741 files changed, 126835 insertions, 77949 deletions

diff --git a/CREDITS b/CREDITS
new file mode 100644
index 00000000..0b456c48
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,90 @@
+MediaWiki 1.14 is a collaborative project released under the
+GNU General Public License v2. We would like to recognize the
+following names for their contribution to the product.
+
+== Developers ==
+* Aaron Schulz
+* Alex Z.
+* Alexandre Emsenhuber
+* Andrew Garrett
+* Aryeh Gregor
+* Ashar Voultoiz
+* Bertrand Grondin
+* Brion Vibber
+* Bryan Tong Minh
+* Chad Horohoe
+* Charles Melbye
+* Daniel Friesen
+* Daniel Kinzler
+* Danny B.
+* David McCabe
+* Derk-Jan Hartman
+* Domas Mituzas
+* Fran Rogers
+* Greg Sabino Mullane
+* Guy Van den Broeck
+* Hojjat
+* Ilmari Karonen
+* Jack D. Pond
+* Jack Phoenix
+* Jason Richey
+* Jon Harald Søby
+* Leon Weber
+* Marco Schuster
+* Matt Johnston
+* Meno25
+* MinuteElectron
+* Mohamed Magdy
+* Nathaniel Herman
+* Nicolas Dumazet
+* Niklas Laxström
+* Platonides
+* Purodha Blissenbach
+* Raimond Spekking
+* Roan Kattouw
+* Robert Stojnić
+* Rotem Liss
+* Ryan Lane
+* Ryan Schmidt
+* Shinjiman
+* Siebrand Mazeland
+* SQL
+* Soxred93
+* Thomas Bleher
+* Tim Starling
+* Victor Vasiliev
+
+== Patch Contributors ==
+* Agbad
+* Brad Jorsch
+* Brent G
+* Daniel Arnold
+* Danny B.
+* FunPika
+* Happy-melon
+* Jeremy Baron
+* Juliano F. Ravasi
+* Lucas Garczewski
+* Louperivois
+* Marooned
+* Max Semenik
+* Michael De La Rue
+* Mike Horvath
+* Mormegil
+* Nakon
+* Nathan Larson
+* Nikolaos S. Karastathis
+* Olaf Lenz
+* Paul Copperman
+* RememberTheDot
+* René Kijewski
+* ST47
+* Stefano
+
+== Translators ==
+* Anders Wegge Jakobsen
+* Hk kng
+* Hojjat
+* Meno25
+* Rotem Liss
+* Shinjiman
diff --git a/HISTORY b/HISTORY
index 8e89f410..f9e3692a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,650 @@
 Change notes from older releases. For current info see RELEASE-NOTES.
 
+== MediaWiki 1.13 ==
+
+== Changes since 1.13.2 ==
+
+David Remahl of Apple's Product Security team has identified a number of 
+security issues in previous releases of MediaWiki. Subsequent analysis by the
+MediaWiki development team expanded the scope of these vulnerabilities. The
+issues with a significant impact are as follows:
+
+* An XSS vulnerability affecting all MediaWiki installations between 1.13.0 and
+  1.13.2. [CVE-2008-5249]
+* A local script injection vulnerability affecting Internet Explorer clients for 
+  all MediaWiki installations with uploads enabled. [CVE-2008-5250]
+* A local script injection vulnerability affecting clients with SVG scripting 
+  capability (such as Firefox 1.5+), for all MediaWiki installations with SVG 
+  uploads enabled. [CVE-2008-5250]
+* A CSRF vulnerability affecting the Special:Import feature, for all MediaWiki 
+  installations since the feature was introduced in 1.3.0. [CVE-2008-5252]
+
+XSS (cross-site scripting) vulnerabilities allow an attacker to steal an
+authorised user's login session, and to act as that user on the wiki. The
+authorised user must visit a web page controlled by the attacker in order to
+activate the attack. Intranet wikis are vulnerable if the attacker can 
+determine the intranet URL.
+
+Local script injection vulnerabilities are like XSS vulnerabilities, except 
+that the attacker must have an account on the local wiki, and there is no 
+external site involved. The attacker uploads a script to the wiki, which another
+user is tricked into executing, with the effect that the attacker is able to act 
+as the privileged user.
+
+CSRF vulnerabilities allow an attacker to act as an authorised user on the wiki,
+but unlike an XSS vulnerability, the attacker can only act as the user in a
+specific and restricted way. The present CSRF vulnerability allows pages to be
+edited, with forged revision histories. Like an XSS vulnerability, the
+authorised user must visit the malicious web page to activate the attack.
+
+These four vulnerabilities are all fixed in this release.
+
+David Remahl also reminded us of some security-related configuration issues:
+
+* By default, MediaWiki stores a backup of deleted images in the images/deleted
+  directory. If you do not want these images to be publically accessible, make
+  sure this directory is not accessible from the web. MediaWiki takes some steps
+  to avoid leaking these images, but these measures are not perfect.
+* Set display_errors=off in your php.ini to avoid path disclosure via PHP fatal
+  errors. This is the default on most shared web hosts.
+* Enabling MediaWiki's debugging features, such as $wgShowExceptionDetails, may 
+  lead to path disclosure.
+
+Other changes in this release:
+
+* Avoid fatal error in profileinfo.php when not configured.
+* Add a .htaccess to deleted images directory for additional protection against 
+  exposure of deleted files with known SHA-1 hashes on default installations. 
+* Avoid streaming uploaded files to the user via index.php. This allows 
+  security-conscious users to serve uploaded files via a different domain, and
+  thus client-side scripts executed from that domain cannot access the login
+  cookies. Affects Special:Undelete, img_auth.php and thumb.php.
+* When streaming files via index.php, use the MIME type detected from the 
+  file extension, not from the data. This reduces the XSS attack surface.
+* Blacklist redirects via Special:Filepath. Such redirects exacerbate any 
+  XSS vulnerabilities involving uploads of files containing scripts.
+* Internationalisation updates.
+
+== Changes since 1.13.1 ==
+
+* Security: Work around misconfiguration by requiring strict comparisons for
+  in_array in User::isAllowed().
+* (bug 14944) Added $wgShellLocale for configuration of an appropriate locale 
+  to use for LC_CTYPE during shell invocation. For servers that don't have 
+  en_US.utf8. Also added locale detection during install.
+* Localisation updates
+* Security: Fixed XSS vulnerability in useskin parameter.
+
+== Changes since 1.13.0 ==
+
+* (bug 15460) Fixed intermittent deadlock errors and poor concurrent 
+  performance for installations without memcached.
+* (bug 13770) Fixed DOM module detection for installations with both dom 
+  and domxml.
+* (bug 15148) Fixed Special:BlockIP for PostgreSQL
+* Fixed SQLite support for non-memcached installations
+* Localisation updates, Achinese (ace) added.
+
+== Changes since 1.13.0rc2 ==
+
+* (bug 13770) Fixed incorrect detection of PHP's DOM module
+* Fix regression from r37834: accesskey tooltip hint should be given for the 
+  minor edit and watch labels on the edit page.
+* Updated Chinese simplified/traditional conversion tables
+
+== Changes since 1.13.0rc1 ==
+
+* $wgForwardSearchUrl has been removed entirely. Documented setting since 1.4
+  has been $wgSearchForwardUrl.
+* (bug 14907) DatabasePostgres::fieldType now defined.
+* (bug 14966) Fix SearchEngineDummy class for silently non-functional search
+  on Sqlite instead of horribly fatal error breaky one.
+* (bug 14987) Only fix double redirects on page move when the checkbox is
+  checked
+* (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return
+  address for page update notification mails.
+* API: Registration time of users registered before the DB field was created is now
+  shown as empty instead of the current time.
+* (bug 14904): fragments were lost when redirects were fixed.
+* Added magic word __STATICREDIRECT__ to suppress the redirect fixer
+* (bug 15035) Revert English linkTrail to /^([a-z]+)(.*)$/sD, as it was before 
+  r36253. Multiple reports of breakage due to old (pre-5.0) PCRE libraries, 
+  both bundled with PHP and packaged with distros such as RHEL. 
+* (bug 14944) Shell invocation of external programs such as ImageMagick convert 
+  was broken in PHP 5.2.6, if the server had a non-UTF-8 locale.
+
+=== Configuration changes in 1.13 ===
+
+* New option $wgFeed can be set false to turn off syndication feeds
+* (bug 5745) Special:Whatlinkshere now shows up to $wgMaxRedirectLinksRetrieved
+  links through each redirect instead of hardcoded 500
+* Set $wgUploadSizeWarning to false by default
+* Added $wgLBFactoryConf, for generic configuration of multi-master wiki farms
+* Removed $wgAlternateMaster, use $wgLBFactoryConf
+* (bug 13562) Misspelled option $wgUserNotifedOnAllChanges changed to
+  $wgUserNotifiedOnAllChanges
+* (bug 12860) New option $wgSitemapNamespaces allows sitemaps to be generated
+  for only some namespaces
+* Removed the emailconfirmed implicit group by default. To re-add it, use:
+    $wgAutopromote['emailconfirmed'] = APCOND_EMAILCONFIRMED;
+  in your LocalSettings.php.
+* (bug 2396) New shared database configuration variables. $wgSharedPrefix allows
+  you to use a shared database with a different prefix. Or you can now use a local
+  database and use prefixes to separate wiki and the shared tables. And the new
+  $wgSharedTables variable allows you to specify a list of tables to share.
+* Automatic edit summaries can be disabled with $wgUseAutomaticEditSummaries  
+* Duplicates of images are now shown on the image page
+* $wgRCFilterByAge allows for the list of dates in recent changes special pages to
+  be filtered to only those within the range of $wgRCMaxAge
+* $wgRCLinkLimits and $wgRCLinkDays allow for customization of the list and limits
+  displayed on the recent changes special pages
+* The "createpage" permission is no longer required when uploading if the target
+  image page already exists
+* $wgMaximumMovedPages restricts the number of pages that can be moved at once
+  (default 100) with the new subpage-move functionality of Special:Movepage
+* Hooks display in Special:Version is now disabled by default, use 
+  $wgSpecialVersionShowHooks = true; to enable it.
+* $wgActiveUserEditCount sets the number of edits that must be performed over
+  a certain number of days to be considered active
+* $wgActiveUserDays is that number of days
+* $wgRateLimitsExcludedGroups has been deprecated in favor of 
+  $wgGroupPermissions[]['noratelimit']. The former still works, however.
+* New $wgGroupPermissions option 'move-subpages' added to control bulk-moving
+  subpages along with pages.  Assigned to 'user' and 'sysop' by default.
+* New $wgRC2UDPOmitBots allows user to omit bot edits from UDP output. 
+  Default: false
+* Removed $wgEnableCascadingProtection option. Disabling cascading protection
+  is no longer possible. 
+* $wgMessageCacheType defines now the type of cache used by the MessageCache class,
+  previously it was choosen based on $wgParserCacheType
+* $wgExtensionAliasesFiles option to simplify adding aliases to special pages
+  provided by extensions, in a similar way to $wgExtensionMessagesFiles
+* Added $wgXMLMimeTypes, an array of XML mimetypes we can check for
+  with MimeMagic.
+* Added $wgDirectoryMode, which allows for setting the default CHMOD value when
+  creating new directories.
+* (bug 14843) $wgCookiePrefix can be set by LocalSettings now, false defaults 
+  current behavior.
+
+=== New features in 1.13 ===
+
+* __HIDDENCAT__ on a category page causes the category to be hidden on the
+  article page
+* Do not show edit permissions errors on a red link click, just redirect to the
+  article. This is so that readers who don't know what a red link is are not
+  confused when they are told they are range-blocked.
+* Add a new hook ImageBeforeProduceHTML to allow extensions to modify wikitext
+  image syntax output
+* (bug 13100) Added 'preloadtitle' parameter to action=edit&section=new that
+  pre-fills the section title field
+* (bug 13112) Added Special:RelatedChanges alias to Special:RecentChangesLinked
+* (bug 13130) Moved edit token and autosummary fields above edit tools to
+  reduce broken form submissions
+* Add --old-redirects-only option to maintenance/refreshLinks.php, to add old
+  redirects to the redirect table
+* Add links to page and file deletion forms to edit predefined delete reasons 
+* (bug 13269) Added MediaWiki:Uploadfooter to the bottom of Special:Upload
+* (bug 2815) Search results for media now use thumbnail instead of text extract
+* When a page doesn't exist, the tab should say "create", not "edit"
+* (bug 12882) Added a span with class "patrollink" around "Mark as patrolled"
+  link on diffs
+* Magic word formatnum can now take raw suffix to undo formatting
+* Add updatelog table to reliably permit updates that don't change the schema
+* Add category table to allow better tracking of category membership counts
+** (bug 1212) Give correct membership counts on the pages of large categories
+** Use category table for more efficient display of Special:Categories
+* (bug 1459) Search for duplicate files by hash: Special:FileDuplicateSearch
+* (bug 9447) Added hooks for search result headings
+* Image redirects are now enabled by default
+* (bug 13450) Email confirmation can now be canceled before the expiration
+* (bug 13490) Show upload/file size limit on upload form
+* Redesign of Special:UserRights
+* Make rev_deleted log entries more intelligible
+* (bug 6943) Added PAGESINCATEGORY: magic word
+* (bug 13604) Added Special:ListGroupRights
+* (bug 6332, 8617) Added message 'mainpage-description' as duplicate of
+  'mainpage' and added it to message 'sidebar'
+* Automatically add old redirects to the redirect table when needed
+* (bug 6934) Allow inclusions, links, redirects to be separately toggled on or
+  off on Special:WhatLinksHere
+* Cache image redirects
+* (bug 10457) Organize Special:SpecialPages into sections
+* Add a new hook EditPageBeforeConflictDiff to allow extensions like FCKeditor
+  to modify the output for edit conflicts
+* Add class="nested" for <fieldset>s so fieldsets inside fieldsets get
+  a slightly less huge margin and padding
+* (bug 13527) Use sitemaps.org format 0.9 instead of a Google-specific format
+* Allow \C and \Q as TeX commands to match \R, \N, \Z
+* On Special:UserRights, when you can add a group you can't remove or remove
+  one you can't add, a notice is printed to warn you
+* (bug 12698) Create PAGESIZE parser function, to return the size of a page
+* Allow the "log in / create account" link in the toolbar to have different
+  text from Special:UserLogin title (new message 'nav-login-createaccount')
+* Say "log in / create account" if an anonymous user can create an account,
+  otherwise just "log in", consistently across skins
+* Special:Shortpages and Special:Longpages now returns pages in all content 
+  namespaces, not just NS_MAIN.
+* (bug 889) Improve conflict-handling between shared upload repository
+  and local one
+* Update documentation links in auto-generated LocalSettings.php
+* (bug 13584) The new hook SkinTemplateToolboxEnd was added.
+* (bug 709) Cannot rename/move images and other media files [EXPERIMENTAL]
+* Custom rollback summaries now accept the same arguments as the default message
+* (bug 12542) Added hooks for expansion of Special:Listusers
+* Drop-down AJAX search suggestions (turn on $wgEnableMWSuggest) 
+* More relevant search snippets (turn on $wgAdvancedSearchHighlighting)
+* (bug 13950) Allow users to watch the user/talk pages of users they block.
+* (bug 13970) Allow MonoBook-based skins to specify their own print stylesheet
+* Show image links on Special:Whatlinkshere
+* Use rel="start", "prev", "next" appropriately on Pager-based pages
+* Add support for SQLite
+* AutoAuthenticate hook renamed to UserLoadFromSession
+* (bug 13232) importScript(), importStylesheet() funcs available to custom JS
+* (bug 13095) Search by first letters or digits in [[Special:Categories]]
+* Users moving a page can now move all subpages automatically as well
+* (bug 14259) Localisation message for upload button on Special:Import is now
+  'import-upload' instead of 'upload'
+* Add information about user group membership to Special:Preferences
+* (bug 14146) Wrap usage section on imagepages into <div>s.
+* New layout for Special:Specialpages. Restricted pages are marked but not separated
+  from other pages in their group.
+* (bug 14263) Show a diff of the revert on rollback notification page.
+* (bug 13434) Show a warning when hash identical files exist
+* Sidebar is now cached for all languages
+* The User class now contains a public function called isActiveEditor. Figures
+  out if a user is active based on at least $wgActiveUserEditCount number of
+  edits in the last $wgActiveUserDays days.
+* SpecialSearchResults hook now passes results by reference, so they can be
+  changed by extensions.
+* Add a new hook LinkerMakeExternalLink to allow extensions to modify the output of
+  external links.
+* (bug 14132) Allow user to disable bot edits from being output to UDP. 
+* (bug 14328) jsMsg() within Wikibits now accepts a DOM object, not just a string  
+* (bug 14558) New system message (emailuserfooter) is now added to the footer of 
+  e-mails sent with Special:Emailuser
+* Add support for Hijri (Islamic) calendar
+* Add a new hook LinkerMakeExternalImage to allow extensions to modify the output
+  of external (hotlinked) images.
+* (bug 14604) Introduced the following features for the LanguageConverter:
+  Multi-tag support, single conversion flag, remove conversion flag on a single
+  page, description flag, variant name, multi-variant fallbacks.
+* Add zh-mo and zh-my variants for the zh language
+* (bugs 4832, 9481, 12890) Special:Recentchangeslinked now has all options that
+  are in Special:Recentchanges
+* Allow an $error message to be passed to ArticleDelete hook
+* Allow extensions to modify the user creation form by calling addInputItem();
+* Add meta generator tag to HTML output
+* MediawikiPerformAction hook is now passed the Mediawiki object
+* Added blank special page Special:BlankPage for benchmarking, etc.
+* Foreign repo file descriptions and thumbnails are now cached.
+* (bug 11732) Allow localisation of edit button images
+* Allow the search box, toolbox and languages box in the Monobook sidebar to be
+  moved around arbitrarily using special sections in [[MediaWiki:Sidebar]]: 
+  SEARCH, TOOLBOX and LANGUAGES
+* Add a new hook NormalizeMessageKey to allow extensions to replace messages before
+  the database is potentially queried
+* (bug 9736) Redirects on Special:Fewestrevisions are now marked as such.
+* New date/time formats in Cs localization according to ÄŒSN and PÄŒP.
+* Special:Recentchangeslinked now includes changes to transcluded pages and
+  displayed images; also, the "Show changes to pages linked" checkbox now works on
+  category pages too, showing all links that are not categorizations
+* (bug 4578) Automatically fix redirects broken by a page move 
+
+=== Bug fixes in 1.13 ===
+
+* (bug 10677) Add link to the file description page on the shared repository
+* (bug 13084) Increase size of source/destination filename fields in upload form
+* (bug 13115) rebuildrecentchanges should print the current value of $wgRCMaxAge
+* (bug 13140) Show parent categories in category namespace
+* (bug 13149) Correctly format 'fileexists' message on Upload page
+* Make the default filepageexists message accurate
+* (bug 12988) $wgMinimalPasswordLength no longer breaks create user by email
+* (bug 13022) Fix upload from URL on PHP 5.0.x
+* (bug 13132) Unable to unprotect pages protected with earlier versions of MediaWiki
+* (bug 12723) OpenSearch description name now uses more compact language code
+  to avoid passing the length limit as often, is customizable per site via
+  'opensearch-desc' message.
+* (bug 13135) Special:Userrights now passes IDs through form submission
+  to allow functionality on not-quite-right usernames
+* (bug 12575) Prevent duplicate patrol log entries from being created
+* (bug 13174) __HIDDENCAT__ now applies only to category pages
+* (bug 13031) Add links to user pages in e-mail form
+* (bug 13147) Description for categoriespagetext (used in Special:Categories) reworded
+* (bug 11561) Fix fatal error when calling action=revert to non-image page
+* (bug 12430) Fix call to private method LinkFilter::makeRegex fatal error in
+  maintenance/cleanupSpam.php
+* All skins should have the "mediawiki" class on the body element
+* (bug 13019) Message cache for some extensions not loaded at time of editing
+* (bug 13247) Prettified ISBN links
+* maintenance/refreshLinks.php did not fix page_id 1 with the --new-only option
+* (bug 13110) Don't show "Permission error" page if the edit is already rolled
+  back when using rollback
+* (bug 13012) Use content messages for block options when generating the
+  recentchanges entry
+* (bug 13274) Change links for messages to ucfirst
+* (bug 13273) Un-hardcode some punctuation (add new messages colon-separator,
+  autocomment-prefix)
+* Parse MediaWiki message translations with a correct language setting on preview
+* (bug 13281) Treat X-Forwarded-For, Client-ip and User-Agent headers as
+  case-insensitive names.
+* Adding the fix for lists in RTL wikis to more skins, and fixing the image toc
+* (bug 8157) Remove redirects from Special:Unusedtemplates. Patch by WebBoy.
+* (bug 10721) Duplicate section anchors with differing case now disambiguated
+  for Internet Explorer's sake and standards compliance
+* (bug 13298) Tighter limits on Special:Newpages limits when embedding
+* Email subject in content language instead of sending user's UI language
+* (bug 13251) Allow maintenance rebuild scripts to work with Postgres
+* (bug 2084) Fixed incorrect regex to match redirects
+* (bug 3131) Manually-specified upload destination filename is no longer
+  overwritten by browsing for a file after you wrote it.
+* (bug 7251) Sidebars generated by MediaWiki:Sidebar now have the class
+  'generated-sidebar'.
+* (bug 13265) Media handler is missing 'image/x-bmp'
+* (bug 13407) MediaWiki:Powersearch is used in two places
+* (bug 13403) Fix cache invalidation of history pages when old revisions change
+* (bug 11563) Deprecated SearchMySQL4 class; merged code to SearchMySQL
+* (bug 12801) Fix link in subtitle message in AJAX search
+* (bug 13428) Fix regression in protection form layout HTML validity
+* (bug 9403) Sanitize newlines from search term input
+* (bug 13429) Separate date and time in message sp-newimages-showfrom
+* (bug 13137) Allow setting 'editprotected' right separately from 'protect', 	 
+  so groups may optionally edit protected pages without having 'protect' perms
+* Disallow deletion of big pages by means of moving a page to its title and
+  using the "delete and move" option.
+* (bug 13466, 13632) White space differences not shown in diffs
+* (bug 1953) Search form now honors namespace selections more reliably
+* (bug 12294) Namespace class renamed to MWNamespace for PHP 5.3 compatibility
+* PHP 5.3 compatibility fix for wfRunHooks() called with no parameters
+* (bug 6447) Trackbacks now work with transactional tables, if enabled
+* (bug 6892, 7147) Trackback error handling, optional fields more robust
+* (bug 6813) Don't break HTML validator when using trackbacks
+* Fix for size checks on SVG images with global 'stroke-width' attribute
+* (bug 11874) Inline CSS with !important no longer borken
+* (bug 1600) Strip extra == section markup == in new-comment field
+* (bug 11325) Wrapped page titles in MonoBook skin spaced more nicely
+* (bug 12077) Fix HTML nesting for TOC
+* (bug 344) Purge cache for talk/article pages when deleting the other tab
+* (bug 13436) Treat image captions correctly when they include option keywords
+  (like ending with "px" or starting with "upright")
+* Trackback display formatting fixed
+* Don't die when single-element arrays are passed to SQL query constructors
+  that have an array index other than 0
+* (bug 13522) Fix fatal error in Parser::extractTagsAndParams
+* (bug 13532) Use proper timestamp call when reverting images
+* (bug 13543) Updated FAQ link in the installer sidebar
+* (bug 13540) Date format in confirmation e-mail now matches message language
+* (bug 13554) PHP Notice in old pre-processor when list item is empty.
+* (bug 13556) Don't show a blank form if no image is attached in Special:Upload
+* (bug 13576) maintenance/rebuildrecentchanges.php fails
+* (bug 13441) Allow Special:Recentchanges to show bots only
+* (bug 13431) Show true message source in Special:Allmessages&ot=php / xml
+* (bug 13463) Login successful page doesn't use user's preferred interface language
+* (bug 13630) Fixed warnings for pass by reference at call time in
+  Special:Revisiondelete when generating the log entry.
+* (bug 12064) BeforePageDisplay hook is now called for all skins
+* (bug 13624) Fix regression with manual thumb= parameter on images
+* (bug 11039) Add missing labels on protection form
+* (bug 13458) Preview/edit toolbar spacing now works consistently
+* (bug 13433) Fix action=render on Image: pages
+* (bug 13678) Fix CSS validation for Monobook
+* (bug 13684) Links in Special:ListGroupRights should be in content language
+* (bug 13690) Fix PHP notice on accessing some URLs
+* Hide (undo) link if user isn't able to edit page
+* Invalidate cache of pages that includes images via redirects on upload
+* (bug 13705) Don't show rollback link in page history on incorrect revisions
+* (bug 13708) Don't set "Search results" title when loading Special:Search
+  without query
+* (bug 13736) Don't show MediaWiki:Anontalkpagetext on non-existant IP addresses
+* (bug 13728) Don't trim initial whitespace during section edits
+* (bug 13727) Don't delete log entries from recentchanges on page deletion
+* (bug 13752) Redirects to sections now work again
+* (bug 13725) Upload form watch checkbox state set correctly with wpDestFile
+* (bug 13756) Don't show the form and navigation links of Special:Newpages if
+  the page is included
+* When hiding things on WhatLinksHere, generated URLs should hide them too
+* Properly escape search terms with regex chars so they appear highlighted in
+  search results
+* (bug 13768) pt_title field encoding fixed
+* Do not display empty columns on Special:UserRights if all groups are
+  changeable or all unchangeable
+* Fix fatal error on calling PAGESINCATEGORY with invalid category name
+* (bug 13793) Special:Whatlinkshere filters wrong - after paginating instead of before
+* (bug 13796) Show links to parent pages even if some of them are missing
+* (bug 13816) Filter by main namespace doesn't work on WhatLinksHere
+* (bug 13822) Fatal error on some pages when calculating subpage subtitle
+* (bug 13824) AJAX search suggestion now works with non-SkinTemplate skins
+* Added 'application/x-dia-diagram' MediaWiki's known MIME types
+* (bug 13866) skins/common/shared.css - invalid attribute fixing
+* Hide edit section links on Special:Undelete
+* (bug 13860) Fix "Justify paragraphs" option for Modern skin
+* (bug 13168) accessibility links in Modern skin link to wrong anchor id
+* (bug 13185) No line break after 'subpages' class in Modern skin
+* (bug 13583) No "poweredby" in Modern skin
+* (bug 13880) "Printable" link in Modern skin now formats as print mode
+* (bug 13885) Bump default $wgSVGMaxSize from 1024 to 2048 pixels
+* (bug 13891) Show categories box even if all categories are hidden and user has
+  "show hidden categories" option on
+* (bug 13915) Undefined variable $wltsfield in includes/SpecialWatchlist.php
+* (bug 13913) Special:Whatlinkshere now has correct HTML markup
+* (bug 13905) Blacklist Mac IE from HttpOnly cookies; it eats them sometimes
+* (bug 13922) Fix bad HTML on empty Special:Prefixindex and Special:Allpages
+* (bug 13924) Fix bad HTML on power search form
+* (bug 13820) Fix updater for rev_parent_id population
+* (bug 13925) Fix bad HTML on search results list
+* (bug 13934) Fixing the link to GNU General Public License Version 2
+* Show correct accesskey prefix for Firefox 3 beta (Alt-Shift-, not Alt-)
+* (bug 13949) Special:PrefixIndex/AllPages paging links contain invalid XML
+* (bug 13770) Use Preprocessor_Hash by default to avoid missing DOM module errors
+* (bug 13982) Disable ccmeonemails preference when user-to-user mails disabled
+* (bug 13615) Update case mappings and normalization to Unicode 5.1.0
+  Note that case mappings will only be used if mbstring extension is not present.
+* (bug 14044) Don't increment page view counters on views from bot users
+* (bug 14042) Calling Database::limitResult() misplaced the comment in the log file
+* (bug 14047) Fix regression in installer which hid DB-specific options
+  Also makes SQLite path configurable in the installer.
+* (bug 13546) Follow image redirects on image page
+* (bug 12644) Template list on edit page now sorted on preview
+* (bug 14058) Support pipe trick for namespaces and interwikis with "-"
+* Message name filter on Special:Allmessages now case-insensitive
+* (bug 13943) Fix image redirect behaviour on image pages
+* (bug 14093) Do 'sysop' => 'protect' magic in Title::isValidMoveOperation
+* (bug 14063) Power search form missing <label> for redirects check
+* (bug 14111) Similar filename warning links now lead to correct page
+* (bug 14082) Fix for complex text input vs AJAX suggestions on some browsers
+* (bug 13693) Categories sometimes claim to have a negative number of members
+* (bug 1701) Korean Hangul syllables now broken down properly in Category lists
+  even if the wiki's overall content language is not Korean
+* (bug 12773) addOnloadHook() now calls functions immediately when scripts are
+  loaded after the primary page completion, instead of dropping them
+* (bug 14199) Fix deletion form for image redirect pages
+* (bug 14220) Disabling $wgCheckFileExtensions now works without also
+  disabling $wgStrictFileExtensions
+* (bug 14241) Pages can no longer be protected to levels you are not in
+* (bug 14296) Fix local name of ang: (Anglo-Saxon)
+* (bug 4871) Hardcoded superscript in time zone preferences moved to message
+* (bug 6957) E-mail confirmation links now using English special page name
+  for better compatibility and keeping the links shorter. Avoids problem
+  with corrupt links in Gmail on IE 6.
+* (bug 14273) Fix for HTTP Accept header parsing with spaces as from Konqueror
+* (bug 14312) Update LanguageKaa.php for handling transform issues with i to Ä°
+  and I to ı
+* (bug 13826) MediaWiki:Defaultns accepts Wikicode
+* (bug 14324) Creating an account is again possible with $wgEmailConfirmToEdit
+  set to true
+* (bug 13034) Interwiki pages can now be reached using Go search button
+* (bug 14362) Change interwiki names of Erzya and Moksha Wikipedias
+* (bug 14370) When a grouppage-x message does not exist the entry on the
+  ListGroupRights special page now links to the project namespace page for it,
+  not the main namespace page.
+* (bug 11659) Urldecode image names in galleries
+* (bug 14258, 14368) Fix for subpage renames in replication environments
+* (bug 14367) Failed block no longer adds phantom watchlist entry
+* (bug 14385) "Move subpages" option no longer tries to move to invalid titles
+* (bug 14386) Fix subpage namespace oddity when moving a talk page
+* (bug 11771) Signup form now not shown if in read-only mode.
+* (bug 12859) $wgRateLimitsExcludedGroups has been deprecated in favor of
+  $wgGroupPermissions[]['noratelimit']. 
+* (Bug 13828) Split parameter $1 of MediaWiki:Missingarticle into $1 (=title)
+  and $2 (=revision numbers)
+* (bug 14401) Fix Safari access key tooltips for Windows and >3.1 Mac versions
+* (bug 14432) Fix notice regression in Special:Newpages feed mode
+* (bug 11951) EditPage::getEditToolbar() is now static.
+* (bug 14392) Fix regression breaking table prefix in installer
+* (bug 11084) $wgDBprefix replacement for updater SQL will now work for
+  extension tables using uppercase letters or digits in their names.
+* (bug 12311) Fix regression with lists at start of undeletion preview
+* (bug 14496) Fix regression with parseinline on Special:Upload.
+* We no longer just give up on a missing upload base directory; it's now
+  created automatically if we have sufficient permissions!
+* (bug 14479) MediaWiki:upload-maxfilesize should have a div id wrapper
+* (bug 14497) Throw visible errors in installer scripts when SQL files
+  fail due to database permission or other error
+* (bug 14500) Site feed (Recentchanges) no longer shows up on the actual
+  recent changes page.
+* (bug 14511) MediaWiki:Delete-legend is no longer double escaped
+* Generate correct section anchors for numeric headers
+* (bug 14520) Don't load nonexistent CSS files for Chick/Myskin/Simple skins
+* (bug 14551) Cancel upload no longer automatically suppresses warnings
+* (bug 13878) Deprecate Article::getDB() in favor of direct wfGetDB() calls
+* (bug 4977) Fix for possible squid purging errors when using HTTP purges
+  and multiple servers
+* (bug 14572) Redirects listed on file links on image pages no longer redirect.
+* (bug 14537) Change interwiki name for Old Church Slavonic (cu)
+* (bug 14583) Fix regression in recent changes "limit to certain categories."
+* (bug 14515) HTML nesting cleanup on edit form
+* (bug 14647) Removed unused 'townBox' CSS classes
+* (bug 14687) OutputPage::addStyle() now adds type="text/css" like it should.
+* OpenSearch cleanup; Firefox now sends you to the search page for empty
+  searches instead of the domain root (which may not even be a wiki).
+* (bug 3481) Pages moved shortly after creation are shown at their new title
+  on Special:Newpages.
+* (bug 12716) Trying to unprotect a title that isn't protected no longer 
+  generates a log entry.
+* (bug 14088) Excessively long block expiry times are rejected as invalid,
+  keeps the log page from being distorted.
+* (bug 14708) Emulate INSERT...IGNORE with standard SQL for Postgres backend.
+* (bug 14646) Fix some double-escaping of HTML in feed output
+* (bug 14709) Fix login success message formatting when using cookie check
+* (bug 14710) Remove "donate" link from default sidebar
+* (bug 14745) Image moving works on sites that transform thumbnails via 404
+* (bug 2186) Document.write() in wikibits caused failures when using
+  application/xhtml+xml. The calls to this have been removed.
+* (bug 14764) Fix regression in from Article::lastModified(), failed to work
+  on non-mySQL schemas.
+* (bug 14763) Child classes of Database (DatabasePostgres and DatabaseOracle)
+  had stict standards issues with setFakeSlaveLag() and setFakeMaster().
+* (bug 451) Improve the phrase mappings of the Chinese converter arrays.
+* (bug 12487) Rights log is not fully internationalized
+* (bug 10837) Language variants no longer override other languages than base
+* (bug 14778) 'limit' parameter now applies to history feeds as well as
+  history pages
+* (bug 14845) Bug in prefs javascript: Calling an array item without checking
+  its existance.
+* Accesskeys for minor edit/watch checkboxes on edit now work in Firefox 3
+* (bug 12384) Comments in maintenance/*php
+* (bug 12441) ./maintenance/generateSitemap.php fix -fspath requiring
+  a trailing slash.
+* (bug 12568) configuration script now produce valid XHTML.
+* The accesskey to edit a page is now disabled when editing the page, to pre-
+  vent conflicts with Safari shortcuts.
+
+=== API changes in 1.13 ===
+
+* Fixing main page display in meta=siteinfo
+* (bug 13128) Added patrolled flag to list=recentchanges
+* Implemented {bl,ei,iu}redirect (lists links through redirects as well)
+* (bug 13154) Introduced subpages flag to meta=siteinfo&siprop=namespaces
+* (bug 13157) Added ucuserprefix parameter to list=usercontibs
+* (bug 12394) Added rctitles parameter to list=recentchanges, making rcid
+  retrieval easier
+* (bug 13218) Fix inclusion of " character in hyperlinks
+* Added watch and unwatch parameters to action=delete and action=move
+* Added action=edit
+* (bug 11401) Added xmldoublequote to xml formatter
+* Added rvsection parameter to prop=revisions to allow fetching the content of
+  a certain section only
+* Introduced list=allimages
+* (bug 13371) Build page set from image hashes
+* Mark non-existent messages in meta=allmessages as missing
+* (bug 13390) One invalid title no longer kills an entire API query
+* (bug 13419) Fix gblredirect so it actually works
+* (bug 13418) Disable eiredirect because it's useless
+* (bug 13395) list=allcategories should use category table
+* (bug 13442) Missing pages in prop=langlinks and prop=extlinks are now 
+  handled properly.
+* (bug 13444) Add description to list=watchlist
+* (bug 13482) Disabled search types handled properly
+* Added inprop=talkid,subjectid to prop=info
+* Added help text message that specifies whether a module is POST-only
+* Added createonly parameter to action=edit
+* Replaced $wgAPIUCUserPrefixMinLength by the more generic $wgAPIMaxDBRows
+* (bug 11719) Remove trailing blanks in YAML output.
+* (bug 13541) Added siprop=specialpagealiases to meta=siteinfo
+* Added fallback8bitEncoding and readonly fields to 
+  meta=siteinfo&siprop=general output
+* (bug 13544) Added prop=revid to action=parse
+* (bug 13603) Added siprop=usergroups to meta=siteinfo
+* Cleaned up redirect resolution
+* Added possibility to obtain all external links through list=exturlusage
+* (bug 13606) Added archivename to iiprop
+* (bug 11633) Explicitly convert redirect titles to strings due to PHP's
+  very weak typing on array keys.
+* (bug 12136) Extend allowed characters in JSON callback to ][.'"_A-Za-z0-9
+* (bug 11673) Return error 'unknown_action' in specified format
+* (bug 13618) Added rcprop=redirect and rcshow=redirect to list=recentchanges
+* (bug 13544) Added oldid parameter to action=parse to allow for parsing of old
+  revisions
+* (bug 13718) Return the proper continue parameter for cmsort=timestamp
+* action=login now returns the correct waiting time in the details property
+* (bug 13792) Broken titles are now silently skipped in search results.
+* (bug 13819) exturlusage paging skipped an item
+* Fixed handling of usernames containing spaces in list=block
+* (bug 13836) Fixed fatal errors resulting from combining iiprop=metadata with
+  format=xml
+* (bug 13735) Added prop=categoryinfo module
+* (bug 13945) Retrieve cascading protection sources via inprop=protection
+* (bug 13965) Hardcoded 51 limit on titles is too limiting
+* (bug 13993) apfrom doesn't work with apdir=descending
+* (bug 14018) Introduced alcontinue to list=alllinks to improve paging
+* (bug 14013) Added rcshow=patrolled to list=recentchanges
+* (bug 14028) Added language attribute to interwiki map in meta=siteinfo
+* (bug 14022) Added usprop=registration and auprop=blockinfo
+* (bug 14021) Removed titles= support from list=backlinks (has been obsolete 
+  for ages)
+* (bug 13829) Expose parse tree via action=expandtemplates
+* (bug 13606) Allow deletion of images
+* Added iiprop=mime and aiprop=metadata
+* Handled unrecognized values for parameters more gracefully
+* Handled requesting disallowed tokens more gracefully
+* (bug 14140) URL-encoded page titles are now decoded in edit summaries
+* (bug 14243) Only accept post requests in action=edit; patch by HardDisk
+* action=block now returns an ISO8601 timestamp, like all other modules do
+* Added md5 parameter to action=edit
+* (bug 14335) Logging in to unified account using API not possible
+* Added action=emailuser to send an email to a user
+* (bug 14471) Use HTMLTidy and generate limit report in action=parse
+* (bug 14459) Added prependtext and appendtext parameters to action=edit
+* (bug 14526) Unescaped SQL in list=backlinks
+* Added 'hidden' flag to list=allcategories and prop=categoryinfo output
+* Added nocreate parameter to action=edit
+* (bug 14402) Added maxage and smaxage parameters to api.php
+* Added bkip parameter to list=blocks
+* (bug 14651) apprefix and similar parameters are now canonicalized
+* Added clprop=timestamp to prop=categories
+* (bug 14678) API errors now respects $wgShowExceptionDetails and 
+  $wgShowSQLErrors
+* (bug 14723) Added time zone and writing direction to meta=siteinfo
+* Added APIQueryInfoTokens and APIQueryRevisionsTokens hooks so extensions
+  can add their own tokens
+* Added block and unblock tokens to prop=info as well
+* Added paging (limit and continue parameters) to
+  prop={links,templatelinks,langlinks,extlinks,categories,images}
+* Added flag "top" to list=usercontribs if the user is the last contributor to
+  the page
+* list=exturlusage in "list all links" mode can now filter by protocol
+
+
+
 == MediaWiki 1.12 ==
 
 This is the Winter 2007 quarterly release.
@@ -30,7 +675,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
      remove the groups specified in $wgAddGroups and $wgRemoveGroups for
      any groups they are in.
 * New permission userrights-interwiki for changing user rights on foreign wikis.
-* $wgImplictGroups for groups that are hidden from Special:Listusers, etc.
+* $wgImplicitGroups for groups that are hidden from Special:Listusers, etc.
 * $wgAutopromote: automatically promote users who match specified criteria
 * $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf: allow users to add or remove
   themselves from specified groups via Special:Userrights.
@@ -2511,7 +3156,7 @@ they will be run along with the main tests by maintenance/parserTests.php
 * (bug 6701) Kazakh language variants in MessagesEn.php
 * (bug 7335) SVN revision check in Special:Version fails on SVN 1.4 working copy
 * (bug 6518) Replaced 'lastmodified' with 'lastmodifiedat' and 'lastmodifiedby' with 'lastmodifiedatby'
-  with seperated parameters for date and time to allow better localisation. Updated all message files
+  with separated parameters for date and time to allow better localisation. Updated all message files
   to display the old format for compatibility.
 * (bug 7357) Make supposedly static methods of Skin actually static
 * Added info text to Special:Deadendpages and Special:Lonelypages
@@ -4584,7 +5229,7 @@ Various bugfixes, small features, and a few experimental things:
 * Fixed a bug in Special:Contributions that caused the namespace selection to
   be forgotten between submits
 * Special:Watchlist/edit now has namespace subheadings
-* (bug 1714) the "Save page" button now has right margin to seperate it from
+* (bug 1714) the "Save page" button now has right margin to separate it from
   "Show preview" and "Show changes"
 * Special:Statistics now supports action=raw, useful for bots designed to
   harwest e.g. article counts from multiple wikis.
diff --git a/README b/README
index 5f659df5..7c3651e0 100644
--- a/README
+++ b/README
@@ -1,15 +1,15 @@
-2007-09-15
+2008-11-11
 
-For system requirements, installation and upgrade details, see the files RELEASE-NOTES, 
-INSTALL, and UPGRADE.
+For system requirements, installation and upgrade details, see the files 
+RELEASE-NOTES, INSTALL, and UPGRADE.
 
 == MediaWiki ==
 
 MediaWiki is the software used for Wikipedia [http://www.wikipedia.org/] and the
 other Wikimedia Foundation websites. Compared to other wikis, it has an
 excellent range of features and support for high-traffic websites using
-multiple servers (Wikimedia sites peak in the 50000+ requests per second range
-as of January 2008).
+multiple servers (Wikimedia sites peak in the 60000+ requests per second range
+as of November 2008).
 
 While quite usable on smaller sites, you may find you have to "roll your own"
 local documentation, and some aspects of configuration may seem overcomplicated
@@ -33,21 +33,24 @@ The MediaWiki software was written by:
 * Domas Mituzas
 * Rob Church
 * Jens Frank
-* Several others
-
-The contributors hold the copyright to this work, and it is licensed
-under the terms of the GNU General Public License, version 2 or later[1]
-(see http://www.fsf.org/licenses/gpl.html). Derivative works and later
-versions of the code must be free software licensed under the same
-terms. This includes "extensions" that use MediaWiki functions or
-variables; see http://www.gnu.org/licenses/gpl-faq.html#GPLAndPlugins
-for details.
+* Yuri Astrakhan
+* Aryeh Gregor
+* Aaron Schulz
+* Several others (view CREDITS for a more complete list)
+
+The contributors hold the copyright to this work, and it is licensed under the
+terms of the GNU General Public License, version 2 or later[1] (see
+http://www.fsf.org/licensing/licenses/gpl.html). Derivative works and later
+versions of the code must be free software licensed under the same or a
+compatible license. This includes "extensions" that use MediaWiki functions or
+variables; see http://www.gnu.org/licenses/gpl-faq.html#GPLAndPlugins for
+details.
 
 The Wikimedia Foundation currently has no legal rights to the software.
 
-[1] Sections of code written exclusively by Lee Crocker or Erik Moeller are
-also released into the public domain, which does not impair the obligations of
-users under the GPL for use of the whole code or other sections thereof.
+[1] Sections of code written exclusively by Lee Crocker or Erik Moeller are also
+released into the public domain, which does not impair the obligations of users
+under the GPL for use of the whole code or other sections thereof.
 
 [2] MediaWiki makes use of the Sajax Toolkit by modernmethod,
 	http://www.modernmethod.com/sajax/
@@ -65,13 +68,12 @@ The official website for MediaWiki is located at:
 
   http://www.mediawiki.org/
 
-The code is currently maintained in a Subversion repository
-at svn.wikimedia.org. See http://www.mediawiki.org/wiki/Subversion
-for details.
+The code is currently maintained in a Subversion repository at
+svn.wikimedia.org. See http://www.mediawiki.org/wiki/Subversion for details.
 
 Please report bugs and make feature requests in our Bugzilla system:
 
-  http://bugzilla.wikimedia.org/
+  https://bugzilla.wikimedia.org/
 
 Documentation and discussion on new features may be found at:
 
@@ -86,18 +88,18 @@ Extensions are listed at:
 If you are setting up your own wiki based on this software, it is highly
 recommended that you subscribe to mediawiki-announce:
 
-  http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
+  https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
 
-The mailing list is very low volume, and is intended primarily for
-announcements of new versions, bug fixes, and security issues.
+The mailing list is very low volume, and is intended primarily for announcements
+of new versions, bug fixes, and security issues.
 
 A higher volume support mailing list can be found at:
 
-  http://lists.wikimedia.org/mailman/listinfo/mediawiki-l
+  https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
 
 Developer discussion takes place at:
 
-  http://lists.wikimedia.org/mailman/listinfo/wikitech-l
+  https://lists.wikimedia.org/mailman/listinfo/wikitech-l
 
-There is also a development and support channel #mediawiki on
-irc.freenode.net, and an unoffical support forum at www.mwusers.com.
+There is also a development and support channel #mediawiki on irc.freenode.net,
+and an unoffical support forum at www.mwusers.com.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1071830b..7ce61f90 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,12 +1,13 @@
 = MediaWiki release notes =
 
-For upgrade instructions please see the UPGRADE file in this directory.
+Security reminder: MediaWiki does not require PHP's register_globals
+setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
-== MediaWiki 1.13.4 ==
+== MediaWiki 1.14.0 ==
 
-February 7, 2009
+February 22, 2009
 
-This is a security update to the Summer 2008 snapshot release of MediaWiki.
+This is the first stable release of the 2009 Q1 branch of MediaWiki.
 
 MediaWiki is now using a "continuous integration" development model with
 quarterly snapshot releases. The latest development code is always kept
@@ -19,687 +20,616 @@ will be made on the development trunk and appear in the next quarterly release.
 Those wishing to use the latest code instead of a branch release can obtain
 it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
-== Changes since 1.13.3 ==
-
-A number of cross-site scripting (XSS) security vulnerabilities were discovered 
-in the web-based installer (config/index.php). These vulnerabilities all 
-require a live installer -- once the installer has been used to install a wiki, 
-it is deactivated.
-
-Note that cross-site scripting vulnerabilities can be used to attack any website
-in the same cookie domain. So if you have an uninstalled copy of MediaWiki on
-the same site as an active web service, MediaWiki could be used to attack the
-active service.
-
-If you are hosting an old copy of MediaWiki that you have never installed, you 
-are advised to remove it from the web.
-
-== Changes since 1.13.2 ==
-
-David Remahl of Apple's Product Security team has identified a number of 
-security issues in previous releases of MediaWiki. Subsequent analysis by the
-MediaWiki development team expanded the scope of these vulnerabilities. The
-issues with a significant impact are as follows:
-
-* An XSS vulnerability affecting all MediaWiki installations between 1.13.0 and
-  1.13.2. [CVE-2008-5249]
-* A local script injection vulnerability affecting Internet Explorer clients for 
-  all MediaWiki installations with uploads enabled. [CVE-2008-5250]
-* A local script injection vulnerability affecting clients with SVG scripting 
-  capability (such as Firefox 1.5+), for all MediaWiki installations with SVG 
-  uploads enabled. [CVE-2008-5250]
-* A CSRF vulnerability affecting the Special:Import feature, for all MediaWiki 
-  installations since the feature was introduced in 1.3.0. [CVE-2008-5252]
-
-XSS (cross-site scripting) vulnerabilities allow an attacker to steal an
-authorised user's login session, and to act as that user on the wiki. The
-authorised user must visit a web page controlled by the attacker in order to
-activate the attack. Intranet wikis are vulnerable if the attacker can 
-determine the intranet URL.
-
-Local script injection vulnerabilities are like XSS vulnerabilities, except 
-that the attacker must have an account on the local wiki, and there is no 
-external site involved. The attacker uploads a script to the wiki, which another
-user is tricked into executing, with the effect that the attacker is able to act 
-as the privileged user.
-
-CSRF vulnerabilities allow an attacker to act as an authorised user on the wiki,
-but unlike an XSS vulnerability, the attacker can only act as the user in a
-specific and restricted way. The present CSRF vulnerability allows pages to be
-edited, with forged revision histories. Like an XSS vulnerability, the
-authorised user must visit the malicious web page to activate the attack.
-
-These four vulnerabilities are all fixed in this release.
-
-David Remahl also reminded us of some security-related configuration issues:
-
-* By default, MediaWiki stores a backup of deleted images in the images/deleted
-  directory. If you do not want these images to be publically accessible, make
-  sure this directory is not accessible from the web. MediaWiki takes some steps
-  to avoid leaking these images, but these measures are not perfect.
-* Set display_errors=off in your php.ini to avoid path disclosure via PHP fatal
-  errors. This is the default on most shared web hosts.
-* Enabling MediaWiki's debugging features, such as $wgShowExceptionDetails, may 
-  lead to path disclosure.
-
-Other changes in this release:
-
-* Avoid fatal error in profileinfo.php when not configured.
-* Add a .htaccess to deleted images directory for additional protection against 
-  exposure of deleted files with known SHA-1 hashes on default installations. 
-* Avoid streaming uploaded files to the user via index.php. This allows 
-  security-conscious users to serve uploaded files via a different domain, and
-  thus client-side scripts executed from that domain cannot access the login
-  cookies. Affects Special:Undelete, img_auth.php and thumb.php.
-* When streaming files via index.php, use the MIME type detected from the 
-  file extension, not from the data. This reduces the XSS attack surface.
-* Blacklist redirects via Special:Filepath. Such redirects exacerbate any 
-  XSS vulnerabilities involving uploads of files containing scripts.
-* Internationalisation updates.
-
-== Changes since 1.13.1 ==
-
-* Security: Work around misconfiguration by requiring strict comparisons for
-  in_array in User::isAllowed().
-* (bug 14944) Added $wgShellLocale for configuration of an appropriate locale 
-  to use for LC_CTYPE during shell invocation. For servers that don't have 
-  en_US.utf8. Also added locale detection during install.
-* Localisation updates
-* Security: Fixed XSS vulnerability in useskin parameter.
-
-== Changes since 1.13.0 ==
-
-* (bug 15460) Fixed intermittent deadlock errors and poor concurrent 
-  performance for installations without memcached.
-* (bug 13770) Fixed DOM module detection for installations with both dom 
-  and domxml.
-* (bug 15148) Fixed Special:BlockIP for PostgreSQL
-* Fixed SQLite support for non-memcached installations
-* Localisation updates, Achinese (ace) added.
-
-== Changes since 1.13.0rc2 ==
+NOTE: Installation of MediaWiki on SQLite has been temporarily disabled in this
+release due to the discovery of serious problems with the schema. We expect to
+fix this problem for the release of 1.15.0. 
 
-* (bug 13770) Fixed incorrect detection of PHP's DOM module
-* Fix regression from r37834: accesskey tooltip hint should be given for the 
-  minor edit and watch labels on the edit page.
-* Updated Chinese simplified/traditional conversion tables
+== Changes since 1.14.0rc1 ==
+
+* Fixed the performance of the backlinks API module
+* (bug 17420) Send the correct content type from action=raw when the HTML file 
+  cache is enabled.
+* (bug 17437) Fixed incorrect link to web-based installer
+* (bug 17527) Fixed missing MySQL-specific options in installer
 
-== Changes since 1.13.0rc1 ==
+=== Configuration changes in 1.14 ===
 
+* $wgExemptFromUserRobotsControl is an array of namespaces to be exempt from
+  the effect of the new __INDEX__/__NOINDEX__ magic words.  (Default: null, ex-
+  empt all content namespaces.)
 * $wgForwardSearchUrl has been removed entirely. Documented setting since 1.4
   has been $wgSearchForwardUrl.
+* (bug 15080) $wgOverrideSiteFeed has been added. Setting either
+  $wgSiteFeed['rss'] or 'atom' to a URL will override the default Recent
+  Changes feed that appears on all pages.
+* $wgSQLiteDataDirMode has been introduced as the default directory mode for
+  SQLite data directories on creation. Note that this setting is separate from
+  $wgDirectoryMode, which applies to all normal dirs created by MediaWiki.
+* $wgGroupsAddToSelf and $wgGroupsRemoveFromSelf now work more like
+  $wgAddGroups and $wgRemoveGroups, where the user must belong to a specified
+  group in order to add or remove those groups from themselves.
+  Backwards compatibility is maintained.
+* $wgRestrictDisplayTitle controls if the use of the {{DISPLAYTITLE}} magic
+  word is restricted to titles equivalent to the actual page title. This
+  is true per default, but can be set to false to allow any title.
+* $wgSpamRegex may now be an array of multiple regular expressions.
+* $wgAjaxSearch has been removed; use $wgEnableMWSuggest instead.
+* Editing the MediaWiki namespace is now unconditionally restricted to people
+  with the editinterface right, configuring this in $wgNamespaceProtection
+  is not required.
+* $wgAllowExternalImagesFrom may now be an array of multiple strings.
+* Introduced $wgEnableImageWhitelist to toggle the on-wiki external image
+  whitelist on or off.
+* Added $wgRenderHashAppend to append some string to the parser cache and the
+  sitenotice cache keys.
+* $wgRCChangedSizeThreshold is now a positive integer by default,
+* (bug 16006) $wgEnableWriteAPI is now true by default. Authorized can perform
+  write actions using the API.
+* Added $wgRC2UDPInterwikiPrefix which adds an interwiki prefix
+  ($wgLocalInterwiki) onto the page names in the UDP feed.
+* Added $wgAllowUserSkin to let the wiki's owner disable user selectable skins
+  on the wiki. If it's set to true, then the skin used will *always* be
+  $wgDefaultSkin.
+* Added $wgEnotifUseRealName, which allows UserMailer to send out e-mails based
+  on the user's real name if one is set. Defaults to false (use the username)
+* Removed the 'apiThumbCacheDir' option from $wgForeignFileRepos (only used in
+  ForeignAPIRepo)
+* (bug 44) Image namespace and accompanying talk namespace renamed to File.
+  For backward compatibility purposes, Image still works. External tools may
+  need to be updated.
+* The constants NS_FILE and NS_FILE_TALK can now be used instead of NS_IMAGE and
+  NS_IMAGE_TALK.  The old constants are retained as aliases for compatibility,
+  and should still be used in code meant to be compatible with v1.13 or older.
+* MediaWiki can be forced to use private IPs forwarded by a proxy server by
+  using $wgUsePrivateIPs.
+* The 'BeforeWatchlist' hook has been removed due to internal changes in
+  Special:Watchlist. 'SpecialWatchlistQuery' should now be used by extensions
+  to customize the watchlist database query.
+
+
+=== Migrated extensions ===
+The following extensions are migrated into MediaWiki 1.14:
+
+* Special:DeletedContributions to show deleted user contributions (was
+  extension DeletedContributions)
+* Special:Log/newusers recording new users (was extension Newuserlog)
+* Special:LinkSearch to search for external links (was extension LinkSearch)
+* RenderHash
+* NoMoveUserPages
+* UniversalEditButton
+
+=== New features in 1.14 ===
+
+* New URL syntaxes for Special:ListUsers - 'Special:ListUsers/USER' and
+  'Special:ListUsers/GROUP/USER', in addition to the older syntax
+  'Special:ListUsers/GROUP' where GROUP is a valid group name.
+* Configurable per-namespace and per-page notices for the edit form,
+  respectively MediaWiki:Editnotice-# where # is the namespace number, and
+  MediaWiki:Editnotice-#-PAGENAME where # is the page's namespace number and
+  PAGENAME is the page name minus the namespace prefix.
+* (bug 8068) New __INDEX__ and __NOINDEX__ magic words allow user control of
+  search engine indexing on a per-article basis.
+* Handheld stylesheet options
+* Added 'DoEditSectionLink' hook as a cleaner unified version of the old
+  'EditSectionLink' and 'EditSectionLinkForOther' hooks.  Note that the
+  'EditSectionLinkForOther' hook has been removed, but 'EditSectionLink' is
+  run in all cases instead, so extensions using the old hooks should still work
+  if they ran roughly the same code for both hooks (as is almost certain).
+* Signature (~~~~) "cleaning", i.e. template removal, can be disabled with
+  $wgCleanSignatures=false
+* Extensions can use the SkinBuildSidebar hook to modify the content of the
+  sidebar and add custom portlets to it
+* Added 'MakeGlobalVariablesScript' hook for extensions to be able to add vari-
+  ables into into the output of Skin::makeVariablesScript
+* (bug 13846) Added $wgAddGroups and $wgRemoveGroups display on
+  Special:ListGroupRights
+* (bug 14377) Add a date selector to history pages
+* (bug 15007) New 'pagetitle-view-mainpage' message allows the HTML <title> of
+  the main page to be customized
+* Added $wgDisableTitleConversion to disabling the conversion for all pages on
+  the wiki
+* Added 'noconvertlink' toggle that can be set per user preferences, also
+  added 'convertlink=no|yes' on GET requests whether have the link titles
+  being converted or not
+* (bug 14921) Special:Contributions/: add user name to <title>
+  Patch by Emufarmers
+* Unescape more "safe" characters when producing URLs, for added prettiness
+* Introduced a new hook 'SkinAfterContent' that allows extensions to add text
+  after the page content and article metadata. Updated all skins and skin
+  templates to work with that hook.
+* (bug 14929) removeUnusedAccounts.php now supports 'ignore-touched' and
+  'ignore-groups'. Patch by Louperivois
+* (bug 15127) Work around minor display glitch in Opera.
+* By default, reject file uploads that look like ZIP files, to avoid the
+  so-called GIFAR vulnerability.
+* (bug 15141) Give ability to only list protected pages with the cascading
+  option enabled on Special:ProtectedPages
+* (bug 15157) Special:Watchlist has the same options as Special:Watchlist:
+  Show/Hide logged in users, Show/Hide anonymous, Invert namespace selection
+* Added hook 'UserrightsChangeableGroups' to allow modification of what
+  groups may be added or removed via the Special:UserRights interface.
+* HTML entities like &nbsp; now work (are not escaped) in edit summaries.
+* (bug 13815) In the comment for page moves, use the colon-separator message
+  instead of a hardcoded colon.
+* Allow <gallery> to accept image names without an Image: prefix
+* Add tooltips to rollback and undo links
+* BMP images are now displayed as PNG
+* (bug 13471) Added NUMBERINGROUP magic word
+* (bug 11884) Now support Flash EXIF attribute
+* Show thumbnails in the file history list, patch by User:Agbad
+* Added support of piped wikilinks using double-width brackets
+* Added an on-wiki external image whitelist. Items in this whitelist are
+  treated as regular expression fragments to match for when possibly
+  displaying an external image inline.
+* (bugs 15405, 15436) Sort more currency types correctly in sortable tables
+* (bug 15422) Sort more different types of numbers in sortable tables
+* (bug 2889) MediaWiki:Print.css applies to the printable version
+* Category counts (e.g. from {{PAGESINCATEGORY:}}) should be more accurate for
+  small categories
+* After logging in, automatically redirect to wherever you logged in from
+* (bug 5619) Break messages used in Special:Statistics down further
+* (bug 11029) Add link to Special:Listusers?group=sysop etc at
+  Special:Statistics
+* (bug 15514) Setting $wgRightsText without $wgRightsUrl now produces a
+  plaintext copyright notice. Patch by Juliano F. Ravasi.
+* (bug 15551) Deletion log excerpt is now shown whenever a user vists a
+  deleted page, even if they are unable to edit it.
+* Added Wantedfiles special pages, allowing users to find image links with no
+  image.
+* (bug 12650) It is now possible to set different expiration times for
+  different restriction types on the protection form.
+* (bug 8440) Allow preventing blocked users from editing their talk pages
+* Improved upload file type detection for OpenDocument formats
+* Added the ability to set the target attribute on external links with
+  $wgExternalLinkTarget
+* api.php now sends "Retry-After" and "X-Database-Lag" HTTP headers if the
+  maxlag check fails, just like index.php does
+* Added "link" parameter to image links, to allow images to link to an
+  arbitrary title or URL. This should replace inaccessible and incomplete
+  solutions such as CSS-based overlays and ImageMap.
+* (bug 368) Don't use caption for alt attribute; allow manual specification
+  using new "alt=" parameter for images
+* (bug 44) The {{ns:}} core parser function now also accepts localized
+  namespace names and aliases; also, its output now uses spaces instead of
+  underscores to match the behavior of the {{NAMESPACE}} magic word
+* Added the ability to display user edit counts in Special:ListUsers. Off by
+  default, enabled with $wgEdititis = true (named after the medical condition
+  marked by unhealthy obsession with edit counts).
+* Added a file cache to the parser to improve page rendering time on pages with
+  several uses of the same image.
+* (bug 1250) Users can still use "show preview" and "show changes" even if the
+  wiki is set to read-only mode.
+* Added a call to the 'UnwatchArticleComplete' hook to the watchlist editor.
+  This should make it so that ALL user-accessible methods of removing a page
+  from a watchlist lead to this hook being called (it was previously only
+  called from within Article.php
+* Maximum execution time for shell processes on linux is now configured with
+  $wgMaxShellTime (180 seconds by default)
+* (bug 1306) 'Email user' link no longer shown on user page when emailing
+  is not available due to lack of confirmed address or disabled preference
+* Special:Wanted templates special page added to display missing templates
+  linked from articles
+* Make search matches bold only, not red as well
+* (bug 10080) Blocks can be modified without unblocking first
+* (bug 15820) Special:BlockIP shows a notice if the user being blocked is
+  already directly blocked
+* (bug 13710) Allow to force "watch this" checkbox via URL using parameter
+  "watchthis"
+* (bug 15125) Add Public Domain to default options when installing. Patch by
+  Nathan Larson.
+* Set a special temporary directory for ImageMagick with $wgImageMagickTempDir
+* (bug 16113) Show/hide for redirects in Special:NewPages
+* (bug 15903) Upload link was added to Nostalgia skin
+* (bug 15761) Add user toggle to omit diff after rollback
+* Added the BitmapHandler_ClientOnly media handler, which allows server-side
+  image scaling to be completely disabled for specific media types, via the
+  $wgMediaHandlers configuration variable.
+* New 'AbortDiffCache' hook can be used to cancel the caching of a diff
+* (bug 15835) Added Content-Style-Type meta tag
+* (bug 11027)  Add parameter to MW:Randompage-nopages so that user can see the
+  namespace.
+* Add id="mw-user-domain-section" to <tr> tag in Userlogin.php template so that
+  admins with a single domain can hide the domain section using CSS
+* Dropped old Paser_OldPP class. Only new parser with preprocessor is used.
+* Moved password reset form from Special:Preferences to Special:ResetPass
+* Added Special:ChangePassword as a special page alias for Special:ResetPass
+* Added complimentary function for addHandler() called removeHandler() for removing events
+* Improved security of file uploads for IE clients, using a reverse-engineered
+  algorithm very similar to IE's content detection algorithm.
+* Cascading protection no longer requires that both edit and move are restricted
+  to sysop, just edit=sysop is enough
+* (bug 2391) A warning is now shown for invalid ISBN numbers on Special:Booksources.
+* Installer has been updated to reflect the release of the GFDL 1.3. The URL for 1.2
+  has been updated, and the 1.3 URL has been given. 1.2 is still Wikipedia-compatible.
+  RightsCode was changed from 'gfdl' to 'gfdl1_2', so we can now support 1.2 as well
+  as 1.3 (gfdl1_3).
+* (bug 16293) PD URL was changed to the CreativeCommons site on PD (which auto-detects
+  your language) instead of Wikipedia.
+* (bug 16635) The "view and edit watchlist" page (Special:Watchlist/edit) now
+  includes a table of contents
+* File objects returned by wfFindFile() are now cached by default
+* (bug 7492) Rights can now be assigned to specific IP addresses and ranges by
+  using $wgAutopromote (new defines: APCOND_ISIP and APCOND_IPINRANGE)
+* Add a 'change block' link to Special:IPBlockList and Special:Log
+* (bug 16459) Use native getElementsByClassName where possible, for better
+  performance in modern browsers
+* Enable \cancel and \cancelto in texvc (recompile required)
+* Added 'UserCryptPassword' and 'UserComparePasswords' hooks to allow extensions to implement
+  their own password hashing methods.
+* (bug 16760) Add CSS-class to action links of Special:Log
+* (bug 505) Time zones can now be specified by location in user preferences,
+  avoiding the need to manually update for DST. Patch by Brad Jorsch.
+* (bug 2585) HTTP 404 return code is now given for a page view if the page
+  does not exist, allowing spiders and link checkers to detect broken links.
+* Special:Log: Add 'change protection' link for unprotected pages too
+* Special:Log: Add log type specific CSS classes 'mw-logline-$logtype' to
+  'li' elements
+* (bug 16754) Making arbitrary rows of sortable tables sticky:
+  |- class="unsortable"
+* Show subversion too even if a "normal" version number is available
+* (bug 16121) Add a note that a page move was without creating a redirect in the
+  move log
+* Image moving is now enabled for sysops by default
+* Make "Did you mean" search feature more noticeable
+* (bug 16720) Transcluded Special:NewPages processes "/username="
+
+=== Bug fixes in 1.14 ===
+
 * (bug 14907) DatabasePostgres::fieldType now defined.
-* (bug 14966) Fix SearchEngineDummy class for silently non-functional search
-  on Sqlite instead of horribly fatal error breaky one.
-* (bug 14987) Only fix double redirects on page move when the checkbox is
-  checked
-* (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return
-  address for page update notification mails.
-* API: Registration time of users registered before the DB field was created is now
+* (bug 14659) Passing the default limit param to Special:Recentchanges no more
+  falls back to the user option
+* (bug 14954) Fix regression in Modern and Simple skins
+* Recursion loop check added to Categoryfinder class
+* Fixed few performance troubles of large job queue processing
+* Not setting various parameters in Foreign Repos now fails more gracefully
+* (bug 2333) Redirects are properly rendered when previewing an edit.
+* (bug 14972) Use localized alias of Special:Search on all search forms
+* (bug 11035) Special:Search should have descriptive <title>
+* Special pages are now not subject to special handling for "self-links"
+* (bug 15053) Syntactically incorrect redirects with another link in them
+  no longer redirect to the second link
+* (bug 15049) Fix for CheckUser extension's log search: usernames containing
+  a "-" were incorrectly turned into bogus IP range searches.
+  Patch by Max Semenik.
+* (bug 15055) Talk page notifications no longer attempt to send mail when
+  user's e-mail address is invalid or unconfirmed
+* (bug 12370) Add throttle on password attempts. Defaults to max 5 attempts in
+  5 minutes.
+* (bug 15016) 'Templates used on this page' list in view source should be
+  wrapped in a div with class "templatesUsed"
+* (bug 14868) Setting $wgFeedDiffCutoff to 0 now disables generation of the
+  diff entirely, not just the display of it.
+* (bug 6387) Introduced new setting $wgCategoryPrefixedDefaultSortkey which
+  allows having the unprefixed page title as the default category sortkey
+* (bug 15079) Add class="ns-talk" / "ns-subject" to <body>. Also added
+  ns-special to special pages.
+* (bug 15052) Skins should add their name as a class in <body>
+* (bug 14165, bug 14294) Wikimedia specific configuration in convertGrammar()
+  for several languages was removed. The settings have been put in extension
+  WikimediaMessages. Patch for Czech by Danny B.
+* (bug 15101) Displaying only bots edits in Special:Recentchanges now works
+  again
+* (bug 13770) Fixed incorrect detection of PHP's DOM module
+* (bug 14790) Export of category pages when using Category: prefix now actually
+  gives results
+* Avoid recursive crazy expansions in section edit comments for pages which
+  contain '/*' in the title
+* Fix excessive memory usage when parsing pages with lots of links
+* $wgSpamRegex now matches the edit summary and page move descriptions in
+  addition to body text.
+* Navigation links to images available from a shared repository (like Commons)
+  from their local talk pages no longer appear as redlinks
+* Action=purge on ForeignApiFiles now works (purges their thumbnails and
+  description pages).
+* (bug 15303) Title conversion for templates wasn't working in some cases.
+* (bug 15264) Underscores in Special:Search/Foo_bar parameters were taken
+  literally; now converting them to spaces per expectation.
+* (bug 15342) "Invert" checkbox now works correctly when selecting main
+  namespace in Special:Watchlist
+* (bug 15172) 'Go' button of Special:Recentchanges now on the same line as the
+  last input element (like Special:Watchlist too)
+* (bug 15351) Fix fatal error for invalid section fragments in autocomments
+* Fixed intermittent deadlock errors involving objectcache table queries.
+  Use a separate database connection for the objectcache table to avoid
+  long-lasting locks on that table.
+* Respect file restrictions in the file history list
+* (bug 15399) Odd/even classes on sortable tables' rows could be slow for large
+  tables, and have been disabled by default.
+* (bug 15482) Special:Recentchangeslinked has no longer two submit buttons
+* (bug 15292) New message notification for unregistred users now works again
+* (bug 14398) mwsuggest.js: Let width of container be configurable
+* (bug 15543) Only include user touched timestamp to generated CSS
+* (bug 15497) Removed encoding attribute from <?xml ?> tag
+* (bug 12284) Special:Preferences now sets a returnto parameter on the link to
+  Special:UserLogin. Patch by Marooned.
+* Fixed the HTTP accept language string detection length in
+  LanguageConverter.php, instead of the fixed length language codes.
+* Special:RecentChangesLinked no longer shows outgoing links for nonexistent
+  pages even if there are broken link records with source article id 0 in the
+  database
+* (bug 15598) Special:Newpages default limit uses user preference for
+  recentchanges limit instead of hardcoded 50.
+* (bug 15617) $wgFeedClassesOutputPage::getHeadLinks() respects $wgFeedClasses,
+  instead of hardcoding rss and atom. Patch by Juliano F. Ravasi.
+* (bug 14638) Special:Blockip now provides a link to the block log if the user
+  has been blocked more than 10 times. Patch by Matt Johnston.
+* (bug 12678) Skins don't show Upload link if the user isn't allowed to upload.
+* Fixed incorrect usage of DB_LAST in Special:Export. Deprecated DB_LAST.
+* (bug 15642) Blocked sysops can no longer block other users
+* Http::request() now respects $wgHTTPtimeout when not using cURL
+* (bug 15158) Userinvalidcssjstitle not shown on preview
+* (bug 15196) Free external links should be numbered in a localised manner
+* (bug 15388) Title of Special:PrefixIndex
+* Links with no title but a curid parameter now use the curid to pick a page
+* (bug 10323) Special:Undelete should have "inverse selection" button
+* (bug 15831) Modern skin RTL support is bugous
+* (bug 15869) Nostalgia skin does not show page title in printable mode
+* (bug 15795) Special:Userrights is now listed on Special:SpecialPages when the
+  user can only change his rights
+* (bug 15846) Categories "leak" from older revisions in certain circumstances
+* (bug 15928) Special pages dropdown should be inline in non-MonoBook skins
+* (bug 14178) Some uses of UserLoadFromSession hook cause segfault
+* (bug 15925) Postitive bytes added on recentchanges and watchlists are now
+  bolded if above the threshold, previously it only worked for negatives
+* Specify apple-touch-icon before favicon in HTML head section to make the
+  Konqueror browser correctly use the latter
+* (bug 15717) Set $separatorTransformTable for language 'eu'
+* (bug 15605) Enabled $datePreferences for language 'hr'. Added standard date
+  preferences.
+* (bug 13701) {{NUMBEROFVIEWS}} magic word to show number of total views.
+* (bug 5101) Image from Commons doesn't show up when searched in Wikipedia
+  search box
+* (bug 14609) User's namespaces to be searched default not updated after adding
+  new namespace
+* Purge form uses valid XHTML
+* (bug 12764) Special:LonelyPages shows transcluded pages
+* (bug 16073) Enhanced RecentChanges uses onclick handler with better fallback
+  if JavaScript is disabled
+* (bug 4253) Recentchanges IRC messages no longer include title in diff URLs
+* Allow '0' to be an accesskey.
+* (bug 8063) Use language-dependent sorting in client-side sortable tables
+* (bug 16160) Suggestions box should be resized from left for RTL wikis
+* (bug 11533) Fixed insane slowdown when in read-only mode for long periods
+  of time with CACHE_NONE (default objectcache table configuration).
+* Trying to set two different default category sort keys for one page now
+  produces a warning
+* (bug 16143) Fix redirect loop on special pages starting with lower case
+  letters
+* (bug 15737) Fix notices while expanding using PPCustomFrame
+* (bug 15544) Non-index entry points cause the "Wiki not set up" message to
+  have corrupt URLs
+* (bug 5101) Image from Commons doesn't show up when searched in Wikipedia
+  search box
+* (bug 4362) [[MediaWiki:History copyright]] no more used with most recent
+  revision when passing oldid parameter in the url
+* (bug 16265) When caching thumbs with the ForeignApiRepo, we now use the same
+  filename as the remote site.
+* (bug 8345) Don't autosummarize where a redirect was left unchanged
+* Made thumb caching in ForeignApiFile objects integrated with normal thumb
+  path naming (/thumbs/hash/file), retired 'apiThumbCacheDir' as a result.
+* (bug 5530) Consistency between character encoding in {{PAGENAMEE}},
+  {{SUBPAGENAMEE}} and {{FULLPAGENAMEE}}
+* Safer handling of non-MediaWiki exceptions -- now obeys our settings for
+  formatting and path exposure.
+* Less verbose errors from profileinfo.php when not configured
+* Blacklist redirects via Special:Filepath, hard to use.
+* Improved input validation on Special:Import form
+* Add a .htaccess to deleted images directory for additional protection
+  against exposure of deleted files with known SHA-1 hashes on default
+  installations.
+* Improved scripting safety heuristics for IE 5/6 content-type detection.
+* Improved scripting safety heuristics on SVG uploads.
+* (bug 11728) Unify layout of enhanced watchlist/recent changes
+* (bug 8702) Properly update stats when running nukePage maintenance script
+* (bug 7726) Searches for words less than 4 characters now work without
+  requiring customization of MySQL server settings
+* Honour unchecked "Leave a redirect behind" for moved subpages
+* (bug 16440) Broken 0-byte math renderings are now deleted and re-rendered
+  when page is re-parsed.
+* (bug 6100) Unicode BiDi embedding/override characters (U+202A - U+202E) are
+  now automatically removed from titles; these characters can accidentally end
+  up in copy-and-pasted titles, and, by overriding normal bidirectional text
+  handling, can lead to annoying behavior such as text rendering backwards
+* Fixed minor bug where the memcached value for how many accounts an IP had
+  created that day would be increased even if $wgAccountCreationThrottle was
+  hit. This meant if an IP hit the throttle and then the throttle was raised
+  later that day, the IP still couldn't create another account, because it
+  had marked them as having created another account, when their last account
+  creation had actually failed.
+* (bug 12647) Allow autogenerated edit summary messages to be blanked with '-'
+* (bug 16026) 'Revision-info' and 'revision-info-current' both accept wiki
+  markup now.
+* (bug 16529) Fix for search suggestions with some third-party JS libraries
+* (bug 13342) importScript() generates more consistent URI encoding
+* (bug 16577) When a blocked user tries to rollback a page, the block message
+  is now only displayed once
+* (bug 14268) SVG image sizes now extracted with proper XML parser
+* (bug 14365) RepoGroup::findFiles() no longer crashes if passed an invalid
+  title via the API
+* (bug 4253, bug 16586) Revision ID is now given instead of title in URLs for
+  new pages in the recent changes IRC feed
+* Ugly tooltips in Special:Statistics were phased out in favor of more direct
+  information. Went ahead and rewrote SpecialStatistics to subclass SpecialPage
+* (bug 5506) Links to files on foreign repositories are now shown consistently
+  as bluelinks e.g. in logs and edit summaries
+* (bug 16623) Add missing </p> tag in Special:LockDB
+* (bug 15849) Special:Movepage now throws a more specific error when trying to
+  move a title to an interwiki target
+* (bug 16638) 8-bit URL fallback encoding now set on additional languages using
+  Arabic script (Persian, Urdu, Sindhi, Punjabi)
+* (bug 16656) cleanupTitles and friends should now work in load-balanced
+  DB environments when $wgDBserver isn't set.
+* (bug 3691) Aspect ratio from viewBox attribute is now preserved for SVG
+  images which do not specify width and height attributes.
+* (bug 15027) Internet domain names and IP addresses can now be indexed and
+  searched sensibly with the default MySQL search backend.
+* (bug 11733) Fixed parameter validation in importTextFile.php
+* (bug 16712) Special:NewFiles updated to use "newer"/"older" paging messages
+  for clarity over "previous/next"
+* (bug 16612) Fixed "noprint" class for Modern skin print style
+* Section anchors now have an "id" attribute as well as a "name" attribute,
+  even when Tidy is not used
+* (bug 16026) revision-info, revision-info-current, cannotdelete,
+  redirectedfrom, historywarning and difference messages now use Wiki text
+  rather than raw HTML markup
+* (bug 13835) Fix rendering of {{filepath:Wiki.png|nowiki}}
+* (bug 16772) Special:Upload now correctly rejects files with spaces in the
+  file extension (e.g. Foo. jpg).
+* Image moving over an existing file no longer throws a database error
+* (bug 16786) Restored "redundant" links recently removed from Classic sidebar
+* (bug 16850) $wgActionPaths can have query strings now, previously, this broke
+  local URLs
+* (bug 16376) Mention in deleteBatch.php and moveBatch.php maintenance scripts
+  that STDIN can be used for page list
+* (bug 16560) Special:Random returns a page from ContentNamespaces, and no
+  longer from NS_MAIN
+* (bug 16123) Fixed Special:Import on SQLite.
+* (bug 16937) Show appropriate error message for attempted installs on 
+  PostgreSQL 7.3 or earlier.
+* Disabled SQLite support in the installer.
+* Fixed XSS vulnerabilities in the web-based installer.
+* Added a meta robots tag to the installer to prevent indexing of potentially 
+  sensitive configuration data.
+* (bug 16483) Prevented a filesort in ApiQueryBacklinks caused by missing parentheses.
+  Building query properly now using makeList()
+
+=== API changes in 1.14 ===
+
+* Registration time of users registered before the DB field was created is now
   shown as empty instead of the current time.
-* (bug 14904): fragments were lost when redirects were fixed.
-* Added magic word __STATICREDIRECT__ to suppress the redirect fixer
-* (bug 15035) Revert English linkTrail to /^([a-z]+)(.*)$/sD, as it was before 
-  r36253. Multiple reports of breakage due to old (pre-5.0) PCRE libraries, 
-  both bundled with PHP and packaged with distros such as RHEL. 
-* (bug 14944) Shell invocation of external programs such as ImageMagick convert 
-  was broken in PHP 5.2.6, if the server had a non-UTF-8 locale.
-
-== Changes since 1.12 ==
-
-=== Configuration changes in 1.13 ===
-
-* New option $wgFeed can be set false to turn off syndication feeds
-* (bug 5745) Special:Whatlinkshere now shows up to $wgMaxRedirectLinksRetrieved
-  links through each redirect instead of hardcoded 500
-* Set $wgUploadSizeWarning to false by default
-* Added $wgLBFactoryConf, for generic configuration of multi-master wiki farms
-* Removed $wgAlternateMaster, use $wgLBFactoryConf
-* (bug 13562) Misspelled option $wgUserNotifedOnAllChanges changed to
-  $wgUserNotifiedOnAllChanges
-* (bug 12860) New option $wgSitemapNamespaces allows sitemaps to be generated
-  for only some namespaces
-* Removed the emailconfirmed implicit group by default. To re-add it, use:
-    $wgAutopromote['emailconfirmed'] = APCOND_EMAILCONFIRMED;
-  in your LocalSettings.php.
-* (bug 2396) New shared database configuration variables. $wgSharedPrefix allows
-  you to use a shared database with a different prefix. Or you can now use a local
-  database and use prefixes to separate wiki and the shared tables. And the new
-  $wgSharedTables variable allows you to specify a list of tables to share.
-* Automatic edit summaries can be disabled with $wgUseAutomaticEditSummaries  
-* Duplicates of images are now shown on the image page
-* $wgRCFilterByAge allows for the list of dates in recent changes special pages to
-  be filtered to only those within the range of $wgRCMaxAge
-* $wgRCLinkLimits and $wgRCLinkDays allow for customization of the list and limits
-  displayed on the recent changes special pages
-* The "createpage" permission is no longer required when uploading if the target
-  image page already exists
-* $wgMaximumMovedPages restricts the number of pages that can be moved at once
-  (default 100) with the new subpage-move functionality of Special:Movepage
-* Hooks display in Special:Version is now disabled by default, use 
-  $wgSpecialVersionShowHooks = true; to enable it.
-* $wgActiveUserEditCount sets the number of edits that must be performed over
-  a certain number of days to be considered active
-* $wgActiveUserDays is that number of days
-* $wgRateLimitsExcludedGroups has been deprecated in favor of 
-  $wgGroupPermissions[]['noratelimit']. The former still works, however.
-* New $wgGroupPermissions option 'move-subpages' added to control bulk-moving
-  subpages along with pages.  Assigned to 'user' and 'sysop' by default.
-* New $wgRC2UDPOmitBots allows user to omit bot edits from UDP output. 
-  Default: false
-* Removed $wgEnableCascadingProtection option. Disabling cascading protection
-  is no longer possible. 
-* $wgMessageCacheType defines now the type of cache used by the MessageCache class,
-  previously it was choosen based on $wgParserCacheType
-* $wgExtensionAliasesFiles option to simplify adding aliases to special pages
-  provided by extensions, in a similar way to $wgExtensionMessagesFiles
-* Added $wgXMLMimeTypes, an array of XML mimetypes we can check for
-  with MimeMagic.
-* Added $wgDirectoryMode, which allows for setting the default CHMOD value when
-  creating new directories.
-* (bug 14843) $wgCookiePrefix can be set by LocalSettings now, false defaults 
-  current behavior.
-
-=== New features in 1.13 ===
-
-* __HIDDENCAT__ on a category page causes the category to be hidden on the
-  article page
-* Do not show edit permissions errors on a red link click, just redirect to the
-  article. This is so that readers who don't know what a red link is are not
-  confused when they are told they are range-blocked.
-* Add a new hook ImageBeforeProduceHTML to allow extensions to modify wikitext
-  image syntax output
-* (bug 13100) Added 'preloadtitle' parameter to action=edit&section=new that
-  pre-fills the section title field
-* (bug 13112) Added Special:RelatedChanges alias to Special:RecentChangesLinked
-* (bug 13130) Moved edit token and autosummary fields above edit tools to
-  reduce broken form submissions
-* Add --old-redirects-only option to maintenance/refreshLinks.php, to add old
-  redirects to the redirect table
-* Add links to page and file deletion forms to edit predefined delete reasons 
-* (bug 13269) Added MediaWiki:Uploadfooter to the bottom of Special:Upload
-* (bug 2815) Search results for media now use thumbnail instead of text extract
-* When a page doesn't exist, the tab should say "create", not "edit"
-* (bug 12882) Added a span with class "patrollink" around "Mark as patrolled"
-  link on diffs
-* Magic word formatnum can now take raw suffix to undo formatting
-* Add updatelog table to reliably permit updates that don't change the schema
-* Add category table to allow better tracking of category membership counts
-** (bug 1212) Give correct membership counts on the pages of large categories
-** Use category table for more efficient display of Special:Categories
-* (bug 1459) Search for duplicate files by hash: Special:FileDuplicateSearch
-* (bug 9447) Added hooks for search result headings
-* Image redirects are now enabled by default
-* (bug 13450) Email confirmation can now be canceled before the expiration
-* (bug 13490) Show upload/file size limit on upload form
-* Redesign of Special:UserRights
-* Make rev_deleted log entries more intelligible
-* (bug 6943) Added PAGESINCATEGORY: magic word
-* (bug 13604) Added Special:ListGroupRights
-* (bug 6332, 8617) Added message 'mainpage-description' as duplicate of
-  'mainpage' and added it to message 'sidebar'
-* Automatically add old redirects to the redirect table when needed
-* (bug 6934) Allow inclusions, links, redirects to be separately toggled on or
-  off on Special:WhatLinksHere
-* Cache image redirects
-* (bug 10457) Organize Special:SpecialPages into sections
-* Add a new hook EditPageBeforeConflictDiff to allow extensions like FCKeditor
-  to modify the output for edit conflicts
-* Add class="nested" for <fieldset>s so fieldsets inside fieldsets get
-  a slightly less huge margin and padding
-* (bug 13527) Use sitemaps.org format 0.9 instead of a Google-specific format
-* Allow \C and \Q as TeX commands to match \R, \N, \Z
-* On Special:UserRights, when you can add a group you can't remove or remove
-  one you can't add, a notice is printed to warn you
-* (bug 12698) Create PAGESIZE parser function, to return the size of a page
-* Allow the "log in / create account" link in the toolbar to have different
-  text from Special:UserLogin title (new message 'nav-login-createaccount')
-* Say "log in / create account" if an anonymous user can create an account,
-  otherwise just "log in", consistently across skins
-* Special:Shortpages and Special:Longpages now returns pages in all content 
-  namespaces, not just NS_MAIN.
-* (bug 889) Improve conflict-handling between shared upload repository
-  and local one
-* Update documentation links in auto-generated LocalSettings.php
-* (bug 13584) The new hook SkinTemplateToolboxEnd was added.
-* (bug 709) Cannot rename/move images and other media files [EXPERIMENTAL]
-* Custom rollback summaries now accept the same arguments as the default message
-* (bug 12542) Added hooks for expansion of Special:Listusers
-* Drop-down AJAX search suggestions (turn on $wgEnableMWSuggest) 
-* More relevant search snippets (turn on $wgAdvancedSearchHighlighting)
-* (bug 13950) Allow users to watch the user/talk pages of users they block.
-* (bug 13970) Allow MonoBook-based skins to specify their own print stylesheet
-* Show image links on Special:Whatlinkshere
-* Use rel="start", "prev", "next" appropriately on Pager-based pages
-* Add support for SQLite
-* AutoAuthenticate hook renamed to UserLoadFromSession
-* (bug 13232) importScript(), importStylesheet() funcs available to custom JS
-* (bug 13095) Search by first letters or digits in [[Special:Categories]]
-* Users moving a page can now move all subpages automatically as well
-* (bug 14259) Localisation message for upload button on Special:Import is now
-  'import-upload' instead of 'upload'
-* Add information about user group membership to Special:Preferences
-* (bug 14146) Wrap usage section on imagepages into <div>s.
-* New layout for Special:Specialpages. Restricted pages are marked but not separated
-  from other pages in their group.
-* (bug 14263) Show a diff of the revert on rollback notification page.
-* (bug 13434) Show a warning when hash identical files exist
-* Sidebar is now cached for all languages
-* The User class now contains a public function called isActiveEditor. Figures
-  out if a user is active based on at least $wgActiveUserEditCount number of
-  edits in the last $wgActiveUserDays days.
-* SpecialSearchResults hook now passes results by reference, so they can be
-  changed by extensions.
-* Add a new hook LinkerMakeExternalLink to allow extensions to modify the output of
-  external links.
-* (bug 14132) Allow user to disable bot edits from being output to UDP. 
-* (bug 14328) jsMsg() within Wikibits now accepts a DOM object, not just a string  
-* (bug 14558) New system message (emailuserfooter) is now added to the footer of 
-  e-mails sent with Special:Emailuser
-* Add support for Hijri (Islamic) calendar
-* Add a new hook LinkerMakeExternalImage to allow extensions to modify the output
-  of external (hotlinked) images.
-* (bug 14604) Introduced the following features for the LanguageConverter:
-  Multi-tag support, single conversion flag, remove conversion flag on a single
-  page, description flag, variant name, multi-variant fallbacks.
-* Add zh-mo and zh-my variants for the zh language
-* (bugs 4832, 9481, 12890) Special:Recentchangeslinked now has all options that
-  are in Special:Recentchanges
-* Allow an $error message to be passed to ArticleDelete hook
-* Allow extensions to modify the user creation form by calling addInputItem();
-* Add meta generator tag to HTML output
-* MediawikiPerformAction hook is now passed the Mediawiki object
-* Added blank special page Special:BlankPage for benchmarking, etc.
-* Foreign repo file descriptions and thumbnails are now cached.
-* (bug 11732) Allow localisation of edit button images
-* Allow the search box, toolbox and languages box in the Monobook sidebar to be
-  moved around arbitrarily using special sections in [[MediaWiki:Sidebar]]: 
-  SEARCH, TOOLBOX and LANGUAGES
-* Add a new hook NormalizeMessageKey to allow extensions to replace messages before
-  the database is potentially queried
-* (bug 9736) Redirects on Special:Fewestrevisions are now marked as such.
-* New date/time formats in Cs localization according to ÄŒSN and PÄŒP.
-* Special:Recentchangeslinked now includes changes to transcluded pages and
-  displayed images; also, the "Show changes to pages linked" checkbox now works on
-  category pages too, showing all links that are not categorizations
-* (bug 4578) Automatically fix redirects broken by a page move 
-
-=== Bug fixes in 1.13 ===
-
-* (bug 10677) Add link to the file description page on the shared repository
-* (bug 13084) Increase size of source/destination filename fields in upload form
-* (bug 13115) rebuildrecentchanges should print the current value of $wgRCMaxAge
-* (bug 13140) Show parent categories in category namespace
-* (bug 13149) Correctly format 'fileexists' message on Upload page
-* Make the default filepageexists message accurate
-* (bug 12988) $wgMinimalPasswordLength no longer breaks create user by email
-* (bug 13022) Fix upload from URL on PHP 5.0.x
-* (bug 13132) Unable to unprotect pages protected with earlier versions of MediaWiki
-* (bug 12723) OpenSearch description name now uses more compact language code
-  to avoid passing the length limit as often, is customizable per site via
-  'opensearch-desc' message.
-* (bug 13135) Special:Userrights now passes IDs through form submission
-  to allow functionality on not-quite-right usernames
-* (bug 12575) Prevent duplicate patrol log entries from being created
-* (bug 13174) __HIDDENCAT__ now applies only to category pages
-* (bug 13031) Add links to user pages in e-mail form
-* (bug 13147) Description for categoriespagetext (used in Special:Categories) reworded
-* (bug 11561) Fix fatal error when calling action=revert to non-image page
-* (bug 12430) Fix call to private method LinkFilter::makeRegex fatal error in
-  maintenance/cleanupSpam.php
-* All skins should have the "mediawiki" class on the body element
-* (bug 13019) Message cache for some extensions not loaded at time of editing
-* (bug 13247) Prettified ISBN links
-* maintenance/refreshLinks.php did not fix page_id 1 with the --new-only option
-* (bug 13110) Don't show "Permission error" page if the edit is already rolled
-  back when using rollback
-* (bug 13012) Use content messages for block options when generating the
-  recentchanges entry
-* (bug 13274) Change links for messages to ucfirst
-* (bug 13273) Un-hardcode some punctuation (add new messages colon-separator,
-  autocomment-prefix)
-* Parse MediaWiki message translations with a correct language setting on preview
-* (bug 13281) Treat X-Forwarded-For, Client-ip and User-Agent headers as
-  case-insensitive names.
-* Adding the fix for lists in RTL wikis to more skins, and fixing the image toc
-* (bug 8157) Remove redirects from Special:Unusedtemplates. Patch by WebBoy.
-* (bug 10721) Duplicate section anchors with differing case now disambiguated
-  for Internet Explorer's sake and standards compliance
-* (bug 13298) Tighter limits on Special:Newpages limits when embedding
-* Email subject in content language instead of sending user's UI language
-* (bug 13251) Allow maintenance rebuild scripts to work with Postgres
-* (bug 2084) Fixed incorrect regex to match redirects
-* (bug 3131) Manually-specified upload destination filename is no longer
-  overwritten by browsing for a file after you wrote it.
-* (bug 7251) Sidebars generated by MediaWiki:Sidebar now have the class
-  'generated-sidebar'.
-* (bug 13265) Media handler is missing 'image/x-bmp'
-* (bug 13407) MediaWiki:Powersearch is used in two places
-* (bug 13403) Fix cache invalidation of history pages when old revisions change
-* (bug 11563) Deprecated SearchMySQL4 class; merged code to SearchMySQL
-* (bug 12801) Fix link in subtitle message in AJAX search
-* (bug 13428) Fix regression in protection form layout HTML validity
-* (bug 9403) Sanitize newlines from search term input
-* (bug 13429) Separate date and time in message sp-newimages-showfrom
-* (bug 13137) Allow setting 'editprotected' right separately from 'protect', 	 
-  so groups may optionally edit protected pages without having 'protect' perms
-* Disallow deletion of big pages by means of moving a page to its title and
-  using the "delete and move" option.
-* (bug 13466, 13632) White space differences not shown in diffs
-* (bug 1953) Search form now honors namespace selections more reliably
-* (bug 12294) Namespace class renamed to MWNamespace for PHP 5.3 compatibility
-* PHP 5.3 compatibility fix for wfRunHooks() called with no parameters
-* (bug 6447) Trackbacks now work with transactional tables, if enabled
-* (bug 6892, 7147) Trackback error handling, optional fields more robust
-* (bug 6813) Don't break HTML validator when using trackbacks
-* Fix for size checks on SVG images with global 'stroke-width' attribute
-* (bug 11874) Inline CSS with !important no longer borken
-* (bug 1600) Strip extra == section markup == in new-comment field
-* (bug 11325) Wrapped page titles in MonoBook skin spaced more nicely
-* (bug 12077) Fix HTML nesting for TOC
-* (bug 344) Purge cache for talk/article pages when deleting the other tab
-* (bug 13436) Treat image captions correctly when they include option keywords
-  (like ending with "px" or starting with "upright")
-* Trackback display formatting fixed
-* Don't die when single-element arrays are passed to SQL query constructors
-  that have an array index other than 0
-* (bug 13522) Fix fatal error in Parser::extractTagsAndParams
-* (bug 13532) Use proper timestamp call when reverting images
-* (bug 13543) Updated FAQ link in the installer sidebar
-* (bug 13540) Date format in confirmation e-mail now matches message language
-* (bug 13554) PHP Notice in old pre-processor when list item is empty.
-* (bug 13556) Don't show a blank form if no image is attached in Special:Upload
-* (bug 13576) maintenance/rebuildrecentchanges.php fails
-* (bug 13441) Allow Special:Recentchanges to show bots only
-* (bug 13431) Show true message source in Special:Allmessages&ot=php / xml
-* (bug 13463) Login successful page doesn't use user's preferred interface language
-* (bug 13630) Fixed warnings for pass by reference at call time in
-  Special:Revisiondelete when generating the log entry.
-* (bug 12064) BeforePageDisplay hook is now called for all skins
-* (bug 13624) Fix regression with manual thumb= parameter on images
-* (bug 11039) Add missing labels on protection form
-* (bug 13458) Preview/edit toolbar spacing now works consistently
-* (bug 13433) Fix action=render on Image: pages
-* (bug 13678) Fix CSS validation for Monobook
-* (bug 13684) Links in Special:ListGroupRights should be in content language
-* (bug 13690) Fix PHP notice on accessing some URLs
-* Hide (undo) link if user isn't able to edit page
-* Invalidate cache of pages that includes images via redirects on upload
-* (bug 13705) Don't show rollback link in page history on incorrect revisions
-* (bug 13708) Don't set "Search results" title when loading Special:Search
-  without query
-* (bug 13736) Don't show MediaWiki:Anontalkpagetext on non-existant IP addresses
-* (bug 13728) Don't trim initial whitespace during section edits
-* (bug 13727) Don't delete log entries from recentchanges on page deletion
-* (bug 13752) Redirects to sections now work again
-* (bug 13725) Upload form watch checkbox state set correctly with wpDestFile
-* (bug 13756) Don't show the form and navigation links of Special:Newpages if
-  the page is included
-* When hiding things on WhatLinksHere, generated URLs should hide them too
-* Properly escape search terms with regex chars so they appear highlighted in
-  search results
-* (bug 13768) pt_title field encoding fixed
-* Do not display empty columns on Special:UserRights if all groups are
-  changeable or all unchangeable
-* Fix fatal error on calling PAGESINCATEGORY with invalid category name
-* (bug 13793) Special:Whatlinkshere filters wrong - after paginating instead of before
-* (bug 13796) Show links to parent pages even if some of them are missing
-* (bug 13816) Filter by main namespace doesn't work on WhatLinksHere
-* (bug 13822) Fatal error on some pages when calculating subpage subtitle
-* (bug 13824) AJAX search suggestion now works with non-SkinTemplate skins
-* Added 'application/x-dia-diagram' MediaWiki's known MIME types
-* (bug 13866) skins/common/shared.css - invalid attribute fixing
-* Hide edit section links on Special:Undelete
-* (bug 13860) Fix "Justify paragraphs" option for Modern skin
-* (bug 13168) accessibility links in Modern skin link to wrong anchor id
-* (bug 13185) No line break after 'subpages' class in Modern skin
-* (bug 13583) No "poweredby" in Modern skin
-* (bug 13880) "Printable" link in Modern skin now formats as print mode
-* (bug 13885) Bump default $wgSVGMaxSize from 1024 to 2048 pixels
-* (bug 13891) Show categories box even if all categories are hidden and user has
-  "show hidden categories" option on
-* (bug 13915) Undefined variable $wltsfield in includes/SpecialWatchlist.php
-* (bug 13913) Special:Whatlinkshere now has correct HTML markup
-* (bug 13905) Blacklist Mac IE from HttpOnly cookies; it eats them sometimes
-* (bug 13922) Fix bad HTML on empty Special:Prefixindex and Special:Allpages
-* (bug 13924) Fix bad HTML on power search form
-* (bug 13820) Fix updater for rev_parent_id population
-* (bug 13925) Fix bad HTML on search results list
-* (bug 13934) Fixing the link to GNU General Public License Version 2
-* Show correct accesskey prefix for Firefox 3 beta (Alt-Shift-, not Alt-)
-* (bug 13949) Special:PrefixIndex/AllPages paging links contain invalid XML
-* (bug 13770) Use Preprocessor_Hash by default to avoid missing DOM module errors
-* (bug 13982) Disable ccmeonemails preference when user-to-user mails disabled
-* (bug 13615) Update case mappings and normalization to Unicode 5.1.0
-  Note that case mappings will only be used if mbstring extension is not present.
-* (bug 14044) Don't increment page view counters on views from bot users
-* (bug 14042) Calling Database::limitResult() misplaced the comment in the log file
-* (bug 14047) Fix regression in installer which hid DB-specific options
-  Also makes SQLite path configurable in the installer.
-* (bug 13546) Follow image redirects on image page
-* (bug 12644) Template list on edit page now sorted on preview
-* (bug 14058) Support pipe trick for namespaces and interwikis with "-"
-* Message name filter on Special:Allmessages now case-insensitive
-* (bug 13943) Fix image redirect behaviour on image pages
-* (bug 14093) Do 'sysop' => 'protect' magic in Title::isValidMoveOperation
-* (bug 14063) Power search form missing <label> for redirects check
-* (bug 14111) Similar filename warning links now lead to correct page
-* (bug 14082) Fix for complex text input vs AJAX suggestions on some browsers
-* (bug 13693) Categories sometimes claim to have a negative number of members
-* (bug 1701) Korean Hangul syllables now broken down properly in Category lists
-  even if the wiki's overall content language is not Korean
-* (bug 12773) addOnloadHook() now calls functions immediately when scripts are
-  loaded after the primary page completion, instead of dropping them
-* (bug 14199) Fix deletion form for image redirect pages
-* (bug 14220) Disabling $wgCheckFileExtensions now works without also
-  disabling $wgStrictFileExtensions
-* (bug 14241) Pages can no longer be protected to levels you are not in
-* (bug 14296) Fix local name of ang: (Anglo-Saxon)
-* (bug 4871) Hardcoded superscript in time zone preferences moved to message
-* (bug 6957) E-mail confirmation links now using English special page name
-  for better compatibility and keeping the links shorter. Avoids problem
-  with corrupt links in Gmail on IE 6.
-* (bug 14273) Fix for HTTP Accept header parsing with spaces as from Konqueror
-* (bug 14312) Update LanguageKaa.php for handling transform issues with i to Ä°
-  and I to ı
-* (bug 13826) MediaWiki:Defaultns accepts Wikicode
-* (bug 14324) Creating an account is again possible with $wgEmailConfirmToEdit
-  set to true
-* (bug 13034) Interwiki pages can now be reached using Go search button
-* (bug 14362) Change interwiki names of Erzya and Moksha Wikipedias
-* (bug 14370) When a grouppage-x message does not exist the entry on the
-  ListGroupRights special page now links to the project namespace page for it,
-  not the main namespace page.
-* (bug 11659) Urldecode image names in galleries
-* (bug 14258, 14368) Fix for subpage renames in replication environments
-* (bug 14367) Failed block no longer adds phantom watchlist entry
-* (bug 14385) "Move subpages" option no longer tries to move to invalid titles
-* (bug 14386) Fix subpage namespace oddity when moving a talk page
-* (bug 11771) Signup form now not shown if in read-only mode.
-* (bug 12859) $wgRateLimitsExcludedGroups has been deprecated in favor of
-  $wgGroupPermissions[]['noratelimit']. 
-* (Bug 13828) Split parameter $1 of MediaWiki:Missingarticle into $1 (=title)
-  and $2 (=revision numbers)
-* (bug 14401) Fix Safari access key tooltips for Windows and >3.1 Mac versions
-* (bug 14432) Fix notice regression in Special:Newpages feed mode
-* (bug 11951) EditPage::getEditToolbar() is now static.
-* (bug 14392) Fix regression breaking table prefix in installer
-* (bug 11084) $wgDBprefix replacement for updater SQL will now work for
-  extension tables using uppercase letters or digits in their names.
-* (bug 12311) Fix regression with lists at start of undeletion preview
-* (bug 14496) Fix regression with parseinline on Special:Upload.
-* We no longer just give up on a missing upload base directory; it's now
-  created automatically if we have sufficient permissions!
-* (bug 14479) MediaWiki:upload-maxfilesize should have a div id wrapper
-* (bug 14497) Throw visible errors in installer scripts when SQL files
-  fail due to database permission or other error
-* (bug 14500) Site feed (Recentchanges) no longer shows up on the actual
-  recent changes page.
-* (bug 14511) MediaWiki:Delete-legend is no longer double escaped
-* Generate correct section anchors for numeric headers
-* (bug 14520) Don't load nonexistent CSS files for Chick/Myskin/Simple skins
-* (bug 14551) Cancel upload no longer automatically suppresses warnings
-* (bug 13878) Deprecate Article::getDB() in favor of direct wfGetDB() calls
-* (bug 4977) Fix for possible squid purging errors when using HTTP purges
-  and multiple servers
-* (bug 14572) Redirects listed on file links on image pages no longer redirect.
-* (bug 14537) Change interwiki name for Old Church Slavonic (cu)
-* (bug 14583) Fix regression in recent changes "limit to certain categories."
-* (bug 14515) HTML nesting cleanup on edit form
-* (bug 14647) Removed unused 'townBox' CSS classes
-* (bug 14687) OutputPage::addStyle() now adds type="text/css" like it should.
-* OpenSearch cleanup; Firefox now sends you to the search page for empty
-  searches instead of the domain root (which may not even be a wiki).
-* (bug 3481) Pages moved shortly after creation are shown at their new title
-  on Special:Newpages.
-* (bug 12716) Trying to unprotect a title that isn't protected no longer 
-  generates a log entry.
-* (bug 14088) Excessively long block expiry times are rejected as invalid,
-  keeps the log page from being distorted.
-* (bug 14708) Emulate INSERT...IGNORE with standard SQL for Postgres backend.
-* (bug 14646) Fix some double-escaping of HTML in feed output
-* (bug 14709) Fix login success message formatting when using cookie check
-* (bug 14710) Remove "donate" link from default sidebar
-* (bug 14745) Image moving works on sites that transform thumbnails via 404
-* (bug 2186) Document.write() in wikibits caused failures when using
-  application/xhtml+xml. The calls to this have been removed.
-* (bug 14764) Fix regression in from Article::lastModified(), failed to work
-  on non-mySQL schemas.
-* (bug 14763) Child classes of Database (DatabasePostgres and DatabaseOracle)
-  had stict standards issues with setFakeSlaveLag() and setFakeMaster().
-* (bug 451) Improve the phrase mappings of the Chinese converter arrays.
-* (bug 12487) Rights log is not fully internationalized
-* (bug 10837) Language variants no longer override other languages than base
-* (bug 14778) 'limit' parameter now applies to history feeds as well as
-  history pages
-* (bug 14845) Bug in prefs javascript: Calling an array item without checking
-  its existance.
-* Accesskeys for minor edit/watch checkboxes on edit now work in Firefox 3
-* (bug 12384) Comments in maintenance/*php
-* (bug 12441) ./maintenance/generateSitemap.php fix -fspath requiring
-  a trailing slash.
-* (bug 12568) configuration script now produce valid XHTML.
-* The accesskey to edit a page is now disabled when editing the page, to pre-
-  vent conflicts with Safari shortcuts.
-
-=== API changes in 1.13 ===
-
-* Fixing main page display in meta=siteinfo
-* (bug 13128) Added patrolled flag to list=recentchanges
-* Implemented {bl,ei,iu}redirect (lists links through redirects as well)
-* (bug 13154) Introduced subpages flag to meta=siteinfo&siprop=namespaces
-* (bug 13157) Added ucuserprefix parameter to list=usercontibs
-* (bug 12394) Added rctitles parameter to list=recentchanges, making rcid
-  retrieval easier
-* (bug 13218) Fix inclusion of " character in hyperlinks
-* Added watch and unwatch parameters to action=delete and action=move
-* Added action=edit
-* (bug 11401) Added xmldoublequote to xml formatter
-* Added rvsection parameter to prop=revisions to allow fetching the content of
-  a certain section only
-* Introduced list=allimages
-* (bug 13371) Build page set from image hashes
-* Mark non-existent messages in meta=allmessages as missing
-* (bug 13390) One invalid title no longer kills an entire API query
-* (bug 13419) Fix gblredirect so it actually works
-* (bug 13418) Disable eiredirect because it's useless
-* (bug 13395) list=allcategories should use category table
-* (bug 13442) Missing pages in prop=langlinks and prop=extlinks are now 
-  handled properly.
-* (bug 13444) Add description to list=watchlist
-* (bug 13482) Disabled search types handled properly
-* Added inprop=talkid,subjectid to prop=info
-* Added help text message that specifies whether a module is POST-only
-* Added createonly parameter to action=edit
-* Replaced $wgAPIUCUserPrefixMinLength by the more generic $wgAPIMaxDBRows
-* (bug 11719) Remove trailing blanks in YAML output.
-* (bug 13541) Added siprop=specialpagealiases to meta=siteinfo
-* Added fallback8bitEncoding and readonly fields to 
-  meta=siteinfo&siprop=general output
-* (bug 13544) Added prop=revid to action=parse
-* (bug 13603) Added siprop=usergroups to meta=siteinfo
-* Cleaned up redirect resolution
-* Added possibility to obtain all external links through list=exturlusage
-* (bug 13606) Added archivename to iiprop
-* (bug 11633) Explicitly convert redirect titles to strings due to PHP's
-  very weak typing on array keys.
-* (bug 12136) Extend allowed characters in JSON callback to ][.'"_A-Za-z0-9
-* (bug 11673) Return error 'unknown_action' in specified format
-* (bug 13618) Added rcprop=redirect and rcshow=redirect to list=recentchanges
-* (bug 13544) Added oldid parameter to action=parse to allow for parsing of old
-  revisions
-* (bug 13718) Return the proper continue parameter for cmsort=timestamp
-* action=login now returns the correct waiting time in the details property
-* (bug 13792) Broken titles are now silently skipped in search results.
-* (bug 13819) exturlusage paging skipped an item
-* Fixed handling of usernames containing spaces in list=block
-* (bug 13836) Fixed fatal errors resulting from combining iiprop=metadata with
-  format=xml
-* (bug 13735) Added prop=categoryinfo module
-* (bug 13945) Retrieve cascading protection sources via inprop=protection
-* (bug 13965) Hardcoded 51 limit on titles is too limiting
-* (bug 13993) apfrom doesn't work with apdir=descending
-* (bug 14018) Introduced alcontinue to list=alllinks to improve paging
-* (bug 14013) Added rcshow=patrolled to list=recentchanges
-* (bug 14028) Added language attribute to interwiki map in meta=siteinfo
-* (bug 14022) Added usprop=registration and auprop=blockinfo
-* (bug 14021) Removed titles= support from list=backlinks (has been obsolete 
-  for ages)
-* (bug 13829) Expose parse tree via action=expandtemplates
-* (bug 13606) Allow deletion of images
-* Added iiprop=mime and aiprop=metadata
-* Handled unrecognized values for parameters more gracefully
-* Handled requesting disallowed tokens more gracefully
-* (bug 14140) URL-encoded page titles are now decoded in edit summaries
-* (bug 14243) Only accept post requests in action=edit; patch by HardDisk
-* action=block now returns an ISO8601 timestamp, like all other modules do
-* Added md5 parameter to action=edit
-* (bug 14335) Logging in to unified account using API not possible
-* Added action=emailuser to send an email to a user
-* (bug 14471) Use HTMLTidy and generate limit report in action=parse
-* (bug 14459) Added prependtext and appendtext parameters to action=edit
-* (bug 14526) Unescaped SQL in list=backlinks
-* Added 'hidden' flag to list=allcategories and prop=categoryinfo output
-* Added nocreate parameter to action=edit
-* (bug 14402) Added maxage and smaxage parameters to api.php
-* Added bkip parameter to list=blocks
-* (bug 14651) apprefix and similar parameters are now canonicalized
-* Added clprop=timestamp to prop=categories
-* (bug 14678) API errors now respects $wgShowExceptionDetails and 
-  $wgShowSQLErrors
-* (bug 14723) Added time zone and writing direction to meta=siteinfo
-* Added APIQueryInfoTokens and APIQueryRevisionsTokens hooks so extensions
-  can add their own tokens
-* Added block and unblock tokens to prop=info as well
-* Added paging (limit and continue parameters) to
-  prop={links,templatelinks,langlinks,extlinks,categories,images}
-* Added flag "top" to list=usercontribs if the user is the last contributor to
-  the page
-* list=exturlusage in "list all links" mode can now filter by protocol
-
-=== Languages updated in 1.13 ===
+* API search now falls back to fulltext search by default when using Lucene
+  or other engine which doesn't support a separate title search function.
+  This means you can use API search on Wikipedia without explicitly adding
+  &srwhat=text to the query.
+* Added iiprop=bitdepth to imageinfo and aiprop=bitdepth to allimages
+* (bug 14713) API-specific permissions (such as 'writeapi' and 'apihighlimits'
+  are now listed on action=help
+* (bug 15044) Added requestid parameter to api.php to facilitate distinguishing
+  between requests
+* (bug 15048) Added limit field for multivalue parameters to action=paraminfo
+  output.
+* When the limit on multivalue parameters is exceeded, a warning is issued
+* list=search doesn't list missing pages any more
+* (bug 15178) Added clshow to prop=categories to allow filtering for hidden/
+  non-hidden categories
+* (bug 15228) Combining revids= and redirects now throws a warning instead of
+  an error, and still resolves redirects generated by the generator.
+* list={backlinks,embeddedin,imageusage} now return arrays with keys 0, 1, 2,
+  etc. (AKA lists) instead of arrays with pageIDs as keys (AKA hash tables)
+  for consistency with other list modules.
+* Added action=watch
+* (bug 15275) apprefix and related parameters ignore spaces at the end
+* action=edit no longer throws unknown error 228  when trying to create an
+  empty section with section=new
+* Database replication lag doesn't cause all action=edit requests to return the
+  nochange flag any more
+* (bug 15392) ApiFormatBase::formatHTML now uses $wgUrlProtocols.
+* (bug 15444) action=edit returns "Unknown error: ``AS_END''" where it should
+  return just "Unknown error"
+* (bug 15448) YAML output returns empty values instead of 0
+* (bug 15445) Added action=patrol
+* (bug 15466) Added action=purge
+* (bug 15486) action=block ignores autoblock parameter
+* (bug 15492) added rcprop=loginfo to list=recentchanges
+* (bug 15527) action=rollback can now revert anonymous editors
+* (bug 15535) prop=info&inprop=protection doesn't list pre-1.10 protections
+  if the page is also protected otherwise (1.10+ style or cascading)
+* list=random now has rnredirect parameter, to get random redirects.
+* Added APIAfterExecute, APIQueryAfterExecute and APIQueryGeneratorAfterExecute
+  hooks which allow for extending core modules in a cleaner way
+* action=protect checks for invalid protection types and levels
+* (bug 15673) Added indentation to format=wddxfm output and improved built-in
+  WDDX formatter to resemble PHP's more
+* (bug 15706) Empty values for apprtype and apprlevel are now silently ignored
+  rather than causing an exception
+* Added uiprop=preferencestoken to meta=userinfo
+* (bug 15609) Add inprop=url and inprop=readable to prop=info
+* Add ApiDisabled and ApiQueryDisabled classes so individual modules can
+  be disabled in LocalSettings.php
+* (bug 15653) Add prop=duplicatefiles
+* (bug 15768) Add list=watchlistraw
+* (bug 15647) action=edit with basetimestamp fails if the page has been deleted
+  and undeleted since the last edit
+* (bug 15785) Allow for different expiry times for different protections in
+  action=protect
+* Added allowsduplicates attribute to action=paraminfo output
+* (bug 15767) apfilterlanglinks returns duplicate results
+* (bug 15845) Added pageid/fromid parameter to action=delete/move, making
+  manipulation of legacy pages with invalid titles possible
+* (bug 15881) Empty or invalid parameters cause database errors
+* The maxage and smaxage parameters are now properly validated
+* (bug 15945) list=recentchanges doesn't check $wgUseRCPatrol, $wgUseNPPatrol
+  and patrolmarks right
+* (bug 15985) acfrom and aifrom parameters didn't work when sorting in
+  descending order.
+* (bug 15995) Add cmstartsortkey and cmendsortkey parameters to
+  list=categorymembers
+* (bug 16017) list=categorymembers sets invalid continue parameters for
+  sortkeys containing pipes
+* (bug 16018) Added uccontinue parameter to list=usercontribs so paging
+  works properly when multiple users are queried or a userprefix is used
+* (bug 16047) Added activeusers attribute to meta=siteinfo&siprop=statistics
+  output
+* Added redirect resolution to action=parse
+* (bug 16074) rvprop=content combined with a generator with a high limit causes
+  an error
+* (bug 16105) Image metadata attributes containing spaces result in invalid XML
+* (bug 16126) Added siprop=magicwords to meta=siteinfo
+* (bug 16159) Added wlshow=patrolled|!patrolled to list=watchlist
+* (bug 16225) Titles like Talk:Talk:Foo broke apfrom and friends
+* meta=siteinfo&siprop=interwikimap no longer throws an exception for empty
+  sifilter parameter.
+* (bug 12760) meta=userinfo&uiprop=ratelimits doesn't list group-specific rate
+  limits
+* (bug 16398) meta=userinfo&uiprop=rights lists some rights twice in some cases
+* (bug 16408) Added rvgeneratexml to prop=revisions
+* (bug 16421) Made list=logevents's leuser accept user names with underscores
+  instead of spaces
+* (bug 16516) Made rvsection=T-2 work
+* (bug 16526) Added usprop=emailable to list=users
+* (bug 16548) list=search threw errors with an invalid error code
+* (bug 16515) Added pst and onlypst parameters to action=parse
+* (bug 16541) Added block expiry timestamp to list=logevents output
+* (bug 16613) action=protect doesn't tell when &cascade was set but cascading
+  protection wasn't allowed
+* (bug 16626) action=delete now correctly handles empty "reason" param
+* (bug 15579) clshow considers all categories !hidden
+* (bug 16647) list=allcategories, prop=categories don't return "hidden"
+  property for hidden categories
+* New siprop parameter of 'extensions' to list all installed extensions
+* (bug 16672) Include canonical namespace name in
+  meta=siteinfo&siprop=namespaces.
+* (bug 16726) siprop=namespacealiases should also list localized aliases
+* (bug 16730) Added apprfiltercascade parameter to list=allpages to filter
+  cascade-protected pages
+* (bug 16798) JSON encoding errors for some characters outside the BMP
+* (bug 16629) prop=info&inprop=protection lists empty legacy protections
+  incorrectly
+* (bug 15261, 16262) API no longer outputs invalid UTF-8
+* Fix broken list=alllinks paging and make alunique actually work
+
+=== Languages updated in 1.14 ===
 
 MediaWiki supports over 300 languages. Many localisations are updated
 regularly. Below only new and removed languages are listed.
 
-* Egyptian Spoken Arabic (arz) (new)
-* Southern Balochi (bcc) (new)
-* Middle Dutch (dum) (removed)
-* British English (en-gb) (new)
-* Fiji Hindi (Latin) (hif-latn) (new)
-* Old Norse (non) (removed)
-* Tarifit (rif) (new)
-* Serbian cyrillic iyekvian (sr-jc) (removed)
-* Serbian latin iyekavian (sr-jl) (removed)
-* Silesian (szl) (new)
-* Tajiki (Cyrllic script) (tg-cyrl) (new)
-* Tajiki (Latin script) (tg-latn) (new)
-* Chinese (Macau) (zh-mo) (new)
-* Chinese (Malaysia) (zh-my) (new)
+* Bakhtiari (bqi) (new)
+* Fiji Hindi (Devanagari script) (hif-deva) (new)
+* Krio (kri) (new)
+* Lezghian (lez) (new)
+* Laz (lzz) (new)
+* Eastern Mari (mhr) (new)
+* Niuean (niu) (new)
+* Oromo (om) (new)
+* Plautdietsch (pdt) (new)
+* Western Punjabi (pnb) (new)
+* Tarantino (roa-tara) (new)
+* Serbo-Croatian (sh) (new)
+* Tulu (tcy) (new)
 
 == Compatibility ==
 
-MediaWiki 1.13 requires PHP 5 (5.1 recommended). PHP 4 is no longer supported.
+MediaWiki 1.14 requires PHP 5 (5.2 recommended). PHP 4 is no longer supported.
 
 PHP 5.0.x fails on 64-bit systems due to serious bugs with array processing:
 http://bugs.php.net/bug.php?id=34879
@@ -711,16 +641,16 @@ At this time we still recommend 4.0, but 4.1/5.0 will work fine in most cases.
 
 == Upgrading ==
 
-1.13 has several database changes since 1.12, and will not work without schema
+1.14 has several database changes since 1.13, and will not work without schema
 updates.
 
+If upgrading from before 1.11, and you are using a wiki as a commons reposito-
+ry, make sure that it is updated as well. Otherwise, errors may arise due to
+database schema changes.
+
 If upgrading from before 1.7, you may want to run refreshLinks.php to ensure
 new database fields are filled with data.
 
-If upgrading from before 1.11, and you are using a wiki as a commons repository,
-make sure that it is updated as well. Otherwise, errors may arise due to
-database schema changes.
-
 If you are upgrading from MediaWiki 1.4.x or earlier, some major database
 changes are made, and there is a slightly higher chance that things could
 break. Don't forget to always back up your database before upgrading!
@@ -736,7 +666,7 @@ set $wgMimeType = "application/xhtml+xml"; to test for remaining problem
 cases, but this is not recommended on live sites. (This must be set for
 MathML to display properly in Mozilla.)
 
-For notes on 1.12.x and older releases, see HISTORY.
+For notes on 1.13.x and older releases, see HISTORY.
 
 
 === Online documentation ===
diff --git a/UPGRADE b/UPGRADE
index f817e738..9d0e0521 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -67,6 +67,11 @@ with $wgEnableUploads in later versions. When upgrading, consult the release
 notes to check for configuration changes which would alter the expected
 behaviour of MediaWiki.
 
+=== Check installed extensions ===
+In MediaWiki 1.14 some extensions are migrated into the core. Please see the
+RELEASE-NOTES section "Migrated extensions" and disable these extensions in your
+localSettings.php
+
 === Test ===
 
 It makes sense to test your wiki immediately following any kind of maintenance
diff --git a/api.php b/api.php
index 77dc52a4..817f4bca 100644
--- a/api.php
+++ b/api.php
@@ -64,7 +64,7 @@ if( strcmp( "$wgScriptPath/api$wgScriptExtension", $url ) ) {
 if (!$wgEnableAPI) {
 	echo 'MediaWiki API is not enabled for this site. Add the following line to your LocalSettings.php';
 	echo '<pre><b>$wgEnableAPI=true;</b></pre>';
-	die(-1);
+	die(1);
 }
 
 /* Construct an ApiMain with the arguments passed via the URL. What we get back
diff --git a/config/index.php b/config/index.php
index cef32248..ced8bc92 100644
--- a/config/index.php
+++ b/config/index.php
@@ -67,11 +67,13 @@ $ourdb['postgres']['compile']    = 'pgsql';
 $ourdb['postgres']['bgcolor']    = '#aaccff';
 $ourdb['postgres']['rootuser']   = 'postgres';
 
-$ourdb['sqlite']['fullname']      = 'SQLite';
-$ourdb['sqlite']['havedriver']    = 0;
-$ourdb['sqlite']['compile']       = 'pdo_sqlite';
-$ourdb['sqlite']['bgcolor']       = '#b1ebb1';
-$ourdb['sqlite']['rootuser']      = '';
+/*** SQLITE DISABLED -- USE MEDIAWIKI 1.15 */
+#$ourdb['sqlite']['fullname']      = 'SQLite';
+#$ourdb['sqlite']['havedriver']    = 0;
+#$ourdb['sqlite']['compile']       = 'pdo_sqlite';
+#$ourdb['sqlite']['bgcolor']       = '#b1ebb1';
+#$ourdb['sqlite']['rootuser']      = '';
+/************************************/
 
 $ourdb['mssql']['fullname']      = 'MSSQL';
 $ourdb['mssql']['havedriver']    = 0;
@@ -688,13 +690,23 @@ if( $conf->SysopName ) {
 }
 
 $conf->License = importRequest( "License", "none" );
-if( $conf->License == "gfdl" ) {
-	$conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+if( $conf->License == "gfdl1_2" ) {
+	$conf->RightsUrl = "http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt";
 	$conf->RightsText = "GNU Free Documentation License 1.2";
-	$conf->RightsCode = "gfdl";
+	$conf->RightsCode = "gfdl1_2";
+	$conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png';
+} elseif( $conf->License == "gfdl1_3" ) {
+	$conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+	$conf->RightsText = "GNU Free Documentation License 1.3";
+	$conf->RightsCode = "gfdl1_3";
 	$conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png';
 } elseif( $conf->License == "none" ) {
 	$conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
+} elseif( $conf->License == "pd" ) {
+	$conf->RightsUrl = "http://creativecommons.org/licenses/publicdomain/";
+	$conf->RightsText = "Public Domain";
+	$conf->RightsCode = "pd";
+	$conf->RightsIcon = '${wgScriptPath}/skins/common/images/public-domain.png';
 } else {
 	$conf->RightsUrl = importRequest( "RightsUrl", "" );
 	$conf->RightsText = importRequest( "RightsText", "" );
@@ -890,7 +902,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			continue;
 		}
 
-		print "<li>Connected to " . htmlspecialchars( $myver );
+		print "<li>Connected to " . htmlspecialchars( "{$conf->DBtype} $myver" );
 		if ($conf->DBtype == 'mysql') {
 			if( version_compare( $myver, "4.0.14" ) < 0 ) {
 				print "</li>\n";
@@ -941,7 +953,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			$wgDatabase->selectDB( $wgDBname );
 		}
 		else if ($conf->DBtype == 'postgres') {
-			if( version_compare( $myver, "PostgreSQL 8.0" ) < 0 ) {
+			if( version_compare( $myver, "8.0" ) < 0 ) {
 				dieout( "<b>Postgres 8.0 or later is required</b>. Aborting." );
 			}
 		}
@@ -1193,7 +1205,9 @@ if( count( $errs ) ) {
 
 		<ul class="plain">
 		<li><?php aField( $conf, "License", "No license metadata", "radio", "none" ); ?></li>
-		<li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl" ); ?></li>
+		<li><?php aField( $conf, "License", "Public Domain", "radio", "pd" ); ?></li>
+		<li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl1_2" ); ?></li>
+		<li><?php aField( $conf, "License", "GNU Free Documentation License 1.3", "radio", "gfdl1_3" ); ?></li>
 		<li><?php
 			aField( $conf, "License", "A Creative Commons license - ", "radio", "cc" );
 			$partner = "MediaWiki";
@@ -1436,6 +1450,10 @@ if( count( $errs ) ) {
 	</div>
 	</fieldset>
 
+	<?php 
+		# SQLITE DISABLED -- USE MEDIAWIKI 1.15
+		if (false):
+	?>
 	<?php database_switcher('sqlite'); ?>
 	<div class="config-desc">
 		<b>NOTE:</b> SQLite only uses the <i>Database name</i> setting above, the user, password and root settings are ignored.
@@ -1452,6 +1470,11 @@ if( count( $errs ) ) {
 	</div>
 	</fieldset>
 
+	<?php 
+		# SQLITE DISABLED -- USE MEDIAWIKI 1.15
+		endif
+	?>
+
 	<?php database_switcher('mssql'); ?>
 	<div class="config-input"><?php
 		aField( $conf, "DBprefix2", "Database table prefix:" );
@@ -1472,7 +1495,7 @@ if( count( $errs ) ) {
 </div>
 </form>
 <script type="text/javascript">
-window.onload = toggleDBarea('<?php echo Xml::encodeJsVar( $conf->DBtype ); ?>',
+window.onload = toggleDBarea(<?php echo Xml::encodeJsVar( $conf->DBtype ); ?>,
 <?php
 	## If they passed in a root user name, don't populate it on page load
 	echo strlen(importPost('RootUser', '')) ? 0 : 1;
@@ -1605,7 +1628,7 @@ function writeLocalSettings( $conf ) {
 
 	# Add slashes to strings for double quoting
 	$slconf = array_map( "escapePhpString", get_object_vars( $conf ) );
-	if( $conf->License == 'gfdl' ) {
+	if( $conf->License == 'gfdl1_2' || $conf->License == 'pd' || $conf->License == 'gfdl1_3' ) {
 		# Needs literal string interpolation for the current style path
 		$slconf['RightsIcon'] = $conf->RightsIcon;
 	}
@@ -1731,11 +1754,11 @@ if ( \$wgCommandLineMode ) {
 ## you can enable inline LaTeX equations:
 \$wgUseTeX           = false;
 
-\$wgLocalInterwiki   = \$wgSitename;
+\$wgLocalInterwiki   = strtolower( \$wgSitename );
 
 \$wgLanguageCode = \"{$slconf['LanguageCode']}\";
 
-\$wgProxyKey = \"$secretKey\";
+\$wgSecretKey = \"$secretKey\";
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
@@ -1964,7 +1987,7 @@ function printListItem( $item ) {
 }
 
 # Determine a suitable value for $wgShellLocale
-function getShellLocale( $wikiLanguage ) {
+function getShellLocale( $wikiLang ) {
 	# Give up now if we're in safe mode or open_basedir
 	# It's theoretically possible but tricky to work with
 	if ( wfIniGetBool( "safe_mode" ) || ini_get( 'open_basedir' ) ) {
diff --git a/docs/database.txt b/docs/database.txt
index 60e268c5..e80a4940 100644
--- a/docs/database.txt
+++ b/docs/database.txt
@@ -74,7 +74,7 @@ want to write code destined for Wikipedia.
 It's often the case that the best algorithm to use for a given task
 depends on whether or not replication is in use. Due to our unabashed
 Wikipedia-centrism, we often just use the replication-friendly version,
-but if you like, you can use $wgLoadBalancer->getServerCount() > 1 to
+but if you like, you can use wfGetLB()->getServerCount() > 1 to
 check to see if replication is in use.
 
 === Lag ===
@@ -110,7 +110,7 @@ in the session, and then at the start of each request, waiting for the
 slave to catch up to that position before doing any reads from it. If
 this wait times out, reads are allowed anyway, but the request is
 considered to be in "lagged slave mode". Lagged slave mode can be
-checked by calling $wgLoadBalancer->getLaggedSlaveMode(). The only
+checked by calling wfGetLB()->getLaggedSlaveMode(). The only
 practical consequence at present is a warning displayed in the page
 footer.
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 286ed7e2..04b1e2ac 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -198,6 +198,10 @@ system (LDAP, another PHP program, whatever), you could do:
 Returning false makes less sense for events where the action is complete, and
 will normally be ignored.
 
+Note that none of the examples made use of create_function() as a way to
+attach a function to a hook. This is known to cause problems (notably with 
+Special:Version), and should be avoided when at all possible.
+
 ==Using hooks==
 
 A calling function or method uses the wfRunHooks() function to run the hooks
@@ -234,6 +238,9 @@ to add events to the MediaWiki code.
 $autoblockip: The IP going to be autoblocked.
 $block: The block from which the autoblock is coming.
 
+'AbortDiffCache': Can be used to cancel the caching of a diff
+&$diffEngine: DifferenceEngine object
+
 'AbortLogin': Return false to cancel account login.
 $user: the User object being authenticated against
 $password: the password being submitted, not yet checked for validity
@@ -265,6 +272,10 @@ before showing the edit form ( EditPage::edit() ). This is triggered
 on &action=edit.
 $EditPage : the EditPage object
 
+'APIAfterExecute': after calling the execute() method of an API module.
+Use this to extend core API modules.
+&$module: Module object
+
 'APIEditBeforeSave': before saving a page with api.php?action=edit,
 after processing request parameters. Return false to let the request
 fail, returning an error message or an <edit result="Failure"> tag
@@ -273,6 +284,24 @@ $EditPage : the EditPage object
 $text : the new text of the article (has yet to be saved)
 $resultArr : data in this array will be added to the API result
 
+'APIGetAllowedParams': use this hook to modify a module's parameters.
+&$module: Module object
+&$params: Array of parameters
+
+'APIGetParamDescription': use this hook to modify a module's parameter
+descriptions.
+&$module: Module object
+&$desc: Array of parameter descriptions
+
+'APIQueryAfterExecute': after calling the execute() method of an
+action=query submodule. Use this to extend core API modules.
+&$module: Module object
+
+'APIQueryGeneratorAfterExecute': after calling the executeGenerator()
+method of an action=query submodule. Use this to extend core API modules.
+&$module: Module object
+&$resultPageSet: ApiPageSet object
+
 'APIQueryInfoTokens': use this hook to add custom tokens to prop=info.
 Every token has an action, which will be used in the intoken parameter
 and in the output (actiontoken="..."), and a callback function which
@@ -295,6 +324,17 @@ associated Revision object. In the hook, just add your callback to the
 $tokenFunctions array and return true (returning false makes no sense)
 $tokenFunctions: array(action => callback)
 
+'APIQueryRecentChangesTokens': use this hook to add custom tokens to list=recentchanges.
+Every token has an action, which will be used in the rctoken parameter
+and in the output (actiontoken="..."), and a callback function which
+should return the token, or false if the user isn't allowed to obtain
+it. The prototype of the callback function is func($pageid, $title, $rc)
+where $pageid is the page ID of the page associated to the revision the
+token is requested for, $title the associated Title object and $rc the
+associated RecentChange object. In the hook, just add your callback to the
+$tokenFunctions array and return true (returning false makes no sense)
+$tokenFunctions: array(action => callback)
+
 'ArticleAfterFetchContent': after fetching content of an article from the database
 $article: the article (object) being loaded from the database
 $content: the content (string) of the article
@@ -315,6 +355,11 @@ $id: id of the article that was deleted
 'ArticleEditUpdateNewTalk': before updating user_newtalk when a user talk page was changed
 $article: article (object) of the user talk page
 
+'ArticleEditUpdates': when edit updates (mainly link tracking) are made when an article has been changed
+$article: the article (object)
+$editInfo: data holder that includes the parser output ($editInfo->output) for that page after the change
+$changed: bool for if the page was changed
+
 'ArticleEditUpdatesDeleteFromRecentchanges': before deleting old entries from recentchanges table, return false to not delete old entries
 $article: article (object) being modified
 
@@ -375,6 +420,7 @@ $oldPageID: the page ID of the revision when archived (may be null)
 $article: the article that was edited
 $user: the user who did the rollback
 $revision: the revision the page was reverted back to
+$current: the reverted revision
 
 'ArticleSave': before an article is saved
 $article: the article (object) being saved
@@ -396,17 +442,6 @@ $section: (No longer used)
 $flags: Flags passed to Article::doEdit()
 $revision: New Revision of the article
 
-'ArticleSaveComplete': after an article is saved
-$article: the article (object) saved
-$user: the user (object) who saved the article
-$text: the new article text
-$summary: the article summary (comment)
-$isminor: minor flag
-$iswatch: watch flag
-$section: section #
-
-wfRunHooks( 'ArticleSaveComplete', array( &$this, &$wgUser, $text, $summary, $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
-
 'ArticleUndelete': When one or more revisions of an article are restored
 $title: Title corresponding to the article restored
 $create: Whether or not the restoration caused the page to be created
@@ -471,13 +506,6 @@ rendered inline in wiki pages or galleries in category pages.
 &$parser: Parser object
 &$ig: ImageGallery object
 
-'BeforeWatchlist': Override watchlist display or add extra SQL clauses.
-$nondefaults: Assoc array with the following keys:
-              days, hideOwn, hideBots, hideMinor, namespace
-$wgUser: wgUser.
-&$hookSql: a string which will be inserted without sanitation into the SQL query
-           used to get the watchlist, at the end of the WHERE part.
-
 'BlockIp': before an IP address or user is blocked
 $block: the Block object about to be saved
 $user: the user _doing_ the block (not the one being blocked)
@@ -490,18 +518,6 @@ $user: the user who did the block (not the one being blocked)
 $isbn: ISBN to show information for
 $output: OutputPage object in use
 
-'BrokenLink': Before the HTML is created for a broken (i.e. red) link
-&$linker: Linker instance
-$nt: the page title
-$query: the URL query string passed in
-&$u: the URL of this link
-&$style: the inline CSS style
-&$prefix: a prefix prepended to the linked text
-&$text: the text placed by the user in the wiki-link
-&$inside: any additional alphanumeric characters placed after the wiki-link,
-that are made part of the link text
-&$trail: text placed immediately after the HTML link
-
 'CategoryPageView': before viewing a categorypage in CategoryPage::view
 $catpage: CategoryPage instance
 
@@ -544,6 +560,17 @@ $newRev: Revision object of the "new" revision
 $article: article (object) being viewed
 $oldid: oldid (int) being viewed
 
+'DoEditSectionLink': Override the HTML generated for section edit links
+$skin: Skin object rendering the UI
+$title: Title object for the title being linked to (may not be the same as
+  $wgTitle, if the section is included from a template)
+$section: The designation of the section being pointed to, to be included in
+  the link, like "&section=$section"
+$tooltip: The default tooltip.  Escape with htmlspecialchars() before using.
+  By default, this is wrapped in the 'editsectionhint' message.
+$result: The HTML to return, prefilled with the default plus whatever other
+  changes earlier hooks have made
+
 'EditFilter': Perform checks on an edit
 $editor: Edit form (see includes/EditPage.php)
 $text: Contents of the edit box
@@ -589,19 +616,17 @@ sections.
 'EditPageBeforeEditButtons':  allows modifying the edit buttons below the textarea in the edit form
 &$editpage: The current EditPage object
 &$buttons: Array of edit buttons "Save", "Preview", "Live", and "Diff"
+&$tabindex: HTML tabindex of the last edit check/button
 
-'EditSectionLink': Override the return value of Linker::editSectionLink()
-$skin: Skin rendering the UI
-$title: Title being linked to
-$section: Section to link to
-$link: Default link
-$result: Result (alter this to override the generated links)
+'EditPageBeforeEditChecks':  allows modifying the edit checks below the textarea in the edit form
+&$editpage: The current EditPage object
+&$checks: Array of edit checks like "watch this page"/"minor edit"
+&$tabindex: HTML tabindex of the last edit check/button
 
-'EditSectionLinkForOther': Override the return value of Linker::editSectionLinkForOther()
+'EditSectionLink': Do not use, use DoEditSectionLink instead.
 $skin: Skin rendering the UI
 $title: Title being linked to
 $section: Section to link to
-$hint: Anchor title/tooltip attributes
 $link: Default link
 $result: Result (alter this to override the generated links)
 
@@ -692,6 +717,9 @@ $result: User permissions error to add. If none, return true.
 'getUserPermissionsErrorsExpensive': Absolutely the same, but is called only
 	if expensive checks are enabled.
 
+'HTMLCacheUpdate::doUpdate': After cache invalidation updates are inserted into the job queue.
+$title: Title object, pages linked to this title are purged.
+
 'ImageBeforeProduceHTML': Called before producing the HTML created by a wiki
 	image insertion.  You can skip the default logic entirely by returning
 	false, or just modify a	few things using call-by-reference.
@@ -726,6 +754,7 @@ $title: Title object ($wgTitle)
 $request: WebRequest
 $ignoreRedirect: boolean to skip redirect check
 $target: Title/string of redirect target
+$article: Article object
 
 'InitPreferencesForm': called at the end of PreferencesForm's constructor
 $form: the PreferencesForm
@@ -762,6 +791,35 @@ $lang: laguage code (string)
 $specialPageAliases: associative array of magic words synonyms
 $lang: laguage code (string)
 
+'LinkBegin': Used when generating internal and interwiki links in
+Linker::link(), before processing starts.  Return false to skip default proces-
+sing and return $ret.  See documentation for Linker::link() for details on the
+expected meanings of parameters.
+$skin: the Skin object
+$target: the Title that the link is pointing to
+&$text: the contents that the <a> tag should have (raw HTML); null means "de-
+	fault"
+&$customAttribs: the HTML attributes that the <a> tag should have, in associa-
+	tive array form, with keys and values unescaped.  Should be merged with de-
+	fault values, with a value of false meaning to suppress the attribute.
+&$query: the query string to add to the generated URL (the bit after the "?"),
+	in associative array form, with keys and values unescaped.
+&$options: array of options.  Can include 'known', 'broken', 'noclasses'.
+&$ret: the value to return if your hook returns false.
+
+'LinkEnd': Used when generating internal and interwiki links in Linker::link(),
+just before the function returns a value.  If you return true, an <a> element
+with HTML attributes $attribs and contents $text will be returned.  If you re-
+turn false, $ret will be returned.
+$skin: the Skin object
+$target: the Title object that the link is pointing to
+$options: the options.  Will always include either 'known' or 'broken', and may
+	include 'noclasses'.
+&$text: the final (raw HTML) contents of the <a> tag, after processing.
+&$attribs: the final HTML attributes of the <a> tag, after processing, in asso-
+	ciative array form.
+&$ret: the value to return if your hook returns false.
+
 'LinkerMakeExternalImage': At the end of Linker::makeExternalImage() just before the return
 &$url: the image url
 &$alt: the image's alt text
@@ -829,6 +887,10 @@ $magicWords: array of strings
 'MagicWordwgVariableIDs': When definig new magic words IDs. DEPRECATED: Use LanguageGetMagic hook instead
 $variableIDs: array of strings
 
+'MakeGlobalVariablesScript': called right before Skin::makeVariablesScript is executed   
+&$vars: variable (or multiple variables) to be added into the output   
+		of Skin::makeVariablesScript
+
 'MarkPatrolled': before an edit is marked patrolled
 $rcid: ID of the revision to be marked patrolled
 $user: the user (object) marking the revision as patrolled
@@ -870,6 +932,7 @@ $tools: array of tools
 $article: the article edited
 $rev: the new revision
 $baseID: the revision ID this was based off, if any
+$user: the editing user
 
 'NormalizeMessageKey': Called before the software gets the text of a message
   (stuff in the MediaWiki: namespace), useful for changing WHAT message gets displayed
@@ -879,6 +942,11 @@ $baseID: the revision ID this was based off, if any
   whether to use the content language (true) or site language (false) (bool)
 &$transform: whether or not to expand variables and templates in the message (bool)
 
+'OldChangesListRecentChangesLine': Customize entire Recent Changes line.
+&$changeslist: The OldChangesList instance.
+&$s: HTML of the form "<li>...</li>" containing one RC entry.
+&$rc: The RecentChange object.
+
 'OpenSearchUrls': Called when constructing the OpenSearch description XML.
 Hooks can alter or append to the array of URLs for search & suggestion formats.
 &$urls: array of associative arrays with Url element attributes
@@ -888,6 +956,9 @@ the resulting HTML is about to be displayed.
 $parserOutput: the parserOutput (object) that corresponds to the page 
 $text: the text that will be displayed, in HTML (string)
 
+'OutputPageCheckLastModified': when checking if the page has been modified since the last visit
+&$modifiedTimes: array of timestamps, the following keys are set: page, user, epoch
+
 'OutputPageParserOutput': after adding a parserOutput to $wgOut
 $out: OutputPage instance (object)
 $parserOutput: parserOutput instance being added in $out
@@ -1046,6 +1117,8 @@ $text : Current text being indexed
 $term : Search term string
 &$title : Outparam; set to $title object and return false for a match
 
+'SetupAfterCache': Called in Setup.php, after cache objects are set
+
 'ShowRawCssJs': Customise the output of raw CSS and JavaScript in page views
 $text: Text being shown
 $title: Title of the custom script/stylesheet page
@@ -1065,6 +1138,17 @@ $skin: Skin object
 &$text: bottomScripts Text
 Append to $text to add additional text/scripts after the stock bottom scripts.
 
+'SkinAfterContent': Allows extensions to add text after the page content and
+article metadata.
+&$data: (string) Text to be printed out directly (without parsing)
+This hook should work in all skins. Just set the &$data variable to the text
+you're going to add.
+
+'SkinBuildSidebar': At the end of Skin::buildSidebar()
+$skin: Skin object
+&$bar: Sidebar contents
+Modify $bar to add or modify sidebar portlets.
+
 'SkinSubPageSubtitle': At the beginning of Skin::subPageSubtitle()
 $skin: Skin object
 &$subpages: Subpage links HTML
@@ -1142,24 +1226,6 @@ $movePage: MovePageForm object
 $oldTitle: old title (object)
 $newTitle: new title (object)
 
-'SpecialPageExecuteAfterPage': called after executing a special page
-Warning: Not all the special pages call this hook
-$specialPage: SpecialPage object
-$par: paramter passed to the special page (string)
-$funct: function called to execute the special page
-
-'SpecialPageExecuteBeforeHeader': called before setting the header text of the special page
-Warning: Not all the special pages call this hook
-$specialPage: SpecialPage object
-$par: paramter passed to the special page (string)
-$funct: function called to execute the special page
-
-'SpecialPageExecuteBeforePage': called after setting the special page header text but before the main execution
-Warning: Not all the special pages call this hook
-$specialPage: SpecialPage object
-$par: paramter passed to the special page (string)
-$funct: function called to execute the special page
-
 'SpecialPage_initList': called when setting up SpecialPage::$mList, use this hook to remove a core special page
 $list: list (array) of core special pages
 
@@ -1168,7 +1234,7 @@ $list: list (array) of core special pages
 $opts: FormOptions for this request
 
 'SpecialRecentChangesQuery': called when building sql query for SpecialRecentChanges
-&$conds: array of where conditionals for query
+&$conds: array of WHERE conditionals for query
 &$tables: array of tables to be queried
 &$join_conds: join conditions for the tables
 $opts: FormOptions for this request
@@ -1187,6 +1253,16 @@ $term: string of search term
 'SpecialVersionExtensionTypes': called when generating the extensions credits, use this to change the tables headers
 $extTypes: associative array of extensions types
 
+'SpecialWatchlistQuery': called when building sql query for SpecialWatchlist
+&$conds: array of WHERE conditionals for query
+&$tables: array of tables to be queried
+&$join_conds: join conditions for the tables
+&$fields: array of query fields
+
+'TitleArrayFromResult': called when creating an TitleArray object from a database result
+&$titleArray: set this to an object to override the default object returned
+$res: database result used to create the object
+
 'TitleMoveComplete': after moving an article (title)
 $old: old title
 $nt: new title
@@ -1234,6 +1310,11 @@ string &$error: output: HTML error to show if upload canceled by returning false
 'UploadComplete': Upon completion of a file upload
 $uploadForm: Upload form object. File can be accessed by $uploadForm->mLocalFile.
 
+'User::mailPasswordInternal': before creation and mailing of a user's new temporary password
+$user: the user who sent the message out
+$ip: IP of the user who sent the message out
+$u: the account whose new password will be set
+
 'UserArrayFromResult': called when creating an UserArray object from a database result
 &$userArray: set this to an object to override the default object returned
 $res: database result used to create the object
@@ -1254,9 +1335,21 @@ $user: User (object) whose permission is being checked
 'UserClearNewTalkNotification': called when clearing the "You have new messages!" message, return false to not delete it
 $user: User (object) that'll clear the message
 
+'UserComparePasswords': called when checking passwords, return false to override the default password checks
+&$hash: String of the password hash (from the database)
+&$password: String of the plaintext password the user entered
+&$userId: Integer of the user's ID or Boolean false if the user ID was not supplied
+&$result: If the hook returns false, this Boolean value will be checked to determine if the password was valid
+
 'UserCreateForm': change to manipulate the login form
 $template: SimpleTemplate instance for the form
 
+'UserCryptPassword': called when hashing a password, return false to implement your own hashing method
+&$password: String of the plaintext password to encrypt
+&$salt: String of the password salt or Boolean false if no salt is provided
+&$wgPasswordSalt: Boolean of whether the salt is used in the default hashing method
+&$hash: If the hook returns false, this String will be used as the hash
+
 'UserEffectiveGroups': Called in User::getEffectiveGroups()
 $user: User to get groups for
 &$groups: Current effective groups
@@ -1275,6 +1368,9 @@ $user: User object
 'UserGetImplicitGroups': Called in User::getImplicitGroups()
 &$groups: List of implicit (automatically-assigned) groups
 
+'UserGetReservedNames': allows to modify $wgReservedUsernames at run time
+*&$reservedUsernames: $wgReservedUsernames
+
 'UserGetRights': Called in User::getRights()
 $user: User to get rights for
 &$rights: Current rights
@@ -1283,10 +1379,13 @@ $user: User to get rights for
 $user: user object
 $name: user name
 
-'UserLoadFromSession': called to authenticate users on external/environmental means
+'UserLoadFromSession': called to authenticate users on external/environmental means; occurs before session is loaded
 $user: user object being loaded
 &$result: set this to a boolean value to abort the normal authentification process
 
+'UserLoadAfterLoadFromSession': called to authenticate users on external/environmental means; occurs after session is loaded
+$user: user object being loaded
+
 'UserLoginComplete': after a user has logged in
 $user: the user object that was created on login
 $inject_html: Any HTML to inject after the "logged in" message.
@@ -1307,6 +1406,17 @@ $user  : User object that was changed
 $add   : Array of strings corresponding to groups added
 $remove: Array of strings corresponding to groups removed
 
+'UserrightsChangeableGroups': allows modification of the groups a user may add or remove via Special:UserRights
+$userrights  : UserrightsPage object
+$user        : User object of the current user
+$addergroups : Array of groups that the user is in
+&$groups     : Array of groups that can be added or removed. In format of
+				array( 
+					'add'         => array( addablegroups ), 
+					'remove'      => array( removablegroups ), 
+					'add-self'    => array( addablegroups to self ),
+					'remove-self' => array( removable groups from self )
+				)
 'UserRetrieveNewTalks': called when retrieving "You have new messages!" message(s)
 $user: user retrieving new talks messages
 $talks: array of new talks page(s)
diff --git a/docs/memcached.txt b/docs/memcached.txt
index b31554cc..2a904872 100644
--- a/docs/memcached.txt
+++ b/docs/memcached.txt
@@ -97,13 +97,6 @@ this is mentionned below.
 
 (incomplete, out of date)
 
-Ajax Search:
-	key: $wgDBname:ajaxsearch:md5( $search )
-	ex: wikidb:ajaxsearch:9565814d5d564fa898dd6111b94fae0b
-	stores: array with the result of research of a given text
-	cleared by: nothing
-	expiry: 30 minutes
-
 Date Formatter:
 	key: $wgDBname:dateformatter
 	ex: wikidb:dateformatter
diff --git a/docs/php-memcached/Documentation b/docs/php-memcached/Documentation
index 4782807b..c9056053 100644
--- a/docs/php-memcached/Documentation
+++ b/docs/php-memcached/Documentation
@@ -165,7 +165,7 @@ EXAMPLE:
 <?php
 require("MemCachedClient.inc.php");
 
-// set the servers, with the last one having an interger weight value of 3
+// set the servers, with the last one having an integer weight value of 3
 $options["servers"] = array("10.0.0.15:11000","10.0.0.16:11001",array("10.0.0.17:11002", 3));
 $options["debug"] = false;
 
diff --git a/docs/upload.txt b/docs/upload.txt
new file mode 100644
index 00000000..e92ca786
--- /dev/null
+++ b/docs/upload.txt
@@ -0,0 +1,40 @@
+Special:Upload:
+
+wfSpecialUpload
+	new UploadForm
+		mUpload = new UploadFrom...
+	execute()
+		$wgEnableUploads
+		isAllowed(upload)
+		isBlocked()
+		wfReadOnly()
+		processUpload()
+			internalProcessUpload()
+				wfRunHooks(UploadForm:BeforeProcessing)
+				mUpload->getTitle()
+					wfStripIllegalFilenameChars
+					splitExtensions()
+					checkFileExtension()
+					Title::makeTitleSafe
+				getUserPermissionsErrors(edit; upload; create)
+				mUpload->verifyUpload()
+					empty(mFileSize)
+					getTitle()
+					checkOverwrite()
+					verifyFile()
+						checkMacBinary()
+					wfRunHooks(UploadVerification)
+				if(!ignoreWarning) mUpload->checkWarnings()
+				getInitialPageText()
+				mUpload->performUpload()
+					mLocalFile->upload()
+					if(isGood() && $watch) addWatch()
+					if(isGood()) wfRunHooks(UploadComplete)
+					wfRunHooks(SpecialUploadComplete)
+
+Changes:
+	* "Your file will be renamed to $1" check now done on the result of 
+	  Title::makeTitleSafe instead of filteredName
+	* getExistWarning only really does existence checks
+	* Other stuff forgotten to be documented
+	
\ No newline at end of file
diff --git a/extensions/LLAuthPlugin.php b/extensions/LLAuthPlugin.php
index ec3ce565..a56df8d8 100644
--- a/extensions/LLAuthPlugin.php
+++ b/extensions/LLAuthPlugin.php
@@ -39,7 +39,7 @@ class LLAuthPlugin extends AuthPlugin {
 			}
 		}
 
-	function getUserData($username) {
+	private function getUserData($username) {
 		if (is_null($this->data))
 			{
 			$this->connect();
@@ -53,7 +53,7 @@ class LLAuthPlugin extends AuthPlugin {
 		return $this->data;
 	}
 
-	function userExists( $username ) {
+	public function userExists( $username ) {
 		$this->connect();
 		$result = mysqli_query($this->dbLink, 'SELECT id FROM users WHERE name = \''.mysqli_escape_string($this->dbLink, $username).'\'');
 		$exists = mysqli_num_rows($result) > 0;
@@ -62,7 +62,7 @@ class LLAuthPlugin extends AuthPlugin {
  		return $exists;
 	}
 
-	function authenticate( $username, $password ) {
+	public function authenticate( $username, $password ) {
 		$this->connect();
 		$result = mysqli_query($this->dbLink, 'SELECT id FROM users WHERE name = \''.mysqli_escape_string($this->dbLink, $username).'\' AND password = \''.mysqli_escape_string($this->dbLink, sha1($password)).'\' ');
 		$authenticated = mysqli_num_rows($result) > 0;
@@ -71,57 +71,57 @@ class LLAuthPlugin extends AuthPlugin {
  		return $authenticated;
 	}
 
-	function modifyUITemplate( &$template ) {
+	public function modifyUITemplate( &$template ) {
 		$template->set( 'usedomain', false );
 		$template->set('link', 'Um Dich hier anzumelden, nutze Deine Konto-Daten aus dem <a href="http://forum.archlinux.de/">archlinux.de-Forum</a>.');
 	}
 
-	function setDomain( $domain ) {
+	public function setDomain( $domain ) {
 		$this->domain = $domain;
 	}
 
-	function validDomain( $domain ) {
+	public function validDomain( $domain ) {
 		return true;
 	}
 
-	function updateUser( &$user ) {
+	public function updateUser( &$user ) {
 		return $this->initUser($user);
 	}
 
-	function autoCreate() {
+	public function autoCreate() {
 		return true;
 	}
 
-	function allowPasswordChange() {
+	public function allowPasswordChange() {
 		return false;
 	}
 
-	function setPassword( $user, $password ) {
+	public function setPassword( $user, $password ) {
 		return false;
 	}
 
-	function updateExternalDB( $user ) {
+	public function updateExternalDB( $user ) {
 		// this way userdata is allways overwritten by external db
 		return $this->initUser($user);
 	}
 
-	function canCreateAccounts() {
+	public function canCreateAccounts() {
 		return false;
 	}
 
-	function addUser( $user, $password, $email = '', $realname = '' ) {
+	public function addUser( $user, $password, $email = '', $realname = '' ) {
 		return false;
 	}
 
-	function strict() {
+	public function strict() {
 		return true;
 	}
 
-	function strictUserAuth( $username ) {
+	public function strictUserAuth( $username ) {
 		return true;
 	}
 
-	function initUser( &$user, $autocreate=false ) {
+	public function initUser( &$user, $autocreate=false ) {
 		$data = $this->getUserData($user->getName());
 		$user->setEmail($data['email']);
 		$user->confirmEmail();
@@ -129,7 +129,7 @@ class LLAuthPlugin extends AuthPlugin {
 		return true;
 	}
 
-	function getCanonicalName( $username ) {
+	public function getCanonicalName( $username ) {
 		// fix bug #122
 		$data = $this->getUserData($username);
 		// needed for update.php
diff --git a/img_auth.php b/img_auth.php
index 4b625e39..91410181 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -48,7 +48,7 @@ if( preg_match( '!\d+px-(.*)!i', $name, $m ) )
 	$name = $m[1];
 wfDebugLog( 'img_auth', "\$name is {$name}" );
 
-$title = Title::makeTitleSafe( NS_IMAGE, $name );
+$title = Title::makeTitleSafe( NS_FILE, $name );
 if( !$title instanceof Title ) {
 	wfDebugLog( 'img_auth', "Unable to construct a valid Title from `{$name}`" );
 	wfForbidden();
diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 9daca9e5..1a9adbca 100644
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -14,7 +14,8 @@ if( !defined( 'MEDIAWIKI' ) ) {
  * Modified function from http://pure-essence.net/stuff/code/utf8RawUrlDecode.phps
  *
  * @param $source String escaped with Javascript's escape() function
- * @param $iconv_to String destination character set will be used as second paramether in the iconv function. Default is UTF-8.
+ * @param $iconv_to String destination character set will be used as second parameter 
+ * in the iconv function. Default is UTF-8.
  * @return string
  */
 function js_unescape($source, $iconv_to = 'UTF-8') {
@@ -72,91 +73,6 @@ function code2utf($num){
    return '';
 }
 
-define( 'AJAX_SEARCH_VERSION', 2 );	//AJAX search cache version
-
-function wfSajaxSearch( $term ) {
-	global $wgContLang, $wgUser, $wgCapitalLinks, $wgMemc;
-	$limit = 16;
-	$sk = $wgUser->getSkin();
-	$output = '';
-
-	$term = trim( $term );
-	$term = $wgContLang->checkTitleEncoding( $wgContLang->recodeInput( js_unescape( $term ) ) );
-	if ( $wgCapitalLinks )
-		$term = $wgContLang->ucfirst( $term );
-	$term_title = Title::newFromText( $term );
-
-	$memckey = $term_title ? wfMemcKey( 'ajaxsearch', md5( $term_title->getFullText() ) ) : wfMemcKey( 'ajaxsearch', md5( $term ) );
-	$cached = $wgMemc->get($memckey);
-	if( is_array( $cached ) && $cached['version'] == AJAX_SEARCH_VERSION ) {
-		$response = new AjaxResponse( $cached['html'] );
-		$response->setCacheDuration( 30*60 );
-		return $response;
-	}
-
-	$r = $more = '';
-	$canSearch = true;
-
-	$results = PrefixSearch::titleSearch( $term, $limit + 1 );
-	foreach( array_slice( $results, 0, $limit ) as $titleText ) {
-		$r .= '<li>' . $sk->makeKnownLink( $titleText ) . "</li>\n";
-	}
-
-	// Hack to check for specials
-	if( $results ) {
-		$t = Title::newFromText( $results[0] );
-		if( $t && $t->getNamespace() == NS_SPECIAL ) {
-			$canSearch = false;
-			if( count( $results ) > $limit ) {
-				$more = '<i>' .
-					$sk->makeKnownLinkObj(
-						SpecialPage::getTitleFor( 'Specialpages' ),
-						wfMsgHtml( 'moredotdotdot' ) ) .
-					'</i>';
-			}
-		} else {
-			if( count( $results ) > $limit ) {
-				$more = '<i>' .
-					$sk->makeKnownLinkObj(
-						SpecialPage::getTitleFor( "Allpages", $term ),
-						wfMsgHtml( 'moredotdotdot' ) ) .
-					'</i>';
-			}
-		}
-	}
-
-	$valid = (bool) $term_title;
-	$term_url = urlencode( $term );
-	$term_normalized = $valid ? $term_title->getFullText() : $term;
-	$term_display = htmlspecialchars( $term );
-	$subtitlemsg = ( $valid ? 'searchsubtitle' : 'searchsubtitleinvalid' );
-	$subtitle = wfMsgExt( $subtitlemsg, array( 'parse' ), wfEscapeWikiText( $term_normalized ) );
-	$html = '<div id="searchTargetHide"><a onclick="Searching_Hide_Results();">'
-		. wfMsgHtml( 'hideresults' ) . '</a></div>'
-		. '<h1 class="firstHeading">'.wfMsgHtml('search')
-		. '</h1><div id="contentSub">'. $subtitle . '</div>';
-	if( $canSearch ) {
-		$html .= '<ul><li>'
-			. $sk->makeKnownLink( $wgContLang->specialPage( 'Search' ),
-						wfMsgHtml( 'searchcontaining', $term_display ),
-						"search={$term_url}&fulltext=Search" )
-			. '</li><li>' . $sk->makeKnownLink( $wgContLang->specialPage( 'Search' ),
-						wfMsgHtml( 'searchnamed', $term_display ) ,
-						"search={$term_url}&go=Go" )
-			. "</li></ul>";
-	}
-	if( $r ) {
-		$html .= "<h2>" . wfMsgHtml( 'articletitles', $term_display ) . "</h2>"
-			. '<ul>' .$r .'</ul>' . $more;
-	}
-
-	$wgMemc->set( $memckey, array( 'version' => AJAX_SEARCH_VERSION, 'html' => $html ), 30 * 60 );
-
-	$response = new AjaxResponse( $html );
-	$response->setCacheDuration( 30*60 );
-	return $response;
-}
-
 /**
  * Called for AJAX watch/unwatch requests.
  * @param $pagename Prefixed title string for page to watch/unwatch
@@ -189,20 +105,54 @@ function wfAjaxWatch($pagename = "", $watch = "") {
 		if(!$watching) {
 			$dbw = wfGetDB(DB_MASTER);
 			$dbw->begin();
-			$article->doWatch();
+			$ok = $article->doWatch();
 			$dbw->commit();
 		}
 	} else {
 		if($watching) {
 			$dbw = wfGetDB(DB_MASTER);
 			$dbw->begin();
-			$article->doUnwatch();
+			$ok = $article->doUnwatch();
 			$dbw->commit();
 		}
 	}
+	// Something stopped the change
+	if( isset($ok) && !$ok ) {
+		return '<err#>';
+	}
 	if( $watch ) {
 		return '<w#>'.wfMsgExt( 'addedwatchtext', array( 'parse' ), $title->getPrefixedText() );
 	} else {
 		return '<u#>'.wfMsgExt( 'removedwatchtext', array( 'parse' ), $title->getPrefixedText() );
 	}
 }
+
+/**
+ * Called in some places (currently just extensions)
+ * to get the thumbnail URL for a given file at a given resolution.
+ */
+function wfAjaxGetThumbnailUrl( $file, $width, $height ) {
+	$file = wfFindFile( $file );
+	
+	if ( !$file || !$file->exists() )
+		return null;
+		
+	$url = $file->getThumbnail( $width, $height )->url;
+	
+	return $url;
+}
+
+/**
+ * Called in some places (currently just extensions)
+ * to get the URL for a given file.
+ */
+function wfAjaxGetFileUrl( $file ) {
+	$file = wfFindFile( $file );
+	
+	if ( !$file || !$file->exists() )
+		return null;
+		
+	$url = $file->getUrl();
+	
+	return $url;
+}
\ No newline at end of file
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index c79e928b..63468a14 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -9,7 +9,9 @@ if( !defined( 'MEDIAWIKI' ) ) {
 }
 
 /**
- * @todo document
+ * Handle responses for Ajax requests (send headers, print
+ * content, that sort of thing)
+ * 
  * @ingroup Ajax
  */
 class AjaxResponse {
@@ -20,7 +22,7 @@ class AjaxResponse {
 	/** HTTP header Content-Type */
 	private $mContentType;
 
-	/** @todo document */
+	/** Disables output. Can be set by calling $AjaxResponse->disable() */
 	private $mDisabled;
 
 	/** Date for the HTTP header Last-modified */
diff --git a/includes/Article.php b/includes/Article.php
index 4d8277bb..3d9c2147 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -16,27 +16,30 @@ class Article {
 	/**@{{
 	 * @private
 	 */
-	var $mComment;			//!<
-	var $mContent;			//!<
-	var $mContentLoaded;	//!<
-	var $mCounter;			//!<
-	var $mForUpdate;		//!<
-	var $mGoodAdjustment;	//!<
-	var $mLatest;			//!<
-	var $mMinorEdit;		//!<
-	var $mOldId;			//!<
-	var $mRedirectedFrom;	//!<
-	var $mRedirectUrl;		//!<
-	var $mRevIdFetched;		//!<
-	var $mRevision;			//!<
-	var $mTimestamp;		//!<
-	var $mTitle;			//!<
-	var $mTotalAdjustment;	//!<
-	var $mTouched;			//!<
-	var $mUser;				//!<
-	var $mUserText;			//!<
-	var $mRedirectTarget;		//!<
-	var $mIsRedirect;
+	var $mComment = '';               //!<
+	var $mContent;                    //!<
+	var $mContentLoaded = false;      //!<
+	var $mCounter = -1;               //!< Not loaded
+	var $mCurID = -1;                 //!< Not loaded
+	var $mDataLoaded = false;         //!<
+	var $mForUpdate = false;          //!<
+	var $mGoodAdjustment = 0;         //!<
+	var $mIsRedirect = false;         //!<
+	var $mLatest = false;             //!<
+	var $mMinorEdit;                  //!<
+	var $mOldId;                      //!<
+	var $mPreparedEdit = false;       //!< Title object if set
+	var $mRedirectedFrom = null;      //!< Title object if set
+	var $mRedirectTarget = null;      //!< Title object if set
+	var $mRedirectUrl = false;        //!<
+	var $mRevIdFetched = 0;           //!<
+	var $mRevision;                   //!<
+	var $mTimestamp = '';             //!<
+	var $mTitle;                      //!<
+	var $mTotalAdjustment = 0;        //!<
+	var $mTouched = '19700101000000'; //!<
+	var $mUser = -1;                  //!< Not loaded
+	var $mUserText = '';              //!<
 	/**@}}*/
 
 	/**
@@ -44,10 +47,18 @@ class Article {
 	 * @param $title Reference to a Title object.
 	 * @param $oldId Integer revision ID, null to fetch from request, zero for current
 	 */
-	function __construct( Title $title, $oldId = null ) {
+	public function __construct( Title $title, $oldId = null ) {
 		$this->mTitle =& $title;
 		$this->mOldId = $oldId;
-		$this->clear();
+	}
+
+	/**
+	 * Constructor from an article article
+	 * @param $id The article ID to load
+	 */
+	public static function newFromID( $id ) {
+		$t = Title::newFromID( $id );
+		return $t == null ? null : new Article( $t );
 	}
 
 	/**
@@ -55,7 +66,7 @@ class Article {
 	 * from another page on the wiki.
 	 * @param $from Title object.
 	 */
-	function setRedirectedFrom( $from ) {
+	public function setRedirectedFrom( $from ) {
 		$this->mRedirectedFrom = $from;
 	}
 
@@ -67,22 +78,20 @@ class Article {
 	 * @return mixed Title object, or null if this page is not a redirect
 	 */
 	public function getRedirectTarget() {
-		if(!$this->mTitle || !$this->mTitle->isRedirect())
+		if( !$this->mTitle || !$this->mTitle->isRedirect() )
 			return null;
-		if(!is_null($this->mRedirectTarget))
+		if( !is_null($this->mRedirectTarget) )
 			return $this->mRedirectTarget;
-
 		# Query the redirect table
-		$dbr = wfGetDB(DB_SLAVE);
-		$res = $dbr->select('redirect',
-				array('rd_namespace', 'rd_title'),
-				array('rd_from' => $this->getID()),
-				__METHOD__
+		$dbr = wfGetDB( DB_SLAVE );
+		$res = $dbr->select( 'redirect',
+			array('rd_namespace', 'rd_title'),
+			array('rd_from' => $this->getID()),
+			__METHOD__
 		);
-		$row = $dbr->fetchObject($res);
-		if($row)
+		if( $row = $dbr->fetchObject($res) ) {
 			return $this->mRedirectTarget = Title::makeTitle($row->rd_namespace, $row->rd_title);
-
+		}
 		# This page doesn't have an entry in the redirect table
 		return $this->mRedirectTarget = $this->insertRedirect();
 	}
@@ -94,15 +103,19 @@ class Article {
 	 * @return Title object
 	 */
 	public function insertRedirect() {
-		$retval = Title::newFromRedirect($this->getContent());
-		if(!$retval)
+		$retval = Title::newFromRedirect( $this->getContent() );
+		if( !$retval ) {
 			return null;
-		$dbw = wfGetDB(DB_MASTER);
-		$dbw->replace('redirect', array('rd_from'), array(
+		}
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->replace( 'redirect', array('rd_from'), 
+			array(
 				'rd_from' => $this->getID(),
 				'rd_namespace' => $retval->getNamespace(),
 				'rd_title' => $retval->getDBKey()
-		), __METHOD__);
+			),
+			__METHOD__
+		);
 		return $retval;
 	}
 
@@ -113,9 +126,9 @@ class Article {
 	 */
 	public function followRedirect() {
 		$text = $this->getContent();
-		return self::followRedirectText( $text );
+		return $this->followRedirectText( $text );
 	}
-	
+
 	/**
 	 * Get the Title object this text redirects to
 	 *
@@ -131,7 +144,6 @@ class Article {
 					//
 					// This can be hard to reverse and may produce loops,
 					// so they may be disabled in the site configuration.
-
 					$source = $this->mTitle->getFullURL( 'redirect=no' );
 					return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) );
 				}
@@ -142,7 +154,6 @@ class Article {
 					// the rest of the page we're on.
 					//
 					// This can be hard to reverse, so they may be disabled.
-
 					if( $rt->isSpecial( 'Userlogout' ) ) {
 						// rolleyes
 					} else {
@@ -159,15 +170,15 @@ class Article {
 	/**
 	 * get the title object of the article
 	 */
-	function getTitle() {
+	public function getTitle() {
 		return $this->mTitle;
 	}
 
 	/**
-	  * Clear the object
-	  * @private
-	  */
-	function clear() {
+	 * Clear the object
+	 * @private
+	 */
+	public function clear() {
 		$this->mDataLoaded    = false;
 		$this->mContentLoaded = false;
 
@@ -190,30 +201,27 @@ class Article {
 	 * Note that getContent/loadContent do not follow redirects anymore.
 	 * If you need to fetch redirectable content easily, try
 	 * the shortcut in Article::followContent()
-	 * FIXME
-	 * @todo There are still side-effects in this!
-	 *        In general, you should use the Revision class, not Article,
-	 *        to fetch text for purposes other than page views.
 	 *
 	 * @return Return the text of this revision
 	*/
-	function getContent() {
-		global $wgUser, $wgOut, $wgMessageCache;
-
+	public function getContent() {
+		global $wgUser, $wgContLang, $wgOut, $wgMessageCache;
 		wfProfileIn( __METHOD__ );
-
-		if ( 0 == $this->getID() ) {
-			wfProfileOut( __METHOD__ );
-			$wgOut->setRobotpolicy( 'noindex,nofollow' );
-
-			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-				$wgMessageCache->loadAllMessages();
-				$ret = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
+		if( $this->getID() === 0 ) {
+			# If this is a MediaWiki:x message, then load the messages
+			# and return the message value for x.
+			if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+				# If this is a system message, get the default text.
+				list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) );
+				$wgMessageCache->loadAllMessages( $lang );
+				$text = wfMsgGetKey( $message, false, $lang, false );
+				if( wfEmptyMsg( $message, $text ) )
+					$text = '';
 			} else {
-				$ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
+				$text = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
 			}
-
-			return "<div class='noarticletext'>\n$ret\n</div>";
+			wfProfileOut( __METHOD__ );
+			return $text;
 		} else {
 			$this->loadContent();
 			wfProfileOut( __METHOD__ );
@@ -233,7 +241,7 @@ class Article {
 	 * @return string text of the requested section
 	 * @deprecated
 	 */
-	function getSection($text,$section) {
+	public function getSection( $text, $section ) {
 		global $wgParser;
 		return $wgParser->getSection( $text, $section );
 	}
@@ -242,8 +250,8 @@ class Article {
 	 * @return int The oldid of the article that is to be shown, 0 for the
 	 *             current revision
 	 */
-	function getOldID() {
-		if ( is_null( $this->mOldId ) ) {
+	public function getOldID() {
+		if( is_null( $this->mOldId ) ) {
 			$this->mOldId = $this->getOldIDFromRequest();
 		}
 		return $this->mOldId;
@@ -254,32 +262,27 @@ class Article {
 	 *
 	 * @return int The old id for the request
 	 */
-	function getOldIDFromRequest() {
+	public function getOldIDFromRequest() {
 		global $wgRequest;
 		$this->mRedirectUrl = false;
 		$oldid = $wgRequest->getVal( 'oldid' );
-		if ( isset( $oldid ) ) {
+		if( isset( $oldid ) ) {
 			$oldid = intval( $oldid );
-			if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
+			if( $wgRequest->getVal( 'direction' ) == 'next' ) {
 				$nextid = $this->mTitle->getNextRevisionID( $oldid );
-				if ( $nextid  ) {
+				if( $nextid  ) {
 					$oldid = $nextid;
 				} else {
 					$this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
 				}
-			} elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) {
+			} elseif( $wgRequest->getVal( 'direction' ) == 'prev' ) {
 				$previd = $this->mTitle->getPreviousRevisionID( $oldid );
-				if ( $previd ) {
+				if( $previd ) {
 					$oldid = $previd;
-				} else {
-					# TODO
 				}
 			}
-			# unused:
-			# $lastid = $oldid;
 		}
-
-		if ( !$oldid ) {
+		if( !$oldid ) {
 			$oldid = 0;
 		}
 		return $oldid;
@@ -289,25 +292,24 @@ class Article {
 	 * Load the revision (including text) into this object
 	 */
 	function loadContent() {
-		if ( $this->mContentLoaded ) return;
-
+		if( $this->mContentLoaded ) return;
+		wfProfileIn( __METHOD__ );
 		# Query variables :P
 		$oldid = $this->getOldID();
-
 		# Pre-fill content with error message so that if something
 		# fails we'll have something telling us what we intended.
 		$this->mOldId = $oldid;
 		$this->fetchContent( $oldid );
+		wfProfileOut( __METHOD__ );
 	}
 
 
 	/**
 	 * Fetch a page record with the given conditions
-	 * @param Database $dbr
-	 * @param array    $conditions
-	 * @private
+	 * @param $dbr Database object
+	 * @param $conditions Array
 	 */
-	function pageData( $dbr, $conditions ) {
+	protected function pageData( $dbr, $conditions ) {
 		$fields = array(
 				'page_id',
 				'page_namespace',
@@ -333,20 +335,20 @@ class Article {
 	}
 
 	/**
-	 * @param Database $dbr
-	 * @param Title $title
+	 * @param $dbr Database object
+	 * @param $title Title object
 	 */
-	function pageDataFromTitle( $dbr, $title ) {
+	public function pageDataFromTitle( $dbr, $title ) {
 		return $this->pageData( $dbr, array(
 			'page_namespace' => $title->getNamespace(),
 			'page_title'     => $title->getDBkey() ) );
 	}
 
 	/**
-	 * @param Database $dbr
-	 * @param int $id
+	 * @param $dbr Database
+	 * @param $id Integer
 	 */
-	function pageDataFromId( $dbr, $id ) {
+	protected function pageDataFromId( $dbr, $id ) {
 		return $this->pageData( $dbr, array( 'page_id' => $id ) );
 	}
 
@@ -354,22 +356,21 @@ class Article {
 	 * Set the general counter, title etc data loaded from
 	 * some source.
 	 *
-	 * @param object $data
-	 * @private
+	 * @param $data Database row object or "fromdb"
 	 */
-	function loadPageData( $data = 'fromdb' ) {
-		if ( $data === 'fromdb' ) {
+	public function loadPageData( $data = 'fromdb' ) {
+		if( $data === 'fromdb' ) {
 			$dbr = wfGetDB( DB_MASTER );
 			$data = $this->pageDataFromId( $dbr, $this->getId() );
 		}
 
 		$lc = LinkCache::singleton();
-		if ( $data ) {
+		if( $data ) {
 			$lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect );
 
 			$this->mTitle->mArticleID = $data->page_id;
 
-			# Old-fashioned restrictions.
+			# Old-fashioned restrictions
 			$this->mTitle->loadRestrictions( $data->page_restrictions );
 
 			$this->mCounter     = $data->page_counter;
@@ -377,7 +378,7 @@ class Article {
 			$this->mIsRedirect  = $data->page_is_redirect;
 			$this->mLatest      = $data->page_latest;
 		} else {
-			if ( is_object( $this->mTitle ) ) {
+			if( is_object( $this->mTitle ) ) {
 				$lc->addBadLinkObj( $this->mTitle );
 			}
 			$this->mTitle->mArticleID = 0;
@@ -389,11 +390,11 @@ class Article {
 	/**
 	 * Get text of an article from database
 	 * Does *NOT* follow redirects.
-	 * @param int $oldid 0 for whatever the latest revision is
+	 * @param $oldid Int: 0 for whatever the latest revision is
 	 * @return string
 	 */
 	function fetchContent( $oldid = 0 ) {
-		if ( $this->mContentLoaded ) {
+		if( $this->mContentLoaded ) {
 			return $this->mContent;
 		}
 
@@ -429,14 +430,14 @@ class Article {
 			}
 			$revision = Revision::newFromId( $this->mLatest );
 			if( is_null( $revision ) ) {
-				wfDebug( __METHOD__." failed to retrieve current page, rev_id {$data->page_latest}\n" );
+				wfDebug( __METHOD__." failed to retrieve current page, rev_id {$this->mLatest}\n" );
 				return false;
 			}
 		}
 
 		// FIXME: Horrible, horrible! This content-loading interface just plain sucks.
 		// We should instead work with the Revision object when we need it...
-		$this->mContent   = $revision->revText(); // Loads if user is allowed
+		$this->mContent   = $revision->getText( Revision::FOR_THIS_USER ); // Loads if user is allowed
 
 		$this->mUser      = $revision->getUser();
 		$this->mUserText  = $revision->getUserText();
@@ -457,7 +458,7 @@ class Article {
 	 *
 	 * @param $x Mixed: FIXME
 	 */
-	function forUpdate( $x = NULL ) {
+	public function forUpdate( $x = NULL ) {
 		return wfSetVar( $this->mForUpdate, $x );
 	}
 
@@ -479,9 +480,9 @@ class Article {
 	 *                       the default
 	 * @return Array: options
 	 */
-	function getSelectOptions( $options = '' ) {
-		if ( $this->mForUpdate ) {
-			if ( is_array( $options ) ) {
+	protected function getSelectOptions( $options = '' ) {
+		if( $this->mForUpdate ) {
+			if( is_array( $options ) ) {
 				$options[] = 'FOR UPDATE';
 			} else {
 				$options = 'FOR UPDATE';
@@ -493,7 +494,7 @@ class Article {
 	/**
 	 * @return int Page ID
 	 */
-	function getID() {
+	public function getID() {
 		if( $this->mTitle ) {
 			return $this->mTitle->getArticleID();
 		} else {
@@ -504,22 +505,38 @@ class Article {
 	/**
 	 * @return bool Whether or not the page exists in the database
 	 */
-	function exists() {
-		return $this->getId() != 0;
+	public function exists() {
+		return $this->getId() > 0;
+	}
+	
+	/**
+	 * Check if this page is something we're going to be showing
+	 * some sort of sensible content for. If we return false, page
+	 * views (plain action=view) will return an HTTP 404 response,
+	 * so spiders and robots can know they're following a bad link.
+	 *
+	 * @return bool
+	 */
+	public function hasViewableContent() {
+		return $this->exists() || $this->mTitle->isAlwaysKnown();
 	}
 
 	/**
 	 * @return int The view count for the page
 	 */
-	function getCount() {
-		if ( -1 == $this->mCounter ) {
+	public function getCount() {
+		if( -1 == $this->mCounter ) {
 			$id = $this->getID();
-			if ( $id == 0 ) {
+			if( $id == 0 ) {
 				$this->mCounter = 0;
 			} else {
 				$dbr = wfGetDB( DB_SLAVE );
-				$this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
-					'Article::getCount', $this->getSelectOptions() );
+				$this->mCounter = $dbr->selectField( 'page', 
+					'page_counter', 
+					array( 'page_id' => $id ), 
+					__METHOD__, 
+					$this->getSelectOptions()
+				);
 			}
 		}
 		return $this->mCounter;
@@ -532,14 +549,11 @@ class Article {
 	 * @param $text String: text to analyze
 	 * @return bool
 	 */
-	function isCountable( $text ) {
+	public function isCountable( $text ) {
 		global $wgUseCommaCount;
 
 		$token = $wgUseCommaCount ? ',' : '[[';
-		return
-			$this->mTitle->isContentPage()
-			&& !$this->isRedirect( $text )
-			&& in_string( $token, $text );
+		return $this->mTitle->isContentPage() && !$this->isRedirect($text) && in_string($token,$text);
 	}
 
 	/**
@@ -548,11 +562,11 @@ class Article {
 	 * @param $text String: FIXME
 	 * @return bool
 	 */
-	function isRedirect( $text = false ) {
-		if ( $text === false ) {
-			if ( $this->mDataLoaded ) 
+	public function isRedirect( $text = false ) {
+		if( $text === false ) {
+			if( $this->mDataLoaded ) {
 				return $this->mIsRedirect;
-			
+			}
 			// Apparently loadPageData was never called
 			$this->loadContent();
 			$titleObj = Title::newFromRedirect( $this->fetchContent() );
@@ -567,28 +581,25 @@ class Article {
 	 * to this page (and it exists).
 	 * @return bool
 	 */
-	function isCurrent() {
+	public function isCurrent() {
 		# If no oldid, this is the current version.
-		if ($this->getOldID() == 0)
+		if( $this->getOldID() == 0 ) {
 			return true;
-
-		return $this->exists() &&
-			isset( $this->mRevision ) &&
-			$this->mRevision->isCurrent();
+		}
+		return $this->exists() && isset($this->mRevision) && $this->mRevision->isCurrent();
 	}
 
 	/**
 	 * Loads everything except the text
 	 * This isn't necessary for all uses, so it's only done if needed.
-	 * @private
 	 */
-	function loadLastEdit() {
-		if ( -1 != $this->mUser )
+	protected function loadLastEdit() {
+		if( -1 != $this->mUser )
 			return;
 
 		# New or non-existent articles have no user information
 		$id = $this->getID();
-		if ( 0 == $id ) return;
+		if( 0 == $id ) return;
 
 		$this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
 		if( !is_null( $this->mLastRevision ) ) {
@@ -601,35 +612,36 @@ class Article {
 		}
 	}
 
-	function getTimestamp() {
+	public function getTimestamp() {
 		// Check if the field has been filled by ParserCache::get()
-		if ( !$this->mTimestamp ) {
+		if( !$this->mTimestamp ) {
 			$this->loadLastEdit();
 		}
 		return wfTimestamp(TS_MW, $this->mTimestamp);
 	}
 
-	function getUser() {
+	public function getUser() {
 		$this->loadLastEdit();
 		return $this->mUser;
 	}
 
-	function getUserText() {
+	public function getUserText() {
 		$this->loadLastEdit();
 		return $this->mUserText;
 	}
 
-	function getComment() {
+	public function getComment() {
 		$this->loadLastEdit();
 		return $this->mComment;
 	}
 
-	function getMinorEdit() {
+	public function getMinorEdit() {
 		$this->loadLastEdit();
 		return $this->mMinorEdit;
 	}
 
-	function getRevIdFetched() {
+	/* Use this to fetch the rev ID used on page views */
+	public function getRevIdFetched() {
 		$this->loadLastEdit();
 		return $this->mRevIdFetched;
 	}
@@ -638,7 +650,7 @@ class Article {
 	 * @param $limit Integer: default 0.
 	 * @param $offset Integer: default 0.
 	 */
-	function getContributors($limit = 0, $offset = 0) {
+	public function getContributors($limit = 0, $offset = 0) {
 		# XXX: this is expensive; cache this info somewhere.
 
 		$contribs = array();
@@ -648,49 +660,62 @@ class Article {
 		$user = $this->getUser();
 		$pageId = $this->getId();
 
-		$sql = "SELECT rev_user, rev_user_text, user_real_name, MAX(rev_timestamp) as timestamp
+		$sql = "SELECT {$userTable}.*, MAX(rev_timestamp) as timestamp
 			FROM $revTable LEFT JOIN $userTable ON rev_user = user_id
 			WHERE rev_page = $pageId
 			AND rev_user != $user
 			GROUP BY rev_user, rev_user_text, user_real_name
 			ORDER BY timestamp DESC";
 
-		if ($limit > 0) { $sql .= ' LIMIT '.$limit; }
-		if ($offset > 0) { $sql .= ' OFFSET '.$offset; }
-		
-		$sql .= ' '. $this->getSelectOptions();
+		if($limit > 0) { $sql .= ' LIMIT '.$limit; }
+		if($offset > 0) { $sql .= ' OFFSET '.$offset; }
 
-		$res = $dbr->query($sql, __METHOD__);
+		$sql .= ' '. $this->getSelectOptions();
 
-		while ( $line = $dbr->fetchObject( $res ) ) {
-			$contribs[] = array($line->rev_user, $line->rev_user_text, $line->user_real_name);
-		}
+		$res = $dbr->query($sql, __METHOD__ );
 
-		$dbr->freeResult($res);
-		return $contribs;
+		return new UserArrayFromResult( $res );
 	}
 
 	/**
 	 * This is the default action of the script: just view the page of
 	 * the given title.
 	*/
-	function view() {
+	public function view() {
 		global $wgUser, $wgOut, $wgRequest, $wgContLang;
 		global $wgEnableParserCache, $wgStylePath, $wgParser;
 		global $wgUseTrackbacks, $wgNamespaceRobotPolicies, $wgArticleRobotPolicies;
 		global $wgDefaultRobotPolicy;
-		$sk = $wgUser->getSkin();
 
 		wfProfileIn( __METHOD__ );
 
-		$parserCache = ParserCache::singleton();
-		$ns = $this->mTitle->getNamespace(); # shortcut
-
 		# Get variables from query string
 		$oldid = $this->getOldID();
 
+		# Try file cache
+		if( $oldid === 0 && $this->checkTouched() ) {
+			global $wgUseETag;
+			if( $wgUseETag ) {
+				$parserCache = ParserCache::singleton();
+				$wgOut->setETag( $parserCache->getETag($this,$wgUser) );
+			}
+			if( $wgOut->checkLastModified( $this->getTouched() ) ) {
+				wfProfileOut( __METHOD__ );
+				return;
+			} else if( $this->tryFileCache() ) {
+				# tell wgOut that output is taken care of
+				$wgOut->disable();
+				$this->viewUpdates();
+				wfProfileOut( __METHOD__ );
+				return;
+			}
+		}
+
+		$ns = $this->mTitle->getNamespace(); # shortcut
+		$sk = $wgUser->getSkin();
+
 		# getOldID may want us to redirect somewhere else
-		if ( $this->mRedirectUrl ) {
+		if( $this->mRedirectUrl ) {
 			$wgOut->redirect( $this->mRedirectUrl );
 			wfProfileOut( __METHOD__ );
 			return;
@@ -701,13 +726,14 @@ class Article {
 		$rdfrom = $wgRequest->getVal( 'rdfrom' );
 		$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
 		$purge = $wgRequest->getVal( 'action' ) == 'purge';
+		$return404 = false;
 
 		$wgOut->setArticleFlag( true );
 
 		# Discourage indexing of printable versions, but encourage following
 		if( $wgOut->isPrintable() ) {
 			$policy = 'noindex,follow';
-		} elseif ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
+		} elseif( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
 			$policy = $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()];
 		} elseif( isset( $wgNamespaceRobotPolicies[$ns] ) ) {
 			# Honour customised robot policies for this namespace
@@ -720,10 +746,12 @@ class Article {
 		# If we got diff and oldid in the query, we want to see a
 		# diff page instead of the article.
 
-		if ( !is_null( $diff ) ) {
+		if( !is_null( $diff ) ) {
 			$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
 
-			$de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid, $purge );
+			$diff = $wgRequest->getVal( 'diff' );
+			$htmldiff = $wgRequest->getVal( 'htmldiff' , false);
+			$de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid, $purge, $htmldiff);
 			// DifferenceEngine directly fetched the revision:
 			$this->mRevIdFetched = $de->mNewid;
 			$de->showDiffPage( $diffOnly );
@@ -738,51 +766,36 @@ class Article {
 			return;
 		}
 
-		if ( empty( $oldid ) && $this->checkTouched() ) {
-			$wgOut->setETag($parserCache->getETag($this, $wgUser));
-
-			if( $wgOut->checkLastModified( $this->mTouched ) ){
-				wfProfileOut( __METHOD__ );
-				return;
-			} else if ( $this->tryFileCache() ) {
-				# tell wgOut that output is taken care of
-				$wgOut->disable();
-				$this->viewUpdates();
-				wfProfileOut( __METHOD__ );
-				return;
-			}
-		}
-
 		# Should the parser cache be used?
 		$pcache = $this->useParserCache( $oldid );
 		wfDebug( 'Article::view using parser cache: ' . ($pcache ? 'yes' : 'no' ) . "\n" );
-		if ( $wgUser->getOption( 'stubthreshold' ) ) {
+		if( $wgUser->getOption( 'stubthreshold' ) ) {
 			wfIncrStats( 'pcache_miss_stub' );
 		}
 
 		$wasRedirected = false;
-		if ( isset( $this->mRedirectedFrom ) ) {
+		if( isset( $this->mRedirectedFrom ) ) {
 			// This is an internally redirected page view.
 			// We'll need a backlink to the source page for navigation.
-			if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+			if( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
 				$redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
-				$s = wfMsg( 'redirectedfrom', $redir );
+				$s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
 				$wgOut->setSubtitle( $s );
 
 				// Set the fragment if one was specified in the redirect
-				if ( strval( $this->mTitle->getFragment() ) != '' ) {
+				if( strval( $this->mTitle->getFragment() ) != '' ) {
 					$fragment = Xml::escapeJsString( $this->mTitle->getFragmentForURL() );
 					$wgOut->addInlineScript( "redirectToFragment(\"$fragment\");" );
 				}
 				$wasRedirected = true;
 			}
-		} elseif ( !empty( $rdfrom ) ) {
+		} elseif( !empty( $rdfrom ) ) {
 			// This is an externally redirected view, from some other wiki.
 			// If it was reported from a trusted site, supply a backlink.
 			global $wgRedirectSources;
 			if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
 				$redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
-				$s = wfMsg( 'redirectedfrom', $redir );
+				$s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
 				$wgOut->setSubtitle( $s );
 				$wasRedirected = true;
 			}
@@ -790,18 +803,20 @@ class Article {
 
 		$outputDone = false;
 		wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$pcache ) );
-		if ( $pcache ) {
-			if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
-				// Ensure that UI elements requiring revision ID have
-				// the correct version information.
-				$wgOut->setRevisionId( $this->mLatest );
-				$outputDone = true;
-			}
+		if( $pcache && $wgOut->tryParserCache( $this, $wgUser ) ) {
+			// Ensure that UI elements requiring revision ID have
+			// the correct version information.
+			$wgOut->setRevisionId( $this->mLatest );
+			$outputDone = true;
 		}
 		# Fetch content and check for errors
-		if ( !$outputDone ) {
+		if( !$outputDone ) {
+			# If the article does not exist and was deleted, show the log
+			if( $this->getID() == 0 ) {
+				$this->showDeletionLog();
+			}
 			$text = $this->getContent();
-			if ( $text === false ) {
+			if( $text === false ) {
 				# Failed to load, replace text with error message
 				$t = $this->mTitle->getPrefixedText();
 				if( $oldid ) {
@@ -811,18 +826,38 @@ class Article {
 					$text = wfMsg( 'noarticletext' );
 				}
 			}
+			
+			# Non-existent pages
+			if( $this->getID() === 0 ) {
+				$wgOut->setRobotPolicy( 'noindex,nofollow' );
+				$text = "<div class='noarticletext'>\n$text\n</div>";
+				if( !$this->hasViewableContent() ) {
+					// If there's no backing content, send a 404 Not Found
+					// for better machine handling of broken links.
+					$return404 = true;
+				}
+			} 
+
+			if( $return404 ) {
+				$wgRequest->response()->header( "HTTP/1.x 404 Not Found" );
+			}
 
 			# Another whitelist check in case oldid is altering the title
-			if ( !$this->mTitle->userCanRead() ) {
+			if( !$this->mTitle->userCanRead() ) {
 				$wgOut->loginToUse();
 				$wgOut->output();
+				$wgOut->disable();
 				wfProfileOut( __METHOD__ );
-				exit;
+				return;
 			}
+			
+			# For ?curid=x urls, disallow indexing
+			if( $wgRequest->getInt('curid') )
+				$wgOut->setRobotPolicy( 'noindex,follow' );
 
 			# We're looking at an old revision
-			if ( !empty( $oldid ) ) {
-				$wgOut->setRobotpolicy( 'noindex,nofollow' );
+			if( !empty( $oldid ) ) {
+				$wgOut->setRobotPolicy( 'noindex,nofollow' );
 				if( is_null( $this->mRevision ) ) {
 					// FIXME: This would be a nice place to load the 'no such page' text.
 				} else {
@@ -840,27 +875,27 @@ class Article {
 					}
 				}
 			}
-			
+
 			$wgOut->setRevisionId( $this->getRevIdFetched() );
 
 			 // Pages containing custom CSS or JavaScript get special treatment
 			if( $this->mTitle->isCssOrJsPage() || $this->mTitle->isCssJsSubpage() ) {
-				$wgOut->addHtml( wfMsgExt( 'clearyourcache', 'parse' ) );
+				$wgOut->addHTML( wfMsgExt( 'clearyourcache', 'parse' ) );
 				// Give hooks a chance to customise the output
 				if( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
 					// Wrap the whole lot in a <pre> and don't parse
 					$m = array();
 					preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
-					$wgOut->addHtml( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
-					$wgOut->addHtml( htmlspecialchars( $this->mContent ) );
-					$wgOut->addHtml( "\n</pre>\n" );
+					$wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
+					$wgOut->addHTML( htmlspecialchars( $this->mContent ) );
+					$wgOut->addHTML( "\n</pre>\n" );
 				}
-			} else if ( $rt = Title::newFromRedirect( $text ) ) {
+			} else if( $rt = Title::newFromRedirect( $text ) ) {
 				# Don't append the subtitle if this was an old revision
-				$this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() );
+				$wgOut->addHTML( $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ) );
 				$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
 				$wgOut->addParserOutputNoText( $parseout );
-			} else if ( $pcache ) {
+			} else if( $pcache ) {
 				# Display content and save to parser cache
 				$this->outputWikiText( $text );
 			} else {
@@ -876,7 +911,7 @@ class Article {
 				$time += wfTime();
 
 				# Timing hack
-				if ( $time > 3 ) {
+				if( $time > 3 ) {
 					wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
 						$this->mTitle->getPrefixedDBkey()));
 				}
@@ -890,6 +925,14 @@ class Article {
 		$t = $wgOut->getPageTitle();
 		if( empty( $t ) ) {
 			$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+
+			# For the main page, overwrite the <title> element with the con-
+			# tents of 'pagetitle-view-mainpage' instead of the default (if
+			# that's not empty).
+			if( $this->mTitle->equals( Title::newMainPage() ) &&
+			wfMsgForContent( 'pagetitle-view-mainpage' ) !== '' ) {
+				$wgOut->setHTMLTitle( wfMsgForContent( 'pagetitle-view-mainpage' ) );
+			}
 		}
 
 		# check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
@@ -899,7 +942,7 @@ class Article {
 
 		# If we have been passed an &rcid= parameter, we want to give the user a
 		# chance to mark this new article as patrolled.
-		if( !is_null( $rcid ) && $rcid != 0 && $wgUser->isAllowed( 'patrol' ) && $this->mTitle->exists() ) {
+		if( !empty($rcid) && $this->mTitle->exists() && $this->mTitle->userCan('patrol') ) {
 			$wgOut->addHTML(
 				"<div class='patrollink'>" .
 					wfMsgHtml( 'markaspatrolledlink',
@@ -911,19 +954,45 @@ class Article {
 		}
 
 		# Trackbacks
-		if ($wgUseTrackbacks)
+		if( $wgUseTrackbacks ) {
 			$this->addTrackbacks();
+		}
 
 		$this->viewUpdates();
 		wfProfileOut( __METHOD__ );
 	}
 	
-	/* 
+	protected function showDeletionLog() {
+		global $wgUser, $wgOut;
+		$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut );
+		$pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() );
+		if( $pager->getNumRows() > 0 ) {
+			$pager->mLimit = 10;
+			$wgOut->addHTML( '<div class="mw-warning-with-logexcerpt">' );
+			$wgOut->addWikiMsg( 'deleted-notice' );
+			$wgOut->addHTML(
+				$loglist->beginLogEventsList() .
+				$pager->getBody() .
+				$loglist->endLogEventsList()
+			);
+			if( $pager->getNumRows() > 10 ) {
+				$wgOut->addHTML( $wgUser->getSkin()->link(
+					SpecialPage::getTitleFor( 'Log' ),
+					wfMsgHtml( 'deletelog-fulllog' ),
+					array(),
+					array( 'type' => 'delete', 'page' => $this->mTitle->getPrefixedText() ) 
+				) );
+			}
+			$wgOut->addHTML( '</div>' );
+		}
+	}
+
+	/*
 	* Should the parser cache be used?
 	*/
 	protected function useParserCache( $oldid ) {
 		global $wgUser, $wgEnableParserCache;
-		
+
 		return $wgEnableParserCache
 			&& intval( $wgUser->getOption( 'stubthreshold' ) ) == 0
 			&& $this->exists()
@@ -931,47 +1000,48 @@ class Article {
 			&& !$this->mTitle->isCssOrJsPage()
 			&& !$this->mTitle->isCssJsSubpage();
 	}
-	
-	protected function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
+
+	/**
+	 * View redirect
+	 * @param $target Title object of destination to redirect
+	 * @param $appendSubtitle Boolean [optional]
+	 * @param $forceKnown Boolean: should the image be shown as a bluelink regardless of existence?
+	 */
+	public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
 		global $wgParser, $wgOut, $wgContLang, $wgStylePath, $wgUser;
-		
 		# Display redirect
 		$imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
 		$imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
-		
+
 		if( $appendSubtitle ) {
 			$wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) );
 		}
 		$sk = $wgUser->getSkin();
-		if ( $forceKnown )
+		if( $forceKnown ) {
 			$link = $sk->makeKnownLinkObj( $target, htmlspecialchars( $target->getFullText() ) );
-		else
+		} else {
 			$link = $sk->makeLinkObj( $target, htmlspecialchars( $target->getFullText() ) );
+		}
+		return '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
+			'<span class="redirectText">'.$link.'</span>';
 
-		$wgOut->addHTML( '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
-			'<span class="redirectText">'.$link.'</span>' );
-		
 	}
 
-	function addTrackbacks() {
+	public function addTrackbacks() {
 		global $wgOut, $wgUser;
-
-		$dbr = wfGetDB(DB_SLAVE);
-		$tbs = $dbr->select(
-				/* FROM   */ 'trackbacks',
-				/* SELECT */ array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
-				/* WHERE  */ array('tb_page' => $this->getID())
+		$dbr = wfGetDB( DB_SLAVE );
+		$tbs = $dbr->select( 'trackbacks',
+			array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
+			array('tb_page' => $this->getID() )
 		);
-
-		if (!$dbr->numrows($tbs))
-			return;
+		if( !$dbr->numRows($tbs) ) return;
 
 		$tbtext = "";
-		while ($o = $dbr->fetchObject($tbs)) {
+		while( $o = $dbr->fetchObject($tbs) ) {
 			$rmvtxt = "";
-			if ($wgUser->isAllowed( 'trackback' )) {
-				$delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid="
-						. $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
+			if( $wgUser->isAllowed( 'trackback' ) ) {
+				$delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid=" .
+					$o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
 				$rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) );
 			}
 			$tbtext .= "\n";
@@ -983,33 +1053,31 @@ class Article {
 					$rmvtxt);
 		}
 		$wgOut->addWikiMsg( 'trackbackbox', $tbtext );
+		$this->mTitle->invalidateCache();
 	}
 
-	function deletetrackback() {
+	public function deletetrackback() {
 		global $wgUser, $wgRequest, $wgOut, $wgTitle;
-
-		if (!$wgUser->matchEditToken($wgRequest->getVal('token'))) {
+		if( !$wgUser->matchEditToken($wgRequest->getVal('token')) ) {
 			$wgOut->addWikiMsg( 'sessionfailure' );
 			return;
 		}
 
 		$permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
-
-		if (count($permission_errors)>0)
-		{
+		if( count($permission_errors) ) {
 			$wgOut->showPermissionsErrorPage( $permission_errors );
 			return;
 		}
 
-		$db = wfGetDB(DB_MASTER);
-		$db->delete('trackbacks', array('tb_id' => $wgRequest->getInt('tbid')));
-		$wgTitle->invalidateCache();
-		$wgOut->addWikiMsg('trackbackdeleteok');
+		$db = wfGetDB( DB_MASTER );
+		$db->delete( 'trackbacks', array('tb_id' => $wgRequest->getInt('tbid')) );
+
+		$wgOut->addWikiMsg( 'trackbackdeleteok' );
+		$this->mTitle->invalidateCache();
 	}
 
-	function render() {
+	public function render() {
 		global $wgOut;
-
 		$wgOut->setArticleBodyOnly(true);
 		$this->view();
 	}
@@ -1017,37 +1085,36 @@ class Article {
 	/**
 	 * Handle action=purge
 	 */
-	function purge() {
+	public function purge() {
 		global $wgUser, $wgRequest, $wgOut;
-
-		if ( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
+		if( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
 			if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
 				$this->doPurge();
+				$this->view();
 			}
 		} else {
-			$msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
-			$action = htmlspecialchars( $_SERVER['REQUEST_URI'] );
-			$button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
-			$msg = str_replace( '$1',
-				"<form method=\"post\" action=\"$action\">\n" .
-				"<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
-				"</form>\n", $msg );
-
+			$action = htmlspecialchars( $wgRequest->getRequestURL() );
+			$button = wfMsgExt( 'confirm_purge_button', array('escapenoentities') );
+			$form = "<form method=\"post\" action=\"$action\">\n" .
+					"<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
+					"</form>\n";
+			$top = wfMsgExt( 'confirm-purge-top', array('parse') );
+			$bottom = wfMsgExt( 'confirm-purge-bottom', array('parse') );
 			$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-			$wgOut->setRobotpolicy( 'noindex,nofollow' );
-			$wgOut->addHTML( $msg );
+			$wgOut->setRobotPolicy( 'noindex,nofollow' );
+			$wgOut->addHTML( $top . $form . $bottom );
 		}
 	}
 
 	/**
 	 * Perform the actions of a page purging
 	 */
-	function doPurge() {
+	public function doPurge() {
 		global $wgUseSquid;
 		// Invalidate the cache
 		$this->mTitle->invalidateCache();
 
-		if ( $wgUseSquid ) {
+		if( $wgUseSquid ) {
 			// Commit the transaction before the purge is sent
 			$dbw = wfGetDB( DB_MASTER );
 			$dbw->immediateCommit();
@@ -1056,16 +1123,15 @@ class Article {
 			$update = SquidUpdate::newSimplePurge( $this->mTitle );
 			$update->doUpdate();
 		}
-		if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+		if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 			global $wgMessageCache;
-			if ( $this->getID() == 0 ) {
+			if( $this->getID() == 0 ) {
 				$text = false;
 			} else {
 				$text = $this->getContent();
 			}
 			$wgMessageCache->replace( $this->mTitle->getDBkey(), $text );
 		}
-		$this->view();
 	}
 
 	/**
@@ -1075,11 +1141,11 @@ class Article {
 	 * or else the record will be left in a funky state.
 	 * Best if all done inside a transaction.
 	 *
-	 * @param Database $dbw
-	 * @return int     The newly created page_id key
+	 * @param $dbw Database
+	 * @return int The newly created page_id key, or false if the title already existed
 	 * @private
 	 */
-	function insertOn( $dbw ) {
+	public function insertOn( $dbw ) {
 		wfProfileIn( __METHOD__ );
 
 		$page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
@@ -1095,31 +1161,33 @@ class Article {
 			'page_touched'      => $dbw->timestamp(),
 			'page_latest'       => 0, # Fill this in shortly...
 			'page_len'          => 0, # Fill this in shortly...
-		), __METHOD__ );
-		$newid = $dbw->insertId();
-
-		$this->mTitle->resetArticleId( $newid );
+		), __METHOD__, 'IGNORE' );
 
+		$affected = $dbw->affectedRows();
+		if( $affected ) {
+			$newid = $dbw->insertId();
+			$this->mTitle->resetArticleId( $newid );
+		}
 		wfProfileOut( __METHOD__ );
-		return $newid;
+		return $affected ? $newid : false;
 	}
 
 	/**
 	 * Update the page record to point to a newly saved revision.
 	 *
-	 * @param Database $dbw
-	 * @param Revision $revision For ID number, and text used to set
-	                             length and redirect status fields
-	 * @param int $lastRevision If given, will not overwrite the page field
-	 *                          when different from the currently set value.
-	 *                          Giving 0 indicates the new page flag should
-	 *                          be set on.
-	 * @param bool $lastRevIsRedirect If given, will optimize adding and
-	 * 							removing rows in redirect table.
+	 * @param $dbw Database object
+	 * @param $revision Revision: For ID number, and text used to set
+	                    length and redirect status fields
+	 * @param $lastRevision Integer: if given, will not overwrite the page field
+	 *                      when different from the currently set value.
+	 *                      Giving 0 indicates the new page flag should be set
+	 *                      on.
+	 * @param $lastRevIsRedirect Boolean: if given, will optimize adding and
+	 * 							 removing rows in redirect table.
 	 * @return bool true on success, false on failure
 	 * @private
 	 */
-	function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
+	public function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
 		wfProfileIn( __METHOD__ );
 
 		$text = $revision->getText();
@@ -1143,8 +1211,7 @@ class Article {
 			__METHOD__ );
 
 		$result = $dbw->affectedRows() != 0;
-
-		if ($result) {
+		if( $result ) {
 			$this->updateRedirectOn( $dbw, $rt, $lastRevIsRedirect );
 		}
 
@@ -1155,46 +1222,40 @@ class Article {
 	/**
 	 * Add row to the redirect table if this is a redirect, remove otherwise.
 	 *
-	 * @param Database $dbw
+	 * @param $dbw Database
 	 * @param $redirectTitle a title object pointing to the redirect target,
-	 * 							or NULL if this is not a redirect
-	 * @param bool $lastRevIsRedirect If given, will optimize adding and
-	 * 							removing rows in redirect table.
+	 * 						 or NULL if this is not a redirect
+	 * @param $lastRevIsRedirect If given, will optimize adding and
+	 * 							 removing rows in redirect table.
 	 * @return bool true on success, false on failure
 	 * @private
 	 */
-	function updateRedirectOn( &$dbw, $redirectTitle, $lastRevIsRedirect = null ) {
-
+	public function updateRedirectOn( &$dbw, $redirectTitle, $lastRevIsRedirect = null ) {
 		// Always update redirects (target link might have changed)
 		// Update/Insert if we don't know if the last revision was a redirect or not
 		// Delete if changing from redirect to non-redirect
 		$isRedirect = !is_null($redirectTitle);
-		if ($isRedirect || is_null($lastRevIsRedirect) || $lastRevIsRedirect !== $isRedirect) {
-
+		if($isRedirect || is_null($lastRevIsRedirect) || $lastRevIsRedirect !== $isRedirect) {
 			wfProfileIn( __METHOD__ );
-
-			if ($isRedirect) {
-
+			if( $isRedirect ) {
 				// This title is a redirect, Add/Update row in the redirect table
 				$set = array( /* SET */
 					'rd_namespace' => $redirectTitle->getNamespace(),
 					'rd_title'     => $redirectTitle->getDBkey(),
 					'rd_from'      => $this->getId(),
 				);
-
 				$dbw->replace( 'redirect', array( 'rd_from' ), $set, __METHOD__ );
 			} else {
 				// This is not a redirect, remove row from redirect table
 				$where = array( 'rd_from' => $this->getId() );
 				$dbw->delete( 'redirect', $where, __METHOD__);
 			}
-
-			if( $this->getTitle()->getNamespace() == NS_IMAGE )
+			if( $this->getTitle()->getNamespace() == NS_FILE ) {
 				RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
+			}
 			wfProfileOut( __METHOD__ );
 			return ( $dbw->affectedRows() != 0 );
 		}
-
 		return true;
 	}
 
@@ -1202,12 +1263,11 @@ class Article {
 	 * If the given revision is newer than the currently set page_latest,
 	 * update the page record. Otherwise, do nothing.
 	 *
-	 * @param Database $dbw
-	 * @param Revision $revision
+	 * @param $dbw Database object
+	 * @param $revision Revision object
 	 */
-	function updateIfNewerOn( &$dbw, $revision ) {
+	public function updateIfNewerOn( &$dbw, $revision ) {
 		wfProfileIn( __METHOD__ );
-
 		$row = $dbw->selectRow(
 			array( 'revision', 'page' ),
 			array( 'rev_id', 'rev_timestamp', 'page_is_redirect' ),
@@ -1227,28 +1287,27 @@ class Article {
 			$prev = 0;
 			$lastRevIsRedirect = null;
 		}
-
 		$ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
 		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
 
 	/**
+	 * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
 	 * @return string Complete article text, or null if error
 	 */
-	function replaceSection($section, $text, $summary = '', $edittime = NULL) {
+	public function replaceSection( $section, $text, $summary = '', $edittime = NULL ) {
 		wfProfileIn( __METHOD__ );
-
-		if( $section == '' ) {
-			// Whole-page edit; let the text through unmolested.
+		if( strval( $section ) == '' ) {
+			// Whole-page edit; let the whole text through
 		} else {
-			if( is_null( $edittime ) ) {
+			if( is_null($edittime) ) {
 				$rev = Revision::newFromTitle( $this->mTitle );
 			} else {
 				$dbw = wfGetDB( DB_MASTER );
 				$rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
 			}
-			if( is_null( $rev ) ) {
+			if( !$rev ) {
 				wfDebug( "Article::replaceSection asked for bogus section (page: " .
 					$this->getId() . "; section: $section; edittime: $edittime)\n" );
 				return null;
@@ -1266,9 +1325,7 @@ class Article {
 				global $wgParser;
 				$text = $wgParser->replaceSection( $oldtext, $section, $text );
 			}
-
 		}
-
 		wfProfileOut( __METHOD__ );
 		return $text;
 	}
@@ -1277,27 +1334,28 @@ class Article {
 	 * @deprecated use Article::doEdit()
 	 */
 	function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false, $bot=false ) {
+		wfDeprecated( __METHOD__ );
 		$flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
 			( $isminor ? EDIT_MINOR : 0 ) |
 			( $suppressRC ? EDIT_SUPPRESS_RC : 0 ) |
 			( $bot ? EDIT_FORCE_BOT : 0 );
 
 		# If this is a comment, add the summary as headline
-		if ( $comment && $summary != "" ) {
+		if( $comment && $summary != "" ) {
 			$text = wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n".$text;
 		}
 
 		$this->doEdit( $text, $summary, $flags );
 
 		$dbw = wfGetDB( DB_MASTER );
-		if ($watchthis) {
-			if (!$this->mTitle->userIsWatching()) {
+		if($watchthis) {
+			if(!$this->mTitle->userIsWatching()) {
 				$dbw->begin();
 				$this->doWatch();
 				$dbw->commit();
 			}
 		} else {
-			if ( $this->mTitle->userIsWatching() ) {
+			if( $this->mTitle->userIsWatching() ) {
 				$dbw->begin();
 				$this->doUnwatch();
 				$dbw->commit();
@@ -1310,33 +1368,36 @@ class Article {
 	 * @deprecated use Article::doEdit()
 	 */
 	function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
+		wfDeprecated( __METHOD__ );
 		$flags = EDIT_UPDATE | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
 			( $minor ? EDIT_MINOR : 0 ) |
 			( $forceBot ? EDIT_FORCE_BOT : 0 );
 
-		$good = $this->doEdit( $text, $summary, $flags );
-		if ( $good ) {
-			$dbw = wfGetDB( DB_MASTER );
-			if ($watchthis) {
-				if (!$this->mTitle->userIsWatching()) {
-					$dbw->begin();
-					$this->doWatch();
-					$dbw->commit();
-				}
-			} else {
-				if ( $this->mTitle->userIsWatching() ) {
-					$dbw->begin();
-					$this->doUnwatch();
-					$dbw->commit();
-				}
+		$status = $this->doEdit( $text, $summary, $flags );
+		if( !$status->isOK() ) {
+			return false;
+		}
+
+		$dbw = wfGetDB( DB_MASTER );
+		if( $watchthis ) {
+			if(!$this->mTitle->userIsWatching()) {
+				$dbw->begin();
+				$this->doWatch();
+				$dbw->commit();
 			}
+		} else {
+			if( $this->mTitle->userIsWatching() ) {
+				$dbw->begin();
+				$this->doUnwatch();
+				$dbw->commit();
+			}
+		}
 
-			$extraQuery = ''; // Give extensions a chance to modify URL query on update
-			wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this, &$sectionanchor, &$extraQuery ) );
+		$extraQuery = ''; // Give extensions a chance to modify URL query on update
+		wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this, &$sectionanchor, &$extraQuery ) );
 
-			$this->doRedirect( $this->isRedirect( $text ), $sectionanchor, $extraQuery );
-		}
-		return $good;
+		$this->doRedirect( $this->isRedirect( $text ), $sectionanchor, $extraQuery );
+		return true;
 	}
 
 	/**
@@ -1347,9 +1408,9 @@ class Article {
 	 *
 	 * $wgUser must be set before calling this function.
 	 *
-	 * @param string $text New text
-	 * @param string $summary Edit summary
-	 * @param integer $flags bitfield:
+	 * @param $text String: new text
+	 * @param $summary String: edit summary
+	 * @param $flags Integer bitfield:
 	 *      EDIT_NEW
 	 *          Article is known or assumed to be non-existent, create a new one
 	 *      EDIT_UPDATE
@@ -1366,40 +1427,67 @@ class Article {
 	 *          Fill in blank summaries with generated text where possible
 	 *
 	 * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected.
-	 * If EDIT_UPDATE is specified and the article doesn't exist, the function will return false. If
-	 * EDIT_NEW is specified and the article does exist, a duplicate key error will cause an exception
-	 * to be thrown from the Database. These two conditions are also possible with auto-detection due
-	 * to MediaWiki's performance-optimised locking strategy.
-	 * @param $baseRevId, the revision ID this edit was based off, if any
+	 * If EDIT_UPDATE is specified and the article doesn't exist, the function will an 
+	 * edit-gone-missing error. If EDIT_NEW is specified and the article does exist, an 
+	 * edit-already-exists error will be returned. These two conditions are also possible with 
+	 * auto-detection due to MediaWiki's performance-optimised locking strategy.
+	 *
+	 * @param $baseRevId the revision ID this edit was based off, if any
+	 * @param $user Optional user object, $wgUser will be used if not passed
 	 *
-	 * @return bool success
+	 * @return Status object. Possible errors:
+	 *     edit-hook-aborted:       The ArticleSave hook aborted the edit but didn't set the fatal flag of $status
+	 *     edit-gone-missing:       In update mode, but the article didn't exist
+	 *     edit-conflict:           In update mode, the article changed unexpectedly
+	 *     edit-no-change:          Warning that the text was the same as before
+	 *     edit-already-exists:     In creation mode, but the article already exists
+	 *
+	 *  Extensions may define additional errors.
+	 *
+	 *  $return->value will contain an associative array with members as follows:
+	 *     new:                     Boolean indicating if the function attempted to create a new article
+	 *     revision:                The revision object for the inserted revision, or null
+	 *
+	 *  Compatibility note: this function previously returned a boolean value indicating success/failure
 	 */
-	function doEdit( $text, $summary, $flags = 0, $baseRevId = false ) {
+	public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
 		global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries;
 
+		# Low-level sanity check
+		if( $this->mTitle->getText() == '' ) {
+			throw new MWException( 'Something is trying to edit an article with an empty title' );
+		}
+
 		wfProfileIn( __METHOD__ );
-		$good = true;
 
-		if ( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) {
-			$aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
-			if ( $aid ) {
+		$user = is_null($user) ? $wgUser : $user;
+		$status = Status::newGood( array() );
+
+		# Load $this->mTitle->getArticleID() and $this->mLatest if it's not already
+		$this->loadPageData(); 
+
+		if( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) {
+			$aid = $this->mTitle->getArticleID();
+			if( $aid ) {
 				$flags |= EDIT_UPDATE;
 			} else {
 				$flags |= EDIT_NEW;
 			}
 		}
 
-		if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text,
-			&$summary, $flags & EDIT_MINOR,
-			null, null, &$flags ) ) )
+		if( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary,
+			$flags & EDIT_MINOR, null, null, &$flags, &$status ) ) )
 		{
 			wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" );
 			wfProfileOut( __METHOD__ );
-			return false;
+			if( $status->isOK() ) {
+				$status->fatal( 'edit-hook-aborted');
+			}
+			return $status;
 		}
 
 		# Silently ignore EDIT_MINOR if not allowed
-		$isminor = ( $flags & EDIT_MINOR ) && $wgUser->isAllowed('minoredit');
+		$isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed('minoredit');
 		$bot = $flags & EDIT_FORCE_BOT;
 
 		$oldtext = $this->getContent();
@@ -1417,32 +1505,29 @@ class Article {
 		$dbw = wfGetDB( DB_MASTER );
 		$now = wfTimestampNow();
 
-		if ( $flags & EDIT_UPDATE ) {
+		if( $flags & EDIT_UPDATE ) {
 			# Update article, but only if changed.
-
+			$status->value['new'] = false;
 			# Make sure the revision is either completely inserted or not inserted at all
 			if( !$wgDBtransactions ) {
 				$userAbort = ignore_user_abort( true );
 			}
 
-			$lastRevision = 0;
 			$revisionId = 0;
 
 			$changed = ( strcmp( $text, $oldtext ) != 0 );
 
-			if ( $changed ) {
+			if( $changed ) {
 				$this->mGoodAdjustment = (int)$this->isCountable( $text )
 				  - (int)$this->isCountable( $oldtext );
 				$this->mTotalAdjustment = 0;
 
-				$lastRevision = $dbw->selectField(
-					'page', 'page_latest', array( 'page_id' => $this->getId() ) );
-
-				if ( !$lastRevision ) {
+				if( !$this->mLatest ) {
 					# Article gone missing
 					wfDebug( __METHOD__.": EDIT_UPDATE specified but article doesn't exist\n" );
+					$status->fatal( 'edit-gone-missing' );
 					wfProfileOut( __METHOD__ );
-					return false;
+					return $status;
 				}
 
 				$revision = new Revision( array(
@@ -1450,38 +1535,54 @@ class Article {
 					'comment'    => $summary,
 					'minor_edit' => $isminor,
 					'text'       => $text,
-					'parent_id'  => $lastRevision
+					'parent_id'  => $this->mLatest,
+					'user'       => $user->getId(),
+					'user_text'  => $user->getName(),
 					) );
 
 				$dbw->begin();
 				$revisionId = $revision->insertOn( $dbw );
 
 				# Update page
-				$ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
+				#
+				# Note that we use $this->mLatest instead of fetching a value from the master DB 
+				# during the course of this function. This makes sure that EditPage can detect 
+				# edit conflicts reliably, either by $ok here, or by $article->getTimestamp() 
+				# before this function is called. A previous function used a separate query, this
+				# creates a window where concurrent edits can cause an ignored edit conflict.
+				$ok = $this->updateRevisionOn( $dbw, $revision, $this->mLatest );
 
 				if( !$ok ) {
 					/* Belated edit conflict! Run away!! */
-					$good = false;
+					$status->fatal( 'edit-conflict' );
+					# Delete the invalid revision if the DB is not transactional
+					if( !$wgDBtransactions ) {
+						$dbw->delete( 'revision', array( 'rev_id' => $revisionId ), __METHOD__ );
+					}
+					$revisionId = 0;
 					$dbw->rollback();
 				} else {
-					wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId ) );
-
+					global $wgUseRCPatrol;
+					wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, $baseRevId, $user) );
 					# Update recentchanges
 					if( !( $flags & EDIT_SUPPRESS_RC ) ) {
-						$rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
-							$lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
-							$revisionId );
-
 						# Mark as patrolled if the user can do so
-						if( $GLOBALS['wgUseRCPatrol'] && $wgUser->isAllowed( 'autopatrol' ) ) {
-							RecentChange::markPatrolled( $rcid );
-							PatrolLog::record( $rcid, true );
+						$patrolled = $wgUseRCPatrol && $this->mTitle->userCan('autopatrol');
+						# Add RC row to the DB
+						$rc = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $user, $summary,
+							$this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
+							$revisionId, $patrolled
+						);
+						# Log auto-patrolled edits
+						if( $patrolled ) {
+							PatrolLog::record( $rc, true );
 						}
 					}
-					$wgUser->incEditCount();
+					$user->incEditCount();
 					$dbw->commit();
 				}
 			} else {
+				$status->warning( 'edit-no-change' );
 				$revision = null;
 				// Keep the same revision ID, but do some updates on it
 				$revisionId = $this->getRevIdFetched();
@@ -1493,17 +1594,20 @@ class Article {
 			if( !$wgDBtransactions ) {
 				ignore_user_abort( $userAbort );
 			}
-
-			if ( $good ) {
-				# Invalidate cache of this article and all pages using this article
-				# as a template. Partly deferred.
-				Article::onArticleEdit( $this->mTitle );
-
-				# Update links tables, site stats, etc.
-				$this->editUpdates( $text, $summary, $isminor, $now, $revisionId, $changed );
+			// Now that ignore_user_abort is restored, we can respond to fatal errors
+			if( !$status->isOK() ) {
+				wfProfileOut( __METHOD__ );
+				return $status;
 			}
+
+			# Invalidate cache of this article and all pages using this article
+			# as a template. Partly deferred. Leave templatelinks for editUpdates().
+			Article::onArticleEdit( $this->mTitle, 'skiptransclusions' );
+			# Update links tables, site stats, etc.
+			$this->editUpdates( $text, $summary, $isminor, $now, $revisionId, $changed );
 		} else {
 			# Create new article
+			$status->value['new'] = true;
 
 			# Set statistics members
 			# We work out if it's countable after PST to avoid counter drift
@@ -1514,15 +1618,24 @@ class Article {
 			$dbw->begin();
 
 			# Add the page record; stake our claim on this title!
-			# This will fail with a database query exception if the article already exists
+			# This will return false if the article already exists
 			$newid = $this->insertOn( $dbw );
 
+			if( $newid === false ) {
+				$dbw->rollback();
+				$status->fatal( 'edit-already-exists' );
+				wfProfileOut( __METHOD__ );
+				return $status;
+			}
+
 			# Save the revision text...
 			$revision = new Revision( array(
 				'page'       => $newid,
 				'comment'    => $summary,
 				'minor_edit' => $isminor,
-				'text'       => $text
+				'text'       => $text,
+				'user'       => $user->getId(),
+				'user_text'  => $user->getName(),
 				) );
 			$revisionId = $revision->insertOn( $dbw );
 
@@ -1530,19 +1643,22 @@ class Article {
 
 			# Update the page record with revision data
 			$this->updateRevisionOn( $dbw, $revision, 0 );
-			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false) );
 
+			wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $user) );
+			# Update recentchanges
 			if( !( $flags & EDIT_SUPPRESS_RC ) ) {
-				$rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, $bot,
-				  '', strlen( $text ), $revisionId );
-				# Mark as patrolled if the user can
-				if( ($GLOBALS['wgUseRCPatrol'] || $GLOBALS['wgUseNPPatrol']) && $wgUser->isAllowed( 'autopatrol' ) ) {
-					RecentChange::markPatrolled( $rcid );
-					PatrolLog::record( $rcid, true );
+				global $wgUseRCPatrol, $wgUseNPPatrol;
+				# Mark as patrolled if the user can do so
+				$patrolled = ($wgUseRCPatrol || $wgUseNPPatrol) && $this->mTitle->userCan('autopatrol');
+				# Add RC row to the DB
+				$rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
+					'', strlen($text), $revisionId, $patrolled );
+				# Log auto-patrolled edits
+				if( $patrolled ) {
+					PatrolLog::record( $rc, true );
 				}
 			}
-			$wgUser->incEditCount();
+			$user->incEditCount();
 			$dbw->commit();
 
 			# Update links, etc.
@@ -1551,27 +1667,30 @@ class Article {
 			# Clear caches
 			Article::onArticleCreate( $this->mTitle );
 
-			wfRunHooks( 'ArticleInsertComplete', array( &$this, &$wgUser, $text, $summary,
-			 $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
+			wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary,
+				$flags & EDIT_MINOR, null, null, &$flags, $revision ) );
 		}
 
-		if ( $good && !( $flags & EDIT_DEFER_UPDATES ) ) {
+		# Do updates right now unless deferral was requested
+		if( !( $flags & EDIT_DEFER_UPDATES ) ) {
 			wfDoUpdates();
 		}
 
-		if ( $good ) {
-			wfRunHooks( 'ArticleSaveComplete', array( &$this, &$wgUser, $text, $summary,
-				$flags & EDIT_MINOR, null, null, &$flags, $revision ) );
-		}
+		// Return the new revision (or null) to the caller
+		$status->value['revision'] = $revision;
+
+		wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
+			$flags & EDIT_MINOR, null, null, &$flags, $revision, &$status ) );
 
 		wfProfileOut( __METHOD__ );
-		return $good;
+		return $status;
 	}
 
 	/**
 	 * @deprecated wrapper for doRedirect
 	 */
-	function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+	public function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+		wfDeprecated( __METHOD__ );
 		$this->doRedirect( $this->isRedirect( $text ), $sectionanchor );
 	}
 
@@ -1579,13 +1698,13 @@ class Article {
 	 * Output a redirect back to the article.
 	 * This is typically used after an edit.
 	 *
-	 * @param boolean $noRedir Add redirect=no
-	 * @param string $sectionAnchor section to redirect to, including "#"
-	 * @param string $extraQuery, extra query params
+	 * @param $noRedir Boolean: add redirect=no
+	 * @param $sectionAnchor String: section to redirect to, including "#"
+	 * @param $extraQuery String: extra query params
 	 */
-	function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
+	public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
 		global $wgOut;
-		if ( $noRedir ) {
+		if( $noRedir ) {
 			$query = 'redirect=no';
 			if( $extraQuery )
 				$query .= "&$query";
@@ -1598,77 +1717,45 @@ class Article {
 	/**
 	 * Mark this particular edit/page as patrolled
 	 */
-	function markpatrolled() {
+	public function markpatrolled() {
 		global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUseNPPatrol, $wgUser;
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
-		# Check patrol config options
-
-		if ( !($wgUseNPPatrol || $wgUseRCPatrol)) {
-			$wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
-			return;
-		}
-
 		# If we haven't been given an rc_id value, we can't do anything
 		$rcid = (int) $wgRequest->getVal('rcid');
-		$rc = $rcid ? RecentChange::newFromId($rcid) : null;
-		if ( is_null ( $rc ) )
-		{
+		$rc = RecentChange::newFromId($rcid);
+		if( is_null($rc) ) {
 			$wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
 			return;
 		}
 
-		if ( !$wgUseRCPatrol && $rc->getAttribute( 'rc_type' ) != RC_NEW) {
-			// Only new pages can be patrolled if the general patrolling is off....???
-			// @fixme -- is this necessary? Shouldn't we only bother controlling the
-			// front end here?
-			$wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
-			return;
-		}
+		#It would be nice to see where the user had actually come from, but for now just guess
+		$returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges';
+		$return = Title::makeTitle( NS_SPECIAL, $returnto );
 
-		# Check permissions
-		$permission_errors = $this->mTitle->getUserPermissionsErrors( 'patrol', $wgUser );
+		$dbw = wfGetDB( DB_MASTER );
+		$errors = $rc->doMarkPatrolled();
 
-		if (count($permission_errors)>0)
-		{
-			$wgOut->showPermissionsErrorPage( $permission_errors );
+		if( in_array(array('rcpatroldisabled'), $errors) ) {
+			$wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
 			return;
 		}
-
-		# Handle the 'MarkPatrolled' hook
-		if( !wfRunHooks( 'MarkPatrolled', array( $rcid, &$wgUser, false ) ) ) {
+		
+		if( in_array(array('hookaborted'), $errors) ) {
+			// The hook itself has handled any output
 			return;
 		}
-
-		#It would be nice to see where the user had actually come from, but for now just guess
-		$returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges';
-		$return = Title::makeTitle( NS_SPECIAL, $returnto );
-
-		# If it's left up to us, check that the user is allowed to patrol this edit
-		# If the user has the "autopatrol" right, then we'll assume there are no
-		# other conditions stopping them doing so
-		if( !$wgUser->isAllowed( 'autopatrol' ) ) {
-			$rc = RecentChange::newFromId( $rcid );
-			# Graceful error handling, as we've done before here...
-			# (If the recent change doesn't exist, then it doesn't matter whether
-			# the user is allowed to patrol it or not; nothing is going to happen
-			if( is_object( $rc ) && $wgUser->getName() == $rc->getAttribute( 'rc_user_text' ) ) {
-				# The user made this edit, and can't patrol it
-				# Tell them so, and then back off
-				$wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
-				$wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
-				$wgOut->returnToMain( false, $return );
-				return;
-			}
+		
+		if( in_array(array('markedaspatrollederror-noautopatrol'), $errors) ) {
+			$wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
+			$wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
+			$wgOut->returnToMain( false, $return );
+			return;
 		}
 
-		# Check that the revision isn't patrolled already
-		# Prevents duplicate log entries
-		if( !$rc->getAttribute( 'rc_patrolled' ) ) {
-			# Mark the edit as patrolled
-			RecentChange::markPatrolled( $rcid );
-			PatrolLog::record( $rcid );
-			wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, false ) );
+		if( !empty($errors) ) {
+			$wgOut->showPermissionsErrorPage( $errors );
+			return;
 		}
 
 		# Inform the user
@@ -1681,26 +1768,21 @@ class Article {
 	 * User-interface handler for the "watch" action
 	 */
 
-	function watch() {
-
+	public function watch() {
 		global $wgUser, $wgOut;
-
-		if ( $wgUser->isAnon() ) {
+		if( $wgUser->isAnon() ) {
 			$wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
 			return;
 		}
-		if ( wfReadOnly() ) {
+		if( wfReadOnly() ) {
 			$wgOut->readOnlyPage();
 			return;
 		}
-
 		if( $this->doWatch() ) {
 			$wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
-			$wgOut->setRobotpolicy( 'noindex,nofollow' );
-
+			$wgOut->setRobotPolicy( 'noindex,nofollow' );
 			$wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() );
 		}
-
 		$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
 	}
 
@@ -1708,44 +1790,36 @@ class Article {
 	 * Add this page to $wgUser's watchlist
 	 * @return bool true on successful watch operation
 	 */
-	function doWatch() {
+	public function doWatch() {
 		global $wgUser;
 		if( $wgUser->isAnon() ) {
 			return false;
 		}
-
-		if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
+		if( wfRunHooks('WatchArticle', array(&$wgUser, &$this)) ) {
 			$wgUser->addWatch( $this->mTitle );
-
 			return wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
 		}
-
 		return false;
 	}
 
 	/**
 	 * User interface handler for the "unwatch" action.
 	 */
-	function unwatch() {
-
+	public function unwatch() {
 		global $wgUser, $wgOut;
-
-		if ( $wgUser->isAnon() ) {
+		if( $wgUser->isAnon() ) {
 			$wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
 			return;
 		}
-		if ( wfReadOnly() ) {
+		if( wfReadOnly() ) {
 			$wgOut->readOnlyPage();
 			return;
 		}
-
 		if( $this->doUnwatch() ) {
 			$wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
-			$wgOut->setRobotpolicy( 'noindex,nofollow' );
-
+			$wgOut->setRobotPolicy( 'noindex,nofollow' );
 			$wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() );
 		}
-
 		$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
 	}
 
@@ -1753,25 +1827,22 @@ class Article {
 	 * Stop watching a page
 	 * @return bool true on successful unwatch
 	 */
-	function doUnwatch() {
+	public function doUnwatch() {
 		global $wgUser;
 		if( $wgUser->isAnon() ) {
 			return false;
 		}
-
-		if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
+		if( wfRunHooks('UnwatchArticle', array(&$wgUser, &$this)) ) {
 			$wgUser->removeWatch( $this->mTitle );
-
 			return wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
 		}
-
 		return false;
 	}
 
 	/**
 	 * action=protect handler
 	 */
-	function protect() {
+	public function protect() {
 		$form = new ProtectionForm( $this );
 		$form->execute();
 	}
@@ -1779,26 +1850,28 @@ class Article {
 	/**
 	 * action=unprotect handler (alias)
 	 */
-	function unprotect() {
+	public function unprotect() {
 		$this->protect();
 	}
 
 	/**
 	 * Update the article's restriction field, and leave a log entry.
 	 *
-	 * @param array $limit set of restriction keys
-	 * @param string $reason
+	 * @param $limit Array: set of restriction keys
+	 * @param $reason String
+	 * @param &$cascade Integer. Set to false if cascading protection isn't allowed.
+	 * @param $expiry Array: per restriction type expiration
 	 * @return bool true on success
 	 */
-	function updateRestrictions( $limit = array(), $reason = '', $cascade = 0, $expiry = null ) {
+	public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) {
 		global $wgUser, $wgRestrictionTypes, $wgContLang;
 
 		$id = $this->mTitle->getArticleID();
-		if( array() != $this->mTitle->getUserPermissionsErrors( 'protect', $wgUser ) || wfReadOnly() || $id == 0 ) {
+		if( $id <= 0 || wfReadOnly() || !$this->mTitle->userCan('protect') ) {
 			return false;
 		}
 
-		if (!$cascade) {
+		if( !$cascade ) {
 			$cascade = false;
 		}
 
@@ -1808,34 +1881,39 @@ class Article {
 		# FIXME: Same limitations as described in ProtectionForm.php (line 37);
 		# we expect a single selection, but the schema allows otherwise.
 		$current = array();
-		foreach( $wgRestrictionTypes as $action )
-			$current[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
+		$updated = Article::flattenRestrictions( $limit );
+		$changed = false;
+		foreach( $wgRestrictionTypes as $action ) {
+			if( isset( $expiry[$action] ) ) {
+				# Get current restrictions on $action
+				$aLimits = $this->mTitle->getRestrictions( $action );
+				$current[$action] = implode( '', $aLimits );
+				# Are any actual restrictions being dealt with here?
+				$aRChanged = count($aLimits) || !empty($limit[$action]);
+				# If something changed, we need to log it. Checking $aRChanged
+				# assures that "unprotecting" a page that is not protected does
+				# not log just because the expiry was "changed".
+				if( $aRChanged && $this->mTitle->mRestrictionsExpiry[$action] != $expiry[$action] ) {
+					$changed = true;
+				}
+			}
+		}
 
 		$current = Article::flattenRestrictions( $current );
-		$updated = Article::flattenRestrictions( $limit );
 
-		$changed = ( $current != $updated );
+		$changed = ($changed || $current != $updated );
 		$changed = $changed || ($updated && $this->mTitle->areRestrictionsCascading() != $cascade);
-		$changed = $changed || ($updated && $this->mTitle->mRestrictionsExpiry != $expiry);
 		$protect = ( $updated != '' );
 
 		# If nothing's changed, do nothing
 		if( $changed ) {
-			global $wgGroupPermissions;
 			if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
 
 				$dbw = wfGetDB( DB_MASTER );
-
-				$encodedExpiry = Block::encodeExpiry($expiry, $dbw );
-
-				$expiry_description = '';
-				if ( $encodedExpiry != 'infinity' ) {
-					$expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry, false, false ) ).')';
-				}
-
+				
 				# Prepare a null revision to be added to the history
 				$modified = $current != '' && $protect;
-				if ( $protect ) {
+				if( $protect ) {
 					$comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle';
 				} else {
 					$comment_type = 'unprotectedarticle';
@@ -1844,35 +1922,51 @@ class Article {
 
 				# Only restrictions with the 'protect' right can cascade...
 				# Otherwise, people who cannot normally protect can "protect" pages via transclusion
-				foreach( $limit as $action => $restriction ) {
-					# FIXME: can $restriction be an array or what? (same as fixme above)
-					if( $restriction != 'protect' && $restriction != 'sysop' ) {
-						$cascade = false;
-						break;
-					}
-				}
-
-				$cascade_description = '';
-				if ($cascade) {
-					$cascade_description = ' ['.wfMsg('protect-summary-cascade').']';
+				$editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' );
+				# The schema allows multiple restrictions
+				if(!in_array('protect', $editrestriction) && !in_array('sysop', $editrestriction))
+					$cascade = false;
+				$cascade_description = ''; 	 
+				if( $cascade ) {
+					$cascade_description = ' ['.wfMsgForContent('protect-summary-cascade').']'; 	 
 				}
 
 				if( $reason )
 					$comment .= ": $reason";
-				if( $protect )
-					$comment .= " [$updated]";
-				if ( $expiry_description && $protect )
-					$comment .= "$expiry_description";
-				if ( $cascade )
-					$comment .= "$cascade_description";
 
+				$editComment = $comment;
+				$encodedExpiry = array();
+				$protect_description = '';
+				foreach( $limit as $action => $restrictions  ) {
+					$encodedExpiry[$action] = Block::encodeExpiry($expiry[$action], $dbw );
+					if( $restrictions != '' ) {
+						$protect_description .= "[$action=$restrictions] (";
+						if( $encodedExpiry[$action] != 'infinity' ) {
+							$protect_description .= wfMsgForContent( 'protect-expiring', 
+								$wgContLang->timeanddate( $expiry[$action], false, false ) ,
+								$wgContLang->date( $expiry[$action], false, false ) ,
+								$wgContLang->time( $expiry[$action], false, false ) ); 	 
+						} else {
+							$protect_description .= wfMsgForContent( 'protect-expiry-indefinite' );
+						}
+						$protect_description .= ') ';
+					}
+				}
+				$protect_description = trim($protect_description);
+					
+				if( $protect_description && $protect )
+					$editComment .= " ($protect_description)";
+				if( $cascade )
+					$editComment .= "$cascade_description";
 				# Update restrictions table
 				foreach( $limit as $action => $restrictions ) {
-					if ($restrictions != '' ) {
+					if($restrictions != '' ) {
 						$dbw->replace( 'page_restrictions', array(array('pr_page', 'pr_type')),
-							array( 'pr_page' => $id, 'pr_type' => $action
-								, 'pr_level' => $restrictions, 'pr_cascade' => $cascade ? 1 : 0
-								, 'pr_expiry' => $encodedExpiry ), __METHOD__  );
+							array( 'pr_page' => $id, 
+								'pr_type' => $action, 
+								'pr_level' => $restrictions, 
+								'pr_cascade' => ($cascade && $action == 'edit') ? 1 : 0,
+								'pr_expiry' => $encodedExpiry[$action] ), __METHOD__  );
 					} else {
 						$dbw->delete( 'page_restrictions', array( 'pr_page' => $id,
 							'pr_type' => $action ), __METHOD__ );
@@ -1880,9 +1974,10 @@ class Article {
 				}
 
 				# Insert a null revision
-				$nullRevision = Revision::newNullRevision( $dbw, $id, $comment, true );
+				$nullRevision = Revision::newNullRevision( $dbw, $id, $editComment, true );
 				$nullRevId = $nullRevision->insertOn( $dbw );
 
+				$latest = $this->getLatest();
 				# Update page record
 				$dbw->update( 'page',
 					array( /* SET */
@@ -1893,15 +1988,15 @@ class Article {
 						'page_id' => $id
 					), 'Article::protect'
 				);
-				
-				wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, false) );
+
+				wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, $latest, $wgUser) );
 				wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) );
 
 				# Update the protection log
 				$log = new LogPage( 'protect' );
 				if( $protect ) {
-					$log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, 
-						trim( $reason . " [$updated]$cascade_description$expiry_description" ) );
+					$params = array($protect_description,$cascade ? 'cascade' : '');
+					$log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason), $params );
 				} else {
 					$log->addEntry( 'unprotect', $this->mTitle, $reason );
 				}
@@ -1915,11 +2010,10 @@ class Article {
 	/**
 	 * Take an array of page restrictions and flatten it to a string
 	 * suitable for insertion into the page_restrictions field.
-	 * @param array $limit
-	 * @return string
-	 * @private
+	 * @param $limit Array
+	 * @return String
 	 */
-	function flattenRestrictions( $limit ) {
+	protected static function flattenRestrictions( $limit ) {
 		if( !is_array( $limit ) ) {
 			throw new MWException( 'Article::flattenRestrictions given non-array restriction set' );
 		}
@@ -1935,26 +2029,24 @@ class Article {
 
 	/**
 	 * Auto-generates a deletion reason
-	 * @param bool &$hasHistory Whether the page has a history
+	 * @param &$hasHistory Boolean: whether the page has a history
 	 */
-	public function generateReason(&$hasHistory)
-	{
+	public function generateReason( &$hasHistory ) {
 		global $wgContLang;
-		$dbw = wfGetDB(DB_MASTER);
+		$dbw = wfGetDB( DB_MASTER );
 		// Get the last revision
-		$rev = Revision::newFromTitle($this->mTitle);
-		if(is_null($rev))
+		$rev = Revision::newFromTitle( $this->mTitle );
+		if( is_null( $rev ) )
 			return false;
+
 		// Get the article's contents
 		$contents = $rev->getText();
 		$blank = false;
 		// If the page is blank, use the text from the previous revision,
 		// which can only be blank if there's a move/import/protect dummy revision involved
-		if($contents == '')
-		{
+		if( $contents == '' ) {
 			$prev = $rev->getPrevious();
-			if($prev)
-			{
+			if( $prev )	{
 				$contents = $prev->getText();
 				$blank = true;
 			}
@@ -1963,44 +2055,51 @@ class Article {
 		// Find out if there was only one contributor
 		// Only scan the last 20 revisions
 		$limit = 20;
-		$res = $dbw->select('revision', 'rev_user_text', array('rev_page' => $this->getID()), __METHOD__,
-				array('LIMIT' => $limit));
-		if($res === false)
+		$res = $dbw->select( 'revision', 'rev_user_text',
+			array( 'rev_page' => $this->getID() ), __METHOD__,
+			array( 'LIMIT' => $limit )
+		);
+		if( $res === false )
 			// This page has no revisions, which is very weird
 			return false;
-		if($res->numRows() > 1)
+		if( $res->numRows() > 1 )
 				$hasHistory = true;
 		else
 				$hasHistory = false;
-		$row = $dbw->fetchObject($res);
+		$row = $dbw->fetchObject( $res );
 		$onlyAuthor = $row->rev_user_text;
 		// Try to find a second contributor
-		while( $row = $dbw->fetchObject($res) ) {
-			if($row->rev_user_text != $onlyAuthor) {
+		foreach( $res as $row ) {
+			if( $row->rev_user_text != $onlyAuthor ) {
 				$onlyAuthor = false;
 				break;
 			}
 		}
-		$dbw->freeResult($res);
+		$dbw->freeResult( $res );
 
 		// Generate the summary with a '$1' placeholder
-		if($blank) {
+		if( $blank ) {
 			// The current revision is blank and the one before is also
 			// blank. It's just not our lucky day
-			$reason = wfMsgForContent('exbeforeblank', '$1');
+			$reason = wfMsgForContent( 'exbeforeblank', '$1' );
 		} else {
-			if($onlyAuthor)
-				$reason = wfMsgForContent('excontentauthor', '$1', $onlyAuthor);
+			if( $onlyAuthor )
+				$reason = wfMsgForContent( 'excontentauthor', '$1', $onlyAuthor );
 			else
-				$reason = wfMsgForContent('excontent', '$1');
+				$reason = wfMsgForContent( 'excontent', '$1' );
+		}
+		
+		if( $reason == '-' ) {
+			// Allow these UI messages to be blanked out cleanly
+			return '';
 		}
 
 		// Replace newlines with spaces to prevent uglyness
-		$contents = preg_replace("/[\n\r]/", ' ', $contents);
+		$contents = preg_replace( "/[\n\r]/", ' ', $contents );
 		// Calculate the maximum amount of chars to get
 		// Max content length = max comment length - length of the comment (excl. $1) - '...'
-		$maxLength = 255 - (strlen($reason) - 2) - 3;
-		$contents = $wgContLang->truncate($contents, $maxLength, '...');
+		$maxLength = 255 - (strlen( $reason ) - 2) - 3;
+		$contents = $wgContLang->truncate( $contents, $maxLength, '...' );
 		// Remove possible unfinished links
 		$contents = preg_replace( '/\[\[([^\]]*)\]?$/', '$1', $contents );
 		// Now replace the '$1' placeholder
@@ -2012,7 +2111,7 @@ class Article {
 	/*
 	 * UI entry point for page deletion
 	 */
-	function delete() {
+	public function delete() {
 		global $wgUser, $wgOut, $wgRequest;
 
 		$confirm = $wgRequest->wasPosted() &&
@@ -2023,19 +2122,19 @@ class Article {
 
 		$reason = $this->DeleteReasonList;
 
-		if ( $reason != 'other' && $this->DeleteReason != '') {
+		if( $reason != 'other' && $this->DeleteReason != '' ) {
 			// Entry from drop down menu + additional comment
 			$reason .= ': ' . $this->DeleteReason;
-		} elseif ( $reason == 'other' ) {
+		} elseif( $reason == 'other' ) {
 			$reason = $this->DeleteReason;
 		}
 		# Flag to hide all contents of the archived revisions
-		$suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed('suppressrevision');
+		$suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
 
 		# This code desperately needs to be totally rewritten
 
 		# Read-only check...
-		if ( wfReadOnly() ) {
+		if( wfReadOnly() ) {
 			$wgOut->readOnlyPage();
 			return;
 		}
@@ -2043,7 +2142,7 @@ class Article {
 		# Check permissions
 		$permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
 
-		if (count($permission_errors)>0) {
+		if( count( $permission_errors ) > 0 ) {
 			$wgOut->showPermissionsErrorPage( $permission_errors );
 			return;
 		}
@@ -2054,8 +2153,10 @@ class Article {
 		$dbw = wfGetDB( DB_MASTER );
 		$conds = $this->mTitle->pageCond();
 		$latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
-		if ( $latest === false ) {
-			$wgOut->showFatalError( wfMsg( 'cannotdelete' ) );
+		if( $latest === false ) {
+			$wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) );
+			$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+			LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() );
 			return;
 		}
 
@@ -2080,12 +2181,12 @@ class Article {
 
 		// Generate deletion reason
 		$hasHistory = false;
-		if ( !$reason ) $reason = $this->generateReason($hasHistory);
+		if( !$reason ) $reason = $this->generateReason($hasHistory);
 
 		// If the page has a history, insert a warning
 		if( $hasHistory && !$confirm ) {
-			$skin=$wgUser->getSkin();
-			$wgOut->addHTML( '<strong>' . wfMsg( 'historywarning' ) . ' ' . $skin->historyLink() . '</strong>' );
+			$skin = $wgUser->getSkin();
+			$wgOut->addHTML( '<strong>' . wfMsgExt( 'historywarning', array( 'parseinline' ) ) . ' ' . $skin->historyLink() . '</strong>' );
 			if( $bigHistory ) {
 				global $wgLang, $wgDeleteRevisionsLimit;
 				$wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",
@@ -2099,7 +2200,7 @@ class Article {
 	/**
 	 * @return bool whether or not the page surpasses $wgDeleteRevisionsLimit revisions
 	 */
-	function isBigDeletion() {
+	public function isBigDeletion() {
 		global $wgDeleteRevisionsLimit;
 		if( $wgDeleteRevisionsLimit ) {
 			$revCount = $this->estimateRevisionCount();
@@ -2111,8 +2212,8 @@ class Article {
 	/**
 	 * @return int approximate revision count
 	 */
-	function estimateRevisionCount() {
-		$dbr = wfGetDB();
+	public function estimateRevisionCount() {
+		$dbr = wfGetDB( DB_SLAVE );
 		// For an exact count...
 		//return $dbr->selectField( 'revision', 'COUNT(*)',
 		//	array( 'rev_page' => $this->getId() ), __METHOD__ );
@@ -2122,13 +2223,12 @@ class Article {
 
 	/**
 	 * Get the last N authors
-	 * @param int $num Number of revisions to get
-	 * @param string $revLatest The latest rev_id, selected from the master (optional)
+	 * @param $num Integer: number of revisions to get
+	 * @param $revLatest String: the latest rev_id, selected from the master (optional)
 	 * @return array Array of authors, duplicates not removed
 	 */
-	function getLastNAuthors( $num, $revLatest = 0 ) {
+	public function getLastNAuthors( $num, $revLatest = 0 ) {
 		wfProfileIn( __METHOD__ );
-
 		// First try the slave
 		// If that doesn't have the latest revision, try the master
 		$continue = 2;
@@ -2145,12 +2245,12 @@ class Article {
 					'LIMIT' => $num
 				) )
 			);
-			if ( !$res ) {
+			if( !$res ) {
 				wfProfileOut( __METHOD__ );
 				return array();
 			}
 			$row = $db->fetchObject( $res );
-			if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
+			if( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
 				$db = wfGetDB( DB_MASTER );
 				$continue--;
 			} else {
@@ -2168,59 +2268,67 @@ class Article {
 
 	/**
 	 * Output deletion confirmation dialog
-	 * @param $reason string Prefilled reason
+	 * @param $reason String: prefilled reason
 	 */
-	function confirmDelete( $reason ) {
-		global $wgOut, $wgUser, $wgContLang;
-		$align = $wgContLang->isRtl() ? 'left' : 'right';
+	public function confirmDelete( $reason ) {
+		global $wgOut, $wgUser;
 
 		wfDebug( "Article::confirmDelete\n" );
 
-		$wgOut->setSubtitle( wfMsg( 'delete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->mTitle ) ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->mTitle ) ) );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->addWikiMsg( 'confirmdeletetext' );
 
 		if( $wgUser->isAllowed( 'suppressrevision' ) ) {
-			$suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\"><td></td><td>";
-			$suppress .= Xml::checkLabel( wfMsg( 'revdelete-suppress' ), 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '2' ) );
-			$suppress .= "</td></tr>";
+			$suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\">
+					<td></td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'revdelete-suppress' ),
+							'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '4' ) ) .
+					"</td>
+				</tr>";
 		} else {
 			$suppress = '';
 		}
+		$checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching();
 
-		$form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
+		$form = Xml::openElement( 'form', array( 'method' => 'post', 
+			'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
 			Xml::openElement( 'fieldset', array( 'id' => 'mw-delete-table' ) ) .
 			Xml::tags( 'legend', null, wfMsgExt( 'delete-legend', array( 'parsemag', 'escapenoentities' ) ) ) .
-			Xml::openElement( 'table' ) .
+			Xml::openElement( 'table', array( 'id' => 'mw-deleteconfirm-table' ) ) .
 			"<tr id=\"wpDeleteReasonListRow\">
-				<td align='$align'>" .
+				<td class='mw-label'>" .
 					Xml::label( wfMsg( 'deletecomment' ), 'wpDeleteReasonList' ) .
 				"</td>
-				<td>" .
+				<td class='mw-input'>" .
 					Xml::listDropDown( 'wpDeleteReasonList',
 						wfMsgForContent( 'deletereason-dropdown' ),
 						wfMsgForContent( 'deletereasonotherlist' ), '', 'wpReasonDropDown', 1 ) .
 				"</td>
 			</tr>
 			<tr id=\"wpDeleteReasonRow\">
-				<td align='$align'>" .
+				<td class='mw-label'>" .
 					Xml::label( wfMsg( 'deleteotherreason' ), 'wpReason' ) .
 				"</td>
-				<td>" .
-					Xml::input( 'wpReason', 60, $reason, array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) .
+				<td class='mw-input'>" .
+					Xml::input( 'wpReason', 60, $reason, array( 'type' => 'text', 'maxlength' => '255', 
+						'tabindex' => '2', 'id' => 'wpReason' ) ) .
 				"</td>
 			</tr>
 			<tr>
 				<td></td>
-				<td>" .
-					Xml::checkLabel( wfMsg( 'watchthis' ), 'wpWatch', 'wpWatch', $wgUser->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching(), array( 'tabindex' => '3' ) ) .
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'watchthis' ),
+						'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
 				"</td>
 			</tr>
 			$suppress
 			<tr>
 				<td></td>
-				<td>" .
-					Xml::submitButton( wfMsg( 'deletepage' ), array( 'name' => 'wpConfirmB', 'id' => 'wpConfirmB', 'tabindex' => '4' ) ) .
+				<td class='mw-submit'>" .
+					Xml::submitButton( wfMsg( 'deletepage' ),
+						array( 'name' => 'wpConfirmB', 'id' => 'wpConfirmB', 'tabindex' => '5' ) ) .
 				"</td>
 			</tr>" .
 			Xml::closeElement( 'table' ) .
@@ -2228,43 +2336,30 @@ class Article {
 			Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
 			Xml::closeElement( 'form' );
 
-			if ( $wgUser->isAllowed( 'editinterface' ) ) {
+			if( $wgUser->isAllowed( 'editinterface' ) ) {
 				$skin = $wgUser->getSkin();
 				$link = $skin->makeLink ( 'MediaWiki:Deletereason-dropdown', wfMsgHtml( 'delete-edit-reasonlist' ) );
 				$form .= '<p class="mw-delete-editreasons">' . $link . '</p>';
 			}
 
 		$wgOut->addHTML( $form );
-		$this->showLogExtract( $wgOut );
-	}
-
-
-	/**
-	 * Show relevant lines from the deletion log
-	 */
-	function showLogExtract( $out ) {
-		$out->addHtml( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
-		LogEventsList::showLogExtract( $out, 'delete', $this->mTitle->getPrefixedText() );
+		LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() );
 	}
 
-
 	/**
 	 * Perform a deletion and output success or failure messages
 	 */
-	function doDelete( $reason, $suppress = false ) {
+	public function doDelete( $reason, $suppress = false ) {
 		global $wgOut, $wgUser;
-		wfDebug( __METHOD__."\n" );
-		
-		$id = $this->getId();
-		
-		$error = '';
+		$id = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
 
-		if (wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason, &$error))) {
-			if ( $this->doDeleteArticle( $reason, $suppress ) ) {
+		$error = '';
+		if( wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason, &$error)) ) {
+			if( $this->doDeleteArticle( $reason, $suppress, $id ) ) {
 				$deleted = $this->mTitle->getPrefixedText();
 
 				$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-				$wgOut->setRobotpolicy( 'noindex,nofollow' );
+				$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 				$loglink = '[[Special:Log/delete|' . wfMsgNoTrans( 'deletionlog' ) . ']]';
 
@@ -2272,10 +2367,13 @@ class Article {
 				$wgOut->returnToMain( false );
 				wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason, $id));
 			} else {
-				if ($error = '')
-					$wgOut->showFatalError( wfMsg( 'cannotdelete' ) );
-				else
+				if( $error == '' ) {
+					$wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) );
+					$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+					LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() );
+				} else {
 					$wgOut->showFatalError( $error );
+				}
 			}
 		}
 	}
@@ -2285,7 +2383,7 @@ class Article {
 	 * Deletes the article with database consistency, writes logs, purges caches
 	 * Returns success
 	 */
-	function doDeleteArticle( $reason, $suppress = false ) {
+	public function doDeleteArticle( $reason, $suppress = false, $id = 0 ) {
 		global $wgUseSquid, $wgDeferredUpdateList;
 		global $wgUseTrackbacks;
 
@@ -2294,9 +2392,9 @@ class Article {
 		$dbw = wfGetDB( DB_MASTER );
 		$ns = $this->mTitle->getNamespace();
 		$t = $this->mTitle->getDBkey();
-		$id = $this->mTitle->getArticleID();
+		$id = $id ? $id : $this->mTitle->getArticleID( GAID_FOR_UPDATE );
 
-		if ( $t == '' || $id == 0 ) {
+		if( $t == '' || $id == 0 ) {
 			return false;
 		}
 
@@ -2304,7 +2402,7 @@ class Article {
 		array_push( $wgDeferredUpdateList, $u );
 
 		// Bitfields to further suppress the content
-		if ( $suppress ) {
+		if( $suppress ) {
 			$bitfield = 0;
 			// This should be 15...
 			$bitfield |= Revision::DELETED_TEXT;
@@ -2351,15 +2449,6 @@ class Article {
 		# Delete restrictions for it
 		$dbw->delete( 'page_restrictions', array ( 'pr_page' => $id ), __METHOD__ );
 
-		# Fix category table counts
-		$cats = array();
-		$res = $dbw->select( 'categorylinks', 'cl_to',
-			array( 'cl_from' => $id ), __METHOD__ );
-		foreach( $res as $row ) {
-			$cats []= $row->cl_to;
-		}
-		$this->updateCategoryCounts( array(), $cats );
-
 		# Now that it's safely backed up, delete it
 		$dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__);
 		$ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy
@@ -2367,12 +2456,20 @@ class Article {
 			$dbw->rollback();
 			return false;
 		}
+		
+		# Fix category table counts
+		$cats = array();
+		$res = $dbw->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ );
+		foreach( $res as $row ) {
+			$cats []= $row->cl_to;
+		}
+		$this->updateCategoryCounts( array(), $cats );
 
 		# If using cascading deletes, we can skip some explicit deletes
-		if ( !$dbw->cascadingDeletes() ) {
+		if( !$dbw->cascadingDeletes() ) {
 			$dbw->delete( 'revision', array( 'rev_page' => $id ), __METHOD__ );
 
-			if ($wgUseTrackbacks)
+			if($wgUseTrackbacks)
 				$dbw->delete( 'trackbacks', array( 'tb_page' => $id ), __METHOD__ );
 
 			# Delete outgoing links
@@ -2386,14 +2483,17 @@ class Article {
 		}
 
 		# If using cleanup triggers, we can skip some manual deletes
-		if ( !$dbw->cleanupTriggers() ) {
-
+		if( !$dbw->cleanupTriggers() ) {
 			# Clean up recentchanges entries...
 			$dbw->delete( 'recentchanges',
-				array( 'rc_namespace' => $ns, 'rc_title' => $t, 'rc_type != '.RC_LOG ),
+				array( 'rc_type != '.RC_LOG, 
+					'rc_namespace' => $this->mTitle->getNamespace(),
+					'rc_title' => $this->mTitle->getDBKey() ),
+				__METHOD__ );
+			$dbw->delete( 'recentchanges',
+				array( 'rc_type != '.RC_LOG, 'rc_cur_id' => $id ),
 				__METHOD__ );
 		}
-		$dbw->commit();
 
 		# Clear caches
 		Article::onArticleDelete( $this->mTitle );
@@ -2409,6 +2509,8 @@ class Article {
 		# Make sure logging got through
 		$log->addEntry( 'delete', $this->mTitle, $reason, array() );
 
+		$dbw->commit();
+
 		return true;
 	}
 
@@ -2419,12 +2521,12 @@ class Article {
 	 * performs permissions checks on $wgUser, then calls commitRollback()
 	 * to do the dirty work
 	 *
-	 * @param string $fromP - Name of the user whose edits to rollback.
-	 * @param string $summary - Custom summary. Set to default summary if empty.
-	 * @param string $token - Rollback token.
-	 * @param bool   $bot - If true, mark all reverted edits as bot.
+	 * @param $fromP String: Name of the user whose edits to rollback.
+	 * @param $summary String: Custom summary. Set to default summary if empty.
+	 * @param $token String: Rollback token.
+	 * @param $bot Boolean: If true, mark all reverted edits as bot.
 	 *
-	 * @param array $resultDetails contains result-specific array of additional values
+	 * @param $resultDetails Array: contains result-specific array of additional values
 	 *    'alreadyrolled' : 'current' (rev)
 	 *    success        : 'summary' (str), 'current' (rev), 'target' (rev)
 	 *
@@ -2438,16 +2540,18 @@ class Article {
 		$resultDetails = null;
 
 		# Check permissions
-		$errors = array_merge( $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ),
-						$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ) );
+		$editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
+		$rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser );
+		$errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) );
+
 		if( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) )
 			$errors[] = array( 'sessionfailure' );
 
-		if ( $wgUser->pingLimiter('rollback') || $wgUser->pingLimiter() ) {
+		if( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) {
 			$errors[] = array( 'actionthrottledtext' );
 		}
 		# If there were errors, bail out now
-		if(!empty($errors))
+		if( !empty( $errors ) )
 			return $errors;
 
 		return $this->commitRollback($fromP, $summary, $bot, $resultDetails);
@@ -2493,7 +2597,7 @@ class Article {
 		$s = $dbw->selectRow( 'revision',
 			array( 'rev_id', 'rev_timestamp', 'rev_deleted' ),
 			array(	'rev_page' => $current->getPage(),
-				"rev_user <> {$user} OR rev_user_text <> {$user_text}"
+				"rev_user != {$user} OR rev_user_text != {$user_text}"
 			), __METHOD__,
 			array(	'USE INDEX' => 'page_timestamp',
 				'ORDER BY'  => 'rev_timestamp DESC' )
@@ -2507,16 +2611,16 @@ class Article {
 		}
 
 		$set = array();
-		if ( $bot && $wgUser->isAllowed('markbotedits') ) {
+		if( $bot && $wgUser->isAllowed('markbotedits') ) {
 			# Mark all reverted edits as bot
 			$set['rc_bot'] = 1;
 		}
-		if ( $wgUseRCPatrol ) {
+		if( $wgUseRCPatrol ) {
 			# Mark all reverted edits as patrolled
 			$set['rc_patrolled'] = 1;
 		}
 
-		if ( $set ) {
+		if( $set ) {
 			$dbw->update( 'recentchanges', $set,
 					array( /* WHERE */
 						'rc_cur_id' => $current->getPage(),
@@ -2531,31 +2635,38 @@ class Article {
 		if( empty( $summary ) ){
 			$summary = wfMsgForContent( 'revertpage' );
 		}
-		
+
 		# Allow the custom summary to use the same args as the default message
 		$args = array(
 			$target->getUserText(), $from, $s->rev_id,
 			$wgLang->timeanddate(wfTimestamp(TS_MW, $s->rev_timestamp), true),
 			$current->getId(), $wgLang->timeanddate($current->getTimestamp())
 		);
-		$summary = wfMsgReplaceArgs( $summary, $args ); 
+		$summary = wfMsgReplaceArgs( $summary, $args );
 
 		# Save
 		$flags = EDIT_UPDATE;
 
-		if ($wgUser->isAllowed('minoredit'))
+		if( $wgUser->isAllowed('minoredit') )
 			$flags |= EDIT_MINOR;
 
 		if( $bot && ($wgUser->isAllowed('markbotedits') || $wgUser->isAllowed('bot')) )
 			$flags |= EDIT_FORCE_BOT;
-		$this->doEdit( $target->getText(), $summary, $flags, $target->getId() );
+		# Actually store the edit
+		$status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() );
+		if( !empty( $status->value['revision'] ) ) {
+			$revId = $status->value['revision']->getId();
+		} else {
+			$revId = false;
+		}
 
-		wfRunHooks( 'ArticleRollbackComplete', array( $this, $wgUser, $target ) );
+		wfRunHooks( 'ArticleRollbackComplete', array( $this, $wgUser, $target, $current ) );
 
 		$resultDetails = array(
 			'summary' => $summary,
 			'current' => $current,
 			'target' => $target,
+			'newid' => $revId
 		);
 		return array();
 	}
@@ -2563,7 +2674,7 @@ class Article {
 	/**
 	 * User interface for rollback operations
 	 */
-	function rollback() {
+	public function rollback() {
 		global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
 		$details = null;
 
@@ -2575,15 +2686,11 @@ class Article {
 			$details
 		);
 
-		if( in_array( array( 'blocked' ), $result ) ) {
-			$wgOut->blockedPage();
-			return;
-		}
 		if( in_array( array( 'actionthrottledtext' ), $result ) ) {
 			$wgOut->rateLimited();
 			return;
 		}
-		if( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ){
+		if( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) {
 			$wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
 			$errArray = $result[0];
 			$errMsg = array_shift( $errArray );
@@ -2591,7 +2698,8 @@ class Article {
 			if( isset( $details['current'] ) ){
 				$current = $details['current'];
 				if( $current->getComment() != '' ) {
-					$wgOut->addWikiMsgArray( 'editcomment', array( $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
+					$wgOut->addWikiMsgArray( 'editcomment', array( 
+						$wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
 				}
 			}
 			return;
@@ -2599,7 +2707,7 @@ class Article {
 		# Display permissions errors before read-only message -- there's no
 		# point in misleading the user into thinking the inability to rollback
 		# is only temporary.
-		if( !empty($result) && $result !== array( array('readonlytext') ) ) {
+		if( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) {
 			# array_diff is completely broken for arrays of arrays, sigh.  Re-
 			# move any 'readonlytext' error manually.
 			$out = array();
@@ -2611,24 +2719,25 @@ class Article {
 			$wgOut->showPermissionsErrorPage( $out );
 			return;
 		}
-		if( $result == array( array('readonlytext') ) ) {
+		if( $result == array( array( 'readonlytext' ) ) ) {
 			$wgOut->readOnlyPage();
 			return;
 		}
 
 		$current = $details['current'];
 		$target = $details['target'];
+		$newId = $details['newid'];
 		$wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
 			. $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
 		$new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
 			. $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
-		$wgOut->addHtml( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
+		$wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
 		$wgOut->returnToMain( false, $this->mTitle );
-		
-		if( !$wgRequest->getBool( 'hidediff', false ) ) {
-			$de = new DifferenceEngine( $this->mTitle, $current->getId(), 'next', false, true );
+
+		if( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) {
+			$de = new DifferenceEngine( $this->mTitle, $current->getId(), $newId, false, true );
 			$de->showDiff( '', '' );
 		}
 	}
@@ -2636,21 +2745,15 @@ class Article {
 
 	/**
 	 * Do standard deferred updates after page view
-	 * @private
 	 */
-	function viewUpdates() {
-		global $wgDeferredUpdateList, $wgUser;
-
-		if ( 0 != $this->getID() ) {
-			# Don't update page view counters on views from bot users (bug 14044)
-			global $wgDisableCounters;
-			if( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) ) {
-				Article::incViewCount( $this->getID() );
-				$u = new SiteStatsUpdate( 1, 0, 0 );
-				array_push( $wgDeferredUpdateList, $u );
-			}
+	public function viewUpdates() {
+		global $wgDeferredUpdateList, $wgDisableCounters, $wgUser;
+		# Don't update page view counters on views from bot users (bug 14044)
+		if( !$wgDisableCounters && !$wgUser->isAllowed('bot') && $this->getID() ) {
+			Article::incViewCount( $this->getID() );
+			$u = new SiteStatsUpdate( 1, 0, 0 );
+			array_push( $wgDeferredUpdateList, $u );
 		}
-
 		# Update newtalk / watchlist notification status
 		$wgUser->clearNotification( $this->mTitle );
 	}
@@ -2659,8 +2762,8 @@ class Article {
 	 * Prepare text which is about to be saved.
 	 * Returns a stdclass with source, pst and output members
 	 */
-	function prepareTextForEdit( $text, $revid=null ) {
-		if ( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid) {
+	public function prepareTextForEdit( $text, $revid=null ) {
+		if( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid) {
 			// Already prepared
 			return $this->mPreparedEdit;
 		}
@@ -2681,6 +2784,7 @@ class Article {
 	/**
 	 * Do standard deferred updates after page edit.
 	 * Update links tables, site stats, search index and message cache.
+	 * Purges pages that include this page if the text was changed here.
 	 * Every 100th edit, prune the recent changes table.
 	 *
 	 * @private
@@ -2691,14 +2795,14 @@ class Article {
 	 * @param $newid rev_id value of the new revision
 	 * @param $changed Whether or not the content actually changed
 	 */
-	function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) {
+	public function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) {
 		global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser, $wgEnableParserCache;
 
 		wfProfileIn( __METHOD__ );
 
 		# Parse the text
 		# Be careful not to double-PST: $text is usually already PST-ed once
-		if ( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) {
+		if( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) {
 			wfDebug( __METHOD__ . ": No prepared edit or vary-revision is set...\n" );
 			$editInfo = $this->prepareTextForEdit( $text, $newid );
 		} else {
@@ -2707,17 +2811,20 @@ class Article {
 		}
 
 		# Save it to the parser cache
-		if ( $wgEnableParserCache ) {
+		if( $wgEnableParserCache ) {
 			$parserCache = ParserCache::singleton();
 			$parserCache->save( $editInfo->output, $this, $wgUser );
 		}
 
 		# Update the links tables
-		$u = new LinksUpdate( $this->mTitle, $editInfo->output );
+		$u = new LinksUpdate( $this->mTitle, $editInfo->output, false );
+		$u->setRecursiveTouch( $changed ); // refresh/invalidate including pages too
 		$u->doUpdate();
+		
+		wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $changed ) );
 
 		if( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
-			if ( 0 == mt_rand( 0, 99 ) ) {
+			if( 0 == mt_rand( 0, 99 ) ) {
 				// Flush old entries from the `recentchanges` table; we do this on
 				// random requests so as to avoid an increase in writes for no good reason
 				global $wgRCMaxAge;
@@ -2733,7 +2840,7 @@ class Article {
 		$title = $this->mTitle->getPrefixedDBkey();
 		$shortTitle = $this->mTitle->getDBkey();
 
-		if ( 0 == $id ) {
+		if( 0 == $id ) {
 			wfProfileOut( __METHOD__ );
 			return;
 		}
@@ -2748,21 +2855,23 @@ class Article {
 		# load of user talk pages and piss people off, nor if it's a minor edit
 		# by a properly-flagged bot.
 		if( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed
-			&& !($minoredit && $wgUser->isAllowed('nominornewtalk') ) ) {
-			if (wfRunHooks('ArticleEditUpdateNewTalk', array(&$this)) ) {
-				$other = User::newFromName( $shortTitle );
-				if( is_null( $other ) && User::isIP( $shortTitle ) ) {
+			&& !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) ) {
+			if( wfRunHooks('ArticleEditUpdateNewTalk', array( &$this ) ) ) {
+				$other = User::newFromName( $shortTitle, false );
+				if( !$other ) {
+					wfDebug( __METHOD__.": invalid username\n" );
+				} elseif( User::isIP( $shortTitle ) ) {
 					// An anonymous user
-					$other = new User();
-					$other->setName( $shortTitle );
-				}
-				if( $other ) {
 					$other->setNewtalk( true );
+				} elseif( $other->isLoggedIn() ) {
+					$other->setNewtalk( true );
+				} else {
+					wfDebug( __METHOD__. ": don't need to notify a nonexistent user\n" );
 				}
 			}
 		}
 
-		if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+		if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 			$wgMessageCache->replace( $shortTitle, $text );
 		}
 
@@ -2772,13 +2881,13 @@ class Article {
 	/**
 	 * Perform article updates on a special page creation.
 	 *
-	 * @param Revision $rev
+	 * @param $rev Revision object
 	 *
 	 * @todo This is a shitty interface function. Kill it and replace the
 	 * other shitty functions like editUpdates and such so it's not needed
 	 * anymore.
 	 */
-	function createUpdates( $rev ) {
+	public function createUpdates( $rev ) {
 		$this->mGoodAdjustment = $this->isCountable( $rev->getText() );
 		$this->mTotalAdjustment = 1;
 		$this->editUpdates( $rev->getText(), $rev->getComment(),
@@ -2791,14 +2900,13 @@ class Article {
 	 *   Revision as of \<date\>; view current revision
 	 *   \<- Previous version | Next Version -\>
 	 *
-	 * @private
-	 * @param string $oldid		Revision ID of this article revision
+	 * @param $oldid String: revision ID of this article revision
 	 */
-	function setOldSubtitle( $oldid=0 ) {
+	public function setOldSubtitle( $oldid = 0 ) {
 		global $wgLang, $wgOut, $wgUser;
 
-		if ( !wfRunHooks( 'DisplayOldSubtitle', array(&$this, &$oldid) ) ) {
-				return;
+		if( !wfRunHooks( 'DisplayOldSubtitle', array( &$this, &$oldid ) ) ) {
+			return;
 		}
 
 		$revision = Revision::newFromId( $oldid );
@@ -2807,34 +2915,34 @@ class Article {
 		$td = $wgLang->timeanddate( $this->mTimestamp, true );
 		$sk = $wgUser->getSkin();
 		$lnk = $current
-			? wfMsg( 'currentrevisionlink' )
-			: $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
+			? wfMsgHtml( 'currentrevisionlink' )
+			: $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'currentrevisionlink' ) );
 		$curdiff = $current
-			? wfMsg( 'diff' )
-			: $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=cur&oldid='.$oldid );
+			? wfMsgHtml( 'diff' )
+			: $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'diff' ), 'diff=cur&oldid='.$oldid );
 		$prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
 		$prevlink = $prev
-			? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
-			: wfMsg( 'previousrevision' );
+			? $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
+			: wfMsgHtml( 'previousrevision' );
 		$prevdiff = $prev
-			? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=prev&oldid='.$oldid )
-			: wfMsg( 'diff' );
+			? $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'diff' ), 'diff=prev&oldid='.$oldid )
+			: wfMsgHtml( 'diff' );
 		$nextlink = $current
-			? wfMsg( 'nextrevision' )
-			: $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
+			? wfMsgHtml( 'nextrevision' )
+			: $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextrevision' ), 'direction=next&oldid='.$oldid );
 		$nextdiff = $current
-			? wfMsg( 'diff' )
-			: $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=next&oldid='.$oldid );
+			? wfMsgHtml( 'diff' )
+			: $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'diff' ), 'diff=next&oldid='.$oldid );
 
 		$cdel='';
 		if( $wgUser->isAllowed( 'deleterevision' ) ) {
 			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 			if( $revision->isCurrent() ) {
 			// We don't handle top deleted edits too well
-				$cdel = wfMsgHtml('rev-delundel');
+				$cdel = wfMsgHtml( 'rev-delundel' );
 			} else if( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) {
 			// If revision was hidden from sysops
-				$cdel = wfMsgHtml('rev-delundel');
+				$cdel = wfMsgHtml( 'rev-delundel' );
 			} else {
 				$cdel = $sk->makeKnownLinkObj( $revdel,
 					wfMsgHtml('rev-delundel'),
@@ -2855,9 +2963,10 @@ class Article {
 			? 'revision-info-current'
 			: 'revision-info';
 
-		$r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsg( $infomsg, $td, $userlinks ) . "</div>\n" .
+		$r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsgExt( $infomsg, array( 'parseinline', 'replaceafter' ), $td, $userlinks, $revision->getID() ) . "</div>\n" .
 
-		     "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsg( 'revision-nav', $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
+		     "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ),
+		     	$prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
 		$wgOut->setSubtitle( $r );
 	}
 
@@ -2865,9 +2974,9 @@ class Article {
 	 * This function is called right before saving the wikitext,
 	 * so we can do things like signatures and links-in-context.
 	 *
-	 * @param string $text
+	 * @param $text String
 	 */
-	function preSaveTransform( $text ) {
+	public function preSaveTransform( $text ) {
 		global $wgParser, $wgUser;
 		return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
 	}
@@ -2879,17 +2988,16 @@ class Article {
 	 * output to the client that is necessary for this request.
 	 * (that is, it has sent a cached version of the page)
 	 */
-	function tryFileCache() {
+	protected function tryFileCache() {
 		static $called = false;
 		if( $called ) {
 			wfDebug( "Article::tryFileCache(): called twice!?\n" );
-			return;
+			return false;
 		}
 		$called = true;
-		if($this->isFileCacheable()) {
-			$touched = $this->mTouched;
+		if( $this->isFileCacheable() ) {
 			$cache = new HTMLFileCache( $this->mTitle );
-			if($cache->isFileCacheGood( $touched )) {
+			if( $cache->isFileCacheGood( $this->mTouched ) ) {
 				wfDebug( "Article::tryFileCache(): about to load file\n" );
 				$cache->loadFromFileCache();
 				return true;
@@ -2900,46 +3008,22 @@ class Article {
 		} else {
 			wfDebug( "Article::tryFileCache(): not cacheable\n" );
 		}
+		return false;
 	}
 
 	/**
 	 * Check if the page can be cached
 	 * @return bool
 	 */
-	function isFileCacheable() {
-		global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest, $wgLang, $wgContLang;
-		$action    = $wgRequest->getVal( 'action'    );
-		$oldid     = $wgRequest->getVal( 'oldid'     );
-		$diff      = $wgRequest->getVal( 'diff'      );
-		$redirect  = $wgRequest->getVal( 'redirect'  );
-		$printable = $wgRequest->getVal( 'printable' );
-		$page      = $wgRequest->getVal( 'page' );
-
-		//check for non-standard user language; this covers uselang,
-		//and extensions for auto-detecting user language.
-		$ulang     = $wgLang->getCode();
-		$clang     = $wgContLang->getCode();
-
-		$cacheable = $wgUseFileCache
-			&& (!$wgShowIPinHeader)
-			&& ($this->getID() != 0)
-			&& ($wgUser->isAnon())
-			&& (!$wgUser->getNewtalk())
-			&& ($this->mTitle->getNamespace() != NS_SPECIAL )
-			&& (empty( $action ) || $action == 'view')
-			&& (!isset($oldid))
-			&& (!isset($diff))
-			&& (!isset($redirect))
-			&& (!isset($printable))
-			&& !isset($page)
-			&& (!$this->mRedirectedFrom)
-			&& ($ulang === $clang);
-
-		if ( $cacheable ) {
-			//extension may have reason to disable file caching on some pages.
-			$cacheable = wfRunHooks( 'IsFileCacheable', array( $this ) );
+	public function isFileCacheable() {
+		$cacheable = false;
+		if( HTMLFileCache::useFileCache() ) {
+			$cacheable = $this->getID() && !$this->mRedirectedFrom;
+			// Extension may have reason to disable file caching on some pages.
+			if( $cacheable ) {
+				$cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) );
+			}
 		}
-
 		return $cacheable;
 	}
 
@@ -2947,7 +3031,7 @@ class Article {
 	 * Loads page_touched and returns a value indicating if it should be used
 	 *
 	 */
-	function checkTouched() {
+	public function checkTouched() {
 		if( !$this->mDataLoaded ) {
 			$this->loadPageData();
 		}
@@ -2957,7 +3041,7 @@ class Article {
 	/**
 	 * Get the page_touched field
 	 */
-	function getTouched() {
+	public function getTouched() {
 		# Ensure that page data has been loaded
 		if( !$this->mDataLoaded ) {
 			$this->loadPageData();
@@ -2968,8 +3052,8 @@ class Article {
 	/**
 	 * Get the page_latest field
 	 */
-	function getLatest() {
-		if ( !$this->mDataLoaded ) {
+	public function getLatest() {
+		if( !$this->mDataLoaded ) {
 			$this->loadPageData();
 		}
 		return $this->mLatest;
@@ -2980,15 +3064,14 @@ class Article {
 	 * The article must already exist; link tables etc
 	 * are not updated, caches are not flushed.
 	 *
-	 * @param string $text text submitted
-	 * @param string $comment comment submitted
-	 * @param bool $minor whereas it's a minor modification
+	 * @param $text String: text submitted
+	 * @param $comment String: comment submitted
+	 * @param $minor Boolean: whereas it's a minor modification
 	 */
-	function quickEdit( $text, $comment = '', $minor = 0 ) {
+	public function quickEdit( $text, $comment = '', $minor = 0 ) {
 		wfProfileIn( __METHOD__ );
 
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
 		$revision = new Revision( array(
 			'page'       => $this->getId(),
 			'text'       => $text,
@@ -2997,9 +3080,8 @@ class Article {
 			) );
 		$revision->insertOn( $dbw );
 		$this->updateRevisionOn( $dbw, $revision );
-		$dbw->commit();
-		
-		wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false) );
+
+		wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $wgUser) );
 
 		wfProfileOut( __METHOD__ );
 	}
@@ -3007,10 +3089,9 @@ class Article {
 	/**
 	 * Used to increment the view counter
 	 *
-	 * @static
-	 * @param integer $id article id
+	 * @param $id Integer: article id
 	 */
-	function incViewCount( $id ) {
+	public static function incViewCount( $id ) {
 		$id = intval( $id );
 		global $wgHitcounterUpdateFreq, $wgDBtype;
 
@@ -3043,14 +3124,14 @@ class Article {
 			wfProfileIn( 'Article::incViewCount-collect' );
 			$old_user_abort = ignore_user_abort( true );
 
-			if ($wgDBtype == 'mysql')
+			if($wgDBtype == 'mysql')
 				$dbw->query("LOCK TABLES $hitcounterTable WRITE");
 			$tabletype = $wgDBtype == 'mysql' ? "ENGINE=HEAP " : '';
 			$dbw->query("CREATE TEMPORARY TABLE $acchitsTable $tabletype AS ".
 				"SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ".
 				'GROUP BY hc_id');
 			$dbw->query("DELETE FROM $hitcounterTable");
-			if ($wgDBtype == 'mysql') {
+			if($wgDBtype == 'mysql') {
 				$dbw->query('UNLOCK TABLES');
 				$dbw->query("UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n ".
 					'WHERE page_id = hc_id');
@@ -3075,13 +3156,13 @@ class Article {
 	 * This is a good place to put code to clear caches, for instance.
 	 *
 	 * This is called on page move and undelete, as well as edit
-	 * @static
-	 * @param $title_obj a title object
+	 *
+	 * @param $title a title object
 	 */
 
-	static function onArticleCreate($title) {
-		# The talk page isn't in the regular link tables, so we need to update manually:
-		if ( $title->isTalkPage() ) {
+	public static function onArticleCreate( $title ) {
+		# Update existence markers on article/talk tabs...
+		if( $title->isTalkPage() ) {
 			$other = $title->getSubjectPage();
 		} else {
 			$other = $title->getTalkPage();
@@ -3094,10 +3175,9 @@ class Article {
 		$title->deleteTitleProtection();
 	}
 
-	static function onArticleDelete( $title ) {
-		global $wgUseFileCache, $wgMessageCache;
-
-		// Update existence markers on article/talk tabs...
+	public static function onArticleDelete( $title ) {
+		global $wgMessageCache;
+		# Update existence markers on article/talk tabs...
 		if( $title->isTalkPage() ) {
 			$other = $title->getSubjectPage();
 		} else {
@@ -3110,17 +3190,14 @@ class Article {
 		$title->purgeSquid();
 
 		# File cache
-		if ( $wgUseFileCache ) {
-			$cm = new HTMLFileCache( $title );
-			@unlink( $cm->fileCacheName() );
-		}
+		HTMLFileCache::clearFileCache( $title );
 
 		# Messages
 		if( $title->getNamespace() == NS_MEDIAWIKI ) {
 			$wgMessageCache->replace( $title->getDBkey(), false );
 		}
 		# Images
-		if( $title->getNamespace() == NS_IMAGE ) {
+		if( $title->getNamespace() == NS_FILE ) {
 			$update = new HTMLCacheUpdate( $title, 'imagelinks' );
 			$update->doUpdate();
 		}
@@ -3134,11 +3211,12 @@ class Article {
 	/**
 	 * Purge caches on page update etc
 	 */
-	static function onArticleEdit( $title ) {
-		global $wgDeferredUpdateList, $wgUseFileCache;
+	public static function onArticleEdit( $title, $transclusions = 'transclusions' ) {
+		global $wgDeferredUpdateList;
 
 		// Invalidate caches of articles which include this page
-		$wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'templatelinks' );
+		if( $transclusions !== 'skiptransclusions' )
+			$wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'templatelinks' );
 
 		// Invalidate the caches of all pages which redirect here
 		$wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'redirect' );
@@ -3146,11 +3224,8 @@ class Article {
 		# Purge squid for this page only
 		$title->purgeSquid();
 
-		# Clear file cache
-		if ( $wgUseFileCache ) {
-			$cm = new HTMLFileCache( $title );
-			@unlink( $cm->fileCacheName() );
-		}
+		# Clear file cache for this page only
+		HTMLFileCache::clearFileCache( $title );
 	}
 
 	/**#@-*/
@@ -3159,7 +3234,7 @@ class Article {
 	 * Overriden by ImagePage class, only present here to avoid a fatal error
 	 * Called for ?action=revert
 	 */
-	public function revert(){
+	public function revert() {
 		global $wgOut;
 		$wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
 	}
@@ -3167,13 +3242,11 @@ class Article {
 	/**
 	 * Info about this page
 	 * Called for ?action=info when $wgAllowPageInfo is on.
-	 *
-	 * @public
 	 */
-	function info() {
+	public function info() {
 		global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser;
 
-		if ( !$wgAllowPageInfo ) {
+		if( !$wgAllowPageInfo ) {
 			$wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
 			return;
 		}
@@ -3182,21 +3255,21 @@ class Article {
 
 		$wgOut->setPagetitle( $page->getPrefixedText() );
 		$wgOut->setPageTitleActionText( wfMsg( 'info_short' ) );
-		$wgOut->setSubtitle( wfMsg( 'infosubtitle' ) );
+		$wgOut->setSubtitle( wfMsgHtml( 'infosubtitle' ) );
 
 		if( !$this->mTitle->exists() ) {
-			$wgOut->addHtml( '<div class="noarticletext">' );
+			$wgOut->addHTML( '<div class="noarticletext">' );
 			if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 				// This doesn't quite make sense; the user is asking for
 				// information about the _page_, not the message... -- RC
-				$wgOut->addHtml( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
+				$wgOut->addHTML( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
 			} else {
 				$msg = $wgUser->isLoggedIn()
 					? 'noarticletext'
 					: 'noarticletextanon';
-				$wgOut->addHtml( wfMsgExt( $msg, 'parse' ) );
+				$wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
 			}
-			$wgOut->addHtml( '</div>' );
+			$wgOut->addHTML( '</div>' );
 		} else {
 			$dbr = wfGetDB( DB_SLAVE );
 			$wl_clause = array(
@@ -3222,7 +3295,6 @@ class Article {
 				$wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
 			}
 			$wgOut->addHTML( '</ul>' );
-
 		}
 	}
 
@@ -3230,34 +3302,30 @@ class Article {
 	 * Return the total number of edits and number of unique editors
 	 * on a given page. If page does not exist, returns false.
 	 *
-	 * @param Title $title
+	 * @param $title Title object
 	 * @return array
-	 * @private
 	 */
-	function pageCountInfo( $title ) {
+	protected function pageCountInfo( $title ) {
 		$id = $title->getArticleId();
 		if( $id == 0 ) {
 			return false;
 		}
-
 		$dbr = wfGetDB( DB_SLAVE );
-
 		$rev_clause = array( 'rev_page' => $id );
-
 		$edits = $dbr->selectField(
 			'revision',
 			'COUNT(rev_page)',
 			$rev_clause,
 			__METHOD__,
-			$this->getSelectOptions() );
-
+			$this->getSelectOptions()
+		);
 		$authors = $dbr->selectField(
 			'revision',
 			'COUNT(DISTINCT rev_user_text)',
 			$rev_clause,
 			__METHOD__,
-			$this->getSelectOptions() );
-
+			$this->getSelectOptions()
+		);
 		return array( 'edits' => $edits, 'authors' => $authors );
 	}
 
@@ -3265,25 +3333,22 @@ class Article {
 	 * Return a list of templates used by this article.
 	 * Uses the templatelinks table
 	 *
-	 * @return array Array of Title objects
+	 * @return Array of Title objects
 	 */
-	function getUsedTemplates() {
+	public function getUsedTemplates() {
 		$result = array();
 		$id = $this->mTitle->getArticleID();
 		if( $id == 0 ) {
 			return array();
 		}
-
 		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( array( 'templatelinks' ),
 			array( 'tl_namespace', 'tl_title' ),
 			array( 'tl_from' => $id ),
-			'Article:getUsedTemplates' );
-		if ( false !== $res ) {
-			if ( $dbr->numRows( $res ) ) {
-				while ( $row = $dbr->fetchObject( $res ) ) {
-					$result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
-				}
+			__METHOD__ );
+		if( $res !== false ) {
+			foreach( $res as $row ) {
+				$result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
 			}
 		}
 		$dbr->freeResult( $res );
@@ -3294,26 +3359,23 @@ class Article {
 	 * Returns a list of hidden categories this page is a member of.
 	 * Uses the page_props and categorylinks tables.
 	 *
-	 * @return array Array of Title objects
+	 * @return Array of Title objects
 	 */
-	function getHiddenCategories() {
+	public function getHiddenCategories() {
 		$result = array();
 		$id = $this->mTitle->getArticleID();
 		if( $id == 0 ) {
 			return array();
 		}
-
 		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( array( 'categorylinks', 'page_props', 'page' ),
 			array( 'cl_to' ),
 			array( 'cl_from' => $id, 'pp_page=page_id', 'pp_propname' => 'hiddencat',
 				'page_namespace' => NS_CATEGORY, 'page_title=cl_to'),
-			'Article:getHiddenCategories' );
-		if ( false !== $res ) {
-			if ( $dbr->numRows( $res ) ) {
-				while ( $row = $dbr->fetchObject( $res ) ) {
-					$result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to );
-				}
+			__METHOD__ );
+		if( $res !== false ) {
+			foreach( $res as $row ) {
+				$result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to );
 			}
 		}
 		$dbr->freeResult( $res );
@@ -3322,17 +3384,18 @@ class Article {
 
 	/**
 	* Return an applicable autosummary if one exists for the given edit.
-	* @param string $oldtext The previous text of the page.
-	* @param string $newtext The submitted text of the page.
-	* @param bitmask $flags A bitmask of flags submitted for the edit.
+	* @param $oldtext String: the previous text of the page.
+	* @param $newtext String: The submitted text of the page.
+	* @param $flags Bitmask: a bitmask of flags submitted for the edit.
 	* @return string An appropriate autosummary, or an empty string.
 	*/
 	public static function getAutosummary( $oldtext, $newtext, $flags ) {
 		# Decide what kind of autosummary is needed.
 
 		# Redirect autosummaries
+		$ot = Title::newFromRedirect( $oldtext );
 		$rt = Title::newFromRedirect( $newtext );
-		if( is_object( $rt ) ) {
+		if( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) {
 			return wfMsgForContent( 'autoredircomment', $rt->getFullText() );
 		}
 
@@ -3342,14 +3405,14 @@ class Article {
 			global $wgContLang;
 			$truncatedtext = $wgContLang->truncate(
 				str_replace("\n", ' ', $newtext),
-				max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new') ) ),
+				max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ),
 				'...' );
 			return wfMsgForContent( 'autosumm-new', $truncatedtext );
 		}
 
 		# Blanking autosummaries
 		if( $oldtext != '' && $newtext == '' ) {
-			return wfMsgForContent('autosumm-blank');
+			return wfMsgForContent( 'autosumm-blank' );
 		} elseif( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500) {
 			# Removing more than 90% of the article
 			global $wgContLang;
@@ -3371,11 +3434,11 @@ class Article {
 	 * Saves the text into the parser cache if possible.
 	 * Updates templatelinks if it is out of date.
 	 *
-	 * @param string  $text
-	 * @param bool    $cache
+	 * @param $text String
+	 * @param $cache Boolean
 	 */
 	public function outputWikiText( $text, $cache = true ) {
-		global $wgParser, $wgUser, $wgOut, $wgEnableParserCache;
+		global $wgParser, $wgUser, $wgOut, $wgEnableParserCache, $wgUseFileCache;
 
 		$popts = $wgOut->parserOptions();
 		$popts->setTidy(true);
@@ -3384,12 +3447,18 @@ class Article {
 			$popts, true, true, $this->getRevIdFetched() );
 		$popts->setTidy(false);
 		$popts->enableLimitReport( false );
-		if ( $wgEnableParserCache && $cache && $this && $parserOutput->getCacheTime() != -1 ) {
+		if( $wgEnableParserCache && $cache && $this && $parserOutput->getCacheTime() != -1 ) {
 			$parserCache = ParserCache::singleton();
 			$parserCache->save( $parserOutput, $this, $wgUser );
 		}
+		// Make sure file cache is not used on uncacheable content.
+		// Output that has magic words in it can still use the parser cache
+		// (if enabled), though it will generally expire sooner.
+		if( $parserOutput->getCacheTime() == -1 || $parserOutput->containsOldMagic() ) {
+			$wgUseFileCache = false;
+		}
 
-		if ( !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
+		if( $this->isCurrent() && !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
 			// templatelinks table may have become out of sync,
 			// especially if using variable-based transclusions.
 			// For paranoia, check if things have changed and if
@@ -3406,15 +3475,13 @@ class Article {
 			$res = $dbr->select( array( 'templatelinks' ),
 				array( 'tl_namespace', 'tl_title' ),
 				array( 'tl_from' => $id ),
-				'Article:getUsedTemplates' );
+				__METHOD__ );
 
 			global $wgContLang;
 
-			if ( false !== $res ) {
-				if ( $dbr->numRows( $res ) ) {
-					while ( $row = $dbr->fetchObject( $res ) ) {
-						$tlTemplates[] = $wgContLang->getNsText( $row->tl_namespace ) . ':' . $row->tl_title ;
-					}
+			if( $res !== false ) {
+				foreach( $res as $row ) {
+					$tlTemplates[] = $wgContLang->getNsText( $row->tl_namespace ) . ':' . $row->tl_title ;
 				}
 			}
 
@@ -3429,16 +3496,10 @@ class Article {
 			# Get the diff
 			$templates_diff = array_diff( $poTemplates, $tlTemplates );
 
-			if ( count( $templates_diff ) > 0 ) {
+			if( count( $templates_diff ) > 0 ) {
 				# Whee, link updates time.
 				$u = new LinksUpdate( $this->mTitle, $parserOutput );
-
-				$dbw = wfGetDb( DB_MASTER );
-				$dbw->begin();
-
 				$u->doUpdate();
-
-				$dbw->commit();
 			}
 		}
 
@@ -3479,12 +3540,12 @@ class Article {
 		if( $ns == NS_CATEGORY ) {
 			$addFields[]    = 'cat_subcats = cat_subcats + 1';
 			$removeFields[] = 'cat_subcats = cat_subcats - 1';
-		} elseif( $ns == NS_IMAGE ) {
+		} elseif( $ns == NS_FILE ) {
 			$addFields[]    = 'cat_files = cat_files + 1';
 			$removeFields[] = 'cat_files = cat_files - 1';
 		}
 
-		if ( $added ) {
+		if( $added ) {
 			$dbw->update(
 				'category',
 				$addFields,
@@ -3492,7 +3553,7 @@ class Article {
 				__METHOD__
 			);
 		}
-		if ( $deleted ) {
+		if( $deleted ) {
 			$dbw->update(
 				'category',
 				$removeFields,
diff --git a/includes/AuthPlugin.php b/includes/AuthPlugin.php
index 7717e001..b29e13f2 100644
--- a/includes/AuthPlugin.php
+++ b/includes/AuthPlugin.php
@@ -38,9 +38,8 @@ class AuthPlugin {
 	 *
 	 * @param $username String: username.
 	 * @return bool
-	 * @public
 	 */
-	function userExists( $username ) {
+	public function userExists( $username ) {
 		# Override this!
 		return false;
 	}
@@ -54,9 +53,8 @@ class AuthPlugin {
 	 * @param $username String: username.
 	 * @param $password String: user password.
 	 * @return bool
-	 * @public
 	 */
-	function authenticate( $username, $password ) {
+	public function authenticate( $username, $password ) {
 		# Override this!
 		return false;
 	}
@@ -65,9 +63,8 @@ class AuthPlugin {
 	 * Modify options in the login template.
 	 *
 	 * @param $template UserLoginTemplate object.
-	 * @public
 	 */
-	function modifyUITemplate( &$template ) {
+	public function modifyUITemplate( &$template ) {
 		# Override this!
 		$template->set( 'usedomain', false );
 	}
@@ -76,9 +73,8 @@ class AuthPlugin {
 	 * Set the domain this plugin is supposed to use when authenticating.
 	 *
 	 * @param $domain String: authentication domain.
-	 * @public
 	 */
-	function setDomain( $domain ) {
+	public function setDomain( $domain ) {
 		$this->domain = $domain;
 	}
 
@@ -87,9 +83,8 @@ class AuthPlugin {
 	 *
 	 * @param $domain String: authentication domain.
 	 * @return bool
-	 * @public
 	 */
-	function validDomain( $domain ) {
+	public function validDomain( $domain ) {
 		# Override this!
 		return true;
 	}
@@ -103,9 +98,8 @@ class AuthPlugin {
 	 * forget the & on your function declaration.
 	 *
 	 * @param User $user
-	 * @public
 	 */
-	function updateUser( &$user ) {
+	public function updateUser( &$user ) {
 		# Override this and do something
 		return true;
 	}
@@ -123,9 +117,8 @@ class AuthPlugin {
 	 * This is just a question, and shouldn't perform any actions.
 	 *
 	 * @return bool
-	 * @public
 	 */
-	function autoCreate() {
+	public function autoCreate() {
 		return false;
 	}
 
@@ -134,7 +127,7 @@ class AuthPlugin {
 	 *
 	 * @return bool
 	 */
-	function allowPasswordChange() {
+	public function allowPasswordChange() {
 		return true;
 	}
 
@@ -149,9 +142,8 @@ class AuthPlugin {
 	 * @param $user User object.
 	 * @param $password String: password.
 	 * @return bool
-	 * @public
 	 */
-	function setPassword( $user, $password ) {
+	public function setPassword( $user, $password ) {
 		return true;
 	}
 
@@ -161,9 +153,8 @@ class AuthPlugin {
 	 *
 	 * @param $user User object.
 	 * @return bool
-	 * @public
 	 */
-	function updateExternalDB( $user ) {
+	public function updateExternalDB( $user ) {
 		return true;
 	}
 
@@ -171,9 +162,8 @@ class AuthPlugin {
 	 * Check to see if external accounts can be created.
 	 * Return true if external accounts can be created.
 	 * @return bool
-	 * @public
 	 */
-	function canCreateAccounts() {
+	public function canCreateAccounts() {
 		return false;
 	}
 
@@ -186,9 +176,8 @@ class AuthPlugin {
 	 * @param string $email
 	 * @param string $realname
 	 * @return bool
-	 * @public
 	 */
-	function addUser( $user, $password, $email='', $realname='' ) {
+	public function addUser( $user, $password, $email='', $realname='' ) {
 		return true;
 	}
 
@@ -200,9 +189,8 @@ class AuthPlugin {
 	 * This is just a question, and shouldn't perform any actions.
 	 *
 	 * @return bool
-	 * @public
 	 */
-	function strict() {
+	public function strict() {
 		return false;
 	}
 
@@ -212,9 +200,8 @@ class AuthPlugin {
 	 *
 	 * @param $username String: username.
 	 * @return bool
-	 * @public
 	 */
-	function strictUserAuth( $username ) {
+	public function strictUserAuth( $username ) {
 		return false;
 	}
 
@@ -228,9 +215,8 @@ class AuthPlugin {
 	 *
 	 * @param $user User object.
 	 * @param $autocreate bool True if user is being autocreated on login
-	 * @public
 	 */
-	function initUser( &$user, $autocreate=false ) {
+	public function initUser( &$user, $autocreate=false ) {
 		# Override this to do something.
 	}
 
@@ -238,7 +224,43 @@ class AuthPlugin {
 	 * If you want to munge the case of an account name before the final
 	 * check, now is your chance.
 	 */
-	function getCanonicalName( $username ) {
+	public function getCanonicalName( $username ) {
 		return $username;
 	}
+	
+	/**
+	 * Get an instance of a User object
+	 *
+	 * @param $user User
+	 * @public
+	 */
+	public function getUserInstance( User &$user ) {
+		return new AuthPluginUser( $user );
+	}
+}
+
+class AuthPluginUser {
+	function __construct( $user ) {
+		# Override this!
+	}
+	
+	public function getId() {
+		# Override this!
+		return -1;
+	}
+	
+	public function isLocked() {
+		# Override this!
+		return false;
+	}
+	
+	public function isHidden() {
+		# Override this!
+		return false;
+	}
+	
+	public function resetAuthToken() {
+		# Override this!
+		return true;
+	}
 }
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index de75b41d..ce1912ea 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -4,483 +4,544 @@
 
 ini_set('unserialize_callback_func', '__autoload' );
 
-class AutoLoader {
-	# Locations of core classes
-	# Extension classes are specified with $wgAutoloadClasses
-	static $localClasses = array(
-		# Includes
-		'AjaxDispatcher' => 'includes/AjaxDispatcher.php',
-		'AjaxResponse' => 'includes/AjaxResponse.php',
-		'AlphabeticPager' => 'includes/Pager.php',
-		'APCBagOStuff' => 'includes/BagOStuff.php',
-		'ArrayDiffFormatter' => 'includes/DifferenceEngine.php',
-		'Article' => 'includes/Article.php',
-		'AtomFeed' => 'includes/Feed.php',
-		'AuthPlugin' => 'includes/AuthPlugin.php',
-		'Autopromote' => 'includes/Autopromote.php',
-		'BagOStuff' => 'includes/BagOStuff.php',
-		'Block' => 'includes/Block.php',
-		'CacheDependency' => 'includes/CacheDependency.php',
-		'Category' => 'includes/Category.php',
-		'Categoryfinder' => 'includes/Categoryfinder.php',
-		'CategoryPage' => 'includes/CategoryPage.php',
-		'CategoryViewer' => 'includes/CategoryPage.php',
-		'ChangesList' => 'includes/ChangesList.php',
-		'ChangesFeed' => 'includes/ChangesFeed.php',
-		'ChannelFeed' => 'includes/Feed.php',
-		'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php',
-		'ConstantDependency' => 'includes/CacheDependency.php',
-		'DBABagOStuff' => 'includes/BagOStuff.php',
-		'DependencyWrapper' => 'includes/CacheDependency.php',
-		'_DiffEngine' => 'includes/DifferenceEngine.php',
-		'DifferenceEngine' => 'includes/DifferenceEngine.php',
-		'DiffFormatter' => 'includes/DifferenceEngine.php',
-		'Diff' => 'includes/DifferenceEngine.php',
-		'_DiffOp_Add' => 'includes/DifferenceEngine.php',
-		'_DiffOp_Change' => 'includes/DifferenceEngine.php',
-		'_DiffOp_Copy' => 'includes/DifferenceEngine.php',
-		'_DiffOp_Delete' => 'includes/DifferenceEngine.php',
-		'_DiffOp' => 'includes/DifferenceEngine.php',
-		'DjVuImage' => 'includes/DjVuImage.php',
-		'DoubleReplacer' => 'includes/StringUtils.php',
-		'DoubleRedirectJob' => 'includes/DoubleRedirectJob.php',
-		'Dump7ZipOutput' => 'includes/Export.php',
-		'DumpBZip2Output' => 'includes/Export.php',
-		'DumpFileOutput' => 'includes/Export.php',
-		'DumpFilter' => 'includes/Export.php',
-		'DumpGZipOutput' => 'includes/Export.php',
-		'DumpLatestFilter' => 'includes/Export.php',
-		'DumpMultiWriter' => 'includes/Export.php',
-		'DumpNamespaceFilter' => 'includes/Export.php',
-		'DumpNotalkFilter' => 'includes/Export.php',
-		'DumpOutput' => 'includes/Export.php',
-		'DumpPipeOutput' => 'includes/Export.php',
-		'eAccelBagOStuff' => 'includes/BagOStuff.php',
-		'EditPage' => 'includes/EditPage.php',
-		'EmaillingJob' => 'includes/EmaillingJob.php',
-		'EmailNotification' => 'includes/UserMailer.php',
-		'EnhancedChangesList' => 'includes/ChangesList.php',
-		'EnotifNotifyJob' => 'includes/EnotifNotifyJob.php',
-		'ErrorPageError' => 'includes/Exception.php',
-		'Exif' => 'includes/Exif.php',
-		'ExternalEdit' => 'includes/ExternalEdit.php',
-		'ExternalStoreDB' => 'includes/ExternalStoreDB.php',
-		'ExternalStoreHttp' => 'includes/ExternalStoreHttp.php',
-		'ExternalStore' => 'includes/ExternalStore.php',
-		'FatalError' => 'includes/Exception.php',
-		'FakeTitle' => 'includes/FakeTitle.php',
-		'FauxRequest' => 'includes/WebRequest.php',
-		'FeedItem' => 'includes/Feed.php',
-		'FeedUtils' => 'includes/FeedUtils.php',
-		'FileDeleteForm' => 'includes/FileDeleteForm.php',
-		'FileDependency' => 'includes/CacheDependency.php',
-		'FileRevertForm' => 'includes/FileRevertForm.php',
-		'FileStore' => 'includes/FileStore.php',
-		'FormatExif' => 'includes/Exif.php',
-		'FormOptions' => 'includes/FormOptions.php',
-		'FSException' => 'includes/FileStore.php',
-		'FSTransaction' => 'includes/FileStore.php',
-		'GlobalDependency' => 'includes/CacheDependency.php',
-		'HashBagOStuff' => 'includes/BagOStuff.php',
-		'HashtableReplacer' => 'includes/StringUtils.php',
-		'HistoryBlobCurStub' => 'includes/HistoryBlob.php',
-		'HistoryBlob' => 'includes/HistoryBlob.php',
-		'HistoryBlobStub' => 'includes/HistoryBlob.php',
-		'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php',
-		'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php',
-		'HTMLFileCache' => 'includes/HTMLFileCache.php',
-		'Http' => 'includes/HttpFunctions.php',
-		'_HWLDF_WordAccumulator' => 'includes/DifferenceEngine.php',
-		'IEContentAnalyzer' => 'includes/IEContentAnalyzer.php',
-		'ImageGallery' => 'includes/ImageGallery.php',
-		'ImageHistoryList' => 'includes/ImagePage.php',
-		'ImagePage' => 'includes/ImagePage.php',
-		'ImageQueryPage' => 'includes/ImageQueryPage.php',
-		'IncludableSpecialPage' => 'includes/SpecialPage.php',
-		'IndexPager' => 'includes/Pager.php',
-		'IP' => 'includes/IP.php',
-		'Job' => 'includes/JobQueue.php',
-		'License' => 'includes/Licenses.php',
-		'Licenses' => 'includes/Licenses.php',
-		'LinkBatch' => 'includes/LinkBatch.php',
-		'LinkCache' => 'includes/LinkCache.php',
-		'Linker' => 'includes/Linker.php',
-		'LinkFilter' => 'includes/LinkFilter.php',
-		'LinksUpdate' => 'includes/LinksUpdate.php',
-		'LogPage' => 'includes/LogPage.php',
-		'LogPager' => 'includes/LogEventsList.php',
-		'LogEventsList' => 'includes/LogEventsList.php',
-		'LogReader' => 'includes/LogEventsList.php',
-		'LogViewer' => 'includes/LogEventsList.php',
-		'MacBinary' => 'includes/MacBinary.php',
-		'MagicWordArray' => 'includes/MagicWord.php',
-		'MagicWord' => 'includes/MagicWord.php',
-		'MailAddress' => 'includes/UserMailer.php',
-		'MappedDiff' => 'includes/DifferenceEngine.php',
-		'MathRenderer' => 'includes/Math.php',
-		'MediaTransformError' => 'includes/MediaTransformOutput.php',
-		'MediaTransformOutput' => 'includes/MediaTransformOutput.php',
-		'MediaWikiBagOStuff' => 'includes/BagOStuff.php',
-		'MediaWiki_I18N' => 'includes/SkinTemplate.php',
-		'MediaWiki' => 'includes/Wiki.php',
-		'memcached' => 'includes/memcached-client.php',
-		'MessageCache' => 'includes/MessageCache.php',
-		'MimeMagic' => 'includes/MimeMagic.php',
-		'MWException' => 'includes/Exception.php',
-		'MWNamespace' => 'includes/Namespace.php',
-		'MySQLSearchResultSet' => 'includes/SearchMySQL.php',
-		'Namespace' => 'includes/NamespaceCompat.php', // Compat
-		'OldChangesList' => 'includes/ChangesList.php',
-		'OracleSearchResultSet' => 'includes/SearchOracle.php',
-		'OutputPage' => 'includes/OutputPage.php',
-		'PageHistory' => 'includes/PageHistory.php',
-		'PageHistoryPager' => 'includes/PageHistory.php',
-		'PageQueryPage' => 'includes/PageQueryPage.php',
-		'Pager' => 'includes/Pager.php',
-		'PasswordError' => 'includes/User.php',
-		'PatrolLog' => 'includes/PatrolLog.php',
-		'PostgresSearchResult' => 'includes/SearchPostgres.php',
-		'PostgresSearchResultSet' => 'includes/SearchPostgres.php',
-		'PrefixSearch' => 'includes/PrefixSearch.php',
-		'Profiler' => 'includes/Profiler.php',
-		'ProfilerSimple' => 'includes/ProfilerSimple.php',
-		'ProfilerSimpleText' => 'includes/ProfilerSimpleText.php',
-		'ProfilerSimpleUDP' => 'includes/ProfilerSimpleUDP.php',
-		'ProtectionForm' => 'includes/ProtectionForm.php',
-		'QueryPage' => 'includes/QueryPage.php',
-		'QuickTemplate' => 'includes/SkinTemplate.php',
-		'RawPage' => 'includes/RawPage.php',
-		'RCCacheEntry' => 'includes/ChangesList.php',
-		'RecentChange' => 'includes/RecentChange.php',
-		'RefreshLinksJob' => 'includes/RefreshLinksJob.php',
-		'RegexlikeReplacer' => 'includes/StringUtils.php',
-		'ReplacementArray' => 'includes/StringUtils.php',
-		'Replacer' => 'includes/StringUtils.php',
-		'ReverseChronologicalPager' => 'includes/Pager.php',
-		'Revision' => 'includes/Revision.php',
-		'RSSFeed' => 'includes/Feed.php',
-		'Sanitizer' => 'includes/Sanitizer.php',
-		'SearchEngineDummy' => 'includes/SearchEngine.php',
-		'SearchEngine' => 'includes/SearchEngine.php',
-		'SearchHighlighter' => 'includes/SearchEngine.php',
-		'SearchMySQL4' => 'includes/SearchMySQL4.php',
-		'SearchMySQL' => 'includes/SearchMySQL.php',
-		'SearchOracle' => 'includes/SearchOracle.php',
-		'SearchPostgres' => 'includes/SearchPostgres.php',
-		'SearchResult' => 'includes/SearchEngine.php',
-		'SearchResultSet' => 'includes/SearchEngine.php',
-		'SearchResultTooMany' => 'includes/SearchEngine.php',
-		'SearchUpdate' => 'includes/SearchUpdate.php',
-		'SearchUpdateMyISAM' => 'includes/SearchUpdate.php',
-		'SiteConfiguration' => 'includes/SiteConfiguration.php',
-		'SiteStats' => 'includes/SiteStats.php',
-		'SiteStatsUpdate' => 'includes/SiteStats.php',
-		'Skin' => 'includes/Skin.php',
-		'SkinTemplate' => 'includes/SkinTemplate.php',
-		'SpecialMycontributions' => 'includes/SpecialPage.php',
-		'SpecialMypage' => 'includes/SpecialPage.php',
-		'SpecialMytalk' => 'includes/SpecialPage.php',
-		'SpecialPage' => 'includes/SpecialPage.php',
-		'SpecialRedirectToSpecial' => 'includes/SpecialPage.php',
-		'SqlBagOStuff' => 'includes/BagOStuff.php',
-		'SquidUpdate' => 'includes/SquidUpdate.php',
-		'Status' => 'includes/Status.php',
-		'StringUtils' => 'includes/StringUtils.php',
-		'TableDiffFormatter' => 'includes/DifferenceEngine.php',
-		'TablePager' => 'includes/Pager.php',
-		'ThumbnailImage' => 'includes/MediaTransformOutput.php',
-		'TitleDependency' => 'includes/CacheDependency.php',
-		'Title' => 'includes/Title.php',
-		'TitleListDependency' => 'includes/CacheDependency.php',
-		'TransformParameterError' => 'includes/MediaTransformOutput.php',
-		'TurckBagOStuff' => 'includes/BagOStuff.php',
-		'UnifiedDiffFormatter' => 'includes/DifferenceEngine.php',
-		'UnlistedSpecialPage' => 'includes/SpecialPage.php',
-		'User' => 'includes/User.php',
-		'UserArray' => 'includes/UserArray.php',
-		'UserArrayFromResult' => 'includes/UserArray.php',
-		'UserMailer' => 'includes/UserMailer.php',
-		'UserRightsProxy' => 'includes/UserRightsProxy.php',
-		'WatchedItem' => 'includes/WatchedItem.php',
-		'WatchlistEditor' => 'includes/WatchlistEditor.php',
-		'WebRequest' => 'includes/WebRequest.php',
-		'WebResponse' => 'includes/WebResponse.php',
-		'WikiError' => 'includes/WikiError.php',
-		'WikiErrorMsg' => 'includes/WikiError.php',
-		'WikiExporter' => 'includes/Export.php',
-		'WikiXmlError' => 'includes/WikiError.php',
-		'WordLevelDiff' => 'includes/DifferenceEngine.php',
-		'XCacheBagOStuff' => 'includes/BagOStuff.php',
-		'XmlDumpWriter' => 'includes/Export.php',
-		'Xml' => 'includes/Xml.php',
-		'XmlSelect' => 'includes/Xml.php',
-		'XmlTypeCheck' => 'includes/XmlTypeCheck.php',
-		'ZhClient' => 'includes/ZhClient.php',
+# Locations of core classes
+# Extension classes are specified with $wgAutoloadClasses
+# This array is a global instead of a static member of AutoLoader to work around a bug in APC
+global $wgAutoloadLocalClasses;
+$wgAutoloadLocalClasses = array(
+	# Includes
+	'AjaxDispatcher' => 'includes/AjaxDispatcher.php',
+	'AjaxResponse' => 'includes/AjaxResponse.php',
+	'AlphabeticPager' => 'includes/Pager.php',
+	'APCBagOStuff' => 'includes/BagOStuff.php',
+	'Article' => 'includes/Article.php',
+	'AtomFeed' => 'includes/Feed.php',
+	'AuthPlugin' => 'includes/AuthPlugin.php',
+	'AuthPluginUser' => 'includes/AuthPlugin.php',
+	'Autopromote' => 'includes/Autopromote.php',
+	'BagOStuff' => 'includes/BagOStuff.php',
+	'Block' => 'includes/Block.php',
+	'CacheDependency' => 'includes/CacheDependency.php',
+	'Category' => 'includes/Category.php',
+	'Categoryfinder' => 'includes/Categoryfinder.php',
+	'CategoryPage' => 'includes/CategoryPage.php',
+	'CategoryViewer' => 'includes/CategoryPage.php',
+	'ChangesList' => 'includes/ChangesList.php',
+	'ChangesFeed' => 'includes/ChangesFeed.php',
+	'ChannelFeed' => 'includes/Feed.php',
+	'ConcatenatedGzipHistoryBlob' => 'includes/HistoryBlob.php',
+	'ConstantDependency' => 'includes/CacheDependency.php',
+	'CreativeCommonsRdf' => 'includes/Metadata.php',
+	'Credits' => 'includes/Credits.php',
+	'DBABagOStuff' => 'includes/BagOStuff.php',
+	'DependencyWrapper' => 'includes/CacheDependency.php',
+	'DiffHistoryBlob' => 'includes/HistoryBlob.php',
+	'DjVuImage' => 'includes/DjVuImage.php',
+	'DoubleReplacer' => 'includes/StringUtils.php',
+	'DoubleRedirectJob' => 'includes/DoubleRedirectJob.php',
+	'DublinCoreRdf' => 'includes/Metadata.php',
+	'Dump7ZipOutput' => 'includes/Export.php',
+	'DumpBZip2Output' => 'includes/Export.php',
+	'DumpFileOutput' => 'includes/Export.php',
+	'DumpFilter' => 'includes/Export.php',
+	'DumpGZipOutput' => 'includes/Export.php',
+	'DumpLatestFilter' => 'includes/Export.php',
+	'DumpMultiWriter' => 'includes/Export.php',
+	'DumpNamespaceFilter' => 'includes/Export.php',
+	'DumpNotalkFilter' => 'includes/Export.php',
+	'DumpOutput' => 'includes/Export.php',
+	'DumpPipeOutput' => 'includes/Export.php',
+	'eAccelBagOStuff' => 'includes/BagOStuff.php',
+	'EditPage' => 'includes/EditPage.php',
+	'EmaillingJob' => 'includes/EmaillingJob.php',
+	'EmailNotification' => 'includes/UserMailer.php',
+	'EnhancedChangesList' => 'includes/ChangesList.php',
+	'EnotifNotifyJob' => 'includes/EnotifNotifyJob.php',
+	'ErrorPageError' => 'includes/Exception.php',
+	'Exif' => 'includes/Exif.php',
+	'ExplodeIterator' => 'includes/StringUtils.php',
+	'ExternalEdit' => 'includes/ExternalEdit.php',
+	'ExternalStoreDB' => 'includes/ExternalStoreDB.php',
+	'ExternalStoreHttp' => 'includes/ExternalStoreHttp.php',
+	'ExternalStore' => 'includes/ExternalStore.php',
+	'FatalError' => 'includes/Exception.php',
+	'FakeTitle' => 'includes/FakeTitle.php',
+	'FauxRequest' => 'includes/WebRequest.php',
+	'FeedItem' => 'includes/Feed.php',
+	'FeedUtils' => 'includes/FeedUtils.php',
+	'FileDeleteForm' => 'includes/FileDeleteForm.php',
+	'FileDependency' => 'includes/CacheDependency.php',
+	'FileRevertForm' => 'includes/FileRevertForm.php',
+	'FileStore' => 'includes/FileStore.php',
+	'FormatExif' => 'includes/Exif.php',
+	'FormOptions' => 'includes/FormOptions.php',
+	'FSException' => 'includes/FileStore.php',
+	'FSTransaction' => 'includes/FileStore.php',
+	'GlobalDependency' => 'includes/CacheDependency.php',
+	'HashBagOStuff' => 'includes/BagOStuff.php',
+	'HashtableReplacer' => 'includes/StringUtils.php',
+	'HistoryBlobCurStub' => 'includes/HistoryBlob.php',
+	'HistoryBlob' => 'includes/HistoryBlob.php',
+	'HistoryBlobStub' => 'includes/HistoryBlob.php',
+	'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php',
+	'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php',
+	'HTMLFileCache' => 'includes/HTMLFileCache.php',
+	'Http' => 'includes/HttpFunctions.php',
+	'IEContentAnalyzer' => 'includes/IEContentAnalyzer.php',
+	'ImageGallery' => 'includes/ImageGallery.php',
+	'ImageHistoryList' => 'includes/ImagePage.php',
+	'ImagePage' => 'includes/ImagePage.php',
+	'ImageQueryPage' => 'includes/ImageQueryPage.php',
+	'IncludableSpecialPage' => 'includes/SpecialPage.php',
+	'IndexPager' => 'includes/Pager.php',
+	'Interwiki' => 'includes/Interwiki.php',
+	'IP' => 'includes/IP.php',
+	'Job' => 'includes/JobQueue.php',
+	'License' => 'includes/Licenses.php',
+	'Licenses' => 'includes/Licenses.php',
+	'LinkBatch' => 'includes/LinkBatch.php',
+	'LinkCache' => 'includes/LinkCache.php',
+	'Linker' => 'includes/Linker.php',
+	'LinkFilter' => 'includes/LinkFilter.php',
+	'LinksUpdate' => 'includes/LinksUpdate.php',
+	'LogPage' => 'includes/LogPage.php',
+	'LogPager' => 'includes/LogEventsList.php',
+	'LogEventsList' => 'includes/LogEventsList.php',
+	'LogReader' => 'includes/LogEventsList.php',
+	'LogViewer' => 'includes/LogEventsList.php',
+	'MacBinary' => 'includes/MacBinary.php',
+	'MagicWordArray' => 'includes/MagicWord.php',
+	'MagicWord' => 'includes/MagicWord.php',
+	'MailAddress' => 'includes/UserMailer.php',
+	'MathRenderer' => 'includes/Math.php',
+	'MediaTransformError' => 'includes/MediaTransformOutput.php',
+	'MediaTransformOutput' => 'includes/MediaTransformOutput.php',
+	'MediaWikiBagOStuff' => 'includes/BagOStuff.php',
+	'MediaWiki_I18N' => 'includes/SkinTemplate.php',
+	'MediaWiki' => 'includes/Wiki.php',
+	'memcached' => 'includes/memcached-client.php',
+	'MessageCache' => 'includes/MessageCache.php',
+	'MimeMagic' => 'includes/MimeMagic.php',
+	'MWException' => 'includes/Exception.php',
+	'MWNamespace' => 'includes/Namespace.php',
+	'MySQLSearchResultSet' => 'includes/SearchMySQL.php',
+	'Namespace' => 'includes/NamespaceCompat.php', // Compat
+	'OldChangesList' => 'includes/ChangesList.php',
+	'OracleSearchResultSet' => 'includes/SearchOracle.php',
+	'OutputPage' => 'includes/OutputPage.php',
+	'PageHistory' => 'includes/PageHistory.php',
+	'PageHistoryPager' => 'includes/PageHistory.php',
+	'PageQueryPage' => 'includes/PageQueryPage.php',
+	'Pager' => 'includes/Pager.php',
+	'PasswordError' => 'includes/User.php',
+	'PatrolLog' => 'includes/PatrolLog.php',
+	'PostgresSearchResult' => 'includes/SearchPostgres.php',
+	'PostgresSearchResultSet' => 'includes/SearchPostgres.php',
+	'PrefixSearch' => 'includes/PrefixSearch.php',
+	'Profiler' => 'includes/Profiler.php',
+	'ProfilerSimple' => 'includes/ProfilerSimple.php',
+	'ProfilerSimpleText' => 'includes/ProfilerSimpleText.php',
+	'ProfilerSimpleUDP' => 'includes/ProfilerSimpleUDP.php',
+	'ProtectionForm' => 'includes/ProtectionForm.php',
+	'QueryPage' => 'includes/QueryPage.php',
+	'QuickTemplate' => 'includes/SkinTemplate.php',
+	'RawPage' => 'includes/RawPage.php',
+	'RCCacheEntry' => 'includes/ChangesList.php',
+	'RdfMetaData' => 'includes/Metadata.php',
+	'RecentChange' => 'includes/RecentChange.php',
+	'RefreshLinksJob' => 'includes/RefreshLinksJob.php',
+	'RefreshLinksJob2' => 'includes/RefreshLinksJob.php',
+	'RegexlikeReplacer' => 'includes/StringUtils.php',
+	'ReplacementArray' => 'includes/StringUtils.php',
+	'Replacer' => 'includes/StringUtils.php',
+	'ReverseChronologicalPager' => 'includes/Pager.php',
+	'Revision' => 'includes/Revision.php',
+	'RSSFeed' => 'includes/Feed.php',
+	'Sanitizer' => 'includes/Sanitizer.php',
+	'SearchEngineDummy' => 'includes/SearchEngine.php',
+	'SearchEngine' => 'includes/SearchEngine.php',
+	'SearchHighlighter' => 'includes/SearchEngine.php',
+	'SearchMySQL4' => 'includes/SearchMySQL4.php',
+	'SearchMySQL' => 'includes/SearchMySQL.php',
+	'SearchOracle' => 'includes/SearchOracle.php',
+	'SearchPostgres' => 'includes/SearchPostgres.php',
+	'SearchResult' => 'includes/SearchEngine.php',
+	'SearchResultSet' => 'includes/SearchEngine.php',
+	'SearchResultTooMany' => 'includes/SearchEngine.php',
+	'SearchUpdate' => 'includes/SearchUpdate.php',
+	'SearchUpdateMyISAM' => 'includes/SearchUpdate.php',
+	'SiteConfiguration' => 'includes/SiteConfiguration.php',
+	'SiteStats' => 'includes/SiteStats.php',
+	'SiteStatsUpdate' => 'includes/SiteStats.php',
+	'Skin' => 'includes/Skin.php',
+	'SkinTemplate' => 'includes/SkinTemplate.php',
+	'SpecialMycontributions' => 'includes/SpecialPage.php',
+	'SpecialMypage' => 'includes/SpecialPage.php',
+	'SpecialMytalk' => 'includes/SpecialPage.php',
+	'SpecialPage' => 'includes/SpecialPage.php',
+	'SpecialRedirectToSpecial' => 'includes/SpecialPage.php',
+	'SqlBagOStuff' => 'includes/BagOStuff.php',
+	'SquidUpdate' => 'includes/SquidUpdate.php',
+	'Status' => 'includes/Status.php',
+	'StringUtils' => 'includes/StringUtils.php',
+	'TablePager' => 'includes/Pager.php',
+	'ThumbnailImage' => 'includes/MediaTransformOutput.php',
+	'TitleDependency' => 'includes/CacheDependency.php',
+	'Title' => 'includes/Title.php',
+	'TitleArray' => 'includes/TitleArray.php',
+	'TitleListDependency' => 'includes/CacheDependency.php',
+	'TransformParameterError' => 'includes/MediaTransformOutput.php',
+	'TurckBagOStuff' => 'includes/BagOStuff.php',
+	'UnlistedSpecialPage' => 'includes/SpecialPage.php',
+	'UploadBase' => 'includes/UploadBase.php',
+	'UploadFromStash' => 'includes/UploadFromStash.php',
+	'UploadFromUpload' => 'includes/UploadFromUpload.php',
+	'UploadFromUrl' => 'includes/UploadFromUrl.php',
+	'User' => 'includes/User.php',
+	'UserArray' => 'includes/UserArray.php',
+	'UserArrayFromResult' => 'includes/UserArray.php',
+	'UserMailer' => 'includes/UserMailer.php',
+	'UserRightsProxy' => 'includes/UserRightsProxy.php',
+	'WatchedItem' => 'includes/WatchedItem.php',
+	'WatchlistEditor' => 'includes/WatchlistEditor.php',
+	'WebRequest' => 'includes/WebRequest.php',
+	'WebResponse' => 'includes/WebResponse.php',
+	'WikiError' => 'includes/WikiError.php',
+	'WikiErrorMsg' => 'includes/WikiError.php',
+	'WikiExporter' => 'includes/Export.php',
+	'WikiXmlError' => 'includes/WikiError.php',
+	'XCacheBagOStuff' => 'includes/BagOStuff.php',
+	'XmlDumpWriter' => 'includes/Export.php',
+	'Xml' => 'includes/Xml.php',
+	'XmlSelect' => 'includes/Xml.php',
+	'XmlTypeCheck' => 'includes/XmlTypeCheck.php',
+	'ZhClient' => 'includes/ZhClient.php',
+
+	# includes/api
+	'ApiBase' => 'includes/api/ApiBase.php',
+	'ApiBlock' => 'includes/api/ApiBlock.php',
+	'ApiDelete' => 'includes/api/ApiDelete.php',
+	'ApiDisabled' => 'includes/api/ApiDisabled.php',
+	'ApiEditPage' => 'includes/api/ApiEditPage.php',
+	'ApiEmailUser' => 'includes/api/ApiEmailUser.php',
+	'ApiExpandTemplates' => 'includes/api/ApiExpandTemplates.php',
+	'ApiFeedWatchlist' => 'includes/api/ApiFeedWatchlist.php',
+	'ApiFormatBase' => 'includes/api/ApiFormatBase.php',
+	'ApiFormatDbg' => 'includes/api/ApiFormatDbg.php',
+	'ApiFormatFeedWrapper' => 'includes/api/ApiFormatBase.php',
+	'ApiFormatJson' => 'includes/api/ApiFormatJson.php',
+	'ApiFormatPhp' => 'includes/api/ApiFormatPhp.php',
+	'ApiFormatTxt' => 'includes/api/ApiFormatTxt.php',
+	'ApiFormatWddx' => 'includes/api/ApiFormatWddx.php',
+	'ApiFormatXml' => 'includes/api/ApiFormatXml.php',
+	'ApiFormatYaml' => 'includes/api/ApiFormatYaml.php',
+	'ApiHelp' => 'includes/api/ApiHelp.php',
+	'ApiLogin' => 'includes/api/ApiLogin.php',
+	'ApiLogout' => 'includes/api/ApiLogout.php',
+	'ApiMain' => 'includes/api/ApiMain.php',
+	'ApiMove' => 'includes/api/ApiMove.php',
+	'ApiOpenSearch' => 'includes/api/ApiOpenSearch.php',
+	'ApiPageSet' => 'includes/api/ApiPageSet.php',
+	'ApiParamInfo' => 'includes/api/ApiParamInfo.php',
+	'ApiParse' => 'includes/api/ApiParse.php',
+	'ApiPatrol' => 'includes/api/ApiPatrol.php',
+	'ApiProtect' => 'includes/api/ApiProtect.php',
+	'ApiPurge' => 'includes/api/ApiPurge.php',
+	'ApiQuery' => 'includes/api/ApiQuery.php',
+	'ApiQueryAllCategories' => 'includes/api/ApiQueryAllCategories.php',
+	'ApiQueryAllimages' => 'includes/api/ApiQueryAllimages.php',
+	'ApiQueryAllLinks' => 'includes/api/ApiQueryAllLinks.php',
+	'ApiQueryAllUsers' => 'includes/api/ApiQueryAllUsers.php',
+	'ApiQueryAllmessages' => 'includes/api/ApiQueryAllmessages.php',
+	'ApiQueryAllpages' => 'includes/api/ApiQueryAllpages.php',
+	'ApiQueryBacklinks' => 'includes/api/ApiQueryBacklinks.php',
+	'ApiQueryBase' => 'includes/api/ApiQueryBase.php',
+	'ApiQueryBlocks' => 'includes/api/ApiQueryBlocks.php',
+	'ApiQueryCategories' => 'includes/api/ApiQueryCategories.php',
+	'ApiQueryCategoryInfo' => 'includes/api/ApiQueryCategoryInfo.php',
+	'ApiQueryCategoryMembers' => 'includes/api/ApiQueryCategoryMembers.php',
+	'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php',
+	'ApiQueryDeletedrevs' => 'includes/api/ApiQueryDeletedrevs.php',
+	'ApiQueryDisabled' => 'includes/api/ApiQueryDisabled.php',
+	'ApiQueryDuplicateFiles' => 'includes/api/ApiQueryDuplicateFiles.php',
+	'ApiQueryExtLinksUsage' => 'includes/api/ApiQueryExtLinksUsage.php',
+	'ApiQueryExternalLinks' => 'includes/api/ApiQueryExternalLinks.php',
+	'ApiQueryGeneratorBase' => 'includes/api/ApiQueryBase.php',
+	'ApiQueryImageInfo' => 'includes/api/ApiQueryImageInfo.php',
+	'ApiQueryImages' => 'includes/api/ApiQueryImages.php',
+	'ApiQueryInfo' => 'includes/api/ApiQueryInfo.php',
+	'ApiQueryLangLinks' => 'includes/api/ApiQueryLangLinks.php',
+	'ApiQueryLinks' => 'includes/api/ApiQueryLinks.php',
+	'ApiQueryLogEvents' => 'includes/api/ApiQueryLogEvents.php',
+	'ApiQueryRandom' => 'includes/api/ApiQueryRandom.php',
+	'ApiQueryRecentChanges'=> 'includes/api/ApiQueryRecentChanges.php',
+	'ApiQueryRevisions' => 'includes/api/ApiQueryRevisions.php',
+	'ApiQuerySearch' => 'includes/api/ApiQuerySearch.php',
+	'ApiQuerySiteinfo' => 'includes/api/ApiQuerySiteinfo.php',
+	'ApiQueryUserInfo' => 'includes/api/ApiQueryUserInfo.php',
+	'ApiQueryUsers' => 'includes/api/ApiQueryUsers.php',
+	'ApiQueryWatchlist' => 'includes/api/ApiQueryWatchlist.php',
+	'ApiQueryWatchlistRaw' => 'includes/api/ApiQueryWatchlistRaw.php',
+	'ApiResult' => 'includes/api/ApiResult.php',
+	'ApiRollback' => 'includes/api/ApiRollback.php',
+	'ApiUnblock' => 'includes/api/ApiUnblock.php',
+	'ApiUndelete' => 'includes/api/ApiUndelete.php',
+	'ApiWatch' => 'includes/api/ApiWatch.php',
+	'Services_JSON' => 'includes/api/ApiFormatJson_json.php',
+	'Services_JSON_Error' => 'includes/api/ApiFormatJson_json.php',
+	'Spyc' => 'includes/api/ApiFormatYaml_spyc.php',
+	'UsageException' => 'includes/api/ApiMain.php',
 
-		# includes/api
-		'ApiBase' => 'includes/api/ApiBase.php',
-		'ApiBlock' => 'includes/api/ApiBlock.php',
-		'ApiDelete' => 'includes/api/ApiDelete.php',
-		'ApiEditPage' => 'includes/api/ApiEditPage.php',
-		'ApiEmailUser' => 'includes/api/ApiEmailUser.php',
-		'ApiExpandTemplates' => 'includes/api/ApiExpandTemplates.php',
-		'ApiFeedWatchlist' => 'includes/api/ApiFeedWatchlist.php',
-		'ApiFormatBase' => 'includes/api/ApiFormatBase.php',
-		'ApiFormatDbg' => 'includes/api/ApiFormatDbg.php',
-		'ApiFormatFeedWrapper' => 'includes/api/ApiFormatBase.php',
-		'ApiFormatJson' => 'includes/api/ApiFormatJson.php',
-		'ApiFormatPhp' => 'includes/api/ApiFormatPhp.php',
-		'ApiFormatTxt' => 'includes/api/ApiFormatTxt.php',
-		'ApiFormatWddx' => 'includes/api/ApiFormatWddx.php',
-		'ApiFormatXml' => 'includes/api/ApiFormatXml.php',
-		'ApiFormatYaml' => 'includes/api/ApiFormatYaml.php',
-		'ApiHelp' => 'includes/api/ApiHelp.php',
-		'ApiLogin' => 'includes/api/ApiLogin.php',
-		'ApiLogout' => 'includes/api/ApiLogout.php',
-		'ApiMain' => 'includes/api/ApiMain.php',
-		'ApiMove' => 'includes/api/ApiMove.php',
-		'ApiOpenSearch' => 'includes/api/ApiOpenSearch.php',
-		'ApiPageSet' => 'includes/api/ApiPageSet.php',
-		'ApiParamInfo' => 'includes/api/ApiParamInfo.php',
-		'ApiParse' => 'includes/api/ApiParse.php',
-		'ApiProtect' => 'includes/api/ApiProtect.php',
-		'ApiQuery' => 'includes/api/ApiQuery.php',
-		'ApiQueryAllCategories' => 'includes/api/ApiQueryAllCategories.php',
-		'ApiQueryAllimages' => 'includes/api/ApiQueryAllimages.php',
-		'ApiQueryAllLinks' => 'includes/api/ApiQueryAllLinks.php',
-		'ApiQueryAllUsers' => 'includes/api/ApiQueryAllUsers.php',
-		'ApiQueryAllmessages' => 'includes/api/ApiQueryAllmessages.php',
-		'ApiQueryAllpages' => 'includes/api/ApiQueryAllpages.php',
-		'ApiQueryBacklinks' => 'includes/api/ApiQueryBacklinks.php',
-		'ApiQueryBase' => 'includes/api/ApiQueryBase.php',
-		'ApiQueryBlocks' => 'includes/api/ApiQueryBlocks.php',
-		'ApiQueryCategories' => 'includes/api/ApiQueryCategories.php',
-		'ApiQueryCategoryInfo' => 'includes/api/ApiQueryCategoryInfo.php',
-		'ApiQueryCategoryMembers' => 'includes/api/ApiQueryCategoryMembers.php',
-		'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php',
-		'ApiQueryDeletedrevs' => 'includes/api/ApiQueryDeletedrevs.php',
-		'ApiQueryExtLinksUsage' => 'includes/api/ApiQueryExtLinksUsage.php',
-		'ApiQueryExternalLinks' => 'includes/api/ApiQueryExternalLinks.php',
-		'ApiQueryGeneratorBase' => 'includes/api/ApiQueryBase.php',
-		'ApiQueryImageInfo' => 'includes/api/ApiQueryImageInfo.php',
-		'ApiQueryImages' => 'includes/api/ApiQueryImages.php',
-		'ApiQueryInfo' => 'includes/api/ApiQueryInfo.php',
-		'ApiQueryLangLinks' => 'includes/api/ApiQueryLangLinks.php',
-		'ApiQueryLinks' => 'includes/api/ApiQueryLinks.php',
-		'ApiQueryLogEvents' => 'includes/api/ApiQueryLogEvents.php',
-		'ApiQueryRandom' => 'includes/api/ApiQueryRandom.php',
-		'ApiQueryRecentChanges'=> 'includes/api/ApiQueryRecentChanges.php',
-		'ApiQueryRevisions' => 'includes/api/ApiQueryRevisions.php',
-		'ApiQuerySearch' => 'includes/api/ApiQuerySearch.php',
-		'ApiQuerySiteinfo' => 'includes/api/ApiQuerySiteinfo.php',
-		'ApiQueryUserInfo' => 'includes/api/ApiQueryUserInfo.php',
-		'ApiQueryUsers' => 'includes/api/ApiQueryUsers.php',
-		'ApiQueryWatchlist' => 'includes/api/ApiQueryWatchlist.php',
-		'ApiResult' => 'includes/api/ApiResult.php',
-		'ApiRollback' => 'includes/api/ApiRollback.php',
-		'ApiUnblock' => 'includes/api/ApiUnblock.php',
-		'ApiUndelete' => 'includes/api/ApiUndelete.php',
-		'Services_JSON' => 'includes/api/ApiFormatJson_json.php',
-		'Services_JSON_Error' => 'includes/api/ApiFormatJson_json.php',
-		'Spyc' => 'includes/api/ApiFormatYaml_spyc.php',
-		'UsageException' => 'includes/api/ApiMain.php',
-		'YAMLNode' => 'includes/api/ApiFormatYaml_spyc.php',
+	# includes/db
+	'Blob' => 'includes/db/Database.php',
+	'ChronologyProtector' => 'includes/db/LBFactory.php',
+	'Database' => 'includes/db/Database.php',
+	'DatabaseMssql' => 'includes/db/DatabaseMssql.php',
+	'DatabaseMysql' => 'includes/db/Database.php',
+	'DatabaseOracle' => 'includes/db/DatabaseOracle.php',
+	'DatabasePostgres' => 'includes/db/DatabasePostgres.php',
+	'DatabaseSqlite' => 'includes/db/DatabaseSqlite.php',
+	'DBConnectionError' => 'includes/db/Database.php',
+	'DBError' => 'includes/db/Database.php',
+	'DBObject' => 'includes/db/Database.php',
+	'DBQueryError' => 'includes/db/Database.php',
+	'DBUnexpectedError' => 'includes/db/Database.php',
+	'LBFactory' => 'includes/db/LBFactory.php',
+	'LBFactory_Multi' => 'includes/db/LBFactory_Multi.php',
+	'LBFactory_Simple' => 'includes/db/LBFactory.php',
+	'LoadBalancer' => 'includes/db/LoadBalancer.php',
+	'LoadMonitor' => 'includes/db/LoadMonitor.php',
+	'LoadMonitor_MySQL' => 'includes/db/LoadMonitor.php',
+	'MSSQLField' => 'includes/db/DatabaseMssql.php',
+	'MySQLField' => 'includes/db/Database.php',
+	'MySQLMasterPos' => 'includes/db/Database.php',
+	'ORABlob' => 'includes/db/DatabaseOracle.php',
+	'ORAResult' => 'includes/db/DatabaseOracle.php',
+	'PostgresField' => 'includes/db/DatabasePostgres.php',
+	'ResultWrapper' => 'includes/db/Database.php',
+	'SQLiteField' => 'includes/db/DatabaseSqlite.php',
 
-		# includes/db
-		'Blob' => 'includes/db/Database.php',
-		'ChronologyProtector' => 'includes/db/LBFactory.php',
-		'Database' => 'includes/db/Database.php',
-		'DatabaseMssql' => 'includes/db/DatabaseMssql.php',
-		'DatabaseMysql' => 'includes/db/Database.php',
-		'DatabaseOracle' => 'includes/db/DatabaseOracle.php',
-		'DatabasePostgres' => 'includes/db/DatabasePostgres.php',
-		'DatabaseSqlite' => 'includes/db/DatabaseSqlite.php',
-		'DBConnectionError' => 'includes/db/Database.php',
-		'DBError' => 'includes/db/Database.php',
-		'DBObject' => 'includes/db/Database.php',
-		'DBQueryError' => 'includes/db/Database.php',
-		'DBUnexpectedError' => 'includes/db/Database.php',
-		'LBFactory' => 'includes/db/LBFactory.php',
-		'LBFactory_Multi' => 'includes/db/LBFactory_Multi.php',
-		'LBFactory_Simple' => 'includes/db/LBFactory.php',
-		'LoadBalancer' => 'includes/db/LoadBalancer.php',
-		'LoadMonitor' => 'includes/db/LoadMonitor.php',
-		'LoadMonitor_MySQL' => 'includes/db/LoadMonitor.php',
-		'MSSQLField' => 'includes/db/DatabaseMssql.php',
-		'MySQLField' => 'includes/db/Database.php',
-		'MySQLMasterPos' => 'includes/db/Database.php',
-		'ORABlob' => 'includes/db/DatabaseOracle.php',
-		'ORAResult' => 'includes/db/DatabaseOracle.php',
-		'PostgresField' => 'includes/db/DatabasePostgres.php',
-		'ResultWrapper' => 'includes/db/Database.php',
-		'SQLiteField' => 'includes/db/DatabaseSqlite.php',
+	# includes/diff
+	'AncestorComparator' => 'includes/diff/HTMLDiff.php',
+	'AnchorToString' => 'includes/diff/HTMLDiff.php',
+	'ArrayDiffFormatter' => 'includes/diff/DifferenceEngine.php',
+	'BodyNode' => 'includes/diff/Nodes.php',
+	'ChangeText' => 'includes/diff/HTMLDiff.php',
+	'ChangeTextGenerator' => 'includes/diff/HTMLDiff.php',
+	'DelegatingContentHandler' => 'includes/diff/HTMLDiff.php',
+	'_DiffEngine' => 'includes/diff/DifferenceEngine.php',
+	'DifferenceEngine' => 'includes/diff/DifferenceEngine.php',
+	'DiffFormatter' => 'includes/diff/DifferenceEngine.php',
+	'Diff' => 'includes/diff/DifferenceEngine.php',
+	'_DiffOp_Add' => 'includes/diff/DifferenceEngine.php',
+	'_DiffOp_Change' => 'includes/diff/DifferenceEngine.php',
+	'_DiffOp_Copy' => 'includes/diff/DifferenceEngine.php',
+	'_DiffOp_Delete' => 'includes/diff/DifferenceEngine.php',
+	'_DiffOp' => 'includes/diff/DifferenceEngine.php',
+	'DomTreeBuilder' => 'includes/diff/HTMLDiff.php',
+	'DummyNode' => 'includes/diff/Nodes.php',
+	'HTMLDiffer' => 'includes/diff/HTMLDiff.php',
+	'HTMLOutput' => 'includes/diff/HTMLDiff.php',
+	'_HWLDF_WordAccumulator' => 'includes/diff/DifferenceEngine.php',
+	'ImageNode' => 'includes/diff/Nodes.php',
+	'LastCommonParentResult' => 'includes/diff/HTMLDiff.php',
+	'MappedDiff' => 'includes/diff/DifferenceEngine.php',
+	'Modification' => 'includes/diff/HTMLDiff.php',
+	'NoContentTagToString' => 'includes/diff/HTMLDiff.php',
+	'Node' => 'includes/diff/Nodes.php',
+	'RangeDifference' => 'includes/diff/Diff.php',
+	'TableDiffFormatter' => 'includes/diff/DifferenceEngine.php',
+	'TagNode' => 'includes/diff/Nodes.php',
+	'TagToString' => 'includes/diff/HTMLDiff.php',
+	'TagToStringFactory' => 'includes/diff/HTMLDiff.php',
+	'TextNode' => 'includes/diff/Nodes.php',
+	'TextNodeDiffer' => 'includes/diff/HTMLDiff.php',
+	'TextOnlyComparator' => 'includes/diff/HTMLDiff.php',
+	'UnifiedDiffFormatter' => 'includes/diff/DifferenceEngine.php',
+	'WhiteSpaceNode' => 'includes/diff/Nodes.php',
+	'WikiDiff3' => 'includes/diff/Diff.php',
+	'WordLevelDiff' => 'includes/diff/DifferenceEngine.php',
 
-		# includes/filerepo
-		'ArchivedFile' => 'includes/filerepo/ArchivedFile.php',
-		'File' => 'includes/filerepo/File.php',
-		'FileRepo' => 'includes/filerepo/FileRepo.php',
-		'FileRepoStatus' => 'includes/filerepo/FileRepoStatus.php',
-		'ForeignAPIFile' => 'includes/filerepo/ForeignAPIFile.php',
-		'ForeignAPIRepo' => 'includes/filerepo/ForeignAPIRepo.php',
-		'ForeignDBFile' => 'includes/filerepo/ForeignDBFile.php',
-		'ForeignDBRepo' => 'includes/filerepo/ForeignDBRepo.php',
-		'ForeignDBViaLBRepo' => 'includes/filerepo/ForeignDBViaLBRepo.php',
-		'FSRepo' => 'includes/filerepo/FSRepo.php',
-		'Image' => 'includes/filerepo/Image.php',
-		'LocalFile' => 'includes/filerepo/LocalFile.php',
-		'LocalFileDeleteBatch' => 'includes/filerepo/LocalFile.php',
-		'LocalFileMoveBatch' => 'includes/filerepo/LocalFile.php',
-		'LocalFileRestoreBatch' => 'includes/filerepo/LocalFile.php',
-		'LocalRepo' => 'includes/filerepo/LocalRepo.php',
-		'OldLocalFile' => 'includes/filerepo/OldLocalFile.php',
-		'RepoGroup' => 'includes/filerepo/RepoGroup.php',
-		'UnregisteredLocalFile' => 'includes/filerepo/UnregisteredLocalFile.php',
+	# includes/filerepo
+	'ArchivedFile' => 'includes/filerepo/ArchivedFile.php',
+	'File' => 'includes/filerepo/File.php',
+	'FileCache' => 'includes/filerepo/FileCache.php',
+	'FileRepo' => 'includes/filerepo/FileRepo.php',
+	'FileRepoStatus' => 'includes/filerepo/FileRepoStatus.php',
+	'ForeignAPIFile' => 'includes/filerepo/ForeignAPIFile.php',
+	'ForeignAPIRepo' => 'includes/filerepo/ForeignAPIRepo.php',
+	'ForeignDBFile' => 'includes/filerepo/ForeignDBFile.php',
+	'ForeignDBRepo' => 'includes/filerepo/ForeignDBRepo.php',
+	'ForeignDBViaLBRepo' => 'includes/filerepo/ForeignDBViaLBRepo.php',
+	'FSRepo' => 'includes/filerepo/FSRepo.php',
+	'Image' => 'includes/filerepo/Image.php',
+	'LocalFile' => 'includes/filerepo/LocalFile.php',
+	'LocalFileDeleteBatch' => 'includes/filerepo/LocalFile.php',
+	'LocalFileMoveBatch' => 'includes/filerepo/LocalFile.php',
+	'LocalFileRestoreBatch' => 'includes/filerepo/LocalFile.php',
+	'LocalRepo' => 'includes/filerepo/LocalRepo.php',
+	'OldLocalFile' => 'includes/filerepo/OldLocalFile.php',
+	'RepoGroup' => 'includes/filerepo/RepoGroup.php',
+	'UnregisteredLocalFile' => 'includes/filerepo/UnregisteredLocalFile.php',
 
-		# includes/media
-		'BitmapHandler' => 'includes/media/Bitmap.php',
-		'BmpHandler' => 'includes/media/BMP.php',
-		'DjVuHandler' => 'includes/media/DjVu.php',
-		'ImageHandler' => 'includes/media/Generic.php',
-		'MediaHandler' => 'includes/media/Generic.php',
-		'SvgHandler' => 'includes/media/SVG.php',
+	# includes/media
+	'BitmapHandler' => 'includes/media/Bitmap.php',
+	'BitmapHandler_ClientOnly' => 'includes/media/Bitmap_ClientOnly.php',
+	'BmpHandler' => 'includes/media/BMP.php',
+	'DjVuHandler' => 'includes/media/DjVu.php',
+	'ImageHandler' => 'includes/media/Generic.php',
+	'MediaHandler' => 'includes/media/Generic.php',
+	'SvgHandler' => 'includes/media/SVG.php',
 
-		# includes/normal
-		'UtfNormal' => 'includes/normal/UtfNormal.php',
+	# includes/normal
+	'UtfNormal' => 'includes/normal/UtfNormal.php',
 
-		# includes/parser
-		'CoreParserFunctions' => 'includes/parser/CoreParserFunctions.php',
-		'DateFormatter' => 'includes/parser/DateFormatter.php',
-		'OnlyIncludeReplacer' => 'includes/parser/Parser.php',
-		'PPDAccum_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'PPDPart' => 'includes/parser/Preprocessor_DOM.php',
-		'PPDPart_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'PPDStack' => 'includes/parser/Preprocessor_DOM.php',
-		'PPDStackElement' => 'includes/parser/Preprocessor_DOM.php',
-		'PPDStackElement_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'PPDStack_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'PPFrame' => 'includes/parser/Preprocessor.php',
-		'PPFrame_DOM' => 'includes/parser/Preprocessor_DOM.php',
-		'PPFrame_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'PPNode' => 'includes/parser/Preprocessor.php',
-		'PPNode_DOM' => 'includes/parser/Preprocessor_DOM.php',
-		'PPNode_Hash_Array' => 'includes/parser/Preprocessor_Hash.php',
-		'PPNode_Hash_Attr' => 'includes/parser/Preprocessor_Hash.php',
-		'PPNode_Hash_Text' => 'includes/parser/Preprocessor_Hash.php',
-		'PPNode_Hash_Tree' => 'includes/parser/Preprocessor_Hash.php',
-		'PPTemplateFrame_DOM' => 'includes/parser/Preprocessor_DOM.php',
-		'PPTemplateFrame_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'Parser' => 'includes/parser/Parser.php',
-		'ParserCache' => 'includes/parser/ParserCache.php',
-		'ParserOptions' => 'includes/parser/ParserOptions.php',
-		'ParserOutput' => 'includes/parser/ParserOutput.php',
-		'Parser_DiffTest' => 'includes/parser/Parser_DiffTest.php',
-		'Parser_OldPP' => 'includes/parser/Parser_OldPP.php',
-		'Preprocessor' => 'includes/parser/Preprocessor.php',
-		'Preprocessor_DOM' => 'includes/parser/Preprocessor_DOM.php',
-		'Preprocessor_Hash' => 'includes/parser/Preprocessor_Hash.php',
-		'StripState' => 'includes/parser/Parser.php',
+	# includes/parser
+	'CoreLinkFunctions' => 'includes/parser/CoreLinkFunctions.php',
+	'CoreParserFunctions' => 'includes/parser/CoreParserFunctions.php',
+	'DateFormatter' => 'includes/parser/DateFormatter.php',
+	'LinkHolderArray' => 'includes/parser/LinkHolderArray.php',
+	'LinkMarkerReplacer' => 'includes/parser/LinkMarkerReplacer.php',
+	'OnlyIncludeReplacer' => 'includes/parser/Parser.php',
+	'PPDAccum_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'PPDPart' => 'includes/parser/Preprocessor_DOM.php',
+	'PPDPart_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'PPDStack' => 'includes/parser/Preprocessor_DOM.php',
+	'PPDStackElement' => 'includes/parser/Preprocessor_DOM.php',
+	'PPDStackElement_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'PPDStack_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'PPFrame' => 'includes/parser/Preprocessor.php',
+	'PPFrame_DOM' => 'includes/parser/Preprocessor_DOM.php',
+	'PPFrame_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'PPNode' => 'includes/parser/Preprocessor.php',
+	'PPNode_DOM' => 'includes/parser/Preprocessor_DOM.php',
+	'PPNode_Hash_Array' => 'includes/parser/Preprocessor_Hash.php',
+	'PPNode_Hash_Attr' => 'includes/parser/Preprocessor_Hash.php',
+	'PPNode_Hash_Text' => 'includes/parser/Preprocessor_Hash.php',
+	'PPNode_Hash_Tree' => 'includes/parser/Preprocessor_Hash.php',
+	'PPTemplateFrame_DOM' => 'includes/parser/Preprocessor_DOM.php',
+	'PPTemplateFrame_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'Parser' => 'includes/parser/Parser.php',
+	'ParserCache' => 'includes/parser/ParserCache.php',
+	'ParserOptions' => 'includes/parser/ParserOptions.php',
+	'ParserOutput' => 'includes/parser/ParserOutput.php',
+	'Parser_DiffTest' => 'includes/parser/Parser_DiffTest.php',
+	'Parser_LinkHooks' => 'includes/parser/Parser_LinkHooks.php',
+	'Preprocessor' => 'includes/parser/Preprocessor.php',
+	'Preprocessor_DOM' => 'includes/parser/Preprocessor_DOM.php',
+	'Preprocessor_Hash' => 'includes/parser/Preprocessor_Hash.php',
+	'StripState' => 'includes/parser/Parser.php',
 
-		# includes/specials
-		'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php',
-		'BrokenRedirectsPage' => 'includes/specials/SpecialBrokenRedirects.php',
-		'ContribsPager' => 'includes/specials/SpecialContributions.php',
-		'DBLockForm' => 'includes/specials/SpecialLockdb.php',
-		'DBUnlockForm' => 'includes/specials/SpecialUnlockdb.php',
-		'DeadendPagesPage' => 'includes/specials/SpecialDeadendpages.php',
-		'DisambiguationsPage' => 'includes/specials/SpecialDisambiguations.php',
-		'DoubleRedirectsPage' => 'includes/specials/SpecialDoubleRedirects.php',
-		'EmailConfirmation' => 'includes/specials/SpecialConfirmemail.php',
-		'EmailInvalidation' => 'includes/specials/SpecialConfirmemail.php',
-		'EmailUserForm' => 'includes/specials/SpecialEmailuser.php',
-		'FewestrevisionsPage' => 'includes/specials/SpecialFewestrevisions.php',
-		'FileDuplicateSearchPage' => 'includes/specials/SpecialFileDuplicateSearch.php',
-		'IPBlockForm' => 'includes/specials/SpecialBlockip.php',
-		'IPBlocklistPager' => 'includes/specials/SpecialIpblocklist.php',
-		'IPUnblockForm' => 'includes/specials/SpecialIpblocklist.php',
-		'ImportReporter' => 'includes/specials/SpecialImport.php',
-		'ImportStreamSource' => 'includes/specials/SpecialImport.php',
-		'ImportStringSource' => 'includes/specials/SpecialImport.php',
-		'ListredirectsPage' => 'includes/specials/SpecialListredirects.php',
-		'LoginForm' => 'includes/specials/SpecialUserlogin.php',
-		'LonelyPagesPage' => 'includes/specials/SpecialLonelypages.php',
-		'LongPagesPage' => 'includes/specials/SpecialLongpages.php',
-		'MIMEsearchPage' => 'includes/specials/SpecialMIMEsearch.php',
-		'MostcategoriesPage' => 'includes/specials/SpecialMostcategories.php',
-		'MostimagesPage' => 'includes/specials/SpecialMostimages.php',
-		'MostlinkedCategoriesPage' => 'includes/specials/SpecialMostlinkedcategories.php',
-		'MostlinkedPage' => 'includes/specials/SpecialMostlinked.php',
-		'MostrevisionsPage' => 'includes/specials/SpecialMostrevisions.php',
-		'MovePageForm' => 'includes/specials/SpecialMovepage.php',
-		'SpecialNewpages' => 'includes/specials/SpecialNewpages.php',
-		'NewPagesPager' => 'includes/specials/SpecialNewpages.php',
-		'PageArchive' => 'includes/specials/SpecialUndelete.php',
-		'PasswordResetForm' => 'includes/specials/SpecialResetpass.php',
-		'PopularPagesPage' => 'includes/specials/SpecialPopularpages.php',
-		'PreferencesForm' => 'includes/specials/SpecialPreferences.php',
-		'RandomPage' => 'includes/specials/SpecialRandompage.php',
-		'RevisionDeleteForm' => 'includes/specials/SpecialRevisiondelete.php',
-		'RevisionDeleter' => 'includes/specials/SpecialRevisiondelete.php',
-		'ShortPagesPage' => 'includes/specials/SpecialShortpages.php',
-		'SpecialAllpages' => 'includes/specials/SpecialAllpages.php',
-		'SpecialBookSources' => 'includes/specials/SpecialBooksources.php',
-		'SpecialListGroupRights' => 'includes/specials/SpecialListgrouprights.php',
-		'SpecialMostlinkedtemplates' => 'includes/specials/SpecialMostlinkedtemplates.php',
-		'SpecialPrefixindex' => 'includes/specials/SpecialPrefixindex.php',
-		'SpecialRandomredirect' => 'includes/specials/SpecialRandomredirect.php',
-		'SpecialRecentchanges' => 'includes/specials/SpecialRecentchanges.php',
-		'SpecialRecentchangeslinked' => 'includes/specials/SpecialRecentchangeslinked.php',
-		'SpecialSearch' => 'includes/specials/SpecialSearch.php',
-		'SpecialVersion' => 'includes/specials/SpecialVersion.php',
-		'UncategorizedCategoriesPage' => 'includes/specials/SpecialUncategorizedcategories.php',
-		'UncategorizedPagesPage' => 'includes/specials/SpecialUncategorizedpages.php',
-		'UncategorizedTemplatesPage' => 'includes/specials/SpecialUncategorizedtemplates.php',
-		'UndeleteForm' => 'includes/specials/SpecialUndelete.php',
-		'UnusedCategoriesPage' => 'includes/specials/SpecialUnusedcategories.php',
-		'UnusedimagesPage' => 'includes/specials/SpecialUnusedimages.php',
-		'UnusedtemplatesPage' => 'includes/specials/SpecialUnusedtemplates.php',
-		'UnwatchedpagesPage' => 'includes/specials/SpecialUnwatchedpages.php',
-		'UploadForm' => 'includes/specials/SpecialUpload.php',
-		'UploadFormMogile' => 'includes/specials/SpecialUploadMogile.php',
-		'UserrightsPage' => 'includes/specials/SpecialUserrights.php',
-		'UsersPager' => 'includes/specials/SpecialListusers.php',
-		'WantedCategoriesPage' => 'includes/specials/SpecialWantedcategories.php',
-		'WantedPagesPage' => 'includes/specials/SpecialWantedpages.php',
-		'WhatLinksHerePage' => 'includes/specials/SpecialWhatlinkshere.php',
-		'WikiImporter' => 'includes/specials/SpecialImport.php',
-		'WikiRevision' => 'includes/specials/SpecialImport.php',
-		'WithoutInterwikiPage' => 'includes/specials/SpecialWithoutinterwiki.php',
+	# includes/specials
+	'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php',
+	'BrokenRedirectsPage' => 'includes/specials/SpecialBrokenRedirects.php',
+	'ContribsPager' => 'includes/specials/SpecialContributions.php',
+	'DBLockForm' => 'includes/specials/SpecialLockdb.php',
+	'DBUnlockForm' => 'includes/specials/SpecialUnlockdb.php',
+	'DeadendPagesPage' => 'includes/specials/SpecialDeadendpages.php',
+	'DeletedContributionsPage' => 'includes/specials/SpecialDeletedContributions.php',
+	'DeletedContribsPager' => 'includes/specials/SpecialDeletedContributions.php',
+	'DisambiguationsPage' => 'includes/specials/SpecialDisambiguations.php',
+	'DoubleRedirectsPage' => 'includes/specials/SpecialDoubleRedirects.php',
+	'EmailConfirmation' => 'includes/specials/SpecialConfirmemail.php',
+	'EmailInvalidation' => 'includes/specials/SpecialConfirmemail.php',
+	'EmailUserForm' => 'includes/specials/SpecialEmailuser.php',
+	'FewestrevisionsPage' => 'includes/specials/SpecialFewestrevisions.php',
+	'FileDuplicateSearchPage' => 'includes/specials/SpecialFileDuplicateSearch.php',
+	'IPBlockForm' => 'includes/specials/SpecialBlockip.php',
+	'IPBlocklistPager' => 'includes/specials/SpecialIpblocklist.php',
+	'IPUnblockForm' => 'includes/specials/SpecialIpblocklist.php',
+	'ImportReporter' => 'includes/specials/SpecialImport.php',
+	'ImportStreamSource' => 'includes/Import.php',
+	'ImportStringSource' => 'includes/Import.php',
+	'LinkSearchPage' => 'includes/specials/SpecialLinkSearch.php',
+	'ListredirectsPage' => 'includes/specials/SpecialListredirects.php',
+	'LoginForm' => 'includes/specials/SpecialUserlogin.php',
+	'LonelyPagesPage' => 'includes/specials/SpecialLonelypages.php',
+	'LongPagesPage' => 'includes/specials/SpecialLongpages.php',
+	'MIMEsearchPage' => 'includes/specials/SpecialMIMEsearch.php',
+	'MostcategoriesPage' => 'includes/specials/SpecialMostcategories.php',
+	'MostimagesPage' => 'includes/specials/SpecialMostimages.php',
+	'MostlinkedCategoriesPage' => 'includes/specials/SpecialMostlinkedcategories.php',
+	'MostlinkedPage' => 'includes/specials/SpecialMostlinked.php',
+	'MostrevisionsPage' => 'includes/specials/SpecialMostrevisions.php',
+	'MovePageForm' => 'includes/specials/SpecialMovepage.php',
+	'SpecialNewpages' => 'includes/specials/SpecialNewpages.php',
+	'SpecialContributions' => 'includes/specials/SpecialContributions.php',
+	'NewPagesPager' => 'includes/specials/SpecialNewpages.php',
+	'PageArchive' => 'includes/specials/SpecialUndelete.php',
+	'SpecialResetpass' => 'includes/specials/SpecialResetpass.php',
+	'PopularPagesPage' => 'includes/specials/SpecialPopularpages.php',
+	'PreferencesForm' => 'includes/specials/SpecialPreferences.php',
+	'RandomPage' => 'includes/specials/SpecialRandompage.php',
+	'RevisionDeleteForm' => 'includes/specials/SpecialRevisiondelete.php',
+	'RevisionDeleter' => 'includes/specials/SpecialRevisiondelete.php',
+	'ShortPagesPage' => 'includes/specials/SpecialShortpages.php',
+	'SpecialAllpages' => 'includes/specials/SpecialAllpages.php',
+	'SpecialBookSources' => 'includes/specials/SpecialBooksources.php',
+	'SpecialImport' => 'includes/specials/SpecialImport.php',
+	'SpecialListGroupRights' => 'includes/specials/SpecialListgrouprights.php',
+	'SpecialMostlinkedtemplates' => 'includes/specials/SpecialMostlinkedtemplates.php',
+	'SpecialPrefixindex' => 'includes/specials/SpecialPrefixindex.php',
+	'SpecialRandomredirect' => 'includes/specials/SpecialRandomredirect.php',
+	'SpecialRecentchanges' => 'includes/specials/SpecialRecentchanges.php',
+	'SpecialRecentchangeslinked' => 'includes/specials/SpecialRecentchangeslinked.php',
+	'SpecialSearch' => 'includes/specials/SpecialSearch.php',
+	'SpecialSearchOld' => 'includes/specials/SpecialSearch.php',
+	'SpecialStatistics' => 'includes/specials/SpecialStatistics.php',
+	'SpecialVersion' => 'includes/specials/SpecialVersion.php',
+	'UncategorizedCategoriesPage' => 'includes/specials/SpecialUncategorizedcategories.php',
+	'UncategorizedPagesPage' => 'includes/specials/SpecialUncategorizedpages.php',
+	'UncategorizedTemplatesPage' => 'includes/specials/SpecialUncategorizedtemplates.php',
+	'UndeleteForm' => 'includes/specials/SpecialUndelete.php',
+	'UnusedCategoriesPage' => 'includes/specials/SpecialUnusedcategories.php',
+	'UnusedimagesPage' => 'includes/specials/SpecialUnusedimages.php',
+	'UnusedtemplatesPage' => 'includes/specials/SpecialUnusedtemplates.php',
+	'UnwatchedpagesPage' => 'includes/specials/SpecialUnwatchedpages.php',
+	'UploadForm' => 'includes/specials/SpecialUpload.php',
+	'UploadFormMogile' => 'includes/specials/SpecialUploadMogile.php',
+	'UserrightsPage' => 'includes/specials/SpecialUserrights.php',
+	'UsersPager' => 'includes/specials/SpecialListusers.php',
+	'WantedCategoriesPage' => 'includes/specials/SpecialWantedcategories.php',
+	'WantedFilesPage' => 'includes/specials/SpecialWantedfiles.php',
+	'WantedPagesPage' => 'includes/specials/SpecialWantedpages.php',
+	'WantedTemplatesPage' => 'includes/specials/SpecialWantedtemplates.php',
+	'WhatLinksHerePage' => 'includes/specials/SpecialWhatlinkshere.php',
+	'WikiImporter' => 'includes/Import.php',
+	'WikiRevision' => 'includes/Import.php',
+	'WithoutInterwikiPage' => 'includes/specials/SpecialWithoutinterwiki.php',
 
-		# includes/templates
-		'UsercreateTemplate' => 'includes/templates/Userlogin.php',
-		'UserloginTemplate' => 'includes/templates/Userlogin.php',
+	# includes/templates
+	'UsercreateTemplate' => 'includes/templates/Userlogin.php',
+	'UserloginTemplate' => 'includes/templates/Userlogin.php',
 
-		# languages
-		'Language' => 'languages/Language.php',
-		'FakeConverter' => 'languages/Language.php',
+	# languages
+	'Language' => 'languages/Language.php',
+	'FakeConverter' => 'languages/Language.php',
 
-		# maintenance/language
-		'statsOutput' => 'maintenance/language/StatOutputs.php',
-		'wikiStatsOutput' => 'maintenance/language/StatOutputs.php',
-		'metawikiStatsOutput' => 'maintenance/language/StatOutputs.php',
-		'textStatsOutput' => 'maintenance/language/StatOutputs.php',
-		'csvStatsOutput' => 'maintenance/language/StatOutputs.php',
+	# maintenance/language
+	'statsOutput' => 'maintenance/language/StatOutputs.php',
+	'wikiStatsOutput' => 'maintenance/language/StatOutputs.php',
+	'metawikiStatsOutput' => 'maintenance/language/StatOutputs.php',
+	'textStatsOutput' => 'maintenance/language/StatOutputs.php',
+	'csvStatsOutput' => 'maintenance/language/StatOutputs.php',
 
-	);
+);
 
+class AutoLoader {
 	/**
 	 * autoload - take a class name and attempt to load it
-	 * 
+	 *
 	 * @param string $className Name of class we're looking for.
 	 * @return bool Returning false is important on failure as
 	 * it allows Zend to try and look in other registered autoloaders
-	 * as well. 
+	 * as well.
 	 */
 	static function autoload( $className ) {
-		global $wgAutoloadClasses;
+		global $wgAutoloadClasses, $wgAutoloadLocalClasses;
 
-		wfProfileIn( __METHOD__ );
-		if ( isset( self::$localClasses[$className] ) ) {
-			$filename = self::$localClasses[$className];
+		if ( isset( $wgAutoloadLocalClasses[$className] ) ) {
+			$filename = $wgAutoloadLocalClasses[$className];
 		} elseif ( isset( $wgAutoloadClasses[$className] ) ) {
 			$filename = $wgAutoloadClasses[$className];
 		} else {
@@ -488,14 +549,15 @@ class AutoLoader {
 			# The case can sometimes be wrong when unserializing PHP 4 objects
 			$filename = false;
 			$lowerClass = strtolower( $className );
-			foreach ( self::$localClasses as $class2 => $file2 ) {
+			foreach ( $wgAutoloadLocalClasses as $class2 => $file2 ) {
 				if ( strtolower( $class2 ) == $lowerClass ) {
 					$filename = $file2;
 				}
 			}
 			if ( !$filename ) {
+				if( function_exists( 'wfDebug' ) ) 	
+					wfDebug( "Class {$className} not found; skipped loading" );
 				# Give up
-				wfProfileOut( __METHOD__ );
 				return false;
 			}
 		}
@@ -506,7 +568,6 @@ class AutoLoader {
 			$filename = "$IP/$filename";
 		}
 		require( $filename );
-		wfProfileOut( __METHOD__ );
 		return true;
 	}
 
@@ -532,4 +593,3 @@ if ( function_exists( 'spl_autoload_register' ) ) {
 		AutoLoader::autoload( $class );
 	}
 }
-
diff --git a/includes/Autopromote.php b/includes/Autopromote.php
index 68fe6636..c8a4c03b 100644
--- a/includes/Autopromote.php
+++ b/includes/Autopromote.php
@@ -19,7 +19,7 @@ class Autopromote {
 				$promote[] = $group;
 		}
 		
-		wfRunHooks( 'GetAutoPromoteGroups', array($user, &$promote) );
+		wfRunHooks( 'GetAutoPromoteGroups', array( $user, &$promote ) );
 		
 		return $promote;
 	}
@@ -106,9 +106,16 @@ class Autopromote {
 			case APCOND_AGE:
 				$age = time() - wfTimestampOrNull( TS_UNIX, $user->getRegistration() );
 				return $age >= $cond[1];
+			case APCOND_AGE_FROM_EDIT:
+				$age = time() - wfTimestampOrNull( TS_UNIX, $user->getFirstEditTimestamp() );
+				return $age >= $cond[1];
 			case APCOND_INGROUPS:
 				$groups = array_slice( $cond, 1 );
 				return count( array_intersect( $groups, $user->getGroups() ) ) == count( $groups );
+			case APCOND_ISIP:
+				return $cond[1] == wfGetIP();
+			case APCOND_IPINRANGE:
+				return IP::isInRange( wfGetIP(), $cond[1] );
 			default:
 				$result = null;
 				wfRunHooks( 'AutopromoteCondition', array( $cond[0], array_slice( $cond, 1 ), $user, &$result ) );
diff --git a/includes/BagOStuff.php b/includes/BagOStuff.php
index 92311329..572dca6c 100644
--- a/includes/BagOStuff.php
+++ b/includes/BagOStuff.php
@@ -475,8 +475,19 @@ class MediaWikiBagOStuff extends SqlBagOStuff {
 	function _fromunixtime($ts) {
 		return $this->_getDB()->timestamp($ts);
 	}
+	/***
+	 * Note -- this should *not* check wfReadOnly().
+	 * Read-only mode has been repurposed from the original
+	 * "nothing must write to the database" to "users should not
+	 * be able to edit or alter anything user-visible".
+	 *
+	 * Backend bits like the object cache should continue
+	 * to work in this mode, otherwise things will blow up
+	 * like the message cache failing to save its state,
+	 * causing long delays (bug 11533).
+	 */
 	function _readonly(){
-		return wfReadOnly();
+		return false;
 	}
 	function _strencode($s) {
 		return $this->_getDB()->strencode($s);
diff --git a/includes/Block.php b/includes/Block.php
index b208fa8a..2c2227e2 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -13,11 +13,10 @@
  *
  * @todo This could be used everywhere, but it isn't.
  */
-class Block
-{
+class Block {
 	/* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry,
 				$mRangeStart, $mRangeEnd, $mAnonOnly, $mEnableAutoblock, $mHideName,
-				$mBlockEmail, $mByName, $mAngryAutoblock;
+				$mBlockEmail, $mByName, $mAngryAutoblock, $mAllowUsertalk;
 	/* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster;
 
 	const EB_KEEP_EXPIRED = 1;
@@ -26,7 +25,7 @@ class Block
 
 	function __construct( $address = '', $user = 0, $by = 0, $reason = '',
 		$timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0,
-		$hideName = 0, $blockEmail = 0 )
+		$hideName = 0, $blockEmail = 0, $allowUsertalk = 0 )
 	{
 		$this->mId = 0;
 		# Expand valid IPv6 addresses
@@ -43,6 +42,7 @@ class Block
 		$this->mEnableAutoblock = $enableAutoblock;
 		$this->mHideName = $hideName;
 		$this->mBlockEmail = $blockEmail;
+		$this->mAllowUsertalk = $allowUsertalk;
 		$this->mForUpdate = false;
 		$this->mFromMaster = false;
 		$this->mByName = false;
@@ -50,9 +50,18 @@ class Block
 		$this->initialiseRange();
 	}
 
-	static function newFromDB( $address, $user = 0, $killExpired = true )
-	{
-		$block = new Block();
+	/**
+	 * Load a block from the database, using either the IP address or
+	 * user ID. Tries the user ID first, and if that doesn't work, tries
+	 * the address.
+	 * 
+	 * @param $address String: IP address of user/anon
+	 * @param $user Integer: user id of user
+	 * @param $killExpired Boolean: delete expired blocks on load
+	 * @return Block Object
+	 */
+	public static function newFromDB( $address, $user = 0, $killExpired = true ) {
+		$block = new Block;
 		$block->load( $address, $user, $killExpired );
 		if ( $block->isValid() ) {
 			return $block;
@@ -61,8 +70,13 @@ class Block
 		}
 	}
 
-	static function newFromID( $id )
-	{
+	/**
+	 * Load a blocked user from their block id.
+	 *
+	 * @param $id Integer: Block id to search for
+	 * @return Block object
+	 */
+	public static function newFromID( $id ) {
 		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->resultObject( $dbr->select( 'ipblocks', '*',
 			array( 'ipb_id' => $id ), __METHOD__ ) );
@@ -73,21 +87,47 @@ class Block
 			return null;
 		}
 	}
+	
+	/**
+	 * Check if two blocks are effectively equal
+	 *
+	 * @return Boolean
+	 */
+	public function equals( Block $block ) {
+		return ( 
+			$this->mAddress == $block->mAddress
+			&& $this->mUser == $block->mUser
+			&& $this->mAuto == $block->mAuto
+			&& $this->mAnonOnly == $block->mAnonOnly
+			&& $this->mCreateAccount == $block->mCreateAccount
+			&& $this->mExpiry == $block->mExpiry
+			&& $this->mEnableAutoblock == $block->mEnableAutoblock
+			&& $this->mHideName == $block->mHideName
+			&& $this->mBlockEmail == $block->mBlockEmail
+			&& $this->mAllowUsertalk == $block->mAllowUsertalk
+		);
+	}
 
-	function clear()
-	{
+	/**
+	 * Clear all member variables in the current object. Does not clear
+	 * the block from the DB.
+	 */
+	public function clear() {
 		$this->mAddress = $this->mReason = $this->mTimestamp = '';
 		$this->mId = $this->mAnonOnly = $this->mCreateAccount =
 			$this->mEnableAutoblock = $this->mAuto = $this->mUser =
-			$this->mBy = $this->mHideName = $this->mBlockEmail = 0;
+			$this->mBy = $this->mHideName = $this->mBlockEmail = $this->mAllowUsertalk = 0;
 		$this->mByName = false;
 	}
 
 	/**
-	 * Get the DB object and set the reference parameter to the query options
+	 * Get the DB object and set the reference parameter to the select options.
+	 * The options array will contain FOR UPDATE if appropriate.
+	 *
+	 * @param $options Array
+	 * @return Database
 	 */
-	function &getDBOptions( &$options )
-	{
+	protected function &getDBOptions( &$options ) {
 		global $wgAntiLockFlags;
 		if ( $this->mForUpdate || $this->mFromMaster ) {
 			$db = wfGetDB( DB_MASTER );
@@ -104,15 +144,15 @@ class Block
 	}
 
 	/**
-	 * Get a ban from the DB, with either the given address or the given username
+	 * Get a block from the DB, with either the given address or the given username
 	 *
-	 * @param string $address The IP address of the user, or blank to skip IP blocks
-	 * @param integer $user The user ID, or zero for anonymous users
-	 * @param bool $killExpired Whether to delete expired rows while loading
+	 * @param $address string The IP address of the user, or blank to skip IP blocks
+	 * @param $user int The user ID, or zero for anonymous users
+	 * @param $killExpired bool Whether to delete expired rows while loading
+	 * @return Boolean: the user is blocked from editing
 	 *
 	 */
-	function load( $address = '', $user = 0, $killExpired = true )
-	{
+	public function load( $address = '', $user = 0, $killExpired = true ) {
 		wfDebug( "Block::load: '$address', '$user', $killExpired\n" );
 
 		$options = array();
@@ -143,7 +183,10 @@ class Block
 				if ( $user && $this->mAnonOnly ) {
 					# Block is marked anon-only
 					# Whitelist this IP address against autoblocks and range blocks
-					$this->clear();
+					# (but not account creation blocks -- bug 13611)
+					if( !$this->mCreateAccount ) {
+						$this->clear();
+					}
 					return false;
 				} else {
 					return true;
@@ -154,7 +197,10 @@ class Block
 		# Try range block
 		if ( $this->loadRange( $address, $killExpired, $user ) ) {
 			if ( $user && $this->mAnonOnly ) {
-				$this->clear();
+				# Respect account creation blocks on logged-in users -- bug 13611
+				if( !$this->mCreateAccount ) {
+					$this->clear();
+				}
 				return false;
 			} else {
 				return true;
@@ -180,9 +226,12 @@ class Block
 
 	/**
 	 * Fill in member variables from a result wrapper
+	 *
+	 * @param $res ResultWrapper: row from the ipblocks table
+	 * @param $killExpired Boolean: whether to delete expired rows while loading
+	 * @return Boolean
 	 */
-	function loadFromResult( ResultWrapper $res, $killExpired = true )
-	{
+	protected function loadFromResult( ResultWrapper $res, $killExpired = true ) {
 		$ret = false;
 		if ( 0 != $res->numRows() ) {
 			# Get first block
@@ -216,9 +265,13 @@ class Block
 	/**
 	 * Search the database for any range blocks matching the given address, and
 	 * load the row if one is found.
+	 *
+	 * @param $address String: IP address range
+	 * @param $killExpired Boolean: whether to delete expired rows while loading
+	 * @param $userid Integer: if not 0, then sets ipb_anon_only
+	 * @return Boolean
 	 */
-	function loadRange( $address, $killExpired = true, $user = 0 )
-	{
+	public function loadRange( $address, $killExpired = true, $user = 0 ) {
 		$iaddr = IP::toHex( $address );
 		if ( $iaddr === false ) {
 			# Invalid address
@@ -247,15 +300,12 @@ class Block
 	}
 
 	/**
-	 * Determine if a given integer IPv4 address is in a given CIDR network
-	 * @deprecated Use IP::isInRange
+	 * Given a database row from the ipblocks table, initialize
+	 * member variables
+	 *
+	 * @param $row ResultWrapper: a row from the ipblocks table
 	 */
-	function isAddressInRange( $addr, $range ) {
-		return IP::isInRange( $addr, $range );
-	}
-
-	function initFromRow( $row )
-	{
+	public function initFromRow( $row ) {
 		$this->mAddress = $row->ipb_address;
 		$this->mReason = $row->ipb_reason;
 		$this->mTimestamp = wfTimestamp(TS_MW,$row->ipb_timestamp);
@@ -266,6 +316,7 @@ class Block
 		$this->mCreateAccount = $row->ipb_create_account;
 		$this->mEnableAutoblock = $row->ipb_enable_autoblock;
 		$this->mBlockEmail = $row->ipb_block_email;
+		$this->mAllowUsertalk = $row->ipb_allow_usertalk;
 		$this->mHideName = $row->ipb_deleted;
 		$this->mId = $row->ipb_id;
 		$this->mExpiry = self::decodeExpiry( $row->ipb_expiry );
@@ -278,8 +329,11 @@ class Block
 		$this->mRangeEnd = $row->ipb_range_end;
 	}
 
-	function initialiseRange()
-	{
+	/**
+	 * Once $mAddress has been set, get the range they came from. 
+	 * Wrapper for IP::parseRange
+	 */
+	protected function initialiseRange() {
 		$this->mRangeStart = '';
 		$this->mRangeEnd = '';
 
@@ -289,64 +343,12 @@ class Block
 	}
 
 	/**
-	 * Callback with a Block object for every block
-	 * @return integer number of blocks;
+	 * Delete the row from the IP blocks table.
+	 *
+	 * @return Boolean
 	 */
-	/*static*/ function enumBlocks( $callback, $tag, $flags = 0 )
-	{
-		global $wgAntiLockFlags;
-
-		$block = new Block();
-		if ( $flags & Block::EB_FOR_UPDATE ) {
-			$db = wfGetDB( DB_MASTER );
-			if ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) {
-				$options = '';
-			} else {
-				$options = 'FOR UPDATE';
-			}
-			$block->forUpdate( true );
-		} else {
-			$db = wfGetDB( DB_SLAVE );
-			$options = '';
-		}
-		if ( $flags & Block::EB_RANGE_ONLY ) {
-			$cond = " AND ipb_range_start <> ''";
-		} else {
-			$cond = '';
-		}
-
-		$now = wfTimestampNow();
-
-		list( $ipblocks, $user ) = $db->tableNamesN( 'ipblocks', 'user' );
-
-		$sql = "SELECT $ipblocks.*,user_name FROM $ipblocks,$user " .
-			"WHERE user_id=ipb_by $cond ORDER BY ipb_timestamp DESC $options";
-		$res = $db->query( $sql, 'Block::enumBlocks' );
-		$num_rows = $db->numRows( $res );
-
-		while ( $row = $db->fetchObject( $res ) ) {
-			$block->initFromRow( $row );
-			if ( ( $flags & Block::EB_RANGE_ONLY ) && $block->mRangeStart == '' ) {
-				continue;
-			}
-
-			if ( !( $flags & Block::EB_KEEP_EXPIRED ) ) {
-				if ( $block->mExpiry && $now > $block->mExpiry ) {
-					$block->delete();
-				} else {
-					call_user_func( $callback, $block, $tag );
-				}
-			} else {
-				call_user_func( $callback, $block, $tag );
-			}
-		}
-		$db->freeResult( $res );
-		return $num_rows;
-	}
-
-	function delete()
-	{
-		if (wfReadOnly()) {
+	public function delete() {
+		if ( wfReadOnly() ) {
 			return false;
 		}
 		if ( !$this->mId ) {
@@ -359,33 +361,17 @@ class Block
 	}
 
 	/**
-	* Insert a block into the block table.
-	* @return Whether or not the insertion was successful.
-	*/
-	function insert()
-	{
+	 * Insert a block into the block table. Will fail if there is a conflicting
+	 * block (same name and options) already in the database.
+	 *
+	 * @return Boolean: whether or not the insertion was successful.
+	 */
+	public function insert() {
 		wfDebug( "Block::insert; timestamp {$this->mTimestamp}\n" );
 		$dbw = wfGetDB( DB_MASTER );
 
-		# Unset ipb_anon_only for user blocks, makes no sense
-		if ( $this->mUser ) {
-			$this->mAnonOnly = 0;
-		}
-
-		# Unset ipb_enable_autoblock for IP blocks, makes no sense
-		if ( !$this->mUser ) {
-			$this->mEnableAutoblock = 0;
-			$this->mBlockEmail = 0; //Same goes for email...
-		}
-
-		if( !$this->mByName ) {
-			if( $this->mBy ) {
-				$this->mByName = User::whoIs( $this->mBy );
-			} else {
-				global $wgUser;
-				$this->mByName = $wgUser->getName();
-			}
-		}
+		$this->validateBlockParams();
+		$this->initialiseRange();
 
 		# Don't collide with expired blocks
 		Block::purgeExpired();
@@ -408,7 +394,8 @@ class Block
 				'ipb_range_start' => $this->mRangeStart,
 				'ipb_range_end' => $this->mRangeEnd,
 				'ipb_deleted'	=> $this->mHideName,
-				'ipb_block_email' => $this->mBlockEmail
+				'ipb_block_email' => $this->mBlockEmail,
+				'ipb_allow_usertalk' => $this->mAllowUsertalk
 			), 'Block::insert', array( 'IGNORE' )
 		);
 		$affected = $dbw->affectedRows();
@@ -416,15 +403,76 @@ class Block
 		if ($affected)
 			$this->doRetroactiveAutoblock();
 
-		return $affected;
+		return (bool)$affected;
+	}
+
+	/**
+	 * Update a block in the DB with new parameters.
+	 * The ID field needs to be loaded first.
+	 */
+	public function update() {
+		wfDebug( "Block::update; timestamp {$this->mTimestamp}\n" );
+		$dbw = wfGetDB( DB_MASTER );
+
+		$this->validateBlockParams();
+
+		$dbw->update( 'ipblocks',
+			array(
+				'ipb_user' => $this->mUser,
+				'ipb_by' => $this->mBy,
+				'ipb_by_text' => $this->mByName,
+				'ipb_reason' => $this->mReason,
+				'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
+				'ipb_auto' => $this->mAuto,
+				'ipb_anon_only' => $this->mAnonOnly,
+				'ipb_create_account' => $this->mCreateAccount,
+				'ipb_enable_autoblock' => $this->mEnableAutoblock,
+				'ipb_expiry' => self::encodeExpiry( $this->mExpiry, $dbw ),
+				'ipb_range_start' => $this->mRangeStart,
+				'ipb_range_end' => $this->mRangeEnd,
+				'ipb_deleted'	=> $this->mHideName,
+				'ipb_block_email' => $this->mBlockEmail,
+				'ipb_allow_usertalk' => $this->mAllowUsertalk ),
+			array( 'ipb_id' => $this->mId ),
+			'Block::update' );
+
+		return $dbw->affectedRows();
 	}
+	
+	/**
+	 * Make sure all the proper members are set to sane values
+	 * before adding/updating a block
+	 */
+	protected function validateBlockParams() {
+		# Unset ipb_anon_only for user blocks, makes no sense
+		if ( $this->mUser ) {
+			$this->mAnonOnly = 0;
+		}
+
+		# Unset ipb_enable_autoblock for IP blocks, makes no sense
+		if ( !$this->mUser ) {
+			$this->mEnableAutoblock = 0;
+			$this->mBlockEmail = 0; //Same goes for email...
+		}
 
+		if( !$this->mByName ) {
+			if( $this->mBy ) {
+				$this->mByName = User::whoIs( $this->mBy );
+			} else {
+				global $wgUser;
+				$this->mByName = $wgUser->getName();
+			}
+		}
+	}
+	
+	
 	/**
 	* Retroactively autoblocks the last IP used by the user (if it is a user)
 	* blocked by this Block.
-	*@return Whether or not a retroactive autoblock was made.
+	*
+	* @return Boolean: whether or not a retroactive autoblock was made.
 	*/
-	function doRetroactiveAutoblock() {
+	public function doRetroactiveAutoblock() {
 		$dbr = wfGetDB( DB_SLAVE );
 		#If autoblock is enabled, autoblock the LAST IP used
 		# - stolen shamelessly from CheckUser_body.php
@@ -458,25 +506,25 @@ class Block
 			}
 		}
 	}
-
+	
 	/**
-	* Autoblocks the given IP, referring to this Block.
-	* @param string $autoblockip The IP to autoblock.
-	* @param bool $justInserted The main block was just inserted
-	* @return bool Whether or not an autoblock was inserted.
-	*/
-	function doAutoblock( $autoblockip, $justInserted = false ) {
-		# If autoblocks are disabled, go away.
-		if ( !$this->mEnableAutoblock ) {
-			return;
+	 * Checks whether a given IP is on the autoblock whitelist.
+	 *
+	 * @param $ip String: The IP to check
+	 * @return Boolean
+	 */
+	public static function isWhitelistedFromAutoblocks( $ip ) {
+		global $wgMemc;
+		
+		// Try to get the autoblock_whitelist from the cache, as it's faster
+		// than getting the msg raw and explode()'ing it.
+		$key = wfMemcKey( 'ipb', 'autoblock', 'whitelist' );
+		$lines = $wgMemc->get( $key );
+		if ( !$lines ) {
+			$lines = explode( "\n", wfMsgForContentNoTrans( 'autoblock_whitelist' ) );
+			$wgMemc->set( $key, $lines, 3600 * 24 );
 		}
 
-		# Check for presence on the autoblock whitelist
-		# TODO cache this?
-		$lines = explode( "\n", wfMsgForContentNoTrans( 'autoblock_whitelist' ) );
-
-		$ip = $autoblockip;
-
 		wfDebug("Checking the autoblock whitelist..\n");
 
 		foreach( $lines as $line ) {
@@ -493,23 +541,42 @@ class Block
 			# Is the IP in this range?
 			if (IP::isInRange( $ip, $wlEntry )) {
 				wfDebug(" IP $ip matches $wlEntry, not autoblocking\n");
-				#$autoblockip = null; # Don't autoblock a whitelisted IP.
-				return; #This /SHOULD/ introduce a dummy block - but
-					# I don't know a safe way to do so. -werdna
+				return true;
 			} else {
 				wfDebug( " No match\n" );
 			}
 		}
 		
+		return false;
+	}
+
+	/**
+	 * Autoblocks the given IP, referring to this Block.
+	 *
+	 * @param $autoblockIP String: the IP to autoblock.
+	 * @param $justInserted Boolean: the main block was just inserted
+	 * @return Boolean: whether or not an autoblock was inserted.
+	 */
+	public function doAutoblock( $autoblockIP, $justInserted = false ) {
+		# If autoblocks are disabled, go away.
+		if ( !$this->mEnableAutoblock ) {
+			return;
+		}
+
+		# Check for presence on the autoblock whitelist
+		if (Block::isWhitelistedFromAutoblocks($autoblockIP)) {
+			return;
+		}
+		
 		## Allow hooks to cancel the autoblock.
-		if (!wfRunHooks( 'AbortAutoblock', array( $autoblockip, &$this ) )) {
+		if (!wfRunHooks( 'AbortAutoblock', array( $autoblockIP, &$this ) )) {
 			wfDebug( "Autoblock aborted by hook." );
 			return false;
 		}
 
 		# It's okay to autoblock. Go ahead and create/insert the block.
 
-		$ipblock = Block::newFromDB( $autoblockip );
+		$ipblock = Block::newFromDB( $autoblockIP );
 		if ( $ipblock ) {
 			# If the user is already blocked. Then check if the autoblock would
 			# exceed the user block. If it would exceed, then do nothing, else
@@ -528,8 +595,8 @@ class Block
 		}
 
 		# Make a new block object with the desired properties
-		wfDebug( "Autoblocking {$this->mAddress}@" . $autoblockip . "\n" );
-		$ipblock->mAddress = $autoblockip;
+		wfDebug( "Autoblocking {$this->mAddress}@" . $autoblockIP . "\n" );
+		$ipblock->mAddress = $autoblockIP;
 		$ipblock->mUser = 0;
 		$ipblock->mBy = $this->mBy;
 		$ipblock->mByName = $this->mByName;
@@ -539,7 +606,7 @@ class Block
 		$ipblock->mCreateAccount = $this->mCreateAccount;
 		# Continue suppressing the name if needed
 		$ipblock->mHideName = $this->mHideName;
-
+		$ipblock->mAllowUsertalk = $this->mAllowUsertalk;
 		# If the user is already blocked with an expiry date, we don't
 		# want to pile on top of that!
 		if($this->mExpiry) {
@@ -551,8 +618,11 @@ class Block
 		return $ipblock->insert();
 	}
 
-	function deleteIfExpired()
-	{
+	/**
+	 * Check if a block has expired. Delete it if it is.
+	 * @return Boolean
+	 */
+	public function deleteIfExpired() {
 		$fname = 'Block::deleteIfExpired';
 		wfProfileIn( $fname );
 		if ( $this->isExpired() ) {
@@ -567,8 +637,11 @@ class Block
 		return $retVal;
 	}
 
-	function isExpired()
-	{
+	/**
+	 * Has the block expired?
+	 * @return Boolean
+	 */
+	public function isExpired() {
 		wfDebug( "Block::isExpired() checking current " . wfTimestampNow() . " vs $this->mExpiry\n" );
 		if ( !$this->mExpiry ) {
 			return false;
@@ -577,13 +650,18 @@ class Block
 		}
 	}
 
-	function isValid()
-	{
+	/**
+	 * Is the block address valid (i.e. not a null string?)
+	 * @return Boolean
+	 */
+	public function isValid() {
 		return $this->mAddress != '';
 	}
 
-	function updateTimestamp()
-	{
+	/**
+	 * Update the timestamp on autoblocks. 
+	 */
+	public function updateTimestamp() {
 		if ( $this->mAuto ) {
 			$this->mTimestamp = wfTimestamp();
 			$this->mExpiry = Block::getAutoblockExpiry( $this->mTimestamp );
@@ -600,41 +678,43 @@ class Block
 		}
 	}
 
-	/*
-	function getIntegerAddr()
-	{
-		return $this->mIntegerAddr;
-	}
-
-	function getNetworkBits()
-	{
-		return $this->mNetworkBits;
-	}*/
-
 	/**
-	 * @return The blocker user ID.
+	 * Get the user id of the blocking sysop
+	 *
+	 * @return Integer
 	 */
 	public function getBy() {
 		return $this->mBy;
 	}
 
 	/**
-	 * @return The blocker user name.
+	 * Get the username of the blocking sysop
+	 *
+	 * @return String
 	 */
-	function getByName()
-	{
+	public function getByName() {
 		return $this->mByName;
 	}
 
-	function forUpdate( $x = NULL ) {
+	/**
+	 * Get/set the SELECT ... FOR UPDATE flag
+	 */
+	public function forUpdate( $x = NULL ) {
 		return wfSetVar( $this->mForUpdate, $x );
 	}
 
-	function fromMaster( $x = NULL ) {
+	/**
+	 * Get/set a flag determining whether the master is used for reads
+	 */
+	public function fromMaster( $x = NULL ) {
 		return wfSetVar( $this->mFromMaster, $x );
 	}
 
-	function getRedactedName() {
+	/**
+	 * Get the block name, but with autoblocked IPs hidden as per standard privacy policy
+	 * @return String
+	 */
+	public function getRedactedName() {
 		if ( $this->mAuto ) {
 			return '#' . $this->mId;
 		} else {
@@ -644,8 +724,12 @@ class Block
 
 	/**
 	 * Encode expiry for DB
+	 *
+	 * @param $expiry String: timestamp for expiry, or 
+	 * @param $db Database object
+	 * @return String
 	 */
-	static function encodeExpiry( $expiry, $db ) {
+	public static function encodeExpiry( $expiry, $db ) {
 		if ( $expiry == '' || $expiry == Block::infinity() ) {
 			return Block::infinity();
 		} else {
@@ -655,8 +739,12 @@ class Block
 
 	/**
 	 * Decode expiry which has come from the DB
+	 *
+	 * @param $expiry String: Database expiry format
+	 * @param $timestampType Requested timestamp format
+	 * @return String
 	 */
-	static function decodeExpiry( $expiry, $timestampType = TS_MW ) {
+	public static function decodeExpiry( $expiry, $timestampType = TS_MW ) {
 		if ( $expiry == '' || $expiry == Block::infinity() ) {
 			return Block::infinity();
 		} else {
@@ -664,8 +752,12 @@ class Block
 		}
 	}
 
-	static function getAutoblockExpiry( $timestamp )
-	{
+	/**
+	 * Get a timestamp of the expiry for autoblocks
+	 *
+	 * @return String
+	 */
+	public static function getAutoblockExpiry( $timestamp ) {
 		global $wgAutoblockExpiry;
 		return wfTimestamp( TS_MW, wfTimestamp( TS_UNIX, $timestamp ) + $wgAutoblockExpiry );
 	}
@@ -673,8 +765,10 @@ class Block
 	/**
 	 * Gets rid of uneeded numbers in quad-dotted/octet IP strings
 	 * For example, 127.111.113.151/24 -> 127.111.113.0/24
+	 * @param $range String: IP address to normalize
+	 * @return string
 	 */
-	static function normaliseRange( $range ) {
+	public static function normaliseRange( $range ) {
 		$parts = explode( '/', $range );
 		if ( count( $parts ) == 2 ) {
 			// IPv6
@@ -706,31 +800,31 @@ class Block
 	/**
 	 * Purge expired blocks from the ipblocks table
 	 */
-	static function purgeExpired() {
+	public static function purgeExpired() {
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->delete( 'ipblocks', array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ );
 	}
 
-	static function infinity() {
+	/**
+	 * Get a value to insert into expiry field of the database when infinite expiry
+	 * is desired. In principle this could be DBMS-dependant, but currently all 
+	 * supported DBMS's support the string "infinity", so we just use that.
+	 *
+	 * @return String
+	 */
+	public static function infinity() {
 		# This is a special keyword for timestamps in PostgreSQL, and
 		# works with CHAR(14) as well because "i" sorts after all numbers.
 		return 'infinity';
-
-		/*
-		static $infinity;
-		if ( !isset( $infinity ) ) {
-			$dbr = wfGetDB( DB_SLAVE );
-			$infinity = $dbr->bigTimestamp();
-		}
-		return $infinity;
-		 */
 	}
 	
 	/**
 	 * Convert a DB-encoded expiry into a real string that humans can read.
+	 *
+	 * @param $encoded_expiry String: Database encoded expiry time
+	 * @return String
 	 */
-	static function formatExpiry( $encoded_expiry ) {
-	
+	public static function formatExpiry( $encoded_expiry ) {
 		static $msg = null;
 		
 		if( is_null( $msg ) ) {
@@ -749,14 +843,15 @@ class Block
 			$expiretimestr = $wgLang->timeanddate( $expiry, true );
 			$expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array($expiretimestr) );
 		}
-
 		return $expirystr;
 	}
 	
 	/**
 	 * Convert a typed-in expiry time into something we can put into the database.
+	 * @param $expiry_input String: whatever was typed into the form
+	 * @return String: more database friendly
 	 */
-	static function parseExpiryInput( $expiry_input ) {
+	public static function parseExpiryInput( $expiry_input ) {
 		if ( $expiry_input == 'infinite' || $expiry_input == 'indefinite' ) {
 			$expiry = 'infinity';
 		} else {
@@ -765,7 +860,6 @@ class Block
 				return false;
 			}
 		}
-		
 		return $expiry;
 	}
 
diff --git a/includes/Category.php b/includes/Category.php
index acafc47a..78567add 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -1,6 +1,8 @@
 <?php
 /**
- * Category objects are immutable, strictly speaking.  If you call methods that change the database, like to refresh link counts, the objects will be appropriately reinitialized.  Member variables are lazy-initialized.
+ * Category objects are immutable, strictly speaking. If you call methods that change the database, 
+ * like to refresh link counts, the objects will be appropriately reinitialized.
+ * Member variables are lazy-initialized.
  *
  * TODO: Move some stuff from CategoryPage.php to here, and use that.
  *
@@ -79,7 +81,7 @@ class Category {
 	/**
 	 * Factory function.
 	 *
-	 * @param array $name A category name (no "Category:" prefix).  It need
+	 * @param $name Array: A category name (no "Category:" prefix).  It need
 	 *   not be normalized, with spaces replaced by underscores.
 	 * @return mixed Category, or false on a totally invalid name
 	 */
@@ -99,8 +101,8 @@ class Category {
 	/**
 	 * Factory function.
 	 *
-	 * @param array $title Title for the category page
-	 * @return mixed Category, or false on a totally invalid name
+	 * @param $title Title for the category page
+	 * @return Mixed: category, or false on a totally invalid name
 	 */
 	public static function newFromTitle( $title ) {
 		$cat = new self();
@@ -114,7 +116,7 @@ class Category {
 	/**
 	 * Factory function.
 	 *
-	 * @param array $id A category id
+	 * @param $id Integer: a category id
 	 * @return Category
 	 */
 	public static function newFromID( $id ) {
@@ -192,6 +194,33 @@ class Category {
 		return $this->mTitle;
 	}
 
+	/**
+	 * Fetch a TitleArray of up to $limit category members, beginning after the
+	 * category sort key $offset.
+	 * @param $limit integer
+	 * @param $offset string
+	 * @return TitleArray object for category members.
+	 */
+	public function getMembers( $limit = false, $offset = '' ) {
+		$dbr = wfGetDB( DB_SLAVE );
+
+		$conds = array( 'cl_to' => $this->getName(), 'cl_from = page_id' );
+		$options = array( 'ORDER BY' => 'cl_sortkey' );
+		if( $limit ) $options[ 'LIMIT' ] = $limit;
+		if( $offset !== '' ) $conds[] = 'cl_sortkey > ' . $dbr->addQuotes( $offset );
+
+		return TitleArray::newFromResult(
+			$dbr->select(
+				array( 'page', 'categorylinks' ),
+				array( 'page_id', 'page_namespace','page_title', 'page_len',
+					'page_is_redirect', 'page_latest' ),
+				$conds,
+				__METHOD__,
+				$options
+			)
+		);
+	}
+
 	/** Generic accessor */
 	private function getX( $key ) {
 		if( !$this->initialize() ) {
@@ -228,7 +257,7 @@ class Category {
 		}
 
 		$cond1 = $dbw->conditional( 'page_namespace='.NS_CATEGORY, 1, 'NULL' );
-		$cond2 = $dbw->conditional( 'page_namespace='.NS_IMAGE, 1, 'NULL' );
+		$cond2 = $dbw->conditional( 'page_namespace='.NS_FILE, 1, 'NULL' );
 		$result = $dbw->selectRow(
 			array( 'categorylinks', 'page' ),
 			array( 'COUNT(*) AS pages',
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 92e4e279..4ac24b5f 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -36,18 +36,18 @@ class CategoryPage extends Article {
 			$this->closeShowCategory();
 		}
 	}
-
+	
 	/**
-	 * This page should not be cached if 'from' or 'until' has been used
-	 * @return bool
+	 * Don't return a 404 for categories in use.
 	 */
-	function isFileCacheable() {
-		global $wgRequest;
-
-		return ( ! Article::isFileCacheable()
-				|| $wgRequest->getVal( 'from' )
-				|| $wgRequest->getVal( 'until' )
-		) ? false : true;
+	function hasViewableContent() {
+		if( parent::hasViewableContent() ) {
+			return true;
+		} else {
+			$cat = Category::newFromTitle( $this->mTitle );
+			return $cat->getId() != 0;
+		}
+			
 	}
 
 	function openShowCategory() {
@@ -85,8 +85,6 @@ class CategoryViewer {
 	/**
 	 * Format the category data list.
 	 *
-	 * @param string $from -- return only sort keys from this item on
-	 * @param string $until -- don't return keys after this point.
 	 * @return string HTML output
 	 * @private
 	 */
@@ -144,7 +142,7 @@ class CategoryViewer {
 
 	/**
 	 * Add a subcategory to the internal lists, using a title object 
-	 * @deprectated kept for compatibility, please use addSubcategoryObject instead
+	 * @deprecated kept for compatibility, please use addSubcategoryObject instead
 	 */
 	function addSubcategory( $title, $sortkey, $pageLength ) {
 		global $wgContLang;
@@ -225,14 +223,14 @@ class CategoryViewer {
 			array( 'page', 'categorylinks', 'category' ),
 			array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey',
 				'cat_id', 'cat_title', 'cat_subcats', 'cat_pages', 'cat_files' ),
-			array( $pageCondition,
-			       'cl_to' => $this->title->getDBkey() ),
+			array( $pageCondition, 'cl_to' => $this->title->getDBkey() ),
 			__METHOD__,
 			array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey',
-			       'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
-			       'LIMIT'    => $this->limit + 1 ),
+				'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
+				'LIMIT'    => $this->limit + 1 ),
 			array( 'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
-		               'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ) );
+				'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) )
+		);
 
 		$count = 0;
 		$this->nextPage = null;
@@ -249,7 +247,7 @@ class CategoryViewer {
 			if( $title->getNamespace() == NS_CATEGORY ) {
 				$cat = Category::newFromRow( $x, $title );
 				$this->addSubcategoryObject( $cat, $x->cl_sortkey, $x->page_len );
-			} elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) {
+			} elseif( $this->showGallery && $title->getNamespace() == NS_FILE ) {
 				$this->addImage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
 			} else {
 				$this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
@@ -339,10 +337,10 @@ class CategoryViewer {
 	 * Format a list of articles chunked by letter, either as a
 	 * bullet list or a columnar format, depending on the length.
 	 *
-	 * @param array $articles
-	 * @param array $articles_start_char
-	 * @param int   $cutoff
-	 * @return string
+	 * @param $articles Array
+	 * @param $articles_start_char Array
+	 * @param $cutoff Int
+	 * @return String
 	 * @private
 	 */
 	function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
@@ -359,9 +357,9 @@ class CategoryViewer {
 	 * Format a list of articles chunked by letter in a three-column
 	 * list, ordered vertically.
 	 *
-	 * @param array $articles
-	 * @param array $articles_start_char
-	 * @return string
+	 * @param $articles Array
+	 * @param $articles_start_char Array
+	 * @return String
 	 * @private
 	 */
 	function columnList( $articles, $articles_start_char ) {
@@ -418,9 +416,9 @@ class CategoryViewer {
 
 	/**
 	 * Format a list of articles chunked by letter in a bullet list.
-	 * @param array $articles
-	 * @param array $articles_start_char
-	 * @return string
+	 * @param $articles Array
+	 * @param $articles_start_char Array
+	 * @return String
 	 * @private
 	 */
 	function shortList( $articles, $articles_start_char ) {
@@ -440,12 +438,12 @@ class CategoryViewer {
 	}
 
 	/**
-	 * @param Title  $title
-	 * @param string $first
-	 * @param string $last
-	 * @param int    $limit
-	 * @param array  $query - additional query options to pass
-	 * @return string
+	 * @param $title Title object
+	 * @param $first String
+	 * @param $last String
+	 * @param $limit Int
+	 * @param $query Array: additional query options to pass
+	 * @return String
 	 * @private
 	 */
 	function pagingLinks( $title, $first, $last, $limit, $query = array() ) {
@@ -477,10 +475,10 @@ class CategoryViewer {
 	 * category-subcat-count-limited, category-file-count,
 	 * category-file-count-limited.
 	 *
-	 * @param int $rescnt The number of items returned by our database query.
-	 * @param int $dbcnt The number of items according to the category table.
-	 * @param string $type 'subcat', 'article', or 'file'
-	 * @return string A message giving the number of items, to output to HTML.
+	 * @param $rescnt Int: The number of items returned by our database query.
+	 * @param $dbcnt Int: The number of items according to the category table.
+	 * @param $type String: 'subcat', 'article', or 'file'
+	 * @return String: A message giving the number of items, to output to HTML.
 	 */
 	private function getCountMessage( $rescnt, $dbcnt, $type ) {
 		global $wgLang;
@@ -500,8 +498,12 @@ class CategoryViewer {
 			# Case 1: seems sane.
 			$totalcnt = $dbcnt;
 		} elseif($totalrescnt < $this->limit && !$this->from && !$this->until){
-			# Case 2: not sane, but salvageable.
+			# Case 2: not sane, but salvageable.  Use the number of results.
+			# Since there are fewer than 200, we can also take this opportunity
+			# to refresh the incorrect category table entry -- which should be
+			# quick due to the small number of entries.
 			$totalcnt = $rescnt;
+			$this->cat->refreshCounts();
 		} else {
 			# Case 3: hopeless.  Don't give a total count at all.
 			return wfMsgExt("category-$type-count-limited", 'parse',
diff --git a/includes/Categoryfinder.php b/includes/Categoryfinder.php
index d28f2eeb..4413bd1a 100644
--- a/includes/Categoryfinder.php
+++ b/includes/Categoryfinder.php
@@ -86,9 +86,15 @@ class Categoryfinder {
 	 * This functions recurses through the parent representation, trying to match the conditions
 	 * @param $id The article/category to check
 	 * @param $conds The array of categories to match
+	 * @param $path used to check for recursion loops
 	 * @return bool Does this match the conditions?
 	 */
-	function check ( $id , &$conds ) {
+	function check ( $id , &$conds, $path=array() ) {
+		// Check for loops and stop!
+		if( in_array( $id, $path ) )
+			return false;
+		$path[] = $id;
+
 		# Shortcut (runtime paranoia): No contitions=all matched
 		if ( count ( $conds ) == 0 ) return true ;
 
@@ -120,7 +126,7 @@ class Categoryfinder {
 				# No sub-parent
 				continue ;
 			}
-			$done = $this->check ( $this->name2id[$pname] , $conds ) ;
+			$done = $this->check ( $this->name2id[$pname] , $conds, $path );
 			if ( $done OR count ( $conds ) == 0 ) {
 				# Subparents have done it!
 				return true ;
diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php
index 9bee1790..f3c3e429 100644
--- a/includes/ChangesFeed.php
+++ b/includes/ChangesFeed.php
@@ -12,14 +12,15 @@ class ChangesFeed {
 	public function getFeedObject( $title, $description ) {
 		global $wgSitename, $wgContLanguageCode, $wgFeedClasses, $wgTitle;
 		$feedTitle = "$wgSitename  - {$title} [$wgContLanguageCode]";
-
+		if( !isset($wgFeedClasses[$this->format] ) )
+			return false;
 		return new $wgFeedClasses[$this->format](
 			$feedTitle, htmlspecialchars( $description ), $wgTitle->getFullUrl() );
 	}
 
 	public function execute( $feed, $rows, $limit = 0 , $hideminor = false, $lastmod = false ) {
 		global $messageMemc, $wgFeedCacheTimeout;
-		global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
+		global $wgFeedClasses, $wgSitename, $wgContLanguageCode;
 
 		if ( !FeedUtils::checkFeedOutput( $this->format ) ) {
 			return;
@@ -85,7 +86,7 @@ class ChangesFeed {
 	}
 
 	/**
-	* @todo document
+	* Generate the feed items given a row from the database.
 	* @param $rows Database resource with recentchanges rows
 	* @param $feed Feed object
 	*/
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 436f006e..a8f5fff0 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -3,10 +3,9 @@
 /**
  * @todo document
  */
-class RCCacheEntry extends RecentChange
-{
+class RCCacheEntry extends RecentChange {
 	var $secureName, $link;
-	var $curlink , $difflink, $lastlink , $usertalklink , $versionlink ;
+	var $curlink , $difflink, $lastlink, $usertalklink, $versionlink;
 	var $userlink, $timestamp, $watched;
 
 	static function newFromParent( $rc ) {
@@ -15,7 +14,7 @@ class RCCacheEntry extends RecentChange
 		$rc2->mExtra = $rc->mExtra;
 		return $rc2;
 	}
-} ;
+}
 
 /**
  * Class to show various lists of changes:
@@ -25,13 +24,13 @@ class RCCacheEntry extends RecentChange
  */
 class ChangesList {
 	# Called by history lists and recent changes
-	#
+	public $skin;
 
 	/**
 	* Changeslist contructor
 	* @param Skin $skin
 	*/
-	function __construct( &$skin ) {
+	public function __construct( &$skin ) {
 		$this->skin =& $skin;
 		$this->preCacheMessages();
 	}
@@ -47,7 +46,8 @@ class ChangesList {
 		$sk = $user->getSkin();
 		$list = NULL;
 		if( wfRunHooks( 'FetchChangesList', array( &$user, &$sk, &$list ) ) ) {
-			return $user->getOption( 'usenewrc' ) ? new EnhancedChangesList( $sk ) : new OldChangesList( $sk );
+			return $user->getOption( 'usenewrc' ) ?
+				new EnhancedChangesList( $sk ) : new OldChangesList( $sk );
 		} else {
 			return $list;
 		}
@@ -58,7 +58,6 @@ class ChangesList {
 	 * they are called often, we call them once and save them in $this->message
 	 */
 	private function preCacheMessages() {
-		// Precache various messages
 		if( !isset( $this->message ) ) {
 			foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last '.
 				'blocklink history boteditletter semicolon-separator' ) as $msg ) {
@@ -78,10 +77,10 @@ class ChangesList {
 	 * @return string
 	 */
 	protected function recentChangesFlags( $new, $minor, $patrolled, $nothing = '&nbsp;', $bot = false ) {
-		$f = $new ? '<span class="newpage">' . $this->message['newpageletter'] . '</span>'
-				: $nothing;
-		$f .= $minor ? '<span class="minor">' . $this->message['minoreditletter'] . '</span>'
-				: $nothing;
+		$f = $new ?
+			'<span class="newpage">' . $this->message['newpageletter'] . '</span>' : $nothing;
+		$f .= $minor ?
+			'<span class="minor">' . $this->message['minoreditletter'] . '</span>' : $nothing;
 		$f .= $bot ? '<span class="bot">' . $this->message['boteditletter'] . '</span>' : $nothing;
 		$f .= $patrolled ? '<span class="unpatrolled">!</span>' : $nothing;
 		return $f;
@@ -99,6 +98,30 @@ class ChangesList {
 		$this->rclistOpen = false;
 		return '';
 	}
+	
+	/**
+	 * Show formatted char difference
+	 * @param int $old bytes
+	 * @param int $new bytes
+	 * @returns string
+	 */
+	public static function showCharacterDifference( $old, $new ) {
+		global $wgRCChangedSizeThreshold, $wgLang;
+		$szdiff = $new - $old;
+		$formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape'), $wgLang->formatNum($szdiff) );
+		if( abs( $szdiff ) > abs( $wgRCChangedSizeThreshold ) ) {
+			$tag = 'strong';
+		} else {
+		    $tag = 'span';
+		}
+		if( $szdiff === 0 ) {
+			return "<$tag class='mw-plusminus-null'>($formatedSize)</$tag>";
+		} elseif( $szdiff > 0 ) {
+			return "<$tag class='mw-plusminus-pos'>(+$formatedSize)</$tag>";
+	    } else {
+			return "<$tag class='mw-plusminus-neg'>($formatedSize)</$tag>";
+		}
+	}
 
 	/**
  	 * Returns text for the end of RC
@@ -116,21 +139,18 @@ class ChangesList {
 		# Diff
 		$s .= '(' . $this->message['diff'] . ') (';
 		# Hist
-		$s .= $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), $this->message['hist'], 'action=history' ) .
-			') . . ';
-
+		$s .= $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), $this->message['hist'], 
+			'action=history' ) . ') . . ';
 		# "[[x]] moved to [[y]]"
 		$msg = ( $rc->mAttribs['rc_type'] == RC_MOVE ) ? '1movedto2' : '1movedto2_redir';
 		$s .= wfMsg( $msg, $this->skin->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
 			$this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
 	}
 
-	protected function insertDateHeader(&$s, $rc_timestamp) {
+	protected function insertDateHeader( &$s, $rc_timestamp ) {
 		global $wgLang;
-
 		# Make date header if necessary
 		$date = $wgLang->date( $rc_timestamp, true, true );
-		$s = '';
 		if( $date != $this->lastdate ) {
 			if( '' != $this->lastdate ) {
 				$s .= "</ul>\n";
@@ -141,21 +161,19 @@ class ChangesList {
 		}
 	}
 
-	protected function insertLog(&$s, $title, $logtype) {
+	protected function insertLog( &$s, $title, $logtype ) {
 		$logname = LogPage::logName( $logtype );
 		$s .= '(' . $this->skin->makeKnownLinkObj($title, $logname ) . ')';
 	}
 
-	protected function insertDiffHist(&$s, &$rc, $unpatrolled) {
+	protected function insertDiffHist( &$s, &$rc, $unpatrolled ) {
 		# Diff link
-		if( !$this->userCan($rc,Revision::DELETED_TEXT) ) {
+		if( $rc->mAttribs['rc_type'] == RC_NEW || $rc->mAttribs['rc_type'] == RC_LOG ) {
 			$diffLink = $this->message['diff'];
-		} else if( $rc->mAttribs['rc_type'] == RC_NEW || $rc->mAttribs['rc_type'] == RC_LOG ) {
+		} else if( !$this->userCan($rc,Revision::DELETED_TEXT) ) {
 			$diffLink = $this->message['diff'];
 		} else {
-			$rcidparam = $unpatrolled
-				? array( 'rcid' => $rc->mAttribs['rc_id'] )
-				: array();
+			$rcidparam = $unpatrolled ? array( 'rcid' => $rc->mAttribs['rc_id'] ) : array();
 			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['diff'],
 				wfArrayToCGI( array(
 					'curid' => $rc->mAttribs['rc_cur_id'],
@@ -165,7 +183,6 @@ class ChangesList {
 				'', '', ' tabindex="'.$rc->counter.'"');
 		}
 		$s .= '('.$diffLink.') (';
-
 		# History link
 		$s .= $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['hist'],
 			wfArrayToCGI( array(
@@ -174,39 +191,40 @@ class ChangesList {
 		$s .= ') . . ';
 	}
 
-	protected function insertArticleLink(&$s, &$rc, $unpatrolled, $watched) {
-		# Article link
+	protected function insertArticleLink( &$s, &$rc, $unpatrolled, $watched ) {
+		global $wgContLang;
 		# If it's a new article, there is no diff link, but if it hasn't been
 		# patrolled yet, we need to give users a way to do so
-		$params = ( $unpatrolled && $rc->mAttribs['rc_type'] == RC_NEW )
-			? 'rcid='.$rc->mAttribs['rc_id']
-			: '';
+		$params = ( $unpatrolled && $rc->mAttribs['rc_type'] == RC_NEW ) ?
+			'rcid='.$rc->mAttribs['rc_id'] : '';
 		if( $this->isDeleted($rc,Revision::DELETED_TEXT) ) {
 			$articlelink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '', $params );
 			$articlelink = '<span class="history-deleted">'.$articlelink.'</span>';
 		} else {
 		    $articlelink = ' '. $this->skin->makeKnownLinkObj( $rc->getTitle(), '', $params );
 		}
-		if( $watched )
+		# Bolden pages watched by this user
+		if( $watched ) {
 			$articlelink = "<strong class=\"mw-watched\">{$articlelink}</strong>";
-		global $wgContLang;
+		}
+		# RTL/LTR marker
 		$articlelink .= $wgContLang->getDirMark();
 
-		wfRunHooks('ChangesListInsertArticleLink',
-			array(&$this, &$articlelink, &$s, &$rc, $unpatrolled, $watched));
+		wfRunHooks( 'ChangesListInsertArticleLink',
+			array(&$this, &$articlelink, &$s, &$rc, $unpatrolled, $watched) );
 
-		$s .= ' '.$articlelink;
+		$s .= " $articlelink";
 	}
 
-	protected function insertTimestamp(&$s, $rc) {
+	protected function insertTimestamp( &$s, $rc ) {
 		global $wgLang;
-		# Timestamp
-		$s .= $this->message['semicolon-separator'] . ' ' . $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
+		$s .= $this->message['semicolon-separator'] . 
+			$wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
 	}
 
 	/** Insert links to user page, user talk page and eventually a blocking link */
-	protected function insertUserRelatedLinks(&$s, &$rc) {
-		if ( $this->isDeleted($rc,Revision::DELETED_USER) ) {
+	public function insertUserRelatedLinks(&$s, &$rc) {
+		if( $this->isDeleted($rc,Revision::DELETED_USER) ) {
 		   $s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-user') . '</span>';
 		} else {
 		  $s .= $this->skin->userLink( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] );
@@ -216,13 +234,11 @@ class ChangesList {
 
 	/** insert a formatted action */
 	protected function insertAction(&$s, &$rc) {
-		# Add action
 		if( $rc->mAttribs['rc_type'] == RC_LOG ) {
-			// log action
-			if ( $this->isDeleted($rc,LogPage::DELETED_ACTION) ) {
+			if( $this->isDeleted($rc,LogPage::DELETED_ACTION) ) {
 				$s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
 			} else {
-				$s .= ' ' . LogPage::actionText( $rc->mAttribs['rc_log_type'], $rc->mAttribs['rc_log_action'],
+				$s .= ' '.LogPage::actionText( $rc->mAttribs['rc_log_type'], $rc->mAttribs['rc_log_action'],
 					$rc->getTitle(), $this->skin, LogPage::extractParams($rc->mAttribs['rc_params']), true, true );
 			}
 		}
@@ -230,10 +246,8 @@ class ChangesList {
 
 	/** insert a formatted comment */
 	protected function insertComment(&$s, &$rc) {
-		# Add comment
 		if( $rc->mAttribs['rc_type'] != RC_MOVE && $rc->mAttribs['rc_type'] != RC_MOVE_OVER_REDIRECT ) {
-			// log comment
-			if ( $this->isDeleted($rc,Revision::DELETED_COMMENT) ) {
+			if( $this->isDeleted($rc,Revision::DELETED_COMMENT) ) {
 				$s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span>';
 			} else {
 				$s .= $this->skin->commentBlock( $rc->mAttribs['rc_comment'], $rc->getTitle() );
@@ -256,8 +270,8 @@ class ChangesList {
 	protected function numberofWatchingusers( $count ) {
 		global $wgLang;
 		static $cache = array();
-		if ( $count > 0 ) {
-			if ( !isset( $cache[$count] ) ) {
+		if( $count > 0 ) {
+			if( !isset( $cache[$count] ) ) {
 				$cache[$count] = wfMsgExt('number_of_watching_users_RCview',
 					array('parsemag', 'escape'), $wgLang->formatNum($count));
 			}
@@ -290,12 +304,20 @@ class ChangesList {
 			$permission = ( $rc->mAttribs['rc_deleted'] & Revision::DELETED_RESTRICTED ) == Revision::DELETED_RESTRICTED
 				? 'suppressrevision'
 				: 'deleterevision';
-			wfDebug( "Checking for $permission due to $field match on $rc->mAttribs['rc_deleted']\n" );
+			wfDebug( "Checking for $permission due to $field match on {$rc->mAttribs['rc_deleted']}\n" );
 			return $wgUser->isAllowed( $permission );
 		} else {
 			return true;
 		}
 	}
+
+	protected function maybeWatchedLink( $link, $watched=false ) {
+		if( $watched ) {
+			return '<strong class="mw-watched">' . $link . '</strong>';
+		} else {
+			return '<span class="mw-rc-unwatched">' . $link . '</span>';
+		}
+	}
 }
 
 
@@ -308,55 +330,43 @@ class OldChangesList extends ChangesList {
 	 */
 	public function recentChangesLine( &$rc, $watched = false ) {
 		global $wgContLang, $wgRCShowChangedSize, $wgUser;
-
-		$fname = 'ChangesList::recentChangesLineOld';
-		wfProfileIn( $fname );
-
-		# Extract DB fields into local scope
-		// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
-		extract( $rc->mAttribs );
-
+		wfProfileIn( __METHOD__ );
 		# Should patrol-related stuff be shown?
-		$unpatrolled = $wgUser->useRCPatrol() && $rc_patrolled == 0;
+		$unpatrolled = $wgUser->useRCPatrol() && !$rc->mAttribs['rc_patrolled'];
 
-		$this->insertDateHeader($s,$rc_timestamp);
-
-		$s .= '<li>';
+		$dateheader = ''; // $s now contains only <li>...</li>, for hooks' convenience.
+		$this->insertDateHeader( $dateheader, $rc->mAttribs['rc_timestamp'] );
 
+		$s = '';
 		// Moved pages
-		if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
+		if( $rc->mAttribs['rc_type'] == RC_MOVE || $rc->mAttribs['rc_type'] == RC_MOVE_OVER_REDIRECT ) {
 			$this->insertMove( $s, $rc );
 		// Log entries
-		} elseif( $rc_log_type ) {
-			$logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
-			$this->insertLog( $s, $logtitle, $rc_log_type );
+		} elseif( $rc->mAttribs['rc_log_type'] ) {
+			$logtitle = Title::newFromText( 'Log/'.$rc->mAttribs['rc_log_type'], NS_SPECIAL );
+			$this->insertLog( $s, $logtitle, $rc->mAttribs['rc_log_type'] );
 		// Log entries (old format) or log targets, and special pages
-		} elseif( $rc_namespace == NS_SPECIAL ) {
-			list( $specialName, $specialSubpage ) = SpecialPage::resolveAliasWithSubpage( $rc_title );
-			if ( $specialName == 'Log' ) {
-				$this->insertLog( $s, $rc->getTitle(), $specialSubpage );
-			} else {
-				wfDebug( "Unexpected special page in recentchanges\n" );
+		} elseif( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) {
+			list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $rc->mAttribs['rc_title'] );
+			if( $name == 'Log' ) {
+				$this->insertLog( $s, $rc->getTitle(), $subpage );
 			}
 		// Regular entries
 		} else {
-			wfProfileIn($fname.'-page');
-
-			$this->insertDiffHist($s, $rc, $unpatrolled);
-
+			$this->insertDiffHist( $s, $rc, $unpatrolled );
 			# M, N, b and ! (minor, new, bot and unpatrolled)
-			$s .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $unpatrolled, '', $rc_bot );
-			$this->insertArticleLink($s, $rc, $unpatrolled, $watched);
-
-			wfProfileOut($fname.'-page');
+			$s .= $this->recentChangesFlags( $rc->mAttribs['rc_new'], $rc->mAttribs['rc_minor'],
+				$unpatrolled, '', $rc->mAttribs['rc_bot'] );
+			$this->insertArticleLink( $s, $rc, $unpatrolled, $watched );
 		}
-
-		wfProfileIn( $fname.'-rest' );
-
-		$this->insertTimestamp($s,$rc);
-
+		# Edit/log timestamp
+		$this->insertTimestamp( $s, $rc );
+		# Bytes added or removed
 		if( $wgRCShowChangedSize ) {
-			$s .= ( $rc->getCharacterDifference() == '' ? '' : $rc->getCharacterDifference() . ' . . ' );
+			$cd = $rc->getCharacterDifference();
+			if( $cd != '' ) {
+				$s .= "$cd  . . ";
+			}
 		}
 		# User tool links
 		$this->insertUserRelatedLinks($s,$rc);
@@ -364,29 +374,45 @@ class OldChangesList extends ChangesList {
 		$this->insertAction($s, $rc);
 		# Edit or log comment
 		$this->insertComment($s, $rc);
-
 		# Mark revision as deleted if so
-		if ( !$rc_log_type && $this->isDeleted($rc,Revision::DELETED_TEXT) )
+		if( !$rc->mAttribs['rc_log_type'] && $this->isDeleted($rc,Revision::DELETED_TEXT) ) {
 		   $s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
-		if($rc->numberofWatchingusers > 0) {
-			$s .= ' ' . wfMsg('number_of_watching_users_RCview',  $wgContLang->formatNum($rc->numberofWatchingusers));
+		}
+		# How many users watch this page
+		if( $rc->numberofWatchingusers > 0 ) {
+			$s .= ' ' . wfMsg( 'number_of_watching_users_RCview', 
+				$wgContLang->formatNum($rc->numberofWatchingusers) );
 		}
 
-		$s .= "</li>\n";
-
-		wfProfileOut( $fname.'-rest' );
+		wfRunHooks( 'OldChangesListRecentChangesLine', array(&$this, &$s, $rc) );
 
-		wfProfileOut( $fname );
-		return $s;
+		wfProfileOut( __METHOD__ );
+		return "$dateheader<li>$s</li>\n";
 	}
 }
 
 
 /**
- * Generate a list of changes using an Enhanced system (use javascript).
+ * Generate a list of changes using an Enhanced system (uses javascript).
  */
 class EnhancedChangesList extends ChangesList {
 	/**
+	*  Add the JavaScript file for enhanced changeslist
+	*  @ return string
+	*/
+	public function beginRecentChangesList() {
+		global $wgStylePath, $wgJsMimeType, $wgStyleVersion;
+		$this->rc_cache = array();
+		$this->rcMoveIndex = 0;
+		$this->rcCacheIndex = 0;
+		$this->lastdate = '';
+		$this->rclistOpen = false;
+		$script = Xml::tags( 'script', array(
+			'type' => $wgJsMimeType,
+			'src' => $wgStylePath . "/common/enhancedchanges.js?$wgStyleVersion" ), '' );
+		return $script;
+	}
+	/**
 	 * Format a line for enhanced recentchange (aka with javascript and block of lines).
 	 */
 	public function recentChangesLine( &$baseRC, $watched = false ) {
@@ -396,12 +422,13 @@ class EnhancedChangesList extends ChangesList {
 		$rc = RCCacheEntry::newFromParent( $baseRC );
 
 		# Extract fields from DB into the function scope (rc_xxxx variables)
-		// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+		// FIXME: Would be good to replace this extract() call with something
+		// that explicitly initializes variables.
 		extract( $rc->mAttribs );
 		$curIdEq = 'curid=' . $rc_cur_id;
 
 		# If it's a new day, add the headline and flush the cache
-		$date = $wgLang->date( $rc_timestamp, true);
+		$date = $wgLang->date( $rc_timestamp, true );
 		$ret = '';
 		if( $date != $this->lastdate ) {
 			# Process current cache
@@ -425,17 +452,6 @@ class EnhancedChangesList extends ChangesList {
 			$msg = ( $rc_type == RC_MOVE ) ? "1movedto2" : "1movedto2_redir";
 			$clink = wfMsg( $msg, $this->skin->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
 			  $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-		// Log entries (old format) and special pages
-		} elseif( $rc_namespace == NS_SPECIAL ) {
-			list( $specialName, $logtype ) = SpecialPage::resolveAliasWithSubpage( $rc_title );
-			if ( $specialName == 'Log' ) {
-				# Log updates, etc
-				$logname = LogPage::logName( $logtype );
-				$clink = '(' . $this->skin->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
-			} else {
-				wfDebug( "Unexpected special page in recentchanges\n" );
-				$clink = '';
-			}
 		// New unpatrolled pages
 		} else if( $rc->unpatrolled && $rc_type == RC_NEW ) {
 			$clink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
@@ -443,11 +459,23 @@ class EnhancedChangesList extends ChangesList {
 		} else if( $rc_type == RC_LOG ) {
 			if( $rc_log_type ) {
 				$logtitle = SpecialPage::getTitleFor( 'Log', $rc_log_type );
-				$clink = '(' . $this->skin->makeKnownLinkObj( $logtitle, LogPage::logName($rc_log_type) ) . ')';
+				$clink = '(' . $this->skin->makeKnownLinkObj( $logtitle, 
+					LogPage::logName($rc_log_type) ) . ')';
 			} else {
 				$clink = $this->skin->makeLinkObj( $rc->getTitle(), '' );
 			}
 			$watched = false;
+		// Log entries (old format) and special pages
+		} elseif( $rc_namespace == NS_SPECIAL ) {
+			list( $specialName, $logtype ) = SpecialPage::resolveAliasWithSubpage( $rc_title );
+			if ( $specialName == 'Log' ) {
+				# Log updates, etc
+				$logname = LogPage::logName( $logtype );
+				$clink = '(' . $this->skin->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
+			} else {
+				wfDebug( "Unexpected special page in recentchanges\n" );
+				$clink = '';
+			}
 		// Edits
 		} else {
 			$clink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '' );
@@ -473,7 +501,8 @@ class EnhancedChangesList extends ChangesList {
 		$querycur = $curIdEq."&diff=0&oldid=$rc_this_oldid";
 		$querydiff = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid$rcIdQuery";
 		$aprops = ' tabindex="'.$baseRC->counter.'"';
-		$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['cur'], $querycur, '' ,'', $aprops );
+		$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), 
+			$this->message['cur'], $querycur, '' ,'', $aprops );
 
 		# Make "diff" an "cur" links
 		if( !$showdifflinks ) {
@@ -485,7 +514,8 @@ class EnhancedChangesList extends ChangesList {
 			}
 			$diffLink = $this->message['diff'];
 		} else {
-			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['diff'], $querydiff, '' ,'', $aprops );
+			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['diff'], 
+				$querydiff, '' ,'', $aprops );
 		}
 
 		# Make "last" link
@@ -545,7 +575,7 @@ class EnhancedChangesList extends ChangesList {
 		$curId = $currentRevision = 0;
 		# Some catalyst variables...
 		$namehidden = true;
-		$alllogs = true;
+		$allLogs = true;
 		foreach( $block as $rcObj ) {
 			$oldid = $rcObj->mAttribs['rc_last_oldid'];
 			if( $rcObj->mAttribs['rc_new'] ) {
@@ -564,7 +594,7 @@ class EnhancedChangesList extends ChangesList {
 				$unpatrolled = true;
 			}
 			if( $rcObj->mAttribs['rc_type'] != RC_LOG ) {
-				$alllogs = false;
+				$allLogs = false;
 			}
 			# Get the latest entry with a page_id and oldid
 			# since logs may not have these.
@@ -587,20 +617,24 @@ class EnhancedChangesList extends ChangesList {
 			$text = $userlink;
 			$text .= $wgContLang->getDirMark();
 			if( $count > 1 ) {
-				$text .= ' ('.$count.'&times;)';
+				$text .= ' (' . $wgLang->formatNum( $count ) . '×)';
 			}
 			array_push( $users, $text );
 		}
 
-		$users = ' <span class="changedby">[' . implode( $this->message['semicolon-separator'] . ' ', $users ) . ']</span>';
+		$users = ' <span class="changedby">[' . 
+			implode( $this->message['semicolon-separator'], $users ) . ']</span>';
 
-		# Arrow
-		$rci = 'RCI'.$this->rcCacheIndex;
-		$rcl = 'RCL'.$this->rcCacheIndex;
-		$rcm = 'RCM'.$this->rcCacheIndex;
-		$toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')";
-		$tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'">' . $this->sideArrow() . '</a></span>';
-		$tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'">' . $this->downArrow() . '</a></span>';
+		# ID for JS visibility toggle
+		$jsid = $this->rcCacheIndex;
+		# onclick handler to toggle hidden/expanded
+		$toggleLink = "onclick='toggleVisibility($jsid); return false'";
+		# Title for <a> tags
+		$expandTitle = htmlspecialchars( wfMsg('rc-enhanced-expand') );
+		$closeTitle = htmlspecialchars( wfMsg('rc-enhanced-hide') );
+
+		$tl  = "<span id='mw-rc-openarrow-$jsid' class='mw-changeslist-expanded' style='visibility:hidden'><a href='#' $toggleLink title='$expandTitle'>" . $this->sideArrow() . "</a></span>";
+		$tl .= "<span id='mw-rc-closearrow-$jsid' class='mw-changeslist-hidden' style='display:none'><a href='#' $toggleLink title='$closeTitle'>" . $this->downArrow() . "</a></span>";
 		$r .= '<td valign="top" style="white-space: nowrap"><tt>'.$tl.'&nbsp;';
 
 		# Main line
@@ -612,8 +646,10 @@ class EnhancedChangesList extends ChangesList {
 		# Article link
 		if( $namehidden ) {
 			$r .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
-		} else {
+		} else if( $allLogs ) {
 			$r .= $this->maybeWatchedLink( $block[0]->link, $block[0]->watched );
+		} else {
+			$this->insertArticleLink( $r, $block[0], $block[0]->unpatrolled, $block[0]->watched );
 		}
 
 		$r .= $wgContLang->getDirMark();
@@ -627,7 +663,7 @@ class EnhancedChangesList extends ChangesList {
 		}
 		# Total change link
 		$r .= ' ';
-		if( !$alllogs ) {
+		if( !$allLogs ) {
 			$r .= '(';
 			if( !ChangesList::userCan($rcObj,Revision::DELETED_TEXT) ) {
 				$r .= $nchanges[$n];
@@ -637,11 +673,21 @@ class EnhancedChangesList extends ChangesList {
 				$r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
 					$nchanges[$n], $curIdEq."&diff=$currentRevision&oldid=$oldid" );
 			}
-			$r .= ') . . ';
 		}
 
+		# History
+		if( $allLogs ) {
+			// don't show history link for logs
+		} else if( $namehidden || !$block[0]->getTitle()->exists() ) {
+			$r .= $this->message['semicolon-separator'] . $this->message['hist'] . ')';
+		} else {
+			$r .= $this->message['semicolon-separator'] . $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
+				$this->message['hist'], $curIdEq . '&action=history' ) . ')';
+		}
+		$r .= ' . . ';
+
 		# Character difference (does not apply if only log items)
-		if( $wgRCShowChangedSize && !$alllogs ) {
+		if( $wgRCShowChangedSize && !$allLogs ) {
 			$last = 0;
 			$first = count($block) - 1;
 			# Some events (like logs) have an "empty" size, so we need to skip those...
@@ -662,26 +708,18 @@ class EnhancedChangesList extends ChangesList {
 			}
 		}
 
-		# History
-		if( $alllogs ) {
-			// don't show history link for logs
-		} else if( $namehidden || !$block[0]->getTitle()->exists() ) {
-			$r .= '(' . $this->message['history'] . ')';
-		} else {
-			$r .= '(' . $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
-				$this->message['history'], $curIdEq.'&action=history' ) . ')';
-		}
-
 		$r .= $users;
 		$r .= $this->numberofWatchingusers($block[0]->numberofWatchingusers);
 
 		$r .= "</td></tr></table>\n";
 
 		# Sub-entries
-		$r .= '<div id="'.$rci.'" style="display:none;"><table cellpadding="0" cellspacing="0"  border="0" style="background: none">';
+		$r .= '<div id="mw-rc-subentries-'.$jsid.'" class="mw-changeslist-hidden">';
+		$r .= '<table cellpadding="0" cellspacing="0"  border="0" style="background: none">';
 		foreach( $block as $rcObj ) {
-			# Get rc_xxxx variables
-			// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+			# Extract fields from DB into the function scope (rc_xxxx variables)
+			// FIXME: Would be good to replace this extract() call with something
+			// that explicitly initializes variables.
 			extract( $rcObj->mAttribs );
 
 			#$r .= '<tr><td valign="top">'.$this->spacerArrow();
@@ -701,9 +739,10 @@ class EnhancedChangesList extends ChangesList {
 			} else if( !ChangesList::userCan($rcObj,Revision::DELETED_TEXT) ) {
 				$link = '<span class="history-deleted"><tt>'.$rcObj->timestamp.'</tt></span> ';
 			} else {
-				$rcIdEq = ($rcObj->unpatrolled && $rc_type == RC_NEW) ? '&rcid='.$rcObj->mAttribs['rc_id'] : '';
-				
-				$link = '<tt>'.$this->skin->makeKnownLinkObj( $rcObj->getTitle(), $rcObj->timestamp, $curIdEq.'&'.$o.$rcIdEq ).'</tt>';
+				$rcIdEq = ($rcObj->unpatrolled && $rc_type == RC_NEW) ?
+					'&rcid='.$rcObj->mAttribs['rc_id'] : '';
+				$link = '<tt>'.$this->skin->makeKnownLinkObj( $rcObj->getTitle(),
+					$rcObj->timestamp, $curIdEq.'&'.$o.$rcIdEq ).'</tt>';
 				if( $this->isDeleted($rcObj,Revision::DELETED_TEXT) )
 					$link = '<span class="history-deleted">'.$link.'</span> ';
 			}
@@ -712,7 +751,7 @@ class EnhancedChangesList extends ChangesList {
 			if ( !$rc_type == RC_LOG || $rc_type == RC_NEW ) {
 				$r .= ' (';
 				$r .= $rcObj->curlink;
-				$r .= $this->message['semicolon-separator'] . ' ';
+				$r .= $this->message['semicolon-separator'];
 				$r .= $rcObj->lastlink;
 				$r .= ')';
 			}
@@ -742,26 +781,19 @@ class EnhancedChangesList extends ChangesList {
 		return $r;
 	}
 
-	protected function maybeWatchedLink( $link, $watched=false ) {
-		if( $watched ) {
-			// FIXME: css style might be more appropriate
-			return '<strong class="mw-watched">' . $link . '</strong>';
-		} else {
-			return $link;
-		}
-	}
-
 	/**
 	 * Generate HTML for an arrow or placeholder graphic
 	 * @param string $dir one of '', 'd', 'l', 'r'
 	 * @param string $alt text
+	 * @param string $title text
 	 * @return string HTML <img> tag
 	 */
-	protected function arrow( $dir, $alt='' ) {
+	protected function arrow( $dir, $alt='', $title='' ) {
 		global $wgStylePath;
 		$encUrl = htmlspecialchars( $wgStylePath . '/common/images/Arr_' . $dir . '.png' );
 		$encAlt = htmlspecialchars( $alt );
-		return "<img src=\"$encUrl\" width=\"12\" height=\"12\" alt=\"$encAlt\" />";
+		$encTitle = htmlspecialchars( $title );
+		return "<img src=\"$encUrl\" width=\"12\" height=\"12\" alt=\"$encAlt\" title=\"$encTitle\" />";
 	}
 
 	/**
@@ -772,7 +804,7 @@ class EnhancedChangesList extends ChangesList {
 	protected function sideArrow() {
 		global $wgContLang;
 		$dir = $wgContLang->isRTL() ? 'l' : 'r';
-		return $this->arrow( $dir, '+' );
+		return $this->arrow( $dir, '+', wfMsg('rc-enhanced-expand') );
 	}
 
 	/**
@@ -781,7 +813,7 @@ class EnhancedChangesList extends ChangesList {
 	 * @return string HTML <img> tag
 	 */
 	protected function downArrow() {
-		return $this->arrow( 'd', '-' );
+		return $this->arrow( 'd', '-', wfMsg('rc-enhanced-hide') );
 	}
 
 	/**
@@ -789,7 +821,7 @@ class EnhancedChangesList extends ChangesList {
 	 * @return string HTML <img> tag
 	 */
 	protected function spacerArrow() {
-		return $this->arrow( '', ' ' );
+		return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // non-breaking space
 	}
 
 	/**
@@ -806,16 +838,14 @@ class EnhancedChangesList extends ChangesList {
 	 */
 	protected function recentChangesBlockLine( $rcObj ) {
 		global $wgContLang, $wgRCShowChangedSize;
-
-		# Get rc_xxxx variables
-		// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+		# Extract fields from DB into the function scope (rc_xxxx variables)
+		// FIXME: Would be good to replace this extract() call with something
+		// that explicitly initializes variables.
 		extract( $rcObj->mAttribs );
-		$curIdEq = 'curid='.$rc_cur_id;
+		$curIdEq = "curid={$rc_cur_id}";
 
 		$r = '<table cellspacing="0" cellpadding="0" border="0" style="background: none"><tr>';
-
 		$r .= '<td valign="top" style="white-space: nowrap"><tt>' . $this->spacerArrow() . '&nbsp;';
-
 		# Flag and Timestamp
 		if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
 			$r .= '&nbsp;&nbsp;&nbsp;&nbsp;'; // 4 flags -> 4 spaces
@@ -823,33 +853,27 @@ class EnhancedChangesList extends ChangesList {
 			$r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled, '&nbsp;', $rc_bot );
 		}
 		$r .= '&nbsp;'.$rcObj->timestamp.'&nbsp;</tt></td><td>';
-
 		# Article or log link
 		if( $rc_log_type ) {
 			$logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
 			$logname = LogPage::logName( $rc_log_type );
 			$r .= '(' . $this->skin->makeKnownLinkObj($logtitle, $logname ) . ')';
-		} else if( !$this->userCan($rcObj,Revision::DELETED_TEXT) ) {
-			$r .= '<span class="history-deleted">' . $rcObj->link . '</span>';
 		} else {
-			$r .= $this->maybeWatchedLink( $rcObj->link, $rcObj->watched );
+			$this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched );
 		}
-
 		# Diff and hist links
 		if ( $rc_type != RC_LOG ) {
-		   $r .= ' ('. $rcObj->difflink . $this->message['semicolon-separator'] . ' ';
-		   $r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' ) . ')';
+			$r .= ' ('. $rcObj->difflink . $this->message['semicolon-separator'];
+			$r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), 
+				$curIdEq.'&action=history' ) . ')';
 		}
 		$r .= ' . . ';
-
 		# Character diff
-		if( $wgRCShowChangedSize ) {
-			$r .= ( $rcObj->getCharacterDifference() == '' ? '' : '&nbsp;' . $rcObj->getCharacterDifference() . ' . . ' ) ;
+		if( $wgRCShowChangedSize && ($cd = $rcObj->getCharacterDifference()) ) {
+			$r .= "$cd . . ";
 		}
-
 		# User/talk
 		$r .= ' '.$rcObj->userlink . $rcObj->usertalklink;
-
 		# Log action (if any)
 		if( $rc_log_type ) {
 			if( $this->isDeleted($rcObj,LogPage::DELETED_ACTION) ) {
@@ -859,7 +883,6 @@ class EnhancedChangesList extends ChangesList {
 					$this->skin, LogPage::extractParams($rc_params), true, true );
 			}
 		}
-
 		# Edit or log comment
 		if( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
 			// log comment
@@ -869,7 +892,6 @@ class EnhancedChangesList extends ChangesList {
 			  $r .= $this->skin->commentBlock( $rc_comment, $rcObj->getTitle() );
 			}
 		}
-
 		# Show how many people are watching this if enabled
 		$r .= $this->numberofWatchingusers($rcObj->numberofWatchingusers);
 
@@ -893,7 +915,6 @@ class EnhancedChangesList extends ChangesList {
 				$blockOut .= $this->recentChangesBlockGroup( $block );
 			}
 		}
-
 		return '<div>'.$blockOut.'</div>';
 	}
 
diff --git a/includes/Credits.php b/includes/Credits.php
index 6326e3a2..ae9377f2 100644
--- a/includes/Credits.php
+++ b/includes/Credits.php
@@ -20,167 +20,187 @@
  * @author <evan@wikitravel.org>
  */
 
-/**
- * This is largely cadged from PageHistory::history
- */
-function showCreditsPage($article) {
-	global $wgOut;
-
-	$fname = 'showCreditsPage';
-
-	wfProfileIn( $fname );
-
-	$wgOut->setPageTitle( $article->mTitle->getPrefixedText() );
-	$wgOut->setSubtitle( wfMsg( 'creditspage' ) );
-	$wgOut->setArticleFlag( false );
-	$wgOut->setArticleRelated( true );
-	$wgOut->setRobotpolicy( 'noindex,nofollow' );
-
-	if( $article->mTitle->getArticleID() == 0 ) {
-		$s = wfMsg( 'nocredits' );
-	} else {
-		$s = getCredits($article, -1);
-	}
-
-	$wgOut->addHTML( $s );
-
-	wfProfileOut( $fname );
-}
-
-function getCredits($article, $cnt, $showIfMax=true) {
-	$fname = 'getCredits';
-	wfProfileIn( $fname );
-	$s = '';
-
-	if (isset($cnt) && $cnt != 0) {
-		$s = getAuthorCredits($article);
-		if ($cnt > 1 || $cnt < 0) {
-			$s .= ' ' . getContributorCredits($article, $cnt - 1, $showIfMax);
+class Credits {
+
+	/**
+	 * This is largely cadged from PageHistory::history
+	 * @param $article Article object
+	 */
+	public static function showPage( Article $article ) {
+		global $wgOut;
+	
+		wfProfileIn( __METHOD__ );
+	
+		$wgOut->setPageTitle( $article->mTitle->getPrefixedText() );
+		$wgOut->setSubtitle( wfMsg( 'creditspage' ) );
+		$wgOut->setArticleFlag( false );
+		$wgOut->setArticleRelated( true );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
+	
+		if( $article->mTitle->getArticleID() == 0 ) {
+			$s = wfMsg( 'nocredits' );
+		} else {
+			$s = self::getCredits($article, -1 );
 		}
+	
+		$wgOut->addHTML( $s );
+	
+		wfProfileOut( __METHOD__ );
 	}
 
-	wfProfileOut( $fname );
-	return $s;
-}
-
-/**
- *
- */
-function getAuthorCredits($article) {
-	global $wgLang, $wgAllowRealName;
-
-	$last_author = $article->getUser();
-
-	if ($last_author == 0) {
-		$author_credit = wfMsg('anonymous');
-	} else {
-		if($wgAllowRealName) { $real_name = User::whoIsReal($last_author); }
-		$user_name = User::whoIs($last_author);
-
-		if (!empty($real_name)) {
-			$author_credit = creditLink($user_name, $real_name);
-		} else {
-			$author_credit = wfMsg('siteuser', creditLink($user_name));
+	/**
+	 * Get a list of contributors of $article
+	 * @param $article Article object
+	 * @param $cnt Int: maximum list of contributors to show
+	 * @param $showIfMax Bool: whether to contributors if there more than $cnt
+	 * @return String: html
+	 */
+	public static function getCredits($article, $cnt, $showIfMax=true) {
+		wfProfileIn( __METHOD__ );
+		$s = '';
+
+		if( isset( $cnt ) && $cnt != 0 ){
+			$s = self::getAuthor( $article );
+			if ($cnt > 1 || $cnt < 0) {
+				$s .= ' ' . self::getContributors( $article, $cnt - 1, $showIfMax );
+			}
 		}
-	}
 
-	$timestamp = $article->getTimestamp();
-	if ($timestamp) {
-		$d = $wgLang->date($article->getTimestamp(), true);
-		$t = $wgLang->time($article->getTimestamp(), true);
-	} else {
-		$d = '';
-		$t = '';
+		wfProfileOut( __METHOD__ );
+		return $s;
 	}
-	return wfMsg('lastmodifiedatby', $d, $t, $author_credit);
-}
-
-/**
- *
- */
-function getContributorCredits($article, $cnt, $showIfMax) {
-
-	global $wgLang, $wgAllowRealName;
 
-	$contributors = $article->getContributors();
+	/**
+	 * Get the last author with the last modification time
+	 * @param $article Article object
+	 */
+	protected static function getAuthor( Article $article ){
+		global $wgLang, $wgAllowRealName;
 
-	$others_link = '';
+		$user = User::newFromId( $article->getUser() );
 
-	# Hmm... too many to fit!
-
-	if ($cnt > 0 && count($contributors) > $cnt) {
-		$others_link = creditOthersLink($article);
-		if (!$showIfMax) {
-			return wfMsg('othercontribs', $others_link);
+		$timestamp = $article->getTimestamp();
+		if( $timestamp ){
+			$d = $wgLang->date( $article->getTimestamp(), true );
+			$t = $wgLang->time( $article->getTimestamp(), true );
 		} else {
-			$contributors = array_slice($contributors, 0, $cnt);
+			$d = '';
+			$t = '';
 		}
+		return wfMsg( 'lastmodifiedatby', $d, $t, self::userLink( $user ) );
 	}
 
-	$real_names = array();
-	$user_names = array();
-
-	$anon = '';
-
-	# Sift for real versus user names
-
-	foreach ($contributors as $user_parts) {
-		if ($user_parts[0] != 0) {
-			if ($wgAllowRealName && !empty($user_parts[2])) {
-				$real_names[] = creditLink($user_parts[1], $user_parts[2]);
+	/**
+	 * Get a list of contributors of $article
+	 * @param $article Article object
+	 * @param $cnt Int: maximum list of contributors to show
+	 * @param $showIfMax Bool: whether to contributors if there more than $cnt
+	 * @return String: html
+	 */
+	protected static function getContributors( Article $article, $cnt, $showIfMax ) {
+		global $wgLang, $wgAllowRealName;
+	
+		$contributors = $article->getContributors();
+	
+		$others_link = '';
+	
+		# Hmm... too many to fit!
+		if( $cnt > 0 && $contributors->count() > $cnt ){
+			$others_link = self::othersLink( $article );
+			if( !$showIfMax )
+				return wfMsg( 'othercontribs', $others_link );
+		}
+	
+		$real_names = array();
+		$user_names = array();
+		$anon = 0;
+	
+		# Sift for real versus user names
+		foreach( $contributors as $user ) {
+			$cnt--;
+			if( $user->isLoggedIn() ){
+				$link = self::link( $user );
+				if( $wgAllowRealName && $user->getRealName() )
+					$real_names[] = $link;
+				else
+					$user_names[] = $link;
 			} else {
-				$user_names[] = creditLink($user_parts[1]);
+				$anon++;
+			}
+			if( $cnt == 0 ) break;
+		}
+	
+		# Two strings: real names, and user names
+		$real = $wgLang->listToText( $real_names );
+		$user = $wgLang->listToText( $user_names );
+		if( $anon )
+			$anon = wfMsgExt( 'anonymous', array( 'parseinline' ), $anon );
+	
+		# "ThisSite user(s) A, B and C"
+		if( !empty( $user ) ){
+			$user = wfMsgExt( 'siteusers', array( 'parsemag' ), $user, count( $user_names ) );
+		}
+	
+		# This is the big list, all mooshed together. We sift for blank strings
+		$fulllist = array();
+		foreach( array( $real, $user, $anon, $others_link ) as $s ){
+			if( !empty( $s ) ){
+				array_push( $fulllist, $s );
 			}
-		} else {
-			$anon = wfMsg('anonymous');
 		}
-	}
-
-	# Two strings: real names, and user names
-
-	$real = $wgLang->listToText($real_names);
-	$user = $wgLang->listToText($user_names);
 
-	# "ThisSite user(s) A, B and C"
+		# Make the list into text...
+		$creds = $wgLang->listToText( $fulllist );
 
-	if (!empty($user)) {
-		$user = wfMsg('siteusers', $user);
+		# "Based on work by ..."
+		return empty( $creds ) ? '' : wfMsg( 'othercontribs', $creds );
 	}
 
-	# This is the big list, all mooshed together. We sift for blank strings
-
-	$fulllist = array();
+	/**
+	 * Get a link to $user_name page
+	 * @param $user User object
+	 * @return String: html
+	 */
+	protected static function link( User $user ) {
+		global $wgUser, $wgAllowRealName;
+		if( $wgAllowRealName )
+			$real = $user->getRealName();
+		else
+			$real = false;
+
+		$skin = $wgUser->getSkin();
+		$page = $user->getUserPage();
+			
+		return $skin->link( $page, htmlspecialchars( $real ? $real : $user->getName() ) );
+	}
 
-	foreach (array($real, $user, $anon, $others_link) as $s) {
-		if (!empty($s)) {
-			array_push($fulllist, $s);
+	/**
+	 * Get a link to $user_name page
+	 * @param $user_name String: user name
+	 * @param $linkText String: optional display
+	 * @return String: html
+	 */
+	protected static function userLink( User $user ) {
+		global $wgUser, $wgAllowRealName;
+		if( $user->isAnon() ){
+			return wfMsgExt( 'anonymous', array( 'parseinline' ), 1 );
+		} else {
+			$link = self::link( $user );
+			if( $wgAllowRealName && $user->getRealName() )
+				return $link;
+			else 
+				return wfMsgExt( 'siteuser', array( 'parseinline', 'replaceafter' ), $link );
 		}
 	}
 
-	# Make the list into text...
-
-	$creds = $wgLang->listToText($fulllist);
-
-	# "Based on work by ..."
-
-	return (empty($creds)) ? '' : wfMsg('othercontribs', $creds);
-}
-
-/**
- *
- */
-function creditLink($user_name, $link_text = '') {
-	global $wgUser, $wgContLang;
-	$skin = $wgUser->getSkin();
-	return $skin->makeLink($wgContLang->getNsText(NS_USER) . ':' . $user_name,
-			       htmlspecialchars( (empty($link_text)) ? $user_name : $link_text ));
-}
-
-/**
- *
- */
-function creditOthersLink($article) {
-	global $wgUser;
-	$skin = $wgUser->getSkin();
-	return $skin->makeKnownLink($article->mTitle->getPrefixedText(), wfMsg('others'), 'action=credits');
-}
+	/**
+	 * Get a link to action=credits of $article page
+	 * @param $article Article object
+	 * @return String: html
+	 */
+	protected static function othersLink( Article $article ) {
+		global $wgUser;
+		$skin = $wgUser->getSkin();
+		return $skin->link( $article->getTitle(), wfMsgHtml( 'others' ), array(), array( 'action' => 'credits' ), array( 'known' ) );
+	}
+}
\ No newline at end of file
diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php
index ad6e7f6c..52e9a8c8 100644
--- a/includes/DatabaseFunctions.php
+++ b/includes/DatabaseFunctions.php
@@ -154,6 +154,7 @@ function wfFieldName( $res, $n, $dbi = DB_LAST )
 
 /**
  * @todo document function
+ * @see Database::insertId()
  */
 function wfInsertId( $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -166,6 +167,7 @@ function wfInsertId( $dbi = DB_LAST ) {
 
 /**
  * @todo document function
+ * @see Database::dataSeek()
  */
 function wfDataSeek( $res, $row, $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -177,7 +179,8 @@ function wfDataSeek( $res, $row, $dbi = DB_LAST ) {
 }
 
 /**
- * @todo document function
+ * Get the last error number
+ * @see Database::lastErrno()
  */
 function wfLastErrno( $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -189,7 +192,8 @@ function wfLastErrno( $dbi = DB_LAST ) {
 }
 
 /**
- * @todo document function
+ * Get the last error
+ * @see Database::lastError()
  */
 function wfLastError( $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -201,7 +205,8 @@ function wfLastError( $dbi = DB_LAST ) {
 }
 
 /**
- * @todo document function
+ * Get the number of affected rows
+ * @see Database::affectedRows()
  */
 function wfAffectedRows( $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -213,7 +218,8 @@ function wfAffectedRows( $dbi = DB_LAST ) {
 }
 
 /**
- * @todo document function
+ * Get the last query ran
+ * @see Database::lastQuery
  */
 function wfLastDBquery( $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -245,8 +251,8 @@ function wfSetSQL( $table, $var, $value, $cond, $dbi = DB_MASTER )
 
 
 /**
+ * Simple select wrapper, return one field
  * @see Database::selectField()
- * @todo document function
  * @param $table
  * @param $var
  * @param $cond Default ''
@@ -263,8 +269,8 @@ function wfGetSQL( $table, $var, $cond='', $dbi = DB_LAST )
 }
 
 /**
+ * Does a given field exist on the specified table?
  * @see Database::fieldExists()
- * @todo document function
  * @param $table
  * @param $field
  * @param $dbi Default DB_LAST
@@ -280,8 +286,8 @@ function wfFieldExists( $table, $field, $dbi = DB_LAST ) {
 }
 
 /**
+ * Does the requested index exist on the specified table?
  * @see Database::indexExists()
- * @todo document function
  * @param $table String
  * @param $index
  * @param $dbi Default DB_LAST
@@ -354,7 +360,8 @@ function wfUpdateArray( $table, $values, $conds, $fname = 'wfUpdateArray', $dbi
 }
 
 /**
- * @todo document function
+ * Get fully usable table name
+ * @see Database::tableName()
  */
 function wfTableName( $name, $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -367,6 +374,7 @@ function wfTableName( $name, $dbi = DB_LAST ) {
 
 /**
  * @todo document function
+ * @see Database::strencode()
  */
 function wfStrencode( $s, $dbi = DB_LAST ) {
 	$db = wfGetDB( $dbi );
@@ -379,6 +387,7 @@ function wfStrencode( $s, $dbi = DB_LAST ) {
 
 /**
  * @todo document function
+ * @see Database::nextSequenceValue()
  */
 function wfNextSequenceValue( $seqName, $dbi = DB_MASTER ) {
 	$db = wfGetDB( $dbi );
@@ -391,6 +400,7 @@ function wfNextSequenceValue( $seqName, $dbi = DB_MASTER ) {
 
 /**
  * @todo document function
+ * @see Database::useIndexClause()
  */
 function wfUseIndexClause( $index, $dbi = DB_SLAVE ) {
 	$db = wfGetDB( $dbi );
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index aaf934f5..ed68fe7a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -27,11 +27,13 @@ if( !defined( 'MEDIAWIKI' ) ) {
  * Create a site configuration object
  * Not used for much in a default install
  */
-require_once( "$IP/includes/SiteConfiguration.php" );
-$wgConf = new SiteConfiguration;
+if ( !defined( 'MW_PHP4' ) ) {
+	require_once( "$IP/includes/SiteConfiguration.php" );
+	$wgConf = new SiteConfiguration;
+}
 
 /** MediaWiki version number */
-$wgVersion			= '1.13.4';
+$wgVersion			= '1.14.0';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
@@ -539,10 +541,10 @@ $wgSMTP				= false;
  */
 /** database host name or ip address */
 $wgDBserver         = 'localhost';
-/** database port number */
-$wgDBport           = '';
+/** database port number (for PostgreSQL) */
+$wgDBport           = 5432;
 /** name of the database */
-$wgDBname           = 'wikidb';
+$wgDBname           = 'my_wiki';
 /** */
 $wgDBconnection     = '';
 /** Database username */
@@ -572,6 +574,12 @@ $wgDBts2schema      = 'public';
 /** To override default SQLite data directory ($docroot/../data) */
 $wgSQLiteDataDir    = '';
 
+/** Default directory mode for SQLite data directory on creation.
+ *  Note that this is different from the default directory mode used
+ *  elsewhere.
+ */
+$wgSQLiteDataDirMode = 0700;
+
 /**
  * Make all database connections secretly go to localhost. Fool the load balancer
  * thinking there is an arbitrarily large cluster of servers to connect to.
@@ -672,14 +680,6 @@ $wgDBClusterTimeout = 10;
  */
 $wgDBAvgStatusPoll = 2000;
 
-/**
- * wgDBminWordLen :
- * MySQL 3.x : used to discard words that MySQL will not return any results for
- * shorter values configure mysql directly.
- * MySQL 4.x : ignore it and configure mySQL
- * See: http://dev.mysql.com/doc/mysql/en/Fulltext_Fine-tuning.html
- */
-$wgDBminWordLen     = 4;
 /** Set to true if using InnoDB tables */
 $wgDBtransactions	= false;
 /** Set to true for compatibility with extensions that might be checking.
@@ -745,12 +745,6 @@ $wgLocalMessageCache = false;
  */
 $wgLocalMessageCacheSerialized = true;
 
-/**
- * Directory for compiled constant message array databases
- * WARNING: turning anything on will just break things, aaaaaah!!!!
- */
-$wgCachedMessageArrays = false;
-
 # Language settings
 #
 /** Site language code, should be one of ./languages/Language(.*).php */
@@ -844,7 +838,6 @@ $wgTranslateNumerals = true;
 
 /**
  * Translation using MediaWiki: namespace.
- * This will increase load times by 25-60% unless memcached is installed.
  * Interface messages will be loaded from the database.
  */
 $wgUseDatabaseMessages = true;
@@ -860,6 +853,14 @@ $wgMsgCacheExpiry	= 86400;
 $wgMaxMsgCacheEntrySize = 10000;
 
 /**
+ * If true, serialized versions of the messages arrays will be
+ * read from the 'serialized' subdirectory if they are present.
+ * Set to false to always use the Messages files, regardless of
+ * whether they are up to date or not.
+ */
+$wgEnableSerializedMessages = true;
+
+/**
  * Set to false if you are thorough system admin who always remembers to keep
  * serialized files up to date to save few mtime calls.
  */
@@ -868,6 +869,9 @@ $wgCheckSerialized = true;
 /** Whether to enable language variant conversion. */
 $wgDisableLangConversion = false;
 
+/** Whether to enable language variant conversion for links. */
+$wgDisableTitleConversion = false;
+
 /** Default variant code, if false, the default will be the language code */
 $wgDefaultLanguageVariant = false;
 
@@ -947,26 +951,68 @@ $wgMaxPPNodeCount = 1000000;  # A complexity limit on template expansion
 $wgMaxTemplateDepth = 40;
 $wgMaxPPExpandDepth = 40;
 
+/**
+ * If true, removes (substitutes) templates in "~~~~" signatures.
+ */
+$wgCleanSignatures = true;
+
 $wgExtraSubtitle	= '';
 $wgSiteSupportPage	= ''; # A page where you users can receive donations
 
+/**
+ * Set this to a string to put the wiki into read-only mode. The text will be 
+ * used as an explanation to users. 
+ *
+ * This prevents most write operations via the web interface. Cache updates may 
+ * still be possible. To prevent database writes completely, use the read_only 
+ * option in MySQL.
+ */
+$wgReadOnly             = null;
+
 /***
- * If this lock file exists, the wiki will be forced into read-only mode.
+ * If this lock file exists (size > 0), the wiki will be forced into read-only mode.
  * Its contents will be shown to users as part of the read-only warning
  * message.
  */
 $wgReadOnlyFile         = false; ///< defaults to "{$wgUploadDirectory}/lock_yBgMBwiR";
 
 /**
+ * Filename for debug logging. 
  * The debug log file should be not be publicly accessible if it is used, as it
- * may contain private data. */
+ * may contain private data. 
+ */
 $wgDebugLogFile         = '';
 
+/**
+ * Prefix for debug log lines
+ */
+$wgDebugLogPrefix       = '';
+
+/**
+ * If true, instead of redirecting, show a page with a link to the redirect 
+ * destination. This allows for the inspection of PHP error messages, and easy
+ * resubmission of form data. For developer use only.
+ */
 $wgDebugRedirects		= false;
-$wgDebugRawPage         = false; # Avoid overlapping debug entries by leaving out CSS
 
+/**
+ * If true, log debugging data from action=raw. 
+ * This is normally false to avoid overlapping debug entries due to gen=css and
+ * gen=js requests.
+ */
+$wgDebugRawPage         = false;
+
+/**
+ * Send debug data to an HTML comment in the output.
+ *
+ * This may occasionally be useful when supporting a non-technical end-user. It's
+ * more secure than exposing the debug log file to the web, since the output only
+ * contains private data for the current user. But it's not ideal for development 
+ * use since data is lost on fatal errors and redirects.
+ */
 $wgDebugComments        = false;
-$wgReadOnly             = null;
+
+/** Does nothing. Obsolete? */
 $wgLogQueries           = false;
 
 /**
@@ -1025,11 +1071,18 @@ $wgUseCategoryBrowser   = false;
  * same options.
  *
  * This can provide a significant speedup for medium to large pages,
- * so you probably want to keep it on.
+ * so you probably want to keep it on. Extensions that conflict with the 
+ * parser cache should disable the cache on a per-page basis instead.
  */
 $wgEnableParserCache = true;
 
 /**
+ * Append a configured value to the parser cache and the sitenotice key so
+ * that they can be kept separate for some class of activity.
+ */
+$wgRenderHashAppend = '';
+
+/**
  * If on, the sidebar navigation links are cached for users with the
  * current language set. This can save a touch of load on a busy site
  * by shaving off extra message lookups.
@@ -1070,7 +1123,7 @@ $wgHitcounterUpdateFreq = 1;
 $wgSysopUserBans        = true; # Allow sysops to ban logged-in users
 $wgSysopRangeBans       = true; # Allow sysops to ban IP ranges
 $wgAutoblockExpiry      = 86400; # Number of seconds before autoblock entries expire
-$wgBlockAllowsUTEdit    = false; # Blocks allow users to edit their own user talk page
+$wgBlockAllowsUTEdit    = false; # Default setting for option on block form to allow self talkpage editing whilst blocked
 $wgSysopEmailBans       = true; # Allow sysops to ban users from accessing Emailuser
 
 # Pages anonymous user may see as an array, e.g.:
@@ -1110,40 +1163,42 @@ $wgEmailConfirmToEdit=false;
 $wgGroupPermissions = array();
 
 // Implicit group for all visitors
-$wgGroupPermissions['*'    ]['createaccount']    = true;
-$wgGroupPermissions['*'    ]['read']             = true;
-$wgGroupPermissions['*'    ]['edit']             = true;
-$wgGroupPermissions['*'    ]['createpage']       = true;
-$wgGroupPermissions['*'    ]['createtalk']       = true;
-$wgGroupPermissions['*'    ]['writeapi']         = true;
+$wgGroupPermissions['*']['createaccount']    = true;
+$wgGroupPermissions['*']['read']             = true;
+$wgGroupPermissions['*']['edit']             = true;
+$wgGroupPermissions['*']['createpage']       = true;
+$wgGroupPermissions['*']['createtalk']       = true;
+$wgGroupPermissions['*']['writeapi']         = true;
 
 // Implicit group for all logged-in accounts
-$wgGroupPermissions['user' ]['move']             = true;
-$wgGroupPermissions['user' ]['move-subpages']    = true;
-$wgGroupPermissions['user' ]['read']             = true;
-$wgGroupPermissions['user' ]['edit']             = true;
-$wgGroupPermissions['user' ]['createpage']       = true;
-$wgGroupPermissions['user' ]['createtalk']       = true;
-$wgGroupPermissions['user' ]['writeapi']         = true;
-$wgGroupPermissions['user' ]['upload']           = true;
-$wgGroupPermissions['user' ]['reupload']         = true;
-$wgGroupPermissions['user' ]['reupload-shared']  = true;
-$wgGroupPermissions['user' ]['minoredit']        = true;
-$wgGroupPermissions['user' ]['purge']            = true; // can use ?action=purge without clicking "ok"
+$wgGroupPermissions['user']['move']             = true;
+$wgGroupPermissions['user']['move-subpages']    = true;
+$wgGroupPermissions['user']['move-rootuserpages'] = true; // can move root userpages
+//$wgGroupPermissions['user']['movefile']         = true;	// Disabled for now due to possible bugs and security concerns
+$wgGroupPermissions['user']['read']             = true;
+$wgGroupPermissions['user']['edit']             = true;
+$wgGroupPermissions['user']['createpage']       = true;
+$wgGroupPermissions['user']['createtalk']       = true;
+$wgGroupPermissions['user']['writeapi']         = true;
+$wgGroupPermissions['user']['upload']           = true;
+$wgGroupPermissions['user']['reupload']         = true;
+$wgGroupPermissions['user']['reupload-shared']  = true;
+$wgGroupPermissions['user']['minoredit']        = true;
+$wgGroupPermissions['user']['purge']            = true; // can use ?action=purge without clicking "ok"
 
 // Implicit group for accounts that pass $wgAutoConfirmAge
 $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true;
 
 // Users with bot privilege can have their edits hidden
 // from various log pages by default
-$wgGroupPermissions['bot'  ]['bot']              = true;
-$wgGroupPermissions['bot'  ]['autoconfirmed']    = true;
-$wgGroupPermissions['bot'  ]['nominornewtalk']   = true;
-$wgGroupPermissions['bot'  ]['autopatrol']       = true;
-$wgGroupPermissions['bot'  ]['suppressredirect'] = true;
-$wgGroupPermissions['bot'  ]['apihighlimits']    = true;
-$wgGroupPermissions['bot'  ]['writeapi']         = true;
-#$wgGroupPermissions['bot'  ]['editprotected']    = true; // can edit all protected pages without cascade protection enabled
+$wgGroupPermissions['bot']['bot']              = true;
+$wgGroupPermissions['bot']['autoconfirmed']    = true;
+$wgGroupPermissions['bot']['nominornewtalk']   = true;
+$wgGroupPermissions['bot']['autopatrol']       = true;
+$wgGroupPermissions['bot']['suppressredirect'] = true;
+$wgGroupPermissions['bot']['apihighlimits']    = true;
+$wgGroupPermissions['bot']['writeapi']         = true;
+#$wgGroupPermissions['bot']['editprotected']    = true; // can edit all protected pages without cascade protection enabled
 
 // Most extra permission abilities go to this group
 $wgGroupPermissions['sysop']['block']            = true;
@@ -1158,6 +1213,7 @@ $wgGroupPermissions['sysop']['import']           = true;
 $wgGroupPermissions['sysop']['importupload']     = true;
 $wgGroupPermissions['sysop']['move']             = true;
 $wgGroupPermissions['sysop']['move-subpages']    = true;
+$wgGroupPermissions['sysop']['move-rootuserpages'] = true;
 $wgGroupPermissions['sysop']['patrol']           = true;
 $wgGroupPermissions['sysop']['autopatrol']       = true;
 $wgGroupPermissions['sysop']['protect']          = true;
@@ -1173,10 +1229,10 @@ $wgGroupPermissions['sysop']['upload_by_url']    = true;
 $wgGroupPermissions['sysop']['ipblock-exempt']   = true;
 $wgGroupPermissions['sysop']['blockemail']       = true;
 $wgGroupPermissions['sysop']['markbotedits']     = true;
-$wgGroupPermissions['sysop']['suppressredirect'] = true;
 $wgGroupPermissions['sysop']['apihighlimits']    = true;
 $wgGroupPermissions['sysop']['browsearchive']    = true;
 $wgGroupPermissions['sysop']['noratelimit']      = true;
+$wgGroupPermissions['sysop']['movefile']         = true;
 #$wgGroupPermissions['sysop']['mergehistory']     = true;
 
 // Permission to change users' group assignments
@@ -1208,8 +1264,22 @@ $wgGroupPermissions['bureaucrat']['noratelimit'] = true;
 $wgImplicitGroups = array( '*', 'user', 'autoconfirmed' );
 
 /**
- * These are the groups that users are allowed to add to or remove from
- * their own account via Special:Userrights.
+ * A map of group names that the user is in, to group names that those users
+ * are allowed to add or revoke.
+ *
+ * Setting the list of groups to add or revoke to true is equivalent to "any group".
+ * 
+ * For example, to allow sysops to add themselves to the "bot" group:
+ *
+ *    $wgGroupsAddToSelf = array( 'sysop' => array( 'bot' ) );
+ *
+ * Implicit groups may be used for the source group, for instance:
+ *
+ *    $wgGroupsRemoveFromSelf = array( '*' => true );
+ *
+ * This allows users in the '*' group (i.e. any user) to remove themselves from
+ * any group that they happen to be in.
+ * 
  */
 $wgGroupsAddToSelf = array();
 $wgGroupsRemoveFromSelf = array();
@@ -1237,9 +1307,10 @@ $wgRestrictionLevels = array( '', 'autoconfirmed', 'sysop' );
  * Set the minimum permissions required to edit pages in each
  * namespace.  If you list more than one permission, a user must
  * have all of them to edit pages in that namespace.
+ *
+ * Note: NS_MEDIAWIKI is implicitly restricted to editinterface.
  */
 $wgNamespaceProtection = array();
-$wgNamespaceProtection[ NS_MEDIAWIKI ] = array( 'editinterface' );
 
 /**
  * Pages in namespaces in this array can not be used as templates.
@@ -1303,8 +1374,8 @@ $wgAutopromote = array(
  * // Sysops can disable other sysops in an emergency, and disable bots
  * $wgRemoveGroups['sysop'] = array( 'sysop', 'bot' );
  */
-$wgAddGroups = $wgRemoveGroups = array();
-
+$wgAddGroups = array();
+$wgRemoveGroups = array();
 
 /**
  * A list of available rights, in addition to the ones defined by the core.
@@ -1375,7 +1446,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '164';
+$wgStyleVersion = '195';
 
 
 # Server-side caching:
@@ -1439,6 +1510,9 @@ $wgEnotifMaxRecips = 500;
 # Send mails via the job queue.
 $wgEnotifUseJobQ = false;
 
+# Use real name instead of username in e-mail "from" field
+$wgEnotifUseRealName = false;
+
 /**
  * Array of usernames who will be sent a notification email for every change which occurs on a wiki
  */
@@ -1456,14 +1530,17 @@ $wgRCShowChangedSize				= true;
  * before and after the edit is below that value, the value will be
  * highlighted on the RC page.
  */
-$wgRCChangedSizeThreshold			= -500;
+$wgRCChangedSizeThreshold			= 500;
 
 /**
  * Show "Updated (since my last visit)" marker in RC view, watchlist and history
  * view for watched pages with new changes */
 $wgShowUpdatedMarker 				= true;
 
-$wgCookieExpiration = 2592000;
+/**
+ * Default cookie expiration time. Setting to 0 makes all cookies session-only.
+ */
+$wgCookieExpiration = 30*86400;
 
 /** Clock skew or the one-second resolution of time() can occasionally cause cache
  * problems when the user requests two pages within a short period of time. This
@@ -1523,6 +1600,9 @@ $wgHTCPMulticastTTL = 1;
 # $wgHTCPMulticastAddress = "224.0.0.85";
 $wgHTCPMulticastAddress = false;
 
+/** Should forwarded Private IPs be accepted? */
+$wgUsePrivateIPs = false;
+
 # Cookie settings:
 #
 /**
@@ -1572,14 +1652,26 @@ $wgAllowExternalImages = false;
 /** If the above is false, you can specify an exception here. Image URLs
   * that start with this string are then rendered, while all others are not.
   * You can use this to set up a trusted, simple repository of images.
+  * You may also specify an array of strings to allow multiple sites
   *
-  * Example:
+  * Examples:
   * $wgAllowExternalImagesFrom = 'http://127.0.0.1/';
+  * $wgAllowExternalImagesFrom = array( 'http://127.0.0.1/', 'http://example.com' );
   */
 $wgAllowExternalImagesFrom = '';
 
-/** Allows to move images and other media files. Experemintal, not sure if it always works */
-$wgAllowImageMoving = false;
+/** If $wgAllowExternalImages is false, you can allow an on-wiki
+ * whitelist of regular expression fragments to match the image URL
+ * against. If the image matches one of the regular expression fragments,
+ * The image will be displayed.
+ *
+ * Set this to true to enable the on-wiki whitelist (MediaWiki:External image whitelist)
+ * Or false to disable it
+ */
+$wgEnableImageWhitelist = true;
+ 
+/** Allows to move images and other media files */
+$wgAllowImageMoving = true;
 
 /** Disable database-intensive features */
 $wgMiserMode = false;
@@ -1598,6 +1690,7 @@ $wgAllowSlowParserFunctions = false;
  */
 $wgJobClasses = array(
 	'refreshLinks' => 'RefreshLinksJob',
+	'refreshLinks2' => 'RefreshLinksJob2',
 	'htmlCacheUpdate' => 'HTMLCacheUpdateJob',
 	'html_cache_update' => 'HTMLCacheUpdateJob', // backwards-compatible
 	'sendMail' => 'EmaillingJob',
@@ -1606,6 +1699,14 @@ $wgJobClasses = array(
 );
 
 /**
+ * Additional functions to be performed with updateSpecialPages.
+ * Expensive Querypages are already updated.
+ */
+$wgSpecialPageCacheUpdates = array(
+	'Statistics' => array('SiteStatsUpdate','cacheUpdate')
+);
+
+/**
  * To use inline TeX, you need to compile 'texvc' (in the 'math' subdirectory of
  * the MediaWiki package and have latex, dvips, gs (ghostscript), andconvert
  * (ImageMagick) installed and available in the PATH.
@@ -1797,7 +1898,10 @@ $wgMimeTypeBlacklist= array(
 	# Client-side hazards on Internet Explorer
 	'text/scriptlet', 'application/x-msdownload',
 	# Windows metafile, client-side vulnerability on some systems
-	'application/x-msmetafile'
+	'application/x-msmetafile',
+	# A ZIP file may be a valid Java archive containing an applet which exploits the
+	# same-origin policy to steal cookies
+	'application/zip',
 );
 
 /** This is a flag to determine whether or not to check file extensions on upload. */
@@ -1823,7 +1927,7 @@ $wgNamespacesWithSubpages = array(
 	NS_USER           => true,
 	NS_USER_TALK      => true,
 	NS_PROJECT_TALK   => true,
-	NS_IMAGE_TALK     => true,
+	NS_FILE_TALK      => true,
 	NS_MEDIAWIKI_TALK => true,
 	NS_TEMPLATE_TALK  => true,
 	NS_HELP_TALK      => true,
@@ -1835,6 +1939,21 @@ $wgNamespacesToBeSearchedDefault = array(
 );
 
 /**
+ * Additional namespaces to those in $wgNamespacesToBeSearchedDefault that
+ * will be added to default search for "project" page inclusive searches
+ * 
+ * Same format as $wgNamespacesToBeSearchedDefault
+ */  
+$wgNamespacesToBeSearchedProject = array(
+	NS_USER           => true,
+	NS_PROJECT        => true,	
+	NS_HELP           => true,
+	NS_CATEGORY       => true,
+);
+
+$wgUseOldSearchUI = true; // temp testing variable
+
+/**
  * Site notice shown at the top of each page
  *
  * This message can contain wiki text, and can also be set through the
@@ -1883,6 +2002,12 @@ $wgSharpenParameter = '0x0.4';
 /** Reduction in linear dimensions below which sharpening will be enabled */
 $wgSharpenReductionThreshold = 0.85;
 
+/** 
+ * Temporary directory used for ImageMagick. The directory must exist. Leave 
+ * this set to false to let ImageMagick decide for itself.
+ */
+$wgImageMagickTempDir = false;
+
 /**
  * Use another resizing converter, e.g. GraphicMagick
  * %s will be replaced with the source path, %d with the destination
@@ -1900,7 +2025,7 @@ $wgCustomConvertCommand = false;
 #
 # An external program is required to perform this conversion:
 $wgSVGConverters = array(
-	'ImageMagick' => '$path/convert -background white -geometry $width $input PNG:$output',
+	'ImageMagick' => '$path/convert -background white -thumbnail $widthx$height\! $input PNG:$output',
 	'sodipodi' => '$path/sodipodi -z -w $width -f $input -e $output',
 	'inkscape' => '$path/inkscape -z -w $width -f $input -e $output',
 	'batik' => 'java -Djava.awt.headless=true -jar $path/batik-rasterizer.jar -w $width -d $output $input',
@@ -1920,6 +2045,13 @@ $wgSVGMaxSize = 2048;
  */
 $wgMaxImageArea = 1.25e7;
 /**
+ * Force thumbnailing of animated GIFs above this size to a single
+ * frame instead of an animated thumbnail. ImageMagick seems to
+ * get real unhappy and doesn't play well with resource limits. :P
+ * Defaulting to 1 megapixel (1000x1000)
+ */
+$wgMaxAnimatedGifArea = 1.0e6;
+/**
  * If rendered thumbnail files are older than this timestamp, they
  * will be rerendered on demand as if the file didn't already exist.
  * Update if there is some need to force thumbs and SVG rasterizations
@@ -1988,17 +2120,54 @@ $wgRCFilterByAge = false;
 $wgRCLinkLimits = array( 50, 100, 250, 500 );
 $wgRCLinkDays   = array( 1, 3, 7, 14, 30 );
 
-# Send RC updates via UDP
+/**
+ * Send recent changes updates via UDP. The updates will be formatted for IRC.
+ * Set this to the IP address of the receiver.
+ */
 $wgRC2UDPAddress = false;
+
+/**
+ * Port number for RC updates
+ */
 $wgRC2UDPPort = false;
+
+/**
+ * Prefix to prepend to each UDP packet.
+ * This can be used to identify the wiki. A script is available called
+ * mxircecho.py which listens on a UDP port, and uses a prefix ending in a 
+ * tab to identify the IRC channel to send the log line to.
+ */
 $wgRC2UDPPrefix = '';
+
+/**
+ * If this is set to true, $wgLocalInterwiki will be prepended to links in the 
+ * IRC feed. If this is set to a string, that string will be used as the prefix.
+ */
+$wgRC2UDPInterwikiPrefix = false;
+
+/**
+ * Set to true to omit "bot" edits (by users with the bot permission) from the 
+ * UDP feed.
+ */
 $wgRC2UDPOmitBots = false;
 
-# Enable user search in Special:Newpages
-# This is really a temporary hack around an index install bug on some Wikipedias.
-# Kill it once fixed.
+/**
+ * Enable user search in Special:Newpages
+ * This is really a temporary hack around an index install bug on some Wikipedias.
+ * Kill it once fixed.
+ */
 $wgEnableNewpagesUserFilter = true;
 
+/**
+ * Whether to use metadata edition
+ * This will put categories, language links and allowed templates in a separate text box
+ * while editing pages
+ * EXPERIMENTAL
+ */
+$wgUseMetadataEdit = false;
+/** Full name (including namespace) of the page containing templates names that will be allowed as metadata */
+$wgMetadataWhitelist = '';
+
 #
 # Copyright and credits settings
 #
@@ -2084,9 +2253,17 @@ $wgExportMaxHistory = 0;
 $wgExportAllowListContributors = false ;
 
 
-/** Text matching this regular expression will be recognised as spam
- * See http://en.wikipedia.org/wiki/Regular_expression */
-$wgSpamRegex = false;
+/**
+ * Edits matching these regular expressions in body text or edit summary
+ * will be recognised as spam and rejected automatically.
+ *
+ * There's no administrator override on-wiki, so be careful what you set. :)
+ * May be an array of regexes or a single string for backwards compatibility.
+ *
+ * See http://en.wikipedia.org/wiki/Regular_expression
+ */
+$wgSpamRegex = array();
+
 /** Similarly you can get a function to do the job. The function will be given
  * the following args:
  *   - a Title object for the article the edit is made on
@@ -2145,6 +2322,35 @@ $wgValidateAllHtml = false;
 /** See list of skins and their symbolic names in languages/Language.php */
 $wgDefaultSkin = 'monobook';
 
+/** Should we allow the user's to select their own skin that will override the default? */
+$wgAllowUserSkin = true;
+
+/**
+ * Optionally, we can specify a stylesheet to use for media="handheld".
+ * This is recognized by some, but not all, handheld/mobile/PDA browsers.
+ * If left empty, compliant handheld browsers won't pick up the skin
+ * stylesheet, which is specified for 'screen' media.
+ *
+ * Can be a complete URL, base-relative path, or $wgStylePath-relative path.
+ * Try 'chick/main.css' to apply the Chick styles to the MonoBook HTML.
+ *
+ * Will also be switched in when 'handheld=yes' is added to the URL, like
+ * the 'printable=yes' mode for print media.
+ */
+$wgHandheldStyle = false;
+
+/**
+ * If set, 'screen' and 'handheld' media specifiers for stylesheets are
+ * transformed such that they apply to the iPhone/iPod Touch Mobile Safari,
+ * which doesn't recognize 'handheld' but does support media queries on its
+ * screen size.
+ *
+ * Consider only using this if you have a *really good* handheld stylesheet,
+ * as iPhone users won't have any way to disable it and use the "grown-up"
+ * styles instead.
+ */
+$wgHandheldForIPhone = false;
+
 /**
  * Settings added to this array will override the default globals for the user
  * preferences used by anonymous visitors and newly created accounts.
@@ -2161,7 +2367,6 @@ $wgDefaultUserOptions = array(
 	'contextlines'            => 5,
 	'contextchars'            => 50,
 	'disablesuggest'          => 0,
-	'ajaxsearch'              => 0,
 	'skin'                    => false,
 	'math'                    => 1,
 	'usenewrc'                => 0,
@@ -2184,6 +2389,10 @@ $wgDefaultUserOptions = array(
 	'imagesize'               => 2,
 	'thumbsize'               => 2,
 	'rememberpassword'        => 0,
+	'nocache'                 => 0,
+	'diffonly'                => 0,
+	'showhiddencats'          => 0,
+	'norollbackdiff'          => 0,
 	'enotifwatchlistpages'    => 0,
 	'enotifusertalkpages'     => 1,
 	'enotifminoredits'        => 0,
@@ -2192,7 +2401,9 @@ $wgDefaultUserOptions = array(
 	'fancysig'                => 0,
 	'externaleditor'          => 0,
 	'externaldiff'            => 0,
+	'forceeditsummary'        => 0,
 	'showjumplinks'           => 1,
+	'justify'                 => 0,
 	'numberheadings'          => 0,
 	'uselivepreview'          => 0,
 	'watchlistdays'           => 3.0,
@@ -2200,10 +2411,13 @@ $wgDefaultUserOptions = array(
 	'watchlisthideminor'      => 0,
 	'watchlisthidebots'       => 0,
 	'watchlisthideown'        => 0,
+	'watchlisthideanons'      => 0,
+	'watchlisthideliu'        => 0,
 	'watchcreations'          => 0,
 	'watchdefault'            => 0,
 	'watchmoves'              => 0,
 	'watchdeletion'           => 0,
+	'noconvertlink'           => 0,
 );
 
 /** Whether or not to allow and use real name fields. Defaults to true. */
@@ -2290,7 +2504,7 @@ $wgAutoloadClasses = array();
  * $wgExtensionCredits[$type][] = array(
  * 	'name' => 'Example extension',
  *  'version' => 1.9,
- *  'svn-revision' => '$LastChangedRevision: 46957 $',
+ *  'svn-revision' => '$LastChangedRevision: 47653 $',
  *	'author' => 'Foo Barstein',
  *	'url' => 'http://wwww.example.com/Example%20Extension/',
  *	'description' => 'An example extension',
@@ -2337,6 +2551,9 @@ $wgMaxTocLevel = 999;
 /** Name of the external diff engine to use */
 $wgExternalDiffEngine = false;
 
+/** Whether to use inline diff */
+$wgEnableHtmlDiff = false;
+
 /** Use RC Patrolling to check for vandalism */
 $wgUseRCPatrol = true;
 
@@ -2363,6 +2580,13 @@ $wgFeedCacheTimeout = 60;
  * pages larger than this size. */
 $wgFeedDiffCutoff = 32768;
 
+/** Override the site's default RSS/ATOM feed for recentchanges that appears on
+ * every page. Some sites might have a different feed they'd like to promote
+ * instead of the RC feed (maybe like a "Recent New Articles" or "Breaking news" one).
+ * Ex: $wgSiteFeed['format'] = "http://example.com/somefeed.xml"; Format can be one
+ * of either 'rss' or 'atom'.
+ */
+$wgOverrideSiteFeed = array();
 
 /**
  * Additional namespaces. If the namespaces defined in Language.php and
@@ -2448,6 +2672,12 @@ $wgCategoryMagicGallery = true;
 $wgCategoryPagingLimit = 200;
 
 /**
+ * Should the default category sortkey be the prefixed title?
+ * Run maintenance/refreshLinks.php after changing this.
+ */
+$wgCategoryPrefixedDefaultSortkey = true;
+
+/**
  * Browser Blacklist for unicode non compliant browsers
  * Contains a list of regexps : "/regexp/"  matching problematic browsers
  */
@@ -2587,6 +2817,30 @@ $wgLogRestrictions = array(
 );
 
 /**
+ * Show/hide links on Special:Log will be shown for these log types.
+ *
+ * This is associative array of log type => boolean "hide by default"
+ *
+ * See $wgLogTypes for a list of available log types. 
+ *
+ * For example:
+ *   $wgFilterLogTypes => array(
+ *      'move' => true,
+ *      'import' => false,
+ *   );
+ *
+ * Will display show/hide links for the move and import logs. Move logs will be
+ * hidden by default unless the link is clicked. Import logs will be shown by 
+ * default, and hidden when the link is clicked.
+ *
+ * A message of the form log-show-hide-<type> should be added, and will be used
+ * for the link text.
+ */
+$wgFilterLogTypes = array(
+	'patrol' => true
+);
+
+/**
  * Lists the message key string for each log type. The localized messages
  * will be listed in the user interface.
  *
@@ -2635,9 +2889,11 @@ $wgLogHeaders = array(
 $wgLogActions = array(
 	'block/block'       => 'blocklogentry',
 	'block/unblock'     => 'unblocklogentry',
+	'block/reblock'     => 'reblock-logentry',
 	'protect/protect'   => 'protectedarticle',
 	'protect/modify'    => 'modifiedarticleprotection',
 	'protect/unprotect' => 'unprotectedarticle',
+	'protect/move_prot' => 'movedarticleprotection',
 	'rights/rights'     => 'rightslogentry',
 	'delete/delete'     => 'deletedarticle',
 	'delete/restore'    => 'undeletedarticle',
@@ -2656,6 +2912,7 @@ $wgLogActions = array(
 	'suppress/event'    => 'logdelete-logentry',
 	'suppress/delete'   => 'suppressedarticle',
 	'suppress/block'	=> 'blocklogentry',
+	'suppress/reblock'  => 'reblock-logentry',
 );
 
 /**
@@ -2665,6 +2922,11 @@ $wgLogActions = array(
 $wgLogActionsHandlers = array();
 
 /**
+ * Maintain a log of newusers at Log/newusers?
+ */
+$wgNewUserLog = true;
+
+/**
  * List of special pages, followed by what subtitle they should go under
  * at Special:SpecialPages
  */
@@ -2688,6 +2950,8 @@ $wgSpecialPageGroups = array(
 	'Deadendpages'              => 'maintenance',
 	'Wantedpages'               => 'maintenance',
 	'Wantedcategories'          => 'maintenance',
+	'Wantedfiles'               => 'maintenance',
+	'Wantedtemplates'           => 'maintenance',
 	'Unwatchedpages'            => 'maintenance',
 	'Fewestrevisions'           => 'maintenance',
 
@@ -2703,7 +2967,7 @@ $wgSpecialPageGroups = array(
 	'Log'                       => 'changes',
 
 	'Upload'                    => 'media',
-	'Imagelist'                 => 'media',
+	'Listfiles'                 => 'media',
 	'MIMEsearch'                => 'media',
 	'FileDuplicateSearch'       => 'media',
 	'Filepath'                  => 'media',
@@ -2719,6 +2983,7 @@ $wgSpecialPageGroups = array(
 	'Blockip'                   => 'users',
 	'Preferences'               => 'users',
 	'Resetpass'                 => 'users',
+	'DeletedContributions'      => 'users',
 
 	'Mostlinked'                => 'highuse',
 	'Mostlinkedcategories'      => 'highuse',
@@ -2739,6 +3004,7 @@ $wgSpecialPageGroups = array(
 	'Mytalk'                    => 'redirects',
 	'Mycontributions'           => 'redirects',
 	'Search'                    => 'redirects',
+	'LinkSearch'                => 'redirects',
 
 	'Movepage'                  => 'pagetools',
 	'MergeHistory'              => 'pagetools',
@@ -2788,6 +3054,11 @@ $wgDisableInternalSearch = false;
 $wgSearchForwardUrl = null;
 
 /**
+ * Set a default target for external links, e.g. _blank to pop up a new window
+ */
+$wgExternalLinkTarget = false;
+
+/**
  * If true, external URL links in wiki text will be given the
  * rel="nofollow" attribute as a hint to search engines that
  * they should not be followed for ranking purposes as they
@@ -2802,34 +3073,57 @@ $wgNoFollowLinks = true;
 $wgNoFollowNsExceptions = array();
 
 /**
- * Default robot policy.
- * The default policy is to encourage indexing and following of links.
- * It may be overridden on a per-namespace and/or per-page basis.
+ * Default robot policy.  The default policy is to encourage indexing and fol-
+ * lowing of links.  It may be overridden on a per-namespace and/or per-page
+ * basis.
  */
 $wgDefaultRobotPolicy = 'index,follow';
 
 /**
- * Robot policies per namespaces.
- * The default policy is given above, the array is made of namespace
- * constants as defined in includes/Defines.php
+ * Robot policies per namespaces. The default policy is given above, the array
+ * is made of namespace constants as defined in includes/Defines.php.  You can-
+ * not specify a different default policy for NS_SPECIAL: it is always noindex,
+ * nofollow.  This is because a number of special pages (e.g., ListPages) have
+ * many permutations of options that display the same data under redundant
+ * URLs, so search engine spiders risk getting lost in a maze of twisty special
+ * pages, all alike, and never reaching your actual content.
+ *
  * Example:
  *   $wgNamespaceRobotPolicies = array( NS_TALK => 'noindex' );
  */
 $wgNamespaceRobotPolicies = array();
 
 /**
- * Robot policies per article.
- * These override the per-namespace robot policies.
- * Must be in the form of an array where the key part is a properly
- * canonicalised text form title and the value is a robot policy.
+ * Robot policies per article. These override the per-namespace robot policies.
+ * Must be in the form of an array where the key part is a properly canonical-
+ * ised text form title and the value is a robot policy.
  * Example:
- *   $wgArticleRobotPolicies = array( 'Main Page' => 'noindex' );
+ *   $wgArticleRobotPolicies = array( 'Main Page' => 'noindex,follow',
+ *     'User:Bob' => 'index,follow' );
+ * Example that DOES NOT WORK because the names are not canonical text forms:
+ *   $wgArticleRobotPolicies = array(
+ *     # Underscore, not space!
+ *     'Main_Page' => 'noindex,follow',
+ *     # "Project", not the actual project name!
+ *     'Project:X' => 'index,follow',
+ *     # Needs to be "Abc", not "abc" (unless $wgCapitalLinks is false)!
+ *     'abc' => 'noindex,nofollow'
+ *   );
  */
 $wgArticleRobotPolicies = array();
 
 /**
- * Specifies the minimal length of a user password. If set to
- * 0, empty passwords are allowed.
+ * An array of namespace keys in which the __INDEX__/__NOINDEX__ magic words
+ * will not function, so users can't decide whether pages in that namespace are
+ * indexed by search engines.  If set to null, default to $wgContentNamespaces.
+ * Example:
+ *   $wgExemptFromUserRobotsControl = array( NS_MAIN, NS_TALK, NS_PROJECT );
+ */
+$wgExemptFromUserRobotsControl = null;
+
+/**
+ * Specifies the minimal length of a user password. If set to 0, empty pass-
+ * words are allowed.
  */
 $wgMinimalPasswordLength = 0;
 
@@ -2844,9 +3138,8 @@ $wgUseExternalEditor = true;
 $wgSortSpecialPages = true;
 
 /**
- * Specify the name of a skin that should not be presented in the
- * list of available skins.
- * Use for blacklisting a skin which you do not want to remove
+ * Specify the name of a skin that should not be presented in the list of a-
+ * vailable skins.  Use for blacklisting a skin which you do not want to remove
  * from the .../skins/ directory
  */
 $wgSkipSkin = '';
@@ -2858,7 +3151,8 @@ $wgSkipSkins = array(); # More of the same
 $wgDisabledActions = array();
 
 /**
- * Disable redirects to special pages and interwiki redirects, which use a 302 and have no "redirected from" link
+ * Disable redirects to special pages and interwiki redirects, which use a 302
+ * and have no "redirected from" link.
  */
 $wgDisableHardRedirects = false;
 
@@ -2869,21 +3163,19 @@ $wgEnableSorbs = false;
 $wgSorbsUrl = 'http.dnsbl.sorbs.net.';
 
 /**
- * Proxy whitelist, list of addresses that are assumed to be non-proxy despite what the other
- * methods might say
+ * Proxy whitelist, list of addresses that are assumed to be non-proxy despite
+ * what the other methods might say.
  */
 $wgProxyWhitelist = array();
 
 /**
- * Simple rate limiter options to brake edit floods.
- * Maximum number actions allowed in the given number of seconds;
- * after that the violating client receives HTTP 500 error pages
- * until the period elapses.
+ * Simple rate limiter options to brake edit floods.  Maximum number actions
+ * allowed in the given number of seconds; after that the violating client re-
+ * ceives HTTP 500 error pages until the period elapses.
  *
  * array( 4, 60 ) for a maximum of 4 hits in 60 seconds.
  *
- * This option set is experimental and likely to change.
- * Requires memcached.
+ * This option set is experimental and likely to change. Requires memcached.
  */
 $wgRateLimits = array(
 	'edit' => array(
@@ -3045,17 +3337,10 @@ $wgUpdateRowsPerQuery = 10;
 $wgUseAjax = true;
 
 /**
- * Enable auto suggestion for the search bar
- * Requires $wgUseAjax to be true too.
- * Causes wfSajaxSearch to be added to $wgAjaxExportList
- */
-$wgAjaxSearch = false;
-
-/**
  * List of Ajax-callable functions.
  * Extensions acting as Ajax callbacks must register here
  */
-$wgAjaxExportList = array( );
+$wgAjaxExportList = array( 'wfAjaxGetThumbnailUrl', 'wfAjaxGetFileUrl' );
 
 /**
  * Enable watching/unwatching pages using AJAX.
@@ -3080,6 +3365,11 @@ $wgAjaxLicensePreview = true;
 $wgAllowDisplayTitle = true;
 
 /**
+ * for consistency, restrict DISPLAYTITLE to titles that normalize to the same canonical DB key
+ */
+$wgRestrictDisplayTitle = true;
+
+/**
  * Array of usernames which may not be registered or logged in from
  * Maintenance scripts can still use these
  */
@@ -3120,6 +3410,16 @@ $wgMaxShellMemory = 102400;
 $wgMaxShellFileSize = 102400;
 
 /**
+ * Maximum CPU time in seconds for shell processes under linux
+ */
+$wgMaxShellTime = 180;
+
+/**
+* Executable name of PHP cli client (php/php5)
+*/
+$wgPhpCli = 'php';
+
+/**
  * DJVU settings
  * Path of the djvudump executable
  * Enable this and $wgDjvuRenderer to enable djvu rendering
@@ -3171,7 +3471,7 @@ $wgEnableAPI = true;
  * (page edits, rollback, etc.) when an authorised user
  * accesses it
  */
-$wgEnableWriteAPI = false;
+$wgEnableWriteAPI = true;
 
 /**
  * API module extensions
@@ -3241,8 +3541,6 @@ $wgSlaveLagCritical = 30;
  *                    If this parameter is not given, it uses Preprocessor_DOM if the
  *                    DOM module is available, otherwise it uses Preprocessor_Hash.
  *
- *                    Has no effect on Parser_OldPP.
- *
  * The entire associative array will be passed through to the constructor as
  * the first parameter. Note that only Setup.php can use this variable --
  * the configuration will change at runtime via $wgParser member functions, so
@@ -3256,6 +3554,12 @@ $wgParserConf = array(
 );
 
 /**
+ * LinkHolderArray batch size
+ * For debugging
+ */
+$wgLinkHolderBatchSize = 1000;
+
+/**
  * Hooks that are used for outputting exceptions.  Format is:
  *   $wgExceptionHooks[] = $funcname
  * or:
@@ -3290,6 +3594,12 @@ $wgExpensiveParserFunctionLimit = 100;
 $wgMaximumMovedPages = 100;
 
 /**
+ * Fix double redirects after a page move.
+ * Tends to conflict with page move vandalism, use only on a private wiki. 
+ */
+$wgFixDoubleRedirects = false;
+
+/**
  * Array of namespaces to generate a sitemap for when the
  * maintenance/generateSitemap.php script is run, or false if one is to be ge-
  * nerated for all namespaces.
@@ -3303,3 +3613,28 @@ $wgSitemapNamespaces = false;
  * ting this variable false.
  */
 $wgUseAutomaticEditSummaries = true;
+
+/**
+ * Limit password attempts to X attempts per Y seconds per IP per account.
+ * Requires memcached.
+ */
+$wgPasswordAttemptThrottle = array( 'count' => 5, 'seconds' => 300 );
+
+/**
+ * Display user edit counts in various prominent places.
+ */
+$wgEdititis = false;
+
+/**
+* Enable the UniversalEditButton for browsers that support it
+* (currently only Firefox with an extension)
+* See http://universaleditbutton.org for more background information
+*/
+$wgUniversalEditButton = true;
+
+/**
+ * Allow id's that don't conform to HTML4 backward compatibility requirements.
+ * This is currently for testing; if all goes well, this option will be removed
+ * and the functionality will be enabled universally.
+ */
+$wgEnforceHtmlIds = true;
diff --git a/includes/Defines.php b/includes/Defines.php
index 98cee57d..8de6c5a1 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -52,8 +52,8 @@ define('NS_USER', 2);
 define('NS_USER_TALK', 3);
 define('NS_PROJECT', 4);
 define('NS_PROJECT_TALK', 5);
-define('NS_IMAGE', 6);
-define('NS_IMAGE_TALK', 7);
+define('NS_FILE', 6);
+define('NS_FILE_TALK', 7);
 define('NS_MEDIAWIKI', 8);
 define('NS_MEDIAWIKI_TALK', 9);
 define('NS_TEMPLATE', 10);
@@ -62,6 +62,16 @@ define('NS_HELP', 12);
 define('NS_HELP_TALK', 13);
 define('NS_CATEGORY', 14);
 define('NS_CATEGORY_TALK', 15);
+/**
+ * NS_IMAGE and NS_IMAGE_TALK are the pre-v1.14 names for NS_FILE and
+ * NS_FILE_TALK respectively, and are kept for compatibility.
+ *
+ * When writing code that should be compatible with older MediaWiki
+ * versions, either stick to the old names or define the new constants
+ * yourself, if they're not defined already.
+ */
+define('NS_IMAGE', NS_FILE);
+define('NS_IMAGE_TALK', NS_FILE_TALK);
 /**#@-*/
 
 /**
@@ -202,6 +212,9 @@ define( 'OT_MSG' , 3 );  // b/c alias for OT_PREPROCESS
 define( 'SFH_NO_HASH', 1 );
 define( 'SFH_OBJECT_ARGS', 2 );
 
+# Flags for Parser::setLinkHook
+define( 'SLH_PATTERN', 1 );
+
 # Flags for Parser::replaceLinkHolders
 define( 'RLH_FOR_UPDATE', 1 );
 
@@ -211,3 +224,6 @@ define( 'APCOND_EDITCOUNT', 1 );
 define( 'APCOND_AGE', 2 );
 define( 'APCOND_EMAILCONFIRMED', 3 );
 define( 'APCOND_INGROUPS', 4 );
+define( 'APCOND_ISIP', 5 );
+define( 'APCOND_IPINRANGE', 6 );
+define( 'APCOND_AGE_FROM_EDIT', 7 );
diff --git a/includes/EditPage.php b/includes/EditPage.php
index a34964bc..0193dc38 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -44,6 +44,7 @@ class EditPage {
 
 	var $mArticle;
 	var $mTitle;
+	var $action;
 	var $mMetaData = '';
 	var $isConflict = false;
 	var $isCssJsSubpage = false;
@@ -61,7 +62,8 @@ class EditPage {
 	var $allowBlankSummary = false;
 	var $autoSumm = '';
 	var $hookError = '';
-	var $mPreviewTemplates;
+	#var $mPreviewTemplates;
+	var $mParserOutput;
 	var $mBaseRevision = false;
 
 	# Form values
@@ -92,6 +94,7 @@ class EditPage {
 	function EditPage( $article ) {
 		$this->mArticle =& $article;
 		$this->mTitle = $article->getTitle();
+		$this->action = 'submit';
 
 		# Placeholders for text injection by hooks (empty per default)
 		$this->editFormPageTop =
@@ -101,49 +104,47 @@ class EditPage {
 		$this->editFormTextAfterTools =
 		$this->editFormTextBottom = "";
 	}
+	
+	function getArticle() {
+		return $this->mArticle;
+	}
 
 	/**
 	 * Fetch initial editing page content.
 	 * @private
 	 */
 	function getContent( $def_text = '' ) {
-		global $wgOut, $wgRequest, $wgParser, $wgMessageCache;
+		global $wgOut, $wgRequest, $wgParser, $wgContLang, $wgMessageCache;
 
+		wfProfileIn( __METHOD__ );
 		# Get variables from query string :P
 		$section = $wgRequest->getVal( 'section' );
 		$preload = $wgRequest->getVal( 'preload' );
 		$undoafter = $wgRequest->getVal( 'undoafter' );
 		$undo = $wgRequest->getVal( 'undo' );
 
-		wfProfileIn( __METHOD__ );
-
 		$text = '';
-		if( !$this->mTitle->exists() ) {
+		// For message page not locally set, use the i18n message.
+		// For other non-existent articles, use preload text if any.
+		if ( !$this->mTitle->exists() ) {
 			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-				$wgMessageCache->loadAllMessages();
 				# If this is a system message, get the default text.
-				$text = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
+				list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) );
+				$wgMessageCache->loadAllMessages( $lang );
+				$text = wfMsgGetKey( $message, false, $lang, false );
+				if( wfEmptyMsg( $message, $text ) )
+					$text = '';
 			} else {
 				# If requested, preload some text.
 				$text = $this->getPreloadedText( $preload );
 			}
-			# We used to put MediaWiki:Newarticletext here if
-			# $text was empty at this point.
-			# This is now shown above the edit box instead.
+		// For existing pages, get text based on "undo" or section parameters.
 		} else {
-			// FIXME: may be better to use Revision class directly
-			// But don't mess with it just yet. Article knows how to
-			// fetch the page record from the high-priority server,
-			// which is needed to guarantee we don't pick up lagged
-			// information.
-
 			$text = $this->mArticle->getContent();
-
-			if ($undo > 0 && $undoafter > 0 && $undo < $undoafter) {
+			if ( $undo > 0 && $undoafter > 0 && $undo < $undoafter ) {
 				# If they got undoafter and undo round the wrong way, switch them
 				list( $undo, $undoafter ) = array( $undoafter, $undo );
 			}
-
 			if ( $undo > 0 && $undo > $undoafter ) {
 				# Undoing a specific edit overrides section editing; section-editing
 				# doesn't work with undoing.
@@ -158,7 +159,7 @@ class EditPage {
 				# Sanity check, make sure it's the right page,
 				# the revisions exist and they were not deleted.
 				# Otherwise, $text will be left as-is.
-				if( !is_null( $undorev ) && !is_null( $oldrev ) &&
+				if ( !is_null( $undorev ) && !is_null( $oldrev ) &&
 					$undorev->getPage() == $oldrev->getPage() &&
 					$undorev->getPage() == $this->mArticle->getID() &&
 					!$undorev->isDeleted( Revision::DELETED_TEXT ) &&
@@ -174,12 +175,12 @@ class EditPage {
 						$text = $oldrev_text;
 						$result = true;
 					}
-					if( $result ) {
+					if ( $result ) {
 						# Inform the user of our success and set an automatic edit summary
 						$this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-success' ) );
 						$firstrev = $oldrev->getNext();
 						# If we just undid one rev, use an autosummary
-						if( $firstrev->mId == $undo ) {
+						if ( $firstrev->mId == $undo ) {
 							$this->summary = wfMsgForContent('undo-summary', $undo, $undorev->getUserText());
 						}
 						$this->formtype = 'diff';
@@ -193,8 +194,8 @@ class EditPage {
 					// was created, or we may simply have got bogus input.
 					$this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-norev' ) );
 				}
-			} else if( $section != '' ) {
-				if( $section == 'new' ) {
+			} else if ( $section != '' ) {
+				if ( $section == 'new' ) {
 					$text = $this->getPreloadedText( $preload );
 				} else {
 					$text = $wgParser->getSection( $text, $section, $def_text );
@@ -212,13 +213,13 @@ class EditPage {
 	 * @param $preload String: the title of the page.
 	 * @return string The contents of the page.
 	 */
-	protected function getPreloadedText($preload) {
-		if ( $preload === '' )
+	protected function getPreloadedText( $preload ) {
+		if ( $preload === '' ) {
 			return '';
-		else {
+		} else {
 			$preloadTitle = Title::newFromText( $preload );
 			if ( isset( $preloadTitle ) && $preloadTitle->userCanRead() ) {
-				$rev=Revision::newFromTitle($preloadTitle);
+				$rev = Revision::newFromTitle($preloadTitle);
 				if ( is_object( $rev ) ) {
 					$text = $rev->getText();
 					// TODO FIXME: AAAAAAAAAAA, this shouldn't be implementing
@@ -237,107 +238,103 @@ class EditPage {
 	 *  and set $wgMetadataWhitelist to the *full* title of the template whitelist
 	 */
 	function extractMetaDataFromArticle () {
-		global $wgUseMetadataEdit , $wgMetadataWhitelist , $wgLang ;
-		$this->mMetaData = '' ;
-		if ( !$wgUseMetadataEdit ) return ;
-		if ( $wgMetadataWhitelist == '' ) return ;
-		$s = '' ;
+		global $wgUseMetadataEdit, $wgMetadataWhitelist, $wgContLang;
+		$this->mMetaData = '';
+		if ( !$wgUseMetadataEdit ) return;
+		if ( $wgMetadataWhitelist == '' ) return;
+		$s = '';
 		$t = $this->getContent();
 
 		# MISSING : <nowiki> filtering
 
 		# Categories and language links
-		$t = explode ( "\n" , $t ) ;
-		$catlow = strtolower ( $wgLang->getNsText ( NS_CATEGORY ) ) ;
-		$cat = $ll = array() ;
-		foreach ( $t AS $key => $x )
-		{
-			$y = trim ( strtolower ( $x ) ) ;
-			while ( substr ( $y , 0 , 2 ) == '[[' )
-			{
-				$y = explode ( ']]' , trim ( $x ) ) ;
-				$first = array_shift ( $y ) ;
-				$first = explode ( ':' , $first ) ;
-				$ns = array_shift ( $first ) ;
-				$ns = trim ( str_replace ( '[' , '' , $ns ) ) ;
-				if ( strlen ( $ns ) == 2 OR strtolower ( $ns ) == $catlow )
-				{
-					$add = '[[' . $ns . ':' . implode ( ':' , $first ) . ']]' ;
-					if ( strtolower ( $ns ) == $catlow ) $cat[] = $add ;
-					else $ll[] = $add ;
-					$x = implode ( ']]' , $y ) ;
-					$t[$key] = $x ;
-					$y = trim ( strtolower ( $x ) ) ;
+		$t = explode ( "\n" , $t );
+		$catlow = strtolower ( $wgContLang->getNsText( NS_CATEGORY ) );
+		$cat = $ll = array();
+		foreach ( $t AS $key => $x ) {
+			$y = trim ( strtolower ( $x ) );
+			while ( substr ( $y , 0 , 2 ) == '[[' ) {
+				$y = explode ( ']]' , trim ( $x ) );
+				$first = array_shift ( $y );
+				$first = explode ( ':' , $first );
+				$ns = array_shift ( $first );
+				$ns = trim ( str_replace ( '[' , '' , $ns ) );
+				if ( $wgContLang->getLanguageName( $ns ) || strtolower ( $ns ) == $catlow ) {
+					$add = '[[' . $ns . ':' . implode ( ':' , $first ) . ']]';
+					if ( strtolower ( $ns ) == $catlow ) $cat[] = $add;
+					else $ll[] = $add;
+					$x = implode ( ']]' , $y );
+					$t[$key] = $x;
+					$y = trim ( strtolower ( $x ) );
+				} else {
+					$x = implode ( ']]' , $y );
+					$y = trim ( strtolower ( $x ) );
 				}
 			}
 		}
-		if ( count ( $cat ) ) $s .= implode ( ' ' , $cat ) . "\n" ;
-		if ( count ( $ll ) ) $s .= implode ( ' ' , $ll ) . "\n" ;
-		$t = implode ( "\n" , $t ) ;
+		if ( count ( $cat ) ) $s .= implode ( ' ' , $cat ) . "\n";
+		if ( count ( $ll ) ) $s .= implode ( ' ' , $ll ) . "\n";
+		$t = implode ( "\n" , $t );
 
 		# Load whitelist
 		$sat = array () ; # stand-alone-templates; must be lowercase
-		$wl_title = Title::newFromText ( $wgMetadataWhitelist ) ;
-		$wl_article = new Article ( $wl_title ) ;
-		$wl = explode ( "\n" , $wl_article->getContent() ) ;
-		foreach ( $wl AS $x )
-		{
-			$isentry = false ;
-			$x = trim ( $x ) ;
-			while ( substr ( $x , 0 , 1 ) == '*' )
-			{
-				$isentry = true ;
-				$x = trim ( substr ( $x , 1 ) ) ;
+		$wl_title = Title::newFromText ( $wgMetadataWhitelist );
+		$wl_article = new Article ( $wl_title );
+		$wl = explode ( "\n" , $wl_article->getContent() );
+		foreach ( $wl AS $x ) {
+			$isentry = false;
+			$x = trim ( $x );
+			while ( substr ( $x , 0 , 1 ) == '*' ) {
+				$isentry = true;
+				$x = trim ( substr ( $x , 1 ) );
 			}
-			if ( $isentry )
-			{
-				$sat[] = strtolower ( $x ) ;
+			if ( $isentry ) {
+				$sat[] = strtolower ( $x );
 			}
 
 		}
 
 		# Templates, but only some
-		$t = explode ( '{{' , $t ) ;
+		$t = explode ( '{{' , $t );
 		$tl = array () ;
-		foreach ( $t AS $key => $x )
-		{
-			$y = explode ( '}}' , $x , 2 ) ;
-			if ( count ( $y ) == 2 )
-			{
-				$z = $y[0] ;
-				$z = explode ( '|' , $z ) ;
-				$tn = array_shift ( $z ) ;
-				if ( in_array ( strtolower ( $tn ) , $sat ) )
-				{
-					$tl[] = '{{' . $y[0] . '}}' ;
-					$t[$key] = $y[1] ;
-					$y = explode ( '}}' , $y[1] , 2 ) ;
+		foreach ( $t AS $key => $x ) {
+			$y = explode ( '}}' , $x , 2 );
+			if ( count ( $y ) == 2 ) {
+				$z = $y[0];
+				$z = explode ( '|' , $z );
+				$tn = array_shift ( $z );
+				if ( in_array ( strtolower ( $tn ) , $sat ) ) {
+					$tl[] = '{{' . $y[0] . '}}';
+					$t[$key] = $y[1];
+					$y = explode ( '}}' , $y[1] , 2 );
 				}
-				else $t[$key] = '{{' . $x ;
+				else $t[$key] = '{{' . $x;
 			}
-			else if ( $key != 0 ) $t[$key] = '{{' . $x ;
-			else $t[$key] = $x ;
+			else if ( $key != 0 ) $t[$key] = '{{' . $x;
+			else $t[$key] = $x;
 		}
-		if ( count ( $tl ) ) $s .= implode ( ' ' , $tl ) ;
-		$t = implode ( '' , $t ) ;
+		if ( count ( $tl ) ) $s .= implode ( ' ' , $tl );
+		$t = implode ( '' , $t );
 
-		$t = str_replace ( "\n\n\n" , "\n" , $t ) ;
-		$this->mArticle->mContent = $t ;
-		$this->mMetaData = $s ;
+		$t = str_replace ( "\n\n\n" , "\n" , $t );
+		$this->mArticle->mContent = $t;
+		$this->mMetaData = $s;
 	}
 
+	/* 
+	 * Check if a page was deleted while the user was editing it, before submit.
+	 * Note that we rely on the logging table, which hasn't been always there,
+	 * but that doesn't matter, because this only applies to brand new
+	 * deletes.
+	 */
 	protected function wasDeletedSinceLastEdit() {
-		/* Note that we rely on the logging table, which hasn't been always there,
-		 * but that doesn't matter, because this only applies to brand new
-		 * deletes.
-		 */
 		if ( $this->deletedSinceEdit )
 			return true;
 		if ( $this->mTitle->isDeleted() ) {
 			$this->lastDelete = $this->getLastDelete();
-			if ( !is_null($this->lastDelete) ) {
-				$deletetime = $this->lastDelete->log_timestamp;
-				if ( ($deletetime - $this->starttime) > 0 ) {
+			if ( $this->lastDelete ) {
+				$deleteTime = wfTimestamp( TS_MW, $this->lastDelete->log_timestamp );
+				if ( $deleteTime > $this->starttime ) {
 					$this->deletedSinceEdit = true;
 				}
 			}
@@ -362,61 +359,34 @@ class EditPage {
 	 */
 	function edit() {
 		global $wgOut, $wgUser, $wgRequest;
-
-		if ( !wfRunHooks( 'AlternateEdit', array( &$this ) ) )
+		// Allow extensions to modify/prevent this form or submission
+		if ( !wfRunHooks( 'AlternateEdit', array( &$this ) ) ) {
 			return;
+		}
 
 		wfProfileIn( __METHOD__ );
 		wfDebug( __METHOD__.": enter\n" );
 
-		// this is not an article
-		$wgOut->setArticleFlag(false);
+		// This is not an article
+		$wgOut->setArticleFlag( false );
 
 		$this->importFormData( $wgRequest );
 		$this->firsttime = false;
 
-		if( $this->live ) {
+		if ( $this->live ) {
 			$this->livePreview();
 			wfProfileOut( __METHOD__ );
 			return;
 		}
-		
-		$wgOut->addScriptFile( 'edit.js' );
-
-		if( wfReadOnly() ) {
-			$this->readOnlyPage( $this->getContent() );
-			wfProfileOut( __METHOD__ );
-			return;
-		}
 
-		$permErrors = $this->mTitle->getUserPermissionsErrors('edit', $wgUser);
-		
-		if( !$this->mTitle->exists() ) {
-			$permErrors = array_merge( $permErrors,
-				wfArrayDiff2( $this->mTitle->getUserPermissionsErrors('create', $wgUser), $permErrors ) );
+		if ( wfReadOnly() && $this->save ) {
+				// Force preview
+				$this->save = false;
+				$this->preview = true;
 		}
 
-		# Ignore some permissions errors.
-		$remove = array();
-		foreach( $permErrors as $error ) {
-			if ( ( $this->preview || $this->diff ) &&
-				($error[0] == 'blockedtext' || $error[0] == 'autoblockedtext'))
-			{
-				// Don't worry about blocks when previewing/diffing
-				$remove[] = $error;
-			}
-
-			if ($error[0] == 'readonlytext')
-			{
-				if ($this->edit) {
-					$this->formtype = 'preview';
-				} elseif ($this->save || $this->preview || $this->diff) {
-					$remove[] = $error;
-				}
-			}
-		}
-		$permErrors = wfArrayDiff2( $permErrors, $remove );
-		
+		$wgOut->addScriptFile( 'edit.js' );
+		$permErrors = $this->getEditPermissionErrors();
 		if ( $permErrors ) {
 			wfDebug( __METHOD__.": User can't edit\n" );
 			$this->readOnlyPage( $this->getContent(), true, $permErrors, 'edit' );
@@ -431,7 +401,7 @@ class EditPage {
 				$this->formtype = 'diff';
 			} else { # First time through
 				$this->firsttime = true;
-				if( $this->previewOnOpen() ) {
+				if ( $this->previewOnOpen() ) {
 					$this->formtype = 'preview';
 				} else {
 					$this->extractMetaDataFromArticle () ;
@@ -448,13 +418,32 @@ class EditPage {
 		$this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage();
 
 		# Show applicable editing introductions
-		if( $this->formtype == 'initial' || $this->firsttime )
+		if ( $this->formtype == 'initial' || $this->firsttime )
 			$this->showIntro();
 
-		if( $this->mTitle->isTalkPage() ) {
+		if ( $this->mTitle->isTalkPage() ) {
 			$wgOut->addWikiMsg( 'talkpagetext' );
 		}
 
+		# Optional notices on a per-namespace and per-page basis
+		$editnotice_ns   = 'editnotice-'.$this->mTitle->getNamespace();
+		$editnotice_page = $editnotice_ns.'-'.$this->mTitle->getDBkey();
+		if ( !wfEmptyMsg( $editnotice_ns, wfMsgForContent( $editnotice_ns ) ) ) {
+			$wgOut->addWikiText( wfMsgForContent( $editnotice_ns )  );
+		}
+		if ( MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
+			$parts = explode( '/', $this->mTitle->getDBkey() );
+			$editnotice_base = $editnotice_ns;
+			while ( count( $parts ) > 0 ) {
+				$editnotice_base .= '-'.array_shift( $parts );
+				if ( !wfEmptyMsg( $editnotice_base, wfMsgForContent( $editnotice_base ) ) ) {
+					$wgOut->addWikiText( wfMsgForContent( $editnotice_base )  );
+				}
+			}
+		} else if ( !wfEmptyMsg( $editnotice_page, wfMsgForContent( $editnotice_page ) ) ) {
+			$wgOut->addWikiText( wfMsgForContent( $editnotice_page ) );
+		}
+
 		# Attempt submission here.  This will check for edit conflicts,
 		# and redundantly check for locked database, blocked IPs, etc.
 		# that edit() already checked just in case someone tries to sneak
@@ -471,13 +460,13 @@ class EditPage {
 		# First time through: get contents, set time for conflict
 		# checking, etc.
 		if ( 'initial' == $this->formtype || $this->firsttime ) {
-			if ($this->initialiseForm() === false) {
+			if ( $this->initialiseForm() === false) {
 				$this->noSuchSectionPage();
 				wfProfileOut( __METHOD__."-business-end" );
 				wfProfileOut( __METHOD__ );
 				return;
 			}
-			if( !$this->mTitle->getArticleId() )
+			if ( !$this->mTitle->getArticleId() )
 				wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->mTitle ) );
 		}
 
@@ -485,6 +474,27 @@ class EditPage {
 		wfProfileOut( __METHOD__."-business-end" );
 		wfProfileOut( __METHOD__ );
 	}
+	
+	protected function getEditPermissionErrors() {
+		global $wgUser;
+		$permErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
+		# Can this title be created?
+		if ( !$this->mTitle->exists() ) {
+			$permErrors = array_merge( $permErrors,
+				wfArrayDiff2( $this->mTitle->getUserPermissionsErrors( 'create', $wgUser ), $permErrors ) );
+		}
+		# Ignore some permissions errors when a user is just previewing/viewing diffs
+		$remove = array();
+		foreach( $permErrors as $error ) {
+			if ( ($this->preview || $this->diff) && 
+				($error[0] == 'blockedtext' || $error[0] == 'autoblockedtext') )
+			{
+				$remove[] = $error;
+			}
+		}
+		$permErrors = wfArrayDiff2( $permErrors, $remove );
+		return $permErrors;
+	}
 
 	/**
 	 * Show a read-only error
@@ -510,19 +520,19 @@ class EditPage {
 	 */
 	protected function previewOnOpen() {
 		global $wgRequest, $wgUser;
-		if( $wgRequest->getVal( 'preview' ) == 'yes' ) {
+		if ( $wgRequest->getVal( 'preview' ) == 'yes' ) {
 			// Explicit override from request
 			return true;
-		} elseif( $wgRequest->getVal( 'preview' ) == 'no' ) {
+		} elseif ( $wgRequest->getVal( 'preview' ) == 'no' ) {
 			// Explicit override from request
 			return false;
-		} elseif( $this->section == 'new' ) {
+		} elseif ( $this->section == 'new' ) {
 			// Nothing *to* preview for new sections
 			return false;
-		} elseif( ( $wgRequest->getVal( 'preload' ) !== '' || $this->mTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) {
+		} elseif ( ( $wgRequest->getVal( 'preload' ) !== '' || $this->mTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) {
 			// Standard preference behaviour
 			return true;
-		} elseif( !$this->mTitle->exists() && $this->mTitle->getNamespace() == NS_CATEGORY ) {
+		} elseif ( !$this->mTitle->exists() && $this->mTitle->getNamespace() == NS_CATEGORY ) {
 			// Categories are special
 			return true;
 		} else {
@@ -542,7 +552,7 @@ class EditPage {
 		# Section edit can come from either the form or a link
 		$this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) );
 
-		if( $request->wasPosted() ) {
+		if ( $request->wasPosted() ) {
 			# These fields need to be checked for encoding.
 			# Also remove trailing whitespace, but don't remove _initial_
 			# whitespace from the text boxes. This may be significant formatting.
@@ -550,7 +560,7 @@ class EditPage {
 			$this->textbox2 = $this->safeUnicodeInput( $request, 'wpTextbox2' );
 			$this->mMetaData = rtrim( $request->getText( 'metadata' ) );
 			# Truncate for whole multibyte characters. +5 bytes for ellipsis
-			$this->summary = $wgLang->truncate( $request->getText( 'wpSummary'  ), 250 );
+			$this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250 );
 
 			# Remove extra headings from summaries and new sections.
 			$this->summary = preg_replace('/^\s*=+\s*(.*?)\s*=+\s*$/', '$1', $this->summary);
@@ -560,7 +570,7 @@ class EditPage {
 
 			$this->scrolltop = $request->getIntOrNull( 'wpScrolltop' );
 
-			if( is_null( $this->edittime ) ) {
+			if ( is_null( $this->edittime ) ) {
 				# If the form is incomplete, force to preview.
 				wfDebug( "$fname: Form data appears to be incomplete\n" );
 				wfDebug( "POST DATA: " . var_export( $_POST, true ) . "\n" );
@@ -591,11 +601,11 @@ class EditPage {
 				}
 			}
 			$this->save = !$this->preview && !$this->diff;
-			if( !preg_match( '/^\d{14}$/', $this->edittime )) {
+			if ( !preg_match( '/^\d{14}$/', $this->edittime )) {
 				$this->edittime = null;
 			}
 
-			if( !preg_match( '/^\d{14}$/', $this->starttime )) {
+			if ( !preg_match( '/^\d{14}$/', $this->starttime )) {
 				$this->starttime = null;
 			}
 
@@ -605,10 +615,12 @@ class EditPage {
 			$this->watchthis = $request->getCheck( 'wpWatchthis' );
 
 			# Don't force edit summaries when a user is editing their own user or talk page
-			if( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && $this->mTitle->getText() == $wgUser->getName() ) {
+			if ( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && 
+				$this->mTitle->getText() == $wgUser->getName() ) 
+			{
 				$this->allowBlankSummary = true;
 			} else {
-				$this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' );
+				$this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ) || !$wgUser->getOption( 'forceeditsummary');
 			}
 
 			$this->autoSumm = $request->getText( 'wpAutoSummary' );
@@ -662,28 +674,30 @@ class EditPage {
 	 */
 	protected function showIntro() {
 		global $wgOut, $wgUser;
-		if( $this->suppressIntro )
+		if ( $this->suppressIntro ) {
 			return;
-
+		}
 		# Show a warning message when someone creates/edits a user (talk) page but the user does not exists
-		if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
+		if ( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
 			$parts = explode( '/', $this->mTitle->getText(), 2 );
 			$username = $parts[0];
 			$id = User::idFromName( $username );
 			$ip = User::isIP( $username );
-
 			if ( $id == 0 && !$ip ) {
 				$wgOut->wrapWikiMsg( '<div class="mw-userpage-userdoesnotexist error">$1</div>',
 					array( 'userpage-userdoesnotexist', $username ) );
 			}
 		}
-
-		if( !$this->showCustomIntro() && !$this->mTitle->exists() ) {
-			if( $wgUser->isLoggedIn() ) {
+		# Try to add a custom edit intro, or use the standard one if this is not possible.
+		if ( !$this->showCustomIntro() && !$this->mTitle->exists() ) {
+			if ( $wgUser->isLoggedIn() ) {
 				$wgOut->wrapWikiMsg( '<div class="mw-newarticletext">$1</div>', 'newarticletext' );
 			} else {
 				$wgOut->wrapWikiMsg( '<div class="mw-newarticletextanon">$1</div>', 'newarticletextanon' );
 			}
+		}
+		# Give a notice if the user is editing a deleted page...
+		if ( !$this->mTitle->exists() ) {
 			$this->showDeletionLog( $wgOut );
 		}
 	}
@@ -694,9 +708,9 @@ class EditPage {
 	 * @return bool
 	 */
 	protected function showCustomIntro() {
-		if( $this->editintro ) {
+		if ( $this->editintro ) {
 			$title = Title::newFromText( $this->editintro );
-			if( $title instanceof Title && $title->exists() && $title->userCanRead() ) {
+			if ( $title instanceof Title && $title->exists() && $title->userCanRead() ) {
 				global $wgOut;
 				$revision = Revision::newFromTitle( $title );
 				$wgOut->addWikiTextTitleTidy( $revision->getText(), $this->mTitle );
@@ -714,24 +728,24 @@ class EditPage {
 	 * @return one of the constants describing the result
 	 */
 	function internalAttemptSave( &$result, $bot = false ) {
-		global $wgSpamRegex, $wgFilterCallback, $wgUser, $wgOut, $wgParser;
+		global $wgFilterCallback, $wgUser, $wgOut, $wgParser;
 		global $wgMaxArticleSize;
 
 		$fname = 'EditPage::attemptSave';
 		wfProfileIn( $fname );
 		wfProfileIn( "$fname-checks" );
 
-		if( !wfRunHooks( 'EditPage::attemptSave', array( &$this ) ) )
+		if ( !wfRunHooks( 'EditPage::attemptSave', array( &$this ) ) )
 		{
 			wfDebug( "Hook 'EditPage::attemptSave' aborted article saving" );
 			return self::AS_HOOK_ERROR;
 		}
 
 		# Check image redirect
-		if ( $this->mTitle->getNamespace() == NS_IMAGE &&
+		if ( $this->mTitle->getNamespace() == NS_FILE &&
 			Title::newFromRedirect( $this->textbox1 ) instanceof Title &&
 			!$wgUser->isAllowed( 'upload' ) ) {
-				if( $wgUser->isAnon() ) {
+				if ( $wgUser->isAnon() ) {
 					return self::AS_IMAGE_REDIRECT_ANON;
 				} else {
 					return self::AS_IMAGE_REDIRECT_LOGGED;
@@ -743,12 +757,15 @@ class EditPage {
 		$this->mMetaData = '' ;
 
 		# Check for spam
-		$matches = array();
-		if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
-			$result['spam'] = $matches[0];
+		$match = self::matchSpamRegex( $this->summary );
+		if ( $match === false ) {
+			$match = self::matchSpamRegex( $this->textbox1 );
+		}
+		if ( $match !== false ) {
+			$result['spam'] = $match;
 			$ip = wfGetIP();
 			$pdbk = $this->mTitle->getPrefixedDBkey();
-			$match = str_replace( "\n", '', $matches[0] );
+			$match = str_replace( "\n", '', $match );
 			wfDebugLog( 'SpamRegex', "$ip spam regex hit [[$pdbk]]: \"$match\"" );
 			wfProfileOut( "$fname-checks" );
 			wfProfileOut( $fname );
@@ -765,7 +782,7 @@ class EditPage {
 			wfProfileOut( "$fname-checks" );
 			wfProfileOut( $fname );
 			return self::AS_HOOK_ERROR;
-		} elseif( $this->hookError != '' ) {
+		} elseif ( $this->hookError != '' ) {
 			# ...or the hook could be expecting us to produce an error
 			wfProfileOut( "$fname-checks" );
 			wfProfileOut( $fname );
@@ -823,7 +840,6 @@ class EditPage {
 		# If article is new, insert it.
 		$aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
 		if ( 0 == $aid ) {
-
 			// Late check for create permission, just in case *PARANOIA*
 			if ( !$this->mTitle->userCan( 'create' ) ) {
 				wfDebug( "$fname: no create permission\n" );
@@ -833,8 +849,8 @@ class EditPage {
 
 			# Don't save a new article if it's blank.
 			if ( '' == $this->textbox1 ) {
-					wfProfileOut( $fname );
-					return self::AS_BLANK_ARTICLE;
+				wfProfileOut( $fname );
+				return self::AS_BLANK_ARTICLE;
 			}
 
 			// Run post-section-merge edit filter
@@ -860,10 +876,10 @@ class EditPage {
 
 		wfDebug("timestamp: {$this->mArticle->getTimestamp()}, edittime: {$this->edittime}\n");
 
-		if( $this->mArticle->getTimestamp() != $this->edittime ) {
+		if ( $this->mArticle->getTimestamp() != $this->edittime ) {
 			$this->isConflict = true;
-			if( $this->section == 'new' ) {
-				if( $this->mArticle->getUserText() == $wgUser->getName() &&
+			if ( $this->section == 'new' ) {
+				if ( $this->mArticle->getUserText() == $wgUser->getName() &&
 					$this->mArticle->getComment() == $this->summary ) {
 					// Probably a duplicate submission of a new comment.
 					// This can happen when squid resends a request after
@@ -878,7 +894,7 @@ class EditPage {
 		}
 		$userid = $wgUser->getId();
 
-		if ( $this->isConflict) {
+		if ( $this->isConflict ) {
 			wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" .
 				$this->mArticle->getTimestamp() . "')\n" );
 			$text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary, $this->edittime);
@@ -887,21 +903,21 @@ class EditPage {
 			wfDebug( "EditPage::editForm getting section '$this->section'\n" );
 			$text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary);
 		}
-		if( is_null( $text ) ) {
+		if ( is_null( $text ) ) {
 			wfDebug( "EditPage::editForm activating conflict; section replace failed.\n" );
 			$this->isConflict = true;
 			$text = $this->textbox1;
 		}
 
 		# Suppress edit conflict with self, except for section edits where merging is required.
-		if ( ( $this->section == '' ) && ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
+		if ( $this->section == '' && $userid && $this->userWasLastToEdit($userid,$this->edittime) ) {
 			wfDebug( "EditPage::editForm Suppressing edit conflict, same user.\n" );
 			$this->isConflict = false;
 		} else {
 			# switch from section editing to normal editing in edit conflict
-			if($this->isConflict) {
+			if ( $this->isConflict ) {
 				# Attempt merge
-				if( $this->mergeChangesInto( $text ) ){
+				if ( $this->mergeChangesInto( $text ) ) {
 					// Successful merge! Maybe we should tell the user the good news?
 					$this->isConflict = false;
 					wfDebug( "EditPage::editForm Suppressing edit conflict, successful merge.\n" );
@@ -928,12 +944,10 @@ class EditPage {
 		}
 
 		# Handle the user preference to force summaries here, but not for null edits
-		if( $this->section != 'new' && !$this->allowBlankSummary &&  $wgUser->getOption( 'forceeditsummary') && 
-			0 != strcmp($oldtext, $text) && 
+		if ( $this->section != 'new' && !$this->allowBlankSummary && 0 != strcmp($oldtext, $text) &&
 			!is_object( Title::newFromRedirect( $text ) ) # check if it's not a redirect
 		) {
-
-			if( md5( $this->summary ) == $this->autoSumm ) {
+			if ( md5( $this->summary ) == $this->autoSumm ) {
 				$this->missingSummary = true;
 				wfProfileOut( $fname );
 				return self::AS_SUMMARY_NEEDED;
@@ -941,7 +955,7 @@ class EditPage {
 		}
 
 		# And a similar thing for new sections
-		if( $this->section == 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) {
+		if ( $this->section == 'new' && !$this->allowBlankSummary ) {
 			if (trim($this->summary) == '') {
 				$this->missingSummary = true;
 				wfProfileOut( $fname );
@@ -952,26 +966,26 @@ class EditPage {
 		# All's well
 		wfProfileIn( "$fname-sectionanchor" );
 		$sectionanchor = '';
-		if( $this->section == 'new' ) {
+		if ( $this->section == 'new' ) {
 			if ( $this->textbox1 == '' ) {
 				$this->missingComment = true;
 				return self::AS_TEXTBOX_EMPTY;
 			}
-			if( $this->summary != '' ) {
+			if ( $this->summary != '' ) {
 				$sectionanchor = $wgParser->guessSectionNameFromWikiText( $this->summary );
 				# This is a new section, so create a link to the new section
 				# in the revision summary.
 				$cleanSummary = $wgParser->stripSectionName( $this->summary );
 				$this->summary = wfMsgForContent( 'newsectionsummary', $cleanSummary );
 			}
-		} elseif( $this->section != '' ) {
+		} elseif ( $this->section != '' ) {
 			# Try to get a section anchor from the section source, redirect to edited section if header found
 			# XXX: might be better to integrate this into Article::replaceSection
 			# for duplicate heading checking and maybe parsing
 			$hasmatch = preg_match( "/^ *([=]{1,6})(.*?)(\\1) *\\n/i", $this->textbox1, $matches );
 			# we can't deal with anchors, includes, html etc in the header for now,
 			# headline would need to be parsed to improve this
-			if($hasmatch and strlen($matches[2]) > 0) {
+			if ( $hasmatch and strlen($matches[2]) > 0 ) {
 				$sectionanchor = $wgParser->guessSectionNameFromWikiText( $matches[2] );
 			}
 		}
@@ -993,7 +1007,7 @@ class EditPage {
 		}
 
 		# update the article here
-		if( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit,
+		if ( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit,
 			$this->watchthis, $bot, $sectionanchor ) ) {
 			wfProfileOut( $fname );
 			return self::AS_SUCCESS_UPDATE;
@@ -1003,6 +1017,48 @@ class EditPage {
 		wfProfileOut( $fname );
 		return self::AS_END;
 	}
+	
+	/**
+	 * Check if no edits were made by other users since
+	 * the time a user started editing the page. Limit to
+	 * 50 revisions for the sake of performance.
+	 */
+	protected function userWasLastToEdit( $id, $edittime ) {
+		$dbw = wfGetDB( DB_MASTER );
+		$res = $dbw->select( 'revision',
+			'rev_user',
+			array( 
+				'rev_page' => $this->mArticle->getId(),
+				'rev_timestamp > '.$dbw->addQuotes( $dbw->timestamp($edittime) )
+			),
+			__METHOD__,
+			array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 50 ) );
+		while( $row = $res->fetchObject() ) {
+			if( $row->rev_user != $id ) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Check given input text against $wgSpamRegex, and return the text of the first match.
+	 * @return mixed -- matching string or false
+	 */
+	public static function matchSpamRegex( $text ) {
+		global $wgSpamRegex;
+		if ( $wgSpamRegex ) {
+			// For back compatibility, $wgSpamRegex may be a single string or an array of regexes.
+			$regexes = (array)$wgSpamRegex;
+			foreach( $regexes as $regex ) {
+				$matches = array();
+				if ( preg_match( $regex, $text, $matches ) ) {
+					return $matches[0];
+				}
+			}
+		}
+		return false;
+	}
 
 	/**
 	 * Initialise form fields in the object
@@ -1010,15 +1066,35 @@ class EditPage {
 	 */
 	function initialiseForm() {
 		$this->edittime = $this->mArticle->getTimestamp();
-		$this->textbox1 = $this->getContent(false);
-		if ($this->textbox1 === false) return false;
-
-		if ( !$this->mArticle->exists() && $this->mTitle->getNamespace() == NS_MEDIAWIKI )
-			$this->textbox1 = wfMsgWeirdKey( $this->mTitle->getText() );
+		$this->textbox1 = $this->getContent( false );
+		if ( $this->textbox1 === false ) return false;
 		wfProxyCheck();
 		return true;
 	}
 
+	function setHeaders() {
+		global $wgOut, $wgTitle;
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
+		if ( $this->formtype == 'preview' ) {
+			$wgOut->setPageTitleActionText( wfMsg( 'preview' ) );
+		}
+		if ( $this->isConflict ) {
+			$wgOut->setPageTitle( wfMsg( 'editconflict', $wgTitle->getPrefixedText() ) );
+		} elseif ( $this->section != '' ) {
+			$msg = $this->section == 'new' ? 'editingcomment' : 'editingsection';
+			$wgOut->setPageTitle( wfMsg( $msg, $wgTitle->getPrefixedText() ) );
+		} else {
+			# Use the title defined by DISPLAYTITLE magic word when present
+			if ( isset($this->mParserOutput)
+			 && ( $dt = $this->mParserOutput->getDisplayTitle() ) !== false ) {
+				$title = $dt;
+			} else {
+				$title = $wgTitle->getPrefixedText();
+			}
+			$wgOut->setPageTitle( wfMsg( 'editing', $title ) );
+		}
+	}
+
 	/**
 	 * Send the edit form and related headers to $wgOut
 	 * @param $formCallback Optional callable that takes an OutputPage
@@ -1026,13 +1102,13 @@ class EditPage {
 	 *                      near the top, for captchas and the like.
 	 */
 	function showEditForm( $formCallback=null ) {
-		global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize, $wgTitle;
+		global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize, $wgTitle, $wgRequest;
 
 		# If $wgTitle is null, that means we're in API mode.
 		# Some hook probably called this function  without checking
 		# for is_null($wgTitle) first. Bail out right here so we don't
 		# do lots of work just to discard it right after.
-		if(is_null($wgTitle))
+		if (is_null($wgTitle))
 			return;
 
 		$fname = 'EditPage::showEditForm';
@@ -1042,60 +1118,55 @@ class EditPage {
 
 		wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) ) ;
 
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		#need to parse the preview early so that we know which templates are used,
+		#otherwise users with "show preview after edit box" will get a blank list
+		#we parse this near the beginning so that setHeaders can do the title
+		#setting work instead of leaving it in getPreviewText
+		$previewOutput = '';
+		if ( $this->formtype == 'preview' ) {
+			$previewOutput = $this->getPreviewText();
+		}
+
+		$this->setHeaders();
 
 		# Enabled article-related sidebar, toplinks, etc.
 		$wgOut->setArticleRelated( true );
 
-		if ( $this->formtype == 'preview' ) {
-			$wgOut->setPageTitleActionText( wfMsg( 'preview' ) );
-		}
-
 		if ( $this->isConflict ) {
-			$s = wfMsg( 'editconflict', $wgTitle->getPrefixedText() );
-			$wgOut->setPageTitle( $s );
 			$wgOut->addWikiMsg( 'explainconflict' );
 
 			$this->textbox2 = $this->textbox1;
 			$this->textbox1 = $this->getContent();
 			$this->edittime = $this->mArticle->getTimestamp();
 		} else {
-			if( $this->section != '' ) {
-				if( $this->section == 'new' ) {
-					$s = wfMsg('editingcomment', $wgTitle->getPrefixedText() );
-				} else {
-					$s = wfMsg('editingsection', $wgTitle->getPrefixedText() );
-					$matches = array();
-					if( !$this->summary && !$this->preview && !$this->diff ) {
-						preg_match( "/^(=+)(.+)\\1/mi",
-							$this->textbox1,
-							$matches );
-						if( !empty( $matches[2] ) ) {
-							global $wgParser;
-							$this->summary = "/* " .
-								$wgParser->stripSectionName(trim($matches[2])) .
-								" */ ";
-						}
+			if ( $this->section != '' && $this->section != 'new' ) {
+				$matches = array();
+				if ( !$this->summary && !$this->preview && !$this->diff ) {
+					preg_match( "/^(=+)(.+)\\1/mi",
+						$this->textbox1,
+						$matches );
+					if ( !empty( $matches[2] ) ) {
+						global $wgParser;
+						$this->summary = "/* " .
+							$wgParser->stripSectionName(trim($matches[2])) .
+							" */ ";
 					}
 				}
-			} else {
-				$s = wfMsg( 'editing', $wgTitle->getPrefixedText() );
 			}
-			$wgOut->setPageTitle( $s );
 
 			if ( $this->missingComment ) {
 				$wgOut->wrapWikiMsg( '<div id="mw-missingcommenttext">$1</div>',  'missingcommenttext' );
 			}
 
-			if( $this->missingSummary && $this->section != 'new' ) {
+			if ( $this->missingSummary && $this->section != 'new' ) {
 				$wgOut->wrapWikiMsg( '<div id="mw-missingsummary">$1</div>', 'missingsummary' );
 			}
 
-			if( $this->missingSummary && $this->section == 'new' ) {
+			if ( $this->missingSummary && $this->section == 'new' ) {
 				$wgOut->wrapWikiMsg( '<div id="mw-missingcommentheader">$1</div>', 'missingcommentheader' );
 			}
 
-			if( $this->hookError !== '' ) {
+			if ( $this->hookError !== '' ) {
 				$wgOut->addWikiText( $this->hookError );
 			}
 
@@ -1105,46 +1176,54 @@ class EditPage {
 			if ( isset( $this->mArticle ) && isset( $this->mArticle->mRevision ) ) {
 			// Let sysop know that this will make private content public if saved
 
-				if( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) {
+				if ( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) {
 					$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
-				} else if( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
+				} else if ( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
 					$wgOut->addWikiMsg( 'rev-deleted-text-view' );
 				}
 
-				if( !$this->mArticle->mRevision->isCurrent() ) {
+				if ( !$this->mArticle->mRevision->isCurrent() ) {
 					$this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() );
 					$wgOut->addWikiMsg( 'editingold' );
 				}
 			}
 		}
 
-		if( wfReadOnly() ) {
-			$wgOut->addHTML( '<div id="mw-read-only-warning">'.wfMsgWikiHTML( 'readonlywarning' ).'</div>' );
-		} elseif( $wgUser->isAnon() && $this->formtype != 'preview' ) {
-			$wgOut->addHTML( '<div id="mw-anon-edit-warning">'.wfMsgWikiHTML( 'anoneditwarning' ).'</div>' );
+		if ( wfReadOnly() ) {
+			$wgOut->wrapWikiMsg( "<div id=\"mw-read-only-warning\">\n$1\n</div>", array( 'readonlywarning', wfReadOnlyReason() ) );
+		} elseif ( $wgUser->isAnon() && $this->formtype != 'preview' ) {
+			$wgOut->wrapWikiMsg( '<div id="mw-anon-edit-warning">$1</div>', 'anoneditwarning' );
 		} else {
-			if( $this->isCssJsSubpage && $this->formtype != 'preview' ) {
+			if ( $this->isCssJsSubpage ) {
 				# Check the skin exists
-				if( $this->isValidCssJsSubpage ) {
-					$wgOut->addWikiMsg( 'usercssjsyoucanpreview' );
+				if ( $this->isValidCssJsSubpage ) {
+					if ( $this->formtype !== 'preview' ) {
+						$wgOut->addWikiMsg( 'usercssjsyoucanpreview' );
+					}
 				} else {
 					$wgOut->addWikiMsg( 'userinvalidcssjstitle', $wgTitle->getSkinFromCssJsSubpage() );
 				}
 			}
 		}
 
-		if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+		$classes = array(); // Textarea CSS
+		if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 			# Show a warning if editing an interface message
 			$wgOut->addWikiMsg( 'editinginterface' );
-		} elseif( $this->mTitle->isProtected( 'edit' ) ) {
+		} elseif ( $this->mTitle->isProtected( 'edit' ) ) {
 			# Is the title semi-protected?
-			if( $this->mTitle->isSemiProtected() ) {
+			if ( $this->mTitle->isSemiProtected() ) {
 				$noticeMsg = 'semiprotectedpagewarning';
+				$classes[] = 'mw-textarea-sprotected';
 			} else {
 				# Then it must be protected based on static groups (regular)
 				$noticeMsg = 'protectedpagewarning';
+				$classes[] = 'mw-textarea-protected';
 			}
+			$wgOut->addHTML( "<div class='mw-warning-with-logexcerpt'>\n" );
 			$wgOut->addWikiMsg( $noticeMsg );
+			LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle->getPrefixedText(), '', 1 );
+			$wgOut->addHTML( "</div>\n" );
 		}
 		if ( $this->mTitle->isCascadeProtected() ) {
 			# Is this page under cascading protection from some source pages?
@@ -1158,7 +1237,7 @@ class EditPage {
 			}
 			$wgOut->wrapWikiMsg( $notice, array( 'cascadeprotectedwarning', count($cascadeSources) ) );
 		}
-		if( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) != array() ){
+		if ( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) ) {
 			$wgOut->addWikiMsg( 'titleprotectedwarning' );
 		}
 
@@ -1166,30 +1245,21 @@ class EditPage {
 			$this->kblength = (int)(strlen( $this->textbox1 ) / 1024);
 		}
 		if ( $this->tooBig || $this->kblength > $wgMaxArticleSize ) {
-			$wgOut->addWikiMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgMaxArticleSize );
-		} elseif( $this->kblength > 29 ) {
+			$wgOut->addHTML( "<div class='error' id='mw-edit-longpageerror'>\n" );
+			$wgOut->addWikiMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgLang->formatNum( $wgMaxArticleSize ) );
+			$wgOut->addHTML( "</div>\n" );
+		} elseif ( $this->kblength > 29 ) {
+			$wgOut->addHTML( "<div id='mw-edit-longpagewarning'>\n" );
 			$wgOut->addWikiMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) );
+			$wgOut->addHTML( "</div>\n" );
 		}
 
-		#need to parse the preview early so that we know which templates are used,
-		#otherwise users with "show preview after edit box" will get a blank list
-		if ( $this->formtype == 'preview' ) {
-			$previewOutput = $this->getPreviewText();
-		}
-
-		$rows = $wgUser->getIntOption( 'rows' );
-		$cols = $wgUser->getIntOption( 'cols' );
-
-		$ew = $wgUser->getOption( 'editwidth' );
-		if ( $ew ) $ew = " style=\"width:100%\"";
-		else $ew = '';
-
-		$q = 'action=submit';
+		$q = 'action='.$this->action;
 		#if ( "no" == $redirect ) { $q .= "&redirect=no"; }
 		$action = $wgTitle->escapeLocalURL( $q );
 
-		$summary = wfMsg('summary');
-		$subject = wfMsg('subject');
+		$summary = wfMsg( 'summary' );
+		$subject = wfMsg( 'subject' );
 
 		$cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(),
 				wfMsgExt('cancel', array('parseinline')) );
@@ -1208,7 +1278,7 @@ class EditPage {
 				'[[' . wfMsgForContent( 'copyrightpage' ) . ']]' );
 		}
 
-		if( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) {
+		if ( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) {
 			# prepare toolbar for edit buttons
 			$toolbar = EditPage::getEditToolbar();
 		} else {
@@ -1216,35 +1286,31 @@ class EditPage {
 		}
 
 		// activate checkboxes if user wants them to be always active
-		if( !$this->preview && !$this->diff ) {
+		if ( !$this->preview && !$this->diff ) {
 			# Sort out the "watch" checkbox
-			if( $wgUser->getOption( 'watchdefault' ) ) {
+			if ( $wgUser->getOption( 'watchdefault' ) ) {
 				# Watch all edits
 				$this->watchthis = true;
-			} elseif( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) {
+			} elseif ( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) {
 				# Watch creations
 				$this->watchthis = true;
-			} elseif( $this->mTitle->userIsWatching() ) {
+			} elseif ( $this->mTitle->userIsWatching() ) {
 				# Already watched
 				$this->watchthis = true;
 			}
+			
+			# May be overriden by request parameters
+			if( $wgRequest->getBool( 'watchthis' ) ) {
+				$this->watchthis = true;
+			}
 
-			if( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true;
+			if ( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true;
 		}
 
 		$wgOut->addHTML( $this->editFormPageTop );
 
 		if ( $wgUser->getOption( 'previewontop' ) ) {
-
-			if ( 'preview' == $this->formtype ) {
-				$this->showPreview( $previewOutput );
-			} else {
-				$wgOut->addHTML( '<div id="wikiPreview"></div>' );
-			}
-
-			if ( 'diff' == $this->formtype ) {
-				$this->showDiff();
-			}
+			$this->displayPreviewArea( $previewOutput, true );
 		}
 
 
@@ -1262,28 +1328,28 @@ class EditPage {
 		# For a bit more sophisticated detection of blank summaries, hash the
 		# automatic one and pass that in the hidden field wpAutoSummary.
 		$summaryhiddens =  '';
-		if( $this->missingSummary ) $summaryhiddens .= Xml::hidden( 'wpIgnoreBlankSummary', true );
+		if ( $this->missingSummary ) $summaryhiddens .= Xml::hidden( 'wpIgnoreBlankSummary', true );
 		$autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary );
 		$summaryhiddens .= Xml::hidden( 'wpAutoSummary', $autosumm );
-		if( $this->section == 'new' ) {
-			$commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
+		if ( $this->section == 'new' ) {
+			$commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}</label></span>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
 			$editsummary = "<div class='editOptions'>\n";
 			global $wgParser;
 			$formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) );
-			$subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
+			$subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">". wfMsg('subject-preview') . $sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
 			$summarypreview = '';
 		} else {
 			$commentsubject = '';
-			$editsummary="<div class='editOptions'>\n<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
-			$summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
+			$editsummary="<div class='editOptions'>\n<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}</label></span>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
+			$summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">". wfMsg('summary-preview') .$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
 			$subjectpreview = '';
 		}
 
 		# Set focus to the edit box on load, except on preview or diff, where it would interfere with the display
-		if( !$this->preview && !$this->diff ) {
+		if ( !$this->preview && !$this->diff ) {
 			$wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
 		}
-		$templates = ($this->preview || $this->section != '') ? $this->mPreviewTemplates : $this->mArticle->getUsedTemplates();
+		$templates = $this->getTemplates();
 		$formattedtemplates = $sk->formatTemplates( $templates, $this->preview, $this->section != '');
 
 		$hiddencats = $this->mArticle->getHiddenCategories();
@@ -1294,20 +1360,24 @@ class EditPage {
 			$metadata = $this->mMetaData ;
 			$metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ;
 			$top = wfMsgWikiHtml( 'metadata_help' );
+			/* ToDo: Replace with clean code */
+			$ew = $wgUser->getOption( 'editwidth' );
+			if ( $ew ) $ew = " style=\"width:100%\"";
+			else $ew = '';
+			$cols = $wgUser->getIntOption( 'cols' );
+			/* /ToDo */
 			$metadata = $top . "<textarea name='metadata' rows='3' cols='{$cols}'{$ew}>{$metadata}</textarea>" ;
 		}
 		else $metadata = "" ;
 
-		$hidden = '';
 		$recreate = '';
-		if ($this->wasDeletedSinceLastEdit()) {
+		if ( $this->wasDeletedSinceLastEdit() ) {
 			if ( 'save' != $this->formtype ) {
 				$wgOut->addWikiMsg('deletedwhileediting');
 			} else {
 				// Hide the toolbar and edit area, use can click preview to get it back
 				// Add an confirmation checkbox and explanation.
 				$toolbar = '';
-				$hidden = 'type="hidden" style="display:none;"';
 				$recreate = $wgOut->parse( wfMsg( 'confirmrecreate',  $this->lastDelete->user_name , $this->lastDelete->log_comment ));
 				$recreate .=
 					"<br /><input tabindex='1' type='checkbox' value='1' name='wpRecreate' id='wpRecreate' />".
@@ -1317,7 +1387,7 @@ class EditPage {
 
 		$tabindex = 2;
 
-		$checkboxes = self::getCheckboxes( $tabindex, $sk,
+		$checkboxes = $this->getCheckboxes( $tabindex, $sk,
 			array( 'minor' => $this->minoredit, 'watch' => $this->watchthis ) );
 
 		$checkboxhtml = implode( $checkboxes, "\n" );
@@ -1334,47 +1404,34 @@ class EditPage {
 END
 );
 
-		if( is_callable( $formCallback ) ) {
+		if ( is_callable( $formCallback ) ) {
 			call_user_func_array( $formCallback, array( &$wgOut ) );
 		}
 
 		wfRunHooks( 'EditPage::showEditForm:fields', array( &$this, &$wgOut ) );
 
 		// Put these up at the top to ensure they aren't lost on early form submission
-		$wgOut->addHTML( "
-<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
-<input type='hidden' value=\"{$this->starttime}\" name=\"wpStarttime\" />\n
-<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n
-<input type='hidden' value=\"{$this->scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" );
-
-		$encodedtext = htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) );
-		if( $encodedtext !== '' ) {
-			// Ensure there's a newline at the end, otherwise adding lines
-			// is awkward.
-			// But don't add a newline if the ext is empty, or Firefox in XHTML
-			// mode will show an extra newline. A bit annoying.
-			$encodedtext .= "\n";
-		}
+		$this->showFormBeforeText();
 
 		$wgOut->addHTML( <<<END
-$recreate
+{$recreate}
 {$commentsubject}
 {$subjectpreview}
 {$this->editFormTextBeforeContent}
-<textarea tabindex='1' accesskey="," name="wpTextbox1" id="wpTextbox1" rows='{$rows}'
-cols='{$cols}'{$ew} $hidden>{$encodedtext}</textarea>
 END
 );
+		$this->showTextbox1( $classes );
 
 		$wgOut->wrapWikiMsg( "<div id=\"editpage-copywarn\">\n$1\n</div>", $copywarnMsg );
-		$wgOut->addHTML( $this->editFormTextAfterWarn );
-		$wgOut->addHTML( "
+		$wgOut->addHTML( <<<END
+{$this->editFormTextAfterWarn}
 {$metadata}
 {$editsummary}
 {$summarypreview}
 {$checkboxhtml}
 {$safemodehtml}
-");
+END
+);
 
 		$wgOut->addHTML(
 "<div class='editButtons'>
@@ -1398,20 +1455,18 @@ END
 		$token = htmlspecialchars( $wgUser->editToken() );
 		$wgOut->addHTML( "\n<input type='hidden' value=\"$token\" name=\"wpEditToken\" />\n" );
 
-		$wgOut->addHtml( '<div class="mw-editTools">' );
-		$wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) );
-		$wgOut->addHtml( '</div>' );
-
-		$wgOut->addHTML( $this->editFormTextAfterTools );
+		$this->showEditTools();
 
-		$wgOut->addHTML( "
+		$wgOut->addHTML( <<<END
+{$this->editFormTextAfterTools}
 <div class='templatesUsed'>
 {$formattedtemplates}
 </div>
 <div class='hiddencats'>
 {$formattedhiddencats}
 </div>
-");
+END
+);
 
 		if ( $this->isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) {
 			$wgOut->wrapWikiMsg( '==$1==', "yourdiff" );
@@ -1421,26 +1476,88 @@ END
 			$de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
 
 			$wgOut->wrapWikiMsg( '==$1==', "yourtext" );
-			$wgOut->addHTML( "<textarea tabindex='6' id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}'>"
-				. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox2 ) ) . "\n</textarea>" );
+			$this->showTextbox2();
 		}
 		$wgOut->addHTML( $this->editFormTextBottom );
 		$wgOut->addHTML( "</form>\n" );
 		if ( !$wgUser->getOption( 'previewontop' ) ) {
+			$this->displayPreviewArea( $previewOutput, false );
+		}
 
-			if ( $this->formtype == 'preview') {
-				$this->showPreview( $previewOutput );
-			} else {
-				$wgOut->addHTML( '<div id="wikiPreview"></div>' );
-			}
+		wfProfileOut( $fname );
+	}
 
-			if ( $this->formtype == 'diff') {
-				$this->showDiff();
-			}
+	protected function showFormBeforeText() {
+		global $wgOut;
+		$wgOut->addHTML( "
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->starttime}\" name=\"wpStarttime\" />\n
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n
+<input type='hidden' value=\"{$this->scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" );
+	}
+	
+	protected function showTextbox1( $classes ) {
+		$attribs = array( 'tabindex' => 1 );
+		
+		if ( $this->wasDeletedSinceLastEdit() )
+			$attribs['type'] = 'hidden';
+		if ( !empty($classes) )
+			$attribs['class'] = implode(' ',$classes);
+		
+		$this->showTextbox( $this->textbox1, 'wpTextbox1', $attribs );
+	}
+	
+	protected function showTextbox2() {
+		$this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6 ) );
+	}
+	
+	protected function showTextbox( $content, $name, $attribs = array() ) {
+		global $wgOut, $wgUser;
+		
+		$wikitext = $this->safeUnicodeOutput( $content );
+		if ( $wikitext !== '' ) {
+			// Ensure there's a newline at the end, otherwise adding lines
+			// is awkward.
+			// But don't add a newline if the ext is empty, or Firefox in XHTML
+			// mode will show an extra newline. A bit annoying.
+			$wikitext .= "\n";
+		}
+		
+		$attribs['accesskey'] = ',';
+		$attribs['id'] = $name;
+		
+		if ( $wgUser->getOption( 'editwidth' ) )
+			$attribs['style'] = 'width: 100%';
+		
+		$wgOut->addHTML( Xml::textarea(
+			$name,
+			$wikitext,
+			$wgUser->getIntOption( 'cols' ), $wgUser->getIntOption( 'rows' ),
+			$attribs ) );
+	}
+
+	protected function displayPreviewArea( $previewOutput, $isOnTop = false ) {
+		global $wgOut;
+		$classes = array();
+		if ( $isOnTop )
+			$classes[] = 'ontop';
+
+		$attribs = array( 'id' => 'wikiPreview', 'class' => implode( ' ', $classes ) );
+
+		if ( $this->formtype != 'preview' )
+			$attribs['style'] = 'display: none;';
+
+		$wgOut->addHTML( Xml::openElement( 'div', $attribs ) );
 
+		if ( $this->formtype == 'preview' ) {
+			$this->showPreview( $previewOutput );
 		}
 
-		wfProfileOut( $fname );
+		$wgOut->addHTML( '</div>' );
+
+		if ( $this->formtype == 'diff') {
+			$this->showDiff();
+		}
 	}
 
 	/**
@@ -1451,17 +1568,16 @@ END
 	 */
 	protected function showPreview( $text ) {
 		global $wgOut;
-
-		$wgOut->addHTML( '<div id="wikiPreview">' );
-		if($this->mTitle->getNamespace() == NS_CATEGORY) {
+		if ( $this->mTitle->getNamespace() == NS_CATEGORY) {
 			$this->mArticle->openShowCategory();
 		}
+		# This hook seems slightly odd here, but makes things more
+		# consistent for extensions.
 		wfRunHooks( 'OutputPageBeforeHTML',array( &$wgOut, &$text ) );
 		$wgOut->addHTML( $text );
-		if($this->mTitle->getNamespace() == NS_CATEGORY) {
+		if ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
 			$this->mArticle->closeShowCategory();
 		}
-		$wgOut->addHTML( '</div>' );
 	}
 
 	/**
@@ -1477,16 +1593,22 @@ END
 	function doLivePreviewScript() {
 		global $wgOut, $wgTitle;
 		$wgOut->addScriptFile( 'preview.js' );
-		$liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
+		$liveAction = $wgTitle->getLocalUrl( "action={$this->action}&wpPreview=true&live=true" );
 		return "return !lpDoPreview(" .
 			"editform.wpTextbox1.value," .
 			'"' . $liveAction . '"' . ")";
 	}
 
+	protected function showEditTools() {
+		global $wgOut;
+		$wgOut->addHTML( '<div class="mw-editTools">' );
+		$wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) );
+		$wgOut->addHTML( '</div>' );
+	}
+
 	function getLastDelete() {
 		$dbr = wfGetDB( DB_SLAVE );
-		$fname = 'EditPage::getLastDelete';
-		$res = $dbr->select(
+		$data = $dbr->selectRow(
 			array( 'logging', 'user' ),
 			array( 'log_type',
 			       'log_action',
@@ -1502,27 +1624,20 @@ END
 			       'log_type' => 'delete',
 			       'log_action' => 'delete',
 			       'user_id=log_user' ),
-			$fname,
+			__METHOD__,
 			array( 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ) );
 
-		if($dbr->numRows($res) == 1) {
-			while ( $x = $dbr->fetchObject ( $res ) )
-				$data = $x;
-			$dbr->freeResult ( $res ) ;
-		} else {
-			$data = null;
-		}
 		return $data;
 	}
 
 	/**
-	 * @todo document
+	 * Get the rendered text for previewing.
+	 * @return string
 	 */
 	function getPreviewText() {
-		global $wgOut, $wgUser, $wgTitle, $wgParser, $wgLang, $wgContLang;
+		global $wgOut, $wgUser, $wgTitle, $wgParser, $wgLang, $wgContLang, $wgMessageCache;
 
-		$fname = 'EditPage::getPreviewText';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		if ( $this->mTriedSave && !$this->mTokenOk ) {
 			if ( $this->mTokenOkExceptSuffix ) {
@@ -1538,7 +1653,7 @@ END
 		$parserOptions->setEditSection( false );
 
 		global $wgRawHtml;
-		if( $wgRawHtml && !$this->mTokenOk ) {
+		if ( $wgRawHtml && !$this->mTokenOk ) {
 			// Could be an offsite preview attempt. This is very unsafe if
 			// HTML is enabled, as it could be an attack.
 			return $wgOut->parse( "<div class='previewnote'>" .
@@ -1549,21 +1664,22 @@ END
 		# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
 
 		if ( $this->isCssJsSubpage ) {
-			if(preg_match("/\\.css$/", $this->mTitle->getText() ) ) {
+			if (preg_match("/\\.css$/", $this->mTitle->getText() ) ) {
 				$previewtext = wfMsg('usercsspreview');
-			} else if(preg_match("/\\.js$/", $this->mTitle->getText() ) ) {
+			} else if (preg_match("/\\.js$/", $this->mTitle->getText() ) ) {
 				$previewtext = wfMsg('userjspreview');
 			}
 			$parserOptions->setTidy(true);
-			$parserOutput = $wgParser->parse( $previewtext , $this->mTitle, $parserOptions );
-			$wgOut->addHTML( $parserOutput->mText );
-			$previewHTML = '';
+			$parserOutput = $wgParser->parse( $previewtext, $this->mTitle, $parserOptions );
+			$previewHTML = $parserOutput->mText;
+		} elseif ( $rt = Title::newFromRedirect( $this->textbox1 ) ) {
+			$previewHTML = $this->mArticle->viewRedirect( $rt, false );
 		} else {
 			$toparse = $this->textbox1;
 
 			# If we're adding a comment, we need to show the
 			# summary as the headline
-			if($this->section=="new" && $this->summary!="") {
+			if ( $this->section=="new" && $this->summary!="" ) {
 				$toparse="== {$this->summary} ==\n\n".$toparse;
 			}
 
@@ -1571,19 +1687,9 @@ END
 
 			// Parse mediawiki messages with correct target language
 			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-				$pos = strrpos( $this->mTitle->getText(), '/' );
-				if ( $pos !== false ) {
-					$code = substr( $this->mTitle->getText(), $pos+1 );
-					switch ($code) {
-						case $wgLang->getCode():
-							$obj = $wgLang; break;
-						case $wgContLang->getCode():
-							$obj = $wgContLang; break;
-						default:
-							$obj = Language::factory( $code );
-					}
-					$parserOptions->setTargetLanguage( $obj );
-				}
+				list( /* $unused */, $lang ) = $wgMessageCache->figureMessage( $this->mTitle->getText() );
+				$obj = wfGetLangObj( $lang );
+				$parserOptions->setTargetLanguage( $obj );
 			}
 
 
@@ -1593,20 +1699,9 @@ END
 					$this->mTitle, $parserOptions );
 
 			$previewHTML = $parserOutput->getText();
+			$this->mParserOutput = $parserOutput;
 			$wgOut->addParserOutputNoText( $parserOutput );
 
-			# ParserOutput might have altered the page title, so reset it
-			# Also, use the title defined by DISPLAYTITLE magic word when present
-			if( ( $dt = $parserOutput->getDisplayTitle() ) !== false ) {
-				$wgOut->setPageTitle( wfMsg( 'editing', $dt ) );
-			} else {
-				$wgOut->setPageTitle( wfMsg( 'editing', $wgTitle->getPrefixedText() ) );
-			}
-
-			foreach ( $parserOutput->getTemplates() as $ns => $template)
-				foreach ( array_keys( $template ) as $dbk)
-					$this->mPreviewTemplates[] = Title::makeTitle($ns, $dbk);
-
 			if ( count( $parserOutput->getWarnings() ) ) {
 				$note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() );
 			}
@@ -1615,18 +1710,26 @@ END
 		$previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
 			"<div class='previewnote'>" . $wgOut->parse( $note ) . "</div>\n";
 		if ( $this->isConflict ) {
-			$previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
+			$previewhead .='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
 		}
 
-		if( $wgUser->getOption( 'previewontop' ) ) {
-			// Spacer for the edit toolbar
-			$previewfoot = '<p><br /></p>';
+		wfProfileOut( __METHOD__ );
+		return $previewhead . $previewHTML;
+	}
+	
+	function getTemplates() {
+		if ( $this->preview || $this->section != '' ) {
+			$templates = array();
+			if ( !isset($this->mParserOutput) ) return $templates;
+			foreach( $this->mParserOutput->getTemplates() as $ns => $template) {
+				foreach( array_keys( $template ) as $dbk ) {
+					$templates[] = Title::makeTitle($ns, $dbk);
+				}
+			}
+			return $templates;
 		} else {
-			$previewfoot = '';
+			return $this->mArticle->getUsedTemplates();
 		}
-
-		wfProfileOut( $fname );
-		return $previewhead . $previewHTML . $previewfoot;
 	}
 
 	/**
@@ -1639,22 +1742,22 @@ END
 		# If the user made changes, preserve them when showing the markup
 		# (This happens when a user is blocked during edit, for instance)
 		$first = $this->firsttime || ( !$this->save && $this->textbox1 == '' );
-		if( $first ) {
+		if ( $first ) {
 			$source = $this->mTitle->exists() ? $this->getContent() : false;
 		} else {
 			$source = $this->textbox1;
 		}
 
 		# Spit out the source or the user's modified version
-		if( $source !== false ) {
-			$rows = $wgUser->getOption( 'rows' );
-			$cols = $wgUser->getOption( 'cols' );
+		if ( $source !== false ) {
+			$rows = $wgUser->getIntOption( 'rows' );
+			$cols = $wgUser->getIntOption( 'cols' );
 			$attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' );
-			$wgOut->addHtml( '<hr />' );
+			$wgOut->addHTML( '<hr />' );
 			$wgOut->addWikiMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() );
 			# Why we don't use Xml::element here?
 			# Is it because if $source is '', it returns <textarea />?
-			$wgOut->addHtml( Xml::openElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . Xml::closeElement( 'textarea' ) );
+			$wgOut->addHTML( Xml::openElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . Xml::closeElement( 'textarea' ) );
 		}
 	}
 
@@ -1672,13 +1775,13 @@ END
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 
-		$wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
+		$wgOut->addHTML( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
 		$wgOut->returnToMain( false, $wgTitle );
 	}
 
 	/**
 	 * Creates a basic error page which informs the user that
-	 * they have attempted to edit a nonexistant section.
+	 * they have attempted to edit a nonexistent section.
 	 */
 	function noSuchSectionPage() {
 		global $wgOut, $wgTitle;
@@ -1703,11 +1806,11 @@ END
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 
-		$wgOut->addHtml( '<div id="spamprotected">' );
+		$wgOut->addHTML( '<div id="spamprotected">' );
 		$wgOut->addWikiMsg( 'spamprotectiontext' );
 		if ( $match )
 			$wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) );
-		$wgOut->addHtml( '</div>' );
+		$wgOut->addHTML( '</div>' );
 
 		$wgOut->returnToMain( false, $wgTitle );
 	}
@@ -1724,7 +1827,7 @@ END
 
 		// This is the revision the editor started from
 		$baseRevision = $this->getBaseRevision();
-		if( is_null( $baseRevision ) ) {
+		if ( is_null( $baseRevision ) ) {
 			wfProfileOut( $fname );
 			return false;
 		}
@@ -1733,14 +1836,14 @@ END
 		// The current state, we want to merge updates into it
 		$currentRevision =  Revision::loadFromTitle(
 			$db, $this->mTitle );
-		if( is_null( $currentRevision ) ) {
+		if ( is_null( $currentRevision ) ) {
 			wfProfileOut( $fname );
 			return false;
 		}
 		$currentText = $currentRevision->getText();
 
 		$result = '';
-		if( wfMerge( $baseText, $editText, $currentText, $result ) ){
+		if ( wfMerge( $baseText, $editText, $currentText, $result ) ) {
 			$editText = $result;
 			wfProfileOut( $fname );
 			return true;
@@ -1759,7 +1862,7 @@ END
 	 */
 	function checkUnicodeCompliantBrowser() {
 		global $wgBrowserBlackList;
-		if( empty( $_SERVER["HTTP_USER_AGENT"] ) ) {
+		if ( empty( $_SERVER["HTTP_USER_AGENT"] ) ) {
 			// No User-Agent header sent? Trust it by default...
 			return true;
 		}
@@ -1861,7 +1964,7 @@ END
 			array(
 				'image'  => $wgLang->getImageFile('button-image'),
 				'id'     => 'mw-editbutton-image',
-				'open'   => '[['.$wgContLang->getNsText(NS_IMAGE).':',
+				'open'   => '[['.$wgContLang->getNsText(NS_FILE).':',
 				'close'  => ']]',
 				'sample' => wfMsg('image_sample'),
 				'tip'    => wfMsg('image_tip'),
@@ -1951,7 +2054,7 @@ END
 	 *
 	 * @return array
 	 */
-	public static function getCheckboxes( &$tabindex, $skin, $checked ) {
+	public function getCheckboxes( &$tabindex, $skin, $checked ) {
 		global $wgUser;
 
 		$checkboxes = array();
@@ -1981,6 +2084,7 @@ END
 				Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) .
 				"&nbsp;<label for='wpWatchthis'".$skin->tooltip('watch', 'withaccess').">{$watchLabel}</label>";
 		}
+		wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) );
 		return $checkboxes;
 	}
 
@@ -2058,7 +2162,7 @@ END
 		);
 		$buttons['diff'] = Xml::element('input', $temp, '');
 
-		wfRunHooks( 'EditPageBeforeEditButtons', array( &$this, &$buttons ) );
+		wfRunHooks( 'EditPageBeforeEditButtons', array( &$this, &$buttons, &$tabindex ) );
 		return $buttons;
 	}
 
@@ -2117,7 +2221,7 @@ END
 		}
 
 		global $wgOut;
-		$wgOut->addHtml( '<div id="wikiDiff">' . $difftext . '</div>' );
+		$wgOut->addHTML( '<div id="wikiDiff">' . $difftext . '</div>' );
 	}
 
 	/**
@@ -2174,20 +2278,20 @@ END
 		$working = 0;
 		for( $i = 0; $i < strlen( $invalue ); $i++ ) {
 			$bytevalue = ord( $invalue{$i} );
-			if( $bytevalue <= 0x7F ) { //0xxx xxxx
+			if ( $bytevalue <= 0x7F ) { //0xxx xxxx
 				$result .= chr( $bytevalue );
 				$bytesleft = 0;
-			} elseif( $bytevalue <= 0xBF ) { //10xx xxxx
+			} elseif ( $bytevalue <= 0xBF ) { //10xx xxxx
 				$working = $working << 6;
 				$working += ($bytevalue & 0x3F);
 				$bytesleft--;
-				if( $bytesleft <= 0 ) {
+				if ( $bytesleft <= 0 ) {
 					$result .= "&#x" . strtoupper( dechex( $working ) ) . ";";
 				}
-			} elseif( $bytevalue <= 0xDF ) { //110x xxxx
+			} elseif ( $bytevalue <= 0xDF ) { //110x xxxx
 				$working = $bytevalue & 0x1F;
 				$bytesleft = 1;
-			} elseif( $bytevalue <= 0xEF ) { //1110 xxxx
+			} elseif ( $bytevalue <= 0xEF ) { //1110 xxxx
 				$working = $bytevalue & 0x0F;
 				$bytesleft = 2;
 			} else { //1111 0xxx
@@ -2210,7 +2314,7 @@ END
 	function unmakesafe( $invalue ) {
 		$result = "";
 		for( $i = 0; $i < strlen( $invalue ); $i++ ) {
-			if( ( substr( $invalue, $i, 3 ) == "&#x" ) && ( $invalue{$i+3} != '0' ) ) {
+			if ( ( substr( $invalue, $i, 3 ) == "&#x" ) && ( $invalue{$i+3} != '0' ) ) {
 				$i += 3;
 				$hexstring = "";
 				do {
@@ -2221,7 +2325,7 @@ END
 				// Do some sanity checks. These aren't needed for reversability,
 				// but should help keep the breakage down if the editor
 				// breaks one of the entities whilst editing.
-				if ((substr($invalue,$i,1)==";") and (strlen($hexstring) <= 6)) {
+				if ( (substr($invalue,$i,1)==";") and (strlen($hexstring) <= 6) ) {
 					$codepoint = hexdec($hexstring);
 					$result .= codepointToUtf8( $codepoint );
 				} else {
@@ -2251,16 +2355,30 @@ END
 		global $wgUser;
 		$loglist = new LogEventsList( $wgUser->getSkin(), $out );
 		$pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() );
-		if( $pager->getNumRows() > 0 ) {
-			$out->addHtml( '<div id="mw-recreate-deleted-warn">' );
+		$count = $pager->getNumRows();
+		if ( $count > 0 ) {
+			$pager->mLimit = 10;
+			$out->addHTML( '<div class="mw-warning-with-logexcerpt">' );
 			$out->addWikiMsg( 'recreate-deleted-warn' );
 			$out->addHTML(
 				$loglist->beginLogEventsList() .
 				$pager->getBody() .
 				$loglist->endLogEventsList()
 			);
-			$out->addHtml( '</div>' );
+			if($count > 10){
+				$out->addHTML( $wgUser->getSkin()->link(
+					SpecialPage::getTitleFor( 'Log' ),
+					wfMsgHtml( 'deletelog-fulllog' ),
+					array(),
+					array(
+						'type' => 'delete',
+						'page' => $this->mTitle->getPrefixedText() ) ) );
+			}
+			$out->addHTML( '</div>' );
+			return true;
 		}
+		
+		return false;
 	}
 
 	/**
@@ -2273,7 +2391,7 @@ END
 		$resultDetails = false;
 		$value = $this->internalAttemptSave( $resultDetails, $wgUser->isAllowed('bot') && $wgRequest->getBool('bot', true) );
 
-		if( $value == self::AS_SUCCESS_UPDATE || $value == self::AS_SUCCESS_NEW_ARTICLE ) {
+		if ( $value == self::AS_SUCCESS_UPDATE || $value == self::AS_SUCCESS_NEW_ARTICLE ) {
 			$this->didSave = true;
 		}
 
@@ -2334,7 +2452,7 @@ END
 	}
 	
 	function getBaseRevision() {
-		if ($this->mBaseRevision == false) {
+		if ( $this->mBaseRevision == false ) {
 			$db = wfGetDB( DB_MASTER );
 			$baseRevision = Revision::loadFromTimestamp(
 				$db, $this->mTitle, $this->edittime );
diff --git a/includes/Exception.php b/includes/Exception.php
index ab25f0b8..eb715986 100644
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -83,7 +83,7 @@ class MWException extends Exception {
 	function getHTML() {
 		global $wgShowExceptionDetails;
 		if( $wgShowExceptionDetails ) {
-			return '<p>' . htmlspecialchars( $this->getMessage() ) .
+			return '<p>' . nl2br( htmlspecialchars( $this->getMessage() ) ) .
 				'</p><p>Backtrace:</p><p>' . nl2br( htmlspecialchars( $this->getTraceAsString() ) ) .
 				"</p>\n";
 		} else {
@@ -129,7 +129,16 @@ class MWException extends Exception {
 		$file = $this->getFile();
 		$line = $this->getLine();
 		$message = $this->getMessage();
-		return $wgRequest->getRequestURL() . " Exception from line $line of $file: $message";
+		if ( isset( $wgRequest ) ) {
+			$url = $wgRequest->getRequestURL();
+			if ( !$url ) {
+				$url = '[no URL]';
+			}
+		} else {
+			$url = '[no req]';
+		}
+
+		return "$url   Exception from line $line of $file: $message";
 	}
 
 	/** Output the exception report using HTML */
@@ -137,7 +146,7 @@ class MWException extends Exception {
 		global $wgOut;
 		if ( $this->useOutputPage() ) {
 			$wgOut->setPageTitle( $this->getPageTitle() );
-			$wgOut->setRobotpolicy( "noindex,nofollow" );
+			$wgOut->setRobotPolicy( "noindex,nofollow" );
 			$wgOut->setArticleRelated( false );
 			$wgOut->enableClientCache( false );
 			$wgOut->redirect( '' );
@@ -169,7 +178,7 @@ class MWException extends Exception {
 			wfDebugLog( 'exception', $log );
 		}
 		if ( $wgCommandLineMode ) {
-			fwrite( STDERR, $this->getText() );
+			wfPrintError( $this->getText() );
 		} else {
 			$this->reportHTML();
 		}
@@ -268,7 +277,7 @@ function wfReportException( Exception $e ) {
 			 $e2->__toString() . "\n";
 
 			 if ( !empty( $GLOBALS['wgCommandLineMode'] ) ) {
-				 fwrite( STDERR, $message );
+				 wfPrintError( $message );
 			 } else {
 				 echo nl2br( htmlspecialchars( $message ) ). "\n";
 			 }
@@ -288,6 +297,21 @@ function wfReportException( Exception $e ) {
 }
 
 /**
+ * Print a message, if possible to STDERR.
+ * Use this in command line mode only (see wgCommandLineMode)
+ */
+function wfPrintError( $message ) {
+	#NOTE: STDERR may not be available, especially if php-cgi is used from the command line (bug #15602).
+	#      Try to produce meaningful output anyway. Using echo may corrupt output to STDOUT though.
+	if ( defined( 'STDERR' ) ) {
+		fwrite( STDERR, $message );
+	}
+	else {
+		echo( $message );
+	}
+}
+
+/**
  * Exception handler which simulates the appropriate catch() handling:
  *
  *   try {
diff --git a/includes/Exif.php b/includes/Exif.php
index bd93eb76..d5cf09cf 100644
--- a/includes/Exif.php
+++ b/includes/Exif.php
@@ -48,7 +48,7 @@ class Exif {
 	/**
 	 * Exif tags grouped by category, the tagname itself is the key and the type
 	 * is the value, in the case of more than one possible value type they are
-	 * seperated by commas.
+	 * separated by commas.
 	 */
 	var $mExifTags;
 
@@ -780,7 +780,28 @@ class FormatExif {
 				}
 				break;
 
-			// TODO: Flash
+			case 'Flash':
+				$flashDecode = array(
+					'fired'    => $val & bindec( '00000001' ),
+					'return'   => ($val & bindec( '00000110' )) >> 1,
+					'mode'     => ($val & bindec( '00011000' )) >> 3,
+					'function' => ($val & bindec( '00100000' )) >> 5,
+					'redeye'   => ($val & bindec( '01000000' )) >> 6,
+//					'reserved' => ($val & bindec( '10000000' )) >> 7,
+				);
+
+				# We do not need to handle unknown values since all are used.
+				foreach( $flashDecode as $subTag => $subValue ) {
+					# We do not need any message for zeroed values.
+					if( $subTag != 'fired' && $subValue == 0) {
+						continue;
+					}
+					$fullTag = $tag . '-' . $subTag ;
+					$flashMsgs[] = $this->msg( $fullTag, $subValue );
+				}
+				$tags[$tag] = $wgLang->commaList( $flashMsgs );
+			break;
+
 			case 'FocalPlaneResolutionUnit':
 				switch( $val ) {
 				case 2:
diff --git a/includes/Export.php b/includes/Export.php
index 7d0a824e..5f040b13 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -32,6 +32,7 @@ class WikiExporter {
 
 	const FULL = 0;
 	const CURRENT = 1;
+	const LOGS = 2;
 
 	const BUFFER = 0;
 	const STREAM = 1;
@@ -71,16 +72,16 @@ class WikiExporter {
 	 *
 	 * @param $sink mixed
 	 */
-	function setOutputSink( &$sink ) {
+	public function setOutputSink( &$sink ) {
 		$this->sink =& $sink;
 	}
 
-	function openStream() {
+	public function openStream() {
 		$output = $this->writer->openStream();
 		$this->sink->writeOpenStream( $output );
 	}
 
-	function closeStream() {
+	public function closeStream() {
 		$output = $this->writer->closeStream();
 		$this->sink->writeCloseStream( $output );
 	}
@@ -90,7 +91,7 @@ class WikiExporter {
 	 * in the database, either including complete history or only
 	 * the most recent version.
 	 */
-	function allPages() {
+	public function allPages() {
 		return $this->dumpFrom( '' );
 	}
 
@@ -101,7 +102,7 @@ class WikiExporter {
 	 * @param $end   Int: Exclusive upper limit (this id is not included)
 	 *                   If 0, no upper limit.
 	 */
-	function pagesByRange( $start, $end ) {
+	public function pagesByRange( $start, $end ) {
 		$condition = 'page_id >= ' . intval( $start );
 		if( $end ) {
 			$condition .= ' AND page_id < ' . intval( $end );
@@ -112,13 +113,13 @@ class WikiExporter {
 	/**
 	 * @param $title Title
 	 */
-	function pageByTitle( $title ) {
+	public function pageByTitle( $title ) {
 		return $this->dumpFrom(
 			'page_namespace=' . $title->getNamespace() .
 			' AND page_title=' . $this->db->addQuotes( $title->getDBkey() ) );
 	}
 
-	function pageByName( $name ) {
+	public function pageByName( $name ) {
 		$title = Title::newFromText( $name );
 		if( is_null( $title ) ) {
 			return new WikiError( "Can't export invalid title" );
@@ -127,26 +128,36 @@ class WikiExporter {
 		}
 	}
 
-	function pagesByName( $names ) {
+	public function pagesByName( $names ) {
 		foreach( $names as $name ) {
 			$this->pageByName( $name );
 		}
 	}
 
+	public function allLogs() {
+		return $this->dumpFrom( '' );
+	}
 
-	// -------------------- private implementation below --------------------
+	public function logsByRange( $start, $end ) {
+		$condition = 'log_id >= ' . intval( $start );
+		if( $end ) {
+			$condition .= ' AND log_id < ' . intval( $end );
+		}
+		return $this->dumpFrom( $condition );
+	}
 
 	# Generates the distinct list of authors of an article
 	# Not called by default (depends on $this->list_authors)
 	# Can be set by Special:Export when not exporting whole history
-	function do_list_authors ( $page , $revision , $cond ) {
+	protected function do_list_authors( $page , $revision , $cond ) {
 		$fname = "do_list_authors" ;
 		wfProfileIn( $fname );
 		$this->author_list = "<contributors>";
 		//rev_deleted
 		$nothidden = '(rev_deleted & '.Revision::DELETED_USER.') = 0';
 
-		$sql = "SELECT DISTINCT rev_user_text,rev_user FROM {$page},{$revision} WHERE page_id=rev_page AND $nothidden AND " . $cond ;
+		$sql = "SELECT DISTINCT rev_user_text,rev_user FROM {$page},{$revision} 
+		WHERE page_id=rev_page AND $nothidden AND " . $cond ;
 		$result = $this->db->query( $sql, $fname );
 		$resultset = $this->db->resultObject( $result );
 		while( $row = $resultset->fetchObject() ) {
@@ -163,87 +174,101 @@ class WikiExporter {
 		$this->author_list .= "</contributors>";
 	}
 
-	function dumpFrom( $cond = '' ) {
+	protected function dumpFrom( $cond = '' ) {
 		$fname = 'WikiExporter::dumpFrom';
 		wfProfileIn( $fname );
+		
+		# For logs dumps...
+		if( $this->history & self::LOGS ) {
+			$where = array( 'user_id = log_user' );
+			# Hide private logs
+			$where[] = LogEventsList::getExcludeClause( $this->db );
+			if( $cond ) $where[] = $cond;
+			$result = $this->db->select( array('logging','user'), 
+				'*',
+				$where,
+				$fname,
+				array( 'ORDER BY' => 'log_id', 'USE INDEX' => array('logging' => 'PRIMARY') )
+			);
+			$wrapper = $this->db->resultObject( $result );
+			$this->outputLogStream( $wrapper );
+		# For page dumps...
+		} else {
+			list($page,$revision,$text) = $this->db->tableNamesN('page','revision','text');
 
-		$page     = $this->db->tableName( 'page' );
-		$revision = $this->db->tableName( 'revision' );
-		$text     = $this->db->tableName( 'text' );
-
-		$order = 'ORDER BY page_id';
-		$limit = '';
+			$order = 'ORDER BY page_id';
+			$limit = '';
 
-		if( $this->history == WikiExporter::FULL ) {
-			$join = 'page_id=rev_page';
-		} elseif( $this->history == WikiExporter::CURRENT ) {
-			if ( $this->list_authors && $cond != '' )  { // List authors, if so desired
-				$this->do_list_authors ( $page , $revision , $cond );
-			}
-			$join = 'page_id=rev_page AND page_latest=rev_id';
-		} elseif ( is_array( $this->history ) ) {
-			$join = 'page_id=rev_page';
-			if ( $this->history['dir'] == 'asc' ) {
-				$op = '>';
-				$order .= ', rev_timestamp';
+			if( $this->history == WikiExporter::FULL ) {
+				$join = 'page_id=rev_page';
+			} elseif( $this->history == WikiExporter::CURRENT ) {
+				if ( $this->list_authors && $cond != '' )  { // List authors, if so desired
+					$this->do_list_authors ( $page , $revision , $cond );
+				}
+				$join = 'page_id=rev_page AND page_latest=rev_id';
+			} elseif ( is_array( $this->history ) ) {
+				$join = 'page_id=rev_page';
+				if ( $this->history['dir'] == 'asc' ) {
+					$op = '>';
+					$order .= ', rev_timestamp';
+				} else {
+					$op = '<';
+					$order .= ', rev_timestamp DESC';
+				}
+				if ( !empty( $this->history['offset'] ) ) {
+					$join .= " AND rev_timestamp $op " . $this->db->addQuotes(
+						$this->db->timestamp( $this->history['offset'] ) );
+				}
+				if ( !empty( $this->history['limit'] ) ) {
+					$limitNum = intval( $this->history['limit'] );
+					if ( $limitNum > 0 ) {
+						$limit = "LIMIT $limitNum";
+					}
+				}
 			} else {
-				$op = '<';
-				$order .= ', rev_timestamp DESC';
+				wfProfileOut( $fname );
+				return new WikiError( "$fname given invalid history dump type." );
 			}
-			if ( !empty( $this->history['offset'] ) ) {
-				$join .= " AND rev_timestamp $op " . $this->db->addQuotes(
-					$this->db->timestamp( $this->history['offset'] ) );
+			$where = ( $cond == '' ) ? '' : "$cond AND";
+
+			if( $this->buffer == WikiExporter::STREAM ) {
+				$prev = $this->db->bufferResults( false );
 			}
-			if ( !empty( $this->history['limit'] ) ) {
-				$limitNum = intval( $this->history['limit'] );
-				if ( $limitNum > 0 ) {
-					$limit = "LIMIT $limitNum";
-				}
+			if( $cond == '' ) {
+				// Optimization hack for full-database dump
+				$revindex = $pageindex = $this->db->useIndexClause("PRIMARY");
+				$straight = ' /*! STRAIGHT_JOIN */ ';
+			} else {
+				$pageindex = '';
+				$revindex = '';
+				$straight = '';
 			}
-		} else {
-			wfProfileOut( $fname );
-			return new WikiError( "$fname given invalid history dump type." );
-		}
-		$where = ( $cond == '' ) ? '' : "$cond AND";
-
-		if( $this->buffer == WikiExporter::STREAM ) {
-			$prev = $this->db->bufferResults( false );
-		}
-		if( $cond == '' ) {
-			// Optimization hack for full-database dump
-			$revindex = $pageindex = $this->db->useIndexClause("PRIMARY");
-			$straight = ' /*! STRAIGHT_JOIN */ ';
-		} else {
-			$pageindex = '';
-			$revindex = '';
-			$straight = '';
-		}
-		if( $this->text == WikiExporter::STUB ) {
-			$sql = "SELECT $straight * FROM
+			if( $this->text == WikiExporter::STUB ) {
+				$sql = "SELECT $straight * FROM
 					$page $pageindex,
 					$revision $revindex
 					WHERE $where $join
 					$order $limit";
-		} else {
-			$sql = "SELECT $straight * FROM
+			} else {
+				$sql = "SELECT $straight * FROM
 					$page $pageindex,
 					$revision $revindex,
 					$text
 					WHERE $where $join AND rev_text_id=old_id
 					$order $limit";
-		}
-		$result = $this->db->query( $sql, $fname );
-		$wrapper = $this->db->resultObject( $result );
-		$this->outputStream( $wrapper );
+			}
+			$result = $this->db->query( $sql, $fname );
+			$wrapper = $this->db->resultObject( $result );
+			$this->outputPageStream( $wrapper );
 
-		if ( $this->list_authors ) {
-			$this->outputStream( $wrapper );
-		}
+			if ( $this->list_authors ) {
+				$this->outputPageStream( $wrapper );
+			}
 
-		if( $this->buffer == WikiExporter::STREAM ) {
-			$this->db->bufferResults( $prev );
+			if( $this->buffer == WikiExporter::STREAM ) {
+				$this->db->bufferResults( $prev );
+			}
 		}
-
 		wfProfileOut( $fname );
 	}
 
@@ -258,9 +283,8 @@ class WikiExporter {
 	 * blob storage types will make queries to pull source data.
 	 *
 	 * @param $resultset ResultWrapper
-	 * @access private
 	 */
-	function outputStream( $resultset ) {
+	protected function outputPageStream( $resultset ) {
 		$last = null;
 		while( $row = $resultset->fetchObject() ) {
 			if( is_null( $last ) ||
@@ -292,6 +316,14 @@ class WikiExporter {
 		}
 		$resultset->free();
 	}
+	
+	protected function outputLogStream( $resultset ) {
+		while( $row = $resultset->fetchObject() ) {
+			$output = $this->writer->writeLogItem( $row );
+			$this->sink->writeLogItem( $row, $output );
+		}
+		$resultset->free();
+	}
 }
 
 /**
@@ -320,7 +352,7 @@ class XmlDumpWriter {
 	function openStream() {
 		global $wgContLanguageCode;
 		$ver = $this->schemaVersion();
-		return wfElement( 'mediawiki', array(
+		return Xml::element( 'mediawiki', array(
 			'xmlns'              => "http://www.mediawiki.org/xml/export-$ver/",
 			'xmlns:xsi'          => "http://www.w3.org/2001/XMLSchema-instance",
 			'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " .
@@ -346,30 +378,30 @@ class XmlDumpWriter {
 
 	function sitename() {
 		global $wgSitename;
-		return wfElement( 'sitename', array(), $wgSitename );
+		return Xml::element( 'sitename', array(), $wgSitename );
 	}
 
 	function generator() {
 		global $wgVersion;
-		return wfElement( 'generator', array(), "MediaWiki $wgVersion" );
+		return Xml::element( 'generator', array(), "MediaWiki $wgVersion" );
 	}
 
 	function homelink() {
-		return wfElement( 'base', array(), Title::newMainPage()->getFullUrl() );
+		return Xml::element( 'base', array(), Title::newMainPage()->getFullUrl() );
 	}
 
 	function caseSetting() {
 		global $wgCapitalLinks;
 		// "case-insensitive" option is reserved for future
 		$sensitivity = $wgCapitalLinks ? 'first-letter' : 'case-sensitive';
-		return wfElement( 'case', array(), $sensitivity );
+		return Xml::element( 'case', array(), $sensitivity );
 	}
 
 	function namespaces() {
 		global $wgContLang;
 		$spaces = "  <namespaces>\n";
 		foreach( $wgContLang->getFormattedNamespaces() as $ns => $title ) {
-			$spaces .= '      ' . wfElement( 'namespace', array( 'key' => $ns ), $title ) . "\n";
+			$spaces .= '      ' . Xml::element( 'namespace', array( 'key' => $ns ), $title ) . "\n";
 		}
 		$spaces .= "    </namespaces>";
 		return $spaces;
@@ -395,10 +427,10 @@ class XmlDumpWriter {
 	function openPage( $row ) {
 		$out = "  <page>\n";
 		$title = Title::makeTitle( $row->page_namespace, $row->page_title );
-		$out .= '    ' . wfElementClean( 'title', array(), $title->getPrefixedText() ) . "\n";
-		$out .= '    ' . wfElement( 'id', array(), strval( $row->page_id ) ) . "\n";
+		$out .= '    ' . Xml::elementClean( 'title', array(), $title->getPrefixedText() ) . "\n";
+		$out .= '    ' . Xml::element( 'id', array(), strval( $row->page_id ) ) . "\n";
 		if( '' != $row->page_restrictions ) {
-			$out .= '    ' . wfElement( 'restrictions', array(),
+			$out .= '    ' . Xml::element( 'restrictions', array(),
 				strval( $row->page_restrictions ) ) . "\n";
 		}
 		return $out;
@@ -426,12 +458,12 @@ class XmlDumpWriter {
 		wfProfileIn( $fname );
 
 		$out  = "    <revision>\n";
-		$out .= "      " . wfElement( 'id', null, strval( $row->rev_id ) ) . "\n";
+		$out .= "      " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n";
 
 		$out .= $this->writeTimestamp( $row->rev_timestamp );
 
 		if( $row->rev_deleted & Revision::DELETED_USER ) {
-			$out .= "      " . wfElement( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";
+			$out .= "      " . Xml::element( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";
 		} else {
 			$out .= $this->writeContributor( $row->rev_user, $row->rev_user_text );
 		}
@@ -440,22 +472,22 @@ class XmlDumpWriter {
 			$out .=  "      <minor/>\n";
 		}
 		if( $row->rev_deleted & Revision::DELETED_COMMENT ) {
-			$out .= "      " . wfElement( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";
+			$out .= "      " . Xml::element( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";
 		} elseif( $row->rev_comment != '' ) {
-			$out .= "      " . wfElementClean( 'comment', null, strval( $row->rev_comment ) ) . "\n";
+			$out .= "      " . Xml::elementClean( 'comment', null, strval( $row->rev_comment ) ) . "\n";
 		}
 
 		if( $row->rev_deleted & Revision::DELETED_TEXT ) {
-			$out .= "      " . wfElement( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
+			$out .= "      " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
 		} elseif( isset( $row->old_text ) ) {
 			// Raw text from the database may have invalid chars
 			$text = strval( Revision::getRevisionText( $row ) );
-			$out .= "      " . wfElementClean( 'text',
+			$out .= "      " . Xml::elementClean( 'text',
 				array( 'xml:space' => 'preserve' ),
 				strval( $text ) ) . "\n";
 		} else {
 			// Stub output
-			$out .= "      " . wfElement( 'text',
+			$out .= "      " . Xml::element( 'text',
 				array( 'id' => $row->rev_text_id ),
 				"" ) . "\n";
 		}
@@ -465,19 +497,67 @@ class XmlDumpWriter {
 		wfProfileOut( $fname );
 		return $out;
 	}
+	
+	/**
+	 * Dumps a <logitem> section on the output stream, with
+	 * data filled in from the given database row.
+	 *
+	 * @param $row object
+	 * @return string
+	 * @access private
+	 */
+	function writeLogItem( $row ) {
+		$fname = 'WikiExporter::writeLogItem';
+		wfProfileIn( $fname );
+
+		$out  = "    <logitem>\n";
+		$out .= "      " . Xml::element( 'id', null, strval( $row->log_id ) ) . "\n";
+
+		$out .= $this->writeTimestamp( $row->log_timestamp );
+
+		if( $row->log_deleted & LogPage::DELETED_USER ) {
+			$out .= "      " . Xml::element( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";
+		} else {
+			$out .= $this->writeContributor( $row->log_user, $row->user_name );
+		}
+
+		if( $row->log_deleted & LogPage::DELETED_COMMENT ) {
+			$out .= "      " . Xml::element( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";
+		} elseif( $row->log_comment != '' ) {
+			$out .= "      " . Xml::elementClean( 'comment', null, strval( $row->log_comment ) ) . "\n";
+		}
+		
+		$out .= "      " . Xml::element( 'type', null, strval( $row->log_type ) ) . "\n";
+		$out .= "      " . Xml::element( 'action', null, strval( $row->log_action ) ) . "\n";
+
+		if( $row->log_deleted & LogPage::DELETED_ACTION ) {
+			$out .= "      " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
+		} else {
+			$title = Title::makeTitle( $row->log_namespace, $row->log_title );
+			$out .= "      " . Xml::elementClean( 'logtitle', null, $title->getPrefixedText() ) . "\n";
+			$out .= "      " . Xml::elementClean( 'params',
+				array( 'xml:space' => 'preserve' ),
+				strval( $row->log_params ) ) . "\n";
+		}
+
+		$out .= "    </logitem>\n";
+
+		wfProfileOut( $fname );
+		return $out;
+	}
 
 	function writeTimestamp( $timestamp ) {
 		$ts = wfTimestamp( TS_ISO_8601, $timestamp );
-		return "      " . wfElement( 'timestamp', null, $ts ) . "\n";
+		return "      " . Xml::element( 'timestamp', null, $ts ) . "\n";
 	}
 
 	function writeContributor( $id, $text ) {
 		$out = "      <contributor>\n";
 		if( $id ) {
-			$out .= "        " . wfElementClean( 'username', null, strval( $text ) ) . "\n";
-			$out .= "        " . wfElement( 'id', null, strval( $id ) ) . "\n";
+			$out .= "        " . Xml::elementClean( 'username', null, strval( $text ) ) . "\n";
+			$out .= "        " . Xml::element( 'id', null, strval( $id ) ) . "\n";
 		} else {
-			$out .= "        " . wfElementClean( 'ip', null, strval( $text ) ) . "\n";
+			$out .= "        " . Xml::elementClean( 'ip', null, strval( $text ) ) . "\n";
 		}
 		$out .= "      </contributor>\n";
 		return $out;
@@ -505,10 +585,10 @@ class XmlDumpWriter {
 		return "    <upload>\n" .
 			$this->writeTimestamp( $file->getTimestamp() ) .
 			$this->writeContributor( $file->getUser( 'id' ), $file->getUser( 'text' ) ) .
-			"      " . wfElementClean( 'comment', null, $file->getDescription() ) . "\n" .
-			"      " . wfElement( 'filename', null, $file->getName() ) . "\n" .
-			"      " . wfElement( 'src', null, $file->getFullUrl() ) . "\n" .
-			"      " . wfElement( 'size', null, $file->getSize() ) . "\n" .
+			"      " . Xml::elementClean( 'comment', null, $file->getDescription() ) . "\n" .
+			"      " . Xml::element( 'filename', null, $file->getName() ) . "\n" .
+			"      " . Xml::element( 'src', null, $file->getFullUrl() ) . "\n" .
+			"      " . Xml::element( 'size', null, $file->getSize() ) . "\n" .
 			"    </upload>\n";
 	}
 
@@ -539,6 +619,10 @@ class DumpOutput {
 	function writeRevision( $rev, $string ) {
 		$this->write( $string );
 	}
+	
+	function writeLogItem( $rev, $string ) {
+		$this->write( $string );
+	}
 
 	/**
 	 * Override to write to a different stream type.
@@ -654,6 +738,10 @@ class DumpFilter {
 			$this->sink->writeRevision( $rev, $string );
 		}
 	}
+	
+	function writeLogItem( $rev, $string ) {
+		$this->sink->writeRevision( $rev, $string );
+	}	
 
 	/**
 	 * Override for page-based filter types.
@@ -692,7 +780,9 @@ class DumpNamespaceFilter extends DumpFilter {
 			"NS_USER_TALK"      => NS_USER_TALK,
 			"NS_PROJECT"        => NS_PROJECT,
 			"NS_PROJECT_TALK"   => NS_PROJECT_TALK,
-			"NS_IMAGE"          => NS_IMAGE,
+			"NS_FILE"           => NS_FILE,
+			"NS_FILE_TALK"      => NS_FILE_TALK,
+			"NS_IMAGE"          => NS_IMAGE,  // NS_IMAGE is an alias for NS_FILE
 			"NS_IMAGE_TALK"     => NS_IMAGE_TALK,
 			"NS_MEDIAWIKI"      => NS_MEDIAWIKI,
 			"NS_MEDIAWIKI_TALK" => NS_MEDIAWIKI_TALK,
diff --git a/includes/ExternalStore.php b/includes/ExternalStore.php
index e2b78566..d095aba0 100644
--- a/includes/ExternalStore.php
+++ b/includes/ExternalStore.php
@@ -14,7 +14,7 @@
  */
 class ExternalStore {
 	/* Fetch data from given URL */
-	static function fetchFromURL($url) {
+	static function fetchFromURL( $url ) {
 		global $wgExternalStores;
 
 		if( !$wgExternalStores )
@@ -44,7 +44,7 @@ class ExternalStore {
 
 		$class = 'ExternalStore' . ucfirst( $proto );
 		/* Any custom modules should be added to $wgAutoLoadClasses for on-demand loading */
-		if( !class_exists( $class ) ){
+		if( !class_exists( $class ) ) {
 			return false;
 		}
 
@@ -66,4 +66,47 @@ class ExternalStore {
 			return $store->store( $params, $data );
 		}
 	}
+	
+	/**
+	 * Like insert() above, but does more of the work for us.
+	 * This function does not need a url param, it builds it by
+	 * itself. It also fails-over to the next possible clusters.
+	 *
+	 * @param string $data
+	 * Returns the URL of the stored data item, or false on error
+	 */
+	public static function insertToDefault( $data ) {
+		global $wgDefaultExternalStore;
+		$tryStores = (array)$wgDefaultExternalStore;
+		$error = false;
+		while ( count( $tryStores ) > 0 ) {
+			$index = mt_rand(0, count( $tryStores ) - 1);
+			$storeUrl = $tryStores[$index];
+			wfDebug( __METHOD__.": trying $storeUrl\n" );
+			list( $proto, $params ) = explode( '://', $storeUrl, 2 );
+			$store = self::getStoreObject( $proto );
+			if ( $store === false ) {
+				throw new MWException( "Invalid external storage protocol - $storeUrl" );
+			}
+			try {
+				$url = $store->store( $params, $data ); // Try to save the object
+			} catch ( DBConnectionError $error ) {
+				$url = false;
+			}
+			if ( $url ) {
+				return $url; // Done!
+			} else {
+				unset( $tryStores[$index] ); // Don't try this one again!
+				$tryStores = array_values( $tryStores ); // Must have consecutive keys
+				wfDebugLog( 'ExternalStorage', "Unable to store text to external storage $storeUrl" );
+			}
+		}
+		// All stores failed
+		if ( $error ) {
+			// Rethrow the last connection error
+			throw $error;
+		} else {
+			throw new MWException( "Unable to store text to external storage" );
+		}
+	}
 }
diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index 549412d1..9fa7d1b1 100644
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -56,7 +56,7 @@ class ExternalStoreDB {
 	 * Fetch data from given URL
 	 * @param string $url An url of the form DB://cluster/id or DB://cluster/id/itemid for concatened storage.
 	 */
-	function fetchFromURL($url) {
+	function fetchFromURL( $url ) {
 		$path = explode( '/', $url );
 		$cluster  = $path[2];
 		$id	  = $path[3];
@@ -122,12 +122,11 @@ class ExternalStoreDB {
 	 * @return string URL
 	 */
 	function store( $cluster, $data ) {
-		$fname = 'ExternalStoreDB::store';
-
-		$dbw =& $this->getMaster( $cluster );
-
+		$dbw = $this->getMaster( $cluster );
 		$id = $dbw->nextSequenceValue( 'blob_blob_id_seq' );
-		$dbw->insert( $this->getTable( $dbw ), array( 'blob_id' => $id, 'blob_text' => $data ), $fname );
+		$dbw->insert( $this->getTable( $dbw ), 
+			array( 'blob_id' => $id, 'blob_text' => $data ), 
+			__METHOD__ );
 		$id = $dbw->insertId();
 		if ( $dbw->getFlag( DBO_TRX ) ) {
 			$dbw->immediateCommit();
diff --git a/includes/FakeTitle.php b/includes/FakeTitle.php
index 4c2eddc8..10bfa538 100644
--- a/includes/FakeTitle.php
+++ b/includes/FakeTitle.php
@@ -3,15 +3,13 @@
 /**
  * Fake title class that triggers an error if any members are called
  */
-class FakeTitle {
+class FakeTitle extends Title {
 	function error() { throw new MWException( "Attempt to call member function of FakeTitle\n" ); }
 
 	// PHP 5.1 method overload
 	function __call( $name, $args ) { $this->error(); }
 
 	// PHP <5.1 compatibility
-	function getInterwikiLink()  { $this->error(); }
-	function getInterwikiCached() { $this->error(); }
 	function isLocal() { $this->error(); }
 	function isTrans() { $this->error(); }
 	function getText() { $this->error(); }
@@ -28,20 +26,20 @@ class FakeTitle {
 	function getPrefixedText() { $this->error(); }
 	function getFullText() { $this->error(); }
 	function getPrefixedURL() { $this->error(); }
-	function getFullURL() {$this->error(); }
-	function getLocalURL() { $this->error(); }
-	function escapeLocalURL() { $this->error(); }
-	function escapeFullURL() { $this->error(); }
-	function getInternalURL() { $this->error(); }
+	function getFullURL( $query = '', $variant = false ) {$this->error(); }
+	function getLocalURL( $query = '', $variant = false ) { $this->error(); }
+	function escapeLocalURL( $query = '' ) { $this->error(); }
+	function escapeFullURL( $query = '' ) { $this->error(); }
+	function getInternalURL( $query = '', $variant = false ) { $this->error(); }
 	function getEditURL() { $this->error(); }
 	function getEscapedText() { $this->error(); }
 	function isExternal() { $this->error(); }
-	function isSemiProtected() { $this->error(); }
-	function isProtected() { $this->error(); }
+	function isSemiProtected( $action = 'edit' ) { $this->error(); }
+	function isProtected( $action = '' ) { $this->error(); }
 	function userIsWatching() { $this->error(); }
-	function userCan() { $this->error(); }
+	function userCan( $action, $doExpensiveQueries = true ) { $this->error(); }
 	function userCanCreate() { $this->error(); }
-	function userCanEdit() { $this->error(); }
+	function userCanEdit( $doExpensiveQueries = true ) { $this->error(); }
 	function userCanMove() { $this->error(); }
 	function isMovable() { $this->error(); }
 	function userCanRead() { $this->error(); }
@@ -79,6 +77,7 @@ class FakeTitle {
 	function equals() { $this->error(); }
 	function exists() { $this->error(); }
 	function isAlwaysKnown() { $this->error(); }
+	function isKnown() { $this->error(); }
 	function touchLinks() { $this->error(); }
 	function trackbackURL() { $this->error(); }
 	function trackbackRDF() { $this->error(); }
diff --git a/includes/Feed.php b/includes/Feed.php
index 512057d9..fe6d8feb 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -52,25 +52,45 @@ class FeedItem {
 		$this->Comments = $Comments;
 	}
 
-	/**
-	 * @static
-	 */
-	function xmlEncode( $string ) {
+	public function xmlEncode( $string ) {
 		$string = str_replace( "\r\n", "\n", $string );
 		$string = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', '', $string );
 		return htmlspecialchars( $string );
 	}
 
-	function getTitle() { return $this->xmlEncode( $this->Title ); }
-	function getUrl() { return $this->xmlEncode( $this->Url ); }
-	function getDescription() { return $this->xmlEncode( $this->Description ); }
-	function getLanguage() {
+	public function getTitle() {
+		return $this->xmlEncode( $this->Title );
+	}
+
+	public function getUrl() {
+		return $this->xmlEncode( $this->Url );
+	}
+
+	public function getDescription() {
+		return $this->xmlEncode( $this->Description );
+	}
+
+	public function getLanguage() {
 		global $wgContLanguageCode;
 		return $wgContLanguageCode;
 	}
-	function getDate() { return $this->Date; }
-	function getAuthor() { return $this->xmlEncode( $this->Author ); }
-	function getComments() { return $this->xmlEncode( $this->Comments ); }
+
+	public function getDate() {
+		return $this->Date;
+	}
+	public function getAuthor() {
+		return $this->xmlEncode( $this->Author );
+	}
+	public function getComments() {
+		return $this->xmlEncode( $this->Comments );
+	}
+	
+	/**
+	 * Quickie hack... strip out wikilinks to more legible form from the comment.
+	 */
+	public static function stripComment( $text ) {
+		return preg_replace( '/\[\[([^]]*\|)?([^]]+)\]\]/', '\2', $text );
+	}
 	/**#@-*/
 }
 
@@ -149,7 +169,7 @@ class ChannelFeed extends FeedItem {
 		global $wgStylePath, $wgStyleVersion;
 
 		$this->httpHeaders();
-		echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
+		echo '<?xml version="1.0"?>' . "\n";
 		echo '<?xml-stylesheet type="text/css" href="' .
 			htmlspecialchars( wfExpandUrl( "$wgStylePath/common/feed.css?$wgStyleVersion" ) ) .
 			'"?' . ">\n";
diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index aa784c02..38bff363 100644
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -75,17 +75,20 @@ class FeedUtils {
 			if( $oldid ) {
 				wfProfileIn( __FUNCTION__."-dodiff" );
 
-				$de = new DifferenceEngine( $title, $oldid, $newid );
 				#$diffText = $de->getDiff( wfMsg( 'revisionasof',
 				#	$wgContLang->timeanddate( $timestamp ) ),
 				#	wfMsg( 'currentrev' ) );
-				$diffText = $de->getDiff(
-					wfMsg( 'previousrevision' ), // hack
-					wfMsg( 'revisionasof',
-						$wgContLang->timeanddate( $timestamp ) ) );
-
+				
+				// Don't bother generating the diff if we won't be able to show it
+				if ( $wgFeedDiffCutoff > 0 ) {
+					$de = new DifferenceEngine( $title, $oldid, $newid );
+					$diffText = $de->getDiff(
+						wfMsg( 'previousrevision' ), // hack
+						wfMsg( 'revisionasof',
+							$wgContLang->timeanddate( $timestamp ) ) );
+				}
 
-				if ( strlen( $diffText ) > $wgFeedDiffCutoff ) {
+				if ( ( strlen( $diffText ) > $wgFeedDiffCutoff ) || ( $wgFeedDiffCutoff <= 0 ) ) {
 					// Omit large diffs
 					$diffLink = $title->escapeFullUrl(
 						'diff=' . $newid .
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index bc80c2b2..66086b0f 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -55,7 +55,7 @@ class FileDeleteForm {
 			$this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
 
 		if( !self::haveDeletableFile($this->file, $this->oldfile, $this->oldimage) ) {
-			$wgOut->addHtml( $this->prepareMessage( 'filedelete-nofile' ) );
+			$wgOut->addHTML( $this->prepareMessage( 'filedelete-nofile' ) );
 			$wgOut->addReturnTo( $this->title );
 			return;
 		}
@@ -78,7 +78,7 @@ class FileDeleteForm {
 				$wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) );
 			if( $status->ok ) {
 				$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-				$wgOut->addHtml( $this->prepareMessage( 'filedelete-success' ) );
+				$wgOut->addHTML( $this->prepareMessage( 'filedelete-success' ) );
 				// Return to the main page if we just deleted all versions of the
 				// file, otherwise go back to the description page
 				$wgOut->addReturnTo( $this->oldimage ? $this->title : Title::newMainPage() );
@@ -105,16 +105,24 @@ class FileDeleteForm {
 		} else {
 			$status = $file->delete( $reason, $suppress );
 			if( $status->ok ) {
+				$id = $title->getArticleID( GAID_FOR_UPDATE );
 				// Need to delete the associated article
 				$article = new Article( $title );
 				if( wfRunHooks('ArticleDelete', array(&$article, &$wgUser, &$reason)) ) {
-					if( $article->doDeleteArticle( $reason, $suppress ) )
-						wfRunHooks('ArticleDeleteComplete', array(&$article, &$wgUser, $reason));
+					if( $article->doDeleteArticle( $reason, $suppress, $id ) ) {
+						global $wgRequest;
+						if( $wgRequest->getCheck( 'wpWatch' ) ) {
+							$article->doWatch();
+						} elseif( $title->userIsWatching() ) {
+							$article->doUnwatch();
+						}
+						wfRunHooks('ArticleDeleteComplete', array(&$article, &$wgUser, $reason, $id));
+					}
 				}
 			}
 		}
-		if( $status->isGood() ) wfRunHooks('FileDeleteComplete', array(
-			&$file, &$oldimage, &$article, &$wgUser, &$reason));
+		if( $status->isGood() ) 
+			wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason));
 
 		return $status;
 	}
@@ -123,46 +131,60 @@ class FileDeleteForm {
 	 * Show the confirmation form
 	 */
 	private function showForm() {
-		global $wgOut, $wgUser, $wgRequest, $wgContLang;
-		$align = $wgContLang->isRtl() ? 'left' : 'right';
+		global $wgOut, $wgUser, $wgRequest;
 
 		if( $wgUser->isAllowed( 'suppressrevision' ) ) {
-			$suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\"><td></td><td>";
-			$suppress .= Xml::checkLabel( wfMsg( 'revdelete-suppress' ), 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '2' ) );
-			$suppress .= "</td></tr>";
+			$suppress = "<tr id=\"wpDeleteSuppressRow\">
+					<td></td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'revdelete-suppress' ),
+							'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '3' ) ) .
+					"</td>
+				</tr>";
 		} else {
 			$suppress = '';
 		}
 
-		$form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) ) .
+		$checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $this->title->userIsWatching();
+		$form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction(),
+			'id' => 'mw-img-deleteconfirm' ) ) .
 			Xml::openElement( 'fieldset' ) .
 			Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
 			Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
 			$this->prepareMessage( 'filedelete-intro' ) .
-			Xml::openElement( 'table' ) .
+			Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) .
 			"<tr>
-				<td align='$align'>" .
+				<td class='mw-label'>" .
 					Xml::label( wfMsg( 'filedelete-comment' ), 'wpDeleteReasonList' ) .
 				"</td>
-				<td>" .
+				<td class='mw-input'>" .
 					Xml::listDropDown( 'wpDeleteReasonList',
 						wfMsgForContent( 'filedelete-reason-dropdown' ),
 						wfMsgForContent( 'filedelete-reason-otherlist' ), '', 'wpReasonDropDown', 1 ) .
 				"</td>
 			</tr>
 			<tr>
-				<td align='$align'>" .
+				<td class='mw-label'>" .
 					Xml::label( wfMsg( 'filedelete-otherreason' ), 'wpReason' ) .
 				"</td>
-				<td>" .
-					Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ), array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) .
+				<td class='mw-input'>" .
+					Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ),
+						array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) .
 				"</td>
 			</tr>
 			{$suppress}
 			<tr>
 				<td></td>
-				<td>" .
-					Xml::submitButton( wfMsg( 'filedelete-submit' ), array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '3' ) ) .
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'watchthis' ),
+						'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td></td>
+				<td class='mw-submit'>" .
+					Xml::submitButton( wfMsg( 'filedelete-submit' ),
+						array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '4' ) ) .
 				"</td>
 			</tr>" .
 			Xml::closeElement( 'table' ) .
@@ -175,7 +197,7 @@ class FileDeleteForm {
 				$form .= '<p class="mw-filedelete-editreasons">' . $link . '</p>';
 			}
 
-		$wgOut->addHtml( $form );
+		$wgOut->addHTML( $form );
 	}
 
 	/**
@@ -183,7 +205,7 @@ class FileDeleteForm {
 	 */
 	private function showLogEntries() {
 		global $wgOut;
-		$wgOut->addHtml( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+		$wgOut->addHTML( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
 		LogEventsList::showLogExtract( $wgOut, 'delete', $this->title->getPrefixedText() );
 	}
 
diff --git a/includes/FileRevertForm.php b/includes/FileRevertForm.php
index 385d83bc..c7c73246 100644
--- a/includes/FileRevertForm.php
+++ b/includes/FileRevertForm.php
@@ -57,7 +57,7 @@ class FileRevertForm {
 		}
 
 		if( !$this->haveOldVersion() ) {
-			$wgOut->addHtml( wfMsgExt( 'filerevert-badversion', 'parse' ) );
+			$wgOut->addHTML( wfMsgExt( 'filerevert-badversion', 'parse' ) );
 			$wgOut->returnToMain( false, $this->title );
 			return;
 		}
@@ -69,7 +69,7 @@ class FileRevertForm {
 			// TODO: Preserve file properties from database instead of reloading from file
 			$status = $this->file->upload( $source, $comment, $comment );
 			if( $status->isGood() ) {
-				$wgOut->addHtml( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(),
+				$wgOut->addHTML( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(),
 					$wgLang->date( $this->getTimestamp(), true ),
 					$wgLang->time( $this->getTimestamp(), true ),
 					wfExpandUrl( $this->file->getArchiveUrl( $this->archiveName ) ) ) );
@@ -104,7 +104,7 @@ class FileRevertForm {
 		$form .= '</fieldset>';
 		$form .= '</form>';
 
-		$wgOut->addHtml( $form );
+		$wgOut->addHTML( $form );
 	}
 
 	/**
diff --git a/includes/FileStore.php b/includes/FileStore.php
index c01350c0..278777b4 100644
--- a/includes/FileStore.php
+++ b/includes/FileStore.php
@@ -35,39 +35,22 @@ class FileStore {
 	 * This is attached to your master database connection, so if you
 	 * suffer an uncaught error the lock will be released when the
 	 * connection is closed.
-	 *
-	 * @todo Probably only works on MySQL. Abstract to the Database class?
+	 * @see Database::lock()
 	 */
 	static function lock() {
-		global $wgDBtype;
-		if ($wgDBtype != 'mysql')
-			return true;
 		$dbw = wfGetDB( DB_MASTER );
 		$lockname = $dbw->addQuotes( FileStore::lockName() );
-		$result = $dbw->query( "SELECT GET_LOCK($lockname, 5) AS lockstatus", __METHOD__ );
-		$row = $dbw->fetchObject( $result );
-		$dbw->freeResult( $result );
-
-		if( $row->lockstatus == 1 ) {
-			return true;
-		} else {
-			wfDebug( __METHOD__." failed to acquire lock\n" );
-			return false;
-		}
+		return $dbw->lock( $lockname, __METHOD__ );
 	}
 
 	/**
 	 * Release the global file store lock.
+	 * @see Database::unlock()
 	 */
 	static function unlock() {
-		global $wgDBtype;
-		if ($wgDBtype != 'mysql')
-			return true;
 		$dbw = wfGetDB( DB_MASTER );
 		$lockname = $dbw->addQuotes( FileStore::lockName() );
-		$result = $dbw->query( "SELECT RELEASE_LOCK($lockname)", __METHOD__ );
-		$dbw->fetchObject( $result );
-		$dbw->freeResult( $result );
+		return $dbw->unlock( $lockname, __METHOD__ );
 	}
 
 	private static function lockName() {
@@ -123,7 +106,7 @@ class FileStore {
 		} else {
 			if( !file_exists( dirname( $destPath ) ) ) {
 				wfSuppressWarnings();
-				$ok = mkdir( dirname( $destPath ), 0777, true );
+				$ok = wfMkdirParents( dirname( $destPath ) );
 				wfRestoreWarnings();
 
 				if( !$ok ) {
diff --git a/includes/FormOptions.php b/includes/FormOptions.php
index 5888a0c4..262c8c7f 100644
--- a/includes/FormOptions.php
+++ b/includes/FormOptions.php
@@ -176,8 +176,8 @@ class FormOptions implements ArrayAccess {
 					throw new MWException( 'Unsupported datatype' );
 			}
 
-			if ( $value !== $default && $value !== null ) {
-				$this->options[$name]['value'] = $value;
+			if ( $value !== null ) {
+				$this->options[$name]['value'] = $value === $default ? null : $value;
 			}
 		}
 	}
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d1336d47..33f5831d 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -8,10 +8,12 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  * Global functions used everywhere
  */
 
-require_once dirname(__FILE__) . '/LogPage.php';
 require_once dirname(__FILE__) . '/normal/UtfNormalUtil.php';
 require_once dirname(__FILE__) . '/XmlFunctions.php';
 
+// Hide compatibility functions from Doxygen
+/// @cond
+
 /**
  * Compatibility functions
  *
@@ -87,6 +89,9 @@ if ( !function_exists( 'array_diff_key' ) ) {
 	}
 }
 
+/// @endcond
+
+
 /**
  * Like array_diff( $a, $b ) except that it works with two-dimensional arrays.
  */
@@ -145,16 +150,31 @@ function wfRandom() {
 }
 
 /**
- * We want / and : to be included as literal characters in our title URLs.
+ * We want some things to be included as literal characters in our title URLs
+ * for prettiness, which urlencode encodes by default.  According to RFC 1738,
+ * all of the following should be safe:
+ *
+ * ;:@&=$-_.+!*'(),
+ *
+ * But + is not safe because it's used to indicate a space; &= are only safe in
+ * paths and not in queries (and we don't distinguish here); ' seems kind of
+ * scary; and urlencode() doesn't touch -_. to begin with.  Plus, although /
+ * is reserved, we don't care.  So the list we unescape is:
+ *
+ * ;:@$!*(),/
+ *
  * %2F in the page titles seems to fatally break for some reason.
  *
  * @param $s String:
  * @return string
 */
-function wfUrlencode ( $s ) {
+function wfUrlencode( $s ) {
 	$s = urlencode( $s );
-	$s = preg_replace( '/%3[Aa]/', ':', $s );
-	$s = preg_replace( '/%2[Ff]/', '/', $s );
+	$s = str_ireplace(
+		array( '%3B','%3A','%40','%24','%21','%2A','%28','%29','%2C','%2F' ),
+		array(   ';',  ':',  '@',  '$',  '!',  '*',  '(',  ')',  ',',  '/' ),
+		$s
+	);
 
 	return $s;
 }
@@ -174,6 +194,7 @@ function wfUrlencode ( $s ) {
  */
 function wfDebug( $text, $logonly = false ) {
 	global $wgOut, $wgDebugLogFile, $wgDebugComments, $wgProfileOnly, $wgDebugRawPage;
+	global $wgDebugLogPrefix;
 	static $recursion = 0;
 
 	static $cache = array(); // Cache of unoutputted messages
@@ -206,11 +227,26 @@ function wfDebug( $text, $logonly = false ) {
 		# Strip unprintables; they can switch terminal modes when binary data
 		# gets dumped, which is pretty annoying.
 		$text = preg_replace( '![\x00-\x08\x0b\x0c\x0e-\x1f]!', ' ', $text );
+		$text = $wgDebugLogPrefix . $text;
 		wfErrorLog( $text, $wgDebugLogFile );
 	}
 }
 
 /**
+ * Send a line giving PHP memory usage.
+ * @param $exact Bool : print exact values instead of kilobytes (default: false)
+ */
+function wfDebugMem( $exact = false ) {
+	$mem = memory_get_usage();
+	if( !$exact ) {
+		$mem = floor( $mem / 1024 ) . ' kilobytes';
+	} else {
+		$mem .= ' bytes';
+	}
+	wfDebug( "Memory usage: $mem\n" );
+}
+
+/**
  * Send a line to a supplementary debug log file, if configured, or main debug log if not.
  * $wgDebugLogGroups[$logGroup] should be set to a filename to send to a separate log.
  *
@@ -220,12 +256,17 @@ function wfDebug( $text, $logonly = false ) {
  *                     log file is specified, (default true)
  */
 function wfDebugLog( $logGroup, $text, $public = true ) {
-	global $wgDebugLogGroups;
-	if( $text{strlen( $text ) - 1} != "\n" ) $text .= "\n";
+	global $wgDebugLogGroups, $wgShowHostnames;
+	$text = trim($text)."\n";
 	if( isset( $wgDebugLogGroups[$logGroup] ) ) {
 		$time = wfTimestamp( TS_DB );
 		$wiki = wfWikiID();
-		wfErrorLog( "$time $wiki: $text", $wgDebugLogGroups[$logGroup] );
+		if ( $wgShowHostnames ) {
+			$host = wfHostname();
+		} else {
+			$host = '';
+		}
+		wfErrorLog( "$time $host $wiki: $text", $wgDebugLogGroups[$logGroup] );
 	} else if ( $public === true ) {
 		wfDebug( $text, true );
 	}
@@ -245,16 +286,50 @@ function wfLogDBError( $text ) {
 }
 
 /**
- * Log to a file without getting "file size exceeded" signals
+ * Log to a file without getting "file size exceeded" signals.
+ * 
+ * Can also log to TCP or UDP with the syntax udp://host:port/prefix. This will 
+ * send lines to the specified port, prefixed by the specified prefix and a space.
  */
 function wfErrorLog( $text, $file ) {
-	wfSuppressWarnings();
-	$exists = file_exists( $file );
-	$size = $exists ? filesize( $file ) : false;
-	if ( !$exists || ( $size !== false && $size + strlen( $text ) < 0x7fffffff ) ) {
-		error_log( $text, 3, $file );
+	if ( substr( $file, 0, 4 ) == 'udp:' ) {
+		if ( preg_match( '!^(tcp|udp):(?://)?\[([0-9a-fA-F:]+)\]:(\d+)(?:/(.*))?$!', $file, $m ) ) {
+			// IPv6 bracketed host
+			$protocol = $m[1];
+			$host = $m[2];
+			$port = $m[3];
+			$prefix = isset( $m[4] ) ? $m[4] : false;
+		} elseif ( preg_match( '!^(tcp|udp):(?://)?([a-zA-Z0-9.-]+):(\d+)(?:/(.*))?$!', $file, $m ) ) {
+			$protocol = $m[1];
+			$host = $m[2];
+			$port = $m[3];
+			$prefix = isset( $m[4] ) ? $m[4] : false;
+		} else {
+			throw new MWException( __METHOD__.": Invalid UDP specification" );
+		}
+		// Clean it up for the multiplexer
+		if ( strval( $prefix ) !== '' ) {
+			$text = preg_replace( '/^/m', $prefix . ' ', $text );
+			if ( substr( $text, -1 ) != "\n" ) {
+				$text .= "\n";
+			}
+		}
+
+		$sock = fsockopen( "$protocol://$host", $port );
+		if ( !$sock ) {
+			return;
+		}
+		fwrite( $sock, $text );
+		fclose( $sock );
+	} else {
+		wfSuppressWarnings();
+		$exists = file_exists( $file );
+		$size = $exists ? filesize( $file ) : false;
+		if ( !$exists || ( $size !== false && $size + strlen( $text ) < 0x7fffffff ) ) {
+			error_log( $text, 3, $file );
+		}
+		wfRestoreWarnings();
 	}
-	wfRestoreWarnings();
 }
 
 /**
@@ -320,6 +395,47 @@ function wfReadOnlyReason() {
 }
 
 /**
+ * Return a Language object from $langcode
+ * @param $langcode Mixed: either:
+ *                  - a Language object
+ *                  - code of the language to get the message for, if it is
+ *                    a valid code create a language for that language, if
+ *                    it is a string but not a valid code then make a basic
+ *                    language object
+ *                  - a boolean: if it's false then use the current users
+ *                    language (as a fallback for the old parameter
+ *                    functionality), or if it is true then use the wikis
+ * @return Language object
+ */
+function wfGetLangObj( $langcode = false ){
+	# Identify which language to get or create a language object for.
+	if( $langcode instanceof Language )
+		# Great, we already have the object!
+		return $langcode;
+		
+	global $wgContLang;
+	if( $langcode === $wgContLang->getCode() || $langcode === true )
+		# $langcode is the language code of the wikis content language object.
+		# or it is a boolean and value is true
+		return $wgContLang;
+	
+	global $wgLang;
+	if( $langcode === $wgLang->getCode() || $langcode === false )
+		# $langcode is the language code of user language object.
+		# or it was a boolean and value is false
+		return $wgLang;
+
+	$validCodes = array_keys( Language::getLanguageNames() );
+	if( in_array( $langcode, $validCodes ) )
+		# $langcode corresponds to a valid language.
+		return Language::factory( $langcode );
+
+	# $langcode is a string, but not a valid language code; use content language.
+	wfDebug( 'Invalid language code passed to wfGetLangObj, falling back to content language.' );
+	return $wgContLang;
+}
+
+/**
  * Get a message from anywhere, for the current user language.
  *
  * Use wfMsgForContent() instead if the message should NOT
@@ -458,7 +574,7 @@ function wfMsgWeirdKey ( $key ) {
  * @private
  */
 function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
-	global $wgParser, $wgContLang, $wgMessageCache, $wgLang;
+	global $wgContLang, $wgMessageCache;
 
 	wfRunHooks('NormalizeMessageKey', array(&$key, &$useDB, &$langCode, &$transform));
 	
@@ -469,21 +585,7 @@ function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
 			$message = $wgMessageCache->transform( $message );
 		}
 	} else {
-		if( $langCode === true ) {
-			$lang = &$wgContLang;
-		} elseif( $langCode === false ) {
-			$lang = &$wgLang;
-		} else {
-			$validCodes = array_keys( Language::getLanguageNames() );
-			if( in_array( $langCode, $validCodes ) ) {
-				# $langcode corresponds to a valid language.
-				$lang = Language::factory( $langCode );
-			} else {
-				# $langcode is a string, but not a valid language code; use content language.
-				$lang =& $wgContLang;
-				wfDebug( 'Invalid language code passed to wfMsgGetKey, falling back to content language.' );
-			}
-		}
+		$lang = wfGetLangObj( $langCode );
 
 		# MessageCache::get() does this already, Language::getMessage() doesn't
 		# ISSUE: Should we try to handle "message/lang" here too?
@@ -565,40 +667,47 @@ function wfMsgWikiHtml( $key ) {
 /**
  * Returns message in the requested format
  * @param string $key Key of the message
- * @param array $options Processing rules:
- *  <i>parse</i>: parses wikitext to html
- *  <i>parseinline</i>: parses wikitext to html and removes the surrounding p's added by parser or tidy
- *  <i>escape</i>: filters message through htmlspecialchars
- *  <i>escapenoentities</i>: same, but allows entity references like &nbsp; through
- *  <i>replaceafter</i>: parameters are substituted after parsing or escaping
- *  <i>parsemag</i>: transform the message using magic phrases
- *  <i>content</i>: fetch message for content language instead of interface
- *  <i>language</i>: language code to fetch message for (overriden by <i>content</i>), its behaviour
- *                   with parser, parseinline and parsemag is undefined.
+ * @param array $options Processing rules.  Can take the following options:
+ *   <i>parse</i>: parses wikitext to html
+ *   <i>parseinline</i>: parses wikitext to html and removes the surrounding
+ *       p's added by parser or tidy
+ *   <i>escape</i>: filters message through htmlspecialchars
+ *   <i>escapenoentities</i>: same, but allows entity references like &nbsp; through
+ *   <i>replaceafter</i>: parameters are substituted after parsing or escaping
+ *   <i>parsemag</i>: transform the message using magic phrases
+ *   <i>content</i>: fetch message for content language instead of interface
+ * Also can accept a single associative argument, of the form 'language' => 'xx':
+ *   <i>language</i>: Language object or language code to fetch message for
+ *       (overriden by <i>content</i>), its behaviour with parser, parseinline
+ *       and parsemag is undefined.
  * Behavior for conflicting options (e.g., parse+parseinline) is undefined.
  */
 function wfMsgExt( $key, $options ) {
-	global $wgOut, $wgParser;
+	global $wgOut;
 
 	$args = func_get_args();
 	array_shift( $args );
 	array_shift( $args );
-
-	if( !is_array($options) ) {
-		$options = array($options);
+	$options = (array)$options;
+
+	foreach( $options as $arrayKey => $option ) {
+		if( !preg_match( '/^[0-9]+|language$/', $arrayKey ) ) {
+			# An unknown index, neither numeric nor "language"
+			trigger_error( "wfMsgExt called with incorrect parameter key $arrayKey", E_USER_WARNING );
+		} elseif( preg_match( '/^[0-9]+$/', $arrayKey ) && !in_array( $option,
+		array( 'parse', 'parseinline', 'escape', 'escapenoentities',
+		'replaceafter', 'parsemag', 'content' ) ) ) {
+			# A numeric index with unknown value
+			trigger_error( "wfMsgExt called with incorrect parameter $option", E_USER_WARNING );
+		}
 	}
 
-	if( in_array('content', $options) ) {
+	if( in_array('content', $options, true ) ) {
 		$forContent = true;
 		$langCode = true;
 	} elseif( array_key_exists('language', $options) ) {
 		$forContent = false;
-		$langCode = $options['language'];
-		$validCodes = array_keys( Language::getLanguageNames() );
-		if( !in_array($options['language'], $validCodes) ) {
-			# Fallback to en, instead of whatever interface language we might have
-			$langCode = 'en';
-		}
+		$langCode = wfGetLangObj( $options['language'] );
 	} else {
 		$forContent = false;
 		$langCode = false;
@@ -606,34 +715,34 @@ function wfMsgExt( $key, $options ) {
 
 	$string = wfMsgGetKey( $key, /*DB*/true, $langCode, /*Transform*/false );
 
-	if( !in_array('replaceafter', $options) ) {
+	if( !in_array('replaceafter', $options, true ) ) {
 		$string = wfMsgReplaceArgs( $string, $args );
 	}
 
-	if( in_array('parse', $options) ) {
+	if( in_array('parse', $options, true ) ) {
 		$string = $wgOut->parse( $string, true, !$forContent );
-	} elseif ( in_array('parseinline', $options) ) {
+	} elseif ( in_array('parseinline', $options, true ) ) {
 		$string = $wgOut->parse( $string, true, !$forContent );
 		$m = array();
 		if( preg_match( '/^<p>(.*)\n?<\/p>\n?$/sU', $string, $m ) ) {
 			$string = $m[1];
 		}
-	} elseif ( in_array('parsemag', $options) ) {
+	} elseif ( in_array('parsemag', $options, true ) ) {
 		global $wgMessageCache;
 		if ( isset( $wgMessageCache ) ) {
-			$string = $wgMessageCache->transform( $string, !$forContent );
+			$string = $wgMessageCache->transform( $string,
+				!$forContent,
+				is_object( $langCode ) ? $langCode : null );
 		}
 	}
 
-	if ( in_array('escape', $options) ) {
+	if ( in_array('escape', $options, true ) ) {
 		$string = htmlspecialchars ( $string );
-	} elseif ( in_array( 'escapenoentities', $options ) ) {
-		$string = htmlspecialchars( $string );
-		$string = str_replace( '&amp;', '&', $string );
-		$string = Sanitizer::normalizeCharReferences( $string );
+	} elseif ( in_array( 'escapenoentities', $options, true  ) ) {
+		$string = Sanitizer::escapeHtmlAllowEntities( $string );
 	}
 
-	if( in_array('replaceafter', $options) ) {
+	if( in_array('replaceafter', $options, true ) ) {
 		$string = wfMsgReplaceArgs( $string, $args );
 	}
 
@@ -707,18 +816,25 @@ function wfDebugDieBacktrace( $msg = '' ) {
  * @return string
  */
 function wfHostname() {
-	if ( function_exists( 'posix_uname' ) ) {
-		// This function not present on Windows
-		$uname = @posix_uname();
-	} else {
-		$uname = false;
-	}
-	if( is_array( $uname ) && isset( $uname['nodename'] ) ) {
-		return $uname['nodename'];
-	} else {
-		# This may be a virtual server.
-		return $_SERVER['SERVER_NAME'];
+	static $host;
+	if ( is_null( $host ) ) {
+		if ( function_exists( 'posix_uname' ) ) {
+			// This function not present on Windows
+			$uname = @posix_uname();
+		} else {
+			$uname = false;
+		}
+		if( is_array( $uname ) && isset( $uname['nodename'] ) ) {
+			$host = $uname['nodename'];
+		} elseif ( getenv( 'COMPUTERNAME' ) ) {
+			# Windows computer name
+			$host = getenv( 'COMPUTERNAME' );
+		} else {
+			# This may be a virtual server.
+			$host = $_SERVER['SERVER_NAME'];
+		}
 	}
+	return $host;
 }
 
 	/**
@@ -929,7 +1045,7 @@ function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
  */
 function wfEscapeWikiText( $text ) {
 	$text = str_replace(
-		array( '[',     '|',      ']',     '\'',    'ISBN ',     'RFC ',     '://',     "\n=",     '{{' ),
+		array( '[',     '|',      ']',     '\'',    'ISBN ',     'RFC ',     '://',     "\n=",     '{{' ), # }}
 		array( '&#91;', '&#124;', '&#93;', '&#39;', 'ISBN&#32;', 'RFC&#32;', '&#58;//', "\n&#61;", '&#123;&#123;' ),
 		htmlspecialchars($text) );
 	return $text;
@@ -1029,6 +1145,34 @@ function wfArrayToCGI( $array1, $array2 = NULL )
 }
 
 /**
+ * This is the logical opposite of wfArrayToCGI(): it accepts a query string as
+ * its argument and returns the same string in array form.  This allows compa-
+ * tibility with legacy functions that accept raw query strings instead of nice
+ * arrays.  Of course, keys and values are urldecode()d.  Don't try passing in-
+ * valid query strings, or it will explode.
+ *
+ * @param $query string Query string
+ * @return array Array version of input
+ */
+function wfCgiToArray( $query ) {
+	if( isset( $query[0] ) and $query[0] == '?' ) {
+		$query = substr( $query, 1 );
+	}
+	$bits = explode( '&', $query );
+	$ret = array();
+	foreach( $bits as $bit ) {
+		if( $bit === '' ) {
+			continue;
+		}
+		list( $key, $value ) = explode( '=', $bit );
+		$key = urldecode( $key );
+		$value = urldecode( $value );
+		$ret[$key] = $value;
+	}
+	return $ret;
+}
+
+/**
  * Append a query string to an existing URL, which may or may not already
  * have query string parameters already. If so, they will be combined.
  *
@@ -1132,7 +1276,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 
 	# This check may also protect against code injection in
 	# case of broken installations.
-	if(! file_exists( $wgDiff3 ) ){
+	if( !$wgDiff3 || !file_exists( $wgDiff3 ) ) {
 		wfDebug( "diff3 not found\n" );
 		return false;
 	}
@@ -1246,7 +1390,10 @@ function wfDiff( $before, $after, $params = '-u' ) {
 }
 
 /**
- * @todo document
+ * A wrapper around the PHP function var_export().
+ * Either print it or add it to the regular output ($wgOut).
+ *
+ * @param $var A PHP variable to dump.
  */
 function wfVarDump( $var ) {
 	global $wgOut;
@@ -1322,6 +1469,7 @@ function wfResetOutputBuffers( $resetGzipEncoding=true ) {
 				// Reset the 'Content-Encoding' field set by this handler
 				// so we can start fresh.
 				header( 'Content-Encoding:' );
+				break;
 			}
 		}
 	}
@@ -1568,11 +1716,11 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) {
 		# TS_ORACLE
 		$uts = strtotime(preg_replace('/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
 				str_replace("+00:00", "UTC", $ts)));
-	} elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z$/', $ts, $da)) {
+	} elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.*\d*)?Z$/', $ts, $da)) {
 		# TS_ISO_8601
-	} elseif (preg_match('/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)[\+\- ](\d\d)$/',$ts,$da)) {
+	} elseif (preg_match('/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d*[\+\- ](\d\d)$/',$ts,$da)) {
 		# TS_POSTGRES
-	} elseif (preg_match('/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d) GMT$/',$ts,$da)) {
+	} elseif (preg_match('/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d* GMT$/',$ts,$da)) {
 		# TS_POSTGRES
 	} else {
 		# Bogus value; fall back to the epoch...
@@ -1648,7 +1796,7 @@ function swap( &$x, &$y ) {
 }
 
 function wfGetCachedNotice( $name ) {
-	global $wgOut, $parserMemc;
+	global $wgOut, $wgRenderHashAppend, $parserMemc;
 	$fname = 'wfGetCachedNotice';
 	wfProfileIn( $fname );
 
@@ -1670,7 +1818,9 @@ function wfGetCachedNotice( $name ) {
 		}
 	}
 
-	$cachedNotice = $parserMemc->get( wfMemcKey( $name ) );
+	// Use the extra hash appender to let eg SSL variants separately cache.
+	$key = wfMemcKey( $name . $wgRenderHashAppend );
+	$cachedNotice = $parserMemc->get( $key );
 	if( is_array( $cachedNotice ) ) {
 		if( md5( $notice ) == $cachedNotice['hash'] ) {
 			$notice = $cachedNotice['html'];
@@ -1684,7 +1834,7 @@ function wfGetCachedNotice( $name ) {
 	if( $needParse ) {
 		if( is_object( $wgOut ) ) {
 			$parsed = $wgOut->parse( $notice );
-			$parserMemc->set( wfMemcKey( $name ), array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+			$parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
 			$notice = $parsed;
 		} else {
 			wfDebug( 'wfGetCachedNotice called for ' . $name . ' with no $wgOut available' );
@@ -1777,69 +1927,20 @@ function wfTempDir() {
 /**
  * Make directory, and make all parent directories if they don't exist
  * 
- * @param string $fullDir Full path to directory to create
+ * @param string $dir Full path to directory to create
  * @param int $mode Chmod value to use, default is $wgDirectoryMode
  * @return bool
  */
-function wfMkdirParents( $fullDir, $mode = null ) {
+function wfMkdirParents( $dir, $mode = null ) {
 	global $wgDirectoryMode;
-	if( strval( $fullDir ) === '' )
-		return true;
-	if( file_exists( $fullDir ) )
-		return true;
-	// If not defined or isn't an int, set to default
-	if ( is_null( $mode ) ) {
-		$mode = $wgDirectoryMode;
-	}
-
-
-	# Go back through the paths to find the first directory that exists
-	$currentDir = $fullDir;
-	$createList = array();
-	while ( strval( $currentDir ) !== '' && !file_exists( $currentDir ) ) {
-		# Strip trailing slashes
-		$currentDir = rtrim( $currentDir, '/\\' );
 
-		# Add to create list
-		$createList[] = $currentDir;
-
-		# Find next delimiter searching from the end
-		$p = max( strrpos( $currentDir, '/' ), strrpos( $currentDir, '\\' ) );
-		if ( $p === false ) {
-			$currentDir = false;
-		} else {
-			$currentDir = substr( $currentDir, 0, $p );
-		}
-	}
-
-	if ( count( $createList ) == 0 ) {
-		# Directory specified already exists
+	if( strval( $dir ) === '' || file_exists( $dir ) )
 		return true;
-	} elseif ( $currentDir === false ) {
-		# Went all the way back to root and it apparently doesn't exist
-		wfDebugLog( 'mkdir', "Root doesn't exist?\n" );
-		return false;
-	}
-	# Now go forward creating directories
-	$createList = array_reverse( $createList );
 
-	# Is the parent directory writable?
-	if ( $currentDir === '' ) {
-		$currentDir = '/';
-	}
-	if ( !is_writable( $currentDir ) ) {
-		wfDebugLog( 'mkdir', "Not writable: $currentDir\n" );
-		return false;
-	}
+	if ( is_null( $mode ) )
+		$mode = $wgDirectoryMode;
 
-	foreach ( $createList as $dir ) {
-		# use chmod to override the umask, as suggested by the PHP manual
-		if ( !mkdir( $dir, $mode ) || !chmod( $dir, $mode ) ) {
-			wfDebugLog( 'mkdir', "Unable to create directory $dir\n" );
-			return false;
-		}
-	}
-	return true;
+	return mkdir( $dir, $mode, true );  // PHP5 <3
 }
 
 /**
@@ -1998,7 +2099,7 @@ function wfIniGetBool( $setting ) {
  * @return collected stdout as a string (trailing newlines stripped)
  */
 function wfShellExec( $cmd, &$retval=null ) {
-	global $IP, $wgMaxShellMemory, $wgMaxShellFileSize;
+	global $IP, $wgMaxShellMemory, $wgMaxShellFileSize, $wgMaxShellTime;
 
 	if( wfIniGetBool( 'safe_mode' ) ) {
 		wfDebug( "wfShellExec can't run in safe_mode, PHP's exec functions are too broken.\n" );
@@ -2008,7 +2109,7 @@ function wfShellExec( $cmd, &$retval=null ) {
 	wfInitShellLocale();
 
 	if ( php_uname( 's' ) == 'Linux' ) {
-		$time = intval( ini_get( 'max_execution_time' ) );
+		$time = intval( $wgMaxShellTime );
 		$mem = intval( $wgMaxShellMemory );
 		$filesize = intval( $wgMaxShellFileSize );
 
@@ -2030,6 +2131,10 @@ function wfShellExec( $cmd, &$retval=null ) {
 	passthru( $cmd, $retval );
 	$output = ob_get_contents();
 	ob_end_clean();
+
+	if ( $retval == 127 ) {
+		wfDebugLog( 'exec', "Possibly missing executable file: $cmd\n" );
+	}
 	return $output;
 }
 
@@ -2167,28 +2272,51 @@ function wfRelativePath( $path, $from ) {
 }
 
 /**
- * array_merge() does awful things with "numeric" indexes, including
- * string indexes when happen to look like integers. When we want
- * to merge arrays with arbitrary string indexes, we don't want our
- * arrays to be randomly corrupted just because some of them consist
- * of numbers.
- *
- * Fuck you, PHP. Fuck you in the ear!
+ * Backwards array plus for people who haven't bothered to read the PHP manual
+ * XXX: will not darn your socks for you.
  *
  * @param array $array1, [$array2, [...]]
  * @return array
  */
 function wfArrayMerge( $array1/* ... */ ) {
-	$out = $array1;
-	for( $i = 1; $i < func_num_args(); $i++ ) {
-		foreach( func_get_arg( $i ) as $key => $value ) {
-			$out[$key] = $value;
-		}
+	$args = func_get_args();
+	$args = array_reverse( $args, true );
+	$out = array();
+	foreach ( $args as $arg ) {
+		$out += $arg;
 	}
 	return $out;
 }
 
 /**
+ * Merge arrays in the style of getUserPermissionsErrors, with duplicate removal
+ * e.g.
+ *	wfMergeErrorArrays( 
+ *		array( array( 'x' ) ), 
+ *		array( array( 'x', '2' ) ), 
+ *		array( array( 'x' ) ), 
+ *		array( array( 'y') )
+ *	);
+ * returns:
+ * 		array( 
+ *   		array( 'x', '2' ),
+ *   		array( 'x' ),
+ *   		array( 'y' )
+ *   	)
+ */
+function wfMergeErrorArrays(/*...*/) {
+	$args = func_get_args();
+	$out = array();
+	foreach ( $args as $errors ) {
+		foreach ( $errors as $params ) {
+			$spec = implode( "\t", $params );
+			$out[$spec] = $params;
+		}
+	}
+	return array_values( $out );
+}
+
+/**
  * Make a URL index, appropriate for the el_index field of externallinks.
  */
 function wfMakeUrlIndex( $url ) {
@@ -2560,7 +2688,7 @@ function wfSplitWikiID( $wiki ) {
  * will always return the same object, unless the underlying connection or load
  * balancer is manually destroyed.
  */
-function &wfGetDB( $db = DB_LAST, $groups = array(), $wiki = false ) {
+function &wfGetDB( $db, $groups = array(), $wiki = false ) {
 	return wfGetLB( $wiki )->getConnection( $db, $groups, $wiki );
 }
 
@@ -2590,10 +2718,15 @@ function &wfGetLBFactory() {
  *                    current version. An image object will be returned which
  *                    was created at the specified time.
  * @param mixed $flags FileRepo::FIND_ flags
+ * @param boolean $bypass Bypass the file cache even if it could be used
  * @return File, or false if the file does not exist
  */
-function wfFindFile( $title, $time = false, $flags = 0 ) {
-	return RepoGroup::singleton()->findFile( $title, $time, $flags );
+function wfFindFile( $title, $time = false, $flags = 0, $bypass = false ) {
+        if( !$time && !$flags && !$bypass ) {
+		return FileCache::singleton()->findFile( $title );
+	} else {
+		return RepoGroup::singleton()->findFile( $title, $time, $flags );
+	}
 }
 
 /**
@@ -2646,6 +2779,8 @@ function wfBoolToStr( $value ) {
  * @param string $extensionName Name of extension to load messages from\for.
  * @param string $langcode Language to load messages for, or false for default
  *                         behvaiour (en, content language and user language).
+ * @since r24808 (v1.11) Using this method of loading extension messages will not work
+ * on MediaWiki prior to that
  */
 function wfLoadExtensionMessages( $extensionName, $langcode = false ) {
 	global $wgExtensionMessagesFiles, $wgMessageCache, $wgLang, $wgContLang;
diff --git a/includes/HTMLCacheUpdate.php b/includes/HTMLCacheUpdate.php
index 1f250214..402102ea 100644
--- a/includes/HTMLCacheUpdate.php
+++ b/includes/HTMLCacheUpdate.php
@@ -37,7 +37,7 @@ class HTMLCacheUpdate
 		$this->mRowsPerQuery = $wgUpdateRowsPerQuery;
 	}
 
-	function doUpdate() {
+	public function doUpdate() {
 		# Fetch the IDs
 		$cond = $this->getToCondition();
 		$dbr = wfGetDB( DB_SLAVE );
@@ -50,16 +50,17 @@ class HTMLCacheUpdate
 				$this->invalidateIDs( $res );
 			}
 		}
+		wfRunHooks( 'HTMLCacheUpdate::doUpdate', array($this->mTitle) );
 	}
 
-	function insertJobs( ResultWrapper $res ) {
+	protected function insertJobs( ResultWrapper $res ) {
 		$numRows = $res->numRows();
 		$numBatches = ceil( $numRows / $this->mRowsPerJob );
 		$realBatchSize = $numRows / $numBatches;
 		$start = false;
 		$jobs = array();
 		do {
-			for ( $i = 0; $i < $realBatchSize - 1; $i++ ) {
+			for ( $i = 0; $i <= $realBatchSize - 1; $i++ ) {
 				$row = $res->fetchRow();
 				if ( $row ) {
 					$id = $row[0];
@@ -82,17 +83,13 @@ class HTMLCacheUpdate
 		Job::batchInsert( $jobs );
 	}
 
-	function getPrefix() {
+	protected function getPrefix() {
 		static $prefixes = array(
 			'pagelinks' => 'pl',
 			'imagelinks' => 'il',
 			'categorylinks' => 'cl',
 			'templatelinks' => 'tl',
 			'redirect' => 'rd',
-
-			# Not needed
-			# 'externallinks' => 'el',
-			# 'langlinks' => 'll'
 		);
 
 		if ( is_null( $this->mPrefix ) ) {
@@ -104,11 +101,11 @@ class HTMLCacheUpdate
 		return $this->mPrefix;
 	}
 
-	function getFromField() {
+	public function getFromField() {
 		return $this->getPrefix() . '_from';
 	}
 
-	function getToCondition() {
+	public function getToCondition() {
 		$prefix = $this->getPrefix();
 		switch ( $this->mTable ) {
 			case 'pagelinks':
@@ -129,7 +126,7 @@ class HTMLCacheUpdate
 	/**
 	 * Invalidate a set of IDs, right now
 	 */
-	function invalidateIDs( ResultWrapper $res ) {
+	public function invalidateIDs( ResultWrapper $res ) {
 		global $wgUseFileCache, $wgUseSquid;
 
 		if ( $res->numRows() == 0 ) {
@@ -175,8 +172,7 @@ class HTMLCacheUpdate
 				# Update file cache
 				if  ( $wgUseFileCache ) {
 					foreach ( $titles as $title ) {
-						$cm = new HTMLFileCache($title);
-						@unlink($cm->fileCacheName());
+						HTMLFileCache::clearFileCache( $title );
 					}
 				}
 			}
@@ -185,7 +181,9 @@ class HTMLCacheUpdate
 }
 
 /**
- * @todo document (e.g. one-sentence top-level class description).
+ * Job wrapper for HTMLCacheUpdate. Gets run whenever a related
+ * job gets called from the queue.
+ * 
  * @ingroup JobQueue
  */
 class HTMLCacheUpdateJob extends Job {
@@ -204,7 +202,7 @@ class HTMLCacheUpdateJob extends Job {
 		$this->end = $params['end'];
 	}
 
-	function run() {
+	public function run() {
 		$update = new HTMLCacheUpdate( $this->title, $this->table );
 
 		$fromField = $update->getFromField();
diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index ba2196eb..e267962c 100644
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -20,25 +20,29 @@
  * @ingroup Cache
  */
 class HTMLFileCache {
-	var $mTitle, $mFileCache;
+	var $mTitle, $mFileCache, $mType;
 
-	function HTMLFileCache( &$title ) {
-		$this->mTitle =& $title;
-		$this->mFileCache = '';
+	public function __construct( &$title, $type = 'view' ) {
+		$this->mTitle = $title;
+		$this->mType = ($type == 'raw' || $type == 'view' ) ? $type : false;
+		$this->fileCacheName(); // init name
 	}
 
-	function fileCacheName() {
-		global $wgFileCacheDirectory;
+	public function fileCacheName() {
 		if( !$this->mFileCache ) {
+			global $wgFileCacheDirectory, $wgRequest;
+			# Store raw pages (like CSS hits) elsewhere
+			$subdir = ($this->mType === 'raw') ? 'raw/' : '';
 			$key = $this->mTitle->getPrefixedDbkey();
 			$hash = md5( $key );
+			# Avoid extension confusion
 			$key = str_replace( '.', '%2E', urlencode( $key ) );
-
+	
 			$hash1 = substr( $hash, 0, 1 );
 			$hash2 = substr( $hash, 0, 2 );
-			$this->mFileCache = "{$wgFileCacheDirectory}/{$hash1}/{$hash2}/{$key}.html";
+			$this->mFileCache = "{$wgFileCacheDirectory}/{$subdir}{$hash1}/{$hash2}/{$key}.html";
 
-			if($this->useGzip())
+			if( $this->useGzip() )
 				$this->mFileCache .= '.gz';
 
 			wfDebug( " fileCacheName() - {$this->mFileCache}\n" );
@@ -46,38 +50,72 @@ class HTMLFileCache {
 		return $this->mFileCache;
 	}
 
-	function isFileCached() {
+	public function isFileCached() {
+		if( $this->mType === false ) return false;
 		return file_exists( $this->fileCacheName() );
 	}
 
-	function fileCacheTime() {
+	public function fileCacheTime() {
 		return wfTimestamp( TS_MW, filemtime( $this->fileCacheName() ) );
 	}
+	
+	/**
+	 * Check if pages can be cached for this request/user
+	 * @return bool
+	 */
+	public static function useFileCache() {
+		global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest, $wgLang, $wgContLang;
+		if( !$wgUseFileCache ) return false;
+		// Get all query values
+		$queryVals = $wgRequest->getValues();
+		foreach( $queryVals as $query => $val ) {
+			if( $query == 'title' || $query == 'curid' ) continue;
+			// Normal page view in query form can have action=view.
+			// Raw hits for pages also stored, like .css pages for example.
+			else if( $query == 'action' && ($val == 'view' || $val == 'raw') ) continue;
+			else if( $query == 'usemsgcache' && $val == 'yes' ) continue;
+			// Below are header setting params
+			else if( $query == 'maxage' || $query == 'smaxage' || $query == 'ctype' || $query == 'gen' )
+				continue;
+			else
+				return false;
+		}
+		// Check for non-standard user language; this covers uselang,
+		// and extensions for auto-detecting user language.
+		$ulang = $wgLang->getCode();
+		$clang = $wgContLang->getCode();
+		// Check that there are no other sources of variation
+		return !$wgShowIPinHeader && !$wgUser->getId() && !$wgUser->getNewtalk() && $ulang == $clang;
+	}
 
-	function isFileCacheGood( $timestamp ) {
+	/* 
+	* Check if up to date cache file exists
+	* @param $timestamp string
+	*/
+	public function isFileCacheGood( $timestamp = '' ) {
 		global $wgCacheEpoch;
 
 		if( !$this->isFileCached() ) return false;
+		if( !$timestamp ) return true; // should be invalidated on change
 
 		$cachetime = $this->fileCacheTime();
-		$good = (( $timestamp <= $cachetime ) &&
-			 ( $wgCacheEpoch <= $cachetime ));
+		$good = $timestamp <= $cachetime && $wgCacheEpoch <= $cachetime;
 
-		wfDebug(" isFileCacheGood() - cachetime $cachetime, touched {$timestamp} epoch {$wgCacheEpoch}, good $good\n");
+		wfDebug(" isFileCacheGood() - cachetime $cachetime, touched '{$timestamp}' epoch {$wgCacheEpoch}, good $good\n");
 		return $good;
 	}
 
-	function useGzip() {
+	public function useGzip() {
 		global $wgUseGzip;
 		return $wgUseGzip;
 	}
 
 	/* In handy string packages */
-	function fetchRawText() {
+	public function fetchRawText() {
 		return file_get_contents( $this->fileCacheName() );
 	}
 
-	function fetchPageText() {
+	public function fetchPageText() {
 		if( $this->useGzip() ) {
 			/* Why is there no gzfile_get_contents() or gzdecode()? */
 			return implode( '', gzfile( $this->fileCacheName() ) );
@@ -87,15 +125,18 @@ class HTMLFileCache {
 	}
 
 	/* Working directory to/from output */
-	function loadFromFileCache() {
+	public function loadFromFileCache() {
 		global $wgOut, $wgMimeType, $wgOutputEncoding, $wgContLanguageCode;
 		wfDebug(" loadFromFileCache()\n");
 
-		$filename=$this->fileCacheName();
-		$wgOut->sendCacheControl();
-
-		header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
-		header( "Content-language: $wgContLanguageCode" );
+		$filename = $this->fileCacheName();
+		// Raw pages should handle cache control on their own,
+		// even when using file cache. This reduces hits from clients.
+		if( $this->mType !== 'raw' ) {
+			$wgOut->sendCacheControl();
+			header( "Content-Type: $wgMimeType; charset={$wgOutputEncoding}" );
+			header( "Content-Language: $wgContLanguageCode" );
+		}
 
 		if( $this->useGzip() ) {
 			if( wfClientAcceptsGzip() ) {
@@ -109,18 +150,22 @@ class HTMLFileCache {
 		readfile( $filename );
 	}
 
-	function checkCacheDirs() {
+	protected function checkCacheDirs() {
 		$filename = $this->fileCacheName();
-		$mydir2=substr($filename,0,strrpos($filename,'/')); # subdirectory level 2
-		$mydir1=substr($mydir2,0,strrpos($mydir2,'/')); # subdirectory level 1
+		$mydir2 = substr($filename,0,strrpos($filename,'/')); # subdirectory level 2
+		$mydir1 = substr($mydir2,0,strrpos($mydir2,'/')); # subdirectory level 1
 
-		if(!file_exists($mydir1)) { mkdir($mydir1,0775); } # create if necessary
-		if(!file_exists($mydir2)) { mkdir($mydir2,0775); }
+		wfMkdirParents( $mydir1 );
+		wfMkdirParents( $mydir2 );
 	}
 
-	function saveToFileCache( $origtext ) {
+	public function saveToFileCache( $origtext ) {
+		global $wgUseFileCache;
+		if( !$wgUseFileCache ) {
+			return $origtext; // return to output
+		}
 		$text = $origtext;
-		if(strcmp($text,'') == 0) return '';
+		if( strcmp($text,'') == 0 ) return '';
 
 		wfDebug(" saveToFileCache()\n", false);
 
@@ -155,4 +200,13 @@ class HTMLFileCache {
 		return $text;
 	}
 
+	public static function clearFileCache( $title ) {
+		global $wgUseFileCache;
+		if( !$wgUseFileCache ) return false;
+		$fc = new self( $title, 'view' );
+		@unlink( $fc->fileCacheName() );
+		$fc = new self( $title, 'raw' );
+		@unlink( $fc->fileCacheName() );
+		return true;
+	}
 }
diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index 3772926d..664ceb4f 100644
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -1,41 +1,33 @@
 <?php
 
 /**
- * Pure virtual parent
- * @todo document (needs a one-sentence top-level class description, that answers the question: "what is a HistoryBlob?")
+ * Base class for general text storage via the "object" flag in old_flags, or 
+ * two-part external storage URLs. Used for represent efficient concatenated 
+ * storage, and migration-related pointer objects.
  */
 interface HistoryBlob
 {
 	/**
-	 * setMeta and getMeta currently aren't used for anything, I just thought
-	 * they might be useful in the future.
-	 * @param $meta String: a single string.
-	 */
-	public function setMeta( $meta );
-
-	/**
-	 * setMeta and getMeta currently aren't used for anything, I just thought
-	 * they might be useful in the future.
-	 * Gets the meta-value
-	 */
-	public function getMeta();
-
-	/**
 	 * Adds an item of text, returns a stub object which points to the item.
 	 * You must call setLocation() on the stub object before storing it to the
 	 * database
+	 * Returns the key for getItem()
 	 */
 	public function addItem( $text );
 
 	/**
-	 * Get item by hash
+	 * Get item by key, or false if the key is not present
 	 */
-	public function getItem( $hash );
+	public function getItem( $key );
 
-	# Set the "default text"
-	# This concept is an odd property of the current DB schema, whereby each text item has a revision
-	# associated with it. The default text is the text of the associated revision. There may, however,
-	# be other revisions in the same object
+	/**
+	 * Set the "default text"
+	 * This concept is an odd property of the current DB schema, whereby each text item has a revision
+	 * associated with it. The default text is the text of the associated revision. There may, however,
+	 * be other revisions in the same object.
+	 *
+	 * Default text is not required for two-part external storage URLs.
+	 */
 	public function setText( $text );
 
 	/**
@@ -45,13 +37,15 @@ interface HistoryBlob
 }
 
 /**
- * The real object
- * @todo document (needs one-sentence top-level class description + function descriptions).
+ * Concatenated gzip (CGZ) storage
+ * Improves compression ratio by concatenating like objects before gzipping
  */
 class ConcatenatedGzipHistoryBlob implements HistoryBlob
 {
 	public $mVersion = 0, $mCompressed = false, $mItems = array(), $mDefaultHash = '';
-	public $mFast = 0, $mSize = 0;
+	public $mSize = 0;
+	public $mMaxSize = 10000000;
+	public $mMaxCount = 100;
 
 	/** Constructor */
 	public function ConcatenatedGzipHistoryBlob() {
@@ -60,34 +54,16 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 		}
 	}
 
-	#
-	# HistoryBlob implementation:
-	#
-
-	/** @todo document */
-	public function setMeta( $metaData ) {
-		$this->uncompress();
-		$this->mItems['meta'] = $metaData;
-	}
-
-	/** @todo document */
-	public function getMeta() {
-		$this->uncompress();
-		return $this->mItems['meta'];
-	}
-
-	/** @todo document */
 	public function addItem( $text ) {
 		$this->uncompress();
 		$hash = md5( $text );
-		$this->mItems[$hash] = $text;
-		$this->mSize += strlen( $text );
-
-		$stub = new HistoryBlobStub( $hash );
-		return $stub;
+		if ( !isset( $this->mItems[$hash] ) ) {
+			$this->mItems[$hash] = $text;
+			$this->mSize += strlen( $text );
+		}
+		return $hash;
 	}
 
-	/** @todo document */
 	public function getItem( $hash ) {
 		$this->uncompress();
 		if ( array_key_exists( $hash, $this->mItems ) ) {
@@ -97,29 +73,27 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 		}
 	}
 
-	/** @todo document */
 	public function setText( $text ) {
 		$this->uncompress();
-		$stub = $this->addItem( $text );
-		$this->mDefaultHash = $stub->mHash;
+		$this->mDefaultHash = $this->addItem( $text );
 	}
 
-	/** @todo document */
 	public function getText() {
 		$this->uncompress();
 		return $this->getItem( $this->mDefaultHash );
 	}
 
-	# HistoryBlob implemented.
-
-
-	/** @todo document */
+	/**
+	 * Remove an item
+	 */
 	public function removeItem( $hash ) {
 		$this->mSize -= strlen( $this->mItems[$hash] );
 		unset( $this->mItems[$hash] );
 	}
 
-	/** @todo document */
+	/**
+	 * Compress the bulk data in the object
+	 */
 	public function compress() {
 		if ( !$this->mCompressed  ) {
 			$this->mItems = gzdeflate( serialize( $this->mItems ) );
@@ -127,7 +101,9 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 		}
 	}
 
-	/** @todo document */
+	/**
+	 * Uncompress bulk data
+	 */
 	public function uncompress() {
 		if ( $this->mCompressed ) {
 			$this->mItems = unserialize( gzinflate( $this->mItems ) );
@@ -136,39 +112,22 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 	}
 
 
-	/** @todo document */
 	function __sleep() {
 		$this->compress();
 		return array( 'mVersion', 'mCompressed', 'mItems', 'mDefaultHash' );
 	}
 
-	/** @todo document */
 	function __wakeup() {
 		$this->uncompress();
 	}
 
 	/**
-	 * Determines if this object is happy
+	 * Helper function for compression jobs
+	 * Returns true until the object is "full" and ready to be committed
 	 */
-	public function isHappy( $maxFactor, $factorThreshold ) {
-		if ( count( $this->mItems ) == 0 ) {
-			return true;
-		}
-		if ( !$this->mFast ) {
-			$this->uncompress();
-			$record = serialize( $this->mItems );
-			$size = strlen( $record );
-			$avgUncompressed = $size / count( $this->mItems );
-			$compressed = strlen( gzdeflate( $record ) );
-
-			if ( $compressed < $factorThreshold * 1024 ) {
-				return true;
-			} else {
-				return $avgUncompressed * $maxFactor < $compressed;
-			}
-		} else {
-			return count( $this->mItems ) <= 10;
-		}
+	public function isHappy() {
+		return $this->mSize < $this->mMaxSize 
+			&& count( $this->mItems ) < $this->mMaxCount;
 	}
 }
 
@@ -184,12 +143,15 @@ $wgBlobCache = array();
 
 
 /**
- * @todo document (needs one-sentence top-level class description + some function descriptions).
+ * Pointer object for an item within a CGZ blob stored in the text table.
  */
 class HistoryBlobStub {
 	var $mOldId, $mHash, $mRef;
 
-	/** @todo document */
+	/**
+	 * @param string $hash The content hash of the text
+	 * @param integer $oldid The old_id for the CGZ object
+	 */
 	function HistoryBlobStub( $hash = '', $oldid = 0 ) {
 		$this->mHash = $hash;
 	}
@@ -216,7 +178,6 @@ class HistoryBlobStub {
 		return $this->mRef;
 	}
 
-	/** @todo document */
 	function getText() {
 		$fname = 'HistoryBlobStub::getText';
 		global $wgBlobCache;
@@ -264,7 +225,9 @@ class HistoryBlobStub {
 		return $obj->getItem( $this->mHash );
 	}
 
-	/** @todo document */
+	/**
+	 * Get the content hash
+	 */
 	function getHash() {
 		return $this->mHash;
 	}
@@ -282,7 +245,9 @@ class HistoryBlobStub {
 class HistoryBlobCurStub {
 	var $mCurId;
 
-	/** @todo document */
+	/**
+	 * @param integer $curid The cur_id pointed to
+	 */
 	function HistoryBlobCurStub( $curid = 0 ) {
 		$this->mCurId = $curid;
 	}
@@ -295,7 +260,6 @@ class HistoryBlobCurStub {
 		$this->mCurId = $id;
 	}
 
-	/** @todo document */
 	function getText() {
 		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow( 'cur', array( 'cur_text' ), array( 'cur_id' => $this->mCurId ) );
@@ -305,3 +269,311 @@ class HistoryBlobCurStub {
 		return $row->cur_text;
 	}
 }
+
+/**
+ * Diff-based history compression
+ * Requires xdiff 1.5+ and zlib
+ */
+class DiffHistoryBlob implements HistoryBlob {
+	/** Uncompressed item cache */
+	var $mItems = array();
+
+	/** Total uncompressed size */
+	var $mSize = 0;
+
+	/** 
+	 * Array of diffs. If a diff D from A to B is notated D = B - A, and Z is 
+	 * an empty string:
+	 *
+	 *              { item[map[i]] - item[map[i-1]]   where i > 0
+	 *    diff[i] = { 
+	 *              { item[map[i]] - Z                where i = 0
+	 */
+	var $mDiffs;
+
+	/** The diff map, see above */
+	var $mDiffMap;
+
+	/**
+	 * The key for getText()
+	 */
+	var $mDefaultKey;
+
+	/**
+	 * Compressed storage
+	 */
+	var $mCompressed;
+
+	/**
+	 * True if the object is locked against further writes
+	 */
+	var $mFrozen = false;
+
+	/**
+	 * The maximum uncompressed size before the object becomes sad
+	 * Should be less than max_allowed_packet
+	 */
+	var $mMaxSize = 10000000;
+
+	/**
+	 * The maximum number of text items before the object becomes sad
+	 */
+	var $mMaxCount = 100;
+	
+	/** Constants from xdiff.h */
+	const XDL_BDOP_INS = 1;
+	const XDL_BDOP_CPY = 2;
+	const XDL_BDOP_INSB = 3;
+
+	function __construct() {
+		if ( !function_exists( 'gzdeflate' ) ) {
+			throw new MWException( "Need zlib support to read or write DiffHistoryBlob\n" );
+		}
+	}
+
+	function addItem( $text ) {
+		if ( $this->mFrozen ) {
+			throw new MWException( __METHOD__.": Cannot add more items after sleep/wakeup" );
+		}
+
+		$this->mItems[] = $text;
+		$this->mSize += strlen( $text );
+		$this->mDiffs = null; // later
+		return count( $this->mItems ) - 1;
+	}
+
+	function getItem( $key ) {
+		return $this->mItems[$key];
+	}
+
+	function setText( $text ) {
+		$this->mDefaultKey = $this->addItem( $text );
+	}
+
+	function getText() {
+		return $this->getItem( $this->mDefaultKey );
+	}
+
+	function compress() {
+		if ( !function_exists( 'xdiff_string_rabdiff' ) ){ 
+			throw new MWException( "Need xdiff 1.5+ support to write DiffHistoryBlob\n" );
+		}
+		if ( isset( $this->mDiffs ) ) {
+			// Already compressed
+			return;
+		}
+		if ( !count( $this->mItems ) ) {
+			// Empty
+			return;
+		}
+
+		// Create two diff sequences: one for main text and one for small text
+		$sequences = array(
+			'small' => array(
+				'tail' => '',
+				'diffs' => array(),
+				'map' => array(),
+			),
+			'main' => array(
+				'tail' => '',
+				'diffs' => array(),
+				'map' => array(),
+			),
+		);
+		$smallFactor = 0.5;
+
+		for ( $i = 0; $i < count( $this->mItems ); $i++ ) {
+			$text = $this->mItems[$i];
+			if ( $i == 0 ) {
+				$seqName = 'main';
+			} else {
+				$mainTail = $sequences['main']['tail'];
+				if ( strlen( $text ) < strlen( $mainTail ) * $smallFactor ) {
+					$seqName = 'small';
+				} else {
+					$seqName = 'main';
+				}
+			}
+			$seq =& $sequences[$seqName];
+			$tail = $seq['tail'];
+			$diff = $this->diff( $tail, $text );
+			$seq['diffs'][] = $diff;
+			$seq['map'][] = $i;
+			$seq['tail'] = $text;
+		}
+		unset( $seq ); // unlink dangerous alias
+
+		// Knit the sequences together
+		$tail = '';
+		$this->mDiffs = array();
+		$this->mDiffMap = array();
+		foreach ( $sequences as $seq ) {
+			if ( !count( $seq['diffs'] ) ) {
+				continue;
+			}
+			if ( $tail === '' ) {
+				$this->mDiffs[] = $seq['diffs'][0];
+			} else {
+				$head = $this->patch( '', $seq['diffs'][0] );
+				$this->mDiffs[] = $this->diff( $tail, $head );
+			}
+			$this->mDiffMap[] = $seq['map'][0];
+			for ( $i = 1; $i < count( $seq['diffs'] ); $i++ ) {
+				$this->mDiffs[] = $seq['diffs'][$i];
+				$this->mDiffMap[] = $seq['map'][$i];
+			}
+			$tail = $seq['tail'];
+		}
+	}
+
+	function diff( $t1, $t2 ) {
+		# Need to do a null concatenation with warnings off, due to bugs in the current version of xdiff
+		# "String is not zero-terminated"
+		wfSuppressWarnings();
+		$diff = xdiff_string_rabdiff( $t1, $t2 ) . '';
+		wfRestoreWarnings();
+		return $diff;
+	}
+
+	function patch( $base, $diff ) {
+		if ( function_exists( 'xdiff_string_bpatch' ) ) {
+			wfSuppressWarnings();
+			$text = xdiff_string_bpatch( $base, $diff ) . '';
+			wfRestoreWarnings();
+			return $text;
+		}
+
+		# Pure PHP implementation
+
+		$header = unpack( 'Vofp/Vcsize', substr( $diff, 0, 8 ) );
+		
+		# Check the checksum if mhash is available
+		if ( extension_loaded( 'mhash' ) ) {
+			$ofp = mhash( MHASH_ADLER32, $base );
+			if ( $ofp !== substr( $diff, 0, 4 ) ) {
+				wfDebug( __METHOD__. ": incorrect base checksum\n" );
+				return false;
+			}
+		}
+		if ( $header['csize'] != strlen( $base ) ) {
+			wfDebug( __METHOD__. ": incorrect base length\n" );
+			return false;
+		}
+		
+		$p = 8;
+		$out = '';
+		while ( $p < strlen( $diff ) ) {
+			$x = unpack( 'Cop', substr( $diff, $p, 1 ) );
+			$op = $x['op'];
+			++$p;
+			switch ( $op ) {
+			case self::XDL_BDOP_INS:
+				$x = unpack( 'Csize', substr( $diff, $p, 1 ) );
+				$p++;
+				$out .= substr( $diff, $p, $x['size'] );
+				$p += $x['size'];
+				break;
+			case self::XDL_BDOP_INSB:
+				$x = unpack( 'Vcsize', substr( $diff, $p, 4 ) );
+				$p += 4;
+				$out .= substr( $diff, $p, $x['csize'] );
+				$p += $x['csize'];
+				break;
+			case self::XDL_BDOP_CPY:
+				$x = unpack( 'Voff/Vcsize', substr( $diff, $p, 8 ) );
+				$p += 8;
+				$out .= substr( $base, $x['off'], $x['csize'] );
+				break;
+			default:
+				wfDebug( __METHOD__.": invalid op\n" );
+				return false;
+			}
+		}
+		return $out;
+	}
+
+	function uncompress() {
+		if ( !$this->mDiffs ) {
+			return;
+		}
+		$tail = '';
+		for ( $diffKey = 0; $diffKey < count( $this->mDiffs ); $diffKey++ ) {
+			$textKey = $this->mDiffMap[$diffKey];
+			$text = $this->patch( $tail, $this->mDiffs[$diffKey] );
+			$this->mItems[$textKey] = $text;
+			$tail = $text;
+		}
+	}
+
+	function __sleep() {
+		$this->compress();
+		if ( !count( $this->mItems ) ) {
+			// Empty object
+			$info = false;
+		} else {
+			// Take forward differences to improve the compression ratio for sequences
+			$map = '';
+			$prev = 0;
+			foreach ( $this->mDiffMap as $i ) {
+				if ( $map !== '' ) {
+					$map .= ',';
+				}
+				$map .= $i - $prev;
+				$prev = $i;
+			}
+			$info = array(
+				'diffs' => $this->mDiffs,
+				'map' => $map
+			);
+		}
+		if ( isset( $this->mDefaultKey ) ) {
+			$info['default'] = $this->mDefaultKey;
+		}
+		$this->mCompressed = gzdeflate( serialize( $info ) );
+		return array( 'mCompressed' );
+	}
+
+	function __wakeup() {
+		// addItem() doesn't work if mItems is partially filled from mDiffs
+		$this->mFrozen = true;
+		$info = unserialize( gzinflate( $this->mCompressed ) );
+		unset( $this->mCompressed );
+
+		if ( !$info ) {
+			// Empty object
+			return;
+		}
+
+		if ( isset( $info['default'] ) ) {
+			$this->mDefaultKey = $info['default'];
+		}
+		$this->mDiffs = $info['diffs'];
+		if ( isset( $info['base'] ) ) {
+			// Old format
+			$this->mDiffMap = range( 0, count( $this->mDiffs ) - 1 );
+			array_unshift( $this->mDiffs, 
+				pack( 'VVCV', 0, 0, self::XDL_BDOP_INSB, strlen( $info['base'] ) ) .
+				$info['base'] );
+		} else {
+			// New format
+			$map = explode( ',', $info['map'] );
+			$cur = 0;
+			$this->mDiffMap = array();
+			foreach ( $map as $i ) {
+				$cur += $i;
+				$this->mDiffMap[] = $cur;
+			}
+		}
+		$this->uncompress();
+	}
+
+	/**
+	 * Helper function for compression jobs
+	 * Returns true until the object is "full" and ready to be committed
+	 */
+	function isHappy() {
+		return $this->mSize < $this->mMaxSize 
+			&& count( $this->mItems ) < $this->mMaxCount;
+	}
+
+}
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 555a79b7..269d45ff 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -1,24 +1,48 @@
 <?php
 
 /**
+ * @defgroup HTTP HTTP
+ * @file
+ * @ingroup HTTP
+ */
+
+/**
  * Various HTTP related functions
+ * @ingroup HTTP
  */
 class Http {
-	static function get( $url, $timeout = 'default' ) {
-		return Http::request( "GET", $url, $timeout );
+
+	/**
+	 * Simple wrapper for Http::request( 'GET' )
+	 * @see Http::request()
+	 */
+	public static function get( $url, $timeout = 'default', $opts = array() ) {
+		return Http::request( "GET", $url, $timeout, $opts );
 	}
 
-	static function post( $url, $timeout = 'default' ) {
-		return Http::request( "POST", $url, $timeout );
+	/**
+	 * Simple wrapper for Http::request( 'POST' )
+	 * @see Http::request()
+	 */
+	public static function post( $url, $timeout = 'default', $opts = array() ) {
+		return Http::request( "POST", $url, $timeout, $opts );
 	}
 
 	/**
 	 * Get the contents of a file by HTTP
-	 *
-	 * if $timeout is 'default', $wgHTTPTimeout is used
+	 * @param $method string HTTP method. Usually GET/POST
+	 * @param $url string Full URL to act on
+	 * @param $timeout int Seconds to timeout. 'default' falls to $wgHTTPTimeout
+	 * @param $curlOptions array Optional array of extra params to pass 
+	 * to curl_setopt()
 	 */
-	static function request( $method, $url, $timeout = 'default' ) {
-		global $wgHTTPTimeout, $wgHTTPProxy, $wgVersion, $wgTitle;
+	public static function request( $method, $url, $timeout = 'default', $curlOptions = array() ) {
+		global $wgHTTPTimeout, $wgHTTPProxy, $wgTitle;
+
+		// Go ahead and set the timeout if not otherwise specified
+		if ( $timeout == 'default' ) {
+			$timeout = $wgHTTPTimeout;
+		}
 
 		wfDebug( __METHOD__ . ": $method $url\n" );
 		# Use curl if available
@@ -30,13 +54,12 @@ class Http {
 				curl_setopt($c, CURLOPT_PROXY, $wgHTTPProxy);
 			}
 
-			if ( $timeout == 'default' ) {
-				$timeout = $wgHTTPTimeout;
-			}
 			curl_setopt( $c, CURLOPT_TIMEOUT, $timeout );
-			curl_setopt( $c, CURLOPT_USERAGENT, "MediaWiki/$wgVersion" );
-			if ( $method == 'POST' )
+			curl_setopt( $c, CURLOPT_USERAGENT, self :: userAgent() );
+			if ( $method == 'POST' ) {
 				curl_setopt( $c, CURLOPT_POST, true );
+				curl_setopt( $c, CURLOPT_POSTFIELDS, '' );
+			}
 			else
 				curl_setopt( $c, CURLOPT_CUSTOMREQUEST, $method );
 
@@ -48,6 +71,12 @@ class Http {
 			if ( is_object( $wgTitle ) ) {
 				curl_setopt( $c, CURLOPT_REFERER, $wgTitle->getFullURL() );
 			}
+			
+			if ( is_array( $curlOptions ) ) {
+				foreach( $curlOptions as $option => $value ) {
+					curl_setopt( $c, $option, $value );
+				}
+			}
 
 			ob_start();
 			curl_exec( $c );
@@ -55,20 +84,24 @@ class Http {
 			ob_end_clean();
 
 			# Don't return the text of error messages, return false on error
-			if ( curl_getinfo( $c, CURLINFO_HTTP_CODE ) != 200 ) {
+			$retcode = curl_getinfo( $c, CURLINFO_HTTP_CODE );
+			if ( $retcode != 200 ) {
+				wfDebug( __METHOD__ . ": HTTP return code $retcode\n" );
 				$text = false;
 			}
 			# Don't return truncated output
-			if ( curl_errno( $c ) != CURLE_OK ) {
+			$errno = curl_errno( $c );
+			if ( $errno != CURLE_OK ) {
+				$errstr = curl_error( $c );
+				wfDebug( __METHOD__ . ": CURL error code $errno: $errstr\n" );
 				$text = false;
 			}
 			curl_close( $c );
 		} else {
 			# Otherwise use file_get_contents...
-			# This may take 3 minutes to time out, and doesn't have local fetch capabilities
+			# This doesn't have local fetch capabilities...
 
-			global $wgVersion;
-			$headers = array( "User-Agent: MediaWiki/$wgVersion" );
+			$headers = array( "User-Agent: " . self :: userAgent() );
 			if( strcasecmp( $method, 'post' ) == 0 ) {
 				// Required for HTTP 1.0 POSTs
 				$headers[] = "Content-Length: 0";
@@ -76,20 +109,21 @@ class Http {
 			$opts = array(
 				'http' => array(
 					'method' => $method,
-					'header' => implode( "\r\n", $headers ) ) );
+					'header' => implode( "\r\n", $headers ),
+					'timeout' => $timeout ) );
 			$ctx = stream_context_create($opts);
 
-			$url_fopen = ini_set( 'allow_url_fopen', 1 );
 			$text = file_get_contents( $url, false, $ctx );
-			ini_set( 'allow_url_fopen', $url_fopen );
 		}
 		return $text;
 	}
 
 	/**
 	 * Check if the URL can be served by localhost
+	 * @param $url string Full url to check
+	 * @return bool
 	 */
-	static function isLocalURL( $url ) {
+	public static function isLocalURL( $url ) {
 		global $wgCommandLineMode, $wgConf;
 		if ( $wgCommandLineMode ) {
 			return false;
@@ -117,4 +151,12 @@ class Http {
 		}
 		return false;
 	}
+	
+	/**
+	 * Return a standard user-agent we can use for external requests.
+	 */
+	public static function userAgent() {
+		global $wgVersion;
+		return "MediaWiki/$wgVersion";
+	}
 }
diff --git a/includes/IEContentAnalyzer.php b/includes/IEContentAnalyzer.php
index 59abc6a6..df4d36f0 100644
--- a/includes/IEContentAnalyzer.php
+++ b/includes/IEContentAnalyzer.php
@@ -569,8 +569,9 @@ class IEContentAnalyzer {
 		$chunk3 = substr( $chunk, 0, 3 );
 		$chunk4 = substr( $chunk, 0, 4 );
 		$chunk5 = substr( $chunk, 0, 5 );
+		$chunk5uc = strtoupper( $chunk5 );
 		$chunk8 = substr( $chunk, 0, 8 );
-		if ( $chunk5 == 'GIF87' || $chunk5 == 'GIF89' ) {
+		if ( $chunk5uc == 'GIF87' || $chunk5uc == 'GIF89' ) {
 			return 'image/gif';
 		}
 		if ( $chunk2 == "\xff\xd8" ) {
@@ -579,7 +580,7 @@ class IEContentAnalyzer {
 
 		if ( $chunk2 == 'BM' 
 			&& substr( $chunk, 6, 2 ) == "\000\000"
-			&& substr( $chunk, 8, 2 ) != "\000\000" )
+			&& substr( $chunk, 8, 2 ) == "\000\000" )
 		{
 			return 'image/bmp'; // another non-standard MIME
 		}
@@ -800,7 +801,7 @@ class IEContentAnalyzer {
 			}
 
 			// BinHex
-			if ( !strncasecmp( $remainder, $binhexMagic, strlen( $binhexMagic ) ) ) {
+			if ( !strncmp( $remainder, $binhexMagic, strlen( $binhexMagic ) ) ) {
 				$found['binhex'] = true;
 			}
 		}
diff --git a/includes/IP.php b/includes/IP.php
index e76f66c1..e5973c2b 100644
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -141,7 +141,7 @@ class IP {
 	public static function toOctet( $ip_int ) {
    		// Convert to padded uppercase hex
    		$ip_hex = wfBaseConvert($ip_int, 10, 16, 32, false);
-   		// Seperate into 8 octets
+   		// Separate into 8 octets
    		$ip_oct = substr( $ip_hex, 0, 4 );
    		for ($n=1; $n < 8; $n++) {
    			$ip_oct .= ':' . substr($ip_hex, 4*$n, 4);
@@ -150,6 +150,41 @@ class IP {
    		$ip_oct = preg_replace( '/(^|:)0+' . RE_IPV6_WORD . '/', '$1$2', $ip_oct );
        	return $ip_oct;
 	}
+	
+	/**
+	 * Given a hexadecimal number, returns to an IPv6 address in octet notation
+	 * @param $ip string hex IP
+	 * @return string
+	 */
+	public static function HextoOctet( $ip_hex ) {
+   		// Convert to padded uppercase hex
+   		$ip_hex = str_pad( strtoupper($ip_hex), 32, '0');
+   		// Separate into 8 octets
+   		$ip_oct = substr( $ip_hex, 0, 4 );
+   		for ($n=1; $n < 8; $n++) {
+   			$ip_oct .= ':' . substr($ip_hex, 4*$n, 4);
+   		}
+   		// NO leading zeroes
+   		$ip_oct = preg_replace( '/(^|:)0+' . RE_IPV6_WORD . '/', '$1$2', $ip_oct );
+       	return $ip_oct;
+	}
+	
+	/**
+	 * Converts a hexadecimal number to an IPv4 address in octet notation
+	 * @param $ip string Hex IP
+	 * @return string
+	 */ 
+	public static function hexToQuad( $ip ) {
+		// Converts a hexadecimal IP to nnn.nnn.nnn.nnn format
+		$dec = wfBaseConvert( $ip, 16, 10 );
+		$parts[3] = $dec % 256;
+		$dec /= 256;
+		$parts[2] = $dec % 256;
+		$dec /= 256;
+		$parts[1] = $dec % 256;
+		$parts[0] = $dec / 256;
+		return implode( '.', array_reverse( $parts ) );
+	}
 
 	/**
 	 * Convert a network specification in IPv6 CIDR notation to an integer network and a number of bits
@@ -320,7 +355,7 @@ class IP {
 	public static function toHex( $ip ) {
 		$n = self::toUnsigned( $ip );
 		if ( $n !== false ) {
-			$n = ( self::isIPv6($ip) ) ? "v6-" . wfBaseConvert( $n, 10, 16, 32, false ) : wfBaseConvert( $n, 10, 16, 8, false );
+			$n = self::isIPv6($ip) ? "v6-" . wfBaseConvert( $n, 10, 16, 32, false ) : wfBaseConvert( $n, 10, 16, 8, false );
 		}
 		return $n;
 	}
@@ -426,12 +461,16 @@ class IP {
 		} elseif ( strpos( $range, '-' ) !== false ) {
 			# Explicit range
 			list( $start, $end ) = array_map( 'trim', explode( '-', $range, 2 ) );
-			$start = self::toUnsigned( $start ); $end = self::toUnsigned( $end );
-			if ( $start > $end ) {
-				$start = $end = false;
+			if( self::isIPAddress( $start ) && self::isIPAddress( $end ) ) {
+				$start = self::toUnsigned( $start ); $end = self::toUnsigned( $end );
+				if ( $start > $end ) {
+					$start = $end = false;
+				} else {
+					$start = sprintf( '%08X', $start );
+					$end = sprintf( '%08X', $end );
+				}
 			} else {
-				$start = sprintf( '%08X', $start );
-				$end = sprintf( '%08X', $end );
+				$start = $end = false;
 			}
 		} else {
 			# Single IP
diff --git a/includes/ImageFunctions.php b/includes/ImageFunctions.php
index af05c1c9..73d935a7 100644
--- a/includes/ImageFunctions.php
+++ b/includes/ImageFunctions.php
@@ -4,9 +4,10 @@
  * http://www.w3.org/TR/SVG11/coords.html#UnitIdentifiers
  *
  * @param $length String: CSS/SVG length.
- * @return Integer: length in pixels
+ * @param $viewportSize: Float optional scale for percentage units...
+ * @return float: length in pixels
  */
-function wfScaleSVGUnit( $length ) {
+function wfScaleSVGUnit( $length, $viewportSize=512 ) {
 	static $unitLength = array(
 		'px' => 1.0,
 		'pt' => 1.25,
@@ -14,17 +15,74 @@ function wfScaleSVGUnit( $length ) {
 		'mm' => 3.543307,
 		'cm' => 35.43307,
 		'in' => 90.0,
+		'em' => 16.0, // fake it?
+		'ex' => 12.0, // fake it?
 		''   => 1.0, // "User units" pixels by default
-		'%'  => 2.0, // Fake it!
 		);
 	$matches = array();
-	if( preg_match( '/^(\d+(?:\.\d+)?)(em|ex|px|pt|pc|cm|mm|in|%|)$/', $length, $matches ) ) {
+	if( preg_match( '/^\s*(\d+(?:\.\d+)?)(em|ex|px|pt|pc|cm|mm|in|%|)\s*$/', $length, $matches ) ) {
 		$length = floatval( $matches[1] );
 		$unit = $matches[2];
-		return round( $length * $unitLength[$unit] );
+		if( $unit == '%' ) {
+			return $length * 0.01 * $viewportSize;
+		} else {
+			return $length * $unitLength[$unit];
+		}
 	} else {
 		// Assume pixels
-		return round( floatval( $length ) );
+		return floatval( $length );
+	}
+}
+
+class XmlSizeFilter {
+	const DEFAULT_WIDTH = 512;
+	const DEFAULT_HEIGHT = 512;
+	var $first = true;
+	var $width = self::DEFAULT_WIDTH;
+	var $height = self::DEFAULT_HEIGHT;
+	function filter( $name, $attribs ) {
+		if( $this->first ) {
+			$defaultWidth = self::DEFAULT_WIDTH;
+			$defaultHeight = self::DEFAULT_HEIGHT;
+			$aspect = 1.0;
+			$width = null;
+			$height = null;
+			
+			if( isset( $attribs['viewBox'] ) ) {
+				// min-x min-y width height
+				$viewBox = preg_split( '/\s+/', trim( $attribs['viewBox'] ) );
+				if( count( $viewBox ) == 4 ) {
+					$viewWidth = wfScaleSVGUnit( $viewBox[2] );
+					$viewHeight = wfScaleSVGUnit( $viewBox[3] );
+					if( $viewWidth > 0 && $viewHeight > 0 ) {
+						$aspect = $viewWidth / $viewHeight;
+						$defaultHeight = $defaultWidth / $aspect;
+					}
+				}
+			}
+			if( isset( $attribs['width'] ) ) {
+				$width = wfScaleSVGUnit( $attribs['width'], $defaultWidth );
+			}
+			if( isset( $attribs['height'] ) ) {
+				$height = wfScaleSVGUnit( $attribs['height'], $defaultHeight );
+			}
+			
+			if( !isset( $width ) && !isset( $height ) ) {
+				$width = $defaultWidth;
+				$height = $width / $aspect;
+			} elseif( isset( $width ) && !isset( $height ) ) {
+				$height = $width / $aspect;
+			} elseif( isset( $height ) && !isset( $width ) ) {
+				$width = $height * $aspect;
+			}
+			
+			if( $width > 0 && $height > 0 ) {
+				$this->width = intval( round( $width ) );
+				$this->height = intval( round( $height ) );
+			}
+			
+			$this->first = false;
+		}
 	}
 }
 
@@ -38,30 +96,14 @@ function wfScaleSVGUnit( $length ) {
  * @return array
  */
 function wfGetSVGsize( $filename ) {
-	$width = 256;
-	$height = 256;
-
-	// Read a chunk of the file
-	$f = fopen( $filename, "rt" );
-	if( !$f ) return false;
-	$chunk = fread( $f, 4096 );
-	fclose( $f );
-
-	// Uber-crappy hack! Run through a real XML parser.
-	$matches = array();
-	if( !preg_match( '/<svg\s*([^>]*)\s*>/s', $chunk, $matches ) ) {
-		return false;
-	}
-	$tag = $matches[1];
-	if( preg_match( '/(?:^|\s)width\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
-		$width = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
+	$filter = new XmlSizeFilter();
+	$xml = new XmlTypeCheck( $filename, array( $filter, 'filter' ) );
+	if( $xml->wellFormed ) {
+		return array( $filter->width, $filter->height, 'SVG',
+			"width=\"$filter->width\" height=\"$filter->height\"" );
 	}
-	if( preg_match( '/(?:^|\s)height\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
-		$height = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
-	}
-
-	return array( $width, $height, 'SVG',
-		"width=\"$width\" height=\"$height\"" );
+	
+	return false;
 }
 
 /**
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 492a3e06..f3f525c1 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -244,7 +244,7 @@ class ImageGallery
 
 			$img = wfFindFile( $nt, $time );
 
-			if( $nt->getNamespace() != NS_IMAGE || !$img ) {
+			if( $nt->getNamespace() != NS_FILE || !$img ) {
 				# We're dealing with a non-image, spit out the name and be done with it.
 				$thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
 					. htmlspecialchars( $nt->getText() ) . '</div>';
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 30fcf13e..314d478e 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -22,22 +22,28 @@ class ImagePage extends Article {
 		$this->dupes = null;
 		$this->repo = null;
 	}
+	
+	public function setFile( $file ) {
+		$this->displayImg = $file;
+		$this->img = $file;
+		$this->fileLoaded = true;
+	}
 
 	protected function loadFile() {
-		if ( $this->fileLoaded ) {
+		if( $this->fileLoaded ) {
 			return true;
 		}
 		$this->fileLoaded = true;
 
 		$this->displayImg = $this->img = false;
 		wfRunHooks( 'ImagePageFindFile', array( $this, &$this->img, &$this->displayImg ) );
-		if ( !$this->img ) {
+		if( !$this->img ) {
 			$this->img = wfFindFile( $this->mTitle );
-			if ( !$this->img ) {
+			if( !$this->img ) {
 				$this->img = wfLocalFile( $this->mTitle );
 			}
 		}
-		if ( !$this->displayImg ) {
+		if( !$this->displayImg ) {
 			$this->displayImg = $this->img;
 		}
 		$this->repo = $this->img->getRepo();
@@ -47,18 +53,18 @@ class ImagePage extends Article {
 	 * Handler for action=render
 	 * Include body text only; none of the image extras
 	 */
-	function render() {
+	public function render() {
 		global $wgOut;
 		$wgOut->setArticleBodyOnly( true );
 		parent::view();
 	}
 
-	function view() {
+	public function view() {
 		global $wgOut, $wgShowEXIF, $wgRequest, $wgUser;
 		$this->loadFile();
 
-		if ( $this->mTitle->getNamespace() == NS_IMAGE && $this->img->getRedirected() ) {
-			if ( $this->mTitle->getDBkey() == $this->img->getName() ) {
+		if( $this->mTitle->getNamespace() == NS_FILE && $this->img->getRedirected() ) {
+			if( $this->mTitle->getDBkey() == $this->img->getName() ) {
 				// mTitle is the same as the redirect target so ask Article
 				// to perform the redirect for us.
 				return Article::view();
@@ -66,8 +72,8 @@ class ImagePage extends Article {
 				// mTitle is not the same as the redirect target so it is 
 				// probably the redirect page itself. Fake the redirect symbol
 				$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-				$this->viewRedirect( Title::makeTitle( NS_IMAGE, $this->img->getName() ),
-					/* $appendSubtitle */ true, /* $forceKnown */ true );
+				$wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->img->getName() ),
+					/* $appendSubtitle */ true, /* $forceKnown */ true ) );
 				$this->viewUpdates();
 				return;
 			}
@@ -76,10 +82,10 @@ class ImagePage extends Article {
 		$diff = $wgRequest->getVal( 'diff' );
 		$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
 
-		if ( $this->mTitle->getNamespace() != NS_IMAGE || ( isset( $diff ) && $diffOnly ) )
+		if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) )
 			return Article::view();
 
-		if ( $wgShowEXIF && $this->displayImg->exists() ) {
+		if( $wgShowEXIF && $this->displayImg->exists() ) {
 			// FIXME: bad interface, see note on MediaHandler::formatMetadata().
 			$formattedMetadata = $this->displayImg->formatMetadata();
 			$showmeta = $formattedMetadata !== false;
@@ -87,24 +93,25 @@ class ImagePage extends Article {
 			$showmeta = false;
 		}
 
-		if ( $this->displayImg->exists() )
+		if( !$diff && $this->displayImg->exists() )
 			$wgOut->addHTML( $this->showTOC($showmeta) );
 
-		$this->openShowImage();
+		if( !$diff )
+			$this->openShowImage();
 
 		# No need to display noarticletext, we use our own message, output in openShowImage()
-		if ( $this->getID() ) {
+		if( $this->getID() ) {
 			Article::view();
 		} else {
 			# Just need to set the right headers
 			$wgOut->setArticleFlag( true );
-			$wgOut->setRobotpolicy( 'noindex,nofollow' );
+			$wgOut->setRobotPolicy( 'noindex,nofollow' );
 			$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
 			$this->viewUpdates();
 		}
 
 		# Show shared description, if needed
-		if ( $this->mExtraDescription ) {
+		if( $this->mExtraDescription ) {
 			$fol = wfMsgNoTrans( 'shareddescriptionfollows' );
 			if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) {
 				$wgOut->addWikiText( $fol );
@@ -118,21 +125,21 @@ class ImagePage extends Article {
 		$this->imageHistory();
 		// TODO: Cleanup the following
 		
-		$wgOut->addHTML( Xml::element( 'h2', 
-			array( 'id' => 'filelinks' ), 
+		$wgOut->addHTML( Xml::element( 'h2',
+			array( 'id' => 'filelinks' ),
 			wfMsg( 'imagelinks' ) ) . "\n" );
 		$this->imageDupes();
 		// TODO: We may want to find local images redirecting to a foreign 
 		// file: "The following local files redirect to this file"
-		if ( $this->img->isLocal() ) {
+		if( $this->img->isLocal() ) {
 			$this->imageRedirects();
 		}
 		$this->imageLinks();
 
-		if ( $showmeta ) {
+		if( $showmeta ) {
 			global $wgStylePath, $wgStyleVersion;
-			$expand = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-expand' ) ) );
-			$collapse = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-collapse' ) ) );
+			$expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
+			$collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
 			$wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ). "\n" );
 			$wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
 			$wgOut->addScriptFile( 'metadata.js' );
@@ -143,32 +150,32 @@ class ImagePage extends Article {
 	
 	public function getRedirectTarget() {
 		$this->loadFile();
-		if ( $this->img->isLocal() ) {
+		if( $this->img->isLocal() ) {
 			return parent::getRedirectTarget();
 		}
 		// Foreign image page
 		$from = $this->img->getRedirected();
 		$to = $this->img->getName();
-		if ( $from == $to ) {
+		if( $from == $to ) {
 			return null; 
 		}
-		return $this->mRedirectTarget = Title::makeTitle( NS_IMAGE, $to );
+		return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to );
 	}
 	public function followRedirect() {
 		$this->loadFile();
-		if ( $this->img->isLocal() ) {
+		if( $this->img->isLocal() ) {
 			return parent::followRedirect();
 		}
 		$from = $this->img->getRedirected();
 		$to = $this->img->getName();
-		if ( $from == $to ) {
+		if( $from == $to ) {
 			return false; 
 		}
-		return Title::makeTitle( NS_IMAGE, $to );	
+		return Title::makeTitle( NS_FILE, $to );	
 	}
 	public function isRedirect( $text = false ) {
 		$this->loadFile();
-		if ( $this->img->isLocal() )
+		if( $this->img->isLocal() )
 			return parent::isRedirect( $text );
 			
 		return (bool)$this->img->getRedirected();
@@ -191,10 +198,10 @@ class ImagePage extends Article {
 	
 	public function getDuplicates() {
 		$this->loadFile();
-		if ( !is_null($this->dupes) ) {
+		if( !is_null($this->dupes) ) {
 			return $this->dupes;
 		}
-		if ( !( $hash = $this->img->getSha1() ) ) {
+		if( !( $hash = $this->img->getSha1() ) ) {
 			return $this->dupes = array();
 		}
 		$dupes = RepoGroup::singleton()->findBySha1( $hash );
@@ -203,9 +210,9 @@ class ImagePage extends Article {
 		$size = $this->img->getSize();
 		foreach ( $dupes as $index => $file ) {
 			$key = $file->getRepoName().':'.$file->getName();
-			if ( $key == $self )
+			if( $key == $self )
 				unset( $dupes[$index] );
-			if ( $file->getSize() != $size )
+			if( $file->getSize() != $size )
 				unset( $dupes[$index] );
 		}
 		return $this->dupes = $dupes;
@@ -216,15 +223,13 @@ class ImagePage extends Article {
 	/**
 	 * Create the TOC
 	 *
-	 * @access private
-	 *
 	 * @param bool $metadata Whether or not to show the metadata link
 	 * @return string
 	 */
-	function showTOC( $metadata ) {
+	protected function showTOC( $metadata ) {
 		global $wgLang;
 		$r = '<ul id="filetoc">
-			<li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>
+			<li><a href="#file">' . $wgLang->getNsText( NS_FILE ) . '</a></li>
 			<li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>
 			<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>' .
 			($metadata ? ' <li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
@@ -237,16 +242,15 @@ class ImagePage extends Article {
 	 *
 	 * FIXME: bad interface, see note on MediaHandler::formatMetadata().
 	 *
-	 * @access private
-	 *
 	 * @param array $exif The array containing the EXIF data
 	 * @return string
 	 */
-	function makeMetadataTable( $metadata ) {
+	protected function makeMetadataTable( $metadata ) {
 		$r = wfMsg( 'metadata-help' ) . "\n\n";
 		$r .= "{| id=mw_metadata class=mw_metadata\n";
 		foreach ( $metadata as $type => $stuff ) {
 			foreach ( $stuff as $v ) {
+				# FIXME, why is this using escapeId for a class?!
 				$class = Sanitizer::escapeId( $v['id'] );
 				if( $type == 'collapsed' ) {
 					$class .= ' collapsable';
@@ -266,7 +270,7 @@ class ImagePage extends Article {
 	 * Omit noarticletext if sharedupload; text will be fetched from the
 	 * shared upload server if possible.
 	 */
-	function getContent() {
+	public function getContent() {
 		$this->loadFile();
 		if( $this->img && !$this->img->isLocal() && 0 == $this->getID() ) {
 			return '';
@@ -274,7 +278,7 @@ class ImagePage extends Article {
 		return Article::getContent();
 	}
 
-	function openShowImage() {
+	protected function openShowImage() {
 		global $wgOut, $wgUser, $wgImageLimits, $wgRequest, $wgLang, $wgContLang;
 
 		$this->loadFile();
@@ -298,10 +302,10 @@ class ImagePage extends Article {
 		$sk = $wgUser->getSkin();
 		$dirmark = $wgContLang->getDirMark();
 
-		if ( $this->displayImg->exists() ) {
+		if( $this->displayImg->exists() ) {
 			# image
 			$page = $wgRequest->getIntOrNull( 'page' );
-			if ( is_null( $page ) ) {
+			if( is_null( $page ) ) {
 				$params = array();
 				$page = 1;
 			} else {
@@ -318,16 +322,16 @@ class ImagePage extends Article {
 
 			wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this , &$wgOut ) )	;
 
-			if ( $this->displayImg->allowInlineDisplay() ) {
+			if( $this->displayImg->allowInlineDisplay() ) {
 				# image
 
 				# "Download high res version" link below the image
 				#$msgsize = wfMsgHtml('file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->displayImg->getSize() ), $mime );
 				# We'll show a thumbnail of this image
-				if ( $width > $maxWidth || $height > $maxHeight ) {
+				if( $width > $maxWidth || $height > $maxHeight ) {
 					# Calculate the thumbnail size.
 					# First case, the limiting factor is the width, not the height.
-					if ( $width / $height >= $maxWidth / $maxHeight ) {
+					if( $width / $height >= $maxWidth / $maxHeight ) {
 						$height = round( $height * $maxWidth / $width);
 						$width = $maxWidth;
 						# Note that $height <= $maxHeight now.
@@ -339,8 +343,10 @@ class ImagePage extends Article {
 						# because of rounding.
 					}
 					$msgbig  = wfMsgHtml( 'show-big-image' );
-					$msgsmall = wfMsgExt( 'show-big-image-thumb',
-						array( 'parseinline' ), $wgLang->formatNum( $width ), $wgLang->formatNum( $height ) );
+					$msgsmall = wfMsgExt( 'show-big-image-thumb', 'parseinline',
+						$wgLang->formatNum( $width ),
+						$wgLang->formatNum( $height )
+					);
 				} else {
 					# Image is small enough to show full size on image page
 					$msgbig = htmlspecialchars( $this->displayImg->getName() );
@@ -359,11 +365,11 @@ class ImagePage extends Article {
 						'<br />' . Xml::tags( 'a', $linkAttribs,  $msgbig ) . "$dirmark " . $longDesc;
 				}
 
-				if ( $this->displayImg->isMultipage() ) {
+				if( $this->displayImg->isMultipage() ) {
 					$wgOut->addHTML( '<table class="multipageimage"><tr><td>' );
 				}
 
-				if ( $thumbnail ) {
+				if( $thumbnail ) {
 					$options = array(
 						'alt' => $this->displayImg->getTitle()->getPrefixedText(),
 						'file-link' => true,
@@ -373,10 +379,10 @@ class ImagePage extends Article {
 						$anchorclose . '</div>' );
 				}
 
-				if ( $this->displayImg->isMultipage() ) {
+				if( $this->displayImg->isMultipage() ) {
 					$count = $this->displayImg->pageCount();
 
-					if ( $page > 1 ) {
+					if( $page > 1 ) {
 						$label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
 						$link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page-1) );
 						$thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
@@ -385,7 +391,7 @@ class ImagePage extends Article {
 						$thumb1 = '';
 					}
 
-					if ( $page < $count ) {
+					if( $page < $count ) {
 						$label = wfMsg( 'imgmultipagenext' );
 						$link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page+1) );
 						$thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
@@ -422,7 +428,7 @@ class ImagePage extends Article {
 				}
 			} else {
 				#if direct link is allowed but it's not a renderable image, show an icon.
-				if ( $this->displayImg->isSafeFile() ) {
+				if( $this->displayImg->isSafeFile() ) {
 					$icon= $this->displayImg->iconThumb();
 
 					$wgOut->addHTML( '<div class="fullImageLink" id="file">' .
@@ -434,10 +440,10 @@ class ImagePage extends Article {
 			}
 
 
-			if ($showLink) {
+			if($showLink) {
 				$filename = wfEscapeWikiText( $this->displayImg->getName() );
 
-				if ( !$this->displayImg->isSafeFile() ) {
+				if( !$this->displayImg->isSafeFile() ) {
 					$warning = wfMsgNoTrans( 'mediawarning' );
 					$wgOut->addWikiText( <<<EOT
 <div class="fullMedia">
@@ -474,7 +480,7 @@ EOT
 	/**
 	 * Show a notice that the file is from a shared repository
 	 */
-	function printSharedImageText() {
+	protected function printSharedImageText() {
 		global $wgOut, $wgUser;
 
 		$this->loadFile();
@@ -482,12 +488,12 @@ EOT
 		$descUrl = $this->img->getDescriptionUrl();
 		$descText = $this->img->getDescriptionText();
 		$s = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml( 'sharedupload' );
-		if ( $descUrl ) {
+		if( $descUrl ) {
 			$sk = $wgUser->getSkin();
 			$link = $sk->makeExternalLink( $descUrl, wfMsg( 'shareduploadwiki-linktext' ) );
 			$msg = ( $descText ) ? 'shareduploadwiki-desc' : 'shareduploadwiki';
 			$msg = wfMsgExt( $msg, array( 'parseinline', 'replaceafter' ), $link );
-			if ( $msg != '-' ) {
+			if( $msg != '-' ) {
 				# Show message only if not voided by local sysops
 				$s .= $msg;
 			}
@@ -495,7 +501,7 @@ EOT
 		$s .= "</div>";
 		$wgOut->addHTML( $s );
 
-		if ( $descText ) {
+		if( $descText ) {
 			$this->mExtraDescription = $descText;
 		}
 	}
@@ -503,7 +509,7 @@ EOT
 	/*
 	 * Check for files with the same name on the foreign repos.
 	 */
-	function checkSharedConflict() {
+	protected function checkSharedConflict() {
 		global $wgOut, $wgUser;
 		
 		$repoGroup = RepoGroup::singleton();
@@ -538,7 +544,7 @@ EOT
 		}
 	}
 
-	function checkSharedConflictCallback( $repo ) {
+	public function checkSharedConflictCallback( $repo ) {
 		$this->loadFile();
 		$dupfile = $repo->newFile( $this->img->getTitle() );
 		if( $dupfile && $dupfile->exists() ) {
@@ -548,7 +554,7 @@ EOT
 		return false;
 	}
 
-	function getUploadUrl() {
+	public function getUploadUrl() {
 		$this->loadFile();
 		$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
 		return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) );
@@ -558,7 +564,7 @@ EOT
 	 * Print out the various links at the bottom of the image page, e.g. reupload,
 	 * external editing (and instructions link) etc.
 	 */
-	function uploadLinksBox() {
+	protected function uploadLinksBox() {
 		global $wgUser, $wgOut;
 
 		$this->loadFile();
@@ -567,69 +573,49 @@ EOT
 
 		$sk = $wgUser->getSkin();
 
-		$wgOut->addHtml( '<br /><ul>' );
+		$wgOut->addHTML( '<br /><ul>' );
 
 		# "Upload a new version of this file" link
 		if( UploadForm::userCanReUpload($wgUser,$this->img->name) ) {
 			$ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) );
-			$wgOut->addHtml( "<li><div class='plainlinks'>{$ulink}</div></li>" );
+			$wgOut->addHTML( "<li><div class='plainlinks'>{$ulink}</div></li>" );
 		}
 
 		# Link to Special:FileDuplicateSearch
 		$dupeLink = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'FileDuplicateSearch', $this->mTitle->getDBkey() ), wfMsgHtml( 'imagepage-searchdupe' ) );
-		$wgOut->addHtml( "<li>{$dupeLink}</li>" );
+		$wgOut->addHTML( "<li>{$dupeLink}</li>" );
 
 		# External editing link
 		$elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' );
-		$wgOut->addHtml( '<li>' . $elink . '<div>' . wfMsgWikiHtml( 'edit-externally-help' ) . '</div></li>' );
+		$wgOut->addHTML( '<li>' . $elink . ' <small>' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . '</small></li>' );
 
-		$wgOut->addHtml( '</ul>' );
+		$wgOut->addHTML( '</ul>' );
 	}
 
-	function closeShowImage()
-	{
-		# For overloading
-
-	}
+	protected function closeShowImage() {} # For overloading
 
 	/**
 	 * If the page we've just displayed is in the "Image" namespace,
 	 * we follow it with an upload history of the image and its usage.
 	 */
-	function imageHistory()
-	{
+	protected function imageHistory() {
 		global $wgOut, $wgUseExternalEditor;
 
 		$this->loadFile();
-		if ( $this->img->exists() ) {
-			$list = new ImageHistoryList( $this );
-			$file = $this->img;
-			$dims = $file->getDimensionsString();
-			$s = $list->beginImageHistoryList();
-			$s .= $list->imageHistoryLine( true, $file );
-			// old image versions
-			$hist = $this->img->getHistory();
-			foreach( $hist as $file ) {
-				$dims = $file->getDimensionsString();
-				$s .= $list->imageHistoryLine( false, $file );
-			}
-			$s .= $list->endImageHistoryList();
-		} else { $s=''; }
-		$wgOut->addHTML( $s );
+		$pager = new ImageHistoryPseudoPager( $this );
+		$wgOut->addHTML( $pager->getBody() );
 
-		$this->img->resetHistory();	// free db resources
+		$this->img->resetHistory(); // free db resources
 
 		# Exist check because we don't want to show this on pages where an image
 		# doesn't exist along with the noimage message, that would suck. -ævar
 		if( $wgUseExternalEditor && $this->img->exists() ) {
 			$this->uploadLinksBox();
 		}
-
 	}
 
-	function imageLinks()
-	{
-		global $wgUser, $wgOut;
+	protected function imageLinks() {
+		global $wgUser, $wgOut, $wgLang;
 
 		$limit = 100;
 
@@ -643,21 +629,30 @@ EOT
 			array( 'LIMIT' => $limit + 1)	
 		);
 		$count = $dbr->numRows( $res );
-		if ( $count == 0 ) {
+		if( $count == 0 ) {
 			$wgOut->addHTML( "<div id='mw-imagepage-nolinkstoimage'>\n" );
 			$wgOut->addWikiMsg( 'nolinkstoimage' );
 			$wgOut->addHTML( "</div>\n" );
 			return;
 		}
+		
 		$wgOut->addHTML( "<div id='mw-imagepage-section-linkstoimage'>\n" );
-		$wgOut->addWikiMsg( 'linkstoimage', $count );
-		$wgOut->addHTML( "<ul class='mw-imagepage-linktoimage'>\n" );
+		if( $count <= $limit - 1 ) {
+			$wgOut->addWikiMsg( 'linkstoimage', $count );
+		} else {
+			// More links than the limit. Add a link to [[Special:Whatlinkshere]]
+			$wgOut->addWikiMsg( 'linkstoimage-more',
+				$wgLang->formatNum( $limit ),
+				$this->mTitle->getPrefixedDBkey()
+			);
+		}
 
+		$wgOut->addHTML( "<ul class='mw-imagepage-linkstoimage'>\n" );
 		$sk = $wgUser->getSkin();
 		$count = 0;
 		while ( $s = $res->fetchObject() ) {
 			$count++;
-			if ( $count <= $limit ) {
+			if( $count <= $limit ) {
 				// We have not yet reached the extra one that tells us there is more to fetch
 				$name = Title::makeTitle( $s->page_namespace, $s->page_title );
 				$link = $sk->makeKnownLinkObj( $name, "" );
@@ -668,19 +663,20 @@ EOT
 		$res->free();
 
 		// Add a links to [[Special:Whatlinkshere]]
-		if ( $count > $limit )
+		if( $count > $limit )
 			$wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
 	}
 	
-	function imageRedirects()
-	{
-		global $wgUser, $wgOut;
+	protected function imageRedirects() {
+		global $wgUser, $wgOut, $wgLang;
 
-		$redirects = $this->getTitle()->getRedirectsHere( NS_IMAGE );
-		if ( count( $redirects ) == 0 ) return;
+		$redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
+		if( count( $redirects ) == 0 ) return;
 
 		$wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" );
-		$wgOut->addWikiMsg( 'redirectstofile', count( $redirects ) );
+		$wgOut->addWikiMsg( 'redirectstofile',
+			$wgLang->formatNum( count( $redirects ) )
+		);
 		$wgOut->addHTML( "<ul class='mw-imagepage-redirectstofile'>\n" );
 
 		$sk = $wgUser->getSkin();
@@ -692,25 +688,28 @@ EOT
 
 	}
 
-	function imageDupes() {
-		global $wgOut, $wgUser;
+	protected function imageDupes() {
+		global $wgOut, $wgUser, $wgLang;
 
 		$this->loadFile();
 
 		$dupes = $this->getDuplicates();
-		if ( count( $dupes ) == 0 ) return;
+		if( count( $dupes ) == 0 ) return;
 
 		$wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
-		$wgOut->addWikiMsg( 'duplicatesoffile', count( $dupes ) );
+		$wgOut->addWikiMsg( 'duplicatesoffile',
+			$wgLang->formatNum( count( $dupes ) )
+		);
 		$wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
 
 		$sk = $wgUser->getSkin();
 		foreach ( $dupes as $file ) {
-			if ( $file->isLocal() )
+			if( $file->isLocal() )
 				$link = $sk->makeKnownLinkObj( $file->getTitle(), "" );
-			else
-				$link = $sk->makeExternalLink( $file->getDescriptionUrl(), 
+			else {
+				$link = $sk->makeExternalLink( $file->getDescriptionUrl(),
 					$file->getTitle()->getPrefixedText() );
+			}
 			$wgOut->addHTML( "<li>{$link}</li>\n" );
 		}
 		$wgOut->addHTML( "</ul></div>\n" );
@@ -742,7 +741,7 @@ EOT
 	/**
 	 * Override handling of action=purge
 	 */
-	function doPurge() {
+	public function doPurge() {
 		$this->loadFile();
 		if( $this->img->exists() ) {
 			wfDebug( "ImagePage::doPurge purging " . $this->img->getName() . "\n" );
@@ -762,7 +761,7 @@ EOT
 	function showError( $description ) {
 		global $wgOut;
 		$wgOut->setPageTitle( wfMsg( "internalerror" ) );
-		$wgOut->setRobotpolicy( "noindex,nofollow" );
+		$wgOut->setRobotPolicy( "noindex,nofollow" );
 		$wgOut->setArticleRelated( false );
 		$wgOut->enableClientCache( false );
 		$wgOut->addWikiText( $description );
@@ -788,34 +787,36 @@ class ImageHistoryList {
 		$this->imagePage = $imagePage;
 	}
 
-	function getImagePage() {
+	public function getImagePage() {
 		return $this->imagePage;
 	}
 
-	function getSkin() {
+	public function getSkin() {
 		return $this->skin;
 	}
 
-	function getFile() {
+	public function getFile() {
 		return $this->img;
 	}
 
-	public function beginImageHistoryList() {
+	public function beginImageHistoryList( $navLinks = '' ) {
 		global $wgOut, $wgUser;
 		return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) )
 			. $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) )
+			. $navLinks
 			. Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n"
 			. '<tr><td></td>'
 			. ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? '<td></td>' : '' )
 			. '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>'
+			. '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>'
 			. '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>'
-			. '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>' 
-			. '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>' 	 
+			. '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>'
+			. '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>'
 			. "</tr>\n";
 	}
 
-	public function endImageHistoryList() {
-		return "</table>\n";
+	public function endImageHistoryList( $navLinks = '' ) {
+		return "</table>\n$navLinks\n";
 	}
 
 	public function imageHistoryLine( $iscur, $file ) {
@@ -910,6 +911,21 @@ class ImageHistoryList {
 			$row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) );
 		}
 
+		// Thumbnail
+		if( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
+			$params = array(
+				'width' => '120',
+				'height' => '120',
+			);
+			$thumbnail = $file->transform( $params );
+			$options = array(
+				'alt' => wfMsg( 'filehist-thumbtext', $wgLang->timeAndDate( $timestamp, true ) ),
+				'file-link' => true,
+			);
+			$row .= '</td><td>' . $thumbnail->toHtml( $options );
+		} else {
+			$row .= '</td><td>' . wfMsgHtml( 'filehist-nothumb' );
+		}
 		$row .= "</td><td>";
 
 		// Image dimensions
@@ -934,7 +950,7 @@ class ImageHistoryList {
 		$row .= '</td><td>';
 
 		// Don't show deleted descriptions
-		if ( $file->isDeleted(File::DELETED_COMMENT) ) {
+		if( $file->isDeleted(File::DELETED_COMMENT) ) {
 			$row .= '<span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span>';
 		} else {
 			$row .= $this->skin->commentBlock( $description, $this->title );
@@ -947,3 +963,128 @@ class ImageHistoryList {
 		return "<tr{$classAttr}>{$row}</tr>\n";
 	}
 }
+
+class ImageHistoryPseudoPager extends ReverseChronologicalPager {
+	function __construct( $imagePage ) {
+		parent::__construct();
+		$this->mImagePage = $imagePage;
+		$this->mTitle = clone( $imagePage->getTitle() );
+		$this->mTitle->setFragment( '#filehistory' );
+		$this->mImg = NULL;
+		$this->mHist = array();
+		$this->mRange = array( 0, 0 ); // display range
+	}
+	
+	function getTitle() {
+		return $this->mTitle;
+	}
+
+	function getQueryInfo() {
+		return false;
+	}
+
+	function getIndexField() {
+		return '';
+	}
+
+	function formatRow( $row ) {
+		return '';
+	}
+	
+	function getBody() {
+		$s = '';
+		$this->doQuery();
+		if( count($this->mHist) ) {
+			$list = new ImageHistoryList( $this->mImagePage );
+			# Generate prev/next links
+			$navLink = $this->getNavigationBar();
+			$s = $list->beginImageHistoryList($navLink);
+			// Skip rows there just for paging links
+			for( $i = $this->mRange[0]; $i <= $this->mRange[1]; $i++ ) {
+				$file = $this->mHist[$i];
+				$s .= $list->imageHistoryLine( !$file->isOld(), $file );
+			}
+			$s .= $list->endImageHistoryList($navLink);
+		}
+		return $s;
+	}
+
+	function doQuery() {
+		if( $this->mQueryDone ) return;
+		$this->mImg = $this->mImagePage->getFile(); // ensure loading
+		if( !$this->mImg->exists() ) {
+			return;
+		}
+		$queryLimit = $this->mLimit + 1; // limit plus extra row
+		if( $this->mIsBackwards ) {
+			// Fetch the file history
+			$this->mHist = $this->mImg->getHistory($queryLimit,null,$this->mOffset,false);
+			// The current rev may not meet the offset/limit
+			$numRows = count($this->mHist);
+			if( $numRows <= $this->mLimit && $this->mImg->getTimestamp() > $this->mOffset ) {
+				$this->mHist = array_merge( array($this->mImg), $this->mHist );
+			}
+		} else {
+			// The current rev may not meet the offset
+			if( !$this->mOffset || $this->mImg->getTimestamp() < $this->mOffset ) {
+				$this->mHist[] = $this->mImg;
+			}
+			// Old image versions (fetch extra row for nav links)
+			$oiLimit = count($this->mHist) ? $this->mLimit : $this->mLimit+1;
+			// Fetch the file history
+			$this->mHist = array_merge( $this->mHist,
+				$this->mImg->getHistory($oiLimit,$this->mOffset,null,false) );
+		}
+		$numRows = count($this->mHist); // Total number of query results
+		if( $numRows ) {
+			# Index value of top item in the list
+			$firstIndex = $this->mIsBackwards ?
+				$this->mHist[$numRows-1]->getTimestamp() : $this->mHist[0]->getTimestamp();
+			# Discard the extra result row if there is one
+			if( $numRows > $this->mLimit && $numRows > 1 ) {
+				if( $this->mIsBackwards ) {
+					# Index value of item past the index
+					$this->mPastTheEndIndex = $this->mHist[0]->getTimestamp();
+					# Index value of bottom item in the list
+					$lastIndex = $this->mHist[1]->getTimestamp();
+					# Display range
+					$this->mRange = array( 1, $numRows-1 );
+				} else {
+					# Index value of item past the index
+					$this->mPastTheEndIndex = $this->mHist[$numRows-1]->getTimestamp();
+					# Index value of bottom item in the list
+					$lastIndex = $this->mHist[$numRows-2]->getTimestamp();
+					# Display range
+					$this->mRange = array( 0, $numRows-2 );
+				}
+			} else {
+				# Setting indexes to an empty string means that they will be
+				# omitted if they would otherwise appear in URLs. It just so
+				# happens that this  is the right thing to do in the standard
+				# UI, in all the relevant cases.
+				$this->mPastTheEndIndex = '';
+				# Index value of bottom item in the list
+				$lastIndex = $this->mIsBackwards ?
+					$this->mHist[0]->getTimestamp() : $this->mHist[$numRows-1]->getTimestamp();
+				# Display range
+				$this->mRange = array( 0, $numRows-1 );
+			}
+		} else {
+			$firstIndex = '';
+			$lastIndex = '';
+			$this->mPastTheEndIndex = '';
+		}
+		if( $this->mIsBackwards ) {
+			$this->mIsFirst = ( $numRows < $queryLimit );
+			$this->mIsLast = ( $this->mOffset == '' );
+			$this->mLastShown = $firstIndex;
+			$this->mFirstShown = $lastIndex;
+		} else {
+			$this->mIsFirst = ( $this->mOffset == '' );
+			$this->mIsLast = ( $numRows < $queryLimit );
+			$this->mLastShown = $lastIndex;
+			$this->mFirstShown = $firstIndex;
+		}
+		$this->mQueryDone = true;
+	}
+}
diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index da9b6fd6..3ab0b858 100644
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -34,7 +34,7 @@ class ImageQueryPage extends QueryPage {
 				}
 			}
 
-			$out->addHtml( $gallery->toHtml() );
+			$out->addHTML( $gallery->toHtml() );
 		}
 	}
 
@@ -45,9 +45,9 @@ class ImageQueryPage extends QueryPage {
 	 * @return Image
 	 */
 	private function prepareImage( $row ) {
-		$namespace = isset( $row->namespace ) ? $row->namespace : NS_IMAGE;
+		$namespace = isset( $row->namespace ) ? $row->namespace : NS_FILE;
 		$title = Title::makeTitleSafe( $namespace, $row->title );
-		return ( $title instanceof Title && $title->getNamespace() == NS_IMAGE )
+		return ( $title instanceof Title && $title->getNamespace() == NS_FILE )
 			? wfFindFile( $title )
 			: null;
 	}
diff --git a/includes/Import.php b/includes/Import.php
new file mode 100644
index 00000000..56e7a7fb
--- /dev/null
+++ b/includes/Import.php
@@ -0,0 +1,1133 @@
+<?php
+/**
+ * MediaWiki page data importer
+ * Copyright (C) 2003,2005 Brion Vibber <brion@pobox.com>
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ *
+ * @ingroup SpecialPage
+ */
+class WikiRevision {
+	var $title = null;
+	var $id = 0;
+	var $timestamp = "20010115000000";
+	var $user = 0;
+	var $user_text = "";
+	var $text = "";
+	var $comment = "";
+	var $minor = false;
+	var $type = "";
+	var $action = "";
+	var $params = "";
+
+	function setTitle( $title ) {
+		if( is_object( $title ) ) {
+			$this->title = $title;
+		} elseif( is_null( $title ) ) {
+			throw new MWException( "WikiRevision given a null title in import. You may need to adjust \$wgLegalTitleChars." );
+		} else {
+			throw new MWException( "WikiRevision given non-object title in import." );
+		}
+	}
+
+	function setID( $id ) {
+		$this->id = $id;
+	}
+
+	function setTimestamp( $ts ) {
+		# 2003-08-05T18:30:02Z
+		$this->timestamp = wfTimestamp( TS_MW, $ts );
+	}
+
+	function setUsername( $user ) {
+		$this->user_text = $user;
+	}
+
+	function setUserIP( $ip ) {
+		$this->user_text = $ip;
+	}
+
+	function setText( $text ) {
+		$this->text = $text;
+	}
+
+	function setComment( $text ) {
+		$this->comment = $text;
+	}
+
+	function setMinor( $minor ) {
+		$this->minor = (bool)$minor;
+	}
+
+	function setSrc( $src ) {
+		$this->src = $src;
+	}
+
+	function setFilename( $filename ) {
+		$this->filename = $filename;
+	}
+
+	function setSize( $size ) {
+		$this->size = intval( $size );
+	}
+	
+	function setType( $type ) {
+		$this->type = $type;
+	}
+	
+	function setAction( $action ) {
+		$this->action = $action;
+	}
+	
+	function setParams( $params ) {
+		$this->params = $params;
+	}
+
+	function getTitle() {
+		return $this->title;
+	}
+
+	function getID() {
+		return $this->id;
+	}
+
+	function getTimestamp() {
+		return $this->timestamp;
+	}
+
+	function getUser() {
+		return $this->user_text;
+	}
+
+	function getText() {
+		return $this->text;
+	}
+
+	function getComment() {
+		return $this->comment;
+	}
+
+	function getMinor() {
+		return $this->minor;
+	}
+
+	function getSrc() {
+		return $this->src;
+	}
+
+	function getFilename() {
+		return $this->filename;
+	}
+
+	function getSize() {
+		return $this->size;
+	}
+	
+	function getType() {
+		return $this->type;
+	}
+	
+	function getAction() {
+		return $this->action;
+	}
+	
+	function getParams() {
+		return $this->params;
+	}
+
+	function importOldRevision() {
+		$dbw = wfGetDB( DB_MASTER );
+
+		# Sneak a single revision into place
+		$user = User::newFromName( $this->getUser() );
+		if( $user ) {
+			$userId = intval( $user->getId() );
+			$userText = $user->getName();
+		} else {
+			$userId = 0;
+			$userText = $this->getUser();
+		}
+
+		// avoid memory leak...?
+		$linkCache = LinkCache::singleton();
+		$linkCache->clear();
+
+		$article = new Article( $this->title );
+		$pageId = $article->getId();
+		if( $pageId == 0 ) {
+			# must create the page...
+			$pageId = $article->insertOn( $dbw );
+			$created = true;
+		} else {
+			$created = false;
+
+			$prior = $dbw->selectField( 'revision', '1',
+				array( 'rev_page' => $pageId,
+					'rev_timestamp' => $dbw->timestamp( $this->timestamp ),
+					'rev_user_text' => $userText,
+					'rev_comment'   => $this->getComment() ),
+				__METHOD__
+			);
+			if( $prior ) {
+				// FIXME: this could fail slightly for multiple matches :P
+				wfDebug( __METHOD__ . ": skipping existing revision for [[" .
+					$this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" );
+				return false;
+			}
+		}
+
+		# FIXME: Use original rev_id optionally (better for backups)
+		# Insert the row
+		$revision = new Revision( array(
+			'page'       => $pageId,
+			'text'       => $this->getText(),
+			'comment'    => $this->getComment(),
+			'user'       => $userId,
+			'user_text'  => $userText,
+			'timestamp'  => $this->timestamp,
+			'minor_edit' => $this->minor,
+			) );
+		$revId = $revision->insertOn( $dbw );
+		$changed = $article->updateIfNewerOn( $dbw, $revision );
+		
+		# To be on the safe side...
+		$tempTitle = $GLOBALS['wgTitle'];
+		$GLOBALS['wgTitle'] = $this->title;
+
+		if( $created ) {
+			wfDebug( __METHOD__ . ": running onArticleCreate\n" );
+			Article::onArticleCreate( $this->title );
+
+			wfDebug( __METHOD__ . ": running create updates\n" );
+			$article->createUpdates( $revision );
+
+		} elseif( $changed ) {
+			wfDebug( __METHOD__ . ": running onArticleEdit\n" );
+			Article::onArticleEdit( $this->title, 'skiptransclusions' ); // leave templatelinks for editUpdates()
+
+			wfDebug( __METHOD__ . ": running edit updates\n" );
+			$article->editUpdates(
+				$this->getText(),
+				$this->getComment(),
+				$this->minor,
+				$this->timestamp,
+				$revId );
+		}
+		$GLOBALS['wgTitle'] = $tempTitle;
+
+		return true;
+	}
+	
+	function importLogItem() {
+		$dbw = wfGetDB( DB_MASTER );
+		# FIXME: this will not record autoblocks
+		if( !$this->getTitle() ) {
+			wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " . 
+				$this->timestamp . "\n" );
+			return;
+		}
+		# Check if it exists already
+		// FIXME: use original log ID (better for backups)
+		$prior = $dbw->selectField( 'logging', '1',
+			array( 'log_type' => $this->getType(),
+				'log_action'    => $this->getAction(),
+				'log_timestamp' => $dbw->timestamp( $this->timestamp ),
+				'log_namespace' => $this->getTitle()->getNamespace(),
+				'log_title'     => $this->getTitle()->getDBkey(),
+				'log_comment'   => $this->getComment(),
+				#'log_user_text' => $this->user_text,
+				'log_params'    => $this->params ),
+			__METHOD__
+		);
+		// FIXME: this could fail slightly for multiple matches :P
+		if( $prior ) {
+			wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " . 
+				$this->timestamp . "\n" );
+			return false;
+		}
+		$log_id = $dbw->nextSequenceValue( 'log_log_id_seq' );
+		$data = array(
+			'log_id' => $log_id,
+			'log_type' => $this->type,
+			'log_action' => $this->action,
+			'log_timestamp' => $dbw->timestamp( $this->timestamp ),
+			'log_user' => User::idFromName( $this->user_text ),
+			#'log_user_text' => $this->user_text,
+			'log_namespace' => $this->getTitle()->getNamespace(),
+			'log_title' => $this->getTitle()->getDBkey(),
+			'log_comment' => $this->getComment(),
+			'log_params' => $this->params
+		);
+		$dbw->insert( 'logging', $data, __METHOD__ );
+	}
+
+	function importUpload() {
+		wfDebug( __METHOD__ . ": STUB\n" );
+
+		/**
+			// from file revert...
+			$source = $this->file->getArchiveVirtualUrl( $this->oldimage );
+			$comment = $wgRequest->getText( 'wpComment' );
+			// TODO: Preserve file properties from database instead of reloading from file
+			$status = $this->file->upload( $source, $comment, $comment );
+			if( $status->isGood() ) {
+		*/
+
+		/**
+			// from file upload...
+		$this->mLocalFile = wfLocalFile( $nt );
+		$this->mDestName = $this->mLocalFile->getName();
+		//....
+			$status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText,
+			File::DELETE_SOURCE, $this->mFileProps );
+			if ( !$status->isGood() ) {
+				$resultDetails = array( 'internal' => $status->getWikiText() );
+		*/
+
+		// @fixme upload() uses $wgUser, which is wrong here
+		// it may also create a page without our desire, also wrong potentially.
+		// and, it will record a *current* upload, but we might want an archive version here
+
+		$file = wfLocalFile( $this->getTitle() );
+		if( !$file ) {
+			var_dump( $file );
+			wfDebug( "IMPORT: Bad file. :(\n" );
+			return false;
+		}
+
+		$source = $this->downloadSource();
+		if( !$source ) {
+			wfDebug( "IMPORT: Could not fetch remote file. :(\n" );
+			return false;
+		}
+
+		$status = $file->upload( $source,
+			$this->getComment(),
+			$this->getComment(), // Initial page, if none present...
+			File::DELETE_SOURCE,
+			false, // props...
+			$this->getTimestamp() );
+
+		if( $status->isGood() ) {
+			// yay?
+			wfDebug( "IMPORT: is ok?\n" );
+			return true;
+		}
+
+		wfDebug( "IMPORT: is bad? " . $status->getXml() . "\n" );
+		return false;
+
+	}
+
+	function downloadSource() {
+		global $wgEnableUploads;
+		if( !$wgEnableUploads ) {
+			return false;
+		}
+
+		$tempo = tempnam( wfTempDir(), 'download' );
+		$f = fopen( $tempo, 'wb' );
+		if( !$f ) {
+			wfDebug( "IMPORT: couldn't write to temp file $tempo\n" );
+			return false;
+		}
+
+		// @fixme!
+		$src = $this->getSrc();
+		$data = Http::get( $src );
+		if( !$data ) {
+			wfDebug( "IMPORT: couldn't fetch source $src\n" );
+			fclose( $f );
+			unlink( $tempo );
+			return false;
+		}
+
+		fwrite( $f, $data );
+		fclose( $f );
+
+		return $tempo;
+	}
+
+}
+
+/**
+ * implements Special:Import
+ * @ingroup SpecialPage
+ */
+class WikiImporter {
+	var $mDebug = false;
+	var $mSource = null;
+	var $mPageCallback = null;
+	var $mPageOutCallback = null;
+	var $mRevisionCallback = null;
+	var $mLogItemCallback = null;
+	var $mUploadCallback = null;
+	var $mTargetNamespace = null;
+	var $mXmlNamespace = false;
+	var $lastfield;
+	var $tagStack = array();
+
+	function __construct( $source ) {
+		$this->setRevisionCallback( array( $this, "importRevision" ) );
+		$this->setUploadCallback( array( $this, "importUpload" ) );
+		$this->setLogItemCallback( array( $this, "importLogItem" ) );
+		$this->mSource = $source;
+	}
+
+	function throwXmlError( $err ) {
+		$this->debug( "FAILURE: $err" );
+		wfDebug( "WikiImporter XML error: $err\n" );
+	}
+
+	function handleXmlNamespace ( $parser, $data, $prefix=false, $uri=false ) {
+    		 if( preg_match( '/www.mediawiki.org/',$prefix ) ) {
+	                $prefix = str_replace( '/','\/',$prefix );
+			$this->mXmlNamespace='/^'.$prefix.':/';
+		 }
+	}
+
+	function stripXmlNamespace($name) {
+		if( $this->mXmlNamespace ) {
+	               return(preg_replace($this->mXmlNamespace,'',$name,1));
+		}
+		else {
+		       return($name);
+                }
+	}
+   
+	# --------------
+
+	function doImport() {
+		if( empty( $this->mSource ) ) {
+			return new WikiErrorMsg( "importnotext" );
+		}
+
+		$parser = xml_parser_create_ns( "UTF-8" );
+
+		# case folding violates XML standard, turn it off
+		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
+
+		xml_set_object( $parser, $this );
+		xml_set_element_handler( $parser, "in_start", "" );
+		xml_set_start_namespace_decl_handler( $parser, "handleXmlNamespace" );
+
+		$offset = 0; // for context extraction on error reporting
+		do {
+			$chunk = $this->mSource->readChunk();
+			if( !xml_parse( $parser, $chunk, $this->mSource->atEnd() ) ) {
+				wfDebug( "WikiImporter::doImport encountered XML parsing error\n" );
+				return new WikiXmlError( $parser, wfMsgHtml( 'import-parse-failure' ), $chunk, $offset );
+			}
+			$offset += strlen( $chunk );
+		} while( $chunk !== false && !$this->mSource->atEnd() );
+		xml_parser_free( $parser );
+
+		return true;
+	}
+
+	function debug( $data ) {
+		if( $this->mDebug ) {
+			wfDebug( "IMPORT: $data\n" );
+		}
+	}
+
+	function notice( $data ) {
+		global $wgCommandLineMode;
+		if( $wgCommandLineMode ) {
+			print "$data\n";
+		} else {
+			global $wgOut;
+			$wgOut->addHTML( "<li>" . htmlspecialchars( $data ) . "</li>\n" );
+		}
+	}
+
+	/**
+	 * Set debug mode...
+	 */
+	function setDebug( $debug ) {
+		$this->mDebug = $debug;
+	}
+
+	/**
+	 * Sets the action to perform as each new page in the stream is reached.
+	 * @param $callback callback
+	 * @return callback
+	 */
+	function setPageCallback( $callback ) {
+		$previous = $this->mPageCallback;
+		$this->mPageCallback = $callback;
+		return $previous;
+	}
+
+	/**
+	 * Sets the action to perform as each page in the stream is completed.
+	 * Callback accepts the page title (as a Title object), a second object
+	 * with the original title form (in case it's been overridden into a
+	 * local namespace), and a count of revisions.
+	 *
+	 * @param $callback callback
+	 * @return callback
+	 */
+	function setPageOutCallback( $callback ) {
+		$previous = $this->mPageOutCallback;
+		$this->mPageOutCallback = $callback;
+		return $previous;
+	}
+
+	/**
+	 * Sets the action to perform as each page revision is reached.
+	 * @param $callback callback
+	 * @return callback
+	 */
+	function setRevisionCallback( $callback ) {
+		$previous = $this->mRevisionCallback;
+		$this->mRevisionCallback = $callback;
+		return $previous;
+	}
+
+	/**
+	 * Sets the action to perform as each file upload version is reached.
+	 * @param $callback callback
+	 * @return callback
+	 */
+	function setUploadCallback( $callback ) {
+		$previous = $this->mUploadCallback;
+		$this->mUploadCallback = $callback;
+		return $previous;
+	}
+	
+	/**
+	 * Sets the action to perform as each log item reached.
+	 * @param $callback callback
+	 * @return callback
+	 */
+	function setLogItemCallback( $callback ) {
+		$previous = $this->mLogItemCallback;
+		$this->mLogItemCallback = $callback;
+		return $previous;
+	}
+
+	/**
+	 * Set a target namespace to override the defaults
+	 */
+	function setTargetNamespace( $namespace ) {
+		if( is_null( $namespace ) ) {
+			// Don't override namespaces
+			$this->mTargetNamespace = null;
+		} elseif( $namespace >= 0 ) {
+			// FIXME: Check for validity
+			$this->mTargetNamespace = intval( $namespace );
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Default per-revision callback, performs the import.
+	 * @param $revision WikiRevision
+	 * @private
+	 */
+	function importRevision( $revision ) {
+		$dbw = wfGetDB( DB_MASTER );
+		return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) );
+	}
+	
+	/**
+	 * Default per-revision callback, performs the import.
+	 * @param $revision WikiRevision
+	 * @private
+	 */
+	function importLogItem( $rev ) {
+		$dbw = wfGetDB( DB_MASTER );
+		return $dbw->deadlockLoop( array( $rev, 'importLogItem' ) );
+	}
+
+	/**
+	 * Dummy for now...
+	 */
+	function importUpload( $revision ) {
+		//$dbw = wfGetDB( DB_MASTER );
+		//return $dbw->deadlockLoop( array( $revision, 'importUpload' ) );
+		return false;
+	}
+
+	/**
+	 * Alternate per-revision callback, for debugging.
+	 * @param $revision WikiRevision
+	 * @private
+	 */
+	function debugRevisionHandler( &$revision ) {
+		$this->debug( "Got revision:" );
+		if( is_object( $revision->title ) ) {
+			$this->debug( "-- Title: " . $revision->title->getPrefixedText() );
+		} else {
+			$this->debug( "-- Title: <invalid>" );
+		}
+		$this->debug( "-- User: " . $revision->user_text );
+		$this->debug( "-- Timestamp: " . $revision->timestamp );
+		$this->debug( "-- Comment: " . $revision->comment );
+		$this->debug( "-- Text: " . $revision->text );
+	}
+
+	/**
+	 * Notify the callback function when a new <page> is reached.
+	 * @param $title Title
+	 * @private
+	 */
+	function pageCallback( $title ) {
+		if( is_callable( $this->mPageCallback ) ) {
+			call_user_func( $this->mPageCallback, $title );
+		}
+	}
+
+	/**
+	 * Notify the callback function when a </page> is closed.
+	 * @param $title Title
+	 * @param $origTitle Title
+	 * @param $revisionCount int
+	 * @param $successCount Int: number of revisions for which callback returned true
+	 * @private
+	 */
+	function pageOutCallback( $title, $origTitle, $revisionCount, $successCount ) {
+		if( is_callable( $this->mPageOutCallback ) ) {
+			call_user_func( $this->mPageOutCallback, $title, $origTitle,
+				$revisionCount, $successCount );
+		}
+	}
+
+	# XML parser callbacks from here out -- beware!
+	function donothing( $parser, $x, $y="" ) {
+		#$this->debug( "donothing" );
+	}
+
+	function in_start( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_start $name" );
+		if( $name != "mediawiki" ) {
+			return $this->throwXMLerror( "Expected <mediawiki>, got <$name>" );
+		}
+		xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
+	}
+
+	function in_mediawiki( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_mediawiki $name" );
+		if( $name == 'siteinfo' ) {
+			xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
+		} elseif( $name == 'page' ) {
+			$this->push( $name );
+			$this->workRevisionCount = 0;
+			$this->workSuccessCount = 0;
+			$this->uploadCount = 0;
+			$this->uploadSuccessCount = 0;
+			xml_set_element_handler( $parser, "in_page", "out_page" );
+		} elseif( $name == 'logitem' ) {
+			$this->push( $name );
+			$this->workRevision = new WikiRevision;
+			xml_set_element_handler( $parser, "in_logitem", "out_logitem" );
+		} else {
+			return $this->throwXMLerror( "Expected <page>, got <$name>" );
+		}
+	}
+	function out_mediawiki( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_mediawiki $name" );
+		if( $name != "mediawiki" ) {
+			return $this->throwXMLerror( "Expected </mediawiki>, got </$name>" );
+		}
+		xml_set_element_handler( $parser, "donothing", "donothing" );
+	}
+
+
+	function in_siteinfo( $parser, $name, $attribs ) {
+		// no-ops for now
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_siteinfo $name" );
+		switch( $name ) {
+		case "sitename":
+		case "base":
+		case "generator":
+		case "case":
+		case "namespaces":
+		case "namespace":
+			break;
+		default:
+			return $this->throwXMLerror( "Element <$name> not allowed in <siteinfo>." );
+		}
+	}
+
+	function out_siteinfo( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		if( $name == "siteinfo" ) {
+			xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
+		}
+	}
+
+
+	function in_page( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_page $name" );
+		switch( $name ) {
+		case "id":
+		case "title":
+		case "restrictions":
+			$this->appendfield = $name;
+			$this->appenddata = "";
+			xml_set_element_handler( $parser, "in_nothing", "out_append" );
+			xml_set_character_data_handler( $parser, "char_append" );
+			break;
+		case "revision":
+			$this->push( "revision" );
+			if( is_object( $this->pageTitle ) ) {
+				$this->workRevision = new WikiRevision;
+				$this->workRevision->setTitle( $this->pageTitle );
+				$this->workRevisionCount++;
+			} else {
+				// Skipping items due to invalid page title
+				$this->workRevision = null;
+			}
+			xml_set_element_handler( $parser, "in_revision", "out_revision" );
+			break;
+		case "upload":
+			$this->push( "upload" );
+			if( is_object( $this->pageTitle ) ) {
+				$this->workRevision = new WikiRevision;
+				$this->workRevision->setTitle( $this->pageTitle );
+				$this->uploadCount++;
+			} else {
+				// Skipping items due to invalid page title
+				$this->workRevision = null;
+			}
+			xml_set_element_handler( $parser, "in_upload", "out_upload" );
+			break;
+		default:
+			return $this->throwXMLerror( "Element <$name> not allowed in a <page>." );
+		}
+	}
+
+	function out_page( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_page $name" );
+		$this->pop();
+		if( $name != "page" ) {
+			return $this->throwXMLerror( "Expected </page>, got </$name>" );
+		}
+		xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
+
+		$this->pageOutCallback( $this->pageTitle, $this->origTitle,
+			$this->workRevisionCount, $this->workSuccessCount );
+
+		$this->workTitle = null;
+		$this->workRevision = null;
+		$this->workRevisionCount = 0;
+		$this->workSuccessCount = 0;
+		$this->pageTitle = null;
+		$this->origTitle = null;
+	}
+
+	function in_nothing( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_nothing $name" );
+		return $this->throwXMLerror( "No child elements allowed here; got <$name>" );
+	}
+
+	function char_append( $parser, $data ) {
+		$this->debug( "char_append '$data'" );
+		$this->appenddata .= $data;
+	}
+
+	function out_append( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_append $name" );
+		if( $name != $this->appendfield ) {
+			return $this->throwXMLerror( "Expected </{$this->appendfield}>, got </$name>" );
+		}
+
+		switch( $this->appendfield ) {
+		case "title":
+			$this->workTitle = $this->appenddata;
+			$this->origTitle = Title::newFromText( $this->workTitle );
+			if( !is_null( $this->mTargetNamespace ) && !is_null( $this->origTitle ) ) {
+				$this->pageTitle = Title::makeTitle( $this->mTargetNamespace,
+					$this->origTitle->getDBkey() );
+			} else {
+				$this->pageTitle = Title::newFromText( $this->workTitle );
+			}
+			if( is_null( $this->pageTitle ) ) {
+				// Invalid page title? Ignore the page
+				$this->notice( "Skipping invalid page title '$this->workTitle'" );
+			} elseif( $this->pageTitle->getInterwiki() != '' ) {
+				$this->notice( "Skipping interwiki page title '$this->workTitle'" );
+				$this->pageTitle = null;
+			} else {
+				$this->pageCallback( $this->workTitle );
+			}
+			break;
+		case "id":
+			if ( $this->parentTag() == 'revision' || $this->parentTag() == 'logitem' ) {
+				if( $this->workRevision )
+					$this->workRevision->setID( $this->appenddata );
+			}
+			break;
+		case "text":
+			if( $this->workRevision )
+				$this->workRevision->setText( $this->appenddata );
+			break;
+		case "username":
+			if( $this->workRevision )
+				$this->workRevision->setUsername( $this->appenddata );
+			break;
+		case "ip":
+			if( $this->workRevision )
+				$this->workRevision->setUserIP( $this->appenddata );
+			break;
+		case "timestamp":
+			if( $this->workRevision )
+				$this->workRevision->setTimestamp( $this->appenddata );
+			break;
+		case "comment":
+			if( $this->workRevision )
+				$this->workRevision->setComment( $this->appenddata );
+			break;
+		case "type":
+			if( $this->workRevision )
+				$this->workRevision->setType( $this->appenddata );
+			break;
+		case "action":
+			if( $this->workRevision )
+				$this->workRevision->setAction( $this->appenddata );
+			break;
+		case "logtitle":
+			if( $this->workRevision )
+				$this->workRevision->setTitle( Title::newFromText( $this->appenddata ) );
+			break;
+		case "params":
+			if( $this->workRevision )
+				$this->workRevision->setParams( $this->appenddata );
+			break;
+		case "minor":
+			if( $this->workRevision )
+				$this->workRevision->setMinor( true );
+			break;
+		case "filename":
+			if( $this->workRevision )
+				$this->workRevision->setFilename( $this->appenddata );
+			break;
+		case "src":
+			if( $this->workRevision )
+				$this->workRevision->setSrc( $this->appenddata );
+			break;
+		case "size":
+			if( $this->workRevision )
+				$this->workRevision->setSize( intval( $this->appenddata ) );
+			break;
+		default:
+			$this->debug( "Bad append: {$this->appendfield}" );
+		}
+		$this->appendfield = "";
+		$this->appenddata = "";
+
+		$parent = $this->parentTag();
+		xml_set_element_handler( $parser, "in_$parent", "out_$parent" );
+		xml_set_character_data_handler( $parser, "donothing" );
+	}
+
+	function in_revision( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_revision $name" );
+		switch( $name ) {
+		case "id":
+		case "timestamp":
+		case "comment":
+		case "minor":
+		case "text":
+			$this->appendfield = $name;
+			xml_set_element_handler( $parser, "in_nothing", "out_append" );
+			xml_set_character_data_handler( $parser, "char_append" );
+			break;
+		case "contributor":
+			$this->push( "contributor" );
+			xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
+			break;
+		default:
+			return $this->throwXMLerror( "Element <$name> not allowed in a <revision>." );
+		}
+	}
+
+	function out_revision( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_revision $name" );
+		$this->pop();
+		if( $name != "revision" ) {
+			return $this->throwXMLerror( "Expected </revision>, got </$name>" );
+		}
+		xml_set_element_handler( $parser, "in_page", "out_page" );
+
+		if( $this->workRevision ) {
+			$ok = call_user_func_array( $this->mRevisionCallback,
+				array( $this->workRevision, $this ) );
+			if( $ok ) {
+				$this->workSuccessCount++;
+			}
+		}
+	}
+	
+	function in_logitem( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_logitem $name" );
+		switch( $name ) {
+		case "id":
+		case "timestamp":
+		case "comment":
+		case "type":
+		case "action":
+		case "logtitle":
+		case "params":
+			$this->appendfield = $name;
+			xml_set_element_handler( $parser, "in_nothing", "out_append" );
+			xml_set_character_data_handler( $parser, "char_append" );
+			break;
+		case "contributor":
+			$this->push( "contributor" );
+			xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
+			break;
+		default:
+			return $this->throwXMLerror( "Element <$name> not allowed in a <revision>." );
+		}
+	}
+
+	function out_logitem( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_logitem $name" );
+		$this->pop();
+		if( $name != "logitem" ) {
+			return $this->throwXMLerror( "Expected </logitem>, got </$name>" );
+		}
+		xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
+
+		if( $this->workRevision ) {
+			$ok = call_user_func_array( $this->mLogItemCallback,
+				array( $this->workRevision, $this ) );
+			if( $ok ) {
+				$this->workSuccessCount++;
+			}
+		}
+	}
+
+	function in_upload( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_upload $name" );
+		switch( $name ) {
+		case "timestamp":
+		case "comment":
+		case "text":
+		case "filename":
+		case "src":
+		case "size":
+			$this->appendfield = $name;
+			xml_set_element_handler( $parser, "in_nothing", "out_append" );
+			xml_set_character_data_handler( $parser, "char_append" );
+			break;
+		case "contributor":
+			$this->push( "contributor" );
+			xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
+			break;
+		default:
+			return $this->throwXMLerror( "Element <$name> not allowed in an <upload>." );
+		}
+	}
+
+	function out_upload( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_revision $name" );
+		$this->pop();
+		if( $name != "upload" ) {
+			return $this->throwXMLerror( "Expected </upload>, got </$name>" );
+		}
+		xml_set_element_handler( $parser, "in_page", "out_page" );
+
+		if( $this->workRevision ) {
+			$ok = call_user_func_array( $this->mUploadCallback,
+				array( $this->workRevision, $this ) );
+			if( $ok ) {
+				$this->workUploadSuccessCount++;
+			}
+		}
+	}
+
+	function in_contributor( $parser, $name, $attribs ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "in_contributor $name" );
+		switch( $name ) {
+		case "username":
+		case "ip":
+		case "id":
+			$this->appendfield = $name;
+			xml_set_element_handler( $parser, "in_nothing", "out_append" );
+			xml_set_character_data_handler( $parser, "char_append" );
+			break;
+		default:
+			$this->throwXMLerror( "Invalid tag <$name> in <contributor>" );
+		}
+	}
+
+	function out_contributor( $parser, $name ) {
+	        $name = $this->stripXmlNamespace($name);
+		$this->debug( "out_contributor $name" );
+		$this->pop();
+		if( $name != "contributor" ) {
+			return $this->throwXMLerror( "Expected </contributor>, got </$name>" );
+		}
+		$parent = $this->parentTag();
+		xml_set_element_handler( $parser, "in_$parent", "out_$parent" );
+	}
+
+	private function push( $name ) {
+		array_push( $this->tagStack, $name );
+		$this->debug( "PUSH $name" );
+	}
+
+	private function pop() {
+		$name = array_pop( $this->tagStack );
+		$this->debug( "POP $name" );
+		return $name;
+	}
+
+	private function parentTag() {
+		$name = $this->tagStack[count( $this->tagStack ) - 1];
+		$this->debug( "PARENT $name" );
+		return $name;
+	}
+
+}
+
+/**
+ * @todo document (e.g. one-sentence class description).
+ * @ingroup SpecialPage
+ */
+class ImportStringSource {
+	function __construct( $string ) {
+		$this->mString = $string;
+		$this->mRead = false;
+	}
+
+	function atEnd() {
+		return $this->mRead;
+	}
+
+	function readChunk() {
+		if( $this->atEnd() ) {
+			return false;
+		} else {
+			$this->mRead = true;
+			return $this->mString;
+		}
+	}
+}
+
+/**
+ * @todo document (e.g. one-sentence class description).
+ * @ingroup SpecialPage
+ */
+class ImportStreamSource {
+	function __construct( $handle ) {
+		$this->mHandle = $handle;
+	}
+
+	function atEnd() {
+		return feof( $this->mHandle );
+	}
+
+	function readChunk() {
+		return fread( $this->mHandle, 32768 );
+	}
+
+	static function newFromFile( $filename ) {
+		$file = @fopen( $filename, 'rt' );
+		if( !$file ) {
+			return new WikiErrorMsg( "importcantopen" );
+		}
+		return new ImportStreamSource( $file );
+	}
+
+	static function newFromUpload( $fieldname = "xmlimport" ) {
+		$upload =& $_FILES[$fieldname];
+
+		if( !isset( $upload ) || !$upload['name'] ) {
+			return new WikiErrorMsg( 'importnofile' );
+		}
+		if( !empty( $upload['error'] ) ) {
+			switch($upload['error']){
+				case 1: # The uploaded file exceeds the upload_max_filesize directive in php.ini.
+					return new WikiErrorMsg( 'importuploaderrorsize' );
+				case 2: # The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.
+					return new WikiErrorMsg( 'importuploaderrorsize' );
+				case 3: # The uploaded file was only partially uploaded
+					return new WikiErrorMsg( 'importuploaderrorpartial' );
+			    case 6: #Missing a temporary folder. Introduced in PHP 4.3.10 and PHP 5.0.3.
+			    	return new WikiErrorMsg( 'importuploaderrortemp' );
+			    # case else: # Currently impossible
+			}
+
+		}
+		$fname = $upload['tmp_name'];
+		if( is_uploaded_file( $fname ) ) {
+			return ImportStreamSource::newFromFile( $fname );
+		} else {
+			return new WikiErrorMsg( 'importnofile' );
+		}
+	}
+
+	static function newFromURL( $url, $method = 'GET' ) {
+		wfDebug( __METHOD__ . ": opening $url\n" );
+		# Use the standard HTTP fetch function; it times out
+		# quicker and sorts out user-agent problems which might
+		# otherwise prevent importing from large sites, such
+		# as the Wikimedia cluster, etc.
+		$data = Http::request( $method, $url );
+		if( $data !== false ) {
+			$file = tmpfile();
+			fwrite( $file, $data );
+			fflush( $file );
+			fseek( $file, 0 );
+			return new ImportStreamSource( $file );
+		} else {
+			return new WikiErrorMsg( 'importcantopen' );
+		}
+	}
+
+	public static function newFromInterwiki( $interwiki, $page, $history=false ) {
+		if( $page == '' ) {
+			return new WikiErrorMsg( 'import-noarticle' );
+		}
+		$link = Title::newFromText( "$interwiki:Special:Export/$page" );
+		if( is_null( $link ) || $link->getInterwiki() == '' ) {
+			return new WikiErrorMsg( 'importbadinterwiki' );
+		} else {
+			$params = $history ? 'history=1' : '';
+			$url = $link->getFullUrl( $params );
+			# For interwikis, use POST to avoid redirects.
+			return ImportStreamSource::newFromURL( $url, "POST" );
+		}
+	}
+}
diff --git a/includes/Interwiki.php b/includes/Interwiki.php
new file mode 100644
index 00000000..3522fadb
--- /dev/null
+++ b/includes/Interwiki.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * @file
+ * Interwiki table entry
+ */
+
+/**
+ * The interwiki class
+ * All information is loaded on creation when called by Interwiki::fetch( $prefix ).
+ * All work is done on slave, because this should *never* change (except during schema updates etc, which arent wiki-related)
+ */
+class Interwiki {
+
+	// Cache - removes oldest entry when it hits limit
+	protected static $smCache = array();
+	const CACHE_LIMIT = 100; // 0 means unlimited, any other value is max number of entries.
+
+	protected $mPrefix, $mURL, $mLocal, $mTrans;
+
+	function __construct( $prefix = null, $url = '', $local = 0, $trans = 0 )
+	{
+		$this->mPrefix = $prefix;
+		$this->mURL = $url;
+		$this->mLocal = $local;
+		$this->mTrans = $trans;
+	}
+
+	/**
+	 * Check whether an interwiki prefix exists
+	 * 
+	 * @return bool Whether it exists
+	 * @param $prefix string Interwiki prefix to use
+	 */
+	static public function isValidInterwiki( $prefix ){
+		$result = self::fetch( $prefix );
+		return (bool)$result;
+	}
+
+	/**
+	 * Fetch an Interwiki object
+	 * 
+	 * @return Interwiki Object, or null if not valid
+	 * @param $prefix string Interwiki prefix to use
+	 */
+	static public function fetch( $prefix ) {
+		global $wgContLang;
+		if( $prefix == '' ) {
+			return null;
+		}
+		$prefix = $wgContLang->lc( $prefix );
+		if( isset( self::$smCache[$prefix] ) ){
+			return self::$smCache[$prefix];
+		}
+		global $wgInterwikiCache;
+		if ($wgInterwikiCache) {
+			$iw = Interwiki::getInterwikiCached( $prefix );
+		} else {
+			$iw = Interwiki::load( $prefix );
+			if( !$iw ){
+				$iw = false;
+			}
+		}
+		if( self::CACHE_LIMIT && count( self::$smCache ) >= self::CACHE_LIMIT ){
+			reset( self::$smCache );
+			unset( self::$smCache[ key( self::$smCache ) ] );
+		}
+		self::$smCache[$prefix] = $iw;
+		return $iw;
+	}
+	
+	/**
+	 * Fetch interwiki prefix data from local cache in constant database.
+	 *
+	 * @note More logic is explained in DefaultSettings.
+	 *
+	 * @param $prefix \type{\string} Interwiki prefix
+	 * @return \type{\Interwiki} An interwiki object
+	 */
+	protected static function getInterwikiCached( $prefix ) {
+		$value = self::getInterwikiCacheEntry( $prefix );
+		
+		$s = new Interwiki( $prefix );
+		if ( $value != '' ) {
+			// Split values
+			list( $local, $url ) = explode( ' ', $value, 2 );
+			$s->mURL = $url;
+			$s->mLocal = (int)$local;
+		}else{
+			$s = false;
+		}
+		return $s;
+	}
+	
+	/**
+	 * Get entry from interwiki cache
+	 *
+	 * @note More logic is explained in DefaultSettings.
+	 *
+	 * @param $prefix \type{\string} Database key
+	 * @return \type{\string) The entry
+	 */
+	protected static function getInterwikiCacheEntry( $prefix ){
+		global $wgInterwikiCache, $wgInterwikiScopes, $wgInterwikiFallbackSite;
+		static $db, $site;
+
+		wfDebug( __METHOD__ . "( $prefix )\n" );
+		if( !$db ){
+			$db = dba_open( $wgInterwikiCache, 'r', 'cdb' );
+		}
+		/* Resolve site name */
+		if( $wgInterwikiScopes>=3 && !$site ) {
+			$site = dba_fetch( '__sites:' . wfWikiID(), $db );
+			if ( $site == "" ){
+				$site = $wgInterwikiFallbackSite;
+			}
+		}
+		
+		$value = dba_fetch( wfMemcKey( $prefix ), $db );
+		// Site level
+		if ( $value == '' && $wgInterwikiScopes >= 3 ) {
+			$value = dba_fetch( "_{$site}:{$prefix}", $db );
+		}
+		// Global Level
+		if ( $value == '' && $wgInterwikiScopes >= 2 ) {
+			$value = dba_fetch( "__global:{$prefix}", $db );
+		}
+		if ( $value == 'undef' )
+			$value = '';
+			
+		return $value;
+	}
+
+	/**
+	 * Load the interwiki, trying first memcached then the DB
+	 *
+	 * @param $prefix The interwiki prefix
+	 * @return bool The prefix is valid
+	 * @static
+	 *
+	 */
+	protected static function load( $prefix ) {
+		global $wgMemc, $wgInterwikiExpiry;
+		$key = wfMemcKey( 'interwiki', $prefix );
+		$mc = $wgMemc->get( $key );
+		$iw = false;
+		if( $mc && is_array( $mc ) ){ // is_array is hack for old keys
+			$iw = Interwiki::loadFromArray( $mc );
+			if( $iw ){
+				return $iw;
+			}
+		}
+		
+		$db = wfGetDB( DB_SLAVE );
+			
+		$row = $db->fetchRow( $db->select( 'interwiki', '*', array( 'iw_prefix' => $prefix ),
+			__METHOD__ ) );
+		$iw = Interwiki::loadFromArray( $row );
+		if ( $iw ) {
+			$mc = array( 'iw_url' => $iw->mURL, 'iw_local' => $iw->mLocal, 'iw_trans' => $iw->mTrans );
+			$wgMemc->add( $key, $mc, $wgInterwikiExpiry );
+			return $iw;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Fill in member variables from an array (e.g. memcached result, Database::fetchRow, etc)
+	 *
+	 * @return bool Whether everything was there
+	 * @param $res ResultWrapper Row from the interwiki table
+	 * @static
+	 */
+	protected static function loadFromArray( $mc ) {
+		if( isset( $mc['iw_url'] ) && isset( $mc['iw_local'] ) && isset( $mc['iw_trans'] ) ){
+			$iw = new Interwiki();
+			$iw->mURL = $mc['iw_url'];
+			$iw->mLocal = $mc['iw_local'];
+			$iw->mTrans = $mc['iw_trans'];
+			return $iw;
+		}
+		return false;
+	}
+	
+	/** 
+	 * Get the URL for a particular title (or with $1 if no title given)
+	 * 
+	 * @param $title string What text to put for the article name
+	 * @return string The URL
+	 */
+	function getURL( $title = null ){
+		$url = $this->mURL;
+		if( $title != null ){
+			$url = str_replace( "$1", $title, $url );
+		}
+		return $url;
+	}
+	
+	function isLocal(){
+		return $this->mLocal;
+	}
+	
+	function isTranscludable(){
+		return $this->mTrans;
+	}
+
+}
diff --git a/includes/JobQueue.php b/includes/JobQueue.php
index 8bfd1b3e..afa757d7 100644
--- a/includes/JobQueue.php
+++ b/includes/JobQueue.php
@@ -127,7 +127,7 @@ abstract class Job {
 			// Failed, someone else beat us to it
 			// Try getting a random row
 			$row = $dbw->selectRow( 'job', array( 'MIN(job_id) as minjob',
-				'MAX(job_id) as maxjob' ), "job_id >= $offset", __METHOD__ );
+				'MAX(job_id) as maxjob' ), '1=1', __METHOD__ );
 			if ( $row === false || is_null( $row->minjob ) || is_null( $row->maxjob ) ) {
 				// No jobs to get
 				wfProfileOut( __METHOD__ );
diff --git a/includes/Licenses.php b/includes/Licenses.php
index e76ac23c..6398c887 100644
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -121,7 +121,7 @@ class Licenses {
 
 	function outputOption( $val, $attribs = null, $depth ) {
 		$val = str_repeat( /* &nbsp */ "\xc2\xa0", $depth * 2 ) . $val;
-		return str_repeat( "\t", $depth ) . wfElement( 'option', $attribs, $val ) . "\n";
+		return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
 	}
 
 	function msg( $str ) {
diff --git a/includes/LinkBatch.php b/includes/LinkBatch.php
index bdc4b43a..d9a9666d 100644
--- a/includes/LinkBatch.php
+++ b/includes/LinkBatch.php
@@ -134,7 +134,7 @@ class LinkBatch {
 		$sql = "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect FROM $page WHERE $set";
 
 		// Do query
-		$res = new ResultWrapper( $dbr,  $dbr->query( $sql, __METHOD__ ) );
+		$res = $dbr->query( $sql, __METHOD__ );
 		wfProfileOut( __METHOD__ );
 		return $res;
 	}
diff --git a/includes/LinkCache.php b/includes/LinkCache.php
index 79727615..4f74cdd7 100644
--- a/includes/LinkCache.php
+++ b/includes/LinkCache.php
@@ -9,7 +9,6 @@ class LinkCache {
 	// becomes incompatible with the new version.
 	/* private */ var $mClassVer = 4;
 
-	/* private */ var $mPageLinks;
 	/* private */ var $mGoodLinks, $mBadLinks;
 	/* private */ var $mForUpdate;
 
@@ -26,7 +25,6 @@ class LinkCache {
 
 	function __construct() {
 		$this->mForUpdate = false;
-		$this->mPageLinks = array();
 		$this->mGoodLinks = array();
 		$this->mGoodLinkFields = array();
 		$this->mBadLinks = array();
@@ -78,14 +76,12 @@ class LinkCache {
 		$dbkey = $title->getPrefixedDbKey();
 		$this->mGoodLinks[$dbkey] = $id;
 		$this->mGoodLinkFields[$dbkey] = array( 'length' => $len, 'redirect' => $redir );
-		$this->mPageLinks[$dbkey] = $title;
 	}
 
 	public function addBadLinkObj( $title ) {
 		$dbkey = $title->getPrefixedDbKey();
-		if ( ! $this->isBadLink( $dbkey ) ) {
+		if ( !$this->isBadLink( $dbkey ) ) {
 			$this->mBadLinks[$dbkey] = 1;
-			$this->mPageLinks[$dbkey] = $title;
 		}
 	}
 
@@ -93,10 +89,19 @@ class LinkCache {
 		unset( $this->mBadLinks[$title] );
 	}
 
-	/* obsolete, for old $wgLinkCacheMemcached stuff */
-	public function clearLink( $title ) {}
+	public function clearLink( $title ) {
+		$dbkey = $title->getPrefixedDbKey();
+		if( isset($this->mBadLinks[$dbkey]) ) {
+			unset($this->mBadLinks[$dbkey]);
+		}
+		if( isset($this->mGoodLinks[$dbkey]) ) {
+			unset($this->mGoodLinks[$dbkey]);
+		}
+		if( isset($this->mGoodLinkFields[$dbkey]) ) {
+			unset($this->mGoodLinkFields[$dbkey]);
+		}
+	}
 
-	public function getPageLinks() { return $this->mPageLinks; }
 	public function getGoodLinks() { return $this->mGoodLinks; }
 	public function getBadLinks() { return array_keys( $this->mBadLinks ); }
 
@@ -125,27 +130,24 @@ class LinkCache {
 	 */
 	public function addLinkObj( &$nt, $len = -1, $redirect = NULL ) {
 		global $wgAntiLockFlags, $wgProfiler;
+		wfProfileIn( __METHOD__ );
 
-		$title = $nt->getPrefixedDBkey();
-		if ( $this->isBadLink( $title ) ) { return 0; }
-		$id = $this->getGoodLinkID( $title );
-		if ( 0 != $id ) { return $id; }
-
-		$fname = 'LinkCache::addLinkObj';
-		if ( isset( $wgProfiler ) ) {
-			$fname .= ' (' . $wgProfiler->getCurrentSection() . ')';
+		$key = $nt->getPrefixedDBkey();
+		if ( $this->isBadLink( $key ) ) {
+			wfProfileOut( __METHOD__ );
+			return 0;
+		}
+		$id = $this->getGoodLinkID( $key );
+		if ( $id != 0 ) {
+			wfProfileOut( __METHOD__ );
+			return $id;
 		}
 
-		wfProfileIn( $fname );
-
-		$ns = $nt->getNamespace();
-		$t = $nt->getDBkey();
-
-		if ( '' == $title ) {
-			wfProfileOut( $fname );
+		if ( $key === '' ) {
+			wfProfileOut( __METHOD__ );
 			return 0;
 		}
-
+		
 		# Some fields heavily used for linking...
 		if ( $this->mForUpdate ) {
 			$db = wfGetDB( DB_MASTER );
@@ -161,19 +163,24 @@ class LinkCache {
 
 		$s = $db->selectRow( 'page', 
 			array( 'page_id', 'page_len', 'page_is_redirect' ),
-			array( 'page_namespace' => $ns, 'page_title' => $t ),
-			$fname, $options );
+			array( 'page_namespace' => $nt->getNamespace(), 'page_title' => $nt->getDBkey() ),
+			__METHOD__, $options );
 		# Set fields...
-		$id = $s ? $s->page_id : 0;
-		$len = $s ? $s->page_len : -1;
-		$redirect = $s ? $s->page_is_redirect : 0;
+		if ( $s !== false ) {
+			$id = $s->page_id;
+			$len = $s->page_len;
+			$redirect = $s->page_is_redirect;
+		} else {
+			$len = -1;
+			$redirect = 0;
+		}
 
-		if( 0 == $id ) {
+		if ( $id == 0 ) {
 			$this->addBadLinkObj( $nt );
 		} else {
 			$this->addGoodLinkObj( $id, $nt, $len, $redirect );
 		}
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $id;
 	}
 
@@ -181,7 +188,6 @@ class LinkCache {
 	 * Clears cache
 	 */
 	public function clear() {
-		$this->mPageLinks = array();
 		$this->mGoodLinks = array();
 		$this->mGoodLinkFields = array();
 		$this->mBadLinks = array();
diff --git a/includes/Linker.php b/includes/Linker.php
index 32c506a4..f116fb4a 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -21,6 +21,7 @@ class Linker {
 	 * @deprecated
 	 */
 	function postParseLinkColour( $s = null ) {
+		wfDeprecated( __METHOD__ );
 		return null;
 	}
 
@@ -123,7 +124,9 @@ class Linker {
 		if ( $t->isRedirect() ) {
 			# Page is a redirect
 			$colour = 'mw-redirect';
-		} elseif ( $threshold > 0 && $t->getLength() < $threshold && MWNamespace::isContent( $t->getNamespace() ) ) {
+		} elseif ( $threshold > 0 && 
+			   $t->exists() && $t->getLength() < $threshold &&
+			   MWNamespace::isContent( $t->getNamespace() ) ) {
 			# Page is a stub
 			$colour = 'stub';
 		}
@@ -131,6 +134,194 @@ class Linker {
 	}
 
 	/**
+	 * This function returns an HTML link to the given target.  It serves a few
+	 * purposes:
+	 *   1) If $target is a Title, the correct URL to link to will be figured
+	 *      out automatically.
+	 *   2) It automatically adds the usual classes for various types of link
+	 *      targets: "new" for red links, "stub" for short articles, etc.
+	 *   3) It escapes all attribute values safely so there's no risk of XSS.
+	 *   4) It provides a default tooltip if the target is a Title (the page
+	 *      name of the target).
+	 * link() replaces the old functions in the makeLink() family.
+	 *
+	 * @param $target        Title  Can currently only be a Title, but this may
+	 *   change to support Images, literal URLs, etc.
+	 * @param $text          string The HTML contents of the <a> element, i.e.,
+	 *   the link text.  This is raw HTML and will not be escaped.  If null,
+	 *   defaults to the prefixed text of the Title; or if the Title is just a
+	 *   fragment, the contents of the fragment.
+	 * @param $customAttribs array  A key => value array of extra HTML attri-
+	 *   butes, such as title and class.  (href is ignored.)  Classes will be
+	 *   merged with the default classes, while other attributes will replace
+	 *   default attributes.  All passed attribute values will be HTML-escaped.
+	 *   A false attribute value means to suppress that attribute.
+	 * @param $query         array  The query string to append to the URL
+	 *   you're linking to, in key => value array form.  Query keys and values
+	 *   will be URL-encoded.
+	 * @param $options       mixed  String or array of strings:
+	 *     'known': Page is known to exist, so don't check if it does.
+	 *     'broken': Page is known not to exist, so don't check if it does.
+	 *     'noclasses': Don't add any classes automatically (includes "new",
+	 *       "stub", "mw-redirect", "extiw").  Only use the class attribute
+	 *       provided, if any, so you get a simple blue link with no funny i-
+	 *       cons.
+	 *     'forcearticlepath': Use the article path always, even with a querystring.
+	 *       Has compatibility issues on some setups, so avoid wherever possible.
+	 * @return string HTML <a> attribute
+	 */
+	public function link( $target, $text = null, $customAttribs = array(), $query = array(), $options = array() ) {
+		wfProfileIn( __METHOD__ );
+		if( !$target instanceof Title ) {
+			return "<!-- ERROR -->$text";
+		}
+		$options = (array)$options;
+
+		$ret = null;
+		if( !wfRunHooks( 'LinkBegin', array( $this, $target, &$text,
+		&$customAttribs, &$query, &$options, &$ret ) ) ) {
+			wfProfileOut( __METHOD__ );
+			return $ret;
+		}
+
+		# Normalize the Title if it's a special page
+		$target = $this->normaliseSpecialPage( $target );
+
+		# If we don't know whether the page exists, let's find out.
+		wfProfileIn( __METHOD__ . '-checkPageExistence' );
+		if( !in_array( 'known', $options ) and !in_array( 'broken', $options ) ) {
+			if( $target->isKnown() ) {
+				$options []= 'known';
+			} else {
+				$options []= 'broken';
+			}
+		}
+		wfProfileOut( __METHOD__ . '-checkPageExistence' );
+
+		$oldquery = array();
+		if( in_array( "forcearticlepath", $options ) && $query ){
+			$oldquery = $query;
+			$query = array();
+		}
+
+		# Note: we want the href attribute first, for prettiness.
+		$attribs = array( 'href' => $this->linkUrl( $target, $query, $options ) );
+		if( in_array( 'forcearticlepath', $options ) && $oldquery ){
+			$attribs['href'] = wfAppendQuery( $attribs['href'], wfArrayToCgi( $oldquery ) );
+		}
+
+		$attribs = array_merge(
+			$attribs,
+			$this->linkAttribs( $target, $customAttribs, $options )
+		);
+		if( is_null( $text ) ) {
+			$text = $this->linkText( $target );
+		}
+
+		$ret = null;
+		if( wfRunHooks( 'LinkEnd', array( $this, $target, $options, &$text, &$attribs, &$ret ) ) ) {
+			$ret = Xml::openElement( 'a', $attribs ) . $text . Xml::closeElement( 'a' );
+		}
+
+		wfProfileOut( __METHOD__ );
+		return $ret;
+	}
+
+	private function linkUrl( $target, $query, $options ) {
+		wfProfileIn( __METHOD__ );
+		# We don't want to include fragments for broken links, because they
+		# generally make no sense.
+		if( in_array( 'broken', $options ) and $target->mFragment !== '' ) {
+			$target = clone $target;
+			$target->mFragment = '';
+		}
+
+		# If it's a broken link, add the appropriate query pieces, unless
+		# there's already an action specified, or unless 'edit' makes no sense
+		# (i.e., for a nonexistent special page).
+		if( in_array( 'broken', $options ) and empty( $query['action'] )
+		and $target->getNamespace() != NS_SPECIAL ) {
+			$query['action'] = 'edit';
+			$query['redlink'] = '1';
+		}
+		$ret = $target->getLinkUrl( $query );
+		wfProfileOut( __METHOD__ );
+		return $ret;
+	}
+
+	private function linkAttribs( $target, $attribs, $options ) {
+		wfProfileIn( __METHOD__ );
+		global $wgUser;
+		$defaults = array();
+
+		if( !in_array( 'noclasses', $options ) ) {
+			wfProfileIn( __METHOD__ . '-getClasses' );
+			# Now build the classes.
+			$classes = array();
+
+			if( in_array( 'broken', $options ) ) {
+				$classes[] = 'new';
+			}
+
+			if( $target->isExternal() ) {
+				$classes[] = 'extiw';
+			}
+
+			# Note that redirects never count as stubs here.
+			if ( $target->isRedirect() ) {
+				$classes[] = 'mw-redirect';
+			} elseif( $target->isContentPage() ) {
+				# Check for stub.
+				$threshold = $wgUser->getOption( 'stubthreshold' );
+				if( $threshold > 0 and $target->exists() and $target->getLength() < $threshold ) {
+					$classes[] = 'stub';
+				}
+			}
+			if( $classes != array() ) {
+				$defaults['class'] = implode( ' ', $classes );
+			}
+			wfProfileOut( __METHOD__ . '-getClasses' );
+		}
+
+		# Get a default title attribute.
+		if( in_array( 'known', $options ) ) {
+			$defaults['title'] = $target->getPrefixedText();
+		} else {
+			$defaults['title'] = wfMsg( 'red-link-title', $target->getPrefixedText() );
+		}
+
+		# Finally, merge the custom attribs with the default ones, and iterate
+		# over that, deleting all "false" attributes.
+		$ret = array();
+		$merged = Sanitizer::mergeAttributes( $defaults, $attribs );
+		foreach( $merged as $key => $val ) {
+			# A false value suppresses the attribute, and we don't want the
+			# href attribute to be overridden.
+			if( $key != 'href' and $val !== false ) {
+				$ret[$key] = $val;
+			}
+		}
+		wfProfileOut( __METHOD__ );
+		return $ret;
+	}
+
+	private function linkText( $target ) {
+		# We might be passed a non-Title by make*LinkObj().  Fail gracefully.
+		if( !$target instanceof Title ) {
+			return '';
+		}
+
+		# If the target is just a fragment, with no title, we return the frag-
+		# ment text.  Otherwise, we return the title text itself.
+		if( $target->getPrefixedText() === '' and $target->getFragment() !== '' ) {
+			return htmlspecialchars( $target->getFragment() );
+		}
+		return htmlspecialchars( $target->getPrefixedText() );
+	}
+
+	/**
+	 * @deprecated Use link()
+	 *
 	 * This function is a shortcut to makeLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeLinkObj for further documentation.
 	 *
@@ -156,6 +347,8 @@ class Linker {
 	}
 
 	/**
+	 * @deprecated Use link()
+	 *
 	 * This function is a shortcut to makeKnownLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeKnownLinkObj for further documentation.
 	 *
@@ -177,6 +370,8 @@ class Linker {
 	}
 
 	/**
+	 * @deprecated Use link()
+	 *
 	 * This function is a shortcut to makeBrokenLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeBrokenLinkObj for further documentation.
 	 *
@@ -198,7 +393,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated use makeColouredLinkObj
+	 * @deprecated Use link()
 	 *
 	 * This function is a shortcut to makeStubLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeStubLinkObj for further documentation.
@@ -211,6 +406,7 @@ class Linker {
 	 *                      the end of the link.
 	 */
 	function makeStubLink( $title, $text = '', $query = '', $trail = '' ) {
+		wfDeprecated( __METHOD__ );
 		$nt = Title::newFromText( $title );
 		if ( $nt instanceof Title ) {
 			return $this->makeStubLinkObj( $nt, $text, $query, $trail );
@@ -221,6 +417,8 @@ class Linker {
 	}
 
 	/**
+	 * @deprecated Use link()
+	 *
 	 * Make a link for a title which may or may not be in the database. If you need to
 	 * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
 	 * call to this will result in a DB query.
@@ -238,67 +436,21 @@ class Linker {
 		global $wgUser;
 		wfProfileIn( __METHOD__ );
 
-		if ( !$nt instanceof Title ) {
-			# Fail gracefully
-			wfProfileOut( __METHOD__ );
-			return "<!-- ERROR -->{$prefix}{$text}{$trail}";
+		$query = wfCgiToArray( $query );
+		list( $inside, $trail ) = Linker::splitTrail( $trail );
+		if( $text === '' ) {
+			$text = $this->linkText( $nt );
 		}
 
-		if ( $nt->isExternal() ) {
-			$u = $nt->getFullURL();
-			$link = $nt->getPrefixedURL();
-			if ( '' == $text ) { $text = $nt->getPrefixedText(); }
-			$style = $this->getInterwikiLinkAttributes( $link, $text, 'extiw' );
-
-			$inside = '';
-			if ( '' != $trail ) {
-				$m = array();
-				if ( preg_match( '/^([a-z]+)(.*)$$/sD', $trail, $m ) ) {
-					$inside = $m[1];
-					$trail = $m[2];
-				}
-			}
-			$t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
-
-			wfProfileOut( __METHOD__ );
-			return $t;
-		} elseif ( $nt->isAlwaysKnown() ) {
-			# Image links, special page links and self-links with fragments are always known.
-			$retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-		} else {
-			wfProfileIn( __METHOD__.'-immediate' );
+		$ret = $this->link( $nt, "$prefix$text$inside", array(), $query ) . $trail;
 
-			# Handles links to special pages which do not exist in the database:
-			if( $nt->getNamespace() == NS_SPECIAL ) {
-				if( SpecialPage::exists( $nt->getDBkey() ) ) {
-					$retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-				} else {
-					$retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
-				}
-				wfProfileOut( __METHOD__.'-immediate' );
-				wfProfileOut( __METHOD__ );
-				return $retVal;
-			}
-
-			# Work out link colour immediately
-			$aid = $nt->getArticleID() ;
-			if ( 0 == $aid ) {
-				$retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
-			} else {
-				$colour = '';
-				if ( $nt->isContentPage() ) {
-					$threshold = $wgUser->getOption('stubthreshold');
-					$colour = $this->getLinkColour( $nt, $threshold );
-				}
-				$retVal = $this->makeColouredLinkObj( $nt, $colour, $text, $query, $trail, $prefix );
-			}
-			wfProfileOut( __METHOD__.'-immediate' );
-		}
 		wfProfileOut( __METHOD__ );
-		return $retVal;
+		return $ret;
 	}
 
 	/**
+	 * @deprecated Use link()
+	 *
 	 * Make a link for a title which definitely exists. This is faster than makeLinkObj because
 	 * it doesn't have to do a database query. It's also valid for interwiki titles and special
 	 * pages.
@@ -315,40 +467,26 @@ class Linker {
 	function makeKnownLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = '' ) {
 		wfProfileIn( __METHOD__ );
 
-		if ( !$title instanceof Title ) {
-			# Fail gracefully
-			wfProfileOut( __METHOD__ );
-			return "<!-- ERROR -->{$prefix}{$text}{$trail}";
-		}
-
-		$nt = $this->normaliseSpecialPage( $title );
-
-		$u = $nt->escapeLocalURL( $query );
-		if ( $nt->getFragment() != '' ) {
-			if( $nt->getPrefixedDbkey() == '' ) {
-				$u = '';
-				if ( '' == $text ) {
-					$text = htmlspecialchars( $nt->getFragment() );
-				}
-			}
-			$u .= $nt->getFragmentForURL();
-		}
 		if ( $text == '' ) {
-			$text = htmlspecialchars( $nt->getPrefixedText() );
-		}
-		if ( $style == '' ) {
-			$style = $this->getInternalLinkAttributesObj( $nt, $text );
+			$text = $this->linkText( $title );
 		}
+		$attribs = Sanitizer::mergeAttributes(
+			Sanitizer::decodeTagAttributes( $aprops ),
+			Sanitizer::decodeTagAttributes( $style )
+		);
+		$query = wfCgiToArray( $query );
+		list( $inside, $trail ) = Linker::splitTrail( $trail );
 
-		if ( $aprops !== '' ) $aprops = ' ' . $aprops;
+		$ret = $this->link( $title, "$prefix$text$inside", $attribs, $query,
+			array( 'known', 'noclasses' ) ) . $trail;
 
-		list( $inside, $trail ) = Linker::splitTrail( $trail );
-		$r = "<a href=\"{$u}\"{$style}{$aprops}>{$prefix}{$text}{$inside}</a>{$trail}";
 		wfProfileOut( __METHOD__ );
-		return $r;
+		return $ret;
 	}
 
 	/**
+	 * @deprecated Use link()
+	 *
 	 * Make a red link to the edit page of a given title.
 	 *
 	 * @param $nt Title object of the target page
@@ -361,40 +499,21 @@ class Linker {
 	function makeBrokenLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' ) {
 		wfProfileIn( __METHOD__ );
 
-		if ( !$title instanceof Title ) {
-			# Fail gracefully
-			wfProfileOut( __METHOD__ );
-			return "<!-- ERROR -->{$prefix}{$text}{$trail}";
+		list( $inside, $trail ) = Linker::splitTrail( $trail );
+		if( $text === '' ) {
+			$text = $this->linkText( $title );
 		}
-
 		$nt = $this->normaliseSpecialPage( $title );
 
-		if( $nt->getNamespace() == NS_SPECIAL ) {
-			$q = $query;
-		} else if ( '' == $query ) {
-			$q = 'action=edit&redlink=1';
-		} else {
-			$q = 'action=edit&redlink=1&'.$query;
-		}
-		$u = $nt->escapeLocalURL( $q );
-
-		$titleText = $nt->getPrefixedText();
-		if ( '' == $text ) {
-			$text = htmlspecialchars( $titleText );
-		}
-		$titleAttr = wfMsg( 'red-link-title', $titleText );
-		$style = $this->getInternalLinkAttributesObj( $nt, $text, 'new', $titleAttr );
-		list( $inside, $trail ) = Linker::splitTrail( $trail );
-
-		wfRunHooks( 'BrokenLink', array( &$this, $nt, $query, &$u, &$style, &$prefix, &$text, &$inside, &$trail ) );
-		$s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
+		$ret = $this->link( $title, "$prefix$text$inside", array(),
+			wfCgiToArray( $query ), 'broken' ) . $trail;
 
 		wfProfileOut( __METHOD__ );
-		return $s;
+		return $ret;
 	}
 
 	/**
-	 * @deprecated use makeColouredLinkObj
+	 * @deprecated Use link()
 	 *
 	 * Make a brown link to a short article.
 	 *
@@ -406,10 +525,13 @@ class Linker {
 	 *                      the end of the link.
 	 */
 	function makeStubLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+		wfDeprecated( __METHOD__ );
 		return $this->makeColouredLinkObj( $nt, 'stub', $text, $query, $trail, $prefix );
 	}
 
 	/**
+	 * @deprecated Use link()
+	 *
 	 * Make a coloured link.
 	 *
 	 * @param $nt Title object of the target page
@@ -421,7 +543,6 @@ class Linker {
 	 *                      the end of the link.
 	 */
 	function makeColouredLinkObj( $nt, $colour, $text = '', $query = '', $trail = '', $prefix = '' ) {
-
 		if($colour != ''){
 			$style = $this->getInternalLinkAttributesObj( $nt, $text, $colour );
 		} else $style = '';
@@ -464,7 +585,9 @@ class Linker {
 		if ( $title->getNamespace() == NS_SPECIAL ) {
 			list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
 			if ( !$name ) return $title;
-			return SpecialPage::getTitleFor( $name, $subpage );
+			$ret = SpecialPage::getTitleFor( $name, $subpage );
+			$ret->mFragment = $title->getFragment();
+			return $ret;
 		} else {
 			return $title;
 		}
@@ -483,6 +606,7 @@ class Linker {
 
 	/** Obsolete alias */
 	function makeImage( $url, $alt = '' ) {
+		wfDeprecated( __METHOD__ );
 		return $this->makeExternalImage( $url, $alt );
 	}
 
@@ -564,6 +688,9 @@ class Linker {
 	 *                          bottom, text-bottom)
 	 *          alt             Alternate text for image (i.e. alt attribute). Plain text.
 	 *          caption         HTML for image caption.
+	 *          link-url        URL to link to
+	 *          link-title      Title object to link to
+	 *          no-link         Boolean, suppress description link
 	 *
 	 * @param array $handlerParams Associative array of media handler parameters, to be passed
 	 *       to transform(). Typical keys are "width" and "page".
@@ -581,7 +708,7 @@ class Linker {
 		global $wgContLang, $wgUser, $wgThumbLimits, $wgThumbUpright;
 		if ( $file && !$file->allowInlineDisplay() ) {
 			wfDebug( __METHOD__.': '.$title->getPrefixedDBkey()." does not allow inline display\n" );
-			return $this->makeKnownLinkObj( $title );
+			return $this->link( $title );
 		}
 
 		// Shortcuts
@@ -592,11 +719,12 @@ class Linker {
 		$page = isset( $hp['page'] ) ? $hp['page'] : false;
 		if ( !isset( $fp['align'] ) ) $fp['align'] = '';
 		if ( !isset( $fp['alt'] ) ) $fp['alt'] = '';
+		# Backward compatibility, title used to always be equal to alt text
+		if ( !isset( $fp['title'] ) ) $fp['title'] = $fp['alt'];
 
 		$prefix = $postfix = '';
 
-		if ( 'center' == $fp['align'] )
-		{
+		if ( 'center' == $fp['align'] ) {
 			$prefix  = '<div class="center">';
 			$postfix = '</div>';
 			$fp['align']   = 'none';
@@ -627,7 +755,6 @@ class Linker {
 		}
 
 		if ( isset( $fp['thumbnail'] ) || isset( $fp['manualthumb'] ) || isset( $fp['framed'] ) ) {
-
 			# Create a thumbnail. Alignment depends on language
 			# writing direction, # right aligned for left-to-right-
 			# languages ("Western languages"), left-aligned
@@ -660,15 +787,26 @@ class Linker {
 		if ( !$thumb ) {
 			$s = $this->makeBrokenImageLinkObj( $title, '', '', '', '', $time==true );
 		} else {
-			$s = $thumb->toHtml( array(
-				'desc-link' => true,
-				'desc-query' => $query,
+			$params = array(
 				'alt' => $fp['alt'],
+				'title' => $fp['title'],
 				'valign' => isset( $fp['valign'] ) ? $fp['valign'] : false ,
-				'img-class' => isset( $fp['border'] ) ? 'thumbborder' : false ) );
+				'img-class' => isset( $fp['border'] ) ? 'thumbborder' : false );
+			if ( !empty( $fp['link-url'] ) ) {
+				$params['custom-url-link'] = $fp['link-url'];
+			} elseif ( !empty( $fp['link-title'] ) ) {
+				$params['custom-title-link'] = $fp['link-title'];
+			} elseif ( !empty( $fp['no-link'] ) ) {
+				// No link
+			} else {
+				$params['desc-link'] = true;
+				$params['desc-query'] = $query;
+			}
+
+			$s = $thumb->toHtml( $params );
 		}
 		if ( '' != $fp['align'] ) {
-			$s = "<div class=\"float{$fp['align']}\"><span>{$s}</span></div>";
+			$s = "<div class=\"float{$fp['align']}\">{$s}</div>";
 		}
 		return str_replace("\n", ' ',$prefix.$s.$postfix);
 	}
@@ -700,6 +838,8 @@ class Linker {
 		$page = isset( $hp['page'] ) ? $hp['page'] : false;
 		if ( !isset( $fp['align'] ) ) $fp['align'] = 'right';
 		if ( !isset( $fp['alt'] ) ) $fp['alt'] = '';
+		# Backward compatibility, title used to always be equal to alt text
+		if ( !isset( $fp['title'] ) ) $fp['title'] = $fp['alt'];
 		if ( !isset( $fp['caption'] ) ) $fp['caption'] = '';
 
 		if ( empty( $hp['width'] ) ) {
@@ -713,7 +853,7 @@ class Linker {
 		} else {
 			if ( isset( $fp['manualthumb'] ) ) {
 				# Use manually specified thumbnail
-				$manual_title = Title::makeTitleSafe( NS_IMAGE, $fp['manualthumb'] );
+				$manual_title = Title::makeTitleSafe( NS_FILE, $fp['manualthumb'] );
 				if( $manual_title ) {
 					$manual_img = wfFindFile( $manual_title );
 					if ( $manual_img ) {
@@ -759,6 +899,7 @@ class Linker {
 		} else {
 			$s .= $thumb->toHtml( array(
 				'alt' => $fp['alt'],
+				'title' => $fp['title'],
 				'img-class' => 'thumbimage',
 				'desc-link' => true,
 				'desc-query' => $query ) );
@@ -818,7 +959,7 @@ class Linker {
 
 	/** @deprecated use Linker::makeMediaLinkObj() */
 	function makeMediaLink( $name, $unused = '', $text = '', $time = false ) {
-		$nt = Title::makeTitleSafe( NS_IMAGE, $name );
+		$nt = Title::makeTitleSafe( NS_FILE, $name );
 		return $this->makeMediaLinkObj( $nt, $text, $time );
 	}
 
@@ -867,11 +1008,10 @@ class Linker {
 	}
 
 	/** @todo document */
-	function makeExternalLink( $url, $text, $escape = true, $linktype = '', $ns = null ) {
-		$style = $this->getExternalLinkAttributes( $url, $text, 'external ' . $linktype );
-		global $wgNoFollowLinks, $wgNoFollowNsExceptions;
-		if( $wgNoFollowLinks && !(isset($ns) && in_array($ns, $wgNoFollowNsExceptions)) ) {
-			$style .= ' rel="nofollow"';
+	function makeExternalLink( $url, $text, $escape = true, $linktype = '', $attribs = array() ) {
+		$attribsText = $this->getExternalLinkAttributes( $url, $text, 'external ' . $linktype );
+		if ( $attribs ) {
+			$attribsText .= Xml::expandAttributes( $attribs );
 		}
 		$url = htmlspecialchars( $url );
 		if( $escape ) {
@@ -883,7 +1023,7 @@ class Linker {
 			wfDebug("Hook LinkerMakeExternalLink changed the output of link with url {$url} and text {$text} to {$link}", true);
 			return $link;
 		}
-		return '<a href="'.$url.'"'.$style.'>'.$text.'</a>';
+		return '<a href="'.$url.'"'.$attribsText.'>'.$text.'</a>';
 	}
 
 	/**
@@ -894,15 +1034,12 @@ class Linker {
 	 * @private
 	 */
 	function userLink( $userId, $userText ) {
-		$encName = htmlspecialchars( $userText );
 		if( $userId == 0 ) {
-			$contribsPage = SpecialPage::getTitleFor( 'Contributions', $userText );
-			return $this->makeKnownLinkObj( $contribsPage,
-				$encName);
+			$page = SpecialPage::getTitleFor( 'Contributions', $userText );
 		} else {
-			$userPage = Title::makeTitle( NS_USER, $userText );
-			return $this->makeLinkObj( $userPage, $encName );
+			$page = Title::makeTitle( NS_USER, $userText );
 		}
+		return $this->link( $page, htmlspecialchars( $userText ), array( 'class' => 'mw-userlink' ) );
 	}
 
 	/**
@@ -926,22 +1063,23 @@ class Linker {
 		}
 		if( $userId ) {
 			// check if the user has an edit
+			$attribs = array();
 			if( $redContribsWhenNoEdits ) {
 				$count = !is_null($edits) ? $edits : User::edits( $userId );
-				$style = ($count == 0) ? " class='new'" : '';
-			} else {
-				$style = '';
+				if( $count == 0 ) {
+					$attribs['class'] = 'new';
+				}
 			}
 			$contribsPage = SpecialPage::getTitleFor( 'Contributions', $userText );
 
-			$items[] = $this->makeKnownLinkObj( $contribsPage, wfMsgHtml( 'contribslink' ), '', '', '', '', $style );
+			$items[] = $this->link( $contribsPage, wfMsgHtml( 'contribslink' ), $attribs );
 		}
 		if( $blockable && $wgUser->isAllowed( 'block' ) ) {
 			$items[] = $this->blockLink( $userId, $userText );
 		}
 
 		if( $items ) {
-			return ' (' . implode( ' | ', $items ) . ')';
+			return ' <span class="mw-usertoollinks">(' . implode( ' | ', $items ) . ')</span>';
 		} else {
 			return '';
 		}
@@ -966,7 +1104,7 @@ class Linker {
 	 */
 	function userTalkLink( $userId, $userText ) {
 		$userTalkPage = Title::makeTitle( NS_USER_TALK, $userText );
-		$userTalkLink = $this->makeLinkObj( $userTalkPage, wfMsgHtml( 'talkpagelinktext' ) );
+		$userTalkLink = $this->link( $userTalkPage, wfMsgHtml( 'talkpagelinktext' ) );
 		return $userTalkLink;
 	}
 
@@ -978,8 +1116,7 @@ class Linker {
 	 */
 	function blockLink( $userId, $userText ) {
 		$blockPage = SpecialPage::getTitleFor( 'Blockip', $userText );
-		$blockLink = $this->makeKnownLinkObj( $blockPage,
-			wfMsgHtml( 'blocklink' ) );
+		$blockLink = $this->link( $blockPage, wfMsgHtml( 'blocklink' ) );
 		return $blockLink;
 	}
 
@@ -993,7 +1130,8 @@ class Linker {
 		if( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
 			$link = wfMsgHtml( 'rev-deleted-user' );
 		} else if( $rev->userCan( Revision::DELETED_USER ) ) {
-			$link = $this->userLink( $rev->getRawUser(), $rev->getRawUserText() );
+			$link = $this->userLink( $rev->getUser( Revision::FOR_THIS_USER ), 
+				$rev->getUserText( Revision::FOR_THIS_USER ) );
 		} else {
 			$link = wfMsgHtml( 'rev-deleted-user' );
 		}
@@ -1013,8 +1151,10 @@ class Linker {
 		if( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
 			$link = wfMsgHtml( 'rev-deleted-user' );
 		} else if( $rev->userCan( Revision::DELETED_USER ) ) {
-			$link = $this->userLink( $rev->getRawUser(), $rev->getRawUserText() ) .
-			' ' . $this->userToolLinks( $rev->getRawUser(), $rev->getRawUserText() );
+			$userId = $rev->getUser( Revision::FOR_THIS_USER );
+			$userText = $rev->getUserText( Revision::FOR_THIS_USER ); 
+			$link = $this->userLink( $userId, $userText ) .
+				' ' . $this->userToolLinks( $userId, $userText );
 		} else {
 			$link = wfMsgHtml( 'rev-deleted-user' );
 		}
@@ -1045,7 +1185,8 @@ class Linker {
 
 		# Sanitize text a bit:
 		$comment = str_replace( "\n", " ", $comment );
-		$comment = htmlspecialchars( $comment );
+		# Allow HTML entities (for bug 13815)
+		$comment = Sanitizer::escapeHtmlAllowEntities( $comment );
 
 		# Render autocomments and make links:
 		$comment = $this->formatAutoComments( $comment, $title, $local );
@@ -1068,45 +1209,63 @@ class Linker {
 	 *
 	 * @todo Document the $local parameter.
 	 */
-	private function formatAutocomments( $comment, $title = NULL, $local = false ) {
-		$match = array();
-		while (preg_match('!(.*)/\*\s*(.*?)\s*\*/(.*)!', $comment,$match)) {
-			$pre=$match[1];
-			$auto=$match[2];
-			$post=$match[3];
-			$link='';
-			if( $title ) {
-				$section = $auto;
-
-				# Generate a valid anchor name from the section title.
-				# Hackish, but should generally work - we strip wiki
-				# syntax, including the magic [[: that is used to
-				# "link rather than show" in case of images and
-				# interlanguage links.
-				$section = str_replace( '[[:', '', $section );
-				$section = str_replace( '[[', '', $section );
-				$section = str_replace( ']]', '', $section );
-				if ( $local ) {
-					$sectionTitle = Title::newFromText( '#' . $section);
-				} else {
-					$sectionTitle = wfClone( $title );
-					$sectionTitle->mFragment = $section;
-				}
-				$link = $this->makeKnownLinkObj( $sectionTitle, wfMsgForContent( 'sectionlink' ) );
-			}
-			$auto = $link . $auto;
-			if( $pre ) {
-				# written summary $presep autocomment (summary /* section */)
-				$auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto;
+	private function formatAutocomments( $comment, $title = null, $local = false ) {
+		// Bah!
+		$this->autocommentTitle = $title;
+		$this->autocommentLocal = $local;
+		$comment = preg_replace_callback(
+			'!(.*)/\*\s*(.*?)\s*\*/(.*)!',
+			array( $this, 'formatAutocommentsCallback' ),
+			$comment );
+		unset( $this->autocommentTitle );
+		unset( $this->autocommentLocal );
+		return $comment;
+	}
+	
+	private function formatAutocommentsCallback( $match ) {
+		$title = $this->autocommentTitle;
+		$local = $this->autocommentLocal;
+		
+		$pre=$match[1];
+		$auto=$match[2];
+		$post=$match[3];
+		$link='';
+		if( $title ) {
+			$section = $auto;
+
+			# Generate a valid anchor name from the section title.
+			# Hackish, but should generally work - we strip wiki
+			# syntax, including the magic [[: that is used to
+			# "link rather than show" in case of images and
+			# interlanguage links.
+			$section = str_replace( '[[:', '', $section );
+			$section = str_replace( '[[', '', $section );
+			$section = str_replace( ']]', '', $section );
+			if ( $local ) {
+				$sectionTitle = Title::newFromText( '#' . $section );
+			} else {
+				$sectionTitle = Title::makeTitleSafe( $title->getNamespace(), 
+					$title->getDBkey(), $section );
 			}
-			if( $post ) {
-				# autocomment $postsep written summary (/* section */ summary)
-				$auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) );
+			if ( $sectionTitle ) {
+				$link = $this->link( $sectionTitle,
+					wfMsgForContent( 'sectionlink' ), array(), array(),
+					'noclasses' );
+			} else {
+				$link = '';
 			}
-			$auto = '<span class="autocomment">' . $auto . '</span>';
-			$comment = $pre . $auto . $post;
 		}
-
+		$auto = "$link$auto";
+		if( $pre ) {
+			# written summary $presep autocomment (summary /* section */)
+			$auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto;
+		}
+		if( $post ) {
+			# autocomment $postsep written summary (/* section */ summary)
+			$auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) );
+		}
+		$auto = '<span class="autocomment">' . $auto . '</span>';
+		$comment = $pre . $auto . $post;
 		return $comment;
 	}
 
@@ -1201,7 +1360,8 @@ class Linker {
 		if( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) {
 			$block = " <span class=\"comment\">" . wfMsgHtml( 'rev-deleted-comment' ) . "</span>";
 		} else if( $rev->userCan( Revision::DELETED_COMMENT ) ) {
-			$block = $this->commentBlock( $rev->getRawComment(), $rev->getTitle(), $local );
+			$block = $this->commentBlock( $rev->getComment( Revision::FOR_THIS_USER ),
+				$rev->getTitle(), $local );
 		} else {
 			$block = " <span class=\"comment\">" . wfMsgHtml( 'rev-deleted-comment' ) . "</span>";
 		}
@@ -1261,8 +1421,8 @@ class Linker {
 		 . "</ul>\n</td></tr></table>"
 		 . '<script type="' . $wgJsMimeType . '">'
 		 . ' if (window.showTocToggle) {'
-		 . ' var tocShowText = "' . wfEscapeJsString( wfMsg('showtoc') ) . '";'
-		 . ' var tocHideText = "' . wfEscapeJsString( wfMsg('hidetoc') ) . '";'
+		 . ' var tocShowText = "' . Xml::escapeJsString( wfMsg('showtoc') ) . '";'
+		 . ' var tocHideText = "' . Xml::escapeJsString( wfMsg('hidetoc') ) . '";'
 		 . ' showTocToggle();'
 		 . ' } '
 		 . "</script>\n";
@@ -1276,8 +1436,9 @@ class Linker {
 	 * @param $section Integer: section number.
 	 */
 	public function editSectionLinkForOther( $title, $section ) {
+		wfDeprecated( __METHOD__ );
 		$title = Title::newFromText( $title );
-		return $this->doEditSectionLink( $title, $section, '', 'EditSectionLinkForOther' );
+		return $this->doEditSectionLink( $title, $section );
 	}
 
 	/**
@@ -1285,49 +1446,64 @@ class Linker {
 	 * @param $section Integer: section number.
 	 * @param $hint Link String: title, or default if omitted or empty
 	 */
-	public function editSectionLink( Title $nt, $section, $hint='' ) {
-		if( $hint != '' ) {
-			$hint = wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) );
-			$hint = " title=\"$hint\"";
-		}
-		return $this->doEditSectionLink( $nt, $section, $hint, 'EditSectionLink' );
+	public function editSectionLink( Title $nt, $section, $hint = '' ) {
+		wfDeprecated( __METHOD__ );
+		if( $hint === '' ) {
+			# No way to pass an actual empty $hint here!  The new interface al-
+			# lows this, so we have to do this for compatibility.
+			$hint = null;
+		}
+		return $this->doEditSectionLink( $nt, $section, $hint );
 	}
 
 	/**
-	 * Implement editSectionLink and editSectionLinkForOther.
+	 * Create a section edit link.  This supersedes editSectionLink() and
+	 * editSectionLinkForOther().
 	 *
-	 * @param $nt      Title object
-	 * @param $section Integer, section number
-	 * @param $hint    String, for HTML title attribute
-	 * @param $hook    String, name of hook to run
-	 * @return         String, HTML to use for edit link
+	 * @param $nt      Title  The title being linked to (may not be the same as
+	 *   $wgTitle, if the section is included from a template)
+	 * @param $section string The designation of the section being pointed to,
+	 *   to be included in the link, like "&section=$section"
+	 * @param $tooltip string The tooltip to use for the link: will be escaped
+	 *   and wrapped in the 'editsectionhint' message
+	 * @return         string HTML to use for edit link
 	 */
-	protected function doEditSectionLink( Title $nt, $section, $hint, $hook ) {
-		global $wgContLang;
-		$editurl = '&section='.$section;
-		$url = $this->makeKnownLinkObj(
-			$nt,
-			htmlspecialchars(wfMsg('editsection')),
-			'action=edit'.$editurl,
-			'', '', '',  $hint
+	public function doEditSectionLink( Title $nt, $section, $tooltip = null ) {
+		$attribs = array();
+		if( !is_null( $tooltip ) ) {
+			$attribs['title'] = wfMsg( 'editsectionhint', $tooltip );
+		}
+		$link = $this->link( $nt, wfMsg('editsection'),
+			$attribs,
+			array( 'action' => 'edit', 'section' => $section ),
+			array( 'noclasses', 'known' )
 		);
-		$result = null;
 
-		// The two hooks have slightly different interfaces . . .
-		if( $hook == 'EditSectionLink' ) {
-			wfRunHooks( 'EditSectionLink', array( &$this, $nt, $section, $hint, $url, &$result ) );
-		} elseif( $hook == 'EditSectionLinkForOther' ) {
-			wfRunHooks( 'EditSectionLinkForOther', array( &$this, $nt, $section, $url, &$result ) );
+		# Run the old hook.  This takes up half of the function . . . hopefully
+		# we can rid of it someday.
+		$attribs = '';
+		if( $tooltip ) {
+			$attribs = wfMsgHtml( 'editsectionhint', htmlspecialchars( $tooltip ) );
+			$attribs = " title=\"$attribs\"";
 		}
-
-		// For reverse compatibility, add the brackets *after* the hook is run,
-		// and even add them to hook-provided text.
-		if( is_null( $result ) ) {
-			$result = wfMsgHtml( 'editsection-brackets', $url );
-		} else {
+		$result = null;
+		wfRunHooks( 'EditSectionLink', array( &$this, $nt, $section, $attribs, $link, &$result ) );
+		if( !is_null( $result ) ) {
+			# For reverse compatibility, add the brackets *after* the hook is
+			# run, and even add them to hook-provided text.  (This is the main
+			# reason that the EditSectionLink hook is deprecated in favor of
+			# DoEditSectionLink: it can't change the brackets or the span.)
 			$result = wfMsgHtml( 'editsection-brackets', $result );
+			return "<span class=\"editsection\">$result</span>";
 		}
-		return "<span class=\"editsection\">$result</span>";
+
+		# Add the brackets and the span, and *then* run the nice new hook, with
+		# clean and non-redundant arguments.
+		$result = wfMsgHtml( 'editsection-brackets', $link );
+		$result = "<span class=\"editsection\">$result</span>";
+
+		wfRunHooks( 'DoEditSectionLink', array( $this, $nt, $section, $tooltip, &$result ) );
+		return $result;
 	}
 
 	/**
@@ -1339,11 +1515,21 @@ class Linker {
 	 * @param string $anchor  The anchor to give the headline (the bit after the #)
 	 * @param string $text    The text of the header
 	 * @param string $link    HTML to add for the section edit link
+	 * @param mixed  $legacyAnchor A second, optional anchor to give for
+	 *   backward compatibility (false to omit)
 	 *
 	 * @return string HTML headline
 	 */
-	public function makeHeadline( $level, $attribs, $anchor, $text, $link ) {
-		return "<a name=\"$anchor\"></a><h$level$attribs$link <span class=\"mw-headline\">$text</span></h$level>";
+	public function makeHeadline( $level, $attribs, $anchor, $text, $link, $legacyAnchor = false ) {
+		$ret = "<a name=\"$anchor\" id=\"$anchor\"></a>"
+			. "<h$level$attribs"
+			. $link
+			. " <span class=\"mw-headline\">$text</span>"
+			. "</h$level>";
+		if ( $legacyAnchor !== false ) {
+			$ret = "<a name=\"$legacyAnchor\" id=\"$legacyAnchor\"></a>$ret";
+		}
+		return $ret;
 	}
 
 	/**
@@ -1397,14 +1583,19 @@ class Linker {
 	public function buildRollbackLink( $rev ) {
 		global $wgRequest, $wgUser;
 		$title = $rev->getTitle();
-		$extra  = $wgRequest->getBool( 'bot' ) ? '&bot=1' : '';
-		$extra .= '&token=' . urlencode( $wgUser->editToken( array( $title->getPrefixedText(),
-			$rev->getUserText() ) ) );
-		return $this->makeKnownLinkObj(
-			$title,
-			wfMsgHtml( 'rollbacklink' ),
-			'action=rollback&from=' . urlencode( $rev->getUserText() ) . $extra
+		$query = array(
+			'action' => 'rollback',
+			'from' => $rev->getUserText()
 		);
+		if( $wgRequest->getBool( 'bot' ) ) {
+			$query['bot'] = '1';
+			$query['hidediff'] = '1'; // bug 15999
+		}
+		$query['token'] = $wgUser->editToken( array( $title->getPrefixedText(),
+			$rev->getUserText() ) );
+		return $this->link( $title, wfMsgHtml( 'rollbacklink' ),
+			array( 'title' => wfMsg( 'tooltip-rollback' ) ),
+			$query,	array( 'known', 'noclasses' ) );
 	}
 
 	/**
@@ -1416,12 +1607,9 @@ class Linker {
 	 * @param bool $section Whether this is for a section edit
 	 * @return string HTML output
 	 */
-	public function formatTemplates( $templates, $preview = false, $section = false) {
-		global $wgUser;
+	public function formatTemplates( $templates, $preview = false, $section = false ) {
 		wfProfileIn( __METHOD__ );
 
-		$sk = $wgUser->getSkin();
-
 		$outText = '';
 		if ( count( $templates ) > 0 ) {
 			# Do a batch existence check
@@ -1440,7 +1628,7 @@ class Linker {
 			} else {
 				$outText .= wfMsgExt( 'templatesused', array( 'parse' ) );
 			}
-			$outText .= '</div><ul>';
+			$outText .= "</div><ul>\n";
 
 			usort( $templates, array( 'Title', 'compare' ) );
 			foreach ( $templates as $titleObj ) {
@@ -1452,7 +1640,12 @@ class Linker {
 				} else {
 					$protected = '';
 				}
-				$outText .= '<li>' . $sk->makeLinkObj( $titleObj ) . ' ' . $protected . '</li>';
+				if( $titleObj->quickUserCan( 'edit' ) ) {
+					$editLink = $this->makeLinkObj( $titleObj, wfMsg('editlink'), 'action=edit' );
+				} else {
+					$editLink = $this->makeLinkObj( $titleObj, wfMsg('viewsourcelink'), 'action=edit' );
+				}
+				$outText .= '<li>' . $this->link( $titleObj ) . ' (' . $editLink . ') ' . $protected . '</li>';
 			}
 			$outText .= '</ul>';
 		}
@@ -1467,21 +1660,19 @@ class Linker {
 	 * or similar
 	 * @return string HTML output
 	 */
-	public function formatHiddenCategories( $hiddencats) {
-		global $wgUser, $wgLang;
+	public function formatHiddenCategories( $hiddencats ) {
+		global $wgLang;
 		wfProfileIn( __METHOD__ );
 
-		$sk = $wgUser->getSkin();
-
 		$outText = '';
 		if ( count( $hiddencats ) > 0 ) {
 			# Construct the HTML
 			$outText = '<div class="mw-hiddenCategoriesExplanation">';
 			$outText .= wfMsgExt( 'hiddencategories', array( 'parse' ), $wgLang->formatnum( count( $hiddencats ) ) );
-			$outText .= '</div><ul>';
+			$outText .= "</div><ul>\n";
 
 			foreach ( $hiddencats as $titleObj ) {
-				$outText .= '<li>' . $sk->makeKnownLinkObj( $titleObj ) . '</li>'; # If it's hidden, it must exist - no need to check with a LinkBatch
+				$outText .= '<li>' . $this->link( $titleObj, null, array(), array(), 'known' ) . "</li>\n"; # If it's hidden, it must exist - no need to check with a LinkBatch
 			}
 			$outText .= '</ul>';
 		}
@@ -1502,38 +1693,37 @@ class Linker {
 	}
 
 	/**
-	 * Given the id of an interface element, constructs the appropriate title
-	 * and accesskey attributes from the system messages.  (Note, this is usu-
-	 * ally the id but isn't always, because sometimes the accesskey needs to
-	 * go on a different element than the id, for reverse-compatibility, etc.)
-	 *
-	 * @param string $name Id of the element, minus prefixes.
-	 * @return string title and accesskey attributes, ready to drop in an
-	 *   element (e.g., ' title="This does something [x]" accesskey="x"').
+	 * @deprecated Returns raw bits of HTML, use titleAttrib() and accesskey()
 	 */
 	public function tooltipAndAccesskey( $name ) {
-		wfProfileIn( __METHOD__ );
-		$attribs = array();
-
-		$tooltip = wfMsg( "tooltip-$name" );
-		if( !wfEmptyMsg( "tooltip-$name", $tooltip ) && $tooltip != '-' ) {
-			// Compatibility: formerly some tooltips had [alt-.] hardcoded
-			$tooltip = preg_replace( "/ ?\[alt-.\]$/", '', $tooltip );
-			$attribs['title'] = $tooltip;
+		# FIXME: If Sanitizer::expandAttributes() treated "false" as "output
+		# no attribute" instead of "output '' as value for attribute", this
+		# would be three lines.
+		$attribs = array(
+			'title' => $this->titleAttrib( $name, 'withaccess' ),
+			'accesskey' => $this->accesskey( $name )
+		);
+		if ( $attribs['title'] === false ) {
+			unset( $attribs['title'] );
 		}
-
-		$accesskey = wfMsg( "accesskey-$name" );
-		if( $accesskey && $accesskey != '-' &&
-		!wfEmptyMsg( "accesskey-$name", $accesskey ) ) {
-			if( isset( $attribs['title'] ) ) {
-				$attribs['title'] .= " [$accesskey]";
-			}
-			$attribs['accesskey'] = $accesskey;
+		if ( $attribs['accesskey'] === false ) {
+			unset( $attribs['accesskey'] );
 		}
+		return Xml::expandAttributes( $attribs );
+	}
 
-		$ret = Xml::expandAttributes( $attribs );
-		wfProfileOut( __METHOD__ );
-		return $ret;
+	/** @deprecated Returns raw bits of HTML, use titleAttrib() */
+	public function tooltip( $name, $options = null ) {
+		# FIXME: If Sanitizer::expandAttributes() treated "false" as "output
+		# no attribute" instead of "output '' as value for attribute", this
+		# would be two lines.
+		$tooltip = $this->titleAttrib( $name, $options );
+		if ( $tooltip === false ) {
+			return '';
+		}
+		return Xml::expandAttributes( array(
+			'title' => $this->titleAttrib( $name, $options )
+		) );
 	}
 
 	/**
@@ -1545,29 +1735,62 @@ class Linker {
 	 * @param string $name    Id of the element, minus prefixes.
 	 * @param mixed  $options null or the string 'withaccess' to add an access-
 	 *   key hint
-	 * @return string title attribute, ready to drop in an element
-	 * (e.g., ' title="This does something"').
+	 * @return string Contents of the title attribute (which you must HTML-
+	 *   escape), or false for no title attribute
 	 */
-	public function tooltip( $name, $options = null ) {
+	public function titleAttrib( $name, $options = null ) {
 		wfProfileIn( __METHOD__ );
 
-		$attribs = array();
-
 		$tooltip = wfMsg( "tooltip-$name" );
-		if( !wfEmptyMsg( "tooltip-$name", $tooltip ) && $tooltip != '-' ) {
-			$attribs['title'] = $tooltip;
+		# Compatibility: formerly some tooltips had [alt-.] hardcoded
+		$tooltip = preg_replace( "/ ?\[alt-.\]$/", '', $tooltip );
+
+		# Message equal to '-' means suppress it.
+		if ( wfEmptyMsg( "tooltip-$name", $tooltip ) || $tooltip == '-' ) {
+			$tooltip = false;
 		}
 
-		if( isset( $attribs['title'] ) && $options == 'withaccess' ) {
-			$accesskey = wfMsg( "accesskey-$name" );
-			if( $accesskey && $accesskey != '-' &&
-			!wfEmptyMsg( "accesskey-$name", $accesskey ) ) {
-				$attribs['title'] .= " [$accesskey]";
+		if ( $options == 'withaccess' ) {
+			$accesskey = $this->accesskey( $name );
+			if( $accesskey !== false ) {
+				if ( $tooltip === false || $tooltip === '' ) {
+					$tooltip = "[$accesskey]";
+				} else {
+					$tooltip .= " [$accesskey]";
+				}
 			}
 		}
 
-		$ret = Xml::expandAttributes( $attribs );
 		wfProfileOut( __METHOD__ );
-		return $ret;
+		return $tooltip;
+	}
+
+	/**
+	 * Given the id of an interface element, constructs the appropriate
+	 * accesskey attribute from the system messages.  (Note, this is usually
+	 * the id but isn't always, because sometimes the accesskey needs to go on
+	 * a different element than the id, for reverse-compatibility, etc.)
+	 *
+	 * @param string $name    Id of the element, minus prefixes.
+	 * @return string Contents of the accesskey attribute (which you must HTML-
+	 *   escape), or false for no accesskey attribute
+	 */
+	public function accesskey( $name ) {
+		wfProfileIn( __METHOD__ );
+
+		$accesskey = wfMsg( "accesskey-$name" );
+
+		# FIXME: Per standard MW behavior, a value of '-' means to suppress the
+		# attribute, but this is broken for accesskey: that might be a useful
+		# value.
+		if( $accesskey != ''
+		&& $accesskey != '-'
+		&& !wfEmptyMsg( "accesskey-$name", $accesskey ) ) {
+			wfProfileOut( __METHOD__ );
+			return $accesskey;
+		}
+
+		wfProfileOut( __METHOD__ );
+		return false;
 	}
 }
diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php
index bb192fb9..13f35b5a 100644
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@ -20,7 +20,8 @@ class LinksUpdate {
 		$mProperties,    //!< Map of arbitrary name to value
 		$mDb,            //!< Database connection reference
 		$mOptions,       //!< SELECT options to be used (array)
-		$mRecursive;     //!< Whether to queue jobs for recursive updates
+		$mRecursive,     //!< Whether to queue jobs for recursive updates
+		$mTouchTmplLinks; //!< Whether to queue HTMLCacheUpdate jobs IF recursive
 	/**@}}*/
 
 	/**
@@ -67,14 +68,24 @@ class LinksUpdate {
 		}
 
 		$this->mRecursive = $recursive;
+		$this->mTouchTmplLinks = false;
 
 		wfRunHooks( 'LinksUpdateConstructed', array( &$this ) );
 	}
+	
+	/**
+	 * Invalidate HTML cache of pages that include this page?
+	 */
+	public function setRecursiveTouch( $val ) {
+		$this->mTouchTmplLinks = (bool)$val;
+		if( $val ) // Cannot invalidate without queueRecursiveJobs()
+			$this->mRecursive = true;
+	}
 
 	/**
 	 * Update link tables with outgoing links from an updated article
 	 */
-	function doUpdate() {
+	public function doUpdate() {
 		global $wgUseDumbLinkUpdate;
 
 		wfRunHooks( 'LinksUpdate', array( &$this ) );
@@ -87,7 +98,7 @@ class LinksUpdate {
 
 	}
 
-	function doIncrementalUpdate() {
+	protected function doIncrementalUpdate() {
 		wfProfileIn( __METHOD__ );
 
 		# Page links
@@ -158,7 +169,7 @@ class LinksUpdate {
 	 * May be slower or faster depending on level of lock contention and write speed of DB
 	 * Also useful where link table corruption needs to be repaired, e.g. in refreshLinks.php
 	 */
-	function doDumbUpdate() {
+	protected function doDumbUpdate() {
 		wfProfileIn( __METHOD__ );
 
 		# Refresh category pages and image description pages
@@ -193,34 +204,54 @@ class LinksUpdate {
 	}
 
 	function queueRecursiveJobs() {
+		global $wgUpdateRowsPerJob;
 		wfProfileIn( __METHOD__ );
 
-		$batchSize = 100;
 		$dbr = wfGetDB( DB_SLAVE );
-		$res = $dbr->select( array( 'templatelinks', 'page' ),
-			array( 'page_namespace', 'page_title' ),
-			array(
-				'page_id=tl_from',
+		$res = $dbr->select( 'templatelinks',
+			array( 'tl_from' ),
+			array( 
 				'tl_namespace' => $this->mTitle->getNamespace(),
 				'tl_title' => $this->mTitle->getDBkey()
 			), __METHOD__
 		);
 
-		$done = false;
-		while ( !$done ) {
-			$jobs = array();
-			for ( $i = 0; $i < $batchSize; $i++ ) {
-				$row = $dbr->fetchObject( $res );
-				if ( !$row ) {
-					$done = true;
+		$numRows = $res->numRows();
+		if( !$numRows ) {
+			wfProfileOut( __METHOD__ );
+			return; // nothing to do
+		}
+		$numBatches = ceil( $numRows / $wgUpdateRowsPerJob );
+		$realBatchSize = $numRows / $numBatches;
+		$start = false;
+		$jobs = array();
+		do {
+			for( $i = 0; $i <= $realBatchSize - 1; $i++ ) {
+				$row = $res->fetchRow();
+				if( $row ) {
+					$id = $row[0];
+				} else {
+					$id = false;
 					break;
 				}
-				$title = Title::makeTitle( $row->page_namespace, $row->page_title );
-				$jobs[] = new RefreshLinksJob( $title, '' );
 			}
-			Job::batchInsert( $jobs );
-		}
+			$params = array(
+				'start' => $start,
+				'end' => ( $id !== false ? $id - 1 : false ),
+			);
+			$jobs[] = new RefreshLinksJob2( $this->mTitle, $params );
+			# Hit page caches while we're at it if set to do so...
+			if( $this->mTouchTmplLinks ) {
+				$params['table'] = 'templatelinks';
+				$jobs[] = new HTMLCacheUpdateJob( $this->mTitle, $params );
+			}
+			$start = $id;
+		} while ( $start );
+
 		$dbr->freeResult( $res );
+
+		Job::batchInsert( $jobs );
+
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -286,7 +317,7 @@ class LinksUpdate {
 	}
 
 	function invalidateImageDescriptions( $images ) {
-		$this->invalidatePages( NS_IMAGE, array_keys( $images ) );
+		$this->invalidatePages( NS_FILE, array_keys( $images ) );
 	}
 
 	function dumbTableUpdate( $table, $insertions, $fromField ) {
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index d49f636b..528bd3aa 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -24,7 +24,7 @@ class LogEventsList {
 	private $out;
 	public $flags;
 
-	function __construct( $skin, $out, $flags = 0 ) {
+	public function __construct( $skin, $out, $flags = 0 ) {
 		$this->skin = $skin;
 		$this->out = $out;
 		$this->flags = $flags;
@@ -38,34 +38,38 @@ class LogEventsList {
 	private function preCacheMessages() {
 		// Precache various messages
 		if( !isset( $this->message ) ) {
-			$messages = 'revertmerge protect_change unblocklink revertmove undeletelink revdel-restore rev-delundel';
-			foreach( explode(' ', $messages ) as $msg ) {
-				$this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
+			$messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink',
+				'revertmove', 'undeletelink', 'revdel-restore', 'rev-delundel', 'hist', 'pipe-separator' );
+			foreach( $messages as $msg ) {
+				$this->message[$msg] = wfMsgExt( $msg, array( 'escape' ) );
 			}
 		}
 	}
 
 	/**
 	 * Set page title and show header for this log type
-	 * @param string $type
+	 * @param $type String
 	 */
 	public function showHeader( $type ) {
 		if( LogPage::isLogType( $type ) ) {
 			$this->out->setPageTitle( LogPage::logName( $type ) );
-			$this->out->addHtml( LogPage::logHeader( $type ) );
+			$this->out->addHTML( LogPage::logHeader( $type ) );
 		}
 	}
 
 	/**
 	 * Show options for the log list
-	 * @param string $type,
-	 * @param string $user,
-	 * @param string $page,
-	 * @param string $pattern
-	 * @param int $year
-	 * @parm int $month
+	 * @param $type String
+	 * @param $user String
+	 * @param $page String
+	 * @param $pattern String
+	 * @param $year Integer: year
+	 * @param $month Integer: month
+	 * @param $filter Boolean
 	 */
-	public function showOptions( $type='', $user='', $page='', $pattern='', $year='', $month='' ) {
+	public function showOptions( $type = '', $user = '', $page = '', $pattern = '', $year = '', 
+			$month = '', $filter = null ) 
+	{
 		global $wgScript, $wgMiserMode;
 		$action = htmlspecialchars( $wgScript );
 		$title = SpecialPage::getTitleFor( 'Log' );
@@ -79,13 +83,46 @@ class LogEventsList {
 			$this->getTitleInput( $page ) . "\n" .
 			( !$wgMiserMode ? ($this->getTitlePattern( $pattern )."\n") : "" ) .
 			"<p>" . $this->getDateMenu( $year, $month ) . "\n" .
+			( $filter ? "</p><p>".$this->getFilterLinks( $type, $filter )."\n" : "" ) .
 			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "</p>\n" .
-			"</fieldset></form>" );
+			"</fieldset></form>"
+		);
+	}
+	
+	private function getFilterLinks( $logType, $filter ) {
+		global $wgTitle;
+		// show/hide links
+		$messages = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) );
+		// Option value -> message mapping
+		$links = array();
+		foreach( $filter as $type => $val ) {
+			$hideVal = 1 - intval($val);
+			$link = $this->skin->makeKnownLinkObj( $wgTitle, $messages[$hideVal],
+				wfArrayToCGI( array( "hide_{$type}_log" => $hideVal ), $this->getDefaultQuery() )
+			);
+			$links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link );
+		}
+		// Build links
+		return implode( ' | ', $links );
+	}
+	
+	private function getDefaultQuery() {
+		if ( !isset( $this->mDefaultQuery ) ) {
+			$this->mDefaultQuery = $_GET;
+			unset( $this->mDefaultQuery['title'] );
+			unset( $this->mDefaultQuery['dir'] );
+			unset( $this->mDefaultQuery['offset'] );
+			unset( $this->mDefaultQuery['limit'] );
+			unset( $this->mDefaultQuery['order'] );
+			unset( $this->mDefaultQuery['month'] );
+			unset( $this->mDefaultQuery['year'] );
+		}
+		return $this->mDefaultQuery;
 	}
 
 	/**
-	 * @return string Formatted HTML
-	 * @param string $queryType
+	 * @param $queryType String
+	 * @return String: Formatted HTML
 	 */
 	private function getTypeMenu( $queryType ) {
 		global $wgLogRestrictions, $wgUser;
@@ -93,19 +130,19 @@ class LogEventsList {
 		$html = "<select name='type'>\n";
 
 		$validTypes = LogPage::validTypes();
-		$m = array(); // Temporary array
+		$typesByName = array(); // Temporary array
 
 		// First pass to load the log names
 		foreach( $validTypes as $type ) {
 			$text = LogPage::logName( $type );
-			$m[$text] = $type;
+			$typesByName[$text] = $type;
 		}
 
 		// Second pass to sort by name
-		ksort($m);
+		ksort($typesByName);
 
 		// Third pass generates sorted XHTML content
-		foreach( $m as $text => $type ) {
+		foreach( $typesByName as $text => $type ) {
 			$selected = ($type == $queryType);
 			// Restricted types
 			if ( isset($wgLogRestrictions[$type]) ) {
@@ -122,25 +159,25 @@ class LogEventsList {
 	}
 
 	/**
-	 * @return string Formatted HTML
-	 * @param string $user
+	 * @param $user String
+	 * @return String: Formatted HTML
 	 */
 	private function getUserInput( $user ) {
 		return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 15, $user );
 	}
 
 	/**
-	 * @return string Formatted HTML
-	 * @param string $title
+	 * @param $title String
+	 * @return String: Formatted HTML
 	 */
 	private function getTitleInput( $title ) {
 		return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title );
 	}
 
 	/**
+	 * @param $year Integer
+	 * @param $month Integer
 	 * @return string Formatted HTML
-	 * @param int $year
-	 * @param int $month
 	 */
 	private function getDateMenu( $year, $month ) {
 		# Offset overrides year/month selection
@@ -185,10 +222,9 @@ class LogEventsList {
 		return "</ul>\n";
 	}
 
-		/**
-	 * @param Row $row a single row from the result set
-	 * @return string Formatted HTML list item
-	 * @private
+	/**
+	 * @param $row Row: a single row from the result set
+	 * @return String: Formatted HTML list item
 	 */
 	public function logLine( $row ) {
 		global $wgLang, $wgUser, $wgContLang;
@@ -213,88 +249,127 @@ class LogEventsList {
 		$revert = $del = '';
 		// Some user can hide log items and have review links
 		if( $wgUser->isAllowed( 'deleterevision' ) ) {
-			$del = $this->showhideLinks( $row ) . ' ';
+			$del = $this->getShowHideLinks( $row ) . ' ';
 		}
 		// Add review links and such...
-		if( !($this->flags & self::NO_ACTION_LINK) && !($row->log_deleted & LogPage::DELETED_ACTION) ) {
-			if( self::typeAction($row,'move','move') && isset( $paramArray[0] ) && $wgUser->isAllowed( 'move' ) ) {
-				$destTitle = Title::newFromText( $paramArray[0] );
-				if( $destTitle ) {
-					$revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
-						$this->message['revertmove'],
-						'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) .
-						'&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) .
-						'&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) .
-						'&wpMovetalk=0' ) . ')';
-				}
-			// Show undelete link
-			} else if( self::typeAction($row,array('delete','suppress'),'delete') && $wgUser->isAllowed( 'delete' ) ) {
-				$revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ),
-					$this->message['undeletelink'], 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')';
-			// Show unblock link
-			} else if( self::typeAction($row,array('block','suppress'),'block') && $wgUser->isAllowed( 'block' ) ) {
-				$revert = '(' .  $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Ipblocklist' ),
+		if( ($this->flags & self::NO_ACTION_LINK) || ($row->log_deleted & LogPage::DELETED_ACTION) ) {
+			// Action text is suppressed...
+		} else if( self::typeAction($row,'move','move','move') && !empty($paramArray[0]) ) {
+			$destTitle = Title::newFromText( $paramArray[0] );
+			if( $destTitle ) {
+				$revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
+					$this->message['revertmove'],
+					'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) .
+					'&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) .
+					'&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) .
+					'&wpMovetalk=0' ) . ')';
+			}
+		// Show undelete link
+		} else if( self::typeAction($row,array('delete','suppress'),'delete','delete') ) {
+			$revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ),
+				$this->message['undeletelink'], 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')';
+		// Show unblock/change block link
+		} else if( self::typeAction($row,array('block','suppress'),array('block','reblock'),'block') ) {
+			$revert = '(' .
+				$this->skin->link( SpecialPage::getTitleFor( 'Ipblocklist' ),
 					$this->message['unblocklink'],
-					'action=unblock&ip=' . urlencode( $row->log_title ) ) . ')';
-			// Show change protection link
-			} else if( self::typeAction($row,'protect','modify') && $wgUser->isAllowed( 'protect' ) ) {
-				$revert = '(' .  $this->skin->makeKnownLinkObj( $title, $this->message['protect_change'], 'action=unprotect' ) . ')';
-			// Show unmerge link
-			} else if ( self::typeAction($row,'merge','merge') ) {
-				$merge = SpecialPage::getTitleFor( 'Mergehistory' );
-				$revert = '(' .  $this->skin->makeKnownLinkObj( $merge, $this->message['revertmerge'],
-					wfArrayToCGI( array('target' => $paramArray[0], 'dest' => $title->getPrefixedDBkey(), 
-						'mergepoint' => $paramArray[1] ) ) ) . ')';
-			// If an edit was hidden from a page give a review link to the history
-			} else if( self::typeAction($row,array('delete','suppress'),'revision') && $wgUser->isAllowed( 'deleterevision' ) ) {
-				if( count($paramArray) == 2 ) {
-					$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-					// Different revision types use different URL params...
-					$key = $paramArray[0];
-					// Link to each hidden object ID, $paramArray[1] is the url param
-					$Ids = explode( ',', $paramArray[1] );
-					$revParams = '';
-					foreach( $Ids as $n => $id ) {
-						$revParams .= '&' . urlencode($key) . '[]=' . urlencode($id);
-					}
-					$revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
-						'target=' . $title->getPrefixedUrl() . $revParams ) . ')';
+					array(),
+					array( 'action' => 'unblock', 'ip' => $row->log_title ),
+					'known' ) 
+				. ' ' . $this->message['pipe-separator'] . ' ' .
+				$this->skin->link( SpecialPage::getTitleFor( 'Blockip', $row->log_title ), 
+					$this->message['change-blocklink'],
+					array(), array(), 'known' ) .
+				')';
+		// Show change protection link
+		} else if( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) {
+			$revert .= ' (' . 
+				$this->skin->link( $title,
+					$this->message['hist'],
+					array(),
+					array( 'action' => 'history', 'offset' => $row->log_timestamp ) );
+			if( $wgUser->isAllowed( 'protect' ) ) {
+				$revert .= ' ' . $this->message['pipe-separator'] . ' ' .
+					$this->skin->link( $title,
+						$this->message['protect_change'],
+						array(),
+						array( 'action' => 'protect' ),
+						'known' );
+			}
+			$revert .= ')';
+		// Show unmerge link
+		} else if( self::typeAction($row,'merge','merge','mergehistory') ) {
+			$merge = SpecialPage::getTitleFor( 'Mergehistory' );
+			$revert = '(' .  $this->skin->makeKnownLinkObj( $merge, $this->message['revertmerge'],
+				wfArrayToCGI( array('target' => $paramArray[0], 'dest' => $title->getPrefixedDBkey(), 
+					'mergepoint' => $paramArray[1] ) ) ) . ')';
+		// If an edit was hidden from a page give a review link to the history
+		} else if( self::typeAction($row,array('delete','suppress'),'revision','deleterevision') ) {
+			if( count($paramArray) == 2 ) {
+				$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+				// Different revision types use different URL params...
+				$key = $paramArray[0];
+				// Link to each hidden object ID, $paramArray[1] is the url param
+				$Ids = explode( ',', $paramArray[1] );
+				$revParams = '';
+				foreach( $Ids as $n => $id ) {
+					$revParams .= '&' . urlencode($key) . '[]=' . urlencode($id);
 				}
-			// Hidden log items, give review link
-			} else if( self::typeAction($row,array('delete','suppress'),'event') && $wgUser->isAllowed( 'deleterevision' ) ) {
-				if( count($paramArray) == 1 ) {
-					$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-					$Ids = explode( ',', $paramArray[0] );
-					// Link to each hidden object ID, $paramArray[1] is the url param
-					$logParams = '';
-					foreach( $Ids as $n => $id ) {
-						$logParams .= '&logid[]=' . intval($id);
-					}
-					$revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
-						'target=' . $title->getPrefixedUrl() . $logParams ) . ')';
+				$revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
+					'target=' . $title->getPrefixedUrl() . $revParams ) . ')';
+			}
+		// Hidden log items, give review link
+		} else if( self::typeAction($row,array('delete','suppress'),'event','deleterevision') ) {
+			if( count($paramArray) == 1 ) {
+				$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+				$Ids = explode( ',', $paramArray[0] );
+				// Link to each hidden object ID, $paramArray[1] is the url param
+				$logParams = '';
+				foreach( $Ids as $n => $id ) {
+					$logParams .= '&logid[]=' . intval($id);
 				}
+				$revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
+					'target=' . $title->getPrefixedUrl() . $logParams ) . ')';
+			}
+		// Self-created users
+		} else if( self::typeAction($row,'newusers','create2') ) {
+			if( isset( $paramArray[0] ) ) {
+				$revert = $this->skin->userToolLinks( $paramArray[0], $title->getDBkey(), true );
 			} else {
-				wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray,
-					&$comment, &$revert, $row->log_timestamp ) );
-				// wfDebug( "Invoked LogLine hook for " $row->log_type . ", " . $row->log_action . "\n" );
-				// Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters.
+				# Fall back to a blue contributions link
+				$revert = $this->skin->userToolLinks( 1, $title->getDBkey() );
+			}
+			if( $time < '20080129000000' ) {
+				# Suppress $comment from old entries (before 2008-01-29),
+				# not needed and can contain incorrect links
+				$comment = '';
 			}
+		// Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters.
+		} else {
+			wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray,
+				&$comment, &$revert, $row->log_timestamp ) );
 		}
 		// Event description
 		if( self::isDeleted($row,LogPage::DELETED_ACTION) ) {
 			$action = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
 		} else {
-			$action = LogPage::actionText( $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true );
+			$action = LogPage::actionText( $row->log_type, $row->log_action, $title,
+				$this->skin, $paramArray, true );
+		}
+
+		if( $revert != '' ) {
+			$revert = '<span class="mw-logevent-actionlink">' . $revert . '</span>';
 		}
 
-		return "<li>$del$time $userLink $action $comment $revert</li>\n";
+		return Xml::tags( 'li', array( "class" => "mw-logline-$row->log_type" ),
+			$del . $time . ' ' . $userLink . ' ' . $action . ' ' . $comment . ' ' . $revert );
 	}
 
 	/**
-	 * @param Row $row
+	 * @param $row Row
 	 * @return string
 	 */
-	private function showhideLinks( $row ) {
+	private function getShowHideLinks( $row ) {
 		$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 		// If event was hidden from sysops
 		if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) {
@@ -314,25 +389,31 @@ class LogEventsList {
 	}
 
 	/**
-	 * @param Row $row
-	 * @param mixed $type (string/array)
-	 * @param string $action
+	 * @param $row Row
+	 * @param $type Mixed: string/array
+	 * @param $action Mixed: string/array
+	 * @param $right string
 	 * @return bool
 	 */
-	public static function typeAction( $row, $type, $action ) {
-		if( is_array($type) ) {
-			return ( in_array($row->log_type,$type) && $row->log_action == $action );
-		} else {
-			return ( $row->log_type == $type && $row->log_action == $action );
+	public static function typeAction( $row, $type, $action, $right='' ) {
+		$match = is_array($type) ? in_array($row->log_type,$type) : $row->log_type == $type;
+		if( $match ) {
+			$match = is_array($action) ?
+				in_array($row->log_action,$action) : $row->log_action == $action;
+			if( $match && $right ) {
+				global $wgUser;
+				$match = $wgUser->isAllowed( $right );
+			}
 		}
+		return $match;
 	}
 
 	/**
 	 * Determine if the current user is allowed to view a particular
 	 * field of this log row, if it's marked as deleted.
-	 * @param Row $row
-	 * @param int $field
-	 * @return bool
+	 * @param $row Row
+	 * @param $field Integer
+	 * @return Boolean
 	 */
 	public static function userCan( $row, $field ) {
 		if( ( $row->log_deleted & $field ) == $field ) {
@@ -348,9 +429,9 @@ class LogEventsList {
 	}
 
 	/**
-	 * @param Row $row
-	 * @param int $field one of DELETED_* bitfield constants
-	 * @return bool
+	 * @param $row Row
+	 * @param $field Integer: one of DELETED_* bitfield constants
+	 * @return Boolean
 	 */
 	public static function isDeleted( $row, $field ) {
 		return ($row->log_deleted & $field) == $field;
@@ -358,16 +439,19 @@ class LogEventsList {
 
 	/**
 	 * Quick function to show a short log extract
-	 * @param OutputPage $out
-	 * @param string $type
-	 * @param string $page
-	 * @param string $user
+	 * @param $out OutputPage
+	 * @param $type String
+	 * @param $page String
+	 * @param $user String
+	 * @param $lim Integer
+	 * @param $conds Array
 	 */
-	 public static function showLogExtract( $out, $type='', $page='', $user='' ) {
+	public static function showLogExtract( $out, $type='', $page='', $user='', $lim=0, $conds=array() ) {
 		global $wgUser;
 		# Insert list of top 50 or so items
 		$loglist = new LogEventsList( $wgUser->getSkin(), $out, 0 );
-		$pager = new LogPager( $loglist, $type, $user, $page, '' );
+		$pager = new LogPager( $loglist, $type, $user, $page, '', $conds );
+		if( $lim > 0 ) $pager->mLimit = $lim;
 		$logBody = $pager->getBody();
 		if( $logBody ) {
 			$out->addHTML(
@@ -378,27 +462,28 @@ class LogEventsList {
 		} else {
 			$out->addWikiMsg( 'logempty' );
 		}
-	 }
+		return $pager->getNumRows();
+	}
 
-	 /**
+	/**
 	 * SQL clause to skip forbidden log types for this user
-	 * @param Database $db
-	 * @returns mixed (string or false)
+	 * @param $db Database
+	 * @return mixed (string or false)
 	 */
 	public static function getExcludeClause( $db ) {
 		global $wgLogRestrictions, $wgUser;
 		// Reset the array, clears extra "where" clauses when $par is used
 		$hiddenLogs = array();
 		// Don't show private logs to unprivileged users
-		foreach( $wgLogRestrictions as $logtype => $right ) {
+		foreach( $wgLogRestrictions as $logType => $right ) {
 			if( !$wgUser->isAllowed($right) ) {
-				$safetype = $db->strencode( $logtype );
-				$hiddenLogs[] = $safetype;
+				$safeType = $db->strencode( $logType );
+				$hiddenLogs[] = $safeType;
 			}
 		}
 		if( count($hiddenLogs) == 1 ) {
 			return 'log_type != ' . $db->addQuotes( $hiddenLogs[0] );
-		} elseif( !empty( $hiddenLogs ) ) {
+		} elseif( $hiddenLogs ) {
 			return 'log_type NOT IN (' . $db->makeList($hiddenLogs) . ')';
 		}
 		return false;
@@ -409,18 +494,23 @@ class LogEventsList {
  * @ingroup Pager
  */
 class LogPager extends ReverseChronologicalPager {
-	private $type = '', $user = '', $title = '', $pattern = '', $year = '', $month = '';
+	private $type = '', $user = '', $title = '', $pattern = '';
 	public $mLogEventsList;
+
 	/**
-	* constructor
-	* @param LogEventsList $loglist,
-	* @param string $type,
-	* @param string $user,
-	* @param string $page,
-	* @param string $pattern
-	* @param array $conds
-	*/
-	function __construct( $list, $type='', $user='', $title='', $pattern='', $conds=array(), $y=false, $m=false ) {
+	 * constructor
+	 * @param $list LogEventsList
+	 * @param $type String
+	 * @param $user String
+	 * @param $title String
+	 * @param $pattern String
+	 * @param $conds Array
+	 * @param $year Integer
+	 * @param $month Integer
+	 */
+	public function __construct( $list, $type = '', $user = '', $title = '', $pattern = '', 
+		$conds = array(), $year = false, $month = false ) 
+	{
 		parent::__construct();
 		$this->mConds = $conds;
 
@@ -429,22 +519,40 @@ class LogPager extends ReverseChronologicalPager {
 		$this->limitType( $type );
 		$this->limitUser( $user );
 		$this->limitTitle( $title, $pattern );
-		$this->limitDate( $y, $m );
+		$this->getDateCond( $year, $month );
 	}
 
-	function getDefaultQuery() {
+	public function getDefaultQuery() {
 		$query = parent::getDefaultQuery();
 		$query['type'] = $this->type;
-		$query['month'] = $this->month;
-		$query['year'] = $this->year;
+		$query['user'] = $this->user;
+		$query['month'] = $this->mMonth;
+		$query['year'] = $this->mYear;
 		return $query;
 	}
 
+	public function getFilterParams() {
+		global $wgFilterLogTypes, $wgUser, $wgRequest;
+		$filters = array();
+		if( $this->type ) {
+			return $filters;
+		}
+		foreach( $wgFilterLogTypes as $type => $default ) {
+			// Avoid silly filtering
+			if( $type !== 'patrol' || $wgUser->useNPPatrol() ) {
+				$hide = $wgRequest->getInt( "hide_{$type}_log", $default );
+				$filters[$type] = $hide;
+				if( $hide )
+					$this->mConds[] = 'log_type != ' . $this->mDb->addQuotes( $type );
+			}
+		}
+		return $filters;
+	}
+
 	/**
 	 * Set the log reader to return only entries of the given type.
 	 * Type restrictions enforced here
-	 * @param string $type A log type ('upload', 'delete', etc)
-	 * @private
+	 * @param $type String: A log type ('upload', 'delete', etc)
 	 */
 	private function limitType( $type ) {
 		global $wgLogRestrictions, $wgUser;
@@ -457,7 +565,7 @@ class LogPager extends ReverseChronologicalPager {
 		if( $hideLogs !== false ) {
 			$this->mConds[] = $hideLogs;
 		}
-		if( empty($type) ) {
+		if( !$type ) {
 			return false;
 		}
 		$this->type = $type;
@@ -466,10 +574,9 @@ class LogPager extends ReverseChronologicalPager {
 
 	/**
 	 * Set the log reader to return only entries by the given user.
-	 * @param string $name (In)valid user name
-	 * @private
+	 * @param $name String: (In)valid user name
 	 */
-	function limitUser( $name ) {
+	private function limitUser( $name ) {
 		if( $name == '' ) {
 			return false;
 		}
@@ -492,10 +599,10 @@ class LogPager extends ReverseChronologicalPager {
 	/**
 	 * Set the log reader to return only entries affecting the given page.
 	 * (For the block and rights logs, this is a user page.)
-	 * @param string $page Title name as text
-	 * @private
+	 * @param $page String: Title name as text
+	 * @param $pattern String
 	 */
-	function limitTitle( $page, $pattern ) {
+	private function limitTitle( $page, $pattern ) {
 		global $wgMiserMode;
 
 		$title = Title::newFromText( $page );
@@ -527,46 +634,7 @@ class LogPager extends ReverseChronologicalPager {
 		}
 	}
 
-	/**
-	 * Set the log reader to return only entries from given date.
-	 * @param int $year
-	 * @param int $month
-	 * @private
-	 */
-	function limitDate( $year, $month ) {
-		$year = intval($year);
-		$month = intval($month);
-
-		$this->year = ($year > 0 && $year < 10000) ? $year : '';
-		$this->month = ($month > 0 && $month < 13) ? $month : '';
-
-		if( $this->year || $this->month ) {
-			// Assume this year if only a month is given
-			if( $this->year ) {
-				$year_start = $this->year;
-			} else {
-				$year_start = substr( wfTimestampNow(), 0, 4 );
-				$thisMonth = gmdate( 'n' );
-				if( $this->month > $thisMonth ) {
-					// Future contributions aren't supposed to happen. :)
-					$year_start--;
-				}
-			}
-
-			if( $this->month ) {
-				$month_end = str_pad($this->month + 1, 2, '0', STR_PAD_LEFT);
-				$year_end = $year_start;
-			} else {
-				$month_end = 0;
-				$year_end = $year_start + 1;
-			}
-			$ts_end = str_pad($year_end . $month_end, 14, '0' );
-
-			$this->mOffset = $ts_end;
-		}
-	}
-
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		$this->mConds[] = 'user_id = log_user';
 		# Don't use the wrong logging index
 		if( $this->title || $this->pattern || $this->user ) {
@@ -589,7 +657,7 @@ class LogPager extends ReverseChronologicalPager {
 		return 'log_timestamp';
 	}
 
-	function getStartBody() {
+	public function getStartBody() {
 		wfProfileIn( __METHOD__ );
 		# Do a link batch query
 		if( $this->getNumRows() > 0 ) {
@@ -606,7 +674,7 @@ class LogPager extends ReverseChronologicalPager {
 		return '';
 	}
 
-	function formatRow( $row ) {
+	public function formatRow( $row ) {
 		return $this->mLogEventsList->logLine( $row );
 	}
 
@@ -627,11 +695,11 @@ class LogPager extends ReverseChronologicalPager {
 	}
 
 	public function getYear() {
-		return $this->year;
+		return $this->mYear;
 	}
 
 	public function getMonth() {
-		return $this->month;
+		return $this->mMonth;
 	}
 }
 
@@ -642,26 +710,27 @@ class LogPager extends ReverseChronologicalPager {
 class LogReader {
 	var $pager;
 	/**
-	 * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters.
+	 * @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters.
 	 */
 	function __construct( $request ) {
 		global $wgUser, $wgOut;
+		wfDeprecated(__METHOD__);
 		# Get parameters
 		$type = $request->getVal( 'type' );
 		$user = $request->getText( 'user' );
 		$title = $request->getText( 'page' );
 		$pattern = $request->getBool( 'pattern' );
-		$y = $request->getIntOrNull( 'year' );
-		$m = $request->getIntOrNull( 'month' );
+		$year = $request->getIntOrNull( 'year' );
+		$month = $request->getIntOrNull( 'month' );
 		# Don't let the user get stuck with a certain date
 		$skip = $request->getText( 'offset' ) || $request->getText( 'dir' ) == 'prev';
 		if( $skip ) {
-			$y = '';
-			$m = '';
+			$year = '';
+			$month = '';
 		}
 		# Use new list class to output results
 		$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
-		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $y, $m );
+		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $year, $month );
 	}
 
 	/**
@@ -679,17 +748,20 @@ class LogReader {
  */
 class LogViewer {
 	const NO_ACTION_LINK = 1;
+
 	/**
-	 * @var LogReader $reader
+	 * LogReader object
 	 */
 	var $reader;
+
 	/**
-	 * @param LogReader &$reader where to get our data from
-	 * @param integer $flags Bitwise combination of flags:
+	 * @param &$reader LogReader: where to get our data from
+	 * @param $flags Integer: Bitwise combination of flags:
 	 *     LogEventsList::NO_ACTION_LINK   Don't show restore/unblock/block links
 	 */
 	function __construct( &$reader, $flags = 0 ) {
 		global $wgUser;
+		wfDeprecated(__METHOD__);
 		$this->reader =& $reader;
 		$this->reader->pager->mLogEventsList->flags = $flags;
 		# Aliases for shorter code...
@@ -725,7 +797,7 @@ class LogViewer {
 	 * Output just the list of entries given by the linked LogReader,
 	 * with extraneous UI elements. Use for displaying log fragments in
 	 * another page (eg at Special:Undelete)
-	 * @param OutputPage $out where to send output
+	 * @param $out OutputPage: where to send output
 	 */
 	public function showList( &$out ) {
 		$logBody = $this->pager->getBody();
diff --git a/includes/LogPage.php b/includes/LogPage.php
index 27554308..50a9a232 100644
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -89,6 +89,9 @@ class LogPage {
 		return true;
 	}
 
+	/**
+	 * Get the RC comment from the last addEntry() call
+	 */
 	public function getRcComment() {
 		$rcComment = $this->actionText;
 		if( '' != $this->comment ) {
@@ -101,6 +104,13 @@ class LogPage {
 	}
 
 	/**
+	 * Get the comment from the last addEntry() call
+	 */
+	public function getComment() {
+		return $this->comment;
+	}
+
+	/**
 	 * @static
 	 */
 	public static function validTypes() {
@@ -136,7 +146,8 @@ class LogPage {
 	 * @return string Headertext of this logtype
 	 */
 	static function logHeader( $type ) {
-		global $wgLogHeaders;
+		global $wgLogHeaders, $wgMessageCache;
+		$wgMessageCache->loadAllMessages();
 		return wfMsgExt($wgLogHeaders[$type],array('parseinline'));
 	}
 
@@ -144,54 +155,24 @@ class LogPage {
 	 * @static
 	 * @return HTML string
 	 */
-	static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) {
-		global $wgLang, $wgContLang, $wgLogActions;
+	static function actionText( $type, $action, $title = NULL, $skin = NULL, 
+		$params = array(), $filterWikilinks = false ) 
+	{
+		global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache;
 
+		$wgMessageCache->loadAllMessages();
 		$key = "$type/$action";
-
-		if( $key == 'patrol/patrol' )
+		# Defer patrol log to PatrolLog class
+		if( $key == 'patrol/patrol' ) {
 			return PatrolLog::makeActionText( $title, $params, $skin );
-
+		}
 		if( isset( $wgLogActions[$key] ) ) {
 			if( is_null( $title ) ) {
-				$rv=wfMsg( $wgLogActions[$key] );
+				$rv = wfMsg( $wgLogActions[$key] );
 			} else {
-				if( $skin ) {
-
-					switch( $type ) {
-						case 'move':
-							$titleLink = $skin->makeLinkObj( $title, htmlspecialchars( $title->getPrefixedText() ), 'redirect=no' );
-							$params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) );
-							break;
-						case 'block':
-							if( substr( $title->getText(), 0, 1 ) == '#' ) {
-								$titleLink = $title->getText();
-							} else {
-								// TODO: Store the user identifier in the parameters
-								// to make this faster for future log entries
-								$id = User::idFromName( $title->getText() );
-								$titleLink = $skin->userLink( $id, $title->getText() )
-									. $skin->userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK );
-							}
-							break;
-						case 'rights':
-							$text = $wgContLang->ucfirst( $title->getText() );
-							$titleLink = $skin->makeLinkObj( Title::makeTitle( NS_USER, $text ) );
-							break;
-						case 'merge':
-							$titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' );
-							$params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) );
-							$params[1] = $wgLang->timeanddate( $params[1] );
-							break;
-						default:
-							$titleLink = $skin->makeLinkObj( $title );
-					}
-
-				} else {
-					$titleLink = $title->getPrefixedText();
-				}
+				$titleLink = self::getTitleLink( $type, $skin, $title, $params );
 				if( $key == 'rights/rights' ) {
-					if ($skin) {
+					if( $skin ) {
 						$rightsnone = wfMsg( 'rightsnone' );
 						foreach ( $params as &$param ) {
 							$groupArray = array_map( 'trim', explode( ',', $param ) );
@@ -213,18 +194,28 @@ class LogPage {
 						$rv = wfMsgForContent( $wgLogActions[$key], $titleLink );
 					}
 				} else {
+					$details = '';
 					array_unshift( $params, $titleLink );
-					if ( $key == 'block/block' || $key == 'suppress/block' ) {
+					if ( $key == 'block/block' || $key == 'suppress/block' || $key == 'block/reblock' ) {
 						if ( $skin ) {
-							$params[1] = '<span title="' . htmlspecialchars( $params[1] ). '">' . $wgLang->translateBlockExpiry( $params[1] ) . '</span>';
+							$params[1] = '<span title="' . htmlspecialchars( $params[1] ). '">' . 
+								$wgLang->translateBlockExpiry( $params[1] ) . '</span>';
 						} else {
 							$params[1] = $wgContLang->translateBlockExpiry( $params[1] );
 						}
-						$params[2] = isset( $params[2] )
-										? self::formatBlockFlags( $params[2], is_null( $skin ) )
-										: '';
+						$params[2] = isset( $params[2] ) ? 
+							self::formatBlockFlags( $params[2], is_null( $skin ) ) : '';
+					} else if ( $type == 'protect' && count($params) == 3 ) {
+						$details .= " {$params[1]}"; // restrictions and expiries
+						if( $params[2] ) {
+							$details .= ' ['.wfMsg('protect-summary-cascade').']';
+						}
+					} else if ( $type == 'move' && count( $params ) == 3 ) {
+						if( $params[2] ) {
+							$details .= ' [' . wfMsg( 'move-redirect-suppressed' ) . ']';
+						}
 					}
-					$rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin );
+					$rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ) . $details;
 				}
 			}
 		} else {
@@ -243,6 +234,59 @@ class LogPage {
 		}
 		return $rv;
 	}
+	
+	protected static function getTitleLink( $type, $skin, $title, &$params ) {
+		global $wgLang, $wgContLang;
+		if( !$skin ) {
+			return $title->getPrefixedText();
+		}
+		switch( $type ) {
+			case 'move':
+				$titleLink = $skin->makeLinkObj( $title, 
+					htmlspecialchars( $title->getPrefixedText() ), 'redirect=no' );
+				$targetTitle = Title::newFromText( $params[0] );
+				if ( !$targetTitle ) {
+					# Workaround for broken database
+					$params[0] = htmlspecialchars( $params[0] );
+				} else {
+					$params[0] = $skin->makeLinkObj( $targetTitle, htmlspecialchars( $params[0] ) );
+				}
+				break;
+			case 'block':
+				if( substr( $title->getText(), 0, 1 ) == '#' ) {
+					$titleLink = $title->getText();
+				} else {
+					// TODO: Store the user identifier in the parameters
+					// to make this faster for future log entries
+					$id = User::idFromName( $title->getText() );
+					$titleLink = $skin->userLink( $id, $title->getText() )
+						. $skin->userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK );
+				}
+				break;
+			case 'rights':
+				$text = $wgContLang->ucfirst( $title->getText() );
+				$titleLink = $skin->makeLinkObj( Title::makeTitle( NS_USER, $text ) );
+				break;
+			case 'merge':
+				$titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' );
+				$params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) );
+				$params[1] = $wgLang->timeanddate( $params[1] );
+				break;
+			default:
+				if( $title->getNamespace() == NS_SPECIAL ) {
+					list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBKey() );
+					# Use the language name for log titles, rather than Log/X
+					if( $name == 'Log' ) {
+						$titleLink = '('.$skin->makeLinkObj( $title, LogPage::logName( $par ) ).')';
+					} else {
+						$titleLink = $skin->makeLinkObj( $title );
+					}
+				} else {
+					$titleLink = $skin->makeLinkObj( $title );
+				}
+		}
+		return $titleLink;
+	}
 
 	/**
 	 * Add a log entry
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 3b22cb9b..5b5b77f0 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -103,8 +103,12 @@ class MagicWord {
 		'contentlanguage',
 		'pagesinnamespace',
 		'numberofadmins',
+		'numberofviews',
 		'defaultsort',
 		'pagesincategory',
+		'index',
+		'noindex',
+		'numberingroup',
 	);
 
 	/* Array of caching hints for ParserCache */
@@ -143,6 +147,8 @@ class MagicWord {
 		'localtimestamp' => 3600,
 		'pagesinnamespace' => 3600,
 		'numberofadmins' => 3600,
+		'numberofviews' => 3600,
+		'numberingroup' => 3600,
 		);
 
 	static public $mDoubleUnderscoreIDs = array(
@@ -153,6 +159,8 @@ class MagicWord {
 		'noeditsection',
 		'newsectionlink',
 		'hiddencat',
+		'index',
+		'noindex',
 		'staticredirect',
 	);
 
diff --git a/includes/Math.php b/includes/Math.php
index 871e9fc3..2ed16033 100644
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -47,7 +47,7 @@ class MathRenderer {
 		if( !$this->_recall() ) {
 			# Ensure that the temp and output directories are available before continuing...
 			if( !file_exists( $wgTmpDirectory ) ) {
-				if( !@mkdir( $wgTmpDirectory ) ) {
+				if( !wfMkdirParents( $wgTmpDirectory ) ) {
 					return $this->_error( 'math_bad_tmpdir' );
 				}
 			} elseif( !is_dir( $wgTmpDirectory ) || !is_writable( $wgTmpDirectory ) ) {
@@ -145,6 +145,10 @@ class MathRenderer {
 				return $this->_error( 'math_image_error' );
 			}
 
+			if( filesize( "$wgTmpDirectory/{$this->hash}.png" ) == 0 ) {
+				return $this->_error( 'math_image_error' );
+			}
+
 			$hashpath = $this->_getHashPath();
 			if( !file_exists( $hashpath ) ) {
 				if( !@wfMkdirParents( $hashpath, 0755 ) ) {
@@ -172,10 +176,17 @@ class MathRenderer {
 					'math_html_conservativeness' => $this->conservativeness,
 					'math_html' => $this->html,
 					'math_mathml' => $this->mathml,
-				  ), $fname, array( 'IGNORE' )
+				  ), $fname
 				);
 			}
-
+			
+			// If we're replacing an older version of the image, make sure it's current.
+			global $wgUseSquid;
+			if ( $wgUseSquid ) {
+				$urls = array( $this->_mathImageUrl() );
+				$u = new SquidUpdate( $urls );
+				$u->doUpdate();
+			}
 		}
 
 		return $this->_doRender();
@@ -209,8 +220,14 @@ class MathRenderer {
 			$this->html = $rpage->math_html;
 			$this->mathml = $rpage->math_mathml;
 
-			if( file_exists( $this->_getHashPath() . "/{$this->hash}.png" ) ) {
-				return true;
+			$filename = $this->_getHashPath() . "/{$this->hash}.png";
+			if( file_exists( $filename ) ) {
+				if( filesize( $filename ) == 0 ) {
+					// Some horrible error corrupted stuff :(
+					@unlink( $filename );
+				} else {
+					return true;
+				}
 			}
 
 			if( file_exists( $wgMathDirectory . "/{$this->hash}.png" ) ) {
@@ -268,10 +285,7 @@ class MathRenderer {
 	}
 
 	function _linkToMathImage() {
-		global $wgMathPath;
-		$url = "$wgMathPath/" . substr($this->hash, 0, 1)
-					.'/'. substr($this->hash, 1, 1) .'/'. substr($this->hash, 2, 1)
-					. "/{$this->hash}.png";
+		$url = $this->_mathImageUrl();
 
 		return Xml::element( 'img',
 			$this->_attribs(
@@ -283,14 +297,24 @@ class MathRenderer {
 					'src' => $url ) ) );
 	}
 
+	function _mathImageUrl() {
+		global $wgMathPath;
+		$dir = $this->_getHashSubPath();
+		return "$wgMathPath/$dir/{$this->hash}.png";
+	}
+	
 	function _getHashPath() {
 		global $wgMathDirectory;
-		$path = $wgMathDirectory .'/'. substr($this->hash, 0, 1)
-					.'/'. substr($this->hash, 1, 1)
-					.'/'. substr($this->hash, 2, 1);
+		$path = $wgMathDirectory .'/' . $this->_getHashSubPath();
 		wfDebug( "TeX: getHashPath, hash is: $this->hash, path is: $path\n" );
 		return $path;
 	}
+	
+	function _getHashSubPath() {
+		return substr($this->hash, 0, 1)
+					.'/'. substr($this->hash, 1, 1)
+					.'/'. substr($this->hash, 2, 1);
+	}
 
 	public static function renderMath( $tex, $params=array() ) {
 		global $wgUser;
diff --git a/includes/MediaTransformOutput.php b/includes/MediaTransformOutput.php
index 9e94f06b..0367494f 100644
--- a/includes/MediaTransformOutput.php
+++ b/includes/MediaTransformOutput.php
@@ -50,6 +50,8 @@ abstract class MediaTransformOutput {
 	 *     alt          Alternate text or caption
 	 *     desc-link    Boolean, show a description link
 	 *     file-link    Boolean, show a file download link
+	 *     custom-url-link    Custom URL to link to
+	 *     custom-title-link  Custom Title object to link to
 	 *     valign       vertical-align property, if the output is an inline element
 	 *     img-class    Class applied to the <img> tag, if there is such a tag
 	 *
@@ -127,12 +129,15 @@ class ThumbnailImage extends MediaTransformOutput {
 	 *     should be indicated with a value of true for true, and false or
 	 *     absent for false.
 	 *
-	 *     alt          Alternate text or caption
+	 *     alt          HTML alt attribute
+	 *     title        HTML title attribute
 	 *     desc-link    Boolean, show a description link
 	 *     file-link    Boolean, show a file download link
 	 *     valign       vertical-align property, if the output is an inline element
 	 *     img-class    Class applied to the <img> tag, if there is such a tag
 	 *     desc-query   String, description link query params
+	 *     custom-url-link    Custom URL to link to
+	 *     custom-title-link  Custom Title object to link to
 	 *
 	 * For images, desc-link and file-link are implemented as a click-through. For
 	 * sounds and videos, they may be displayed in other ways.
@@ -146,9 +151,18 @@ class ThumbnailImage extends MediaTransformOutput {
 		}
 
 		$alt = empty( $options['alt'] ) ? '' : $options['alt'];
+		# Note: if title is empty and alt is not, make the title empty, don't
+		# use alt; only use alt if title is not set
+		$title = !isset( $options['title'] ) ? $alt : $options['title'];		
 		$query = empty($options['desc-query'])  ? '' : $options['desc-query'];
-		if ( !empty( $options['desc-link'] ) ) {
-			$linkAttribs = $this->getDescLinkAttribs( $alt, $query );
+
+		if ( !empty( $options['custom-url-link'] ) ) {
+			$linkAttribs = array( 'href' => $options['custom-url-link'] );
+		} elseif ( !empty( $options['custom-title-link'] ) ) {
+			$title = $options['custom-title-link'];
+			$linkAttribs = array( 'href' => $title->getLinkUrl(), 'title' => $title->getFullText() );
+		} elseif ( !empty( $options['desc-link'] ) ) {
+			$linkAttribs = $this->getDescLinkAttribs( $title, $query );
 		} elseif ( !empty( $options['file-link'] ) ) {
 			$linkAttribs = array( 'href' => $this->file->getURL() );
 		} else {
diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index f24d3b4d..a06b0cb9 100644
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -25,7 +25,7 @@ class MessageCache {
 	var $mKeys, $mParserOptions, $mParser;
 	var $mExtensionMessages = array();
 	var $mInitialised = false;
-	var $mAllMessagesLoaded; // Extension messages
+	var $mAllMessagesLoaded = array(); // Extension messages
 
 	// Variable for tracking which variables are loaded
 	var $mLoadedLanguages = array();
@@ -44,7 +44,6 @@ class MessageCache {
 
 	/**
 	 * ParserOptions is lazy initialised.
-	 * Access should probably be protected.
 	 */
 	function getParserOptions() {
 		if ( !$this->mParserOptions ) {
@@ -110,7 +109,7 @@ class MessageCache {
 		global $wgLocalMessageCache;
 
 		$filename = "$wgLocalMessageCache/messages-" . wfWikiID() . "-$code";
-		wfMkdirParents( $wgLocalMessageCache, 0777 ); // might fail
+		wfMkdirParents( $wgLocalMessageCache ); // might fail
 
 		wfSuppressWarnings();
 		$file = fopen( $filename, 'w' );
@@ -131,7 +130,7 @@ class MessageCache {
 
 		$filename = "$wgLocalMessageCache/messages-" . wfWikiID() . "-$code";
 		$tempFilename = $filename . '.tmp';
-  	wfMkdirParents( $wgLocalMessageCache, 0777 ); // might fail
+  		wfMkdirParents( $wgLocalMessageCache ); // might fail
 
 		wfSuppressWarnings();
 		$file = fopen( $tempFilename, 'w');
@@ -261,12 +260,23 @@ class MessageCache {
 
 			$this->lock($cacheKey);
 
-			$cache = $this->loadFromDB( $code );
-			$success = $this->setCache( $cache, $code );
+			# Limit the concurrency of loadFromDB to a single process 
+			# This prevents the site from going down when the cache expires
+			$statusKey = wfMemcKey( 'messages', $code, 'status' );
+			$success = $this->mMemc->add( $statusKey, 'loading', MSG_LOAD_TIMEOUT );
 			if ( $success ) {
-				$this->saveToCaches( $cache, true, $code );
+				$cache = $this->loadFromDB( $code );
+				$success = $this->setCache( $cache, $code );
+			}
+			if ( $success ) {
+				$success = $this->saveToCaches( $cache, true, $code );
+				if ( $success ) {
+					$this->mMemc->delete( $statusKey );
+				} else {
+					$this->mMemc->set( $statusKey, 'error', 60*5 );
+					wfDebug( "MemCached set error in MessageCache: restart memcached server!\n" );
+				}
 			}
-
 			$this->unlock($cacheKey);
 		}
 
@@ -414,10 +424,6 @@ class MessageCache {
 		global $wgLocalMessageCache, $wgLocalMessageCacheSerialized;
 
 		$cacheKey = wfMemcKey( 'messages', $code );
-		$statusKey = wfMemcKey( 'messages', $code, 'status' );
-
-		$success = $this->mMemc->add( $statusKey, 'loading', MSG_LOAD_TIMEOUT );
-		if ( !$success ) return true; # Other process should be updating them now
 
 		$i = 0;
 		if ( $memc ) {
@@ -444,11 +450,8 @@ class MessageCache {
 		}
 
 		if ( $i == 20 ) {
-			$this->mMemc->set( $statusKey, 'error', 60*5 );
-			wfDebug( "MemCached set error in MessageCache: restart memcached server!\n" );
 			$success = false;
 		} else {
-			$this->mMemc->delete( $statusKey );
 			$success = true;
 		}
 		wfProfileOut( __METHOD__ );
@@ -498,29 +501,9 @@ class MessageCache {
 	 * @param bool $isFullKey Specifies whether $key is a two part key "lang/msg".
 	 */
 	function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) {
-		global $wgContLanguageCode, $wgContLang, $wgLang;
-
-		# Identify which language to get or create a language object for.
-		if( $langcode === $wgContLang->getCode() || $langcode === true ) {
-			# $langcode is the language code of the wikis content language object.
-			# or it is a boolean and value is true
-			$lang =& $wgContLang;
-		} elseif( $langcode === $wgLang->getCode() || $langcode === false ) {
-			# $langcode is the language code of user language object.
-			# or it was a boolean and value is false
-			$lang =& $wgLang;
-		} else {
-			$validCodes = array_keys( Language::getLanguageNames() );
-			if( in_array( $langcode, $validCodes ) ) {
-				# $langcode corresponds to a valid language.
-				$lang = Language::factory( $langcode );
-			} else {
-				# $langcode is a string, but not a valid language code; use content language.
-				$lang =& $wgContLang;
-				wfDebug( 'Invalid language code passed to MessageCache::get, falling back to content language.' );
-			}
-		}
+		global $wgContLanguageCode, $wgContLang;
 
+		$lang = wfGetLangObj( $langcode );
 		$langcode = $lang->getCode();
 
 		# If uninitialised, someone is trying to call this halfway through Setup.php
@@ -664,23 +647,30 @@ class MessageCache {
 		return $message;
 	}
 
-	function transform( $message, $interface = false ) {
+	function transform( $message, $interface = false, $language = null ) {
 		// Avoid creating parser if nothing to transfrom
 		if( strpos( $message, '{{' ) === false ) {
 			return $message;
 		}
 
-		global $wgParser;
+		global $wgParser, $wgParserConf;
 		if ( !$this->mParser && isset( $wgParser ) ) {
 			# Do some initialisation so that we don't have to do it twice
 			$wgParser->firstCallInit();
 			# Clone it and store it
-			$this->mParser = clone $wgParser;
+			$class = $wgParserConf['class'];
+			if ( $class == 'Parser_DiffTest' ) {
+				# Uncloneable
+				$this->mParser = new $class( $wgParserConf );
+			} else {
+				$this->mParser = clone $wgParser;
+			}
 			#wfDebug( __METHOD__ . ": following contents triggered transform: $message\n" );
 		}
 		if ( $this->mParser ) {
 			$popts = $this->getParserOptions();
 			$popts->setInterfaceMessage( $interface );
+			$popts->setTargetLanguage( $language );
 			$message = $this->mParser->transformMsg( $message, $popts );
 		}
 		return $message;
@@ -781,12 +771,13 @@ class MessageCache {
 		}
 	}
 
-	function loadAllMessages() {
+	function loadAllMessages( $lang = false ) {
 		global $wgExtensionMessagesFiles;
-		if ( $this->mAllMessagesLoaded ) {
+		$key = $lang === false ? '*' : $lang;
+		if ( isset( $this->mAllMessagesLoaded[$key] ) ) {
 			return;
 		}
-		$this->mAllMessagesLoaded = true;
+		$this->mAllMessagesLoaded[$key] = true;
 
 		# Some extensions will load their messages when you load their class file
 		wfLoadAllExtensions();
@@ -794,7 +785,7 @@ class MessageCache {
 		wfRunHooks( 'LoadAllMessages' );
 		# Some register their messages in $wgExtensionMessagesFiles
 		foreach ( $wgExtensionMessagesFiles as $name => $file ) {
-			wfLoadExtensionMessages( $name );
+			wfLoadExtensionMessages( $name, $lang );
 		}
 		# Still others will respond to neither, they are EVIL. We sometimes need to know!
 	}
@@ -855,13 +846,17 @@ class MessageCache {
 
 	public function figureMessage( $key ) {
 		global $wgContLanguageCode;
-		$pieces = explode('/', $key, 2);
+		$pieces = explode( '/', $key );
+		if( count( $pieces ) < 2 )
+			return array( $key, $wgContLanguageCode );
 
-		$key = $pieces[0];
+		$lang = array_pop( $pieces );
+		$validCodes = Language::getLanguageNames();
+		if( !array_key_exists( $lang, $validCodes ) )
+			return array( $key, $wgContLanguageCode );
 
-		# Language the user is translating to
-		$langCode = isset($pieces[1]) ? $pieces[1] : $wgContLanguageCode;
-		return array( $key, $langCode );
+		$message = implode( '/', $pieces );
+		return array( $message, $lang );
 	}
 
 }
diff --git a/includes/Metadata.php b/includes/Metadata.php
index a543c73c..0b4fbf8c 100644
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -20,347 +20,299 @@
  * @author Evan Prodromou <evan@wikitravel.org>
  */
 
-/**
- * TODO: Perhaps make this file into a Metadata class, with static methods (declared
- * as private where indicated), to move these functions out of the global namespace?
- */
-define('RDF_TYPE_PREFS', "application/rdf+xml,text/xml;q=0.7,application/xml;q=0.5,text/rdf;q=0.1");
-
-function wfDublinCoreRdf($article) {
-
-	$url = dcReallyFullUrl($article->mTitle);
-
-	if (rdfSetup()) {
-		dcPrologue($url);
-		dcBasics($article);
-		dcEpilogue();
+abstract class RdfMetaData {
+	const RDF_TYPE_PREFS = 'application/rdf+xml,text/xml;q=0.7,application/xml;q=0.5,text/rdf;q=0.1';
+
+	/**
+	 * Constructor
+	 * @param $article Article object
+	 */
+	public function __construct( Article $article ){
+		$this->mArticle = $article;
 	}
-}
 
-function wfCreativeCommonsRdf($article) {
+	public abstract function show();
 
-	if (rdfSetup()) {
-		global $wgRightsUrl;
+	/**
+	 *
+	 */
+	protected function setup() {
+		global $wgOut, $wgRequest;
 
-		$url = dcReallyFullUrl($article->mTitle);
+		$httpaccept = isset( $_SERVER['HTTP_ACCEPT'] ) ? $_SERVER['HTTP_ACCEPT'] : null;
+		$rdftype = wfNegotiateType( wfAcceptToPrefs( $httpaccept ), wfAcceptToPrefs( self::RDF_TYPE_PREFS ) );
 
-		ccPrologue();
-		ccSubPrologue('Work', $url);
-		dcBasics($article);
-		if (isset($wgRightsUrl)) {
-			$url = htmlspecialchars( $wgRightsUrl );
-			print "    <cc:license rdf:resource=\"$url\" />\n";
+		if( !$rdftype ){
+			wfHttpError( 406, 'Not Acceptable', wfMsg( 'notacceptable' ) );
+			return false;
+		} else {
+			$wgOut->disable();
+			$wgRequest->response()->header( "Content-type: {$rdftype}; charset=utf-8" );
+			$wgOut->sendCacheControl();
+			return true;
 		}
+	}
 
-		ccSubEpilogue('Work');
-
-		if (isset($wgRightsUrl)) {
-			$terms = ccGetTerms($wgRightsUrl);
-			if ($terms) {
-				ccSubPrologue('License', $wgRightsUrl);
-				ccLicense($terms);
-				ccSubEpilogue('License');
-			}
-		}
+	/**
+	 *
+	 */
+	protected function reallyFullUrl() {
+		return $this->mArticle->getTitle()->getFullURL();
 	}
 
-	ccEpilogue();
-}
+	protected function basics() {
+		global $wgContLanguageCode, $wgSitename;
 
-/**
- * @private
- */
-function rdfSetup() {
-	global $wgOut, $_SERVER;
+		$this->element( 'title', $this->mArticle->mTitle->getText() );
+		$this->pageOrString( 'publisher', wfMsg( 'aboutpage' ), $wgSitename );
+		$this->element( 'language', $wgContLanguageCode );
+		$this->element( 'type', 'Text' );
+		$this->element( 'format', 'text/html' );
+		$this->element( 'identifier', $this->reallyFullUrl() );
+		$this->element( 'date', $this->date( $this->mArticle->getTimestamp() ) );
 
-	$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+		$lastEditor = User::newFromId( $this->mArticle->getUser() );
+		$this->person( 'creator', $lastEditor );
 
-	$rdftype = wfNegotiateType(wfAcceptToPrefs($httpaccept), wfAcceptToPrefs(RDF_TYPE_PREFS));
+		foreach( $this->mArticle->getContributors() as $user ){
+			$this->person( 'contributor', $user );
+		}
 
-	if (!$rdftype) {
-		wfHttpError(406, "Not Acceptable", wfMsg("notacceptable"));
-		return false;
-	} else {
-		$wgOut->disable();
-		header( "Content-type: {$rdftype}; charset=utf-8" );
-		$wgOut->sendCacheControl();
-		return true;
+		$this->rights();
 	}
-}
 
-/**
- * @private
- */
-function dcPrologue($url) {
-	global $wgOutputEncoding;
+	protected function element( $name, $value ) {
+		$value = htmlspecialchars( $value );
+		print "\t\t<dc:{$name}>{$value}</dc:{$name}>\n";
+	}
 
-	$url = htmlspecialchars( $url );
-	print "<" . "?xml version=\"1.0\" encoding=\"{$wgOutputEncoding}\" ?" . ">
+	protected function date($timestamp) {
+		return substr($timestamp, 0, 4) . '-'
+		  . substr($timestamp, 4, 2) . '-'
+		  . substr($timestamp, 6, 2);
+	}
 
-																			  <!DOCTYPE rdf:RDF PUBLIC \"-//DUBLIN CORE//DCMES DTD 2002/07/31//EN\" \"http://dublincore.org/documents/2002/07/31/dcmes-xml/dcmes-xml-dtd.dtd\">
+	protected function pageOrString( $name, $page, $str ){
+		if( $page instanceof Title )
+			$nt = $page;
+		else
+			$nt = Title::newFromText( $page );
 
-																			  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"
-																			  xmlns:dc=\"http://purl.org/dc/elements/1.1/\">
-																			  <rdf:Description rdf:about=\"$url\">
-																			  ";
-}
+		if( !$nt || $nt->getArticleID() == 0 ){
+			$this->element( $name, $str );
+		} else {
+			$this->page( $name, $nt );
+		}
+	}
 
-/**
- * @private
- */
-function dcEpilogue() {
-	print "
-			</rdf:Description>
-			</rdf:RDF>
-			";
-}
+	protected function page( $name, $title ){
+		$this->url( $name, $title->getFullUrl() );
+	}
 
-/**
- * @private
- */
-function dcBasics($article) {
-	global $wgContLanguageCode, $wgSitename;
-
-	dcElement('title', $article->mTitle->getText());
-	dcPageOrString('publisher', wfMsg('aboutpage'), $wgSitename);
-	dcElement('language', $wgContLanguageCode);
-	dcElement('type', 'Text');
-	dcElement('format', 'text/html');
-	dcElement('identifier', dcReallyFullUrl($article->mTitle));
-	dcElement('date', dcDate($article->getTimestamp()));
-
-	$last_editor = $article->getUser();
-
-	if ($last_editor == 0) {
-		dcPerson('creator', 0);
-	} else {
-		dcPerson('creator', $last_editor, $article->getUserText(),
-				 User::whoIsReal($last_editor));
+	protected function url($name, $url) {
+		$url = htmlspecialchars( $url );
+		print "\t\t<dc:{$name} rdf:resource=\"{$url}\" />\n";
 	}
 
-	$contributors = $article->getContributors();
+	protected function person($name, User $user ){
+		global $wgContLang;
 
-	foreach ($contributors as $user_parts) {
-		dcPerson('contributor', $user_parts[0], $user_parts[1], $user_parts[2]);
+		if( $user->isAnon() ){
+			$this->element( $name, wfMsgExt( 'anonymous', array( 'parsemag' ), 1 ) );
+		} else if( $real = $user->getRealName() ) {
+			$this->element( $name, $real );
+		} else {
+			$this->pageOrString( $name, $user->getUserPage(), wfMsg( 'siteuser', $user->getName() ) );
+		}
 	}
 
-	dcRights();
-}
+	/**
+	 * Takes an arg, for future enhancement with different rights for
+	 * different pages.
+	 */
+	protected function rights() {
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText;
+
+		if( $wgRightsPage && ( $nt = Title::newFromText( $wgRightsPage ) )
+			&& ($nt->getArticleID() != 0)) {
+			$this->page('rights', $nt);
+		} else if( $wgRightsUrl ){
+			$this->url('rights', $wgRightsUrl);
+		} else if( $wgRightsText ){
+			$this->element( 'rights', $wgRightsText );
+		}
+	}
 
-/**
- * @private
- */
-function ccPrologue() {
-	global $wgOutputEncoding;
+	protected function getTerms( $url ){
+		global $wgLicenseTerms;
 
-	echo "<" . "?xml version='1.0'  encoding='{$wgOutputEncoding}' ?" . ">
+		if( $wgLicenseTerms ){
+			return $wgLicenseTerms;
+		} else {
+			$known = $this->getKnownLicenses();
+			if( isset( $known[$url] ) ) {
+				return $known[$url];
+			} else {
+				return array();
+			}
+		}
+	}
 
-																		  <rdf:RDF xmlns:cc=\"http://web.resource.org/cc/\"
-																		  xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
-																		  xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">
-																		  ";
-}
+	protected function getKnownLicenses() {
+		$ccLicenses = array('by', 'by-nd', 'by-nd-nc', 'by-nc',
+							'by-nc-sa', 'by-sa');
+		$ccVersions = array('1.0', '2.0');
+		$knownLicenses = array();
+
+		foreach ($ccVersions as $version) {
+			foreach ($ccLicenses as $license) {
+				if( $version == '2.0' && substr( $license, 0, 2) != 'by' ) {
+					# 2.0 dropped the non-attribs licenses
+					continue;
+				}
+				$lurl = "http://creativecommons.org/licenses/{$license}/{$version}/";
+				$knownLicenses[$lurl] = explode('-', $license);
+				$knownLicenses[$lurl][] = 're';
+				$knownLicenses[$lurl][] = 'di';
+				$knownLicenses[$lurl][] = 'no';
+				if (!in_array('nd', $knownLicenses[$lurl])) {
+					$knownLicenses[$lurl][] = 'de';
+				}
+			}
+		}
 
-/**
- * @private
- */
-function ccSubPrologue($type, $url) {
-	$url = htmlspecialchars( $url );
-	echo "  <cc:{$type} rdf:about=\"{$url}\">\n";
-}
+		/* Handle the GPL and LGPL, too. */
 
-/**
- * @private
- */
-function ccSubEpilogue($type) {
-	echo "  </cc:{$type}>\n";
-}
+		$knownLicenses['http://creativecommons.org/licenses/GPL/2.0/'] =
+		  array('de', 're', 'di', 'no', 'sa', 'sc');
+		$knownLicenses['http://creativecommons.org/licenses/LGPL/2.1/'] =
+		  array('de', 're', 'di', 'no', 'sa', 'sc');
+		$knownLicenses['http://www.gnu.org/copyleft/fdl.html'] =
+		  array('de', 're', 'di', 'no', 'sa', 'sc');
 
-/**
- * @private
- */
-function ccLicense($terms) {
-
-	foreach ($terms as $term) {
-		switch ($term) {
-		 case 're':
-			ccTerm('permits', 'Reproduction'); break;
-		 case 'di':
-			ccTerm('permits', 'Distribution'); break;
-		 case 'de':
-			ccTerm('permits', 'DerivativeWorks'); break;
-		 case 'nc':
-			ccTerm('prohibits', 'CommercialUse'); break;
-		 case 'no':
-			ccTerm('requires', 'Notice'); break;
-		 case 'by':
-			ccTerm('requires', 'Attribution'); break;
-		 case 'sa':
-			ccTerm('requires', 'ShareAlike'); break;
-		 case 'sc':
-			ccTerm('requires', 'SourceCode'); break;
-		}
+		return $knownLicenses;
 	}
 }
 
-/**
- * @private
- */
-function ccTerm($term, $name) {
-	print "    <cc:{$term} rdf:resource=\"http://web.resource.org/cc/{$name}\" />\n";
-}
+class DublinCoreRdf extends RdfMetaData {
 
-/**
- * @private
- */
-function ccEpilogue() {
-	echo "</rdf:RDF>\n";
-}
+	public function show(){
+		if( $this->setup() ){
+			$this->prologue();
+			$this->basics();
+			$this->epilogue();
+		}
+	}
 
-/**
- * @private
- */
-function dcElement($name, $value) {
-	$value = htmlspecialchars( $value );
-	print "    <dc:{$name}>{$value}</dc:{$name}>\n";
-}
+	/**
+	 * begin of the page
+	 */
+	protected function prologue() {
+		global $wgOutputEncoding;
+
+		$url = htmlspecialchars( $this->reallyFullUrl() );
+		print <<<PROLOGUE
+<?xml version="1.0" encoding="{$wgOutputEncoding}" ?>
+<!DOCTYPE rdf:RDF PUBLIC "-//DUBLIN CORE//DCMES DTD 2002/07/31//EN" "http://dublincore.org/documents/2002/07/31/dcmes-xml/dcmes-xml-dtd.dtd">
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/">
+	<rdf:Description rdf:about="{$url}">
+
+PROLOGUE;
+	}
 
-/**
- * @private
- */
-function dcDate($timestamp) {
-	return substr($timestamp, 0, 4) . '-'
-	  . substr($timestamp, 4, 2) . '-'
-	  . substr($timestamp, 6, 2);
+	/**
+	 * end of the page
+	 */
+	protected function epilogue() {
+		print <<<EPILOGUE
+	</rdf:Description>
+</rdf:RDF>
+EPILOGUE;
+	}
 }
 
-/**
- * @private
- */
-function dcReallyFullUrl($title) {
-	return $title->getFullURL();
-}
+class CreativeCommonsRdf extends RdfMetaData {
 
-/**
- * @private
- */
-function dcPageOrString($name, $page, $str) {
-	$nt = Title::newFromText($page);
+	public function show(){
+		if( $this->setup() ){
+			global $wgRightsUrl;
 
-	if (!$nt || $nt->getArticleID() == 0) {
-		dcElement($name, $str);
-	} else {
-		dcPage($name, $nt);
-	}
-}
+			$url = $this->reallyFullUrl();
 
-/**
- * @private
- */
-function dcPage($name, $title) {
-	dcUrl($name, dcReallyFullUrl($title));
-}
+			$this->prologue();
+			$this->subPrologue('Work', $url);
 
-/**
- * @private
- */
-function dcUrl($name, $url) {
-	$url = htmlspecialchars( $url );
-	print "    <dc:{$name} rdf:resource=\"{$url}\" />\n";
-}
+			$this->basics();
+			if( $wgRightsUrl ){
+				$url = htmlspecialchars( $wgRightsUrl );
+				print "\t\t<cc:license rdf:resource=\"$url\" />\n";
+			}
 
-/**
- * @private
- */
-function dcPerson($name, $id, $user_name='', $user_real_name='') {
-	global $wgContLang;
-
-	if ($id == 0) {
-		dcElement($name, wfMsg('anonymous'));
-	} else if ( !empty($user_real_name) ) {
-		dcElement($name, $user_real_name);
-	} else {
-		# XXX: This shouldn't happen.
-		if( empty( $user_name ) ) {
-			$user_name = User::whoIs($id);
+			$this->subEpilogue('Work');
+
+			if( $wgRightsUrl ){
+				$terms = $this->getTerms( $wgRightsUrl );
+				if( $terms ){
+					$this->subPrologue( 'License', $wgRightsUrl );
+					$this->license( $terms );
+					$this->subEpilogue( 'License' );
+				}
+			}
 		}
-		dcPageOrString($name, $wgContLang->getNsText(NS_USER) . ':' . $user_name, wfMsg('siteuser', $user_name));
+
+		$this->epilogue();
 	}
-}
 
-/**
- * Takes an arg, for future enhancement with different rights for
- * different pages.
- * @private
- */
-function dcRights() {
-
-	global $wgRightsPage, $wgRightsUrl, $wgRightsText;
-
-	if (isset($wgRightsPage) &&
-		($nt = Title::newFromText($wgRightsPage))
-		&& ($nt->getArticleID() != 0)) {
-		dcPage('rights', $nt);
-	} else if (isset($wgRightsUrl)) {
-		dcUrl('rights', $wgRightsUrl);
-	} else if (isset($wgRightsText)) {
-		dcElement('rights', $wgRightsText);
+	protected function prologue() {
+		global $wgOutputEncoding;
+		echo <<<PROLOGUE
+<?xml version='1.0'  encoding="{$wgOutputEncoding}" ?>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+PROLOGUE;
 	}
-}
 
-/**
- * @private
- */
-function ccGetTerms($url) {
-	global $wgLicenseTerms;
-
-	if (isset($wgLicenseTerms)) {
-		return $wgLicenseTerms;
-	} else {
-		$known = getKnownLicenses();
-		if( isset( $known[$url] ) ) {
-			return $known[$url];
-		} else {
-			return array();
-		}
+	protected function subPrologue( $type, $url ){
+		$url = htmlspecialchars( $url );
+		echo "\t<cc:{$type} rdf:about=\"{$url}\">\n";
 	}
-}
 
-/**
- * @private
- */
-function getKnownLicenses() {
-
-	$ccLicenses = array('by', 'by-nd', 'by-nd-nc', 'by-nc',
-						'by-nc-sa', 'by-sa');
-	$ccVersions = array('1.0', '2.0');
-	$knownLicenses = array();
-
-	foreach ($ccVersions as $version) {
-		foreach ($ccLicenses as $license) {
-			if( $version == '2.0' && substr( $license, 0, 2) != 'by' ) {
-				# 2.0 dropped the non-attribs licenses
-				continue;
-			}
-			$lurl = "http://creativecommons.org/licenses/{$license}/{$version}/";
-			$knownLicenses[$lurl] = explode('-', $license);
-			$knownLicenses[$lurl][] = 're';
-			$knownLicenses[$lurl][] = 'di';
-			$knownLicenses[$lurl][] = 'no';
-			if (!in_array('nd', $knownLicenses[$lurl])) {
-				$knownLicenses[$lurl][] = 'de';
+	protected function subEpilogue($type) {
+		echo "\t</cc:{$type}>\n";
+	}
+
+	protected function license($terms) {
+
+		foreach( $terms as $term ){
+			switch( $term ) {
+			 case 're':
+				$this->term('permits', 'Reproduction'); break;
+			 case 'di':
+				$this->term('permits', 'Distribution'); break;
+			 case 'de':
+				$this->term('permits', 'DerivativeWorks'); break;
+			 case 'nc':
+				$this->term('prohibits', 'CommercialUse'); break;
+			 case 'no':
+				$this->term('requires', 'Notice'); break;
+			 case 'by':
+				$this->term('requires', 'Attribution'); break;
+			 case 'sa':
+				$this->term('requires', 'ShareAlike'); break;
+			 case 'sc':
+				$this->term('requires', 'SourceCode'); break;
 			}
 		}
 	}
 
-	/* Handle the GPL and LGPL, too. */
-
-	$knownLicenses['http://creativecommons.org/licenses/GPL/2.0/'] =
-	  array('de', 're', 'di', 'no', 'sa', 'sc');
-	$knownLicenses['http://creativecommons.org/licenses/LGPL/2.1/'] =
-	  array('de', 're', 'di', 'no', 'sa', 'sc');
-	$knownLicenses['http://www.gnu.org/copyleft/fdl.html'] =
-	  array('de', 're', 'di', 'no', 'sa', 'sc');
+	protected function term( $term, $name ){
+		print "\t\t<cc:{$term} rdf:resource=\"http://web.resource.org/cc/{$name}\" />\n";
+	}
 
-	return $knownLicenses;
-}
+	protected function epilogue() {
+		echo "</rdf:RDF>\n";
+	}
+}
\ No newline at end of file
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index e33b1c0a..4797752d 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -11,6 +11,22 @@
 define('MM_WELL_KNOWN_MIME_TYPES',<<<END_STRING
 application/ogg ogg ogm ogv
 application/pdf pdf
+application/vnd.oasis.opendocument.chart odc
+application/vnd.oasis.opendocument.chart-template otc
+application/vnd.oasis.opendocument.formula odf
+application/vnd.oasis.opendocument.formula-template otf
+application/vnd.oasis.opendocument.graphics odg
+application/vnd.oasis.opendocument.graphics-template otg
+application/vnd.oasis.opendocument.image odi
+application/vnd.oasis.opendocument.image-template oti
+application/vnd.oasis.opendocument.presentation odp
+application/vnd.oasis.opendocument.presentation-template otp
+application/vnd.oasis.opendocument.spreadsheet ods
+application/vnd.oasis.opendocument.spreadsheet-template ots
+application/vnd.oasis.opendocument.text odt
+application/vnd.oasis.opendocument.text-template ott
+application/vnd.oasis.opendocument.text-master otm
+application/vnd.oasis.opendocument.text-web oth
 application/x-javascript js
 application/x-shockwave-flash swf
 audio/midi mid midi kar
@@ -41,6 +57,22 @@ END_STRING
  */
 define('MM_WELL_KNOWN_MIME_INFO', <<<END_STRING
 application/pdf [OFFICE]
+application/vnd.oasis.opendocument.chart [OFFICE]
+application/vnd.oasis.opendocument.chart-template [OFFICE]
+application/vnd.oasis.opendocument.formula [OFFICE]
+application/vnd.oasis.opendocument.formula-template [OFFICE]
+application/vnd.oasis.opendocument.graphics [OFFICE]
+application/vnd.oasis.opendocument.graphics-template [OFFICE]
+application/vnd.oasis.opendocument.image [OFFICE]
+application/vnd.oasis.opendocument.image-template [OFFICE]
+application/vnd.oasis.opendocument.presentation [OFFICE]
+application/vnd.oasis.opendocument.presentation-template [OFFICE]
+application/vnd.oasis.opendocument.spreadsheet [OFFICE]
+application/vnd.oasis.opendocument.spreadsheet-template [OFFICE]
+application/vnd.oasis.opendocument.text [OFFICE]
+application/vnd.oasis.opendocument.text-template [OFFICE]
+application/vnd.oasis.opendocument.text-master [OFFICE]
+application/vnd.oasis.opendocument.text-web [OFFICE]
 text/javascript application/x-javascript [EXECUTABLE]
 application/x-shockwave-flash [MULTIMEDIA]
 audio/midi [AUDIO]
@@ -406,6 +438,8 @@ class MimeMagic {
 		wfRestoreWarnings();
 		if( !$f ) return "unknown/unknown";
 		$head = fread( $f, 1024 );
+		fseek( $f, -65558, SEEK_END );
+		$tail = fread( $f, 65558 ); // 65558 = maximum size of a zip EOCDR
 		fclose( $f );
 
 		// Hardcode a few magic number checks...
@@ -462,8 +496,8 @@ class MimeMagic {
 		$xml = new XmlTypeCheck( $file );
 		if( $xml->wellFormed ) {
 			global $wgXMLMimeTypes;
-			if( isset( $wgXMLMimeTypes[$xml->rootElement] ) ) {
-				return $wgXMLMimeTypes[$xml->rootElement];
+			if( isset( $wgXMLMimeTypes[$xml->getRootElement()] ) ) {
+				return $wgXMLMimeTypes[$xml->getRootElement()];
 			} else {
 				return 'application/xml';
 			}
@@ -509,6 +543,12 @@ class MimeMagic {
 			}
 		}
 
+		// Check for ZIP (before getimagesize)
+		if ( strpos( $tail, "PK\x05\x06" ) !== false ) {
+			wfDebug( __METHOD__.": ZIP header present at end of $file\n" );
+			return $this->detectZipType( $head );
+		}
+
 		wfSuppressWarnings();
 		$gis = getimagesize( $file );
 		wfRestoreWarnings();
@@ -517,8 +557,6 @@ class MimeMagic {
 			$mime = $gis['mime'];
 			wfDebug( __METHOD__.": getimagesize detected $file as $mime\n" );
 			return $mime;
-		} else {
-			return false;
 		}
 
 		// Also test DjVu
@@ -527,6 +565,50 @@ class MimeMagic {
 			wfDebug( __METHOD__.": detected $file as image/vnd.djvu\n" );
 			return 'image/vnd.djvu';
 		}
+
+		return false;
+	}
+	
+	/**
+	 * Detect application-specific file type of a given ZIP file from its
+	 * header data.  Currently works for OpenDocument types...
+	 * If can't tell, returns 'application/zip'.
+	 *
+	 * @param string $header Some reasonably-sized chunk of file header
+	 * @return string
+	 */
+	function detectZipType( $header ) {
+		$opendocTypes = array(
+			'chart',
+			'chart-template',
+			'formula',
+			'formula-template',
+			'graphics',
+			'graphics-template',
+			'image',
+			'image-template',
+			'presentation',
+			'presentation-template',
+			'spreadsheet',
+			'spreadsheet-template',
+			'text',
+			'text-template',
+			'text-master',
+			'text-web' );
+
+		// http://lists.oasis-open.org/archives/office/200505/msg00006.html
+		$types = '(?:' . implode( '|', $opendocTypes ) . ')';
+		$opendocRegex = "/^mimetype(application\/vnd\.oasis\.opendocument\.$types)/";
+		wfDebug( __METHOD__.": $opendocRegex\n" );
+		
+		if( preg_match( $opendocRegex, substr( $header, 30 ), $matches ) ) {
+			$mime = $matches[1];
+			wfDebug( __METHOD__.": detected $mime from ZIP archive\n" );
+			return $mime;
+		} else {
+			wfDebug( __METHOD__.": unable to identify type of ZIP archive\n" );
+			return 'application/zip';
+		}
 	}
 
 	/** Internal mime type detection, please use guessMimeType() for application code instead.
diff --git a/includes/Namespace.php b/includes/Namespace.php
index 7c7b7ded..3d618e64 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -16,8 +16,8 @@ $wgCanonicalNamespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	NS_PROJECT          => 'Project',
 	NS_PROJECT_TALK     => 'Project_talk',
-	NS_IMAGE            => 'Image',
-	NS_IMAGE_TALK       => 'Image_talk',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'File_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -53,7 +53,7 @@ class MWNamespace {
 	 */
 	public static function isMovable( $index ) {
 		global $wgAllowImageMoving;
-		return !( $index < NS_MAIN || ($index == NS_IMAGE && !$wgAllowImageMoving)  || $index == NS_CATEGORY );
+		return !( $index < NS_MAIN || ($index == NS_FILE && !$wgAllowImageMoving)  || $index == NS_CATEGORY );
 	}
 
 	/**
@@ -105,11 +105,15 @@ class MWNamespace {
 	 * Returns the canonical (English Wikipedia) name for a given index
 	 *
 	 * @param $index Int: namespace index
-	 * @return string
+	 * @return string or false if no canonical definition.
 	 */
 	public static function getCanonicalName( $index ) {
 		global $wgCanonicalNamespaceNames;
-		return $wgCanonicalNamespaceNames[$index];
+		if( isset( $wgCanonicalNamespaceNames[$index] ) ) {
+			return $wgCanonicalNamespaceNames[$index];
+		} else {
+			return false;
+		}
 	}
 
 	/**
diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index 01b61dfb..6cfb2340 100644
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -32,7 +32,10 @@ class FakeMemCachedClient {
 global $wgCaches;
 $wgCaches = array();
 
-/** @todo document */
+/**
+ * Get a cache object.
+ * @param int $inputType cache type, one the the CACHE_* constants. 
+ */
 function &wfGetCache( $inputType ) {
 	global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;
 	$cache = false;
@@ -48,23 +51,20 @@ function &wfGetCache( $inputType ) {
 	}
 
 	if ( $type == CACHE_MEMCACHED ) {
-		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){
-			require_once( 'memcached-client.php' );
-
-			if (!class_exists("MemcachedClientforWiki")) {
+		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) {
+			if ( !class_exists( 'MemcachedClientforWiki' ) ) {
 				class MemCachedClientforWiki extends memcached {
 					function _debugprint( $text ) {
 						wfDebug( "memcached: $text" );
 					}
 				}
 			}
-
-			$wgCaches[CACHE_DB] = new MemCachedClientforWiki(
+			$wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki(
 				array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
-			$cache =& $wgCaches[CACHE_DB];
-			$cache->set_servers( $wgMemCachedServers );
-			$cache->set_debug( $wgMemCachedDebug );
+			$wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers );
+			$wgCaches[CACHE_MEMCACHED]->set_debug( $wgMemCachedDebug );
 		}
+		$cache =& $wgCaches[CACHE_MEMCACHED];
 	} elseif ( $type == CACHE_ACCEL ) {
 		if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
 			if ( function_exists( 'eaccelerator_get' ) ) {
@@ -106,18 +106,21 @@ function &wfGetCache( $inputType ) {
 	return $cache;
 }
 
+/** Get the main cache object */
 function &wfGetMainCache() {
 	global $wgMainCacheType;
 	$ret =& wfGetCache( $wgMainCacheType );
 	return $ret;
 }
 
+/** Get the cache object used by the message cache */
 function &wfGetMessageCacheStorage() {
 	global $wgMessageCacheType;
 	$ret =& wfGetCache( $wgMessageCacheType );
 	return $ret;
 }
 
+/** Get the cache object used by the parser cache */
 function &wfGetParserCacheStorage() {
 	global $wgParserCacheType;
 	$ret =& wfGetCache( $wgParserCacheType );
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8226cb2f..f8dba714 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -6,20 +6,23 @@ if ( ! defined( 'MEDIAWIKI' ) )
  * @todo document
  */
 class OutputPage {
-	var $mMetatags, $mKeywords;
-	var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
-	var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable;
-	var $mSubtitle, $mRedirect, $mStatusCode;
-	var $mLastModified, $mETag, $mCategoryLinks;
-	var $mScripts, $mLinkColours, $mPageLinkTitle;
+	var $mMetatags = array(), $mKeywords = array(), $mLinktags = array();
+	var $mExtStyles = array();
+	var $mPagetitle = '', $mBodytext = '', $mDebugtext = '';
+	var $mHTMLtitle = '', $mIsarticle = true, $mPrintable = false;
+	var $mSubtitle = '', $mRedirect = '', $mStatusCode;
+	var $mLastModified = '', $mETag = false;
+	var $mCategoryLinks = array(), $mLanguageLinks = array();
+	var $mScripts = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems = array();
+	var $mTemplateIds = array();
 
 	var $mAllowUserJs;
-	var $mSuppressQuickbar;
-	var $mOnloadHandler;
-	var $mDoNothing;
-	var $mContainsOldMagic, $mContainsNewMagic;
-	var $mIsArticleRelated;
-	protected $mParserOptions; // lazy initialised, use parserOptions()
+	var $mSuppressQuickbar = false;
+	var $mOnloadHandler = '';
+	var $mDoNothing = false;
+	var $mContainsOldMagic = 0, $mContainsNewMagic = 0;
+	var $mIsArticleRelated = true;
+	protected $mParserOptions = null; // lazy initialised, use parserOptions()
 	var $mShowFeedLinks = false;
 	var $mFeedLinksAppendQuery = false;
 	var $mEnableClientCache = true;
@@ -29,6 +32,18 @@ class OutputPage {
 	var $mNoGallery = false;
 	var $mPageTitleActionText = '';
 	var $mParseWarnings = array();
+	var $mSquidMaxage = 0;
+	var $mRevisionId = null;
+
+	/**
+	 * An array of stylesheet filenames (relative from skins path), with options
+	 * for CSS media, IE conditions, and RTL/LTR direction.
+	 * For internal use; add settings in the skin via $this->addStyle()
+	 */
+	var $styles = array();
+
+	private $mIndexPolicy = 'index';
+	private $mFollowPolicy = 'follow';
 
 	/**
 	 * Constructor
@@ -37,25 +52,6 @@ class OutputPage {
 	function __construct() {
 		global $wgAllowUserJs;
 		$this->mAllowUserJs = $wgAllowUserJs;
-		$this->mMetatags = $this->mKeywords = $this->mLinktags = array();
-		$this->mHTMLtitle = $this->mPagetitle = $this->mBodytext =
-		$this->mRedirect = $this->mLastModified =
-		$this->mSubtitle = $this->mDebugtext = $this->mRobotpolicy =
-		$this->mOnloadHandler = $this->mPageLinkTitle = '';
-		$this->mIsArticleRelated = $this->mIsarticle = $this->mPrintable = true;
-		$this->mSuppressQuickbar = $this->mPrintable = false;
-		$this->mLanguageLinks = array();
-		$this->mCategoryLinks = array();
-		$this->mDoNothing = false;
-		$this->mContainsOldMagic = $this->mContainsNewMagic = 0;
-		$this->mParserOptions = null;
-		$this->mSquidMaxage = 0;
-		$this->mScripts = '';
-		$this->mHeadItems = array();
-		$this->mETag = false;
-		$this->mRevisionId = null;
-		$this->mNewSectionLink = false;
-		$this->mTemplateIds = array();
 	}
 
 	public function redirect( $url, $responsecode = '302' ) {
@@ -76,17 +72,23 @@ class OutputPage {
 	 */
 	function setStatusCode( $statusCode ) { $this->mStatusCode = $statusCode; }
 
-	# To add an http-equiv meta tag, precede the name with "http:"
-	function addMeta( $name, $val ) { array_push( $this->mMetatags, array( $name, $val ) ); }
+	/**
+	 * Add a new <meta> tag
+	 * To add an http-equiv meta tag, precede the name with "http:"
+	 *
+	 * @param $name tag name
+	 * @param $val tag value
+	 */
+	function addMeta( $name, $val ) {
+		array_push( $this->mMetatags, array( $name, $val ) );
+	}
+
 	function addKeyword( $text ) { array_push( $this->mKeywords, $text ); }
 	function addScript( $script ) { $this->mScripts .= "\t\t".$script; }
-	function addStyle( $style ) {
-		global $wgStylePath, $wgStyleVersion;
-		$this->addLink(
-				array(
-					'rel' => 'stylesheet',
-					'href' => $wgStylePath . '/' . $style . '?' . $wgStyleVersion,
-					'type' => 'text/css' ) );
+	
+	function addExtensionStyle( $url ) {
+		$linkarr = array( 'rel' => 'stylesheet', 'href' => $url, 'type' => 'text/css' );
+		array_push( $this->mExtStyles, $linkarr );
 	}
 
 	/**
@@ -100,7 +102,6 @@ class OutputPage {
 		} else {
 			$path =  "{$wgStylePath}/common/{$file}";
 		}
-		$encPath = htmlspecialchars( $path );
 		$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"$path?$wgStyleVersion\"></script>\n" );
 	}
 	
@@ -141,6 +142,11 @@ class OutputPage {
 		# $linkarr should be an associative array of attributes. We'll escape on output.
 		array_push( $this->mLinktags, $linkarr );
 	}
+	
+	# Get all links added by extensions
+	function getExtStyle() {
+		return $this->mExtStyles;
+	}
 
 	function addMetadataLink( $linkarr ) {
 		# note: buggy CC software only reads first "meta" link
@@ -155,62 +161,87 @@ class OutputPage {
 	 * possible. If sucessful, the OutputPage is disabled so that
 	 * any future call to OutputPage->output() have no effect.
 	 *
+	 * Side effect: sets mLastModified for Last-Modified header
+	 *
 	 * @return bool True iff cache-ok headers was sent.
 	 */
 	function checkLastModified ( $timestamp ) {
 		global $wgCachePages, $wgCacheEpoch, $wgUser, $wgRequest;
-
+		
 		if ( !$timestamp || $timestamp == '19700101000000' ) {
 			wfDebug( __METHOD__ . ": CACHE DISABLED, NO TIMESTAMP\n" );
-			return;
+			return false;
 		}
 		if( !$wgCachePages ) {
 			wfDebug( __METHOD__ . ": CACHE DISABLED\n", false );
-			return;
+			return false;
 		}
 		if( $wgUser->getOption( 'nocache' ) ) {
 			wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false );
-			return;
+			return false;
 		}
 
-		$timestamp=wfTimestamp(TS_MW,$timestamp);
-		$lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched, $wgCacheEpoch ) );
+		$timestamp = wfTimestamp( TS_MW, $timestamp );
+		$modifiedTimes = array(
+			'page' => $timestamp,
+			'user' => $wgUser->getTouched(),
+			'epoch' => $wgCacheEpoch
+		);
+		wfRunHooks( 'OutputPageCheckLastModified', array( &$modifiedTimes ) );
 
-		if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
-			# IE sends sizes after the date like this:
-			# Wed, 20 Aug 2003 06:51:19 GMT; length=5202
-			# this breaks strtotime().
-			$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
+		$maxModified = max( $modifiedTimes );
+		$this->mLastModified = wfTimestamp( TS_RFC2822, $maxModified );
 
-			wfSuppressWarnings(); // E_STRICT system time bitching
-			$modsinceTime = strtotime( $modsince );
-			wfRestoreWarnings();
+		if( empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+			wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false );
+			return false;
+		}
 
-			$ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
-			wfDebug( __METHOD__ . ": -- client send If-Modified-Since: " . $modsince . "\n", false );
-			wfDebug( __METHOD__ . ": --  we might send Last-Modified : $lastmod\n", false );
-			if( ($ismodsince >= $timestamp ) && $wgUser->validateCache( $ismodsince ) && $ismodsince >= $wgCacheEpoch ) {
-				# Make sure you're in a place you can leave when you call us!
-				$wgRequest->response()->header( "HTTP/1.0 304 Not Modified" );
-				$this->mLastModified = $lastmod;
-				$this->sendCacheControl();
-				wfDebug( __METHOD__ . ": CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
-				$this->disable();
+		# Make debug info
+		$info = '';
+		foreach ( $modifiedTimes as $name => $value ) {
+			if ( $info !== '' ) {
+				$info .= ', ';
+			}
+			$info .= "$name=" . wfTimestamp( TS_ISO_8601, $value );
+		}
 
-				// Don't output a compressed blob when using ob_gzhandler;
-				// it's technically against HTTP spec and seems to confuse
-				// Firefox when the response gets split over two packets.
-				wfClearOutputBuffers();
+		# IE sends sizes after the date like this:
+		# Wed, 20 Aug 2003 06:51:19 GMT; length=5202
+		# this breaks strtotime().
+		$clientHeader = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
 
-				return true;
-			} else {
-				wfDebug( __METHOD__ . ": READY  client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
-				$this->mLastModified = $lastmod;
-			}
-		} else {
-			wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false );
-			$this->mLastModified = $lastmod;
+		wfSuppressWarnings(); // E_STRICT system time bitching
+		$clientHeaderTime = strtotime( $clientHeader );
+		wfRestoreWarnings();
+		if ( !$clientHeaderTime ) {
+			wfDebug( __METHOD__ . ": unable to parse the client's If-Modified-Since header: $clientHeader\n" );
+			return false;
 		}
+		$clientHeaderTime = wfTimestamp( TS_MW, $clientHeaderTime );
+
+		wfDebug( __METHOD__ . ": client sent If-Modified-Since: " . 
+			wfTimestamp( TS_ISO_8601, $clientHeaderTime ) . "\n", false );
+		wfDebug( __METHOD__ . ": effective Last-Modified: " . 
+			wfTimestamp( TS_ISO_8601, $maxModified ) . "\n", false );
+		if( $clientHeaderTime < $maxModified ) {
+			wfDebug( __METHOD__ . ": STALE, $info\n", false );
+			return false;
+		}
+
+		# Not modified
+		# Give a 304 response code and disable body output 
+		wfDebug( __METHOD__ . ": NOT MODIFIED, $info\n", false );
+		$wgRequest->response()->header( "HTTP/1.1 304 Not Modified" );
+		$this->sendCacheControl();
+		$this->disable();
+
+		// Don't output a compressed blob when using ob_gzhandler;
+		// it's technically against HTTP spec and seems to confuse
+		// Firefox when the response gets split over two packets.
+		wfClearOutputBuffers();
+
+		return true;
 	}
 
 	function setPageTitleActionText( $text ) {
@@ -223,7 +254,61 @@ class OutputPage {
 		}
 	}
 
-	public function setRobotpolicy( $str ) { $this->mRobotpolicy = $str; }
+	/**
+	 * Set the robot policy for the page: <http://www.robotstxt.org/meta.html>
+	 *
+	 * @param $policy string The literal string to output as the contents of
+	 *   the meta tag.  Will be parsed according to the spec and output in
+	 *   standardized form.
+	 * @return null
+	 */
+	public function setRobotPolicy( $policy ) {
+		$policy = explode( ',', $policy );
+		$policy = array_map( 'trim', $policy );
+
+		# The default policy is follow, so if nothing is said explicitly, we
+		# do that.
+		if( in_array( 'nofollow', $policy ) ) {
+			$this->mFollowPolicy = 'nofollow';
+		} else {
+			$this->mFollowPolicy = 'follow';
+		}
+
+		if( in_array( 'noindex', $policy ) ) {
+			$this->mIndexPolicy = 'noindex';
+		} else {
+			$this->mIndexPolicy = 'index';
+		}
+	}
+
+	/**
+	 * Set the index policy for the page, but leave the follow policy un-
+	 * touched.
+	 *
+	 * @param $policy string Either 'index' or 'noindex'.
+	 * @return null
+	 */
+	public function setIndexPolicy( $policy ) {
+		$policy = trim( $policy );
+		if( in_array( $policy, array( 'index', 'noindex' ) ) ) {
+			$this->mIndexPolicy = $policy;
+		}
+	}
+
+	/**
+	 * Set the follow policy for the page, but leave the index policy un-
+	 * touched.
+	 *
+	 * @param $policy string Either 'follow' or 'nofollow'.
+	 * @return null
+	 */
+	public function setFollowPolicy( $policy ) {
+		$policy = trim( $policy );
+		if( in_array( $policy, array( 'follow', 'nofollow' ) ) ) {
+			$this->mFollowPolicy = $policy;
+		}
+	}
+
 	public function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; }
 	public function setPageTitle( $name ) {
 		global $action, $wgContLang;
@@ -341,6 +426,7 @@ class OutputPage {
 	public function disallowUserJs() { $this->mAllowUserJs = false; }
 	public function isUserJsAllowed() { return $this->mAllowUserJs; }
 
+	public function prependHTML( $text ) { $this->mBodytext = $text . $this->mBodytext; }
 	public function addHTML( $text ) { $this->mBodytext .= $text; }
 	public function clearHTML() { $this->mBodytext = ''; }
 	public function getHTML() { return $this->mBodytext; }
@@ -369,6 +455,10 @@ class OutputPage {
 		$val = is_null( $revid ) ? null : intval( $revid );
 		return wfSetVar( $this->mRevisionId, $val );
 	}
+	
+	public function getRevisionId() {
+		return $this->mRevisionId;
+	}
 
 	/**
 	 * Convert wikitext to HTML and add it to the buffer
@@ -416,9 +506,23 @@ class OutputPage {
 	 * @param ParserOutput object &$parserOutput
 	 */
 	public function addParserOutputNoText( &$parserOutput ) {
+		global $wgTitle, $wgExemptFromUserRobotsControl, $wgContentNamespaces;
+
 		$this->mLanguageLinks += $parserOutput->getLanguageLinks();
 		$this->addCategoryLinks( $parserOutput->getCategories() );
 		$this->mNewSectionLink = $parserOutput->getNewSection();
+
+		if( is_null( $wgExemptFromUserRobotsControl ) ) {
+			$bannedNamespaces = $wgContentNamespaces;
+		} else {
+			$bannedNamespaces = $wgExemptFromUserRobotsControl;
+		}
+		if( !in_array( $wgTitle->getNamespace(), $bannedNamespaces ) ) {
+			# FIXME (bug 14900): This overrides $wgArticleRobotPolicies, and it
+			# shouldn't
+			$this->setIndexPolicy( $parserOutput->getIndexPolicy() );
+		}
+
 		$this->addKeywords( $parserOutput );
 		$this->mParseWarnings = $parserOutput->getWarnings();
 		if ( $parserOutput->getCacheTime() == -1 ) {
@@ -427,8 +531,13 @@ class OutputPage {
 		$this->mNoGallery = $parserOutput->getNoGallery();
 		$this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems );
 		// Versioning...
-		$this->mTemplateIds = wfArrayMerge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds );
-
+		foreach ( (array)$parserOutput->mTemplateIds as $ns => $dbks ) {
+			if ( isset( $this->mTemplateIds[$ns] ) ) {
+				$this->mTemplateIds[$ns] = $dbks + $this->mTemplateIds[$ns];
+			} else {
+				$this->mTemplateIds[$ns] = $dbks;
+			}
+		}
 		// Display title
 		if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )
 			$this->setPageTitle( $dt );
@@ -522,6 +631,9 @@ class OutputPage {
 	 */
 	public function parse( $text, $linestart = true, $interface = false ) {
 		global $wgParser, $wgTitle;
+		if( is_null( $wgTitle ) ) {
+			throw new MWException( 'Empty $wgTitle in ' . __METHOD__ );
+		}
 		$popts = $this->parserOptions();
 		if ( $interface) { $popts->setInterfaceMessage(true); }
 		$parserOutput = $wgParser->parse( $text, $wgTitle, $popts,
@@ -590,7 +702,7 @@ class OutputPage {
 	 * If it does, it's very important that we don't allow public caching
 	 */
 	function haveCacheVaryCookies() {
-		global $wgRequest, $wgCookiePrefix;
+		global $wgRequest;
 		$cookieHeader = $wgRequest->getHeader( 'cookie' );
 		if ( $cookieHeader === false ) {
 			return false;
@@ -609,7 +721,6 @@ class OutputPage {
 
 	/** Get a complete X-Vary-Options header */
 	public function getXVO() {
-		global $wgCookiePrefix;
 		$cvCookies = $this->getCacheVaryCookies();
 		$xvo = 'X-Vary-Options: Accept-Encoding;list-contains=gzip,Cookie;';
 		$first = true;
@@ -668,7 +779,9 @@ class OutputPage {
 				$response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
 				$response->header( "Cache-Control: private, must-revalidate, max-age=0" );
 			}
-			if($this->mLastModified) $response->header( "Last-modified: {$this->mLastModified}" );
+			if($this->mLastModified) {
+				$response->header( "Last-Modified: {$this->mLastModified}" );
+			}
 		} else {
 			wfDebug( __METHOD__ . ": no caching **\n", false );
 
@@ -687,8 +800,9 @@ class OutputPage {
 	public function output() {
 		global $wgUser, $wgOutputEncoding, $wgRequest;
 		global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
-		global $wgJsMimeType, $wgUseAjax, $wgAjaxSearch, $wgAjaxWatch;
-		global $wgServer, $wgEnableMWSuggest;
+		global $wgJsMimeType, $wgUseAjax, $wgAjaxWatch;
+		global $wgEnableMWSuggest, $wgUniversalEditButton;
+		global $wgArticle, $wgTitle;
 
 		if( $this->mDoNothing ){
 			return;
@@ -782,11 +896,6 @@ class OutputPage {
 
 			wfRunHooks( 'AjaxAddScript', array( &$this ) );
 
-			if( $wgAjaxSearch && $wgUser->getBoolOption( 'ajaxsearch' ) ) {
-				$this->addScriptFile( 'ajaxsearch.js' );
-				$this->addScript( "<script type=\"{$wgJsMimeType}\">hookEvent(\"load\", sajax_onload);</script>\n" );
-			}
-
 			if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
 				$this->addScriptFile( 'ajaxwatch.js' );
 			}
@@ -800,13 +909,28 @@ class OutputPage {
 			$this->addScriptFile( 'rightclickedit.js' );
 		}
 
-
+		if( $wgUniversalEditButton ) {
+			if( isset( $wgArticle ) && isset( $wgTitle ) && $wgTitle->quickUserCan( 'edit' )
+				&& ( $wgTitle->exists() || $wgTitle->quickUserCan( 'create' ) ) ) {
+				// Original UniversalEditButton
+				$this->addLink( array(
+					'rel' => 'alternate',
+					'type' => 'application/x-wiki',
+					'title' => wfMsg( 'edit' ),
+					'href' => $wgTitle->getFullURL( 'action=edit' )
+				) );
+				// Alternate edit link
+				$this->addLink( array(
+					'rel' => 'edit',
+					'title' => wfMsg( 'edit' ),
+					'href' => $wgTitle->getFullURL( 'action=edit' )
+				) );
+			}
+		}
+		
 		# Buffer output; final headers may depend on later processing
 		ob_start();
 
-		# Disable temporary placeholders, so that the skin produces HTML
-		$sk->postParseLinkColour( false );
-
 		$wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
 		$wgRequest->response()->header( 'Content-language: '.$wgContLanguageCode );
 
@@ -879,7 +1003,7 @@ class OutputPage {
 		global $wgUser, $wgContLang, $wgTitle, $wgLang;
 
 		$this->setPageTitle( wfMsg( 'blockedtitle' ) );
-		$this->setRobotpolicy( 'noindex,nofollow' );
+		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
 
 		$name = User::whoIs( $wgUser->blockedBy() );
@@ -945,7 +1069,7 @@ class OutputPage {
 		}
 		$this->setPageTitle( wfMsg( $title ) );
 		$this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
-		$this->setRobotpolicy( 'noindex,nofollow' );
+		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
 		$this->enableClientCache( false );
 		$this->mRedirect = '';
@@ -953,7 +1077,7 @@ class OutputPage {
 
 		array_unshift( $params, 'parse' );
 		array_unshift( $params, $msg );
-		$this->addHtml( call_user_func_array( 'wfMsgExt', $params ) );
+		$this->addHTML( call_user_func_array( 'wfMsgExt', $params ) );
 
 		$this->returnToMain();
 	}
@@ -971,7 +1095,7 @@ class OutputPage {
 		$wgTitle->getPrefixedText() . "\n";
 		$this->setPageTitle( wfMsg( 'permissionserrors' ) );
 		$this->setHTMLTitle( wfMsg( 'permissionserrors' ) );
-		$this->setRobotpolicy( 'noindex,nofollow' );
+		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
 		$this->enableClientCache( false );
 		$this->mRedirect = '';
@@ -994,7 +1118,7 @@ class OutputPage {
 	public function versionRequired( $version ) {
 		$this->setPageTitle( wfMsg( 'versionrequired', $version ) );
 		$this->setHTMLTitle( wfMsg( 'versionrequired', $version ) );
-		$this->setRobotpolicy( 'noindex,nofollow' );
+		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
 		$this->mBodytext = '';
 
@@ -1008,39 +1132,23 @@ class OutputPage {
 	 * @param string $permission key required
 	 */
 	public function permissionRequired( $permission ) {
-		global $wgGroupPermissions, $wgUser;
+		global $wgUser;
 
 		$this->setPageTitle( wfMsg( 'badaccess' ) );
 		$this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
-		$this->setRobotpolicy( 'noindex,nofollow' );
+		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
 		$this->mBodytext = '';
 
-		$groups = array();
-		foreach( $wgGroupPermissions as $key => $value ) {
-			if( isset( $value[$permission] ) && $value[$permission] == true ) {
-				$groupName = User::getGroupName( $key );
-				$groupPage = User::getGroupPage( $key );
-				if( $groupPage ) {
-					$skin = $wgUser->getSkin();
-					$groups[] = $skin->makeLinkObj( $groupPage, $groupName );
-				} else {
-					$groups[] = $groupName;
-				}
-			}
+		$groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
+			User::getGroupsWithPermission( $permission ) );
+		if( $groups ) {
+			$this->addWikiMsg( 'badaccess-groups',
+				implode( ', ', $groups ),
+				count( $groups) );
+		} else {
+			$this->addWikiMsg( 'badaccess-group0' );
 		}
-		$n = count( $groups );
-		$groups = implode( ', ', $groups );
-		switch( $n ) {
-			case 0:
-			case 1:
-			case 2:
-				$message = wfMsgHtml( "badaccess-group$n", $groups );
-				break;
-			default:
-				$message = wfMsgHtml( 'badaccess-groups', $groups );
-		}
-		$this->addHtml( $message );
 		$this->returnToMain();
 	}
 
@@ -1080,8 +1188,8 @@ class OutputPage {
 
 		$loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
 		$loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() );
-		$this->addHtml( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
-		$this->addHtml( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
+		$this->addHTML( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
+		$this->addHTML( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
 
 		# Don't return to the main page if the user can't read it
 		# otherwise we'll end up in a pointless loop
@@ -1103,8 +1211,8 @@ class OutputPage {
 		if ($action == null) {
 			$text = wfMsgNoTrans( 'permissionserrorstext', count($errors)). "\n\n";
 		} else {
-			$action_desc = wfMsg( "right-$action" );
-			$action_desc[0] = strtolower($action_desc[0]);
+			global $wgLang;
+			$action_desc = wfMsg( "action-$action" );
 			$text = wfMsgNoTrans( 'permissionserrorstext-withaction', count($errors), $action_desc ) . "\n\n";
 		}
 
@@ -1148,7 +1256,7 @@ class OutputPage {
 		global $wgUser, $wgTitle;
 		$skin = $wgUser->getSkin();
 
-		$this->setRobotpolicy( 'noindex,nofollow' );
+		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
 
 		// If no reason is given, just supply a default "I can't let you do
@@ -1170,7 +1278,7 @@ class OutputPage {
 			// Wiki is read only
 			$this->setPageTitle( wfMsg( 'readonly' ) );
 			$reason = wfReadOnlyReason();
-			$this->addWikiMsg( 'readonlytext', $reason );
+			$this->wrapWikiMsg( '<div class="mw-readonly-error">$1</div>', array( 'readonlytext', $reason ) );
 		}
 
 		// Show source, if supplied
@@ -1189,7 +1297,10 @@ class OutputPage {
 			// Show templates used by this article
 			$skin = $wgUser->getSkin();
 			$article = new Article( $wgTitle );
-			$this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) );
+			$this->addHTML( "<div class='templatesUsed'>
+{$skin->formatTemplates( $article->getUsedTemplates() )}
+</div>
+" );
 		}
 
 		# If the title doesn't exist, it's fairly pointless to print a return
@@ -1238,7 +1349,7 @@ class OutputPage {
 
 	public function showFatalError( $message ) {
 		$this->setPageTitle( wfMsg( "internalerror" ) );
-		$this->setRobotpolicy( "noindex,nofollow" );
+		$this->setRobotPolicy( "noindex,nofollow" );
 		$this->setArticleRelated( false );
 		$this->enableClientCache( false );
 		$this->mRedirect = '';
@@ -1272,8 +1383,9 @@ class OutputPage {
 	 */
 	public function addReturnTo( $title ) {
 		global $wgUser;
+		$this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) );
 		$link = wfMsg( 'returnto', $wgUser->getSkin()->makeLinkObj( $title ) );
-		$this->addHtml( "<p>{$link}</p>\n" );
+		$this->addHTML( "<p>{$link}</p>\n" );
 	}
 
 	/**
@@ -1333,15 +1445,19 @@ class OutputPage {
 	/**
 	 * @return string The doctype, opening <html>, and head element.
 	 */
-	public function headElement() {
+	public function headElement( Skin $sk ) {
 		global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType;
 		global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
 		global $wgUser, $wgContLang, $wgUseTrackbacks, $wgTitle, $wgStyleVersion;
 
+		$this->addMeta( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" );
+		$this->addStyle( 'common/wikiprintable.css', 'print' );
+		$sk->setupUserCss( $this );
+
+		$ret = '';
+
 		if( $wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml' ) {
-			$ret = "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?>\n";
-		} else {
-			$ret = '';
+			$ret .= "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?>\n";
 		}
 
 		$ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
@@ -1356,24 +1472,17 @@ class OutputPage {
 			$ret .= "xmlns:{$tag}=\"{$ns}\" ";
 		}
 		$ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n";
-		$ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n";
-		$this->addMeta( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" );
-		
-		$ret .= $this->getHeadLinks();
-		global $wgStylePath;
-		if( $this->isPrintable() ) {
-			$media = '';
-		} else {
-			$media = "media='print'";
+		$ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n\t\t";
+		$ret .= implode( "\t\t", array(
+			$this->getHeadLinks(),
+			$this->buildCssLinks(),
+			$sk->getHeadScripts( $this->mAllowUserJs ),
+			$this->mScripts,
+			$this->getHeadItems(),
+		));
+		if( $sk->usercss ){
+			$ret .= "<style type='text/css'>{$sk->usercss}</style>";
 		}
-		$printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css?$wgStyleVersion" );
-		$ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet' />\n";
-
-		$sk = $wgUser->getSkin();
-		$ret .= $sk->getHeadScripts( $this->mAllowUserJs );
-		$ret .= $this->mScripts;
-		$ret .= $sk->getUserStyles();
-		$ret .= $this->getHeadItems();
 
 		if ($wgUseTrackbacks && $this->isArticleRelated())
 			$ret .= $wgTitle->trackbackRDF();
@@ -1384,10 +1493,11 @@ class OutputPage {
 	
 	protected function addDefaultMeta() {
 		global $wgVersion;
-		$this->addMeta( "generator", "MediaWiki $wgVersion" );
+		$this->addMeta( 'http:Content-Style-Type', 'text/css' ); //bug 15835
+		$this->addMeta( 'generator', "MediaWiki $wgVersion" );
 		
-		$p = $this->mRobotpolicy;
-		if( $p !== '' && $p != 'index,follow' ) {
+		$p = "{$this->mIndexPolicy},{$this->mFollowPolicy}";
+		if( $p !== 'index,follow' ) {
 			// http://www.robotstxt.org/wc/meta-user.html
 			// Only show if it's different from the default robots policy
 			$this->addMeta( 'robots', $p );
@@ -1446,20 +1556,29 @@ class OutputPage {
 			# Recent changes feed should appear on every page (except recentchanges, 
 			# that would be redundant). Put it after the per-page feed to avoid 
 			# changing existing behavior. It's still available, probably via a 
-			# menu in your browser.
-
+			# menu in your browser. Some sites might have a different feed they'd
+			# like to promote instead of the RC feed (maybe like a "Recent New Articles"
+			# or "Breaking news" one). For this, we see if $wgOverrideSiteFeed is defined.
+			# If so, use it instead.
+			
+			global $wgOverrideSiteFeed, $wgSitename, $wgFeedClasses;
 			$rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
-			if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) {
-				global $wgSitename;
-				
-				$tags[] = $this->feedLink(
-					'rss',
-					$rctitle->getFullURL( 'feed=rss' ),
-					wfMsg( 'site-rss-feed', $wgSitename ) );
-				$tags[] = $this->feedLink(
-					'atom',
-					$rctitle->getFullURL( 'feed=atom' ),
-					wfMsg( 'site-atom-feed', $wgSitename ) );
+			
+			if ( $wgOverrideSiteFeed ) {
+				foreach ( $wgOverrideSiteFeed as $type => $feedUrl ) { 
+					$tags[] = $this->feedLink (
+						$type,
+						htmlspecialchars( $feedUrl ),
+						wfMsg( "site-{$type}-feed", $wgSitename ) );
+				}
+			}
+			else if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) {
+				foreach( $wgFeedClasses as $format => $class ) {
+					$tags[] = $this->feedLink(
+						$format,
+						$rctitle->getFullURL( "feed={$format}" ),
+						wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'.
+				}
 			}
 		}
 
@@ -1500,6 +1619,118 @@ class OutputPage {
 	}
 
 	/**
+	 * Add a local or specified stylesheet, with the given media options.
+	 * Meant primarily for internal use...
+	 *
+	 * @param $media -- to specify a media type, 'screen', 'printable', 'handheld' or any.
+	 * @param $conditional -- for IE conditional comments, specifying an IE version
+	 * @param $dir -- set to 'rtl' or 'ltr' for direction-specific sheets
+	 */
+	public function addStyle( $style, $media='', $condition='', $dir='' ) {
+		$options = array();
+		if( $media )
+			$options['media'] = $media;
+		if( $condition )
+			$options['condition'] = $condition;
+		if( $dir )
+			$options['dir'] = $dir;
+		$this->styles[$style] = $options;
+	}
+
+	/**
+	 * Build a set of <link>s for the stylesheets specified in the $this->styles array.
+	 * These will be applied to various media & IE conditionals.
+	 */
+	public function buildCssLinks() {
+		$links = array();
+		foreach( $this->styles as $file => $options ) {
+			$link = $this->styleLink( $file, $options );
+			if( $link )
+				$links[] = $link;
+		}
+
+		return implode( "\n\t\t", $links );
+	}
+
+	protected function styleLink( $style, $options ) {
+		global $wgRequest;
+
+		if( isset( $options['dir'] ) ) {
+			global $wgContLang;
+			$siteDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+			if( $siteDir != $options['dir'] )
+				return '';
+		}
+
+		if( isset( $options['media'] ) ) {
+			$media = $this->transformCssMedia( $options['media'] );
+			if( is_null( $media ) ) {
+				return '';
+			}
+		} else {
+			$media = '';
+		}
+
+		if( substr( $style, 0, 1 ) == '/' ||
+			substr( $style, 0, 5 ) == 'http:' ||
+			substr( $style, 0, 6 ) == 'https:' ) {
+			$url = $style;
+		} else {
+			global $wgStylePath, $wgStyleVersion;
+			$url = $wgStylePath . '/' . $style . '?' . $wgStyleVersion;
+		}
+
+		$attribs = array(
+			'rel' => 'stylesheet',
+			'href' => $url,
+			'type' => 'text/css' );
+		if( $media ) {
+			$attribs['media'] = $media;
+		}
+
+		$link = Xml::element( 'link', $attribs );
+
+		if( isset( $options['condition'] ) ) {
+			$condition = htmlspecialchars( $options['condition'] );
+			$link = "<!--[if $condition]>$link<![endif]-->";
+		}
+		return $link;
+	}
+
+	function transformCssMedia( $media ) {
+		global $wgRequest, $wgHandheldForIPhone;
+
+		// Switch in on-screen display for media testing
+		$switches = array(
+			'printable' => 'print',
+			'handheld' => 'handheld',
+		);
+		foreach( $switches as $switch => $targetMedia ) {
+			if( $wgRequest->getBool( $switch ) ) {
+				if( $media == $targetMedia ) {
+					$media = '';
+				} elseif( $media == 'screen' ) {
+					return null;
+				}
+			}
+		}
+
+		// Expand longer media queries as iPhone doesn't grok 'handheld'
+		if( $wgHandheldForIPhone ) {
+			$mediaAliases = array(
+				'screen' => 'screen and (min-device-width: 481px)',
+				'handheld' => 'handheld, only screen and (max-device-width: 480px)',
+			);
+
+			if( isset( $mediaAliases[$media] ) ) {
+				$media = $mediaAliases[$media];
+			}
+		}
+
+		return $media;
+	}
+
+	/**
 	 * Turn off regular page output and return an error reponse
 	 * for when rate limiting has triggered.
 	 */
@@ -1543,7 +1774,7 @@ class OutputPage {
 				? 'lag-warn-normal'
 				: 'lag-warn-high';
 			$warning = wfMsgExt( $message, 'parse', $lag );
-			$this->addHtml( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
+			$this->addHTML( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
 		}
 	}
 
diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 870b57b7..b01b485e 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -22,7 +22,6 @@ class PageHistory {
 	var $mArticle, $mTitle, $mSkin;
 	var $lastdate;
 	var $linesonpage;
-	var $mNotificationTimestamp;
 	var $mLatestId = null;
 
 	/**
@@ -31,12 +30,10 @@ class PageHistory {
 	 * @param Article $article
 	 * @returns nothing
 	 */
-	function __construct($article) {
+	function __construct( $article ) {
 		global $wgUser;
-
 		$this->mArticle =& $article;
 		$this->mTitle =& $article->mTitle;
-		$this->mNotificationTimestamp = NULL;
 		$this->mSkin = $wgUser->getSkin();
 		$this->preCacheMessages();
 	}
@@ -44,7 +41,7 @@ class PageHistory {
 	function getArticle() {
 		return $this->mArticle;
 	}
-	
+
 	function getTitle() {
 		return $this->mTitle;
 	}
@@ -68,15 +65,13 @@ class PageHistory {
 	 * @returns nothing
 	 */
 	function history() {
-		global $wgOut, $wgRequest, $wgTitle;
+		global $wgOut, $wgRequest, $wgTitle, $wgScript;
 
 		/*
 		 * Allow client caching.
 		 */
-
 		if( $wgOut->checkLastModified( $this->mArticle->getTouched() ) )
-			/* Client cache fresh and headers sent, nothing more to do. */
-			return;
+			return; // Client cache fresh and headers sent, nothing more to do.
 
 		wfProfileIn( __METHOD__ );
 
@@ -87,13 +82,14 @@ class PageHistory {
 		$wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
 		$wgOut->setArticleFlag( false );
 		$wgOut->setArticleRelated( true );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setSyndicated( true );
 		$wgOut->setFeedAppendQuery( 'action=history' );
 		$wgOut->addScriptFile( 'history.js' );
 
 		$logPage = SpecialPage::getTitleFor( 'Log' );
-		$logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() );
+		$logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ),
+			'page=' . $this->mTitle->getPrefixedUrl() );
 		$wgOut->setSubtitle( $logLink );
 
 		$feedType = $wgRequest->getVal( 'feed' );
@@ -111,26 +107,29 @@ class PageHistory {
 			return;
 		}
 
-		/*
-		 * "go=first" means to jump to the last (earliest) history page.
-		 * This is deprecated, it no longer appears in the user interface
+		/**
+		 * Add date selector to quickly get to a certain time
 		 */
-		if ( $wgRequest->getText("go") == 'first' ) {
-			$limit = $wgRequest->getInt( 'limit', 50 );
-			global $wgFeedLimit;
-			if( $limit > $wgFeedLimit ) {
-				$limit = $wgFeedLimit;
-			}
-			$wgOut->redirect( $wgTitle->getLocalURL( "action=history&limit={$limit}&dir=prev" ) );
-			return;
-		}
+		$year = $wgRequest->getInt( 'year' );
+		$month = $wgRequest->getInt( 'month' );
+
+		$action = htmlspecialchars( $wgScript );
+		$wgOut->addHTML(
+			"<form action=\"$action\" method=\"get\" id=\"mw-history-searchform\">" .
+			Xml::fieldset( wfMsg( 'history-fieldset-title' ), false, array( 'id' => 'mw-history-search' ) ) .
+			Xml::hidden( 'title', $this->mTitle->getPrefixedDBKey() ) . "\n" .
+			Xml::hidden( 'action', 'history' ) . "\n" .
+			$this->getDateMenu( $year, $month ) . '&nbsp;' .
+			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+			'</fieldset></form>'
+		);
 
 		wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
 
 		/**
 		 * Do the list
 		 */
-		$pager = new PageHistoryPager( $this );
+		$pager = new PageHistoryPager( $this, $year, $month );
 		$this->linesonpage = $pager->getNumRows();
 		$wgOut->addHTML(
 			$pager->getNavigationBar() .
@@ -139,21 +138,77 @@ class PageHistory {
 			$this->endHistoryList() .
 			$pager->getNavigationBar()
 		);
+
 		wfProfileOut( __METHOD__ );
 	}
 
 	/**
+	 * @return string Formatted HTML
+	 * @param int $year
+	 * @param int $month
+	 */
+	private function getDateMenu( $year, $month ) {
+		# Offset overrides year/month selection
+		if( $month && $month !== -1 ) {
+			$encMonth = intval( $month );
+		} else {
+			$encMonth = '';
+		}
+		if( $year ) {
+			$encYear = intval( $year );
+		} else if( $encMonth ) {
+			$thisMonth = intval( gmdate( 'n' ) );
+			$thisYear = intval( gmdate( 'Y' ) );
+			if( intval($encMonth) > $thisMonth ) {
+				$thisYear--;
+			}
+			$encYear = $thisYear;
+		} else {
+			$encYear = '';
+		}
+		return Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+			Xml::input( 'year', 4, $encYear, array('id' => 'year', 'maxlength' => 4) ) .
+				' '.
+			Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+			Xml::monthSelector( $encMonth, -1 );
+	}
+
+	/**
 	 * Creates begin of history list with a submit button
 	 *
 	 * @return string HTML output
 	 */
 	function beginHistoryList() {
-		global $wgTitle, $wgScript;
+		global $wgTitle, $wgScript, $wgEnableHtmlDiff;
 		$this->lastdate = '';
 		$s = wfMsgExt( 'histlegend', array( 'parse') );
-		$s .= Xml::openElement( 'form', array( 'action' => $wgScript ) );
+		$s .= Xml::openElement( 'form', array( 'action' => $wgScript, 'id' => 'mw-history-compare' ) );
 		$s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() );
-		$s .= $this->submitButton();
+		if( $wgEnableHtmlDiff ) {
+			$s .= $this->submitButton( wfMsg( 'visualcomparison'),
+				array(
+						'name' => 'htmldiff',
+						'class'     => 'historysubmit',
+						'accesskey' => wfMsg( 'accesskey-visualcomparison' ),
+						'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+				)
+			);
+			$s .= $this->submitButton( wfMsg( 'wikicodecomparison'),
+				array(
+						'class'     => 'historysubmit',
+						'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+						'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+				)
+			);
+		} else {
+			$s .= $this->submitButton( wfMsg( 'compareselectedversions'),
+				array(
+						'class'     => 'historysubmit',
+						'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+						'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+				)
+			);
+		}
 		$s .= '<ul id="pagehistory">' . "\n";
 		return $s;
 	}
@@ -164,8 +219,33 @@ class PageHistory {
 	 * @return string HTML output
 	 */
 	function endHistoryList() {
+		global $wgEnableHtmlDiff;
 		$s = '</ul>';
-		$s .= $this->submitButton( array( 'id' => 'historysubmit' ) );
+		if( $wgEnableHtmlDiff ) {
+			$s .= $this->submitButton( wfMsg( 'visualcomparison'),
+				array(
+						'name' => 'htmldiff',
+						'class'     => 'historysubmit',
+						'accesskey' => wfMsg( 'accesskey-visualcomparison' ),
+						'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+				)
+			);
+			$s .= $this->submitButton( wfMsg( 'wikicodecomparison'),
+				array(
+						'class'     => 'historysubmit',
+						'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+						'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+				)
+			);
+		} else {
+			$s .= $this->submitButton( wfMsg( 'compareselectedversions'),
+				array(
+						'class'     => 'historysubmit',
+						'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+						'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+				)
+			);
+		}
 		$s .= '</form>';
 		return $s;
 	}
@@ -173,19 +253,13 @@ class PageHistory {
 	/**
 	 * Creates a submit button
 	 *
-	 * @param array $bits optional CSS ID
+	 * @param array $attributes attributes
 	 * @return string HTML output for the submit button
 	 */
-	function submitButton( $bits = array() ) {
+	function submitButton($message, $attributes = array() ) {
 		# Disable submit button if history has 1 revision only
-		if ( $this->linesonpage > 1 ) {
-			return Xml::submitButton( wfMsg( 'compareselectedversions' ),
-				$bits + array(
-					'class'     => 'historysubmit',
-					'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
-					'title'     => wfMsg( 'tooltip-compareselectedversions' ),
-					)
-				);
+		if( $this->linesonpage > 1 ) {
+			return Xml::submitButton( $message , $attributes );
 		} else {
 			return '';
 		}
@@ -209,30 +283,29 @@ class PageHistory {
 		$rev = new Revision( $row );
 		$rev->setTitle( $this->mTitle );
 
-		$s = '';
 		$curlink = $this->curLink( $rev, $latest );
 		$lastlink = $this->lastLink( $rev, $next, $counter );
 		$arbitrary = $this->diffButtons( $rev, $firstInList, $counter );
 		$link = $this->revLink( $rev );
 
-		$s .= "($curlink) ($lastlink) $arbitrary";
+		$s = "($curlink) ($lastlink) $arbitrary";
 
 		if( $wgUser->isAllowed( 'deleterevision' ) ) {
 			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 			if( $firstInList ) {
-			// We don't currently handle well changing the top revision's settings
+				// We don't currently handle well changing the top revision's settings
 				$del = $this->message['rev-delundel'];
 			} else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
+				// If revision was hidden from sysops
 				$del = $this->message['rev-delundel'];
 			} else {
 				$del = $this->mSkin->makeKnownLinkObj( $revdel,
-					$this->message['rev-delundel'],
+				$this->message['rev-delundel'],
 					'target=' . urlencode( $this->mTitle->getPrefixedDbkey() ) .
 					'&oldid=' . urlencode( $rev->getId() ) );
 				// Bolden oversighted content
 				if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) )
-					$del = "<strong>$del</strong>";
+				$del = "<strong>$del</strong>";
 			}
 			$s .= " <tt>(<small>$del</small>)</tt> ";
 		}
@@ -244,38 +317,39 @@ class PageHistory {
 			$s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
 		}
 
-		if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
+		if( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
 			$s .= ' ' . $this->mSkin->formatRevisionSize( $size );
 		}
 
 		$s .= $this->mSkin->revComment( $rev, false, true );
 
-		if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) {
+		if( $notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp) ) {
 			$s .= ' <span class="updatedmarker">' .  wfMsgHtml( 'updatedmarker' ) . '</span>';
 		}
-		#add blurb about text having been deleted
 		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
 			$s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
 		}
 
 		$tools = array();
 
-		if ( !is_null( $next ) && is_object( $next ) ) {
-			if( !$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser )
-			&& !$this->mTitle->getUserPermissionsErrors( 'edit', $wgUser )
-			&& $latest ) {
-				$tools[] = '<span class="mw-rollback-link">'
-					. $this->mSkin->buildRollbackLink( $rev )
-					. '</span>';
+		if( !is_null( $next ) && is_object( $next ) ) {
+			if( $latest && $this->mTitle->userCan( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) {
+				$tools[] = '<span class="mw-rollback-link">'.$this->mSkin->buildRollbackLink( $rev ).'</span>';
 			}
 
-			if( $this->mTitle->quickUserCan( 'edit' ) &&
-				!$rev->isDeleted( Revision::DELETED_TEXT ) &&
-				!$next->rev_deleted & Revision::DELETED_TEXT ) {
-				$undolink = $this->mSkin->makeKnownLinkObj(
+			if( $this->mTitle->quickUserCan( 'edit' ) && !$rev->isDeleted( Revision::DELETED_TEXT ) &&
+				!$next->rev_deleted & Revision::DELETED_TEXT )
+			{
+				# Create undo tooltip for the first (=latest) line only
+				$undoTooltip = $latest
+					? array( 'title' => wfMsg( 'tooltip-undo' ) )
+					: array();
+				$undolink = $this->mSkin->link(
 					$this->mTitle,
 					wfMsgHtml( 'editundo' ),
-					'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
+					$undoTooltip,
+					array( 'action' => 'edit', 'undoafter' => $next->rev_id, 'undo' => $rev->getId() ),
+					array( 'known', 'noclasses' )
 				);
 				$tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
 			}
@@ -291,16 +365,16 @@ class PageHistory {
 	}
 
 	/**
-	* Create a link to view this revision of the page
-	* @param Revision $rev
-	* @returns string
-	*/
+	 * Create a link to view this revision of the page
+	 * @param Revision $rev
+	 * @returns string
+	 */
 	function revLink( $rev ) {
 		global $wgLang;
 		$date = $wgLang->timeanddate( wfTimestamp(TS_MW, $rev->getTimestamp()), true );
 		if( $rev->userCan( Revision::DELETED_TEXT ) ) {
 			$link = $this->mSkin->makeKnownLinkObj(
-				$this->mTitle, $date, "oldid=" . $rev->getId() );
+			$this->mTitle, $date, "oldid=" . $rev->getId() );
 		} else {
 			$link = $date;
 		}
@@ -311,30 +385,28 @@ class PageHistory {
 	}
 
 	/**
-	* Create a diff-to-current link for this revision for this page
-	* @param Revision $rev
-	* @param Bool $latest, this is the latest revision of the page?
-	* @returns string
-	*/
+	 * Create a diff-to-current link for this revision for this page
+	 * @param Revision $rev
+	 * @param Bool $latest, this is the latest revision of the page?
+	 * @returns string
+	 */
 	function curLink( $rev, $latest ) {
 		$cur = $this->message['cur'];
 		if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
 			return $cur;
 		} else {
-			return $this->mSkin->makeKnownLinkObj(
-				$this->mTitle, $cur,
-				'diff=' . $this->getLatestID() .
-				"&oldid=" . $rev->getId() );
+			return $this->mSkin->makeKnownLinkObj( $this->mTitle, $cur,
+				'diff=' . $this->mTitle->getLatestRevID() . "&oldid=" . $rev->getId() );
 		}
 	}
 
 	/**
-	* Create a diff-to-previous link for this revision for this page.
-	* @param Revision $prevRev, the previous revision
-	* @param mixed $next, the newer revision
-	* @param int $counter, what row on the history list this is
-	* @returns string
-	*/
+	 * Create a diff-to-previous link for this revision for this page.
+	 * @param Revision $prevRev, the previous revision
+	 * @param mixed $next, the newer revision
+	 * @param int $counter, what row on the history list this is
+	 * @returns string
+	 */
 	function lastLink( $prevRev, $next, $counter ) {
 		$last = $this->message['last'];
 		# $next may either be a Row, null, or "unkown"
@@ -344,21 +416,13 @@ class PageHistory {
 			return $last;
 		} elseif( $next === 'unknown' ) {
 			# Next row probably exists but is unknown, use an oldid=prev link
-			return $this->mSkin->makeKnownLinkObj(
-				$this->mTitle,
-				$last,
+			return $this->mSkin->makeKnownLinkObj( $this->mTitle, $last,
 				"diff=" . $prevRev->getId() . "&oldid=prev" );
 		} elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || !$nextRev->userCan(Revision::DELETED_TEXT) ) {
 			return $last;
 		} else {
-			return $this->mSkin->makeKnownLinkObj(
-				$this->mTitle,
-				$last,
-				"diff=" . $prevRev->getId() . "&oldid={$next->rev_id}"
-				/*,
-				'',
-				'',
-				"tabindex={$counter}"*/ );
+			return $this->mSkin->makeKnownLinkObj( $this->mTitle, $last,
+				"diff=" . $prevRev->getId() . "&oldid={$next->rev_id}" );
 		}
 	}
 
@@ -382,10 +446,10 @@ class PageHistory {
 			}
 
 			/** @todo: move title texts to javascript */
-			if ( $firstInList ) {
+			if( $firstInList ) {
 				$first = Xml::element( 'input', array_merge(
-					$radio,
-					array(
+				$radio,
+				array(
 						'style' => 'visibility:hidden',
 						'name'  => 'oldid' ) ) );
 				$checkmark = array( 'checked' => 'checked' );
@@ -396,34 +460,21 @@ class PageHistory {
 					$checkmark = array();
 				}
 				$first = Xml::element( 'input', array_merge(
-					$radio,
-					$checkmark,
-					array( 'name'  => 'oldid' ) ) );
+				$radio,
+				$checkmark,
+				array( 'name'  => 'oldid' ) ) );
 				$checkmark = array();
 			}
 			$second = Xml::element( 'input', array_merge(
-				$radio,
-				$checkmark,
-				array( 'name'  => 'diff' ) ) );
+			$radio,
+			$checkmark,
+			array( 'name'  => 'diff' ) ) );
 			return $first . $second;
 		} else {
 			return '';
 		}
 	}
 
-	/** @todo document */
-	function getLatestId() {
-		if( is_null( $this->mLatestId ) ) {
-			$id = $this->mTitle->getArticleID();
-			$db = wfGetDB( DB_SLAVE );
-			$this->mLatestId = $db->selectField( 'page',
-				"page_latest",
-				array( 'page_id' => $id ),
-				__METHOD__ );
-		}
-		return $this->mLatestId;
-	}
-
 	/**
 	 * Fetch an array of revisions, specified by a given limit, offset and
 	 * direction. This is now only used by the feeds. It was previously
@@ -432,61 +483,25 @@ class PageHistory {
 	function fetchRevisions($limit, $offset, $direction) {
 		$dbr = wfGetDB( DB_SLAVE );
 
-		if ($direction == PageHistory::DIR_PREV)
+		if( $direction == PageHistory::DIR_PREV )
 			list($dirs, $oper) = array("ASC", ">=");
 		else /* $direction == PageHistory::DIR_NEXT */
 			list($dirs, $oper) = array("DESC", "<=");
 
-		if ($offset)
+		if( $offset )
 			$offsets = array("rev_timestamp $oper '$offset'");
 		else
 			$offsets = array();
 
 		$page_id = $this->mTitle->getArticleID();
 
-		$res = $dbr->select(
-			'revision',
+		return $dbr->select( 'revision',
 			Revision::selectFields(),
 			array_merge(array("rev_page=$page_id"), $offsets),
 			__METHOD__,
-			array('ORDER BY' => "rev_timestamp $dirs",
+			array( 'ORDER BY' => "rev_timestamp $dirs", 
 				'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit)
-			);
-
-		$result = array();
-		while (($obj = $dbr->fetchObject($res)) != NULL)
-			$result[] = $obj;
-
-		return $result;
-	}
-
-	/** @todo document */
-	function getNotificationTimestamp() {
-		global $wgUser, $wgShowUpdatedMarker;
-
-		if ($this->mNotificationTimestamp !== NULL)
-			return $this->mNotificationTimestamp;
-
-		if ($wgUser->isAnon() || !$wgShowUpdatedMarker)
-			return $this->mNotificationTimestamp = false;
-
-		$dbr = wfGetDB(DB_SLAVE);
-
-		$this->mNotificationTimestamp = $dbr->selectField(
-			'watchlist',
-			'wl_notificationtimestamp',
-			array(	'wl_namespace' => $this->mTitle->getNamespace(),
-				'wl_title' => $this->mTitle->getDBkey(),
-				'wl_user' => $wgUser->getId()
-			),
-			__METHOD__ );
-
-		// Don't use the special value reserved for telling whether the field is filled
-		if ( is_null( $this->mNotificationTimestamp ) ) {
-			$this->mNotificationTimestamp = false;
-		}
-
-		return $this->mNotificationTimestamp;
+		);
 	}
 
 	/**
@@ -495,15 +510,15 @@ class PageHistory {
 	 */
 	function feed( $type ) {
 		global $wgFeedClasses, $wgRequest, $wgFeedLimit;
-		if ( !FeedUtils::checkFeedOutput($type) ) {
+		if( !FeedUtils::checkFeedOutput($type) ) {
 			return;
 		}
 
 		$feed = new $wgFeedClasses[$type](
-			$this->mTitle->getPrefixedText() . ' - ' .
-				wfMsgForContent( 'history-feed-title' ),
-			wfMsgForContent( 'history-feed-description' ),
-			$this->mTitle->getFullUrl( 'action=history' ) );
+		$this->mTitle->getPrefixedText() . ' - ' .
+		wfMsgForContent( 'history-feed-title' ),
+		wfMsgForContent( 'history-feed-description' ),
+		$this->mTitle->getFullUrl( 'action=history' ) );
 
 		// Get a limit on number of feed entries. Provide a sane default
 		// of 10 if none is defined (but limit to $wgFeedLimit max)
@@ -511,7 +526,7 @@ class PageHistory {
 		if( $limit > $wgFeedLimit || $limit < 1 ) {
 			$limit = 10;
 		}
- 		$items = $this->fetchRevisions($limit, 0, PageHistory::DIR_NEXT);
+		$items = $this->fetchRevisions($limit, 0, PageHistory::DIR_NEXT);
 
 		$feed->outHeader();
 		if( $items ) {
@@ -531,7 +546,7 @@ class PageHistory {
 			$wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ),
 			$this->mTitle->getFullUrl(),
 			wfTimestamp( TS_MW ),
-			'',
+				'',
 			$this->mTitle->getTalkPage()->getFullUrl() );
 	}
 
@@ -547,18 +562,18 @@ class PageHistory {
 		$rev = new Revision( $row );
 		$rev->setTitle( $this->mTitle );
 		$text = FeedUtils::formatDiffRow( $this->mTitle,
-			$this->mTitle->getPreviousRevisionID( $rev->getId() ),
-			$rev->getId(),
-			$rev->getTimestamp(),
-			$rev->getComment() );
+		$this->mTitle->getPreviousRevisionID( $rev->getId() ),
+		$rev->getId(),
+		$rev->getTimestamp(),
+		$rev->getComment() );
 
 		if( $rev->getComment() == '' ) {
 			global $wgContLang;
 			$title = wfMsgForContent( 'history-feed-item-nocomment',
-				$rev->getUserText(),
-				$wgContLang->timeanddate( $rev->getTimestamp() ) );
+			$rev->getUserText(),
+			$wgContLang->timeanddate( $rev->getTimestamp() ) );
 		} else {
-			$title = $rev->getUserText() . ": " . $this->stripComment( $rev->getComment() );
+			$title = $rev->getUserText() . ": " . FeedItem::stripComment( $rev->getComment() );
 		}
 
 		return new FeedItem(
@@ -569,13 +584,6 @@ class PageHistory {
 			$rev->getUserText(),
 			$this->mTitle->getTalkPage()->getFullUrl() );
 	}
-
-	/**
-	 * Quickie hack... strip out wikilinks to more legible form from the comment.
-	 */
-	function stripComment( $text ) {
-		return preg_replace( '/\[\[([^]]*\|)?([^]]+)\]\]/', '\2', $text );
-	}
 }
 
 
@@ -583,11 +591,13 @@ class PageHistory {
  * @ingroup Pager
  */
 class PageHistoryPager extends ReverseChronologicalPager {
-	public $mLastRow = false, $mPageHistory;
+	public $mLastRow = false, $mPageHistory, $mTitle;
 
-	function __construct( $pageHistory ) {
+	function __construct( $pageHistory, $year='', $month='' ) {
 		parent::__construct();
 		$this->mPageHistory = $pageHistory;
+		$this->mTitle =& $this->mPageHistory->mTitle;
+		$this->getDateCond( $year, $month );
 	}
 
 	function getQueryInfo() {
@@ -606,11 +616,11 @@ class PageHistoryPager extends ReverseChronologicalPager {
 	}
 
 	function formatRow( $row ) {
-		if ( $this->mLastRow ) {
+		if( $this->mLastRow ) {
 			$latest = $this->mCounter == 1 && $this->mIsFirst;
 			$firstInList = $this->mCounter == 1;
 			$s = $this->mPageHistory->historyLine( $this->mLastRow, $row, $this->mCounter++,
-				$this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+				$this->mTitle->getNotificationTimestamp(), $latest, $firstInList );
 		} else {
 			$s = '';
 		}
@@ -625,12 +635,12 @@ class PageHistoryPager extends ReverseChronologicalPager {
 	}
 
 	function getEndBody() {
-		if ( $this->mLastRow ) {
+		if( $this->mLastRow ) {
 			$latest = $this->mCounter == 1 && $this->mIsFirst;
 			$firstInList = $this->mCounter == 1;
-			if ( $this->mIsBackwards ) {
+			if( $this->mIsBackwards ) {
 				# Next row is unknown, but for UI reasons, probably exists if an offset has been specified
-				if ( $this->mOffset == '' ) {
+				if( $this->mOffset == '' ) {
 					$next = null;
 				} else {
 					$next = 'unknown';
@@ -640,7 +650,7 @@ class PageHistoryPager extends ReverseChronologicalPager {
 				$next = $this->mPastTheEndRow;
 			}
 			$s = $this->mPageHistory->historyLine( $this->mLastRow, $next, $this->mCounter++,
-				$this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+				$this->mTitle->getNotificationTimestamp(), $latest, $firstInList );
 		} else {
 			$s = '';
 		}
diff --git a/includes/PageQueryPage.php b/includes/PageQueryPage.php
index 0d1789ee..a2091e8b 100644
--- a/includes/PageQueryPage.php
+++ b/includes/PageQueryPage.php
@@ -17,7 +17,9 @@ class PageQueryPage extends QueryPage {
 	public function formatResult( $skin, $row ) {
 		global $wgContLang;
 		$title = Title::makeTitleSafe( $row->namespace, $row->title );
-		return $skin->makeKnownLinkObj( $title,
-			htmlspecialchars( $wgContLang->convert( $title->getPrefixedText() ) ) );
+		$text = $row->title;
+		if ($title instanceof Title)
+			$text = $wgContLang->convert( $title->getPrefixedText() ); 
+		return $skin->link( $title, htmlspecialchars($text), array(), array(), array('known', 'noclasses') );
 	}
 }
diff --git a/includes/Pager.php b/includes/Pager.php
index 62c4e551..8ec32ff4 100644
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -154,6 +154,26 @@ abstract class IndexPager implements Pager {
 
 		wfProfileOut( $fname );
 	}
+	
+	/**
+	 * Return the result wrapper.
+	 */
+	function getResult() {
+		return $this->mResult;
+	}
+	
+	/**
+	 * Set the offset from an other source than $wgRequest
+	 */
+	function setOffset( $offset ) {
+		$this->mOffset = $offset;
+	}
+	/**
+	 * Set the limit from an other source than $wgRequest
+	 */
+	function setLimit( $limit ) {
+		$this->mLimit = $limit;
+	}
 
 	/**
 	 * Extract some useful data from the result object for use by
@@ -292,9 +312,12 @@ abstract class IndexPager implements Pager {
 			# HTML 4 has no rel="end" . . .
 			$attrs = '';
 		}
+
+		if( $type ) {
+			$attrs .= " class=\"mw-{$type}link\"" ;
+		}
 		return $this->getSkin()->makeKnownLinkObj( $this->getTitle(), $text,
-				wfArrayToCGI( $query, $this->getDefaultQuery() ), '', '',
-				$attrs );
+			wfArrayToCGI( $query, $this->getDefaultQuery() ), '', '', $attrs );
 	}
 
 	/**
@@ -352,6 +375,8 @@ abstract class IndexPager implements Pager {
 			unset( $this->mDefaultQuery['offset'] );
 			unset( $this->mDefaultQuery['limit'] );
 			unset( $this->mDefaultQuery['order'] );
+			unset( $this->mDefaultQuery['month'] );
+			unset( $this->mDefaultQuery['year'] );
 		}
 		return $this->mDefaultQuery;
 	}
@@ -425,7 +450,7 @@ abstract class IndexPager implements Pager {
 		}
 		foreach ( $this->mLimitsShown as $limit ) {
 			$links[] = $this->makeLink( $wgLang->formatNum( $limit ),
-				array( 'offset' => $offset, 'limit' => $limit ) );
+				array( 'offset' => $offset, 'limit' => $limit ), 'num' );
 		}
 		return $links;
 	}
@@ -564,6 +589,8 @@ abstract class AlphabeticPager extends IndexPager {
  */
 abstract class ReverseChronologicalPager extends IndexPager {
 	public $mDefaultDirection = true;
+	public $mYear;
+	public $mMonth;
 
 	function __construct() {
 		parent::__construct();
@@ -591,6 +618,53 @@ abstract class ReverseChronologicalPager extends IndexPager {
 			wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits);
 		return $this->mNavigationBar;
 	}
+	
+	function getDateCond( $year, $month ) {
+		$year = intval($year);
+		$month = intval($month);
+		// Basic validity checks
+		$this->mYear = $year > 0 ? $year : false;
+		$this->mMonth = ($month > 0 && $month < 13) ? $month : false;
+		// Given an optional year and month, we need to generate a timestamp
+		// to use as "WHERE rev_timestamp <= result"
+		// Examples: year = 2006 equals < 20070101 (+000000)
+		// year=2005, month=1    equals < 20050201
+		// year=2005, month=12   equals < 20060101
+		if ( !$this->mYear && !$this->mMonth ) {
+			return;
+		}
+		if ( $this->mYear ) {
+			$year = $this->mYear;
+		} else {
+			// If no year given, assume the current one
+			$year = gmdate( 'Y' );
+			// If this month hasn't happened yet this year, go back to last year's month
+			if( $this->mMonth > gmdate( 'n' ) ) {
+				$year--;
+			}
+		}
+		if ( $this->mMonth ) {
+			$month = $this->mMonth + 1;
+			// For December, we want January 1 of the next year
+			if ($month > 12) {
+				$month = 1;
+				$year++;
+			}
+		} else {
+			// No month implies we want up to the end of the year in question
+			$month = 1;
+			$year++;
+		}
+		// Y2K38 bug
+		if ( $year > 2032 ) {
+			$year = 2032;
+		}
+		$ymd = (int)sprintf( "%04d%02d01", $year, $month );
+		if ( $ymd > 20320101 ) {
+			$ymd = 20320101;
+		}
+		$this->mOffset = $this->mDb->timestamp( "${ymd}000000" );
+	}
 }
 
 /**
@@ -795,7 +869,7 @@ abstract class TablePager extends IndexPager {
 			"<form method=\"get\" action=\"$url\">" .
 			wfMsgHtml( 'table_pager_limit', $this->getLimitSelect() ) .
 			"\n<input type=\"submit\" value=\"$msgSubmit\"/>\n" .
-			$this->getHiddenFields( 'limit' ) .
+			$this->getHiddenFields( array('limit','title') ) .
 			"</form>\n";
 	}
 
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index a3ff05e2..af569112 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * PrefixSearch - Handles searching prefixes of titles and finding any page
+ * names that match. Used largely by the OpenSearch implementation.
+ * 
+ * @ingroup Search
+ */
+
 class PrefixSearch {
 	/**
 	 * Do a prefix search of titles and return a list of matching page names.
@@ -48,7 +55,7 @@ class PrefixSearch {
 		if( count($namespaces) == 1 ){
 			$ns = $namespaces[0];
 			if( $ns == NS_MEDIA ) {
-				$namespaces = array(NS_IMAGE);
+				$namespaces = array(NS_FILE);
 			} elseif( $ns == NS_SPECIAL ) {
 				return self::specialSearch( $search, $limit );
 			}
@@ -96,7 +103,9 @@ class PrefixSearch {
 
 	/**
 	 * Unless overridden by PrefixSearchBackend hook...
-	 * This is case-sensitive except the first letter (per $wgCapitalLinks)
+	 * This is case-sensitive (First character may
+	 * be automatically capitalized by Title::secureAndSpit()
+	 * later on depending on $wgCapitalLinks)
 	 *
 	 * @param array $namespaces Namespaces to search in
 	 * @param string $search term
@@ -104,12 +113,6 @@ class PrefixSearch {
 	 * @return array of title strings
 	 */
 	protected static function defaultSearchBackend( $namespaces, $search, $limit ) {
-		global $wgCapitalLinks, $wgContLang;
-
-		if( $wgCapitalLinks ) {
-			$search = $wgContLang->ucfirst( $search );
-		}
-
 		$ns = array_shift($namespaces); // support only one namespace
 		if( in_array(NS_MAIN,$namespaces))
 			$ns = NS_MAIN; // if searching on many always default to main 
diff --git a/includes/Profiler.php b/includes/Profiler.php
index cef89dd3..ffb48978 100644
--- a/includes/Profiler.php
+++ b/includes/Profiler.php
@@ -355,8 +355,7 @@ class Profiler {
 		# Do not log anything if database is readonly (bug 5375)
 		if( wfReadOnly() ) { return; }
 
-		# Warning: $wguname is a live patch, it should be moved to Setup.php
-		global $wguname, $wgProfilePerHost;
+		global $wgProfilePerHost;
 
 		$dbw = wfGetDB( DB_MASTER );
 		if( !is_object( $dbw ) )
@@ -366,7 +365,7 @@ class Profiler {
 		$name = substr($name, 0, 255);
 
 		if( $wgProfilePerHost ){
-			$pfhost = $wguname['nodename'];
+			$pfhost = wfHostname();
 		} else {
 			$pfhost = '';
 		}
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index e7787822..372edfcd 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -20,79 +20,146 @@
  */
 
 /**
- * @todo document, briefly.
+ * Handles the page protection UI and backend
  */
 class ProtectionForm {
+	/** A map of action to restriction level, from request or default */
 	var $mRestrictions = array();
+
+	/** The custom/additional protection reason */
 	var $mReason = '';
+
+	/** The reason selected from the list, blank for other/additional */
+	var $mReasonSelection = '';
+
+	/** True if the restrictions are cascading, from request or existing protection */
 	var $mCascade = false;
-	var $mExpiry = null;
+
+	/** Map of action to "other" expiry time. Used in preference to mExpirySelection. */
+	var $mExpiry = array();
+
+	/** 
+	 * Map of action to value selected in expiry drop-down list. 
+	 * Will be set to 'othertime' whenever mExpiry is set. 
+	 */
+	var $mExpirySelection = array();
+
+	/** Permissions errors for the protect action */
 	var $mPermErrors = array();
+
+	/** Types (i.e. actions) for which levels can be selected */
 	var $mApplicableTypes = array();
 
-	function __construct( &$article ) {
+	/** Map of action to the expiry time of the existing protection */
+	var $mExistingExpiry = array();
+
+	function __construct( Article $article ) {
 		global $wgRequest, $wgUser;
 		global $wgRestrictionTypes, $wgRestrictionLevels;
-		$this->mArticle =& $article;
-		$this->mTitle =& $article->mTitle;
+		$this->mArticle = $article;
+		$this->mTitle = $article->mTitle;
 		$this->mApplicableTypes = $this->mTitle->exists() ? $wgRestrictionTypes : array('create');
 
-		if( $this->mTitle ) {
-			$this->mTitle->loadRestrictions();
+		$this->mCascade = $this->mTitle->areRestrictionsCascading();
 
-			foreach( $this->mApplicableTypes as $action ) {
-				// Fixme: this form currently requires individual selections,
-				// but the db allows multiples separated by commas.
-				$this->mRestrictions[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
-			}
+		// The form will be available in read-only to show levels.
+		$this->mPermErrors = $this->mTitle->getUserPermissionsErrors('protect',$wgUser);
+		$this->disabled = wfReadOnly() || $this->mPermErrors != array();
+		$this->disabledAttrib = $this->disabled
+			? array( 'disabled' => 'disabled' )
+			: array();
+
+		$this->mReason = $wgRequest->getText( 'mwProtect-reason' );
+		$this->mReasonSelection = $wgRequest->getText( 'wpProtectReasonSelection' );
+		$this->mCascade = $wgRequest->getBool( 'mwProtect-cascade', $this->mCascade );
 
-			$this->mCascade = $this->mTitle->areRestrictionsCascading();
+		foreach( $this->mApplicableTypes as $action ) {
+			// Fixme: this form currently requires individual selections,
+			// but the db allows multiples separated by commas.
+			$this->mRestrictions[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
 
-			if ( $this->mTitle->mRestrictionsExpiry == 'infinity' ) {
-				$this->mExpiry = 'infinite';
-			} else if ( strlen($this->mTitle->mRestrictionsExpiry) == 0 ) {
-				$this->mExpiry = '';
+			if ( !$this->mRestrictions[$action] ) {
+				// No existing expiry
+				$existingExpiry = '';
 			} else {
-				// FIXME: this format is not user friendly
-				$this->mExpiry = wfTimestamp( TS_ISO_8601, $this->mTitle->mRestrictionsExpiry );
+				$existingExpiry = $this->mTitle->getRestrictionExpiry( $action );
+			}
+			$this->mExistingExpiry[$action] = $existingExpiry;
+
+			$requestExpiry = $wgRequest->getText( "mwProtect-expiry-$action" );
+			$requestExpirySelection = $wgRequest->getVal( "wpProtectExpirySelection-$action" );
+
+			if ( $requestExpiry ) {
+				// Custom expiry takes precedence
+				$this->mExpiry[$action] = $requestExpiry;
+				$this->mExpirySelection[$action] = 'othertime';
+			} elseif ( $requestExpirySelection ) {
+				// Expiry selected from list
+				$this->mExpiry[$action] = '';
+				$this->mExpirySelection[$action] = $requestExpirySelection;
+			} elseif ( $existingExpiry == 'infinity' ) {
+				// Existing expiry is infinite, use "infinite" in drop-down
+				$this->mExpiry[$action] = '';
+				$this->mExpirySelection[$action] = 'infinite';
+			} elseif ( $existingExpiry ) {
+				// Use existing expiry in its own list item
+				$this->mExpiry[$action] = '';
+				$this->mExpirySelection[$action] = $existingExpiry;
+			} else {
+				// Final default: infinite
+				$this->mExpiry[$action] = '';
+				$this->mExpirySelection[$action] = 'infinite';
+			}
+
+			$val = $wgRequest->getVal( "mwProtect-level-$action" );
+			if( isset( $val ) && in_array( $val, $wgRestrictionLevels ) ) {
+				// Prevent users from setting levels that they cannot later unset
+				if( $val == 'sysop' ) {
+					// Special case, rewrite sysop to either protect and editprotected
+					if( !$wgUser->isAllowed('protect') && !$wgUser->isAllowed('editprotected') )
+						continue;
+				} else {
+					if( !$wgUser->isAllowed($val) )
+						continue;
+				}
+				$this->mRestrictions[$action] = $val;
 			}
 		}
+	}
 
-		// The form will be available in read-only to show levels.
-		$this->disabled = wfReadOnly() || ($this->mPermErrors = $this->mTitle->getUserPermissionsErrors('protect',$wgUser)) != array();
-		$this->disabledAttrib = $this->disabled
-			? array( 'disabled' => 'disabled' )
-			: array();
+	/** 
+	 * Get the expiry time for a given action, by combining the relevant inputs.
+	 * Returns a 14-char timestamp or "infinity", or false if the input was invalid
+	 */
+	function getExpiry( $action ) {
+		if ( $this->mExpirySelection[$action] == 'existing' ) {
+			return $this->mExistingExpiry[$action];
+		} elseif ( $this->mExpirySelection[$action] == 'othertime' ) {
+			$value = $this->mExpiry[$action];
+		} else {
+			$value = $this->mExpirySelection[$action];
+		}
+		if ( $value == 'infinite' || $value == 'indefinite' || $value == 'infinity' ) {
+			$time = Block::infinity();
+		} else {
+			$unix = strtotime( $value );
 
-		if( $wgRequest->wasPosted() ) {
-			$this->mReason = $wgRequest->getText( 'mwProtect-reason' );
-			$this->mCascade = $wgRequest->getBool( 'mwProtect-cascade' );
-			$this->mExpiry = $wgRequest->getText( 'mwProtect-expiry' );
-
-			foreach( $this->mApplicableTypes as $action ) {
-				$val = $wgRequest->getVal( "mwProtect-level-$action" );
-				if( isset( $val ) && in_array( $val, $wgRestrictionLevels ) ) {
-					//prevent users from setting levels that they cannot later unset
-					if( $val == 'sysop' ) {
-						//special case, rewrite sysop to either protect and editprotected
-						if( !$wgUser->isAllowed('protect') && !$wgUser->isAllowed('editprotected') )
-							continue;
-					} else {
-						if( !$wgUser->isAllowed($val) )
-							continue;
-					}
-					$this->mRestrictions[$action] = $val;
-				}
+			if ( !$unix || $unix === -1 ) {
+				return false;
 			}
+
+			// Fixme: non-qualified absolute times are not in users specified timezone
+			// and there isn't notice about it in the ui
+			$time = wfTimestamp( TS_MW, $unix );
 		}
+		return $time;
 	}
 
 	function execute() {
 		global $wgRequest, $wgOut;
 		if( $wgRequest->wasPosted() ) {
 			if( $this->save() ) {
-				$article = new Article( $this->mTitle );
-				$q = $article->isRedirect() ? 'redirect=no' : '';
+				$q = $this->mArticle->isRedirect() ? 'redirect=no' : '';
 				$wgOut->redirect( $this->mTitle->getFullUrl( $q ) );
 			}
 		} else {
@@ -103,7 +170,7 @@ class ProtectionForm {
 	function show( $err = null ) {
 		global $wgOut, $wgUser;
 
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 		if( is_null( $this->mTitle ) ||
 			$this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
@@ -152,42 +219,39 @@ class ProtectionForm {
 
 	function save() {
 		global $wgRequest, $wgUser, $wgOut;
-
-		if( $this->disabled ) {
+		# Permission check!
+		if ( $this->disabled ) {
 			$this->show();
 			return false;
 		}
 
 		$token = $wgRequest->getVal( 'wpEditToken' );
-		if( !$wgUser->matchEditToken( $token ) ) {
+		if ( !$wgUser->matchEditToken( $token ) ) {
 			$this->show( wfMsg( 'sessionfailure' ) );
 			return false;
 		}
-
-		if ( strlen( $this->mExpiry ) == 0 ) {
-			$this->mExpiry = 'infinite';
+		
+		# Create reason string. Use list and/or custom string.
+		$reasonstr = $this->mReasonSelection;
+		if ( $reasonstr != 'other' && $this->mReason != '' ) {
+			// Entry from drop down menu + additional comment
+			$reasonstr .= ': ' . $this->mReason;
+		} elseif ( $reasonstr == 'other' ) {
+			$reasonstr = $this->mReason;
 		}
-
-		if ( $this->mExpiry == 'infinite' || $this->mExpiry == 'indefinite' ) {
-			$expiry = Block::infinity();
-		} else {
-			# Convert GNU-style date, on error returns -1 for PHP <5.1 and false for PHP >=5.1
-			$expiry = strtotime( $this->mExpiry );
-
-			if ( $expiry < 0 || $expiry === false ) {
+		$expiry = array();
+		foreach( $this->mApplicableTypes as $action ) {
+			$expiry[$action] = $this->getExpiry( $action );
+			if( empty($this->mRestrictions[$action]) )
+				continue; // unprotected
+			if ( !$expiry[$action] ) {
 				$this->show( wfMsg( 'protect_expiry_invalid' ) );
 				return false;
 			}
-
-			// Fixme: non-qualified absolute times are not in users specified timezone
-			// and there isn't notice about it in the ui
-			$expiry = wfTimestamp( TS_MW, $expiry );
-
-			if ( $expiry < wfTimestampNow() ) {
+			if ( $expiry[$action] < wfTimestampNow() ) {
 				$this->show( wfMsg( 'protect_expiry_old' ) );
 				return false;
 			}
-
 		}
 
 		# They shouldn't be able to do this anyway, but just to make sure, ensure that cascading restrictions aren't being applied
@@ -195,15 +259,15 @@ class ProtectionForm {
 		global $wgGroupPermissions;
 
 		$edit_restriction = $this->mRestrictions['edit'];
-
+		$this->mCascade = $wgRequest->getBool( 'mwProtect-cascade' );
 		if ($this->mCascade && ($edit_restriction != 'protect') &&
 			!(isset($wgGroupPermissions[$edit_restriction]['protect']) && $wgGroupPermissions[$edit_restriction]['protect'] ) )
 			$this->mCascade = false;
 
 		if ($this->mTitle->exists()) {
-			$ok = $this->mArticle->updateRestrictions( $this->mRestrictions, $this->mReason, $this->mCascade, $expiry );
+			$ok = $this->mArticle->updateRestrictions( $this->mRestrictions, $reasonstr, $this->mCascade, $expiry );
 		} else {
-			$ok = $this->mTitle->updateTitleProtection( $this->mRestrictions['create'], $this->mReason, $expiry );
+			$ok = $this->mTitle->updateTitleProtection( $this->mRestrictions['create'], $reasonstr, $expiry['create'] );
 		}
 
 		if( !$ok ) {
@@ -215,7 +279,6 @@ class ProtectionForm {
 		} elseif( $this->mTitle->userIsWatching() ) {
 			$this->mArticle->doUnwatch();
 		}
-
 		return $ok;
 	}
 
@@ -225,73 +288,143 @@ class ProtectionForm {
 	 * @return $out string HTML form
 	 */
 	function buildForm() {
-		global $wgUser;
+		global $wgUser, $wgLang;
+
+		$mProtectreasonother = Xml::label( wfMsg( 'protectcomment' ), 'wpProtectReasonSelection' );
+		$mProtectreason = Xml::label( wfMsg( 'protect-otherreason' ), 'mwProtect-reason' );
 
 		$out = '';
 		if( !$this->disabled ) {
 			$out .= $this->buildScript();
-			// The submission needs to reenable the move permission selector
-			// if it's in locked mode, or some browsers won't submit the data.
-			$out .=	Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->mTitle->getLocalUrl( 'action=protect' ), 'id' => 'mw-Protect-Form', 'onsubmit' => 'protectEnable(true)' ) ) .
-				Xml::hidden( 'wpEditToken',$wgUser->editToken() );
+			$out .= Xml::openElement( 'form', array( 'method' => 'post', 
+				'action' => $this->mTitle->getLocalUrl( 'action=protect' ), 
+				'id' => 'mw-Protect-Form', 'onsubmit' => 'ProtectionForm.enableUnchainedInputs(true)' ) );
+			$out .= Xml::hidden( 'wpEditToken',$wgUser->editToken() );
 		}
 
 		$out .= Xml::openElement( 'fieldset' ) .
 			Xml::element( 'legend', null, wfMsg( 'protect-legend' ) ) .
 			Xml::openElement( 'table', array( 'id' => 'mwProtectSet' ) ) .
-			Xml::openElement( 'tbody' ) .
-			"<tr>\n";
+			Xml::openElement( 'tbody' );
 
-		foreach( $this->mRestrictions as $action => $required ) {
-			/* Not all languages have V_x <-> N_x relation */
-			$label = Xml::element( 'label',
-					array( 'for' => "mwProtect-level-$action" ),
-					wfMsg( 'restriction-' . $action ) );
-			$out .= "<th>$label</th>";
-		}
-		$out .= "</tr>
-			<tr>\n";
 		foreach( $this->mRestrictions as $action => $selected ) {
-			$out .= "<td>" .
-					$this->buildSelector( $action, $selected ) .
-				"</td>";
+			/* Not all languages have V_x <-> N_x relation */
+			$msg = wfMsg( 'restriction-' . $action );
+			if( wfEmptyMsg( 'restriction-' . $action, $msg ) ) {
+				$msg = $action;
+			}
+			$out .= "<tr><td>".
+			Xml::openElement( 'fieldset' ) .
+			Xml::element( 'legend', null, $msg ) .
+			Xml::openElement( 'table', array( 'id' => "mw-protect-table-$action" ) ) .
+				"<tr><td>" . $this->buildSelector( $action, $selected ) . "</td></tr><tr><td>";
+
+			$reasonDropDown = Xml::listDropDown( 'wpProtectReasonSelection',
+				wfMsgForContent( 'protect-dropdown' ),
+				wfMsgForContent( 'protect-otherreason-op' ), 
+				$this->mReasonSelection,
+				'mwProtect-reason', 4 );
+			$scExpiryOptions = wfMsgForContent( 'protect-expiry-options' );
+
+			$showProtectOptions = ($scExpiryOptions !== '-' && !$this->disabled);
+
+			$mProtectexpiry = Xml::label( wfMsg( 'protectexpiry' ), "mwProtectExpirySelection-$action" );
+			$mProtectother = Xml::label( wfMsg( 'protect-othertime' ), "mwProtect-$action-expires" );
+
+			$expiryFormOptions = '';
+			if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) {
+				$timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action] );
+				$d = $wgLang->date( $this->mExistingExpiry[$action] );
+				$t = $wgLang->time( $this->mExistingExpiry[$action] );
+				$expiryFormOptions .= 
+					Xml::option( 
+						wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ),
+						'existing',
+						$this->mExpirySelection[$action] == 'existing'
+					) . "\n";
+			}
+			
+			$expiryFormOptions .= Xml::option( wfMsg( 'protect-othertime-op' ), "othertime" ) . "\n";
+			foreach( explode(',', $scExpiryOptions) as $option ) {
+				if ( strpos($option, ":") === false ) {
+					$show = $value = $option;
+				} else {
+					list($show, $value) = explode(":", $option);
+				}
+				$show = htmlspecialchars($show);
+				$value = htmlspecialchars($value);
+				$expiryFormOptions .= Xml::option( $show, $value, $this->mExpirySelection[$action] === $value ) . "\n";
+			}
+			# Add expiry dropdown
+			if( $showProtectOptions && !$this->disabled ) {
+				$out .= "
+					<table><tr>
+						<td class='mw-label'>
+							{$mProtectexpiry}
+						</td>
+						<td class='mw-input'>" .
+							Xml::tags( 'select',
+								array(
+									'id' => "mwProtectExpirySelection-$action",
+									'name' => "wpProtectExpirySelection-$action",
+									'onchange' => "ProtectionForm.updateExpiryList(this)",
+									'tabindex' => '2' ) + $this->disabledAttrib,
+								$expiryFormOptions ) .
+						"</td>
+					</tr></table>";
+			}
+			# Add custom expiry field
+			$attribs = array( 'id' => "mwProtect-$action-expires", 'onkeyup' => 'ProtectionForm.updateExpiry(this)' ) + $this->disabledAttrib;
+			$out .= "<table><tr>
+					<td class='mw-label'>" .
+						$mProtectother .
+					'</td>
+					<td class="mw-input">' .
+						Xml::input( "mwProtect-expiry-$action", 50, $this->mExpiry[$action], $attribs ) .
+					'</td>
+				</tr></table>';
+			$out .= "</td></tr>" .
+			Xml::closeElement( 'table' ) .
+			Xml::closeElement( 'fieldset' ) .
+			"</td></tr>";
 		}
-		$out .= "</tr>\n";
-
-		// JavaScript will add another row with a value-chaining checkbox
 
-		$out .= Xml::closeElement( 'tbody' ) .
-			Xml::closeElement( 'table' ) .
-			Xml::openElement( 'table', array( 'id' => 'mw-protect-table2' ) ) .
-			Xml::openElement( 'tbody' );
+		$out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
 
+		// JavaScript will add another row with a value-chaining checkbox
 		if( $this->mTitle->exists() ) {
+			$out .= Xml::openElement( 'table', array( 'id' => 'mw-protect-table2' ) ) .
+				Xml::openElement( 'tbody' );
 			$out .= '<tr>
 					<td></td>
 					<td class="mw-input">' .
-						Xml::checkLabel( wfMsg( 'protect-cascade' ), 'mwProtect-cascade', 'mwProtect-cascade', $this->mCascade, $this->disabledAttrib ) .
+						Xml::checkLabel( wfMsg( 'protect-cascade' ), 'mwProtect-cascade', 'mwProtect-cascade', 
+							$this->mCascade, $this->disabledAttrib ) .
 					"</td>
 				</tr>\n";
+			$out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
 		}
-
-		$attribs = array( 'id' => 'expires' ) + $this->disabledAttrib;
-		$out .= "<tr>
-				<td class='mw-label'>" .
-					Xml::label( wfMsgExt( 'protectexpiry', array( 'parseinline' ) ), 'expires' ) .
-				'</td>
-				<td class="mw-input">' .
-					Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) .
-				'</td>
-			</tr>';
-
+		
+		# Add manual and custom reason field/selects as well as submit
 		if( !$this->disabled ) {
-			$id = 'mwProtect-reason';
-			$out .= "<tr>
-					<td class='mw-label'>" .
-						Xml::label( wfMsg( 'protectcomment' ), $id ) .
-					'</td>
-					<td class="mw-input">' .
-						Xml::input( $id, 60, $this->mReason, array( 'type' => 'text', 'id' => $id, 'maxlength' => 255 ) ) .
+			$out .=  Xml::openElement( 'table', array( 'id' => 'mw-protect-table3' ) ) .
+				Xml::openElement( 'tbody' );
+			$out .= "
+				<tr>
+					<td class='mw-label'>
+						{$mProtectreasonother}
+					</td>
+					<td class='mw-input'>
+						{$reasonDropDown}
+					</td>
+				</tr>
+				<tr>
+					<td class='mw-label'>
+						{$mProtectreason}
+					</td>
+					<td class='mw-input'>" .
+						Xml::input( 'mwProtect-reason', 60, $this->mReason, array( 'type' => 'text', 
+							'id' => 'mwProtect-reason', 'maxlength' => 255 ) ) .
 					"</td>
 				</tr>
 				<tr>
@@ -308,11 +441,15 @@ class ProtectionForm {
 						Xml::submitButton( wfMsg( 'confirm' ), array( 'id' => 'mw-Protect-submit' ) ) .
 					"</td>
 				</tr>\n";
+			$out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
 		}
+		$out .= Xml::closeElement( 'fieldset' );
 
-		$out .= Xml::closeElement( 'tbody' ) .
-			Xml::closeElement( 'table' ) .
-			Xml::closeElement( 'fieldset' );
+		if ( $wgUser->isAllowed( 'editinterface' ) ) {
+			$linkTitle = Title::makeTitleSafe( NS_MEDIAWIKI, 'protect-dropdown' );
+			$link = $wgUser->getSkin()->Link ( $linkTitle, wfMsgHtml( 'protect-edit-reasonlist' ) );
+			$out .= '<p class="mw-protect-editreasons">' . $link . '</p>';
+		}
 
 		if ( !$this->disabled ) {
 			$out .= Xml::closeElement( 'form' ) .
@@ -324,15 +461,8 @@ class ProtectionForm {
 
 	function buildSelector( $action, $selected ) {
 		global $wgRestrictionLevels, $wgUser;
-		$id = 'mwProtect-level-' . $action;
-		$attribs = array(
-			'id' => $id,
-			'name' => $id,
-			'size' => count( $wgRestrictionLevels ),
-			'onchange' => 'protectLevelsUpdate(this)',
-			) + $this->disabledAttrib;
 
-		$out = Xml::openElement( 'select', $attribs );
+		$levels = array();
 		foreach( $wgRestrictionLevels as $key ) {
 			//don't let them choose levels above their own (aka so they can still unprotect and edit the page). but only when the form isn't disabled
 			if( $key == 'sysop' ) {
@@ -343,6 +473,19 @@ class ProtectionForm {
 				if( !$wgUser->isAllowed($key) && !$this->disabled )
 					continue;
 			}
+			$levels[] = $key;
+		}
+
+		$id = 'mwProtect-level-' . $action;
+		$attribs = array(
+			'id' => $id,
+			'name' => $id,
+			'size' => count( $levels ),
+			'onchange' => 'ProtectionForm.updateLevels(this)',
+			) + $this->disabledAttrib;
+
+		$out = Xml::openElement( 'select', $attribs );
+		foreach( $levels as $key ) {
 			$out .= Xml::option( $this->getOptionLabel( $key ), $key, $key == $selected );
 		}
 		$out .= Xml::closeElement( 'select' );
@@ -371,7 +514,7 @@ class ProtectionForm {
 		global $wgStylePath, $wgStyleVersion;
 		return Xml::tags( 'script', array(
 			'type' => 'text/javascript',
-			'src' => $wgStylePath . "/common/protect.js?$wgStyleVersion" ), '' );
+			'src' => $wgStylePath . "/common/protect.js?$wgStyleVersion.1" ), '' );
 	}
 
 	function buildCleanupScript() {
@@ -384,7 +527,15 @@ class ProtectionForm {
 			}
 		}
 		$script .= "[" . implode(',',$CascadeableLevels) . "];\n";
-		$script .= 'protectInitialize("mwProtectSet","' . Xml::escapeJsString( wfMsg( 'protect-unchain' ) ) . '","' . count($this->mApplicableTypes) . '")';
+		$options = (object)array(
+			'tableId' => 'mw-protect-table-move',
+			'labelText' => wfMsg( 'protect-unchain' ),
+			'numTypes' => count($this->mApplicableTypes),
+			'existingMatch' => 1 == count( array_unique( $this->mExistingExpiry ) ),
+		);
+		$encOptions = Xml::encodeJsVar( $options );
+
+		$script .= "ProtectionForm.init($encOptions)";
 		return Xml::tags( 'script', array( 'type' => 'text/javascript' ), $script );
 	}
 
diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 0f010421..771fd577 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -67,7 +67,7 @@ function wfGetAgent() {
  * @return string
  */
 function wfGetIP() {
-	global $wgIP;
+	global $wgIP, $wgUsePrivateIPs;
 
 	# Return cached result
 	if ( !empty( $wgIP ) ) {
@@ -97,8 +97,10 @@ function wfGetIP() {
 	foreach ( $ipchain as $i => $curIP ) {
 		$curIP = IP::canonicalize( $curIP );
 		if ( wfIsTrustedProxy( $curIP ) ) {
-			if ( isset( $ipchain[$i + 1] ) && IP::isPublic( $ipchain[$i + 1] ) ) {
-				$ip = $ipchain[$i + 1];
+			if ( isset( $ipchain[$i + 1] ) ) {
+				if( $wgUsePrivateIPs || IP::isPublic( $ipchain[$i + 1 ] ) ) {
+					$ip = $ipchain[$i + 1];
+				}
 			}
 		} else {
 			break;
@@ -121,8 +123,7 @@ function wfIsTrustedProxy( $ip ) {
 	global $wgSquidServers, $wgSquidServersNoPurge;
 
 	if ( in_array( $ip, $wgSquidServers ) ||
-		in_array( $ip, $wgSquidServersNoPurge ) ||
-		wfIsAOLProxy( $ip )
+		in_array( $ip, $wgSquidServersNoPurge )
 	) {
 		$trusted = true;
 	} else {
@@ -212,50 +213,3 @@ function wfIsLocallyBlockedProxy( $ip ) {
 	return $ret;
 }
 
-/**
- * TODO: move this list to the database in a global IP info table incorporating
- * trusted ISP proxies, blocked IP addresses and open proxies.
- * @return bool
- */
-function wfIsAOLProxy( $ip ) {
-	# From http://webmaster.info.aol.com/proxyinfo.html
-	$ranges = array(
-		'64.12.96.0/19',
-		'149.174.160.0/20',
-		'152.163.240.0/21',
-		'152.163.248.0/22',
-		'152.163.252.0/23',
-		'152.163.96.0/22',
-		'152.163.100.0/23',
-		'195.93.32.0/22',
-		'195.93.48.0/22',
-		'195.93.64.0/19',
-		'195.93.96.0/19',
-		'195.93.16.0/20',
-		'198.81.0.0/22',
-		'198.81.16.0/20',
-		'198.81.8.0/23',
-		'202.67.64.128/25',
-		'205.188.192.0/20',
-		'205.188.208.0/23',
-		'205.188.112.0/20',
-		'205.188.146.144/30',
-		'207.200.112.0/21',
-	);
-
-	static $parsedRanges;
-	if ( is_null( $parsedRanges ) ) {
-		$parsedRanges = array();
-		foreach ( $ranges as $range ) {
-			$parsedRanges[] =  IP::parseRange( $range );
-		}
-	}
-
-	$hex = IP::toHex( $ip );
-	foreach ( $parsedRanges as $range ) {
-		if ( $hex >= $range[0] && $hex <= $range[1] ) {
-			return true;
-		}
-	}
-	return false;
-}
diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 16dc7c04..0b587508 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -21,6 +21,7 @@ $wgQueryPages = array(
 	array( 'DeadendPagesPage',              'Deadendpages'                  ),
 	array( 'DisambiguationsPage',           'Disambiguations'               ),
 	array( 'DoubleRedirectsPage',           'DoubleRedirects'               ),
+	array( 'LinkSearchPage',                'LinkSearch'                    ),
 	array( 'ListredirectsPage',             'Listredirects'					),
 	array( 'LonelyPagesPage',               'Lonelypages'                   ),
 	array( 'LongPagesPage',                 'Longpages'                     ),
@@ -39,7 +40,9 @@ $wgQueryPages = array(
 	array( 'UnusedCategoriesPage',          'Unusedcategories'              ),
 	array( 'UnusedimagesPage',              'Unusedimages'                  ),
 	array( 'WantedCategoriesPage',          'Wantedcategories'              ),
+	array( 'WantedFilesPage',               'Wantedfiles'                   ),
 	array( 'WantedPagesPage',               'Wantedpages'                   ),
+	array( 'WantedTemplatesPage',          'Wantedtemplates'              ),
 	array( 'UnwatchedPagesPage',            'Unwatchedpages'                ),
 	array( 'UnusedtemplatesPage',           'Unusedtemplates' 				),
 	array( 'WithoutInterwikiPage',			'Withoutinterwiki'				),
@@ -334,22 +337,22 @@ class QueryPage {
 
 		$this->preprocessResults( $dbr, $res );
 
-		$wgOut->addHtml( XML::openElement( 'div', array('class' => 'mw-spcontent') ) );
+		$wgOut->addHTML( XML::openElement( 'div', array('class' => 'mw-spcontent') ) );
 
 		# Top header and navigation
 		if( $shownavigation ) {
-			$wgOut->addHtml( $this->getPageHeader() );
+			$wgOut->addHTML( $this->getPageHeader() );
 			if( $num > 0 ) {
-				$wgOut->addHtml( '<p>' . wfShowingResults( $offset, $num ) . '</p>' );
+				$wgOut->addHTML( '<p>' . wfShowingResults( $offset, $num ) . '</p>' );
 				# Disable the "next" link when we reach the end
 				$paging = wfViewPrevNext( $offset, $limit, $wgContLang->specialPage( $sname ),
 					wfArrayToCGI( $this->linkParameters() ), ( $num < $limit ) );
-				$wgOut->addHtml( '<p>' . $paging . '</p>' );
+				$wgOut->addHTML( '<p>' . $paging . '</p>' );
 			} else {
 				# No results to show, so don't bother with "showing X of Y" etc.
 				# -- just let the user know and give up now
-				$wgOut->addHtml( '<p>' . wfMsgHtml( 'specialpage-empty' ) . '</p>' );
-				$wgOut->addHtml( XML::closeElement( 'div' ) );
+				$wgOut->addHTML( '<p>' . wfMsgHtml( 'specialpage-empty' ) . '</p>' );
+				$wgOut->addHTML( XML::closeElement( 'div' ) );
 				return;
 			}
 		}
@@ -366,10 +369,10 @@ class QueryPage {
 
 		# Repeat the paging links at the bottom
 		if( $shownavigation ) {
-			$wgOut->addHtml( '<p>' . $paging . '</p>' );
+			$wgOut->addHTML( '<p>' . $paging . '</p>' );
 		}
 
-		$wgOut->addHtml( XML::closeElement( 'div' ) );
+		$wgOut->addHTML( XML::closeElement( 'div' ) );
 
 		return $num;
 	}
@@ -428,7 +431,7 @@ class QueryPage {
 				? $wgContLang->listToText( $html )
 				: implode( '', $html );
 
-			$out->addHtml( $html );
+			$out->addHTML( $html );
 		}
 	}
 
@@ -531,7 +534,7 @@ class QueryPage {
 	}
 
 	function feedDesc() {
-		return wfMsg( 'tagline' );
+		return wfMsgExt( 'tagline', 'parsemag' );
 	}
 
 	function feedUrl() {
diff --git a/includes/RawPage.php b/includes/RawPage.php
index b1e2539a..7093367f 100644
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -21,20 +21,20 @@ class RawPage {
 	var $mContentType, $mExpandTemplates;
 
 	function __construct( &$article, $request = false ) {
-		global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType, $wgForcedRawSMaxage, $wgGroupPermissions;
+		global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType, $wgGroupPermissions;
 
 		$allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
 		$this->mArticle =& $article;
 		$this->mTitle =& $article->mTitle;
 
-		if ( $request === false ) {
+		if( $request === false ) {
 			$this->mRequest =& $wgRequest;
 		} else {
 			$this->mRequest = $request;
 		}
 
 		$ctype = $this->mRequest->getVal( 'ctype' );
-		$smaxage = $this->mRequest->getIntOrNull( 'smaxage', $wgSquidMaxage );
+		$smaxage = $this->mRequest->getIntOrNull( 'smaxage' );
 		$maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage );
 
 		$this->mExpandTemplates = $this->mRequest->getVal( 'templates' ) === 'expand';
@@ -44,17 +44,17 @@ class RawPage {
 
 		$oldid = $this->mRequest->getInt( 'oldid' );
 
-		switch ( $wgRequest->getText( 'direction' ) ) {
+		switch( $wgRequest->getText( 'direction' ) ) {
 			case 'next':
 				# output next revision, or nothing if there isn't one
-				if ( $oldid ) {
+				if( $oldid ) {
 					$oldid = $this->mTitle->getNextRevisionId( $oldid );
 				}
 				$oldid = $oldid ? $oldid : -1;
 				break;
 			case 'prev':
 				# output previous revision, or nothing if there isn't one
-				if ( ! $oldid ) {
+				if( ! $oldid ) {
 					# get the current revision so we can get the penultimate one
 					$this->mArticle->getTouched();
 					$oldid = $this->mArticle->mLatest;
@@ -71,11 +71,11 @@ class RawPage {
 		# special case for 'generated' raw things: user css/js
 		$gen = $this->mRequest->getVal( 'gen' );
 
-		if($gen == 'css') {
+		if( $gen == 'css' ) {
 			$this->mGen = $gen;
 			if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
 			if($ctype == '') $ctype = 'text/css';
-		} elseif ($gen == 'js') {
+		} elseif( $gen == 'js' ) {
 			$this->mGen = $gen;
 			if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
 			if($ctype == '') $ctype = $wgJsMimeType;
@@ -85,7 +85,8 @@ class RawPage {
 		$this->mCharset = $wgInputEncoding;
 
 		# Force caching for CSS and JS raw content, default: 5 minutes
-		if (is_null($smaxage) and ($ctype=='text/css' or $ctype==$wgJsMimeType)) {
+		if( is_null($smaxage) and ($ctype=='text/css' or $ctype==$wgJsMimeType) ) {
+			global $wgForcedRawSMaxage;
 			$this->mSmaxage = intval($wgForcedRawSMaxage);
 		} else {
 			$this->mSmaxage = intval( $smaxage );
@@ -94,14 +95,13 @@ class RawPage {
 
 		# Output may contain user-specific data;
 		# vary generated content for open sessions and private wikis
-		if ($this->mGen or !$wgGroupPermissions['*']['read']) {
-			$this->mPrivateCache = ( $this->mSmaxage == 0 ) ||
-				( session_id() != '' );
+		if( $this->mGen or !$wgGroupPermissions['*']['read'] ) {
+			$this->mPrivateCache = $this->mSmaxage == 0 || session_id() != '';
 		} else {
 			$this->mPrivateCache = false;
 		}
 
-		if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
+		if( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
 			$this->mContentType = 'text/x-wiki';
 		} else {
 			$this->mContentType = $ctype;
@@ -149,6 +149,18 @@ class RawPage {
 		# allow the client to cache this for 24 hours
 		$mode = $this->mPrivateCache ? 'private' : 'public';
 		header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
+		
+		if( HTMLFileCache::useFileCache() ) {
+			$cache = new HTMLFileCache( $this->mTitle, 'raw' );
+			if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
+				$cache->loadFromFileCache();
+				$wgOut->disable();
+				return;
+			} else {
+				ob_start( array(&$cache, 'saveToFileCache' ) );
+			}
+		}
+		
 		$text = $this->getRawText();
 
 		if( !wfRunHooks( 'RawPageViewBeforeOutput', array( &$this, &$text ) ) ) {
@@ -161,13 +173,15 @@ class RawPage {
 
 	function getRawText() {
 		global $wgUser, $wgOut, $wgRequest;
-		if($this->mGen) {
+		if( $this->mGen ) {
 			$sk = $wgUser->getSkin();
-			$sk->initPage($wgOut);
-			if($this->mGen == 'css') {
-				return $sk->getUserStylesheet();
-			} else if($this->mGen == 'js') {
-				return $sk->getUserJs();
+			if( !StubObject::isRealObject( $wgOut ) )
+				$wgOut->_unstub( 2 );
+			$sk->initPage( $wgOut );
+			if( $this->mGen == 'css' ) {
+				return $sk->generateUserStylesheet();
+			} else if( $this->mGen == 'js' ) {
+				return $sk->generateUserJs();
 			}
 		} else {
 			return $this->getArticleText();
@@ -179,7 +193,7 @@ class RawPage {
 		$text = '';
 		if( $this->mTitle ) {
 			// If it's a MediaWiki message we can just hit the message cache
-			if ( $this->mUseMessageCache && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+			if( $this->mUseMessageCache && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 				$key = $this->mTitle->getDBkey();
 				$text = wfMsgForContentNoTrans( $key );
 				# If the message doesn't exist, return a blank
@@ -189,11 +203,11 @@ class RawPage {
 			} else {
 				// Get it from the DB
 				$rev = Revision::newFromTitle( $this->mTitle, $this->mOldId );
-				if ( $rev ) {
+				if( $rev ) {
 					$lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() );
 					header( "Last-modified: $lastmod" );
 
-					if ( !is_null($this->mSection ) ) {
+					if( !is_null($this->mSection ) ) {
 						global $wgParser;
 						$text = $wgParser->getSection ( $rev->getText(), $this->mSection );
 					} else
@@ -230,10 +244,10 @@ class RawPage {
 	}
 
 	function parseArticleText( $text ) {
-		if ( $text === '' )
+		if( $text === '' )
 			return '';
 		else
-			if ( $this->mExpandTemplates ) {
+			if( $this->mExpandTemplates ) {
 				global $wgParser;
 				return $wgParser->preprocess( $text, $this->mTitle, new ParserOptions() );
 			} else
diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 4daf6f87..f03fbcbb 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -49,15 +49,13 @@ class RecentChange
 
 	# Factory methods
 
-	public static function newFromRow( $row )
-	{
+	public static function newFromRow( $row ) {
 		$rc = new RecentChange;
 		$rc->loadFromRow( $row );
 		return $rc;
 	}
 
-	public static function newFromCurRow( $row )
-	{
+	public static function newFromCurRow( $row ) {
 		$rc = new RecentChange;
 		$rc->loadFromCurRow( $row );
 		$rc->notificationtimestamp = false;
@@ -110,27 +108,23 @@ class RecentChange
 
 	# Accessors
 
-	function setAttribs( $attribs )
-	{
+	public function setAttribs( $attribs ) {
 		$this->mAttribs = $attribs;
 	}
 
-	function setExtra( $extra )
-	{
+	public function setExtra( $extra ) {
 		$this->mExtra = $extra;
 	}
 
-	function &getTitle()
-	{
-		if ( $this->mTitle === false ) {
+	public function &getTitle() {
+		if( $this->mTitle === false ) {
 			$this->mTitle = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
 		}
 		return $this->mTitle;
 	}
 
-	function getMovedToTitle()
-	{
-		if ( $this->mMovedToTitle === false ) {
+	public function getMovedToTitle() {
+		if( $this->mMovedToTitle === false ) {
 			$this->mMovedToTitle = Title::makeTitle( $this->mAttribs['rc_moved_to_ns'],
 				$this->mAttribs['rc_moved_to_title'] );
 		}
@@ -138,24 +132,22 @@ class RecentChange
 	}
 
 	# Writes the data in this object to the database
-	function save()
-	{
-		global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, 
-		$wgRC2UDPPort, $wgRC2UDPPrefix, $wgRC2UDPOmitBots;
+	public function save() {
+		global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPOmitBots;
 		$fname = 'RecentChange::save';
 
 		$dbw = wfGetDB( DB_MASTER );
-		if ( !is_array($this->mExtra) ) {
+		if( !is_array($this->mExtra) ) {
 			$this->mExtra = array();
 		}
 		$this->mExtra['lang'] = $wgLocalInterwiki;
 
-		if ( !$wgPutIPinRC ) {
+		if( !$wgPutIPinRC ) {
 			$this->mAttribs['rc_ip'] = '';
 		}
 
-		## If our database is strict about IP addresses, use NULL instead of an empty string
-		if ( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
+		# If our database is strict about IP addresses, use NULL instead of an empty string
+		if( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
 			unset( $this->mAttribs['rc_ip'] );
 		}
 
@@ -165,7 +157,7 @@ class RecentChange
 		$this->mAttribs['rc_id'] = $dbw->nextSequenceValue( 'rc_rc_id_seq' );
 
 		## If we are using foreign keys, an entry of 0 for the page_id will fail, so use NULL
-		if ( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id']==0 ) {
+		if( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id']==0 ) {
 			unset ( $this->mAttribs['rc_cur_id'] );
 		}
 
@@ -175,48 +167,9 @@ class RecentChange
 		# Set the ID
 		$this->mAttribs['rc_id'] = $dbw->insertId();
 
-		# Update old rows, if necessary
-		if ( $this->mAttribs['rc_type'] == RC_EDIT ) {
-			$lastTime = $this->mExtra['lastTimestamp'];
-			#$now = $this->mAttribs['rc_timestamp'];
-			#$curId = $this->mAttribs['rc_cur_id'];
-
-			# Don't bother looking for entries that have probably
-			# been purged, it just locks up the indexes needlessly.
-			global $wgRCMaxAge;
-			$age = time() - wfTimestamp( TS_UNIX, $lastTime );
-			if( $age < $wgRCMaxAge ) {
-				# live hack, will commit once tested - kate
-				# Update rc_this_oldid for the entries which were current
-				#
-				#$oldid = $this->mAttribs['rc_last_oldid'];
-				#$ns = $this->mAttribs['rc_namespace'];
-				#$title = $this->mAttribs['rc_title'];
-				#
-				#$dbw->update( 'recentchanges',
-				#	array( /* SET */
-				#		'rc_this_oldid' => $oldid
-				#	), array( /* WHERE */
-				#		'rc_namespace' => $ns,
-				#		'rc_title' => $title,
-				#		'rc_timestamp' => $dbw->timestamp( $lastTime )
-				#	), $fname
-				#);
-			}
-
-			# Update rc_cur_time
-			#$dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ),
-			#	array( 'rc_cur_id' => $curId ), $fname );
-		}
-
 		# Notify external application via UDP
-		if ( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
-			$conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
-			if ( $conn ) {
-				$line = $wgRC2UDPPrefix . $this->getIRCLine();
-				socket_sendto( $conn, $line, strlen($line), 0, $wgRC2UDPAddress, $wgRC2UDPPort );
-				socket_close( $conn );
-			}
+		if( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
+			self::sendToUDP( $this->getIRCLine() );
 		}
 
 		# E-mail notifications
@@ -246,15 +199,105 @@ class RecentChange
 	}
 
 	/**
+	 * Send some text to UDP
+	 * @param string $line
+	 * @param string $prefix
+	 * @param string $address
+	 * @return bool success
+	 */
+	public static function sendToUDP( $line, $address = '', $prefix = '' ) {
+		global $wgRC2UDPAddress, $wgRC2UDPPrefix, $wgRC2UDPPort;
+		# Assume default for standard RC case
+		$address = $address ? $address : $wgRC2UDPAddress;
+		$prefix = $prefix ? $prefix : $wgRC2UDPPrefix;
+		# Notify external application via UDP
+		if( $address ) {
+			$conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
+			if( $conn ) {
+				$line = $prefix . $line;
+				wfDebug( __METHOD__ . ": sending UDP line: $line\n" );
+				socket_sendto( $conn, $line, strlen($line), 0, $address, $wgRC2UDPPort );
+				socket_close( $conn );
+				return true;
+			} else {
+				wfDebug( __METHOD__ . ": failed to create UDP socket\n" );
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Remove newlines and carriage returns
+	 * @param string $line
+	 * @return string
+	 */
+	public static function cleanupForIRC( $text ) {
+		return str_replace(array("\n", "\r"), array("", ""), $text);
+	}
+
+	/**
 	 * Mark a given change as patrolled
 	 *
 	 * @param mixed $change RecentChange or corresponding rc_id
-	 * @returns integer number of affected rows
+	 * @param bool $auto for automatic patrol
+	 * @return See doMarkPatrolled(), or null if $change is not an existing rc_id
+	 */
+	public static function markPatrolled( $change, $auto = false ) {
+		$change = $change instanceof RecentChange
+			? $change
+			: RecentChange::newFromId($change);
+		if( !$change instanceof RecentChange ) {
+			return null;
+		}
+		return $change->doMarkPatrolled( $auto );
+	}
+	
+	/**
+	 * Mark this RecentChange as patrolled
+	 *
+	 * NOTE: Can also return 'rcpatroldisabled', 'hookaborted' and 'markedaspatrollederror-noautopatrol' as errors
+	 * @param bool $auto for automatic patrol
+	 * @return array of permissions errors, see Title::getUserPermissionsErrors()
+	 */
+	public function doMarkPatrolled( $auto = false ) {
+		global $wgUser, $wgUseRCPatrol, $wgUseNPPatrol;
+		$errors = array();
+		// If recentchanges patrol is disabled, only new pages
+		// can be patrolled
+		if( !$wgUseRCPatrol && ( !$wgUseNPPatrol || $this->getAttribute('rc_type') != RC_NEW ) ) {
+			$errors[] = array('rcpatroldisabled');
+		}
+		// Automatic patrol needs "autopatrol", ordinary patrol needs "patrol"
+		$right = $auto ? 'autopatrol' : 'patrol';
+		$errors = array_merge( $errors, $this->getTitle()->getUserPermissionsErrors( $right, $wgUser ) );
+		if( !wfRunHooks('MarkPatrolled', array($this->getAttribute('rc_id'), &$wgUser, false)) ) {
+			$errors[] = array('hookaborted');
+		}
+		// Users without the 'autopatrol' right can't patrol their
+		// own revisions
+		if( $wgUser->getName() == $this->getAttribute('rc_user_text') && !$wgUser->isAllowed('autopatrol') ) {
+			$errors[] = array('markedaspatrollederror-noautopatrol');
+		}
+		if( $errors ) {
+			return $errors;
+		}
+		// If the change was patrolled already, do nothing
+		if( $this->getAttribute('rc_patrolled') ) {
+			return array();
+		}
+		// Actually set the 'patrolled' flag in RC
+		$this->reallyMarkPatrolled();
+		// Log this patrol event
+		PatrolLog::record( $this, $auto );
+		wfRunHooks( 'MarkPatrolledComplete', array($this->getAttribute('rc_id'), &$wgUser, false) );
+		return array();
+	}
+	
+	/**
+	 * Mark this RecentChange patrolled, without error checking
+	 * @return int Number of affected rows
 	 */
-	public static function markPatrolled( $change ) {
-		$rcid = $change instanceof RecentChange
-			? $change->mAttribs['rc_id']
-			: $change;
+	public function reallyMarkPatrolled() {
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->update(
 			'recentchanges',
@@ -262,7 +305,7 @@ class RecentChange
 				'rc_patrolled' => 1
 			),
 			array(
-				'rc_id' => $rcid
+				'rc_id' => $this->getAttribute('rc_id')
 			),
 			__METHOD__
 		);
@@ -270,13 +313,12 @@ class RecentChange
 	}
 
 	# Makes an entry in the database corresponding to an edit
-	public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment,
-		$oldId, $lastTimestamp, $bot, $ip = '', $oldSize = 0, $newSize = 0,
-		$newId = 0)
+	public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, $oldId,
+		$lastTimestamp, $bot, $ip='', $oldSize=0, $newSize=0, $newId=0, $patrol=0 )
 	{
-		if ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
+			if( !$ip ) {
 				$ip = '';
 			}
 		}
@@ -299,7 +341,7 @@ class RecentChange
 			'rc_moved_to_ns'	=> 0,
 			'rc_moved_to_title'	=> '',
 			'rc_ip'		=> $ip,
-			'rc_patrolled'	=> 0,
+			'rc_patrolled'	=> intval($patrol),
 			'rc_new'	=> 0,  # obsolete
 			'rc_old_len'	=> $oldSize,
 			'rc_new_len'	=> $newSize,
@@ -317,7 +359,7 @@ class RecentChange
 			'newSize'       => $newSize,
 		);
 		$rc->save();
-		return( $rc->mAttribs['rc_id'] );
+		return $rc;
 	}
 
 	/**
@@ -326,11 +368,11 @@ class RecentChange
 	 * @todo Document parameters and return
 	 */
 	public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
-	  $ip='', $size = 0, $newId = 0 )
+		$ip='', $size=0, $newId=0, $patrol=0 )
 	{
-		if ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
+			if( !$ip ) {
 				$ip = '';
 			}
 		}
@@ -353,7 +395,7 @@ class RecentChange
 			'rc_moved_to_ns'    => 0,
 			'rc_moved_to_title' => '',
 			'rc_ip'             => $ip,
-			'rc_patrolled'      => 0,
+			'rc_patrolled'      => intval($patrol),
 			'rc_new'	    	=> 1, # obsolete
 			'rc_old_len'        => 0,
 			'rc_new_len'	    => $size,
@@ -371,7 +413,7 @@ class RecentChange
 			'newSize' => $size
 		);
 		$rc->save();
-		return( $rc->mAttribs['rc_id'] );
+		return $rc;	
 	}
 
 	# Makes an entry in the database corresponding to a rename
@@ -379,9 +421,9 @@ class RecentChange
 	{
 		global $wgRequest;
 
-		if ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
+			if( !$ip ) {
 				$ip = '';
 			}
 		}
@@ -431,15 +473,14 @@ class RecentChange
 		RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, true );
 	}
 
-	# A log entry is different to an edit in that previous revisions are not kept
 	public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='',
 	   $type, $action, $target, $logComment, $params, $newId=0 )
 	{
 		global $wgRequest;
 
-		if ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
+			if( !$ip ) {
 				$ip = '';
 			}
 		}
@@ -458,7 +499,7 @@ class RecentChange
 			'rc_comment'	=> $logComment,
 			'rc_this_oldid'	=> 0,
 			'rc_last_oldid'	=> 0,
-			'rc_bot'	=> $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot' , true ) : 0,
+			'rc_bot'	=> $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot', true ) : 0,
 			'rc_moved_to_ns'	=> 0,
 			'rc_moved_to_title'	=> '',
 			'rc_ip'	=> $ip,
@@ -481,16 +522,14 @@ class RecentChange
 	}
 
 	# Initialises the members of this object from a mysql row object
-	function loadFromRow( $row )
-	{
+	public function loadFromRow( $row ) {
 		$this->mAttribs = get_object_vars( $row );
-		$this->mAttribs["rc_timestamp"] = wfTimestamp(TS_MW, $this->mAttribs["rc_timestamp"]);
-		$this->mExtra = array();
+		$this->mAttribs['rc_timestamp'] = wfTimestamp(TS_MW, $this->mAttribs['rc_timestamp']);
+		$this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set
 	}
 
 	# Makes a pseudo-RC entry from a cur row
-	function loadFromCurRow( $row )
-	{
+	public function loadFromCurRow( $row ) {
 		$this->mAttribs = array(
 			'rc_timestamp' => wfTimestamp(TS_MW, $row->rev_timestamp),
 			'rc_cur_time' => $row->rev_timestamp,
@@ -517,11 +556,8 @@ class RecentChange
 			'rc_log_type' => isset($row->rc_log_type) ? $row->rc_log_type : null,
 			'rc_log_action' => isset($row->rc_log_action) ? $row->rc_log_action : null,
 			'rc_log_id' => isset($row->rc_log_id) ? $row->rc_log_id: 0,
-			// this one REALLY should be set...
-			'rc_deleted' => isset($row->rc_deleted) ? $row->rc_deleted: 0,
+			'rc_deleted' => $row->rc_deleted // MUST be set
 		);
-
-		$this->mExtra = array();
 	}
 
 	/**
@@ -538,12 +574,11 @@ class RecentChange
 	 * Gets the end part of the diff URL associated with this object
 	 * Blank if no diff link should be displayed
 	 */
-	function diffLinkTrail( $forceCur )
-	{
-		if ( $this->mAttribs['rc_type'] == RC_EDIT ) {
+	public function diffLinkTrail( $forceCur ) {
+		if( $this->mAttribs['rc_type'] == RC_EDIT ) {
 			$trail = "curid=" . (int)($this->mAttribs['rc_cur_id']) .
 				"&oldid=" . (int)($this->mAttribs['rc_last_oldid']);
-			if ( $forceCur ) {
+			if( $forceCur ) {
 				$trail .= '&diff=0' ;
 			} else {
 				$trail .= '&diff=' . (int)($this->mAttribs['rc_this_oldid']);
@@ -554,44 +589,45 @@ class RecentChange
 		return $trail;
 	}
 
-	function cleanupForIRC( $text ) {
-		return str_replace(array("\n", "\r"), array("", ""), $text);
-	}
-
-	function getIRCLine() {
-		global $wgUseRCPatrol;
+	protected function getIRCLine() {
+		global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki;
 
 		// FIXME: Would be good to replace these 2 extract() calls with something more explicit
 		// e.g. list ($rc_type, $rc_id) = array_values ($this->mAttribs); [or something like that]
 		extract($this->mAttribs);
 		extract($this->mExtra);
 
-		if ( $rc_type == RC_LOG ) {
+		if( $rc_type == RC_LOG ) {
 			$titleObj = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
 		} else {
 			$titleObj =& $this->getTitle();
 		}
 		$title = $titleObj->getPrefixedText();
-		$title = $this->cleanupForIRC( $title );
+		$title = self::cleanupForIRC( $title );
 
-		// FIXME: *HACK* these should be getFullURL(), hacked for SSL madness --brion 2005-12-26
-		if ( $rc_type == RC_LOG ) {
+		if( $rc_type == RC_LOG ) {
 			$url = '';
-		} elseif ( $rc_new && $wgUseRCPatrol ) {
-			$url = $titleObj->getInternalURL("rcid=$rc_id");
-		} else if ( $rc_new ) {
-			$url = $titleObj->getInternalURL();
-		} else if ( $wgUseRCPatrol ) {
-			$url = $titleObj->getInternalURL("diff=$rc_this_oldid&oldid=$rc_last_oldid&rcid=$rc_id");
 		} else {
-			$url = $titleObj->getInternalURL("diff=$rc_this_oldid&oldid=$rc_last_oldid");
+			if( $rc_type == RC_NEW ) {
+				$url = "oldid=$rc_this_oldid";
+			} else {
+				$url = "diff=$rc_this_oldid&oldid=$rc_last_oldid";
+			}
+			if( $wgUseRCPatrol || ($rc_type == RC_NEW && $wgUseNPPatrol) ) {
+				$url .= "&rcid=$rc_id";
+			}
+			// XXX: *HACK* this should use getFullURL(), hacked for SSL madness --brion 2005-12-26
+			// XXX: *HACK^2* the preg_replace() undoes much of what getInternalURL() does, but we 
+			// XXX: need to call it so that URL paths on the Wikimedia secure server can be fixed
+			// XXX: by a custom GetInternalURL hook --vyznev 2008-12-10
+			$url = preg_replace( '/title=[^&]*&/', '', $titleObj->getInternalURL( $url ) );
 		}
 
-		if ( isset( $oldSize ) && isset( $newSize ) ) {
+		if( isset( $oldSize ) && isset( $newSize ) ) {
 			$szdiff = $newSize - $oldSize;
-			if ($szdiff < -500) {
+			if($szdiff < -500) {
 				$szdiff = "\002$szdiff\002";
-			} elseif ($szdiff >= 0) {
+			} elseif($szdiff >= 0) {
 				$szdiff = '+' . $szdiff ;
 			}
 			$szdiff = '(' . $szdiff . ')' ;
@@ -599,20 +635,35 @@ class RecentChange
 			$szdiff = '';
 		}
 
-		$user = $this->cleanupForIRC( $rc_user_text );
+		$user = self::cleanupForIRC( $rc_user_text );
 
-		if ( $rc_type == RC_LOG ) {
-			$logTargetText = $this->getTitle()->getPrefixedText();
-			$comment = $this->cleanupForIRC( str_replace($logTargetText,"\00302$logTargetText\00310",$actionComment) );
+		if( $rc_type == RC_LOG ) {
+			$targetText = $this->getTitle()->getPrefixedText();
+			$comment = self::cleanupForIRC( str_replace("[[$targetText]]","[[\00302$targetText\00310]]",$actionComment) );
 			$flag = $rc_log_action;
 		} else {
-			$comment = $this->cleanupForIRC( $rc_comment );
+			$comment = self::cleanupForIRC( $rc_comment );
 			$flag = ($rc_new ? "N" : "") . ($rc_minor ? "M" : "") . ($rc_bot ? "B" : "");
 		}
+
+		if ( $wgRC2UDPInterwikiPrefix === true ) {
+			$prefix = $wgLocalInterwiki;
+		} elseif ( $wgRC2UDPInterwikiPrefix ) {
+			$prefix = $wgRC2UDPInterwikiPrefix;
+		} else {
+			$prefix = false;
+		}
+		if ( $prefix !== false ) {
+			$titleString = "\00314[[\00303$prefix:\00307$title\00314]]";
+		} else {
+			$titleString = "\00314[[\00307$title\00314]]";
+		}
+		
 		# see http://www.irssi.org/documentation/formats for some colour codes. prefix is \003,
 		# no colour (\003) switches back to the term default
-		$fullString = "\00314[[\00307$title\00314]]\0034 $flag\00310 " .
+		$fullString = "$titleString\0034 $flag\00310 " .
 		              "\00302$url\003 \0035*\003 \00303$user\003 \0035*\003 $szdiff \00310$comment\003\n";
+			
 		return $fullString;
 	}
 
@@ -620,32 +671,16 @@ class RecentChange
 	 * Returns the change size (HTML).
 	 * The lengths can be given optionally.
 	 */
-	function getCharacterDifference( $old = 0, $new = 0 ) {
-		global $wgRCChangedSizeThreshold, $wgLang;
-
+	public function getCharacterDifference( $old = 0, $new = 0 ) {
 		if( $old === 0 ) {
 			$old = $this->mAttribs['rc_old_len'];
 		}
 		if( $new === 0 ) {
 			$new = $this->mAttribs['rc_new_len'];
 		}
-
 		if( $old === NULL || $new === NULL ) {
 			return '';
 		}
-
-		$szdiff = $new - $old;
-		$formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape'),
-			$wgLang->formatNum($szdiff) );
-
-		if( $szdiff < $wgRCChangedSizeThreshold ) {
-			return '<strong class=\'mw-plusminus-neg\'>(' . $formatedSize . ')</strong>';
-		} elseif( $szdiff === 0 ) {
-			return '<span class=\'mw-plusminus-null\'>(' . $formatedSize . ')</span>';
-		} elseif( $szdiff > 0 ) {
-			return '<span class=\'mw-plusminus-pos\'>(+' . $formatedSize . ')</span>';
-		} else {
-			return '<span class=\'mw-plusminus-neg\'>(' . $formatedSize . ')</span>';
-		}
+		return ChangesList::showCharacterDifference( $old, $new );
 	}
 }
diff --git a/includes/RefreshLinksJob.php b/includes/RefreshLinksJob.php
index f95e5a50..1c119a8d 100644
--- a/includes/RefreshLinksJob.php
+++ b/includes/RefreshLinksJob.php
@@ -47,3 +47,87 @@ class RefreshLinksJob extends Job {
 		return true;
 	}
 }
+
+/**
+ * Background job to update links for a given title.
+ * Newer version for high use templates.
+ *
+ * @ingroup JobQueue
+ */
+class RefreshLinksJob2 extends Job {
+
+	function __construct( $title, $params, $id = 0 ) {
+		parent::__construct( 'refreshLinks2', $title, $params, $id );
+	}
+
+	/**
+	 * Run a refreshLinks2 job
+	 * @return boolean success
+	 */
+	function run() {
+		global $wgParser;
+
+		wfProfileIn( __METHOD__ );
+
+		$linkCache = LinkCache::singleton();
+		$linkCache->clear();
+
+		if( is_null( $this->title ) ) {
+			$this->error = "refreshLinks2: Invalid title";
+			wfProfileOut( __METHOD__ );
+			return false;
+		}
+		if( !isset($this->params['start']) || !isset($this->params['end']) ) {
+			$this->error = "refreshLinks2: Invalid params";
+			wfProfileOut( __METHOD__ );
+			return false;
+		}
+		$start = intval($this->params['start']);
+		$end = intval($this->params['end']);
+		
+		$dbr = wfGetDB( DB_SLAVE );
+		$res = $dbr->select( array( 'templatelinks', 'page' ),
+			array( 'page_namespace', 'page_title' ),
+			array(
+				'page_id=tl_from',
+				"tl_from >= '$start'",
+				"tl_from <= '$end'", 
+				'tl_namespace' => $this->title->getNamespace(),
+				'tl_title' => $this->title->getDBkey()
+			), __METHOD__
+		);
+		
+		# Not suitable for page load triggered job running!
+		# Gracefully switch to refreshLinks jobs if this happens.
+		if( php_sapi_name() != 'cli' ) {
+			$jobs = array();
+			while( $row = $dbr->fetchObject( $res ) ) {
+				$title = Title::makeTitle( $row->page_namespace, $row->page_title );
+				$jobs[] = new RefreshLinksJob( $title, '' );
+			}
+			Job::batchInsert( $jobs );
+			return true;
+		}
+		# Re-parse each page that transcludes this page and update their tracking links...
+		while( $row = $dbr->fetchObject( $res ) ) {
+			$title = Title::makeTitle( $row->page_namespace, $row->page_title );
+			$revision = Revision::newFromTitle( $title );
+			if ( !$revision ) {
+				$this->error = 'refreshLinks: Article not found "' . $title->getPrefixedDBkey() . '"';
+				wfProfileOut( __METHOD__ );
+				return false;
+			}
+			wfProfileIn( __METHOD__.'-parse' );
+			$options = new ParserOptions;
+			$parserOutput = $wgParser->parse( $revision->getText(), $title, $options, true, true, $revision->getId() );
+			wfProfileOut( __METHOD__.'-parse' );
+			wfProfileIn( __METHOD__.'-update' );
+			$update = new LinksUpdate( $title, $parserOutput, false );
+			$update->doUpdate();
+			wfProfileOut( __METHOD__.'-update' );
+			wfProfileOut( __METHOD__ );
+		}
+
+		return true;
+	}
+}
diff --git a/includes/Revision.php b/includes/Revision.php
index d0ccb46d..7938d88a 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -13,6 +13,11 @@ class Revision {
 	const DELETED_USER = 4;
 	const DELETED_RESTRICTED = 8;
 
+	// Audience options for Revision::getText()
+	const FOR_PUBLIC = 1;
+	const FOR_THIS_USER = 2;
+	const RAW = 3;
+
 	/**
 	 * Load a page revision from a given revision ID number.
 	 * Returns null if no such revision can be found.
@@ -37,16 +42,24 @@ class Revision {
 	 * @return Revision
 	 */
 	public static function newFromTitle( $title, $id = 0 ) {
-		if( $id ) {
-			$matchId = intval( $id );
+		$conds = array( 
+			'page_namespace' => $title->getNamespace(), 
+			'page_title' => $title->getDBkey()
+		);
+		if ( $id ) {
+			// Use the specified ID
+			$conds['rev_id'] = $id;
+		} elseif ( wfGetLB()->getServerCount() > 1 ) {
+			// Get the latest revision ID from the master
+			$dbw = wfGetDB( DB_MASTER );
+			$latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
+			$conds['rev_id'] = $latest;
 		} else {
-			$matchId = 'page_latest';
+			// Use a join to get the latest revision
+			$conds[] = 'rev_id=page_latest';
 		}
-		return Revision::newFromConds(
-			array( "rev_id=$matchId",
-			       'page_id=rev_page',
-			       'page_namespace' => $title->getNamespace(),
-			       'page_title'     => $title->getDBkey() ) );
+		$conds[] = 'page_id=rev_page';
+		return Revision::newFromConds( $conds );
 	}
 
 	/**
@@ -144,7 +157,7 @@ class Revision {
 	private static function newFromConds( $conditions ) {
 		$db = wfGetDB( DB_SLAVE );
 		$row = Revision::loadFromConds( $db, $conditions );
-		if( is_null( $row ) ) {
+		if( is_null( $row ) && wfGetLB()->getServerCount() > 1 ) {
 			$dbw = wfGetDB( DB_MASTER );
 			$row = Revision::loadFromConds( $dbw, $conditions );
 		}
@@ -232,7 +245,7 @@ class Revision {
 			array( 'page', 'revision' ),
 			$fields,
 			$conditions,
-			'Revision::fetchRow',
+			__METHOD__,
 			array( 'LIMIT' => 1 ) );
 		$ret = $db->resultObject( $res );
 		return $ret;
@@ -306,9 +319,9 @@ class Revision {
 				$this->mSize = intval( $row->rev_len );
 
 			if( isset( $row->page_latest ) ) {
-				$this->mCurrent   = ( $row->rev_id == $row->page_latest );
-				$this->mTitle     = Title::makeTitle( $row->page_namespace,
-				                                      $row->page_title );
+				$this->mCurrent = ( $row->rev_id == $row->page_latest );
+				$this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
+				$this->mTitle->resetArticleID( $this->mPage );
 			} else {
 				$this->mCurrent = false;
 				$this->mTitle = null;
@@ -427,11 +440,22 @@ class Revision {
 	}
 
 	/**
-	 * Fetch revision's user id if it's available to all users
+	 * Fetch revision's user id if it's available to the specified audience.
+	 * If the specified audience does not have access to it, zero will be 
+	 * returned.
+	 *
+	 * @param integer $audience One of:
+	 *      Revision::FOR_PUBLIC       to be displayed to all users
+	 *      Revision::FOR_THIS_USER    to be displayed to $wgUser
+	 *      Revision::RAW              get the ID regardless of permissions
+	 *
+	 *
 	 * @return int
 	 */
-	public function getUser() {
-		if( $this->isDeleted( self::DELETED_USER ) ) {
+	public function getUser( $audience = self::FOR_PUBLIC ) {
+		if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_USER ) ) {
+			return 0;
+		} elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_USER ) ) {
 			return 0;
 		} else {
 			return $this->mUser;
@@ -447,11 +471,21 @@ class Revision {
 	}
 
 	/**
-	 * Fetch revision's username if it's available to all users
+	 * Fetch revision's username if it's available to the specified audience.
+	 * If the specified audience does not have access to the username, an 
+	 * empty string will be returned.
+	 *
+	 * @param integer $audience One of:
+	 *      Revision::FOR_PUBLIC       to be displayed to all users
+	 *      Revision::FOR_THIS_USER    to be displayed to $wgUser
+	 *      Revision::RAW              get the text regardless of permissions
+	 *
 	 * @return string
 	 */
-	public function getUserText() {
-		if( $this->isDeleted( self::DELETED_USER ) ) {
+	public function getUserText( $audience = self::FOR_PUBLIC ) {
+		if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_USER ) ) {
+			return "";
+		} elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_USER ) ) {
 			return "";
 		} else {
 			return $this->mUserText;
@@ -467,11 +501,21 @@ class Revision {
 	}
 
 	/**
-	 * Fetch revision comment if it's available to all users
+	 * Fetch revision comment if it's available to the specified audience.
+	 * If the specified audience does not have access to the comment, an 
+	 * empty string will be returned.
+	 *
+	 * @param integer $audience One of:
+	 *      Revision::FOR_PUBLIC       to be displayed to all users
+	 *      Revision::FOR_THIS_USER    to be displayed to $wgUser
+	 *      Revision::RAW              get the text regardless of permissions
+	 *
 	 * @return string
 	 */
-	function getComment() {
-		if( $this->isDeleted( self::DELETED_COMMENT ) ) {
+	function getComment( $audience = self::FOR_PUBLIC ) {
+		if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_COMMENT ) ) {
+			return "";
+		} elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_COMMENT ) ) {
 			return "";
 		} else {
 			return $this->mComment;
@@ -500,13 +544,31 @@ class Revision {
 	public function isDeleted( $field ) {
 		return ($this->mDeleted & $field) == $field;
 	}
+	
+	/**
+	 * Get the deletion bitfield of the revision
+	 */	
+	public function getVisibility() {
+		return (int)$this->mDeleted;
+	}
 
 	/**
-	 * Fetch revision text if it's available to all users
+	 * Fetch revision text if it's available to the specified audience.
+	 * If the specified audience does not have the ability to view this 
+	 * revision, an empty string will be returned.
+	 *
+	 * @param integer $audience One of:
+	 *      Revision::FOR_PUBLIC       to be displayed to all users
+	 *      Revision::FOR_THIS_USER    to be displayed to $wgUser
+	 *      Revision::RAW              get the text regardless of permissions
+	 *
+	 *
 	 * @return string
 	 */
-	public function getText() {
-		if( $this->isDeleted( self::DELETED_TEXT ) ) {
+	public function getText( $audience = self::FOR_PUBLIC ) {
+		if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_TEXT ) ) {
+			return "";
+		} elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_TEXT ) ) {
 			return "";
 		} else {
 			return $this->getRawText();
@@ -514,6 +576,13 @@ class Revision {
 	}
 
 	/**
+	 * Alias for getText(Revision::FOR_THIS_USER)
+	 */
+	public function revText() {
+		return $this->getText( self::FOR_THIS_USER );
+	}
+
+	/**
 	 * Fetch revision text without regard for view restrictions
 	 * @return string
 	 */
@@ -526,18 +595,6 @@ class Revision {
 	}
 
 	/**
-	 * Fetch revision text if it's available to THIS user
-	 * @return string
-	 */
-	public function revText() {
-		if( !$this->userCan( self::DELETED_TEXT ) ) {
-			return "";
-		} else {
-			return $this->getRawText();
-		}
-	}
-
-	/**
 	 * @return string
 	 */
 	public function getTimestamp() {
@@ -607,7 +664,7 @@ class Revision {
 	  * $row is usually an object from wfFetchRow(), both the flags and the text
 	  * field must be included
 	  *
-	  * @param integer $row Id of a row
+	  * @param object $row The text data
 	  * @param string $prefix table prefix (default 'old_')
 	  * @return string $text|false the text requested
 	  */
@@ -663,9 +720,11 @@ class Revision {
 			}
 
 			global $wgLegacyEncoding;
-			if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) ) {
+			if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) ) {
 				# Old revisions kept around in a legacy encoding?
 				# Upconvert on demand.
+				# ("utf8" checked for compatibility with some broken
+				#  conversion scripts 2008-12-30)
 				global $wgInputEncoding, $wgContLang;
 				$text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
 			}
@@ -719,20 +778,13 @@ class Revision {
 		$flags = Revision::compressRevisionText( $data );
 
 		# Write to external storage if required
-		if ( $wgDefaultExternalStore ) {
-			if ( is_array( $wgDefaultExternalStore ) ) {
-				// Distribute storage across multiple clusters
-				$store = $wgDefaultExternalStore[mt_rand(0, count( $wgDefaultExternalStore ) - 1)];
-			} else {
-				$store = $wgDefaultExternalStore;
-			}
+		if( $wgDefaultExternalStore ) {
 			// Store and get the URL
-			$data = ExternalStore::insert( $store, $data );
-			if ( !$data ) {
-				# This should only happen in the case of a configuration error, where the external store is not valid
-				throw new MWException( "Unable to store text to external storage $store" );
+			$data = ExternalStore::insertToDefault( $data );
+			if( !$data ) {
+				throw new MWException( "Unable to store text to external storage" );
 			}
-			if ( $flags ) {
+			if( $flags ) {
 				$flags .= ',';
 			}
 			$flags .= 'external';
@@ -816,7 +868,7 @@ class Revision {
 				__METHOD__ );
 		}
 
-		if( !$row ) {
+		if( !$row && wfGetLB()->getServerCount() > 1 ) {
 			// Possible slave lag!
 			$dbw = wfGetDB( DB_MASTER );
 			$row = $dbw->selectRow( 'text',
@@ -827,7 +879,8 @@ class Revision {
 
 		$text = self::getRevisionText( $row );
 
-		if( $wgRevisionCacheExpiry ) {
+		# No negative caching -- negative hits on text rows may be due to corrupted slave servers
+		if( $wgRevisionCacheExpiry && $text !== false ) {
 			$wgMemc->set( $key, $text, $wgRevisionCacheExpiry );
 		}
 
@@ -855,7 +908,7 @@ class Revision {
 
 		$current = $dbw->selectRow(
 			array( 'page', 'revision' ),
-			array( 'page_latest', 'rev_text_id' ),
+			array( 'page_latest', 'rev_text_id', 'rev_len' ),
 			array(
 				'page_id' => $pageId,
 				'page_latest=rev_id',
@@ -868,7 +921,8 @@ class Revision {
 				'comment'    => $summary,
 				'minor_edit' => $minor,
 				'text_id'    => $current->rev_text_id,
-				'parent_id'  => $current->page_latest
+				'parent_id'  => $current->page_latest,
+				'len'        => $current->rev_len
 				) );
 		} else {
 			$revision = null;
@@ -902,17 +956,15 @@ class Revision {
 
 	/**
 	 * Get rev_timestamp from rev_id, without loading the rest of the row
+	 * @param Title $title
 	 * @param integer $id
-	 * @param integer $pageid, optional
 	 */
-	static function getTimestampFromId( $id, $pageId = 0 ) {
+	static function getTimestampFromId( $title, $id ) {
 		$dbr = wfGetDB( DB_SLAVE );
 		$conds = array( 'rev_id' => $id );
-		if( $pageId ) {
-			$conds['rev_page'] = $pageId;
-		}
+		$conds['rev_page'] = $title->getArticleId();
 		$timestamp = $dbr->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
-		if ( $timestamp === false ) {
+		if ( $timestamp === false && wfGetLB()->getServerCount() > 1 ) {
 			# Not in slave, try master
 			$dbw = wfGetDB( DB_MASTER );
 			$timestamp = $dbw->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 28b1c275..5d58b036 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -331,9 +331,6 @@ $wgHtmlEntityAliases = array(
  * @ingroup Parser
  */
 class Sanitizer {
-	const NONE = 0;
-	const INITIAL_NONLETTER = 1;
-
 	/**
 	 * Cleans up HTML, removes dangerous tags and attributes, and
 	 * removes HTML comments
@@ -616,8 +613,11 @@ class Sanitizer {
 				}
 			}
 
-			if ( $attribute === 'id' )
-				$value = Sanitizer::escapeId( $value );
+			if ( $attribute === 'id' ) {
+				global $wgEnforceHtmlIds;
+				$value = Sanitizer::escapeId( $value,
+					$wgEnforceHtmlIds ? 'noninitial' : 'xml' );
+			}
 
 			// If this attribute was previously set, override it.
 			// Output should only have one attribute of each name.
@@ -627,10 +627,9 @@ class Sanitizer {
 	}
 
 	/**
-	 * Merge two sets of HTML attributes.
-	 * Conflicting items in the second set will override those
-	 * in the first, except for 'class' attributes which will be
-	 * combined.
+	 * Merge two sets of HTML attributes.  Conflicting items in the second set
+	 * will override those in the first, except for 'class' attributes which
+	 * will be combined (if they're both strings).
 	 *
 	 * @todo implement merging for other attributes such as style
 	 * @param array $a
@@ -639,16 +638,12 @@ class Sanitizer {
 	 */
 	static function mergeAttributes( $a, $b ) {
 		$out = array_merge( $a, $b );
-		if( isset( $a['class'] )
-			&& isset( $b['class'] )
-			&& $a['class'] !== $b['class'] ) {
-
-			$out['class'] = implode( ' ',
-				array_unique(
-					preg_split( '/\s+/',
-						$a['class'] . ' ' . $b['class'],
-						-1,
-						PREG_SPLIT_NO_EMPTY ) ) );
+		if( isset( $a['class'] ) && isset( $b['class'] )
+		&& is_string( $a['class'] ) && is_string( $b['class'] )
+		&& $a['class'] !== $b['class'] ) {
+			$classes = preg_split( '/\s+/', "{$a['class']} {$b['class']}",
+				-1, PREG_SPLIT_NO_EMPTY );
+			$out['class'] = implode( ' ', array_unique( $classes ) );
 		}
 		return $out;
 	}
@@ -782,28 +777,55 @@ class Sanitizer {
 	 *                                                          name attributes
 	 * @see http://www.w3.org/TR/html401/struct/links.html#h-12.2.3 Anchors with the id attribute
 	 *
-	 * @param string $id    Id to validate
-	 * @param int    $flags Currently only two values: Sanitizer::INITIAL_NONLETTER
-	 *                      (default) permits initial non-letter characters,
-	 *                      such as if you're adding a prefix to them.
-	 *                      Sanitizer::NONE will prepend an 'x' if the id
-	 *                      would otherwise start with a nonletter.
+	 * @param string $id      Id to validate
+	 * @param mixed  $options String or array of strings (default is array()):
+	 *   'noninitial': This is a non-initial fragment of an id, not a full id,
+	 *       so don't pay attention if the first character isn't valid at the
+	 *       beginning of an id.
+	 *   'xml': Don't restrict the id to be HTML4-compatible.  This option
+	 *       allows any alphabetic character to be used, per the XML standard.
+	 *       Therefore, it also completely changes the type of escaping: instead
+	 *       of weird dot-encoding, runs of invalid characters (mostly
+	 *       whitespace) are just compressed into a single underscore.
 	 * @return string
 	 */
-	static function escapeId( $id, $flags = Sanitizer::INITIAL_NONLETTER ) {
-		static $replace = array(
-			'%3A' => ':',
-			'%' => '.'
-		);
-
-		$id = urlencode( Sanitizer::decodeCharReferences( strtr( $id, ' ', '_' ) ) );
-		$id = str_replace( array_keys( $replace ), array_values( $replace ), $id );
-
-		if( ~$flags & Sanitizer::INITIAL_NONLETTER
-		&& !preg_match( '/[a-zA-Z]/', $id[0] ) ) {
-			// Initial character must be a letter!
-			$id = "x$id";
+	static function escapeId( $id, $options = array() ) {
+		$options = (array)$options;
+
+		if ( !in_array( 'xml', $options ) ) {
+			# HTML4-style escaping
+			static $replace = array(
+				'%3A' => ':',
+				'%' => '.'
+			);
+
+			$id = urlencode( Sanitizer::decodeCharReferences( strtr( $id, ' ', '_' ) ) );
+			$id = str_replace( array_keys( $replace ), array_values( $replace ), $id );
+
+			if ( !preg_match( '/^[a-zA-Z]/', $id )
+			&& !in_array( 'noninitial', $options ) )  {
+				// Initial character must be a letter!
+				$id = "x$id";
+			}
+			return $id;
+		}
+
+		# XML-style escaping.  For the patterns used, see the XML 1.0 standard,
+		# 5th edition, NameStartChar and NameChar: <http://www.w3.org/TR/REC-xml/>
+		$nameStartChar = ':a-zA-Z_\xC0-\xD6\xD8-\xF6\xF8-\x{2FF}\x{370}-\x{37D}'
+			. '\x{37F}-\x{1FFF}\x{200C}-\x{200D}\x{2070}-\x{218F}\x{2C00}-\x{2FEF}'
+			. '\x{3001}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFFD}\x{10000}-\x{EFFFF}';
+		$nameChar = $nameStartChar . '.\-0-9\xB7\x{0300}-\x{036F}'
+			. '\x{203F}-\x{2040}';
+		# Replace _ as well so we don't get multiple consecutive underscores
+		$id = preg_replace( "/([^$nameChar]|_)+/u", '_', $id );
+		$id = trim( $id, '_' );
+
+		if ( !preg_match( "/^[$nameStartChar]/u", $id )
+		&& !in_array( 'noninitial', $options ) ) {
+			$id = "_$id";
 		}
+
 		return $id;
 	}
 
@@ -827,6 +849,22 @@ class Sanitizer {
 	}
 
 	/**
+	 * Given HTML input, escape with htmlspecialchars but un-escape entites.
+	 * This allows (generally harmless) entities like &nbsp; to survive.
+	 *
+	 * @param  string $html String to escape
+	 * @return string Escaped input
+	 */
+	static function escapeHtmlAllowEntities( $html ) {
+		# It seems wise to escape ' as well as ", as a matter of course.  Can't
+		# hurt.
+		$html = htmlspecialchars( $html, ENT_QUOTES );
+		$html = str_replace( '&amp;', '&', $html );
+		$html = Sanitizer::normalizeCharReferences( $html );
+		return $html;
+	}
+
+	/**
 	 * Regex replace callback for armoring links against further processing.
 	 * @param array $matches
 	 * @return string
@@ -844,7 +882,7 @@ class Sanitizer {
 	 * @param string
 	 * @return array
 	 */
-	static function decodeTagAttributes( $text ) {
+	public static function decodeTagAttributes( $text ) {
 		$attribs = array();
 
 		if( trim( $text ) == '' ) {
@@ -1111,7 +1149,8 @@ class Sanitizer {
 	}
 
 	/**
-	 * @todo Document it a bit
+	 * Foreach array key (an allowed HTML element), return an array
+	 * of allowed attributes
 	 * @return array
 	 */
 	static function setupAttributeWhitelist() {
@@ -1301,7 +1340,7 @@ class Sanitizer {
 		return $out;
 	}
 
-	static function cleanUrl( $url, $hostname=true ) {
+	static function cleanUrl( $url ) {
 		# Normalize any HTML entities in input. They will be
 		# re-escaped by makeExternalLink().
 		$url = Sanitizer::decodeCharReferences( $url );
diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index edd93cce..3ea0341d 100644
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -13,6 +13,7 @@
 class SearchEngine {
 	var $limit = 10;
 	var $offset = 0;
+	var $prefix = '';
 	var $searchTerms = array();
 	var $namespaces = array( NS_MAIN );
 	var $showRedirects = false;
@@ -43,6 +44,19 @@ class SearchEngine {
 		return null;
 	}
 	
+	/** If this search backend can list/unlist redirects */
+	function acceptListRedirects() {
+		return true;
+	}
+	
+	/**
+	 * Transform search term in cases when parts of the query came as different GET params (when supported)
+	 * e.g. for prefix queries: search=test&prefix=Main_Page/Archive -> test prefix:Main Page/Archive
+	 */
+	function transformSearchTerm( $term ) {
+		return $term;
+	}
+	
 	/**
 	 * If an exact title match can be find, or a very slightly close match,
 	 * return the title. If no match, returns NULL.
@@ -98,19 +112,6 @@ class SearchEngine {
 				return $title;
 			}
 
-			global $wgCapitalLinks, $wgContLang;
-			if( !$wgCapitalLinks ) {
-				// Catch differs-by-first-letter-case-only
-				$title = Title::newFromText( $wgContLang->ucfirst( $term ) );
-				if ( $title && $title->exists() ) {
-					return $title;
-				}
-				$title = Title::newFromText( $wgContLang->lcfirst( $term ) );
-				if ( $title && $title->exists() ) {
-					return $title;
-				}
-			}
-
 			// Give hooks a chance at better match variants
 			$title = null;
 			if( !wfRunHooks( 'SearchGetNearMatch', array( $term, &$title ) ) ) {
@@ -135,7 +136,7 @@ class SearchEngine {
 		# Go to images that exist even if there's no local page.
 		# There may have been a funny upload, or it may be on a shared
 		# file repository such as Wikimedia Commons.
-		if( $title->getNamespace() == NS_IMAGE ) {
+		if( $title->getNamespace() == NS_FILE ) {
 			$image = wfFindFile( $title );
 			if( $image ) {
 				return $title;
@@ -158,7 +159,7 @@ class SearchEngine {
 	}
 
 	public static function legalSearchChars() {
-		return "A-Za-z_'0-9\\x80-\\xFF\\-";
+		return "A-Za-z_'.0-9\\x80-\\xFF\\-";
 	}
 
 	/**
@@ -275,7 +276,51 @@ class SearchEngine {
 		
 		return array_keys($wgNamespacesToBeSearchedDefault, true);
 	}
-
+	
+	/**
+	 * Get a list of namespace names useful for showing in tooltips
+	 * and preferences
+	 *
+	 * @param unknown_type $namespaces
+	 */
+	public static function namespacesAsText( $namespaces ){
+		global $wgContLang;
+		
+		$formatted = array_map( array($wgContLang,'getFormattedNsText'), $namespaces );
+		foreach( $formatted as $key => $ns ){
+			if ( empty($ns) )
+				$formatted[$key] = wfMsg( 'blanknamespace' );
+		}
+		return $formatted;
+	}
+	
+	/**
+	 * An array of "project" namespaces indexes typically searched
+	 * by logged-in users
+	 * 
+	 * @return array 
+	 * @static
+	 */
+	public static function projectNamespaces() {
+		global $wgNamespacesToBeSearchedDefault, $wgNamespacesToBeSearchedProject;
+		
+		return array_keys( $wgNamespacesToBeSearchedProject, true );
+	}
+	
+	/**
+	 * An array of "project" namespaces indexes typically searched
+	 * by logged-in users in addition to the default namespaces
+	 * 
+	 * @return array 
+	 * @static
+	 */
+	public static function defaultAndProjectNamespaces() {
+		global $wgNamespacesToBeSearchedDefault, $wgNamespacesToBeSearchedProject;
+		
+		return array_keys( $wgNamespacesToBeSearchedDefault + 
+			$wgNamespacesToBeSearchedProject, true);
+	}
+	
 	/**
 	 * Return a 'cleaned up' search string
 	 *
@@ -290,24 +335,17 @@ class SearchEngine {
 	 * Load up the appropriate search engine class for the currently
 	 * active database backend, and return a configured instance.
 	 *
-	 * @fixme Ask the database class for his default search class
-	 * instead of knowing about every backend here.
 	 * @return SearchEngine
 	 */
 	public static function create() {
-		global $wgDBtype, $wgSearchType;
+		global $wgSearchType;
+		$dbr = wfGetDB( DB_SLAVE );
 		if( $wgSearchType ) {
 			$class = $wgSearchType;
-		} elseif( $wgDBtype == 'mysql' ) {
-			$class = 'SearchMySQL';
-		} else if ( $wgDBtype == 'postgres' ) {
-			$class = 'SearchPostgres';
-		} else if ( $wgDBtype == 'oracle' ) {
-			$class = 'SearchOracle';
 		} else {
-			$class = 'SearchEngineDummy';
+			$class = $dbr->getSearchEngine();
 		}
-		$search = new $class( wfGetDB( DB_SLAVE ) );
+		$search = new $class( $dbr );
 		$search->setLimitOffset(0,0);
 		return $search;
 	}
@@ -345,11 +383,11 @@ class SearchEngine {
 	 */
 	public static function getOpenSearchTemplate() {
 		global $wgOpenSearchTemplate, $wgServer, $wgScriptPath;
-		if($wgOpenSearchTemplate)		
+		if( $wgOpenSearchTemplate )	{	
 			return $wgOpenSearchTemplate;
-		else{ 
-			$ns = implode(',',SearchEngine::defaultNamespaces());
-			if(!$ns) $ns = "0";
+		} else { 
+			$ns = implode( '|', SearchEngine::defaultNamespaces() );
+			if( !$ns ) $ns = "0";
 			return $wgServer . $wgScriptPath . '/api.php?action=opensearch&search={searchTerms}&namespace='.$ns;
 		}
 	}
@@ -432,7 +470,7 @@ class SearchResultSet {
 	}
 
 	/**
-	 * @return string highlighted suggested query, '' if none
+	 * @return string HTML highlighted suggested query, '' if none
 	 */
 	function getSuggestionSnippet(){
 		return '';
@@ -503,11 +541,15 @@ class SearchResultTooMany {
  */
 class SearchResult {
 	var $mRevision = null;
+	var $mImage = null;
 
-	function SearchResult( $row ) {
+	function __construct( $row ) {
 		$this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
-		if( !is_null($this->mTitle) )
+		if( !is_null($this->mTitle) ){
 			$this->mRevision = Revision::newFromTitle( $this->mTitle );
+			if( $this->mTitle->getNamespace() === NS_FILE )
+				$this->mImage = wfFindFile( $this->mTitle );
+		}
 	}
 	
 	/**
@@ -529,9 +571,7 @@ class SearchResult {
 	 * @access public
 	 */
 	function isMissingRevision(){
-		if( !$this->mRevision )
-			return true;
-		return false;
+		return !$this->mRevision && !$this->mImage;
 	}
 
 	/**
@@ -554,7 +594,11 @@ class SearchResult {
 	 */
 	protected function initText(){
 		if( !isset($this->mText) ){
-			$this->mText = $this->mRevision->getText();
+			if($this->mRevision != null)
+				$this->mText = $this->mRevision->getText();
+			else // TODO: can we fetch raw wikitext for commons images?
+				$this->mText = '';
+			
 		}
 	}
 	
@@ -614,7 +658,11 @@ class SearchResult {
 	 * @return string timestamp
 	 */
 	function getTimestamp(){
-		return $this->mRevision->getTimestamp();
+		if( $this->mRevision )
+			return $this->mRevision->getTimestamp();
+		else if( $this->mImage )
+			return $this->mImage->getTimestamp();
+		return '';			
 	}
 
 	/**
@@ -706,7 +754,7 @@ class SearchHighlighter {
 						if($key == 2){
 							// see if this is an image link
 							$ns = substr($val[0],2,-1);
-							if( $wgContLang->getNsIndex($ns) != NS_IMAGE )
+							if( $wgContLang->getNsIndex($ns) != NS_FILE )
 								break;
 							
 						}
@@ -761,13 +809,12 @@ class SearchHighlighter {
 		
 		// prepare regexps
 		foreach( $terms as $index => $term ) {
-			$terms[$index] = preg_quote( $term, '/' );			
 			// manually do upper/lowercase stuff for utf-8 since PHP won't do it
 			if(preg_match('/[\x80-\xff]/', $term) ){
 				$terms[$index] = preg_replace_callback('/./us',array($this,'caseCallback'),$terms[$index]);
+			} else {
+				$terms[$index] = $term;
 			}
-			
-			
 		}
 		$anyterm = implode( '|', $terms );
 		$phrase = implode("$wgSearchHighlightBoundaries+", $terms );
@@ -1077,7 +1124,7 @@ class SearchHighlighter {
 		global $wgContLang;
 		$ns = substr( $matches[1], 0, $colon );
 		$index = $wgContLang->getNsIndex($ns);
-		if( $index !== false && ($index == NS_IMAGE || $index == NS_CATEGORY) )
+		if( $index !== false && ($index == NS_FILE || $index == NS_CATEGORY) )
 			return $matches[0]; // return the whole thing 
 		else
 			return $matches[2];
@@ -1097,11 +1144,10 @@ class SearchHighlighter {
     public function highlightSimple( $text, $terms, $contextlines, $contextchars ) {
         global $wgLang, $wgContLang;
         $fname = __METHOD__;
-    
+
         $lines = explode( "\n", $text );
         
         $terms = implode( '|', $terms );
-        $terms = str_replace( '/', "\\/", $terms);
         $max = intval( $contextchars ) + 1;
         $pat1 = "/(.*)($terms)(.{0,$max})/i";
 
diff --git a/includes/SearchMySQL.php b/includes/SearchMySQL.php
index f9b71c8e..5fc06790 100644
--- a/includes/SearchMySQL.php
+++ b/includes/SearchMySQL.php
@@ -34,7 +34,10 @@ class SearchMySQL extends SearchEngine {
 		$this->db = $db;
 	}
 
-	/** @todo document */
+	/** 
+	 * Parse the user's query and transform it into an SQL fragment which will 
+	 * become part of a WHERE clause
+	 */
 	function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
 		$lc = SearchEngine::legalSearchChars(); // Minus format chars
@@ -54,7 +57,11 @@ class SearchMySQL extends SearchEngine {
 				if( !empty( $terms[3] ) ) {
 					// Match individual terms in result highlighting...
 					$regexp = preg_quote( $terms[3], '/' );
-					if( $terms[4] ) $regexp .= "[0-9A-Za-z_]+";
+					if( $terms[4] ) {
+						$regexp = "\b$regexp"; // foo*
+					} else {
+						$regexp = "\b$regexp\b";
+					}
 				} else {
 					// Match the quoted term in result highlighting...
 					$regexp = preg_quote( str_replace( '"', '', $terms[2] ), '/' );
@@ -122,9 +129,10 @@ class SearchMySQL extends SearchEngine {
 	function queryNamespaces() {
 		if( is_null($this->namespaces) )
 			return '';  # search all
-		$namespaces = implode( ',', $this->namespaces );
-		if ($namespaces == '') {
+		if ( !count( $this->namespaces ) ) {
 			$namespaces = '0';
+		} else {
+			$namespaces = $this->db->makeList( $this->namespaces );
 		}
 		return 'AND page_namespace IN (' . $namespaces . ')';
 	}
diff --git a/includes/SearchOracle.php b/includes/SearchOracle.php
index bf9368d1..b48d5e6e 100644
--- a/includes/SearchOracle.php
+++ b/includes/SearchOracle.php
@@ -77,9 +77,10 @@ class SearchOracle extends SearchEngine {
 	function queryNamespaces() {
 		if( is_null($this->namespaces) )
 			return '';
-		$namespaces = implode(',', $this->namespaces);
-		if ($namespaces == '') {
+		if ( !count( $this->namespaces ) ) {
 			$namespaces = '0';
+		} else {
+			$namespaces = $this->db->makeList( $this->namespaces );
 		}
 		return 'AND page_namespace IN (' . $namespaces . ')';
 	}
@@ -144,7 +145,10 @@ class SearchOracle extends SearchEngine {
 			'WHERE page_id=si_page AND ' . $match;
 	}
 
-	/** @todo document */
+	/** 
+	 * Parse a user input search string, and return an SQL fragment to be used 
+	 * as part of a WHERE clause
+	 */
 	function parseQuery($filteredText, $fulltext) {
 		global $wgContLang;
 		$lc = SearchEngine::legalSearchChars();
@@ -170,9 +174,9 @@ class SearchOracle extends SearchEngine {
 			}
 		}
 
-		$searchon = $this->db->strencode(join(',', $q));
+		$searchon = $this->db->addQuotes(join(',', $q));
 		$field = $this->getIndexField($fulltext);
-		return " CONTAINS($field, '$searchon', 1) > 0 ";
+		return " CONTAINS($field, $searchon, 1) > 0 ";
 	}
 
 	/**
diff --git a/includes/SearchPostgres.php b/includes/SearchPostgres.php
index 88e4a0da..4862a44e 100644
--- a/includes/SearchPostgres.php
+++ b/includes/SearchPostgres.php
@@ -66,6 +66,7 @@ class SearchPostgres extends SearchEngine {
 
 	/*
 	 * Transform the user's search string into a better form for tsearch2
+	 * Returns an SQL fragment consisting of quoted text to search for.
 	*/
 	function parseQuery( $term ) {
 
@@ -142,6 +143,7 @@ class SearchPostgres extends SearchEngine {
 		}
 		$prefix = $wgDBversion < 8.3 ? "'default'," : '';
 
+		# Get the SQL fragment for the given term
 		$searchstring = $this->parseQuery( $term );
 
 		## We need a separate query here so gin does not complain about empty searches
@@ -183,7 +185,7 @@ class SearchPostgres extends SearchEngine {
 			if ( count($this->namespaces) < 1)
 				$query .= ' AND page_namespace = 0';
 			else {
-				$namespaces = implode( ',', $this->namespaces );
+				$namespaces = $this->db->makeList( $this->namespaces );
 				$query .= " AND page_namespace IN ($namespaces)";
 			}
 		}
@@ -201,9 +203,9 @@ class SearchPostgres extends SearchEngine {
 
 	function update( $pageid, $title, $text ) {
 		## We don't want to index older revisions
-		$SQL = "UPDATE pagecontent SET textvector = NULL WHERE old_id = ".
-				"(SELECT rev_text_id FROM revision WHERE rev_page = $pageid ".
-				"ORDER BY rev_text_id DESC LIMIT 1 OFFSET 1)";
+		$SQL = "UPDATE pagecontent SET textvector = NULL WHERE old_id IN ".
+				"(SELECT rev_text_id FROM revision WHERE rev_page = " . intval( $pageid ) . 
+				" ORDER BY rev_text_id DESC OFFSET 1)";
 		$this->db->doQuery($SQL);
 		return true;
 	}
diff --git a/includes/Setup.php b/includes/Setup.php
index 36c4d965..859ad008 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -59,6 +59,23 @@ if ( empty( $wgFileStore['deleted']['directory'] ) ) {
 }
 
 /**
+ * Unconditional protection for NS_MEDIAWIKI since otherwise it's too easy for a 
+ * sysadmin to set $wgNamespaceProtection incorrectly and leave the wiki insecure. 
+ *
+ * Note that this is the definition of editinterface and it can be granted to 
+ * all users if desired.
+ */
+$wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
+
+/**
+ * The canonical names of namespaces 6 and 7 are, as of v1.14, "File"
+ * and "File_talk".  The old names "Image" and "Image_talk" are
+ * retained as aliases for backwards compatibility.
+ */
+$wgNamespaceAliases['Image'] = NS_FILE;
+$wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
+
+/**
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
@@ -137,12 +154,6 @@ wfProfileIn( $fname.'-misc1' );
 $wgIP = false; # Load on demand
 # Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
 $wgRequest = new WebRequest;
-if ( function_exists( 'posix_uname' ) ) {
-	$wguname = posix_uname();
-	$wgNodeName = $wguname['nodename'];
-} else {
-	$wgNodeName = '';
-}
 
 # Useful debug output
 if ( $wgCommandLineMode ) {
@@ -198,15 +209,19 @@ wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
 	"\nParser cache: " . get_class( $parserMemc ) . "\n" );
 
 wfProfileOut( $fname.'-memcached' );
+
+## Most of the config is out, some might want to run hooks here.
+wfRunHooks( 'SetupAfterCache' );
+
 wfProfileIn( $fname.'-SetupSession' );
 
 # Set default shared prefix
 if( $wgSharedPrefix === false ) $wgSharedPrefix = $wgDBprefix;
 
 if( !$wgCookiePrefix ) {
-	if ( in_array('user', $wgSharedTables) && $wgSharedDB && $wgSharedPrefix ) {
+	if ( $wgSharedDB && $wgSharedPrefix && in_array('user',$wgSharedTables) ) {
 		$wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
-	} elseif ( in_array('user', $wgSharedTables) && $wgSharedDB ) {
+	} elseif ( $wgSharedDB && in_array('user',$wgSharedTables) ) {
 		$wgCookiePrefix = $wgSharedDB;
 	} elseif ( $wgDBprefix ) {
 		$wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
@@ -269,7 +284,6 @@ wfProfileIn( $fname.'-misc2' );
 $wgDeferredUpdateList = array();
 $wgPostCommitUpdateList = array();
 
-if ( $wgAjaxSearch ) $wgAjaxExportList[] = 'wfSajaxSearch';
 if ( $wgAjaxWatch ) $wgAjaxExportList[] = 'wfAjaxWatch';
 if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'UploadForm::ajaxGetExistsWarning';
 if( $wgAjaxLicensePreview )
@@ -299,6 +313,16 @@ wfRunHooks( 'LogPageLogName', array( &$wgLogNames ) );
 wfRunHooks( 'LogPageLogHeader', array( &$wgLogHeaders ) );
 wfRunHooks( 'LogPageActionText', array( &$wgLogActions ) );
 
+if( !empty($wgNewUserLog) ) {
+	# Add a new log type
+	$wgLogTypes[]                        = 'newusers';
+	$wgLogNames['newusers']              = 'newuserlogpage';
+	$wgLogHeaders['newusers']            = 'newuserlogpagetext';
+	$wgLogActions['newusers/newusers']   = 'newuserlogentry'; // For compatibility with older log entries
+	$wgLogActions['newusers/create']     = 'newuserlog-create-entry';
+	$wgLogActions['newusers/create2']    = 'newuserlog-create2-entry';
+	$wgLogActions['newusers/autocreate'] = 'newuserlog-autocreate-entry';
+}
 
 wfDebug( "Fully initialised\n" );
 $wgFullyInitialised = true;
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 6cdd5082..2ed28139 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -5,57 +5,143 @@
  * meaning that require_once() fails to detect that it is including the same
  * file again. We use DIY C-style protection as a workaround.
  */
-if (!defined('SITE_CONFIGURATION')) {
-define('SITE_CONFIGURATION', 1);
+
+// Hide this pattern from Doxygen, which spazzes out at it
+/// @cond
+if( !defined( 'SITE_CONFIGURATION' ) ){
+define( 'SITE_CONFIGURATION', 1 );
+/// @endcond
 
 /**
  * This is a class used to hold configuration settings, particularly for multi-wiki sites.
- *
  */
 class SiteConfiguration {
-	var $suffixes = array();
-	var $wikis = array();
-	var $settings = array();
-	var $localVHosts = array();
-
-	/** */
-	function get( $settingName, $wiki, $suffix, $params = array(), $wikiTags = array() ) {
-		if ( array_key_exists( $settingName, $this->settings ) ) {
+
+	/**
+	 * Array of suffixes, for self::siteFromDB()
+	 */
+	public $suffixes = array();
+
+	/**
+	 * Array of wikis, should be the same as $wgLocalDatabases
+	 */
+	public $wikis = array();
+
+	/**
+	 * The whole array of settings
+	 */
+	public $settings = array();
+
+	/**
+	 * Array of domains that are local and can be handled by the same server
+	 */
+	public $localVHosts = array();
+
+	/**
+	 * A callback function that returns an array with the following keys (all
+	 * optional):
+	 * - suffix: site's suffix
+	 * - lang: site's lang
+	 * - tags: array of wiki tags
+	 * - params: array of parameters to be replaced
+	 * The function will receive the SiteConfiguration instance in the first
+	 * argument and the wiki in the second one.
+	 * if suffix and lang are passed they will be used for the return value of
+	 * self::siteFromDB() and self::$suffixes will be ignored
+	 */
+	public $siteParamsCallback = null;
+
+	/**
+	 * Retrieves a configuration setting for a given wiki.
+	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 * @return Mixed the value of the setting requested.
+	 */
+	public function get( $settingName, $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
+		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
+		return $this->getSetting( $settingName, $wiki, $params );
+	}
+
+	/**
+	 * Really retrieves a configuration setting for a given wiki.
+	 *
+	 * @param $settingName String ID of the setting name to retrieve.
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $params Array: array of parameters.
+	 * @return Mixed the value of the setting requested.
+	 */
+	protected function getSetting( $settingName, $wiki, /*array*/ $params ){
+		$retval = null;
+		if( array_key_exists( $settingName, $this->settings ) ) {
 			$thisSetting =& $this->settings[$settingName];
 			do {
-				if ( array_key_exists( $wiki, $thisSetting ) ) {
+				// Do individual wiki settings
+				if( array_key_exists( $wiki, $thisSetting ) ) {
 					$retval = $thisSetting[$wiki];
 					break;
+				} elseif( array_key_exists( "+$wiki", $thisSetting ) && is_array( $thisSetting["+$wiki"] ) ) {
+					$retval = $thisSetting["+$wiki"];
 				}
-				foreach ( $wikiTags as $tag ) {
-					if ( array_key_exists( $tag, $thisSetting ) ) {
-						$retval = $thisSetting[$tag];
+
+				// Do tag settings
+				foreach( $params['tags'] as $tag ) {
+					if( array_key_exists( $tag, $thisSetting ) ) {
+						if ( isset( $retval ) && is_array( $retval ) && is_array( $thisSetting[$tag] ) ) {
+							$retval = self::arrayMerge( $retval, $thisSetting[$tag] );
+						} else {
+							$retval = $thisSetting[$tag];
+						}
 						break 2;
+					} elseif( array_key_exists( "+$tag", $thisSetting ) && is_array($thisSetting["+$tag"]) ) {
+						if( !isset( $retval ) )
+							$retval = array();
+						$retval = self::arrayMerge( $retval, $thisSetting["+$tag"] );
 					}
 				}
-				if ( array_key_exists( $suffix, $thisSetting ) ) {
-					$retval = $thisSetting[$suffix];
-					break;
+				// Do suffix settings
+				$suffix = $params['suffix'];
+				if( !is_null( $suffix ) ) {
+					if( array_key_exists( $suffix, $thisSetting ) ) {
+						if ( isset($retval) && is_array($retval) && is_array($thisSetting[$suffix]) ) {
+							$retval = self::arrayMerge( $retval, $thisSetting[$suffix] );
+						} else {
+							$retval = $thisSetting[$suffix];
+						}
+						break;
+					} elseif( array_key_exists( "+$suffix", $thisSetting ) && is_array($thisSetting["+$suffix"]) ) {
+						if (!isset($retval))
+							$retval = array();
+						$retval = self::arrayMerge( $retval, $thisSetting["+$suffix"] );
+					}
 				}
-				if ( array_key_exists( 'default', $thisSetting ) ) {
-					$retval = $thisSetting['default'];
+
+				// Fall back to default.
+				if( array_key_exists( 'default', $thisSetting ) ) {
+					if( is_array( $retval ) && is_array( $thisSetting['default'] ) ) {
+						$retval = self::arrayMerge( $retval, $thisSetting['default'] );
+					} else {
+						$retval = $thisSetting['default'];
+					}
 					break;
 				}
-				$retval = null;
 			} while ( false );
-		} else {
-			$retval = NULL;
 		}
 
-		if ( !is_null( $retval ) && count( $params ) ) {
-			foreach ( $params as $key => $value ) {
+		if( !is_null( $retval ) && count( $params['params'] ) ) {
+			foreach ( $params['params'] as $key => $value ) {
 				$retval = $this->doReplace( '$' . $key, $value, $retval );
 			}
 		}
 		return $retval;
 	}
 
-	/** Type-safe string replace; won't do replacements on non-strings */
+	/**
+	 * Type-safe string replace; won't do replacements on non-strings
+	 * private?
+	 */
 	function doReplace( $from, $to, $in ) {
 		if( is_string( $in ) ) {
 			return str_replace( $from, $to, $in );
@@ -69,62 +155,191 @@ class SiteConfiguration {
 		}
 	}
 
-	/** */
-	function getAll( $wiki, $suffix, $params, $wikiTags = array() ) {
+	/**
+	 * Gets all settings for a wiki
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 * @return Array Array of settings requested.
+	 */
+	public function getAll( $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
+		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
 		$localSettings = array();
-		foreach ( $this->settings as $varname => $stuff ) {
-			$value = $this->get( $varname, $wiki, $suffix, $params, $wikiTags );
+		foreach( $this->settings as $varname => $stuff ) {
+			$append = false;
+			$var = $varname;
+			if ( substr( $varname, 0, 1 ) == '+' ) {
+				$append = true;
+				$var = substr( $varname, 1 );
+			}
+
+			$value = $this->getSetting( $varname, $wiki, $params );
+			if ( $append && is_array( $value ) && is_array( $GLOBALS[$var] ) )
+				$value = self::arrayMerge( $value, $GLOBALS[$var] );
 			if ( !is_null( $value ) ) {
-				$localSettings[$varname] = $value;
+				$localSettings[$var] = $value;
 			}
 		}
 		return $localSettings;
 	}
 
-	/** */
-	function getBool( $setting, $wiki, $suffix, $wikiTags = array() ) {
+	/**
+	 * Retrieves a configuration setting for a given wiki, forced to a boolean.
+	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 * @return bool The value of the setting requested.
+	 */
+	public function getBool( $setting, $wiki, $suffix = null, $wikiTags = array() ) {
 		return (bool)($this->get( $setting, $wiki, $suffix, array(), $wikiTags ) );
 	}
 
-	/** */
+	/** Retrieves an array of local databases */
 	function &getLocalDatabases() {
 		return $this->wikis;
 	}
 
-	/** */
+	/** A no-op */
 	function initialise() {
 	}
 
-	/** */
-	function extractVar( $setting, $wiki, $suffix, &$var, $params, $wikiTags = array() ) {
+	/**
+	 * Retrieves the value of a given setting, and places it in a variable passed by reference.
+	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $var Reference The variable to insert the value into.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 */
+	public function extractVar( $setting, $wiki, $suffix, &$var, $params = array(), $wikiTags = array() ) {
 		$value = $this->get( $setting, $wiki, $suffix, $params, $wikiTags );
 		if ( !is_null( $value ) ) {
 			$var = $value;
 		}
 	}
 
-	/** */
-	function extractGlobal( $setting, $wiki, $suffix, $params, $wikiTags = array() ) {
-		$value = $this->get( $setting, $wiki, $suffix, $params, $wikiTags );
+	/**
+	 * Retrieves the value of a given setting, and places it in its corresponding global variable.
+	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 */
+	public function extractGlobal( $setting, $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
+		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
+		$this->extractGlobalSetting( $setting, $wiki, $params );
+	}
+
+	public function extractGlobalSetting( $setting, $wiki, $params ) {
+		$value = $this->getSetting( $setting, $wiki, $params );
 		if ( !is_null( $value ) ) {
-			$GLOBALS[$setting] = $value;
+			if (substr($setting,0,1) == '+' && is_array($value)) {
+				$setting = substr($setting,1);
+				if ( is_array($GLOBALS[$setting]) ) {
+					$GLOBALS[$setting] = self::arrayMerge( $GLOBALS[$setting], $value );
+				} else {
+					$GLOBALS[$setting] = $value;
+				}
+			} else {
+				$GLOBALS[$setting] = $value;
+			}
 		}
 	}
 
-	/** */
-	function extractAllGlobals( $wiki, $suffix, $params, $wikiTags = array() ) {
+	/**
+	 * Retrieves the values of all settings, and places them in their corresponding global variables.
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 */
+	public function extractAllGlobals( $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
+		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
 		foreach ( $this->settings as $varName => $setting ) {
-			$this->extractGlobal( $varName, $wiki, $suffix, $params, $wikiTags );
+			$this->extractGlobalSetting( $varName, $wiki, $params );
 		}
 	}
 
 	/**
+	 * Return specific settings for $wiki
+	 * See the documentation of self::$siteParamsCallback for more in-depth
+	 * documentation about this function
+	 *
+	 * @param $wiki String
+	 * @return array
+	 */
+	protected function getWikiParams( $wiki ){
+		static $default = array(
+			'suffix' => null,
+			'lang' => null,
+			'tags' => array(),
+			'params' => array(),
+		);
+
+		if( !is_callable( $this->siteParamsCallback ) )
+			return $default;
+
+		$ret = call_user_func_array( $this->siteParamsCallback, array( $this, $wiki ) );
+		# Validate the returned value
+		if( !is_array( $ret ) )
+			return $default;
+
+		foreach( $default as $name => $def ){
+			if( !isset( $ret[$name] ) || ( is_array( $default[$name] ) && !is_array( $ret[$name] ) ) )
+				$ret[$name] = $default[$name];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Merge params beetween the ones passed to the function and the ones given
+	 * by self::$siteParamsCallback for backward compatibility
+	 * Values returned by self::getWikiParams() have the priority.
+	 *
+	 * @param $wiki String Wiki ID of the wiki in question.
+	 * @param $suffix String The suffix of the wiki in question.
+	 * @param $params Array List of parameters. $.'key' is replaced by $value in
+	 *                all returned data.
+	 * @param $wikiTags Array The tags assigned to the wiki.
+	 * @return array
+	 */
+	protected function mergeParams( $wiki, $suffix, /*array*/ $params, /*array*/ $wikiTags ){
+		$ret = $this->getWikiParams( $wiki );
+
+		if( is_null( $ret['suffix'] ) )
+			$ret['suffix'] = $suffix;
+
+		$ret['tags'] = array_unique( array_merge( $ret['tags'], $wikiTags ) );
+
+		$ret['params'] += $params;
+
+		// Automatically fill that ones if needed
+		if( !isset( $ret['params']['lang'] ) && !is_null( $ret['lang'] ) )
+			$ret['params']['lang'] = $ret['lang'];
+		if( !isset( $ret['params']['site'] ) && !is_null( $ret['suffix'] ) )
+			$ret['params']['site'] = $ret['suffix'];
+
+		return $ret;
+	}
+
+	/**
 	 * Work out the site and language name from a database name
 	 * @param $db
 	 */
-	function siteFromDB( $db ) {
-		$site = NULL;
-		$lang = NULL;
+	public function siteFromDB( $db ) {
+		// Allow override
+		$def = $this->getWikiParams( $db );
+		if( !is_null( $def['suffix'] ) && !is_null( $def['lang'] ) )
+			return array( $def['suffix'], $def['lang'] );
+
+		$site = null;
+		$lang = null;
 		foreach ( $this->suffixes as $suffix ) {
 			if ( $suffix === '' ) {
 				$site = '';
@@ -140,9 +355,37 @@ class SiteConfiguration {
 		return array( $site, $lang );
 	}
 
-	/** */
-	function isLocalVHost( $vhost ) {
+	/**
+	 * Returns true if the given vhost is handled locally.
+	 * @param $vhost String
+	 * @return bool
+	 */
+	public function isLocalVHost( $vhost ) {
 		return in_array( $vhost, $this->localVHosts );
 	}
+
+	/**
+	 * Merge multiple arrays together.
+	 * On encountering duplicate keys, merge the two, but ONLY if they're arrays.
+	 * PHP's array_merge_recursive() merges ANY duplicate values into arrays,
+	 * which is not fun
+	 */
+	static function arrayMerge( $array1/* ... */ ) {
+		$out = $array1;
+		for( $i=1; $i < func_num_args(); $i++ ) {
+			foreach( func_get_arg( $i ) as $key => $value ) {
+				if ( isset($out[$key]) && is_array($out[$key]) && is_array($value) ) {
+					$out[$key] = self::arrayMerge( $out[$key], $value );
+				} elseif ( !isset($out[$key]) || !$out[$key] && !is_numeric($key) ) {
+					// Values that evaluate to true given precedence, for the primary purpose of merging permissions arrays.
+					$out[$key] = $value;
+				} elseif ( is_numeric( $key ) ) {
+					$out[] = $value;
+				}
+			}
+		}
+
+		return $out;
+	}
 }
 }
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 3b10f4a0..ab0caa7e 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -7,6 +7,7 @@ class SiteStats {
 	static $row, $loaded = false;
 	static $admins, $jobs;
 	static $pageCount = array();
+	static $groupMemberCounts = array();
 
 	static function recache() {
 		self::load( true );
@@ -92,18 +93,44 @@ class SiteStats {
 		self::load();
 		return self::$row->ss_users;
 	}
+	
+	static function activeUsers() {
+		self::load();
+		return self::$row->ss_active_users;
+	}
 
 	static function images() {
 		self::load();
 		return self::$row->ss_images;
 	}
 
+	/**
+	 * @deprecated Use self::numberingroup('sysop') instead
+	 */
 	static function admins() {
-		if ( !isset( self::$admins ) ) {
-			$dbr = wfGetDB( DB_SLAVE );
-			self::$admins = $dbr->selectField( 'user_groups', 'COUNT(*)', array( 'ug_group' => 'sysop' ), __METHOD__ );
+		wfDeprecated(__METHOD__);
+		return self::numberingroup('sysop');
+	}
+	
+	/**
+	 * Find the number of users in a given user group.
+	 * @param string $group Name of group
+	 * @return int
+	 */
+	static function numberingroup($group) {
+		if ( !isset( self::$groupMemberCounts[$group] ) ) {
+			global $wgMemc;
+			$key = wfMemcKey( 'SiteStats', 'groupcounts', $group );
+			$hit = $wgMemc->get( $key );
+			if ( !$hit ) {
+				$dbr = wfGetDB( DB_SLAVE );
+				$hit = $dbr->selectField( 'user_groups', 'COUNT(*)', 
+													array( 'ug_group' => $group ), __METHOD__ );
+				$wgMemc->set( $key, $hit, 3600 );
+			}
+			self::$groupMemberCounts[$group] = $hit;
 		}
-		return self::$admins;
+		return self::$groupMemberCounts[$group];		
 	}
 
 	static function jobs() {
@@ -185,54 +212,35 @@ class SiteStatsUpdate {
 		$fname = 'SiteStatsUpdate::doUpdate';
 		$dbw = wfGetDB( DB_MASTER );
 
-		# First retrieve the row just to find out which schema we're in
-		$row = $dbw->selectRow( 'site_stats', '*', false, $fname );
-
 		$updates = '';
 
 		$this->appendUpdate( $updates, 'ss_total_views', $this->mViews );
 		$this->appendUpdate( $updates, 'ss_total_edits', $this->mEdits );
 		$this->appendUpdate( $updates, 'ss_good_articles', $this->mGood );
+		$this->appendUpdate( $updates, 'ss_total_pages', $this->mPages );
+		$this->appendUpdate( $updates, 'ss_users', $this->mUsers );
 
-		if ( isset( $row->ss_total_pages ) ) {
-			# Update schema if required
-			if ( $row->ss_total_pages == -1 && !$this->mViews ) {
-				$dbr = wfGetDB( DB_SLAVE, array( 'SpecialStatistics', 'vslow') );
-				list( $page, $user ) = $dbr->tableNamesN( 'page', 'user' );
-
-				$sql = "SELECT COUNT(page_namespace) AS total FROM $page";
-				$res = $dbr->query( $sql, $fname );
-				$pageRow = $dbr->fetchObject( $res );
-				$pages = $pageRow->total + $this->mPages;
-
-				$sql = "SELECT COUNT(user_id) AS total FROM $user";
-				$res = $dbr->query( $sql, $fname );
-				$userRow = $dbr->fetchObject( $res );
-				$users = $userRow->total + $this->mUsers;
-
-				if ( $updates ) {
-					$updates .= ',';
-				}
-				$updates .= "ss_total_pages=$pages, ss_users=$users";
-			} else {
-				$this->appendUpdate( $updates, 'ss_total_pages', $this->mPages );
-				$this->appendUpdate( $updates, 'ss_users', $this->mUsers );
-			}
-		}
 		if ( $updates ) {
 			$site_stats = $dbw->tableName( 'site_stats' );
 			$sql = $dbw->limitResultForUpdate("UPDATE $site_stats SET $updates", 1);
+
+			# Need a separate transaction because this a global lock
 			$dbw->begin();
 			$dbw->query( $sql, $fname );
 			$dbw->commit();
 		}
-
-		/*
-		global $wgDBname, $wgTitle;
-		if ( $this->mGood && $wgDBname == 'enwiki' ) {
-			$good = $dbw->selectField( 'site_stats', 'ss_good_articles', '', $fname );
-			error_log( $good . ' ' . $wgTitle->getPrefixedDBkey() . "\n", 3, '/home/wikipedia/logs/million.log' );
-		}
-		*/
+	}
+	
+	public static function cacheUpdate( $dbw ) {
+		$dbr = wfGetDB( DB_SLAVE, array( 'SpecialStatistics', 'vslow') );
+		# Get non-bot users than did some recent action other than making accounts.
+		# If account creation is included, the number gets inflated ~20+ fold on enwiki.
+		$activeUsers = $dbr->selectField( 'recentchanges', 'COUNT( DISTINCT rc_user_text )',
+			array( 'rc_user != 0', 'rc_bot' => 0, "rc_log_type != 'newusers' OR rc_log_type IS NULL" ),
+			__METHOD__ );
+		$dbw->update( 'site_stats', 
+			array( 'ss_active_users' => intval($activeUsers) ),
+			array( 'ss_row_id' => 1 ), __METHOD__, array( 'LIMIT' => 1 )
+		);
 	}
 }
diff --git a/includes/Skin.php b/includes/Skin.php
index a9e44ab4..636b96bf 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -60,6 +60,21 @@ class Skin extends Linker {
 		}
 		return $wgValidSkinNames;
 	}
+	
+	/**
+	 * Fetch the list of usable skins in regards to $wgSkipSkins.
+	 * Useful for Special:Preferences and other places where you
+	 * only want to show skins users _can_ use.
+	 * @return array of strings
+	 */
+	public static function getUsableSkins() {
+		global $wgSkipSkins;
+		$usableSkins = self::getSkinNames();
+		foreach ( $wgSkipSkins as $skip ) {
+			unset( $usableSkins[$skip] );
+		}
+		return $usableSkins;
+	}
 
 	/**
 	 * Normalize a skin preference value to a form that can be loaded.
@@ -156,24 +171,28 @@ class Skin extends Linker {
 		return $q;
 	}
 
-	function initPage( &$out ) {
-		global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgScriptExtension;
+	function initPage( OutputPage $out ) {
+		global $wgFavicon, $wgAppleTouchIcon;
 
 		wfProfileIn( __METHOD__ );
 
-		if( false !== $wgFavicon ) {
-			$out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
-		}
-
+		# Generally the order of the favicon and apple-touch-icon links
+		# should not matter, but Konqueror (3.5.9 at least) incorrectly
+		# uses whichever one appears later in the HTML source.  Make sure
+		# apple-touch-icon is specified first to avoid this.
 		if( false !== $wgAppleTouchIcon ) {
 			$out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
 		}
 
+		if( false !== $wgFavicon ) {
+			$out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
+		}
+
 		# OpenSearch description link
 		$out->addLink( array(
 			'rel' => 'search',
 			'type' => 'application/opensearchdescription+xml',
-			'href' => "$wgScriptPath/opensearch_desc{$wgScriptExtension}",
+			'href' => wfScript( 'opensearch_desc' ),
 			'title' => wfMsgForContent( 'opensearch-desc' ),
 		));
 
@@ -208,7 +227,7 @@ class Skin extends Linker {
 		$lb->execute();
 	}
 
-	function addMetadataLinks( &$out ) {
+	function addMetadataLinks( OutputPage $out ) {
 		global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
 		global $wgRightsPage, $wgRightsUrl;
 
@@ -244,13 +263,25 @@ class Skin extends Linker {
 		}
 	}
 
-	function outputPage( &$out ) {
-		global $wgDebugComments;
+	function setMembers(){
+		global $wgTitle, $wgUser;
+		$this->mTitle = $wgTitle;
+		$this->mUser = $wgUser;
+		$this->userpage = $wgUser->getUserPage()->getPrefixedText();
+		$this->usercss = false;
+	}
 
+	function outputPage( OutputPage $out ) {
+		global $wgDebugComments;
 		wfProfileIn( __METHOD__ );
+
+		$this->setMembers();
 		$this->initPage( $out );
 
-		$out->out( $out->headElement() );
+		// See self::afterContentHook() for documentation
+		$afterContent = $this->afterContentHook();
+
+		$out->out( $out->headElement( $this ) );
 
 		$out->out( "\n<body" );
 		$ops = $this->getBodyOptions();
@@ -268,6 +299,8 @@ class Skin extends Linker {
 		$out->out( $out->mBodytext . "\n" );
 
 		$out->out( $this->afterContent() );
+		
+		$out->out( $afterContent );
 
 		$out->out( $this->bottomScripts() );
 
@@ -280,14 +313,14 @@ class Skin extends Linker {
 	static function makeVariablesScript( $data ) {
 		global $wgJsMimeType;
 
-		$r = "<script type= \"$wgJsMimeType\">/*<![CDATA[*/\n";
+		$r = array( "<script type= \"$wgJsMimeType\">/*<![CDATA[*/" );
 		foreach ( $data as $name => $value ) {
 			$encValue = Xml::encodeJsVar( $value );
-			$r .= "var $name = $encValue;\n";
+			$r[] = "var $name = $encValue;";
 		}
-		$r .= "/*]]>*/</script>\n";
+		$r[] = "/*]]>*/</script>\n";
 
-		return $r;
+		return implode( "\n\t\t", $r );
 	}
 
 	/**
@@ -308,6 +341,18 @@ class Skin extends Linker {
 
 		$ns = $wgTitle->getNamespace();
 		$nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
+		$separatorTransTable = $wgContLang->separatorTransformTable();
+		$separatorTransTable = $separatorTransTable ? $separatorTransTable : array();
+		$compactSeparatorTransTable = array(
+			implode( "\t", array_keys( $separatorTransTable ) ),
+			implode( "\t", $separatorTransTable ),
+		);
+		$digitTransTable = $wgContLang->digitTransformTable();
+		$digitTransTable = $digitTransTable ? $digitTransTable : array();
+		$compactDigitTransTable = array(
+			implode( "\t", array_keys( $digitTransTable ) ),
+			implode( "\t", $digitTransTable ),
+		);
 
 		$vars = array(
 			'skin' => $data['skinname'],
@@ -316,7 +361,7 @@ class Skin extends Linker {
 			'wgScriptPath' => $wgScriptPath,
 			'wgScript' => $wgScript,
 			'wgVariantArticlePath' => $wgVariantArticlePath,
-			'wgActionPaths' => $wgActionPaths,
+			'wgActionPaths' => (object)$wgActionPaths,
 			'wgServer' => $wgServer,
 			'wgCanonicalNamespace' => $nsname,
 			'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBkey() ),
@@ -335,6 +380,8 @@ class Skin extends Linker {
 			'wgVersion' => $wgVersion,
 			'wgEnableAPI' => $wgEnableAPI,
 			'wgEnableWriteAPI' => $wgEnableWriteAPI,
+			'wgSeparatorTransformTable' => $compactSeparatorTransTable,
+			'wgDigitTransformTable' => $compactDigitTransTable,
 		);
 		
 		if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false )){
@@ -362,32 +409,34 @@ class Skin extends Linker {
 			$vars['wgAjaxWatch'] = $msgs;
 		}
 
+		wfRunHooks('MakeGlobalVariablesScript', array(&$vars));
+
 		return self::makeVariablesScript( $vars );
 	}
 
 	function getHeadScripts( $allowUserJs ) {
 		global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
 
-		$r = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
+		$vars = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
 
-		$r .= "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>\n";
+		$r = array( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>" );
 		global $wgUseSiteJs;
 		if ($wgUseSiteJs) {
 			$jsCache = $wgUser->isLoggedIn() ? '&smaxage=0' : '';
-			$r .= "<script type=\"$wgJsMimeType\" src=\"".
+			$r[] = "<script type=\"$wgJsMimeType\" src=\"".
 				htmlspecialchars(self::makeUrl('-',
 					"action=raw$jsCache&gen=js&useskin=" .
 					urlencode( $this->getSkinName() ) ) ) .
-				"\"><!-- site js --></script>\n";
+				"\"><!-- site js --></script>";
 		}
 		if( $allowUserJs && $wgUser->isLoggedIn() ) {
 			$userpage = $wgUser->getUserPage();
 			$userjs = htmlspecialchars( self::makeUrl(
 				$userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
 				'action=raw&ctype='.$wgJsMimeType));
-			$r .= '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>\n";
+			$r[] = '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>";
 		}
-		return $r;
+		return $vars . "\t\t" . implode ( "\n\t\t", $r );
 	}
 
 	/**
@@ -414,38 +463,24 @@ class Skin extends Linker {
 			$wgRequest->getVal( 'wpEditToken' ) );
 	}
 
-	# get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
-	function getUserStylesheet() {
-		global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
-		$sheet = $this->getStylesheet();
-		$s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
-		$s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
-		$s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
-		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";
-
-		$query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
-		$s .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
-			'@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
-
-		$s .= $this->doGetUserStyles();
-		return $s."\n";
-	}
-
 	/**
-	 * This returns MediaWiki:Common.js, and derived classes may add other JS.
-	 * Despite its name, it does *not* return any custom user JS from user
-	 * subpages.  The returned script is sitewide and publicly cacheable and
-	 * therefore must not include anything that varies according to user,
-	 * interface language, etc. (although it may vary by skin).  See
-	 * makeGlobalVariablesScript for things that can vary per page view and are
-	 * not cacheable.
+	 * generated JavaScript action=raw&gen=js
+	 * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
+	 * nated together.  For some bizarre reason, it does *not* return any
+	 * custom user JS from subpages.  Huh?
+	 *
+	 * There's absolutely no reason to have separate Monobook/Common JSes.
+	 * Any JS that cares can just check the skin variable generated at the
+	 * top.  For now Monobook.js will be maintained, but it should be consi-
+	 * dered deprecated.
 	 *
-	 * @return string Raw JavaScript to be returned
+	 * @return string
 	 */
-	public function getUserJs() {
+	public function generateUserJs() {
+		global $wgStylePath;
+
 		wfProfileIn( __METHOD__ );
 
-		global $wgStylePath;
 		$s = "/* generated javascript */\n";
 		$s .= "var skin = '" . Xml::escapeJsString( $this->getSkinName() ) . "';\n";
 		$s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
@@ -454,45 +489,35 @@ class Skin extends Linker {
 		if ( !wfEmptyMsg ( 'common.js', $commonJs ) ) {
 			$s .= $commonJs;
 		}
+
+		$s .= "\n\n/* MediaWiki:".ucfirst( $this->getSkinName() ).".js */\n";
+		// avoid inclusion of non defined user JavaScript (with custom skins only)
+		// by checking for default message content
+		$msgKey = ucfirst( $this->getSkinName() ).'.js';
+		$userJS = wfMsgForContent($msgKey);
+		if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
+			$s .= $userJS;
+		}
+
 		wfProfileOut( __METHOD__ );
 		return $s;
 	}
 
 	/**
-	 * Return html code that include User stylesheets
+	 * generate user stylesheet for action=raw&gen=css
 	 */
-	function getUserStyles() {
-		$s = "<style type='text/css'>\n";
-		$s .= "/*/*/ /*<![CDATA[*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
-		$s .= $this->getUserStylesheet();
-		$s .= "/*]]>*/ /* */\n";
-		$s .= "</style>\n";
+	public function generateUserStylesheet() {
+		wfProfileIn( __METHOD__ );
+		$s = "/* generated user stylesheet */\n" .
+			$this->reallyGenerateUserStylesheet();
+		wfProfileOut( __METHOD__ );
 		return $s;
 	}
-
+	
 	/**
-	 * Some styles that are set by user through the user settings interface.
+	 * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
 	 */
-	function doGetUserStyles() {
-		global $wgUser, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
-
-		$s = '';
-
-		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
-			if($wgTitle->isCssSubpage() && $this->userCanPreview( $wgRequest->getText( 'action' ) ) ) {
-				$s .= $wgRequest->getText('wpTextbox1');
-			} else {
-				$userpage = $wgUser->getUserPage();
-				$s.= '@import "'.self::makeUrl(
-					$userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
-					'action=raw&ctype=text/css').'";'."\n";
-			}
-		}
-
-		return $s . $this->reallyDoGetUserStyles();
-	}
-
-	function reallyDoGetUserStyles() {
+	protected function reallyGenerateUserStylesheet(){
 		global $wgUser;
 		$s = '';
 		if (($undopt = $wgUser->getOption("underline")) < 2) {
@@ -529,6 +554,86 @@ END;
 		return $s;
 	}
 
+	/**
+	 * @private
+	 */
+	function setupUserCss( OutputPage $out ) {
+		global $wgRequest, $wgContLang, $wgUser;
+		global $wgAllowUserCss, $wgUseSiteCss, $wgSquidMaxage, $wgStylePath;
+
+		wfProfileIn( __METHOD__ );
+
+		$this->setupSkinUserCss( $out );
+
+		$siteargs = array(
+			'action' => 'raw',
+			'maxage' => $wgSquidMaxage,
+		);
+
+		// Add any extension CSS
+		foreach( $out->getExtStyle() as $tag ) {
+			$out->addStyle( $tag['href'] );
+		}
+
+		// If we use the site's dynamic CSS, throw that in, too
+		// Per-site custom styles
+		if( $wgUseSiteCss ) {
+			global $wgHandheldStyle;
+			$query = wfArrayToCGI( array(
+				'usemsgcache' => 'yes',
+				'ctype' => 'text/css',
+				'smaxage' => $wgSquidMaxage
+			) + $siteargs );
+			# Site settings must override extension css! (bug 15025)
+			$out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) );
+			$out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ), 'print' );
+			if( $wgHandheldStyle ) {
+				$out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI ), 'handheld' );
+			}
+			$out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
+		}
+
+		if( $wgUser->isLoggedIn() ) {
+			// Ensure that logged-in users' generated CSS isn't clobbered
+			// by anons' publicly cacheable generated CSS.
+			$siteargs['smaxage'] = '0';
+			$siteargs['ts'] = $wgUser->mTouched;
+		}
+		// Per-user styles based on preferences
+		$siteargs['gen'] = 'css';
+		if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) {
+			$siteargs['useskin'] = $us;
+		}
+		$out->addStyle( self::makeUrl( '-', wfArrayToCGI( $siteargs ) ) );
+
+		// Per-user custom style pages
+		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) {
+			$action = $wgRequest->getVal('action');
+			# If we're previewing the CSS page, use it
+			if( $this->mTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
+				$previewCss = $wgRequest->getText('wpTextbox1');
+				// @FIXME: properly escape the cdata!
+				$this->usercss = "/*<![CDATA[*/\n" . $previewCss . "/*]]>*/";
+			} else {
+				$out->addStyle( self::makeUrl($this->userpage . '/' . $this->getSkinName() .'.css',
+					'action=raw&ctype=text/css' ) );
+			}
+		}
+
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Add skin specific stylesheets
+	 * @param $out OutputPage
+	 */
+	function setupSkinUserCss( OutputPage $out ) {
+		$out->addStyle( 'common/shared.css' );
+		$out->addStyle( 'common/oldshared.css' );
+		$out->addStyle( $this->getStylesheet() );
+		$out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
+	}
+
 	function getBodyOptions() {
 		global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
 
@@ -539,19 +644,33 @@ END;
 		}
 		else $a = array( 'bgcolor' => '#FFFFFF' );
 		if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
-		  $wgTitle->userCan( 'edit' ) ) {
+		  $wgTitle->quickUserCan( 'edit' ) ) {
 			$s = $wgTitle->getFullURL( $this->editUrlOptions() );
-			$s = 'document.location = "' .wfEscapeJSString( $s ) .'";';
+			$s = 'document.location = "' .Xml::escapeJsString( $s ) .'";';
 			$a += array ('ondblclick' => $s);
 
 		}
 		$a['onload'] = $wgOut->getOnloadHandler();
 		$a['class'] =
-			'mediawiki ns-'.$wgTitle->getNamespace().
-			' '.($wgContLang->isRTL() ? "rtl" : "ltr").
-			' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() );
+			'mediawiki' .
+			' '.( $wgContLang->isRTL() ? "rtl" : "ltr" ).
+			' '.$this->getPageClasses( $wgTitle ) .
+			' skin-'. Sanitizer::escapeClass( $this->getSkinName( ) );
 		return $a;
 	}
+	
+	function getPageClasses( $title ) {
+		$numeric = 'ns-'.$title->getNamespace();
+		if( $title->getNamespace() == NS_SPECIAL ) {
+			$type = "ns-special";
+		} elseif( $title->isTalkPage() ) {
+			$type = "ns-talk";
+		} else {
+			$type = "ns-subject";
+		}
+		$name = Sanitizer::escapeClass( 'page-'.$title->getPrefixedText() );
+		return "$numeric $type $name";
+	}
 
 	/**
 	 * URL to the logo
@@ -589,11 +708,11 @@ END;
 		$s .= "\n<div id='content'>\n<div id='topbar'>\n" .
 		  "<table border='0' cellspacing='0' width='98%'>\n<tr>\n";
 
-		$shove = ($qb != 0);
-		$left = ($qb == 1 || $qb == 3);
-		if($wgContLang->isRTL()) $left = !$left;
+		$shove = ( $qb != 0 );
+		$left = ( $qb == 1 || $qb == 3 );
+		if( $wgContLang->isRTL() ) $left = !$left;
 
-		if ( !$shove ) {
+		if( !$shove ) {
 			$s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
 			  $this->logoText() . '</td>';
 		} elseif( $left ) {
@@ -655,7 +774,7 @@ END;
 
 			$msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
 			$s .= '<div id="mw-normal-catlinks">' .
-				$this->makeLinkObj( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
+				$this->link( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
 				. $colon . $t . '</div>';
 		}
 
@@ -676,7 +795,7 @@ END;
 
 		# optional 'dmoz-like' category browser. Will be shown under the list
 		# of categories an article belong to
-		if($wgUseCategoryBrowser) {
+		if( $wgUseCategoryBrowser ){
 			$s .= '<br /><hr />';
 
 			# get a big array of the parents tree
@@ -699,7 +818,7 @@ END;
 	 * @param &skin Object: skin passed by reference
 	 * @return String separated by &gt;, terminate with "\n"
 	 */
-	function drawCategoryBrowser($tree, &$skin) {
+	function drawCategoryBrowser( $tree, &$skin ){
 		$return = '';
 		foreach ($tree as $element => $parent) {
 			if (empty($parent)) {
@@ -710,8 +829,8 @@ END;
 				$return .= Skin::drawCategoryBrowser($parent, $skin) . ' &gt; ';
 			}
 			# add our current element to the list
-			$eltitle = Title::NewFromText($element);
-			$return .=  $skin->makeLinkObj( $eltitle, $eltitle->getText() ) ;
+			$eltitle = Title::newFromText($element);
+			$return .=  $skin->link( $eltitle, $eltitle->getText() ) ;
 		}
 		return $return;
 	}
@@ -736,8 +855,43 @@ END;
 	}
 
 	/**
-	 * This gets called shortly before the \</body\> tag.
-	 * @return String HTML to be put before \</body\>
+	 * This runs a hook to allow extensions placing their stuff after content
+	 * and article metadata (e.g. categories).
+	 * Note: This function has nothing to do with afterContent().
+	 *
+	 * This hook is placed here in order to allow using the same hook for all
+	 * skins, both the SkinTemplate based ones and the older ones, which directly
+	 * use this class to get their data.
+	 *
+	 * The output of this function gets processed in SkinTemplate::outputPage() for
+	 * the SkinTemplate based skins, all other skins should directly echo it.
+	 *
+	 * Returns an empty string by default, if not changed by any hook function.
+	 */
+	protected function afterContentHook() {
+		$data = "";
+
+		if( wfRunHooks( 'SkinAfterContent', array( &$data ) ) ){
+			// adding just some spaces shouldn't toggle the output
+			// of the whole <div/>, so we use trim() here
+			if( trim( $data ) != '' ){
+				// Doing this here instead of in the skins to
+				// ensure that the div has the same ID in all
+				// skins
+				$data = "<div id='mw-data-after-content'>\n" .
+					"\t$data\n" .
+					"</div>\n";
+			}
+		} else {
+			wfDebug( "Hook SkinAfterContent changed output processing.\n" );
+		}
+
+		return $data;
+	}
+
+	/**
+	 * This gets called shortly before the </body> tag.
+	 * @return String HTML to be put before </body>
 	 */
 	function afterContent() {
 		$printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
@@ -745,8 +899,8 @@ END;
 	}
 
 	/**
-	 * This gets called shortly before the \</body\> tag.
-	 * @return String HTML-wrapped JS code to be put before \</body\>
+	 * This gets called shortly before the </body> tag.
+	 * @return String HTML-wrapped JS code to be put before </body>
 	 */
 	function bottomScripts() {
 		global $wgJsMimeType;
@@ -768,7 +922,7 @@ END;
 	}
 
 	/** overloaded by derived classes */
-	function doAfterContent() { }
+	function doAfterContent() { return "</div></div>"; }
 
 	function pageTitleLinks() {
 		global $wgOut, $wgTitle, $wgUser, $wgRequest;
@@ -788,7 +942,7 @@ END;
 		}
 
 		if ( $wgOut->isArticleRelated() ) {
-			if ( $wgTitle->getNamespace() == NS_IMAGE ) {
+			if ( $wgTitle->getNamespace() == NS_FILE ) {
 				$name = $wgTitle->getDBkey();
 				$image = wfFindFile( $wgTitle );
 				if( $image ) {
@@ -859,7 +1013,7 @@ END;
 
 	function pageTitle() {
 		global $wgOut;
-		$s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
+		$s = '<h1 class="pagetitle">' . $wgOut->getPageTitle() . '</h1>';
 		return $s;
 	}
 
@@ -869,7 +1023,7 @@ END;
 		$sub = $wgOut->getSubtitle();
 		if ( '' == $sub ) {
 			global $wgExtraSubtitle;
-			$sub = wfMsg( 'tagline' ) . $wgExtraSubtitle;
+			$sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
 		}
 		$subpages = $this->subPageSubtitle();
 		$sub .= !empty($subpages)?"</p><p class='subpages'>$subpages":'';
@@ -926,50 +1080,54 @@ END;
 	function nameAndLogin() {
 		global $wgUser, $wgTitle, $wgLang, $wgContLang;
 
-		$lo = $wgContLang->specialPage( 'Userlogout' );
+		$logoutPage = $wgContLang->specialPage( 'Userlogout' );
 
-		$s = '';
+		$ret = '';
 		if ( $wgUser->isAnon() ) {
 			if( $this->showIPinHeader() ) {
-				$n = wfGetIP();
+				$name = wfGetIP();
 
-				$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
-				  $wgLang->getNsText( NS_TALK ) );
+				$talkLink = $this->link( $wgUser->getTalkPage(),
+					$wgLang->getNsText( NS_TALK ) );
 
-				$s .= $n . ' ('.$tl.')';
+				$ret .= "$name ($talkLink)";
 			} else {
-				$s .= wfMsg('notloggedin');
+				$ret .= wfMsg( 'notloggedin' );
 			}
 
-			$rt = $wgTitle->getPrefixedURL();
-			if ( 0 == strcasecmp( urlencode( $lo ), $rt ) ) {
-				$q = '';
-			} else { $q = "returnto={$rt}"; }
+			$returnTo = $wgTitle->getPrefixedDBkey();
+			$query = array();
+			if ( $logoutPage != $returnTo ) {
+				$query['returnto'] = $returnTo;
+			}
 
 			$loginlink = $wgUser->isAllowed( 'createaccount' )
 				? 'nav-login-createaccount'
 				: 'login';
-			$s .= "\n<br />" . $this->makeKnownLinkObj(
+			$ret .= "\n<br />" . $this->link(
 				SpecialPage::getTitleFor( 'Userlogin' ),
-				wfMsg( $loginlink ), $q );
+				wfMsg( $loginlink ), array(), $query
+			);
 		} else {
-			$n = $wgUser->getName();
-			$rt = $wgTitle->getPrefixedURL();
-			$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
-			  $wgLang->getNsText( NS_TALK ) );
-
-			$tl = " ({$tl})";
-
-			$s .= $this->makeKnownLinkObj( $wgUser->getUserPage(),
-			  $n ) . "{$tl}<br />" .
-			  $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
-			  "returnto={$rt}" ) . ' | ' .
-			  $this->specialLink( 'preferences' );
+			$returnTo = $wgTitle->getPrefixedDBkey();
+			$talkLink = $this->link( $wgUser->getTalkPage(),
+				$wgLang->getNsText( NS_TALK ) );
+
+			$ret .= $this->link( $wgUser->getUserPage(),
+				htmlspecialchars( $wgUser->getName() ) );
+			$ret .= " ($talkLink)<br />";
+			$ret .= $this->link(
+				SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
+				array(), array( 'returnto' => $returnTo )
+			);
+			$ret .= ' | ' . $this->specialLink( 'preferences' );
 		}
-		$s .= ' | ' . $this->makeKnownLink( wfMsgForContent( 'helppage' ),
-		  wfMsg( 'help' ) );
+		$ret .= ' | ' . $this->link(
+			Title::newFromText( wfMsgForContent( 'helppage' ) ),
+			wfMsg( 'help' )
+		);
 
-		return $s;
+		return $ret;
 	}
 
 	function getSearchLink() {
@@ -1107,6 +1265,7 @@ END;
 		$oldid = $wgRequest->getVal( 'oldid' );
 		$diff = $wgRequest->getVal( 'diff' );
 		if ( ! $wgOut->isArticle() ) { return ''; }
+		if( !$wgArticle instanceOf Article ) { return ''; }
 		if ( isset( $oldid ) || isset( $diff ) ) { return ''; }
 		if ( 0 == $wgArticle->getID() ) { return ''; }
 
@@ -1118,14 +1277,13 @@ END;
 			}
 		}
 
-	        if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
-		    require_once('Credits.php');
-		    $s .= ' ' . getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+		if( $wgMaxCredits != 0 ){
+			$s .= ' ' . Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
 		} else {
-		    $s .= $this->lastModified();
+			$s .= $this->lastModified();
 		}
 
-		if ($wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+		if( $wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ) ) {
 			$dbr = wfGetDB( DB_SLAVE );
 			$watchlist = $dbr->tableName( 'watchlist' );
 			$sql = "SELECT COUNT(*) AS n FROM $watchlist
@@ -1143,13 +1301,12 @@ END;
 	}
 
 	function getCopyright( $type = 'detect' ) {
-		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest, $wgArticle;
 
 		if ( $type == 'detect' ) {
-			$oldid = $wgRequest->getVal( 'oldid' );
 			$diff = $wgRequest->getVal( 'diff' );
-
-			if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+			$isCur = $wgArticle && $wgArticle->isCurrent();
+			if ( is_null( $diff ) && !$isCur && wfMsgForContent( 'history_copyright' ) !== '-' ) {
 				$type = 'history';
 			} else {
 				$type = 'normal';
@@ -1167,6 +1324,8 @@ END;
 			$link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
 		} elseif( $wgRightsUrl ) {
 			$link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
+		} elseif( $wgRightsText ) {
+			$link = $wgRightsText;
 		} else {
 			# Give up now
 			return $out;
@@ -1205,7 +1364,7 @@ END;
 	function lastModified() {
 		global $wgLang, $wgArticle;
 		if( $this->mRevisionId ) {
-			$timestamp = Revision::getTimestampFromId( $this->mRevisionId, $wgArticle->getId() );
+			$timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
 		} else {
 			$timestamp = $wgArticle->getTimestamp();
 		}
@@ -1249,7 +1408,7 @@ END;
 		$sp = wfMsg( 'specialpages' );
 		$spp = $wgContLang->specialPage( 'Specialpages' );
 
-		$s = '<form id="specialpages" method="get" class="inline" ' .
+		$s = '<form id="specialpages" method="get" ' .
 		  'action="' . htmlspecialchars( "{$wgServer}{$wgRedirectScript}" ) . "\">\n";
 		$s .= "<select name=\"wpDropdown\">\n";
 		$s .= "<option value=\"{$spp}\">{$sp}</option>\n";
@@ -1308,9 +1467,9 @@ END;
 		if ( !$wgOut->isArticleRelated() ) {
 			$s = wfMsg( 'protectedpage' );
 		} else {
-			if( $wgTitle->userCan( 'edit' ) && $wgTitle->exists() ) {
+			if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() ) {
 				$t = wfMsg( 'editthispage' );
-			} elseif( $wgTitle->userCan( 'create' ) && !$wgTitle->exists() ) {
+			} elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() ) {
 				$t = wfMsg( 'create-this-page' );
 			} else {
 				$t = wfMsg( 'viewsource' );
@@ -1395,7 +1554,7 @@ END;
 	function moveThisPage() {
 		global $wgTitle;
 
-		if ( $wgTitle->userCan( 'move' ) ) {
+		if ( $wgTitle->quickUserCan( 'move' ) ) {
 			return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
 			  wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
 		} else {
@@ -1428,14 +1587,10 @@ END;
 	}
 
 	function showEmailUser( $id ) {
-		global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
-		return $wgEnableEmail &&
-		       $wgEnableUserEmail &&
-		       $wgUser->isLoggedIn() && # show only to signed in users
-		       0 != $id; # we can only email to non-anons ..
-#		       '' != $id->getEmail() && # who must have an email address stored ..
-#		       0 != $id->getEmailauthenticationtimestamp() && # .. which is authenticated
-#		       1 != $wgUser->getOption('disablemail'); # and not disabled
+		global $wgUser;
+		$targetUser = User::newFromId( $id );
+		return	$wgUser->canSendEmail() && # the sending user must have a confirmed email address
+			$targetUser->canReceiveEmail(); # the target user must have a confirmed email address and allow emails from users
 	}
 
 	function emailUserLink() {
@@ -1496,12 +1651,6 @@ END;
 		return $s;
 	}
 
-	function bugReportsLink() {
-		$s = $this->makeKnownLink( wfMsgForContent( 'bugreportspage' ),
-		  wfMsg( 'bugreports' ) );
-		return $s;
-	}
-
 	function talkLink() {
 		global $wgTitle;
 
@@ -1510,6 +1659,8 @@ END;
 			return '';
 		}
 
+		$linkOptions = array();
+
 		if( $wgTitle->isTalkPage() ) {
 			$link = $wgTitle->getSubjectPage();
 			switch( $link->getNamespace() ) {
@@ -1522,8 +1673,11 @@ END;
 				case NS_PROJECT:
 					$text = wfMsg( 'projectpage' );
 					break;
-				case NS_IMAGE:
+				case NS_FILE:
 					$text = wfMsg( 'imagepage' );
+					# Make link known if image exists, even if the desc. page doesn't.
+					if( wfFindFile( $link ) )
+						$linkOptions[] = 'known';
 					break;
 				case NS_MEDIAWIKI:
 					$text = wfMsg( 'mediawikipage' );
@@ -1545,7 +1699,7 @@ END;
 			$text = wfMsg( 'talkpage' );
 		}
 
-		$s = $this->makeLinkObj( $link, $text );
+		$s = $this->link( $link, $text, array(), array(), $linkOptions );
 
 		return $s;
 	}
@@ -1677,19 +1831,17 @@ END;
 				continue;
 			if (strpos($line, '**') !== 0) {
 				$line = trim($line, '* ');
-				if ( $line == 'SEARCH' || $line == 'TOOLBOX' || $line == 'LANGUAGES' ) {
-					# Special box type
-					$bar[$line] = array();
-				} else {
-					$heading = $line;
-				}
+				$heading = $line;
+				if( !array_key_exists($heading, $bar) ) $bar[$heading] = array();
 			} else {
 				if (strpos($line, '|') !== false) { // sanity check
 					$line = array_map('trim', explode( '|' , trim($line, '* '), 2 ) );
 					$link = wfMsgForContent( $line[0] );
 					if ($link == '-')
 						continue;
-					if (wfEmptyMsg($line[1], $text = wfMsg($line[1])))
+
+					$text = wfMsgExt($line[1], 'parsemag');
+					if (wfEmptyMsg($line[1], $text))
 						$text = $line[1];
 					if (wfEmptyMsg($line[0], $link))
 						$link = $line[0];
@@ -1715,6 +1867,7 @@ END;
 				} else { continue; }
 			}
 		}
+		wfRunHooks('SkinBuildSidebar', array($this, &$bar));
 		if ( $wgEnableSidebarCache ) $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
 		wfProfileOut( __METHOD__ );
 		return $bar;
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 506d1024..4f13571a 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -87,12 +87,6 @@ class SkinTemplate extends Skin {
 	 */
 	var $template;
 
-	/**
-	 * An array of strings representing extra CSS files to load.  May include:
-	 * 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl'.
-	 */
-	var $cssfiles;
-
 	/**#@-*/
 
 	/**
@@ -100,14 +94,23 @@ class SkinTemplate extends Skin {
 	 * Child classes should override this to set the name,
 	 * style subdirectory, and template filler callback.
 	 *
-	 * @param OutputPage $out
+	 * @param $out OutputPage
 	 */
-	function initPage( &$out ) {
+	function initPage( OutputPage $out ) {
 		parent::initPage( $out );
 		$this->skinname  = 'monobook';
 		$this->stylename = 'monobook';
 		$this->template  = 'QuickTemplate';
-		$this->cssfiles = array();
+	}
+
+	/**
+	 * Add specific styles for this skin
+	 *
+	 * @param $out OutputPage
+	 */
+	function setupSkinUserCss( OutputPage $out ){
+		$out->addStyle( 'common/shared.css', 'screen' );
+		$out->addStyle( 'common/commonPrint.css', 'print' );	
 	}
 
 	/**
@@ -115,9 +118,9 @@ class SkinTemplate extends Skin {
 	 * and eventually it spits out some HTML. Should have interface
 	 * roughly equivalent to PHPTAL 0.7.
 	 *
-	 * @param string $callback (or file)
-	 * @param string $repository subdirectory where we keep template files
-	 * @param string $cache_dir
+	 * @param $callback string (or file)
+	 * @param $repository string: subdirectory where we keep template files
+	 * @param $cache_dir string
 	 * @return object
 	 * @private
 	 */
@@ -128,18 +131,17 @@ class SkinTemplate extends Skin {
 	/**
 	 * initialize various variables and generate the template
 	 *
-	 * @param OutputPage $out
-	 * @public
+	 * @param $out OutputPage
 	 */
-	function outputPage( &$out ) {
-		global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
+	function outputPage( OutputPage $out ) {
+		global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang;
 		global $wgScript, $wgStylePath, $wgContLanguageCode;
 		global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
 		global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
 		global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
 		global $wgMaxCredits, $wgShowCreditsIfMax;
 		global $wgPageShowWatchingUsers;
-		global $wgUseTrackbacks;
+		global $wgUseTrackbacks, $wgUseSiteJs;
 		global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
 
 		wfProfileIn( __METHOD__ );
@@ -150,9 +152,7 @@ class SkinTemplate extends Skin {
 		wfProfileIn( __METHOD__."-init" );
 		$this->initPage( $out );
 
-		$this->mTitle =& $wgTitle;
-		$this->mUser =& $wgUser;
-
+		$this->setMembers();
 		$tpl = $this->setupTemplate( $this->template, 'skins' );
 
 		#if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
@@ -167,8 +167,6 @@ class SkinTemplate extends Skin {
 		$this->iscontent = ($this->mTitle->getNamespace() != NS_SPECIAL );
 		$this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
 		$this->username = $wgUser->getName();
-		$userPage = $wgUser->getUserPage();
-		$this->userpage = $userPage->getPrefixedText();
 
 		if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
 			$this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
@@ -178,17 +176,18 @@ class SkinTemplate extends Skin {
 			$this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
 		}
 
-		$this->usercss =  $this->userjs = $this->userjsprev = false;
-		$this->setupUserCss();
+		$this->userjs = $this->userjsprev = false;
+		$this->setupUserCss( $out );
 		$this->setupUserJs( $out->isUserJsAllowed() );
 		$this->titletxt = $this->mTitle->getPrefixedText();
 		wfProfileOut( __METHOD__."-stuff" );
 
 		wfProfileIn( __METHOD__."-stuff2" );
-		$tpl->set( 'title', $wgOut->getPageTitle() );
-		$tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
-		$tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
-		$tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) );
+		$tpl->set( 'title', $out->getPageTitle() );
+		$tpl->set( 'pagetitle', $out->getHTMLTitle() );
+		$tpl->set( 'displaytitle', $out->mPageLinkTitle );
+		$tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
+		$tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) );
 
 		$nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
 		          $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
@@ -201,7 +200,7 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'articleid', $this->mTitle->getArticleId() );
 		$tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
 
-		$tpl->set( 'isarticle', $wgOut->isArticle() );
+		$tpl->set( 'isarticle', $out->isArticle() );
 
 		$tpl->setRef( "thispage", $this->thispage );
 		$subpagestr = $this->subPageSubtitle();
@@ -218,9 +217,9 @@ class SkinTemplate extends Skin {
 		);
 
 		$tpl->set( 'catlinks', $this->getCategories());
-		if( $wgOut->isSyndicated() ) {
+		if( $out->isSyndicated() ) {
 			$feeds = array();
-			foreach( $wgOut->getSyndicationLinks() as $format => $link ) {
+			foreach( $out->getSyndicationLinks() as $format => $link ) {
 				$feeds[$format] = array(
 					'text' => wfMsg( "feed-$format" ),
 					'href' => $link );
@@ -241,14 +240,15 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'jsmimetype', $wgJsMimeType );
 		$tpl->setRef( 'charset', $wgOutputEncoding );
 		$tpl->set( 'headlinks', $out->getHeadLinks() );
-		$tpl->set('headscripts', $out->getScript() );
+		$tpl->set( 'headscripts', $out->getScript() );
+		$tpl->set( 'csslinks', $out->buildCssLinks() );
 		$tpl->setRef( 'wgScript', $wgScript );
 		$tpl->setRef( 'skinname', $this->skinname );
 		$tpl->set( 'skinclass', get_class( $this ) );
 		$tpl->setRef( 'stylename', $this->stylename );
 		$tpl->set( 'printable', $wgRequest->getBool( 'printable' ) );
+		$tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
 		$tpl->setRef( 'loggedin', $this->loggedin );
-		$tpl->set('nsclass', 'ns-'.$this->mTitle->getNamespace());
 		$tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
 		/* XXX currently unused, might get useful later
 		$tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
@@ -274,12 +274,10 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
 		$tpl->set( 'userlang', $wgLang->getCode() );
 		$tpl->set( 'pagecss', $this->setupPageCss() );
-		$tpl->set( 'printcss', $this->getPrintCss() );
 		$tpl->setRef( 'usercss', $this->usercss);
 		$tpl->setRef( 'userjs', $this->userjs);
 		$tpl->setRef( 'userjsprev', $this->userjsprev);
-		global $wgUseSiteJs;
-		if ($wgUseSiteJs) {
+		if( $wgUseSiteJs ) {
 			$jsCache = $this->loggedin ? '&smaxage=0' : '';
 			$tpl->set( 'jsvarurl',
 				self::makeUrl('-',
@@ -307,18 +305,18 @@ class SkinTemplate extends Skin {
 					)
 				);
 				# Disable Cache
-				$wgOut->setSquidMaxage(0);
+				$out->setSquidMaxage(0);
 			}
 		} else if (count($newtalks)) {
-			$sep = str_replace("_", " ", wfMsgHtml("newtalkseperator"));
+			$sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
 			$msgs = array();
 			foreach ($newtalks as $newtalk) {
-				$msgs[] = wfElement("a",
+				$msgs[] = Xml::element("a",
 					array('href' => $newtalk["link"]), $newtalk["wiki"]);
 			}
 			$parts = implode($sep, $msgs);
 			$ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
-			$wgOut->setSquidMaxage(0);
+			$out->setSquidMaxage(0);
 		} else {
 			$ntl = '';
 		}
@@ -326,9 +324,9 @@ class SkinTemplate extends Skin {
 
 		wfProfileIn( __METHOD__."-stuff3" );
 		$tpl->setRef( 'newtalk', $ntl );
-		$tpl->setRef( 'skin', $this);
+		$tpl->setRef( 'skin', $this );
 		$tpl->set( 'logo', $this->logoText() );
-		if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and
+		if ( $out->isArticle() and (!isset( $oldid ) or isset( $diff )) and
 			$wgArticle and 0 != $wgArticle->getID() )
 		{
 			if ( !$wgDisableCounters ) {
@@ -367,11 +365,10 @@ class SkinTemplate extends Skin {
 
 			$this->credits = false;
 
-			if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
-				require_once("Credits.php");
-				$this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+			if( $wgMaxCredits != 0 ){
+				$this->credits = Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
 			} else {
-				$tpl->set('lastmod', $this->lastModified());
+				$tpl->set( 'lastmod', $this->lastModified() );
 			}
 
 			$tpl->setRef( 'credits', $this->credits );
@@ -411,16 +408,18 @@ class SkinTemplate extends Skin {
 		$language_urls = array();
 
 		if ( !$wgHideInterlanguageLinks ) {
-			foreach( $wgOut->getLanguageLinks() as $l ) {
+			foreach( $out->getLanguageLinks() as $l ) {
 				$tmp = explode( ':', $l, 2 );
 				$class = 'interwiki-' . $tmp[0];
 				unset($tmp);
 				$nt = Title::newFromText( $l );
-				$language_urls[] = array(
-					'href' => $nt->getFullURL(),
-					'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
-					'class' => $class
-				);
+				if ( $nt ) {
+					$language_urls[] = array(
+						'href' => $nt->getFullURL(),
+						'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+						'class' => $class
+					);
+				}
 			}
 		}
 		if(count($language_urls)) {
@@ -430,6 +429,7 @@ class SkinTemplate extends Skin {
 		}
 		wfProfileOut( __METHOD__."-stuff4" );
 
+		wfProfileIn( __METHOD__."-stuff5" );
 		# Personal toolbar
 		$tpl->set('personal_urls', $this->buildPersonalUrls());
 		$content_actions = $this->buildContentActionUrls();
@@ -438,7 +438,7 @@ class SkinTemplate extends Skin {
 		// XXX: attach this from javascript, same with section editing
 		if($this->iseditable &&	$wgUser->getOption("editondblclick") )
 		{
-			$encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
+			$encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
 			$tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
 		} else {
 			$tpl->set('body_ondblclick', false);
@@ -452,6 +452,11 @@ class SkinTemplate extends Skin {
 			wfDebug( __METHOD__ . ': Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!' );
 		}
 
+		// allow extensions adding stuff after the page content.
+		// See Skin::afterContentHook() for further documentation.
+		$tpl->set ('dataAfterContent', $this->afterContentHook());
+		wfProfileOut( __METHOD__."-stuff5" );
+
 		// execute template
 		wfProfileIn( __METHOD__."-execute" );
 		$res = $tpl->execute();
@@ -589,9 +594,9 @@ class SkinTemplate extends Skin {
 		if( $selected ) {
 			$classes[] = 'selected';
 		}
-		if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 ) {
+		if( $checkEdit && !$title->isKnown() ) {
 			$classes[] = 'new';
-			$query = 'action=edit';
+			$query = 'action=edit&redlink=1';
 		}
 
 		$text = wfMsg( $message );
@@ -641,7 +646,7 @@ class SkinTemplate extends Skin {
 	 * @return array
 	 * @private
 	 */
-	function buildContentActionUrls () {
+	function buildContentActionUrls() {
 		global $wgContLang, $wgLang, $wgOut;
 		wfProfileIn( __METHOD__ );
 
@@ -690,7 +695,7 @@ class SkinTemplate extends Skin {
 						'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
 					);
 				}
-			} elseif ( $this->mTitle->exists() || $this->mTitle->isAlwaysKnown() ) {
+			} elseif ( $this->mTitle->isKnown() ) {
 				$content_actions['viewsource'] = array(
 					'class' => ($action == 'edit') ? 'selected' : false,
 					'text' => wfMsg('viewsource'),
@@ -700,7 +705,7 @@ class SkinTemplate extends Skin {
 			wfProfileOut( __METHOD__."-edit" );
 
 			wfProfileIn( __METHOD__."-live" );
-			if ( $this->mTitle->getArticleId() ) {
+			if ( $this->mTitle->exists() ) {
 
 				$content_actions['history'] = array(
 					'class' => ($action == 'history') ? 'selected' : false,
@@ -708,7 +713,7 @@ class SkinTemplate extends Skin {
 					'href' => $this->mTitle->getLocalUrl( 'action=history')
 				);
 
-				if($wgUser->isAllowed('delete')){
+				if( $wgUser->isAllowed('delete') ) {
 					$content_actions['delete'] = array(
 						'class' => ($action == 'delete') ? 'selected' : false,
 						'text' => wfMsg('delete'),
@@ -725,7 +730,7 @@ class SkinTemplate extends Skin {
 				}
 
 				if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
-					if(!$this->mTitle->isProtected()){
+					if( !$this->mTitle->isProtected() ){
 						$content_actions['protect'] = array(
 							'class' => ($action == 'protect') ? 'selected' : false,
 							'text' => wfMsg('protect'),
@@ -837,7 +842,7 @@ class SkinTemplate extends Skin {
 	 * @return array
 	 * @private
 	 */
-	function buildNavUrls () {
+	function buildNavUrls() {
 		global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
 		global $wgEnableUploads, $wgUploadNavigationUrl;
 
@@ -847,7 +852,7 @@ class SkinTemplate extends Skin {
 
 		$nav_urls = array();
 		$nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
-		if( $wgEnableUploads ) {
+		if( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
 			if ($wgUploadNavigationUrl) {
 				$nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
 			} else {
@@ -952,70 +957,13 @@ class SkinTemplate extends Skin {
 	 * @return string
 	 * @private
 	 */
-	function getNameSpaceKey () {
+	function getNameSpaceKey() {
 		return $this->mTitle->getNamespaceKey();
 	}
 
 	/**
 	 * @private
 	 */
-	function setupUserCss() {
-		wfProfileIn( __METHOD__ );
-
-		global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
-
-		$sitecss = '';
-		$usercss = '';
-		$siteargs = '&maxage=' . $wgSquidMaxage;
-		if( $this->loggedin ) {
-			// Ensure that logged-in users' generated CSS isn't clobbered
-			// by anons' publicly cacheable generated CSS.
-			$siteargs .= '&smaxage=0';
-		}
-
-		# Add user-specific code if this is a user and we allow that kind of thing
-
-		if ( $wgAllowUserCss && $this->loggedin ) {
-			$action = $wgRequest->getText('action');
-
-			# if we're previewing the CSS page, use it
-			if( $this->mTitle->isCssSubpage() and $this->userCanPreview( $action ) ) {
-				$siteargs = "&smaxage=0&maxage=0";
-				$usercss = $wgRequest->getText('wpTextbox1');
-			} else {
-				$usercss = '@import "' .
-				  self::makeUrl($this->userpage . '/'.$this->skinname.'.css',
-								 'action=raw&ctype=text/css') . '";' ."\n";
-			}
-
-			$siteargs .= '&ts=' . $wgUser->mTouched;
-		}
-
-		if( $wgContLang->isRTL() && in_array( 'rtl', $this->cssfiles ) ) {
-			global $wgStyleVersion;
-			$sitecss .= "@import \"$wgStylePath/$this->stylename/rtl.css?$wgStyleVersion\";\n";
-		}
-
-		# If we use the site's dynamic CSS, throw that in, too
-		if ( $wgUseSiteCss ) {
-			$query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
-			$skinquery = "&useskin=" . urlencode( $this->getSkinName() );
-			$sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n";
-			$sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n";
-			$sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n";
-		}
-
-		# If we use any dynamic CSS, make a little CDATA block out of it.
-
-		if ( !empty($sitecss) || !empty($usercss) ) {
-			$this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
-		}
-		wfProfileOut( __METHOD__ );
-	}
-
-	/**
-	 * @private
-	 */
 	function setupUserJs( $allowUserJs ) {
 		wfProfileIn( __METHOD__ );
 
@@ -1043,63 +991,9 @@ class SkinTemplate extends Skin {
 		wfProfileIn( __METHOD__ );
 		$out = false;
 		wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
-
 		wfProfileOut( __METHOD__ );
 		return $out;
 	}
-
-	/**
-	 * returns css with user-specific options
-	 */
-	public function getUserStylesheet() {
-		wfProfileIn( __METHOD__ );
-
-		$s = "/* generated user stylesheet */\n";
-		$s .= $this->reallyDoGetUserStyles();
-		wfProfileOut( __METHOD__ );
-		return $s;
-	}
-
-	/**
-	 * Returns the print stylesheet for this skin.  In all default skins this
-	 * is just commonPrint.css, but third-party skins may want to modify it.
-	 *
-	 * @return string
-	 */
-	protected function getPrintCss() {
-		global $wgStylePath;
-		return $wgStylePath . "/common/commonPrint.css";
-	}
-
-	/**
-	 * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
-	 * nated together.  For some bizarre reason, it does *not* return any
-	 * custom user JS from subpages.  Huh?
-	 *
-	 * There's absolutely no reason to have separate Monobook/Common JSes.
-	 * Any JS that cares can just check the skin variable generated at the
-	 * top.  For now Monobook.js will be maintained, but it should be consi-
-	 * dered deprecated.
-	 *
-	 * @return string
-	 */
-	public function getUserJs() {
-		wfProfileIn( __METHOD__ );
-
-		$s = parent::getUserJs();
-		$s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js */\n";
-
-		// avoid inclusion of non defined user JavaScript (with custom skins only)
-		// by checking for default message content
-		$msgKey = ucfirst($this->skinname).'.js';
-		$userJS = wfMsgForContent($msgKey);
-		if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
-			$s .= $userJS;
-		}
-
-		wfProfileOut( __METHOD__ );
-		return $s;
-	}
 }
 
 /**
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index d6ad6e6e..00eacd1e 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -89,14 +89,17 @@ class SpecialPage
 		'CreateAccount'             => array( 'SpecialRedirectToSpecial', 'CreateAccount', 'Userlogin', 'signup', array( 'uselang' ) ),
 		'Preferences'               => array( 'SpecialPage', 'Preferences' ),
 		'Watchlist'                 => array( 'SpecialPage', 'Watchlist' ),
+		'Resetpass'                 => 'SpecialResetpass',
+
 
 		'Recentchanges'             => 'SpecialRecentchanges',
 		'Upload'                    => array( 'SpecialPage', 'Upload' ),
-		'Imagelist'                 => array( 'SpecialPage', 'Imagelist' ),
+		'Listfiles'                 => array( 'SpecialPage', 'Listfiles' ),
 		'Newimages'                 => array( 'IncludableSpecialPage', 'Newimages' ),
 		'Listusers'                 => array( 'SpecialPage', 'Listusers' ),
 		'Listgrouprights'           => 'SpecialListGroupRights',
-		'Statistics'                => array( 'SpecialPage', 'Statistics' ),
+		'DeletedContributions'      => 'DeletedContributionsPage',
+		'Statistics'				=> 'SpecialStatistics',
 		'Randompage'                => 'Randompage',
 		'Lonelypages'               => array( 'SpecialPage', 'Lonelypages' ),
 		'Uncategorizedpages'        => array( 'SpecialPage', 'Uncategorizedpages' ),
@@ -107,6 +110,8 @@ class SpecialPage
 		'Unusedimages'              => array( 'SpecialPage', 'Unusedimages' ),
 		'Wantedpages'               => array( 'IncludableSpecialPage', 'Wantedpages' ),
 		'Wantedcategories'          => array( 'SpecialPage', 'Wantedcategories' ),
+		'Wantedfiles'               => array( 'SpecialPage', 'Wantedfiles' ),
+		'Wantedtemplates'           => array( 'SpecialPage', 'Wantedtemplates' ),
 		'Mostlinked'                => array( 'SpecialPage', 'Mostlinked' ),
 		'Mostlinkedcategories'      => array( 'SpecialPage', 'Mostlinkedcategories' ),
 		'Mostlinkedtemplates'       => array( 'SpecialPage', 'Mostlinkedtemplates' ),
@@ -121,27 +126,27 @@ class SpecialPage
 		'Deadendpages'              => array( 'SpecialPage', 'Deadendpages' ),
 		'Protectedpages'            => array( 'SpecialPage', 'Protectedpages' ),
 		'Protectedtitles'           => array( 'SpecialPage', 'Protectedtitles' ),
-		'Allpages'                  => array( 'IncludableSpecialPage', 'Allpages' ),
-		'Prefixindex'               => array( 'IncludableSpecialPage', 'Prefixindex' ) ,
+		'Allpages'                  => 'SpecialAllpages',
+		'Prefixindex'               => 'SpecialPrefixindex',
 		'Ipblocklist'               => array( 'SpecialPage', 'Ipblocklist' ),
 		'Specialpages'              => array( 'UnlistedSpecialPage', 'Specialpages' ),
-		'Contributions'             => array( 'SpecialPage', 'Contributions' ),
+		'Contributions'             => 'SpecialContributions',
 		'Emailuser'                 => array( 'UnlistedSpecialPage', 'Emailuser' ),
 		'Whatlinkshere'             => array( 'SpecialPage', 'Whatlinkshere' ),
+		'LinkSearch'                => array( 'SpecialPage', 'LinkSearch' ),
 		'Recentchangeslinked'       => 'SpecialRecentchangeslinked',
 		'Movepage'                  => array( 'UnlistedSpecialPage', 'Movepage' ),
 		'Blockme'                   => array( 'UnlistedSpecialPage', 'Blockme' ),
-		'Resetpass'                 => array( 'UnlistedSpecialPage', 'Resetpass' ),
 		'Booksources'               => 'SpecialBookSources',
 		'Categories'                => array( 'SpecialPage', 'Categories' ),
 		'Export'                    => array( 'SpecialPage', 'Export' ),
-		'Version'                   => array( 'SpecialPage', 'Version' ),
+		'Version'                   => 'SpecialVersion',
 		'Blankpage'                 => array( 'UnlistedSpecialPage', 'Blankpage' ),
 		'Allmessages'               => array( 'SpecialPage', 'Allmessages' ),
 		'Log'                       => array( 'SpecialPage', 'Log' ),
 		'Blockip'                   => array( 'SpecialPage', 'Blockip', 'block' ),
 		'Undelete'                  => array( 'SpecialPage', 'Undelete', 'deletedhistory' ),
-		'Import'                    => array( 'SpecialPage', 'Import', 'import' ),
+		'Import'                    => 'SpecialImport',
 		'Lockdb'                    => array( 'SpecialPage', 'Lockdb', 'siteadmin' ),
 		'Unlockdb'                  => array( 'SpecialPage', 'Unlockdb', 'siteadmin' ),
 		'Userrights'                => 'UserrightsPage',
@@ -484,7 +489,7 @@ class SpecialPage
 		if ( !$page ) {
 			if ( !$including ) {
 				$wgOut->setArticleRelated( false );
-				$wgOut->setRobotpolicy( 'noindex,nofollow' );
+				$wgOut->setRobotPolicy( 'noindex,nofollow' );
 				$wgOut->setStatusCode( 404 );
 				$wgOut->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
 			}
@@ -576,7 +581,7 @@ class SpecialPage
 		if ( $subpage !== false && !is_null( $subpage ) ) {
 			$name = "$name/$subpage";
 		}
-		return $name;
+		return ucfirst( $name );
 	}
 
 	/**
@@ -740,14 +745,8 @@ class SpecialPage
 			if(!is_callable($func) and $this->mFile) {
 				require_once( $this->mFile );
 			}
-			# FIXME: these hooks are broken for extensions and anything else that subclasses SpecialPage.
-			if ( wfRunHooks( 'SpecialPageExecuteBeforeHeader', array( &$this, &$par, &$func ) ) )
-				$this->outputHeader();
-			if ( ! wfRunHooks( 'SpecialPageExecuteBeforePage', array( &$this, &$par, &$func ) ) )
-				return;
+			$this->outputHeader();
 			call_user_func( $func, $par, $this );
-			if ( ! wfRunHooks( 'SpecialPageExecuteAfterPage', array( &$this, &$par, &$func ) ) )
-				return;
 		} else {
 			$this->displayRestrictionError();
 		}
diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index f69d1f0b..c8497a83 100644
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -6,7 +6,7 @@
  */
 
 /**
- * @todo document
+ * Handles purging appropriate Squid URLs given a title (or titles)
  * @ingroup Cache
  */
 class SquidUpdate {
diff --git a/includes/StringUtils.php b/includes/StringUtils.php
index 70d0bff1..c437b3c1 100644
--- a/includes/StringUtils.php
+++ b/includes/StringUtils.php
@@ -167,6 +167,18 @@ class StringUtils {
 		$string = str_replace( '$', '\\$', $string );
 		return $string;
 	}
+
+	/**
+	 * Workalike for explode() with limited memory usage.
+	 * Returns an Iterator
+	 */
+	static function explode( $separator, $subject ) {
+		if ( substr_count( $subject, $separator ) > 1000 ) {
+			return new ExplodeIterator( $separator, $subject );
+		} else {
+			return new ArrayIterator( explode( $separator, $subject ) );
+		}
+	}
 }
 
 /**
@@ -310,3 +322,90 @@ class ReplacementArray {
 		return $result;
 	}
 }
+
+/**
+ * An iterator which works exactly like:
+ * 
+ * foreach ( explode( $delim, $s ) as $element ) {
+ *    ...
+ * }
+ *
+ * Except it doesn't use 193 byte per element
+ */
+class ExplodeIterator implements Iterator {
+	// The subject string
+	var $subject, $subjectLength;
+
+	// The delimiter
+	var $delim, $delimLength;
+
+	// The position of the start of the line
+	var $curPos;
+
+	// The position after the end of the next delimiter
+	var $endPos;
+
+	// The current token
+	var $current;
+
+	/** 
+	 * Construct a DelimIterator
+	 */
+	function __construct( $delim, $s ) {
+		$this->subject = $s;
+		$this->delim = $delim;
+
+		// Micro-optimisation (theoretical)
+		$this->subjectLength = strlen( $s );
+		$this->delimLength = strlen( $delim );
+
+		$this->rewind();
+	}
+
+	function rewind() {
+		$this->curPos = 0;
+		$this->endPos = strpos( $this->subject, $this->delim );
+		$this->refreshCurrent();
+	}
+
+
+	function refreshCurrent() {
+		if ( $this->curPos === false ) {
+			$this->current = false;
+		} elseif ( $this->curPos >= $this->subjectLength ) {
+			$this->current = '';
+		} elseif ( $this->endPos === false ) {
+			$this->current = substr( $this->subject, $this->curPos );
+		} else {
+			$this->current = substr( $this->subject, $this->curPos, $this->endPos - $this->curPos );
+		}
+	}
+
+	function current() {
+		return $this->current;
+	}
+
+	function key() {
+		return $this->curPos;
+	}
+
+	function next() {
+		if ( $this->endPos === false ) {
+			$this->curPos = false;
+		} else {
+			$this->curPos = $this->endPos + $this->delimLength;
+			if ( $this->curPos >= $this->subjectLength ) {
+				$this->endPos = false;
+			} else {
+				$this->endPos = strpos( $this->subject, $this->delim, $this->curPos );
+			}
+		}
+		$this->refreshCurrent();
+		return $this->current;
+	}
+
+	function valid() {
+		return $this->curPos !== false;
+	}
+}
+
diff --git a/includes/StubObject.php b/includes/StubObject.php
index ec52e7f4..e27f0b25 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -95,7 +95,7 @@ class StubObject {
 			if ( ++$recursionLevel > 2 ) {
 				throw new MWException( "Unstub loop detected on call of \${$this->mGlobal}->$name from $caller\n" );
 			}
-			wfDebug( "Unstubbing \${$this->mGlobal} on call of \${$this->mGlobal}->$name from $caller\n" );
+			wfDebug( "Unstubbing \${$this->mGlobal} on call of \${$this->mGlobal}::$name from $caller\n" );
 			$GLOBALS[$this->mGlobal] = $this->_newObject();
 			--$recursionLevel;
 			wfProfileOut( $fname );
diff --git a/includes/Title.php b/includes/Title.php
index 6326240c..515a3b65 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4,97 +4,86 @@
  * @file
  */
 
-/** */
 if ( !class_exists( 'UtfNormal' ) ) {
 	require_once( dirname(__FILE__) . '/normal/UtfNormal.php' );
 }
 
 define ( 'GAID_FOR_UPDATE', 1 );
 
-# Title::newFromTitle maintains a cache to avoid
-# expensive re-normalization of commonly used titles.
-# On a batch operation this can become a memory leak
-# if not bounded. After hitting this many titles,
-# reset the cache.
-define( 'MW_TITLECACHE_MAX', 1000 );
 
-# Constants for pr_cascade bitfield
+/**
+ * Constants for pr_cascade bitfield
+ */
 define( 'CASCADE', 1 );
 
 /**
- * Title class
- * - Represents a title, which may contain an interwiki designation or namespace
- * - Can fetch various kinds of data from the database, albeit inefficiently.
- *
+ * Represents a title within MediaWiki.
+ * Optionally may contain an interwiki designation or namespace.
+ * @note This class can fetch various kinds of data from the database;
+ *       however, it does so inefficiently.
  */
 class Title {
-	/**
-	 * Static cache variables
-	 */
+	/** @name Static cache variables */
+	//@{
 	static private $titleCache=array();
 	static private $interwikiCache=array();
-
+	//@}
 
 	/**
-	 * All member variables should be considered private
-	 * Please use the accessor functions
+	 * Title::newFromText maintains a cache to avoid expensive re-normalization of
+	 * commonly used titles. On a batch operation this can become a memory leak
+	 * if not bounded. After hitting this many titles reset the cache.
 	 */
+	const CACHE_MAX = 1000;
+
 
-	/**#@+
+	/**
+	 * @name Private member variables
+	 * Please use the accessor functions instead.
 	 * @private
 	 */
-
-	var $mTextform;           	# Text form (spaces not underscores) of the main part
-	var $mUrlform;            	# URL-encoded form of the main part
-	var $mDbkeyform;          	# Main part with underscores
-	var $mUserCaseDBKey;        # DB key with the initial letter in the case specified by the user
-	var $mNamespace;          	# Namespace index, i.e. one of the NS_xxxx constants
-	var $mInterwiki;          	# Interwiki prefix (or null string)
-	var $mFragment;           	# Title fragment (i.e. the bit after the #)
-	var $mArticleID;          	# Article ID, fetched from the link cache on demand
-	var $mLatestID;         	# ID of most recent revision
-	var $mRestrictions;       	# Array of groups allowed to edit this article
-	var $mCascadeRestriction;	# Cascade restrictions on this page to included templates and images?
-	var $mRestrictionsExpiry;	# When do the restrictions on this page expire?
-	var $mHasCascadingRestrictions;	# Are cascading restrictions in effect on this page?
-	var $mCascadeRestrictionSources;# Where are the cascading restrictions coming from on this page?
-	var $mRestrictionsLoaded; 	# Boolean for initialisation on demand
-	var $mPrefixedText;       	# Text form including namespace/interwiki, initialised on demand
-	var $mDefaultNamespace;   	# Namespace index when there is no namespace
-	                    		# Zero except in {{transclusion}} tags
-	var $mWatched;      		# Is $wgUser watching this page? NULL if unfilled, accessed through userIsWatching()
-	var $mLength;              # The page length, 0 for special pages
-	var $mRedirect;            # Is the article at this title a redirect?
-	/**#@-*/
+	//@{
+
+	var $mTextform = '';           	  ///< Text form (spaces not underscores) of the main part
+	var $mUrlform = '';            	  ///< URL-encoded form of the main part
+	var $mDbkeyform = '';          	  ///< Main part with underscores
+	var $mUserCaseDBKey;              ///< DB key with the initial letter in the case specified by the user
+	var $mNamespace = NS_MAIN;        ///< Namespace index, i.e. one of the NS_xxxx constants
+	var $mInterwiki = '';          	  ///< Interwiki prefix (or null string)
+	var $mFragment;           	  ///< Title fragment (i.e. the bit after the #)
+	var $mArticleID = -1;             ///< Article ID, fetched from the link cache on demand
+	var $mLatestID = false;           ///< ID of most recent revision
+	var $mRestrictions = array();     ///< Array of groups allowed to edit this article
+	var $mOldRestrictions = false;
+	var $mCascadeRestriction;	  ///< Cascade restrictions on this page to included templates and images?
+	var $mRestrictionsExpiry = array();	  ///< When do the restrictions on this page expire?
+	var $mHasCascadingRestrictions;	  ///< Are cascading restrictions in effect on this page?
+	var $mCascadeSources;  ///< Where are the cascading restrictions coming from on this page?
+	var $mRestrictionsLoaded = false; ///< Boolean for initialisation on demand
+	var $mPrefixedText;       	  ///< Text form including namespace/interwiki, initialised on demand
+	# Don't change the following default, NS_MAIN is hardcoded in several
+	# places.  See bug 696.
+	var $mDefaultNamespace = NS_MAIN; ///< Namespace index when there is no namespace
+	                    		  # Zero except in {{transclusion}} tags
+	var $mWatched = null;      	  ///< Is $wgUser watching this page? null if unfilled, accessed through userIsWatching()
+	var $mLength = -1;                ///< The page length, 0 for special pages
+	var $mRedirect = null;            ///< Is the article at this title a redirect?
+	var $mNotificationTimestamp = array(); ///< Associative array of user ID -> timestamp/false
+	//@}
 
 
 	/**
 	 * Constructor
 	 * @private
 	 */
-	/* private */ function __construct() {
-		$this->mInterwiki = $this->mUrlform =
-		$this->mTextform = $this->mDbkeyform = '';
-		$this->mArticleID = -1;
-		$this->mNamespace = NS_MAIN;
-		$this->mRestrictionsLoaded = false;
-		$this->mRestrictions = array();
-		# Dont change the following, NS_MAIN is hardcoded in several place
-		# See bug #696
-		$this->mDefaultNamespace = NS_MAIN;
-		$this->mWatched = NULL;
-		$this->mLatestID = false;
-		$this->mOldRestrictions = false;
-		$this->mLength = -1;
-		$this->mRedirect = NULL;
-	}
+	/* private */ function __construct() {}
 
 	/**
 	 * Create a new Title from a prefixed DB key
-	 * @param string $key The database key, which has underscores
+	 * @param $key \type{\string} The database key, which has underscores
 	 *	instead of spaces, possibly including namespace and
 	 *	interwiki prefixes
-	 * @return Title the new object, or NULL on an error
+	 * @return \type{Title} the new object, or NULL on an error
 	 */
 	public static function newFromDBkey( $key ) {
 		$t = new Title();
@@ -106,15 +95,16 @@ class Title {
 	}
 
 	/**
-	 * Create a new Title from text, such as what one would
-	 * find in a link. Decodes any HTML entities in the text.
+	 * Create a new Title from text, such as what one would find in a link. De-
+	 * codes any HTML entities in the text.
 	 *
-	 * @param string $text the link text; spaces, prefixes,
-	 *	and an initial ':' indicating the main namespace
-	 *	are accepted
-	 * @param int $defaultNamespace the namespace to use if
-	 * 	none is specified by a prefix
-	 * @return Title the new object, or NULL on an error
+	 * @param $text             string  The link text; spaces, prefixes, and an
+	 *   initial ':' indicating the main namespace are accepted.
+	 * @param $defaultNamespace int     The namespace to use if none is speci-
+	 *   fied by a prefix.  If you want to force a specific namespace even if
+	 *   $text might begin with a namespace prefix, use makeTitle() or
+	 *   makeTitleSafe().
+	 * @return Title  The new object, or null on an error.
 	 */
 	public static function newFromText( $text, $defaultNamespace = NS_MAIN ) {
 		if( is_object( $text ) ) {
@@ -145,7 +135,7 @@ class Title {
 		static $cachedcount = 0 ;
 		if( $t->secureAndSplit() ) {
 			if( $defaultNamespace == NS_MAIN ) {
-				if( $cachedcount >= MW_TITLECACHE_MAX ) {
+				if( $cachedcount >= self::CACHE_MAX ) {
 					# Avoid memory leaks on mass operations...
 					Title::$titleCache = array();
 					$cachedcount=0;
@@ -163,8 +153,8 @@ class Title {
 	/**
 	 * Create a new Title from URL-encoded text. Ensures that
 	 * the given title's length does not exceed the maximum.
-	 * @param string $url the title, as might be taken from a URL
-	 * @return Title the new object, or NULL on an error
+	 * @param $url \type{\string} the title, as might be taken from a URL
+	 * @return \type{Title} the new object, or NULL on an error
 	 */
 	public static function newFromURL( $url ) {
 		global $wgLegalTitleChars;
@@ -191,9 +181,9 @@ class Title {
 	 * @todo This is inefficiently implemented, the page row is requested
 	 *       but not used for anything else
 	 *
-	 * @param int $id the page_id corresponding to the Title to create
-	 * @param int $flags, use GAID_FOR_UPDATE to use master
-	 * @return Title the new object, or NULL on an error
+	 * @param $id \type{\int} the page_id corresponding to the Title to create
+	 * @param $flags \type{\int} use GAID_FOR_UPDATE to use master
+	 * @return \type{Title} the new object, or NULL on an error
 	 */
 	public static function newFromID( $id, $flags = 0 ) {
 		$fname = 'Title::newFromID';
@@ -210,6 +200,8 @@ class Title {
 
 	/**
 	 * Make an array of titles from an array of IDs
+	 * @param $ids \type{\arrayof{\int}} Array of IDs
+	 * @return \type{\arrayof{Title}} Array of Titles
 	 */
 	public static function newFromIDs( $ids ) {
 		if ( !count( $ids ) ) {
@@ -220,7 +212,7 @@ class Title {
 			'page_id IN (' . $dbr->makeList( $ids ) . ')', __METHOD__ );
 
 		$titles = array();
-		while ( $row = $dbr->fetchObject( $res ) ) {
+		foreach( $res as $row ) {
 			$titles[] = Title::makeTitle( $row->page_namespace, $row->page_title );
 		}
 		return $titles;
@@ -228,7 +220,8 @@ class Title {
 
 	/**
 	 * Make a Title object from a DB row
-	 * @param Row $row (needs at least page_title,page_namespace)
+	 * @param $row \type{Row} (needs at least page_title,page_namespace)
+	 * @return \type{Title} corresponding Title
 	 */
 	public static function newFromRow( $row ) {
 		$t = self::makeTitle( $row->page_namespace, $row->page_title );
@@ -248,10 +241,10 @@ class Title {
 	 * For convenience, spaces are converted to underscores so that
 	 * eg user_text fields can be used directly.
 	 *
-	 * @param int $ns the namespace of the article
-	 * @param string $title the unprefixed database key form
-	 * @param string $fragment The link fragment (after the "#")
-	 * @return Title the new object
+	 * @param $ns \type{\int} the namespace of the article
+	 * @param $title \type{\string} the unprefixed database key form
+	 * @param $fragment \type{\string} The link fragment (after the "#")
+	 * @return \type{Title} the new object
 	 */
 	public static function &makeTitle( $ns, $title, $fragment = '' ) {
 		$t = new Title();
@@ -270,10 +263,10 @@ class Title {
 	 * The parameters will be checked for validity, which is a bit slower
 	 * than makeTitle() but safer for user-provided data.
 	 *
-	 * @param int $ns the namespace of the article
-	 * @param string $title the database key form
-	 * @param string $fragment The link fragment (after the "#")
-	 * @return Title the new object, or NULL on an error
+	 * @param $ns \type{\int} the namespace of the article
+	 * @param $title \type{\string} the database key form
+	 * @param $fragment \type{\string} The link fragment (after the "#")
+	 * @return \type{Title} the new object, or NULL on an error
 	 */
 	public static function makeTitleSafe( $ns, $title, $fragment = '' ) {
 		$t = new Title();
@@ -287,7 +280,7 @@ class Title {
 
 	/**
 	 * Create a new Title for the Main Page
-	 * @return Title the new object
+	 * @return \type{Title} the new object
 	 */
 	public static function newMainPage() {
 		$title = Title::newFromText( wfMsgForContent( 'mainpage' ) );
@@ -302,15 +295,18 @@ class Title {
 	 * Extract a redirect destination from a string and return the
 	 * Title, or null if the text doesn't contain a valid redirect
 	 *
-	 * @param string $text Text with possible redirect
-	 * @return Title
+	 * @param $text \type{String} Text with possible redirect
+	 * @return \type{Title} The corresponding Title
 	 */
 	public static function newFromRedirect( $text ) {
 		$redir = MagicWord::get( 'redirect' );
-		if( $redir->matchStart( trim($text) ) ) {
+		$text = trim($text);
+		if( $redir->matchStartAndRemove( $text ) ) {
 			// Extract the first link and see if it's usable
+			// Ensure that it really does come directly after #REDIRECT
+			// Some older redirects included a colon, so don't freak about that!
 			$m = array();
-			if( preg_match( '!\[{2}(.*?)(?:\|.*?)?\]{2}!', $text, $m ) ) {
+			if( preg_match( '!^\s*:?\s*\[{2}(.*?)(?:\|.*?)?\]{2}!', $text, $m ) ) {
 				// Strip preceding colon used to "escape" categories, etc.
 				// and URL-decode links
 				if( strpos( $m[1], '%' ) !== false ) {
@@ -338,26 +334,26 @@ class Title {
 
 	/**
 	 * Get the prefixed DB key associated with an ID
-	 * @param int $id the page_id of the article
-	 * @return Title an object representing the article, or NULL
+	 * @param $id \type{\int} the page_id of the article
+	 * @return \type{Title} an object representing the article, or NULL
 	 * 	if no such article was found
-	 * @static
-	 * @access public
 	 */
-	function nameOf( $id ) {
-		$fname = 'Title::nameOf';
+	public static function nameOf( $id ) {
 		$dbr = wfGetDB( DB_SLAVE );
 
-		$s = $dbr->selectRow( 'page', array( 'page_namespace','page_title' ),  array( 'page_id' => $id ), $fname );
+		$s = $dbr->selectRow( 'page',
+			array( 'page_namespace','page_title' ),
+			array( 'page_id' => $id ), 
+			__METHOD__ );
 		if ( $s === false ) { return NULL; }
 
-		$n = Title::makeName( $s->page_namespace, $s->page_title );
+		$n = self::makeName( $s->page_namespace, $s->page_title );
 		return $n;
 	}
 
 	/**
 	 * Get a regex character class describing the legal characters in a link
-	 * @return string the list of characters, not delimited
+	 * @return \type{\string} the list of characters, not delimited
 	 */
 	public static function legalChars() {
 		global $wgLegalTitleChars;
@@ -368,9 +364,9 @@ class Title {
 	 * Get a string representation of a title suitable for
 	 * including in a search index
 	 *
-	 * @param int $ns a namespace index
-	 * @param string $title text-form main part
-	 * @return string a stripped-down title string ready for the
+	 * @param $ns \type{\int} a namespace index
+	 * @param $title \type{\string} text-form main part
+	 * @return \type{\string} a stripped-down title string ready for the
 	 * 	search index
 	 */
 	public static function indexTitle( $ns, $title ) {
@@ -387,7 +383,7 @@ class Title {
 
 		$t = preg_replace( "/\\s+/", ' ', $t );
 
-		if ( $ns == NS_IMAGE ) {
+		if ( $ns == NS_FILE ) {
 			$t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t );
 		}
 		return trim( $t );
@@ -395,10 +391,10 @@ class Title {
 
 	/*
 	 * Make a prefixed DB key from a DB key and a namespace index
-	 * @param int $ns numerical representation of the namespace
-	 * @param string $title the DB key form the title
-	 * @param string $fragment The link fragment (after the "#")
-	 * @return string the prefixed form of the title
+	 * @param $ns \type{\int} numerical representation of the namespace
+	 * @param $title \type{\string} the DB key form the title
+	 * @param $fragment \type{\string} The link fragment (after the "#")
+	 * @return \type{\string} the prefixed form of the title
 	 */
 	public static function makeName( $ns, $title, $fragment = '' ) {
 		global $wgContLang;
@@ -413,111 +409,26 @@ class Title {
 
 	/**
 	 * Returns the URL associated with an interwiki prefix
-	 * @param string $key the interwiki prefix (e.g. "MeatBall")
-	 * @return the associated URL, containing "$1", which should be
-	 * 	replaced by an article title
+	 * @param $key \type{\string} the interwiki prefix (e.g. "MeatBall")
+	 * @return \type{\string} the associated URL, containing "$1", 
+	 * 	which should be replaced by an article title
 	 * @static (arguably)
+	 * @deprecated See Interwiki class
 	 */
 	public function getInterwikiLink( $key )  {
-		global $wgMemc, $wgInterwikiExpiry;
-		global $wgInterwikiCache, $wgContLang;
-		$fname = 'Title::getInterwikiLink';
-
-		$key = $wgContLang->lc( $key );
-
-		$k = wfMemcKey( 'interwiki', $key );
-		if( array_key_exists( $k, Title::$interwikiCache ) ) {
-			return Title::$interwikiCache[$k]->iw_url;
-		}
-
-		if ($wgInterwikiCache) {
-			return Title::getInterwikiCached( $key );
-		}
-
-		$s = $wgMemc->get( $k );
-		# Ignore old keys with no iw_local
-		if( $s && isset( $s->iw_local ) && isset($s->iw_trans)) {
-			Title::$interwikiCache[$k] = $s;
-			return $s->iw_url;
-		}
-
-		$dbr = wfGetDB( DB_SLAVE );
-		$res = $dbr->select( 'interwiki',
-			array( 'iw_url', 'iw_local', 'iw_trans' ),
-			array( 'iw_prefix' => $key ), $fname );
-		if( !$res ) {
-			return '';
-		}
-
-		$s = $dbr->fetchObject( $res );
-		if( !$s ) {
-			# Cache non-existence: create a blank object and save it to memcached
-			$s = (object)false;
-			$s->iw_url = '';
-			$s->iw_local = 0;
-			$s->iw_trans = 0;
-		}
-		$wgMemc->set( $k, $s, $wgInterwikiExpiry );
-		Title::$interwikiCache[$k] = $s;
-
-		return $s->iw_url;
+		return Interwiki::fetch( $key )->getURL( );
 	}
 
 	/**
-	 * Fetch interwiki prefix data from local cache in constant database
-	 *
-	 * More logic is explained in DefaultSettings
-	 *
-	 * @return string URL of interwiki site
-	 */
-	public static function getInterwikiCached( $key ) {
-		global $wgInterwikiCache, $wgInterwikiScopes, $wgInterwikiFallbackSite;
-		static $db, $site;
-
-		if (!$db)
-			$db=dba_open($wgInterwikiCache,'r','cdb');
-		/* Resolve site name */
-		if ($wgInterwikiScopes>=3 and !$site) {
-			$site = dba_fetch('__sites:' . wfWikiID(), $db);
-			if ($site=="")
-				$site = $wgInterwikiFallbackSite;
-		}
-		$value = dba_fetch( wfMemcKey( $key ), $db);
-		if ($value=='' and $wgInterwikiScopes>=3) {
-			/* try site-level */
-			$value = dba_fetch("_{$site}:{$key}", $db);
-		}
-		if ($value=='' and $wgInterwikiScopes>=2) {
-			/* try globals */
-			$value = dba_fetch("__global:{$key}", $db);
-		}
-		if ($value=='undef')
-			$value='';
-		$s = (object)false;
-		$s->iw_url = '';
-		$s->iw_local = 0;
-		$s->iw_trans = 0;
-		if ($value!='') {
-			list($local,$url)=explode(' ',$value,2);
-			$s->iw_url=$url;
-			$s->iw_local=(int)$local;
-		}
-		Title::$interwikiCache[wfMemcKey( 'interwiki', $key )] = $s;
-		return $s->iw_url;
-	}
-	/**
 	 * Determine whether the object refers to a page within
 	 * this project.
 	 *
-	 * @return bool TRUE if this is an in-project interwiki link
+	 * @return \type{\bool} TRUE if this is an in-project interwiki link
 	 *	or a wikilink, FALSE otherwise
 	 */
 	public function isLocal() {
 		if ( $this->mInterwiki != '' ) {
-			# Make sure key is loaded into cache
-			$this->getInterwikiLink( $this->mInterwiki );
-			$k = wfMemcKey( 'interwiki', $this->mInterwiki );
-			return (bool)(Title::$interwikiCache[$k]->iw_local);
+			return Interwiki::fetch( $this->mInterwiki )->isLocal();
 		} else {
 			return true;
 		}
@@ -527,28 +438,26 @@ class Title {
 	 * Determine whether the object refers to a page within
 	 * this project and is transcludable.
 	 *
-	 * @return bool TRUE if this is transcludable
+	 * @return \type{\bool} TRUE if this is transcludable
 	 */
 	public function isTrans() {
 		if ($this->mInterwiki == '')
 			return false;
-		# Make sure key is loaded into cache
-		$this->getInterwikiLink( $this->mInterwiki );
-		$k = wfMemcKey( 'interwiki', $this->mInterwiki );
-		return (bool)(Title::$interwikiCache[$k]->iw_trans);
+		
+		return Interwiki::fetch( $this->mInterwiki )->isTranscludable();
 	}
 
 	/**
 	 * Escape a text fragment, say from a link, for a URL
 	 */
 	static function escapeFragmentForURL( $fragment ) {
-		$fragment = str_replace( ' ', '_', $fragment );
-		$fragment = urlencode( Sanitizer::decodeCharReferences( $fragment ) );
-		$replaceArray = array(
-			'%3A' => ':',
-			'%' => '.'
-		);
-		return strtr( $fragment, $replaceArray );
+		global $wgEnforceHtmlIds;
+		# Note that we don't urlencode the fragment.  urlencoded Unicode
+		# fragments appear not to work in IE (at least up to 7) or in at least
+		# one version of Opera 9.x.  The W3C validator, for one, doesn't seem
+		# to care if they aren't encoded.
+		return Sanitizer::escapeId( $fragment,
+			$wgEnforceHtmlIds ? 'noninitial' : 'xml' );
 	}
 
 #----------------------------------------------------------------------------
@@ -558,27 +467,27 @@ class Title {
 	/** Simple accessors */
 	/**
 	 * Get the text form (spaces not underscores) of the main part
-	 * @return string
+	 * @return \type{\string} Main part of the title
 	 */
 	public function getText() { return $this->mTextform; }
 	/**
 	 * Get the URL-encoded form of the main part
-	 * @return string
+	 * @return \type{\string} Main part of the title, URL-encoded
 	 */
 	public function getPartialURL() { return $this->mUrlform; }
 	/**
 	 * Get the main part with underscores
-	 * @return string
+	 * @return \type{\string} Main part of the title, with underscores
 	 */
 	public function getDBkey() { return $this->mDbkeyform; }
 	/**
-	 * Get the namespace index, i.e. one of the NS_xxxx constants
-	 * @return int
+	 * Get the namespace index, i.e.\ one of the NS_xxxx constants.
+	 * @return \type{\int} Namespace index
 	 */
 	public function getNamespace() { return $this->mNamespace; }
 	/**
 	 * Get the namespace text
-	 * @return string
+	 * @return \type{\string} Namespace text
 	 */
 	public function getNsText() {
 		global $wgContLang, $wgCanonicalNamespaceNames;
@@ -598,49 +507,47 @@ class Title {
 	}
 	/**
 	 * Get the DB key with the initial letter case as specified by the user
+	 * @return \type{\string} DB key
 	 */
 	function getUserCaseDBKey() {
 		return $this->mUserCaseDBKey;
 	}
 	/**
 	 * Get the namespace text of the subject (rather than talk) page
-	 * @return string
+	 * @return \type{\string} Namespace text
 	 */
 	public function getSubjectNsText() {
 		global $wgContLang;
 		return $wgContLang->getNsText( MWNamespace::getSubject( $this->mNamespace ) );
 	}
-
 	/**
 	 * Get the namespace text of the talk page
-	 * @return string
+	 * @return \type{\string} Namespace text
 	 */
 	public function getTalkNsText() {
 		global $wgContLang;
 		return( $wgContLang->getNsText( MWNamespace::getTalk( $this->mNamespace ) ) );
 	}
-
 	/**
 	 * Could this title have a corresponding talk page?
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function canTalk() {
 		return( MWNamespace::canTalk( $this->mNamespace ) );
 	}
-
 	/**
 	 * Get the interwiki prefix (or null string)
-	 * @return string
+	 * @return \type{\string} Interwiki prefix
 	 */
 	public function getInterwiki() { return $this->mInterwiki; }
 	/**
-	 * Get the Title fragment (i.e. the bit after the #) in text form
-	 * @return string
+	 * Get the Title fragment (i.e.\ the bit after the #) in text form
+	 * @return \type{\string} Title fragment
 	 */
 	public function getFragment() { return $this->mFragment; }
 	/**
 	 * Get the fragment in URL form, including the "#" character if there is one
-	 * @return string
+	 * @return \type{\string} Fragment in URL form
 	 */
 	public function getFragmentForURL() {
 		if ( $this->mFragment == '' ) {
@@ -651,13 +558,13 @@ class Title {
 	}
 	/**
 	 * Get the default namespace index, for when there is no namespace
-	 * @return int
+	 * @return \type{\int} Default namespace index
 	 */
 	public function getDefaultNamespace() { return $this->mDefaultNamespace; }
 
 	/**
 	 * Get title for search index
-	 * @return string a stripped-down title string ready for the
+	 * @return \type{\string} a stripped-down title string ready for the
 	 * 	search index
 	 */
 	public function getIndexTitle() {
@@ -666,7 +573,7 @@ class Title {
 
 	/**
 	 * Get the prefixed database key form
-	 * @return string the prefixed title, with underscores and
+	 * @return \type{\string} the prefixed title, with underscores and
 	 * 	any interwiki and namespace prefixes
 	 */
 	public function getPrefixedDBkey() {
@@ -678,7 +585,7 @@ class Title {
 	/**
 	 * Get the prefixed title with spaces.
 	 * This is the form usually used for display
-	 * @return string the prefixed title, with spaces
+	 * @return \type{\string} the prefixed title, with spaces
 	 */
 	public function getPrefixedText() {
 		if ( empty( $this->mPrefixedText ) ) { // FIXME: bad usage of empty() ?
@@ -692,7 +599,7 @@ class Title {
 	/**
 	 * Get the prefixed title with spaces, plus any fragment
 	 * (part beginning with '#')
-	 * @return string the prefixed title, with spaces and
+	 * @return \type{\string} the prefixed title, with spaces and
 	 * 	the fragment, including '#'
 	 */
 	public function getFullText() {
@@ -705,7 +612,7 @@ class Title {
 
 	/**
 	 * Get the base name, i.e. the leftmost parts before the /
-	 * @return string Base name
+	 * @return \type{\string} Base name
 	 */
 	public function getBaseText() {
 		if( !MWNamespace::hasSubpages( $this->mNamespace ) ) {
@@ -721,7 +628,7 @@ class Title {
 
 	/**
 	 * Get the lowest-level subpage name, i.e. the rightmost part after /
-	 * @return string Subpage name
+	 * @return \type{\string} Subpage name
 	 */
 	public function getSubpageText() {
 		if( !MWNamespace::hasSubpages( $this->mNamespace ) ) {
@@ -733,29 +640,21 @@ class Title {
 
 	/**
 	 * Get a URL-encoded form of the subpage text
-	 * @return string URL-encoded subpage name
+	 * @return \type{\string} URL-encoded subpage name
 	 */
 	public function getSubpageUrlForm() {
 		$text = $this->getSubpageText();
 		$text = wfUrlencode( str_replace( ' ', '_', $text ) );
-		$text = str_replace( '%28', '(', str_replace( '%29', ')', $text ) ); # Clean up the URL; per below, this might not be safe
 		return( $text );
 	}
 
 	/**
 	 * Get a URL-encoded title (not an actual URL) including interwiki
-	 * @return string the URL-encoded form
+	 * @return \type{\string} the URL-encoded form
 	 */
 	public function getPrefixedURL() {
 		$s = $this->prefix( $this->mDbkeyform );
-		$s = str_replace( ' ', '_', $s );
-
-		$s = wfUrlencode ( $s ) ;
-
-		# Cleaning up URL to make it look nice -- is this safe?
-		$s = str_replace( '%28', '(', $s );
-		$s = str_replace( '%29', ')', $s );
-
+		$s = wfUrlencode( str_replace( ' ', '_', $s ) );
 		return $s;
 	}
 
@@ -763,15 +662,21 @@ class Title {
 	 * Get a real URL referring to this title, with interwiki link and
 	 * fragment
 	 *
-	 * @param string $query an optional query string, not used
-	 * 	for interwiki links
-	 * @param string $variant language variant of url (for sr, zh..)
-	 * @return string the URL
+	 * @param $query \twotypes{\string,\array} an optional query string, not used for interwiki
+	 *   links. Can be specified as an associative array as well, e.g.,
+	 *   array( 'action' => 'edit' ) (keys and values will be URL-escaped).
+	 * @param $variant \type{\string} language variant of url (for sr, zh..)
+	 * @return \type{\string} the URL
 	 */
 	public function getFullURL( $query = '', $variant = false ) {
 		global $wgContLang, $wgServer, $wgRequest;
 
-		if ( '' == $this->mInterwiki ) {
+		if( is_array( $query ) ) {
+			$query = wfArrayToCGI( $query );
+		}
+
+		$interwiki = Interwiki::fetch( $this->mInterwiki );
+		if ( !$interwiki ) {
 			$url = $this->getLocalUrl( $query, $variant );
 
 			// Ugly quick hack to avoid duplicate prefixes (bug 4571 etc)
@@ -780,7 +685,7 @@ class Title {
 				$url = $wgServer . $url;
 			}
 		} else {
-			$baseUrl = $this->getInterwikiLink( $this->mInterwiki );
+			$baseUrl = $interwiki->getURL( );
 
 			$namespace = wfUrlencode( $this->getNsText() );
 			if ( '' != $namespace ) {
@@ -802,15 +707,21 @@ class Title {
 	/**
 	 * Get a URL with no fragment or server name.  If this page is generated
 	 * with action=render, $wgServer is prepended.
-	 * @param string $query an optional query string; if not specified,
-	 * 	$wgArticlePath will be used.
-	 * @param string $variant language variant of url (for sr, zh..)
-	 * @return string the URL
+	 * @param mixed $query an optional query string; if not specified,
+	 * 	 $wgArticlePath will be used.  Can be specified as an associative array
+	 *   as well, e.g., array( 'action' => 'edit' ) (keys and values will be
+	 *   URL-escaped).
+	 * @param $variant \type{\string} language variant of url (for sr, zh..)
+	 * @return \type{\string} the URL
 	 */
 	public function getLocalURL( $query = '', $variant = false ) {
 		global $wgArticlePath, $wgScript, $wgServer, $wgRequest;
 		global $wgVariantArticlePath, $wgContLang, $wgUser;
 
+		if( is_array( $query ) ) {
+			$query = wfArrayToCGI( $query );
+		}
+
 		// internal links should point to same variant as current page (only anonymous users)
 		if($variant == false && $wgContLang->hasVariants() && !$wgUser->isLoggedIn()){
 			$pref = $wgContLang->getPreferredVariant(false);
@@ -853,7 +764,9 @@ class Title {
 						$query = $matches[1];
 						if( isset( $matches[4] ) ) $query .= $matches[4];
 						$url = str_replace( '$1', $dbkey, $wgActionPaths[$action] );
-						if( $query != '' ) $url .= '?' . $query;
+						if( $query != '' ) {
+							$url = wfAppendQuery( $url, $query );
+						}
 					}
 				}
 				if ( $url === false ) {
@@ -875,10 +788,40 @@ class Title {
 	}
 
 	/**
+	 * Get a URL that's the simplest URL that will be valid to link, locally,
+	 * to the current Title.  It includes the fragment, but does not include
+	 * the server unless action=render is used (or the link is external).  If
+	 * there's a fragment but the prefixed text is empty, we just return a link
+	 * to the fragment.
+	 *
+	 * @param $query \type{\arrayof{\string}} An associative array of key => value pairs for the
+	 *   query string.  Keys and values will be escaped.
+	 * @param $variant \type{\string} Language variant of URL (for sr, zh..).  Ignored
+	 *   for external links.  Default is "false" (same variant as current page,
+	 *   for anonymous users).
+	 * @return \type{\string} the URL
+	 */
+	public function getLinkUrl( $query = array(), $variant = false ) {
+		if( !is_array( $query ) ) {
+			throw new MWException( 'Title::getLinkUrl passed a non-array for '.
+			'$query' );
+		}
+		if( $this->isExternal() ) {
+			return $this->getFullURL( $query );
+		} elseif( $this->getPrefixedText() === ''
+		and $this->getFragment() !== '' ) {
+			return $this->getFragmentForURL();
+		} else {
+			return $this->getLocalURL( $query, $variant )
+				. $this->getFragmentForURL();
+		}
+	}
+
+	/**
 	 * Get an HTML-escaped version of the URL form, suitable for
 	 * using in a link, without a server name or fragment
-	 * @param string $query an optional query string
-	 * @return string the URL
+	 * @param $query \type{\string} an optional query string
+	 * @return \type{\string} the URL
 	 */
 	public function escapeLocalURL( $query = '' ) {
 		return htmlspecialchars( $this->getLocalURL( $query ) );
@@ -888,8 +831,8 @@ class Title {
 	 * Get an HTML-escaped version of the URL form, suitable for
 	 * using in a link, including the server name and fragment
 	 *
-	 * @return string the URL
-	 * @param string $query an optional query string
+	 * @param $query \type{\string} an optional query string
+	 * @return \type{\string} the URL
 	 */
 	public function escapeFullURL( $query = '' ) {
 		return htmlspecialchars( $this->getFullURL( $query ) );
@@ -900,9 +843,9 @@ class Title {
 	 * - Used in various Squid-related code, in case we have a different
 	 * internal hostname for the server from the exposed one.
 	 *
-	 * @param string $query an optional query string
-	 * @param string $variant language variant of url (for sr, zh..)
-	 * @return string the URL
+	 * @param $query \type{\string} an optional query string
+	 * @param $variant \type{\string} language variant of url (for sr, zh..)
+	 * @return \type{\string} the URL
 	 */
 	public function getInternalURL( $query = '', $variant = false ) {
 		global $wgInternalServer;
@@ -913,7 +856,7 @@ class Title {
 
 	/**
 	 * Get the edit URL for this Title
-	 * @return string the URL, or a null string if this is an
+	 * @return \type{\string} the URL, or a null string if this is an
 	 * 	interwiki link
 	 */
 	public function getEditURL() {
@@ -926,7 +869,7 @@ class Title {
 	/**
 	 * Get the HTML-escaped displayable text form.
 	 * Used for the title field in <a> tags.
-	 * @return string the text, including any prefixes
+	 * @return \type{\string} the text, including any prefixes
 	 */
 	public function getEscapedText() {
 		return htmlspecialchars( $this->getPrefixedText() );
@@ -934,15 +877,15 @@ class Title {
 
 	/**
 	 * Is this Title interwiki?
-	 * @return boolean
+	 * @return \type{\bool}
 	 */
 	public function isExternal() { return ( '' != $this->mInterwiki ); }
 
 	/**
 	 * Is this page "semi-protected" - the *only* protection is autoconfirm?
 	 *
-	 * @param string Action to check (default: edit)
-	 * @return bool
+	 * @param @action \type{\string} Action to check (default: edit)
+	 * @return \type{\bool}
 	 */
 	public function isSemiProtected( $action = 'edit' ) {
 		if( $this->exists() ) {
@@ -965,9 +908,9 @@ class Title {
 
 	/**
 	 * Does the title correspond to a protected article?
-	 * @param string $what the action the page is protected from,
+	 * @param $what \type{\string} the action the page is protected from,
 	 * by default checks move and edit
-	 * @return boolean
+	 * @return \type{\bool}
 	 */
 	public function isProtected( $action = '' ) {
 		global $wgRestrictionLevels, $wgRestrictionTypes;
@@ -993,7 +936,7 @@ class Title {
 
 	/**
 	 * Is $wgUser watching this page?
-	 * @return boolean
+	 * @return \type{\bool}
 	 */
 	public function userIsWatching() {
 		global $wgUser;
@@ -1017,8 +960,8 @@ class Title {
 	 *
 	 * May provide false positives, but should never provide a false negative.
 	 *
-	 * @param string $action action that permission needs to be checked for
-	 * @return boolean
+	 * @param $action \type{\string} action that permission needs to be checked for
+	 * @return \type{\bool}
  	 */
 	public function quickUserCan( $action ) {
 		return $this->userCan( $action, false );
@@ -1028,7 +971,7 @@ class Title {
 	 * Determines if $wgUser is unable to edit this page because it has been protected
 	 * by $wgNamespaceProtection.
 	 *
-	 * @return boolean
+	 * @return \type{\bool}
 	 */
 	public function isNamespaceProtected() {
 		global $wgNamespaceProtection, $wgUser;
@@ -1043,9 +986,9 @@ class Title {
 
 	/**
 	 * Can $wgUser perform $action on this page?
-	 * @param string $action action that permission needs to be checked for
-	 * @param bool $doExpensiveQueries Set this to false to avoid doing unnecessary queries.
-	 * @return boolean
+	 * @param $action \type{\string} action that permission needs to be checked for
+	 * @param $doExpensiveQueries \type{\bool} Set this to false to avoid doing unnecessary queries.
+	 * @return \type{\bool}
  	 */
 	public function userCan( $action, $doExpensiveQueries = true ) {
 		global $wgUser;
@@ -1057,11 +1000,11 @@ class Title {
 	 *
 	 * FIXME: This *does not* check throttles (User::pingLimiter()).
 	 *
-	 * @param string $action action that permission needs to be checked for
-	 * @param User $user user to check
-	 * @param bool $doExpensiveQueries Set this to false to avoid doing unnecessary queries.
-	 * @param array $ignoreErrors Set this to a list of message keys whose corresponding errors may be ignored.
-	 * @return array Array of arrays of the arguments to wfMsg to explain permissions problems.
+	 * @param $action \type{\string}action that permission needs to be checked for
+	 * @param $user \type{User} user to check
+	 * @param $doExpensiveQueries \type{\bool} Set this to false to avoid doing unnecessary queries.
+	 * @param $ignoreErrors \type{\arrayof{\string}} Set this to a list of message keys whose corresponding errors may be ignored.
+	 * @return \type{\array} Array of arrays of the arguments to wfMsg to explain permissions problems.
 	 */
 	public function getUserPermissionsErrors( $action, $user, $doExpensiveQueries = true, $ignoreErrors = array() ) {
 		if( !StubObject::isRealObject( $user ) ) {
@@ -1080,7 +1023,8 @@ class Title {
 			$errors[] = array( 'confirmedittext' );
 		}
 
-		if ( $user->isBlockedFrom( $this ) && $action != 'createaccount' ) {
+		// Edit blocks should not affect reading. Account creation blocks handled at userlogin.
+		if ( $user->isBlockedFrom( $this ) && $action != 'read' && $action != 'createaccount' ) {
 			$block = $user->mBlock;
 
 			// This is from OutputPage::blockedPage
@@ -1147,10 +1091,10 @@ class Title {
 	 * which checks ONLY that previously checked by userCan (i.e. it leaves out
 	 * checks on wfReadOnly() and blocks)
 	 *
-	 * @param string $action action that permission needs to be checked for
-	 * @param User $user user to check
-	 * @param bool $doExpensiveQueries Set this to false to avoid doing unnecessary queries.
-	 * @return array Array of arrays of the arguments to wfMsg to explain permissions problems.
+	 * @param $action \type{\string} action that permission needs to be checked for
+	 * @param $user \type{User} user to check
+	 * @param $doExpensiveQueries \type{\bool} Set this to false to avoid doing unnecessary queries.
+	 * @return \type{\array} Array of arrays of the arguments to wfMsg to explain permissions problems.
 	 */
 	private function getUserPermissionsErrorsInternal( $action, $user, $doExpensiveQueries = true ) {
 		wfProfileIn( __METHOD__ );
@@ -1158,61 +1102,55 @@ class Title {
 		$errors = array();
 
 		// Use getUserPermissionsErrors instead
-		if ( !wfRunHooks( 'userCan', array( &$this, &$user, $action, &$result ) ) ) {
+		if( !wfRunHooks( 'userCan', array( &$this, &$user, $action, &$result ) ) ) {
 			wfProfileOut( __METHOD__ );
 			return $result ? array() : array( array( 'badaccess-group0' ) );
 		}
 
-		if (!wfRunHooks( 'getUserPermissionsErrors', array( &$this, &$user, $action, &$result ) ) ) {
-			if ($result != array() && is_array($result) && !is_array($result[0]))
+		if( !wfRunHooks( 'getUserPermissionsErrors', array(&$this,&$user,$action,&$result) ) ) {
+			if( is_array($result) && count($result) && !is_array($result[0]) )
 				$errors[] = $result; # A single array representing an error
-			else if (is_array($result) && is_array($result[0]))
+			else if( is_array($result) && is_array($result[0]) )
 				$errors = array_merge( $errors, $result ); # A nested array representing multiple errors
-			else if ($result != '' && $result != null && $result !== true && $result !== false)
+			else if( $result !== '' && is_string($result) )
 				$errors[] = array($result); # A string representing a message-id
-			else if ($result === false )
+			else if( $result === false )
 				$errors[] = array('badaccess-group0'); # a generic "We don't want them to do that"
 		}
-		if ($doExpensiveQueries && !wfRunHooks( 'getUserPermissionsErrorsExpensive', array( &$this, &$user, $action, &$result ) ) ) {
-			if ($result != array() && is_array($result) && !is_array($result[0]))
+		if( $doExpensiveQueries && !wfRunHooks( 'getUserPermissionsErrorsExpensive', array(&$this,&$user,$action,&$result) ) ) {
+			if( is_array($result) && count($result) && !is_array($result[0]) )
 				$errors[] = $result; # A single array representing an error
-			else if (is_array($result) && is_array($result[0]))
+			else if( is_array($result) && is_array($result[0]) )
 				$errors = array_merge( $errors, $result ); # A nested array representing multiple errors
-			else if ($result != '' && $result != null && $result !== true && $result !== false)
+			else if( $result !== '' && is_string($result) )
 				$errors[] = array($result); # A string representing a message-id
-			else if ($result === false )
+			else if( $result === false )
 				$errors[] = array('badaccess-group0'); # a generic "We don't want them to do that"
 		}
 		
+		// TODO: document
 		$specialOKActions = array( 'createaccount', 'execute' );
 		if( NS_SPECIAL == $this->mNamespace && !in_array( $action, $specialOKActions) ) {
 			$errors[] = array('ns-specialprotected');
 		}
 
-		if ( $this->isNamespaceProtected() ) {
-			$ns = $this->getNamespace() == NS_MAIN
-				? wfMsg( 'nstab-main' )
-				: $this->getNsText();
-			$errors[] = (NS_MEDIAWIKI == $this->mNamespace
-				? array('protectedinterface')
-				: array( 'namespaceprotected',  $ns ) );
-		}
-
-		if( $this->mDbkeyform == '_' ) {
-			# FIXME: Is this necessary? Shouldn't be allowed anyway...
-			$errors[] = array('badaccess-group0');
+		if( $this->isNamespaceProtected() ) {
+			$ns = $this->getNamespace() == NS_MAIN ?
+				wfMsg( 'nstab-main' ) : $this->getNsText();
+			$errors[] = NS_MEDIAWIKI == $this->mNamespace ?
+				array('protectedinterface') : array( 'namespaceprotected',  $ns );
 		}
 
 		# protect css/js subpages of user pages
 		# XXX: this might be better using restrictions
 		# XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working
-		if( $this->isCssJsSubpage()
-			&& !$user->isAllowed('editusercssjs')
-			&& !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) {
+		if( $this->isCssJsSubpage() && !$user->isAllowed('editusercssjs')
+			&& !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
+		{
 			$errors[] = array('customcssjsprotected');
 		}
 
-		if ( $doExpensiveQueries && !$this->isCssJsSubpage() ) {
+		if( $doExpensiveQueries && !$this->isCssJsSubpage() ) {
 			# We /could/ use the protection level on the source page, but it's fairly ugly
 			#  as we have to establish a precedence hierarchy for pages included by multiple
 			#  cascade-protected pages. So just restrict it to people with 'protect' permission,
@@ -1237,18 +1175,18 @@ class Title {
 
 		foreach( $this->getRestrictions($action) as $right ) {
 			// Backwards compatibility, rewrite sysop -> protect
-			if ( $right == 'sysop' ) {
+			if( $right == 'sysop' ) {
 				$right = 'protect';
 			}
 			if( '' != $right && !$user->isAllowed( $right ) ) {
-				//Users with 'editprotected' permission can edit protected pages
+				// Users with 'editprotected' permission can edit protected pages
 				if( $action=='edit' && $user->isAllowed( 'editprotected' ) ) {
-					//Users with 'editprotected' permission cannot edit protected pages
-					//with cascading option turned on.
-					if($this->mCascadeRestriction) {
+					// Users with 'editprotected' permission cannot edit protected pages
+					// with cascading option turned on.
+					if( $this->mCascadeRestriction ) {
 						$errors[] = array( 'protectedpagetext', $right );
 					} else {
-						//Nothing, user can edit!
+						// Nothing, user can edit!
 					}
 				} else {
 					$errors[] = array( 'protectedpagetext', $right );
@@ -1256,57 +1194,76 @@ class Title {
 			}
 		}
 
-		if ($action == 'protect') {
-			if ($this->getUserPermissionsErrors('edit', $user) != array()) {
+		if( $action == 'protect' ) {
+			if( $this->getUserPermissionsErrors('edit', $user) != array() ) {
 				$errors[] = array( 'protect-cantedit' ); // If they can't edit, they shouldn't protect.
 			}
 		}
 
-		if ($action == 'create') {
+		if( $action == 'create' ) {
 			$title_protection = $this->getTitleProtection();
+			if( is_array($title_protection) ) {
+				extract($title_protection); // is this extract() really needed?
 
-			if (is_array($title_protection)) {
-				extract($title_protection);
-
-				if ($pt_create_perm == 'sysop')
-					$pt_create_perm = 'protect';
-
-				if ($pt_create_perm == '' || !$user->isAllowed($pt_create_perm)) {
-					$errors[] = array ( 'titleprotected', User::whoIs($pt_user), $pt_reason );
+				if( $pt_create_perm == 'sysop' ) {
+					$pt_create_perm = 'protect'; // B/C
+				}
+				if( $pt_create_perm == '' || !$user->isAllowed($pt_create_perm) ) {
+					$errors[] = array( 'titleprotected', User::whoIs($pt_user), $pt_reason );
 				}
 			}
 
-			if( (  $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
-				( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) {
+			if( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
+				( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) 
+			{
 				$errors[] = $user->isAnon() ? array ('nocreatetext') : array ('nocreate-loggedin');
 			}
-		} elseif( $action == 'move' && !( $this->isMovable() && $user->isAllowed( 'move' ) ) ) {
-			$errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
-		} elseif ( !$user->isAllowed( $action ) ) {
-			$return = null;
-			$groups = array();
-			global $wgGroupPermissions;
-			foreach( $wgGroupPermissions as $key => $value ) {
-				if( isset( $value[$action] ) && $value[$action] == true ) {
-					$groupName = User::getGroupName( $key );
-					$groupPage = User::getGroupPage( $key );
-					if( $groupPage ) {
-						$groups[] = '[['.$groupPage->getPrefixedText().'|'.$groupName.']]';
-					} else {
-						$groups[] = $groupName;
-					}
-				}
+		} elseif( $action == 'move' ) {
+			if( !$user->isAllowed( 'move' ) ) {
+				// User can't move anything
+				$errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
+			} elseif( !$user->isAllowed( 'move-rootuserpages' ) 
+					&& $this->getNamespace() == NS_USER && !$this->isSubpage() ) 
+			{
+				// Show user page-specific message only if the user can move other pages
+				$errors[] = array( 'cant-move-user-page' );
+			}
+			// Check if user is allowed to move files if it's a file
+			if( $this->getNamespace() == NS_FILE && !$user->isAllowed( 'movefile' ) ) {
+				$errors[] = array( 'movenotallowedfile' );
+			}
+			// Check for immobile pages
+			if( !MWNamespace::isMovable( $this->getNamespace() ) ) {
+				// Specific message for this case
+				$errors[] = array( 'immobile-source-namespace', $this->getNsText() );
+			} elseif( !$this->isMovable() ) {
+				// Less specific message for rarer cases
+				$errors[] = array( 'immobile-page' );
 			}
-			$n = count( $groups );
-			$groups = implode( ', ', $groups );
-			switch( $n ) {
-				case 0:
-				case 1:
-				case 2:
-					$return = array( "badaccess-group$n", $groups );
-					break;
-				default:
-					$return = array( 'badaccess-groups', $groups );
+		} elseif( $action == 'move-target' ) {
+			if( !$user->isAllowed( 'move' ) ) {
+				// User can't move anything
+				$errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
+			} elseif( !$user->isAllowed( 'move-rootuserpages' ) 
+				&& $this->getNamespace() == NS_USER && !$this->isSubpage() ) 
+			{
+				// Show user page-specific message only if the user can move other pages
+				$errors[] = array( 'cant-move-to-user-page' );
+			}
+			if( !MWNamespace::isMovable( $this->getNamespace() ) ) {
+				$errors[] = array( 'immobile-target-namespace', $this->getNsText() );
+			} elseif( !$this->isMovable() ) {
+				$errors[] = array( 'immobile-target-page' );
+			}
+		} elseif( !$user->isAllowed( $action ) ) {
+			$return = null;
+			$groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
+				User::getGroupsWithPermission( $action ) );
+			if( $groups ) {
+				$return = array( 'badaccess-groups',
+					array( implode( ', ', $groups ), count( $groups ) ) );
+			} else {
+				$return = array( "badaccess-group0" );
 			}
 			$errors[] = $return;
 		}
@@ -1317,7 +1274,7 @@ class Title {
 
 	/**
 	 * Is this title subject to title protection?
-	 * @return mixed An associative array representing any existent title
+	 * @return \type{\mixed} An associative array representing any existent title
 	 *   protection, or false if there's none.
 	 */
 	private function getTitleProtection() {
@@ -1328,7 +1285,8 @@ class Title {
 
 		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( 'protected_titles', '*',
-			array ('pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey()) );
+			array( 'pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey() ),
+			__METHOD__ );
 
 		if ($row = $dbr->fetchRow( $res )) {
 			return $row;
@@ -1337,11 +1295,17 @@ class Title {
 		}
 	}
 
+	/**
+	 * Update the title protection status
+	 * @param $create_perm \type{\string} Permission required for creation
+	 * @param $reason \type{\string} Reason for protection
+	 * @param $expiry \type{\string} Expiry timestamp
+	 */
 	public function updateTitleProtection( $create_perm, $reason, $expiry ) {
-		global $wgGroupPermissions,$wgUser,$wgContLang;
+		global $wgUser,$wgContLang;
 
 		if ($create_perm == implode(',',$this->getRestrictions('create'))
-			&& $expiry == $this->mRestrictionsExpiry) {
+			&& $expiry == $this->mRestrictionsExpiry['create']) {
 			// No change
 			return true;
 		}
@@ -1354,9 +1318,12 @@ class Title {
 
 		$expiry_description = '';
 		if ( $encodedExpiry != 'infinity' ) {
-			$expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) ).')';
+			$expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) , $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
 		}
-
+		else {
+			$expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ).')';
+		}
+	
 		# Update protection table
 		if ($create_perm != '' ) {
 			$dbw->replace( 'protected_titles', array(array('pt_namespace', 'pt_title')),
@@ -1373,7 +1340,8 @@ class Title {
 		$log = new LogPage( 'protect' );
 
 		if( $create_perm ) {
-			$log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason . " [create=$create_perm] $expiry_description" ) );
+			$params = array("[create=$create_perm] $expiry_description",'');
+			$log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason ), $params );
 		} else {
 			$log->addEntry( 'unprotect', $this, $reason );
 		}
@@ -1382,18 +1350,19 @@ class Title {
 	}
 
 	/**
-	 * Remove any title protection (due to page existing
+	 * Remove any title protection due to page existing
 	 */
 	public function deleteTitleProtection() {
 		$dbw = wfGetDB( DB_MASTER );
 
 		$dbw->delete( 'protected_titles',
-			array ('pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey()), __METHOD__ );
+			array( 'pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey() ), 
+			__METHOD__ );
 	}
 
 	/**
 	 * Can $wgUser edit this page?
-	 * @return boolean
+	 * @return \type{\bool} TRUE or FALSE
 	 * @deprecated use userCan('edit')
 	 */
 	public function userCanEdit( $doExpensiveQueries = true ) {
@@ -1402,7 +1371,7 @@ class Title {
 
 	/**
 	 * Can $wgUser create this page?
-	 * @return boolean
+	 * @return \type{\bool} TRUE or FALSE
 	 * @deprecated use userCan('create')
 	 */
 	public function userCanCreate( $doExpensiveQueries = true ) {
@@ -1411,7 +1380,7 @@ class Title {
 
 	/**
 	 * Can $wgUser move this page?
-	 * @return boolean
+	 * @return \type{\bool} TRUE or FALSE
 	 * @deprecated use userCan('move')
 	 */
 	public function userCanMove( $doExpensiveQueries = true ) {
@@ -1422,16 +1391,15 @@ class Title {
 	 * Would anybody with sufficient privileges be able to move this page?
 	 * Some pages just aren't movable.
 	 *
-	 * @return boolean
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isMovable() {
-		return MWNamespace::isMovable( $this->getNamespace() )
-			&& $this->getInterwiki() == '';
+		return MWNamespace::isMovable( $this->getNamespace() ) && $this->getInterwiki() == '';
 	}
 
 	/**
 	 * Can $wgUser read this page?
-	 * @return boolean
+	 * @return \type{\bool} TRUE or FALSE
 	 * @todo fold these checks into userCan()
 	 */
 	public function userCanRead() {
@@ -1508,7 +1476,7 @@ class Title {
 
 	/**
 	 * Is this a talk page of some sort?
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isTalkPage() {
 		return MWNamespace::isTalk( $this->getNamespace() );
@@ -1516,7 +1484,7 @@ class Title {
 
 	/**
 	 * Is this a subpage?
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isSubpage() {
 		return MWNamespace::hasSubpages( $this->mNamespace )
@@ -1526,7 +1494,7 @@ class Title {
 
 	/**
 	 * Does this have subpages?  (Warning, usually requires an extra DB query.)
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function hasSubpages() {
 		if( !MWNamespace::hasSubpages( $this->mNamespace ) ) {
@@ -1554,7 +1522,7 @@ class Title {
 	 * Could this page contain custom CSS or JavaScript, based
 	 * on the title?
 	 *
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isCssOrJsPage() {
 		return $this->mNamespace == NS_MEDIAWIKI
@@ -1563,7 +1531,7 @@ class Title {
 
 	/**
 	 * Is this a .css or .js subpage of a user page?
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isCssJsSubpage() {
 		return ( NS_USER == $this->mNamespace and preg_match("/\\/.*\\.(?:css|js)$/", $this->mTextform ) );
@@ -1571,6 +1539,7 @@ class Title {
 	/**
 	 * Is this a *valid* .css or .js subpage of a user page?
 	 * Check that the corresponding skin exists
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isValidCssJsSubpage() {
 		if ( $this->isCssJsSubpage() ) {
@@ -1590,14 +1559,14 @@ class Title {
 	}
 	/**
 	 * Is this a .css subpage of a user page?
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isCssSubpage() {
 		return ( NS_USER == $this->mNamespace && preg_match("/\\/.*\\.css$/", $this->mTextform ) );
 	}
 	/**
 	 * Is this a .js subpage of a user page?
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isJsSubpage() {
 		return ( NS_USER == $this->mNamespace && preg_match("/\\/.*\\.js$/", $this->mTextform ) );
@@ -1606,7 +1575,7 @@ class Title {
 	 * Protect css/js subpages of user pages: can $wgUser edit
 	 * this page?
 	 *
-	 * @return boolean
+	 * @return \type{\bool} TRUE or FALSE
 	 * @todo XXX: this might be better using restrictions
 	 */
 	public function userCanEditCssJsSubpage() {
@@ -1617,7 +1586,7 @@ class Title {
 	/**
 	 * Cascading protection: Return true if cascading restrictions apply to this page, false if not.
 	 *
-	 * @return bool If the page is subject to cascading restrictions.
+	 * @return \type{\bool} If the page is subject to cascading restrictions.
 	 */
 	public function isCascadeProtected() {
 		list( $sources, /* $restrictions */ ) = $this->getCascadeProtectionSources( false );
@@ -1627,10 +1596,10 @@ class Title {
 	/**
 	 * Cascading protection: Get the source of any cascading restrictions on this page.
 	 *
-	 * @param $get_pages bool Whether or not to retrieve the actual pages that the restrictions have come from.
-	 * @return array( mixed title array, restriction array)
-	 * Array of the Title objects of the pages from which cascading restrictions have come, false for none, or true if such restrictions exist, but $get_pages was not set.
-	 * The restriction array is an array of each type, each of which contains an array of unique groups
+	 * @param $get_pages \type{\bool} Whether or not to retrieve the actual pages that the restrictions have come from.
+	 * @return \type{\arrayof{mixed title array, restriction array}} Array of the Title objects of the pages from 
+	 *         which cascading restrictions have come, false for none, or true if such restrictions exist, but $get_pages was not set.
+	 *         The restriction array is an array of each type, each of which contains an array of unique groups.
 	 */
 	public function getCascadeProtectionSources( $get_pages = true ) {
 		global $wgRestrictionTypes;
@@ -1648,9 +1617,9 @@ class Title {
 
 		wfProfileIn( __METHOD__ );
 
-		$dbr = wfGetDb( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 
-		if ( $this->getNamespace() == NS_IMAGE ) {
+		if ( $this->getNamespace() == NS_FILE ) {
 			$tables = array ('imagelinks', 'page_restrictions');
 			$where_clauses = array(
 				'il_to' => $this->getDBkey(),
@@ -1679,7 +1648,7 @@ class Title {
 		$now = wfTimestampNow();
 		$purgeExpired = false;
 
-		while( $row = $dbr->fetchObject( $res ) ) {
+		foreach( $res as $row ) {
 			$expiry = Block::decodeExpiry( $row->pr_expiry );
 			if( $expiry > $now ) {
 				if ($get_pages) {
@@ -1712,7 +1681,6 @@ class Title {
 		} else {
 			$this->mHasCascadingRestrictions = $sources;
 		}
-
 		return array( $sources, $pagerestrictions );
 	}
 
@@ -1726,7 +1694,7 @@ class Title {
 
 	/**
 	 * Loads a string into mRestrictions array
-	 * @param resource $res restrictions as an SQL result.
+	 * @param $res \type{Resource} restrictions as an SQL result.
 	 */
 	private function loadRestrictionsFromRow( $res, $oldFashionedRestrictions = NULL ) {
 		global $wgRestrictionTypes;
@@ -1734,10 +1702,10 @@ class Title {
 
 		foreach( $wgRestrictionTypes as $type ){
 			$this->mRestrictions[$type] = array();
+			$this->mRestrictionsExpiry[$type] = Block::decodeExpiry('');
 		}
 
 		$this->mCascadeRestriction = false;
-		$this->mRestrictionsExpiry = Block::decodeExpiry('');
 
 		# Backwards-compatibility: also load the restrictions from the page record (old format).
 
@@ -1768,7 +1736,7 @@ class Title {
 			$now = wfTimestampNow();
 			$purgeExpired = false;
 
-			while ($row = $dbr->fetchObject( $res ) ) {
+			foreach( $res as $row ) {
 				# Cycle through all the restrictions.
 
 				// Don't take care of restrictions types that aren't in $wgRestrictionTypes
@@ -1781,7 +1749,7 @@ class Title {
 
 				// Only apply the restrictions if they haven't expired!
 				if ( !$expiry || $expiry > $now ) {
-					$this->mRestrictionsExpiry = $expiry;
+					$this->mRestrictionsExpiry[$row->pr_type] = $expiry;
 					$this->mRestrictions[$row->pr_type] = explode( ',', trim( $row->pr_level ) );
 
 					$this->mCascadeRestriction |= $row->pr_cascade;
@@ -1799,6 +1767,9 @@ class Title {
 		$this->mRestrictionsLoaded = true;
 	}
 
+	/**
+	 * Load restrictions from the page_restrictions table
+	 */
 	public function loadRestrictions( $oldFashionedRestrictions = NULL ) {
 		if( !$this->mRestrictionsLoaded ) {
 			if ($this->exists()) {
@@ -1819,13 +1790,13 @@ class Title {
 
 					if (!$expiry || $expiry > $now) {
 						// Apply the restrictions
-						$this->mRestrictionsExpiry = $expiry;
+						$this->mRestrictionsExpiry['create'] = $expiry;
 						$this->mRestrictions['create'] = explode(',', trim($pt_create_perm) );
 					} else { // Get rid of the old restrictions
 						Title::purgeExpiredRestrictions();
 					}
 				} else {
-					$this->mRestrictionsExpiry = Block::decodeExpiry('');
+					$this->mRestrictionsExpiry['create'] = Block::decodeExpiry('');
 				}
 				$this->mRestrictionsLoaded = true;
 			}
@@ -1849,8 +1820,8 @@ class Title {
 	/**
 	 * Accessor/initialisation for mRestrictions
 	 *
-	 * @param string $action action that permission needs to be checked for
-	 * @return array the array of groups allowed to edit this article
+	 * @param $action \type{\string} action that permission needs to be checked for
+	 * @return \type{\arrayof{\string}} the array of groups allowed to edit this article
 	 */
 	public function getRestrictions( $action ) {
 		if( !$this->mRestrictionsLoaded ) {
@@ -1862,8 +1833,20 @@ class Title {
 	}
 
 	/**
+	 * Get the expiry time for the restriction against a given action
+	 * @return 14-char timestamp, or 'infinity' if the page is protected forever 
+	 * or not protected at all, or false if the action is not recognised.
+	 */
+	public function getRestrictionExpiry( $action ) {
+		if( !$this->mRestrictionsLoaded ) {
+			$this->loadRestrictions();
+		}
+		return isset( $this->mRestrictionsExpiry[$action] ) ? $this->mRestrictionsExpiry[$action] : false;
+	}
+
+	/**
 	 * Is there a version of this page in the deletion archive?
-	 * @return int the number of archived revisions
+	 * @return \type{\int} the number of archived revisions
 	 */
 	public function isDeleted() {
 		$fname = 'Title::isDeleted';
@@ -1873,7 +1856,7 @@ class Title {
 			$dbr = wfGetDB( DB_SLAVE );
 			$n = $dbr->selectField( 'archive', 'COUNT(*)', array( 'ar_namespace' => $this->getNamespace(),
 				'ar_title' => $this->getDBkey() ), $fname );
-			if( $this->getNamespace() == NS_IMAGE ) {
+			if( $this->getNamespace() == NS_FILE ) {
 				$n += $dbr->selectField( 'filearchive', 'COUNT(*)',
 					array( 'fa_name' => $this->getDBkey() ), $fname );
 			}
@@ -1884,18 +1867,22 @@ class Title {
 	/**
 	 * Get the article ID for this Title from the link cache,
 	 * adding it if necessary
-	 * @param int $flags a bit field; may be GAID_FOR_UPDATE to select
+	 * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select
 	 * 	for update
-	 * @return int the ID
+	 * @return \type{\int} the ID
 	 */
 	public function getArticleID( $flags = 0 ) {
+		if( $this->getNamespace() < 0 ) {
+			return $this->mArticleID = 0;
+		}
 		$linkCache = LinkCache::singleton();
-		if ( $flags & GAID_FOR_UPDATE ) {
+		if( $flags & GAID_FOR_UPDATE ) {
 			$oldUpdate = $linkCache->forUpdate( true );
+			$linkCache->clearLink( $this );
 			$this->mArticleID = $linkCache->addLinkObj( $this );
 			$linkCache->forUpdate( $oldUpdate );
 		} else {
-			if ( -1 == $this->mArticleID ) {
+			if( -1 == $this->mArticleID ) {
 				$this->mArticleID = $linkCache->addLinkObj( $this );
 			}
 		}
@@ -1905,16 +1892,15 @@ class Title {
 	/**
 	 * Is this an article that is a redirect page?
 	 * Uses link cache, adding it if necessary
-	 * @param int $flags a bit field; may be GAID_FOR_UPDATE to select for update
-	 * @return bool
+	 * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select for update
+	 * @return \type{\bool}
 	 */
 	public function isRedirect( $flags = 0 ) {
 		if( !is_null($this->mRedirect) )
 			return $this->mRedirect;
-		# Zero for special pages.
-		# Also, calling getArticleID() loads the field from cache!
-		if( !$this->getArticleID($flags) || $this->getNamespace() == NS_SPECIAL ) {
-			return false;
+		# Calling getArticleID() loads the field from cache as needed
+		if( !$this->getArticleID($flags) ) {
+			return $this->mRedirect = false;
 		}
 		$linkCache = LinkCache::singleton();
 		$this->mRedirect = (bool)$linkCache->getGoodLinkFieldObj( $this, 'redirect' );
@@ -1925,16 +1911,15 @@ class Title {
 	/**
 	 * What is the length of this page?
 	 * Uses link cache, adding it if necessary
-	 * @param int $flags a bit field; may be GAID_FOR_UPDATE to select for update
-	 * @return bool
+	 * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select for update
+	 * @return \type{\bool}
 	 */
 	public function getLength( $flags = 0 ) {
 		if( $this->mLength != -1 )
 			return $this->mLength;
-		# Zero for special pages.
-		# Also, calling getArticleID() loads the field from cache!
-		if( !$this->getArticleID($flags) || $this->getNamespace() == NS_SPECIAL ) {
-			return 0;
+		# Calling getArticleID() loads the field from cache as needed
+		if( !$this->getArticleID($flags) ) {
+			return $this->mLength = 0;
 		}
 		$linkCache = LinkCache::singleton();
 		$this->mLength = intval( $linkCache->getGoodLinkFieldObj( $this, 'length' ) );
@@ -1944,18 +1929,16 @@ class Title {
 
 	/**
 	 * What is the page_latest field for this page?
-	 * @param int $flags a bit field; may be GAID_FOR_UPDATE to select for update
-	 * @return int
+	 * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select for update
+	 * @return \type{\int}
 	 */
 	public function getLatestRevID( $flags = 0 ) {
-		if ($this->mLatestID !== false)
+		if( $this->mLatestID !== false )
 			return $this->mLatestID;
 
 		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB(DB_MASTER) : wfGetDB(DB_SLAVE);
-		return $this->mLatestID = $db->selectField( 'revision',
-			"max(rev_id)",
-			array('rev_page' => $this->getArticleID($flags)),
-			'Title::getLatestRevID' );
+		$this->mLatestID = $db->selectField( 'page', 'page_latest', $this->pageCond(), __METHOD__ );
+		return $this->mLatestID;
 	}
 
 	/**
@@ -1966,7 +1949,7 @@ class Title {
 	 * loading of the new page_id. It's also called from
 	 * Article::doDeleteArticle()
 	 *
-	 * @param int $newid the new Article ID
+	 * @param $newid \type{\int} the new Article ID
 	 */
 	public function resetArticleID( $newid ) {
 		$linkCache = LinkCache::singleton();
@@ -1980,30 +1963,19 @@ class Title {
 
 	/**
 	 * Updates page_touched for this page; called from LinksUpdate.php
-	 * @return bool true if the update succeded
+	 * @return \type{\bool} true if the update succeded
 	 */
 	public function invalidateCache() {
-		global $wgUseFileCache;
-
-		if ( wfReadOnly() ) {
+		if( wfReadOnly() ) {
 			return;
 		}
-
 		$dbw = wfGetDB( DB_MASTER );
 		$success = $dbw->update( 'page',
-			array( /* SET */
-				'page_touched' => $dbw->timestamp()
-			), array( /* WHERE */
-				'page_namespace' => $this->getNamespace() ,
-				'page_title' => $this->getDBkey()
-			), 'Title::invalidateCache'
+			array( 'page_touched' => $dbw->timestamp() ), 
+			$this->pageCond(), 
+			__METHOD__
 		);
-
-		if ($wgUseFileCache) {
-			$cache = new HTMLFileCache($this);
-			@unlink($cache->fileCacheName());
-		}
-
+		HTMLFileCache::clearFileCache( $this );
 		return $success;
 	}
 
@@ -2011,8 +1983,8 @@ class Title {
 	 * Prefix some arbitrary text with the namespace or interwiki prefix
 	 * of this object
 	 *
-	 * @param string $name the text
-	 * @return string the prefixed text
+	 * @param $name \type{\string} the text
+	 * @return \type{\string} the prefixed text
 	 * @private
 	 */
 	/* private */ function prefix( $name ) {
@@ -2034,7 +2006,7 @@ class Title {
 	 * removes illegal characters, splits off the interwiki and
 	 * namespace prefixes, sets the other forms, and canonicalizes
 	 * everything.
-	 * @return bool true on success
+	 * @return \type{\bool} true on success
 	 */
 	private function secureAndSplit() {
 		global $wgContLang, $wgLocalInterwiki, $wgCapitalLinks;
@@ -2064,8 +2036,7 @@ class Title {
 		# Strip Unicode bidi override characters.
 		# Sometimes they slip into cut-n-pasted page titles, where the
 		# override chars get included in list displays.
-		$dbkey = str_replace( "\xE2\x80\x8E", '', $dbkey ); // 200E LEFT-TO-RIGHT MARK
-		$dbkey = str_replace( "\xE2\x80\x8F", '', $dbkey ); // 200F RIGHT-TO-LEFT MARK
+		$dbkey = preg_replace( '/\xE2\x80[\x8E\x8F\xAA-\xAE]/S', '', $dbkey );
 
 		# Clean up whitespace
 		#
@@ -2101,7 +2072,7 @@ class Title {
 					# Ordinary namespace
 					$dbkey = $m[2];
 					$this->mNamespace = $ns;
-				} elseif( $this->getInterwikiLink( $p ) ) {
+				} elseif( Interwiki::isValidInterwiki( $p ) ) {
 					if( !$firstPass ) {
 						# Can't make a local interwiki link to an interwiki link.
 						# That's just crazy!
@@ -2158,9 +2129,9 @@ class Title {
 		}
 
 		/**
-		 * Pages with "/./" or "/../" appearing in the URLs will
-		 * often be unreachable due to the way web browsers deal
-		 * with 'relative' URLs. Forbid them explicitly.
+		 * Pages with "/./" or "/../" appearing in the URLs will often be un-
+		 * reachable due to the way web browsers deal with 'relative' URLs.
+		 * Also, they conflict with subpage syntax.  Forbid them explicitly.
 		 */
 		if ( strpos( $dbkey, '.' ) !== false &&
 		     ( $dbkey === '.' || $dbkey === '..' ||
@@ -2240,13 +2211,14 @@ class Title {
 	}
 
 	/**
-	 * Set the fragment for this title
-	 * This is kind of bad, since except for this rarely-used function, Title objects
-	 * are immutable. The reason this is here is because it's better than setting the
-	 * members directly, which is what Linker::formatComment was doing previously.
+	 * Set the fragment for this title. Removes the first character from the
+	 * specified fragment before setting, so it assumes you're passing it with 
+	 * an initial "#".
+	 *
+	 * Deprecated for public use, use Title::makeTitle() with fragment parameter.
+	 * Still in active use privately.
 	 *
-	 * @param string $fragment text
-	 * @todo clarify whether access is supposed to be public (was marked as "kind of public")
+	 * @param $fragment \type{\string} text
 	 */
 	public function setFragment( $fragment ) {
 		$this->mFragment = str_replace( '_', ' ', substr( $fragment, 1 ) );
@@ -2254,7 +2226,7 @@ class Title {
 
 	/**
 	 * Get a Title object associated with the talk page of this article
-	 * @return Title the object for the talk page
+	 * @return \type{Title} the object for the talk page
 	 */
 	public function getTalkPage() {
 		return Title::makeTitle( MWNamespace::getTalk( $this->getNamespace() ), $this->getDBkey() );
@@ -2264,10 +2236,15 @@ class Title {
 	 * Get a title object associated with the subject page of this
 	 * talk page
 	 *
-	 * @return Title the object for the subject page
+	 * @return \type{Title} the object for the subject page
 	 */
 	public function getSubjectPage() {
-		return Title::makeTitle( MWNamespace::getSubject( $this->getNamespace() ), $this->getDBkey() );
+		// Is this the same title?
+		$subjectNS = MWNamespace::getSubject( $this->getNamespace() );
+		if( $this->getNamespace() == $subjectNS ) {
+			return $this;
+		}
+		return Title::makeTitle( $subjectNS, $this->getDBkey() );
 	}
 
 	/**
@@ -2277,8 +2254,8 @@ class Title {
 	 * WARNING: do not use this function on arbitrary user-supplied titles!
 	 * On heavily-used templates it will max out the memory.
 	 *
-	 * @param string $options may be FOR UPDATE
-	 * @return array the Title objects linking here
+	 * @param $options \type{\string} may be FOR UPDATE
+	 * @return \type{\arrayof{Title}} the Title objects linking here
 	 */
 	public function getLinksTo( $options = '', $table = 'pagelinks', $prefix = 'pl' ) {
 		$linkCache = LinkCache::singleton();
@@ -2295,12 +2272,12 @@ class Title {
 				"{$prefix}_from=page_id",
 				"{$prefix}_namespace" => $this->getNamespace(),
 				"{$prefix}_title"     => $this->getDBkey() ),
-			'Title::getLinksTo',
+			__METHOD__,
 			$options );
 
 		$retVal = array();
 		if ( $db->numRows( $res ) ) {
-			while ( $row = $db->fetchObject( $res ) ) {
+			foreach( $res as $row ) {
 				if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
 					$linkCache->addGoodLinkObj( $row->page_id, $titleObj, $row->page_len, $row->page_is_redirect );
 					$retVal[] = $titleObj;
@@ -2318,8 +2295,8 @@ class Title {
 	 * WARNING: do not use this function on arbitrary user-supplied titles!
 	 * On heavily-used templates it will max out the memory.
 	 *
-	 * @param string $options may be FOR UPDATE
-	 * @return array the Title objects linking here
+	 * @param $options \type{\string} may be FOR UPDATE
+	 * @return \type{\arrayof{Title}} the Title objects linking here
 	 */
 	public function getTemplateLinksTo( $options = '' ) {
 		return $this->getLinksTo( $options, 'templatelinks', 'tl' );
@@ -2329,8 +2306,8 @@ class Title {
 	 * Get an array of Title objects referring to non-existent articles linked from this page
 	 *
 	 * @todo check if needed (used only in SpecialBrokenRedirects.php, and should use redirect table in this case)
-	 * @param string $options may be FOR UPDATE
-	 * @return array the Title objects
+	 * @param $options \type{\string} may be FOR UPDATE
+	 * @return \type{\arrayof{Title}} the Title objects
 	 */
 	public function getBrokenLinksFrom( $options = '' ) {
 		if ( $this->getArticleId() == 0 ) {
@@ -2360,7 +2337,7 @@ class Title {
 
 		$retVal = array();
 		if ( $db->numRows( $res ) ) {
-			while ( $row = $db->fetchObject( $res ) ) {
+			foreach( $res as $row ) {
 				$retVal[] = Title::makeTitle( $row->pl_namespace, $row->pl_title );
 			}
 		}
@@ -2373,7 +2350,7 @@ class Title {
 	 * Get a list of URLs to purge from the Squid cache when this
 	 * page changes
 	 *
-	 * @return array the URLs
+	 * @return \type{\arrayof{\string}} the URLs
 	 */
 	public function getSquidURLs() {
 		global $wgContLang;
@@ -2395,6 +2372,9 @@ class Title {
 		return $urls;
 	}
 
+	/**
+	 * Purge all applicable Squid URLs
+	 */
 	public function purgeSquid() {
 		global $wgUseSquid;
 		if ( $wgUseSquid ) {
@@ -2406,7 +2386,7 @@ class Title {
 
 	/**
 	 * Move this page without authentication
-	 * @param Title &$nt the new page Title
+	 * @param &$nt \type{Title} the new page Title
 	 */
 	public function moveNoAuth( &$nt ) {
 		return $this->moveTo( $nt, false );
@@ -2415,13 +2395,15 @@ class Title {
 	/**
 	 * Check whether a given move operation would be valid.
 	 * Returns true if ok, or a getUserPermissionsErrors()-like array otherwise
-	 * @param Title &$nt the new title
-	 * @param bool $auth indicates whether $wgUser's permissions
+	 * @param &$nt \type{Title} the new title
+	 * @param $auth \type{\bool} indicates whether $wgUser's permissions
 	 * 	should be checked
-	 * @param string $reason is the log summary of the move, used for spam checking
-	 * @return mixed True on success, getUserPermissionsErrors()-like array on failure
+	 * @param $reason \type{\string} is the log summary of the move, used for spam checking
+	 * @return \type{\mixed} True on success, getUserPermissionsErrors()-like array on failure
 	 */
 	public function isValidMoveOperation( &$nt, $auth = true, $reason = '' ) {
+		global $wgUser;
+
 		$errors = array();	
 		if( !$nt ) {
 			// Normally we'd add this to $errors, but we'll get
@@ -2431,8 +2413,14 @@ class Title {
 		if( $this->equals( $nt ) ) {
 			$errors[] = array('selfmove');
 		}
-		if( !$this->isMovable() || !$nt->isMovable() ) {
-			$errors[] = array('immobile_namespace');
+		if( !$this->isMovable() ) {
+			$errors[] = array( 'immobile-source-namespace', $this->getNsText() );
+		}
+		if ( $nt->getInterwiki() != '' ) {
+			$errors[] = array( 'immobile-target-namespace-iw' );
+		}
+		if ( !$nt->isMovable() ) {
+			$errors[] = array('immobile-target-namespace', $nt->getNsText() );
 		}
 
 		$oldid = $this->getArticleID();
@@ -2448,31 +2436,35 @@ class Title {
 		}
 
 		// Image-specific checks
-		if( $this->getNamespace() == NS_IMAGE ) {
+		if( $this->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
-				if( $nt->getNamespace() != NS_IMAGE ) {
+				if( $nt->getNamespace() != NS_FILE ) {
 					$errors[] = array('imagenocrossnamespace');
 				}
 				if( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) {
 					$errors[] = array('imageinvalidfilename');
 				}
-				if( !File::checkExtensionCompatibility( $file, $nt->getDbKey() ) ) {
+				if( !File::checkExtensionCompatibility( $file, $nt->getDBKey() ) ) {
 					$errors[] = array('imagetypemismatch');
 				}
 			}
 		}
 
 		if ( $auth ) {
-			global $wgUser;
-			$errors = array_merge($errors, 
-					$this->getUserPermissionsErrors('move', $wgUser),
-					$this->getUserPermissionsErrors('edit', $wgUser),
-					$nt->getUserPermissionsErrors('move', $wgUser),
-					$nt->getUserPermissionsErrors('edit', $wgUser));
+			$errors = wfMergeErrorArrays( $errors,
+				$this->getUserPermissionsErrors('move', $wgUser),
+				$this->getUserPermissionsErrors('edit', $wgUser),
+				$nt->getUserPermissionsErrors('move-target', $wgUser),
+				$nt->getUserPermissionsErrors('edit', $wgUser) );
 		}
 
-		global $wgUser;
+		$match = EditPage::matchSpamRegex( $reason );
+		if( $match !== false ) {
+			// This is kind of lame, won't display nice
+			$errors[] = array('spamprotectiontext');
+		}
+		
 		$err = null;
 		if( !wfRunHooks( 'AbortMove', array( $this, $nt, $wgUser, &$err, $reason ) ) ) {
 			$errors[] = array('hookaborted', $err);
@@ -2500,13 +2492,13 @@ class Title {
 
 	/**
 	 * Move a title to a new location
-	 * @param Title &$nt the new title
-	 * @param bool $auth indicates whether $wgUser's permissions
+	 * @param &$nt \type{Title} the new title
+	 * @param $auth \type{\bool} indicates whether $wgUser's permissions
 	 * 	should be checked
-	 * @param string $reason The reason for the move
-	 * @param bool $createRedirect Whether to create a redirect from the old title to the new title.
+	 * @param $reason \type{\string} The reason for the move
+	 * @param $createRedirect \type{\bool} Whether to create a redirect from the old title to the new title.
 	 *  Ignored if the user doesn't have the suppressredirect right.
-	 * @return mixed true on success, getUserPermissionsErrors()-like array on failure
+	 * @return \type{\mixed} true on success, getUserPermissionsErrors()-like array on failure
 	 */
 	public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) {
 		$err = $this->isValidMoveOperation( $nt, $auth, $reason );
@@ -2515,6 +2507,7 @@ class Title {
 		}
 
 		$pageid = $this->getArticleID();
+		$protected = $this->isProtected();
 		if( $nt->exists() ) {
 			$err = $this->moveOverExistingRedirect( $nt, $reason, $createRedirect );
 			$pageCountChange = ($createRedirect ? 0 : -1);
@@ -2549,8 +2542,29 @@ class Title {
 				'cl_sortkey' => $this->getPrefixedText() ),
 			__METHOD__ );
 
-		# Update watchlists
+		if( $protected ) {
+			# Protect the redirect title as the title used to be...
+			$dbw->insertSelect( 'page_restrictions', 'page_restrictions',
+				array( 
+					'pr_page'    => $redirid,
+					'pr_type'    => 'pr_type',
+					'pr_level'   => 'pr_level',
+					'pr_cascade' => 'pr_cascade',
+					'pr_user'    => 'pr_user',
+					'pr_expiry'  => 'pr_expiry'
+				),
+				array( 'pr_page' => $pageid ),
+				__METHOD__,
+				array( 'IGNORE' )
+			);
+			# Update the protection log
+			$log = new LogPage( 'protect' );
+			$comment = wfMsgForContent('prot_1movedto2',$this->getPrefixedText(), $nt->getPrefixedText() );
+			if( $reason ) $comment .= ': ' . $reason;
+			$log->addEntry( 'move_prot', $nt, $comment, array($this->getPrefixedText()) ); // FIXME: $params?
+		}
 
+		# Update watchlists
 		$oldnamespace = $this->getNamespace() & ~1;
 		$newnamespace = $nt->getNamespace() & ~1;
 		$oldtitle = $this->getDBkey();
@@ -2602,10 +2616,10 @@ class Title {
 	 * Move page to a title which is at present a redirect to the
 	 * source page
 	 *
-	 * @param Title &$nt the page to move to, which should currently
+	 * @param &$nt \type{Title} the page to move to, which should currently
 	 * 	be a redirect
-	 * @param string $reason The reason for the move
-	 * @param bool $createRedirect Whether to leave a redirect at the old title.
+	 * @param $reason \type{\string} The reason for the move
+	 * @param $createRedirect \type{\bool} Whether to leave a redirect at the old title.
 	 *  Ignored if the user doesn't have the suppressredirect right
 	 */
 	private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) {
@@ -2620,9 +2634,9 @@ class Title {
 		$now = wfTimestampNow();
 		$newid = $nt->getArticleID();
 		$oldid = $this->getArticleID();
+		$latest = $this->getLatestRevID();
 
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
 
 		# Delete the old redirect. We don't save it to history since
 		# by definition if we've got here it's rather uninteresting.
@@ -2648,7 +2662,7 @@ class Title {
 		$nullRevId = $nullRevision->insertOn( $dbw );
 		
 		$article = new Article( $this );
-		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 
 		# Change the name of the target page:
 		$dbw->update( 'page',
@@ -2676,7 +2690,7 @@ class Title {
 			$redirectRevision->insertOn( $dbw );
 			$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
 			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false, $wgUser) );
 
 			# Now, we record the link from the redirect to the new title.
 			# It should have no other outgoing links...
@@ -2687,12 +2701,14 @@ class Title {
 					'pl_namespace' => $nt->getNamespace(),
 					'pl_title'     => $nt->getDBkey() ),
 				$fname );
+			$redirectSuppressed = false;
 		} else {
 			$this->resetArticleID( 0 );
+			$redirectSuppressed = true;
 		}
-		
+
 		# Move an image if this is a file
-		if( $this->getNamespace() == NS_IMAGE ) {
+		if( $this->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
 				$status = $file->move( $nt );
@@ -2702,11 +2718,10 @@ class Title {
 				}
 			}
 		}
-		$dbw->commit();
 
 		# Log the move
 		$log = new LogPage( 'move' );
-		$log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText() ) );
+		$log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
 
 		# Purge squid
 		if ( $wgUseSquid ) {
@@ -2719,9 +2734,9 @@ class Title {
 
 	/**
 	 * Move page to non-existing title.
-	 * @param Title &$nt the new Title
-	 * @param string $reason The reason for the move
-	 * @param bool $createRedirect Whether to create a redirect from the old title to the new title
+	 * @param &$nt \type{Title} the new Title
+	 * @param $reason \type{\string} The reason for the move
+	 * @param $createRedirect \type{\bool} Whether to create a redirect from the old title to the new title
 	 *  Ignored if the user doesn't have the suppressredirect right
 	 */
 	private function moveToNewTitle( &$nt, $reason = '', $createRedirect = true ) {
@@ -2729,14 +2744,16 @@ class Title {
 		$fname = 'MovePageForm::moveToNewTitle';
 		$comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
 		if ( $reason ) {
-			$comment .= ": $reason";
+			$comment .= wfMsgExt( 'colon-separator',
+				array( 'escapenoentities', 'content' ) );
+			$comment .= $reason;
 		}
 
 		$newid = $nt->getArticleID();
 		$oldid = $this->getArticleID();
+		$latest = $this->getLatestRevId();
 		
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
 		$now = $dbw->timestamp();
 
 		# Save a null revision in the page's history notifying of the move
@@ -2744,7 +2761,7 @@ class Title {
 		$nullRevId = $nullRevision->insertOn( $dbw );
 		
 		$article = new Article( $this );
-		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 
 		# Rename page entry
 		$dbw->update( 'page',
@@ -2772,7 +2789,7 @@ class Title {
 			$redirectRevision->insertOn( $dbw );
 			$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
 			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false, $wgUser) );
 
 			# Record the just-created redirect's linking to the page
 			$dbw->insert( 'pagelinks',
@@ -2781,12 +2798,14 @@ class Title {
 					'pl_namespace' => $nt->getNamespace(),
 					'pl_title'     => $nt->getDBkey() ),
 				$fname );
+			$redirectSuppressed = false;
 		} else {
 			$this->resetArticleID( 0 );
+			$redirectSuppressed = true;
 		}
-		
+
 		# Move an image if this is a file
-		if( $this->getNamespace() == NS_IMAGE ) {
+		if( $this->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
 				$status = $file->move( $nt );
@@ -2796,11 +2815,10 @@ class Title {
 				}
 			}
 		}
-		$dbw->commit();
 
 		# Log the move
 		$log = new LogPage( 'move' );
-		$log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText()) );
+		$log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
 
 		# Purge caches as per article creation
 		Article::onArticleCreate( $nt );
@@ -2810,41 +2828,69 @@ class Title {
 		$this->purgeSquid();
 		
 	}
+	
+	/**
+	 * Checks if this page is just a one-rev redirect.
+	 * Adds lock, so don't use just for light purposes.
+	 *
+	 * @return \type{\bool} TRUE or FALSE
+	 */
+	public function isSingleRevRedirect() {
+		$dbw = wfGetDB( DB_MASTER );
+		# Is it a redirect?
+		$row = $dbw->selectRow( 'page',
+			array( 'page_is_redirect', 'page_latest', 'page_id' ),
+			$this->pageCond(),
+			__METHOD__,
+			'FOR UPDATE'
+		);
+		# Cache some fields we may want
+		$this->mArticleID = $row ? intval($row->page_id) : 0;
+		$this->mRedirect = $row ? (bool)$row->page_is_redirect : false;
+		$this->mLatestID = $row ? intval($row->page_latest) : false;
+		if( !$this->mRedirect ) {
+			return false;
+		}
+		# Does the article have a history?
+		$row = $dbw->selectField( array( 'page', 'revision'),
+			'rev_id',
+			array( 'page_namespace' => $this->getNamespace(),
+				'page_title' => $this->getDBkey(),
+				'page_id=rev_page',
+				'page_latest != rev_id'
+			), 
+			__METHOD__,
+			'FOR UPDATE'
+		);
+		# Return true if there was no history
+		return ($row === false);
+	}
 
 	/**
 	 * Checks if $this can be moved to a given Title
 	 * - Selects for update, so don't call it unless you mean business
 	 *
-	 * @param Title &$nt the new title to check
+	 * @param &$nt \type{Title} the new title to check
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isValidMoveTarget( $nt ) {
-
-		$fname = 'Title::isValidMoveTarget';
 		$dbw = wfGetDB( DB_MASTER );
-
 		# Is it an existsing file?
-		if( $nt->getNamespace() == NS_IMAGE ) {
+		if( $nt->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $nt );
 			if( $file->exists() ) {
 				wfDebug( __METHOD__ . ": file exists\n" );
 				return false;
 			}
 		}
-
-		# Is it a redirect?
-		$id  = $nt->getArticleID();
-		$obj = $dbw->selectRow( array( 'page', 'revision', 'text'),
-			array( 'page_is_redirect','old_text','old_flags' ),
-			array( 'page_id' => $id, 'page_latest=rev_id', 'rev_text_id=old_id' ),
-			$fname, 'FOR UPDATE' );
-
-		if ( !$obj || 0 == $obj->page_is_redirect ) {
-			# Not a redirect
-			wfDebug( __METHOD__ . ": not a redirect\n" );
+		# Is it a redirect with no history?
+		if( !$nt->isSingleRevRedirect() ) {
+			wfDebug( __METHOD__ . ": not a one-rev redirect\n" );
 			return false;
 		}
-		$text = Revision::getRevisionText( $obj );
-
+		# Get the article text
+		$rev = Revision::newFromTitle( $nt );
+		$text = $rev->getText();
 		# Does the redirect point to the source?
 		# Or is it a broken self-redirect, usually caused by namespace collisions?
 		$m = array();
@@ -2861,35 +2907,23 @@ class Title {
 			wfDebug( __METHOD__ . ": failsafe\n" );
 			return false;
 		}
-
-		# Does the article have a history?
-		$row = $dbw->selectRow( array( 'page', 'revision'),
-			array( 'rev_id' ),
-			array( 'page_namespace' => $nt->getNamespace(),
-				'page_title' => $nt->getDBkey(),
-				'page_id=rev_page AND page_latest != rev_id'
-			), $fname, 'FOR UPDATE'
-		);
-
-		# Return true if there was no history
-		return $row === false;
+		return true;
 	}
 
 	/**
 	 * Can this title be added to a user's watchlist?
 	 *
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isWatchable() {
-		return !$this->isExternal()
-			&& MWNamespace::isWatchable( $this->getNamespace() );
+		return !$this->isExternal() && MWNamespace::isWatchable( $this->getNamespace() );
 	}
 
 	/**
 	 * Get categories to which this Title belongs and return an array of
 	 * categories' names.
 	 *
-	 * @return array an array of parents in the form:
+	 * @return \type{\array} array an array of parents in the form:
 	 *	$parent => $currentarticle
 	 */
 	public function getParentCategories() {
@@ -2908,9 +2942,9 @@ class Title {
 		$res = $dbr->query( $sql );
 
 		if( $dbr->numRows( $res ) > 0 ) {
-			while( $x = $dbr->fetchObject( $res ) )
-				//$data[] = Title::newFromText($wgContLang->getNSText ( NS_CATEGORY ).':'.$x->cl_to);
-				$data[$wgContLang->getNSText( NS_CATEGORY ).':'.$x->cl_to] = $this->getFullText();
+			foreach( $res as $row )
+				//$data[] = Title::newFromText($wgContLang->getNSText ( NS_CATEGORY ).':'.$row->cl_to);
+				$data[$wgContLang->getNSText( NS_CATEGORY ).':'.$row->cl_to] = $this->getFullText();
 			$dbr->freeResult( $res );
 		} else {
 			$data = array();
@@ -2920,8 +2954,8 @@ class Title {
 
 	/**
 	 * Get a tree of parent categories
-	 * @param array $children an array with the children in the keys, to check for circular refs
-	 * @return array
+	 * @param $children \type{\array} an array with the children in the keys, to check for circular refs
+	 * @return \type{\array} Tree of parent categories
 	 */
 	public function getParentCategoryTree( $children = array() ) {
 	  	$stack = array();
@@ -2950,25 +2984,30 @@ class Title {
 	 * Get an associative array for selecting this title from
 	 * the "page" table
 	 *
-	 * @return array
+	 * @return \type{\array} Selection array
 	 */
 	public function pageCond() {
-		return array( 'page_namespace' => $this->mNamespace, 'page_title' => $this->mDbkeyform );
+		if( $this->mArticleID > 0 ) {
+			// PK avoids secondary lookups in InnoDB, shouldn't hurt other DBs
+			return array( 'page_id' => $this->mArticleID );
+		} else {
+			return array( 'page_namespace' => $this->mNamespace, 'page_title' => $this->mDbkeyform );
+		}
 	}
 
 	/**
 	 * Get the revision ID of the previous revision
 	 *
-	 * @param integer $revision  Revision ID. Get the revision that was before this one.
-	 * @param integer $flags, GAID_FOR_UPDATE
-	 * @return integer $oldrevision|false
+	 * @param $revId \type{\int} Revision ID. Get the revision that was before this one.
+	 * @param $flags \type{\int} GAID_FOR_UPDATE
+	 * @return \twotypes{\int,\bool} Old revision ID, or FALSE if none exists
 	 */
-	public function getPreviousRevisionID( $revision, $flags=0 ) {
+	public function getPreviousRevisionID( $revId, $flags=0 ) {
 		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
 		return $db->selectField( 'revision', 'rev_id',
 			array(
 				'rev_page' => $this->getArticleId($flags),
-				'rev_id < ' . intval( $revision )
+				'rev_id < ' . intval( $revId )
 			),
 			__METHOD__,
 			array( 'ORDER BY' => 'rev_id DESC' )
@@ -2978,29 +3017,56 @@ class Title {
 	/**
 	 * Get the revision ID of the next revision
 	 *
-	 * @param integer $revision  Revision ID. Get the revision that was after this one.
-	 * @param integer $flags, GAID_FOR_UPDATE
-	 * @return integer $oldrevision|false
+	 * @param $revId \type{\int} Revision ID. Get the revision that was after this one.
+	 * @param $flags \type{\int} GAID_FOR_UPDATE
+	 * @return \twotypes{\int,\bool} Next revision ID, or FALSE if none exists
 	 */
-	public function getNextRevisionID( $revision, $flags=0 ) {
+	public function getNextRevisionID( $revId, $flags=0 ) {
 		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
 		return $db->selectField( 'revision', 'rev_id',
 			array(
 				'rev_page' => $this->getArticleId($flags),
-				'rev_id > ' . intval( $revision )
+				'rev_id > ' . intval( $revId )
 			),
 			__METHOD__,
 			array( 'ORDER BY' => 'rev_id' )
 		);
 	}
+	
+	/**
+	 * Check if this is a new page
+	 *
+	 * @return bool
+	 */
+	public function isNewPage() {
+		$dbr = wfGetDB( DB_SLAVE );
+		return (bool)$dbr->selectField( 'page', 'page_is_new', $this->pageCond(), __METHOD__ );
+	}
+
+	/**
+	 * Get the oldest revision timestamp of this page
+	 *
+	 * @return string, MW timestamp
+	 */
+	public function getEarliestRevTime() {
+		$dbr = wfGetDB( DB_SLAVE );
+		if( $this->exists() ) {
+			$min = $dbr->selectField( 'revision',
+				'MIN(rev_timestamp)',
+				array( 'rev_page' => $this->getArticleId() ),
+				__METHOD__ );
+			return wfTimestampOrNull( TS_MW, $min );
+		}
+		return null;
+	}
 
 	/**
 	 * Get the number of revisions between the given revision IDs.
 	 * Used for diffs and other things that really need it.
 	 *
-	 * @param integer $old  Revision ID.
-	 * @param integer $new  Revision ID.
-	 * @return integer  Number of revisions between these IDs.
+	 * @param $old \type{\int} Revision ID.
+	 * @param $new \type{\int} Revision ID.
+	 * @return \type{\int} Number of revisions between these IDs.
 	 */
 	public function countRevisionsBetween( $old, $new ) {
 		$dbr = wfGetDB( DB_SLAVE );
@@ -3015,10 +3081,10 @@ class Title {
 	/**
 	 * Compare with another title.
 	 *
-	 * @param Title $title
-	 * @return bool
+	 * @param \type{Title} $title
+	 * @return \type{\bool} TRUE or FALSE
 	 */
-	public function equals( $title ) {
+	public function equals( Title $title ) {
 		// Note: === is necessary for proper matching of number-like titles.
 		return $this->getInterwiki() === $title->getInterwiki()
 			&& $this->getNamespace() == $title->getNamespace()
@@ -3039,36 +3105,85 @@ class Title {
 	/**
 	 * Return a string representation of this title
 	 *
-	 * @return string
+	 * @return \type{\string} String representation of this title
 	 */
 	public function __toString() {
 		return $this->getPrefixedText();
 	}
 
 	/**
-	 * Check if page exists
-	 * @return bool
+	 * Check if page exists.  For historical reasons, this function simply
+	 * checks for the existence of the title in the page table, and will
+	 * thus return false for interwiki links, special pages and the like.
+	 * If you want to know if a title can be meaningfully viewed, you should
+	 * probably call the isKnown() method instead.
+	 *
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function exists() {
 		return $this->getArticleId() != 0;
 	}
 
 	/**
-	 * Do we know that this title definitely exists, or should we otherwise
-	 * consider that it exists?
+	 * Should links to this title be shown as potentially viewable (i.e. as
+	 * "bluelinks"), even if there's no record by this title in the page
+	 * table?
 	 *
-	 * @return bool
+	 * This function is semi-deprecated for public use, as well as somewhat
+	 * misleadingly named.  You probably just want to call isKnown(), which
+	 * calls this function internally.
+	 *
+	 * (ISSUE: Most of these checks are cheap, but the file existence check
+	 * can potentially be quite expensive.  Including it here fixes a lot of
+	 * existing code, but we might want to add an optional parameter to skip
+	 * it and any other expensive checks.)
+	 *
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isAlwaysKnown() {
-		// If the page is form Mediawiki:message/lang, calling wfMsgWeirdKey causes
-		// the full l10n of that language to be loaded. That takes much memory and
-		// isn't needed. So we strip the language part away.
-		// Also, extension messages which are not loaded, are shown as red, because
-		// we don't call MessageCache::loadAllMessages.
-		list( $basename, /* rest */ ) = explode( '/', $this->mDbkeyform, 2 );
-		return $this->isExternal()
-			|| ( $this->mNamespace == NS_MAIN && $this->mDbkeyform == '' )
-			|| ( $this->mNamespace == NS_MEDIAWIKI && wfMsgWeirdKey( $basename ) );
+		if( $this->mInterwiki != '' ) {
+			return true;  // any interwiki link might be viewable, for all we know
+		}
+		switch( $this->mNamespace ) {			
+		case NS_MEDIA:
+		case NS_FILE:
+			return wfFindFile( $this );  // file exists, possibly in a foreign repo
+		case NS_SPECIAL:
+			return SpecialPage::exists( $this->getDBKey() );  // valid special page
+		case NS_MAIN:
+			return $this->mDbkeyform == '';  // selflink, possibly with fragment
+		case NS_MEDIAWIKI:
+			// If the page is form Mediawiki:message/lang, calling wfMsgWeirdKey causes
+			// the full l10n of that language to be loaded. That takes much memory and
+			// isn't needed. So we strip the language part away.
+			// Also, extension messages which are not loaded, are shown as red, because
+			// we don't call MessageCache::loadAllMessages.
+			list( $basename, /* rest */ ) = explode( '/', $this->mDbkeyform, 2 );
+			return wfMsgWeirdKey( $basename );  // known system message
+		default:
+			return false;
+		}
+	}
+
+	/**
+	 * Does this title refer to a page that can (or might) be meaningfully
+	 * viewed?  In particular, this function may be used to determine if
+	 * links to the title should be rendered as "bluelinks" (as opposed to
+	 * "redlinks" to non-existent pages).
+	 *
+	 * @return \type{\bool} TRUE or FALSE
+	 */
+	public function isKnown() {
+		return $this->exists() || $this->isAlwaysKnown();
+	}
+	
+	/**
+	* Is this in a namespace that allows actual pages?
+	*
+	* @return \type{\bool} TRUE or FALSE
+	*/
+	public function canExist() {
+		return $this->mNamespace >= 0 && $this->mNamespace != NS_MEDIA;
 	}
 
 	/**
@@ -3088,25 +3203,63 @@ class Title {
 
 	/**
 	 * Get the last touched timestamp
+	 * @param Database $db, optional db
+	 * @return \type{\string} Last touched timestamp
 	 */
-	public function getTouched() {
+	public function getTouched( $db = NULL ) {
+		$db = isset($db) ? $db : wfGetDB( DB_SLAVE );
+		$touched = $db->selectField( 'page', 'page_touched', $this->pageCond(), __METHOD__ );
+		return $touched;
+	}
+
+	/**
+	 * Get the timestamp when this page was updated since the user last saw it.
+	 * @param User $user
+	 * @return mixed string/NULL
+	 */
+	public function getNotificationTimestamp( $user = NULL ) {
+		global $wgUser, $wgShowUpdatedMarker;
+		// Assume current user if none given
+		if( !$user ) $user = $wgUser;
+		// Check cache first
+		$uid = $user->getId();
+		if( isset($this->mNotificationTimestamp[$uid]) ) {
+			return $this->mNotificationTimestamp[$uid];
+		}
+		if( !$uid || !$wgShowUpdatedMarker ) {
+			return $this->mNotificationTimestamp[$uid] = false;
+		}
+		// Don't cache too much!
+		if( count($this->mNotificationTimestamp) >= self::CACHE_MAX ) {
+			$this->mNotificationTimestamp = array();
+		}
 		$dbr = wfGetDB( DB_SLAVE );
-		$touched = $dbr->selectField( 'page', 'page_touched',
-			array(
-				'page_namespace' => $this->getNamespace(),
-				'page_title' => $this->getDBkey()
-			), __METHOD__
+		$this->mNotificationTimestamp[$uid] = $dbr->selectField( 'watchlist',
+			'wl_notificationtimestamp',
+			array( 'wl_namespace' => $this->getNamespace(),
+				'wl_title' => $this->getDBkey(),
+				'wl_user' => $user->getId()
+			),
+			__METHOD__
 		);
-		return $touched;
+		return $this->mNotificationTimestamp[$uid];
 	}
 
+	/**
+	 * Get the trackback URL for this page
+	 * @return \type{\string} Trackback URL
+	 */
 	public function trackbackURL() {
-		global $wgTitle, $wgScriptPath, $wgServer;
+		global $wgScriptPath, $wgServer;
 
 		return "$wgServer$wgScriptPath/trackback.php?article="
-			. htmlspecialchars(urlencode($wgTitle->getPrefixedDBkey()));
+			. htmlspecialchars(urlencode($this->getPrefixedDBkey()));
 	}
 
+	/**
+	 * Get the trackback RDF for this page
+	 * @return \type{\string} Trackback RDF
+	 */
 	public function trackbackRDF() {
 		$url = htmlspecialchars($this->getFullURL());
 		$title = htmlspecialchars($this->getText());
@@ -3132,7 +3285,7 @@ class Title {
 
 	/**
 	 * Generate strings used for xml 'id' names in monobook tabs
-	 * @return string
+	 * @return \type{\string} XML 'id' name
 	 */
 	public function getNamespaceKey() {
 		global $wgContLang;
@@ -3150,8 +3303,8 @@ class Title {
 			case NS_PROJECT:
 			case NS_PROJECT_TALK:
 				return 'nstab-project';
-			case NS_IMAGE:
-			case NS_IMAGE_TALK:
+			case NS_FILE:
+			case NS_FILE_TALK:
 				return 'nstab-image';
 			case NS_MEDIAWIKI:
 			case NS_MEDIAWIKI_TALK:
@@ -3172,7 +3325,7 @@ class Title {
 
 	/**
 	 * Returns true if this title resolves to the named special page
-	 * @param string $name The special page name
+	 * @param $name \type{\string} The special page name
 	 */
 	public function isSpecial( $name ) {
 		if ( $this->getNamespace() == NS_SPECIAL ) {
@@ -3186,7 +3339,7 @@ class Title {
 
 	/**
 	 * If the Title refers to a special page alias which is not the local default,
-	 * returns a new Title which points to the local default. Otherwise, returns $this.
+	 * @return \type{Title} A new Title which points to the local default. Otherwise, returns $this.
 	 */
 	public function fixSpecialName() {
 		if ( $this->getNamespace() == NS_SPECIAL ) {
@@ -3206,12 +3359,19 @@ class Title {
 	 * In other words, is this a content page, for the purposes of calculating
 	 * statistics, etc?
 	 *
-	 * @return bool
+	 * @return \type{\bool} TRUE or FALSE
 	 */
 	public function isContentPage() {
 		return MWNamespace::isContent( $this->getNamespace() );
 	}
 
+	/**
+	 * Get all extant redirects to this Title
+	 *
+	 * @param $ns \twotypes{\int,\null} Single namespace to consider; 
+	 *            NULL to consider all namespaces
+	 * @return \type{\arrayof{Title}} Redirects to this title
+	 */
 	public function getRedirectsHere( $ns = null ) {
 		$redirs = array();
 		
@@ -3223,7 +3383,7 @@ class Title {
 		);
 		if ( !is_null($ns) ) $where['page_namespace'] = $ns;
 		
-		$result = $dbr->select(
+		$res = $dbr->select(
 			array( 'redirect', 'page' ),
 			array( 'page_namespace', 'page_title' ),
 			$where,
@@ -3231,7 +3391,7 @@ class Title {
 		);
 
 
-		while( $row = $dbr->fetchObject( $result ) ) {
+		foreach( $res as $row ) {
 			$redirs[] = self::newFromRow( $row );
 		}
 		return $redirs;
diff --git a/includes/TitleArray.php b/includes/TitleArray.php
new file mode 100644
index 00000000..f7a9e1dc
--- /dev/null
+++ b/includes/TitleArray.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Note: this entire file is a byte-for-byte copy of UserArray.php with
+ * s/User/Title/.  If anyone can figure out how to do this nicely with inheri-
+ * tance or something, please do so.
+ */
+
+/**
+ * The TitleArray class only exists to provide the newFromResult method at pre-
+ * sent.
+ */
+abstract class TitleArray implements Iterator {
+	/**
+	 * @param $res result A MySQL result including at least page_namespace and
+	 *   page_title -- also can have page_id, page_len, page_is_redirect,
+	 *   page_latest (if those will be used).  See Title::newFromRow.
+	 * @return TitleArray
+	 */
+	static function newFromResult( $res ) {
+		$array = null;
+		if ( !wfRunHooks( 'TitleArrayFromResult', array( &$array, $res ) ) ) {
+			return null;
+		}
+		if ( $array === null ) {
+			$array = self::newFromResult_internal( $res );
+		}
+		return $array;
+	}
+
+	protected static function newFromResult_internal( $res ) {
+		$array = new TitleArrayFromResult( $res );
+		return $array;
+	}
+}
+
+class TitleArrayFromResult extends TitleArray {
+	var $res;
+	var $key, $current;
+
+	function __construct( $res ) {
+		$this->res = $res;
+		$this->key = 0;
+		$this->setCurrent( $this->res->current() );
+	}
+
+	protected function setCurrent( $row ) {
+		if ( $row === false ) {
+			$this->current = false;
+		} else {
+			$this->current = Title::newFromRow( $row );
+		}
+	}
+
+	public function count() {
+		return $this->res->numRows();
+	}
+
+	function current() {
+		return $this->current;
+	}
+
+	function key() {
+		return $this->key;
+	}
+
+	function next() {
+		$row = $this->res->next();
+		$this->setCurrent( $row );
+		$this->key++;
+	}
+
+	function rewind() {
+		$this->res->rewind();
+		$this->key = 0;
+		$this->setCurrent( $this->res->current() );
+	}
+
+	function valid() {
+		return $this->current !== false;
+	}
+}
diff --git a/includes/UploadBase.php b/includes/UploadBase.php
new file mode 100644
index 00000000..91155a1b
--- /dev/null
+++ b/includes/UploadBase.php
@@ -0,0 +1,867 @@
+<?php
+
+class UploadBase {
+	var $mTempPath;
+	var $mDesiredDestName, $mDestName, $mRemoveTempFile, $mSourceType;
+	var $mTitle = false, $mTitleError = 0;
+	var $mFilteredName, $mFinalExtension;
+	
+	const SUCCESS = 0;
+	const OK = 0;
+	const BEFORE_PROCESSING = 1;
+	const LARGE_FILE_SERVER = 2;
+	const EMPTY_FILE = 3;
+	const MIN_LENGTH_PARTNAME = 4;
+	const ILLEGAL_FILENAME = 5;
+	const PROTECTED_PAGE = 6;
+	const OVERWRITE_EXISTING_FILE = 7;
+	const FILETYPE_MISSING = 8;
+	const FILETYPE_BADTYPE = 9;
+	const VERIFICATION_ERROR = 10;
+	const UPLOAD_VERIFICATION_ERROR = 11;
+	const UPLOAD_WARNING = 12;
+	const INTERNAL_ERROR = 13;
+	
+	const SESSION_VERSION = 2;
+	
+	/**
+	 * Returns true if uploads are enabled.
+	 * Can be overriden by subclasses.
+	 */
+	static function isEnabled() {
+		global $wgEnableUploads;
+		return $wgEnableUploads;
+	}
+	/**
+	 * Returns true if the user can use this upload module or else a string 
+	 * identifying the missing permission.
+	 * Can be overriden by subclasses.
+	 */
+	static function isAllowed( $user ) {
+		if( !$user->isAllowed( 'upload' ) )
+			return 'upload';
+		return true;
+	}
+	
+	// Upload handlers. Should probably just be a global
+	static $uploadHandlers = array( 'Stash', 'Upload', 'Url' );
+	/**
+	 * Create a form of UploadBase depending on wpSourceType and initializes it
+	 */
+	static function createFromRequest( &$request, $type = null ) {
+		$type = $type ? $type : $request->getVal( 'wpSourceType' );
+		if( !$type ) 
+			return null;
+		$type = ucfirst($type);
+		$className = 'UploadFrom'.$type;
+		if( !in_array( $type, self::$uploadHandlers ) )
+			return null;
+		if( !call_user_func( array( $className, 'isEnabled' ) ) )
+			return null;
+		if( !call_user_func( array( $className, 'isValidRequest' ), $request ) )
+			return null;
+		
+		$handler = new $className;
+		$handler->initializeFromRequest( $request );
+		return $handler;
+	}
+	
+	/**
+	 * Check whether a request if valid for this handler
+	 */
+	static function isValidRequest( $request ) {
+		return false;
+	}
+	
+	function __construct() {}
+	
+	/**
+	 * Do the real variable initialization
+	 */
+	function initialize( $name, $tempPath, $fileSize, $removeTempFile = false ) {
+		$this->mDesiredDestName = $name;
+		$this->mTempPath = $tempPath;
+		$this->mFileSize = $fileSize;
+		$this->mRemoveTempFile = $removeTempFile;
+	}
+
+	/**
+	 * Fetch the file. Usually a no-op
+	 */
+	function fetchFile() {
+		return self::OK;
+	}
+
+	/**
+	 * Verify whether the upload is sane. 
+	 * Returns self::OK or else an array with error information
+	 */
+	function verifyUpload() {
+		global $wgUser;
+		
+		/**
+		 * If there was no filename or a zero size given, give up quick.
+		 */
+		if( empty( $this->mFileSize ) ) 
+			return array( 'status' => self::EMPTY_FILE );
+
+		$nt = $this->getTitle();
+		if( is_null( $nt ) ) {
+			$result = array( 'status' => $this->mTitleError );
+			if( $this->mTitleError == self::ILLEGAL_FILENAME )
+				$resul['filtered'] = $this->mFilteredName;
+			if ( $this->mTitleError == self::FILETYPE_BADTYPE )
+				$result['finalExt'] = $this->mFinalExtension;
+			return $result;
+		}
+		$this->mLocalFile = wfLocalFile( $nt );
+		$this->mDestName = $this->mLocalFile->getName();
+
+		/**
+		 * In some cases we may forbid overwriting of existing files.
+		 */
+		$overwrite = $this->checkOverwrite( $this->mDestName );
+		if( $overwrite !== true )
+			return array( 'status' => self::OVERWRITE_EXISTING_FILE, 'overwrite' => $overwrite );
+		
+		/**
+		 * Look at the contents of the file; if we can recognize the
+		 * type but it's corrupt or data of the wrong type, we should
+		 * probably not accept it.
+		 */
+		$verification = $this->verifyFile( $this->mTempPath );
+
+		if( $verification !== true ) {
+			if( !is_array( $verification ) ) 
+				$verification = array( $verification );
+			$verification['status'] = self::VERIFICATION_ERROR;
+			return $verification;
+		}
+		
+		$error = '';
+		if( !wfRunHooks( 'UploadVerification',
+				array( $this->mDestName, $this->mTempPath, &$error ) ) ) {
+			return array( 'status' => self::UPLOAD_VERIFICATION_ERROR, 'error' => $error );
+		}
+		
+		return self::OK;
+	}
+	
+	/**
+	 * Verifies that it's ok to include the uploaded file
+	 *
+	 * @param string $tmpfile the full path of the temporary file to verify
+	 * @return mixed true of the file is verified, a string or array otherwise.
+	 */
+	protected function verifyFile( $tmpfile ) {
+		$this->mFileProps = File::getPropsFromPath( $this->mTempPath, 
+		$this->mFinalExtension );
+		$this->checkMacBinary();
+		
+		#magically determine mime type
+		$magic = MimeMagic::singleton();
+		$mime = $magic->guessMimeType( $tmpfile, false );
+
+		#check mime type, if desired
+		global $wgVerifyMimeType;
+		if ( $wgVerifyMimeType ) {
+
+		  wfDebug ( "\n\nmime: <$mime> extension: <{$this->mFinalExtension}>\n\n");
+			#check mime type against file extension
+			if( !self::verifyExtension( $mime, $this->mFinalExtension ) ) {
+				return 'uploadcorrupt';
+			}
+
+			#check mime type blacklist
+			global $wgMimeTypeBlacklist;
+			if( isset($wgMimeTypeBlacklist) && !is_null($wgMimeTypeBlacklist)
+				&& $this->checkFileExtension( $mime, $wgMimeTypeBlacklist ) ) {
+				return array( 'filetype-badmime', $mime );
+			}
+		}
+
+		#check for htmlish code and javascript
+		if( $this->detectScript ( $tmpfile, $mime, $this->mFinalExtension ) ) {
+			return 'uploadscripted';
+		}
+
+		/**
+		* Scan the uploaded file for viruses
+		*/
+		$virus = $this->detectVirus($tmpfile);
+		if ( $virus ) {
+			return array( 'uploadvirus', $virus );
+		}
+
+		wfDebug( __METHOD__.": all clear; passing.\n" );
+		return true;
+	}
+	
+	/**
+	 * Check whether the user can edit, upload and create the image
+	 */
+	function verifyPermissions( $user ) {
+		/**
+		 * If the image is protected, non-sysop users won't be able
+		 * to modify it by uploading a new revision.
+		 */
+		$nt = $this->getTitle();
+		if( is_null( $nt ) )
+			return true;
+		$permErrors = $nt->getUserPermissionsErrors( 'edit', $user );
+		$permErrorsUpload = $nt->getUserPermissionsErrors( 'upload', $user );
+		$permErrorsCreate = ( $nt->exists() ? array() : $nt->getUserPermissionsErrors( 'create', $user ) );
+		if( $permErrors || $permErrorsUpload || $permErrorsCreate ) {
+			$permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsUpload, $permErrors ) );
+			$permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsCreate, $permErrors ) );
+			return $permErrors;
+		}
+		return true;
+	}	
+	
+	/**
+	 * Check for non fatal problems with the file
+	 */
+	function checkWarnings() {
+		$warning = array();
+
+		$filename = $this->mLocalFile->getName();
+		$n = strrpos( $filename, '.' );		
+		$partname = $n ? substr( $filename, 0, $n ) : $filename;
+
+		// Check whether the resulting filename is different from the desired one
+		if( $this->mDesiredDestName != $filename )
+			$warning['badfilename'] = $filename;
+
+		// Check whether the file extension is on the unwanted list
+		global $wgCheckFileExtensions, $wgFileExtensions;
+		if ( $wgCheckFileExtensions ) {
+			if ( !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) )
+				$warning['filetype-unwanted-type'] = $this->mFinalExtension; 
+		}
+		
+		global $wgUploadSizeWarning;
+		if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) )
+			$warning['large-file'] = $wgUploadSizeWarning;
+
+		if ( $this->mFileSize == 0 )
+			$warning['emptyfile'] = true;
+		
+		$exists = self::getExistsWarning( $this->mLocalFile );
+		if( $exists !== false )
+			$warning['exists'] = $exists;
+		
+		// Check whether this may be a thumbnail
+		if( $exists !== false && $exists[0] != 'thumb' 
+				&& self::isThumbName( $this->mLocalFile->getName() ) )
+			$warning['file-thumbnail-no'] = substr( $filename , 0, 
+				strpos( $nt->getText() , '-' ) +1 );
+		
+		$hash = File::sha1Base36( $this->mTempPath );
+		$dupes = RepoGroup::singleton()->findBySha1( $hash );
+		if( $dupes )
+			$warning['duplicate'] = $dupes;
+			
+		$filenamePrefixBlacklist = self::getFilenamePrefixBlacklist();
+		foreach( $filenamePrefixBlacklist as $prefix ) {
+			if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) {
+				$warning['filename-bad-prefix'] = $prefix;
+				break;
+			}
+		}
+		
+		# If the file existed before and was deleted, warn the user of this
+		# Don't bother doing so if the file exists now, however
+		if( $this->mLocalFile->wasDeleted() && !$this->mLocalFile->exists() )
+			$warning['filewasdeleted'] = $this->mLocalFile->getTitle();
+			
+		return $warning;
+	}
+
+	/**
+	 * Really perform the upload.
+	 */
+	function performUpload( $comment, $pageText, $watch, $user ) {
+		$status = $this->mLocalFile->upload( $this->mTempPath, $comment, $pageText,
+			File::DELETE_SOURCE, $this->mFileProps, false, $user );
+		
+		if( $status->isGood() && $watch ) {
+			$user->addWatch( $this->mLocalFile->getTitle() );
+		}
+		
+		if( $status->isGood() )
+			wfRunHooks( 'UploadComplete', array( &$this ) );
+		
+		return $status;
+	}
+
+	/**
+	 * Returns a title or null
+	 */
+	function getTitle() {
+		if ( $this->mTitle !== false )
+			return $this->mTitle;
+		
+		/**
+		 * Chop off any directories in the given filename. Then
+		 * filter out illegal characters, and try to make a legible name
+		 * out of it. We'll strip some silently that Title would die on.
+		 */
+
+		$basename = $this->mDesiredDestName;
+
+		$this->mFilteredName = wfStripIllegalFilenameChars( $basename );
+
+		/**
+		 * We'll want to blacklist against *any* 'extension', and use
+		 * only the final one for the whitelist.
+		 */
+		list( $partname, $ext ) = $this->splitExtensions( $this->mFilteredName );
+
+		if( count( $ext ) ) {
+			$this->mFinalExtension = $ext[count( $ext ) - 1];
+		} else {
+			$this->mFinalExtension = '';
+		}
+
+		/* Don't allow users to override the blacklist (check file extension) */
+		global $wgCheckFileExtensions, $wgStrictFileExtensions;
+		global $wgFileExtensions, $wgFileBlacklist;
+		if ( $this->mFinalExtension == '' ) {
+			$this->mTitleError = self::FILETYPE_MISSING;
+			return $this->mTitle = null;
+		} elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) ||
+				( $wgCheckFileExtensions && $wgStrictFileExtensions &&
+					!$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
+			$this->mTitleError = self::FILETYPE_BADTYPE;
+			return $this->mTitle = null;
+		}
+
+		# If there was more than one "extension", reassemble the base
+		# filename to prevent bogus complaints about length
+		if( count( $ext ) > 1 ) {
+			for( $i = 0; $i < count( $ext ) - 1; $i++ )
+				$partname .= '.' . $ext[$i];
+		}
+
+		if( strlen( $partname ) < 1 ) {
+			$this->mTitleError =  self::MIN_LENGTH_PARTNAME;
+			return $this->mTitle = null;
+		}
+		
+		$nt = Title::makeTitleSafe( NS_FILE, $this->mFilteredName );
+		if( is_null( $nt ) ) {
+			$this->mTitleError = self::ILLEGAL_FILENAME;
+			return $this->mTitle = null;
+		}
+		return $this->mTitle = $nt;
+	}
+	
+	function getLocalFile() {
+		if( is_null( $this->mLocalFile ) ) {
+			$nt = $this->getTitle();
+			$this->mLocalFile = is_null( $nt ) ? null : wfLocalFile( $nt );
+		}	
+		return $this->mLocalFile;
+	}
+	
+	/**
+	 * Stash a file in a temporary directory for later processing
+	 * after the user has confirmed it.
+	 *
+	 * If the user doesn't explicitly cancel or accept, these files
+	 * can accumulate in the temp directory.
+	 *
+	 * @param string $saveName - the destination filename
+	 * @param string $tempName - the source temporary file to save
+	 * @return string - full path the stashed file, or false on failure
+	 * @access private
+	 */
+	function saveTempUploadedFile( $saveName, $tempName ) {
+		global $wgOut;
+		$repo = RepoGroup::singleton()->getLocalRepo();
+		$status = $repo->storeTemp( $saveName, $tempName );
+		return $status;
+	}
+	
+	/**
+	 * Stash a file in a temporary directory for later processing,
+	 * and save the necessary descriptive info into the session.
+	 * Returns a key value which will be passed through a form
+	 * to pick up the path info on a later invocation.
+	 *
+	 * @return int
+	 * @access private
+	 */
+	function stashSession() {
+		$status = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath );
+
+		if( !$status->isGood() ) {
+			# Couldn't save the file.
+			return false;
+		}
+
+		return array(
+			'mTempPath'       => $status->value,
+			'mFileSize'       => $this->mFileSize,
+			'mFileProps'      => $this->mFileProps,
+			'version'         => self::SESSION_VERSION,
+	   	);
+	}
+	
+	/**
+	 * Remove a temporarily kept file stashed by saveTempUploadedFile().
+	 * @return success
+	 */
+	function unsaveUploadedFile() {
+		$repo = RepoGroup::singleton()->getLocalRepo();
+		$success = $repo->freeTemp( $this->mTempPath );
+		return $success;
+	}
+	
+	/**
+	 * If we've modified the upload file we need to manually remove it
+	 * on exit to clean up.
+	 * @access private
+	 */
+	function cleanupTempFile() {
+		if ( $this->mRemoveTempFile && file_exists( $this->mTempPath ) ) {
+			wfDebug( __METHOD__.": Removing temporary file {$this->mTempPath}\n" );
+			unlink( $this->mTempPath );
+		}
+	}
+	
+	function getTempPath() {
+		return $this->mTempPath;
+	}
+	
+	
+		/**
+	 * Split a file into a base name and all dot-delimited 'extensions'
+	 * on the end. Some web server configurations will fall back to
+	 * earlier pseudo-'extensions' to determine type and execute
+	 * scripts, so the blacklist needs to check them all.
+	 *
+	 * @return array
+	 */
+	function splitExtensions( $filename ) {
+		$bits = explode( '.', $filename );
+		$basename = array_shift( $bits );
+		return array( $basename, $bits );
+	}
+
+	/**
+	 * Perform case-insensitive match against a list of file extensions.
+	 * Returns true if the extension is in the list.
+	 *
+	 * @param string $ext
+	 * @param array $list
+	 * @return bool
+	 */
+	function checkFileExtension( $ext, $list ) {
+		return in_array( strtolower( $ext ), $list );
+	}
+
+	/**
+	 * Perform case-insensitive match against a list of file extensions.
+	 * Returns true if any of the extensions are in the list.
+	 *
+	 * @param array $ext
+	 * @param array $list
+	 * @return bool
+	 */
+	function checkFileExtensionList( $ext, $list ) {
+		foreach( $ext as $e ) {
+			if( in_array( strtolower( $e ), $list ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	
+	/**
+	 * Checks if the mime type of the uploaded file matches the file extension.
+	 *
+	 * @param string $mime the mime type of the uploaded file
+	 * @param string $extension The filename extension that the file is to be served with
+	 * @return bool
+	 */
+	public static function verifyExtension( $mime, $extension ) {
+		$magic = MimeMagic::singleton();
+
+		if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' )
+			if ( ! $magic->isRecognizableExtension( $extension ) ) {
+				wfDebug( __METHOD__.": passing file with unknown detected mime type; " .
+					"unrecognized extension '$extension', can't verify\n" );
+				return true;
+			} else {
+				wfDebug( __METHOD__.": rejecting file with unknown detected mime type; ".
+					"recognized extension '$extension', so probably invalid file\n" );
+				return false;
+			}
+
+		$match= $magic->isMatchingExtension($extension,$mime);
+
+		if ($match===NULL) {
+			wfDebug( __METHOD__.": no file extension known for mime type $mime, passing file\n" );
+			return true;
+		} elseif ($match===true) {
+			wfDebug( __METHOD__.": mime type $mime matches extension $extension, passing file\n" );
+
+			#TODO: if it's a bitmap, make sure PHP or ImageMagic resp. can handle it!
+			return true;
+
+		} else {
+			wfDebug( __METHOD__.": mime type $mime mismatches file extension $extension, rejecting file\n" );
+			return false;
+		}
+	}
+
+	/**
+	 * Heuristic for detecting files that *could* contain JavaScript instructions or
+	 * things that may look like HTML to a browser and are thus
+	 * potentially harmful. The present implementation will produce false positives in some situations.
+	 *
+	 * @param string $file Pathname to the temporary upload file
+	 * @param string $mime The mime type of the file
+	 * @param string $extension The extension of the file
+	 * @return bool true if the file contains something looking like embedded scripts
+	 */
+	function detectScript($file, $mime, $extension) {
+		global $wgAllowTitlesInSVG;
+
+		#ugly hack: for text files, always look at the entire file.
+		#For binary field, just check the first K.
+
+		if (strpos($mime,'text/')===0) $chunk = file_get_contents( $file );
+		else {
+			$fp = fopen( $file, 'rb' );
+			$chunk = fread( $fp, 1024 );
+			fclose( $fp );
+		}
+
+		$chunk= strtolower( $chunk );
+
+		if (!$chunk) return false;
+
+		#decode from UTF-16 if needed (could be used for obfuscation).
+		if (substr($chunk,0,2)=="\xfe\xff") $enc= "UTF-16BE";
+		elseif (substr($chunk,0,2)=="\xff\xfe") $enc= "UTF-16LE";
+		else $enc= NULL;
+
+		if ($enc) $chunk= iconv($enc,"ASCII//IGNORE",$chunk);
+
+		$chunk= trim($chunk);
+
+		#FIXME: convert from UTF-16 if necessarry!
+
+		wfDebug("SpecialUpload::detectScript: checking for embedded scripts and HTML stuff\n");
+
+		#check for HTML doctype
+		if (eregi("<!DOCTYPE *X?HTML",$chunk)) return true;
+
+		/**
+		* Internet Explorer for Windows performs some really stupid file type
+		* autodetection which can cause it to interpret valid image files as HTML
+		* and potentially execute JavaScript, creating a cross-site scripting
+		* attack vectors.
+		*
+		* Apple's Safari browser also performs some unsafe file type autodetection
+		* which can cause legitimate files to be interpreted as HTML if the
+		* web server is not correctly configured to send the right content-type
+		* (or if you're really uploading plain text and octet streams!)
+		*
+		* Returns true if IE is likely to mistake the given file for HTML.
+		* Also returns true if Safari would mistake the given file for HTML
+		* when served with a generic content-type.
+		*/
+
+		$tags = array(
+			'<body',
+			'<head',
+			'<html',   #also in safari
+			'<img',
+			'<pre',
+			'<script', #also in safari
+			'<table'
+			);
+		if( ! $wgAllowTitlesInSVG && $extension !== 'svg' && $mime !== 'image/svg' ) {
+			$tags[] = '<title';
+		}
+
+		foreach( $tags as $tag ) {
+			if( false !== strpos( $chunk, $tag ) ) {
+				return true;
+			}
+		}
+
+		/*
+		* look for javascript
+		*/
+
+		#resolve entity-refs to look at attributes. may be harsh on big files... cache result?
+		$chunk = Sanitizer::decodeCharReferences( $chunk );
+
+		#look for script-types
+		if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim',$chunk)) return true;
+
+		#look for html-style script-urls
+		if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) return true;
+
+		#look for css-style script-urls
+		if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) return true;
+
+		wfDebug("SpecialUpload::detectScript: no scripts found\n");
+		return false;
+	}
+
+	/**
+	 * Generic wrapper function for a virus scanner program.
+	 * This relies on the $wgAntivirus and $wgAntivirusSetup variables.
+	 * $wgAntivirusRequired may be used to deny upload if the scan fails.
+	 *
+	 * @param string $file Pathname to the temporary upload file
+	 * @return mixed false if not virus is found, NULL if the scan fails or is disabled,
+	 *         or a string containing feedback from the virus scanner if a virus was found.
+	 *         If textual feedback is missing but a virus was found, this function returns true.
+	 */
+	function detectVirus($file) {
+		global $wgAntivirus, $wgAntivirusSetup, $wgAntivirusRequired, $wgOut;
+
+		if ( !$wgAntivirus ) {
+			wfDebug( __METHOD__.": virus scanner disabled\n");
+			return NULL;
+		}
+
+		if ( !$wgAntivirusSetup[$wgAntivirus] ) {
+			wfDebug( __METHOD__.": unknown virus scanner: $wgAntivirus\n" );
+			$wgOut->wrapWikiMsg( '<div class="error">$1</div>', array( 'virus-badscanner', $wgAntivirus ) );
+			return wfMsg('virus-unknownscanner') . " $wgAntivirus";
+		}
+
+		# look up scanner configuration
+		$command = $wgAntivirusSetup[$wgAntivirus]["command"];
+		$exitCodeMap = $wgAntivirusSetup[$wgAntivirus]["codemap"];
+		$msgPattern = isset( $wgAntivirusSetup[$wgAntivirus]["messagepattern"] ) ?
+			$wgAntivirusSetup[$wgAntivirus]["messagepattern"] : null;
+
+		if ( strpos( $command,"%f" ) === false ) {
+			# simple pattern: append file to scan
+			$command .= " " . wfEscapeShellArg( $file );
+		} else {
+			# complex pattern: replace "%f" with file to scan
+			$command = str_replace( "%f", wfEscapeShellArg( $file ), $command );
+		}
+
+		wfDebug( __METHOD__.": running virus scan: $command \n" );
+
+		# execute virus scanner
+		$exitCode = false;
+
+		#NOTE: there's a 50 line workaround to make stderr redirection work on windows, too.
+		#      that does not seem to be worth the pain.
+		#      Ask me (Duesentrieb) about it if it's ever needed.
+		$output = array();
+		if ( wfIsWindows() ) {
+			exec( "$command", $output, $exitCode );
+		} else {
+			exec( "$command 2>&1", $output, $exitCode );
+		}
+
+		# map exit code to AV_xxx constants.
+		$mappedCode = $exitCode;
+		if ( $exitCodeMap ) {
+			if ( isset( $exitCodeMap[$exitCode] ) ) {
+				$mappedCode = $exitCodeMap[$exitCode];
+			} elseif ( isset( $exitCodeMap["*"] ) ) {
+				$mappedCode = $exitCodeMap["*"];
+			}
+		}
+
+		if ( $mappedCode === AV_SCAN_FAILED ) {
+			# scan failed (code was mapped to false by $exitCodeMap)
+			wfDebug( __METHOD__.": failed to scan $file (code $exitCode).\n" );
+
+			if ( $wgAntivirusRequired ) {
+				return wfMsg('virus-scanfailed', array( $exitCode ) );
+			} else {
+				return NULL;
+			}
+		} else if ( $mappedCode === AV_SCAN_ABORTED ) {
+			# scan failed because filetype is unknown (probably imune)
+			wfDebug( __METHOD__.": unsupported file type $file (code $exitCode).\n" );
+			return NULL;
+		} else if ( $mappedCode === AV_NO_VIRUS ) {
+			# no virus found
+			wfDebug( __METHOD__.": file passed virus scan.\n" );
+			return false;
+		} else {
+			$output = join( "\n", $output );
+			$output = trim( $output );
+
+			if ( !$output ) {
+				$output = true; #if there's no output, return true
+			} elseif ( $msgPattern ) {
+				$groups = array();
+				if ( preg_match( $msgPattern, $output, $groups ) ) {
+					if ( $groups[1] ) {
+						$output = $groups[1];
+					}
+				}
+			}
+
+			wfDebug( __METHOD__.": FOUND VIRUS! scanner feedback: $output" );
+			return $output;
+		}
+	}
+
+	/**
+	 * Check if the temporary file is MacBinary-encoded, as some uploads
+	 * from Internet Explorer on Mac OS Classic and Mac OS X will be.
+	 * If so, the data fork will be extracted to a second temporary file,
+	 * which will then be checked for validity and either kept or discarded.
+	 *
+	 * @access private
+	 */
+	function checkMacBinary() {
+		$macbin = new MacBinary( $this->mTempPath );
+		if( $macbin->isValid() ) {
+			$dataFile = tempnam( wfTempDir(), "WikiMacBinary" );
+			$dataHandle = fopen( $dataFile, 'wb' );
+
+			wfDebug( "SpecialUpload::checkMacBinary: Extracting MacBinary data fork to $dataFile\n" );
+			$macbin->extractData( $dataHandle );
+
+			$this->mTempPath = $dataFile;
+			$this->mFileSize = $macbin->dataForkLength();
+
+			// We'll have to manually remove the new file if it's not kept.
+			$this->mRemoveTempFile = true;
+		}
+		$macbin->close();
+	}
+	
+	/**
+	 * Check if there's an overwrite conflict and, if so, if restrictions
+	 * forbid this user from performing the upload.
+	 *
+	 * @return mixed true on success, WikiError on failure
+	 * @access private
+	 */
+	function checkOverwrite() {
+		global $wgUser;
+		// First check whether the local file can be overwritten
+		if( $this->mLocalFile->exists() )
+			if( !self::userCanReUpload( $wgUser, $this->mLocalFile ) )
+				return 'fileexists-forbidden';
+		
+		// Check shared conflicts
+		$file = wfFindFile( $this->mLocalFile->getName() );
+		if ( $file && ( !$wgUser->isAllowed( 'reupload' ) ||
+				!$wgUser->isAllowed( 'reupload-shared' ) ) )
+			return 'fileexists-shared-forbidden';
+		
+		return true;
+				  
+	}
+	
+	/**
+	 * Check if a user is the last uploader
+	 *
+	 * @param User $user
+	 * @param string $img, image name
+	 * @return bool
+	 */
+	public static function userCanReUpload( User $user, $img ) {
+		if( $user->isAllowed( 'reupload' ) )
+			return true; // non-conditional
+		if( !$user->isAllowed( 'reupload-own' ) )
+			return false;
+		if( is_string( $img ) )
+			$img = wfLocalFile( $img );
+		if ( !( $img instanceof LocalFile ) )
+			return false;
+
+		return $user->getId() == $img->getUser( 'id' );
+	}
+	
+	public static function getExistsWarning( $file ) {
+		if( $file->exists() )
+			return array( 'exists', $file );
+		
+		if( $file->getTitle()->getArticleID() )
+			return array( 'page-exists', $file );
+		
+		if( strpos( $file->getName(), '.' ) == false ) {
+			$partname = $file->getName();
+			$rawExtension = '';
+		} else {
+			$n = strrpos( $file->getName(), '.' );
+			$rawExtension = substr( $file->getName(), $n + 1 );
+			$partname = substr( $file->getName(), 0, $n );
+		}
+		
+		if ( $rawExtension != $file->getExtension() ) {
+			// We're not using the normalized form of the extension.
+			// Normal form is lowercase, using most common of alternate
+			// extensions (eg 'jpg' rather than 'JPEG').
+			//
+			// Check for another file using the normalized form...
+			$nt_lc = Title::makeTitle( NS_FILE, $partname . '.' . $file->getExtension() );
+			$file_lc = wfLocalFile( $nt_lc );
+			
+			if( $file_lc->exists() )
+				return array( 'exists-normalized', $file_lc );
+		} 
+		
+		if ( self::isThumbName( $file->getName() ) ) {
+			# Check for filenames like 50px- or 180px-, these are mostly thumbnails
+			$nt_thb = Title::newFromText( substr( $partname , strpos( $partname , '-' ) +1 ) . '.' . $rawExtension );
+			$file_thb = wfLocalFile( $nt_thb );
+			if( $file_thb->exists() )
+				return array( 'thumb', $file_thb );
+		}
+		
+		return false;
+	}
+	
+	public static function isThumbName( $filename ) {
+		$n = strrpos( $filename, '.' );
+		$partname = $n ? substr( $filename, 0, $n ) : $filename;
+		return ( 
+					substr( $partname , 3, 3 ) == 'px-' || 
+					substr( $partname , 2, 3 ) == 'px-' 
+				) && 
+				ereg( "[0-9]{2}" , substr( $partname , 0, 2) );	
+	}
+	
+	/**
+	 * Get a list of blacklisted filename prefixes from [[MediaWiki:filename-prefix-blacklist]]
+	 *
+	 * @return array list of prefixes
+	 */
+	public static function getFilenamePrefixBlacklist() {
+		$blacklist = array();
+		$message = wfMsgForContent( 'filename-prefix-blacklist' );
+		if( $message && !( wfEmptyMsg( 'filename-prefix-blacklist', $message ) || $message == '-' ) ) {
+			$lines = explode( "\n", $message );
+			foreach( $lines as $line ) {
+				// Remove comment lines
+				$comment = substr( trim( $line ), 0, 1 );
+				if ( $comment == '#' || $comment == '' ) {
+					continue;
+				}
+				// Remove additional comments after a prefix
+				$comment = strpos( $line, '#' );
+				if ( $comment > 0 ) {
+					$line = substr( $line, 0, $comment-1 );
+				}
+				$blacklist[] = trim( $line );
+			}
+		}
+		return $blacklist;
+	}
+	
+	
+}
diff --git a/includes/UploadFromStash.php b/includes/UploadFromStash.php
new file mode 100644
index 00000000..8bff3b49
--- /dev/null
+++ b/includes/UploadFromStash.php
@@ -0,0 +1,58 @@
+<?php
+
+class UploadFromStash extends UploadBase {
+	static function isValidSessionKey( $key, $sessionData ) {
+		return !empty( $key ) && 
+			is_array( $sessionData ) && 
+			isset( $sessionData[$key] ) && 
+			isset( $sessionData[$key]['version'] ) && 
+			$sessionData[$key]['version'] == self::SESSION_VERSION
+		;
+	}
+	static function isValidRequest( $request ) {
+		$sessionData = $request->getSessionData('wsUploadData');
+		return self::isValidSessionKey( 
+			$request->getInt( 'wpSessionKey' ),
+			$sessionData
+		);
+	}
+	
+	function initialize( $name, $sessionData ) {
+			/**
+			 * Confirming a temporarily stashed upload.
+			 * We don't want path names to be forged, so we keep
+			 * them in the session on the server and just give
+			 * an opaque key to the user agent.
+			 */
+			$this->initialize( $name, 
+				$sessionData['mTempPath'], 
+				$sessionData['mFileSize'],
+				false
+			);
+
+			$this->mFileProps        = $sessionData['mFileProps'];
+	}
+	function initializeFromRequest( &$request ) {
+		$sessionKey = $request->getInt( 'wpSessionKey' );
+		$sessionData = $request->getSessionData('wsUploadData');
+		
+		$desiredDestName = $request->getText( 'wpDestFile' );
+		if( !$desiredDestName )
+			$desiredDestName = $request->getText( 'wpUploadFile' );
+			
+		return $this->initialize( $desiredDestName, $sessionData[$sessionKey] );
+	}
+	
+	/**
+	 * File has been previously verified so no need to do so again.
+	 */
+	protected function verifyFile( $tmpfile ) {
+		return true;
+	}
+	/**
+	 * We're here from "ignore warnings anyway" so return just OK
+	 */
+	function checkWarnings() {
+		return array();
+	}
+}
diff --git a/includes/UploadFromUpload.php b/includes/UploadFromUpload.php
new file mode 100644
index 00000000..1b6762c6
--- /dev/null
+++ b/includes/UploadFromUpload.php
@@ -0,0 +1,20 @@
+<?php
+
+class UploadFromUpload extends UploadBase {
+
+	function initializeFromRequest( &$request ) {
+		$desiredDestName = $request->getText( 'wpDestFile' );
+		if( !$desiredDestName )
+			$desiredDestName = $request->getText( 'wpUploadFile' );
+		
+		return $this->initialize( 
+			$desiredDestName, 
+			$request->getFileTempName( 'wpUploadFile' ), 
+			$request->getFileSize( 'wpUploadFile' ) 
+		);
+	}
+	
+	static function isValidRequest( $request ) {
+		return (bool)$request->getFileTempName( 'wpUploadFile' );
+	}
+}
diff --git a/includes/UploadFromUrl.php b/includes/UploadFromUrl.php
new file mode 100644
index 00000000..7e23b8cd
--- /dev/null
+++ b/includes/UploadFromUrl.php
@@ -0,0 +1,92 @@
+<?php
+
+
+class UploadFromUrl extends UploadBase {
+	static function isAllowed( $user ) {
+		if( !$user->isAllowed( 'upload_by_url' ) )
+			return 'upload_by_url';
+		return parent::isAllowed( $user );
+	}
+	static function isEnabled() {
+		global $wgAllowCopyUploads;
+		return $wgAllowCopyUploads && parent::isEnabled();
+	}
+	
+	function initialize( $name, $url ) {
+		global $wgTmpDirectory;
+		$local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' );
+		$this-initialize( $name, $local_file, 0, true );
+
+		$this->mUrl = trim( $url );
+	}
+	
+	/**
+	 * Do the real fetching stuff
+	 */
+	function fetchFile() {
+		if( stripos($this->mUrl, 'http://') !== 0 && stripos($this->mUrl, 'ftp://') !== 0 ) {
+			return array(
+				'status' => self::BEFORE_PROCESSING,
+				'error' => 'upload-proto-error',
+			);
+		}
+		$res = $this->curlCopy();
+		if( $res !== true ) {
+			return array(
+				'status' => self::BEFORE_PROCESSING,
+				'error' => $res,
+			);
+		}
+		return self::OK;
+	}
+	
+	/**
+	 * Safe copy from URL
+	 * Returns true if there was an error, false otherwise
+	 */
+	private function curlCopy() {
+		global $wgUser, $wgOut;
+
+		# Open temporary file
+		$this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" );
+		if( $this->mCurlDestHandle === false ) {
+			# Could not open temporary file to write in
+			return 'upload-file-error';
+		}
+
+		$ch = curl_init();
+		curl_setopt( $ch, CURLOPT_HTTP_VERSION, 1.0); # Probably not needed, but apparently can work around some bug
+		curl_setopt( $ch, CURLOPT_TIMEOUT, 10); # 10 seconds timeout
+		curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 512); # 0.5KB per second minimum transfer speed
+		curl_setopt( $ch, CURLOPT_URL, $this->mUrl);
+		curl_setopt( $ch, CURLOPT_WRITEFUNCTION, array( $this, 'uploadCurlCallback' ) );
+		curl_exec( $ch );
+		$error =  curl_errno( $ch );
+		curl_close( $ch );
+
+		fclose( $this->mCurlDestHandle );
+		unset( $this->mCurlDestHandle );
+		
+		if( $error ) 
+			return "upload-curl-error$errornum";
+
+		return true;
+	}
+	
+	/**
+	 * Callback function for CURL-based web transfer
+	 * Write data to file unless we've passed the length limit;
+	 * if so, abort immediately.
+	 * @access private
+	 */
+	function uploadCurlCallback( $ch, $data ) {
+		global $wgMaxUploadSize;
+		$length = strlen( $data );
+		$this->mFileSize += $length;
+		if( $this->mFileSize > $wgMaxUploadSize ) {
+			return 0;
+		}
+		fwrite( $this->mCurlDestHandle, $data );
+		return $length;
+	}
+}
diff --git a/includes/User.php b/includes/User.php
index 4e39d678..9fee089c 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1,20 +1,29 @@
 <?php
 /**
- * See user.txt
+ * Implements the User class for the %MediaWiki software.
  * @file
  */
 
-# Number of characters in user_token field
+/**
+ * \int Number of characters in user_token field.
+ * @ingroup Constants
+ */
 define( 'USER_TOKEN_LENGTH', 32 );
 
-# Serialized record version
+/**
+ * \int Serialized record version.
+ * @ingroup Constants
+ */
 define( 'MW_USER_VERSION', 6 );
 
-# Some punctuation to prevent editing from broken text-mangling proxies.
+/**
+ * \string Some punctuation to prevent editing from broken text-mangling proxies.
+ * @ingroup Constants
+ */
 define( 'EDIT_TOKEN_SUFFIX', '+\\' );
 
 /**
- * Thrown by User::setPassword() on error
+ * Thrown by User::setPassword() on error.
  * @ingroup Exception
  */
 class PasswordError extends MWException {
@@ -34,11 +43,13 @@ class PasswordError extends MWException {
 class User {
 
 	/**
-	 * A list of default user toggles, i.e. boolean user preferences that are
-	 * displayed by Special:Preferences as checkboxes. This list can be
-	 * extended via the UserToggles hook or $wgContLang->getExtraUserToggles().
+	 * \type{\arrayof{\string}} A list of default user toggles, i.e., boolean user 
+         * preferences that are displayed by Special:Preferences as checkboxes.
+	 * This list can be extended via the UserToggles hook or by
+	 * $wgContLang::getExtraUserToggles().
+	 * @showinitializer
 	 */
-	static public $mToggles = array(
+	public static $mToggles = array(
 		'highlightbroken',
 		'justify',
 		'hideminor',
@@ -71,21 +82,26 @@ class User {
 		'showjumplinks',
 		'uselivepreview',
 		'forceeditsummary',
-		'watchlisthideown',
-		'watchlisthidebots',
 		'watchlisthideminor',
+		'watchlisthidebots',
+		'watchlisthideown',
+		'watchlisthideanons',
+		'watchlisthideliu',
 		'ccmeonemails',
 		'diffonly',
 		'showhiddencats',
+		'noconvertlink',
+		'norollbackdiff',
 	);
 
 	/**
-	 * List of member variables which are saved to the shared cache (memcached).
-	 * Any operation which changes the corresponding database fields must
-	 * call a cache-clearing function.
+	 * \type{\arrayof{\string}} List of member variables which are saved to the 
+	 * shared cache (memcached). Any operation which changes the 
+	 * corresponding database fields must call a cache-clearing function.
+	 * @showinitializer
 	 */
 	static $mCacheVars = array(
-		# user table
+		// user table
 		'mId',
 		'mName',
 		'mRealName',
@@ -101,13 +117,15 @@ class User {
 		'mEmailTokenExpires',
 		'mRegistration',
 		'mEditCount',
-		# user_group table
+		// user_group table
 		'mGroups',
 	);
 
 	/**
-	 * Core rights
-	 * Each of these should have a corresponding message of the form "right-$right"
+	 * \type{\arrayof{\string}} Core rights.
+	 * Each of these should have a corresponding message of the form 
+	 * "right-$right".
+	 * @showinitializer
 	 */
 	static $mCoreRights = array(
 		'apihighlimits',
@@ -132,6 +150,9 @@ class User {
 		'markbotedits',
 		'minoredit',
 		'move',
+		'movefile',
+		'move-rootuserpages',
+		'move-subpages',
 		'nominornewtalk',
 		'noratelimit',
 		'patrol',
@@ -142,6 +163,7 @@ class User {
 		'reupload',
 		'reupload-shared',
 		'rollback',
+		'siteadmin',
 		'suppressredirect',
 		'trackback',
 		'undelete',
@@ -150,47 +172,57 @@ class User {
 		'upload_by_url',
 		'userrights',
 	);
-	static $mAllRights = false;
-
 	/**
-	 * The cache variable declarations
+	 * \string Cached results of getAllRights()
 	 */
+	static $mAllRights = false;
+
+	/** @name Cache variables */
+	//@{
 	var $mId, $mName, $mRealName, $mPassword, $mNewpassword, $mNewpassTime,
 		$mEmail, $mOptions, $mTouched, $mToken, $mEmailAuthenticated,
 		$mEmailToken, $mEmailTokenExpires, $mRegistration, $mGroups;
+	//@}
 
 	/**
-	 * Whether the cache variables have been loaded
+	 * \bool Whether the cache variables have been loaded.
 	 */
-	var $mDataLoaded;
+	var $mDataLoaded, $mAuthLoaded;
 
 	/**
-	 * Initialisation data source if mDataLoaded==false. May be one of:
-	 *    defaults      anonymous user initialised from class defaults
-	 *    name          initialise from mName
-	 *    id            initialise from mId
-	 *    session       log in from cookies or session if possible
+	 * \string Initialization data source if mDataLoaded==false. May be one of:
+	 *  - 'defaults'   anonymous user initialised from class defaults
+	 *  - 'name'       initialise from mName
+	 *  - 'id'         initialise from mId
+	 *  - 'session'    log in from cookies or session if possible
 	 *
 	 * Use the User::newFrom*() family of functions to set this.
 	 */
 	var $mFrom;
 
-	/**
-	 * Lazy-initialised variables, invalidated with clearInstanceCache
-	 */
+	/** @name Lazy-initialized variables, invalidated with clearInstanceCache */
+	//@{
 	var $mNewtalk, $mDatePreference, $mBlockedby, $mHash, $mSkin, $mRights,
-		$mBlockreason, $mBlock, $mEffectiveGroups;
+		$mBlockreason, $mBlock, $mEffectiveGroups, $mBlockedGlobally, 
+		$mLocked, $mHideName;
+	//@}
 
 	/**
-	 * Lightweight constructor for anonymous user
-	 * Use the User::newFrom* factory functions for other kinds of users
+	 * Lightweight constructor for an anonymous user.
+	 * Use the User::newFrom* factory functions for other kinds of users.
+	 * 
+	 * @see newFromName()
+	 * @see newFromId()
+	 * @see newFromConfirmationCode()
+	 * @see newFromSession()
+	 * @see newFromRow()
 	 */
 	function User() {
 		$this->clearInstanceCache( 'defaults' );
 	}
 
 	/**
-	 * Load the user table data for this object from the source given by mFrom
+	 * Load the user table data for this object from the source given by mFrom.
 	 */
 	function load() {
 		if ( $this->mDataLoaded ) {
@@ -219,6 +251,7 @@ class User {
 				break;
 			case 'session':
 				$this->loadFromSession();
+				wfRunHooks( 'UserLoadAfterLoadFromSession', array( $this ) );
 				break;
 			default:
 				throw new MWException( "Unrecognised value for User->mFrom: \"{$this->mFrom}\"" );
@@ -227,8 +260,8 @@ class User {
 	}
 
 	/**
-	 * Load user table data given mId
-	 * @return false if the ID does not exist, true otherwise
+	 * Load user table data, given mId has already been set.
+	 * @return \bool false if the ID does not exist, true otherwise
 	 * @private
 	 */
 	function loadFromId() {
@@ -283,6 +316,10 @@ class User {
 		global $wgMemc;
 		$wgMemc->set( $key, $data );
 	}
+	
+	
+	/** @name newFrom*() static factory methods */
+	//@{
 
 	/**
 	 * Static factory method for creation from username.
@@ -290,14 +327,14 @@ class User {
 	 * This is slightly less efficient than newFromId(), so use newFromId() if
 	 * you have both an ID and a name handy.
 	 *
-	 * @param $name String: username, validated by Title:newFromText()
-	 * @param $validate Mixed: validate username. Takes the same parameters as
+	 * @param $name \string Username, validated by Title::newFromText()
+	 * @param $validate \mixed Validate username. Takes the same parameters as
 	 *    User::getCanonicalName(), except that true is accepted as an alias
 	 *    for 'valid', for BC.
 	 *
-	 * @return User object, or null if the username is invalid. If the username
-	 *    is not present in the database, the result will be a user object with
-	 *    a name, zero user ID and default settings.
+	 * @return \type{User} The User object, or null if the username is invalid. If the 
+	 *    username is not present in the database, the result will be a user object 
+	 *    with a name, zero user ID and default settings.
 	 */
 	static function newFromName( $name, $validate = 'valid' ) {
 		if ( $validate === true ) {
@@ -315,6 +352,12 @@ class User {
 		}
 	}
 
+	/**
+	 * Static factory method for creation from a given user ID.
+	 *
+	 * @param $id \int Valid user ID
+	 * @return \type{User} The corresponding User object
+	 */
 	static function newFromId( $id ) {
 		$u = new User;
 		$u->mId = $id;
@@ -329,8 +372,8 @@ class User {
 	 *
 	 * If the code is invalid or has expired, returns NULL.
 	 *
-	 * @param $code string
-	 * @return User
+	 * @param $code \string Confirmation code
+	 * @return \type{User}
 	 */
 	static function newFromConfirmationCode( $code ) {
 		$dbr = wfGetDB( DB_SLAVE );
@@ -349,7 +392,7 @@ class User {
 	 * Create a new user object using data from session or cookies. If the
 	 * login credentials are invalid, the result is an anonymous user.
 	 *
-	 * @return User
+	 * @return \type{User}
 	 */
 	static function newFromSession() {
 		$user = new User;
@@ -360,17 +403,22 @@ class User {
 	/**
 	 * Create a new user object from a user row.
 	 * The row should have all fields from the user table in it.
+	 * @param $row array A row from the user table
+	 * @return \type{User}
 	 */
 	static function newFromRow( $row ) {
 		$user = new User;
 		$user->loadFromRow( $row );
 		return $user;
 	}
+	
+	//@}
+	
 
 	/**
-	 * Get username given an id.
-	 * @param $id Integer: database user id
-	 * @return string Nickname of a user
+	 * Get the username corresponding to a given user ID
+	 * @param $id \int User ID
+	 * @return \string The corresponding username
 	 */
 	static function whoIs( $id ) {
 		$dbr = wfGetDB( DB_SLAVE );
@@ -378,10 +426,10 @@ class User {
 	}
 
 	/**
-	 * Get the real name of a user given their identifier
+	 * Get the real name of a user given their user ID
 	 *
-	 * @param $id Int: database user id
-	 * @return string Real name of a user
+	 * @param $id \int User ID
+	 * @return \string The corresponding user's real name
 	 */
 	static function whoIsReal( $id ) {
 		$dbr = wfGetDB( DB_SLAVE );
@@ -390,12 +438,11 @@ class User {
 
 	/**
 	 * Get database id given a user name
-	 * @param $name String: nickname of a user
-	 * @return integer|null Database user id (null: if non existent
-	 * @static
+	 * @param $name \string Username
+	 * @return \types{\int,\null} The corresponding user's ID, or null if user is nonexistent
 	 */
 	static function idFromName( $name ) {
-		$nt = Title::newFromText( $name );
+		$nt = Title::makeTitleSafe( NS_USER, $name );
 		if( is_null( $nt ) ) {
 			# Illegal name
 			return null;
@@ -423,8 +470,8 @@ class User {
 	 * addresses like this, if we allowed accounts like this to be created
 	 * new users could get the old edits of these anonymous users.
 	 *
-	 * @param $name String: nickname of a user
-	 * @return bool
+	 * @param $name \string String to match
+	 * @return \bool True or false
 	 */
 	static function isIP( $name ) {
 		return preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.(?:xxx|\d{1,3})$/',$name) || IP::isIPv6($name);
@@ -438,8 +485,8 @@ class User {
 	 * is longer than the maximum allowed username size or doesn't begin with
 	 * a capital letter.
 	 *
-	 * @param $name string
-	 * @return bool
+	 * @param $name \string String to match
+	 * @return \bool True or false
 	 */
 	static function isValidUserName( $name ) {
 		global $wgContLang, $wgMaxNameChars;
@@ -492,8 +539,8 @@ class User {
 	 * If an account already exists in this form, login will be blocked
 	 * by a failure to pass this function.
 	 *
-	 * @param $name string
-	 * @return bool
+	 * @param $name \string String to match
+	 * @return \bool True or false
 	 */
 	static function isUsableName( $name ) {
 		global $wgReservedUsernames;
@@ -502,8 +549,14 @@ class User {
 			return false;
 		}
 
+		static $reservedUsernames = false;
+		if ( !$reservedUsernames ) {
+			$reservedUsernames = $wgReservedUsernames;
+			wfRunHooks( 'UserGetReservedNames', array( &$reservedUsernames ) );
+		}
+
 		// Certain names may be reserved for batch processes.
-		foreach ( $wgReservedUsernames as $reserved ) {
+		foreach ( $reservedUsernames as $reserved ) {
 			if ( substr( $reserved, 0, 4 ) == 'msg:' ) {
 				$reserved = wfMsgForContent( substr( $reserved, 4 ) );
 			}
@@ -524,8 +577,8 @@ class User {
 	 * rather than in isValidUserName() to avoid disrupting
 	 * existing accounts.
 	 *
-	 * @param $name string
-	 * @return bool
+	 * @param $name \string String to match
+	 * @return \bool True or false
 	 */
 	static function isCreatableName( $name ) {
 		return
@@ -538,8 +591,8 @@ class User {
 	/**
 	 * Is the input a valid password for this user?
 	 *
-	 * @param $password String: desired password
-	 * @return bool
+	 * @param $password \string Desired password
+	 * @return \bool True or false
 	 */
 	function isValidPassword( $password ) {
 		global $wgMinimalPasswordLength, $wgContLang;
@@ -556,7 +609,7 @@ class User {
 	}
 
 	/**
-	 * Does a string look like an email address?
+	 * Does a string look like an e-mail address?
 	 *
 	 * There used to be a regular expression here, it got removed because it
 	 * rejected valid addresses. Actually just check if there is '@' somewhere
@@ -564,8 +617,8 @@ class User {
 	 *
 	 * @todo Check for RFC 2822 compilance (bug 959)
 	 *
-	 * @param $addr String: email address
-	 * @return bool
+	 * @param $addr \string E-mail address
+	 * @return \bool True or false
 	 */
 	public static function isValidEmailAddr( $addr ) {
 		$result = null;
@@ -579,12 +632,12 @@ class User {
 	/**
 	 * Given unvalidated user input, return a canonical username, or false if
 	 * the username is invalid.
-	 * @param $name string
-	 * @param $validate Mixed: type of validation to use:
-	 *                  false        No validation
-	 *                  'valid'      Valid for batch processes
-	 *                  'usable'     Valid for batch processes and login
-	 *                  'creatable'  Valid for batch processes, login and account creation
+	 * @param $name \string User input
+	 * @param $validate \types{\string,\bool} Type of validation to use:
+	 *                - false        No validation
+	 *                - 'valid'      Valid for batch processes
+	 *                - 'usable'     Valid for batch processes and login
+	 *                - 'creatable'  Valid for batch processes, login and account creation
 	 */
 	static function getCanonicalName( $name, $validate = 'valid' ) {
 		# Force usernames to capital
@@ -598,7 +651,9 @@ class User {
 			return false;
 
 		# Clean up name according to title rules
-		$t = Title::newFromText( $name );
+		$t = ($validate === 'valid') ? 
+			Title::newFromText( $name ) : Title::makeTitle( NS_USER, $name );
+		# Check for invalid titles
 		if( is_null( $t ) ) {
 			return false;
 		}
@@ -634,11 +689,10 @@ class User {
 
 	/**
 	 * Count the number of edits of a user
+	 * @todo It should not be static and some day should be merged as proper member function / deprecated -- domas
 	 *
-	 * It should not be static and some day should be merged as proper member function / deprecated -- domas
-	 *
-	 * @param $uid Int: the user ID to check
-	 * @return int
+	 * @param $uid \int User ID to check
+	 * @return \int The user's edit count
 	 */
 	static function edits( $uid ) {
 		wfProfileIn( __METHOD__ );
@@ -674,7 +728,7 @@ class User {
 	 * Return a random password. Sourced from mt_rand, so it's not particularly secure.
 	 * @todo hash random numbers to improve security, like generateToken()
 	 *
-	 * @return string
+	 * @return \string New random password
 	 */
 	static function randomPassword() {
 		global $wgMinimalPasswordLength;
@@ -691,9 +745,10 @@ class User {
 	}
 
 	/**
-	 * Set cached properties to default. Note: this no longer clears
-	 * uncached lazy-initialised properties. The constructor does that instead.
+	 * Set cached properties to default. 
 	 *
+	 * @note This no longer clears uncached lazy-initialised properties; 
+	 *       the constructor does that instead.
 	 * @private
 	 */
 	function loadDefaults( $name = false ) {
@@ -728,8 +783,7 @@ class User {
 	}
 
 	/**
-	 * Initialise php session
-	 * @deprecated use wfSetupSession()
+	 * @deprecated Use wfSetupSession().
 	 */
 	function SetupSession() {
 		wfDeprecated( __METHOD__ );
@@ -738,8 +792,8 @@ class User {
 
 	/**
 	 * Load user data from the session or login cookie. If there are no valid
-	 * credentials, initialises the user as an anon.
-	 * @return true if the user is logged in, false otherwise
+	 * credentials, initialises the user as an anonymous user.
+	 * @return \bool True if the user is logged in, false otherwise.
 	 */
 	private function loadFromSession() {
 		global $wgMemc, $wgCookiePrefix;
@@ -750,20 +804,27 @@ class User {
 			return $result;
 		}
 
-		if ( isset( $_SESSION['wsUserID'] ) ) {
-			if ( 0 != $_SESSION['wsUserID'] ) {
+		if ( isset( $_COOKIE["{$wgCookiePrefix}UserID"] ) ) {
+			$sId = intval( $_COOKIE["{$wgCookiePrefix}UserID"] );
+			if( isset( $_SESSION['wsUserID'] ) && $sId != $_SESSION['wsUserID'] ) {
+				$this->loadDefaults(); // Possible collision!
+				wfDebugLog( 'loginSessions', "Session user ID ({$_SESSION['wsUserID']}) and 
+					cookie user ID ($sId) don't match!" );
+				return false;
+			}
+			$_SESSION['wsUserID'] = $sId;
+		} else if ( isset( $_SESSION['wsUserID'] ) ) {
+			if ( $_SESSION['wsUserID'] != 0 ) {
 				$sId = $_SESSION['wsUserID'];
 			} else {
 				$this->loadDefaults();
 				return false;
 			}
-		} else if ( isset( $_COOKIE["{$wgCookiePrefix}UserID"] ) ) {
-			$sId = intval( $_COOKIE["{$wgCookiePrefix}UserID"] );
-			$_SESSION['wsUserID'] = $sId;
 		} else {
 			$this->loadDefaults();
 			return false;
 		}
+
 		if ( isset( $_SESSION['wsUserName'] ) ) {
 			$sName = $_SESSION['wsUserName'];
 		} else if ( isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) {
@@ -806,10 +867,10 @@ class User {
 	}
 
 	/**
-	 * Load user and user_group data from the database
-	 * $this->mId must be set, this is how the user is identified.
+	 * Load user and user_group data from the database.
+	 * $this::mId must be set, this is how the user is identified.
 	 *
-	 * @return true if the user exists, false if the user is anonymous
+	 * @return \bool True if the user exists, false if the user is anonymous
 	 * @private
 	 */
 	function loadFromDatabase() {
@@ -840,7 +901,9 @@ class User {
 	}
 
 	/**
-	 * Initialise the user object from a row from the user table
+	 * Initialize this object from a row from the user table.
+	 *
+	 * @param $row \type{\arrayof{\mixed}} Row from the user table to load.
 	 */
 	function loadFromRow( $row ) {
 		$this->mDataLoaded = true;
@@ -865,7 +928,7 @@ class User {
 	}
 
 	/**
-	 * Load the groups from the database if they aren't already loaded
+	 * Load the groups from the database if they aren't already loaded.
 	 * @private
 	 */
 	function loadGroups() {
@@ -884,8 +947,8 @@ class User {
 
 	/**
 	 * Clear various cached data stored in this object.
-	 * @param $reloadFrom String: reload user and user_groups table data from a
-	 *   given source. May be "name", "id", "defaults", "session" or false for
+	 * @param $reloadFrom \string Reload user and user_groups table data from a
+	 *   given source. May be "name", "id", "defaults", "session", or false for
 	 *   no reload.
 	 */
 	function clearInstanceCache( $reloadFrom = false ) {
@@ -906,9 +969,8 @@ class User {
 	/**
 	 * Combine the language default options with any site-specific options
 	 * and add the default language variants.
-	 * Not really private cause it's called by Language class
-	 * @return array
-	 * @private
+	 *
+	 * @return \type{\arrayof{\string}} Array of options
 	 */
 	static function getDefaultOptions() {
 		global $wgNamespacesToBeSearchedDefault;
@@ -934,8 +996,8 @@ class User {
 	/**
 	 * Get a given default option value.
 	 *
-	 * @param $opt string
-	 * @return string
+	 * @param $opt \string Name of option to retrieve
+	 * @return \string Default option value
 	 */
 	public static function getDefaultOption( $opt ) {
 		$defOpts = self::getDefaultOptions();
@@ -948,7 +1010,7 @@ class User {
 
 	/**
 	 * Get a list of user toggle names
-	 * @return array
+	 * @return \type{\arrayof{\string}} Array of user toggle names
 	 */
 	static function getToggles() {
 		global $wgContLang;
@@ -961,7 +1023,7 @@ class User {
 	/**
 	 * Get blocking information
 	 * @private
-	 * @param $bFromSlave Bool: specify whether to check slave or master. To
+	 * @param $bFromSlave \bool Whether to check the slave database first. To
 	 *                    improve performance, non-critical checks are done
 	 *                    against slaves. Check when actually saving should be
 	 *                    done against master.
@@ -986,6 +1048,7 @@ class User {
 		
 		$this->mBlockedby = 0;
 		$this->mHideName = 0;
+		$this->mAllowUsertalk = 0;
 		$ip = wfGetIP();
 
 		if ($this->isAllowed( 'ipblock-exempt' ) ) {
@@ -1001,12 +1064,14 @@ class User {
 			$this->mBlockedby = $this->mBlock->mBy;
 			$this->mBlockreason = $this->mBlock->mReason;
 			$this->mHideName = $this->mBlock->mHideName;
+			$this->mAllowUsertalk = $this->mBlock->mAllowUsertalk;
 			if ( $this->isLoggedIn() ) {
 				$this->spreadBlock();
 			}
 		} else {
-			$this->mBlock = null;
-			wfDebug( __METHOD__.": No block.\n" );
+			// Bug 13611: don't remove mBlock here, to allow account creation blocks to 
+			// apply to users. Note that the existence of $this->mBlock is not used to 
+			// check for edit blocks, $this->mBlockedby is instead.
 		}
 
 		# Proxy blocking
@@ -1032,6 +1097,12 @@ class User {
 		wfProfileOut( __METHOD__ );
 	}
 
+	/**
+	 * Whether the given IP is in the SORBS blacklist.
+	 *
+	 * @param $ip \string IP to check
+	 * @return \bool True if blacklisted.
+	 */
 	function inSorbsBlacklist( $ip ) {
 		global $wgEnableSorbs, $wgSorbsUrl;
 
@@ -1039,24 +1110,27 @@ class User {
 			$this->inDnsBlacklist( $ip, $wgSorbsUrl );
 	}
 
+	/**
+	 * Whether the given IP is in a given DNS blacklist.
+	 *
+	 * @param $ip \string IP to check
+	 * @param $base \string URL of the DNS blacklist
+	 * @return \bool True if blacklisted.
+	 */
 	function inDnsBlacklist( $ip, $base ) {
 		wfProfileIn( __METHOD__ );
 
 		$found = false;
 		$host = '';
-		// FIXME: IPv6 ???
-		$m = array();
-		if ( preg_match( '/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $ip, $m ) ) {
+		// FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
+		if( IP::isIPv4($ip) ) {
 			# Make hostname
-			for ( $i=4; $i>=1; $i-- ) {
-				$host .= $m[$i] . '.';
-			}
-			$host .= $base;
+			$host = "$ip.$base";
 
 			# Send query
 			$ipList = gethostbynamel( $host );
 
-			if ( $ipList ) {
+			if( $ipList ) {
 				wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy says $base!\n" );
 				$found = true;
 			} else {
@@ -1071,7 +1145,7 @@ class User {
 	/**
 	 * Is this user subject to rate limiting?
 	 *
-	 * @return bool
+	 * @return \bool True if rate limited
 	 */
 	public function isPingLimitable() {
 		global $wgRateLimitsExcludedGroups;
@@ -1086,10 +1160,11 @@ class User {
 	 * Primitive rate limits: enforce maximum actions per time period
 	 * to put a brake on flooding.
 	 *
-	 * Note: when using a shared cache like memcached, IP-address
+	 * @note When using a shared cache like memcached, IP-address
 	 * last-hit counters will be shared across wikis.
 	 *
-	 * @return bool true if a rate limiter was tripped
+	 * @param $action \string Action to enforce; 'edit' if unspecified
+	 * @return \bool True if a rate limiter was tripped
 	 */
 	function pingLimiter( $action='edit' ) {
 
@@ -1180,7 +1255,9 @@ class User {
 
 	/**
 	 * Check if user is blocked
-	 * @return bool True if blocked, false otherwise
+	 * 
+	 * @param $bFromSlave \bool Whether to check the slave database instead of the master
+	 * @return \bool True if blocked, false otherwise
 	 */
 	function isBlocked( $bFromSlave = true ) { // hacked from false due to horrible probs on site
 		wfDebug( "User::isBlocked: enter\n" );
@@ -1190,6 +1267,10 @@ class User {
 
 	/**
 	 * Check if user is blocked from editing a particular article
+	 * 
+	 * @param $title      \string Title to check
+	 * @param $bFromSlave \bool   Whether to check the slave database instead of the master
+	 * @return \bool True if blocked, false otherwise
 	 */
 	function isBlockedFrom( $title, $bFromSlave = false ) {
 		global $wgBlockAllowsUTEdit;
@@ -1198,8 +1279,9 @@ class User {
 
 		wfDebug( __METHOD__.": asking isBlocked()\n" );
 		$blocked = $this->isBlocked( $bFromSlave );
+		$allowUsertalk = ($wgBlockAllowsUTEdit ? $this->mAllowUsertalk : false);
 		# If a user's name is suppressed, they cannot make edits anywhere
-		if ( !$this->mHideName && $wgBlockAllowsUTEdit && $title->getText() === $this->getName() &&
+		if ( !$this->mHideName && $allowUsertalk && $title->getText() === $this->getName() &&
 		  $title->getNamespace() == NS_USER_TALK ) {
 			$blocked = false;
 			wfDebug( __METHOD__.": self-talk page, ignoring any blocks\n" );
@@ -1209,8 +1291,8 @@ class User {
 	}
 
 	/**
-	 * Get name of blocker
-	 * @return string name of blocker
+	 * If user is blocked, return the name of the user who placed the block
+	 * @return \string name of blocker
 	 */
 	function blockedBy() {
 		$this->getBlockedStatus();
@@ -1218,16 +1300,74 @@ class User {
 	}
 
 	/**
-	 * Get blocking reason
-	 * @return string Blocking reason
+	 * If user is blocked, return the specified reason for the block
+	 * @return \string Blocking reason
 	 */
 	function blockedFor() {
 		$this->getBlockedStatus();
 		return $this->mBlockreason;
 	}
+	
+	/**
+	 * Check if user is blocked on all wikis.
+	 * Do not use for actual edit permission checks!
+	 * This is intented for quick UI checks.
+	 * 
+	 * @param $ip \type{\string} IP address, uses current client if none given
+	 * @return \type{\bool} True if blocked, false otherwise
+	 */
+	function isBlockedGlobally( $ip = '' ) {
+		if( $this->mBlockedGlobally !== null ) {
+			return $this->mBlockedGlobally;
+		}
+		// User is already an IP?
+		if( IP::isIPAddress( $this->getName() ) ) {
+			$ip = $this->getName();
+		} else if( !$ip ) {
+			$ip = wfGetIP();
+		}
+		$blocked = false;
+		wfRunHooks( 'UserIsBlockedGlobally', array( &$this, $ip, &$blocked ) );
+		$this->mBlockedGlobally = (bool)$blocked;
+		return $this->mBlockedGlobally;
+	}
+	
+	/**
+	 * Check if user account is locked
+	 * 
+	 * @return \type{\bool} True if locked, false otherwise
+	 */
+	function isLocked() {
+		if( $this->mLocked !== null ) {
+			return $this->mLocked;
+		}
+		global $wgAuth;
+		$authUser = $wgAuth->getUserInstance( $this );
+		$this->mLocked = (bool)$authUser->isLocked();
+		return $this->mLocked;
+	}
+	
+	/**
+	 * Check if user account is hidden
+	 * 
+	 * @return \type{\bool} True if hidden, false otherwise
+	 */
+	function isHidden() {
+		if( $this->mHideName !== null ) {
+			return $this->mHideName;
+		}
+		$this->getBlockedStatus();
+		if( !$this->mHideName ) {
+			global $wgAuth;
+			$authUser = $wgAuth->getUserInstance( $this );
+			$this->mHideName = (bool)$authUser->isHidden();
+		}
+		return $this->mHideName;
+	}
 
 	/**
-	 * Get the user ID. Returns 0 if the user is anonymous or nonexistent.
+	 * Get the user's ID.
+	 * @return \int The user's ID; 0 if the user is anonymous or nonexistent
 	 */
 	function getId() {
 		if( $this->mId === null and $this->mName !== null
@@ -1242,7 +1382,8 @@ class User {
 	}
 
 	/**
-	 * Set the user and reload all fields according to that ID
+	 * Set the user and reload all fields according to a given ID
+	 * @param $v \int User ID to reload
 	 */
 	function setId( $v ) {
 		$this->mId = $v;
@@ -1250,7 +1391,8 @@ class User {
 	}
 
 	/**
-	 * Get the user name, or the IP for anons
+	 * Get the user name, or the IP of an anonymous user
+	 * @return \string User's name or IP address
 	 */
 	function getName() {
 		if ( !$this->mDataLoaded && $this->mFrom == 'name' ) {
@@ -1275,8 +1417,9 @@ class User {
 	 * address for an anonymous user to something other than the current
 	 * remote IP.
 	 *
-	 * User::newFromName() has rougly the same function, when the named user
+	 * @note User::newFromName() has rougly the same function, when the named user
 	 * does not exist.
+	 * @param $str \string New user name to set
 	 */
 	function setName( $str ) {
 		$this->load();
@@ -1284,13 +1427,17 @@ class User {
 	}
 
 	/**
-	 * Return the title dbkey form of the name, for eg user pages.
-	 * @return string
+	 * Get the user's name escaped by underscores.
+	 * @return \string Username escaped by underscores.
 	 */
 	function getTitleKey() {
 		return str_replace( ' ', '_', $this->getName() );
 	}
 
+	/**
+	 * Check if the user has new messages.
+	 * @return \bool True if the user has new messages
+	 */
 	function getNewtalk() {
 		$this->load();
 
@@ -1322,6 +1469,7 @@ class User {
 
 	/**
 	 * Return the talk page(s) this user has new messages on.
+	 * @return \type{\arrayof{\string}} Array of page URLs
 	 */
 	function getNewMessageLinks() {
 		$talks = array();
@@ -1337,13 +1485,13 @@ class User {
 
 
 	/**
-	 * Perform a user_newtalk check, uncached.
-	 * Use getNewtalk for a cached check.
+	 * Internal uncached check for new messages
 	 *
-	 * @param $field string
-	 * @param $id mixed
-	 * @param $fromMaster Bool: true to fetch from the master, false for a slave
-	 * @return bool
+	 * @see getNewtalk()
+	 * @param $field \string 'user_ip' for anonymous users, 'user_id' otherwise
+	 * @param $id \types{\string,\int} User's IP address for anonymous users, User ID otherwise
+	 * @param $fromMaster \bool true to fetch from the master, false for a slave
+	 * @return \bool True if the user has new messages
 	 * @private
 	 */
 	function checkNewtalk( $field, $id, $fromMaster = false ) {
@@ -1358,9 +1506,10 @@ class User {
 	}
 
 	/**
-	 * Add or update the
-	 * @param $field string
-	 * @param $id mixed
+	 * Add or update the new messages flag
+	 * @param $field \string 'user_ip' for anonymous users, 'user_id' otherwise
+	 * @param $id \types{\string,\int} User's IP address for anonymous users, User ID otherwise
+	 * @return \bool True if successful, false otherwise
 	 * @private
 	 */
 	function updateNewtalk( $field, $id ) {
@@ -1380,8 +1529,9 @@ class User {
 
 	/**
 	 * Clear the new messages flag for the given user
-	 * @param $field string
-	 * @param $id mixed
+	 * @param $field \string 'user_ip' for anonymous users, 'user_id' otherwise
+	 * @param $id \types{\string,\int} User's IP address for anonymous users, User ID otherwise
+	 * @return \bool True if successful, false otherwise
 	 * @private
 	 */
 	function deleteNewtalk( $field, $id ) {
@@ -1400,7 +1550,7 @@ class User {
 
 	/**
 	 * Update the 'You have new messages!' status.
-	 * @param $val bool
+	 * @param $val \bool Whether the user has new messages
 	 */
 	function setNewtalk( $val ) {
 		if( wfReadOnly() ) {
@@ -1439,6 +1589,7 @@ class User {
 	/**
 	 * Generate a current or new-future timestamp to be stored in the
 	 * user_touched field when we update things.
+	 * @return \string Timestamp in TS_MW format
 	 */
 	private static function newTouchedTimestamp() {
 		global $wgClockSkewFudge;
@@ -1453,6 +1604,7 @@ class User {
 	 * Called implicitly from invalidateCache() and saveSettings().
 	 */
 	private function clearSharedCache() {
+		$this->load();
 		if( $this->mId ) {
 			global $wgMemc;
 			$wgMemc->delete( wfMemcKey( 'user', 'id', $this->mId ) );
@@ -1479,13 +1631,25 @@ class User {
 		}
 	}
 
+	/**
+	 * Validate the cache for this account.
+	 * @param $timestamp \string A timestamp in TS_MW format
+	 */
 	function validateCache( $timestamp ) {
 		$this->load();
 		return ($timestamp >= $this->mTouched);
 	}
 
 	/**
-	 * Set the password and reset the random token
+	 * Get the user touched timestamp
+	 */
+	function getTouched() {
+		$this->load();
+		return $this->mTouched;
+	}
+
+	/**
+	 * Set the password and reset the random token.
 	 * Calls through to authentication plugin if necessary;
 	 * will have no effect if the auth plugin refuses to
 	 * pass the change through or if the legal password
@@ -1495,7 +1659,7 @@ class User {
 	 * wipes it, so the account cannot be logged in until
 	 * a new password is set, for instance via e-mail.
 	 *
-	 * @param $str string
+	 * @param $str \string New password to set
 	 * @throws PasswordError on failure
 	 */
 	function setPassword( $str ) {
@@ -1523,10 +1687,9 @@ class User {
 	}
 
 	/**
-	 * Set the password and reset the random token no matter
-	 * what.
+	 * Set the password and reset the random token unconditionally.
 	 *
-	 * @param $str string
+	 * @param $str \string New password to set
 	 */
 	function setInternalPassword( $str ) {
 		$this->load();
@@ -1542,6 +1705,10 @@ class User {
 		$this->mNewpassTime = null;
 	}
 	
+	/**
+	 * Get the user's current token.
+	 * @return \string Token
+	 */
 	function getToken() {
 		$this->load();
 		return $this->mToken;
@@ -1550,6 +1717,8 @@ class User {
 	/**
 	 * Set the random token (used for persistent authentication)
 	 * Called from loadDefaults() among other places.
+	 *
+	 * @param $token \string If specified, set the token to this value
 	 * @private
 	 */
 	function setToken( $token = false ) {
@@ -1568,7 +1737,13 @@ class User {
 			$this->mToken = $token;
 		}
 	}
-
+	
+	/**
+	 * Set the cookie password
+	 *
+	 * @param $str \string New cookie password
+	 * @private
+	 */
 	function setCookiePassword( $str ) {
 		$this->load();
 		$this->mCookiePassword = md5( $str );
@@ -1576,7 +1751,9 @@ class User {
 
 	/**
 	 * Set the password for a password reminder or new account email
-	 * Sets the user_newpass_time field if $throttle is true
+	 *
+	 * @param $str \string New password to set
+	 * @param $throttle \bool If true, reset the throttle timestamp to the present
 	 */
 	function setNewpassword( $str, $throttle = true ) {
 		$this->load();
@@ -1587,8 +1764,9 @@ class User {
 	}
 
 	/**
-	 * Returns true if a password reminder email has already been sent within
-	 * the last $wgPasswordReminderResendTime hours
+	 * Has password reminder email been sent within the last 
+	 * $wgPasswordReminderResendTime hours?
+	 * @return \bool True or false
 	 */
 	function isPasswordReminderThrottled() {
 		global $wgPasswordReminderResendTime;
@@ -1600,38 +1778,62 @@ class User {
 		return time() < $expiry;
 	}
 
+	/**
+	 * Get the user's e-mail address
+	 * @return \string User's email address
+	 */
 	function getEmail() {
 		$this->load();
 		wfRunHooks( 'UserGetEmail', array( $this, &$this->mEmail ) );
 		return $this->mEmail;
 	}
 
+	/**
+	 * Get the timestamp of the user's e-mail authentication
+	 * @return \string TS_MW timestamp
+	 */
 	function getEmailAuthenticationTimestamp() {
 		$this->load();
 		wfRunHooks( 'UserGetEmailAuthenticationTimestamp', array( $this, &$this->mEmailAuthenticated ) );
 		return $this->mEmailAuthenticated;
 	}
 
+	/**
+	 * Set the user's e-mail address
+	 * @param $str \string New e-mail address
+	 */
 	function setEmail( $str ) {
 		$this->load();
 		$this->mEmail = $str;
 		wfRunHooks( 'UserSetEmail', array( $this, &$this->mEmail ) );
 	}
 
+	/**
+	 * Get the user's real name
+	 * @return \string User's real name
+	 */
 	function getRealName() {
 		$this->load();
 		return $this->mRealName;
 	}
 
+	/**
+	 * Set the user's real name
+	 * @param $str \string New real name
+	 */
 	function setRealName( $str ) {
 		$this->load();
 		$this->mRealName = $str;
 	}
 
 	/**
-	 * @param $oname String: the option to check
-	 * @param $defaultOverride String: A default value returned if the option does not exist
-	 * @return string
+	 * Get the user's current setting for a given option.
+	 *
+	 * @param $oname \string The option to check
+	 * @param $defaultOverride \string A default value returned if the option does not exist
+	 * @return \string User's current value for the option
+	 * @see getBoolOption()
+	 * @see getIntOption()
 	 */
 	function getOption( $oname, $defaultOverride = '' ) {
 		$this->load();
@@ -1649,46 +1851,41 @@ class User {
 			return $defaultOverride;
 		}
 	}
-
-	/**
-	 * Get the user's date preference, including some important migration for
-	 * old user rows.
-	 */
-	function getDatePreference() {
-		if ( is_null( $this->mDatePreference ) ) {
-			global $wgLang;
-			$value = $this->getOption( 'date' );
-			$map = $wgLang->getDatePreferenceMigrationMap();
-			if ( isset( $map[$value] ) ) {
-				$value = $map[$value];
-			}
-			$this->mDatePreference = $value;
-		}
-		return $this->mDatePreference;
-	}
-
+	
 	/**
-	 * @param $oname String: the option to check
-	 * @return bool False if the option is not selected, true if it is
+	 * Get the user's current setting for a given option, as a boolean value.
+	 *
+	 * @param $oname \string The option to check
+	 * @return \bool User's current value for the option
+	 * @see getOption()
 	 */
 	function getBoolOption( $oname ) {
 		return (bool)$this->getOption( $oname );
 	}
 
+	
 	/**
-	 * Get an option as an integer value from the source string.
-	 * @param $oname String: the option to check
-	 * @param $default Int: optional value to return if option is unset/blank.
-	 * @return int
+	 * Get the user's current setting for a given option, as a boolean value.
+	 *
+	 * @param $oname \string The option to check
+	 * @param $defaultOverride \int A default value returned if the option does not exist
+	 * @return \int User's current value for the option
+	 * @see getOption()
 	 */
-	function getIntOption( $oname, $default=0 ) {
+	function getIntOption( $oname, $defaultOverride=0 ) {
 		$val = $this->getOption( $oname );
 		if( $val == '' ) {
-			$val = $default;
+			$val = $defaultOverride;
 		}
 		return intval( $val );
 	}
 
+	/**
+	 * Set the given option for a user.
+	 *
+	 * @param $oname \string The option to set
+	 * @param $val \mixed New value to set
+	 */
 	function setOption( $oname, $val ) {
 		$this->load();
 		if ( is_null( $this->mOptions ) ) {
@@ -1713,6 +1910,28 @@ class User {
 		$this->mOptions[$oname] = $val;
 	}
 
+	/**
+	 * Get the user's preferred date format.
+	 * @return \string User's preferred date format
+	 */
+	function getDatePreference() {
+		// Important migration for old data rows
+		if ( is_null( $this->mDatePreference ) ) {
+			global $wgLang;
+			$value = $this->getOption( 'date' );
+			$map = $wgLang->getDatePreferenceMigrationMap();
+			if ( isset( $map[$value] ) ) {
+				$value = $map[$value];
+			}
+			$this->mDatePreference = $value;
+		}
+		return $this->mDatePreference;
+	}
+
+	/**
+	 * Get the permissions this user has.
+	 * @return \type{\arrayof{\string}} Array of permission names
+	 */
 	function getRights() {
 		if ( is_null( $this->mRights ) ) {
 			$this->mRights = self::getGroupPermissions( $this->getEffectiveGroups() );
@@ -1726,7 +1945,7 @@ class User {
 	/**
 	 * Get the list of explicit group memberships this user has.
 	 * The implicit * and user groups are not included.
-	 * @return array of strings
+	 * @return \type{\arrayof{\string}} Array of internal group names
 	 */
 	function getGroups() {
 		$this->load();
@@ -1737,8 +1956,8 @@ class User {
 	 * Get the list of implicit group memberships this user has.
 	 * This includes all explicit groups, plus 'user' if logged in,
 	 * '*' for all accounts and autopromoted groups
-	 * @param $recache Boolean: don't use the cache
-	 * @return array of strings
+	 * @param $recache \bool Whether to avoid the cache
+	 * @return \type{\arrayof{\string}} Array of internal group names
 	 */
 	function getEffectiveGroups( $recache = false ) {
 		if ( $recache || is_null( $this->mEffectiveGroups ) ) {
@@ -1759,7 +1978,10 @@ class User {
 		return $this->mEffectiveGroups;
 	}
 
-	/* Return the edit count for the user. This is where User::edits should have been */
+	/**
+	 * Get the user's edit count.
+	 * @return \int User'e edit count
+	 */
 	function getEditCount() {
 		if ($this->mId) {
 			if ( !isset( $this->mEditCount ) ) {
@@ -1776,7 +1998,7 @@ class User {
 	/**
 	 * Add the user to the given group.
 	 * This takes immediate effect.
-	 * @param $group string
+	 * @param $group \string Name of the group to add
 	 */
 	function addGroup( $group ) {
 		$dbw = wfGetDB( DB_MASTER );
@@ -1800,7 +2022,7 @@ class User {
 	/**
 	 * Remove the user from the given group.
 	 * This takes immediate effect.
-	 * @param $group string
+	 * @param $group \string Name of the group to remove
 	 */
 	function removeGroup( $group ) {
 		$this->load();
@@ -1821,27 +2043,24 @@ class User {
 
 
 	/**
-	 * A more legible check for non-anonymousness.
-	 * Returns true if the user is not an anonymous visitor.
-	 *
-	 * @return bool
+	 * Get whether the user is logged in
+	 * @return \bool True or false
 	 */
 	function isLoggedIn() {
 		return $this->getID() != 0;
 	}
 
 	/**
-	 * A more legible check for anonymousness.
-	 * Returns true if the user is an anonymous visitor.
-	 *
-	 * @return bool
+	 * Get whether the user is anonymous
+	 * @return \bool True or false
 	 */
 	function isAnon() {
 		return !$this->isLoggedIn();
 	}
 
 	/**
-	 * Whether the user is a bot
+	 * Get whether the user is a bot
+	 * @return \bool True or false
 	 * @deprecated
 	 */
 	function isBot() {
@@ -1851,8 +2070,8 @@ class User {
 
 	/**
 	 * Check if user is allowed to access a feature / make an action
-	 * @param $action String: action to be checked
-	 * @return boolean True: action is allowed, False: action should not be allowed
+	 * @param $action \string action to be checked
+	 * @return \bool True if action is allowed, else false
 	 */
 	function isAllowed($action='') {
 		if ( $action === '' )
@@ -1866,7 +2085,7 @@ class User {
 
 	/**
 	* Check whether to enable recent changes patrol features for this user
-	* @return bool
+	* @return \bool True or false
 	*/
 	public function useRCPatrol() {
 		global $wgUseRCPatrol;
@@ -1874,8 +2093,8 @@ class User {
 	}
 
 	/**
-	* Check whether to enable recent changes patrol features for this user
-	* @return bool
+	* Check whether to enable new pages patrol features for this user
+	* @return \bool True or false
 	*/
 	public function useNPPatrol() {
 		global $wgUseRCPatrol, $wgUseNPPatrol;
@@ -1883,31 +2102,34 @@ class User {
 	}
 
 	/**
-	 * Load a skin if it doesn't exist or return it
+	 * Get the current skin, loading it if required
+	 * @return \type{Skin} Current skin
 	 * @todo FIXME : need to check the old failback system [AV]
 	 */
 	function &getSkin() {
-		global $wgRequest;
+		global $wgRequest, $wgAllowUserSkin, $wgDefaultSkin;
 		if ( ! isset( $this->mSkin ) ) {
 			wfProfileIn( __METHOD__ );
 
-			# get the user skin
-			$userSkin = $this->getOption( 'skin' );
-			$userSkin = $wgRequest->getVal('useskin', $userSkin);
-
+			if( $wgAllowUserSkin ) {
+				# get the user skin
+				$userSkin = $this->getOption( 'skin' );
+				$userSkin = $wgRequest->getVal('useskin', $userSkin);
+			} else {
+				# if we're not allowing users to override, then use the default
+				$userSkin = $wgDefaultSkin;
+			}
+			
 			$this->mSkin =& Skin::newFromKey( $userSkin );
 			wfProfileOut( __METHOD__ );
 		}
 		return $this->mSkin;
 	}
 
-	/**#@+
-	 * @param $title Title: article title to look at
-	 */
-
 	/**
-	 * Check watched status of an article
-	 * @return bool True if article is watched
+	 * Check the watched status of an article.
+	 * @param $title \type{Title} Title of the article to look at
+	 * @return \bool True if article is watched
 	 */
 	function isWatched( $title ) {
 		$wl = WatchedItem::fromUserTitle( $this, $title );
@@ -1915,7 +2137,8 @@ class User {
 	}
 
 	/**
-	 * Watch an article
+	 * Watch an article.
+	 * @param $title \type{Title} Title of the article to look at
 	 */
 	function addWatch( $title ) {
 		$wl = WatchedItem::fromUserTitle( $this, $title );
@@ -1924,7 +2147,8 @@ class User {
 	}
 
 	/**
-	 * Stop watching an article
+	 * Stop watching an article.
+	 * @param $title \type{Title} Title of the article to look at
 	 */
 	function removeWatch( $title ) {
 		$wl = WatchedItem::fromUserTitle( $this, $title );
@@ -1936,6 +2160,7 @@ class User {
 	 * Clear the user's notification timestamp for the given title.
 	 * If e-notif e-mails are on, they will receive notification mails on
 	 * the next change of the page if it's watched etc.
+	 * @param $title \type{Title} Title of the article to look at
 	 */
 	function clearNotification( &$title ) {
 		global $wgUser, $wgUseEnotif, $wgShowUpdatedMarker;
@@ -1991,14 +2216,12 @@ class User {
 		}
 	}
 
-	/**#@-*/
-
 	/**
 	 * Resets all of the given user's page-change notification timestamps.
 	 * If e-notif e-mails are on, they will receive notification mails on
 	 * the next change of any watched page.
 	 *
-	 * @param $currentUser Int: user ID number
+	 * @param $currentUser \int User ID
 	 */
 	function clearAllNotifications( $currentUser ) {
 		global $wgUseEnotif, $wgShowUpdatedMarker;
@@ -2021,8 +2244,9 @@ class User {
 	}
 
 	/**
+	 * Encode this user's options as a string
+	 * @return \string Encoded options
 	 * @private
-	 * @return string Encoding options
 	 */
 	function encodeOptions() {
 		$this->load();
@@ -2038,6 +2262,8 @@ class User {
 	}
 
 	/**
+	 * Set this user's options from an encoded string
+	 * @param $str \string Encoded options to import
 	 * @private
 	 */
 	function decodeOptions( $str ) {
@@ -2051,46 +2277,30 @@ class User {
 		}
 	}
 	
+	/**
+	 * Set a cookie on the user's client. Wrapper for 
+	 * WebResponse::setCookie
+	 * @param $name \string Name of the cookie to set
+	 * @param $value \string Value to set
+	 * @param $exp \int Expiration time, as a UNIX time value; 
+	 *                   if 0 or not specified, use the default $wgCookieExpiration
+	 */
 	protected function setCookie( $name, $value, $exp=0 ) {
-		global $wgCookiePrefix,$wgCookieDomain,$wgCookieSecure,$wgCookieExpiration, $wgCookieHttpOnly;
-		if( $exp == 0 ) {
-			$exp = time() + $wgCookieExpiration;
-		}
-		$httpOnlySafe = wfHttpOnlySafe();
-		wfDebugLog( 'cookie',
-			'setcookie: "' . implode( '", "',
-				array(
-					$wgCookiePrefix . $name,
-					$value,
-					$exp,
-					'/',
-					$wgCookieDomain,
-					$wgCookieSecure,
-					$httpOnlySafe && $wgCookieHttpOnly ) ) . '"' );
-		if( $httpOnlySafe && isset( $wgCookieHttpOnly ) ) {
-			setcookie( $wgCookiePrefix . $name,
-				$value,
-				$exp,
-				'/',
-				$wgCookieDomain,
-				$wgCookieSecure,
-				$wgCookieHttpOnly );
-		} else {
-			// setcookie() fails on PHP 5.1 if you give it future-compat paramters.
-			// stab stab!
-			setcookie( $wgCookiePrefix . $name,
-				$value,
-				$exp,
-				'/',
-				$wgCookieDomain,
-				$wgCookieSecure );
-		}
+		global $wgRequest;
+		$wgRequest->response()->setcookie( $name, $value, $exp );
 	}
 	
+	/**
+	 * Clear a cookie on the user's client
+	 * @param $name \string Name of the cookie to clear
+	 */
 	protected function clearCookie( $name ) {
 		$this->setCookie( $name, '', time() - 86400 );
 	}
 
+	/**
+	 * Set the default cookies for this session on the user's client.
+	 */
 	function setCookies() {
 		$this->load();
 		if ( 0 == $this->mId ) return;
@@ -2110,7 +2320,10 @@ class User {
 		}
 		
 		wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) );
-		$_SESSION = $session + $_SESSION;
+		#check for null, since the hook could cause a null value 
+		if ( !is_null( $session ) && isset( $_SESSION ) ){
+			$_SESSION = $session + $_SESSION;
+		}
 		foreach ( $cookies as $name => $value ) {
 			if ( $value === false ) {
 				$this->clearCookie( $name );
@@ -2121,7 +2334,7 @@ class User {
 	}
 
 	/**
-	 * Logout user.
+	 * Log this user out.
 	 */
 	function logout() {
 		global $wgUser;
@@ -2131,8 +2344,9 @@ class User {
 	}
 
 	/**
-	 * Really logout user
-	 * Clears the cookies and session, resets the instance cache
+	 * Clear the user's cookies and session, and reset the instance cache.
+	 * @private
+	 * @see logout()
 	 */
 	function doLogout() {
 		$this->clearInstanceCache( 'defaults' );
@@ -2147,7 +2361,7 @@ class User {
 	}
 
 	/**
-	 * Save object settings into database
+	 * Save this user's settings into the database.
 	 * @todo Only rarely do all these fields need to be set!
 	 */
 	function saveSettings() {
@@ -2178,10 +2392,11 @@ class User {
 		);
 		wfRunHooks( 'UserSaveSettings', array( $this ) );
 		$this->clearSharedCache();
+		$this->getUserPage()->invalidateCache();
 	}
 
 	/**
-	 * Checks if a user with the given name exists, returns the ID.
+	 * If only this user's username is known, and it exists, return the user ID.
 	 */
 	function idForName() {
 		$s = trim( $this->getName() );
@@ -2198,18 +2413,18 @@ class User {
 	/**
 	 * Add a user to the database, return the user object
 	 *
-	 * @param $name String: the user's name
-	 * @param $params Associative array of non-default parameters to save to the database:
-	 *     password             The user's password. Password logins will be disabled if this is omitted.
-	 *     newpassword          A temporary password mailed to the user
-	 *     email                The user's email address
-	 *     email_authenticated  The email authentication timestamp
-	 *     real_name            The user's real name
-	 *     options              An associative array of non-default options
-	 *     token                Random authentication token. Do not set.
-	 *     registration         Registration timestamp. Do not set.
+	 * @param $name \string Username to add
+	 * @param $params \type{\arrayof{\string}} Non-default parameters to save to the database:
+	 *   - password             The user's password. Password logins will be disabled if this is omitted.
+	 *   - newpassword          A temporary password mailed to the user
+	 *   - email                The user's email address
+	 *   - email_authenticated  The email authentication timestamp
+	 *   - real_name            The user's real name
+	 *   - options              An associative array of non-default options
+	 *   - token                Random authentication token. Do not set.
+	 *   - registration         Registration timestamp. Do not set.
 	 *
-	 * @return User object, or null if the username already exists
+	 * @return \type{User} A new User object, or null if the username already exists
 	 */
 	static function createNew( $name, $params = array() ) {
 		$user = new User;
@@ -2247,7 +2462,7 @@ class User {
 	}
 
 	/**
-	 * Add an existing user object to the database
+	 * Add this existing user object to the database
 	 */
 	function addToDatabase() {
 		$this->load();
@@ -2271,13 +2486,13 @@ class User {
 		);
 		$this->mId = $dbw->insertId();
 
-		# Clear instance cache other than user table data, which is already accurate
+		// Clear instance cache other than user table data, which is already accurate
 		$this->clearInstanceCache();
 	}
 
 	/**
-	 * If the (non-anonymous) user is blocked, this function will block any IP address
-	 * that they successfully log on from.
+	 * If this (non-anonymous) user is blocked, block any IP address
+	 * they've successfully logged in from.
 	 */
 	function spreadBlock() {
 		wfDebug( __METHOD__."()\n" );
@@ -2306,10 +2521,10 @@ class User {
 	 * which will give them a chance to modify this key based on their own
 	 * settings.
 	 *
-	 * @return string
+	 * @return \string Page rendering hash
 	 */
 	function getPageRenderingHash() {
-		global $wgContLang, $wgUseDynamicDates, $wgLang;
+		global $wgUseDynamicDates, $wgRenderHashAppend, $wgLang, $wgContLang;
 		if( $this->mHash ){
 			return $this->mHash;
 		}
@@ -2329,6 +2544,8 @@ class User {
 		$extra = $wgContLang->getExtraHashOptions();
 		$confstr .= $extra;
 
+		$confstr .= $wgRenderHashAppend;
+
 		// Give a chance for extensions to modify the hash, if they have
 		// extra options or other effects on the parser cache.
 		wfRunHooks( 'PageRenderingHash', array( &$confstr ) );
@@ -2339,21 +2556,28 @@ class User {
 		return $confstr;
 	}
 
+	/**
+	 * Get whether the user is explicitly blocked from account creation.
+	 * @return \bool True if blocked
+	 */
 	function isBlockedFromCreateAccount() {
 		$this->getBlockedStatus();
 		return $this->mBlock && $this->mBlock->mCreateAccount;
 	}
 
 	/**
-	 * Determine if the user is blocked from using Special:Emailuser.
-	 *
-	 * @return boolean
+	 * Get whether the user is blocked from using Special:Emailuser.
+	 * @return \bool True if blocked
 	 */
 	function isBlockedFromEmailuser() {
 		$this->getBlockedStatus();
 		return $this->mBlock && $this->mBlock->mBlockEmail;
 	}
 
+	/**
+	 * Get whether the user is allowed to create an account.
+	 * @return \bool True if allowed
+	 */
 	function isAllowedToCreateAccount() {
 		return $this->isAllowed( 'createaccount' ) && !$this->isBlockedFromCreateAccount();
 	}
@@ -2368,7 +2592,7 @@ class User {
 	/**
 	 * Get this user's personal page title.
 	 *
-	 * @return Title
+	 * @return \type{Title} User's personal page title
 	 */
 	function getUserPage() {
 		return Title::makeTitle( NS_USER, $this->getName() );
@@ -2377,7 +2601,7 @@ class User {
 	/**
 	 * Get this user's talk page title.
 	 *
-	 * @return Title
+	 * @return \type{Title} User's talk page title
 	 */
 	function getTalkPage() {
 		$title = $this->getUserPage();
@@ -2385,6 +2609,8 @@ class User {
 	}
 
 	/**
+	 * Get the maximum valid user ID.
+	 * @return \int User ID
 	 * @static
 	 */
 	function getMaxID() {
@@ -2401,7 +2627,7 @@ class User {
 	/**
 	 * Determine whether the user is a newbie. Newbies are either
 	 * anonymous IPs, or the most recently created accounts.
-	 * @return bool True if it is a newbie.
+	 * @return \bool True if the user is a newbie
 	 */
 	function isNewbie() {
 		return !$this->isAllowed( 'autoconfirmed' );
@@ -2411,7 +2637,7 @@ class User {
 	 * Is the user active? We check to see if they've made at least
 	 * X number of edits in the last Y days.
 	 * 
-	 * @return bool true if the user is active, false if not
+	 * @return \bool True if the user is active, false if not.
 	 */
 	public function isActiveEditor() {
 		global $wgActiveUserEditCount, $wgActiveUserDays;
@@ -2435,8 +2661,8 @@ class User {
 
 	/**
 	 * Check to see if the given clear-text password is one of the accepted passwords
-	 * @param $password String: user password.
-	 * @return bool True if the given password is correct otherwise False.
+	 * @param $password \string user password.
+	 * @return \bool True if the given password is correct, otherwise False.
 	 */
 	function checkPassword( $password ) {
 		global $wgAuth;
@@ -2476,7 +2702,7 @@ class User {
 	/**
 	 * Check if the given clear-text password matches the temporary password
 	 * sent by e-mail for password reset operations.
-	 * @return bool
+	 * @return \bool True if matches, false otherwise
 	 */
 	function checkTemporaryPassword( $plaintext ) {
 		return self::comparePasswords( $this->mNewpassword, $plaintext, $this->getId() );
@@ -2488,9 +2714,8 @@ class User {
 	 * login credentials aren't being hijacked with a foreign form
 	 * submission.
 	 *
-	 * @param $salt Mixed: optional function-specific data for hash.
-	 *                     Use a string or an array of strings.
-	 * @return string
+	 * @param $salt \types{\string,\arrayof{\string}} Optional function-specific data for hashing
+	 * @return \string The new edit token
 	 */
 	function editToken( $salt = '' ) {
 		if ( $this->isAnon() ) {
@@ -2510,9 +2735,10 @@ class User {
 	}
 
 	/**
-	 * Generate a hex-y looking random token for various uses.
-	 * Could be made more cryptographically sure if someone cares.
-	 * @return string
+	 * Generate a looking random token for various uses.
+	 *
+	 * @param $salt \string Optional salt value
+	 * @return \string The new random token
 	 */
 	function generateToken( $salt = '' ) {
 		$token = dechex( mt_rand() ) . dechex( mt_rand() );
@@ -2525,9 +2751,9 @@ class User {
 	 * user's own login session, not a form submission from a third-party
 	 * site.
 	 *
-	 * @param $val String: the input value to compare
-	 * @param $salt String: optional function-specific data for hash
-	 * @return bool
+	 * @param $val \string Input value to compare
+	 * @param $salt \string Optional function-specific data for hashing
+	 * @return \bool Whether the token matches
 	 */
 	function matchEditToken( $val, $salt = '' ) {
 		$sessionToken = $this->editToken( $salt );
@@ -2538,7 +2764,12 @@ class User {
 	}
 
 	/**
-	 * Check whether the edit token is fine except for the suffix
+	 * Check given value against the token value stored in the session,
+	 * ignoring the suffix.
+	 *
+	 * @param $val \string Input value to compare
+	 * @param $salt \string Optional function-specific data for hashing
+	 * @return \bool Whether the token matches
 	 */
 	function matchEditTokenNoSuffix( $val, $salt = '' ) {
 		$sessionToken = $this->editToken( $salt );
@@ -2549,10 +2780,7 @@ class User {
 	 * Generate a new e-mail confirmation token and send a confirmation/invalidation
 	 * mail to the user's given address.
 	 *
-	 * Calls saveSettings() internally; as it has side effects, not committing changes
-	 * would be pretty silly.
-	 *
-	 * @return mixed True on success, a WikiError object on failure.
+	 * @return \types{\bool,\type{WikiError}} True on success, a WikiError object on failure.
 	 */
 	function sendConfirmationMail() {
 		global $wgLang;
@@ -2575,11 +2803,11 @@ class User {
 	 * Send an e-mail to this user's account. Does not check for
 	 * confirmed status or validity.
 	 *
-	 * @param $subject string
-	 * @param $body string
-	 * @param $from string: optional from address; default $wgPasswordSender will be used otherwise.
-	 * @param $replyto string
-	 * @return mixed True on success, a WikiError object on failure.
+	 * @param $subject \string Message subject
+	 * @param $body \string Message body
+	 * @param $from \string Optional From address; if unspecified, default $wgPasswordSender will be used
+	 * @param $replyto \string Reply-To address
+	 * @return \types{\bool,\type{WikiError}} True on success, a WikiError object on failure
 	 */
 	function sendMail( $subject, $body, $from = null, $replyto = null ) {
 		if( is_null( $from ) ) {
@@ -2594,13 +2822,13 @@ class User {
 
 	/**
 	 * Generate, store, and return a new e-mail confirmation code.
-	 * A hash (unsalted since it's used as a key) is stored.
+	 * A hash (unsalted, since it's used as a key) is stored.
 	 *
-	 * Call saveSettings() after calling this function to commit
+	 * @note Call saveSettings() after calling this function to commit
 	 * this change to the database.
 	 *
-	 * @param &$expiration mixed output: accepts the expiration time
-	 * @return string
+	 * @param[out] &$expiration \mixed Accepts the expiration time
+	 * @return \string New token
 	 * @private
 	 */
 	function confirmationToken( &$expiration ) {
@@ -2617,8 +2845,8 @@ class User {
 
 	/**
 	* Return a URL the user can use to confirm their email address.
-	 * @param $token accepts the email confirmation token
-	 * @return string
+	 * @param $token \string Accepts the email confirmation token
+	 * @return \string New token URL
 	 * @private
 	 */
 	function confirmationTokenUrl( $token ) {
@@ -2626,8 +2854,8 @@ class User {
 	}
 	/**
 	 * Return a URL the user can use to invalidate their email address.
-	 * @param $token accepts the email confirmation token
-	 * @return string
+	 * @param $token \string Accepts the email confirmation token
+	 * @return \string New token URL
 	 * @private
 	 */
 	function invalidationTokenUrl( $token ) {
@@ -2639,10 +2867,14 @@ class User {
 	 * This uses $wgArticlePath directly as a quickie hack to use the
 	 * hardcoded English names of the Special: pages, for ASCII safety.
 	 *
-	 * Since these URLs get dropped directly into emails, using the
+	 * @note Since these URLs get dropped directly into emails, using the
 	 * short English names avoids insanely long URL-encoded links, which
 	 * also sometimes can get corrupted in some browsers/mailers
 	 * (bug 6957 with Gmail and Internet Explorer).
+	 *
+	 * @param $page \string Special page
+	 * @param $token \string Token
+	 * @return \string Formatted URL
 	 */
 	protected function getTokenUrl( $page, $token ) {
 		global $wgArticlePath;
@@ -2656,7 +2888,7 @@ class User {
 	/**
 	 * Mark the e-mail address confirmed.
 	 *
-	 * Call saveSettings() after calling this function to commit the change.
+	 * @note Call saveSettings() after calling this function to commit the change.
 	 */
 	function confirmEmail() {
 		$this->setEmailAuthenticationTimestamp( wfTimestampNow() );
@@ -2664,10 +2896,10 @@ class User {
 	}
 
 	/**
-	 * Invalidate the user's email confirmation, unauthenticate the email
-	 * if it was already confirmed.
+	 * Invalidate the user's e-mail confirmation, and unauthenticate the e-mail
+	 * address if it was already confirmed.
 	 *
-	 * Call saveSettings() after calling this function to commit the change.
+	 * @note Call saveSettings() after calling this function to commit the change.
 	 */
 	function invalidateEmail() {
 		$this->load();
@@ -2677,6 +2909,10 @@ class User {
 		return true;
 	}
 
+	/**
+	 * Set the e-mail authentication timestamp.
+	 * @param $timestamp \string TS_MW timestamp
+	 */
 	function setEmailAuthenticationTimestamp( $timestamp ) {
 		$this->load();
 		$this->mEmailAuthenticated = $timestamp;
@@ -2686,9 +2922,13 @@ class User {
 	/**
 	 * Is this user allowed to send e-mails within limits of current
 	 * site configuration?
-	 * @return bool
+	 * @return \bool True if allowed
 	 */
 	function canSendEmail() {
+		global $wgEnableEmail, $wgEnableUserEmail;
+		if( !$wgEnableEmail || !$wgEnableUserEmail ) {
+			return false;
+		}
 		$canSend = $this->isEmailConfirmed();
 		wfRunHooks( 'UserCanSendEmail', array( &$this, &$canSend ) );
 		return $canSend;
@@ -2697,7 +2937,7 @@ class User {
 	/**
 	 * Is this user allowed to receive e-mails within limits of current
 	 * site configuration?
-	 * @return bool
+	 * @return \bool True if allowed
 	 */
 	function canReceiveEmail() {
 		return $this->isEmailConfirmed() && !$this->getOption( 'disablemail' );
@@ -2707,11 +2947,11 @@ class User {
 	 * Is this user's e-mail address valid-looking and confirmed within
 	 * limits of the current site configuration?
 	 *
-	 * If $wgEmailAuthentication is on, this may require the user to have
+	 * @note If $wgEmailAuthentication is on, this may require the user to have
 	 * confirmed their address by returning a code or using a password
 	 * sent to the address from the wiki.
 	 *
-	 * @return bool
+	 * @return \bool True if confirmed
 	 */
 	function isEmailConfirmed() {
 		global $wgEmailAuthentication;
@@ -2731,8 +2971,8 @@ class User {
 	}
 
 	/**
-	 * Return true if there is an outstanding request for e-mail confirmation.
-	 * @return bool
+	 * Check whether there is an outstanding request for e-mail confirmation.
+	 * @return \bool True if pending
 	 */
 	function isEmailConfirmationPending() {
 		global $wgEmailAuthentication;
@@ -2743,20 +2983,40 @@ class User {
 	}
 
 	/**
-	 * Get the timestamp of account creation, or false for
-	 * non-existent/anonymous user accounts
+	 * Get the timestamp of account creation.
 	 *
-	 * @return mixed
+	 * @return \types{\string,\bool} string Timestamp of account creation, or false for
+	 *                                non-existent/anonymous user accounts.
 	 */
 	public function getRegistration() {
-		return $this->mId > 0
+		return $this->getId() > 0
 			? $this->mRegistration
 			: false;
 	}
+	
+	/**
+	 * Get the timestamp of the first edit
+	 *
+	 * @return \types{\string,\bool} string Timestamp of first edit, or false for
+	 *                                non-existent/anonymous user accounts.
+	 */
+	public function getFirstEditTimestamp() {
+		if( $this->getId() == 0 ) return false; // anons
+		$dbr = wfGetDB( DB_SLAVE );
+		$time = $dbr->selectField( 'revision', 'rev_timestamp',
+			array( 'rev_user' => $this->getId() ),
+			__METHOD__,
+			array( 'ORDER BY' => 'rev_timestamp ASC' )
+		);
+		if( !$time ) return false; // no edits
+		return wfTimestamp( TS_MW, $time );
+	}	
 
 	/**
-	 * @param $groups Array: list of groups
-	 * @return array list of permission key names for given groups combined
+	 * Get the permissions associated with a given list of groups
+	 *
+	 * @param $groups \type{\arrayof{\string}} List of internal group names
+	 * @return \type{\arrayof{\string}} List of permission key names for given groups combined
 	 */
 	static function getGroupPermissions( $groups ) {
 		global $wgGroupPermissions;
@@ -2764,15 +3024,35 @@ class User {
 		foreach( $groups as $group ) {
 			if( isset( $wgGroupPermissions[$group] ) ) {
 				$rights = array_merge( $rights,
+					// array_filter removes empty items
 					array_keys( array_filter( $wgGroupPermissions[$group] ) ) );
 			}
 		}
-		return $rights;
+		return array_unique($rights);
+	}
+	
+	/**
+	 * Get all the groups who have a given permission
+	 * 
+	 * @param $role \string Role to check
+	 * @return \type{\arrayof{\string}} List of internal group names with the given permission
+	 */
+	static function getGroupsWithPermission( $role ) {
+		global $wgGroupPermissions;
+		$allowedGroups = array();
+		foreach ( $wgGroupPermissions as $group => $rights ) {
+			if ( isset( $rights[$role] ) && $rights[$role] ) {
+				$allowedGroups[] = $group;
+			}
+		}
+		return $allowedGroups;
 	}
 
 	/**
-	 * @param $group String: key name
-	 * @return string localized descriptive name for group, if provided
+	 * Get the localized descriptive name for a group, if it exists
+	 *
+	 * @param $group \string Internal group name
+	 * @return \string Localized descriptive group name
 	 */
 	static function getGroupName( $group ) {
 		global $wgMessageCache;
@@ -2785,8 +3065,10 @@ class User {
 	}
 
 	/**
-	 * @param $group String: key name
-	 * @return string localized descriptive name for member of a group, if provided
+	 * Get the localized descriptive name for a member of a group, if it exists
+	 *
+	 * @param $group \string Internal group name
+	 * @return \string Localized name for group member
 	 */
 	static function getGroupMember( $group ) {
 		global $wgMessageCache;
@@ -2801,9 +3083,8 @@ class User {
 	/**
 	 * Return the set of defined explicit groups.
 	 * The implicit groups (by default *, 'user' and 'autoconfirmed')
-	 * are not included, as they are defined automatically,
-	 * not in the database.
-	 * @return array
+	 * are not included, as they are defined automatically, not in the database.
+	 * @return \type{\arrayof{\string}} Array of internal group names
 	 */
 	static function getAllGroups() {
 		global $wgGroupPermissions;
@@ -2814,7 +3095,8 @@ class User {
 	}
 
 	/**
-	 * Get a list of all available permissions
+	 * Get a list of all available permissions.
+	 * @return \type{\arrayof{\string}} Array of permission names
 	 */
 	static function getAllRights() {
 		if ( self::$mAllRights === false ) {
@@ -2831,8 +3113,7 @@ class User {
 
 	/**
 	 * Get a list of implicit groups
-	 *
-	 * @return array
+	 * @return \type{\arrayof{\string}} Array of internal group names
 	 */
 	public static function getImplicitGroups() {
 		global $wgImplicitGroups;
@@ -2844,8 +3125,8 @@ class User {
 	/**
 	 * Get the title of a page describing a particular group
 	 *
-	 * @param $group Name of the group
-	 * @return mixed
+	 * @param $group \string Internal group name
+	 * @return \types{\type{Title},\bool} Title of the page if it exists, false otherwise
 	 */
 	static function getGroupPage( $group ) {
 		global $wgMessageCache;
@@ -2860,11 +3141,12 @@ class User {
 	}
 
 	/**
-	 * Create a link to the group in HTML, if available
+	 * Create a link to the group in HTML, if available; 
+	 * else return the group name.
 	 *
-	 * @param $group Name of the group
-	 * @param $text The text of the link
-	 * @return mixed
+	 * @param $group \string Internal name of the group
+	 * @param $text \string The text of the link
+	 * @return \string HTML link to the group
 	 */
 	static function makeGroupLinkHTML( $group, $text = '' ) {
 		if( $text == '' ) {
@@ -2881,11 +3163,12 @@ class User {
 	}
 
 	/**
-	 * Create a link to the group in Wikitext, if available
+	 * Create a link to the group in Wikitext, if available; 
+	 * else return the group name.
 	 *
-	 * @param $group Name of the group
-	 * @param $text The text of the link (by default, the name of the group)
-	 * @return mixed
+	 * @param $group \string Internal name of the group
+	 * @param $text \string The text of the link
+	 * @return \string Wikilink to the group
 	 */
 	static function makeGroupLinkWiki( $group, $text = '' ) {
 		if( $text == '' ) {
@@ -2944,6 +3227,12 @@ class User {
 		$this->invalidateCache();
 	}
 	
+	/**
+	 * Get the description of a given right
+	 *
+	 * @param $right \string Right to query
+	 * @return \string Localized description of the right
+	 */
 	static function getRightDescription( $right ) {
 		global $wgMessageCache;
 		$wgMessageCache->loadAllMessages();
@@ -2957,8 +3246,9 @@ class User {
 	/**
 	 * Make an old-style password hash
 	 *
-	 * @param $password String: plain-text password
-	 * @param $userId String: user ID
+	 * @param $password \string Plain-text password
+	 * @param $userId \string User ID
+	 * @return \string Password hash
 	 */
 	static function oldCrypt( $password, $userId ) {
 		global $wgPasswordSalt;
@@ -2972,19 +3262,26 @@ class User {
 	/**
 	 * Make a new-style password hash
 	 *
-	 * @param $password String: plain-text password
-	 * @param $salt String: salt, may be random or the user ID. False to generate a salt.
+	 * @param $password \string Plain-text password
+	 * @param $salt \string Optional salt, may be random or the user ID. 
+	 *                     If unspecified or false, will generate one automatically
+	 * @return \string Password hash
 	 */
 	static function crypt( $password, $salt = false ) {
 		global $wgPasswordSalt;
 
-		if($wgPasswordSalt) {
+		$hash = '';
+		if( !wfRunHooks( 'UserCryptPassword', array( &$password, &$salt, &$wgPasswordSalt, &$hash ) ) ) {
+			return $hash;
+		}
+		
+		if( $wgPasswordSalt ) {
 			if ( $salt === false ) {
 				$salt = substr( wfGenerateToken(), 0, 8 );
 			}
 			return ':B:' . $salt . ':' . md5( $salt . '-' . md5( $password ) );
 		} else {
-			return ':A:' . md5( $password);
+			return ':A:' . md5( $password );
 		}
 	}
 
@@ -2992,13 +3289,20 @@ class User {
 	 * Compare a password hash with a plain-text password. Requires the user
 	 * ID if there's a chance that the hash is an old-style hash.
 	 *
-	 * @param $hash String: password hash
-	 * @param $password String: plain-text password to compare
-	 * @param $userId String: user ID for old-style password salt
+	 * @param $hash \string Password hash
+	 * @param $password \string Plain-text password to compare
+	 * @param $userId \string User ID for old-style password salt
+	 * @return \bool
 	 */
 	static function comparePasswords( $hash, $password, $userId = false ) {
 		$m = false;
 		$type = substr( $hash, 0, 3 );
+		
+		$result = false;
+		if( !wfRunHooks( 'UserComparePasswords', array( &$hash, &$password, &$userId, &$result ) ) ) {
+			return $result;
+		}
+		
 		if ( $type == ':A:' ) {
 			# Unsalted
 			return md5( $password ) === substr( $hash, 3 );
@@ -3011,4 +3315,41 @@ class User {
 			return self::oldCrypt( $password, $userId ) === $hash;
 		}
 	}
+	
+	/**
+	 * Add a newuser log entry for this user
+	 * @param $byEmail Boolean: account made by email?
+	 */
+	public function addNewUserLogEntry( $byEmail = false ) {
+		global $wgUser, $wgContLang, $wgNewUserLog;
+		if( empty($wgNewUserLog) ) {
+			return true; // disabled
+		}
+		$talk = $wgContLang->getFormattedNsText( NS_TALK );
+		if( $this->getName() == $wgUser->getName() ) {
+			$action = 'create';
+			$message = '';
+		} else {
+			$action = 'create2';
+			$message = $byEmail ? wfMsgForContent( 'newuserlog-byemail' ) : '';
+		}
+		$log = new LogPage( 'newusers' );
+		$log->addEntry( $action, $this->getUserPage(), $message, array( $this->getId() ) );
+		return true;
+	}
+
+	/**
+	 * Add an autocreate newuser log entry for this user
+	 * Used by things like CentralAuth and perhaps other authplugins.
+	 */
+	public function addNewUserLogEntryAutoCreate() {
+		global $wgNewUserLog;
+		if( empty($wgNewUserLog) ) {
+			return true; // disabled
+		}
+		$log = new LogPage( 'newusers', false );
+		$log->addEntry( 'autocreate', $this->getUserPage(), '', array( $this->getId() ) );
+		return true;
+	}
+
 }
diff --git a/includes/UserArray.php b/includes/UserArray.php
index 27847e6f..a2f54b7f 100644
--- a/includes/UserArray.php
+++ b/includes/UserArray.php
@@ -36,6 +36,10 @@ class UserArrayFromResult extends UserArray {
 		}
 	}
 
+	public function count() {
+		return $this->res->numRows();
+	}
+
 	function current() {
 		return $this->current;
 	}
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0bc4268f..ab1a740b 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -32,13 +32,15 @@ class MailAddress {
 	 * @param $address Mixed: string with an email address, or a User object
 	 * @param $name String: human-readable name if a string address is given
 	 */
-	function __construct( $address, $name=null ) {
+	function __construct( $address, $name = null, $realName = null ) {
 		if( is_object( $address ) && $address instanceof User ) {
 			$this->address = $address->getEmail();
 			$this->name = $address->getName();
+			$this->realName = $address->getRealName();
 		} else {
 			$this->address = strval( $address );
 			$this->name = strval( $name );
+			$this->reaName = strval( $realName );
 		}
 	}
 
@@ -51,7 +53,9 @@ class MailAddress {
 		# can't handle "Joe Bloggs <joe@bloggs.com>" format email addresses,
 		# so don't bother generating them
 		if( $this->name != '' && !wfIsWindows() ) {
-			$quoted = wfQuotedPrintable( $this->name );
+			global $wgEnotifUseRealName;
+			$name = ( $wgEnotifUseRealName && $this->realName ) ? $this->realName : $this->name;
+			$quoted = wfQuotedPrintable( $name );
 			if( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) {
 				$quoted = '"' . $quoted . '"';
 			}
@@ -98,9 +102,10 @@ class UserMailer {
 	 * @param $subject String: email's subject.
 	 * @param $body String: email's text.
 	 * @param $replyto String: optional reply-to email (default: null).
+	 * @param $contentType String: optional custom Content-Type
 	 * @return mixed True on success, a WikiError object on failure.
 	 */
-	static function send( $to, $from, $subject, $body, $replyto=null ) {
+	static function send( $to, $from, $subject, $body, $replyto=null, $contentType=null ) {
 		global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
 		global $wgEnotifMaxRecips;
 
@@ -139,7 +144,8 @@ class UserMailer {
 			$headers['Subject'] = wfQuotedPrintable( $subject );
 			$headers['Date'] = date( 'r' );
 			$headers['MIME-Version'] = '1.0';
-			$headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
+			$headers['Content-type'] = (is_null($contentType) ?
+					'text/plain; charset='.$wgOutputEncoding : $contentType);
 			$headers['Content-transfer-encoding'] = '8bit';
 			$headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
 			$headers['X-Mailer'] = 'MediaWiki mailer';
@@ -170,9 +176,11 @@ class UserMailer {
 			} else {
 				$endl = "\n";
 			}
+			$ctype = (is_null($contentType) ? 
+					'text/plain; charset='.$wgOutputEncoding : $contentType);
 			$headers =
 				"MIME-Version: 1.0$endl" .
-				"Content-type: text/plain; charset={$wgOutputEncoding}$endl" .
+				"Content-type: $ctype$endl" .
 				"Content-Transfer-Encoding: 8bit$endl" .
 				"X-Mailer: MediaWiki mailer$endl".
 				'From: ' . $from->toString();
@@ -255,14 +263,9 @@ class UserMailer {
  *
  */
 class EmailNotification {
-	/**@{{
-	 * @private
-	 */
-	var $to, $subject, $body, $replyto, $from;
-	var $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
-	var $mailTargets = array();
-
-	/**@}}*/
+	private $to, $subject, $body, $replyto, $from;
+	private $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
+	private $mailTargets = array();
 
 	/**
 	 * Send emails corresponding to the user $editor editing the page $title.
@@ -339,7 +342,7 @@ class EmailNotification {
 
 		$userTalkId = false;
 
-		if ( (!$minorEdit || $wgEnotifMinorEdits) ) {
+		if ( !$minorEdit || ($wgEnotifMinorEdits && !$editor->isAllowed('nominornewtalk') ) ) {
 			if ( $wgEnotifUserTalk && $isUserTalkPage ) {
 				$targetUser = User::newFromName( $title->getText() );
 				if ( !$targetUser || $targetUser->isAnon() ) {
@@ -347,9 +350,13 @@ class EmailNotification {
 				} elseif ( $targetUser->getId() == $editor->getId() ) {
 					wfDebug( __METHOD__.": user edited their own talk page, no notification sent\n" );
 				} elseif( $targetUser->getOption( 'enotifusertalkpages' ) ) {
-					wfDebug( __METHOD__.": sending talk page update notification\n" );
-					$this->compose( $targetUser );
-					$userTalkId = $targetUser->getId();
+					if( $targetUser->isEmailConfirmed() ) {
+						wfDebug( __METHOD__.": sending talk page update notification\n" );
+						$this->compose( $targetUser );
+						$userTalkId = $targetUser->getId();
+					} else {
+						wfDebug( __METHOD__.": talk page owner doesn't have validated email\n" );
+					}
 				} else {
 					wfDebug( __METHOD__.": talk page owner doesn't want notifications\n" );
 				}
@@ -396,7 +403,9 @@ class EmailNotification {
 
 		$this->sendMails();
 
-		if ( $wgShowUpdatedMarker || $wgEnotifWatchlist ) {
+		$latestTimestamp = Revision::getTimestampFromId( $title, $title->getLatestRevID() );
+		// Do not update watchlists if something else already did.
+		if ( $timestamp >= $latestTimestamp && ($wgShowUpdatedMarker || $wgEnotifWatchlist) ) {
 			# Mark the changed watch-listed page with a timestamp, so that the page is
 			# listed with an "updated since your last visit" icon in the watch list. Do
 			# not do this to users for their own edits.
@@ -422,7 +431,7 @@ class EmailNotification {
 	function composeCommonMailtext() {
 		global $wgPasswordSender, $wgNoReplyAddress;
 		global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
-		global $wgEnotifImpersonal;
+		global $wgEnotifImpersonal, $wgEnotifUseRealName;
 
 		$this->composed_common = true;
 
@@ -439,9 +448,6 @@ class EmailNotification {
 		$replyto = ''; /* fail safe */
 		$keys    = array();
 
-		# regarding the use of oldid as an indicator for the last visited version, see also
-		# http://bugzilla.wikipeda.org/show_bug.cgi?id=603 "Delete + undelete cycle doesn't preserve old_id"
-		# However, in the case of a new page which is already watched, we have no previous version to compare
 		if( $this->oldid ) {
 			$difflink = $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid );
 			$keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink );
@@ -476,7 +482,7 @@ class EmailNotification {
 		# the user has not opted-out and the option is enabled at the
 		# global configuration level.
 		$editor = $this->editor;
-		$name    = $editor->getName();
+		$name    = $wgEnotifUseRealName ? $editor->getRealName() : $editor->getName();
 		$adminAddress = new MailAddress( $wgPasswordSender, 'WikiAdmin' );
 		$editorAddress = new MailAddress( $editor );
 		if( $wgEnotifRevealEditorAddress
@@ -557,12 +563,13 @@ class EmailNotification {
 	 * @private
 	 */
 	function sendPersonalised( $watchingUser ) {
-		global $wgLang;
+		global $wgLang, $wgEnotifUseRealName;
 		// From the PHP manual:
 		//     Note:  The to parameter cannot be an address in the form of "Something <someone@example.com>".
 		//     The mail command will not parse this properly while talking with the MTA.
 		$to = new MailAddress( $watchingUser );
-		$body = str_replace( '$WATCHINGUSERNAME', $watchingUser->getName() , $this->body );
+		$name = $wgEnotifUseRealName ? $watchingUser->getRealName() : $watchingUser->getName();
+		$body = str_replace( '$WATCHINGUSERNAME', $name , $this->body );
 
 		$timecorrection = $watchingUser->getOption( 'timecorrection' );
 
diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 23fc6a74..2d2d34f1 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -8,22 +8,23 @@
  * @ingroup Watchlist
  */
 class WatchedItem {
-	var $mTitle, $mUser;
+	var $mTitle, $mUser, $id, $ns, $ti;
 
 	/**
 	 * Create a WatchedItem object with the given user and title
-	 * @todo document
-	 * @access private
+	 * @param $user User: the user to use for (un)watching
+	 * @param $title Title: the title we're going to (un)watch
+	 * @return WatchedItem object
 	 */
-	static function fromUserTitle( $user, $title ) {
+	public static function fromUserTitle( $user, $title ) {
 		$wl = new WatchedItem;
 		$wl->mUser = $user;
 		$wl->mTitle = $title;
 		$wl->id = $user->getId();
-# Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004
-# TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
-# The change results in talk-pages not automatically included in watchlists, when their parent page is included
-#		$wl->ns = $title->getNamespace() & ~1;
+		# Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004
+		# TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
+		# The change results in talk-pages not automatically included in watchlists, when their parent page is included
+		# $wl->ns = $title->getNamespace() & ~1;
 		$wl->ns = $title->getNamespace();
 
 		$wl->ti = $title->getDBkey();
@@ -32,8 +33,9 @@ class WatchedItem {
 
 	/**
 	 * Is mTitle being watched by mUser?
+	 * @return bool
 	 */
-	function isWatched() {
+	public function isWatched() {
 		# Pages and their talk pages are considered equivalent for watching;
 		# remember that talk namespaces are numbered as page namespace+1.
 		$fname = 'WatchedItem::isWatched';
@@ -46,9 +48,11 @@ class WatchedItem {
 	}
 
 	/**
-	 * @todo document
+	 * Given a title and user (assumes the object is setup), add the watch to the
+	 * database.
+	 * @return bool (always true)
 	 */
-	function addWatch() {
+	public function addWatch() {
 		$fname = 'WatchedItem::addWatch';
 		wfProfileIn( $fname );
 
@@ -77,7 +81,11 @@ class WatchedItem {
 		return true;
 	}
 
-	function removeWatch() {
+	/**
+	 * Same as addWatch, only the opposite.
+	 * @return bool
+	 */
+	public function removeWatch() {
 		$fname = 'WatchedItem::removeWatch';
 
 		$success = false;
@@ -118,11 +126,14 @@ class WatchedItem {
 	 * @param $ot Title: page title to duplicate entries from, if present
 	 * @param $nt Title: page title to add watches on
 	 */
-	static function duplicateEntries( $ot, $nt ) {
+	public static function duplicateEntries( $ot, $nt ) {
 		WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() );
 		WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() );
 	}
 
+	/**
+	 * Handle duplicate entries. Backend for duplicateEntries().
+	 */
 	private static function doDuplicateEntries( $ot, $nt ) {
 		$fname = "WatchedItem::duplicateEntries";
 		$oldnamespace = $ot->getNamespace();
diff --git a/includes/WatchlistEditor.php b/includes/WatchlistEditor.php
index fcfdb782..e49851bd 100644
--- a/includes/WatchlistEditor.php
+++ b/includes/WatchlistEditor.php
@@ -46,19 +46,19 @@ class WatchlistEditor {
 						$this->unwatchTitles( $toUnwatch, $user );
 						$user->invalidateCache();
 						if( count( $toWatch ) > 0 || count( $toUnwatch ) > 0 )
-							$output->addHtml( wfMsgExt( 'watchlistedit-raw-done', 'parse' ) );
+							$output->addHTML( wfMsgExt( 'watchlistedit-raw-done', 'parse' ) );
 						if( ( $count = count( $toWatch ) ) > 0 ) {
-							$output->addHtml( wfMsgExt( 'watchlistedit-raw-added', 'parse', $count ) );
+							$output->addHTML( wfMsgExt( 'watchlistedit-raw-added', 'parse', $count ) );
 							$this->showTitles( $toWatch, $output, $wgUser->getSkin() );
 						}
 						if( ( $count = count( $toUnwatch ) ) > 0 ) {
-							$output->addHtml( wfMsgExt( 'watchlistedit-raw-removed', 'parse', $count ) );
+							$output->addHTML( wfMsgExt( 'watchlistedit-raw-removed', 'parse', $count ) );
 							$this->showTitles( $toUnwatch, $output, $wgUser->getSkin() );
 						}
 					} else {
 						$this->clearWatchlist( $user );
 						$user->invalidateCache();
-						$output->addHtml( wfMsgExt( 'watchlistedit-raw-removed', 'parse', count( $current ) ) );
+						$output->addHTML( wfMsgExt( 'watchlistedit-raw-removed', 'parse', count( $current ) ) );
 						$this->showTitles( $current, $output, $wgUser->getSkin() );
 					}
 				}
@@ -70,7 +70,7 @@ class WatchlistEditor {
 					$titles = $this->extractTitles( $request->getArray( 'titles' ) );
 					$this->unwatchTitles( $titles, $user );
 					$user->invalidateCache();
-					$output->addHtml( wfMsgExt( 'watchlistedit-normal-done', 'parse',
+					$output->addHTML( wfMsgExt( 'watchlistedit-normal-done', 'parse',
 						$GLOBALS['wgLang']->formatNum( count( $titles ) ) ) );
 					$this->showTitles( $titles, $output, $wgUser->getSkin() );
 				}
@@ -138,16 +138,16 @@ class WatchlistEditor {
 		}
 		$batch->execute();
 		// Print out the list
-		$output->addHtml( "<ul>\n" );
+		$output->addHTML( "<ul>\n" );
 		foreach( $titles as $title ) {
 			if( !$title instanceof Title )
 				$title = Title::newFromText( $title );
 			if( $title instanceof Title ) {
-				$output->addHtml( "<li>" . $skin->makeLinkObj( $title )
+				$output->addHTML( "<li>" . $skin->makeLinkObj( $title )
 				. ' (' . $skin->makeLinkObj( $title->getTalkPage(), $talk ) . ")</li>\n" );
 			}
 		}
-		$output->addHtml( "</ul>\n" );
+		$output->addHTML( "</ul>\n" );
 	}
 
 	/**
@@ -239,10 +239,10 @@ class WatchlistEditor {
 	 */
 	private function showItemCount( $output, $user ) {
 		if( ( $count = $this->countWatchlist( $user ) ) > 0 ) {
-			$output->addHtml( wfMsgExt( 'watchlistedit-numitems', 'parse',
+			$output->addHTML( wfMsgExt( 'watchlistedit-numitems', 'parse',
 				$GLOBALS['wgLang']->formatNum( $count ) ) );
 		} else {
-			$output->addHtml( wfMsgExt( 'watchlistedit-noitems', 'parse' ) );
+			$output->addHTML( wfMsgExt( 'watchlistedit-noitems', 'parse' ) );
 		}
 		return $count;
 	}
@@ -323,6 +323,8 @@ class WatchlistEditor {
 					),
 					__METHOD__
 				);
+				$article = new Article($title);
+				wfRunHooks('UnwatchArticleComplete',array(&$user,&$article));
 			}
 		}
 	}
@@ -340,21 +342,47 @@ class WatchlistEditor {
 			$form  = Xml::openElement( 'form', array( 'method' => 'post',
 				'action' => $self->getLocalUrl( 'action=edit' ) ) );
 			$form .= Xml::hidden( 'token', $wgUser->editToken( 'watchlistedit' ) );
-			$form .= '<fieldset><legend>' . wfMsgHtml( 'watchlistedit-normal-legend' ) . '</legend>';
+			$form .= "<fieldset>\n<legend>" . wfMsgHtml( 'watchlistedit-normal-legend' ) . "</legend>";
 			$form .= wfMsgExt( 'watchlistedit-normal-explain', 'parse' );
-			foreach( $this->getWatchlistInfo( $user ) as $namespace => $pages ) {
-				$form .= '<h2>' . $this->getNamespaceHeading( $namespace ) . '</h2>';
-				$form .= '<ul>';
-				foreach( $pages as $dbkey => $redirect ) {
-					$title = Title::makeTitleSafe( $namespace, $dbkey );
-					$form .= $this->buildRemoveLine( $title, $redirect, $wgUser->getSkin() );
-				}
-				$form .= '</ul>';
-			}
+			$form .= $this->buildRemoveList( $user, $wgUser->getSkin() );
 			$form .= '<p>' . Xml::submitButton( wfMsg( 'watchlistedit-normal-submit' ) ) . '</p>';
 			$form .= '</fieldset></form>';
-			$output->addHtml( $form );
+			$output->addHTML( $form );
+		}
+	}
+
+	/**
+	 * Build the part of the standard watchlist editing form with the actual
+	 * title selection checkboxes and stuff.  Also generates a table of
+	 * contents if there's more than one heading.
+	 *
+	 * @param $user User
+	 * @param $skin Skin (really, Linker)
+	 */
+	private function buildRemoveList( $user, $skin ) {
+		$list = "";
+		$toc = $skin->tocIndent();
+		$tocLength = 0;
+		foreach( $this->getWatchlistInfo( $user ) as $namespace => $pages ) {
+			$tocLength++;
+			$heading = htmlspecialchars( $this->getNamespaceHeading( $namespace ) );
+			$anchor = "editwatchlist-ns" . $namespace;
+
+			$list .= $skin->makeHeadLine( 2, ">", $anchor, $heading, "" );
+			$toc .= $skin->tocLine( $anchor, $heading, $tocLength, 1 ) . $skin->tocLineEnd();
+
+			$list .= "<ul>\n";
+			foreach( $pages as $dbkey => $redirect ) {
+				$title = Title::makeTitleSafe( $namespace, $dbkey );
+				$list .= $this->buildRemoveLine( $title, $redirect, $skin );
+			}
+			$list .= "</ul>\n";
+		}
+		// ISSUE: omit the TOC if the total number of titles is low?
+		if( $tocLength > 1 ) {
+			$list = $skin->tocList( $toc ) . $list;
 		}
+		return $list;
 	}
 
 	/**
@@ -389,9 +417,9 @@ class WatchlistEditor {
 		if( $title->getNamespace() == NS_USER && !$title->isSubpage() ) {
 			$tools[] = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Contributions', $title->getText() ), wfMsgHtml( 'contributions' ) );
 		}
-		return '<li>'
+		return "<li>"
 			. Xml::check( 'titles[]', false, array( 'value' => $title->getPrefixedText() ) )
-			. $link . ' (' . implode( ' | ', $tools ) . ')' . '</li>';
+			. $link . " (" . implode( ' | ', $tools ) . ")" . "</li>\n";
 		}
 
 	/**
@@ -419,7 +447,7 @@ class WatchlistEditor {
 		$form .= '</textarea>';
 		$form .= '<p>' . Xml::submitButton( wfMsg( 'watchlistedit-raw-submit' ) ) . '</p>';
 		$form .= '</fieldset></form>';
-		$output->addHtml( $form );
+		$output->addHTML( $form );
 	}
 
 	/**
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 3fce5845..46747125 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -39,7 +39,8 @@ if ( !function_exists( '__autoload' ) ) {
  * not create a second WebRequest object; make a FauxRequest object if
  * you want to pass arbitrary data to some function in place of the web
  * input.
- *
+ * 
+ * @ingroup HTTP
  */
 class WebRequest {
 	var $data = array();
@@ -54,7 +55,7 @@ class WebRequest {
 
 		// POST overrides GET data
 		// We don't use $_REQUEST here to avoid interference from cookies...
-		$this->data = wfArrayMerge( $_GET, $_POST );
+		$this->data = $_POST + $_GET;
 	}
 
 	/**
@@ -255,6 +256,18 @@ class WebRequest {
 			return (string)$val;
 		}
 	}
+	
+	/**
+	 * Set an aribtrary value into our get/post data.
+	 * @param $key string Key name to use
+	 * @param $value mixed Value to set
+	 * @return mixed old value if one was present, null otherwise
+	 */
+	function setVal( $key, $value ) {
+		$ret = isset( $this->data[$key] ) ? $this->data[$key] : null;
+		$this->data[$key] = $value;
+		return $ret;
+	}
 
 	/**
 	 * Fetch an array from the input or return $default if it's not set.
@@ -507,7 +520,7 @@ class WebRequest {
 		unset( $newquery['title'] );
 		$newquery = array_merge( $newquery, $array );
 		$query = wfArrayToCGI( $newquery );
-		return $onlyquery ? $query : $wgTitle->getLocalURL( $basequery );
+		return $onlyquery ? $query : $wgTitle->getLocalURL( $query );
 	}
 
 	/**
@@ -636,11 +649,24 @@ class WebRequest {
 			}
 		}
 	}
+	
+	/*
+	 * Get data from $_SESSION
+	 */
+	function getSessionData( $key ) {
+		if( !isset( $_SESSION[$key] ) )
+			return null;
+		return $_SESSION[$key];
+	}
+	function setSessionData( $key, $data ) {
+		$_SESSION[$key] = $data;
+	}
 }
 
 /**
  * WebRequest clone which takes values from a provided array.
  *
+ * @ingroup HTTP
  */
 class FauxRequest extends WebRequest {
 	var $wasPosted = false;
@@ -650,7 +676,7 @@ class FauxRequest extends WebRequest {
 	 *   fake GET/POST values
 	 * @param $wasPosted Bool: whether to treat the data as POST
 	 */
-	function FauxRequest( $data, $wasPosted = false ) {
+	function FauxRequest( $data, $wasPosted = false, $session = null ) {
 		if( is_array( $data ) ) {
 			$this->data = $data;
 		} else {
@@ -658,6 +684,11 @@ class FauxRequest extends WebRequest {
 		}
 		$this->wasPosted = $wasPosted;
 		$this->headers = array();
+		$this->session = $session ? $session : array();
+	}
+	
+	function notImplemented( $method ) {
+		throw new MWException( "{$method}() not implemented" );
 	}
 
 	function getText( $name, $default = '' ) {
@@ -678,15 +709,24 @@ class FauxRequest extends WebRequest {
 	}
 
 	function getRequestURL() {
-		throw new MWException( 'FauxRequest::getRequestURL() not implemented' );
+		$this->notImplemented( __METHOD__ );
 	}
 
 	function appendQuery( $query ) {
-		throw new MWException( 'FauxRequest::appendQuery() not implemented' );
+		$this->notImplemented( __METHOD__ );
 	}
 
 	function getHeader( $name ) {
 		return isset( $this->headers[$name] ) ? $this->headers[$name] : false;
 	}
 
+	function getSessionData( $key ) {
+		if( !isset( $this->session[$key] ) )
+			return null;
+		return $this->session[$key];
+	}
+	function setSessionData( $key, $data ) {
+		$this->notImplemented( __METHOD__ );
+	}
+
 }
diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 05023e15..09d37385 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -2,17 +2,59 @@
 /**
  * Allow programs to request this object from WebRequest::response()
  * and handle all outputting (or lack of outputting) via it.
+ * @ingroup HTTP
  */
 class WebResponse {
 
-	/** Output a HTTP header */
-	function header($string, $replace=true) {
+	/** 
+	 * Output a HTTP header, wrapper for PHP's
+	 * header()
+	 * @param $string String: header to output
+	 * @param $replace Bool: replace current similar header
+	 */
+	public function header($string, $replace=true) {
 		header($string,$replace);
 	}
 
-	/** Set the browser cookie */
-	function setcookie($name, $value, $expire) {
-		global $wgCookiePath, $wgCookieDomain, $wgCookieSecure;
-		setcookie($name,$value,$expire, $wgCookiePath, $wgCookieDomain, $wgCookieSecure);
+	/** Set the browser cookie
+	 * @param $name String: name of cookie
+	 * @param $value String: value to give cookie
+	 * @param $expire Int: number of seconds til cookie expires
+	 */
+	public function setcookie( $name, $value, $expire = 0 ) {
+		global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
+		global $wgCookieSecure,$wgCookieExpiration, $wgCookieHttpOnly;
+		if ( $expire == 0 ) {
+			$expire = time() + $wgCookieExpiration;
+		}
+		$httpOnlySafe = wfHttpOnlySafe();
+		wfDebugLog( 'cookie',
+			'setcookie: "' . implode( '", "',
+				array(
+					$wgCookiePrefix . $name,
+					$value,
+					$expire,
+					$wgCookiePath,
+					$wgCookieDomain,
+					$wgCookieSecure,
+					$httpOnlySafe && $wgCookieHttpOnly ) ) . '"' );
+		if( $httpOnlySafe && isset( $wgCookieHttpOnly ) ) {
+			setcookie( $wgCookiePrefix . $name,
+				$value,
+				$expire,
+				$wgCookiePath,
+				$wgCookieDomain,
+				$wgCookieSecure,
+				$wgCookieHttpOnly );
+		} else {
+			// setcookie() fails on PHP 5.1 if you give it future-compat paramters.
+			// stab stab!
+			setcookie( $wgCookiePrefix . $name,
+				$value,
+				$expire,
+				$wgCookiePath,
+				$wgCookieDomain,
+				$wgCookieSecure );
+		}
 	}
 }
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 411c211c..edc58cb3 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -4,16 +4,6 @@
 # starts the profiler and loads the configuration, and optionally loads
 # Setup.php depending on whether MW_NO_SETUP is defined.
 
-# Test for PHP bug which breaks PHP 5.0.x on 64-bit...
-# As of 1.8 this breaks lots of common operations instead
-# of just some rare ones like export.
-$borked = str_replace( 'a', 'b', array( -1 => -1 ) );
-if( !isset( $borked[-1] ) ) {
-	echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" .
-	     "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n";
-	die( -1 );
-}
-
 # Protect against register_globals
 # This must be done before any globals are set by the code
 if ( ini_get( 'register_globals' ) ) {
@@ -74,6 +64,7 @@ if ( $IP === false ) {
 	$IP = realpath( '.' );
 }
 
+
 # Start profiler
 require_once( "$IP/StartProfiler.php" );
 wfProfileIn( 'WebStart.php-conf' );
@@ -81,20 +72,46 @@ wfProfileIn( 'WebStart.php-conf' );
 # Load up some global defines.
 require_once( "$IP/includes/Defines.php" );
 
-# LocalSettings.php is the per site customization file. If it does not exit
-# the wiki installer need to be launched or the generated file moved from
-# ./config/ to ./
-if( !file_exists( "$IP/LocalSettings.php" ) ) {
-	require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version
-	require_once( "$IP/includes/templates/NoLocalSettings.php" );
-	die();
+# Check for PHP 5
+if ( !function_exists( 'version_compare' ) 
+	|| version_compare( phpversion(), '5.0.0' ) < 0
+) {
+	define( 'MW_PHP4', '1' );
+	require( "$IP/includes/DefaultSettings.php" );
+	require( "$IP/includes/templates/PHP4.php" );
+	exit;
+}
+
+# Test for PHP bug which breaks PHP 5.0.x on 64-bit...
+# As of 1.8 this breaks lots of common operations instead
+# of just some rare ones like export.
+$borked = str_replace( 'a', 'b', array( -1 => -1 ) );
+if( !isset( $borked[-1] ) ) {
+	echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" .
+	     "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n";
+	exit;
 }
 
 # Start the autoloader, so that extensions can derive classes from core files
 require_once( "$IP/includes/AutoLoader.php" );
 
-# Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
-require_once( "$IP/LocalSettings.php" );
+if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
+	# Use a callback function to configure MediaWiki
+	require_once( "$IP/includes/DefaultSettings.php" );
+	call_user_func( MW_CONFIG_CALLBACK );
+} else {
+	# LocalSettings.php is the per site customization file. If it does not exit
+	# the wiki installer need to be launched or the generated file moved from
+	# ./config/ to ./
+	if( !file_exists( "$IP/LocalSettings.php" ) ) {
+		require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version
+		require_once( "$IP/includes/templates/NoLocalSettings.php" );
+		die();
+	}
+
+	# Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
+	require_once( "$IP/LocalSettings.php" );
+}
 wfProfileOut( 'WebStart.php-conf' );
 
 wfProfileIn( 'WebStart.php-ob_start' );
diff --git a/includes/Wiki.php b/includes/Wiki.php
index fa49290a..ce4ce67e 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -42,6 +42,7 @@ class MediaWiki {
 	/**
 	 * Initialization of ... everything
 	 * Performs the request too
+	 * FIXME: why is this crap called "initialize" when it performs everything?
 	 *
 	 * @param $title Title ($wgTitle)
 	 * @param $article Article
@@ -51,8 +52,11 @@ class MediaWiki {
 	 */
 	function initialize( &$title, &$article, &$output, &$user, $request ) {
 		wfProfileIn( __METHOD__ );
-		$this->preliminaryChecks( $title, $output, $request ) ;
-		if ( !$this->initializeSpecialCases( $title, $output, $request ) ) {
+		if( !$this->preliminaryChecks( $title, $output, $request ) ) {
+			wfProfileOut( __METHOD__ );
+			return;
+		}
+		if( !$this->initializeSpecialCases( $title, $output, $request ) ) {
 			$new_article = $this->initializeArticle( $title, $request );
 			if( is_object( $new_article ) ) {
 				$article = $new_article;
@@ -60,6 +64,7 @@ class MediaWiki {
 			} elseif( is_string( $new_article ) ) {
 				$output->redirect( $new_article );
 			} else {
+				wfProfileOut( __METHOD__ );
 				throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
 			}
 		}
@@ -76,7 +81,7 @@ class MediaWiki {
 	 */
 	function checkMaxLag( $maxLag ) {
 		list( $host, $lag ) = wfGetLB()->getMaxLag();
-		if ( $lag > $maxLag ) {
+		if( $lag > $maxLag ) {
 			wfMaxlagError( $host, $lag, $maxLag );
 			return false;
 		} else {
@@ -84,7 +89,6 @@ class MediaWiki {
 		}
 	}
 
-
 	/**
 	 * Checks some initial queries
 	 * Note that $title here is *not* a Title object, but a string!
@@ -95,26 +99,23 @@ class MediaWiki {
 	 */
 	function checkInitialQueries( $title, $action ) {
 		global $wgOut, $wgRequest, $wgContLang;
-		if( $wgRequest->getVal( 'printable' ) == 'yes' ){
+		if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
 			$wgOut->setPrintable();
 		}
-
 		$ret = NULL;
-
-		if ( '' == $title && 'delete' != $action ) {
-			$ret = Title::newMainPage();
-		} elseif ( $curid = $wgRequest->getInt( 'curid' ) ) {
+		if( $curid = $wgRequest->getInt( 'curid' ) ) {
 			# URLs like this are generated by RC, because rc_title isn't always accurate
 			$ret = Title::newFromID( $curid );
+		} elseif( '' == $title && 'delete' != $action ) {
+			$ret = Title::newMainPage();
 		} else {
 			$ret = Title::newFromURL( $title );
 			// check variant links so that interwiki links don't have to worry
 			// about the possible different language variants
 			if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
 				$wgContLang->findVariantLink( $title, $ret );
-
 		}
-		if ( ( $oldid = $wgRequest->getInt( 'oldid' ) )
+		if( ( $oldid = $wgRequest->getInt( 'oldid' ) )
 			&& ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) ) {
 			// Allow oldid to override a changed or missing title.
 			$rev = Revision::newFromId( $oldid );
@@ -133,7 +134,6 @@ class MediaWiki {
 	 * @param $request WebRequest
 	 */
 	function preliminaryChecks( &$title, &$output, $request ) {
-
 		if( $request->getCheck( 'search' ) ) {
 			// Compatibility with old search URLs which didn't use Special:Search
 			// Just check for presence here, so blank requests still
@@ -142,16 +142,16 @@ class MediaWiki {
 			// Do this above the read whitelist check for security...
 			$title = SpecialPage::getTitleFor( 'Search' );
 		}
-
 		# If the user is not logged in, the Namespace:title of the article must be in
 		# the Read array in order for the user to see it. (We have to check here to
 		# catch special pages etc. We check again in Article::view())
-		if ( !is_null( $title ) && !$title->userCanRead() ) {
+		if( !is_null( $title ) && !$title->userCanRead() ) {
 			$output->loginToUse();
 			$output->output();
-			exit;
+			$output->disable();
+			return false;
 		}
-
+		return true;
 	}
 
 	/**
@@ -161,6 +161,8 @@ class MediaWiki {
 	 * - redirect loop
 	 * - special pages
 	 *
+	 * FIXME: why is this crap called "initialize" when it performs everything?
+	 *
 	 * @param $title Title
 	 * @param $output OutputPage
 	 * @param $request WebRequest
@@ -170,25 +172,25 @@ class MediaWiki {
 		wfProfileIn( __METHOD__ );
 
 		$action = $this->getVal( 'Action' );
-		if( !$title || $title->getDBkey() == '' ) {
+		if( is_null($title) || $title->getDBkey() == '' ) {
 			$title = SpecialPage::getTitleFor( 'Badtitle' );
 			# Die now before we mess up $wgArticle and the skin stops working
 			throw new ErrorPageError( 'badtitle', 'badtitletext' );
-		} else if ( $title->getInterwiki() != '' ) {
+		} else if( $title->getInterwiki() != '' ) {
 			if( $rdfrom = $request->getVal( 'rdfrom' ) ) {
 				$url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) );
 			} else {
 				$url = $title->getFullURL();
 			}
 			/* Check for a redirect loop */
-			if ( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) {
+			if( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) {
 				$output->redirect( $url );
 			} else {
 				$title = SpecialPage::getTitleFor( 'Badtitle' );
 				throw new ErrorPageError( 'badtitle', 'badtitletext' );
 			}
-		} else if ( ( $action == 'view' ) && !$request->wasPosted() &&
-			(!isset( $this->GET['title'] ) || $title->getPrefixedDBKey() != $this->GET['title'] ) &&
+		} else if( $action == 'view' && !$request->wasPosted() &&
+			( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) &&
 			!count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) )
 		{
 			$targetUrl = $title->getFullURL();
@@ -219,7 +221,7 @@ class MediaWiki {
 				$output->setSquidMaxage( 1200 );
 				$output->redirect( $targetUrl, '301' );
 			}
-		} else if ( NS_SPECIAL == $title->getNamespace() ) {
+		} else if( NS_SPECIAL == $title->getNamespace() ) {
 			/* actions that need to be made when we have a special pages */
 			SpecialPage::executePath( $title );
 		} else {
@@ -241,7 +243,7 @@ class MediaWiki {
 	static function articleFromTitle( &$title ) {
 		if( NS_MEDIA == $title->getNamespace() ) {
 			// FIXME: where should this go?
-			$title = Title::makeTitle( NS_IMAGE, $title->getDBkey() );
+			$title = Title::makeTitle( NS_FILE, $title->getDBkey() );
 		}
 
 		$article = null;
@@ -251,12 +253,12 @@ class MediaWiki {
 		}
 
 		switch( $title->getNamespace() ) {
-		case NS_IMAGE:
-			return new ImagePage( $title );
-		case NS_CATEGORY:
-			return new CategoryPage( $title );
-		default:
-			return new Article( $title );
+			case NS_FILE:
+				return new ImagePage( $title );
+			case NS_CATEGORY:
+				return new CategoryPage( $title );
+			default:
+				return new Article( $title );
 		}
 	}
 
@@ -271,27 +273,32 @@ class MediaWiki {
 	function initializeArticle( &$title, $request ) {
 		wfProfileIn( __METHOD__ );
 
-		$action = $this->getVal( 'action' );
+		$action = $this->getVal( 'action', 'view' );
 		$article = self::articleFromTitle( $title );
-		
-		wfDebug("Article: ".$title->getPrefixedText()."\n");
-		
+		# NS_MEDIAWIKI has no redirects.
+		# It is also used for CSS/JS, so performance matters here...
+		if( $title->getNamespace() == NS_MEDIAWIKI ) {
+			wfProfileOut( __METHOD__ );
+			return $article;
+		}
 		// Namespace might change when using redirects
 		// Check for redirects ...
-		$file = $title->getNamespace() == NS_IMAGE ? $article->getFile() : null;
+		$file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null;
 		if( ( $action == 'view' || $action == 'render' ) 	// ... for actions that show content
-					&& !$request->getVal( 'oldid' ) &&    // ... and are not old revisions
-					$request->getVal( 'redirect' ) != 'no' &&	// ... unless explicitly told not to
-					// ... and the article is not a non-redirect image page with associated file
-					!( is_object( $file ) && $file->exists() && !$file->getRedirected() ) ) {
-
+			&& !$request->getVal( 'oldid' ) &&    // ... and are not old revisions
+			$request->getVal( 'redirect' ) != 'no' &&	// ... unless explicitly told not to
+			// ... and the article is not a non-redirect image page with associated file
+			!( is_object( $file ) && $file->exists() && !$file->getRedirected() ) )
+		{
 			# Give extensions a change to ignore/handle redirects as needed
 			$ignoreRedirect = $target = false;
-			wfRunHooks( 'InitializeArticleMaybeRedirect', array( &$title, &$request, &$ignoreRedirect, &$target ) );
-
+			
 			$dbr = wfGetDB( DB_SLAVE );
 			$article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
 
+			wfRunHooks( 'InitializeArticleMaybeRedirect', 
+				array(&$title,&$request,&$ignoreRedirect,&$target,&$article) );
+
 			// Follow redirects only for... redirects
 			if( !$ignoreRedirect && $article->isRedirect() ) {
 				# Is the target already set by an extension?
@@ -302,12 +309,11 @@ class MediaWiki {
 						return $target;
 					}
 				}
-				
-				if( is_object( $target ) ) {
+				if( is_object($target) ) {
 					// Rewrite environment to redirected article
 					$rarticle = self::articleFromTitle( $target );
 					$rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) );
-					if ( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) {
+					if( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) {
 						$rarticle->setRedirectedFrom( $title );
 						$article = $rarticle;
 						$title = $target;
@@ -327,14 +333,18 @@ class MediaWiki {
 	 * @param $deferredUpdates array of updates to do
 	 * @param $output OutputPage
 	 */
-	function finalCleanup ( &$deferredUpdates, &$output ) {
+	function finalCleanup( &$deferredUpdates, &$output ) {
 		wfProfileIn( __METHOD__ );
-		$this->doUpdates( $deferredUpdates );
-		$this->doJobs();
 		# Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
 		$factory = wfGetLBFactory();
-		$factory->shutdown();
+		$factory->commitMasterChanges();
+		# Output everything!
 		$output->output();
+		# Do any deferred jobs
+		$this->doUpdates( $deferredUpdates );
+		$this->doJobs();
+		# Commit and close up!
+		$factory->shutdown();
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -359,7 +369,7 @@ class MediaWiki {
 			$up->doUpdate();
 
 			# Commit after every update to prevent lock contention
-			if ( $dbw->trxLevel() ) {
+			if( $dbw->trxLevel() ) {
 				$dbw->commit();
 			}
 		}
@@ -372,12 +382,12 @@ class MediaWiki {
 	function doJobs() {
 		$jobRunRate = $this->getVal( 'JobRunRate' );
 
-		if ( $jobRunRate <= 0 || wfReadOnly() ) {
+		if( $jobRunRate <= 0 || wfReadOnly() ) {
 			return;
 		}
-		if ( $jobRunRate < 1 ) {
+		if( $jobRunRate < 1 ) {
 			$max = mt_getrandmax();
-			if ( mt_rand( 0, $max ) > $max * $jobRunRate ) {
+			if( mt_rand( 0, $max ) > $max * $jobRunRate ) {
 				return;
 			}
 			$n = 1;
@@ -391,7 +401,7 @@ class MediaWiki {
 			$success = $job->run();
 			$t += wfTime();
 			$t = round( $t*1000 );
-			if ( !$success ) {
+			if( !$success ) {
 				$output .= "Error: " . $job->getLastError() . ", Time: $t ms\n";
 			} else {
 				$output .= "Success, Time: $t ms\n";
@@ -420,7 +430,7 @@ class MediaWiki {
 	function performAction( &$output, &$article, &$title, &$user, &$request ) {
 		wfProfileIn( __METHOD__ );
 
-		if ( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) {
+		if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) {
 			wfProfileOut( __METHOD__ );
 			return;
 		}
@@ -436,6 +446,10 @@ class MediaWiki {
 				$output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
 				$article->view();
 				break;
+			case 'raw': // includes JS/CSS
+				$raw = new RawPage( $article );
+				$raw->view();
+				break;
 			case 'watch':
 			case 'unwatch':
 			case 'delete':
@@ -457,21 +471,20 @@ class MediaWiki {
 				if( !$this->getVal( 'EnableDublinCoreRdf' ) ) {
 					wfHttpError( 403, 'Forbidden', wfMsg( 'nodublincore' ) );
 				} else {
-					require_once( 'includes/Metadata.php' );
-					wfDublinCoreRdf( $article );
+					$rdf = new DublinCoreRdf( $article );
+					$rdf->show();
 				}
 				break;
 			case 'creativecommons':
 				if( !$this->getVal( 'EnableCreativeCommonsRdf' ) ) {
 					wfHttpError( 403, 'Forbidden', wfMsg( 'nocreativecommons' ) );
 				} else {
-					require_once( 'includes/Metadata.php' );
-					wfCreativeCommonsRdf( $article );
+					$rdf = new CreativeCommonsRdf( $article );
+					$rdf->show();
 				}
 				break;
 			case 'credits':
-				require_once( 'includes/Credits.php' );
-				showCreditsPage( $article );
+				Credits::showPage( $article );
 				break;
 			case 'submit':
 				if( session_id() == '' ) {
@@ -504,10 +517,6 @@ class MediaWiki {
 				$history = new PageHistory( $article );
 				$history->history();
 				break;
-			case 'raw':
-				$raw = new RawPage( $article );
-				$raw->view();
-				break;
 			default:
 				if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
 					$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
diff --git a/includes/WikiError.php b/includes/WikiError.php
index c5082004..41edb2f3 100644
--- a/includes/WikiError.php
+++ b/includes/WikiError.php
@@ -79,7 +79,8 @@ class WikiErrorMsg extends WikiError {
 }
 
 /**
- * @todo document
+ * Error class designed to handle errors involved with 
+ * XML parsing
  * @ingroup Exception
  */
 class WikiXmlError extends WikiError {
diff --git a/includes/Xml.php b/includes/Xml.php
index 32a68251..68990d86 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -112,11 +112,11 @@ class Xml {
 	 *
 	 * @param $selected Mixed: Namespace which should be pre-selected
 	 * @param $all Mixed: Value of an item denoting all namespaces, or null to omit
-	 * @param $hidden Mixed: Include hidden namespaces? [WTF? --RC]
 	 * @param $element_name String: value of the "name" attribute of the select tag
+	 * @param $label String: optional label to add to the field
 	 * @return string
 	 */
-	public static function namespaceSelector( $selected = '', $all = null, $hidden = false, $element_name = 'namespace' ) {
+	public static function namespaceSelector( $selected = '', $all = null, $element_name = 'namespace', $label = null ) {
 		global $wgContLang;
 		$namespaces = $wgContLang->getFormattedNamespaces();
 		$options = array();
@@ -139,12 +139,16 @@ class Xml {
 			$options[] = self::option( $name, $index, $index === $selected );
 		}
 
-		return Xml::openElement( 'select', array( 'id' => 'namespace', 'name' => $element_name,
+		$ret = Xml::openElement( 'select', array( 'id' => 'namespace', 'name' => $element_name,
 			'class' => 'namespaceselector' ) )
 			. "\n"
 			. implode( "\n", $options )
 			. "\n"
 			. Xml::closeElement( 'select' );
+		if ( !is_null( $label ) ) {
+			$ret = Xml::label( $label, $element_name ) . '&nbsp;' . $ret;
+		}
+		return $ret;
 	}
 
 	/**
@@ -640,18 +644,63 @@ class Xml {
 			
 			$form .= Xml::openElement( 'tr', array( 'id' => $id ) );
 			$form .= Xml::tags( 'td', array('class' => 'mw-label'), wfMsgExt( $labelmsg, array('parseinline') ) );
-			$form .= Xml::openElement( 'td' ) . $input . Xml::closeElement( 'td' );
+			$form .= Xml::openElement( 'td', array( 'class' => 'mw-input' ) ) . $input . Xml::closeElement( 'td' );
+			$form .= Xml::closeElement( 'tr' );
+		}
+
+		if( $submitLabel ) {
+			$form .= Xml::openElement( 'tr', array( 'id' => $id ) );
+			$form .= Xml::tags( 'td', array(), '' );
+			$form .= Xml::openElement( 'td', array( 'class' => 'mw-submit' ) ) . Xml::submitButton( wfMsg( $submitLabel ) ) . Xml::closeElement( 'td' );
 			$form .= Xml::closeElement( 'tr' );
 		}
 	
 		$form .= "</tbody></table>";
-		
-		if ($submitLabel) {	
-			$form .= Xml::submitButton( wfMsg($submitLabel) );
-		}
+
 	
 		return $form;
 	}
+	
+	/**
+	 * Build a table of data
+	 * @param array $rows An array of arrays of strings, each to be a row in a table
+	 * @param array $attribs Attributes to apply to the table tag [optional]
+	 * @param array $headers An array of strings to use as table headers [optional]
+	 * @return string
+	 */
+	public static function buildTable( $rows, $attribs = array(), $headers = null ) {
+		$s = Xml::openElement( 'table', $attribs );
+		if ( is_array( $headers ) ) {
+			foreach( $headers as $id => $header ) {
+				$attribs = array();
+				if ( is_string( $id ) ) $attribs['id'] = $id;
+				$s .= Xml::element( 'th', $attribs, $header );
+			}
+		}
+		foreach( $rows as $id => $row ) {
+			$attribs = array();
+			if ( is_string( $id ) ) $attribs['id'] = $id;
+			$s .= Xml::buildTableRow( $attribs, $row );
+		}
+		$s .= Xml::closeElement( 'table' );
+		return $s;
+	}
+	
+	/**
+	 * Build a row for a table
+	 * @param array $cells An array of strings to put in <td>
+	 * @return string
+	 */
+	public static function buildTableRow( $attribs, $cells ) {
+		$s = Xml::openElement( 'tr', $attribs );
+		foreach( $cells as $id => $cell ) {
+			$attribs = array();
+			if ( is_string( $id ) ) $attribs['id'] = $id;
+			$s .= Xml::element( 'td', $attribs, $cell );
+		}
+		$s .= Xml::closeElement( 'tr' );
+		return $s;
+	}
 }
 
 class XmlSelect {
@@ -674,7 +723,8 @@ class XmlSelect {
 	}
 
 	public function addOption( $name, $value = false ) {
-		$value = $value ? $value : $name;
+		// Stab stab stab
+		$value = ($value !== false) ? $value : $name;
 		$this->options[] = Xml::option( $name, $value, $value === $this->default );
 	}
 
@@ -682,4 +732,4 @@ class XmlSelect {
 		return Xml::tags( 'select', $this->attributes, implode( "\n", $this->options ) );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/XmlFunctions.php b/includes/XmlFunctions.php
index bc18a2cd..8cb8f3f5 100644
--- a/includes/XmlFunctions.php
+++ b/includes/XmlFunctions.php
@@ -4,63 +4,83 @@
  * Look at the Xml class (Xml.php) for the implementations.
  */
 function wfElement( $element, $attribs = null, $contents = '') {
+	wfDeprecated(__FUNCTION__);
 	return Xml::element( $element, $attribs, $contents );
 }
 function wfElementClean( $element, $attribs = array(), $contents = '') {
+	wfDeprecated(__FUNCTION__);
 	return Xml::elementClean( $element, $attribs, $contents );
 }
 function wfOpenElement( $element, $attribs = null ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::openElement( $element, $attribs );
 }
 function wfCloseElement( $element ) {
+	wfDeprecated(__FUNCTION__);
 	return "</$element>";
 }
-function HTMLnamespaceselector($selected = '', $allnamespaces = null, $includehidden=false) {
-	return Xml::namespaceSelector( $selected, $allnamespaces, $includehidden );
+function HTMLnamespaceselector($selected = '', $allnamespaces = null ) {
+	wfDeprecated(__FUNCTION__);
+	return Xml::namespaceSelector( $selected, $allnamespaces );
 }
 function wfSpan( $text, $class, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::span( $text, $class, $attribs );
 }
 function wfInput( $name, $size=false, $value=false, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::input( $name, $size, $value, $attribs );
 }
 function wfAttrib( $name, $present = true ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::attrib( $name, $present );
 }
 function wfCheck( $name, $checked=false, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::check( $name, $checked, $attribs );
 }
 function wfRadio( $name, $value, $checked=false, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::radio( $name, $value, $checked, $attribs );
 }
 function wfLabel( $label, $id ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::label( $label, $id );
 }
 function wfInputLabel( $label, $name, $id, $size=false, $value=false, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::inputLabel( $label, $name, $id, $size, $value, $attribs );
 }
 function wfCheckLabel( $label, $name, $id, $checked=false, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::checkLabel( $label, $name, $id, $checked, $attribs );
 }
 function wfRadioLabel( $label, $name, $value, $id, $checked=false, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::radioLabel( $label, $name, $value, $id, $checked, $attribs );
 }
 function wfSubmitButton( $value, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::submitButton( $value, $attribs );
 }
 function wfHidden( $name, $value, $attribs=array() ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::hidden( $name, $value, $attribs );
 }
 function wfEscapeJsString( $string ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::escapeJsString( $string );
 }
 function wfIsWellFormedXml( $text ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::isWellFormed( $text );
 }
 function wfIsWellFormedXmlFragment( $text ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::isWellFormedXmlFragment( $text );
 }
 
 function wfBuildForm( $fields, $submitLabel ) {
+	wfDeprecated(__FUNCTION__);
 	return Xml::buildForm( $fields, $submitLabel );
 }
diff --git a/includes/XmlTypeCheck.php b/includes/XmlTypeCheck.php
index 8ee211e1..a004ef4d 100644
--- a/includes/XmlTypeCheck.php
+++ b/includes/XmlTypeCheck.php
@@ -31,6 +31,13 @@ class XmlTypeCheck {
 		$this->filterCallback = $filterCallback;
 		$this->run( $file );
 	}
+	
+	/**
+	 * Get the root element. Simple accessor to $rootElement
+	 */
+	public function getRootElement() {
+		return $this->rootElement;
+	}
 
 	private function run( $fname ) {
 		$parser = xml_parser_create_ns( 'UTF-8' );
diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 1cae8463..4c1e0ae8 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -2574,6 +2574,10 @@ $zh2Hant = array(
 "三�" => 	"三隻",
 "三余" => 	"三餘",
 "上�" => 	"上樑",
+"上签�" => 	"上簽�",
+"上签字" => 	"上簽字",
+"上签写" => 	"上簽寫",
+"上签收" => 	"上簽收",
 "上签" => 	"上籤",
 "上�" => 	"上藥",
 "下于" => 	"下於",
@@ -3482,6 +3486,7 @@ $zh2Hant = array(
 "外强中干" => 	"外強中乾",
 "外制" => 	"外製",
 "多划" => 	"多劃",
+"多�是" => 	"多�是",
 "多天�" => 	"多天後",
 "多于" => 	"多於",
 "多冲" => 	"多�",
@@ -4776,7 +4781,6 @@ $zh2Hant = array(
 "水准" => 	"水準",
 "水里" => 	"水裡",
 "水里乡" => 	"水里鄉",
-"水表" => 	"水錶",
 "æ°´ç¡·" => 	"æ°´é¹¼",
 "永历" => 	"永曆",
 "求助于" => 	"求助於",
@@ -6228,7 +6232,6 @@ $zh2Hant = array(
 "退烧�" => 	"退燒藥",
 "逋�" => 	"逋髮",
 "�辟" => 	"�闢",
-"这么�" => 	"這么著",
 "这里" => 	"這�",
 "这里" => 	"這裡",
 "这�" => 	"這隻",
@@ -6922,7 +6925,6 @@ $zh2Hant = array(
 "斗斗" => 	"鬥鬥",
 "斗鱼" => 	"鬥魚",
 "斗鹌鹑" => 	"鬥鵪鶉",
-"闹�玩儿" => 	"鬧著玩儿",
 "闹�玩儿" => 	"鬧著玩兒",
 "闹钟" => 	"鬧�",
 "哄动" => 	"鬨動",
@@ -9910,22 +9912,22 @@ $zh2Hans = array(
 "乘著" => 	"乘�",
 "書畫" => 	"书画",
 "乾乾" => 	"乾乾",
-"乾元;" => 	"乾元;",
-"乾�;" => 	"乾�;",
+"乾元" => 	"乾元",
+"乾�" => 	"乾�",
 "乾縣" => 	"乾县",
 "乾嘉" => 	"乾嘉",
 "乾圖" => 	"乾图",
 "乾� " => 	"乾� ",
-"乾宅;" => 	"乾宅;",
+"乾宅" => 	"乾宅",
 "乾斷" => 	"乾断",
 "乾旦" => 	"乾旦",
-"乾曜;" => 	"乾曜;",
+"乾曜" => 	"乾曜",
 "乾清宮" => 	"乾清宫",
 "乾盛世" => 	"乾盛世",
 "乾紅" => 	"乾红",
 "乾綱" => 	"乾纲",
-"乾象;" => 	"乾象;",
-"乾造;" => 	"乾造;",
+"乾象" => 	"乾象",
+"乾造" => 	"乾造",
 "乾陵" => 	"乾陵",
 "乾隆" => 	"乾隆",
 "爭著" => 	"争�",
@@ -10220,8 +10222,12 @@ $zh2Hans = array(
 "本著�" => 	"本著�",
 "本著者" => 	"本著者",
 "機械畫" => 	"机械画",
+"殺著" => 	"��",
+"殺著作" => 	"�著作",
+"殺著�" => 	"�著�",
+"殺著者" => 	"�著者",
 "雜著" => 	"��",
-"�乾德;" => 	"�乾德;",
+"�乾德" => 	"�乾德",
 "來著" => 	"��",
 "�著臉" => 	"��脸",
 "枕著" => 	"枕�",
@@ -10631,6 +10637,7 @@ $zh2TW = array(
 "復蘇" => "復甦",
 "缺�" => "�設",
 "串行" => "串列",
+"串列加速器" => "串列加速器",
 "以太网" => "乙太網",
 "�图" => "點陣圖",
 "例程" => "常�",
@@ -10695,7 +10702,6 @@ $zh2TW = array(
 "�务器" => "伺�器",
 "等于" => "等於",
 "局域网" => "�域網",
-"计算机" => "電腦",
 "扫瞄仪" => "掃瞄器",
 "宽带" => "寬頻",
 "数�库" => "資料庫",
@@ -10753,7 +10759,6 @@ $zh2TW = array(
 "伯利兹" => "�里斯",
 "伯利茲" => "�里斯",
 "佛得角" => "維德角",
-"佛得角" => "維德角",
 "克罗地亚" => "克羅埃西亞",
 "克羅地亞" => "克羅埃西亞",
 "冈比亚" => "甘比亞",
@@ -10811,10 +10816,11 @@ $zh2TW = array(
 "塞浦路斯" => "塞普勒斯",
 "塞舌尔" => "塞席爾",
 "塞舌爾" => "塞席爾",
-"多米尼加" => "多明尼加",
+"多米尼加共和国" => "多明尼加",
+"多米尼加共和國" => "多明尼加",
 "多明尼加共和國" => "多明尼加",
-"多米尼加�邦" => "多米尼克",
-"多明尼加�邦" => "多米尼克",
+"多米尼加国" => "多米尼克",
+"多明尼加國" => "多米尼克",
 "安�瓜和巴布达" => "安地��巴布�",
 "安�瓜和巴布�" => "安地��巴布�",
 "尼日利亚" => "奈�利亞",
@@ -10822,17 +10828,14 @@ $zh2TW = array(
 "尼日尔" => "尼日",
 "尼日爾" => "尼日",
 "巴巴多斯" => "巴�多",
-"巴巴多斯" => "巴�多",
 "巴布亚新几内亚" => "巴布亞�幾內亞",
 "巴布亞新畿內亞" => "巴布亞�幾內亞",
 "布基纳法索" => "布��法索",
 "布基�法索" => "布��法索",
 "布隆迪" => "蒲隆地",
 "布隆迪" => "蒲隆地",
-"希腊" => "希臘",
 "帕劳" => "帛�",
 "�大利" => "義大利",
-"�大利" => "義大利",
 "所罗门群岛" => "索羅門群島",
 "所羅門群島" => "索羅門群島",
 "文莱" => "汶�",
@@ -10886,7 +10889,6 @@ $zh2TW = array(
 "赞比亚" => "尚比亞",
 "贊比亞" => "尚比亞",
 "阿塞拜疆" => "亞塞拜然",
-"阿塞拜疆" => "亞塞拜然",
 "阿拉伯��酋长国" => "阿拉伯��大公國",
 "阿拉伯��酋長國" => "阿拉伯��大公國",
 "马尔代夫" => "馬爾地夫",
@@ -10917,7 +10919,6 @@ $zh2TW = array(
 "�架" => "�豹",
 "�士" => "�斯",
 "雪�龙" => "雪��",
-"马自达" => "馬自�",
 "�事得" => "馬自�",
 "拿破仑" => "拿破崙",
 "æ‹¿ç ´ä¾–" => "æ‹¿ç ´å´™",
@@ -10941,25 +10942,17 @@ $zh2HK = array(
 "凶殘" => "兇殘",
 "�凶" => "�兇",
 "買凶" => "買兇",
-"打�机" => "打�機",
 "�表機" => "打�機",
 "字节" => "�元組",
 "字節" => "�元組",
-"打�" => "打�",
 "列�" => "打�",
 "硬件" => "硬件",
 "硬體" => "硬件",
-"二�管" => "二極管",
 "二極體" => "二極管",
-"三�管" => "三極管",
 "三極體" => "三極管",
-"数�" => "數碼",
 "數�" => "數碼",
-"软件" => "軟件",
 "軟體" => "軟件",
-"网络" => "網絡",
 "網路" => "網絡",
-"人工智能" => "人工智能",
 "人工智慧" => "人工智能",
 "航天飞机" => "穿梭機",
 "太空梭" => "穿梭機",
@@ -10969,141 +10962,85 @@ $zh2HK = array(
 "機器人" => "機械人",
 "移动电�" => "�動電話",
 "行動電話" => "�動電話",
-"调制解调器" => "調制解調器",
 "數據機" => "調制解調器",
 "短信" => "短訊",
 "簡訊" => "短訊",
-"�得" => "�得",
 "查德" => "�得",
-"也门" => "也門",
 "葉門" => "也門",
-"伯利兹" => "伯利茲",
 "�里斯" => "伯利茲",
-"佛得角" => "佛得角",
 "維德角" => "佛得角",
-"克罗地亚" => "克羅地亞",
 "克羅埃西亞" => "克羅地亞",
-"冈比亚" => "岡比亞",
 "甘比亞" => "岡比亞",
-"几内亚比�" => "幾內亞比紹",
 "幾內亞比索" => "幾內亞比紹",
-"列支敦士登" => "列支敦士登",
 "列支敦斯登" => "列支敦士登",
-"利比里亚" => "利比里亞",
 "賴比瑞亞" => "利比里亞",
-"加纳" => "加�",
 "迦�" => "加�",
-"加蓬" => "加蓬",
 "加彭" => "加蓬",
-"�茨瓦纳" => "�茨瓦�",
 "波札那" => "�茨瓦�",
-"�塔尔" => "�塔爾",
 "��" => "�塔爾",
-"�旺达" => "盧旺�",
 "盧安�" => "盧旺�",
-"�地马拉" => "�地馬拉",
 "瓜地馬拉" => "�地馬拉",
 "厄瓜多尔" => "厄瓜多爾",
+"厄瓜多爾" => "厄瓜多爾",
 "厄瓜多" => "厄瓜多爾",
-"厄立特里亚" => "厄立特里亞",
 "厄利垂亞" => "厄立特里亞",
-"�布�" => "�布堤",
 "�布地" => "�布堤",
-"哥斯达黎加" => "哥斯�黎加",
 "哥斯大黎加" => "哥斯�黎加",
-"图瓦�" => "圖瓦盧",
 "�瓦魯" => "圖瓦盧",
-"圣�西亚" => "�盧西亞",
 "�露西亞" => "�盧西亞",
 "圣基茨和尼维斯" => "��斯�域斯",
 "�克里斯多��尼維斯" => "��斯�域斯",
-"圣文森特和格林纳�斯" => "�文森特和格林��斯",
 "�文森�格瑞那�" => "�文森特和格林��斯",
-"圣马力诺" => "�馬力諾",
 "�馬利諾" => "�馬力諾",
-"圭亚那" => "圭亞那",
 "蓋亞那" => "圭亞那",
-"�桑尼亚" => "�桑尼亞",
 "�尚尼亞" => "�桑尼亞",
-"埃塞俄比亚" => "埃塞俄比亞",
 "衣索匹亞" => "埃塞俄比亞",
 "衣索比亞" => "埃塞俄比亞",
-"基里巴斯" => "基里巴斯",
 "�里巴斯" => "基里巴斯",
-"狮�山" => "��山",
 "塞普勒斯" => "塞浦路斯",
-"塞舌尔" => "塞舌爾",
 "塞席爾" => "塞舌爾",
-"多米尼加" => "多明尼加共和國",
-"多明尼加" => "多明尼加共和國",
-"多米尼加�邦" => "多明尼加�邦",
-"多米尼克" => "多明尼加�邦",
-"安�瓜和巴布达" => "安�瓜和巴布�",
+"多米尼克" => "多明尼加國",
 "安地��巴布�" => "安�瓜和巴布�",
 "尼日利亚" => "尼日利亞",
+"尼日利亞" => "尼日利亞",
 "奈�利亞" => "尼日利亞",
 "尼日尔" => "尼日爾",
+"尼日爾" => "尼日爾",
 "尼日" => "尼日爾",
-"巴巴多斯" => "巴巴多斯",
 "巴�多" => "巴巴多斯",
-"巴布亚新几内亚" => "巴布亞新畿內亞",
 "巴布亞�幾內亞" => "巴布亞新畿內亞",
-"布基纳法索" => "布基�法索",
 "布��法索" => "布基�法索",
-"布隆迪" => "布隆迪",
 "蒲隆地" => "布隆迪",
+"帕劳" => "帛�",
 "義大利" => "�大利",
-"所罗门群岛" => "所羅門群島",
 "索羅門群島" => "所羅門群島",
-"斯�士兰" => "斯�士蘭",
+"文莱" => "汶�",
 "�瓦濟蘭" => "斯�士蘭",
-"斯洛文尼亚" => "斯洛文尼亞",
 "斯洛維尼亞" => "斯洛文尼亞",
-"新西兰" => "新西蘭",
 "�西蘭" => "新西蘭",
-"格林纳达" => "格林��",
 "格瑞那�" => "格林��",
-"格��亚" => "喬治亞",
-"格魯�亞" => "喬治亞",
-"梵蒂冈" => "梵蒂岡",
-"毛里塔尼亚" => "毛里塔尼亞",
 "茅利塔尼亞" => "毛里塔尼亞",
 "毛里求斯" => "毛里裘斯",
 "模里西斯" => "毛里裘斯",
+"沙地阿拉伯" => "沙特阿拉伯",
 "沙�地阿拉伯" => "沙特阿拉伯",
-"波斯尼亚和黑塞哥维那" => "波斯尼亞黑塞哥維那",
 "波士尼亞赫塞哥維�" => "波斯尼亞黑塞哥維那",
-"津巴布韦" => "津巴布韋",
 "辛巴�" => "津巴布韋",
-"洪都拉斯" => "洪都拉斯",
 "�都拉斯" => "洪都拉斯",
-"特立尼达和托巴哥" => "特立尼�和多巴哥",
 "�里�托�哥" => "特立尼�和多巴哥",
-"瑙�" => "瑙魯",
 "諾魯" => "瑙魯",
-"瓦努阿图" => "瓦努阿圖",
 "�那�" => "瓦努阿圖",
-"科摩罗" => "科摩羅",
 "葛摩" => "科摩羅",
-"索马里" => "索馬里",
 "索馬利亞" => "索馬里",
-"��" => "�撾",
 "寮國" => "�撾",
 "肯尼亚" => "肯雅",
 "肯亞" => "肯雅",
-"莫桑比克" => "莫桑比克",
 "莫三比克" => "莫桑比克",
-"莱索托" => "�索托",
 "賴索托" => "�索托",
-"��" => "�寧",
 "��" => "�寧",
-"赞比亚" => "贊比亞",
 "尚比亞" => "贊比亞",
-"阿塞拜疆" => "阿塞拜疆",
 "亞塞拜然" => "阿塞拜疆",
-"阿拉伯��酋长国" => "阿拉伯��酋長國",
 "阿拉伯��大公國" => "阿拉伯��酋長國",
-"马尔代夫" => "馬爾代夫",
 "馬爾地夫" => "馬爾代夫",
 "馬利共和國" => "馬里共和國",
 "方便�" => "�食麵",
@@ -11135,11 +11072,9 @@ $zh2HK = array(
 "æ‹¿ç ´å´™" => "æ‹¿ç ´ä¾–",
 "布什" => "布殊",
 "布希" => "布殊",
-"å…‹æž—é¡¿" => "å…‹æž—é “",
 "柯林頓" => "克林頓",
 "�达姆" => "薩�姆",
 "海�" => "侯賽因",
-"侯赛因" => "侯賽因",
 "大�·�克汉姆" => "大衛碧咸",
 "迈克尔·欧文" => "米高奧雲",
 "�妮弗·�普里亚蒂" => "�佩雅蒂",
@@ -11158,6 +11093,7 @@ $zh2CN = array(
 "記憶體" => "内存",
 "�設" => "默认",
 "串列" => "串行",
+"串列加速器" => "串列加速器",
 "乙太網" => "以太网",
 "點陣圖" => "�图",
 "常�" => "例程",
@@ -11262,150 +11198,92 @@ $zh2CN = array(
 "簡訊" => "短信",
 "�茲別克" => "乌兹别克斯�",
 "查德" => "�得",
-"�得" => "�得",
-"也門" => "",
 "葉門" => "也门",
 "伯利茲" => "伯利兹",
 "�里斯" => "伯利兹",
 "維德角" => "佛得角",
-"佛得角" => "佛得角",
-"克羅地亞" => "克罗地亚",
 "克羅埃西亞" => "克罗地亚",
-"岡比亞" => "冈比亚",
 "甘比亞" => "冈比亚",
-"幾內亞比紹" => "几内亚比�",
 "幾內亞比索" => "几内亚比�",
 "列支敦斯登" => "列支敦士登",
-"列支敦士登" => "列支敦士登",
-"利比里亞" => "利比里亚",
 "賴比瑞亞" => "利比里亚",
-"加�" => "加纳",
 "迦�" => "加纳",
 "加彭" => "加蓬",
-"加蓬" => "加蓬",
-"�茨瓦�" => "�茨瓦纳",
 "波札那" => "�茨瓦纳",
-"�塔爾" => "�塔尔",
 "��" => "�塔尔",
-"盧旺�" => "�旺达",
 "盧安�" => "�旺达",
-"�地馬拉" => "�地马拉",
 "瓜地馬拉" => "�地马拉",
 "厄瓜多爾" => "厄瓜多尔",
+"厄瓜多尔" => "厄瓜多尔",
 "厄瓜多" => "厄瓜多尔",
-"厄立特里亞" => "厄立特里亚",
 "厄利垂亞" => "厄立特里亚",
-"�布堤" => "�布�",
 "�布地" => "�布�",
 "哈薩克" => "哈�克斯�",
-"哥斯�黎加" => "哥斯达黎加",
 "哥斯大黎加" => "哥斯达黎加",
-"圖瓦盧" => "图瓦�",
 "�瓦魯" => "图瓦�",
 "土庫曼" => "土库曼斯�",
-"�盧西亞" => "圣�西亚",
 "�露西亞" => "圣�西亚",
 "��斯�域斯" => "圣基茨和尼维斯",
 "�克里斯多��尼維斯" => "圣基茨和尼维斯",
-"�文森特和格林��斯" => "圣文森特和格林纳�斯",
 "�文森�格瑞那�" => "圣文森特和格林纳�斯",
-"�馬力諾" => "圣马力诺",
 "�馬利諾" => "圣马力诺",
-"圭亞那" => "圭亚那",
 "蓋亞那" => "圭亚那",
-"�桑尼亞" => "�桑尼亚",
 "�尚尼亞" => "�桑尼亚",
-"埃塞俄比亞" => "埃塞俄比亚",
 "衣索匹亞" => "埃塞俄比亚",
 "衣索比亞" => "埃塞俄比亚",
 "�里巴斯" => "基里巴斯",
-"基里巴斯" => "基里巴斯",
 "塔�克" => "塔�克斯�",
 "塞拉利昂" => "塞拉利昂",
 "塞普勒斯" => "塞浦路斯",
-"塞浦路斯" => "塞浦路斯",
-"塞舌爾" => "塞舌尔",
 "塞席爾" => "塞舌尔",
-"多明尼加共和國" => "多米尼加",
-"多明尼加" => "多米尼加",
-"多明尼加�邦" => "多米尼加�邦",
-"多米尼克" => "多米尼加�邦",
-"安�瓜和巴布�" => "安�瓜和巴布达",
+"多米尼克" => "多米尼加国",
 "安地��巴布�" => "安�瓜和巴布达",
 "尼日利亞" => "尼日利亚",
+"尼日利亚" => "尼日利亚",
 "奈�利亞" => "尼日利亚",
 "尼日爾" => "尼日尔",
+"尼日尔" => "尼日尔",
 "尼日" => "尼日尔",
 "巴�多" => "巴巴多斯",
-"巴巴多斯" => "巴巴多斯",
-"巴布亞新畿內亞" => "巴布亚新几内亚",
 "巴布亞�幾內亞" => "巴布亚新几内亚",
 "布基�法索" => "布基纳法索",
 "布��法索" => "布基纳法索",
 "蒲隆地" => "布隆迪",
-"布隆迪" => "布隆迪",
-"希臘" => "希腊",
 "帛�" => "帕劳",
 "義大利" => "�大利",
-"�大利" => "�大利",
-"所羅門群島" => "所罗门群岛",
 "索羅門群島" => "所罗门群岛",
 "汶�" => "文莱",
-"斯�士蘭" => "斯�士兰",
 "�瓦濟蘭" => "斯�士兰",
-"斯洛文尼亞" => "斯洛文尼亚",
 "斯洛維尼亞" => "斯洛文尼亚",
-"新西蘭" => "新西兰",
 "�西蘭" => "新西兰",
-"格林��" => "格林纳达",
 "格瑞那�" => "格林纳达",
-"格魯�亞" => "乔治亚",
-"喬治亞" => "乔治亚",
-"梵蒂岡" => "梵蒂冈",
-"毛里塔尼亞" => "毛里塔尼亚",
 "茅利塔尼亞" => "毛里塔尼亚",
 "毛里裘斯" => "毛里求斯",
 "模里西斯" => "毛里求斯",
 "沙地阿拉伯" => "沙特阿拉伯",
 "沙�地阿拉伯" => "沙特阿拉伯",
-"波斯尼亞黑塞哥維那" => "波斯尼亚和黑塞哥维那",
 "波士尼亞赫塞哥維�" => "波斯尼亚和黑塞哥维那",
-"津巴布韋" => "津巴布韦",
 "辛巴�" => "津巴布韦",
 "�都拉斯" => "洪都拉斯",
-"洪都拉斯" => "洪都拉斯",
-"特立尼�和多巴哥" => "特立尼达和托巴哥",
 "�里�托�哥" => "特立尼达和托巴哥",
-"瑙魯" => "瑙�",
 "諾魯" => "瑙�",
-"瓦努阿圖" => "瓦努阿图",
 "�那�" => "瓦努阿图",
 "溫�圖" => "瓦努阿图",
-"科摩羅" => "科摩罗",
 "葛摩" => "科摩罗",
 "象牙海岸" => "科特迪瓦",
 "�尼西亞" => "�尼斯",
-"索馬里" => "索马里",
 "索馬利亞" => "索马里",
-"�撾" => "��",
 "寮國" => "��",
 "肯雅" => "肯尼亚",
 "肯亞" => "肯尼亚",
 "蘇利�" => "�里�",
 "莫三比克" => "莫桑比克",
-"莫桑比克" => "莫桑比克",
-"�索托" => "莱索托",
 "賴索托" => "莱索托",
-"�寧" => "��",
 "��" => "��",
-"贊比亞" => "赞比亚",
 "尚比亞" => "赞比亚",
 "亞塞拜然" => "阿塞拜疆",
-"阿塞拜疆" => "阿塞拜疆",
-"阿拉伯��酋長國" => "阿拉伯��酋长国",
 "阿拉伯��大公國" => "阿拉伯��酋长国",
 "�韓" => "韩国",
-"馬爾代夫" => "马尔代夫",
 "馬爾地夫" => "马尔代夫",
 "馬爾他" => "马耳他",
 "馬利共和國" => "马里共和国",
@@ -11415,7 +11293,7 @@ $zh2CN = array(
 "泡麵" => "方便�",
 "笨豬跳" => "蹦�跳",
 "绑紧跳" => "蹦�跳",
-"冷盤　　" => "凉�",
+"冷盤" => "凉�",
 "冷�" => "凉�",
 "散钱" => "零钱",
 "�星" => "笑星",
@@ -11443,16 +11321,12 @@ $zh2CN = array(
 "�架" => "�豹",
 "�斯" => "大众",
 "�士" => "大众",
-"雪��" => "雪�龙",
 "�事得" => "马自达",
-"馬自�" => "马自达",
 "寶�" => "标志",
 "拿破崙" => "拿破仑",
 "布殊" => "布什",
 "布希" => "布什",
 "柯林頓" => "克林顿",
-"å…‹æž—é “" => "å…‹æž—é¡¿",
-"薩�姆" => "�达姆",
 "海�" => "�达姆",
 "梵谷" => "凡高",
 "大衛碧咸" => "大�·�克汉姆",
@@ -11472,6 +11346,7 @@ $zh2SG = array(
 "方便�" => "快速�",
 "速食麵" => "快速�",
 "�食麵" => "快速�",
+"泡麵" => "快速�",
 "蹦�跳" => "绑紧跳",
 "笨豬跳" => "绑紧跳",
 "凉�" => "冷�",
@@ -11483,6 +11358,5 @@ $zh2SG = array(
 "民�" => "��",
 "�房" => "�屋",
 "房价" => "屋价",
-"泡麵" => "快速�",
 
 );
\ No newline at end of file
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 732adae1..22144333 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -38,14 +38,15 @@
  */
 abstract class ApiBase {
 
-	// These constants allow modules to specify exactly how to treat incomming parameters.
+	// These constants allow modules to specify exactly how to treat incoming parameters.
 
-	const PARAM_DFLT = 0;
-	const PARAM_ISMULTI = 1;
-	const PARAM_TYPE = 2;
-	const PARAM_MAX = 3;
-	const PARAM_MAX2 = 4;
-	const PARAM_MIN = 5;
+	const PARAM_DFLT = 0; // Default value of the parameter
+	const PARAM_ISMULTI = 1; // Boolean, do we accept more than one item for this parameter (e.g.: titles)?
+	const PARAM_TYPE = 2; // Can be either a string type (e.g.: 'integer') or an array of allowed values
+	const PARAM_MAX = 3; // Max value allowed for a parameter. Only applies if TYPE='integer'
+	const PARAM_MAX2 = 4; // Max value allowed for a parameter for bots and sysops. Only applies if TYPE='integer'
+	const PARAM_MIN = 5; // Lowest value allowed for a parameter. Only applies if TYPE='integer'
+	const PARAM_ALLOW_DUPLICATES = 6; // Boolean, do we allow the same value to be set more than once when ISMULTI=true
 
 	const LIMIT_BIG1 = 500; // Fast query, std user limit
 	const LIMIT_BIG2 = 5000; // Fast query, bot/sysop limit
@@ -159,6 +160,10 @@ abstract class ApiBase {
 		$data =& $this->getResult()->getData();
 		if(isset($data['warnings'][$this->getModuleName()]))
 		{
+			# Don't add duplicate warnings
+			$warn_regex = preg_quote($warning, '/');
+			if(preg_match("/{$warn_regex}(\\n|$)/", $data['warnings'][$this->getModuleName()]['*']))
+				return;
 			$warning = "{$data['warnings'][$this->getModuleName()]['*']}\n$warning";
 			unset($data['warnings'][$this->getModuleName()]);
 		}
@@ -238,10 +243,10 @@ abstract class ApiBase {
 	 * module's help.
 	 */
 	public function makeHelpMsgParameters() {
-		$params = $this->getAllowedParams();
+		$params = $this->getFinalParams();
 		if ($params !== false) {
 
-			$paramsDescription = $this->getParamDescription();
+			$paramsDescription = $this->getFinalParamDescription();
 			$msg = '';
 			$paramPrefix = "\n" . str_repeat(' ', 19);
 			foreach ($params as $paramName => $paramSettings) {
@@ -260,7 +265,7 @@ abstract class ApiBase {
 						$choices = array();
 						$nothingPrompt = false;
 						foreach ($type as $t)
-							if ($t=='')
+							if ($t === '')
 								$nothingPrompt = 'Can be empty, or ';
 							else
 								$choices[] =  $t;
@@ -319,18 +324,39 @@ abstract class ApiBase {
 	}
 
 	/**
-	 * Returns an array of allowed parameters (keys) => default value for that parameter
+	 * Returns an array of allowed parameters (keys) => default value for that parameter.
+	 * Don't call this function directly: use getFinalParams() to allow hooks
+	 * to modify parameters as needed.
 	 */
 	protected function getAllowedParams() {
 		return false;
 	}
 
 	/**
-	 * Returns the description string for the given parameter.
+	 * Returns an array of parameter descriptions.
+	 * Don't call this functon directly: use getFinalParamDescription() to allow
+	 * hooks to modify descriptions as needed.
 	 */
 	protected function getParamDescription() {
 		return false;
 	}
+	
+	/**
+	 * Get final list of parameters, after hooks have had
+	 * a chance to tweak it as needed.
+	 */
+	public function getFinalParams() {
+		$params = $this->getAllowedParams();
+		wfRunHooks('APIGetAllowedParams', array(&$this, &$params));
+		return $params;
+	}
+	
+	
+	public function getFinalParamDescription() {
+		$desc = $this->getParamDescription();
+		wfRunHooks('APIGetParamDescription', array(&$this, &$desc));
+		return $desc;
+	}
 
 	/**
 	 * This method mangles parameter name based on the prefix supplied to the constructor.
@@ -343,12 +369,11 @@ abstract class ApiBase {
 	/**
 	* Using getAllowedParams(), makes an array of the values provided by the user,
 	* with key being the name of the variable, and value - validated value from user or default.
-	* This method can be used to generate local variables using extract().
 	* limit=max will not be parsed if $parseMaxLimit is set to false; use this
 	* when the max limit is not definite, e.g. when getting revisions.
 	*/
 	public function extractRequestParams($parseMaxLimit = true) {
-		$params = $this->getAllowedParams();
+		$params = $this->getFinalParams();
 		$results = array ();
 
 		foreach ($params as $paramName => $paramSettings)
@@ -361,10 +386,27 @@ abstract class ApiBase {
 	 * Get a value for the given parameter
 	 */
 	protected function getParameter($paramName, $parseMaxLimit = true) {
-		$params = $this->getAllowedParams();
+		$params = $this->getFinalParams();
 		$paramSettings = $params[$paramName];
 		return $this->getParameterFromSettings($paramName, $paramSettings, $parseMaxLimit);
 	}
+	
+	/**
+	 * Die if none or more than one of a certain set of parameters is set
+	 */
+	public function requireOnlyOneParameter($params) {
+		$required = func_get_args();
+		array_shift($required);
+		
+		$intersection = array_intersect(array_keys(array_filter($params,
+				create_function('$x', 'return !is_null($x);')
+			)), $required);
+		if (count($intersection) > 1) {
+			$this->dieUsage('The parameters '.implode(', ', $intersection).' can not be used together', 'invalidparammix');
+		} elseif (count($intersection) == 0) {
+			$this->dieUsage('One of the parameters '.implode(', ', $required).' is required', 'missingparam');
+		}
+	}
 
 	/**
 	 * Returns an array of the namespaces (by integer id) that exist on the
@@ -400,10 +442,12 @@ abstract class ApiBase {
 			$default = $paramSettings;
 			$multi = false;
 			$type = gettype($paramSettings);
+			$dupes = false;
 		} else {
 			$default = isset ($paramSettings[self :: PARAM_DFLT]) ? $paramSettings[self :: PARAM_DFLT] : null;
 			$multi = isset ($paramSettings[self :: PARAM_ISMULTI]) ? $paramSettings[self :: PARAM_ISMULTI] : false;
 			$type = isset ($paramSettings[self :: PARAM_TYPE]) ? $paramSettings[self :: PARAM_TYPE] : null;
+			$dupes = isset ($paramSettings[self:: PARAM_ALLOW_DUPLICATES]) ? $paramSettings[self :: PARAM_ALLOW_DUPLICATES] : false;
 
 			// When type is not given, and no choices, the type is the same as $default
 			if (!isset ($type)) {
@@ -494,8 +538,8 @@ abstract class ApiBase {
 				}
 			}
 
-			// There should never be any duplicate values in a list
-			if (is_array($value))
+			// Throw out duplicates if requested
+			if (is_array($value) && !$dupes)
 				$value = array_unique($value);
 		}
 
@@ -515,10 +559,10 @@ abstract class ApiBase {
 	protected function parseMultiValue($valueName, $value, $allowMultiple, $allowedValues) {
 		if( trim($value) === "" )
 			return array();
-		$sizeLimit = $this->mMainModule->canApiHighLimits() ? 501 : 51;
-		$valuesList = explode('|', $value,$sizeLimit);
-		if( count($valuesList) == $sizeLimit ) {
-			$junk = array_pop($valuesList); // kill last jumbled param
+		$sizeLimit = $this->mMainModule->canApiHighLimits() ? self::LIMIT_SML2 : self::LIMIT_SML1;
+		$valuesList = explode('|', $value, $sizeLimit + 1);
+		if( self::truncateArray($valuesList, $sizeLimit) ) {
+			$this->setWarning("Too many values supplied for parameter '$valueName': the limit is $sizeLimit");
 		}
 		if (!$allowMultiple && count($valuesList) != 1) {
 			$possibleValues = is_array($allowedValues) ? "of '" . implode("', '", $allowedValues) . "'" : '';
@@ -527,7 +571,7 @@ abstract class ApiBase {
 		if (is_array($allowedValues)) {
 			# Check for unknown values
 			$unknown = array_diff($valuesList, $allowedValues);
-			if(!empty($unknown))
+			if(count($unknown))
 			{
 				if($allowMultiple)
 				{
@@ -569,6 +613,23 @@ abstract class ApiBase {
 			}
 		}
 	}
+	
+	/**
+	 * Truncate an array to a certain length.
+	 * @param $arr array Array to truncate
+	 * @param $limit int Maximum length
+	 * @return bool True if the array was truncated, false otherwise
+	 */
+	public static function truncateArray(&$arr, $limit)
+	{
+		$modified = false;
+		while(count($arr) > $limit)
+		{
+			$junk = array_pop($arr);
+			$modified = true;
+		}
+		return $modified;
+	}
 
 	/**
 	 * Call main module's error handler
@@ -594,8 +655,6 @@ abstract class ApiBase {
 		'protectedpagetext' => array('code' => 'protectedpage', 'info' => "The ``\$1'' right is required to edit this page"),
 		'protect-cantedit' => array('code' => 'cantedit', 'info' => "You can't protect this page because you can't edit it"),
 		'badaccess-group0' => array('code' => 'permissiondenied', 'info' => "Permission denied"), // Generic permission denied message
-		'badaccess-group1' => array('code' => 'permissiondenied', 'info' => "Permission denied"), // Can't use the parameter 'cause it's wikilinked
-		'badaccess-group2' => array('code' => 'permissiondenied', 'info' => "Permission denied"),
 		'badaccess-groups' => array('code' => 'permissiondenied', 'info' => "Permission denied"),
 		'titleprotected' => array('code' => 'protectedtitle', 'info' => "This title has been protected from creation"),
 		'nocreate-loggedin' => array('code' => 'cantcreate', 'info' => "You don't have permission to create new pages"),
@@ -632,13 +691,21 @@ abstract class ApiBase {
 		'ipb_already_blocked' => array('code' => 'alreadyblocked', 'info' => "The user you tried to block was already blocked"),
 		'ipb_blocked_as_range' => array('code' => 'blockedasrange', 'info' => "IP address ``\$1'' was blocked as part of range ``\$2''. You can't unblock the IP invidually, but you can unblock the range as a whole."),
 		'ipb_cant_unblock' => array('code' => 'cantunblock', 'info' => "The block you specified was not found. It may have been unblocked already"),
+		'mailnologin' => array('code' => 'cantsend', 'info' => "You're not logged in or you don't have a confirmed e-mail address, so you can't send e-mail"),
+		'usermaildisabled' => array('code' => 'usermaildisabled', 'info' => "User email has been disabled"),
+		'blockedemailuser' => array('code' => 'blockedfrommail', 'info' => "You have been blocked from sending e-mail"),
+		'notarget' => array('code' => 'notarget', 'info' => "You have not specified a valid target for this action"),
+		'noemail' => array('code' => 'noemail', 'info' => "The user has not specified a valid e-mail address, or has chosen not to receive e-mail from other users"),
+		'rcpatroldisabled' => array('code' => 'patroldisabled', 'info' => "Patrolling is disabled on this wiki"),
+		'markedaspatrollederror-noautopatrol' => array('code' => 'noautopatrol', 'info' => "You don't have permission to patrol your own changes"),
 
 		// API-specific messages
 		'missingparam' => array('code' => 'no$1', 'info' => "The \$1 parameter must be set"),
 		'invalidtitle' => array('code' => 'invalidtitle', 'info' => "Bad title ``\$1''"),
+		'nosuchpageid' => array('code' => 'nosuchpageid', 'info' => "There is no page with ID \$1"),
 		'invaliduser' => array('code' => 'invaliduser', 'info' => "Invalid username ``\$1''"),
-		'invalidexpiry' => array('code' => 'invalidexpiry', 'info' => "Invalid expiry time"),
-		'pastexpiry' => array('code' => 'pastexpiry', 'info' => "Expiry time is in the past"),
+		'invalidexpiry' => array('code' => 'invalidexpiry', 'info' => "Invalid expiry time ``\$1''"),
+		'pastexpiry' => array('code' => 'pastexpiry', 'info' => "Expiry time ``\$1'' is in the past"),
 		'create-titleexists' => array('code' => 'create-titleexists', 'info' => "Existing titles can't be protected with 'create'"),
 		'missingtitle-createonly' => array('code' => 'missingtitle-createonly', 'info' => "Missing titles can only be protected with 'create'"),
 		'cantblock' => array('code' => 'cantblock', 'info' => "You don't have permission to block users"),
@@ -651,6 +718,12 @@ abstract class ApiBase {
 		'permdenied-undelete' => array('code' => 'permissiondenied', 'info' => "You don't have permission to restore deleted revisions"),
 		'createonly-exists' => array('code' => 'articleexists', 'info' => "The article you tried to create has been created already"),
 		'nocreate-missing' => array('code' => 'missingtitle', 'info' => "The article you tried to edit doesn't exist"),
+		'nosuchrcid' => array('code' => 'nosuchrcid', 'info' => "There is no change with rcid ``\$1''"),
+		'cantpurge' => array('code' => 'cantpurge', 'info' => "Only users with the 'purge' right can purge pages via the API"),
+		'protect-invalidaction' => array('code' => 'protect-invalidaction', 'info' => "Invalid protection type ``\$1''"),
+		'protect-invalidlevel' => array('code' => 'protect-invalidlevel', 'info' => "Invalid protection level ``\$1''"),
+		'toofewexpiries' => array('code' => 'toofewexpiries', 'info' => "\$1 expiry timestamps were provided where \$2 were needed"),
+		
 
 		// ApiEditPage messages
 		'noimageredirect-anon' => array('code' => 'noimageredirect-anon', 'info' => "Anonymous users can't create image redirects"),
@@ -665,18 +738,33 @@ abstract class ApiBase {
 		'editconflict' => array('code' => 'editconflict', 'info' => "Edit conflict detected"),
 		'hashcheckfailed' => array('code' => 'badmd5', 'info' => "The supplied MD5 hash was incorrect"),
 		'missingtext' => array('code' => 'notext', 'info' => "One of the text, appendtext and prependtext parameters must be set"),
+		'emptynewsection' => array('code' => 'emptynewsection', 'info' => 'Creating empty new sections is not possible.'),
 	);
 
 	/**
 	 * Output the error message related to a certain array
-	 * @param array $error Element of a getUserPermissionsErrors()
+	 * @param array $error Element of a getUserPermissionsErrors()-style array
 	 */
 	public function dieUsageMsg($error) {
+		$parsed = $this->parseMsg($error);
+		$this->dieUsage($parsed['code'], $parsed['info']);
+	}
+	
+	/**
+	 * Return the error message related to a certain array
+	 * @param array $error Element of a getUserPermissionsErrors()-style array
+	 * @return array('code' => code, 'info' => info)
+	 */
+	public function parseMsg($error) {
 		$key = array_shift($error);
 		if(isset(self::$messageMap[$key]))
-			$this->dieUsage(wfMsgReplaceArgs(self::$messageMap[$key]['info'], $error), wfMsgReplaceArgs(self::$messageMap[$key]['code'], $error));
+			return array(	'code' =>
+				wfMsgReplaceArgs(self::$messageMap[$key]['code'], $error),
+					'info' =>
+				wfMsgReplaceArgs(self::$messageMap[$key]['info'], $error)
+			);
 		// If the key isn't present, throw an "unknown error"
-		$this->dieUsageMsg(array('unknownerror', $key));
+		return $this->parseMsg(array('unknownerror', $key));
 	}
 
 	/**
@@ -814,6 +902,6 @@ abstract class ApiBase {
 	 * Returns a String that identifies the version of this class.
 	 */
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiBase.php 36309 2008-06-15 20:37:28Z catrope $';
+		return __CLASS__ . ': $Id: ApiBase.php 47041 2009-02-09 14:39:41Z catrope $';
 	}
 }
diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index 34813bf7..dfb11061 100644
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -49,7 +49,7 @@ class ApiBlock extends ApiBase {
 	 * of success. If it fails, the result will specify the nature of the error.
 	 */
 	public function execute() {
-		global $wgUser;
+		global $wgUser, $wgBlockAllowsUTEdit;
 		$this->getMain()->requestWriteMode();
 		$params = $this->extractRequestParams();
 
@@ -72,8 +72,6 @@ class ApiBlock extends ApiBase {
 			$this->dieUsageMsg(array('canthide'));
 		if($params['noemail'] && !$wgUser->isAllowed('blockemail'))
 			$this->dieUsageMsg(array('cantblock-email'));
-		if(wfReadOnly())
-			$this->dieUsageMsg(array('readonlytext'));
 
 		$form = new IPBlockForm('');
 		$form->BlockAddress = $params['user'];
@@ -83,13 +81,15 @@ class ApiBlock extends ApiBase {
 		$form->BlockOther = '';
 		$form->BlockAnonOnly = $params['anononly'];
 		$form->BlockCreateAccount = $params['nocreate'];
-		$form->BlockEnableAutoBlock = $params['autoblock'];
+		$form->BlockEnableAutoblock = $params['autoblock'];
 		$form->BlockEmail = $params['noemail'];
 		$form->BlockHideName = $params['hidename'];
+		$form->BlockAllowUsertalk = $params['allowusertalk'] && $wgBlockAllowsUTEdit;
+		$form->BlockReblock = $params['reblock'];
 
 		$userID = $expiry = null;
 		$retval = $form->doBlock($userID, $expiry);
-		if(!empty($retval))
+		if(count($retval))
 			// We don't care about multiple errors, just report one of them
 			$this->dieUsageMsg($retval);
 
@@ -107,6 +107,8 @@ class ApiBlock extends ApiBase {
 			$res['noemail'] = '';
 		if($params['hidename'])
 			$res['hidename'] = '';
+		if($params['allowusertalk'])
+			$res['allowusertalk'] = '';
 
 		$this->getResult()->addValue(null, $this->getModuleName(), $res);
 	}
@@ -125,13 +127,15 @@ class ApiBlock extends ApiBase {
 			'autoblock' => false,
 			'noemail' => false,
 			'hidename' => false,
+			'allowusertalk' => false,
+			'reblock' => false,
 		);
 	}
 
 	public function getParamDescription() {
 		return array (
 			'user' => 'Username, IP address or IP range you want to block',
-			'token' => 'A block token previously obtained through the gettoken parameter',
+			'token' => 'A block token previously obtained through the gettoken parameter or prop=info',
 			'gettoken' => 'If set, a block token will be returned, and no other action will be taken',
 			'expiry' => 'Relative expiry time, e.g. \'5 months\' or \'2 weeks\'. If set to \'infinite\', \'indefinite\' or \'never\', the block will never expire.',
 			'reason' => 'Reason for block (optional)',
@@ -139,7 +143,9 @@ class ApiBlock extends ApiBase {
 			'nocreate' => 'Prevent account creation',
 			'autoblock' => 'Automatically block the last used IP address, and any subsequent IP addresses they try to login from',
 			'noemail' => 'Prevent user from sending e-mail through the wiki. (Requires the "blockemail" right.)',
-			'hidename' => 'Hide the username from the block log. (Requires the "hideuser" right.)'
+			'hidename' => 'Hide the username from the block log. (Requires the "hideuser" right.)',
+			'allowusertalk' => 'Allow the user to edit their own talk page (depends on $wgBlockAllowsUTEdit)',
+			'reblock' => 'If the user is already blocked, overwrite the existing block',
 		);
 	}
 
@@ -157,6 +163,6 @@ class ApiBlock extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiBlock.php 35388 2008-05-27 10:18:28Z catrope $';
+		return __CLASS__ . ': $Id: ApiBlock.php 43677 2008-11-18 15:21:04Z catrope $';
 	}
 }
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 06592d46..c0212924 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -52,29 +52,36 @@ class ApiDelete extends ApiBase {
 		$this->getMain()->requestWriteMode();
 		$params = $this->extractRequestParams();
 
-		$titleObj = NULL;
-		if(!isset($params['title']))
-			$this->dieUsageMsg(array('missingparam', 'title'));
+		$this->requireOnlyOneParameter($params, 'title', 'pageid');
 		if(!isset($params['token']))
 			$this->dieUsageMsg(array('missingparam', 'token'));
 
-		$titleObj = Title::newFromText($params['title']);
-		if(!$titleObj)
-			$this->dieUsageMsg(array('invalidtitle', $params['title']));
+		if(isset($params['title']))
+		{
+			$titleObj = Title::newFromText($params['title']);
+			if(!$titleObj)
+				$this->dieUsageMsg(array('invalidtitle', $params['title']));
+		}
+		else if(isset($params['pageid']))
+		{
+			$titleObj = Title::newFromID($params['pageid']);
+			if(!$titleObj)
+				$this->dieUsageMsg(array('nosuchpageid', $params['pageid']));
+		}
 		if(!$titleObj->exists())
 			$this->dieUsageMsg(array('notanarticle'));
 
 		$reason = (isset($params['reason']) ? $params['reason'] : NULL);
-		if ($titleObj->getNamespace() == NS_IMAGE) {
-			$retval = self::deletefile($params['token'], $titleObj, $params['oldimage'], $reason, false);
-			if(!empty($retval))
+		if ($titleObj->getNamespace() == NS_FILE) {
+			$retval = self::deleteFile($params['token'], $titleObj, $params['oldimage'], $reason, false);
+			if(count($retval))
 				// We don't care about multiple errors, just report one of them
 				$this->dieUsageMsg(current($retval));
 		} else {
 			$articleObj = new Article($titleObj);
 			$retval = self::delete($articleObj, $params['token'], $reason);
 			
-			if(!empty($retval))
+			if(count($retval))
 				// We don't care about multiple errors, just report one of them
 				$this->dieUsageMsg(current($retval));
 			
@@ -90,8 +97,6 @@ class ApiDelete extends ApiBase {
 
 	private static function getPermissionsError(&$title, $token) {
 		global $wgUser;
-		// Check wiki readonly
-		if (wfReadOnly()) return array(array('readonlytext'));
 		
 		// Check permissions
 		$errors = $title->getUserPermissionsErrors('delete', $wgUser);
@@ -114,8 +119,8 @@ class ApiDelete extends ApiBase {
 	public static function delete(&$article, $token, &$reason = NULL)
 	{
 		global $wgUser;
-		
-		$errors = self::getPermissionsError($article->getTitle(), $token);
+		$title = $article->getTitle();
+		$errors = self::getPermissionsError($title, $token);
 		if (count($errors)) return $errors;
 
 		// Auto-generate a summary, if necessary
@@ -156,7 +161,8 @@ class ApiDelete extends ApiBase {
 			
 		if( !FileDeleteForm::haveDeletableFile($file, $oldfile, $oldimage) )
 			return array(array('nofile'));
-
+		if (is_null($reason)) # Log and RC don't like null reasons
+			$reason = '';
 		$status = FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress );
 				
 		if( !$status->isGood() )
@@ -170,6 +176,9 @@ class ApiDelete extends ApiBase {
 	public function getAllowedParams() {
 		return array (
 			'title' => null,
+			'pageid' => array(
+				ApiBase::PARAM_TYPE => 'integer'
+			),
 			'token' => null,
 			'reason' => null,
 			'watch' => false,
@@ -180,7 +189,8 @@ class ApiDelete extends ApiBase {
 
 	public function getParamDescription() {
 		return array (
-			'title' => 'Title of the page you want to delete.',
+			'title' => 'Title of the page you want to delete. Cannot be used together with pageid',
+			'pageid' => 'Page ID of the page you want to delete. Cannot be used together with title',
 			'token' => 'A delete token previously retrieved through prop=info',
 			'reason' => 'Reason for the deletion. If not set, an automatically generated reason will be used.',
 			'watch' => 'Add the page to your watchlist',
@@ -191,7 +201,7 @@ class ApiDelete extends ApiBase {
 
 	public function getDescription() {
 		return array(
-			'Deletes a page. You need to be logged in as a sysop to use this function, see also action=login.'
+			'Delete a page.'
 		);
 	}
 
@@ -203,6 +213,6 @@ class ApiDelete extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiDelete.php 35350 2008-05-26 12:15:21Z simetrical $';
+		return __CLASS__ . ': $Id: ApiDelete.php 44541 2008-12-13 21:07:18Z mrzman $';
 	}
 }
diff --git a/includes/api/ApiDisabled.php b/includes/api/ApiDisabled.php
new file mode 100644
index 00000000..40e38a0f
--- /dev/null
+++ b/includes/api/ApiDisabled.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * Created on Sep 25, 2008
+ * API for MediaWiki 1.8+
+ *
+ * Copyright (C) 2008 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	// Eclipse helper - will be ignored in production
+	require_once ("ApiBase.php");
+}
+
+
+/**
+ * API module that dies with an error immediately.
+ *
+ * Use this to disable core modules with
+ * $wgAPIModules['modulename'] = 'ApiDisabled';
+ *
+ * To disable submodules of action=query, use ApiQueryDisabled instead
+ *
+ * @ingroup API
+ */
+class ApiDisabled extends ApiBase {
+
+	public function __construct($main, $action) {
+		parent :: __construct($main, $action);
+	}
+
+	public function execute() {
+		$this->dieUsage("The ``{$this->getModuleName()}'' module has been disabled.", 'moduledisabled');
+	}
+
+	public function getAllowedParams() {
+		return array ();
+	}
+
+	public function getParamDescription() {
+		return array ();
+	}
+
+	public function getDescription() {
+		return array(
+			'This module has been disabled.'
+		);
+	}
+
+	protected function getExamples() {
+		return array ();
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiDisabled.php 41268 2008-09-25 20:50:50Z catrope $';
+	}
+}
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index d10432f3..bc5dfa87 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -29,8 +29,10 @@ if (!defined('MEDIAWIKI')) {
 }
 
 /**
- * A query module to list all external URLs found on a given set of pages.
+ * A module that allows for editing and creating pages.
  *
+ * Currently, this wraps around the EditPage class in an ugly way,
+ * EditPage.php should be rewritten to provide a cleaner interface
  * @ingroup API
  */
 class ApiEditPage extends ApiBase {
@@ -66,7 +68,7 @@ class ApiEditPage extends ApiBase {
 		$errors = $titleObj->getUserPermissionsErrors('edit', $wgUser);
 		if(!$titleObj->exists())
 			$errors = array_merge($errors, $titleObj->getUserPermissionsErrors('create', $wgUser));
-		if(!empty($errors))
+		if(count($errors))
 			$this->dieUsageMsg($errors[0]);
 
 		$articleObj = new Article($titleObj);
@@ -98,8 +100,11 @@ class ApiEditPage extends ApiBase {
 			$reqArr['wpEdittime'] = wfTimestamp(TS_MW, $params['basetimestamp']);
 		else
 			$reqArr['wpEdittime'] = $articleObj->getTimestamp();
-		# Fake wpStartime
-		$reqArr['wpStarttime'] = $reqArr['wpEdittime'];
+		if(!is_null($params['starttimestamp']) && $params['starttimestamp'] != '')
+			$reqArr['wpStarttime'] = wfTimestamp(TS_MW, $params['starttimestamp']);
+		else
+			# Fake wpStartime
+			$reqArr['wpStarttime'] = $reqArr['wpEdittime'];
 		if($params['minor'] || (!$params['notminor'] && $wgUser->getOption('minordefault')))
 			$reqArr['wpMinoredit'] = '';
 		if($params['recreate'])
@@ -111,6 +116,8 @@ class ApiEditPage extends ApiBase {
 				$this->dieUsage("The section parameter must be set to an integer or 'new'", "invalidsection");
 			$reqArr['wpSection'] = $params['section'];
 		}
+		else
+			$reqArr['wpSection'] = '';
 
 		if($params['watch'])
 			$watch = true;
@@ -134,13 +141,13 @@ class ApiEditPage extends ApiBase {
 		# Handle CAPTCHA parameters
 		global $wgRequest;
 		if(isset($params['captchaid']))
-			$wgRequest->data['wpCaptchaId'] = $params['captchaid'];
+			$wgRequest->setVal( 'wpCaptchaId', $params['captchaid'] );
 		if(isset($params['captchaword']))
-			$wgRequest->data['wpCaptchaWord'] = $params['captchaword'];
+			$wgRequest->setVal( 'wpCaptchaWord', $params['captchaword'] );
 		$r = array();
 		if(!wfRunHooks('APIEditBeforeSave', array(&$ep, $ep->textbox1, &$r)))
 		{
-			if(!empty($r))
+			if(count($r))
 			{
 				$r['result'] = "Failure";
 				$this->getResult()->addValue(null, $this->getModuleName(), $r);
@@ -200,18 +207,24 @@ class ApiEditPage extends ApiBase {
 			case EditPage::AS_CONFLICT_DETECTED:
 				$this->dieUsageMsg(array('editconflict'));
 			#case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary
-			#case EditPage::AS_TEXTBOX_EMPTY: Can't happen since we don't do sections
+			case EditPage::AS_TEXTBOX_EMPTY:
+				$this->dieUsageMsg(array('emptynewsection'));
 			case EditPage::AS_END:
 				# This usually means some kind of race condition
 				# or DB weirdness occurred. Throw an unknown error here.
-				$this->dieUsageMsg(array('unknownerror', 'AS_END'));
+				$this->dieUsageMsg(array('unknownerror'));
 			case EditPage::AS_SUCCESS_NEW_ARTICLE:
 				$r['new'] = '';
 			case EditPage::AS_SUCCESS_UPDATE:
 				$r['result'] = "Success";
 				$r['pageid'] = $titleObj->getArticleID();
 				$r['title'] = $titleObj->getPrefixedText();
-				$newRevId = $titleObj->getLatestRevId();
+				# HACK: We create a new Article object here because getRevIdFetched()
+				# refuses to be run twice, and because Title::getLatestRevId()
+				# won't fetch from the master unless we select for update, which we
+				# don't want to do.
+				$newArticle = new Article($titleObj);
+				$newRevId = $newArticle->getRevIdFetched();
 				if($newRevId == $oldRevId)
 					$r['nochange'] = '';
 				else
@@ -245,6 +258,7 @@ class ApiEditPage extends ApiBase {
 			'notminor' => false,
 			'bot' => false,
 			'basetimestamp' => null,
+			'starttimestamp' => null,
 			'recreate' => false,
 			'createonly' => false,
 			'nocreate' => false,
@@ -271,6 +285,9 @@ class ApiEditPage extends ApiBase {
 			'basetimestamp' => array('Timestamp of the base revision (gotten through prop=revisions&rvprop=timestamp).',
 						'Used to detect edit conflicts; leave unset to ignore conflicts.'
 			),
+			'starttimestamp' => array('Timestamp when you obtained the edit token.',
+						'Used to detect edit conflicts; leave unset to ignore conflicts.'
+			),
 			'recreate' => 'Override any errors about the article having been deleted in the meantime',
 			'createonly' => 'Don\'t edit the page if it exists already',
 			'nocreate' => 'Throw an error if the page doesn\'t exist',
@@ -294,6 +311,6 @@ class ApiEditPage extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiEditPage.php 36309 2008-06-15 20:37:28Z catrope $';
+		return __CLASS__ . ': $Id: ApiEditPage.php 44394 2008-12-10 14:12:54Z catrope $';
 	}
 }
diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php
index 7e083536..fbdf495f 100644
--- a/includes/api/ApiEmailUser.php
+++ b/includes/api/ApiEmailUser.php
@@ -39,6 +39,11 @@ class ApiEmailUser extends ApiBase {
 
 	public function execute() {
 		global $wgUser;
+		
+		// Check whether email is enabled
+		if ( !EmailUserForm::userEmailEnabled() )
+			$this->dieUsageMsg( array( 'usermaildisabled' ) );
+		
 		$this->getMain()->requestWriteMode();
 		$params = $this->extractRequestParams();
 		
@@ -53,12 +58,12 @@ class ApiEmailUser extends ApiBase {
 		// Validate target 
 		$targetUser = EmailUserForm::validateEmailTarget( $params['target'] );
 		if ( !( $targetUser instanceof User ) )
-			$this->dieUsageMsg( array( $targetUser[0] ) );
+			$this->dieUsageMsg( array( $targetUser ) );
 		
 		// Check permissions
 		$error = EmailUserForm::getPermissionsError( $wgUser, $params['token'] );
 		if ( $error )
-			$this->dieUsageMsg( array( $error[0] ) );
+			$this->dieUsageMsg( array( $error ) );
 		
 			
 		$form = new EmailUserForm( $targetUser, $params['text'], $params['subject'], $params['ccme'] );
@@ -89,7 +94,6 @@ class ApiEmailUser extends ApiBase {
 			'target' => 'User to send email to',
 			'subject' => 'Subject header',
 			'text' => 'Mail body',
-			// FIXME: How to properly get a token?
 			'token' => 'A token previously acquired via prop=info',
 			'ccme' => 'Send a copy of this mail to me',
 		);
@@ -97,7 +101,7 @@ class ApiEmailUser extends ApiBase {
 
 	public function getDescription() {
 		return array(
-			'Emails a user.'
+			'Email a user.'
 		);
 	}
 
@@ -108,7 +112,7 @@ class ApiEmailUser extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: $';
+		return __CLASS__ . ': $Id: ApiEmailUser.php 41269 2008-09-25 21:39:36Z catrope $';
 	}
 }	
 	
\ No newline at end of file
diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php
index 397aece3..f4e6212a 100644
--- a/includes/api/ApiExpandTemplates.php
+++ b/includes/api/ApiExpandTemplates.php
@@ -43,23 +43,22 @@ class ApiExpandTemplates extends ApiBase {
 
 	public function execute() {
 		// Get parameters
-		extract( $this->extractRequestParams() );
-		$retval = '';
+		$params = $this->extractRequestParams();
 
 		//Create title for parser
-		$title_obj = Title :: newFromText( $title );
+		$title_obj = Title :: newFromText( $params['title'] );
 		if(!$title_obj)
-			$title_obj = Title :: newFromText( "API" );	//  Default title is "API". For example, ExpandTemplates uses "ExpendTemplates" for it
+			$title_obj = Title :: newFromText( "API" ); // default
 
 		$result = $this->getResult();
 
 		// Parse text
 		global $wgParser;
 		$options = new ParserOptions();
-		if ( $generatexml )
+		if ( $params['generatexml'] )
 		{
 			$wgParser->startExternalParse( $title_obj, $options, OT_PREPROCESS );
-			$dom = $wgParser->preprocessToDom( $text );
+			$dom = $wgParser->preprocessToDom( $params['text'] );
 			if ( is_callable( array( $dom, 'saveXML' ) ) ) {
 				$xml = $dom->saveXML();
 			} else {
@@ -67,9 +66,9 @@ class ApiExpandTemplates extends ApiBase {
 			}
 			$xml_result = array();
 			$result->setContent( $xml_result, $xml );
-            $result->addValue( null, 'parsetree', $xml_result);
+			$result->addValue( null, 'parsetree', $xml_result);
 		}
-		$retval = $wgParser->preprocess( $text, $title_obj, $options );
+		$retval = $wgParser->preprocess( $params['text'], $title_obj, $options );
 
 		// Return result
 		$retval_array = array();
@@ -106,6 +105,6 @@ class ApiExpandTemplates extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiExpandTemplates.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiExpandTemplates.php 44719 2008-12-17 16:34:01Z catrope $';
 	}
 }
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index 8f08f4db..9efbbbe0 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -199,15 +199,17 @@ See <a href='http://www.mediawiki.org/wiki/API'>complete documentation</a>, or
 	* This method also replaces any '<' with &lt;
 	*/
 	protected function formatHTML($text) {
+		global $wgUrlProtocols;
+		
 		// Escape everything first for full coverage
 		$text = htmlspecialchars($text);
 
 		// encode all comments or tags as safe blue strings
 		$text = preg_replace('/\&lt;(!--.*?--|.*?)\&gt;/', '<span style="color:blue;">&lt;\1&gt;</span>', $text);
 		// identify URLs
-		$protos = "http|https|ftp|gopher";
+		$protos = implode("|", $wgUrlProtocols);
 		# This regex hacks around bug 13218 (&quot; included in the URL)
-		$text = preg_replace("#(($protos)://.*?)(&quot;)?([ \\'\"()<\n])#", '<a href="\\1">\\1</a>\\3\\4', $text);
+		$text = preg_replace("#(($protos).*?)(&quot;)?([ \\'\"()<\n])#", '<a href="\\1">\\1</a>\\3\\4', $text);
 		// identify requests to api.php
 		$text = preg_replace("#api\\.php\\?[^ \\()<\n\t]+#", '<a href="\\0">\\0</a>', $text);
 		if( $this->mHelp ) {
@@ -239,7 +241,7 @@ See <a href='http://www.mediawiki.org/wiki/API'>complete documentation</a>, or
 	}
 
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiFormatBase.php 44569 2008-12-14 08:31:04Z tstarling $';
+		return __CLASS__ . ': $Id: ApiFormatBase.php 43470 2008-11-14 00:30:34Z tstarling $';
 	}
 }
 
@@ -300,6 +302,6 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatBase.php 44569 2008-12-14 08:31:04Z tstarling $';
+		return __CLASS__ . ': $Id: ApiFormatBase.php 43470 2008-11-14 00:30:34Z tstarling $';
 	}
 }
diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 42156849..1d89eb18 100644
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -58,7 +58,10 @@ class ApiFormatJson extends ApiFormatBase {
 			$suffix = ")";
 		}
 
-		if (!function_exists('json_encode') || $this->getIsHtml()) {
+		// Some versions of PHP have a broken json_encode, see PHP bug 
+		// 46944. Test encoding an affected character (U+20000) to 
+		// avoid this.
+		if (!function_exists('json_encode') || $this->getIsHtml() || strtolower(json_encode("\xf0\xa0\x80\x80")) != '\ud840\udc00') {
 			$json = new Services_JSON();
 			$this->printText($prefix . $json->encode($this->getResultData(), $this->getIsHtml()) . $suffix);
 		} else {
@@ -86,6 +89,6 @@ class ApiFormatJson extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatJson.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiFormatJson.php 45682 2009-01-12 19:06:33Z raymond $';
 	}
 }
diff --git a/includes/api/ApiFormatJson_json.php b/includes/api/ApiFormatJson_json.php
index 87d7086e..4b29ff56 100644
--- a/includes/api/ApiFormatJson_json.php
+++ b/includes/api/ApiFormatJson_json.php
@@ -50,7 +50,7 @@
 * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
 * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
 * @copyright   2005 Michal Migurski
-* @version     CVS: $Id: ApiFormatJson_json.php 35098 2008-05-20 17:13:28Z ialex $
+* @version     CVS: $Id: ApiFormatJson_json.php 45682 2009-01-12 19:06:33Z raymond $
 * @license     http://www.opensource.org/licenses/bsd-license.php
 * @see         http://pear.php.net/pepr/pepr-proposal-show.php?id=198
 */
@@ -168,6 +168,17 @@ class Services_JSON
                 return chr(0xC0 | (($bytes >> 6) & 0x1F))
                      . chr(0x80 | ($bytes & 0x3F));
 
+            case (0xFC00 & $bytes) == 0xD800 && strlen($utf16) >= 4 && (0xFC & ord($utf16{2})) == 0xDC:
+                // return a 4-byte UTF-8 character
+                $char = ((($bytes & 0x03FF) << 10)
+                       | ((ord($utf16{2}) & 0x03) << 8)
+                       | ord($utf16{3}));
+                $char += 0x10000;
+                return chr(0xF0 | (($char >> 18) & 0x07))
+                     . chr(0x80 | (($char >> 12) & 0x3F))
+                     . chr(0x80 | (($char >> 6) & 0x3F))
+                     . chr(0x80 | ($char & 0x3F));
+
             case (0xFFFF & $bytes) == $bytes:
                 // return a 3-byte UTF-8 character
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -218,6 +229,20 @@ class Services_JSON
                          | (0x0F & (ord($utf8{1}) >> 2)))
                      . chr((0xC0 & (ord($utf8{1}) << 6))
                          | (0x7F & ord($utf8{2})));
+
+            case 4:
+                // return a UTF-16 surrogate pair from a 4-byte UTF-8 char
+                if(ord($utf8{0}) > 0xF4) return ''; # invalid
+                $char = ((0x1C0000 & (ord($utf8{0}) << 18))
+                       | (0x03F000 & (ord($utf8{1}) << 12))
+                       | (0x000FC0 & (ord($utf8{2}) << 6))
+                       | (0x00003F & ord($utf8{3})));
+                if($char > 0x10FFFF) return ''; # invalid
+                $char -= 0x10000;
+                return chr(0xD8 | (($char >> 18) & 0x03))
+                     . chr(($char >> 10) & 0xFF)
+                     . chr(0xDC | (($char >> 8) & 0x03))
+                     . chr($char & 0xFF);
         }
 
         // ignoring UTF-32 for now, sorry
@@ -346,40 +371,19 @@ class Services_JSON
                         case (($ord_var_c & 0xF8) == 0xF0):
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            // These will always return a surrogate pair
                             $char = pack('C*', $ord_var_c,
                                          ord($var{$c + 1}),
                                          ord($var{$c + 2}),
                                          ord($var{$c + 3}));
                             $c += 3;
                             $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            if($utf16 == '') {
+                                $ascii .= '\ufffd';
+                            } else {
+                                $utf16 = str_split($utf16, 2);
+                                $ascii .= sprintf('\u%04s\u%04s', bin2hex($utf16[0]), bin2hex($utf16[1]));
+                            }
                             break;
                     }
                 }
@@ -591,6 +595,16 @@ class Services_JSON
                                 }
                                 break;
 
+                            case preg_match('/\\\uD[89AB][0-9A-F]{2}\\\uD[C-F][0-9A-F]{2}/i', substr($chrs, $c, 12)):
+                                // escaped unicode surrogate pair
+                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
+                                       . chr(hexdec(substr($chrs, ($c + 4), 2)))
+                                       . chr(hexdec(substr($chrs, ($c + 8), 2)))
+                                       . chr(hexdec(substr($chrs, ($c + 10), 2)));
+                                $utf8 .= $this->utf162utf8($utf16);
+                                $c += 11;
+                                break;
+
                             case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
                                 // single, escaped unicode character
                                 $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
@@ -812,6 +826,9 @@ class Services_JSON
     }
 }
 
+
+// Hide the PEAR_Error variant from Doxygen
+/// @cond
 if (class_exists('PEAR_Error')) {
 
     /**
@@ -827,6 +844,7 @@ if (class_exists('PEAR_Error')) {
     }
 
 } else {
+/// @endcond
 
     /**
      * @todo Ultimately, this class shall be descended from PEAR_Error
diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php
index 0909539e..e741c16d 100644
--- a/includes/api/ApiFormatWddx.php
+++ b/includes/api/ApiFormatWddx.php
@@ -42,38 +42,62 @@ class ApiFormatWddx extends ApiFormatBase {
 	}
 
 	public function execute() {
-		if (function_exists('wddx_serialize_value')) {
+		if (function_exists('wddx_serialize_value') && !$this->getIsHtml()) {
 			$this->printText(wddx_serialize_value($this->getResultData()));
 		} else {
-			$this->printText('<?xml version="1.0" encoding="utf-8"?>');
-			$this->printText('<wddxPacket version="1.0"><header/><data>');
-			$this->slowWddxPrinter($this->getResultData());
-			$this->printText('</data></wddxPacket>');
+			// Don't do newlines and indentation if we weren't asked
+			// for pretty output
+			$nl = ($this->getIsHtml() ? "" : "\n");
+			$indstr = " ";
+			$this->printText("<?xml version=\"1.0\"?>$nl");
+			$this->printText("<wddxPacket version=\"1.0\">$nl");
+			$this->printText("$indstr<header/>$nl");
+			$this->printText("$indstr<data>$nl");
+			$this->slowWddxPrinter($this->getResultData(), 4);
+			$this->printText("$indstr</data>$nl");
+			$this->printText("</wddxPacket>$nl");
 		}
 	}
 
 	/**
 	* Recursivelly go through the object and output its data in WDDX format.
 	*/
-	function slowWddxPrinter($elemValue) {
+	function slowWddxPrinter($elemValue, $indent = 0) {
+		$indstr = ($this->getIsHtml() ? "" : str_repeat(' ', $indent));
+		$indstr2 = ($this->getIsHtml() ? "" : str_repeat(' ', $indent + 2));
+		$nl = ($this->getIsHtml() ? "" : "\n");
 		switch (gettype($elemValue)) {
 			case 'array' :
-				$this->printText('<struct>');
-				foreach ($elemValue as $subElemName => $subElemValue) {
-					$this->printText(wfElement('var', array (
-						'name' => $subElemName
-					), null));
-					$this->slowWddxPrinter($subElemValue);
-					$this->printText('</var>');
+				// Check whether we've got an associative array (<struct>)
+				// or a regular array (<array>)
+				$cnt = count($elemValue);
+				if($cnt == 0 || array_keys($elemValue) === range(0, $cnt - 1)) {
+					// Regular array
+					$this->printText($indstr . Xml::element('array', array(
+						'length' => $cnt
+					), null) . $nl);
+					foreach($elemValue as $subElemValue)
+						$this->slowWddxPrinter($subElemValue, $indent + 2);
+					$this->printText("$indstr</array>$nl");
+				} else {
+					// Associative array (<struct>)
+					$this->printText("$indstr<struct>$nl");
+					foreach($elemValue as $subElemName => $subElemValue) {
+						$this->printText($indstr2 . Xml::element('var', array(
+							'name' => $subElemName
+						), null) . $nl);
+						$this->slowWddxPrinter($subElemValue, $indent + 4);
+						$this->printText("$indstr2</var>$nl");
+					}
+					$this->printText("$indstr</struct>$nl");
 				}
-				$this->printText('</struct>');
 				break;
 			case 'integer' :
 			case 'double' :
-				$this->printText(wfElement('number', null, $elemValue));
+				$this->printText($indstr . Xml::element('number', null, $elemValue) . $nl);
 				break;
 			case 'string' :
-				$this->printText(wfElement('string', null, $elemValue));
+				$this->printText($indstr . Xml::element('string', null, $elemValue) . $nl);
 				break;
 			default :
 				ApiBase :: dieDebug(__METHOD__, 'Unknown type ' . gettype($elemValue));
@@ -85,6 +109,6 @@ class ApiFormatWddx extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatWddx.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiFormatWddx.php 44588 2008-12-14 19:14:21Z demon $';
 	}
 }
diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php
index d35eb3e9..7ff57324 100644
--- a/includes/api/ApiFormatXml.php
+++ b/includes/api/ApiFormatXml.php
@@ -56,12 +56,12 @@ class ApiFormatXml extends ApiFormatBase {
 		$params = $this->extractRequestParams();
 		$this->mDoubleQuote = $params['xmldoublequote'];
 
-		$this->printText('<?xml version="1.0" encoding="utf-8"?>');
+		$this->printText('<?xml version="1.0"?>');
 		$this->recXmlPrint($this->mRootElemName, $this->getResultData(), $this->getIsHtml() ? -2 : null);
 	}
 
 	/**
-	* This method takes an array and converts it into an xml.
+	* This method takes an array and converts it to XML.
 	* There are several noteworthy cases:
 	*
 	*  If array contains a key '_element', then the code assumes that ALL other keys are not important and replaces them with the value['_element'].
@@ -80,6 +80,7 @@ class ApiFormatXml extends ApiFormatBase {
 		} else {
 			$indstr = '';
 		}
+		$elemName = str_replace(' ', '_', $elemName);
 
 		switch (gettype($elemValue)) {
 			case 'array' :
@@ -104,6 +105,14 @@ class ApiFormatXml extends ApiFormatBase {
 				foreach ($elemValue as $subElemId => & $subElemValue) {
 					if (is_string($subElemValue) && $this->mDoubleQuote)
 						$subElemValue = $this->doubleQuote($subElemValue);
+					
+					// Replace spaces with underscores
+					$newSubElemId = str_replace(' ', '_', $subElemId);
+					if($newSubElemId != $subElemId) {
+						$elemValue[$newSubElemId] = $subElemValue;
+						unset($elemValue[$subElemId]);
+						$subElemId = $newSubElemId;
+					}
 
 					if (gettype($subElemId) === 'integer') {
 						$indElements[] = $subElemValue;
@@ -114,18 +123,18 @@ class ApiFormatXml extends ApiFormatBase {
 					}
 				}
 
-				if (is_null($subElemIndName) && !empty ($indElements))
+				if (is_null($subElemIndName) && count($indElements))
 					ApiBase :: dieDebug(__METHOD__, "($elemName, ...) has integer keys without _element value. Use ApiResult::setIndexedTagName().");
 
-				if (!empty ($subElements) && !empty ($indElements) && !is_null($subElemContent))
+				if (count($subElements) && count($indElements) && !is_null($subElemContent))
 					ApiBase :: dieDebug(__METHOD__, "($elemName, ...) has content and subelements");
 
 				if (!is_null($subElemContent)) {
-					$this->printText($indstr . wfElement($elemName, $elemValue, $subElemContent));
-				} elseif (empty ($indElements) && empty ($subElements)) {
-						$this->printText($indstr . wfElement($elemName, $elemValue));
+					$this->printText($indstr . Xml::element($elemName, $elemValue, $subElemContent));
+				} elseif (!count($indElements) && !count($subElements)) {
+						$this->printText($indstr . Xml::element($elemName, $elemValue));
 				} else {
-					$this->printText($indstr . wfElement($elemName, $elemValue, null));
+					$this->printText($indstr . Xml::element($elemName, $elemValue, null));
 
 					foreach ($subElements as $subElemId => & $subElemValue)
 						$this->recXmlPrint($subElemId, $subElemValue, $indent);
@@ -133,14 +142,14 @@ class ApiFormatXml extends ApiFormatBase {
 					foreach ($indElements as $subElemId => & $subElemValue)
 						$this->recXmlPrint($subElemIndName, $subElemValue, $indent);
 
-					$this->printText($indstr . wfCloseElement($elemName));
+					$this->printText($indstr . Xml::closeElement($elemName));
 				}
 				break;
 			case 'object' :
 				// ignore
 				break;
 			default :
-				$this->printText($indstr . wfElement($elemName, null, $elemValue));
+				$this->printText($indstr . Xml::element($elemName, null, $elemValue));
 				break;
 		}
 	}
@@ -166,6 +175,6 @@ class ApiFormatXml extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatXml.php 37075 2008-07-04 22:44:57Z brion $';
+		return __CLASS__ . ': $Id: ApiFormatXml.php 44588 2008-12-14 19:14:21Z demon $';
 	}
 }
diff --git a/includes/api/ApiFormatYaml_spyc.php b/includes/api/ApiFormatYaml_spyc.php
index c0d4093e..f16b2c8a 100644
--- a/includes/api/ApiFormatYaml_spyc.php
+++ b/includes/api/ApiFormatYaml_spyc.php
@@ -1,883 +1,234 @@
 <?php
-  /**
-   * Spyc -- A Simple PHP YAML Class
-   * @version 0.2.3 -- 2006-02-04
-   * @author Chris Wanstrath <chris@ozmm.org>
-   * @see http://spyc.sourceforge.net/
-   * @copyright Copyright 2005-2006 Chris Wanstrath
-   * @license http://www.opensource.org/licenses/mit-license.php MIT License
-   */
-
-  /**
-   * A node, used by Spyc for parsing YAML.
-   * @ingroup API
-   */
-  class YAMLNode {
-    /**#@+
-     * @access public
-     * @var string
-     */
-    var $parent;
-    var $id;
-    /**#@-*/
-    /**
-     * @access public
-     * @var mixed
-     */
-    var $data;
-    /**
-     * @access public
-     * @var int
-     */
-    var $indent;
-    /**
-     * @access public
-     * @var bool
-     */
-    var $children = false;
-
-    /**
-     * The constructor assigns the node a unique ID.
-     * @access public
-     * @return void
-     */
-    function YAMLNode() {
-      $this->id = uniqid('');
-    }
-  }
-
-  /**
-   * The Simple PHP YAML Class.
-   *
-   * This class can be used to read a YAML file and convert its contents
-   * into a PHP array.  It currently supports a very limited subsection of
-   * the YAML spec.
-   *
-   * Usage:
-   * <code>
-   *   $parser = new Spyc;
-   *   $array  = $parser->load($file);
-   * </code>
-   * @ingroup API
-   */
-  class Spyc {
-
-    /**
-     * Load YAML into a PHP array statically
-     *
-     * The load method, when supplied with a YAML stream (string or file),
-     * will do its best to convert YAML in a file into a PHP array.  Pretty
-     * simple.
-     *  Usage:
-     *  <code>
-     *   $array = Spyc::YAMLLoad('lucky.yml');
-     *   print_r($array);
-     *  </code>
-     * @access public
-     * @return array
-     * @param string $input Path of YAML file or string containing YAML
-     */
-    function YAMLLoad($input) {
-      $spyc = new Spyc;
-      return $spyc->load($input);
-    }
-
-    /**
-     * Dump YAML from PHP array statically
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.  Pretty simple.  Feel free to
-     * save the returned string as nothing.yml and pass it around.
-     *
-     * Oh, and you can decide how big the indent is and what the wordwrap
-     * for folding is.  Pretty cool -- just pass in 'false' for either if
-     * you want to use the default.
-     *
-     * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
-     * you can turn off wordwrap by passing in 0.
-     *
-     * @access public
-     * @static
-     * @return string
-     * @param array $array PHP array
-     * @param int $indent Pass in false to use the default, which is 2
-     * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
-     */
-    public static function YAMLDump($array,$indent = false,$wordwrap = false) {
-      $spyc = new Spyc;
-      return $spyc->dump($array,$indent,$wordwrap);
-    }
-
-    /**
-     * Load YAML into a PHP array from an instantiated object
-     *
-     * The load method, when supplied with a YAML stream (string or file path),
-     * will do its best to convert the YAML into a PHP array.  Pretty simple.
-     *  Usage:
-     *  <code>
-     *   $parser = new Spyc;
-     *   $array  = $parser->load('lucky.yml');
-     *   print_r($array);
-     *  </code>
-     * @access public
-     * @return array
-     * @param string $input Path of YAML file or string containing YAML
-     */
-    function load($input) {
-      // See what type of input we're talking about
-      // If it's not a file, assume it's a string
-      if (!empty($input) && (strpos($input, "\n") === false)
-          && file_exists($input)) {
-        $yaml = file($input);
-      } else {
-        $yaml = explode("\n",$input);
-      }
-      // Initiate some objects and values
-      $base              = new YAMLNode;
-      $base->indent      = 0;
-      $this->_lastIndent = 0;
-      $this->_lastNode   = $base->id;
-      $this->_inBlock    = false;
-      $this->_isInline   = false;
-
-      foreach ($yaml as $linenum => $line) {
-        $ifchk = trim($line);
-
-        // If the line starts with a tab (instead of a space), throw a fit.
-        if (preg_match('/^(\t)+(\w+)/', $line)) {
-          $err = 'ERROR: Line '. ($linenum + 1) .' in your input YAML begins'.
-                 ' with a tab.  YAML only recognizes spaces.  Please reformat.';
-          die($err);
-        }
-
-        if ($this->_inBlock === false && empty($ifchk)) {
-          continue;
-        } elseif ($this->_inBlock == true && empty($ifchk)) {
-          $last =& $this->_allNodes[$this->_lastNode];
-          $last->data[key($last->data)] .= "\n";
-        } elseif ($ifchk{0} != '#' && substr($ifchk,0,3) != '---') {
-          // Create a new node and get its indent
-          $node         = new YAMLNode;
-          $node->indent = $this->_getIndent($line);
-
-          // Check where the node lies in the hierarchy
-          if ($this->_lastIndent == $node->indent) {
-            // If we're in a block, add the text to the parent's data
-            if ($this->_inBlock === true) {
-              $parent =& $this->_allNodes[$this->_lastNode];
-              $parent->data[key($parent->data)] .= trim($line).$this->_blockEnd;
-            } else {
-              // The current node's parent is the same as the previous node's
-              if (isset($this->_allNodes[$this->_lastNode])) {
-                $node->parent = $this->_allNodes[$this->_lastNode]->parent;
-              }
-            }
-          } elseif ($this->_lastIndent < $node->indent) {
-            if ($this->_inBlock === true) {
-              $parent =& $this->_allNodes[$this->_lastNode];
-              $parent->data[key($parent->data)] .= trim($line).$this->_blockEnd;
-            } elseif ($this->_inBlock === false) {
-              // The current node's parent is the previous node
-              $node->parent = $this->_lastNode;
-
-              // If the value of the last node's data was > or | we need to
-              // start blocking i.e. taking in all lines as a text value until
-              // we drop our indent.
-              $parent =& $this->_allNodes[$node->parent];
-              $this->_allNodes[$node->parent]->children = true;
-              if (is_array($parent->data)) {
-                $chk = $parent->data[key($parent->data)];
-                if ($chk === '>') {
-                  $this->_inBlock  = true;
-                  $this->_blockEnd = ' ';
-                  $parent->data[key($parent->data)] =
-                        str_replace('>','',$parent->data[key($parent->data)]);
-                  $parent->data[key($parent->data)] .= trim($line).' ';
-                  $this->_allNodes[$node->parent]->children = false;
-                  $this->_lastIndent = $node->indent;
-                } elseif ($chk === '|') {
-                  $this->_inBlock  = true;
-                  $this->_blockEnd = "\n";
-                  $parent->data[key($parent->data)] =
-                        str_replace('|','',$parent->data[key($parent->data)]);
-                  $parent->data[key($parent->data)] .= trim($line)."\n";
-                  $this->_allNodes[$node->parent]->children = false;
-                  $this->_lastIndent = $node->indent;
-                }
-              }
-            }
-          } elseif ($this->_lastIndent > $node->indent) {
-            // Any block we had going is dead now
-            if ($this->_inBlock === true) {
-              $this->_inBlock = false;
-              if ($this->_blockEnd = "\n") {
-                $last =& $this->_allNodes[$this->_lastNode];
-                $last->data[key($last->data)] =
-                      trim($last->data[key($last->data)]);
-              }
-            }
-
-            // We don't know the parent of the node so we have to find it
-            // foreach ($this->_allNodes as $n) {
-            foreach ($this->_indentSort[$node->indent] as $n) {
-              if ($n->indent == $node->indent) {
-                $node->parent = $n->parent;
-              }
-            }
-          }
-
-          if ($this->_inBlock === false) {
-            // Set these properties with information from our current node
-            $this->_lastIndent = $node->indent;
-            // Set the last node
-            $this->_lastNode = $node->id;
-            // Parse the YAML line and return its data
-            $node->data = $this->_parseLine($line);
-            // Add the node to the master list
-            $this->_allNodes[$node->id] = $node;
-            // Add a reference to the node in an indent array
-            $this->_indentSort[$node->indent][] =& $this->_allNodes[$node->id];
-            // Add a reference to the node in a References array if this node
-            // has a YAML reference in it.
-            if (
-              ( (is_array($node->data)) &&
-                isset($node->data[key($node->data)]) &&
-                (!is_array($node->data[key($node->data)])) )
-              &&
-              ( (preg_match('/^&([^ ]+)/',$node->data[key($node->data)]))
-                ||
-                (preg_match('/^\*([^ ]+)/',$node->data[key($node->data)])) )
-            ) {
-                $this->_haveRefs[] =& $this->_allNodes[$node->id];
-            } elseif (
-              ( (is_array($node->data)) &&
-                isset($node->data[key($node->data)]) &&
-                 (is_array($node->data[key($node->data)])) )
-            ) {
-              // Incomplete reference making code.  Ugly, needs cleaned up.
-              foreach ($node->data[key($node->data)] as $d) {
-                if ( !is_array($d) &&
-                  ( (preg_match('/^&([^ ]+)/',$d))
-                    ||
-                    (preg_match('/^\*([^ ]+)/',$d)) )
-                  ) {
-                    $this->_haveRefs[] =& $this->_allNodes[$node->id];
-                }
-              }
-            }
-          }
-        }
-      }
-      unset($node);
-
-      // Here we travel through node-space and pick out references (& and *)
-      $this->_linkReferences();
-
-      // Build the PHP array out of node-space
-      $trunk = $this->_buildArray();
-      return $trunk;
-    }
-
-    /**
-     * Dump PHP array to YAML
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.  Pretty simple.  Feel free to
-     * save the returned string as tasteful.yml and pass it around.
-     *
-     * Oh, and you can decide how big the indent is and what the wordwrap
-     * for folding is.  Pretty cool -- just pass in 'false' for either if
-     * you want to use the default.
-     *
-     * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
-     * you can turn off wordwrap by passing in 0.
-     *
-     * @access public
-     * @return string
-     * @param array $array PHP array
-     * @param int $indent Pass in false to use the default, which is 2
-     * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
-     */
-    function dump($array,$indent = false,$wordwrap = false) {
-      // Dumps to some very clean YAML.  We'll have to add some more features
-      // and options soon.  And better support for folding.
-
-      // New features and options.
-      if ($indent === false or !is_numeric($indent)) {
-        $this->_dumpIndent = 2;
-      } else {
-        $this->_dumpIndent = $indent;
-      }
-
-      if ($wordwrap === false or !is_numeric($wordwrap)) {
-        $this->_dumpWordWrap = 40;
-      } else {
-        $this->_dumpWordWrap = $wordwrap;
-      }
-
-      // New YAML document
-      $string = "---\n";
-
-      // Start at the base of the array and move through it.
-      foreach ($array as $key => $value) {
-        $string .= $this->_yamlize($key,$value,0);
-      }
-      return $string;
-    }
-
-    /**** Private Properties ****/
-
-    /**#@+
-     * @access private
-     * @var mixed
-     */
-    var $_haveRefs;
-    var $_allNodes;
-    var $_lastIndent;
-    var $_lastNode;
-    var $_inBlock;
-    var $_isInline;
-    var $_dumpIndent;
-    var $_dumpWordWrap;
-    /**#@-*/
-
-    /**** Private Methods ****/
-
-    /**
-     * Attempts to convert a key / value array item to YAML
-     * @access private
-     * @return string
-     * @param $key The name of the key
-     * @param $value The value of the item
-     * @param $indent The indent of the current node
-     */
-    function _yamlize($key,$value,$indent) {
-      if (is_array($value)) {
-        // It has children.  What to do?
-        // Make it the right kind of item
-        $string = $this->_dumpNode($key,NULL,$indent);
-        // Add the indent
-        $indent += $this->_dumpIndent;
-        // Yamlize the array
-        $string .= $this->_yamlizeArray($value,$indent);
-      } elseif (!is_array($value)) {
-        // It doesn't have children.  Yip.
-        $string = $this->_dumpNode($key,$value,$indent);
-      }
-      return $string;
-    }
-
-    /**
-     * Attempts to convert an array to YAML
-     * @access private
-     * @return string
-     * @param $array The array you want to convert
-     * @param $indent The indent of the current level
-     */
-    function _yamlizeArray($array,$indent) {
-      if (is_array($array)) {
-        $string = '';
-        foreach ($array as $key => $value) {
-          $string .= $this->_yamlize($key,$value,$indent);
-        }
-        return $string;
-      } else {
-        return false;
-      }
-    }
-
-    /**
-     * Find out whether a string needs to be output as a literal rather than in plain style.
-     * Added by Roan Kattouw 13-03-2008
-     * @param $value The string to check
-     * @return bool
-     */
-    function _needLiteral($value) {
-      # Check whether the string contains # or : or begins with any of:
-      # [ - ? , [ ] { } ! * & | > ' " % @ ` ]
-      # or is a number or contains newlines
-      return (bool)(gettype($value) == "string" &&
-	(is_numeric($value)  ||
-	strpos($value, "\n") ||
-	preg_match("/[#:]/", $value) ||
-	preg_match("/^[-?,[\]{}!*&|>'\"%@`]/", $value)));
-
-    }
-
-    /**
-     * Returns YAML from a key and a value
-     * @access private
-     * @return string
-     * @param $key The name of the key
-     * @param $value The value of the item
-     * @param $indent The indent of the current node
-     */
-    function _dumpNode($key,$value,$indent) {
-      // do some folding here, for blocks
-      if ($this->_needLiteral($value)) {
-        $value = $this->_doLiteralBlock($value,$indent);
-      } else {
-        $value  = $this->_doFolding($value,$indent);
-      }
-
-      $spaces = str_repeat(' ',$indent);
-
-      if (is_int($key)) {
-        // It's a sequence
-		if ($value)
-			$string = $spaces.'- '.$value."\n";
-		else
-			$string = $spaces . "-\n";
-      } else {
-		// It's mapped
-		if ($value)
-	        $string = $spaces.$key.': '.$value."\n";
-		else
-			$string = $spaces . $key . ":\n";
-      }
-      return $string;
-    }
-
-    /**
-     * Creates a literal block for dumping
-     * @access private
-     * @return string
-     * @param $value
-     * @param $indent int The value of the indent
-     */
-    function _doLiteralBlock($value,$indent) {
-      $exploded = explode("\n",$value);
-      $newValue = '|';
-      $indent  += $this->_dumpIndent;
-      $spaces   = str_repeat(' ',$indent);
-      foreach ($exploded as $line) {
-        $newValue .= "\n" . $spaces . trim($line);
-      }
-      return $newValue;
-    }
-
-    /**
-     * Folds a string of text, if necessary
-     * @access private
-     * @return string
-     * @param $value The string you wish to fold
-     */
-    function _doFolding($value,$indent) {
-      // Don't do anything if wordwrap is set to 0
-      if ($this->_dumpWordWrap === 0) {
-        return $value;
-      }
-
-      if (strlen($value) > $this->_dumpWordWrap) {
-        $indent += $this->_dumpIndent;
-        $indent = str_repeat(' ',$indent);
-        $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
-        $value   = ">\n".$indent.$wrapped;
-      }
-      return $value;
-    }
-
-    /* Methods used in loading */
-
-    /**
-     * Finds and returns the indentation of a YAML line
-     * @access private
-     * @return int
-     * @param string $line A line from the YAML file
-     */
-    function _getIndent($line) {
-      $match = array();
-      preg_match('/^\s{1,}/',$line,$match);
-      if (!empty($match[0])) {
-        $indent = substr_count($match[0],' ');
-      } else {
-        $indent = 0;
-      }
-      return $indent;
-    }
-
-    /**
-     * Parses YAML code and returns an array for a node
-     * @access private
-     * @return array
-     * @param string $line A line from the YAML file
-     */
-    function _parseLine($line) {
-      $line = trim($line);
-
-      $array = array();
-
-      if (preg_match('/^-(.*):$/',$line)) {
-        // It's a mapped sequence
-        $key         = trim(substr(substr($line,1),0,-1));
-        $array[$key] = '';
-      } elseif ($line[0] == '-' && substr($line,0,3) != '---') {
-        // It's a list item but not a new stream
-        if (strlen($line) > 1) {
-          $value   = trim(substr($line,1));
-          // Set the type of the value.  Int, string, etc
-          $value   = $this->_toType($value);
-          $array[] = $value;
-        } else {
-          $array[] = array();
-        }
-      } elseif (preg_match('/^(.+):/',$line,$key)) {
-        // It's a key/value pair most likely
-        // If the key is in double quotes pull it out
-        $matches = array();
-        if (preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) {
-          $value = trim(str_replace($matches[1],'',$line));
-          $key   = $matches[2];
-        } else {
-          // Do some guesswork as to the key and the value
-          $explode = explode(':',$line);
-          $key     = trim($explode[0]);
-          array_shift($explode);
-          $value   = trim(implode(':',$explode));
-        }
-
-        // Set the type of the value.  Int, string, etc
-        $value = $this->_toType($value);
-        if (empty($key)) {
-          $array[]     = $value;
-        } else {
-          $array[$key] = $value;
-        }
-      }
-      return $array;
-    }
-
-    /**
-     * Finds the type of the passed value, returns the value as the new type.
-     * @access private
-     * @param string $value
-     * @return mixed
-     */
-    function _toType($value) {
-      $matches = array();
-      if (preg_match('/^("(.*)"|\'(.*)\')/',$value,$matches)) {
-       $value = (string)preg_replace('/(\'\'|\\\\\')/',"'",end($matches));
-       $value = preg_replace('/\\\\"/','"',$value);
-      } elseif (preg_match('/^\\[(.+)\\]$/',$value,$matches)) {
-        // Inline Sequence
-
-        // Take out strings sequences and mappings
-        $explode = $this->_inlineEscape($matches[1]);
-
-        // Propogate value array
-        $value  = array();
-        foreach ($explode as $v) {
-          $value[] = $this->_toType($v);
-        }
-      } elseif (strpos($value,': ')!==false && !preg_match('/^{(.+)/',$value)) {
-          // It's a map
-          $array = explode(': ',$value);
-          $key   = trim($array[0]);
-          array_shift($array);
-          $value = trim(implode(': ',$array));
-          $value = $this->_toType($value);
-          $value = array($key => $value);
-      } elseif (preg_match("/{(.+)}$/",$value,$matches)) {
-        // Inline Mapping
-
-        // Take out strings sequences and mappings
-        $explode = $this->_inlineEscape($matches[1]);
-
-        // Propogate value array
-        $array = array();
-        foreach ($explode as $v) {
-          $array = $array + $this->_toType($v);
-        }
-        $value = $array;
-      } elseif (strtolower($value) == 'null' or $value == '' or $value == '~') {
-        $value = NULL;
-      } elseif (ctype_digit($value)) {
-        $value = (int)$value;
-      } elseif (in_array(strtolower($value),
-                  array('true', 'on', '+', 'yes', 'y'))) {
-        $value = TRUE;
-      } elseif (in_array(strtolower($value),
-                  array('false', 'off', '-', 'no', 'n'))) {
-        $value = FALSE;
-      } elseif (is_numeric($value)) {
-        $value = (float)$value;
-      } else {
-        // Just a normal string, right?
-        $value = trim(preg_replace('/#(.+)$/','',$value));
-      }
-
-      return $value;
-    }
-
-    /**
-     * Used in inlines to check for more inlines or quoted strings
-     * @access private
-     * @return array
-     */
-    function _inlineEscape($inline) {
-      // There's gotta be a cleaner way to do this...
-      // While pure sequences seem to be nesting just fine,
-      // pure mappings and mappings with sequences inside can't go very
-      // deep.  This needs to be fixed.
-
-      // Check for strings
-      $regex = '/(?:(")|(?:\'))((?(1)[^"]+|[^\']+))(?(1)"|\')/';
-      $strings = array();
-      if (preg_match_all($regex,$inline,$strings)) {
-        $saved_strings[] = $strings[0][0];
-        $inline  = preg_replace($regex,'YAMLString',$inline);
-      }
-      unset($regex);
-
-      // Check for sequences
-      $seqs = array();
-      if (preg_match_all('/\[(.+)\]/U',$inline,$seqs)) {
-        $inline = preg_replace('/\[(.+)\]/U','YAMLSeq',$inline);
-        $seqs   = $seqs[0];
-      }
-
-      // Check for mappings
-      $maps = array();
-      if (preg_match_all('/{(.+)}/U',$inline,$maps)) {
-        $inline = preg_replace('/{(.+)}/U','YAMLMap',$inline);
-        $maps   = $maps[0];
-      }
-
-      $explode = explode(', ',$inline);
-
-      // Re-add the strings
-      if (!empty($saved_strings)) {
-        $i = 0;
-        foreach ($explode as $key => $value) {
-          if (strpos($value,'YAMLString')) {
-            $explode[$key] = str_replace('YAMLString',$saved_strings[$i],$value);
-            ++$i;
-          }
-        }
-      }
-
-      // Re-add the sequences
-      if (!empty($seqs)) {
-        $i = 0;
-        foreach ($explode as $key => $value) {
-          if (strpos($value,'YAMLSeq') !== false) {
-            $explode[$key] = str_replace('YAMLSeq',$seqs[$i],$value);
-            ++$i;
-          }
-        }
-      }
-
-      // Re-add the mappings
-      if (!empty($maps)) {
-        $i = 0;
-        foreach ($explode as $key => $value) {
-          if (strpos($value,'YAMLMap') !== false) {
-            $explode[$key] = str_replace('YAMLMap',$maps[$i],$value);
-            ++$i;
-          }
-        }
-      }
-
-      return $explode;
-    }
-
-    /**
-     * Builds the PHP array from all the YAML nodes we've gathered
-     * @access private
-     * @return array
-     */
-    function _buildArray() {
-      $trunk = array();
-
-      if (!isset($this->_indentSort[0])) {
-        return $trunk;
-      }
-
-      foreach ($this->_indentSort[0] as $n) {
-        if (empty($n->parent)) {
-          $this->_nodeArrayizeData($n);
-          // Check for references and copy the needed data to complete them.
-          $this->_makeReferences($n);
-          // Merge our data with the big array we're building
-          $trunk = $this->_array_kmerge($trunk,$n->data);
-        }
-      }
-
-      return $trunk;
-    }
-
-    /**
-     * Traverses node-space and sets references (& and *) accordingly
-     * @access private
-     * @return bool
-     */
-    function _linkReferences() {
-      if (is_array($this->_haveRefs)) {
-        foreach ($this->_haveRefs as $node) {
-          if (!empty($node->data)) {
-            $key = key($node->data);
-            // If it's an array, don't check.
-            if (is_array($node->data[$key])) {
-              foreach ($node->data[$key] as $k => $v) {
-                $this->_linkRef($node,$key,$k,$v);
-              }
-            } else {
-              $this->_linkRef($node,$key);
-            }
-          }
-        }
-      }
-      return true;
-    }
-
-    function _linkRef(&$n,$key,$k = NULL,$v = NULL) {
-      if (empty($k) && empty($v)) {
-        // Look for &refs
-        $matches = array();
-        if (preg_match('/^&([^ ]+)/',$n->data[$key],$matches)) {
-          // Flag the node so we know it's a reference
-          $this->_allNodes[$n->id]->ref = substr($matches[0],1);
-          $this->_allNodes[$n->id]->data[$key] =
-                   substr($n->data[$key],strlen($matches[0])+1);
-        // Look for *refs
-        } elseif (preg_match('/^\*([^ ]+)/',$n->data[$key],$matches)) {
-          $ref = substr($matches[0],1);
-          // Flag the node as having a reference
-          $this->_allNodes[$n->id]->refKey =  $ref;
-        }
-      } elseif (!empty($k) && !empty($v)) {
-        if (preg_match('/^&([^ ]+)/',$v,$matches)) {
-          // Flag the node so we know it's a reference
-          $this->_allNodes[$n->id]->ref = substr($matches[0],1);
-          $this->_allNodes[$n->id]->data[$key][$k] =
-                              substr($v,strlen($matches[0])+1);
-        // Look for *refs
-        } elseif (preg_match('/^\*([^ ]+)/',$v,$matches)) {
-          $ref = substr($matches[0],1);
-          // Flag the node as having a reference
-          $this->_allNodes[$n->id]->refKey =  $ref;
-        }
-      }
-    }
-
-    /**
-     * Finds the children of a node and aids in the building of the PHP array
-     * @access private
-     * @param int $nid The id of the node whose children we're gathering
-     * @return array
-     */
-    function _gatherChildren($nid) {
-      $return = array();
-      $node   =& $this->_allNodes[$nid];
-      foreach ($this->_allNodes as $z) {
-        if ($z->parent == $node->id) {
-          // We found a child
-          $this->_nodeArrayizeData($z);
-          // Check for references
-          $this->_makeReferences($z);
-          // Merge with the big array we're returning
-          // The big array being all the data of the children of our parent node
-          $return = $this->_array_kmerge($return,$z->data);
-        }
-      }
-      return $return;
-    }
-
-    /**
-     * Turns a node's data and its children's data into a PHP array
-     *
-     * @access private
-     * @param array $node The node which you want to arrayize
-     * @return boolean
-     */
-    function _nodeArrayizeData(&$node) {
-      if (is_array($node->data) && $node->children == true) {
-        // This node has children, so we need to find them
-        $childs = $this->_gatherChildren($node->id);
-        // We've gathered all our children's data and are ready to use it
-        $key = key($node->data);
-        $key = empty($key) ? 0 : $key;
-        // If it's an array, add to it of course
-        if (is_array($node->data[$key])) {
-          $node->data[$key] = $this->_array_kmerge($node->data[$key],$childs);
-        } else {
-          $node->data[$key] = $childs;
-        }
-      } elseif (!is_array($node->data) && $node->children == true) {
-        // Same as above, find the children of this node
-        $childs       = $this->_gatherChildren($node->id);
-        $node->data   = array();
-        $node->data[] = $childs;
-      }
-
-      // We edited $node by reference, so just return true
-      return true;
-    }
-
-    /**
-     * Traverses node-space and copies references to / from this object.
-     * @access private
-     * @param object $z A node whose references we wish to make real
-     * @return bool
-     */
-    function _makeReferences(&$z) {
-      // It is a reference
-      if (isset($z->ref)) {
-        $key                = key($z->data);
-        // Copy the data to this object for easy retrieval later
-        $this->ref[$z->ref] =& $z->data[$key];
-      // It has a reference
-      } elseif (isset($z->refKey)) {
-        if (isset($this->ref[$z->refKey])) {
-          $key           = key($z->data);
-          // Copy the data from this object to make the node a real reference
-          $z->data[$key] =& $this->ref[$z->refKey];
-        }
-      }
-      return true;
-    }
-
-
-    /**
-     * Merges arrays and maintains numeric keys.
-     *
-     * An ever-so-slightly modified version of the array_kmerge() function posted
-     * to php.net by mail at nospam dot iaindooley dot com on 2004-04-08.
-     *
-     * http://www.php.net/manual/en/function.array-merge.php#41394
-     *
-     * @access private
-     * @param array $arr1
-     * @param array $arr2
-     * @return array
-     */
-    function _array_kmerge($arr1,$arr2) {
-      if(!is_array($arr1))
-        $arr1 = array();
-
-      if(!is_array($arr2))
-        $arr2 = array();
-
-      $keys1 = array_keys($arr1);
-      $keys2 = array_keys($arr2);
-      $keys  = array_merge($keys1,$keys2);
-      $vals1 = array_values($arr1);
-      $vals2 = array_values($arr2);
-      $vals  = array_merge($vals1,$vals2);
-      $ret   = array();
-
-      foreach($keys as $key) {
-        list( /* unused */ ,$val) = each($vals);
-        // This is the good part!  If a key already exists, but it's part of a
-        // sequence (an int), just keep addin numbers until we find a fresh one.
-        if (isset($ret[$key]) and is_int($key)) {
-          while (array_key_exists($key, $ret)) {
-            $key++;
-          }
-        }
-        $ret[$key] = $val;
-      }
-
-      return $ret;
-    }
-  }
+/**
+ * Spyc -- A Simple PHP YAML Class
+ * @version 0.2.3 -- 2006-02-04
+ * @author Chris Wanstrath <chris@ozmm.org>
+ * @see http://spyc.sourceforge.net/
+ * @copyright Copyright 2005-2006 Chris Wanstrath
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+/**
+ * The Simple PHP YAML Class.
+ *
+ * This class can be used to read a YAML file and convert its contents
+ * into a PHP array.  It currently supports a very limited subsection of
+ * the YAML spec.
+ *
+ * @ingroup API
+ */
+class Spyc {
+
+	/**
+	 * Dump YAML from PHP array statically
+	 *
+	 * The dump method, when supplied with an array, will do its best
+	 * to convert the array into friendly YAML.  Pretty simple.  Feel free to
+	 * save the returned string as nothing.yml and pass it around.
+	 *
+	 * Oh, and you can decide how big the indent is and what the wordwrap
+	 * for folding is.  Pretty cool -- just pass in 'false' for either if
+	 * you want to use the default.
+	 *
+	 * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
+	 * you can turn off wordwrap by passing in 0.
+	 *
+	 * @return string
+	 * @param $array Array: PHP array
+	 * @param $indent Integer: Pass in false to use the default, which is 2
+	 * @param $wordwrap Integer: Pass in 0 for no wordwrap, false for default (40)
+	 */
+	public static function YAMLDump($array,$indent = false,$wordwrap = false) {
+		$spyc = new Spyc;
+		return $spyc->dump($array,$indent,$wordwrap);
+	}
+
+	/**
+	 * Dump PHP array to YAML
+	 *
+	 * The dump method, when supplied with an array, will do its best
+	 * to convert the array into friendly YAML.  Pretty simple.  Feel free to
+	 * save the returned string as tasteful.yml and pass it around.
+	 *
+	 * Oh, and you can decide how big the indent is and what the wordwrap
+	 * for folding is.  Pretty cool -- just pass in 'false' for either if
+	 * you want to use the default.
+	 *
+	 * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
+	 * you can turn off wordwrap by passing in 0.
+	 *
+	 * @public
+	 * @return string
+	 * @param $array Array: PHP array
+	 * @param $indent Integer: Pass in false to use the default, which is 2
+	 * @param $wordwrap Integer: Pass in 0 for no wordwrap, false for default (40)
+	 */
+	function dump($array,$indent = false,$wordwrap = false) {
+		// Dumps to some very clean YAML.  We'll have to add some more features
+		// and options soon.  And better support for folding.
+
+		// New features and options.
+		if ($indent === false or !is_numeric($indent)) {
+			$this->_dumpIndent = 2;
+		} else {
+			$this->_dumpIndent = $indent;
+		}
+
+		if ($wordwrap === false or !is_numeric($wordwrap)) {
+			$this->_dumpWordWrap = 40;
+		} else {
+			$this->_dumpWordWrap = $wordwrap;
+		}
+
+		// New YAML document
+		$string = "---\n";
+
+		// Start at the base of the array and move through it.
+		foreach ($array as $key => $value) {
+			$string .= $this->_yamlize($key,$value,0);
+		}
+		return $string;
+	}
+
+	/**** Private Properties ****/
+
+	private $_haveRefs;
+	private $_allNodes;
+	private $_lastIndent;
+	private $_lastNode;
+	private $_inBlock;
+	private $_isInline;
+	private $_dumpIndent;
+	private $_dumpWordWrap;
+
+	/**** Private Methods ****/
+
+	/**
+	 * Attempts to convert a key / value array item to YAML
+	 * @return string
+	 * @param $key The name of the key
+	 * @param $value The value of the item
+	 * @param $indent The indent of the current node
+	 */
+	private function _yamlize($key,$value,$indent) {
+		if (is_array($value)) {
+			// It has children.  What to do?
+			// Make it the right kind of item
+			$string = $this->_dumpNode($key,NULL,$indent);
+			// Add the indent
+			$indent += $this->_dumpIndent;
+			// Yamlize the array
+			$string .= $this->_yamlizeArray($value,$indent);
+		} elseif (!is_array($value)) {
+			// It doesn't have children.  Yip.
+			$string = $this->_dumpNode($key,$value,$indent);
+		}
+		return $string;
+	}
+
+	/**
+	 * Attempts to convert an array to YAML
+	 * @return string
+	 * @param $array The array you want to convert
+	 * @param $indent The indent of the current level
+	 */
+	private function _yamlizeArray($array,$indent) {
+		if (is_array($array)) {
+			$string = '';
+			foreach ($array as $key => $value) {
+				$string .= $this->_yamlize($key,$value,$indent);
+			}
+			return $string;
+		} else {
+ 			return false;
+		}
+    }
+
+	/**
+	 * Find out whether a string needs to be output as a literal rather than in plain style.
+	 * Added by Roan Kattouw 13-03-2008
+	 * @param $value The string to check
+	 * @return bool
+	 */
+	function _needLiteral($value) {
+		# Check whether the string contains # or : or begins with any of:
+		# [ - ? , [ ] { } ! * & | > ' " % @ ` ]
+		# or is a number or contains newlines
+		return (bool)(gettype($value) == "string" &&
+			(is_numeric($value)  ||
+			strpos($value, "\n") ||
+			preg_match("/[#:]/", $value) ||
+			preg_match("/^[-?,[\]{}!*&|>'\"%@`]/", $value)));
+
+	}
+
+	/**
+	 * Returns YAML from a key and a value
+	 * @return string
+	 * @param $key The name of the key
+	 * @param $value The value of the item
+	 * @param $indent The indent of the current node
+	 */
+	private function _dumpNode($key,$value,$indent) {
+		// do some folding here, for blocks
+		if ($this->_needLiteral($value)) {
+			$value = $this->_doLiteralBlock($value,$indent);
+		} else {
+			$value  = $this->_doFolding($value,$indent);
+		}
+
+		$spaces = str_repeat(' ',$indent);
+
+		if (is_int($key)) {
+			// It's a sequence
+			if ($value !== '' && !is_null($value))
+				$string = $spaces.'- '.$value."\n";
+			else
+				$string = $spaces . "-\n";
+		} else {
+			// It's mapped
+			if ($value !== '' && !is_null($value))
+				$string = $spaces . $key . ': ' . $value . "\n";
+			else
+				$string = $spaces . $key . ":\n";
+		}
+		return $string;
+	}
+
+	/**
+	 * Creates a literal block for dumping
+	 * @return string
+	 * @param $value
+	 * @param $indent int The value of the indent
+	 */
+	private function _doLiteralBlock($value,$indent) {
+		$exploded = explode("\n",$value);
+		$newValue = '|';
+		$indent  += $this->_dumpIndent;
+		$spaces   = str_repeat(' ',$indent);
+		foreach ($exploded as $line) {
+			$newValue .= "\n" . $spaces . trim($line);
+		}
+		return $newValue;
+	}
+
+	/**
+	 * Folds a string of text, if necessary
+	 * @return string
+	 * @param $value The string you wish to fold
+	 */
+	private function _doFolding($value,$indent) {
+		// Don't do anything if wordwrap is set to 0
+		if ($this->_dumpWordWrap === 0) {
+			return $value;
+		}
+
+		if (strlen($value) > $this->_dumpWordWrap) {
+			$indent += $this->_dumpIndent;
+			$indent = str_repeat(' ',$indent);
+			$wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
+			$value   = ">\n".$indent.$wrapped;
+		}
+		return $value;
+	}
+}
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index a45390c4..43b30f7c 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -36,23 +36,6 @@ if (!defined('MEDIAWIKI')) {
  */
 class ApiLogin extends ApiBase {
 
-	/**
-	 * Time (in seconds) a user must wait after submitting
-	 * a bad login (will be multiplied by the THROTTLE_FACTOR for each bad attempt)
-	 */
-	const THROTTLE_TIME = 5;
-
-	/**
-	 * The factor by which the wait-time in between authentication
-	 * attempts is increased every failed attempt.
-	 */
-	const THROTTLE_FACTOR = 2;
-
-	/**
-	 * The maximum number of failed logins after which the wait increase stops.
-	 */
-	const THOTTLE_MAX_COUNT = 10;
-
 	public function __construct($main, $action) {
 		parent :: __construct($main, $action, 'lg');
 	}
@@ -61,7 +44,7 @@ class ApiLogin extends ApiBase {
 	 * Executes the log-in attempt using the parameters passed. If
 	 * the log-in succeeeds, it attaches a cookie to the session
 	 * and outputs the user id, username, and session token. If a
-	 * log-in fails, as the result of a bad password, a nonexistant
+	 * log-in fails, as the result of a bad password, a nonexistent
 	 * user, or any other reason, the host is cached with an expiry
 	 * and no log-in attempts will be accepted until that expiry
 	 * is reached. The expiry is $this->mLoginThrottle.
@@ -69,25 +52,14 @@ class ApiLogin extends ApiBase {
 	 * @access public
 	 */
 	public function execute() {
-		$name = $password = $domain = null;
-		extract($this->extractRequestParams());
+		$params = $this->extractRequestParams();
 
 		$result = array ();
 
-		// Make sure noone is trying to guess the password brut-force
-		$nextLoginIn = $this->getNextLoginTimeout();
-		if ($nextLoginIn > 0) {
-			$result['result']  = 'NeedToWait';
-			$result['details'] = "Please wait $nextLoginIn seconds before next log-in attempt";
-			$result['wait'] = $nextLoginIn;
-			$this->getResult()->addValue(null, 'login', $result);
-			return;
-		}
-
-		$params = new FauxRequest(array (
-			'wpName' => $name,
-			'wpPassword' => $password,
-			'wpDomain' => $domain,
+		$req = new FauxRequest(array (
+			'wpName' => $params['name'],
+			'wpPassword' => $params['password'],
+			'wpDomain' => $params['domain'],
 			'wpRemember' => ''
 		));
 
@@ -96,8 +68,8 @@ class ApiLogin extends ApiBase {
 			wfSetupSession();
 		}
 
-		$loginForm = new LoginForm($params);
-		switch ($loginForm->authenticateUserData()) {
+		$loginForm = new LoginForm($req);
+		switch ($authRes = $loginForm->authenticateUserData()) {
 			case LoginForm :: SUCCESS :
 				global $wgUser, $wgCookiePrefix;
 
@@ -139,95 +111,18 @@ class ApiLogin extends ApiBase {
 				$result['result'] = 'CreateBlocked';
 				$result['details'] = 'Your IP address is blocked from account creation';
 				break;
+			case LoginForm :: THROTTLED :
+				global $wgPasswordAttemptThrottle;
+				$result['result'] = 'Throttled';
+				$result['wait'] = $wgPasswordAttemptThrottle['seconds'];
+				break;
 			default :
-				ApiBase :: dieDebug(__METHOD__, 'Unhandled case value');
-		}
-
-		if ($result['result'] != 'Success' && !isset( $result['details'] ) ) {
-			$delay = $this->cacheBadLogin();
-			$result['wait'] = $delay;
-			$result['details'] = "Please wait " . $delay . " seconds before next log-in attempt";
+				ApiBase :: dieDebug(__METHOD__, "Unhandled case value: {$authRes}");
 		}
-		// if we were allowed to try to login, memcache is fine
 
 		$this->getResult()->addValue(null, 'login', $result);
 	}
 
-
-	/**
-	 * Caches a bad-login attempt associated with the host and with an
-	 * expiry of $this->mLoginThrottle. These are cached by a key
-	 * separate from that used by the captcha system--as such, logging
-	 * in through the standard interface will get you a legal session
-	 * and cookies to prove it, but will not remove this entry.
-	 *
-	 * Returns the number of seconds until next login attempt will be allowed.
-	 *
-	 * @access private
-	 */
-	private function cacheBadLogin() {
-		global $wgMemc;
-
-		$key = $this->getMemCacheKey();
-		$val = $wgMemc->get( $key );
-
-		$val['lastReqTime'] = time();
-		if (!isset($val['count'])) {
-			$val['count'] = 1;
-		} else {
-			$val['count'] = 1 + $val['count'];
-		}
-
-		$delay = ApiLogin::calculateDelay($val['count']);
-
-		$wgMemc->delete($key);
-		// Cache expiration should be the maximum timeout - to prevent a "try and wait" attack
-		$wgMemc->add( $key, $val, ApiLogin::calculateDelay(ApiLogin::THOTTLE_MAX_COUNT) );
-
-		return $delay;
-	}
-
-	/**
-	 * How much time the client must wait before it will be
-	 * allowed to try to log-in next.
-	 * The return value is 0 if no wait is required.
-	 */
-	private function getNextLoginTimeout() {
-		global $wgMemc;
-
-		$val = $wgMemc->get($this->getMemCacheKey());
-
-		$elapse = (time() - $val['lastReqTime']);  // in seconds
-		$canRetryIn = ApiLogin::calculateDelay($val['count']) - $elapse;
-
-		return $canRetryIn < 0 ? 0 : $canRetryIn;
-	}
-
-	/**
-	 * Based on the number of previously attempted logins, returns
-	 * the delay (in seconds) when the next login attempt will be allowed.
-	 */
-	private static function calculateDelay($count) {
-		// Defensive programming
-		$count = intval($count);
-		$count = $count < 1 ? 1 : $count;
-		$count = $count > self::THOTTLE_MAX_COUNT ? self::THOTTLE_MAX_COUNT : $count;
-
-		return self::THROTTLE_TIME + self::THROTTLE_TIME * ($count - 1) * self::THROTTLE_FACTOR;
-	}
-
-	/**
-	* Internal cache key for badlogin checks. Robbed from the
-	* ConfirmEdit extension and modified to use a key unique to the
-	* API login.3
-	*
-	* @return string
-	* @access private
-	*/
-	private function getMemCacheKey() {
-		return wfMemcKey( 'apilogin', 'badlogin', 'ip', wfGetIP() );
-	}
-
 	public function mustBePosted() { return true; }
 
 	public function getAllowedParams() {
@@ -263,6 +158,6 @@ class ApiLogin extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiLogin.php 35565 2008-05-29 19:23:37Z btongminh $';
+		return __CLASS__ . ': $Id: ApiLogin.php 45275 2009-01-01 02:02:03Z simetrical $';
 	}
 }
diff --git a/includes/api/ApiLogout.php b/includes/api/ApiLogout.php
index 694c9e3c..8b178f6a 100644
--- a/includes/api/ApiLogout.php
+++ b/includes/api/ApiLogout.php
@@ -42,11 +42,12 @@ class ApiLogout extends ApiBase {
 
 	public function execute() {
 		global $wgUser;
+		$oldName = $wgUser->getName();
 		$wgUser->logout();
 		
 		// Give extensions to do something after user logout
 		$injected_html = '';
-		wfRunHooks( 'UserLogoutComplete', array(&$wgUser, &$injected_html) );
+		wfRunHooks( 'UserLogoutComplete', array(&$wgUser, &$injected_html, $oldName) );
 	}
 
 	public function getAllowedParams() {
@@ -70,6 +71,6 @@ class ApiLogout extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiLogout.php 35294 2008-05-24 20:44:49Z btongminh $';
+		return __CLASS__ . ': $Id: ApiLogout.php 43522 2008-11-15 01:23:39Z brion $';
 	}
 }
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 2d0e278c..60d932be 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -65,6 +65,7 @@ class ApiMain extends ApiBase {
 		'feedwatchlist' => 'ApiFeedWatchlist',
 		'help' => 'ApiHelp',
 		'paraminfo' => 'ApiParamInfo',
+		'purge' => 'ApiPurge',
 	);
 
 	private static $WriteModules = array (
@@ -77,6 +78,8 @@ class ApiMain extends ApiBase {
 		'move' => 'ApiMove',
 		'edit' => 'ApiEditPage',
 		'emailuser' => 'ApiEmailUser',
+		'watch' => 'ApiWatch',
+		'patrol' => 'ApiPatrol',
 	);
 
 	/**
@@ -99,6 +102,23 @@ class ApiMain extends ApiBase {
 		'dbg' => 'ApiFormatDbg',
 		'dbgfm' => 'ApiFormatDbg'
 	);
+	
+	/**
+	 * List of user roles that are specifically relevant to the API.
+	 * array( 'right' => array ( 'msg'    => 'Some message with a $1',
+	 *                           'params' => array ( $someVarToSubst ) ),
+	 *                          );
+	 */
+	private static $mRights = array('writeapi' => array(
+						'msg' => 'Use of the write API',
+						'params' => array()
+					),
+					'apihighlimits'	=> array(
+						'msg' => 'Use higher limits in API queries (Slow queries: $1 results; Fast queries: $2 results). The limits for slow queries also apply to multivalue parameters.',
+						'params' => array (ApiMain::LIMIT_SML2, ApiMain::LIMIT_BIG2)
+					)
+	);
+
 
 	private $mPrinter, $mModules, $mModuleNames, $mFormats, $mFormatNames;
 	private $mResult, $mAction, $mShowVersions, $mEnableWrite, $mRequest, $mInternalMode, $mSquidMaxage;
@@ -144,9 +164,9 @@ class ApiMain extends ApiBase {
 		if($wgEnableWriteAPI)
 			$this->mModules += self::$WriteModules;
 
-		$this->mModuleNames = array_keys($this->mModules); // todo: optimize
+		$this->mModuleNames = array_keys($this->mModules);
 		$this->mFormats = self :: $Formats;
-		$this->mFormatNames = array_keys($this->mFormats); // todo: optimize
+		$this->mFormatNames = array_keys($this->mFormats);
 
 		$this->mResult = new ApiResult($this);
 		$this->mShowVersions = false;
@@ -193,6 +213,8 @@ class ApiMain extends ApiBase {
 		if (!$wgUser->isAllowed('writeapi'))
 			$this->dieUsage('You\'re not allowed to edit this ' .
 			'wiki through the API', 'writeapidenied');
+		if (wfReadOnly())
+			$this->dieUsageMsg(array('readonlytext'));
 	}
 
 	/**
@@ -206,6 +228,8 @@ class ApiMain extends ApiBase {
 	 * Create an instance of an output formatter by its name
 	 */
 	public function createPrinterByName($format) {
+		if( !isset( $this->mFormats[$format] ) )
+			$this->dieUsage( "Unrecognized format: {$format}", 'unknown_format' );
 		return new $this->mFormats[$format] ($this, $format);
 	}
 
@@ -235,6 +259,11 @@ class ApiMain extends ApiBase {
 		try {
 			$this->executeAction();
 		} catch (Exception $e) {
+			// Log it
+			if ( $e instanceof MWException ) {
+				wfDebugLog( 'exception', $e->getLogMessage() );
+			}
+
 			//
 			// Handle any kind of exception by outputing properly formatted error message.
 			// If this fails, an unhandled exception should be thrown so that global error
@@ -248,7 +277,7 @@ class ApiMain extends ApiBase {
 
 			$headerStr = 'MediaWiki-API-Error: ' . $errCode;
 			if ($e->getCode() === 0)
-				header($headerStr, true);
+				header($headerStr);
 			else
 				header($headerStr, true, $e->getCode());
 
@@ -260,12 +289,11 @@ class ApiMain extends ApiBase {
 			$this->printResult(true);
 		}
 
-		global $wgRequest;
 		if($this->mSquidMaxage == -1)
 		{
 			# Nobody called setCacheMaxAge(), use the (s)maxage parameters
-			$smaxage = $wgRequest->getVal('smaxage', 0);
-			$maxage = $wgRequest->getVal('maxage', 0);
+			$smaxage = $this->getParameter('smaxage');
+			$maxage = $this->getParameter('maxage');
 		}
 		else
 			$smaxage = $maxage = $this->mSquidMaxage;
@@ -332,6 +360,9 @@ class ApiMain extends ApiBase {
 			}
 
 			$this->getResult()->reset();
+			// Re-add the id
+			if($this->mRequest->getCheck('requestid'))
+				$this->getResult()->addValue(null, 'requestid', $this->mRequest->getVal('requestid'));
 			$this->getResult()->addValue(null, 'error', $errMessage);
 
 		return $errMessage['code'];
@@ -341,12 +372,19 @@ class ApiMain extends ApiBase {
 	 * Execute the actual module, without any error handling
 	 */
 	protected function executeAction() {
+		// First add the id to the top element
+		if($this->mRequest->getCheck('requestid'))
+			$this->getResult()->addValue(null, 'requestid', $this->mRequest->getVal('requestid'));
 
 		$params = $this->extractRequestParams();
 
 		$this->mShowVersions = $params['version'];
 		$this->mAction = $params['action'];
 
+		if( !is_string( $this->mAction ) ) {
+			$this->dieUsage( "The API requires a valid action parameter", 'unknown_action' );
+		}
+
 		// Instantiate the module requested by the user
 		$module = new $this->mModules[$this->mAction] ($this, $this->mAction);
 
@@ -356,6 +394,9 @@ class ApiMain extends ApiBase {
 			$maxLag = $params['maxlag'];
 			list( $host, $lag ) = wfGetLB()->getMaxLag();
 			if ( $lag > $maxLag ) {
+				header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
+				header( 'X-Database-Lag: ' . intval( $lag ) );
+				// XXX: should we return a 503 HTTP error code like wfMaxlagError() does?
 				if( $wgShowHostnames ) {
 					ApiBase :: dieUsage( "Waiting for $host: $lag seconds lagged", 'maxlag' );
 				} else {
@@ -384,6 +425,7 @@ class ApiMain extends ApiBase {
 		// Execute
 		$module->profileIn();
 		$module->execute();
+		wfRunHooks('APIAfterExecute', array(&$module));
 		$module->profileOut();
 
 		if (!$this->mInternalMode) {
@@ -396,6 +438,7 @@ class ApiMain extends ApiBase {
 	 * Print results using the current printer
 	 */
 	protected function printResult($isError) {
+		$this->getResult()->cleanupUTF8();
 		$printer = $this->mPrinter;
 		$printer->profileIn();
 
@@ -437,6 +480,7 @@ class ApiMain extends ApiBase {
 				ApiBase :: PARAM_TYPE => 'integer',
 				ApiBase :: PARAM_DFLT => 0
 			),
+			'requestid' => null,
 		);
 	}
 
@@ -451,6 +495,7 @@ class ApiMain extends ApiBase {
 			'maxlag' => 'Maximum lag',
 			'smaxage' => 'Set the s-maxage header to this many seconds. Errors are never cached',
 			'maxage' => 'Set the max-age header to this many seconds. Errors are never cached',
+			'requestid' => 'Request ID to distinguish requests. This will just be output back to you',
 		);
 	}
 
@@ -493,6 +538,7 @@ class ApiMain extends ApiBase {
 			'API developers:',
 			'    Roan Kattouw <Firstname>.<Lastname>@home.nl (lead developer Sep 2007-present)',
 			'    Victor Vasiliev - vasilvv at gee mail dot com',
+			'    Bryan Tong Minh - bryan . tongminh @ gmail . com',
 			'    Yuri Astrakhan <Firstname><Lastname>@gmail.com (creator, lead developer Sep 2006-Sep 2007)',
 			'',
 			'Please send your comments, suggestions and questions to mediawiki-api@lists.wikimedia.org',
@@ -521,6 +567,14 @@ class ApiMain extends ApiBase {
 			$msg .= "\n";
 		}
 
+		$msg .= "\n$astriks Permissions $astriks\n\n";
+		foreach ( self :: $mRights as $right => $rightMsg ) {
+			$groups = User::getGroupsWithPermission( $right );
+			$msg .= "* " . $right . " *\n  " . wfMsgReplaceArgs( $rightMsg[ 'msg' ], $rightMsg[ 'params' ] ) . 
+						"\nGranted to:\n  " . str_replace( "*", "all", implode( ", ", $groups ) ) . "\n";
+
+		}
+
 		$msg .= "\n$astriks Formats  $astriks\n\n";
 		foreach( $this->mFormats as $formatName => $unused ) {
 			$module = $this->createPrinterByName($formatName);
@@ -539,7 +593,7 @@ class ApiMain extends ApiBase {
 
 	public static function makeHelpMsgHeader($module, $paramName) {
 		$modulePrefix = $module->getModulePrefix();
-		if (!empty($modulePrefix))
+		if (strval($modulePrefix) !== '')
 			$modulePrefix = "($modulePrefix) ";
 
 		return "* $paramName={$module->getModuleName()} $modulePrefix*";
@@ -602,8 +656,8 @@ class ApiMain extends ApiBase {
 	 */
 	public function getVersion() {
 		$vers = array ();
-		$vers[] = 'MediaWiki ' . SpecialVersion::getVersion();
-		$vers[] = __CLASS__ . ': $Id: ApiMain.php 44569 2008-12-14 08:31:04Z tstarling $';
+		$vers[] = 'MediaWiki: ' . SpecialVersion::getVersion() . "\n    http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/";
+		$vers[] = __CLASS__ . ': $Id: ApiMain.php 45752 2009-01-14 21:36:57Z catrope $';
 		$vers[] = ApiBase :: getBaseVersion();
 		$vers[] = ApiFormatBase :: getBaseVersion();
 		$vers[] = ApiQueryBase :: getBaseVersion();
diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 8687bdcd..13b058c9 100644
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -44,9 +44,7 @@ class ApiMove extends ApiBase {
 		if(is_null($params['reason']))
 			$params['reason'] = '';
 
-		$titleObj = NULL;
-		if(!isset($params['from']))
-			$this->dieUsageMsg(array('missingparam', 'from'));
+		$this->requireOnlyOneParameter($params, 'from', 'fromid');
 		if(!isset($params['to']))
 			$this->dieUsageMsg(array('missingparam', 'to'));
 		if(!isset($params['token']))
@@ -54,9 +52,18 @@ class ApiMove extends ApiBase {
 		if(!$wgUser->matchEditToken($params['token']))
 			$this->dieUsageMsg(array('sessionfailure'));
 
-		$fromTitle = Title::newFromText($params['from']);
-		if(!$fromTitle)
-			$this->dieUsageMsg(array('invalidtitle', $params['from']));
+		if(isset($params['from']))
+		{
+			$fromTitle = Title::newFromText($params['from']);
+			if(!$fromTitle)
+				$this->dieUsageMsg(array('invalidtitle', $params['from']));
+		}
+		else if(isset($params['fromid']))
+		{
+			$fromTitle = Title::newFromID($params['fromid']);
+			if(!$fromTitle)
+				$this->dieUsageMsg(array('nosuchpageid', $params['fromid']));
+		}
 		if(!$fromTitle->exists())
 			$this->dieUsageMsg(array('notanarticle'));
 		$fromTalk = $fromTitle->getTalkPage();
@@ -66,27 +73,10 @@ class ApiMove extends ApiBase {
 			$this->dieUsageMsg(array('invalidtitle', $params['to']));
 		$toTalk = $toTitle->getTalkPage();
 
-		// Run getUserPermissionsErrors() here so we get message arguments too,
-		// rather than just a message key. The latter is troublesome for messages
-		// that use arguments.
-		// FIXME: moveTo() should really return an array, requires some
-		//	  refactoring of other code, though (mainly SpecialMovepage.php)
-		$errors = array_merge($fromTitle->getUserPermissionsErrors('move', $wgUser),
-					$fromTitle->getUserPermissionsErrors('edit', $wgUser),
-					$toTitle->getUserPermissionsErrors('move', $wgUser),
-					$toTitle->getUserPermissionsErrors('edit', $wgUser));
-		if(!empty($errors))
-			// We don't care about multiple errors, just report one of them
-			$this->dieUsageMsg(current($errors));
-
 		$hookErr = null;
-
 		$retval = $fromTitle->moveTo($toTitle, true, $params['reason'], !$params['noredirect']);
 		if($retval !== true)
-		{
-			# FIXME: Title::moveTo() sometimes returns a string
 			$this->dieUsageMsg(reset($retval));
-		}
 
 		$r = array('from' => $fromTitle->getPrefixedText(), 'to' => $toTitle->getPrefixedText(), 'reason' => $params['reason']);
 		if(!$params['noredirect'] || !$wgUser->isAllowed('suppressredirect'))
@@ -105,8 +95,9 @@ class ApiMove extends ApiBase {
 			// We're not gonna dieUsage() on failure, since we already changed something
 			else
 			{
-				$r['talkmove-error-code'] = ApiBase::$messageMap[$retval]['code'];
-				$r['talkmove-error-info'] = ApiBase::$messageMap[$retval]['info'];
+				$parsed = $this->parseMsg(reset($retval));
+				$r['talkmove-error-code'] = $parsed['code'];
+				$r['talkmove-error-info'] = $parsed['info'];
 			}
 		}
 
@@ -129,6 +120,9 @@ class ApiMove extends ApiBase {
 	public function getAllowedParams() {
 		return array (
 			'from' => null,
+			'fromid' => array(
+				ApiBase::PARAM_TYPE => 'integer'
+			),
 			'to' => null,
 			'token' => null,
 			'reason' => null,
@@ -141,7 +135,8 @@ class ApiMove extends ApiBase {
 
 	public function getParamDescription() {
 		return array (
-			'from' => 'Title of the page you want to move.',
+			'from' => 'Title of the page you want to move. Cannot be used together with fromid.',
+			'fromid' => 'Page ID of the page you want to move. Cannot be used together with from.',
 			'to' => 'Title you want to rename the page to.',
 			'token' => 'A move token previously retrieved through prop=info',
 			'reason' => 'Reason for the move (optional).',
@@ -154,7 +149,7 @@ class ApiMove extends ApiBase {
 
 	public function getDescription() {
 		return array(
-			'Moves a page.'
+			'Move a page.'
 		);
 	}
 
@@ -165,6 +160,6 @@ class ApiMove extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiMove.php 35619 2008-05-30 19:59:47Z btongminh $';
+		return __CLASS__ . ': $Id: ApiMove.php 47041 2009-02-09 14:39:41Z catrope $';
 	}
 }
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index e09cb285..54482e4b 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -53,7 +53,7 @@ class ApiPageSet extends ApiQueryBase {
 	private $mRequestedPageFields;
 
 	public function __construct($query, $resolveRedirects = false) {
-		parent :: __construct($query, __CLASS__);
+		parent :: __construct($query, 'query');
 
 		$this->mAllPages = array ();
 		$this->mTitles = array();
@@ -92,10 +92,11 @@ class ApiPageSet extends ApiQueryBase {
 	 */
 	public function getPageTableFields() {
 		// Ensure we get minimum required fields
+		// DON'T change this order
 		$pageFlds = array (
-			'page_id' => null,
 			'page_namespace' => null,
-			'page_title' => null
+			'page_title' => null,
+			'page_id' => null,
 		);
 
 		// only store non-default fields
@@ -227,19 +228,18 @@ class ApiPageSet extends ApiQueryBase {
 	 */
 	public function execute() {
 		$this->profileIn();
-		$titles = $pageids = $revids = null;
-		extract($this->extractRequestParams());
+		$params = $this->extractRequestParams();
 
 		// Only one of the titles/pageids/revids is allowed at the same time
 		$dataSource = null;
-		if (isset ($titles))
+		if (isset ($params['titles']))
 			$dataSource = 'titles';
-		if (isset ($pageids)) {
+		if (isset ($params['pageids'])) {
 			if (isset ($dataSource))
 				$this->dieUsage("Cannot use 'pageids' at the same time as '$dataSource'", 'multisource');
 			$dataSource = 'pageids';
 		}
-		if (isset ($revids)) {
+		if (isset ($params['revids'])) {
 			if (isset ($dataSource))
 				$this->dieUsage("Cannot use 'revids' at the same time as '$dataSource'", 'multisource');
 			$dataSource = 'revids';
@@ -247,15 +247,17 @@ class ApiPageSet extends ApiQueryBase {
 
 		switch ($dataSource) {
 			case 'titles' :
-				$this->initFromTitles($titles);
+				$this->initFromTitles($params['titles']);
 				break;
 			case 'pageids' :
-				$this->initFromPageIds($pageids);
+				$this->initFromPageIds($params['pageids']);
 				break;
 			case 'revids' :
 				if($this->mResolveRedirects)
-					$this->dieUsage('revids may not be used with redirect resolution', 'params');
-				$this->initFromRevIDs($revids);
+					$this->setWarning('Redirect resolution cannot be used together with the revids= parameter. '.
+					'Any redirects the revids= point to have not been resolved.');
+				$this->mResolveRedirects = false;
+				$this->initFromRevIDs($params['revids']);
 				break;
 			default :
 				// Do nothing - some queries do not need any of the data sources.
@@ -366,7 +368,7 @@ class ApiPageSet extends ApiQueryBase {
 	}
 
 	private function initFromPageIds($pageids) {
-		if(empty($pageids))
+		if(!count($pageids))
 			return;
 
 		$pageids = array_map('intval', $pageids); // paranoia
@@ -424,7 +426,7 @@ class ApiPageSet extends ApiQueryBase {
 		if(isset($remaining)) {
 			// Any items left in the $remaining list are added as missing
 			if($processTitles) {
-				// The remaining titles in $remaining are non-existant pages
+				// The remaining titles in $remaining are non-existent pages
 				foreach ($remaining as $ns => $dbkeys) {
 					foreach ( $dbkeys as $dbkey => $unused ) {
 						$title = Title :: makeTitle($ns, $dbkey);
@@ -438,7 +440,7 @@ class ApiPageSet extends ApiQueryBase {
 			else
 			{
 				// The remaining pageids do not exist
-				if(empty($this->mMissingPageIDs))
+				if(!$this->mMissingPageIDs)
 					$this->mMissingPageIDs = array_keys($remaining);
 				else
 					$this->mMissingPageIDs = array_merge($this->mMissingPageIDs, array_keys($remaining));
@@ -448,16 +450,16 @@ class ApiPageSet extends ApiQueryBase {
 
 	private function initFromRevIDs($revids) {
 
-		if(empty($revids))
+		if(!count($revids))
 			return;
 
 		$db = $this->getDB();
 		$pageids = array();
 		$remaining = array_flip($revids);
 
-		$tables = array('revision');
+		$tables = array('revision','page');
 		$fields = array('rev_id','rev_page');
-		$where = array('rev_deleted' => 0, 'rev_id' => $revids);
+		$where = array('rev_deleted' => 0, 'rev_id' => $revids,'rev_page = page_id');
 
 		// Get pageIDs data from the `page` table
 		$this->profileDBIn();
@@ -475,8 +477,6 @@ class ApiPageSet extends ApiQueryBase {
 		$this->mMissingRevIDs = array_keys($remaining);
 
 		// Populate all the page information
-		if($this->mResolveRedirects)
-			ApiBase :: dieDebug(__METHOD__, 'revids may not be used with redirect resolution');
 		$this->initFromPageIds(array_keys($pageids));
 	}
 
@@ -488,7 +488,7 @@ class ApiPageSet extends ApiQueryBase {
 
 			// Repeat until all redirects have been resolved
 			// The infinite loop is prevented by keeping all known pages in $this->mAllPages
-			while (!empty ($this->mPendingRedirectIDs)) {
+			while ($this->mPendingRedirectIDs) {
 
 				// Resolve redirects by querying the pagelinks table, and repeat the process
 				// Create a new linkBatch object for the next pass
@@ -537,7 +537,7 @@ class ApiPageSet extends ApiQueryBase {
 			$this->mRedirectTitles[$from] = $to;
 		}
 		$db->freeResult($res);
-		if(!empty($this->mPendingRedirectIDs))
+		if($this->mPendingRedirectIDs)
 		{
 			# We found pages that aren't in the redirect table
 			# Add them
@@ -580,16 +580,16 @@ class ApiPageSet extends ApiQueryBase {
 				continue; // There's nothing else we can do
 			}
 			$iw = $titleObj->getInterwiki();
-			if (!empty($iw)) {
+			if (strval($iw) !== '') {
 				// This title is an interwiki link.
 				$this->mInterwikiTitles[$titleObj->getPrefixedText()] = $iw;
 			} else {
 
 				// Validation
 				if ($titleObj->getNamespace() < 0)
-					$this->dieUsage("No support for special pages has been implemented", 'unsupportednamespace');
-
-				$linkBatch->addObj($titleObj);
+					$this->setWarning("No support for special pages has been implemented");
+				else
+					$linkBatch->addObj($titleObj);
 			}
 
 			// Make sure we remember the original title that was given to us
@@ -628,6 +628,6 @@ class ApiPageSet extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiPageSet.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiPageSet.php 45275 2009-01-01 02:02:03Z simetrical $';
 	}
 }
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 77ce514f..2cf044cf 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -86,12 +86,12 @@ class ApiParamInfo extends ApiBase {
 		$retval['classname'] = get_class($obj);
 		$retval['description'] = (is_array($obj->getDescription()) ? implode("\n", $obj->getDescription()) : $obj->getDescription());
 		$retval['prefix'] = $obj->getModulePrefix();
-		$allowedParams = $obj->getAllowedParams();
+		$allowedParams = $obj->getFinalParams();
 		if(!is_array($allowedParams))
 			return $retval;
 		$retval['parameters'] = array();
-		$paramDesc = $obj->getParamDescription();
-		foreach($obj->getAllowedParams() as $n => $p)
+		$paramDesc = $obj->getFinalParamDescription();
+		foreach($allowedParams as $n => $p)
 		{
 			$a = array('name' => $n);
 			if(!is_array($p))
@@ -111,7 +111,15 @@ class ApiParamInfo extends ApiBase {
 				$a['default'] = $p[ApiBase::PARAM_DFLT];
 			if(isset($p[ApiBase::PARAM_ISMULTI]))
 				if($p[ApiBase::PARAM_ISMULTI])
+				{
 					$a['multi'] = '';
+					$a['limit'] = $this->getMain()->canApiHighLimits() ?
+							ApiBase::LIMIT_SML2 :
+							ApiBase::LIMIT_SML1;
+				}
+			if(isset($p[ApiBase::PARAM_ALLOW_DUPLICATES]))
+				if($p[ApiBase::PARAM_ALLOW_DUPLICATES])
+					$a['allowsduplicates'] = '';
 			if(isset($p[ApiBase::PARAM_TYPE]))
 			{
 				$a['type'] = $p[ApiBase::PARAM_TYPE];
@@ -161,6 +169,6 @@ class ApiParamInfo extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiParamInfo.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiParamInfo.php 41653 2008-10-04 15:03:03Z catrope $';
 	}
 }
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 4dcc94b6..e221fb1d 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -49,10 +49,13 @@ class ApiParse extends ApiBase {
 		$prop = array_flip($params['prop']);
 		$revid = false;
 
-		global $wgParser, $wgUser;
+		// The parser needs $wgTitle to be set, apparently the
+		// $title parameter in Parser::parse isn't enough *sigh*
+		global $wgParser, $wgUser, $wgTitle;
 		$popts = new ParserOptions();
 		$popts->setTidy(true);
 		$popts->enableLimitReport();
+		$redirValues = null;
 		if(!is_null($oldid) || !is_null($page))
 		{
 			if(!is_null($oldid))
@@ -63,23 +66,42 @@ class ApiParse extends ApiBase {
 					$this->dieUsage("There is no revision ID $oldid", 'missingrev');
 				if(!$rev->userCan(Revision::DELETED_TEXT))
 					$this->dieUsage("You don't have permission to view deleted revisions", 'permissiondenied');
-				$text = $rev->getRawText();
+				$text = $rev->getText( Revision::FOR_THIS_USER );
 				$titleObj = $rev->getTitle();
+				$wgTitle = $titleObj;
 				$p_result = $wgParser->parse($text, $titleObj, $popts);
 			}
 			else
 			{
-				$titleObj = Title::newFromText($page);
+				if($params['redirects'])
+				{
+					$req = new FauxRequest(array(
+						'action' => 'query',
+						'redirects' => '',
+						'titles' => $page
+					));
+					$main = new ApiMain($req);
+					$main->execute();
+					$data = $main->getResultData();
+					$redirValues = @$data['query']['redirects'];
+					$to = $page;
+					foreach((array)$redirValues as $r)
+						$to = $r['to'];
+				}
+				else
+					$to = $page; 
+				$titleObj = Title::newFromText($to);
 				if(!$titleObj)
 					$this->dieUsage("The page you specified doesn't exist", 'missingtitle');
 
-				// Try the parser cache first
 				$articleObj = new Article($titleObj);
 				if(isset($prop['revid']))
 					$oldid = $articleObj->getRevIdFetched();
+				// Try the parser cache first
 				$pcache = ParserCache::singleton();
 				$p_result = $pcache->get($articleObj, $wgUser);
-				if(!$p_result) {
+				if(!$p_result)
+				{
 					$p_result = $wgParser->parse($articleObj->getContent(), $titleObj, $popts);
 					global $wgUseParserCache;
 					if($wgUseParserCache)
@@ -92,12 +114,25 @@ class ApiParse extends ApiBase {
 			$titleObj = Title::newFromText($title);
 			if(!$titleObj)
 				$titleObj = Title::newFromText("API");
+			$wgTitle = $titleObj;
+			if($params['pst'] || $params['onlypst'])
+				$text = $wgParser->preSaveTransform($text, $titleObj, $wgUser, $popts);
+			if($params['onlypst'])
+			{
+				// Build a result and bail out
+				$result_array['text'] = array();
+				$this->getResult()->setContent($result_array['text'], $text);
+				$this->getResult()->addValue(null, $this->getModuleName(), $result_array);
+				return;
+			}
 			$p_result = $wgParser->parse($text, $titleObj, $popts);
 		}
 
 		// Return result
 		$result = $this->getResult();
 		$result_array = array();
+		if($params['redirects'] && !is_null($redirValues))
+			$result_array['redirects'] = $redirValues;
 		if(isset($prop['text'])) {
 			$result_array['text'] = array();
 			$result->setContent($result_array['text'], $p_result->getText());
@@ -120,6 +155,7 @@ class ApiParse extends ApiBase {
 			$result_array['revid'] = $oldid;
 
 		$result_mapping = array(
+			'redirects' => 'r',
 			'langlinks' => 'll',
 			'categories' => 'cl',
 			'links' => 'pl',
@@ -184,6 +220,7 @@ class ApiParse extends ApiBase {
 			),
 			'text' => null,
 			'page' => null,
+			'redirects' => false,
 			'oldid' => null,
 			'prop' => array(
 				ApiBase :: PARAM_DFLT => 'text|langlinks|categories|links|templates|images|externallinks|sections|revid',
@@ -199,19 +236,28 @@ class ApiParse extends ApiBase {
 					'sections',
 					'revid'
 				)
-			)
+			),
+			'pst' => false,
+			'onlypst' => false,
 		);
 	}
 
 	public function getParamDescription() {
 		return array (
 			'text' => 'Wikitext to parse',
+			'redirects' => 'If the page parameter is set to a redirect, resolve it',
 			'title' => 'Title of page the text belongs to',
 			'page' => 'Parse the content of this page. Cannot be used together with text and title',
 			'oldid' => 'Parse the content of this revision. Overrides page',
 			'prop' => array('Which pieces of information to get.',
 					'NOTE: Section tree is only generated if there are more than 4 sections, or if the __TOC__ keyword is present'
 			),
+			'pst' => array(	'Do a pre-save transform on the input before parsing it.',
+					'Ignored if page or oldid is used.'
+			),
+			'onlypst' => array('Do a PST on the input, but don\'t parse it.',
+					'Returns PSTed wikitext. Ignored if page or oldid is used.'
+			),
 		);
 	}
 
@@ -226,6 +272,6 @@ class ApiParse extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiParse.php 36983 2008-07-03 15:01:50Z catrope $';
+		return __CLASS__ . ': $Id: ApiParse.php 44858 2008-12-20 20:00:07Z catrope $';
 	}
 }
diff --git a/includes/api/ApiPatrol.php b/includes/api/ApiPatrol.php
new file mode 100644
index 00000000..08de87b0
--- /dev/null
+++ b/includes/api/ApiPatrol.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * Created on Sep 2, 2008
+ *
+ * API for MediaWiki 1.14+
+ *
+ * Copyright (C) 2008 Soxred93 soxred93@gmail.com,
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	require_once ('ApiBase.php');
+}
+
+/**
+ * Allows user to patrol pages
+ * @ingroup API
+ */
+class ApiPatrol extends ApiBase {
+
+	public function __construct($main, $action) {
+		parent :: __construct($main, $action);
+	}
+
+	/**
+	 * Patrols the article or provides the reason the patrol failed.
+	 */
+	public function execute() {
+		global $wgUser, $wgUseRCPatrol, $wgUseNPPatrol;
+		$this->getMain()->requestWriteMode();
+		$params = $this->extractRequestParams();
+		
+		if(!isset($params['token']))
+			$this->dieUsageMsg(array('missingparam', 'token'));
+		if(!isset($params['rcid']))
+			$this->dieUsageMsg(array('missingparam', 'rcid'));
+		if(!$wgUser->matchEditToken($params['token']))
+			$this->dieUsageMsg(array('sessionfailure'));
+
+		$rc = RecentChange::newFromID($params['rcid']);
+		if(!$rc instanceof RecentChange)
+			$this->dieUsageMsg(array('nosuchrcid', $params['rcid']));
+		$retval = RecentChange::markPatrolled($params['rcid']);
+			
+		if($retval)
+			$this->dieUsageMsg(current($retval));
+		
+		$result = array('rcid' => $rc->getAttribute('rc_id'));
+		ApiQueryBase::addTitleInfo($result, $rc->getTitle());
+		$this->getResult()->addValue(null, $this->getModuleName(), $result);
+	}
+
+	public function getAllowedParams() {
+		return array (
+			'token' => null,
+			'rcid' => array(
+				ApiBase :: PARAM_TYPE => 'integer'
+			),
+		);
+	}
+
+	public function getParamDescription() {
+		return array (
+			'token' => 'Patrol token obtained from list=recentchanges',
+			'rcid' => 'Recentchanges ID to patrol',
+		);
+	}
+
+	public function getDescription() {
+		return array (
+			'Patrol a page or revision. '
+		);
+	}
+
+	protected function getExamples() {
+		return array(
+			'api.php?action=patrol&token=123abc&rcid=230672766'
+		);
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiPatrol.php 42548 2008-10-25 14:04:43Z tstarling $';
+	}
+}
diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index 30bcfdbc..522d02b2 100644
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -37,7 +37,7 @@ class ApiProtect extends ApiBase {
 	}
 
 	public function execute() {
-		global $wgUser;
+		global $wgUser, $wgRestrictionTypes, $wgRestrictionLevels;
 		$this->getMain()->requestWriteMode();
 		$params = $this->extractRequestParams();
 
@@ -46,7 +46,7 @@ class ApiProtect extends ApiBase {
 			$this->dieUsageMsg(array('missingparam', 'title'));
 		if(!isset($params['token']))
 			$this->dieUsageMsg(array('missingparam', 'token'));
-		if(!isset($params['protections']) || empty($params['protections']))
+		if(empty($params['protections']))
 			$this->dieUsageMsg(array('missingparam', 'protections'));
 
 		if(!$wgUser->matchEditToken($params['token']))
@@ -57,25 +57,23 @@ class ApiProtect extends ApiBase {
 			$this->dieUsageMsg(array('invalidtitle', $params['title']));
 
 		$errors = $titleObj->getUserPermissionsErrors('protect', $wgUser);
-		if(!empty($errors))
+		if($errors)
 			// We don't care about multiple errors, just report one of them
 			$this->dieUsageMsg(current($errors));
 
-		if(in_array($params['expiry'], array('infinite', 'indefinite', 'never')))
-			$expiry = Block::infinity();
-		else
+		$expiry = (array)$params['expiry'];
+		if(count($expiry) != count($params['protections']))
 		{
-			$expiry = strtotime($params['expiry']);
-			if($expiry < 0 || $expiry == false)
-				$this->dieUsageMsg(array('invalidexpiry'));
-
-			$expiry = wfTimestamp(TS_MW, $expiry);
-			if($expiry < wfTimestampNow())
-				$this->dieUsageMsg(array('pastexpiry'));
+			if(count($expiry) == 1)
+				$expiry = array_fill(0, count($params['protections']), $expiry[0]);
+			else
+				$this->dieUsageMsg(array('toofewexpiries', count($expiry), count($params['protections'])));
 		}
-
+			
 		$protections = array();
-		foreach($params['protections'] as $prot)
+		$expiryarray = array();
+		$resultProtections = array();
+		foreach($params['protections'] as $i => $prot)
 		{
 			$p = explode('=', $prot);
 			$protections[$p[0]] = ($p[1] == 'all' ? '' : $p[1]);
@@ -83,26 +81,45 @@ class ApiProtect extends ApiBase {
 				$this->dieUsageMsg(array('create-titleexists'));
 			if(!$titleObj->exists() && $p[0] != 'create')
 				$this->dieUsageMsg(array('missingtitles-createonly'));
+			if(!in_array($p[0], $wgRestrictionTypes) && $p[0] != 'create')
+				$this->dieUsageMsg(array('protect-invalidaction', $p[0]));
+			if(!in_array($p[1], $wgRestrictionLevels) && $p[1] != 'all')
+				$this->dieUsageMsg(array('protect-invalidlevel', $p[1]));
+
+			if(in_array($expiry[$i], array('infinite', 'indefinite', 'never')))
+				$expiryarray[$p[0]] = Block::infinity();
+			else
+			{
+				$exp = strtotime($expiry[$i]);
+				if($exp < 0 || $exp == false)
+					$this->dieUsageMsg(array('invalidexpiry', $expiry[$i]));
+
+				$exp = wfTimestamp(TS_MW, $exp);
+				if($exp < wfTimestampNow())
+					$this->dieUsageMsg(array('pastexpiry', $expiry[$i]));
+				$expiryarray[$p[0]] = $exp;
+			}
+			$resultProtections[] = array($p[0] => $protections[$p[0]],
+					'expiry' => ($expiryarray[$p[0]] == Block::infinity() ?
+								'infinite' :
+								wfTimestamp(TS_ISO_8601, $expiryarray[$p[0]])));
 		}
 
+		$cascade = $params['cascade'];
 		if($titleObj->exists()) {
 			$articleObj = new Article($titleObj);
-			$ok = $articleObj->updateRestrictions($protections, $params['reason'], $params['cascade'], $expiry);
+			$ok = $articleObj->updateRestrictions($protections, $params['reason'], $cascade, $expiryarray);
 		} else
-			$ok = $titleObj->updateTitleProtection($protections['create'], $params['reason'], $expiry);
+			$ok = $titleObj->updateTitleProtection($protections['create'], $params['reason'], $expiryarray['create']);
 		if(!$ok)
 			// This is very weird. Maybe the article was deleted or the user was blocked/desysopped in the meantime?
 			// Just throw an unknown error in this case, as it's very likely to be a race condition
 			$this->dieUsageMsg(array());
 		$res = array('title' => $titleObj->getPrefixedText(), 'reason' => $params['reason']);
-		if($expiry == Block::infinity())
-			$res['expiry'] = 'infinity';
-		else
-			$res['expiry'] = wfTimestamp(TS_ISO_8601, $expiry);
-
-		if($params['cascade'])
+		if($cascade)
 			$res['cascade'] = '';
-		$res['protections'] = $protections;
+		$res['protections'] = $resultProtections;
+		$this->getResult()->setIndexedTagName($res['protections'], 'protection');
 		$this->getResult()->addValue(null, $this->getModuleName(), $res);
 	}
 
@@ -115,7 +132,11 @@ class ApiProtect extends ApiBase {
 			'protections' => array(
 				ApiBase :: PARAM_ISMULTI => true
 			),
-			'expiry' => 'infinite',
+			'expiry' => array(
+				ApiBase :: PARAM_ISMULTI => true,
+				ApiBase :: PARAM_ALLOW_DUPLICATES => true,
+				ApiBase :: PARAM_DFLT => 'infinite',
+			),
 			'reason' => '',
 			'cascade' => false
 		);
@@ -123,12 +144,14 @@ class ApiProtect extends ApiBase {
 
 	public function getParamDescription() {
 		return array (
-			'title' => 'Title of the page you want to restore.',
+			'title' => 'Title of the page you want to (un)protect.',
 			'token' => 'A protect token previously retrieved through prop=info',
 			'protections' => 'Pipe-separated list of protection levels, formatted action=group (e.g. edit=sysop)',
-			'expiry' => 'Expiry timestamp. If set to \'infinite\', \'indefinite\' or \'never\', the protection will never expire.',
+			'expiry' => array('Expiry timestamps. If only one timestamp is set, it\'ll be used for all protections.',
+					'Use \'infinite\', \'indefinite\' or \'never\', for a neverexpiring protection.'),
 			'reason' => 'Reason for (un)protecting (optional)',
-			'cascade' => 'Enable cascading protection (i.e. protect pages included in this page)'
+			'cascade' => array('Enable cascading protection (i.e. protect pages included in this page)',
+					'Ignored if not all protection levels are \'sysop\' or \'protect\''),
 		);
 	}
 
@@ -140,12 +163,12 @@ class ApiProtect extends ApiBase {
 
 	protected function getExamples() {
 		return array (
-			'api.php?action=protect&title=Main%20Page&token=123ABC&protections=edit=sysop|move=sysop&cascade&expiry=20070901163000',
+			'api.php?action=protect&title=Main%20Page&token=123ABC&protections=edit=sysop|move=sysop&cascade&expiry=20070901163000|never',
 			'api.php?action=protect&title=Main%20Page&token=123ABC&protections=edit=all|move=all&reason=Lifting%20restrictions'
 		);
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiProtect.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiProtect.php 44426 2008-12-10 22:39:41Z catrope $';
 	}
 }
diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
new file mode 100644
index 00000000..d7202a46
--- /dev/null
+++ b/includes/api/ApiPurge.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * Created on Sep 2, 2008
+ *
+ * API for MediaWiki 1.14+
+ *
+ * Copyright (C) 2008 Chad Horohoe
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	require_once ('ApiBase.php');
+}
+
+/**
+ * API interface for page purging
+ * @ingroup API
+ */
+class ApiPurge extends ApiBase {
+
+	public function __construct($main, $action) {
+		parent :: __construct($main, $action);
+	}
+
+	/**
+	 * Purges the cache of a page
+	 */
+	public function execute() {
+		global $wgUser;
+		$params = $this->extractRequestParams();
+		if(!$wgUser->isAllowed('purge'))
+			$this->dieUsageMsg(array('cantpurge'));
+		if(!isset($params['titles']))
+			$this->dieUsageMsg(array('missingparam', 'titles'));
+		$result = array();
+		foreach($params['titles'] as $t) {
+			$r = array();
+			$title = Title::newFromText($t);
+			if(!$title instanceof Title)
+			{
+				$r['title'] = $t;
+				$r['invalid'] = '';
+				$result[] = $r;
+				continue;
+			}
+			ApiQueryBase::addTitleInfo($r, $title);
+			if(!$title->exists())
+			{
+				$r['missing'] = '';
+				$result[] = $r;
+				continue;
+			}
+			$article = new Article($title);
+			$article->doPurge(); // Directly purge and skip the UI part of purge().
+			$r['purged'] = '';
+			$result[] = $r;
+		}
+		$this->getResult()->setIndexedTagName($result, 'page');
+		$this->getResult()->addValue(null, $this->getModuleName(), $result);
+	}
+
+	public function getAllowedParams() {
+		return array (
+			'titles' => array(
+				ApiBase :: PARAM_ISMULTI => true
+			)
+		);
+	}
+
+	public function getParamDescription() {
+		return array (
+			'titles' => 'A list of titles',
+		);
+	}
+
+	public function getDescription() {
+		return array (
+			'Purge the cache for the given titles.'
+		);
+	}
+
+	protected function getExamples() {
+		return array(
+			'api.php?action=purge&titles=Main_Page|API'
+		);
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiPurge.php 41020 2008-09-19 00:21:03Z demon $';
+	}
+}
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index f4a2402f..45a5667a 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -56,6 +56,7 @@ class ApiQuery extends ApiBase {
 		'categories' => 'ApiQueryCategories',
 		'extlinks' => 'ApiQueryExternalLinks',
 		'categoryinfo' => 'ApiQueryCategoryInfo',
+		'duplicatefiles' => 'ApiQueryDuplicateFiles',
 	);
 
 	private $mQueryListModules = array (
@@ -75,6 +76,7 @@ class ApiQuery extends ApiBase {
 		'search' => 'ApiQuerySearch',
 		'usercontribs' => 'ApiQueryContributions',
 		'watchlist' => 'ApiQueryWatchlist',
+		'watchlistraw' => 'ApiQueryWatchlistRaw',
 		'exturlusage' => 'ApiQueryExtLinksUsage',
 		'users' => 'ApiQueryUsers',
 		'random' => 'ApiQueryRandom',
@@ -93,10 +95,10 @@ class ApiQuery extends ApiBase {
 		parent :: __construct($main, $action);
 
 		// Allow custom modules to be added in LocalSettings.php
-		global $wgApiQueryPropModules, $wgApiQueryListModules, $wgApiQueryMetaModules;
-		self :: appendUserModules($this->mQueryPropModules, $wgApiQueryPropModules);
-		self :: appendUserModules($this->mQueryListModules, $wgApiQueryListModules);
-		self :: appendUserModules($this->mQueryMetaModules, $wgApiQueryMetaModules);
+		global $wgAPIPropModules, $wgAPIListModules, $wgAPIMetaModules;
+		self :: appendUserModules($this->mQueryPropModules, $wgAPIPropModules);
+		self :: appendUserModules($this->mQueryListModules, $wgAPIListModules);
+		self :: appendUserModules($this->mQueryMetaModules, $wgAPIMetaModules);
 
 		$this->mPropModuleNames = array_keys($this->mQueryPropModules);
 		$this->mListModuleNames = array_keys($this->mQueryListModules);
@@ -209,6 +211,7 @@ class ApiQuery extends ApiBase {
 		foreach ($modules as $module) {
 			$module->profileIn();
 			$module->execute();
+			wfRunHooks('APIQueryAfterExecute', array(&$module));
 			$module->profileOut();
 		}
 	}
@@ -229,8 +232,8 @@ class ApiQuery extends ApiBase {
 	 * Create instances of all modules requested by the client
 	 */
 	private function InstantiateModules(&$modules, $param, $moduleList) {
-		$list = $this->params[$param];
-		if (isset ($list))
+		$list = @$this->params[$param];
+		if (!is_null ($list))
 			foreach ($list as $moduleName)
 				$modules[] = new $moduleList[$moduleName] ($this, $moduleName);
 	}
@@ -253,7 +256,7 @@ class ApiQuery extends ApiBase {
 			);
 		}
 
-		if (!empty ($normValues)) {
+		if (count($normValues)) {
 			$result->setIndexedTagName($normValues, 'n');
 			$result->addValue('query', 'normalized', $normValues);
 		}
@@ -267,7 +270,7 @@ class ApiQuery extends ApiBase {
 			);
 		}
 
-		if (!empty ($intrwValues)) {
+		if (count($intrwValues)) {
 			$result->setIndexedTagName($intrwValues, 'i');
 			$result->addValue('query', 'interwiki', $intrwValues);
 		}
@@ -281,7 +284,7 @@ class ApiQuery extends ApiBase {
 			);
 		}
 
-		if (!empty ($redirValues)) {
+		if (count($redirValues)) {
 			$result->setIndexedTagName($redirValues, 'r');
 			$result->addValue('query', 'redirects', $redirValues);
 		}
@@ -290,7 +293,7 @@ class ApiQuery extends ApiBase {
 		// Missing revision elements
 		//
 		$missingRevIDs = $pageSet->getMissingRevisionIDs();
-		if (!empty ($missingRevIDs)) {
+		if (count($missingRevIDs)) {
 			$revids = array ();
 			foreach ($missingRevIDs as $revid) {
 				$revids[$revid] = array (
@@ -332,7 +335,7 @@ class ApiQuery extends ApiBase {
 			$pages[$pageid] = $vals;
 		}
 
-		if (!empty ($pages)) {
+		if (count($pages)) {
 
 			if ($this->params['indexpageids']) {
 				$pageIDs = array_keys($pages);
@@ -381,6 +384,7 @@ class ApiQuery extends ApiBase {
 		// populate resultPageSet with the generator output
 		$generator->profileIn();
 		$generator->executeGenerator($resultPageSet);
+		wfRunHooks('APIQueryGeneratorAfterExecute', array(&$generator, &$resultPageSet));
 		$resultPageSet->finishPageSetGeneration();
 		$generator->profileOut();
 
@@ -476,7 +480,6 @@ class ApiQuery extends ApiBase {
 		return $psModule->makeHelpMsgParameters() . parent :: makeHelpMsgParameters();
 	}
 
-	// @todo should work correctly
 	public function shouldCheckMaxlag() {
 		return true;
 	}
@@ -509,7 +512,7 @@ class ApiQuery extends ApiBase {
 	public function getVersion() {
 		$psModule = new ApiPageSet($this);
 		$vers = array ();
-		$vers[] = __CLASS__ . ': $Id: ApiQuery.php 35098 2008-05-20 17:13:28Z ialex $';
+		$vers[] = __CLASS__ . ': $Id: ApiQuery.php 42548 2008-10-25 14:04:43Z tstarling $';
 		$vers[] = $psModule->getVersion();
 		return $vers;
 	}
diff --git a/includes/api/ApiQueryAllCategories.php b/includes/api/ApiQueryAllCategories.php
index 3ff42c88..e6287eea 100644
--- a/includes/api/ApiQueryAllCategories.php
+++ b/includes/api/ApiQueryAllCategories.php
@@ -56,17 +56,30 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
 		$this->addTables('category');
 		$this->addFields('cat_title');
 
-		if (!is_null($params['from']))
-			$this->addWhere('cat_title>=' . $db->addQuotes($this->titleToKey($params['from'])));
+		$dir = ($params['dir'] == 'descending' ? 'older' : 'newer');
+		$from = (is_null($params['from']) ? null : $this->titlePartToKey($params['from']));
+		$this->addWhereRange('cat_title', $dir, $from, null);
 		if (isset ($params['prefix']))
-			$this->addWhere("cat_title LIKE '" . $db->escapeLike($this->titleToKey($params['prefix'])) . "%'");
+			$this->addWhere("cat_title LIKE '" . $db->escapeLike($this->titlePartToKey($params['prefix'])) . "%'");
 
 		$this->addOption('LIMIT', $params['limit']+1);
 		$this->addOption('ORDER BY', 'cat_title' . ($params['dir'] == 'descending' ? ' DESC' : ''));
 
 		$prop = array_flip($params['prop']);
 		$this->addFieldsIf( array( 'cat_pages', 'cat_subcats', 'cat_files' ), isset($prop['size']) );
-		$this->addFieldsIf( 'cat_hidden', isset($prop['hidden']) );
+		if(isset($prop['hidden']))
+		{
+			$this->addTables(array('page', 'page_props'));
+			$this->addJoinConds(array(
+				'page' => array('LEFT JOIN', array(
+					'page_namespace' => NS_CATEGORY,
+					'page_title=cat_title')),
+				'page_props' => array('LEFT JOIN', array(
+					'pp_page=page_id',
+					'pp_propname' => 'hiddencat')),
+			));
+			$this->addFields('pp_propname AS cat_hidden');
+		}
 
 		$res = $this->select(__METHOD__);
 
@@ -158,6 +171,6 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllCategories.php 36790 2008-06-29 22:26:23Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryAllCategories.php 44590 2008-12-14 20:24:23Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php
index aefbb725..9ad34aa2 100644
--- a/includes/api/ApiQueryAllLinks.php
+++ b/includes/api/ApiQueryAllLinks.php
@@ -74,30 +74,30 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
 			$arr = explode('|', $params['continue']);
 			if(count($arr) != 2)
 				$this->dieUsage("Invalid continue parameter", 'badcontinue');
-			$params['from'] = $arr[0]; // Handled later
+			$from = $this->getDB()->strencode($this->titleToKey($arr[0]));
 			$id = intval($arr[1]);
-			$this->addWhere("pl_from >= $id");
+			$this->addWhere("pl_title > '$from' OR " .
+					"(pl_title = '$from' AND " .
+					"pl_from > $id)");
 		}		
 
 		if (!is_null($params['from']))
-			$this->addWhere('pl_title>=' . $db->addQuotes($this->titleToKey($params['from'])));
+			$this->addWhere('pl_title>=' . $db->addQuotes($this->titlePartToKey($params['from'])));
 		if (isset ($params['prefix']))
-			$this->addWhere("pl_title LIKE '" . $db->escapeLike($this->titleToKey($params['prefix'])) . "%'");
+			$this->addWhere("pl_title LIKE '" . $db->escapeLike($this->titlePartToKey($params['prefix'])) . "%'");
 
 		$this->addFields(array (
-			'pl_namespace',
 			'pl_title',
-			'pl_from'
 		));
+		$this->addFieldsIf('pl_from', !$params['unique']);
 
 		$this->addOption('USE INDEX', 'pl_namespace');
 		$limit = $params['limit'];
 		$this->addOption('LIMIT', $limit+1);
-		# Only order by pl_namespace if it isn't constant in the WHERE clause
-		if(count($params['namespace']) != 1)
-			$this->addOption('ORDER BY', 'pl_namespace, pl_title');
-		else
+		if($params['unique'])
 			$this->addOption('ORDER BY', 'pl_title');
+		else
+			$this->addOption('ORDER BY', 'pl_title, pl_from');
 
 		$res = $this->select(__METHOD__);
 
@@ -107,7 +107,10 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
 			if (++ $count > $limit) {
 				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
 				// TODO: Security issue - if the user has no right to view next title, it will still be shown
-				$this->setContinueEnumParameter('continue', $this->keyToTitle($row->pl_title) . "|" . $row->pl_from);
+				if($params['unique'])
+					$this->setContinueEnumParameter('from', $this->keyToTitle($row->pl_title));
+				else
+					$this->setContinueEnumParameter('continue', $this->keyToTitle($row->pl_title) . "|" . $row->pl_from);
 				break;
 			}
 
@@ -116,7 +119,7 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
 				if ($fld_ids)
 					$vals['fromid'] = intval($row->pl_from);
 				if ($fld_title) {
-					$title = Title :: makeTitle($row->pl_namespace, $row->pl_title);
+					$title = Title :: makeTitle($params['namespace'], $row->pl_title);
 					$vals['ns'] = intval($title->getNamespace());
 					$vals['title'] = $title->getPrefixedText();
 				}
@@ -187,6 +190,6 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllLinks.php 37258 2008-07-07 14:48:40Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryAllLinks.php 45850 2009-01-17 20:03:25Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index dd0e98a8..8395808b 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -121,7 +121,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			$row = $db->fetchObject($res);
 			$count++;
 
-			if (!$row || $lastUser != $row->user_name) {
+			if (!$row || $lastUser !== $row->user_name) {
 				// Save the last pass's user data
 				if (is_array($lastUserData))
 					$data[] = $lastUserData;
@@ -219,6 +219,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllUsers.php 36790 2008-06-29 22:26:23Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryAllUsers.php 44472 2008-12-11 21:51:01Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 26cbc368..ea83c667 100644
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -61,10 +61,11 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 		$params = $this->extractRequestParams();
 
 		// Image filters
-		if (!is_null($params['from']))
-			$this->addWhere('img_name>=' . $db->addQuotes($this->titleToKey($params['from'])));
+		$dir = ($params['dir'] == 'descending' ? 'older' : 'newer');
+		$from = (is_null($params['from']) ? null : $this->titlePartToKey($params['from']));
+		$this->addWhereRange('img_name', $dir, $from, null);
 		if (isset ($params['prefix']))
-			$this->addWhere("img_name LIKE '" . $db->escapeLike($this->titleToKey($params['prefix'])) . "%'");
+			$this->addWhere("img_name LIKE '" . $db->escapeLike($this->titlePartToKey($params['prefix'])) . "%'");
 
 		if (isset ($params['minsize'])) {
 			$this->addWhere('img_size>=' . intval($params['minsize']));
@@ -109,10 +110,10 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 
 			if (is_null($resultPageSet)) {
 				$file = $repo->newFileFromRow( $row );
-
-				$data[] = ApiQueryImageInfo::getInfo( $file, $prop, $result );
+				$data[] = array_merge(array('name' => $row->img_name),
+					ApiQueryImageInfo::getInfo($file, $prop, $result));
 			} else {
-				$data[] = Title::makeTitle( NS_IMAGE, $row->img_name );
+				$data[] = Title::makeTitle(NS_FILE, $row->img_name);
 			}
 		}
 		$db->freeResult($res);
@@ -162,7 +163,8 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 					'dimensions', // Obsolete
 					'mime',
 					'sha1',
-					'metadata'
+					'metadata',
+					'bitdepth',
 				),
 				ApiBase :: PARAM_DFLT => 'timestamp|url',
 				ApiBase :: PARAM_ISMULTI => true
@@ -200,6 +202,6 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllimages.php 37909 2008-07-22 13:26:15Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryAllimages.php 44121 2008-12-01 17:14:30Z vyznev $';
 	}
 }
diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 39490fe7..531fa02a 100644
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -62,11 +62,21 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 			$this->addWhereIf('page_is_redirect = 0', $params['filterredir'] === 'nonredirects');
 		$this->addWhereFld('page_namespace', $params['namespace']);
 		$dir = ($params['dir'] == 'descending' ? 'older' : 'newer');
-		$from = (is_null($params['from']) ? null : $this->titleToKey($params['from']));
+		$from = (is_null($params['from']) ? null : $this->titlePartToKey($params['from']));
 		$this->addWhereRange('page_title', $dir, $from, null);
 		if (isset ($params['prefix']))
-			$this->addWhere("page_title LIKE '" . $db->escapeLike($this->titleToKey($params['prefix'])) . "%'");
+			$this->addWhere("page_title LIKE '" . $db->escapeLike($this->titlePartToKey($params['prefix'])) . "%'");
 
+		if (is_null($resultPageSet)) {
+			$selectFields = array (
+				'page_namespace',
+				'page_title',
+				'page_id'
+			);
+		} else {
+			$selectFields = $resultPageSet->getPageTableFields();
+		}
+		$this->addFields($selectFields);
 		$forceNameTitleIndex = true;
 		if (isset ($params['minsize'])) {
 			$this->addWhere('page_len>=' . intval($params['minsize']));
@@ -79,15 +89,20 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 		}
 
 		// Page protection filtering
-		if (isset ($params['prtype'])) {
+		if (!empty ($params['prtype'])) {
 			$this->addTables('page_restrictions');
 			$this->addWhere('page_id=pr_page');
 			$this->addWhere('pr_expiry>' . $db->addQuotes($db->timestamp()));
 			$this->addWhereFld('pr_type', $params['prtype']);
 
-			$prlevel = $params['prlevel'];
-			if (!is_null($prlevel) && $prlevel != '' && $prlevel != '*')
+			// Remove the empty string and '*' from the prlevel array
+			$prlevel = array_diff($params['prlevel'], array('', '*'));
+			if (!empty($prlevel))
 				$this->addWhereFld('pr_level', $prlevel);
+			if ($params['prfiltercascade'] == 'cascading')
+				$this->addWhereFld('pr_cascade', 1);
+			if ($params['prfiltercascade'] == 'noncascading')
+				$this->addWhereFld('pr_cascade', 0);
 
 			$this->addOption('DISTINCT');
 
@@ -105,20 +120,16 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 		} else if($params['filterlanglinks'] == 'withlanglinks') {
 			$this->addTables('langlinks');
 			$this->addWhere('page_id=ll_from');
+			$this->addOption('STRAIGHT_JOIN');
+			// We have to GROUP BY all selected fields to stop
+			// PostgreSQL from whining
+			$this->addOption('GROUP BY', implode(', ', $selectFields));
 			$forceNameTitleIndex = false;
 		}
 		if ($forceNameTitleIndex)
 			$this->addOption('USE INDEX', 'name_title');
 
-		if (is_null($resultPageSet)) {
-			$this->addFields(array (
-				'page_id',
-				'page_namespace',
-				'page_title'
-			));
-		} else {
-			$this->addFields($resultPageSet->getPageTableFields());
-		}
+		
 
 		$limit = $params['limit'];
 		$this->addOption('LIMIT', $limit+1);
@@ -185,6 +196,14 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 				ApiBase :: PARAM_TYPE => $wgRestrictionLevels,
 				ApiBase :: PARAM_ISMULTI => true
 			),
+			'prfiltercascade' => array (
+				ApiBase :: PARAM_DFLT => 'all',
+				ApiBase :: PARAM_TYPE => array (
+					'cascading',
+					'noncascading',
+					'all'
+				),
+			),
 			'limit' => array (
 				ApiBase :: PARAM_DFLT => 10,
 				ApiBase :: PARAM_TYPE => 'limit',
@@ -221,6 +240,7 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 			'maxsize' => 'Limit to pages with at most this many bytes',
 			'prtype' => 'Limit to protected pages only',
 			'prlevel' => 'The protection level (must be used with apprtype= parameter)',
+			'prfiltercascade' => 'Filter protections based on cascadingness (ignored when apprtype isn\'t set)',
 			'filterlanglinks' => 'Filter based on whether a page has langlinks',
 			'limit' => 'How many total pages to return.'
 		);
@@ -244,6 +264,6 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllpages.php 37775 2008-07-17 09:26:01Z brion $';
+		return __CLASS__ . ': $Id: ApiQueryAllpages.php 44863 2008-12-20 23:54:04Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index fea058f3..f67e0044 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -60,7 +60,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 	);
 
 	public function __construct($query, $moduleName) {
-		$code = $prefix = $linktbl = null;
 		extract($this->backlinksSettings[$moduleName]);
 
 		parent :: __construct($query, $moduleName, $code);
@@ -100,7 +99,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		 * AND pl_title='Foo' AND pl_namespace=0
 		 * LIMIT 11 ORDER BY pl_from
 		 */
-		$db = $this->getDb();
+		$db = $this->getDB();
 		$this->addTables(array('page', $this->bl_table));
 		$this->addWhere("{$this->bl_from}=page_id");
 		if(is_null($resultPageSet))
@@ -108,12 +107,12 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		else
 			$this->addFields($resultPageSet->getPageTableFields());
 		$this->addFields('page_is_redirect');
-		$this->addWhereFld($this->bl_title, $this->rootTitle->getDbKey());
+		$this->addWhereFld($this->bl_title, $this->rootTitle->getDBKey());
 		if($this->hasNS)
 			$this->addWhereFld($this->bl_ns, $this->rootTitle->getNamespace());
 		$this->addWhereFld('page_namespace', $this->params['namespace']);
 		if(!is_null($this->contID))
-			$this->addWhere("page_id>={$this->contID}");
+			$this->addWhere("{$this->bl_from}>={$this->contID}");
 		if($this->params['filterredir'] == 'redirects')
 			$this->addWhereFld('page_is_redirect', 1);
 		if($this->params['filterredir'] == 'nonredirects')
@@ -124,11 +123,11 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 
 	private function prepareSecondQuery($resultPageSet = null) {
 		/* SELECT page_id, page_title, page_namespace, page_is_redirect, pl_title, pl_namespace
-		 * FROM pagelinks, page WHERE pl_from=page_id
-		 * AND (pl_title='Foo' AND pl_namespace=0) OR (pl_title='Bar' AND pl_namespace=1)
-		 * LIMIT 11 ORDER BY pl_namespace, pl_title, pl_from
+		   FROM pagelinks, page WHERE pl_from=page_id
+		   AND (pl_title='Foo' AND pl_namespace=0) OR (pl_title='Bar' AND pl_namespace=1)
+		   ORDER BY pl_namespace, pl_title, pl_from LIMIT 11
 		 */
-		$db = $this->getDb();
+		$db = $this->getDB();
 		$this->addTables(array('page', $this->bl_table));
 		$this->addWhere("{$this->bl_from}=page_id");
 		if(is_null($resultPageSet))
@@ -138,16 +137,31 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		$this->addFields($this->bl_title);
 		if($this->hasNS)
 			$this->addFields($this->bl_ns);
-		$titleWhere = '';
+		$titleWhere = array();
 		foreach($this->redirTitles as $t)
-			$titleWhere .= ($titleWhere != '' ? " OR " : '') .
-					"({$this->bl_title} = ".$db->addQuotes($t->getDBKey()).
+			$titleWhere[] = "({$this->bl_title} = ".$db->addQuotes($t->getDBKey()).
 					($this->hasNS ? " AND {$this->bl_ns} = '{$t->getNamespace()}'" : "") .
 					")";
-		$this->addWhere($titleWhere);
+		$this->addWhere($db->makeList($titleWhere, LIST_OR));
 		$this->addWhereFld('page_namespace', $this->params['namespace']);
 		if(!is_null($this->redirID))
-			$this->addWhere("page_id>={$this->redirID}");
+		{
+			$first = $this->redirTitles[0];
+			$title = $db->strencode($first->getDBKey());
+			$ns = $first->getNamespace();
+			$from = $this->redirID;
+			if($this->hasNS)
+				$this->addWhere("{$this->bl_ns} > $ns OR ".
+						"({$this->bl_ns} = $ns AND ".
+						"({$this->bl_title} > '$title' OR ".
+						"({$this->bl_title} = '$title' AND ".
+						"{$this->bl_from} >= $from)))");
+			else
+				$this->addWhere("{$this->bl_title} > '$title' OR ".
+						"({$this->bl_title} = '$title' AND ".
+						"{$this->bl_from} >= $from)");
+				
+		}
 		if($this->params['filterredir'] == 'redirects')
 			$this->addWhereFld('page_is_redirect', 1);
 		if($this->params['filterredir'] == 'nonredirects')
@@ -170,7 +184,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		$this->prepareFirstQuery($resultPageSet);
 
 		$db = $this->getDB();
-		$res = $this->select(__METHOD__);
+		$res = $this->select(__METHOD__.'::firstQuery');
 
 		$count = 0;
 		$this->data = array ();
@@ -195,11 +209,11 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		}
 		$db->freeResult($res);
 
-		if($this->redirect && !empty($this->redirTitles))
+		if($this->redirect && count($this->redirTitles))
 		{
 			$this->resetQueryParams();
 			$this->prepareSecondQuery($resultPageSet);
-			$res = $this->select(__METHOD__);
+			$res = $this->select(__METHOD__.'::secondQuery');
 			$count = 0;
 			while($row = $db->fetchObject($res))
 			{
@@ -210,7 +224,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 					if($this->hasNS)
 						$contTitle = Title::makeTitle($row->{$this->bl_ns}, $row->{$this->bl_title});
 					else
-						$contTitle = Title::makeTitle(NS_IMAGE, $row->{$this->bl_title});
+						$contTitle = Title::makeTitle(NS_FILE, $row->{$this->bl_title});
 					$this->continueStr = $this->getContinueRedirStr($contTitle->getArticleID(), $row->page_id);
 					break;
 				}
@@ -229,7 +243,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 			$resultData = array();
 			foreach($this->data as $ns => $a)
 				foreach($a as $title => $arr)
-					$resultData[$arr['pageid']] = $arr;
+					$resultData[] = $arr;
 			$result = $this->getResult();
 			$result->setIndexedTagName($resultData, $this->bl_code);
 			$result->addValue('query', $this->getModuleName(), $resultData);
@@ -254,7 +268,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		ApiQueryBase::addTitleInfo($a, Title::makeTitle($row->page_namespace, $row->page_title));
 		if($row->page_is_redirect)
 			$a['redirect'] = '';
-		$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_IMAGE;
+		$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_FILE;
 		$this->data[$ns][$row->{$this->bl_title}]['redirlinks'][] = $a;
 		$this->getResult()->setIndexedTagName($this->data[$ns][$row->{$this->bl_title}]['redirlinks'], $this->bl_code);
 	}
@@ -276,7 +290,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		}
 
 		// only image titles are allowed for the root in imageinfo mode
-		if (!$this->hasNS && $this->rootTitle->getNamespace() !== NS_IMAGE)
+		if (!$this->hasNS && $this->rootTitle->getNamespace() !== NS_FILE)
 			$this->dieUsage("The title for {$this->getModuleName()} query must be an image", 'bad_image_title');
 	}
 
@@ -399,6 +413,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBacklinks.php 37504 2008-07-10 14:28:09Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryBacklinks.php 46135 2009-01-24 13:03:40Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index f392186b..896dd00c 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -126,13 +126,19 @@ abstract class ApiQueryBase extends ApiBase {
 	 * Clauses can be formatted as 'foo=bar' or array('foo' => 'bar'),
 	 * the latter only works if the value is a constant (i.e. not another field)
 	 *
+	 * If $value is an empty array, this function does nothing.
+	 *
 	 * For example, array('foo=bar', 'baz' => 3, 'bla' => 'foo') translates
 	 * to "foo=bar AND baz='3' AND bla='foo'"
 	 * @param mixed $value String or array
 	 */
 	protected function addWhere($value) {
-		if (is_array($value))
-			$this->where = array_merge($this->where, $value);
+		if (is_array($value)) {
+			// Sanity check: don't insert empty arrays,
+			// Database::makeList() chokes on them
+			if ( count( $value ) )
+				$this->where = array_merge($this->where, $value);
+		}
 		else
 			$this->where[] = $value;
 	}
@@ -154,10 +160,12 @@ abstract class ApiQueryBase extends ApiBase {
 	/**
 	 * Equivalent to addWhere(array($field => $value))
 	 * @param string $field Field name
-	 * @param string $value Value; ignored if nul;
+	 * @param string $value Value; ignored if null or empty array;
 	 */
 	protected function addWhereFld($field, $value) {
-		if (!is_null($value))
+		// Use count() to its full documented capabilities to simultaneously 
+		// test for null, empty array or empty countable object
+		if ( count( $value ) )
 			$this->where[$field] = $value;
 	}
 
@@ -236,7 +244,7 @@ abstract class ApiQueryBase extends ApiBase {
 
 	/**
 	 * Add information (title and namespace) about a Title object to a result array
-	 * @param array $arr Result array à la ApiResult
+	 * @param array $arr Result array à la ApiResult
 	 * @param Title $title Title object
 	 * @param string $prefix Module prefix
 	 */
@@ -264,7 +272,7 @@ abstract class ApiQueryBase extends ApiBase {
 	/**
 	 * Add a sub-element under the page element with the given page ID
 	 * @param int $pageId Page ID
-	 * @param array $data Data array à la ApiResult 
+	 * @param array $data Data array à la ApiResult 
 	 */
 	protected function addPageSubItems($pageId, $data) {
 		$result = $this->getResult();
@@ -324,10 +332,13 @@ abstract class ApiQueryBase extends ApiBase {
 	 * @return string Page title with underscores
 	 */
 	public function titleToKey($title) {
+		# Don't throw an error if we got an empty string
+		if(trim($title) == '')
+			return '';
 		$t = Title::newFromText($title);
 		if(!$t)
 			$this->dieUsageMsg(array('invalidtitle', $title));
-		return $t->getDbKey();
+		return $t->getPrefixedDbKey();
 	}
 
 	/**
@@ -336,19 +347,40 @@ abstract class ApiQueryBase extends ApiBase {
 	 * @return string Page title with spaces
 	 */
 	public function keyToTitle($key) {
+		# Don't throw an error if we got an empty string
+		if(trim($key) == '')
+			return '';
 		$t = Title::newFromDbKey($key);
 		# This really shouldn't happen but we gotta check anyway
 		if(!$t)
 			$this->dieUsageMsg(array('invalidtitle', $key));
 		return $t->getPrefixedText();
 	}
+	
+	/**
+	 * An alternative to titleToKey() that doesn't trim trailing spaces
+	 * @param string $titlePart Title part with spaces
+	 * @return string Title part with underscores
+	 */
+	public function titlePartToKey($titlePart) {
+		return substr($this->titleToKey($titlePart . 'x'), 0, -1);
+	}
+	
+	/**
+	 * An alternative to keyToTitle() that doesn't trim trailing spaces
+	 * @param string $keyPart Key part with spaces
+	 * @return string Key part with underscores
+	 */
+	public function keyPartToTitle($keyPart) {
+		return substr($this->keyToTitle($keyPart . 'x'), 0, -1);
+	}
 
 	/**
 	 * Get version string for use in the API help output
 	 * @return string
 	 */
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBase.php 37083 2008-07-05 11:18:50Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryBase.php 44461 2008-12-11 19:11:11Z ialex $';
 	}
 }
 
diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index ebe87908..6f356cea 100644
--- a/includes/api/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -42,10 +42,6 @@ class ApiQueryBlocks extends ApiQueryBase {
 	}
 
 	public function execute() {
-		$this->run();
-	}
-
-	private function run() {
 		global $wgUser;
 
 		$params = $this->extractRequestParams();
@@ -87,17 +83,17 @@ class ApiQueryBlocks extends ApiQueryBase {
 		if($fld_range)
 			$this->addFields(array('ipb_range_start', 'ipb_range_end'));
 		if($fld_flags)
-			$this->addFields(array('ipb_auto', 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted'));
+			$this->addFields(array('ipb_auto', 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk'));
 
 		$this->addOption('LIMIT', $params['limit'] + 1);
 		$this->addWhereRange('ipb_timestamp', $params['dir'], $params['start'], $params['end']);
 		if(isset($params['ids']))
-			$this->addWhere(array('ipb_id' => $params['ids']));
+			$this->addWhereFld('ipb_id', $params['ids']);
 		if(isset($params['users']))
 		{
 			foreach((array)$params['users'] as $u)
 				$this->prepareUsername($u);
-			$this->addWhere(array('ipb_address' => $this->usernames));
+			$this->addWhereFld('ipb_address', $this->usernames);
 		}
 		if(isset($params['ip']))
 		{
@@ -120,19 +116,18 @@ class ApiQueryBlocks extends ApiQueryBase {
 			));
 		}
 		if(!$wgUser->isAllowed('suppress'))
-			$this->addWhere(array('ipb_deleted' => 0));
+			$this->addWhereFld('ipb_deleted', 0);
 
 		// Purge expired entries on one in every 10 queries
 		if(!mt_rand(0, 10))
 			Block::purgeExpired();
 
 		$res = $this->select(__METHOD__);
-		$db = wfGetDB();
 
 		$count = 0;
-		while($row = $db->fetchObject($res))
+		while($row = $res->fetchObject())
 		{
-			if($count++ == $params['limit'])
+			if(++$count > $params['limit'])
 			{
 				// We've had enough
 				$this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->ipb_timestamp));
@@ -142,13 +137,9 @@ class ApiQueryBlocks extends ApiQueryBase {
 			if($fld_id)
 				$block['id'] = $row->ipb_id;
 			if($fld_user && !$row->ipb_auto)
-			{
 				$block['user'] = $row->ipb_address;
-			}
 			if($fld_by)
-			{
 				$block['by'] = $row->user_name;
-			}
 			if($fld_timestamp)
 				$block['timestamp'] = wfTimestamp(TS_ISO_8601, $row->ipb_timestamp);
 			if($fld_expiry)
@@ -157,8 +148,8 @@ class ApiQueryBlocks extends ApiQueryBase {
 				$block['reason'] = $row->ipb_reason;
 			if($fld_range)
 			{
-				$block['rangestart'] = $this->convertHexIP($row->ipb_range_start);
-				$block['rangeend'] = $this->convertHexIP($row->ipb_range_end);
+				$block['rangestart'] = IP::hexToQuad($row->ipb_range_start);
+				$block['rangeend'] = IP::hexToQuad($row->ipb_range_end);
 			}
 			if($fld_flags)
 			{
@@ -175,6 +166,8 @@ class ApiQueryBlocks extends ApiQueryBase {
 					$block['noemail'] = '';
 				if($row->ipb_deleted)
 					$block['hidden'] = '';
+				if($row->ipb_allow_usertalk)
+					$block['allowusertalk'] = '';
 			}
 			$data[] = $block;
 		}
@@ -194,19 +187,6 @@ class ApiQueryBlocks extends ApiQueryBase {
 		$this->usernames[] = $name;
 	}
 
-	protected function convertHexIP($ip)
-	{
-		// Converts a hexadecimal IP to nnn.nnn.nnn.nnn format
-		$dec = wfBaseConvert($ip, 16, 10);
-		$parts[0] = (int)($dec / (256*256*256));
-		$dec %= 256*256*256;
-		$parts[1] = (int)($dec / (256*256));
-		$dec %= 256*256;
-		$parts[2] = (int)($dec / 256);
-		$parts[3] = $dec % 256;
-		return implode('.', $parts);
-	}
-
 	public function getAllowedParams() {
 		return array (
 			'start' => array(
@@ -279,6 +259,6 @@ class ApiQueryBlocks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBlocks.php 37892 2008-07-21 21:37:11Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryBlocks.php 43676 2008-11-18 15:11:11Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php
index 51492d63..9c4e9b41 100644
--- a/includes/api/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -54,6 +54,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 
 		$params = $this->extractRequestParams();
 		$prop = $params['prop'];
+		$show = array_flip((array)$params['show']);
 
 		$this->addFields(array (
 			'cl_from',
@@ -86,11 +87,31 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 				$this->dieUsage("Invalid continue param. You should pass the " .
 					"original value returned by the previous query", "_badcontinue");
 			$clfrom = intval($cont[0]);
-			$clto = $this->getDb()->strencode($this->titleToKey($cont[1]));
+			$clto = $this->getDB()->strencode($this->titleToKey($cont[1]));
 			$this->addWhere("cl_from > $clfrom OR ".
 					"(cl_from = $clfrom AND ".
 					"cl_to >= '$clto')");
 		}
+		if(isset($show['hidden']) && isset($show['!hidden']))
+			$this->dieUsage("Incorrect parameter - mutually exclusive values may not be supplied", 'show');
+		if(isset($show['hidden']) || isset($show['!hidden']))
+		{
+			$this->addOption('STRAIGHT_JOIN');
+			$this->addTables(array('page', 'page_props'));
+			$this->addJoinConds(array(
+				'page' => array('LEFT JOIN', array(
+					'page_namespace' => NS_CATEGORY,
+					'page_title = cl_to')),
+				'page_props' => array('LEFT JOIN', array(
+					'pp_page=page_id',
+					'pp_propname' => 'hiddencat'))
+			));
+			if(isset($show['hidden']))
+				$this->addWhere(array('pp_propname IS NOT NULL'));
+			else
+				$this->addWhere(array('pp_propname IS NULL'));
+		}
+
 		# Don't order by cl_from if it's constant in the WHERE clause
 		if(count($this->getPageSet()->getGoodTitles()) == 1)
 			$this->addOption('ORDER BY', 'cl_to');
@@ -128,7 +149,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 				if ($fld_sortkey)
 					$vals['sortkey'] = $row->cl_sortkey;
 				if ($fld_timestamp)
-					$vals['timestamp'] = $row->cl_timestamp;
+					$vals['timestamp'] = wfTimestamp(TS_ISO_8601, $row->cl_timestamp);
 
 				$data[] = $vals;
 			}
@@ -166,6 +187,13 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 					'timestamp',
 				)
 			),
+			'show' => array(
+				ApiBase :: PARAM_ISMULTI => true,
+				ApiBase :: PARAM_TYPE => array(
+					'hidden',
+					'!hidden',
+				)
+			),
 			'limit' => array(
 				ApiBase :: PARAM_DFLT => 10,
 				ApiBase :: PARAM_TYPE => 'limit',
@@ -181,6 +209,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 		return array (
 			'prop' => 'Which additional properties to get for each category.',
 			'limit' => 'How many categories to return',
+			'show' => 'Which kind of categories to show',
 			'continue' => 'When more results are available, use this to continue',
 		);
 	}
@@ -199,6 +228,6 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategories.php 37909 2008-07-22 13:26:15Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryCategories.php 44585 2008-12-14 17:39:50Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryCategoryInfo.php b/includes/api/ApiQueryCategoryInfo.php
index f809bb15..f83c4a5b 100644
--- a/includes/api/ApiQueryCategoryInfo.php
+++ b/includes/api/ApiQueryCategoryInfo.php
@@ -41,9 +41,10 @@ class ApiQueryCategoryInfo extends ApiQueryBase {
 
 	public function execute() {			
 		$alltitles = $this->getPageSet()->getAllTitlesByNamespace();
-		$categories = $alltitles[NS_CATEGORY];
-		if(empty($categories))
+		if ( empty( $alltitles[NS_CATEGORY] ) ) {
 			return;
+		}
+		$categories = $alltitles[NS_CATEGORY];
 
 		$titles = $this->getPageSet()->getGoodTitles() +
 					$this->getPageSet()->getMissingTitles();
@@ -51,11 +52,19 @@ class ApiQueryCategoryInfo extends ApiQueryBase {
 		foreach($categories as $c)
 		{
 			$t = $titles[$c];
-			$cattitles[$c] = $t->getDbKey();
+			$cattitles[$c] = $t->getDBKey();
 		}
 
-		$this->addTables('category');
-		$this->addFields(array('cat_title', 'cat_pages', 'cat_subcats', 'cat_files', 'cat_hidden'));
+		$this->addTables(array('category', 'page', 'page_props'));
+		$this->addJoinConds(array(
+			'page' => array('LEFT JOIN', array(
+				'page_namespace' => NS_CATEGORY,
+				'page_title=cat_title')),
+			'page_props' => array('LEFT JOIN', array(
+				'pp_page=page_id',
+				'pp_propname' => 'hiddencat')),
+		));
+		$this->addFields(array('cat_title', 'cat_pages', 'cat_subcats', 'cat_files', 'pp_propname AS cat_hidden'));
 		$this->addWhere(array('cat_title' => $cattitles));			
 
 		$db = $this->getDB();
@@ -86,6 +95,6 @@ class ApiQueryCategoryInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategoryInfo.php 37504 2008-07-10 14:28:09Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryCategoryInfo.php 44590 2008-12-14 20:24:23Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index 3909b213..e2f577a2 100644
--- a/includes/api/ApiQueryCategoryMembers.php
+++ b/includes/api/ApiQueryCategoryMembers.php
@@ -76,17 +76,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 		$this->addTables(array('page','categorylinks'));	// must be in this order for 'USE INDEX'
 									// Not needed after bug 10280 is applied to servers
 		if($params['sort'] == 'timestamp')
-		{
 			$this->addOption('USE INDEX', 'cl_timestamp');
-			// cl_timestamp will be added by addWhereRange() later
-			$this->addOption('ORDER BY', 'cl_to');
-		}
 		else
-		{
-			$dir = ($params['dir'] == 'desc' ? ' DESC' : '');
 			$this->addOption('USE INDEX', 'cl_sortkey');
-			$this->addOption('ORDER BY', 'cl_to, cl_sortkey' . $dir . ', cl_from' . $dir);
-		}
 
 		$this->addWhere('cl_from=page_id');
 		$this->setContinuation($params['continue'], $params['dir']);
@@ -94,6 +86,11 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 		$this->addWhereFld('page_namespace', $params['namespace']);
 		if($params['sort'] == 'timestamp')
 			$this->addWhereRange('cl_timestamp', ($params['dir'] == 'asc' ? 'newer' : 'older'), $params['start'], $params['end']);
+		else
+		{
+			$this->addWhereRange('cl_sortkey', ($params['dir'] == 'asc' ? 'newer' : 'older'), $params['startsortkey'], $params['endsortkey']);
+			$this->addWhereRange('cl_from', ($params['dir'] == 'asc' ? 'newer' : 'older'), null, null);
+		}
 
 		$limit = $params['limit'];
 		$this->addOption('LIMIT', $limit +1);
@@ -157,18 +154,15 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 		if (is_null($continue))
 			return;	// This is not a continuation request
 
-		$continueList = explode('|', $continue);
-		$hasError = count($continueList) != 2;
-		$from = 0;
-		if (!$hasError && strlen($continueList[1]) > 0) {
-			$from = intval($continueList[1]);
-			$hasError = ($from == 0);
-		}
+		$pos = strrpos($continue, '|');
+		$sortkey = substr($continue, 0, $pos);
+		$fromstr = substr($continue, $pos + 1);
+		$from = intval($fromstr);
 
-		if ($hasError)
+		if ($from == 0 && strlen($fromstr) > 0)
 			$this->dieUsage("Invalid continue param. You should pass the original value returned by the previous query", "badcontinue");
 
-		$encSortKey = $this->getDB()->addQuotes($continueList[0]);
+		$encSortKey = $this->getDB()->addQuotes($sortkey);
 		$encFrom = $this->getDB()->addQuotes($from);
 		
 		$op = ($dir == 'desc' ? '<' : '>');
@@ -225,7 +219,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 			),
 			'end' => array(
 				ApiBase :: PARAM_TYPE => 'timestamp'
-			)
+			),
+			'startsortkey' => null,
+			'endsortkey' => null,
 		);
 	}
 
@@ -238,6 +234,8 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 			'dir' => 'In which direction to sort',
 			'start' => 'Timestamp to start listing from. Can only be used with cmsort=timestamp',
 			'end' => 'Timestamp to end listing at. Can only be used with cmsort=timestamp',
+			'startsortkey' => 'Sortkey to start listing from. Can only be used with cmsort=sortkey',
+			'endsortkey' => 'Sortkey to end listing at. Can only be used with cmsort=sortkey',
 			'continue' => 'For large categories, give the value retured from previous query',
 			'limit' => 'The maximum number of pages to return.',
 		);
@@ -257,6 +255,6 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategoryMembers.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiQueryCategoryMembers.php 42197 2008-10-18 10:09:19Z ialex $';
 	}
 }
diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index 8368896d..408421c4 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -107,6 +107,8 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			$lb = new LinkBatch($titles);
 			$where = $lb->constructSet('ar', $db);
 			$this->addWhere($where);
+		} else {
+			$this->dieUsage('You have to specify a page title or titles');
 		}
 
 		$this->addOption('LIMIT', $limit + 1);
@@ -228,6 +230,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 37502 2008-07-10 14:13:11Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 40798 2008-09-13 20:41:58Z aaron $';
 	}
 }
diff --git a/includes/api/ApiQueryDisabled.php b/includes/api/ApiQueryDisabled.php
new file mode 100644
index 00000000..50825464
--- /dev/null
+++ b/includes/api/ApiQueryDisabled.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * Created on Sep 25, 2008
+ * API for MediaWiki 1.8+
+ *
+ * Copyright (C) 2008 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	// Eclipse helper - will be ignored in production
+	require_once ("ApiBase.php");
+}
+
+
+/**
+ * API module that does nothing 
+ *
+ * Use this to disable core modules with e.g.
+ * $wgAPIPropModules['modulename'] = 'ApiQueryDisabled';
+ *
+ * To disable top-level modules, use ApiDisabled instead
+ *
+ * @ingroup API
+ */
+class ApiQueryDisabled extends ApiQueryBase {
+
+	public function __construct($main, $action) {
+		parent :: __construct($main, $action);
+	}
+
+	public function execute() {
+		$this->setWarning("The ``{$this->getModuleName()}'' module has been disabled.");
+	}
+
+	public function getAllowedParams() {
+		return array ();
+	}
+
+	public function getParamDescription() {
+		return array ();
+	}
+
+	public function getDescription() {
+		return array(
+			'This module has been disabled.'
+		);
+	}
+
+	protected function getExamples() {
+		return array ();
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiQueryDisabled.php 41268 2008-09-25 20:50:50Z catrope $';
+	}
+}
diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php
new file mode 100644
index 00000000..5f7d7ee0
--- /dev/null
+++ b/includes/api/ApiQueryDuplicateFiles.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ * Created on Sep 27, 2008
+ *
+ * API for MediaWiki 1.8+
+ *
+ * Copyright (C) 2008 Roan Kattow <Firstname>,<Lastname>@home.nl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	// Eclipse helper - will be ignored in production
+	require_once ("ApiQueryBase.php");
+}
+
+/**
+ * A query module to list duplicates of the given file(s)
+ *
+ * @ingroup API
+ */
+class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
+
+	public function __construct($query, $moduleName) {
+		parent :: __construct($query, $moduleName, 'df');
+	}
+
+	public function execute() {
+		$this->run();
+	}
+
+	public function executeGenerator($resultPageSet) {
+		$this->run($resultPageSet);
+	}
+
+	private function run($resultPageSet = null) {
+		$params = $this->extractRequestParams();
+		$namespaces = $this->getPageSet()->getAllTitlesByNamespace();
+		if ( empty( $namespaces[NS_FILE] ) ) {
+			return;
+		}
+		$images = $namespaces[NS_FILE];
+		
+		$this->addTables('image', 'i1');
+		$this->addTables('image', 'i2');
+		$this->addFields(array(
+			'i1.img_name AS orig_name',
+			'i2.img_name AS dup_name',
+			'i2.img_user_text AS dup_user_text',
+			'i2.img_timestamp AS dup_timestamp'
+		));
+		$this->addWhere(array(
+			'i1.img_name' => array_keys($images),
+			'i1.img_sha1 = i2.img_sha1',
+			'i1.img_name != i2.img_name',
+		));
+		if(isset($params['continue']))
+		{
+			$cont = explode('|', $params['continue']);
+			if(count($cont) != 2)
+				$this->dieUsage("Invalid continue param. You should pass the " .
+					"original value returned by the previous query", "_badcontinue");
+			$orig = $this->getDB()->strencode($this->titleTokey($cont[0]));
+			$dup = $this->getDB()->strencode($this->titleToKey($cont[1]));
+			$this->addWhere("i1.img_name > '$orig' OR ".
+					"(i1.img_name = '$orig' AND ".
+					"i2.img_name >= '$dup')");
+		}
+		$this->addOption('ORDER BY', 'i1.img_name');
+		$this->addOption('LIMIT', $params['limit'] + 1);
+
+		$res = $this->select(__METHOD__);
+		$db = $this->getDB();
+		$count = 0;
+		$data = array();
+		$titles = array();
+		$lastName = '';
+		while($row = $db->fetchObject($res))
+		{
+			if(++$count > $params['limit'])
+			{
+				// We've reached the one extra which shows that
+				// there are additional pages to be had. Stop here...
+				$this->setContinueEnumParameter('continue',
+					$this->keyToTitle($row->orig_name) . '|' .
+					$this->keyToTitle($row->dup_name));
+				break;
+			}
+			if(!is_null($resultPageSet))
+				$titles[] = Title::makeTitle(NS_FILE, $row->dup_name);
+			else
+			{
+				if($row->orig_name != $lastName)
+				{
+					if($lastName != '')
+					{
+						$this->addPageSubItems($images[$lastName], $data);
+						$data = array();
+					}
+					$lastName = $row->orig_name;
+				}
+						
+				$data[] = array(
+					'name' => $row->dup_name,
+					'user' => $row->dup_user_text,
+					'timestamp' => wfTimestamp(TS_ISO_8601, $row->dup_timestamp)
+				);
+			}
+		}
+		if(!is_null($resultPageSet))
+			$resultPageSet->populateFromTitles($titles);
+		else if($lastName != '')
+			$this->addPageSubItems($images[$lastName], $data);
+		$db->freeResult($res);
+	}
+
+	public function getAllowedParams() {
+		return array (
+			'limit' => array(
+				ApiBase :: PARAM_DFLT => 10,
+				ApiBase :: PARAM_TYPE => 'limit',
+				ApiBase :: PARAM_MIN => 1,
+				ApiBase :: PARAM_MAX => ApiBase :: LIMIT_BIG1,
+				ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2
+			),
+			'continue' => null,
+		);
+	}
+
+	public function getParamDescription() {
+		return array (
+			'limit' => 'How many files to return',
+			'continue' => 'When more results are available, use this to continue',
+		);
+	}
+
+	public function getDescription() {
+		return 'List all files that are duplicates of the given file(s).';
+	}
+
+	protected function getExamples() {
+		return array (	'api.php?action=query&titles=Image:Albert_Einstein_Head.jpg&prop=duplicatefiles',
+				'api.php?action=query&generator=allimages&prop=duplicatefiles',
+			);
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiQueryDuplicateFiles.php 44121 2008-12-01 17:14:30Z vyznev $';
+	}
+}
diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php
index 8ffb7246..85e21f42 100644
--- a/includes/api/ApiQueryExtLinksUsage.php
+++ b/includes/api/ApiQueryExtLinksUsage.php
@@ -54,7 +54,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 
 		// Find the right prefix
 		global $wgUrlProtocols;
-		if(!is_null($protocol) && !empty($protocol) && !in_array($protocol, $wgUrlProtocols))
+		if($protocol && !in_array($protocol, $wgUrlProtocols))
 		{
 			foreach ($wgUrlProtocols as $p) {
 				if( substr( $p, 0, strlen( $protocol ) ) === $protocol ) {
@@ -66,7 +66,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 		else
 			$protocol = null;
 
-		$db = $this->getDb();
+		$db = $this->getDB();
 		$this->addTables(array('page','externallinks'));	// must be in this order for 'USE INDEX'
 		$this->addOption('USE INDEX', 'el_index');
 		$this->addWhere('page_id=el_from');
@@ -206,6 +206,6 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryExtLinksUsage.php 37909 2008-07-22 13:26:15Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryExtLinksUsage.php 43271 2008-11-06 22:38:42Z siebrand $';
 	}
 }
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 33ff1d3f..612d5cc9 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -56,10 +56,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
 		}
 
 		$pageIds = $this->getPageSet()->getAllTitlesByNamespace();
-		if (!empty($pageIds[NS_IMAGE])) {
+		if (!empty($pageIds[NS_FILE])) {
 			
 			$result = $this->getResult();
-			$images = RepoGroup::singleton()->findFiles( array_keys( $pageIds[NS_IMAGE] ) );
+			$images = RepoGroup::singleton()->findFiles( array_keys( $pageIds[NS_FILE] ) );
 			foreach ( $images as $img ) {
 				$data = array();
 				
@@ -78,14 +78,14 @@ class ApiQueryImageInfo extends ApiQueryBase {
 					if(++$count > $params['limit']) {
 						// We've reached the extra one which shows that there are additional pages to be had. Stop here...
 						// Only set a query-continue if there was only one title
-						if(count($pageIds[NS_IMAGE]) == 1)
+						if(count($pageIds[NS_FILE]) == 1)
 							$this->setContinueEnumParameter('start', $oldie->getTimestamp());
 						break;
 					}
 					$data[] = self::getInfo( $oldie, $prop, $result );
 				}
 
-				$pageId = $pageIds[NS_IMAGE][ $img->getOriginalTitle()->getDBkey() ];
+				$pageId = $pageIds[NS_FILE][ $img->getOriginalTitle()->getDBkey() ];
 				$result->addValue(
 					array( 'query', 'pages', intval( $pageId ) ),
 					'imagerepository', $img->getRepoName()
@@ -93,10 +93,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
 				$this->addPageSubItems($pageId, $data);
 			}
 			
-			$missing = array_diff( array_keys( $pageIds[NS_IMAGE] ), array_keys( $images ) );
+			$missing = array_diff( array_keys( $pageIds[NS_FILE] ), array_keys( $images ) );
 			foreach ( $missing as $title )
 				$result->addValue(
-					array( 'query', 'pages', intval( $pageIds[NS_IMAGE][$title] ) ),
+					array( 'query', 'pages', intval( $pageIds[NS_FILE][$title] ) ),
 					'imagerepository', ''
 				);
 		}
@@ -123,12 +123,12 @@ class ApiQueryImageInfo extends ApiQueryBase {
 		}
 		if( isset( $prop['url'] ) ) {
 			if( !is_null( $scale ) && !$file->isOld() ) {
-				$thumb = $file->getThumbnail( $scale['width'], $scale['height'] );
-				if( $thumb )
+				$mto = $file->transform( array( 'width' => $scale['width'], 'height' => $scale['height'] ) );
+				if( $mto && !$mto->isError() )
 				{
-					$vals['thumburl'] = wfExpandUrl( $thumb->getURL() );
-					$vals['thumbwidth'] = $thumb->getWidth();
-					$vals['thumbheight'] = $thumb->getHeight();
+					$vals['thumburl'] = $mto->getUrl();
+					$vals['thumbwidth'] = $mto->getWidth();
+					$vals['thumbheight'] = $mto->getHeight();
 				}
 			}
 			$vals['url'] = $file->getFullURL();
@@ -148,6 +148,9 @@ class ApiQueryImageInfo extends ApiQueryBase {
 		
 		if( isset( $prop['archivename'] ) && $file->isOld() )
 			$vals['archivename'] = $file->getArchiveName();
+			
+		if( isset( $prop['bitdepth'] ) )
+			$vals['bitdepth'] = $file->getBitDepth();
 
 		return $vals;
 	}
@@ -166,7 +169,8 @@ class ApiQueryImageInfo extends ApiQueryBase {
 					'sha1',
 					'mime',
 					'metadata',
-					'archivename'
+					'archivename',
+					'bitdepth',
 				)
 			),
 			'limit' => array(
@@ -219,6 +223,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryImageInfo.php 37504 2008-07-10 14:28:09Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryImageInfo.php 44121 2008-12-01 17:14:30Z vyznev $';
 	}
 }
diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php
index 32c4e1b0..02fe24f1 100644
--- a/includes/api/ApiQueryImages.php
+++ b/includes/api/ApiQueryImages.php
@@ -66,7 +66,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 				$this->dieUsage("Invalid continue param. You should pass the " .
 					"original value returned by the previous query", "_badcontinue");
 			$ilfrom = intval($cont[0]);
-			$ilto = $this->getDb()->strencode($this->titleToKey($cont[1]));
+			$ilto = $this->getDB()->strencode($this->titleToKey($cont[1]));
 			$this->addWhere("il_from > $ilfrom OR ".
 					"(il_from = $ilfrom AND ".
 					"il_to >= '$ilto')");
@@ -103,7 +103,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 				}
 
 				$vals = array();
-				ApiQueryBase :: addTitleInfo($vals, Title :: makeTitle(NS_IMAGE, $row->il_to));
+				ApiQueryBase :: addTitleInfo($vals, Title :: makeTitle(NS_FILE, $row->il_to));
 				$data[] = $vals;
 			}
 
@@ -123,7 +123,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 							'|' . $this->keyToTitle($row->il_to));
 					break;
 				}
-				$titles[] = Title :: makeTitle(NS_IMAGE, $row->il_to);
+				$titles[] = Title :: makeTitle(NS_FILE, $row->il_to);
 			}
 			$resultPageSet->populateFromTitles($titles);
 		}
@@ -165,6 +165,6 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryImages.php 37535 2008-07-10 21:20:43Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryImages.php 44121 2008-12-01 17:14:30Z vyznev $';
 	}
 }
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 9c6487b3..0c5c72fc 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -68,7 +68,8 @@ class ApiQueryInfo extends ApiQueryBase {
 			'protect' => array( 'ApiQueryInfo', 'getProtectToken' ),
 			'move' => array( 'ApiQueryInfo', 'getMoveToken' ),
 			'block' => array( 'ApiQueryInfo', 'getBlockToken' ),
-			'unblock' => array( 'ApiQueryInfo', 'getUnblockToken' )
+			'unblock' => array( 'ApiQueryInfo', 'getUnblockToken' ),
+			'email' => array( 'ApiQueryInfo', 'getEmailToken' ),
 		);
 		wfRunHooks('APIQueryInfoTokens', array(&$this->tokenFunctions));
 		return $this->tokenFunctions;
@@ -153,17 +154,33 @@ class ApiQueryInfo extends ApiQueryBase {
 		return self::getBlockToken($pageid, $title);
 	}
 
+	public static function getEmailToken($pageid, $title)
+	{
+		global $wgUser;
+		if(!$wgUser->canSendEmail() || $wgUser->isBlockedFromEmailUser())
+			return false;
+
+		static $cachedEmailToken = null;
+		if(!is_null($cachedEmailToken))
+			return $cachedEmailToken;
+
+		$cachedEmailToken = $wgUser->editToken();
+		return $cachedEmailToken;
+	}
+
 	public function execute() {
 
 		global $wgUser;
 
 		$params = $this->extractRequestParams();
-		$fld_protection = $fld_talkid = $fld_subjectid = false;
+		$fld_protection = $fld_talkid = $fld_subjectid = $fld_url = $fld_readable = false;
 		if(!is_null($params['prop'])) {
 			$prop = array_flip($params['prop']);
 			$fld_protection = isset($prop['protection']);
 			$fld_talkid = isset($prop['talkid']);
 			$fld_subjectid = isset($prop['subjectid']);
+			$fld_url = isset($prop['url']);
+			$fld_readable = isset($prop['readable']);
 		}
 
 		$pageSet = $this->getPageSet();
@@ -180,7 +197,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		$pageLength = $pageSet->getCustomField('page_len');
 
 		$db = $this->getDB();
-		if ($fld_protection && !empty($titles)) {
+		if ($fld_protection && count($titles)) {
 			$this->addTables('page_restrictions');
 			$this->addFields(array('pr_page', 'pr_type', 'pr_level', 'pr_expiry', 'pr_cascade'));
 			$this->addWhereFld('pr_page', array_keys($titles));
@@ -195,12 +212,44 @@ class ApiQueryInfo extends ApiQueryBase {
 				if($row->pr_cascade)
 					$a['cascade'] = '';
 				$protections[$row->pr_page][] = $a;
+				
+				# Also check old restrictions
+				if($pageRestrictions[$row->pr_page]) {
+					foreach(explode(':', trim($pageRestrictions[$pageid])) as $restrict) {
+						$temp = explode('=', trim($restrict));
+						if(count($temp) == 1) {
+							// old old format should be treated as edit/move restriction
+							$restriction = trim( $temp[0] );
+							if($restriction == '')
+								continue;
+							$protections[$row->pr_page][] = array(
+								'type' => 'edit',
+								'level' => $restriction,
+								'expiry' => 'infinity',
+							);
+							$protections[$row->pr_page][] = array(
+								'type' => 'move',
+								'level' => $restriction,
+								'expiry' => 'infinity',
+							);
+						} else {
+							$restriction = trim( $temp[1] );
+							if($restriction == '')
+								continue;
+							$protections[$row->pr_page][] = array(
+								'type' => $temp[0],
+								'level' => $restriction,
+								'expiry' => 'infinity',
+							);
+						}
+					}
+				}
 			}
 			$db->freeResult($res);
 			
 			$imageIds = array();
 			foreach ($titles as $id => $title)
-				if ($title->getNamespace() == NS_IMAGE)
+				if ($title->getNamespace() == NS_FILE)
 					$imageIds[] = $id;
 			// To avoid code duplication
 			$cascadeTypes = array(
@@ -214,7 +263,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				array(
 				 	'prefix' => 'il',
 				 	'table' => 'imagelinks',
-				 	'ns' => NS_IMAGE,
+				 	'ns' => NS_FILE,
 				 	'title' => 'il_to',
 				 	'ids' => $imageIds
 				)
@@ -256,7 +305,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// We don't need to check for pt stuff if there are no nonexistent titles
-		if($fld_protection && !empty($missing))
+		if($fld_protection && count($missing))
 		{
 			$this->resetQueryParams();
 			// Construct a custom WHERE clause that matches all titles in $missing
@@ -278,8 +327,8 @@ class ApiQueryInfo extends ApiQueryBase {
 			$images = array();
 			$others = array();
 			foreach ($missing as $title)
-				if ($title->getNamespace() == NS_IMAGE)
-					$images[] = $title->getDbKey();
+				if ($title->getNamespace() == NS_FILE)
+					$images[] = $title->getDBKey();
 				else
 					$others[] = $title;					
 			
@@ -328,7 +377,7 @@ class ApiQueryInfo extends ApiQueryBase {
 						'expiry' => Block::decodeExpiry( $row->pr_expiry, TS_ISO_8601 ),
 						'source' => $source->getPrefixedText()
 					);
-					$prottitles[NS_IMAGE][$row->il_to][] = $a;
+					$prottitles[NS_FILE][$row->il_to][] = $a;
 				}
 				$db->freeResult($res);
 			}
@@ -350,7 +399,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				else if($fld_talkid)
 					$talktitles[] = $t->getTalkPage();
 			}
-			if(!empty($talktitles) || !empty($subjecttitles))
+			if(count($talktitles) || count($subjecttitles))
 			{
 				// Construct a custom WHERE clause that matches
 				// all titles in $talktitles and $subjecttitles
@@ -386,6 +435,7 @@ class ApiQueryInfo extends ApiQueryBase {
 
 			if (!is_null($params['token'])) {
 				$tokenFunctions = $this->getTokenFunctions();
+				$pageInfo['starttimestamp'] = wfTimestamp(TS_ISO_8601, time());
 				foreach($params['token'] as $t)
 				{
 					$val = call_user_func($tokenFunctions[$t], $pageid, $title);
@@ -397,46 +447,23 @@ class ApiQueryInfo extends ApiQueryBase {
 			}
 
 			if($fld_protection) {
+				$pageInfo['protection'] = array();
 				if (isset($protections[$pageid])) {
 					$pageInfo['protection'] = $protections[$pageid];
 					$result->setIndexedTagName($pageInfo['protection'], 'pr');
-				} else {
-					# Also check old restrictions
-					if( $pageRestrictions[$pageid] ) {
-						foreach( explode( ':', trim( $pageRestrictions[$pageid] ) ) as $restrict ) {
-							$temp = explode( '=', trim( $restrict ) );
-							if(count($temp) == 1) {
-								// old old format should be treated as edit/move restriction
-								$restriction = trim( $temp[0] );
-								$pageInfo['protection'][] = array(
-									'type' => 'edit',
-									'level' => $restriction,
-									'expiry' => 'infinity',
-								);
-								$pageInfo['protection'][] = array(
-									'type' => 'move',
-									'level' => $restriction,
-									'expiry' => 'infinity',
-								);
-							} else {
-								$restriction = trim( $temp[1] );
-								$pageInfo['protection'][] = array(
-									'type' => $temp[0],
-									'level' => $restriction,
-									'expiry' => 'infinity',
-								);
-							}
-						}
-						$result->setIndexedTagName($pageInfo['protection'], 'pr');
-					} else {
-						$pageInfo['protection'] = array();
-					}
 				}
 			}
-			if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDbKey()]))
-				$pageInfo['talkid'] = $talkids[$title->getNamespace()][$title->getDbKey()];
-			if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDbKey()]))
-				$pageInfo['subjectid'] = $subjectids[$title->getNamespace()][$title->getDbKey()];
+			if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDBKey()]))
+				$pageInfo['talkid'] = $talkids[$title->getNamespace()][$title->getDBKey()];
+			if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDBKey()]))
+				$pageInfo['subjectid'] = $subjectids[$title->getNamespace()][$title->getDBKey()];
+			if($fld_url) {
+				$pageInfo['fullurl'] = $title->getFullURL();
+				$pageInfo['editurl'] = $title->getFullURL('action=edit');
+			}
+			if($fld_readable)
+				if($title->userCanRead())
+					$pageInfo['readable'] = '';
 
 			$result->addValue(array (
 				'query',
@@ -444,19 +471,22 @@ class ApiQueryInfo extends ApiQueryBase {
 			), $pageid, $pageInfo);
 		}
 
-		// Get edit/protect tokens and protection data for missing titles if requested
-		// Delete and move tokens are N/A for missing titles anyway
-		if(!is_null($params['token']) || $fld_protection || $fld_talkid || $fld_subjectid)
+		// Get properties for missing titles if requested
+		if(!is_null($params['token']) || $fld_protection || $fld_talkid || $fld_subjectid ||
+		  					$fld_url || $fld_readable)
 		{
 			$res = &$result->getData();
 			foreach($missing as $pageid => $title) {
 				if(!is_null($params['token'])) 
 				{
 					$tokenFunctions = $this->getTokenFunctions();
+					$res['query']['pages'][$pageid]['starttimestamp'] = wfTimestamp(TS_ISO_8601, time());
 					foreach($params['token'] as $t)
 					{
 						$val = call_user_func($tokenFunctions[$t], $pageid, $title);
-						if($val !== false)
+						if($val === false)
+							$this->setWarning("Action '$t' is not allowed for the current user");
+						else
 							$res['query']['pages'][$pageid][$t . 'token'] = $val;
 					}
 				}
@@ -470,10 +500,17 @@ class ApiQueryInfo extends ApiQueryBase {
 						$res['query']['pages'][$pageid]['protection'] = array();
 					$result->setIndexedTagName($res['query']['pages'][$pageid]['protection'], 'pr');
 				}
-				if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDbKey()]))
-					$res['query']['pages'][$pageid]['talkid'] = $talkids[$title->getNamespace()][$title->getDbKey()];
-				if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDbKey()]))
-					$res['query']['pages'][$pageid]['subjectid'] = $subjectids[$title->getNamespace()][$title->getDbKey()];
+				if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDBKey()]))
+					$res['query']['pages'][$pageid]['talkid'] = $talkids[$title->getNamespace()][$title->getDBKey()];
+				if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDBKey()]))
+					$res['query']['pages'][$pageid]['subjectid'] = $subjectids[$title->getNamespace()][$title->getDBKey()];
+				if($fld_url) {
+					$res['query']['pages'][$pageid]['fullurl'] = $title->getFullURL();
+					$res['query']['pages'][$pageid]['editurl'] = $title->getFullURL('action=edit');
+				}
+				if($fld_readable)
+					if($title->userCanRead())
+						$res['query']['pages'][$pageid]['readable'] = '';
 			}
 		}
 	}
@@ -486,7 +523,9 @@ class ApiQueryInfo extends ApiQueryBase {
 				ApiBase :: PARAM_TYPE => array (
 					'protection',
 					'talkid',
-					'subjectid'
+					'subjectid',
+					'url',
+					'readable',
 				)),
 			'token' => array (
 				ApiBase :: PARAM_DFLT => NULL,
@@ -521,6 +560,6 @@ class ApiQueryInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryInfo.php 37191 2008-07-06 18:43:06Z brion $';
+		return __CLASS__ . ': $Id: ApiQueryInfo.php 45683 2009-01-12 19:10:42Z raymond $';
 	}
 }
diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php
index e7d84fc3..8eaf8d02 100644
--- a/includes/api/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -58,7 +58,7 @@ class ApiQueryLangLinks extends ApiQueryBase {
 				$this->dieUsage("Invalid continue param. You should pass the " .
 					"original value returned by the previous query", "_badcontinue");
 			$llfrom = intval($cont[0]);
-			$lllang = $this->getDb()->strencode($cont[1]);
+			$lllang = $this->getDB()->strencode($cont[1]);
 			$this->addWhere("ll_from > $llfrom OR ".
 					"(ll_from = $llfrom AND ".
 					"ll_lang >= '$lllang')");
@@ -134,6 +134,6 @@ class ApiQueryLangLinks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLangLinks.php 37534 2008-07-10 21:08:37Z brion $';
+		return __CLASS__ . ': $Id: ApiQueryLangLinks.php 43271 2008-11-06 22:38:42Z siebrand $';
 	}
 }
diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index 546a599d..91b5b529 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -76,9 +76,9 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 		$params = $this->extractRequestParams();
 
 		$this->addFields(array (
-			$this->prefix . '_from pl_from',
-			$this->prefix . '_namespace pl_namespace',
-			$this->prefix . '_title pl_title'
+			$this->prefix . '_from AS pl_from',
+			$this->prefix . '_namespace AS pl_namespace',
+			$this->prefix . '_title AS pl_title'
 		));
 
 		$this->addTables($this->table);
@@ -92,7 +92,7 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 					"original value returned by the previous query", "_badcontinue");
 			$plfrom = intval($cont[0]);
 			$plns = intval($cont[1]);
-			$pltitle = $this->getDb()->strencode($this->titleToKey($cont[2]));
+			$pltitle = $this->getDB()->strencode($this->titleToKey($cont[2]));
 			$this->addWhere("{$this->prefix}_from > $plfrom OR ".
 					"({$this->prefix}_from = $plfrom AND ".
 					"({$this->prefix}_namespace > $plns OR ".
@@ -213,6 +213,6 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLinks.php 37909 2008-07-22 13:26:15Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryLinks.php 43271 2008-11-06 22:38:42Z siebrand $';
 	}
 }
diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 47a526bb..83c73b83 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -93,16 +93,15 @@ class ApiQueryLogEvents extends ApiQueryBase {
 
 		$limit = $params['limit'];
 		$this->addOption('LIMIT', $limit +1);
-
+		
+		$index = false;
 		$user = $params['user'];
 		if (!is_null($user)) {
-			$userid = $db->selectField('user', 'user_id', array (
-				'user_name' => $user
-			));
+			$userid = User::idFromName($user);
 			if (!$userid)
 				$this->dieUsage("User name $user not found", 'param_user');
 			$this->addWhereFld('log_user', $userid);
-			$this->addOption('USE INDEX', array('logging' => array('user_time','page_time')));
+			$index = 'user_time';
 		}
 
 		$title = $params['title'];
@@ -112,8 +111,14 @@ class ApiQueryLogEvents extends ApiQueryBase {
 				$this->dieUsage("Bad title value '$title'", 'param_title');
 			$this->addWhereFld('log_namespace', $titleObj->getNamespace());
 			$this->addWhereFld('log_title', $titleObj->getDBkey());
-			$this->addOption('USE INDEX', array('logging' => array('user_time','page_time')));
+
+			// Use the title index in preference to the user index if there is a conflict
+			$index = 'page_time';
 		}
+		if ( $index ) {
+			$this->addOption( 'USE INDEX', array( 'logging' => $index ) );
+		}
+
 
 		$data = array ();
 		$count = 0;
@@ -134,6 +139,48 @@ class ApiQueryLogEvents extends ApiQueryBase {
 		$this->getResult()->setIndexedTagName($data, 'item');
 		$this->getResult()->addValue('query', $this->getModuleName(), $data);
 	}
+	
+	public static function addLogParams($result, &$vals, $params, $type, $ts) {
+		$params = explode("\n", $params);
+		switch ($type) {
+			case 'move':
+				if (isset ($params[0])) {
+					$title = Title :: newFromText($params[0]);
+					if ($title) {
+						$vals2 = array();
+						ApiQueryBase :: addTitleInfo($vals2, $title, "new_");
+						$vals[$type] = $vals2;
+						$params = null;
+					}
+				}
+				break;
+			case 'patrol':
+				$vals2 = array();
+				list( $vals2['cur'], $vals2['prev'], $vals2['auto'] ) = $params;
+				$vals[$type] = $vals2;
+				$params = null;
+				break;
+			case 'rights':
+				$vals2 = array();
+				list( $vals2['old'], $vals2['new'] ) = $params;
+				$vals[$type] = $vals2;
+				$params = null;
+				break;
+			case 'block':
+				$vals2 = array();
+				list( $vals2['duration'], $vals2['flags'] ) = $params;
+				$vals2['expiry'] = wfTimestamp(TS_ISO_8601,
+						strtotime($params[0], wfTimestamp(TS_UNIX, $ts)));
+				$vals[$type] = $vals2;
+				$params = null;
+				break;
+		}
+		if (!is_null($params)) {
+			$result->setIndexedTagName($params, 'param');
+			$vals = array_merge($vals, $params);
+		}
+		return $vals;
+	}
 
 	private function extractRowInfo($row) {
 		$vals = array();
@@ -154,43 +201,9 @@ class ApiQueryLogEvents extends ApiQueryBase {
 		}
 
 		if ($this->fld_details && $row->log_params !== '') {
-			$params = explode("\n", $row->log_params);
-			switch ($row->log_type) {
-				case 'move':
-					if (isset ($params[0])) {
-						$title = Title :: newFromText($params[0]);
-						if ($title) {
-							$vals2 = array();
-							ApiQueryBase :: addTitleInfo($vals2, $title, "new_");
-							$vals[$row->log_type] = $vals2;
-							$params = null;
-						}
-					}
-					break;
-				case 'patrol':
-					$vals2 = array();
-					list( $vals2['cur'], $vals2['prev'], $vals2['auto'] ) = $params;
-					$vals[$row->log_type] = $vals2;
-					$params = null;
-					break;
-				case 'rights':
-					$vals2 = array();
-					list( $vals2['old'], $vals2['new'] ) = $params;
-					$vals[$row->log_type] = $vals2;
-					$params = null;
-					break;
-				case 'block':
-					$vals2 = array();
-					list( $vals2['duration'], $vals2['flags'] ) = $params;
-					$vals[$row->log_type] = $vals2;
-					$params = null;
-					break;
-			}
-
-			if (isset($params)) {
-				$this->getResult()->setIndexedTagName($params, 'param');
-				$vals = array_merge($vals, $params);
-			}
+			self::addLogParams($this->getResult(), $vals,
+				$row->log_params, $row->log_type,
+				$row->log_timestamp);
 		}
 
 		if ($this->fld_user) {
@@ -201,7 +214,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 		if ($this->fld_timestamp) {
 			$vals['timestamp'] = wfTimestamp(TS_ISO_8601, $row->log_timestamp);
 		}
-		if ($this->fld_comment && !empty ($row->log_comment)) {
+		if ($this->fld_comment && isset($row->log_comment)) {
 			$vals['comment'] = $row->log_comment;
 		}
 
@@ -277,6 +290,6 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLogEvents.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiQueryLogEvents.php 44234 2008-12-04 15:59:26Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php
index 046157a6..e7b8bf46 100644
--- a/includes/api/ApiQueryRandom.php
+++ b/includes/api/ApiQueryRandom.php
@@ -48,13 +48,13 @@ if (!defined('MEDIAWIKI')) {
 		$this->run($resultPageSet);
 	}
 
-	protected function prepareQuery($randstr, $limit, $namespace, &$resultPageSet) {
+	protected function prepareQuery($randstr, $limit, $namespace, &$resultPageSet, $redirect) {
 		$this->resetQueryParams();
 		$this->addTables('page');
 		$this->addOption('LIMIT', $limit);
 		$this->addWhereFld('page_namespace', $namespace);
 		$this->addWhereRange('page_random', 'newer', $randstr, null);
-		$this->addWhere(array('page_is_redirect' => 0));
+		$this->addWhereFld('page_is_redirect', $redirect);
 		$this->addOption('USE INDEX', 'page_random');
 		if(is_null($resultPageSet))
 			$this->addFields(array('page_id', 'page_title', 'page_namespace'));
@@ -89,7 +89,8 @@ if (!defined('MEDIAWIKI')) {
 		$result = $this->getResult();
 		$data = array();
 		$this->pageIDs = array();
-		$this->prepareQuery(wfRandom(), $params['limit'], $params['namespace'], $resultPageSet);
+		
+		$this->prepareQuery(wfRandom(), $params['limit'], $params['namespace'], $resultPageSet, $params['redirect']);
 		$count = $this->runQuery($data, $resultPageSet);
 		if($count < $params['limit'])
 		{
@@ -97,7 +98,7 @@ if (!defined('MEDIAWIKI')) {
 			 * for page_random. We'll just take the lowest ones, see
 			 * also the comment in Title::getRandomTitle()
 			 */
-			 $this->prepareQuery(0, $params['limit'] - $count, $params['namespace'], $resultPageSet);
+			 $this->prepareQuery(0, $params['limit'] - $count, $params['namespace'], $resultPageSet, $params['redirect']);
 			 $this->runQuery($data, $resultPageSet);
 		}
 
@@ -129,13 +130,15 @@ if (!defined('MEDIAWIKI')) {
 				ApiBase :: PARAM_MAX => 10,
 				ApiBase :: PARAM_MAX2 => 20
 			),
+			'redirect' => false,
 		);
 	}
 
 	public function getParamDescription() {
 		return array (
 			'namespace' => 'Return pages in these namespaces only',
-			'limit' => 'Limit how many random pages will be returned'
+			'limit' => 'Limit how many random pages will be returned',
+			'redirect' => 'Load a random redirect instead of a random page'
 		);
 	}
 
diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index 2b8c6a92..04eb910f 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -43,16 +43,48 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 	private $fld_comment = false, $fld_user = false, $fld_flags = false,
 			$fld_timestamp = false, $fld_title = false, $fld_ids = false,
 			$fld_sizes = false;
+	
+	protected function getTokenFunctions() {
+		// tokenname => function
+		// function prototype is func($pageid, $title, $rev)
+		// should return token or false
+
+		// Don't call the hooks twice
+		if(isset($this->tokenFunctions))
+			return $this->tokenFunctions;
+
+		// If we're in JSON callback mode, no tokens can be obtained
+		if(!is_null($this->getMain()->getRequest()->getVal('callback')))
+			return array();
+
+		$this->tokenFunctions = array(
+			'patrol' => array( 'ApiQueryRecentChanges', 'getPatrolToken' )
+		);
+		wfRunHooks('APIQueryRecentChangesTokens', array(&$this->tokenFunctions));
+		return $this->tokenFunctions;
+	}
+	
+	public static function getPatrolToken($pageid, $title, $rc)
+	{
+		global $wgUser;
+		if(!$wgUser->useRCPatrol() && !$wgUser->useNPPatrol())
+			return false;
+		
+		// The patrol token is always the same, let's exploit that
+		static $cachedPatrolToken = null;
+		if(!is_null($cachedPatrolToken))
+			return $cachedPatrolToken;
+
+		$cachedPatrolToken = $wgUser->editToken();
+		return $cachedPatrolToken;
+	}
 
 	/**
 	 * Generates and outputs the result of this query based upon the provided parameters.
 	 */
 	public function execute() {
-		/* Initialize vars */
-		$limit = $prop = $namespace = $titles = $show = $type = $dir = $start = $end = null;
-
 		/* Get the parameters of the request. */
-		extract($this->extractRequestParams());
+		$params = $this->extractRequestParams();
 
 		/* Build our basic query. Namely, something along the lines of:
 		 * SELECT * FROM recentchanges WHERE rc_timestamp > $start
@@ -62,13 +94,13 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 		$db = $this->getDB();
 		$this->addTables('recentchanges');
 		$this->addOption('USE INDEX', array('recentchanges' => 'rc_timestamp'));
-		$this->addWhereRange('rc_timestamp', $dir, $start, $end);
-		$this->addWhereFld('rc_namespace', $namespace);
+		$this->addWhereRange('rc_timestamp', $params['dir'], $params['start'], $params['end']);
+		$this->addWhereFld('rc_namespace', $params['namespace']);
 		$this->addWhereFld('rc_deleted', 0);
-		if(!empty($titles))
+		if($params['titles'])
 		{
 			$lb = new LinkBatch;
-			foreach($titles as $t)
+			foreach($params['titles'] as $t)
 			{
 				$obj = Title::newFromText($t);
 				$lb->addObj($obj);
@@ -77,19 +109,19 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 					// LinkBatch refuses these, but we need them anyway
 					if(!array_key_exists($obj->getNamespace(), $lb->data))
 						$lb->data[$obj->getNamespace()] = array();
-					$lb->data[$obj->getNamespace()][$obj->getDbKey()] = 1;
+					$lb->data[$obj->getNamespace()][$obj->getDBKey()] = 1;
 				}
 			}
-			$where = $lb->constructSet('rc', $this->getDb());
+			$where = $lb->constructSet('rc', $this->getDB());
 			if($where != '')
 				$this->addWhere($where);
 		}
 
-		if(!is_null($type))
-				$this->addWhereFld('rc_type', $this->parseRCType($type));
+		if(!is_null($params['type']))
+				$this->addWhereFld('rc_type', $this->parseRCType($params['type']));
 
-		if (!is_null($show)) {
-			$show = array_flip($show);
+		if (!is_null($params['show'])) {
+			$show = array_flip($params['show']);
 
 			/* Check for conflicting parameters. */
 			if ((isset ($show['minor']) && isset ($show['!minor']))
@@ -103,7 +135,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 			
 			// Check permissions
 			global $wgUser;
-			if((isset($show['patrolled']) || isset($show['!patrolled'])) && !$wgUser->isAllowed('patrol'))
+			if((isset($show['patrolled']) || isset($show['!patrolled'])) && !$wgUser->useRCPatrol() && !$wgUser->useNPPatrol())
 				$this->dieUsage("You need the patrol right to request the patrolled flag", 'permissiondenied');
 
 			/* Add additional conditions to query depending upon parameters. */
@@ -125,14 +157,15 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 			'rc_timestamp',
 			'rc_namespace',
 			'rc_title',
+			'rc_cur_id',
 			'rc_type',
 			'rc_moved_to_ns',
 			'rc_moved_to_title'
 		));
 
 		/* Determine what properties we need to display. */
-		if (!is_null($prop)) {
-			$prop = array_flip($prop);
+		if (!is_null($params['prop'])) {
+			$prop = array_flip($params['prop']);
 
 			/* Set up internal members based upon params. */
 			$this->fld_comment = isset ($prop['comment']);
@@ -144,14 +177,14 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 			$this->fld_sizes = isset ($prop['sizes']);
 			$this->fld_redirect = isset($prop['redirect']);
 			$this->fld_patrolled = isset($prop['patrolled']);
+			$this->fld_loginfo = isset($prop['loginfo']);
 
 			global $wgUser;
-			if($this->fld_patrolled && !$wgUser->isAllowed('patrol'))
+			if($this->fld_patrolled && !$wgUser->useRCPatrol() && !$wgUser->useNPPatrol())
 				$this->dieUsage("You need the patrol right to request the patrolled flag", 'permissiondenied');
 
 			/* Add fields to our query if they are specified as a needed parameter. */
 			$this->addFieldsIf('rc_id', $this->fld_ids);
-			$this->addFieldsIf('rc_cur_id', $this->fld_ids);
 			$this->addFieldsIf('rc_this_oldid', $this->fld_ids);
 			$this->addFieldsIf('rc_last_oldid', $this->fld_ids);
 			$this->addFieldsIf('rc_comment', $this->fld_comment);
@@ -163,6 +196,10 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 			$this->addFieldsIf('rc_old_len', $this->fld_sizes);
 			$this->addFieldsIf('rc_new_len', $this->fld_sizes);
 			$this->addFieldsIf('rc_patrolled', $this->fld_patrolled);
+			$this->addFieldsIf('rc_logid', $this->fld_loginfo);
+			$this->addFieldsIf('rc_log_type', $this->fld_loginfo);
+			$this->addFieldsIf('rc_log_action', $this->fld_loginfo);
+			$this->addFieldsIf('rc_params', $this->fld_loginfo);
 			if($this->fld_redirect || isset($show['redirect']) || isset($show['!redirect']))
 			{
 				$this->addTables('page');
@@ -170,9 +207,8 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 				$this->addFields('page_is_redirect');
 			}
 		}
-		/* Specify the limit for our query. It's $limit+1 because we (possibly) need to
-		 * generate a "continue" parameter, to allow paging. */
-		$this->addOption('LIMIT', $limit +1);
+		$this->token = $params['token'];
+		$this->addOption('LIMIT', $params['limit'] +1);
 
 		$data = array ();
 		$count = 0;
@@ -183,7 +219,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 
 		/* Iterate through the rows, adding data extracted from them to our query result. */
 		while ($row = $db->fetchObject($res)) {
-			if (++ $count > $limit) {
+			if (++ $count > $params['limit']) {
 				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
 				$this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->rc_timestamp));
 				break;
@@ -215,7 +251,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 	private function extractRowInfo($row) {
 		/* If page was moved somewhere, get the title of the move target. */
 		$movedToTitle = false;
-		if (!empty($row->rc_moved_to_title))
+		if (isset($row->rc_moved_to_title) && $row->rc_moved_to_title !== '')
 			$movedToTitle = Title :: makeTitle($row->rc_moved_to_ns, $row->rc_moved_to_title);
 
 		/* Determine the title of the page that has been changed. */
@@ -228,11 +264,11 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 
 		/* Determine what kind of change this was. */
 		switch ( $type ) {
-		case RC_EDIT:  $vals['type'] = 'edit'; break;
-		case RC_NEW:   $vals['type'] = 'new'; break;
-		case RC_MOVE:  $vals['type'] = 'move'; break;
-		case RC_LOG:   $vals['type'] = 'log'; break;
-		case RC_MOVE_OVER_REDIRECT: $vals['type'] = 'move over redirect'; break;
+			case RC_EDIT:  $vals['type'] = 'edit'; break;
+			case RC_NEW:   $vals['type'] = 'new'; break;
+			case RC_MOVE:  $vals['type'] = 'move'; break;
+			case RC_LOG:   $vals['type'] = 'log'; break;
+			case RC_MOVE_OVER_REDIRECT: $vals['type'] = 'move over redirect'; break;
 		default: $vals['type'] = $type;
 		}
 
@@ -279,7 +315,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 			$vals['timestamp'] = wfTimestamp(TS_ISO_8601, $row->rc_timestamp);
 
 		/* Add edit summary / log summary. */
-		if ($this->fld_comment && !empty ($row->rc_comment)) {
+		if ($this->fld_comment && isset($row->rc_comment)) {
 			$vals['comment'] = $row->rc_comment;
 		}
 
@@ -290,6 +326,29 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 		/* Add the patrolled flag */
 		if ($this->fld_patrolled && $row->rc_patrolled == 1)
 			$vals['patrolled'] = '';
+			
+		if ($this->fld_loginfo && $row->rc_type == RC_LOG) {
+			$vals['logid'] = $row->rc_logid;
+			$vals['logtype'] = $row->rc_log_type;
+			$vals['logaction'] = $row->rc_log_action;
+			ApiQueryLogEvents::addLogParams($this->getResult(),
+				$vals, $row->rc_params,
+				$row->rc_log_type, $row->rc_timestamp);
+		}
+		
+		if(!is_null($this->token))
+		{
+			$tokenFunctions = $this->getTokenFunctions();
+			foreach($this->token as $t)
+			{
+				$val = call_user_func($tokenFunctions[$t], $row->rc_cur_id,
+					$title, RecentChange::newFromRow($row));
+				if($val === false)
+					$this->setWarning("Action '$t' is not allowed for the current user");
+				else
+					$vals[$t . 'token'] = $val;
+			}
+		}
 
 		return $vals;
 	}
@@ -345,9 +404,14 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 					'ids',
 					'sizes',
 					'redirect',
-					'patrolled'
+					'patrolled',
+					'loginfo',
 				)
 			),
+			'token' => array(
+				ApiBase :: PARAM_TYPE => array_keys($this->getTokenFunctions()),
+				ApiBase :: PARAM_ISMULTI => true
+			),
 			'show' => array (
 				ApiBase :: PARAM_ISMULTI => true,
 				ApiBase :: PARAM_TYPE => array (
@@ -389,6 +453,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 			'namespace' => 'Filter log entries to only this namespace(s)',
 			'titles' => 'Filter log entries to only these page titles',
 			'prop' => 'Include additional pieces of information',
+			'token' => 'Which tokens to obtain for each change',
 			'show' => array (
 				'Show only items that meet this criteria.',
 				'For example, to see only minor edits done by logged-in users, set show=minor|!anon'
@@ -409,6 +474,6 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryRecentChanges.php 37909 2008-07-22 13:26:15Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryRecentChanges.php 44719 2008-12-17 16:34:01Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 1fd2d7c6..977e792b 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -58,7 +58,7 @@ class ApiQueryRevisions extends ApiQueryBase {
 			return array();
 
 		$this->tokenFunctions = array(
-			'rollback' => array( 'ApiQueryRevisions','getRollbackToken' )
+			'rollback' => array( 'ApiQueryRevisions', 'getRollbackToken' )
 		);
 		wfRunHooks('APIQueryRevisionsTokens', array(&$this->tokenFunctions));
 		return $this->tokenFunctions;
@@ -74,14 +74,16 @@ class ApiQueryRevisions extends ApiQueryBase {
 	}
 
 	public function execute() {
-		$limit = $startid = $endid = $start = $end = $dir = $prop = $user = $excludeuser = $expandtemplates = $section = $token = null;
-		extract($this->extractRequestParams(false));
+		$params = $this->extractRequestParams(false);
 
 		// If any of those parameters are used, work in 'enumeration' mode.
 		// Enum mode can only be used when exactly one page is provided.
 		// Enumerating revisions on multiple pages make it extremely
 		// difficult to manage continuations and require additional SQL indexes
-		$enumRevMode = (!is_null($user) || !is_null($excludeuser) || !is_null($limit) || !is_null($startid) || !is_null($endid) || $dir === 'newer' || !is_null($start) || !is_null($end));
+		$enumRevMode = (!is_null($params['user']) || !is_null($params['excludeuser']) ||
+				!is_null($params['limit']) || !is_null($params['startid']) ||
+				!is_null($params['endid']) || $params['dir'] === 'newer' ||
+				!is_null($params['start']) || !is_null($params['end']));
 
 
 		$pageSet = $this->getPageSet();
@@ -100,8 +102,10 @@ class ApiQueryRevisions extends ApiQueryBase {
 
 		$this->addTables('revision');
 		$this->addFields( Revision::selectFields() );
+		$this->addTables( 'page' );
+		$this->addWhere('page_id = rev_page');
 
-		$prop = array_flip($prop);
+		$prop = array_flip($params['prop']);
 
 		// Optional fields
 		$this->fld_ids = isset ($prop['ids']);
@@ -111,11 +115,9 @@ class ApiQueryRevisions extends ApiQueryBase {
 		$this->fld_comment = isset ($prop['comment']);
 		$this->fld_size = isset ($prop['size']);
 		$this->fld_user = isset ($prop['user']);
-		$this->token = $token;
+		$this->token = $params['token'];
 
-		if ( !is_null($this->token) || ( $this->fld_content && $this->expandTemplates ) || $pageCount > 0) {
-			$this->addTables( 'page' );
-			$this->addWhere('page_id=rev_page');
+		if ( !is_null($this->token) || $pageCount > 0) {
 			$this->addFields( Revision::selectPageFields() );
 		}
 
@@ -136,15 +138,17 @@ class ApiQueryRevisions extends ApiQueryBase {
 
 			$this->fld_content = true;
 
-			$this->expandTemplates = $expandtemplates;
-			if(isset($section))
-				$this->section = $section;
+			$this->expandTemplates = $params['expandtemplates'];
+			$this->generateXML = $params['generatexml'];
+			if(isset($params['section']))
+				$this->section = $params['section'];
 			else
 				$this->section = false;
 		}
 
 		$userMax = ( $this->fld_content ? ApiBase::LIMIT_SML1 : ApiBase::LIMIT_BIG1 );
 		$botMax  = ( $this->fld_content ? ApiBase::LIMIT_SML2 : ApiBase::LIMIT_BIG2 );
+		$limit = $params['limit'];
 		if( $limit == 'max' ) {
 			$limit = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
 			$this->getResult()->addValue( 'limits', $this->getModuleName(), $limit );
@@ -153,13 +157,13 @@ class ApiQueryRevisions extends ApiQueryBase {
 		if ($enumRevMode) {
 
 			// This is mostly to prevent parameter errors (and optimize SQL?)
-			if (!is_null($startid) && !is_null($start))
+			if (!is_null($params['startid']) && !is_null($params['start']))
 				$this->dieUsage('start and startid cannot be used together', 'badparams');
 
-			if (!is_null($endid) && !is_null($end))
+			if (!is_null($params['endid']) && !is_null($params['end']))
 				$this->dieUsage('end and endid cannot be used together', 'badparams');
 
-			if(!is_null($user) && !is_null( $excludeuser))
+			if(!is_null($params['user']) && !is_null($params['excludeuser']))
 				$this->dieUsage('user and excludeuser cannot be used together', 'badparams');
 
 			// This code makes an assumption that sorting by rev_id and rev_timestamp produces
@@ -169,10 +173,12 @@ class ApiQueryRevisions extends ApiQueryBase {
 			// one row with the same timestamp for the same page.
 			// The order needs to be the same as start parameter to avoid SQL filesort.
 
-			if (is_null($startid) && is_null($endid))
-				$this->addWhereRange('rev_timestamp', $dir, $start, $end);
+			if (is_null($params['startid']) && is_null($params['endid']))
+				$this->addWhereRange('rev_timestamp', $params['dir'],
+					$params['start'], $params['end']);
 			else
-				$this->addWhereRange('rev_id', $dir, $startid, $endid);
+				$this->addWhereRange('rev_id', $params['dir'],
+					$params['startid'], $params['endid']);
 
 			// must manually initialize unset limit
 			if (is_null($limit))
@@ -182,30 +188,38 @@ class ApiQueryRevisions extends ApiQueryBase {
 			// There is only one ID, use it
 			$this->addWhereFld('rev_page', current(array_keys($pageSet->getGoodTitles())));
 
-			if(!is_null($user)) {
-				$this->addWhereFld('rev_user_text', $user);
-			} elseif (!is_null( $excludeuser)) {
-				$this->addWhere('rev_user_text != ' . $this->getDB()->addQuotes($excludeuser));
+			if(!is_null($params['user'])) {
+				$this->addWhereFld('rev_user_text', $params['user']);
+			} elseif (!is_null( $params['excludeuser'])) {
+				$this->addWhere('rev_user_text != ' .
+					$this->getDB()->addQuotes($params['excludeuser']));
 			}
 		}
 		elseif ($revCount > 0) {
-			$this->validateLimit('rev_count', $revCount, 1, $userMax, $botMax);
+			$max = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
+			$revs = $pageSet->getRevisionIDs();
+			if(self::truncateArray($revs, $max))
+				$this->setWarning("Too many values supplied for parameter 'revids': the limit is $max"); 
 
 			// Get all revision IDs
-			$this->addWhereFld('rev_id', array_keys($pageSet->getRevisionIDs()));
+			$this->addWhereFld('rev_id', array_keys($revs));
 
 			// assumption testing -- we should never get more then $revCount rows.
 			$limit = $revCount;
 		}
 		elseif ($pageCount > 0) {
+			$max = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
+			$titles = $pageSet->getGoodTitles();
+			if(self::truncateArray($titles, $max))
+				$this->setWarning("Too many values supplied for parameter 'titles': the limit is $max");
+			
 			// When working in multi-page non-enumeration mode,
 			// limit to the latest revision only
 			$this->addWhere('page_id=rev_page');
 			$this->addWhere('page_latest=rev_id');
-			$this->validateLimit('page_count', $pageCount, 1, $userMax, $botMax);
-
+			
 			// Get all page IDs
-			$this->addWhereFld('page_id', array_keys($pageSet->getGoodTitles()));
+			$this->addWhereFld('page_id', array_keys($titles));
 
 			// assumption testing -- we should never get more then $pageCount rows.
 			$limit = $pageCount;
@@ -281,7 +295,7 @@ class ApiQueryRevisions extends ApiQueryBase {
 
 		if ($this->fld_comment) {
 			$comment = $revision->getComment();
-			if (!empty($comment))		
+			if (strval($comment) !== '')
 				$vals['comment'] = $comment;
 		}
 
@@ -312,6 +326,17 @@ class ApiQueryRevisions extends ApiQueryBase {
 				if($text === false)
 					$this->dieUsage("There is no section {$this->section} in r".$revision->getId(), 'nosuchsection');
 			}
+			if ($this->generateXML) {
+				$wgParser->startExternalParse( $title, new ParserOptions(), OT_PREPROCESS );
+				$dom = $wgParser->preprocessToDom( $text );
+				if ( is_callable( array( $dom, 'saveXML' ) ) ) {
+					$xml = $dom->saveXML();
+				} else {
+					$xml = $dom->__toString();
+				}
+				$vals['parsetree'] = $xml;
+				
+			}
 			if ($this->expandTemplates) {
 				$text = $wgParser->preprocess( $text, $title, new ParserOptions() );
 			}
@@ -366,11 +391,9 @@ class ApiQueryRevisions extends ApiQueryBase {
 			'excludeuser' => array(
 				ApiBase :: PARAM_TYPE => 'user'
 			),
-
 			'expandtemplates' => false,
-			'section' => array(
-				ApiBase :: PARAM_TYPE => 'integer'
-			),
+			'generatexml' => false,
+			'section' => null,
 			'token' => array(
 				ApiBase :: PARAM_TYPE => array_keys($this->getTokenFunctions()),
 				ApiBase :: PARAM_ISMULTI => true
@@ -390,6 +413,7 @@ class ApiQueryRevisions extends ApiQueryBase {
 			'user' => 'only include revisions made by user',
 			'excludeuser' => 'exclude revisions made by user',
 			'expandtemplates' => 'expand templates in revision content',
+			'generatexml' => 'generate XML parse tree for revision content',
 			'section' => 'only retrieve the content of this section',
 			'token' => 'Which tokens to obtain for each revision',
 		);
@@ -424,6 +448,6 @@ class ApiQueryRevisions extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryRevisions.php 37300 2008-07-08 08:42:27Z btongminh $';
+		return __CLASS__ . ': $Id: ApiQueryRevisions.php 44719 2008-12-17 16:34:01Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 84a2ec63..cb020fff 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -53,7 +53,8 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 
 		$limit = $params['limit'];
 		$query = $params['search'];
-		if (is_null($query) || empty($query))
+		$what = $params['what'];
+		if (strval($query) === '')
 			$this->dieUsage("empty search string is not allowed", 'param-search');
 
 		$search = SearchEngine::create();
@@ -61,13 +62,30 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		$search->setNamespaces( $params['namespace'] );
 		$search->showRedirects = $params['redirects'];
 
-		if ($params['what'] == 'text')
+		if ($what == 'text') {
 			$matches = $search->searchText( $query );
-		else
+		} elseif( $what == 'title' ) {
 			$matches = $search->searchTitle( $query );
+		} else {
+			// We default to title searches; this is a terrible legacy
+			// of the way we initially set up the MySQL fulltext-based
+			// search engine with separate title and text fields.
+			// In the future, the default should be for a combined index.
+			$what = 'title';
+			$matches = $search->searchTitle( $query );
+			
+			// Not all search engines support a separate title search,
+			// for instance the Lucene-based engine we use on Wikipedia.
+			// In this case, fall back to full-text search (which will
+			// include titles in it!)
+			if( is_null( $matches ) ) {
+				$what = 'text';
+				$matches = $search->searchText( $query );
+			}
+		}
 		if (is_null($matches))
-			$this->dieUsage("{$params['what']} search is disabled",
-					"search-{$params['what']}-disabled");
+			$this->dieUsage("{$what} search is disabled",
+					"search-{$what}-disabled");
 
 		$data = array ();
 		$count = 0;
@@ -78,8 +96,9 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 				break;
 			}
 
-			// Silently skip broken titles
-			if ($result->isBrokenTitle()) continue;
+			// Silently skip broken and missing titles
+			if ($result->isBrokenTitle() || $result->isMissingRevision())
+				continue;
 			
 			$title = $result->getTitle();
 			if (is_null($resultPageSet)) {
@@ -109,7 +128,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 				ApiBase :: PARAM_ISMULTI => true,
 			),
 			'what' => array (
-				ApiBase :: PARAM_DFLT => 'title',
+				ApiBase :: PARAM_DFLT => null,
 				ApiBase :: PARAM_TYPE => array (
 					'title',
 					'text',
@@ -151,6 +170,6 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQuerySearch.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiQuerySearch.php 44186 2008-12-03 19:33:57Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 1fd3b888..84757f7f 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -57,6 +57,9 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 				case 'specialpagealiases':
 					$this->appendSpecialPageAliases( $p );
 					break;
+				case 'magicwords':
+					$this->appendMagicWords( $p );
+					break;
 				case 'interwikimap':
 					$filteriw = isset( $params['filteriw'] ) ? $params['filteriw'] : false;
 					$this->appendInterwikiMap( $p, $filteriw );
@@ -70,6 +73,9 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 				case 'usergroups':
 					$this->appendUserGroups( $p );
 					break;
+				case 'extensions':
+					$this->appendExtensions( $p );
+					break;
 				default :
 					ApiBase :: dieDebug( __METHOD__, "Unknown prop=$p" );
 			}
@@ -129,8 +135,13 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 				'id' => $ns
 			);
 			ApiResult :: setContent( $data[$ns], $title );
-			if( MWNamespace::hasSubpages($ns) )
+			$canonical = MWNamespace::getCanonicalName( $ns );
+			
+			if( MWNamespace::hasSubpages( $ns ) )
 				$data[$ns]['subpages'] = '';
+			
+			if( $canonical ) 
+				$data[$ns]['canonical'] = strtr($canonical, '_', ' ');
 		}
 
 		$this->getResult()->setIndexedTagName( $data, 'ns' );
@@ -138,9 +149,11 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 	}
 
 	protected function appendNamespaceAliases( $property ) {
-		global $wgNamespaceAliases;
+		global $wgNamespaceAliases, $wgContLang;
+		$wgContLang->load();
+		$aliases = array_merge($wgNamespaceAliases, $wgContLang->namespaceAliases);
 		$data = array();
-		foreach( $wgNamespaceAliases as $title => $ns ) {
+		foreach( $aliases as $title => $ns ) {
 			$item = array(
 				'id' => $ns
 			);
@@ -164,6 +177,22 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 		$this->getResult()->setIndexedTagName( $data, 'specialpage' );
 		$this->getResult()->addValue( 'query', $property, $data );
 	}
+	
+	protected function appendMagicWords( $property ) {
+		global $wgContLang;
+		$data = array();
+		foreach($wgContLang->getMagicWords() as $magicword => $aliases)
+		{
+			$caseSensitive = array_shift($aliases);
+			$arr = array('name' => $magicword, 'aliases' => $aliases);
+			if($caseSensitive)
+				$arr['case-sensitive'] = '';
+			$this->getResult()->setIndexedTagName($arr['aliases'], 'alias');
+			$data[] = $arr;
+		}
+		$this->getResult()->setIndexedTagName($data, 'magicword');
+		$this->getResult()->addValue('query', $property, $data);
+	}
 
 	protected function appendInterwikiMap( $property, $filter ) {
 		$this->resetQueryParams();
@@ -174,7 +203,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 			$this->addWhere( 'iw_local = 1' );
 		elseif( $filter === '!local' )
 			$this->addWhere( 'iw_local = 0' );
-		elseif( $filter !== false )
+		elseif( $filter )
 			ApiBase :: dieDebug( __METHOD__, "Unknown filter=$filter" );
 
 		$this->addOption( 'ORDER BY', 'iw_prefix' );
@@ -239,7 +268,8 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 		$data['edits'] = intval( SiteStats::edits() );
 		$data['images'] = intval( SiteStats::images() );
 		$data['users'] = intval( SiteStats::users() );
-		$data['admins'] = intval( SiteStats::admins() );
+		$data['activeusers'] = intval( SiteStats::activeUsers() );
+		$data['admins'] = intval( SiteStats::numberingroup('sysop') );
 		$data['jobs'] = intval( SiteStats::jobs() );
 		$this->getResult()->addValue( 'query', $property, $data );
 	}
@@ -257,6 +287,40 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 		$this->getResult()->addValue( 'query', $property, $data );
 	}
 
+	protected function appendExtensions( $property ) {
+		global $wgExtensionCredits;
+		$data = array();
+		foreach ( $wgExtensionCredits as $type => $extensions ) {
+			foreach ( $extensions as $ext ) {
+				$ret = array();
+				$ret['type'] = $type;
+				if ( isset( $ext['name'] ) ) 
+					$ret['name'] = $ext['name'];
+				if ( isset( $ext['description'] ) ) 
+					$ret['description'] = $ext['description'];
+				if ( isset( $ext['descriptionmsg'] ) ) 
+					$ret['descriptionmsg'] = $ext['descriptionmsg'];
+				if ( isset( $ext['author'] ) ) {
+					$ret['author'] = is_array( $ext['author'] ) ? 
+						implode( ', ', $ext['author' ] ) : $ext['author'];
+				}
+				if ( isset( $ext['version'] ) ) {
+						$ret['version'] = $ext['version'];
+				} elseif ( isset( $ext['svn-revision'] ) && 
+					preg_match( '/\$(?:Rev|LastChangedRevision|Revision): *(\d+)/', 
+						$ext['svn-revision'], $m ) )  
+				{
+						$ret['version'] = 'r' . $m[1];
+				}
+				$data[] = $ret;
+			}
+		}
+
+		$this->getResult()->setIndexedTagName( $data, 'ext' );
+		$this->getResult()->addValue( 'query', $property, $data );
+	}
+
+
 	public function getAllowedParams() {
 		return array(
 			'prop' => array(
@@ -267,10 +331,12 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 					'namespaces',
 					'namespacealiases',
 					'specialpagealiases',
+					'magicwords',
 					'interwikimap',
 					'dbrepllag',
 					'statistics',
 					'usergroups',
+					'extensions',
 				)
 			),
 			'filteriw' => array(
@@ -288,13 +354,15 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 			'prop' => array(
 				'Which sysinfo properties to get:',
 				' "general"      - Overall system information',
-				' "namespaces"   - List of registered namespaces (localized)',
+				' "namespaces"   - List of registered namespaces and their canonical names',
 				' "namespacealiases" - List of registered namespace aliases',
 				' "specialpagealiases" - List of special page aliases',
+				' "magicwords"   - List of magic words and their aliases',
 				' "statistics"   - Returns site statistics',
 				' "interwikimap" - Returns interwiki map (optionally filtered)',
 				' "dbrepllag"    - Returns database server with the highest replication lag',
 				' "usergroups"   - Returns user groups and the associated permissions',
+				' "extensions"   - Returns extensions installed on the wiki',
 			),
 			'filteriw' =>  'Return only local or only nonlocal entries of the interwiki map',
 			'showalldb' => 'List all database servers, not just the one lagging the most',
@@ -314,6 +382,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQuerySiteinfo.php 37034 2008-07-04 09:21:11Z vasilievvv $';
+		return __CLASS__ . ': $Id: ApiQuerySiteinfo.php 44862 2008-12-20 23:49:16Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php
index c477acdb..be6c8bc4 100644
--- a/includes/api/ApiQueryUserContributions.php
+++ b/includes/api/ApiQueryUserContributions.php
@@ -62,6 +62,7 @@ class ApiQueryContributions extends ApiQueryBase {
 		if(isset($this->params['userprefix']))
 		{
 			$this->prefixMode = true;
+			$this->multiUserMode = true;
 			$this->userprefix = $this->params['userprefix'];
 		}
 		else
@@ -72,6 +73,7 @@ class ApiQueryContributions extends ApiQueryBase {
 			foreach($this->params['user'] as $u)
 				$this->prepareUsername($u);
 			$this->prefixMode = false;
+			$this->multiUserMode = (count($this->params['user']) > 1);
 		}
 		$this->prepareQuery();
 
@@ -87,7 +89,10 @@ class ApiQueryContributions extends ApiQueryBase {
 		while ( $row = $db->fetchObject( $res ) ) {
 			if (++ $count > $limit) {
 				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
-				$this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->rev_timestamp));
+				if($this->multiUserMode)
+					$this->setContinueEnumParameter('continue', $this->continueStr($row));
+				else
+					$this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->rev_timestamp));
 				break;
 			}
 
@@ -132,13 +137,28 @@ class ApiQueryContributions extends ApiQueryBase {
 		//anything we retrieve.
 		$this->addTables(array('revision', 'page'));
 		$this->addWhere('page_id=rev_page');
+		
+		// Handle continue parameter
+		if($this->multiUserMode && !is_null($this->params['continue']))
+		{
+			$continue = explode('|', $this->params['continue']);
+			if(count($continue) != 2)
+				$this->dieUsage("Invalid continue param. You should pass the original " .
+					"value returned by the previous query", "_badcontinue");
+			$encUser = $this->getDB()->strencode($continue[0]);
+			$encTS = wfTimestamp(TS_MW, $continue[1]);
+			$op = ($this->params['dir'] == 'older' ? '<' : '>');
+			$this->addWhere("rev_user_text $op '$encUser' OR " .
+					"(rev_user_text = '$encUser' AND " .
+					"rev_timestamp $op= '$encTS')");
+		}
 
 		$this->addWhereFld('rev_deleted', 0);
 		// We only want pages by the specified users.
 		if($this->prefixMode)
-			$this->addWhere("rev_user_text LIKE '" . $this->getDb()->escapeLike($this->userprefix) . "%'");
+			$this->addWhere("rev_user_text LIKE '" . $this->getDB()->escapeLike($this->userprefix) . "%'");
 		else
-			$this->addWhereFld( 'rev_user_text', $this->usernames );
+			$this->addWhereFld('rev_user_text', $this->usernames);
 		// ... and in the specified timeframe.
 		// Ensure the same sort order for rev_user_text and rev_timestamp
 		// so our query is indexed
@@ -157,6 +177,7 @@ class ApiQueryContributions extends ApiQueryBase {
 			$this->addWhereIf('rev_minor_edit != 0', isset ($show['minor']));
 		}
 		$this->addOption('LIMIT', $this->params['limit'] + 1);
+		$this->addOption( 'USE INDEX', array( 'revision' => 'usertext_timestamp' ) );
 
 		// Mandatory fields: timestamp allows request continuation
 		// ns+title checks if the user has access rights for this page
@@ -207,11 +228,17 @@ class ApiQueryContributions extends ApiQueryBase {
 				$vals['top'] = '';
 		}
 
-		if ($this->fld_comment && !empty ($row->rev_comment))
+		if ($this->fld_comment && isset( $row->rev_comment ) )
 			$vals['comment'] = $row->rev_comment;
 
 		return $vals;
 	}
+	
+	private function continueStr($row)
+	{
+		return $row->rev_user_text . '|' .
+			wfTimestamp(TS_ISO_8601, $row->rev_timestamp);
+	}
 
 	public function getAllowedParams() {
 		return array (
@@ -228,6 +255,7 @@ class ApiQueryContributions extends ApiQueryBase {
 			'end' => array (
 				ApiBase :: PARAM_TYPE => 'timestamp'
 			),
+			'continue' => null,
 			'user' => array (
 				ApiBase :: PARAM_ISMULTI => true
 			),
@@ -269,6 +297,7 @@ class ApiQueryContributions extends ApiQueryBase {
 			'limit' => 'The maximum number of contributions to return.',
 			'start' => 'The start timestamp to return from.',
 			'end' => 'The end timestamp to return to.',
+			'continue' => 'When more results are available, use this to continue.',
 			'user' => 'The user to retrieve contributions for.',
 			'userprefix' => 'Retrieve contibutions for all users whose names begin with this value. Overrides ucuser.',
 			'dir' => 'The direction to search (older or newer).',
@@ -290,6 +319,6 @@ class ApiQueryContributions extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUserContributions.php 37383 2008-07-09 11:44:49Z btongminh $';
+		return __CLASS__ . ': $Id: ApiQueryUserContributions.php 43271 2008-11-06 22:38:42Z siebrand $';
 	}
 }
diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 2d55a352..203b7e25 100644
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -76,12 +76,16 @@ class ApiQueryUserInfo extends ApiQueryBase {
 			$result->setIndexedTagName($vals['groups'], 'g');	// even if empty
 		}
 		if (isset($this->prop['rights'])) {
-			$vals['rights'] = $wgUser->getRights();
+			// User::getRights() may return duplicate values, strip them
+			$vals['rights'] = array_values(array_unique($wgUser->getRights()));
 			$result->setIndexedTagName($vals['rights'], 'r');	// even if empty
 		}
 		if (isset($this->prop['options'])) {
 			$vals['options'] = (is_null($wgUser->mOptions) ? User::getDefaultOptions() : $wgUser->mOptions);
 		}
+		if (isset($this->prop['preferencestoken']) && is_null($this->getMain()->getRequest()->getVal('callback'))) {
+			$vals['preferencestoken'] = $wgUser->editToken();
+		}
 		if (isset($this->prop['editcount'])) {
 			$vals['editcount'] = $wgUser->getEditCount();
 		}
@@ -110,6 +114,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
 			if(!$wgUser->isAnon())
 				$categories[] = 'newbie';
 		}
+		$categories = array_merge($categories, $wgUser->getGroups());
 
 		// Now get the actual limits
 		$retval = array();
@@ -134,6 +139,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
 					'groups',
 					'rights',
 					'options',
+					'preferencestoken',
 					'editcount',
 					'ratelimits'
 				)
@@ -168,6 +174,6 @@ class ApiQueryUserInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUserInfo.php 35186 2008-05-22 16:39:43Z brion $';
+		return __CLASS__ . ': $Id: ApiQueryUserInfo.php 43764 2008-11-20 15:15:00Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index a8147567..e50d8d82 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -68,15 +68,13 @@ if (!defined('MEDIAWIKI')) {
 			 else
 				$goodNames[] = $n;
 		}
-		if(empty($goodNames))
+		if(!count($goodNames))
 			return $retval;
 
-		$db = $this->getDb();
+		$db = $this->getDB();
 		$this->addTables('user', 'u1');
-		$this->addFields('u1.user_name');
+		$this->addFields('u1.*');
 		$this->addWhereFld('u1.user_name', $goodNames);
-		$this->addFieldsIf('u1.user_editcount', isset($this->prop['editcount']));
-		$this->addFieldsIf('u1.user_registration', isset($this->prop['registration']));
 
 		if(isset($this->prop['groups'])) {
 			$this->addTables('user_groups');
@@ -96,20 +94,26 @@ if (!defined('MEDIAWIKI')) {
 		$data = array();
 		$res = $this->select(__METHOD__);
 		while(($r = $db->fetchObject($res))) {
-			$data[$r->user_name]['name'] = $r->user_name;
+			$user = User::newFromRow($r);
+			$name = $user->getName();
+			$data[$name]['name'] = $name;
 			if(isset($this->prop['editcount']))
-				$data[$r->user_name]['editcount'] = $r->user_editcount;
+				// No proper member function in User class for this
+				$data[$name]['editcount'] = $r->user_editcount;
 			if(isset($this->prop['registration']))
-				$data[$r->user_name]['registration'] = wfTimestampOrNull(TS_ISO_8601, $r->user_registration);
+				// Nor for this one
+				$data[$name]['registration'] = wfTimestampOrNull(TS_ISO_8601, $r->user_registration);
 			if(isset($this->prop['groups']))
 				// This row contains only one group, others will be added from other rows
 				if(!is_null($r->ug_group))
-					$data[$r->user_name]['groups'][] = $r->ug_group;
+					$data[$name]['groups'][] = $r->ug_group;
 			if(isset($this->prop['blockinfo']))
 				if(!is_null($r->blocker_name)) {
-					$data[$r->user_name]['blockedby'] = $r->blocker_name;
-					$data[$r->user_name]['blockreason'] = $r->ipb_reason;
+					$data[$name]['blockedby'] = $r->blocker_name;
+					$data[$name]['blockreason'] = $r->ipb_reason;
 				}
+			if(isset($this->prop['emailable']) && $user->canReceiveEmail())
+				$data[$name]['emailable'] = '';
 		}
 
 		// Second pass: add result data to $retval
@@ -134,7 +138,8 @@ if (!defined('MEDIAWIKI')) {
 					'blockinfo',
 					'groups',
 					'editcount',
-					'registration'
+					'registration',
+					'emailable',
 				)
 			),
 			'users' => array(
@@ -147,9 +152,11 @@ if (!defined('MEDIAWIKI')) {
 		return array (
 			'prop' => array(
 				'What pieces of information to include',
-				'  blockinfo - tags if the user is blocked, by whom, and for what reason',
-				'  groups    - lists all the groups the user belongs to',
-				'  editcount - adds the user\'s edit count'
+				'  blockinfo    - tags if the user is blocked, by whom, and for what reason',
+				'  groups       - lists all the groups the user belongs to',
+				'  editcount    - adds the user\'s edit count',
+				'  registration - adds the user\'s registration timestamp',
+				'  emailable    - tags if the user can and wants to receive e-mail through [[Special:Emailuser]]',
 			),
 			'users' => 'A list of users to obtain the same information for'
 		);
@@ -164,6 +171,6 @@ if (!defined('MEDIAWIKI')) {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUsers.php 38183 2008-07-29 12:58:04Z rotem $';
+		return __CLASS__ . ': $Id: ApiQueryUsers.php 44231 2008-12-04 14:42:30Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index d17e83f6..ed3482fb 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -59,12 +59,11 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 		if (!$wgUser->isLoggedIn())
 			$this->dieUsage('You must be logged-in to have a watchlist', 'notloggedin');
 
-		$allrev = $start = $end = $namespace = $dir = $limit = $prop = $show = null;
-		extract($this->extractRequestParams());
+		$params = $this->extractRequestParams();
 
-		if (!is_null($prop) && is_null($resultPageSet)) {
+		if (!is_null($params['prop']) && is_null($resultPageSet)) {
 
-			$prop = array_flip($prop);
+			$prop = array_flip($params['prop']);
 
 			$this->fld_ids = isset($prop['ids']);
 			$this->fld_title = isset($prop['title']);
@@ -76,8 +75,8 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			$this->fld_patrol = isset($prop['patrol']);
 
 			if ($this->fld_patrol) {
-				global $wgUseRCPatrol, $wgUser;
-				if (!$wgUseRCPatrol || !$wgUser->isAllowed('patrol'))
+				global $wgUser;
+				if (!$wgUser->useRCPatrol() && !$wgUser->useNPPatrol())
 					$this->dieUsage('patrol property is not available', 'patrol');
 			}
 		}
@@ -100,7 +99,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			$this->addFieldsIf('rc_old_len', $this->fld_sizes);
 			$this->addFieldsIf('rc_new_len', $this->fld_sizes);
 		}
-		elseif ($allrev) {
+		elseif ($params['allrev']) {
 			$this->addFields(array (
 				'rc_this_oldid',
 				'rc_namespace',
@@ -131,20 +130,26 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			'rc_deleted' => 0,
 		));
 
-		$this->addWhereRange('rc_timestamp', $dir, $start, $end);
-		$this->addWhereFld('wl_namespace', $namespace);
-		$this->addWhereIf('rc_this_oldid=page_latest', !$allrev);
+		$this->addWhereRange('rc_timestamp', $params['dir'], $params['start'], $params['end']);
+		$this->addWhereFld('wl_namespace', $params['namespace']);
+		$this->addWhereIf('rc_this_oldid=page_latest', !$params['allrev']);
 
-		if (!is_null($show)) {
-			$show = array_flip($show);
+		if (!is_null($params['show'])) {
+			$show = array_flip($params['show']);
 
 			/* Check for conflicting parameters. */
 			if ((isset ($show['minor']) && isset ($show['!minor']))
 					|| (isset ($show['bot']) && isset ($show['!bot']))
-					|| (isset ($show['anon']) && isset ($show['!anon']))) {
+					|| (isset ($show['anon']) && isset ($show['!anon']))
+					|| (isset ($show['patrolled']) && isset ($show['!patrolled']))) {
 
 				$this->dieUsage("Incorrect parameter - mutually exclusive values may not be supplied", 'show');
 			}
+			
+			// Check permissions
+			global $wgUser;
+			if((isset($show['patrolled']) || isset($show['!patrolled'])) && !$wgUser->useRCPatrol() && !$wgUser->useNPPatrol())
+				$this->dieUsage("You need the patrol right to request the patrolled flag", 'permissiondenied');
 
 			/* Add additional conditions to query depending upon parameters. */
 			$this->addWhereIf('rc_minor = 0', isset ($show['!minor']));
@@ -153,13 +158,15 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			$this->addWhereIf('rc_bot != 0', isset ($show['bot']));
 			$this->addWhereIf('rc_user = 0', isset ($show['anon']));
 			$this->addWhereIf('rc_user != 0', isset ($show['!anon']));
+			$this->addWhereIf('rc_patrolled = 0', isset($show['!patrolled']));
+			$this->addWhereIf('rc_patrolled != 0', isset($show['patrolled']));			
 		}
 
 
 		# This is an index optimization for mysql, as done in the Special:Watchlist page
-		$this->addWhereIf("rc_timestamp > ''", !isset ($start) && !isset ($end) && $wgDBtype == 'mysql');
+		$this->addWhereIf("rc_timestamp > ''", !isset ($params['start']) && !isset ($params['end']) && $wgDBtype == 'mysql');
 
-		$this->addOption('LIMIT', $limit +1);
+		$this->addOption('LIMIT', $params['limit'] +1);
 
 		$data = array ();
 		$count = 0;
@@ -167,7 +174,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 
 		$db = $this->getDB();
 		while ($row = $db->fetchObject($res)) {
-			if (++ $count > $limit) {
+			if (++ $count > $params['limit']) {
 				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
 				$this->setContinueEnumParameter('start', wfTimestamp(TS_ISO_8601, $row->rc_timestamp));
 				break;
@@ -178,7 +185,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 				if ($vals)
 					$data[] = $vals;
 			} else {
-				if ($allrev) {
+				if ($params['allrev']) {
 					$data[] = intval($row->rc_this_oldid);
 				} else {
 					$data[] = intval($row->rc_cur_id);
@@ -192,7 +199,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			$this->getResult()->setIndexedTagName($data, 'item');
 			$this->getResult()->addValue('query', $this->getModuleName(), $data);
 		}
-		elseif ($allrev) {
+		elseif ($params['allrev']) {
 			$resultPageSet->populateFromRevisionIDs($data);
 		} else {
 			$resultPageSet->populateFromPageIDs($data);
@@ -237,7 +244,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			$vals['newlen'] = intval($row->rc_new_len);
 		}
 
-		if ($this->fld_comment && !empty ($row->rc_comment))
+		if ($this->fld_comment && isset( $row->rc_comment ))
 			$vals['comment'] = $row->rc_comment;
 
 		return $vals;
@@ -292,7 +299,9 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 					'bot',
 					'!bot',
 					'anon',
-					'!anon'
+					'!anon',
+					'patrolled',
+					'!patrolled',
 				)
 			)
 		);
@@ -329,6 +338,6 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryWatchlist.php 37909 2008-07-22 13:26:15Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryWatchlist.php 44719 2008-12-17 16:34:01Z catrope $';
 	}
 }
diff --git a/includes/api/ApiQueryWatchlistRaw.php b/includes/api/ApiQueryWatchlistRaw.php
new file mode 100644
index 00000000..e9951b42
--- /dev/null
+++ b/includes/api/ApiQueryWatchlistRaw.php
@@ -0,0 +1,179 @@
+<?php
+
+/*
+ * Created on Oct 4, 2008
+ *
+ * API for MediaWiki 1.8+
+ *
+ * Copyright (C) 2008 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	// Eclipse helper - will be ignored in production
+	require_once ('ApiQueryBase.php');
+}
+
+/**
+ * This query action allows clients to retrieve a list of pages
+ * on the logged-in user's watchlist.
+ *
+ * @ingroup API
+ */
+class ApiQueryWatchlistRaw extends ApiQueryGeneratorBase {
+
+	public function __construct($query, $moduleName) {
+		parent :: __construct($query, $moduleName, 'wr');
+	}
+
+	public function execute() {
+		$this->run();
+	}
+
+	public function executeGenerator($resultPageSet) {
+		$this->run($resultPageSet);
+	}
+
+	private function run($resultPageSet = null) {
+		global $wgUser;
+
+		$this->selectNamedDB('watchlist', DB_SLAVE, 'watchlist');
+
+		if (!$wgUser->isLoggedIn())
+			$this->dieUsage('You must be logged-in to have a watchlist', 'notloggedin');	
+		$params = $this->extractRequestParams();
+		$prop = array_flip((array)$params['prop']);
+		$show = array_flip((array)$params['show']);
+		if(isset($show['changed']) && isset($show['!changed']))
+			$this->dieUsage("Incorrect parameter - mutually exclusive values may not be supplied", 'show');
+
+		$this->addTables('watchlist');
+		$this->addFields(array('wl_namespace', 'wl_title'));
+		$this->addFieldsIf('wl_notificationtimestamp', isset($prop['changed']));
+		$this->addWhereFld('wl_user', $wgUser->getId());
+		$this->addWhereFld('wl_namespace', $params['namespace']);
+		$this->addWhereIf('wl_notificationtimestamp IS NOT NULL', isset($show['changed']));
+		$this->addWhereIf('wl_notificationtimestamp IS NULL', isset($show['!changed']));
+		if(isset($params['continue']))
+		{
+			$cont = explode('|', $params['continue']);
+			if(count($cont) != 2)
+				$this->dieUsage("Invalid continue param. You should pass the " .
+					"original value returned by the previous query", "_badcontinue");
+			$ns = intval($cont[0]);
+			$title = $this->getDB()->strencode($this->titleToKey($cont[1]));
+			$this->addWhere("wl_namespace > '$ns' OR ".
+					"(wl_namespace = '$ns' AND ".
+					"wl_title >= '$title')");
+		}
+		// Don't ORDER BY wl_namespace if it's constant in the WHERE clause
+		if(count($params['namespace']) == 1)
+			$this->addOption('ORDER BY', 'wl_title');
+		else
+			$this->addOption('ORDER BY', 'wl_namespace, wl_title');
+		$this->addOption('LIMIT', $params['limit'] + 1);
+		$res = $this->select(__METHOD__);
+		
+		$db = $this->getDB();
+		$data = array();
+		$titles = array();
+		$count = 0;
+		while($row = $db->fetchObject($res))
+		{
+			if(++$count > $params['limit'])
+			{
+				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
+				$this->setContinueEnumParameter('continue', $row->wl_namespace . '|' .
+									$this->keyToTitle($row->wl_title));
+				break;
+			}
+			$t = Title::makeTitle($row->wl_namespace, $row->wl_title);
+			if(is_null($resultPageSet))
+			{
+				$vals = array();
+				ApiQueryBase::addTitleInfo($vals, $t);
+				if(isset($prop['changed']) && !is_null($row->wl_notificationtimestamp))
+					$vals['changed'] = wfTimestamp(TS_ISO_8601, $row->wl_notificationtimestamp);
+				$data[] = $vals;
+			}
+			else
+				$titles[] = $t;
+		}
+		if(is_null($resultPageSet))
+		{
+			$this->getResult()->setIndexedTagName($data, 'wr');
+			$this->getResult()->addValue(null, $this->getModuleName(), $data);
+		}
+		else
+			$resultPageSet->populateFromTitles($titles);
+	}
+
+	public function getAllowedParams() {
+		return array (
+			'continue' => null,
+			'namespace' => array (
+				ApiBase :: PARAM_ISMULTI => true,
+				ApiBase :: PARAM_TYPE => 'namespace'
+			),
+			'limit' => array (
+				ApiBase :: PARAM_DFLT => 10,
+				ApiBase :: PARAM_TYPE => 'limit',
+				ApiBase :: PARAM_MIN => 1,
+				ApiBase :: PARAM_MAX => ApiBase :: LIMIT_BIG1,
+				ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2
+			),
+			'prop' => array (
+				ApiBase :: PARAM_ISMULTI => true,
+				ApiBase :: PARAM_TYPE => array (
+					'changed',
+				)
+			),
+			'show' => array (
+				ApiBase :: PARAM_ISMULTI => true,
+				ApiBase :: PARAM_TYPE => array (
+					'changed',
+					'!changed',
+				)
+			)
+		);
+	}
+
+	public function getParamDescription() {
+		return array (
+			'continue' => 'When more results are available, use this to continue',
+			'namespace' => 'Only list pages in the given namespace(s).',
+			'limit' => 'How many total results to return per request.',
+			'prop' => 'Which additional properties to get (non-generator mode only).',
+			'show' => 'Only list items that meet these criteria.',
+		);
+	}
+
+	public function getDescription() {
+		return "Get all pages on the logged in user's watchlist";
+	}
+
+	protected function getExamples() {
+		return array (
+			'api.php?action=query&list=watchlistraw',
+			'api.php?action=query&generator=watchlistraw&gwrshow=changed&prop=revisions',
+		);
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiQueryWatchlistRaw.php 41651 2008-10-04 14:30:33Z catrope $';
+	}
+}
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index 9e798d35..900953e0 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -100,7 +100,7 @@ class ApiResult extends ApiBase {
 		}
 		elseif (is_array($arr[$name]) && is_array($value)) {
 			$merged = array_intersect_key($arr[$name], $value);
-			if (empty ($merged))
+			if (!count($merged))
 				$arr[$name] += $value;
 			else
 				ApiBase :: dieDebug(__METHOD__, "Attempting to merge element $name");
@@ -180,18 +180,27 @@ class ApiResult extends ApiBase {
 			}
 		}
 
-		if (empty($name))
+		if (!$name)
 			$data[] = $value;	// Add list element
 		else
 			ApiResult :: setElement($data, $name, $value);	// Add named element
 	}
 
+	/**
+	 * Ensure all values in this result are valid UTF-8.
+	 */
+	public function cleanUpUTF8()
+	{
+		$data = & $this->getData();
+		array_walk_recursive($data, array('UtfNormal', 'cleanUp'));
+	}
+
 	public function execute() {
 		ApiBase :: dieDebug(__METHOD__, 'execute() is not supported on Result object');
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiResult.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiResult.php 45752 2009-01-14 21:36:57Z catrope $';
 	}
 }
 
@@ -201,7 +210,7 @@ if (!function_exists('array_intersect_key')) {
 		$argc = func_num_args();
 
 		if ($argc > 2) {
-			for ($i = 1; !empty($isec) && $i < $argc; $i++) {
+			for ($i = 1; $isec && $i < $argc; $i++) {
 				$arr = func_get_arg($i);
 
 				foreach (array_keys($isec) as $key) {
diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index 3739f694..653dca9e 100644
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -37,7 +37,6 @@ class ApiRollback extends ApiBase {
 	}
 
 	public function execute() {
-		global $wgUser;
 		$this->getMain()->requestWriteMode();
 		$params = $this->extractRequestParams();
 
@@ -55,7 +54,10 @@ class ApiRollback extends ApiBase {
 		if(!$titleObj->exists())
 			$this->dieUsageMsg(array('notanarticle'));
 
-		$username = User::getCanonicalName($params['user']);
+		#We need to be able to revert IPs, but getCanonicalName rejects them
+		$username = User::isIP($params['user'])
+			? $params['user']
+			: User::getCanonicalName($params['user']);
 		if(!$username)
 			$this->dieUsageMsg(array('invaliduser', $params['user']));
 
@@ -64,20 +66,17 @@ class ApiRollback extends ApiBase {
 		$details = null;
 		$retval = $articleObj->doRollback($username, $summary, $params['token'], $params['markbot'], $details);
 
-		if(!empty($retval))
+		if($retval)
 			// We don't care about multiple errors, just report one of them
 			$this->dieUsageMsg(current($retval));
 
-		$current = $target = $summary = NULL;
-		extract($details);
-
 		$info = array(
 			'title' => $titleObj->getPrefixedText(),
-			'pageid' => $current->getPage(),
-			'summary' => $summary,
+			'pageid' => $details['current']->getPage(),
+			'summary' => $details['summary'],
 			'revid' => $titleObj->getLatestRevID(),
-			'old_revid' => $current->getID(),
-			'last_revid' => $target->getID()
+			'old_revid' => $details['current']->getID(),
+			'last_revid' => $details['target']->getID()
 		);
 
 		$this->getResult()->addValue(null, $this->getModuleName(), $info);
@@ -99,7 +98,7 @@ class ApiRollback extends ApiBase {
 		return array (
 			'title' => 'Title of the page you want to rollback.',
 			'user' => 'Name of the user whose edits are to be rolled back. If set incorrectly, you\'ll get a badtoken error.',
-			'token' => 'A rollback token previously retrieved through prop=info',
+			'token' => 'A rollback token previously retrieved through prop=revisions',
 			'summary' => 'Custom edit summary. If not set, default summary will be used.',
 			'markbot' => 'Mark the reverted edits and the revert as bot edits'
 		);
@@ -107,8 +106,8 @@ class ApiRollback extends ApiBase {
 
 	public function getDescription() {
 		return array(
-				'Undoes the last edit to the page. If the last user who edited the page made multiple edits in a row,',
-				'they will all be rolled back. You need to be logged in as a sysop to use this function, see also action=login.'
+				'Undo the last edit to the page. If the last user who edited the page made multiple edits in a row,',
+				'they will all be rolled back.'
 			);
 	}
 
@@ -120,6 +119,6 @@ class ApiRollback extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiRollback.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiRollback.php 45043 2008-12-26 04:13:47Z mrzman $';
 	}
 }
diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php
index d6a02a2a..cd52c518 100644
--- a/includes/api/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -64,14 +64,12 @@ class ApiUnblock extends ApiBase {
 			$this->dieUsageMsg(array('sessionfailure'));
 		if(!$wgUser->isAllowed('block'))
 			$this->dieUsageMsg(array('cantunblock'));
-		if(wfReadOnly())
-			$this->dieUsageMsg(array('readonlytext'));
 
 		$id = $params['id'];
 		$user = $params['user'];
 		$reason = (is_null($params['reason']) ? '' : $params['reason']);
 		$retval = IPUnblockForm::doUnblock($id, $user, $reason, $range);
-		if(!empty($retval))
+		if($retval)
 			$this->dieUsageMsg($retval);
 
 		$res['id'] = $id;
@@ -96,7 +94,7 @@ class ApiUnblock extends ApiBase {
 		return array (
 			'id' => 'ID of the block you want to unblock (obtained through list=blocks). Cannot be used together with user',
 			'user' => 'Username, IP address or IP range you want to unblock. Cannot be used together with id',
-			'token' => 'An unblock token previously obtained through the gettoken parameter',
+			'token' => 'An unblock token previously obtained through the gettoken parameter or prop=info',
 			'gettoken' => 'If set, an unblock token will be returned, and no other action will be taken',
 			'reason' => 'Reason for unblock (optional)',
 		);
@@ -116,6 +114,6 @@ class ApiUnblock extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUnblock.php 35098 2008-05-20 17:13:28Z ialex $';
+		return __CLASS__ . ': $Id: ApiUnblock.php 42651 2008-10-27 12:06:49Z catrope $';
 	}
 }
diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index e054a70e..7ae9a3c0 100644
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -51,8 +51,6 @@ class ApiUndelete extends ApiBase {
 			$this->dieUsageMsg(array('permdenied-undelete'));
 		if($wgUser->isBlocked())
 			$this->dieUsageMsg(array('blockedtext'));
-		if(wfReadOnly())
-			$this->dieUsageMsg(array('readonlytext'));
 		if(!$wgUser->matchEditToken($params['token']))
 			$this->dieUsageMsg(array('sessionfailure'));
 
@@ -69,7 +67,7 @@ class ApiUndelete extends ApiBase {
 			$params['timestamps'][$i] = wfTimestamp(TS_MW, $ts);
 
 		$pa = new PageArchive($titleObj);
-		$dbw = wfGetDb(DB_MASTER);
+		$dbw = wfGetDB(DB_MASTER);
 		$dbw->begin();
 		$retval = $pa->undelete((isset($params['timestamps']) ? $params['timestamps'] : array()), $params['reason']);
 		if(!is_array($retval))
@@ -123,6 +121,6 @@ class ApiUndelete extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUndelete.php 35348 2008-05-26 10:51:31Z catrope $';
+		return __CLASS__ . ': $Id: ApiUndelete.php 43270 2008-11-06 22:30:55Z siebrand $';
 	}
 }
diff --git a/includes/api/ApiWatch.php b/includes/api/ApiWatch.php
new file mode 100644
index 00000000..ab122fea
--- /dev/null
+++ b/includes/api/ApiWatch.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * Created on Jan 4, 2008
+ *
+ * API for MediaWiki 1.8+
+ *
+ * Copyright (C) 2008 Yuri Astrakhan <Firstname><Lastname>@gmail.com,
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+if (!defined('MEDIAWIKI')) {
+	// Eclipse helper - will be ignored in production
+	require_once ('ApiBase.php');
+}
+
+/**
+ * API module to allow users to log out of the wiki. API equivalent of
+ * Special:Userlogout.
+ *
+ * @ingroup API
+ */
+class ApiWatch extends ApiBase {
+
+	public function __construct($main, $action) {
+		parent :: __construct($main, $action);
+	}
+
+	public function execute() {
+		global $wgUser;
+		$this->getMain()->requestWriteMode();
+		if(!$wgUser->isLoggedIn())
+			$this->dieUsage('You must be logged-in to have a watchlist', 'notloggedin');
+		$params = $this->extractRequestParams();
+		$title = Title::newFromText($params['title']);
+		if(!$title)
+			$this->dieUsageMsg(array('invalidtitle', $params['title']));
+		$article = new Article($title);
+		$res = array('title' => $title->getPrefixedText());
+		if($params['unwatch'])
+		{
+			$res['unwatched'] = '';
+			$success = $article->doUnwatch();
+		}
+		else
+		{
+			$res['watched'] = '';
+			$success = $article->doWatch();
+		}
+		if(!$success)
+			$this->dieUsageMsg(array('hookaborted'));
+		$this->getResult()->addValue(null, $this->getModuleName(), $res);
+	}
+
+	public function getAllowedParams() {
+		return array (
+			'title' => null,
+			'unwatch' => false,
+		);
+	}
+
+	public function getParamDescription() {
+		return array (
+			'title' => 'The page to (un)watch',
+			'unwatch' => 'If set the page will be unwatched rather than watched',
+		);
+	}
+
+	public function getDescription() {
+		return array (
+			'Add or remove a page from/to the current user\'s watchlist'
+		);
+	}
+
+	protected function getExamples() {
+		return array(
+			'api.php?action=watch&title=Main_Page',
+			'api.php?action=watch&title=Main_Page&unwatch',
+		);
+	}
+
+	public function getVersion() {
+		return __CLASS__ . ': $Id: ApiWatch.php 40460 2008-09-04 22:20:32Z ialex $';
+	}
+}
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 885ede54..84b88643 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -205,12 +205,17 @@ class Database {
 		return false;
 	}
 
-	/**#@+
-	 * Get function
+	/**
+	 * Return the last query that went through Database::query()
+	 * @return String
 	 */
 	function lastQuery() { return $this->mLastQuery; }
+	
+	/**
+	 * Is a connection to the database open?
+	 * @return Boolean
+	 */
 	function isOpen() { return $this->mOpened; }
-	/**#@-*/
 
 	function setFlag( $flag ) {
 		$this->mFlags |= $flag;
@@ -243,13 +248,13 @@ class Database {
 # Other functions
 #------------------------------------------------------------------------------
 
-	/**@{{
+	/**
 	 * Constructor.
-	 * @param string $server database server host
-	 * @param string $user database user name
-	 * @param string $password database user password
-	 * @param string $dbname database name
-	 * @param failFunction
+	 * @param $server String: database server host
+	 * @param $user String: database user name
+	 * @param $password String: database user password
+	 * @param $dbName String: database name
+	 * @param $failFunction
 	 * @param $flags
 	 * @param $tablePrefix String: database table prefixes. By default use the prefix gave in LocalSettings.php
 	 */
@@ -293,7 +298,11 @@ class Database {
 	}
 
 	/**
-	 * @static
+	 * Same as new Database( ... ), kept for backward compatibility
+	 * @param $server String: database server host
+	 * @param $user String: database user name
+	 * @param $password String: database user password
+	 * @param $dbName String: database name
 	 * @param failFunction
 	 * @param $flags
 	 */
@@ -305,9 +314,13 @@ class Database {
 	/**
 	 * Usually aborts on failure
 	 * If the failFunction is set to a non-zero integer, returns success
+	 * @param $server String: database server host
+	 * @param $user String: database user name
+	 * @param $password String: database user password
+	 * @param $dbName String: database name
 	 */
 	function open( $server, $user, $password, $dbName ) {
-		global $wguname, $wgAllDBsAreLocalhost;
+		global $wgAllDBsAreLocalhost;
 		wfProfileIn( __METHOD__ );
 
 		# Test for missing mysql.so
@@ -338,13 +351,17 @@ class Database {
 
 		wfProfileIn("dbconnect-$server");
 
-		# Try to connect up to three times
 		# The kernel's default SYN retransmission period is far too slow for us,
-		# so we use a short timeout plus a manual retry.
+		# so we use a short timeout plus a manual retry. Retrying means that a small
+		# but finite rate of SYN packet loss won't cause user-visible errors.
 		$this->mConn = false;
-		$max = 3;
+		if ( ini_get( 'mysql.connect_timeout' ) <= 3 ) {
+			$numAttempts = 2;
+		} else {
+			$numAttempts = 1;
+		}
 		$this->installErrorHandler();
-		for ( $i = 0; $i < $max && !$this->mConn; $i++ ) {
+		for ( $i = 0; $i < $numAttempts && !$this->mConn; $i++ ) {
 			if ( $i > 1 ) {
 				usleep( 1000 );
 			}
@@ -360,23 +377,28 @@ class Database {
 			}
 		}
 		$phpError = $this->restoreErrorHandler();
+		# Always log connection errors
+		if ( !$this->mConn ) {
+			$error = $this->lastError();
+			if ( !$error ) {
+				$error = $phpError;
+			}
+			wfLogDBError( "Error connecting to {$this->mServer}: $error\n" );
+			wfDebug( "DB connection error\n" );
+			wfDebug( "Server: $server, User: $user, Password: " .
+				substr( $password, 0, 3 ) . "..., error: " . mysql_error() . "\n" );
+			$success = false;
+		}
 		
 		wfProfileOut("dbconnect-$server");
 
-		if ( $dbName != '' ) {
-			if ( $this->mConn !== false ) {
-				$success = @/**/mysql_select_db( $dbName, $this->mConn );
-				if ( !$success ) {
-					$error = "Error selecting database $dbName on server {$this->mServer} " .
-						"from client host {$wguname['nodename']}\n";
-					wfLogDBError(" Error selecting database $dbName on server {$this->mServer} \n");
-					wfDebug( $error );
-				}
-			} else {
-				wfDebug( "DB connection error\n" );
-				wfDebug( "Server: $server, User: $user, Password: " .
-					substr( $password, 0, 3 ) . "..., error: " . mysql_error() . "\n" );
-				$success = false;
+		if ( $dbName != '' && $this->mConn !== false ) {
+			$success = @/**/mysql_select_db( $dbName, $this->mConn );
+			if ( !$success ) {
+				$error = "Error selecting database $dbName on server {$this->mServer} " .
+					"from client host " . wfHostname() . "\n";
+				wfLogDBError(" Error selecting database $dbName on server {$this->mServer} \n");
+				wfDebug( $error );
 			}
 		} else {
 			# Delay USE query
@@ -405,16 +427,25 @@ class Database {
 		wfProfileOut( __METHOD__ );
 		return $success;
 	}
-	/**@}}*/
 
 	protected function installErrorHandler() {
 		$this->mPHPError = false;
+		$this->htmlErrors = ini_set( 'html_errors', '0' );
 		set_error_handler( array( $this, 'connectionErrorHandler' ) );
 	}
 
 	protected function restoreErrorHandler() {
 		restore_error_handler();
-		return $this->mPHPError;
+		if ( $this->htmlErrors !== false ) {
+			ini_set( 'html_errors', $this->htmlErrors );
+		}
+		if ( $this->mPHPError ) {
+			$error = preg_replace( '!\[<a.*</a>\]!', '', $this->mPHPError );
+			$error = preg_replace( '!^.*?:(.*)$!', '$1', $error );
+			return $error;
+		} else {
+			return false;
+		}
 	}
 
 	protected function connectionErrorHandler( $errno,  $errstr ) {
@@ -425,7 +456,7 @@ class Database {
 	 * Closes a database connection.
 	 * if it is open : commits any open transactions
 	 *
-	 * @return bool operation success. true if already closed.
+	 * @return Bool operation success. true if already closed.
 	 */
 	function close()
 	{
@@ -441,7 +472,7 @@ class Database {
 	}
 
 	/**
-	 * @param string $error fallback error message, used if none is given by MySQL
+	 * @param $error String: fallback error message, used if none is given by MySQL
 	 */
 	function reportConnectionError( $error = 'Unknown error' ) {
 		$myError = $this->lastError();
@@ -457,7 +488,6 @@ class Database {
 			}
 		} else {
 			# New method
-			wfLogDBError( "Connection error: $error\n" );
 			throw new DBConnectionError( $this, $error );
 		}
 	}
@@ -468,7 +498,7 @@ class Database {
 	 * @param  $sql        String: SQL query
 	 * @param  $fname      String: Name of the calling function, for profiling/SHOW PROCESSLIST 
 	 *     comment (you can use __METHOD__ or add some extra info)
-	 * @param  $tempIgnore Bool:   Whether to avoid throwing an exception on errors... 
+	 * @param  $tempIgnore Boolean:   Whether to avoid throwing an exception on errors... 
 	 *     maybe best to catch the exception instead?
 	 * @return true for a successful write query, ResultWrapper object for a successful read query, 
 	 *     or false on failure if $tempIgnore set
@@ -572,7 +602,7 @@ class Database {
 	 * The DBMS-dependent part of query()
 	 * @param  $sql String: SQL query.
 	 * @return Result object to feed to fetchObject, fetchRow, ...; or false on failure
-	 * @access private
+	 * @private
 	 */
 	/*private*/ function doQuery( $sql ) {
 		if( $this->bufferResults() ) {
@@ -584,11 +614,11 @@ class Database {
 	}
 
 	/**
-	 * @param $error
-	 * @param $errno
-	 * @param $sql
-	 * @param string $fname
-	 * @param bool $tempIgnore
+	 * @param $error String
+	 * @param $errno Integer
+	 * @param $sql String
+	 * @param $fname String
+	 * @param $tempIgnore Boolean
 	 */
 	function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
 		global $wgCommandLineMode;
@@ -630,8 +660,8 @@ class Database {
 
 	/**
 	 * Execute a prepared query with the various arguments
-	 * @param string $prepared the prepared sql
-	 * @param mixed $args Either an array here, or put scalars as varargs
+	 * @param $prepared String: the prepared sql
+	 * @param $args Mixed: Either an array here, or put scalars as varargs
 	 */
 	function execute( $prepared, $args = null ) {
 		if( !is_array( $args ) ) {
@@ -646,8 +676,8 @@ class Database {
 	/**
 	 * Prepare & execute an SQL statement, quoting and inserting arguments
 	 * in the appropriate places.
-	 * @param string $query
-	 * @param string $args ...
+	 * @param $query String
+	 * @param $args ...
 	 */
 	function safeQuery( $query, $args = null ) {
 		$prepared = $this->prepare( $query, 'Database::safeQuery' );
@@ -664,8 +694,8 @@ class Database {
 	/**
 	 * For faking prepared SQL statements on DBs that don't support
 	 * it directly.
-	 * @param string $preparedSql - a 'preparable' SQL statement
-	 * @param array $args - array of arguments to fill it with
+	 * @param $preparedQuery String: a 'preparable' SQL statement
+	 * @param $args Array of arguments to fill it with
 	 * @return string executable SQL
 	 */
 	function fillPrepared( $preparedQuery, $args ) {
@@ -680,8 +710,8 @@ class Database {
 	 * The arguments should be in $this->preparedArgs and must not be touched
 	 * while we're doing this.
 	 *
-	 * @param array $matches
-	 * @return string
+	 * @param $matches Array
+	 * @return String
 	 * @private
 	 */
 	function fillPreparedArg( $matches ) {
@@ -702,11 +732,9 @@ class Database {
 		}
 	}
 
-	/**#@+
-	 * @param mixed $res A SQL result
-	 */
 	/**
 	 * Free a result object
+	 * @param $res Mixed: A SQL result
 	 */
 	function freeResult( $res ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -758,6 +786,7 @@ class Database {
 
 	/**
 	 * Get the number of rows in a result object
+	 * @param $res Mixed: A SQL result
 	 */
 	function numRows( $res ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -773,6 +802,7 @@ class Database {
 	/**
 	 * Get the number of fields in a result object
 	 * See documentation for mysql_num_fields()
+	 * @param $res Mixed: A SQL result
 	 */
 	function numFields( $res ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -785,6 +815,8 @@ class Database {
 	 * Get a field name in a result object
 	 * See documentation for mysql_field_name():
 	 * http://www.php.net/mysql_field_name
+	 * @param $res Mixed: A SQL result
+	 * @param $n Integer
 	 */
 	function fieldName( $res, $n ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -808,6 +840,8 @@ class Database {
 	/**
 	 * Change the position of the cursor in a result object
 	 * See mysql_data_seek()
+	 * @param $res Mixed: A SQL result
+	 * @param $row Mixed: Either MySQL row or ResultWrapper
 	 */
 	function dataSeek( $res, $row ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -854,7 +888,6 @@ class Database {
 	 * See mysql_affected_rows() for more details
 	 */
 	function affectedRows() { return mysql_affected_rows( $this->mConn ); }
-	/**#@-*/ // end of template : @param $result
 
 	/**
 	 * Simple UPDATE wrapper
@@ -864,8 +897,7 @@ class Database {
 	 * This function exists for historical reasons, Database::update() has a more standard
 	 * calling convention and feature set
 	 */
-	function set( $table, $var, $value, $cond, $fname = 'Database::set' )
-	{
+	function set( $table, $var, $value, $cond, $fname = 'Database::set' ) {
 		$table = $this->tableName( $table );
 		$sql = "UPDATE $table SET $var = '" .
 		  $this->strencode( $value ) . "' WHERE ($cond)";
@@ -890,7 +922,7 @@ class Database {
 		$row = $this->fetchRow( $res );
 		if ( $row !== false ) {
 			$this->freeResult( $res );
-			return $row[0];
+			return reset( $row );
 		} else {
 			return false;
 		}
@@ -902,9 +934,9 @@ class Database {
 	 *
 	 * @private
 	 *
-	 * @param array $options an associative array of options to be turned into
+	 * @param $options Array: associative array of options to be turned into
 	 *              an SQL query, valid keys are listed in the function.
-	 * @return array
+	 * @return Array
 	 */
 	function makeSelectOptions( $options ) {
 		$preLimitTail = $postLimitTail = '';
@@ -953,14 +985,14 @@ class Database {
 	/**
 	 * SELECT wrapper
 	 *
-	 * @param mixed  $table   Array or string, table name(s) (prefix auto-added)
-	 * @param mixed  $vars    Array or string, field name(s) to be retrieved
-	 * @param mixed  $conds   Array or string, condition(s) for WHERE
-	 * @param string $fname   Calling function name (use __METHOD__) for logs/profiling
-	 * @param array  $options Associative array of options (e.g. array('GROUP BY' => 'page_title')),
-	 *                        see Database::makeSelectOptions code for list of supported stuff
-	 * @param array $join_conds Associative array of table join conditions (optional)
-	 *                        (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') )
+	 * @param $table   Mixed:  Array or string, table name(s) (prefix auto-added)
+	 * @param $vars    Mixed:  Array or string, field name(s) to be retrieved
+	 * @param $conds   Mixed:  Array or string, condition(s) for WHERE
+	 * @param $fname   String: Calling function name (use __METHOD__) for logs/profiling
+	 * @param $options Array:  Associative array of options (e.g. array('GROUP BY' => 'page_title')),
+	 *                         see Database::makeSelectOptions code for list of supported stuff
+	 * @param $join_conds Array: Associative array of table join conditions (optional)
+	 *                           (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') )
 	 * @return mixed Database result resource (feed to Database::fetchObject or whatever), or false on failure
 	 */
 	function select( $table, $vars, $conds='', $fname = 'Database::select', $options = array(), $join_conds = array() )
@@ -972,14 +1004,14 @@ class Database {
 	/**
 	 * SELECT wrapper
 	 *
-	 * @param mixed  $table   Array or string, table name(s) (prefix auto-added)
-	 * @param mixed  $vars    Array or string, field name(s) to be retrieved
-	 * @param mixed  $conds   Array or string, condition(s) for WHERE
-	 * @param string $fname   Calling function name (use __METHOD__) for logs/profiling
-	 * @param array  $options Associative array of options (e.g. array('GROUP BY' => 'page_title')),
-	 *                        see Database::makeSelectOptions code for list of supported stuff
-	 * @param array $join_conds Associative array of table join conditions (optional)
-	 *                        (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') )
+	 * @param $table   Mixed:  Array or string, table name(s) (prefix auto-added)
+	 * @param $vars    Mixed:  Array or string, field name(s) to be retrieved
+	 * @param $conds   Mixed:  Array or string, condition(s) for WHERE
+	 * @param $fname   String: Calling function name (use __METHOD__) for logs/profiling
+	 * @param $options Array:  Associative array of options (e.g. array('GROUP BY' => 'page_title')),
+	 *                         see Database::makeSelectOptions code for list of supported stuff
+	 * @param $join_conds Array: Associative array of table join conditions (optional)
+	 *                           (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') )
 	 * @return string, the SQL text
 	 */
 	function selectSQLText( $table, $vars, $conds='', $fname = 'Database::select', $options = array(), $join_conds = array() ) {
@@ -1030,13 +1062,17 @@ class Database {
 	 * Single row SELECT wrapper
 	 * Aborts or returns FALSE on error
 	 *
-	 * $vars: the selected variables
-	 * $conds: a condition map, terms are ANDed together.
+	 * @param $table String: table name
+	 * @param $vars String: the selected variables
+	 * @param $conds Array: a condition map, terms are ANDed together.
 	 *   Items with numeric keys are taken to be literal conditions
 	 * Takes an array of selected variables, and a condition map, which is ANDed
 	 * e.g: selectRow( "page", array( "page_id" ), array( "page_namespace" =>
 	 * NS_MAIN, "page_title" => "Astronomy" ) )   would return an object where
 	 * $obj- >page_id is the ID of the Astronomy article
+	 * @param $fname String: Calling functio name
+	 * @param $options Array
+	 * @param $join_conds Array
 	 *
 	 * @todo migrate documentation to phpdocumentor format
 	 */
@@ -1086,8 +1122,7 @@ class Database {
 	 * Removes most variables from an SQL query and replaces them with X or N for numbers.
 	 * It's only slightly flawed. Don't use for anything important.
 	 *
-	 * @param string $sql A SQL Query
-	 * @static
+	 * @param $sql String: A SQL Query
 	 */
 	static function generalizeSQL( $sql ) {
 		# This does the same as the regexp below would do, but in such a way
@@ -1280,7 +1315,7 @@ class Database {
 	 * Make UPDATE options for the Database::update function
 	 *
 	 * @private
-	 * @param array $options The options passed to Database::update
+	 * @param $options Array: The options passed to Database::update
 	 * @return string
 	 */
 	function makeUpdateOptions( $options ) {
@@ -1298,14 +1333,14 @@ class Database {
 	/**
 	 * UPDATE wrapper, takes a condition array and a SET array
 	 *
-	 * @param string $table  The table to UPDATE
-	 * @param array  $values An array of values to SET
-	 * @param array  $conds  An array of conditions (WHERE). Use '*' to update all rows.
-	 * @param string $fname  The Class::Function calling this function
-	 *                       (for the log)
-	 * @param array  $options An array of UPDATE options, can be one or
+	 * @param $table  String: The table to UPDATE
+	 * @param $values Array:  An array of values to SET
+	 * @param $conds  Array:  An array of conditions (WHERE). Use '*' to update all rows.
+	 * @param $fname  String: The Class::Function calling this function
+	 *                        (for the log)
+	 * @param $options Array: An array of UPDATE options, can be one or
 	 *                        more of IGNORE, LOW_PRIORITY
-	 * @return bool
+	 * @return Boolean
 	 */
 	function update( $table, $values, $conds, $fname = 'Database::update', $options = array() ) {
 		$table = $this->tableName( $table );
@@ -1410,8 +1445,8 @@ class Database {
 	 * themselves. Pass the canonical name to such functions. This is only needed
 	 * when calling query() directly.
 	 *
-	 * @param string $name database table name
-	 * @return string full database name
+	 * @param $name String: database table name
+	 * @return String: full database name
 	 */
 	function tableName( $name ) {
 		global $wgSharedDB, $wgSharedPrefix, $wgSharedTables;
@@ -1540,8 +1575,8 @@ class Database {
 
 	/**
 	 * Wrapper for addslashes()
-	 * @param string $s String to be slashed.
-	 * @return string slashed string.
+	 * @param $s String: to be slashed.
+	 * @return String: slashed string.
 	 */
 	function strencode( $s ) {
 		return mysql_real_escape_string( $s, $this->mConn );
@@ -1632,11 +1667,12 @@ class Database {
 	 *
 	 * DO NOT put the join condition in $conds
 	 *
-	 * @param string $delTable The table to delete from.
-	 * @param string $joinTable The other table.
-	 * @param string $delVar The variable to join on, in the first table.
-	 * @param string $joinVar The variable to join on, in the second table.
-	 * @param array $conds Condition array of field names mapped to variables, ANDed together in the WHERE clause
+	 * @param $delTable String: The table to delete from.
+	 * @param $joinTable String: The other table.
+	 * @param $delVar String: The variable to join on, in the first table.
+	 * @param $joinVar String: The variable to join on, in the second table.
+	 * @param $conds Array: Condition array of field names mapped to variables, ANDed together in the WHERE clause
+	 * @param $fname String: Calling function name (use __METHOD__) for logs/profiling
 	 */
 	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'Database::deleteJoin' ) {
 		if ( !$conds ) {
@@ -1732,9 +1768,9 @@ class Database {
 	/**
 	 * Construct a LIMIT query with optional offset
 	 * This is used for query pages
-	 * $sql string SQL query we will append the limit too
-	 * $limit integer the SQL limit
-	 * $offset integer the SQL offset (default false)
+	 * @param $sql String: SQL query we will append the limit too
+	 * @param $limit Integer: the SQL limit
+	 * @param $offset Integer the SQL offset (default false)
 	 */
 	function limitResult($sql, $limit, $offset=false) {
 		if( !is_numeric($limit) ) {
@@ -1752,10 +1788,10 @@ class Database {
 	 * Returns an SQL expression for a simple conditional.
 	 * Uses IF on MySQL.
 	 *
-	 * @param string $cond SQL expression which will result in a boolean value
-	 * @param string $trueVal SQL expression to return if true
-	 * @param string $falseVal SQL expression to return if false
-	 * @return string SQL fragment
+	 * @param $cond String: SQL expression which will result in a boolean value
+	 * @param $trueVal String: SQL expression to return if true
+	 * @param $falseVal String: SQL expression to return if false
+	 * @return String: SQL fragment
 	 */
 	function conditional( $cond, $trueVal, $falseVal ) {
 		return " IF($cond, $trueVal, $falseVal) ";
@@ -1765,9 +1801,9 @@ class Database {
 	 * Returns a comand for str_replace function in SQL query.
 	 * Uses REPLACE() in MySQL
 	 *
-	 * @param string $orig String or column to modify
-	 * @param string $old String or column to seek
-	 * @param string $new String or column to replace with
+	 * @param $orig String: column to modify
+	 * @param $old String: column to seek
+	 * @param $new String: column to replace with
 	 */
 	function strreplace( $orig, $old, $new ) {
 		return "REPLACE({$orig}, {$old}, {$new})";
@@ -1838,9 +1874,8 @@ class Database {
 	/**
 	 * Do a SELECT MASTER_POS_WAIT()
 	 *
-	 * @param string $file the binlog file
-	 * @param string $pos the binlog position
-	 * @param integer $timeout the maximum number of seconds to wait for synchronisation
+	 * @param $pos MySQLMasterPos object
+	 * @param $timeout Integer: the maximum number of seconds to wait for synchronisation
 	 */
 	function masterPosWait( MySQLMasterPos $pos, $timeout ) {
 		$fname = 'Database::masterPosWait';
@@ -1896,7 +1931,8 @@ class Database {
 		$res = $this->query( 'SHOW SLAVE STATUS', 'Database::getSlavePos' );
 		$row = $this->fetchObject( $res );
 		if ( $row ) {
-			return new MySQLMasterPos( $row->Master_Log_File, $row->Read_Master_Log_Pos );
+			$pos = isset($row->Exec_master_log_pos) ? $row->Exec_master_log_pos : $row->Exec_Master_Log_Pos;
+			return new MySQLMasterPos( $row->Relay_Master_Log_File, $pos );
 		} else {
 			return false;
 		}
@@ -2001,14 +2037,14 @@ class Database {
 	}
 
 	/**
-	 * @return string wikitext of a link to the server software's web site
+	 * @return String: wikitext of a link to the server software's web site
 	 */
 	function getSoftwareLink() {
 		return "[http://www.mysql.com/ MySQL]";
 	}
 
 	/**
-	 * @return string Version information from the database
+	 * @return String: Version information from the database
 	 */
 	function getServerVersion() {
 		return mysql_get_server_info( $this->mConn );
@@ -2106,7 +2142,7 @@ class Database {
 	 * May be useful for very long batch queries such as
 	 * full-wiki dumps, where a single query reads out
 	 * over hours or days.
-	 * @param int $timeout in seconds
+	 * @param $timeout Integer in seconds
 	 */
 	public function setTimeout( $timeout ) {
 		$this->query( "SET net_read_timeout=$timeout" );
@@ -2116,9 +2152,9 @@ class Database {
 	/**
 	 * Read and execute SQL commands from a file.
 	 * Returns true on success, error string or exception on failure (depending on object's error ignore settings)
-	 * @param string $filename File name to open
-	 * @param callback $lineCallback Optional function called before reading each line
-	 * @param callback $resultCallback Optional function called for each MySQL result
+	 * @param $filename String: File name to open
+	 * @param $lineCallback Callback: Optional function called before reading each line
+	 * @param $resultCallback Callback: Optional function called for each MySQL result
 	 */
 	function sourceFile( $filename, $lineCallback = false, $resultCallback = false ) {
 		$fp = fopen( $filename, 'r' );
@@ -2133,9 +2169,9 @@ class Database {
 	/**
 	 * Read and execute commands from an open file handle
 	 * Returns true on success, error string or exception on failure (depending on object's error ignore settings)
-	 * @param string $fp File handle
-	 * @param callback $lineCallback Optional function called before reading each line
-	 * @param callback $resultCallback Optional function called for each MySQL result
+	 * @param $fp String: File handle
+	 * @param $lineCallback Callback: Optional function called before reading each line
+	 * @param $resultCallback Callback: Optional function called for each MySQL result
 	 */
 	function sourceStream( $fp, $lineCallback = false, $resultCallback = false ) {
 		$cmd = "";
@@ -2177,7 +2213,7 @@ class Database {
 				$cmd = $this->replaceVars( $cmd );
 				$res = $this->query( $cmd, __METHOD__ );
 				if ( $resultCallback ) {
-					call_user_func( $resultCallback, $res );
+					call_user_func( $resultCallback, $res, $this );
 				}
 
 				if ( false === $res ) {
@@ -2240,8 +2276,8 @@ class Database {
 	 * Abstracted from Filestore::lock() so child classes can implement for
 	 * their own needs.
 	 * 
-	 * @param string $lockName Name of lock to aquire
-	 * @param string $method Name of method calling us
+	 * @param $lockName String: Name of lock to aquire
+	 * @param $method String: Name of method calling us
 	 * @return bool
 	 */
 	public function lock( $lockName, $method ) {
@@ -2263,14 +2299,24 @@ class Database {
 	 * @todo fixme - Figure out a way to return a bool
 	 * based on successful lock release.
 	 * 
-	 * @param string $lockName Name of lock to release
-	 * @param string $method Name of method calling us
+	 * @param $lockName String: Name of lock to release
+	 * @param $method String: Name of method calling us
 	 */
 	public function unlock( $lockName, $method ) {
 		$lockName = $this->addQuotes( $lockName );
 		$result = $this->query( "SELECT RELEASE_LOCK($lockName)", $method );
 		$this->freeResult( $result );
 	}
+	
+	/**
+	 * Get search engine class. All subclasses of this
+	 * need to implement this if they wish to use searching.
+	 * 
+	 * @return String
+	 */
+	public function getSearchEngine() {
+		return "SearchMySQL";
+	}
 }
 
 /**
@@ -2390,8 +2436,8 @@ class DBError extends MWException {
 
 	/**
 	 * Construct a database error
-	 * @param Database $db The database object which threw the error
-	 * @param string $error A simple error message to be used for debugging
+	 * @param $db Database object which threw the error
+	 * @param $error A simple error message to be used for debugging
 	 */
 	function __construct( Database &$db, $error ) {
 		$this->db =& $db;
@@ -2483,7 +2529,13 @@ border=\"0\" ALT=\"Google\"></A>
 		}
 
 		$text = str_replace( '$1', $this->error, $noconnect );
-		$text .= wfGetSiteNotice();
+
+		/*
+		if ( $GLOBALS['wgShowExceptionDetails'] ) {
+			$text .= '</p><p>Backtrace:</p><p>' . 
+				nl2br( htmlspecialchars( $this->getTraceAsString() ) ) . 
+				"</p>\n";
+		}*/
 
 		if($wgUseFileCache) {
 			if($wgTitle) {
@@ -2504,13 +2556,13 @@ border=\"0\" ALT=\"Google\"></A>
 			$cache = new HTMLFileCache( $t );
 			if( $cache->isFileCached() ) {
 				// @todo, FIXME: $msg is not defined on the next line.
-				$msg = '<p style="color: red"><b>'.$msg."<br />\n" .
+				$msg = '<p style="color: red"><b>'.$text."<br />\n" .
 					$cachederror . "</b></p>\n";
 
 				$tag = '<div id="article">';
 				$text = str_replace(
 					$tag,
-					$tag . $msg,
+					$tag . $text,
 					$cache->fetchPageText() );
 			}
 		}
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 32fe28b1..28ccab2d 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -105,7 +105,7 @@ class DatabaseMssql extends Database {
 				$success = @/**/mssql_select_db($dbName, $this->mConn);
 				if (!$success) {
 					$error = "Error selecting database $dbName on server {$this->mServer} " .
-						"from client host {$wguname['nodename']}\n";
+						"from client host " . wfHostname() . "\n";
 					wfLogDBError(" Error selecting database $dbName on server {$this->mServer} \n");
 					wfDebug( $error );
 				}
@@ -154,9 +154,6 @@ class DatabaseMssql extends Database {
 		return $ret;
 	}
 
-	/**#@+
-	 * @param mixed $res A SQL result
-	 */
 	/**
 	 * Free a result object
 	 */
@@ -225,6 +222,7 @@ class DatabaseMssql extends Database {
 	/**
 	 * Get the number of fields in a result object
 	 * See documentation for mysql_num_fields()
+	 * @param $res SQL result object as returned from Database::query(), etc.
 	 */
 	function numFields( $res ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -237,6 +235,8 @@ class DatabaseMssql extends Database {
 	 * Get a field name in a result object
 	 * See documentation for mysql_field_name():
 	 * http://www.php.net/mysql_field_name
+	 * @param $res SQL result object as returned from Database::query(), etc.
+	 * @param $n Int
 	 */
 	function fieldName( $res, $n ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -263,6 +263,8 @@ class DatabaseMssql extends Database {
 	/**
 	 * Change the position of the cursor in a result object
 	 * See mysql_data_seek()
+	 * @param $res SQL result object as returned from Database::query(), etc.
+	 * @param $row Database row
 	 */
 	function dataSeek( $res, $row ) {
 		if ( $res instanceof ResultWrapper ) {
@@ -339,7 +341,7 @@ class DatabaseMssql extends Database {
 	 *
 	 * @private
 	 *
-	 * @param array $options an associative array of options to be turned into
+	 * @param $options Array: an associative array of options to be turned into
 	 *              an SQL query, valid keys are listed in the function.
 	 * @return array
 	 */
@@ -390,11 +392,11 @@ class DatabaseMssql extends Database {
 	/**
 	 * SELECT wrapper
 	 *
-	 * @param mixed  $table   Array or string, table name(s) (prefix auto-added)
-	 * @param mixed  $vars    Array or string, field name(s) to be retrieved
-	 * @param mixed  $conds   Array or string, condition(s) for WHERE
-	 * @param string $fname   Calling function name (use __METHOD__) for logs/profiling
-	 * @param array  $options Associative array of options (e.g. array('GROUP BY' => 'page_title')),
+	 * @param $table   Mixed: Array or string, table name(s) (prefix auto-added)
+	 * @param $vars    Mixed: Array or string, field name(s) to be retrieved
+	 * @param $conds   Mixed: Array or string, condition(s) for WHERE
+	 * @param $fname   String: Calling function name (use __METHOD__) for logs/profiling
+	 * @param $options Array: Associative array of options (e.g. array('GROUP BY' => 'page_title')),
 	 *                        see Database::makeSelectOptions code for list of supported stuff
 	 * @return mixed Database result resource (feed to Database::fetchObject or whatever), or false on failure
 	 */
@@ -643,12 +645,12 @@ class DatabaseMssql extends Database {
 	/**
 	 * UPDATE wrapper, takes a condition array and a SET array
 	 *
-	 * @param string $table  The table to UPDATE
-	 * @param array  $values An array of values to SET
-	 * @param array  $conds  An array of conditions (WHERE). Use '*' to update all rows.
-	 * @param string $fname  The Class::Function calling this function
-	 *                       (for the log)
-	 * @param array  $options An array of UPDATE options, can be one or
+	 * @param $table   String: The table to UPDATE
+	 * @param $values  Array: An array of values to SET
+	 * @param $conds   Array: An array of conditions (WHERE). Use '*' to update all rows.
+	 * @param $fname   String: The Class::Function calling this function
+	 *                        (for the log)
+	 * @param $options Array: An array of UPDATE options, can be one or
 	 *                        more of IGNORE, LOW_PRIORITY
 	 * @return bool
 	 */
@@ -666,7 +668,7 @@ class DatabaseMssql extends Database {
 	 * Make UPDATE options for the Database::update function
 	 *
 	 * @private
-	 * @param array $options The options passed to Database::update
+	 * @param $options Array: The options passed to Database::update
 	 * @return string
 	 */
 	function makeUpdateOptions( $options ) {
@@ -698,7 +700,7 @@ class DatabaseMssql extends Database {
 
 	/**
 	 * MSSQL doubles quotes instead of escaping them
-	 * @param string $s String to be slashed.
+	 * @param $s String to be slashed.
 	 * @return string slashed string.
 	 */
 	function strencode($s) {
@@ -755,11 +757,12 @@ class DatabaseMssql extends Database {
 	 *
 	 * DO NOT put the join condition in $conds
 	 *
-	 * @param string $delTable The table to delete from.
-	 * @param string $joinTable The other table.
-	 * @param string $delVar The variable to join on, in the first table.
-	 * @param string $joinVar The variable to join on, in the second table.
-	 * @param array $conds Condition array of field names mapped to variables, ANDed together in the WHERE clause
+	 * @param $delTable String: The table to delete from.
+	 * @param $joinTable String: The other table.
+	 * @param $delVar String: The variable to join on, in the first table.
+	 * @param $joinVar String: The variable to join on, in the second table.
+	 * @param $conds Array: Condition array of field names mapped to variables, ANDed together in the WHERE clause
+	 * @param $fname String: Calling function name
 	 */
 	function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'Database::deleteJoin' ) {
 		if ( !$conds ) {
@@ -857,9 +860,9 @@ class DatabaseMssql extends Database {
 	/**
 	 * Returns an SQL expression for a simple conditional.
 	 *
-	 * @param string $cond SQL expression which will result in a boolean value
-	 * @param string $trueVal SQL expression to return if true
-	 * @param string $falseVal SQL expression to return if false
+	 * @param $cond String: SQL expression which will result in a boolean value
+	 * @param $trueVal String: SQL expression to return if true
+	 * @param $falseVal String: SQL expression to return if false
 	 * @return string SQL fragment
 	 */
 	function conditional( $cond, $trueVal, $falseVal ) {
@@ -1007,6 +1010,10 @@ class DatabaseMssql extends Database {
 	public function unlock( $lockName, $method ) {
 		return true;
 	}
+	
+	public function getSearchEngine() {
+		return "SearchEngineDummy";
+	}
 
 }
 
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index f4dbac71..4c37a507 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -509,10 +509,10 @@ class DatabaseOracle extends Database {
 	 * Returns an SQL expression for a simple conditional.
 	 * Uses CASE on Oracle
 	 *
-	 * @param string $cond SQL expression which will result in a boolean value
-	 * @param string $trueVal SQL expression to return if true
-	 * @param string $falseVal SQL expression to return if false
-	 * @return string SQL fragment
+	 * @param $cond String: SQL expression which will result in a boolean value
+	 * @param $trueVal String: SQL expression to return if true
+	 * @param $falseVal String: SQL expression to return if false
+	 * @return String: SQL fragment
 	 */
 	function conditional( $cond, $trueVal, $falseVal ) {
 		return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
@@ -640,7 +640,7 @@ echo "error!\n";
 	 *
 	 * @private
 	 *
-	 * @param array $options an associative array of options to be turned into
+	 * @param $options Array: an associative array of options to be turned into
 	 *              an SQL query, valid keys are listed in the function.
 	 * @return array
 	 */
@@ -716,5 +716,9 @@ echo "error!\n";
 	public function unlock( $lockName, $method ) {
 		return true;
 	}
+	
+	public function getSearchEngine() {
+		return "SearchOracle";
+	}
 
 } // end DatabaseOracle class
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 8fd04cb6..16a74b53 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -78,12 +78,6 @@ class DatabasePostgres extends Database {
 		$failFunction = false, $flags = 0 )
 	{
 
-		global $wgOut;
-		# Can't get a reference if it hasn't been set yet
-		if ( !isset( $wgOut ) ) {
-			$wgOut = NULL;
-		}
-		$this->mOut =& $wgOut;
 		$this->mFailFunction = $failFunction;
 		$this->mFlags = $flags;
 		$this->open( $server, $user, $password, $dbName);
@@ -138,10 +132,9 @@ class DatabasePostgres extends Database {
 
 		global $wgDBport;
 
-		if (!strlen($user)) { ## e.g. the class is being loaded
-			return;
+		if (!strlen($user)) { ## e.g. the class is being loaded  
+			return;  
 		}
-
 		$this->close();
 		$this->mServer = $server;
 		$this->mPort = $port = $wgDBport;
@@ -149,22 +142,31 @@ class DatabasePostgres extends Database {
 		$this->mPassword = $password;
 		$this->mDBname = $dbName;
 
-		$hstring="";
+		$connectVars = array(
+			'dbname' => $dbName,
+			'user' => $user,
+			'password' => $password );
 		if ($server!=false && $server!="") {
-			$hstring="host=$server ";
+			$connectVars['host'] = $server;
 		}
 		if ($port!=false && $port!="") {
-			$hstring .= "port=$port ";
+			$connectVars['port'] = $port;
 		}
+		$connectString = $this->makeConnectionString( $connectVars );
 
-		error_reporting( E_ALL );
-		@$this->mConn = pg_connect("$hstring dbname=$dbName user=$user password=$password");
+		$this->installErrorHandler();
+		$this->mConn = pg_connect( $connectString );
+		$phpError = $this->restoreErrorHandler();
 
 		if ( $this->mConn == false ) {
 			wfDebug( "DB connection error\n" );
 			wfDebug( "Server: $server, Database: $dbName, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n" );
 			wfDebug( $this->lastError()."\n" );
-			return false;
+			if ( !$this->mFailFunction ) {
+				throw new DBConnectionError( $this, $phpError );
+			} else {
+				return false;
+			}
 		}
 
 		$this->mOpened = true;
@@ -189,6 +191,14 @@ class DatabasePostgres extends Database {
 		return $this->mConn;
 	}
 
+	function makeConnectionString( $vars ) {
+		$s = '';
+		foreach ( $vars as $name => $value ) {
+			$s .= "$name='" . str_replace( "'", "\\'", $value ) . "' ";
+		}
+		return $s;
+	}
+
 
 	function initial_setup($password, $dbName) {
 		// If this is the initial connection, setup the schema stuff and possibly create the user
@@ -197,9 +207,8 @@ class DatabasePostgres extends Database {
 		print "<li>Checking the version of Postgres...";
 		$version = $this->getServerVersion();
 		$PGMINVER = '8.1';
-		if ($this->numeric_version < $PGMINVER) {
-			print "<b>FAILED</b>. Required version is $PGMINVER. You have " . 
-				htmlspecialchars( $this->numeric_version ) . " (" . htmlspecialchars( $version ) . ")</li>\n";
+		if ($version < $PGMINVER) {
+			print "<b>FAILED</b>. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "</li>\n";
 			dieout("</ul>");
 		}
 		print "version " . htmlspecialchars( $this->numeric_version ) . " is OK.</li>\n";
@@ -730,10 +739,10 @@ class DatabasePostgres extends Database {
 	 * $args may be a single associative array, or an array of these with numeric keys,
 	 * for multi-row insert (Postgres version 8.2 and above only).
 	 *
-	 * @param array $table   String: Name of the table to insert to.
-	 * @param array $args    Array: Items to insert into the table.
-	 * @param array $fname   String: Name of the function, for profiling
-	 * @param mixed $options String or Array. Valid options: IGNORE
+	 * @param $table   String: Name of the table to insert to.
+	 * @param $args    Array: Items to insert into the table.
+	 * @param $fname   String: Name of the function, for profiling
+	 * @param $options String or Array. Valid options: IGNORE
 	 *
 	 * @return bool Success of insert operation. IGNORE always returns true.
 	 */
@@ -746,8 +755,7 @@ class DatabasePostgres extends Database {
 
 		$table = $this->tableName( $table );
 		if (! isset( $wgDBversion ) ) {
-			$this->getServerVersion();
-			$wgDBversion = $this->numeric_version;
+			$wgDBversion = $this->getServerVersion();
 		}
 
 		if ( !is_array( $options ) )
@@ -1009,10 +1017,10 @@ class DatabasePostgres extends Database {
 	 * Returns an SQL expression for a simple conditional.
 	 * Uses CASE on Postgres
 	 *
-	 * @param string $cond SQL expression which will result in a boolean value
-	 * @param string $trueVal SQL expression to return if true
-	 * @param string $falseVal SQL expression to return if false
-	 * @return string SQL fragment
+	 * @param $cond String: SQL expression which will result in a boolean value
+	 * @param $trueVal String: SQL expression to return if true
+	 * @param $falseVal String: SQL expression to return if false
+	 * @return String: SQL fragment
 	 */
 	function conditional( $cond, $trueVal, $falseVal ) {
 		return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
@@ -1055,7 +1063,7 @@ class DatabasePostgres extends Database {
 	/**
 	 * @return string wikitext of a link to the server software's web site
 	 */
-		function getSoftwareLink() {
+	function getSoftwareLink() {
 		return "[http://www.postgresql.org/ PostgreSQL]";
 	}
 
@@ -1063,16 +1071,17 @@ class DatabasePostgres extends Database {
 	 * @return string Version information from the database
 	 */
 	function getServerVersion() {
-		$version = pg_fetch_result($this->doQuery("SELECT version()"),0,0);
-		$thisver = array();
-		if (!preg_match('/PostgreSQL (\d+\.\d+)(\S+)/', $version, $thisver)) {
-			die("Could not determine the numeric version from $version!");
+		$versionInfo = pg_version( $this->mConn );
+		if ( isset( $versionInfo['server'] ) ) {
+			$this->numeric_version = $versionInfo['server'];
+		} else {
+			// There's no way to identify the precise version before 7.4, but 
+			// it doesn't matter anyway since we're just going to give an error.
+			$this->numeric_version = '7.3 or earlier';
 		}
-		$this->numeric_version = $thisver[1];
-		return $version;
+		return $this->numeric_version;
 	}
 
-
 	/**
 	 * Query whether a given relation exists (in the given schema, or the
 	 * default mw one if not given)
@@ -1319,7 +1328,7 @@ END;
 	 *
 	 * @private
 	 *
-	 * @param string $com SQL string, read from a stream (usually tables.sql)
+	 * @param $ins String: SQL string, read from a stream (usually tables.sql)
 	 *
 	 * @return string SQL string
 	 */
@@ -1344,7 +1353,7 @@ END;
 	 *
 	 * @private
 	 *
-	 * @param array $options an associative array of options to be turned into
+	 * @param $options Array: an associative array of options to be turned into
 	 *              an SQL query, valid keys are listed in the function.
 	 * @return array
 	 */
@@ -1417,5 +1426,9 @@ END;
 	public function unlock( $lockName, $method ) {
 		return true;
 	}
+	
+	public function getSearchEngine() {
+		return "SearchPostgres";
+	}
 
 } // end DatabasePostgres class
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 112c417b..dfc506cc 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -20,11 +20,9 @@ class DatabaseSqlite extends Database {
 	 * Constructor
 	 */
 	function __construct($server = false, $user = false, $password = false, $dbName = false, $failFunction = false, $flags = 0) {
-		global $wgOut,$wgSQLiteDataDir;
+		global $wgOut,$wgSQLiteDataDir, $wgSQLiteDataDirMode;
 		if ("$wgSQLiteDataDir" == '') $wgSQLiteDataDir = dirname($_SERVER['DOCUMENT_ROOT']).'/data';
-		if (!is_dir($wgSQLiteDataDir)) mkdir($wgSQLiteDataDir,0700);
-		if (!isset($wgOut)) $wgOut = NULL; # Can't get a reference if it hasn't been set yet
-		$this->mOut =& $wgOut;
+		if (!is_dir($wgSQLiteDataDir)) wfMkdirParents( $wgSQLiteDataDir, $wgSQLiteDataDirMode );
 		$this->mFailFunction = $failFunction;
 		$this->mFlags = $flags;
 		$this->mDatabaseFile = "$wgSQLiteDataDir/$dbName.sqlite";
@@ -48,11 +46,28 @@ class DatabaseSqlite extends Database {
 		$this->mConn = false;
 		if ($dbName) {
 			$file = $this->mDatabaseFile;
-			if ($this->mFlags & DBO_PERSISTENT) $this->mConn = new PDO("sqlite:$file",$user,$pass,array(PDO::ATTR_PERSISTENT => true));
-			else $this->mConn = new PDO("sqlite:$file",$user,$pass);
-			if ($this->mConn === false) wfDebug("DB connection error: $err\n");;
+			try {
+				if ( $this->mFlags & DBO_PERSISTENT ) {
+					$this->mConn = new PDO( "sqlite:$file", $user, $pass, 
+						array( PDO::ATTR_PERSISTENT => true ) );
+				} else {
+					$this->mConn = new PDO( "sqlite:$file", $user, $pass );
+				}
+			} catch ( PDOException $e ) {
+				$err = $e->getMessage();
+			}
+			if ( $this->mConn === false ) {
+				wfDebug( "DB connection error: $err\n" );
+				if ( !$this->mFailFunction ) {
+					throw new DBConnectionError( $this, $err );
+				} else {
+					return false;
+				}
+
+			}
 			$this->mOpened = $this->mConn;
-			$this->mConn->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT); # set error codes only, dont raise exceptions
+			# set error codes only, don't raise exceptions
+			$this->mConn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT ); 
 		}
 		return $this->mConn;
 	}
@@ -390,7 +405,19 @@ class DatabaseSqlite extends Database {
 	public function unlock( $lockName, $method ) {
 		return true;
 	}
+	
+	public function getSearchEngine() {
+		return "SearchEngineDummy";
+	}
 
+	/**
+	 * No-op version of deadlockLoop
+	 */
+	public function deadlockLoop( /*...*/ ) {
+		$args = func_get_args();
+		$function = array_shift( $args );
+		return call_user_func_array( $function, $args );
+	}
 }
 
 /**
diff --git a/includes/db/LBFactory_Multi.php b/includes/db/LBFactory_Multi.php
index 48c2d99b..820aa2ea 100644
--- a/includes/db/LBFactory_Multi.php
+++ b/includes/db/LBFactory_Multi.php
@@ -36,6 +36,8 @@
  *
  *     masterTemplateOverrides     An override array for all master servers.
  *
+ *     readOnlyBySection           A map of section name to read-only message. Missing or false for read/write.
+ *
  * @ingroup Database
  */
 class LBFactory_Multi extends LBFactory {
@@ -44,7 +46,7 @@ class LBFactory_Multi extends LBFactory {
 	// Optional settings
 	var $groupLoadsBySection = array(), $groupLoadsByDB = array(), $hostsByName = array();
 	var $externalLoads = array(), $externalTemplateOverrides, $templateOverridesByServer;
-	var $templateOverridesByCluster, $masterTemplateOverrides;
+	var $templateOverridesByCluster, $masterTemplateOverrides, $readOnlyBySection = array();
 	// Other stuff
 	var $conf, $mainLBs = array(), $extLBs = array();
 	var $lastWiki, $lastSection;
@@ -55,7 +57,8 @@ class LBFactory_Multi extends LBFactory {
 		$required = array( 'sectionsByDB', 'sectionLoads', 'serverTemplate' );
 		$optional = array( 'groupLoadsBySection', 'groupLoadsByDB', 'hostsByName',
 			'externalLoads', 'externalTemplateOverrides', 'templateOverridesByServer',
-			'templateOverridesByCluster', 'masterTemplateOverrides' );
+			'templateOverridesByCluster', 'masterTemplateOverrides', 
+			'readOnlyBySection' );
 
 		foreach ( $required as $key ) {
 			if ( !isset( $conf[$key] ) ) {
@@ -69,6 +72,13 @@ class LBFactory_Multi extends LBFactory {
 				$this->$key = $conf[$key];
 			}
 		}
+
+		// Check for read-only mode
+		$section = $this->getSectionForWiki();
+		if ( !empty( $this->readOnlyBySection[$section] ) ) {
+			global $wgReadOnly;
+			$wgReadOnly = $this->readOnlyBySection[$section];
+		}
 	}
 
 	function getSectionForWiki( $wiki = false ) {
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 42c4044d..f847fe22 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -13,7 +13,7 @@
 class LoadBalancer {
 	/* private */ var $mServers, $mConns, $mLoads, $mGroupLoads;
 	/* private */ var $mFailFunction, $mErrorConnection;
-	/* private */ var $mReadIndex, $mLastIndex, $mAllowLagged;
+	/* private */ var $mReadIndex, $mAllowLagged;
 	/* private */ var $mWaitForPos, $mWaitTimeout;
 	/* private */ var $mLaggedSlaveMode, $mLastError = 'Unknown error';
 	/* private */ var $mParentInfo, $mLagTimes;
@@ -50,7 +50,6 @@ class LoadBalancer {
 			'local' => array(),
 			'foreignUsed' => array(),
 			'foreignFree' => array() );
-		$this->mLastIndex = -1;
 		$this->mLoads = array();
 		$this->mWaitForPos = false;
 		$this->mLaggedSlaveMode = false;
@@ -399,11 +398,20 @@ class LoadBalancer {
 	/**
 	 * Get a connection by index
 	 * This is the main entry point for this class.
+	 * @param int $i Database
+	 * @param array $groups Query groups
+	 * @param string $wiki Wiki ID
 	 */
 	public function &getConnection( $i, $groups = array(), $wiki = false ) {
 		global $wgDBtype;
 		wfProfileIn( __METHOD__ );
 
+		if ( $i == DB_LAST ) {
+			throw new MWException( 'Attempt to call ' . __METHOD__ . ' with deprecated server index DB_LAST' );
+		} elseif ( $i === null || $i === false ) {
+			throw new MWException( 'Attempt to call ' . __METHOD__ . ' with invalid server index' );
+		}
+
 		if ( $wiki === wfWikiID() ) {
 			$wiki = false;
 		}
@@ -433,19 +441,13 @@ class LoadBalancer {
 		# Operation-based index
 		if ( $i == DB_SLAVE ) {
 			$i = $this->getReaderIndex( false, $wiki );
-		} elseif ( $i == DB_LAST ) {
-			# Just use $this->mLastIndex, which should already be set
-			$i = $this->mLastIndex;
-			if ( $i === -1 ) {
-				# Oh dear, not set, best to use the writer for safety
-				wfDebug( "Warning: DB_LAST used when there was no previous index\n" );
-				$i = $this->getWriterIndex();
+			# Couldn't find a working server in getReaderIndex()?
+			if ( $i === false ) {
+				$this->mLastError = 'No working slave server: ' . $this->mLastError;
+				$this->reportConnectionError( $this->mErrorConnection );
+				return false;
 			}
 		}
-		# Couldn't find a working server in getReaderIndex()?
-		if ( $i === false ) {
-			$this->reportConnectionError( $this->mErrorConnection );
-		}
 
 		# Now we have an explicit index into the servers array
 		$conn = $this->openConnection( $i, $wiki );
@@ -525,7 +527,7 @@ class LoadBalancer {
 		} else {
 			$server = $this->mServers[$i];
 			$server['serverIndex'] = $i;
-			$conn = $this->reallyOpenConnection( $server );
+			$conn = $this->reallyOpenConnection( $server, false );
 			if ( $conn->isOpen() ) {
 				$this->mConns['local'][$i][0] = $conn;
 			} else {
@@ -534,7 +536,6 @@ class LoadBalancer {
 				$conn = false;
 			}
 		}
-		$this->mLastIndex = $i;
 		wfProfileOut( __METHOD__ );
 		return $conn;
 	}
@@ -576,9 +577,8 @@ class LoadBalancer {
 			$oldWiki = key( $this->mConns['foreignFree'][$i] );
 
 			if ( !$conn->selectDB( $dbName ) ) {
-				global $wguname;
 				$this->mLastError = "Error selecting database $dbName on server " .
-					$conn->getServer() . " from client host {$wguname['nodename']}\n";
+					$conn->getServer() . " from client host " . wfHostname() . "\n";
 				$this->mErrorConnection = $conn;
 				$conn = false;
 			} else {
@@ -598,6 +598,7 @@ class LoadBalancer {
 				$this->mErrorConnection = $conn;
 				$conn = false;
 			} else {
+				$conn->tablePrefix( $prefix );
 				$this->mConns['foreignUsed'][$i][$wiki] = $conn;
 				wfDebug( __METHOD__.": opened new connection for $i/$wiki\n" );
 			}
@@ -661,31 +662,27 @@ class LoadBalancer {
 
 	function reportConnectionError( &$conn ) {
 		wfProfileIn( __METHOD__ );
-		# Prevent infinite recursion
-
-		static $reporting = false;
-		if ( !$reporting ) {
-			$reporting = true;
-			if ( !is_object( $conn ) ) {
-				// No last connection, probably due to all servers being too busy
-				$conn = new Database;
-				if ( $this->mFailFunction ) {
-					$conn->failFunction( $this->mFailFunction );
-					$conn->reportConnectionError( $this->mLastError );
-				} else {
-					// If all servers were busy, mLastError will contain something sensible
-					throw new DBConnectionError( $conn, $this->mLastError );
-				}
+
+		if ( !is_object( $conn ) ) {
+			// No last connection, probably due to all servers being too busy
+			wfLogDBError( "LB failure with no last connection\n" );
+			$conn = new Database;
+			if ( $this->mFailFunction ) {
+				$conn->failFunction( $this->mFailFunction );
+				$conn->reportConnectionError( $this->mLastError );
 			} else {
-				if ( $this->mFailFunction ) {
-					$conn->failFunction( $this->mFailFunction );
-				} else {
-					$conn->failFunction( false );
-				}
-				$server = $conn->getProperty( 'mServer' );
-				$conn->reportConnectionError( "{$this->mLastError} ({$server})" );
+				// If all servers were busy, mLastError will contain something sensible
+				throw new DBConnectionError( $conn, $this->mLastError );
+			}
+		} else {
+			if ( $this->mFailFunction ) {
+				$conn->failFunction( $this->mFailFunction );
+			} else {
+				$conn->failFunction( false );
 			}
-			$reporting = false;
+			$server = $conn->getProperty( 'mServer' );
+			wfLogDBError( "Connection error: {$this->mLastError} ({$server})\n" );
+			$conn->reportConnectionError( "{$this->mLastError} ({$server})" );
 		}
 		wfProfileOut( __METHOD__ );
 	}
diff --git a/includes/db/LoadMonitor.php b/includes/db/LoadMonitor.php
index 8e16f1a1..929ab2b9 100644
--- a/includes/db/LoadMonitor.php
+++ b/includes/db/LoadMonitor.php
@@ -64,6 +64,9 @@ class LoadMonitor_MySQL implements LoadMonitor {
 		$requestRate = 10;
 
 		global $wgMemc;
+		if ( empty( $wgMemc ) )
+			$wgMemc = wfGetMainCache();
+		
 		$masterName = $this->parent->getServerName( 0 );
 		$memcKey = wfMemcKey( 'lag_times', $masterName );
 		$times = $wgMemc->get( $memcKey );
diff --git a/includes/diff/Diff.php b/includes/diff/Diff.php
new file mode 100644
index 00000000..538c2d83
--- /dev/null
+++ b/includes/diff/Diff.php
@@ -0,0 +1,580 @@
+<?php
+/* Copyright (C) 2008 Guy Van den Broeck <guy@guyvdb.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * This diff implementation is mainly lifted from the LCS algorithm of the Eclipse project which
+ * in turn is based on Myers' "An O(ND) difference algorithm and its variations"
+ * (http://citeseer.ist.psu.edu/myers86ond.html) with range compression (see Wu et al.'s
+ * "An O(NP) Sequence Comparison Algorithm").
+ *
+ * This implementation supports an upper bound on the excution time.
+ *
+ * Complexity: O((M + N)D) worst case time, O(M + N + D^2) expected time, O(M + N) space
+ *
+ * @author Guy Van den Broeck
+ * @ingroup DifferenceEngine
+ */
+class WikiDiff3 {
+
+	//Input variables
+	private $from;
+	private $to;
+	private $m;
+	private $n;
+
+	private $tooLong;
+	private $powLimit;
+
+	//State variables
+	private $maxDifferences;
+	private $lcsLengthCorrectedForHeuristic = false;
+
+	//Output variables
+	public $length;
+	public $removed;
+	public $added;
+	public $heuristicUsed;
+
+	function __construct($tooLong = 2000000, $powLimit = 1.45){
+		$this->tooLong = $tooLong;
+		$this->powLimit = $powLimit;
+	}
+
+	public function diff(/*array*/ $from, /*array*/ $to){
+		//remember initial lengths
+		$m = sizeof($from);
+		$n = count($to);
+
+		$this->heuristicUsed = false;
+
+		//output
+		$removed = $m > 0 ? array_fill(0, $m, true) : array();
+		$added = $n > 0 ? array_fill(0, $n, true) : array();
+
+		//reduce the complexity for the next step (intentionally done twice)
+		//remove common tokens at the start
+		$i = 0;
+		while($i < $m && $i < $n && $from[$i] === $to[$i]) {
+			$removed[$i] = $added[$i] = false;
+			unset($from[$i], $to[$i]);
+			++$i;
+		}
+
+		//remove common tokens at the end
+		$j = 1;
+		while($i + $j <= $m && $i + $j <= $n && $from[$m - $j] === $to[$n - $j]) {
+			$removed[$m - $j] = $added[$n - $j] = false;
+			unset($from[$m - $j], $to[$n - $j]);
+			++$j;
+		}
+
+		$this->from = $newFromIndex = $this->to = $newToIndex = array();
+
+		//remove tokens not in both sequences
+		$shared = array();
+		foreach( $from as $key ) {
+			$shared[$key] = false;
+		}
+
+		foreach($to as $index => &$el) {
+			if(array_key_exists($el, $shared)) {
+				//keep it
+				$this->to[] = $el;
+				$shared[$el] = true;
+				$newToIndex[] = $index;
+			}
+		}
+		foreach($from as $index => &$el) {
+			if($shared[$el]) {
+				//keep it
+				$this->from[] = $el;
+				$newFromIndex[] = $index;
+			}
+		}
+
+		unset($shared, $from, $to);
+
+		$this->m = count($this->from);
+		$this->n = count($this->to);
+
+		$this->removed = $this->m > 0 ? array_fill(0, $this->m, true) : array();
+		$this->added = $this->n > 0 ? array_fill(0, $this->n, true) : array();
+
+		if ($this->m == 0 || $this->n == 0) {
+			$this->length = 0;
+		} else {
+			$this->maxDifferences = ceil(($this->m + $this->n) / 2.0);
+			if ($this->m * $this->n > $this->tooLong) {
+				// limit complexity to D^POW_LIMIT for long sequences
+				$this->maxDifferences = floor(pow($this->maxDifferences, $this->powLimit - 1.0));
+				wfDebug("Limiting max number of differences to $this->maxDifferences\n");
+			}
+
+			/*
+			 * The common prefixes and suffixes are always part of some LCS, include
+			 * them now to reduce our search space
+			 */
+			$max = min($this->m, $this->n);
+			for ($forwardBound = 0; $forwardBound < $max
+					&& $this->from[$forwardBound] === $this->to[$forwardBound];
+					++$forwardBound) {
+				$this->removed[$forwardBound] = $this->added[$forwardBound] = false;
+			}
+
+			$backBoundL1 = $this->m - 1;
+			$backBoundL2 = $this->n - 1;
+
+			while ($backBoundL1 >= $forwardBound && $backBoundL2 >= $forwardBound
+					&& $this->from[$backBoundL1] === $this->to[$backBoundL2]) {
+				$this->removed[$backBoundL1--] = $this->added[$backBoundL2--] = false;
+			}
+
+			$temp = array_fill(0, $this->m + $this->n + 1, 0);
+			$V = array($temp, $temp);
+			$snake = array(0, 0, 0);
+
+			$this->length = $forwardBound + $this->m - $backBoundL1 - 1
+				+ $this->lcs_rec($forwardBound, $backBoundL1,
+				$forwardBound, $backBoundL2, $V, $snake);
+		}
+
+		$this->m = $m;
+		$this->n = $n;
+
+		$this->length += $i + $j - 1;
+
+		foreach($this->removed as $key => &$removed_elem) {
+			if(!$removed_elem) {
+				$removed[$newFromIndex[$key]] = false;
+			}
+		}
+		foreach($this->added as $key => &$added_elem) {
+			if(!$added_elem) {
+				$added[$newToIndex[$key]] = false;
+			}
+		}
+		$this->removed = $removed;
+		$this->added = $added;
+	}
+
+	function diff_range($from_lines, $to_lines) {
+		// Diff and store locally
+		$this->diff($from_lines, $to_lines);
+		unset($from_lines, $to_lines);
+
+		$ranges = array();
+		$xi = $yi = 0;
+		while ($xi < $this->m || $yi < $this->n) {
+			// Matching "snake".
+			while ($xi < $this->m && $yi < $this->n
+					&& !$this->removed[$xi]
+					&& !$this->added[$yi]) {
+				++$xi;
+				++$yi;
+			}
+			// Find deletes & adds.
+			$xstart = $xi;
+			while ($xi < $this->m && $this->removed[$xi]) {
+				++$xi;
+			}
+
+			$ystart = $yi;
+			while ($yi < $this->n && $this->added[$yi]) {
+				++$yi;
+			}
+
+			if ($xi > $xstart || $yi > $ystart) {
+				$ranges[] = new RangeDifference($xstart, $xi,
+								$ystart, $yi);
+			}
+		}
+		return $ranges;
+	}
+
+	private function lcs_rec($bottoml1, $topl1, $bottoml2, $topl2, &$V, &$snake) {
+		// check that both sequences are non-empty
+		if ($bottoml1 > $topl1 || $bottoml2 > $topl2) {
+			return 0;
+		}
+
+		$d = $this->find_middle_snake($bottoml1, $topl1, $bottoml2,
+							$topl2, $V, $snake);
+
+		// need to store these so we don't lose them when they're
+		// overwritten by the recursion
+		$len = $snake[2];
+		$startx = $snake[0];
+		$starty = $snake[1];
+
+		// the middle snake is part of the LCS, store it
+		for ($i = 0; $i < $len; ++$i) {
+			$this->removed[$startx + $i] = $this->added[$starty + $i] = false;
+		}
+
+		if ($d > 1) {
+			return $len
+			+ $this->lcs_rec($bottoml1, $startx - 1, $bottoml2,
+							$starty - 1, $V, $snake)
+			+ $this->lcs_rec($startx + $len, $topl1, $starty + $len,
+							$topl2, $V, $snake);
+		} else if ($d == 1) {
+			/*
+			 * In this case the sequences differ by exactly 1 line. We have
+			 * already saved all the lines after the difference in the for loop
+			 * above, now we need to save all the lines before the difference.
+			 */
+			$max = min($startx - $bottoml1, $starty - $bottoml2);
+			for ($i = 0; $i < $max; ++$i) {
+				$this->removed[$bottoml1 + $i] =
+					$this->added[$bottoml2 + $i] = false;
+			}
+			return $max + $len;
+		}
+		return $len;
+	}
+
+	private function find_middle_snake($bottoml1, $topl1, $bottoml2,$topl2, &$V, &$snake) {
+		$from = &$this->from;
+		$to = &$this->to;
+		$V0 = &$V[0];
+		$V1 = &$V[1];
+		$snake0 = &$snake[0];
+		$snake1 = &$snake[1];
+		$snake2 = &$snake[2];
+		$bottoml1_min_1 = $bottoml1-1;
+		$bottoml2_min_1 = $bottoml2-1;
+		$N = $topl1 - $bottoml1_min_1;
+		$M = $topl2 - $bottoml2_min_1;
+		$delta = $N - $M;
+		$maxabsx = $N+$bottoml1;
+		$maxabsy = $M+$bottoml2;
+		$limit = min($this->maxDifferences, ceil(($N + $M ) / 2));
+
+		//value_to_add_forward: a 0 or 1 that we add to the start
+		// offset to make it odd/even
+		if (($M & 1) == 1) {
+			$value_to_add_forward = 1;
+		} else {
+			$value_to_add_forward = 0;
+		}
+
+		if (($N & 1) == 1) {
+			$value_to_add_backward = 1;
+		} else {
+			$value_to_add_backward = 0;
+		}
+
+		$start_forward = -$M;
+		$end_forward = $N;
+		$start_backward = -$N;
+		$end_backward = $M;
+
+		$limit_min_1 = $limit - 1;
+		$limit_plus_1 = $limit + 1;
+
+		$V0[$limit_plus_1] = 0;
+		$V1[$limit_min_1] = $N;
+		$limit = min($this->maxDifferences, ceil(($N + $M ) / 2));
+
+		if (($delta & 1) == 1) {
+			for ($d = 0; $d <= $limit; ++$d) {
+				$start_diag = max($value_to_add_forward + $start_forward, -$d);
+				$end_diag = min($end_forward, $d);
+				$value_to_add_forward = 1 - $value_to_add_forward;
+
+				// compute forward furthest reaching paths
+				for ($k = $start_diag; $k <= $end_diag; $k += 2) {
+					if ($k == -$d || ($k < $d
+							&& $V0[$limit_min_1 + $k] < $V0[$limit_plus_1 + $k])) {
+						$x = $V0[$limit_plus_1 + $k];
+					} else {
+						$x = $V0[$limit_min_1 + $k] + 1;
+					}
+
+					$absx = $snake0 = $x + $bottoml1;
+					$absy = $snake1 = $x - $k + $bottoml2;
+
+					while ($absx < $maxabsx && $absy < $maxabsy && $from[$absx] === $to[$absy]) {
+						++$absx;
+						++$absy;
+					}
+					$x = $absx-$bottoml1;
+
+					$snake2 = $absx -$snake0;
+					$V0[$limit + $k] = $x;
+					if ($k >= $delta - $d + 1 && $k <= $delta + $d - 1
+							&& $x >= $V1[$limit + $k - $delta]) {
+						return 2 * $d - 1;
+					}
+
+					// check to see if we can cut down the diagonal range
+					if ($x >= $N && $end_forward > $k - 1) {
+						$end_forward = $k - 1;
+					} else if ($absy - $bottoml2 >= $M) {
+						$start_forward = $k + 1;
+						$value_to_add_forward = 0;
+					}
+				}
+
+				$start_diag = max($value_to_add_backward + $start_backward, -$d);
+				$end_diag = min($end_backward, $d);
+				$value_to_add_backward = 1 - $value_to_add_backward;
+
+				// compute backward furthest reaching paths
+				for ($k = $start_diag; $k <= $end_diag; $k += 2) {
+					if ($k == $d
+					|| ($k != -$d && $V1[$limit_min_1 + $k] < $V1[$limit_plus_1 + $k])) {
+						$x = $V1[$limit_min_1 + $k];
+					} else {
+						$x = $V1[$limit_plus_1 + $k] - 1;
+					}
+
+					$y = $x - $k - $delta;
+
+					$snake2 = 0;
+					while ($x > 0 && $y > 0
+					&& $from[$x +$bottoml1_min_1] === $to[$y + $bottoml2_min_1]) {
+						--$x;
+						--$y;
+						++$snake2;
+					}
+					$V1[$limit + $k] = $x;
+
+					// check to see if we can cut down our diagonal range
+					if ($x <= 0) {
+						$start_backward = $k + 1;
+						$value_to_add_backward = 0;
+					} else if ($y <= 0 && $end_backward > $k - 1) {
+						$end_backward = $k - 1;
+					}
+				}
+			}
+		} else {
+			for ($d = 0; $d <= $limit; ++$d) {
+				$start_diag = max($value_to_add_forward + $start_forward, -$d);
+				$end_diag = min($end_forward, $d);
+				$value_to_add_forward = 1 - $value_to_add_forward;
+
+				// compute forward furthest reaching paths
+				for ($k = $start_diag; $k <= $end_diag; $k += 2) {
+					if ($k == -$d
+					|| ($k < $d && $V0[$limit_min_1 + $k] < $V0[$limit_plus_1 + $k])) {
+						$x = $V0[$limit_plus_1 + $k];
+					} else {
+						$x = $V0[$limit_min_1 + $k] + 1;
+					}
+
+					$absx = $snake0 = $x + $bottoml1;
+					$absy = $snake1 = $x - $k + $bottoml2;
+
+					while ($absx < $maxabsx && $absy < $maxabsy && $from[$absx] === $to[$absy]) {
+						++$absx;
+						++$absy;
+					}
+					$x = $absx-$bottoml1;
+					$snake2 = $absx -$snake0;
+					$V0[$limit + $k] = $x;
+
+					// check to see if we can cut down the diagonal range
+					if ($x >= $N && $end_forward > $k - 1) {
+						$end_forward = $k - 1;
+					} else if ($absy-$bottoml2 >= $M) {
+						$start_forward = $k + 1;
+						$value_to_add_forward = 0;
+					}
+				}
+
+				$start_diag = max($value_to_add_backward + $start_backward, -$d);
+				$end_diag = min($end_backward, $d);
+				$value_to_add_backward = 1 - $value_to_add_backward;
+
+				// compute backward furthest reaching paths
+				for ($k = $start_diag; $k <= $end_diag; $k += 2) {
+					if ($k == $d
+					|| ($k != -$d && $V1[$limit_min_1 + $k] < $V1[$limit_plus_1 + $k])) {
+						$x = $V1[$limit_min_1 + $k];
+					} else {
+						$x = $V1[$limit_plus_1 + $k] - 1;
+					}
+
+					$y = $x - $k - $delta;
+
+					$snake2 = 0;
+					while ($x > 0 && $y > 0
+							&& $from[$x +$bottoml1_min_1] === $to[$y + $bottoml2_min_1]) {
+						--$x;
+						--$y;
+						++$snake2;
+					}
+					$V1[$limit + $k] = $x;
+
+					if ($k >= -$delta - $d && $k <= $d - $delta
+							&& $x <= $V0[$limit + $k + $delta]) {
+						$snake0 = $bottoml1 + $x;
+						$snake1 = $bottoml2 + $y;
+						return 2 * $d;
+					}
+
+					// check to see if we can cut down our diagonal range
+					if ($x <= 0) {
+						$start_backward = $k + 1;
+						$value_to_add_backward = 0;
+					} else if ($y <= 0 && $end_backward > $k - 1) {
+						$end_backward = $k - 1;
+					}
+				}
+			}
+		}
+		/*
+		 * computing the true LCS is too expensive, instead find the diagonal
+		 * with the most progress and pretend a midle snake of length 0 occurs
+		 * there.
+		 */
+
+		$most_progress = self::findMostProgress($M, $N, $limit, $V);
+
+		$snake0 = $bottoml1 + $most_progress[0];
+		$snake1 = $bottoml2 + $most_progress[1];
+		$snake2 = 0;
+		wfDebug("Computing the LCS is too expensive. Using a heuristic.\n");
+		$this->heuristicUsed = true;
+		return 5; /*
+		* HACK: since we didn't really finish the LCS computation
+		* we don't really know the length of the SES. We don't do
+		* anything with the result anyway, unless it's <=1. We know
+		* for a fact SES > 1 so 5 is as good a number as any to
+		* return here
+		*/
+	}
+
+	private static function findMostProgress($M, $N, $limit, $V) {
+		$delta = $N - $M;
+
+		if (($M & 1) == ($limit & 1)) {
+			$forward_start_diag = max(-$M, -$limit);
+		} else {
+			$forward_start_diag = max(1 - $M, -$limit);
+		}
+
+		$forward_end_diag = min($N, $limit);
+
+		if (($N & 1) == ($limit & 1)) {
+			$backward_start_diag = max(-$N, -$limit);
+		} else {
+			$backward_start_diag = max(1 - $N, -$limit);
+		}
+
+		$backward_end_diag = -min($M, $limit);
+
+		$temp = array(0, 0, 0);
+
+
+		$max_progress = array_fill(0, ceil(max($forward_end_diag - $forward_start_diag,
+				$backward_end_diag - $backward_start_diag) / 2), $temp);
+		$num_progress = 0; // the 1st entry is current, it is initialized
+		// with 0s
+
+		// first search the forward diagonals
+		for ($k = $forward_start_diag; $k <= $forward_end_diag; $k += 2) {
+			$x = $V[0][$limit + $k];
+			$y = $x - $k;
+			if ($x > $N || $y > $M) {
+				continue;
+			}
+
+			$progress = $x + $y;
+			if ($progress > $max_progress[0][2]) {
+				$num_progress = 0;
+				$max_progress[0][0] = $x;
+				$max_progress[0][1] = $y;
+				$max_progress[0][2] = $progress;
+			} else if ($progress == $max_progress[0][2]) {
+				++$num_progress;
+				$max_progress[$num_progress][0] = $x;
+				$max_progress[$num_progress][1] = $y;
+				$max_progress[$num_progress][2] = $progress;
+			}
+		}
+
+		$max_progress_forward = true; // initially the maximum
+		// progress is in the forward
+		// direction
+
+		// now search the backward diagonals
+		for ($k = $backward_start_diag; $k <= $backward_end_diag; $k += 2) {
+			$x = $V[1][$limit + $k];
+			$y = $x - $k - $delta;
+			if ($x < 0 || $y < 0) {
+				continue;
+			}
+
+			$progress = $N - $x + $M - $y;
+			if ($progress > $max_progress[0][2]) {
+				$num_progress = 0;
+				$max_progress_forward = false;
+				$max_progress[0][0] = $x;
+				$max_progress[0][1] = $y;
+				$max_progress[0][2] = $progress;
+			} else if ($progress == $max_progress[0][2] && !$max_progress_forward) {
+				++$num_progress;
+				$max_progress[$num_progress][0] = $x;
+				$max_progress[$num_progress][1] = $y;
+				$max_progress[$num_progress][2] = $progress;
+			}
+		}
+
+		// return the middle diagonal with maximal progress.
+		return $max_progress[floor($num_progress / 2)];
+	}
+
+	public function getLcsLength(){
+		if($this->heuristicUsed && !$this->lcsLengthCorrectedForHeuristic){
+			$this->lcsLengthCorrectedForHeuristic = true;
+			$this->length = $this->m-array_sum($this->added);
+		}
+		return $this->length;
+	}
+
+}
+
+/**
+ * Alternative representation of a set of changes, by the index
+ * ranges that are changed.
+ * 
+ * @ingroup DifferenceEngine
+ */
+class RangeDifference {
+
+	public $leftstart;
+	public $leftend;
+	public $leftlength;
+
+	public $rightstart;
+	public $rightend;
+	public $rightlength;
+
+	function __construct($leftstart, $leftend, $rightstart, $rightend){
+		$this->leftstart = $leftstart;
+		$this->leftend = $leftend;
+		$this->leftlength = $leftend - $leftstart;
+		$this->rightstart = $rightstart;
+		$this->rightend = $rightend;
+		$this->rightlength = $rightend - $rightstart;
+	}
+}
diff --git a/includes/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 0b4028cb..b30ff190 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -27,6 +27,7 @@ class DifferenceEngine {
 	var $mOldRev, $mNewRev;
 	var $mRevisionsLoaded = false; // Have the revisions been loaded
 	var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2?
+	var $htmldiff;
 	/**#@-*/
 
 	/**
@@ -36,8 +37,9 @@ class DifferenceEngine {
 	 * @param $new String: either 'prev' or 'next'.
 	 * @param $rcid Integer: ??? FIXME (default 0)
 	 * @param $refreshCache boolean If set, refreshes the diff cache
+	 * @param $htmldiff boolean If set, output using HTMLDiff instead of raw wikicode diff
 	 */
-	function __construct( $titleObj = null, $old = 0, $new = 0, $rcid = 0, $refreshCache = false ) {
+	function __construct( $titleObj = null, $old = 0, $new = 0, $rcid = 0, $refreshCache = false , $htmldiff = false) {
 		$this->mTitle = $titleObj;
 		wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n");
 
@@ -67,6 +69,7 @@ class DifferenceEngine {
 		}
 		$this->mRcidMarkPatrolled = intval($rcid);  # force it to be an integer
 		$this->mRefreshCache = $refreshCache;
+		$this->htmldiff = $htmldiff;
 	}
 
 	function getTitle() {
@@ -74,10 +77,11 @@ class DifferenceEngine {
 	}
 
 	function showDiffPage( $diffOnly = false ) {
-		global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol;
+		global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol, $wgEnableHtmlDiff;
 		wfProfileIn( __METHOD__ );
 
-	 	# If external diffs are enabled both globally and for the user,
+
+		# If external diffs are enabled both globally and for the user,
 		# we'll use the application/x-external-editor interface to call
 		# an external diff tool like kompare, kdiff3, etc.
 		if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) {
@@ -88,19 +92,19 @@ class DifferenceEngine {
 			$url2=$this->mTitle->getFullURL("action=raw&oldid=".$this->mNewid);
 			$special=$wgLang->getNsText(NS_SPECIAL);
 			$control=<<<CONTROL
-[Process]
-Type=Diff text
-Engine=MediaWiki
-Script={$wgServer}{$wgScript}
-Special namespace={$special}
-
-[File]
-Extension=wiki
-URL=$url1
-
-[File 2]
-Extension=wiki
-URL=$url2
+			[Process]
+			Type=Diff text
+			Engine=MediaWiki
+			Script={$wgServer}{$wgScript}
+			Special namespace={$special}
+
+			[File]
+			Extension=wiki
+			URL=$url1
+
+			[File 2]
+			Extension=wiki
+			URL=$url2
 CONTROL;
 			echo($control);
 			return;
@@ -141,14 +145,15 @@ CONTROL;
 		} else {
 			$wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
 		}
-		$wgOut->setSubtitle( wfMsg( 'difference' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
-		if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) {
+		if ( !$this->mOldPage->userCanRead() || !$this->mNewPage->userCanRead() ) {
 			$wgOut->loginToUse();
 			$wgOut->output();
+			$wgOut->disable();
 			wfProfileOut( __METHOD__ );
-			exit;
+			return;
 		}
 
 		$sk = $wgUser->getSkin();
@@ -162,7 +167,7 @@ CONTROL;
 		}
 
 		// Prepare a change patrol link, if applicable
-		if( $wgUseRCPatrol && $wgUser->isAllowed( 'patrol' ) ) {
+		if( $wgUseRCPatrol && $this->mTitle->userCan('patrol') ) {
 			// If we've been given an explicit change identifier, use it; saves time
 			if( $this->mRcidMarkPatrolled ) {
 				$rcid = $this->mRcidMarkPatrolled;
@@ -170,15 +175,15 @@ CONTROL;
 				// Look for an unpatrolled change corresponding to this diff
 				$db = wfGetDB( DB_SLAVE );
 				$change = RecentChange::newFromConds(
-					array(
-						// Add redundant user,timestamp condition so we can use the existing index
-						'rc_user_text'  => $this->mNewRev->getRawUserText(),
-						'rc_timestamp' => $db->timestamp( $this->mNewRev->getTimestamp() ),
+				array(
+				// Add redundant user,timestamp condition so we can use the existing index
+						'rc_user_text'  => $this->mNewRev->getUserText( Revision::FOR_THIS_USER ),
+						'rc_timestamp'  => $db->timestamp( $this->mNewRev->getTimestamp() ),
 						'rc_this_oldid' => $this->mNewid,
 						'rc_last_oldid' => $this->mOldid,
-						'rc_patrolled' => 0
-					),
-					__METHOD__
+						'rc_patrolled'  => 0
+				),
+				__METHOD__
 				);
 				if( $change instanceof RecentChange ) {
 					$rcid = $change->mAttribs['rc_id'];
@@ -192,8 +197,8 @@ CONTROL;
 				$patrol = ' <span class="patrollink">[' . $sk->makeKnownLinkObj(
 					$this->mTitle,
 					wfMsgHtml( 'markaspatrolleddiff' ),
-					"action=markpatrolled&rcid={$rcid}"
-				) . ']</span>';
+						"action=markpatrolled&rcid={$rcid}"
+					) . ']</span>';
 			} else {
 				$patrol = '';
 			}
@@ -201,57 +206,58 @@ CONTROL;
 			$patrol = '';
 		}
 
+		$htmldiffarg = $this->htmlDiffArgument();
 		$prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousdiff' ),
-			'diff=prev&oldid='.$this->mOldid, '', '', 'id="differences-prevlink"' );
+			'diff=prev&oldid='.$this->mOldid.$htmldiffarg, '', '', 'id="differences-prevlink"' );
 		if ( $this->mNewRev->isCurrent() ) {
 			$nextlink = '&nbsp;';
 		} else {
 			$nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ),
-				'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
+				'diff=next&oldid='.$this->mNewid.$htmldiffarg, '', '', 'id="differences-nextlink"' );
 		}
 
 		$oldminor = '';
 		$newminor = '';
 
 		if ($this->mOldRev->mMinorEdit == 1) {
-			$oldminor = Xml::span( wfMsg( 'minoreditletter'), 'minor' ) . ' ';
+			$oldminor = Xml::span( wfMsg( 'minoreditletter' ), 'minor' ) . ' ';
 		}
 
 		if ($this->mNewRev->mMinorEdit == 1) {
-			$newminor = Xml::span( wfMsg( 'minoreditletter'), 'minor' ) . ' ';
+			$newminor = Xml::span( wfMsg( 'minoreditletter' ), 'minor' ) . ' ';
 		}
 
 		$rdel = ''; $ldel = '';
 		if( $wgUser->isAllowed( 'deleterevision' ) ) {
 			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 			if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
-				$ldel = wfMsgHtml('rev-delundel');
+				// If revision was hidden from sysops
+				$ldel = wfMsgHtml( 'rev-delundel' );
 			} else {
 				$ldel = $sk->makeKnownLinkObj( $revdel,
-					wfMsgHtml('rev-delundel'),
+				wfMsgHtml( 'rev-delundel' ),
 					'target=' . urlencode( $this->mOldRev->mTitle->getPrefixedDbkey() ) .
 					'&oldid=' . urlencode( $this->mOldRev->getId() ) );
 				// Bolden oversighted content
 				if( $this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ) )
-					$ldel = "<strong>$ldel</strong>";
+				$ldel = "<strong>$ldel</strong>";
 			}
 			$ldel = "&nbsp;&nbsp;&nbsp;<tt>(<small>$ldel</small>)</tt> ";
 			// We don't currently handle well changing the top revision's settings
 			if( $this->mNewRev->isCurrent() ) {
-			// If revision was hidden from sysops
-				$rdel = wfMsgHtml('rev-delundel');
+				// If revision was hidden from sysops
+				$rdel = wfMsgHtml( 'rev-delundel' );
 			} else if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
-				$rdel = wfMsgHtml('rev-delundel');
+				// If revision was hidden from sysops
+				$rdel = wfMsgHtml( 'rev-delundel' );
 			} else {
 				$rdel = $sk->makeKnownLinkObj( $revdel,
-					wfMsgHtml('rev-delundel'),
+				wfMsgHtml( 'rev-delundel' ),
 					'target=' . urlencode( $this->mNewRev->mTitle->getPrefixedDbkey() ) .
 					'&oldid=' . urlencode( $this->mNewRev->getId() ) );
 				// Bolden oversighted content
 				if( $this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ) )
-					$rdel = "<strong>$rdel</strong>";
+				$rdel = "<strong>$rdel</strong>";
 			}
 			$rdel = "&nbsp;&nbsp;&nbsp;<tt>(<small>$rdel</small>)</tt> ";
 		}
@@ -265,11 +271,22 @@ CONTROL;
 			'<div id="mw-diff-ntitle3">' . $newminor . $sk->revComment( $this->mNewRev, !$diffOnly, true ) . $rdel . "</div>" .
 			'<div id="mw-diff-ntitle4">' . $nextlink . $patrol . '</div>';
 
-		$this->showDiff( $oldHeader, $newHeader );
-
-		if ( !$diffOnly )
-			$this->renderNewRevision();
-
+		if( $wgEnableHtmlDiff && $this->htmldiff) {
+			$multi = $this->getMultiNotice();
+			$wgOut->addHTML('<div class="diff-switchtype">'.$sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'wikicodecomparison' ),
+			'diff='.$this->mNewid.'&oldid='.$this->mOldid.'&htmldiff=0', '', '', 'id="differences-switchtype"' ).'</div>');
+			$wgOut->addHTML( $this->addHeader( '', $oldHeader, $newHeader, $multi ) );
+			$this->renderHtmlDiff();
+		} else {
+			if($wgEnableHtmlDiff){
+				$wgOut->addHTML('<div class="diff-switchtype">'.$sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'visualcomparison' ),
+				'diff='.$this->mNewid.'&oldid='.$this->mOldid.'&htmldiff=1', '', '', 'id="differences-switchtype"' ).'</div>');
+			}
+			$this->showDiff( $oldHeader, $newHeader );
+			if( !$diffOnly ) {
+				$this->renderNewRevision();
+			}
+		}
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -283,9 +300,9 @@ CONTROL;
 		$wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
 		#add deleted rev tag if needed
 		if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
-		  	$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
+			$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
 		} else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
-		  	$wgOut->addWikiMsg( 'rev-deleted-text-view' );
+			$wgOut->addWikiMsg( 'rev-deleted-text-view' );
 		}
 
 		if( !$this->mNewRev->isCurrent() ) {
@@ -305,12 +322,12 @@ CONTROL;
 				// Wrap the whole lot in a <pre> and don't parse
 				$m = array();
 				preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
-				$wgOut->addHtml( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
-				$wgOut->addHtml( htmlspecialchars( $this->mNewtext ) );
-				$wgOut->addHtml( "\n</pre>\n" );
+				$wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
+				$wgOut->addHTML( htmlspecialchars( $this->mNewtext ) );
+				$wgOut->addHTML( "\n</pre>\n" );
 			}
 		} else
-			$wgOut->addWikiTextTidy( $this->mNewtext );
+		$wgOut->addWikiTextTidy( $this->mNewtext );
 
 		if( !$this->mNewRev->isCurrent() ) {
 			$wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
@@ -319,6 +336,70 @@ CONTROL;
 		wfProfileOut( __METHOD__ );
 	}
 
+
+	function renderHtmlDiff() {
+		global $wgOut, $wgTitle, $wgParser, $wgDebugComments;
+		wfProfileIn( __METHOD__ );
+
+		$this->showDiffStyle();
+
+		$wgOut->addHTML( '<h2>'.wfMsgHtml( 'visual-comparison' )."</h2>\n" );
+		#add deleted rev tag if needed
+		if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
+			$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
+		} else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
+			$wgOut->addWikiMsg( 'rev-deleted-text-view' );
+		}
+
+		if( !$this->mNewRev->isCurrent() ) {
+			$oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );
+		}
+
+		$this->loadText();
+
+		// Old revision
+		if( is_object( $this->mOldRev ) ) {
+			$wgOut->setRevisionId( $this->mOldRev->getId() );
+		}
+
+		$popts = $wgOut->parserOptions();
+		$oldTidy = $popts->setTidy( true );
+		$popts->setEditSection( false );
+
+		$parserOutput = $wgParser->parse( $this->mOldtext, $wgTitle, $popts, true, true, $wgOut->getRevisionId() );
+		$popts->setTidy( $oldTidy );
+
+		//only for new?
+		//$wgOut->addParserOutputNoText( $parserOutput );
+		$oldHtml = $parserOutput->getText();
+		wfRunHooks( 'OutputPageBeforeHTML', array( &$wgOut, &$oldHtml ) );
+
+		// New revision
+		if( is_object( $this->mNewRev ) ) {
+			$wgOut->setRevisionId( $this->mNewRev->getId() );
+		}
+
+		$popts = $wgOut->parserOptions();
+		$oldTidy = $popts->setTidy( true );
+
+		$parserOutput = $wgParser->parse( $this->mNewtext, $wgTitle, $popts, true, true, $wgOut->getRevisionId() );
+		$popts->setTidy( $oldTidy );
+
+		$wgOut->addParserOutputNoText( $parserOutput );
+		$newHtml = $parserOutput->getText();
+		wfRunHooks( 'OutputPageBeforeHTML', array( &$wgOut, &$newHtml ) );
+
+		unset($parserOutput, $popts);
+
+		$differ = new HTMLDiffer(new DelegatingContentHandler($wgOut));
+		$differ->htmlDiff($oldHtml, $newHtml);
+		if ( $wgDebugComments ) {
+			$wgOut->addHTML( "\n<!-- HtmlDiff Debug Output:\n" . HTMLDiffer::getDebugOutput() . " End Debug -->" );
+		}
+
+		wfProfileOut( __METHOD__ );
+	}
+
 	/**
 	 * Show the first revision of an article. Uses normal diff headers in
 	 * contrast to normal "old revision" display style.
@@ -343,31 +424,44 @@ CONTROL;
 
 		# Check if user is allowed to look at this page. If not, bail out.
 		#
-		if ( !( $this->mTitle->userCanRead() ) ) {
+		if ( !$this->mTitle->userCanRead() ) {
 			$wgOut->loginToUse();
 			$wgOut->output();
 			wfProfileOut( __METHOD__ );
-			exit;
+			throw new MWException("Permission Error: you do not have access to view this page");
 		}
 
 		# Prepare the header box
 		#
 		$sk = $wgUser->getSkin();
 
-		$nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
+		$nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid.$this->htmlDiffArgument(), '', '', 'id="differences-nextlink"' );
 		$header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />" .
-			$sk->revUserTools( $this->mNewRev ) . "<br />" .
-			$sk->revComment( $this->mNewRev ) . "<br />" .
-			$nextlink . "</div>\n";
+		$sk->revUserTools( $this->mNewRev ) . "<br />" .
+		$sk->revComment( $this->mNewRev ) . "<br />" .
+		$nextlink . "</div>\n";
 
 		$wgOut->addHTML( $header );
 
-		$wgOut->setSubtitle( wfMsg( 'difference' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 		wfProfileOut( __METHOD__ );
 	}
 
+	function htmlDiffArgument(){
+		global $wgEnableHtmlDiff;
+		if($wgEnableHtmlDiff){
+			if($this->htmldiff){
+				return '&htmldiff=1';
+			}else{
+				return '&htmldiff=0';
+			}
+		}else{
+			return '';
+		}
+	}
+
 	/**
 	 * Get the diff text, send it to $wgOut
 	 * Returns false if the diff could not be generated, otherwise returns true
@@ -423,9 +517,9 @@ CONTROL;
 		wfProfileIn( __METHOD__ );
 		// Check if the diff should be hidden from this user
 		if ( $this->mOldRev && !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) {
-		  	return '';
+			return '';
 		} else if ( $this->mNewRev && !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
-		  	return '';
+			return '';
 		}
 		// Cacheable?
 		$key = false;
@@ -453,7 +547,9 @@ CONTROL;
 		$difftext = $this->generateDiffBody( $this->mOldtext, $this->mNewtext );
 
 		// Save to cache for 7 days
-		if ( $key !== false && $difftext !== false ) {
+		if ( !wfRunHooks( 'AbortDiffCache', array( &$this ) ) ) {
+			wfIncrStats( 'diff_uncacheable' );
+		} else if ( $key !== false && $difftext !== false ) {
 			wfIncrStats( 'diff_cache_miss' );
 			$wgMemc->set( $key, $difftext, 7*86400 );
 		} else {
@@ -486,7 +582,7 @@ CONTROL;
 				dl('php_wikidiff.so');
 			}
 			return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) .
-				$this->debug( 'wikidiff1' );
+			$this->debug( 'wikidiff1' );
 		}
 
 		if ( $wgExternalDiffEngine == 'wikidiff2' ) {
@@ -505,7 +601,7 @@ CONTROL;
 				return $text;
 			}
 		}
-		if ( $wgExternalDiffEngine !== false ) {
+		if ( $wgExternalDiffEngine != 'wikidiff3' && $wgExternalDiffEngine !== false ) {
 			# Diff via the shell
 			global $wgTmpDirectory;
 			$tempName1 = tempnam( $wgTmpDirectory, 'diff_' );
@@ -541,25 +637,25 @@ CONTROL;
 		$diffs = new Diff( $ota, $nta );
 		$formatter = new TableDiffFormatter();
 		return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) .
-			$this->debug();
+		$this->debug();
 	}
-	
+
 	/**
 	 * Generate a debug comment indicating diff generating time,
 	 * server node, and generator backend.
 	 */
 	protected function debug( $generator="internal" ) {
-		global $wgShowHostnames, $wgNodeName;
+		global $wgShowHostnames;
 		$data = array( $generator );
 		if( $wgShowHostnames ) {
-			$data[] = $wgNodeName;
+			$data[] = wfHostname();
 		}
 		$data[] = wfTimestamp( TS_DB );
 		return "<!-- diff generator: " .
-			implode( " ",
-				array_map(
+		implode( " ",
+		array_map(
 					"htmlspecialchars",
-						$data ) ) .
+		$data ) ) .
 			" -->\n";
 	}
 
@@ -568,12 +664,12 @@ CONTROL;
 	 */
 	function localiseLineNumbers( $text ) {
 		return preg_replace_callback( '/<!--LINE (\d+)-->/',
-			array( &$this, 'localiseLineNumbersCb' ), $text );
+		array( &$this, 'localiseLineNumbersCb' ), $text );
 	}
 
 	function localiseLineNumbersCb( $matches ) {
 		global $wgLang;
-		return wfMsgExt( 'lineno', array('parseinline'), $wgLang->formatNum( $matches[1] ) );
+		return wfMsgExt( 'lineno', array( 'parseinline' ), $wgLang->formatNum( $matches[1] ) );
 	}
 
 
@@ -582,7 +678,7 @@ CONTROL;
 	 */
 	function getMultiNotice() {
 		if ( !is_object($this->mOldRev) || !is_object($this->mNewRev) )
-			return '';
+		return '';
 
 		if( !$this->mOldPage->equals( $this->mNewPage ) ) {
 			// Comparing two different pages? Count would be meaningless.
@@ -597,7 +693,7 @@ CONTROL;
 
 		$n = $this->mTitle->countRevisionsBetween( $oldid, $newid );
 		if ( !$n )
-			return '';
+		return '';
 
 		return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n );
 	}
@@ -607,22 +703,20 @@ CONTROL;
 	 * Add the header to a diff body
 	 */
 	static function addHeader( $diff, $otitle, $ntitle, $multi = '' ) {
-		global $wgOut;
-
 		$header = "
-			<table class='diff'>
-			<col class='diff-marker' />
-			<col class='diff-content' />
-			<col class='diff-marker' />
-			<col class='diff-content' />
-			<tr valign='top'>
-				<td colspan='2' class='diff-otitle'>{$otitle}</td>
-				<td colspan='2' class='diff-ntitle'>{$ntitle}</td>
-			</tr>
+		<table class='diff'>
+		<col class='diff-marker' />
+		<col class='diff-content' />
+		<col class='diff-marker' />
+		<col class='diff-content' />
+		<tr valign='top'>
+		<td colspan='2' class='diff-otitle'>{$otitle}</td>
+		<td colspan='2' class='diff-ntitle'>{$ntitle}</td>
+		</tr>
 		";
 
 		if ( $multi != '' )
-			$header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";
+		$header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";
 
 		return $header . $diff . "</table>";
 	}
@@ -647,7 +741,7 @@ CONTROL;
 	 * API convenience.
 	 */
 	function loadRevisionData() {
-		global $wgLang;
+		global $wgLang, $wgUser;
 		if ( $this->mRevisionsLoaded ) {
 			return true;
 		} else {
@@ -657,10 +751,10 @@ CONTROL;
 
 		// Load the new revision object
 		$this->mNewRev = $this->mNewid
-			? Revision::newFromId( $this->mNewid )
-			: Revision::newFromTitle( $this->mTitle );
+		? Revision::newFromId( $this->mNewid )
+		: Revision::newFromTitle( $this->mTitle );
 		if( !$this->mNewRev instanceof Revision )
-			return false;
+		return false;
 
 		// Update the new revision ID in case it was 0 (makes life easier doing UI stuff)
 		$this->mNewid = $this->mNewRev->getId();
@@ -673,10 +767,10 @@ CONTROL;
 		$this->mNewPage = $this->mNewRev->getTitle();
 		if( $this->mNewRev->isCurrent() ) {
 			$newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
-			$this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) );
+			$this->mPagetitle = wfMsgHTML( 'currentrev-asof', $timestamp );
 			$newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' );
 
-			$this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a> ($timestamp)";
+			$this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>";
 			$this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
 
 		} else {
@@ -688,9 +782,9 @@ CONTROL;
 			$this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
 		}
 		if ( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
-		  	$this->mNewtitle = "<span class='history-deleted'>{$this->mPagetitle}</span>";
+			$this->mNewtitle = "<span class='history-deleted'>{$this->mPagetitle}</span>";
 		} else if ( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
-		  	$this->mNewtitle = '<span class="history-deleted">'.$this->mNewtitle.'</span>';
+			$this->mNewtitle = '<span class="history-deleted">'.$this->mNewtitle.'</span>';
 		}
 
 		// Load the old revision object
@@ -722,17 +816,19 @@ CONTROL;
 			$this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) );
 
 			$this->mOldtitle = "<a href='$oldLink'>{$this->mOldPagetitle}</a>"
-				. " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
+			. " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
 			// Add an "undo" link
 			$newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undoafter=' . $this->mOldid . '&undo=' . $this->mNewid);
+			$htmlLink = htmlspecialchars( wfMsg( 'editundo' ) );
+			$htmlTitle = $wgUser->getSkin()->tooltip( 'undo' );
 			if( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {
-				$this->mNewtitle .= " (<a href='$newUndo'>" . htmlspecialchars( wfMsg( 'editundo' ) ) . "</a>)";
+				$this->mNewtitle .= " (<a href='$newUndo' $htmlTitle>" . $htmlLink . "</a>)";
 			}
 
 			if( !$this->mOldRev->userCan( Revision::DELETED_TEXT ) ) {
-		  		$this->mOldtitle = '<span class="history-deleted">' . $this->mOldPagetitle . '</span>';
+				$this->mOldtitle = '<span class="history-deleted">' . $this->mOldPagetitle . '</span>';
 			} else if( $this->mOldRev->isDeleted( Revision::DELETED_TEXT ) ) {
-		  		$this->mOldtitle = '<span class="history-deleted">' . $this->mOldtitle . '</span>';
+				$this->mOldtitle = '<span class="history-deleted">' . $this->mOldtitle . '</span>';
 			}
 		}
 
@@ -754,13 +850,13 @@ CONTROL;
 			return false;
 		}
 		if ( $this->mOldRev ) {
-			$this->mOldtext = $this->mOldRev->revText();
+			$this->mOldtext = $this->mOldRev->getText( Revision::FOR_THIS_USER );
 			if ( $this->mOldtext === false ) {
 				return false;
 			}
 		}
 		if ( $this->mNewRev ) {
-			$this->mNewtext = $this->mNewRev->revText();
+			$this->mNewtext = $this->mNewRev->getText( Revision::FOR_THIS_USER );
 			if ( $this->mNewtext === false ) {
 				return false;
 			}
@@ -828,7 +924,7 @@ class _DiffOp_Copy extends _DiffOp {
 
 	function _DiffOp_Copy ($orig, $closing = false) {
 		if (!is_array($closing))
-			$closing = $orig;
+		$closing = $orig;
 		$this->orig = $orig;
 		$this->closing = $closing;
 	}
@@ -892,7 +988,6 @@ class _DiffOp_Change extends _DiffOp {
 	}
 }
 
-
 /**
  * Class used internally by Diff to actually compute the diffs.
  *
@@ -911,70 +1006,30 @@ class _DiffOp_Change extends _DiffOp {
  * are my own.
  *
  * Line length limits for robustness added by Tim Starling, 2005-08-31
+ * Alternative implementation added by Guy Van den Broeck, 2008-07-30
  *
- * @author Geoffrey T. Dairiki, Tim Starling
+ * @author Geoffrey T. Dairiki, Tim Starling, Guy Van den Broeck
  * @private
  * @ingroup DifferenceEngine
  */
 class _DiffEngine {
+
 	const MAX_XREF_LENGTH =  10000;
 
-	function diff ($from_lines, $to_lines) {
+	function diff ($from_lines, $to_lines){
 		wfProfileIn( __METHOD__ );
 
-		$n_from = sizeof($from_lines);
-		$n_to = sizeof($to_lines);
-
-		$this->xchanged = $this->ychanged = array();
-		$this->xv = $this->yv = array();
-		$this->xind = $this->yind = array();
-		unset($this->seq);
-		unset($this->in_seq);
-		unset($this->lcs);
-
-		// Skip leading common lines.
-		for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
-			if ($from_lines[$skip] !== $to_lines[$skip])
-				break;
-			$this->xchanged[$skip] = $this->ychanged[$skip] = false;
-		}
-		// Skip trailing common lines.
-		$xi = $n_from; $yi = $n_to;
-		for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
-			if ($from_lines[$xi] !== $to_lines[$yi])
-				break;
-			$this->xchanged[$xi] = $this->ychanged[$yi] = false;
-		}
-
-		// Ignore lines which do not exist in both files.
-		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-			$xhash[$this->_line_hash($from_lines[$xi])] = 1;
-		}
-
-		for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
-			$line = $to_lines[$yi];
-			if ( ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) )
-				continue;
-			$yhash[$this->_line_hash($line)] = 1;
-			$this->yv[] = $line;
-			$this->yind[] = $yi;
-		}
-		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-			$line = $from_lines[$xi];
-			if ( ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) )
-				continue;
-			$this->xv[] = $line;
-			$this->xind[] = $xi;
-		}
-
-		// Find the LCS.
-		$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+		// Diff and store locally
+		$this->diff_local($from_lines, $to_lines);
 
 		// Merge edits when possible
 		$this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
 		$this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
 
 		// Compute the edit operations.
+		$n_from = sizeof($from_lines);
+		$n_to = sizeof($to_lines);
+
 		$edits = array();
 		$xi = $yi = 0;
 		while ($xi < $n_from || $yi < $n_to) {
@@ -984,33 +1039,96 @@ class _DiffEngine {
 			// Skip matching "snake".
 			$copy = array();
 			while ( $xi < $n_from && $yi < $n_to
-					&& !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+			&& !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
 				$copy[] = $from_lines[$xi++];
 				++$yi;
 			}
 			if ($copy)
-				$edits[] = new _DiffOp_Copy($copy);
+			$edits[] = new _DiffOp_Copy($copy);
 
 			// Find deletes & adds.
 			$delete = array();
 			while ($xi < $n_from && $this->xchanged[$xi])
-				$delete[] = $from_lines[$xi++];
+			$delete[] = $from_lines[$xi++];
 
 			$add = array();
 			while ($yi < $n_to && $this->ychanged[$yi])
-				$add[] = $to_lines[$yi++];
+			$add[] = $to_lines[$yi++];
 
 			if ($delete && $add)
-				$edits[] = new _DiffOp_Change($delete, $add);
+			$edits[] = new _DiffOp_Change($delete, $add);
 			elseif ($delete)
-				$edits[] = new _DiffOp_Delete($delete);
+			$edits[] = new _DiffOp_Delete($delete);
 			elseif ($add)
-				$edits[] = new _DiffOp_Add($add);
+			$edits[] = new _DiffOp_Add($add);
 		}
 		wfProfileOut( __METHOD__ );
 		return $edits;
 	}
 
+	function diff_local ($from_lines, $to_lines) {
+		global $wgExternalDiffEngine;
+		wfProfileIn( __METHOD__);
+
+		if($wgExternalDiffEngine == 'wikidiff3'){
+			// wikidiff3
+			$wikidiff3 = new WikiDiff3();
+			$wikidiff3->diff($from_lines, $to_lines);
+			$this->xchanged = $wikidiff3->removed;
+			$this->ychanged = $wikidiff3->added;
+			unset($wikidiff3);
+		}else{
+			// old diff
+			$n_from = sizeof($from_lines);
+			$n_to = sizeof($to_lines);
+			$this->xchanged = $this->ychanged = array();
+			$this->xv = $this->yv = array();
+			$this->xind = $this->yind = array();
+			unset($this->seq);
+			unset($this->in_seq);
+			unset($this->lcs);
+
+			// Skip leading common lines.
+			for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+				if ($from_lines[$skip] !== $to_lines[$skip])
+				break;
+				$this->xchanged[$skip] = $this->ychanged[$skip] = false;
+			}
+			// Skip trailing common lines.
+			$xi = $n_from; $yi = $n_to;
+			for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+				if ($from_lines[$xi] !== $to_lines[$yi])
+				break;
+				$this->xchanged[$xi] = $this->ychanged[$yi] = false;
+			}
+
+			// Ignore lines which do not exist in both files.
+			for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+				$xhash[$this->_line_hash($from_lines[$xi])] = 1;
+			}
+
+			for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+				$line = $to_lines[$yi];
+				if ( ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) )
+				continue;
+				$yhash[$this->_line_hash($line)] = 1;
+				$this->yv[] = $line;
+				$this->yind[] = $yi;
+			}
+			for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+				$line = $from_lines[$xi];
+				if ( ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) )
+				continue;
+				$this->xv[] = $line;
+				$this->xind[] = $xi;
+			}
+
+			// Find the LCS.
+			$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+		}
+		wfProfileOut( __METHOD__ );
+	}
+
 	/**
 	 * Returns the whole line if it's small enough, or the MD5 hash otherwise
 	 */
@@ -1022,7 +1140,6 @@ class _DiffEngine {
 		}
 	}
 
-
 	/* Divide the Largest Common Subsequence (LCS) of the sequences
 	 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
 	 * sized segments.
@@ -1040,23 +1157,22 @@ class _DiffEngine {
 	 * of the portions it is going to specify.
 	 */
 	function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
-		wfProfileIn( __METHOD__ );
 		$flip = false;
 
 		if ($xlim - $xoff > $ylim - $yoff) {
 			// Things seems faster (I'm not sure I understand why)
-				// when the shortest sequence in X.
-				$flip = true;
+			// when the shortest sequence in X.
+			$flip = true;
 			list ($xoff, $xlim, $yoff, $ylim)
 			= array( $yoff, $ylim, $xoff, $xlim);
 		}
 
 		if ($flip)
-			for ($i = $ylim - 1; $i >= $yoff; $i--)
-				$ymatches[$this->xv[$i]][] = $i;
+		for ($i = $ylim - 1; $i >= $yoff; $i--)
+		$ymatches[$this->xv[$i]][] = $i;
 		else
-			for ($i = $ylim - 1; $i >= $yoff; $i--)
-				$ymatches[$this->yv[$i]][] = $i;
+		for ($i = $ylim - 1; $i >= $yoff; $i--)
+		$ymatches[$this->yv[$i]][] = $i;
 
 		$this->lcs = 0;
 		$this->seq[0]= $yoff - 1;
@@ -1066,25 +1182,24 @@ class _DiffEngine {
 		$numer = $xlim - $xoff + $nchunks - 1;
 		$x = $xoff;
 		for ($chunk = 0; $chunk < $nchunks; $chunk++) {
-			wfProfileIn( __METHOD__ . "-chunk" );
 			if ($chunk > 0)
-				for ($i = 0; $i <= $this->lcs; $i++)
-					$ymids[$i][$chunk-1] = $this->seq[$i];
+			for ($i = 0; $i <= $this->lcs; $i++)
+			$ymids[$i][$chunk-1] = $this->seq[$i];
 
 			$x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
 			for ( ; $x < $x1; $x++) {
 				$line = $flip ? $this->yv[$x] : $this->xv[$x];
-					if (empty($ymatches[$line]))
-						continue;
+				if (empty($ymatches[$line]))
+				continue;
 				$matches = $ymatches[$line];
 				reset($matches);
 				while (list ($junk, $y) = each($matches))
-					if (empty($this->in_seq[$y])) {
-						$k = $this->_lcs_pos($y);
-						USE_ASSERTS && assert($k > 0);
-						$ymids[$k] = $ymids[$k-1];
-						break;
-					}
+				if (empty($this->in_seq[$y])) {
+					$k = $this->_lcs_pos($y);
+					USE_ASSERTS && assert($k > 0);
+					$ymids[$k] = $ymids[$k-1];
+					break;
+				}
 				while (list ( /* $junk */, $y) = each($matches)) {
 					if ($y > $this->seq[$k-1]) {
 						USE_ASSERTS && assert($y < $this->seq[$k]);
@@ -1100,7 +1215,6 @@ class _DiffEngine {
 					}
 				}
 			}
-			wfProfileOut( __METHOD__ . "-chunk" );
 		}
 
 		$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
@@ -1112,18 +1226,14 @@ class _DiffEngine {
 		}
 		$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
 
-		wfProfileOut( __METHOD__ );
 		return array($this->lcs, $seps);
 	}
 
 	function _lcs_pos ($ypos) {
-		wfProfileIn( __METHOD__ );
-
 		$end = $this->lcs;
 		if ($end == 0 || $ypos > $this->seq[$end]) {
 			$this->seq[++$this->lcs] = $ypos;
 			$this->in_seq[$ypos] = 1;
-			wfProfileOut( __METHOD__ );
 			return $this->lcs;
 		}
 
@@ -1131,9 +1241,9 @@ class _DiffEngine {
 		while ($beg < $end) {
 			$mid = (int)(($beg + $end) / 2);
 			if ( $ypos > $this->seq[$mid] )
-				$beg = $mid + 1;
+			$beg = $mid + 1;
 			else
-				$end = $mid;
+			$end = $mid;
 		}
 
 		USE_ASSERTS && assert($ypos != $this->seq[$end]);
@@ -1141,7 +1251,6 @@ class _DiffEngine {
 		$this->in_seq[$this->seq[$end]] = false;
 		$this->seq[$end] = $ypos;
 		$this->in_seq[$ypos] = 1;
-		wfProfileOut( __METHOD__ );
 		return $end;
 	}
 
@@ -1157,24 +1266,22 @@ class _DiffEngine {
 	 * All line numbers are origin-0 and discarded lines are not counted.
 	 */
 	function _compareseq ($xoff, $xlim, $yoff, $ylim) {
-		wfProfileIn( __METHOD__ );
-
 		// Slide down the bottom initial diagonal.
 		while ($xoff < $xlim && $yoff < $ylim
-			   && $this->xv[$xoff] == $this->yv[$yoff]) {
+		&& $this->xv[$xoff] == $this->yv[$yoff]) {
 			++$xoff;
 			++$yoff;
 		}
 
 		// Slide up the top initial diagonal.
 		while ($xlim > $xoff && $ylim > $yoff
-			   && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+		&& $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
 			--$xlim;
 			--$ylim;
 		}
 
 		if ($xoff == $xlim || $yoff == $ylim)
-			$lcs = 0;
+		$lcs = 0;
 		else {
 			// This is ad hoc but seems to work well.
 			//$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
@@ -1188,9 +1295,9 @@ class _DiffEngine {
 			// X and Y sequences have no common subsequence:
 			// mark all changed.
 			while ($yoff < $ylim)
-				$this->ychanged[$this->yind[$yoff++]] = 1;
+			$this->ychanged[$this->yind[$yoff++]] = 1;
 			while ($xoff < $xlim)
-				$this->xchanged[$this->xind[$xoff++]] = 1;
+			$this->xchanged[$this->xind[$xoff++]] = 1;
 		} else {
 			// Use the partitions to split this problem into subproblems.
 			reset($seps);
@@ -1200,7 +1307,6 @@ class _DiffEngine {
 				$pt1 = $pt2;
 			}
 		}
-		wfProfileOut( __METHOD__ );
 	}
 
 	/* Adjust inserts/deletes of identical lines to join changes
@@ -1237,23 +1343,23 @@ class _DiffEngine {
 			 * $other_changed[$j] == false.
 			 */
 			while ($j < $other_len && $other_changed[$j])
-				$j++;
+			$j++;
 
 			while ($i < $len && ! $changed[$i]) {
 				USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
 				$i++; $j++;
 				while ($j < $other_len && $other_changed[$j])
-					$j++;
+				$j++;
 			}
 
 			if ($i == $len)
-				break;
+			break;
 
 			$start = $i;
 
 			// Find the end of this run of changes.
 			while (++$i < $len && $changed[$i])
-				continue;
+			continue;
 
 			do {
 				/*
@@ -1271,10 +1377,10 @@ class _DiffEngine {
 					$changed[--$start] = 1;
 					$changed[--$i] = false;
 					while ($start > 0 && $changed[$start - 1])
-						$start--;
+					$start--;
 					USE_ASSERTS && assert('$j > 0');
 					while ($other_changed[--$j])
-						continue;
+					continue;
 					USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
 				}
 
@@ -1296,14 +1402,14 @@ class _DiffEngine {
 					$changed[$start++] = false;
 					$changed[$i++] = 1;
 					while ($i < $len && $changed[$i])
-						$i++;
+					$i++;
 
 					USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
 					$j++;
 					if ($j < $other_len && $other_changed[$j]) {
 						$corresponding = $i;
 						while ($j < $other_len && $other_changed[$j])
-							$j++;
+						$j++;
 					}
 				}
 			} while ($runlength != $i - $start);
@@ -1317,7 +1423,7 @@ class _DiffEngine {
 				$changed[--$i] = 0;
 				USE_ASSERTS && assert('$j > 0');
 				while ($other_changed[--$j])
-					continue;
+				continue;
 				USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
 			}
 		}
@@ -1376,7 +1482,7 @@ class Diff
 	function isEmpty () {
 		foreach ($this->edits as $edit) {
 			if ($edit->type != 'copy')
-				return false;
+			return false;
 		}
 		return true;
 	}
@@ -1392,7 +1498,7 @@ class Diff
 		$lcs = 0;
 		foreach ($this->edits as $edit) {
 			if ($edit->type == 'copy')
-				$lcs += sizeof($edit->orig);
+			$lcs += sizeof($edit->orig);
 		}
 		return $lcs;
 	}
@@ -1410,7 +1516,7 @@ class Diff
 
 		foreach ($this->edits as $edit) {
 			if ($edit->orig)
-				array_splice($lines, sizeof($lines), 0, $edit->orig);
+			array_splice($lines, sizeof($lines), 0, $edit->orig);
 		}
 		return $lines;
 	}
@@ -1428,7 +1534,7 @@ class Diff
 
 		foreach ($this->edits as $edit) {
 			if ($edit->closing)
-				array_splice($lines, sizeof($lines), 0, $edit->closing);
+			array_splice($lines, sizeof($lines), 0, $edit->closing);
 		}
 		return $lines;
 	}
@@ -1441,21 +1547,21 @@ class Diff
 	function _check ($from_lines, $to_lines) {
 		wfProfileIn( __METHOD__ );
 		if (serialize($from_lines) != serialize($this->orig()))
-			trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+		trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
 		if (serialize($to_lines) != serialize($this->closing()))
-			trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
+		trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
 
 		$rev = $this->reverse();
 		if (serialize($to_lines) != serialize($rev->orig()))
-			trigger_error("Reversed original doesn't match", E_USER_ERROR);
+		trigger_error("Reversed original doesn't match", E_USER_ERROR);
 		if (serialize($from_lines) != serialize($rev->closing()))
-			trigger_error("Reversed closing doesn't match", E_USER_ERROR);
+		trigger_error("Reversed closing doesn't match", E_USER_ERROR);
 
 
 		$prevtype = 'none';
 		foreach ($this->edits as $edit) {
 			if ( $prevtype == $edit->type )
-				trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+			trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
 			$prevtype = $edit->type;
 		}
 
@@ -1496,7 +1602,7 @@ class MappedDiff extends Diff
 	 *	have the same number of elements as $to_lines.
 	 */
 	function MappedDiff($from_lines, $to_lines,
-		$mapped_from_lines, $mapped_to_lines) {
+	$mapped_from_lines, $mapped_to_lines) {
 		wfProfileIn( __METHOD__ );
 
 		assert(sizeof($from_lines) == sizeof($mapped_from_lines));
@@ -1579,8 +1685,8 @@ class DiffFormatter {
 							$block[] = new _DiffOp_Copy($context);
 						}
 						$this->_block($x0, $ntrail + $xi - $x0,
-									  $y0, $ntrail + $yi - $y0,
-									  $block);
+						$y0, $ntrail + $yi - $y0,
+						$block);
 						$block = false;
 					}
 				}
@@ -1593,21 +1699,21 @@ class DiffFormatter {
 					$y0 = $yi - sizeof($context);
 					$block = array();
 					if ($context)
-						$block[] = new _DiffOp_Copy($context);
+					$block[] = new _DiffOp_Copy($context);
 				}
 				$block[] = $edit;
 			}
 
 			if ($edit->orig)
-				$xi += sizeof($edit->orig);
+			$xi += sizeof($edit->orig);
 			if ($edit->closing)
-				$yi += sizeof($edit->closing);
+			$yi += sizeof($edit->closing);
 		}
 
 		if (is_array($block))
-			$this->_block($x0, $xi - $x0,
-						  $y0, $yi - $y0,
-						  $block);
+		$this->_block($x0, $xi - $x0,
+		$y0, $yi - $y0,
+		$block);
 
 		$end = $this->_end_diff();
 		wfProfileOut( __METHOD__ );
@@ -1619,15 +1725,15 @@ class DiffFormatter {
 		$this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
 		foreach ($edits as $edit) {
 			if ($edit->type == 'copy')
-				$this->_context($edit->orig);
+			$this->_context($edit->orig);
 			elseif ($edit->type == 'add')
-				$this->_added($edit->closing);
+			$this->_added($edit->closing);
 			elseif ($edit->type == 'delete')
-				$this->_deleted($edit->orig);
+			$this->_deleted($edit->orig);
 			elseif ($edit->type == 'change')
-				$this->_changed($edit->orig, $edit->closing);
+			$this->_changed($edit->orig, $edit->closing);
 			else
-				trigger_error('Unknown edit type', E_USER_ERROR);
+			trigger_error('Unknown edit type', E_USER_ERROR);
 		}
 		$this->_end_block();
 		wfProfileOut( __METHOD__ );
@@ -1645,9 +1751,9 @@ class DiffFormatter {
 
 	function _block_header($xbeg, $xlen, $ybeg, $ylen) {
 		if ($xlen > 1)
-			$xbeg .= "," . ($xbeg + $xlen - 1);
+		$xbeg .= "," . ($xbeg + $xlen - 1);
 		if ($ylen > 1)
-			$ybeg .= "," . ($ybeg + $ylen - 1);
+		$ybeg .= "," . ($ybeg + $ylen - 1);
 
 		return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
 	}
@@ -1661,7 +1767,7 @@ class DiffFormatter {
 
 	function _lines($lines, $prefix = ' ') {
 		foreach ($lines as $line)
-			echo "$prefix $line\n";
+		echo "$prefix $line\n";
 	}
 
 	function _context($lines) {
@@ -1716,40 +1822,40 @@ class ArrayDiffFormatter extends DiffFormatter {
 		$newline = 1;
 		$retval = array();
 		foreach($diff->edits as $edit)
-			switch($edit->type) {
-				case 'add':
-					foreach($edit->closing as $l) {
-						$retval[] = array(
+		switch($edit->type) {
+			case 'add':
+				foreach($edit->closing as $l) {
+					$retval[] = array(
 							'action' => 'add',
 							'new'=> $l,
 							'newline' => $newline++
-						);
-					}
-					break;
-				case 'delete':
-					foreach($edit->orig as $l) {
-						$retval[] = array(
+					);
+				}
+				break;
+			case 'delete':
+				foreach($edit->orig as $l) {
+					$retval[] = array(
 							'action' => 'delete',
 							'old' => $l,
 							'oldline' => $oldline++,
-						);
-					}
-					break;
-				case 'change':
-					foreach($edit->orig as $i => $l) {
-						$retval[] = array(
+					);
+				}
+				break;
+			case 'change':
+				foreach($edit->orig as $i => $l) {
+					$retval[] = array(
 							'action' => 'change',
 							'old' => $l,
 							'new' => @$edit->closing[$i],
 							'oldline' => $oldline++,
 							'newline' => $newline++,
-						);
-					}
-					break;
-				case 'copy':
-					$oldline += count($edit->orig);
-					$newline += count($edit->orig);
-			}
+					);
+				}
+				break;
+			case 'copy':
+				$oldline += count($edit->orig);
+				$newline += count($edit->orig);
+		}
 		return $retval;
 	}
 }
@@ -1777,13 +1883,13 @@ class _HWLDF_WordAccumulator {
 	function _flushGroup ($new_tag) {
 		if ($this->_group !== '') {
 			if ($this->_tag == 'ins')
-				$this->_line .= '<ins class="diffchange diffchange-inline">' .
-					htmlspecialchars ( $this->_group ) . '</ins>';
+			$this->_line .= '<ins class="diffchange diffchange-inline">' .
+			htmlspecialchars ( $this->_group ) . '</ins>';
 			elseif ($this->_tag == 'del')
-				$this->_line .= '<del class="diffchange diffchange-inline">' .
-					htmlspecialchars ( $this->_group ) . '</del>';
+			$this->_line .= '<del class="diffchange diffchange-inline">' .
+			htmlspecialchars ( $this->_group ) . '</del>';
 			else
-				$this->_line .= htmlspecialchars ( $this->_group );
+			$this->_line .= htmlspecialchars ( $this->_group );
 		}
 		$this->_group = '';
 		$this->_tag = $new_tag;
@@ -1792,21 +1898,21 @@ class _HWLDF_WordAccumulator {
 	function _flushLine ($new_tag) {
 		$this->_flushGroup($new_tag);
 		if ($this->_line != '')
-			array_push ( $this->_lines, $this->_line );
+		array_push ( $this->_lines, $this->_line );
 		else
-			# make empty lines visible by inserting an NBSP
-			array_push ( $this->_lines, NBSP );
+		# make empty lines visible by inserting an NBSP
+		array_push ( $this->_lines, NBSP );
 		$this->_line = '';
 	}
 
 	function addWords ($words, $tag = '') {
 		if ($tag != $this->_tag)
-			$this->_flushGroup($tag);
+		$this->_flushGroup($tag);
 
 		foreach ($words as $word) {
 			// new-line should only come as first char of word.
 			if ($word == '')
-				continue;
+			continue;
 			if ($word[0] == "\n") {
 				$this->_flushLine($tag);
 				$word = substr($word, 1);
@@ -1837,7 +1943,7 @@ class WordLevelDiff extends MappedDiff {
 		list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
 
 		$this->MappedDiff($orig_words, $closing_words,
-			$orig_stripped, $closing_stripped);
+		$orig_stripped, $closing_stripped);
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -1862,7 +1968,7 @@ class WordLevelDiff extends MappedDiff {
 			} else {
 				$m = array();
 				if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
-					$line, $m))
+				$line, $m))
 				{
 					$words = array_merge( $words, $m[0] );
 					$stripped = array_merge( $stripped, $m[1] );
@@ -1879,9 +1985,9 @@ class WordLevelDiff extends MappedDiff {
 
 		foreach ($this->edits as $edit) {
 			if ($edit->type == 'copy')
-				$orig->addWords($edit->orig);
+			$orig->addWords($edit->orig);
 			elseif ($edit->orig)
-				$orig->addWords($edit->orig, 'del');
+			$orig->addWords($edit->orig, 'del');
 		}
 		$lines = $orig->getLines();
 		wfProfileOut( __METHOD__ );
@@ -1894,9 +2000,9 @@ class WordLevelDiff extends MappedDiff {
 
 		foreach ($this->edits as $edit) {
 			if ($edit->type == 'copy')
-				$closing->addWords($edit->closing);
+			$closing->addWords($edit->closing);
 			elseif ($edit->closing)
-				$closing->addWords($edit->closing, 'ins');
+			$closing->addWords($edit->closing, 'ins');
 		}
 		$lines = $closing->getLines();
 		wfProfileOut( __METHOD__ );
@@ -1969,24 +2075,24 @@ class TableDiffFormatter extends DiffFormatter {
 	function _added( $lines ) {
 		foreach ($lines as $line) {
 			echo '<tr>' . $this->emptyLine() .
-				$this->addedLine( '<ins class="diffchange">' .
-					htmlspecialchars ( $line ) . '</ins>' ) . "</tr>\n";
+			$this->addedLine( '<ins class="diffchange">' .
+			htmlspecialchars ( $line ) . '</ins>' ) . "</tr>\n";
 		}
 	}
 
 	function _deleted($lines) {
 		foreach ($lines as $line) {
 			echo '<tr>' . $this->deletedLine( '<del class="diffchange">' .
-				htmlspecialchars ( $line ) . '</del>' ) .
-			  $this->emptyLine() . "</tr>\n";
+			htmlspecialchars ( $line ) . '</del>' ) .
+			$this->emptyLine() . "</tr>\n";
 		}
 	}
 
 	function _context( $lines ) {
 		foreach ($lines as $line) {
 			echo '<tr>' .
-				$this->contextLine( htmlspecialchars ( $line ) ) .
-				$this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
+			$this->contextLine( htmlspecialchars ( $line ) ) .
+			$this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
 		}
 	}
 
@@ -2003,11 +2109,11 @@ class TableDiffFormatter extends DiffFormatter {
 		while ( $line = array_shift( $del ) ) {
 			$aline = array_shift( $add );
 			echo '<tr>' . $this->deletedLine( $line ) .
-				$this->addedLine( $aline ) . "</tr>\n";
+			$this->addedLine( $aline ) . "</tr>\n";
 		}
 		foreach ($add as $line) {	# If any leftovers
 			echo '<tr>' . $this->emptyLine() .
-				$this->addedLine( $line ) . "</tr>\n";
+			$this->addedLine( $line ) . "</tr>\n";
 		}
 		wfProfileOut( __METHOD__ );
 	}
diff --git a/includes/diff/HTMLDiff.php b/includes/diff/HTMLDiff.php
new file mode 100644
index 00000000..0698059f
--- /dev/null
+++ b/includes/diff/HTMLDiff.php
@@ -0,0 +1,1005 @@
+<?php
+
+/** Copyright (C) 2008 Guy Van den Broeck <guy@guyvdb.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * or see http://www.gnu.org/
+ * 
+ * @ingroup DifferenceEngine
+ */
+
+/**
+ * When detecting the last common parent of two nodes, all results are stored as
+ * a LastCommonParentResult.
+ */
+class LastCommonParentResult {
+
+	// Parent
+	public $parent;
+
+	// Splitting
+	public $splittingNeeded = false;
+
+	// Depth
+	public $lastCommonParentDepth = -1;
+
+	// Index
+	public $indexInLastCommonParent = -1;
+}
+
+class Modification{
+
+	const NONE = 1;
+	const REMOVED = 2;
+	const ADDED = 4;
+	const CHANGED = 8;
+
+	public $type;
+
+	public $id = -1;
+
+	public $firstOfID = false;
+
+	public $changes;
+
+	function __construct($type) {
+		$this->type = $type;
+	}
+
+	public static function typeToString($type) {
+		switch($type) {
+			case self::NONE: return 'none';
+			case self::REMOVED: return 'removed';
+			case self::ADDED: return 'added';
+			case self::CHANGED: return 'changed';
+		}
+	}
+}
+
+class DomTreeBuilder {
+
+	public $textNodes = array();
+
+	public $bodyNode;
+
+	private $currentParent;
+
+	private $newWord = '';
+
+	protected $bodyStarted = false;
+
+	protected $bodyEnded = false;
+
+	private $whiteSpaceBeforeThis = false;
+
+	private $lastSibling;
+
+	private $notInPre = true;
+
+	function __construct() {
+		$this->bodyNode = $this->currentParent = new BodyNode();
+		$this->lastSibling = new DummyNode();
+	}
+
+	/**
+	 * Must be called manually
+	 */
+	public function endDocument() {
+		$this->endWord();
+		HTMLDiffer::diffDebug( count($this->textNodes) . " text nodes in document.\n" );
+	}
+
+	public function startElement($parser, $name, /*array*/ $attributes) {
+		if (strcasecmp($name, 'body') != 0) {
+			HTMLDiffer::diffDebug( "Starting $name node.\n" );
+			$this->endWord();
+
+			$newNode = new TagNode($this->currentParent, $name, $attributes);
+			$this->currentParent->children[] = $newNode;
+			$this->currentParent = $newNode;
+			$this->lastSibling = new DummyNode();
+			if ($this->whiteSpaceBeforeThis && !in_array(strtolower($this->currentParent->qName),TagNode::$blocks)) {
+				$this->currentParent->whiteBefore = true;
+			}
+			$this->whiteSpaceBeforeThis = false;
+			if(strcasecmp($name, 'pre') == 0) {
+				$this->notInPre = false;
+			}
+		}
+	}
+
+	public function endElement($parser, $name) {
+		if(strcasecmp($name, 'body') != 0) {
+			HTMLDiffer::diffDebug( "Ending $name node.\n");
+			if (0 == strcasecmp($name,'img')) {
+				// Insert a dummy leaf for the image
+				$img = new ImageNode($this->currentParent, $this->currentParent->attributes);
+				$this->currentParent->children[] = $img;
+				$img->whiteBefore = $this->whiteSpaceBeforeThis;
+				$this->lastSibling = $img;
+				$this->textNodes[] = $img;
+			}
+			$this->endWord();
+			if (!in_array(strtolower($this->currentParent->qName),TagNode::$blocks)) {
+				$this->lastSibling = $this->currentParent;
+			} else {
+				$this->lastSibling = new DummyNode();
+			}
+			$this->currentParent = $this->currentParent->parent;
+			$this->whiteSpaceBeforeThis = false;
+			if (!$this->notInPre && strcasecmp($name, 'pre') == 0) {
+				$this->notInPre = true;
+			}
+		} else {
+			$this->endDocument();
+		}
+	}
+
+	const regex = '/([\s\.\,\"\\\'\(\)\?\:\;\!\{\}\-\+\*\=\_\[\]\&\|\$]{1})/';
+	const whitespace = '/^[\s]{1}$/';
+	const delimiter = '/^[\s\.\,\"\\\'\(\)\?\:\;\!\{\}\-\+\*\=\_\[\]\&\|\$]{1}$/';
+
+	public function characters($parser, $data) {
+		$matches = preg_split(self::regex, $data, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+		foreach($matches as &$word) {
+			if (preg_match(self::whitespace, $word) && $this->notInPre) {
+				$this->endWord();
+				$this->lastSibling->whiteAfter = true;
+				$this->whiteSpaceBeforeThis = true;
+			} else if (preg_match(self::delimiter, $word)) {
+				$this->endWord();
+				$textNode = new TextNode($this->currentParent, $word);
+				$this->currentParent->children[] = $textNode;
+				$textNode->whiteBefore = $this->whiteSpaceBeforeThis;
+				$this->whiteSpaceBeforeThis = false;
+				$this->lastSibling = $textNode;
+				$this->textNodes[] = $textNode;
+			} else {
+				$this->newWord .= $word;
+			}
+		}
+	}
+
+	private function endWord() {
+		if ($this->newWord !== '') {
+			$node = new TextNode($this->currentParent, $this->newWord);
+			$this->currentParent->children[] = $node;
+			$node->whiteBefore = $this->whiteSpaceBeforeThis;
+			$this->whiteSpaceBeforeThis = false;
+			$this->lastSibling = $node;
+			$this->textNodes[] = $node;
+			$this->newWord = "";
+		}
+	}
+
+	public function getDiffLines() {
+		return array_map(array('TextNode','toDiffLine'), $this->textNodes);
+	}
+}
+
+class TextNodeDiffer {
+
+	private $textNodes;
+	public $bodyNode;
+
+	private $oldTextNodes;
+	private $oldBodyNode;
+
+	private $newID = 0;
+
+	private $changedID = 0;
+
+	private $changedIDUsed = false;
+
+	// used to remove the whitespace between a red and green block
+	private $whiteAfterLastChangedPart = false;
+
+	private $deletedID = 0;
+
+	function __construct(DomTreeBuilder $tree, DomTreeBuilder $oldTree) {
+		$this->textNodes = $tree->textNodes;
+		$this->bodyNode = $tree->bodyNode;
+		$this->oldTextNodes = $oldTree->textNodes;
+		$this->oldBodyNode = $oldTree->bodyNode;
+	}
+
+	public function markAsNew($start, $end) {
+		if ($end <= $start) {
+			return;
+		}
+
+		if ($this->whiteAfterLastChangedPart) {
+			$this->textNodes[$start]->whiteBefore = false;
+		}
+
+		for ($i = $start; $i < $end; ++$i) {
+			$mod = new Modification(Modification::ADDED);
+			$mod->id = $this->newID;
+			$this->textNodes[$i]->modification = $mod;
+		}
+		if ($start < $end) {
+			$this->textNodes[$start]->modification->firstOfID = true;
+		}
+		++$this->newID;
+	}
+
+	public function handlePossibleChangedPart($leftstart, $leftend,	$rightstart, $rightend) {
+		$i = $rightstart;
+		$j = $leftstart;
+
+		if ($this->changedIDUsed) {
+			++$this->changedID;
+			$this->changedIDUsed = false;
+		}
+
+		$changes;
+		while ($i < $rightend) {
+			$acthis = new AncestorComparator($this->textNodes[$i]->getParentTree());
+			$acother = new AncestorComparator($this->oldTextNodes[$j]->getParentTree());
+			$result = $acthis->getResult($acother);
+			unset($acthis, $acother);
+
+			if ( $result ) {
+				$mod = new Modification(Modification::CHANGED);
+
+				if (!$this->changedIDUsed) {
+					$mod->firstOfID = true;
+				} else if (!is_null( $result ) && $result !== $this->changes) {
+					++$this->changedID;
+					$mod->firstOfID = true;
+				}
+
+				$mod->changes = $result;
+				$mod->id = $this->changedID;
+
+				$this->textNodes[$i]->modification = $mod;
+				$this->changes = $result;
+				$this->changedIDUsed = true;
+			} else if ($this->changedIDUsed) {
+				++$this->changedID;
+				$this->changedIDUsed = false;
+			}
+			++$i;
+			++$j;
+		}
+	}
+
+	public function markAsDeleted($start, $end, $before) {
+
+		if ($end <= $start) {
+			return;
+		}
+
+		if ($before > 0 && $this->textNodes[$before - 1]->whiteAfter) {
+			$this->whiteAfterLastChangedPart = true;
+		} else {
+			$this->whiteAfterLastChangedPart = false;
+		}
+
+		for ($i = $start; $i < $end; ++$i) {
+			$mod = new Modification(Modification::REMOVED);
+			$mod->id = $this->deletedID;
+
+			// oldTextNodes is used here because we're going to move its deleted
+			// elements to this tree!
+			$this->oldTextNodes[$i]->modification = $mod;
+		}
+		$this->oldTextNodes[$start]->modification->firstOfID = true;
+
+		$root = $this->oldTextNodes[$start]->getLastCommonParent($this->oldTextNodes[$end-1])->parent;
+
+		$junk1 = $junk2 = null;
+		$deletedNodes = $root->getMinimalDeletedSet($this->deletedID, $junk1, $junk2);
+
+		HTMLDiffer::diffDebug( "Minimal set of deleted nodes of size " . count($deletedNodes) . "\n" );
+
+		// Set prevLeaf to the leaf after which the old HTML needs to be
+		// inserted
+		if ($before > 0) {
+			$prevLeaf = $this->textNodes[$before - 1];
+		}
+		// Set nextLeaf to the leaf before which the old HTML needs to be
+		// inserted
+		if ($before < count($this->textNodes)) {
+			$nextLeaf = $this->textNodes[$before];
+		}
+
+		while (count($deletedNodes) > 0) {
+			if (isset($prevLeaf)) {
+				$prevResult = $prevLeaf->getLastCommonParent($deletedNodes[0]);
+			} else {
+				$prevResult = new LastCommonParentResult();
+				$prevResult->parent = $this->bodyNode;
+				$prevResult->indexInLastCommonParent = -1;
+			}
+			if (isset($nextleaf)) {
+				$nextResult = $nextLeaf->getLastCommonParent($deletedNodes[count($deletedNodes) - 1]);
+			} else {
+				$nextResult = new LastCommonParentResult();
+				$nextResult->parent = $this->bodyNode;
+				$nextResult->indexInLastCommonParent = $this->bodyNode->getNbChildren();
+			}
+
+			if ($prevResult->lastCommonParentDepth == $nextResult->lastCommonParentDepth) {
+				// We need some metric to choose which way to add-...
+				if ($deletedNodes[0]->parent === $deletedNodes[count($deletedNodes) - 1]->parent
+						&& $prevResult->parent === $nextResult->parent) {
+					// The difference is not in the parent
+					$prevResult->lastCommonParentDepth = $prevResult->lastCommonParentDepth + 1;
+				} else {
+					// The difference is in the parent, so compare them
+					// now THIS is tricky
+					$distancePrev = $deletedNodes[0]->parent->getMatchRatio($prevResult->parent);
+					$distanceNext = $deletedNodes[count($deletedNodes) - 1]->parent->getMatchRatio($nextResult->parent);
+
+					if ($distancePrev <= $distanceNext) {
+						$prevResult->lastCommonParentDepth = $prevResult->lastCommonParentDepth + 1;
+					} else {
+						$nextResult->lastCommonParentDepth = $nextResult->lastCommonParentDepth + 1;
+					}
+				}
+
+			}
+
+			if ($prevResult->lastCommonParentDepth > $nextResult->lastCommonParentDepth) {
+				// Inserting at the front
+				if ($prevResult->splittingNeeded) {
+					$prevLeaf->parent->splitUntil($prevResult->parent, $prevLeaf, true);
+				}
+				$prevLeaf = $deletedNodes[0]->copyTree();
+				unset($deletedNodes[0]);
+				$deletedNodes = array_values($deletedNodes);
+				$prevLeaf->setParent($prevResult->parent);
+				$prevResult->parent->addChildAbsolute($prevLeaf,$prevResult->indexInLastCommonParent + 1);
+			} else if ($prevResult->lastCommonParentDepth < $nextResult->lastCommonParentDepth) {
+				// Inserting at the back
+				if ($nextResult->splittingNeeded) {
+					$splitOccured = $nextLeaf->parent->splitUntil($nextResult->parent, $nextLeaf, false);
+					if ($splitOccured) {
+						// The place where to insert is shifted one place to the
+						// right
+						$nextResult->indexInLastCommonParent = $nextResult->indexInLastCommonParent + 1;
+					}
+				}
+				$nextLeaf = $deletedNodes[count(deletedNodes) - 1]->copyTree();
+				unset($deletedNodes[count(deletedNodes) - 1]);
+				$deletedNodes = array_values($deletedNodes);
+				$nextLeaf->setParent($nextResult->parent);
+				$nextResult->parent->addChildAbsolute($nextLeaf,$nextResult->indexInLastCommonParent);
+			}
+		}
+		++$this->deletedID;
+	}
+
+	public function expandWhiteSpace() {
+		$this->bodyNode->expandWhiteSpace();
+	}
+
+	public function lengthNew(){
+		return count($this->textNodes);
+	}
+
+	public function lengthOld(){
+		return count($this->oldTextNodes);
+	}
+}
+
+class HTMLDiffer {
+
+	private $output;
+	private static $debug = '';
+
+	function __construct($output) {
+		$this->output = $output;
+	}
+
+	function htmlDiff($from, $to) {
+		wfProfileIn( __METHOD__ );
+		// Create an XML parser
+		$xml_parser = xml_parser_create('');
+
+		$domfrom = new DomTreeBuilder();
+
+		// Set the functions to handle opening and closing tags
+		xml_set_element_handler($xml_parser, array($domfrom, "startElement"), array($domfrom, "endElement"));
+
+		// Set the function to handle blocks of character data
+		xml_set_character_data_handler($xml_parser, array($domfrom, "characters"));
+
+		HTMLDiffer::diffDebug( "Parsing " . strlen($from) . " characters worth of HTML\n" );
+		if (!xml_parse($xml_parser, '<?xml version="1.0" encoding="UTF-8"?>'.Sanitizer::hackDocType().'<body>', false)
+					|| !xml_parse($xml_parser, $from, false)
+					|| !xml_parse($xml_parser, '</body>', true)){
+			$error = xml_error_string(xml_get_error_code($xml_parser));
+			$line = xml_get_current_line_number($xml_parser);
+			HTMLDiffer::diffDebug( "XML error: $error at line $line\n" );
+		}
+		xml_parser_free($xml_parser);
+		unset($from);
+
+		$xml_parser = xml_parser_create('');
+
+		$domto = new DomTreeBuilder();
+
+		// Set the functions to handle opening and closing tags
+		xml_set_element_handler($xml_parser, array($domto, "startElement"), array($domto, "endElement"));
+
+		// Set the function to handle blocks of character data
+		xml_set_character_data_handler($xml_parser, array($domto, "characters"));
+
+		HTMLDiffer::diffDebug( "Parsing " . strlen($to) . " characters worth of HTML\n" );
+		if (!xml_parse($xml_parser, '<?xml version="1.0" encoding="UTF-8"?>'.Sanitizer::hackDocType().'<body>', false)
+		|| !xml_parse($xml_parser, $to, false)
+		|| !xml_parse($xml_parser, '</body>', true)){
+			$error = xml_error_string(xml_get_error_code($xml_parser));
+			$line = xml_get_current_line_number($xml_parser);
+			HTMLDiffer::diffDebug( "XML error: $error at line $line\n" );
+		}
+		xml_parser_free($xml_parser);
+		unset($to);
+
+		$diffengine = new WikiDiff3();
+		$differences = $this->preProcess($diffengine->diff_range($domfrom->getDiffLines(), $domto->getDiffLines()));
+		unset($xml_parser, $diffengine);
+
+		$domdiffer = new TextNodeDiffer($domto, $domfrom);
+
+		$currentIndexLeft = 0;
+		$currentIndexRight = 0;
+		foreach ($differences as &$d) {
+			if ($d->leftstart > $currentIndexLeft) {
+				$domdiffer->handlePossibleChangedPart($currentIndexLeft, $d->leftstart,
+					$currentIndexRight, $d->rightstart);
+			}
+			if ($d->leftlength > 0) {
+				$domdiffer->markAsDeleted($d->leftstart, $d->leftend, $d->rightstart);
+			}
+			$domdiffer->markAsNew($d->rightstart, $d->rightend);
+
+			$currentIndexLeft = $d->leftend;
+			$currentIndexRight = $d->rightend;
+		}
+		$oldLength = $domdiffer->lengthOld();
+		if ($currentIndexLeft < $oldLength) {
+			$domdiffer->handlePossibleChangedPart($currentIndexLeft, $oldLength, $currentIndexRight, $domdiffer->lengthNew());
+		}
+		$domdiffer->expandWhiteSpace();
+		$output = new HTMLOutput('htmldiff', $this->output);
+		$output->parse($domdiffer->bodyNode);
+		wfProfileOut( __METHOD__ );
+	}
+
+	private function preProcess(/*array*/ $differences) {
+		$newRanges = array();
+
+		$nbDifferences = count($differences);
+		for ($i = 0; $i < $nbDifferences; ++$i) {
+			$leftStart = $differences[$i]->leftstart;
+			$leftEnd = $differences[$i]->leftend;
+			$rightStart = $differences[$i]->rightstart;
+			$rightEnd = $differences[$i]->rightend;
+
+			$leftLength = $leftEnd - $leftStart;
+			$rightLength = $rightEnd - $rightStart;
+
+			while ($i + 1 < $nbDifferences && self::score($leftLength,
+						$differences[$i + 1]->leftlength,
+						$rightLength,
+						$differences[$i + 1]->rightlength)
+					> ($differences[$i + 1]->leftstart - $leftEnd)) {
+				$leftEnd = $differences[$i + 1]->leftend;
+				$rightEnd = $differences[$i + 1]->rightend;
+				$leftLength = $leftEnd - $leftStart;
+				$rightLength = $rightEnd - $rightStart;
+				++$i;
+			}
+			$newRanges[] = new RangeDifference($leftStart, $leftEnd, $rightStart, $rightEnd);
+		}
+		return $newRanges;
+	}
+
+	/**
+	 * Heuristic to merge differences for readability.
+	 */
+	public static function score($ll, $nll, $rl, $nrl) {
+		if (($ll == 0 && $nll == 0)
+				|| ($rl == 0 && $nrl == 0)) {
+			return 0;
+		}
+		$numbers = array($ll, $nll, $rl, $nrl);
+		$d = 0;
+		foreach ($numbers as &$number) {
+			while ($number > 3) {
+				$d += 3;
+				$number -= 3;
+				$number *= 0.5;
+			}
+			$d += $number;
+
+		}
+		return $d / (1.5 * count($numbers));
+	}
+
+	/**
+	 * Add to debug output
+	 * @param string $str Debug output
+	 */
+	public static function diffDebug( $str ) {
+		self :: $debug .= $str;
+	}
+	
+	/**
+	 * Get debug output
+	 * @return string
+	 */
+	public static function getDebugOutput() {
+		return self :: $debug;
+	}
+
+}
+
+class TextOnlyComparator {
+
+	public $leafs = array();
+
+	function _construct(TagNode $tree) {
+		$this->addRecursive($tree);
+		$this->leafs = array_map(array('TextNode','toDiffLine'), $this->leafs);
+	}
+
+	private function addRecursive(TagNode $tree) {
+		foreach ($tree->children as &$child) {
+			if ($child instanceof TagNode) {
+				$this->addRecursive($child);
+			} else if ($child instanceof TextNode) {
+				$this->leafs[] = $node;
+			}
+		}
+	}
+
+	public function getMatchRatio(TextOnlyComparator $other) {
+		$nbOthers = count($other->leafs);
+		$nbThis = count($this->leafs);
+		if($nbOthers == 0 || $nbThis == 0){
+			return -log(0);
+		}
+
+		$diffengine = new WikiDiff3(25000, 1.35);
+		$diffengine->diff($this->leafs, $other->leafs);
+
+		$lcsLength = $diffengine->getLcsLength();
+
+		$distanceThis = $nbThis-$lcsLength;
+
+		return (2.0 - $lcsLength/$nbOthers - $lcsLength/$nbThis) / 2.0;
+	}
+}
+
+/**
+ * A comparator used when calculating the difference in ancestry of two Nodes.
+ */
+class AncestorComparator {
+
+	public $ancestors;
+	public $ancestorsText;
+
+	function __construct(/*array*/ $ancestors) {
+		$this->ancestors = $ancestors;
+		$this->ancestorsText = array_map(array('TagNode','toDiffLine'), $ancestors);
+	}
+
+	public $compareTxt = "";
+
+	public function getResult(AncestorComparator $other) {
+
+		$diffengine = new WikiDiff3(10000, 1.35);
+		$differences = $diffengine->diff_range($other->ancestorsText,$this->ancestorsText);
+
+		if (count($differences) == 0){
+			return null;
+		}
+		$changeTxt = new ChangeTextGenerator($this, $other);
+
+		return $changeTxt->getChanged($differences)->toString();;
+	}
+}
+
+class ChangeTextGenerator {
+
+	private $ancestorComparator;
+	private $other;
+
+	private $factory;
+
+	function __construct(AncestorComparator $ancestorComparator, AncestorComparator $other) {
+		$this->ancestorComparator = $ancestorComparator;
+		$this->other = $other;
+		$this->factory = new TagToStringFactory();
+	}
+
+	public function getChanged(/*array*/ $differences) {
+		$txt = new ChangeText;
+		$rootlistopened = false;
+		if (count($differences) > 1) {
+			$txt->addHtml('<ul class="changelist">');
+			$rootlistopened = true;
+		}
+		$nbDifferences = count($differences);
+		for ($j = 0; $j < $nbDifferences; ++$j) {
+			$d = $differences[$j];
+			$lvl1listopened = false;
+			if ($rootlistopened) {
+				$txt->addHtml('<li>');
+			}
+			if ($d->leftlength + $d->rightlength > 1) {
+				$txt->addHtml('<ul class="changelist">');
+				$lvl1listopened = true;
+			}
+			// left are the old ones
+			for ($i = $d->leftstart; $i < $d->leftend; ++$i) {
+				if ($lvl1listopened){
+					$txt->addHtml('<li>');
+				}
+				// add a bullet for a old tag
+				$this->addTagOld($txt, $this->other->ancestors[$i]);
+				if ($lvl1listopened){
+					$txt->addHtml('</li>');
+				}
+			}
+			// right are the new ones
+			for ($i = $d->rightstart; $i < $d->rightend; ++$i) {
+				if ($lvl1listopened){
+					$txt->addHtml('<li>');
+				}
+				// add a bullet for a new tag
+				$this->addTagNew($txt, $this->ancestorComparator->ancestors[$i]);
+
+				if ($lvl1listopened){
+					$txt->addHtml('</li>');
+				}
+			}
+			if ($lvl1listopened) {
+				$txt->addHtml('</ul>');
+			}
+			if ($rootlistopened) {
+				$txt->addHtml('</li>');
+			}
+		}
+		if ($rootlistopened) {
+			$txt->addHtml('</ul>');
+		}
+		return $txt;
+	}
+
+	private function addTagOld(ChangeText $txt, TagNode $ancestor) {
+		$this->factory->create($ancestor)->getRemovedDescription($txt);
+	}
+
+	private function addTagNew(ChangeText $txt, TagNode $ancestor) {
+		$this->factory->create($ancestor)->getAddedDescription($txt);
+	}
+}
+
+class ChangeText {
+
+	private $txt = "";
+
+	public function addHtml($s) {
+		$this->txt .= $s;
+	}
+
+	public function toString() {
+		return $this->txt;
+	}
+}
+
+class TagToStringFactory {
+
+	private static $containerTags = array('html', 'body', 'p', 'blockquote',
+		'h1', 'h2', 'h3', 'h4', 'h5', 'pre', 'div', 'ul', 'ol', 'li',
+		'table', 'tbody', 'tr', 'td', 'th', 'br', 'hr', 'code', 'dl',
+		'dt', 'dd', 'input', 'form', 'img', 'span', 'a');
+
+	private static $styleTags = array('i', 'b', 'strong', 'em', 'font',
+		'big', 'del', 'tt', 'sub', 'sup', 'strike');
+
+	const MOVED = 1;
+	const STYLE = 2;
+	const UNKNOWN = 4;
+
+	public function create(TagNode $node) {
+		$sem = $this->getChangeSemantic($node->qName);
+		if (strcasecmp($node->qName,'a') == 0) {
+			return new AnchorToString($node, $sem);
+		}
+		if (strcasecmp($node->qName,'img') == 0) {
+			return new NoContentTagToString($node, $sem);
+		}
+		return new TagToString($node, $sem);
+	}
+
+	protected function getChangeSemantic($qname) {
+		if (in_array(strtolower($qname),self::$containerTags)) {
+			return self::MOVED;
+		}
+		if (in_array(strtolower($qname),self::$styleTags)) {
+			return self::STYLE;
+		}
+		return self::UNKNOWN;
+	}
+}
+
+class TagToString {
+
+	protected $node;
+
+	protected $sem;
+
+	function __construct(TagNode $node, $sem) {
+		$this->node = $node;
+		$this->sem = $sem;
+	}
+
+	public function getRemovedDescription(ChangeText $txt) {
+		$tagDescription = wfMsgExt('diff-' . $this->node->qName, 'parseinline' );
+		if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
+			$tagDescription = "&lt;" . $this->node->qName . "&gt;";
+		}
+		if ($this->sem == TagToStringFactory::MOVED) {
+			$txt->addHtml( wfMsgExt( 'diff-movedoutof', 'parseinline', $tagDescription ) );
+		} else if ($this->sem == TagToStringFactory::STYLE) {
+			$txt->addHtml( wfMsgExt( 'diff-styleremoved' , 'parseinline', $tagDescription ) );
+		} else {
+			$txt->addHtml( wfMsgExt( 'diff-removed' , 'parseinline', $tagDescription ) );
+		}
+		$this->addAttributes($txt, $this->node->attributes);
+		$txt->addHtml('.');
+	}
+
+	public function getAddedDescription(ChangeText $txt) {
+		$tagDescription = wfMsgExt('diff-' . $this->node->qName, 'parseinline' );
+		if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
+			$tagDescription = "&lt;" . $this->node->qName . "&gt;";
+		}
+		if ($this->sem == TagToStringFactory::MOVED) {
+			$txt->addHtml( wfMsgExt( 'diff-movedto' , 'parseinline', $tagDescription) );
+		} else if ($this->sem == TagToStringFactory::STYLE) {
+			$txt->addHtml( wfMsgExt( 'diff-styleadded', 'parseinline', $tagDescription ) );
+		} else {
+			$txt->addHtml( wfMsgExt( 'diff-added', 'parseinline', $tagDescription ) );
+		}
+		$this->addAttributes($txt, $this->node->attributes);
+		$txt->addHtml('.');
+	}
+
+	protected function addAttributes(ChangeText $txt, array $attributes) {
+		if (count($attributes) < 1) {
+			return;
+		}
+		$firstOne = true;
+		$nbAttributes_min_1 = count($attributes)-1;
+		$keys = array_keys($attributes);
+		for ($i=0;$i<$nbAttributes_min_1;$i++) {
+			$key = $keys[$i];
+			$attr = $attributes[$key];
+			if($firstOne) {
+				$firstOne = false;
+				$txt->addHtml( wfMsgExt('diff-with', 'escapenoentities', $this->translateArgument($key), htmlspecialchars($attr) ) );
+				continue;
+			}
+			$txt->addHtml( wfMsgExt( 'comma-separator', 'escapenoentities' ) .
+				wfMsgExt( 'diff-with-additional', 'escapenoentities',
+				$this->translateArgument( $key ), htmlspecialchars( $attr ) )
+			);
+		}
+
+		if ($nbAttributes_min_1 > 0) {
+			$txt->addHtml( wfMsgExt( 'diff-with-final', 'escapenoentities',
+			$this->translateArgument($keys[$nbAttributes_min_1]),
+			htmlspecialchars($attributes[$keys[$nbAttributes_min_1]]) ) );
+		}
+	}
+
+	protected function translateArgument($name) {
+		$translation = wfMsgExt('diff-' . $name, 'parseinline' );
+		if ( wfEmptyMsg( 'diff-' . $name, $translation ) ) {
+			$translation = "&lt;" . $name . "&gt;";;
+		}
+		return htmlspecialchars( $translation );
+	}
+}
+
+class NoContentTagToString extends TagToString {
+
+	function __construct(TagNode $node, $sem) {
+		parent::__construct($node, $sem);
+	}
+
+	public function getAddedDescription(ChangeText $txt) {
+		$tagDescription = wfMsgExt('diff-' . $this->node->qName, 'parseinline' );
+		if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
+			$tagDescription = "&lt;" . $this->node->qName . "&gt;";
+		}
+		$txt->addHtml( wfMsgExt('diff-changedto', 'parseinline', $tagDescription ) );
+		$this->addAttributes($txt, $this->node->attributes);
+		$txt->addHtml('.');
+	}
+
+	public function getRemovedDescription(ChangeText $txt) {
+		$txt->addHtml( wfMsgExt('diff-changedfrom', 'parseinline', $tagDescription ) );
+		$this->addAttributes($txt, $this->node->attributes);
+		$txt->addHtml('.');
+	}
+}
+
+class AnchorToString extends TagToString {
+
+	function __construct(TagNode $node, $sem) {
+		parent::__construct($node, $sem);
+	}
+
+	protected function addAttributes(ChangeText $txt, array $attributes) {
+		if (array_key_exists('href', $attributes)) {
+			$txt->addHtml(' ' . wfMsgExt( 'diff-withdestination', 'parseinline', htmlspecialchars($attributes['href']) ) );
+			unset($attributes['href']);
+		}
+		parent::addAttributes($txt, $attributes);
+	}
+}
+
+/**
+ * Takes a branch root and creates an HTML file for it.
+ */
+class HTMLOutput{
+
+	private $prefix;
+	private $handler;
+
+	function __construct($prefix, $handler) {
+		$this->prefix = $prefix;
+		$this->handler = $handler;
+	}
+
+	public function parse(TagNode $node) {
+		$handler = &$this->handler;
+
+		if (strcasecmp($node->qName, 'img') != 0 && strcasecmp($node->qName, 'body') != 0) {
+			$handler->startElement($node->qName, $node->attributes);
+		}
+
+		$newStarted = false;
+		$remStarted = false;
+		$changeStarted = false;
+		$changeTXT = '';
+
+		foreach ($node->children as &$child) {
+			if ($child instanceof TagNode) {
+				if ($newStarted) {
+					$handler->endElement('span');
+					$newStarted = false;
+				} else if ($changeStarted) {
+					$handler->endElement('span');
+					$changeStarted = false;
+				} else if ($remStarted) {
+					$handler->endElement('span');
+					$remStarted = false;
+				}
+				$this->parse($child);
+			} else if ($child instanceof TextNode) {
+				$mod = $child->modification;
+
+				if ($newStarted && ($mod->type != Modification::ADDED || $mod->firstOfID)) {
+					$handler->endElement('span');
+					$newStarted = false;
+				} else if ($changeStarted && ($mod->type != Modification::CHANGED
+						|| $mod->changes != $changeTXT || $mod->firstOfID)) {
+					$handler->endElement('span');
+					$changeStarted = false;
+				} else if ($remStarted && ($mod->type != Modification::REMOVED || $mod ->firstOfID)) {
+					$handler->endElement('span');
+					$remStarted = false;
+				}
+
+				// no else because a removed part can just be closed and a new
+				// part can start
+				if (!$newStarted && $mod->type == Modification::ADDED) {
+					$attrs = array('class' => 'diff-html-added');
+					if ($mod->firstOfID) {
+						$attrs['id'] = "added-{$this->prefix}-{$mod->id}";
+					}
+					$handler->startElement('span', $attrs);
+					$newStarted = true;
+				} else if (!$changeStarted && $mod->type == Modification::CHANGED) {
+					$attrs = array('class' => 'diff-html-changed');
+					if ($mod->firstOfID) {
+						$attrs['id'] = "changed-{$this->prefix}-{$mod->id}";
+					}
+					$handler->startElement('span', $attrs);
+
+					//tooltip
+					$handler->startElement('span', array('class' => 'tip'));
+					$handler->html($mod->changes);
+					$handler->endElement('span');
+
+					$changeStarted = true;
+					$changeTXT = $mod->changes;
+				} else if (!$remStarted && $mod->type == Modification::REMOVED) {
+					$attrs = array('class'=>'diff-html-removed');
+					if ($mod->firstOfID) {
+						$attrs['id'] = "removed-{$this->prefix}-{$mod->id}";
+					}
+					$handler->startElement('span', $attrs);
+					$remStarted = true;
+				}
+
+				$chars = $child->text;
+
+				if ($child instanceof ImageNode) {
+					$this->writeImage($child);
+				} else {
+					$handler->characters($chars);
+				}
+			}
+		}
+
+		if ($newStarted) {
+			$handler->endElement('span');
+			$newStarted = false;
+		} else if ($changeStarted) {
+			$handler->endElement('span');
+			$changeStarted = false;
+		} else if ($remStarted) {
+			$handler->endElement('span');
+			$remStarted = false;
+		}
+
+		if (strcasecmp($node->qName, 'img') != 0
+				&& strcasecmp($node->qName, 'body') != 0) {
+			$handler->endElement($node->qName);
+		}
+	}
+
+	private function writeImage(ImageNode  $imgNode) {
+		$attrs = $imgNode->attributes;
+		$this->handler->startElement('img', $attrs);
+		$this->handler->endElement('img');
+	}
+}
+
+class DelegatingContentHandler {
+
+	private $delegate;
+
+	function __construct($delegate) {
+		$this->delegate = $delegate;
+	}
+
+	function startElement($qname, /*array*/ $arguments) {
+		$this->delegate->addHtml(Xml::openElement($qname, $arguments));
+	}
+
+	function endElement($qname){
+		$this->delegate->addHtml(Xml::closeElement($qname));
+	}
+
+	function characters($chars){
+		$this->delegate->addHtml(htmlspecialchars($chars));
+	}
+
+	function html($html){
+		$this->delegate->addHtml($html);
+	}
+}
diff --git a/includes/diff/Nodes.php b/includes/diff/Nodes.php
new file mode 100644
index 00000000..1b1363d4
--- /dev/null
+++ b/includes/diff/Nodes.php
@@ -0,0 +1,439 @@
+<?php
+
+/** Copyright (C) 2008 Guy Van den Broeck <guy@guyvdb.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * or see http://www.gnu.org/
+ * 
+ */
+ 
+/**
+ * Any element in the DOM tree of an HTML document.
+ * @ingroup DifferenceEngine
+ */
+class Node {
+
+	public $parent;
+
+	protected $parentTree;
+
+	public $whiteBefore = false;
+
+	public $whiteAfter = false;
+
+	function __construct($parent) {
+		$this->parent = $parent;
+	}
+
+	public function getParentTree() {
+		if (!isset($this->parentTree)) {
+			if (!is_null($this->parent)) {
+				$this->parentTree = $this->parent->getParentTree();
+				$this->parentTree[] = $this->parent;
+			} else {
+				$this->parentTree = array();
+			}
+		}
+		return $this->parentTree;
+	}
+
+	public function getLastCommonParent(Node $other) {
+		$result = new LastCommonParentResult();
+
+		$myParents = $this->getParentTree();
+		$otherParents = $other->getParentTree();
+
+		$i = 1;
+		$isSame = true;
+		$nbMyParents = count($myParents);
+		$nbOtherParents = count($otherParents);
+		while ($isSame && $i < $nbMyParents && $i < $nbOtherParents) {
+			if (!$myParents[$i]->openingTag === $otherParents[$i]->openingTag) {
+				$isSame = false;
+			} else {
+				// After a while, the index i-1 must be the last common parent
+				$i++;
+			}
+		}
+
+		$result->lastCommonParentDepth = $i - 1;
+		$result->parent = $myParents[$i - 1];
+
+		if (!$isSame || $nbMyParents > $nbOtherParents) {
+			// Not all tags matched, or all tags matched but
+			// there are tags left in this tree
+			$result->indexInLastCommonParent = $myParents[$i - 1]->getIndexOf($myParents[$i]);
+			$result->splittingNeeded = true;
+		} else if ($nbMyParents <= $nbOtherParents) {
+			$result->indexInLastCommonParent = $myParents[$i - 1]->getIndexOf($this);
+		}
+		return $result;
+	}
+
+	public function setParent($parent) {
+		$this->parent = $parent;
+		unset($this->parentTree);
+	}
+
+	public function inPre() {
+		$tree = $this->getParentTree();
+		foreach ($tree as &$ancestor) {
+			if ($ancestor->isPre()) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
+
+/**
+ * Node that can contain other nodes. Represents an HTML tag.
+ * @ingroup DifferenceEngine
+ */
+class TagNode extends Node {
+
+	public $children = array();
+
+	public $qName;
+
+	public $attributes = array();
+
+	public $openingTag;
+
+	function __construct($parent, $qName, /*array*/ $attributes) {
+		parent::__construct($parent);
+		$this->qName = strtolower($qName);
+		foreach($attributes as $key => &$value){
+			$this->attributes[strtolower($key)] = $value;
+		}
+		return $this->openingTag = Xml::openElement($this->qName, $this->attributes);
+	}
+
+	public function addChildAbsolute(Node $node, $index) {
+		array_splice($this->children, $index, 0, array($node));
+	}
+
+	public function getIndexOf(Node $child) {
+		// don't trust array_search with objects
+		foreach ($this->children as $key => &$value){
+			if ($value === $child) {
+				return $key;
+			}
+		}
+		return null;
+	}
+
+	public function getNbChildren() {
+		return count($this->children);
+	}
+
+	public function getMinimalDeletedSet($id, &$allDeleted, &$somethingDeleted) {
+		$nodes = array();
+
+		$allDeleted = false;
+		$somethingDeleted = false;
+		$hasNonDeletedDescendant = false;
+
+		if (empty($this->children)) {
+			return $nodes;
+		}
+
+		foreach ($this->children as &$child) {
+			$allDeleted_local = false;
+			$somethingDeleted_local = false;
+			$childrenChildren = $child->getMinimalDeletedSet($id, $allDeleted_local, $somethingDeleted_local);
+			if ($somethingDeleted_local) {
+				$nodes = array_merge($nodes, $childrenChildren);
+				$somethingDeleted = true;
+			}
+			if (!$allDeleted_local) {
+				$hasNonDeletedDescendant = true;
+			}
+		}
+		if (!$hasNonDeletedDescendant) {
+			$nodes = array($this);
+			$allDeleted = true;
+		}
+		return $nodes;
+	}
+
+	public function splitUntil(TagNode $parent, Node $split, $includeLeft) {
+		$splitOccured = false;
+		if ($parent !== $this) {
+			$part1 = new TagNode(null, $this->qName, $this->attributes);
+			$part2 = new TagNode(null, $this->qName, $this->attributes);
+			$part1->setParent($this->parent);
+			$part2->setParent($this->parent);
+
+			$onSplit = false;
+			$pastSplit = false;
+			foreach ($this->children as &$child)
+			{
+				if ($child === $split) {
+					$onSplit = true;
+				}
+				if(!$pastSplit || ($onSplit && $includeLeft)) {
+					$child->setParent($part1);
+					$part1->children[] = $child;
+				} else {
+					$child->setParent($part2);
+					$part2->children[] = $child;
+				}
+				if ($onSplit) {
+					$onSplit = false;
+					$pastSplit = true;
+				}
+			}
+			$myindexinparent = $this->parent->getIndexOf($this);
+			if (!empty($part1->children)) {
+				$this->parent->addChildAbsolute($part1, $myindexinparent);
+			}
+			if (!empty($part2->children)) {
+				$this->parent->addChildAbsolute($part2, $myindexinparent);
+			}
+			if (!empty($part1->children) && !empty($part2->children)) {
+				$splitOccured = true;
+			}
+
+			$this->parent->removeChild($myindexinparent);
+
+			if ($includeLeft) {
+				$this->parent->splitUntil($parent, $part1, $includeLeft);
+			} else {
+				$this->parent->splitUntil($parent, $part2, $includeLeft);
+			}
+		}
+		return $splitOccured;
+
+	}
+
+	private function removeChild($index) {
+		unset($this->children[$index]);
+		$this->children = array_values($this->children);
+	}
+
+	public static $blocks = array('html', 'body','p','blockquote', 'h1',
+		'h2', 'h3', 'h4', 'h5', 'pre', 'div', 'ul', 'ol', 'li', 'table',
+		'tbody', 'tr', 'td', 'th', 'br');
+
+	public function copyTree() {
+		$newThis = new TagNode(null, $this->qName, $this->attributes);
+		$newThis->whiteBefore = $this->whiteBefore;
+		$newThis->whiteAfter = $this->whiteAfter;
+		foreach ($this->children as &$child) {
+			$newChild = $child->copyTree();
+			$newChild->setParent($newThis);
+			$newThis->children[] = $newChild;
+		}
+		return $newThis;
+	}
+
+	public function getMatchRatio(TagNode $other) {
+		$txtComp = new TextOnlyComparator($other);
+		return $txtComp->getMatchRatio(new TextOnlyComparator($this));
+	}
+
+	public function expandWhiteSpace() {
+		$shift = 0;
+		$spaceAdded = false;
+
+		$nbOriginalChildren = $this->getNbChildren();
+		for ($i = 0; $i < $nbOriginalChildren; ++$i) {
+			$child = $this->children[$i + $shift];
+
+			if ($child instanceof TagNode) {
+				if (!$child->isPre()) {
+					$child->expandWhiteSpace();
+				}
+			}
+			if (!$spaceAdded && $child->whiteBefore) {
+				$ws = new WhiteSpaceNode(null, ' ', $child->getLeftMostChild());
+				$ws->setParent($this);
+				$this->addChildAbsolute($ws,$i + ($shift++));
+			}
+			if ($child->whiteAfter) {
+				$ws = new WhiteSpaceNode(null, ' ', $child->getRightMostChild());
+				$ws->setParent($this);
+				$this->addChildAbsolute($ws,$i + 1 + ($shift++));
+				$spaceAdded = true;
+			} else {
+				$spaceAdded = false;
+			}
+
+		}
+	}
+
+	public function getLeftMostChild() {
+		if (empty($this->children)) {
+			return $this;
+		}
+		return $this->children[0]->getLeftMostChild();
+	}
+
+	public function getRightMostChild() {
+		if (empty($this->children)) {
+			return $this;
+		}
+		return $this->children[$this->getNbChildren() - 1]->getRightMostChild();
+	}
+
+	public function isPre() {
+		return 0 == strcasecmp($this->qName,'pre');
+	}
+
+	public static function toDiffLine(TagNode $node) {
+		return $node->openingTag;
+	}
+}
+
+/**
+ * Represents a piece of text in the HTML file.
+ * @ingroup DifferenceEngine
+ */
+class TextNode extends Node {
+
+	public $text;
+
+	public $modification;
+
+	function __construct($parent, $text) {
+		parent::__construct($parent);
+		$this->modification = new Modification(Modification::NONE);
+		$this->text = $text;
+	}
+
+	public function copyTree() {
+		$clone = clone $this;
+		$clone->setParent(null);
+		return $clone;
+	}
+
+	public function getLeftMostChild() {
+		return $this;
+	}
+
+	public function getRightMostChild() {
+		return $this;
+	}
+
+	public function getMinimalDeletedSet($id, &$allDeleted, &$somethingDeleted) {
+		if ($this->modification->type == Modification::REMOVED
+					&& $this->modification->id == $id){
+			$somethingDeleted = true;
+			$allDeleted = true;
+			return array($this);
+		}
+		return array();
+	}
+
+	public function isSameText($other) {
+		if (is_null($other) || ! $other instanceof TextNode) {
+			return false;
+		}
+		return str_replace('\n', ' ',$this->text) === str_replace('\n', ' ',$other->text);
+	}
+
+	public static function toDiffLine(TextNode $node) {
+		return str_replace('\n', ' ',$node->text);
+	}
+}
+
+/**
+ * @todo Document
+ * @ingroup DifferenceEngine
+ */
+class WhiteSpaceNode extends TextNode {
+
+	function __construct($parent, $s, Node $like = null) {
+		parent::__construct($parent, $s);
+		if(!is_null($like) && $like instanceof TextNode) {
+			$newModification = clone $like->modification;
+			$newModification->firstOfID = false;
+			$this->modification = $newModification;
+		}
+	}
+}
+
+/**
+ * Represents the root of a HTML document.
+ * @ingroup DifferenceEngine
+ */
+class BodyNode extends TagNode {
+
+	function __construct() {
+		parent::__construct(null, 'body', array());
+	}
+
+	public function copyTree() {
+		$newThis = new BodyNode();
+		foreach ($this->children as &$child) {
+			$newChild = $child->copyTree();
+			$newChild->setParent($newThis);
+			$newThis->children[] = $newChild;
+		}
+		return $newThis;
+	}
+
+	public function getMinimalDeletedSet($id, &$allDeleted, &$somethingDeleted) {
+		$nodes = array();
+		foreach ($this->children as &$child) {
+			$childrenChildren = $child->getMinimalDeletedSet($id,
+						$allDeleted, $somethingDeleted);
+			$nodes = array_merge($nodes, $childrenChildren);
+		}
+		return $nodes;
+	}
+
+}
+
+/**
+ * Represents an image in HTML. Even though images do not contain any text they
+ * are independent visible objects on the page. They are logically a TextNode.
+ * @ingroup DifferenceEngine
+ */
+class ImageNode extends TextNode {
+
+	public $attributes;
+
+	function __construct(TagNode $parent, /*array*/ $attrs) {
+		if(!array_key_exists('src', $attrs)) {
+			HTMLDiffer::diffDebug( "Image without a source\n" );
+			parent::__construct($parent, '<img></img>');
+		}else{
+			parent::__construct($parent, '<img>' . strtolower($attrs['src']) . '</img>');
+		}
+		$this->attributes = $attrs;
+	}
+
+	public function isSameText($other) {
+		if (is_null($other) || ! $other instanceof ImageNode) {
+			return false;
+		}
+		return $this->text === $other->text;
+	}
+
+}
+
+/**
+ * No-op node
+ * @ingroup DifferenceEngine
+ */
+class DummyNode extends Node {
+
+	function __construct() {
+		// no op
+	}
+
+}
diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php
index 646256bb..3919cfbc 100644
--- a/includes/filerepo/ArchivedFile.php
+++ b/includes/filerepo/ArchivedFile.php
@@ -30,12 +30,9 @@ class ArchivedFile
 	/**#@-*/
 
 	function ArchivedFile( $title, $id=0, $key='' ) {
-		if( !is_object($title) ) {
-			throw new MWException( 'ArchivedFile constructor given bogus title.' );
-		}
 		$this->id = -1;
-		$this->title = $title;
-		$this->name = $title->getDBkey();
+		$this->title = false;
+		$this->name = false;
 		$this->group = '';
 		$this->key = '';
 		$this->size = 0;
@@ -51,6 +48,20 @@ class ArchivedFile
 		$this->timestamp = NULL;
 		$this->deleted = 0;
 		$this->dataLoaded = false;
+		
+		if( is_object($title) ) {
+			$this->title = $title;
+			$this->name = $title->getDBkey();
+		}
+		
+		if ($id)
+			$this->id = $id;
+		
+		if ($key)
+			$this->key = $key;
+		
+		if (!$id && !$key && !is_object($title))
+			throw new MWException( "No specifications provided to ArchivedFile constructor." );
 	}
 
 	/**
@@ -61,8 +72,19 @@ class ArchivedFile
 		if ( $this->dataLoaded ) {
 			return true;
 		}
-		$conds = ($this->id) ? "fa_id = {$this->id}" : "fa_storage_key = '{$this->key}'";
-		if( $this->title->getNamespace() == NS_IMAGE ) {
+		$conds = array();
+		
+		if ($this->id>0)
+			$conds['fa_id'] = $this->id;
+		if ($this->key)
+			$conds['fa_storage_key'] = $this->key;	
+		if ($this->title)
+			$conds['fa_name'] = $this->title->getDBkey();
+			
+		if (!count($conds))
+			throw new MWException( "No specific information for retrieving archived file" );
+		
+		if( !$this->title || $this->title->getNamespace() == NS_FILE ) {
 			$dbr = wfGetDB( DB_SLAVE );
 			$res = $dbr->select( 'filearchive',
 				array(
@@ -84,9 +106,7 @@ class ArchivedFile
 					'fa_user_text',
 					'fa_timestamp',
 					'fa_deleted' ),
-				array(
-					'fa_name' => $this->title->getDBkey(),
-					$conds ),
+				$conds,
 				__METHOD__,
 				array( 'ORDER BY' => 'fa_timestamp DESC' ) );
 
@@ -129,7 +149,7 @@ class ArchivedFile
 	 * @return ResultWrapper
 	 */
 	public static function newFromRow( $row ) {
-		$file = new ArchivedFile( Title::makeTitle( NS_IMAGE, $row->fa_name ) );
+		$file = new ArchivedFile( Title::makeTitle( NS_FILE, $row->fa_name ) );
 
 		$file->id = intval($row->fa_id);
 		$file->name = $row->fa_name;
@@ -251,7 +271,7 @@ class ArchivedFile
 	 */
 	public function getTimestamp() {
 		$this->load();
-		return $this->timestamp;
+		return wfTimestamp( TS_MW, $this->timestamp );
 	}
 
 	/**
diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index eb8df0f5..d561e61b 100644
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -6,7 +6,7 @@
  * @ingroup FileRepo
  */
 class FSRepo extends FileRepo {
-	var $directory, $deletedDir, $url, $hashLevels, $deletedHashLevels;
+	var $directory, $deletedDir, $url, $deletedHashLevels;
 	var $fileFactory = array( 'UnregisteredLocalFile', 'newFromTitle' );
 	var $oldFileFactory = false;
 	var $pathDisclosureProtection = 'simple';
@@ -452,14 +452,6 @@ class FSRepo extends FileRepo {
 	}
 
 	/**
-	 * Get a relative path including trailing slash, e.g. f/fa/
-	 * If the repo is not hashed, returns an empty string
-	 */
-	function getHashPath( $name ) {
-		return FileRepo::getHashPathForLevel( $name, $this->hashLevels );
-	}
-
-	/**
 	 * Get a relative path for a deletion archive key,
 	 * e.g. s/z/a/ for sza251lrxrc1jad41h5mgilp8nysje52.jpg
 	 */
diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 64b48e0a..4f0990af 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -264,7 +264,14 @@ abstract class File {
 	 * Overridden by LocalFile, UnregisteredLocalFile
 	 * STUB
 	 */
-	function getMetadata() { return false; }
+	public function getMetadata() { return false; }
+
+	/**
+	 * Return the bit depth of the file
+	 * Overridden by LocalFile
+	 * STUB
+	 */
+	public function getBitDepth() { return 0; }
 
 	/**
 	 * Return the size of the image file, in bytes
@@ -499,8 +506,7 @@ abstract class File {
 	 *
 	 * @param integer $width	maximum width of the generated thumbnail
 	 * @param integer $height	maximum height of the image (optional)
-	 * @param boolean $render	True to render the thumbnail if it doesn't exist,
-	 *                       	false to just return the URL
+	 * @param boolean $render	Deprecated
 	 *
 	 * @return ThumbnailImage or null on failure
 	 *
@@ -511,8 +517,7 @@ abstract class File {
 		if ( $height != -1 ) {
 			$params['height'] = $height;
 		}
-		$flags = $render ? self::RENDER_NOW : 0;
-		return $this->transform( $params, $flags );
+		return $this->transform( $params, 0 );
 	}
 
 	/**
@@ -575,7 +580,7 @@ abstract class File {
 			// Purge. Useful in the event of Core -> Squid connection failure or squid 
 			// purge collisions from elsewhere during failure. Don't keep triggering for 
 			// "thumbs" which have the main image URL though (bug 13776)
-			if ( $wgUseSquid && ($thumb->isError() || $thumb->getUrl() != $this->getURL()) ) {
+			if ( $wgUseSquid && ( !$thumb || $thumb->isError() || $thumb->getUrl() != $this->getURL()) ) {
 				SquidUpdate::purge( array( $thumbUrl ) );
 			}
 		} while (false);
@@ -678,8 +683,9 @@ abstract class File {
 	 * @param $limit integer Limit of rows to return
 	 * @param $start timestamp Only revisions older than $start will be returned
 	 * @param $end timestamp Only revisions newer than $end will be returned
+	 * @param $inc bool Include the endpoints of the time range
 	 */
-	function getHistory($limit = null, $start = null, $end = null) {
+	function getHistory($limit = null, $start = null, $end = null, $inc=true) {
 		return array();
 	}
 
@@ -1212,7 +1218,7 @@ abstract class File {
 		if ( $handler ) {
 			return $handler->getLongDesc( $this );
 		} else {
-			return MediaHandler::getLongDesc( $this );
+			return MediaHandler::getGeneralLongDesc( $this );
 		}
 	}
 
@@ -1221,7 +1227,7 @@ abstract class File {
 		if ( $handler ) {
 			return $handler->getShortDesc( $this );
 		} else {
-			return MediaHandler::getShortDesc( $this );
+			return MediaHandler::getGeneralShortDesc( $this );
 		}
 	}
 
@@ -1241,7 +1247,7 @@ abstract class File {
 	function getRedirectedTitle() {
 		if ( $this->redirected ) {
 			if ( !$this->redirectTitle )
-				$this->redirectTitle = Title::makeTitle( NS_IMAGE, $this->redirected );
+				$this->redirectTitle = Title::makeTitle( NS_FILE, $this->redirected );
 			return $this->redirectTitle;
 		}
 	}
diff --git a/includes/filerepo/FileCache.php b/includes/filerepo/FileCache.php
new file mode 100644
index 00000000..7840d1a3
--- /dev/null
+++ b/includes/filerepo/FileCache.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Cache of file objects, wrapping some RepoGroup functions to avoid redundant
+ * queries.  Loosely inspired by the LinkCache / LinkBatch classes for titles.
+ *
+ * ISSUE: Merge with RepoGroup?
+ *
+ * @ingroup FileRepo
+ */
+class FileCache {
+	var $repoGroup;
+	var $cache = array(), $notFound = array();
+
+	protected static $instance;
+
+	/**
+	 * Get a FileCache instance.  Typically, only one instance of FileCache
+	 * is needed in a MediaWiki invocation.
+	 */
+	static function singleton() {
+		if ( self::$instance ) {
+			return self::$instance;
+		}
+		self::$instance = new FileCache( RepoGroup::singleton() );
+		return self::$instance;
+	}
+
+	/**
+	 * Destroy the singleton instance, so that a new one will be created next
+	 * time singleton() is called.
+	 */
+	static function destroySingleton() {
+		self::$instance = null;
+	}
+
+	/**
+	 * Set the singleton instance to a given object
+	 */
+	static function setSingleton( $instance ) {
+		self::$instance = $instance;
+	}
+
+	/**
+	 * Construct a group of file repositories.
+	 * @param RepoGroup $repoGroup
+	 */
+	function __construct( $repoGroup ) {
+		$this->repoGroup = $repoGroup;
+	}
+
+
+	/**
+	 * Add some files to the cache.  This is a fairly low-level function,
+	 * which most users should not need to call.  Note that any existing
+	 * entries for the same keys will not be replaced.  Call clearFiles()
+	 * first if you need that.
+	 * @param array $files array of File objects, indexed by DB key
+	 */
+	function addFiles( $files ) {
+		wfDebug( "FileCache adding ".count( $files )." files\n" );
+		$this->cache += $files;
+	}
+
+	/**
+	 * Remove some files from the cache, so that their existence will be
+	 * rechecked.  This is a fairly low-level function, which most users
+	 * should not need to call.
+	 * @param array $remove array indexed by DB keys to remove (the values are ignored)
+	 */
+	function clearFiles( $remove ) {
+		wfDebug( "FileCache clearing data for ".count( $remove )." files\n" );
+		$this->cache = array_diff_keys( $this->cache, $remove );
+		$this->notFound = array_diff_keys( $this->notFound, $remove );
+	}
+
+	/**
+	 * Mark some DB keys as nonexistent.  This is a fairly low-level
+	 * function, which most users should not need to call.
+	 * @param array $dbkeys array of DB keys
+	 */
+	function markNotFound( $dbkeys ) {
+		wfDebug( "FileCache marking ".count( $dbkeys )." files as not found\n" );
+		$this->notFound += array_fill_keys( $dbkeys, true );
+	}
+
+
+	/**
+	 * Search the cache for a file.
+	 * @param mixed $title Title object or string
+	 * @return File object or false if it is not found
+	 * @todo Implement searching for old file versions(?)
+	 */
+	function findFile( $title ) {
+		if( !( $title instanceof Title ) ) {
+			$title = Title::makeTitleSafe( NS_FILE, $title );
+		}
+		if( !$title ) {
+			return false;  // invalid title?
+		}
+
+		$dbkey = $title->getDBkey();
+		if( array_key_exists( $dbkey, $this->cache ) ) {
+			wfDebug( "FileCache HIT for $dbkey\n" );
+			return $this->cache[$dbkey];
+		}
+		if( array_key_exists( $dbkey, $this->notFound ) ) {
+			wfDebug( "FileCache negative HIT for $dbkey\n" );
+			return false;
+		}
+
+		// Not in cache, fall back to a direct query
+		$file = $this->repoGroup->findFile( $title );
+		if( $file ) {
+			wfDebug( "FileCache MISS for $dbkey\n" );
+			$this->cache[$dbkey] = $file;
+		} else {
+			wfDebug( "FileCache negative MISS for $dbkey\n" );
+			$this->notFound[$dbkey] = true;
+		}
+		return $file;
+	}
+
+	/**
+	 * Search the cache for multiple files.
+	 * @param array $titles Title objects or strings to search for
+	 * @return array of File objects, indexed by DB key
+	 */
+	function findFiles( $titles ) {
+		$titleObjs = array();
+		foreach ( $titles as $title ) {
+			if ( !( $title instanceof Title ) ) {
+				$title = Title::makeTitleSafe( NS_FILE, $title );
+			}
+			if ( $title ) {
+				$titleObjs[$title->getDBkey()] = $title;
+			}
+		}
+
+		$result = array_intersect_key( $this->cache, $titleObjs );
+
+		$unsure = array_diff_key( $titleObjs, $result, $this->notFound );
+		if( $unsure ) {
+			wfDebug( "FileCache MISS for ".count( $unsure )." files out of ".count( $titleObjs )."...\n" );
+			// XXX: We assume the array returned by findFiles() is
+			// indexed by DBkey; this appears to be true, but should
+			// be explicitly documented.
+			$found = $this->repoGroup->findFiles( $unsure );
+			$result += $found;
+			$this->addFiles( $found );
+			$this->markNotFound( array_keys( array_diff_key( $unsure, $found ) ) );
+		}
+
+		wfDebug( "FileCache found ".count( $result )." files out of ".count( $titleObjs )."\n" );
+		return $result;
+	}
+}
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index edfc2a99..5beac732 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -15,6 +15,7 @@ abstract class FileRepo {
 	var $thumbScriptUrl, $transformVia404;
 	var $descBaseUrl, $scriptDirUrl, $articleUrl, $fetchDescription, $initialCapital;
 	var $pathDisclosureProtection = 'paranoid';
+	var $descriptionCacheExpiry, $apiThumbCacheExpiry, $hashLevels;
 
 	/**
 	 * Factory functions for creating new files
@@ -30,7 +31,8 @@ abstract class FileRepo {
 		// Optional settings
 		$this->initialCapital = true; // by default
 		foreach ( array( 'descBaseUrl', 'scriptDirUrl', 'articleUrl', 'fetchDescription',
-			'thumbScriptUrl', 'initialCapital', 'pathDisclosureProtection', 'descriptionCacheExpiry' ) as $var )
+			'thumbScriptUrl', 'initialCapital', 'pathDisclosureProtection', 
+			'descriptionCacheExpiry', 'apiThumbCacheExpiry', 'hashLevels' ) as $var )
 		{
 			if ( isset( $info[$var] ) ) {
 				$this->$var = $info[$var];
@@ -57,7 +59,7 @@ abstract class FileRepo {
 	 */
 	function newFile( $title, $time = false ) {
 		if ( !($title instanceof Title) ) {
-			$title = Title::makeTitleSafe( NS_IMAGE, $title );
+			$title = Title::makeTitleSafe( NS_FILE, $title );
 			if ( !is_object( $title ) ) {
 				return null;
 			}
@@ -83,7 +85,7 @@ abstract class FileRepo {
 	 */
 	function findFile( $title, $time = false, $flags = 0 ) {
 		if ( !($title instanceof Title) ) {
-			$title = Title::makeTitleSafe( NS_IMAGE, $title );
+			$title = Title::makeTitleSafe( NS_FILE, $title );
 			if ( !is_object( $title ) ) {
 				return false;
 			}
@@ -99,7 +101,7 @@ abstract class FileRepo {
 		# Now try an old version of the file
 		if ( $time !== false ) {
 			$img = $this->newFile( $title, $time );
-			if ( $img->exists() ) {
+			if ( $img && $img->exists() ) {
 				if ( !$img->isDeleted(File::DELETED_FILE) ) {
 					return $img;
 				} else if ( ($flags & FileRepo::FIND_PRIVATE) && $img->userCan(File::DELETED_FILE) ) {
@@ -113,7 +115,7 @@ abstract class FileRepo {
 			return false;
 		}
 		$redir = $this->checkRedirect( $title );		
-		if( $redir && $redir->getNamespace() == NS_IMAGE) {
+		if( $redir && $redir->getNamespace() == NS_FILE) {
 			$img = $this->newFile( $redir );
 			if( !$img ) {
 				return false;
@@ -129,12 +131,12 @@ abstract class FileRepo {
 	/*
 	 * Find many files at once. 
 	 * @param array $titles, an array of titles
-	 * @param int $flags
+	 * @todo Think of a good way to optionally pass timestamps to this function.
 	 */
-	function findFiles( $titles, $flags ) {
+	function findFiles( $titles ) {
 		$result = array();
 		foreach ( $titles as $index => $title ) {
-			$file = $this->findFile( $title, $flags );
+			$file = $this->findFile( $title );
 			if ( $file )
 				$result[$file->getTitle()->getDBkey()] = $file;
 		}
@@ -236,6 +238,14 @@ abstract class FileRepo {
 			return $path;
 		}
 	}
+	
+	/**
+	 * Get a relative path including trailing slash, e.g. f/fa/
+	 * If the repo is not hashed, returns an empty string
+	 */
+	function getHashPath( $name ) {
+		return self::getHashPathForLevel( $name, $this->hashLevels );
+	}
 
 	/**
 	 * Get the name of this repository, as specified by $info['name]' to the constructor
@@ -245,25 +255,6 @@ abstract class FileRepo {
 	}
 
 	/**
-	 * Get the file description page base URL, or false if there isn't one.
-	 * @private
-	 */
-	function getDescBaseUrl() {
-		if ( is_null( $this->descBaseUrl ) ) {
-			if ( !is_null( $this->articleUrl ) ) {
-				$this->descBaseUrl = str_replace( '$1',
-					wfUrlencode( MWNamespace::getCanonicalName( NS_IMAGE ) ) . ':', $this->articleUrl );
-			} elseif ( !is_null( $this->scriptDirUrl ) ) {
-				$this->descBaseUrl = $this->scriptDirUrl . '/index.php?title=' .
-					wfUrlencode( MWNamespace::getCanonicalName( NS_IMAGE ) ) . ':';
-			} else {
-				$this->descBaseUrl = false;
-			}
-		}
-		return $this->descBaseUrl;
-	}
-
-	/**
 	 * Get the URL of an image description page. May return false if it is
 	 * unknown or not applicable. In general this should only be called by the
 	 * File class, since it may return invalid results for certain kinds of
@@ -273,12 +264,29 @@ abstract class FileRepo {
 	 * constructor, whereas local repositories use the local Title functions.
 	 */
 	function getDescriptionUrl( $name ) {
-		$base = $this->getDescBaseUrl();
-		if ( $base ) {
-			return $base . wfUrlencode( $name );
-		} else {
-			return false;
+		$encName = wfUrlencode( $name );
+		if ( !is_null( $this->descBaseUrl ) ) {
+			# "http://example.com/wiki/Image:"
+			return $this->descBaseUrl . $encName;
+		}
+		if ( !is_null( $this->articleUrl ) ) {
+			# "http://example.com/wiki/$1"
+			#
+			# We use "Image:" as the canonical namespace for
+			# compatibility across all MediaWiki versions.
+			return str_replace( '$1',
+				"Image:$encName", $this->articleUrl );
 		}
+		if ( !is_null( $this->scriptDirUrl ) ) {
+			# "http://example.com/w"
+			#
+			# We use "Image:" as the canonical namespace for
+			# compatibility across all MediaWiki versions,
+			# and just sort of hope index.php is right. ;)
+			return $this->scriptDirUrl .
+				"/index.php?title=Image:$encName";
+		}
+		return false;
 	}
 
 	/**
@@ -290,12 +298,12 @@ abstract class FileRepo {
 	function getDescriptionRenderUrl( $name ) {
 		if ( isset( $this->scriptDirUrl ) ) {
 			return $this->scriptDirUrl . '/index.php?title=' .
-				wfUrlencode( MWNamespace::getCanonicalName( NS_IMAGE ) . ':' . $name ) .
+				wfUrlencode( 'Image:' . $name ) .
 				'&action=render';
 		} else {
-			$descBase = $this->getDescBaseUrl();
-			if ( $descBase ) {
-				return wfAppendQuery( $descBase . wfUrlencode( $name ), 'action=render' );
+			$descUrl = $this->getDescriptionUrl( $name );
+			if ( $descUrl ) {
+				return wfAppendQuery( $descUrl, 'action=render' );
 			} else {
 				return false;
 			}
diff --git a/includes/filerepo/ForeignAPIFile.php b/includes/filerepo/ForeignAPIFile.php
index aaf92204..d9fb85d0 100644
--- a/includes/filerepo/ForeignAPIFile.php
+++ b/includes/filerepo/ForeignAPIFile.php
@@ -7,15 +7,19 @@
  * @ingroup FileRepo
  */
 class ForeignAPIFile extends File {
-	function __construct( $title, $repo, $info ) {
+	
+	private $mExists;
+	
+	function __construct( $title, $repo, $info, $exists = false ) {
 		parent::__construct( $title, $repo );
 		$this->mInfo = $info;
+		$this->mExists = $exists;
 	}
 	
 	static function newFromTitle( $title, $repo ) {
 		$info = $repo->getImageInfo( $title );
 		if( $info ) {
-			return new ForeignAPIFile( $title, $repo, $info );
+			return new ForeignAPIFile( $title, $repo, $info, true );
 		} else {
 			return null;
 		}
@@ -23,7 +27,7 @@ class ForeignAPIFile extends File {
 	
 	// Dummy functions...
 	public function exists() {
-		return true;
+		return $this->mExists;
 	}
 	
 	public function getPath() {
@@ -31,12 +35,15 @@ class ForeignAPIFile extends File {
 	}
 
 	function transform( $params, $flags = 0 ) {
-		$thumbUrl = $this->repo->getThumbUrl(
-			$this->getName(),
-			isset( $params['width'] ) ? $params['width'] : -1,
-			isset( $params['height'] ) ? $params['height'] : -1 );
+		if( !$this->canRender() ) {
+			// show icon
+			return parent::transform( $params, $flags );
+		}
+		$thumbUrl = $this->repo->getThumbUrlFromCache(
+				$this->getName(),
+				isset( $params['width'] ) ? $params['width'] : -1,
+				isset( $params['height'] ) ? $params['height'] : -1 );
 		if( $thumbUrl ) {
-			wfDebug( __METHOD__ . " got remote thumb $thumbUrl\n" );
 			return $this->handler->getTransform( $this, 'bogus', $thumbUrl, $params );;
 		}
 		return false;
@@ -98,4 +105,64 @@ class ForeignAPIFile extends File {
 			? $this->mInfo['descriptionurl']
 			: false;
 	}
+	
+	/**
+	 * Only useful if we're locally caching thumbs anyway...
+	 */
+	function getThumbPath( $suffix = '' ) {
+		if ( $this->repo->canCacheThumbs() ) {
+			global $wgUploadDirectory;
+			$path = $wgUploadDirectory . '/thumb/' . $this->getHashPath( $this->getName() );
+			if ( $suffix ) {
+				$path = $path . $suffix . '/';
+			}
+			return $path;
+		}
+		else {
+			return null;	
+		}
+	}
+	
+	function getThumbnails() {
+		$files = array();
+		$dir = $this->getThumbPath( $this->getName() );
+		if ( is_dir( $dir ) ) {
+			$handle = opendir( $dir );
+			if ( $handle ) {
+				while ( false !== ( $file = readdir($handle) ) ) {
+					if ( $file{0} != '.'  ) {
+						$files[] = $file;
+					}
+				}
+				closedir( $handle );
+			}
+		}
+		return $files;
+	}
+	
+	function purgeCache() {
+		$this->purgeThumbnails();
+		$this->purgeDescriptionPage();
+	}
+	
+	function purgeDescriptionPage() {
+		global $wgMemc;
+		$url = $this->repo->getDescriptionRenderUrl( $this->getName() );
+		$key = wfMemcKey( 'RemoteFileDescription', 'url', md5($url) );
+		$wgMemc->delete( $key );
+	}
+	
+	function purgeThumbnails() {
+		global $wgMemc;
+		$key = wfMemcKey( 'ForeignAPIRepo', 'ThumbUrl', $this->getName() );
+		$wgMemc->delete( $key );
+		$files = $this->getThumbnails();
+		$dir = $this->getThumbPath( $this->getName() );
+		foreach ( $files as $file ) {
+			unlink( $dir . $file );
+		}
+		if ( is_dir( $dir ) ) {
+			rmdir( $dir ); // Might have already gone away, spews errors if we don't.
+		}
+	}
 }
diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php
index 0dee699f..6fc9c465 100644
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -19,6 +19,7 @@
  */
 class ForeignAPIRepo extends FileRepo {
 	var $fileFactory = array( 'ForeignAPIFile', 'newFromTitle' );
+	var $apiThumbCacheExpiry = 0;
 	protected $mQueryCache = array();
 	
 	function __construct( $info ) {
@@ -30,10 +31,12 @@ class ForeignAPIRepo extends FileRepo {
 		}
 	}
 
+/**
+ * No-ops
+ */
 	function storeBatch( $triplets, $flags = 0 ) {
 		return false;
 	}
-
 	function storeTemp( $originalName, $srcPath ) {
 		return false;
 	}
@@ -69,14 +72,16 @@ class ForeignAPIRepo extends FileRepo {
 				array_merge( $query,
 					array(
 						'format' => 'json',
-						'action' => 'query',
-						'prop' => 'imageinfo' ) ) );
+						'action' => 'query' ) ) );
 		
 		if( !isset( $this->mQueryCache[$url] ) ) {
-			$key = wfMemcKey( 'ForeignAPIRepo', $url );
+			$key = wfMemcKey( 'ForeignAPIRepo', 'Metadata', md5( $url ) );
 			$data = $wgMemc->get( $key );
 			if( !$data ) {
 				$data = Http::get( $url );
+				if ( !$data ) {
+					return null;
+				}
 				$wgMemc->set( $key, $data, 3600 );
 			}
 
@@ -92,7 +97,22 @@ class ForeignAPIRepo extends FileRepo {
 	function getImageInfo( $title, $time = false ) {
 		return $this->queryImage( array(
 			'titles' => 'Image:' . $title->getText(),
-			'iiprop' => 'timestamp|user|comment|url|size|sha1|metadata|mime' ) );
+			'iiprop' => 'timestamp|user|comment|url|size|sha1|metadata|mime',
+			'prop' => 'imageinfo' ) );
+	}
+	
+	function findBySha1( $hash ) {
+		$results = $this->fetchImageQuery( array(
+										'aisha1base36' => $hash,
+										'aiprop'       => 'timestamp|user|comment|url|size|sha1|metadata|mime',
+										'list'         => 'allimages', ) );
+		$ret = array();
+		if ( isset( $results['query']['allimages'] ) ) {
+			foreach ( $results['query']['allimages'] as $img ) {
+				$ret[] = new ForeignAPIFile( Title::makeTitle( NS_IMAGE, $img['name'] ), $this, $img );
+			}
+		}
+		return $ret;
 	}
 	
 	function getThumbUrl( $name, $width=-1, $height=-1 ) {
@@ -100,11 +120,56 @@ class ForeignAPIRepo extends FileRepo {
 			'titles' => 'Image:' . $name,
 			'iiprop' => 'url',
 			'iiurlwidth' => $width,
-			'iiurlheight' => $height ) );
+			'iiurlheight' => $height,
+			'prop' => 'imageinfo' ) );
 		if( $info ) {
+			wfDebug( __METHOD__ . " got remote thumb " . $info['thumburl'] . "\n" );
 			return $info['thumburl'];
 		} else {
 			return false;
 		}
 	}
+	
+	function getThumbUrlFromCache( $name, $width, $height ) {
+		global $wgMemc, $wgUploadPath, $wgServer, $wgUploadDirectory;
+		
+		if ( !$this->canCacheThumbs() ) {
+			return $this->getThumbUrl( $name, $width, $height );
+		}
+		
+		$key = wfMemcKey( 'ForeignAPIRepo', 'ThumbUrl', $name );
+		if ( $thumbUrl = $wgMemc->get($key) ) {
+			wfDebug("Got thumb from local cache. $thumbUrl \n");
+			return $thumbUrl;
+		}
+		else {
+			$foreignUrl = $this->getThumbUrl( $name, $width, $height );
+			
+			// We need the same filename as the remote one :)
+			$fileName = ltrim( substr( $foreignUrl, strrpos( $foreignUrl, '/' ) ), '/' );
+			$path = 'thumb/' . $this->getHashPath( $name ) . $name . "/";
+			if ( !is_dir($wgUploadDirectory . '/' . $path) ) {
+				wfMkdirParents($wgUploadDirectory . '/' . $path);
+			}
+			if ( !is_writable( $wgUploadDirectory . '/' . $path . $fileName ) ) {
+				wfDebug( __METHOD__ . " could not write to thumb path\n" );
+				return $foreignUrl;
+			}
+			$localUrl =  $wgServer . $wgUploadPath . '/' . $path . $fileName;
+			$thumb = Http::get( $foreignUrl );
+			# FIXME: Delete old thumbs that aren't being used. Maintenance script?
+			file_put_contents($wgUploadDirectory . '/' . $path . $fileName, $thumb );
+			$wgMemc->set( $key, $localUrl, $this->apiThumbCacheExpiry );
+			wfDebug( __METHOD__ . " got local thumb $localUrl, saving to cache \n" );
+			return $localUrl;
+		}
+	}
+	
+	/**
+	 * Are we locally caching the thumbnails?
+	 * @return bool
+	 */
+	public function canCacheThumbs() {
+		return ( $this->apiThumbCacheExpiry > 0 );
+	}
 }
diff --git a/includes/filerepo/ForeignDBFile.php b/includes/filerepo/ForeignDBFile.php
index eed26048..5fb432c8 100644
--- a/includes/filerepo/ForeignDBFile.php
+++ b/includes/filerepo/ForeignDBFile.php
@@ -13,7 +13,7 @@ class ForeignDBFile extends LocalFile {
 	 * Do not call this except from inside a repo class.
 	 */
 	static function newFromRow( $row, $repo ) {
-		$title = Title::makeTitle( NS_IMAGE, $row->img_name );
+		$title = Title::makeTitle( NS_FILE, $row->img_name );
 		$file = new self( $title, $repo );
 		$file->loadFromRow( $row );
 		return $file;
diff --git a/includes/filerepo/Image.php b/includes/filerepo/Image.php
index 665dd4bf..5207bb4b 100644
--- a/includes/filerepo/Image.php
+++ b/includes/filerepo/Image.php
@@ -36,7 +36,7 @@ class Image extends LocalFile {
 	 */
 	static function newFromName( $name ) {
 		wfDeprecated( __METHOD__ );
-		$title = Title::makeTitleSafe( NS_IMAGE, $name );
+		$title = Title::makeTitleSafe( NS_FILE, $name );
 		if ( is_object( $title ) ) {
 			$img = wfFindFile( $title );
 			if ( !$img ) {
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 57c0703d..6fd6de72 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -68,7 +68,7 @@ class LocalFile extends File
 	 * Do not call this except from inside a repo class.
 	 */
 	static function newFromRow( $row, $repo ) {
-		$title = Title::makeTitle( NS_IMAGE, $row->img_name );
+		$title = Title::makeTitle( NS_FILE, $row->img_name );
 		$file = new self( $title, $repo );
 		$file->loadFromRow( $row );
 		return $file;
@@ -453,6 +453,11 @@ class LocalFile extends File
 		return $this->metadata;
 	}
 
+	function getBitDepth() {
+		$this->load();
+		return $this->bits;
+	}
+
 	/**
 	 * Return the size of the image file, in bytes
 	 * @public
@@ -619,31 +624,38 @@ class LocalFile extends File
 	/** purgeDescription inherited */
 	/** purgeEverything inherited */
 
-	function getHistory($limit = null, $start = null, $end = null) {
+	function getHistory($limit = null, $start = null, $end = null, $inc = true) {
 		$dbr = $this->repo->getSlaveDB();
 		$tables = array('oldimage');
-		$join_conds = array();
 		$fields = OldLocalFile::selectFields();
-		$conds = $opts = array();
+		$conds = $opts = $join_conds = array();
+		$eq = $inc ? "=" : "";
 		$conds[] = "oi_name = " . $dbr->addQuotes( $this->title->getDBKey() );
-		if( $start !== null ) {
-			$conds[] = "oi_timestamp <= " . $dbr->addQuotes( $dbr->timestamp( $start ) );
+		if( $start ) {
+			$conds[] = "oi_timestamp <$eq " . $dbr->addQuotes( $dbr->timestamp( $start ) );
 		}
-		if( $end !== null ) {
-			$conds[] = "oi_timestamp >= " . $dbr->addQuotes( $dbr->timestamp( $end ) );
+		if( $end ) {
+			$conds[] = "oi_timestamp >$eq " . $dbr->addQuotes( $dbr->timestamp( $end ) );
 		}
 		if( $limit ) {
 			$opts['LIMIT'] = $limit;
 		}
-		$opts['ORDER BY'] = 'oi_timestamp DESC';
+		// Search backwards for time > x queries
+		$order = (!$start && $end !== null) ? "ASC" : "DESC";
+		$opts['ORDER BY'] = "oi_timestamp $order";
+		$opts['USE INDEX'] = array('oldimage' => 'oi_name_timestamp');
 		
-		wfRunHooks( 'LocalFile::getHistory', array( &$this, &$tables, &$fields, &$conds, &$opts, &$join_conds ) );
+		wfRunHooks( 'LocalFile::getHistory', array( &$this, &$tables, &$fields, 
+			&$conds, &$opts, &$join_conds ) );
 		
 		$res = $dbr->select( $tables, $fields, $conds, __METHOD__, $opts, $join_conds );
 		$r = array();
 		while( $row = $dbr->fetchObject($res) ) {
 			$r[] = OldLocalFile::newFromRow($row, $this->repo);
 		}
+		if( $order == "ASC" ) {
+			$r = array_reverse( $r ); // make sure it ends up descending
+		}
 		return $r;
 	}
 
@@ -732,11 +744,11 @@ class LocalFile extends File
 	 * @return FileRepoStatus object. On success, the value member contains the
 	 *     archive name, or an empty string if it was a new file.
 	 */
-	function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $timestamp = false ) {
+	function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $timestamp = false, $user = null ) {
 		$this->lock();
 		$status = $this->publish( $srcPath, $flags );
 		if ( $status->ok ) {
-			if ( !$this->recordUpload2( $status->value, $comment, $pageText, $props, $timestamp ) ) {
+			if ( !$this->recordUpload2( $status->value, $comment, $pageText, $props, $timestamp, $user ) ) {
 				$status->fatal( 'filenotfound', $srcPath );
 			}
 		}
@@ -766,18 +778,22 @@ class LocalFile extends File
 	/**
 	 * Record a file upload in the upload log and the image table
 	 */
-	function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false )
+	function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null )
 	{
-		global $wgUser;
+		if( is_null( $user ) ) {
+			global $wgUser;
+			$user = $wgUser; 
+		}
 
 		$dbw = $this->repo->getMasterDB();
+		$dbw->begin();
 
 		if ( !$props ) {
 			$props = $this->repo->getFileProps( $this->getVirtualUrl() );
 		}
 		$props['description'] = $comment;
-		$props['user'] = $wgUser->getId();
-		$props['user_text'] = $wgUser->getName();
+		$props['user'] = $user->getId();
+		$props['user_text'] = $user->getName();
 		$props['timestamp'] = wfTimestamp( TS_MW );
 		$this->setProps( $props );
 
@@ -812,8 +828,8 @@ class LocalFile extends File
 				'img_minor_mime' => $this->minor_mime,
 				'img_timestamp' => $timestamp,
 				'img_description' => $comment,
-				'img_user' => $wgUser->getId(),
-				'img_user_text' => $wgUser->getName(),
+				'img_user' => $user->getId(),
+				'img_user_text' => $user->getName(),
 				'img_metadata' => $this->metadata,
 				'img_sha1' => $this->sha1
 			),
@@ -858,8 +874,8 @@ class LocalFile extends File
 					'img_minor_mime' => $this->minor_mime,
 					'img_timestamp' => $timestamp,
 					'img_description' => $comment,
-					'img_user' => $wgUser->getId(),
-					'img_user_text' => $wgUser->getName(),
+					'img_user' => $user->getId(),
+					'img_user_text' => $user->getName(),
 					'img_metadata' => $this->metadata,
 					'img_sha1' => $this->sha1
 				), array( /* WHERE */
@@ -874,19 +890,22 @@ class LocalFile extends File
 		}
 
 		$descTitle = $this->getTitle();
-		$article = new Article( $descTitle );
+		$article = new ImagePage( $descTitle );
+		$article->setFile( $this );
 
 		# Add the log entry
 		$log = new LogPage( 'upload' );
 		$action = $reupload ? 'overwrite' : 'upload';
-		$log->addEntry( $action, $descTitle, $comment );
+		$log->addEntry( $action, $descTitle, $comment, array(), $user );
 
 		if( $descTitle->exists() ) {
 			# Create a null revision
-			$nullRevision = Revision::newNullRevision( $dbw, $descTitle->getArticleId(), $log->getRcComment(), false );
+			$latest = $descTitle->getLatestRevID();
+			$nullRevision = Revision::newNullRevision( $dbw, $descTitle->getArticleId(),
+				$log->getRcComment(), false );
 			$nullRevision->insertOn( $dbw );
 			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $user) );
 			$article->updateRevisionOn( $dbw, $nullRevision );
 
 			# Invalidate the cache for the description page
@@ -1109,8 +1128,8 @@ class LocalFile extends File
 		if ( !$revision ) return false;
 		$text = $revision->getText();
 		if ( !$text ) return false;
-		$html = $wgParser->parse( $text, new ParserOptions );
-		return $html;
+		$pout = $wgParser->parse( $text, $this->title, new ParserOptions() );
+		return $pout->getText();
 	}
 
 	function getDescription() {
@@ -1128,7 +1147,7 @@ class LocalFile extends File
 		// Initialise now if necessary
 		if ( $this->sha1 == '' && $this->fileExists ) {
 			$this->sha1 = File::sha1Base36( $this->getPath() );
-			if ( strval( $this->sha1 ) != '' ) {
+			if ( !wfReadOnly() && strval( $this->sha1 ) != '' ) {
 				$dbw = $this->repo->getMasterDB();
 				$dbw->update( 'image',
 					array( 'img_sha1' => $this->sha1 ),
@@ -1355,7 +1374,7 @@ class LocalFileDeleteBatch {
 			$dbw->delete( 'oldimage',
 				array(
 					'oi_name' => $this->file->getName(),
-					'oi_archive_name IN (' . $dbw->makeList( array_keys( $oldRels ) ) . ')'
+					'oi_archive_name' => array_keys( $oldRels )
 				), __METHOD__ );
 		}
 		if ( $deleteCurrent ) {
@@ -1509,7 +1528,8 @@ class LocalFileRestoreBatch {
 		$result = $dbw->select( 'filearchive', '*',
 			$conditions,
 			__METHOD__,
-			array( 'ORDER BY' => 'fa_timestamp DESC' ) );
+			array( 'ORDER BY' => 'fa_timestamp DESC' )
+		);
 
 		$idsPresent = array();
 		$storeBatch = array();
@@ -1554,15 +1574,11 @@ class LocalFileRestoreBatch {
 					'minor_mime' => $row->fa_minor_mime,
 					'major_mime' => $row->fa_major_mime,
 					'media_type' => $row->fa_media_type,
-					'metadata' => $row->fa_metadata );
+					'metadata'   => $row->fa_metadata
+				);
 			}
 
 			if ( $first && !$exists ) {
-				// The live (current) version cannot be hidden!
-				if( !$this->unsuppress && $row->fa_deleted ) {
-					$this->file->unlock();
-					return $status;
-				}
 				// This revision will be published as the new current version
 				$destRel = $this->file->getRel();
 				$insertCurrent = array(
@@ -1579,7 +1595,13 @@ class LocalFileRestoreBatch {
 					'img_user'        => $row->fa_user,
 					'img_user_text'   => $row->fa_user_text,
 					'img_timestamp'   => $row->fa_timestamp,
-					'img_sha1'        => $sha1);
+					'img_sha1'        => $sha1
+				);
+				// The live (current) version cannot be hidden!
+				if( !$this->unsuppress && $row->fa_deleted ) {
+					$storeBatch[] = array( $deletedUrl, 'public', $destRel );
+					$this->cleanupBatch[] = $row->fa_storage_key;
+				}
 			} else {
 				$archiveName = $row->fa_archive_name;
 				if( $archiveName == '' ) {
@@ -1616,6 +1638,7 @@ class LocalFileRestoreBatch {
 			$deleteIds[] = $row->fa_id;
 			if( !$this->unsuppress && $row->fa_deleted & File::DELETED_FILE ) {
 				// private files can stay where they are
+				$status->successCount++;
 			} else {
 				$storeBatch[] = array( $deletedUrl, 'public', $destRel );
 				$this->cleanupBatch[] = $row->fa_storage_key;
@@ -1705,7 +1728,7 @@ class LocalFileMoveBatch {
 		$this->file = $file;
 		$this->target = $target;
 		$this->oldHash = $this->file->repo->getHashPath( $this->file->getName() );
-		$this->newHash = $this->file->repo->getHashPath( $this->target->getDbKey() );
+		$this->newHash = $this->file->repo->getHashPath( $this->target->getDBKey() );
 		$this->oldName = $this->file->getName();
 		$this->newName = $this->file->repo->getNameFromTitle( $this->target );
 		$this->oldRel = $this->oldHash . $this->oldName;
@@ -1751,7 +1774,7 @@ class LocalFileMoveBatch {
 				continue;
 			}
 			$this->olds[] = array(
-				"{$archiveBase}/{$this->oldHash}{$oldname}",
+				"{$archiveBase}/{$this->oldHash}{$oldName}",
 				"{$archiveBase}/{$this->newHash}{$timestamp}!{$this->newName}"
 			);
 		}
diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 90b198c8..5eb1a11c 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -94,7 +94,7 @@ class LocalRepo extends FSRepo {
 			'page_id',	//Field
 			array(	//Conditions
 				'page_namespace' => $title->getNamespace(),
-				'page_title' => $title->getDbKey(),
+				'page_title' => $title->getDBKey(),
 			),
 			__METHOD__	//Function name
 		);
@@ -108,7 +108,7 @@ class LocalRepo extends FSRepo {
 			$title = Title::newFromTitle( $title );
 		}
 		if( $title instanceof Title && $title->getNamespace() == NS_MEDIA ) {
-			$title = Title::makeTitle( NS_IMAGE, $title->getText() );
+			$title = Title::makeTitle( NS_FILE, $title->getText() );
 		}
 
 		$memcKey = $this->getMemcKey( "image_redirect:" . md5( $title->getPrefixedDBkey() ) );
@@ -164,8 +164,7 @@ class LocalRepo extends FSRepo {
 	/*
 	 * Find many files using one query
 	 */
-	function findFiles( $titles, $flags ) {
-		// FIXME: Comply with $flags
+	function findFiles( $titles ) {
 	 	// FIXME: Only accepts a $titles array where the keys are the sanitized
 	 	// file names.
 	 	 
diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index 89e49c4c..46c35bd9 100644
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -23,7 +23,7 @@ class OldLocalFile extends LocalFile {
 	}
 
 	static function newFromRow( $row, $repo ) {
-		$title = Title::makeTitle( NS_IMAGE, $row->oi_name );
+		$title = Title::makeTitle( NS_FILE, $row->oi_name );
 		$file = new self( $title, $repo, null, $row->oi_archive_name );
 		$file->loadFromRow( $row, 'oi_' );
 		return $file;
@@ -64,6 +64,7 @@ class OldLocalFile extends LocalFile {
 			'oi_user',
 			'oi_user_text',
 			'oi_timestamp',
+			'oi_deleted',
 			'oi_sha1',
 		);
 	}
diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
index 7cb837b3..2303f581 100644
--- a/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@ -82,7 +82,7 @@ class RepoGroup {
 		}
 		return false;
 	}
-	function findFiles( $titles, $flags = 0 ) {
+	function findFiles( $titles ) {
 		if ( !$this->reposInitialised ) {
 			$this->initialiseRepos();
 		}
@@ -90,11 +90,12 @@ class RepoGroup {
 		$titleObjs = array();
 		foreach ( $titles as $title ) {
 			if ( !( $title instanceof Title ) )
-				$title = Title::makeTitleSafe( NS_IMAGE, $title );
-			$titleObjs[$title->getDBkey()] = $title;
+				$title = Title::makeTitleSafe( NS_FILE, $title );
+			if ( $title )
+				$titleObjs[$title->getDBkey()] = $title;
 		}
 
-		$images = $this->localRepo->findFiles( $titleObjs, $flags );
+		$images = $this->localRepo->findFiles( $titleObjs );
 
 		foreach ( $this->foreignRepos as $repo ) {
 			// Remove found files from $titleObjs
@@ -102,7 +103,7 @@ class RepoGroup {
 				if ( isset( $titleObjs[$name] ) )
 					unset( $titleObjs[$name] );
 			
-			$images = array_merge( $images, $repo->findFiles( $titleObjs, $flags ) );
+			$images = array_merge( $images, $repo->findFiles( $titleObjs ) );
 		}
 		return $images;
 	}
@@ -176,6 +177,13 @@ class RepoGroup {
 		return $this->getRepo( 'local' );
 	}
 
+	/**
+	 * Call a function for each foreign repo, with the repo object as the 
+	 * first parameter.
+	 *
+	 * @param $callback callback The function to call
+	 * @param $params array Optional additional parameters to pass to the function
+	 */
 	function forEachForeignRepo( $callback, $params = array() ) {
 		foreach( $this->foreignRepos as $repo ) {
 			$args = array_merge( array( $repo ), $params );
@@ -186,8 +194,12 @@ class RepoGroup {
 		return false;
 	}
 
+	/**
+	 * Does the installation have any foreign repos set up?
+	 * @return bool
+	 */
 	function hasForeignRepos() {
-		return !empty( $this->foreignRepos );
+		return (bool)$this->foreignRepos;
 	}
 
 	/**
diff --git a/includes/filerepo/UnregisteredLocalFile.php b/includes/filerepo/UnregisteredLocalFile.php
index c687ef6e..6f63cb0b 100644
--- a/includes/filerepo/UnregisteredLocalFile.php
+++ b/includes/filerepo/UnregisteredLocalFile.php
@@ -32,7 +32,7 @@ class UnregisteredLocalFile extends File {
 			$this->name = $repo->getNameFromTitle( $title );
 		} else {
 			$this->name = basename( $path );
-			$this->title = Title::makeTitleSafe( NS_IMAGE, $this->name );
+			$this->title = Title::makeTitleSafe( NS_FILE, $this->name );
 		}
 		$this->repo = $repo;
 		if ( $path ) {
diff --git a/includes/media/BMP.php b/includes/media/BMP.php
index ce1b0362..39b29744 100644
--- a/includes/media/BMP.php
+++ b/includes/media/BMP.php
@@ -11,6 +11,15 @@
  * @ingroup Media
  */
 class BmpHandler extends BitmapHandler {
+	// We never want to use .bmp in an <img/> tag
+	function mustRender( $file ) {
+		return true;
+	}
+
+	// Render files as PNG
+	function getThumbType( $text, $mime ) {
+		return array( 'png', 'image/png' );
+	}
 
 	/*
 	 * Get width and height from the bmp header.
diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index e01386e9..b949ae3d 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -41,9 +41,10 @@ class BitmapHandler extends ImageHandler {
 	}
 
 	function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
-		global $wgUseImageMagick, $wgImageMagickConvertCommand;
+		global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgImageMagickTempDir;
 		global $wgCustomConvertCommand;
 		global $wgSharpenParameter, $wgSharpenReductionThreshold;
+		global $wgMaxAnimatedGifArea;
 
 		if ( !$this->normaliseParams( $image, $params ) ) {
 			return new TransformParameterError( $params );
@@ -59,7 +60,7 @@ class BitmapHandler extends ImageHandler {
 		$retval = 0;
 		wfDebug( __METHOD__.": creating {$physicalWidth}x{$physicalHeight} thumbnail at $dstPath\n" );
 
-		if ( $physicalWidth == $srcWidth && $physicalHeight == $srcHeight ) {
+		if ( !$image->mustRender() && $physicalWidth == $srcWidth && $physicalHeight == $srcHeight ) {
 			# normaliseParams (or the user) wants us to return the unscaled image
 			wfDebug( __METHOD__.": returning unscaled image\n" );
 			return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath );
@@ -77,6 +78,7 @@ class BitmapHandler extends ImageHandler {
 		} else {
 			$scaler = 'client';
 		}
+		wfDebug( __METHOD__.": scaler $scaler\n" );
 
 		if ( $scaler == 'client' ) {
 			# Client-side image scaling, use the source URL
@@ -85,18 +87,22 @@ class BitmapHandler extends ImageHandler {
 		}
 
 		if ( $flags & self::TRANSFORM_LATER ) {
+			wfDebug( __METHOD__.": Transforming later per flags.\n" );
 			return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
 		}
 
 		if ( !wfMkdirParents( dirname( $dstPath ) ) ) {
-			wfDebug( "Unable to create thumbnail destination directory, falling back to client scaling\n" );
+			wfDebug( __METHOD__.": Unable to create thumbnail destination directory, falling back to client scaling\n" );
 			return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath );
 		}
 
 		if ( $scaler == 'im' ) {
 			# use ImageMagick
 
+			$quality = '';
 			$sharpen = '';
+			$frame = '';
+			$animation = '';
 			if ( $mimeType == 'image/jpeg' ) {
 				$quality = "-quality 80"; // 80%
 				# Sharpening, see bug 6193
@@ -105,8 +111,21 @@ class BitmapHandler extends ImageHandler {
 				}
 			} elseif ( $mimeType == 'image/png' ) {
 				$quality = "-quality 95"; // zlib 9, adaptive filtering
+			} elseif( $mimeType == 'image/gif' ) {
+				if( $srcWidth * $srcHeight > $wgMaxAnimatedGifArea ) {
+					// Extract initial frame only; we're so big it'll
+					// be a total drag. :P
+					$frame = '[0]';
+				} else {
+					// Coalesce is needed to scale animated GIFs properly (bug 1017).
+					$animation = ' -coalesce ';
+				}
+			}
+
+			if ( strval( $wgImageMagickTempDir ) !== '' ) {
+				$tempEnv = 'MAGICK_TMPDIR=' . wfEscapeShellArg( $wgImageMagickTempDir ) . ' ';
 			} else {
-				$quality = ''; // default
+				$tempEnv = '';
 			}
 
 			# Specify white background color, will be used for transparent images
@@ -116,11 +135,12 @@ class BitmapHandler extends ImageHandler {
 			# It seems that ImageMagick has a bug wherein it produces thumbnails of
 			# the wrong size in the second case.
 
-			$cmd  =  wfEscapeShellArg($wgImageMagickConvertCommand) .
+			$cmd  = 
+				$tempEnv .
+				wfEscapeShellArg($wgImageMagickConvertCommand) .
 				" {$quality} -background white -size {$physicalWidth} ".
-				wfEscapeShellArg($srcPath) .
-				// Coalesce is needed to scale animated GIFs properly (bug 1017).
-				' -coalesce ' .
+				wfEscapeShellArg($srcPath . $frame) .
+				$animation .
 				// For the -resize option a "!" is needed to force exact size,
 				// or ImageMagick may decide your ratio is wrong and slice off
 				// a pixel.
diff --git a/includes/media/Bitmap_ClientOnly.php b/includes/media/Bitmap_ClientOnly.php
new file mode 100644
index 00000000..9801f9be
--- /dev/null
+++ b/includes/media/Bitmap_ClientOnly.php
@@ -0,0 +1,15 @@
+<?php
+
+class BitmapHandler_ClientOnly extends BitmapHandler {
+	function normaliseParams( $image, &$params ) {
+		return ImageHandler::normaliseParams( $image, $params );
+	}
+
+	function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
+		if ( !$this->normaliseParams( $image, $params ) ) {
+			return new TransformParameterError( $params );
+		}
+		return new ThumbnailImage( $image, $image->getURL(), $params['width'], 
+			$params['height'], $image->getPath() );
+	}
+}
diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index b2cb70f6..a9c681e1 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -239,6 +239,21 @@ abstract class MediaHandler {
 			$sk->formatSize( $file->getSize() ),
 			$file->getMimeType() );
 	}
+	
+	static function getGeneralShortDesc( $file ) {
+		global $wgLang;
+		$nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
+			$wgLang->formatNum( $file->getSize() ) ) . ')';
+		return "$nbytes";
+	}
+
+	static function getGeneralLongDesc( $file ) {
+		global $wgUser;
+		$sk = $wgUser->getSkin();
+		return wfMsgExt( 'file-info', 'parseinline',
+			$sk->formatSize( $file->getSize() ),
+			$file->getMimeType() );
+	}
 
 	function getDimensionsString( $file ) {
 		return '';
diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 2604e3b4..f0519e89 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -27,7 +27,6 @@ class SvgHandler extends ImageHandler {
 		if ( !parent::normaliseParams( $image, $params ) ) {
 			return false;
 		}
-
 		# Don't make an image bigger than wgMaxSVGSize
 		$params['physicalWidth'] = $params['width'];
 		$params['physicalHeight'] = $params['height'];
@@ -60,32 +59,49 @@ class SvgHandler extends ImageHandler {
 			return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight,
 				wfMsg( 'thumbnail_dest_directory' ) );
 		}
-
+		
+		$status = $this->rasterize( $srcPath, $dstPath, $physicalWidth, $physicalHeight );
+		if( $status === true ) {
+			return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
+		} else {
+			return $status; // MediaTransformError
+		}
+	}
+	
+	/*
+	* Transform an SVG file to PNG
+	* This function can be called outside of thumbnail contexts
+	* @param string $srcPath
+	* @param string $dstPath
+	* @param string $width
+	* @param string $height
+	* @returns TRUE/MediaTransformError
+	*/
+	public function rasterize( $srcPath, $dstPath, $width, $height ) {
+		global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath;
 		$err = false;
-		if( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
+		if ( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
 			$cmd = str_replace(
 				array( '$path/', '$width', '$height', '$input', '$output' ),
 				array( $wgSVGConverterPath ? wfEscapeShellArg( "$wgSVGConverterPath/" ) : "",
-					   intval( $physicalWidth ),
-					   intval( $physicalHeight ),
+					   intval( $width ),
+					   intval( $height ),
 					   wfEscapeShellArg( $srcPath ),
 					   wfEscapeShellArg( $dstPath ) ),
-				$wgSVGConverters[$wgSVGConverter] ) . " 2>&1";
+				$wgSVGConverters[$wgSVGConverter]
+			) . " 2>&1";
 			wfProfileIn( 'rsvg' );
 			wfDebug( __METHOD__.": $cmd\n" );
 			$err = wfShellExec( $cmd, $retval );
 			wfProfileOut( 'rsvg' );
 		}
-
 		$removed = $this->removeBadFile( $dstPath, $retval );
 		if ( $retval != 0 || $removed ) {
-			wfDebugLog( 'thumbnail',
-				sprintf( 'thumbnail failed on %s: error %d "%s" from "%s"',
+			wfDebugLog( 'thumbnail', sprintf( 'thumbnail failed on %s: error %d "%s" from "%s"',
 					wfHostname(), $retval, trim($err), $cmd ) );
-			return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err );
-		} else {
-			return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
+			return new MediaTransformError( 'thumbnail_error', $width, $height, $err );
 		}
+		return true;
 	}
 
 	function getImageSize( $image, $path ) {
diff --git a/includes/memcached-client.php b/includes/memcached-client.php
index 6bd18387..79745309 100644
--- a/includes/memcached-client.php
+++ b/includes/memcached-client.php
@@ -454,7 +454,7 @@ class memcached
       if (!$this->_active)
          return false;
 
-      $this->stats['get_multi']++;
+      @$this->stats['get_multi']++;
       $sock_keys = array();
 
       foreach ($keys as $key)
@@ -800,8 +800,8 @@ class memcached
          if (is_resource($sock)) {
             $this->_flush_read_buffer($sock);
             return $sock;
-         }
-         $hv += $this->_hashfunc($tries . $realkey);
+		 }
+         $hv = $this->_hashfunc( $hv . $realkey );
       }
 
       return false;
diff --git a/includes/mime.types b/includes/mime.types
index 6021e926..2b8cb9ab 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -59,6 +59,7 @@ application/xslt+xml xslt
 application/xml xml xsl xsd
 application/xml-dtd dtd
 application/zip zip jar xpi  sxc stc  sxd std   sxi sti   sxm stm   sxw stw
+application/x-rar rar
 audio/basic au snd
 audio/midi mid midi kar
 audio/mpeg mpga mp2 mp3
diff --git a/includes/parser/CoreLinkFunctions.php b/includes/parser/CoreLinkFunctions.php
new file mode 100644
index 00000000..d6d11880
--- /dev/null
+++ b/includes/parser/CoreLinkFunctions.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Various core link functions, registered in Parser::firstCallInit()
+ * @ingroup Parser
+ */
+class CoreLinkFunctions {
+	static function register( $parser ) {
+		$parser->setLinkHook( NS_CATEGORY, array( __CLASS__, 'categoryLinkHook' ) );
+		return true;
+	}
+
+	static function defaultLinkHook( $parser, $holders, $markers,
+			Title $title, $titleText, &$displayText = null, &$leadingColon = false ) {
+		if( isset($displayText) && $markers->findMarker( $displayText ) ) {
+			# There are links inside of the displayText
+			# For backwards compatibility the deepest links are dominant so this
+			# link should not be handled
+			$displayText = $markers->expand($displayText);
+			# Return false so that this link is reverted back to WikiText
+			return false;
+		}
+		return $holders->makeHolder( $title, isset($displayText) ? $displayText : $titleText, '', '', '' );
+	}
+	
+	static function categoryLinkHook( $parser, $holders, $markers,
+			Title $title, $titleText, &$sortText = null, &$leadingColon = false ) {
+		global $wgContLang;
+		# When a category link starts with a : treat it as a normal link
+		if( $leadingColon ) return true;
+		if( isset($sortText) && $markers->findMarker( $sortText ) ) {
+			# There are links inside of the sortText
+			# For backwards compatibility the deepest links are dominant so this
+			# link should not be handled
+			$sortText = $markers->expand($sortText);
+			# Return false so that this link is reverted back to WikiText
+			return false;
+		}
+		if( !isset($sortText) ) $sortText = $parser->getDefaultSort();
+		$sortText = Sanitizer::decodeCharReferences( $sortText );
+		$sortText = str_replace( "\n", '', $sortText );
+		$sortText = $wgContLang->convertCategoryKey( $sortText );
+		$parser->mOutput->addCategory( $title->getDBkey(), $sortText );
+		return '';
+	}
+	
+}
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index d9072e93..a3b5189a 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -33,7 +33,9 @@ class CoreParserFunctions {
 		$parser->setFunctionHook( 'numberofarticles', array( __CLASS__, 'numberofarticles' ), SFH_NO_HASH );
 		$parser->setFunctionHook( 'numberoffiles',    array( __CLASS__, 'numberoffiles'    ), SFH_NO_HASH );
 		$parser->setFunctionHook( 'numberofadmins',   array( __CLASS__, 'numberofadmins'   ), SFH_NO_HASH );
+		$parser->setFunctionHook( 'numberingroup',    array( __CLASS__, 'numberingroup'    ), SFH_NO_HASH );
 		$parser->setFunctionHook( 'numberofedits',    array( __CLASS__, 'numberofedits'    ), SFH_NO_HASH );
+		$parser->setFunctionHook( 'numberofviews',    array( __CLASS__, 'numberofviews'    ), SFH_NO_HASH );
 		$parser->setFunctionHook( 'language',         array( __CLASS__, 'language'         ), SFH_NO_HASH );
 		$parser->setFunctionHook( 'padleft',          array( __CLASS__, 'padleft'          ), SFH_NO_HASH );
 		$parser->setFunctionHook( 'padright',         array( __CLASS__, 'padright'         ), SFH_NO_HASH );
@@ -56,7 +58,10 @@ class CoreParserFunctions {
 	static function intFunction( $parser, $part1 = '' /*, ... */ ) {
 		if ( strval( $part1 ) !== '' ) {
 			$args = array_slice( func_get_args(), 2 );
-			return wfMsgReal( $part1, $args, true );
+			$message = wfMsgGetKey( $part1, true, false, false );
+			$message = wfMsgReplaceArgs( $message, $args );
+			$message = $parser->replaceVariables( $message ); // like $wgMessageCache->transform()
+			return $message;
 		} else {
 			return array( 'found' => false );
 		}
@@ -64,20 +69,13 @@ class CoreParserFunctions {
 
 	static function ns( $parser, $part1 = '' ) {
 		global $wgContLang;
-		$found = false;
 		if ( intval( $part1 ) || $part1 == "0" ) {
-			$text = $wgContLang->getNsText( intval( $part1 ) );
-			$found = true;
+			$index = intval( $part1 );
 		} else {
-			$param = str_replace( ' ', '_', strtolower( $part1 ) );
-			$index = MWNamespace::getCanonicalIndex( strtolower( $param ) );
-			if ( !is_null( $index ) ) {
-				$text = $wgContLang->getNsText( $index );
-				$found = true;
-			}
+			$index = $wgContLang->getNsIndex( str_replace( ' ', '_', $part1 ) );
 		}
-		if ( $found ) {
-			return $text;
+		if ( $index !== false ) {
+			return $wgContLang->getFormattedNsText( $index );
 		} else {
 			return array( 'found' => false );
 		}
@@ -128,8 +126,12 @@ class CoreParserFunctions {
 		# attempt, url-decode and try for a second.
 		if( is_null( $title ) )
 			$title = Title::newFromUrl( urldecode( $s ) );
-		if ( !is_null( $title ) ) {
-			if ( !is_null( $arg ) ) {
+		if( !is_null( $title ) ) {
+			# Convert NS_MEDIA -> NS_FILE
+			if( $title->getNamespace() == NS_MEDIA ) {
+				$title = Title::makeTitle( NS_FILE, $title->getDBKey() );
+			}
+			if( !is_null( $arg ) ) {
 				$text = $title->$func( $arg );
 			} else {
 				$text = $title->$func();
@@ -167,10 +169,16 @@ class CoreParserFunctions {
 	 * @return string
 	 */
 	static function displaytitle( $parser, $text = '' ) {
+		global $wgRestrictDisplayTitle;
 		$text = trim( Sanitizer::decodeCharReferences( $text ) );
-		$title = Title::newFromText( $text );
-		if( $title instanceof Title && $title->getFragment() == '' && $title->equals( $parser->mTitle ) )
+
+		if ( !$wgRestrictDisplayTitle ) {
 			$parser->mOutput->setDisplayTitle( $text );
+		} else {
+			$title = Title::newFromText( $text );
+			if( $title instanceof Title && $title->getFragment() == '' && $title->equals( $parser->mTitle ) )
+				$parser->mOutput->setDisplayTitle( $text );
+		}
 		return '';
 	}
 
@@ -207,14 +215,20 @@ class CoreParserFunctions {
 		return self::formatRaw( SiteStats::images(), $raw );
 	}
 	static function numberofadmins( $parser, $raw = null ) {
-		return self::formatRaw( SiteStats::admins(), $raw );
+		return self::formatRaw( SiteStats::numberingroup('sysop'), $raw );
 	}
 	static function numberofedits( $parser, $raw = null ) {
 		return self::formatRaw( SiteStats::edits(), $raw );
 	}
+	static function numberofviews( $parser, $raw = null ) {
+		return self::formatRaw( SiteStats::views(), $raw );
+	}
 	static function pagesinnamespace( $parser, $namespace = 0, $raw = null ) {
 		return self::formatRaw( SiteStats::pagesInNs( intval( $namespace ) ), $raw );
 	}
+	static function numberingroup( $parser, $name = '', $raw = null) {
+		return self::formatRaw( SiteStats::numberingroup( strtolower( $name ) ), $raw );
+	} 
 
 	/**
 	 * Return the number of pages in the given category, or 0 if it's nonexis-
@@ -269,12 +283,12 @@ class CoreParserFunctions {
 		if( isset( $cache[$page] ) ) {
 			$length = $cache[$page];
 		} elseif( $parser->incrementExpensiveFunctionCount() ) {
-			$length = $cache[$page] = $title->getLength();
+			$rev = Revision::newFromTitle($title);
+			$id = $rev ? $rev->getPage() : 0;
+			$length = $cache[$page] = $rev ? $rev->getSize() : 0;
 	
 			// Register dependency in templatelinks
-			$id = $title->getArticleId();
-			$revid = Revision::newFromTitle($title);
-			$parser->mOutput->addTemplate($title, $id, $revid);
+			$parser->mOutput->addTemplate( $title, $id, $rev ? $rev->getId() : 0 );
 		}	
 		return self::formatRaw( $length, $raw );
 	}
@@ -320,9 +334,18 @@ class CoreParserFunctions {
 
 	public static function defaultsort( $parser, $text ) {
 		$text = trim( $text );
-		if( strlen( $text ) > 0 )
-			$parser->setDefaultSort( $text );
-		return '';
+		if( strlen( $text ) == 0 )
+			return '';
+		$old = $parser->getCustomDefaultSort();
+		$parser->setDefaultSort( $text );
+		if( $old === false || $old == $text )
+			return '';
+		else
+			return( '<span class="error">' .
+				wfMsg( 'duplicate-defaultsort',
+						 htmlspecialchars( $old ),
+						 htmlspecialchars( $text ) ) .
+				'</span>' );
 	}
 
 	public static function filepath( $parser, $name='', $option='' ) {
@@ -330,7 +353,7 @@ class CoreParserFunctions {
 		if( $file ) {
 			$url = $file->getFullUrl();
 			if( $option == 'nowiki' ) {
-				return "<nowiki>$url</nowiki>";
+				return array( $url, 'nowiki' => true );
 			}
 			return $url;
 		} else {
@@ -365,7 +388,7 @@ class CoreParserFunctions {
 		foreach ( $args as $arg ) {
 			$bits = $arg->splitArg();
 			if ( strval( $bits['index'] ) === '' ) {
-				$name = $frame->expand( $bits['name'], PPFrame::STRIP_COMMENTS );
+				$name = trim( $frame->expand( $bits['name'], PPFrame::STRIP_COMMENTS ) );
 				$value = trim( $frame->expand( $bits['value'] ) );
 				if ( preg_match( '/^(?:["\'](.+)["\']|""|\'\')$/s', $value, $m ) ) {
 					$value = isset( $m[1] ) ? $m[1] : '';
diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
new file mode 100644
index 00000000..35b672b9
--- /dev/null
+++ b/includes/parser/LinkHolderArray.php
@@ -0,0 +1,438 @@
+<?php
+
+class LinkHolderArray {
+	var $internals = array(), $interwikis = array();
+	var $size = 0;
+	var $parent;
+
+	function __construct( $parent ) {
+		$this->parent = $parent;
+	}
+
+	/**
+	 * Reduce memory usage to reduce the impact of circular references
+	 */
+	function __destruct() {
+		foreach ( $this as $name => $value ) {
+			unset( $this->$name );
+		}
+	}
+
+	/**
+	 * Merge another LinkHolderArray into this one
+	 */
+	function merge( $other ) {
+		foreach ( $other->internals as $ns => $entries ) {
+			$this->size += count( $entries );
+			if ( !isset( $this->internals[$ns] ) ) {
+				$this->internals[$ns] = $entries;
+			} else {
+				$this->internals[$ns] += $entries;
+			}
+		}
+		$this->interwikis += $other->interwikis;
+	}
+
+	/**
+	 * Returns true if the memory requirements of this object are getting large
+	 */
+	function isBig() {
+		global $wgLinkHolderBatchSize;
+		return $this->size > $wgLinkHolderBatchSize;
+	}
+
+	/**
+	 * Clear all stored link holders.
+	 * Make sure you don't have any text left using these link holders, before you call this
+	 */
+	function clear() {
+		$this->internals = array();
+		$this->interwikis = array();
+		$this->size = 0;
+	}
+
+	/**
+	 * Make a link placeholder. The text returned can be later resolved to a real link with
+	 * replaceLinkHolders(). This is done for two reasons: firstly to avoid further
+	 * parsing of interwiki links, and secondly to allow all existence checks and
+	 * article length checks (for stub links) to be bundled into a single query.
+	 *
+	 */
+	function makeHolder( $nt, $text = '', $query = '', $trail = '', $prefix = ''  ) {
+		wfProfileIn( __METHOD__ );
+		if ( ! is_object($nt) ) {
+			# Fail gracefully
+			$retVal = "<!-- ERROR -->{$prefix}{$text}{$trail}";
+		} else {
+			# Separate the link trail from the rest of the link
+			list( $inside, $trail ) = Linker::splitTrail( $trail );
+
+			$entry = array(
+				'title' => $nt,
+				'text' => $prefix.$text.$inside,
+				'pdbk' => $nt->getPrefixedDBkey(),
+			);
+			if ( $query !== '' ) {
+				$entry['query'] = $query;
+			}
+
+			if ( $nt->isExternal() ) {
+				// Use a globally unique ID to keep the objects mergable
+				$key = $this->parent->nextLinkID();
+				$this->interwikis[$key] = $entry;
+				$retVal = "<!--IWLINK $key-->{$trail}";
+			} else {
+				$key = $this->parent->nextLinkID();
+				$ns = $nt->getNamespace();
+				$this->internals[$ns][$key] = $entry;
+				$retVal = "<!--LINK $ns:$key-->{$trail}";
+			}
+			$this->size++;
+		}
+		wfProfileOut( __METHOD__ );
+		return $retVal;
+	}
+
+	/**
+	 * Get the stub threshold
+	 */
+	function getStubThreshold() {
+		global $wgUser;
+		if ( !isset( $this->stubThreshold ) ) {
+			$this->stubThreshold = $wgUser->getOption('stubthreshold');
+		}
+		return $this->stubThreshold;
+	}
+
+	/**
+	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
+	 * Placeholders created in Skin::makeLinkObj()
+	 * Returns an array of link CSS classes, indexed by PDBK.
+	 */
+	function replace( &$text ) {
+		wfProfileIn( __METHOD__ );
+
+		$colours = $this->replaceInternal( $text );
+		$this->replaceInterwiki( $text );
+
+		wfProfileOut( __METHOD__ );
+		return $colours;
+	}
+
+	/**
+	 * Replace internal links
+	 */
+	protected function replaceInternal( &$text ) {
+		if ( !$this->internals ) {
+			return;
+		}
+
+		wfProfileIn( __METHOD__ );
+		global $wgContLang;
+
+		$colours = array();
+		$sk = $this->parent->getOptions()->getSkin();
+		$linkCache = LinkCache::singleton();
+		$output = $this->parent->getOutput();
+
+		wfProfileIn( __METHOD__.'-check' );
+		$dbr = wfGetDB( DB_SLAVE );
+		$page = $dbr->tableName( 'page' );
+		$threshold = $this->getStubThreshold();
+
+		# Sort by namespace
+		ksort( $this->internals );
+
+		# Generate query
+		$query = false;
+		$current = null;
+		foreach ( $this->internals as $ns => $entries ) {
+			foreach ( $entries as $index => $entry ) {
+				$key = 	"$ns:$index";
+				$title = $entry['title'];
+				$pdbk = $entry['pdbk'];
+
+				# Skip invalid entries.
+				# Result will be ugly, but prevents crash.
+				if ( is_null( $title ) ) {
+					continue;
+				}
+
+				# Check if it's a static known link, e.g. interwiki
+				if ( $title->isAlwaysKnown() ) {
+					$colours[$pdbk] = '';
+				} elseif ( ( $id = $linkCache->getGoodLinkID( $pdbk ) ) != 0 ) {
+					$colours[$pdbk] = $sk->getLinkColour( $title, $threshold );
+					$output->addLink( $title, $id );
+				} elseif ( $linkCache->isBadLink( $pdbk ) ) {
+					$colours[$pdbk] = 'new';
+				} else {
+					# Not in the link cache, add it to the query
+					if ( !isset( $current ) ) {
+						$current = $ns;
+						$query =  "SELECT page_id, page_namespace, page_title, page_is_redirect, page_len";
+						$query .= " FROM $page WHERE (page_namespace=$ns AND page_title IN(";
+					} elseif ( $current != $ns ) {
+						$current = $ns;
+						$query .= ")) OR (page_namespace=$ns AND page_title IN(";
+					} else {
+						$query .= ', ';
+					}
+
+					$query .= $dbr->addQuotes( $title->getDBkey() );
+				}
+			}
+		}
+		if ( $query ) {
+			$query .= '))';
+
+			$res = $dbr->query( $query, __METHOD__ );
+
+			# Fetch data and form into an associative array
+			# non-existent = broken
+			$linkcolour_ids = array();
+			while ( $s = $dbr->fetchObject($res) ) {
+				$title = Title::makeTitle( $s->page_namespace, $s->page_title );
+				$pdbk = $title->getPrefixedDBkey();
+				$linkCache->addGoodLinkObj( $s->page_id, $title, $s->page_len, $s->page_is_redirect );
+				$output->addLink( $title, $s->page_id );
+				# FIXME: convoluted data flow
+				# The redirect status and length is passed to getLinkColour via the LinkCache
+				# Use formal parameters instead
+				$colours[$pdbk] = $sk->getLinkColour( $title, $threshold );
+				//add id to the extension todolist
+				$linkcolour_ids[$s->page_id] = $pdbk;
+			}
+			unset( $res );
+			//pass an array of page_ids to an extension
+			wfRunHooks( 'GetLinkColours', array( $linkcolour_ids, &$colours ) );
+		}
+		wfProfileOut( __METHOD__.'-check' );
+
+		# Do a second query for different language variants of links and categories
+		if($wgContLang->hasVariants()) {
+			$this->doVariants( $colours );
+		}
+
+		# Construct search and replace arrays
+		wfProfileIn( __METHOD__.'-construct' );
+		$replacePairs = array();
+		foreach ( $this->internals as $ns => $entries ) {
+			foreach ( $entries as $index => $entry ) {
+				$pdbk = $entry['pdbk'];
+				$title = $entry['title'];
+				$query = isset( $entry['query'] ) ? $entry['query'] : '';
+				$key = "$ns:$index";
+				$searchkey = "<!--LINK $key-->";
+				if ( !isset( $colours[$pdbk] ) || $colours[$pdbk] == 'new' ) {
+					$linkCache->addBadLinkObj( $title );
+					$colours[$pdbk] = 'new';
+					$output->addLink( $title, 0 );
+					$replacePairs[$searchkey] = $sk->makeBrokenLinkObj( $title,
+									$entry['text'],
+									$query );
+				} else {
+					$replacePairs[$searchkey] = $sk->makeColouredLinkObj( $title, $colours[$pdbk],
+									$entry['text'],
+									$query );
+				}
+			}
+		}
+		$replacer = new HashtableReplacer( $replacePairs, 1 );
+		wfProfileOut( __METHOD__.'-construct' );
+
+		# Do the thing
+		wfProfileIn( __METHOD__.'-replace' );
+		$text = preg_replace_callback(
+			'/(<!--LINK .*?-->)/',
+			$replacer->cb(),
+			$text);
+
+		wfProfileOut( __METHOD__.'-replace' );
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Replace interwiki links
+	 */
+	protected function replaceInterwiki( &$text ) {
+		if ( empty( $this->interwikis ) ) {
+			return;
+		}
+
+		wfProfileIn( __METHOD__ );
+		# Make interwiki link HTML
+		$sk = $this->parent->getOptions()->getSkin();
+		$replacePairs = array();
+		foreach( $this->interwikis as $key => $link ) {
+			$replacePairs[$key] = $sk->link( $link['title'], $link['text'] );
+		}
+		$replacer = new HashtableReplacer( $replacePairs, 1 );
+
+		$text = preg_replace_callback(
+			'/<!--IWLINK (.*?)-->/',
+			$replacer->cb(),
+			$text );
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Modify $this->internals and $colours according to language variant linking rules
+	 */
+	protected function doVariants( &$colours ) {
+		global $wgContLang;
+		$linkBatch = new LinkBatch();
+		$variantMap = array(); // maps $pdbkey_Variant => $keys (of link holders)
+		$output = $this->parent->getOutput();
+		$linkCache = LinkCache::singleton();
+		$sk = $this->parent->getOptions()->getSkin();
+		$threshold = $this->getStubThreshold();
+
+		// Add variants of links to link batch
+		foreach ( $this->internals as $ns => $entries ) {
+			foreach ( $entries as $index => $entry ) {
+				$key = "$ns:$index";
+				$pdbk = $entry['pdbk'];
+				$title = $entry['title'];
+				$titleText = $title->getText();
+
+				// generate all variants of the link title text
+				$allTextVariants = $wgContLang->convertLinkToAllVariants($titleText);
+
+				// if link was not found (in first query), add all variants to query
+				if ( !isset($colours[$pdbk]) ){
+					foreach($allTextVariants as $textVariant){
+						if($textVariant != $titleText){
+							$variantTitle = Title::makeTitle( $ns, $textVariant );
+							if(is_null($variantTitle)) continue;
+							$linkBatch->addObj( $variantTitle );
+							$variantMap[$variantTitle->getPrefixedDBkey()][] = $key;
+						}
+					}
+				}
+			}
+		}
+
+		// process categories, check if a category exists in some variant
+		$categoryMap = array(); // maps $category_variant => $category (dbkeys)
+		$varCategories = array(); // category replacements oldDBkey => newDBkey
+		foreach( $output->getCategoryLinks() as $category ){
+			$variants = $wgContLang->convertLinkToAllVariants($category);
+			foreach($variants as $variant){
+				if($variant != $category){
+					$variantTitle = Title::newFromDBkey( Title::makeName(NS_CATEGORY,$variant) );
+					if(is_null($variantTitle)) continue;
+					$linkBatch->addObj( $variantTitle );
+					$categoryMap[$variant] = $category;
+				}
+			}
+		}
+
+
+		if(!$linkBatch->isEmpty()){
+			// construct query
+			$dbr = wfGetDB( DB_SLAVE );
+			$page = $dbr->tableName( 'page' );
+			$titleClause = $linkBatch->constructSet('page', $dbr);
+			$variantQuery =  "SELECT page_id, page_namespace, page_title, page_is_redirect, page_len";
+			$variantQuery .= " FROM $page WHERE $titleClause";
+			$varRes = $dbr->query( $variantQuery, __METHOD__ );
+			$linkcolour_ids = array();
+
+			// for each found variants, figure out link holders and replace
+			while ( $s = $dbr->fetchObject($varRes) ) {
+
+				$variantTitle = Title::makeTitle( $s->page_namespace, $s->page_title );
+				$varPdbk = $variantTitle->getPrefixedDBkey();
+				$vardbk = $variantTitle->getDBkey();
+
+				$holderKeys = array();
+				if(isset($variantMap[$varPdbk])){
+					$holderKeys = $variantMap[$varPdbk];
+					$linkCache->addGoodLinkObj( $s->page_id, $variantTitle, $s->page_len, $s->page_is_redirect );
+					$output->addLink( $variantTitle, $s->page_id );
+				}
+
+				// loop over link holders
+				foreach($holderKeys as $key){
+					list( $ns, $index ) = explode( ':', $key, 2 );
+					$entry =& $this->internals[$ns][$index];
+					$pdbk = $entry['pdbk'];
+
+					if(!isset($colours[$pdbk])){
+						// found link in some of the variants, replace the link holder data
+						$entry['title'] = $variantTitle;
+						$entry['pdbk'] = $varPdbk;
+
+						// set pdbk and colour
+						# FIXME: convoluted data flow
+						# The redirect status and length is passed to getLinkColour via the LinkCache
+						# Use formal parameters instead
+						$colours[$varPdbk] = $sk->getLinkColour( $variantTitle, $threshold );
+						$linkcolour_ids[$s->page_id] = $pdbk;
+					}
+				}
+
+				// check if the object is a variant of a category
+				if(isset($categoryMap[$vardbk])){
+					$oldkey = $categoryMap[$vardbk];
+					if($oldkey != $vardbk)
+						$varCategories[$oldkey]=$vardbk;
+				}
+			}
+			wfRunHooks( 'GetLinkColours', array( $linkcolour_ids, &$colours ) );
+
+			// rebuild the categories in original order (if there are replacements)
+			if(count($varCategories)>0){
+				$newCats = array();
+				$originalCats = $output->getCategories();
+				foreach($originalCats as $cat => $sortkey){
+					// make the replacement
+					if( array_key_exists($cat,$varCategories) )
+						$newCats[$varCategories[$cat]] = $sortkey;
+					else $newCats[$cat] = $sortkey;
+				}
+				$output->setCategoryLinks($newCats);
+			}
+		}
+	}
+
+	/**
+	 * Replace <!--LINK--> link placeholders with plain text of links
+	 * (not HTML-formatted).
+	 * @param string $text
+	 * @return string
+	 */
+	function replaceText( $text ) {
+		wfProfileIn( __METHOD__ );
+
+		$text = preg_replace_callback(
+			'/<!--(LINK|IWLINK) (.*?)-->/',
+			array( &$this, 'replaceTextCallback' ),
+			$text );
+
+		wfProfileOut( __METHOD__ );
+		return $text;
+	}
+
+	/**
+	 * @param array $matches
+	 * @return string
+	 * @private
+	 */
+	function replaceTextCallback( $matches ) {
+		$type = $matches[1];
+		$key  = $matches[2];
+		if( $type == 'LINK' ) {
+			list( $ns, $index ) = explode( ':', $key, 2 );
+			if( isset( $this->internals[$ns][$index]['text'] ) ) {
+				return $this->internals[$ns][$index]['text'];
+			}
+		} elseif( $type == 'IWLINK' ) {
+			if( isset( $this->interwikis[$key]['text'] ) ) {
+				return $this->interwikis[$key]['text'];
+			}
+		}
+		return $matches[0];
+	}
+}
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 3ff56a2b..7fcfb90a 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -92,17 +92,18 @@ class Parser
 	# Persistent:
 	var $mTagHooks, $mTransparentTagHooks, $mFunctionHooks, $mFunctionSynonyms, $mVariables,
 		$mImageParams, $mImageParamsMagicArray, $mStripList, $mMarkerIndex, $mPreprocessor,
-		$mExtLinkBracketedRegex, $mDefaultStripList, $mVarCache, $mConf;
+		$mExtLinkBracketedRegex, $mUrlProtocols, $mDefaultStripList, $mVarCache, $mConf;
 
 
 	# Cleared with clearState():
 	var $mOutput, $mAutonumber, $mDTopen, $mStripState;
 	var $mIncludeCount, $mArgStack, $mLastSection, $mInPre;
-	var $mInterwikiLinkHolders, $mLinkHolders;
+	var $mLinkHolders, $mLinkID;
 	var $mIncludeSizes, $mPPNodeCount, $mDefaultSort;
 	var $mTplExpandCache; // empty-frame expansion cache
 	var $mTplRedirCache, $mTplDomCache, $mHeadings, $mDoubleUnderscores;
 	var $mExpensiveFunctionCount; // number of expensive parser function calls
+	var $mFileCache;
 
 	# Temporary
 	# These are variables reset at least once per parse regardless of $clearState
@@ -128,6 +129,7 @@ class Parser
 		$this->mFunctionHooks = array();
 		$this->mFunctionSynonyms = array( 0 => array(), 1 => array() );
 		$this->mDefaultStripList = $this->mStripList = array( 'nowiki', 'gallery' );
+		$this->mUrlProtocols = wfUrlProtocols();
 		$this->mExtLinkBracketedRegex = '/\[(\b(' . wfUrlProtocols() . ')'.
 			'[^][<>"\\x00-\\x20\\x7F]+) *([^\]\\x0a\\x0d]*?)\]/S';
 		$this->mVarCache = array();
@@ -147,6 +149,18 @@ class Parser
 	}
 
 	/**
+	 * Reduce memory usage to reduce the impact of circular references
+	 */
+	function __destruct() {
+		if ( isset( $this->mLinkHolders ) ) {
+			$this->mLinkHolders->__destruct();
+		}
+		foreach ( $this as $name => $value ) {
+			unset( $this->$name );
+		}
+	}
+
+	/**
 	 * Do various kinds of initialisation on the first call of the parser
 	 */
 	function firstCallInit() {
@@ -183,17 +197,8 @@ class Parser
 		$this->mStripState = new StripState;
 		$this->mArgStack = false;
 		$this->mInPre = false;
-		$this->mInterwikiLinkHolders = array(
-			'texts' => array(),
-			'titles' => array()
-		);
-		$this->mLinkHolders = array(
-			'namespaces' => array(),
-			'dbkeys' => array(),
-			'queries' => array(),
-			'texts' => array(),
-			'titles' => array()
-		);
+		$this->mLinkHolders = new LinkHolderArray( $this );
+		$this->mLinkID = 0;
 		$this->mRevisionTimestamp = $this->mRevisionId = null;
 
 		/**
@@ -208,7 +213,7 @@ class Parser
 		 */
 		#$this->mUniqPrefix = "\x07UNIQ" . Parser::getRandomString();
 		# Changed to \x7f to allow XML double-parsing -- TS
-		$this->mUniqPrefix = "\x7fUNIQ" . Parser::getRandomString();
+		$this->mUniqPrefix = "\x7fUNIQ" . self::getRandomString();
 
 
 		# Clear these on every parse, bug 4549
@@ -225,6 +230,7 @@ class Parser
 		$this->mHeadings = array();
 		$this->mDoubleUnderscores = array();
 		$this->mExpensiveFunctionCount = 0;
+		$this->mFileCache = array();
 
 		# Fix cloning
 		if ( isset( $this->mPreprocessor ) && $this->mPreprocessor->parser !== $this ) {
@@ -283,22 +289,22 @@ class Parser
 	 * Convert wikitext to HTML
 	 * Do not call this function recursively.
 	 *
-	 * @param string $text Text we want to parse
-	 * @param Title &$title A title object
-	 * @param array $options
-	 * @param boolean $linestart
-	 * @param boolean $clearState
-	 * @param int $revid number to pass in {{REVISIONID}}
+	 * @param $text String: text we want to parse
+	 * @param $title A title object
+	 * @param $options ParserOptions
+	 * @param $linestart boolean
+	 * @param $clearState boolean
+	 * @param $revid Int: number to pass in {{REVISIONID}}
 	 * @return ParserOutput a ParserOutput
 	 */
-	public function parse( $text, &$title, $options, $linestart = true, $clearState = true, $revid = null ) {
+	public function parse( $text, Title $title, ParserOptions $options, $linestart = true, $clearState = true, $revid = null ) {
 		/**
 		 * First pass--just handle <nowiki> sections, pass the rest off
 		 * to internalParse() which does all the real work.
 		 */
 
 		global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang;
-		$fname = 'Parser::parse-' . wfGetCaller();
+		$fname = __METHOD__.'-' . wfGetCaller();
 		wfProfileIn( __METHOD__ );
 		wfProfileIn( $fname );
 
@@ -332,7 +338,6 @@ class Parser
 		);
 		$text = preg_replace( array_keys($fixtags), array_values($fixtags), $text );
 
-		# only once and last
 		$text = $this->doBlockLevels( $text, $linestart );
 
 		$this->replaceLinkHolders( $text );
@@ -352,7 +357,7 @@ class Parser
 		$uniq_prefix = $this->mUniqPrefix;
 		$matches = array();
 		$elements = array_keys( $this->mTransparentTagHooks );
-		$text = Parser::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
+		$text = self::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
 
 		foreach( $matches as $marker => $data ) {
 			list( $element, $content, $params, $tag ) = $data;
@@ -370,7 +375,7 @@ class Parser
 		$text = Sanitizer::normalizeCharReferences( $text );
 
 		if (($wgUseTidy and $this->mOptions->mTidy) or $wgAlwaysUseTidy) {
-			$text = Parser::tidy($text);
+			$text = self::tidy($text);
 		} else {
 			# attempt to sanitize at least some nesting problems
 			# (bug #2702 and quite a few others)
@@ -475,6 +480,8 @@ class Parser
 	function &getTitle() { return $this->mTitle; }
 	function getOptions() { return $this->mOptions; }
 	function getRevisionId() { return $this->mRevisionId; }
+	function getOutput() { return $this->mOutput; }
+	function nextLinkID() { return $this->mLinkID++; }
 
 	function getFunctionLang() {
 		global $wgLang, $wgContLang;
@@ -553,7 +560,7 @@ class Parser
 				$text = $inside;
 				$tail = null;
 			} else {
-				if( $element == '!--' ) {
+				if( $element === '!--' ) {
 					$end = '/(-->)/';
 				} else {
 					$end = "/(<\\/$element\\s*>)/i";
@@ -658,18 +665,27 @@ class Parser
 	 */
 	function tidy( $text ) {
 		global $wgTidyInternal;
+
 		$wrappedtext = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'.
 ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>'.
 '<head><title>test</title></head><body>'.$text.'</body></html>';
+
+		# Tidy is known to clobber tabs; convert 'em to entities
+		$wrappedtext = str_replace("\t", '&#9;', $wrappedtext);
+
 		if( $wgTidyInternal ) {
-			$correctedtext = Parser::internalTidy( $wrappedtext );
+			$correctedtext = self::internalTidy( $wrappedtext );
 		} else {
-			$correctedtext = Parser::externalTidy( $wrappedtext );
+			$correctedtext = self::externalTidy( $wrappedtext );
 		}
 		if( is_null( $correctedtext ) ) {
 			wfDebug( "Tidy error detected!\n" );
 			return $text . "\n<!-- Tidy found serious XHTML errors -->\n";
 		}
+
+		# Convert the tabs back from entities
+		$correctedtext = str_replace('&#9;', "\t", $correctedtext);
+
 		return $correctedtext;
 	}
 
@@ -681,8 +697,7 @@ class Parser
 	 */
 	function externalTidy( $text ) {
 		global $wgTidyConf, $wgTidyBin, $wgTidyOpts;
-		$fname = 'Parser::externalTidy';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$cleansource = '';
 		$opts = ' -utf8';
@@ -693,23 +708,25 @@ class Parser
 			2 => array('file', wfGetNull(), 'a')
 		);
 		$pipes = array();
-		$process = proc_open("$wgTidyBin -config $wgTidyConf $wgTidyOpts$opts", $descriptorspec, $pipes);
-		if (is_resource($process)) {
-			// Theoretically, this style of communication could cause a deadlock
-			// here. If the stdout buffer fills up, then writes to stdin could
-			// block. This doesn't appear to happen with tidy, because tidy only
-			// writes to stdout after it's finished reading from stdin. Search
-			// for tidyParseStdin and tidySaveStdout in console/tidy.c
-			fwrite($pipes[0], $text);
-			fclose($pipes[0]);
-			while (!feof($pipes[1])) {
-				$cleansource .= fgets($pipes[1], 1024);
+		if( function_exists('proc_open') ) {
+			$process = proc_open("$wgTidyBin -config $wgTidyConf $wgTidyOpts$opts", $descriptorspec, $pipes);
+			if (is_resource($process)) {
+				// Theoretically, this style of communication could cause a deadlock
+				// here. If the stdout buffer fills up, then writes to stdin could
+				// block. This doesn't appear to happen with tidy, because tidy only
+				// writes to stdout after it's finished reading from stdin. Search
+				// for tidyParseStdin and tidySaveStdout in console/tidy.c
+				fwrite($pipes[0], $text);
+				fclose($pipes[0]);
+				while (!feof($pipes[1])) {
+					$cleansource .= fgets($pipes[1], 1024);
+				}
+				fclose($pipes[1]);
+				proc_close($process);
 			}
-			fclose($pipes[1]);
-			proc_close($process);
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 
 		if( $cleansource == '' && $text != '') {
 			// Some kind of error happened, so we couldn't get the corrected text.
@@ -731,8 +748,7 @@ class Parser
 	 */
 	function internalTidy( $text ) {
 		global $wgTidyConf, $IP, $wgDebugTidy;
-		$fname = 'Parser::internalTidy';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$tidy = new tidy;
 		$tidy->parseString( $text, $wgTidyConf, 'utf8' );
@@ -750,7 +766,7 @@ class Parser
 				"\n-->";
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $cleansource;
 	}
 
@@ -760,34 +776,35 @@ class Parser
 	 * @private
 	 */
 	function doTableStuff ( $text ) {
-		$fname = 'Parser::doTableStuff';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
-		$lines = explode ( "\n" , $text );
+		$lines = StringUtils::explode( "\n", $text );
+		$out = '';
 		$td_history = array (); // Is currently a td tag open?
 		$last_tag_history = array (); // Save history of last lag activated (td, th or caption)
 		$tr_history = array (); // Is currently a tr tag open?
 		$tr_attributes = array (); // history of tr attributes
 		$has_opened_tr = array(); // Did this table open a <tr> element?
 		$indent_level = 0; // indent level of the table
-		foreach ( $lines as $key => $line )
-		{
-			$line = trim ( $line );
+
+		foreach ( $lines as $outLine ) {
+			$line = trim( $outLine );
 
 			if( $line == '' ) { // empty line, go to next line
+				$out .= $outLine."\n";
 				continue;
 			}
-			$first_character = $line{0};
+			$first_character = $line[0];
 			$matches = array();
 
-			if ( preg_match( '/^(:*)\{\|(.*)$/' , $line , $matches ) ) {
+			if ( preg_match( '/^(:*)\{\|(.*)$/', $line , $matches ) ) {
 				// First check if we are starting a new table
 				$indent_level = strlen( $matches[1] );
 
 				$attributes = $this->mStripState->unstripBoth( $matches[2] );
 				$attributes = Sanitizer::fixTagAttributes ( $attributes , 'table' );
 
-				$lines[$key] = str_repeat( '<dl><dd>' , $indent_level ) . "<table{$attributes}>";
+				$outLine = str_repeat( '<dl><dd>' , $indent_level ) . "<table{$attributes}>";
 				array_push ( $td_history , false );
 				array_push ( $last_tag_history , '' );
 				array_push ( $tr_history , false );
@@ -795,8 +812,9 @@ class Parser
 				array_push ( $has_opened_tr , false );
 			} else if ( count ( $td_history ) == 0 ) {
 				// Don't do any of the following
+				$out .= $outLine."\n";
 				continue;
-			} else if ( substr ( $line , 0 , 2 ) == '|}' ) {
+			} else if ( substr ( $line , 0 , 2 ) === '|}' ) {
 				// We are ending a table
 				$line = '</table>' . substr ( $line , 2 );
 				$last_tag = array_pop ( $last_tag_history );
@@ -813,8 +831,8 @@ class Parser
 					$line = "</{$last_tag}>{$line}";
 				}
 				array_pop ( $tr_attributes );
-				$lines[$key] = $line . str_repeat( '</dd></dl>' , $indent_level );
-			} else if ( substr ( $line , 0 , 2 ) == '|-' ) {
+				$outLine = $line . str_repeat( '</dd></dl>' , $indent_level );
+			} else if ( substr ( $line , 0 , 2 ) === '|-' ) {
 				// Now we have a table row
 				$line = preg_replace( '#^\|-+#', '', $line );
 
@@ -837,21 +855,21 @@ class Parser
 					$line = "</{$last_tag}>{$line}";
 				}
 
-				$lines[$key] = $line;
+				$outLine = $line;
 				array_push ( $tr_history , false );
 				array_push ( $td_history , false );
 				array_push ( $last_tag_history , '' );
 			}
-			else if ( $first_character == '|' || $first_character == '!' || substr ( $line , 0 , 2 )  == '|+' ) {
+			else if ( $first_character === '|' || $first_character === '!' || substr ( $line , 0 , 2 )  === '|+' ) {
 				// This might be cell elements, td, th or captions
-				if ( substr ( $line , 0 , 2 ) == '|+' ) {
+				if ( substr ( $line , 0 , 2 ) === '|+' ) {
 					$first_character = '+';
 					$line = substr ( $line , 1 );
 				}
 
 				$line = substr ( $line , 1 );
 
-				if ( $first_character == '!' ) {
+				if ( $first_character === '!' ) {
 					$line = str_replace ( '!!' , '||' , $line );
 				}
 
@@ -861,13 +879,13 @@ class Parser
 				// attribute values containing literal "||".
 				$cells = StringUtils::explodeMarkup( '||' , $line );
 
-				$lines[$key] = '';
+				$outLine = '';
 
 				// Loop through each table cell
 				foreach ( $cells as $cell )
 				{
 					$previous = '';
-					if ( $first_character != '+' )
+					if ( $first_character !== '+' )
 					{
 						$tr_after = array_pop ( $tr_attributes );
 						if ( !array_pop ( $tr_history ) ) {
@@ -885,11 +903,11 @@ class Parser
 						$previous = "</{$last_tag}>{$previous}";
 					}
 
-					if ( $first_character == '|' ) {
+					if ( $first_character === '|' ) {
 						$last_tag = 'td';
-					} else if ( $first_character == '!' ) {
+					} else if ( $first_character === '!' ) {
 						$last_tag = 'th';
-					} else if ( $first_character == '+' ) {
+					} else if ( $first_character === '+' ) {
 						$last_tag = 'caption';
 					} else {
 						$last_tag = '';
@@ -912,38 +930,42 @@ class Parser
 						$cell = "{$previous}<{$last_tag}{$attributes}>{$cell_data[1]}";
 					}
 
-					$lines[$key] .= $cell;
+					$outLine .= $cell;
 					array_push ( $td_history , true );
 				}
 			}
+			$out .= $outLine . "\n";
 		}
 
 		// Closing open td, tr && table
 		while ( count ( $td_history ) > 0 )
 		{
 			if ( array_pop ( $td_history ) ) {
-				$lines[] = '</td>' ;
+				$out .= "</td>\n";
 			}
 			if ( array_pop ( $tr_history ) ) {
-				$lines[] = '</tr>' ;
+				$out .= "</tr>\n";
 			}
 			if ( !array_pop ( $has_opened_tr ) ) {
-				$lines[] = "<tr><td></td></tr>" ;
+				$out .= "<tr><td></td></tr>\n" ;
 			}
 
-			$lines[] = '</table>' ;
+			$out .= "</table>\n";
 		}
 
-		$output = implode ( "\n" , $lines ) ;
+		// Remove trailing line-ending (b/c)
+		if ( substr( $out, -1 ) === "\n" ) {
+			$out = substr( $out, 0, -1 );
+		}
 
 		// special case: don't return empty table
-		if( $output == "<table>\n<tr><td></td></tr>\n</table>" ) {
-			$output = '';
+		if( $out === "<table>\n<tr><td></td></tr>\n</table>" ) {
+			$out = '';
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 
-		return $output;
+		return $out;
 	}
 
 	/**
@@ -954,12 +976,11 @@ class Parser
 	 */
 	function internalParse( $text ) {
 		$isMain = true;
-		$fname = 'Parser::internalParse';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		# Hook to suspend the parser in this state
 		if ( !wfRunHooks( 'ParserBeforeInternalParse', array( &$this, &$text, &$this->mStripState ) ) ) {
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return $text ;
 		}
 
@@ -992,84 +1013,147 @@ class Parser
 		$text = $this->doMagicLinks( $text );
 		$text = $this->formatHeadings( $text, $isMain );
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
 	/**
 	 * Replace special strings like "ISBN xxx" and "RFC xxx" with
 	 * magic external links.
-	 *
+	 * 
+	 * DML
 	 * @private
 	 */
 	function doMagicLinks( $text ) {
 		wfProfileIn( __METHOD__ );
+		$prots = $this->mUrlProtocols;
+		$urlChar = self::EXT_LINK_URL_CLASS;
 		$text = preg_replace_callback(
 			'!(?:                           # Start cases
-			    <a.*?</a> |                 # Skip link text
-			    <.*?> |                     # Skip stuff inside HTML elements
-			    (?:RFC|PMID)\s+([0-9]+) |   # RFC or PMID, capture number as m[1]
-			    ISBN\s+(\b                  # ISBN, capture number as m[2]
-                                     (?: 97[89] [\ \-]? )?   # optional 13-digit ISBN prefix
-                                     (?: [0-9]  [\ \-]? ){9} # 9 digits with opt. delimiters
-                                     [0-9Xx]                 # check digit
-                                   \b)
+				(<a.*?</a>) |               # m[1]: Skip link text 
+				(<.*?>) |                   # m[2]: Skip stuff inside HTML elements' . "
+				(\\b(?:$prots)$urlChar+) |  # m[3]: Free external links" . '
+				(?:RFC|PMID)\s+([0-9]+) |   # m[4]: RFC or PMID, capture number
+				ISBN\s+(\b                  # m[5]: ISBN, capture number
+				    (?: 97[89] [\ \-]? )?   # optional 13-digit ISBN prefix
+				    (?: [0-9]  [\ \-]? ){9} # 9 digits with opt. delimiters
+				    [0-9Xx]                 # check digit
+				    \b)
 			)!x', array( &$this, 'magicLinkCallback' ), $text );
 		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
 	function magicLinkCallback( $m ) {
-		if ( substr( $m[0], 0, 1 ) == '<' ) {
+		if ( isset( $m[1] ) && strval( $m[1] ) !== '' ) {
+			# Skip anchor
+			return $m[0];
+		} elseif ( isset( $m[2] ) && strval( $m[2] ) !== '' ) {
 			# Skip HTML element
 			return $m[0];
-		} elseif ( substr( $m[0], 0, 4 ) == 'ISBN' ) {
-			$isbn = $m[2];
-			$num = strtr( $isbn, array(
-				'-' => '',
-				' ' => '',
-				'x' => 'X',
-			));
-			$titleObj = SpecialPage::getTitleFor( 'Booksources', $num );
-			$text = '<a href="' .
-				$titleObj->escapeLocalUrl() .
-				"\" class=\"internal\">ISBN $isbn</a>";
-		} else {
-			if ( substr( $m[0], 0, 3 ) == 'RFC' ) {
+		} elseif ( isset( $m[3] ) && strval( $m[3] ) !== '' ) {
+			# Free external link
+			return $this->makeFreeExternalLink( $m[0] );
+		} elseif ( isset( $m[4] ) && strval( $m[4] ) !== '' ) {
+			# RFC or PMID
+			if ( substr( $m[0], 0, 3 ) === 'RFC' ) {
 				$keyword = 'RFC';
 				$urlmsg = 'rfcurl';
-				$id = $m[1];
-			} elseif ( substr( $m[0], 0, 4 ) == 'PMID' ) {
+				$id = $m[4];
+			} elseif ( substr( $m[0], 0, 4 ) === 'PMID' ) {
 				$keyword = 'PMID';
 				$urlmsg = 'pubmedurl';
-				$id = $m[1];
+				$id = $m[4];
 			} else {
 				throw new MWException( __METHOD__.': unrecognised match type "' .
 					substr($m[0], 0, 20 ) . '"' );
 			}
-
 			$url = wfMsg( $urlmsg, $id);
 			$sk = $this->mOptions->getSkin();
 			$la = $sk->getExternalLinkAttributes( $url, $keyword.$id );
-			$text = "<a href=\"{$url}\"{$la}>{$keyword} {$id}</a>";
+			return "<a href=\"{$url}\"{$la}>{$keyword} {$id}</a>";
+		} elseif ( isset( $m[5] ) && strval( $m[5] ) !== '' ) {
+			# ISBN
+			$isbn = $m[5];
+			$num = strtr( $isbn, array(
+				'-' => '',
+				' ' => '',
+				'x' => 'X',
+			));
+			$titleObj = SpecialPage::getTitleFor( 'Booksources', $num );
+			return'<a href="' .
+				$titleObj->escapeLocalUrl() .
+				"\" class=\"internal\">ISBN $isbn</a>";
+		} else {
+			return $m[0];
 		}
-		return $text;
 	}
 
 	/**
+	 * Make a free external link, given a user-supplied URL
+	 * @return HTML
+	 * @private
+	 */
+	function makeFreeExternalLink( $url ) {
+		global $wgContLang;
+		wfProfileIn( __METHOD__ );
+
+		$sk = $this->mOptions->getSkin();
+		$trail = '';
+
+		# The characters '<' and '>' (which were escaped by
+		# removeHTMLtags()) should not be included in
+		# URLs, per RFC 2396.
+		$m2 = array();
+		if (preg_match('/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE)) {
+			$trail = substr($url, $m2[0][1]) . $trail;
+			$url = substr($url, 0, $m2[0][1]);
+		}
+
+		# Move trailing punctuation to $trail
+		$sep = ',;\.:!?';
+		# If there is no left bracket, then consider right brackets fair game too
+		if ( strpos( $url, '(' ) === false ) {
+			$sep .= ')';
+		}
+
+		$numSepChars = strspn( strrev( $url ), $sep );
+		if ( $numSepChars ) {
+			$trail = substr( $url, -$numSepChars ) . $trail;
+			$url = substr( $url, 0, -$numSepChars );
+		}
+
+		$url = Sanitizer::cleanUrl( $url );
+
+		# Is this an external image?
+		$text = $this->maybeMakeExternalImage( $url );
+		if ( $text === false ) {
+			# Not an image, make a link
+			$text = $sk->makeExternalLink( $url, $wgContLang->markNoConversion($url), true, 'free', 
+				$this->getExternalLinkAttribs() );
+			# Register it in the output object...
+			# Replace unnecessary URL escape codes with their equivalent characters
+			$pasteurized = self::replaceUnusualEscapes( $url );
+			$this->mOutput->addExternalLink( $pasteurized );
+		}
+		wfProfileOut( __METHOD__ );
+		return $text . $trail;
+	}
+
+
+	/**
 	 * Parse headers and return html
 	 *
 	 * @private
 	 */
 	function doHeadings( $text ) {
-		$fname = 'Parser::doHeadings';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		for ( $i = 6; $i >= 1; --$i ) {
 			$h = str_repeat( '=', $i );
 			$text = preg_replace( "/^$h(.+)$h\\s*$/m",
 			  "<h$i>\\1</h$i>", $text );
 		}
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
@@ -1079,15 +1163,14 @@ class Parser
 	 * @return string the altered text
 	 */
 	function doAllQuotes( $text ) {
-		$fname = 'Parser::doAllQuotes';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		$outtext = '';
-		$lines = explode( "\n", $text );
+		$lines = StringUtils::explode( "\n", $text );
 		foreach ( $lines as $line ) {
-			$outtext .= $this->doQuotes ( $line ) . "\n";
+			$outtext .= $this->doQuotes( $line ) . "\n";
 		}
 		$outtext = substr($outtext, 0,-1);
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $outtext;
 	}
 
@@ -1149,9 +1232,9 @@ class Parser
 					{
 						$x1 = substr ($arr[$i-1], -1);
 						$x2 = substr ($arr[$i-1], -2, 1);
-						if ($x1 == ' ') {
+						if ($x1 === ' ') {
 							if ($firstspace == -1) $firstspace = $i;
-						} else if ($x2 == ' ') {
+						} else if ($x2 === ' ') {
 							if ($firstsingleletterword == -1) $firstsingleletterword = $i;
 						} else {
 							if ($firstmultiletterword == -1) $firstmultiletterword = $i;
@@ -1191,7 +1274,7 @@ class Parser
 			{
 				if (($i % 2) == 0)
 				{
-					if ($state == 'both')
+					if ($state === 'both')
 						$buffer .= $r;
 					else
 						$output .= $r;
@@ -1200,41 +1283,41 @@ class Parser
 				{
 					if (strlen ($r) == 2)
 					{
-						if ($state == 'i')
+						if ($state === 'i')
 						{ $output .= '</i>'; $state = ''; }
-						else if ($state == 'bi')
+						else if ($state === 'bi')
 						{ $output .= '</i>'; $state = 'b'; }
-						else if ($state == 'ib')
+						else if ($state === 'ib')
 						{ $output .= '</b></i><b>'; $state = 'b'; }
-						else if ($state == 'both')
+						else if ($state === 'both')
 						{ $output .= '<b><i>'.$buffer.'</i>'; $state = 'b'; }
 						else # $state can be 'b' or ''
 						{ $output .= '<i>'; $state .= 'i'; }
 					}
 					else if (strlen ($r) == 3)
 					{
-						if ($state == 'b')
+						if ($state === 'b')
 						{ $output .= '</b>'; $state = ''; }
-						else if ($state == 'bi')
+						else if ($state === 'bi')
 						{ $output .= '</i></b><i>'; $state = 'i'; }
-						else if ($state == 'ib')
+						else if ($state === 'ib')
 						{ $output .= '</b>'; $state = 'i'; }
-						else if ($state == 'both')
+						else if ($state === 'both')
 						{ $output .= '<i><b>'.$buffer.'</b>'; $state = 'i'; }
 						else # $state can be 'i' or ''
 						{ $output .= '<b>'; $state .= 'b'; }
 					}
 					else if (strlen ($r) == 5)
 					{
-						if ($state == 'b')
+						if ($state === 'b')
 						{ $output .= '</b><i>'; $state = 'i'; }
-						else if ($state == 'i')
+						else if ($state === 'i')
 						{ $output .= '</i><b>'; $state = 'b'; }
-						else if ($state == 'bi')
+						else if ($state === 'bi')
 						{ $output .= '</i></b>'; $state = ''; }
-						else if ($state == 'ib')
+						else if ($state === 'ib')
 						{ $output .= '</b></i>'; $state = ''; }
-						else if ($state == 'both')
+						else if ($state === 'both')
 						{ $output .= '<i><b>'.$buffer.'</b></i>'; $state = ''; }
 						else # ($state == '')
 						{ $buffer = ''; $state = 'both'; }
@@ -1243,21 +1326,21 @@ class Parser
 				$i++;
 			}
 			# Now close all remaining tags.  Notice that the order is important.
-			if ($state == 'b' || $state == 'ib')
+			if ($state === 'b' || $state === 'ib')
 				$output .= '</b>';
-			if ($state == 'i' || $state == 'bi' || $state == 'ib')
+			if ($state === 'i' || $state === 'bi' || $state === 'ib')
 				$output .= '</i>';
-			if ($state == 'bi')
+			if ($state === 'bi')
 				$output .= '</b>';
 			# There might be lonely ''''', so make sure we have a buffer
-			if ($state == 'both' && $buffer)
+			if ($state === 'both' && $buffer)
 				$output .= '<b><i>'.$buffer.'</i></b>';
 			return $output;
 		}
 	}
 
 	/**
-	 * Replace external links
+	 * Replace external links (REL)
 	 *
  	 * Note: this is all very hackish and the order of execution matters a lot.
 	 * Make sure to run maintenance/parserTests.php if you change this code.
@@ -1266,14 +1349,12 @@ class Parser
 	 */
 	function replaceExternalLinks( $text ) {
 		global $wgContLang;
-		$fname = 'Parser::replaceExternalLinks';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$sk = $this->mOptions->getSkin();
 
 		$bits = preg_split( $this->mExtLinkBracketedRegex, $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-
-		$s = $this->replaceFreeExternalLinks( array_shift( $bits ) );
+		$s = array_shift( $bits );
 
 		$i = 0;
 		while ( $i<count( $bits ) ) {
@@ -1301,13 +1382,14 @@ class Parser
 			$dtrail = '';
 
 			# Set linktype for CSS - if URL==text, link is essentially free
-			$linktype = ($text == $url) ? 'free' : 'text';
+			$linktype = ($text === $url) ? 'free' : 'text';
 
 			# No link text, e.g. [http://domain.tld/some.link]
 			if ( $text == '' ) {
 				# Autonumber if allowed. See bug #5918
 				if ( strpos( wfUrlProtocols(), substr($protocol, 0, strpos($protocol, ':')) ) !== false ) {
-					$text = '[' . ++$this->mAutonumber . ']';
+					$langObj = $this->getFunctionLang();
+					$text = '[' . $langObj->formatNum( ++$this->mAutonumber ) . ']';
 					$linktype = 'autonumber';
 				} else {
 					# Otherwise just use the URL
@@ -1324,108 +1406,44 @@ class Parser
 
 			$url = Sanitizer::cleanUrl( $url );
 
-			# Process the trail (i.e. everything after this link up until start of the next link),
-			# replacing any non-bracketed links
-			$trail = $this->replaceFreeExternalLinks( $trail );
+			if ( $this->mOptions->mExternalLinkTarget ) {
+				$attribs = array( 'target' => $this->mOptions->mExternalLinkTarget );
+			} else {
+				$attribs = array();
+			}
 
 			# Use the encoded URL
 			# This means that users can paste URLs directly into the text
 			# Funny characters like &ouml; aren't valid in URLs anyway
 			# This was changed in August 2004
-			$s .= $sk->makeExternalLink( $url, $text, false, $linktype, $this->mTitle->getNamespace() ) . $dtrail . $trail;
+			$s .= $sk->makeExternalLink( $url, $text, false, $linktype, $this->getExternalLinkAttribs() ) 
+				. $dtrail . $trail;
 
 			# Register link in the output object.
 			# Replace unnecessary URL escape codes with the referenced character
 			# This prevents spammers from hiding links from the filters
-			$pasteurized = Parser::replaceUnusualEscapes( $url );
+			$pasteurized = self::replaceUnusualEscapes( $url );
 			$this->mOutput->addExternalLink( $pasteurized );
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $s;
 	}
 
-	/**
-	 * Replace anything that looks like a URL with a link
-	 * @private
-	 */
-	function replaceFreeExternalLinks( $text ) {
-		global $wgContLang;
-		$fname = 'Parser::replaceFreeExternalLinks';
-		wfProfileIn( $fname );
-
-		$bits = preg_split( '/(\b(?:' . wfUrlProtocols() . '))/S', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-		$s = array_shift( $bits );
-		$i = 0;
-
-		$sk = $this->mOptions->getSkin();
-
-		while ( $i < count( $bits ) ){
-			$protocol = $bits[$i++];
-			$remainder = $bits[$i++];
-
-			$m = array();
-			if ( preg_match( '/^('.self::EXT_LINK_URL_CLASS.'+)(.*)$/s', $remainder, $m ) ) {
-				# Found some characters after the protocol that look promising
-				$url = $protocol . $m[1];
-				$trail = $m[2];
-
-				# special case: handle urls as url args:
-				# http://www.example.com/foo?=http://www.example.com/bar
-				if(strlen($trail) == 0 &&
-					isset($bits[$i]) &&
-					preg_match('/^'. wfUrlProtocols() . '$/S', $bits[$i]) &&
-					preg_match( '/^('.self::EXT_LINK_URL_CLASS.'+)(.*)$/s', $bits[$i + 1], $m ))
-				{
-					# add protocol, arg
-					$url .= $bits[$i] . $m[1]; # protocol, url as arg to previous link
-					$i += 2;
-					$trail = $m[2];
-				}
-
-				# The characters '<' and '>' (which were escaped by
-				# removeHTMLtags()) should not be included in
-				# URLs, per RFC 2396.
-				$m2 = array();
-				if (preg_match('/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE)) {
-					$trail = substr($url, $m2[0][1]) . $trail;
-					$url = substr($url, 0, $m2[0][1]);
-				}
-
-				# Move trailing punctuation to $trail
-				$sep = ',;\.:!?';
-				# If there is no left bracket, then consider right brackets fair game too
-				if ( strpos( $url, '(' ) === false ) {
-					$sep .= ')';
-				}
-
-				$numSepChars = strspn( strrev( $url ), $sep );
-				if ( $numSepChars ) {
-					$trail = substr( $url, -$numSepChars ) . $trail;
-					$url = substr( $url, 0, -$numSepChars );
-				}
-
-				$url = Sanitizer::cleanUrl( $url );
-
-				# Is this an external image?
-				$text = $this->maybeMakeExternalImage( $url );
-				if ( $text === false ) {
-					# Not an image, make a link
-					$text = $sk->makeExternalLink( $url, $wgContLang->markNoConversion($url), true, 'free', $this->mTitle->getNamespace() );
-					# Register it in the output object...
-					# Replace unnecessary URL escape codes with their equivalent characters
-					$pasteurized = Parser::replaceUnusualEscapes( $url );
-					$this->mOutput->addExternalLink( $pasteurized );
-				}
-				$s .= $text . $trail;
-			} else {
-				$s .= $protocol . $remainder;
-			}
+	function getExternalLinkAttribs() {
+		$attribs = array();
+		global $wgNoFollowLinks, $wgNoFollowNsExceptions;
+		$ns = $this->mTitle->getNamespace();
+		if( $wgNoFollowLinks && !in_array($ns, $wgNoFollowNsExceptions) ) {
+			$attribs['rel'] = 'nofollow';
 		}
-		wfProfileOut( $fname );
-		return $s;
+		if ( $this->mOptions->getExternalLinkTarget() ) {
+			$attribs['target'] = $this->mOptions->getExternalLinkTarget();
+		}
+		return $attribs;
 	}
 
+
 	/**
 	 * Replace unusual URL escape codes with their equivalent characters
 	 * @param string
@@ -1438,7 +1456,7 @@ class Parser
 	 */
 	static function replaceUnusualEscapes( $url ) {
 		return preg_replace_callback( '/%[0-9A-Fa-f]{2}/',
-			array( 'Parser', 'replaceUnusualEscapesCallback' ), $url );
+			array( __CLASS__, 'replaceUnusualEscapesCallback' ), $url );
 	}
 
 	/**
@@ -1462,7 +1480,7 @@ class Parser
 
 	/**
 	 * make an image if it's allowed, either through the global
-	 * option or through the exception
+	 * option, through the exception, or through the on-wiki whitelist
 	 * @private
 	 */
 	function maybeMakeExternalImage( $url ) {
@@ -1470,47 +1488,88 @@ class Parser
 		$imagesfrom = $this->mOptions->getAllowExternalImagesFrom();
 		$imagesexception = !empty($imagesfrom);
 		$text = false;
+		# $imagesfrom could be either a single string or an array of strings, parse out the latter
+		if( $imagesexception && is_array( $imagesfrom ) ) {
+			$imagematch = false;
+			foreach( $imagesfrom as $match ) {
+				if( strpos( $url, $match ) === 0 ) {
+					$imagematch = true;
+					break;
+				}
+			}
+		} elseif( $imagesexception ) {
+			$imagematch = (strpos( $url, $imagesfrom ) === 0);
+		} else {
+			$imagematch = false;
+		}
 		if ( $this->mOptions->getAllowExternalImages()
-		     || ( $imagesexception && strpos( $url, $imagesfrom ) === 0 ) ) {
+		     || ( $imagesexception && $imagematch ) ) {
 			if ( preg_match( self::EXT_IMAGE_REGEX, $url ) ) {
 				# Image found
 				$text = $sk->makeExternalImage( $url );
 			}
 		}
+		if( !$text && $this->mOptions->getEnableImageWhitelist()
+			 && preg_match( self::EXT_IMAGE_REGEX, $url ) ) {
+			$whitelist = explode( "\n", wfMsgForContent( 'external_image_whitelist' ) );
+			foreach( $whitelist as $entry ) {
+				# Sanitize the regex fragment, make it case-insensitive, ignore blank entries/comments
+				if( strpos( $entry, '#' ) === 0 || $entry === '' )
+					continue;
+				if( preg_match( '/' . str_replace( '/', '\\/', $entry ) . '/i', $url ) ) {
+					# Image matches a whitelist entry
+					$text = $sk->makeExternalImage( $url );
+					break;
+				}
+			}
+		}
 		return $text;
 	}
 
 	/**
 	 * Process [[ ]] wikilinks
+	 * @return processed text
 	 *
 	 * @private
 	 */
 	function replaceInternalLinks( $s ) {
+		$this->mLinkHolders->merge( $this->replaceInternalLinks2( $s ) );
+		return $s;
+	}
+
+	/**
+	 * Process [[ ]] wikilinks (RIL)
+	 * @return LinkHolderArray
+	 *
+	 * @private
+	 */
+	function replaceInternalLinks2( &$s ) {
 		global $wgContLang;
-		static $fname = 'Parser::replaceInternalLinks' ;
 
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
-		wfProfileIn( $fname.'-setup' );
-		static $tc = FALSE;
+		wfProfileIn( __METHOD__.'-setup' );
+		static $tc = FALSE, $e1, $e1_img;
 		# the % is needed to support urlencoded titles as well
-		if ( !$tc ) { $tc = Title::legalChars() . '#%'; }
+		if ( !$tc ) { 
+			$tc = Title::legalChars() . '#%';
+			# Match a link having the form [[namespace:link|alternate]]trail
+			$e1 = "/^([{$tc}]+)(?:\\|(.+?))?]](.*)\$/sD";
+			# Match cases where there is no "]]", which might still be images
+			$e1_img = "/^([{$tc}]+)\\|(.*)\$/sD";
+		}
 
 		$sk = $this->mOptions->getSkin();
+		$holders = new LinkHolderArray( $this );
 
 		#split the entire text string on occurences of [[
-		$a = explode( '[[', ' ' . $s );
+		$a = StringUtils::explode( '[[', ' ' . $s );
 		#get the first element (all text up to first [[), and remove the space we added
-		$s = array_shift( $a );
+		$s = $a->current();
+		$a->next();
+		$line = $a->current(); # Workaround for broken ArrayIterator::next() that returns "void"
 		$s = substr( $s, 1 );
 
-		# Match a link having the form [[namespace:link|alternate]]trail
-		static $e1 = FALSE;
-		if ( !$e1 ) { $e1 = "/^([{$tc}]+)(?:\\|(.+?))?]](.*)\$/sD"; }
-		# Match cases where there is no "]]", which might still be images
-		static $e1_img = FALSE;
-		if ( !$e1_img ) { $e1_img = "/^([{$tc}]+)\\|(.*)\$/sD"; }
-
 		$useLinkPrefixExtension = $wgContLang->linkPrefixExtension();
 		$e2 = null;
 		if ( $useLinkPrefixExtension ) {
@@ -1520,8 +1579,8 @@ class Parser
 		}
 
 		if( is_null( $this->mTitle ) ) {
-			wfProfileOut( $fname );
-			wfProfileOut( $fname.'-setup' );
+			wfProfileOut( __METHOD__.'-setup' );
+			wfProfileOut( __METHOD__ );
 			throw new MWException( __METHOD__.": \$this->mTitle is null\n" );
 		}
 		$nottalk = !$this->mTitle->isTalkPage();
@@ -1543,13 +1602,20 @@ class Parser
 			$selflink = array($this->mTitle->getPrefixedText());
 		}
 		$useSubpages = $this->areSubpagesAllowed();
-		wfProfileOut( $fname.'-setup' );
+		wfProfileOut( __METHOD__.'-setup' );
 
 		# Loop for each link
-		for ($k = 0; isset( $a[$k] ); $k++) {
-			$line = $a[$k];
+		for ( ; $line !== false && $line !== null ; $a->next(), $line = $a->current() ) {
+			# Check for excessive memory usage
+			if ( $holders->isBig() ) {
+				# Too big
+				# Do the existence check, replace the link holders and clear the array
+				$holders->replace( $s );
+				$holders->clear();
+			}
+
 			if ( $useLinkPrefixExtension ) {
-				wfProfileIn( $fname.'-prefixhandling' );
+				wfProfileIn( __METHOD__.'-prefixhandling' );
 				if ( preg_match( $e2, $s, $m ) ) {
 					$prefix = $m[2];
 					$s = $m[1];
@@ -1561,12 +1627,12 @@ class Parser
 					$prefix = $first_prefix;
 					$first_prefix = false;
 				}
-				wfProfileOut( $fname.'-prefixhandling' );
+				wfProfileOut( __METHOD__.'-prefixhandling' );
 			}
 
 			$might_be_img = false;
 
-			wfProfileIn( "$fname-e1" );
+			wfProfileIn( __METHOD__."-e1" );
 			if ( preg_match( $e1, $line, $m ) ) { # page with normal text or alt
 				$text = $m[2];
 				# If we get a ] at the beginning of $m[3] that means we have a link that's something like:
@@ -1600,18 +1666,18 @@ class Parser
 				$trail = "";
 			} else { # Invalid form; output directly
 				$s .= $prefix . '[[' . $line ;
-				wfProfileOut( "$fname-e1" );
+				wfProfileOut( __METHOD__."-e1" );
 				continue;
 			}
-			wfProfileOut( "$fname-e1" );
-			wfProfileIn( "$fname-misc" );
+			wfProfileOut( __METHOD__."-e1" );
+			wfProfileIn( __METHOD__."-misc" );
 
 			# Don't allow internal links to pages containing
 			# PROTO: where PROTO is a valid URL protocol; these
 			# should be external links.
 			if (preg_match('/^\b(?:' . wfUrlProtocols() . ')/', $m[1])) {
 				$s .= $prefix . '[[' . $line ;
-				wfProfileOut( "$fname-misc" );
+				wfProfileOut( __METHOD__."-misc" );
 				continue;
 			}
 
@@ -1622,33 +1688,36 @@ class Parser
 				$link = $m[1];
 			}
 
-			$noforce = (substr($m[1], 0, 1) != ':');
+			$noforce = (substr($m[1], 0, 1) !== ':');
 			if (!$noforce) {
 				# Strip off leading ':'
 				$link = substr($link, 1);
 			}
 
-			wfProfileOut( "$fname-misc" );
-			wfProfileIn( "$fname-title" );
+			wfProfileOut( __METHOD__."-misc" );
+			wfProfileIn( __METHOD__."-title" );
 			$nt = Title::newFromText( $this->mStripState->unstripNoWiki($link) );
 			if( !$nt ) {
 				$s .= $prefix . '[[' . $line;
-				wfProfileOut( "$fname-title" );
+				wfProfileOut( __METHOD__."-title" );
 				continue;
 			}
 
 			$ns = $nt->getNamespace();
 			$iw = $nt->getInterWiki();
-			wfProfileOut( "$fname-title" );
+			wfProfileOut( __METHOD__."-title" );
 
 			if ($might_be_img) { # if this is actually an invalid link
-				wfProfileIn( "$fname-might_be_img" );
-				if ($ns == NS_IMAGE && $noforce) { #but might be an image
+				wfProfileIn( __METHOD__."-might_be_img" );
+				if ($ns == NS_FILE && $noforce) { #but might be an image
 					$found = false;
-					while (isset ($a[$k+1]) ) {
+					while ( true ) {
 						#look at the next 'line' to see if we can close it there
-						$spliced = array_splice( $a, $k + 1, 1 );
-						$next_line = array_shift( $spliced );
+						$a->next();
+						$next_line = $a->current();
+						if ( $next_line === false || $next_line === null ) {
+							break;
+						}
 						$m = explode( ']]', $next_line, 3 );
 						if ( count( $m ) == 3 ) {
 							# the first ]] closes the inner link, the second the image
@@ -1668,19 +1737,19 @@ class Parser
 					if ( !$found ) {
 						# we couldn't find the end of this imageLink, so output it raw
 						#but don't ignore what might be perfectly normal links in the text we've examined
-						$text = $this->replaceInternalLinks($text);
+						$holders->merge( $this->replaceInternalLinks2( $text ) );
 						$s .= "{$prefix}[[$link|$text";
 						# note: no $trail, because without an end, there *is* no trail
-						wfProfileOut( "$fname-might_be_img" );
+						wfProfileOut( __METHOD__."-might_be_img" );
 						continue;
 					}
 				} else { #it's not an image, so output it raw
 					$s .= "{$prefix}[[$link|$text";
 					# note: no $trail, because without an end, there *is* no trail
-					wfProfileOut( "$fname-might_be_img" );
+					wfProfileOut( __METHOD__."-might_be_img" );
 					continue;
 				}
-				wfProfileOut( "$fname-might_be_img" );
+				wfProfileOut( __METHOD__."-might_be_img" );
 			}
 
 			$wasblank = ( '' == $text );
@@ -1690,41 +1759,36 @@ class Parser
 			if( $noforce ) {
 
 				# Interwikis
-				wfProfileIn( "$fname-interwiki" );
+				wfProfileIn( __METHOD__."-interwiki" );
 				if( $iw && $this->mOptions->getInterwikiMagic() && $nottalk && $wgContLang->getLanguageName( $iw ) ) {
 					$this->mOutput->addLanguageLink( $nt->getFullText() );
 					$s = rtrim($s . $prefix);
 					$s .= trim($trail, "\n") == '' ? '': $prefix . $trail;
-					wfProfileOut( "$fname-interwiki" );
+					wfProfileOut( __METHOD__."-interwiki" );
 					continue;
 				}
-				wfProfileOut( "$fname-interwiki" );
+				wfProfileOut( __METHOD__."-interwiki" );
 
-				if ( $ns == NS_IMAGE ) {
-					wfProfileIn( "$fname-image" );
+				if ( $ns == NS_FILE ) {
+					wfProfileIn( __METHOD__."-image" );
 					if ( !wfIsBadImage( $nt->getDBkey(), $this->mTitle ) ) {
 						# recursively parse links inside the image caption
 						# actually, this will parse them in any other parameters, too,
 						# but it might be hard to fix that, and it doesn't matter ATM
 						$text = $this->replaceExternalLinks($text);
-						$text = $this->replaceInternalLinks($text);
+						$holders->merge( $this->replaceInternalLinks2( $text ) );
 
 						# cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them
-						$s .= $prefix . $this->armorLinks( $this->makeImage( $nt, $text ) ) . $trail;
-						$this->mOutput->addImage( $nt->getDBkey() );
-
-						wfProfileOut( "$fname-image" );
-						continue;
-					} else {
-						# We still need to record the image's presence on the page
-						$this->mOutput->addImage( $nt->getDBkey() );
+						$s .= $prefix . $this->armorLinks( $this->makeImage( $nt, $text, $holders ) ) . $trail;
 					}
-					wfProfileOut( "$fname-image" );
+					$this->mOutput->addImage( $nt->getDBkey() );
+					wfProfileOut( __METHOD__."-image" );
+					continue;
 
 				}
 
 				if ( $ns == NS_CATEGORY ) {
-					wfProfileIn( "$fname-category" );
+					wfProfileIn( __METHOD__."-category" );
 					$s = rtrim($s . "\n"); # bug 87
 
 					if ( $wasblank ) {
@@ -1743,26 +1807,27 @@ class Parser
 					 */
 					$s .= trim($prefix . $trail, "\n") == '' ? '': $prefix . $trail;
 
-					wfProfileOut( "$fname-category" );
+					wfProfileOut( __METHOD__."-category" );
 					continue;
 				}
 			}
 
 			# Self-link checking
-			if( $nt->getFragment() === '' ) {
+			if( $nt->getFragment() === '' && $ns != NS_SPECIAL ) {
 				if( in_array( $nt->getPrefixedText(), $selflink, true ) ) {
 					$s .= $prefix . $sk->makeSelfLinkObj( $nt, $text, '', $trail );
 					continue;
 				}
 			}
 
-			# Special and Media are pseudo-namespaces; no pages actually exist in them
+			# NS_MEDIA is a pseudo-namespace for linking directly to a file
+			# FIXME: Should do batch file existence checks, see comment below
 			if( $ns == NS_MEDIA ) {
 				# Give extensions a chance to select the file revision for us
 				$skip = $time = false;
 				wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$nt, &$skip, &$time ) );
 				if ( $skip ) {
-					$link = $sk->makeLinkObj( $nt );
+					$link = $sk->link( $nt );
 				} else {
 					$link = $sk->makeMediaLinkObj( $nt, $text, $time );
 				}
@@ -1770,28 +1835,23 @@ class Parser
 				$s .= $prefix . $this->armorLinks( $link ) . $trail;
 				$this->mOutput->addImage( $nt->getDBkey() );
 				continue;
-			} elseif( $ns == NS_SPECIAL ) {
-				if( SpecialPage::exists( $nt->getDBkey() ) ) {
-					$s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix );
-				} else {
-					$s .= $this->makeLinkHolder( $nt, $text, '', $trail, $prefix );
-				}
-				continue;
-			} elseif( $ns == NS_IMAGE ) {
-				$img = wfFindFile( $nt );
-				if( $img ) {
-					// Force a blue link if the file exists; may be a remote
-					// upload on the shared repository, and we want to see its
-					// auto-generated page.
-					$s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix );
-					$this->mOutput->addLink( $nt );
-					continue;
-				}
 			}
-			$s .= $this->makeLinkHolder( $nt, $text, '', $trail, $prefix );
+
+			# Some titles, such as valid special pages or files in foreign repos, should
+			# be shown as bluelinks even though they're not included in the page table
+			#
+			# FIXME: isAlwaysKnown() can be expensive for file links; we should really do
+			# batch file existence checks for NS_FILE and NS_MEDIA
+			if( $iw == '' && $nt->isAlwaysKnown() ) {
+				$this->mOutput->addLink( $nt );
+				$s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix );
+			} else {
+				# Links will be added to the output link list after checking
+				$s .= $holders->makeHolder( $nt, $text, '', $trail, $prefix );
+			}
 		}
-		wfProfileOut( $fname );
-		return $s;
+		wfProfileOut( __METHOD__ );
+		return $holders;
 	}
 
 	/**
@@ -1800,32 +1860,10 @@ class Parser
 	 * parsing of interwiki links, and secondly to allow all existence checks and
 	 * article length checks (for stub links) to be bundled into a single query.
 	 *
+	 * @deprecated
 	 */
 	function makeLinkHolder( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		wfProfileIn( __METHOD__ );
-		if ( ! is_object($nt) ) {
-			# Fail gracefully
-			$retVal = "<!-- ERROR -->{$prefix}{$text}{$trail}";
-		} else {
-			# Separate the link trail from the rest of the link
-			list( $inside, $trail ) = Linker::splitTrail( $trail );
-
-			if ( $nt->isExternal() ) {
-				$nr = array_push( $this->mInterwikiLinkHolders['texts'], $prefix.$text.$inside );
-				$this->mInterwikiLinkHolders['titles'][] = $nt;
-				$retVal = '<!--IWLINK '. ($nr-1) ."-->{$trail}";
-			} else {
-				$nr = array_push( $this->mLinkHolders['namespaces'], $nt->getNamespace() );
-				$this->mLinkHolders['dbkeys'][] = $nt->getDBkey();
-				$this->mLinkHolders['queries'][] = $query;
-				$this->mLinkHolders['texts'][] = $prefix.$text.$inside;
-				$this->mLinkHolders['titles'][] = $nt;
-
-				$retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
-			}
-		}
-		wfProfileOut( __METHOD__ );
-		return $retVal;
+		return $this->mLinkHolders->makeHolder( $nt, $text, $query, $trail, $prefix );
 	}
 
 	/**
@@ -1853,10 +1891,8 @@ class Parser
 	 * Insert a NOPARSE hacky thing into any inline links in a chunk that's
 	 * going to go through further parsing steps before inline URL expansion.
 	 *
-	 * In particular this is important when using action=render, which causes
-	 * full URLs to be included.
-	 *
-	 * Oh man I hate our multi-layer parser!
+	 * Not needed quite as much as it used to be since free links are a bit
+	 * more sensible these days. But bracketed links are still an issue.
 	 *
 	 * @param string more-or-less HTML
 	 * @return string less-or-more HTML with NOPARSE bits
@@ -1891,8 +1927,7 @@ class Parser
 		# ../ -- convert to CurrentPage, from CurrentPage/CurrentSubPage
 		# ../Foobar -- convert to CurrentPage/Foobar, from CurrentPage/CurrentSubPage
 
-		$fname = 'Parser::maybeDoSubpageLink';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		$ret = $target; # default return value is no change
 
 		# Some namespaces don't allow subpages,
@@ -1908,7 +1943,7 @@ class Parser
 			# bug 7425
 			$target = trim( $target );
 			# Look at the first character
-			if( $target != '' && $target{0} == '/' ) {
+			if( $target != '' && $target{0} === '/' ) {
 				# / at end means we don't want the slash to be shown
 				$m = array();
 				$trailingSlashes = preg_match_all( '%(/+)$%', $target, $m );
@@ -1935,7 +1970,7 @@ class Parser
 					if( count( $exploded ) > $dotdotcount ) { # not allowed to go below top level page
 						$ret = implode( '/', array_slice( $exploded, 0, -$dotdotcount ) );
 						# / at the end means don't show full path
-						if( substr( $nodotdot, -1, 1 ) == '/' ) {
+						if( substr( $nodotdot, -1, 1 ) === '/' ) {
 							$nodotdot = substr( $nodotdot, 0, -1 );
 							if( '' === $text ) {
 								$text = $nodotdot . $suffix;
@@ -1951,7 +1986,7 @@ class Parser
 			}
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
 
@@ -1987,10 +2022,10 @@ class Parser
 	/* private */ function openList( $char ) {
 		$result = $this->closeParagraph();
 
-		if ( '*' == $char ) { $result .= '<ul><li>'; }
-		else if ( '#' == $char ) { $result .= '<ol><li>'; }
-		else if ( ':' == $char ) { $result .= '<dl><dd>'; }
-		else if ( ';' == $char ) {
+		if ( '*' === $char ) { $result .= '<ul><li>'; }
+		else if ( '#' === $char ) { $result .= '<ol><li>'; }
+		else if ( ':' === $char ) { $result .= '<dl><dd>'; }
+		else if ( ';' === $char ) {
 			$result .= '<dl><dt>';
 			$this->mDTopen = true;
 		}
@@ -2000,11 +2035,11 @@ class Parser
 	}
 
 	/* private */ function nextItem( $char ) {
-		if ( '*' == $char || '#' == $char ) { return '</li><li>'; }
-		else if ( ':' == $char || ';' == $char ) {
+		if ( '*' === $char || '#' === $char ) { return '</li><li>'; }
+		else if ( ':' === $char || ';' === $char ) {
 			$close = '</dd>';
 			if ( $this->mDTopen ) { $close = '</dt>'; }
-			if ( ';' == $char ) {
+			if ( ';' === $char ) {
 				$this->mDTopen = true;
 				return $close . '<dt>';
 			} else {
@@ -2016,9 +2051,9 @@ class Parser
 	}
 
 	/* private */ function closeList( $char ) {
-		if ( '*' == $char ) { $text = '</li></ul>'; }
-		else if ( '#' == $char ) { $text = '</li></ol>'; }
-		else if ( ':' == $char ) {
+		if ( '*' === $char ) { $text = '</li></ul>'; }
+		else if ( '#' === $char ) { $text = '</li></ol>'; }
+		else if ( ':' === $char ) {
 			if ( $this->mDTopen ) {
 				$this->mDTopen = false;
 				$text = '</dt></dl>';
@@ -2032,56 +2067,59 @@ class Parser
 	/**#@-*/
 
 	/**
-	 * Make lists from lines starting with ':', '*', '#', etc.
+	 * Make lists from lines starting with ':', '*', '#', etc. (DBL)
 	 *
 	 * @private
 	 * @return string the lists rendered as HTML
 	 */
 	function doBlockLevels( $text, $linestart ) {
-		$fname = 'Parser::doBlockLevels';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		# Parsing through the text line by line.  The main thing
 		# happening here is handling of block-level elements p, pre,
 		# and making lists from lines starting with * # : etc.
 		#
-		$textLines = explode( "\n", $text );
+		$textLines = StringUtils::explode( "\n", $text );
 
 		$lastPrefix = $output = '';
 		$this->mDTopen = $inBlockElem = false;
 		$prefixLength = 0;
 		$paragraphStack = false;
 
-		if ( !$linestart ) {
-			$output .= array_shift( $textLines );
-		}
 		foreach ( $textLines as $oLine ) {
+			# Fix up $linestart
+			if ( !$linestart ) {
+				$output .= $oLine;
+				$linestart = true;
+				continue;
+			}
+
 			$lastPrefixLength = strlen( $lastPrefix );
 			$preCloseMatch = preg_match('/<\\/pre/i', $oLine );
 			$preOpenMatch = preg_match('/<pre/i', $oLine );
 			if ( !$this->mInPre ) {
 				# Multiple prefixes may abut each other for nested lists.
 				$prefixLength = strspn( $oLine, '*#:;' );
-				$pref = substr( $oLine, 0, $prefixLength );
+				$prefix = substr( $oLine, 0, $prefixLength );
 
 				# eh?
-				$pref2 = str_replace( ';', ':', $pref );
+				$prefix2 = str_replace( ';', ':', $prefix );
 				$t = substr( $oLine, $prefixLength );
-				$this->mInPre = !empty($preOpenMatch);
+				$this->mInPre = (bool)$preOpenMatch;
 			} else {
 				# Don't interpret any other prefixes in preformatted text
 				$prefixLength = 0;
-				$pref = $pref2 = '';
+				$prefix = $prefix2 = '';
 				$t = $oLine;
 			}
 
 			# List generation
-			if( $prefixLength && 0 == strcmp( $lastPrefix, $pref2 ) ) {
+			if( $prefixLength && $lastPrefix === $prefix2 ) {
 				# Same as the last item, so no need to deal with nesting or opening stuff
-				$output .= $this->nextItem( substr( $pref, -1 ) );
+				$output .= $this->nextItem( substr( $prefix, -1 ) );
 				$paragraphStack = false;
 
-				if ( substr( $pref, -1 ) == ';') {
+				if ( substr( $prefix, -1 ) === ';') {
 					# The one nasty exception: definition lists work like this:
 					# ; title : definition text
 					# So we check for : in the remainder text to split up the
@@ -2094,21 +2132,21 @@ class Parser
 				}
 			} elseif( $prefixLength || $lastPrefixLength ) {
 				# Either open or close a level...
-				$commonPrefixLength = $this->getCommon( $pref, $lastPrefix );
+				$commonPrefixLength = $this->getCommon( $prefix, $lastPrefix );
 				$paragraphStack = false;
 
 				while( $commonPrefixLength < $lastPrefixLength ) {
-					$output .= $this->closeList( $lastPrefix{$lastPrefixLength-1} );
+					$output .= $this->closeList( $lastPrefix[$lastPrefixLength-1] );
 					--$lastPrefixLength;
 				}
 				if ( $prefixLength <= $commonPrefixLength && $commonPrefixLength > 0 ) {
-					$output .= $this->nextItem( $pref{$commonPrefixLength-1} );
+					$output .= $this->nextItem( $prefix[$commonPrefixLength-1] );
 				}
 				while ( $prefixLength > $commonPrefixLength ) {
-					$char = substr( $pref, $commonPrefixLength, 1 );
+					$char = substr( $prefix, $commonPrefixLength, 1 );
 					$output .= $this->openList( $char );
 
-					if ( ';' == $char ) {
+					if ( ';' === $char ) {
 						# FIXME: This is dupe of code above
 						if ($this->findColonNoLinks($t, $term, $t2) !== false) {
 							$t = $t2;
@@ -2117,10 +2155,10 @@ class Parser
 					}
 					++$commonPrefixLength;
 				}
-				$lastPrefix = $pref2;
+				$lastPrefix = $prefix2;
 			}
 			if( 0 == $prefixLength ) {
-				wfProfileIn( "$fname-paragraph" );
+				wfProfileIn( __METHOD__."-paragraph" );
 				# No prefix (not in list)--go to paragraph mode
 				// XXX: use a stack for nestable elements like span, table and div
 				$openmatch = preg_match('/(?:<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
@@ -2140,9 +2178,9 @@ class Parser
 						$inBlockElem = true;
 					}
 				} else if ( !$inBlockElem && !$this->mInPre ) {
-					if ( ' ' == $t{0} and ( $this->mLastSection == 'pre' or trim($t) != '' ) ) {
+					if ( ' ' == $t{0} and ( $this->mLastSection === 'pre' or trim($t) != '' ) ) {
 						// pre
-						if ($this->mLastSection != 'pre') {
+						if ($this->mLastSection !== 'pre') {
 							$paragraphStack = false;
 							$output .= $this->closeParagraph().'<pre>';
 							$this->mLastSection = 'pre';
@@ -2156,7 +2194,7 @@ class Parser
 								$paragraphStack = false;
 								$this->mLastSection = 'p';
 							} else {
-								if ($this->mLastSection != 'p' ) {
+								if ($this->mLastSection !== 'p' ) {
 									$output .= $this->closeParagraph();
 									$this->mLastSection = '';
 									$paragraphStack = '<p>';
@@ -2169,14 +2207,14 @@ class Parser
 								$output .= $paragraphStack;
 								$paragraphStack = false;
 								$this->mLastSection = 'p';
-							} else if ($this->mLastSection != 'p') {
+							} else if ($this->mLastSection !== 'p') {
 								$output .= $this->closeParagraph().'<p>';
 								$this->mLastSection = 'p';
 							}
 						}
 					}
 				}
-				wfProfileOut( "$fname-paragraph" );
+				wfProfileOut( __METHOD__."-paragraph" );
 			}
 			// somewhere above we forget to get out of pre block (bug 785)
 			if($preCloseMatch && $this->mInPre) {
@@ -2187,7 +2225,7 @@ class Parser
 			}
 		}
 		while ( $prefixLength ) {
-			$output .= $this->closeList( $pref2{$prefixLength-1} );
+			$output .= $this->closeList( $prefix2[$prefixLength-1] );
 			--$prefixLength;
 		}
 		if ( '' != $this->mLastSection ) {
@@ -2195,7 +2233,7 @@ class Parser
 			$this->mLastSection = '';
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $output;
 	}
 
@@ -2208,13 +2246,12 @@ class Parser
 	 * return string the position of the ':', or false if none found
 	 */
 	function findColonNoLinks($str, &$before, &$after) {
-		$fname = 'Parser::findColonNoLinks';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$pos = strpos( $str, ':' );
 		if( $pos === false ) {
 			// Nothing to find!
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return false;
 		}
 
@@ -2223,7 +2260,7 @@ class Parser
 			// Easy; no tag nesting to worry about
 			$before = substr( $str, 0, $pos );
 			$after = substr( $str, $pos+1 );
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return $pos;
 		}
 
@@ -2247,7 +2284,7 @@ class Parser
 						// We found it!
 						$before = substr( $str, 0, $i );
 						$after = substr( $str, $i + 1 );
-						wfProfileOut( $fname );
+						wfProfileOut( __METHOD__ );
 						return $i;
 					}
 					// Embedded in a tag; don't break it.
@@ -2257,7 +2294,7 @@ class Parser
 					$colon = strpos( $str, ':', $i );
 					if( $colon === false ) {
 						// Nothing else interesting
-						wfProfileOut( $fname );
+						wfProfileOut( __METHOD__ );
 						return false;
 					}
 					$lt = strpos( $str, '<', $i );
@@ -2266,7 +2303,7 @@ class Parser
 							// We found it!
 							$before = substr( $str, 0, $colon );
 							$after = substr( $str, $colon + 1 );
-							wfProfileOut( $fname );
+							wfProfileOut( __METHOD__ );
 							return $i;
 						}
 					}
@@ -2313,18 +2350,18 @@ class Parser
 				break;
 			case 3: // self::COLON_STATE_CLOSETAG:
 				// In a </tag>
-				if( $c == ">" ) {
+				if( $c === ">" ) {
 					$stack--;
 					if( $stack < 0 ) {
-						wfDebug( "Invalid input in $fname; too many close tags\n" );
-						wfProfileOut( $fname );
+						wfDebug( __METHOD__.": Invalid input; too many close tags\n" );
+						wfProfileOut( __METHOD__ );
 						return false;
 					}
 					$state = self::COLON_STATE_TEXT;
 				}
 				break;
 			case self::COLON_STATE_TAGSLASH:
-				if( $c == ">" ) {
+				if( $c === ">" ) {
 					// Yes, a self-closed tag <blah/>
 					$state = self::COLON_STATE_TEXT;
 				} else {
@@ -2333,33 +2370,33 @@ class Parser
 				}
 				break;
 			case 5: // self::COLON_STATE_COMMENT:
-				if( $c == "-" ) {
+				if( $c === "-" ) {
 					$state = self::COLON_STATE_COMMENTDASH;
 				}
 				break;
 			case self::COLON_STATE_COMMENTDASH:
-				if( $c == "-" ) {
+				if( $c === "-" ) {
 					$state = self::COLON_STATE_COMMENTDASHDASH;
 				} else {
 					$state = self::COLON_STATE_COMMENT;
 				}
 				break;
 			case self::COLON_STATE_COMMENTDASHDASH:
-				if( $c == ">" ) {
+				if( $c === ">" ) {
 					$state = self::COLON_STATE_TEXT;
 				} else {
 					$state = self::COLON_STATE_COMMENT;
 				}
 				break;
 			default:
-				throw new MWException( "State machine error in $fname" );
+				throw new MWException( "State machine error in " . __METHOD__ );
 			}
 		}
 		if( $stack > 0 ) {
-			wfDebug( "Invalid input in $fname; not enough close tags (stack $stack, state $state)\n" );
+			wfDebug( __METHOD__.": Invalid input; not enough close tags (stack $stack, state $state)\n" );
 			return false;
 		}
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return false;
 	}
 
@@ -2552,9 +2589,11 @@ class Parser
 			case 'numberofpages':
 				return $this->mVarCache[$index] = $wgContLang->formatNum( SiteStats::pages() );
 			case 'numberofadmins':
-				return $this->mVarCache[$index] = $wgContLang->formatNum( SiteStats::admins() );
+				return $this->mVarCache[$index] = $wgContLang->formatNum( SiteStats::numberingroup('sysop') );
 			case 'numberofedits':
 				return $this->mVarCache[$index] = $wgContLang->formatNum( SiteStats::edits() );
+			case 'numberofviews':
+				return $this->mVarCache[$index] = $wgContLang->formatNum( SiteStats::views() );
 			case 'currenttimestamp':
 				return $this->mVarCache[$index] = wfTimestamp( TS_MW, $ts );
 			case 'localtimestamp':
@@ -2589,12 +2628,11 @@ class Parser
 	 * @private
 	 */
 	function initialiseVariables() {
-		$fname = 'Parser::initialiseVariables';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		$variableIDs = MagicWord::getVariableIDs();
 
 		$this->mVariables = new MagicWordArray( $variableIDs );
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 	}
 
 	/**
@@ -2663,8 +2701,7 @@ class Parser
 			return $text;
 		}
 
-		$fname = __METHOD__;
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		if ( $frame === false ) {
 			$frame = $this->getPreprocessor()->newFrame();
@@ -2677,7 +2714,7 @@ class Parser
 		$flags = $argsOnly ? PPFrame::NO_TEMPLATES : 0;
 		$text = $frame->expand( $dom, $flags );
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
@@ -2718,7 +2755,7 @@ class Parser
 	function limitationWarn( $limitationType, $current=null, $max=null) {
 		$msgName = $limitationType . '-warning';
 		//does no harm if $current and $max are present but are unnecessary for the message
-		$warning = wfMsg( $msgName, $current, $max); 
+		$warning = wfMsgExt( $msgName, array( 'parsemag', 'escape' ), $current, $max ); 
 		$this->mOutput->addWarning( $warning );
 		$cat = Title::makeTitleSafe( NS_CATEGORY, wfMsgForContent( $limitationType . '-category' ) );
 		if ( $cat ) {
@@ -2739,9 +2776,8 @@ class Parser
 	 * @private
 	 */
 	function braceSubstitution( $piece, $frame ) {
-		global $wgContLang, $wgLang, $wgAllowDisplayTitle, $wgNonincludableNamespaces;
-		$fname = __METHOD__;
-		wfProfileIn( $fname );
+		global $wgContLang, $wgAllowDisplayTitle, $wgNonincludableNamespaces;
+		wfProfileIn( __METHOD__ );
 		wfProfileIn( __METHOD__.'-setup' );
 
 		# Flags
@@ -2855,7 +2891,7 @@ class Parser
 
 					# Workaround for PHP bug 35229 and similar
 					if ( !is_callable( $callback ) ) {
-						throw new MWException( "Tag hook for $name is not callable\n" );
+						throw new MWException( "Tag hook for $function is not callable\n" );
 					}
 					$result = call_user_func_array( $callback, $allArgs );
 					$found = true;
@@ -2898,19 +2934,19 @@ class Parser
 				$titleText = $title->getPrefixedText();
 				# Check for language variants if the template is not found
 				if($wgContLang->hasVariants() && $title->getArticleID() == 0){
-					$wgContLang->findVariantLink($part1, $title);
+					$wgContLang->findVariantLink( $part1, $title, true );
 				}
 				# Do infinite loop check
 				if ( !$frame->loopCheck( $title ) ) {
 					$found = true;
-					$text = "<span class=\"error\">Template loop detected: [[$titleText]]</span>";
+					$text = '<span class="error">' . wfMsgForContent( 'parser-template-loop-warning', $titleText ) . '</span>';
 					wfDebug( __METHOD__.": template loop broken at '$titleText'\n" );
 				}
 				# Do recursion depth check
 				$limit = $this->mOptions->getMaxTemplateDepth();
 				if ( $frame->depth >= $limit ) {
 					$found = true;
-					$text = "<span class=\"error\">Template recursion depth limit exceeded ($limit)</span>";
+					$text = '<span class="error">' . wfMsgForContent( 'parser-template-recursion-depth-warning', $limit ) . '</span>';
 				}
 			}
 		}
@@ -2928,7 +2964,7 @@ class Parser
 					}
 				} else if ( $wgNonincludableNamespaces && in_array( $title->getNamespace(), $wgNonincludableNamespaces ) ) {
 					$found = false; //access denied
-					wfDebug( "$fname: template inclusion denied for " . $title->getPrefixedDBkey() );
+					wfDebug( __METHOD__.": template inclusion denied for " . $title->getPrefixedDBkey() );
 				} else {
 					list( $text, $title ) = $this->getTemplateDom( $title );
 					if ( $text !== false ) {
@@ -2962,7 +2998,7 @@ class Parser
 		# Recover the source wikitext and return it
 		if ( !$found ) {
 			$text = $frame->virtualBracketedImplode( '{{', '|', '}}', $titleWithSpaces, $args );
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return array( 'object' => $text );
 		}
 
@@ -3021,7 +3057,7 @@ class Parser
 			$ret = array( 'text' => $text );
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
 
@@ -3121,8 +3157,8 @@ class Parser
 			if( $rev ) {
 				$text = $rev->getText();
 			} elseif( $title->getNamespace() == NS_MEDIAWIKI ) {
-				global $wgLang;
-				$message = $wgLang->lcfirst( $title->getText() );
+				global $wgContLang;
+				$message = $wgContLang->lcfirst( $title->getText() );
 				$text = wfMsgForContentNoTrans( $message );
 				if( wfEmptyMsg( $message, $text ) ) {
 					$text = false;
@@ -3308,7 +3344,7 @@ class Parser
 			}
 		}
 
-		if ( $name == 'html' || $name == 'nowiki' ) {
+		if ( $name === 'html' || $name === 'nowiki' ) {
 			$this->mStripState->nowiki->setPair( $marker, $output );
 		} else {
 			$this->mStripState->general->setPair( $marker, $output );
@@ -3384,6 +3420,16 @@ class Parser
 				wfDebug( __METHOD__.": [[MediaWiki:hidden-category-category]] is not a valid title!\n" );
 			}
 		}
+		# (bug 8068) Allow control over whether robots index a page.
+		#
+		# FIXME (bug 14899): __INDEX__ always overrides __NOINDEX__ here!  This
+		# is not desirable, the last one on the page should win.
+		if( isset( $this->mDoubleUnderscores['noindex'] ) ) {
+			$this->mOutput->setIndexPolicy( 'noindex' );
+		} elseif( isset( $this->mDoubleUnderscores['index'] ) ) {
+			$this->mOutput->setIndexPolicy( 'index' );
+		}
+
 		return $text;
 	}
 
@@ -3402,13 +3448,14 @@ class Parser
 	 * @private
 	 */
 	function formatHeadings( $text, $isMain=true ) {
-		global $wgMaxTocLevel, $wgContLang;
+		global $wgMaxTocLevel, $wgContLang, $wgEnforceHtmlIds;
 
 		$doNumberHeadings = $this->mOptions->getNumberHeadings();
-		if( !$this->mTitle->quickUserCan( 'edit' ) ) {
+		$showEditLink = $this->mOptions->getEditSection();
+
+		// Do not call quickUserCan unless necessary
+		if( $showEditLink && !$this->mTitle->quickUserCan( 'edit' ) ) {
 			$showEditLink = 0;
-		} else {
-			$showEditLink = $this->mOptions->getEditSection();
 		}
 
 		# Inhibit editsection links if requested in the page
@@ -3554,12 +3601,7 @@ class Parser
 			#     <!--LINK number-->
 			# turns into
 			#     link text with suffix
-			$safeHeadline = preg_replace( '/<!--LINK ([0-9]*)-->/e',
-							    "\$this->mLinkHolders['texts'][\$1]",
-							    $safeHeadline );
-			$safeHeadline = preg_replace( '/<!--IWLINK ([0-9]*)-->/e',
-							    "\$this->mInterwikiLinkHolders['texts'][\$1]",
-							    $safeHeadline );
+			$safeHeadline = $this->replaceLinkHoldersText( $safeHeadline );
 
 			# Strip out HTML (other than plain <sup> and <sub>: bug 8393)
 			$tocline = preg_replace(
@@ -3575,13 +3617,60 @@ class Parser
 
 			# Save headline for section edit hint before it's escaped
 			$headlineHint = $safeHeadline;
-			$safeHeadline = Sanitizer::escapeId( $safeHeadline );
-			# HTML names must be case-insensitively unique (bug 10721)
+
+			if ( $wgEnforceHtmlIds ) {
+				$legacyHeadline = false;
+				$safeHeadline = Sanitizer::escapeId( $safeHeadline,
+					'noninitial' );
+			} else {
+				# For reverse compatibility, provide an id that's
+				# HTML4-compatible, like we used to.
+				#
+				# It may be worth noting, academically, that it's possible for
+				# the legacy anchor to conflict with a non-legacy headline
+				# anchor on the page.  In this case likely the "correct" thing
+				# would be to either drop the legacy anchors or make sure
+				# they're numbered first.  However, this would require people
+				# to type in section names like "abc_.D7.93.D7.90.D7.A4"
+				# manually, so let's not bother worrying about it.
+				$legacyHeadline = Sanitizer::escapeId( $safeHeadline,
+					'noninitial' );
+				$safeHeadline = Sanitizer::escapeId( $safeHeadline, 'xml' );
+
+				if ( $legacyHeadline == $safeHeadline ) {
+					# No reason to have both (in fact, we can't)
+					$legacyHeadline = false;
+				} elseif ( $legacyHeadline != Sanitizer::escapeId(
+				$legacyHeadline, 'xml' ) ) {
+					# The legacy id is invalid XML.  We used to allow this, but
+					# there's no reason to do so anymore.  Backward
+					# compatibility will fail slightly in this case, but it's
+					# no big deal.
+					$legacyHeadline = false;
+				}
+			}
+
+			# HTML names must be case-insensitively unique (bug 10721).  FIXME:
+			# Does this apply to Unicode characters?  Because we aren't
+			# handling those here.
 			$arrayKey = strtolower( $safeHeadline );
+			if ( $legacyHeadline === false ) {
+				$legacyArrayKey = false;
+			} else {
+				$legacyArrayKey = strtolower( $legacyHeadline );
+			}
 
 			# count how many in assoc. array so we can track dupes in anchors
-			isset( $refers[$arrayKey] ) ? $refers[$arrayKey]++ : $refers[$arrayKey] = 1;
-			$refcount[$headlineCount] = $refers[$arrayKey];
+			if ( isset( $refers[$arrayKey] ) ) {
+				$refers[$arrayKey]++;
+			} else {
+				$refers[$arrayKey] = 1;
+			}
+			if ( isset( $refers[$legacyArrayKey] ) ) {
+				$refers[$legacyArrayKey]++;
+			} else {
+				$refers[$legacyArrayKey] = 1;
+			}
 
 			# Don't number the heading if it is the only one (looks silly)
 			if( $doNumberHeadings && count( $matches[3] ) > 1) {
@@ -3591,8 +3680,12 @@ class Parser
 
 			# Create the anchor for linking from the TOC to the section
 			$anchor = $safeHeadline;
-			if($refcount[$headlineCount] > 1 ) {
-				$anchor .= '_' . $refcount[$headlineCount];
+			$legacyAnchor = $legacyHeadline;
+			if ( $refers[$arrayKey] > 1 ) {
+				$anchor .= '_' . $refers[$arrayKey];
+			}
+			if ( $legacyHeadline !== false && $refers[$legacyArrayKey] > 1 ) {
+				$legacyAnchor .= '_' . $refers[$legacyArrayKey];
 			}
 			if( $enoughToc && ( !isset($wgMaxTocLevel) || $toclevel<$wgMaxTocLevel ) ) {
 				$toc .= $sk->tocLine($anchor, $tocline, $numbering, $toclevel);
@@ -3603,14 +3696,16 @@ class Parser
 				if( $isTemplate ) {
 					# Put a T flag in the section identifier, to indicate to extractSections()
 					# that sections inside <includeonly> should be counted.
-					$editlink = $sk->editSectionLinkForOther($titleText, "T-$sectionIndex");
+					$editlink = $sk->doEditSectionLink(Title::newFromText( $titleText ), "T-$sectionIndex");
 				} else {
-					$editlink = $sk->editSectionLink($this->mTitle, $sectionIndex, $headlineHint);
+					$editlink = $sk->doEditSectionLink($this->mTitle, $sectionIndex, $headlineHint);
 				}
 			} else {
 				$editlink = '';
 			}
-			$head[$headlineCount] = $sk->makeHeadline( $level, $matches['attrib'][$headlineCount], $anchor, $headline, $editlink );
+			$head[$headlineCount] = $sk->makeHeadline( $level,
+				$matches['attrib'][$headlineCount], $anchor, $headline,
+				$editlink, $legacyAnchor );
 
 			$headlineCount++;
 		}
@@ -3635,7 +3730,7 @@ class Parser
 		$i = 0;
 
 		foreach( $blocks as $block ) {
-			if( $showEditLink && $headlineCount > 0 && $i == 0 && $block != "\n" ) {
+			if( $showEditLink && $headlineCount > 0 && $i == 0 && $block !== "\n" ) {
 				# This is the [edit] link that appears for the top block of text when
 				# section editing is enabled
 
@@ -3737,11 +3832,13 @@ class Parser
 		$nc = '[ _0-9A-Za-z\x80-\xff-]'; # Namespaces can use non-ascii!
 
 		$p1 = "/\[\[(:?$nc+:|:|)($tc+?)( \\($tc+\\))\\|]]/";		# [[ns:page (context)|]]
+		$p4 = "/\[\[(:?$nc+:|:|)($tc+?)(（$tc+）)\\|]]/";		# [[ns:page（context）|]]
 		$p3 = "/\[\[(:?$nc+:|:|)($tc+?)( \\($tc+\\)|)(, $tc+|)\\|]]/";	# [[ns:page (context), context|]]
 		$p2 = "/\[\[\\|($tc+)]]/";					# [[|page]]
 
 		# try $p1 first, to turn "[[A, B (C)|]]" into "[[A, B (C)|A, B]]"
 		$text = preg_replace( $p1, '[[\\1\\2\\3|\\2]]', $text );
+		$text = preg_replace( $p4, '[[\\1\\2\\3|\\2]]', $text );
 		$text = preg_replace( $p3, '[[\\1\\2\\3\\4|\\2]]', $text );
 
 		$t = $this->mTitle->getText();
@@ -3787,7 +3884,7 @@ class Parser
 			} else {
 				# Failed to validate; fall back to the default
 				$nickname = $username;
-				wfDebug( "Parser::getUserSig: $username has bad XML tags in signature.\n" );
+				wfDebug( __METHOD__.": $username has bad XML tags in signature.\n" );
 			}
 		}
 
@@ -3811,7 +3908,7 @@ class Parser
 	 * @return mixed An expanded string, or false if invalid.
 	 */
 	function validateSig( $text ) {
-		return( wfIsWellFormedXmlFragment( $text ) ? $text : false );
+		return( Xml::isWellFormedXmlFragment( $text ) ? $text : false );
 	}
 
 	/**
@@ -3833,6 +3930,11 @@ class Parser
 			$this->setOutputType = self::OT_PREPROCESS;
 		}
 
+		# Option to disable this feature
+		if ( !$this->mOptions->getCleanSignatures() ) {
+			return $text;
+		}
+
 		# FIXME: regex doesn't respect extension tags or nowiki
 		#  => Move this logic to braceSubstitution()
 		$substWord = MagicWord::get( 'subst' );
@@ -3888,19 +3990,17 @@ class Parser
 		global $wgTitle;
 		static $executing = false;
 
-		$fname = "Parser::transformMsg";
-
 		# Guard against infinite recursion
 		if ( $executing ) {
 			return $text;
 		}
 		$executing = true;
 
-		wfProfileIn($fname);
+		wfProfileIn(__METHOD__);
 		$text = $this->preprocess( $text, $wgTitle, $options );
 
 		$executing = false;
-		wfProfileOut($fname);
+		wfProfileOut(__METHOD__);
 		return $text;
 	}
 
@@ -3997,7 +4097,7 @@ class Parser
 		# Add to function cache
 		$mw = MagicWord::get( $id );
 		if( !$mw )
-			throw new MWException( 'Parser::setFunctionHook() expecting a magic word identifier.' );
+			throw new MWException( __METHOD__.'() expecting a magic word identifier.' );
 
 		$synonyms = $mw->getSynonyms();
 		$sensitive = intval( $mw->isCaseSensitive() );
@@ -4012,7 +4112,7 @@ class Parser
 				$syn = '#' . $syn;
 			}
 			# Remove trailing colon
-			if ( substr( $syn, -1, 1 ) == ':' ) {
+			if ( substr( $syn, -1, 1 ) === ':' ) {
 				$syn = substr( $syn, 0, -1 );
 			}
 			$this->mFunctionSynonyms[$sensitive][$syn] = $id;
@@ -4033,266 +4133,9 @@ class Parser
 	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
 	 * Placeholders created in Skin::makeLinkObj()
 	 * Returns an array of link CSS classes, indexed by PDBK.
-	 * $options is a bit field, RLH_FOR_UPDATE to select for update
 	 */
 	function replaceLinkHolders( &$text, $options = 0 ) {
-		global $wgUser;
-		global $wgContLang;
-
-		$fname = 'Parser::replaceLinkHolders';
-		wfProfileIn( $fname );
-
-		$pdbks = array();
-		$colours = array();
-		$linkcolour_ids = array();
-		$sk = $this->mOptions->getSkin();
-		$linkCache = LinkCache::singleton();
-
-		if ( !empty( $this->mLinkHolders['namespaces'] ) ) {
-			wfProfileIn( $fname.'-check' );
-			$dbr = wfGetDB( DB_SLAVE );
-			$page = $dbr->tableName( 'page' );
-			$threshold = $wgUser->getOption('stubthreshold');
-
-			# Sort by namespace
-			asort( $this->mLinkHolders['namespaces'] );
-
-			# Generate query
-			$query = false;
-			$current = null;
-			foreach ( $this->mLinkHolders['namespaces'] as $key => $ns ) {
-				# Make title object
-				$title = $this->mLinkHolders['titles'][$key];
-
-				# Skip invalid entries.
-				# Result will be ugly, but prevents crash.
-				if ( is_null( $title ) ) {
-					continue;
-				}
-				$pdbk = $pdbks[$key] = $title->getPrefixedDBkey();
-
-				# Check if it's a static known link, e.g. interwiki
-				if ( $title->isAlwaysKnown() ) {
-					$colours[$pdbk] = '';
-				} elseif ( ( $id = $linkCache->getGoodLinkID( $pdbk ) ) != 0 ) {
-					$colours[$pdbk] = '';
-					$this->mOutput->addLink( $title, $id );
-				} elseif ( $linkCache->isBadLink( $pdbk ) ) {
-					$colours[$pdbk] = 'new';
-				} elseif ( $title->getNamespace() == NS_SPECIAL && !SpecialPage::exists( $pdbk ) ) {
-					$colours[$pdbk] = 'new';
-				} else {
-					# Not in the link cache, add it to the query
-					if ( !isset( $current ) ) {
-						$current = $ns;
-						$query =  "SELECT page_id, page_namespace, page_title, page_is_redirect, page_len";
-						$query .= " FROM $page WHERE (page_namespace=$ns AND page_title IN(";
-					} elseif ( $current != $ns ) {
-						$current = $ns;
-						$query .= ")) OR (page_namespace=$ns AND page_title IN(";
-					} else {
-						$query .= ', ';
-					}
-
-					$query .= $dbr->addQuotes( $this->mLinkHolders['dbkeys'][$key] );
-				}
-			}
-			if ( $query ) {
-				$query .= '))';
-				if ( $options & RLH_FOR_UPDATE ) {
-					$query .= ' FOR UPDATE';
-				}
-
-				$res = $dbr->query( $query, $fname );
-
-				# Fetch data and form into an associative array
-				# non-existent = broken
-				while ( $s = $dbr->fetchObject($res) ) {
-					$title = Title::makeTitle( $s->page_namespace, $s->page_title );
-					$pdbk = $title->getPrefixedDBkey();
-					$linkCache->addGoodLinkObj( $s->page_id, $title, $s->page_len, $s->page_is_redirect );
-					$this->mOutput->addLink( $title, $s->page_id );
-					$colours[$pdbk] = $sk->getLinkColour( $title, $threshold );
-					//add id to the extension todolist
-					$linkcolour_ids[$s->page_id] = $pdbk;
-				}
-				//pass an array of page_ids to an extension
-				wfRunHooks( 'GetLinkColours', array( $linkcolour_ids, &$colours ) );
-			}
-			wfProfileOut( $fname.'-check' );
-
-			# Do a second query for different language variants of links and categories
-			if($wgContLang->hasVariants()){
-				$linkBatch = new LinkBatch();
-				$variantMap = array(); // maps $pdbkey_Variant => $keys (of link holders)
-				$categoryMap = array(); // maps $category_variant => $category (dbkeys)
-				$varCategories = array(); // category replacements oldDBkey => newDBkey
-
-				$categories = $this->mOutput->getCategoryLinks();
-
-				// Add variants of links to link batch
-				foreach ( $this->mLinkHolders['namespaces'] as $key => $ns ) {
-					$title = $this->mLinkHolders['titles'][$key];
-					if ( is_null( $title ) )
-						continue;
-
-					$pdbk = $title->getPrefixedDBkey();
-					$titleText = $title->getText();
-
-					// generate all variants of the link title text
-					$allTextVariants = $wgContLang->convertLinkToAllVariants($titleText);
-
-					// if link was not found (in first query), add all variants to query
-					if ( !isset($colours[$pdbk]) ){
-						foreach($allTextVariants as $textVariant){
-							if($textVariant != $titleText){
-								$variantTitle = Title::makeTitle( $ns, $textVariant );
-								if(is_null($variantTitle)) continue;
-								$linkBatch->addObj( $variantTitle );
-								$variantMap[$variantTitle->getPrefixedDBkey()][] = $key;
-							}
-						}
-					}
-				}
-
-				// process categories, check if a category exists in some variant
-				foreach( $categories as $category ){
-					$variants = $wgContLang->convertLinkToAllVariants($category);
-					foreach($variants as $variant){
-						if($variant != $category){
-							$variantTitle = Title::newFromDBkey( Title::makeName(NS_CATEGORY,$variant) );
-							if(is_null($variantTitle)) continue;
-							$linkBatch->addObj( $variantTitle );
-							$categoryMap[$variant] = $category;
-						}
-					}
-				}
-
-
-				if(!$linkBatch->isEmpty()){
-					// construct query
-					$titleClause = $linkBatch->constructSet('page', $dbr);
-
-					$variantQuery =  "SELECT page_id, page_namespace, page_title, page_is_redirect, page_len";
-
-					$variantQuery .= " FROM $page WHERE $titleClause";
-					if ( $options & RLH_FOR_UPDATE ) {
-						$variantQuery .= ' FOR UPDATE';
-					}
-
-					$varRes = $dbr->query( $variantQuery, $fname );
-
-					// for each found variants, figure out link holders and replace
-					while ( $s = $dbr->fetchObject($varRes) ) {
-
-						$variantTitle = Title::makeTitle( $s->page_namespace, $s->page_title );
-						$varPdbk = $variantTitle->getPrefixedDBkey();
-						$vardbk = $variantTitle->getDBkey();
-
-						$holderKeys = array();
-						if(isset($variantMap[$varPdbk])){
-							$holderKeys = $variantMap[$varPdbk];
-							$linkCache->addGoodLinkObj( $s->page_id, $variantTitle, $s->page_len, $s->page_is_redirect );
-							$this->mOutput->addLink( $variantTitle, $s->page_id );
-						}
-
-						// loop over link holders
-						foreach($holderKeys as $key){
-							$title = $this->mLinkHolders['titles'][$key];
-							if ( is_null( $title ) ) continue;
-
-							$pdbk = $title->getPrefixedDBkey();
-
-							if(!isset($colours[$pdbk])){
-								// found link in some of the variants, replace the link holder data
-								$this->mLinkHolders['titles'][$key] = $variantTitle;
-								$this->mLinkHolders['dbkeys'][$key] = $variantTitle->getDBkey();
-
-								// set pdbk and colour
-								$pdbks[$key] = $varPdbk;
-								$colours[$varPdbk] = $sk->getLinkColour( $variantTitle, $threshold );
-								$linkcolour_ids[$s->page_id] = $pdbk;
-							}
-							wfRunHooks( 'GetLinkColours', array( $linkcolour_ids, &$colours ) );
-						}
-
-						// check if the object is a variant of a category
-						if(isset($categoryMap[$vardbk])){
-							$oldkey = $categoryMap[$vardbk];
-							if($oldkey != $vardbk)
-								$varCategories[$oldkey]=$vardbk;
-						}
-					}
-
-					// rebuild the categories in original order (if there are replacements)
-					if(count($varCategories)>0){
-						$newCats = array();
-						$originalCats = $this->mOutput->getCategories();
-						foreach($originalCats as $cat => $sortkey){
-							// make the replacement
-							if( array_key_exists($cat,$varCategories) )
-								$newCats[$varCategories[$cat]] = $sortkey;
-							else $newCats[$cat] = $sortkey;
-						}
-						$this->mOutput->setCategoryLinks($newCats);
-					}
-				}
-			}
-
-			# Construct search and replace arrays
-			wfProfileIn( $fname.'-construct' );
-			$replacePairs = array();
-			foreach ( $this->mLinkHolders['namespaces'] as $key => $ns ) {
-				$pdbk = $pdbks[$key];
-				$searchkey = "<!--LINK $key-->";
-				$title = $this->mLinkHolders['titles'][$key];
-				if ( !isset( $colours[$pdbk] ) || $colours[$pdbk] == 'new' ) {
-					$linkCache->addBadLinkObj( $title );
-					$colours[$pdbk] = 'new';
-					$this->mOutput->addLink( $title, 0 );
-					$replacePairs[$searchkey] = $sk->makeBrokenLinkObj( $title,
-									$this->mLinkHolders['texts'][$key],
-									$this->mLinkHolders['queries'][$key] );
-				} else {
-					$replacePairs[$searchkey] = $sk->makeColouredLinkObj( $title, $colours[$pdbk],
-									$this->mLinkHolders['texts'][$key],
-									$this->mLinkHolders['queries'][$key] );
-				}
-			}
-			$replacer = new HashtableReplacer( $replacePairs, 1 );
-			wfProfileOut( $fname.'-construct' );
-
-			# Do the thing
-			wfProfileIn( $fname.'-replace' );
-			$text = preg_replace_callback(
-				'/(<!--LINK .*?-->)/',
-				$replacer->cb(),
-				$text);
-
-			wfProfileOut( $fname.'-replace' );
-		}
-
-		# Now process interwiki link holders
-		# This is quite a bit simpler than internal links
-		if ( !empty( $this->mInterwikiLinkHolders['texts'] ) ) {
-			wfProfileIn( $fname.'-interwiki' );
-			# Make interwiki link HTML
-			$replacePairs = array();
-			foreach( $this->mInterwikiLinkHolders['texts'] as $key => $link ) {
-				$title = $this->mInterwikiLinkHolders['titles'][$key];
-				$replacePairs[$key] = $sk->makeLinkObj( $title, $link );
-			}
-			$replacer = new HashtableReplacer( $replacePairs, 1 );
-
-			$text = preg_replace_callback(
-				'/<!--IWLINK (.*?)-->/',
-				$replacer->cb(),
-				$text );
-			wfProfileOut( $fname.'-interwiki' );
-		}
-
-		wfProfileOut( $fname );
-		return $colours;
+		return $this->mLinkHolders->replace( $text );
 	}
 
 	/**
@@ -4302,36 +4145,7 @@ class Parser
 	 * @return string
 	 */
 	function replaceLinkHoldersText( $text ) {
-		$fname = 'Parser::replaceLinkHoldersText';
-		wfProfileIn( $fname );
-
-		$text = preg_replace_callback(
-			'/<!--(LINK|IWLINK) (.*?)-->/',
-			array( &$this, 'replaceLinkHoldersTextCallback' ),
-			$text );
-
-		wfProfileOut( $fname );
-		return $text;
-	}
-
-	/**
-	 * @param array $matches
-	 * @return string
-	 * @private
-	 */
-	function replaceLinkHoldersTextCallback( $matches ) {
-		$type = $matches[1];
-		$key  = $matches[2];
-		if( $type == 'LINK' ) {
-			if( isset( $this->mLinkHolders['texts'][$key] ) ) {
-				return $this->mLinkHolders['texts'][$key];
-			}
-		} elseif( $type == 'IWLINK' ) {
-			if( isset( $this->mInterwikiLinkHolders['texts'][$key] ) ) {
-				return $this->mInterwikiLinkHolders['texts'][$key];
-			}
-		}
-		return $matches[0];
+		return $this->mLinkHolders->replaceText( $text );
 	}
 
 	/**
@@ -4342,7 +4156,7 @@ class Parser
 		$content = StringUtils::delimiterReplace( '<nowiki>', '</nowiki>', '$1', $text, 'i' );
 
 		$attribs = Sanitizer::validateTagAttributes( $attribs, 'pre' );
-		return wfOpenElement( 'pre', $attribs ) .
+		return Xml::openElement( 'pre', $attribs ) .
 			Xml::escapeTagsOnly( $content ) .
 			'</pre>';
 	}
@@ -4385,7 +4199,7 @@ class Parser
 
 		wfRunHooks( 'BeforeParserrenderImageGallery', array( &$this, &$ig ) );
 
-		$lines = explode( "\n", $text );
+		$lines = StringUtils::explode( "\n", $text );
 		foreach ( $lines as $line ) {
 			# match lines like these:
 			# Image:someimage.jpg|This is some image
@@ -4398,7 +4212,7 @@ class Parser
 			
 			if ( strpos( $matches[0], '%' ) !== false )
 				$matches[1] = urldecode( $matches[1] );
-			$tp = Title::newFromText( $matches[1] );
+			$tp = Title::newFromText( $matches[1]/*, NS_FILE*/ );
 			$nt =& $tp;
 			if( is_null( $nt ) ) {
 				# Bogus title. Ignore these so we don't bomb out later.
@@ -4415,7 +4229,7 @@ class Parser
 			$ig->add( $nt, $html );
 
 			# Only add real images (bug #5586)
-			if ( $nt->getNamespace() == NS_IMAGE ) {
+			if ( $nt->getNamespace() == NS_FILE ) {
 				$this->mOutput->addImage( $nt->getDBkey() );
 			}
 		}
@@ -4435,7 +4249,7 @@ class Parser
 				'vertAlign' => array( 'baseline', 'sub', 'super', 'top', 'text-top', 'middle',
 					'bottom', 'text-bottom' ),
 				'frame' => array( 'thumbnail', 'manualthumb', 'framed', 'frameless',
-					'upright', 'border' ),
+					'upright', 'border', 'link', 'alt' ),
 			);
 			static $internalParamMap;
 			if ( !$internalParamMap ) {
@@ -4464,20 +4278,24 @@ class Parser
 
 	/**
 	 * Parse image options text and use it to make an image
+	 * @param Title $title
+	 * @param string $options
+	 * @param LinkHolderArray $holders
 	 */
-	function makeImage( $title, $options ) {
+	function makeImage( $title, $options, $holders = false ) {
 		# Check if the options text is of the form "options|alt text"
 		# Options are:
-		#  * thumbnail       	make a thumbnail with enlarge-icon and caption, alignment depends on lang
-		#  * left		no resizing, just left align. label is used for alt= only
-		#  * right		same, but right aligned
-		#  * none		same, but not aligned
-		#  * ___px		scale to ___ pixels width, no aligning. e.g. use in taxobox
-		#  * center		center the image
-		#  * framed		Keep original image size, no magnify-button.
-		#  * frameless		like 'thumb' but without a frame. Keeps user preferences for width
-		#  * upright		reduce width for upright images, rounded to full __0 px
-		#  * border		draw a 1px border around the image
+		#  * thumbnail  make a thumbnail with enlarge-icon and caption, alignment depends on lang
+		#  * left       no resizing, just left align. label is used for alt= only
+		#  * right      same, but right aligned
+		#  * none       same, but not aligned
+		#  * ___px      scale to ___ pixels width, no aligning. e.g. use in taxobox
+		#  * center     center the image
+		#  * framed     Keep original image size, no magnify-button.
+		#  * frameless  like 'thumb' but without a frame. Keeps user preferences for width
+		#  * upright    reduce width for upright images, rounded to full __0 px
+		#  * border     draw a 1px border around the image
+		#  * alt        Text for HTML alt attribute (defaults to empty)
 		# vertical-align values (no % or length right now):
 		#  * baseline
 		#  * sub
@@ -4488,7 +4306,7 @@ class Parser
 		#  * bottom
 		#  * text-bottom
 
-		$parts = array_map( 'trim', explode( '|', $options) );
+		$parts = StringUtils::explode( "|", $options );
 		$sk = $this->mOptions->getSkin();
 
 		# Give extensions a chance to select the file revision for us
@@ -4496,11 +4314,21 @@ class Parser
 		wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$title, &$skip, &$time, &$descQuery ) );
 
 		if ( $skip ) {
-			return $sk->makeLinkObj( $title );
+			return $sk->link( $title );
 		}
 
+		# Get the file
+		$imagename = $title->getDBkey();
+		if ( isset( $this->mFileCache[$imagename][$time] ) ) {
+			$file = $this->mFileCache[$imagename][$time];
+		} else {
+			$file = wfFindFile( $title, $time );
+			if ( count( $this->mFileCache ) > 1000 ) {
+				$this->mFileCache = array();
+			}
+			$this->mFileCache[$imagename][$time] = $file;
+		}
 		# Get parameter map
-		$file = wfFindFile( $title, $time );
 		$handler = $file ? $file->getHandler() : false;
 
 		list( $paramMap, $mwArray ) = $this->getImageParams( $handler );
@@ -4510,13 +4338,14 @@ class Parser
 		$params = array( 'frame' => array(), 'handler' => array(),
 			'horizAlign' => array(), 'vertAlign' => array() );
 		foreach( $parts as $part ) {
+			$part = trim( $part );
 			list( $magicName, $value ) = $mwArray->matchVariableStartToEnd( $part );
 			$validated = false;
 			if( isset( $paramMap[$magicName] ) ) {
 				list( $type, $paramName ) = $paramMap[$magicName];
 
 				// Special case; width and height come in one variable together
-				if( $type == 'handler' && $paramName == 'width' ) {
+				if( $type === 'handler' && $paramName === 'width' ) {
 					$m = array();
 					# (bug 13500) In both cases (width/height and width only),
 					# permit trailing "px" for backward compatibility.
@@ -4539,16 +4368,42 @@ class Parser
 						}
 					} // else no validation -- bug 13436
 				} else {
-					if ( $type == 'handler' ) {
+					if ( $type === 'handler' ) {
 						# Validate handler parameter
 						$validated = $handler->validateParam( $paramName, $value );
 					} else {
 						# Validate internal parameters
 						switch( $paramName ) {
-						case "manualthumb":
-							/// @fixme - possibly check validity here?
-							/// downstream behavior seems odd with missing manual thumbs.
+						case 'manualthumb':
+						case 'alt':
+							// @fixme - possibly check validity here for
+							// manualthumb? downstream behavior seems odd with
+							// missing manual thumbs.
 							$validated = true;
+							$value = $this->stripAltText( $value, $holders );
+							break;
+						case 'link':
+							$chars = self::EXT_LINK_URL_CLASS;
+							$prots = $this->mUrlProtocols;
+							if ( $value === '' ) {
+								$paramName = 'no-link';
+								$value = true;
+								$validated = true;
+							} elseif ( preg_match( "/^$prots/", $value ) ) {
+								if ( preg_match( "/^($prots)$chars+$/", $value, $m ) ) {
+									$paramName = 'link-url';
+									$this->mOutput->addExternalLink( $value );
+									$validated = true;
+								}
+							} else {
+								$linkTitle = Title::newFromText( $value );
+								if ( $linkTitle ) {
+									$paramName = 'link-title';
+									$value = $linkTitle;
+									$this->mOutput->addLink( $linkTitle );
+									$validated = true;
+								}
+							}
 							break;
 						default:
 							// Most other things appear to be empty or numeric...
@@ -4574,17 +4429,32 @@ class Parser
 			$params['frame']['valign'] = key( $params['vertAlign'] );
 		}
 
-		# Strip bad stuff out of the alt text
-		$alt = $this->replaceLinkHoldersText( $caption );
+		$params['frame']['caption'] = $caption;
 
-		# make sure there are no placeholders in thumbnail attributes
-		# that are later expanded to html- so expand them now and
-		# remove the tags
-		$alt = $this->mStripState->unstripBoth( $alt );
-		$alt = Sanitizer::stripAllTags( $alt );
+		$params['frame']['title'] = $this->stripAltText( $caption, $holders );
 
-		$params['frame']['alt'] = $alt;
-		$params['frame']['caption'] = $caption;
+		# In the old days, [[Image:Foo|text...]] would set alt text.  Later it
+		# came to also set the caption, ordinary text after the image -- which
+		# makes no sense, because that just repeats the text multiple times in
+		# screen readers.  It *also* came to set the title attribute.
+		#
+		# Now that we have an alt attribute, we should not set the alt text to
+		# equal the caption: that's worse than useless, it just repeats the
+		# text.  This is the framed/thumbnail case.  If there's no caption, we
+		# use the unnamed parameter for alt text as well, just for the time be-
+		# ing, if the unnamed param is set and the alt param is not.
+		#
+		# For the future, we need to figure out if we want to tweak this more,
+		# e.g., introducing a title= parameter for the title; ignoring the un-
+		# named parameter entirely for images without a caption; adding an ex-
+		# plicit caption= parameter and preserving the old magic unnamed para-
+		# meter for BC; ...
+		if( $caption !== '' && !isset( $params['frame']['alt'] )
+		&& !isset( $params['frame']['framed'] )
+		&& !isset( $params['frame']['thumbnail'] )
+		&& !isset( $params['frame']['manualthumb'] ) ) {
+			$params['frame']['alt'] = $params['frame']['title'];
+		}
 
 		wfRunHooks( 'ParserMakeImageParams', array( $title, $file, &$params ) );
 
@@ -4598,6 +4468,25 @@ class Parser
 
 		return $ret;
 	}
+	
+	protected function stripAltText( $caption, $holders ) {
+		# Strip bad stuff out of the title (tooltip).  We can't just use
+		# replaceLinkHoldersText() here, because if this function is called
+		# from replaceInternalLinks2(), mLinkHolders won't be up-to-date.
+		if ( $holders ) {
+			$tooltip = $holders->replaceText( $caption );
+		} else {
+			$tooltip = $this->replaceLinkHoldersText( $caption );
+		}
+
+		# make sure there are no placeholders in thumbnail attributes
+		# that are later expanded to html- so expand them now and
+		# remove the tags
+		$tooltip = $this->mStripState->unstripBoth( $tooltip );
+		$tooltip = Sanitizer::stripAllTags( $tooltip );
+		
+		return $tooltip;
+	}
 
 	/**
 	 * Set a flag in the output object indicating that the content is dynamic and
@@ -4678,7 +4567,7 @@ class Parser
 		$sectionParts = explode( '-', $section );
 		$sectionIndex = array_pop( $sectionParts );
 		foreach ( $sectionParts as $part ) {
-			if ( $part == 'T' ) {
+			if ( $part === 'T' ) {
 				$flags |= self::PTD_FOR_INCLUSION;
 			}
 		}
@@ -4695,14 +4584,14 @@ class Parser
 			$targetLevel = 1000;
 		} else {
             while ( $node ) {
-                if ( $node->getName() == 'h' ) {
+                if ( $node->getName() === 'h' ) {
                     $bits = $node->splitHeading();
 					if ( $bits['i'] == $sectionIndex ) {
         				$targetLevel = $bits['level'];
 						break;
 					}
 				}
-				if ( $mode == 'replace' ) {
+				if ( $mode === 'replace' ) {
 					$outText .= $frame->expand( $node, PPFrame::RECOVER_ORIG );
 				}
 				$node = $node->getNextSibling();
@@ -4711,7 +4600,7 @@ class Parser
 
 		if ( !$node ) {
 			// Not found
-			if ( $mode == 'get' ) {
+			if ( $mode === 'get' ) {
 				return $newText;
 			} else {
 				return $text;
@@ -4720,21 +4609,21 @@ class Parser
 
 		// Find the end of the section, including nested sections
 		do {
-			if ( $node->getName() == 'h' ) {
+			if ( $node->getName() === 'h' ) {
 				$bits = $node->splitHeading();
 				$curLevel = $bits['level'];
 				if ( $bits['i'] != $sectionIndex && $curLevel <= $targetLevel ) {
 					break;
 				}
 			}
-			if ( $mode == 'get' ) {
+			if ( $mode === 'get' ) {
 				$outText .= $frame->expand( $node, PPFrame::RECOVER_ORIG );
 			}
 			$node = $node->getNextSibling();
 		} while ( $node );
 
 		// Write out the remainder (in replace mode only)
-		if ( $mode == 'replace' ) {
+		if ( $mode === 'replace' ) {
 			// Output the replacement text
 			// Add two newlines on -- trailing whitespace in $newText is conventionally
 			// stripped by the editor, so we need both newlines to restore the paragraph gap
@@ -4820,16 +4709,28 @@ class Parser
 	 * @return string
 	 */
 	public function getDefaultSort() {
+		global $wgCategoryPrefixedDefaultSortkey;
 		if( $this->mDefaultSort !== false ) {
 			return $this->mDefaultSort;
+		} elseif ($this->mTitle->getNamespace() == NS_CATEGORY ||
+			!$wgCategoryPrefixedDefaultSortkey) {
+			return $this->mTitle->getText();
 		} else {
-			return $this->mTitle->getNamespace() == NS_CATEGORY
-					? $this->mTitle->getText()
-					: $this->mTitle->getPrefixedText();
+			return $this->mTitle->getPrefixedText();
 		}
 	}
 
 	/**
+	 * Accessor for $mDefaultSort
+	 * Unlike getDefaultSort(), will return false if none is set
+	 *
+	 * @return string or false
+	 */
+	public function getCustomDefaultSort() {
+		return $this->mDefaultSort;
+	}
+
+	/**
 	 * Try to guess the section anchor name based on a wikitext fragment
 	 * presumably extracted from a heading, for example "Header" from
 	 * "== Header ==".
@@ -4962,7 +4863,7 @@ class StripState {
 		do {
 			$oldText = $text;
 			$text = $this->general->replace( $text );
-		} while ( $text != $oldText );
+		} while ( $text !== $oldText );
 		wfProfileOut( __METHOD__ );
 		return $text;
 	}
@@ -4972,7 +4873,7 @@ class StripState {
 		do {
 			$oldText = $text;
 			$text = $this->nowiki->replace( $text );
-		} while ( $text != $oldText );
+		} while ( $text !== $oldText );
 		wfProfileOut( __METHOD__ );
 		return $text;
 	}
@@ -4983,7 +4884,7 @@ class StripState {
 			$oldText = $text;
 			$text = $this->general->replace( $text );
 			$text = $this->nowiki->replace( $text );
-		} while ( $text != $oldText );
+		} while ( $text !== $oldText );
 		wfProfileOut( __METHOD__ );
 		return $text;
 	}
@@ -4997,7 +4898,7 @@ class OnlyIncludeReplacer {
 	var $output = '';
 
 	function replace( $matches ) {
-		if ( substr( $matches[1], -1 ) == "\n" ) {
+		if ( substr( $matches[1], -1 ) === "\n" ) {
 			$this->output .= substr( $matches[1], 0, -1 );
 		} else {
 			$this->output .= $matches[1];
diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index bf11da2e..7e61157a 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -35,9 +35,9 @@ class ParserCache {
 		} else {
 			$edit = '';
 		}
-		$pageid = intval( $article->getID() );
+		$pageid = $article->getID();
 		$renderkey = (int)($action == 'render');
-		$key = wfMemcKey( 'pcache', 'idhash', "$pageid-$renderkey!$hash$edit" );
+		$key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}{$edit}" );
 		return $key;
 	}
 
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 330ec446..5b8cd3ee 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -13,6 +13,7 @@ class ParserOptions
 	var $mInterwikiMagic;            # Interlanguage links are removed and returned in an array
 	var $mAllowExternalImages;       # Allow external images inline
 	var $mAllowExternalImagesFrom;   # If not, any exception?
+	var $mEnableImageWhitelist;      # If not or it doesn't match, should we check an on-wiki whitelist?
 	var $mSkin;                      # Reference to the preferred skin
 	var $mDateFormat;                # Date format index
 	var $mEditSection;               # Create "edit section" links
@@ -29,6 +30,7 @@ class ParserOptions
 	var $mTemplateCallback;          # Callback for template fetching
 	var $mEnableLimitReport;         # Enable limit report in an HTML comment on output
 	var $mTimestamp;                 # Timestamp used for {{CURRENTDAY}} etc.
+	var $mExternalLinkTarget;        # Target attribute for external links
 
 	var $mUser;                      # Stored user object, just used to initialise the skin
 
@@ -37,6 +39,7 @@ class ParserOptions
 	function getInterwikiMagic()                { return $this->mInterwikiMagic; }
 	function getAllowExternalImages()           { return $this->mAllowExternalImages; }
 	function getAllowExternalImagesFrom()       { return $this->mAllowExternalImagesFrom; }
+	function getEnableImageWhitelist()          { return $this->mEnableImageWhitelist; }
 	function getEditSection()                   { return $this->mEditSection; }
 	function getNumberHeadings()                { return $this->mNumberHeadings; }
 	function getAllowSpecialInclusion()         { return $this->mAllowSpecialInclusion; }
@@ -49,6 +52,8 @@ class ParserOptions
 	function getRemoveComments()                { return $this->mRemoveComments; }
 	function getTemplateCallback()              { return $this->mTemplateCallback; }
 	function getEnableLimitReport()             { return $this->mEnableLimitReport; }
+	function getCleanSignatures()               { return $this->mCleanSignatures; }
+	function getExternalLinkTarget()            { return $this->mExternalLinkTarget; }
 
 	function getSkin() {
 		if ( !isset( $this->mSkin ) ) {
@@ -76,6 +81,7 @@ class ParserOptions
 	function setInterwikiMagic( $x )            { return wfSetVar( $this->mInterwikiMagic, $x ); }
 	function setAllowExternalImages( $x )       { return wfSetVar( $this->mAllowExternalImages, $x ); }
 	function setAllowExternalImagesFrom( $x )   { return wfSetVar( $this->mAllowExternalImagesFrom, $x ); }
+	function setEnableImageWhitelist( $x )      { return wfSetVar( $this->mEnableImageWhitelist, $x ); }
 	function setDateFormat( $x )                { return wfSetVar( $this->mDateFormat, $x ); }
 	function setEditSection( $x )               { return wfSetVar( $this->mEditSection, $x ); }
 	function setNumberHeadings( $x )            { return wfSetVar( $this->mNumberHeadings, $x ); }
@@ -91,6 +97,8 @@ class ParserOptions
 	function setTemplateCallback( $x )          { return wfSetVar( $this->mTemplateCallback, $x ); }
 	function enableLimitReport( $x = true )     { return wfSetVar( $this->mEnableLimitReport, $x ); }
 	function setTimestamp( $x )                 { return wfSetVar( $this->mTimestamp, $x ); }
+	function setCleanSignatures( $x )           { return wfSetVar( $this->mCleanSignatures, $x ); }
+	function setExternalLinkTarget( $x )        { return wfSetVar( $this->mExternalLinkTarget, $x ); }
 
 	function __construct( $user = null ) {
 		$this->initialiseFromUser( $user );
@@ -107,8 +115,9 @@ class ParserOptions
 	/** Get user options */
 	function initialiseFromUser( $userInput ) {
 		global $wgUseTeX, $wgUseDynamicDates, $wgInterwikiMagic, $wgAllowExternalImages;
-		global $wgAllowExternalImagesFrom, $wgAllowSpecialInclusion, $wgMaxArticleSize;
-		global $wgMaxPPNodeCount, $wgMaxTemplateDepth, $wgMaxPPExpandDepth;
+		global $wgAllowExternalImagesFrom, $wgEnableImageWhitelist, $wgAllowSpecialInclusion, $wgMaxArticleSize;
+		global $wgMaxPPNodeCount, $wgMaxTemplateDepth, $wgMaxPPExpandDepth, $wgCleanSignatures;
+		global $wgExternalLinkTarget;
 		$fname = 'ParserOptions::initialiseFromUser';
 		wfProfileIn( $fname );
 		if ( !$userInput ) {
@@ -129,6 +138,7 @@ class ParserOptions
 		$this->mInterwikiMagic = $wgInterwikiMagic;
 		$this->mAllowExternalImages = $wgAllowExternalImages;
 		$this->mAllowExternalImagesFrom = $wgAllowExternalImagesFrom;
+		$this->mEnableImageWhitelist = $wgEnableImageWhitelist;
 		$this->mSkin = null; # Deferred
 		$this->mDateFormat = null; # Deferred
 		$this->mEditSection = true;
@@ -144,6 +154,8 @@ class ParserOptions
 		$this->mRemoveComments = true;
 		$this->mTemplateCallback = array( 'Parser', 'statelessFetchTemplate' );
 		$this->mEnableLimitReport = false;
+		$this->mCleanSignatures = $wgCleanSignatures;
+		$this->mExternalLinkTarget = $wgExternalLinkTarget;
 		wfProfileOut( $fname );
 	}
 }
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index f98d5641..35cb5c92 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -5,25 +5,26 @@
  */
 class ParserOutput
 {
-	var $mText,             # The output text
-		$mLanguageLinks,    # List of the full text of language links, in the order they appear
-		$mCategories,       # Map of category names to sort keys
-		$mContainsOldMagic, # Boolean variable indicating if the input contained variables like {{CURRENTDAY}}
-		$mCacheTime,        # Time when this object was generated, or -1 for uncacheable. Used in ParserCache.
-		$mVersion,          # Compatibility check
-		$mTitleText,        # title text of the chosen language variant
-		$mLinks,            # 2-D map of NS/DBK to ID for the links in the document. ID=zero for broken.
-		$mTemplates,        # 2-D map of NS/DBK to ID for the template references. ID=zero for broken.
-		$mTemplateIds,      # 2-D map of NS/DBK to rev ID for the template references. ID=zero for broken.
-		$mImages,           # DB keys of the images used, in the array key only
-		$mExternalLinks,    # External link URLs, in the key only
-		$mNewSection,       # Show a new section link?
-		$mNoGallery,        # No gallery on category page? (__NOGALLERY__)
-		$mHeadItems,        # Items to put in the <head> section
-		$mOutputHooks,      # Hook tags as per $wgParserOutputHooks
-		$mWarnings,         # Warning text to be returned to the user. Wikitext formatted, in the key only
-		$mSections,         # Table of contents
-		$mProperties;       # Name/value pairs to be cached in the DB
+	var $mText,                       # The output text
+		$mLanguageLinks,              # List of the full text of language links, in the order they appear
+		$mCategories,                 # Map of category names to sort keys
+		$mContainsOldMagic,           # Boolean variable indicating if the input contained variables like {{CURRENTDAY}}
+		$mTitleText,                  # title text of the chosen language variant
+		$mCacheTime = '',             # Time when this object was generated, or -1 for uncacheable. Used in ParserCache.
+		$mVersion = Parser::VERSION,  # Compatibility check
+		$mLinks = array(),            # 2-D map of NS/DBK to ID for the links in the document. ID=zero for broken.
+		$mTemplates = array(),        # 2-D map of NS/DBK to ID for the template references. ID=zero for broken.
+		$mTemplateIds = array(),      # 2-D map of NS/DBK to rev ID for the template references. ID=zero for broken.
+		$mImages = array(),           # DB keys of the images used, in the array key only
+		$mExternalLinks = array(),    # External link URLs, in the key only
+		$mNewSection = false,         # Show a new section link?
+		$mNoGallery = false,          # No gallery on category page? (__NOGALLERY__)
+		$mHeadItems = array(),        # Items to put in the <head> section
+		$mOutputHooks = array(),      # Hook tags as per $wgParserOutputHooks
+		$mWarnings = array(),         # Warning text to be returned to the user. Wikitext formatted, in the key only
+		$mSections = array(),         # Table of contents
+		$mProperties = array();       # Name/value pairs to be cached in the DB
+	private $mIndexPolicy = '';	      # 'index' or 'noindex'?  Any other value will result in no change.
 
 	/**
 	 * Overridden title for display
@@ -37,21 +38,7 @@ class ParserOutput
 		$this->mLanguageLinks = $languageLinks;
 		$this->mCategories = $categoryLinks;
 		$this->mContainsOldMagic = $containsOldMagic;
-		$this->mCacheTime = '';
-		$this->mVersion = Parser::VERSION;
 		$this->mTitleText = $titletext;
-		$this->mSections = array();
-		$this->mLinks = array();
-		$this->mTemplates = array();
-		$this->mImages = array();
-		$this->mExternalLinks = array();
-		$this->mNewSection = false;
-		$this->mNoGallery = false;
-		$this->mHeadItems = array();
-		$this->mTemplateIds = array();
-		$this->mOutputHooks = array();
-		$this->mWarnings = array();
-		$this->mProperties = array();
 	}
 
 	function getText()                   { return $this->mText; }
@@ -69,6 +56,7 @@ class ParserOutput
 	function getSubtitle()               { return $this->mSubtitle; }
 	function getOutputHooks()            { return (array)$this->mOutputHooks; }
 	function getWarnings()               { return array_keys( $this->mWarnings ); }
+	function getIndexPolicy()            { return $this->mIndexPolicy; }
 
 	function containsOldMagic()          { return $this->mContainsOldMagic; }
 	function setText( $text )            { return wfSetVar( $this->mText, $text ); }
@@ -78,6 +66,7 @@ class ParserOutput
 	function setCacheTime( $t )          { return wfSetVar( $this->mCacheTime, $t ); }
 	function setTitleText( $t )          { return wfSetVar( $this->mTitleText, $t ); }
 	function setSections( $toc )         { return wfSetVar( $this->mSections, $toc ); }
+	function setIndexPolicy( $policy )   { return wfSetVar( $this->mIndexPolicy, $policy ); }
 
 	function addCategory( $c, $sort )    { $this->mCategories[$c] = $sort; }
 	function addLanguageLink( $t )       { $this->mLanguageLinks[] = $t; }
@@ -98,6 +87,14 @@ class ParserOutput
 	function addLink( $title, $id = null ) {
 		$ns = $title->getNamespace();
 		$dbk = $title->getDBkey();
+		if ( $ns == NS_MEDIA ) {
+			// Normalize this pseudo-alias if it makes it down here...
+			$ns = NS_FILE;
+		} elseif( $ns == NS_SPECIAL ) {
+			// We don't record Special: links currently
+			// It might actually be wise to, but we'd need to do some normalization.
+			return;
+		}
 		if ( !isset( $this->mLinks[$ns] ) ) {
 			$this->mLinks[$ns] = array();
 		}
diff --git a/includes/parser/Parser_DiffTest.php b/includes/parser/Parser_DiffTest.php
index be3702cf..608c883a 100644
--- a/includes/parser/Parser_DiffTest.php
+++ b/includes/parser/Parser_DiffTest.php
@@ -6,6 +6,7 @@
 class Parser_DiffTest
 {
 	var $parsers, $conf;
+	var $shortOutput = false;
 
 	var $dfUniqPrefix;
 
@@ -28,6 +29,9 @@ class Parser_DiffTest
 			$doneHook = true;
 			$wgHooks['ParserClearState'][] = array( $this, 'onClearState' );
 		}
+		if ( isset( $this->conf['shortOutput'] ) ) {
+			$this->shortOutput = $this->conf['shortOutput'];
+		}
 
 		foreach ( $this->conf['parsers'] as $i => $parserConf ) {
 			if ( !is_array( $parserConf ) ) {
@@ -65,13 +69,37 @@ class Parser_DiffTest
 			$lastResult = $currentResult;
 		}
 		if ( $mismatch ) {
-			throw new MWException( "Parser_DiffTest: results mismatch on call to $name\n" .
-				'Arguments: ' . var_export( $args, true ) . "\n" .
-				'Results: ' . var_export( $results, true ) . "\n" );
+			if ( count( $results ) == 2 ) {
+				$resultsList = array();
+				foreach ( $this->parsers as $i => $parser ) {
+					$resultsList[] = var_export( $results[$i], true );
+				}
+				$diff = wfDiff( $resultsList[0], $resultsList[1] );
+			} else {
+				$diff = '[too many parsers]';
+			}
+			$msg = "Parser_DiffTest: results mismatch on call to $name\n";
+			if ( !$this->shortOutput ) {
+				$msg .= 'Arguments: ' . $this->formatArray( $args ) . "\n";
+			}
+			$msg .= 'Results: ' . $this->formatArray( $results ) . "\n" .
+				"Diff: $diff\n";
+			throw new MWException( $msg );
 		}
 		return $lastResult;
 	}
 
+	function formatArray( $array ) {
+		if ( $this->shortOutput ) {
+			foreach ( $array as $key => $value ) {
+				if ( $value instanceof ParserOutput ) {
+					$array[$key] = "ParserOutput: {$value->getText()}";
+				}
+			}
+		}
+		return var_export( $array, true );
+	}
+
 	function setFunctionHook( $id, $callback, $flags = 0 ) {
 		$this->init();
 		foreach  ( $this->parsers as $i => $parser ) {
diff --git a/includes/parser/Parser_LinkHooks.php b/includes/parser/Parser_LinkHooks.php
new file mode 100644
index 00000000..2b306933
--- /dev/null
+++ b/includes/parser/Parser_LinkHooks.php
@@ -0,0 +1,315 @@
+<?php
+/**
+ * Parser with LinkHooks experiment
+ * @ingroup Parser
+ */
+class Parser_LinkHooks extends Parser
+{
+	/**
+	 * Update this version number when the ParserOutput format
+	 * changes in an incompatible way, so the parser cache
+	 * can automatically discard old data.
+	 */
+	const VERSION = '1.6.4';
+	
+	# Flags for Parser::setLinkHook
+	# Also available as global constants from Defines.php
+	const SLH_PATTERN = 1;
+
+	# Constants needed for external link processing
+	# Everything except bracket, space, or control characters
+	const EXT_LINK_URL_CLASS = '[^][<>"\\x00-\\x20\\x7F]';
+	const EXT_IMAGE_REGEX = '/^(http:\/\/|https:\/\/)([^][<>"\\x00-\\x20\\x7F]+)
+		\\/([A-Za-z0-9_.,~%\\-+&;#*?!=()@\\x80-\\xFF]+)\\.((?i)gif|png|jpg|jpeg)$/Sx';
+
+	/**#@+
+	 * @private
+	 */
+	# Persistent:
+	var $mLinkHooks;
+
+	/**#@-*/
+
+	/**
+	 * Constructor
+	 *
+	 * @public
+	 */
+	function __construct( $conf = array() ) {
+		parent::__construct( $conf );
+		$this->mLinkHooks = array();
+	}
+
+	/**
+	 * Do various kinds of initialisation on the first call of the parser
+	 */
+	function firstCallInit() {
+		parent::__construct();
+		if ( !$this->mFirstCall ) {
+			return;
+		}
+		$this->mFirstCall = false;
+
+		wfProfileIn( __METHOD__ );
+
+		$this->setHook( 'pre', array( $this, 'renderPreTag' ) );
+		CoreParserFunctions::register( $this );
+		CoreLinkFunctions::register( $this );
+		$this->initialiseVariables();
+
+		wfRunHooks( 'ParserFirstCallInit', array( &$this ) );
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Create a link hook, e.g. [[Namepsace:...|display}}
+	 * The callback function should have the form:
+	 *    function myLinkCallback( $parser, $holders, $markers,
+	 *    	Title $title, $titleText, &$sortText = null, &$leadingColon = false ) { ... }
+	 *
+	 * Or with SLH_PATTERN:
+	 *    function myLinkCallback( $parser, $holders, $markers, )
+	 *    	&$titleText, &$sortText = null, &$leadingColon = false ) { ... }
+	 *
+	 * The callback may either return a number of different possible values:
+	 * String) Text result of the link
+	 * True) (Treat as link) Parse the link according to normal link rules
+	 * False) (Bad link) Just output the raw wikitext (You may modify the text first)
+	 *
+	 * @public
+	 *
+	 * @param integer|string $ns The Namespace ID or regex pattern if SLH_PATTERN is set
+	 * @param mixed $callback The callback function (and object) to use
+	 * @param integer $flags a combination of the following flags:
+	 *     SLH_PATTERN   Use a regex link pattern rather than a namespace
+	 *
+	 * @return The old callback function for this name, if any
+	 */
+	function setLinkHook( $ns, $callback, $flags = 0 ) {
+		if( $flags & SLH_PATTERN && !is_string($ns) )
+			throw new MWException( __METHOD__.'() expecting a regex string pattern.' );
+		elseif( $flags | ~SLH_PATTERN && !is_int($ns) )
+			throw new MWException( __METHOD__.'() expecting a namespace index.' );
+		$oldVal = isset( $this->mLinkHooks[$ns] ) ? $this->mLinkHooks[$ns][0] : null;
+		$this->mLinkHooks[$ns] = array( $callback, $flags );
+		return $oldVal;
+	}
+	
+	/**
+	 * Get all registered link hook identifiers
+	 *
+	 * @return array
+	 */
+	function getLinkHooks() {
+		return array_keys( $this->mLinkHooks );
+	}
+	
+	/**
+	 * Process [[ ]] wikilinks
+	 * @return LinkHolderArray
+	 *
+	 * @private
+	 */
+	function replaceInternalLinks2( &$s ) {
+		global $wgContLang;
+
+		wfProfileIn( __METHOD__ );
+
+		wfProfileIn( __METHOD__.'-setup' );
+		static $tc = FALSE, $titleRegex;//$e1, $e1_img;
+		if( !$tc ) {
+			# the % is needed to support urlencoded titles as well
+			$tc = Title::legalChars() . '#%';
+			# Match a link having the form [[namespace:link|alternate]]trail
+			//$e1 = "/^([{$tc}]+)(?:\\|(.+?))?]](.*)\$/sD";
+			# Match cases where there is no "]]", which might still be images
+			//$e1_img = "/^([{$tc}]+)\\|(.*)\$/sD";
+			# Match a valid plain title
+			$titleRegex = "/^([{$tc}]+)$/sD";
+		}
+
+		$sk = $this->mOptions->getSkin();
+		$holders = new LinkHolderArray( $this );
+		
+		if( is_null( $this->mTitle ) ) {
+			wfProfileOut( __METHOD__ );
+			wfProfileOut( __METHOD__.'-setup' );
+			throw new MWException( __METHOD__.": \$this->mTitle is null\n" );
+		}
+		$nottalk = !$this->mTitle->isTalkPage();
+		
+		if($wgContLang->hasVariants()) {
+			$selflink = $wgContLang->convertLinkToAllVariants($this->mTitle->getPrefixedText());
+		} else {
+			$selflink = array($this->mTitle->getPrefixedText());
+		}
+		wfProfileOut( __METHOD__.'-setup' );
+		
+		$offset = 0;
+		$offsetStack = array();
+		$markers = new LinkMarkerReplacer( $this, $holders, array( &$this, 'replaceInternalLinksCallback' ) );
+		while( true ) {
+			$startBracketOffset = strpos( $s, '[[', $offset );
+			$endBracketOffset   = strpos( $s, ']]', $offset );
+			# Finish when there are no more brackets
+			if( $startBracketOffset === false && $endBracketOffset === false ) break;
+			# Determine if the bracket is a starting or ending bracket
+			# When we find both, use the first one
+			elseif( $startBracketOffset !== false && $endBracketOffset !== false )
+			     $isStart = $startBracketOffset <= $endBracketOffset;
+			# When we only found one, check which it is
+			else $isStart = $startBracketOffset !== false;
+			$bracketOffset = $isStart ? $startBracketOffset : $endBracketOffset;
+			if( $isStart ) {
+				/** Opening bracket **/
+				# Just push our current offset in the string onto the stack
+				$offsetStack[] = $startBracketOffset;
+			} else {
+				/** Closing bracket **/
+				# Pop the start pos for our current link zone off the stack
+				$startBracketOffset = array_pop($offsetStack);
+				# Just to clean up the code, lets place offsets on the outer ends
+				$endBracketOffset += 2;
+				
+				# Only do logic if we actually have a opening bracket for this
+				if( isset($startBracketOffset) ) {
+					# Extract text inside the link
+					@list( $titleText, $paramText ) = explode('|',
+						substr($s, $startBracketOffset+2, $endBracketOffset-$startBracketOffset-4), 2);
+					# Create markers only for valid links
+					if( preg_match( $titleRegex, $titleText ) ) {
+						# Store the text for the marker
+						$marker = $markers->addMarker($titleText, $paramText);
+						# Replace the current link with the marker
+						$s = substr($s,0,$startBracketOffset).
+							$marker.
+							substr($s, $endBracketOffset);
+						# We have modified $s, because of this we need to set the
+						# offset manually since the end position is different now
+						$offset = $startBracketOffset+strlen($marker);
+						continue;
+					}
+					# ToDo: Some LinkHooks may allow recursive links inside of
+					# the link text, create a regex that also matches our
+					# <!-- LINKMARKER ### --> sequence in titles
+					# ToDO: Some LinkHooks use patterns rather than namespaces
+					# these need to be tested at this point here
+				}
+				
+			}
+			# Bump our offset to after our current bracket
+			$offset = $bracketOffset+2;
+		}
+		
+		
+		# Now expand our tree
+		wfProfileIn( __METHOD__.'-expand' );
+		$s = $markers->expand( $s );
+		wfProfileOut( __METHOD__.'-expand' );
+		
+		wfProfileOut( __METHOD__ );
+		return $holders;
+	}
+	
+	function replaceInternalLinksCallback( $parser, $holders, $markers, $titleText, $paramText ) {
+		wfProfileIn( __METHOD__ );
+		$wt = isset($paramText) ? "[[$titleText|$paramText]]" : "[[$titleText]]";
+		wfProfileIn( __METHOD__."-misc" );
+		# Don't allow internal links to pages containing
+		# PROTO: where PROTO is a valid URL protocol; these
+		# should be external links.
+		if( preg_match('/^\b(?:' . wfUrlProtocols() . ')/', $titleText) ) {
+			wfProfileOut( __METHOD__ );
+			return $wt;
+		}
+		
+		# Make subpage if necessary
+		if( $this->areSubpagesAllowed() ) {
+			$titleText = $this->maybeDoSubpageLink( $titleText, $paramText );
+		}
+		
+		# Check for a leading colon and strip it if it is there
+		$leadingColon = $titleText[0] == ':';
+		if( $leadingColon ) $titleText = substr( $titleText, 1 );
+		
+		wfProfileOut( __METHOD__."-misc" );
+		# Make title object
+		wfProfileIn( __METHOD__."-title" );
+		$title = Title::newFromText( $this->mStripState->unstripNoWiki($titleText) );
+		if( !$title ) {
+			wfProfileOut( __METHOD__."-title" );
+			wfProfileOut( __METHOD__ );
+			return $wt;
+		}
+		$ns = $title->getNamespace();
+		wfProfileOut( __METHOD__."-title" );
+		
+		# Default for Namespaces is a default link
+		# ToDo: Default for patterns is plain wikitext
+		$return = true;
+		if( isset($this->mLinkHooks[$ns]) ) {
+			list( $callback, $flags ) = $this->mLinkHooks[$ns];
+			if( $flags & SLH_PATTERN ) {
+				$args = array( $parser, $holders, $markers, $titleText, &$paramText, &$leadingColon );
+			} else {
+				$args = array( $parser, $holders, $markers, $title, $titleText, &$paramText, &$leadingColon );
+			}
+			# Workaround for PHP bug 35229 and similar
+			if ( !is_callable( $callback ) ) {
+				throw new MWException( "Tag hook for $name is not callable\n" );
+			}
+			$return = call_user_func_array( $callback, $args );
+		}
+		if( $return === true ) {
+			# True (treat as plain link) was returned, call the defaultLinkHook
+			$args = array( $parser, $holders, $markers, $title, $titleText, &$paramText, &$leadingColon );
+			$return = call_user_func_array( array( 'CoreLinkFunctions', 'defaultLinkHook' ), $args );
+		}
+		if( $return === false ) {
+			# False (no link) was returned, output plain wikitext
+			# Build it again as the hook is allowed to modify $paramText
+			return isset($paramText) ? "[[$titleText|$paramText]]" : "[[$titleText]]";
+		}
+		# Content was returned, return it
+		return $return;
+	}
+	
+}
+
+class LinkMarkerReplacer {
+	
+	protected $markers, $nextId, $parser, $holders, $callback;
+	
+	function __construct( $parser, $holders, $callback ) {
+		$this->nextId   = 0;
+		$this->markers  = array();
+		$this->parser   = $parser;
+		$this->holders  = $holders;
+		$this->callback = $callback;
+	}
+	
+	function addMarker($titleText, $paramText) {
+		$id = $this->nextId++;
+		$this->markers[$id] = array( $titleText, $paramText );
+		return "<!-- LINKMARKER $id -->";
+	}
+	
+	function findMarker( $string ) {
+		return (bool) preg_match('/<!-- LINKMARKER [0-9]+ -->/', $string );
+	}
+	
+	function expand( $string ) {
+		return StringUtils::delimiterReplaceCallback( "<!-- LINKMARKER ", " -->", array( &$this, 'callback' ), $string );
+	}
+	
+	function callback( $m ) {
+		$id = intval($m[1]);
+		if( !array_key_exists($id, $this->markers) ) return $m[0];
+		$args = $this->markers[$id];
+		array_unshift( $args, $this );
+		array_unshift( $args, $this->holders );
+		array_unshift( $args, $this->parser );
+		return call_user_func_array( $this->callback, $args );
+	}
+	
+}
diff --git a/includes/parser/Parser_OldPP.php b/includes/parser/Parser_OldPP.php
deleted file mode 100644
index 487d3ffd..00000000
--- a/includes/parser/Parser_OldPP.php
+++ /dev/null
@@ -1,4944 +0,0 @@
-<?php
-/**
- * Parser with old preprocessor
- * @ingroup Parser
- */
-class Parser_OldPP
-{
-	/**
-	 * Update this version number when the ParserOutput format
-	 * changes in an incompatible way, so the parser cache
-	 * can automatically discard old data.
-	 */
-	const VERSION = '1.6.4';
-
-	# Flags for Parser::setFunctionHook
-	# Also available as global constants from Defines.php
-	const SFH_NO_HASH = 1;
-
-	# Constants needed for external link processing
-	# Everything except bracket, space, or control characters
-	const EXT_LINK_URL_CLASS = '[^][<>"\\x00-\\x20\\x7F]';
-	const EXT_IMAGE_REGEX = '/^(http:\/\/|https:\/\/)([^][<>"\\x00-\\x20\\x7F]+)\\/([A-Za-z0-9_.,~%\\-+&;#*?!=()@\\x80-\\xFF]+)\\.((?i)gif|png|jpg|jpeg)$/S';
-
-	// State constants for the definition list colon extraction
-	const COLON_STATE_TEXT = 0;
-	const COLON_STATE_TAG = 1;
-	const COLON_STATE_TAGSTART = 2;
-	const COLON_STATE_CLOSETAG = 3;
-	const COLON_STATE_TAGSLASH = 4;
-	const COLON_STATE_COMMENT = 5;
-	const COLON_STATE_COMMENTDASH = 6;
-	const COLON_STATE_COMMENTDASHDASH = 7;
-
-	// Allowed values for $this->mOutputType
-	// Parameter to startExternalParse().
-	const OT_HTML = 1;
-	const OT_WIKI = 2;
-	const OT_PREPROCESS = 3;
-	const OT_MSG = 4;
-
-	/**#@+
-	 * @private
-	 */
-	# Persistent:
-	var $mTagHooks, $mTransparentTagHooks, $mFunctionHooks, $mFunctionSynonyms, $mVariables,
-		$mImageParams, $mImageParamsMagicArray, $mExtLinkBracketedRegex;
-
-	# Cleared with clearState():
-	var $mOutput, $mAutonumber, $mDTopen, $mStripState;
-	var $mIncludeCount, $mArgStack, $mLastSection, $mInPre;
-	var $mInterwikiLinkHolders, $mLinkHolders, $mUniqPrefix;
-	var $mIncludeSizes, $mDefaultSort;
-	var $mTemplates,	// cache of already loaded templates, avoids
-		                // multiple SQL queries for the same string
-	    $mTemplatePath;	// stores an unsorted hash of all the templates already loaded
-		                // in this path. Used for loop detection.
-
-	# Temporary
-	# These are variables reset at least once per parse regardless of $clearState
-	var $mOptions,      // ParserOptions object
-		$mTitle,        // Title context, used for self-link rendering and similar things
-		$mOutputType,   // Output type, one of the OT_xxx constants
-		$ot,            // Shortcut alias, see setOutputType()
-		$mRevisionId,   // ID to display in {{REVISIONID}} tags
-		$mRevisionTimestamp, // The timestamp of the specified revision ID
-		$mRevIdForTs;   // The revision ID which was used to fetch the timestamp
-
-	/**#@-*/
-
-	/**
-	 * Constructor
-	 *
-	 * @public
-	 */
-	function __construct( $conf = array() ) {
-		$this->mTagHooks = array();
-		$this->mTransparentTagHooks = array();
-		$this->mFunctionHooks = array();
-		$this->mFunctionSynonyms = array( 0 => array(), 1 => array() );
-		$this->mFirstCall = true;
-		$this->mExtLinkBracketedRegex = '/\[(\b(' . wfUrlProtocols() . ')'.
-			'[^][<>"\\x00-\\x20\\x7F]+) *([^\]\\x0a\\x0d]*?)\]/S';
-	}
-
-	/**
-	 * Do various kinds of initialisation on the first call of the parser
-	 */
-	function firstCallInit() {
-		if ( !$this->mFirstCall ) {
-			return;
-		}
-		$this->mFirstCall = false;
-
-		wfProfileIn( __METHOD__ );
-		global $wgAllowDisplayTitle, $wgAllowSlowParserFunctions;
-
-		$this->setHook( 'pre', array( $this, 'renderPreTag' ) );
-
-		# Syntax for arguments (see self::setFunctionHook):
-		#  "name for lookup in localized magic words array",
-		#  function callback,
-		#  optional SFH_NO_HASH to omit the hash from calls (e.g. {{int:...}
-		#    instead of {{#int:...}})
-		$this->setFunctionHook( 'int',              array( 'CoreParserFunctions', 'intFunction'      ), SFH_NO_HASH );
-		$this->setFunctionHook( 'ns',               array( 'CoreParserFunctions', 'ns'               ), SFH_NO_HASH );
-		$this->setFunctionHook( 'urlencode',        array( 'CoreParserFunctions', 'urlencode'        ), SFH_NO_HASH );
-		$this->setFunctionHook( 'lcfirst',          array( 'CoreParserFunctions', 'lcfirst'          ), SFH_NO_HASH );
-		$this->setFunctionHook( 'ucfirst',          array( 'CoreParserFunctions', 'ucfirst'          ), SFH_NO_HASH );
-		$this->setFunctionHook( 'lc',               array( 'CoreParserFunctions', 'lc'               ), SFH_NO_HASH );
-		$this->setFunctionHook( 'uc',               array( 'CoreParserFunctions', 'uc'               ), SFH_NO_HASH );
-		$this->setFunctionHook( 'localurl',         array( 'CoreParserFunctions', 'localurl'         ), SFH_NO_HASH );
-		$this->setFunctionHook( 'localurle',        array( 'CoreParserFunctions', 'localurle'        ), SFH_NO_HASH );
-		$this->setFunctionHook( 'fullurl',          array( 'CoreParserFunctions', 'fullurl'          ), SFH_NO_HASH );
-		$this->setFunctionHook( 'fullurle',         array( 'CoreParserFunctions', 'fullurle'         ), SFH_NO_HASH );
-		$this->setFunctionHook( 'formatnum',        array( 'CoreParserFunctions', 'formatnum'        ), SFH_NO_HASH );
-		$this->setFunctionHook( 'grammar',          array( 'CoreParserFunctions', 'grammar'          ), SFH_NO_HASH );
-		$this->setFunctionHook( 'plural',           array( 'CoreParserFunctions', 'plural'           ), SFH_NO_HASH );
-		$this->setFunctionHook( 'numberofpages',    array( 'CoreParserFunctions', 'numberofpages'    ), SFH_NO_HASH );
-		$this->setFunctionHook( 'numberofusers',    array( 'CoreParserFunctions', 'numberofusers'    ), SFH_NO_HASH );
-		$this->setFunctionHook( 'numberofarticles', array( 'CoreParserFunctions', 'numberofarticles' ), SFH_NO_HASH );
-		$this->setFunctionHook( 'numberoffiles',    array( 'CoreParserFunctions', 'numberoffiles'    ), SFH_NO_HASH );
-		$this->setFunctionHook( 'numberofadmins',   array( 'CoreParserFunctions', 'numberofadmins'   ), SFH_NO_HASH );
-		$this->setFunctionHook( 'numberofedits',    array( 'CoreParserFunctions', 'numberofedits'    ), SFH_NO_HASH );
-		$this->setFunctionHook( 'language',         array( 'CoreParserFunctions', 'language'         ), SFH_NO_HASH );
-		$this->setFunctionHook( 'padleft',          array( 'CoreParserFunctions', 'padleft'          ), SFH_NO_HASH );
-		$this->setFunctionHook( 'padright',         array( 'CoreParserFunctions', 'padright'         ), SFH_NO_HASH );
-		$this->setFunctionHook( 'anchorencode',     array( 'CoreParserFunctions', 'anchorencode'     ), SFH_NO_HASH );
-		$this->setFunctionHook( 'special',          array( 'CoreParserFunctions', 'special'          ) );
-		$this->setFunctionHook( 'defaultsort',      array( 'CoreParserFunctions', 'defaultsort'      ), SFH_NO_HASH );
-		$this->setFunctionHook( 'filepath',         array( 'CoreParserFunctions', 'filepath'         ), SFH_NO_HASH );
-
-		if ( $wgAllowDisplayTitle ) {
-			$this->setFunctionHook( 'displaytitle', array( 'CoreParserFunctions', 'displaytitle' ), SFH_NO_HASH );
-		}
-		if ( $wgAllowSlowParserFunctions ) {
-			$this->setFunctionHook( 'pagesinnamespace', array( 'CoreParserFunctions', 'pagesinnamespace' ), SFH_NO_HASH );
-		}
-
-		$this->initialiseVariables();
-
-		wfRunHooks( 'ParserFirstCallInit', array( &$this ) );
-		wfProfileOut( __METHOD__ );
-	}
-
-	/**
-	 * Clear Parser state
-	 *
-	 * @private
-	 */
-	function clearState() {
-		wfProfileIn( __METHOD__ );
-		if ( $this->mFirstCall ) {
-			$this->firstCallInit();
-		}
-		$this->mOutput = new ParserOutput;
-		$this->mAutonumber = 0;
-		$this->mLastSection = '';
-		$this->mDTopen = false;
-		$this->mIncludeCount = array();
-		$this->mStripState = new StripState;
-		$this->mArgStack = array();
-		$this->mInPre = false;
-		$this->mInterwikiLinkHolders = array(
-			'texts' => array(),
-			'titles' => array()
-		);
-		$this->mLinkHolders = array(
-			'namespaces' => array(),
-			'dbkeys' => array(),
-			'queries' => array(),
-			'texts' => array(),
-			'titles' => array()
-		);
-		$this->mRevisionTimestamp = $this->mRevisionId = null;
-
-		/**
-		 * Prefix for temporary replacement strings for the multipass parser.
-		 * \x07 should never appear in input as it's disallowed in XML.
-		 * Using it at the front also gives us a little extra robustness
-		 * since it shouldn't match when butted up against identifier-like
-		 * string constructs.
-		 */
-		$this->mUniqPrefix = "\x07UNIQ" . self::getRandomString();
-
-		# Clear these on every parse, bug 4549
- 		$this->mTemplates = array();
- 		$this->mTemplatePath = array();
-
-		$this->mShowToc = true;
-		$this->mForceTocPosition = false;
-		$this->mIncludeSizes = array(
-			'pre-expand' => 0,
-			'post-expand' => 0,
-			'arg' => 0
-		);
-		$this->mDefaultSort = false;
-
-		wfRunHooks( 'ParserClearState', array( &$this ) );
-		wfProfileOut( __METHOD__ );
-	}
-
-	function setOutputType( $ot ) {
-		$this->mOutputType = $ot;
-		// Shortcut alias
-		$this->ot = array(
-			'html' => $ot == self::OT_HTML,
-			'wiki' => $ot == self::OT_WIKI,
-			'msg' => $ot == self::OT_MSG,
-			'pre' => $ot == self::OT_PREPROCESS,
-		);
-	}
-
-	/**
-	 * Accessor for mUniqPrefix.
-	 *
-	 * @public
-	 */
-	function uniqPrefix() {
-		return $this->mUniqPrefix;
-	}
-
-	/**
-	 * Convert wikitext to HTML
-	 * Do not call this function recursively.
-	 *
-	 * @param string $text Text we want to parse
-	 * @param Title &$title A title object
-	 * @param array $options
-	 * @param boolean $linestart
-	 * @param boolean $clearState
-	 * @param int $revid number to pass in {{REVISIONID}}
-	 * @return ParserOutput a ParserOutput
-	 */
-	public function parse( $text, &$title, $options, $linestart = true, $clearState = true, $revid = null ) {
-		/**
-		 * First pass--just handle <nowiki> sections, pass the rest off
-		 * to internalParse() which does all the real work.
-		 */
-
-		global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang;
-		$fname = 'Parser::parse-' . wfGetCaller();
-		wfProfileIn( __METHOD__ );
-		wfProfileIn( $fname );
-
-		if ( $clearState ) {
-			$this->clearState();
-		}
-
-		$this->mOptions = $options;
-		$this->mTitle =& $title;
-		$oldRevisionId = $this->mRevisionId;
-		$oldRevisionTimestamp = $this->mRevisionTimestamp;
-		if( $revid !== null ) {
-			$this->mRevisionId = $revid;
-			$this->mRevisionTimestamp = null;
-		}
-		$this->setOutputType( self::OT_HTML );
-		wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) );
-		$text = $this->strip( $text, $this->mStripState );
-		wfRunHooks( 'ParserAfterStrip', array( &$this, &$text, &$this->mStripState ) );
-		$text = $this->internalParse( $text );
-		$text = $this->mStripState->unstripGeneral( $text );
-
-		# Clean up special characters, only run once, next-to-last before doBlockLevels
-		$fixtags = array(
-			# french spaces, last one Guillemet-left
-			# only if there is something before the space
-			'/(.) (?=\\?|:|;|!|%|\\302\\273)/' => '\\1&nbsp;\\2',
-			# french spaces, Guillemet-right
-			'/(\\302\\253) /' => '\\1&nbsp;',
-		);
-		$text = preg_replace( array_keys($fixtags), array_values($fixtags), $text );
-
-		# only once and last
-		$text = $this->doBlockLevels( $text, $linestart );
-
-		$this->replaceLinkHolders( $text );
-
-		# the position of the parserConvert() call should not be changed. it
-		# assumes that the links are all replaced and the only thing left
-		# is the <nowiki> mark.
-		# Side-effects: this calls $this->mOutput->setTitleText()
-		$text = $wgContLang->parserConvert( $text, $this );
-
-		$text = $this->mStripState->unstripNoWiki( $text );
-
-		wfRunHooks( 'ParserBeforeTidy', array( &$this, &$text ) );
-
-//!JF Move to its own function
-
-		$uniq_prefix = $this->mUniqPrefix;
-                $matches = array();
-		$elements = array_keys( $this->mTransparentTagHooks );
-                $text = self::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
-
-                foreach( $matches as $marker => $data ) {
-                        list( $element, $content, $params, $tag ) = $data;
-                        $tagName = strtolower( $element );
-                        if( isset( $this->mTransparentTagHooks[$tagName] ) ) {
-                                $output = call_user_func_array( $this->mTransparentTagHooks[$tagName],
-                                        array( $content, $params, $this ) );
-                        } else {
-				$output = $tag;
-			}
-			$this->mStripState->general->setPair( $marker, $output );
-		}
-		$text = $this->mStripState->unstripGeneral( $text );
-
-		$text = Sanitizer::normalizeCharReferences( $text );
-
-		if (($wgUseTidy and $this->mOptions->mTidy) or $wgAlwaysUseTidy) {
-			$text = self::tidy($text);
-		} else {
-			# attempt to sanitize at least some nesting problems
-			# (bug #2702 and quite a few others)
-			$tidyregs = array(
-				# ''Something [http://www.cool.com cool''] -->
-				# <i>Something</i><a href="http://www.cool.com"..><i>cool></i></a>
-				'/(<([bi])>)(<([bi])>)?([^<]*)(<\/?a[^<]*>)([^<]*)(<\/\\4>)?(<\/\\2>)/' =>
-				'\\1\\3\\5\\8\\9\\6\\1\\3\\7\\8\\9',
-				# fix up an anchor inside another anchor, only
-				# at least for a single single nested link (bug 3695)
-				'/(<a[^>]+>)([^<]*)(<a[^>]+>[^<]*)<\/a>(.*)<\/a>/' =>
-				'\\1\\2</a>\\3</a>\\1\\4</a>',
-				# fix div inside inline elements- doBlockLevels won't wrap a line which
-				# contains a div, so fix it up here; replace
-				# div with escaped text
-				'/(<([aib]) [^>]+>)([^<]*)(<div([^>]*)>)(.*)(<\/div>)([^<]*)(<\/\\2>)/' =>
-				'\\1\\3&lt;div\\5&gt;\\6&lt;/div&gt;\\8\\9',
-				# remove empty italic or bold tag pairs, some
-				# introduced by rules above
-				'/<([bi])><\/\\1>/' => '',
-			);
-
-			$text = preg_replace(
-				array_keys( $tidyregs ),
-				array_values( $tidyregs ),
-				$text );
-		}
-
-		wfRunHooks( 'ParserAfterTidy', array( &$this, &$text ) );
-
-		# Information on include size limits, for the benefit of users who try to skirt them
-		if ( $this->mOptions->getEnableLimitReport() ) {
-			$max = $this->mOptions->getMaxIncludeSize();
-			$limitReport =
-				"Pre-expand include size: {$this->mIncludeSizes['pre-expand']}/$max bytes\n" .
-				"Post-expand include size: {$this->mIncludeSizes['post-expand']}/$max bytes\n" .
-				"Template argument size: {$this->mIncludeSizes['arg']}/$max bytes\n";
-			wfRunHooks( 'ParserLimitReport', array( $this, &$limitReport ) );
-			$text .= "<!-- \n$limitReport-->\n";
-		}
-		$this->mOutput->setText( $text );
-		$this->mRevisionId = $oldRevisionId;
-		$this->mRevisionTimestamp = $oldRevisionTimestamp;
-		wfProfileOut( $fname );
-		wfProfileOut( __METHOD__ );
-
-		return $this->mOutput;
-	}
-
-	/**
-	 * Recursive parser entry point that can be called from an extension tag
-	 * hook.
-	 */
-	function recursiveTagParse( $text ) {
-		wfProfileIn( __METHOD__ );
-		wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) );
-		$text = $this->strip( $text, $this->mStripState );
-		wfRunHooks( 'ParserAfterStrip', array( &$this, &$text, &$this->mStripState ) );
-		$text = $this->internalParse( $text );
-		wfProfileOut( __METHOD__ );
-		return $text;
-	}
-
-	/**
-	 * Expand templates and variables in the text, producing valid, static wikitext.
-	 * Also removes comments.
-	 */
-	function preprocess( $text, $title, $options, $revid = null ) {
-		wfProfileIn( __METHOD__ );
-		$this->clearState();
-		$this->setOutputType( self::OT_PREPROCESS );
-		$this->mOptions = $options;
-		$this->mTitle = $title;
-		if( $revid !== null ) {
-			$this->mRevisionId = $revid;
-		}
-		wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) );
-		$text = $this->strip( $text, $this->mStripState );
-		wfRunHooks( 'ParserAfterStrip', array( &$this, &$text, &$this->mStripState ) );
-		if ( $this->mOptions->getRemoveComments() ) {
-			$text = Sanitizer::removeHTMLcomments( $text );
-		}
-		$text = $this->replaceVariables( $text );
-		$text = $this->mStripState->unstripBoth( $text );
-		wfProfileOut( __METHOD__ );
-		return $text;
-	}
-
-	/**
-	 * Get a random string
-	 *
-	 * @private
-	 * @static
-	 */
-	function getRandomString() {
-		return dechex(mt_rand(0, 0x7fffffff)) . dechex(mt_rand(0, 0x7fffffff));
-	}
-
-	function &getTitle() { return $this->mTitle; }
-	function getOptions() { return $this->mOptions; }
-	function getRevisionId() { return $this->mRevisionId; }
-
-	function getFunctionLang() {
-		global $wgLang, $wgContLang;
-		return $this->mOptions->getInterfaceMessage() ? $wgLang : $wgContLang;
-	}
-
-	/**
-	 * Replaces all occurrences of HTML-style comments and the given tags
-	 * in the text with a random marker and returns teh next text. The output
-	 * parameter $matches will be an associative array filled with data in
-	 * the form:
-	 *   'UNIQ-xxxxx' => array(
-	 *     'element',
-	 *     'tag content',
-	 *     array( 'param' => 'x' ),
-	 *     '<element param="x">tag content</element>' ) )
-	 *
-	 * @param $elements list of element names. Comments are always extracted.
-	 * @param $text Source text string.
-	 * @param $uniq_prefix
-	 *
-	 * @public
-	 * @static
-	 */
-	function extractTagsAndParams($elements, $text, &$matches, $uniq_prefix = ''){
-		static $n = 1;
-		$stripped = '';
-		$matches = array();
-
-		$taglist = implode( '|', $elements );
-		$start = "/<($taglist)(\\s+[^>]*?|\\s*?)(\/?>)|<(!--)/i";
-
-		while ( '' != $text ) {
-			$p = preg_split( $start, $text, 2, PREG_SPLIT_DELIM_CAPTURE );
-			$stripped .= $p[0];
-			if( count( $p ) < 5 ) {
-				break;
-			}
-			if( count( $p ) > 5 ) {
-				// comment
-				$element    = $p[4];
-				$attributes = '';
-				$close      = '';
-				$inside     = $p[5];
-			} else {
-				// tag
-				$element    = $p[1];
-				$attributes = $p[2];
-				$close      = $p[3];
-				$inside     = $p[4];
-			}
-
-			$marker = "$uniq_prefix-$element-" . sprintf('%08X', $n++) . "-QINU\x07";
-			$stripped .= $marker;
-
-			if ( $close === '/>' ) {
-				// Empty element tag, <tag />
-				$content = null;
-				$text = $inside;
-				$tail = null;
-			} else {
-				if( $element == '!--' ) {
-					$end = '/(-->)/';
-				} else {
-					$end = "/(<\\/$element\\s*>)/i";
-				}
-				$q = preg_split( $end, $inside, 2, PREG_SPLIT_DELIM_CAPTURE );
-				$content = $q[0];
-				if( count( $q ) < 3 ) {
-					# No end tag -- let it run out to the end of the text.
-					$tail = '';
-					$text = '';
-				} else {
-					$tail = $q[1];
-					$text = $q[2];
-				}
-			}
-
-			$matches[$marker] = array( $element,
-				$content,
-				Sanitizer::decodeTagAttributes( $attributes ),
-				"<$element$attributes$close$content$tail" );
-		}
-		return $stripped;
-	}
-
-	/**
-	 * Strips and renders nowiki, pre, math, hiero
-	 * If $render is set, performs necessary rendering operations on plugins
-	 * Returns the text, and fills an array with data needed in unstrip()
-	 *
-	 * @param StripState $state
-	 *
-	 * @param bool $stripcomments when set, HTML comments <!-- like this -->
-	 *  will be stripped in addition to other tags. This is important
-	 *  for section editing, where these comments cause confusion when
-	 *  counting the sections in the wikisource
-	 *
-	 * @param array dontstrip contains tags which should not be stripped;
-	 *  used to prevent stipping of <gallery> when saving (fixes bug 2700)
-	 *
-	 * @private
-	 */
-	function strip( $text, $state, $stripcomments = false , $dontstrip = array () ) {
-		global $wgContLang;
-		wfProfileIn( __METHOD__ );
-		$render = ($this->mOutputType == self::OT_HTML);
-
-		$uniq_prefix = $this->mUniqPrefix;
-		$commentState = new ReplacementArray;
-		$nowikiItems = array();
-		$generalItems = array();
-
-		$elements = array_merge(
-			array( 'nowiki', 'gallery' ),
-			array_keys( $this->mTagHooks ) );
-		global $wgRawHtml;
-		if( $wgRawHtml ) {
-			$elements[] = 'html';
-		}
-		if( $this->mOptions->getUseTeX() ) {
-			$elements[] = 'math';
-		}
-
-		# Removing $dontstrip tags from $elements list (currently only 'gallery', fixing bug 2700)
-		foreach ( $elements AS $k => $v ) {
-			if ( !in_array ( $v , $dontstrip ) ) continue;
-			unset ( $elements[$k] );
-		}
-
-		$matches = array();
-		$text = self::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
-
-		foreach( $matches as $marker => $data ) {
-			list( $element, $content, $params, $tag ) = $data;
-			if( $render ) {
-				$tagName = strtolower( $element );
-				wfProfileIn( __METHOD__."-render-$tagName" );
-				switch( $tagName ) {
-				case '!--':
-					// Comment
-					if( substr( $tag, -3 ) == '-->' ) {
-						$output = $tag;
-					} else {
-						// Unclosed comment in input.
-						// Close it so later stripping can remove it
-						$output = "$tag-->";
-					}
-					break;
-				case 'html':
-					if( $wgRawHtml ) {
-						$output = $content;
-						break;
-					}
-					// Shouldn't happen otherwise. :)
-				case 'nowiki':
-					$output = Xml::escapeTagsOnly( $content );
-					break;
-				case 'math':
-					$output = $wgContLang->armourMath(
-						MathRenderer::renderMath( $content, $params ) );
-					break;
-				case 'gallery':
-					$output = $this->renderImageGallery( $content, $params );
-					break;
-				default:
-					if( isset( $this->mTagHooks[$tagName] ) ) {
-						$output = call_user_func_array( $this->mTagHooks[$tagName],
-							array( $content, $params, $this ) );
-					} else {
-						throw new MWException( "Invalid call hook $element" );
-					}
-				}
-				wfProfileOut( __METHOD__."-render-$tagName" );
-			} else {
-				// Just stripping tags; keep the source
-				$output = $tag;
-			}
-
-			// Unstrip the output, to support recursive strip() calls
-			$output = $state->unstripBoth( $output );
-
-			if( !$stripcomments && $element == '!--' ) {
-				$commentState->setPair( $marker, $output );
-			} elseif ( $element == 'html' || $element == 'nowiki' ) {
-				$nowikiItems[$marker] = $output;
-			} else {
-				$generalItems[$marker] = $output;
-			}
-		}
-		# Add the new items to the state
-		# We do this after the loop instead of during it to avoid slowing
-		# down the recursive unstrip
-		$state->nowiki->mergeArray( $nowikiItems );
-		$state->general->mergeArray( $generalItems );
-
-		# Unstrip comments unless explicitly told otherwise.
-		# (The comments are always stripped prior to this point, so as to
-		# not invoke any extension tags / parser hooks contained within
-		# a comment.)
-		if ( !$stripcomments ) {
-			// Put them all back and forget them
-			$text = $commentState->replace( $text );
-		}
-
-		wfProfileOut( __METHOD__ );
-		return $text;
-	}
-
-	/**
-	 * Restores pre, math, and other extensions removed by strip()
-	 *
-	 * always call unstripNoWiki() after this one
-	 * @private
-	 * @deprecated use $this->mStripState->unstrip()
-	 */
-	function unstrip( $text, $state ) {
-		return $state->unstripGeneral( $text );
-	}
-
-	/**
-	 * Always call this after unstrip() to preserve the order
-	 *
-	 * @private
-	 * @deprecated use $this->mStripState->unstrip()
-	 */
-	function unstripNoWiki( $text, $state ) {
-		return $state->unstripNoWiki( $text );
-	}
-
-	/**
-	 * @deprecated use $this->mStripState->unstripBoth()
-	 */
-	function unstripForHTML( $text ) {
-		return $this->mStripState->unstripBoth( $text );
-	}
-
-	/**
-	 * Add an item to the strip state
-	 * Returns the unique tag which must be inserted into the stripped text
-	 * The tag will be replaced with the original text in unstrip()
-	 *
-	 * @private
-	 */
-	function insertStripItem( $text, &$state ) {
-		$rnd = $this->mUniqPrefix . '-item' . self::getRandomString();
-		$state->general->setPair( $rnd, $text );
-		return $rnd;
-	}
-
-	/**
-	 * Interface with html tidy, used if $wgUseTidy = true.
-	 * If tidy isn't able to correct the markup, the original will be
-	 * returned in all its glory with a warning comment appended.
-	 *
-	 * Either the external tidy program or the in-process tidy extension
-	 * will be used depending on availability. Override the default
-	 * $wgTidyInternal setting to disable the internal if it's not working.
-	 *
-	 * @param string $text Hideous HTML input
-	 * @return string Corrected HTML output
-	 * @public
-	 * @static
-	 */
-	function tidy( $text ) {
-		global $wgTidyInternal;
-		$wrappedtext = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'.
-' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>'.
-'<head><title>test</title></head><body>'.$text.'</body></html>';
-		if( $wgTidyInternal ) {
-			$correctedtext = self::internalTidy( $wrappedtext );
-		} else {
-			$correctedtext = self::externalTidy( $wrappedtext );
-		}
-		if( is_null( $correctedtext ) ) {
-			wfDebug( "Tidy error detected!\n" );
-			return $text . "\n<!-- Tidy found serious XHTML errors -->\n";
-		}
-		return $correctedtext;
-	}
-
-	/**
-	 * Spawn an external HTML tidy process and get corrected markup back from it.
-	 *
-	 * @private
-	 * @static
-	 */
-	function externalTidy( $text ) {
-		global $wgTidyConf, $wgTidyBin, $wgTidyOpts;
-		$fname = 'Parser::externalTidy';
-		wfProfileIn( $fname );
-
-		$cleansource = '';
-		$opts = ' -utf8';
-
-		$descriptorspec = array(
-			0 => array('pipe', 'r'),
-			1 => array('pipe', 'w'),
-			2 => array('file', wfGetNull(), 'a')
-		);
-		$pipes = array();
-		$process = proc_open("$wgTidyBin -config $wgTidyConf $wgTidyOpts$opts", $descriptorspec, $pipes);
-		if (is_resource($process)) {
-			// Theoretically, this style of communication could cause a deadlock
-			// here. If the stdout buffer fills up, then writes to stdin could
-			// block. This doesn't appear to happen with tidy, because tidy only
-			// writes to stdout after it's finished reading from stdin. Search
-			// for tidyParseStdin and tidySaveStdout in console/tidy.c
-			fwrite($pipes[0], $text);
-			fclose($pipes[0]);
-			while (!feof($pipes[1])) {
-				$cleansource .= fgets($pipes[1], 1024);
-			}
-			fclose($pipes[1]);
-			proc_close($process);
-		}
-
-		wfProfileOut( $fname );
-
-		if( $cleansource == '' && $text != '') {
-			// Some kind of error happened, so we couldn't get the corrected text.
-			// Just give up; we'll use the source text and append a warning.
-			return null;
-		} else {
-			return $cleansource;
-		}
-	}
-
-	/**
-	 * Use the HTML tidy PECL extension to use the tidy library in-process,
-	 * saving the overhead of spawning a new process.
-	 *
-	 * 'pear install tidy' should be able to compile the extension module.
-	 *
-	 * @private
-	 * @static
-	 */
-	function internalTidy( $text ) {
-		global $wgTidyConf, $IP;
-		$fname = 'Parser::internalTidy';
-		wfProfileIn( $fname );
-
-		$tidy = new tidy;
-		$tidy->parseString( $text, $wgTidyConf, 'utf8' );
-		$tidy->cleanRepair();
-		if( $tidy->getStatus() == 2 ) {
-			// 2 is magic number for fatal error
-			// http://www.php.net/manual/en/function.tidy-get-status.php
-			$cleansource = null;
-		} else {
-			$cleansource = tidy_get_output( $tidy );
-		}
-		wfProfileOut( $fname );
-		return $cleansource;
-	}
-
-	/**
-	 * parse the wiki syntax used to render tables
-	 *
-	 * @private
-	 */
-	function doTableStuff ( $text ) {
-		$fname = 'Parser::doTableStuff';
-		wfProfileIn( $fname );
-
-		$lines = explode ( "\n" , $text );
-		$td_history = array (); // Is currently a td tag open?
-		$last_tag_history = array (); // Save history of last lag activated (td, th or caption)
-		$tr_history = array (); // Is currently a tr tag open?
-		$tr_attributes = array (); // history of tr attributes
-		$has_opened_tr = array(); // Did this table open a <tr> element?
-		$indent_level = 0; // indent level of the table
-		foreach ( $lines as $key => $line )
-		{
-			$line = trim ( $line );
-
-			if( $line == '' ) { // empty line, go to next line
-				continue;
-			}
-			$first_character = $line{0};
-			$matches = array();
-
-			if ( preg_match( '/^(:*)\{\|(.*)$/' , $line , $matches ) ) {
-				// First check if we are starting a new table
-				$indent_level = strlen( $matches[1] );
-
-				$attributes = $this->mStripState->unstripBoth( $matches[2] );
-				$attributes = Sanitizer::fixTagAttributes ( $attributes , 'table' );
-
-				$lines[$key] = str_repeat( '<dl><dd>' , $indent_level ) . "<table{$attributes}>";
-				array_push ( $td_history , false );
-				array_push ( $last_tag_history , '' );
-				array_push ( $tr_history , false );
-				array_push ( $tr_attributes , '' );
-				array_push ( $has_opened_tr , false );
-			} else if ( count ( $td_history ) == 0 ) {
-				// Don't do any of the following
-				continue;
-			} else if ( substr ( $line , 0 , 2 ) == '|}' ) {
-				// We are ending a table
-				$line = '</table>' . substr ( $line , 2 );
-				$last_tag = array_pop ( $last_tag_history );
-
-				if ( !array_pop ( $has_opened_tr ) ) {
-					$line = "<tr><td></td></tr>{$line}";
-				}
-
-				if ( array_pop ( $tr_history ) ) {
-					$line = "</tr>{$line}";
-				}
-
-				if ( array_pop ( $td_history ) ) {
-					$line = "</{$last_tag}>{$line}";
-				}
-				array_pop ( $tr_attributes );
-				$lines[$key] = $line . str_repeat( '</dd></dl>' , $indent_level );
-			} else if ( substr ( $line , 0 , 2 ) == '|-' ) {
-				// Now we have a table row
-				$line = preg_replace( '#^\|-+#', '', $line );
-
-				// Whats after the tag is now only attributes
-				$attributes = $this->mStripState->unstripBoth( $line );
-				$attributes = Sanitizer::fixTagAttributes ( $attributes , 'tr' );
-				array_pop ( $tr_attributes );
-				array_push ( $tr_attributes , $attributes );
-
-				$line = '';
-				$last_tag = array_pop ( $last_tag_history );
-				array_pop ( $has_opened_tr );
-				array_push ( $has_opened_tr , true );
-
-				if ( array_pop ( $tr_history ) ) {
-					$line = '</tr>';
-				}
-
-				if ( array_pop ( $td_history ) ) {
-					$line = "</{$last_tag}>{$line}";
-				}
-
-				$lines[$key] = $line;
-				array_push ( $tr_history , false );
-				array_push ( $td_history , false );
-				array_push ( $last_tag_history , '' );
-			}
-			else if ( $first_character == '|' || $first_character == '!' || substr ( $line , 0 , 2 )  == '|+' ) {
-				// This might be cell elements, td, th or captions
-				if ( substr ( $line , 0 , 2 ) == '|+' ) {
-					$first_character = '+';
-					$line = substr ( $line , 1 );
-				}
-
-				$line = substr ( $line , 1 );
-
-				if ( $first_character == '!' ) {
-					$line = str_replace ( '!!' , '||' , $line );
-				}
-
-				// Split up multiple cells on the same line.
-				// FIXME : This can result in improper nesting of tags processed
-				// by earlier parser steps, but should avoid splitting up eg
-				// attribute values containing literal "||".
-				$cells = StringUtils::explodeMarkup( '||' , $line );
-
-				$lines[$key] = '';
-
-				// Loop through each table cell
-				foreach ( $cells as $cell )
-				{
-					$previous = '';
-					if ( $first_character != '+' )
-					{
-						$tr_after = array_pop ( $tr_attributes );
-						if ( !array_pop ( $tr_history ) ) {
-							$previous = "<tr{$tr_after}>\n";
-						}
-						array_push ( $tr_history , true );
-						array_push ( $tr_attributes , '' );
-						array_pop ( $has_opened_tr );
-						array_push ( $has_opened_tr , true );
-					}
-
-					$last_tag = array_pop ( $last_tag_history );
-
-					if ( array_pop ( $td_history ) ) {
-						$previous = "</{$last_tag}>{$previous}";
-					}
-
-					if ( $first_character == '|' ) {
-						$last_tag = 'td';
-					} else if ( $first_character == '!' ) {
-						$last_tag = 'th';
-					} else if ( $first_character == '+' ) {
-						$last_tag = 'caption';
-					} else {
-						$last_tag = '';
-					}
-
-					array_push ( $last_tag_history , $last_tag );
-
-					// A cell could contain both parameters and data
-					$cell_data = explode ( '|' , $cell , 2 );
-
-					// Bug 553: Note that a '|' inside an invalid link should not
-					// be mistaken as delimiting cell parameters
-					if ( strpos( $cell_data[0], '[[' ) !== false ) {
-						$cell = "{$previous}<{$last_tag}>{$cell}";
-					} else if ( count ( $cell_data ) == 1 )
-						$cell = "{$previous}<{$last_tag}>{$cell_data[0]}";
-					else {
-						$attributes = $this->mStripState->unstripBoth( $cell_data[0] );
-						$attributes = Sanitizer::fixTagAttributes( $attributes , $last_tag );
-						$cell = "{$previous}<{$last_tag}{$attributes}>{$cell_data[1]}";
-					}
-
-					$lines[$key] .= $cell;
-					array_push ( $td_history , true );
-				}
-			}
-		}
-
-		// Closing open td, tr && table
-		while ( count ( $td_history ) > 0 )
-		{
-			if ( array_pop ( $td_history ) ) {
-				$lines[] = '</td>' ;
-			}
-			if ( array_pop ( $tr_history ) ) {
-				$lines[] = '</tr>' ;
-			}
-			if ( !array_pop ( $has_opened_tr ) ) {
-				$lines[] = "<tr><td></td></tr>" ;
-			}
-
-			$lines[] = '</table>' ;
-		}
-
-		$output = implode ( "\n" , $lines ) ;
-
-		// special case: don't return empty table
-		if( $output == "<table>\n<tr><td></td></tr>\n</table>" ) {
-			$output = '';
-		}
-
-		wfProfileOut( $fname );
-
-		return $output;
-	}
-
-	/**
-	 * Helper function for parse() that transforms wiki markup into
-	 * HTML. Only called for $mOutputType == OT_HTML.
-	 *
-	 * @private
-	 */
-	function internalParse( $text ) {
-		$args = array();
-		$isMain = true;
-		$fname = 'Parser::internalParse';
-		wfProfileIn( $fname );
-
-		# Hook to suspend the parser in this state
-		if ( !wfRunHooks( 'ParserBeforeInternalParse', array( &$this, &$text, &$this->mStripState ) ) ) {
-			wfProfileOut( $fname );
-			return $text ;
-		}
-
-		# Remove <noinclude> tags and <includeonly> sections
-		$text = strtr( $text, array( '<onlyinclude>' => '' , '</onlyinclude>' => '' ) );
-		$text = strtr( $text, array( '<noinclude>' => '', '</noinclude>' => '') );
-		$text = StringUtils::delimiterReplace( '<includeonly>', '</includeonly>', '', $text );
-
-		$text = Sanitizer::removeHTMLtags( $text, array( &$this, 'attributeStripCallback' ), array(), array_keys( $this->mTransparentTagHooks ) );
-
-		$text = $this->replaceVariables( $text, $args );
-		wfRunHooks( 'InternalParseBeforeLinks', array( &$this, &$text, &$this->mStripState ) );
-
-		// Tables need to come after variable replacement for things to work
-		// properly; putting them before other transformations should keep
-		// exciting things like link expansions from showing up in surprising
-		// places.
-		$text = $this->doTableStuff( $text );
-
-		$text = preg_replace( '/(^|\n)-----*/', '\\1<hr />', $text );
-
-		$text = $this->stripToc( $text );
-		$this->stripNoGallery( $text );
-		$text = $this->doHeadings( $text );
-		if($this->mOptions->getUseDynamicDates()) {
-			$df =& DateFormatter::getInstance();
-			$text = $df->reformat( $this->mOptions->getDateFormat(), $text );
-		}
-		$text = $this->doAllQuotes( $text );
-		$text = $this->replaceInternalLinks( $text );
-		$text = $this->replaceExternalLinks( $text );
-
-		# replaceInternalLinks may sometimes leave behind
-		# absolute URLs, which have to be masked to hide them from replaceExternalLinks
-		$text = str_replace($this->mUniqPrefix."NOPARSE", "", $text);
-
-		$text = $this->doMagicLinks( $text );
-		$text = $this->formatHeadings( $text, $isMain );
-
-		wfProfileOut( $fname );
-		return $text;
-	}
-
-	/**
-	 * Replace special strings like "ISBN xxx" and "RFC xxx" with
-	 * magic external links.
-	 *
-	 * @private
-	 */
-	function &doMagicLinks( &$text ) {
-		wfProfileIn( __METHOD__ );
-		$text = preg_replace_callback(
-			'!(?:                           # Start cases
-			    <a.*?</a> |                 # Skip link text
-			    <.*?> |                     # Skip stuff inside HTML elements
-			    (?:RFC|PMID)\s+([0-9]+) |   # RFC or PMID, capture number as m[1]
-			    ISBN\s+(\b                  # ISBN, capture number as m[2]
-                                     (?: 97[89] [\ \-]? )?   # optional 13-digit ISBN prefix
-                                     (?: [0-9]  [\ \-]? ){9} # 9 digits with opt. delimiters
-                                     [0-9Xx]                 # check digit
-                                   \b)
-			)!x', array( &$this, 'magicLinkCallback' ), $text );
-		wfProfileOut( __METHOD__ );
-		return $text;
-	}
-
-	function magicLinkCallback( $m ) {
-		if ( substr( $m[0], 0, 1 ) == '<' ) {
-			# Skip HTML element
-			return $m[0];
-		} elseif ( substr( $m[0], 0, 4 ) == 'ISBN' ) {
-			$isbn = $m[2];
-			$num = strtr( $isbn, array(
-				'-' => '',
-				' ' => '',
-				'x' => 'X',
-			));
-			$titleObj = SpecialPage::getTitleFor( 'Booksources' );
-			$text = '<a href="' .
-				$titleObj->escapeLocalUrl( "isbn=$num" ) .
-				"\" class=\"internal\">ISBN $isbn</a>";
-		} else {
-			if ( substr( $m[0], 0, 3 ) == 'RFC' ) {
-				$keyword = 'RFC';
-				$urlmsg = 'rfcurl';
-				$id = $m[1];
-			} elseif ( substr( $m[0], 0, 4 ) == 'PMID' ) {
-				$keyword = 'PMID';
-				$urlmsg = 'pubmedurl';
-				$id = $m[1];
-			} else {
-				throw new MWException( __METHOD__.': unrecognised match type "' .
-					substr($m[0], 0, 20 ) . '"' );
-			}
-
-			$url = wfMsg( $urlmsg, $id);
-			$sk = $this->mOptions->getSkin();
-			$la = $sk->getExternalLinkAttributes( $url, $keyword.$id );
-			$text = "<a href=\"{$url}\"{$la}>{$keyword} {$id}</a>";
-		}
-		return $text;
-	}
-
-	/**
-	 * Parse headers and return html
-	 *
-	 * @private
-	 */
-	function doHeadings( $text ) {
-		$fname = 'Parser::doHeadings';
-		wfProfileIn( $fname );
-		for ( $i = 6; $i >= 1; --$i ) {
-			$h = str_repeat( '=', $i );
-			$text = preg_replace( "/^{$h}(.+){$h}\\s*$/m",
-			  "<h{$i}>\\1</h{$i}>\\2", $text );
-		}
-		wfProfileOut( $fname );
-		return $text;
-	}
-
-	/**
-	 * Replace single quotes with HTML markup
-	 * @private
-	 * @return string the altered text
-	 */
-	function doAllQuotes( $text ) {
-		$fname = 'Parser::doAllQuotes';
-		wfProfileIn( $fname );
-		$outtext = '';
-		$lines = explode( "\n", $text );
-		foreach ( $lines as $line ) {
-			$outtext .= $this->doQuotes ( $line ) . "\n";
-		}
-		$outtext = substr($outtext, 0,-1);
-		wfProfileOut( $fname );
-		return $outtext;
-	}
-
-	/**
-	 * Helper function for doAllQuotes()
-	 */
-	public function doQuotes( $text ) {
-		$arr = preg_split( "/(''+)/", $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-		if ( count( $arr ) == 1 )
-			return $text;
-		else
-		{
-			# First, do some preliminary work. This may shift some apostrophes from
-			# being mark-up to being text. It also counts the number of occurrences
-			# of bold and italics mark-ups.
-			$i = 0;
-			$numbold = 0;
-			$numitalics = 0;
-			foreach ( $arr as $r )
-			{
-				if ( ( $i % 2 ) == 1 )
-				{
-					# If there are ever four apostrophes, assume the first is supposed to
-					# be text, and the remaining three constitute mark-up for bold text.
-					if ( strlen( $arr[$i] ) == 4 )
-					{
-						$arr[$i-1] .= "'";
-						$arr[$i] = "'''";
-					}
-					# If there are more than 5 apostrophes in a row, assume they're all
-					# text except for the last 5.
-					else if ( strlen( $arr[$i] ) > 5 )
-					{
-						$arr[$i-1] .= str_repeat( "'", strlen( $arr[$i] ) - 5 );
-						$arr[$i] = "'''''";
-					}
-					# Count the number of occurrences of bold and italics mark-ups.
-					# We are not counting sequences of five apostrophes.
-					if ( strlen( $arr[$i] ) == 2 )      { $numitalics++;             }
-					else if ( strlen( $arr[$i] ) == 3 ) { $numbold++;                }
-					else if ( strlen( $arr[$i] ) == 5 ) { $numitalics++; $numbold++; }
-				}
-				$i++;
-			}
-
-			# If there is an odd number of both bold and italics, it is likely
-			# that one of the bold ones was meant to be an apostrophe followed
-			# by italics. Which one we cannot know for certain, but it is more
-			# likely to be one that has a single-letter word before it.
-			if ( ( $numbold % 2 == 1 ) && ( $numitalics % 2 == 1 ) )
-			{
-				$i = 0;
-				$firstsingleletterword = -1;
-				$firstmultiletterword = -1;
-				$firstspace = -1;
-				foreach ( $arr as $r )
-				{
-					if ( ( $i % 2 == 1 ) and ( strlen( $r ) == 3 ) )
-					{
-						$x1 = substr ($arr[$i-1], -1);
-						$x2 = substr ($arr[$i-1], -2, 1);
-						if ($x1 == ' ') {
-							if ($firstspace == -1) $firstspace = $i;
-						} else if ($x2 == ' ') {
-							if ($firstsingleletterword == -1) $firstsingleletterword = $i;
-						} else {
-							if ($firstmultiletterword == -1) $firstmultiletterword = $i;
-						}
-					}
-					$i++;
-				}
-
-				# If there is a single-letter word, use it!
-				if ($firstsingleletterword > -1)
-				{
-					$arr [ $firstsingleletterword ] = "''";
-					$arr [ $firstsingleletterword-1 ] .= "'";
-				}
-				# If not, but there's a multi-letter word, use that one.
-				else if ($firstmultiletterword > -1)
-				{
-					$arr [ $firstmultiletterword ] = "''";
-					$arr [ $firstmultiletterword-1 ] .= "'";
-				}
-				# ... otherwise use the first one that has neither.
-				# (notice that it is possible for all three to be -1 if, for example,
-				# there is only one pentuple-apostrophe in the line)
-				else if ($firstspace > -1)
-				{
-					$arr [ $firstspace ] = "''";
-					$arr [ $firstspace-1 ] .= "'";
-				}
-			}
-
-			# Now let's actually convert our apostrophic mush to HTML!
-			$output = '';
-			$buffer = '';
-			$state = '';
-			$i = 0;
-			foreach ($arr as $r)
-			{
-				if (($i % 2) == 0)
-				{
-					if ($state == 'both')
-						$buffer .= $r;
-					else
-						$output .= $r;
-				}
-				else
-				{
-					if (strlen ($r) == 2)
-					{
-						if ($state == 'i')
-						{ $output .= '</i>'; $state = ''; }
-						else if ($state == 'bi')
-						{ $output .= '</i>'; $state = 'b'; }
-						else if ($state == 'ib')
-						{ $output .= '</b></i><b>'; $state = 'b'; }
-						else if ($state == 'both')
-						{ $output .= '<b><i>'.$buffer.'</i>'; $state = 'b'; }
-						else # $state can be 'b' or ''
-						{ $output .= '<i>'; $state .= 'i'; }
-					}
-					else if (strlen ($r) == 3)
-					{
-						if ($state == 'b')
-						{ $output .= '</b>'; $state = ''; }
-						else if ($state == 'bi')
-						{ $output .= '</i></b><i>'; $state = 'i'; }
-						else if ($state == 'ib')
-						{ $output .= '</b>'; $state = 'i'; }
-						else if ($state == 'both')
-						{ $output .= '<i><b>'.$buffer.'</b>'; $state = 'i'; }
-						else # $state can be 'i' or ''
-						{ $output .= '<b>'; $state .= 'b'; }
-					}
-					else if (strlen ($r) == 5)
-					{
-						if ($state == 'b')
-						{ $output .= '</b><i>'; $state = 'i'; }
-						else if ($state == 'i')
-						{ $output .= '</i><b>'; $state = 'b'; }
-						else if ($state == 'bi')
-						{ $output .= '</i></b>'; $state = ''; }
-						else if ($state == 'ib')
-						{ $output .= '</b></i>'; $state = ''; }
-						else if ($state == 'both')
-						{ $output .= '<i><b>'.$buffer.'</b></i>'; $state = ''; }
-						else # ($state == '')
-						{ $buffer = ''; $state = 'both'; }
-					}
-				}
-				$i++;
-			}
-			# Now close all remaining tags.  Notice that the order is important.
-			if ($state == 'b' || $state == 'ib')
-				$output .= '</b>';
-			if ($state == 'i' || $state == 'bi' || $state == 'ib')
-				$output .= '</i>';
-			if ($state == 'bi')
-				$output .= '</b>';
-			# There might be lonely ''''', so make sure we have a buffer
-			if ($state == 'both' && $buffer)
-				$output .= '<b><i>'.$buffer.'</i></b>';
-			return $output;
-		}
-	}
-
-	/**
-	 * Replace external links
-	 *
- 	 * Note: this is all very hackish and the order of execution matters a lot.
-	 * Make sure to run maintenance/parserTests.php if you change this code.
-	 *
-	 * @private
-	 */
-	function replaceExternalLinks( $text ) {
-		global $wgContLang;
-		$fname = 'Parser::replaceExternalLinks';
-		wfProfileIn( $fname );
-
-		$sk = $this->mOptions->getSkin();
-
-		$bits = preg_split( $this->mExtLinkBracketedRegex, $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-
-		$s = $this->replaceFreeExternalLinks( array_shift( $bits ) );
-
-		$i = 0;
-		while ( $i<count( $bits ) ) {
-			$url = $bits[$i++];
-			$protocol = $bits[$i++];
-			$text = $bits[$i++];
-			$trail = $bits[$i++];
-
-			# The characters '<' and '>' (which were escaped by
-			# removeHTMLtags()) should not be included in
-			# URLs, per RFC 2396.
-			$m2 = array();
-			if (preg_match('/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE)) {
-				$text = substr($url, $m2[0][1]) . ' ' . $text;
-				$url = substr($url, 0, $m2[0][1]);
-			}
-
-			# If the link text is an image URL, replace it with an <img> tag
-			# This happened by accident in the original parser, but some people used it extensively
-			$img = $this->maybeMakeExternalImage( $text );
-			if ( $img !== false ) {
-				$text = $img;
-			}
-
-			$dtrail = '';
-
-			# Set linktype for CSS - if URL==text, link is essentially free
-			$linktype = ($text == $url) ? 'free' : 'text';
-
-			# No link text, e.g. [http://domain.tld/some.link]
-			if ( $text == '' ) {
-				# Autonumber if allowed. See bug #5918
-				if ( strpos( wfUrlProtocols(), substr($protocol, 0, strpos($protocol, ':')) ) !== false ) {
-					$text = '[' . ++$this->mAutonumber . ']';
-					$linktype = 'autonumber';
-				} else {
-					# Otherwise just use the URL
-					$text = htmlspecialchars( $url );
-					$linktype = 'free';
-				}
-			} else {
-				# Have link text, e.g. [http://domain.tld/some.link text]s
-				# Check for trail
-				list( $dtrail, $trail ) = Linker::splitTrail( $trail );
-			}
-
-			$text = $wgContLang->markNoConversion($text);
-
-			$url = Sanitizer::cleanUrl( $url );
-
-			# Process the trail (i.e. everything after this link up until start of the next link),
-			# replacing any non-bracketed links
-			$trail = $this->replaceFreeExternalLinks( $trail );
-
-			# Use the encoded URL
-			# This means that users can paste URLs directly into the text
-			# Funny characters like &ouml; aren't valid in URLs anyway
-			# This was changed in August 2004
-			$s .= $sk->makeExternalLink( $url, $text, false, $linktype, $this->mTitle->getNamespace() ) . $dtrail . $trail;
-
-			# Register link in the output object.
-			# Replace unnecessary URL escape codes with the referenced character
-			# This prevents spammers from hiding links from the filters
-			$pasteurized = self::replaceUnusualEscapes( $url );
-			$this->mOutput->addExternalLink( $pasteurized );
-		}
-
-		wfProfileOut( $fname );
-		return $s;
-	}
-
-	/**
-	 * Replace anything that looks like a URL with a link
-	 * @private
-	 */
-	function replaceFreeExternalLinks( $text ) {
-		global $wgContLang;
-		$fname = 'Parser::replaceFreeExternalLinks';
-		wfProfileIn( $fname );
-
-		$bits = preg_split( '/(\b(?:' . wfUrlProtocols() . '))/S', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-		$s = array_shift( $bits );
-		$i = 0;
-
-		$sk = $this->mOptions->getSkin();
-
-		while ( $i < count( $bits ) ){
-			$protocol = $bits[$i++];
-			$remainder = $bits[$i++];
-
-			$m = array();
-			if ( preg_match( '/^('.self::EXT_LINK_URL_CLASS.'+)(.*)$/s', $remainder, $m ) ) {
-				# Found some characters after the protocol that look promising
-				$url = $protocol . $m[1];
-				$trail = $m[2];
-
-				# special case: handle urls as url args:
-				# http://www.example.com/foo?=http://www.example.com/bar
-				if(strlen($trail) == 0 &&
-					isset($bits[$i]) &&
-					preg_match('/^'. wfUrlProtocols() . '$/S', $bits[$i]) &&
-					preg_match( '/^('.self::EXT_LINK_URL_CLASS.'+)(.*)$/s', $bits[$i + 1], $m ))
-				{
-					# add protocol, arg
-					$url .= $bits[$i] . $m[1]; # protocol, url as arg to previous link
-					$i += 2;
-					$trail = $m[2];
-				}
-
-				# The characters '<' and '>' (which were escaped by
-				# removeHTMLtags()) should not be included in
-				# URLs, per RFC 2396.
-				$m2 = array();
-				if (preg_match('/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE)) {
-					$trail = substr($url, $m2[0][1]) . $trail;
-					$url = substr($url, 0, $m2[0][1]);
-				}
-
-				# Move trailing punctuation to $trail
-				$sep = ',;\.:!?';
-				# If there is no left bracket, then consider right brackets fair game too
-				if ( strpos( $url, '(' ) === false ) {
-					$sep .= ')';
-				}
-
-				$numSepChars = strspn( strrev( $url ), $sep );
-				if ( $numSepChars ) {
-					$trail = substr( $url, -$numSepChars ) . $trail;
-					$url = substr( $url, 0, -$numSepChars );
-				}
-
-				$url = Sanitizer::cleanUrl( $url );
-
-				# Is this an external image?
-				$text = $this->maybeMakeExternalImage( $url );
-				if ( $text === false ) {
-					# Not an image, make a link
-					$text = $sk->makeExternalLink( $url, $wgContLang->markNoConversion($url), true, 'free', $this->mTitle->getNamespace() );
-					# Register it in the output object...
-					# Replace unnecessary URL escape codes with their equivalent characters
-					$pasteurized = self::replaceUnusualEscapes( $url );
-					$this->mOutput->addExternalLink( $pasteurized );
-				}
-				$s .= $text . $trail;
-			} else {
-				$s .= $protocol . $remainder;
-			}
-		}
-		wfProfileOut( $fname );
-		return $s;
-	}
-
-	/**
-	 * Replace unusual URL escape codes with their equivalent characters
-	 * @param string
-	 * @return string
-	 * @static
-	 * @todo  This can merge genuinely required bits in the path or query string,
-	 *        breaking legit URLs. A proper fix would treat the various parts of
-	 *        the URL differently; as a workaround, just use the output for
-	 *        statistical records, not for actual linking/output.
-	 */
-	static function replaceUnusualEscapes( $url ) {
-		return preg_replace_callback( '/%[0-9A-Fa-f]{2}/',
-			array( __CLASS__, 'replaceUnusualEscapesCallback' ), $url );
-	}
-
-	/**
-	 * Callback function used in replaceUnusualEscapes().
-	 * Replaces unusual URL escape codes with their equivalent character
-	 * @static
-	 * @private
-	 */
-	private static function replaceUnusualEscapesCallback( $matches ) {
-		$char = urldecode( $matches[0] );
-		$ord = ord( $char );
-		// Is it an unsafe or HTTP reserved character according to RFC 1738?
-		if ( $ord > 32 && $ord < 127 && strpos( '<>"#{}|\^~[]`;/?', $char ) === false ) {
-			// No, shouldn't be escaped
-			return $char;
-		} else {
-			// Yes, leave it escaped
-			return $matches[0];
-		}
-	}
-
-	/**
-	 * make an image if it's allowed, either through the global
-	 * option or through the exception
-	 * @private
-	 */
-	function maybeMakeExternalImage( $url ) {
-		$sk = $this->mOptions->getSkin();
-		$imagesfrom = $this->mOptions->getAllowExternalImagesFrom();
-		$imagesexception = !empty($imagesfrom);
-		$text = false;
-		if ( $this->mOptions->getAllowExternalImages()
-		     || ( $imagesexception && strpos( $url, $imagesfrom ) === 0 ) ) {
-			if ( preg_match( self::EXT_IMAGE_REGEX, $url ) ) {
-				# Image found
-				$text = $sk->makeExternalImage( $url );
-			}
-		}
-		return $text;
-	}
-
-	/**
-	 * Process [[ ]] wikilinks
-	 *
-	 * @private
-	 */
-	function replaceInternalLinks( $s ) {
-		global $wgContLang;
-		static $fname = 'Parser::replaceInternalLinks' ;
-
-		wfProfileIn( $fname );
-
-		wfProfileIn( $fname.'-setup' );
-		static $tc = FALSE;
-		# the % is needed to support urlencoded titles as well
-		if ( !$tc ) { $tc = Title::legalChars() . '#%'; }
-
-		$sk = $this->mOptions->getSkin();
-
-		#split the entire text string on occurences of [[
-		$a = explode( '[[', ' ' . $s );
-		#get the first element (all text up to first [[), and remove the space we added
-		$s = array_shift( $a );
-		$s = substr( $s, 1 );
-
-		# Match a link having the form [[namespace:link|alternate]]trail
-		static $e1 = FALSE;
-		if ( !$e1 ) { $e1 = "/^([{$tc}]+)(?:\\|(.+?))?]](.*)\$/sD"; }
-		# Match cases where there is no "]]", which might still be images
-		static $e1_img = FALSE;
-		if ( !$e1_img ) { $e1_img = "/^([{$tc}]+)\\|(.*)\$/sD"; }
-		# Match the end of a line for a word that's not followed by whitespace,
-		# e.g. in the case of 'The Arab al[[Razi]]', 'al' will be matched
-		$e2 = wfMsgForContent( 'linkprefix' );
-
-		$useLinkPrefixExtension = $wgContLang->linkPrefixExtension();
-		if( is_null( $this->mTitle ) ) {
-			throw new MWException( __METHOD__.": \$this->mTitle is null\n" );
-		}
-		$nottalk = !$this->mTitle->isTalkPage();
-
-		if ( $useLinkPrefixExtension ) {
-			$m = array();
-			if ( preg_match( $e2, $s, $m ) ) {
-				$first_prefix = $m[2];
-			} else {
-				$first_prefix = false;
-			}
-		} else {
-			$prefix = '';
-		}
-
-		if($wgContLang->hasVariants()) {
-			$selflink = $wgContLang->convertLinkToAllVariants($this->mTitle->getPrefixedText());
-		} else {
-			$selflink = array($this->mTitle->getPrefixedText());
-		}
-		$useSubpages = $this->areSubpagesAllowed();
-		wfProfileOut( $fname.'-setup' );
-
-		# Loop for each link
-		for ($k = 0; isset( $a[$k] ); $k++) {
-			$line = $a[$k];
-			if ( $useLinkPrefixExtension ) {
-				wfProfileIn( $fname.'-prefixhandling' );
-				if ( preg_match( $e2, $s, $m ) ) {
-					$prefix = $m[2];
-					$s = $m[1];
-				} else {
-					$prefix='';
-				}
-				# first link
-				if($first_prefix) {
-					$prefix = $first_prefix;
-					$first_prefix = false;
-				}
-				wfProfileOut( $fname.'-prefixhandling' );
-			}
-
-			$might_be_img = false;
-
-			wfProfileIn( "$fname-e1" );
-			if ( preg_match( $e1, $line, $m ) ) { # page with normal text or alt
-				$text = $m[2];
-				# If we get a ] at the beginning of $m[3] that means we have a link that's something like:
-				# [[Image:Foo.jpg|[http://example.com desc]]] <- having three ] in a row fucks up,
-				# the real problem is with the $e1 regex
-				# See bug 1300.
-				#
-				# Still some problems for cases where the ] is meant to be outside punctuation,
-				# and no image is in sight. See bug 2095.
-				#
-				if( $text !== '' &&
-					substr( $m[3], 0, 1 ) === ']' &&
-					strpos($text, '[') !== false
-				)
-				{
-					$text .= ']'; # so that replaceExternalLinks($text) works later
-					$m[3] = substr( $m[3], 1 );
-				}
-				# fix up urlencoded title texts
-				if( strpos( $m[1], '%' ) !== false ) {
-					# Should anchors '#' also be rejected?
-					$m[1] = str_replace( array('<', '>'), array('&lt;', '&gt;'), urldecode($m[1]) );
-				}
-				$trail = $m[3];
-			} elseif( preg_match($e1_img, $line, $m) ) { # Invalid, but might be an image with a link in its caption
-				$might_be_img = true;
-				$text = $m[2];
-				if ( strpos( $m[1], '%' ) !== false ) {
-					$m[1] = urldecode($m[1]);
-				}
-				$trail = "";
-			} else { # Invalid form; output directly
-				$s .= $prefix . '[[' . $line ;
-				wfProfileOut( "$fname-e1" );
-				continue;
-			}
-			wfProfileOut( "$fname-e1" );
-			wfProfileIn( "$fname-misc" );
-
-			# Don't allow internal links to pages containing
-			# PROTO: where PROTO is a valid URL protocol; these
-			# should be external links.
-			if (preg_match('/^\b(?:' . wfUrlProtocols() . ')/', $m[1])) {
-				$s .= $prefix . '[[' . $line ;
-				continue;
-			}
-
-			# Make subpage if necessary
-			if( $useSubpages ) {
-				$link = $this->maybeDoSubpageLink( $m[1], $text );
-			} else {
-				$link = $m[1];
-			}
-
-			$noforce = (substr($m[1], 0, 1) != ':');
-			if (!$noforce) {
-				# Strip off leading ':'
-				$link = substr($link, 1);
-			}
-
-			wfProfileOut( "$fname-misc" );
-			wfProfileIn( "$fname-title" );
-			$nt = Title::newFromText( $this->mStripState->unstripNoWiki($link) );
-			if( !$nt ) {
-				$s .= $prefix . '[[' . $line;
-				wfProfileOut( "$fname-title" );
-				continue;
-			}
-
-			$ns = $nt->getNamespace();
-			$iw = $nt->getInterWiki();
-			wfProfileOut( "$fname-title" );
-
-			if ($might_be_img) { # if this is actually an invalid link
-				wfProfileIn( "$fname-might_be_img" );
-				if ($ns == NS_IMAGE && $noforce) { #but might be an image
-					$found = false;
-					while (isset ($a[$k+1]) ) {
-						#look at the next 'line' to see if we can close it there
-						$spliced = array_splice( $a, $k + 1, 1 );
-						$next_line = array_shift( $spliced );
-						$m = explode( ']]', $next_line, 3 );
-						if ( count( $m ) == 3 ) {
-							# the first ]] closes the inner link, the second the image
-							$found = true;
-							$text .= "[[{$m[0]}]]{$m[1]}";
-							$trail = $m[2];
-							break;
-						} elseif ( count( $m ) == 2 ) {
-							#if there's exactly one ]] that's fine, we'll keep looking
-							$text .= "[[{$m[0]}]]{$m[1]}";
-						} else {
-							#if $next_line is invalid too, we need look no further
-							$text .= '[[' . $next_line;
-							break;
-						}
-					}
-					if ( !$found ) {
-						# we couldn't find the end of this imageLink, so output it raw
-						#but don't ignore what might be perfectly normal links in the text we've examined
-						$text = $this->replaceInternalLinks($text);
-						$s .= "{$prefix}[[$link|$text";
-						# note: no $trail, because without an end, there *is* no trail
-						wfProfileOut( "$fname-might_be_img" );
-						continue;
-					}
-				} else { #it's not an image, so output it raw
-					$s .= "{$prefix}[[$link|$text";
-					# note: no $trail, because without an end, there *is* no trail
-					wfProfileOut( "$fname-might_be_img" );
-					continue;
-				}
-				wfProfileOut( "$fname-might_be_img" );
-			}
-
-			$wasblank = ( '' == $text );
-			if( $wasblank ) $text = $link;
-
-			# Link not escaped by : , create the various objects
-			if( $noforce ) {
-
-				# Interwikis
-				wfProfileIn( "$fname-interwiki" );
-				if( $iw && $this->mOptions->getInterwikiMagic() && $nottalk && $wgContLang->getLanguageName( $iw ) ) {
-					$this->mOutput->addLanguageLink( $nt->getFullText() );
-					$s = rtrim($s . $prefix);
-					$s .= trim($trail, "\n") == '' ? '': $prefix . $trail;
-					wfProfileOut( "$fname-interwiki" );
-					continue;
-				}
-				wfProfileOut( "$fname-interwiki" );
-
-				if ( $ns == NS_IMAGE ) {
-					wfProfileIn( "$fname-image" );
-					if ( !wfIsBadImage( $nt->getDBkey(), $this->mTitle ) ) {
-						# recursively parse links inside the image caption
-						# actually, this will parse them in any other parameters, too,
-						# but it might be hard to fix that, and it doesn't matter ATM
-						$text = $this->replaceExternalLinks($text);
-						$text = $this->replaceInternalLinks($text);
-
-						# cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them
-						$s .= $prefix . $this->armorLinks( $this->makeImage( $nt, $text ) ) . $trail;
-						$this->mOutput->addImage( $nt->getDBkey() );
-
-						wfProfileOut( "$fname-image" );
-						continue;
-					} else {
-						# We still need to record the image's presence on the page
-						$this->mOutput->addImage( $nt->getDBkey() );
-					}
-					wfProfileOut( "$fname-image" );
-
-				}
-
-				if ( $ns == NS_CATEGORY ) {
-					wfProfileIn( "$fname-category" );
-					$s = rtrim($s . "\n"); # bug 87
-
-					if ( $wasblank ) {
-						$sortkey = $this->getDefaultSort();
-					} else {
-						$sortkey = $text;
-					}
-					$sortkey = Sanitizer::decodeCharReferences( $sortkey );
-					$sortkey = str_replace( "\n", '', $sortkey );
-					$sortkey = $wgContLang->convertCategoryKey( $sortkey );
-					$this->mOutput->addCategory( $nt->getDBkey(), $sortkey );
-
-					/**
-					 * Strip the whitespace Category links produce, see bug 87
-					 * @todo We might want to use trim($tmp, "\n") here.
-					 */
-					$s .= trim($prefix . $trail, "\n") == '' ? '': $prefix . $trail;
-
-					wfProfileOut( "$fname-category" );
-					continue;
-				}
-			}
-
-			# Self-link checking
-			if( $nt->getFragment() === '' ) {
-				if( in_array( $nt->getPrefixedText(), $selflink, true ) ) {
-					$s .= $prefix . $sk->makeSelfLinkObj( $nt, $text, '', $trail );
-					continue;
-				}
-			}
-
-			# Special and Media are pseudo-namespaces; no pages actually exist in them
-			if( $ns == NS_MEDIA ) {
-				# Give extensions a chance to select the file revision for us
-				$skip = $time = false;
-				wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$nt, &$skip, &$time ) );
-				if ( $skip ) {
-					$link = $sk->makeLinkObj( $nt );
-				} else {
-					$link = $sk->makeMediaLinkObj( $nt, $text, $time );
-				}
-				# Cloak with NOPARSE to avoid replacement in replaceExternalLinks
-				$s .= $prefix . $this->armorLinks( $link ) . $trail;
-				$this->mOutput->addImage( $nt->getDBkey() );
-				continue;
-			} elseif( $ns == NS_SPECIAL ) {
-				if( SpecialPage::exists( $nt->getDBkey() ) ) {
-					$s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix );
-				} else {
-					$s .= $this->makeLinkHolder( $nt, $text, '', $trail, $prefix );
-				}
-				continue;
-			} elseif( $ns == NS_IMAGE ) {
-				$img = wfFindFile( $nt );
-				if( $img ) {
-					// Force a blue link if the file exists; may be a remote
-					// upload on the shared repository, and we want to see its
-					// auto-generated page.
-					$s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix );
-					$this->mOutput->addLink( $nt );
-					continue;
-				}
-			}
-			$s .= $this->makeLinkHolder( $nt, $text, '', $trail, $prefix );
-		}
-		wfProfileOut( $fname );
-		return $s;
-	}
-
-	/**
-	 * Make a link placeholder. The text returned can be later resolved to a real link with
-	 * replaceLinkHolders(). This is done for two reasons: firstly to avoid further
-	 * parsing of interwiki links, and secondly to allow all existence checks and
-	 * article length checks (for stub links) to be bundled into a single query.
-	 *
-	 */
-	function makeLinkHolder( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		wfProfileIn( __METHOD__ );
-		if ( ! is_object($nt) ) {
-			# Fail gracefully
-			$retVal = "<!-- ERROR -->{$prefix}{$text}{$trail}";
-		} else {
-			# Separate the link trail from the rest of the link
-			list( $inside, $trail ) = Linker::splitTrail( $trail );
-
-			if ( $nt->isExternal() ) {
-				$nr = array_push( $this->mInterwikiLinkHolders['texts'], $prefix.$text.$inside );
-				$this->mInterwikiLinkHolders['titles'][] = $nt;
-				$retVal = '<!--IWLINK '. ($nr-1) ."-->{$trail}";
-			} else {
-				$nr = array_push( $this->mLinkHolders['namespaces'], $nt->getNamespace() );
-				$this->mLinkHolders['dbkeys'][] = $nt->getDBkey();
-				$this->mLinkHolders['queries'][] = $query;
-				$this->mLinkHolders['texts'][] = $prefix.$text.$inside;
-				$this->mLinkHolders['titles'][] = $nt;
-
-				$retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
-			}
-		}
-		wfProfileOut( __METHOD__ );
-		return $retVal;
-	}
-
-	/**
-	 * Render a forced-blue link inline; protect against double expansion of
-	 * URLs if we're in a mode that prepends full URL prefixes to internal links.
-	 * Since this little disaster has to split off the trail text to avoid
-	 * breaking URLs in the following text without breaking trails on the
-	 * wiki links, it's been made into a horrible function.
-	 *
-	 * @param Title $nt
-	 * @param string $text
-	 * @param string $query
-	 * @param string $trail
-	 * @param string $prefix
-	 * @return string HTML-wikitext mix oh yuck
-	 */
-	function makeKnownLinkHolder( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		list( $inside, $trail ) = Linker::splitTrail( $trail );
-		$sk = $this->mOptions->getSkin();
-		$link = $sk->makeKnownLinkObj( $nt, $text, $query, $inside, $prefix );
-		return $this->armorLinks( $link ) . $trail;
-	}
-
-	/**
-	 * Insert a NOPARSE hacky thing into any inline links in a chunk that's
-	 * going to go through further parsing steps before inline URL expansion.
-	 *
-	 * In particular this is important when using action=render, which causes
-	 * full URLs to be included.
-	 *
-	 * Oh man I hate our multi-layer parser!
-	 *
-	 * @param string more-or-less HTML
-	 * @return string less-or-more HTML with NOPARSE bits
-	 */
-	function armorLinks( $text ) {
-		return preg_replace( '/\b(' . wfUrlProtocols() . ')/',
-			"{$this->mUniqPrefix}NOPARSE$1", $text );
-	}
-
-	/**
-	 * Return true if subpage links should be expanded on this page.
-	 * @return bool
-	 */
-	function areSubpagesAllowed() {
-		# Some namespaces don't allow subpages
-		global $wgNamespacesWithSubpages;
-		return !empty($wgNamespacesWithSubpages[$this->mTitle->getNamespace()]);
-	}
-
-	/**
-	 * Handle link to subpage if necessary
-	 * @param string $target the source of the link
-	 * @param string &$text the link text, modified as necessary
-	 * @return string the full name of the link
-	 * @private
-	 */
-	function maybeDoSubpageLink($target, &$text) {
-		# Valid link forms:
-		# Foobar -- normal
-		# :Foobar -- override special treatment of prefix (images, language links)
-		# /Foobar -- convert to CurrentPage/Foobar
-		# /Foobar/ -- convert to CurrentPage/Foobar, strip the initial / from text
-		# ../ -- convert to CurrentPage, from CurrentPage/CurrentSubPage
-		# ../Foobar -- convert to CurrentPage/Foobar, from CurrentPage/CurrentSubPage
-
-		$fname = 'Parser::maybeDoSubpageLink';
-		wfProfileIn( $fname );
-		$ret = $target; # default return value is no change
-
-		# Some namespaces don't allow subpages,
-		# so only perform processing if subpages are allowed
-		if( $this->areSubpagesAllowed() ) {
-			$hash = strpos( $target, '#' );
-			if( $hash !== false ) {
-				$suffix = substr( $target, $hash );
-				$target = substr( $target, 0, $hash );
-			} else {
-				$suffix = '';
-			}
-			# bug 7425
-			$target = trim( $target );
-			# Look at the first character
-			if( $target != '' && $target{0} == '/' ) {
-				# / at end means we don't want the slash to be shown
-				$m = array();
-				$trailingSlashes = preg_match_all( '%(/+)$%', $target, $m );
-				if( $trailingSlashes ) {
-					$noslash = $target = substr( $target, 1, -strlen($m[0][0]) );
-				} else {
-					$noslash = substr( $target, 1 );
-				}
-
-				$ret = $this->mTitle->getPrefixedText(). '/' . trim($noslash) . $suffix;
-				if( '' === $text ) {
-					$text = $target . $suffix;
-				} # this might be changed for ugliness reasons
-			} else {
-				# check for .. subpage backlinks
-				$dotdotcount = 0;
-				$nodotdot = $target;
-				while( strncmp( $nodotdot, "../", 3 ) == 0 ) {
-					++$dotdotcount;
-					$nodotdot = substr( $nodotdot, 3 );
-				}
-				if($dotdotcount > 0) {
-					$exploded = explode( '/', $this->mTitle->GetPrefixedText() );
-					if( count( $exploded ) > $dotdotcount ) { # not allowed to go below top level page
-						$ret = implode( '/', array_slice( $exploded, 0, -$dotdotcount ) );
-						# / at the end means don't show full path
-						if( substr( $nodotdot, -1, 1 ) == '/' ) {
-							$nodotdot = substr( $nodotdot, 0, -1 );
-							if( '' === $text ) {
-								$text = $nodotdot . $suffix;
-							}
-						}
-						$nodotdot = trim( $nodotdot );
-						if( $nodotdot != '' ) {
-							$ret .= '/' . $nodotdot;
-						}
-						$ret .= $suffix;
-					}
-				}
-			}
-		}
-
-		wfProfileOut( $fname );
-		return $ret;
-	}
-
-	/**#@+
-	 * Used by doBlockLevels()
-	 * @private
-	 */
-	/* private */ function closeParagraph() {
-		$result = '';
-		if ( '' != $this->mLastSection ) {
-			$result = '</' . $this->mLastSection  . ">\n";
-		}
-		$this->mInPre = false;
-		$this->mLastSection = '';
-		return $result;
-	}
-	# getCommon() returns the length of the longest common substring
-	# of both arguments, starting at the beginning of both.
-	#
-	/* private */ function getCommon( $st1, $st2 ) {
-		$fl = strlen( $st1 );
-		$shorter = strlen( $st2 );
-		if ( $fl < $shorter ) { $shorter = $fl; }
-
-		for ( $i = 0; $i < $shorter; ++$i ) {
-			if ( $st1{$i} != $st2{$i} ) { break; }
-		}
-		return $i;
-	}
-	# These next three functions open, continue, and close the list
-	# element appropriate to the prefix character passed into them.
-	#
-	/* private */ function openList( $char ) {
-		$result = $this->closeParagraph();
-
-		if ( '*' == $char ) { $result .= '<ul><li>'; }
-		else if ( '#' == $char ) { $result .= '<ol><li>'; }
-		else if ( ':' == $char ) { $result .= '<dl><dd>'; }
-		else if ( ';' == $char ) {
-			$result .= '<dl><dt>';
-			$this->mDTopen = true;
-		}
-		else { $result = '<!-- ERR 1 -->'; }
-
-		return $result;
-	}
-
-	/* private */ function nextItem( $char ) {
-		if ( '*' == $char || '#' == $char ) { return '</li><li>'; }
-		else if ( ':' == $char || ';' == $char ) {
-			$close = '</dd>';
-			if ( $this->mDTopen ) { $close = '</dt>'; }
-			if ( ';' == $char ) {
-				$this->mDTopen = true;
-				return $close . '<dt>';
-			} else {
-				$this->mDTopen = false;
-				return $close . '<dd>';
-			}
-		}
-		return '<!-- ERR 2 -->';
-	}
-
-	/* private */ function closeList( $char ) {
-		if ( '*' == $char ) { $text = '</li></ul>'; }
-		else if ( '#' == $char ) { $text = '</li></ol>'; }
-		else if ( ':' == $char ) {
-			if ( $this->mDTopen ) {
-				$this->mDTopen = false;
-				$text = '</dt></dl>';
-			} else {
-				$text = '</dd></dl>';
-			}
-		}
-		else {	return '<!-- ERR 3 -->'; }
-		return $text."\n";
-	}
-	/**#@-*/
-
-	/**
-	 * Make lists from lines starting with ':', '*', '#', etc.
-	 *
-	 * @private
-	 * @return string the lists rendered as HTML
-	 */
-	function doBlockLevels( $text, $linestart ) {
-		$fname = 'Parser::doBlockLevels';
-		wfProfileIn( $fname );
-
-		# Parsing through the text line by line.  The main thing
-		# happening here is handling of block-level elements p, pre,
-		# and making lists from lines starting with * # : etc.
-		#
-		$textLines = explode( "\n", $text );
-
-		$lastPrefix = $output = '';
-		$this->mDTopen = $inBlockElem = false;
-		$prefixLength = 0;
-		$paragraphStack = false;
-
-		if ( !$linestart ) {
-			$output .= array_shift( $textLines );
-		}
-		foreach ( $textLines as $oLine ) {
-			$lastPrefixLength = strlen( $lastPrefix );
-			$preCloseMatch = preg_match('/<\\/pre/i', $oLine );
-			$preOpenMatch = preg_match('/<pre/i', $oLine );
-			if ( !$this->mInPre ) {
-				# Multiple prefixes may abut each other for nested lists.
-				$prefixLength = strspn( $oLine, '*#:;' );
-				$pref = substr( $oLine, 0, $prefixLength );
-
-				# eh?
-				$pref2 = str_replace( ';', ':', $pref );
-				$t = substr( $oLine, $prefixLength );
-				$this->mInPre = !empty($preOpenMatch);
-			} else {
-				# Don't interpret any other prefixes in preformatted text
-				$prefixLength = 0;
-				$pref = $pref2 = '';
-				$t = $oLine;
-			}
-
-			# List generation
-			if( $prefixLength && 0 == strcmp( $lastPrefix, $pref2 ) ) {
-				# Same as the last item, so no need to deal with nesting or opening stuff
-				$output .= $this->nextItem( substr( $pref, -1 ) );
-				$paragraphStack = false;
-
-				if ( substr( $pref, -1 ) == ';') {
-					# The one nasty exception: definition lists work like this:
-					# ; title : definition text
-					# So we check for : in the remainder text to split up the
-					# title and definition, without b0rking links.
-					$term = $t2 = '';
-					if ($this->findColonNoLinks($t, $term, $t2) !== false) {
-						$t = $t2;
-						$output .= $term . $this->nextItem( ':' );
-					}
-				}
-			} elseif( $prefixLength || $lastPrefixLength ) {
-				# Either open or close a level...
-				$commonPrefixLength = $this->getCommon( $pref, $lastPrefix );
-				$paragraphStack = false;
-
-				while( $commonPrefixLength < $lastPrefixLength ) {
-					$output .= $this->closeList( $lastPrefix{$lastPrefixLength-1} );
-					--$lastPrefixLength;
-				}
-				if ( $prefixLength <= $commonPrefixLength && $commonPrefixLength > 0 ) {
-					$output .= $this->nextItem( $pref{$commonPrefixLength-1} );
-				}
-				while ( $prefixLength > $commonPrefixLength ) {
-					$char = substr( $pref, $commonPrefixLength, 1 );
-					$output .= $this->openList( $char );
-
-					if ( ';' == $char ) {
-						# FIXME: This is dupe of code above
-						if ($this->findColonNoLinks($t, $term, $t2) !== false) {
-							$t = $t2;
-							$output .= $term . $this->nextItem( ':' );
-						}
-					}
-					++$commonPrefixLength;
-				}
-				$lastPrefix = $pref2;
-			}
-			if( 0 == $prefixLength ) {
-				wfProfileIn( "$fname-paragraph" );
-				# No prefix (not in list)--go to paragraph mode
-				// XXX: use a stack for nestable elements like span, table and div
-				$openmatch = preg_match('/(?:<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
-				$closematch = preg_match(
-					'/(?:<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'.
-					'<td|<th|<\\/?div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol|<\\/?center)/iS', $t );
-				if ( $openmatch or $closematch ) {
-					$paragraphStack = false;
-					# TODO bug 5718: paragraph closed
-					$output .= $this->closeParagraph();
-					if ( $preOpenMatch and !$preCloseMatch ) {
-						$this->mInPre = true;
-					}
-					if ( $closematch ) {
-						$inBlockElem = false;
-					} else {
-						$inBlockElem = true;
-					}
-				} else if ( !$inBlockElem && !$this->mInPre ) {
-					if ( '' != $t and ' ' == $t{0} and ( $this->mLastSection == 'pre' or trim($t) != '' ) ) {
-						// pre
-						if ($this->mLastSection != 'pre') {
-							$paragraphStack = false;
-							$output .= $this->closeParagraph().'<pre>';
-							$this->mLastSection = 'pre';
-						}
-						$t = substr( $t, 1 );
-					} else {
-						// paragraph
-						if ( '' == trim($t) ) {
-							if ( $paragraphStack ) {
-								$output .= $paragraphStack.'<br />';
-								$paragraphStack = false;
-								$this->mLastSection = 'p';
-							} else {
-								if ($this->mLastSection != 'p' ) {
-									$output .= $this->closeParagraph();
-									$this->mLastSection = '';
-									$paragraphStack = '<p>';
-								} else {
-									$paragraphStack = '</p><p>';
-								}
-							}
-						} else {
-							if ( $paragraphStack ) {
-								$output .= $paragraphStack;
-								$paragraphStack = false;
-								$this->mLastSection = 'p';
-							} else if ($this->mLastSection != 'p') {
-								$output .= $this->closeParagraph().'<p>';
-								$this->mLastSection = 'p';
-							}
-						}
-					}
-				}
-				wfProfileOut( "$fname-paragraph" );
-			}
-			// somewhere above we forget to get out of pre block (bug 785)
-			if($preCloseMatch && $this->mInPre) {
-				$this->mInPre = false;
-			}
-			if ($paragraphStack === false) {
-				$output .= $t."\n";
-			}
-		}
-		while ( $prefixLength ) {
-			$output .= $this->closeList( $pref2{$prefixLength-1} );
-			--$prefixLength;
-		}
-		if ( '' != $this->mLastSection ) {
-			$output .= '</' . $this->mLastSection . '>';
-			$this->mLastSection = '';
-		}
-
-		wfProfileOut( $fname );
-		return $output;
-	}
-
-	/**
-	 * Split up a string on ':', ignoring any occurences inside tags
-	 * to prevent illegal overlapping.
-	 * @param string $str the string to split
-	 * @param string &$before set to everything before the ':'
-	 * @param string &$after set to everything after the ':'
-	 * return string the position of the ':', or false if none found
-	 */
-	function findColonNoLinks($str, &$before, &$after) {
-		$fname = 'Parser::findColonNoLinks';
-		wfProfileIn( $fname );
-
-		$pos = strpos( $str, ':' );
-		if( $pos === false ) {
-			// Nothing to find!
-			wfProfileOut( $fname );
-			return false;
-		}
-
-		$lt = strpos( $str, '<' );
-		if( $lt === false || $lt > $pos ) {
-			// Easy; no tag nesting to worry about
-			$before = substr( $str, 0, $pos );
-			$after = substr( $str, $pos+1 );
-			wfProfileOut( $fname );
-			return $pos;
-		}
-
-		// Ugly state machine to walk through avoiding tags.
-		$state = self::COLON_STATE_TEXT;
-		$stack = 0;
-		$len = strlen( $str );
-		for( $i = 0; $i < $len; $i++ ) {
-			$c = $str{$i};
-
-			switch( $state ) {
-			// (Using the number is a performance hack for common cases)
-			case 0: // self::COLON_STATE_TEXT:
-				switch( $c ) {
-				case "<":
-					// Could be either a <start> tag or an </end> tag
-					$state = self::COLON_STATE_TAGSTART;
-					break;
-				case ":":
-					if( $stack == 0 ) {
-						// We found it!
-						$before = substr( $str, 0, $i );
-						$after = substr( $str, $i + 1 );
-						wfProfileOut( $fname );
-						return $i;
-					}
-					// Embedded in a tag; don't break it.
-					break;
-				default:
-					// Skip ahead looking for something interesting
-					$colon = strpos( $str, ':', $i );
-					if( $colon === false ) {
-						// Nothing else interesting
-						wfProfileOut( $fname );
-						return false;
-					}
-					$lt = strpos( $str, '<', $i );
-					if( $stack === 0 ) {
-						if( $lt === false || $colon < $lt ) {
-							// We found it!
-							$before = substr( $str, 0, $colon );
-							$after = substr( $str, $colon + 1 );
-							wfProfileOut( $fname );
-							return $i;
-						}
-					}
-					if( $lt === false ) {
-						// Nothing else interesting to find; abort!
-						// We're nested, but there's no close tags left. Abort!
-						break 2;
-					}
-					// Skip ahead to next tag start
-					$i = $lt;
-					$state = self::COLON_STATE_TAGSTART;
-				}
-				break;
-			case 1: // self::COLON_STATE_TAG:
-				// In a <tag>
-				switch( $c ) {
-				case ">":
-					$stack++;
-					$state = self::COLON_STATE_TEXT;
-					break;
-				case "/":
-					// Slash may be followed by >?
-					$state = self::COLON_STATE_TAGSLASH;
-					break;
-				default:
-					// ignore
-				}
-				break;
-			case 2: // self::COLON_STATE_TAGSTART:
-				switch( $c ) {
-				case "/":
-					$state = self::COLON_STATE_CLOSETAG;
-					break;
-				case "!":
-					$state = self::COLON_STATE_COMMENT;
-					break;
-				case ">":
-					// Illegal early close? This shouldn't happen D:
-					$state = self::COLON_STATE_TEXT;
-					break;
-				default:
-					$state = self::COLON_STATE_TAG;
-				}
-				break;
-			case 3: // self::COLON_STATE_CLOSETAG:
-				// In a </tag>
-				if( $c == ">" ) {
-					$stack--;
-					if( $stack < 0 ) {
-						wfDebug( "Invalid input in $fname; too many close tags\n" );
-						wfProfileOut( $fname );
-						return false;
-					}
-					$state = self::COLON_STATE_TEXT;
-				}
-				break;
-			case self::COLON_STATE_TAGSLASH:
-				if( $c == ">" ) {
-					// Yes, a self-closed tag <blah/>
-					$state = self::COLON_STATE_TEXT;
-				} else {
-					// Probably we're jumping the gun, and this is an attribute
-					$state = self::COLON_STATE_TAG;
-				}
-				break;
-			case 5: // self::COLON_STATE_COMMENT:
-				if( $c == "-" ) {
-					$state = self::COLON_STATE_COMMENTDASH;
-				}
-				break;
-			case self::COLON_STATE_COMMENTDASH:
-				if( $c == "-" ) {
-					$state = self::COLON_STATE_COMMENTDASHDASH;
-				} else {
-					$state = self::COLON_STATE_COMMENT;
-				}
-				break;
-			case self::COLON_STATE_COMMENTDASHDASH:
-				if( $c == ">" ) {
-					$state = self::COLON_STATE_TEXT;
-				} else {
-					$state = self::COLON_STATE_COMMENT;
-				}
-				break;
-			default:
-				throw new MWException( "State machine error in $fname" );
-			}
-		}
-		if( $stack > 0 ) {
-			wfDebug( "Invalid input in $fname; not enough close tags (stack $stack, state $state)\n" );
-			return false;
-		}
-		wfProfileOut( $fname );
-		return false;
-	}
-
-	/**
-	 * Return value of a magic variable (like PAGENAME)
-	 *
-	 * @private
-	 */
-	function getVariableValue( $index ) {
-		global $wgContLang, $wgSitename, $wgServer, $wgServerName, $wgScriptPath;
-
-		/**
-		 * Some of these require message or data lookups and can be
-		 * expensive to check many times.
-		 */
-		static $varCache = array();
-		if ( wfRunHooks( 'ParserGetVariableValueVarCache', array( &$this, &$varCache ) ) ) {
-			if ( isset( $varCache[$index] ) ) {
-				return $varCache[$index];
-			}
-		}
-
-		$ts = time();
-		wfRunHooks( 'ParserGetVariableValueTs', array( &$this, &$ts ) );
-
-		# Use the time zone
-		global $wgLocaltimezone;
-		if ( isset( $wgLocaltimezone ) ) {
-			$oldtz = getenv( 'TZ' );
-			putenv( 'TZ='.$wgLocaltimezone );
-		}
-
-		wfSuppressWarnings(); // E_STRICT system time bitching
-		$localTimestamp = date( 'YmdHis', $ts );
-		$localMonth = date( 'm', $ts );
-		$localMonthName = date( 'n', $ts );
-		$localDay = date( 'j', $ts );
-		$localDay2 = date( 'd', $ts );
-		$localDayOfWeek = date( 'w', $ts );
-		$localWeek = date( 'W', $ts );
-		$localYear = date( 'Y', $ts );
-		$localHour = date( 'H', $ts );
-		if ( isset( $wgLocaltimezone ) ) {
-			putenv( 'TZ='.$oldtz );
-		}
-		wfRestoreWarnings();
-
-		switch ( $index ) {
-			case 'currentmonth':
-				return $varCache[$index] = $wgContLang->formatNum( gmdate( 'm', $ts ) );
-			case 'currentmonthname':
-				return $varCache[$index] = $wgContLang->getMonthName( gmdate( 'n', $ts ) );
-			case 'currentmonthnamegen':
-				return $varCache[$index] = $wgContLang->getMonthNameGen( gmdate( 'n', $ts ) );
-			case 'currentmonthabbrev':
-				return $varCache[$index] = $wgContLang->getMonthAbbreviation( gmdate( 'n', $ts ) );
-			case 'currentday':
-				return $varCache[$index] = $wgContLang->formatNum( gmdate( 'j', $ts ) );
-			case 'currentday2':
-				return $varCache[$index] = $wgContLang->formatNum( gmdate( 'd', $ts ) );
-			case 'localmonth':
-				return $varCache[$index] = $wgContLang->formatNum( $localMonth );
-			case 'localmonthname':
-				return $varCache[$index] = $wgContLang->getMonthName( $localMonthName );
-			case 'localmonthnamegen':
-				return $varCache[$index] = $wgContLang->getMonthNameGen( $localMonthName );
-			case 'localmonthabbrev':
-				return $varCache[$index] = $wgContLang->getMonthAbbreviation( $localMonthName );
-			case 'localday':
-				return $varCache[$index] = $wgContLang->formatNum( $localDay );
-			case 'localday2':
-				return $varCache[$index] = $wgContLang->formatNum( $localDay2 );
-			case 'pagename':
-				return wfEscapeWikiText( $this->mTitle->getText() );
-			case 'pagenamee':
-				return $this->mTitle->getPartialURL();
-			case 'fullpagename':
-				return wfEscapeWikiText( $this->mTitle->getPrefixedText() );
-			case 'fullpagenamee':
-				return $this->mTitle->getPrefixedURL();
-			case 'subpagename':
-				return wfEscapeWikiText( $this->mTitle->getSubpageText() );
-			case 'subpagenamee':
-				return $this->mTitle->getSubpageUrlForm();
-			case 'basepagename':
-				return wfEscapeWikiText( $this->mTitle->getBaseText() );
-			case 'basepagenamee':
-				return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getBaseText() ) );
-			case 'talkpagename':
-				if( $this->mTitle->canTalk() ) {
-					$talkPage = $this->mTitle->getTalkPage();
-					return wfEscapeWikiText( $talkPage->getPrefixedText() );
-				} else {
-					return '';
-				}
-			case 'talkpagenamee':
-				if( $this->mTitle->canTalk() ) {
-					$talkPage = $this->mTitle->getTalkPage();
-					return $talkPage->getPrefixedUrl();
-				} else {
-					return '';
-				}
-			case 'subjectpagename':
-				$subjPage = $this->mTitle->getSubjectPage();
-				return wfEscapeWikiText( $subjPage->getPrefixedText() );
-			case 'subjectpagenamee':
-				$subjPage = $this->mTitle->getSubjectPage();
-				return $subjPage->getPrefixedUrl();
-			case 'revisionid':
-				return $this->mRevisionId;
-			case 'revisionday':
-				return intval( substr( $this->getRevisionTimestamp(), 6, 2 ) );
-			case 'revisionday2':
-				return substr( $this->getRevisionTimestamp(), 6, 2 );
-			case 'revisionmonth':
-				return intval( substr( $this->getRevisionTimestamp(), 4, 2 ) );
-			case 'revisionyear':
-				return substr( $this->getRevisionTimestamp(), 0, 4 );
-			case 'revisiontimestamp':
-				return $this->getRevisionTimestamp();
-			case 'namespace':
-				return str_replace('_',' ',$wgContLang->getNsText( $this->mTitle->getNamespace() ) );
-			case 'namespacee':
-				return wfUrlencode( $wgContLang->getNsText( $this->mTitle->getNamespace() ) );
-			case 'talkspace':
-				return $this->mTitle->canTalk() ? str_replace('_',' ',$this->mTitle->getTalkNsText()) : '';
-			case 'talkspacee':
-				return $this->mTitle->canTalk() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
-			case 'subjectspace':
-				return $this->mTitle->getSubjectNsText();
-			case 'subjectspacee':
-				return( wfUrlencode( $this->mTitle->getSubjectNsText() ) );
-			case 'currentdayname':
-				return $varCache[$index] = $wgContLang->getWeekdayName( gmdate( 'w', $ts ) + 1 );
-			case 'currentyear':
-				return $varCache[$index] = $wgContLang->formatNum( gmdate( 'Y', $ts ), true );
-			case 'currenttime':
-				return $varCache[$index] = $wgContLang->time( wfTimestamp( TS_MW, $ts ), false, false );
-			case 'currenthour':
-				return $varCache[$index] = $wgContLang->formatNum( gmdate( 'H', $ts ), true );
-			case 'currentweek':
-				// @bug 4594 PHP5 has it zero padded, PHP4 does not, cast to
-				// int to remove the padding
-				return $varCache[$index] = $wgContLang->formatNum( (int)gmdate( 'W', $ts ) );
-			case 'currentdow':
-				return $varCache[$index] = $wgContLang->formatNum( gmdate( 'w', $ts ) );
-			case 'localdayname':
-				return $varCache[$index] = $wgContLang->getWeekdayName( $localDayOfWeek + 1 );
-			case 'localyear':
-				return $varCache[$index] = $wgContLang->formatNum( $localYear, true );
-			case 'localtime':
-				return $varCache[$index] = $wgContLang->time( $localTimestamp, false, false );
-			case 'localhour':
-				return $varCache[$index] = $wgContLang->formatNum( $localHour, true );
-			case 'localweek':
-				// @bug 4594 PHP5 has it zero padded, PHP4 does not, cast to
-				// int to remove the padding
-				return $varCache[$index] = $wgContLang->formatNum( (int)$localWeek );
-			case 'localdow':
-				return $varCache[$index] = $wgContLang->formatNum( $localDayOfWeek );
-			case 'numberofarticles':
-				return $varCache[$index] = $wgContLang->formatNum( SiteStats::articles() );
-			case 'numberoffiles':
-				return $varCache[$index] = $wgContLang->formatNum( SiteStats::images() );
-			case 'numberofusers':
-				return $varCache[$index] = $wgContLang->formatNum( SiteStats::users() );
-			case 'numberofpages':
-				return $varCache[$index] = $wgContLang->formatNum( SiteStats::pages() );
-			case 'numberofadmins':
-				return $varCache[$index]  = $wgContLang->formatNum( SiteStats::admins() );
-			case 'numberofedits':
-				return $varCache[$index]  = $wgContLang->formatNum( SiteStats::edits() );
-			case 'currenttimestamp':
-				return $varCache[$index] = wfTimestampNow();
-			case 'localtimestamp':
-				return $varCache[$index] = $localTimestamp;
-			case 'currentversion':
-				return $varCache[$index] = SpecialVersion::getVersion();
-			case 'sitename':
-				return $wgSitename;
-			case 'server':
-				return $wgServer;
-			case 'servername':
-				return $wgServerName;
-			case 'scriptpath':
-				return $wgScriptPath;
-			case 'directionmark':
-				return $wgContLang->getDirMark();
-			case 'contentlanguage':
-				global $wgContLanguageCode;
-				return $wgContLanguageCode;
-			default:
-				$ret = null;
-				if ( wfRunHooks( 'ParserGetVariableValueSwitch', array( &$this, &$varCache, &$index, &$ret ) ) )
-					return $ret;
-				else
-					return null;
-		}
-	}
-
-	/**
-	 * initialise the magic variables (like CURRENTMONTHNAME)
-	 *
-	 * @private
-	 */
-	function initialiseVariables() {
-		$fname = 'Parser::initialiseVariables';
-		wfProfileIn( $fname );
-		$variableIDs = MagicWord::getVariableIDs();
-
-		$this->mVariables = array();
-		foreach ( $variableIDs as $id ) {
-			$mw =& MagicWord::get( $id );
-			$mw->addToArray( $this->mVariables, $id );
-		}
-		wfProfileOut( $fname );
-	}
-
-	/**
-	 * parse any parentheses in format ((title|part|part))
-	 * and call callbacks to get a replacement text for any found piece
-	 *
-	 * @param string $text The text to parse
-	 * @param array $callbacks rules in form:
-	 *     '{' => array(				# opening parentheses
-	 *					'end' => '}',   # closing parentheses
-	 *					'cb' => array(2 => callback,	# replacement callback to call if {{..}} is found
-	 *								  3 => callback 	# replacement callback to call if {{{..}}} is found
-	 *								  )
-	 *					)
-	 * 					'min' => 2,     # Minimum parenthesis count in cb
-	 * 					'max' => 3,     # Maximum parenthesis count in cb
-	 * @private
-	 */
-	function replace_callback ($text, $callbacks) {
-		wfProfileIn( __METHOD__ );
-		$openingBraceStack = array();	# this array will hold a stack of parentheses which are not closed yet
-		$lastOpeningBrace = -1;			# last not closed parentheses
-
-		$validOpeningBraces = implode( '', array_keys( $callbacks ) );
-
-		$i = 0;
-		while ( $i < strlen( $text ) ) {
-			# Find next opening brace, closing brace or pipe
-			if ( $lastOpeningBrace == -1 ) {
-				$currentClosing = '';
-				$search = $validOpeningBraces;
-			} else {
-				$currentClosing = $openingBraceStack[$lastOpeningBrace]['braceEnd'];
-				$search = $validOpeningBraces . '|' . $currentClosing;
-			}
-			$rule = null;
-			$i += strcspn( $text, $search, $i );
-			if ( $i < strlen( $text ) ) {
-				if ( $text[$i] == '|' ) {
-					$found = 'pipe';
-				} elseif ( $text[$i] == $currentClosing ) {
-					$found = 'close';
-				} elseif ( isset( $callbacks[$text[$i]] ) ) {
-					$found = 'open';
-					$rule = $callbacks[$text[$i]];
-				} else {
-					# Some versions of PHP have a strcspn which stops on null characters
-					# Ignore and continue
-					++$i;
-					continue;
-				}
-			} else {
-				# All done
-				break;
-			}
-
-			if ( $found == 'open' ) {
-				# found opening brace, let's add it to parentheses stack
-				$piece = array('brace' => $text[$i],
-							   'braceEnd' => $rule['end'],
-							   'title' => '',
-							   'parts' => null);
-
-				# count opening brace characters
-				$piece['count'] = strspn( $text, $piece['brace'], $i );
-				$piece['startAt'] = $piece['partStart'] = $i + $piece['count'];
-				$i += $piece['count'];
-
-				# we need to add to stack only if opening brace count is enough for one of the rules
-				if ( $piece['count'] >= $rule['min'] ) {
-					$lastOpeningBrace ++;
-					$openingBraceStack[$lastOpeningBrace] = $piece;
-				}
-			} elseif ( $found == 'close' ) {
-				# lets check if it is enough characters for closing brace
-				$maxCount = $openingBraceStack[$lastOpeningBrace]['count'];
-				$count = strspn( $text, $text[$i], $i, $maxCount );
-
-				# check for maximum matching characters (if there are 5 closing
-				# characters, we will probably need only 3 - depending on the rules)
-				$matchingCount = 0;
-				$matchingCallback = null;
-				$cbType = $callbacks[$openingBraceStack[$lastOpeningBrace]['brace']];
-				if ( $count > $cbType['max'] ) {
-					# The specified maximum exists in the callback array, unless the caller
-					# has made an error
-					$matchingCount = $cbType['max'];
-				} else {
-					# Count is less than the maximum
-					# Skip any gaps in the callback array to find the true largest match
-					# Need to use array_key_exists not isset because the callback can be null
-					$matchingCount = $count;
-					while ( $matchingCount > 0 && !array_key_exists( $matchingCount, $cbType['cb'] ) ) {
-						--$matchingCount;
-					}
-				}
-
-				if ($matchingCount <= 0) {
-					$i += $count;
-					continue;
-				}
-				$matchingCallback = $cbType['cb'][$matchingCount];
-
-				# let's set a title or last part (if '|' was found)
-				if (null === $openingBraceStack[$lastOpeningBrace]['parts']) {
-					$openingBraceStack[$lastOpeningBrace]['title'] =
-						substr($text, $openingBraceStack[$lastOpeningBrace]['partStart'],
-						$i - $openingBraceStack[$lastOpeningBrace]['partStart']);
-				} else {
-					$openingBraceStack[$lastOpeningBrace]['parts'][] =
-						substr($text, $openingBraceStack[$lastOpeningBrace]['partStart'],
-						$i - $openingBraceStack[$lastOpeningBrace]['partStart']);
-				}
-
-				$pieceStart = $openingBraceStack[$lastOpeningBrace]['startAt'] - $matchingCount;
-				$pieceEnd = $i + $matchingCount;
-
-				if( is_callable( $matchingCallback ) ) {
-					$cbArgs = array (
-									 'text' => substr($text, $pieceStart, $pieceEnd - $pieceStart),
-									 'title' => trim($openingBraceStack[$lastOpeningBrace]['title']),
-									 'parts' => $openingBraceStack[$lastOpeningBrace]['parts'],
-									 'lineStart' => (($pieceStart > 0) && ($text[$pieceStart-1] == "\n")),
-									 );
-					# finally we can call a user callback and replace piece of text
-					$replaceWith = call_user_func( $matchingCallback, $cbArgs );
-					$text = substr($text, 0, $pieceStart) . $replaceWith . substr($text, $pieceEnd);
-					$i = $pieceStart + strlen($replaceWith);
-				} else {
-					# null value for callback means that parentheses should be parsed, but not replaced
-					$i += $matchingCount;
-				}
-
-				# reset last opening parentheses, but keep it in case there are unused characters
-				$piece = array('brace' => $openingBraceStack[$lastOpeningBrace]['brace'],
-							   'braceEnd' => $openingBraceStack[$lastOpeningBrace]['braceEnd'],
-							   'count' => $openingBraceStack[$lastOpeningBrace]['count'],
-							   'title' => '',
-							   'parts' => null,
-							   'startAt' => $openingBraceStack[$lastOpeningBrace]['startAt']);
-				$openingBraceStack[$lastOpeningBrace--] = null;
-
-				if ($matchingCount < $piece['count']) {
-					$piece['count'] -= $matchingCount;
-					$piece['startAt'] -= $matchingCount;
-					$piece['partStart'] = $piece['startAt'];
-					# do we still qualify for any callback with remaining count?
-					$currentCbList = $callbacks[$piece['brace']]['cb'];
-					while ( $piece['count'] ) {
-						if ( array_key_exists( $piece['count'], $currentCbList ) ) {
-							$lastOpeningBrace++;
-							$openingBraceStack[$lastOpeningBrace] = $piece;
-							break;
-						}
-						--$piece['count'];
-					}
-				}
-			} elseif ( $found == 'pipe' ) {
-				# lets set a title if it is a first separator, or next part otherwise
-				if (null === $openingBraceStack[$lastOpeningBrace]['parts']) {
-					$openingBraceStack[$lastOpeningBrace]['title'] =
-						substr($text, $openingBraceStack[$lastOpeningBrace]['partStart'],
-						$i - $openingBraceStack[$lastOpeningBrace]['partStart']);
-					$openingBraceStack[$lastOpeningBrace]['parts'] = array();
-				} else {
-					$openingBraceStack[$lastOpeningBrace]['parts'][] =
-						substr($text, $openingBraceStack[$lastOpeningBrace]['partStart'],
-						$i - $openingBraceStack[$lastOpeningBrace]['partStart']);
-				}
-				$openingBraceStack[$lastOpeningBrace]['partStart'] = ++$i;
-			}
-		}
-
-		wfProfileOut( __METHOD__ );
-		return $text;
-	}
-
-	/**
-	 * Replace magic variables, templates, and template arguments
-	 * with the appropriate text. Templates are substituted recursively,
-	 * taking care to avoid infinite loops.
-	 *
-	 * Note that the substitution depends on value of $mOutputType:
-	 *  self::OT_WIKI: only {{subst:}} templates
-	 *  self::OT_MSG: only magic variables
-	 *  self::OT_HTML: all templates and magic variables
-	 *
-	 * @param string $tex The text to transform
-	 * @param array $args Key-value pairs representing template parameters to substitute
-	 * @param bool $argsOnly Only do argument (triple-brace) expansion, not double-brace expansion
-	 * @private
-	 */
-	function replaceVariables( $text, $args = array(), $argsOnly = false ) {
-		# Prevent too big inclusions
-		if( strlen( $text ) > $this->mOptions->getMaxIncludeSize() ) {
-			return $text;
-		}
-
-		$fname = __METHOD__ /*. '-L' . count( $this->mArgStack )*/;
-		wfProfileIn( $fname );
-
-		# This function is called recursively. To keep track of arguments we need a stack:
-		array_push( $this->mArgStack, $args );
-
-		$braceCallbacks = array();
-		if ( !$argsOnly ) {
-			$braceCallbacks[2] = array( &$this, 'braceSubstitution' );
-		}
-		if ( $this->mOutputType != self::OT_MSG ) {
-			$braceCallbacks[3] = array( &$this, 'argSubstitution' );
-		}
-		if ( $braceCallbacks ) {
-			$callbacks = array(
-				'{' => array(
-					'end' => '}',
-					'cb' => $braceCallbacks,
-					'min' => $argsOnly ? 3 : 2,
-					'max' => isset( $braceCallbacks[3] ) ? 3 : 2,
-				),
-				'[' => array(
-					'end' => ']',
-					'cb' => array(2=>null),
-					'min' => 2,
-					'max' => 2,
-				)
-			);
-			$text = $this->replace_callback ($text, $callbacks);
-
-			array_pop( $this->mArgStack );
-		}
-		wfProfileOut( $fname );
-		return $text;
-	}
-
-	/**
-	 * Replace magic variables
-	 * @private
-	 */
-	function variableSubstitution( $matches ) {
-		global $wgContLang;
-		$fname = 'Parser::variableSubstitution';
-		$varname = $wgContLang->lc($matches[1]);
-		wfProfileIn( $fname );
-		$skip = false;
-		if ( $this->mOutputType == self::OT_WIKI ) {
-			# Do only magic variables prefixed by SUBST
-			$mwSubst =& MagicWord::get( 'subst' );
-			if (!$mwSubst->matchStartAndRemove( $varname ))
-				$skip = true;
-			# Note that if we don't substitute the variable below,
-			# we don't remove the {{subst:}} magic word, in case
-			# it is a template rather than a magic variable.
-		}
-		if ( !$skip && array_key_exists( $varname, $this->mVariables ) ) {
-			$id = $this->mVariables[$varname];
-			# Now check if we did really match, case sensitive or not
-			$mw =& MagicWord::get( $id );
-			if ($mw->match($matches[1])) {
-				$text = $this->getVariableValue( $id );
-				if (MagicWord::getCacheTTL($id)>-1)
-					$this->mOutput->mContainsOldMagic = true;
-			} else {
-				$text = $matches[0];
-			}
-		} else {
-			$text = $matches[0];
-		}
-		wfProfileOut( $fname );
-		return $text;
-	}
-
-
-	/// Clean up argument array - refactored in 1.9 so parserfunctions can use it, too.
-	static function createAssocArgs( $args ) {
-		$assocArgs = array();
-		$index = 1;
-		foreach( $args as $arg ) {
-			$eqpos = strpos( $arg, '=' );
-			if ( $eqpos === false ) {
-				$assocArgs[$index++] = $arg;
-			} else {
-				$name = trim( substr( $arg, 0, $eqpos ) );
-				$value = trim( substr( $arg, $eqpos+1 ) );
-				if ( $value === false ) {
-					$value = '';
-				}
-				if ( $name !== false ) {
-					$assocArgs[$name] = $value;
-				}
-			}
-		}
-
-		return $assocArgs;
-	}
-
-	/**
-	 * Return the text of a template, after recursively
-	 * replacing any variables or templates within the template.
-	 *
-	 * @param array $piece The parts of the template
-	 *  $piece['text']: matched text
-	 *  $piece['title']: the title, i.e. the part before the |
-	 *  $piece['parts']: the parameter array
-	 * @return string the text of the template
-	 * @private
-	 */
-	function braceSubstitution( $piece ) {
-		global $wgContLang, $wgLang, $wgAllowDisplayTitle, $wgNonincludableNamespaces;
-		$fname = __METHOD__ /*. '-L' . count( $this->mArgStack )*/;
-		wfProfileIn( $fname );
-		wfProfileIn( __METHOD__.'-setup' );
-
-		# Flags
-		$found = false;             # $text has been filled
-		$nowiki = false;            # wiki markup in $text should be escaped
-		$noparse = false;           # Unsafe HTML tags should not be stripped, etc.
-		$noargs = false;            # Don't replace triple-brace arguments in $text
-		$replaceHeadings = false;   # Make the edit section links go to the template not the article
-                $headingOffset = 0;         # Skip headings when number, to account for those that weren't transcluded.
-		$isHTML = false;            # $text is HTML, armour it against wikitext transformation
-		$forceRawInterwiki = false; # Force interwiki transclusion to be done in raw mode not rendered
-
-		# Title object, where $text came from
-		$title = NULL;
-
-		$linestart = '';
-
-
-		# $part1 is the bit before the first |, and must contain only title characters
-		# $args is a list of arguments, starting from index 0, not including $part1
-
-		$titleText = $part1 = $piece['title'];
-		# If the third subpattern matched anything, it will start with |
-
-		if (null == $piece['parts']) {
-			$replaceWith = $this->variableSubstitution (array ($piece['text'], $piece['title']));
-			if ($replaceWith != $piece['text']) {
-				$text = $replaceWith;
-				$found = true;
-				$noparse = true;
-				$noargs = true;
-			}
-		}
-
-		$args = (null == $piece['parts']) ? array() : $piece['parts'];
-		wfProfileOut( __METHOD__.'-setup' );
-
-		# SUBST
-		wfProfileIn( __METHOD__.'-modifiers' );
-		if ( !$found ) {
-			$mwSubst =& MagicWord::get( 'subst' );
-			if ( $mwSubst->matchStartAndRemove( $part1 ) xor $this->ot['wiki'] ) {
-				# One of two possibilities is true:
-				# 1) Found SUBST but not in the PST phase
-				# 2) Didn't find SUBST and in the PST phase
-				# In either case, return without further processing
-				$text = $piece['text'];
-				$found = true;
-				$noparse = true;
-				$noargs = true;
-			}
-		}
-
-		# MSG, MSGNW and RAW
-		if ( !$found ) {
-			# Check for MSGNW:
-			$mwMsgnw =& MagicWord::get( 'msgnw' );
-			if ( $mwMsgnw->matchStartAndRemove( $part1 ) ) {
-				$nowiki = true;
-			} else {
-				# Remove obsolete MSG:
-				$mwMsg =& MagicWord::get( 'msg' );
-				$mwMsg->matchStartAndRemove( $part1 );
-			}
-
-			# Check for RAW:
-			$mwRaw =& MagicWord::get( 'raw' );
-			if ( $mwRaw->matchStartAndRemove( $part1 ) ) {
-				$forceRawInterwiki = true;
-			}
-		}
-		wfProfileOut( __METHOD__.'-modifiers' );
-
-		//save path level before recursing into functions & templates.
-		$lastPathLevel = $this->mTemplatePath;
-
-		# Parser functions
-		if ( !$found ) {
-			wfProfileIn( __METHOD__ . '-pfunc' );
-
-			$colonPos = strpos( $part1, ':' );
-			if ( $colonPos !== false ) {
-				# Case sensitive functions
-				$function = substr( $part1, 0, $colonPos );
-				if ( isset( $this->mFunctionSynonyms[1][$function] ) ) {
-					$function = $this->mFunctionSynonyms[1][$function];
-				} else {
-					# Case insensitive functions
-					$function = strtolower( $function );
-					if ( isset( $this->mFunctionSynonyms[0][$function] ) ) {
-						$function = $this->mFunctionSynonyms[0][$function];
-					} else {
-						$function = false;
-					}
-				}
-				if ( $function ) {
-					$funcArgs = array_map( 'trim', $args );
-					$funcArgs = array_merge( array( &$this, trim( substr( $part1, $colonPos + 1 ) ) ), $funcArgs );
-					$result = call_user_func_array( $this->mFunctionHooks[$function], $funcArgs );
-					$found = true;
-
-					// The text is usually already parsed, doesn't need triple-brace tags expanded, etc.
-					//$noargs = true;
-					//$noparse = true;
-
-					if ( is_array( $result ) ) {
-						if ( isset( $result[0] ) ) {
-							$text = $linestart . $result[0];
-							unset( $result[0] );
-						}
-
-						// Extract flags into the local scope
-						// This allows callers to set flags such as nowiki, noparse, found, etc.
-						extract( $result );
-					} else {
-						$text = $linestart . $result;
-					}
-				}
-			}
-			wfProfileOut( __METHOD__ . '-pfunc' );
-		}
-
-		# Template table test
-
-		# Did we encounter this template already? If yes, it is in the cache
-		# and we need to check for loops.
-		if ( !$found && isset( $this->mTemplates[$piece['title']] ) ) {
-			$found = true;
-
-			# Infinite loop test
-			if ( isset( $this->mTemplatePath[$part1] ) ) {
-				$noparse = true;
-				$noargs = true;
-				$found = true;
-				$text = $linestart .
-					"[[$part1]]<!-- WARNING: template loop detected -->";
-				wfDebug( __METHOD__.": template loop broken at '$part1'\n" );
-			} else {
-				# set $text to cached message.
-				$text = $linestart . $this->mTemplates[$piece['title']];
-				#treat title for cached page the same as others
-				$ns = NS_TEMPLATE;
-				$subpage = '';
-				$part1 = $this->maybeDoSubpageLink( $part1, $subpage );
-				if ($subpage !== '') {
-				  $ns = $this->mTitle->getNamespace();
-				}
-				$title = Title::newFromText( $part1, $ns );
-				//used by include size checking
-				$titleText = $title->getPrefixedText();
-				//used by edit section links
-				$replaceHeadings = true;
-
-			}
-		}
-
-		# Load from database
-		if ( !$found ) {
-			wfProfileIn( __METHOD__ . '-loadtpl' );
-			$ns = NS_TEMPLATE;
-			# declaring $subpage directly in the function call
-			# does not work correctly with references and breaks
-			# {{/subpage}}-style inclusions
-			$subpage = '';
-			$part1 = $this->maybeDoSubpageLink( $part1, $subpage );
-			if ($subpage !== '') {
-				$ns = $this->mTitle->getNamespace();
-			}
-			$title = Title::newFromText( $part1, $ns );
-
-
-			if ( !is_null( $title ) ) {
-				$titleText = $title->getPrefixedText();
-				# Check for language variants if the template is not found
-				if($wgContLang->hasVariants() && $title->getArticleID() == 0){
-					$wgContLang->findVariantLink($part1, $title);
-				}
-
-				if ( !$title->isExternal() ) {
-					if ( $title->getNamespace() == NS_SPECIAL && $this->mOptions->getAllowSpecialInclusion() && $this->ot['html'] ) {
-						$text = SpecialPage::capturePath( $title );
-						if ( is_string( $text ) ) {
-							$found = true;
-							$noparse = true;
-							$noargs = true;
-							$isHTML = true;
-							$this->disableCache();
-						}
-					} else if ( $wgNonincludableNamespaces && in_array( $title->getNamespace(), $wgNonincludableNamespaces ) ) {
-						$found = false; //access denied
-						wfDebug( "$fname: template inclusion denied for " . $title->getPrefixedDBkey() );
-					} else {
-						list($articleContent,$title) = $this->fetchTemplateAndtitle( $title );
-						if ( $articleContent !== false ) {
-							$found = true;
-							$text = $articleContent;
-							$replaceHeadings = true;
-						}
-					}
-
-					# If the title is valid but undisplayable, make a link to it
-					if ( !$found && ( $this->ot['html'] || $this->ot['pre'] ) ) {
-						$text = "[[:$titleText]]";
-						$found = true;
-					}
-				} elseif ( $title->isTrans() ) {
-					// Interwiki transclusion
-					if ( $this->ot['html'] && !$forceRawInterwiki ) {
-						$text = $this->interwikiTransclude( $title, 'render' );
-						$isHTML = true;
-						$noparse = true;
-					} else {
-						$text = $this->interwikiTransclude( $title, 'raw' );
-						$replaceHeadings = true;
-					}
-					$found = true;
-				}
-
-				# Template cache array insertion
-				# Use the original $piece['title'] not the mangled $part1, so that
-				# modifiers such as RAW: produce separate cache entries
-				if( $found ) {
-					if( $isHTML ) {
-						// A special page; don't store it in the template cache.
-					} else {
-						$this->mTemplates[$piece['title']] = $text;
-					}
-					$text = $linestart . $text;
-				}
-			}
-			wfProfileOut( __METHOD__ . '-loadtpl' );
-		}
-
-		if ( $found && !$this->incrementIncludeSize( 'pre-expand', strlen( $text ) ) ) {
-			# Error, oversize inclusion
-			$text = $linestart .
-				"[[$titleText]]<!-- WARNING: template omitted, pre-expand include size too large -->";
-			$noparse = true;
-			$noargs = true;
-		}
-
-		# Recursive parsing, escaping and link table handling
-		# Only for HTML output
-		if ( $nowiki && $found && ( $this->ot['html'] || $this->ot['pre'] ) ) {
-			$text = wfEscapeWikiText( $text );
-		} elseif ( !$this->ot['msg'] && $found ) {
-			if ( $noargs ) {
-				$assocArgs = array();
-			} else {
-				# Clean up argument array
-				$assocArgs = self::createAssocArgs($args);
-				# Add a new element to the templace recursion path
-				$this->mTemplatePath[$part1] = 1;
-			}
-
-			if ( !$noparse ) {
-				# If there are any <onlyinclude> tags, only include them
-				if ( in_string( '<onlyinclude>', $text ) && in_string( '</onlyinclude>', $text ) ) {
-					$replacer = new OnlyIncludeReplacer;
-					StringUtils::delimiterReplaceCallback( '<onlyinclude>', '</onlyinclude>',
-						array( &$replacer, 'replace' ), $text );
-					$text = $replacer->output;
-				}
-				# Remove <noinclude> sections and <includeonly> tags
-				$text = StringUtils::delimiterReplace( '<noinclude>', '</noinclude>', '', $text );
-				$text = strtr( $text, array( '<includeonly>' => '' , '</includeonly>' => '' ) );
-
-				if( $this->ot['html'] || $this->ot['pre'] ) {
-					# Strip <nowiki>, <pre>, etc.
-					$text = $this->strip( $text, $this->mStripState );
-					if ( $this->ot['html'] ) {
-						$text = Sanitizer::removeHTMLtags( $text, array( &$this, 'replaceVariables' ), $assocArgs );
-					} elseif ( $this->ot['pre'] && $this->mOptions->getRemoveComments() ) {
-						$text = Sanitizer::removeHTMLcomments( $text );
-					}
-				}
-				$text = $this->replaceVariables( $text, $assocArgs );
-
-				# If the template begins with a table or block-level
-				# element, it should be treated as beginning a new line.
-				if (!$piece['lineStart'] && preg_match('/^(?:{\\||:|;|#|\*)/', $text)) /*}*/{
-					$text = "\n" . $text;
-				}
-			} elseif ( !$noargs ) {
-				# $noparse and !$noargs
-				# Just replace the arguments, not any double-brace items
-				# This is used for rendered interwiki transclusion
-				$text = $this->replaceVariables( $text, $assocArgs, true );
-			}
-		}
-		# Prune lower levels off the recursion check path
-		$this->mTemplatePath = $lastPathLevel;
-
-		if ( $found && !$this->incrementIncludeSize( 'post-expand', strlen( $text ) ) ) {
-			# Error, oversize inclusion
-			$text = $linestart .
-				"[[$titleText]]<!-- WARNING: template omitted, post-expand include size too large -->";
-			$noparse = true;
-			$noargs = true;
-		}
-
-		if ( !$found ) {
-			wfProfileOut( $fname );
-			return $piece['text'];
-		} else {
-			wfProfileIn( __METHOD__ . '-placeholders' );
-			if ( $isHTML ) {
-				# Replace raw HTML by a placeholder
-				# Add a blank line preceding, to prevent it from mucking up
-				# immediately preceding headings
-				$text = "\n\n" . $this->insertStripItem( $text, $this->mStripState );
-			} else {
-				# replace ==section headers==
-				# XXX this needs to go away once we have a better parser.
-				if ( !$this->ot['wiki'] && !$this->ot['pre'] && $replaceHeadings ) {
-					if( !is_null( $title ) )
-						$encodedname = base64_encode($title->getPrefixedDBkey());
-					else
-						$encodedname = base64_encode("");
-					$m = preg_split('/(^={1,6}.*?={1,6}\s*?$)/m', $text, -1,
-						PREG_SPLIT_DELIM_CAPTURE);
-					$text = '';
-					$nsec = $headingOffset;
-
-					for( $i = 0; $i < count($m); $i += 2 ) {
-						$text .= $m[$i];
-						if (!isset($m[$i + 1]) || $m[$i + 1] == "") continue;
-						$hl = $m[$i + 1];
-						if( strstr($hl, "<!--MWTEMPLATESECTION") ) {
-							$text .= $hl;
-							continue;
-						}
-						$m2 = array();
-						preg_match('/^(={1,6})(.*?)(={1,6}\s*?)$/m', $hl, $m2);
-						$text .= $m2[1] . $m2[2] . "<!--MWTEMPLATESECTION="
-							. $encodedname . "&" . base64_encode("$nsec") . "-->" . $m2[3];
-
-						$nsec++;
-					}
-				}
-			}
-			wfProfileOut( __METHOD__ . '-placeholders' );
-		}
-
-		# Prune lower levels off the recursion check path
-		$this->mTemplatePath = $lastPathLevel;
-
-		if ( !$found ) {
-			wfProfileOut( $fname );
-			return $piece['text'];
-		} else {
-			wfProfileOut( $fname );
-			return $text;
-		}
-	}
-
-	/**
-	 * Fetch the unparsed text of a template and register a reference to it.
-	 */
-	function fetchTemplateAndTitle( $title ) {
-		$templateCb = $this->mOptions->getTemplateCallback();
-		$stuff = call_user_func( $templateCb, $title, $this );
-		$text = $stuff['text'];
-		$finalTitle = isset( $stuff['finalTitle'] ) ? $stuff['finalTitle'] : $title;
-		if ( isset( $stuff['deps'] ) ) {
-			foreach ( $stuff['deps'] as $dep ) {
-				$this->mOutput->addTemplate( $dep['title'], $dep['page_id'], $dep['rev_id'] );
-			}
-		}
-		return array($text,$finalTitle);
-	}
-
-	function fetchTemplate( $title ) {
-		$rv = $this->fetchTemplateAndtitle($title);
-		return $rv[0];
-	}
-
-	/**
-	 * Static function to get a template
-	 * Can be overridden via ParserOptions::setTemplateCallback().
-	 *
-	 * Returns an associative array:
-	 *    text          The unparsed template text
-	 *    finalTitle    (Optional) The title after following redirects
-	 *    deps          (Optional) An array of associative array dependencies:
-	 *                       title:    The dependency title, to be registered in templatelinks
-	 *                       page_id:  The page_id of the title
-	 *                       rev_id:   The revision ID loaded
-	 */
-	static function statelessFetchTemplate( $title, $parser=false ) {
-		$text = $skip = false;
-		$finalTitle = $title;
-		$deps = array();
-
-		// Loop to fetch the article, with up to 1 redirect
-		for ( $i = 0; $i < 2 && is_object( $title ); $i++ ) {
-			# Give extensions a chance to select the revision instead
-			$id = false; // Assume current
-			wfRunHooks( 'BeforeParserFetchTemplateAndtitle', array( $parser, &$title, &$skip, &$id ) );
-
-			if( $skip ) {
-				$text = false;
-				$deps[] = array(
-					'title' => $title,
-					'page_id' => $title->getArticleID(),
-					'rev_id' => null );
-				break;
-			}
-			$rev = $id ? Revision::newFromId( $id ) : Revision::newFromTitle( $title );
-			$rev_id = $rev ? $rev->getId() : 0;
-
-			$deps[] = array(
-				'title' => $title,
-				'page_id' => $title->getArticleID(),
-				'rev_id' => $rev_id );
-
-			if( $rev ) {
-				$text = $rev->getText();
-			} elseif( $title->getNamespace() == NS_MEDIAWIKI ) {
-				global $wgLang;
-				$message = $wgLang->lcfirst( $title->getText() );
-				$text = wfMsgForContentNoTrans( $message );
-				if( wfEmptyMsg( $message, $text ) ) {
-					$text = false;
-					break;
-				}
-			} else {
-				break;
-			}
-			if ( $text === false ) {
-				break;
-			}
-			// Redirect?
-			$finalTitle = $title;
-			$title = Title::newFromRedirect( $text );
-		}
-		return array(
-			'text' => $text,
-			'finalTitle' => $finalTitle,
-			'deps' => $deps );
-	}
-
-	/**
-	 * Transclude an interwiki link.
-	 */
-	function interwikiTransclude( $title, $action ) {
-		global $wgEnableScaryTranscluding;
-
-		if (!$wgEnableScaryTranscluding)
-			return wfMsg('scarytranscludedisabled');
-
-		$url = $title->getFullUrl( "action=$action" );
-
-		if (strlen($url) > 255)
-			return wfMsg('scarytranscludetoolong');
-		return $this->fetchScaryTemplateMaybeFromCache($url);
-	}
-
-	function fetchScaryTemplateMaybeFromCache($url) {
-		global $wgTranscludeCacheExpiry;
-		$dbr = wfGetDB(DB_SLAVE);
-		$obj = $dbr->selectRow('transcache', array('tc_time', 'tc_contents'),
-				array('tc_url' => $url));
-		if ($obj) {
-			$time = $obj->tc_time;
-			$text = $obj->tc_contents;
-			if ($time && time() < $time + $wgTranscludeCacheExpiry ) {
-				return $text;
-			}
-		}
-
-		$text = Http::get($url);
-		if (!$text)
-			return wfMsg('scarytranscludefailed', $url);
-
-		$dbw = wfGetDB(DB_MASTER);
-		$dbw->replace('transcache', array('tc_url'), array(
-			'tc_url' => $url,
-			'tc_time' => time(),
-			'tc_contents' => $text));
-		return $text;
-	}
-
-
-	/**
-	 * Triple brace replacement -- used for template arguments
-	 * @private
-	 */
-	function argSubstitution( $matches ) {
-		$arg = trim( $matches['title'] );
-		$text = $matches['text'];
-		$inputArgs = end( $this->mArgStack );
-
-		if ( array_key_exists( $arg, $inputArgs ) ) {
-			$text = $inputArgs[$arg];
-		} else if (($this->mOutputType == self::OT_HTML || $this->mOutputType == self::OT_PREPROCESS ) &&
-		null != $matches['parts'] && count($matches['parts']) > 0) {
-			$text = $matches['parts'][0];
-		}
-		if ( !$this->incrementIncludeSize( 'arg', strlen( $text ) ) ) {
-			$text = $matches['text'] .
-				'<!-- WARNING: argument omitted, expansion size too large -->';
-		}
-
-		return $text;
-	}
-
-	/**
-	 * Increment an include size counter
-	 *
-	 * @param string $type The type of expansion
-	 * @param integer $size The size of the text
-	 * @return boolean False if this inclusion would take it over the maximum, true otherwise
-	 */
-	function incrementIncludeSize( $type, $size ) {
-		if ( $this->mIncludeSizes[$type] + $size > $this->mOptions->getMaxIncludeSize() ) {
-			return false;
-		} else {
-			$this->mIncludeSizes[$type] += $size;
-			return true;
-		}
-	}
-
-	/**
-	 * Detect __NOGALLERY__ magic word and set a placeholder
-	 */
-	function stripNoGallery( &$text ) {
-		# if the string __NOGALLERY__ (not case-sensitive) occurs in the HTML,
-		# do not add TOC
-		$mw = MagicWord::get( 'nogallery' );
-		$this->mOutput->mNoGallery = $mw->matchAndRemove( $text ) ;
-	}
-
-	/**
-	 * Find the first __TOC__ magic word and set a <!--MWTOC-->
-	 * placeholder that will then be replaced by the real TOC in
-	 * ->formatHeadings, this works because at this points real
-	 * comments will have already been discarded by the sanitizer.
-	 *
-	 * Any additional __TOC__ magic words left over will be discarded
-	 * as there can only be one TOC on the page.
-	 */
-	function stripToc( $text ) {
-		# if the string __NOTOC__ (not case-sensitive) occurs in the HTML,
-		# do not add TOC
-		$mw = MagicWord::get( 'notoc' );
-		if( $mw->matchAndRemove( $text ) ) {
-			$this->mShowToc = false;
-		}
-
-		$mw = MagicWord::get( 'toc' );
-		if( $mw->match( $text ) ) {
-			$this->mShowToc = true;
-			$this->mForceTocPosition = true;
-
-			// Set a placeholder. At the end we'll fill it in with the TOC.
-			$text = $mw->replace( '<!--MWTOC-->', $text, 1 );
-
-			// Only keep the first one.
-			$text = $mw->replace( '', $text );
-		}
-		return $text;
-	}
-
-	/**
-	 * This function accomplishes several tasks:
-	 * 1) Auto-number headings if that option is enabled
-	 * 2) Add an [edit] link to sections for users who have enabled the option and can edit the page
-	 * 3) Add a Table of contents on the top for users who have enabled the option
-	 * 4) Auto-anchor headings
-	 *
-	 * It loops through all headlines, collects the necessary data, then splits up the
-	 * string and re-inserts the newly formatted headlines.
-	 *
-	 * @param string $text
-	 * @param boolean $isMain
-	 * @private
-	 */
-	function formatHeadings( $text, $isMain=true ) {
-		global $wgMaxTocLevel, $wgContLang;
-
-		$doNumberHeadings = $this->mOptions->getNumberHeadings();
-		if( !$this->mTitle->quickUserCan( 'edit' ) ) {
-			$showEditLink = 0;
-		} else {
-			$showEditLink = $this->mOptions->getEditSection();
-		}
-
-		# Inhibit editsection links if requested in the page
-		$esw =& MagicWord::get( 'noeditsection' );
-		if( $esw->matchAndRemove( $text ) ) {
-			$showEditLink = 0;
-		}
-
-		# Get all headlines for numbering them and adding funky stuff like [edit]
-		# links - this is for later, but we need the number of headlines right now
-		$matches = array();
-		$numMatches = preg_match_all( '/<H(?P<level>[1-6])(?P<attrib>.*?'.'>)(?P<header>.*?)<\/H[1-6] *>/i', $text, $matches );
-
-		# if there are fewer than 4 headlines in the article, do not show TOC
-		# unless it's been explicitly enabled.
-		$enoughToc = $this->mShowToc &&
-			(($numMatches >= 4) || $this->mForceTocPosition);
-
-		# Allow user to stipulate that a page should have a "new section"
-		# link added via __NEWSECTIONLINK__
-		$mw =& MagicWord::get( 'newsectionlink' );
-		if( $mw->matchAndRemove( $text ) )
-			$this->mOutput->setNewSection( true );
-
-		# if the string __FORCETOC__ (not case-sensitive) occurs in the HTML,
-		# override above conditions and always show TOC above first header
-		$mw =& MagicWord::get( 'forcetoc' );
-		if ($mw->matchAndRemove( $text ) ) {
-			$this->mShowToc = true;
-			$enoughToc = true;
-		}
-
-		# We need this to perform operations on the HTML
-		$sk = $this->mOptions->getSkin();
-
-		# headline counter
-		$headlineCount = 0;
-		$sectionCount = 0; # headlineCount excluding template sections
-		$numVisible = 0;
-
-		# Ugh .. the TOC should have neat indentation levels which can be
-		# passed to the skin functions. These are determined here
-		$toc = '';
-		$full = '';
-		$head = array();
-		$sublevelCount = array();
-		$levelCount = array();
-		$toclevel = 0;
-		$level = 0;
-		$prevlevel = 0;
-		$toclevel = 0;
-		$prevtoclevel = 0;
-		$tocraw = array();
-
-		foreach( $matches[3] as $headline ) {
-			$istemplate = 0;
-			$templatetitle = '';
-			$templatesection = 0;
-			$numbering = '';
-			$mat = array();
-			if (preg_match("/<!--MWTEMPLATESECTION=([^&]+)&([^_]+)-->/", $headline, $mat)) {
-				$istemplate = 1;
-				$templatetitle = base64_decode($mat[1]);
-				$templatesection = 1 + (int)base64_decode($mat[2]);
-				$headline = preg_replace("/<!--MWTEMPLATESECTION=([^&]+)&([^_]+)-->/", "", $headline);
-			}
-
-			if( $toclevel ) {
-				$prevlevel = $level;
-				$prevtoclevel = $toclevel;
-			}
-			$level = $matches[1][$headlineCount];
-
-			if( $doNumberHeadings || $enoughToc ) {
-
-				if ( $level > $prevlevel ) {
-					# Increase TOC level
-					$toclevel++;
-					$sublevelCount[$toclevel] = 0;
-					if( $toclevel<$wgMaxTocLevel ) {
-						$prevtoclevel = $toclevel;
-						$toc .= $sk->tocIndent();
-						$numVisible++;
-					}
-				}
-				elseif ( $level < $prevlevel && $toclevel > 1 ) {
-					# Decrease TOC level, find level to jump to
-
-					if ( $toclevel == 2 && $level <= $levelCount[1] ) {
-						# Can only go down to level 1
-						$toclevel = 1;
-					} else {
-						for ($i = $toclevel; $i > 0; $i--) {
-							if ( $levelCount[$i] == $level ) {
-								# Found last matching level
-								$toclevel = $i;
-								break;
-							}
-							elseif ( $levelCount[$i] < $level ) {
-								# Found first matching level below current level
-								$toclevel = $i + 1;
-								break;
-							}
-						}
-					}
-					if( $toclevel<$wgMaxTocLevel ) {
-						if($prevtoclevel < $wgMaxTocLevel) {
-							# Unindent only if the previous toc level was shown :p
-							$toc .= $sk->tocUnindent( $prevtoclevel - $toclevel );
-						} else {
-							$toc .= $sk->tocLineEnd();
-						}
-					}
-				}
-				else {
-					# No change in level, end TOC line
-					if( $toclevel<$wgMaxTocLevel ) {
-						$toc .= $sk->tocLineEnd();
-					}
-				}
-
-				$levelCount[$toclevel] = $level;
-
-				# count number of headlines for each level
-				@$sublevelCount[$toclevel]++;
-				$dot = 0;
-				for( $i = 1; $i <= $toclevel; $i++ ) {
-					if( !empty( $sublevelCount[$i] ) ) {
-						if( $dot ) {
-							$numbering .= '.';
-						}
-						$numbering .= $wgContLang->formatNum( $sublevelCount[$i] );
-						$dot = 1;
-					}
-				}
-			}
-
-			# The canonized header is a version of the header text safe to use for links
-			# Avoid insertion of weird stuff like <math> by expanding the relevant sections
-			$canonized_headline = $this->mStripState->unstripBoth( $headline );
-
-			# Remove link placeholders by the link text.
-			#     <!--LINK number-->
-			# turns into
-			#     link text with suffix
-			$canonized_headline = preg_replace( '/<!--LINK ([0-9]*)-->/e',
-							    "\$this->mLinkHolders['texts'][\$1]",
-							    $canonized_headline );
-			$canonized_headline = preg_replace( '/<!--IWLINK ([0-9]*)-->/e',
-							    "\$this->mInterwikiLinkHolders['texts'][\$1]",
-							    $canonized_headline );
-
-			# Strip out HTML (other than plain <sup> and <sub>: bug 8393)
-			$tocline = preg_replace(
-				array( '#<(?!/?(sup|sub)).*?'.'>#', '#<(/?(sup|sub)).*?'.'>#' ),
-				array( '',                          '<$1>'),
-				$canonized_headline
-			);
-			$tocline = trim( $tocline );
-
-			# For the anchor, strip out HTML-y stuff period
-			$canonized_headline = preg_replace( '/<.*?'.'>/', '', $canonized_headline );
-			$canonized_headline = trim( $canonized_headline );
-
-			# Save headline for section edit hint before it's escaped
-			$headline_hint = $canonized_headline;
-			$canonized_headline = Sanitizer::escapeId( $canonized_headline );
-			$refers[$headlineCount] = $canonized_headline;
-
-			# count how many in assoc. array so we can track dupes in anchors
-			isset( $refers[$canonized_headline] ) ? $refers[$canonized_headline]++ : $refers[$canonized_headline] = 1;
-			$refcount[$headlineCount]=$refers[$canonized_headline];
-
-			# Don't number the heading if it is the only one (looks silly)
-			if( $doNumberHeadings && count( $matches[3] ) > 1) {
-				# the two are different if the line contains a link
-				$headline=$numbering . ' ' . $headline;
-			}
-
-			# Create the anchor for linking from the TOC to the section
-			$anchor = $canonized_headline;
-			if($refcount[$headlineCount] > 1 ) {
-				$anchor .= '_' . $refcount[$headlineCount];
-			}
-			if( $enoughToc && ( !isset($wgMaxTocLevel) || $toclevel<$wgMaxTocLevel ) ) {
-				$toc .= $sk->tocLine($anchor, $tocline, $numbering, $toclevel);
-				$tocraw[] = array( 'toclevel' => $toclevel, 'level' => $level, 'line' => $tocline, 'number' => $numbering );
-			}
-			# give headline the correct <h#> tag
-			if( $showEditLink && ( !$istemplate || $templatetitle !== "" ) ) {
-				if( $istemplate )
-					$editlink = $sk->editSectionLinkForOther($templatetitle, $templatesection);
-				else
-					$editlink = $sk->editSectionLink($this->mTitle, $sectionCount+1, $headline_hint);
-			} else {
-				$editlink = '';
-			}
-			$head[$headlineCount] = $sk->makeHeadline( $level, $matches['attrib'][$headlineCount], $anchor, $headline, $editlink );
-
-			$headlineCount++;
-			if( !$istemplate )
-				$sectionCount++;
-		}
-
-		$this->mOutput->setSections( $tocraw );
-
-		# Never ever show TOC if no headers
-		if( $numVisible < 1 ) {
-			$enoughToc = false;
-		}
-
-		if( $enoughToc ) {
-			if( $prevtoclevel > 0 && $prevtoclevel < $wgMaxTocLevel ) {
-				$toc .= $sk->tocUnindent( $prevtoclevel - 1 );
-			}
-			$toc = $sk->tocList( $toc );
-		}
-
-		# split up and insert constructed headlines
-
-		$blocks = preg_split( '/<H[1-6].*?' . '>.*?<\/H[1-6]>/i', $text );
-		$i = 0;
-
-		foreach( $blocks as $block ) {
-			if( $showEditLink && $headlineCount > 0 && $i == 0 && $block != "\n" ) {
-				# This is the [edit] link that appears for the top block of text when
-				# section editing is enabled
-
-				# Disabled because it broke block formatting
-				# For example, a bullet point in the top line
-				# $full .= $sk->editSectionLink(0);
-			}
-			$full .= $block;
-			if( $enoughToc && !$i && $isMain && !$this->mForceTocPosition ) {
-				# Top anchor now in skin
-				$full = $full.$toc;
-			}
-
-			if( !empty( $head[$i] ) ) {
-				$full .= $head[$i];
-			}
-			$i++;
-		}
-		if( $this->mForceTocPosition ) {
-			return str_replace( '<!--MWTOC-->', $toc, $full );
-		} else {
-			return $full;
-		}
-	}
-
-	/**
-	 * Transform wiki markup when saving a page by doing \r\n -> \n
-	 * conversion, substitting signatures, {{subst:}} templates, etc.
-	 *
-	 * @param string $text the text to transform
-	 * @param Title &$title the Title object for the current article
-	 * @param User &$user the User object describing the current user
-	 * @param ParserOptions $options parsing options
-	 * @param bool $clearState whether to clear the parser state first
-	 * @return string the altered wiki markup
-	 * @public
-	 */
-	function preSaveTransform( $text, &$title, $user, $options, $clearState = true ) {
-		$this->mOptions = $options;
-		$this->mTitle =& $title;
-		$this->setOutputType( self::OT_WIKI );
-
-		if ( $clearState ) {
-			$this->clearState();
-		}
-
-		$stripState = new StripState;
-		$pairs = array(
-			"\r\n" => "\n",
-		);
-		$text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text );
-		$text = $this->strip( $text, $stripState, true, array( 'gallery' ) );
-		$text = $this->pstPass2( $text, $stripState, $user );
-		$text = $stripState->unstripBoth( $text );
-		return $text;
-	}
-
-	/**
-	 * Pre-save transform helper function
-	 * @private
-	 */
-	function pstPass2( $text, &$stripState, $user ) {
-		global $wgContLang, $wgLocaltimezone;
-
-		/* Note: This is the timestamp saved as hardcoded wikitext to
-		 * the database, we use $wgContLang here in order to give
-		 * everyone the same signature and use the default one rather
-		 * than the one selected in each user's preferences.
-		 */
-		if ( isset( $wgLocaltimezone ) ) {
-			$oldtz = getenv( 'TZ' );
-			putenv( 'TZ='.$wgLocaltimezone );
-		}
-		$d = $wgContLang->timeanddate( date( 'YmdHis' ), false, false) .
-		  ' (' . date( 'T' ) . ')';
-		if ( isset( $wgLocaltimezone ) ) {
-			putenv( 'TZ='.$oldtz );
-		}
-
-		# Variable replacement
-		# Because mOutputType is OT_WIKI, this will only process {{subst:xxx}} type tags
-		$text = $this->replaceVariables( $text );
-
-		# Strip out <nowiki> etc. added via replaceVariables
-		$text = $this->strip( $text, $stripState, false, array( 'gallery' ) );
-
-		# Signatures
-		$sigText = $this->getUserSig( $user );
-		$text = strtr( $text, array(
-			'~~~~~' => $d,
-			'~~~~' => "$sigText $d",
-			'~~~' => $sigText
-		) );
-
-		# Context links: [[|name]] and [[name (context)|]]
-		#
-		global $wgLegalTitleChars;
-		$tc = "[$wgLegalTitleChars]";
-		$nc = '[ _0-9A-Za-z\x80-\xff]'; # Namespaces can use non-ascii!
-
-		$p1 = "/\[\[(:?$nc+:|:|)($tc+?)( \\($tc+\\))\\|]]/";		# [[ns:page (context)|]]
-		$p3 = "/\[\[(:?$nc+:|:|)($tc+?)( \\($tc+\\)|)(, $tc+|)\\|]]/";	# [[ns:page (context), context|]]
-		$p2 = "/\[\[\\|($tc+)]]/";					# [[|page]]
-
-		# try $p1 first, to turn "[[A, B (C)|]]" into "[[A, B (C)|A, B]]"
-		$text = preg_replace( $p1, '[[\\1\\2\\3|\\2]]', $text );
-		$text = preg_replace( $p3, '[[\\1\\2\\3\\4|\\2]]', $text );
-
-		$t = $this->mTitle->getText();
-		$m = array();
-		if ( preg_match( "/^($nc+:|)$tc+?( \\($tc+\\))$/", $t, $m ) ) {
-			$text = preg_replace( $p2, "[[$m[1]\\1$m[2]|\\1]]", $text );
-		} elseif ( preg_match( "/^($nc+:|)$tc+?(, $tc+|)$/", $t, $m ) && '' != "$m[1]$m[2]" ) {
-			$text = preg_replace( $p2, "[[$m[1]\\1$m[2]|\\1]]", $text );
-		} else {
-			# if there's no context, don't bother duplicating the title
-			$text = preg_replace( $p2, '[[\\1]]', $text );
-		}
-
-		# Trim trailing whitespace
-		$text = rtrim( $text );
-
-		return $text;
-	}
-
-	/**
-	 * Fetch the user's signature text, if any, and normalize to
-	 * validated, ready-to-insert wikitext.
-	 *
-	 * @param User $user
-	 * @return string
-	 * @private
-	 */
-	function getUserSig( &$user ) {
-		global $wgMaxSigChars;
-
-		$username = $user->getName();
-		$nickname = $user->getOption( 'nickname' );
-		$nickname = $nickname === '' ? $username : $nickname;
-
-		if( mb_strlen( $nickname ) > $wgMaxSigChars ) {
-			$nickname = $username;
-			wfDebug( __METHOD__ . ": $username has overlong signature.\n" );
-		} elseif( $user->getBoolOption( 'fancysig' ) !== false ) {
-			# Sig. might contain markup; validate this
-			if( $this->validateSig( $nickname ) !== false ) {
-				# Validated; clean up (if needed) and return it
-				return $this->cleanSig( $nickname, true );
-			} else {
-				# Failed to validate; fall back to the default
-				$nickname = $username;
-				wfDebug( "Parser::getUserSig: $username has bad XML tags in signature.\n" );
-			}
-		}
-
-		// Make sure nickname doesnt get a sig in a sig
-		$nickname = $this->cleanSigInSig( $nickname );
-
-		# If we're still here, make it a link to the user page
-		$userText = wfEscapeWikiText( $username );
-		$nickText = wfEscapeWikiText( $nickname );
-		if ( $user->isAnon() )  {
-			return wfMsgExt( 'signature-anon', array( 'content', 'parsemag' ), $userText, $nickText );
-		} else {
-			return wfMsgExt( 'signature', array( 'content', 'parsemag' ), $userText, $nickText );
-		}
-	}
-
-	/**
-	 * Check that the user's signature contains no bad XML
-	 *
-	 * @param string $text
-	 * @return mixed An expanded string, or false if invalid.
-	 */
-	function validateSig( $text ) {
-		return( wfIsWellFormedXmlFragment( $text ) ? $text : false );
-	}
-
-	/**
-	 * Clean up signature text
-	 *
-	 * 1) Strip ~~~, ~~~~ and ~~~~~ out of signatures @see cleanSigInSig
-	 * 2) Substitute all transclusions
-	 *
-	 * @param string $text
-	 * @param $parsing Whether we're cleaning (preferences save) or parsing
-	 * @return string Signature text
-	 */
-	function cleanSig( $text, $parsing = false ) {
-		global $wgTitle;
-		$this->startExternalParse( $this->mTitle, new ParserOptions(), $parsing ? self::OT_WIKI : self::OT_MSG );
-
-		$substWord = MagicWord::get( 'subst' );
-		$substRegex = '/\{\{(?!(?:' . $substWord->getBaseRegex() . '))/x' . $substWord->getRegexCase();
-		$substText = '{{' . $substWord->getSynonym( 0 );
-
-		$text = preg_replace( $substRegex, $substText, $text );
-		$text = $this->cleanSigInSig( $text );
-		$text = $this->replaceVariables( $text );
-
-		$this->clearState();
-		return $text;
-	}
-
-	/**
-	 * Strip ~~~, ~~~~ and ~~~~~ out of signatures
-	 * @param string $text
-	 * @return string Signature text with /~{3,5}/ removed
-	 */
-	function cleanSigInSig( $text ) {
-		$text = preg_replace( '/~{3,5}/', '', $text );
-		return $text;
-	}
-
-	/**
-	 * Set up some variables which are usually set up in parse()
-	 * so that an external function can call some class members with confidence
-	 * @public
-	 */
-	function startExternalParse( &$title, $options, $outputType, $clearState = true ) {
-		$this->mTitle =& $title;
-		$this->mOptions = $options;
-		$this->setOutputType( $outputType );
-		if ( $clearState ) {
-			$this->clearState();
-		}
-	}
-
-	/**
-	 * Transform a MediaWiki message by replacing magic variables.
-	 *
-	 * @param string $text the text to transform
-	 * @param ParserOptions $options  options
-	 * @return string the text with variables substituted
-	 * @public
-	 */
-	function transformMsg( $text, $options ) {
-		global $wgTitle;
-		static $executing = false;
-
-		$fname = "Parser::transformMsg";
-
-		# Guard against infinite recursion
-		if ( $executing ) {
-			return $text;
-		}
-		$executing = true;
-
-		wfProfileIn($fname);
-
-		if ( $wgTitle && !( $wgTitle instanceof FakeTitle ) ) {
-			$this->mTitle = $wgTitle;
-		} else {
-			$this->mTitle = Title::newFromText('msg');
-		}
-		$this->mOptions = $options;
-		$this->setOutputType( self::OT_MSG );
-		$this->clearState();
-		$text = $this->replaceVariables( $text );
-
-		$executing = false;
-		wfProfileOut($fname);
-		return $text;
-	}
-
-	/**
-	 * Create an HTML-style tag, e.g. <yourtag>special text</yourtag>
-	 * The callback should have the following form:
-	 *    function myParserHook( $text, $params, &$parser ) { ... }
-	 *
-	 * Transform and return $text. Use $parser for any required context, e.g. use
-	 * $parser->getTitle() and $parser->getOptions() not $wgTitle or $wgOut->mParserOptions
-	 *
-	 * @public
-	 *
-	 * @param mixed $tag The tag to use, e.g. 'hook' for <hook>
-	 * @param mixed $callback The callback function (and object) to use for the tag
-	 *
-	 * @return The old value of the mTagHooks array associated with the hook
-	 */
-	function setHook( $tag, $callback ) {
-		$tag = strtolower( $tag );
-		$oldVal = isset( $this->mTagHooks[$tag] ) ? $this->mTagHooks[$tag] : null;
-		$this->mTagHooks[$tag] = $callback;
-
-		return $oldVal;
-	}
-
-	function setTransparentTagHook( $tag, $callback ) {
-		$tag = strtolower( $tag );
-		$oldVal = isset( $this->mTransparentTagHooks[$tag] ) ? $this->mTransparentTagHooks[$tag] : null;
-		$this->mTransparentTagHooks[$tag] = $callback;
-
-		return $oldVal;
-	}
-
-	/**
-	 * Create a function, e.g. {{sum:1|2|3}}
-	 * The callback function should have the form:
-	 *    function myParserFunction( &$parser, $arg1, $arg2, $arg3 ) { ... }
-	 *
-	 * The callback may either return the text result of the function, or an array with the text
-	 * in element 0, and a number of flags in the other elements. The names of the flags are
-	 * specified in the keys. Valid flags are:
-	 *   found                     The text returned is valid, stop processing the template. This
-	 *                             is on by default.
-	 *   nowiki                    Wiki markup in the return value should be escaped
-	 *   noparse                   Unsafe HTML tags should not be stripped, etc.
-	 *   noargs                    Don't replace triple-brace arguments in the return value
-	 *   isHTML                    The returned text is HTML, armour it against wikitext transformation
-	 *
-	 * @public
-	 *
-	 * @param string $id The magic word ID
-	 * @param mixed $callback The callback function (and object) to use
-	 * @param integer $flags a combination of the following flags:
-	 *                SFH_NO_HASH No leading hash, i.e. {{plural:...}} instead of {{#if:...}}
-	 *
-	 * @return The old callback function for this name, if any
-	 */
-	function setFunctionHook( $id, $callback, $flags = 0 ) {
-		$oldVal = isset( $this->mFunctionHooks[$id] ) ? $this->mFunctionHooks[$id] : null;
-		$this->mFunctionHooks[$id] = $callback;
-
-		# Add to function cache
-		$mw = MagicWord::get( $id );
-		if( !$mw )
-			throw new MWException( 'Parser::setFunctionHook() expecting a magic word identifier.' );
-
-		$synonyms = $mw->getSynonyms();
-		$sensitive = intval( $mw->isCaseSensitive() );
-
-		foreach ( $synonyms as $syn ) {
-			# Case
-			if ( !$sensitive ) {
-				$syn = strtolower( $syn );
-			}
-			# Add leading hash
-			if ( !( $flags & SFH_NO_HASH ) ) {
-				$syn = '#' . $syn;
-			}
-			# Remove trailing colon
-			if ( substr( $syn, -1, 1 ) == ':' ) {
-				$syn = substr( $syn, 0, -1 );
-			}
-			$this->mFunctionSynonyms[$sensitive][$syn] = $id;
-		}
-		return $oldVal;
-	}
-
-	/**
-	 * Get all registered function hook identifiers
-	 *
-	 * @return array
-	 */
-	function getFunctionHooks() {
-		return array_keys( $this->mFunctionHooks );
-	}
-
-	/**
-	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
-	 * Placeholders created in Skin::makeLinkObj()
-	 * Returns an array of links found, indexed by PDBK:
-	 *  0 - broken
-	 *  1 - normal link
-	 *  2 - stub
-	 * $options is a bit field, RLH_FOR_UPDATE to select for update
-	 */
-	function replaceLinkHolders( &$text, $options = 0 ) {
-		global $wgUser;
-		global $wgContLang;
-
-		$fname = 'Parser::replaceLinkHolders';
-		wfProfileIn( $fname );
-
-		$pdbks = array();
-		$colours = array();
-		$sk = $this->mOptions->getSkin();
-		$linkCache = LinkCache::singleton();
-
-		if ( !empty( $this->mLinkHolders['namespaces'] ) ) {
-			wfProfileIn( $fname.'-check' );
-			$dbr = wfGetDB( DB_SLAVE );
-			$page = $dbr->tableName( 'page' );
-			$threshold = $wgUser->getOption('stubthreshold');
-
-			# Sort by namespace
-			asort( $this->mLinkHolders['namespaces'] );
-
-			# Generate query
-			$query = false;
-			$current = null;
-			foreach ( $this->mLinkHolders['namespaces'] as $key => $ns ) {
-				# Make title object
-				$title = $this->mLinkHolders['titles'][$key];
-
-				# Skip invalid entries.
-				# Result will be ugly, but prevents crash.
-				if ( is_null( $title ) ) {
-					continue;
-				}
-				$pdbk = $pdbks[$key] = $title->getPrefixedDBkey();
-
-				# Check if it's a static known link, e.g. interwiki
-				if ( $title->isAlwaysKnown() ) {
-					$colours[$pdbk] = 1;
-				} elseif ( ( $id = $linkCache->getGoodLinkID( $pdbk ) ) != 0 ) {
-					$colours[$pdbk] = 1;
-					$this->mOutput->addLink( $title, $id );
-				} elseif ( $linkCache->isBadLink( $pdbk ) ) {
-					$colours[$pdbk] = 0;
-				} elseif ( $title->getNamespace() == NS_SPECIAL && !SpecialPage::exists( $pdbk ) ) {
-					$colours[$pdbk] = 0;
-				} else {
-					# Not in the link cache, add it to the query
-					if ( !isset( $current ) ) {
-						$current = $ns;
-						$query =  "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect";
-						$query .= " FROM $page WHERE (page_namespace=$ns AND page_title IN(";
-					} elseif ( $current != $ns ) {
-						$current = $ns;
-						$query .= ")) OR (page_namespace=$ns AND page_title IN(";
-					} else {
-						$query .= ', ';
-					}
-
-					$query .= $dbr->addQuotes( $this->mLinkHolders['dbkeys'][$key] );
-				}
-			}
-			if ( $query ) {
-				$query .= '))';
-				if ( $options & RLH_FOR_UPDATE ) {
-					$query .= ' FOR UPDATE';
-				}
-
-				$res = $dbr->query( $query, $fname );
-
-				# Fetch data and form into an associative array
-				# non-existent = broken
-				# 1 = known
-				# 2 = stub
-				while ( $s = $dbr->fetchObject($res) ) {
-					$title = Title::makeTitle( $s->page_namespace, $s->page_title );
-					$pdbk = $title->getPrefixedDBkey();
-					$linkCache->addGoodLinkObj( $s->page_id, $title, $s->page_len, $s->page_is_redirect );
-					$this->mOutput->addLink( $title, $s->page_id );
-
-					$colours[$pdbk] = ( $threshold == 0 || (
-								$s->page_len >= $threshold || # always true if $threshold <= 0
-							        $s->page_is_redirect ||
-							        !MWNamespace::isContent( $s->page_namespace ) )
-							    ? 1 : 2 );
-				}
-			}
-			wfProfileOut( $fname.'-check' );
-
-			# Do a second query for different language variants of links and categories
-			if( $wgContLang->hasVariants() ) {
-				$linkBatch = new LinkBatch();
-				$variantMap = array(); // maps $pdbkey_Variant => $keys (of link holders)
-				$categoryMap = array(); // maps $category_variant => $category (dbkeys)
-				$varCategories = array(); // category replacements oldDBkey => newDBkey
-
-				$categories = $this->mOutput->getCategoryLinks();
-
-				// Add variants of links to link batch
-				foreach ( $this->mLinkHolders['namespaces'] as $key => $ns ) {
-					$title = $this->mLinkHolders['titles'][$key];
-					if ( is_null( $title ) )
-						continue;
-
-					$pdbk = $title->getPrefixedDBkey();
-					$titleText = $title->getText();
-
-					// generate all variants of the link title text
-					$allTextVariants = $wgContLang->convertLinkToAllVariants($titleText);
-
-					// if link was not found (in first query), add all variants to query
-					if ( !isset($colours[$pdbk]) ){
-						foreach($allTextVariants as $textVariant){
-							if($textVariant != $titleText){
-								$variantTitle = Title::makeTitle( $ns, $textVariant );
-								if(is_null($variantTitle)) continue;
-								$linkBatch->addObj( $variantTitle );
-								$variantMap[$variantTitle->getPrefixedDBkey()][] = $key;
-							}
-						}
-					}
-				}
-
-				// process categories, check if a category exists in some variant
-				foreach( $categories as $category ){
-					$variants = $wgContLang->convertLinkToAllVariants($category);
-					foreach($variants as $variant){
-						if($variant != $category){
-							$variantTitle = Title::newFromDBkey( Title::makeName(NS_CATEGORY,$variant) );
-							if(is_null($variantTitle)) continue;
-							$linkBatch->addObj( $variantTitle );
-							$categoryMap[$variant] = $category;
-						}
-					}
-				}
-
-
-				if ( !$linkBatch->isEmpty() ){
-					// construct query
-					$titleClause = $linkBatch->constructSet('page', $dbr);
-
-					$variantQuery =  "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect";
-
-					$variantQuery .= " FROM $page WHERE $titleClause";
-					if ( $options & RLH_FOR_UPDATE ) {
-						$variantQuery .= ' FOR UPDATE';
-					}
-
-					$varRes = $dbr->query( $variantQuery, $fname );
-
-					// for each found variants, figure out link holders and replace
-					while ( $s = $dbr->fetchObject($varRes) ) {
-
-						$variantTitle = Title::makeTitle( $s->page_namespace, $s->page_title );
-						$varPdbk = $variantTitle->getPrefixedDBkey();
-						$vardbk = $variantTitle->getDBkey();
-
-						$holderKeys = array();
-						if(isset($variantMap[$varPdbk])){
-							$holderKeys = $variantMap[$varPdbk];
-							$linkCache->addGoodLinkObj( $s->page_id, $variantTitle, $s->page_len, $s->page_is_redirect );
-							$this->mOutput->addLink( $variantTitle, $s->page_id );
-						}
-
-						// loop over link holders
-						foreach($holderKeys as $key){
-							$title = $this->mLinkHolders['titles'][$key];
-							if ( is_null( $title ) ) continue;
-
-							$pdbk = $title->getPrefixedDBkey();
-
-							if(!isset($colours[$pdbk])){
-								// found link in some of the variants, replace the link holder data
-								$this->mLinkHolders['titles'][$key] = $variantTitle;
-								$this->mLinkHolders['dbkeys'][$key] = $variantTitle->getDBkey();
-
-								// set pdbk and colour
-								$pdbks[$key] = $varPdbk;
-								if ( $threshold >  0 ) {
-									$size = $s->page_len;
-									if ( $s->page_is_redirect || $s->page_namespace != 0 || $size >= $threshold ) {
-										$colours[$varPdbk] = 1;
-									} else {
-										$colours[$varPdbk] = 2;
-									}
-								}
-								else {
-									$colours[$varPdbk] = 1;
-								}
-							}
-						}
-
-						// check if the object is a variant of a category
-						if(isset($categoryMap[$vardbk])){
-							$oldkey = $categoryMap[$vardbk];
-							if($oldkey != $vardbk)
-								$varCategories[$oldkey]=$vardbk;
-						}
-					}
-
-					// rebuild the categories in original order (if there are replacements)
-					if(count($varCategories)>0){
-						$newCats = array();
-						$originalCats = $this->mOutput->getCategories();
-						foreach($originalCats as $cat => $sortkey){
-							// make the replacement
-							if( array_key_exists($cat,$varCategories) )
-								$newCats[$varCategories[$cat]] = $sortkey;
-							else $newCats[$cat] = $sortkey;
-						}
-						$this->mOutput->setCategoryLinks($newCats);
-					}
-				}
-			}
-
-			# Construct search and replace arrays
-			wfProfileIn( $fname.'-construct' );
-			$replacePairs = array();
-			foreach ( $this->mLinkHolders['namespaces'] as $key => $ns ) {
-				$pdbk = $pdbks[$key];
-				$searchkey = "<!--LINK $key-->";
-				$title = $this->mLinkHolders['titles'][$key];
-				if ( empty( $colours[$pdbk] ) ) {
-					$linkCache->addBadLinkObj( $title );
-					$colours[$pdbk] = 0;
-					$this->mOutput->addLink( $title, 0 );
-					$replacePairs[$searchkey] = $sk->makeBrokenLinkObj( $title,
-									$this->mLinkHolders['texts'][$key],
-									$this->mLinkHolders['queries'][$key] );
-				} elseif ( $colours[$pdbk] == 1 ) {
-					$replacePairs[$searchkey] = $sk->makeKnownLinkObj( $title,
-									$this->mLinkHolders['texts'][$key],
-									$this->mLinkHolders['queries'][$key] );
-				} elseif ( $colours[$pdbk] == 2 ) {
-					$replacePairs[$searchkey] = $sk->makeStubLinkObj( $title,
-									$this->mLinkHolders['texts'][$key],
-									$this->mLinkHolders['queries'][$key] );
-				}
-			}
-			$replacer = new HashtableReplacer( $replacePairs, 1 );
-			wfProfileOut( $fname.'-construct' );
-
-			# Do the thing
-			wfProfileIn( $fname.'-replace' );
-			$text = preg_replace_callback(
-				'/(<!--LINK .*?-->)/',
-				$replacer->cb(),
-				$text);
-
-			wfProfileOut( $fname.'-replace' );
-		}
-
-		# Now process interwiki link holders
-		# This is quite a bit simpler than internal links
-		if ( !empty( $this->mInterwikiLinkHolders['texts'] ) ) {
-			wfProfileIn( $fname.'-interwiki' );
-			# Make interwiki link HTML
-			$replacePairs = array();
-			foreach( $this->mInterwikiLinkHolders['texts'] as $key => $link ) {
-				$title = $this->mInterwikiLinkHolders['titles'][$key];
-				$replacePairs[$key] = $sk->makeLinkObj( $title, $link );
-			}
-			$replacer = new HashtableReplacer( $replacePairs, 1 );
-
-			$text = preg_replace_callback(
-				'/<!--IWLINK (.*?)-->/',
-				$replacer->cb(),
-				$text );
-			wfProfileOut( $fname.'-interwiki' );
-		}
-
-		wfProfileOut( $fname );
-		return $colours;
-	}
-
-	/**
-	 * Replace <!--LINK--> link placeholders with plain text of links
-	 * (not HTML-formatted).
-	 * @param string $text
-	 * @return string
-	 */
-	function replaceLinkHoldersText( $text ) {
-		$fname = 'Parser::replaceLinkHoldersText';
-		wfProfileIn( $fname );
-
-		$text = preg_replace_callback(
-			'/<!--(LINK|IWLINK) (.*?)-->/',
-			array( &$this, 'replaceLinkHoldersTextCallback' ),
-			$text );
-
-		wfProfileOut( $fname );
-		return $text;
-	}
-
-	/**
-	 * @param array $matches
-	 * @return string
-	 * @private
-	 */
-	function replaceLinkHoldersTextCallback( $matches ) {
-		$type = $matches[1];
-		$key  = $matches[2];
-		if( $type == 'LINK' ) {
-			if( isset( $this->mLinkHolders['texts'][$key] ) ) {
-				return $this->mLinkHolders['texts'][$key];
-			}
-		} elseif( $type == 'IWLINK' ) {
-			if( isset( $this->mInterwikiLinkHolders['texts'][$key] ) ) {
-				return $this->mInterwikiLinkHolders['texts'][$key];
-			}
-		}
-		return $matches[0];
-	}
-
-	/**
-	 * Tag hook handler for 'pre'.
-	 */
-	function renderPreTag( $text, $attribs ) {
-		// Backwards-compatibility hack
-		$content = StringUtils::delimiterReplace( '<nowiki>', '</nowiki>', '$1', $text, 'i' );
-
-		$attribs = Sanitizer::validateTagAttributes( $attribs, 'pre' );
-		return wfOpenElement( 'pre', $attribs ) .
-			Xml::escapeTagsOnly( $content ) .
-			'</pre>';
-	}
-
-	/**
-	 * Renders an image gallery from a text with one line per image.
-	 * text labels may be given by using |-style alternative text. E.g.
-	 *   Image:one.jpg|The number "1"
-	 *   Image:tree.jpg|A tree
-	 * given as text will return the HTML of a gallery with two images,
-	 * labeled 'The number "1"' and
-	 * 'A tree'.
-	 */
-	function renderImageGallery( $text, $params ) {
-		$ig = new ImageGallery();
-		$ig->setContextTitle( $this->mTitle );
-		$ig->setShowBytes( false );
-		$ig->setShowFilename( false );
-		$ig->setParser( $this );
-		$ig->setHideBadImages();
-		$ig->setAttributes( Sanitizer::validateTagAttributes( $params, 'table' ) );
-		$ig->useSkin( $this->mOptions->getSkin() );
-		$ig->mRevisionId = $this->mRevisionId;
-
-		if( isset( $params['caption'] ) ) {
-			$caption = $params['caption'];
-			$caption = htmlspecialchars( $caption );
-			$caption = $this->replaceInternalLinks( $caption );
-			$ig->setCaptionHtml( $caption );
-		}
-		if( isset( $params['perrow'] ) ) {
-			$ig->setPerRow( $params['perrow'] );
-		}
-		if( isset( $params['widths'] ) ) {
-			$ig->setWidths( $params['widths'] );
-		}
-		if( isset( $params['heights'] ) ) {
-			$ig->setHeights( $params['heights'] );
-		}
-
-		wfRunHooks( 'BeforeParserrenderImageGallery', array( &$this, &$ig ) );
-
-		$lines = explode( "\n", $text );
-		foreach ( $lines as $line ) {
-			# match lines like these:
-			# Image:someimage.jpg|This is some image
-			$matches = array();
-			preg_match( "/^([^|]+)(\\|(.*))?$/", $line, $matches );
-			# Skip empty lines
-			if ( count( $matches ) == 0 ) {
-				continue;
-			}
-			$tp = Title::newFromText( $matches[1] );
-			$nt =& $tp;
-			if( is_null( $nt ) ) {
-				# Bogus title. Ignore these so we don't bomb out later.
-				continue;
-			}
-			if ( isset( $matches[3] ) ) {
-				$label = $matches[3];
-			} else {
-				$label = '';
-			}
-
-			$pout = $this->parse( $label,
-				$this->mTitle,
-				$this->mOptions,
-				false, // Strip whitespace...?
-				false  // Don't clear state!
-			);
-			$html = $pout->getText();
-
-			$ig->add( $nt, $html );
-
-			# Only add real images (bug #5586)
-			if ( $nt->getNamespace() == NS_IMAGE ) {
-				$this->mOutput->addImage( $nt->getDBkey() );
-			}
-		}
-		return $ig->toHTML();
-	}
-
-	function getImageParams( $handler ) {
-		if ( $handler ) {
-			$handlerClass = get_class( $handler );
-		} else {
-			$handlerClass = '';
-		}
-		if ( !isset( $this->mImageParams[$handlerClass]  ) ) {
-			// Initialise static lists
-			static $internalParamNames = array(
-				'horizAlign' => array( 'left', 'right', 'center', 'none' ),
-				'vertAlign' => array( 'baseline', 'sub', 'super', 'top', 'text-top', 'middle',
-					'bottom', 'text-bottom' ),
-				'frame' => array( 'thumbnail', 'manualthumb', 'framed', 'frameless',
-					'upright', 'border' ),
-			);
-			static $internalParamMap;
-			if ( !$internalParamMap ) {
-				$internalParamMap = array();
-				foreach ( $internalParamNames as $type => $names ) {
-					foreach ( $names as $name ) {
-						$magicName = str_replace( '-', '_', "img_$name" );
-						$internalParamMap[$magicName] = array( $type, $name );
-					}
-				}
-			}
-
-			// Add handler params
-			$paramMap = $internalParamMap;
-			if ( $handler ) {
-				$handlerParamMap = $handler->getParamMap();
-				foreach ( $handlerParamMap as $magic => $paramName ) {
-					$paramMap[$magic] = array( 'handler', $paramName );
-				}
-			}
-			$this->mImageParams[$handlerClass] = $paramMap;
-			$this->mImageParamsMagicArray[$handlerClass] = new MagicWordArray( array_keys( $paramMap ) );
-		}
-		return array( $this->mImageParams[$handlerClass], $this->mImageParamsMagicArray[$handlerClass] );
-	}
-
-	/**
-	 * Parse image options text and use it to make an image
-	 */
-	function makeImage( $title, $options ) {
-		# @TODO: let the MediaHandler specify its transform parameters
-		#
-		# Check if the options text is of the form "options|alt text"
-		# Options are:
-		#  * thumbnail       	make a thumbnail with enlarge-icon and caption, alignment depends on lang
-		#  * left		no resizing, just left align. label is used for alt= only
-		#  * right		same, but right aligned
-		#  * none		same, but not aligned
-		#  * ___px		scale to ___ pixels width, no aligning. e.g. use in taxobox
-		#  * center		center the image
-		#  * framed		Keep original image size, no magnify-button.
-		#  * frameless		like 'thumb' but without a frame. Keeps user preferences for width
-		#  * upright		reduce width for upright images, rounded to full __0 px
-		#  * border		draw a 1px border around the image
-		# vertical-align values (no % or length right now):
-		#  * baseline
-		#  * sub
-		#  * super
-		#  * top
-		#  * text-top
-		#  * middle
-		#  * bottom
-		#  * text-bottom
-
-		$parts = array_map( 'trim', explode( '|', $options) );
-		$sk = $this->mOptions->getSkin();
-
-		# Give extensions a chance to select the file revision for us
-		$skip = $time = false;
-		wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$title, &$skip, &$time ) );
-
-		if ( $skip ) {
-			return $sk->makeLinkObj( $title );
-		}
-
-		# Get parameter map
-		$file = wfFindFile( $title, $time );
-		$handler = $file ? $file->getHandler() : false;
-
-		list( $paramMap, $mwArray ) = $this->getImageParams( $handler );
-
-		# Process the input parameters
-		$caption = '';
-		$params = array( 'frame' => array(), 'handler' => array(),
-			'horizAlign' => array(), 'vertAlign' => array() );
-		foreach( $parts as $part ) {
-			list( $magicName, $value ) = $mwArray->matchVariableStartToEnd( $part );
-			if ( isset( $paramMap[$magicName] ) ) {
-				list( $type, $paramName ) = $paramMap[$magicName];
-				$params[$type][$paramName] = $value;
-
-				// Special case; width and height come in one variable together
-				if( $type == 'handler' && $paramName == 'width' ) {
-					$m = array();
-					if ( preg_match( '/^([0-9]*)x([0-9]*)$/', $value, $m ) ) {
-						$params[$type]['width'] = intval( $m[1] );
-						$params[$type]['height'] = intval( $m[2] );
-					} else {
-						$params[$type]['width'] = intval( $value );
-					}
-				}
-			} else {
-				$caption = $part;
-			}
-		}
-
-		# Process alignment parameters
-		if ( $params['horizAlign'] ) {
-			$params['frame']['align'] = key( $params['horizAlign'] );
-		}
-		if ( $params['vertAlign'] ) {
-			$params['frame']['valign'] = key( $params['vertAlign'] );
-		}
-
-		# Validate the handler parameters
-		if ( $handler ) {
-			foreach ( $params['handler'] as $name => $value ) {
-				if ( !$handler->validateParam( $name, $value ) ) {
-					unset( $params['handler'][$name] );
-				}
-			}
-		}
-
-		# Strip bad stuff out of the alt text
-		$alt = $this->replaceLinkHoldersText( $caption );
-
-		# make sure there are no placeholders in thumbnail attributes
-		# that are later expanded to html- so expand them now and
-		# remove the tags
-		$alt = $this->mStripState->unstripBoth( $alt );
-		$alt = Sanitizer::stripAllTags( $alt );
-
-		$params['frame']['alt'] = $alt;
-		$params['frame']['caption'] = $caption;
-
-		# Linker does the rest
-		$ret = $sk->makeImageLink2( $title, $file, $params['frame'], $params['handler'] );
-
-		# Give the handler a chance to modify the parser object
-		if ( $handler ) {
-			$handler->parserTransformHook( $this, $file );
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Set a flag in the output object indicating that the content is dynamic and
-	 * shouldn't be cached.
-	 */
-	function disableCache() {
-		wfDebug( "Parser output marked as uncacheable.\n" );
-		$this->mOutput->mCacheTime = -1;
-	}
-
-	/**#@+
-	 * Callback from the Sanitizer for expanding items found in HTML attribute
-	 * values, so they can be safely tested and escaped.
-	 * @param string $text
-	 * @param array $args
-	 * @return string
-	 * @private
-	 */
-	function attributeStripCallback( &$text, $args ) {
-		$text = $this->replaceVariables( $text, $args );
-		$text = $this->mStripState->unstripBoth( $text );
-		return $text;
-	}
-
-	/**#@-*/
-
-	/**#@+
-	 * Accessor/mutator
-	 */
-	function Title( $x = NULL ) { return wfSetVar( $this->mTitle, $x ); }
-	function Options( $x = NULL ) { return wfSetVar( $this->mOptions, $x ); }
-	function OutputType( $x = NULL ) { return wfSetVar( $this->mOutputType, $x ); }
-	/**#@-*/
-
-	/**#@+
-	 * Accessor
-	 */
-	function getTags() { return array_merge( array_keys($this->mTransparentTagHooks), array_keys( $this->mTagHooks ) ); }
-	/**#@-*/
-
-
-	/**
-	 * Break wikitext input into sections, and either pull or replace
-	 * some particular section's text.
-	 *
-	 * External callers should use the getSection and replaceSection methods.
-	 *
-	 * @param $text Page wikitext
-	 * @param $section Numbered section. 0 pulls the text before the first
-	 *                 heading; other numbers will pull the given section
-	 *                 along with its lower-level subsections.
-	 * @param $mode One of "get" or "replace"
-	 * @param $newtext Replacement text for section data.
-	 * @return string for "get", the extracted section text.
-	 *                for "replace", the whole page with the section replaced.
-	 */
-	private function extractSections( $text, $section, $mode, $newtext='' ) {
-		# I.... _hope_ this is right.
-		# Otherwise, sometimes we don't have things initialized properly.
-		$this->clearState();
-
-		# strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
-		# comments to be stripped as well)
-		$stripState = new StripState;
-
-		$oldOutputType = $this->mOutputType;
-		$oldOptions = $this->mOptions;
-		$this->mOptions = new ParserOptions();
-		$this->setOutputType( self::OT_WIKI );
-
-		$striptext = $this->strip( $text, $stripState, true );
-
-		$this->setOutputType( $oldOutputType );
-		$this->mOptions = $oldOptions;
-
-		# now that we can be sure that no pseudo-sections are in the source,
-		# split it up by section
-		$uniq = preg_quote( $this->uniqPrefix(), '/' );
-		$comment = "(?:$uniq-!--.*?QINU\x07)";
-		$secs = preg_split(
-			"/
-			(
-				^
-				(?:$comment|<\/?noinclude>)* # Initial comments will be stripped
-				(=+) # Should this be limited to 6?
-				.+?  # Section title...
-				\\2  # Ending = count must match start
-				(?:$comment|<\/?noinclude>|[ \\t]+)* # Trailing whitespace ok
-				$
-			|
-				<h([1-6])\b.*?>
-				.*?
-				<\/h\\3\s*>
-			)
-			/mix",
-			$striptext, -1,
-			PREG_SPLIT_DELIM_CAPTURE);
-
-		if( $mode == "get" ) {
-			if( $section == 0 ) {
-				// "Section 0" returns the content before any other section.
-				$rv = $secs[0];
-			} else {
-			  	//track missing section, will replace if found.
-				$rv = $newtext;
-			}
-		} elseif( $mode == "replace" ) {
-			if( $section == 0 ) {
-				$rv = $newtext . "\n\n";
-				$remainder = true;
-			} else {
-				$rv = $secs[0];
-				$remainder = false;
-			}
-		}
-		$count = 0;
-		$sectionLevel = 0;
-		for( $index = 1; $index < count( $secs ); ) {
-			$headerLine = $secs[$index++];
-			if( $secs[$index] ) {
-				// A wiki header
-				$headerLevel = strlen( $secs[$index++] );
-			} else {
-				// An HTML header
-				$index++;
-				$headerLevel = intval( $secs[$index++] );
-			}
-			$content = $secs[$index++];
-
-			$count++;
-			if( $mode == "get" ) {
-				if( $count == $section ) {
-					$rv = $headerLine . $content;
-					$sectionLevel = $headerLevel;
-				} elseif( $count > $section ) {
-					if( $sectionLevel && $headerLevel > $sectionLevel ) {
-						$rv .= $headerLine . $content;
-					} else {
-						// Broke out to a higher-level section
-						break;
-					}
-				}
-			} elseif( $mode == "replace" ) {
-				if( $count < $section ) {
-					$rv .= $headerLine . $content;
-				} elseif( $count == $section ) {
-					$rv .= $newtext . "\n\n";
-					$sectionLevel = $headerLevel;
-				} elseif( $count > $section ) {
-					if( $headerLevel <= $sectionLevel ) {
-						// Passed the section's sub-parts.
-						$remainder = true;
-					}
-					if( $remainder ) {
-						$rv .= $headerLine . $content;
-					}
-				}
-			}
-		}
-		if (is_string($rv))
-			# reinsert stripped tags
-			$rv = trim( $stripState->unstripBoth( $rv ) );
-
-		return $rv;
-	}
-
-	/**
-	 * This function returns the text of a section, specified by a number ($section).
-	 * A section is text under a heading like == Heading == or \<h1\>Heading\</h1\>, or
-	 * the first section before any such heading (section 0).
-	 *
-	 * If a section contains subsections, these are also returned.
-	 *
-	 * @param $text String: text to look in
-	 * @param $section Integer: section number
-	 * @param $deftext: default to return if section is not found
-	 * @return string text of the requested section
-	 */
-	public function getSection( $text, $section, $deftext='' ) {
-		return $this->extractSections( $text, $section, "get", $deftext );
-	}
-
-	public function replaceSection( $oldtext, $section, $text ) {
-		return $this->extractSections( $oldtext, $section, "replace", $text );
-	}
-
-	/**
-	 * Get the timestamp associated with the current revision, adjusted for
-	 * the default server-local timestamp
-	 */
-	function getRevisionTimestamp() {
-		if ( is_null( $this->mRevisionTimestamp ) ) {
-			wfProfileIn( __METHOD__ );
-			global $wgContLang;
-			$dbr = wfGetDB( DB_SLAVE );
-			$timestamp = $dbr->selectField( 'revision', 'rev_timestamp',
-					array( 'rev_id' => $this->mRevisionId ), __METHOD__ );
-
-			// Normalize timestamp to internal MW format for timezone processing.
-			// This has the added side-effect of replacing a null value with
-			// the current time, which gives us more sensible behavior for
-			// previews.
-			$timestamp = wfTimestamp( TS_MW, $timestamp );
-
-			// The cryptic '' timezone parameter tells to use the site-default
-			// timezone offset instead of the user settings.
-			//
-			// Since this value will be saved into the parser cache, served
-			// to other users, and potentially even used inside links and such,
-			// it needs to be consistent for all visitors.
-			$this->mRevisionTimestamp = $wgContLang->userAdjust( $timestamp, '' );
-
-			wfProfileOut( __METHOD__ );
-		}
-		return $this->mRevisionTimestamp;
-	}
-
-	/**
-	 * Mutator for $mDefaultSort
-	 *
-	 * @param $sort New value
-	 */
-	public function setDefaultSort( $sort ) {
-		$this->mDefaultSort = $sort;
-	}
-
-	/**
-	 * Accessor for $mDefaultSort
-	 * Will use the title/prefixed title if none is set
-	 *
-	 * @return string
-	 */
-	public function getDefaultSort() {
-		if( $this->mDefaultSort !== false ) {
-			return $this->mDefaultSort;
-		} else {
-			return $this->mTitle->getNamespace() == NS_CATEGORY
-					? $this->mTitle->getText()
-					: $this->mTitle->getPrefixedText();
-		}
-	}
-
-	/**
-	 * Try to guess the section anchor name based on a wikitext fragment
-	 * presumably extracted from a heading, for example "Header" from
-	 * "== Header ==".
-	 */
-	public function guessSectionNameFromWikiText( $text ) {
-		# Strip out wikitext links(they break the anchor)
-		$text = $this->stripSectionName( $text );
-		$headline = Sanitizer::decodeCharReferences( $text );
-		# strip out HTML
-		$headline = StringUtils::delimiterReplace( '<', '>', '', $headline );
-		$headline = trim( $headline );
-		$sectionanchor = '#' . urlencode( str_replace( ' ', '_', $headline ) );
-		$replacearray = array(
-			'%3A' => ':',
-			'%' => '.'
-		);
-		return str_replace(
-			array_keys( $replacearray ),
-			array_values( $replacearray ),
-			$sectionanchor );
-	}
-
-	/**
-	 * Strips a text string of wikitext for use in a section anchor
-	 *
-	 * Accepts a text string and then removes all wikitext from the
-	 * string and leaves only the resultant text (i.e. the result of
-	 * [[User:WikiSysop|Sysop]] would be "Sysop" and the result of
-	 * [[User:WikiSysop]] would be "User:WikiSysop") - this is intended
-	 * to create valid section anchors by mimicing the output of the
-	 * parser when headings are parsed.
-	 *
-	 * @param $text string Text string to be stripped of wikitext
-	 * for use in a Section anchor
-	 * @return Filtered text string
-	 */
-	public function stripSectionName( $text ) {
-		# Strip internal link markup
-		$text = preg_replace('/\[\[:?([^[|]+)\|([^[]+)\]\]/','$2',$text);
-		$text = preg_replace('/\[\[:?([^[]+)\|?\]\]/','$1',$text);
-
-		# Strip external link markup (FIXME: Not Tolerant to blank link text
-		# I.E. [http://www.mediawiki.org] will render as [1] or something depending
-		# on how many empty links there are on the page - need to figure that out.
-		$text = preg_replace('/\[(?:' . wfUrlProtocols() . ')([^ ]+?) ([^[]+)\]/','$2',$text);
-
-		# Parse wikitext quotes (italics & bold)
-		$text = $this->doQuotes($text);
-
-		# Strip HTML tags
-		$text = StringUtils::delimiterReplace( '<', '>', '', $text );
-		return $text;
-	}
-
-	/**
-	 * strip/replaceVariables/unstrip for preprocessor regression testing
-	 */
-	function srvus( $text ) {
-		$text = $this->strip( $text, $this->mStripState );
-		$text = Sanitizer::removeHTMLtags( $text );
-		$text = $this->replaceVariables( $text );
-		$text = preg_replace( '/<!--MWTEMPLATESECTION.*?-->/', '', $text );
-		$text = $this->mStripState->unstripBoth( $text );
-		return $text;
-	}
-}
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 34d58967..af591b67 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -770,6 +770,7 @@ class PPFrame_DOM implements PPFrame {
 
 	/**
 	 * Recursion depth of this frame, top = 0
+	 * Note that this is NOT the same as expansion depth in expand()
 	 */
 	var $depth;
 
@@ -826,20 +827,21 @@ class PPFrame_DOM implements PPFrame {
 	}
 
 	function expand( $root, $flags = 0 ) {
-		static $depth = 0;
+		static $expansionDepth = 0;
 		if ( is_string( $root ) ) {
 			return $root;
 		}
+		wfProfileIn( __METHOD__ );
 
 		if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->mMaxPPNodeCount )
 		{
 			return '<span class="error">Node-count limit exceeded</span>';
 		}
 
-		if ( $depth > $this->parser->mOptions->mMaxPPExpandDepth ) {
+		if ( $expansionDepth > $this->parser->mOptions->mMaxPPExpandDepth ) {
 			return '<span class="error">Expansion depth limit exceeded</span>';
 		}
-		++$depth;
+		++$expansionDepth;
 
 		if ( $root instanceof PPNode_DOM ) {
 			$root = $root->node;
@@ -1005,6 +1007,7 @@ class PPFrame_DOM implements PPFrame {
 					$newIterator = $contextNode->childNodes;
 				}
 			} else {
+				wfProfileOut( __METHOD__ );
 				throw new MWException( __METHOD__.': Invalid parameter type' );
 			}
 
@@ -1027,7 +1030,8 @@ class PPFrame_DOM implements PPFrame {
 				}
 			}
 		}
-		--$depth;
+		--$expansionDepth;
+		wfProfileOut( __METHOD__ );
 		return $outStack[0];
 	}
 
@@ -1218,6 +1222,32 @@ class PPTemplateFrame_DOM extends PPFrame_DOM {
 		return !count( $this->numberedArgs ) && !count( $this->namedArgs );
 	}
 
+	function getArguments() {
+		$arguments = array();
+		foreach ( array_merge(
+				array_keys($this->numberedArgs),
+				array_keys($this->namedArgs)) as $key ) {
+			$arguments[$key] = $this->getArgument($key);
+		}
+		return $arguments;
+	}
+	
+	function getNumberedArguments() {
+		$arguments = array();
+		foreach ( array_keys($this->numberedArgs) as $key ) {
+			$arguments[$key] = $this->getArgument($key);
+		}
+		return $arguments;
+	}
+	
+	function getNamedArguments() {
+		$arguments = array();
+		foreach ( array_keys($this->namedArgs) as $key ) {
+			$arguments[$key] = $this->getArgument($key);
+		}
+		return $arguments;
+	}
+
 	function getNumberedArgument( $index ) {
 		if ( !isset( $this->numberedArgs[$index] ) ) {
 			return false;
@@ -1291,6 +1321,9 @@ class PPCustomFrame_DOM extends PPFrame_DOM {
 	}
 
 	function getArgument( $index ) {
+		if ( !isset( $this->args[$index] ) ) {
+			return false;
+		}
 		return $this->args[$index];
 	}
 }
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index b5775243..62028291 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -758,6 +758,7 @@ class PPFrame_Hash implements PPFrame {
 
 	/**
 	 * Recursion depth of this frame, top = 0
+	 * Note that this is NOT the same as expansion depth in expand()
 	 */
 	var $depth;
 
@@ -810,6 +811,7 @@ class PPFrame_Hash implements PPFrame {
 	}
 
 	function expand( $root, $flags = 0 ) {
+		static $expansionDepth = 0;
 		if ( is_string( $root ) ) {
 			return $root;
 		}
@@ -818,10 +820,10 @@ class PPFrame_Hash implements PPFrame {
 		{
 			return '<span class="error">Node-count limit exceeded</span>';
 		}
-		if ( $this->depth > $this->parser->mOptions->mMaxPPExpandDepth ) {
+		if ( $expansionDepth > $this->parser->mOptions->mMaxPPExpandDepth ) {
 			return '<span class="error">Expansion depth limit exceeded</span>';
 		}
-		++$this->depth;
+		++$expansionDepth;
 
 		$outStack = array( '', '' );
 		$iteratorStack = array( false, $root );
@@ -974,7 +976,7 @@ class PPFrame_Hash implements PPFrame {
 				}
 			}
 		}
-		--$this->depth;
+		--$expansionDepth;
 		return $outStack[0];
 	}
 
@@ -1173,6 +1175,32 @@ class PPTemplateFrame_Hash extends PPFrame_Hash {
 		return !count( $this->numberedArgs ) && !count( $this->namedArgs );
 	}
 
+	function getArguments() {
+		$arguments = array();
+		foreach ( array_merge(
+				array_keys($this->numberedArgs),
+				array_keys($this->namedArgs)) as $key ) {
+			$arguments[$key] = $this->getArgument($key);
+		}
+		return $arguments;
+	}
+	
+	function getNumberedArguments() {
+		$arguments = array();
+		foreach ( array_keys($this->numberedArgs) as $key ) {
+			$arguments[$key] = $this->getArgument($key);
+		}
+		return $arguments;
+	}
+	
+	function getNamedArguments() {
+		$arguments = array();
+		foreach ( array_keys($this->namedArgs) as $key ) {
+			$arguments[$key] = $this->getArgument($key);
+		}
+		return $arguments;
+	}
+
 	function getNumberedArgument( $index ) {
 		if ( !isset( $this->numberedArgs[$index] ) ) {
 			return false;
@@ -1246,6 +1274,9 @@ class PPCustomFrame_Hash extends PPFrame_Hash {
 	}
 
 	function getArgument( $index ) {
+		if ( !isset( $this->args[$index] ) ) {
+			return false;
+		}
 		return $this->args[$index];
 	}
 }
diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index c2a8de4e..0ff94b49 100644
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -29,15 +29,19 @@ function wfSpecialAllmessages() {
 
 	$wgMessageCache->loadAllMessages();
 
-	$sortedArray = array_merge( Language::getMessagesFor( 'en' ), $wgMessageCache->getExtensionMessagesFor( 'en' ) );
+	$sortedArray = array_merge( Language::getMessagesFor( 'en' ), 
+		$wgMessageCache->getExtensionMessagesFor( 'en' ) );
 	ksort( $sortedArray );
-	$messages = array();
 
-	foreach ( $sortedArray as $key => $value ) {
+	$messages = array();
+	foreach( $sortedArray as $key => $value ) {
 		$messages[$key]['enmsg'] = $value;
-		$messages[$key]['statmsg'] = wfMsgReal( $key, array(), false, false, false ); // wfMsgNoDbNoTrans doesn't exist
+		$messages[$key]['statmsg'] = wfMsgReal( $key, array(), false, false, false );
 		$messages[$key]['msg'] = wfMsgNoTrans( $key );
+		$sortedArray[$key] = NULL; // trade bytes from $sortedArray to this
+		
 	}
+	unset($sortedArray); // trade bytes from $sortedArray to this
 
 	wfProfileOut( __METHOD__ . '-setup' );
 
@@ -63,13 +67,14 @@ function wfSpecialAllmessages() {
 	wfProfileOut( __METHOD__ );
 }
 
-function wfAllMessagesMakeXml( $messages ) {
+function wfAllMessagesMakeXml( &$messages ) {
 	global $wgLang;
 	$lang = $wgLang->getCode();
 	$txt = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n";
 	$txt .= "<messages lang=\"$lang\">\n";
 	foreach( $messages as $key => $m ) {
 		$txt .= "\t" . Xml::element( 'message', array( 'name' => $key ), $m['msg'] ) . "\n";
+		$messages[$key] = NULL; // trade bytes
 	}
 	$txt .= "</messages>";
 	return $txt;
@@ -81,7 +86,7 @@ function wfAllMessagesMakeXml( $messages ) {
  * @return The PHP messages array.
  * @todo Make suitable for language files.
  */
-function wfAllMessagesMakePhp( $messages ) {
+function wfAllMessagesMakePhp( &$messages ) {
 	global $wgLang;
 	$txt = "\n\n\$messages = array(\n";
 	foreach( $messages as $key => $m ) {
@@ -94,6 +99,7 @@ function wfAllMessagesMakePhp( $messages ) {
 			$comment = '';
 		}
 		$txt .= "'$key' => '" . preg_replace( '/(?<!\\\\)\'/', "\'", $m['msg']) . "',$comment\n";
+		$messages[$key] = NULL; // trade bytes
 	}
 	$txt .= ');';
 	return $txt;
@@ -104,7 +110,7 @@ function wfAllMessagesMakePhp( $messages ) {
  * @param $messages Messages array.
  * @return The HTML list of messages.
  */
-function wfAllMessagesMakeHTMLText( $messages ) {
+function wfAllMessagesMakeHTMLText( &$messages ) {
 	global $wgLang, $wgContLang, $wgUser;
 	wfProfileIn( __METHOD__ );
 
@@ -123,7 +129,8 @@ function wfAllMessagesMakeHTMLText( $messages ) {
 		'onclick' => 'allmessagesmodified()'
 	), '' );
 
-	$txt = '<span id="allmessagesfilter" style="display: none;">' . wfMsgHtml( 'allmessagesfilter' ) . " {$input}{$checkbox} " . '</span>';
+	$txt = '<span id="allmessagesfilter" style="display: none;">' . wfMsgHtml( 'allmessagesfilter' ) . 
+		" {$input}{$checkbox} " . '</span>';
 
 	$txt .= '
 <table border="1" cellspacing="0" width="100%" id="allmessagestable">
@@ -144,11 +151,14 @@ function wfAllMessagesMakeHTMLText( $messages ) {
 		NS_MEDIAWIKI_TALK => array()
 	);
 	$dbr = wfGetDB( DB_SLAVE );
-	$page = $dbr->tableName( 'page' );
-	$sql = "SELECT page_namespace,page_title FROM $page WHERE page_namespace IN (" . NS_MEDIAWIKI . ", " . NS_MEDIAWIKI_TALK . ")";
-	$res = $dbr->query( $sql );
+	$res = $dbr->select( 'page',
+		array( 'page_namespace', 'page_title' ),
+		array( 'page_namespace' => array(NS_MEDIAWIKI,NS_MEDIAWIKI_TALK) ),
+		__METHOD__,
+		array( 'USE INDEX' => 'name_title' )
+	);
 	while( $s = $dbr->fetchObject( $res ) ) {
-		$pageExists[$s->page_namespace][$s->page_title] = true;
+		$pageExists[$s->page_namespace][$s->page_title] = 1;
 	}
 	$dbr->freeResult( $res );
 	wfProfileOut( __METHOD__ . "-check" );
@@ -163,19 +173,21 @@ function wfAllMessagesMakeHTMLText( $messages ) {
 			$title .= '/' . $wgLang->getCode();
 		}
 
-		$titleObj =& Title::makeTitle( NS_MEDIAWIKI, $title );
-		$talkPage =& Title::makeTitle( NS_MEDIAWIKI_TALK, $title );
+		$titleObj = Title::makeTitle( NS_MEDIAWIKI, $title );
+		$talkPage = Title::makeTitle( NS_MEDIAWIKI_TALK, $title );
 
 		$changed = ( $m['statmsg'] != $m['msg'] );
 		$message = htmlspecialchars( $m['statmsg'] );
 		$mw = htmlspecialchars( $m['msg'] );
 
-		if( isset( $pageExists[NS_MEDIAWIKI][$title] ) ) {
-			$pageLink = $sk->makeKnownLinkObj( $titleObj, "<span id=\"sp-allmessages-i-$i\">" .  htmlspecialchars( $key ) . '</span>' );
+		if( array_key_exists( $title, $pageExists[NS_MEDIAWIKI] ) ) {
+			$pageLink = $sk->makeKnownLinkObj( $titleObj, "<span id=\"sp-allmessages-i-$i\">" . 
+				htmlspecialchars( $key ) . '</span>' );
 		} else {
-			$pageLink = $sk->makeBrokenLinkObj( $titleObj, "<span id=\"sp-allmessages-i-$i\">" .  htmlspecialchars( $key ) . '</span>' );
+			$pageLink = $sk->makeBrokenLinkObj( $titleObj, "<span id=\"sp-allmessages-i-$i\">" . 
+				htmlspecialchars( $key ) . '</span>' );
 		}
-		if( isset( $pageExists[NS_MEDIAWIKI_TALK][$title] ) ) {
+		if( array_key_exists( $title, $pageExists[NS_MEDIAWIKI_TALK] ) ) {
 			$talkLink = $sk->makeKnownLinkObj( $talkPage, htmlspecialchars( $talk ) );
 		} else {
 			$talkLink = $sk->makeBrokenLinkObj( $talkPage, htmlspecialchars( $talk ) );
@@ -186,27 +198,28 @@ function wfAllMessagesMakeHTMLText( $messages ) {
 
 		if( $changed ) {
 			$txt .= "
-	<tr class=\"orig\" id=\"sp-allmessages-r1-$i\">
-		<td rowspan=\"2\">
-			$anchor$pageLink<br />$talkLink
-		</td><td>
-$message
-		</td>
-	</tr><tr class=\"new\" id=\"sp-allmessages-r2-$i\">
-		<td>
-$mw
-		</td>
-	</tr>";
+				<tr class=\"orig\" id=\"sp-allmessages-r1-$i\">
+					<td rowspan=\"2\">
+						$anchor$pageLink<br />$talkLink
+					</td><td>
+				$message
+					</td>
+				</tr><tr class=\"new\" id=\"sp-allmessages-r2-$i\">
+					<td>
+				$mw
+					</td>
+				</tr>";
 		} else {
 			$txt .= "
-	<tr class=\"def\" id=\"sp-allmessages-r1-$i\">
-		<td>
-			$anchor$pageLink<br />$talkLink
-		</td><td>
-$mw
-		</td>
-	</tr>";
+				<tr class=\"def\" id=\"sp-allmessages-r1-$i\">
+					<td>
+						$anchor$pageLink<br />$talkLink
+					</td><td>
+				$mw
+					</td>
+				</tr>";
 		}
+		$messages[$key] = NULL; // trade bytes
 		$i++;
 	}
 	$txt .= '</table>';
diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php
index 7223e317..bf68dfa6 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -1,404 +1,445 @@
 <?php
-/**
- * @file
- * @ingroup SpecialPage
- */
-
-/**
- * Entry point : initialise variables and call subfunctions.
- * @param $par String: becomes "FOO" when called like Special:Allpages/FOO (default NULL)
- * @param $specialPage See the SpecialPage object.
- */
-function wfSpecialAllpages( $par=NULL, $specialPage ) {
-	global $wgRequest, $wgOut, $wgContLang;
-
-	# GET values
-	$from = $wgRequest->getVal( 'from' );
-	$namespace = $wgRequest->getInt( 'namespace' );
-
-	$namespaces = $wgContLang->getNamespaces();
-
-	$indexPage = new SpecialAllpages();
-
-	$wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) )  ?
-		wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
-		wfMsg( 'allarticles' )
-		);
-
-	if ( isset($par) ) {
-		$indexPage->showChunk( $namespace, $par, $specialPage->including() );
-	} elseif ( isset($from) ) {
-		$indexPage->showChunk( $namespace, $from, $specialPage->including() );
-	} else {
-		$indexPage->showToplevel ( $namespace, $specialPage->including() );
-	}
-}
 
 /**
  * Implements Special:Allpages
  * @ingroup SpecialPage
  */
-class SpecialAllpages {
+class SpecialAllpages extends IncludableSpecialPage {
+
 	/**
 	 * Maximum number of pages to show on single subpage.
 	 */
-	protected $maxPerPage = 960;
+	protected $maxPerPage = 345;
 
 	/**
-	 * Name of this special page. Used to make title objects that reference back
-	 * to this page.
+	 * Maximum number of pages to show on single index subpage.
 	 */
-	protected $name = 'Allpages';
+	protected $maxLineCount = 200;
+
+	/**
+	 * Maximum number of chars to show for an entry.
+	 */
+	protected $maxPageLength = 70;
 
 	/**
 	 * Determines, which message describes the input field 'nsfrom'.
 	 */
 	protected $nsfromMsg = 'allpagesfrom';
 
-/**
- * HTML for the top form
- * @param integer $namespace A namespace constant (default NS_MAIN).
- * @param string $from Article name we are starting listing at.
- */
-function namespaceForm ( $namespace = NS_MAIN, $from = '' ) {
-	global $wgScript;
-	$t = SpecialPage::getTitleFor( $this->name );
-
-	$out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
-	$out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-	$out .= Xml::hidden( 'title', $t->getPrefixedText() );
-	$out .= Xml::openElement( 'fieldset' );
-	$out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
-	$out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
-	$out .= "<tr>
-			<td class='mw-label'>" .
-				Xml::label( wfMsg( $this->nsfromMsg ), 'nsfrom' ) .
-			"</td>
-			<td class='mw-input'>" .
-				Xml::input( 'from', 20, $from, array( 'id' => 'nsfrom' ) ) .
-			"</td>
-		</tr>
-		<tr>
-			<td class='mw-label'>" .
-				Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
-			"</td>
-			<td class='mw-input'>" .
-				Xml::namespaceSelector( $namespace, null ) . ' ' .
-				Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
-			"</td>
-			</tr>";
-	$out .= Xml::closeElement( 'table' );
-	$out .= Xml::closeElement( 'fieldset' );
-	$out .= Xml::closeElement( 'form' );
-	$out .= Xml::closeElement( 'div' );
-	return $out;
-}
+	function __construct( $name = 'Allpages' ){
+		parent::__construct( $name );	
+	}
 
-/**
- * @param integer $namespace (default NS_MAIN)
- */
-function showToplevel ( $namespace = NS_MAIN, $including = false ) {
-	global $wgOut, $wgContLang;
-	$align = $wgContLang->isRtl() ? 'left' : 'right';
+	/**
+	 * Entry point : initialise variables and call subfunctions.
+	 * @param $par String: becomes "FOO" when called like Special:Allpages/FOO (default NULL)
+	 * @param $specialPage See the SpecialPage object.
+	 */
+	function execute( $par ) {
+		global $wgRequest, $wgOut, $wgContLang;
 
-	# TODO: Either make this *much* faster or cache the title index points
-	# in the querycache table.
+		$this->setHeaders();
+		$this->outputHeader();
 
-	$dbr = wfGetDB( DB_SLAVE );
-	$out = "";
-	$where = array( 'page_namespace' => $namespace );
+		# GET values
+		$from = $wgRequest->getVal( 'from', null );
+		$to = $wgRequest->getVal( 'to', null );
+		$namespace = $wgRequest->getInt( 'namespace' );
 
-	global $wgMemc;
-	$key = wfMemcKey( 'allpages', 'ns', $namespace );
-	$lines = $wgMemc->get( $key );
+		$namespaces = $wgContLang->getNamespaces();
 
-	if( !is_array( $lines ) ) {
-		$options = array( 'LIMIT' => 1 );
-		if ( ! $dbr->implicitOrderby() ) {
-			$options['ORDER BY'] = 'page_title';
+		$wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) )  ?
+			wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
+			wfMsg( 'allarticles' )
+		);
+
+		if( isset($par) ) {
+			$this->showChunk( $namespace, $par, $to );
+		} elseif( isset($from) && !isset($to) ) {
+			$this->showChunk( $namespace, $from, $to );
+		} else {
+			$this->showToplevel( $namespace, $from, $to );
 		}
-		$firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options );
-		$lastTitle = $firstTitle;
-
-		# This array is going to hold the page_titles in order.
-		$lines = array( $firstTitle );
-
-		# If we are going to show n rows, we need n+1 queries to find the relevant titles.
-		$done = false;
-		for( $i = 0; !$done; ++$i ) {
-			// Fetch the last title of this chunk and the first of the next
-			$chunk = is_null( $lastTitle )
-				? ''
-				: 'page_title >= ' . $dbr->addQuotes( $lastTitle );
-			$res = $dbr->select(
-				'page', /* FROM */
-				'page_title', /* WHAT */
-				$where + array($chunk),
-				__METHOD__,
-				array ('LIMIT' => 2, 'OFFSET' => $this->maxPerPage - 1, 'ORDER BY' => 'page_title') );
+	}
 
-			if ( $s = $dbr->fetchObject( $res ) ) {
-				array_push( $lines, $s->page_title );
-			} else {
-				// Final chunk, but ended prematurely. Go back and find the end.
-				$endTitle = $dbr->selectField( 'page', 'MAX(page_title)',
-					array(
-						'page_namespace' => $namespace,
-						$chunk
-					), __METHOD__ );
-				array_push( $lines, $endTitle );
-				$done = true;
+	/**
+	 * HTML for the top form
+	 * @param integer $namespace A namespace constant (default NS_MAIN).
+	 * @param string $from dbKey we are starting listing at.
+	 * @param string $to dbKey we are ending listing at.
+	 */
+	function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '' ) {
+	    global $wgScript;
+	    $t = $this->getTitle();
+
+	    $out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
+	    $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+	    $out .= Xml::hidden( 'title', $t->getPrefixedText() );
+	    $out .= Xml::openElement( 'fieldset' );
+	    $out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
+	    $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
+	    $out .= "<tr>
+	            <td class='mw-label'>" .
+	                Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
+	            "</td>
+	            <td class='mw-input'>" .
+	                Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
+	            "</td>
+	        </tr>
+	        <tr>
+	            <td class='mw-label'>" .
+	                Xml::label( wfMsg( 'allpagesto' ), 'nsto' ) .
+	            "</td>
+	            <td class='mw-input'>" .
+	                Xml::input( 'to', 30, str_replace('_',' ',$to), array( 'id' => 'nsto' ) ) .
+	            "</td>
+	        </tr>
+	        <tr>
+	            <td class='mw-label'>" .
+	                Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+	            "</td>
+	            <td class='mw-input'>" .
+	                Xml::namespaceSelector( $namespace, null ) . ' ' .
+	                Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
+	            "</td>
+	            </tr>";
+	    $out .= Xml::closeElement( 'table' );
+	    $out .= Xml::closeElement( 'fieldset' );
+	    $out .= Xml::closeElement( 'form' );
+	    $out .= Xml::closeElement( 'div' );
+	    return $out;
+	}
+
+	/**
+	 * @param integer $namespace (default NS_MAIN)
+	 */
+	function showToplevel( $namespace = NS_MAIN, $from = '', $to = '' ) {
+		global $wgOut, $wgContLang;
+		$align = $wgContLang->isRtl() ? 'left' : 'right';
+
+		# TODO: Either make this *much* faster or cache the title index points
+		# in the querycache table.
+
+		$dbr = wfGetDB( DB_SLAVE );
+		$out = "";
+		$where = array( 'page_namespace' => $namespace );
+
+		$from = Title::makeTitleSafe( $namespace, $from );
+		$to = Title::makeTitleSafe( $namespace, $to );
+		$from = ( $from && $from->isLocal() ) ? $from->getDBKey() : null;
+		$to = ( $to && $to->isLocal() ) ? $to->getDBKey() : null;
+
+		if( isset($from) )
+			$where[] = 'page_title >= '.$dbr->addQuotes( $from );
+		if( isset($to) )
+			$where[] = 'page_title <= '.$dbr->addQuotes( $to );
+
+		global $wgMemc;
+		$key = wfMemcKey( 'allpages', 'ns', $namespace, $from, $to );
+		$lines = $wgMemc->get( $key );
+
+		$count = $dbr->estimateRowCount( 'page', '*', $where, __METHOD__ );
+		$maxPerSubpage = intval($count/$this->maxLineCount);
+		$maxPerSubpage = max($maxPerSubpage,$this->maxPerPage);
+
+		if( !is_array( $lines ) ) {
+			$options = array( 'LIMIT' => 1 );
+			$options['ORDER BY'] = 'page_title ASC';
+			$firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options );
+			$lastTitle = $firstTitle;
+			# This array is going to hold the page_titles in order.
+			$lines = array( $firstTitle );
+			# If we are going to show n rows, we need n+1 queries to find the relevant titles.
+			$done = false;
+			while( !$done ) {
+				// Fetch the last title of this chunk and the first of the next
+				$chunk = ( $lastTitle === false )
+					? array()
+					: array( 'page_title >= ' . $dbr->addQuotes( $lastTitle ) );
+				$res = $dbr->select( 'page', /* FROM */
+					'page_title', /* WHAT */
+					array_merge($where,$chunk),
+					__METHOD__,
+					array ('LIMIT' => 2, 'OFFSET' => $maxPerSubpage - 1, 'ORDER BY' => 'page_title ASC')
+				);
+
+				if( $s = $dbr->fetchObject( $res ) ) {
+					array_push( $lines, $s->page_title );
+				} else {
+					// Final chunk, but ended prematurely. Go back and find the end.
+					$endTitle = $dbr->selectField( 'page', 'MAX(page_title)',
+						array_merge($where,$chunk),
+						__METHOD__ );
+					array_push( $lines, $endTitle );
+					$done = true;
+				}
+				if( $s = $res->fetchObject() ) {
+					array_push( $lines, $s->page_title );
+					$lastTitle = $s->page_title;
+				} else {
+					// This was a final chunk and ended exactly at the limit.
+					// Rare but convenient!
+					$done = true;
+				}
+				$res->free();
 			}
-			if( $s = $dbr->fetchObject( $res ) ) {
-				array_push( $lines, $s->page_title );
-				$lastTitle = $s->page_title;
+			$wgMemc->add( $key, $lines, 3600 );
+		}
+
+		// If there are only two or less sections, don't even display them.
+		// Instead, display the first section directly.
+		if( count( $lines ) <= 2 ) {
+			if( !empty($lines) ) {
+				$this->showChunk( $namespace, $lines[0], $lines[count($lines)-1] );
 			} else {
-				// This was a final chunk and ended exactly at the limit.
-				// Rare but convenient!
-				$done = true;
+				$wgOut->addHTML( $this->namespaceForm( $namespace, $from, $to ) );
 			}
-			$dbr->freeResult( $res );
+			return;
 		}
-		$wgMemc->add( $key, $lines, 3600 );
-	}
 
-	// If there are only two or less sections, don't even display them.
-	// Instead, display the first section directly.
-	if( count( $lines ) <= 2 ) {
-		$this->showChunk( $namespace, '', $including );
-		return;
-	}
+		# At this point, $lines should contain an even number of elements.
+		$out .= "<table class='allpageslist' style='background: inherit;'>";
+		while( count ( $lines ) > 0 ) {
+			$inpoint = array_shift( $lines );
+			$outpoint = array_shift( $lines );
+			$out .= $this->showline( $inpoint, $outpoint, $namespace );
+		}
+		$out .= '</table>';
+		$nsForm = $this->namespaceForm( $namespace, $from, $to );
 
-	# At this point, $lines should contain an even number of elements.
-	$out .= "<table class='allpageslist' style='background: inherit;'>";
-	while ( count ( $lines ) > 0 ) {
-		$inpoint = array_shift ( $lines );
-		$outpoint = array_shift ( $lines );
-		$out .= $this->showline ( $inpoint, $outpoint, $namespace, false );
-	}
-	$out .= '</table>';
-	$nsForm = $this->namespaceForm( $namespace, '', false );
-
-	# Is there more?
-	if ( $including ) {
-		$out2 = '';
-	} else {
-		$morelinks = '';
-		if ( $morelinks != '' ) {
-			$out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
-			$out2 .= '<tr valign="top"><td>' . $nsForm;
-			$out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">';
-			$out2 .= $morelinks . '</td></tr></table><hr />';
+		# Is there more?
+		if( $this->including() ) {
+			$out2 = '';
 		} else {
-			$out2 = $nsForm . '<hr />';
+			if( isset($from) || isset($to) ) {
+				global $wgUser;
+				$out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
+				$out2 .= '<tr valign="top"><td>' . $nsForm;
+				$out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
+					$wgUser->getSkin()->makeKnownLinkObj( $this->getTitle(), wfMsgHtml ( 'allpages' ) );
+				$out2 .= "</td></tr></table><hr />";
+			} else {
+				$out2 = $nsForm . '<hr />';
+			}
 		}
+		$wgOut->addHTML( $out2 . $out );
 	}
 
-	$wgOut->addHtml( $out2 . $out );
-}
-
-/**
- * @todo Document
- * @param string $from
- * @param integer $namespace (Default NS_MAIN)
- */
-function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
-	global $wgContLang;
-	$align = $wgContLang->isRtl() ? 'left' : 'right';
-	$inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) );
-	$outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint ) );
-	$queryparams = ($namespace ? "namespace=$namespace" : '');
-	$special = SpecialPage::getTitleFor( $this->name, $inpoint );
-	$link = $special->escapeLocalUrl( $queryparams );
-
-	$out = wfMsgHtml(
-		'alphaindexline',
-		"<a href=\"$link\">$inpointf</a></td><td><a href=\"$link\">",
-		"</a></td><td><a href=\"$link\">$outpointf</a>"
-	);
-	return '<tr><td align="' . $align . '">'.$out.'</td></tr>';
-}
+	/**
+	 * Show a line of "ABC to DEF" ranges of articles
+	 * @param string $inpoint Lower limit of pagenames
+	 * @param string $outpout Upper limit of pagenames
+	 * @param integer $namespace (Default NS_MAIN)
+	 */
+	function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
+		global $wgContLang;
+		$align = $wgContLang->isRtl() ? 'left' : 'right';
+		$inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) );
+		$outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint ) );
+		// Don't let the length runaway
+		$inpointf = $wgContLang->truncate( $inpointf, $this->maxPageLength, '...' );
+		$outpointf = $wgContLang->truncate( $outpointf, $this->maxPageLength, '...' );
+
+		$queryparams = $namespace ? "namespace=$namespace&" : '';
+		$special = $this->getTitle();
+		$link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) );
+
+		$out = wfMsgHtml( 'alphaindexline',
+			"<a href=\"$link\">$inpointf</a></td><td>",
+			"</td><td><a href=\"$link\">$outpointf</a>"
+		);
+		return '<tr><td align="' . $align . '">'.$out.'</td></tr>';
+	}
 
-/**
- * @param integer $namespace (Default NS_MAIN)
- * @param string $from list all pages from this name (default FALSE)
- */
-function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
-	global $wgOut, $wgUser, $wgContLang;
+	/**
+	 * @param integer $namespace (Default NS_MAIN)
+	 * @param string $from list all pages from this name (default FALSE)
+	 * @param string $to list all pages to this name (default FALSE)
+	 */
+	function showChunk( $namespace = NS_MAIN, $from = false, $to = false ) {
+		global $wgOut, $wgUser, $wgContLang;
 
-	$sk = $wgUser->getSkin();
+		$sk = $wgUser->getSkin();
 
-	$fromList = $this->getNamespaceKeyAndText($namespace, $from);
-	$namespaces = $wgContLang->getNamespaces();
-	$align = $wgContLang->isRtl() ? 'left' : 'right';
+		$fromList = $this->getNamespaceKeyAndText($namespace, $from);
+		$toList = $this->getNamespaceKeyAndText( $namespace, $to );
+		$namespaces = $wgContLang->getNamespaces();
+		$align = $wgContLang->isRtl() ? 'left' : 'right';
 
-	$n = 0;
+		$n = 0;
 
-	if ( !$fromList ) {
-		$out = wfMsgWikiHtml( 'allpagesbadtitle' );
-	} elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) {
-		// Show errormessage and reset to NS_MAIN
-		$out = wfMsgExt( 'allpages-bad-ns', array( 'parseinline' ), $namespace );
-		$namespace = NS_MAIN;
-	} else {
-		list( $namespace, $fromKey, $from ) = $fromList;
+		if ( !$fromList || !$toList ) {
+			$out = wfMsgWikiHtml( 'allpagesbadtitle' );
+		} elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) {
+			// Show errormessage and reset to NS_MAIN
+			$out = wfMsgExt( 'allpages-bad-ns', array( 'parseinline' ), $namespace );
+			$namespace = NS_MAIN;
+		} else {
+			list( $namespace, $fromKey, $from ) = $fromList;
+			list( $namespace2, $toKey, $to ) = $toList;
 
-		$dbr = wfGetDB( DB_SLAVE );
-		$res = $dbr->select( 'page',
-			array( 'page_namespace', 'page_title', 'page_is_redirect' ),
-			array(
+			$dbr = wfGetDB( DB_SLAVE );
+			$conds = array(
 				'page_namespace' => $namespace,
 				'page_title >= ' . $dbr->addQuotes( $fromKey )
-			),
-			__METHOD__,
-			array(
-				'ORDER BY'  => 'page_title',
-				'LIMIT'     => $this->maxPerPage + 1,
-				'USE INDEX' => 'name_title',
-			)
-		);
+			);
+			if( $toKey !== "" ) {
+				$conds[] = 'page_title <= ' . $dbr->addQuotes( $toKey );
+			}
 
-		if( $res->numRows() > 0 ) {
-			$out = '<table style="background: inherit;" border="0" width="100%">';
-	
-			while( ($n < $this->maxPerPage) && ($s = $dbr->fetchObject( $res )) ) {
-				$t = Title::makeTitle( $s->page_namespace, $s->page_title );
-				if( $t ) {
-					$link = ($s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
-						$sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) .
-						($s->page_is_redirect ? '</div>' : '' );
-				} else {
-					$link = '[[' . htmlspecialchars( $s->page_title ) . ']]';
-				}
-				if( $n % 3 == 0 ) {
-					$out .= '<tr>';
+			$res = $dbr->select( 'page',
+				array( 'page_namespace', 'page_title', 'page_is_redirect' ),
+				$conds,
+				__METHOD__,
+				array(
+					'ORDER BY'  => 'page_title',
+					'LIMIT'     => $this->maxPerPage + 1,
+					'USE INDEX' => 'name_title',
+				)
+			);
+
+			if( $res->numRows() > 0 ) {
+				$out = '<table style="background: inherit;" border="0" width="100%">';
+
+				while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
+					$t = Title::makeTitle( $s->page_namespace, $s->page_title );
+					if( $t ) {
+						$link = ( $s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
+							$sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) .
+							($s->page_is_redirect ? '</div>' : '' );
+					} else {
+						$link = '[[' . htmlspecialchars( $s->page_title ) . ']]';
+					}
+					if( $n % 3 == 0 ) {
+						$out .= '<tr>';
+					}
+					$out .= "<td width=\"33%\">$link</td>";
+					$n++;
+					if( $n % 3 == 0 ) {
+						$out .= '</tr>';
+					}
 				}
-				$out .= "<td width=\"33%\">$link</td>";
-				$n++;
-				if( $n % 3 == 0 ) {
+				if( ($n % 3) != 0 ) {
 					$out .= '</tr>';
 				}
+				$out .= '</table>';
+			} else {
+				$out = '';
 			}
-			if( ($n % 3) != 0 ) {
-				$out .= '</tr>';
-			}
-			$out .= '</table>';
-		} else {
-			$out = '';
 		}
-	}
 
-	if ( $including ) {
-		$out2 = '';
-	} else {
-		if( $from == '' ) {
-			// First chunk; no previous link.
-			$prevTitle = null;
+		if ( $this->including() ) {
+			$out2 = '';
 		} else {
-			# Get the last title from previous chunk
-			$dbr = wfGetDB( DB_SLAVE );
-			$res_prev = $dbr->select(
-				'page',
-				'page_title',
-				array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ),
-				__METHOD__,
-				array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) )
-			);
-
-			# Get first title of previous complete chunk
-			if( $dbr->numrows( $res_prev ) >= $this->maxPerPage ) {
-				$pt = $dbr->fetchObject( $res_prev );
-				$prevTitle = Title::makeTitle( $namespace, $pt->page_title );
+			if( $from == '' ) {
+				// First chunk; no previous link.
+				$prevTitle = null;
 			} else {
-				# The previous chunk is not complete, need to link to the very first title
-				# available in the database
-				$options = array( 'LIMIT' => 1 );
-				if ( ! $dbr->implicitOrderby() ) {
-					$options['ORDER BY'] = 'page_title';
-				}
-				$reallyFirstPage_title = $dbr->selectField( 'page', 'page_title', array( 'page_namespace' => $namespace ), __METHOD__, $options );
-				# Show the previous link if it s not the current requested chunk
-				if( $from != $reallyFirstPage_title ) {
-					$prevTitle =  Title::makeTitle( $namespace, $reallyFirstPage_title );
+				# Get the last title from previous chunk
+				$dbr = wfGetDB( DB_SLAVE );
+				$res_prev = $dbr->select(
+					'page',
+					'page_title',
+					array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ),
+					__METHOD__,
+					array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) )
+				);
+
+				# Get first title of previous complete chunk
+				if( $dbr->numrows( $res_prev ) >= $this->maxPerPage ) {
+					$pt = $dbr->fetchObject( $res_prev );
+					$prevTitle = Title::makeTitle( $namespace, $pt->page_title );
 				} else {
-					$prevTitle = null;
+					# The previous chunk is not complete, need to link to the very first title
+					# available in the database
+					$options = array( 'LIMIT' => 1 );
+					if ( ! $dbr->implicitOrderby() ) {
+						$options['ORDER BY'] = 'page_title';
+					}
+					$reallyFirstPage_title = $dbr->selectField( 'page', 'page_title',
+						array( 'page_namespace' => $namespace ), __METHOD__, $options );
+					# Show the previous link if it s not the current requested chunk
+					if( $from != $reallyFirstPage_title ) {
+						$prevTitle =  Title::makeTitle( $namespace, $reallyFirstPage_title );
+					} else {
+						$prevTitle = null;
+					}
 				}
 			}
-		}
 
-		$nsForm = $this->namespaceForm( $namespace, $from );
-		$out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
-		$out2 .= '<tr valign="top"><td>' . $nsForm;
-		$out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
-				$sk->makeKnownLink( $wgContLang->specialPage( "Allpages" ),
-					wfMsgHtml ( 'allpages' ) );
-
-		$self = SpecialPage::getTitleFor( 'Allpages' );
-
-		# Do we put a previous link ?
-		if( isset( $prevTitle ) &&  $pt = $prevTitle->getText() ) {
-			$q = 'from=' . $prevTitle->getPartialUrl()
-				. ( $namespace ? '&namespace=' . $namespace : '' );
-			$prevLink = $sk->makeKnownLinkObj( $self,
-				wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q );
-			$out2 .= ' | ' . $prevLink;
-		}
+			$self = $this->getTitle();
 
-		if( $n == $this->maxPerPage && $s = $dbr->fetchObject($res) ) {
-			# $s is the first link of the next chunk
-			$t = Title::MakeTitle($namespace, $s->page_title);
-			$q = 'from=' . $t->getPartialUrl()
-				. ( $namespace ? '&namespace=' . $namespace : '' );
-			$nextLink = $sk->makeKnownLinkObj( $self,
-				wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q );
-			$out2 .= ' | ' . $nextLink;
-		}
-		$out2 .= "</td></tr></table><hr />";
-	}
+			$nsForm = $this->namespaceForm( $namespace, $from, $to );
+			$out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
+			$out2 .= '<tr valign="top"><td>' . $nsForm;
+			$out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
+					$sk->makeKnownLinkObj( $self,
+						wfMsgHtml ( 'allpages' ) );
+
+			# Do we put a previous link ?
+			if( isset( $prevTitle ) &&  $pt = $prevTitle->getText() ) {
+				$q = 'from=' . $prevTitle->getPartialUrl()
+					. ( $namespace ? '&namespace=' . $namespace : '' );
+				$prevLink = $sk->makeKnownLinkObj( $self,
+					wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q );
+				$out2 .= ' | ' . $prevLink;
+			}
 
-	$wgOut->addHtml( $out2 . $out );
-	if( isset($prevLink) or isset($nextLink) ) {
-		$wgOut->addHtml( '<hr /><p style="font-size: smaller; float: ' . $align . '">' );
-		if( isset( $prevLink ) ) {
-			$wgOut->addHTML( $prevLink );
-		}
-		if( isset( $prevLink ) && isset( $nextLink ) ) {
-			$wgOut->addHTML( ' | ' );
-		}
-		if( isset( $nextLink ) ) {
-			$wgOut->addHTML( $nextLink );
+			if( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
+				# $s is the first link of the next chunk
+				$t = Title::MakeTitle($namespace, $s->page_title);
+				$q = 'from=' . $t->getPartialUrl()
+					. ( $namespace ? '&namespace=' . $namespace : '' );
+				$nextLink = $sk->makeKnownLinkObj( $self,
+					wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q );
+				$out2 .= ' | ' . $nextLink;
+			}
+			$out2 .= "</td></tr></table><hr />";
 		}
-		$wgOut->addHTML( '</p>' );
 
-	}
+		$wgOut->addHTML( $out2 . $out );
+		if( isset($prevLink) or isset($nextLink) ) {
+			$wgOut->addHTML( '<hr /><p style="font-size: smaller; float: ' . $align . '">' );
+			if( isset( $prevLink ) ) {
+				$wgOut->addHTML( $prevLink );
+			}
+			if( isset( $prevLink ) && isset( $nextLink ) ) {
+				$wgOut->addHTML( ' | ' );
+			}
+			if( isset( $nextLink ) ) {
+				$wgOut->addHTML( $nextLink );
+			}
+			$wgOut->addHTML( '</p>' );
 
-}
+		}
 
-/**
- * @param int $ns the namespace of the article
- * @param string $text the name of the article
- * @return array( int namespace, string dbkey, string pagename ) or NULL on error
- * @static (sort of)
- * @access private
- */
-function getNamespaceKeyAndText ($ns, $text) {
-	if ( $text == '' )
-		return array( $ns, '', '' ); # shortcut for common case
-
-	$t = Title::makeTitleSafe($ns, $text);
-	if ( $t && $t->isLocal() ) {
-		return array( $t->getNamespace(), $t->getDBkey(), $t->getText() );
-	} else if ( $t ) {
-		return NULL;
 	}
 
-	# try again, in case the problem was an empty pagename
-	$text = preg_replace('/(#|$)/', 'X$1', $text);
-	$t = Title::makeTitleSafe($ns, $text);
-	if ( $t && $t->isLocal() ) {
-		return array( $t->getNamespace(), '', '' );
-	} else {
-		return NULL;
+	/**
+	 * @param int $ns the namespace of the article
+	 * @param string $text the name of the article
+	 * @return array( int namespace, string dbkey, string pagename ) or NULL on error
+	 * @static (sort of)
+	 * @access private
+	 */
+	function getNamespaceKeyAndText($ns, $text) {
+		if ( $text == '' )
+			return array( $ns, '', '' ); # shortcut for common case
+
+		$t = Title::makeTitleSafe($ns, $text);
+		if ( $t && $t->isLocal() ) {
+			return array( $t->getNamespace(), $t->getDBkey(), $t->getText() );
+		} else if ( $t ) {
+			return NULL;
+		}
+
+		# try again, in case the problem was an empty pagename
+		$text = preg_replace('/(#|$)/', 'X$1', $text);
+		$t = Title::makeTitleSafe($ns, $text);
+		if ( $t && $t->isLocal() ) {
+			return array( $t->getNamespace(), '', '' );
+		} else {
+			return NULL;
+		}
 	}
 }
-}
diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 52829d92..4d82997f 100644
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -47,7 +47,7 @@ class IPBlockForm {
 #	var $BlockEmail;
 
 	function IPBlockForm( $par ) {
-		global $wgRequest, $wgUser;
+		global $wgRequest, $wgUser, $wgBlockAllowsUTEdit;
 
 		$this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip', $par ) );
 		$this->BlockAddress = strtr( $this->BlockAddress, '_', ' ' );
@@ -66,6 +66,8 @@ class IPBlockForm {
 		$this->BlockWatchUser = $wgRequest->getBool( 'wpWatchUser', false );
 		# Re-check user's rights to hide names, very serious, defaults to 0
 		$this->BlockHideName = ( $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ) ) ? 1 : 0;
+		$this->BlockAllowUsertalk = ( $wgRequest->getBool( 'wpAllowUsertalk', $byDefault ) && $wgBlockAllowsUTEdit );
+		$this->BlockReblock = $wgRequest->getBool( 'wpChangeBlock', false );
 	}
 
 	function showForm( $err ) {
@@ -85,10 +87,26 @@ class IPBlockForm {
 		$mIpbreason = Xml::label( wfMsg( 'ipbotherreason' ), 'mw-bi-reason' );
 
 		$titleObj = SpecialPage::getTitleFor( 'Blockip' );
-
-		if ( "" != $err ) {
+		$user = User::newFromName( $this->BlockAddress );
+		
+		$alreadyBlocked = false;
+		if ( $err && $err[0] != 'ipb_already_blocked' ) {
+			$key = array_shift($err);
+			$msg = wfMsgReal($key, $err);
 			$wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
-			$wgOut->addHTML( Xml::tags( 'p', array( 'class' => 'error' ), $err ) );
+			$wgOut->addHTML( Xml::tags( 'p', array( 'class' => 'error' ), $msg ) );
+		} elseif ( $this->BlockAddress ) {
+			$userId = 0;
+			if ( is_object( $user ) )
+				$userId = $user->getId();
+			$currentBlock = Block::newFromDB( $this->BlockAddress, $userId );
+			if ( !is_null($currentBlock) && !$currentBlock->mAuto && # The block exists and isn't an autoblock
+				( $currentBlock->mRangeStart == $currentBlock->mRangeEnd || # The block isn't a rangeblock
+				# or if it is, the range is what we're about to block
+				( $currentBlock->mAddress == $this->BlockAddress ) ) ) {
+					$wgOut->addWikiMsg( 'ipb-needreblock', $this->BlockAddress );
+					$alreadyBlocked = true;
+			}
 		}
 
 		$scBlockExpiryOptions = wfMsgForContent( 'ipboptions' );
@@ -108,7 +126,7 @@ class IPBlockForm {
 
 		$reasonDropDown = Xml::listDropDown( 'wpBlockReasonList',
 			wfMsgForContent( 'ipbreason-dropdown' ),
-			wfMsgForContent( 'ipbreasonotherlist' ), '', 'wpBlockDropDown', 4 );
+			wfMsgForContent( 'ipbreasonotherlist' ), $this->BlockReasonList, 'wpBlockDropDown', 4 );
 
 		global $wgStylePath, $wgStyleVersion;
 		$wgOut->addHTML(
@@ -201,7 +219,7 @@ class IPBlockForm {
 			</tr>"
 		);
 
-		global $wgSysopEmailBans;
+		global $wgSysopEmailBans, $wgBlockAllowsUTEdit;
 		if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
 			$wgOut->addHTML("
 				<tr id='wpEnableEmailBan'>
@@ -240,25 +258,37 @@ class IPBlockForm {
 				</td>
 			</tr>"
 		);
+		if( $wgBlockAllowsUTEdit ){
+			$wgOut->addHTML("
+				<tr id='wpAllowUsertalkRow'>
+					<td>&nbsp;</td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'ipballowusertalk' ),
+							'wpAllowUsertalk', 'wpAllowUsertalk', $this->BlockAllowUsertalk,
+							array( 'tabindex' => '12' ) ) . "
+					</td>
+				</tr>"
+			);
+		}
 
 		$wgOut->addHTML("
 			<tr>
 				<td style='padding-top: 1em'>&nbsp;</td>
 				<td  class='mw-submit' style='padding-top: 1em'>" .
-					Xml::submitButton( wfMsg( 'ipbsubmit' ),
-						array( 'name' => 'wpBlock', 'tabindex' => '12' ) ) . "
+					Xml::submitButton( wfMsg( $alreadyBlocked ? 'ipb-change-block' : 'ipbsubmit' ),
+						array( 'name' => 'wpBlock', 'tabindex' => '13', 'accesskey' => 's' ) ) . "
 				</td>
 			</tr>" .
 			Xml::closeElement( 'table' ) .
 			Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
+			( $alreadyBlocked ? Xml::hidden( 'wpChangeBlock', 1 ) : "" ) .
 			Xml::closeElement( 'fieldset' ) .
 			Xml::closeElement( 'form' ) .
 			Xml::tags( 'script', array( 'type' => 'text/javascript' ), 'updateBlockOptions()' ) . "\n"
 		);
 
-		$wgOut->addHtml( $this->getConvenienceLinks() );
+		$wgOut->addHTML( $this->getConvenienceLinks() );
 
-		$user = User::newFromName( $this->BlockAddress );
 		if( is_object( $user ) ) {
 			$this->showLogFragment( $wgOut, $user->getUserPage() );
 		} elseif( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', $this->BlockAddress ) ) {
@@ -273,9 +303,8 @@ class IPBlockForm {
 	 * $userID and $expiry will be filled accordingly
 	 * @return array(message key, arguments) on failure, empty array on success
 	 */
-	function doBlock(&$userId = null, &$expiry = null)
-	{
-		global $wgUser, $wgSysopUserBans, $wgSysopRangeBans;
+	function doBlock( &$userId = null, &$expiry = null ) {
+		global $wgUser, $wgSysopUserBans, $wgSysopRangeBans, $wgBlockAllowsUTEdit;
 
 		$userId = 0;
 		# Expand valid IPv6 addresses, usernames are left as is
@@ -327,8 +356,12 @@ class IPBlockForm {
 			}
 		}
 
+		if ( $wgUser->isBlocked() && ( $wgUser->getId() !== $userId ) ) {
+			return array( 'cant-block-while-blocked' );
+		}
+
 		$reasonstr = $this->BlockReasonList;
-		if ( $reasonstr != 'other' && $this->BlockReason != '') {
+		if ( $reasonstr != 'other' && $this->BlockReason != '' ) {
 			// Entry from drop down menu + additional comment
 			$reasonstr .= ': ' . $this->BlockReason;
 		} elseif ( $reasonstr == 'other' ) {
@@ -339,7 +372,7 @@ class IPBlockForm {
 		if( $expirestr == 'other' )
 			$expirestr = $this->BlockOther;
 
-		if ((strlen($expirestr) == 0) || (strlen($expirestr) > 50)) {
+		if ( ( strlen( $expirestr ) == 0) || ( strlen( $expirestr ) > 50) ) {
 			return array('ipb_expiry_invalid');
 		}
 		
@@ -358,14 +391,27 @@ class IPBlockForm {
 		$block = new Block( $this->BlockAddress, $userId, $wgUser->getId(),
 			$reasonstr, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly,
 			$this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName,
-			$this->BlockEmail );
+			$this->BlockEmail, isset( $this->BlockAllowUsertalk ) ? $this->BlockAllowUsertalk : $wgBlockAllowsUTEdit );
 
 		if ( wfRunHooks('BlockIp', array(&$block, &$wgUser)) ) {
 
 			if ( !$block->insert() ) {
-				return array('ipb_already_blocked', htmlspecialchars($this->BlockAddress));
+				if ( !$this->BlockReblock ) {
+					return array( 'ipb_already_blocked' );
+				} else {
+					# This returns direct blocks before autoblocks/rangeblocks, since we should
+					# be sure the user is blocked by now it should work for our purposes
+					$currentBlock = Block::newFromDB( $this->BlockAddress, $userId );
+					if( $block->equals( $currentBlock ) ) {
+						return array( 'ipb_already_blocked' );
+					}
+					$currentBlock->delete();
+					$block->insert();
+					$log_action = 'reblock';
+				}
+			} else {
+				$log_action = 'block';
 			}
-
 			wfRunHooks('BlockIpComplete', array($block, $wgUser));
 
 			if ( $this->BlockWatchUser ) { 
@@ -380,7 +426,7 @@ class IPBlockForm {
 			# Make log entry, if the name is hidden, put it in the oversight log
 			$log_type = ($this->BlockHideName) ? 'suppress' : 'block';
 			$log = new LogPage( $log_type );
-			$log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
+			$log->addEntry( $log_action, Title::makeTitle( NS_USER, $this->BlockAddress ),
 			  $reasonstr, $logParams );
 
 			# Report to the user
@@ -404,8 +450,7 @@ class IPBlockForm {
 				urlencode( $this->BlockAddress ) ) );
 			return;
 		}
-		$key = array_shift($retval);
-		$this->showForm(wfMsgReal($key, $retval));
+		$this->showForm( $retval );
 	}
 
 	function showSuccess() {
@@ -414,12 +459,22 @@ class IPBlockForm {
 		$wgOut->setPagetitle( wfMsg( 'blockip' ) );
 		$wgOut->setSubtitle( wfMsg( 'blockipsuccesssub' ) );
 		$text = wfMsgExt( 'blockipsuccesstext', array( 'parse' ), $this->BlockAddress );
-		$wgOut->addHtml( $text );
+		$wgOut->addHTML( $text );
 	}
 
 	function showLogFragment( $out, $title ) {
-		$out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
-		LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() );
+		global $wgUser;
+		$out->addHTML( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
+		$count = LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText(), '', 10 );
+		if($count > 10){
+			$out->addHTML( $wgUser->getSkin()->link(
+				SpecialPage::getTitleFor( 'Log' ),
+				wfMsgHtml( 'blocklog-fulllog' ),
+				array(),
+				array(
+					'type' => 'block',
+					'page' => $title->getPrefixedText() ) ) );
+		}
 	}
 
 	/**
@@ -429,6 +484,7 @@ class IPBlockForm {
 	 * @return array
 	 */
 	private function blockLogFlags() {
+		global $wgBlockAllowsUTEdit;
 		$flags = array();
 		if( $this->BlockAnonOnly && IP::isIPAddress( $this->BlockAddress ) )
 					// when blocking a user the option 'anononly' is not available/has no effect -> do not write this into log
@@ -439,6 +495,8 @@ class IPBlockForm {
 			$flags[] = 'noautoblock';
 		if ( $this->BlockEmail )
 			$flags[] = 'noemail';
+		if ( !$this->BlockAllowUsertalk && $wgBlockAllowsUTEdit )
+			$flags[] = 'nousertalk';
 		return implode( ',', $flags );
 	}
 
@@ -450,11 +508,25 @@ class IPBlockForm {
 	private function getConvenienceLinks() {
 		global $wgUser;
 		$skin = $wgUser->getSkin();
-		$links[] = $skin->makeLink ( 'MediaWiki:Ipbreason-dropdown', wfMsgHtml( 'ipb-edit-dropdown' ) );
+		if( $this->BlockAddress )
+			$links[] = $this->getContribsLink( $skin );
 		$links[] = $this->getUnblockLink( $skin );
 		$links[] = $this->getBlockListLink( $skin );
+		$links[] = $skin->makeLink ( 'MediaWiki:Ipbreason-dropdown', wfMsgHtml( 'ipb-edit-dropdown' ) );
 		return '<p class="mw-ipb-conveniencelinks">' . implode( ' | ', $links ) . '</p>';
 	}
+	
+	/**
+	 * Build a convenient link to a user or IP's contribs
+	 * form
+	 *
+	 * @param $skin Skin to use
+	 * @return string
+	 */
+	private function getContribsLink( $skin ) {
+		$contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->BlockAddress );
+		return $skin->link( $contribsPage, wfMsgHtml( 'ipb-blocklist-contribs', $this->BlockAddress ) );
+	}
 
 	/**
 	 * Build a convenient link to unblock the given username or IP
@@ -491,4 +563,77 @@ class IPBlockForm {
 			return $skin->makeKnownLinkObj( $list, wfMsgHtml( 'ipb-blocklist' ) );
 		}
 	}
+	
+	/**
+	* Block a list of selected users
+	* @param array $users
+	* @param string $reason
+	* @param string $tag replaces user pages
+	* @param string $talkTag replaces user talk pages
+	* @returns array, list of html-safe usernames
+	*/
+	public static function doMassUserBlock( $users, $reason = '', $tag = '', $talkTag = '' ) {
+		global $wgUser;
+		$counter = $blockSize = 0;
+		$safeUsers = array();
+		$log = new LogPage( 'block' );
+		foreach( $users as $name ) {
+			# Enforce limits
+			$counter++;
+			$blockSize++;
+			# Lets not go *too* fast
+			if( $blockSize >= 20 ) {
+				$blockSize = 0;
+				wfWaitForSlaves( 5 );
+			}
+			$u = User::newFromName( $name, false );
+			// If user doesn't exist, it ought to be an IP then
+			if( is_null($u) || (!$u->getId() && !IP::isIPAddress( $u->getName() )) ) {
+				continue;
+			}
+			$userTitle = $u->getUserPage();
+			$userTalkTitle = $u->getTalkPage();
+			$userpage = new Article( $userTitle );
+			$usertalk = new Article( $userTalkTitle );
+			$safeUsers[] = '[[' . $userTitle->getPrefixedText() . '|' . $userTitle->getText() . ']]';
+			$expirestr = $u->getId() ? 'indefinite' : '1 week';
+			$expiry = Block::parseExpiryInput( $expirestr );
+			$anonOnly = IP::isIPAddress( $u->getName() ) ? 1 : 0;
+			// Create the block
+			$block = new Block( $u->getName(), // victim
+				$u->getId(), // uid
+				$wgUser->getId(), // blocker
+				$reason, // comment
+				wfTimestampNow(), // block time
+				0, // auto ?
+				$expiry, // duration
+				$anonOnly, // anononly?
+				1, // block account creation?
+				1, // autoblocking?
+				0, // suppress name?
+				0 // block from sending email?
+			);
+			$oldblock = Block::newFromDB( $u->getName(), $u->getId() );
+			if( !$oldblock ) {
+				$block->insert();
+				# Prepare log parameters
+				$logParams = array();
+				$logParams[] = $expirestr;
+				if( $anonOnly ) {
+					$logParams[] = 'anononly';
+				}
+				$logParams[] = 'nocreate';
+				# Add log entry
+				$log->addEntry( 'block', $userTitle, $reason, $logParams );
+			}
+			# Tag userpage! (check length to avoid mistakes)
+			if( strlen($tag) > 2 ) {
+				$userpage->doEdit( $tag, $reason, EDIT_MINOR );
+			}
+			if( strlen($talkTag) > 2 ) {
+				$usertalk->doEdit( $talkTag, $reason, EDIT_MINOR );
+			}
+		}
+		return $safeUsers;
+	}
 }
diff --git a/includes/specials/SpecialBooksources.php b/includes/specials/SpecialBooksources.php
index 0690c5c0..12b119d8 100644
--- a/includes/specials/SpecialBooksources.php
+++ b/includes/specials/SpecialBooksources.php
@@ -30,20 +30,62 @@ class SpecialBookSources extends SpecialPage {
 	public function execute( $isbn ) {
 		global $wgOut, $wgRequest;
 		$this->setHeaders();
-		$this->isbn = $this->cleanIsbn( $isbn ? $isbn : $wgRequest->getText( 'isbn' ) );
+		$this->isbn = self::cleanIsbn( $isbn ? $isbn : $wgRequest->getText( 'isbn' ) );
 		$wgOut->addWikiMsg( 'booksources-summary' );
-		$wgOut->addHtml( $this->makeForm() );
-		if( strlen( $this->isbn ) > 0 )
+		$wgOut->addHTML( $this->makeForm() );
+		if( strlen( $this->isbn ) > 0 ) {
+			if( !$this->isValidIsbn( $this->isbn ) ) {
+				$wgOut->wrapWikiMsg( '<div class="error">$1</div>', 'booksources-invalid-isbn' );
+			}
 			$this->showList();
+		}
 	}
 
 	/**
+	 * Returns whether a given ISBN (10 or 13) is valid.  True indicates validity.
+	 * @param isbn ISBN passed for check
+	 */
+	public static function isValidISBN( $isbn ) {
+		$isbn = self::cleanIsbn( $isbn );
+		$sum = 0;
+		$check = -1;
+		if( strlen( $isbn ) == 13 ) {
+			for( $i = 0; $i < 12; $i++ ) {
+				if($i % 2 == 0) {
+					$sum += $isbn{$i};
+				} else {
+					$sum += 3 * $isbn{$i};
+				}
+			}
+		
+			$check = (10 - ($sum % 10)) % 10;
+			if ($check == $isbn{12}) {
+				return true;
+			}
+		} elseif( strlen( $isbn ) == 10 ) {
+			for($i = 0; $i < 9; $i++) {
+				$sum += $isbn{$i} * ($i + 1);
+			}
+		
+			$check = $sum % 11;
+			if($check == 10) {
+				$check = "X";
+			}
+			if($check == $isbn{9}) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
 	 * Trim ISBN and remove characters which aren't required
 	 *
 	 * @param $isbn Unclean ISBN
 	 * @return string
 	 */
-	private function cleanIsbn( $isbn ) {
+	private static function cleanIsbn( $isbn ) {
 		return trim( preg_replace( '![^0-9X]!', '', $isbn ) );
 	}
 
@@ -88,11 +130,11 @@ class SpecialBookSources extends SpecialPage {
 
 		# Fall back to the defaults given in the language file
 		$wgOut->addWikiMsg( 'booksources-text' );
-		$wgOut->addHtml( '<ul>' );
+		$wgOut->addHTML( '<ul>' );
 		$items = $wgContLang->getBookstoreList();
 		foreach( $items as $label => $url )
-			$wgOut->addHtml( $this->makeListItem( $label, $url ) );
-		$wgOut->addHtml( '</ul>' );
+			$wgOut->addHTML( $this->makeListItem( $label, $url ) );
+		$wgOut->addHTML( '</ul>' );
 		return true;
 	}
 
diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php
index 951c2228..8c2ae2b6 100644
--- a/includes/specials/SpecialCategories.php
+++ b/includes/specials/SpecialCategories.php
@@ -14,11 +14,13 @@ function wfSpecialCategories( $par=null ) {
 	}
 	$cap = new CategoryPager( $from );
 	$wgOut->addHTML(
+		XML::openElement( 'div', array('class' => 'mw-spcontent') ) .
 		wfMsgExt( 'categoriespagetext', array( 'parse' ) ) .
 		$cap->getStartForm( $from ) .
 		$cap->getNavigationBar() .
 		'<ul>' . $cap->getBody() . '</ul>' .
-		$cap->getNavigationBar()
+		$cap->getNavigationBar() .
+		XML::closeElement( 'div' )
 	);
 }
 
diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 9075fb95..e19aa99b 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -36,8 +36,9 @@ class EmailConfirmation extends UnlistedSpecialPage {
 				$title = SpecialPage::getTitleFor( 'Userlogin' );
 				$self = SpecialPage::getTitleFor( 'Confirmemail' );
 				$skin = $wgUser->getSkin();
-				$llink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $self->getPrefixedUrl() );
-				$wgOut->addHtml( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
+				$llink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 
+					'returnto=' . $self->getPrefixedUrl() );
+				$wgOut->addHTML( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
 			}
 		} else {
 			$this->attemptConfirm( $code );
@@ -58,19 +59,24 @@ class EmailConfirmation extends UnlistedSpecialPage {
 			}
 		} else {
 			if( $wgUser->isEmailConfirmed() ) {
+				// date and time are separate parameters to facilitate localisation.
+				// $time is kept for backward compat reasons.
+				// 'emailauthenticated' is also used in SpecialPreferences.php
 				$time = $wgLang->timeAndDate( $wgUser->mEmailAuthenticated, true );
-				$wgOut->addWikiMsg( 'emailauthenticated', $time );
+				$d = $wgLang->date( $wgUser->mEmailAuthenticated, true );
+				$t = $wgLang->time( $wgUser->mEmailAuthenticated, true );
+				$wgOut->addWikiMsg( 'emailauthenticated', $time, $d, $t );
 			}
 			if( $wgUser->isEmailConfirmationPending() ) {
 				$wgOut->addWikiMsg( 'confirmemail_pending' );
 			}
 			$wgOut->addWikiMsg( 'confirmemail_text' );
 			$self = SpecialPage::getTitleFor( 'Confirmemail' );
-			$form  = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
-			$form .= wfHidden( 'token', $wgUser->editToken() );
-			$form .= wfSubmitButton( wfMsgHtml( 'confirmemail_send' ) );
-			$form .= wfCloseElement( 'form' );
-			$wgOut->addHtml( $form );
+			$form  = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
+			$form .= Xml::hidden( 'token', $wgUser->editToken() );
+			$form .= Xml::submitButton( wfMsgHtml( 'confirmemail_send' ) );
+			$form .= Xml::closeElement( 'form' );
+			$wgOut->addHTML( $form );
 		}
 	}
 
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 4a131f15..3d8c18dd 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -4,6 +4,363 @@
  * @file
  * @ingroup SpecialPage
  */
+ 
+class SpecialContributions extends SpecialPage {
+
+	public function __construct() {
+		parent::__construct( 'Contributions' );
+	}
+
+	public function execute( $par ) {
+		global $wgUser, $wgOut, $wgLang, $wgRequest;
+
+		$this->setHeaders();
+		$this->outputHeader();
+
+		$this->opts = array();
+
+		if( $par == 'newbies' ) {
+			$target = 'newbies';
+			$this->opts['contribs'] = 'newbie';
+		} elseif( isset( $par ) ) {
+			$target = $par;
+		} else {
+			$target = $wgRequest->getVal( 'target' );
+		}
+
+		// check for radiobox
+		if( $wgRequest->getVal( 'contribs' ) == 'newbie' ) {
+			$target = 'newbies';
+			$this->opts['contribs'] = 'newbie';
+		}
+
+		if( !strlen( $target ) ) {
+			$wgOut->addHTML( $this->getForm( '' ) );
+			return;
+		}
+
+		$this->opts['limit'] = $wgRequest->getInt( 'limit', 50 );
+		$this->opts['target'] = $target;
+
+		$nt = Title::makeTitleSafe( NS_USER, $target );
+		if( !$nt ) {
+			$wgOut->addHTML( $this->getForm( '' ) );
+			return;
+		}
+		$id = User::idFromName( $nt->getText() );
+
+		if( $target != 'newbies' ) {
+			$target = $nt->getText();
+			$wgOut->setSubtitle( $this->contributionsSub( $nt, $id ) );
+			$wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'contributions-title', $target ) ) );
+		} else {
+			$wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
+			$wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'sp-contributions-newbies-title' ) ) );
+		}
+
+		if( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
+			$this->opts['namespace'] = intval( $ns );
+		} else {
+			$this->opts['namespace'] = '';
+		}
+	
+		// Allows reverts to have the bot flag in recent changes. It is just here to
+		// be passed in the form at the top of the page 
+		if( $wgUser->isAllowed( 'markbotedits' ) && $wgRequest->getBool( 'bot' ) ) {
+			$this->opts['bot'] = '1';
+		}
+
+		$skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
+		# Offset overrides year/month selection
+		if( ( $month = $wgRequest->getIntOrNull( 'month' ) ) !== null && $month !== -1 ) {
+			$this->opts['month'] = intval( $month );
+		} else {
+			$this->opts['month'] = '';
+		}
+		if( ( $year = $wgRequest->getIntOrNull( 'year' ) ) !== null ) {
+			$this->opts['year'] = intval( $year );
+		} else if( $this->opts['month'] ) {
+			$thisMonth = intval( gmdate( 'n' ) );
+			$thisYear = intval( gmdate( 'Y' ) );
+			if( intval( $this->opts['month'] ) > $thisMonth ) {
+				$thisYear--;
+			}
+			$this->opts['year'] = $thisYear;
+		} else {
+			$this->opts['year'] = '';
+		}
+
+		if( $skip ) {
+			$this->opts['year'] = '';
+			$this->opts['month'] = '';
+		}
+		
+		// Add RSS/atom links
+		$this->setSyndicated();
+		$feedType = $wgRequest->getVal( 'feed' );
+		if( $feedType ) {
+			return $this->feed( $feedType );
+		}
+
+		wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
+
+		$wgOut->addHTML( $this->getForm( $this->opts ) );
+
+		$pager = new ContribsPager( $target, $this->opts['namespace'], $this->opts['year'], $this->opts['month'] );
+		if( !$pager->getNumRows() ) {
+			$wgOut->addWikiMsg( 'nocontribs' );
+			return;
+		}
+
+		# Show a message about slave lag, if applicable
+		if( ( $lag = $pager->getDatabase()->getLag() ) > 0 )
+			$wgOut->showLagWarning( $lag );
+
+		$wgOut->addHTML(
+			'<p>' . $pager->getNavigationBar() . '</p>' .
+			$pager->getBody() .
+			'<p>' . $pager->getNavigationBar() . '</p>'
+		);
+
+		# If there were contributions, and it was a valid user or IP, show
+		# the appropriate "footer" message - WHOIS tools, etc.
+		if( $target != 'newbies' ) {
+			$message = IP::isIPAddress( $target ) ?
+				'sp-contributions-footer-anon' : 'sp-contributions-footer';
+
+			$text = wfMsgNoTrans( $message, $target );
+			if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
+				$wgOut->addHTML( '<div class="mw-contributions-footer">' );
+				$wgOut->addWikiText( $text );
+				$wgOut->addHTML( '</div>' );
+			}
+		}
+	}
+	
+	protected function setSyndicated() {
+		global $wgOut;
+		$queryParams = array(
+			'namespace' => $this->opts['namespace'],
+			'target'  => $this->opts['target']
+		);
+		$wgOut->setSyndicated( true );
+		$wgOut->setFeedAppendQuery( wfArrayToCGI( $queryParams ) );
+	}
+
+	/**
+	* Generates the subheading with links
+	* @param Title $nt Title object for the target
+	* @param integer $id User ID for the target
+	* @return String: appropriately-escaped HTML to be output literally
+	*/
+	protected function contributionsSub( $nt, $id ) {
+		global $wgSysopUserBans, $wgLang, $wgUser;
+
+		$sk = $wgUser->getSkin();
+
+		if( 0 == $id ) {
+			$user = $nt->getText();
+		} else {
+			$user = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
+		}
+		$talk = $nt->getTalkPage();
+		if( $talk ) {
+			# Talk page link
+			$tools[] = $sk->makeLinkObj( $talk, wfMsgHtml( 'talkpagelinktext' ) );
+			if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && IP::isIPAddress( $nt->getText() ) ) ) {
+				# Block link
+				if( $wgUser->isAllowed( 'block' ) )
+					$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Blockip', 
+						$nt->getDBkey() ), wfMsgHtml( 'blocklink' ) );
+				# Block log link
+				$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), 
+					wfMsgHtml( 'sp-contributions-blocklog' ), 'type=block&page=' . $nt->getPrefixedUrl() );
+			}
+			# Other logs link
+			$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log' ), 
+				'user=' . $nt->getPartialUrl()	);
+
+			# Add link to deleted user contributions for priviledged users
+			if( $wgUser->isAllowed( 'deletedhistory' ) ) {
+					$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'DeletedContributions', 
+					$nt->getDBkey() ), wfMsgHtml( 'deletedcontributions' ) );
+			}
+	
+			wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
+	
+			$links = implode( ' | ', $tools );
+		}
+	
+		// Old message 'contribsub' had one parameter, but that doesn't work for
+		// languages that want to put the "for" bit right after $user but before
+		// $links.  If 'contribsub' is around, use it for reverse compatibility,
+		// otherwise use 'contribsub2'.
+		if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
+			return wfMsgHtml( 'contribsub2', $user, $links );
+		} else {
+			return wfMsgHtml( 'contribsub', "$user ($links)" );
+		}
+	}
+
+	/**
+	 * Generates the namespace selector form with hidden attributes.
+	 * @param $this->opts Array: the options to be included.
+	 */
+	protected function getForm() {
+		global $wgScript, $wgTitle;
+	
+		$this->opts['title'] = $wgTitle->getPrefixedText();
+		if( !isset( $this->opts['target'] ) ) {
+			$this->opts['target'] = '';
+		} else {
+			$this->opts['target'] = str_replace( '_' , ' ' , $this->opts['target'] );
+		}
+	
+		if( !isset( $this->opts['namespace'] ) ) {
+			$this->opts['namespace'] = '';
+		}
+	
+		if( !isset( $this->opts['contribs'] ) ) {
+			$this->opts['contribs'] = 'user';
+		}
+	
+		if( !isset( $this->opts['year'] ) ) {
+			$this->opts['year'] = '';
+		}
+	
+		if( !isset( $this->opts['month'] ) ) {
+			$this->opts['month'] = '';
+		}
+	
+		if( $this->opts['contribs'] == 'newbie' ) {
+			$this->opts['target'] = '';
+		}
+	
+		$f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+	
+		foreach ( $this->opts as $name => $value ) {
+			if( in_array( $name, array( 'namespace', 'target', 'contribs', 'year', 'month' ) ) ) {
+				continue;
+			}
+			$f .= "\t" . Xml::hidden( $name, $value ) . "\n";
+		}
+	
+		$f .= '<fieldset>' .
+			Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
+			Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 
+				'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ? true : false ) . '<br />' .
+			Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 
+				'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ? true : false ) . ' ' .
+			Xml::input( 'target', 20, $this->opts['target']) . ' '.
+			'<span style="white-space: nowrap">' .
+			Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+			Xml::namespaceSelector( $this->opts['namespace'], '' ) .
+			'</span>' .
+			Xml::openElement( 'p' ) .
+			'<span style="white-space: nowrap">' .
+			Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+			Xml::input( 'year', 4, $this->opts['year'], array('id' => 'year', 'maxlength' => 4) ) .
+			'</span>' .
+			' '.
+			'<span style="white-space: nowrap">' .
+			Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+			Xml::monthSelector( $this->opts['month'], -1 ) . ' '.
+			'</span>' .
+			Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
+			Xml::closeElement( 'p' );
+	
+		$explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
+		if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
+			$f .= "<p>{$explain}</p>";
+	
+		$f .= '</fieldset>' .
+			Xml::closeElement( 'form' );
+		return $f;
+	}
+	
+		/**
+	 * Output a subscription feed listing recent edits to this page.
+	 * @param string $type
+	 */
+	protected function feed( $type ) {
+		global $wgRequest, $wgFeed, $wgFeedClasses, $wgFeedLimit;
+
+		if( !$wgFeed ) {
+			global $wgOut;
+			$wgOut->addWikiMsg( 'feed-unavailable' );
+			return;
+		}
+
+		if( !isset( $wgFeedClasses[$type] ) ) {
+			global $wgOut;
+			$wgOut->addWikiMsg( 'feed-invalid' );
+			return;
+		}
+
+		$feed = new $wgFeedClasses[$type](
+			$this->feedTitle(),
+			wfMsgExt( 'tagline', 'parsemag' ),
+			$this->getTitle()->getFullUrl() );
+			
+		// Already valid title
+		$nt = Title::makeTitleSafe( NS_USER, $this->opts['target'] );
+		$target = $this->opts['target'] == 'newbies' ? 'newbies' : $nt->getText();
+			
+		$pager = new ContribsPager( $target, $this->opts['namespace'], 
+			$this->opts['year'], $this->opts['month'] );
+
+		$pager->mLimit = min( $this->opts['limit'], $wgFeedLimit );
+
+		$feed->outHeader();
+		if( $pager->getNumRows() > 0 ) {
+			while( $row = $pager->mResult->fetchObject() ) {
+				$feed->outItem( $this->feedItem( $row ) );
+			}
+		}
+		$feed->outFooter();
+	}
+
+	protected function feedTitle() {
+		global $wgContLanguageCode, $wgSitename;
+		$page = SpecialPage::getPage( 'Contributions' );
+		$desc = $page->getDescription();
+		return "$wgSitename - $desc [$wgContLanguageCode]";
+	}
+
+	protected function feedItem( $row ) {
+		$title = Title::MakeTitle( intval( $row->page_namespace ), $row->page_title );
+		if( $title ) {
+			$date = $row->rev_timestamp;
+			$comments = $title->getTalkPage()->getFullURL();
+			$revision = Revision::newFromTitle( $title, $row->rev_id );
+
+			return new FeedItem(
+				$title->getPrefixedText(),
+				$this->feedItemDesc( $revision ),
+				$title->getFullURL(),
+				$date,
+				$this->feedItemAuthor( $revision ),
+				$comments
+			);
+		} else {
+			return NULL;
+		}
+	}
+
+	protected function feedItemAuthor( $revision ) {
+		return $revision->getUserText();
+	}
+
+	protected function feedItemDesc( $revision ) {
+		if( $revision ) {
+			return '<p>' . htmlspecialchars( $revision->getUserText() ) . ': ' .
+				htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) . 
+				"</p>\n<hr />\n<div>" .
+				nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";
+		}
+		return '';
+	}
+}
 
 /**
  * Pager for Special:Contributions
@@ -12,7 +369,7 @@
 class ContribsPager extends ReverseChronologicalPager {
 	public $mDefaultDirection = true;
 	var $messages, $target;
-	var $namespace = '', $year = '', $month = '', $mDb;
+	var $namespace = '', $mDb;
 
 	function __construct( $target, $namespace = false, $year = false, $month = false ) {
 		parent::__construct();
@@ -22,12 +379,7 @@ class ContribsPager extends ReverseChronologicalPager {
 		$this->target = $target;
 		$this->namespace = $namespace;
 
-		$year = intval($year);
-		$month = intval($month);
-
-		$this->year = $year > 0 ? $year : false;
-		$this->month = ($month > 0 && $month < 13) ? $month : false;
-		$this->getDateCond();
+		$this->getDateCond( $year, $month );
 
 		$this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
 	}
@@ -35,23 +387,22 @@ class ContribsPager extends ReverseChronologicalPager {
 	function getDefaultQuery() {
 		$query = parent::getDefaultQuery();
 		$query['target'] = $this->target;
-		$query['month'] = $this->month;
-		$query['year'] = $this->year;
 		return $query;
 	}
 
 	function getQueryInfo() {
-		list( $index, $userCond ) = $this->getUserCond();
+		list( $tables, $index, $userCond, $join_cond ) = $this->getUserCond();
 		$conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond() );
 		$queryInfo = array(
-			'tables' => array( 'page', 'revision' ),
+			'tables' => $tables,
 			'fields' => array(
 				'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'rev_id', 'rev_page',
 				'rev_text_id', 'rev_timestamp', 'rev_comment', 'rev_minor_edit', 'rev_user',
 				'rev_user_text', 'rev_parent_id', 'rev_deleted'
 			),
 			'conds' => $conds,
-			'options' => array( 'USE INDEX' => array('revision' => $index) )
+			'options' => array( 'USE INDEX' => array('revision' => $index) ),
+			'join_conds' => $join_cond
 		);
 		wfRunHooks( 'ContribsPager::getQueryInfo', array( &$this, &$queryInfo ) );
 		return $queryInfo;
@@ -59,73 +410,31 @@ class ContribsPager extends ReverseChronologicalPager {
 
 	function getUserCond() {
 		$condition = array();
-
-		if ( $this->target == 'newbies' ) {
+		$join_conds = array();
+		if( $this->target == 'newbies' ) {
+			$tables = array( 'user_groups', 'page', 'revision' );
 			$max = $this->mDb->selectField( 'user', 'max(user_id)', false, __METHOD__ );
 			$condition[] = 'rev_user >' . (int)($max - $max / 100);
+			$condition[] = 'ug_group IS NULL';
 			$index = 'user_timestamp';
+			# FIXME: other groups may have 'bot' rights
+			$join_conds['user_groups'] = array( 'LEFT JOIN', "ug_user = rev_user AND ug_group = 'bot'" );
 		} else {
+			$tables = array( 'page', 'revision' );
 			$condition['rev_user_text'] = $this->target;
 			$index = 'usertext_timestamp';
 		}
-		return array( $index, $condition );
+		return array( $tables, $index, $condition, $join_conds );
 	}
 
 	function getNamespaceCond() {
-		if ( $this->namespace !== '' ) {
+		if( $this->namespace !== '' ) {
 			return array( 'page_namespace' => (int)$this->namespace );
 		} else {
 			return array();
 		}
 	}
 
-	function getDateCond() {
-		// Given an optional year and month, we need to generate a timestamp
-		// to use as "WHERE rev_timestamp <= result"
-		// Examples: year = 2006 equals < 20070101 (+000000)
-		// year=2005, month=1    equals < 20050201
-		// year=2005, month=12   equals < 20060101
-
-		if (!$this->year && !$this->month)
-			return;
-
-		if ( $this->year ) {
-			$year = $this->year;
-		}
-		else {
-			// If no year given, assume the current one
-			$year = gmdate( 'Y' );
-			// If this month hasn't happened yet this year, go back to last year's month
-			if( $this->month > gmdate( 'n' ) ) {
-				$year--;
-			}
-		}
-
-		if ( $this->month ) {
-			$month = $this->month + 1;
-			// For December, we want January 1 of the next year
-			if ($month > 12) {
-				$month = 1;
-				$year++;
-			}
-		}
-		else {
-			// No month implies we want up to the end of the year in question
-			$month = 1;
-			$year++;
-		}
-
-		if ($year > 2032)
-			$year = 2032;
-		$ymd = (int)sprintf( "%04d%02d01", $year, $month );
-
-		// Y2K38 bug
-		if ($ymd > 20320101)
-			$ymd = 20320101;
-
-		$this->mOffset = $this->mDb->timestamp( "${ymd}000000" );
-	}
-
 	function getIndexField() {
 		return 'rev_timestamp';
 	}
@@ -167,8 +476,7 @@ class ContribsPager extends ReverseChronologicalPager {
 				$difftext .= $this->messages['newarticle'];
 			}
 
-			if( !$page->getUserPermissionsErrors( 'rollback', $wgUser )
-			&&  !$page->getUserPermissionsErrors( 'edit', $wgUser ) ) {
+			if( $page->userCan( 'rollback') && $page->userCan( 'edit' ) ) {
 				$topmarktext .= ' '.$sk->generateRollback( $rev );
 			}
 
@@ -182,7 +490,8 @@ class ContribsPager extends ReverseChronologicalPager {
 		$histlink='('.$sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' ) . ')';
 
 		$comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true );
-		$d = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
+		$date = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
+		$d = $sk->makeKnownLinkObj( $page, $date, 'oldid='.intval($row->rev_id) );
 
 		if( $this->target == 'newbies' ) {
 			$userlink = ' . . ' . $sk->userLink( $row->rev_user, $row->rev_user_text );
@@ -207,7 +516,7 @@ class ContribsPager extends ReverseChronologicalPager {
 			$mflag = '';
 		}
 
-		$ret = "{$d} {$histlink} {$difftext} {$nflag}{$mflag} {$link}{$userlink}{$comment} {$topmarktext}";
+		$ret = "{$d} {$histlink} {$difftext} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
 		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
 			$ret .= ' ' . wfMsgHtml( 'deletedrev' );
 		}
@@ -229,242 +538,3 @@ class ContribsPager extends ReverseChronologicalPager {
 	}
 
 }
-
-/**
- * Special page "user contributions".
- * Shows a list of the contributions of a user.
- *
- * @return	none
- * @param	$par	String: (optional) user name of the user for which to show the contributions
- */
-function wfSpecialContributions( $par = null ) {
-	global $wgUser, $wgOut, $wgLang, $wgRequest;
-
-	$options = array();
-
-	if ( isset( $par ) && $par == 'newbies' ) {
-		$target = 'newbies';
-		$options['contribs'] = 'newbie';
-	} elseif ( isset( $par ) ) {
-		$target = $par;
-	} else {
-		$target = $wgRequest->getVal( 'target' );
-	}
-
-	// check for radiobox
-	if ( $wgRequest->getVal( 'contribs' ) == 'newbie' ) {
-		$target = 'newbies';
-		$options['contribs'] = 'newbie';
-	}
-
-	if ( !strlen( $target ) ) {
-		$wgOut->addHTML( contributionsForm( '' ) );
-		return;
-	}
-
-	$options['limit'] = $wgRequest->getInt( 'limit', 50 );
-	$options['target'] = $target;
-
-	$nt = Title::makeTitleSafe( NS_USER, $target );
-	if ( !$nt ) {
-		$wgOut->addHTML( contributionsForm( '' ) );
-		return;
-	}
-	$id = User::idFromName( $nt->getText() );
-
-	if ( $target != 'newbies' ) {
-		$target = $nt->getText();
-		$wgOut->setSubtitle( contributionsSub( $nt, $id ) );
-	} else {
-		$wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
-	}
-
-	if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
-		$options['namespace'] = intval( $ns );
-	} else {
-		$options['namespace'] = '';
-	}
-	if ( $wgUser->isAllowed( 'markbotedit' ) && $wgRequest->getBool( 'bot' ) ) {
-		$options['bot'] = '1';
-	}
-
-	$skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
-	# Offset overrides year/month selection
-	if ( ( $month = $wgRequest->getIntOrNull( 'month' ) ) !== null && $month !== -1 ) {
-		$options['month'] = intval( $month );
-	} else {
-		$options['month'] = '';
-	}
-	if ( ( $year = $wgRequest->getIntOrNull( 'year' ) ) !== null ) {
-		$options['year'] = intval( $year );
-	} else if( $options['month'] ) {
-		$thisMonth = intval( gmdate( 'n' ) );
-		$thisYear = intval( gmdate( 'Y' ) );
-		if( intval( $options['month'] ) > $thisMonth ) {
-			$thisYear--;
-		}
-		$options['year'] = $thisYear;
-	} else {
-		$options['year'] = '';
-	}
-
-	wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
-
-	if( $skip ) {
-		$options['year'] = '';
-		$options['month'] = '';
-	}
-
-	$wgOut->addHTML( contributionsForm( $options ) );
-
-	$pager = new ContribsPager( $target, $options['namespace'], $options['year'], $options['month'] );
-	if ( !$pager->getNumRows() ) {
-		$wgOut->addWikiMsg( 'nocontribs' );
-		return;
-	}
-
-	# Show a message about slave lag, if applicable
-	if( ( $lag = $pager->getDatabase()->getLag() ) > 0 )
-		$wgOut->showLagWarning( $lag );
-
-	$wgOut->addHTML(
-		'<p>' . $pager->getNavigationBar() . '</p>' .
-		$pager->getBody() .
-		'<p>' . $pager->getNavigationBar() . '</p>' );
-
-	# If there were contributions, and it was a valid user or IP, show
-	# the appropriate "footer" message - WHOIS tools, etc.
-	if( $target != 'newbies' ) {
-		$message = IP::isIPAddress( $target )
-			? 'sp-contributions-footer-anon'
-			: 'sp-contributions-footer';
-
-
-		$text = wfMsgNoTrans( $message, $target );
-		if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
-			$wgOut->addHtml( '<div class="mw-contributions-footer">' );
-			$wgOut->addWikiText( $text );
-			$wgOut->addHtml( '</div>' );
-		}
-	}
-}
-
-/**
- * Generates the subheading with links
- * @param Title $nt Title object for the target
- * @param integer $id User ID for the target
- * @return String: appropriately-escaped HTML to be output literally
- */
-function contributionsSub( $nt, $id ) {
-	global $wgSysopUserBans, $wgLang, $wgUser;
-
-	$sk = $wgUser->getSkin();
-
-	if ( 0 == $id ) {
-		$user = $nt->getText();
-	} else {
-		$user = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
-	}
-	$talk = $nt->getTalkPage();
-	if( $talk ) {
-		# Talk page link
-		$tools[] = $sk->makeLinkObj( $talk, wfMsgHtml( 'talkpagelinktext' ) );
-		if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
-			# Block link
-			if( $wgUser->isAllowed( 'block' ) )
-				$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ), wfMsgHtml( 'blocklink' ) );
-			# Block log link
-			$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'sp-contributions-blocklog' ), 'type=block&page=' . $nt->getPrefixedUrl() );
-		}
-		# Other logs link
-		$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
-
-		wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
-
-		$links = implode( ' | ', $tools );
-	}
-
-	// Old message 'contribsub' had one parameter, but that doesn't work for
-	// languages that want to put the "for" bit right after $user but before
-	// $links.  If 'contribsub' is around, use it for reverse compatibility,
-	// otherwise use 'contribsub2'.
-	if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
-		return wfMsgHtml( 'contribsub2', $user, $links );
-	} else {
-		return wfMsgHtml( 'contribsub', "$user ($links)" );
-	}
-}
-
-/**
- * Generates the namespace selector form with hidden attributes.
- * @param $options Array: the options to be included.
- */
-function contributionsForm( $options ) {
-	global $wgScript, $wgTitle, $wgRequest;
-
-	$options['title'] = $wgTitle->getPrefixedText();
-	if ( !isset( $options['target'] ) ) {
-		$options['target'] = '';
-	} else {
-		$options['target'] = str_replace( '_' , ' ' , $options['target'] );
-	}
-
-	if ( !isset( $options['namespace'] ) ) {
-		$options['namespace'] = '';
-	}
-
-	if ( !isset( $options['contribs'] ) ) {
-		$options['contribs'] = 'user';
-	}
-
-	if ( !isset( $options['year'] ) ) {
-		$options['year'] = '';
-	}
-
-	if ( !isset( $options['month'] ) ) {
-		$options['month'] = '';
-	}
-
-	if ( $options['contribs'] == 'newbie' ) {
-		$options['target'] = '';
-	}
-
-	$f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-
-	foreach ( $options as $name => $value ) {
-		if ( in_array( $name, array( 'namespace', 'target', 'contribs', 'year', 'month' ) ) ) {
-			continue;
-		}
-		$f .= "\t" . Xml::hidden( $name, $value ) . "\n";
-	}
-
-	$f .= '<fieldset>' .
-		Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
-		Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 'contribs' , 'newbie' , 'newbie', $options['contribs'] == 'newbie' ? true : false ) . '<br />' .
-		Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 'contribs' , 'user', 'user', $options['contribs'] == 'user' ? true : false ) . ' ' .
-		Xml::input( 'target', 20, $options['target']) . ' '.
-		'<span style="white-space: nowrap">' .
-		Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
-		Xml::namespaceSelector( $options['namespace'], '' ) .
-		'</span>' .
-		Xml::openElement( 'p' ) .
-		'<span style="white-space: nowrap">' .
-		Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
-		Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) .
-		'</span>' .
-		' '.
-		'<span style="white-space: nowrap">' .
-		Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
-		Xml::monthSelector( $options['month'], -1 ) . ' '.
-		'</span>' .
-		Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
-		Xml::closeElement( 'p' );
-
-	$explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
-	if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
-		$f .= "<p>{$explain}</p>";
-
-	$f .= '</fieldset>' .
-		Xml::closeElement( 'form' );
-	return $f;
-}
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
new file mode 100644
index 00000000..513d25e2
--- /dev/null
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * Implements Special:DeletedContributions to display archived revisions
+ * @ingroup SpecialPage
+ */
+
+class DeletedContribsPager extends IndexPager {
+	public $mDefaultDirection = true;
+	var $messages, $target;
+	var $namespace = '', $mDb;
+
+	function __construct( $target, $namespace = false ) {
+		parent::__construct();
+		foreach( explode( ' ', 'deletionlog undeletebtn minoreditletter diff' ) as $msg ) {
+			$this->messages[$msg] = wfMsgExt( $msg, array( 'escape') );
+		}
+		$this->target = $target;
+		$this->namespace = $namespace;
+		$this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
+	}
+
+	function getDefaultQuery() {
+		$query = parent::getDefaultQuery();
+		$query['target'] = $this->target;
+		return $query;
+	}
+
+	function getQueryInfo() {
+		list( $index, $userCond ) = $this->getUserCond();
+		$conds = array_merge( $userCond, $this->getNamespaceCond() );
+
+		return array(
+			'tables' => array( 'archive' ),
+			'fields' => array(
+				'ar_rev_id', 'ar_namespace', 'ar_title', 'ar_timestamp', 'ar_comment', 'ar_minor_edit',
+				'ar_user', 'ar_user_text', 'ar_deleted'
+			),
+			'conds' => $conds,
+			'options' => array( 'FORCE INDEX' => $index )
+		);
+	}
+
+	function getUserCond() {
+		$condition = array();
+
+		$condition['ar_user_text'] = $this->target;
+		$index = 'usertext_timestamp';
+
+		return array( $index, $condition );
+	}
+
+	function getIndexField() {
+		return 'ar_timestamp';
+	}
+
+	function getStartBody() {
+		return "<ul>\n";
+	}
+
+	function getEndBody() {
+		return "</ul>\n";
+	}
+
+	function getNavigationBar() {
+		if ( isset( $this->mNavigationBar ) ) {
+			return $this->mNavigationBar;
+		}
+		$linkTexts = array(
+			'prev' => wfMsgHtml( 'pager-newer-n', $this->mLimit ),
+			'next' => wfMsgHtml( 'pager-older-n', $this->mLimit ),
+			'first' => wfMsgHtml( 'histlast' ),
+			'last' => wfMsgHtml( 'histfirst' )
+		);
+
+		$pagingLinks = $this->getPagingLinks( $linkTexts );
+		$limitLinks = $this->getLimitLinks();
+		$limits = implode( ' | ', $limitLinks );
+
+		$this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
+			wfMsgExt( 'viewprevnext', array( 'parsemag' ), $pagingLinks['prev'], $pagingLinks['next'], $limits );
+		return $this->mNavigationBar;
+	}
+
+	function getNamespaceCond() {
+		if ( $this->namespace !== '' ) {
+			return array( 'ar_namespace' => (int)$this->namespace );
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Generates each row in the contributions list.
+	 *
+	 * Contributions which are marked "top" are currently on top of the history.
+	 * For these contributions, a [rollback] link is shown for users with sysop
+	 * privileges. The rollback link restores the most recent version that was not
+	 * written by the target user.
+	 *
+	 * @todo This would probably look a lot nicer in a table.
+	 */
+	function formatRow( $row ) {
+		wfProfileIn( __METHOD__ );
+
+		global $wgLang, $wgUser;
+
+		$sk = $this->getSkin();
+
+		$rev = new Revision( array(
+				'id'         => $row->ar_rev_id,
+				'comment'    => $row->ar_comment,
+				'user'       => $row->ar_user,
+				'user_text'  => $row->ar_user_text,
+				'timestamp'  => $row->ar_timestamp,
+				'minor_edit' => $row->ar_minor_edit,
+				'rev_deleted' => $row->ar_deleted,
+				) );
+
+		$page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
+
+		$undelete = SpecialPage::getTitleFor( 'Undelete' );
+
+		$logs = SpecialPage::getTitleFor( 'Log' );
+		$dellog = $sk->makeKnownLinkObj( $logs,
+			$this->messages['deletionlog'],
+			'type=delete&page=' . $page->getPrefixedUrl() );
+
+		$reviewlink = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete', $page->getPrefixedDBkey() ),
+			$this->messages['undeletebtn'] );
+
+		$link = $sk->makeKnownLinkObj( $undelete,
+			htmlspecialchars( $page->getPrefixedText() ),
+			'target=' . $page->getPrefixedUrl() .
+			'&timestamp=' . $rev->getTimestamp() );
+
+		$last = $sk->makeKnownLinkObj( $undelete,
+			$this->messages['diff'],
+			"target=" . $page->getPrefixedUrl() .
+			"&timestamp=" . $rev->getTimestamp() .
+			"&diff=prev" );
+
+		$comment = $sk->revComment( $rev );
+		$d = $wgLang->timeanddate( $rev->getTimestamp(), true );
+
+		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+			$d = '<span class="history-deleted">' . $d . '</span>';
+		} else {
+			$link = $sk->makeKnownLinkObj( $undelete, $d,
+				'target=' . $page->getPrefixedUrl() .
+				'&timestamp=' . $rev->getTimestamp() );
+		}
+
+		$pagelink = $sk->makeLinkObj( $page );
+
+		if( $rev->isMinor() ) {
+			$mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
+		} else {
+			$mflag = '';
+		}
+
+
+		$ret = "{$link} ($last) ({$dellog}) ({$reviewlink}) . . {$mflag} {$pagelink} {$comment}";
+		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+			$ret .= ' ' . wfMsgHtml( 'deletedrev' );
+		}
+
+		$ret = "<li>$ret</li>\n";
+
+		wfProfileOut( __METHOD__ );
+		return $ret;
+	}
+
+	/**
+	 * Get the Database object in use
+	 *
+	 * @return Database
+	 */
+	public function getDatabase() {
+		return $this->mDb;
+	}
+}
+
+class DeletedContributionsPage extends SpecialPage {
+	function __construct() {
+		parent::__construct( 'DeletedContributions', 'deletedhistory',
+		/*listed*/ true, /*function*/ false, /*file*/ false );
+	}
+
+	/**
+	 * Special page "deleted user contributions".
+	 * Shows a list of the deleted contributions of a user.
+	 *
+	 * @return	none
+	 * @param	$par	String: (optional) user name of the user for which to show the contributions
+	 */
+	function execute( $par ) {
+		global $wgUser;
+		$this->setHeaders();
+
+		if ( !$this->userCanExecute( $wgUser ) ) {
+			$this->displayRestrictionError();
+			return;
+		}
+
+		global $wgUser, $wgOut, $wgLang, $wgRequest;
+
+		$options = array();
+
+		if ( isset( $par ) ) {
+			$target = $par;
+		} else {
+			$target = $wgRequest->getVal( 'target' );
+		}
+
+		if ( !strlen( $target ) ) {
+			$wgOut->addHTML( $this->getForm( '' ) );
+			return;
+		}
+
+		$options['limit'] = $wgRequest->getInt( 'limit', 50 );
+		$options['target'] = $target;
+
+		$nt = Title::makeTitleSafe( NS_USER, $target );
+		if ( !$nt ) {
+			$wgOut->addHTML( $this->getForm( '' ) );
+			return;
+		}
+		$id = User::idFromName( $nt->getText() );
+
+		$target = $nt->getText();
+		$wgOut->setSubtitle( $this->getSubTitle( $nt, $id ) );
+
+		if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
+			$options['namespace'] = intval( $ns );
+		} else {
+			$options['namespace'] = '';
+		}
+
+		$wgOut->addHTML( $this->getForm( $options ) );
+
+		$pager = new DeletedContribsPager( $target, $options['namespace'] );
+		if ( !$pager->getNumRows() ) {
+			$wgOut->addWikiText( wfMsg( 'nocontribs' ) );
+			return;
+		}
+
+		# Show a message about slave lag, if applicable
+		if( ( $lag = $pager->getDatabase()->getLag() ) > 0 )
+			$wgOut->showLagWarning( $lag );
+
+		$wgOut->addHTML(
+			'<p>' . $pager->getNavigationBar() . '</p>' .
+			$pager->getBody() .
+			'<p>' . $pager->getNavigationBar() . '</p>' );
+
+		# If there were contributions, and it was a valid user or IP, show
+		# the appropriate "footer" message - WHOIS tools, etc.
+		if( $target != 'newbies' ) {
+			$message = IP::isIPAddress( $target )
+				? 'sp-contributions-footer-anon'
+				: 'sp-contributions-footer';
+
+
+			$text = wfMsgNoTrans( $message, $target );
+			if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
+				$wgOut->addHTML( '<div class="mw-contributions-footer">' );
+				$wgOut->addWikiText( $text );
+				$wgOut->addHTML( '</div>' );
+			}
+		}
+	}
+
+	/**
+	 * Generates the subheading with links
+	 * @param $nt @see Title object for the target
+	 */
+	function getSubTitle( $nt, $id ) {
+		global $wgSysopUserBans, $wgLang, $wgUser;
+
+		$sk = $wgUser->getSkin();
+
+		if ( 0 == $id ) {
+			$user = $nt->getText();
+		} else {
+			$user = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
+		}
+		$talk = $nt->getTalkPage();
+		if( $talk ) {
+			# Talk page link
+			$tools[] = $sk->makeLinkObj( $talk, wfMsgHtml( 'talkpagelinktext' ) );
+			if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
+				# Block link
+				if( $wgUser->isAllowed( 'block' ) )
+					$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
+						wfMsgHtml( 'blocklink' ) );
+				# Block log link
+				$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ),
+					wfMsgHtml( 'sp-contributions-blocklog' ), 'type=block&page=' . $nt->getPrefixedUrl() );
+			}
+			# Other logs link
+			$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ),
+				wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
+			# Link to undeleted contributions
+			$tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Contributions', $nt->getDBkey() ),
+				wfMsgHtml( 'contributions' ) );
+				
+			wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
+
+			$links = implode( ' | ', $tools );
+		}
+
+		// Old message 'contribsub' had one parameter, but that doesn't work for
+		// languages that want to put the "for" bit right after $user but before
+		// $links.  If 'contribsub' is around, use it for reverse compatibility,
+		// otherwise use 'contribsub2'.
+		if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
+			return wfMsgHtml( 'contribsub2', $user, $links );
+		} else {
+			return wfMsgHtml( 'contribsub', "$user ($links)" );
+		}
+	}
+
+	/**
+	 * Generates the namespace selector form with hidden attributes.
+	 * @param $options Array: the options to be included.
+	 */
+	function getForm( $options ) {
+		global $wgScript, $wgTitle, $wgRequest;
+
+		$options['title'] = $wgTitle->getPrefixedText();
+		if ( !isset( $options['target'] ) ) {
+			$options['target'] = '';
+		} else {
+			$options['target'] = str_replace( '_' , ' ' , $options['target'] );
+		}
+
+		if ( !isset( $options['namespace'] ) ) {
+			$options['namespace'] = '';
+		}
+
+		if ( !isset( $options['contribs'] ) ) {
+			$options['contribs'] = 'user';
+		}
+
+		if ( $options['contribs'] == 'newbie' ) {
+			$options['target'] = '';
+		}
+
+		$f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+
+		foreach ( $options as $name => $value ) {
+			if ( in_array( $name, array( 'namespace', 'target', 'contribs' ) ) ) {
+				continue;
+			}
+			$f .= "\t" . Xml::hidden( $name, $value ) . "\n";
+		}
+
+		$f .=  Xml::openElement( 'fieldset' ) .
+			Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
+			Xml::tags( 'label', array( 'for' => 'target' ), wfMsgExt( 'sp-contributions-username', 'parseinline' ) ) . ' ' .
+			Xml::input( 'target', 20, $options['target']) . ' '.
+			Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+			Xml::namespaceSelector( $options['namespace'], '' ) . ' ' .
+			Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
+			Xml::closeElement( 'fieldset' ) .
+			Xml::closeElement( 'form' );
+		return $f;
+	}
+}
diff --git a/includes/specials/SpecialDisambiguations.php b/includes/specials/SpecialDisambiguations.php
index 34045660..0a728b68 100644
--- a/includes/specials/SpecialDisambiguations.php
+++ b/includes/specials/SpecialDisambiguations.php
@@ -84,13 +84,13 @@ class DisambiguationsPage extends PageQueryPage {
 
 	function formatResult( $skin, $result ) {
 		global $wgContLang;
-		$title = Title::newFromId( $result->value );
+		$title = Title::newFromID( $result->value );
 		$dp = Title::makeTitle( $result->namespace, $result->title );
 
-		$from = $skin->makeKnownLinkObj( $title, '' );
-		$edit = $skin->makeKnownLinkObj( $title, "(".wfMsgHtml("qbedit").")" , 'redirect=no&action=edit' );
+		$from = $skin->link( $title );
+		$edit = $skin->link( $title, "(".wfMsgHtml("qbedit").")", array(), array( 'redirect' => 'no', 'action' => 'edit' ) );
 		$arr  = $wgContLang->getArrow();
-		$to   = $skin->makeKnownLinkObj( $dp, '' );
+		$to   = $skin->link( $dp );
 
 		return "$from $edit $arr $to";
 	}
diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 3874c6a1..cf90f94d 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -5,17 +5,22 @@
  */
 
 /**
- * @todo document
+ * 	Constructor for Special:Emailuser.
  */
 function wfSpecialEmailuser( $par ) {
 	global $wgRequest, $wgUser, $wgOut;
 
+	if ( !EmailUserForm::userEmailEnabled() ) {
+		$wgOut->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
+		return;
+	}
+
 	$action = $wgRequest->getVal( 'action' );
 	$target = isset($par) ? $par : $wgRequest->getVal( 'target' );
 	$targetUser = EmailUserForm::validateEmailTarget( $target );
 	
 	if ( !( $targetUser instanceof User ) ) {
-		$wgOut->showErrorPage( $targetUser[0], $targetUser[1] );
+		$wgOut->showErrorPage( $targetUser.'title', $targetUser.'text' );
 		return;
 	}
 	
@@ -30,7 +35,7 @@ function wfSpecialEmailuser( $par ) {
 					
 	$error = EmailUserForm::getPermissionsError( $wgUser, $wgRequest->getVal( 'wpEditToken' ) );
 	if ( $error ) {
-		switch ( $error[0] ) {
+		switch ( $error ) {
 			case 'blockedemailuser':
 				$wgOut->blockedPage();
 				return;
@@ -40,12 +45,11 @@ function wfSpecialEmailuser( $par ) {
 			case 'sessionfailure':
 				$form->showForm();
 				return;
-			default:
-				$wgOut->showErrorPage( $error[0], $error[1] );
+			case 'mailnologin':
+				$wgOut->showErrorPage( 'mailnologin', 'mailnologintext' );
 				return;
 		}
 	}	
-		
 	
 	if ( "submit" == $action && $wgRequest->wasPosted() ) {
 		$result = $form->doSubmit();
@@ -94,46 +98,64 @@ class EmailUserForm {
 			$this->subject = wfMsgExt( 'defemailsubject', array( 'content', 'parsemag' ) );
 		}
 
-		$emf = wfMsg( "emailfrom" );
-		$senderLink = $skin->makeLinkObj(
-			$wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) );
-		$emt = wfMsg( "emailto" );
-		$recipientLink = $skin->makeLinkObj(
-			$this->target->getUserPage(), htmlspecialchars( $this->target->getName() ) );
-		$emr = wfMsg( "emailsubject" );
-		$emm = wfMsg( "emailmessage" );
-		$ems = wfMsg( "emailsend" );
-		$emc = wfMsg( "emailccme" );
-		$encSubject = htmlspecialchars( $this->subject );
-
 		$titleObj = SpecialPage::getTitleFor( "Emailuser" );
-		$action = $titleObj->escapeLocalURL( "target=" .
+		$action = $titleObj->getLocalURL( "target=" .
 			urlencode( $this->target->getName() ) . "&action=submit" );
-		$token = htmlspecialchars( $wgUser->editToken() );
-
-		$wgOut->addHTML( "
-<form id=\"emailuser\" method=\"post\" action=\"{$action}\">
-<table border='0' id='mailheader'><tr>
-<td align='right'>{$emf}:</td>
-<td align='left'><strong>{$senderLink}</strong></td>
-</tr><tr>
-<td align='right'>{$emt}:</td>
-<td align='left'><strong>{$recipientLink}</strong></td>
-</tr><tr>
-<td align='right'>{$emr}:</td>
-<td align='left'>
-<input type='text' size='60' maxlength='200' name=\"wpSubject\" value=\"{$encSubject}\" />
-</td>
-</tr>
-</table>
-<span id='wpTextLabel'><label for=\"wpText\">{$emm}:</label><br /></span>
-<textarea id=\"wpText\" name=\"wpText\" rows='20' cols='80' style=\"width: 100%;\">" . htmlspecialchars( $this->text ) .
-"</textarea>
-" . wfCheckLabel( $emc, 'wpCCMe', 'wpCCMe', $wgUser->getBoolOption( 'ccmeonemails' ) ) . "<br />
-<input type='submit' name=\"wpSend\" value=\"{$ems}\" />
-<input type='hidden' name='wpEditToken' value=\"$token\" />
-</form>\n" );
 
+		$wgOut->addHTML(  
+			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'emailuser' ) ) .
+			Xml::openElement( 'fieldset' ) .
+			Xml::element( 'legend', null, wfMsgExt( 'email-legend', 'parsemag' ) ) .
+			Xml::openElement( 'table', array( 'class' => 'mw-emailuser-table' ) ) .
+			"<tr>
+				<td class='mw-label'>" .
+					Xml::label( wfMsg( 'emailfrom' ), 'emailfrom' ) .
+				"</td>
+				<td class='mw-input' id='mw-emailuser-sender'>" .
+					$skin->link( $wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td class='mw-label'>" .
+					Xml::label( wfMsg( 'emailto' ), 'emailto' ) .
+				"</td>
+				<td class='mw-input' id='mw-emailuser-recipient'>" .
+					$skin->link( $this->target->getUserPage(), htmlspecialchars( $this->target->getName() ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td class='mw-label'>" .
+					Xml::label( wfMsg( 'emailsubject' ), 'wpSubject' ) .
+				"</td>
+				<td class='mw-input'>" .
+					Xml::input( 'wpSubject', 60, $this->subject, array( 'type' => 'text', 'maxlength' => 200 ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td class='mw-label'>" .
+					Xml::label( wfMsg( 'emailmessage' ), 'wpText' ) .
+				"</td>
+				<td class='mw-input'>" .
+					Xml::textarea( 'wpText', $this->text, 80, 20, array( 'id' => 'wpText' ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td></td>
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'emailccme' ), 'wpCCMe', 'wpCCMe', $wgUser->getBoolOption( 'ccmeonemails' ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td></td>
+				<td class='mw-submit'>" .
+					Xml::submitButton( wfMsg( 'emailsend' ), array( 'name' => 'wpSend', 'accesskey' => 's' ) ) .
+				"</td>
+			</tr>" .
+			Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
+			Xml::closeElement( 'table' ) .
+			Xml::closeElement( 'fieldset' ) .
+			Xml::closeElement( 'form' )
+		);
 	}
 
 	/*
@@ -149,7 +171,7 @@ class EmailUserForm {
 		$subject = $this->subject;
 
 		// Add a standard footer and trim up trailing newlines
-		$this->text = rtrim($this->text) . "\n\n---\n" . wfMsgExt( 'emailuserfooter',
+		$this->text = rtrim($this->text) . "\n\n-- \n" . wfMsgExt( 'emailuserfooter',
 			array( 'content', 'parsemag' ), array( $from->name, $to->name ) );
 		
 		if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
@@ -228,27 +250,33 @@ class EmailUserForm {
 		return $this->target;
 	}
 	
-	static function validateEmailTarget ( $target ) {
+	static function userEmailEnabled() {
 		global $wgEnableEmail, $wgEnableUserEmail;
-
-		if( !( $wgEnableEmail && $wgEnableUserEmail ) ) 
-			return array( "nosuchspecialpage", "nospecialpagetext" );
+		return $wgEnableEmail && $wgEnableUserEmail;
 		
+	}
+	static function validateEmailTarget ( $target ) {
 		if ( "" == $target ) {
 			wfDebug( "Target is empty.\n" );
-			return array( "notargettitle", "notargettext" );
+			return "notarget";
 		}
 	
 		$nt = Title::newFromURL( $target );
 		if ( is_null( $nt ) ) {
 			wfDebug( "Target is invalid title.\n" );
-			return array( "notargettitle", "notargettext" );
+			return "notarget";
 		}
 	
 		$nu = User::newFromName( $nt->getText() );
-		if( is_null( $nu ) || !$nu->canReceiveEmail() ) {
-			wfDebug( "Target is invalid user or can't receive.\n" );
-			return array( "noemailtitle", "noemailtext" );
+		if( is_null( $nu ) || !$nu->getId() ) {
+			wfDebug( "Target is invalid user.\n" );
+			return "notarget";
+		} else if ( !$nu->isEmailConfirmed() ) {
+			wfDebug( "User has no valid email.\n" );
+			return "noemail";
+		} else if ( !$nu->canReceiveEmail() ) {
+			wfDebug( "User does not allow user emails.\n" );
+			return "nowikiemail";
 		}
 		
 		return $nu;
@@ -256,22 +284,22 @@ class EmailUserForm {
 	static function getPermissionsError ( $user, $editToken ) {
 		if( !$user->canSendEmail() ) {
 			wfDebug( "User can't send.\n" );
-			return array( "mailnologin", "mailnologintext" );
+			return "mailnologin";
 		}
 		
 		if( $user->isBlockedFromEmailuser() ) {
 			wfDebug( "User is blocked from sending e-mail.\n" );
-			return array( "blockedemailuser", "" );
+			return "blockedemailuser";
 		}
 		
 		if( $user->pingLimiter( 'emailuser' ) ) {
 			wfDebug( "Ping limiter triggered.\n" );	
-			return array( 'actionthrottledtext', '' );
+			return 'actionthrottledtext';
 		}
 		
 		if( !$user->matchEditToken( $editToken ) ) {
 			wfDebug( "Matching edit token failed.\n" );
-			return array( 'sessionfailure', '' );
+			return 'sessionfailure';
 		}
 		
 		return;
diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 38bfc83e..898b5a78 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (C) 2003 Brion Vibber <brion@pobox.com>
+# Copyright (C) 2003-2008 Brion Vibber <brion@pobox.com>
 # http://www.mediawiki.org/
 #
 # This program is free software; you can redistribute it and/or modify
@@ -71,7 +71,7 @@ function wfExportGetTemplates( $inputPages, $pageSet ) {
 function wfExportGetImages( $inputPages, $pageSet ) {
 	return wfExportGetLinks( $inputPages, $pageSet,
 		'imagelinks',
-		array( NS_IMAGE . ' AS namespace', 'il_to AS title' ),
+		array( NS_FILE . ' AS namespace', 'il_to AS title' ),
 		array( 'page_id=il_from' ) );
 }
 
@@ -93,7 +93,7 @@ function wfExportGetLinks( $inputPages, $pageSet, $table, $fields, $join ) {
 				array_merge( $join,
 					array(
 						'page_namespace' => $title->getNamespace(),
-						'page_title' => $title->getDbKey() ) ),
+						'page_title' => $title->getDBKey() ) ),
 				__METHOD__ );
 			foreach( $result as $row ) {
 				$template = Title::makeTitle( $row->namespace, $row->title );
@@ -126,7 +126,7 @@ function wfSpecialExport( $page = '' ) {
 		$catname = $wgRequest->getText( 'catname' );
 
 		if ( $catname !== '' && $catname !== NULL && $catname !== false ) {
-			$t = Title::makeTitleSafe( NS_CATEGORY, $catname );
+			$t = Title::makeTitleSafe( NS_MAIN, $catname );
 			if ( $t ) {
 				/**
 				 * @fixme This can lead to hitting memory limit for very large
@@ -223,8 +223,23 @@ function wfSpecialExport( $page = '' ) {
 
 		/* Ok, let's get to it... */
 
-		$db = wfGetDB( DB_SLAVE );
-		$exporter = new WikiExporter( $db, $history );
+		if( $history == WikiExporter::CURRENT ) {
+			$lb = false;
+			$db = wfGetDB( DB_SLAVE );
+			$buffer = WikiExporter::BUFFER;
+		} else {
+			// Use an unbuffered query; histories may be very long!
+			$lb = wfGetLBFactory()->newMainLB();
+			$db = $lb->getConnection( DB_SLAVE );
+			$buffer = WikiExporter::STREAM;
+			
+			// This might take a while... :D
+			wfSuppressWarnings();
+			set_time_limit(0);
+			wfRestoreWarnings();
+		}
+
+		$exporter = new WikiExporter( $db, $history, $buffer );
 		$exporter->list_authors = $list_authors ;
 		$exporter->openStream();
 
@@ -251,11 +266,14 @@ function wfSpecialExport( $page = '' ) {
 		}
 
 		$exporter->closeStream();
+		if( $lb ) {
+			$lb->closeAll();
+		}
 		return;
 	}
 
 	$self = SpecialPage::getTitleFor( 'Export' );
-	$wgOut->addHtml( wfMsgExt( 'exporttext', 'parse' ) );
+	$wgOut->addHTML( wfMsgExt( 'exporttext', 'parse' ) );
 
 	$form = Xml::openElement( 'form', array( 'method' => 'post',
 		'action' => $self->getLocalUrl( 'action=submit' ) ) );
@@ -271,14 +289,14 @@ function wfSpecialExport( $page = '' ) {
 	if( $wgExportAllowHistory ) {
 		$form .= Xml::checkLabel( wfMsg( 'exportcuronly' ), 'curonly', 'curonly', true ) . '<br />';
 	} else {
-		$wgOut->addHtml( wfMsgExt( 'exportnohistory', 'parse' ) );
+		$wgOut->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) );
 	}
 	$form .= Xml::checkLabel( wfMsg( 'export-templates' ), 'templates', 'wpExportTemplates', false ) . '<br />';
 	// Enable this when we can do something useful exporting/importing image information. :)
 	//$form .= Xml::checkLabel( wfMsg( 'export-images' ), 'images', 'wpExportImages', false ) . '<br />';
 	$form .= Xml::checkLabel( wfMsg( 'export-download' ), 'wpDownload', 'wpDownload', true ) . '<br />';
 
-	$form .= Xml::submitButton( wfMsg( 'export-submit' ) );
+	$form .= Xml::submitButton( wfMsg( 'export-submit' ), array( 'accesskey' => 's' ) );
 	$form .= Xml::closeElement( 'form' );
-	$wgOut->addHtml( $form );
+	$wgOut->addHTML( $form );
 }
diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index 5236ca25..49a218c8 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -49,7 +49,7 @@ class FileDuplicateSearchPage extends QueryPage {
 	function formatResult( $skin, $result ) {
 		global $wgContLang, $wgLang;
 
-		$nt = Title::makeTitle( NS_IMAGE, $result->title );
+		$nt = Title::makeTitle( NS_FILE, $result->title );
 		$text = $wgContLang->convert( $nt->getText() );
 		$plink = $skin->makeLink( $nt->getPrefixedText(), $text );
 
@@ -73,7 +73,7 @@ function wfSpecialFileDuplicateSearch( $par = null ) {
 	if( $title && $title->getText() != '' ) {
 		$dbr = wfGetDB( DB_SLAVE );
 		$image = $dbr->tableName( 'image' );
-		$encFilename = $dbr->addQuotes( htmlspecialchars( $title->getDbKey() ) );
+		$encFilename = $dbr->addQuotes( htmlspecialchars( $title->getDBKey() ) );
 		$sql = "SELECT img_sha1 from $image where img_name = $encFilename";
 		$res = $dbr->query( $sql );
 		$row = $dbr->fetchRow( $res );
@@ -100,7 +100,7 @@ function wfSpecialFileDuplicateSearch( $par = null ) {
 		# Show a thumbnail of the file
 		$img = wfFindFile( $title );
 		if ( $img ) {
-			$thumb = $img->getThumbnail( 120, 120 );
+			$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
 			if( $thumb ) {
 				$wgOut->addHTML( '<div style="float:' . $align . '" id="mw-fileduplicatesearch-icon">' .
 					$thumb->toHtml( array( 'desc-link' => false ) ) . '<br />' .
diff --git a/includes/specials/SpecialFilepath.php b/includes/specials/SpecialFilepath.php
index a2ba3e57..4a724b1f 100644
--- a/includes/specials/SpecialFilepath.php
+++ b/includes/specials/SpecialFilepath.php
@@ -9,9 +9,9 @@ function wfSpecialFilepath( $par ) {
 
 	$file = isset( $par ) ? $par : $wgRequest->getText( 'file' );
 
-	$title = Title::newFromText( $file, NS_IMAGE );
+	$title = Title::makeTitleSafe( NS_FILE, $file );
 
-	if ( ! $title instanceof Title || $title->getNamespace() != NS_IMAGE ) {
+	if ( ! $title instanceof Title || $title->getNamespace() != NS_FILE ) {
 		$cform = new FilepathForm( $title );
 		$cform->execute();
 	} else {
diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 1623245d..5e1a6533 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -23,28 +23,55 @@
  * @ingroup SpecialPage
  */
 
-/**
- * Constructor
- */
-function wfSpecialImport( $page = '' ) {
-	global $wgUser, $wgOut, $wgRequest, $wgTitle, $wgImportSources;
-	global $wgImportTargetNamespace;
-
-	$interwiki = false;
-	$namespace = $wgImportTargetNamespace;
-	$frompage = '';
-	$history = true;
-
-	if ( wfReadOnly() ) {
-		$wgOut->readOnlyPage();
-		return;
+class SpecialImport extends SpecialPage {
+	
+	private $interwiki = false;
+	private $namespace;
+	private $frompage = '';
+	private $logcomment= false;
+	private $history = true;
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		parent::__construct( 'Import', 'import' );
+		global $wgImportTargetNamespace;
+		$this->namespace = $wgImportTargetNamespace;
 	}
-
-	if( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit') {
+	
+	/**
+	 * Execute
+	 */
+	function execute( $par ) {
+		global $wgRequest;
+		
+		$this->setHeaders();
+		$this->outputHeader();
+		
+		if ( wfReadOnly() ) {
+			global $wgOut;
+			$wgOut->readOnlyPage();
+			return;
+		}
+		
+		if ( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit' ) {
+			$this->doImport();
+		}
+		$this->showForm();
+	}
+	
+	/**
+	 * Do the actual import
+	 */
+	private function doImport() {
+		global $wgOut, $wgRequest, $wgUser, $wgImportSources;
 		$isUpload = false;
-		$namespace = $wgRequest->getIntOrNull( 'namespace' );
+		$this->namespace = $wgRequest->getIntOrNull( 'namespace' );
 		$sourceName = $wgRequest->getVal( "source" );
 
+		$this->logcomment = $wgRequest->getText( 'log-comment' );
+
 		if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'editToken' ) ) ) {
 			$source = new WikiErrorMsg( 'import-token-mismatch' );
 		} elseif ( $sourceName == 'upload' ) {
@@ -55,16 +82,16 @@ function wfSpecialImport( $page = '' ) {
 				return $wgOut->permissionRequired( 'importupload' );
 			}
 		} elseif ( $sourceName == "interwiki" ) {
-			$interwiki = $wgRequest->getVal( 'interwiki' );
-			if ( !in_array( $interwiki, $wgImportSources ) ) {
+			$this->interwiki = $wgRequest->getVal( 'interwiki' );
+			if ( !in_array( $this->interwiki, $wgImportSources ) ) {
 				$source = new WikiErrorMsg( "import-invalid-interwiki" );
 			} else {
-				$history = $wgRequest->getCheck( 'interwikiHistory' );
-				$frompage = $wgRequest->getText( "frompage" );
+				$this->history = $wgRequest->getCheck( 'interwikiHistory' );
+				$this->frompage = $wgRequest->getText( "frompage" );
 				$source = ImportStreamSource::newFromInterwiki(
-					$interwiki,
-					$frompage,
-					$history );
+					$this->interwiki,
+					$this->frompage,
+					$this->history );
 			}
 		} else {
 			$source = new WikiErrorMsg( "importunknownsource" );
@@ -76,10 +103,10 @@ function wfSpecialImport( $page = '' ) {
 			$wgOut->addWikiMsg( "importstart" );
 
 			$importer = new WikiImporter( $source );
-			if( !is_null( $namespace ) ) {
-				$importer->setTargetNamespace( $namespace );
+			if( !is_null( $this->namespace ) ) {
+				$importer->setTargetNamespace( $this->namespace );
 			}
-			$reporter = new ImportReporter( $importer, $isUpload, $interwiki );
+			$reporter = new ImportReporter( $importer, $isUpload, $this->interwiki , $this->logcomment);
 
 			$reporter->open();
 			$result = $importer->doImport();
@@ -99,79 +126,121 @@ function wfSpecialImport( $page = '' ) {
 		}
 	}
 
-	$action = $wgTitle->getLocalUrl( 'action=submit' );
-
-	if( $wgUser->isAllowed( 'importupload' ) ) {
-		$wgOut->addWikiMsg( "importtext" );
-		$wgOut->addHTML(
-			Xml::openElement( 'fieldset' ).
-			Xml::element( 'legend', null, wfMsg( 'import-upload' ) ) .
-			Xml::openElement( 'form', array( 'enctype' => 'multipart/form-data', 'method' => 'post', 'action' => $action ) ) .
-			Xml::hidden( 'action', 'submit' ) .
-			Xml::hidden( 'source', 'upload' ) .
-			Xml::input( 'xmlimport', 50, '', array( 'type' => 'file' ) ) . ' ' .
-			Xml::hidden( 'editToken', $wgUser->editToken() ) .
-			Xml::submitButton( wfMsg( 'uploadbtn' ) ) .
-			Xml::closeElement( 'form' ) .
-			Xml::closeElement( 'fieldset' )
-		);
-	} else {
-		if( empty( $wgImportSources ) ) {
-			$wgOut->addWikiMsg( 'importnosources' );
+	private function showForm() {
+		global $wgUser, $wgOut, $wgRequest, $wgTitle, $wgImportSources;
+		# FIXME: Quick hack to disable import for non privileged users /Raymond 
+		# Regression from 43963 
+		if( !$wgUser->isAllowed( 'import' ) && !$wgUser->isAllowed( 'importupload' ) )
+			return $wgOut->permissionRequired( 'import' );
+
+		$action = $wgTitle->getLocalUrl( 'action=submit' );
+
+		if( $wgUser->isAllowed( 'importupload' ) ) {
+			$wgOut->addWikiMsg( "importtext" );
+			$wgOut->addHTML(
+				Xml::openElement( 'fieldset' ).
+				Xml::element( 'legend', null, wfMsg( 'import-upload' ) ) .
+				Xml::openElement( 'form', array( 'enctype' => 'multipart/form-data', 'method' => 'post', 'action' => $action ) ) .
+				Xml::hidden( 'action', 'submit' ) .
+				Xml::hidden( 'source', 'upload' ) .
+				Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
+
+				"<tr>
+					<td class='mw-label'>" .
+						Xml::label( wfMsg( 'import-upload-filename' ), 'xmlimport' ) .
+					"</td>
+					<td class='mw-input'>" .
+						Xml::input( 'xmlimport', 50, '', array( 'type' => 'file' ) ) . ' ' .
+					"</td>
+				</tr>
+				<tr>
+					<td class='mw-label'>" .
+						Xml::label( wfMsg( 'import-comment' ), 'mw-import-comment' ) .
+					"</td>
+					<td class='mw-input'>" .
+						Xml::input( 'log-comment', 50, '',
+							array( 'id' => 'mw-import-comment', 'type' => 'text' ) ) . ' ' .
+					"</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td class='mw-input'>" .
+						Xml::submitButton( wfMsg( 'uploadbtn' ) ) .
+					"</td>
+				</tr>" .
+				Xml::closeElement( 'table' ).
+				Xml::hidden( 'editToken', $wgUser->editToken() ) .
+				Xml::closeElement( 'form' ) .
+				Xml::closeElement( 'fieldset' )
+			);
+		} else {
+			if( empty( $wgImportSources ) ) {
+				$wgOut->addWikiMsg( 'importnosources' );
+			}
 		}
-	}
 
-	if( !empty( $wgImportSources ) ) {
-		$wgOut->addHTML(
-			Xml::openElement( 'fieldset' ) .
-			Xml::element( 'legend', null, wfMsg( 'importinterwiki' ) ) .
-			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action ) ) .
-			wfMsgExt( 'import-interwiki-text', array( 'parse' ) ) .
-			Xml::hidden( 'action', 'submit' ) .
-			Xml::hidden( 'source', 'interwiki' ) .
-			Xml::hidden( 'editToken', $wgUser->editToken() ) .
-			Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
-			"<tr>
-				<td>" .
-					Xml::openElement( 'select', array( 'name' => 'interwiki' ) )
-		);
-		foreach( $wgImportSources as $prefix ) {
-			$selected = ( $interwiki === $prefix ) ? ' selected="selected"' : '';
-			$wgOut->addHTML( Xml::option( $prefix, $prefix, $selected ) );
+		if( $wgUser->isAllowed( 'import' ) && !empty( $wgImportSources ) ) {
+			$wgOut->addHTML(
+				Xml::openElement( 'fieldset' ) .
+				Xml::element( 'legend', null, wfMsg( 'importinterwiki' ) ) .
+				Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action ) ) .
+				wfMsgExt( 'import-interwiki-text', array( 'parse' ) ) .
+				Xml::hidden( 'action', 'submit' ) .
+				Xml::hidden( 'source', 'interwiki' ) .
+				Xml::hidden( 'editToken', $wgUser->editToken() ) .
+				Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
+				"<tr>
+					<td class='mw-label'>" .
+						Xml::label( wfMsg( 'import-interwiki-source' ), 'interwiki' ) .
+					"</td>
+					<td class='mw-input'>" .
+						Xml::openElement( 'select', array( 'name' => 'interwiki' ) )
+			);
+			foreach( $wgImportSources as $prefix ) {
+				$selected = ( $this->interwiki === $prefix ) ? ' selected="selected"' : '';
+				$wgOut->addHTML( Xml::option( $prefix, $prefix, $selected ) );
+			}
+			$wgOut->addHTML(
+						Xml::closeElement( 'select' ) .
+						Xml::input( 'frompage', 50, $this->frompage ) .
+					"</td>
+				</tr>
+				<tr>
+					<td>
+					</td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'import-interwiki-history' ), 'interwikiHistory', 'interwikiHistory', $this->history ) .
+					"</td>
+				</tr>
+				<tr>
+					<td>" .
+						Xml::label( wfMsg( 'import-interwiki-namespace' ), 'namespace' ) .
+					"</td>
+					<td class='mw-input'>" .
+						Xml::namespaceSelector( $this->namespace, '' ) .
+					"</td>
+				</tr>
+				<tr>
+					<td class='mw-label'>" .
+						Xml::label( wfMsg( 'import-comment' ), 'mw-interwiki-comment' ) .
+					"</td>
+					<td class='mw-input'>" .
+						Xml::input( 'log-comment', 50, '',
+							array( 'id' => 'mw-interwiki-comment', 'type' => 'text' ) ) . ' ' .
+					"</td>
+				</tr>
+				<tr>
+					<td>
+					</td>
+					<td class='mw-input'>" .
+						Xml::submitButton( wfMsg( 'import-interwiki-submit' ), array( 'accesskey' => 's' ) ) .
+					"</td>
+				</tr>" .
+				Xml::closeElement( 'table' ).
+				Xml::closeElement( 'form' ) .
+				Xml::closeElement( 'fieldset' )
+			);
 		}
-		$wgOut->addHTML(
-					Xml::closeElement( 'select' ) .
-				"</td>
-				<td>" .
-					Xml::input( 'frompage', 50, $frompage ) .
-				"</td>
-			</tr>
-			<tr>
-				<td>
-				</td>
-				<td>" .
-					Xml::checkLabel( wfMsg( 'import-interwiki-history' ), 'interwikiHistory', 'interwikiHistory', $history ) .
-				"</td>
-			</tr>
-			<tr>
-				<td>
-				</td>
-				<td>" .
-					Xml::label( wfMsg( 'import-interwiki-namespace' ), 'namespace' ) .
-					Xml::namespaceSelector( $namespace, '' ) .
-				"</td>
-			</tr>
-			<tr>
-				<td>
-				</td>
-				<td>" .
-					Xml::submitButton( wfMsg( 'import-interwiki-submit' ) ) .
-				"</td>
-			</tr>" .
-			Xml::closeElement( 'table' ).
-			Xml::closeElement( 'form' ) .
-			Xml::closeElement( 'fieldset' )
-		);
 	}
 }
 
@@ -180,16 +249,19 @@ function wfSpecialImport( $page = '' ) {
  * @ingroup SpecialPage
  */
 class ImportReporter {
-	function __construct( $importer, $upload, $interwiki ) {
+      private $reason=false;
+
+	function __construct( $importer, $upload, $interwiki , $reason=false ) {
 		$importer->setPageOutCallback( array( $this, 'reportPage' ) );
 		$this->mPageCount = 0;
 		$this->mIsUpload = $upload;
 		$this->mInterwiki = $interwiki;
+		$this->reason = $reason;
 	}
 
 	function open() {
 		global $wgOut;
-		$wgOut->addHtml( "<ul>\n" );
+		$wgOut->addHTML( "<ul>\n" );
 	}
 
 	function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
@@ -203,7 +275,7 @@ class ImportReporter {
 		$contentCount = $wgContLang->formatNum( $successCount );
 
 		if( $successCount > 0 ) {
-			$wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) . " " .
+			$wgOut->addHTML( "<li>" . $skin->makeKnownLinkObj( $title ) . " " .
 				wfMsgExt( 'import-revision-count', array( 'parsemag', 'escape' ), $localCount ) .
 				"</li>\n"
 			);
@@ -212,949 +284,43 @@ class ImportReporter {
 			if( $this->mIsUpload ) {
 				$detail = wfMsgExt( 'import-logentry-upload-detail', array( 'content', 'parsemag' ),
 					$contentCount );
+				if ( $this->reason ) {
+			                $detail .=  wfMsgForContent( 'colon-separator' ) . $this->reason;
+				}
 				$log->addEntry( 'upload', $title, $detail );
 			} else {
 				$interwiki = '[[:' . $this->mInterwiki . ':' .
 					$origTitle->getPrefixedText() . ']]';
 				$detail = wfMsgExt( 'import-logentry-interwiki-detail', array( 'content', 'parsemag' ),
 					$contentCount, $interwiki );
+				if ( $this->reason ) {
+			                $detail .=  wfMsgForContent( 'colon-separator' ) . $this->reason;
+				}
 				$log->addEntry( 'interwiki', $title, $detail );
 			}
 
 			$comment = $detail; // quick
 			$dbw = wfGetDB( DB_MASTER );
+			$latest = $title->getLatestRevID();
 			$nullRevision = Revision::newNullRevision( $dbw, $title->getArticleId(), $comment, true );
 			$nullRevision->insertOn( $dbw );
 			$article = new Article( $title );
 			# Update page record
 			$article->updateRevisionOn( $dbw, $nullRevision );
-			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 		} else {
-			$wgOut->addHtml( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
+			$wgOut->addHTML( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
 		}
 	}
 
 	function close() {
 		global $wgOut;
 		if( $this->mPageCount == 0 ) {
-			$wgOut->addHtml( "</ul>\n" );
+			$wgOut->addHTML( "</ul>\n" );
 			return new WikiErrorMsg( "importnopages" );
 		}
-		$wgOut->addHtml( "</ul>\n" );
+		$wgOut->addHTML( "</ul>\n" );
 
 		return $this->mPageCount;
 	}
 }
-
-/**
- *
- * @ingroup SpecialPage
- */
-class WikiRevision {
-	var $title = null;
-	var $id = 0;
-	var $timestamp = "20010115000000";
-	var $user = 0;
-	var $user_text = "";
-	var $text = "";
-	var $comment = "";
-	var $minor = false;
-
-	function setTitle( $title ) {
-		if( is_object( $title ) ) {
-			$this->title = $title;
-		} elseif( is_null( $title ) ) {
-			throw new MWException( "WikiRevision given a null title in import. You may need to adjust \$wgLegalTitleChars." );
-		} else {
-			throw new MWException( "WikiRevision given non-object title in import." );
-		}
-	}
-
-	function setID( $id ) {
-		$this->id = $id;
-	}
-
-	function setTimestamp( $ts ) {
-		# 2003-08-05T18:30:02Z
-		$this->timestamp = wfTimestamp( TS_MW, $ts );
-	}
-
-	function setUsername( $user ) {
-		$this->user_text = $user;
-	}
-
-	function setUserIP( $ip ) {
-		$this->user_text = $ip;
-	}
-
-	function setText( $text ) {
-		$this->text = $text;
-	}
-
-	function setComment( $text ) {
-		$this->comment = $text;
-	}
-
-	function setMinor( $minor ) {
-		$this->minor = (bool)$minor;
-	}
-
-	function setSrc( $src ) {
-		$this->src = $src;
-	}
-
-	function setFilename( $filename ) {
-		$this->filename = $filename;
-	}
-
-	function setSize( $size ) {
-		$this->size = intval( $size );
-	}
-
-	function getTitle() {
-		return $this->title;
-	}
-
-	function getID() {
-		return $this->id;
-	}
-
-	function getTimestamp() {
-		return $this->timestamp;
-	}
-
-	function getUser() {
-		return $this->user_text;
-	}
-
-	function getText() {
-		return $this->text;
-	}
-
-	function getComment() {
-		return $this->comment;
-	}
-
-	function getMinor() {
-		return $this->minor;
-	}
-
-	function getSrc() {
-		return $this->src;
-	}
-
-	function getFilename() {
-		return $this->filename;
-	}
-
-	function getSize() {
-		return $this->size;
-	}
-
-	function importOldRevision() {
-		$dbw = wfGetDB( DB_MASTER );
-
-		# Sneak a single revision into place
-		$user = User::newFromName( $this->getUser() );
-		if( $user ) {
-			$userId = intval( $user->getId() );
-			$userText = $user->getName();
-		} else {
-			$userId = 0;
-			$userText = $this->getUser();
-		}
-
-		// avoid memory leak...?
-		$linkCache = LinkCache::singleton();
-		$linkCache->clear();
-
-		$article = new Article( $this->title );
-		$pageId = $article->getId();
-		if( $pageId == 0 ) {
-			# must create the page...
-			$pageId = $article->insertOn( $dbw );
-			$created = true;
-		} else {
-			$created = false;
-
-			$prior = Revision::loadFromTimestamp( $dbw, $this->title, $this->timestamp );
-			if( !is_null( $prior ) ) {
-				// FIXME: this could fail slightly for multiple matches :P
-				wfDebug( __METHOD__ . ": skipping existing revision for [[" .
-					$this->title->getPrefixedText() . "]], timestamp " .
-					$this->timestamp . "\n" );
-				return false;
-			}
-		}
-
-		# FIXME: Use original rev_id optionally
-		# FIXME: blah blah blah
-
-		#if( $numrows > 0 ) {
-		#	return wfMsg( "importhistoryconflict" );
-		#}
-
-		# Insert the row
-		$revision = new Revision( array(
-			'page'       => $pageId,
-			'text'       => $this->getText(),
-			'comment'    => $this->getComment(),
-			'user'       => $userId,
-			'user_text'  => $userText,
-			'timestamp'  => $this->timestamp,
-			'minor_edit' => $this->minor,
-			) );
-		$revId = $revision->insertOn( $dbw );
-		$changed = $article->updateIfNewerOn( $dbw, $revision );
-
-		if( $created ) {
-			wfDebug( __METHOD__ . ": running onArticleCreate\n" );
-			Article::onArticleCreate( $this->title );
-
-			wfDebug( __METHOD__ . ": running create updates\n" );
-			$article->createUpdates( $revision );
-
-		} elseif( $changed ) {
-			wfDebug( __METHOD__ . ": running onArticleEdit\n" );
-			Article::onArticleEdit( $this->title );
-
-			wfDebug( __METHOD__ . ": running edit updates\n" );
-			$article->editUpdates(
-				$this->getText(),
-				$this->getComment(),
-				$this->minor,
-				$this->timestamp,
-				$revId );
-		}
-
-		return true;
-	}
-
-	function importUpload() {
-		wfDebug( __METHOD__ . ": STUB\n" );
-
-		/**
-			// from file revert...
-			$source = $this->file->getArchiveVirtualUrl( $this->oldimage );
-			$comment = $wgRequest->getText( 'wpComment' );
-			// TODO: Preserve file properties from database instead of reloading from file
-			$status = $this->file->upload( $source, $comment, $comment );
-			if( $status->isGood() ) {
-		*/
-
-		/**
-			// from file upload...
-		$this->mLocalFile = wfLocalFile( $nt );
-		$this->mDestName = $this->mLocalFile->getName();
-		//....
-			$status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText,
-			File::DELETE_SOURCE, $this->mFileProps );
-			if ( !$status->isGood() ) {
-				$resultDetails = array( 'internal' => $status->getWikiText() );
-		*/
-
-		// @fixme upload() uses $wgUser, which is wrong here
-		// it may also create a page without our desire, also wrong potentially.
-		// and, it will record a *current* upload, but we might want an archive version here
-
-		$file = wfLocalFile( $this->getTitle() );
-		if( !$file ) {
-			var_dump( $file );
-			wfDebug( "IMPORT: Bad file. :(\n" );
-			return false;
-		}
-
-		$source = $this->downloadSource();
-		if( !$source ) {
-			wfDebug( "IMPORT: Could not fetch remote file. :(\n" );
-			return false;
-		}
-
-		$status = $file->upload( $source,
-			$this->getComment(),
-			$this->getComment(), // Initial page, if none present...
-			File::DELETE_SOURCE,
-			false, // props...
-			$this->getTimestamp() );
-
-		if( $status->isGood() ) {
-			// yay?
-			wfDebug( "IMPORT: is ok?\n" );
-			return true;
-		}
-
-		wfDebug( "IMPORT: is bad? " . $status->getXml() . "\n" );
-		return false;
-
-	}
-
-	function downloadSource() {
-		global $wgEnableUploads;
-		if( !$wgEnableUploads ) {
-			return false;
-		}
-
-		$tempo = tempnam( wfTempDir(), 'download' );
-		$f = fopen( $tempo, 'wb' );
-		if( !$f ) {
-			wfDebug( "IMPORT: couldn't write to temp file $tempo\n" );
-			return false;
-		}
-
-		// @fixme!
-		$src = $this->getSrc();
-		$data = Http::get( $src );
-		if( !$data ) {
-			wfDebug( "IMPORT: couldn't fetch source $src\n" );
-			fclose( $f );
-			unlink( $tempo );
-			return false;
-		}
-
-		fwrite( $f, $data );
-		fclose( $f );
-
-		return $tempo;
-	}
-
-}
-
-/**
- * implements Special:Import
- * @ingroup SpecialPage
- */
-class WikiImporter {
-	var $mDebug = false;
-	var $mSource = null;
-	var $mPageCallback = null;
-	var $mPageOutCallback = null;
-	var $mRevisionCallback = null;
-	var $mUploadCallback = null;
-	var $mTargetNamespace = null;
-	var $lastfield;
-	var $tagStack = array();
-
-	function __construct( $source ) {
-		$this->setRevisionCallback( array( $this, "importRevision" ) );
-		$this->setUploadCallback( array( $this, "importUpload" ) );
-		$this->mSource = $source;
-	}
-
-	function throwXmlError( $err ) {
-		$this->debug( "FAILURE: $err" );
-		wfDebug( "WikiImporter XML error: $err\n" );
-	}
-
-	# --------------
-
-	function doImport() {
-		if( empty( $this->mSource ) ) {
-			return new WikiErrorMsg( "importnotext" );
-		}
-
-		$parser = xml_parser_create( "UTF-8" );
-
-		# case folding violates XML standard, turn it off
-		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
-
-		xml_set_object( $parser, $this );
-		xml_set_element_handler( $parser, "in_start", "" );
-
-		$offset = 0; // for context extraction on error reporting
-		do {
-			$chunk = $this->mSource->readChunk();
-			if( !xml_parse( $parser, $chunk, $this->mSource->atEnd() ) ) {
-				wfDebug( "WikiImporter::doImport encountered XML parsing error\n" );
-				return new WikiXmlError( $parser, wfMsgHtml( 'import-parse-failure' ), $chunk, $offset );
-			}
-			$offset += strlen( $chunk );
-		} while( $chunk !== false && !$this->mSource->atEnd() );
-		xml_parser_free( $parser );
-
-		return true;
-	}
-
-	function debug( $data ) {
-		if( $this->mDebug ) {
-			wfDebug( "IMPORT: $data\n" );
-		}
-	}
-
-	function notice( $data ) {
-		global $wgCommandLineMode;
-		if( $wgCommandLineMode ) {
-			print "$data\n";
-		} else {
-			global $wgOut;
-			$wgOut->addHTML( "<li>" . htmlspecialchars( $data ) . "</li>\n" );
-		}
-	}
-
-	/**
-	 * Set debug mode...
-	 */
-	function setDebug( $debug ) {
-		$this->mDebug = $debug;
-	}
-
-	/**
-	 * Sets the action to perform as each new page in the stream is reached.
-	 * @param $callback callback
-	 * @return callback
-	 */
-	function setPageCallback( $callback ) {
-		$previous = $this->mPageCallback;
-		$this->mPageCallback = $callback;
-		return $previous;
-	}
-
-	/**
-	 * Sets the action to perform as each page in the stream is completed.
-	 * Callback accepts the page title (as a Title object), a second object
-	 * with the original title form (in case it's been overridden into a
-	 * local namespace), and a count of revisions.
-	 *
-	 * @param $callback callback
-	 * @return callback
-	 */
-	function setPageOutCallback( $callback ) {
-		$previous = $this->mPageOutCallback;
-		$this->mPageOutCallback = $callback;
-		return $previous;
-	}
-
-	/**
-	 * Sets the action to perform as each page revision is reached.
-	 * @param $callback callback
-	 * @return callback
-	 */
-	function setRevisionCallback( $callback ) {
-		$previous = $this->mRevisionCallback;
-		$this->mRevisionCallback = $callback;
-		return $previous;
-	}
-
-	/**
-	 * Sets the action to perform as each file upload version is reached.
-	 * @param $callback callback
-	 * @return callback
-	 */
-	function setUploadCallback( $callback ) {
-		$previous = $this->mUploadCallback;
-		$this->mUploadCallback = $callback;
-		return $previous;
-	}
-
-	/**
-	 * Set a target namespace to override the defaults
-	 */
-	function setTargetNamespace( $namespace ) {
-		if( is_null( $namespace ) ) {
-			// Don't override namespaces
-			$this->mTargetNamespace = null;
-		} elseif( $namespace >= 0 ) {
-			// FIXME: Check for validity
-			$this->mTargetNamespace = intval( $namespace );
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Default per-revision callback, performs the import.
-	 * @param $revision WikiRevision
-	 * @private
-	 */
-	function importRevision( $revision ) {
-		$dbw = wfGetDB( DB_MASTER );
-		return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) );
-	}
-
-	/**
-	 * Dummy for now...
-	 */
-	function importUpload( $revision ) {
-		//$dbw = wfGetDB( DB_MASTER );
-		//return $dbw->deadlockLoop( array( $revision, 'importUpload' ) );
-		return false;
-	}
-
-	/**
-	 * Alternate per-revision callback, for debugging.
-	 * @param $revision WikiRevision
-	 * @private
-	 */
-	function debugRevisionHandler( &$revision ) {
-		$this->debug( "Got revision:" );
-		if( is_object( $revision->title ) ) {
-			$this->debug( "-- Title: " . $revision->title->getPrefixedText() );
-		} else {
-			$this->debug( "-- Title: <invalid>" );
-		}
-		$this->debug( "-- User: " . $revision->user_text );
-		$this->debug( "-- Timestamp: " . $revision->timestamp );
-		$this->debug( "-- Comment: " . $revision->comment );
-		$this->debug( "-- Text: " . $revision->text );
-	}
-
-	/**
-	 * Notify the callback function when a new <page> is reached.
-	 * @param $title Title
-	 * @private
-	 */
-	function pageCallback( $title ) {
-		if( is_callable( $this->mPageCallback ) ) {
-			call_user_func( $this->mPageCallback, $title );
-		}
-	}
-
-	/**
-	 * Notify the callback function when a </page> is closed.
-	 * @param $title Title
-	 * @param $origTitle Title
-	 * @param $revisionCount int
-	 * @param $successCount Int: number of revisions for which callback returned true
-	 * @private
-	 */
-	function pageOutCallback( $title, $origTitle, $revisionCount, $successCount ) {
-		if( is_callable( $this->mPageOutCallback ) ) {
-			call_user_func( $this->mPageOutCallback, $title, $origTitle,
-				$revisionCount, $successCount );
-		}
-	}
-
-
-	# XML parser callbacks from here out -- beware!
-	function donothing( $parser, $x, $y="" ) {
-		#$this->debug( "donothing" );
-	}
-
-	function in_start( $parser, $name, $attribs ) {
-		$this->debug( "in_start $name" );
-		if( $name != "mediawiki" ) {
-			return $this->throwXMLerror( "Expected <mediawiki>, got <$name>" );
-		}
-		xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
-	}
-
-	function in_mediawiki( $parser, $name, $attribs ) {
-		$this->debug( "in_mediawiki $name" );
-		if( $name == 'siteinfo' ) {
-			xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
-		} elseif( $name == 'page' ) {
-			$this->push( $name );
-			$this->workRevisionCount = 0;
-			$this->workSuccessCount = 0;
-			$this->uploadCount = 0;
-			$this->uploadSuccessCount = 0;
-			xml_set_element_handler( $parser, "in_page", "out_page" );
-		} else {
-			return $this->throwXMLerror( "Expected <page>, got <$name>" );
-		}
-	}
-	function out_mediawiki( $parser, $name ) {
-		$this->debug( "out_mediawiki $name" );
-		if( $name != "mediawiki" ) {
-			return $this->throwXMLerror( "Expected </mediawiki>, got </$name>" );
-		}
-		xml_set_element_handler( $parser, "donothing", "donothing" );
-	}
-
-
-	function in_siteinfo( $parser, $name, $attribs ) {
-		// no-ops for now
-		$this->debug( "in_siteinfo $name" );
-		switch( $name ) {
-		case "sitename":
-		case "base":
-		case "generator":
-		case "case":
-		case "namespaces":
-		case "namespace":
-			break;
-		default:
-			return $this->throwXMLerror( "Element <$name> not allowed in <siteinfo>." );
-		}
-	}
-
-	function out_siteinfo( $parser, $name ) {
-		if( $name == "siteinfo" ) {
-			xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
-		}
-	}
-
-
-	function in_page( $parser, $name, $attribs ) {
-		$this->debug( "in_page $name" );
-		switch( $name ) {
-		case "id":
-		case "title":
-		case "restrictions":
-			$this->appendfield = $name;
-			$this->appenddata = "";
-			xml_set_element_handler( $parser, "in_nothing", "out_append" );
-			xml_set_character_data_handler( $parser, "char_append" );
-			break;
-		case "revision":
-			$this->push( "revision" );
-			if( is_object( $this->pageTitle ) ) {
-				$this->workRevision = new WikiRevision;
-				$this->workRevision->setTitle( $this->pageTitle );
-				$this->workRevisionCount++;
-			} else {
-				// Skipping items due to invalid page title
-				$this->workRevision = null;
-			}
-			xml_set_element_handler( $parser, "in_revision", "out_revision" );
-			break;
-		case "upload":
-			$this->push( "upload" );
-			if( is_object( $this->pageTitle ) ) {
-				$this->workRevision = new WikiRevision;
-				$this->workRevision->setTitle( $this->pageTitle );
-				$this->uploadCount++;
-			} else {
-				// Skipping items due to invalid page title
-				$this->workRevision = null;
-			}
-			xml_set_element_handler( $parser, "in_upload", "out_upload" );
-			break;
-		default:
-			return $this->throwXMLerror( "Element <$name> not allowed in a <page>." );
-		}
-	}
-
-	function out_page( $parser, $name ) {
-		$this->debug( "out_page $name" );
-		$this->pop();
-		if( $name != "page" ) {
-			return $this->throwXMLerror( "Expected </page>, got </$name>" );
-		}
-		xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
-
-		$this->pageOutCallback( $this->pageTitle, $this->origTitle,
-			$this->workRevisionCount, $this->workSuccessCount );
-
-		$this->workTitle = null;
-		$this->workRevision = null;
-		$this->workRevisionCount = 0;
-		$this->workSuccessCount = 0;
-		$this->pageTitle = null;
-		$this->origTitle = null;
-	}
-
-	function in_nothing( $parser, $name, $attribs ) {
-		$this->debug( "in_nothing $name" );
-		return $this->throwXMLerror( "No child elements allowed here; got <$name>" );
-	}
-	function char_append( $parser, $data ) {
-		$this->debug( "char_append '$data'" );
-		$this->appenddata .= $data;
-	}
-	function out_append( $parser, $name ) {
-		$this->debug( "out_append $name" );
-		if( $name != $this->appendfield ) {
-			return $this->throwXMLerror( "Expected </{$this->appendfield}>, got </$name>" );
-		}
-
-		switch( $this->appendfield ) {
-		case "title":
-			$this->workTitle = $this->appenddata;
-			$this->origTitle = Title::newFromText( $this->workTitle );
-			if( !is_null( $this->mTargetNamespace ) && !is_null( $this->origTitle ) ) {
-				$this->pageTitle = Title::makeTitle( $this->mTargetNamespace,
-					$this->origTitle->getDBkey() );
-			} else {
-				$this->pageTitle = Title::newFromText( $this->workTitle );
-			}
-			if( is_null( $this->pageTitle ) ) {
-				// Invalid page title? Ignore the page
-				$this->notice( "Skipping invalid page title '$this->workTitle'" );
-			} else {
-				$this->pageCallback( $this->workTitle );
-			}
-			break;
-		case "id":
-			if ( $this->parentTag() == 'revision' ) {
-				if( $this->workRevision )
-					$this->workRevision->setID( $this->appenddata );
-			}
-			break;
-		case "text":
-			if( $this->workRevision )
-				$this->workRevision->setText( $this->appenddata );
-			break;
-		case "username":
-			if( $this->workRevision )
-				$this->workRevision->setUsername( $this->appenddata );
-			break;
-		case "ip":
-			if( $this->workRevision )
-				$this->workRevision->setUserIP( $this->appenddata );
-			break;
-		case "timestamp":
-			if( $this->workRevision )
-				$this->workRevision->setTimestamp( $this->appenddata );
-			break;
-		case "comment":
-			if( $this->workRevision )
-				$this->workRevision->setComment( $this->appenddata );
-			break;
-		case "minor":
-			if( $this->workRevision )
-				$this->workRevision->setMinor( true );
-			break;
-		case "filename":
-			if( $this->workRevision )
-				$this->workRevision->setFilename( $this->appenddata );
-			break;
-		case "src":
-			if( $this->workRevision )
-				$this->workRevision->setSrc( $this->appenddata );
-			break;
-		case "size":
-			if( $this->workRevision )
-				$this->workRevision->setSize( intval( $this->appenddata ) );
-			break;
-		default:
-			$this->debug( "Bad append: {$this->appendfield}" );
-		}
-		$this->appendfield = "";
-		$this->appenddata = "";
-
-		$parent = $this->parentTag();
-		xml_set_element_handler( $parser, "in_$parent", "out_$parent" );
-		xml_set_character_data_handler( $parser, "donothing" );
-	}
-
-	function in_revision( $parser, $name, $attribs ) {
-		$this->debug( "in_revision $name" );
-		switch( $name ) {
-		case "id":
-		case "timestamp":
-		case "comment":
-		case "minor":
-		case "text":
-			$this->appendfield = $name;
-			xml_set_element_handler( $parser, "in_nothing", "out_append" );
-			xml_set_character_data_handler( $parser, "char_append" );
-			break;
-		case "contributor":
-			$this->push( "contributor" );
-			xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
-			break;
-		default:
-			return $this->throwXMLerror( "Element <$name> not allowed in a <revision>." );
-		}
-	}
-
-	function out_revision( $parser, $name ) {
-		$this->debug( "out_revision $name" );
-		$this->pop();
-		if( $name != "revision" ) {
-			return $this->throwXMLerror( "Expected </revision>, got </$name>" );
-		}
-		xml_set_element_handler( $parser, "in_page", "out_page" );
-
-		if( $this->workRevision ) {
-			$ok = call_user_func_array( $this->mRevisionCallback,
-				array( $this->workRevision, $this ) );
-			if( $ok ) {
-				$this->workSuccessCount++;
-			}
-		}
-	}
-
-	function in_upload( $parser, $name, $attribs ) {
-		$this->debug( "in_upload $name" );
-		switch( $name ) {
-		case "timestamp":
-		case "comment":
-		case "text":
-		case "filename":
-		case "src":
-		case "size":
-			$this->appendfield = $name;
-			xml_set_element_handler( $parser, "in_nothing", "out_append" );
-			xml_set_character_data_handler( $parser, "char_append" );
-			break;
-		case "contributor":
-			$this->push( "contributor" );
-			xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
-			break;
-		default:
-			return $this->throwXMLerror( "Element <$name> not allowed in an <upload>." );
-		}
-	}
-
-	function out_upload( $parser, $name ) {
-		$this->debug( "out_revision $name" );
-		$this->pop();
-		if( $name != "upload" ) {
-			return $this->throwXMLerror( "Expected </upload>, got </$name>" );
-		}
-		xml_set_element_handler( $parser, "in_page", "out_page" );
-
-		if( $this->workRevision ) {
-			$ok = call_user_func_array( $this->mUploadCallback,
-				array( $this->workRevision, $this ) );
-			if( $ok ) {
-				$this->workUploadSuccessCount++;
-			}
-		}
-	}
-
-	function in_contributor( $parser, $name, $attribs ) {
-		$this->debug( "in_contributor $name" );
-		switch( $name ) {
-		case "username":
-		case "ip":
-		case "id":
-			$this->appendfield = $name;
-			xml_set_element_handler( $parser, "in_nothing", "out_append" );
-			xml_set_character_data_handler( $parser, "char_append" );
-			break;
-		default:
-			$this->throwXMLerror( "Invalid tag <$name> in <contributor>" );
-		}
-	}
-
-	function out_contributor( $parser, $name ) {
-		$this->debug( "out_contributor $name" );
-		$this->pop();
-		if( $name != "contributor" ) {
-			return $this->throwXMLerror( "Expected </contributor>, got </$name>" );
-		}
-		$parent = $this->parentTag();
-		xml_set_element_handler( $parser, "in_$parent", "out_$parent" );
-	}
-
-	private function push( $name ) {
-		array_push( $this->tagStack, $name );
-		$this->debug( "PUSH $name" );
-	}
-
-	private function pop() {
-		$name = array_pop( $this->tagStack );
-		$this->debug( "POP $name" );
-		return $name;
-	}
-
-	private function parentTag() {
-		$name = $this->tagStack[count( $this->tagStack ) - 1];
-		$this->debug( "PARENT $name" );
-		return $name;
-	}
-
-}
-
-/**
- * @todo document (e.g. one-sentence class description).
- * @ingroup SpecialPage
- */
-class ImportStringSource {
-	function __construct( $string ) {
-		$this->mString = $string;
-		$this->mRead = false;
-	}
-
-	function atEnd() {
-		return $this->mRead;
-	}
-
-	function readChunk() {
-		if( $this->atEnd() ) {
-			return false;
-		} else {
-			$this->mRead = true;
-			return $this->mString;
-		}
-	}
-}
-
-/**
- * @todo document (e.g. one-sentence class description).
- * @ingroup SpecialPage
- */
-class ImportStreamSource {
-	function __construct( $handle ) {
-		$this->mHandle = $handle;
-	}
-
-	function atEnd() {
-		return feof( $this->mHandle );
-	}
-
-	function readChunk() {
-		return fread( $this->mHandle, 32768 );
-	}
-
-	static function newFromFile( $filename ) {
-		$file = @fopen( $filename, 'rt' );
-		if( !$file ) {
-			return new WikiErrorMsg( "importcantopen" );
-		}
-		return new ImportStreamSource( $file );
-	}
-
-	static function newFromUpload( $fieldname = "xmlimport" ) {
-		$upload =& $_FILES[$fieldname];
-
-		if( !isset( $upload ) || !$upload['name'] ) {
-			return new WikiErrorMsg( 'importnofile' );
-		}
-		if( !empty( $upload['error'] ) ) {
-			switch($upload['error']){
-				case 1: # The uploaded file exceeds the upload_max_filesize directive in php.ini.
-					return new WikiErrorMsg( 'importuploaderrorsize' );
-				case 2: # The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.
-					return new WikiErrorMsg( 'importuploaderrorsize' );
-				case 3: # The uploaded file was only partially uploaded
-					return new WikiErrorMsg( 'importuploaderrorpartial' );
-			    case 6: #Missing a temporary folder. Introduced in PHP 4.3.10 and PHP 5.0.3.
-			    	return new WikiErrorMsg( 'importuploaderrortemp' );
-			    # case else: # Currently impossible
-			}
-
-		}
-		$fname = $upload['tmp_name'];
-		if( is_uploaded_file( $fname ) ) {
-			return ImportStreamSource::newFromFile( $fname );
-		} else {
-			return new WikiErrorMsg( 'importnofile' );
-		}
-	}
-
-	static function newFromURL( $url, $method = 'GET' ) {
-		wfDebug( __METHOD__ . ": opening $url\n" );
-		# Use the standard HTTP fetch function; it times out
-		# quicker and sorts out user-agent problems which might
-		# otherwise prevent importing from large sites, such
-		# as the Wikimedia cluster, etc.
-		$data = Http::request( $method, $url );
-		if( $data !== false ) {
-			$file = tmpfile();
-			fwrite( $file, $data );
-			fflush( $file );
-			fseek( $file, 0 );
-			return new ImportStreamSource( $file );
-		} else {
-			return new WikiErrorMsg( 'importcantopen' );
-		}
-	}
-
-	public static function newFromInterwiki( $interwiki, $page, $history=false ) {
-		if( $page == '' ) {
-			return new WikiErrorMsg( 'import-noarticle' );
-		}
-		$link = Title::newFromText( "$interwiki:Special:Export/$page" );
-		if( is_null( $link ) || $link->getInterwiki() == '' ) {
-			return new WikiErrorMsg( 'importbadinterwiki' );
-		} else {
-			$params = $history ? 'history=1' : '';
-			$url = $link->getFullUrl( $params );
-			# For interwikis, use POST to avoid redirects.
-			return ImportStreamSource::newFromURL( $url, "POST" );
-		}
-	}
-}
diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index 696c7efe..8d573547 100644
--- a/includes/specials/SpecialIpblocklist.php
+++ b/includes/specials/SpecialIpblocklist.php
@@ -10,7 +10,7 @@
 function wfSpecialIpblocklist() {
 	global $wgUser, $wgOut, $wgRequest;
 
-	$ip = $wgRequest->getVal( 'wpUnblockAddress', $wgRequest->getVal( 'ip' ) );
+	$ip = trim( $wgRequest->getVal( 'wpUnblockAddress', $wgRequest->getVal( 'ip' ) ) );
 	$id = $wgRequest->getVal( 'id' );
 	$reason = $wgRequest->getText( 'wpUnblockReason' );
 	$action = $wgRequest->getText( 'action' );
@@ -71,9 +71,13 @@ class IPUnblockForm {
 	var $ip, $reason, $id;
 
 	function IPUnblockForm( $ip, $id, $reason ) {
+		global $wgRequest;
 		$this->ip = strtr( $ip, '_', ' ' );
 		$this->id = $id;
 		$this->reason = $reason;
+		$this->hideuserblocks = $wgRequest->getBool( 'hideuserblocks' );
+		$this->hidetempblocks = $wgRequest->getBool( 'hidetempblocks' );
+		$this->hideaddressblocks = $wgRequest->getBool( 'hideaddressblocks' );
 	}
 
 	/**
@@ -158,8 +162,7 @@ class IPUnblockForm {
 	 * @return array array(message key, parameters) on failure, empty array on success
 	 */
 
-	static function doUnblock(&$id, &$ip, &$reason, &$range = null)
-	{
+	static function doUnblock(&$id, &$ip, &$reason, &$range = null) {
 		if ( $id ) {
 			$block = Block::newFromID( $id );
 			if ( !$block ) {
@@ -241,10 +244,27 @@ class IPUnblockForm {
 			// No extra conditions
 		} elseif ( substr( $this->ip, 0, 1 ) == '#' ) {
 			$conds['ipb_id'] = substr( $this->ip, 1 );
-		} elseif ( IP::toUnsigned( $this->ip ) !== false ) {
-			$conds['ipb_address'] = $this->ip;
+		// Single IPs
+		} elseif ( IP::isIPAddress($this->ip) && strpos($this->ip,'/') === false ) {
+			if( $iaddr = IP::toHex($this->ip) ) {
+				# Only scan ranges which start in this /16, this improves search speed
+				# Blocks should not cross a /16 boundary.
+				$range = substr( $iaddr, 0, 4 );
+				// Fixme -- encapsulate this sort of query-building.
+				$dbr = wfGetDB( DB_SLAVE );
+				$encIp = $dbr->addQuotes( IP::sanitizeIP($this->ip) );
+				$encRange = $dbr->addQuotes( "$range%" );
+				$encAddr = $dbr->addQuotes( $iaddr );
+				$conds[] = "(ipb_address = $encIp) OR 
+					(ipb_range_start LIKE $encRange AND
+					ipb_range_start <= $encAddr
+					AND ipb_range_end >= $encAddr)";
+			} else {
+				$conds['ipb_address'] = IP::sanitizeIP($this->ip);
+			}
 			$conds['ipb_auto'] = 0;
-		} elseif( preg_match( '/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\\/(\\d{1,2})$/', $this->ip, $matches ) ) {
+		// IP range
+		} elseif ( IP::isIPAddress($this->ip) ) {
 			$conds['ipb_address'] = Block::normaliseRange( $this->ip );
 			$conds['ipb_auto'] = 0;
 		} else {
@@ -257,6 +277,16 @@ class IPUnblockForm {
 				$conds['ipb_auto'] = 0;
 			}
 		}
+		// Apply filters
+		if( $this->hideuserblocks ) {
+			$conds['ipb_user'] = 0;
+		}
+		if( $this->hidetempblocks ) {
+			$conds['ipb_expiry'] = 'infinity';
+		}
+		if( $this->hideaddressblocks ) {
+			$conds[] = "ipb_user != 0 OR ipb_range_end > ipb_range_start";
+		}
 
 		$pager = new IPBlocklistPager( $this, $conds );
 		if ( $pager->getNumRows() ) {
@@ -270,12 +300,38 @@ class IPUnblockForm {
 			$wgOut->addHTML( $this->searchForm() );
 			$wgOut->addWikiMsg( 'ipblocklist-no-results' );
 		} else {
+			$wgOut->addHTML( $this->searchForm() );
 			$wgOut->addWikiMsg( 'ipblocklist-empty' );
 		}
 	}
 
 	function searchForm() {
 		global $wgTitle, $wgScript, $wgRequest;
+
+		$showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ) );
+		$nondefaults = array();
+		if( $this->hideuserblocks ) {
+			$nondefaults['hideuserblocks'] = $this->hideuserblocks;
+		}
+		if( $this->hidetempblocks ) {
+			$nondefaults['hidetempblocks'] = $this->hidetempblocks;
+		}
+		if( $this->hideaddressblocks ) {
+			$nondefaults['hideaddressblocks'] = $this->hideaddressblocks;
+		}
+		$ubLink = $this->makeOptionsLink( $showhide[1-$this->hideuserblocks],
+			array( 'hideuserblocks' => 1-$this->hideuserblocks ), $nondefaults);
+		$tbLink = $this->makeOptionsLink( $showhide[1-$this->hidetempblocks],
+			array( 'hidetempblocks' => 1-$this->hidetempblocks ), $nondefaults);
+		$sipbLink = $this->makeOptionsLink( $showhide[1-$this->hideaddressblocks],
+			array( 'hideaddressblocks' => 1-$this->hideaddressblocks ), $nondefaults);
+
+		$links = array();
+		$links[] = wfMsgHtml( 'ipblocklist-sh-userblocks', $ubLink );
+		$links[] = wfMsgHtml( 'ipblocklist-sh-tempblocks', $tbLink );
+		$links[] = wfMsgHtml( 'ipblocklist-sh-addressblocks', $sipbLink );
+		$hl = implode( ' ' . wfMsg( 'pipe-separator' ) . ' ', $links );
+
 		return
 			Xml::tags( 'form', array( 'action' => $wgScript ),
 				Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
@@ -283,16 +339,32 @@ class IPUnblockForm {
 				Xml::element( 'legend', null, wfMsg( 'ipblocklist-legend' ) ) .
 				Xml::inputLabel( wfMsg( 'ipblocklist-username' ), 'ip', 'ip', /* size */ false, $this->ip ) .
 				'&nbsp;' .
-				Xml::submitButton( wfMsg( 'ipblocklist-submit' ) ) .
+				Xml::submitButton( wfMsg( 'ipblocklist-submit' ) ) . '<br />' .
+				$hl .
 				Xml::closeElement( 'fieldset' )
 			);
 	}
 
 	/**
+	 * Makes change an option link which carries all the other options
+	 * @param $title see Title
+	 * @param $override
+	 * @param $options
+	 */
+	function makeOptionsLink( $title, $override, $options, $active = false ) {
+		global $wgUser;
+		$sk = $wgUser->getSkin();
+		$params = $override + $options;
+		$ipblocklist = SpecialPage::getTitleFor( 'IPBlockList' );
+		return $sk->link( $ipblocklist, htmlspecialchars( $title ),
+			( $active ? array( 'style'=>'font-weight: bold;' ) : array() ), $params, array( 'known' ) );
+	}
+
+	/**
 	 * Callback function to output a block
 	 */
 	function formatRow( $block ) {
-		global $wgUser, $wgLang;
+		global $wgUser, $wgLang, $wgBlockAllowsUTEdit;
 
 		wfProfileIn( __METHOD__ );
 
@@ -302,8 +374,8 @@ class IPUnblockForm {
 			$sk = $wgUser->getSkin();
 		if( is_null( $msg ) ) {
 			$msg = array();
-			$keys = array( 'infiniteblock', 'expiringblock', 'unblocklink',
-				'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock' );
+			$keys = array( 'infiniteblock', 'expiringblock', 'unblocklink', 'change-blocklink',
+				'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock', 'blocklist-nousertalk' );
 			foreach( $keys as $key ) {
 				$msg[$key] = wfMsgHtml( $key );
 			}
@@ -341,15 +413,33 @@ class IPUnblockForm {
 		if ( $block->mBlockEmail && $block->mUser ) {
 			$properties[] = $msg['emailblock'];
 		}
+		
+		if ( !$block->mAllowUsertalk && $wgBlockAllowsUTEdit ) {
+			$properties[] = $msg['blocklist-nousertalk'];
+		}
 
 		$properties = implode( ', ', $properties );
 
 		$line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $properties ) );
 
 		$unblocklink = '';
-		if ( $wgUser->isAllowed('block') ) {
-			$titleObj = SpecialPage::getTitleFor( "Ipblocklist" );
-			$unblocklink = ' (' . $sk->makeKnownLinkObj($titleObj, $msg['unblocklink'], 'action=unblock&id=' . urlencode( $block->mId ) ) . ')';
+		$changeblocklink = '';
+		$toolLinks = '';
+		if ( $wgUser->isAllowed( 'block' ) ) {
+			$unblocklink = $sk->link( SpecialPage::getTitleFor( 'Ipblocklist' ),
+					$msg['unblocklink'],
+					array(),
+					array( 'action' => 'unblock', 'id' => $block->mId ),
+					'known' );
+
+			# Create changeblocklink for all blocks with exception of autoblocks
+			if( !$block->mAuto ) {
+				$changeblocklink = ' ' . wfMsg( 'pipe-separator' ) . ' ' .
+					$sk->link( SpecialPage::getTitleFor( 'Blockip', $block->mAddress ), 
+						$msg['change-blocklink'],
+						array(), array(), 'known' );
+			}
+			$toolLinks = "($unblocklink$changeblocklink)";
 		}
 
 		$comment = $sk->commentBlock( $block->mReason );
@@ -359,7 +449,7 @@ class IPUnblockForm {
 			$s = '<span class="history-deleted">' . $s . '</span>';
 
 		wfProfileOut( __METHOD__ );
-		return "<li>$s $unblocklink</li>\n";
+		return "<li>$s $toolLinks</li>\n";
 	}
 }
 
diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
new file mode 100644
index 00000000..6b9df58f
--- /dev/null
+++ b/includes/specials/SpecialLinkSearch.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @file
+ * @ingroup SpecialPage
+ *
+ * @author Brion Vibber
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ */
+
+/**
+ * Special:LinkSearch to search the external-links table.
+ * @ingroup SpecialPage
+ */
+
+function wfSpecialLinkSearch( $par ) {
+
+	list( $limit, $offset ) = wfCheckLimits();
+	global $wgOut, $wgRequest, $wgUrlProtocols, $wgMiserMode;
+	$target = $GLOBALS['wgRequest']->getVal( 'target', $par );
+	$namespace = $GLOBALS['wgRequest']->getIntorNull( 'namespace', null );
+
+	$protocols_list[] = '';
+	foreach( $wgUrlProtocols as $prot ) {
+		$protocols_list[] = $prot;
+	}
+
+	$target2 = $target;
+	$protocol = '';
+	$pr_sl = strpos($target2, '//' );
+	$pr_cl = strpos($target2, ':' );
+	if ( $pr_sl ) {
+		// For protocols with '//'
+		$protocol = substr( $target2, 0 , $pr_sl+2 );
+		$target2 = substr( $target2, $pr_sl+2 );
+	} elseif ( !$pr_sl && $pr_cl ) {
+		// For protocols without '//' like 'mailto:'
+		$protocol = substr( $target2, 0 , $pr_cl+1 );
+		$target2 = substr( $target2, $pr_cl+1 );
+	} elseif ( $protocol == '' && $target2 != '' ) {
+		// default
+		$protocol = 'http://';
+	}
+	if ( !in_array( $protocol, $protocols_list ) ) {
+		// unsupported protocol, show original search request
+		$target2 = $target;
+		$protocol = '';
+	}
+
+	$self = Title::makeTitle( NS_SPECIAL, 'Linksearch' );
+
+	$wgOut->addWikiText( wfMsg( 'linksearch-text', '<nowiki>' . implode( ', ',  $wgUrlProtocols) . '</nowiki>' ) );
+	$s =	Xml::openElement( 'form', array( 'id' => 'mw-linksearch-form', 'method' => 'get', 'action' => $GLOBALS['wgScript'] ) ) .
+		Xml::hidden( 'title', $self->getPrefixedDbKey() ) .
+		'<fieldset>' .
+		Xml::element( 'legend', array(), wfMsg( 'linksearch' ) ) .
+		Xml::inputLabel( wfMsg( 'linksearch-pat' ), 'target', 'target', 50, $target ) . ' ';
+	if ( !$wgMiserMode ) {
+		$s .= Xml::label( wfMsg( 'linksearch-ns' ), 'namespace' ) . ' ' .
+			XML::namespaceSelector( $namespace, '' );
+	}
+	$s .=	Xml::submitButton( wfMsg( 'linksearch-ok' ) ) .
+		'</fieldset>' .
+		Xml::closeElement( 'form' );
+	$wgOut->addHTML( $s );
+
+	if( $target != '' ) {
+		$searcher = new LinkSearchPage;
+		$searcher->setParams( array( 
+			'query' => $target2, 
+			'namespace' => $namespace, 
+			'protocol' => $protocol ) );
+		$searcher->doQuery( $offset, $limit );
+	}
+}
+
+class LinkSearchPage extends QueryPage {
+	function setParams( $params ) {
+		$this->mQuery = $params['query'];
+		$this->mNs = $params['namespace'];
+		$this->mProt = $params['protocol'];
+	}
+
+	function getName() {
+		return 'LinkSearch';
+	}
+
+	/**
+	 * Disable RSS/Atom feeds
+	 */
+	function isSyndicated() {
+		return false;
+	}
+
+	/**
+	 * Return an appropriately formatted LIKE query and the clause
+	 */
+	static function mungeQuery( $query , $prot ) {
+		$field = 'el_index';
+		$rv = LinkFilter::makeLike( $query , $prot );
+		if ($rv === false) {
+			//makeLike doesn't handle wildcard in IP, so we'll have to munge here.
+			if (preg_match('/^(:?[0-9]{1,3}\.)+\*\s*$|^(:?[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]*\*\s*$/', $query)) {
+				$rv = $prot . rtrim($query, " \t*") . '%';
+				$field = 'el_to';
+			}
+		}
+		return array( $rv, $field );
+	}
+
+	function linkParameters() {
+		global $wgMiserMode;
+		$params = array();
+		$params['target'] = $this->mProt . $this->mQuery;
+		if( isset( $this->mNs ) && !$wgMiserMode ) {
+			$params['namespace'] = $this->mNs;
+		}
+		return $params;
+	}
+
+	function getSQL() {
+		global $wgMiserMode;
+		$dbr = wfGetDB( DB_SLAVE );
+		$page = $dbr->tableName( 'page' );
+		$externallinks = $dbr->tableName( 'externallinks' );
+
+		/* strip everything past first wildcard, so that index-based-only lookup would be done */
+		list( $munged, $clause ) = self::mungeQuery( $this->mQuery, $this->mProt );
+		$stripped = substr($munged,0,strpos($munged,'%')+1);
+		$encSearch = $dbr->addQuotes( $stripped );
+
+		$encSQL = '';
+		if ( isset ($this->mNs) && !$wgMiserMode )
+			$encSQL = 'AND page_namespace=' . $dbr->addQuotes( $this->mNs );
+
+		$use_index = $dbr->useIndexClause( $clause );
+		return
+			"SELECT
+				page_namespace AS namespace,
+				page_title AS title,
+				el_index AS value,
+				el_to AS url
+			FROM
+				$page,
+				$externallinks $use_index
+			WHERE
+				page_id=el_from
+				AND $clause LIKE $encSearch
+				$encSQL";
+	}
+
+	function formatResult( $skin, $result ) {
+		$title = Title::makeTitle( $result->namespace, $result->title );
+		$url = $result->url;
+		$pageLink = $skin->makeKnownLinkObj( $title );
+		$urlLink = $skin->makeExternalLink( $url, $url );
+
+		return wfMsgHtml( 'linksearch-line', $urlLink, $pageLink );
+	}
+
+	/**
+	 * Override to check query validity.
+	 */
+	function doQuery( $offset, $limit, $shownavigation=true ) {
+		global $wgOut;
+		list( $this->mMungedQuery, $clause ) = LinkSearchPage::mungeQuery( $this->mQuery, $this->mProt );
+		if( $this->mMungedQuery === false ) {
+			$wgOut->addWikiText( wfMsg( 'linksearch-error' ) );
+		} else {
+			// For debugging
+			// Generates invalid xhtml with patterns that contain --
+			//$wgOut->addHTML( "\n<!-- " . htmlspecialchars( $this->mMungedQuery ) . " -->\n" );
+			parent::doQuery( $offset, $limit, $shownavigation );
+		}
+	}
+
+	/**
+	 * Override to squash the ORDER BY.
+	 * We do a truncated index search, so the optimizer won't trust
+	 * it as good enough for optimizing sort. The implicit ordering
+	 * from the scan will usually do well enough for our needs.
+	 */
+	function getOrder() {
+		return '';
+	}
+}
diff --git a/includes/specials/SpecialListUserRestrictions.php b/includes/specials/SpecialListUserRestrictions.php
new file mode 100644
index 00000000..27b24298
--- /dev/null
+++ b/includes/specials/SpecialListUserRestrictions.php
@@ -0,0 +1,161 @@
+<?php
+
+function wfSpecialListUserRestrictions() {
+	global $wgOut, $wgRequest;
+	
+	$wgOut->addWikiMsg( 'listuserrestrictions-intro' );
+	$f = new SpecialListUserRestrictionsForm();
+	$wgOut->addHTML( $f->getHTML() );
+
+	if( !mt_rand( 0, 10 ) )
+		UserRestriction::purgeExpired();
+	$pager = new UserRestrictionsPager( $f->getConds() );
+	if( $pager->getNumRows() ) 
+		$wgOut->addHTML( $pager->getNavigationBar() .
+			Xml::tags( 'ul', null, $pager->getBody() ) .
+			$pager->getNavigationBar()
+		);
+	elseif( $f->getConds() )
+		$wgOut->addWikiMsg( 'listuserrestrictions-notfound' );
+	else 
+		$wgOut->addWikiMsg( 'listuserrestrictions-empty' );
+}
+
+class SpecialListUserRestrictionsForm {
+	public function getHTML() {
+		global $wgRequest, $wgScript, $wgTitle;
+		$s = '';
+		$s .= Xml::fieldset( wfMsg( 'listuserrestrictions-legend' ) );
+		$s .= "<form action=\"{$wgScript}\">";
+		$s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() );
+		$s .= Xml::label( wfMsgHtml( 'listuserrestrictions-type' ), 'type' ) . '&nbsp;' .
+			self::typeSelector( 'type', $wgRequest->getVal( 'type' ), 'type' );
+		$s .= '&nbsp;';
+		$s .= Xml::inputLabel( wfMsgHtml( 'listuserrestrictions-user' ), 'user', 'user',
+			false, $wgRequest->getVal( 'user' ) );
+		$s .= '<p>';
+		$s .= Xml::label( wfMsgHtml( 'listuserrestrictions-namespace' ), 'namespace' ) . '&nbsp;' .
+			Xml::namespaceSelector( $wgRequest->getVal( 'namespace' ), '', 'namespace' );
+		$s .= '&nbsp;';
+		$s .= Xml::inputLabel( wfMsgHtml( 'listuserrestrictions-page' ), 'page', 'page',
+			false, $wgRequest->getVal( 'page' ) );
+		$s .= Xml::submitButton( wfMsg( 'listuserrestrictions-submit' ) );
+		$s .= "</p></form></fieldset>";
+		return $s;
+	}
+
+	public static function typeSelector( $name = 'type', $value = '', $id = false ) {
+		$s = new XmlSelect( $name, $id, $value );
+		$s->addOption( wfMsg( 'userrestrictiontype-none' ), '' );
+		$s->addOption( wfMsg( 'userrestrictiontype-page' ), UserRestriction::PAGE );
+		$s->addOption( wfMsg( 'userrestrictiontype-namespace' ), UserRestriction::NAMESPACE );
+		return $s->getHTML();
+	}
+
+	public function getConds() {
+		global $wgRequest;
+		$conds = array();
+
+		$type = $wgRequest->getVal( 'type' );
+		if( in_array( $type, array( UserRestriction::PAGE, UserRestriction::NAMESPACE ) ) )
+			$conds['ur_type'] = $type;
+
+		$user = $wgRequest->getVal( 'user' );
+		if( $user )
+			$conds['ur_user_text'] = $user;
+
+		$namespace = $wgRequest->getVal( 'namespace' );
+		if( $namespace || $namespace === '0' )
+			$conds['ur_namespace'] = $namespace;
+
+		$page = $wgRequest->getVal( 'page' );
+		$title = Title::newFromText( $page );
+		if( $title ) {
+			$conds['ur_page_namespace'] = $title->getNamespace();
+			$conds['ur_page_title'] = $title->getDBKey();
+		}
+
+		return $conds;
+	}
+}
+
+class UserRestrictionsPager extends ReverseChronologicalPager {
+	public $mConds;
+
+	public function __construct( $conds = array() ) {
+		$this->mConds = $conds;
+		parent::__construct();
+	}
+
+	public function getStartBody() {
+		# Copied from Special:Ipblocklist
+		wfProfileIn( __METHOD__ );
+		# Do a link batch query
+		$this->mResult->seek( 0 );
+		$lb = new LinkBatch;
+
+		# Faster way
+		# Usernames and titles are in fact related by a simple substitution of space -> underscore
+		# The last few lines of Title::secureAndSplit() tell the story.
+		foreach( $this->mResult as $row ) {
+			$name = str_replace( ' ', '_', $row->ur_by_text );
+			$lb->add( NS_USER, $name );
+			$lb->add( NS_USER_TALK, $name );
+			$name = str_replace( ' ', '_', $row->ur_user_text );
+			$lb->add( NS_USER, $name );
+			$lb->add( NS_USER_TALK, $name );
+			if( $row->ur_type == UserRestriction::PAGE )
+				$lb->add( $row->ur_page_namespace, $row->ur_page_title );
+		}
+		$lb->execute();
+		wfProfileOut( __METHOD__ );
+		return '';
+	}
+
+	public function getQueryInfo() {
+		return array(
+			'tables' => 'user_restrictions',
+			'fields' => '*',
+			'conds' => $this->mConds,
+		);
+	}
+
+	public function formatRow( $row ) {
+		return self::formatRestriction( UserRestriction::newFromRow( $row )  );
+	}
+
+	// Split off for use on Special:RestrictUser
+	public static function formatRestriction( $r ) {
+		global $wgUser, $wgLang;
+		$sk = $wgUser->getSkin();
+		$timestamp = $wgLang->timeanddate( $r->getTimestamp(), true );
+		$blockerlink = $sk->userLink( $r->getBlockerId(), $r->getBlockerText() ) .
+			$sk->userToolLinks( $r->getBlockerId(), $r->getBlockerText() );
+		$subjlink = $sk->userLink( $r->getSubjectId(), $r->getSubjectText() ) .
+			$sk->userToolLinks( $r->getSubjectId(), $r->getSubjectText() );
+		$expiry = is_numeric( $r->getExpiry() ) ?
+			wfMsg( 'listuserrestrictions-row-expiry', $wgLang->timeanddate( $r->getExpiry() ) ) :
+			wfMsg( 'ipbinfinite' );
+		$msg = '';
+		if( $r->isNamespace() ) {
+			$msg = wfMsgHtml( 'listuserrestrictions-row-ns', $subjlink,
+				$wgLang->getDisplayNsText( $r->getNamespace() ), $expiry );
+		}
+		if( $r->isPage() ) {
+			$pagelink = $sk->link( $r->getPage() );
+			$msg = wfMsgHtml( 'listuserrestrictions-row-page', $subjlink,
+				$pagelink, $expiry );
+		}
+		$reason = $sk->commentBlock( $r->getReason() );
+		$removelink = '';
+		if( $wgUser->isAllowed( 'restrict' ) ) {
+			$removelink = '(' . $sk->link( SpecialPage::getTitleFor( 'RemoveRestrictions' ),
+				wfMsgHtml( 'listuserrestrictions-remove' ), array(), array( 'id' => $r->getId() ) ) . ')';
+		}
+		return "<li>{$timestamp}, {$blockerlink} {$msg} {$reason} {$removelink}</li>\n";
+	}
+
+	public function getIndexField() {
+		return 'ur_timestamp';
+	}
+}
diff --git a/includes/specials/SpecialImagelist.php b/includes/specials/SpecialListfiles.php
index 3d449b54..d2178ee0 100644
--- a/includes/specials/SpecialImagelist.php
+++ b/includes/specials/SpecialListfiles.php
@@ -7,7 +7,7 @@
 /**
  *
  */
-function wfSpecialImagelist() {
+function wfSpecialListfiles() {
 	global $wgOut;
 
 	$pager = new ImageListPager;
@@ -49,13 +49,17 @@ class ImageListPager extends TablePager {
 
 	function getFieldNames() {
 		if ( !$this->mFieldNames ) {
+			global $wgMiserMode;
 			$this->mFieldNames = array(
-				'img_timestamp' => wfMsg( 'imagelist_date' ),
-				'img_name' => wfMsg( 'imagelist_name' ),
-				'img_user_text' => wfMsg( 'imagelist_user' ),
-				'img_size' => wfMsg( 'imagelist_size' ),
-				'img_description' => wfMsg( 'imagelist_description' ),
+				'img_timestamp' => wfMsg( 'listfiles_date' ),
+				'img_name' => wfMsg( 'listfiles_name' ),
+				'img_user_text' => wfMsg( 'listfiles_user' ),
+				'img_size' => wfMsg( 'listfiles_size' ),
+				'img_description' => wfMsg( 'listfiles_description' ),
 			);
+			if( !$wgMiserMode ) {
+				$this->mFieldNames['COUNT(oi_archive_name)'] = wfMsg( 'listfiles_count' );
+			}
 		}
 		return $this->mFieldNames;
 	}
@@ -66,13 +70,22 @@ class ImageListPager extends TablePager {
 	}
 
 	function getQueryInfo() {
-		$fields = $this->getFieldNames();
-		$fields = array_keys( $fields );
+		$tables = array( 'image' );
+		$fields = array_keys( $this->getFieldNames() );
 		$fields[] = 'img_user';
+		$options = $join_conds = array();
+		# Depends on $wgMiserMode
+		if( isset($this->mFieldNames['COUNT(oi_archive_name)']) ) {
+			$tables[] = 'oldimage';
+			$options = array('GROUP BY' => 'img_name');
+			$join_conds = array('oldimage' => array('LEFT JOIN','oi_name = img_name') );
+		}
 		return array(
-			'tables' => 'image',
-			'fields' => $fields,
-			'conds' => $this->mQueryConds
+			'tables'     => $tables,
+			'fields'     => $fields,
+			'conds'      => $this->mQueryConds,
+			'options'    => $options,
+			'join_conds' => $join_conds
 		);
 	}
 
@@ -106,7 +119,7 @@ class ImageListPager extends TablePager {
 				if ( $imgfile === null ) $imgfile = wfMsg( 'imgfile' );
 
 				$name = $this->mCurrentRow->img_name;
-				$link = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ), $value );
+				$link = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_FILE, $name ), $value );
 				$image = wfLocalFile( $value );
 				$url = $image->getURL();
 				$download = Xml::element('a', array( 'href' => $url ), $imgfile );
@@ -123,6 +136,8 @@ class ImageListPager extends TablePager {
 				return $this->getSkin()->formatSize( $value );
 			case 'img_description':
 				return $this->getSkin()->commentBlock( $value );
+			case 'COUNT(oi_archive_name)':
+				return intval($value)+1;
 		}
 	}
 
@@ -130,14 +145,14 @@ class ImageListPager extends TablePager {
 		global $wgRequest, $wgMiserMode;
 		$search = $wgRequest->getText( 'ilsearch' );
 
-		$s = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $this->getTitle()->getLocalURL(), 'id' => 'mw-imagelist-form' ) ) .
+		$s = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $this->getTitle()->getLocalURL(), 'id' => 'mw-listfiles-form' ) ) .
 			Xml::openElement( 'fieldset' ) .
-			Xml::element( 'legend', null, wfMsg( 'imagelist' ) ) .
+			Xml::element( 'legend', null, wfMsg( 'listfiles' ) ) .
 			Xml::tags( 'label', null, wfMsgHtml( 'table_pager_limit', $this->getLimitSelect() ) );
 
 		if ( !$wgMiserMode ) {
 			$s .= "<br />\n" .
-				Xml::inputLabel( wfMsg( 'imagelist_search_for' ), 'ilsearch', 'mw-ilsearch', 20, $search );
+				Xml::inputLabel( wfMsg( 'listfiles_search_for' ), 'ilsearch', 'mw-ilsearch', 20, $search );
 		}
 		$s .= ' ' .
 			Xml::submitButton( wfMsg( 'table_pager_limit_submit' ) ) ."\n" .
@@ -148,14 +163,14 @@ class ImageListPager extends TablePager {
 	}
 
 	function getTableClass() {
-		return 'imagelist ' . parent::getTableClass();
+		return 'listfiles ' . parent::getTableClass();
 	}
 
 	function getNavClass() {
-		return 'imagelist_nav ' . parent::getNavClass();
+		return 'listfiles_nav ' . parent::getNavClass();
 	}
 
 	function getSortHeaderClass() {
-		return 'imagelist_sort ' . parent::getSortHeaderClass();
+		return 'listfiles_sort ' . parent::getSortHeaderClass();
 	}
 }
diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php
index 131c0606..5c76df8c 100644
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -24,7 +24,8 @@ class SpecialListGroupRights extends SpecialPage {
 	 * Show the special page
 	 */
 	public function execute( $par ) {
-		global $wgOut, $wgGroupPermissions, $wgImplicitGroups, $wgMessageCache;
+		global $wgOut, $wgImplicitGroups, $wgMessageCache;
+		global $wgGroupPermissions, $wgAddGroups, $wgRemoveGroups;
 		$wgMessageCache->loadAllMessages();
 
 		$this->setHeaders();
@@ -69,13 +70,16 @@ class SpecialListGroupRights extends SpecialPage {
 				$grouplink = '';
 			}
 
+			$addgroups = isset( $wgAddGroups[$group] ) ? $wgAddGroups[$group] : array();
+			$removegroups = isset( $wgRemoveGroups[$group] ) ? $wgRemoveGroups[$group] : array();
+
 			$wgOut->addHTML(
 				'<tr>
 					<td>' .
 						$grouppage . $grouplink .
 					'</td>
 					<td>' .
-						self::formatPermissions( $permissions ) .
+						self::formatPermissions( $permissions, $addgroups, $removegroups ) .
 					'</td>
 				</tr>'
 			);
@@ -91,18 +95,29 @@ class SpecialListGroupRights extends SpecialPage {
 	 * @param $permissions Array of permission => bool (from $wgGroupPermissions items)
 	 * @return string List of all granted permissions, separated by comma separator
 	 */
-	 private static function formatPermissions( $permissions ) {
+	 private static function formatPermissions( $permissions, $add, $remove ) {
+	 	global $wgLang;
 		$r = array();
 		foreach( $permissions as $permission => $granted ) {
 			if ( $granted ) {
-				$description = wfMsgHTML( 'listgrouprights-right-display',
-					User::getRightDescription($permission),
+				$description = wfMsgExt( 'listgrouprights-right-display', array( 'parseinline' ),
+					User::getRightDescription( $permission ),
 					$permission
 				);
 				$r[] = $description;
 			}
 		}
 		sort( $r );
+		if( $add === true ){
+			$r[] = wfMsgExt( 'listgrouprights-addgroup-all', array( 'escape' ) );
+		} else if( is_array( $add ) && count( $add ) ) {
+			$r[] = wfMsgExt( 'listgrouprights-addgroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $add ) ), count( $add ) );
+		}
+		if( $remove === true ){
+			$r[] = wfMsgExt( 'listgrouprights-removegroup-all', array( 'escape' ) );
+		} else if( is_array( $remove ) && count( $remove ) ) {
+			$r[] = wfMsgExt( 'listgrouprights-removegroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $remove ) ), count( $remove ) );
+		}
 		if( empty( $r ) ) {
 			return '';
 		} else {
diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index 808aab14..9555bd16 100644
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -22,7 +22,8 @@ class ListredirectsPage extends QueryPage {
 	function getSQL() {
 		$dbr = wfGetDB( DB_SLAVE );
 		$page = $dbr->tableName( 'page' );
-		$sql = "SELECT 'Listredirects' AS type, page_title AS title, page_namespace AS namespace, 0 AS value FROM $page WHERE page_is_redirect = 1";
+		$sql = "SELECT 'Listredirects' AS type, page_title AS title, page_namespace AS namespace, 
+			0 AS value FROM $page WHERE page_is_redirect = 1";
 		return( $sql );
 	}
 
diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php
index 7dba44e2..17bec70e 100644
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -35,10 +35,25 @@
  */
 class UsersPager extends AlphabeticPager {
 
-	function __construct($group=null) {
+	function __construct( $par=null ) {
 		global $wgRequest;
-		$this->requestedGroup = $group != "" ? $group : $wgRequest->getVal( 'group' );
-		$un = $wgRequest->getText( 'username' );
+		$parms = explode( '/', ($par = ( $par !== null ) ? $par : '' ) );
+		$symsForAll = array( '*', 'user' );
+		if ( $parms[0] != '' && ( in_array( $par, User::getAllGroups() ) || in_array( $par, $symsForAll ) ) ) {
+			$this->requestedGroup = $par;
+			$un = $wgRequest->getText( 'username' );
+		} else if ( count( $parms ) == 2 ) {
+			$this->requestedGroup = $parms[0];
+			$un = $parms[1];
+		} else {
+			$this->requestedGroup = $wgRequest->getVal( 'group' );
+			$un = ( $par != '' ) ? $par : $wgRequest->getText( 'username' );
+		}
+		if ( in_array( $this->requestedGroup, $symsForAll ) ) {
+			$this->requestedGroup = '';
+		}
+		$this->editsOnly = $wgRequest->getBool( 'editsOnly' );
+
 		$this->requestedUser = '';
 		if ( $un != '' ) {
 			$username = Title::makeTitleSafe( NS_USER, $un );
@@ -56,9 +71,9 @@ class UsersPager extends AlphabeticPager {
 
 	function getQueryInfo() {
 		$dbr = wfGetDB( DB_SLAVE );
-		$conds=array();
-		// don't show hidden names
-		$conds[]='ipb_deleted IS NULL OR ipb_deleted = 0';
+		$conds = array();
+		// Don't show hidden names
+		$conds[] = 'ipb_deleted IS NULL OR ipb_deleted = 0';
 		if ($this->requestedGroup != "") {
 			$conds['ug_group'] = $this->requestedGroup;
 			$useIndex = '';
@@ -68,6 +83,9 @@ class UsersPager extends AlphabeticPager {
 		if ($this->requestedUser != "") {
 			$conds[] = 'user_name >= ' . $dbr->addQuotes( $this->requestedUser );
 		}
+		if( $this->editsOnly ) {
+			$conds[] = 'user_editcount > 0';
+		}
 
 		list ($user,$user_groups,$ipblocks) = $dbr->tableNamesN('user','user_groups','ipblocks');
 
@@ -76,6 +94,7 @@ class UsersPager extends AlphabeticPager {
 				LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 ",
 			'fields' => array('user_name',
 				'MAX(user_id) AS user_id',
+				'MAX(user_editcount) AS edits',
 				'COUNT(ug_group) AS numgroups',
 				'MAX(ug_group) AS singlegroup'),
 			'options' => array('GROUP BY' => 'user_name'),
@@ -87,6 +106,8 @@ class UsersPager extends AlphabeticPager {
 	}
 
 	function formatRow( $row ) {
+		global $wgLang;
+
 		$userPage = Title::makeTitle( NS_USER, $row->user_name );
 		$name = $this->getSkin()->makeLinkObj( $userPage, htmlspecialchars( $userPage->getText() ) );
 
@@ -102,18 +123,24 @@ class UsersPager extends AlphabeticPager {
 		}
 
 		$item = wfSpecialList( $name, $groups );
+
+		global $wgEdititis;
+		if ( $wgEdititis ) {
+			$editCount = $wgLang->formatNum( $row->edits );
+			$edits = ' [' . wfMsgExt( 'usereditcount', 'parsemag', $editCount ) . ']';
+		} else {
+			$edits = '';
+		}
 		wfRunHooks( 'SpecialListusersFormatRow', array( &$item, $row ) );
-		return "<li>{$item}</li>";
+		return "<li>{$item}{$edits}</li>";
 	}
 
 	function getBody() {
-		if (!$this->mQueryDone) {
+		if( !$this->mQueryDone ) {
 			$this->doQuery();
 		}
-		$batch = new LinkBatch;
-
 		$this->mResult->rewind();
-
+		$batch = new LinkBatch;
 		while ( $row = $this->mResult->fetchObject() ) {
 			$batch->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) );
 		}
@@ -142,7 +169,9 @@ class UsersPager extends AlphabeticPager {
 			Xml::option( wfMsg( 'group-all' ), '' );
 		foreach( $this->getAllGroups() as $group => $groupText )
 			$out .= Xml::option( $groupText, $group, $group == $this->requestedGroup );
-		$out .= Xml::closeElement( 'select' ) . ' ';
+		$out .= Xml::closeElement( 'select' ) . '<br/>';
+		$out .= Xml::checkLabel( wfMsg('listusers-editsonly'), 'editsOnly', 'editsOnly', $this->editsOnly );
+		$out .= '&nbsp;';
 
 		wfRunHooks( 'SpecialListusersHeaderForm', array( $this, &$out ) );
 
@@ -186,14 +215,8 @@ class UsersPager extends AlphabeticPager {
 	 * @return array
 	 */
 	protected static function getGroups( $uid ) {
-		$dbr = wfGetDB( DB_SLAVE );
-		$groups = array();
-		$res = $dbr->select( 'user_groups', 'ug_group', array( 'ug_user' => $uid ), __METHOD__ );
-		if( $res && $dbr->numRows( $res ) > 0 ) {
-			while( $row = $dbr->fetchObject( $res ) )
-				$groups[] = $row->ug_group;
-			$dbr->freeResult( $res );
-		}
+		$user = User::newFromId( $uid );
+		$groups = array_diff( $user->getEffectiveGroups(), $user->getImplicitGroups() );
 		return $groups;
 	}
 
@@ -222,7 +245,8 @@ function wfSpecialListusers( $par = null ) {
 
 	# getBody() first to check, if empty
 	$usersbody = $up->getBody();
-	$s = $up->getPageHeader();
+	$s = XML::openElement( 'div', array('class' => 'mw-spcontent') );
+	$s .= $up->getPageHeader();
 	if( $usersbody ) {
 		$s .=	$up->getNavigationBar();
 		$s .=	'<ul>' . $usersbody . '</ul>';
@@ -230,6 +254,6 @@ function wfSpecialListusers( $par = null ) {
 	} else {
 		$s .=	'<p>' . wfMsgHTML('listusers-noresult') . '</p>';
 	};
-
+	$s .= XML::closeElement( 'div' );
 	$wgOut->addHTML( $s );
 }
diff --git a/includes/specials/SpecialLockdb.php b/includes/specials/SpecialLockdb.php
index 04019223..5859d5b2 100644
--- a/includes/specials/SpecialLockdb.php
+++ b/includes/specials/SpecialLockdb.php
@@ -109,7 +109,7 @@ END
 		}
 		fwrite( $fp, $this->reason );
 		fwrite( $fp, "\n<p>(by " . $wgUser->getName() . " at " .
-		  $wgLang->timeanddate( wfTimestampNow() ) . ")\n" );
+		  $wgLang->timeanddate( wfTimestampNow() ) . ")</p>\n" );
 		fclose( $fp );
 
 		$titleObj = SpecialPage::getTitleFor( 'Lockdb' );
diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index 3154ed13..492c2608 100644
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -26,10 +26,21 @@
  * constructor
  */
 function wfSpecialLog( $par = '' ) {
-	global $wgRequest, $wgOut, $wgUser;
+	global $wgRequest, $wgOut, $wgUser, $wgLogTypes;
+
 	# Get parameters
-	$type = $wgRequest->getVal( 'type', $par );
-	$user = $wgRequest->getText( 'user' );
+	$parms = explode( '/', ($par = ( $par !== null ) ? $par : '' ) );
+	$symsForAll = array( '*', 'all' );
+	if ( $parms[0] != '' && ( in_array( $par, $wgLogTypes ) || in_array( $par, $symsForAll ) ) ) {
+		$type = $par;
+		$user = $wgRequest->getText( 'user' );
+	} else if ( count( $parms ) == 2 ) {
+		$type = $parms[0];
+		$user = $parms[1];
+	} else {
+		$type = $wgRequest->getVal( 'type' );
+		$user = ( $par != '' ) ? $par : $wgRequest->getText( 'user' );
+	}
 	$title = $wgRequest->getText( 'page' );
 	$pattern = $wgRequest->getBool( 'pattern' );
 	$y = $wgRequest->getIntOrNull( 'year' );
@@ -40,15 +51,14 @@ function wfSpecialLog( $par = '' ) {
 		$y = '';
 		$m = '';
 	}
-	# Create a LogPager item to get the results and a LogEventsList
-	# item to format them...
+	# Create a LogPager item to get the results and a LogEventsList item to format them...
 	$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
 	$pager = new LogPager( $loglist, $type, $user, $title, $pattern, array(), $y, $m );
 	# Set title and add header
 	$loglist->showHeader( $pager->getType() );
 	# Show form options
 	$loglist->showOptions( $pager->getType(), $pager->getUser(), $pager->getPage(), $pager->getPattern(),
-		$pager->getYear(), $pager->getMonth() );
+		$pager->getYear(), $pager->getMonth(), $pager->getFilterParams() );
 	# Insert list
 	$logBody = $pager->getBody();
 	if( $logBody ) {
diff --git a/includes/specials/SpecialLonelypages.php b/includes/specials/SpecialLonelypages.php
index 5aafac7d..90da25fd 100644
--- a/includes/specials/SpecialLonelypages.php
+++ b/includes/specials/SpecialLonelypages.php
@@ -29,7 +29,7 @@ class LonelyPagesPage extends PageQueryPage {
 
 	function getSQL() {
 		$dbr = wfGetDB( DB_SLAVE );
-		list( $page, $pagelinks ) = $dbr->tableNamesN( 'page', 'pagelinks' );
+		list( $page, $pagelinks, $templatelinks ) = $dbr->tableNamesN( 'page', 'pagelinks', 'templatelinks' );
 
 		return
 		  "SELECT 'Lonelypages'  AS type,
@@ -39,9 +39,12 @@ class LonelyPagesPage extends PageQueryPage {
 		     FROM $page
 		LEFT JOIN $pagelinks
 		       ON page_namespace=pl_namespace AND page_title=pl_title
+		LEFT JOIN $templatelinks
+				ON page_namespace=tl_namespace AND page_title=tl_title
 		    WHERE pl_namespace IS NULL
 		      AND page_namespace=".NS_MAIN."
-		      AND page_is_redirect=0";
+		      AND page_is_redirect=0
+			  AND tl_namespace IS NULL";
 
 	}
 }
diff --git a/includes/specials/SpecialMIMEsearch.php b/includes/specials/SpecialMIMEsearch.php
index 82ee4be6..cdfde24e 100644
--- a/includes/specials/SpecialMIMEsearch.php
+++ b/includes/specials/SpecialMIMEsearch.php
@@ -46,7 +46,7 @@ class MIMEsearchPage extends QueryPage {
 
 		return
 			"SELECT 'MIMEsearch' AS type,
-				" . NS_IMAGE . " AS namespace,
+				" . NS_FILE . " AS namespace,
 				img_name AS title,
 				img_major_mime AS value,
 
diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 0460c207..f870406c 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -96,8 +96,10 @@ class MergehistoryForm {
 				wfEscapeWikiText( $this->mDestObj->getPrefixedText() )
 			);
 		}
-
-		// TODO: warn about target = dest?
+		
+		if ( $this->mTargetObj->equals( $this->mDestObj ) ) {
+			$errors[] = wfMsgExt( 'mergehistory-same-destination', array( 'parse' ) );
+		}
 
 		if ( count( $errors ) ) {
 			$this->showMergeForm();
@@ -113,7 +115,7 @@ class MergehistoryForm {
 
 		$wgOut->addWikiMsg( 'mergehistory-header' );
 
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::openElement( 'form', array(
 				'method' => 'get',
 				'action' => $wgScript ) ) .
@@ -156,7 +158,7 @@ class MergehistoryForm {
 		$action = $titleObj->getLocalURL( "action=submit" );
 		# Start the form here
 		$top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'merge' ) );
-		$wgOut->addHtml( $top );
+		$wgOut->addHTML( $top );
 
 		if( $haveRevisions ) {
 			# Format the user-visible controls (comment field, submission button)
@@ -188,7 +190,7 @@ class MergehistoryForm {
 				Xml::closeElement( 'table' ) .
 				Xml::closeElement( 'fieldset' );
 
-			$wgOut->addHtml( $table );
+			$wgOut->addHTML( $table );
 		}
 
 		$wgOut->addHTML( "<h2 id=\"mw-mergehistory\">" . wfMsgHtml( "mergehistory-list" ) . "</h2>\n" );
@@ -215,7 +217,7 @@ class MergehistoryForm {
 		$misc .= Xml::hidden( 'dest', $this->mDest );
 		$misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 		$misc .= Xml::closeElement( 'form' );
-		$wgOut->addHtml( $misc );
+		$wgOut->addHTML( $misc );
 
 		return true;
 	}
@@ -229,7 +231,7 @@ class MergehistoryForm {
 		$last = $this->message['last'];
 
 		$ts = wfTimestamp( TS_MW, $row->rev_timestamp );
-		$checkBox = wfRadio( "mergepoint", $ts, false );
+		$checkBox = Xml::radio( "mergepoint", $ts, false );
 
 		$pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(),
 			htmlspecialchars( $wgLang->timeanddate( $ts ) ), 'oldid=' . $rev->getId() );
@@ -370,7 +372,7 @@ class MergehistoryForm {
 		$log->addEntry( 'merge', $targetTitle, $this->mComment,
 			array($destTitle->getPrefixedText(),$TimestampLimit) );
 
-		$wgOut->addHtml( wfMsgExt( 'mergehistory-success', array('parseinline'),
+		$wgOut->addHTML( wfMsgExt( 'mergehistory-success', array('parseinline'),
 			$targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );
 
 		wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );
@@ -432,10 +434,10 @@ class MergeHistoryPager extends ReverseChronologicalPager {
 	function getQueryInfo() {
 		$conds = $this->mConds;
 		$conds['rev_page'] = $this->articleID;
+		$conds[] = 'page_id = rev_page';
 		$conds[] = "rev_timestamp < {$this->maxTimestamp}";
-
 		return array(
-			'tables' => array('revision'),
+			'tables' => array('revision','page'),
 			'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment',
 				 'rev_id', 'rev_page', 'rev_text_id', 'rev_len', 'rev_deleted' ),
 			'conds' => $conds
diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php
index e6810999..1ba05626 100644
--- a/includes/specials/SpecialMostcategories.php
+++ b/includes/specials/SpecialMostcategories.php
@@ -39,9 +39,9 @@ class MostcategoriesPage extends QueryPage {
 	function formatResult( $skin, $result ) {
 		global $wgLang;
 		$title = Title::makeTitleSafe( $result->namespace, $result->title );
-		if ( !$title instanceof Title ) { throw new MWException('Invalid title in database'); }
+
 		$count = wfMsgExt( 'ncategories', array( 'parsemag', 'escape' ), $wgLang->formatNum( $result->value ) );
-		$link = $skin->makeKnownLinkObj( $title, $title->getText() );
+		$link = $skin->link( $title );
 		return wfSpecialList( $link, $count );
 	}
 }
diff --git a/includes/specials/SpecialMostimages.php b/includes/specials/SpecialMostimages.php
index 6cfeb7ad..5cc100ba 100644
--- a/includes/specials/SpecialMostimages.php
+++ b/includes/specials/SpecialMostimages.php
@@ -25,7 +25,7 @@ class MostimagesPage extends ImageQueryPage {
 			"
 			SELECT
 				'Mostimages' as type,
-				" . NS_IMAGE . " as namespace,
+				" . NS_FILE . " as namespace,
 				il_to as title,
 				COUNT(*) as value
 			FROM $imagelinks
diff --git a/includes/specials/SpecialMostlinkedtemplates.php b/includes/specials/SpecialMostlinkedtemplates.php
index d597a4e0..2d398a38 100644
--- a/includes/specials/SpecialMostlinkedtemplates.php
+++ b/includes/specials/SpecialMostlinkedtemplates.php
@@ -92,15 +92,12 @@ class SpecialMostlinkedtemplates extends QueryPage {
 	 */
 	public function formatResult( $skin, $result ) {
 		$title = Title::makeTitleSafe( $result->namespace, $result->title );
-		if( $title instanceof Title ) {
-			return wfSpecialList(
-				$skin->makeLinkObj( $title ),
-				$this->makeWlhLink( $title, $skin, $result )
-			);
-		} else {
-			$tsafe = htmlspecialchars( $result->title );
-			return "Invalid title in result set; {$tsafe}";
-		}
+
+		$skin->link( $title );
+		return wfSpecialList(
+			$skin->makeLinkObj( $title ),
+			$this->makeWlhLink( $title, $skin, $result )
+		);
 	}
 
 	/**
@@ -115,8 +112,8 @@ class SpecialMostlinkedtemplates extends QueryPage {
 		global $wgLang;
 		$wlh = SpecialPage::getTitleFor( 'Whatlinkshere' );
 		$label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ),
-			$wgLang->formatNum( $result->value ) );
-		return $skin->makeKnownLinkObj( $wlh, $label, 'target=' . $title->getPrefixedUrl() );
+		$wgLang->formatNum( $result->value ) );
+		return $skin->link( $wlh, $label, array(), array( 'target' => $title->getPrefixedText() ) );
 	}
 }
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index efd2dcfd..acc27625 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -54,12 +54,13 @@ function wfSpecialMovepage( $par = null ) {
  * @ingroup SpecialPage
  */
 class MovePageForm {
-	var $oldTitle, $newTitle, $reason; # Text input
-	var $moveTalk, $deleteAndMove, $moveSubpages, $fixRedirects;
+	var $oldTitle, $newTitle; # Objects
+	var $reason; # Text input
+	var $moveTalk, $deleteAndMove, $moveSubpages, $fixRedirects, $leaveRedirect; # Checks
 
 	private $watch = false;
 
-	function MovePageForm( $oldTitle, $newTitle ) {
+	function __construct( $oldTitle, $newTitle ) {
 		global $wgRequest;
 		$target = isset($par) ? $par : $wgRequest->getVal( 'target' );
 		$this->oldTitle = $oldTitle;
@@ -68,48 +69,54 @@ class MovePageForm {
 		if ( $wgRequest->wasPosted() ) {
 			$this->moveTalk = $wgRequest->getBool( 'wpMovetalk', false );
 			$this->fixRedirects = $wgRequest->getBool( 'wpFixRedirects', false );
+			$this->leaveRedirect = $wgRequest->getBool( 'wpLeaveRedirect', false );
 		} else {
 			$this->moveTalk = $wgRequest->getBool( 'wpMovetalk', true );
 			$this->fixRedirects = $wgRequest->getBool( 'wpFixRedirects', true );
+			$this->leaveRedirect = $wgRequest->getBool( 'wpLeaveRedirect', true );
 		}
 		$this->moveSubpages = $wgRequest->getBool( 'wpMovesubpages', false );
 		$this->deleteAndMove = $wgRequest->getBool( 'wpDeleteAndMove' ) && $wgRequest->getBool( 'wpConfirm' );
 		$this->watch = $wgRequest->getCheck( 'wpWatch' );
 	}
 
-	function showForm( $err, $hookErr = '' ) {
-		global $wgOut, $wgUser;
+	/**
+	 * Show the form
+	 * @param mixed $err Error message. May either be a string message name or 
+	 *    array message name and parameters, like the second argument to 
+	 *    OutputPage::wrapWikiMsg(). 
+	 */
+	function showForm( $err ) {
+		global $wgOut, $wgUser, $wgFixDoubleRedirects;
 
 		$skin = $wgUser->getSkin();
 
 		$oldTitleLink = $skin->makeLinkObj( $this->oldTitle );
-		$oldTitle = $this->oldTitle->getPrefixedText();
 
-		$wgOut->setPagetitle( wfMsg( 'move-page', $oldTitle ) );
+		$wgOut->setPagetitle( wfMsg( 'move-page', $this->oldTitle->getPrefixedText() ) );
 		$wgOut->setSubtitle( wfMsg( 'move-page-backlink', $oldTitleLink ) );
 
-		if( $this->newTitle == '' ) {
+		$newTitle = $this->newTitle;
+
+		if( !$newTitle ) {
 			# Show the current title as a default
 			# when the form is first opened.
-			$newTitle = $oldTitle;
-		} else {
-			if( $err == '' ) {
-				$nt = Title::newFromURL( $this->newTitle );
-				if( $nt ) {
-					# If a title was supplied, probably from the move log revert
-					# link, check for validity. We can then show some diagnostic
-					# information and save a click.
-					$newerr = $this->oldTitle->isValidMoveOperation( $nt );
-					if( is_string( $newerr ) ) {
-						$err = $newerr;
-					}
+			$newTitle = $this->oldTitle;
+		}
+		else {
+			if( empty($err) ) {
+				# If a title was supplied, probably from the move log revert
+				# link, check for validity. We can then show some diagnostic
+				# information and save a click.
+				$newerr = $this->oldTitle->isValidMoveOperation( $newTitle );
+				if( $newerr ) {
+					$err = $newerr[0];
 				}
 			}
-			$newTitle = $this->newTitle;
 		}
 
-		if ( $err == 'articleexists' && $wgUser->isAllowed( 'delete' ) ) {
-			$wgOut->addWikiMsg( 'delete_and_move_text', $newTitle );
+		if ( !empty($err) && $err[0] == 'articleexists' && $wgUser->isAllowed( 'delete' ) ) {
+			$wgOut->addWikiMsg( 'delete_and_move_text', $newTitle->getPrefixedText() );
 			$movepagebtn = wfMsg( 'delete_and_move' );
 			$submitVar = 'wpDeleteAndMove';
 			$confirm = "
@@ -131,12 +138,16 @@ class MovePageForm {
 		$considerTalk = ( !$this->oldTitle->isTalkPage() && $oldTalk->exists() );
 
 		$dbr = wfGetDB( DB_SLAVE );
-		$hasRedirects = $dbr->selectField( 'redirect', '1', 
-			array( 
-				'rd_namespace' => $this->oldTitle->getNamespace(),
-				'rd_title' => $this->oldTitle->getDBkey(),
-			) , __METHOD__ );
-		
+		if ( $wgFixDoubleRedirects ) {
+			$hasRedirects = $dbr->selectField( 'redirect', '1', 
+				array( 
+					'rd_namespace' => $this->oldTitle->getNamespace(),
+					'rd_title' => $this->oldTitle->getDBkey(),
+				) , __METHOD__ );
+		} else {
+			$hasRedirects = false;
+		}
+
 		if ( $considerTalk ) {
 			$wgOut->addWikiMsg( 'movepagetalktext' );
 		}
@@ -144,9 +155,10 @@ class MovePageForm {
 		$titleObj = SpecialPage::getTitleFor( 'Movepage' );
 		$token = htmlspecialchars( $wgUser->editToken() );
 
-		if ( $err != '' ) {
+		if ( !empty($err) ) {
 			$wgOut->setSubtitle( wfMsg( 'formerror' ) );
-			if( $err == 'hookaborted' ) {
+			if( $err[0] == 'hookaborted' ) {
+				$hookErr = $err[1];
 				$errMsg = "<p><strong class=\"error\">$hookErr</strong></p>\n";
 				$wgOut->addHTML( $errMsg );
 			} else {
@@ -172,8 +184,8 @@ class MovePageForm {
 					Xml::label( wfMsg( 'newtitle' ), 'wpNewTitle' ) .
 				"</td>
 				<td class='mw-input'>" .
-					Xml::input( 'wpNewTitle', 40, $newTitle, array( 'type' => 'text', 'id' => 'wpNewTitle' ) ) .
-					Xml::hidden( 'wpOldTitle', $oldTitle ) .
+					Xml::input( 'wpNewTitle', 40, $newTitle->getPrefixedText(), array( 'type' => 'text', 'id' => 'wpNewTitle' ) ) .
+					Xml::hidden( 'wpOldTitle', $this->oldTitle->getPrefixedText() ) .
 				"</td>
 			</tr>
 			<tr>
@@ -197,6 +209,18 @@ class MovePageForm {
 			);
 		}
 
+		if ( $wgUser->isAllowed( 'suppressredirect' ) ) {
+			$wgOut->addHTML( "
+				<tr>
+					<td></td>
+					<td class='mw-input' >" .
+						Xml::checkLabel( wfMsg( 'move-leave-redirect' ), 'wpLeaveRedirect', 
+							'wpLeaveRedirect', $this->leaveRedirect ) .
+					"</td>
+				</tr>"
+			);
+		}
+
 		if ( $hasRedirects ) {
 			$wgOut->addHTML( "
 				<tr>
@@ -205,7 +229,7 @@ class MovePageForm {
 						Xml::checkLabel( wfMsg( 'fix-double-redirects' ), 'wpFixRedirects', 
 							'wpFixRedirects', $this->fixRedirects ) .
 					"</td>
-				</td>"
+				</tr>"
 			);
 		}
 
@@ -215,7 +239,7 @@ class MovePageForm {
 				<tr>
 					<td></td>
 					<td class=\"mw-input\">" .
-				Xml::checkLabel( wfMsgHtml(
+				Xml::checkLabel( wfMsg(
 						$this->oldTitle->hasSubpages()
 						? 'move-subpages'
 						: 'move-talk-subpages'
@@ -259,6 +283,7 @@ class MovePageForm {
 
 	function doSubmit() {
 		global $wgOut, $wgUser, $wgRequest, $wgMaximumMovedPages, $wgLang;
+		global $wgFixDoubleRedirects;
 
 		if ( $wgUser->pingLimiter( 'move' ) ) {
 			$wgOut->rateLimited();
@@ -280,6 +305,12 @@ class MovePageForm {
 				return;
 			}
 
+			// Delete an associated image if there is
+			$file = wfLocalFile( $nt );
+			if( $file->exists() ) {
+				$file->delete( wfMsgForContent( 'delete_and_move_reason' ), false );
+			}
+
 			// This may output an error message and exit
 			$article->doDelete( wfMsgForContent( 'delete_and_move_reason' ) );
 		}
@@ -290,14 +321,20 @@ class MovePageForm {
 			return;
 		}
 
-		$error = $ot->moveTo( $nt, true, $this->reason );
+		if ( $wgUser->isAllowed( 'suppressredirect' ) ) {
+			$createRedirect = $this->leaveRedirect;
+		} else {
+			$createRedirect = true;
+		}
+
+		$error = $ot->moveTo( $nt, true, $this->reason, $createRedirect );
 		if ( $error !== true ) {
-			# FIXME: showForm() should handle multiple errors
-			call_user_func_array(array($this, 'showForm'), $error[0]);
+			# FIXME: show all the errors in a list, not just the first one
+			$this->showForm( reset( $error ) );
 			return;
 		}
 
-		if ( $this->fixRedirects ) {
+		if ( $wgFixDoubleRedirects && $this->fixRedirects ) {
 			DoubleRedirectJob::fixRedirects( 'move', $ot, $nt );
 		}
 
@@ -312,7 +349,9 @@ class MovePageForm {
 		$oldLink = "<span class='plainlinks'>[$oldUrl $oldText]</span>";
 		$newLink = "<span class='plainlinks'>[$newUrl $newText]</span>";
 
+		$msgName = $createRedirect ? 'movepage-moved-redirect' : 'movepage-moved-noredirect';
 		$wgOut->addWikiMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText );
+		$wgOut->addWikiMsg( $msgName );
 
 		# Now we move extra pages we've been asked to move: subpages and talk
 		# pages.  First, if the old page or the new page is a talk page, we
@@ -364,25 +403,26 @@ class MovePageForm {
 			$conds = null;
 		}
 
-		$extrapages = array();
+		$extraPages = array();
 		if( !is_null( $conds ) ) {
-			$extrapages = $dbr->select( 'page',
-				array( 'page_id', 'page_namespace', 'page_title' ),
-				$conds,
-				__METHOD__
+			$extraPages = TitleArray::newFromResult(
+				$dbr->select( 'page',
+					array( 'page_id', 'page_namespace', 'page_title' ),
+					$conds,
+					__METHOD__
+				)
 			);
 		}
 
 		$extraOutput = array();
 		$skin = $wgUser->getSkin();
 		$count = 1;
-		foreach( $extrapages as $row ) {
-			if( $row->page_id == $ot->getArticleId() ) {
+		foreach( $extraPages as $oldSubpage ) {
+			if( $oldSubpage->getArticleId() == $ot->getArticleId() ) {
 				# Already did this one.
 				continue;
 			}
 
-			$oldSubpage = Title::newFromRow( $row );
 			$newPageName = preg_replace(
 				'#^'.preg_quote( $ot->getDBKey(), '#' ).'#',
 				$nt->getDBKey(),
@@ -408,7 +448,7 @@ class MovePageForm {
 				$link = $skin->makeKnownLinkObj( $newSubpage );
 				$extraOutput []= wfMsgHtml( 'movepage-page-exists', $link );
 			} else {
-				$success = $oldSubpage->moveTo( $newSubpage, true, $this->reason );
+				$success = $oldSubpage->moveTo( $newSubpage, true, $this->reason, $createRedirect );
 				if( $success === true ) {
 					if ( $this->fixRedirects ) {
 						DoubleRedirectJob::fixRedirects( 'move', $oldSubpage, $newSubpage );
diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index e57f6fc1..575e37a7 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -5,66 +5,56 @@
  * FIXME: this code is crap, should use Pager and Database::select().
  */
 
-/**
- *
- */
 function wfSpecialNewimages( $par, $specialPage ) {
-	global $wgUser, $wgOut, $wgLang, $wgRequest, $wgGroupPermissions, $wgMiserMode;
+	global $wgUser, $wgOut, $wgLang, $wgRequest, $wgMiserMode;
 
 	$wpIlMatch = $wgRequest->getText( 'wpIlMatch' );
 	$dbr = wfGetDB( DB_SLAVE );
 	$sk = $wgUser->getSkin();
 	$shownav = !$specialPage->including();
-	$hidebots = $wgRequest->getBool('hidebots',1);
+	$hidebots = $wgRequest->getBool( 'hidebots' , 1 );
 
 	$hidebotsql = '';
-	if ($hidebots) {
-
-		/** Make a list of group names which have the 'bot' flag
-		    set.
-		*/
-		$botconds=array();
-		foreach ($wgGroupPermissions as $groupname=>$perms) {
-			if(array_key_exists('bot',$perms) && $perms['bot']) {
-				$botconds[]="ug_group='$groupname'";
-			}
+	if ( $hidebots ) {
+		# Make a list of group names which have the 'bot' flag set.
+		$botconds = array();
+		foreach ( User::getGroupsWithPermission('bot') as $groupname ) {
+			$botconds[] = 'ug_group = ' . $dbr->addQuotes( $groupname );
 		}
 
-		/* If not bot groups, do not set $hidebotsql */
-		if ($botconds) {
-			$isbotmember=$dbr->makeList($botconds, LIST_OR);
-
-			/** This join, in conjunction with WHERE ug_group
-			    IS NULL, returns only those rows from IMAGE
-		    	where the uploading user is not a member of
-		    	a group which has the 'bot' permission set.
-			*/
-			$ug = $dbr->tableName('user_groups');
-			$hidebotsql = " LEFT OUTER JOIN $ug ON img_user=ug_user AND ($isbotmember)";
+		# If not bot groups, do not set $hidebotsql
+		if ( $botconds ) {
+			$isbotmember = $dbr->makeList( $botconds, LIST_OR );
+
+			# This join, in conjunction with WHERE ug_group IS NULL, returns
+			# only those rows from IMAGE where the uploading user is not a mem-
+			# ber of a group which has the 'bot' permission set.
+			$ug = $dbr->tableName( 'user_groups' );
+			$hidebotsql = " LEFT JOIN $ug ON img_user=ug_user AND ($isbotmember)";
 		}
 	}
 
-	$image = $dbr->tableName('image');
+	$image = $dbr->tableName( 'image' );
 
-	$sql="SELECT img_timestamp from $image";
+	$sql = "SELECT img_timestamp from $image";
 	if ($hidebotsql) {
 		$sql .= "$hidebotsql WHERE ug_group IS NULL";
 	}
-	$sql.=' ORDER BY img_timestamp DESC LIMIT 1';
-	$res = $dbr->query($sql, 'wfSpecialNewImages');
-	$row = $dbr->fetchRow($res);
-	if($row!==false) {
-		$ts=$row[0];
+	$sql .= ' ORDER BY img_timestamp DESC LIMIT 1';
+	$res = $dbr->query( $sql, __FUNCTION__ );
+	$row = $dbr->fetchRow( $res );
+	if( $row !== false ) {
+		$ts = $row[0];
 	} else {
-		$ts=false;
+		$ts = false;
 	}
-	$dbr->freeResult($res);
-	$sql='';
+	$dbr->freeResult( $res );
+	$sql = '';
 
-	/** If we were clever, we'd use this to cache. */
-	$latestTimestamp = wfTimestamp( TS_MW, $ts);
+	# If we were clever, we'd use this to cache.
+	$latestTimestamp = wfTimestamp( TS_MW, $ts );
 
-	/** Hardcode this for now. */
+	# Hardcode this for now.
 	$limit = 48;
 
 	if ( $parval = intval( $par ) ) {
@@ -77,10 +67,8 @@ function wfSpecialNewimages( $par, $specialPage ) {
 	$searchpar = '';
 	if ( $wpIlMatch != '' && !$wgMiserMode) {
 		$nt = Title::newFromUrl( $wpIlMatch );
-		if($nt ) {
-			$m = $dbr->strencode( strtolower( $nt->getDBkey() ) );
-			$m = str_replace( '%', "\\%", $m );
-			$m = str_replace( '_', "\\_", $m );
+		if( $nt ) {
+			$m = $dbr->escapeLike( strtolower( $nt->getDBkey() ) );
 			$where[] = "LOWER(img_name) LIKE '%{$m}%'";
 			$searchpar = '&wpIlMatch=' . urlencode( $wpIlMatch );
 		}
@@ -97,16 +85,16 @@ function wfSpecialNewimages( $par, $specialPage ) {
 	$sql='SELECT img_size, img_name, img_user, img_user_text,'.
 	     "img_description,img_timestamp FROM $image";
 
-	if($hidebotsql) {
+	if( $hidebotsql ) {
 		$sql .= $hidebotsql;
-		$where[]='ug_group IS NULL';
+		$where[] = 'ug_group IS NULL';
 	}
-	if(count($where)) {
-		$sql.=' WHERE '.$dbr->makeList($where, LIST_AND);
+	if( count( $where ) ) {
+		$sql .= ' WHERE ' . $dbr->makeList( $where, LIST_AND );
 	}
 	$sql.=' ORDER BY img_timestamp '. ( $invertSort ? '' : ' DESC' );
-	$sql.=' LIMIT '.($limit+1);
-	$res = $dbr->query($sql, 'wfSpecialNewImages');
+	$sql.=' LIMIT ' . ( $limit + 1 );
+	$res = $dbr->query( $sql, __FUNCTION__ );
 
 	/**
 	 * We have to flip things around to get the last N after a certain date
@@ -126,7 +114,8 @@ function wfSpecialNewimages( $par, $specialPage ) {
 	$lastTimestamp = null;
 	$shownImages = 0;
 	foreach( $images as $s ) {
-		if( ++$shownImages > $limit ) {
+		$shownImages++;
+		if( $shownImages > $limit ) {
 			# One extra just to test for whether to show a page link;
 			# don't actually show it.
 			break;
@@ -135,7 +124,7 @@ function wfSpecialNewimages( $par, $specialPage ) {
 		$name = $s->img_name;
 		$ut = $s->img_user_text;
 
-		$nt = Title::newFromText( $name, NS_IMAGE );
+		$nt = Title::newFromText( $name, NS_FILE );
 		$ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut );
 
 		$gallery->add( $nt, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" );
@@ -147,33 +136,35 @@ function wfSpecialNewimages( $par, $specialPage ) {
 		$lastTimestamp = $timestamp;
 	}
 
+	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
+	$action = $titleObj->getLocalURL( $hidebots ? '' : 'hidebots=0' );
+	if ( $shownav && !$wgMiserMode ) {
+		$wgOut->addHTML(
+			Xml::openElement( 'form', array( 'action' => $action, 'method' => 'post', 'id' => 'imagesearch' ) ) .
+			Xml::fieldset( wfMsg( 'newimages-legend' ) ) .
+			Xml::inputLabel( wfMsg( 'newimages-label' ), 'wpIlMatch', 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
+			Xml::submitButton( wfMsg( 'ilsubmit' ), array( 'name' => 'wpIlSubmit' ) ) .
+			Xml::closeElement( 'fieldset' ) .
+			Xml::closeElement( 'form' )
+		 );
+	}
+
 	$bydate = wfMsg( 'bydate' );
 	$lt = $wgLang->formatNum( min( $shownImages, $limit ) );
-	if ($shownav) {
+	if ( $shownav ) {
 		$text = wfMsgExt( 'imagelisttext', array('parse'), $lt, $bydate );
 		$wgOut->addHTML( $text . "\n" );
 	}
 
-	$sub = wfMsg( 'ilsubmit' );
-	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
-	$action = $titleObj->escapeLocalURL( $hidebots ? '' : 'hidebots=0' );
-	if ($shownav && !$wgMiserMode) {
-		$wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
-		  "{$action}\">" .
-			Xml::input( 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
-		  Xml::submitButton( $sub, array( 'name' => 'wpIlSubmit' ) ) .
-		  "</form>" );
-	}
-
 	/**
 	 * Paging controls...
 	 */
 
 	# If we change bot visibility, this needs to be carried along.
-	if(!$hidebots) {
-		$botpar='&hidebots=0';
+	if( !$hidebots ) {
+		$botpar = '&hidebots=0';
 	} else {
-		$botpar='';
+		$botpar = '';
 	}
 	$now = wfTimestampNow();
 	$d = $wgLang->date( $now, true );
@@ -186,12 +177,12 @@ function wfSpecialNewimages( $par, $specialPage ) {
 
 
 	$opts = array( 'parsemag', 'escapenoentities' );
-	$prevLink = wfMsgExt( 'prevn', $opts, $wgLang->formatNum( $limit ) );
+	$prevLink = wfMsgExt( 'pager-newer-n', $opts, $wgLang->formatNum( $limit ) );
 	if( $firstTimestamp && $firstTimestamp != $latestTimestamp ) {
 		$prevLink = $sk->makeKnownLinkObj( $titleObj, $prevLink, 'from=' . $firstTimestamp . $botpar . $searchpar );
 	}
 
-	$nextLink = wfMsgExt( 'nextn', $opts, $wgLang->formatNum( $limit ) );
+	$nextLink = wfMsgExt( 'pager-older-n', $opts, $wgLang->formatNum( $limit ) );
 	if( $shownImages > $limit && $lastTimestamp ) {
 		$nextLink = $sk->makeKnownLinkObj( $titleObj, $nextLink, 'until=' . $lastTimestamp.$botpar.$searchpar );
 	}
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 1a410ae0..08e776d8 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -12,7 +12,7 @@ class SpecialNewpages extends SpecialPage {
 	// Some internal settings
 	protected $showNavigation = false;
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct( 'Newpages' );
 		$this->includable( true );	
 	}
@@ -26,7 +26,8 @@ class SpecialNewpages extends SpecialPage {
 		$opts->add( 'hideliu', false );
 		$opts->add( 'hidepatrolled', false );
 		$opts->add( 'hidebots', false );
-		$opts->add( 'limit', 50 );
+		$opts->add( 'hideredirs', true );
+		$opts->add( 'limit', (int)$wgUser->getOption( 'rclimit' ) );
 		$opts->add( 'offset', '' );
 		$opts->add( 'namespace', '0' );
 		$opts->add( 'username', '' );
@@ -58,6 +59,8 @@ class SpecialNewpages extends SpecialPage {
 				$this->opts->setValue( 'hidepatrolled', true );
 			if ( 'hidebots' == $bit )
 				$this->opts->setValue( 'hidebots', true );
+			if ( 'showredirs' == $bit )
+				$this->opts->setValue( 'hideredirs', false );
 			if ( is_numeric( $bit ) )
 				$this->opts->setValue( 'limit', intval( $bit ) );
 
@@ -67,6 +70,8 @@ class SpecialNewpages extends SpecialPage {
 			// PG offsets not just digits!
 			if ( preg_match( '/^offset=([^=]+)$/', $bit, $m ) )
 				$this->opts->setValue( 'offset',  intval($m[1]) );
+			if ( preg_match( '/^username=(.*)$/', $bit, $m ) )
+				$this->opts->setValue( 'username', $m[1] );
 			if ( preg_match( '/^namespace=(.*)$/', $bit, $m ) ) {
 				$ns = $wgLang->getNsIndex( $m[1] );
 				if( $ns !== false ) {
@@ -83,7 +88,7 @@ class SpecialNewpages extends SpecialPage {
 	 * @return string
 	 */
 	public function execute( $par ) {
-		global $wgLang, $wgGroupPermissions, $wgUser, $wgOut;
+		global $wgLang, $wgUser, $wgOut;
 
 		$this->setHeaders();
 		$this->outputHeader();
@@ -125,7 +130,8 @@ class SpecialNewpages extends SpecialPage {
 		$filters = array(
 			'hideliu' => 'rcshowhideliu',
 			'hidepatrolled' => 'rcshowhidepatr',
-			'hidebots' => 'rcshowhidebots'
+			'hidebots' => 'rcshowhidebots',
+			'hideredirs' => 'whatlinkshere-hideredirs'
 		);
 
 		// Disable some if needed
@@ -142,8 +148,8 @@ class SpecialNewpages extends SpecialPage {
 		$self = $this->getTitle();
 		foreach ( $filters as $key => $msg ) {
 			$onoff = 1 - $this->opts->getValue($key);
-			$link = $this->skin->makeKnownLinkObj( $self, $showhide[$onoff],
-				wfArrayToCGI( array( $key => $onoff ), $changed )
+			$link = $this->skin->link( $self, $showhide[$onoff], array(),
+				 array( $key => $onoff ) + $changed
 			);
 			$links[$key] = wfMsgHtml( $msg, $link );
 		}
@@ -231,7 +237,7 @@ class SpecialNewpages extends SpecialPage {
 		global $wgLang, $wgContLang, $wgUser;
 		$dm = $wgContLang->getDirMark();
 
-		$title = Title::makeTitleSafe( $result->page_namespace, $result->page_title );
+		$title = Title::makeTitleSafe( $result->rc_namespace, $result->rc_title );
 		$time = $wgLang->timeAndDate( $result->rc_timestamp, true );
 		$plink = $this->skin->makeKnownLinkObj( $title, '', $this->patrollable( $result ) ? 'rcid=' . $result->rc_id : '' );
 		$hist = $this->skin->makeKnownLinkObj( $title, wfMsgHtml( 'hist' ), 'action=history' );
@@ -261,7 +267,7 @@ class SpecialNewpages extends SpecialPage {
 	 * @param string $type
 	 */
 	protected function feed( $type ) {
-		global $wgFeed, $wgFeedClasses;
+		global $wgFeed, $wgFeedClasses, $wgFeedLimit;
 
 		if ( !$wgFeed ) {
 			global $wgOut;
@@ -277,16 +283,12 @@ class SpecialNewpages extends SpecialPage {
 
 		$feed = new $wgFeedClasses[$type](
 			$this->feedTitle(),
-			wfMsg( 'tagline' ),
+			wfMsgExt( 'tagline', 'parsemag' ),
 			$this->getTitle()->getFullUrl() );
 
 		$pager = new NewPagesPager( $this, $this->opts );
 		$limit = $this->opts->getValue( 'limit' );
-		global $wgFeedLimit;
-		if( $limit > $wgFeedLimit ) {
-			$limit = $wgFeedLimit;
-		}
-		$pager->mLimit = $limit;
+		$pager->mLimit = min( $limit, $wgFeedLimit );
 
 		$feed->outHeader();
 		if( $pager->getNumRows() > 0 ) {
@@ -305,7 +307,7 @@ class SpecialNewpages extends SpecialPage {
 	}
 
 	protected function feedItem( $row ) {
-		$title = Title::MakeTitle( intval( $row->page_namespace ), $row->page_title );
+		$title = Title::MakeTitle( intval( $row->rc_namespace ), $row->rc_title );
 		if( $title ) {
 			$date = $row->rc_timestamp;
 			$comments = $title->getTalkPage()->getFullURL();
@@ -322,13 +324,6 @@ class SpecialNewpages extends SpecialPage {
 		}
 	}
 
-	/**
-	 * Quickie hack... strip out wikilinks to more legible form from the comment.
-	 */
-	protected function stripComment( $text ) {
-		return preg_replace( '/\[\[([^]]*\|)?([^]]+)\]\]/', '\2', $text );
-	}
-
 	protected function feedItemAuthor( $row ) {
 		return isset( $row->rc_user_text ) ? $row->rc_user_text : '';
 	}
@@ -337,7 +332,7 @@ class SpecialNewpages extends SpecialPage {
 		$revision = Revision::newFromId( $row->rev_id );
 		if( $revision ) {
 			return '<p>' . htmlspecialchars( $revision->getUserText() ) . ': ' .
-				htmlspecialchars( $revision->getComment() ) . 
+				htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) . 
 				"</p>\n<hr />\n<div>" .
 				nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";
 		}
@@ -352,15 +347,13 @@ class NewPagesPager extends ReverseChronologicalPager {
 	// Stored opts
 	protected $opts, $mForm;
 
-	private $hideliu, $hidepatrolled, $hidebots, $namespace, $user, $spTitle;
-
 	function __construct( $form, FormOptions $opts ) {
 		parent::__construct();
 		$this->mForm = $form;
 		$this->opts = $opts;
 	}
 
-	function getTitle(){
+	function getTitle() {
 		static $title = null;
 		if ( $title === null )
 			$title = $this->mForm->getTitle();
@@ -379,13 +372,13 @@ class NewPagesPager extends ReverseChronologicalPager {
 		$user = Title::makeTitleSafe( NS_USER, $username );
 
 		if( $namespace !== false ) {
-			$conds['page_namespace'] = $namespace;
+			$conds['rc_namespace'] = $namespace;
 			$rcIndexes = array( 'new_name_timestamp' );
 		} else {
 			$rcIndexes = array( 'rc_timestamp' );
 		}
 		$conds[] = 'page_id = rc_cur_id';
-		$conds['page_is_redirect'] = 0;
+
 		# $wgEnableNewpagesUserFilter - temp WMF hack
 		if( $wgEnableNewpagesUserFilter && $user ) {
 			$conds['rc_user_text'] = $user->getText();
@@ -402,9 +395,13 @@ class NewPagesPager extends ReverseChronologicalPager {
 			$conds['rc_bot'] = 0;
 		}
 
+		if ( $this->opts->getValue( 'hideredirs' ) ) {
+			$conds['page_is_redirect'] = 0;
+		}
+
 		return array(
 			'tables' => array( 'recentchanges', 'page' ),
-			'fields' => 'page_namespace,page_title, rc_cur_id, rc_user,rc_user_text,rc_comment,
+			'fields' => 'rc_namespace,rc_title, rc_cur_id, rc_user,rc_user_text,rc_comment,
 				rc_timestamp,rc_patrolled,rc_id,page_len as length, page_latest as rev_id',
 			'conds' => $conds,
 			'options' => array( 'USE INDEX' => array('recentchanges' => $rcIndexes) )
@@ -425,7 +422,7 @@ class NewPagesPager extends ReverseChronologicalPager {
 		while( $row = $this->mResult->fetchObject() ) {
 			$linkBatch->add( NS_USER, $row->rc_user_text );
 			$linkBatch->add( NS_USER_TALK, $row->rc_user_text );
-			$linkBatch->add( $row->page_namespace, $row->page_title );
+			$linkBatch->add( $row->rc_namespace, $row->rc_title );
 		}
 		$linkBatch->execute();
 		return "<ul>";
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index b3468a3c..ca2236ee 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -21,11 +21,11 @@ function wfSpecialPreferences() {
  * @ingroup SpecialPage
  */
 class PreferencesForm {
-	var $mQuickbar, $mOldpass, $mNewpass, $mRetypePass, $mStubs;
+	var $mQuickbar, $mStubs;
 	var $mRows, $mCols, $mSkin, $mMath, $mDate, $mUserEmail, $mEmailFlag, $mNick;
 	var $mUserLanguage, $mUserVariant;
-	var $mSearch, $mRecent, $mRecentDays, $mHourDiff, $mSearchLines, $mSearchChars, $mAction;
-	var $mReset, $mPosted, $mToggles, $mUseAjaxSearch, $mSearchNs, $mRealName, $mImageSize;
+	var $mSearch, $mRecent, $mRecentDays, $mTimeZone, $mHourDiff, $mSearchLines, $mSearchChars, $mAction;
+	var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize;
 	var $mUnderline, $mWatchlistEdits;
 
 	/**
@@ -36,13 +36,10 @@ class PreferencesForm {
 		global $wgContLang, $wgUser, $wgAllowRealName;
 
 		$this->mQuickbar = $request->getVal( 'wpQuickbar' );
-		$this->mOldpass = $request->getVal( 'wpOldpass' );
-		$this->mNewpass = $request->getVal( 'wpNewpass' );
-		$this->mRetypePass =$request->getVal( 'wpRetypePass' );
 		$this->mStubs = $request->getVal( 'wpStubs' );
 		$this->mRows = $request->getVal( 'wpRows' );
 		$this->mCols = $request->getVal( 'wpCols' );
-		$this->mSkin = $request->getVal( 'wpSkin' );
+		$this->mSkin = Skin::normalizeKey( $request->getVal( 'wpSkin' ) );
 		$this->mMath = $request->getVal( 'wpMath' );
 		$this->mDate = $request->getVal( 'wpDate' );
 		$this->mUserEmail = $request->getVal( 'wpUserEmail' );
@@ -54,6 +51,7 @@ class PreferencesForm {
 		$this->mSearch = $request->getVal( 'wpSearch' );
 		$this->mRecent = $request->getVal( 'wpRecent' );
 		$this->mRecentDays = $request->getVal( 'wpRecentDays' );
+		$this->mTimeZone = $request->getVal( 'wpTimeZone' );
 		$this->mHourDiff = $request->getVal( 'wpHourDiff' );
 		$this->mSearchLines = $request->getVal( 'wpSearchLines' );
 		$this->mSearchChars = $request->getVal( 'wpSearchChars' );
@@ -66,7 +64,6 @@ class PreferencesForm {
 		$this->mSuccess = $request->getCheck( 'success' );
 		$this->mWatchlistDays = $request->getVal( 'wpWatchlistDays' );
 		$this->mWatchlistEdits = $request->getVal( 'wpWatchlistEdits' );
-		$this->mUseAjaxSearch = $request->getCheck( 'wpUseAjaxSearch' );
 		$this->mDisableMWSuggest = $request->getCheck( 'wpDisableMWSuggest' );
 
 		$this->mSaveprefs = $request->getCheck( 'wpSaveprefs' ) &&
@@ -105,10 +102,10 @@ class PreferencesForm {
 	}
 
 	function execute() {
-		global $wgUser, $wgOut;
+		global $wgUser, $wgOut, $wgTitle;
 
 		if ( $wgUser->isAnon() ) {
-			$wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext' );
+			$wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext', array($wgTitle->getPrefixedDBkey()) );
 			return;
 		}
 		if ( wfReadOnly() ) {
@@ -174,34 +171,37 @@ class PreferencesForm {
 
 	/**
 	 * Used to validate the user inputed timezone before saving it as
-	 * 'timecorrection', will return '00:00' if fed bogus data.
-	 * Note: It's not a 100% correct implementation timezone-wise, it will
-	 * accept stuff like '14:30',
+	 * 'timecorrection', will return 'System' if fed bogus data.
 	 * @access private
-	 * @param string $s the user input
+	 * @param string $tz the user input Zoneinfo timezone
+	 * @param string $s  the user input offset string
 	 * @return string
 	 */
-	function validateTimeZone( $s ) {
-		if ( $s !== '' ) {
-			if ( strpos( $s, ':' ) ) {
-				# HH:MM
-				$array = explode( ':' , $s );
-				$hour = intval( $array[0] );
-				$minute = intval( $array[1] );
-			} else {
-				$minute = intval( $s * 60 );
-				$hour = intval( $minute / 60 );
-				$minute = abs( $minute ) % 60;
-			}
-			# Max is +14:00 and min is -12:00, see:
-			# http://en.wikipedia.org/wiki/Timezone
-			$hour = min( $hour, 14 );
-			$hour = max( $hour, -12 );
-			$minute = min( $minute, 59 );
-			$minute = max( $minute, 0 );
-			$s = sprintf( "%02d:%02d", $hour, $minute );
+	function validateTimeZone( $tz, $s ) {
+		$data = explode( '|', $tz, 3 );
+		switch ( $data[0] ) {
+			case 'ZoneInfo':
+			case 'System':
+				return $tz;
+			case 'Offset':
+			default:
+				$data = explode( ':', $s, 2 );
+				$minDiff = 0;
+				if( count( $data ) == 2 ) {
+					$data[0] = intval( $data[0] );
+					$data[1] = intval( $data[1] );
+					$minDiff = abs( $data[0] ) * 60 + $data[1];
+					if ( $data[0] < 0 ) $minDiff = -$minDiff;
+				} else {
+					$minDiff = intval( $data[0] ) * 60;
+				}
+
+				# Max is +14:00 and min is -12:00, see:
+				# http://en.wikipedia.org/wiki/Timezone
+				$minDiff = min( $minDiff, 840 );  # 14:00
+				$minDiff = max( $minDiff, -720 ); # -12:00
+				return 'Offset|'.$minDiff;
 		}
-		return $s;
 	}
 
 	/**
@@ -213,30 +213,6 @@ class PreferencesForm {
 		global $wgEmailAuthentication, $wgRCMaxAge;
 		global $wgAuth, $wgEmailConfirmToEdit;
 
-
-		if ( '' != $this->mNewpass && $wgAuth->allowPasswordChange() ) {
-			if ( $this->mNewpass != $this->mRetypePass ) {
-				wfRunHooks( 'PrefsPasswordAudit', array( $wgUser, $this->mNewpass, 'badretype' ) );
-				$this->mainPrefsForm( 'error', wfMsg( 'badretype' ) );
-				return;
-			}
-
-			if (!$wgUser->checkPassword( $this->mOldpass )) {
-				wfRunHooks( 'PrefsPasswordAudit', array( $wgUser, $this->mNewpass, 'wrongpassword' ) );
-				$this->mainPrefsForm( 'error', wfMsg( 'wrongpassword' ) );
-				return;
-			}
-
-			try {
-				$wgUser->setPassword( $this->mNewpass );
-				wfRunHooks( 'PrefsPasswordAudit', array( $wgUser, $this->mNewpass, 'success' ) );
-				$this->mNewpass = $this->mOldpass = $this->mRetypePass = '';
-			} catch( PasswordError $e ) {
-				wfRunHooks( 'PrefsPasswordAudit', array( $wgUser, $this->mNewpass, 'error' ) );
-				$this->mainPrefsForm( 'error', $e->getMessage() );
-				return;
-			}
-		}
 		$wgUser->setRealName( $this->mRealName );
 		$oldOptions = $wgUser->mOptions;
 
@@ -269,7 +245,10 @@ class PreferencesForm {
 		$wgUser->setOption( 'variant', $this->mUserVariant );
 		$wgUser->setOption( 'nickname', $this->mNick );
 		$wgUser->setOption( 'quickbar', $this->mQuickbar );
-		$wgUser->setOption( 'skin', $this->mSkin );
+		global $wgAllowUserSkin;
+		if( $wgAllowUserSkin ) {
+			$wgUser->setOption( 'skin', $this->mSkin );
+		}
 		global $wgUseTeX;
 		if( $wgUseTeX ) {
 			$wgUser->setOption( 'math', $this->mMath );
@@ -284,12 +263,11 @@ class PreferencesForm {
 		$wgUser->setOption( 'rows', $this->validateInt( $this->mRows, 4, 1000 ) );
 		$wgUser->setOption( 'cols', $this->validateInt( $this->mCols, 4, 1000 ) );
 		$wgUser->setOption( 'stubthreshold', $this->validateIntOrNull( $this->mStubs ) );
-		$wgUser->setOption( 'timecorrection', $this->validateTimeZone( $this->mHourDiff, -12, 14 ) );
+		$wgUser->setOption( 'timecorrection', $this->validateTimeZone( $this->mTimeZone, $this->mHourDiff ) );
 		$wgUser->setOption( 'imagesize', $this->mImageSize );
 		$wgUser->setOption( 'thumbsize', $this->mThumbSize );
 		$wgUser->setOption( 'underline', $this->validateInt($this->mUnderline, 0, 2) );
 		$wgUser->setOption( 'watchlistdays', $this->validateFloat( $this->mWatchlistDays, 0, 7 ) );
-		$wgUser->setOption( 'ajaxsearch', $this->mUseAjaxSearch );
 		$wgUser->setOption( 'disablesuggest', $this->mDisableMWSuggest );
 
 		# Set search namespace options
@@ -370,9 +348,8 @@ class PreferencesForm {
 	 * @access private
 	 */
 	function resetPrefs() {
-		global $wgUser, $wgLang, $wgContLang, $wgContLanguageCode, $wgAllowRealName;
+		global $wgUser, $wgLang, $wgContLang, $wgContLanguageCode, $wgAllowRealName, $wgLocalTZoffset;
 
-		$this->mOldpass = $this->mNewpass = $this->mRetypePass = '';
 		$this->mUserEmail = $wgUser->getEmail();
 		$this->mUserEmailAuthenticationtimestamp = $wgUser->getEmailAuthenticationtimestamp();
 		$this->mRealName = ($wgAllowRealName) ? $wgUser->getRealName() : '';
@@ -391,7 +368,47 @@ class PreferencesForm {
 		$this->mRows = $wgUser->getOption( 'rows' );
 		$this->mCols = $wgUser->getOption( 'cols' );
 		$this->mStubs = $wgUser->getOption( 'stubthreshold' );
-		$this->mHourDiff = $wgUser->getOption( 'timecorrection' );
+
+		$tz = $wgUser->getOption( 'timecorrection' );
+		$data = explode( '|', $tz, 3 );
+		$minDiff = null;
+		switch ( $data[0] ) {
+			case 'ZoneInfo':
+				$this->mTimeZone = $tz;
+				# Check if the specified TZ exists, and change to 'Offset' if 
+				# not.
+				if ( !function_exists('timezone_open') || @timezone_open( $data[2] ) === false ) {
+					$this->mTimeZone = 'Offset';
+					$minDiff = intval( $data[1] );
+				}
+				break;
+			case '':
+			case 'System':
+				$this->mTimeZone = 'System|'.$wgLocalTZoffset;
+				break;
+			case 'Offset':
+				$this->mTimeZone = 'Offset';
+				$minDiff = intval( $data[1] );
+				break;
+			default:
+				$this->mTimeZone = 'Offset';
+				$data = explode( ':', $tz, 2 );
+				if( count( $data ) == 2 ) {
+					$data[0] = intval( $data[0] );
+					$data[1] = intval( $data[1] );
+					$minDiff = abs( $data[0] ) * 60 + $data[1];
+					if ( $data[0] < 0 ) $minDiff = -$minDiff;
+				} else {
+					$minDiff = intval( $data[0] ) * 60;
+				}
+				break;
+		}
+		if ( is_null( $minDiff ) ) {
+			$this->mHourDiff = '';
+		} else {
+			$this->mHourDiff = sprintf( '%+03d:%02d', floor($minDiff/60), abs($minDiff)%60 );
+		}
+
 		$this->mSearch = $wgUser->getOption( 'searchlimit' );
 		$this->mSearchLines = $wgUser->getOption( 'contextlines' );
 		$this->mSearchChars = $wgUser->getOption( 'contextchars' );
@@ -402,7 +419,6 @@ class PreferencesForm {
 		$this->mWatchlistEdits = $wgUser->getOption( 'wllimit' );
 		$this->mUnderline = $wgUser->getOption( 'underline' );
 		$this->mWatchlistDays = $wgUser->getOption( 'watchlistdays' );
-		$this->mUseAjaxSearch = $wgUser->getBoolOption( 'ajaxsearch' );
 		$this->mDisableMWSuggest = $wgUser->getBoolOption( 'disablesuggest' );
 
 		$togs = User::getToggles();
@@ -511,18 +527,18 @@ class PreferencesForm {
 	 * @access private
 	 */
 	function mainPrefsForm( $status , $message = '' ) {
-		global $wgUser, $wgOut, $wgLang, $wgContLang;
+		global $wgUser, $wgOut, $wgLang, $wgContLang, $wgAuth;
 		global $wgAllowRealName, $wgImageLimits, $wgThumbLimits;
-		global $wgDisableLangConversion;
+		global $wgDisableLangConversion, $wgDisableTitleConversion;
 		global $wgEnotifWatchlist, $wgEnotifUserTalk,$wgEnotifMinorEdits;
 		global $wgRCShowWatchingUsers, $wgEnotifRevealEditorAddress;
 		global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
-		global $wgContLanguageCode, $wgDefaultSkin, $wgSkipSkins, $wgAuth;
-		global $wgEmailConfirmToEdit, $wgAjaxSearch, $wgEnableMWSuggest;
+		global $wgContLanguageCode, $wgDefaultSkin, $wgCookieExpiration;
+		global $wgEmailConfirmToEdit, $wgEnableMWSuggest, $wgLocalTZoffset;
 
 		$wgOut->setPageTitle( wfMsg( 'preferences' ) );
 		$wgOut->setArticleRelated( false );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->addScriptFile( 'prefs.js' );
 
 		$wgOut->disallowUserJs();  # Prevent hijacked user scripts from sniffing passwords etc.
@@ -536,7 +552,6 @@ class PreferencesForm {
 		}
 
 		$qbs = $wgLang->getQuickbarSettings();
-		$skinNames = $wgLang->getSkinNames();
 		$mathopts = $wgLang->getMathNames();
 		$dateopts = $wgLang->getDatePreferences();
 		$togs = User::getToggles();
@@ -552,6 +567,7 @@ class PreferencesForm {
 		$this->mUsedToggles[ 'enotifrevealaddr' ] = true;
 		$this->mUsedToggles[ 'ccmeonemails' ] = true;
 		$this->mUsedToggles[ 'uselivepreview' ] = true;
+		$this->mUsedToggles[ 'noconvertlink' ] = true;
 
 
 		if ( !$this->mEmailFlag ) { $emfc = 'checked="checked"'; }
@@ -560,7 +576,13 @@ class PreferencesForm {
 
 		if ($wgEmailAuthentication && ($this->mUserEmail != '') ) {
 			if( $wgUser->getEmailAuthenticationTimestamp() ) {
-				$emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationTimestamp(), true ) ).'<br />';
+				// date and time are separate parameters to facilitate localisation.
+				// $time is kept for backward compat reasons.
+				// 'emailauthenticated' is also used in SpecialConfirmemail.php
+				$time = $wgLang->timeAndDate( $wgUser->getEmailAuthenticationTimestamp(), true );
+				$d = $wgLang->date( $wgUser->getEmailAuthenticationTimestamp(), true );
+				$t = $wgLang->time( $wgUser->getEmailAuthenticationTimestamp(), true );
+				$emailauthenticated = wfMsg('emailauthenticated', $time, $d, $t ).'<br />';
 				$disableEmailPrefs = false;
 			} else {
 				$disableEmailPrefs = true;
@@ -620,26 +642,26 @@ class PreferencesForm {
 		$toolLinks = array();
 		$toolLinks[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'ListGroupRights' ), wfMsg( 'listgrouprights' ) );
 		# At the moment one tool link only but be prepared for the future...
-		# FIXME: Add a link to Special:Userrights for users who are allowed to use it. 
+		# FIXME: Add a link to Special:Userrights for users who are allowed to use it.
 		# $wgUser->isAllowed( 'userrights' ) seems to strict in some cases
 
 		$userInformationHtml =
 			$this->tableRow( wfMsgHtml( 'username' ), htmlspecialchars( $wgUser->getName() ) ) .
-			$this->tableRow( wfMsgHtml( 'uid' ), htmlspecialchars( $wgUser->getId() ) ) .
+			$this->tableRow( wfMsgHtml( 'uid' ), $wgLang->formatNum( htmlspecialchars( $wgUser->getId() ) ) ).
 
 			$this->tableRow(
 				wfMsgExt( 'prefs-memberingroups', array( 'parseinline' ), count( $userEffectiveGroupsArray ) ),
-				implode( wfMsg( 'comma-separator' ), $userEffectiveGroupsArray ) . 
+				$wgLang->commaList( $userEffectiveGroupsArray ) .
 				'<br />(' . implode( ' | ', $toolLinks ) . ')'
 			) .
 
 			$this->tableRow(
 				wfMsgHtml( 'prefs-edits' ),
-				$wgLang->formatNum( User::edits( $wgUser->getId() ) )
+				$wgLang->formatNum( $wgUser->getEditCount() )
 			);
 
 		if( wfRunHooks( 'PreferencesUserInformationPanel', array( $this, &$userInformationHtml ) ) ) {
-			$wgOut->addHtml( $userInformationHtml );
+			$wgOut->addHTML( $userInformationHtml );
 		}
 
 		if ( $wgAllowRealName ) {
@@ -724,7 +746,7 @@ class PreferencesForm {
 			}
 
 			if(count($variantArray) > 1) {
-				$wgOut->addHtml(
+				$wgOut->addHTML(
 					$this->tableRow(
 						Xml::label( wfMsg( 'yourvariant' ), 'wpUserVariant' ),
 						Xml::tags( 'select',
@@ -734,30 +756,25 @@ class PreferencesForm {
 					)
 				);
 			}
+
+			if(count($variantArray) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion) {
+				$wgOut->addHTML(
+					Xml::tags( 'tr', null,
+						Xml::tags( 'td', array( 'colspan' => '2' ),
+							$this->getToggle( "noconvertlink" )
+						)
+					)
+				);
+			}
 		}
 
 		# Password
 		if( $wgAuth->allowPasswordChange() ) {
+			$link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'ResetPass' ), wfMsgHtml( 'prefs-resetpass' ),
+				array() , array('returnto' => SpecialPage::getTitleFor( 'Preferences') ) );
 			$wgOut->addHTML(
 				$this->tableRow( Xml::element( 'h2', null, wfMsg( 'changepassword' ) ) ) .
-				$this->tableRow(
-					Xml::label( wfMsg( 'oldpassword' ), 'wpOldpass' ),
-					Xml::password( 'wpOldpass', 25, $this->mOldpass, array( 'id' => 'wpOldpass' ) )
-				) .
-				$this->tableRow(
-					Xml::label( wfMsg( 'newpassword' ), 'wpNewpass' ),
-					Xml::password( 'wpNewpass', 25, $this->mNewpass, array( 'id' => 'wpNewpass' ) )
-				) .
-				$this->tableRow(
-					Xml::label( wfMsg( 'retypenew' ), 'wpRetypePass' ),
-					Xml::password( 'wpRetypePass', 25, $this->mRetypePass, array( 'id' => 'wpRetypePass' ) )
-				) .
-				Xml::tags( 'tr', null,
-					Xml::tags( 'td', array( 'colspan' => '2' ),
-						$this->getToggle( "rememberpassword" )
-					)
-				)
-			);
+				$this->tableRow( '<ul><li>' . $link . '</li></ul>' ) );
 		}
 
 		# <FIXME>
@@ -799,48 +816,49 @@ class PreferencesForm {
 		# Quickbar
 		#
 		if ($this->mSkin == 'cologneblue' || $this->mSkin == 'standard') {
-			$wgOut->addHtml( "<fieldset>\n<legend>" . wfMsg( 'qbsettings' ) . "</legend>\n" );
+			$wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg( 'qbsettings' ) . "</legend>\n" );
 			for ( $i = 0; $i < count( $qbs ); ++$i ) {
 				if ( $i == $this->mQuickbar ) { $checked = ' checked="checked"'; }
 				else { $checked = ""; }
 				$wgOut->addHTML( "<div><label><input type='radio' name='wpQuickbar' value=\"$i\"$checked />{$qbs[$i]}</label></div>\n" );
 			}
-			$wgOut->addHtml( "</fieldset>\n\n" );
+			$wgOut->addHTML( "</fieldset>\n\n" );
 		} else {
 			# Need to output a hidden option even if the relevant skin is not in use,
 			# otherwise the preference will get reset to 0 on submit
-			$wgOut->addHtml( wfHidden( 'wpQuickbar', $this->mQuickbar ) );
+			$wgOut->addHTML( Xml::hidden( 'wpQuickbar', $this->mQuickbar ) );
 		}
 
 		# Skin
 		#
-		$wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
-		$mptitle = Title::newMainPage();
-		$previewtext = wfMsg('skinpreview');
-		# Only show members of Skin::getSkinNames() rather than
-		# $skinNames (skins is all skin names from Language.php)
-		$validSkinNames = Skin::getSkinNames();
-		# Sort by UI skin name. First though need to update validSkinNames as sometimes
-		# the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
-		foreach ($validSkinNames as $skinkey => & $skinname ) {
-			if ( isset( $skinNames[$skinkey] ) )  {
-				$skinname = $skinNames[$skinkey];
+		global $wgAllowUserSkin;
+		if( $wgAllowUserSkin ) {
+			$wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg( 'skin' ) . "</legend>\n" );
+			$mptitle = Title::newMainPage();
+			$previewtext = wfMsg( 'skin-preview' );
+			# Only show members of Skin::getSkinNames() rather than
+			# $skinNames (skins is all skin names from Language.php)
+			$validSkinNames = Skin::getUsableSkins();
+			# Sort by UI skin name. First though need to update validSkinNames as sometimes
+			# the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
+			foreach ( $validSkinNames as $skinkey => &$skinname ) {
+				$msgName = "skinname-{$skinkey}";
+				$localisedSkinName = wfMsg( $msgName );
+				if ( !wfEmptyMsg( $msgName, $localisedSkinName ) )  {
+					$skinname = $localisedSkinName;
+				}
 			}
-		}
-		asort($validSkinNames);
-		foreach ($validSkinNames as $skinkey => $sn ) {
-			if ( in_array( $skinkey, $wgSkipSkins ) ) {
-				continue;
+			asort($validSkinNames);
+			foreach ($validSkinNames as $skinkey => $sn ) {
+				$checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
+				$mplink = htmlspecialchars( $mptitle->getLocalURL( "useskin=$skinkey" ) );
+				$previewlink = "(<a target='_blank' href=\"$mplink\">$previewtext</a>)";
+				if( $skinkey == $wgDefaultSkin )
+					$sn .= ' (' . wfMsg( 'default' ) . ')';
+				$wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<br />\n" );
 			}
-			$checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
-
-			$mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
-			$previewlink = "<a target='_blank' href=\"$mplink\">$previewtext</a>";
-			if( $skinkey == $wgDefaultSkin )
-				$sn .= ' (' . wfMsg( 'default' ) . ')';
-			$wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<br />\n" );
+			$wgOut->addHTML( "</fieldset>\n\n" );
 		}
-		$wgOut->addHTML( "</fieldset>\n\n" );
 
 		# Math
 		#
@@ -860,10 +878,6 @@ class PreferencesForm {
 
 		# Files
 		#
-		$wgOut->addHTML(
-			"<fieldset>\n" . Xml::element( 'legend', null, wfMsg( 'files' ) ) . "\n"
-		);
-
 		$imageLimitOptions = null;
 		foreach ( $wgImageLimits as $index => $limits ) {
 			$selected = ($index == $this->mImageSize);
@@ -871,14 +885,6 @@ class PreferencesForm {
 				wfMsg('unit-pixel'), $index, $selected );
 		}
 
-		$imageSizeId = 'wpImageSize';
-		$wgOut->addHTML(
-			"<div>" . Xml::label( wfMsg('imagemaxsize'), $imageSizeId ) . " " .
-			Xml::openElement( 'select', array( 'name' => $imageSizeId, 'id' => $imageSizeId ) ) .
-				$imageLimitOptions .
-			Xml::closeElement( 'select' ) . "</div>\n"
-		);
-
 		$imageThumbOptions = null;
 		foreach ( $wgThumbLimits as $index => $size ) {
 			$selected = ($index == $this->mThumbSize);
@@ -886,16 +892,34 @@ class PreferencesForm {
 				$selected);
 		}
 
+		$imageSizeId = 'wpImageSize';
 		$thumbSizeId = 'wpThumbSize';
 		$wgOut->addHTML(
-			"<div>" . Xml::label( wfMsg('thumbsize'), $thumbSizeId ) . " " .
-			Xml::openElement( 'select', array( 'name' => $thumbSizeId, 'id' => $thumbSizeId ) ) .
-				$imageThumbOptions .
-			Xml::closeElement( 'select' ) . "</div>\n"
+			Xml::fieldset( wfMsg( 'files' ) ) . "\n" .
+			Xml::openElement( 'table' ) .
+				'<tr>
+					<td class="mw-label">' .
+						Xml::label( wfMsg( 'imagemaxsize' ), $imageSizeId ) .
+					'</td>
+					<td class="mw-input">' .
+						Xml::openElement( 'select', array( 'name' => $imageSizeId, 'id' => $imageSizeId ) ) .
+						$imageLimitOptions .
+						Xml::closeElement( 'select' ) .
+					'</td>
+				</tr><tr>
+					<td class="mw-label">' .
+						Xml::label( wfMsg( 'thumbsize' ), $thumbSizeId ) .
+					'</td>
+					<td class="mw-input">' .
+						Xml::openElement( 'select', array( 'name' => $thumbSizeId, 'id' => $thumbSizeId ) ) .
+						$imageThumbOptions .
+						Xml::closeElement( 'select' ) .
+					'</td>
+				</tr>' .
+ 			Xml::closeElement( 'table' ) .
+ 			Xml::closeElement( 'fieldset' )
 		);
 
-		$wgOut->addHTML( "</fieldset>\n\n" );
-
 		# Date format
 		#
 		# Date/Time
@@ -929,18 +953,61 @@ class PreferencesForm {
 			$wgOut->addHTML( Xml::closeElement( 'fieldset' ) . "\n" );
 		}
 
-		$nowlocal = $wgLang->time( $now = wfTimestampNow(), true );
-		$nowserver = $wgLang->time( $now, false );
+		$nowlocal = Xml::openElement( 'span', array( 'id' => 'wpLocalTime' ) ) .
+			$wgLang->time( $now = wfTimestampNow(), true ) .
+			Xml::closeElement( 'span' );
+		$nowserver = $wgLang->time( $now, false ) .
+			Xml::hidden( 'wpServerTime', substr( $now, 8, 2 ) * 60 + substr( $now, 10, 2 ) );
 
 		$wgOut->addHTML(
 			Xml::openElement( 'fieldset' ) .
 			Xml::element( 'legend', null, wfMsg( 'timezonelegend' ) ) .
 			Xml::openElement( 'table' ) .
 		 	$this->addRow( wfMsg( 'servertime' ), $nowserver ) .
-			$this->addRow( wfMsg( 'localtime' ), $nowlocal ) .
+			$this->addRow( wfMsg( 'localtime' ), $nowlocal )
+		);
+		$opt = Xml::openElement( 'select', array(
+			'name' => 'wpTimeZone',
+			'id' => 'wpTimeZone',
+			'onchange' => 'javascript:updateTimezoneSelection(false)' ) );
+		$opt .= Xml::option( wfMsg( 'timezoneuseserverdefault' ), "System|$wgLocalTZoffset", $this->mTimeZone === "System|$wgLocalTZoffset" );
+		$opt .= Xml::option( wfMsg( 'timezoneuseoffset' ), 'Offset', $this->mTimeZone === 'Offset' );
+		if ( function_exists( 'timezone_identifiers_list' ) ) {
+			$optgroup = '';
+			$tzs = timezone_identifiers_list();
+			sort( $tzs );
+			$selZone = explode( '|', $this->mTimeZone, 3);
+			$selZone = ( $selZone[0] == 'ZoneInfo' ) ? $selZone[2] : null;
+			$now = date_create( 'now' );
+			foreach ( $tzs as $tz ) {
+				$z = explode( '/', $tz, 2 );
+				# timezone_identifiers_list() returns a number of
+				# backwards-compatibility entries. This filters them out of the 
+				# list presented to the user.
+				if ( count( $z ) != 2 || !in_array( $z[0], array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific' ) ) ) continue;
+				if ( $optgroup != $z[0] ) {
+					if ( $optgroup !== '' ) $opt .= Xml::closeElement( 'optgroup' );
+					$optgroup = $z[0];
+					$opt .= Xml::openElement( 'optgroup', array( 'label' => $z[0] ) );
+				}
+				$minDiff = floor( timezone_offset_get( timezone_open( $tz ), $now ) / 60 );
+				$opt .= Xml::option( str_replace( '_', ' ', $tz ), "ZoneInfo|$minDiff|$tz", $selZone === $tz, array( 'label' => $z[1] ) );
+			}
+			if ( $optgroup !== '' ) $opt .= Xml::closeElement( 'optgroup' );
+		}
+		$opt .= Xml::closeElement( 'select' );
+		$wgOut->addHTML(
+			$this->addRow(
+				Xml::label( wfMsg( 'timezoneselect' ), 'wpTimeZone' ),
+				$opt )
+		);
+		$wgOut->addHTML(
 			$this->addRow(
 				Xml::label( wfMsg( 'timezoneoffset' ), 'wpHourDiff'  ),
-				Xml::input( 'wpHourDiff', 6, $this->mHourDiff, array( 'id' => 'wpHourDiff' ) ) ) .
+				Xml::input( 'wpHourDiff', 6, $this->mHourDiff, array(
+					'id' => 'wpHourDiff',
+					'onfocus' => 'javascript:updateTimezoneSelection(true)',
+					'onblur' => 'javascript:updateTimezoneSelection(false)' ) ) ) .
 			"<tr>
 				<td></td>
 				<td class='mw-submit'>" .
@@ -961,12 +1028,11 @@ class PreferencesForm {
 		# Editing
 		#
 		global $wgLivePreview;
-		$wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textboxsize' ) . '</legend>
-			<div>' .
-				wfInputLabel( wfMsg( 'rows' ), 'wpRows', 'wpRows', 3, $this->mRows ) .
-				' ' .
-				wfInputLabel( wfMsg( 'columns' ), 'wpCols', 'wpCols', 3, $this->mCols ) .
-			"</div>" .
+		$wgOut->addHTML(
+			Xml::fieldset( wfMsg( 'textboxsize' ) ) .
+			wfMsgHTML( 'prefs-edit-boxsize' ) . ' ' .
+			Xml::inputLabel( wfMsg( 'rows' ), 'wpRows', 'wpRows', 3, $this->mRows ) . ' ' .
+			Xml::inputLabel( wfMsg( 'columns' ), 'wpCols', 'wpCols', 3, $this->mCols ) .
 			$this->getToggles( array(
 				'editsection',
 				'editsectiononrightclick',
@@ -980,62 +1046,76 @@ class PreferencesForm {
 				'externaldiff',
 				$wgLivePreview ? 'uselivepreview' : false,
 				'forceeditsummary',
-			) ) . '</fieldset>'
+			) )
 		);
 
-		# Recent changes
-		$wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-rc' ) . '</legend>' );
-
-		$rc  = '<table><tr>';
-		$rc .= '<td>' . Xml::label( wfMsg( 'recentchangesdays' ), 'wpRecentDays' ) . '</td>';
-		$rc .= '<td>' . Xml::input( 'wpRecentDays', 3, $this->mRecentDays, array( 'id' => 'wpRecentDays' ) ) . '</td>';
-		$rc .= '</tr><tr>';
-		$rc .= '<td>' . Xml::label( wfMsg( 'recentchangescount' ), 'wpRecent' ) . '</td>';
-		$rc .= '<td>' . Xml::input( 'wpRecent', 3, $this->mRecent, array( 'id' => 'wpRecent' ) ) . '</td>';
-		$rc .= '</tr></table>';
-		$wgOut->addHtml( $rc );
+		$wgOut->addHTML( Xml::closeElement( 'fieldset' ) );
 
-		$wgOut->addHtml( '<br />' );
+		# Recent changes
+		global $wgRCMaxAge;
+		$wgOut->addHTML(
+			Xml::fieldset( wfMsg( 'prefs-rc' ) ) .
+ 			Xml::openElement( 'table' ) .
+				'<tr>
+					<td class="mw-label">' .
+						Xml::label( wfMsg( 'recentchangesdays' ), 'wpRecentDays' ) .
+					'</td>
+					<td class="mw-input">' .
+						Xml::input( 'wpRecentDays', 3, $this->mRecentDays, array( 'id' => 'wpRecentDays' ) ) . ' ' .
+						wfMsgExt( 'recentchangesdays-max', 'parsemag',
+							$wgLang->formatNum( ceil( $wgRCMaxAge / ( 3600 * 24 ) ) ) ) .
+					'</td>
+				</tr><tr>
+					<td class="mw-label">' .
+						Xml::label( wfMsg( 'recentchangescount' ), 'wpRecent' ) .
+					'</td>
+					<td class="mw-input">' .
+						Xml::input( 'wpRecent', 3, $this->mRecent, array( 'id' => 'wpRecent' ) ) .
+					'</td>
+				</tr>' .
+ 			Xml::closeElement( 'table' ) .
+			'<br />'
+		);
 
 		$toggles[] = 'hideminor';
 		if( $wgRCShowWatchingUsers )
 			$toggles[] = 'shownumberswatching';
 		$toggles[] = 'usenewrc';
-		$wgOut->addHtml( $this->getToggles( $toggles ) );
 
-		$wgOut->addHtml( '</fieldset>' );
+		$wgOut->addHTML(
+			$this->getToggles( $toggles ) .
+			Xml::closeElement( 'fieldset' )
+		);
 
 		# Watchlist
-		$wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-watchlist' ) . '</legend>' );
-
-		$wgOut->addHtml( wfInputLabel( wfMsg( 'prefs-watchlist-days' ), 'wpWatchlistDays', 'wpWatchlistDays', 3, $this->mWatchlistDays ) );
-		$wgOut->addHtml( '<br /><br />' );
-
-		$wgOut->addHtml( $this->getToggle( 'extendwatchlist' ) );
-		$wgOut->addHtml( wfInputLabel( wfMsg( 'prefs-watchlist-edits' ), 'wpWatchlistEdits', 'wpWatchlistEdits', 3, $this->mWatchlistEdits ) );
-		$wgOut->addHtml( '<br /><br />' );
+		$wgOut->addHTML( 
+			Xml::fieldset( wfMsg( 'prefs-watchlist' ) ) .
+			Xml::inputLabel( wfMsg( 'prefs-watchlist-days' ), 'wpWatchlistDays', 'wpWatchlistDays', 3, $this->mWatchlistDays ) . ' ' .
+			wfMsgHTML( 'prefs-watchlist-days-max' ) .
+			'<br /><br />' .
+			$this->getToggle( 'extendwatchlist' ) .
+			Xml::inputLabel( wfMsg( 'prefs-watchlist-edits' ), 'wpWatchlistEdits', 'wpWatchlistEdits', 3, $this->mWatchlistEdits ) . ' ' .
+			wfMsgHTML( 'prefs-watchlist-edits-max' ) .
+			'<br /><br />' .
+			$this->getToggles( array( 'watchlisthideminor', 'watchlisthidebots', 'watchlisthideown', 'watchlisthideanons', 'watchlisthideliu' ) )
+		);
 
-		$wgOut->addHtml( $this->getToggles( array( 'watchlisthideown', 'watchlisthidebots', 'watchlisthideminor' ) ) );
+		if( $wgUser->isAllowed( 'createpage' ) || $wgUser->isAllowed( 'createtalk' ) ) {
+			$wgOut->addHTML( $this->getToggle( 'watchcreations' ) );
+		}
 
-		if( $wgUser->isAllowed( 'createpage' ) || $wgUser->isAllowed( 'createtalk' ) )
-			$wgOut->addHtml( $this->getToggle( 'watchcreations' ) );
 		foreach( array( 'edit' => 'watchdefault', 'move' => 'watchmoves', 'delete' => 'watchdeletion' ) as $action => $toggle ) {
 			if( $wgUser->isAllowed( $action ) )
-				$wgOut->addHtml( $this->getToggle( $toggle ) );
+				$wgOut->addHTML( $this->getToggle( $toggle ) );
 		}
 		$this->mUsedToggles['watchcreations'] = true;
 		$this->mUsedToggles['watchdefault'] = true;
 		$this->mUsedToggles['watchmoves'] = true;
 		$this->mUsedToggles['watchdeletion'] = true;
 
-		$wgOut->addHtml( '</fieldset>' );
+		$wgOut->addHTML( Xml::closeElement( 'fieldset' ) );
 
 		# Search
-		$ajaxsearch = $wgAjaxSearch ?
-			$this->addRow(
-				Xml::label( wfMsg( 'useajaxsearch' ), 'wpUseAjaxSearch' ),
-				Xml::check( 'wpUseAjaxSearch', $this->mUseAjaxSearch, array( 'id' => 'wpUseAjaxSearch' ) )
-			) : '';
 		$mwsuggest = $wgEnableMWSuggest ?
 			$this->addRow(
 				Xml::label( wfMsg( 'mwsuggest-disable' ), 'wpDisableMWSuggest' ),
@@ -1049,7 +1129,6 @@ class PreferencesForm {
 			Xml::openElement( 'fieldset' ) .
 			Xml::element( 'legend', null, wfMsg( 'prefs-searchoptions' ) ) .
 			Xml::openElement( 'table' ) .
-			$ajaxsearch .
 			$this->addRow(
 				Xml::label( wfMsg( 'resultsperpage' ), 'wpSearch' ),
 				Xml::input( 'wpSearch', 4, $this->mSearch, array( 'id' => 'wpSearch' ) )
@@ -1078,8 +1157,8 @@ class PreferencesForm {
 		# Misc
 		#
 		$wgOut->addHTML('<fieldset><legend>' . wfMsg('prefs-misc') . '</legend>');
-		$wgOut->addHtml( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label>&nbsp;' );
-		$wgOut->addHtml( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) );
+		$wgOut->addHTML( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label>&nbsp;' );
+		$wgOut->addHTML( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) );
 		$msgUnderline = htmlspecialchars( wfMsg ( 'tog-underline' ) );
 		$msgUnderlinenever = htmlspecialchars( wfMsg ( 'underline-never' ) );
 		$msgUnderlinealways = htmlspecialchars( wfMsg ( 'underline-always' ) );
@@ -1098,9 +1177,13 @@ class PreferencesForm {
 
 		foreach ( $togs as $tname ) {
 			if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
-				$wgOut->addHTML( $this->getToggle( $tname ) );
+				if( $tname == 'norollbackdiff' && $wgUser->isAllowed( 'rollback' ) )
+					$wgOut->addHTML( $this->getToggle( $tname ) );
+				else
+					$wgOut->addHTML( $this->getToggle( $tname ) );
 			}
 		}
+
 		$wgOut->addHTML( '</fieldset>' );
 
 		wfRunHooks( 'RenderPreferencesForm', array( $this, $wgOut ) );
@@ -1119,7 +1202,7 @@ class PreferencesForm {
 	<input type='hidden' name='wpEditToken' value=\"{$token}\" />
 	</div></form>\n" );
 
-		$wgOut->addHtml( Xml::tags( 'div', array( 'class' => "prefcache" ),
+		$wgOut->addHTML( Xml::tags( 'div', array( 'class' => "prefcache" ),
 			wfMsgExt( 'clearyourcache', 'parseinline' ) )
 		);
 	}
diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index 9c880349..ea0c1135 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -1,40 +1,4 @@
 <?php
-/**
- * @file
- * @ingroup SpecialPage
- */
-
-/**
- * Entry point : initialise variables and call subfunctions.
- * @param $par String: becomes "FOO" when called like Special:Prefixindex/FOO (default NULL)
- * @param $specialPage SpecialPage object.
- */
-function wfSpecialPrefixIndex( $par=NULL, $specialPage ) {
-	global $wgRequest, $wgOut, $wgContLang;
-
-	# GET values
-	$from = $wgRequest->getVal( 'from' );
-	$prefix = $wgRequest->getVal( 'prefix' );
-	$namespace = $wgRequest->getInt( 'namespace' );
-	$namespaces = $wgContLang->getNamespaces();
-
-	$indexPage = new SpecialPrefixIndex();
-
-	$wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces ) ) )
-		? wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) )
-		: wfMsg( 'allarticles' )
-	);
-
-	if ( isset($par) ) {
-		$indexPage->showChunk( $namespace, $par, $specialPage->including(), $from );
-	} elseif ( isset($prefix) ) {
-		$indexPage->showChunk( $namespace, $prefix, $specialPage->including(), $from );
-	} elseif ( isset($from) ) {
-		$indexPage->showChunk( $namespace, $from, $specialPage->including(), $from );
-	} else {
-		$wgOut->addHtml($indexPage->namespaceForm ( $namespace, null ));
-	}
-}
 
 /**
  * implements Special:Prefixindex
@@ -44,18 +8,90 @@ class SpecialPrefixindex extends SpecialAllpages {
 	// Inherit $maxPerPage
 
 	// Define other properties
-	protected $name = 'Prefixindex';
 	protected $nsfromMsg = 'allpagesprefix';
+	
+	function __construct(){
+		parent::__construct( 'Prefixindex' );
+	}
+	
+	/**
+	 * Entry point : initialise variables and call subfunctions.
+	 * @param $par String: becomes "FOO" when called like Special:Prefixindex/FOO (default null)
+	 */
+	function execute( $par ) {
+		global $wgRequest, $wgOut, $wgContLang;
+
+		$this->setHeaders();
+		$this->outputHeader();
+
+		# GET values
+		$from = $wgRequest->getVal( 'from' );
+		$prefix = $wgRequest->getVal( 'prefix' );
+		$namespace = $wgRequest->getInt( 'namespace' );
+		$namespaces = $wgContLang->getNamespaces();
+
+		$wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces ) ) )
+			? wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) )
+			: wfMsg( 'prefixindex' )
+		);
+
+		if( isset( $par ) ){
+			$this->showPrefixChunk( $namespace, $par, $from );
+		} elseif( isset( $prefix ) ){
+			$this->showPrefixChunk( $namespace, $prefix, $from );
+		} elseif( isset( $from ) ){
+			$this->showPrefixChunk( $namespace, $from, $from );
+		} else {
+			$wgOut->addHTML( $this->namespacePrefixForm( $namespace, null ) );
+		}
+	}
+	
+	/**
+	* HTML for the top form
+	* @param integer $namespace A namespace constant (default NS_MAIN).
+	* @param string $from dbKey we are starting listing at.
+	*/
+	function namespacePrefixForm( $namespace = NS_MAIN, $from = '' ) {
+		global $wgScript;
+		$t = $this->getTitle();
+
+		$out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
+		$out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+		$out .= Xml::hidden( 'title', $t->getPrefixedText() );
+		$out .= Xml::openElement( 'fieldset' );
+		$out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
+		$out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
+		$out .= "<tr>
+				<td class='mw-label'>" .
+				Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
+				"</td>
+				<td class='mw-input'>" .
+					Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td class='mw-label'>" .
+					Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+				"</td>
+				<td class='mw-input'>" .
+					Xml::namespaceSelector( $namespace, null ) . ' ' .
+					Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
+				"</td>
+				</tr>";
+		$out .= Xml::closeElement( 'table' );
+		$out .= Xml::closeElement( 'fieldset' );
+		$out .= Xml::closeElement( 'form' );
+		$out .= Xml::closeElement( 'div' );
+		return $out;
+	}
 
 	/**
 	 * @param integer $namespace (Default NS_MAIN)
 	 * @param string $from list all pages from this name (default FALSE)
 	 */
-	function showChunk( $namespace = NS_MAIN, $prefix, $including = false, $from = null ) {
+	function showPrefixChunk( $namespace = NS_MAIN, $prefix, $from = null ) {
 		global $wgOut, $wgUser, $wgContLang;
 
-		$fname = 'indexShowChunk';
-
 		$sk = $wgUser->getSkin();
 
 		if (!isset($from)) $from = $prefix;
@@ -86,7 +122,7 @@ class SpecialPrefixindex extends SpecialAllpages {
 					'page_title LIKE \'' . $dbr->escapeLike( $prefixKey ) .'%\'',
 					'page_title >= ' . $dbr->addQuotes( $fromKey ),
 				),
-				$fname,
+				__METHOD__,
 				array(
 					'ORDER BY'  => 'page_title',
 					'LIMIT'     => $this->maxPerPage + 1,
@@ -100,7 +136,7 @@ class SpecialPrefixindex extends SpecialAllpages {
 			if( $res->numRows() > 0 ) {
 				$out = '<table style="background: inherit;" border="0" width="100%">';
 	
-				while( ($n < $this->maxPerPage) && ($s = $dbr->fetchObject( $res )) ) {
+				while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
 					$t = Title::makeTitle( $s->page_namespace, $s->page_title );
 					if( $t ) {
 						$link = ($s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
@@ -127,26 +163,27 @@ class SpecialPrefixindex extends SpecialAllpages {
 			}
 		}
 
-		if ( $including ) {
+		if ( $this->including() ) {
 			$out2 = '';
 		} else {
-			$nsForm = $this->namespaceForm ( $namespace, $prefix );
+			$nsForm = $this->namespacePrefixForm( $namespace, $prefix );
+			$self = $this->getTitle();
 			$out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
 			$out2 .= '<tr valign="top"><td>' . $nsForm;
 			$out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
-					$sk->makeKnownLink( $wgContLang->specialPage( $this->name ),
+					$sk->makeKnownLinkObj( $self,
 						wfMsg ( 'allpages' ) );
-			if ( isset($dbr) && $dbr && ($n == $this->maxPerPage) && ($s = $dbr->fetchObject( $res )) ) {
+			if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
 				$namespaceparam = $namespace ? "&namespace=$namespace" : "";
-				$out2 .= " | " . $sk->makeKnownLink(
-					$wgContLang->specialPage( $this->name ),
+				$out2 .= " | " . $sk->makeKnownLinkObj(
+					$self,
 					wfMsgHtml( 'nextpage', htmlspecialchars( $s->page_title ) ),
-					"from=" . wfUrlEncode ( $s->page_title ) .
-					"&prefix=" . wfUrlEncode ( $prefix ) . $namespaceparam );
+					"from=" . wfUrlEncode( $s->page_title ) .
+					"&prefix=" . wfUrlEncode( $prefix ) . $namespaceparam );
 			}
 			$out2 .= "</td></tr></table><hr />";
 		}
 
-		$wgOut->addHtml( $out2 . $out );
+		$wgOut->addHTML( $out2 . $out );
 	}
 }
diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index 3025c055..4e56ca42 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -16,7 +16,6 @@ class ProtectedPagesForm {
 	public function showList( $msg = '' ) {
 		global $wgOut, $wgRequest;
 
-		$wgOut->setPagetitle( wfMsg( "protectedpages" ) );
 		if ( "" != $msg ) {
 			$wgOut->setSubtitle( $msg );
 		}
@@ -32,10 +31,11 @@ class ProtectedPagesForm {
 		$size = $wgRequest->getIntOrNull( 'size' );
 		$NS = $wgRequest->getIntOrNull( 'namespace' );
 		$indefOnly = $wgRequest->getBool( 'indefonly' ) ? 1 : 0;
+		$cascadeOnly = $wgRequest->getBool('cascadeonly') ? 1 : 0;
 
-		$pager = new ProtectedPagesPager( $this, array(), $type, $level, $NS, $sizetype, $size, $indefOnly );
+		$pager = new ProtectedPagesPager( $this, array(), $type, $level, $NS, $sizetype, $size, $indefOnly, $cascadeOnly );
 
-		$wgOut->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size, $indefOnly ) );
+		$wgOut->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size, $indefOnly, $cascadeOnly ) );
 
 		if ( $pager->getNumRows() ) {
 			$s = $pager->getNavigationBar();
@@ -83,7 +83,7 @@ class ProtectedPagesForm {
 		if ( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) {
 			$expiry = Block::decodeExpiry( $row->pr_expiry );
 
-			$expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) );
+			$expiry_description = wfMsg( 'protect-expiring' , $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
 
 			$description_items[] = $expiry_description;
 		}
@@ -111,21 +111,24 @@ class ProtectedPagesForm {
 	 * @param $level string
 	 * @param $minsize int
 	 * @param $indefOnly bool
+	 * @param $cascadeOnly bool
 	 * @return string Input form
 	 * @private
 	 */
-	protected function showOptions( $namespace, $type='edit', $level, $sizetype, $size, $indefOnly ) {
+	protected function showOptions( $namespace, $type='edit', $level, $sizetype, $size, $indefOnly, $cascadeOnly ) {
 		global $wgScript;
 		$title = SpecialPage::getTitleFor( 'ProtectedPages' );
 		return Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) .
 			Xml::openElement( 'fieldset' ) .
 			Xml::element( 'legend', array(), wfMsg( 'protectedpages' ) ) .
-			Xml::hidden( 'title', $title->getPrefixedDBkey() ) . "&nbsp;\n" .
+			Xml::hidden( 'title', $title->getPrefixedDBkey() ) . "\n" .
 			$this->getNamespaceMenu( $namespace ) . "&nbsp;\n" .
 			$this->getTypeMenu( $type ) . "&nbsp;\n" .
 			$this->getLevelMenu( $level ) . "&nbsp;\n" .
-			"<br /><span style='white-space: nowrap'>&nbsp;&nbsp;" .
+			"<br/><span style='white-space: nowrap'>" .
 			$this->getExpiryCheck( $indefOnly ) . "&nbsp;\n" .
+			$this->getCascadeCheck( $cascadeOnly ) . "&nbsp;\n" .
+			"</span><br/><span style='white-space: nowrap'>" .
 			$this->getSizeLimit( $sizetype, $size ) . "&nbsp;\n" .
 			"</span>" .
 			"&nbsp;" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
@@ -153,6 +156,14 @@ class ProtectedPagesForm {
 		return
 			Xml::checkLabel( wfMsg('protectedpages-indef'), 'indefonly', 'indefonly', $indefOnly ) . "\n";
 	}
+	
+	/**
+	 * @return string Formatted HTML
+	 */
+	protected function getCascadeCheck( $cascadeOnly ) {
+		return
+			Xml::checkLabel( wfMsg('protectedpages-cascade'), 'cascadeonly', 'cascadeonly', $cascadeOnly ) . "\n";
+	}
 
 	/**
 	 * @return string Formatted HTML
@@ -237,7 +248,8 @@ class ProtectedPagesPager extends AlphabeticPager {
 	public $mForm, $mConds;
 	private $type, $level, $namespace, $sizetype, $size, $indefonly;
 
-	function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', $size=0, $indefonly=false ) {
+	function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', 
+							$size=0, $indefonly = false, $cascadeonly = false ) {
 		$this->mForm = $form;
 		$this->mConds = $conds;
 		$this->type = ( $type ) ? $type : 'edit';
@@ -246,6 +258,7 @@ class ProtectedPagesPager extends AlphabeticPager {
 		$this->sizetype = $sizetype;
 		$this->size = intval($size);
 		$this->indefonly = (bool)$indefonly;
+		$this->cascadeonly = (bool)$cascadeonly;
 		parent::__construct();
 	}
 
@@ -281,6 +294,9 @@ class ProtectedPagesPager extends AlphabeticPager {
 		if( $this->indefonly ) {
 			$conds[] = "pr_expiry = 'infinity' OR pr_expiry IS NULL";
 		}
+		if ( $this->cascadeonly ) {
+			$conds[] = "pr_cascade = '1'";
+		}
 
 		if( $this->level )
 			$conds[] = 'pr_level=' . $this->mDb->addQuotes( $this->level );
diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index 2ec68a66..7e8126d9 100644
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -16,7 +16,6 @@ class ProtectedTitlesForm {
 	function showList( $msg = '' ) {
 		global $wgOut, $wgRequest;
 
-		$wgOut->setPagetitle( wfMsg( "protectedtitles" ) );
 		if ( "" != $msg ) {
 			$wgOut->setSubtitle( $msg );
 		}
@@ -75,7 +74,7 @@ class ProtectedTitlesForm {
 		if ( $row->pt_expiry != 'infinity' && strlen($row->pt_expiry) ) {
 			$expiry = Block::decodeExpiry( $row->pt_expiry );
 
-			$expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) );
+			$expiry_description = wfMsg( 'protect-expiring', $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
 
 			$description_items[] = $expiry_description;
 		}
@@ -102,7 +101,7 @@ class ProtectedTitlesForm {
 			Xml::element( 'legend', array(), wfMsg( 'protectedtitles' ) ) .
 			Xml::hidden( 'title', $special ) . "&nbsp;\n" .
 			$this->getNamespaceMenu( $namespace ) . "&nbsp;\n" .
-			// $this->getLevelMenu( $level ) . "<br/>\n" .
+			$this->getLevelMenu( $level ) . "&nbsp;\n" .
 			"&nbsp;" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
 			"</fieldset></form>";
 	}
@@ -137,7 +136,10 @@ class ProtectedTitlesForm {
 				$m[$text] = $type;
 			}
 		}
-
+		// Is there only one level (aside from "all")?
+		if( count($m) <= 2 ) {
+			return '';
+		}
 		// Third pass generates sorted XHTML content
 		foreach( $m as $text => $type ) {
 			$selected = ($type == $pr_level );
@@ -190,7 +192,8 @@ class ProtectedtitlesPager extends AlphabeticPager {
 	function getQueryInfo() {
 		$conds = $this->mConds;
 		$conds[] = 'pt_expiry>' . $this->mDb->addQuotes( $this->mDb->timestamp() );
-
+		if( $this->level )
+			$conds['pt_create_perm'] = $this->level;
 		if( !is_null($this->namespace) )
 			$conds[] = 'pt_namespace=' . $this->mDb->addQuotes( $this->namespace );
 		return array(
diff --git a/includes/specials/SpecialRandompage.php b/includes/specials/SpecialRandompage.php
index 0e7ada1d..f4bff30b 100644
--- a/includes/specials/SpecialRandompage.php
+++ b/includes/specials/SpecialRandompage.php
@@ -8,19 +8,23 @@
  * @license GNU General Public Licence 2.0 or later
  */
 class RandomPage extends SpecialPage {
-	private $namespace = NS_MAIN;  // namespace to select pages from
+	private $namespaces;  // namespaces to select pages from
 
 	function __construct( $name = 'Randompage' ){
+		global $wgContentNamespaces;
+
+		$this->namespaces = $wgContentNamespaces;
+
 		parent::__construct( $name );
 	}
 
-	public function getNamespace() {
-		return $this->namespace;
+	public function getNamespaces() {
+		return $this->namespaces;
 	}
 
 	public function setNamespace ( $ns ) {
 		if( $ns < NS_MAIN ) $ns = NS_MAIN;
-		$this->namespace = $ns;
+		$this->namespaces = array( $ns );
 	}
 
 	// select redirects instead of normal pages?
@@ -39,7 +43,7 @@ class RandomPage extends SpecialPage {
 
 		if( is_null( $title ) ) {
 			$this->setHeaders();
-			$wgOut->addWikiMsg( strtolower( $this->mName ) . '-nopages' );
+			$wgOut->addWikiMsg( strtolower( $this->mName ) . '-nopages',  $wgContLang->getNsText( $this->namespace ) );
 			return;
 		}
 
@@ -67,7 +71,7 @@ class RandomPage extends SpecialPage {
 			$row = $this->selectRandomPageFromDB( "0" );
 
 		if( $row )
-			return Title::makeTitleSafe( $this->namespace, $row->page_title );
+			return Title::makeTitleSafe( $row->page_namespace, $row->page_title );
 		else
 			return null;
 	}
@@ -81,13 +85,13 @@ class RandomPage extends SpecialPage {
 		$use_index = $dbr->useIndexClause( 'page_random' );
 		$page = $dbr->tableName( 'page' );
 
-		$ns = (int) $this->namespace;
+		$ns = implode( ",", $this->namespaces );
 		$redirect = $this->isRedirect() ? 1 : 0;
 
 		$extra = $wgExtraRandompageSQL ? "AND ($wgExtraRandompageSQL)" : "";
-		$sql = "SELECT page_title
+		$sql = "SELECT page_title, page_namespace
 			FROM $page $use_index
-			WHERE page_namespace = $ns
+			WHERE page_namespace IN ( $ns )
 			AND page_is_redirect = $redirect
 			AND page_random >= $randstr
 			$extra
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index cb718bdc..8c14e1fc 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -6,7 +6,7 @@
  */
 class SpecialRecentChanges extends SpecialPage {
 	public function __construct() {
-  		SpecialPage::SpecialPage( 'Recentchanges' );
+  		parent::__construct( 'Recentchanges' );
 		$this->includable( true );
 	}
 
@@ -16,13 +16,14 @@ class SpecialRecentChanges extends SpecialPage {
 	 * @return FormOptions
 	 */
 	public function getDefaultOptions() {
+		global $wgUser;
 		$opts = new FormOptions();
 
-		$opts->add( 'days',  (int)User::getDefaultOption( 'rcdays' ) );
-		$opts->add( 'limit', (int)User::getDefaultOption( 'rclimit' ) );
+		$opts->add( 'days',  (int)$wgUser->getOption( 'rcdays' ) );
+		$opts->add( 'limit', (int)$wgUser->getOption( 'rclimit' ) );
 		$opts->add( 'from', '' );
 
-		$opts->add( 'hideminor',     false );
+		$opts->add( 'hideminor',     (bool)$wgUser->getOption( 'hideminor' ) );
 		$opts->add( 'hidebots',      true  );
 		$opts->add( 'hideanons',     false );
 		$opts->add( 'hideliu',       false );
@@ -34,7 +35,6 @@ class SpecialRecentChanges extends SpecialPage {
 
 		$opts->add( 'categories', '' );
 		$opts->add( 'categories_any', false );
-
 		return $opts;
 	}
 
@@ -44,16 +44,13 @@ class SpecialRecentChanges extends SpecialPage {
 	 * @return FormOptions
 	 */
 	public function setup( $parameters ) {
-		global $wgUser, $wgRequest;
+		global $wgRequest;
 
 		$opts = $this->getDefaultOptions();
-		$opts['days'] = (int)$wgUser->getOption( 'rcdays', $opts['days'] );
-		$opts['limit'] = (int)$wgUser->getOption( 'rclimit', $opts['limit'] );
-		$opts['hideminor'] = $wgUser->getOption( 'hideminor', $opts['hideminor'] );
 		$opts->fetchValuesFromRequest( $wgRequest );
 
 		// Give precedence to subpage syntax
-		if ( $parameters !== null ) {
+		if( $parameters !== null ) {
 			$this->parseParameters( $parameters, $opts );
 		}
 
@@ -85,9 +82,9 @@ class SpecialRecentChanges extends SpecialPage {
 
 		# 10 seconds server-side caching max
 		$wgOut->setSquidMaxage( 10 );
-
+		# Check if the client has a cached version
 		$lastmod = $this->checkLastModified( $feedFormat );
-		if( $lastmod === false ){
+		if( $lastmod === false ) {
 			return;
 		}
 
@@ -97,33 +94,32 @@ class SpecialRecentChanges extends SpecialPage {
 
 		// Fetch results, prepare a batch link existence check query
 		$rows = array();
-		$batch = new LinkBatch;
 		$conds = $this->buildMainQueryConds( $opts );
-		$res = $this->doMainQuery( $conds, $opts );
-		if( $res === false ){
-			$this->doHeader( $opts );
+		$rows = $this->doMainQuery( $conds, $opts );
+		if( $rows === false ){
+			if( !$this->including() ) {
+				$this->doHeader( $opts );
+			}
 			return;
 		}
-		$dbr = wfGetDB( DB_SLAVE );
-		while( $row = $dbr->fetchObject( $res ) ){
-			$rows[] = $row;
-			if ( !$feedFormat ) {
-				// User page and talk links
+
+		if( !$feedFormat ) {
+			$batch = new LinkBatch;
+			foreach( $rows as $row ) {
 				$batch->add( NS_USER, $row->rc_user_text  );
 				$batch->add( NS_USER_TALK, $row->rc_user_text  );
 			}
-
+			$batch->execute();
 		}
-		$dbr->freeResult( $res );
 
-		if ( $feedFormat ) {
+		if( $feedFormat ) {
 			list( $feed, $feedObj ) = $this->getFeedObject( $feedFormat );
 			$feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $lastmod );
 		} else {
-			$batch->execute();
 			$this->webOutput( $rows, $opts );
 		}
-  	
+
+		$rows->free();
 	}
 
 	/**
@@ -149,21 +145,21 @@ class SpecialRecentChanges extends SpecialPage {
 	 */
 	public function parseParameters( $par, FormOptions $opts ) {
 		$bits = preg_split( '/\s*,\s*/', trim( $par ) );
-		foreach ( $bits as $bit ) {
-			if ( 'hidebots' === $bit ) $opts['hidebots'] = true;
-			if ( 'bots' === $bit ) $opts['hidebots'] = false;
-			if ( 'hideminor' === $bit ) $opts['hideminor'] = true;
-			if ( 'minor' === $bit ) $opts['hideminor'] = false;
-			if ( 'hideliu' === $bit ) $opts['hideliu'] = true;
-			if ( 'hidepatrolled' === $bit ) $opts['hidepatrolled'] = true;
-			if ( 'hideanons' === $bit ) $opts['hideanons'] = true;
-			if ( 'hidemyself' === $bit ) $opts['hidemyself'] = true;
-
-			if ( is_numeric( $bit ) ) $opts['limit'] =  $bit;
+		foreach( $bits as $bit ) {
+			if( 'hidebots' === $bit ) $opts['hidebots'] = true;
+			if( 'bots' === $bit ) $opts['hidebots'] = false;
+			if( 'hideminor' === $bit ) $opts['hideminor'] = true;
+			if( 'minor' === $bit ) $opts['hideminor'] = false;
+			if( 'hideliu' === $bit ) $opts['hideliu'] = true;
+			if( 'hidepatrolled' === $bit ) $opts['hidepatrolled'] = true;
+			if( 'hideanons' === $bit ) $opts['hideanons'] = true;
+			if( 'hidemyself' === $bit ) $opts['hidemyself'] = true;
+
+			if( is_numeric( $bit ) ) $opts['limit'] =  $bit;
 
 			$m = array();
-			if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) $opts['limit'] = $m[1];
-			if ( preg_match( '/^days=(\d+)$/', $bit, $m ) ) $opts['days'] = $m[1];
+			if( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) $opts['limit'] = $m[1];
+			if( preg_match( '/^days=(\d+)$/', $bit, $m ) ) $opts['days'] = $m[1];
 		}
 	}
 
@@ -173,14 +169,14 @@ class SpecialRecentChanges extends SpecialPage {
 	 * update the timestamp
 	 *
 	 * @param $feedFormat String
-	 * @return int or false
+	 * @return string or false
 	 */
 	public function checkLastModified( $feedFormat ) {
 		global $wgUseRCPatrol, $wgOut;
 		$dbr = wfGetDB( DB_SLAVE );
 		$lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, __FUNCTION__ );
-		if ( $feedFormat || !$wgUseRCPatrol ) {
-			if( $lastmod && $wgOut->checkLastModified( $lastmod ) ){
+		if( $feedFormat || !$wgUseRCPatrol ) {
+			if( $lastmod && $wgOut->checkLastModified( $lastmod ) ) {
 				# Client cache fresh and headers sent, nothing more to do.
 				return false;
 			}
@@ -232,12 +228,12 @@ class SpecialRecentChanges extends SpecialPage {
 		$hideLoggedInUsers = $opts['hideliu'] && !$forcebot;
 		$hideAnonymousUsers = $opts['hideanons'] && !$forcebot;
 
-		if ( $opts['hideminor'] )  $conds['rc_minor'] = 0;
-		if ( $opts['hidebots'] )   $conds['rc_bot'] = 0;
-		if ( $hidePatrol )         $conds['rc_patrolled'] = 0;
-		if ( $forcebot )           $conds['rc_bot'] = 1;
-		if ( $hideLoggedInUsers )  $conds[] = 'rc_user = 0';
-		if ( $hideAnonymousUsers ) $conds[] = 'rc_user != 0';
+		if( $opts['hideminor'] )  $conds['rc_minor'] = 0;
+		if( $opts['hidebots'] )   $conds['rc_bot'] = 0;
+		if( $hidePatrol )         $conds['rc_patrolled'] = 0;
+		if( $forcebot )           $conds['rc_bot'] = 1;
+		if( $hideLoggedInUsers )  $conds[] = 'rc_user = 0';
+		if( $hideAnonymousUsers ) $conds[] = 'rc_user != 0';
 
 		if( $opts['hidemyself'] ) {
 			if( $wgUser->getId() ) {
@@ -248,8 +244,8 @@ class SpecialRecentChanges extends SpecialPage {
 		}
 
 		# Namespace filtering
-		if ( $opts['namespace'] !== '' ) {
-			if ( !$opts['invert'] ) {
+		if( $opts['namespace'] !== '' ) {
+			if( !$opts['invert'] ) {
 				$conds[] = 'rc_namespace = ' . $dbr->addQuotes( $opts['namespace'] );
 			} else {
 				$conds[] = 'rc_namespace != ' . $dbr->addQuotes( $opts['namespace'] );
@@ -281,7 +277,8 @@ class SpecialRecentChanges extends SpecialPage {
 		// JOIN on watchlist for users
 		if( $uid ) {
 			$tables[] = 'watchlist';
-			$join_conds = array( 'watchlist' => array('LEFT JOIN',"wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace") );
+			$join_conds = array( 'watchlist' => array('LEFT JOIN',
+				"wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace") );
 		}
 
 		wfRunHooks('SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts ) );
@@ -329,7 +326,7 @@ class SpecialRecentChanges extends SpecialPage {
 
 		$limit = $opts['limit'];
 
-		if ( !$this->including() ) {
+		if( !$this->including() ) {
 			// Output options box
 			$this->doHeader( $opts );
 		}
@@ -337,55 +334,46 @@ class SpecialRecentChanges extends SpecialPage {
 		// And now for the content
 		$wgOut->setSyndicated( true );
 
-		$list = ChangesList::newFromUser( $wgUser );
-
-		if ( $wgAllowCategorizedRecentChanges ) {
+		if( $wgAllowCategorizedRecentChanges ) {
 			$this->filterByCategories( $rows, $opts );
 		}
 
-		$s = $list->beginRecentChangesList();
-		$counter = 1;
-
 		$showWatcherCount = $wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' );
 		$watcherCache = array();
 
 		$dbr = wfGetDB( DB_SLAVE );
 
-		foreach( $rows as $obj ){
-			if( $limit == 0) {
-				break;
-			}
-
-			if ( ! ( $opts['hideminor']     && $obj->rc_minor     ) &&
-			     ! ( $opts['hidepatrolled'] && $obj->rc_patrolled ) ) {
-				$rc = RecentChange::newFromRow( $obj );
-				$rc->counter = $counter++;
-
-				if ($wgShowUpdatedMarker
-					&& !empty( $obj->wl_notificationtimestamp )
-					&& ($obj->rc_timestamp >= $obj->wl_notificationtimestamp)) {
-						$rc->notificationtimestamp = true;
-				} else {
-					$rc->notificationtimestamp = false;
-				}
+		$counter = 1;
+		$list = ChangesList::newFromUser( $wgUser );
 
-				$rc->numberofWatchingusers = 0; // Default
-				if ($showWatcherCount && $obj->rc_namespace >= 0) {
-					if (!isset($watcherCache[$obj->rc_namespace][$obj->rc_title])) {
-						$watcherCache[$obj->rc_namespace][$obj->rc_title] =
-						 	$dbr->selectField( 'watchlist',
-								'COUNT(*)',
-								array(
-									'wl_namespace' => $obj->rc_namespace,
-									'wl_title' => $obj->rc_title,
-								),
-								__METHOD__ . '-watchers' );
-					}
-					$rc->numberofWatchingusers = $watcherCache[$obj->rc_namespace][$obj->rc_title];
+		$s = $list->beginRecentChangesList();
+		foreach( $rows as $obj ) {
+			if( $limit == 0 ) break;
+			$rc = RecentChange::newFromRow( $obj );
+			$rc->counter = $counter++;
+			# Check if the page has been updated since the last visit
+			if( $wgShowUpdatedMarker && !empty($obj->wl_notificationtimestamp) ) {
+				$rc->notificationtimestamp = ($obj->rc_timestamp >= $obj->wl_notificationtimestamp);
+			} else {
+				$rc->notificationtimestamp = false; // Default
+			}
+			# Check the number of users watching the page
+			$rc->numberofWatchingusers = 0; // Default
+			if( $showWatcherCount && $obj->rc_namespace >= 0 ) {
+				if( !isset($watcherCache[$obj->rc_namespace][$obj->rc_title]) ) {
+					$watcherCache[$obj->rc_namespace][$obj->rc_title] =
+						 $dbr->selectField( 'watchlist',
+							'COUNT(*)',
+							array(
+								'wl_namespace' => $obj->rc_namespace,
+								'wl_title' => $obj->rc_title,
+							),
+							__METHOD__ . '-watchers' );
 				}
-				$s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
-				--$limit;
+				$rc->numberofWatchingusers = $watcherCache[$obj->rc_namespace][$obj->rc_title];
 			}
+			$s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
+			--$limit;
 		}
 		$s .= $list->endRecentChangesList();
 		$wgOut->addHTML( $s );
@@ -411,22 +399,29 @@ class SpecialRecentChanges extends SpecialPage {
 		$panel[] = '<hr />';
 
 		$extraOpts = $this->getExtraOptions( $opts );
+		$extraOptsCount = count( $extraOpts );
+		$count = 0;
+		$submit = ' ' . Xml::submitbutton( wfMsg( 'allpagessubmit' ) );
+
+		$out = Xml::openElement( 'table', array( 'class' => 'mw-recentchanges-table' ) );
+		foreach( $extraOpts as $optionRow ) {
+			# Add submit button to the last row only
+			++$count;
+			$addSubmit = $count === $extraOptsCount ? $submit : '';
 
-		$out = Xml::openElement( 'table' );
-		foreach ( $extraOpts as $optionRow ) {
 			$out .= Xml::openElement( 'tr' );
-			if ( is_array($optionRow) ) {
-				$out .= Xml::tags( 'td', null, $optionRow[0] );
-				$out .= Xml::tags( 'td', null, $optionRow[1] );
+			if( is_array( $optionRow ) ) {
+				$out .= Xml::tags( 'td', array( 'class' => 'mw-label' ), $optionRow[0] );
+				$out .= Xml::tags( 'td', array( 'class' => 'mw-input' ), $optionRow[1] . $addSubmit );
 			} else {
-				$out .= Xml::tags( 'td', array( 'colspan' => 2 ), $optionRow );
+				$out .= Xml::tags( 'td', array( 'class' => 'mw-input', 'colspan' => 2 ), $optionRow . $addSubmit );
 			}
 			$out .= Xml::closeElement( 'tr' );
 		}
 		$out .= Xml::closeElement( 'table' );
 
 		$unconsumed = $opts->getUnconsumedValues();
-		foreach ( $unconsumed as $key => $value ) {
+		foreach( $unconsumed as $key => $value ) {
 			$out .= Xml::hidden( $key, $value );
 		}
 
@@ -437,7 +432,7 @@ class SpecialRecentChanges extends SpecialPage {
 		$panelString = implode( "\n", $panel );
 
 		$wgOut->addHTML(
-			Xml::fieldset( wfMsg( strtolower( $this->mName )  ), $panelString, array( 'class' => 'rcoptions' ) )
+			Xml::fieldset( wfMsg( 'recentchanges-legend' ), $panelString, array( 'class' => 'rcoptions' ) )
 		);
 
 		$this->setBottomText( $wgOut, $opts );
@@ -454,12 +449,11 @@ class SpecialRecentChanges extends SpecialPage {
 		$extraOpts['namespace'] = $this->namespaceFilterForm( $opts );
 
 		global $wgAllowCategorizedRecentChanges;
-		if ( $wgAllowCategorizedRecentChanges ) {
+		if( $wgAllowCategorizedRecentChanges ) {
 			$extraOpts['category'] = $this->categoryFilterForm( $opts );
 		}
 
 		wfRunHooks( 'SpecialRecentChangesPanel', array( &$extraOpts, $opts ) );
-		$extraOpts['submit'] = Xml::submitbutton( wfMsg('allpagessubmit') );
 		return $extraOpts;
 	}
 
@@ -469,7 +463,7 @@ class SpecialRecentChanges extends SpecialPage {
 	 * @param $out OutputPage
 	 * @param $opts FormOptions
 	 */
-	function setTopText( &$out, $opts ){
+	function setTopText( OutputPage $out, FormOptions $opts ){
 		$out->addWikiText( wfMsgForContentNoTrans( 'recentchangestext' ) );
 	}
 
@@ -480,7 +474,7 @@ class SpecialRecentChanges extends SpecialPage {
 	 * @param $out OutputPage
 	 * @param $opts FormOptions
 	 */
-	function setBottomText( &$out, $opts ){}
+	function setBottomText( OutputPage $out, FormOptions $opts ){}
 
 	/**
 	 * Creates the choose namespace selection
@@ -489,7 +483,7 @@ class SpecialRecentChanges extends SpecialPage {
 	 * @return string
 	 */
 	protected function namespaceFilterForm( FormOptions $opts ) {
-		$nsSelect = HTMLnamespaceselector( $opts['namespace'], '' );
+		$nsSelect = Xml::namespaceSelector( $opts['namespace'], '' );
 		$nsLabel = Xml::label( wfMsg('namespace'), 'namespace' );
 		$invert = Xml::checkLabel( wfMsg('invert'), 'invert', 'nsinvert', $opts['invert'] );
 		return array( $nsLabel, "$nsSelect $invert" );
@@ -526,30 +520,30 @@ class SpecialRecentChanges extends SpecialPage {
 
 		# Filter categories
 		$cats = array();
-		foreach ( $categories as $cat ) {
+		foreach( $categories as $cat ) {
 			$cat = trim( $cat );
-			if ( $cat == "" ) continue;
+			if( $cat == "" ) continue;
 			$cats[] = $cat;
 		}
 
 		# Filter articles
 		$articles = array();
 		$a2r = array();
-		foreach ( $rows AS $k => $r ) {
+		foreach( $rows AS $k => $r ) {
 			$nt = Title::makeTitle( $r->rc_namespace, $r->rc_title );
 			$id = $nt->getArticleID();
-			if ( $id == 0 ) continue; # Page might have been deleted...
-			if ( !in_array($id, $articles) ) {
+			if( $id == 0 ) continue; # Page might have been deleted...
+			if( !in_array($id, $articles) ) {
 				$articles[] = $id;
 			}
-			if ( !isset($a2r[$id]) ) {
+			if( !isset($a2r[$id]) ) {
 				$a2r[$id] = array();
 			}
 			$a2r[$id][] = $k;
 		}
 
 		# Shortcut?
-		if ( !count($articles) || !count($cats) )
+		if( !count($articles) || !count($cats) )
 			return ;
 
 		# Look up
@@ -559,8 +553,8 @@ class SpecialRecentChanges extends SpecialPage {
 
 		# Filter
 		$newrows = array();
-		foreach ( $match AS $id ) {
-			foreach ( $a2r[$id] AS $rev ) {
+		foreach( $match AS $id ) {
+			foreach( $a2r[$id] AS $rev ) {
 				$k = $rev;
 				$newrows[$k] = $rows[$k];
 			}
@@ -577,8 +571,9 @@ class SpecialRecentChanges extends SpecialPage {
 	function makeOptionsLink( $title, $override, $options, $active = false ) {
 		global $wgUser;
 		$sk = $wgUser->getSkin();
-		return $sk->makeKnownLinkObj( $this->getTitle(), htmlspecialchars( $title ),
-			wfArrayToCGI( $override, $options ), '', '', $active ? 'style="font-weight: bold;"' : '' );
+		$params = $override + $options;
+		return $sk->link( $this->getTitle(), htmlspecialchars( $title ),
+			( $active ? array( 'style'=>'font-weight: bold;' ) : array() ), $params, array( 'known' ) );
 	}
 
 	/**
@@ -591,43 +586,41 @@ class SpecialRecentChanges extends SpecialPage {
 
 		$options = $nondefaults + $defaults;
 
-		if( $options['from'] )
-			$note = wfMsgExt( 'rcnotefrom', array( 'parseinline' ),
+		$note = '';
+		if( $options['from'] ) {
+			$note .= wfMsgExt( 'rcnotefrom', array( 'parseinline' ),
 				$wgLang->formatNum( $options['limit'] ),
-				$wgLang->timeanddate( $options['from'], true ) );
-		else
-			$note = wfMsgExt( 'rcnote', array( 'parseinline' ),
-				$wgLang->formatNum( $options['limit'] ),
-				$wgLang->formatNum( $options['days'] ),
-				$wgLang->timeAndDate( wfTimestampNow(), true ),
-				$wgLang->date( wfTimestampNow(), true ),
-				$wgLang->time( wfTimestampNow(), true ) );
+				$wgLang->timeanddate( $options['from'], true ) ) . '<br />';
+		}
+		if( !wfEmptyMsg( 'rclegend', wfMsg('rclegend') ) ) {
+			$note .= wfMsgExt( 'rclegend', array('parseinline') ) . '<br />';
+		}
 
 		# Sort data for display and make sure it's unique after we've added user data.
 		$wgRCLinkLimits[] = $options['limit'];
 		$wgRCLinkDays[] = $options['days'];
-		sort($wgRCLinkLimits);
-		sort($wgRCLinkDays);
-		$wgRCLinkLimits = array_unique($wgRCLinkLimits);
-		$wgRCLinkDays = array_unique($wgRCLinkDays);
+		sort( $wgRCLinkLimits );
+		sort( $wgRCLinkDays );
+		$wgRCLinkLimits = array_unique( $wgRCLinkLimits );
+		$wgRCLinkDays = array_unique( $wgRCLinkDays );
 
 		// limit links
 		foreach( $wgRCLinkLimits as $value ) {
 			$cl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ),
 				array( 'limit' => $value ), $nondefaults, $value == $options['limit'] ) ;
 		}
-		$cl = implode( ' | ', $cl);
+		$cl = implode( ' | ', $cl );
 
 		// day links, reset 'from' to none
 		foreach( $wgRCLinkDays as $value ) {
 			$dl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ),
 				array( 'days' => $value, 'from' => '' ), $nondefaults, $value == $options['days'] ) ;
 		}
-		$dl = implode( ' | ', $dl);
+		$dl = implode( ' | ', $dl );
 
 
 		// show/hide links
-		$showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ));
+		$showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ) );
 		$minorLink = $this->makeOptionsLink( $showhide[1-$options['hideminor']],
 			array( 'hideminor' => 1-$options['hideminor'] ), $nondefaults);
 		$botLink = $this->makeOptionsLink( $showhide[1-$options['hidebots']],
@@ -652,11 +645,11 @@ class SpecialRecentChanges extends SpecialPage {
 
 		// show from this onward link
 		$now = $wgLang->timeanddate( wfTimestampNow(), true );
-		$tl =  $this->makeOptionsLink( $now, array( 'from' => wfTimestampNow()), $nondefaults );
+		$tl =  $this->makeOptionsLink( $now, array( 'from' => wfTimestampNow() ), $nondefaults );
 
-		$rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter'),
+		$rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter' ),
 			$cl, $dl, $hl );
-		$rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter'), $tl );
-		return "$note<br />$rclinks<br />$rclistfrom";
+		$rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter' ), $tl );
+		return "{$note}$rclinks<br />$rclistfrom";
 	}
 }
diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index d773fb77..c0734354 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -7,7 +7,8 @@
 class SpecialRecentchangeslinked extends SpecialRecentchanges {
 
 	function __construct(){
-		SpecialPage::SpecialPage( 'Recentchangeslinked' );	
+		SpecialPage::SpecialPage( 'Recentchangeslinked' );
+		$this->includable( true );
 	}
 
 	public function getDefaultOptions() {
@@ -92,10 +93,13 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 		} else {
 			// for now, always join on these tables; really should be configurable as in whatlinkshere
 			$link_tables = array( 'pagelinks', 'templatelinks' );
-			// imagelinks only contains links to pages in NS_IMAGE
-			if( $ns == NS_IMAGE || !$showlinkedto ) $link_tables[] = 'imagelinks';
+			// imagelinks only contains links to pages in NS_FILE
+			if( $ns == NS_FILE || !$showlinkedto ) $link_tables[] = 'imagelinks';
 		}
 
+		if( $id == 0 && !$showlinkedto )
+			return false; // nonexistent pages can't link to any pages
+
 		// field name prefixes for all the various tables we might want to join with
 		$prefix = array( 'pagelinks' => 'pl', 'templatelinks' => 'tl', 'categorylinks' => 'cl', 'imagelinks' => 'il' );
 
@@ -105,7 +109,7 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 			$pfx = $prefix[$link_table];
 
 			// imagelinks and categorylinks tables have no xx_namespace field, and have xx_to instead of xx_title
-			if( $link_table == 'imagelinks' ) $link_ns = NS_IMAGE;
+			if( $link_table == 'imagelinks' ) $link_ns = NS_FILE;
 			else if( $link_table == 'categorylinks' ) $link_ns = NS_CATEGORY;
 			else $link_ns = 0;
 
@@ -145,7 +149,7 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 
 		$res = $dbr->query( $sql, __METHOD__ );
 
-		if( $dbr->numRows( $res ) == 0 )
+		if( $res->numRows() == 0 )
 			$this->mResultEmpty = true;
 
 		return $res;
@@ -159,17 +163,21 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 			Xml::input( 'target', 40, str_replace('_',' ',$opts['target']) ) .
 			Xml::check( 'showlinkedto', $opts['showlinkedto'], array('id' => 'showlinkedto') ) . ' ' .
 			Xml::label( wfMsg("recentchangeslinked-to"), 'showlinkedto' ) );
-		$extraOpts['submit'] = Xml::submitbutton( wfMsg('allpagessubmit') );
 		return $extraOpts;
 	}
-	
-	function setTopText( &$out, $opts ){}
-	
-	function setBottomText( &$out, $opts ){
+
+	function setTopText( OutputPage $out, FormOptions $opts ) {
+		global $wgUser;
+		$skin = $wgUser->getSkin();
+		if( isset( $this->mTargetTitle ) && is_object( $this->mTargetTitle ) )
+			$out->setSubtitle( wfMsg( 'recentchangeslinked-backlink', $skin->link( $this->mTargetTitle,
+				$this->mTargetTitle->getPrefixedText(), array(), array( 'redirect' => 'no'  ) ) ) );
+	}
+
+	function setBottomText( OutputPage $out, FormOptions $opts ){
 		if( isset( $this->mTargetTitle ) && is_object( $this->mTargetTitle ) ){
 			global $wgUser;
 			$out->setFeedAppendQuery( "target=" . urlencode( $this->mTargetTitle->getPrefixedDBkey() ) );
-			$out->addHTML("&lt; ".$wgUser->getSkin()->makeLinkObj( $this->mTargetTitle, "", "redirect=no" )."<hr />\n");
 		}
 		if( isset( $this->mResultEmpty ) && $this->mResultEmpty ){
 			$out->addWikiMsg( 'recentchangeslinked-noresult' );	
diff --git a/includes/specials/SpecialRemoveRestrictions.php b/includes/specials/SpecialRemoveRestrictions.php
new file mode 100644
index 00000000..ded6cbe3
--- /dev/null
+++ b/includes/specials/SpecialRemoveRestrictions.php
@@ -0,0 +1,60 @@
+<?php
+
+function wfSpecialRemoveRestrictions() {
+	global $wgOut, $wgRequest, $wgUser, $wgLang, $wgTitle;
+	$sk = $wgUser->getSkin();
+
+	$id = $wgRequest->getVal( 'id' );
+	if( !is_numeric( $id ) ) {
+		$wgOut->addWikiMsg( 'removerestrictions-noid' );
+		return;
+	}
+
+	UserRestriction::purgeExpired();
+	$r = UserRestriction::newFromId( $id, true );
+	if( !$r ) {
+		$wgOut->addWikiMsg( 'removerestrictions-wrongid' );
+		return;
+	}
+
+	$form = array();
+	$form['removerestrictions-user'] = $sk->userLink( $r->getSubjectId(), $r->getSubjectText() ) .
+		$sk->userToolLinks( $r->getSubjectId(), $r->getSubjectText() );
+	$form['removerestrictions-type'] = UserRestriction::formatType( $r->getType() );
+	if( $r->isPage() )
+		$form['removerestrictions-page'] = $sk->link( $r->getPage() );
+	if( $r->isNamespace() )
+		$form['removerestrictions-namespace'] = $wgLang->getDisplayNsText( $r->getNamespace() );
+	$form['removerestrictions-reason'] = Xml::input( 'reason' );
+
+	$result = null;
+	if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal( 'edittoken' ) ) )
+		$result = wfSpecialRemoveRestrictionsProcess( $r );
+
+	$wgOut->addWikiMsg( 'removerestrictions-intro' );
+	$wgOut->addHTML( Xml::fieldset( wfMsgHtml( 'removerestrictions-legend' ) ) );
+	if( $result )
+		$wgOut->addHTML( '<strong class="success">' . wfMsgExt( 'removerestrictions-success',
+			'parseinline', $r->getSubjectText() ) . '</strong>' );
+	$wgOut->addHTML( Xml::openElement( 'form', array( 'action' => $wgTitle->getLocalUrl( array( 'id' => $id ) ),
+		'method' => 'post' ) ) );
+	$wgOut->addHTML( Xml::buildForm( $form, 'removerestrictions-submit' ) );
+	$wgOut->addHTML( Xml::hidden( 'id', $r->getId() ) );
+	$wgOut->addHTML( Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ) );
+	$wgOut->addHTML( Xml::hidden( 'edittoken', $wgUser->editToken() ) );
+	$wgOut->addHTML( "</form></fieldset>" );
+}
+
+function wfSpecialRemoveRestrictionsProcess( $r ) {
+	global $wgUser, $wgRequest;
+	$reason = $wgRequest->getVal( 'reason' );
+	$result = $r->delete();
+	$log = new LogPage( 'restrict' );
+	$params = array( $r->getType() );
+	if( $r->isPage() )
+		$params[] = $r->getPage()->getPrefixedDbKey();
+	if( $r->isNamespace() )
+		$params[] = $r->getNamespace();
+	$log->addEntry( 'remove', Title::makeTitle( NS_USER, $r->getSubjectText() ), $reason, $params );
+	return $result;
+}
diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 707b941d..059f8dbd 100644
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -4,26 +4,13 @@
  * @ingroup SpecialPage
  */
 
-/** Constructor */
-function wfSpecialResetpass( $par ) {
-	$form = new PasswordResetForm();
-	$form->execute( $par );
-}
-
 /**
  * Let users recover their password.
  * @ingroup SpecialPage
  */
-class PasswordResetForm extends SpecialPage {
-	function __construct( $name=null, $reset=null ) {
-		if( $name !== null ) {
-			$this->mName = $name;
-			$this->mTemporaryPassword = $reset;
-		} else {
-			global $wgRequest;
-			$this->mName = $wgRequest->getVal( 'wpName' );
-			$this->mTemporaryPassword = $wgRequest->getVal( 'wpPassword' );
-		}
+class SpecialResetpass extends SpecialPage {
+	public function __construct() {
+		parent::__construct( 'Resetpass' );
 	}
 
 	/**
@@ -32,36 +19,46 @@ class PasswordResetForm extends SpecialPage {
 	function execute( $par ) {
 		global $wgUser, $wgAuth, $wgOut, $wgRequest;
 
+		$this->mUserName = $wgRequest->getVal( 'wpName' );
+		$this->mOldpass = $wgRequest->getVal( 'wpPassword' );
+		$this->mNewpass = $wgRequest->getVal( 'wpNewPassword' );
+		$this->mRetype = $wgRequest->getVal( 'wpRetype' );
+		
+		$this->setHeaders();
+		$this->outputHeader();
+
 		if( !$wgAuth->allowPasswordChange() ) {
 			$this->error( wfMsg( 'resetpass_forbidden' ) );
 			return;
 		}
 
-		if( $this->mName === null && !$wgRequest->wasPosted() ) {
-			$this->error( wfMsg( 'resetpass_missing' ) );
+		if( !$wgRequest->wasPosted() && !$wgUser->isLoggedIn() ) {
+			$this->error( wfMsg( 'resetpass-no-info' ) );
 			return;
 		}
 
-		if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
-			$newpass = $wgRequest->getVal( 'wpNewPassword' );
-			$retype = $wgRequest->getVal( 'wpRetype' );
+		if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal('token') ) ) {
 			try {
-				$this->attemptReset( $newpass, $retype );
+				$this->attemptReset( $this->mNewpass, $this->mRetype );
 				$wgOut->addWikiMsg( 'resetpass_success' );
-
-				$data = array(
-					'action' => 'submitlogin',
-					'wpName' => $this->mName,
-					'wpPassword' => $newpass,
-					'returnto' => $wgRequest->getVal( 'returnto' ),
-				);
-				if( $wgRequest->getCheck( 'wpRemember' ) ) {
-					$data['wpRemember'] = 1;
+				if( !$wgUser->isLoggedIn() ) {
+					$data = array(
+						'action'     => 'submitlogin',
+						'wpName'     => $this->mUserName,
+						'wpPassword' => $this->mNewpass,
+						'returnto'   => $wgRequest->getVal( 'returnto' ),
+					);
+					if( $wgRequest->getCheck( 'wpRemember' ) ) {
+						$data['wpRemember'] = 1;
+					}
+					$login = new LoginForm( new FauxRequest( $data, true ) );
+					$login->execute();
 				}
-				$login = new LoginForm( new FauxRequest( $data, true ) );
-				$login->execute();
-
-				return;
+				$titleObj = Title::newFromText( $wgRequest->getVal( 'returnto' ) );
+				if ( !$titleObj instanceof Title ) {
+					$titleObj = Title::newMainPage();
+				}
+				$wgOut->redirect( $titleObj->getFullURL() );
 			} catch( PasswordError $e ) {
 				$this->error( $e->getMessage() );
 			}
@@ -71,9 +68,7 @@ class PasswordResetForm extends SpecialPage {
 
 	function error( $msg ) {
 		global $wgOut;
-		$wgOut->addHtml( '<div class="errorbox">' .
-			htmlspecialchars( $msg ) .
-			'</div>' );
+		$wgOut->addHTML( Xml::element('p', array( 'class' => 'error' ), $msg ) );
 	}
 
 	function showForm() {
@@ -82,44 +77,54 @@ class PasswordResetForm extends SpecialPage {
 		$wgOut->disallowUserJs();
 
 		$self = SpecialPage::getTitleFor( 'Resetpass' );
-		$form  =
-			'<div id="userloginForm">' .
-			wfOpenElement( 'form',
+		if ( !$this->mUserName ) {
+			$this->mUserName = $wgUser->getName();
+		}
+		$rememberMe = '';
+		if ( !$wgUser->isLoggedIn() ) {
+			$rememberMe = '<tr>' .
+				'<td></td>' .
+				'<td class="mw-input">' .
+					Xml::checkLabel( wfMsg( 'remembermypassword' ),
+						'wpRemember', 'wpRemember',
+						$wgRequest->getCheck( 'wpRemember' ) ) .
+				'</td>' .
+			'</tr>';
+			$submitMsg = 'resetpass_submit';
+			$oldpassMsg = 'resetpass-temp-password';
+		} else {
+			$oldpassMsg = 'oldpassword';
+			$submitMsg = 'resetpass-submit-loggedin';
+		}
+		$wgOut->addHTML(
+			Xml::fieldset( wfMsg( 'resetpass_header' ) ) .
+			Xml::openElement( 'form',
 				array(
 					'method' => 'post',
-					'action' => $self->getLocalUrl() ) ) .
-			'<h2>' . wfMsgHtml( 'resetpass_header' ) . '</h2>' .
-			'<div id="userloginprompt">' .
+					'action' => $self->getLocalUrl(),
+					'id' => 'mw-resetpass-form' ) ) .	
+			Xml::hidden( 'token', $wgUser->editToken() ) .
+			Xml::hidden( 'wpName', $this->mUserName ) .
+			Xml::hidden( 'returnto', $wgRequest->getVal( 'returnto' ) ) .
 			wfMsgExt( 'resetpass_text', array( 'parse' ) ) .
-			'</div>' .
-			'<table>' .
-			wfHidden( 'token', $wgUser->editToken() ) .
-			wfHidden( 'wpName', $this->mName ) .
-			wfHidden( 'wpPassword', $this->mTemporaryPassword ) .
-			wfHidden( 'returnto', $wgRequest->getVal( 'returnto' ) ) .
+			Xml::openElement( 'table', array( 'id' => 'mw-resetpass-table' ) ) .
 			$this->pretty( array(
-				array( 'wpName', 'username', 'text', $this->mName ),
+				array( 'wpName', 'username', 'text', $this->mUserName ),
+				array( 'wpPassword', $oldpassMsg, 'password', $this->mOldpass ),
 				array( 'wpNewPassword', 'newpassword', 'password', '' ),
-				array( 'wpRetype', 'yourpasswordagain', 'password', '' ),
+				array( 'wpRetype', 'retypenew', 'password', '' ),
 			) ) .
+			$rememberMe .
 			'<tr>' .
 				'<td></td>' .
-				'<td>' .
-					Xml::checkLabel( wfMsg( 'remembermypassword' ),
-						'wpRemember', 'wpRemember',
-						$wgRequest->getCheck( 'wpRemember' ) ) .
-				'</td>' .
-			'</tr>' .
-			'<tr>' .
-				'<td></td>' .
-				'<td>' .
-					wfSubmitButton( wfMsgHtml( 'resetpass_submit' ) ) .
+				'<td class="mw-input">' .
+					Xml::submitButton( wfMsg( $submitMsg ) ) .
 				'</td>' .
 			'</tr>' .
-			'</table>' .
-			wfCloseElement( 'form' ) .
-			'</div>';
-		$wgOut->addHtml( $form );
+			Xml::closeElement( 'table' ) .
+			Xml::closeElement( 'form' ) .
+			Xml::closeElement( 'fieldset' )
+		);
 	}
 
 	function pretty( $fields ) {
@@ -127,16 +132,19 @@ class PasswordResetForm extends SpecialPage {
 		foreach( $fields as $list ) {
 			list( $name, $label, $type, $value ) = $list;
 			if( $type == 'text' ) {
-				$field = '<tt>' . htmlspecialchars( $value ) . '</tt>';
+				$field = htmlspecialchars( $value );
 			} else {
 				$field = Xml::input( $name, 20, $value,
 					array( 'id' => $name, 'type' => $type ) );
 			}
 			$out .= '<tr>';
-			$out .= '<td align="right">';
-			$out .= Xml::label( wfMsg( $label ), $name );
+			$out .= "<td class='mw-label'>";
+			if ( $type != 'text' )
+				$out .= Xml::label( wfMsg( $label ), $name );
+			else 
+				$out .=  wfMsg( $label );
 			$out .= '</td>';
-			$out .= '<td>';
+			$out .= "<td class='mw-input'>";
 			$out .= $field;
 			$out .= '</td>';
 			$out .= '</tr>';
@@ -147,21 +155,33 @@ class PasswordResetForm extends SpecialPage {
 	/**
 	 * @throws PasswordError when cannot set the new password because requirements not met.
 	 */
-	function attemptReset( $newpass, $retype ) {
-		$user = User::newFromName( $this->mName );
-		if( $user->isAnon() ) {
+	protected function attemptReset( $newpass, $retype ) {
+		$user = User::newFromName( $this->mUserName );
+		if( !$user || $user->isAnon() ) {
 			throw new PasswordError( 'no such user' );
 		}
-
-		if( !$user->checkTemporaryPassword( $this->mTemporaryPassword ) ) {
-			throw new PasswordError( wfMsg( 'resetpass_bad_temporary' ) );
-		}
-
+		
 		if( $newpass !== $retype ) {
+			wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'badretype' ) );
 			throw new PasswordError( wfMsg( 'badretype' ) );
 		}
 
-		$user->setPassword( $newpass );
+		if( !$user->checkTemporaryPassword($this->mOldpass) && !$user->checkPassword($this->mOldpass) ) {
+			wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'wrongpassword' ) );
+			throw new PasswordError( wfMsg( 'resetpass-wrong-oldpass' ) );
+		}
+		
+		try {
+			$user->setPassword( $this->mNewpass );
+			wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'success' ) );
+			$this->mNewpass = $this->mOldpass = $this->mRetypePass = '';
+		} catch( PasswordError $e ) {
+			wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'error' ) );
+			throw new PasswordError( $e->getMessage() );
+			return;
+		}
+		
+		$user->setCookies();
 		$user->saveSettings();
 	}
 }
diff --git a/includes/specials/SpecialRestrictUser.php b/includes/specials/SpecialRestrictUser.php
new file mode 100644
index 00000000..761e0cd6
--- /dev/null
+++ b/includes/specials/SpecialRestrictUser.php
@@ -0,0 +1,189 @@
+<?php
+
+function wfSpecialRestrictUser( $par = null ) {
+	global $wgOut, $wgRequest;
+	$user = $userOrig = null;
+	if( $par ) {
+		$userOrig = $par;
+	} elseif( $wgRequest->getVal( 'user' ) ) {
+		$userOrig = $wgRequest->getVal( 'user' );
+	} else {
+		$wgOut->addHTML( RestrictUserForm::selectUserForm() );
+		return;
+	}
+	$isIP = User::isIP( $userOrig );
+	$user = $isIP ? $userOrig : User::getCanonicalName( $userOrig );
+	$uid = User::idFromName( $user );
+	if( !$uid && !$isIP ) {
+		$err = '<strong class="error">' . wfMsgHtml( 'restrictuser-notfound' ) . '</strong>';
+		$wgOut->addHTML( RestrictUserForm::selectUserForm( $userOrig, $err ) );
+		return;
+	}
+	$wgOut->addHTML( RestrictUserForm::selectUserForm( $user ) );
+
+	UserRestriction::purgeExpired();
+	$old = UserRestriction::fetchForUser( $user, true );
+
+	RestrictUserForm::pageRestrictionForm( $uid, $user, $old );
+	RestrictUserForm::namespaceRestrictionForm( $uid, $user, $old );
+
+	// Renew it after possible changes in previous two functions
+	$old = UserRestriction::fetchForUser( $user, true );
+	if( $old ) {
+		$wgOut->addHTML( RestrictUserForm::existingRestrictions( $old ) );
+	}
+}
+
+class RestrictUserForm {
+	public static function selectUserForm( $val = null, $error = null ) {
+		global $wgScript, $wgTitle;
+		$s  = Xml::fieldset( wfMsg( 'restrictuser-userselect' ) ) . "<form action=\"{$wgScript}\">";
+		if( $error )
+			$s .= '<p>' . $error . '</p>';
+		$s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() );
+		$form = array( 'restrictuser-user' => Xml::input( 'user', false, $val ) );
+		$s .= Xml::buildForm( $form, 'restrictuser-go' );
+		$s .= "</form></fieldset>";
+		return $s;
+	}
+
+	public static function existingRestrictions( $restrictions ) {
+		//TODO: autoload?
+		require_once( dirname( __FILE__ ) . '/SpecialListUserRestrictions.php' );
+		$s  = Xml::fieldset( wfMsg( 'restrictuser-existing' ) ) . '<ul>';
+		foreach( $restrictions as $r )
+			$s .= UserRestrictionsPager::formatRestriction( $r );
+		$s .= "</ul></fieldset>";
+		return $s;
+	}
+
+	public static function pageRestrictionForm( $uid, $user, $oldRestrictions ) {
+		global $wgOut, $wgTitle, $wgRequest, $wgUser;
+		$error = '';
+		$success = false;
+		if( $wgRequest->wasPosted() && $wgRequest->getVal( 'type' ) == UserRestriction::PAGE &&
+			$wgUser->matchEditToken( $wgRequest->getVal( 'edittoken' ) ) ) {
+
+			$title = Title::newFromText( $wgRequest->getVal( 'page' ) );
+			if( !$title ) {
+				$error = array( 'restrictuser-badtitle', $wgRequest->getVal( 'page' ) );
+			} elseif( UserRestriction::convertExpiry( $wgRequest->getVal( 'expiry' ) ) === false ) {
+				$error = array( 'restrictuser-badexpiry', $wgRequest->getVal( 'expiry' ) );
+			} else {
+				foreach( $oldRestrictions as $r ) {
+					if( $r->isPage() && $r->getPage()->equals( $title ) )
+						$error = array( 'restrictuser-duptitle' );
+				}
+			}
+			if( !$error ) {
+				self::doPageRestriction( $uid, $user );
+				$success = array('restrictuser-success', $user);
+			}
+		}
+		$useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::PAGE;
+		$wgOut->addHTML( Xml::fieldset( wfMsg( 'restrictuser-legend-page' ) ) );
+
+		self::printSuccessError( $success, $error );
+
+		$wgOut->addHTML( Xml::openElement( 'form', array( 'action' => $wgTitle->getLocalUrl(),
+			'method' => 'post' ) ) );
+		$wgOut->addHTML( Xml::hidden( 'type', UserRestriction::PAGE ) );
+		$wgOut->addHTML( Xml::hidden( 'edittoken', $wgUser->editToken() ) );
+		$wgOut->addHTML( Xml::hidden( 'user', $user ) );
+		$form = array();
+		$form['restrictuser-title'] = Xml::input( 'page', false,
+			$useRequestValues ? $wgRequest->getVal( 'page' ) : false );
+		$form['restrictuser-expiry'] = Xml::input( 'expiry', false,
+			$useRequestValues ? $wgRequest->getVal( 'expiry' ) : false );
+		$form['restrictuser-reason'] = Xml::input( 'reason', false,
+			$useRequestValues ? $wgRequest->getVal( 'reason' ) : false );
+		$wgOut->addHTML( Xml::buildForm( $form, 'restrictuser-submit' ) );
+		$wgOut->addHTML( "</form></fieldset>" );
+	}
+
+	public static function printSuccessError( $success, $error ) {
+		global $wgOut;
+		if ( $error )
+			$wgOut->wrapWikiMsg( '<strong class="error">$1</strong>', $error );
+		if ( $success )
+			$wgOut->wrapWikiMsg( '<strong class="success">$1</strong>', $success );
+	}
+
+	public static function doPageRestriction( $uid, $user ) {
+		global $wgUser, $wgRequest;
+		$r = new UserRestriction();
+		$r->setType( UserRestriction::PAGE );
+		$r->setPage( Title::newFromText( $wgRequest->getVal( 'page' ) ) );
+		$r->setSubjectId( $uid );
+		$r->setSubjectText( $user );
+		$r->setBlockerId( $wgUser->getId() );
+		$r->setBlockerText( $wgUser->getName() );
+		$r->setReason( $wgRequest->getVal( 'reason' ) );
+		$r->setExpiry( UserRestriction::convertExpiry( $wgRequest->getVal( 'expiry' ) ) );
+		$r->setTimestamp( wfTimestampNow( TS_MW ) );
+		$r->commit();
+		$logExpiry = $wgRequest->getVal( 'expiry' ) ? $wgRequest->getVal( 'expiry' ) : Block::infinity();
+		$l = new LogPage( 'restrict' );
+		$l->addEntry( 'restrict', Title::makeTitle( NS_USER, $user ), $r->getReason(),
+			array( $r->getType(), $r->getPage()->getFullText(), $logExpiry) );
+	}
+
+	public static function namespaceRestrictionForm( $uid, $user, $oldRestrictions ) {
+		global $wgOut, $wgTitle, $wgRequest, $wgUser, $wgContLang;
+		$error = '';
+		$success = false;
+		if( $wgRequest->wasPosted() && $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE &&
+			$wgUser->matchEditToken( $wgRequest->getVal( 'edittoken' ) ) ) {
+				$ns = $wgRequest->getVal( 'namespace' );
+				if( $wgContLang->getNsText( $ns ) === false )
+					$error = wfMsgExt( 'restrictuser-badnamespace', 'parseinline' );
+				elseif( UserRestriction::convertExpiry( $wgRequest->getVal( 'expiry' ) ) === false )
+					$error = wfMsgExt( 'restrictuser-badexpiry', 'parseinline', $wgRequest->getVal( 'expiry' ) );
+				else 
+					foreach( $oldRestrictions as $r )
+						if( $r->isNamespace() && $r->getNamespace() == $ns )
+							$error = wfMsgExt( 'restrictuser-dupnamespace', 'parse' );
+				if( !$error ) {
+					self::doNamespaceRestriction( $uid, $user );
+					$success = array('restrictuser-success', $user);
+				}
+		}
+		$useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE;
+		$wgOut->addHTML( Xml::fieldset( wfMsg( 'restrictuser-legend-namespace' ) ) );
+
+		self::printSuccessError( $success, $error );
+
+		$wgOut->addHTML( Xml::openElement( 'form', array( 'action' => $wgTitle->getLocalUrl(),
+			'method' => 'post' ) ) );
+		$wgOut->addHTML( Xml::hidden( 'type', UserRestriction::NAMESPACE ) );
+		$wgOut->addHTML( Xml::hidden( 'edittoken', $wgUser->editToken() ) );
+		$wgOut->addHTML( Xml::hidden( 'user', $user ) );
+		$form = array();
+		$form['restrictuser-namespace'] = Xml::namespaceSelector( $wgRequest->getVal( 'namespace' ) );
+		$form['restrictuser-expiry'] = Xml::input( 'expiry', false,
+			$useRequestValues ? $wgRequest->getVal( 'expiry' ) : false );
+		$form['restrictuser-reason'] = Xml::input( 'reason', false,
+			$useRequestValues ? $wgRequest->getVal( 'reason' ) : false );
+		$wgOut->addHTML( Xml::buildForm( $form, 'restrictuser-submit' ) );
+		$wgOut->addHTML( "</form></fieldset>" );
+	}
+
+	public static function doNamespaceRestriction( $uid, $user ) {
+		global $wgUser, $wgRequest;
+		$r = new UserRestriction();
+		$r->setType( UserRestriction::NAMESPACE );
+		$r->setNamespace( $wgRequest->getVal( 'namespace' ) );
+		$r->setSubjectId( $uid );
+		$r->setSubjectText( $user );
+		$r->setBlockerId( $wgUser->getId() );
+		$r->setBlockerText( $wgUser->getName() );
+		$r->setReason( $wgRequest->getVal( 'reason' ) );
+		$r->setExpiry( UserRestriction::convertExpiry( $wgRequest->getVal( 'expiry' ) ) );
+		$r->setTimestamp( wfTimestampNow( TS_MW ) );
+		$r->commit();
+		$logExpiry = $wgRequest->getVal( 'expiry' ) ? $wgRequest->getVal( 'expiry' ) : Block::infinity();
+		$l = new LogPage( 'restrict' );
+		$l->addEntry( 'restrict', Title::makeTitle( NS_USER, $user ), $r->getReason(),
+			array( $r->getType(), $r->getNamespace(), $logExpiry ) );
+	}
+}
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index e94fc222..74b118e2 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -171,7 +171,7 @@ class RevisionDeleteForm {
 		$wgOut->addWikiMsg( 'revdelete-selected', $this->page->getPrefixedText(), $count );
 
 		$bitfields = 0;
-		$wgOut->addHtml( "<ul>" );
+		$wgOut->addHTML( "<ul>" );
 
 		$where = $revObjs = array();
 		$dbr = wfGetDB( DB_SLAVE );
@@ -204,7 +204,7 @@ class RevisionDeleteForm {
 					$UserAllowed = false;
 				}
 				$revisions++;
-				$wgOut->addHtml( $this->historyLine( $revObjs[$revid] ) );
+				$wgOut->addHTML( $this->historyLine( $revObjs[$revid] ) );
 				$bitfields |= $revObjs[$revid]->mDeleted;
 			}
 		// The archives...
@@ -245,7 +245,7 @@ class RevisionDeleteForm {
 					$UserAllowed = false;
 				}
 				$revisions++;
-				$wgOut->addHtml( $this->historyLine( $revObjs[$timestamp] ) );
+				$wgOut->addHTML( $this->historyLine( $revObjs[$timestamp] ) );
 				$bitfields |= $revObjs[$timestamp]->mDeleted;
 			}
 		}
@@ -254,7 +254,7 @@ class RevisionDeleteForm {
 			return;
 		}
 		
-		$wgOut->addHtml( "</ul>" );
+		$wgOut->addHTML( "</ul>" );
 
 		$wgOut->addWikiMsg( 'revdelete-text' );
 
@@ -278,7 +278,7 @@ class RevisionDeleteForm {
 				$hidden[] = Xml::hidden( 'artimestamp[]', $rev->getTimestamp() );
 		}
 		$special = SpecialPage::getTitleFor( 'Revisiondelete' );
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 
 				'id' => 'mw-revdel-form-revisions' ) ) .
 			Xml::openElement( 'fieldset' ) .
@@ -287,15 +287,15 @@ class RevisionDeleteForm {
 		// FIXME: all items checked for just one rev are checked, even if not set for the others
 		foreach( $this->checks as $item ) {
 			list( $message, $name, $field ) = $item;
-			$wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
+			$wgOut->addHTML( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
 		}
 		foreach( $items as $item ) {
-			$wgOut->addHtml( Xml::tags( 'p', null, $item ) );
+			$wgOut->addHTML( Xml::tags( 'p', null, $item ) );
 		}
 		foreach( $hidden as $item ) {
-			$wgOut->addHtml( $item );
+			$wgOut->addHTML( $item );
 		}
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::closeElement( 'fieldset' ) .
 			Xml::closeElement( 'form' ) . "\n"
 		);
@@ -317,7 +317,7 @@ class RevisionDeleteForm {
 			$wgLang->formatNum($count) );
 
 		$bitfields = 0;
-		$wgOut->addHtml( "<ul>" );
+		$wgOut->addHTML( "<ul>" );
 
 		$where = $filesObjs = array();
 		$dbr = wfGetDB( DB_SLAVE );
@@ -326,11 +326,11 @@ class RevisionDeleteForm {
 		if( $this->deleteKey=='oldimage' ) {
 			// Run through and pull all our data in one query
 			foreach( $this->ofiles as $timestamp ) {
-				$where[] = $dbr->addQuotes( $timestamp.'!'.$this->page->getDbKey() );
+				$where[] = $dbr->addQuotes( $timestamp.'!'.$this->page->getDBKey() );
 			}
 			$whereClause = 'oi_archive_name IN(' . implode(',',$where) . ')';
 			$result = $dbr->select( 'oldimage', '*',
-				array( 'oi_name' => $this->page->getDbKey(),
+				array( 'oi_name' => $this->page->getDBKey(),
 					$whereClause ),
 				__METHOD__ );
 			while( $row = $dbr->fetchObject( $result ) ) {
@@ -340,7 +340,7 @@ class RevisionDeleteForm {
 			}
 			// Check through our images
 			foreach( $this->ofiles as $timestamp ) {
-				$archivename = $timestamp.'!'.$this->page->getDbKey();
+				$archivename = $timestamp.'!'.$this->page->getDBKey();
 				if( !isset($filesObjs[$archivename]) ) {
 					continue;
 				} else if( !$filesObjs[$archivename]->userCan(File::DELETED_RESTRICTED) ) {
@@ -353,7 +353,7 @@ class RevisionDeleteForm {
 				}
 				$revisions++;
 				// Inject history info
-				$wgOut->addHtml( $this->fileLine( $filesObjs[$archivename] ) );
+				$wgOut->addHTML( $this->fileLine( $filesObjs[$archivename] ) );
 				$bitfields |= $filesObjs[$archivename]->deleted;
 			}
 		// Archived files...
@@ -364,7 +364,7 @@ class RevisionDeleteForm {
 			}
 			$whereClause = 'fa_id IN(' . implode(',',$where) . ')';
 			$result = $dbr->select( 'filearchive', '*',
-				array( 'fa_name' => $this->page->getDbKey(),
+				array( 'fa_name' => $this->page->getDBKey(),
 					$whereClause ),
 				__METHOD__ );
 			while( $row = $dbr->fetchObject( $result ) ) {
@@ -384,7 +384,7 @@ class RevisionDeleteForm {
 				}
 				$revisions++;
 				// Inject history info
-				$wgOut->addHtml( $this->archivedfileLine( $filesObjs[$fileid] ) );
+				$wgOut->addHTML( $this->archivedfileLine( $filesObjs[$fileid] ) );
 				$bitfields |= $filesObjs[$fileid]->deleted;
 			}
 		}
@@ -393,7 +393,7 @@ class RevisionDeleteForm {
 			return;
 		}
 		
-		$wgOut->addHtml( "</ul>" );
+		$wgOut->addHTML( "</ul>" );
 
 		$wgOut->addWikiMsg('revdelete-text' );
 		//Normal sysops can always see what they did, but can't always change it
@@ -416,7 +416,7 @@ class RevisionDeleteForm {
 				$hidden[] = Xml::hidden( 'fileid[]', $fileid );
 		}
 		$special = SpecialPage::getTitleFor( 'Revisiondelete' );
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 
 				'id' => 'mw-revdel-form-filerevisions' ) ) .
 			Xml::fieldset( wfMsg( 'revdelete-legend' ) )
@@ -424,16 +424,16 @@ class RevisionDeleteForm {
 		// FIXME: all items checked for just one file are checked, even if not set for the others
 		foreach( $this->checks as $item ) {
 			list( $message, $name, $field ) = $item;
-			$wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
+			$wgOut->addHTML( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
 		}
 		foreach( $items as $item ) {
-			$wgOut->addHtml( "<p>$item</p>" );
+			$wgOut->addHTML( "<p>$item</p>" );
 		}
 		foreach( $hidden as $item ) {
-			$wgOut->addHtml( $item );
+			$wgOut->addHTML( $item );
 		}
 
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::closeElement( 'fieldset' ) .
 			Xml::closeElement( 'form' ) . "\n"
 		);
@@ -449,7 +449,7 @@ class RevisionDeleteForm {
 		$wgOut->addWikiMsg( 'logdelete-selected', $wgLang->formatNum( count($this->events) ) );
 
 		$bitfields = 0;
-		$wgOut->addHtml( "<ul>" );
+		$wgOut->addHTML( "<ul>" );
 
 		$where = $logRows = array();
 		$dbr = wfGetDB( DB_SLAVE );
@@ -480,7 +480,7 @@ class RevisionDeleteForm {
 				$UserAllowed = false;
 			}
 			$logItems++;
-			$wgOut->addHtml( $this->logLine( $logRows[$logid] ) );
+			$wgOut->addHTML( $this->logLine( $logRows[$logid] ) );
 			$bitfields |= $logRows[$logid]->log_deleted;
 		}
 		if( !$logItems ) {
@@ -488,7 +488,7 @@ class RevisionDeleteForm {
 			return;
 		}
 		
-		$wgOut->addHtml( "</ul>" );
+		$wgOut->addHTML( "</ul>" );
 
 		$wgOut->addWikiMsg( 'revdelete-text' );
 		// Normal sysops can always see what they did, but can't always change it
@@ -506,7 +506,7 @@ class RevisionDeleteForm {
 		}
 
 		$special = SpecialPage::getTitleFor( 'Revisiondelete' );
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 
 				'id' => 'mw-revdel-form-logs' ) ) .
 			Xml::fieldset( wfMsg( 'revdelete-legend' ) )
@@ -514,16 +514,16 @@ class RevisionDeleteForm {
 		// FIXME: all items checked for just on event are checked, even if not set for the others
 		foreach( $this->checks as $item ) {
 			list( $message, $name, $field ) = $item;
-			$wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
+			$wgOut->addHTML( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
 		}
 		foreach( $items as $item ) {
-			$wgOut->addHtml( "<p>$item</p>" );
+			$wgOut->addHTML( "<p>$item</p>" );
 		}
 		foreach( $hidden as $item ) {
-			$wgOut->addHtml( $item );
+			$wgOut->addHTML( $item );
 		}
 
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::closeElement( 'fieldset' ) .
 			Xml::closeElement( 'form' ) . "\n"
 		);
@@ -606,7 +606,7 @@ class RevisionDeleteForm {
 	 * @returns string
 	 */
 	private function archivedfileLine( $file ) {
-		global $wgLang, $wgTitle;
+		global $wgLang;
 
 		$target = $this->page->getPrefixedText();
 		$date = $wgLang->timeanddate( $file->getTimestamp(), true  );
@@ -939,11 +939,11 @@ class RevisionDeleter {
 		$set = array();
 		// Run through and pull all our data in one query
 		foreach( $items as $timestamp ) {
-			$where[] = $this->dbw->addQuotes( $timestamp.'!'.$title->getDbKey() );
+			$where[] = $this->dbw->addQuotes( $timestamp.'!'.$title->getDBKey() );
 		}
 		$whereClause = 'oi_archive_name IN(' . implode(',',$where) . ')';
 		$result = $this->dbw->select( 'oldimage', '*',
-			array( 'oi_name' => $title->getDbKey(),
+			array( 'oi_name' => $title->getDBKey(),
 				$whereClause ),
 			__METHOD__ );
 		while( $row = $this->dbw->fetchObject( $result ) ) {
@@ -953,7 +953,7 @@ class RevisionDeleter {
 		}
 		// To work!
 		foreach( $items as $timestamp ) {
-			$archivename = $timestamp.'!'.$title->getDbKey();
+			$archivename = $timestamp.'!'.$title->getDBKey();
 			if( !isset($filesObjs[$archivename]) ) {
 				$success = false;
 				continue; // Must exist
@@ -1036,7 +1036,7 @@ class RevisionDeleter {
 		}
 		$whereClause = 'fa_id IN(' . implode(',',$where) . ')';
 		$result = $this->dbw->select( 'filearchive', '*',
-			array( 'fa_name' => $title->getDbKey(),
+			array( 'fa_name' => $title->getDBKey(),
 				$whereClause ),
 			__METHOD__ );
 		while( $row = $this->dbw->fetchObject( $result ) ) {
@@ -1344,7 +1344,7 @@ class RevisionDeleter {
 	function updatePage( $title ) {
 		$title->invalidateCache();
 		$title->purgeSquid();
-
+		$title->touchLinks();
 		// Extensions that require referencing previous revisions may need this
 		wfRunHooks( 'ArticleRevisionVisiblitySet', array( &$title ) );
 	}
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index f13c1676..f3117242 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -29,13 +29,18 @@
  * @param $par String: (default '')
  */
 function wfSpecialSearch( $par = '' ) {
-	global $wgRequest, $wgUser;
-
-	$search = str_replace( "\n", " ", $wgRequest->getText( 'search', $par ) );
-	$searchPage = new SpecialSearch( $wgRequest, $wgUser );
+	global $wgRequest, $wgUser, $wgUseOldSearchUI;
+	// Strip underscores from title parameter; most of the time we'll want
+	// text form here. But don't strip underscores from actual text params!
+	$titleParam = str_replace( '_', ' ', $par );
+	// Fetch the search term
+	$search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) );
+	$class = $wgUseOldSearchUI ? 'SpecialSearchOld' : 'SpecialSearch';
+	$searchPage = new $class( $wgRequest, $wgUser );
 	if( $wgRequest->getVal( 'fulltext' ) 
 		|| !is_null( $wgRequest->getVal( 'offset' )) 
-		|| !is_null( $wgRequest->getVal( 'searchx' ))) {
+		|| !is_null( $wgRequest->getVal( 'searchx' )) )
+	{
 		$searchPage->showResults( $search, 'search' );
 	} else {
 		$searchPage->goResult( $search );
@@ -56,9 +61,806 @@ class SpecialSearch {
 	 * @param User $user
 	 * @public
 	 */
-	function SpecialSearch( &$request, &$user ) {
+	function __construct( &$request, &$user ) {
 		list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
+		$this->mPrefix = $request->getVal('prefix', '');
+		# Extract requested namespaces
+		$this->namespaces = $this->powerSearch( $request );
+		if( empty( $this->namespaces ) ) {
+			$this->namespaces = SearchEngine::userNamespaces( $user );
+		}
+		$this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
+		$this->searchAdvanced = $request->getVal( 'advanced' );
+		$this->active = 'advanced';
+		$this->sk = $user->getSkin();
+		$this->didYouMeanHtml = ''; # html of did you mean... link
+	}
+
+	/**
+	 * If an exact title match can be found, jump straight ahead to it.
+	 * @param string $term
+	 */
+	public function goResult( $term ) {
+		global $wgOut;
+		$this->setupPage( $term );
+		# Try to go to page as entered.
+		$t = Title::newFromText( $term );
+		# If the string cannot be used to create a title
+		if( is_null( $t ) ) {
+			return $this->showResults( $term );
+		}
+		# If there's an exact or very near match, jump right there.
+		$t = SearchEngine::getNearMatch( $term );
+		if( !is_null( $t ) ) {
+			$wgOut->redirect( $t->getFullURL() );
+			return;
+		}
+		# No match, generate an edit URL
+		$t = Title::newFromText( $term );
+		if( !is_null( $t ) ) {
+			global $wgGoToEdit;
+			wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
+			# If the feature is enabled, go straight to the edit page
+			if( $wgGoToEdit ) {
+				$wgOut->redirect( $t->getFullURL( 'action=edit' ) );
+				return;
+			}
+		}
+		return $this->showResults( $term );
+	}
+
+	/**
+	 * @param string $term
+	 */
+	public function showResults( $term ) {
+		global $wgOut, $wgUser, $wgDisableTextSearch, $wgContLang;
+		wfProfileIn( __METHOD__ );
+		
+		$sk = $wgUser->getSkin();
+		
+		$this->searchEngine = SearchEngine::create();
+		$search =& $this->searchEngine;
+		$search->setLimitOffset( $this->limit, $this->offset );
+		$search->setNamespaces( $this->namespaces );
+		$search->showRedirects = $this->searchRedirects;
+		$search->prefix = $this->mPrefix;
+		$term = $search->transformSearchTerm($term);
+		
+		$this->setupPage( $term );
+		
+		if( $wgDisableTextSearch ) {
+			global $wgSearchForwardUrl;
+			if( $wgSearchForwardUrl ) {
+				$url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl );
+				$wgOut->redirect( $url );
+				wfProfileOut( __METHOD__ );
+				return;
+			}
+			global $wgInputEncoding;
+			$wgOut->addHTML(
+				Xml::openElement( 'fieldset' ) .
+				Xml::element( 'legend', null, wfMsg( 'search-external' ) ) .
+				Xml::element( 'p', array( 'class' => 'mw-searchdisabled' ), wfMsg( 'searchdisabled' ) ) .
+				wfMsg( 'googlesearch',
+					htmlspecialchars( $term ),
+					htmlspecialchars( $wgInputEncoding ),
+					htmlspecialchars( wfMsg( 'searchbutton' ) )
+				) .
+				Xml::closeElement( 'fieldset' )
+			);
+			wfProfileOut( __METHOD__ );
+			return;
+		}
+		
+		$t = Title::newFromText( $term );
+		
+		// fetch search results		
+		$rewritten = $search->replacePrefixes($term);
+
+		$titleMatches = $search->searchTitle( $rewritten );
+		if( !($titleMatches instanceof SearchResultTooMany))
+			$textMatches = $search->searchText( $rewritten );
+
+		// did you mean... suggestions
+		if( $textMatches && $textMatches->hasSuggestion() ) {
+			$st = SpecialPage::getTitleFor( 'Search' );			
+			$stParams = wfArrayToCGI( 
+				array( 'search' => $textMatches->getSuggestionQuery(), 'fulltext' 	=> wfMsg('search') ),
+				$this->powerSearchOptions()
+			);
+			$suggestLink = $sk->makeKnownLinkObj( $st,
+				$textMatches->getSuggestionSnippet(),
+				$stParams );
+
+			$this->didYouMeanHtml = '<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>';
+		}
+		
+		// start rendering the page		
+		$wgOut->addHtml( 
+			Xml::openElement( 'table', array( 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) .
+			Xml::openElement( 'tr' ) .
+			Xml::openElement( 'td' ) . "\n"	.
+			( $this->searchAdvanced ? $this->powerSearchBox( $term ) : $this->shortDialog( $term ) ) .
+			Xml::closeElement('td') .
+			Xml::closeElement('tr') .
+			Xml::closeElement('table')
+		);
+		
+		// Sometimes the search engine knows there are too many hits
+		if( $titleMatches instanceof SearchResultTooMany ) {
+			$wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
+			wfProfileOut( __METHOD__ );
+			return;
+		}
+		
+		$filePrefix = $wgContLang->getFormattedNsText(NS_FILE).':';
+		if( '' === trim( $term ) || $filePrefix === trim( $term ) ) {
+			$wgOut->addHTML( $this->searchAdvanced ? $this->powerSearchFocus() : $this->searchFocus() );
+			// Empty query -- straight view of search form
+			wfProfileOut( __METHOD__ );
+			return;
+		}
+
+		// show direct page/create link
+		if( !is_null($t) ) {
+			if( !$t->exists() ) {
+				$wgOut->addWikiMsg( 'searchmenu-new', wfEscapeWikiText( $t->getPrefixedText() ) );
+			} else {
+				$wgOut->addWikiMsg( 'searchmenu-exists', wfEscapeWikiText( $t->getPrefixedText() ) );
+			}
+		}
+
+		// Get number of results
+		$titleMatchesSQL = $titleMatches ? $titleMatches->numRows() : 0;
+		$textMatchesSQL = $textMatches ? $textMatches->numRows() : 0;
+		// Total initial query matches (possible false positives)
+		$numSQL = $titleMatchesSQL + $textMatchesSQL;
+		// Get total actual results (after second filtering, if any)
+		$numTitleMatches = $titleMatches && !is_null( $titleMatches->getTotalHits() ) ?
+			$titleMatches->getTotalHits() : $titleMatchesSQL;
+		$numTextMatches = $textMatches && !is_null( $textMatches->getTotalHits() ) ?
+			$textMatches->getTotalHits() : $textMatchesSQL;
+		$totalRes = $numTitleMatches + $numTextMatches;
+
+		// show number of results and current offset
+		if( $numSQL > 0 ) {
+			if( $numSQL > 0 ) {
+				$top = wfMsgExt('showingresultstotal', array( 'parseinline' ), 
+					$this->offset+1, $this->offset+$numSQL, $totalRes, $numSQL );
+			} elseif( $numSQL >= $this->limit ) {
+				$top = wfShowingResults( $this->offset, $this->limit );
+			} else {
+				$top = wfShowingResultsNum( $this->offset, $this->limit, $numSQL );
+			}
+			$wgOut->addHTML( "<p class='mw-search-numberresults'>{$top}</p>\n" );
+		}
+
+		// prev/next links
+		if( $numSQL || $this->offset ) {
+			$prevnext = wfViewPrevNext( $this->offset, $this->limit,
+				SpecialPage::getTitleFor( 'Search' ),
+				wfArrayToCGI( $this->powerSearchOptions(), array( 'search' => $term ) ),
+				max( $titleMatchesSQL, $textMatchesSQL ) < $this->limit
+			);
+			$wgOut->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
+			wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) );
+		} else {
+			wfRunHooks( 'SpecialSearchNoResults', array( $term ) );
+		}
+
+		$wgOut->addHtml( "<div class='searchresults'>" );
+		if( $titleMatches ) {
+			if( $numTitleMatches > 0 ) {
+				$wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
+				$wgOut->addHTML( $this->showMatches( $titleMatches ) );
+			}
+			$titleMatches->free();
+		}
+		if( $textMatches ) {
+			// output appropriate heading
+			if( $numTextMatches > 0 && $numTitleMatches > 0 ) {
+				// if no title matches the heading is redundant
+				$wgOut->wrapWikiMsg( "==$1==\n", 'textmatches' );					
+			} elseif( $totalRes == 0 ) {
+				# Don't show the 'no text matches' if we received title matches
+				$wgOut->wrapWikiMsg( "==$1==\n", 'notextmatches' );
+			}
+			// show interwiki results if any
+			if( $textMatches->hasInterwikiResults() ) {
+				$wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
+			}
+			// show results
+			if( $numTextMatches > 0 ) {
+				$wgOut->addHTML( $this->showMatches( $textMatches ) );
+			}
+
+			$textMatches->free();
+		}
+		if( $totalRes === 0 ) {
+			$wgOut->addWikiMsg( 'search-nonefound' );
+		}
+		$wgOut->addHtml( "</div>" );
+		if( $totalRes === 0 ) {
+			$wgOut->addHTML( $this->searchAdvanced ? $this->powerSearchFocus() : $this->searchFocus() );
+		}
+
+		if( $numSQL || $this->offset ) {
+			$wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
+		}
+		wfProfileOut( __METHOD__ );
+	}
+	
+	/**
+	 *
+	 */
+	protected function setupPage( $term ) {
+		global $wgOut;
+		// Figure out the active search profile header
+		$nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
+		if( $this->searchAdvanced )
+			$this->active = 'advanced';
+		else if( $this->namespaces === NS_FILE || $this->startsWithImage( $term ) )
+			$this->active = 'images';
+		elseif( $this->namespaces === $nsAllSet )
+			$this->active = 'all';
+		elseif( $this->namespaces === SearchEngine::defaultNamespaces() )
+			$this->active = 'default';
+		elseif( $this->namespaces === SearchEngine::projectNamespaces() )
+			$this->active = 'project';
+		else
+			$this->active = 'advanced';
+		# Should advanced UI be used?
+		$this->searchAdvanced = ($this->active === 'advanced');
+		if( !empty( $term ) ) {
+			$wgOut->setPageTitle( wfMsg( 'searchresults') );
+			$wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term ) ) );
+		}			
+		$wgOut->setArticleRelated( false );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
+	}
+
+	/**
+	 * Extract "power search" namespace settings from the request object,
+	 * returning a list of index numbers to search.
+	 *
+	 * @param WebRequest $request
+	 * @return array
+	 */
+	protected function powerSearch( &$request ) {
+		$arr = array();
+		foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
+			if( $request->getCheck( 'ns' . $ns ) ) {
+				$arr[] = $ns;
+			}
+		}
+		return $arr;
+	}
 
+	/**
+	 * Reconstruct the 'power search' options for links
+	 * @return array
+	 */
+	protected function powerSearchOptions() {
+		$opt = array();
+		foreach( $this->namespaces as $n ) {
+			$opt['ns' . $n] = 1;
+		}
+		$opt['redirs'] = $this->searchRedirects ? 1 : 0;
+		if( $this->searchAdvanced ) {
+			$opt['advanced'] = $this->searchAdvanced;
+		}
+		return $opt;
+	}
+
+	/**
+	 * Show whole set of results 
+	 * 
+	 * @param SearchResultSet $matches
+	 */
+	protected function showMatches( &$matches ) {
+		global $wgContLang;
+		wfProfileIn( __METHOD__ );
+
+		$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
+
+		$out = "";
+		$infoLine = $matches->getInfo();
+		if( !is_null($infoLine) ) {
+			$out .= "\n<!-- {$infoLine} -->\n";
+		}
+		$off = $this->offset + 1;
+		$out .= "<ul class='mw-search-results'>\n";
+		while( $result = $matches->next() ) {
+			$out .= $this->showHit( $result, $terms );
+		}
+		$out .= "</ul>\n";
+
+		// convert the whole thing to desired language variant
+		$out = $wgContLang->convert( $out );
+		wfProfileOut( __METHOD__ );
+		return $out;
+	}
+
+	/**
+	 * Format a single hit result
+	 * @param SearchResult $result
+	 * @param array $terms terms to highlight
+	 */
+	protected function showHit( $result, $terms ) {
+		global $wgContLang, $wgLang, $wgUser;
+		wfProfileIn( __METHOD__ );
+
+		if( $result->isBrokenTitle() ) {
+			wfProfileOut( __METHOD__ );
+			return "<!-- Broken link in search result -->\n";
+		}
+
+		$sk = $wgUser->getSkin();
+		$t = $result->getTitle();
+
+		$link = $this->sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+
+		//If page content is not readable, just return the title.
+		//This is not quite safe, but better than showing excerpts from non-readable pages
+		//Note that hiding the entry entirely would screw up paging.
+		if( !$t->userCanRead() ) {
+			wfProfileOut( __METHOD__ );
+			return "<li>{$link}</li>\n";
+		}
+
+		// If the page doesn't *exist*... our search index is out of date.
+		// The least confusing at this point is to drop the result.
+		// You may get less results, but... oh well. :P
+		if( $result->isMissingRevision() ) {
+			wfProfileOut( __METHOD__ );
+			return "<!-- missing page " . htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
+		}
+
+		// format redirects / relevant sections
+		$redirectTitle = $result->getRedirectTitle();
+		$redirectText = $result->getRedirectSnippet($terms);
+		$sectionTitle = $result->getSectionTitle();
+		$sectionText = $result->getSectionSnippet($terms);
+		$redirect = '';
+		if( !is_null($redirectTitle) )
+			$redirect = "<span class='searchalttitle'>"
+				.wfMsg('search-redirect',$this->sk->makeKnownLinkObj( $redirectTitle, $redirectText))
+				."</span>";
+		$section = '';
+		if( !is_null($sectionTitle) )
+			$section = "<span class='searchalttitle'>" 
+				.wfMsg('search-section', $this->sk->makeKnownLinkObj( $sectionTitle, $sectionText))
+				."</span>";
+
+		// format text extract
+		$extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
+		
+		// format score
+		if( is_null( $result->getScore() ) ) {
+			// Search engine doesn't report scoring info
+			$score = '';
+		} else {
+			$percent = sprintf( '%2.1f', $result->getScore() * 100 );
+			$score = wfMsg( 'search-result-score', $wgLang->formatNum( $percent ) )
+				. ' - ';
+		}
+
+		// format description
+		$byteSize = $result->getByteSize();
+		$wordCount = $result->getWordCount();
+		$timestamp = $result->getTimestamp();
+		$size = wfMsgExt( 'search-result-size', array( 'parsemag', 'escape' ),
+			$this->sk->formatSize( $byteSize ), $wordCount );
+		$date = $wgLang->timeanddate( $timestamp );
+
+		// link to related articles if supported
+		$related = '';
+		if( $result->hasRelated() ) {
+			$st = SpecialPage::getTitleFor( 'Search' );
+			$stParams = wfArrayToCGI( $this->powerSearchOptions(),
+				array('search'    => wfMsgForContent('searchrelated').':'.$t->getPrefixedText(),
+				      'fulltext'  => wfMsg('search') ));
+			
+			$related = ' -- ' . $sk->makeKnownLinkObj( $st,
+				wfMsg('search-relatedarticle'), $stParams );
+		}
+
+		// Include a thumbnail for media files...
+		if( $t->getNamespace() == NS_FILE ) {
+			$img = wfFindFile( $t );
+			if( $img ) {
+				$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
+				if( $thumb ) {
+					$desc = $img->getShortDesc();
+					wfProfileOut( __METHOD__ );
+					// Float doesn't seem to interact well with the bullets.
+					// Table messes up vertical alignment of the bullets.
+					// Bullets are therefore disabled (didn't look great anyway).
+					return "<li>" .
+						'<table class="searchResultImage">' .
+						'<tr>' .
+						'<td width="120" align="center" valign="top">' .
+						$thumb->toHtml( array( 'desc-link' => true ) ) .
+						'</td>' .
+						'<td valign="top">' .
+						$link .
+						$extract .
+						"<div class='mw-search-result-data'>{$score}{$desc} - {$date}{$related}</div>" .
+						'</td>' .
+						'</tr>' .
+						'</table>' .
+						"</li>\n";
+				}
+			}
+		}
+
+		wfProfileOut( __METHOD__ );
+		return "<li>{$link} {$redirect} {$section} {$extract}\n" .
+			"<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
+			"</li>\n";
+
+	}
+
+	/**
+	 * Show results from other wikis
+	 * 
+	 * @param SearchResultSet $matches
+	 */
+	protected function showInterwiki( &$matches, $query ) {
+		global $wgContLang;
+		wfProfileIn( __METHOD__ );
+		$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
+
+		$out = "<div id='mw-search-interwiki'><div id='mw-search-interwiki-caption'>".
+			wfMsg('search-interwiki-caption')."</div>\n";		
+		$off = $this->offset + 1;
+		$out .= "<ul class='mw-search-iwresults'>\n";
+
+		// work out custom project captions
+		$customCaptions = array();
+		$customLines = explode("\n",wfMsg('search-interwiki-custom')); // format per line <iwprefix>:<caption>
+		foreach($customLines as $line) {
+			$parts = explode(":",$line,2);
+			if(count($parts) == 2) // validate line
+				$customCaptions[$parts[0]] = $parts[1]; 
+		}
+		
+		$prev = null;
+		while( $result = $matches->next() ) {
+			$out .= $this->showInterwikiHit( $result, $prev, $terms, $query, $customCaptions );
+			$prev = $result->getInterwikiPrefix();
+		}
+		// FIXME: should support paging in a non-confusing way (not sure how though, maybe via ajax)..
+		$out .= "</ul></div>\n";
+
+		// convert the whole thing to desired language variant
+		$out = $wgContLang->convert( $out );
+		wfProfileOut( __METHOD__ );
+		return $out;
+	}
+	
+	/**
+	 * Show single interwiki link
+	 *
+	 * @param SearchResult $result
+	 * @param string $lastInterwiki
+	 * @param array $terms
+	 * @param string $query 
+	 * @param array $customCaptions iw prefix -> caption
+	 */
+	protected function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
+		wfProfileIn( __METHOD__ );
+		global $wgContLang, $wgLang;
+		
+		if( $result->isBrokenTitle() ) {
+			wfProfileOut( __METHOD__ );
+			return "<!-- Broken link in search result -->\n";
+		}
+		
+		$t = $result->getTitle();
+
+		$link = $this->sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+
+		// format redirect if any
+		$redirectTitle = $result->getRedirectTitle();
+		$redirectText = $result->getRedirectSnippet($terms);
+		$redirect = '';
+		if( !is_null($redirectTitle) )
+			$redirect = "<span class='searchalttitle'>"
+				.wfMsg('search-redirect',$this->sk->makeKnownLinkObj( $redirectTitle, $redirectText))
+				."</span>";
+
+		$out = "";
+		// display project name 
+		if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()) {
+			if( key_exists($t->getInterwiki(),$customCaptions) )
+				// captions from 'search-interwiki-custom'
+				$caption = $customCaptions[$t->getInterwiki()];
+			else{
+				// default is to show the hostname of the other wiki which might suck 
+				// if there are many wikis on one hostname
+				$parsed = parse_url($t->getFullURL());
+				$caption = wfMsg('search-interwiki-default', $parsed['host']); 
+			}		
+			// "more results" link (special page stuff could be localized, but we might not know target lang)
+			$searchTitle = Title::newFromText($t->getInterwiki().":Special:Search");   			
+			$searchLink = $this->sk->makeKnownLinkObj( $searchTitle, wfMsg('search-interwiki-more'),
+				wfArrayToCGI(array('search' => $query, 'fulltext' => 'Search'))); 
+			$out .= "</ul><div class='mw-search-interwiki-project'><span class='mw-search-interwiki-more'>
+				{$searchLink}</span>{$caption}</div>\n<ul>";
+		}
+
+		$out .= "<li>{$link} {$redirect}</li>\n"; 
+		wfProfileOut( __METHOD__ );
+		return $out;
+	}
+	
+
+	/**
+	 * Generates the power search box at bottom of [[Special:Search]]
+	 * @param $term string: search term
+	 * @return $out string: HTML form
+	 */
+	protected function powerSearchBox( $term ) {
+		global $wgScript;
+
+		$namespaces = SearchEngine::searchableNamespaces();
+
+		$tables = $this->namespaceTables( $namespaces );
+
+		$redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
+		$redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
+		$searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
+		$searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' )) . "\n";
+		$searchTitle = SpecialPage::getTitleFor( 'Search' );
+		
+		$redirectText = '';
+		// show redirects check only if backend supports it 
+		if( $this->searchEngine->acceptListRedirects() ) {
+			$redirectText = "<p>". $redirect . " " . $redirectLabel ."</p>";
+		}
+		
+		$out = Xml::openElement( 'form', array(	'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
+			Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n" .
+			"<p>" .
+			wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) .
+			"</p>\n" .
+			'<input type="hidden" name="advanced" value="'.$this->searchAdvanced."\"/>\n".
+			$tables .
+			"<hr style=\"clear: both;\" />\n".			
+			$redirectText ."\n".
+			"<div style=\"padding-top:2px;padding-bottom:2px;\">".
+			wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) .
+			"&nbsp;" .
+			$searchField .
+			"&nbsp;" .
+			$searchButton .
+			"</div>".
+			"</form>";
+		$t = Title::newFromText( $term );
+		/* if( $t != null && count($this->namespaces) === 1 ) {
+			$out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
+		} */
+		return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
+			Xml::element( 'legend', null, wfMsg('powersearch-legend') ) .
+			$this->formHeader($term) . $out . $this->didYouMeanHtml . 
+			Xml::closeElement( 'fieldset' );
+	}
+	
+	protected function searchFocus() {
+		global $wgJsMimeType;
+		return "<script type=\"$wgJsMimeType\">" .
+			"hookEvent(\"load\", function() {" .
+				"document.getElementById('searchText').focus();" .
+			"});" .
+			"</script>";
+	}
+
+	protected function powerSearchFocus() {
+		global $wgJsMimeType;
+		return "<script type=\"$wgJsMimeType\">" .
+			"hookEvent(\"load\", function() {" .
+				"document.getElementById('powerSearchText').focus();" .
+			"});" .
+			"</script>";
+	}
+
+	protected function formHeader( $term ) {
+		global $wgContLang, $wgCanonicalNamespaceNames;
+
+		$sep = '&nbsp;&nbsp;&nbsp;';
+		$out = Xml::openElement('div', array( 'style' => 'padding-bottom:0.5em;' ) );
+
+		$bareterm = $term;
+		if( $this->startsWithImage( $term ) )
+			$bareterm = substr( $term, strpos( $term, ':' ) + 1 ); // delete all/image prefix
+			
+		$nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
+
+		// search profiles headers
+		$m = wfMsg( 'searchprofile-articles' );
+		$tt = wfMsg( 'searchprofile-articles-tooltip', 
+			implode( ', ', SearchEngine::namespacesAsText( SearchEngine::defaultNamespaces() ) ) );
+		if( $this->active == 'default' ) {
+			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
+		} else {
+			$out .= $this->makeSearchLink( $bareterm, SearchEngine::defaultNamespaces(), $m, $tt );
+		}
+		$out .= $sep;
+		
+		$m = wfMsg( 'searchprofile-images' );
+		$tt = wfMsg( 'searchprofile-images-tooltip' );
+		if( $this->active == 'images' ) {
+			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
+		} else {
+			$imageTextForm = $wgContLang->getFormattedNsText(NS_FILE).':'.$bareterm;
+			$out .= $this->makeSearchLink( $imageTextForm, array( NS_FILE ) , $m, $tt );
+		}
+		$out .= $sep;
+		
+		/*
+		$m = wfMsg( 'searchprofile-articles-and-proj' );
+		$tt = wfMsg( 'searchprofile-project-tooltip', 
+			implode( ', ', SearchEngine::namespacesAsText( SearchEngine::defaultAndProjectNamespaces() ) ) );
+		if( $this->active == 'withproject' ) {
+			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
+		} else {
+			$out .= $this->makeSearchLink( $bareterm, SearchEngine::defaultAndProjectNamespaces(), $m, $tt );
+		}
+		$out .= $sep;
+		*/
+		
+		$m = wfMsg( 'searchprofile-project' );
+		$tt = wfMsg( 'searchprofile-project-tooltip', 
+			implode( ', ', SearchEngine::namespacesAsText( SearchEngine::projectNamespaces() ) ) );
+		if( $this->active == 'project' ) {
+			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
+		} else {
+			$out .= $this->makeSearchLink( $bareterm, SearchEngine::projectNamespaces(), $m, $tt );
+		}
+		$out .= $sep;
+			
+		$m = wfMsg( 'searchprofile-everything' );
+		$tt = wfMsg( 'searchprofile-everything-tooltip' );
+		if( $this->active == 'all' ) {
+			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
+		} else {
+			$out .= $this->makeSearchLink( $bareterm, $nsAllSet, $m, $tt );
+		}
+		$out .= $sep;
+		
+		$m = wfMsg( 'searchprofile-advanced' );
+		$tt = wfMsg( 'searchprofile-advanced-tooltip' );
+		if( $this->active == 'advanced' ) {
+			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
+		} else {
+			$out .= $this->makeSearchLink( $bareterm, $this->namespaces, $m, $tt, array( 'advanced' => '1' ) );
+		}
+		$out .= Xml::closeElement('div') ;
+		
+		return $out;
+	}
+	
+	protected function shortDialog( $term ) {
+		global $wgScript;
+		$searchTitle = SpecialPage::getTitleFor( 'Search' );
+		$searchable = SearchEngine::searchableNamespaces();
+		$out = Xml::openElement( 'form', array( 'id' => 'search', 'method' => 'get', 'action' => $wgScript ) );
+		$out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
+		// show namespaces only for advanced search
+		if( $this->active == 'advanced' ) {
+			$active = array();
+			foreach( $this->namespaces as $ns ) {
+				$active[$ns] = $searchable[$ns];
+			}
+			$out .= wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) . "<br/>\n";
+			$out .= $this->namespaceTables( $active, 1 )."<br/>\n";
+		// Still keep namespace settings otherwise, but don't show them
+		} else {
+			foreach( $this->namespaces as $ns ) {
+				$out .= Xml::hidden( "ns{$ns}", '1' );
+			}
+		}
+		// Keep redirect setting
+		$out .= Xml::hidden( "redirs", (int)$this->searchRedirects );
+		// Term box
+		$out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . "\n";
+		$out .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) );
+		$out .= ' (' . wfMsgExt('searchmenu-help',array('parseinline') ) . ')';
+		$out .= Xml::closeElement( 'form' );
+		// Add prefix link for single-namespace searches
+		$t = Title::newFromText( $term );
+		/*if( $t != null && count($this->namespaces) === 1 ) {
+			$out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
+		}*/
+		return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
+			Xml::element( 'legend', null, wfMsg('searchmenu-legend') ) .
+			$this->formHeader($term) . $out . $this->didYouMeanHtml .
+			Xml::closeElement( 'fieldset' );
+	}
+	
+	/** Make a search link with some target namespaces */
+	protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params=array() ) {
+		$opt = $params;
+		foreach( $namespaces as $n ) {
+			$opt['ns' . $n] = 1;
+		}
+		$opt['redirs'] = $this->searchRedirects ? 1 : 0;
+
+		$st = SpecialPage::getTitleFor( 'Search' );		
+		$stParams = wfArrayToCGI( array( 'search' => $term, 'fulltext' => wfMsg( 'search' ) ), $opt );
+
+		return Xml::element( 'a', 
+			array( 'href'=> $st->getLocalURL( $stParams ), 'title' => $tooltip ), 
+			$label );	
+	}
+	
+	/** Check if query starts with image: prefix */
+	protected function startsWithImage( $term ) {
+		global $wgContLang;
+		
+		$p = explode( ':', $term );
+		if( count( $p ) > 1 ) {
+			return $wgContLang->getNsIndex( $p[0] ) == NS_FILE;
+		}
+		return false;
+	}
+	
+	protected function namespaceTables( $namespaces, $rowsPerTable = 3 ) {
+		global $wgContLang;
+		// Group namespaces into rows according to subject.
+		// Try not to make too many assumptions about namespace numbering.
+		$rows = array();
+		$tables = "";
+		foreach( $namespaces as $ns => $name ) {
+			$subj = MWNamespace::getSubject( $ns );
+			if( !array_key_exists( $subj, $rows ) ) {
+				$rows[$subj] = "";
+			}
+			$name = str_replace( '_', ' ', $name );
+			if( '' == $name ) {
+				$name = wfMsg( 'blanknamespace' );
+			}
+			$rows[$subj] .= Xml::openElement( 'td', array( 'style' => 'white-space: nowrap' ) ) .
+				Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
+				Xml::closeElement( 'td' ) . "\n";
+		}
+		$rows = array_values( $rows );
+		$numRows = count( $rows );
+		// Lay out namespaces in multiple floating two-column tables so they'll
+		// be arranged nicely while still accommodating different screen widths
+		// Float to the right on RTL wikis
+		$tableStyle = $wgContLang->isRTL() ?
+			'float: right; margin: 0 0 0em 1em' : 'float: left; margin: 0 1em 0em 0';
+		// Build the final HTML table...
+		for( $i = 0; $i < $numRows; $i += $rowsPerTable ) {
+			$tables .= Xml::openElement( 'table', array( 'style' => $tableStyle ) );
+			for( $j = $i; $j < $i + $rowsPerTable && $j < $numRows; $j++ ) {
+				$tables .= "<tr>\n" . $rows[$j] . "</tr>";
+			}
+			$tables .= Xml::closeElement( 'table' ) . "\n";
+		}
+		return $tables;
+	}
+}
+
+/**
+ * implements Special:Search - Run text & title search and display the output
+ * @ingroup SpecialPage
+ */
+class SpecialSearchOld {
+
+	/**
+	 * Set up basic search parameters from the request and user settings.
+	 * Typically you'll pass $wgRequest and $wgUser.
+	 *
+	 * @param WebRequest $request
+	 * @param User $user
+	 * @public
+	 */
+	function __construct( &$request, &$user ) {
+		list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
+		$this->mPrefix = $request->getVal('prefix', '');
 		$this->namespaces = $this->powerSearch( $request );
 		if( empty( $this->namespaces ) ) {
 			$this->namespaces = SearchEngine::userNamespaces( $user );
@@ -119,13 +921,38 @@ class SpecialSearch {
 	 * @public
 	 */
 	function showResults( $term ) {
-		$fname = 'SpecialSearch::showResults';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		global $wgOut, $wgUser;
 		$sk = $wgUser->getSkin();
 
+		$search = SearchEngine::create();
+		$search->setLimitOffset( $this->limit, $this->offset );
+		$search->setNamespaces( $this->namespaces );
+		$search->showRedirects = $this->searchRedirects;
+		$search->prefix = $this->mPrefix;
+		$term = $search->transformSearchTerm($term);
+		
 		$this->setupPage( $term );
 
+		$rewritten = $search->replacePrefixes($term);
+		$titleMatches = $search->searchTitle( $rewritten );
+		$textMatches = $search->searchText( $rewritten );
+
+		// did you mean... suggestions
+		if($textMatches && $textMatches->hasSuggestion()){
+			$st = SpecialPage::getTitleFor( 'Search' );			
+			$stParams = wfArrayToCGI( array( 
+					'search' 	=> $textMatches->getSuggestionQuery(), 
+					'fulltext' 	=> wfMsg('search')),
+					$this->powerSearchOptions());
+					
+			$suggestLink = $sk->makeKnownLinkObj( $st,
+				$textMatches->getSuggestionSnippet(),
+				$stParams );
+			 		
+			$wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
+		}
+
 		$wgOut->addWikiMsg( 'searchresulttext' );
 
 		if( '' === trim( $term ) ) {
@@ -133,7 +960,7 @@ class SpecialSearch {
 			$wgOut->setSubtitle( '' );
 			$wgOut->addHTML( $this->powerSearchBox( $term ) );
 			$wgOut->addHTML( $this->powerSearchFocus() );
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return;
 		}
 
@@ -143,6 +970,7 @@ class SpecialSearch {
 			if( $wgSearchForwardUrl ) {
 				$url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl );
 				$wgOut->redirect( $url );
+				wfProfileOut( __METHOD__ );
 				return;
 			}
 			global $wgInputEncoding;
@@ -157,45 +985,21 @@ class SpecialSearch {
 				) .
 				Xml::closeElement( 'fieldset' )
 			);
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return;
 		}
 
-		$wgOut->addHTML( $this->shortDialog( $term ) );
-
-		$search = SearchEngine::create();
-		$search->setLimitOffset( $this->limit, $this->offset );
-		$search->setNamespaces( $this->namespaces );
-		$search->showRedirects = $this->searchRedirects;
-		$rewritten = $search->replacePrefixes($term);
-
-		$titleMatches = $search->searchTitle( $rewritten );
+		$wgOut->addHTML( $this->shortDialog( $term ) );		
 
 		// Sometimes the search engine knows there are too many hits
 		if ($titleMatches instanceof SearchResultTooMany) {
 			$wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
 			$wgOut->addHTML( $this->powerSearchBox( $term ) );
 			$wgOut->addHTML( $this->powerSearchFocus() );
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return;
 		}
 		
-		$textMatches = $search->searchText( $rewritten );
-
-		// did you mean... suggestions
-		if($textMatches && $textMatches->hasSuggestion()){
-			$st = SpecialPage::getTitleFor( 'Search' );			
-			$stParams = wfArrayToCGI( array( 
-					'search' 	=> $textMatches->getSuggestionQuery(), 
-					'fulltext' 	=> wfMsg('search')),
-					$this->powerSearchOptions());
-					
-			$suggestLink = '<a href="'.$st->escapeLocalURL($stParams).'">'.
-					$textMatches->getSuggestionSnippet().'</a>';
-			 		
-			$wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
-		}
-
 		// show number of results
 		$num = ( $titleMatches ? $titleMatches->numRows() : 0 )
 			+ ( $textMatches ? $textMatches->numRows() : 0);
@@ -207,7 +1011,7 @@ class SpecialSearch {
 		if ( $num > 0 ) {
 			if ( $totalNum > 0 ){
 				$top = wfMsgExt('showingresultstotal', array( 'parseinline' ), 
-					$this->offset+1, $this->offset+$num, $totalNum );
+					$this->offset+1, $this->offset+$num, $totalNum, $num );
 			} elseif ( $num >= $this->limit ) {
 				$top = wfShowingResults( $this->offset, $this->limit );
 			} else {
@@ -251,7 +1055,7 @@ class SpecialSearch {
 			}
 			// show interwiki results if any
 			if( $textMatches->hasInterwikiResults() )
-				$wgOut->addHtml( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
+				$wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
 			// show results
 			if( $textMatches->numRows() )
 				$wgOut->addHTML( $this->showMatches( $textMatches ) );
@@ -266,7 +1070,7 @@ class SpecialSearch {
 			$wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
 		}
 		$wgOut->addHTML( $this->powerSearchBox( $term ) );
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 	}
 
 	#------------------------------------------------------------------
@@ -277,12 +1081,14 @@ class SpecialSearch {
 	 */
 	function setupPage( $term ) {
 		global $wgOut;
-		if( !empty( $term ) )
-			$wgOut->setPageTitle( wfMsg( 'searchresults' ) );			
+		if( !empty( $term ) ){
+			$wgOut->setPageTitle( wfMsg( 'searchresults') );
+			$wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term) ) );
+		}			
 		$subtitlemsg = ( Title::newFromText( $term ) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
 		$wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) );
 		$wgOut->setArticleRelated( false );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 	}
 
 	/**
@@ -323,8 +1129,7 @@ class SpecialSearch {
 	 * @param SearchResultSet $matches
 	 */
 	function showMatches( &$matches ) {
-		$fname = 'SpecialSearch::showMatches';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		global $wgContLang;
 		$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
@@ -347,7 +1152,7 @@ class SpecialSearch {
 		// convert the whole thing to desired language variant
 		global $wgContLang;
 		$out = $wgContLang->convert( $out );
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $out;
 	}
 
@@ -357,12 +1162,11 @@ class SpecialSearch {
 	 * @param array $terms terms to highlight
 	 */
 	function showHit( $result, $terms ) {
-		$fname = 'SpecialSearch::showHit';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		global $wgUser, $wgContLang, $wgLang;
 		
 		if( $result->isBrokenTitle() ) {
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return "<!-- Broken link in search result -->\n";
 		}
 		
@@ -375,7 +1179,7 @@ class SpecialSearch {
 		//This is not quite safe, but better than showing excerpts from non-readable pages
 		//Note that hiding the entry entirely would screw up paging.
 		if (!$t->userCanRead()) {
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return "<li>{$link}</li>\n";
 		}
 
@@ -383,7 +1187,7 @@ class SpecialSearch {
 		// The least confusing at this point is to drop the result.
 		// You may get less results, but... oh well. :P
 		if( $result->isMissingRevision() ) {
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return "<!-- missing page " .
 				htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
 		}
@@ -434,18 +1238,18 @@ class SpecialSearch {
 				array('search'    => wfMsgForContent('searchrelated').':'.$t->getPrefixedText(),
 				      'fulltext'  => wfMsg('search') ));
 			
-			$related = ' -- <a href="'.$st->escapeLocalURL($stParams).'">'. 
-				wfMsg('search-relatedarticle').'</a>';
+			$related = ' -- ' . $sk->makeKnownLinkObj( $st,
+				wfMsg('search-relatedarticle'), $stParams );
 		}
 				
 		// Include a thumbnail for media files...
-		if( $t->getNamespace() == NS_IMAGE ) {
+		if( $t->getNamespace() == NS_FILE ) {
 			$img = wfFindFile( $t );
 			if( $img ) {
-				$thumb = $img->getThumbnail( 120, 120 );
+				$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
 				if( $thumb ) {
 					$desc = $img->getShortDesc();
-					wfProfileOut( $fname );
+					wfProfileOut( __METHOD__ );
 					// Ugly table. :D
 					// Float doesn't seem to interact well with the bullets.
 					// Table messes up vertical alignment of the bullet, but I'm
@@ -468,7 +1272,7 @@ class SpecialSearch {
 			}
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return "<li>{$link} {$redirect} {$section} {$extract}\n" .
 			"<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
 			"</li>\n";
@@ -481,8 +1285,7 @@ class SpecialSearch {
 	 * @param SearchResultSet $matches
 	 */
 	function showInterwiki( &$matches, $query ) {
-		$fname = 'SpecialSearch::showInterwiki';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		global $wgContLang;
 		$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
@@ -512,7 +1315,7 @@ class SpecialSearch {
 		// convert the whole thing to desired language variant
 		global $wgContLang;
 		$out = $wgContLang->convert( $out );
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $out;
 	}
 	
@@ -525,13 +1328,12 @@ class SpecialSearch {
 	 * @param string $query 
 	 * @param array $customCaptions iw prefix -> caption
 	 */
-	function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions){
-		$fname = 'SpecialSearch::showInterwikiHit';
-		wfProfileIn( $fname );
+	function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
+		wfProfileIn( __METHOD__ );
 		global $wgUser, $wgContLang, $wgLang;
 		
 		if( $result->isBrokenTitle() ) {
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return "<!-- Broken link in search result -->\n";
 		}
 		
@@ -569,7 +1371,7 @@ class SpecialSearch {
 		}
 
 		$out .= "<li>{$link} {$redirect}</li>\n"; 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $out;
 	}
 	
@@ -580,35 +1382,64 @@ class SpecialSearch {
 	 * @return $out string: HTML form
 	 */
 	function powerSearchBox( $term ) {
-		global $wgScript;
+		global $wgScript, $wgContLang;
 
-		$namespaces = '';
-		foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
+		$namespaces = SearchEngine::searchableNamespaces();
+
+		// group namespaces into rows according to subject; try not to make too
+		// many assumptions about namespace numbering
+		$rows = array();
+		foreach( $namespaces as $ns => $name ) {
+			$subj = MWNamespace::getSubject( $ns );
+			if( !array_key_exists( $subj, $rows ) ) {
+				$rows[$subj] = "";
+			}
 			$name = str_replace( '_', ' ', $name );
 			if( '' == $name ) {
 				$name = wfMsg( 'blanknamespace' );
 			}
-			$namespaces .= Xml::openElement( 'span', array( 'style' => 'white-space: nowrap' ) ) .
+			$rows[$subj] .= Xml::openElement( 'td', array( 'style' => 'white-space: nowrap' ) ) .
 					Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
-					Xml::closeElement( 'span' ) . "\n";
+					Xml::closeElement( 'td' ) . "\n";
+		}
+		$rows = array_values( $rows );
+		$numRows = count( $rows );
+
+		// lay out namespaces in multiple floating two-column tables so they'll
+		// be arranged nicely while still accommodating different screen widths
+		$rowsPerTable = 3;  // seems to look nice
+
+		// float to the right on RTL wikis
+		$tableStyle = ( $wgContLang->isRTL() ?
+				'float: right; margin: 0 0 1em 1em' :
+				'float: left; margin: 0 1em 1em 0' );
+
+		$tables = "";
+		for( $i = 0; $i < $numRows; $i += $rowsPerTable ) {
+			$tables .= Xml::openElement( 'table', array( 'style' => $tableStyle ) );
+			for( $j = $i; $j < $i + $rowsPerTable && $j < $numRows; $j++ ) {
+				$tables .= "<tr>\n" . $rows[$j] . "</tr>";
+			}
+			$tables .= Xml::closeElement( 'table' ) . "\n";
 		}
 
 		$redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
 		$redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
 		$searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
 		$searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n";
-
+		$searchTitle = SpecialPage::getTitleFor( 'Search' );
+		
 		$out = Xml::openElement( 'form', array(	'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
 			Xml::fieldset( wfMsg( 'powersearch-legend' ),
-				Xml::hidden( 'title', 'Special:Search' ) .
+				Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n" .
 				"<p>" .
 				wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) .
-				"<br />" .
-				$namespaces .
-				"</p>" .
+				"</p>\n" .
+				$tables .
+				"<hr style=\"clear: both\" />\n" .
 				"<p>" .
 				$redirect . " " . $redirectLabel .
-				"</p>" .
+				"</p>\n" .
 				wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) .
 				"&nbsp;" .
 				$searchField .
@@ -636,7 +1467,8 @@ class SpecialSearch {
 			'method' => 'get',
 			'action' => $wgScript
 		));
-		$out .= Xml::hidden( 'title', 'Special:Search' );
+		$searchTitle = SpecialPage::getTitleFor( 'Search' );
+		$out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() );
 		$out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . ' ';
 		foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
 			if( in_array( $ns, $this->namespaces ) ) {
diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php
index ca91ad51..560ba445 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -12,7 +12,7 @@ function wfSpecialSpecialpages() {
 
 	$wgMessageCache->loadAllMessages();
 
-	$wgOut->setRobotpolicy( 'noindex,nofollow' );  # Is this really needed?
+	$wgOut->setRobotPolicy( 'noindex,nofollow' );  # Is this really needed?
 	$sk = $wgUser->getSkin();
 
 	$pages = SpecialPage::getUsablePages();
diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index 570a21c6..109c5c30 100644
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -13,50 +13,214 @@
  *
  * @param mixed $par (not used)
  */
-function wfSpecialStatistics( $par = '' ) {
-	global $wgOut, $wgLang, $wgRequest;
-	$dbr = wfGetDB( DB_SLAVE );
+class SpecialStatistics extends SpecialPage {
+	
+	private $views, $edits, $good, $images, $total, $users,
+			$activeUsers, $admins, $numJobs = 0;
+	
+	public function __construct() {
+		parent::__construct( 'Statistics' );
+	}
+	
+	public function execute( $par ) {
+		global $wgOut, $wgRequest, $wgMessageCache;
+		global $wgDisableCounters, $wgMiserMode;
+		$wgMessageCache->loadAllMessages();
+		
+		$this->setHeaders();
+	
+		$this->views = SiteStats::views();
+		$this->edits = SiteStats::edits();
+		$this->good = SiteStats::articles();
+		$this->images = SiteStats::images();
+		$this->total = SiteStats::pages();
+		$this->users = SiteStats::users();
+		$this->activeUsers = SiteStats::activeUsers();
+		$this->admins = SiteStats::numberingroup('sysop');
+		$this->numJobs = SiteStats::jobs();
+	
+		# Staticic - views
+		$viewsStats = '';
+		if( !$wgDisableCounters ) {
+			$viewsStats = $this->getViewsStats();
+		}
+		
+		# Set active user count
+		if( !$wgMiserMode ) {
+			$dbw = wfGetDB( DB_MASTER );
+			SiteStatsUpdate::cacheUpdate( $dbw );
+		}
+	
+		# Do raw output
+		if( $wgRequest->getVal( 'action' ) == 'raw' ) {
+			$this->doRawOutput();
+		}
 
-	$views = SiteStats::views();
-	$edits = SiteStats::edits();
-	$good = SiteStats::articles();
-	$images = SiteStats::images();
-	$total = SiteStats::pages();
-	$users = SiteStats::users();
-	$admins = SiteStats::admins();
-	$numJobs = SiteStats::jobs();
+		$text = Xml::openElement( 'table', array( 'class' => 'mw-statistics-table' ) );
 
-	if( $wgRequest->getVal( 'action' ) == 'raw' ) {
-		$wgOut->disable();
-		header( 'Pragma: nocache' );
-		echo "total=$total;good=$good;views=$views;edits=$edits;users=$users;admins=$admins;images=$images;jobs=$numJobs\n";
-		return;
-	} else {
-		$text = "__NOTOC__\n";
-		$text .= '==' . wfMsgNoTrans( 'sitestats' ) . "==\n";
-		$text .= wfMsgExt( 'sitestatstext', array( 'parsemag' ),
-			$wgLang->formatNum( $total ),
-			$wgLang->formatNum( $good ),
-			$wgLang->formatNum( $views ),
-			$wgLang->formatNum( $edits ),
-			$wgLang->formatNum( sprintf( '%.2f', $total ? $edits / $total : 0 ) ),
-			$wgLang->formatNum( sprintf( '%.2f', $edits ? $views / $edits : 0 ) ),
-			$wgLang->formatNum( $numJobs ),
-			$wgLang->formatNum( $images )
-	   	)."\n";
+		# Statistic - pages
+		$text .= $this->getPageStats();		
+
+		# Statistic - edits
+		$text .= $this->getEditStats();
 
-		$text .= "==" . wfMsgNoTrans( 'userstats' ) . "==\n";
-		$text .= wfMsgExt( 'userstatstext', array ( 'parsemag' ),
-			$wgLang->formatNum( $users ),
-			$wgLang->formatNum( $admins ),
-			'[[' . wfMsgForContent( 'grouppage-sysop' ) . ']]', # TODO somehow remove, kept for backwards compatibility
-			$wgLang->formatNum( @sprintf( '%.2f', $admins / $users * 100 ) ),
-			User::makeGroupLinkWiki( 'sysop' )
-		)."\n";
+		# Statistic - users
+		$text .= $this->getUserStats();
 
-		global $wgDisableCounters, $wgMiserMode, $wgUser, $wgLang, $wgContLang;
+		# Statistic - usergroups
+		$text .= $this->getGroupStats();
+		$text .= $viewsStats;
+
+		# Statistic - popular pages
 		if( !$wgDisableCounters && !$wgMiserMode ) {
-			$res = $dbr->select(
+			$text .= $this->getMostViewedPages();
+		}
+
+		$text .= Xml::closeElement( 'table' );
+
+		# Customizable footer
+		$footer = wfMsgExt( 'statistics-footer', array('parseinline') );
+		if( !wfEmptyMsg( 'statistics-footer', $footer ) && $footer != '' ) {
+			$text .= "\n" . $footer;
+		}
+
+		$wgOut->addHTML( $text );
+	}
+
+	/**
+	 * Format a row
+	 * @param string $text description of the row
+	 * @param float $number a number
+	 * @param array $trExtraParams
+	 * @param string $descMsg
+	 * @param string $descMsgParam
+	 * @return string table row in HTML format
+	 */
+	private function formatRow( $text, $number, $trExtraParams = array(), $descMsg = '', $descMsgParam = '' ) {
+		global $wgStylePath;
+		if( $descMsg ) {
+			$descriptionText = wfMsgExt( $descMsg, array( 'parseinline' ), $descMsgParam );
+			if ( !wfEmptyMsg( $descMsg, $descriptionText ) ) {
+				$descriptionText = " ($descriptionText)";
+				$text .= "<br />" . Xml::element( 'small', array( 'class' => 'mw-statistic-desc'), 
+					$descriptionText );
+			}
+		}
+		return Xml::openElement( 'tr', $trExtraParams ) .
+			Xml::openElement( 'td' ) . $text . Xml::closeElement( 'td' ) .
+			Xml::openElement( 'td', array( 'class' => 'mw-statistics-numbers' ) ) . $number . Xml::closeElement( 'td' ) .
+			Xml::closeElement( 'tr' );
+	}
+	
+	/**
+	 * Each of these methods is pretty self-explanatory, get a particular
+	 * row for the table of statistics
+	 * @return string
+	 */
+	private function getPageStats() {
+		global $wgLang;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-pages', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-articles', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->good ),
+						array( 'class' => 'mw-statistics-articles' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-pages', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->total ),
+						array( 'class' => 'mw-statistics-pages' ),
+						'statistics-pages-desc' ) .
+				$this->formatRow( wfMsgExt( 'statistics-files', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->images ),
+						array( 'class' => 'mw-statistics-files' ) );
+	}
+	private function getEditStats() {
+		global $wgLang;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-edits', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-edits', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->edits ),
+						array( 'class' => 'mw-statistics-edits' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-edits-average', array( 'parseinline' ) ),
+						$wgLang->formatNum( sprintf( '%.2f', $this->total ? $this->edits / $this->total : 0 ) ),
+						array( 'class' => 'mw-statistics-edits-average' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-jobqueue', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->numJobs ),
+						array( 'class' => 'mw-statistics-jobqueue' ) );
+	}
+	private function getUserStats() {
+		global $wgLang, $wgRCMaxAge;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-users', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-users', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->users ),
+						array( 'class' => 'mw-statistics-users' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-users-active', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->activeUsers ),
+						array( 'class' => 'mw-statistics-users-active' ),
+						'statistics-users-active-desc',
+						$wgLang->formatNum( ceil( $wgRCMaxAge / ( 3600 * 24 ) ) ) );
+	}
+	private function getGroupStats() {
+		global $wgGroupPermissions, $wgImplicitGroups, $wgLang, $wgUser;
+		$sk = $wgUser->getSkin();
+		$text = '';
+		foreach( $wgGroupPermissions as $group => $permissions ) {
+			# Skip generic * and implicit groups
+			if ( in_array( $group, $wgImplicitGroups ) || $group == '*' ) {
+				continue;
+			}
+			$groupname = htmlspecialchars( $group );
+			$msg = wfMsg( 'group-' . $groupname );
+			if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) {
+				$groupnameLocalized = $groupname;
+			} else {
+				$groupnameLocalized = $msg;
+			}
+			$msg = wfMsgForContent( 'grouppage-' . $groupname );
+			if ( wfEmptyMsg( 'grouppage-' . $groupname, $msg ) || $msg == '' ) {
+				$grouppageLocalized = MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname;
+			} else {
+				$grouppageLocalized = $msg;
+			}
+			$grouppage = $sk->makeLink( $grouppageLocalized, htmlspecialchars( $groupnameLocalized ) );
+			$grouplink = $sk->link( SpecialPage::getTitleFor( 'Listusers' ),
+				wfMsgHtml( 'listgrouprights-members' ),
+				array(),
+				array( 'group' => $group ),
+				'known' );
+				# Add a class when a usergroup contains no members to allow hiding these rows
+			$classZero = '';
+			$countUsers = SiteStats::numberingroup( $groupname );
+			if( $countUsers == 0 ) {
+				$classZero = ' statistics-group-zero';
+			}
+			$text .= $this->formatRow( $grouppage . ' ' . $grouplink,
+				$wgLang->formatNum( $countUsers ),
+				array( 'class' => 'statistics-group-' . Sanitizer::escapeClass( $group ) . $classZero )  );
+		}
+		return $text;
+	}
+	private function getViewsStats() {
+		global $wgLang;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-views', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-views-total', array( 'parseinline' ) ),
+					$wgLang->formatNum( $this->views ),
+						array ( 'class' => 'mw-statistics-views-total' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-views-peredit', array( 'parseinline' ) ),
+					$wgLang->formatNum( sprintf( '%.2f', $this->edits ? 
+						$this->views / $this->edits : 0 ) ),
+						array ( 'class' => 'mw-statistics-views-peredit' ) );
+	}
+	private function getMostViewedPages() {
+		global $wgLang, $wgUser;
+		$text = '';
+		$dbr = wfGetDB( DB_SLAVE );
+		$sk = $wgUser->getSkin();
+		$res = $dbr->select(
 				'page',
 				array(
 					'page_namespace',
@@ -74,20 +238,33 @@ function wfSpecialStatistics( $par = '' ) {
 				)
 			);
 			if( $res->numRows() > 0 ) {
-				$text .= "==" . wfMsgNoTrans( 'statistics-mostpopular' ) . "==\n";
+				$text .= Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-mostpopular', array( 'parseinline' ) ) );
 				while( $row = $res->fetchObject() ) {
 					$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
-					if( $title instanceof Title )
-						$text .= '* [[:' . $title->getPrefixedText() . ']] (' . $wgLang->formatNum( $row->page_counter ) . ")\n";
+					if( $title instanceof Title ) {
+						$text .= $this->formatRow( $sk->link( $title ),
+								$wgLang->formatNum( $row->page_counter ) );
+	
+					}
 				}
 				$res->free();
 			}
-		}
-
-		$footer = wfMsgNoTrans( 'statistics-footer' );
-		if( !wfEmptyMsg( 'statistics-footer', $footer ) && $footer != '' )
-			$text .= "\n" . $footer;
-
-		$wgOut->addWikiText( $text );
+		return $text;
+	}
+	
+	/**
+	 * Do the action=raw output for this page. Legacy, but we support
+	 * it for backwards compatibility
+	 * http://lists.wikimedia.org/pipermail/wikitech-l/2008-August/039202.html
+	 */
+	private function doRawOutput() {
+		global $wgOut;
+		$wgOut->disable();
+		header( 'Pragma: nocache' );
+		echo "total=" . $this->total . ";good=" . $this->good . ";views=" . 
+				$this->views . ";edits=" . $this->edits . ";users=" . $this->users . ";";
+		echo "activeusers=" . $this->activeUsers . ";admins=" . $this->admins . 
+				";images=" . $this->images . ";jobs=" . $this->numJobs . "\n";
+		return;
 	}
-}
+}
\ No newline at end of file
diff --git a/includes/specials/SpecialUncategorizedimages.php b/includes/specials/SpecialUncategorizedimages.php
index 986ec967..25310081 100644
--- a/includes/specials/SpecialUncategorizedimages.php
+++ b/includes/specials/SpecialUncategorizedimages.php
@@ -31,7 +31,7 @@ class UncategorizedImagesPage extends ImageQueryPage {
 	function getSQL() {
 		$dbr = wfGetDB( DB_SLAVE );
 		list( $page, $categorylinks ) = $dbr->tableNamesN( 'page', 'categorylinks' );
-		$ns = NS_IMAGE;
+		$ns = NS_FILE;
 
 		return "SELECT 'Uncategorizedimages' AS type, page_namespace AS namespace,
 				page_title AS title, page_title AS value
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index d862ebb3..a9fb4ef1 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -119,7 +119,7 @@ class PageArchive {
 	 * @todo Does this belong in Image for fuller encapsulation?
 	 */
 	function listFiles() {
-		if( $this->title->getNamespace() == NS_IMAGE ) {
+		if( $this->title->getNamespace() == NS_FILE ) {
 			$dbr = wfGetDB( DB_SLAVE );
 			$res = $dbr->select( 'filearchive',
 				array(
@@ -336,7 +336,7 @@ class PageArchive {
 		$restoreText = $restoreAll || !empty( $timestamps );
 		$restoreFiles = $restoreAll || !empty( $fileVersions );
 
-		if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) {
+		if( $restoreFiles && $this->title->getNamespace() == NS_FILE ) {
 			$img = wfLocalFile( $this->title );
 			$this->fileStatus = $img->restore( $fileVersions, $unsuppress );
 			$filesRestored = $this->fileStatus->successCount;
@@ -412,7 +412,7 @@ class PageArchive {
 			# we'll update the latest revision field in the record.
 			$newid             = 0;
 			$pageId            = $page->page_id;
-			$previousRevId     = $page->page_latest;
+			$previousRevId    = $page->page_latest;
 			# Get the time span of this page
 			$previousTimestamp = $dbw->selectField( 'revision', 'rev_timestamp',
 				array( 'rev_id' => $previousRevId ),
@@ -461,25 +461,10 @@ class PageArchive {
 				'ar_title'     => $this->title->getDBkey(),
 				$oldones ),
 			__METHOD__,
-			/* options */ array(
-				'ORDER BY' => 'ar_timestamp' )
+			/* options */ array( 'ORDER BY' => 'ar_timestamp' )
 			);
 		$ret = $dbw->resultObject( $result );
-
 		$rev_count = $dbw->numRows( $result );
-		if( $rev_count ) {
-			# We need to seek around as just using DESC in the ORDER BY
-			# would leave the revisions inserted in the wrong order
-			$first = $ret->fetchObject();
-			$ret->seek( $rev_count - 1 );
-			$last = $ret->fetchObject();
-			// We don't handle well changing the top revision's settings
-			if( !$unsuppress && $last->ar_deleted && $last->ar_timestamp > $previousTimestamp ) {
-				wfDebug( __METHOD__.": restoration would result in a deleted top revision\n" );
-				return false;
-			}
-			$ret->seek( 0 );
-		}
 
 		if( $makepage ) {
 			$newid  = $article->insertOn( $dbw );
@@ -502,6 +487,12 @@ class PageArchive {
 				// a new text table entry will be created for it.
 				$revText = Revision::getRevisionText( $row, 'ar_' );
 			}
+			// Check for key dupes due to shitty archive integrity.
+			if( $row->ar_rev_id ) {
+				$exists = $dbw->selectField( 'revision', '1', array('rev_id' => $row->ar_rev_id), __METHOD__ );
+				if( $exists ) continue; // don't throw DB errors
+			}
+			
 			$revision = new Revision( array(
 				'page'       => $pageId,
 				'id'         => $row->ar_rev_id,
@@ -520,17 +511,32 @@ class PageArchive {
 
 			wfRunHooks( 'ArticleRevisionUndeleted', array( &$this->title, $revision, $row->ar_page_id ) );
 		}
+		# Now that it's safely stored, take it out of the archive
+		$dbw->delete( 'archive',
+			/* WHERE */ array(
+				'ar_namespace' => $this->title->getNamespace(),
+				'ar_title' => $this->title->getDBkey(),
+				$oldones ),
+			__METHOD__ );
+		
 		// Was anything restored at all?
-		if($restored == 0)
+		if( $restored == 0 )
 			return 0;
 
 		if( $revision ) {
 			// Attach the latest revision to the page...
 			$wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId );
-
 			if( $newid || $wasnew ) {
 				// Update site stats, link tables, etc
 				$article->createUpdates( $revision );
+				// We don't handle well with top revision deleted
+				if( $revision->getVisibility() ) {
+					$dbw->update( 'revision', 
+						array( 'rev_deleted' => 0 ),
+						array( 'rev_id' => $revision->getId() ),
+						__METHOD__
+					);
+				}
 			}
 
 			if( $newid ) {
@@ -541,7 +547,7 @@ class PageArchive {
 				Article::onArticleEdit( $this->title );
 			}
 
-			if( $this->title->getNamespace() == NS_IMAGE ) {
+			if( $this->title->getNamespace() == NS_FILE ) {
 				$update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
 				$update->doUpdate();
 			}
@@ -550,14 +556,6 @@ class PageArchive {
 			return self::UNDELETE_UNKNOWNERR;
 		}
 
-		# Now that it's safely stored, take it out of the archive
-		$dbw->delete( 'archive',
-			/* WHERE */ array(
-				'ar_namespace' => $this->title->getNamespace(),
-				'ar_title' => $this->title->getDBkey(),
-				$oldones ),
-			__METHOD__ );
-
 		return $restored;
 	}
 
@@ -570,7 +568,7 @@ class PageArchive {
  * @ingroup SpecialPage
  */
 class UndeleteForm {
-	var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj;
+	var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mTargetObj;
 	var $mTargetTimestamp, $mAllowed, $mComment, $mToken;
 
 	function UndeleteForm( $request, $par = "" ) {
@@ -585,6 +583,7 @@ class UndeleteForm {
 		$posted = $request->wasPosted() &&
 			$wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
 		$this->mRestore = $request->getCheck( 'restore' ) && $posted;
+		$this->mInvert = $request->getCheck( 'invert' ) && $posted;
 		$this->mPreview = $request->getCheck( 'preview' ) && $posted;
 		$this->mDiff = $request->getCheck( 'diff' );
 		$this->mComment = $request->getText( 'wpComment' );
@@ -606,7 +605,7 @@ class UndeleteForm {
 		} else {
 			$this->mTargetObj = NULL;
 		}
-		if( $this->mRestore ) {
+		if( $this->mRestore || $this->mInvert ) {
 			$timestamps = array();
 			$this->mFileVersions = array();
 			foreach( $_REQUEST as $key => $val ) {
@@ -666,6 +665,9 @@ class UndeleteForm {
 		if( $this->mRestore && $this->mAction == "submit" ) {
 			return $this->undelete();
 		}
+		if( $this->mInvert && $this->mAction == "submit" ) {
+			return $this->showHistory( );
+		}
 		return $this->showHistory();
 	}
 
@@ -673,21 +675,20 @@ class UndeleteForm {
 		global $wgOut, $wgScript;
 		$wgOut->addWikiMsg( 'undelete-header' );
 
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			Xml::openElement( 'form', array(
 				'method' => 'get',
 				'action' => $wgScript ) ) .
-			'<fieldset>' .
-			Xml::element( 'legend', array(),
-				wfMsg( 'undelete-search-box' ) ) .
+			Xml::fieldset( wfMsg( 'undelete-search-box' ) ) .
 			Xml::hidden( 'title',
 				SpecialPage::getTitleFor( 'Undelete' )->getPrefixedDbKey() ) .
 			Xml::inputLabel( wfMsg( 'undelete-search-prefix' ),
 				'prefix', 'prefix', 20,
-				$this->mSearchPrefix ) .
+				$this->mSearchPrefix ) . ' ' .
 			Xml::submitButton( wfMsg( 'undelete-search-submit' ) ) .
-			'</fieldset>' .
-			'</form>' );
+			Xml::closeElement( 'fieldset' ) .
+			Xml::closeElement( 'form' )
+		);
 	}
 
 	// Generic list of deleted pages
@@ -699,7 +700,7 @@ class UndeleteForm {
 			return;
 		}
 
-		$wgOut->addWikiMsg( "undeletepagetext" );
+		$wgOut->addWikiMsg( 'undeletepagetext', $wgLang->formatNum( $result->numRows() ) );
 
 		$sk = $wgUser->getSkin();
 		$undelete = SpecialPage::getTitleFor( 'Undelete' );
@@ -708,11 +709,10 @@ class UndeleteForm {
 			$title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
 			$link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ),
 				'target=' . $title->getPrefixedUrl() );
-			#$revs = wfMsgHtml( 'undeleterevisions', $wgLang->formatNum( $row->count ) );
 			$revs = wfMsgExt( 'undeleterevisions',
 				array( 'parseinline' ),
 				$wgLang->formatNum( $row->count ) );
-			$wgOut->addHtml( "<li>{$link} ({$revs})</li>\n" );
+			$wgOut->addHTML( "<li>{$link} ({$revs})</li>\n" );
 		}
 		$result->free();
 		$wgOut->addHTML( "</ul>\n" );
@@ -752,8 +752,6 @@ class UndeleteForm {
 			SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
 			htmlspecialchars( $this->mTargetObj->getPrefixedText() )
 		);
-		$time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) );
-		$user = $skin->revUserTools( $rev );
 
 		if( $this->mDiff ) {
 			$previousRev = $archive->getPreviousRevision( $timestamp );
@@ -762,59 +760,66 @@ class UndeleteForm {
 				if( $wgUser->getOption( 'diffonly' ) ) {
 					return;
 				} else {
-					$wgOut->addHtml( '<hr />' );
+					$wgOut->addHTML( '<hr />' );
 				}
 			} else {
-				$wgOut->addHtml( wfMsgHtml( 'undelete-nodiff' ) );
+				$wgOut->addHTML( wfMsgHtml( 'undelete-nodiff' ) );
 			}
 		}
 
-		$wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user ) . '</p>' );
+		// date and time are separate parameters to facilitate localisation.
+		// $time is kept for backward compat reasons.
+		$time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) );
+		$d = htmlspecialchars( $wgLang->date( $timestamp, true ) );
+		$t = htmlspecialchars( $wgLang->time( $timestamp, true ) );
+		$user = $skin->revUserTools( $rev );
+
+		$wgOut->addHTML( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</p>' );
 
 		wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
 
 		if( $this->mPreview ) {
-			$wgOut->addHtml( "<hr />\n" );
+			$wgOut->addHTML( "<hr />\n" );
 
 			//Hide [edit]s
 			$popts = $wgOut->parserOptions();
 			$popts->setEditSection( false );
 			$wgOut->parserOptions( $popts );
-			$wgOut->addWikiTextTitleTidy( $rev->revText(), $this->mTargetObj, true );
+			$wgOut->addWikiTextTitleTidy( $rev->getText( Revision::FOR_THIS_USER ), $this->mTargetObj, true );
 		}
 
-		$wgOut->addHtml(
-			wfElement( 'textarea', array(
+		$wgOut->addHTML(
+			Xml::element( 'textarea', array(
 					'readonly' => 'readonly',
 					'cols' => intval( $wgUser->getOption( 'cols' ) ),
 					'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
-				$rev->revText() . "\n" ) .
-			wfOpenElement( 'div' ) .
-			wfOpenElement( 'form', array(
+				$rev->getText( Revision::FOR_THIS_USER ) . "\n" ) .
+			Xml::openElement( 'div' ) .
+			Xml::openElement( 'form', array(
 				'method' => 'post',
 				'action' => $self->getLocalURL( "action=submit" ) ) ) .
-			wfElement( 'input', array(
+			Xml::element( 'input', array(
 				'type' => 'hidden',
 				'name' => 'target',
 				'value' => $this->mTargetObj->getPrefixedDbKey() ) ) .
-			wfElement( 'input', array(
+			Xml::element( 'input', array(
 				'type' => 'hidden',
 				'name' => 'timestamp',
 				'value' => $timestamp ) ) .
-			wfElement( 'input', array(
+			Xml::element( 'input', array(
 				'type' => 'hidden',
 				'name' => 'wpEditToken',
 				'value' => $wgUser->editToken() ) ) .
-			wfElement( 'input', array(
+			Xml::element( 'input', array(
 				'type' => 'submit',
 				'name' => 'preview',
 				'value' => wfMsg( 'showpreview' ) ) ) .
-			wfElement( 'input', array(
+			Xml::element( 'input', array(
 				'name' => 'diff',
 				'type' => 'submit',
 				'value' => wfMsg( 'showdiff' ) ) ) .
-			wfCloseElement( 'form' ) .
-			wfCloseElement( 'div' ) );
+			Xml::closeElement( 'form' ) .
+			Xml::closeElement( 'div' ) );
 	}
 
 	/**
@@ -829,7 +834,7 @@ class UndeleteForm {
 
 		$diffEngine = new DifferenceEngine();
 		$diffEngine->showDiffStyle();
-		$wgOut->addHtml(
+		$wgOut->addHTML(
 			"<div>" .
 			"<table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>" .
 			"<col class='diff-marker' />" .
@@ -838,11 +843,11 @@ class UndeleteForm {
 			"<col class='diff-content' />" .
 			"<tr>" .
 				"<td colspan='2' width='50%' align='center' class='diff-otitle'>" .
-				$this->diffHeader( $previousRev ) .
-				"</td>" .
+				$this->diffHeader( $previousRev, 'o' ) .
+				"</td>\n" .
 				"<td colspan='2' width='50%' align='center' class='diff-ntitle'>" .
-				$this->diffHeader( $currentRev ) .
-				"</td>" .
+				$this->diffHeader( $currentRev, 'n' ) .
+				"</td>\n" .
 			"</tr>" .
 			$diffEngine->generateDiffBody(
 				$previousRev->getText(), $currentRev->getText() ) .
@@ -851,7 +856,7 @@ class UndeleteForm {
 
 	}
 
-	private function diffHeader( $rev ) {
+	private function diffHeader( $rev, $prefix ) {
 		global $wgUser, $wgLang, $wgLang;
 		$sk = $wgUser->getSkin();
 		$isDeleted = !( $rev->getId() && $rev->getTitle() );
@@ -868,17 +873,17 @@ class UndeleteForm {
 			$targetQuery = 'oldid=' . $rev->getId();
 		}
 		return
-			'<div id="mw-diff-otitle1"><strong>' .
+			'<div id="mw-diff-'.$prefix.'title1"><strong>' .
 				$sk->makeLinkObj( $targetPage,
 					wfMsgHtml( 'revisionasof',
 						$wgLang->timeanddate( $rev->getTimestamp(), true ) ),
 					$targetQuery ) .
 				( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
 			'</strong></div>' .
-			'<div id="mw-diff-otitle2">' .
+			'<div id="mw-diff-'.$prefix.'title2">' .
 				$sk->revUserTools( $rev ) . '<br/>' .
 			'</div>' .
-			'<div id="mw-diff-otitle3">' .
+			'<div id="mw-diff-'.$prefix.'title3">' .
 				$sk->revComment( $rev ) . '<br/>' .
 			'</div>';
 	}
@@ -891,7 +896,8 @@ class UndeleteForm {
 		$file = new ArchivedFile( $this->mTargetObj, '', $this->mFile );
 		$wgOut->addWikiMsg( 'undelete-show-file-confirm',
 			$this->mTargetObj->getText(),
-			$wgLang->timeanddate( $file->getTimestamp() ) );
+			$wgLang->date( $file->getTimestamp() ),
+			$wgLang->time( $file->getTimestamp() ) );
 		$wgOut->addHTML( 
 			Xml::openElement( 'form', array( 
 				'method' => 'POST',
@@ -925,7 +931,7 @@ class UndeleteForm {
 		$store->stream( $key );
 	}
 
-	private function showHistory() {
+	private function showHistory( ) {
 		global $wgLang, $wgUser, $wgOut;
 
 		$sk = $wgUser->getSkin();
@@ -984,7 +990,7 @@ class UndeleteForm {
 			$action = $titleObj->getLocalURL( "action=submit" );
 			# Start the form here
 			$top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) );
-			$wgOut->addHtml( $top );
+			$wgOut->addHTML( $top );
 		}
 
 		# Show relevant lines from the deletion log:
@@ -1007,8 +1013,7 @@ class UndeleteForm {
 				$unsuppressBox = "";
 			}
 			$table =
-				Xml::openElement( 'fieldset' ) .
-				Xml::element( 'legend', null, wfMsg( 'undelete-fieldset-title' ) ).
+				Xml::fieldset( wfMsg( 'undelete-fieldset-title' ) ) .
 				Xml::openElement( 'table', array( 'id' => 'mw-undelete-table' ) ) .
 					"<tr>
 						<td colspan='2'>" .
@@ -1026,15 +1031,16 @@ class UndeleteForm {
 					<tr>
 						<td>&nbsp;</td>
 						<td class='mw-submit'>" .
-							Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) .
-							Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) .
+							Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) . ' ' .
+							Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) . ' ' .
+							Xml::submitButton( wfMsg( 'undeleteinvert' ), array( 'name' => 'invert', 'id' => 'mw-undelete-invert' ) ) .
 						"</td>
 					</tr>" .
 					$unsuppressBox .
 				Xml::closeElement( 'table' ) .
 				Xml::closeElement( 'fieldset' );
 
-			$wgOut->addHtml( $table );
+			$wgOut->addHTML( $table );
 		}
 
 		$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'history' ) ) . "\n" );
@@ -1044,7 +1050,7 @@ class UndeleteForm {
 			$wgOut->addHTML("<ul>");
 			$target = urlencode( $this->mTarget );
 			$remaining = $revisions->numRows();
-			$earliestLiveTime = $this->getEarliestTime( $this->mTargetObj );
+			$earliestLiveTime = $this->mTargetObj->getEarliestRevTime();
 
 			while( $row = $revisions->fetchObject() ) {
 				$remaining--;
@@ -1057,8 +1063,8 @@ class UndeleteForm {
 		}
 
 		if( $haveFiles ) {
-			$wgOut->addHtml( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
-			$wgOut->addHtml( "<ul>" );
+			$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
+			$wgOut->addHTML( "<ul>" );
 			while( $row = $files->fetchObject() ) {
 				$wgOut->addHTML( $this->formatFileRow( $row, $sk ) );
 			}
@@ -1071,7 +1077,7 @@ class UndeleteForm {
 			$misc  = Xml::hidden( 'target', $this->mTarget );
 			$misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 			$misc .= Xml::closeElement( 'form' );
-			$wgOut->addHtml( $misc );
+			$wgOut->addHTML( $misc );
 		}
 
 		return true;
@@ -1093,7 +1099,15 @@ class UndeleteForm {
 		$stxt = '';
 		$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
 		if( $this->mAllowed ) {
-			$checkBox = Xml::check( "ts$ts" );
+			if( $this->mInvert){
+				if( in_array( $ts, $this->mTargetTimestamp ) ) {
+					$checkBox = Xml::check( "ts$ts");
+				} else {
+					$checkBox = Xml::check( "ts$ts", true );
+				}
+			} else {
+				$checkBox = Xml::check( "ts$ts" );
+			}
 			$titleObj = SpecialPage::getTitleFor( "Undelete" );
 			$pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
 			# Last link
@@ -1123,7 +1137,6 @@ class UndeleteForm {
 			// If revision was hidden from sysops
 				$del = wfMsgHtml('rev-delundel');
 			} else {
-				$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
 				$del = $sk->makeKnownLinkObj( $revdel,
 					wfMsgHtml('rev-delundel'),
 					'target=' . $this->mTargetObj->getPrefixedUrl() . "&artimestamp=$ts" );
@@ -1183,18 +1196,6 @@ class UndeleteForm {
 		return "<li>$checkBox $revdlink $pageLink . . $userLink $data $comment</li>\n";
 	}
 
-	private function getEarliestTime( $title ) {
-		$dbr = wfGetDB( DB_SLAVE );
-		if( $title->exists() ) {
-			$min = $dbr->selectField( 'revision',
-				'MIN(rev_timestamp)',
-				array( 'rev_page' => $title->getArticleId() ),
-				__METHOD__ );
-			return wfTimestampOrNull( TS_MW, $min );
-		}
-		return null;
-	}
-
 	/**
 	 * Fetch revision text link if it's available to all users
 	 * @return string
@@ -1286,10 +1287,10 @@ class UndeleteForm {
 
 				$skin = $wgUser->getSkin();
 				$link = $skin->makeKnownLinkObj( $this->mTargetObj );
-				$wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
+				$wgOut->addHTML( wfMsgWikiHtml( 'undeletedpage', $link ) );
 			} else {
 				$wgOut->showFatalError( wfMsg( "cannotundelete" ) );
-				$wgOut->addHtml( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
+				$wgOut->addHTML( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
 			}
 
 			// Show file deletion warnings and errors
diff --git a/includes/specials/SpecialUnusedimages.php b/includes/specials/SpecialUnusedimages.php
index d71b638f..4adf405d 100644
--- a/includes/specials/SpecialUnusedimages.php
+++ b/includes/specials/SpecialUnusedimages.php
@@ -33,7 +33,7 @@ class UnusedimagesPage extends ImageQueryPage {
 					FROM ((($page AS I LEFT JOIN $categorylinks AS L ON I.page_id = L.cl_from)
 						LEFT JOIN $imagelinks AS P ON I.page_title = P.il_to)
 						INNER JOIN $image AS G ON I.page_title = G.img_name)
-					WHERE I.page_namespace = ".NS_IMAGE." AND L.cl_from IS NULL AND P.il_to IS NULL";
+					WHERE I.page_namespace = ".NS_FILE." AND L.cl_from IS NULL AND P.il_to IS NULL";
 		} else {
 			list( $image, $imagelinks ) = $dbr->tableNamesN( 'image','imagelinks' );
 
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 3a79e052..450c8728 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -23,7 +23,7 @@ class UploadForm {
 	const BEFORE_PROCESSING = 1;
 	const LARGE_FILE_SERVER = 2;
 	const EMPTY_FILE = 3;
-	const MIN_LENGHT_PARTNAME = 4;
+	const MIN_LENGTH_PARTNAME = 4;
 	const ILLEGAL_FILENAME = 5;
 	const PROTECTED_PAGE = 6;
 	const OVERWRITE_EXISTING_FILE = 7;
@@ -300,7 +300,7 @@ class UploadForm {
 				$this->mainUploadForm( wfMsgHtml( 'emptyfile' ) );
 				break;
 
-			case self::MIN_LENGHT_PARTNAME:
+			case self::MIN_LENGTH_PARTNAME:
 				$this->mainUploadForm( wfMsgHtml( 'minlength1' ) );
 				break;
 
@@ -328,10 +328,7 @@ class UploadForm {
 					wfMsgExt( 'filetype-banned-type',
 						array( 'parseinline' ),
 						htmlspecialchars( $finalExt ),
-						implode(
-							wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ),
-							$wgFileExtensions
-						),
+						$wgLang->commaList( $wgFileExtensions ),
 						$wgLang->formatNum( count($wgFileExtensions) )
 					)
 				);
@@ -402,7 +399,15 @@ class UploadForm {
 			$basename = $this->mSrcName;
 		}
 		$filtered = wfStripIllegalFilenameChars( $basename );
-
+		
+		/* Normalize to title form before we do any further processing */
+		$nt = Title::makeTitleSafe( NS_FILE, $filtered );
+		if( is_null( $nt ) ) {
+			$resultDetails = array( 'filtered' => $filtered );
+			return self::ILLEGAL_FILENAME;
+		}
+		$filtered = $nt->getDBkey();
+		
 		/**
 		 * We'll want to blacklist against *any* 'extension', and use
 		 * only the final one for the whitelist.
@@ -423,14 +428,9 @@ class UploadForm {
 		}
 
 		if( strlen( $partname ) < 1 ) {
-			return self::MIN_LENGHT_PARTNAME;
+			return self::MIN_LENGTH_PARTNAME;
 		}
 
-		$nt = Title::makeTitleSafe( NS_IMAGE, $filtered );
-		if( is_null( $nt ) ) {
-			$resultDetails = array( 'filtered' => $filtered );
-			return self::ILLEGAL_FILENAME;
-		}
 		$this->mLocalFile = wfLocalFile( $nt );
 		$this->mDestName = $this->mLocalFile->getName();
 
@@ -520,10 +520,7 @@ class UploadForm {
 					wfMsgExt( 'filetype-unwanted-type',
 						array( 'parseinline' ),
 						htmlspecialchars( $finalExt ),
-						implode(
-							wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ),
-							$wgFileExtensions
-						),
+						$wgLang->commaList( $wgFileExtensions ),
 						$wgLang->formatNum( count($wgFileExtensions) )
 					) . '</li>';
 				}
@@ -544,7 +541,7 @@ class UploadForm {
 				$warning .= self::getExistsWarning( $this->mLocalFile );
 			}
 			
-			$warning .= $this->getDupeWarning( $this->mTempPath );
+			$warning .= $this->getDupeWarning( $this->mTempPath, $finalExt );
 			
 			if( $warning != '' ) {
 				/**
@@ -610,7 +607,7 @@ class UploadForm {
 			// extensions (eg 'jpg' rather than 'JPEG').
 			//
 			// Check for another file using the normalized form...
-			$nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() );
+			$nt_lc = Title::makeTitle( NS_FILE, $partname . '.' . $file->getExtension() );
 			$file_lc = wfLocalFile( $nt_lc );
 		} else {
 			$file_lc = false;
@@ -737,7 +734,7 @@ class UploadForm {
 	public static function ajaxGetLicensePreview( $license ) {
 		global $wgParser, $wgUser;
 		$text = '{{' . $license . '}}';
-		$title = Title::makeTitle( NS_IMAGE, 'Sample.jpg' );
+		$title = Title::makeTitle( NS_FILE, 'Sample.jpg' );
 		$options = ParserOptions::newFromUser( $wgUser );
 
 		// Expand subst: first, then live templates...
@@ -751,9 +748,10 @@ class UploadForm {
 	 * Check for duplicate files and throw up a warning before the upload
 	 * completes.
 	 */
-	function getDupeWarning( $tempfile ) {
+	function getDupeWarning( $tempfile, $extension ) {
 		$hash = File::sha1Base36( $tempfile );
 		$dupes = RepoGroup::singleton()->findBySha1( $hash );
+		$archivedImage = new ArchivedFile( null, 0, $hash.".$extension" );
 		if( $dupes ) {
 			global $wgOut;
 			$msg = "<gallery>";
@@ -767,6 +765,10 @@ class UploadForm {
 				wfMsgExt( "file-exists-duplicate", array( "parse" ), count( $dupes ) ) .
 				$wgOut->parse( $msg ) .
 				"</li>\n";
+		} elseif ( $archivedImage->getID() > 0 ) {
+			global $wgOut;
+			$name = Title::makeTitle( NS_FILE, $archivedImage->getName() )->getPrefixedText();
+			return Xml::tags( 'li', null, wfMsgExt( 'file-deleted-duplicate', array( 'parseinline' ), array( $name ) ) );
 		} else {
 			return '';
 		}
@@ -961,7 +963,7 @@ wgUploadAutoFill = {$autofill};
 		}
 
 		if( $this->mDesiredDestName ) {
-			$title = Title::makeTitleSafe( NS_IMAGE, $this->mDesiredDestName );
+			$title = Title::makeTitleSafe( NS_FILE, $this->mDesiredDestName );
 			// Show a subtitle link to deleted revisions (to sysops et al only)
 			if( $title instanceof Title && ( $count = $title->isDeleted() ) > 0 && $wgUser->isAllowed( 'deletedhistory' ) ) {
 				$link = wfMsgExt(
@@ -972,7 +974,7 @@ wgUploadAutoFill = {$autofill};
 						wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $count )
 					)
 				);
-				$wgOut->addHtml( "<div id=\"contentSub2\">{$link}</div>" );
+				$wgOut->addHTML( "<div id=\"contentSub2\">{$link}</div>" );
 			}
 
 			// Show the relevant lines from deletion log (for still deleted files only)
@@ -1005,21 +1007,20 @@ wgUploadAutoFill = {$autofill};
 
 		$allowedExtensions = '';
 		if( $wgCheckFileExtensions ) {
-			$delim = wfMsgExt( 'comma-separator', array( 'escapenoentities' ) );
 			if( $wgStrictFileExtensions ) {
 				# Everything not permitted is banned
 				$extensionsList =
 					'<div id="mw-upload-permitted">' .
-					wfMsgWikiHtml( 'upload-permitted', implode( $wgFileExtensions, $delim ) ) .
+					wfMsgWikiHtml( 'upload-permitted', $wgLang->commaList( $wgFileExtensions ) ) .
 					"</div>\n";
 			} else {
 				# We have to list both preferred and prohibited
 				$extensionsList =
 					'<div id="mw-upload-preferred">' .
-					wfMsgWikiHtml( 'upload-preferred', implode( $wgFileExtensions, $delim ) ) .
+					wfMsgWikiHtml( 'upload-preferred', $wgLang->commaList( $wgFileExtensions ) ) .
 					"</div>\n" .
 					'<div id="mw-upload-prohibited">' .
-					wfMsgWikiHtml( 'upload-prohibited', implode( $wgFileBlacklist, $delim ) ) .
+					wfMsgWikiHtml( 'upload-prohibited', $wgLang->commaList( $wgFileBlacklist ) ) .
 					"</div>\n";
 			}
 		} else {
@@ -1169,7 +1170,7 @@ wgUploadAutoFill = {$autofill};
 				<tr>"
 			);
 			if( $useAjaxLicensePreview ) {
-				$wgOut->addHtml( "
+				$wgOut->addHTML( "
 						<td></td>
 						<td id=\"mw-license-preview\"></td>
 					</tr>
@@ -1205,7 +1206,7 @@ wgUploadAutoFill = {$autofill};
 			);
 		}
 
-		$wgOut->addHtml( "
+		$wgOut->addHTML( "
 				<td></td>
 				<td>
 					<input tabindex='7' type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' />
@@ -1279,7 +1280,7 @@ wgUploadAutoFill = {$autofill};
 	 *
 	 * @return array
 	 */
-	function splitExtensions( $filename ) {
+	public function splitExtensions( $filename ) {
 		$bits = explode( '.', $filename );
 		$basename = array_shift( $bits );
 		return array( $basename, $bits );
@@ -1305,7 +1306,7 @@ wgUploadAutoFill = {$autofill};
 	 * @param array $list
 	 * @return bool
 	 */
-	function checkFileExtensionList( $ext, $list ) {
+	public function checkFileExtensionList( $ext, $list ) {
 		foreach( $ext as $e ) {
 			if( in_array( strtolower( $e ), $list ) ) {
 				return true;
@@ -1754,7 +1755,7 @@ wgUploadAutoFill = {$autofill};
 	function showError( $description ) {
 		global $wgOut;
 		$wgOut->setPageTitle( wfMsg( "internalerror" ) );
-		$wgOut->setRobotpolicy( "noindex,nofollow" );
+		$wgOut->setRobotPolicy( "noindex,nofollow" );
 		$wgOut->setArticleRelated( false );
 		$wgOut->enableClientCache( false );
 		$wgOut->addWikiText( $description );
@@ -1797,14 +1798,14 @@ wgUploadAutoFill = {$autofill};
 		$loglist = new LogEventsList( $wgUser->getSkin(), $out );
 		$pager = new LogPager( $loglist, 'delete', false, $filename );
 		if( $pager->getNumRows() > 0 ) {
-			$out->addHtml( '<div id="mw-upload-deleted-warn">' );
+			$out->addHTML( '<div class="mw-warning-with-logexcerpt">' );
 			$out->addWikiMsg( 'upload-wasdeleted' );
 			$out->addHTML(
 				$loglist->beginLogEventsList() .
 				$pager->getBody() .
 				$loglist->endLogEventsList()
 			);
-			$out->addHtml( '</div>' );
+			$out->addHTML( '</div>' );
 		}
 	}
 }
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 27009eed..6a4da7a4 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -33,6 +33,7 @@ class LoginForm {
 	const RESET_PASS = 7;
 	const ABORTED = 8;
 	const CREATE_BLOCKED = 9;
+	const THROTTLED = 10;
 
 	var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
 	var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
@@ -128,9 +129,10 @@ class LoginForm {
 		$result = $this->mailPasswordInternal( $u, false, 'createaccount-title', 'createaccount-text' );
 
 		wfRunHooks( 'AddNewAccount', array( $u, true ) );
+		$u->addNewUserLogEntry();
 
 		$wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 
 		if( WikiError::isError( $result ) ) {
@@ -174,14 +176,16 @@ class LoginForm {
 		# Save settings (including confirmation token)
 		$u->saveSettings();
 
-		# If not logged in, assume the new account as the current one and set session cookies
-		# then show a "welcome" message or a "need cookies" message as needed
+		# If not logged in, assume the new account as the current one and set
+		# session cookies then show a "welcome" message or a "need cookies"
+		# message as needed
 		if( $wgUser->isAnon() ) {
 			$wgUser = $u;
 			$wgUser->setCookies();
 			wfRunHooks( 'AddNewAccount', array( $wgUser ) );
+			$wgUser->addNewUserLogEntry();
 			if( $this->hasSessionCookie() ) {
-				return $this->successfulLogin( 'welcomecreation', $wgUser->getName(), false );
+				return $this->successfulCreation();
 			} else {
 				return $this->cookieRedirectCheck( 'new' );
 			}
@@ -192,9 +196,10 @@ class LoginForm {
 			$wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) );
 			$wgOut->setArticleRelated( false );
 			$wgOut->setRobotPolicy( 'noindex,nofollow' );
-			$wgOut->addHtml( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
+			$wgOut->addHTML( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
 			$wgOut->returnToMain( false, $self );
 			wfRunHooks( 'AddNewAccount', array( $u ) );
+			$u->addNewUserLogEntry();
 			return true;
 		}
 	}
@@ -215,12 +220,11 @@ class LoginForm {
 			return false;
 		}
 
-		// If we are not allowing users to login locally, we should
-		// be checking to see if the user is actually able to
-		// authenticate to the authentication server before they
-		// create an account (otherwise, they can create a local account
-		// and login as any domain user). We only need to check this for
-		// domains that aren't local.
+		// If we are not allowing users to login locally, we should be checking
+		// to see if the user is actually able to authenticate to the authenti-
+		// cation server before they create an account (otherwise, they can
+		// create a local account and login as any domain user). We only need
+		// to check this for domains that aren't local.
 		if( 'local' != $this->mDomain && '' != $this->mDomain ) {
 			if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mName ) || !$wgAuth->authenticate( $this->mName, $this->mPassword ) ) ) {
 				$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
@@ -280,7 +284,8 @@ class LoginForm {
 			}
 		}
 
-		# if you need a confirmed email address to edit, then obviously you need an email address.
+		# if you need a confirmed email address to edit, then obviously you
+		# need an email address.
 		if ( $wgEmailConfirmToEdit && empty( $this->mEmail ) ) {
 			$this->mainLoginForm( wfMsg( 'noemailtitle' ) );
 			return false;
@@ -291,8 +296,8 @@ class LoginForm {
 			return false;
 		}
 
-		# Set some additional data so the AbortNewAccount hook can be
-		# used for more than just username validation
+		# Set some additional data so the AbortNewAccount hook can be used for
+		# more than just username validation
 		$u->setEmail( $this->mEmail );
 		$u->setRealName( $this->mRealName );
 
@@ -306,14 +311,15 @@ class LoginForm {
 
 		if ( $wgAccountCreationThrottle && $wgUser->isPingLimitable() ) {
 			$key = wfMemcKey( 'acctcreate', 'ip', $ip );
-			$value = $wgMemc->incr( $key );
+			$value = $wgMemc->get( $key );
 			if ( !$value ) {
-				$wgMemc->set( $key, 1, 86400 );
+				$wgMemc->set( $key, 0, 86400 );
 			}
-			if ( $value > $wgAccountCreationThrottle ) {
+			if ( $value >= $wgAccountCreationThrottle ) {
 				$this->throttleHit( $wgAccountCreationThrottle );
 				return false;
 			}
+			$wgMemc->incr( $key );
 		}
 
 		if( !$wgAuth->addUser( $u, $this->mPassword, $this->mEmail, $this->mRealName ) ) {
@@ -372,12 +378,32 @@ class LoginForm {
 		if ( '' == $this->mName ) {
 			return self::NO_NAME;
 		}
+		
+		global $wgPasswordAttemptThrottle;
+
+		$throttleCount=0;
+		if ( is_array($wgPasswordAttemptThrottle) ) {
+			$throttleKey = wfMemcKey( 'password-throttle', wfGetIP(), md5( $this->mName ) );
+			$count = $wgPasswordAttemptThrottle['count'];
+			$period = $wgPasswordAttemptThrottle['seconds'];
+			
+			global $wgMemc;
+			$throttleCount = $wgMemc->get($throttleKey);
+			if ( !$throttleCount ) {
+				$wgMemc->add( $throttleKey, 1, $period ); // start counter
+			} else if ( $throttleCount < $count ) {
+				$wgMemc->incr($throttleKey);
+			} else if ( $throttleCount >= $count ) {
+				return self::THROTTLED;
+			}
+		}
 
-		// Load $wgUser now, and check to see if we're logging in as the same name. 
-		// This is necessary because loading $wgUser (say by calling getName()) calls
-		// the UserLoadFromSession hook, which potentially creates the user in the 
-		// database. Until we load $wgUser, checking for user existence using 
-		// User::newFromName($name)->getId() below will effectively be using stale data.
+		// Load $wgUser now, and check to see if we're logging in as the same
+		// name. This is necessary because loading $wgUser (say by calling
+		// getName()) calls the UserLoadFromSession hook, which potentially
+		// creates the user in the database. Until we load $wgUser, checking
+		// for user existence using User::newFromName($name)->getId() below
+		// will effectively be using stale data.
 		if ( $wgUser->getName() === $this->mName ) {
 			wfDebug( __METHOD__.": already logged in as {$this->mName}\n" );
 			return self::SUCCESS;
@@ -407,34 +433,30 @@ class LoginForm {
 
 		if (!$u->checkPassword( $this->mPassword )) {
 			if( $u->checkTemporaryPassword( $this->mPassword ) ) {
-				// The e-mailed temporary password should not be used
-				// for actual logins; that's a very sloppy habit,
-				// and insecure if an attacker has a few seconds to
-				// click "search" on someone's open mail reader.
+				// The e-mailed temporary password should not be used for actu-
+				// al logins; that's a very sloppy habit, and insecure if an
+				// attacker has a few seconds to click "search" on someone's o-
+				// pen mail reader.
 				//
-				// Allow it to be used only to reset the password
-				// a single time to a new value, which won't be in
-				// the user's e-mail archives.
+				// Allow it to be used only to reset the password a single time
+				// to a new value, which won't be in the user's e-mail ar-
+				// chives.
 				//
-				// For backwards compatibility, we'll still recognize
-				// it at the login form to minimize surprises for
-				// people who have been logging in with a temporary
-				// password for some time.
-				//
-				// As a side-effect, we can authenticate the user's
-				// e-mail address if it's not already done, since
-				// the temporary password was sent via e-mail.
+				// For backwards compatibility, we'll still recognize it at the
+				// login form to minimize surprises for people who have been
+				// logging in with a temporary password for some time.
 				//
+				// As a side-effect, we can authenticate the user's e-mail ad-
+				// dress if it's not already done, since the temporary password
+				// was sent via e-mail.
 				if( !$u->isEmailConfirmed() ) {
 					$u->confirmEmail();
 					$u->saveSettings();
 				}
 
-				// At this point we just return an appropriate code
-				// indicating that the UI should show a password
-				// reset form; bot interfaces etc will probably just
-				// fail cleanly here.
-				//
+				// At this point we just return an appropriate code/ indicating
+				// that the UI should show a password reset form; bot inter-
+				// faces etc will probably just fail cleanly here.
 				$retval = self::RESET_PASS;
 			} else {
 				$retval = '' == $this->mPassword ? self::EMPTY_PASS : self::WRONG_PASS;
@@ -443,6 +465,11 @@ class LoginForm {
 			$wgAuth->updateUser( $u );
 			$wgUser = $u;
 
+			// Please reset throttle for successful logins, thanks!
+			if($throttleCount) {
+				$wgMemc->delete($throttleKey);
+			}
+
 			if ( $isAutoCreated ) {
 				// Must be run after $wgUser is set, for correct new user log
 				wfRunHooks( 'AuthPluginAutoCreate', array( $wgUser ) );
@@ -455,16 +482,16 @@ class LoginForm {
 	}
 
 	/**
-	 * Attempt to automatically create a user on login.
-	 * Only succeeds if there is an external authentication method which allows it.
+	 * Attempt to automatically create a user on login. Only succeeds if there
+	 * is an external authentication method which allows it.
 	 * @return integer Status code
 	 */
 	function attemptAutoCreate( $user ) {
 		global $wgAuth, $wgUser;
 		/**
-		 * If the external authentication plugin allows it,
-		 * automatically create a new account for users that
-		 * are externally defined but have not yet logged in.
+		 * If the external authentication plugin allows it, automatically cre-
+		 * ate a new account for users that are externally defined but have not
+		 * yet logged in.
 		 */
 		if ( !$wgAuth->autoCreate() ) {
 			return self::NOT_EXISTS;
@@ -502,14 +529,19 @@ class LoginForm {
 				}
 				$wgUser->setCookies();
 
+				// Reset the throttle
+				$key = wfMemcKey( 'password-throttle', wfGetIP(), md5( $this->mName ) );
+				global $wgMemc;
+				$wgMemc->delete( $key );
+
 				if( $this->hasSessionCookie() || $this->mSkipCookieCheck ) {
-					/* Replace the language object to provide user interface in correct
-					 * language immediately on this first page load.
+					/* Replace the language object to provide user interface in
+					 * correct language immediately on this first page load.
 					 */
 					global $wgLang, $wgRequest;
 					$code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
 					$wgLang = Language::factory( $code );
-					return $this->successfulLogin( 'loginsuccess', $wgUser->getName() );
+					return $this->successfulLogin();
 				} else {
 					return $this->cookieRedirectCheck( 'login' );
 				}
@@ -524,7 +556,7 @@ class LoginForm {
 				break;
 			case self::NOT_EXISTS:
 				if( $wgUser->isAllowed( 'createaccount' ) ){
-					$this->mainLoginForm( wfMsg( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
+					$this->mainLoginForm( wfMsgWikiHtml( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
 				} else {
 					$this->mainLoginForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->mName ) ) );
 				}
@@ -541,6 +573,9 @@ class LoginForm {
 			case self::CREATE_BLOCKED:
 				$this->userBlockedMessage();
 				break;
+			case self::THROTTLED:
+				$this->mainLoginForm( wfMsg( 'login-throttled' ) );
+				break;
 			default:
 				throw new MWException( "Unhandled case value" );
 		}
@@ -548,8 +583,8 @@ class LoginForm {
 
 	function resetLoginForm( $error ) {
 		global $wgOut;
-		$wgOut->addWikiText( "<div class=\"errorbox\">$error</div>" );
-		$reset = new PasswordResetForm( $this->mName, $this->mPassword );
+		$wgOut->addHTML( Xml::element('p', array( 'class' => 'error' ), $error ) );
+		$reset = new SpecialResetpass();
 		$reset->execute( null );
 	}
 
@@ -587,14 +622,15 @@ class LoginForm {
 			return;
 		}
 		if ( 0 == $u->getID() ) {
-			$this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
+			$this->mainLoginForm( wfMsgWikiHtml( 'nosuchuser', htmlspecialchars( $u->getName() ) ) );
 			return;
 		}
 
 		# Check against password throttle
 		if ( $u->isPasswordReminderThrottled() ) {
 			global $wgPasswordReminderResendTime;
-			# Round the time in hours to 3 d.p., in case someone is specifying minutes or seconds.
+			# Round the time in hours to 3 d.p., in case someone is specifying
+			# minutes or seconds.
 			$this->mainLoginForm( wfMsgExt( 'throttled-mailpassword', array( 'parsemag' ),
 				round( $wgPasswordReminderResendTime, 3 ) ) );
 			return;
@@ -618,20 +654,22 @@ class LoginForm {
 	 * @private
 	 */
 	function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
-		global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
-		global $wgServer, $wgScript;
+		global $wgServer, $wgScript, $wgUser;
 
 		if ( '' == $u->getEmail() ) {
 			return new WikiError( wfMsg( 'noemail', $u->getName() ) );
 		}
+		$ip = wfGetIP();
+		if( !$ip ) {
+			return new WikiError( wfMsg( 'badipaddress' ) );
+		}
+		
+		wfRunHooks( 'User::mailPasswordInternal', array(&$wgUser, &$ip, &$u) );
 
 		$np = $u->randomPassword();
 		$u->setNewpassword( $np, $throttle );
 		$u->saveSettings();
 
-		$ip = wfGetIP();
-		if ( '' == $ip ) { $ip = '(Unknown)'; }
-
 		$m = wfMsg( $emailText, $ip, $u->getName(), $np, $wgServer . $wgScript );
 		$result = $u->sendMail( wfMsg( $emailTitle ), $m );
 
@@ -640,29 +678,66 @@ class LoginForm {
 
 
 	/**
-	 * @param string $msg Message key that will be shown on success
-	 * @param $params String: parameters for the above message
-	 * @param bool $auto Toggle auto-redirect to main page; default true
+	 * Run any hooks registered for logins, then HTTP redirect to
+	 * $this->mReturnTo (or Main Page if that's undefined).  Formerly we had a
+	 * nice message here, but that's really not as useful as just being sent to
+	 * wherever you logged in from.  It should be clear that the action was
+	 * successful, given the lack of error messages plus the appearance of your
+	 * name in the upper right.
+	 *
 	 * @private
 	 */
-	function successfulLogin( $msg, $params, $auto = true ) {
-		global $wgUser;
-		global $wgOut;
+	function successfulLogin() {
+		global $wgUser, $wgOut;
 
-		# Run any hooks; ignore results
+		# Run any hooks; display injected HTML if any, else redirect
+		$injected_html = '';
+		wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
 
+		if( $injected_html !== '' ) {
+			$this->displaySuccessfulLogin( 'loginsuccess', $injected_html );
+		} else {
+			$titleObj = Title::newFromText( $this->mReturnTo );
+			if ( !$titleObj instanceof Title ) {
+				$titleObj = Title::newMainPage();
+			}
+
+			$wgOut->redirect( $titleObj->getFullURL() );
+		}
+	}
+
+	/**
+	 * Run any hooks registered for logins, then display a message welcoming
+	 * the user.
+	 *
+	 * @private
+	 */
+	function successfulCreation() {
+		global $wgUser, $wgOut;
+
+		# Run any hooks; display injected HTML
 		$injected_html = '';
 		wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
 
+		$this->displaySuccessfulLogin( 'welcomecreation', $injected_html );
+	}
+
+	/**
+	 * Display a "login successful" page.
+	 */
+	private function displaySuccessfulLogin( $msgname, $injected_html ) {
+		global $wgOut, $wgUser;
+
 		$wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
-		$wgOut->addWikiMsgArray( $msg, $params );
-		$wgOut->addHtml( $injected_html );
+		$wgOut->addWikiMsg( $msgname, $wgUser->getName() );
+		$wgOut->addHTML( $injected_html );
+
 		if ( !empty( $this->mReturnTo ) ) {
-			$wgOut->returnToMain( $auto, $this->mReturnTo );
+			$wgOut->returnToMain( null, $this->mReturnTo );
 		} else {
-			$wgOut->returnToMain( $auto );
+			$wgOut->returnToMain( null );
 		}
 	}
 
@@ -671,11 +746,12 @@ class LoginForm {
 		global $wgOut;
 
 		$wgOut->setPageTitle( wfMsg( 'permissionserrors' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 
 		$wgOut->addWikitext( $wgOut->formatPermissionsErrorMessage( $errors, 'createaccount' ) );
-		// Stuff that might want to be added at the end. For example, instructions if blocked.
+		// Stuff that might want to be added at the end. For example, instruc-
+		// tions if blocked.
 		$wgOut->addWikiMsg( 'cantcreateaccount-nonblock-text' );
 
 		$wgOut->returnToMain( false );
@@ -694,7 +770,7 @@ class LoginForm {
 		# out.
 
 		$wgOut->setPageTitle( wfMsg( 'cantcreateaccounttitle' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 
 		$ip = wfGetIP();
@@ -713,8 +789,8 @@ class LoginForm {
 	 */
 	function mainLoginForm( $msg, $msgtype = 'error' ) {
 		global $wgUser, $wgOut, $wgAllowRealName, $wgEnableEmail;
-		global $wgCookiePrefix, $wgAuth, $wgLoginLanguageSelector;
-		global $wgAuth, $wgEmailConfirmToEdit;
+		global $wgCookiePrefix, $wgLoginLanguageSelector;
+		global $wgAuth, $wgEmailConfirmToEdit, $wgCookieExpiration;
 		
 		$titleObj = SpecialPage::getTitleFor( 'Userlogin' );
 		
@@ -792,6 +868,7 @@ class LoginForm {
 		$template->set( 'useemail', $wgEnableEmail );
 		$template->set( 'emailrequired', $wgEmailConfirmToEdit );
 		$template->set( 'canreset', $wgAuth->allowPasswordChange() );
+		$template->set( 'canremember', ( $wgCookieExpiration > 0 ) );
 		$template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember  );
 
 		# Prepare language selection links as needed
@@ -810,7 +887,7 @@ class LoginForm {
 		}
 
 		$wgOut->setPageTitle( wfMsg( 'userlogin' ) );
-		$wgOut->setRobotpolicy( 'noindex,nofollow' );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 		$wgOut->disallowUserJs();  // just in case...
 		$wgOut->addTemplate( $template );
@@ -832,9 +909,9 @@ class LoginForm {
 	/**
 	 * Check if a session cookie is present.
 	 *
-	 * This will not pick up a cookie set during _this_ request, but is
-	 * meant to ensure that the client is returning the cookie which was
-	 * set on a previous pass through the system.
+	 * This will not pick up a cookie set during _this_ request, but is meant
+	 * to ensure that the client is returning the cookie which was set on a
+	 * previous pass through the system.
 	 *
 	 * @private
 	 */
@@ -850,7 +927,9 @@ class LoginForm {
 		global $wgOut;
 
 		$titleObj = SpecialPage::getTitleFor( 'Userlogin' );
-		$check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
+		$query = array( 'wpCookieCheck' => $type );
+		if ( $this->mReturnTo ) $query['returnto'] = $this->mReturnTo;
+		$check = $titleObj->getFullURL( $query );
 
 		return $wgOut->redirect( $check );
 	}
@@ -871,7 +950,7 @@ class LoginForm {
 				return $this->mainLoginForm( wfMsg( 'error' ) );
 			}
 		} else {
-			return $this->successfulLogin( 'loginsuccess', $wgUser->getName() );
+			return $this->successfulLogin();
 		}
 	}
 
@@ -879,9 +958,7 @@ class LoginForm {
 	 * @private
 	 */
 	function throttleHit( $limit ) {
-		global $wgOut;
-
-		$wgOut->addWikiMsg( 'acct_creation_throttle_hit', $limit );
+		$this->mainLoginForm( wfMsgExt( 'acct_creation_throttle_hit', array( 'parseinline' ), $limit ) );
 	}
 
 	/**
diff --git a/includes/specials/SpecialUserlogout.php b/includes/specials/SpecialUserlogout.php
index 137eadb4..3d497bd7 100644
--- a/includes/specials/SpecialUserlogout.php
+++ b/includes/specials/SpecialUserlogout.php
@@ -12,7 +12,7 @@ function wfSpecialUserlogout() {
 
 	$oldName = $wgUser->getName();
 	$wgUser->logout();
-	$wgOut->setRobotpolicy( 'noindex,nofollow' );
+	$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 	// Hook.
 	$injected_html = '';
diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index fd3c690b..ce0097b2 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -26,10 +26,14 @@ class UserrightsPage extends SpecialPage {
 	}
 
 	public function userCanExecute( $user ) {
+		return $this->userCanChangeRights( $user, false );
+	}
+
+	public function userCanChangeRights( $user, $checkIfSelf = true ) {
 		$available = $this->changeableGroups();
 		return !empty( $available['add'] )
 			or !empty( $available['remove'] )
-			or ($this->isself and
+			or ( ( $this->isself || !$checkIfSelf ) and
 				(!empty( $available['add-self'] )
 				 or !empty( $available['remove-self'] )));
 	}
@@ -65,7 +69,7 @@ class UserrightsPage extends SpecialPage {
 		if ($this->mTarget == $wgUser->getName())
 			$this->isself = true;
 
-		if( !$this->userCanExecute( $wgUser ) ) {
+		if( !$this->userCanChangeRights( $wgUser, true ) ) {
 			// fixme... there may be intermediate groups we can mention.
 			global $wgOut;
 			$wgOut->showPermissionsErrorPage( array(
@@ -141,13 +145,8 @@ class UserrightsPage extends SpecialPage {
 
 		// Validate input set...
 		$changeable = $this->changeableGroups();
-		if ($wgUser->getId() != 0 && $wgUser->getId() == $user->getId()) {
-			$addable = array_merge($changeable['add'], $wgGroupsAddToSelf);
-			$removable = array_merge($changeable['remove'], $wgGroupsRemoveFromSelf);
-		} else {
-			$addable = $changeable['add'];
-			$removable = $changeable['remove'];
-		}
+		$addable = array_merge( $changeable['add'], $this->isself ? $changeable['add-self'] : array() );
+		$removable = array_merge( $changeable['remove'], $this->isself ? $changeable['remove-self'] : array() );
 
 		$removegroup = array_unique(
 			array_intersect( (array)$removegroup, $removable ) );
@@ -289,7 +288,7 @@ class UserrightsPage extends SpecialPage {
 
 	function makeGroupNameList( $ids ) {
 		if( empty( $ids ) ) {
-			return wfMsg( 'rightsnone' );
+			return wfMsgForContent( 'rightsnone' );
 		} else {
 			return implode( ', ', $ids );
 		}
@@ -329,14 +328,13 @@ class UserrightsPage extends SpecialPage {
 	 * @return Array:  Tuple of addable, then removable groups
 	 */
 	protected function splitGroups( $groups ) {
-		global $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
-		list($addable, $removable) = array_values( $this->changeableGroups() );
+		list($addable, $removable, $addself, $removeself) = array_values( $this->changeableGroups() );
 
 		$removable = array_intersect(
-				array_merge($this->isself ? $wgGroupsRemoveFromSelf : array(), $removable),
+				array_merge( $this->isself ? $removeself : array(), $removable ),
 				$groups ); // Can't remove groups the user doesn't have
 		$addable   = array_diff(
-				array_merge($this->isself ? $wgGroupsAddToSelf : array(), $addable),
+				array_merge( $this->isself ? $addself : array(), $addable ),
 				$groups ); // Can't add groups the user does have
 
 		return array( $addable, $removable );
@@ -351,10 +349,8 @@ class UserrightsPage extends SpecialPage {
 	protected function showEditUserGroupsForm( $user, $groups ) {
 		global $wgOut, $wgUser, $wgLang;
 
-		list( $addable, $removable ) = $this->splitGroups( $groups );
-
 		$list = array();
-		foreach( $user->getGroups() as $group )
+		foreach( $groups as $group )
 			$list[] = self::buildGroupLink( $group );
 
 		$grouplist = '';
@@ -384,7 +380,7 @@ class UserrightsPage extends SpecialPage {
 				<tr>
 					<td></td>
 					<td class='mw-submit'>" .
-						Xml::submitButton( wfMsg( 'saveusergroups' ), array( 'name' => 'saveusergroups' ) ) .
+						Xml::submitButton( wfMsg( 'saveusergroups' ), array( 'name' => 'saveusergroups', 'accesskey' => 's' ) ) .
 					"</td>
 				</tr>" .
 			Xml::closeElement( 'table' ) . "\n" .
@@ -510,10 +506,10 @@ class UserrightsPage extends SpecialPage {
 	/**
 	 * Returns an array of the groups that the user can add/remove.
 	 *
-	 * @return Array array( 'add' => array( addablegroups ), 'remove' => array( removablegroups ) )
+	 * @return Array array( 'add' => array( addablegroups ), 'remove' => array( removablegroups ) , 'add-self' => array( addablegroups to self), 'remove-self' => array( removable groups from self) )
 	 */
 	function changeableGroups() {
-		global $wgUser, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
+		global $wgUser;
 
 		if( $wgUser->isAllowed( 'userrights' ) ) {
 			// This group gives the right to modify everything (reverse-
@@ -533,8 +529,8 @@ class UserrightsPage extends SpecialPage {
 		$groups = array(
 				'add' => array(),
 				'remove' => array(),
-				'add-self' => $wgGroupsAddToSelf,
-				'remove-self' => $wgGroupsRemoveFromSelf);
+				'add-self' => array(),
+				'remove-self' => array() );
 		$addergroups = $wgUser->getEffectiveGroups();
 
 		foreach ($addergroups as $addergroup) {
@@ -543,7 +539,13 @@ class UserrightsPage extends SpecialPage {
 			);
 			$groups['add']    = array_unique( $groups['add'] );
 			$groups['remove'] = array_unique( $groups['remove'] );
+			$groups['add-self'] = array_unique( $groups['add-self'] );
+			$groups['remove-self'] = array_unique( $groups['remove-self'] );
 		}
+		
+		// Run a hook because we can
+		wfRunHooks( 'UserrightsChangeableGroups', array( $this, $wgUser, $addergroups, &$groups ) );
+		
 		return $groups;
 	}
 
@@ -551,12 +553,12 @@ class UserrightsPage extends SpecialPage {
 	 * Returns an array of the groups that a particular group can add/remove.
 	 *
 	 * @param $group String: the group to check for whether it can add/remove
-	 * @return Array array( 'add' => array( addablegroups ), 'remove' => array( removablegroups ) )
+	 * @return Array array( 'add' => array( addablegroups ), 'remove' => array( removablegroups ) , 'add-self' => array( addablegroups to self), 'remove-self' => array( removable groups from self) )
 	 */
 	private function changeableByGroup( $group ) {
-		global $wgAddGroups, $wgRemoveGroups;
+		global $wgAddGroups, $wgRemoveGroups, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
 
-		$groups = array( 'add' => array(), 'remove' => array() );
+		$groups = array( 'add' => array(), 'remove' => array(), 'add-self' => array(), 'remove-self' => array() );
 		if( empty($wgAddGroups[$group]) ) {
 			// Don't add anything to $groups
 		} elseif( $wgAddGroups[$group] === true ) {
@@ -573,6 +575,40 @@ class UserrightsPage extends SpecialPage {
 		} elseif( is_array($wgRemoveGroups[$group]) ) {
 			$groups['remove'] = $wgRemoveGroups[$group];
 		}
+		
+		// Re-map numeric keys of AddToSelf/RemoveFromSelf to the 'user' key for backwards compatibility
+		if( empty($wgGroupsAddToSelf['user']) || $wgGroupsAddToSelf['user'] !== true ) {
+			foreach($wgGroupsAddToSelf as $key => $value) {
+				if( is_int($key) ) {
+					$wgGroupsAddToSelf['user'][] = $value;
+				}
+			}
+		}
+		
+		if( empty($wgGroupsRemoveFromSelf['user']) || $wgGroupsRemoveFromSelf['user'] !== true ) {
+			foreach($wgGroupsRemoveFromSelf as $key => $value) {
+				if( is_int($key) ) {
+					$wgGroupsRemoveFromSelf['user'][] = $value;
+				}
+			}
+		}
+		
+		// Now figure out what groups the user can add to him/herself
+		if( empty($wgGroupsAddToSelf[$group]) ) {
+		} elseif( $wgGroupsAddToSelf[$group] === true ) {
+			// No idea WHY this would be used, but it's there
+			$groups['add-self'] = User::getAllGroups();
+		} elseif( is_array($wgGroupsAddToSelf[$group]) ) {
+			$groups['add-self'] = $wgGroupsAddToSelf[$group];
+		}
+		
+		if( empty($wgGroupsRemoveFromSelf[$group]) ) {
+		} elseif( $wgGroupsRemoveFromSelf[$group] === true ) {
+			$groups['remove-self'] = User::getAllGroups();
+		} elseif( is_array($wgGroupsRemoveFromSelf[$group]) ) {
+			$groups['remove-self'] = $wgGroupsRemoveFromSelf[$group];
+		}
+		
 		return $groups;
 	}
 
@@ -583,7 +619,7 @@ class UserrightsPage extends SpecialPage {
 	 * @param $output OutputPage to use
 	 */
 	protected function showLogFragment( $user, $output ) {
-		$output->addHtml( Xml::element( 'h2', null, LogPage::logName( 'rights' ) . "\n" ) );
+		$output->addHTML( Xml::element( 'h2', null, LogPage::logName( 'rights' ) . "\n" ) );
 		LogEventsList::showLogExtract( $output, 'rights', $user->getUserPage()->getPrefixedText() );
 	}
 }
diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 8c8e386d..29f527f2 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -1,42 +1,37 @@
 <?php
-/**#@+
+
+/**
  * Give information about the version of MediaWiki, PHP, the DB and extensions
  *
- * @file
  * @ingroup SpecialPage
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
-
-/**
- * constructor
- */
-function wfSpecialVersion() {
-	$version = new SpecialVersion;
-	$version->execute();
-}
-
-/**
- * @ingroup SpecialPage
- */
-class SpecialVersion {
+class SpecialVersion extends SpecialPage {
 	private $firstExtOpened = true;
 
+	function __construct(){
+		parent::__construct( 'Version' );	
+	}
+
 	/**
 	 * main()
 	 */
-	function execute() {
+	function execute( $par ) {
 		global $wgOut, $wgMessageCache, $wgSpecialVersionShowHooks;
 		$wgMessageCache->loadAllMessages();
 
+		$this->setHeaders();
+		$this->outputHeader();
+
 		$wgOut->addHTML( '<div dir="ltr">' );
 		$text = 
 			$this->MediaWikiCredits() .
 			$this->softwareInformation() .
 			$this->extensionCredits();
-		if  ( $wgSpecialVersionShowHooks ) {
+		if ( $wgSpecialVersionShowHooks ) {
 			$text .= $this->wgHooks();
 		}
 		$wgOut->addWikiText( $text );
@@ -162,15 +157,21 @@ class SpecialVersion {
 				usort( $wgExtensionCredits[$type], array( $this, 'compare' ) );
 
 				foreach ( $wgExtensionCredits[$type] as $extension ) {
+					$version = null;
+					$subVersion = '';
 					if ( isset( $extension['version'] ) ) {
 						$version = $extension['version'];
-					} elseif ( isset( $extension['svn-revision'] ) && 
+					}
+					if ( isset( $extension['svn-revision'] ) && 
 						preg_match( '/\$(?:Rev|LastChangedRevision|Revision): *(\d+)/', 
-							$extension['svn-revision'], $m ) ) 
-					{
-						$version = 'r' . $m[1];
-					} else {
-						$version = null;
+							$extension['svn-revision'], $m ) ) {
+						$subVersion = 'r' . $m[1];
+					}
+
+					if( $version && $subVersion ) {
+						$version = $version . ' [' . $subVersion . ']';
+					} elseif ( !$version && $subVersion ) {
+						$version = $subVersion;
 					}
 
 					$out .= $this->formatCredits(
@@ -287,8 +288,6 @@ class SpecialVersion {
 	}
 
 	/**
-	 * @static
-	 *
 	 * @return string
 	 */
 	function IPInfo() {
@@ -306,35 +305,34 @@ class SpecialVersion {
 
 		if ( $cnt == 1 ) {
 			// Enforce always returning a string
-			return (string)$this->arrayToString( $list[0] );
+			return (string)self::arrayToString( $list[0] );
 		} elseif ( $cnt == 0 ) {
 			return '';
 		} else {
+			global $wgLang;
 			sort( $list );
-			$t = array_slice( $list, 0, $cnt - 1 );
-			$one = array_map( array( &$this, 'arrayToString' ), $t );
-			$two = $this->arrayToString( $list[$cnt - 1] );
-			$and = wfMsg( 'and' );
-
-			return implode( ', ', $one ) . " $and $two";
+			return $wgLang->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) );
 		}
 	}
 
 	/**
-	 * @static
-	 *
 	 * @param mixed $list Will convert an array to string if given and return
 	 *                    the paramater unaltered otherwise
 	 * @return mixed
 	 */
-	function arrayToString( $list ) {
+	static function arrayToString( $list ) {
+		if( is_array( $list ) && count( $list ) == 1 )
+			$list = $list[0];
 		if( is_object( $list ) ) {
 			$class = get_class( $list );
 			return "($class)";
-		} elseif ( ! is_array( $list ) ) {
+		} elseif ( !is_array( $list ) ) {
 			return $list;
 		} else {
-			$class = get_class( $list[0] );
+			if( is_object( $list[0] ) )
+				$class = get_class( $list[0] );
+			else 
+				$class = $list[0];
 			return "($class, {$list[1]})";
 		}
 	}
@@ -387,5 +385,3 @@ class SpecialVersion {
 
 	/**#@-*/
 }
-
-/**#@-*/
diff --git a/includes/specials/SpecialWantedfiles.php b/includes/specials/SpecialWantedfiles.php
new file mode 100644
index 00000000..c2731fa9
--- /dev/null
+++ b/includes/specials/SpecialWantedfiles.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ * Querypage that lists the most wanted files - implements Special:Wantedfiles
+ *
+ * @ingroup SpecialPage
+ *
+ * @author Soxred93 <soxred93@gmail.com>
+ * @copyright Copyright © 2008, Soxred93
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ */
+class WantedFilesPage extends QueryPage {
+
+	function getName() {
+		return 'Wantedfiles';
+	}
+
+	function isExpensive() {
+		return true;
+	}
+
+	function isSyndicated() {
+		return false;
+	}
+
+	function getSQL() {
+		$dbr = wfGetDB( DB_SLAVE );
+		list( $imagelinks, $page ) = $dbr->tableNamesN( 'imagelinks', 'page' );
+		$name = $dbr->addQuotes( $this->getName() );
+		return
+			"
+			SELECT
+				$name as type,
+				" . NS_FILE . " as namespace,
+				il_to as title,
+				COUNT(*) as value
+			FROM $imagelinks
+			LEFT JOIN $page ON il_to = page_title AND page_namespace = ". NS_FILE ."
+			WHERE page_title IS NULL
+			GROUP BY il_to
+			";
+	}
+
+	function sortDescending() { return true; }
+
+	/**
+	 * Fetch user page links and cache their existence
+	 */
+	function preprocessResults( $db, $res ) {
+		$batch = new LinkBatch;
+		while ( $row = $db->fetchObject( $res ) )
+			$batch->add( $row->namespace, $row->title );
+		$batch->execute();
+
+		// Back to start for display
+		if ( $db->numRows( $res ) > 0 )
+			// If there are no rows we get an error seeking.
+			$db->dataSeek( $res, 0 );
+	}
+
+	function formatResult( $skin, $result ) {
+		global $wgLang, $wgContLang;
+
+		$nt = Title::makeTitle( $result->namespace, $result->title );
+		$text = $wgContLang->convert( $nt->getText() );
+
+		$plink = $this->isCached() ?
+			$skin->makeLinkObj( $nt, htmlspecialchars( $text ) ) :
+			$skin->makeBrokenLinkObj( $nt, htmlspecialchars( $text ) );
+
+		$nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
+			$wgLang->formatNum( $result->value ) );
+		return wfSpecialList($plink, $nlinks);
+	}
+}
+
+/**
+ * constructor
+ */
+function wfSpecialWantedFiles() {
+	list( $limit, $offset ) = wfCheckLimits();
+
+	$wpp = new WantedFilesPage();
+
+	$wpp->doQuery( $offset, $limit );
+}
diff --git a/includes/specials/SpecialWantedtemplates.php b/includes/specials/SpecialWantedtemplates.php
new file mode 100644
index 00000000..43b5cf8f
--- /dev/null
+++ b/includes/specials/SpecialWantedtemplates.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ * A querypage to list the most wanted templates - implements Special:Wantedtemplates
+ * based on SpecialWantedcategories.php by Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+ * makeWlhLink() taken from SpecialMostlinkedtemplates by Rob Church <robchur@gmail.com>
+ *
+ * @ingroup SpecialPage
+ *
+ * @author Danny B.
+ * @copyright Copyright © 2008, Danny B.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ */
+class WantedTemplatesPage extends QueryPage {
+
+	function getName() {
+		return 'Wantedtemplates';
+	}
+
+	function isExpensive() {
+		return true;
+	}
+
+	function isSyndicated() {
+		return false;
+	}
+
+	function getSQL() {
+		$dbr = wfGetDB( DB_SLAVE );
+		list( $templatelinks, $page ) = $dbr->tableNamesN( 'templatelinks', 'page' );
+		$name = $dbr->addQuotes( $this->getName() );
+		return
+			"
+			  SELECT $name as type, 
+			         tl_namespace as namespace,
+			         tl_title as title,
+			         COUNT(*) as value
+			    FROM $templatelinks LEFT JOIN
+			         $page ON tl_title = page_title AND tl_namespace = page_namespace
+			   WHERE page_title IS NULL AND tl_namespace = ". NS_TEMPLATE ."
+			GROUP BY tl_title
+			";
+	}
+
+	function sortDescending() { return true; }
+
+	/**
+	 * Fetch user page links and cache their existence
+	 */
+	function preprocessResults( $db, $res ) {
+		$batch = new LinkBatch;
+		while ( $row = $db->fetchObject( $res ) )
+			$batch->add( $row->namespace, $row->title );
+		$batch->execute();
+
+		// Back to start for display
+		if ( $db->numRows( $res ) > 0 )
+			// If there are no rows we get an error seeking.
+			$db->dataSeek( $res, 0 );
+	}
+
+	function formatResult( $skin, $result ) {
+		global $wgLang, $wgContLang;
+
+		$nt = Title::makeTitle( $result->namespace, $result->title );
+		$text = $wgContLang->convert( $nt->getText() );
+
+		$plink = $this->isCached() ?
+			$skin->makeLinkObj( $nt, htmlspecialchars( $text ) ) :
+			$skin->makeBrokenLinkObj( $nt, htmlspecialchars( $text ) );
+
+		$nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
+			$wgLang->formatNum( $result->value ) );
+		return wfSpecialList(
+			$plink,
+			$this->makeWlhLink( $nt, $skin, $result )
+		);
+	}
+
+	/**
+	 * Make a "what links here" link for a given title
+	 *
+	 * @param Title $title Title to make the link for
+	 * @param Skin $skin Skin to use
+	 * @param object $result Result row
+	 * @return string
+	 */
+	private function makeWlhLink( $title, $skin, $result ) {
+		global $wgLang;
+		$wlh = SpecialPage::getTitleFor( 'Whatlinkshere' );
+		$label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ),
+		$wgLang->formatNum( $result->value ) );
+		return $skin->link( $wlh, $label, array(), array( 'target' => $title->getPrefixedText() ) );
+	}
+}
+
+/**
+ * constructor
+ */
+function wfSpecialWantedTemplates() {
+	list( $limit, $offset ) = wfCheckLimits();
+
+	$wpp = new WantedTemplatesPage();
+
+	$wpp->doQuery( $offset, $limit );
+}
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index db7cd423..61dd6b3e 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -13,7 +13,6 @@ function wfSpecialWatchlist( $par ) {
 	global $wgUser, $wgOut, $wgLang, $wgRequest;
 	global $wgRCShowWatchingUsers, $wgEnotifWatchlist, $wgShowUpdatedMarker;
 	global $wgEnotifWatchlist;
-	$fname = 'wfSpecialWatchlist';
 
 	$skin = $wgUser->getSkin();
 	$specialTitle = SpecialPage::getTitleFor( 'Watchlist' );
@@ -22,8 +21,9 @@ function wfSpecialWatchlist( $par ) {
 	# Anons don't get a watchlist
 	if( $wgUser->isAnon() ) {
 		$wgOut->setPageTitle( wfMsg( 'watchnologin' ) );
-		$llink = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogin' ), wfMsgHtml( 'loginreqlink' ), 'returnto=' . $specialTitle->getPrefixedUrl() );
-		$wgOut->addHtml( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
+		$llink = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogin' ), 
+			wfMsgHtml( 'loginreqlink' ), 'returnto=' . $specialTitle->getPrefixedUrl() );
+		$wgOut->addHTML( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
 		return;
 	}
 
@@ -40,40 +40,56 @@ function wfSpecialWatchlist( $par ) {
 	}
 
 	$uid = $wgUser->getId();
-	if( ($wgEnotifWatchlist || $wgShowUpdatedMarker) && $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
+	if( ($wgEnotifWatchlist || $wgShowUpdatedMarker) && $wgRequest->getVal( 'reset' ) && 
+		$wgRequest->wasPosted() )
+	{
 		$wgUser->clearAllNotifications( $uid );
 		$wgOut->redirect( $specialTitle->getFullUrl() );
 		return;
 	}
 
 	$defaults = array(
-	/* float */ 'days' => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */
-	/* bool  */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ),
-	/* bool  */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ),
-	/* bool */ 'hideMinor' => (int)$wgUser->getBoolOption( 'watchlisthideminor' ),
+	/* float */ 'days'      => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */
+	/* bool  */ 'hideMinor' => (int)$wgUser->getBoolOption( 'watchlisthideminor' ),
+	/* bool  */ 'hideBots'  => (int)$wgUser->getBoolOption( 'watchlisthidebots' ),
+	/* bool  */ 'hideAnons' => (int)$wgUser->getBoolOption( 'watchlisthideanons' ),
+	/* bool  */ 'hideLiu'   => (int)$wgUser->getBoolOption( 'watchlisthideliu' ),
+	/* bool  */ 'hidePatrolled' => (int)$wgUser->getBoolOption( 'watchlisthidepatrolled' ), // TODO
+	/* bool  */ 'hideOwn'   => (int)$wgUser->getBoolOption( 'watchlisthideown' ),
 	/* ?     */ 'namespace' => 'all',
+	/* ?     */ 'invert'    => false,
 	);
 
 	extract($defaults);
 
 	# Extract variables from the request, falling back to user preferences or
 	# other default values if these don't exist
-	$prefs['days'    ] = floatval( $wgUser->getOption( 'watchlistdays' ) );
-	$prefs['hideown' ] = $wgUser->getBoolOption( 'watchlisthideown' );
-	$prefs['hidebots'] = $wgUser->getBoolOption( 'watchlisthidebots' );
+	$prefs['days']      = floatval( $wgUser->getOption( 'watchlistdays' ) );
 	$prefs['hideminor'] = $wgUser->getBoolOption( 'watchlisthideminor' );
+	$prefs['hidebots']  = $wgUser->getBoolOption( 'watchlisthidebots' );
+	$prefs['hideanons'] = $wgUser->getBoolOption( 'watchlisthideanon' );
+	$prefs['hideliu']   = $wgUser->getBoolOption( 'watchlisthideliu' );
+	$prefs['hideown' ]  = $wgUser->getBoolOption( 'watchlisthideown' );
+	$prefs['hidepatrolled' ] = $wgUser->getBoolOption( 'watchlisthidepatrolled' );
 
 	# Get query variables
-	$days     = $wgRequest->getVal(  'days', $prefs['days'] );
-	$hideOwn  = $wgRequest->getBool( 'hideOwn', $prefs['hideown'] );
-	$hideBots = $wgRequest->getBool( 'hideBots', $prefs['hidebots'] );
+	$days      = $wgRequest->getVal(  'days'     , $prefs['days'] );
 	$hideMinor = $wgRequest->getBool( 'hideMinor', $prefs['hideminor'] );
+	$hideBots  = $wgRequest->getBool( 'hideBots' , $prefs['hidebots'] );
+	$hideAnons = $wgRequest->getBool( 'hideAnons', $prefs['hideanons'] );
+	$hideLiu   = $wgRequest->getBool( 'hideLiu'  , $prefs['hideliu'] );
+	$hideOwn   = $wgRequest->getBool( 'hideOwn'  , $prefs['hideown'] );
+	$hidePatrolled   = $wgRequest->getBool( 'hidePatrolled'  , $prefs['hidepatrolled'] );
 
 	# Get namespace value, if supplied, and prepare a WHERE fragment
 	$nameSpace = $wgRequest->getIntOrNull( 'namespace' );
+	$invert = $wgRequest->getIntOrNull( 'invert' );
 	if( !is_null( $nameSpace ) ) {
 		$nameSpace = intval( $nameSpace );
-		$nameSpaceClause = " AND rc_namespace = $nameSpace";
+		if( $invert && $nameSpace !== 'all' )
+			$nameSpaceClause = "rc_namespace != $nameSpace";
+		else
+			$nameSpaceClause = "rc_namespace = $nameSpace";
 	} else {
 		$nameSpace = '';
 		$nameSpaceClause = '';
@@ -103,32 +119,24 @@ function wfSpecialWatchlist( $par ) {
 	// Dump everything here
 	$nondefaults = array();
 
-	wfAppendToArrayIfNotDefault('days'     , $days         , $defaults, $nondefaults);
-	wfAppendToArrayIfNotDefault('hideOwn'  , (int)$hideOwn , $defaults, $nondefaults);
-	wfAppendToArrayIfNotDefault('hideBots' , (int)$hideBots, $defaults, $nondefaults);
+	wfAppendToArrayIfNotDefault( 'days'     , $days          , $defaults, $nondefaults);
 	wfAppendToArrayIfNotDefault( 'hideMinor', (int)$hideMinor, $defaults, $nondefaults );
-	wfAppendToArrayIfNotDefault('namespace', $nameSpace    , $defaults, $nondefaults);
-
-	$hookSql = "";
-	if( ! wfRunHooks('BeforeWatchlist', array($nondefaults, $wgUser, &$hookSql)) ) {
-		return;
-	}
-
-	if($nitems == 0) {
+	wfAppendToArrayIfNotDefault( 'hideBots' , (int)$hideBots , $defaults, $nondefaults);
+	wfAppendToArrayIfNotDefault( 'hideAnons', (int)$hideAnons, $defaults, $nondefaults );
+	wfAppendToArrayIfNotDefault( 'hideLiu'  , (int)$hideLiu  , $defaults, $nondefaults );
+	wfAppendToArrayIfNotDefault( 'hideOwn'  , (int)$hideOwn  , $defaults, $nondefaults);
+	wfAppendToArrayIfNotDefault( 'namespace', $nameSpace     , $defaults, $nondefaults);
+	wfAppendToArrayIfNotDefault( 'hidePatrolled', (int)$hidePatrolled, $defaults, $nondefaults );
+
+	if( $nitems == 0 ) {
 		$wgOut->addWikiMsg( 'nowatchlist' );
 		return;
 	}
 
-	if ( $days <= 0 ) {
+	if( $days <= 0 ) {
 		$andcutoff = '';
 	} else {
-		$andcutoff = "AND rc_timestamp > '".$dbr->timestamp( time() - intval( $days * 86400 ) )."'";
-		/*
-		$sql = "SELECT COUNT(*) AS n FROM $page, $revision  WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
-		$res = $dbr->query( $sql, $fname );
-		$s = $dbr->fetchObject( $res );
-		$npages = $s->n;
-		*/
+		$andcutoff = "rc_timestamp > '".$dbr->timestamp( time() - intval( $days * 86400 ) )."'";
 	}
 
 	# If the watchlist is relatively short, it's simplest to zip
@@ -140,128 +148,158 @@ function wfSpecialWatchlist( $par ) {
 	# Up estimate of watched items by 15% to compensate for talk pages...
 
 	# Toggles
-	$andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
-	$andHideBots = $hideBots ? "AND (rc_bot = 0)" : '';
-	$andHideMinor = $hideMinor ? 'AND rc_minor = 0' : '';
-
-	# Show watchlist header
-	$header = '';
-	if( $wgUser->getOption( 'enotifwatchlistpages' ) && $wgEnotifWatchlist) {
-		$header .= wfMsg( 'wlheader-enotif' ) . "\n";
-	}
-	if ( $wgShowUpdatedMarker ) {
-		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
-	}
-
-  # Toggle watchlist content (all recent edits or just the latest)
+	$andHideOwn   = $hideOwn   ? "rc_user != $uid" : '';
+	$andHideBots  = $hideBots  ? "rc_bot = 0" : '';
+	$andHideMinor = $hideMinor ? "rc_minor = 0" : '';
+	$andHideLiu   = $hideLiu   ? "rc_user = 0" : '';
+	$andHideAnons = $hideAnons ? "rc_user != 0" : '';
+	$andHidePatrolled = $wgUser->useRCPatrol() && $hidePatrolled ? "rc_patrolled != 1" : '';
+
+	# Toggle watchlist content (all recent edits or just the latest)
 	if( $wgUser->getOption( 'extendwatchlist' )) {
 		$andLatest='';
- 		$limitWatchlist = 'LIMIT ' . intval( $wgUser->getOption( 'wllimit' ) );
+ 		$limitWatchlist = intval( $wgUser->getOption( 'wllimit' ) );
 	} else {
 	# Top log Ids for a page are not stored
-		$andLatest = 'AND (rc_this_oldid=page_latest OR rc_type=' . RC_LOG . ') ';
-		$limitWatchlist = '';
+		$andLatest = 'rc_this_oldid=page_latest OR rc_type=' . RC_LOG;
+		$limitWatchlist = 0;
 	}
 
-	$header .= wfMsgExt( 'watchlist-details', array( 'parsemag' ), $wgLang->formatNum( $nitems ) );
-	$wgOut->addWikiText( $header );
-
 	# Show a message about slave lag, if applicable
 	if( ( $lag = $dbr->getLag() ) > 0 )
 		$wgOut->showLagWarning( $lag );
 
-	if ( $wgShowUpdatedMarker ) {
-		$wgOut->addHTML( '<form action="' .
-			$specialTitle->escapeLocalUrl() .
-			'" method="post"><input type="submit" name="dummy" value="' .
-			htmlspecialchars( wfMsg( 'enotif_reset' ) ) .
-			'" /><input type="hidden" name="reset" value="all" /></form>' .
-			"\n\n" );
+	# Create output form
+	$form  = Xml::fieldset( wfMsg( 'watchlist-options' ), false, array( 'id' => 'mw-watchlist-options' ) );
+
+	# Show watchlist header
+	$form .= wfMsgExt( 'watchlist-details', array( 'parseinline' ), $wgLang->formatNum( $nitems ) );
+
+	if( $wgUser->getOption( 'enotifwatchlistpages' ) && $wgEnotifWatchlist) {
+		$form .= wfMsgExt( 'wlheader-enotif', 'parse' ) . "\n";
 	}
-	if ( $wgShowUpdatedMarker ) {
-		$wltsfield = ", ${watchlist}.wl_notificationtimestamp ";
-	} else {
-		$wltsfield = '';
+	if( $wgShowUpdatedMarker ) {
+		$form .= Xml::openElement( 'form', array( 'method' => 'post',
+					'action' => $specialTitle->getLocalUrl(),
+					'id' => 'mw-watchlist-resetbutton' ) ) .
+				wfMsgExt( 'wlheader-showupdated', array( 'parseinline' ) ) . ' ' .
+				Xml::submitButton( wfMsg( 'enotif_reset' ), array( 'name' => 'dummy' ) ) .
+				Xml::hidden( 'reset', 'all' ) .
+				Xml::closeElement( 'form' );
+	}
+	$form .= '<hr />';
+	
+	$tables = array( 'recentchanges', 'watchlist', 'page' );
+	$fields = array( "{$recentchanges}.*" );
+	$conds = array();
+	$join_conds = array(
+		'watchlist' => array('INNER JOIN',"wl_user='{$uid}' AND wl_namespace=rc_namespace AND wl_title=rc_title"),
+		'page'      => array('LEFT JOIN','rc_cur_id=page_id')
+	);
+	$options = array( 'ORDER BY' => 'rc_timestamp DESC' );
+	if( $wgShowUpdatedMarker ) {
+		$fields[] = 'wl_notificationtimestamp';
+	}
+	if( $limitWatchlist ) {
+		$options['LIMIT'] = $limitWatchlist;
 	}
-	$sql = "SELECT ${recentchanges}.* ${wltsfield}
-	  FROM $watchlist,$recentchanges
-	  LEFT JOIN $page ON rc_cur_id=page_id
-	  WHERE wl_user=$uid
-	  AND wl_namespace=rc_namespace
-	  AND wl_title=rc_title
-	  $andcutoff
-	  $andLatest
-	  $andHideOwn
-	  $andHideBots
-	  $andHideMinor
-	  $nameSpaceClause
-	  $hookSql
-	  ORDER BY rc_timestamp DESC
-	  $limitWatchlist";
-
-	$res = $dbr->query( $sql, $fname );
+	if( $andcutoff ) $conds[] = $andcutoff;
+	if( $andLatest ) $conds[] = $andLatest;
+	if( $andHideOwn ) $conds[] = $andHideOwn;
+	if( $andHideBots ) $conds[] = $andHideBots;
+	if( $andHideMinor ) $conds[] = $andHideMinor;
+	if( $andHideLiu ) $conds[] = $andHideLiu;
+	if( $andHideAnons ) $conds[] = $andHideAnons;
+	if( $andHidePatrolled ) $conds[] = $andHidePatrolled;
+	if( $nameSpaceClause ) $conds[] = $nameSpaceClause;
+	
+	wfRunHooks('SpecialWatchlistQuery', array(&$conds,&$tables,&$join_conds,&$fields) );
+	
+	$res = $dbr->select( $tables, $fields, $conds, __METHOD__, $options, $join_conds );
 	$numRows = $dbr->numRows( $res );
 
 	/* Start bottom header */
-	$wgOut->addHTML( "<hr />\n" );
 
-	if($days >= 1) {
-		$wgOut->addHTML(
-			wfMsgExt( 'rcnote', 'parseinline',
+	$wlInfo = '';
+	if( $days >= 1 ) {
+		$wlInfo = wfMsgExt( 'rcnote', 'parseinline',
 				$wgLang->formatNum( $numRows ),
 				$wgLang->formatNum( $days ),
 				$wgLang->timeAndDate( wfTimestampNow(), true ),
 				$wgLang->date( wfTimestampNow(), true ),
 				$wgLang->time( wfTimestampNow(), true )
-			) . '<br />'
-		);
-	} elseif($days > 0) {
-		$wgOut->addHtml(
-			wfMsgExt( 'wlnote', 'parseinline',
+			) . '<br />';
+	} elseif( $days > 0 ) {
+		$wlInfo = wfMsgExt( 'wlnote', 'parseinline',
 				$wgLang->formatNum( $numRows ),
 				$wgLang->formatNum( round($days*24) )
-			) . '<br />'
-		);
+			) . '<br />';
 	}
 
-	$wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" );
+	$cutofflinks = "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n";
 
 	# Spit out some control panel links
 	$thisTitle = SpecialPage::getTitleFor( 'Watchlist' );
 	$skin = $wgUser->getSkin();
 
+	$showLinktext = wfMsgHtml( 'show' );
+	$hideLinktext = wfMsgHtml( 'hide' );
+	# Hide/show minor edits
+	$label = $hideMinor ? $showLinktext : $hideLinktext;
+	$linkBits = wfArrayToCGI( array( 'hideMinor' => 1 - (int)$hideMinor ), $nondefaults );
+	$links[] = wfMsgHtml( 'rcshowhideminor', $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ) );
+
 	# Hide/show bot edits
-	$label = $hideBots ? wfMsgHtml( 'watchlist-show-bots' ) : wfMsgHtml( 'watchlist-hide-bots' );
+	$label = $hideBots ? $showLinktext : $hideLinktext;
 	$linkBits = wfArrayToCGI( array( 'hideBots' => 1 - (int)$hideBots ), $nondefaults );
-	$links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
+	$links[] = wfMsgHtml( 'rcshowhidebots', $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ) );
+
+	# Hide/show anonymous edits
+	$label = $hideAnons ? $showLinktext : $hideLinktext;
+	$linkBits = wfArrayToCGI( array( 'hideAnons' => 1 - (int)$hideAnons ), $nondefaults );
+	$links[] = wfMsgHtml( 'rcshowhideanons', $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ) );
+
+	# Hide/show logged in edits
+	$label = $hideLiu ? $showLinktext : $hideLinktext;
+	$linkBits = wfArrayToCGI( array( 'hideLiu' => 1 - (int)$hideLiu ), $nondefaults );
+	$links[] = wfMsgHtml( 'rcshowhideliu', $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ) );
 
 	# Hide/show own edits
-	$label = $hideOwn ? wfMsgHtml( 'watchlist-show-own' ) : wfMsgHtml( 'watchlist-hide-own' );
+	$label = $hideOwn ? $showLinktext : $hideLinktext;
 	$linkBits = wfArrayToCGI( array( 'hideOwn' => 1 - (int)$hideOwn ), $nondefaults );
-	$links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
+	$links[] = wfMsgHtml( 'rcshowhidemine', $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ) );
 
-	# Hide/show minor edits
-	$label = $hideMinor ? wfMsgHtml( 'watchlist-show-minor' ) : wfMsgHtml( 'watchlist-hide-minor' );
-	$linkBits = wfArrayToCGI( array( 'hideMinor' => 1 - (int)$hideMinor ), $nondefaults );
-	$links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
-
-	$wgOut->addHTML( implode( ' | ', $links ) );
+	# Hide/show patrolled edits
+	if( $wgUser->useRCPatrol() ) {
+		$label = $hidePatrolled ? $showLinktext : $hideLinktext;
+		$linkBits = wfArrayToCGI( array( 'hidePatrolled' => 1 - (int)$hidePatrolled ), $nondefaults );
+		$links[] = wfMsgHtml( 'rcshowhidepatr', $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits ) );
+	}
 
-	# Form for namespace filtering
-	$form  = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
-	$form .= '<p>';
+	# Namespace filter and put the whole form together.
+	$form .= $wlInfo;
+	$form .= $cutofflinks;
+	$form .= implode( ' | ', $links );
+	$form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
+	$form .= '<hr /><p>';
 	$form .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . '&nbsp;';
 	$form .= Xml::namespaceSelector( $nameSpace, '' ) . '&nbsp;';
+	$form .= Xml::checkLabel( wfMsg('invert'), 'invert', 'nsinvert', $invert ) . '&nbsp;';
 	$form .= Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . '</p>';
 	$form .= Xml::hidden( 'days', $days );
-	if( $hideOwn )
-		$form .= Xml::hidden( 'hideOwn', 1 );
-	if( $hideBots )
-		$form .= Xml::hidden( 'hideBots', 1 );
 	if( $hideMinor )
 		$form .= Xml::hidden( 'hideMinor', 1 );
+	if( $hideBots )
+		$form .= Xml::hidden( 'hideBots', 1 );
+	if( $hideAnons )
+		$form .= Xml::hidden( 'hideAnons', 1 );
+	if( $hideLiu )
+		$form .= Xml::hidden( 'hideLiu', 1 );
+	if( $hideOwn )
+		$form .= Xml::hidden( 'hideOwn', 1 );
 	$form .= Xml::closeElement( 'form' );
-	$wgOut->addHtml( $form );
+	$form .= Xml::closeElement( 'fieldset' );
+	$wgOut->addHTML( $form );
 
 	# If there's nothing to show, stop here
 	if( $numRows == 0 ) {
@@ -316,7 +354,6 @@ function wfSpecialWatchlist( $par ) {
 
 	$dbr->freeResult( $res );
 	$wgOut->addHTML( $s );
-
 }
 
 function wlHoursLink( $h, $page, $options = array() ) {
@@ -370,7 +407,8 @@ function wlCountItems( &$user, $talk = true ) {
 	$dbr = wfGetDB( DB_SLAVE, 'watchlist' );
 
 	# Fetch the raw count
-	$res = $dbr->select( 'watchlist', 'COUNT(*) AS count', array( 'wl_user' => $user->mId ), 'wlCountItems' );
+	$res = $dbr->select( 'watchlist', 'COUNT(*) AS count', 
+		array( 'wl_user' => $user->mId ), 'wlCountItems' );
 	$row = $dbr->fetchObject( $res );
 	$count = $row->count;
 	$dbr->freeResult( $res );
diff --git a/includes/specials/SpecialWhatlinkshere.php b/includes/specials/SpecialWhatlinkshere.php
index 3502e33c..d91b4960 100644
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -74,9 +74,7 @@ class WhatLinksHerePage {
 		$this->selfTitle = SpecialPage::getTitleFor( 'Whatlinkshere', $this->target->getPrefixedDBkey() );
 
 		$wgOut->setPageTitle( wfMsg( 'whatlinkshere-title', $this->target->getPrefixedText() ) );
-		$wgOut->setSubtitle( wfMsgHtml( 'linklistsub' ) );
-
-		$wgOut->addHTML( wfMsgExt( 'whatlinkshere-barrow', array( 'escapenoentities') ) . ' '  .$this->skin->makeLinkObj($this->target, '', 'redirect=no' )."<br />\n");
+		$wgOut->setSubtitle( wfMsg( 'whatlinkshere-backlink', $this->skin->link( $this->target, $this->target->getPrefixedText(), array(), array( 'redirect' => 'no'  ) ) ) );
 
 		$this->showIndirectLinks( 0, $this->target, $opts->getValue( 'limit' ),
 			$opts->getValue( 'from' ), $opts->getValue( 'back' ) );
@@ -98,7 +96,7 @@ class WhatLinksHerePage {
 		$hidelinks = $this->opts->getValue( 'hidelinks' );
 		$hideredirs = $this->opts->getValue( 'hideredirs' );
 		$hidetrans = $this->opts->getValue( 'hidetrans' );
-		$hideimages = $target->getNamespace() != NS_IMAGE || $this->opts->getValue( 'hideimages' );
+		$hideimages = $target->getNamespace() != NS_FILE || $this->opts->getValue( 'hideimages' );
 
 		$fetchlinks = (!$hidelinks || !$hideredirs);
 
@@ -169,11 +167,13 @@ class WhatLinksHerePage {
 		if( ( !$fetchlinks || !$dbr->numRows($plRes) ) && ( $hidetrans || !$dbr->numRows($tlRes) ) && ( $hideimages || !$dbr->numRows($ilRes) ) ) {
 			if ( 0 == $level ) {
 				$wgOut->addHTML( $this->whatlinkshereForm() );
-				$errMsg = is_int($namespace) ? 'nolinkshere-ns' : 'nolinkshere';
-				$wgOut->addWikiMsg( $errMsg, $this->target->getPrefixedText() );
+
 				// Show filters only if there are links
 				if( $hidelinks || $hidetrans || $hideredirs || $hideimages )
 					$wgOut->addHTML( $this->getFilterPanel() );
+
+				$errMsg = is_int($namespace) ? 'nolinkshere-ns' : 'nolinkshere';
+				$wgOut->addWikiMsg( $errMsg, $this->target->getPrefixedText() );
 			}
 			return;
 		}
@@ -256,7 +256,7 @@ class WhatLinksHerePage {
 	}
 
 	protected function listStart() {
-		return Xml::openElement( 'ul' );
+		return Xml::openElement( 'ul', array ( 'id' => 'mw-whatlinkshere-list' ) );
 	}
 
 	protected function listItem( $row, $nt, $notClose = false ) {
@@ -267,7 +267,7 @@ class WhatLinksHerePage {
 				'whatlinkshere-links', 'isimage' );
 			$msgcache = array();
 			foreach ( $msgs as $msg ) {
-				$msgcache[$msg] = wfMsgHtml( $msg );
+				$msgcache[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
 			}
 		}
 
@@ -377,6 +377,8 @@ class WhatLinksHerePage {
 		$f .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . '&nbsp;' .
 			Xml::namespaceSelector( $namespace, '' );
 
+		$f .= ' ';
+
 		# Submit
 		$f .= Xml::submitButton( wfMsg( 'allpagessubmit' ) );
 
@@ -395,7 +397,7 @@ class WhatLinksHerePage {
 
 		$links = array();
 		$types = array( 'hidetrans', 'hidelinks', 'hideredirs' );
-		if( $this->target->getNamespace() == NS_IMAGE )
+		if( $this->target->getNamespace() == NS_FILE )
 			$types[] = 'hideimages';
 		foreach( $types as $type ) {
 			$chosen = $this->opts->getValue( $type );
diff --git a/includes/templates/NoLocalSettings.php b/includes/templates/NoLocalSettings.php
index 75a7e95a..5f7e93c7 100644
--- a/includes/templates/NoLocalSettings.php
+++ b/includes/templates/NoLocalSettings.php
@@ -10,12 +10,31 @@ if ( isset( $wgVersion ) ) {
 } else {
 	$wgVersion = 'VERSION';
 }
-# Set the path in case we hit a page such as /index.php/Main_Page
-# Could use <base href> but then we have to worry about http[s]/port #/etc.
-$ext = strpos( $_SERVER['SCRIPT_NAME'], 'index.php5' ) === false ? 'php' : 'php5';
+
+$scriptName = $_SERVER['SCRIPT_NAME'];
+$ext = substr( $scriptName, strrpos( $scriptName, "." ) + 1 );
 $path = '';
-if( isset( $_SERVER['SCRIPT_NAME'] )) {
-	$path = htmlspecialchars( preg_replace('/index.php5?/', '', $_SERVER['SCRIPT_NAME']) );
+# Add any directories in the main folder that could contain an entrypoint (even possibly).
+# We cannot just do a dir listing here, as we do not know where it is yet
+# These must not also be the names of subfolders that may contain an entrypoint
+$topdirs = array( 'extensions', 'includes' );
+foreach( $topdirs as $dir ){
+	# Check whether a directory by this name is in the path
+	if( strrpos( $scriptName, "/" . $dir . "/" ) ){
+		# If so, check whether it is the right folder
+		# First, get the number of directories up it is (to generate path)
+		$numToGoUp = substr_count( substr( $scriptName, strrpos( $scriptName, "/" . $dir . "/" ) + 1 ), "/" );
+		# And generate the path using ..'s
+		for( $i = 0; $i < $numToGoUp; $i++ ){
+			$realPath = "../" . $realPath;
+		}
+		# Checking existance (using the image here as it is something not likely to change, and to always be here)
+		if( file_exists( $realPath . "skins/common/images/mediawiki.png" ) ) {
+			# If so, get the path that we can use in this file, and stop looking
+			$path = substr( $scriptName, 0, strrpos( $scriptName, "/" . $dir . "/" ) + 1 );
+			break;
+		}
+	}
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/includes/templates/PHP4.php b/includes/templates/PHP4.php
new file mode 100644
index 00000000..058351a0
--- /dev/null
+++ b/includes/templates/PHP4.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @file
+ * @ingroup Templates
+ */
+
+if( !defined( 'MW_PHP4' ) ) {
+	die( "Not an entry point.");
+}
+
+if( isset( $_SERVER['SCRIPT_NAME'] ) ) {
+	// Probably IIS; doesn't set REQUEST_URI
+	$scriptUrl = $_SERVER['SCRIPT_NAME'];
+} elseif( isset( $_SERVER['REQUEST_URI'] ) ) {
+	// We're trying SCRIPT_NAME first because it won't include PATH_INFO... hopefully
+	$scriptUrl = $_SERVER['REQUEST_URI'];
+} else {
+	$scriptUrl = '';
+}
+if ( preg_match( '!^(.*)/config/[^/]*.php$!', $scriptUrl, $m ) ) {
+	$baseUrl = $m[1];
+} elseif ( preg_match( '!^(.*)/[^/]*.php$!', $scriptUrl, $m ) ) {
+	$baseUrl = $m[1];
+} else {
+	$baseUrl = dirname( $scriptUrl );
+}
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+	<head>
+		<title>MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?></title>
+		<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+		<style type='text/css' media='screen, projection'>
+			html, body {
+				color: #000;
+				background-color: #fff;
+				font-family: sans-serif;
+				text-align: center;
+			}
+
+			p {
+				text-align: left;
+				margin-left: 2em;
+				margin-right: 2em;
+			}
+
+			h1 {
+				font-size: 150%;
+			}
+		</style>
+	</head>
+	<body>
+		<img src="<?php echo htmlspecialchars( $baseUrl ) ?>/skins/common/images/mediawiki.png" alt='The MediaWiki logo' />
+
+		<h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?></h1>
+		<div class='error'>
+<p>
+			MediaWiki requires PHP 5.0.0 or higher. You are running PHP
+			<?php echo htmlspecialchars( phpversion() ); ?>.
+</p>
+<?php
+flush();
+/**
+ * Test the *.php5 extension
+ */
+$downloadOther = true;
+if ( $baseUrl ) {
+	$testUrl = "$wgServer$baseUrl/php5.php5";
+	if( function_exists( 'file_get_contents' ) ) {
+		$errorLevel = error_reporting();
+		error_reporting( $errorLevel & !E_WARNING );
+		
+		ini_set( 'allow_url_fopen', '1' );
+		$s = file_get_contents( $testUrl );
+		
+		error_reporting( $errorLevel );
+	}
+
+	if ( strpos( $s, 'yes' ) !== false ) {
+		$encUrl = htmlspecialchars( str_replace( '.php', '.php5', $scriptUrl ) );
+		echo "<p>You may be able to use MediaWiki using a <a href=\"$encUrl\">.php5</a> file extension.</p>";
+		$downloadOther = false;
+	}
+}
+if ( $downloadOther ) {
+?>
+<p>Please consider
+<a href="http://www.php.net/downloads.php">upgrading your copy of PHP</a>.
+PHP 4 is at the end of its lifecycle and will not receive further security updates.</p>
+<p>If for some reason you really really need to run MediaWiki on PHP 4, you will need to
+<a href="http://www.mediawiki.org/wiki/Download">download version 1.6.x</a>
+from our website. </p>
+<?php
+}
+?>
+
+		</div>
+	</body>
+</html>
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index deeeb274..c4a60b6c 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -16,7 +16,7 @@ class UserloginTemplate extends QuickTemplate {
 ?>
 	<div class="<?php $this->text('messagetype') ?>box">
 		<?php if ( $this->data['messagetype'] == 'error' ) { ?>
-			<h2><?php $this->msg('loginerror') ?>:</h2>
+			<h2><?php $this->msg('loginerror') ?></h2>
 		<?php } ?>
 		<?php $this->html('message') ?>
 	</div>
@@ -54,7 +54,7 @@ class UserloginTemplate extends QuickTemplate {
 			$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
 		}
 	?>
-		<tr>
+		<tr id="mw-user-domain-section">
 			<td class="mw-label"><?php $this->msg( 'yourdomainname' ) ?></td>
 			<td class="mw-input">
 				<select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
@@ -63,7 +63,8 @@ class UserloginTemplate extends QuickTemplate {
 				</select>
 			</td>
 		</tr>
-	<?php } ?>
+	<?php }
+	if( $this->data['canremember'] ) { ?>
 		<tr>
 			<td></td>
 			<td class="mw-input">
@@ -74,6 +75,7 @@ class UserloginTemplate extends QuickTemplate {
 					/> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
 			</td>
 		</tr>
+		<?php } ?>
 		<tr>
 			<td></td>
 			<td class="mw-submit">
@@ -111,7 +113,7 @@ class UsercreateTemplate extends QuickTemplate {
 ?>
 	<div class="<?php $this->text('messagetype') ?>box">
 		<?php if ( $this->data['messagetype'] == 'error' ) { ?>
-			<h2><?php $this->msg('loginerror') ?>:</h2>
+			<h2><?php $this->msg('loginerror') ?></h2>
 		<?php } ?>
 		<?php $this->html('message') ?>
 	</div>
@@ -196,6 +198,7 @@ class UsercreateTemplate extends QuickTemplate {
 					</td>
 			<?php } ?>
 		</tr>
+		<?php if( $this->data['canremember'] ) { ?>
 		<tr>
 			<td></td>
 			<td class="mw-input">
@@ -206,7 +209,8 @@ class UsercreateTemplate extends QuickTemplate {
 					/> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
 			</td>
 		</tr>
-<?php
+<?php   }
+
 		$tabIndex = 8;
 		if ( isset( $this->data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) {
 			foreach ( $this->data['extraInput'] as $inputItem ) { ?>
diff --git a/includes/zhtable/simpphrases.manual b/includes/zhtable/simpphrases.manual
index 8e754b7f..60d0861c 100644
--- a/includes/zhtable/simpphrases.manual
+++ b/includes/zhtable/simpphrases.manual
@@ -16,13 +16,13 @@
 乾红
 乾乾
 乾清宫
-乾象;
-乾宅;
-乾造;
-乾曜;
-乾元;
-乾�;
-�乾德;
+乾象
+乾宅
+乾造
+乾曜
+乾元
+乾�
+�乾德
 挨�
 爱�
 暗�
@@ -374,6 +374,10 @@
 写著作
 写著�
 ��
+��
+�著�
+�著作
+�著者
 於乎
 於�
 �徵
diff --git a/includes/zhtable/toCN.manual b/includes/zhtable/toCN.manual
index bc2222f4..feeca9dc 100644
--- a/includes/zhtable/toCN.manual
+++ b/includes/zhtable/toCN.manual
@@ -5,6 +5,7 @@
 記憶體	内存
 �設	默认
 串列	串行
+串列加速器	串列加速器
 乙太網	以太网
 點陣圖	�图
 常�	例程
@@ -109,150 +110,92 @@
 簡訊	短信
 �茲別克	乌兹别克斯�
 查德	�得
-�得	�得
-也門	
 葉門	也门
 伯利茲	伯利兹
 �里斯	伯利兹
 維德角	佛得角
-佛得角	佛得角
-克羅地亞	克罗地亚
 克羅埃西亞	克罗地亚
-岡比亞	冈比亚
 甘比亞	冈比亚
-幾內亞比紹	几内亚比�
 幾內亞比索	几内亚比�
 列支敦斯登	列支敦士登
-列支敦士登	列支敦士登
-利比里亞	利比里亚
 賴比瑞亞	利比里亚
-加�	加纳
 迦�	加纳
 加彭	加蓬
-加蓬	加蓬
-�茨瓦�	�茨瓦纳
 波札那	�茨瓦纳
-�塔爾	�塔尔
 ��	�塔尔
-盧旺�	�旺达
 盧安�	�旺达
-�地馬拉	�地马拉
 瓜地馬拉	�地马拉
 厄瓜多爾	厄瓜多尔
+厄瓜多尔	厄瓜多尔
 厄瓜多	厄瓜多尔
-厄立特里亞	厄立特里亚
 厄利垂亞	厄立特里亚
-�布堤	�布�
 �布地	�布�
 哈薩克	哈�克斯�
-哥斯�黎加	哥斯达黎加
 哥斯大黎加	哥斯达黎加
-圖瓦盧	图瓦�
 �瓦魯	图瓦�
 土庫曼	土库曼斯�
-�盧西亞	圣�西亚
 �露西亞	圣�西亚
 ��斯�域斯	圣基茨和尼维斯
 �克里斯多��尼維斯	圣基茨和尼维斯
-�文森特和格林��斯	圣文森特和格林纳�斯
 �文森�格瑞那�	圣文森特和格林纳�斯
-�馬力諾	圣马力诺
 �馬利諾	圣马力诺
-圭亞那	圭亚那
 蓋亞那	圭亚那
-�桑尼亞	�桑尼亚
 �尚尼亞	�桑尼亚
-埃塞俄比亞	埃塞俄比亚
 衣索匹亞	埃塞俄比亚
 衣索比亞	埃塞俄比亚
 �里巴斯	基里巴斯
-基里巴斯	基里巴斯
 塔�克	塔�克斯�
 塞拉利昂	塞拉利昂
 塞普勒斯	塞浦路斯
-塞浦路斯	塞浦路斯
-塞舌爾	塞舌尔
 塞席爾	塞舌尔
-多明尼加共和國	多米尼加
-多明尼加	多米尼加
-多明尼加�邦	多米尼加�邦
-多米尼克	多米尼加�邦
-安�瓜和巴布�	安�瓜和巴布达
+多米尼克	多米尼加国
 安地��巴布�	安�瓜和巴布达
 尼日利亞	尼日利亚
+尼日利亚	尼日利亚
 奈�利亞	尼日利亚
 尼日爾	尼日尔
+尼日尔	尼日尔
 尼日	尼日尔
 巴�多	巴巴多斯
-巴巴多斯	巴巴多斯
-巴布亞新畿內亞	巴布亚新几内亚
 巴布亞�幾內亞	巴布亚新几内亚
 布基�法索	布基纳法索
 布��法索	布基纳法索
 蒲隆地	布隆迪
-布隆迪	布隆迪
-希臘	希腊
 帛�	帕劳
 義大利	�大利
-�大利	�大利
-所羅門群島	所罗门群岛
 索羅門群島	所罗门群岛
 汶�	文莱
-斯�士蘭	斯�士兰
 �瓦濟蘭	斯�士兰
-斯洛文尼亞	斯洛文尼亚
 斯洛維尼亞	斯洛文尼亚
-新西蘭	新西兰
 �西蘭	新西兰
-格林��	格林纳达
 格瑞那�	格林纳达
-格魯�亞	乔治亚
-喬治亞	乔治亚
-梵蒂岡	梵蒂冈
-毛里塔尼亞	毛里塔尼亚
 茅利塔尼亞	毛里塔尼亚
 毛里裘斯	毛里求斯
 模里西斯	毛里求斯
 沙地阿拉伯	沙特阿拉伯
 沙�地阿拉伯	沙特阿拉伯
-波斯尼亞黑塞哥維那	波斯尼亚和黑塞哥维那
 波士尼亞赫塞哥維�	波斯尼亚和黑塞哥维那
-津巴布韋	津巴布韦
 辛巴�	津巴布韦
 �都拉斯	洪都拉斯
-洪都拉斯	洪都拉斯
-特立尼�和多巴哥	特立尼达和托巴哥
 �里�托�哥	特立尼达和托巴哥
-瑙魯	瑙�
 諾魯	瑙�
-瓦努阿圖	瓦努阿图
 �那�	瓦努阿图
 溫�圖	瓦努阿图
-科摩羅	科摩罗
 葛摩	科摩罗
 象牙海岸	科特迪瓦
 �尼西亞	�尼斯
-索馬里	索马里
 索馬利亞	索马里
-�撾	��
 寮國	��
 肯雅	肯尼亚
 肯亞	肯尼亚
 蘇利�	�里�
 莫三比克	莫桑比克
-莫桑比克	莫桑比克
-�索托	莱索托
 賴索托	莱索托
-�寧	��
 ��	��
-贊比亞	赞比亚
 尚比亞	赞比亚
 亞塞拜然	阿塞拜疆
-阿塞拜疆	阿塞拜疆
-阿拉伯��酋長國	阿拉伯��酋长国
 阿拉伯��大公國	阿拉伯��酋长国
 �韓	韩国
-馬爾代夫	马尔代夫
 馬爾地夫	马尔代夫
 馬爾他	马耳他
 馬利共和國	马里共和国
@@ -262,7 +205,7 @@
 泡麵	方便�
 笨豬跳	蹦�跳
 绑紧跳	蹦�跳
-冷盤　　	凉�
+冷盤	凉�
 冷�	凉�
 散钱	零钱
 �星	笑星
@@ -290,16 +233,12 @@
 �架	�豹
 �斯	大众
 �士	大众
-雪��	雪�龙
 �事得	马自达
-馬自�	马自达
 寶�	标志
 拿破崙	拿破仑
 布殊	布什
 布希	布什
 柯林頓	克林顿
-å…‹æž—é “	å…‹æž—é¡¿
-薩�姆	�达姆
 海�	�达姆
 梵谷	凡高
 大衛碧咸	大�·�克汉姆
diff --git a/includes/zhtable/toHK.manual b/includes/zhtable/toHK.manual
index 9afddb77..916b4020 100644
--- a/includes/zhtable/toHK.manual
+++ b/includes/zhtable/toHK.manual
@@ -6,25 +6,17 @@
 凶殘	兇殘
 �凶	�兇
 買凶	買兇
-打�机	打�機
 �表機	打�機
 字节	�元組
 字節	�元組
-打�	打�
 列�	打�
 硬件	硬件
 硬體	硬件
-二�管	二極管
 二極體	二極管
-三�管	三極管
 三極體	三極管
-数�	數碼
 數�	數碼
-软件	軟件
 軟體	軟件
-网络	網絡
 網路	網絡
-人工智能	人工智能
 人工智慧	人工智能
 航天飞机	穿梭機
 太空梭	穿梭機
@@ -34,141 +26,85 @@
 機器人	機械人
 移动电�	�動電話
 行動電話	�動電話
-调制解调器	調制解調器
 數據機	調制解調器
 短信	短訊
 簡訊	短訊
-�得	�得
 查德	�得
-也门	也門
 葉門	也門
-伯利兹	伯利茲
 �里斯	伯利茲
-佛得角	佛得角
 維德角	佛得角
-克罗地亚	克羅地亞
 克羅埃西亞	克羅地亞
-冈比亚	岡比亞
 甘比亞	岡比亞
-几内亚比�	幾內亞比紹
 幾內亞比索	幾內亞比紹
-列支敦士登	列支敦士登
 列支敦斯登	列支敦士登
-利比里亚	利比里亞
 賴比瑞亞	利比里亞
-加纳	加�
 迦�	加�
-加蓬	加蓬
 加彭	加蓬
-�茨瓦纳	�茨瓦�
 波札那	�茨瓦�
-�塔尔	�塔爾
 ��	�塔爾
-�旺达	盧旺�
 盧安�	盧旺�
-�地马拉	�地馬拉
 瓜地馬拉	�地馬拉
 厄瓜多尔	厄瓜多爾
+厄瓜多爾	厄瓜多爾
 厄瓜多	厄瓜多爾
-厄立特里亚	厄立特里亞
 厄利垂亞	厄立特里亞
-�布�	�布堤
 �布地	�布堤
-哥斯达黎加	哥斯�黎加
 哥斯大黎加	哥斯�黎加
-图瓦�	圖瓦盧
 �瓦魯	圖瓦盧
-圣�西亚	�盧西亞
 �露西亞	�盧西亞
 圣基茨和尼维斯	��斯�域斯
 �克里斯多��尼維斯	��斯�域斯
-圣文森特和格林纳�斯	�文森特和格林��斯
 �文森�格瑞那�	�文森特和格林��斯
-圣马力诺	�馬力諾
 �馬利諾	�馬力諾
-圭亚那	圭亞那
 蓋亞那	圭亞那
-�桑尼亚	�桑尼亞
 �尚尼亞	�桑尼亞
-埃塞俄比亚	埃塞俄比亞
 衣索匹亞	埃塞俄比亞
 衣索比亞	埃塞俄比亞
-基里巴斯	基里巴斯
 �里巴斯	基里巴斯
-狮�山	��山
 塞普勒斯	塞浦路斯
-塞舌尔	塞舌爾
 塞席爾	塞舌爾
-多米尼加	多明尼加共和國
-多明尼加	多明尼加共和國
-多米尼加�邦	多明尼加�邦
-多米尼克	多明尼加�邦
-安�瓜和巴布达	安�瓜和巴布�
+多米尼克	多明尼加國
 安地��巴布�	安�瓜和巴布�
 尼日利亚	尼日利亞
+尼日利亞	尼日利亞
 奈�利亞	尼日利亞
 尼日尔	尼日爾
+尼日爾	尼日爾
 尼日	尼日爾
-巴巴多斯	巴巴多斯
 巴�多	巴巴多斯
-巴布亚新几内亚	巴布亞新畿內亞
 巴布亞�幾內亞	巴布亞新畿內亞
-布基纳法索	布基�法索
 布��法索	布基�法索
-布隆迪	布隆迪
 蒲隆地	布隆迪
+帕劳	帛�
 義大利	�大利
-所罗门群岛	所羅門群島
 索羅門群島	所羅門群島
-斯�士兰	斯�士蘭
+文莱	汶�
 �瓦濟蘭	斯�士蘭
-斯洛文尼亚	斯洛文尼亞
 斯洛維尼亞	斯洛文尼亞
-新西兰	新西蘭
 �西蘭	新西蘭
-格林纳达	格林��
 格瑞那�	格林��
-格��亚	喬治亞
-格魯�亞	喬治亞
-梵蒂冈	梵蒂岡
-毛里塔尼亚	毛里塔尼亞
 茅利塔尼亞	毛里塔尼亞
 毛里求斯	毛里裘斯
 模里西斯	毛里裘斯
+沙地阿拉伯	沙特阿拉伯
 沙�地阿拉伯	沙特阿拉伯
-波斯尼亚和黑塞哥维那	波斯尼亞黑塞哥維那
 波士尼亞赫塞哥維�	波斯尼亞黑塞哥維那
-津巴布韦	津巴布韋
 辛巴�	津巴布韋
-洪都拉斯	洪都拉斯
 �都拉斯	洪都拉斯
-特立尼达和托巴哥	特立尼�和多巴哥
 �里�托�哥	特立尼�和多巴哥
-瑙�	瑙魯
 諾魯	瑙魯
-瓦努阿图	瓦努阿圖
 �那�	瓦努阿圖
-科摩罗	科摩羅
 葛摩	科摩羅
-索马里	索馬里
 索馬利亞	索馬里
-��	�撾
 寮國	�撾
 肯尼亚	肯雅
 肯亞	肯雅
-莫桑比克	莫桑比克
 莫三比克	莫桑比克
-莱索托	�索托
 賴索托	�索托
-��	�寧
 ��	�寧
-赞比亚	贊比亞
 尚比亞	贊比亞
-阿塞拜疆	阿塞拜疆
 亞塞拜然	阿塞拜疆
-阿拉伯��酋长国	阿拉伯��酋長國
 阿拉伯��大公國	阿拉伯��酋長國
-马尔代夫	馬爾代夫
 馬爾地夫	馬爾代夫
 馬利共和國	馬里共和國
 方便�	�食麵
@@ -200,11 +136,9 @@
 æ‹¿ç ´å´™	æ‹¿ç ´ä¾–
 布什	布殊
 布希	布殊
-å…‹æž—é¡¿	å…‹æž—é “
 柯林頓	克林頓
 �达姆	薩�姆
 海�	侯賽因
-侯赛因	侯賽因
 大�·�克汉姆	大衛碧咸
 迈克尔·欧文	米高奧雲
 �妮弗·�普里亚蒂	�佩雅蒂
diff --git a/includes/zhtable/toSG.manual b/includes/zhtable/toSG.manual
index 5f7cb0ca..3c0cbc1d 100644
--- a/includes/zhtable/toSG.manual
+++ b/includes/zhtable/toSG.manual
@@ -5,6 +5,7 @@
 方便�	快速�
 速食麵	快速�
 �食麵	快速�
+泡麵	快速�
 蹦�跳	绑紧跳
 笨豬跳	绑紧跳
 凉�	冷�
@@ -16,4 +17,3 @@
 民�	��
 �房	�屋
 房价	屋价
-泡麵	快速�
diff --git a/includes/zhtable/toTW.manual b/includes/zhtable/toTW.manual
index 13a81a69..b0041ccf 100644
--- a/includes/zhtable/toTW.manual
+++ b/includes/zhtable/toTW.manual
@@ -21,6 +21,7 @@
 復蘇	復甦
 缺�	�設
 串行	串列
+串列加速器	串列加速器
 以太网	乙太網
 �图	點陣圖
 例程	常�
@@ -85,7 +86,6 @@
 �务器	伺�器
 等于	等於
 局域网	�域網
-计算机	電腦
 扫瞄仪	掃瞄器
 宽带	寬頻
 数�库	資料庫
@@ -143,7 +143,6 @@
 伯利兹	�里斯
 伯利茲	�里斯
 佛得角	維德角
-佛得角	維德角
 克罗地亚	克羅埃西亞
 克羅地亞	克羅埃西亞
 冈比亚	甘比亞
@@ -201,10 +200,11 @@
 塞浦路斯	塞普勒斯
 塞舌尔	塞席爾
 塞舌爾	塞席爾
-多米尼加	多明尼加
+多米尼加共和国	多明尼加
+多米尼加共和國	多明尼加
 多明尼加共和國	多明尼加
-多米尼加�邦	多米尼克
-多明尼加�邦	多米尼克
+多米尼加国	多米尼克
+多明尼加國	多米尼克
 安�瓜和巴布达	安地��巴布�
 安�瓜和巴布�	安地��巴布�
 尼日利亚	奈�利亞
@@ -212,17 +212,14 @@
 尼日尔	尼日
 尼日爾	尼日
 巴巴多斯	巴�多
-巴巴多斯	巴�多
 巴布亚新几内亚	巴布亞�幾內亞
 巴布亞新畿內亞	巴布亞�幾內亞
 布基纳法索	布��法索
 布基�法索	布��法索
 布隆迪	蒲隆地
 布隆迪	蒲隆地
-希腊	希臘
 帕劳	帛�
 �大利	義大利
-�大利	義大利
 所罗门群岛	索羅門群島
 所羅門群島	索羅門群島
 文莱	汶�
@@ -276,7 +273,6 @@
 赞比亚	尚比亞
 贊比亞	尚比亞
 阿塞拜疆	亞塞拜然
-阿塞拜疆	亞塞拜然
 阿拉伯��酋长国	阿拉伯��大公國
 阿拉伯��酋長國	阿拉伯��大公國
 马尔代夫	馬爾地夫
@@ -307,7 +303,6 @@
 �架	�豹
 �士	�斯
 雪�龙	雪��
-马自达	馬自�
 �事得	馬自�
 拿破仑	拿破崙
 æ‹¿ç ´ä¾–	æ‹¿ç ´å´™
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index 9caa3cc5..02d07d20 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -14,6 +14,7 @@
 �隻
 �隻
 å„„éš»
+多�是
 多隻
 0多隻
 零多隻
@@ -308,7 +309,6 @@
 �濱
 �濱鄉
 象徵著
-這么著
 這麼著
 那麼著
 ��著
@@ -327,7 +327,6 @@
 披頭散髮
 髮�
 鬥著
-鬧著玩儿
 鬧著玩兒
 鯰魚
 世界盃
@@ -996,6 +995,10 @@
 藥籤
 �籤�架
 雲笈七籤
+上簽�
+上簽字
+上簽收
+上簽寫
 犖确
 磽确
 确瘠
diff --git a/includes/zhtable/tradphrases_exclude.manual b/includes/zhtable/tradphrases_exclude.manual
index 40dc5c09..0db69513 100644
--- a/includes/zhtable/tradphrases_exclude.manual
+++ b/includes/zhtable/tradphrases_exclude.manual
@@ -72,6 +72,7 @@
 白麵
 切麵
 和麵
+�水麵
 復甦
 複蘇
 甦醒
@@ -131,6 +132,7 @@
 採邑
 嚮日
 佔城
+水錶
 �錶
 錶�
 彆腳
diff --git a/index.php b/index.php
index 4cadf788..1c24f5a5 100644
--- a/index.php
+++ b/index.php
@@ -47,10 +47,8 @@ wfProfileIn( 'main-misc-setup' );
 OutputPage::setEncodings(); # Not really used yet
 
 $maxLag = $wgRequest->getVal( 'maxlag' );
-if ( !is_null( $maxLag ) ) {
-	if ( !$mediaWiki->checkMaxLag( $maxLag ) ) {
-		exit;
-	}
+if( !is_null($maxLag) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
+	exit;
 }
 
 # Query string fields
@@ -58,7 +56,7 @@ $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
 $wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
-if ($wgTitle == NULL) {
+if( $wgTitle === NULL ) {
 	unset( $wgTitle );
 }
 
@@ -67,15 +65,38 @@ wfProfileOut( 'main-misc-setup' );
 #
 # Send Ajax requests to the Ajax dispatcher.
 #
-if ( $wgUseAjax && $action == 'ajax' ) {
+if( $wgUseAjax && $action == 'ajax' ) {
 	require_once( $IP . '/includes/AjaxDispatcher.php' );
-
 	$dispatcher = new AjaxDispatcher();
 	$dispatcher->performAction();
 	$mediaWiki->restInPeace();
 	exit;
 }
 
+if( $wgUseFileCache && isset($wgTitle) ) {
+	wfProfileIn( 'main-try-filecache' );
+	// Raw pages should handle cache control on their own,
+	// even when using file cache. This reduces hits from clients.
+	if( $action != 'raw' && HTMLFileCache::useFileCache() ) {
+		/* Try low-level file cache hit */
+		$cache = new HTMLFileCache( $wgTitle, $action );
+		if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
+			/* Check incoming headers to see if client has this cached */
+			if( !$wgOut->checkLastModified( $cache->fileCacheTime() ) ) {
+				$cache->loadFromFileCache();
+			}
+			# Do any stats increment/watchlist stuff
+			$wgArticle = MediaWiki::articleFromTitle( $wgTitle );
+			$wgArticle->viewUpdates();
+			# Tell $wgOut that output is taken care of
+			wfProfileOut( 'main-try-filecache' );
+			$mediaWiki->restInPeace();
+			exit;
+		}
+	}
+	wfProfileOut( 'main-try-filecache' );
+}
+
 # Setting global variables in mediaWiki
 $mediaWiki->setVal( 'action', $action );
 $mediaWiki->setVal( 'CommandLineMode', $wgCommandLineMode );
@@ -91,7 +112,7 @@ $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
 $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
 $mediaWiki->initialize( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
-$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgOut );
+$mediaWiki->finalCleanup( $wgDeferredUpdateList, $wgOut );
 
 # Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
 $mediaWiki->doUpdates( $wgPostCommitUpdateList );
diff --git a/languages/Language.php b/languages/Language.php
index 624e43d3..6502aa0d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -39,7 +39,7 @@ class FakeConverter {
 	function parserConvert($t, $p) {return $t;}
 	function getVariants() { return array( $this->mLang->getCode() ); }
 	function getPreferredVariant() {return $this->mLang->getCode(); }
-	function findVariantLink(&$l, &$n) {}
+	function findVariantLink(&$l, &$n, $forTemplate = false) {}
 	function getExtraHashOptions() {return '';}
 	function getParsedTitle() {return '';}
 	function markNoConversion($text, $noParse=false) {return $text;}
@@ -56,9 +56,9 @@ class Language {
 	var $mConverter, $mVariants, $mCode, $mLoaded = false;
 	var $mMagicExtensions = array(), $mMagicHookDone = false;
 
-	static public $mLocalisationKeys = array( 'fallback', 'namespaceNames',
-		'skinNames', 'mathNames',
-		'bookstoreList', 'magicWords', 'messages', 'rtl', 'digitTransformTable',
+	static public $mLocalisationKeys = array(
+		'fallback', 'namespaceNames', 'mathNames', 'bookstoreList',
+		'magicWords', 'messages', 'rtl', 'digitTransformTable',
 		'separatorTransformTable', 'fallback8bitEncoding', 'linkPrefixExtension',
 		'defaultUserOptionOverrides', 'linkTrail', 'namespaceAliases',
 		'dateFormats', 'datePreferences', 'datePreferenceMigrationMap',
@@ -74,6 +74,7 @@ class Language {
 	static public $mMergeableAliasListKeys = array( 'specialPageAliases' );
 
 	static public $mLocalisationCache = array();
+	static public $mLangObjCache = array();
 
 	static public $mWeekdayMsgs = array(
 		'sunday', 'monday', 'tuesday', 'wednesday', 'thursday',
@@ -130,12 +131,25 @@ class Language {
 	);
 
 	/**
-	 * Create a language object for a given language code
+	 * Get a cached language object for a given language code
 	 */
 	static function factory( $code ) {
+		if ( !isset( self::$mLangObjCache[$code] ) ) {
+			if( count( self::$mLangObjCache ) > 10 ) {
+				// Don't keep a billion objects around, that's stupid.
+				self::$mLangObjCache = array();
+			}
+			self::$mLangObjCache[$code] = self::newFromCode( $code );
+		}
+		return self::$mLangObjCache[$code];
+	}
+
+	/**
+	 * Create a language object for a given language code
+	 */
+	protected static function newFromCode( $code ) {
 		global $IP;
 		static $recursionLevel = 0;
-
 		if ( $code == 'en' ) {
 			$class = 'Language';
 		} else {
@@ -156,13 +170,12 @@ class Language {
 		if( ! class_exists( $class ) ) {
 			$fallback = Language::getFallbackFor( $code );
 			++$recursionLevel;
-			$lang = Language::factory( $fallback );
+			$lang = Language::newFromCode( $fallback );
 			--$recursionLevel;
 			$lang->setCode( $code );
 		} else {
 			$lang = new $class;
 		}
-
 		return $lang;
 	}
 
@@ -177,6 +190,15 @@ class Language {
 	}
 
 	/**
+	 * Reduce memory usage
+	 */
+	function __destruct() {
+		foreach ( $this as $name => $value ) {
+			unset( $this->$name );
+		}
+	}
+
+	/**
 	 * Hook which will be called if this is the content language.
 	 * Descendants can use this to register hook functions or modify globals
 	 */
@@ -298,7 +320,7 @@ class Language {
 		if ( isset( $aliases[$name][0] ) ) {
 			$name = $aliases[$name][0];
 		}
-		return $this->getNsText(NS_SPECIAL) . ':' . $name;
+		return $this->getNsText( NS_SPECIAL ) . ':' . $name;
 	}
 
 	function getQuickbarSettings() {
@@ -311,11 +333,6 @@ class Language {
 		);
 	}
 
-	function getSkinNames() {
-		$this->load();
-		return $this->skinNames;
-	}
-
 	function getMathNames() {
 		$this->load();
 		return $this->mathNames;
@@ -393,21 +410,13 @@ class Language {
 	}
 
 	/**
-	 * Ugly hack to get a message maybe from the MediaWiki namespace, if this
-	 * language object is the content or user language.
+	 * Get a message from the MediaWiki namespace.
+	 *
+	 * @param $msg String: message name
+	 * @return string
 	 */
 	function getMessageFromDB( $msg ) {
-		global $wgContLang, $wgLang;
-		if ( $wgContLang->getCode() == $this->getCode() ) {
-			# Content language
-			return wfMsgForContent( $msg );
-		} elseif ( $wgLang->getCode() == $this->getCode() ) {
-			# User language
-			return wfMsg( $msg );
-		} else {
-			# Neither, get from localisation
-			return $this->getMessage( $msg );
-		}
+		return wfMsgExt( $msg, array( 'parsemag', 'language' => $this ) );
 	}
 
 	function getLanguageName( $code ) {
@@ -465,39 +474,50 @@ class Language {
 	function userAdjust( $ts, $tz = false )	{
 		global $wgUser, $wgLocalTZoffset;
 
-		if (!$tz) {
+		if ( $tz === false ) {
 			$tz = $wgUser->getOption( 'timecorrection' );
 		}
 
-		# minutes and hours differences:
-		$minDiff = 0;
-		$hrDiff  = 0;
+		$data = explode( '|', $tz, 3 );
 
-		if ( $tz === '' ) {
-			# Global offset in minutes.
-			if( isset($wgLocalTZoffset) ) {
-				if( $wgLocalTZoffset >= 0 ) {
-					$hrDiff = floor($wgLocalTZoffset / 60);
-				} else {
-					$hrDiff = ceil($wgLocalTZoffset / 60);
-				}
-				$minDiff = $wgLocalTZoffset % 60;
+		if ( $data[0] == 'ZoneInfo' ) {
+			if ( function_exists( 'timezone_open' ) && @timezone_open( $data[2] ) !== false ) {
+				$date = date_create( $ts, timezone_open( 'UTC' ) );
+				date_timezone_set( $date, timezone_open( $data[2] ) );
+				$date = date_format( $date, 'YmdHis' );
+				return $date;
 			}
-		} elseif ( strpos( $tz, ':' ) !== false ) {
-			$tzArray = explode( ':', $tz );
-			$hrDiff = intval($tzArray[0]);
-			$minDiff = intval($hrDiff < 0 ? -$tzArray[1] : $tzArray[1]);
+			# Unrecognized timezone, default to 'Offset' with the stored offset.
+			$data[0] = 'Offset';
+		}
+
+		$minDiff = 0;
+		if ( $data[0] == 'System' || $tz == '' ) {
+			# Global offset in minutes.
+			if( isset($wgLocalTZoffset) ) $minDiff = $wgLocalTZoffset;
+		} else if ( $data[0] == 'Offset' ) {
+			$minDiff = intval( $data[1] );
 		} else {
-			$hrDiff = intval( $tz );
+			$data = explode( ':', $tz );
+			if( count( $data ) == 2 ) {
+				$data[0] = intval( $data[0] );
+				$data[1] = intval( $data[1] );
+				$minDiff = abs( $data[0] ) * 60 + $data[1];
+				if ( $data[0] < 0 ) $minDiff = -$minDiff;
+			} else {
+				$minDiff = intval( $data[0] ) * 60;
+			}
 		}
 
 		# No difference ? Return time unchanged
-		if ( 0 == $hrDiff && 0 == $minDiff ) { return $ts; }
+		if ( 0 == $minDiff ) return $ts;
 
 		wfSuppressWarnings(); // E_STRICT system time bitching
-		# Generate an adjusted date
+		# Generate an adjusted date; take advantage of the fact that mktime
+		# will normalize out-of-range values so we don't have to split $minDiff 
+		# into hours and minutes.
 		$t = mktime( (
-		  (int)substr( $ts, 8, 2) ) + $hrDiff, # Hours
+		  (int)substr( $ts, 8, 2) ), # Hours
 		  (int)substr( $ts, 10, 2 ) + $minDiff, # Minutes
 		  (int)substr( $ts, 12, 2 ), # Seconds
 		  (int)substr( $ts, 4, 2 ), # Month
@@ -515,9 +535,10 @@ class Language {
 	 * internationalisation, a reduced set of format characters, and a better 
 	 * escaping format.
 	 *
-	 * Supported format characters are dDjlNwzWFmMntLYyaAgGhHiscrU. See the 
-	 * PHP manual for definitions. There are a number of extensions, which 
-	 * start with "x":
+	 * Supported format characters are dDjlNwzWFmMntLoYyaAgGhHiscrU. See the 
+	 * PHP manual for definitions. "o" format character is supported since
+	 * PHP 5.1.0, previous versions return literal o.
+	 * There are a number of extensions, which start with "x":
 	 *
 	 *    xn   Do not translate digits of the next numeric format character
 	 *    xN   Toggle raw digit (xn) flag, stays set until explicitly unset
@@ -538,10 +559,10 @@ class Language {
 	 *    xjn  n (month number) in Hebrew calendar
 	 *    xjY  Y (full year) in Hebrew calendar
 	 *
-	 *   xmj  j (day number) in Hijri calendar
-	 *   xmF  F (month name) in Hijri calendar
-	 *   xmn  n (month number) in Hijri calendar
-	 *   xmY  Y (full year) in Hijri calendar
+	 *    xmj  j (day number) in Hijri calendar
+	 *    xmF  F (month name) in Hijri calendar
+	 *    xmn  n (month number) in Hijri calendar
+	 *    xmY  Y (full year) in Hijri calendar
 	 *
 	 *    xkY  Y (full year) in Thai solar calendar. Months and days are
 	 *                       identical to the Gregorian calendar
@@ -562,6 +583,8 @@ class Language {
 	 * @param $ts String: 14-character timestamp
 	 *      YYYYMMDDHHMMSS
 	 *      01234567890123
+	 * @todo emulation of "o" format character for PHP pre 5.1.0
+	 * @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai?
 	 */
 	function sprintfDate( $format, $ts ) {
 		$s = '';
@@ -699,6 +722,16 @@ class Language {
 					if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
 					$num = gmdate( 'L', $unix );
 					break;
+				# 'o' is supported since PHP 5.1.0
+				# return literal if not supported
+				# TODO: emulation for pre 5.1.0 versions
+				case 'o':
+					if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+					if ( version_compare(PHP_VERSION, '5.1.0') === 1 )
+						$num = date( 'o', $unix );
+					else
+						$s .= 'o';
+					break;
 				case 'Y':
 					$num = substr( $ts, 0, 4 );
 					break;
@@ -911,6 +944,9 @@ class Language {
 	 * (abu-mami@kaluach.net, http://www.kaluach.net), who permitted
 	 * to translate the relevant functions into PHP and release them under
 	 * GNU GPL.
+	 *
+	 * The months are counted from Tishrei = 1. In a leap year, Adar I is 13
+	 * and Adar II is 14. In a non-leap year, Adar is 6.
 	 */
 	private static function tsToHebrew( $ts ) {
 		# Parse date
@@ -1510,25 +1546,72 @@ class Language {
 			return $string;
 		}
 
-		# MySQL fulltext index doesn't grok utf-8, so we
-		# need to fold cases and convert to hex
 
 		wfProfileIn( __METHOD__ );
-		if( function_exists( 'mb_strtolower' ) ) {
-			$out = preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"'U8' . bin2hex( \"$1\" )",
-				mb_strtolower( $string ) );
-		} else {
-			list( , $wikiLowerChars ) = self::getCaseMaps();
+		
+		// MySQL fulltext index doesn't grok utf-8, so we
+		// need to fold cases and convert to hex
+		$out = preg_replace_callback(
+			"/([\\xc0-\\xff][\\x80-\\xbf]*)/",
+			array( $this, 'stripForSearchCallback' ),
+			$this->lc( $string ) );
+		
+		// And to add insult to injury, the default indexing
+		// ignores short words... Pad them so we can pass them
+		// through without reconfiguring the server...
+		$minLength = $this->minSearchLength();
+		if( $minLength > 1 ) {
+			$n = $minLength-1;
 			$out = preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"'U8' . bin2hex( strtr( \"\$1\", \$wikiLowerChars ) )",
-				$string );
+				"/\b(\w{1,$n})\b/",
+				"$1U800",
+				$out );
 		}
+		
+		// Periods within things like hostnames and IP addresses
+		// are also important -- we want a search for "example.com"
+		// or "192.168.1.1" to work sanely.
+		//
+		// MySQL's search seems to ignore them, so you'd match on
+		// "example.wikipedia.com" and "192.168.83.1" as well.
+		$out = preg_replace(
+			"/(\w)\.(\w|\*)/u",
+			"$1U82e$2",
+			$out );
+		
 		wfProfileOut( __METHOD__ );
 		return $out;
 	}
+	
+	/**
+	 * Armor a case-folded UTF-8 string to get through MySQL's
+	 * fulltext search without being mucked up by funny charset
+	 * settings or anything else of the sort.
+	 */
+	protected function stripForSearchCallback( $matches ) {
+		return 'U8' . bin2hex( $matches[1] );
+	}
+	
+	/**
+	 * Check MySQL server's ft_min_word_len setting so we know
+	 * if we need to pad short words...
+	 */
+	protected function minSearchLength() {
+		if( !isset( $this->minSearchLength ) ) {
+			$sql = "show global variables like 'ft\\_min\\_word\\_len'";
+			$dbr = wfGetDB( DB_SLAVE );
+			$result = $dbr->query( $sql );
+			$row = $result->fetchObject();
+			$result->free();
+			
+			if( $row && $row->Variable_name == 'ft_min_word_len' ) {
+				$this->minSearchLength = intval( $row->Value );
+			} else {
+				$this->minSearchLength = 0;
+			}
+		}
+		return $this->minSearchLength;
+	}
 
 	function convertForSearchResult( $termsArray ) {
 		# some languages, e.g. Chinese, need to do a conversion
@@ -1686,7 +1769,9 @@ class Language {
 			} else {
 				# Fall back to English if local list is incomplete
 				$magicWords =& Language::getMagicWords();
-				if ( !isset($magicWords[$mw->mId]) ) { throw new MWException("Magic word not found" ); }
+				if ( !isset($magicWords[$mw->mId]) ) {
+					throw new MWException("Magic word '{$mw->mId}' not found" ); 
+				}
 				$rawEntry = $magicWords[$mw->mId];
 			}
 		}
@@ -1738,14 +1823,14 @@ class Language {
 
 				// Fail fast
 				if ( !file_exists($file) )
-					throw new MWException( 'Aliases file does not exist' );
+					throw new MWException( "Aliases file does not exist: $file" );
 
 				$aliases = array();
 				require($file);
 
 				// Check the availability of aliases
 				if ( !isset($aliases['en']) )
-					throw new MWException( 'Malformed aliases file' );
+					throw new MWException( "Malformed aliases file: $file" );
 
 				// Merge all aliases in fallback chain
 				$code = $this->getCode();
@@ -1755,7 +1840,7 @@ class Language {
 					$aliases[$code] = $this->fixSpecialPageAliases( $aliases[$code] );
 					/* Merge the aliases, THIS will break if there is special page name
 					* which looks like a numerical key, thanks to PHP...
-					* See the comments for wfArrayMerge in GlobalSettings.php. */
+					* See the array_merge_recursive manual entry */
 					$this->mExtendedSpecialPageAliases = array_merge_recursive(
 						$this->mExtendedSpecialPageAliases, $aliases[$code] );
 
@@ -1807,10 +1892,11 @@ class Language {
 	  * </code>
 	  *
 	  * See LanguageGu.php for the Gujarati implementation and
-	  * LanguageIs.php for the , => . and . => , implementation.
+	  * $separatorTransformTable on MessageIs.php for
+	  * the , => . and . => , implementation.
 	  *
 	  * @todo check if it's viable to use localeconv() for the decimal
-	  *       seperator thing.
+	  *       separator thing.
 	  * @param $number Mixed: the string to be formatted, should be an integer
 	  *        or a floating point number.
 	  * @param $nocommafy Bool: set to true for special numbers like dates
@@ -1821,12 +1907,12 @@ class Language {
 		if (!$nocommafy) {
 			$number = $this->commafy($number);
 			$s = $this->separatorTransformTable();
-			if (!is_null($s)) { $number = strtr($number, $s); }
+			if ($s) { $number = strtr($number, $s); }
 		}
 
 		if ($wgTranslateNumerals) {
 			$s = $this->digitTransformTable();
-			if (!is_null($s)) { $number = strtr($number, $s); }
+			if ($s) { $number = strtr($number, $s); }
 		}
 
 		return $number;
@@ -1834,10 +1920,10 @@ class Language {
 
 	function parseFormattedNumber( $number ) {
 		$s = $this->digitTransformTable();
-		if (!is_null($s)) { $number = strtr($number, array_flip($s)); }
+		if ($s) { $number = strtr($number, array_flip($s)); }
 
 		$s = $this->separatorTransformTable();
-		if (!is_null($s)) { $number = strtr($number, array_flip($s)); }
+		if ($s) { $number = strtr($number, array_flip($s)); }
 
 		$number = strtr( $number, array (',' => '') );
 		return $number;
@@ -1865,24 +1951,54 @@ class Language {
 
 
 	/**
-	 * For the credit list in includes/Credits.php (action=credits)
+	 * Take a list of strings and build a locale-friendly comma-separated
+	 * list, using the local comma-separator message.
+	 * The last two strings are chained with an "and".
 	 *
 	 * @param $l Array
 	 * @return string
 	 */
 	function listToText( $l ) {
 		$s = '';
-		$m = count($l) - 1;
-		for ($i = $m; $i >= 0; $i--) {
-			if ($i == $m) {
-				$s = $l[$i];
-			} else if ($i == $m - 1) {
-				$s = $l[$i] . ' ' . $this->getMessageFromDB( 'and' ) . ' ' . $s;
-			} else {
-				$s = $l[$i] . ', ' . $s;
+		$m = count( $l ) - 1;
+		if( $m == 1 ) {
+			return $l[0] . $this->getMessageFromDB( 'and' ) . $this->getMessageFromDB( 'word-separator' ) . $l[1];
+		}
+		else {
+			for ( $i = $m; $i >= 0; $i-- ) {
+				if ( $i == $m ) {
+					$s = $l[$i];
+				} else if( $i == $m - 1 ) {
+					$s = $l[$i] . $this->getMessageFromDB( 'and' ) . $this->getMessageFromDB( 'word-separator' ) . $s;
+				} else {
+					$s = $l[$i] . $this->getMessageFromDB( 'comma-separator' ) . $s;
+				}
 			}
+			return $s;
 		}
-		return $s;
+	}
+
+	/**
+	 * Take a list of strings and build a locale-friendly comma-separated
+	 * list, using the local comma-separator message.
+	 * @param $list array of strings to put in a comma list
+	 * @return string
+	 */
+	function commaList( $list ) {
+		return implode(
+			$list,
+			wfMsgExt( 'comma-separator', array( 'escapenoentities', 'language' => $this ) ) );
+	}
+	
+	/**
+	 * Same as commaList, but separate it with the pipe instead.
+	 * @param $list array of strings to put in a pipe list
+	 * @return string
+	 */
+	function pipeList( $list ) {
+		return implode(
+			$list,
+			wfMsgExt( 'pipe-separator', array( 'escapenoentities', 'language' => $this ) ) );
 	}
 
 	/**
@@ -1967,7 +2083,7 @@ class Language {
 		if ( !count($forms) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 2 );
 
-		return ( abs($count) == 1 ) ? $forms[0] : $forms[1];
+		return ( $count == 1 ) ? $forms[0] : $forms[1];
 	}
 
 	/**
@@ -2093,8 +2209,8 @@ class Language {
 	 * @param $nt Mixed: the title object of the link
 	 * @return null the input parameters may be modified upon return
 	 */
-	function findVariantLink( &$link, &$nt ) {
-		$this->mConverter->findVariantLink($link, $nt);
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
+		$this->mConverter->findVariantLink($link, $nt, $forTemplate );
 	}
 
 	/**
@@ -2193,7 +2309,7 @@ class Language {
 	 */
 	static function loadLocalisation( $code, $disableCache = false ) {
 		static $recursionGuard = array();
-		global $wgMemc, $wgCheckSerialized;
+		global $wgMemc, $wgEnableSerializedMessages, $wgCheckSerialized;
 
 		if ( !$code ) {
 			throw new MWException( "Invalid language code requested" );
@@ -2208,16 +2324,18 @@ class Language {
 			wfProfileIn( __METHOD__ );
 
 			# Try the serialized directory
-			$cache = wfGetPrecompiledData( self::getFileName( "Messages", $code, '.ser' ) );
-			if ( $cache ) {
-				if ( $wgCheckSerialized && self::isLocalisationOutOfDate( $cache ) ) {
-					$cache = false;
-					wfDebug( "Language::loadLocalisation(): precompiled data file for $code is out of date\n" );
-				} else {
-					self::$mLocalisationCache[$code] = $cache;
-					wfDebug( "Language::loadLocalisation(): got localisation for $code from precompiled data file\n" );
-					wfProfileOut( __METHOD__ );
-					return self::$mLocalisationCache[$code]['deps'];
+			if( $wgEnableSerializedMessages ) {
+				$cache = wfGetPrecompiledData( self::getFileName( "Messages", $code, '.ser' ) );
+				if ( $cache ) {
+					if ( $wgCheckSerialized && self::isLocalisationOutOfDate( $cache ) ) {
+						$cache = false;
+						wfDebug( "Language::loadLocalisation(): precompiled data file for $code is out of date\n" );
+					} else {
+						self::$mLocalisationCache[$code] = $cache;
+						wfDebug( "Language::loadLocalisation(): got localisation for $code from precompiled data file\n" );
+						wfProfileOut( __METHOD__ );
+						return self::$mLocalisationCache[$code]['deps'];
+					}
 				}
 			}
 
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index bbf15971..dd69e826 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -180,7 +180,8 @@ class LanguageConverter {
 				$header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
 				$zh = strstr($header, $pv.'-');
 				if($zh) {
-					$pv = substr($zh,0,5);
+					$ary = split("[,;]",$zh);
+					$pv = $ary[0];
 				}
 			}
 			// don't try to return bad variant
@@ -374,8 +375,10 @@ class LanguageConverter {
 	 * @private
 	 */
 	function convertTitle($text){
-		// check for __NOTC__ tag
-		if( !$this->mDoTitleConvert ) {
+		global $wgDisableTitleConversion, $wgUser;
+
+		// check for global param and __NOTC__ tag
+		if( $wgDisableTitleConversion || !$this->mDoTitleConvert || $wgUser->getOption('noconvertlink') == 1 ) {
 			$this->mTitleDisplay = $text;
 			return $text;
 		}
@@ -389,7 +392,8 @@ class LanguageConverter {
 		global $wgRequest;
 		$isredir = $wgRequest->getText( 'redirect', 'yes' );
 		$action = $wgRequest->getText( 'action' );
-		if ( $isredir == 'no' || $action == 'edit' ) {
+		$linkconvert = $wgRequest->getText( 'linkconvert', 'yes' );
+		if ( $isredir == 'no' || $action == 'edit' || $action == 'submit' || $linkconvert == 'no' ) {
 			return $text;
 		} else {
 			$this->mTitleDisplay = $this->convert($text);
@@ -432,8 +436,9 @@ class LanguageConverter {
 		if ($isTitle) return $this->convertTitle($text);
 
 		$plang = $this->getPreferredVariant();
-		$tarray = explode($this->mMarkup['end'], $text);
+		$tarray = StringUtils::explode($this->mMarkup['end'], $text);
 		$text = '';
+		$lastDelim = false;
 		foreach($tarray as $txt) {
 			$marked = explode($this->mMarkup['begin'], $txt, 2);
 
@@ -449,8 +454,17 @@ class LanguageConverter {
 
 				$text .= $crule->getDisplay();
 				$this->applyManualConv($crule);
+				$lastDelim = false;
+			} else {
+				// Reinsert the }- which wasn't part of anything
+				$text .= $this->mMarkup['end'];
+				$lastDelim = true;
 			}
 		}
+		if ( $lastDelim ) {
+			// Remove the last delimiter (wasn't real)
+			$text = substr( $text, 0, -strlen( $this->mMarkup['end'] ) );
+		}
 
 		return $text;
 	}
@@ -466,12 +480,21 @@ class LanguageConverter {
 	 * @return null the input parameters may be modified upon return
 	 * @public
 	 */
-	function findVariantLink( &$link, &$nt ) {
-		global $wgDisableLangConversion;
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
+		global $wgDisableLangConversion, $wgDisableTitleConversion, $wgRequest, $wgUser;
+		$isredir = $wgRequest->getText( 'redirect', 'yes' );
+		$action = $wgRequest->getText( 'action' );
+		$linkconvert = $wgRequest->getText( 'linkconvert', 'yes' );
+		$disableLinkConversion = $wgDisableLangConversion || $wgDisableTitleConversion;
 		$linkBatch = new LinkBatch();
 
 		$ns=NS_MAIN;
 
+		if ( $disableLinkConversion || ( !$forTemplate && ( $isredir == 'no' || $action == 'edit'
+			|| $action == 'submit' || $linkconvert == 'no' || $wgUser->getOption('noconvertlink') == 1 ) ) ) {
+			return;
+		}
+
 		if(is_object($nt))
 			$ns = $nt->getNamespace();
 
@@ -497,8 +520,7 @@ class LanguageConverter {
 		foreach( $titles as $varnt ) {
 			if( $varnt->getArticleID() > 0 ) {
 				$nt = $varnt;
-				if( !$wgDisableLangConversion )
-					$link = $v;
+				$link = $v;
 				break;
 			}
 		}
diff --git a/languages/Names.php b/languages/Names.php
index 60bc0450..e6ea3c5b 100644
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -6,9 +6,9 @@
   * @ingroup Language
   */
 /* private */ $wgLanguageNames = array(
-	'aa' => 'Afar',			# Afar
+	'aa' => 'Qafár af',	# Afar
 	'ab' => '�ҧ�уа',	# Abkhaz, should possibly add ' бы�жѡа'
-	'ace' => 'Achèh',	# Aceh
+	'ace' => 'Acèh',	# Aceh
 	'af' => 'Afrikaans',	# Afrikaans
 	'ak' => 'Akan',		# Akan
 	'aln' => 'Gegë',	# Gheg Albanian
@@ -102,8 +102,8 @@
 	'gl' => 'Galego',		# Galician
 	'glk' => 'گیلکی',	# Gilaki
 	'gn' => 'Avañe\'ẽ',	# Guaraní, Paraguayan
-	'got' => '𐌲𐌿𐍄𐌹𐍃𐌺',	# Gothic
-	'grc' => 'Ἀ�χαία ἑλληνικὴ', # Ancient Greece
+	'got' => '������',	# Gothic
+	'grc' => 'Ἀ�χαία ἑλληνικὴ', # Ancient Greek
 	'gsw' => 'Alemannisch',	# Alemannic
 	'gu' => 'ગ�જરાતી',	# Gujarati
 	'gv' => 'Gaelg',		# Manx
diff --git a/languages/classes/LanguageBe.php b/languages/classes/LanguageBe.php
index 7633f031..1468daff 100644
--- a/languages/classes/LanguageBe.php
+++ b/languages/classes/LanguageBe.php
@@ -31,61 +31,4 @@ class LanguageBe extends Language {
 			}
 		}
 	}
-
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-   * Cases: родны, вінавальны, ме�ны
-   */
-	function convertGrammar( $word, $case ) {
-		switch ( $case ) {
-			case 'родны': # genitive
-				if ( $word == 'Вікіп�ды�' ) {
-					$word = 'Вікіп�дыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніка';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКніг';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'Вікі�авіны' ) {
-					$word = 'Вікі�авін';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідаў';
-				}
-			break;
-			case 'вінавальны': # akusative
-				if ( $word == 'Вікіп�ды�' ) {
-					$word = 'Вікіп�дыю';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўнік';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігі';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцу';
-				} elseif ( $word == 'Вікі�авіны' ) {
-					$word = 'Вікі�авіны';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВіды';
-				}
-			break;
-			case 'ме�ны': # prepositional
-				if ( $word == 'Вікіп�ды�' ) {
-					$word = 'Вікіп�дыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніку';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігах';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'Вікі�авіны' ) {
-					$word = 'Вікі�авінах';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідах';
-				}
-			break;
-		}
-
-		return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values
-	}
 }
diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php
index 312735da..358cb486 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -39,61 +39,4 @@ class LanguageBe_tarask extends Language {
 			}
 		}
 	}
-
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-   * Cases: родны, вінавальны, ме�ны
-   */
-	function convertGrammar( $word, $case ) {
-		switch ( $case ) {
-			case 'родны': # genitive
-				if ( $word == 'Вікіп�ды�' ) {
-					$word = 'Вікіп�дыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніка';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКніг';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'Вікі�авіны' ) {
-					$word = 'Вікі�авін';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідаў';
-				}
-			break;
-			case 'вінавальны': # akusative
-				if ( $word == 'Вікіп�ды�' ) {
-					$word = 'Вікіп�дыю';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўнік';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігі';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцу';
-				} elseif ( $word == 'Вікі�авіны' ) {
-					$word = 'Вікі�авіны';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВіды';
-				}
-			break;
-			case 'ме�ны': # prepositional
-				if ( $word == 'Вікіп�ды�' ) {
-					$word = 'Вікіп�дыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніку';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігах';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'Вікі�авіны' ) {
-					$word = 'Вікі�авінах';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідах';
-				}
-			break;
-		}
-
-		return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values
-	}
 }
diff --git a/languages/classes/LanguageBs.php b/languages/classes/LanguageBs.php
index ee2eb6a6..24f6adde 100644
--- a/languages/classes/LanguageBs.php
+++ b/languages/classes/LanguageBs.php
@@ -34,99 +34,11 @@ class LanguageBs extends Language {
 			return $wgGrammarForms['bs'][$case][$word];
 		}
 		switch ( $case ) {
-			case 'genitiv': # genitive
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipedije';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjiga';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijesti';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitata';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikiizvora';
-				} elseif ( $word == 'Vikirje�nik' ) {
-					$word = 'Vikirje�nika';
-				}
-			break;
-			case 'dativ': # dative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjigama';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitatima';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijestima';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikiizvoru';
-				} elseif ( $word == 'Vikirje�nik' ) {
-					$word = 'Vikirje�niku';
-				}
-			break;
-			case 'akuzativ': # akusative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjige';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitate';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijesti';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikiizvora';
-				} elseif ( $word == 'Vikirje�nik' ) {
-					$word = 'Vikirje�nika';
-				}
-			break;
-			case 'vokativ': # vocative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipedijo';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjige';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitati';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijesti';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikizivoru';
-				} elseif ( $word == 'Vikirje�nik' ) {
-					$word = 'Vikirje�ni�e';
-				}
-			break;
 			case 'instrumental': # instrumental
-				if ( $word == 'Wikipedia' ) {
-					$word = 's Wikipediom';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 's Wikiknjigama';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 's Wikicitatima';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 's Wikivijestima';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 's Wikiizvorom';
-				} elseif ( $word == 'Vikirje�nik' ) {
-					$word = 's Vikirje�nikom';
-				} else {
-					$word = 's ' . $word;
-				}
+				$word = 's ' . $word;
 			break;
 			case 'lokativ': # locative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'o Wikipediji';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'o Wikiknjigama';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'o Wikicitatima';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'o Wikivijestima';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'o Wikiizvoru';
-				} elseif ( $word == 'Vikirje�nik' ) {
-					$word = 'o Vikirje�niku';
-				} else {
-					$word = 'o ' . $word;
-				}
+				$word = 'o ' . $word;
 			break;
 		}
 
diff --git a/languages/classes/LanguageCs.php b/languages/classes/LanguageCs.php
index 9c523d98..ca1669b9 100644
--- a/languages/classes/LanguageCs.php
+++ b/languages/classes/LanguageCs.php
@@ -1,120 +1,16 @@
 <?php
 
-/** Czech (�esky)
+/** Czech (�eština [subst.], �eský [adj.], �esky [adv.])
  *
  * @ingroup Language
  */
 class LanguageCs extends Language {
-	# Grammatical transformations, needed for inflected languages
-	# Invoked by putting {{grammar:case|word}} in a message
-	function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['cs'][$case][$word]) ) {
-			return $wgGrammarForms['cs'][$case][$word];
-		}
-		# allowed values for $case:
-		#	1sg, 2sg, ..., 7sg -- nominative, genitive, ... (in singular)
-		switch ( $word ) {
-			case 'Wikibooks':
-			case 'Wikiknihy':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikiknih';
-					case '3sg':
-						return 'Wikiknihám';
-					case '6sg':
-						return 'Wikiknihách';
-					case '7sg':
-						return 'Wikiknihami';
-					default:
-						return 'Wikiknihy';
-				}
-			case 'Wikipedia':
-			case 'Wikipedie':
-				switch ( $case ) {
-					case '3sg':
-					case '4sg':
-					case '6sg':
-						return 'Wikipedii';
-					case '7sg':
-						return 'Wikipedií';
-					default:
-						return 'Wikipedie';
-				}
-			case 'Wiktionary':
-			case 'Wikcionář':
-			case 'Wikislovník':
-				switch ( $case ) {
-					case '2sg':
-					case '3sg':
-					case '5sg':
-					case '6sg':
-						return 'Wikislovníku';
-					case '7sg':
-						return 'Wikislovníkem';
-					default:
-						return 'Wikislovník';
-				}
-			case 'Wikiquote':
-			case 'Wikicitáty':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikicitátů';
-					case '3sg':
-						return 'Wikicitátům';
-					case '6sg':
-						return 'Wikicitátech';
-					default:
-						return 'Wikicitáty';
-				}
-			case 'Wikinews':
-			case 'Wikizprávy':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikizpráv';
-					case '3sg':
-						return 'Wikizprávám';
-					case '6sg':
-						return 'Wikizprávách';
-					case '7sg':
-						return 'Wikizprávami';
-					default:
-						return 'Wikizprávy';
-				}
-			case 'Wikiversity':
-			case 'Wikiverzita':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikiverzity';
-					case '3sg':
-					case '6sg':
-						return 'WikiverzitÄ›';
-					case '4sg':
-						return 'Wikiverzitu';
-					case '5sg':
-						return 'Wikiverzito';
-					case '7sg':
-						return 'Wikiverzitou';
-					default:
-						return 'Wikiverzita';
-				}
-			case 'Wikispecies':
-			case 'Wikidruhy':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikidruhů';
-					case '3sg':
-						return 'Wikidruhům';
-					case '6sg':
-						return 'Wikidruzích';
-					default:
-						return 'Wikidruhy';
-				}
-		}
-		# unknown
-		return $word;
-	}
 
+	# Plural transformations
+	# Invoked by putting
+	#   {{plural:count|form1|form2-4|form0,5+}} for two forms plurals
+	#   {{plural:count|form1|form0,2+}} for single form plurals
+	# in a message
 	function convertPlural( $count, $forms ) {
 		if ( !count($forms) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 3 );
diff --git a/languages/classes/LanguageDsb.php b/languages/classes/LanguageDsb.php
index 88887998..4ea1b893 100644
--- a/languages/classes/LanguageDsb.php
+++ b/languages/classes/LanguageDsb.php
@@ -11,89 +11,15 @@ class LanguageDsb extends Language {
 
 	function convertGrammar( $word, $case ) {
 		global $wgGrammarForms;
-		if ( isset( $wgGrammarForms['hsb'][$case][$word] ) ) {
-			return $wgGrammarForms['hsb'][$case][$word];
+		if ( isset( $wgGrammarForms['dsb'][$case][$word] ) ) {
+			return $wgGrammarForms['dsb'][$case][$word];
 		}
 
 		switch ( $case ) {
-			case 'genitiw': # genitive
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipedije';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknih';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowin';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórła';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatow';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownika';
-				}
-				break;
-			case 'datiw': # dativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikikniham';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinam';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatam';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikej';
-				}
-				break;
-			case 'akuzativ': # akuzativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknknihi';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowiny';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórło';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitaty';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownik';
-				}
-				break;
 			case 'instrumental': # instrumental
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihami';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinami';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłom';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatami';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikom';
-				} else {
-					$word = 'z ' . $word;
-				}
-				break;
+				$word = 'z ' . $word;
 			case 'lokatiw': # lokatiw
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihach';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinach';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatach';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłowniku';
-				} else {
-					$word = 'wo ' . $word;
-				}
+				$word = 'wo ' . $word;
 				break;
 			}
 
diff --git a/languages/classes/LanguageGa.php b/languages/classes/LanguageGa.php
index fc1546a8..2fdeed04 100644
--- a/languages/classes/LanguageGa.php
+++ b/languages/classes/LanguageGa.php
@@ -14,17 +14,6 @@ class LanguageGa extends Language {
 		}
 
 		switch ( $case ) {
-		case 'genitive':
-			switch ($word) {
-			case 'Vicipéid':     $word = 'Vicipéide'; break;
-			case 'Vicífhoclóir': $word = 'Vicífhoclóra'; break;
-			case 'Vicíleabhair': $word = 'Vicíleabhar'; break;
-			case 'Vicíshliocht': $word = 'Vicíshleachta'; break;
-			case 'Vicífhoinse':  $word = 'Vicífhoinse'; break;
-			case 'Vicíghnéithe': $word = 'Vicíghnéithe'; break;
-			case 'Vicínuacht':   $word = 'Vicínuachta'; break;
-			}
-
 		case 'ainmlae':
 			switch ($word) {
 			case 'an Domhnach':
diff --git a/languages/classes/LanguageGsw.php b/languages/classes/LanguageGsw.php
deleted file mode 100644
index 3a1b4139..00000000
--- a/languages/classes/LanguageGsw.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/** Alemannic (Alemannisch)
- *
- * @ingroup Language
- */
-class LanguageGsw extends Language {
-   # Convert from the nominative form of a noun to some other case
-   # Invoked with result
-
-   function convertGrammar( $word, $case ) {
-       global $wgGrammarForms;
-       if ( isset($wgGrammarForms['gsw'][$case][$word]) ) {
-           return $wgGrammarForms['gsw'][$case][$word];
-       }
-       switch ( $case ) {
-           case 'dativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'vo de Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'vo de Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 'vom Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'vo de Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'vo de Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'vo de Wikiquälle';
-               }
-               break;
-           case 'akkusativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'd Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'd Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 's Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'd Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'd Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'd Wikiquälle';
-               }
-               break;
-           case 'nominativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'd Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'd Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 's Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'd Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'd Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'd Wikiquälle';
-               }
-               break;
-       }
-       return $word;
-   }
-}
diff --git a/languages/classes/LanguageHsb.php b/languages/classes/LanguageHsb.php
index efbaab39..f1418782 100644
--- a/languages/classes/LanguageHsb.php
+++ b/languages/classes/LanguageHsb.php
@@ -16,84 +16,11 @@ class LanguageHsb extends Language {
 		}
 
 		switch ( $case ) {
-			case 'genitiw': # genitive
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipedije';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknih';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowin';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórła';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatow';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownika';
-				}
-				break;
-			case 'datiw': # dativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikikniham';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinam';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatam';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikej';
-				}
-				break;
-			case 'akuzativ': # akuzativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknknihi';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowiny';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórło';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitaty';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownik';
-				}
-				break;
 			case 'instrumental': # instrumental
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihami';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinami';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłom';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatami';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikom';
-				} else {
-					$word = 'z ' . $word;
-				}
+				$word = 'z ' . $word;
 				break;
 			case 'lokatiw': # lokatiw
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihach';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinach';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatach';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłowniku';
-				} else {
-					$word = 'wo ' . $word;
-				}
+				$word = 'wo ' . $word;
 				break;
 			}
 
diff --git a/languages/classes/LanguageHu.php b/languages/classes/LanguageHu.php
index d247b498..7845bdbb 100644
--- a/languages/classes/LanguageHu.php
+++ b/languages/classes/LanguageHu.php
@@ -11,31 +11,6 @@ class LanguageHu extends Language {
 			return $wgGrammarForms[$this->getCode()][$case][$word];
 		}
 
-		static $localForms = array(
-			'rol' => array(
-				'Wikipédia'   => 'Wikipédiáról',
-				'Wikidézet'   => 'Wikidézetről',
-				'Wikiszótár'  => 'Wikiszótárról',
-				'Wikikönyvek' => 'Wikikönyvekről',
-			),
-			'ba' => array(
-				'Wikipédia'   => 'Wikipédiába',
-				'Wikidézet'   => 'Wikidézetbe',
-				'Wikiszótár'  => 'Wikiszótárba',
-				'Wikikönyvek' => 'Wikikönyvekbe',
-			),
-			'k' => array(
-				'Wikipédia'   => 'Wikipédiák',
-				'Wikidézet'   => 'Wikidézetek',
-				'Wikiszótár'  => 'Wikiszótárak',
-				'Wikikönyvek' => 'Wikikönyvek',
-			)
-		);
-
-		if ( isset( $localForms[$case][$word] ) ) {
-			return $localForms[$case][$word];
-		}
-
 		switch ( $case ) {
 			case 'rol':
 				return $word . 'ról';
@@ -46,5 +21,3 @@ class LanguageHu extends Language {
 		}
 	}
 }
-
-
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 34c5c39a..73f0a1f9 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -225,7 +225,7 @@ class KkConverter extends LanguageConverter {
 	 *    names as they were
 	 *  - do not try to find variants for usernames
 	 */
-	function findVariantLink( &$link, &$nt ) {
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
 		// check for user namespace
 		if(is_object($nt)){
 			$ns = $nt->getNamespace();
@@ -234,8 +234,8 @@ class KkConverter extends LanguageConverter {
 		}
 
 		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
-		if($this->getPreferredVariant()==$this->mMainLanguageCode)
+		parent::findVariantLink( $link, $nt, $forTemplate );
+		if( $this->getPreferredVariant()==$this->mMainLanguageCode )
 			$link=$oldlink;
 	}
 
@@ -245,7 +245,7 @@ class KkConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php
index 55eb0d56..3137c7e8 100644
--- a/languages/classes/LanguageKu.php
+++ b/languages/classes/LanguageKu.php
@@ -148,7 +148,7 @@ class KuConverter extends LanguageConverter {
 	 *     names as they were
 	 *   - do not try to find variants for usernames
 	 */
-	function findVariantLink( &$link, &$nt ) {
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
 		// check for user namespace
 		if(is_object($nt)){
 			$ns = $nt->getNamespace();
@@ -157,8 +157,8 @@ class KuConverter extends LanguageConverter {
 		}
 
 		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
-		if($this->getPreferredVariant()==$this->mMainLanguageCode)
+		parent::findVariantLink( $link, $nt, $forTemplate );
+		if( $this->getPreferredVariant() == $this->mMainLanguageCode )
 			$link=$oldlink;
 	}
 
@@ -178,7 +178,7 @@ class KuConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
@@ -244,24 +244,4 @@ class LanguageKu extends LanguageKu_ku {
 		$this->mConverter = new KuConverter( $this, 'ku', $variants, $variantfallbacks );
 		$wgHooks['ArticleSaveComplete'][] = $this->mConverter;
 	}
-
-/*   From Kazakh interface, not needed for the moment
-
-	function convertGrammar( $word, $case ) {
-		$fname="LanguageKu::convertGrammar";
-		wfProfileIn( $fname );
-
-		//always convert to ku-latn before convertGrammar
-		$w1 = $word;
-		$word = $this->mConverter->autoConvert( $word, 'ku-latn' );
-		$w2 = $word;
-		$word = parent::convertGrammar( $word, $case );
-		//restore encoding
-		if( $w1 != $w2 ) {
-			$word = $this->mConverter->translate( $word, 'ku-latn' );
-		}
-		wfProfileOut( $fname );
-		return $word;
-	}
-*/
 }
diff --git a/languages/classes/LanguageKu_ku.php b/languages/classes/LanguageKu_ku.php
index 5dec67e6..cf2107ec 100644
--- a/languages/classes/LanguageKu_ku.php
+++ b/languages/classes/LanguageKu_ku.php
@@ -6,17 +6,6 @@
  */
 class LanguageKu_ku extends Language {
 
-/**  	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-	 * Cases:
-	 *
-	 * From Kazakh interface, not needed at the moment, maybe later
-	 */
-	function convertGrammar( $word, $case ) {
-		return $word;
-	}
-
 	/**
 	 * Avoid grouping whole numbers between 0 to 9999
 	 */
diff --git a/languages/classes/LanguageLv.php b/languages/classes/LanguageLv.php
index 1c82831c..2c8d9f31 100644
--- a/languages/classes/LanguageLv.php
+++ b/languages/classes/LanguageLv.php
@@ -27,31 +27,4 @@ class LanguageLv extends Language {
 
 		return ( ( $count % 10 == 1 ) && ( $count % 100 != 11 ) ) ? $forms[0] : $forms[1];
 	}
-
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	# ģenitīvs - k�, datīvs - kam, akuzatīvs - ko, lokatīvs - kur.
-	/**
-	 * Cases: ģenitīvs, datīvs, akuzatīvs, lokatīvs
-	 */
-	function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-
-		$wgGrammarForms['lv']['ģenitīvs' ]['Vikipēdija']   = 'Vikipēdijas';
-		$wgGrammarForms['lv']['ģenitīvs' ]['Vikiv�rdnīca'] = 'Vikiv�rdnīcas';
-		$wgGrammarForms['lv']['datīvs'   ]['Vikipēdija']   = 'Vikipēdijai';
-		$wgGrammarForms['lv']['datīvs'   ]['Vikiv�rdnīca'] = 'Vikiv�rdnīcai';
-		$wgGrammarForms['lv']['akuzatīvs']['Vikipēdija']   = 'Vikipēdiju';
-		$wgGrammarForms['lv']['akuzatīvs']['Vikiv�rdnīca'] = 'Vikiv�rdnīcu';
-		$wgGrammarForms['lv']['lokatīvs' ]['Vikipēdija']   = 'Vikipēdij�';
-		$wgGrammarForms['lv']['lokatīvs' ]['Vikiv�rdnīca'] = 'Vikiv�rdnīc�';
-
-		if ( isset($wgGrammarForms['lv'][$case][$word]) ) {
-			return $wgGrammarForms['lv'][$case][$word];
-		}
-
-		return $word;
-	}
 }
-
-
diff --git a/languages/classes/LanguageMy.php b/languages/classes/LanguageMy.php
new file mode 100644
index 00000000..d76b99e7
--- /dev/null
+++ b/languages/classes/LanguageMy.php
@@ -0,0 +1,18 @@
+<?php
+/** Burmese (Myanmasa)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Niklas Laxström, 2008
+ */
+
+class LanguageMy extends Language {
+	function commafy($_) {
+		/* NO-op. Cannot use
+		 * $separatorTransformTable = array( ',' => '' )
+		 * That would break when parsing and doing strstr '' => 'foo';
+		 */
+		return $_;
+	}
+}
\ No newline at end of file
diff --git a/languages/classes/LanguageRmy.php b/languages/classes/LanguageRmy.php
deleted file mode 100644
index e3cab8f4..00000000
--- a/languages/classes/LanguageRmy.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @ingroup Language
- */
-class LanguageRmy extends Language {
-	/**
-	 * Convert from the nominative form of a noun to some other case
-	 * Invoked with {{GRAMMAR:case|word}}
-	 *
-	 * Cases: nominative, genitive-m-sg, genitive-f-sg, dative, locative, ablative, instrumental
-	 */
-	public function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['rmy'][$case][$word]) ) {
-			return $wgGrammarForms['rmy'][$case][$word];
-		}
-
-		switch ( $case ) {
-			case 'genitive-m-sg': # genitive (m.sg.)
-				if ( $word == 'Vikipidiya' ) {
-					$word = 'Vikipidiyako';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonaresko';
-				}
-			break;
-			case 'genitive-f-sg': # genitive (f.sg.)
-				if ( $word == 'Vikipidiya' ) {
-					$word = 'Vikipidiyaki';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareski';
-				}
-			break;
-			case 'genitive-pl': # genitive (pl.)
-				if ( $word == 'Vikipidiya' ) {
-					$word = 'Vikipidiyake';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareske';
-				}
-			break;
-			case 'dativ':
-				if ( $word == 'Vikipidiyake' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareske';
-				}
-			break;
-			case 'locative':
-				if ( $word == 'Vikipidiyate' ) {
-					$word = 'Wikipedijo';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareste';
-				}
-			break;
-			case 'ablative':
-				if ( $word == 'Vikipidiyatar' ) {
-					$word = 'o Wikipediji';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonarestar';
-				}
-			break;
-			case 'instrumental':
-				if ( $word == 'Vikipidiyasa' ) {
-					$word = 'z Wikipedijo';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonaresa';
-				}
-			break;
-		}
-
-		return $word; # this will return the original value for 'nominative' and all undefined case values
-	}
-}
diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php
index d857920a..5933b47a 100644
--- a/languages/classes/LanguageRu.php
+++ b/languages/classes/LanguageRu.php
@@ -92,14 +92,15 @@ class LanguageRu extends Language {
 	}
 
 	/*
-	 * Russian numeric format is "12 345,67" but "1234,56"
+	 * Four-digit number should be without group commas (spaces)
+	 * See manual of style at http://ru.wikipedia.org/wiki/Википеди�:Оформление_�татей
+	 * So "1 234 567", "12 345" but "1234"
 	 */
-
 	function commafy($_) {
-		if (!preg_match('/^\d{1,4}$/',$_)) {
-			return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
-		} else {
+		if (preg_match('/^-?\d{1,4}(\.\d*)?$/',$_)) {
 			return $_;
+		} else {
+			return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
 		}
 	}
 }
diff --git a/languages/classes/LanguageSk.php b/languages/classes/LanguageSk.php
index 19e66bae..7ddbcbdb 100644
--- a/languages/classes/LanguageSk.php
+++ b/languages/classes/LanguageSk.php
@@ -1,82 +1,10 @@
 <?php
-
 /**
  * Slovak (Sloven�ina)
  *
  * @ingroup Language
  */
 class LanguageSk extends Language {
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-	 * Cases: genitív, datív, akuzatív, lokál, inštrumentál
-	 */
-	function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['sk'][$case][$word]) ) {
-			return $wgGrammarForms['sk'][$case][$word];
-		}
-
-		switch ( $case ) {
-			case 'genitív':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédie';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníku';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátov';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikikníh';
-				}
-			break;
-			case 'datív':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédii';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníku';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátom';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihám';
-				}
-			break;
-			case 'akuzatív':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédiu';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovník';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitáty';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihy';
-				}
-			break;
-			case 'lokál':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédii';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníku';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátoch';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihách';
-				}
-			break;
-			case 'inštrumentál':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédiou';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníkom';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátmi';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihami';
-				}
-			break;
-		}
-		return $word;
-	}
-
 	function convertPlural( $count, $forms ) {
 		if ( !count($forms) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 3 );
diff --git a/languages/classes/LanguageSl.php b/languages/classes/LanguageSl.php
index 8c1b503b..734b274c 100644
--- a/languages/classes/LanguageSl.php
+++ b/languages/classes/LanguageSl.php
@@ -17,55 +17,10 @@ class LanguageSl extends Language {
 		}
 
 		switch ( $case ) {
-			case 'rodilnik': # genitive
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'Wikipedije'; break 2;
-					case 'Wikiknjige': $word = 'Wikiknjig'; break 2;
-					case 'Wikinovice': $word = 'Wikinovic'; break 2;
-					case 'Wikinavedek': $word = 'Wikinavedka'; break 2;
-					case 'Wikivir': $word = 'Wikivira'; break 2;
-					case 'Wikislovar': $word = 'Wikislovarja'; break 2;
-				}
-			case 'dajalnik': # dativ
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'Wikipediji'; break 2;
-					case 'Wikiknjige': $word = 'Wikiknjigam'; break 2;
-					case 'Wikinovice': $word = 'Wikinovicam'; break 2;
-					case 'Wikinavedek': $word = 'Wikinavedku'; break 2;
-					case 'Wikivir': $word = 'Wikiviru'; break 2;
-					case 'Wikislovar': $word = 'Wikislovarju'; break 2;
-				}
-			case 'tožilnik': # akuzatív
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'Wikipedijo'; break 2;
-					case 'Wikiknjige':
-					case 'Wikinovice':
-					case 'Wikinavedek':
-					case 'Wikivir':
-					case 'Wikislovar':
-						// Don't change, just fall through
-						break 2;
-				}
 			case 'mestnik': # locative
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'o Wikipediji'; break 2;
-					case 'Wikiknjige': $word = 'o Wikiknjigah'; break 2;
-					case 'Wikinovice': $word = 'o Wikinovicah'; break 2;
-					case 'Wikinavedek': $word = 'o Wikinavedku'; break 2;
-					case 'Wikivir': $word = 'o Wikiviru'; break 2;
-					case 'Wikislovar': $word = 'o Wikislovarju'; break 2;
-					default: $word = 'o ' . $word; break 2;
-				}
+				$word = 'o ' . $word; break;
 			case 'orodnik': # instrumental
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'z Wikipedijo'; break 2;
-					case 'Wikiknjige': $word = 'z Wikiknjigami'; break 2;
-					case 'Wikinovice': $word = 'z Wikinovicami'; break 2;
-					case 'Wikinavedek': $word = 'z Wikinavedkom'; break 2;
-					case 'Wikivir': $word = 'z Wikivirom'; break 2;
-					case 'Wikislovar': $word = 'z Wikislovarjem'; break 2;
-					default: $word = 'z ' . $word;
-				}
+				$word = 'z ' . $word;
 		}
 
 		return $word; # this will return the original value for 'imenovalnik' (nominativ) and all undefined case values
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index d57c733d..cac82ce7 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -92,7 +92,7 @@ class SrConverter extends LanguageConverter {
 	 *     names as they were
 	 *   - do not try to find variants for usernames
 	 */
-	function findVariantLink( &$link, &$nt ) {
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
 		// check for user namespace
 		if(is_object($nt)){
 			$ns = $nt->getNamespace();
@@ -101,7 +101,7 @@ class SrConverter extends LanguageConverter {
 		}
 
 		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
+		parent::findVariantLink( $link, $nt, $forTemplate );
 		if($this->getPreferredVariant()==$this->mMainLanguageCode)
 			$link=$oldlink;
 	}
@@ -122,7 +122,7 @@ class SrConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php
index fdc227b3..fc7f233c 100644
--- a/languages/classes/LanguageYue.php
+++ b/languages/classes/LanguageYue.php
@@ -4,20 +4,18 @@
  */
 class LanguageYue extends Language {
 	function stripForSearch( $string ) {
-		# MySQL fulltext index doesn't grok utf-8, so we
-		# need to fold cases and convert to hex
-		# we also separate characters as "words"
-		if( function_exists( 'mb_strtolower' ) ) {
-			return preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"' U8' . bin2hex( \"$1\" )",
-				mb_strtolower( $string ) );
-		} else {
-			list( , $wikiLowerChars ) = Language::getCaseMaps();
-			return preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"' U8' . bin2hex( strtr( \"\$1\", \$wikiLowerChars ) )",
-				$string );
-		}
+		wfProfileIn( __METHOD__ );
+
+		// eventually this should be a word segmentation
+		// for now just treat each character as a word
+		// @fixme only do this for Han characters...
+		$t = preg_replace(
+				"/([\\xc0-\\xff][\\x80-\\xbf]*)/",
+				" $1", $string);
+
+		// Do general case folding and UTF-8 armoring
+		$t = parent::stripForSearch( $t );
+		wfProfileOut( __METHOD__ );
+		return $t;
 	}
 }
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 3d162a8e..09362690 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -126,14 +126,14 @@ class LanguageZh extends LanguageZh_hans {
 
 	// word segmentation
 	function stripForSearch( $string ) {
-		$fname="LanguageZh::stripForSearch";
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		// eventually this should be a word segmentation
 		// for now just treat each character as a word
+		// @fixme only do this for Han characters...
 		$t = preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"' ' .\"$1\"", $string);
+				"/([\\xc0-\\xff][\\x80-\\xbf]*)/",
+				" $1", $string);
 
         //always convert to zh-hans before indexing. it should be
 		//better to use zh-hans for search, since conversion from
@@ -142,7 +142,7 @@ class LanguageZh extends LanguageZh_hans {
 
 		$t = $this->mConverter->autoConvert($t, 'zh-hans');
 		$t = parent::stripForSearch( $t );
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $t;
 
 	}
diff --git a/languages/messages/MessagesAce.php b/languages/messages/MessagesAce.php
index d7031e27..e2002625 100644
--- a/languages/messages/MessagesAce.php
+++ b/languages/messages/MessagesAce.php
@@ -1,5 +1,5 @@
 <?php
-/** Achinese (Achèh)
+/** Achinese (Acèh)
  *
  * @ingroup Language
  * @file
@@ -9,6 +9,8 @@
  * @author Si Gam Acèh
  */
 
+$fallback = 'id';
+
 $messages = array(
 # Dates
 'sun'           => 'Aleu',
@@ -100,8 +102,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Bhah {{SITENAME}}',
 'aboutpage'            => 'Project:Bhah Ôn',
-'bugreports'           => 'Neubri thèë bug',
-'bugreportspage'       => 'Project:Neubri thèë bug',
 'copyrightpage'        => '{{ns:project}}:Hak karang',
 'currentevents'        => 'Peristiwa paléng barô',
 'currentevents-url'    => 'Project:Peristiwa paléng barô',
@@ -183,6 +183,9 @@ Droëneuh geupeusaran keu neutamong sigra, lheuëh nyan neugantoë lageuëm rahs
 'passwordsent'            => 'Lageuëm rahsia barô ka geukirém u surat-e nyang geupeudapeuta keu "$1". Neutamong teuma lheuëh neuteurimong surat-e nyan.',
 'eauthentsent'            => 'Saboh surat èlèktronik keu peunyoë ka geukirém u alamat surat èlèktronik Droëneuh. Droëneuh beuneuseutöt préntah lam surat nyan keu neupeunyoë meunyo alamat nyan nakeuh beutôy atra Droëneuh. {{SITENAME}} h‘an geupeuudép surat Droëneuh meunyo langkah nyoë hana neupeulaku lom.',
 
+# Password reset dialog
+'retypenew' => 'Pasoë keulayi lageuëm rahsia barô:',
+
 # Edit page toolbar
 'bold_sample'     => 'Citak teubay naseukah nyoë',
 'bold_tip'        => 'Citak teubay',
@@ -204,8 +207,8 @@ Droëneuh geupeusaran keu neutamong sigra, lheuëh nyan neugantoë lageuëm rahs
 'hr_tip'          => 'Garéh data',
 
 # Edit pages
-'summary'                => 'Reuningkah',
-'subject'                => 'Bhah/nan',
+'summary'                => 'Reuningkah:',
+'subject'                => 'Bhah/nan:',
 'minoredit'              => 'Nyoë lôn andam bacut',
 'watchthis'              => 'Kalön ôn nyoë',
 'savearticle'            => 'Keubah ôn',
@@ -213,7 +216,7 @@ Droëneuh geupeusaran keu neutamong sigra, lheuëh nyan neugantoë lageuëm rahs
 'showpreview'            => 'Peuleumah hasé',
 'showdiff'               => 'Peuleumah neu’ubah',
 'anoneditwarning'        => 'Droëneuh   hana teudapeuta tamong. Alamat IP Droëneuh   teucatat lam tarèh (riwayat away) ôn nyoë.',
-'summary-preview'        => 'Eu dilèë reuningkah',
+'summary-preview'        => 'Eu dilèë reuningkah:',
 'blockedtext'            => "<big>'''Nan nyang nguy atawa alamat IP Droëneuh  ka geutheun.'''</big> 
 
 Geutheun lé $1. Dalèh jih nakeuh ''$2''. 
@@ -230,11 +233,11 @@ Alamat IP Droëneuh nakeuh $3, ngön ID neutheun nakeuh $5. Tulông peuseureuta
 'newarticle'             => '(Barô)',
 'newarticletext'         => "Droëneuh   ka neuseutot u ôn nyang goh na. Keu peugöt ôn nyan, neukeutik asoë ôn di  kutak di yup nyoë (ngiëng [[{{MediaWiki:Helppage}}|ôn bantu]] keu beurita leubèh lanjut). Meunyo Droëneuh  hana neusaja ka trôk keunoë, teugon '''back''' nyang na bak layeuë.",
 'noarticletext'          => 'Hana naseukah jinoë lam ôn nyoë. I Droëneuh   jeuët [[Special:Search/{{PAGENAME}}|mita keu nan ôn nyoë]] bak ôn-ôn la’én atawa [{{fullurl:{{FULLPAGENAME}}|action=edit}} andam ôn nyoë].',
-'previewnote'            => '<strong>Beuneuingat meunyo nyoë goh lom neukeubah!</strong>',
+'previewnote'            => "'''Beuneuingat meunyo nyoë goh lom neukeubah!'''",
 'editing'                => 'Andam $1',
 'editingsection'         => 'Andam $1 (bideuëng)',
-'copyrightwarning'       => 'Beuneuingat bahwa ban mandum nyang Droëneuh   tuléh keu {{SITENAME}} geukira geupeuteubiët di yup $2 (ngiëng $1 keu leubèh jeulah). Meunyoë Droëneuh h‘an neutém teunuléh Droëneuh  ji’andam ngön jiba ho ho la’én, bèk neupasoë teunuléh Droëneuh  keunoë.<br />Droëneuh  neumeujanji chit meunyoë teunuléh nyoë nakeuh atra neutuléh keudroë, atawa neucok nibak nè nè atra umôm atawa nè bibeuëh la’én.
-<strong>BÈK NEUPASOË TEUNULÉH NYANG GEUPEULINDÔNG HAK KARANG NYANG HANA IDIN</strong>',
+'copyrightwarning'       => "Beuneuingat bahwa ban mandum nyang Droëneuh   tuléh keu {{SITENAME}} geukira geupeuteubiët di yup $2 (ngiëng $1 keu leubèh jeulah). Meunyoë Droëneuh h‘an neutém teunuléh Droëneuh  ji’andam ngön jiba ho ho la’én, bèk neupasoë teunuléh Droëneuh  keunoë.<br />Droëneuh  neumeujanji chit meunyoë teunuléh nyoë nakeuh atra neutuléh keudroë, atawa neucok nibak nè nè atra umôm atawa nè bibeuëh la’én.
+'''BÈK NEUPASOË TEUNULÉH NYANG GEUPEULINDÔNG HAK KARANG NYANG HANA IDIN'''",
 'longpagewarning'        => "'''INGAT: Ôn nyoë panyangjih nakeuh $1 kilobit; ladôm alat rawoh web kadang na masalah bak ji’andam ôn nyang panyangjih 32 kb atawa leubèh. Beu neupeutimang keu neuplah jeuët padum boh beunagi nyang leubèh cut. '''",
 'templatesused'          => 'Templat nyang geunguy bak ôn nyoë:',
 'templatesusedpreview'   => 'Templat nyang geunguy bak eu dilèë nyoë',
@@ -247,20 +250,21 @@ Neutimang-timang dilèë peuë ék patôt neupeulanjut atra nyang teungoh neu’
 Nyoë pat nakeuh log seunampôh nibak ôn nyoë:",
 
 # History pages
-'viewpagelogs'        => 'Eu log ôn nyoë',
-'currentrev'          => 'Geunantoë jinoë',
-'revisionasof'        => 'Gantoë tiëp $1',
-'revision-info'       => 'Geunantoë tiëp $1; $2',
-'previousrevision'    => '�Geunantoë sigohlomjih',
-'nextrevision'        => 'Geunantoë lheuëh nyan→',
-'currentrevisionlink' => 'Geunantoë jinoë',
-'cur'                 => 'jin',
-'last'                => 'akhé',
-'page_first'          => 'phôn',
-'page_last'           => 'keuneulheuëh',
-'histlegend'          => "Piléh duwa teuneugön radiô, lheuëh nyan teugön teuneugön ''peubandéng'' keu peubandéng seunalén. Teugön saboh tanggay keu eu seunalén ôn bak tanggay nyan.<br />(skr) = bida ngön seunalén jinoë, (akhé) = bida ngön seunalén sigohlomjih. '''b''' = andam bacut, '''b''' = andam bot, → = andam bideuëng, � = reuningkah keudroë",
-'histfirst'           => 'Paléng trép',
-'histlast'            => 'Paléng barô',
+'viewpagelogs'           => 'Eu log ôn nyoë',
+'currentrev'             => 'Geunantoë jinoë',
+'revisionasof'           => 'Gantoë tiëp $1',
+'revision-info'          => 'Geunantoë tiëp $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Geunantoë sigohlomjih',
+'nextrevision'           => 'Geunantoë lheuëh nyan→',
+'currentrevisionlink'    => 'Geunantoë jinoë',
+'cur'                    => 'jin',
+'last'                   => 'akhé',
+'page_first'             => 'phôn',
+'page_last'              => 'keuneulheuëh',
+'histlegend'             => "Piléh duwa teuneugön radiô, lheuëh nyan teugön teuneugön ''peubandéng'' keu peubandéng seunalén. Teugön saboh tanggay keu eu seunalén ôn bak tanggay nyan.<br />(skr) = bida ngön seunalén jinoë, (akhé) = bida ngön seunalén sigohlomjih. '''b''' = andam bacut, '''b''' = andam bot, → = andam bideuëng, � = reuningkah keudroë",
+'history-fieldset-title' => 'Jeulajah riwayat away',
+'histfirst'              => 'Paléng trép',
+'histlast'               => 'Paléng barô',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 bak $2', # user at time
@@ -274,16 +278,16 @@ Nyoë pat nakeuh log seunampôh nibak ôn nyoë:",
 'diff-multi'              => '({{PLURAL:$1|Sa|$1}} geunantoë antara hana geupeuleumah.)',
 
 # Search results
-'noexactmatch' => "'''Hana ôn nyang nanjih ''$1''. ''' Droëneuh   jeuët [[:$1|peugèt ôn nyoë]].",
-'prevn'        => '$1 sigohlomjih',
-'nextn'        => '$1 lheuëh nyan',
-'viewprevnext' => 'Eu ($1)($2)($3)',
-'powersearch'  => 'Mita lanjut',
+'noexactmatch'   => "'''Hana ôn nyang nanjih ''$1''. ''' Droëneuh   jeuët [[:$1|peugèt ôn nyoë]].",
+'prevn'          => '$1 sigohlomjih',
+'nextn'          => '$1 lheuëh nyan',
+'viewprevnext'   => 'Eu ($1)($2)($3)',
+'searchhelp-url' => 'Help:Asoë',
+'powersearch'    => 'Mita lanjut',
 
 # Preferences page
 'preferences'   => 'Geunalak',
 'mypreferences' => 'Geunalak lôn',
-'retypenew'     => 'Pasoë keulayi lageuëm rahsia barô:',
 
 'grouppage-sysop' => '{{ns:project}}:Nyang urôh',
 
@@ -324,10 +328,10 @@ Nyoë pat nakeuh log seunampôh nibak ôn nyoë:",
 'uploadlogpage' => 'Log peutamong',
 'uploadedimage' => 'peutamong "[[$1]]"',
 
-# Special:ImageList
-'imagelist' => 'Dapeuta beureukah',
+# Special:ListFiles
+'listfiles' => 'Dapeuta beureukah',
 
-# Image description page
+# File description page
 'filehist'                  => 'Riwayat beureukah',
 'filehist-help'             => 'Teugon bak tanggay/watèë keu eu beureukah nyoë ‘oh watèë nyan.',
 'filehist-current'          => 'jinoë hat',
@@ -430,46 +434,48 @@ Nyoë pat nakeuh log seunampôh nibak ôn nyoë:",
 'emailuser' => 'Surat-e nyang nguy',
 
 # Watchlist
-'watchlist'            => 'Dapeuta keunalön lôn',
-'mywatchlist'          => 'Keunalön lôn',
-'watchlistfor'         => "(keu '''$1''')",
-'addedwatch'           => 'Ka geupeutamah u dapeuta kalön',
-'addedwatchtext'       => "Ôn \"[[:\$1]]\" ka geupeutamah u [[Special:Watchlist|dapeuta keunalön]] Droëneuh. Neu’ubah-neu’ubah bak masa u keuë bak ôn nyan ngön bak ôn peugah habajih, euntreuk leumah nyoë pat. Ôn nyan euntreuk geupeuleumah ''teubay'' bak [[Special:RecentChanges|dapeuta neu’ubah paléng barô]] mangat leubèh mudah leumah.",
-'removedwatch'         => 'Ka geusampôh nibak dapeuta keunalön',
-'removedwatchtext'     => 'Ôn "<nowiki>$1</nowiki>" ka geusampôh bak dapeuta kalön.',
-'watch'                => 'Kalön',
-'watchthispage'        => 'Kalön ôn nyoë',
-'unwatch'              => 'Bateuë kalön',
-'watchlist-details'    => '{{PLURAL:$1|$1 ôn|$1 ôn}} geukalön, hana kira ôn peugah haba.',
-'wlshowlast'           => 'Peuleumah $1 jeum $2 uroë $3 keuneulheuëh',
-'watchlist-hide-bots'  => 'Peusom andam bot',
-'watchlist-hide-own'   => 'Peusom andam lôn',
-'watchlist-hide-minor' => 'Peusom andam bacut',
+'watchlist'         => 'Dapeuta keunalön lôn',
+'mywatchlist'       => 'Keunalön lôn',
+'watchlistfor'      => "(keu '''$1''')",
+'addedwatch'        => 'Ka geupeutamah u dapeuta kalön',
+'addedwatchtext'    => "Ôn \"[[:\$1]]\" ka geupeutamah u [[Special:Watchlist|dapeuta keunalön]] Droëneuh. Neu’ubah-neu’ubah bak masa u keuë bak ôn nyan ngön bak ôn peugah habajih, euntreuk leumah nyoë pat. Ôn nyan euntreuk geupeuleumah ''teubay'' bak [[Special:RecentChanges|dapeuta neu’ubah paléng barô]] mangat leubèh mudah leumah.",
+'removedwatch'      => 'Ka geusampôh nibak dapeuta keunalön',
+'removedwatchtext'  => 'Ôn "<nowiki>$1</nowiki>" ka geusampôh bak dapeuta kalön.',
+'watch'             => 'Kalön',
+'watchthispage'     => 'Kalön ôn nyoë',
+'unwatch'           => 'Bateuë kalön',
+'watchlist-details' => '{{PLURAL:$1|$1 ôn|$1 ôn}} geukalön, hana kira ôn peugah haba.',
+'wlshowlast'        => 'Peuleumah $1 jeum $2 uroë $3 keuneulheuëh',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Kalön...',
 'unwatching' => 'Hana kalön...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Sampôh ôn',
-'historywarning'              => 'Ingat: Ôn nyang hawa neusampôh na riwayat:',
-'confirmdeletetext'           => 'Droëneuh neuk neusampôh ôn atawa beureukah nyoë keu sabé. Meunan cit ban mandum riwayatjih nibak basis data. Neupeupaseuti meunyo Droëneuh cit keubiët meung neusampôh, neutupeuë ban mandum akébatjih, ngön peuë nyang neupeulaku nyoë nakeuh meunurôt [[{{MediaWiki:Policy-url}}|kebijakan{{SITENAME}}]].',
-'actioncomplete'              => 'Proses seuleusoë',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ka geusampôh. Eu $2 keu log paléng barô bak ôn nyang ka geusampôh.',
-'deletedarticle'              => 'sampôh "[[$1]]"',
-'dellogpage'                  => 'Log seunampoh',
-'deletecomment'               => 'Choë sampôh',
-'deleteotherreason'           => 'Nyang la’én/choë la’én:',
-'deletereasonotherlist'       => 'Choë la’én',
-'rollbacklink'                => 'pulang',
+# Delete
+'deletepage'            => 'Sampôh ôn',
+'historywarning'        => 'Ingat: Ôn nyang hawa neusampôh na riwayat:',
+'confirmdeletetext'     => 'Droëneuh neuk neusampôh ôn atawa beureukah nyoë keu sabé. Meunan cit ban mandum riwayatjih nibak basis data. Neupeupaseuti meunyo Droëneuh cit keubiët meung neusampôh, neutupeuë ban mandum akébatjih, ngön peuë nyang neupeulaku nyoë nakeuh meunurôt [[{{MediaWiki:Policy-url}}|kebijakan{{SITENAME}}]].',
+'actioncomplete'        => 'Proses seuleusoë',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ka geusampôh. Eu $2 keu log paléng barô bak ôn nyang ka geusampôh.',
+'deletedarticle'        => 'sampôh "[[$1]]"',
+'dellogpage'            => 'Log seunampoh',
+'deletecomment'         => 'Choë sampôh',
+'deleteotherreason'     => 'Nyang la’én/choë la’én:',
+'deletereasonotherlist' => 'Choë la’én',
+
+# Rollback
+'rollbacklink' => 'pulang',
+
+# Protect
 'protectlogpage'              => 'Log lindông',
+'prot_1movedto2'              => 'peupinah [[$1]] u [[$2]]',
 'protectcomment'              => 'Bri peunapat:',
 'protectexpiry'               => 'Maté tanggay:',
 'protect_expiry_invalid'      => 'Watèë maté tanggay hana sah.',
 'protect_expiry_old'          => 'Watèë maté tanggay nakeuh bak masa u likôt.',
 'protect-unchain'             => 'Peuhah neulindông peupinah',
-'protect-text'                => 'Droëneuh jeuët neu’eu atawa neugantoë tingkat lindông keu ôn <strong><nowiki>$1</nowiki></strong> nyoë pat.',
-'protect-locked-access'       => 'Nan dapeuta Droëneuh hana hak keu jak gantoë tingkat lindông ôn. Nyoë pat nakeuh konfigurasi atra jinoë keu ôn <strong>$1</strong>:',
+'protect-text'                => "Droëneuh jeuët neu’eu atawa neugantoë tingkat lindông keu ôn '''<nowiki>$1</nowiki>''' nyoë pat.",
+'protect-locked-access'       => "Nan dapeuta Droëneuh hana hak keu jak gantoë tingkat lindông ôn. Nyoë pat nakeuh konfigurasi atra jinoë keu ôn '''$1''':",
 'protect-cascadeon'           => 'Ôn nyoë teungöh geulindông kareuna geupeuseureuta lam {{PLURAL:$1|ôn|ôn-ôn}} nyoë nyang ka geulindông ngön peuniléh lindông meuturôt geupeuudép.
 Droëneuh jeuët neugantoë tingkat lindông keu ôn nyoë, tapi nyan hana peungarôh keu lindông meuturôt.',
 'protect-default'             => '(baku)',
@@ -480,6 +486,7 @@ Droëneuh jeuët neugantoë tingkat lindông keu ôn nyoë, tapi nyan hana peung
 'protect-expiring'            => 'maté tanggay $1 (UTC)',
 'protect-cascade'             => 'Peulindông ban mandum ôn nyang rôh lam ôn nyoë (lindông meuturôt).',
 'protect-cantedit'            => 'Droëneuh h‘an jeuët neu’ubah tingkat lindông ôn nyoë kareuna Droëneuh hana hak keu neupeulaku nyan.',
+'protect-expiry-options'      => '2 jeum:2 hours,1 uroë:1 day,3 uroë:3 days,1 minggu:1 week,2 minggu:2 weeks,1 buleuën:1 month,3 buleuën:3 months,6 buleuën:6 months,1 thôn:1 year,sabé:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Lindông:',
 'restriction-level'           => 'Tingkat:',
 
@@ -620,7 +627,7 @@ Droëneuh cuman jeuët neu’eu nèjih.',
 'show-big-image'       => 'Resolusi peunoh',
 'show-big-image-thumb' => '<small>Rayek atra nyoë: $1 x $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Beureukah barô',
 
 # Bad image list
diff --git a/languages/messages/MessagesAf.php b/languages/messages/MessagesAf.php
index 3bb2874b..c4d2a8c0 100644
--- a/languages/messages/MessagesAf.php
+++ b/languages/messages/MessagesAf.php
@@ -13,31 +13,94 @@
  * @author Spacebirdy
  */
 
-$skinNames = array(
-	'standard' => 'Standaard',
-	'nostalgia' => 'Nostalgie',
-	'cologneblue' => 'Keulen blou',
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Spesiaal',
+	NS_TALK             => 'Bespreking',
+	NS_USER             => 'Gebruiker',
+	NS_USER_TALK        => 'Gebruikerbespreking',
+	NS_PROJECT_TALK     => '$1bespreking',
+	NS_FILE             => 'Lêer',
+	NS_FILE_TALK        => 'Lêerbespreking',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWikibespreking',
+	NS_TEMPLATE         => 'Sjabloon',
+	NS_TEMPLATE_TALK    => 'Sjabloonbespreking',
+	NS_HELP             => 'Hulp',
+	NS_HELP_TALK        => 'Hulpbespreking',
+	NS_CATEGORY         => 'Kategorie',
+	NS_CATEGORY_TALK    => 'Kategoriebespreking',
 );
 
-$namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Spesiaal',
-	NS_MAIN           => '',
-	NS_TALK           => 'Bespreking',
-	NS_USER           => 'Gebruiker',
-	NS_USER_TALK      => 'Gebruikerbespreking',
-	# NS_PROJECT set by $wgMetaNamespace,
-	NS_PROJECT_TALK   => '$1bespreking',
-	NS_IMAGE          => 'Beeld',
-	NS_IMAGE_TALK     => 'Beeldbespreking',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWikibespreking',
-	NS_TEMPLATE       => 'Sjabloon',
-	NS_TEMPLATE_TALK  => 'Sjabloonbespreking',
-	NS_HELP           => 'Hulp',
-	NS_HELP_TALK      => 'Hulpbespreking',
-	NS_CATEGORY       => 'Kategorie',
-	NS_CATEGORY_TALK  => 'Kategoriebespreking'
+$namespaceAliases = array(
+	'Beeld' => NS_FILE,
+	'Beeldbespreking' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Dubbele aansture', 'Dubbeleaansture' ),
+	'BrokenRedirects'           => array( 'Stukkende aansture', 'Stukkendeaansture' ),
+	'Disambiguations'           => array( 'Dubbelsinnig' ),
+	'Userlogin'                 => array( 'Teken in', 'Tekenin' ),
+	'Userlogout'                => array( 'Teken uit', 'Tekenuit' ),
+	'CreateAccount'             => array( 'SkepRekening', 'MaakGebruiker' ),
+	'Preferences'               => array( 'Voorkeure' ),
+	'Watchlist'                 => array( 'Dophoulys' ),
+	'Recentchanges'             => array( 'Onlangse wysigings', 'Onlangsewysigings' ),
+	'Upload'                    => array( 'Laai', 'Oplaai' ),
+	'Listfiles'                 => array( 'Beeldelys', 'Prentelys', 'Lêerslys' ),
+	'Newimages'                 => array( 'Nuwe beelde', 'Nuwebeelde', 'Nuwe lêers', 'Nuwelêers' ),
+	'Listusers'                 => array( 'Gebruikerslys', 'Lysgebruikers' ),
+	'Listgrouprights'           => array( 'LysGroepRegte' ),
+	'Statistics'                => array( 'Statistiek' ),
+	'Randompage'                => array( 'Lukraak', 'Lukrakebladsy' ),
+	'Lonelypages'               => array( 'EensaamBladsye' ),
+	'Uncategorizedpages'        => array( 'OngekategoriseerdeBladsye' ),
+	'Uncategorizedcategories'   => array( 'OngekategoriseerdeKategorieë' ),
+	'Uncategorizedimages'       => array( 'OngekategoriseerdeBeelde' ),
+	'Uncategorizedtemplates'    => array( 'OngekategoriseerdeSjablone' ),
+	'Unusedcategories'          => array( 'OngebruikdeKategorieë' ),
+	'Unusedimages'              => array( 'OngebruikdeBeelde' ),
+	'Wantedpages'               => array( 'GesoekdeBladsye', 'GebreekteSkakels' ),
+	'Wantedcategories'          => array( 'GesoekdeKategorieë' ),
+	'Mostlinked'                => array( 'MeeteGeskakel' ),
+	'Mostlinkedcategories'      => array( 'MeesGeskakeldeKategorieë' ),
+	'Mostlinkedtemplates'       => array( 'MeesGeskakeldeSjablone' ),
+	'Mostcategories'            => array( 'MeesteKategorieë' ),
+	'Mostimages'                => array( 'MeesteBeelde' ),
+	'Mostrevisions'             => array( 'MeesteWysigings' ),
+	'Fewestrevisions'           => array( 'MinsteWysigings' ),
+	'Shortpages'                => array( 'KortBladsye' ),
+	'Longpages'                 => array( 'LangBladsye' ),
+	'Newpages'                  => array( 'Nuwe bladsye', 'Nuwebladsye' ),
+	'Ancientpages'              => array( 'OuBladsye' ),
+	'Deadendpages'              => array( 'DoodloopBladsye' ),
+	'Protectedpages'            => array( 'BeskermdeBladsye' ),
+	'Protectedtitles'           => array( 'BeskermdeTitels' ),
+	'Allpages'                  => array( 'Alle bladsye', 'Allebladsye' ),
+	'Prefixindex'               => array( 'VoorvoegselIndeks' ),
+	'Ipblocklist'               => array( 'IPBlokLys' ),
+	'Specialpages'              => array( 'Spesiale bladsye', 'Spesialebladsye' ),
+	'Contributions'             => array( 'Bydraes', 'Gebruikersbydraes' ),
+	'Emailuser'                 => array( 'Stuur e-pos', 'Stuure-pos', 'Stuur epos', 'Stuurepos' ),
+	'Confirmemail'              => array( 'Bevestig e-posadres', 'Bevestige-posadres', 'Bevestig eposadres', 'Bevestigeposadres' ),
+	'Whatlinkshere'             => array( 'Skakels hierheen', 'Skakelshierheen' ),
+	'Movepage'                  => array( 'Skuif bladsy', 'Skuifbladsy' ),
+	'Blockme'                   => array( 'BlokMy' ),
+	'Booksources'               => array( 'Boekbronne' ),
+	'Categories'                => array( 'Kategorieë' ),
+	'Version'                   => array( 'Weergawe' ),
+	'Allmessages'               => array( 'Stelselboodskappe', 'Alle stelselboodskappe', 'Allestelselboodskappe', 'Boodskappe' ),
+	'Blockip'                   => array( 'BlokIP' ),
+	'MIMEsearch'                => array( 'MIME-soek', 'MIMEsoek', 'MIME soek' ),
+	'Randomredirect'            => array( 'Lukrake aanstuur', 'Lukrakeaanstuur' ),
+	'Mypage'                    => array( 'Mybladsy' ),
+	'Mytalk'                    => array( 'Mybespreking', 'Mybesprekings' ),
+	'Mycontributions'           => array( 'Mybydrae' ),
+	'Search'                    => array( 'Soek' ),
+	'Resetpass'                 => array( 'HerstelWagwoord' ),
+	'Withoutinterwiki'          => array( 'Sonder taalskakels', 'Sondertaalskakels' ),
+	'Filepath'                  => array( 'Lêerpad' ),
 );
 
 # South Africa uses space for thousands and comma for decimal
@@ -84,6 +147,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Versteek my wysigings in dophoulys',
 'tog-watchlisthidebots'       => 'Versteek robotwysigings in dophoulys',
 'tog-watchlisthideminor'      => 'Versteek klein wysigings van my dophoulys',
+'tog-watchlisthideliu'        => 'Versteek wysigings deur aangetekende gebruikers van dophoulys',
+'tog-watchlisthideanons'      => 'Versteek wysigings deur anonieme gebruikers van dophoulys',
 'tog-ccmeonemails'            => "Stuur my 'n kopie van die e-pos wat ek aan ander stuur",
 'tog-diffonly'                => "Moenie 'n bladsy se inhoud onder die wysigingsverskil wys nie",
 'tog-showhiddencats'          => 'Wys versteekte kategorië',
@@ -92,8 +157,6 @@ $messages = array(
 'underline-never'   => 'Nooit',
 'underline-default' => 'Blaaierverstek',
 
-'skinpreview' => '(Voorskou)',
-
 # Dates
 'sunday'        => 'Sondag',
 'monday'        => 'Maandag',
@@ -186,7 +249,7 @@ $messages = array(
 'mytalk'         => 'My besprekings',
 'anontalk'       => 'Besprekingsblad vir hierdie IP',
 'navigation'     => 'Navigasie',
-'and'            => 'en',
+'and'            => '&#32;en',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -249,8 +312,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Inligting oor {{SITENAME}}',
 'aboutpage'            => 'Project:Omtrent',
-'bugreports'           => 'Foutverslae',
-'bugreportspage'       => 'Project:Foutverslae',
 'copyright'            => 'Teks is beskikbaar onderhewig aan $1.',
 'copyrightpagename'    => '{{SITENAME}} kopiereg',
 'copyrightpage'        => '{{ns:project}}:kopiereg',
@@ -273,9 +334,7 @@ $messages = array(
 
 'badaccess'        => 'Toestemmingsfout',
 'badaccess-group0' => 'U is nie toegelaat om die aksie uit te voer wat u aangevra het nie.',
-'badaccess-group1' => 'Die gevraagde aksie is beperk tot gebruikers in die $1 groep.',
-'badaccess-group2' => 'Die aksie wat U aangevra het is beperk tot gebruikers in een van die groepe $1.',
-'badaccess-groups' => 'Die aksie wat U aangevra het is beperk tot gebruikers in een van die groepe $1.',
+'badaccess-groups' => 'Die aksie wat u aangevra het is beperk tot gebruikers in {{PLURAL:$2|die groep|een van die groepe}}: $1.',
 
 'versionrequired'     => 'Weergawe $1 van MediaWiki benodig',
 'versionrequiredtext' => 'Weergawe $1 van MediaWiki word benodig om hierdie bladsy te gebruik. Sien [[Special:Version|version page]].',
@@ -289,6 +348,8 @@ $messages = array(
 'editsection'             => 'wysig',
 'editold'                 => 'wysig',
 'viewsourceold'           => 'bekyk bronteks',
+'editlink'                => 'wysig',
+'viewsourcelink'          => 'wys bronkode',
 'editsectionhint'         => 'Wysig afdeling: $1',
 'toc'                     => 'Inhoud',
 'showtoc'                 => 'wys',
@@ -373,7 +434,6 @@ Indien dit nie die geval is nie, het u moontlik 'n fout in die sagteware ontdek.
 'badtitle'             => 'Ongeldige titel',
 'badtitletext'         => "Die bladsytitel waarvoor gevra is, is ongeldig, leeg, of
 'n verkeerd geskakelde tussen-taal of tussen-wiki titel.",
-'perfdisabled'         => 'Jammer, hierdie funksie is tydelik afgeskakel omdat dit die databasis soveel verstadig dat dit onbruikbaar vir andere raak.',
 'perfcached'           => "Die volgende inligting is 'n gekaste kopie en mag dalk nie volledig op datum wees nie.",
 'perfcachedts'         => 'Die volgende data is gekas. Laaste opdatering: $1',
 'querypage-no-updates' => 'Opdatering van hierdie bladsy is huidiglik afgeskakel. Inligting hier sal nie tans verfris word nie.',
@@ -388,7 +448,7 @@ Probeer asseblief weer oor 'n paar minute.",
 'protectedpagetext'    => 'Hierdie bladsy is beskerm om redigering te verhoed.',
 'viewsourcetext'       => 'U kan die bronteks van hierdie bladsy bekyk en wysig:',
 'protectedinterface'   => 'Hierdie bladsy verskaf teks vir die koppelvlak van die sagteware, en is beskerm om misbruik te voorkom.',
-'editinginterface'     => "'''Waarskuwing:''' U is besig om 'n bladsy te redigeer wat koppelvlakinligting aan die programmatuur voorsien. Wysigings aan hierdie bladsy sal die voorkoms van die gebruikerskoppelvlak vir ander gebruikers beïnvloed. Vir vertalings, oorweeg om eerder [http://translatewiki.net/wiki/Main_Page?setlang=af Betawiki] (die vertalingsprojek vir MediaWiki) te gebruik.",
+'editinginterface'     => "'''Waarskuwing:''' U is besig om 'n bladsy te redigeer wat koppelvlakinligting aan die programmatuur voorsien. Wysigings aan hierdie bladsy sal die voorkoms van die gebruikerskoppelvlak vir ander gebruikers beïnvloed. Vir vertalings, oorweeg om eerder [http://translatewiki.net/wiki/Main_Page?setlang=af translatewiki.net] (die vertalingsprojek vir MediaWiki) te gebruik.",
 'sqlhidden'            => '(SQL navraag versteek)',
 'cascadeprotected'     => 'Hierdie bladsy is beskerm teen redigering omdat dit ingesluit is in die volgende {{PLURAL:$1|bladsy|bladsye}} wat beskerm is met die "kaskade" opsie aangeskakel: $2',
 'namespaceprotected'   => "U het nie toestemming om bladsye in die '''$1'''-naamruimte te wysig nie.",
@@ -398,13 +458,13 @@ Probeer asseblief weer oor 'n paar minute.",
 Die rede gegee is ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Slegte konfigurasie: onbekende virusskandeerder: <i>$1</i>',
+'virus-badscanner'     => "Slegte konfigurasie: onbekende virusskandeerder: ''$1''",
 'virus-scanfailed'     => 'skandering het misluk (kode $1)',
 'virus-unknownscanner' => 'onbekende antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Teken uit',
-'logouttext'                 => "<strong>U is nou uitgeteken</strong>
+'logouttext'                 => "'''U is nou uitgeteken'''
 
 U kan aanhou om {{SITENAME}} anoniem te gebruik; of u kan [[Special:UserLogin|inteken]] as dieselfde of 'n ander gebruiker.",
 'welcomecreation'            => '<h2>Welkom, $1.</h2>
@@ -417,7 +477,6 @@ moenie vergeet om u persoonlike voorkeure te stel nie.',
 'remembermypassword'         => 'Onthou my wagwoord oor sessies.',
 'yourdomainname'             => 'U domein:',
 'externaldberror'            => "'n Databasis fout het voorgekom tydens aanmelding of u het nie toestemming om u eksterne rekening op te dateer nie.",
-'loginproblem'               => '<b>Daar was probleme met jou intekening.</b><br />Probeer weer.',
 'login'                      => 'Teken in',
 'nav-login-createaccount'    => 'Teken in',
 'loginprompt'                => 'U blaaier moet koekies toelaat om by {{SITENAME}} te kan aanteken.',
@@ -481,8 +540,8 @@ moet die instruksies in bogenoemde pos gevolg word om te bevestig dat die adres
 'throttled-mailpassword'     => "Daar is reeds 'n wagwoordwenk in die laaste {{PLURAL:$1|uur|$1 ure}} gestuur.
 Om misbruik te voorkom, word slegs een wagwoordwenk per {{PLURAL:$1|uur|$1 ure}} gestuur.",
 'mailerror'                  => 'Fout tydens e-pos versending: $1',
-'acct_creation_throttle_hit' => 'Jammer. U het reeds $1 rekeninge geskep. U kan nie nog skep nie.',
-'emailauthenticated'         => 'U e-posadres is bevestig op $1.',
+'acct_creation_throttle_hit' => "Jammer, maar u het reeds {{PLURAL:$1|'n rekening|$1 rekeninge}} geskep. U kan nie nog skep nie.",
+'emailauthenticated'         => 'U e-posadres is bevestig op $2 om $3.',
 'emailnotauthenticated'      => 'U e-poasadres is <strong>nog nie bevestig nie</strong>. Geen e-pos sal gestuur word vir die volgende funksies nie.',
 'noemailprefs'               => "Spesifiseer 'n eposadres vir hierdie funksies om te werk.",
 'emailconfirmlink'           => 'Bevestig u e-posadres',
@@ -498,16 +557,20 @@ Indien hierdie rekening foutief geskep is, kan u hierdie boodskap ignoreer.',
 'loginlanguagelabel'         => 'Taal: $1',
 
 # Password reset dialog
-'resetpass'               => 'Herstel rekening wagwoord',
-'resetpass_announce'      => "U het aangeteken met 'n tydelike e-poskode.
+'resetpass'                 => 'Verander wagwoord',
+'resetpass_announce'        => "U het aangeteken met 'n tydelike e-poskode.
 Om voort te gaan moet u 'n nuwe wagwoord hier kies:",
-'resetpass_header'        => 'Herstel wagwoord',
-'resetpass_submit'        => 'Stel wagwoord en teken in',
-'resetpass_success'       => 'U wagwoord is suksesvol gewysig! Besig om u in te teken ...',
-'resetpass_bad_temporary' => "Ongeldige tydelike wagwoord. 
+'resetpass_header'          => 'Verander wagwoord',
+'oldpassword'               => 'Ou wagwoord',
+'newpassword'               => 'Nuwe wagwoord',
+'retypenew'                 => 'Tik nuwe wagwoord weer in',
+'resetpass_submit'          => 'Stel wagwoord en teken in',
+'resetpass_success'         => 'U wagwoord is suksesvol gewysig! Besig om u in te teken ...',
+'resetpass_bad_temporary'   => "Ongeldige tydelike wagwoord. 
 U het u wagwoord al gewysig of 'n nuwe tydelike wagwoord aangevra.",
-'resetpass_forbidden'     => 'Wagwoorde kannie gewysig word nie.',
-'resetpass_missing'       => "U het nie 'n wagwoord verskaf nie.",
+'resetpass_forbidden'       => 'Wagwoorde kannie gewysig word nie.',
+'resetpass-submit-loggedin' => 'Verander wagwoord',
+'resetpass-temp-password'   => 'Tydelike wagwoord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Vet teks',
@@ -532,8 +595,8 @@ U het u wagwoord al gewysig of 'n nuwe tydelike wagwoord aangevra.",
 'hr_tip'          => 'Horisontale streep (selde nodig)',
 
 # Edit pages
-'summary'                          => 'Opsomming',
-'subject'                          => 'Onderwerp/opskrif',
+'summary'                          => 'Opsomming:',
+'subject'                          => 'Onderwerp/opskrif:',
 'minoredit'                        => 'Klein wysiging',
 'watchthis'                        => 'Hou bladsy dop',
 'savearticle'                      => 'Stoor bladsy',
@@ -545,8 +608,8 @@ U het u wagwoord al gewysig of 'n nuwe tydelike wagwoord aangevra.",
 'missingsummary'                   => "'''Onthou:''' Geen opsomming van die wysiging is verskaf nie. As \"Stoor\" weer geklik word, word die wysiging sonder opsomming gestoor.",
 'missingcommenttext'               => 'Tik die opsomming onder.',
 'missingcommentheader'             => "'''Let op:''' U het geen onderwerp/opskrif vir die opmerking verskaf nie. As u weer op \"Stoor\" klik, sal u wysiging sonder die onderwerp/opskrif gestoor word.",
-'summary-preview'                  => 'Opsomming nakijken',
-'subject-preview'                  => 'Onderwerp/ opskrif voorskou',
+'summary-preview'                  => 'Opsomming nakijken:',
+'subject-preview'                  => 'Onderwerp/ opskrif voorskou:',
 'blockedtitle'                     => 'Gebruiker is geblokkeer',
 'blockedtext'                      => "<big>'''U gebruikersnaam of IP-adres is geblokkeer.'''</big>
 
@@ -600,21 +663,21 @@ Indien u per ongeluk hier is, gebruik u blaaier se '''terug'''- knoppie.",
 'noarticletext'                    => 'Daar is tans geen inligting vir hierdie artikel nie. Jy kan [[Special:Search/{{PAGENAME}}|soek vir hierdie bladsytitel]] in ander bladsye of [{{fullurl:{{FULLPAGENAME}}|action=edit}} wysig hierdie bladsy].',
 'userpage-userdoesnotexist'        => 'U is besig om \'n gebruikersblad wat nie bestaan nie te wysig (gebruiker "$1"). Maak asseblief seker of u die bladsy wil skep/ wysig.',
 'clearyourcache'                   => "'''Let wel''': Na die voorkeure gestoor is, moet u blaaier se kasgeheue verfris word om die veranderinge te sien: '''Mozilla:''' klik ''Reload'' (of ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
-'usercssjsyoucanpreview'           => '<strong>Wenk:</strong> Gebruik die "Wys voorskou"-knoppie om u nuwe CSS/JS te toets voor u stoor.',
+'usercssjsyoucanpreview'           => "'''Wenk:''' Gebruik die \"Wys voorskou\"-knoppie om u nuwe CSS/JS te toets voor u stoor.",
 'usercsspreview'                   => "'''Onthou hierdie is slegs 'n voorskou van u persoonlike CSS.'''
 '''Dit is nog nie gestoor nie!'''",
 'userjspreview'                    => "'''Onthou hierdie is slegs 'n toets/voorskou van u gebruiker-JavaScript, dit is nog nie gestoor nie.'''",
 'updated'                          => '(Gewysig)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => "<strong>Onthou dat hierdie slegs 'n voorskou is en nog nie gestoor is nie!</strong>",
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Onthou dat hierdie slegs 'n voorskou is en nog nie gestoor is nie!'''",
 'previewconflict'                  => 'Hierdie voorskou vertoon die teks in die boonste teksarea soos dit sou lyk indien u die bladsy stoor.',
-'session_fail_preview'             => '<strong>Jammer! Weens verlies aan sessie-inligting is die wysiging nie verwerk nie.
-Probeer asseblief weer. As dit steeds nie werk nie, probeer om [[Special:UserLogout|af te teken]] en dan weer aan te teken.</strong>',
-'session_fail_preview_html'        => "<strong>Jammer! U wysigings is nie verwerk nie omdat sessie-data verlore gegaan het.</strong>
+'session_fail_preview'             => "'''Jammer! Weens verlies aan sessie-inligting is die wysiging nie verwerk nie.
+Probeer asseblief weer. As dit steeds nie werk nie, probeer om [[Special:UserLogout|af te teken]] en dan weer aan te teken.'''",
+'session_fail_preview_html'        => "'''Jammer! U wysigings is nie verwerk nie omdat sessie-data verlore gegaan het.'''
 
 ''Omrede rou HTML hier by {{SITENAME}} ingevoer kan word, kan die voorskou nie gesien word nie ter beskerming teen aanvalle met JavaScript.''
 
-<strong>As dit 'n regmatige wysiging is, probeer asseblief weer. As dit daarna nog nie werk nie, [[Special:UserLogout|teken dan af]] en weer aan.</strong>",
+'''As dit 'n regmatige wysiging is, probeer asseblief weer. As dit daarna nog nie werk nie, [[Special:UserLogout|teken dan af]] en weer aan.'''",
 'editing'                          => 'Besig om $1 te wysig',
 'editingsection'                   => 'Besig om $1 (onderafdeling) te wysig',
 'editingcomment'                   => 'Besig om $1 (kommentaar) te wysig',
@@ -626,25 +689,27 @@ U sal u wysigings moet saamsmelt met die huidige teks.
 <strong>Slegs</strong> die teks in die boonste invoerboks sal gestoor word wanneer u "Stoor bladsy" druk.<br />',
 'yourtext'                         => 'U teks',
 'storedversion'                    => 'Gestoorde weergawe',
-'editingold'                       => "<strong>WAARSKUWING: U is besig om 'n ouer weergawe van hierdie bladsy te wysig.
-As u dit stoor, sal enige wysigings sedert hierdie een weer uitgewis word.</strong>",
+'editingold'                       => "'''WAARSKUWING: U is besig om 'n ouer weergawe van hierdie bladsy te wysig.
+As u dit stoor, sal enige wysigings sedert hierdie een weer uitgewis word.'''",
 'yourdiff'                         => 'Wysigings',
-'copyrightwarning'                 => 'Alle bydraes aan {{SITENAME}} word beskou as beskikbaar gestel onder die $2 (lees $1 vir meer inligting).
+'copyrightwarning'                 => "Alle bydraes aan {{SITENAME}} word beskou as beskikbaar gestel onder die $2 (lees $1 vir meer inligting).
 As u nie wil toelaat dat u teks deur ander persone gewysig of versprei word nie, moet dit asseblief nie hier invoer nie.<br />
 Hierdeur beloof u ons dat u die byvoegings self geskryf het, of gekopieer het van publieke domein of soortgelyke vrye bronne.
-<strong>MOENIE WERK WAT DEUR KOPIEREG BESKERM WORD HIER PLAAS SONDER TOESTEMMING NIE!</strong>',
-'copyrightwarning2'                => 'Enige bydraes op {{SITENAME}} mag genadeloos gewysig of selfs verwyder word; indien u dit nie met u bydrae wil toelaat nie, moenie dit hier bylas nie.<br />
-Deur enigiets hier te plaas, beloof u dat u dit self geskryf het, of dat dit gekopieer is vanuit "publieke domein" of soortgelyke vrye bronne (sien $1 vir details).
-<strong>MOENIE WERK WAT DEUR KOPIEREG BESKERM WORD HIER PLAAS SONDER TOESTEMMING NIE!</strong>',
+'''MOENIE WERK WAT DEUR KOPIEREG BESKERM WORD HIER PLAAS SONDER TOESTEMMING NIE!'''",
+'copyrightwarning2'                => "Enige bydraes op {{SITENAME}} mag genadeloos gewysig of selfs verwyder word; indien u dit nie met u bydrae wil toelaat nie, moenie dit hier bylas nie.<br />
+Deur enigiets hier te plaas, beloof u dat u dit self geskryf het, of dat dit gekopieer is vanuit \"publieke domein\" of soortgelyke vrye bronne (sien \$1 vir details).
+'''MOENIE WERK WAT DEUR KOPIEREG BESKERM WORD HIER PLAAS SONDER TOESTEMMING NIE!'''",
 'longpagewarning'                  => 'WAARSKUWING: Hierdie bladsy is $1 kG groot.
 Probeer asseblief die bladsy verkort en die detail na subartikels skuif sodat dit nie 32 kG oorskry nie.',
-'longpageerror'                    => '<strong>FOUT: die teks wat u bygevoeg het is $1 kilogrepe groot, wat groter is as die maximum van $2 kilogrepe.
-Die bladsy kan nie gestoor word nie.</strong>',
-'readonlywarning'                  => "<strong>WAARSKUWING: Die databasis is gesluit vir onderhoud. Dus sal u nie nou u wysigings kan stoor nie. Dalk wil u die teks plak in 'n lêer en stoor vir later. </strong>",
-'protectedpagewarning'             => '<strong>WAARSKUWING: Hierdie blad is beskerm, en slegs administrateurs kan die inhoud verander.</strong>',
+'longpageerror'                    => "'''FOUT: die teks wat u bygevoeg het is $1 kilogrepe groot, wat groter is as die maximum van $2 kilogrepe.
+Die bladsy kan nie gestoor word nie.'''",
+'readonlywarning'                  => "'''WAARSKUWING: Die databasis is gesluit vir onderhoud. Dus sal u nie nou u wysigings kan stoor nie. Dalk wil u die teks plak in 'n lêer en stoor vir later.'''
+
+Een administrateur het die databasis geblokkeer vir hierdie rede: $1",
+'protectedpagewarning'             => "'''WAARSKUWING: Hierdie blad is beskerm, en slegs administrateurs kan die inhoud verander.'''",
 'semiprotectedpagewarning'         => "'''Let wel:''' Hierdie artikel is beskerm sodat slegs ingetekende gebruikers dit kan wysig.",
 'cascadeprotectedwarning'          => "'''Waarskuwing:''' Die bladsy was beveilig sodat dit slegs deur administrateurs gewysig kan word, omrede dit ingesluit is in die volgende {{PLURAL:$1|bladsy|bladsye}} wat kaskade-beskerming geniet:",
-'titleprotectedwarning'            => '<strong>WAARSKUWING:  Die bladsy is gesluit sodat net sekere gebruikers dit kan skep.</strong>',
+'titleprotectedwarning'            => "'''WAARSKUWING:  Die bladsy is gesluit sodat net sekere gebruikers dit kan skep.'''",
 'templatesused'                    => 'Sjablone in gebruik op hierdie blad:',
 'templatesusedpreview'             => 'Sjablone in hierdie voorskou gebruik:',
 'templatesusedsection'             => 'Sjablone gebruik in hierdie afdeling:',
@@ -662,11 +727,20 @@ U kan slegs bestaande bladsye wysig, of u kan [[Special:UserLogin|aanteken of re
 
 U moet besluit of dit wys is om voort te gaan en aan die bladsy te werk. 
 Die verwyderingslogboek vir die blad word hier onder vertoon vir u gerief:",
+'deleted-notice'                   => 'Hierdie bladsy is verwyder.
+Die skraplogboek word hieronder ter inligting weergegee.',
+'deletelog-fulllog'                => 'Wys volledige logboek',
+'edit-gone-missing'                => 'Die bladsy is nie gewysig nie.
+Dit lyk of dit verwyder is.',
+'edit-conflict'                    => 'Wysigingskonflik',
+'edit-no-change'                   => 'U wysiging was geignoreer omdat die teks nie verander is nie.',
+'edit-already-exists'              => 'Die bladsy is nie geskep nie.
+Dit bestaan alreeds.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Waarskuwing: Die bladsy gebruik te veel duur ontlederfunksies.
 
-Daar is $1 funksies, terwyl die bladsy minder as $2 moet hê.',
+Daar is {{PLURAL:$1|$1 funksie|$1 funksies}}, terwyl die bladsy minder as $2 moet hê.',
 'expensive-parserfunction-category'       => 'Bladsye wat te veel duur ontlederfunkies gebruik',
 'post-expand-template-inclusion-category' => 'Bladsye waar die maksimum sjabloon insluit grootte oorskry is',
 'post-expand-template-argument-category'  => 'Bladsye met weggelate sjabloonargumente',
@@ -683,28 +757,28 @@ Daar is $1 funksies, terwyl die bladsy minder as $2 moet hê.',
 Die rede verskaf deur $3 is ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Bekyk logboeke vir hierdie bladsy',
-'nohistory'           => 'Daar is geen wysigingsgeskiedenis vir hierdie bladsy nie.',
-'revnotfound'         => 'Weergawe nie gevind nie',
-'revnotfoundtext'     => 'Die ou weergawe wat jy aangevra het kon nie gevind word nie. Gaan asseblief die URL na wat jy gebruik het.',
-'currentrev'          => 'Huidige wysiging',
-'revisionasof'        => 'Wysiging soos op $1',
-'revision-info'       => 'Weergawe soos op $1 deur $2',
-'previousrevision'    => '� Ouer weergawe',
-'nextrevision'        => 'Nuwer weergawe →',
-'currentrevisionlink' => 'bekyk huidige weergawe',
-'cur'                 => 'huidige',
-'next'                => 'volgende',
-'last'                => 'vorige',
-'page_first'          => 'eerste',
-'page_last'           => 'laaste',
-'histlegend'          => 'Byskrif: (huidige) = verskil van huidige weergawe,
+'viewpagelogs'           => 'Bekyk logboeke vir hierdie bladsy',
+'nohistory'              => 'Daar is geen wysigingsgeskiedenis vir hierdie bladsy nie.',
+'currentrev'             => 'Huidige wysiging',
+'currentrev-asof'        => 'Huidige wysiging per $1',
+'revisionasof'           => 'Wysiging soos op $1',
+'revision-info'          => 'Weergawe soos op $1 deur $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Ouer weergawe',
+'nextrevision'           => 'Nuwer weergawe →',
+'currentrevisionlink'    => 'bekyk huidige weergawe',
+'cur'                    => 'huidige',
+'next'                   => 'volgende',
+'last'                   => 'vorige',
+'page_first'             => 'eerste',
+'page_last'              => 'laaste',
+'histlegend'             => 'Byskrif: (huidige) = verskil van huidige weergawe,
 (vorige) = verskil van vorige weergawe, M = klein wysiging',
-'deletedrev'          => '[geskrap]',
-'histfirst'           => 'Oudste',
-'histlast'            => 'Nuutste',
-'historysize'         => '({{PLURAL:$1|1 greep|$1 grepe}})',
-'historyempty'        => '(leeg)',
+'history-fieldset-title' => 'Blaai deur geskiedenis',
+'deletedrev'             => '[geskrap]',
+'histfirst'              => 'Oudste',
+'histlast'               => 'Nuutste',
+'historysize'            => '({{PLURAL:$1|1 greep|$1 grepe}})',
+'historyempty'           => '(leeg)',
 
 # Revision feed
 'history-feed-title'          => 'Weergawegeskiedenis',
@@ -772,51 +846,114 @@ Die rede verskaf deur $3 is ''$2''",
 'difference'              => '(Verskil tussen weergawes)',
 'lineno'                  => 'Lyn $1:',
 'compareselectedversions' => 'Vergelyk gekose weergawes',
+'visualcomparison'        => 'Visuele vergelyking',
+'wikicodecomparison'      => 'Wikiteks vergelyking',
 'editundo'                => 'maak ongedaan',
 'diff-multi'              => '({{PLURAL:$1|Een tussenin wysiging|$1 tussenin wysigings}} word nie gewys nie.)',
+'diff-movedto'            => 'geskuif na $1',
+'diff-styleadded'         => 'styl $1 toegevoeg',
+'diff-added'              => '$1 bygevoeg',
+'diff-changedto'          => 'verander na $1',
+'diff-movedoutof'         => 'uitgeskuif uit $1',
+'diff-styleremoved'       => 'styl $1 is verwyder',
+'diff-removed'            => '$1 is verwyder',
+'diff-changedfrom'        => 'gewysig van $1',
+'diff-src'                => 'bron',
+'diff-withdestination'    => 'met bestemming $1',
+'diff-with'               => '&#32;met $1 $2',
+'diff-with-final'         => '&#32;en $1 $2',
+'diff-width'              => 'breedte',
+'diff-height'             => 'hoogte',
+'diff-p'                  => "'n '''paragraaf'''",
+'diff-blockquote'         => "'n '''aanhaling'''",
+'diff-h1'                 => "'n '''Opskrif (vlak 1)'''",
+'diff-h2'                 => "'n '''Opskrif (vlak 2)'''",
+'diff-h3'                 => "'n '''Opskrif (vlak 3)'''",
+'diff-h4'                 => "'n '''Opskrif (vlak 4)'''",
+'diff-h5'                 => "'n '''Opskrif (vlak 5)'''",
+'diff-pre'                => "'n '''voorgeformatteerde teksblok'''",
+'diff-div'                => "'n '''afdeling'''",
+'diff-ul'                 => "'n '''ongenommerde lys''''",
+'diff-ol'                 => "'n '''genommerde lys'''",
+'diff-li'                 => "'n '''lys-item'''",
+'diff-table'              => "'n '''tabel'''",
+'diff-tbody'              => "'''tabelinhoud'''",
+'diff-tr'                 => "'n '''ry'''",
+'diff-td'                 => "'n '''sel'''",
+'diff-th'                 => "'n '''kolomopskrif'''",
+'diff-br'                 => "'n '''lynbreek'''",
+'diff-hr'                 => "'n '''horisontale lyn'''",
+'diff-code'               => "'n '''teksblok met programkode'''",
+'diff-dl'                 => "'n '''definisie-lys'''",
+'diff-dt'                 => "'n '''definisie-item'''",
+'diff-dd'                 => "'n '''definisie'''",
+'diff-input'              => "'n '''invoerveld'''",
+'diff-form'               => "'n '''vorm'''",
+'diff-img'                => "'n '''beeld'''",
+'diff-span'               => "'n '''span'''",
+'diff-a'                  => "'n '''skakel'''",
+'diff-i'                  => "'''kursief'''",
+'diff-b'                  => "'''vet'''",
+'diff-strong'             => "'''sterk'''",
+'diff-em'                 => "'''nadruk'''",
+'diff-font'               => "'''lettertipe'''",
+'diff-big'                => "'''groot'''",
+'diff-del'                => "'''verwyderd'''",
+'diff-tt'                 => "'''vaste breedte'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''doodgetrek'''",
 
 # Search results
-'searchresults'             => 'soekresultate',
-'searchresulttext'          => 'Vir meer inligting oor {{SITENAME}} soekresultate, lees [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Vir navraag "[[:$1]]"',
-'searchsubtitleinvalid'     => 'Vir navraag "$1"',
-'noexactmatch'              => "'''Geen bladsy met die titel \"\$1\" bestaan nie.''' Probeer 'n volteksnavraag of [[:\$1|skep die bladsy]].",
-'noexactmatch-nocreate'     => "'''Daar bestaan geen bladsy met titel \"\$1\" nie.'''",
-'toomanymatches'            => "Te veel resultate. Probeer asseblief 'n ander soektog.",
-'titlematches'              => 'Artikeltitel resultate',
-'notitlematches'            => 'Geen artikeltitel resultate nie',
-'textmatches'               => 'Artikelteks resultate',
-'notextmatches'             => 'Geen artikelteks resultate nie',
-'prevn'                     => 'vorige $1',
-'nextn'                     => 'volgende $1',
-'viewprevnext'              => 'Kyk na ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 woord|$2 woorde}})',
-'search-result-score'       => 'Relevansie: $1%',
-'search-redirect'           => '(aanstuur $1)',
-'search-section'            => '(afdeling $1)',
-'search-suggest'            => 'Het u bedoel: $1',
-'search-interwiki-caption'  => 'Suster projekte',
-'search-interwiki-default'  => '$1 resultate:',
-'search-interwiki-more'     => '(meer)',
-'search-mwsuggest-enabled'  => 'met voorstelle',
-'search-mwsuggest-disabled' => 'geen voorstelle',
-'search-relatedarticle'     => 'Verwante',
-'mwsuggest-disable'         => 'Deaktiveer AJAX voorstelle',
-'searchrelated'             => 'verwante',
-'searchall'                 => 'alle',
-'showingresults'            => "Hier volg {{PLURAL:$1|'''1''' resultaat|'''$1''' resultate}} wat met #'''$2''' begin.",
-'showingresultsnum'         => "Hier onder {{PLURAL:$3|is '''1''' resultaat|is '''$3''' resultate}} vanaf #'''$2'''.",
-'showingresultstotal'       => "Hieronder is {{PLURAL:$3|resultaat '''$1''' van '''$3'''|resultate '''$1 - $2''' van '''$3'''}}",
-'nonefound'                 => "<strong>Nota</strong>: onsuksesvolle navrae word gewoonlik veroorsaak deur 'n soektog met algemene
+'searchresults'                  => 'soekresultate',
+'searchresults-title'            => 'Soekresultate vir "$1"',
+'searchresulttext'               => 'Vir meer inligting oor {{SITENAME}} soekresultate, lees [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                 => 'Vir navraag "[[:$1]]"',
+'searchsubtitleinvalid'          => 'Vir navraag "$1"',
+'noexactmatch'                   => "'''Geen bladsy met die titel \"\$1\" bestaan nie.''' Probeer 'n volteksnavraag of [[:\$1|skep die bladsy]].",
+'noexactmatch-nocreate'          => "'''Daar bestaan geen bladsy met titel \"\$1\" nie.'''",
+'toomanymatches'                 => "Te veel resultate. Probeer asseblief 'n ander soektog.",
+'titlematches'                   => 'Artikeltitel resultate',
+'notitlematches'                 => 'Geen artikeltitel resultate nie',
+'textmatches'                    => 'Artikelteks resultate',
+'notextmatches'                  => 'Geen artikelteks resultate nie',
+'prevn'                          => 'vorige $1',
+'nextn'                          => 'volgende $1',
+'viewprevnext'                   => 'Kyk na ($1) ($2) ($3).',
+'searchhelp-url'                 => 'Help:Hulp',
+'searchprofile-images'           => 'Lêers',
+'searchprofile-everything'       => 'Alles',
+'searchprofile-advanced'         => 'Uitgebreid',
+'searchprofile-articles-tooltip' => 'Soek in $1',
+'searchprofile-project-tooltip'  => 'Soek in $1',
+'searchprofile-images-tooltip'   => 'Soek na lêers',
+'search-result-size'             => '$1 ({{PLURAL:$2|1 woord|$2 woorde}})',
+'search-result-score'            => 'Relevansie: $1%',
+'search-redirect'                => '(aanstuur $1)',
+'search-section'                 => '(afdeling $1)',
+'search-suggest'                 => 'Het u bedoel: $1',
+'search-interwiki-caption'       => 'Suster projekte',
+'search-interwiki-default'       => '$1 resultate:',
+'search-interwiki-more'          => '(meer)',
+'search-mwsuggest-enabled'       => 'met voorstelle',
+'search-mwsuggest-disabled'      => 'geen voorstelle',
+'search-relatedarticle'          => 'Verwante',
+'mwsuggest-disable'              => 'Deaktiveer AJAX voorstelle',
+'searchrelated'                  => 'verwante',
+'searchall'                      => 'alle',
+'showingresults'                 => "Hier volg {{PLURAL:$1|'''1''' resultaat|'''$1''' resultate}} wat met #'''$2''' begin.",
+'showingresultsnum'              => "Hier onder {{PLURAL:$3|is '''1''' resultaat|is '''$3''' resultate}} vanaf #'''$2'''.",
+'showingresultstotal'            => "Hier onder is {{PLURAL:$4|resultaat '''$1''' van '''$3'''|resultate '''$1 - $2''' van '''$3'''}}",
+'nonefound'                      => "<strong>Nota</strong>: onsuksesvolle navrae word gewoonlik veroorsaak deur 'n soektog met algemene
 woorde wat nie geindekseer word nie, of spesifisering van meer as een woord (slegs blaaie wat alle navraagwoorde
 bevat, word gewys).",
-'powersearch'               => 'Soek',
-'powersearch-legend'        => 'Gevorderde soektog',
-'powersearch-ns'            => 'Soek in naamruimtes:',
-'powersearch-redir'         => 'Wys aanstuurbladsye',
-'powersearch-field'         => 'Soek vir',
-'search-external'           => 'Eksterne soektog',
-'searchdisabled'            => '{{SITENAME}} se soekfunksie is tans afgeskakel ter wille van werkverrigting. Gebruik gerus intussen Google of Yahoo! Let daarop dat hulle indekse van die {{SITENAME}}-inhoud verouderd mag wees.',
+'powersearch'                    => 'Soek',
+'powersearch-legend'             => 'Gevorderde soektog',
+'powersearch-ns'                 => 'Soek in naamruimtes:',
+'powersearch-redir'              => 'Wys aanstuurbladsye',
+'powersearch-field'              => 'Soek vir',
+'search-external'                => 'Eksterne soektog',
+'searchdisabled'                 => '{{SITENAME}} se soekfunksie is tans afgeskakel ter wille van werkverrigting. Gebruik gerus intussen Google of Yahoo! Let daarop dat hulle indekse van die {{SITENAME}}-inhoud verouderd mag wees.',
 
 # Preferences page
 'preferences'              => 'Voorkeure',
@@ -833,6 +970,7 @@ bevat, word gewys).",
 'qbsettings-floatingright' => 'Dryf regs.',
 'changepassword'           => 'Verander wagwoord',
 'skin'                     => 'Omslag',
+'skin-preview'             => 'Voorskou',
 'math'                     => 'Wiskunde',
 'dateformat'               => 'Datumformaat',
 'datedefault'              => 'Geen voorkeur',
@@ -848,11 +986,9 @@ bevat, word gewys).",
 'prefs-watchlist-days'     => 'Aantal dae om in dophoulys te wys:',
 'prefs-watchlist-edits'    => 'Aantal wysigings om in uitgebreide dophoulys te wys:',
 'prefs-misc'               => 'Allerlei',
+'prefs-resetpass'          => 'Verander wagwoord',
 'saveprefs'                => 'Stoor voorkeure',
 'resetprefs'               => 'Herstel voorkeure',
-'oldpassword'              => 'Ou wagwoord',
-'newpassword'              => 'Nuwe wagwoord',
-'retypenew'                => 'Tik nuwe wagwoord weer in',
 'textboxsize'              => 'Wysiging',
 'rows'                     => 'Rye',
 'columns'                  => 'Kolomme',
@@ -881,7 +1017,7 @@ bevat, word gewys).",
 'userrights-lookup-user'      => 'Beheer gebruikersgroepe',
 'userrights-user-editname'    => 'Voer gebruikersnaam in:',
 'editusergroup'               => 'Wysig gebruikersgroepe',
-'editinguser'                 => "Besig om gebruikersregte van gebruiker '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) te wysig",
+'editinguser'                 => "Besig om gebruikersregte van gebruiker '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) te wysig",
 'userrights-editusergroup'    => 'wysig gebruikersgroepe',
 'saveusergroups'              => 'Stoor gebruikersgroepe',
 'userrights-groupsmember'     => 'Lid van:',
@@ -955,9 +1091,21 @@ bevat, word gewys).",
 'rightslogentry' => 'groep lidmaatskap verander vir $1 van $2 na $3',
 'rightsnone'     => '(geen)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'       => 'lees die bladsy',
+'action-edit'       => 'wysig die bladsy',
+'action-createpage' => 'skep bladsye',
+'action-createtalk' => 'skep besprekingsblaaie',
+'action-move'       => 'skuif die bladsy',
+'action-upload'     => 'laai die lêer op',
+'action-reupload'   => 'oorskryf die bestaande lêer',
+'action-delete'     => 'verwyder die bladsy',
+'action-userrights' => 'Wysig alle gebruikersregte',
+
 # Recent changes
 'nchanges'                       => '$1 {{PLURAL:$1|wysiging|wysigings}}',
 'recentchanges'                  => 'Onlangse wysigings',
+'recentchanges-legend'           => 'Opsies vir onlangse wysigings',
 'recentchangestext'              => 'Volg die mees onlangse wysigings aan die wiki op die bladsy.',
 'recentchanges-feed-description' => 'Spoor die mees onlangse wysigings op die wiki na in die voer.',
 'rcnote'                         => "Hier volg die laaste {{PLURAL:$1|'''$1''' wysiging|'''$1''' wysigings}} vir die afgelope {{PLURAL:$2|dag|'''$2''' dae}}, soos vanaf $4, $5.",
@@ -980,6 +1128,8 @@ bevat, word gewys).",
 'rc_categories'                  => 'Beperk tot kategorië (skei met "|")',
 'rc_categories_any'              => 'Enige',
 'newsectionsummary'              => '/* $1 */ nuwe afdeling',
+'rc-enhanced-expand'             => 'Wys details (benodig JavaScript)',
+'rc-enhanced-hide'               => 'Steek details weg',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Verwante veranderings',
@@ -1005,7 +1155,7 @@ om lêers te laai.',
 [[{{MediaWiki:Copyrightpage}}|beleid oor prentgebruik]].
 
 Om prente wat voorheen gelaai is te sien of te soek, gaan na die
-[[Special:ImageList|lys van gelaaide prente]].
+[[Special:FileList|lys van gelaaide prente]].
 Laai van lêers en skrappings word aangeteken in die
 [[Special:Log/upload|laailog]].
 
@@ -1018,8 +1168,8 @@ Dit mag dalk 'n rukkie neem as u 'n stadige internetverbinding het.
 
 Die voorkeurformate is JPEG vir fotografiese prente, PNG vir tekeninge en ander ikoniese prente, en OGG vir klanklêers.
 Gebruik asseblief beskrywende lêername om verwarring te voorkom.
-Om die prent in 'n artikel te gebruik, gebruik 'n skakel met die formaat '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.jpg]]</nowiki>''' of
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.png|alt text]]</nowiki>''' of
+Om die prent in 'n artikel te gebruik, gebruik 'n skakel met die formaat '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki>''' of
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png|alt text]]</nowiki>''' of
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki>''' vir klanklêers.
 
 Let asseblief op dat, soos met {{SITENAME}} bladsye, mag ander u gelaaide lêers redigeer as hulle dink dit dien die ensiklopedie, en u kan verhoed word om lêers te laai as u die stelsel misbruik.",
@@ -1050,7 +1200,7 @@ Toelaatbare {{PLURAL:\$3|lêertipes|lêertipes}} is \$2.",
 die lêer is $2.',
 'largefileserver'            => 'Hierdie lêer is groter as wat die bediener se opstelling toelaat.',
 'emptyfile'                  => "Die lêer wat u probeer oplaai het blyk leeg te wees. Dit mag wees omdat u 'n tikfout in die lêernaam gemaak het. Gaan asseblief na en probeer weer.",
-'fileexists'                 => "'n Lêer met die naam bestaan reeds, kyk na <strong><tt>$1</tt></strong> as u nie seker is dat u dit wil wysig nie.",
+'fileexists'                 => "'n Lêer met die naam bestaan reeds, kyk na '''<tt>$1</tt>''' as u nie seker is dat u dit wil wysig nie.",
 'fileexists-thumb'           => "<center>'''Bestaande lêer'''</center>",
 'file-exists-duplicate'      => "Die lêer is 'n duplikaat van die volgende {{PLURAL:$1|lêer|lêers}}:",
 'successfulupload'           => 'Laai suksesvol',
@@ -1085,20 +1235,20 @@ Die verwyderingsinligting van die lêer word vir u gemak hier herhaal:",
 'upload_source_url'  => " ('n geldige, publiek toeganklike URL)",
 'upload_source_file' => " ('n lêer op u rekenaar)",
 
-# Special:ImageList
-'imagelist-summary'     => 'Die spesiale bladsy wys al die opgelaaide lêers.
+# Special:ListFiles
+'listfiles-summary'     => 'Die spesiale bladsy wys al die opgelaaide lêers.
 Die nuutste lêer word eerste vertoon.
 Klik op die opskrifte om die tabel anders te sorteer.',
-'imagelist_search_for'  => 'Soek vir medianaam:',
+'listfiles_search_for'  => 'Soek vir medianaam:',
 'imgfile'               => 'lêer',
-'imagelist'             => 'Prentelys',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Naam',
-'imagelist_user'        => 'Gebruiker',
-'imagelist_size'        => 'Grootte',
-'imagelist_description' => 'Beskrywing',
-
-# Image description page
+'listfiles'             => 'Prentelys',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Naam',
+'listfiles_user'        => 'Gebruiker',
+'listfiles_size'        => 'Grootte',
+'listfiles_description' => 'Beskrywing',
+
+# File description page
 'filehist'                       => 'Lêergeskiedenis',
 'filehist-help'                  => 'Klik op die datum/tyd om te sien hoe die lêer destyds gelyk het.',
 'filehist-deleteall'             => 'verwyder alles',
@@ -1106,6 +1256,9 @@ Klik op die opskrifte om die tabel anders te sorteer.',
 'filehist-revert'                => 'rol terug',
 'filehist-current'               => 'huidig',
 'filehist-datetime'              => 'Datum/Tyd',
+'filehist-thumb'                 => 'Duimnaelskets',
+'filehist-thumbtext'             => 'Duimnaelskets vir weergawe vanaf $1',
+'filehist-nothumb'               => 'Geen duimnaelskets',
 'filehist-user'                  => 'Gebruiker',
 'filehist-dimensions'            => 'Dimensies',
 'filehist-filesize'              => 'Lêergrootte',
@@ -1170,29 +1323,30 @@ Klik op die opskrifte om die tabel anders te sorteer.',
 
 # Random page
 'randompage'         => 'Lukrake bladsy',
-'randompage-nopages' => 'Daar is geen bladye in die naamspasie.',
+'randompage-nopages' => 'Daar is geen bladye in naamspasie "$1".',
 
 # Random redirect
 'randomredirect'         => 'Lukrake aanstuur',
-'randomredirect-nopages' => 'Daar is geen aansture in die naamspasie.',
+'randomredirect-nopages' => 'Daar is geen aansture in naamspasie "$1".',
 
 # Statistics
-'statistics'             => 'Statistiek',
-'sitestats'              => 'Werfstatistiek',
-'userstats'              => 'Gebruikerstatistiek',
-'sitestatstext'          => "Daar is {{PLURAL:\$1|'''1''' bladsy|'n totaal van '''\$1''' bladsye}} in die databasis.
-Dit sluit \"bespreek\"-bladsye in, bladsye oor {{SITENAME}}, minimale \"verkorte\"
-bladsye, wegwysbladsye, en ander wat waarskynlik nie as artikels kwalifiseer nie.
-Uitsluitend bogenoemde, is daar {{PLURAL:\$2|'''1''' bladsy|'''\$2''' bladsye}} wat waarskynlik {{PLURAL:\$2|bladsy|bladsye}} met ware inhoud is.
-
-'''\$8''' {{PLURAL:\$8|lêer|lêers}} is gelaai.
-
-{{PLURAL:\$3|Bladsy is al '''1''' keer aangevra|Bladsye is al '''\$3''' kere aangevra}}, en '''\$4''' keer verander sedert hierdie wiki opgezet is.
-Dit werk uit op gemiddeld '''\$5''' veranderings per bladsy, en bladsye word '''\$6''' keer per verandering aangevra.
-
-Die ''[http://www.mediawiki.org/wiki/Manual:Job_queue job queue]''-lengte is '''\$7'''.",
-'userstatstext'          => "Daar is {{PLURAL:$1|'''1''' geregistreerde [[Special:ListUsers|gebruiker]]|'''$1''' geregistreerde [[Special:ListUsers|gebruikers]]}}, waarvan '''$2''' (of '''$4%''') $5 regte het.",
-'statistics-mostpopular' => 'Mees bekykte bladsye',
+'statistics'               => 'Statistiek',
+'statistics-header-pages'  => 'Bladsy statistieke',
+'statistics-header-edits'  => 'Wysig statistieke',
+'statistics-header-views'  => 'Wys statistieke',
+'statistics-header-users'  => 'Gebruikerstatistiek',
+'statistics-articles'      => 'Inhoudelike bladsye',
+'statistics-pages'         => 'Bladsye',
+'statistics-pages-desc'    => 'Alle bladsye in die wiki, insluitend besprekings-, aanstuur- en ander bladsye.',
+'statistics-files'         => 'Ongelaaide lêers',
+'statistics-edits'         => 'Wysigings sedert {{SITENAME}} begin is',
+'statistics-edits-average' => 'Gemiddelde wysigings per bladsy',
+'statistics-views-total'   => 'Totale aantal bladsye vertoon',
+'statistics-views-peredit' => 'Bladsye besigtig per wysiging',
+'statistics-jobqueue'      => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] lengte',
+'statistics-users'         => 'Geregistreerde [[Special:ListUsers|gebruikers]]',
+'statistics-users-active'  => 'Aktiewe grbruikers',
+'statistics-mostpopular'   => 'Mees bekykte bladsye',
 
 'disambiguations'      => 'Bladsye wat onduidelikhede opklaar',
 'disambiguationspage'  => 'Template:Dubbelsinnig',
@@ -1236,7 +1390,8 @@ Elke ry bevat skakels na die eerste en die tweede aanstuur, asook die eerste reÃ
 'popularpages'            => 'Gewilde bladsye',
 'wantedcategories'        => 'Gesoekte kategorieë',
 'wantedpages'             => 'Gesogte bladsye',
-'missingfiles'            => 'Lêers wat nie bestaan nie',
+'wantedfiles'             => 'Gesoekte lêers',
+'wantedtemplates'         => 'Gesoekte sjablone',
 'mostlinked'              => 'Bladsye met meeste skakels daarheen',
 'mostlinkedcategories'    => 'Kategorieë met die meeste skakels daarheen',
 'mostlinkedtemplates'     => 'Sjablone met die meeste skakels daarheen',
@@ -1278,8 +1433,6 @@ Elke ry bevat skakels na die eerste en die tweede aanstuur, asook die eerste reÃ
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Logboeke',
 'all-logs-page'        => 'Alle logboeke',
-'log-search-legend'    => 'Soek vir logboeke',
-'log-search-submit'    => 'Gaan',
 'alllogstext'          => "Vertoon 'n samestelling van laai-, skrap-, beskerm-, versper- en administrateurboekstawings van {{SITENAME}}.
 U kan die resultate vernou deur 'n boekstaaftipe, gebruikersnaam of spesifieke blad te kies.",
 'logempty'             => 'Geen inskrywings in die logboek voldoen aan die kriteria.',
@@ -1291,6 +1444,7 @@ U kan die resultate vernou deur 'n boekstaaftipe, gebruikersnaam of spesifieke b
 'nextpage'          => 'Volgende blad ($1)',
 'prevpage'          => 'Vorige bladsye ($1)',
 'allpagesfrom'      => 'Wys bladsye vanaf:',
+'allpagesto'        => 'Wys bladsye tot:',
 'allarticles'       => 'Alle artikels',
 'allinnamespace'    => 'Alle bladsye (naamruimte $1)',
 'allnotinnamespace' => 'Alle bladsye (nie in naamruimte $1 nie)',
@@ -1307,11 +1461,32 @@ U kan die resultate vernou deur 'n boekstaaftipe, gebruikersnaam of spesifieke b
 'special-categories-sort-count' => 'sorteer volgens getal',
 'special-categories-sort-abc'   => 'sorteer alfabeties',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Geskrapte gebruikersbydraes',
+
+# Special:LinkSearch
+'linksearch'       => 'Soek webskakels',
+'linksearch-pat'   => 'Soekpatroon:',
+'linksearch-ns'    => 'Naamruimte:',
+'linksearch-ok'    => 'Soek',
+'linksearch-text'  => 'Patrone soos "*.wikipedia.org" of "*.org" kan gebruik word.<br />
+Ondersteunde protokolle: <tt>$1</tt>',
+'linksearch-line'  => '$1 geskakel vanaf $2',
+'linksearch-error' => 'Patrone kan slegs aan die begin van die rekenaarnaam geplaas word.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Wys gebruikers, beginnende by:',
 'listusers-submit'   => 'Wys',
 'listusers-noresult' => 'Geen gebruiker gevind.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logboek van nuwe gebruikers',
+'newuserlogpagetext'          => "Dit is 'n logboek van gebruikers wat onlangs ingeteken het.",
+'newuserlog-byemail'          => 'wagwoord is per e-pos versend',
+'newuserlog-create-entry'     => 'Nuwe gebruiker',
+'newuserlog-create2-entry'    => 'rekening geskep vir $1',
+'newuserlog-autocreate-entry' => 'Gebruiker outomaties geskep',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Gebruikersgroepregte',
 'listgrouprights-summary'  => "Hier volg 'n lys van gebruikersgroepe wat op die wiki gedefinieer is met hulle geassosieerde regte. Vir meer inligting oor individuele regte, sien [[{{MediaWiki:Listgrouprights-helppage}}]].",
@@ -1370,12 +1545,7 @@ As u die bladsy later van u dophoulys wil verwyder, kliek "verwyder van dophouly
 'iteminvalidname'      => "Probleem met item '$1', ongeldige naam...",
 'wlnote'               => "Hier volg die laaste {{PLURAL:$1|verandering|'''$1''' veranderings}} binne die laaste {{PLURAL:$2|uur|'''$2''' ure}}.",
 'wlshowlast'           => 'Wys afgelope $1 ure, $2 dae of $3',
-'watchlist-show-bots'  => "Wys 'bot' wysigings",
-'watchlist-hide-bots'  => 'Versteek robotte',
-'watchlist-show-own'   => 'Wys my wysigings',
-'watchlist-hide-own'   => 'Versteek my wysigings',
-'watchlist-show-minor' => 'Wys klein wysigings',
-'watchlist-hide-minor' => 'Versteek klein wysigings',
+'watchlist-options'    => 'Opsies vir dophoulys',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Plaas op dophoulys...',
@@ -1414,57 +1584,63 @@ U kan u dophoulys wysig by:
 Terugvoer en verdere bystand:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Skrap bladsy',
-'confirm'                     => 'Bevestig',
-'excontent'                   => "inhoud was: '$1'",
-'excontentauthor'             => "Inhoud was: '$1' (en '[[Special:Contributions/$2|$2]]' was die enigste bydraer)",
-'exbeforeblank'               => "Inhoud voor uitwissing was: '$1'",
-'exblank'                     => 'bladsy was leeg',
-'delete-confirm'              => 'Skrap "$1"',
-'delete-legend'               => 'Skrap',
-'historywarning'              => "Waarskuwing: Die bladsy het 'n geskiedenis:",
-'confirmdeletetext'           => "U staan op die punt om 'n bladsy of prent asook al hulle geskiedenis uit die databasis te skrap.
+# Delete
+'deletepage'             => 'Skrap bladsy',
+'confirm'                => 'Bevestig',
+'excontent'              => "inhoud was: '$1'",
+'excontentauthor'        => "Inhoud was: '$1' (en '[[Special:Contributions/$2|$2]]' was die enigste bydraer)",
+'exbeforeblank'          => "Inhoud voor uitwissing was: '$1'",
+'exblank'                => 'bladsy was leeg',
+'delete-confirm'         => 'Skrap "$1"',
+'delete-legend'          => 'Skrap',
+'historywarning'         => "Waarskuwing: Die bladsy het 'n geskiedenis:",
+'confirmdeletetext'      => "U staan op die punt om 'n bladsy of prent asook al hulle geskiedenis uit die databasis te skrap.
 Bevestig asseblief dat u dit wil doen, dat u die gevolge verstaan en dat u dit doen in ooreenstemming met die [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Aksie uitgevoer',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" is geskrap.
+'actioncomplete'         => 'Aksie uitgevoer',
+'deletedtext'            => '"<nowiki>$1</nowiki>" is geskrap.
 Kyk na $2 vir \'n rekord van onlangse skrappings.',
-'deletedarticle'              => '"$1" geskrap',
-'dellogpage'                  => 'Skraplogboek',
-'dellogpagetext'              => "Hier onder is 'n lys van die mees onlangse skrappings. Alle tye is bedienertyd (UGT).",
-'deletionlog'                 => 'skrappingslogboek',
-'reverted'                    => 'Het terug gegaan na vroeëre weergawe',
-'deletecomment'               => 'Rede vir skrapping',
-'deleteotherreason'           => 'Ander/ekstra rede:',
-'deletereasonotherlist'       => 'Andere rede',
-'deletereason-dropdown'       => '*Algemene redes vir verwydering
+'deletedarticle'         => '"$1" geskrap',
+'dellogpage'             => 'Skraplogboek',
+'dellogpagetext'         => "Hier onder is 'n lys van die mees onlangse skrappings. Alle tye is bedienertyd (UGT).",
+'deletionlog'            => 'skrappingslogboek',
+'reverted'               => 'Het terug gegaan na vroeëre weergawe',
+'deletecomment'          => 'Rede vir skrapping',
+'deleteotherreason'      => 'Ander/ekstra rede:',
+'deletereasonotherlist'  => 'Andere rede',
+'deletereason-dropdown'  => '*Algemene redes vir verwydering
 ** Op aanvraag van outeur
 ** Skending van kopieregte
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Wysig skrap redes',
-'delete-toobig'               => "Die bladsy het 'n lang wysigingsgeskiedenis, meer as $1 {{PLURAL:$1|weergawe|weergawes}}.
+'delete-edit-reasonlist' => 'Wysig skrap redes',
+'delete-toobig'          => "Die bladsy het 'n lang wysigingsgeskiedenis, meer as $1 {{PLURAL:$1|weergawe|weergawes}}.
 Verwydering van die soort blaaie is beperk om ontwrigting van {{SITENAME}} te voorkom.",
-'rollback'                    => 'Rol veranderinge terug',
-'rollback_short'              => 'Rol terug',
-'rollbacklink'                => 'Rol terug',
-'rollbackfailed'              => 'Terugrol onsuksesvol',
-'cantrollback'                => 'Kan nie na verandering terug keer nie; die laaste bydraer is die enigste outer van hierdie bladsy.',
-'editcomment'                 => 'Die wysigopsomming was: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Wysigings deur [[Special:Contributions/$2|$2]] teruggerol na laaste weergawe deur $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Wysigings deur $1 teruggerol; terugverander na laaste weergawe deur $2.',
+
+# Rollback
+'rollback'         => 'Rol veranderinge terug',
+'rollback_short'   => 'Rol terug',
+'rollbacklink'     => 'Rol terug',
+'rollbackfailed'   => 'Terugrol onsuksesvol',
+'cantrollback'     => 'Kan nie na verandering terug keer nie; die laaste bydraer is die enigste outer van hierdie bladsy.',
+'editcomment'      => "Die wysigopsomming was: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Wysigings deur [[Special:Contributions/$2|$2]] teruggerol na laaste weergawe deur $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Wysigings deur $1 teruggerol; terugverander na laaste weergawe deur $2.',
+
+# Protect
 'protectlogpage'              => 'Beskermlogboek',
 'protectedarticle'            => 'het [[$1]] beskerm',
+'modifiedarticleprotection'   => 'Die beskermingsvlak vir "[[$1]]" is gewysig',
 'unprotectedarticle'          => 'het beskerming van [[$1]] verwyder',
 'protect-title'               => 'Beskerm "$1"',
+'prot_1movedto2'              => '[[$1]] geskuif na [[$2]]',
 'protect-legend'              => 'Bevestig beskerming',
 'protectcomment'              => 'Rede vir beskerming:',
 'protectexpiry'               => 'Verval:',
 'protect_expiry_invalid'      => 'Vervaltyd is ongeldig.',
 'protect_expiry_old'          => 'Vervaltyd is in die verlede.',
 'protect-unchain'             => 'Gee regte om te skuif',
-'protect-text'                => 'U kan die veiligheidsvlak vir blad <strong><nowiki>$1</nowiki></strong> hier bekyk of verander.',
+'protect-text'                => "U kan die veiligheidsvlak vir blad '''<nowiki>$1</nowiki>''' hier bekyk of verander.",
 'protect-locked-access'       => "U rekening het nie regte om 'n bladsy se veiligheidsvlakke te verander nie.
-Hier is die huidige verstellings vir bladsy <strong>$1</strong>:",
+Hier is die huidige verstellings vir bladsy '''$1''':",
 'protect-cascadeon'           => 'Die bladsy word beskerm want dit is ingesluit by die volgende {{PLURAL:$1|blad|blaaie}} wat kaskade-beskerming geniet. U kan die veiligheidsvlak van die bladsy verander, maar dit sal nie die ander kaskade blaaie beïnvloed nie.',
 'protect-default'             => '(normaal)',
 'protect-fallback'            => 'Hiervoor is "$1" regte nodig',
@@ -1474,6 +1650,7 @@ Hier is die huidige verstellings vir bladsy <strong>$1</strong>:",
 'protect-expiring'            => 'verval $1 (UTC)',
 'protect-cascade'             => 'Beveilig bladsye insluitend die bladsy (kaskade effek)',
 'protect-cantedit'            => 'U kan nie die veiligheidsvlak van die blad verander nie, want u het nie regte om dit te wysig nie.',
+'protect-expiry-options'      => '2 ure:2 hours,1 dag:1 day,3 dae:3 days,1 week:1 week,2 weke:2 weeks,1 maand:1 month,3 maande:3 months,6 maande:6 months,1 jaar:1 year,onbeperk:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Regte:',
 'restriction-level'           => 'Beperkingsvlak:',
 'minimum-size'                => 'Minimum grootte',
@@ -1496,14 +1673,14 @@ Hier is die huidige verstellings vir bladsy <strong>$1</strong>:",
 'undeletepage'             => 'Bekyk en herstel geskrapte bladsye',
 'undeletepagetitle'        => "'''Hier onder is die verwyderde bydraes van [[:$1]]'''.",
 'viewdeletedpage'          => 'Bekyk geskrapte bladsye',
-'undeletepagetext'         => 'Die volgende bladsye is geskrap, maar hulle is nog in die argief en kan herstel word. Die argief kan periodiek skoongemaak word.',
+'undeletepagetext'         => 'Die volgende {{PLURAL:$1|bladsy|$1 bladsye}} is geskrap, maar is nog in die argief en kan teruggeplaas word. Die argief van geskrapte blaaie kan periodiek skoongemaak word.',
 'undeleterevisions'        => '$1 {{PLURAL:$1|weergawe|weergawes}} in argief',
 'undeletehistory'          => "As u die bladsy herstel, sal alle weergawes herstel word.
 As 'n nuwe bladsy met dieselfde naam sedert die skrapping geskep is, sal die herstelde weergawes in die nuwe bladsy se voorgeskiedenis verskyn en die huidige weergawe van die lewendige bladsy sal nie outomaties vervang word nie.",
 'undeletehistorynoadmin'   => 'Die bladsy is geskrap.
 Die rede hiervoor word onder in die opsomming aangedui, saam met besonderhede van die gebruikers wat die bladsy gewysig het voordat dit verwyder is.
 Die verwyderde inhoud is slegs vir administrateurs sigbaar.',
-'undelete-revision'        => 'Verwyder weergawe van $1 (vanaf $2) deur $3:',
+'undelete-revision'        => 'Verwyder weergawe van $1 (per $4 om $5) deur $3:',
 'undelete-nodiff'          => 'Geen vorige wysigings gevind.',
 'undeletebtn'              => 'Herstel',
 'undeletelink'             => 'herstel',
@@ -1526,26 +1703,27 @@ Die verwyderde inhoud is slegs vir administrateurs sigbaar.',
 'blanknamespace' => '(Hoof)',
 
 # Contributions
-'contributions' => 'Gebruikersbydraes',
-'mycontris'     => 'My bydraes',
-'contribsub2'   => 'Vir $1 ($2)',
-'nocontribs'    => 'Geen veranderinge wat by hierdie kriteria pas, is gevind nie.',
-'uctop'         => ' (boontoe)',
-'month'         => 'Vanaf maand (en vroeër):',
-'year'          => 'Vanaf jaar (en vroeër):',
-
-'sp-contributions-newbies'     => 'Wys slegs bydraes deur nuwe rekenings',
-'sp-contributions-newbies-sub' => 'Vir nuwe gebruikers',
-'sp-contributions-blocklog'    => 'Blokkeerlogboek',
-'sp-contributions-search'      => 'Soek na bydraes',
-'sp-contributions-username'    => 'IP-adres of gebruikersnaam:',
-'sp-contributions-submit'      => 'Vertoon',
+'contributions'       => 'Gebruikersbydraes',
+'contributions-title' => '$1 se bydraes',
+'mycontris'           => 'My bydraes',
+'contribsub2'         => 'Vir $1 ($2)',
+'nocontribs'          => 'Geen veranderinge wat by hierdie kriteria pas, is gevind nie.',
+'uctop'               => ' (boontoe)',
+'month'               => 'Vanaf maand (en vroeër):',
+'year'                => 'Vanaf jaar (en vroeër):',
+
+'sp-contributions-newbies'       => 'Wys slegs bydraes deur nuwe rekenings',
+'sp-contributions-newbies-sub'   => 'Vir nuwe gebruikers',
+'sp-contributions-newbies-title' => 'Bydraes van nuwe gebruikers',
+'sp-contributions-blocklog'      => 'Blokkeerlogboek',
+'sp-contributions-search'        => 'Soek na bydraes',
+'sp-contributions-username'      => 'IP-adres of gebruikersnaam:',
+'sp-contributions-submit'        => 'Vertoon',
 
 # What links here
 'whatlinkshere'            => 'Skakels hierheen',
 'whatlinkshere-title'      => 'Bladsye wat verwys na "$1"',
 'whatlinkshere-page'       => 'Bladsy:',
-'linklistsub'              => '(Lys van skakels)',
 'linkshere'                => "Die volgende bladsye skakel na '''[[:$1]]''':",
 'nolinkshere'              => "Geen bladsye skakel na '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Geen bladsye skakel na '''[[:$1]]''' in die verkose naamruimte nie.",
@@ -1623,6 +1801,7 @@ Vul 'n spesifieke rede hier onder in (haal byvoorbeeld spesifieke bladsye wat ge
 Sien die [[Special:IPBlockList|IP-bloklys]] vir geblokkeerde adresse.",
 'unblocklogentry'          => 'blokkade van $1 is opgehef:',
 'block-log-flags-anononly' => 'anonieme gebruikers alleenlik',
+'block-log-flags-nocreate' => 'Registrasie van gebruikers buite werking',
 'block-log-flags-noemail'  => 'e-pos versper',
 'ipb_expiry_invalid'       => 'Ongeldige duur.',
 'ipb_already_blocked'      => '"$1" is reeds geblok',
@@ -1669,6 +1848,9 @@ maak asseblief seker dat u die gevolge van hierdie aksie verstaan voordat u voor
 
 Indien wel sal u self die blad moet skuif of versmelt (indien nodig).",
 'movearticle'             => 'Skuif bladsy',
+'movenologin'             => 'Nie ingeteken nie',
+'movenologintext'         => "U moet 'n geregistreerde gebruiker wees en [[Special:UserLogin|ingeteken]]
+wees om 'n bladsy te skuif.",
 'movenotallowed'          => 'U het nie regte om bladsye te skuif nie.',
 'newtitle'                => 'Na nuwe titel',
 'move-watch'              => 'Hou hierdie bladsy dop',
@@ -1701,6 +1883,7 @@ Die teikenartikel "[[:$1]]" bestaan reeds. Wil u dit skrap om plek te maak vir d
 'selfmove'                => 'Bron- en teikentitels is dieselfde; kan nie bladsy oor homself skuif nie.',
 'imageinvalidfilename'    => 'Die nuwe lêernaam is ongeldig',
 'fix-double-redirects'    => 'Opdateer alle aansture wat na die oorspronklike titel wys',
+'move-leave-redirect'     => "Los 'n aanstuur agter",
 
 # Export
 'export'            => 'Eksporteer bladsye',
@@ -1709,7 +1892,7 @@ Die eksportlêer kan daarna geïmporteer word na enige ander MediaWiki webwerf v
 
 Verskaf die name van die bladsye wat geëksporteer moet word in die onderstaande veld, een bladsy per lyn, en kies of u alle weergawes (met geskiedenis) of slegs die nuutste weergawe soek.
 
-In die laatste geval kan u ook \'n verwysing gebruik, byvoorbeeld [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] vir die bladsy "{{MediaWiki:Mainpage}}".',
+In die laatste geval kan u ook \'n verwysing gebruik, byvoorbeeld [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] vir die bladsy "{{MediaWiki:Mainpage}}".',
 'exportcuronly'     => 'Slegs die nuutste weergawes, sonder volledige geskiedenis',
 'export-submit'     => 'Eksporteer',
 'export-addcattext' => 'Voeg bladsye by van kategorie:',
@@ -1737,6 +1920,7 @@ In die laatste geval kan u ook \'n verwysing gebruik, byvoorbeeld [[{{ns:special
 'import'                     => 'Voer bladsye in',
 'import-interwiki-submit'    => 'importeer',
 'import-interwiki-namespace' => 'Plaas bladsye in naamruimte:',
+'import-comment'             => 'Opmerking:',
 'importstart'                => 'Importeer bladsye...',
 'import-revision-count'      => '$1 {{PLURAL:$1|weergawe|weergawes}}',
 'importnopages'              => 'Geen bladsye om te importeer nie.',
@@ -1819,12 +2003,12 @@ In die laatste geval kan u ook \'n verwysing gebruik, byvoorbeeld [[{{ns:special
 'common.css' => '/** Gemeenskaplike CSS vir alle omslae */',
 
 # Attribution
-'anonymous'        => 'Anonieme gebruiker(s) van {{SITENAME}}',
+'anonymous'        => 'Anonieme {{PLURAL:$1|gebruiker|gebruikers}} van {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} gebruiker $1',
 'lastmodifiedatby' => 'Hierdie bladsy is laaste gewysig $2, $1 deur $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Gebaseer op werk van $1.',
 'others'           => 'ander',
-'siteusers'        => '{{SITENAME}} gebruiker(s) $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|gebruikers|gebruikers}} $1',
 
 # Info page
 'infosubtitle'   => 'Inligting vir bladsy',
@@ -1834,6 +2018,11 @@ In die laatste geval kan u ook \'n verwysing gebruik, byvoorbeeld [[{{ns:special
 'numauthors'     => 'Aantal outeurs (bladsy): $1',
 'numtalkauthors' => 'Aantal outeurs (besprekingsblad): $1',
 
+# Skin names
+'skinname-standard'    => 'Standaard',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Keulen blou',
+
 # Math options
 'mw_math_png'    => 'Gebruik altyd PNG.',
 'mw_math_simple' => 'Gebruik HTML indien dit eenvoudig is, andersins PNG.',
@@ -1882,10 +2071,12 @@ $1',
 'show-big-image'       => 'Volle resolusie',
 'show-big-image-thumb' => '<small>Grootte van hierdie voorskou: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Gallery van nuwe beelde',
 'imagelisttext'         => "Hier onder is a lys van '''$1''' {{PLURAL:$1|lêer|lêers}}, $2 gesorteer.",
 'newimages-summary'     => 'Die spesiale bladsy wys die nuutste lêers wat na die wiki opgelaai is.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Lêernaam (of deel daarvan):',
 'showhidebots'          => '($1 robotte)',
 'noimages'              => 'Niks te sien nie.',
 'ilsubmit'              => 'Soek',
@@ -2017,6 +2208,10 @@ Ander velde sal versteek wees.
 'exif-lightsource-19'  => 'Standaard lig C',
 'exif-lightsource-255' => 'Ander ligbron',
 
+# Flash modes
+'exif-flash-fired-0' => 'Flits het nie afgegaan',
+'exif-flash-fired-1' => 'Flits het afgegaan',
+
 'exif-focalplaneresolutionunit-2' => 'duim',
 
 'exif-sensingmethod-1' => 'Ongedefineer',
@@ -2123,21 +2318,9 @@ Hierde bevestigingkode verval om $4.',
 Bevestig asseblief dat u regtig hierdie blad oor wil skep.",
 'recreate'            => 'Herskep',
 
-# HTML dump
-'redirectingto' => 'Stuur aan na [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Verwyder die kas van hierdie blad?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Soek na bladsye wat ''$1'' bevat.",
-'searchnamed'      => "Soek vir bladsye genaamd ''$1''.",
-'articletitles'    => "Artikels wat met ''$1'' begin",
-'hideresults'      => 'Steek resultate weg',
-'useajaxsearch'    => 'Gebruik AJAX-soek',
+'confirm-purge-top'    => 'Verwyder die kas van hierdie blad?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� vorige bladsy',
@@ -2234,7 +2417,7 @@ U kan ook die [[Special:Watchlist/edit|standaard opdaterigskerm gebruik]].",
 'filepath-summary' => 'Die spesiale bladsy wys die volledige pad vir \'n lêer. 
 Beelde word in hulle volle resolusie gewys. Ander lêertipes word direk met hulle MIME-geskakelde programme geopen.
 
-Sleutel die lêernaam in sonder die "{{ns:image}}:" voorvoegsel.',
+Sleutel die lêernaam in sonder die "{{ns:file}}:" voorvoegsel.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Soek duplikaat lêers',
diff --git a/languages/messages/MessagesAln.php b/languages/messages/MessagesAln.php
index d7625d9f..5cbab582 100644
--- a/languages/messages/MessagesAln.php
+++ b/languages/messages/MessagesAln.php
@@ -10,6 +10,11 @@
 
 $fallback = 'sq';
 
+$specialPageAliases = array(
+	'Popularpages'              => array( 'Faqe të famshme' ),
+	'Search'                    => array( 'Kërko' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Nënvizoji lidhjet',
@@ -56,8 +61,6 @@ $messages = array(
 'underline-never'   => 'kurrë',
 'underline-default' => 'sipas shfletuesit',
 
-'skinpreview' => '(Parapamje)',
-
 # Dates
 'sunday'        => 'E diel',
 'monday'        => 'E háne',
@@ -146,7 +149,7 @@ $messages = array(
 'mytalk'         => 'Diskutimet e mia',
 'anontalk'       => 'Diskutimet për këtë IP',
 'navigation'     => 'Shfleto',
-'and'            => 'dhe',
+'and'            => '&#32;dhe',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -207,8 +210,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Rreth {{SITENAME}}',
 'aboutpage'            => 'Project:Rreth',
-'bugreports'           => 'Kontakt',
-'bugreportspage'       => 'Project:Kontakt',
 'copyright'            => 'Përmbajtja asht në disponim nëpërmjet liqencës $1.',
 'copyrightpagename'    => '{{SITENAME}} Të drejta autori',
 'copyrightpage'        => '{{ns:project}}:Të drejta autori',
@@ -231,8 +232,6 @@ $messages = array(
 
 'badaccess'        => 'Gabim leje',
 'badaccess-group0' => 'Nuk jeni lejue me e bá kët veprim.',
-'badaccess-group1' => 'Ky veprim asht i limituem për përdoruesit e grupit $1',
-'badaccess-group2' => 'Veprimi i kërkuem asht i limituem për përdoruesit e grupit $1.',
 'badaccess-groups' => 'Ky veprim asht i limituem për përdoruesit e grupit $1.',
 
 'versionrequired'     => 'Nevojitet versioni $1 i MediaWiki-it',
@@ -321,7 +320,6 @@ Mirëmbajtësi i cili e ka bllokue dha këtë arsye: $1",
 'cannotdelete'         => 'Nuk mujta me gris këtë faqe ose figurë të dhënë. (Munet qi asht e grisur nga dikush tjeter.)',
 'badtitle'             => 'Titull i gabuem',
 'badtitletext'         => 'Titulli i faqes qi kërkuet nuk ishte i saktë, ishte bosh, ose ishte një lidhje gabim me një titull wiki internacional.',
-'perfdisabled'         => "Ju kërkoj të falme! Ky veprim asht bllokue përkohsisht se e ngadalëson regjistrin aq shumë sa s'munet me përdor kërrkush tjetër.",
 'perfcached'           => 'Informacioni i mëposhtëm asht kopje e ruajtme dhe munet mos me kán e freskët:',
 'perfcachedts'         => 'Informacioni i mëposhtëm asht një kopje e rifreskueme me $1.',
 'wrong_wfQuery_params' => 'Parametra gabim te wfQuery()<br />
@@ -390,8 +388,8 @@ Llogaria juej asht hap. Mos harroni me ndryshu parapëlqimet e {{SITENAME}}-s.',
 'hr_tip'          => 'vijë horizontale (përdoreni rallë)',
 
 # Edit pages
-'summary'            => 'Përmbledhje',
-'subject'            => 'Subjekt/Titull',
+'summary'            => 'Përmbledhje:',
+'subject'            => 'Subjekt/Titull:',
 'minoredit'          => 'Ky asht një redaktim i vogël',
 'watchthis'          => 'Mbikqyre kët faqe',
 'showpreview'        => 'Trego parapamjen',
@@ -406,7 +404,7 @@ Llogaria juej asht hap. Mos harroni me ndryshu parapëlqimet e {{SITENAME}}-s.',
 
 # History pages
 'revisionasof'     => 'Versioni i $1',
-'revision-info'    => 'Versioni me $1 nga $2',
+'revision-info'    => 'Versioni me $1 nga $2', # Additionally available: $3: revision id
 'previousrevision' => '� Verzion ma i vjetër',
 'cur'              => 'tash',
 'last'             => 'fund',
@@ -417,16 +415,18 @@ Llogaria juej asht hap. Mos harroni me ndryshu parapëlqimet e {{SITENAME}}-s.',
 'editundo'                => 'ktheje',
 
 # Search results
-'noexactmatch' => 'Faqja me atë titull nuk asht krijue
+'noexactmatch'   => 'Faqja me atë titull nuk asht krijue
 
 Muneni me [[$1|fillu një artikull]] me kët titull.
 
 Ju lutem kërkoni {{SITENAME}}-n para se me krijue një artikull të ri se munet me kánë nën një titull tjetër.',
-'viewprevnext' => 'Shikoni ($1) ($2) ($3).',
-'powersearch'  => 'Kërko',
+'viewprevnext'   => 'Shikoni ($1) ($2) ($3).',
+'searchhelp-url' => 'Help:Ndihmë',
+'powersearch'    => 'Kërko',
 
 # Preferences page
 'mypreferences' => 'Parapëlqimet',
+'skin-preview'  => 'Parapamje',
 
 # Recent changes
 'recentchanges'   => 'Ndryshimet e fundit',
@@ -449,7 +449,7 @@ Ju lutem kërkoni {{SITENAME}}-n para se me krijue një artikull të ri se munet
 # Upload
 'upload' => 'Ngarkoni skeda',
 
-# Image description page
+# File description page
 'filehist'            => 'Historiku i dosjes',
 'filehist-datetime'   => 'Data/Ora',
 'filehist-user'       => 'Përdoruesi',
@@ -488,29 +488,29 @@ Ju lutem kërkoni {{SITENAME}}-n para se me krijue një artikull të ri se munet
 'categories' => 'Kategori',
 
 # Watchlist
-'mywatchlist'          => 'Lista mbikqyrëse',
-'addedwatch'           => 'U shtu te lista mbikqyrëse',
-'removedwatch'         => 'U hjek nga lista mibkqyrëse',
-'removedwatchtext'     => 'Faqja "<nowiki>$1</nowiki>" asht hjek nga lista mbikqyrëse e juej.',
-'watch'                => 'Mbikqyre',
-'unwatch'              => 'Çmbikqyre',
-'watchlist-hide-own'   => 'Mshehi redaktimet e mija',
-'watchlist-hide-minor' => 'Mshehi redaktimet e vogla',
+'mywatchlist'      => 'Lista mbikqyrëse',
+'addedwatch'       => 'U shtu te lista mbikqyrëse',
+'removedwatch'     => 'U hjek nga lista mibkqyrëse',
+'removedwatchtext' => 'Faqja "<nowiki>$1</nowiki>" asht hjek nga lista mbikqyrëse e juej.',
+'watch'            => 'Mbikqyre',
+'unwatch'          => 'Çmbikqyre',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Tuj mbikqyrë...',
 'unwatching' => 'Tuj çmbikqyrë...',
 
-# Delete/protect/revert
-'deletedarticle'              => 'grisi "$1"',
+# Delete
+'deletedarticle' => 'grisi "$1"',
+
+# Protect
 'protect-legend'              => 'Konfirmoni',
 'protectcomment'              => 'Arsyja:',
 'protectexpiry'               => 'Afáti',
 'protect_expiry_invalid'      => 'Data e skadimit asht e pasaktë.',
 'protect_expiry_old'          => 'Data e skadimit asht në kohën kalueme.',
 'protect-unchain'             => 'Ndryshoje lejen e zhvendosjeve',
-'protect-text'                => 'Këtu muneni me shiku dhe me ndryshu nivelin e mbrojtjes për faqen <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Llogaria juej nuk ka privilegjet e nevojitme për me ndryshu nivelin e mbrojtjes. Kufizimet e kësaj faqe janë <strong>$1</strong>:',
+'protect-text'                => "Këtu muneni me shiku dhe me ndryshu nivelin e mbrojtjes për faqen '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Llogaria juej nuk ka privilegjet e nevojitme për me ndryshu nivelin e mbrojtjes. Kufizimet e kësaj faqe janë '''$1''':",
 'protect-default'             => '(parazgjedhje)',
 'protect-level-autoconfirmed' => 'Blloko përdoruesit pa llogari',
 'protect-level-sysop'         => 'Lejo veç administruesit',
@@ -531,7 +531,6 @@ Ju lutem kërkoni {{SITENAME}}-n para se me krijue një artikull të ri se munet
 # What links here
 'whatlinkshere'       => "Lidhjet k'tu",
 'whatlinkshere-title' => 'Faqe qi lidhen me $1',
-'linklistsub'         => '(Listë e lidhjeve)',
 'linkshere'           => "Faqet e mëposhtme lidhen k'tu '''[[:$1]]''':",
 'isredirect'          => 'faqe përcjellëse',
 'istemplate'          => 'përfshirë',
diff --git a/languages/messages/MessagesAm.php b/languages/messages/MessagesAm.php
index 3a3a16f4..256d3232 100644
--- a/languages/messages/MessagesAm.php
+++ b/languages/messages/MessagesAm.php
@@ -5,26 +5,33 @@
  * @file
  *
  * @author Codex Sinaiticus
+ * @author Elfalem
  * @author Teferra
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => '�ይ�',
-	NS_SPECIAL        => '�ዩ',
-	NS_TALK           => '�ይይት',
-	NS_USER           => 'አባ�',
-	NS_USER_TALK      => 'አባ�_�ይይት',
-	NS_PROJECT_TALK   => '$1_�ይይት',
-	NS_IMAGE          => 'ስዕ�',
-	NS_IMAGE_TALK     => 'ስዕ�_�ይይት',
-	NS_MEDIAWIKI      => 'መ�ዕክት',
-	NS_MEDIAWIKI_TALK => 'መ�ዕክት_�ይይት',
-	NS_TEMPLATE       => 'መ�ጠ�ያ',
-	NS_TEMPLATE_TALK  => 'መ�ጠ�ያ_�ይይት',
-	NS_HELP           => 'እርዳታ',
-	NS_HELP_TALK      => 'እርዳታ_�ይይት',
-	NS_CATEGORY       => 'መደብ',
-	NS_CATEGORY_TALK  => 'መደብ_�ይይት',
+	NS_MEDIA            => '�ይ�',
+	NS_SPECIAL          => '�ዩ',
+	NS_TALK             => '�ይይት',
+	NS_USER             => 'አባ�',
+	NS_USER_TALK        => 'አባ�_�ይይት',
+	NS_PROJECT_TALK     => '$1_�ይይት',
+	NS_FILE             => 'ስዕ�',
+	NS_FILE_TALK        => 'ስዕ�_�ይይት',
+	NS_MEDIAWIKI        => 'መ�ዕክት',
+	NS_MEDIAWIKI_TALK   => 'መ�ዕክት_�ይይት',
+	NS_TEMPLATE         => 'መ�ጠ�ያ',
+	NS_TEMPLATE_TALK    => 'መ�ጠ�ያ_�ይይት',
+	NS_HELP             => 'እርዳታ',
+	NS_HELP_TALK        => 'እርዳታ_�ይይት',
+	NS_CATEGORY         => 'መደብ',
+	NS_CATEGORY_TALK    => 'መደብ_�ይይት',
+);
+
+$specialPageAliases = array(
+	'Shortpages'                => array( 'አጫጭር_ገጾች' ),
+	'Longpages'                 => array( 'ረጃጅ�_ገጾች' ),
+	'Newpages'                  => array( 'አዳዲስ_ገጾች' ),
 );
 
 $messages = array(
@@ -65,16 +72,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'የራስዎ ለ�ጦች ከሚከታተሉት ገጾች ይደበ�',
 'tog-watchlisthidebots'       => 'የቦት (መሣርያ) ለ�ጦች ከሚከታተሉት ገጾች ይደበ�',
 'tog-watchlisthideminor'      => 'ጥቃቅን ለ�ጦች ከሚከታተሉት ገጾች ይደበ�',
+'tog-watchlisthideliu'        => 'ያባላት ለ�ጦች ከ�ከታተ� ገጾች �ር�ር ይደበ�',
+'tog-watchlisthideanons'      => 'የ�. አድራሻ ለ�ጦች ከ�ከታተ� ገጾች �ር�ር ይደበ�',
 'tog-ccmeonemails'            => 'ወደ ሌላ ተጠቃሚ የ��ከ� ኢሜ� ቅጂ ለኔ� ይላክ',
 'tog-diffonly'                => 'ከለ�ጦቹ ስር የገጽ ይዞታ አታሳይ',
 'tog-showhiddencats'          => 'የተደበ� መደቦች ይታዩ',
+'tog-norollbackdiff'          => 'ROLLBACK ከማድረ� በኋላ �ዩ�ቱ ማሳየት ይቅር',
 
 'underline-always'  => '�ሌ� ይህን',
 'underline-never'   => '�ሌ� አይ�ን',
 'underline-default' => 'የቃ� ቀዳሚ ባህሪዎች',
 
-'skinpreview' => '(ቅድመ-ዕይታ)',
-
 # Dates
 'sunday'        => 'እሑድ',
 'monday'        => 'ሰኞ',
@@ -168,7 +176,7 @@ $messages = array(
 'mytalk'         => 'የኔ �ይይት',
 'anontalk'       => '�ይይት ለዚ� �. አድራሻ',
 'navigation'     => 'መቃኘት',
-'and'            => 'እና',
+'and'            => '&#32;እና',
 
 # Metadata in edit box
 'metadata_help' => 'ተጨማሪ መረጃ:',
@@ -231,8 +239,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'ስለ {{SITENAME}} መርሃ�ብር',
 'aboutpage'            => 'Project:ስለ',
-'bugreports'           => 'ተ�ሳክ ማመ�ከቻ',
-'bugreportspage'       => 'Project:ተ�ሳክ ማመ�ከቻ',
 'copyright'            => 'ይዘቱ በ$1 ሥር ይገኛ��',
 'copyrightpagename'    => '{{SITENAME}} የቅጂ መብት',
 'copyrightpage'        => '{{ns:project}}:የማብዛት መብት ደንብ',
@@ -255,8 +261,6 @@ $messages = array(
 
 'badaccess'        => 'ያ�ተ�ቀደ - አይቻ��',
 'badaccess-group0' => 'የጠየ�ት አድራጎት እንዲ�ጸ� �ቃድ የለዎ��',
-'badaccess-group1' => 'የጠየ�ት አድራጎት ለ$1 ማዕረ� ላላቸ� አባላት ብቻ ይ�ቀዳ��',
-'badaccess-group2' => 'የጠየ�ት አድራጎት ለ$1 ማዕረጎች ላ�ቸ� አባላት ብቻ ይ�ቀዳ��',
 'badaccess-groups' => 'የጠየ�ት አድራጎት ለ$1 ማዕረጎች ላ�ቸ� አባላት ብቻ ይ�ቀዳ��',
 
 'versionrequired'     => 'የMediaWiki �ርያ $1 ያስ��ጋ��',
@@ -271,6 +275,8 @@ $messages = array(
 'editsection'             => 'አር�',
 'editold'                 => 'አር�',
 'viewsourceold'           => '�ንጩን ለማየት',
+'editlink'                => 'አር�',
+'viewsourcelink'          => '�ንጩን ለማየት',
 'editsectionhint'         => 'ክ�ሉን «$1» ለማስተካከ�',
 'toc'                     => 'ማ�ጫ',
 'showtoc'                 => 'አሳይ',
@@ -295,7 +301,7 @@ $messages = array(
 'nstab-project'   => 'የ�ሮጀክት ገጽ',
 'nstab-image'     => '�ይ�',
 'nstab-mediawiki' => 'መ�ዕክት',
-'nstab-template'  => 'መ�ጠ�ያ',
+'nstab-template'  => 'መለጠ�ያ',
 'nstab-help'      => 'የመመሪያ ገጽ',
 'nstab-category'  => '�ድብ',
 
@@ -322,6 +328,8 @@ $1',
 'readonlytext'         => 'መረጃ-ቤቱ አ�ን ከመቀየር ተቆ���� ይህ ለተራ አጠባበቅ ብቻ መሆኑ አይቀር�� ከዚያ በኋላ እንደ ወትሮ �ኔታ ይኖራ��
 
 የቆለ�ት መጋቢ ይህንን መ�ለጫ አቀረቡ� $1',
+'missingarticle-rev'   => '(እት�#: $1)',
+'missingarticle-diff'  => '(�ዩ�ት# : $1 እና $2)',
 'readonly_lag'         => 'ተከታይ ሰርቨሮች ለቀዳሚ� እስከሚደርሱ ድረስ መረጃ-ቤቱ በቀጥታ ተቆ����',
 'internalerror'        => 'የ�ስጥ ስህተት',
 'internalerror_info'   => 'የ�ስጥ ስህተት� $1',
@@ -337,7 +345,6 @@ $1',
 'cannotdelete'         => 'የተወሰ�� ገጽ ወይ� �ይ� ለማጥ�ት አ�ተቻለ�� (�ና�ባት በሌላ ሰ� እጅ ገና ጠ�ቷ��)',
 'badtitle'             => 'መጥ� አርዕስት',
 'badtitletext'         => 'የ�ለጉት አርዕስት �ክ አ��በረ�� �ና�ባት ለአርዕስት የማይሆን የ�ደ� ��ክት አለበት�',
-'perfdisabled'         => 'ይቅርታ! ማን� ዊኪ�ን ለመጠቀ� እስከማይች� ድረስ መረጃ-ቤቱን ስለሚያዘገይ ይህ ተ�ባር ለ�ዜ� እንደማይሰራ ተደርጓ��',
 'perfcached'           => 'ማስታወቂያ� ይህ መረጃ በየጊዜ የሚታደስ ስለሆ� ዘመናዊ ሳይሆን የቆየ ሊሆን ይችላ��',
 'perfcachedts'         => 'የሚቀጥለ� መረጃ ተቆጥቧ�� መጨረሻ የታደሠ� $1 እ.ኤ.አ. ���',
 'querypage-no-updates' => 'ይህ ገጽ አ�ን የታደሠ አይደለ�� ወደ�ት� መታደሱ ቀርቷ�� በቅርብ �ዜ አይታደስ��',
@@ -351,7 +358,7 @@ $1',
 'protectedpagetext'    => 'ይኸ� ገጽ እንዳይታረ� ተጠብቋ��',
 'viewsourcetext'       => 'የዚህን ገጽ �ንጭ ማየትና መቅዳት ይችላሉ�',
 'protectedinterface'   => 'ይህ ገጽ ለስ�ቱ ገጽታ ጽሑ�ን ያቀርባ��� ስለዚህ እንዳይበላሽ ተጠብቋ��',
-'editinginterface'     => "'''ማስጠንቀቂያ�''' ይህ ገጽ ለድረገጹ መ�ክ ጽሕ�ት ይሰጣ�� በዊኪ �ሉ ላይ መላ�ን የድረገጽ መ�ክ በቀላ� ለማስተርጎ� [http://translatewiki.net/wiki/Main_Page?setlang=am Betawiki] ይጎብኙ�",
+'editinginterface'     => "'''ማስጠንቀቂያ�''' ይህ ገጽ ለድረገጹ መ�ክ ጽሕ�ት ይሰጣ�� በዊኪ �ሉ ላይ መላ�ን የድረገጽ መ�ክ በቀላ� ለማስተርጎ� [http://translatewiki.net/wiki/Main_Page?setlang=am translatewiki.net] ይጎብኙ�",
 'sqlhidden'            => '(የመደበኛ-የመጠይቅ-ቋንቋ (SQL) ጥያቄ ተደበቀ)',
 'cascadeprotected'     => "'''ማስጠንቀቂያ�''' ይህ አርእስት ሊ�ጠር ወይ� ሊቀየር አይቻ��� �ክንያቱ� ወደ {{PLURAL:$1|ተከታተለ� አርዕስት|ተከታተሉት አርእስቶች}} ተጨ�ሯ��
 $2",
@@ -360,11 +367,14 @@ $2",
 'ns-specialprotected'  => '�ዩ ገጾችን ማረ� አይ�ቀድ��',
 'titleprotected'       => "ይህ አርዕስት እንዳይ�ጠር በ[[User:$1|$1]] ተጠብቋ�� የተሰጠ� �ክንያት ''$2'' ���",
 
+# Virus scanner
+'virus-unknownscanner' => 'ያ�ታወቀ antivirus:',
+
 # Login and logout pages
 'logouttitle'                => 'የአባ� መ�ጫ',
-'logouttext'                 => '<strong>አ�ን ወጥተዋ��</strong><br /> አ�ን� በ�ጥር መታወቂያዎ ማዘጋጀት ይቻላ�� ወይ� ደ�ሞ እንደገና በብዕር ስ�ዎ መ�ባት ይችላሉ�
+'logouttext'                 => "'''አ�ን ወጥተዋ��'''<br /> አ�ን� በ�ጥር መታወቂያዎ ማዘጋጀት ይቻላ�� ወይ� ደ�ሞ እንደገና በብዕር ስ�ዎ መ�ባት ይችላሉ�
 ----
-በጥቂት ሴኮንድ �ስጥ ወደሚከተለ� ገጽ በቀጥታ ይመለሳ��',
+በጥቂት ሴኮንድ �ስጥ ወደሚከተለ� ገጽ በቀጥታ ይመለሳ��",
 'welcomecreation'            => '== ሰላ�ታ� $1! ==
 
 የብዕር ስ�ዎ ተ�ጥሯ�� �ርጫዎችዎን ለማስተካከ� ይችላሉ�',
@@ -375,7 +385,6 @@ $2",
 'remembermypassword'         => '(መ�ቢያዎ እንዲታወስ ��ክት እዚህ ያድርጉ)',
 'yourdomainname'             => 'የእርስዎ ከባቢ (domain)�',
 'externaldberror'            => 'ወይ� አ�አዊ የማረጋገጫ መረጃ-ቤት ስኅተት �በረ� ወይ� አ�አዊ አባ��ትዎን ማሳደስ አ�ተ�ቀዱ��',
-'loginproblem'               => '<b>በመ�ባትዎ አንድ ች�ር ኖሯ�� </b><br />እንደገና ይሞክሩ!',
 'login'                      => 'ለመ�ባት',
 'nav-login-createaccount'    => 'መ�ቢያ',
 'loginprompt'                => '(You must have cookies enabled to log in to {{SITENAME}}.)',
@@ -440,17 +449,26 @@ $2",
 'createaccount-text'         => 'አንድ ሰ� ለኢሜ� አድራሻዎ {{SITENAME}} ($4) «$2» የተባለ�ን ብዕር ስ� በመ�ቢያ ቃ� «$3» �ጥሯ�� አ�ን ገብተ� የመ�ቢያ ቃ�ዎን መቀየር ይቫ�ዎታ��
 
 ይህ ብዕር ስ� በስህተት ከተ�ጠረ� ይህን መ�እክት ቸ� ማለት ይችላሉ�',
+'login-throttled'            => 'በዚ� አባ� ስ� በጥቂት �ዜ �ስጥ ከመጠን በላይ ሙከራዎች አድርገዋ�� 
+እባክዎ እንደገና ሳይሞክሩ ለጥቂት ደቂቃ ይቆዩ�',
 'loginlanguagelabel'         => 'ቋ�ቋ� $1',
 
 # Password reset dialog
-'resetpass'               => 'የአባ� መ�ቢያ ቃ� ለመቀየር',
-'resetpass_announce'      => 'በኢ-ሜ� በተላከ ጊዜያዊ ኮድ ገብተዋ�� መ�ባትዎን ለመጨርስ� አዲስ መ�ቢያ ቃ� እዚህ መ�ረጥ አለብዎ�',
-'resetpass_header'        => 'መ�ቢያ ቃ� ለመቀየር',
-'resetpass_submit'        => 'መ�ቢያ ቃ� ለመቀየርና ለመ�ባት',
-'resetpass_success'       => 'የመ�ቢያ ቃ�ዎ መቀየሩ ተከናወ�! አ�ን መ�ባት ይደረ��ዎታ�......',
-'resetpass_bad_temporary' => 'ትክክለኛ ያ�ሆ� ጊዜያዊ መ�ቢያ ቃ�� �ና�ባት ከዚህ በ�ት መ�ቢያ ቃ�ዎን በመከናወን ቀየሩ� ወይ� አዲስ ጊዜያዊ መ�ቢያ ቃ� ጠይቀዋ��',
-'resetpass_forbidden'     => 'በ{{SITENAME}} የመ�ቢያ ቃ� መቀየር አይቻ���',
-'resetpass_missing'       => 'የማመ�ከቻ መረጃ የለ��',
+'resetpass'                 => 'የአባ� መ�ቢያ ቃ� ለመቀየር',
+'resetpass_announce'        => 'በኢ-ሜ� በተላከ ጊዜያዊ ኮድ ገብተዋ�� መ�ባትዎን ለመጨርስ� አዲስ መ�ቢያ ቃ� እዚህ መ�ረጥ አለብዎ�',
+'resetpass_header'          => 'መ�ቢያ ቃ� ለመቀየር',
+'oldpassword'               => 'የአ�ኑ መ�ቢያ ቃ�ዎ',
+'newpassword'               => 'አዲስ መ�ቢያ ቃ�',
+'retypenew'                 => 'አዲስ መ�ቢያ ቃ� ዳ�መኛ',
+'resetpass_submit'          => 'መ�ቢያ ቃ� ለመቀየርና ለመ�ባት',
+'resetpass_success'         => 'የመ�ቢያ ቃ�ዎ መቀየሩ ተከናወ�! አ�ን መ�ባት ይደረ��ዎታ�......',
+'resetpass_bad_temporary'   => 'ትክክለኛ ያ�ሆ� ጊዜያዊ መ�ቢያ ቃ�� �ና�ባት ከዚህ በ�ት መ�ቢያ ቃ�ዎን በመከናወን ቀየሩ� ወይ� አዲስ ጊዜያዊ መ�ቢያ ቃ� ጠይቀዋ��',
+'resetpass_forbidden'       => 'በ{{SITENAME}} የመ�ቢያ ቃ� መቀየር አይቻ���',
+'resetpass-no-info'         => 'ይህንን ገጽ በቀጥታ ለማ�ኘት አስቀድሞ መ�ባት ያስ��ጋ��',
+'resetpass-submit-loggedin' => 'ቃ�ዎ ይቀየር',
+'resetpass-wrong-oldpass'   => 'ጊዜያዊ� ወይ� ያ�ኑኑ መ�ቢያ ቃ� አይስማማ�� 
+�ና�ባት መ�ቢያ ቃ�ዎን መቀይሩ ተከናወ�� ወይ� አዲስ ጊዜያዊ መ�ቢያ ቃ�ን ጠየ��',
+'resetpass-temp-password'   => 'ኅላ� (ጊዜያዊ) መ�ቢያ ቃ��',
 
 # Edit page toolbar
 'bold_sample'     => 'ጨለማ ጽሕ�ት',
@@ -473,8 +491,8 @@ $2",
 'hr_tip'          => "አድማሳዊ መስመር (በ'----') ለመ�ጠር",
 
 # Edit pages
-'summary'                          => 'ማጠቃለያ',
-'subject'                          => 'ጥቅ� ርዕስ',
+'summary'                          => 'ማጠቃለያ:',
+'subject'                          => 'ጥቅ� ርዕስ:',
 'minoredit'                        => 'ይህ ለ�ጥ ጥቃቅን ���',
 'watchthis'                        => 'ይህንን ገጽ ለመከታተ�',
 'savearticle'                      => 'ገጹን አስቀ�ጥ',
@@ -486,7 +504,7 @@ $2",
 'missingsummary'                   => "'''ማስታወሻ�''' ማጠቃለያ ገና አላቀረቡ�� እንደገና «ገጹን ለማቅረብ» ቢጫኑ� ያለ ማጠቃለያ ይላካ��",
 'missingcommenttext'               => 'እባክዎ አስተያየት ከዚህ በታች ያስ�ቡ�',
 'missingcommentheader'             => "'''ማስታወሻ�''' ለዚ� አስተያየት �ን� አርእስት አላቀረቡ�� 'ለማቅረብ' እንደገና ቢጫኑ ለ�ጥዎ ያለ አርዕስት ይሆና��",
-'summary-preview'                  => 'የማጠቃለያ ቅድመ እይታ',
+'summary-preview'                  => 'የማጠቃለያ ቅድመ እይታ:',
 'subject-preview'                  => 'የአርእስት ቅድመ-ዕይታ',
 'blockedtitle'                     => 'አባ� ተከለክ��',
 'blockedtext'                      => "<big>'''የርስዎ ብዕር ስ� ወይ� �ጥር አድራሻ ከማዘጋጀት ተከለክ���'''</big>
@@ -531,15 +549,15 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'anontalkpagetext'                 => "----''ይኸ� ገጽ ገና ያ�ገባ ወይ� ብዕር ስ� የሌለ� ተጠቃሚ �ይይት ገጽ ��� መታወቂያ� በ[[�ጥር አድራሻ]] እንዲሆን ያስ��ጋ�� አንዳንዴ �ን አንድ የ�ጥር አድራሻ በ�ለት ወይ� በብዙ ተጠቃሚዎች የጋራ ሊሆን ይችላ�� ስለዚህ ለርስዎ የማይገባ �ይይት እንዳይደርስ�ዎ� [[Special:UserLogin|«መ�ቢያ»]] በመጫን የብዕር ስ� ለማ�ጣት ይችላሉ�''",
 'noarticletext'                    => 'በአ�ኑ ወቅት በዚህ ገጽ ላይ �ን� ጽሑ� የለ�� በሌላ ገጾች [[Special:Search/{{PAGENAME}}|የዚህን ገጽ አርዕስት መ�ለ�]] ወይ� [{{fullurl:{{FULLPAGENAME}}|action=edit}} አዲስ ገ� ማዘጋጀት ይችላሉ].',
 'userpage-userdoesnotexist'        => 'የብዕር ስ� «$1» አ�ተመዘገበ�� እባክዎ ይህን ገጽ ለመ�ጠር/ ለማስተካከ� የ�ለጉ እንደ ሆ� ያረጋ�ጡ�',
-'usercssjsyoucanpreview'           => "<strong>�ክር�</strong> ሳይቆጠብ አዲስ CSS/JSዎን ለመሞከር 'ቅድመ እይታ' የሚለ�ን ይጫኑ�",
+'usercssjsyoucanpreview'           => "'''�ክር�''' ሳይቆጠብ አዲስ CSS/JSዎን ለመሞከር 'ቅድመ እይታ' የሚለ�ን ይጫኑ�",
 'usercsspreview'                   => "'''ማስታወሻ� CSS-ዎን ለሙከራ ብቻ እያዩ ��� ገና አ�ተቆጠበ�!'''",
 'userjspreview'                    => "'''ማስታወሻ� JavaScriptዎን ለሙከራ ብቻ እያዩ ��� ገና አ�ተቆጠበ�!'''",
 'userinvalidcssjstitle'            => "'''ማስጠንቀቂያ�''' «$1» የሚባ� መ�ክ የለ�� �ዩ .css እና .js ገጾች በትንንሽ እን�ሊ�ኛ �ደ� መጀመር እንዳለባቸ� ያስታ�ሱ� ለ�ሳሌ�  {{ns:user}}:Foo/monobook.css �ክ �� እንጂ {{ns:user}}:Foo/Monobook.css አይደለ��",
 'updated'                          => '(የታደሰ)',
-'note'                             => '<strong>ማሳሰቢያ�</strong>',
-'previewnote'                      => 'ማስታወቂያ� <strong><big>ይህ ለሙከራ� ብቻ �� የሚታየ� -- �ን� ለ�ጦች ገና አ�ተላኩ�!</big></strong>',
+'note'                             => "'''ማሳሰቢያ�'''",
+'previewnote'                      => "ማስታወቂያ� '''<big>ይህ ለሙከራ� ብቻ �� የሚታየ� -- �ን� ለ�ጦች ገና አ�ተላኩ�!</big>'''",
 'previewconflict'                  => 'ለማስቀ�ጥ የመረጡ እንደ ሆ� እንደሚታይ� ይህ ቅድመ-ዕይታ በላይኛ ጽሕ�ት ማዘጋጀት ክ�� ያለ�ን ጽሕ�ት ያንጸባርቃ��',
-'session_fail_preview'             => '<strong>ይቅርታ! ገጹን ለማቅረብ ስንሂድ� አንድ ትንሽ ች�ር በመረቡ መረጃ �ስጥ ድንገት ገብቶበታ�� እባክዎ� እንደገና ገጹን ለማቅረብ አንዴ ይሞክሩ� ከዚያ ገና ካ�ሠራ� �ና�ባት ከአባ� ስ�ዎ መ�ጣትና እንደገና መ�ባት ይሞክሩ�</strong>',
+'session_fail_preview'             => "'''ይቅርታ! ገጹን ለማቅረብ ስንሂድ� አንድ ትንሽ ች�ር በመረቡ መረጃ �ስጥ ድንገት ገብቶበታ�� እባክዎ� እንደገና ገጹን ለማቅረብ አንዴ ይሞክሩ� ከዚያ ገና ካ�ሠራ� �ና�ባት ከአባ� ስ�ዎ መ�ጣትና እንደገና መ�ባት ይሞክሩ�'''",
 'editing'                          => '«$1» ማዘጋጀት / ማስተካከ�',
 'editingsection'                   => '«$1» (ክ��) ማዘጋጀት / ማስተካከ�',
 'editingcomment'                   => '$1 ማዘጋጀት (�ይይት መጨመር)',
@@ -547,23 +565,23 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'explainconflict'                  => "ይህን ገጽ ለማዘጋጀት ከጀመሩ በኋላ የሌላ ሰ� ለ�ጥ ገብቷ�� ላይኛ� ጽሕ�ት የአ�ኑ እት� ያሳያ�� የርስዎ� እት� ከዚያ በታች ይገኛ�� ለ�ጦችዎን በአ�ኑ ጽሕ�ት �ስጥ ማዋ�ድ ይኖርብዎታ�� ገጹን� ባቀረቡበት �ዜ በላይኛ� ክ�� ያለ� ጽሕ�ት '''ብቻ''' ይቀርባ��",
 'yourtext'                         => 'የእርስዎ እት�',
 'storedversion'                    => 'የተቆጠበ� እት�',
-'editingold'                       => '<strong>ማስጠንቀቂያ�
+'editingold'                       => "'''ማስጠንቀቂያ�
 ይህ እት� የአ�ኑ አይደለ�� ከዚህ �ናቴ ታድሷ��
-ይህንን እንዳቀረቡ ከዚህ እት� በኋላ የተቀየረ� ለ�ጥ �ሉ ያ����</strong>',
+ይህንን እንዳቀረቡ ከዚህ እት� በኋላ የተቀየረ� ለ�ጥ �ሉ ያ����'''",
 'yourdiff'                         => '�ዩ�ቶች',
 'copyrightwarning'                 => "*<big> '''መጣጥ�ችን ለመ�ጠርና ለማሻሻ� አይ�ሩ''!''''' — </big>ሥራዎ ትክክለኛ ካ�ሆ�� በሌሎቹ አዘጋጆች ሊታረ� ይችላ��",
-'copyrightwarning2'                => 'ወደ {{SITENAME}} የሚላከ� አስተዋጽኦ �ሉ በሌሎች ተጠቃሚዎች ሊታረ�� ሊለወጥ� ወይ� ሊጠ� እንደሚቻ� ያስታ�ሱ� ጽሕ�ትዎ እንዲታረ� ካ�ወደዱ� ወደዚህ አይ�ኩት�<br />
+'copyrightwarning2'                => "ወደ {{SITENAME}} የሚላከ� አስተዋጽኦ �ሉ በሌሎች ተጠቃሚዎች ሊታረ�� ሊለወጥ� ወይ� ሊጠ� እንደሚቻ� ያስታ�ሱ� ጽሕ�ትዎ እንዲታረ� ካ�ወደዱ� ወደዚህ አይ�ኩት�<br />
 ደ�ሞ ይህ የራስዎ ጽሕ�ት ወይ� ከ�ጻ �ንጭ የተቀዳ ጽሕ�ት መ�ኑን ያረጋ�ጣሉ� (ለ�ር�ር $1 ይዩ)�
-<strong>አለ�ቃድ� መብቱ የተጠበቀ�ን ሥራ አይ�ኩት!</strong>',
-'longpagewarning'                  => '<strong>ማስጠንቀቂያ� የዚ� ገጽ መጠን እስከ $1 kilobyte ድረስ ደርሷ�� አንድ ጽሑ� ከ32 kilobyte የበለጠ ሲሆን ይህ �ዙ��ት ለአንዳንድ ተጠቃሚ ዌብ-ብራ�ዘር ያስቸ�ራ�� እባክዎን� ገጹን ወደ ተለያዩ ገጾች ማከ���ን ያስቡበት� </strong>',
-'longpageerror'                    => '<strong>ስህተት� ያቀረቡት ጽሕ�ት $1 kb ��� ይህ� ከተ�ቀደ� ወሰን $2 kb በላይ ��� ሊቆጠብ አይች���</strong>',
-'readonlywarning'                  => ':<strong>ማስታወቂያ�</strong> {{SITENAME}} አ�ን ለአጭር �ዜ ተቆ�� ገጹን ለማቅረብ አይቻ��� ጥቂት ደቂቃ ቆይተ� እባክዎ እንደገና ይሞክሩት!
-:(The database has been temporarily locked for maintenance, so you cannot save your edits at this time. You may wish to cut-&-paste the text into another file, and try again in a moment or two.)',
-'protectedpagewarning'             => '<strong>ማስጠንቀቂያ� ይህ ገጽ ከመጋቢ በስተቀር በማን� እንዳይለወጥ ተቆ����</strong>',
+'''አለ�ቃድ� መብቱ የተጠበቀ�ን ሥራ አይ�ኩት!'''",
+'longpagewarning'                  => "'''ማስጠንቀቂያ� የዚ� ገጽ መጠን እስከ $1 kilobyte ድረስ ደርሷ�� አንድ ጽሑ� ከ32 kilobyte የበለጠ ሲሆን ይህ �ዙ��ት ለአንዳንድ ተጠቃሚ ዌብ-ብራ�ዘር ያስቸ�ራ�� እባክዎን� ገጹን ወደ ተለያዩ ገጾች ማከ���ን ያስቡበት� '''",
+'longpageerror'                    => "'''ስህተት� ያቀረቡት ጽሕ�ት $1 kb ��� ይህ� ከተ�ቀደ� ወሰን $2 kb በላይ ��� ሊቆጠብ አይች���'''",
+'readonlywarning'                  => ":'''ማስታወቂያ�''' {{SITENAME}} አ�ን ለአጭር �ዜ ተቆ�� ገጹን ለማቅረብ አይቻ��� ጥቂት ደቂቃ ቆይተ� እባክዎ እንደገና ይሞክሩት!
+:(The database has been temporarily locked for maintenance, so you cannot save your edits at this time. You may wish to cut-&-paste the text into another file, and try again in a moment or two.)",
+'protectedpagewarning'             => "'''ማስጠንቀቂያ� ይህ ገጽ ከመጋቢ በስተቀር በማን� እንዳይለወጥ ተቆ����'''",
 'semiprotectedpagewarning'         => "'''ማስታወቂያ�''' ይኸ� ገጽ ከቋሚ አዛጋጆች በተቀር በማን� እንዳይለወጥ ተቆ����",
 'cascadeprotectedwarning'          => "'''ማስጠንቀቂያ�''' ይህ ገጽ በመጋቢ ብቻ እንዲታረ� ተቆ���� �ክንያቱ� {{PLURAL:$1|በሚከተለ� በ�ስጡ የሚያቆ�� ገጽ|በሚከተሉ በ�ስጡ ይሚያቆ�� ገጾች}} �ስጥ ይገኛ��",
-'titleprotectedwarning'            => '<strong>ማስጠንቀቂያ� ይህ ገጽ አንዳንድ ተጠቃሚ ብቻ ሊ�ጠር እንዲች� ተቆ����</strong>',
-'templatesused'                    => 'በዚ� ገጽ ላይ የሚገኙት መ�ጠ�ያዎች እ�ዚህ ናቸ��',
+'titleprotectedwarning'            => "'''ማስጠንቀቂያ� ይህ ገጽ አንዳንድ ተጠቃሚ ብቻ ሊ�ጠር እንዲች� ተቆ����'''",
+'templatesused'                    => 'በዚ� ገጽ ላይ የሚገኙት መለጠ�ያዎች እ�ዚህ ናቸ��',
 'templatesusedpreview'             => 'በዚ� ቅድመ-እይታ የሚገኙት መ�ጠ�ያዎች እ�ዚህ ናቸ��',
 'templatesusedsection'             => 'በዚ� ክ�� የተጠቀሙት መ�ጠ�ያዎች�',
 'template-protected'               => '(የተቆለ�)',
@@ -580,6 +598,16 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 *እባክዎ� ገጹ እንደገና እንዲ�ጠር የሚገባ መሆኑን ያረጋ�ጡ�
 
 *የገጹ መጥ�ት �ር�ር ከዚህ ታች ይታያ��",
+'deleted-notice'                   => 'ይኸ� ገጽ ከዚህ በ�ት የጠ� ���
+የገጹ መጥ�ት �ር�ር ከዚህ ታች ይታያ��',
+'deletelog-fulllog'                => 'ሙሉ መ�ገብ ለማየት',
+'edit-hook-aborted'                => 'ለ�ጡ በሜንጦ ተቋረጠ�  
+�ን� �ክንያት አ�ሰጠ��',
+'edit-gone-missing'                => 'ገጹን ማሳደስ አ�ተቻለ��  እንደ ጠ� ይመስላ��',
+'edit-conflict'                    => 'ተቃራኒ ለ�ጥ�',
+'edit-no-change'                   => 'በጽሕ�ቱ አንዳች� አ�ተለወጠ�ና ለ�ጥዎ ቸ� ተብ���',
+'edit-already-exists'              => 'አዲስ ገጽ ለመ�ጠር አ�ተቻለ�� 
+ገና ይኖራ�ና�',
 
 # "Undo" feature
 'undo-success' => "ያ ለ�ጥ በቀጥታ ሊገለበጥ ይቻላ�� እባክዎ ከታች ያለ�ን ማ�ጻጸርያ ተመ�ክተ� ይህ እንደሚ��ጉ ያረጋ�ጡና ለ�ጡ እንዲገለበጥ '''ገጹን ለማቅረብ''' ይጫኑ�",
@@ -594,27 +622,27 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 በ$3 የተሰጠ� �ክንያት ''$2'' ���",
 
 # History pages
-'viewpagelogs'        => 'መ�ገቦች ለዚ� ገጽ',
-'nohistory'           => 'ለዚ� ገጽ የዕትሞች ታሪክ የለ��',
-'revnotfound'         => 'እት� አ�ተገኘ�',
-'revnotfoundtext'     => 'ለዚህ ገጽ የጠየ�ት የቆየ� ዕት� ሊገ� አ�ቻለ�� እባክዎ ይህን ገጽ ለማ�ኘት የተጠቀመ� URL ይመ�ከቱ�',
-'currentrev'          => 'የአ�ኑ እት�',
-'revisionasof'        => 'እት� በ$1',
-'revision-info'       => 'የ$1 ዕት� (ከ$2 ተዘጋጅቶ)',
-'previousrevision'    => '� የ�ተኛ� እት�',
-'nextrevision'        => 'የሚከተለ� እት� →',
-'currentrevisionlink' => '«የአ�ኑን እት� ለመመ�ከት»',
-'cur'                 => 'ከአ�ን',
-'next'                => 'ቀጥሎ',
-'last'                => 'ካለ��',
-'page_first'          => '�ተኞች',
-'page_last'           => 'ኋለኞች',
-'histlegend'          => "ከ2 እትሞች መካከ� �ዩ�ቶቹን ለመናበብ� በ2 ክብ �ገሮች �ስጥ ��ክት አድርገ� «የተመረጡትን እትሞች ለማ���ር» የሚለ�ን ተጭ�� የዛኔ በቀጥታ ይሄዳሉ�<br /> መ�ለጫ� (ከአ�ን) - ከአ�ኑ እት� ያለ� �ዩ�ት� (ካለ��) - ቀጥሎ ከቀደመ� እት� ያለ� �ዩ�ት�<br /> «'''ጥ'''» ማለት ጥቃቅን ለ�ጥ ���",
-'deletedrev'          => '[የተደለዘ]',
-'histfirst'           => 'ቀድመኞች',
-'histlast'            => 'ኋለኞች',
-'historysize'         => '($1 byte)',
-'historyempty'        => '(ባዶ)',
+'viewpagelogs'           => 'መ�ገቦች ለዚ� ገጽ',
+'nohistory'              => 'ለዚ� ገጽ የዕትሞች ታሪክ የለ��',
+'currentrev'             => 'የአ�ኑ እት�',
+'currentrev-asof'        => 'በ$1 የታተመ� ያ�ኑኑ እት�',
+'revisionasof'           => 'እት� በ$1',
+'revision-info'          => 'የ$1 ዕት� (ከ$2 ተዘጋጅቶ)', # Additionally available: $3: revision id
+'previousrevision'       => '� የ�ተኛ� እት�',
+'nextrevision'           => 'የሚከተለ� እት� →',
+'currentrevisionlink'    => '«የአ�ኑን እት� ለመመ�ከት»',
+'cur'                    => 'ከአ�ን',
+'next'                   => 'ቀጥሎ',
+'last'                   => 'ካለ��',
+'page_first'             => '�ተኞች',
+'page_last'              => 'ኋለኞች',
+'histlegend'             => "ከ2 እትሞች መካከ� �ዩ�ቶቹን ለመናበብ� በ2 ክብ �ገሮች �ስጥ ��ክት አድርገ� «የተመረጡትን እትሞች ለማ���ር» የሚለ�ን ተጭ�� የዛኔ በቀጥታ ይሄዳሉ�<br /> መ�ለጫ� (ከአ�ን) - ከአ�ኑ እት� ያለ� �ዩ�ት� (ካለ��) - ቀጥሎ ከቀደመ� እት� ያለ� �ዩ�ት�<br /> «'''ጥ'''» ማለት ጥቃቅን ለ�ጥ ���",
+'history-fieldset-title' => 'የቀደሙት ዕትሞች �ለጋ',
+'deletedrev'             => '[የተደለዘ]',
+'histfirst'              => 'ቀድመኞች',
+'histlast'               => 'ኋለኞች',
+'historysize'            => '($1 byte)',
+'historyempty'           => '(ባዶ)',
 
 # Revision feed
 'history-feed-title'          => 'የዕትሞች ታሪክ',
@@ -635,10 +663,20 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'revdelete-hide-name'     => 'ድርጊትና �ቡ ይደበቅ',
 'revdelete-hide-comment'  => 'ማጠቃለያ ይደበቅ',
 'revdelete-hide-user'     => 'የአዘጋ� ብዕር ስ� ወይ� �. አድርሻ ይደበቅ',
+'revdelete-suppress'      => 'መረጃ ከመጋቢዎችና ከሌሎች ይደበቅ�',
 'revdelete-hide-image'    => 'የ�ይሉ ይዞታ ይደበቅ',
 'revdelete-log'           => 'የመ�ገቡ ማጠቃለያ�',
+'revdelete-submit'        => 'በተመረጠ� ዕት� ይደረ�',
+'pagehist'                => 'የገጽ ታሪክ',
 'revdelete-content'       => 'ይዞታ',
+'revdelete-summary'       => 'ማጠቃለያ',
+'revdelete-uname'         => 'ያባ� ስ�',
 'revdelete-hid'           => '$1 ደበቀ',
+'revdelete-unhid'         => '$1 ገለጸ',
+'revdelete-log-message'   => '$1 ለ$2 {{PLURAL:$2|እት�|እትሞች}}',
+
+# Suppression log
+'suppressionlog' => 'የመከ�ከ� መ�ገብ',
 
 # History merging
 'mergehistory'                     => 'የገጽ ታሪኮች ለመዋ�ድ',
@@ -657,6 +695,7 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'mergehistory-invalid-destination' => 'መድረሻ� ገጽ ትክክለኛ አርእስት መሆን አለበት�',
 'mergehistory-autocomment'         => '[[:$1]] ወደ [[:$2]] አዋ�ደ',
 'mergehistory-comment'             => '[[:$1]] ወደ [[:$2]] አዋ�ደ: $3',
+'mergehistory-same-destination'    => 'መ�ሻና መድረሻ ገጾች አንድላይ ሊሆኑ አይቻ��',
 
 # Merge log
 'mergelog'           => 'የመዋ�ድ መ�ገብ',
@@ -669,112 +708,165 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'difference'              => '(በ2ቱ እትሞቹ ዘንድ ያለ� �ዩ�ት)',
 'lineno'                  => 'መስመር� $1�',
 'compareselectedversions' => 'የተመረጡትን እትሞች ለማ���ር',
+'wikicodecomparison'      => 'Wikitext ማ���ሪያ',
 'editundo'                => 'ለ�ጡ ይገለበጥ',
 'diff-multi'              => '(ከ�ዚህ 2 እትሞች መካከ� {{PLURAL:$1|አንድ ለ�ጥ �በር|$1 ለ�ጦች �በሩ}}�)',
+'diff-movedto'            => 'ወደ $1 ተዛወረ',
+'diff-added'              => '$1 ጨመረ',
+'diff-changedto'          => 'ወደ $1 ተቀየረ',
+'diff-movedoutof'         => 'ከ$1 ተዛወረ',
+'diff-removed'            => '$1 አ�ሣ',
+'diff-changedfrom'        => 'ከ$1 ተቀየረ',
+'diff-with'               => '&#32;ከ� $1 $2',
+'diff-with-final'         => '&#32;እና $1 $2',
+'diff-width'              => 'ስ�ት',
+'diff-height'             => '�መት',
+'diff-blockquote'         => "'''ጥቅስ'''",
+'diff-table'              => "'''ሰንጠረዥ'''",
+'diff-tr'                 => "'''ተርታ'''",
+'diff-hr'                 => "'''አድማሳዊ መስመር'''",
+'diff-dd'                 => "'''ትርጒ�'''",
+'diff-a'                  => "'''መያያዣ'''",
+'diff-b'                  => "'''ጨለማ ጽሕ�ት'''",
+'diff-big'                => "'''ት�ቅ'''",
+'diff-del'                => "'''ጠ�'''",
 
 # Search results
-'searchresults'            => 'የ�ለጋ �ጤቶች',
-'searchresulttext'         => 'በተጨማሪ ስለ �ለጋዎች ለመረዳት� [[{{MediaWiki:Helppage}}]] ያንብቡ�',
-'searchsubtitle'           => "'''�ለጋ ለ[[:$1]]�'''",
-'searchsubtitleinvalid'    => "ለ'''$1''' �ለጉ",
-'noexactmatch'             => "በ«$1» አርዕስት የሚሰየ� መጣጥ� '''አ�ተገኘ�'''� እርሶ �ን [[:$1|ሊ�ጥሩት ይችላሉ]]... �",
-'noexactmatch-nocreate'    => "'''«$1» የሚባ� ገጽ የለ��'''",
-'toomanymatches'           => 'ከመጠን በላይ ያሉ ስ���ቶች ተመለሱ� እባክዎ ሌላ ጥያቄ ይሞክሩ�',
-'titlematches'             => 'የሚስማሙ አርዕስቶች',
-'notitlematches'           => 'የሚስማሙ አርዕስቶች የሉ�',
-'textmatches'              => 'ጽሕ�ት የሚስማማባቸ� ገጾች',
-'notextmatches'            => 'ጽሕ�ት የሚስማማባቸ� ገጾች የሉ�',
-'prevn'                    => '�ተኛ $1',
-'nextn'                    => 'ቀጥሎ $1',
-'viewprevnext'             => 'በ�ጥር ለማየት� ($1) ($2) ($3).',
-'search-result-size'       => '$1 ({{PLURAL:$2|1 ቃ�|$2 ቃላት}})',
-'search-result-score'      => 'ተገቢ�ት� $1%',
-'search-redirect'          => '(መ�ሪያ መንገድ $1)',
-'search-section'           => '(ክ�� $1)',
-'search-suggest'           => '�ና�ባት $1 የ�ለጉት ይሆን',
-'search-interwiki-default' => '$1 �ጤቶች�',
-'search-interwiki-more'    => '(ተጨማሪ)',
-'searchall'                => '�ሉ',
-'showingresults'           => 'ከ �.#<b>$2</b> ጀ�ሮ እስከ <b>$1</b> �ጤቶች ድረስ ከዚህ በታች ይታያሉ�',
-'showingresultsnum'        => "ከ#'''$2''' ጀ�ሮ {{PLURAL:$3|'''1''' �ጤት|'''$3''' �ጤቶች}} ከዚህ ታች ማየት ይቻላ��",
-'powersearch'              => '�ለጋ',
-'powersearch-legend'       => 'ተጨማሪ �ለጋ',
-'powersearch-ns'           => 'በ�ዚ� ክ�ለ-ዊኪዎች ይ���:',
-'powersearch-redir'        => 'መ�ሪያ መንገዶቹ� ይዘር�ሩ',
-'powersearch-field'        => 'ለዚ� ጽሕ�ት ይ����',
-'searchdisabled'           => '{{SITENAME}} �ለጋ አ�ን እንዳይሠራ ተደርጓ�� ለጊዜ� �ን በGoogle ላይ መ��� ይችላሉ� የ{{SITENAME}} ይዞታ ማ�ጫ በዚያ እንዳ�ታደሰ ማቻሉ ያስታ�ሱ�',
+'searchresults'                    => 'የ�ለጋ �ጤቶች',
+'searchresults-title'              => 'ለ"$1" የ�ለጋ �ጤቶች',
+'searchresulttext'                 => 'በተጨማሪ ስለ �ለጋዎች ለመረዳት� [[{{MediaWiki:Helppage}}]] ያንብቡ�',
+'searchsubtitle'                   => "'''�ለጋ ለ[[:$1]]�'''",
+'searchsubtitleinvalid'            => "ለ'''$1''' �ለጉ",
+'noexactmatch'                     => "በ«$1» አርዕስት የሚሰየ� መጣጥ� '''አ�ተገኘ�'''� እርሶ �ን [[:$1|ሊ�ጥሩት ይችላሉ]]... �",
+'noexactmatch-nocreate'            => "'''«$1» የሚባ� ገጽ የለ��'''",
+'toomanymatches'                   => 'ከመጠን በላይ ያሉ ስ���ቶች ተመለሱ� እባክዎ ሌላ ጥያቄ ይሞክሩ�',
+'titlematches'                     => 'የሚስማሙ አርዕስቶች',
+'notitlematches'                   => 'የሚስማሙ አርዕስቶች የሉ�',
+'textmatches'                      => 'ጽሕ�ት የሚስማማባቸ� ገጾች',
+'notextmatches'                    => 'ጽሕ�ት የሚስማማባቸ� ገጾች የሉ�',
+'prevn'                            => '�ተኛ $1',
+'nextn'                            => 'ቀጥሎ $1',
+'viewprevnext'                     => 'በ�ጥር ለማየት� ($1) ($2) ($3).',
+'searchmenu-legend'                => 'የ�ለጋ �ርጫዎች',
+'searchmenu-exists'                => "'''\"[[:\$1]]\" የሚባ� መጣጥ� በዚ� ዊኪ ላይ አለ�'''",
+'searchmenu-new'                   => "'''\"[[:\$1]]\" የሚባ� መጣጥ� ይ�ጠር?'''",
+'searchhelp-url'                   => 'Help:ይዞታ',
+'searchprofile-articles'           => 'ይዞታ ያላቸ� መጣጥ�ች',
+'searchprofile-articles-and-proj'  => 'የይዞታና የመርሃገብሩ ገጾች',
+'searchprofile-project'            => 'የመርሃ�ብሩ ገጾች',
+'searchprofile-images'             => '�ይሎች',
+'searchprofile-everything'         => '�ሉ�',
+'searchprofile-articles-tooltip'   => 'በ$1 ለመ�ለ�',
+'searchprofile-project-tooltip'    => 'በ$1 ለመ�ለ�',
+'searchprofile-images-tooltip'     => 'ለ�ይሎች ለመ�ለ�',
+'searchprofile-everything-tooltip' => 'ይዞታ�ን �ሉ (ከ��ይይት ገጾች) ለመ�ለ�',
+'searchprofile-advanced-tooltip'   => 'በ�ዩ ክ�ለ-ዊኪዎች ለመ�ለ�',
+'prefs-search-nscustom'            => '�ዩ ክ�ለዊኪዎች ለመ�ለ��',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 ቃ�|$2 ቃላት}})',
+'search-result-score'              => 'ተገቢ�ት� $1%',
+'search-redirect'                  => '(መ�ሪያ መንገድ $1)',
+'search-section'                   => '(ክ�� $1)',
+'search-suggest'                   => '�ና�ባት $1 የ�ለጉት ይሆን',
+'search-interwiki-default'         => '$1 �ጤቶች�',
+'search-interwiki-more'            => '(ተጨማሪ)',
+'search-relatedarticle'            => 'የተዛመደ',
+'searchrelated'                    => 'የተዛመደ',
+'searchall'                        => '�ሉ',
+'showingresults'                   => 'ከ �.#<b>$2</b> ጀ�ሮ እስከ <b>$1</b> �ጤቶች ድረስ ከዚህ በታች ይታያሉ�',
+'showingresultsnum'                => "ከ#'''$2''' ጀ�ሮ {{PLURAL:$3|'''1''' �ጤት|'''$3''' �ጤቶች}} ከዚህ ታች ማየት ይቻላ��",
+'showingresultstotal'              => "ከዚህ ታች {{PLURAL:$4|�ጤት '''$1''' (ከ '''$3''') ይታያ��|�ጤቶች '''$1 - $2''' ከ '''$3''' ይታያሉ�}}",
+'search-nonefound'                 => 'ለጥያቄ� �ን� የሚስማማ �ጤት አ�ተገኘ��',
+'powersearch'                      => '�ለጋ',
+'powersearch-legend'               => 'ተጨማሪ �ለጋ',
+'powersearch-ns'                   => 'በ�ዚ� ክ�ለ-ዊኪዎች ይ���:',
+'powersearch-redir'                => 'መ�ሪያ መንገዶቹ� ይዘር�ሩ',
+'powersearch-field'                => 'ለዚ� ጽሕ�ት ይ����',
+'search-external'                  => 'አ�አዊ �ለጋ',
+'searchdisabled'                   => '{{SITENAME}} �ለጋ አ�ን እንዳይሠራ ተደርጓ�� ለጊዜ� �ን በGoogle ላይ መ��� ይችላሉ� የ{{SITENAME}} ይዞታ ማ�ጫ በዚያ እንዳ�ታደሰ ማቻሉ ያስታ�ሱ�',
 
 # Preferences page
-'preferences'              => '�ርጫዎች�',
-'mypreferences'            => '�ርጫዎች�',
-'prefs-edits'              => 'የለ�ጦች �ጥር:',
-'prefsnologin'             => 'ገና አ�ገቡ�',
-'prefsnologintext'         => '�ርጫዎችዎን ለማስተካከ� አስቀድሞ [[Special:UserLogin|መ�ባት]] ያስ���ዎታ��',
-'prefsreset'               => '�ርጫዎች ከመቆጠቢያ ታድሰዋ��',
-'qbsettings-none'          => 'የለ�',
-'qbsettings-fixedleft'     => 'በ�ራ የተለጠ�',
-'qbsettings-fixedright'    => 'በቀ� የተለጠ�',
-'qbsettings-floatingleft'  => 'በ�ራ ተንሳ��',
-'qbsettings-floatingright' => 'በቀ� ተንሳ��',
-'changepassword'           => 'መ�ቢያ ቃ�ዎን ለመቀየር',
-'skin'                     => 'የድህረ-ገጽ መ�ክ',
-'math'                     => 'የሂሳብ መ�ክ',
-'dateformat'               => 'ያ�ሮ� አቆጣጠር ዘመን ሥርዓት',
-'datedefault'              => '�ድ የለ��',
-'datetime'                 => 'ዘመንና ሰዓት',
-'math_failure'             => 'ዘርዛሪ� ተሳ��',
-'math_unknown_error'       => 'የማይታወቅ ስኅተት',
-'math_unknown_function'    => 'የማይታወቅ ተ�ባር',
-'math_lexing_error'        => 'የlexing ስህተት',
-'math_syntax_error'        => 'የሰዋሰ� ስህተት',
-'math_bad_output'          => 'ወደ math �ጤት ዶሴ መጻ� ወይ� መ�ጠር አይቻ��',
-'prefs-personal'           => 'ያባ� ዶሴ',
-'prefs-rc'                 => 'የቅርቡ ለ�ጦች �ር�ር',
-'prefs-watchlist'          => 'የሚከታተሉ ገጾች',
-'prefs-watchlist-days'     => 'በሚከታተሉት ገጾች �ር�ር ስንት ቀን ይታይ�',
-'prefs-watchlist-edits'    => 'በተደረ�ት �ር�ር ስንት ለ�ጥ ይታይ�',
-'prefs-misc'               => '�ዩ �ዩ �ርጫዎች',
-'saveprefs'                => 'ይቆጠብ',
-'resetprefs'               => 'እንደ በ�ቱ ይታደስ',
-'oldpassword'              => 'የአ�ኑ መ�ቢያ ቃ�ዎ',
-'newpassword'              => 'አዲስ መ�ቢያ ቃ�',
-'retypenew'                => 'አዲስ መ�ቢያ ቃ� ዳ�መኛ',
-'textboxsize'              => 'የማዘጋጀት �ርጫዎች',
-'rows'                     => 'በማዘጋጀቱ ሰንጠረዥ ስንት ተርታዎች?',
-'columns'                  => 'ስንት ዓ�ዶችስ?',
-'searchresultshead'        => '�ለጋ',
-'resultsperpage'           => 'ስንት �ጤቶች በየገጹ?',
-'contextlines'             => 'ስንት መስመሮች በየ�ጤቱ?',
-'contextchars'             => 'ስንት �ደላት በየመስመሩ?',
-'recentchangesdays'        => 'በቅርቡ ለ�ጦች �ር�ር ስንት ቀን ይታይ?',
-'recentchangescount'       => 'በ�ር�ርዎ ላይ ስንት ለ�ጥ ይታይ? (እስከ 500)',
-'savedprefs'               => '�ርጫዎችህ ተቆጥበዋ��',
-'timezonelegend'           => 'የሰዓት ክ��',
-'timezonetext'             => '¹ከ Server time (UTC) ያለ� �ዩ�ት (በሰዓቶች �ጥር) (እንደ ኢትዮጵያ ጊዜ ለማድረ� እንደገና ስድስት ሰዓት ይጨ�ሩ�)',
-'localtime'                => 'የክ�ሉ ሰዓት (Local time)',
-'timezoneoffset'           => 'ኦ� ሰት¹',
-'servertime'               => 'የሰርቨሩ ሰዓት',
-'guesstimezone'            => 'ከኮ���ተርዎ መ�ገብ �ዩ�ቱ ይገ�',
-'allowemail'               => 'ኢሜ� ከሌሎች ተጠቃሚዎች ለመ�ቀድ',
-'prefs-namespaces'         => 'ክ�ለ-ዊኪዎች',
-'defaultns'                => 'በመጀመርያ� �ለጋዎ በ�ዚህ ክ�ለ-ዊኪዎች ብቻ ይደረ�:',
-'default'                  => 'ቀዳሚ',
-'files'                    => 'የስዕሎች መጠን',
+'preferences'               => '�ርጫዎች�',
+'mypreferences'             => '�ርጫዎች�',
+'prefs-edits'               => 'የለ�ጦች �ጥር:',
+'prefsnologin'              => 'ገና አ�ገቡ�',
+'prefsnologintext'          => '�ርጫዎችዎን ለማስተካከ� አስቀድሞ <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} መ�ባት]</span>  ያስ���ዎታ��',
+'prefsreset'                => '�ርጫዎች ከመቆጠቢያ ታድሰዋ��',
+'qbsettings-none'           => 'የለ�',
+'qbsettings-fixedleft'      => 'በ�ራ የተለጠ�',
+'qbsettings-fixedright'     => 'በቀ� የተለጠ�',
+'qbsettings-floatingleft'   => 'በ�ራ ተንሳ��',
+'qbsettings-floatingright'  => 'በቀ� ተንሳ��',
+'changepassword'            => 'መ�ቢያ ቃ�ዎን ለመቀየር',
+'skin'                      => 'የድህረ-ገጽ መ�ክ',
+'skin-preview'              => 'ቅድመ-ዕይታ',
+'math'                      => 'የሂሳብ መ�ክ',
+'dateformat'                => 'ያ�ሮ� አቆጣጠር ዘመን ሥርዓት',
+'datedefault'               => '�ድ የለ��',
+'datetime'                  => 'ዘመንና ሰዓት',
+'math_failure'              => 'ዘርዛሪ� ተሳ��',
+'math_unknown_error'        => 'የማይታወቅ ስኅተት',
+'math_unknown_function'     => 'የማይታወቅ ተ�ባር',
+'math_lexing_error'         => 'የlexing ስህተት',
+'math_syntax_error'         => 'የሰዋሰ� ስህተት',
+'math_bad_output'           => 'ወደ math �ጤት ዶሴ መጻ� ወይ� መ�ጠር አይቻ��',
+'prefs-personal'            => 'ያባ� ዶሴ',
+'prefs-rc'                  => 'የቅርቡ ለ�ጦች �ር�ር',
+'prefs-watchlist'           => 'የሚከታተሉ ገጾች',
+'prefs-watchlist-days'      => 'በሚከታተሉት ገጾች �ር�ር ስንት ቀን ይታይ�',
+'prefs-watchlist-days-max'  => '(ከ7 ቀን አይበ�ጥ�)',
+'prefs-watchlist-edits'     => 'በተደረ�ት �ር�ር ስንት ለ�ጥ ይታይ�',
+'prefs-watchlist-edits-max' => '(ከ1,000 ለ�ጥ በላይ አይሆን�)',
+'prefs-misc'                => '�ዩ �ዩ �ርጫዎች',
+'prefs-resetpass'           => 'መ�ቢያ ቃ� ለመቀየር',
+'saveprefs'                 => 'ይቆጠብ',
+'resetprefs'                => 'እንደ በ�ቱ ይታደስ',
+'textboxsize'               => 'የማዘጋጀት �ርጫዎች',
+'prefs-edit-boxsize'        => 'ይህ የማዘጋጀት ሳጥን ስ�ት ለመወሰን ���',
+'rows'                      => 'በማዘጋጀቱ ሰንጠረዥ ስንት ተርታዎች?',
+'columns'                   => 'ስንት ዓ�ዶችስ?',
+'searchresultshead'         => '�ለጋ',
+'resultsperpage'            => 'ስንት �ጤቶች በየገጹ?',
+'contextlines'              => 'ስንት መስመሮች በየ�ጤቱ?',
+'contextchars'              => 'ስንት �ደላት በየመስመሩ?',
+'recentchangesdays'         => 'በቅርቡ ለ�ጦች �ር�ር ስንት ቀን ይታይ?',
+'recentchangesdays-max'     => '(እስከ $1 {{PLURAL:$1|ቀን|ቀን}} ድረስ)',
+'recentchangescount'        => 'በ�ር�ርዎ ላይ ስንት ለ�ጥ ይታይ? (እስከ 500)',
+'savedprefs'                => '�ርጫዎችህ ተቆጥበዋ��',
+'timezonelegend'            => 'የሰዓት ክ��',
+'timezonetext'              => '¹ከ Server time (UTC) ያለ� �ዩ�ት (በሰዓቶች �ጥር) (እንደ ኢትዮጵያ ጊዜ ለማድረ� እንደገና ስድስት ሰዓት ይጨ�ሩ�)',
+'localtime'                 => 'የክ�ሉ ሰዓት (Local time)',
+'timezoneselect'            => 'የሰዓት ክ���',
+'timezoneuseoffset'         => 'ሌላ (ኦ� ሴት ለመወሰን)',
+'timezoneoffset'            => 'ኦ� ሰት¹',
+'servertime'                => 'የሰርቨሩ ሰዓት',
+'guesstimezone'             => 'ከኮ���ተርዎ መ�ገብ �ዩ�ቱ ይገ�',
+'allowemail'                => 'ኢሜ� ከሌሎች ተጠቃሚዎች ለመ�ቀድ',
+'prefs-searchoptions'       => 'የ�ለጋ �ርጫዎች',
+'prefs-namespaces'          => 'ክ�ለ-ዊኪዎች',
+'defaultns'                 => 'በመጀመርያ� �ለጋዎ በ�ዚህ ክ�ለ-ዊኪዎች ብቻ ይደረ�:',
+'default'                   => 'ቀዳሚ',
+'files'                     => 'የስዕሎች መጠን',
 
 # User rights
-'userrights'               => 'የአባ� መብቶች ለማስተዳደር', # Not used as normal message but as header for the special page itself
-'userrights-lookup-user'   => 'የ1 አባ� ማዕረ� ለማስተዳደር',
-'userrights-user-editname' => 'ለዚ� ብዕር ስ��',
-'editusergroup'            => 'የአባሉ ማዕረ� ለማስተካከ�',
-'editinguser'              => "ይህ ማመ�ከቻ ለብዕር ስ� '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) መብቶቹን ለመቀየር ���",
-'userrights-editusergroup' => 'የአባሉ ማዕረ� ለማስተካከ�',
-'saveusergroups'           => 'ለ�ጦቹ ይቆጠቡ',
-'userrights-groupsmember'  => 'አ�ን ያሉባቸ� ማዕረጎች�',
-'userrights-reason'        => 'የመቀየሩ �ክንያት�',
-'userrights-no-interwiki'  => 'ማዕረጎችን በሌላ ዊኪ ላይ ለማስተካከ� �ቃድ የለዎ��',
-'userrights-nodatabase'    => 'መረጃ-ቤቱ $1 አይኖር� ወይ� የቅርብ አካባቢ አይደለ��',
-'userrights-nologin'       => 'የአባ� መብቶች ለመወሰን መጋቢ ሆ�� [[Special:UserLogin|መ�ባት]] ያስ���ዎታ��',
-'userrights-notallowed'    => 'የአባ� መብቶች ለማስተካከ� �ቃድ የለዎ��',
+'userrights'                  => 'የአባ� መብቶች ለማስተዳደር', # Not used as normal message but as header for the special page itself
+'userrights-lookup-user'      => 'የ1 አባ� ማዕረ� ለማስተዳደር',
+'userrights-user-editname'    => 'ለዚ� ብዕር ስ��',
+'editusergroup'               => 'የአባሉ ማዕረ� ለማስተካከ�',
+'editinguser'                 => "ይህ ማመ�ከቻ ለብዕር ስ� '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) መብቶቹን ለመቀየር ���",
+'userrights-editusergroup'    => 'የአባሉ ማዕረ� ለማስተካከ�',
+'saveusergroups'              => 'ለ�ጦቹ ይቆጠቡ',
+'userrights-groupsmember'     => 'አ�ን ያሉባቸ� ማዕረጎች�',
+'userrights-groups-help'      => 'ይኸ� አባ� (ብዕር ስ�) ያለባቸ� ስብሰባዎች (ማዕረጎች) ለመቀይር እርስዎ ይችላሉ�
+*በሳጥኑ ��ክት ቢኖር� አባሉ በዚያ ስብስባ �ስጥ አለ ማለት ���
+*በሳጥኑ ��ክት ከሌላ� አባሉ በዚያ� ስብስባ አይደለ� ማለት ���
+*��ክቱ * ቢኖር� ስብስባ� ከተወገደ በኋላ �ለተኛ ሊጨ�ሩት አይችሉ�� ወይ� ከተጨመረ በኋላ �ለተኛ ሊያስወ�ዱት አይችሉ� ያመለክታ��',
+'userrights-reason'           => 'የመቀየሩ �ክንያት�',
+'userrights-no-interwiki'     => 'ማዕረጎችን በሌላ ዊኪ ላይ ለማስተካከ� �ቃድ የለዎ��',
+'userrights-nodatabase'       => 'መረጃ-ቤቱ $1 አይኖር� ወይ� የቅርብ አካባቢ አይደለ��',
+'userrights-nologin'          => 'የአባ� መብቶች ለመወሰን መጋቢ ሆ�� [[Special:UserLogin|መ�ባት]] ያስ���ዎታ��',
+'userrights-notallowed'       => 'የአባ� መብቶች ለማስተካከ� �ቃድ የለዎ��',
+'userrights-changeable-col'   => 'ሊቀይሩ የሚችሉት ስብስባዎች',
+'userrights-unchangeable-col' => 'ሊቀይሩ የማይችሉት ስብስባዎች�',
 
 # Groups
 'group'               => 'ደረጃ�',
@@ -797,14 +889,33 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'grouppage-bureaucrat'    => '{{ns:project}}:አስተዳዳሪዎች',
 
 # Rights
-'right-read'          => 'ገጾችን ለማንበብ',
-'right-edit'          => 'ገጾችን ለማዘጋጀት',
-'right-createtalk'    => 'የ�ይይት ገጽ ለመ�ጠር',
-'right-minoredit'     => 'ለ�ጦችን ጥቃቅን ሆኖ ለማመ�ከት',
-'right-move'          => 'ገጾችን ለማዛወር',
-'right-move-subpages' => 'ገጾችን ከ�ንዑስ ገጾቻቸ� ለማዛወር',
-'right-upload'        => '�ይሎችን ለመላክ',
-'right-delete'        => 'ገጾችን ለማጥ�ት',
+'right-read'             => 'ገጾችን ለማንበብ',
+'right-edit'             => 'ገጾችን ለማዘጋጀት',
+'right-createpage'       => 'ገጾች ለመ�ጠር (�ይይት ገጾች ያ�ሆኑትን)',
+'right-createtalk'       => 'የ�ይይት ገጽ ለመ�ጠር',
+'right-minoredit'        => 'ለ�ጦችን ጥቃቅን ሆኖ ለማመ�ከት',
+'right-move'             => 'ገጾችን ለማዛወር',
+'right-move-subpages'    => 'ገጾችን ከ�ንዑስ ገጾቻቸ� ለማዛወር',
+'right-upload'           => '�ይሎችን ለመላክ',
+'right-autoconfirmed'    => 'በከ�� የተቆለ�ት ገጾች ለማረ�',
+'right-delete'           => 'ገጾችን ለማጥ�ት',
+'right-bigdelete'        => 'ት�ቅ የእት� ታሪክ ያላቸ�ን ገጾች ለማጥ�ት',
+'right-deleterevision'   => 'በገጾች የተወሰኑትን እትሞች ለማጥ�ትና ለመመ�ስ',
+'right-browsearchive'    => 'የጠ�ትን ገጾች ለመ�ለ�',
+'right-undelete'         => 'የጠ��ን ገጽ ለመመ�ስ',
+'right-suppressrevision' => 'ከመጋቢዎቹ የተደበ�ትን እትሞች አይቶ ለመመ�ስ',
+'right-suppressionlog'   => 'የ�� መ�ገቦች ለማየት',
+'right-block'            => 'ተጠቃሚዎችን ከማዘጋጀት ለማገድ',
+'right-blockemail'       => 'ተጠቃሚ ኢ-ሜ� ከመላክ ለመከ�ከ�',
+'right-protect'          => 'የመቆለ� ደረጃ ለመቀይርና የተቆለ�ትን ገጾች ለማረ�',
+'right-rollback'         => 'አንድ ገጽ መጨረሻ የለወጠ�ን ተጠቃሚ ለ�ጦች በ�ጥ�ት rollback ለማድረ�',
+'right-markbotedits'     => 'rollback ሲደረ� እንደ bot ለማመ�ከት',
+'right-import'           => 'ከሌላ ዊኪ ገጾችን ለማስገባት',
+'right-patrol'           => 'የሰ� ለ�ጦች የተሣለ� ሆ�� ለማመ�ከት',
+'right-autopatrol'       => 'የራሱ ለ�ጦች በቀጥታ የተሣለ� ሆ�� መመ�ከት',
+'right-trackback'        => 'trackback ለማቅረብ',
+'right-mergehistory'     => 'የገጾች እትሞችን ታሪክ ለመዋ�ድ',
+'right-userrights'       => 'ያባላት �ሉ መብቶች ለማስተካከ�',
 
 # User rights log
 'rightslog'      => 'የአባ� መብቶች መ�ገብ',
@@ -812,13 +923,40 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'rightslogentry' => 'የ$1 ማዕረ� ከ$2 ወደ $3 ለወጠ',
 'rightsnone'     => '(የለ�)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'             => 'ይህን ገጽ ለማንበብ',
+'action-edit'             => 'ይህን ገጽ ለማስተካከ�',
+'action-createpage'       => 'ገጽ ለመ�ጠር',
+'action-createtalk'       => 'የ�ይይት ገጽ ለመ�ጠር',
+'action-createaccount'    => 'ይህን አባ� ስ� ለመ�ጠር',
+'action-minoredit'        => 'ይህን ለ�ጥ ጥቃቅን ሆኖ ለማመ�ከት',
+'action-move'             => 'ይህንን ገጽ ለማዛወር',
+'action-move-subpages'    => 'ይህንን ገጽ ከ�ንዑስ-ገጾቹ ለማዛወር',
+'action-upload'           => 'ይህንን �ይ� ለመላክ',
+'action-delete'           => 'ይህን ገጽ ለማጥ�ት',
+'action-deleterevision'   => 'ይህን እት� ለማጥ�ት',
+'action-deletedhistory'   => 'ለዚ� ገጽ የጠ�ትን ዕትሞች ታሪክ ለማየት',
+'action-browsearchive'    => 'የጠ�ትን ገጾች ለመ�ለ�',
+'action-undelete'         => 'ይህንን ገጽ ለመመ�ስ',
+'action-suppressrevision' => 'ይህን የተደበቅ ዕት� አይተ� ለመመ�ስ',
+'action-suppressionlog'   => 'ይህንን የ�� መ�ገብ ለማየት',
+'action-block'            => 'ይህንን ተጠቃሚ ከማዘጋጀት ለማገድ',
+'action-protect'          => 'ለዚ� ገጽ የመቆለ� ደረጃ ለመቀይር',
+'action-import'           => 'ይህን ገጽ ከሌላ ዊኪ ለማስገባት',
+'action-patrol'           => 'የሰ� ለ�ጦች የተሣለ� ሆ�� ለማመ�ከት',
+'action-autopatrol'       => 'የራስዎ ለ�ጥ የተሣለ� ሆኖ መመ�ከት',
+'action-trackback'        => 'trackback ለማቅረብ',
+'action-mergehistory'     => 'የዚ�ን ገጽ ዕትሞች ታሪክ ለማዋ�ድ',
+'action-userrights'       => 'ያባላት �ሉ መብቶች ለማስተካከ�',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|ለ�ጥ|ለ�ጦች}}',
 'recentchanges'                     => 'በቅርብ ጊዜ የተለወጡ',
+'recentchanges-legend'              => 'የቅርብ ለ�ጥ አማራጮች�',
 'recentchangestext'                 => "በዚ� ገጽ ላይ በቅርብ ጊዜ የወጡ አዳዲስ ለ�ጦች ለመከታተ� ይችላሉ� <br /> ('''ጥ'''� ጥቃቅን ለ�ጥ� '''አ'''� አዲስ ገጽ)",
 'recentchanges-feed-description'    => 'በዚህ ዊኪ ላይ በቅርብ �ዜ የተለወጠ�ን በዚ� feed መከታተ� ይችላሉ',
 'rcnote'                            => "ከ$5 $4 እ.ኤ.አ. {{PLURAL:$2|ባለ�� 1 ቀን|ባለ�ት '''$2''' ቀኖች}} {{PLURAL:$1|የተደረገ� '''1''' ለ�ጥ እታች ይገኛ�|የተደረጉት '''$1''' መጨረሻ ለ�ጦች እታች ይገኛሉ}}�",
-'rcnotefrom'                        => "ከ'''$2''' ጀ�ሮ የተቀየሩትን ገጾች (እስከ '''$1''' ድረስ) ክዚህ በታች ይታያሉ�",
+'rcnotefrom'                        => "ከ'''$2''' ጀ�ሮ የተቀየሩት ገጾች (እስከ '''$1''' ድረስ) ክዚህ በታች ይታያሉ�",
 'rclistfrom'                        => '(ከ $1 ጀ�ሮ አዲስ ለ�ጦቹን ለማየት)',
 'rcshowhideminor'                   => 'ጥቃቅን ለ�ጦች $1',
 'rcshowhidebots'                    => 'bots $1',
@@ -837,6 +975,8 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'number_of_watching_users_pageview' => '[$1 የሚከታተሉ {{PLURAL:$1|ተጠቃሚ|ተጠቃሚዎች}}]',
 'rc_categories_any'                 => 'ማንኛ��',
 'newsectionsummary'                 => '/* $1 */ አዲስ ክ��',
+'rc-enhanced-expand'                => '�ር�ሩን አሳይ (JavaScript ያስ��ጋ�)',
+'rc-enhanced-hide'                  => '�ር�ሩን ደብቅ',
 
 # Recent changes linked
 'recentchangeslinked'          => 'የተዛመዱ ለ�ጦች',
@@ -856,10 +996,10 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'uploadnologin'               => 'ገና አ�ገቡ�',
 'uploadnologintext'           => '�ይ� ለመላክ አስቀድሞ [[Special:UserLogin|መ�ባት]] ያስ���ዎታ��',
 'uploaderror'                 => 'የመላክ ስሕተት',
-'uploadtext'                  => "በዚህ ማመ�ከቻ ላይ �ይ� ለመላክ ይችላሉ� ቀድሞ የተላኩት ስዕሎች [[Special:ImageList|በ�ይ� / ሥዕሎች �ር�ር]] ናቸ�� ከዚህ በላይ የሚጨመረ� �ይ� �ሉ [[Special:Log/upload|በ�ይሎች መ�ገብ]] ይዘረ�ራሉ�
+'uploadtext'                  => "በዚህ ማመ�ከቻ ላይ �ይ� ለመላክ ይችላሉ� ቀድሞ የተላኩት ስዕሎች [[Special:FileList|በ�ይ� / ሥዕሎች �ር�ር]] ናቸ�� ከዚህ በላይ የሚጨመረ� �ይ� �ሉ [[Special:Log/upload|በ�ይሎች መ�ገብ]] ይዘረ�ራሉ�
 
-ስዕ�ዎ በጽሑ� እንዲታይ '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Filename.jpg]]</nowiki>''' ወይ�
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Filename.png|thumb|ሌላ ጽሑ�]]</nowiki>''' በሚመስ� መ�ክ ይጠቅሙ�",
+ስዕ�ዎ በጽሑ� እንዲታይ '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Filename.jpg]]</nowiki>''' ወይ�
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Filename.png|thumb|ሌላ ጽሑ�]]</nowiki>''' በሚመስ� መ�ክ ይጠቅሙ�",
 'upload-permitted'            => 'የተ�ቀዱት የ�ይ� አይ�ቶች� $1 ብቻ ናቸ��',
 'upload-preferred'            => 'የተመረጡት የ�ይ� አይ�ቶች�  $1�',
 'upload-prohibited'           => 'ያ�ተ�ቀዱት የ�ይ� አይ�ቶች� $1�',
@@ -878,30 +1018,33 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'illegalfilename'             => 'የ�ይሉ ስ� «$1» በአርእስት ያ�ተ�ቀደ �ደ� ወይ� ��ክት አለበት� እባክዎ� ለ�ይሉ አዲስ ስ� ያ�ጡና እንደገና ይ�ኩት�',
 'badfilename'                 => 'የ�ይ� ስ� ወደ «$1» ተቀይሯ��',
 'filetype-badmime'            => 'የMIME አይ�ት «$1» �ይሎች ሊላኩ አይ�ቀዱ��',
+'filetype-bad-ie-mime'        => 'ይህን �ይ� መላክ አይቻ��� Internet Explorer እንደ $1 ይመስለ� �በርና ይህ የማይ�ቅድ አደገኛ የ�ይ� አይ�ት ���',
 'filetype-unwanted-type'      => "'''\".\$1\"''' ያ�ተ�ለገ �ይ� አይ�ት ��� የተመረጡት �ይ� አይ�ቶች \$2 ናቸ��",
 'filetype-banned-type'        => "'''«.$1»''' ያ�ተ�ቀደ �ይ� አይ�ት ��� የተ�ቀዱት �ይ� አይ�ቶች $2 ናቸ��",
 'filetype-missing'            => '�ይሉ �ን� ቅጥያ (ለ�ሳሌ «.jpg») የለ���',
 'large-file'                  => 'የ�ይ� መጠን ከ$1 በላይ እንዳይሆን ይመከራ�� የዚህ �ይ� መጠን $2 ���',
 'largefileserver'             => 'ይህ �ይ� ሰርቨሩ ከሚችለ� መጠን በላይ ���',
 'emptyfile'                   => 'የላኩት �ይ� ባዶ እንደ ሆ� ይመስላ�� ይህ �ና�ባት በ�ይሉ ስ� አንድ �ድ�ት ስላለ ይሆና�� እባክዎ ይህን �ይ� በ�ኑ መላክ እንደ �ለጉ ያረጋ�ጡ�',
-'fileexists'                  => 'ይህ ስ� ያለ� �ይ� አ�ን ይኖራ�� እባክዎ እሱ� ለመቀየር እንደ�ለጉ እር�ጥኛ ካ�ሆኑ <strong><tt>$1</tt></strong> ይመለከቱ�',
-'filepageexists'              => 'የዚ� �ኡ� መ�ለጫ ገጽ ከዚህ በ�ት በ<strong><tt>$1</tt></strong> ተ�ጥሯ�� �ገር �ን ይህ ስ� ያለበት �ይ� አ�ን አይኖር�� ስለዚህ ያቀረቡት ማጠቃለያ በመ�ለጫ� ገጽ አይታይ�� መ�ለጫዎ በዚያ እንዲታይ በእጅ ማስገባት ይኖርብዎታ��',
-'fileexists-extension'        => 'ተመሳሳይ ስ� ያለበት �ይ� ይኖራ��<br />
-የሚላክ �ይ� ስ�� <strong><tt>$1</tt></strong><br />
-የሚኖር (የቆየ�) �ይ� ስ�� <strong><tt>$2</tt></strong><br />
-እባክዎ ሌላ ስ� ይ�ረጡ�',
+'fileexists'                  => "ይህ ስ� ያለ� �ይ� አ�ን ይኖራ�� እባክዎ እሱ� ለመቀየር እንደ�ለጉ እር�ጥኛ ካ�ሆኑ '''<tt>$1</tt>''' ይመለከቱ�",
+'filepageexists'              => "የዚ� �ኡ� መ�ለጫ ገጽ ከዚህ በ�ት በ'''<tt>$1</tt>''' ተ�ጥሯ�� �ገር �ን ይህ ስ� ያለበት �ይ� አ�ን አይኖር�� ስለዚህ ያቀረቡት ማጠቃለያ በመ�ለጫ� ገጽ አይታይ�� መ�ለጫዎ በዚያ እንዲታይ በእጅ ማስገባት ይኖርብዎታ��",
+'fileexists-extension'        => "ተመሳሳይ ስ� ያለበት �ይ� ይኖራ��<br />
+የሚላክ �ይ� ስ�� '''<tt>$1</tt>'''<br />
+የሚኖር (የቆየ�) �ይ� ስ�� '''<tt>$2</tt>'''<br />
+እባክዎ ሌላ ስ� ይ�ረጡ�",
 'fileexists-thumb'            => "<center>'''የሚኖር �ይ�'''</center>",
-'fileexists-thumbnail-yes'    => '�ይሉ የተቀ�ሰ መጠን ያለበት ስዕ� <i>(ናሙና)</i> እንደ ሆ� ይመስላ�� እባክዎ �ይሉን <strong><tt>$1</tt></strong> ይመለከቱ�<br /> ያ� �ይ� ለዚ� �ይ� አንድ አይ�ት በኦሪጂናሉ መጠን ቢሆን ኖሮ� ተጨማሪ ናሙና መላክ አያስ�����',
-'file-thumbnail-no'           => 'የ�ይሉ ስ� በ<strong><tt>$1</tt></strong> ይጀመራ�� የተቀ�ሰ መጠን ያለበት ስዕ� <i>(ናሙና)</i> እንደ ሆ� ይመስላ�� ይህን ስዕ� በሙሉ ማጉላት ካለዎ� ይህን ይላኩ� አለዚያ እባክዎ የ�ይሉን ስ� ይቀይሩ�',
-'fileexists-forbidden'        => 'በዚህ ስ� የሚኖር �ይ� ገና አለ� እባክዎ ተመ�ሰ� ይህን �ይ� በአዲስ ስ� ስር ይ�ኩት� [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'ይህ ስ� ያለበት �ይ� አ�ን በጋራ �ይ� �ንጭ ይኖራ�� እባክዎ ተመ�ሰ� �ይሉን በሌላ ስ� ስር ይላኩት� [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "�ይሉ የተቀ�ሰ መጠን ያለበት ስዕ� ''(ናሙና)'' እንደ ሆ� ይመስላ�� እባክዎ �ይሉን '''<tt>$1</tt>''' ይመለከቱ�<br /> ያ� �ይ� ለዚ� �ይ� አንድ አይ�ት በኦሪጂናሉ መጠን ቢሆን ኖሮ� ተጨማሪ ናሙና መላክ አያስ�����",
+'file-thumbnail-no'           => "የ�ይሉ ስ� በ'''<tt>$1</tt>''' ይጀመራ�� የተቀ�ሰ መጠን ያለበት ስዕ� ''(ናሙና)'' እንደ ሆ� ይመስላ�� ይህን ስዕ� በሙሉ ማጉላት ካለዎ� ይህን ይላኩ� አለዚያ እባክዎ የ�ይሉን ስ� ይቀይሩ�",
+'fileexists-forbidden'        => 'በዚህ ስ� የሚኖር �ይ� ገና አለ� እባክዎ ተመ�ሰ� ይህን �ይ� በአዲስ ስ� ስር ይ�ኩት� [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'ይህ ስ� ያለበት �ይ� አ�ን በጋራ �ይ� �ንጭ ይኖራ�� እባክዎ ተመ�ሰ� �ይሉን በሌላ ስ� ስር ይላኩት� [[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'ይህ �ይ� {{PLURAL:$1|የሚከተለ� �ኡ�|የሚከተሉት �ይሎች}} ቅጂ ���',
+'file-deleted-duplicate'      => 'ለዚህ �ይ� አንድ ቅጂ የሆ� �ይ� ([[$1]]) ቀድሞ ጠ�ቷ�� እንደገና ሳይ�ኩት እባክዎ የዚያ�ን �ይ� መጥ�ት ታሪክ ይመለከቱ�',
 'successfulupload'            => 'መላኩ ተከናወ�',
 'uploadwarning'               => 'የመላክ ማስጠንቀቂያ',
 'savefile'                    => '�ይሉ ለመቆጠብ',
 'uploadedimage'               => '«[[$1]]» ላከ',
 'overwroteimage'              => 'የ«[[$1]]» አዲስ ዕት� ላከ',
 'uploaddisabled'              => '�ይ� መላክ አይቻ��',
-'uploaddisabledtext'          => '�ይ� መላክ በ{{SITENAME}} አይቻ���',
+'uploaddisabledtext'          => '�ይ� መላክ በዚህ ዊኪ አይቻ���',
 'uploadcorrupt'               => 'ይህ �ይ� ብ�ሹ ��� ወይ� ትክክለኛ ያ�ሆ� ቅጥያ አለ�� እባክዎ �ይሉን ተመ�ክተ� እንደገና ይላኩት�',
 'uploadvirus'                 => '�ይሉ ቫይረስ አለበት! �ር�ር� $1',
 'sourcefilename'              => 'የቆየ� የ�ይሉ ስ��',
@@ -911,7 +1054,7 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'upload-wasdeleted'           => "'''ማስጠንቀቂያ� ቀድሞ የተደለዘ �ይ� እየላኩ ���'''
 
 ይህን �ይ� መላክ የሚገባ መሆኑን ይቆጠሩ� የ�ይሉ ማጥ�ት መ�ገብ ከዚህ ታች ይታያ��",
-'filename-bad-prefix'         => 'የሚ�ኩት �ይ� ስ� በ<strong>«$1»</strong> ይጀመራ�� ይህ ብዙ ጊዜ በ�ጥራዊ ካሜራ የተወሰ� ገላጭ ያ�ሆ� ስ� ይሆና�� እባክዎ ለ�ይ�ዎ ገላጭ የሆ� ስ� ይ�ረጡ�',
+'filename-bad-prefix'         => "የሚ�ኩት �ይ� ስ� በ'''«$1»''' ይጀመራ�� ይህ ብዙ ጊዜ በ�ጥራዊ ካሜራ የተወሰ� ገላጭ ያ�ሆ� ስ� ይሆና�� እባክዎ ለ�ይ�ዎ ገላጭ የሆ� ስ� ይ�ረጡ�",
 
 'upload-proto-error'      => 'ትክክለኛ ያ�ሆ� ወ� (protocol)',
 'upload-proto-error-text' => 'የሩቅ መላክ እንዲቻ� URL በ<code>http://</code> ወይ� በ<code>ftp://</code> መጀመር አለበት�',
@@ -920,8 +1063,14 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'upload-misc-error-text'  => 'በተላከበት ጊዜ ያ�ታወቀ ስህተት ተ�ሣ� እባክዎ URL ትክክለኛና የሚገ� መሆኑን አረጋ�ጠ� እንደገና ይሞክሩ� ች�ሩ ቢቀጠ�� መጋቢን ይጠይ��',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
-'upload-curl-error6'  => 'URLን መድረስ አ�ተቻለ�',
-'upload-curl-error28' => 'የመላክ ጊዜ አ�ቋ�',
+'upload-curl-error6'       => 'URLን መድረስ አ�ተቻለ�',
+'upload-curl-error6-text'  => 'የቀረበ� URL ሊገ� አ�ቻለ�� 
+እባክዎ URL �ክ መሆኑንና አ�ን መኖሩን ያረጋ�ጡ�',
+'upload-curl-error28'      => 'የመላክ ጊዜ አ�ቋ�',
+'upload-curl-error28-text' => '
+ድረ-ገጹ እንዲገ� ከመጠን በላይ ረጅ� ሰዓት �ጀ� 
+እባክዎ ድረ-ገጹ መኖሩን ያረጋ�ጡና እንደገና ሳይሞክሩ ትንሽ ይቆዩ� 
+�ና�ባት� በሌላ ጊዜ ትራ�ኩ ይቀ�ሳ��',
 
 'license'            => 'የ�ቃድ አይ�ት�',
 'nolicense'          => '�ን� አ�ተመረጠ�',
@@ -929,17 +1078,17 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'upload_source_url'  => ' (ትክክለኛ� በ��ጽ የሚገ� URL)',
 'upload_source_file' => ' (በኮ���ተርዎ ላይ ያለበት �ይ�)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'ለMedia �ይ� ስ� �ለጋ�',
+# Special:ListFiles
+'listfiles_search_for'  => 'ለMedia �ይ� ስ� �ለጋ�',
 'imgfile'               => '�ይሉ',
-'imagelist'             => 'የ�ይ� / ሥዕሎች �ር�ር',
-'imagelist_date'        => 'ቀን እ.ኤ.አ',
-'imagelist_name'        => 'የ�ይ� ስ�',
-'imagelist_user'        => 'አቅራቢ�',
-'imagelist_size'        => 'መጠን (byte)',
-'imagelist_description' => 'ማጠቃለያ',
-
-# Image description page
+'listfiles'             => 'የ�ይ� / ሥዕሎች �ር�ር',
+'listfiles_date'        => 'ቀን እ.ኤ.አ',
+'listfiles_name'        => 'የ�ይ� ስ�',
+'listfiles_user'        => 'አቅራቢ�',
+'listfiles_size'        => 'መጠን (byte)',
+'listfiles_description' => 'ማጠቃለያ',
+
+# File description page
 'filehist'                       => 'የ�ይሉ ታሪክ',
 'filehist-help'                  => 'የቀድሞ� ዕት� ካለ ቀን/ሰዓቱን በመጫን መመ�ከት ይቻላ��',
 'filehist-deleteall'             => '�ሉን ለማጥ�ት',
@@ -947,13 +1096,18 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'filehist-revert'                => 'ወዲህ ይገለበጥ',
 'filehist-current'               => 'ያ�ኑኑ',
 'filehist-datetime'              => 'ቀን /ሰዓት',
+'filehist-thumb'                 => 'ናሙና',
+'filehist-thumbtext'             => 'በ$1 የ�በረ� ዕት� ናሙና',
+'filehist-nothumb'               => 'ናሙና የለ�',
 'filehist-user'                  => 'አቅራቢ�',
 'filehist-dimensions'            => 'ክ�ሉ (በpixel)',
 'filehist-filesize'              => 'መጠን',
 'filehist-comment'               => 'ማጠቃለያ',
 'imagelinks'                     => 'መያያዣዎች',
-'linkstoimage'                   => 'የሚከተሉ ገጾች ወደዚ� �ይ� ተያይዘዋ��',
+'linkstoimage'                   => '{{PLURAL:$1|የሚከተለ� ገጽ ወደዚ� �ይ� ተያይዟ�|የሚከተሉ $1 ገጾች ወደዚ� �ይ� ተያይዘዋ�}}�',
 'nolinkstoimage'                 => 'ወዲህ �ይ� የተያያዘ ገጽ የለ��',
+'morelinkstoimage'               => 'ለዚህ �ይ� [[Special:WhatLinksHere/$1|ተጨማሪ መያያዣዎችን]] ለማየት�',
+'redirectstofile'                => 'ለዚህ �ይ� {{PLURAL:$1|የሚከተለ� �ይ� መ�ሪያ መንገድ አለ|የሚከተሉት $1 �ይሎች መ�ሪያ መንገዶች አሉ}}�',
 'duplicatesoffile'               => '{{PLURAL:$1|የሚከተለ� �ይ� የዚህ �ይ� ቅጂ ��|የሚከተሉት $1 �ይሎች የዚ� �ይ� ቅጂዎች ናቸ�}}�',
 'sharedupload'                   => 'ይህ �ይ� ከጋራ �ንጭ (Commons) የተቀሰመ ��� በማንኛ�� ዊኪ ላይ ሊጠቅ� ይቻላ��',
 'shareduploadwiki'               => 'በተጨማሪ ለመረዳት $1 ይዩ�',
@@ -1017,24 +1171,31 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'randomredirect-nopages' => 'በዚህ ክ�ለ-ዊኪ �ን� መ�ሪያ መንገድ የለ��',
 
 # Statistics
-'statistics'             => 'የዚ� ሥራ እቅድ �ር�ር �ጥሮች',
-'sitestats'              => 'የዚህ {{SITENAME}} �ር�ር �ጥሮች (Statistics)',
-'userstats'              => 'ያባላት �ር�ር �ጥሮች',
-'sitestatstext'          => "በጠቅላላ� '''$1''' ገጾች በዚህ ሥራ ዕቅድ አሉ� ይኸኛ� ድ�ር �ጥር የሚጠቅ�ለ� �ይይት ገጾች� �ዩ ገጾች� አጫጭር �ሑ�ች� መ�ሪያ ገጾች� እንዲ�� ሌሎች ይዞታ የሌለባቸ� ገጾች �ሉ ይሆና�� ከ�ዚህ �ጭ '''$2''' ይዞታ ያላቸ� ተገቢ �ሑ�ች ይኖራሉ� 
-
-ይህ ዊኪ�ድያ ከተመሰረተ ጀ�ሮ '''$4''' ለ�ጦች ተደርገዋ�� ስለዚህ ባማካ� '''$5''' ለ�ጦች በየገጹ ይሆና��",
-'userstatstext'          => "እስከ ዛሬ ድረስ '''$1''' አባላት ገብተዋ�� ከዚህ �ጥር መካከ�� '''$2''' (ማለት '''$4%''') መጋቢዎች ናቸ�� There are '''$1''' registered users, of whom '''$2''' (or '''$4%''') {{PLURAL:$2|has|have}} $5 rights.",
-'statistics-mostpopular' => 'ከ�ሉ የታዩት ገጾች',
+'statistics'                   => 'የዚ� ሥራ እቅድ �ር�ር �ጥሮች',
+'statistics-header-pages'      => 'የገጽ �ር�ር �ጥሮች',
+'statistics-header-edits'      => 'የለ�ጥ �ር�ር �ጥሮች',
+'statistics-header-users'      => 'ያባላት �ር�ር �ጥሮች',
+'statistics-articles'          => 'መያያዣ ያላቸ� መጣጥ�ች',
+'statistics-pages'             => 'ገጾች በሙሉ',
+'statistics-pages-desc'        => 'በዊኪ ላይ ያሉት ገጾች �ሉ - ከ��ይይት� መ�ሪያ መንገድ ወዘተ.',
+'statistics-files'             => 'የተላኩት �ይሎች',
+'statistics-edits'             => '{{SITENAME}} ከተጀመረ አንሥቶ የተደረጉት ለ�ጦች',
+'statistics-users'             => 'አባ��ት የገቡ [[Special:ListUsers|ተጠቃሚዎች]]',
+'statistics-users-active'      => 'ተ�ባራዊ ተጠቃሚዎች',
+'statistics-users-active-desc' => 'ባለ�� {{PLURAL:$1|ቀን|$1 ቀን}} ማንኛ�ን� ድርጊት የሠሩት ተጠቃሚዎች',
+'statistics-mostpopular'       => 'ከ�ሉ የታዩት ገጾች',
 
 'disambiguations'      => 'ወደ መንታ መንገድ የሚያያይ�',
 'disambiguationspage'  => 'Template:መንታ',
 'disambiguations-text' => "የሚከተሉት ጽሑ�ች ወደ '''መንታ መንገድ''' እየተያያዙ ��ና ብዙ ጊዜ እንዲህ ሳይሆን ወደሚገባ� ርዕስ ቢወስዱ ይሻላ�� <br />
 መንታ መንገድ ማለት የመንታ መ�ጠ�ያ ([[MediaWiki:Disambiguationspage]]) ሲኖርበት ���",
 
-'doubleredirects'     => 'ድርብ መ�ሪያ መንገዶች',
-'doubleredirectstext' => 'ይህ ድርብ መ�ሪያ መንገዶች ይዘርዘራ��
+'doubleredirects'            => 'ድርብ መ�ሪያ መንገዶች',
+'doubleredirectstext'        => 'ይህ ድርብ መ�ሪያ መንገዶች ይዘርዘራ��
 
 ድርብ መ�ሪያ መንገድ ካለ ወደ መጨረሻ መያያዣ እንዲሄድ ቢስተካከ� ይሻላ��',
+'double-redirect-fixed-move' => '[[$1]] ተዛ�ራ�ና አ�ን ለ[[$2]] መ�ሪያ መንገድ ���',
+'double-redirect-fixer'      => 'የመ�ሪያ መንገድ አስተካካይ',
 
 'brokenredirects'        => 'ሰባራ መ�ሪያ መንገዶች',
 'brokenredirectstext'    => 'እ�ዚህ መ�ሪያ መንገዶች ወደማይኖር ጽሑ� ይመራሉ�',
@@ -1043,6 +1204,7 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 
 'withoutinterwiki'         => 'በሌሎች ቋንቋዎች ያ�ተያያዙ',
 'withoutinterwiki-summary' => 'እ�ዚህ ጽሑ�ች «በሌሎች ቋንቋዎች» ሥር ወደሆኑት ሌሎች ትርጉሞች ገና አ�ተያያዙ��',
+'withoutinterwiki-legend'  => 'በቅድመ-�ደ� ለመወሰን',
 'withoutinterwiki-submit'  => 'ይታዩ',
 
 'fewestrevisions' => 'ለ�ጦች ያ�ሱላቸ� መጣጥ�ች',
@@ -1066,6 +1228,8 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'popularpages'            => 'የሚወደዱ ገጾች',
 'wantedcategories'        => 'ቀይ መያያዣዎች የበዙላቸ� መደቦች',
 'wantedpages'             => 'ቀይ መያያዣዎች የበዙላቸ� አርእስቶች',
+'wantedfiles'             => 'የተ�ለጉ �ይሎች',
+'wantedtemplates'         => 'የተ�ለጉ መ�ጠ�ያዎች',
 'mostlinked'              => 'መያያዣዎች የበዙላቸ� ገጾች',
 'mostlinkedcategories'    => 'መያያዣዎች የበዙላቸ� መደቦች',
 'mostlinkedtemplates'     => 'መያያዣዎች የበዙላቸ� መ�ጠ�ያዎች',
@@ -1084,6 +1248,8 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'protectedtitlestext'     => 'የሚከተሉት አርዕስቶች ከመ�ጠር ተጠብቀዋ��',
 'protectedtitlesempty'    => 'እንደዚህ አይ�ት አርእስት አ�ን የሚቆለ� �ን� የለ��',
 'listusers'               => 'አባላት',
+'listusers-editsonly'     => 'ለ�ጦች ያላቸ� ተጠቃሚዎች ብቻ ይታዩ',
+'usereditcount'           => '$1 {{PLURAL:$1|ለ�ጥ|ለ�ጦች}}',
 'newpages'                => 'አዳዲስ መጣጥ�ች',
 'newpages-username'       => 'በአቅራቢ��',
 'ancientpages'            => 'የቈዩ �ሑ�ች (በተለወጠበት ሰአት)',
@@ -1110,8 +1276,6 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'speciallogtitlelabel' => 'አርዕስት�',
 'log'                  => 'Logs / መ�ገቦች',
 'all-logs-page'        => 'All logs - መ�ገቦች �ሉ',
-'log-search-legend'    => 'ለመ�ገቦች መ�ለ�',
-'log-search-submit'    => 'ሂድ',
 'alllogstext'          => 'ይኸ� መ�ገብ �ሉን� ያጠቅ�ላ�� 1) የ�ይሎች መ�ገብ 2) የማጥ�ት መ�ገብ 3) የመቆለ� መ�ገብ 4) የማገድ መ�ገብ 5) የመጋቢ አድራጎት መ�ገቦች በያይ�ቱ ናቸ��
 
 ከሳጥኑ የተወሰ� መ�ገብ አይ�ት መ�ረጥ ይችላሉ� ከዚያ ጭ�ር በብዕር ስ� ወይ� በገጽ ስ� መ�ለ� ይቻላ��',
@@ -1134,15 +1298,30 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'allpages-bad-ns'   => 'በ{{SITENAME}} «$1» የሚባ� ክ�ለዊኪ የለ��',
 
 # Special:Categories
-'categories'         => '�ድቦች',
-'categoriespagetext' => 'በዚ� ሥራ ዕቅድ �ስጥ የሚከተሉ መደቦች ይኖራሉ�',
+'categories'                  => '�ድቦች',
+'categoriespagetext'          => 'በዚ� ሥራ ዕቅድ �ስጥ የሚከተሉ መደቦች ይኖራሉ�',
+'special-categories-sort-abc' => 'በ�ደ� ተራ ይደርደሩ',
+
+# Special:LinkSearch
+'linksearch'    => 'የድረ-ገጽ መያያዣ ለመ���',
+'linksearch-ns' => 'ክ�ለ-ዊኪ�',
+'linksearch-ok' => '�ለጋ',
 
 # Special:ListUsers
 'listusersfrom'      => 'ከዚ� �ደ� ጀ�ሮ�',
 'listusers-submit'   => 'ይታይ',
 'listusers-noresult' => 'ማን� ተጠቃሚ አ�ተገኘ��',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'የአባ��ት መ�ገብ (user log)',
+'newuserlogpagetext'       => 'ይህ መ�ገብ ወደ አባ��ት የገቡትን ብዕር ስሞች ይዘር�ራ��',
+'newuserlog-byemail'       => 'ማለ�ያ-ቃ� በኤ-መ�ዕክት ተ�ኳ�',
+'newuserlog-create-entry'  => 'አዲስ አባ�',
+'newuserlog-create2-entry' => 'ለ$1 አባ��ት ተ�ጥሯ�',
+
 # Special:ListGroupRights
+'listgrouprights'        => 'የተጠቃሚ ስብስባ መብቶች',
+'listgrouprights-group'  => 'ስብስባ',
 'listgrouprights-rights' => 'መብቶች',
 
 # E-mail user
@@ -1156,10 +1335,11 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'defemailsubject' => '{{SITENAME}} Email / ኢ-ሜ�',
 'noemailtitle'    => 'ኢ-ሜ� አይቻ��',
 'noemailtext'     => 'ለዚህ/ች አባ� ኢ-ሜ� መላክ አይቻ��� ወይ� ተገቢ ኢ-ሜ� አድራሻ የለን�� ወይ� ከሰ� �ን� ኢ-ሜ� መቀበ� አ�ወደደ/ች��',
+'email-legend'    => 'ኢ-ሜ� ወደ ሌላ የ{{SITENAME}} ተጠቃሚ ለመላክ',
 'emailfrom'       => 'ከ',
 'emailto'         => 'ለ',
-'emailsubject'    => 'ርዕሰ ጉዳይ',
-'emailmessage'    => 'መ�እክት',
+'emailsubject'    => 'ርዕሰ ጉዳይ:',
+'emailmessage'    => 'መ�እክት:',
 'emailsend'       => 'ይላክ',
 'emailccme'       => 'አንድ ቅጂ ደ�ሞ ለራስዎ ኢ-ሜ� ይላክ�',
 'emailccsubject'  => 'ወደ $1 የመ�ዕክትዎ ቅጂ� $2',
@@ -1195,12 +1375,7 @@ $1ን ወይ� ማን� ሌላ [[{{MediaWiki:Grouppage-sysop}}|መጋቢ]] ስ
 'watchlistcontains'    => 'አ�ን በሙሉ $1 ገጾች እየተከታተሉ ���',
 'wlnote'               => 'ባለ�ት <b>$2</b> ሰዓቶች የተደረጉት $1 መጨረሻ ለ�ጦች እታች ይገኛሉ�',
 'wlshowlast'           => 'ያለ�ት $1 ሰዓት� $2 ቀን� $3 ይታዩ�',
-'watchlist-show-bots'  => 'የቦት (BOT) ለ�ጦች ይታዩ',
-'watchlist-hide-bots'  => 'የቦት (BOT) ለ�ጦች ይደበ�',
-'watchlist-show-own'   => 'የራሴ ለ�ጦች ይታዩ',
-'watchlist-hide-own'   => 'የራሴ ለ�ጦች ይደበ�',
-'watchlist-show-minor' => "'ጥ' (ጥቃቅን) ለ�ጦች ይታዩ",
-'watchlist-hide-minor' => "'ጥ' (ጥቃቅን) ለ�ጦች ይደበ�",
+'watchlist-options'    => 'የ�ር�ሩ �ርጫዎች',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'እየተጨመረ ��...',
@@ -1239,61 +1414,68 @@ $NEWPAGE
 በተጨማሪ ለመረዳት�
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'ገጹ ይጥ�',
-'confirm'                     => 'ማረጋገጫ',
-'excontent'                   => 'ይዞታ� «$1» አለ�',
-'excontentauthor'             => "ይዞታ '$1' አለ (የጻ�በት� '$2' ብቻ �በር)",
-'exbeforeblank'               => 'ባዶ� ከተደመሰሰ በ�ት ይዞታ� «$1» አለ�',
-'exblank'                     => 'ገጹ ባዶ �በረ�',
-'delete-confirm'              => '«$1» ለማጥ�ት',
-'delete-legend'               => 'ለማጥ�ት',
-'historywarning'              => 'ማስጠንቀቂያ� ለዚ� ገጽ የዕት� ታሪክ ደ�ሞ ሊጠ� ��! :',
-'confirmdeletetext'           => 'አንድ ገጽ ወይ� ስዕ� ከ�ለ�ጦቹ በሙሉ ከዚ� {{SITENAME}} ሊጠ� ��! ይህን ማድረ�ዎ ያሠቡበት መሆኑንና ማጥ�ቱ በ�ሊሲ ተገቢ እንደሆ� እባክዎ ያረጋ�ጡ�',
-'actioncomplete'              => 'ተ�ጽሟ�',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» ጠ�ቷ��
+# Delete
+'deletepage'             => 'ገጹ ይጥ�',
+'confirm'                => 'ማረጋገጫ',
+'excontent'              => 'ይዞታ� «$1» አለ�',
+'excontentauthor'        => "ይዞታ '$1' አለ (የጻ�በት� '$2' ብቻ �በር)",
+'exbeforeblank'          => 'ባዶ� ከተደመሰሰ በ�ት ይዞታ� «$1» አለ�',
+'exblank'                => 'ገጹ ባዶ �በረ�',
+'delete-confirm'         => '«$1» ለማጥ�ት',
+'delete-legend'          => 'ለማጥ�ት',
+'historywarning'         => 'ማስጠንቀቂያ� ለዚ� ገጽ የዕት� ታሪክ ደ�ሞ ሊጠ� ��! :',
+'confirmdeletetext'      => 'አንድ ገጽ ወይ� ስዕ� ከ�ለ�ጦቹ በሙሉ ከዚ� {{SITENAME}} ሊጠ� ��! ይህን ማድረ�ዎ ያሠቡበት መሆኑንና ማጥ�ቱ በ�ሊሲ ተገቢ እንደሆ� እባክዎ ያረጋ�ጡ�',
+'actioncomplete'         => 'ተ�ጽሟ�',
+'deletedtext'            => '«<nowiki>$1</nowiki>» ጠ�ቷ��
 
 (የጠ�ትን ገጾች �ሉ ለመመ�ከት $2 ይዩ�)',
-'deletedarticle'              => '«[[$1]]» አጠ�',
-'dellogpage'                  => 'የማጥ�ት መ�ገብ',
-'dellogpagetext'              => 'በቅርቡ የጠ�ት ገጾች ከዚህ ታች የዘረ�ራሉ�',
-'deletionlog'                 => 'የማጥ�ት መ�ገብ',
-'reverted'                    => 'ወደ ቀድመኛ ዕት� ገለበጠ��',
-'deletecomment'               => 'የማጥ�ቱ �ክንያት�',
-'deleteotherreason'           => 'ሌላ /ተጨማሪ �ክንያት',
-'deletereasonotherlist'       => 'ሌላ �ክንያት',
-'deletereason-dropdown'       => '*ተራ የማጥ�ት �ክንያቶች
+'deletedarticle'         => '«[[$1]]» አጠ�',
+'suppressedarticle'      => '"[[$1]]"ን ከለከለ',
+'dellogpage'             => 'የማጥ�ት መ�ገብ',
+'dellogpagetext'         => 'በቅርቡ የጠ�ት ገጾች ከዚህ ታች የዘረ�ራሉ�',
+'deletionlog'            => 'የማጥ�ት መ�ገብ',
+'reverted'               => 'ወደ ቀድመኛ ዕት� ገለበጠ��',
+'deletecomment'          => 'የማጥ�ቱ �ክንያት�',
+'deleteotherreason'      => 'ሌላ /ተጨማሪ �ክንያት',
+'deletereasonotherlist'  => 'ሌላ �ክንያት',
+'deletereason-dropdown'  => '*ተራ የማጥ�ት �ክንያቶች
 ** በአቅራቢ� ጥያቄ
 ** ማብዛቱ ያ�ተ�ቀደለት ጽሑ�
 ** ተንኮ�',
-'delete-edit-reasonlist'      => "'ተራ የማጥ�ት �ክንያቶች' ለማዘጋጀት",
-'rollback'                    => 'ለ�ጦቹ ይገ�በጡ',
-'rollback_short'              => 'ይመለስ',
-'rollbacklink'                => 'ROLLBACK ይመለስ',
-'rollbackfailed'              => 'መገ�በጡ አ�ተከናወ��',
-'cantrollback'                => 'ለ�ጡን መገ�በጥ አይቻ��� አቅራቢ� ብቻ ስላዘጋ�ት ���',
-'alreadyrolled'               => 'የ[[:$1]] መጨረሻ ለ�ጥ በ[[User:$2|$2]] ([[User talk:$2|�ይይት]]) መገ�በት አይቻ��� ሌላ ሰ� አ�ን ገጹን መ�ሶታ��
+'delete-edit-reasonlist' => "'ተራ የማጥ�ት �ክንያቶች' ለማዘጋጀት",
+
+# Rollback
+'rollback'         => 'ለ�ጦቹ ይገ�በጡ',
+'rollback_short'   => 'ይመለስ',
+'rollbacklink'     => 'ROLLBACK ይመለስ',
+'rollbackfailed'   => 'መገ�በጡ አ�ተከናወ��',
+'cantrollback'     => 'ለ�ጡን መገ�በጥ አይቻ��� አቅራቢ� ብቻ ስላዘጋ�ት ���',
+'alreadyrolled'    => 'የ[[:$1]] መጨረሻ ለ�ጥ በ[[User:$2|$2]] ([[User talk:$2|�ይይት]]) መገ�በት አይቻ��� ሌላ ሰ� አ�ን ገጹን መ�ሶታ��
 
 መጨረሻ� ለ�ጥ በ[[User:$3|$3]] ([[User talk:$3|�ይይት]]) �በረ�',
-'editcomment'                 => 'ማጠቃለያ�� «<i>$1</i>» �በረ�', # only shown if there is an edit comment
-'revertpage'                  => 'የ$2ን ለ�ጦች ወደ $1 እት� መለሰ�', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'የ$1 ለ�ጦች ተገለበጡ� ወደ $2 ዕት� ተመ�ሷ��',
+'editcomment'      => "ማጠቃለያ�� «''$1''» �በረ�", # only shown if there is an edit comment
+'revertpage'       => 'የ$2ን ለ�ጦች ወደ $1 እት� መለሰ�', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'የ$1 ለ�ጦች ተገለበጡ� ወደ $2 ዕት� ተመ�ሷ��',
+
+# Protect
 'protectlogpage'              => 'የማቆለ� መ�ገብ',
 'protectlogtext'              => 'ይህ መ�ገብ ገጽ ሲቆለ� ወይ� ሲከ�ት ይዘረ�ራ�� ለአ�ኑ የተቆለ��ን ለመመ�ከት� [[Special:ProtectedPages|የቆለ�ትን ገጾች]] ደ�ሞ ያዩ�',
 'protectedarticle'            => 'ገጹን «[[$1]]» ቆለ���',
 'modifiedarticleprotection'   => 'የመቆለ� ደረጃ ለ«[[$1]]» ቀየረ�',
 'unprotectedarticle'          => 'ገጹን «[[$1]]» �ታ�',
+'movedarticleprotection'      => 'የመቆለ� ደረጃ ከ"[[$2]]" ወደ "[[$1]]" ተቀየረ',
 'protect-title'               => 'ለ«$1» የመቆለ� ደረጃ ለማስተካከ�',
+'prot_1movedto2'              => '«$1» ወደ «[[$2]]» አዛወረ',
 'protect-legend'              => 'የመቆለ� ማረጋገጫ',
 'protectcomment'              => 'ማጠቃለያ�',
 'protectexpiry'               => 'የሚያ�ቅበት �ዜ�',
 'protect_expiry_invalid'      => "የተሰጠ� 'የሚያ�ቅበት ጊዜ' �ክ አይደለ��",
 'protect_expiry_old'          => "የተሰጠ� 'የሚያ�ቅበት ጊዜ' ባለ�� �ዜ �በር�",
 'protect-unchain'             => 'ገጹን የማዛወር �ቃዶች ለመ�ታት',
-'protect-text'                => 'እዚህ ለገጹ «<strong><nowiki>$1</nowiki></strong>» የመቆለ� ደረጃ መመ�ከት ወይ� መቀይር ይችላሉ�',
-'protect-locked-blocked'      => 'ማገጃ እያለብዎት የመቆለ� ደረጃ ለመቀየር አይችሉ�� ለገጹ <strong>$1</strong> የአ�ኑኑ ደረጃ እንዲህ ���',
-'protect-locked-dblock'       => 'መረጃ-ቤቱ እራሱ አ�ን ስለሚቆለ�� የገጽ መቆለ� ደረጃ ሊቀየር አይች��� ለገጹ <strong>$1</strong> የአ�ኑኑ ደረጃ እንዲህ ���',
-'protect-locked-access'       => 'እርስዎ ገጽ የመቆለ� ወይ� የመ�ታት �ቃድ የለዎ��<br />አ�ኑ የዚ� ገጽ መቆለ� ደረጃ እንዲህ ��� <strong>$1</strong>:',
+'protect-text'                => "እዚህ ለገጹ «'''<nowiki>$1</nowiki>'''» የመቆለ� ደረጃ መመ�ከት ወይ� መቀይር ይችላሉ�",
+'protect-locked-blocked'      => "ማገጃ እያለብዎት የመቆለ� ደረጃ ለመቀየር አይችሉ�� ለገጹ '''$1''' የአ�ኑኑ ደረጃ እንዲህ ���",
+'protect-locked-dblock'       => "መረጃ-ቤቱ እራሱ አ�ን ስለሚቆለ�� የገጽ መቆለ� ደረጃ ሊቀየር አይች��� ለገጹ '''$1''' የአ�ኑኑ ደረጃ እንዲህ ���",
+'protect-locked-access'       => "እርስዎ ገጽ የመቆለ� ወይ� የመ�ታት �ቃድ የለዎ��<br />አ�ኑ የዚ� ገጽ መቆለ� ደረጃ እንዲህ ��� '''$1''':",
 'protect-cascadeon'           => 'ይህ ገጽ ወደ ተከለከሉት አርእስቶች ተጨ�ሯ�� የመቆለ� ደረጃ እዚህ መቀየር ቢቻ�ዎ� ገጹ �ን በሚከተለ� ድርብ የተቆለ� ገጽ �ስጥ ይጨመራ��',
 'protect-default'             => '(እንደ ወትሮ)',
 'protect-fallback'            => 'የ$1 �ቃደ ለማስ���',
@@ -1301,8 +1483,15 @@ $NEWPAGE
 'protect-level-sysop'         => 'መጋቢዎች ብቻ',
 'protect-summary-cascade'     => 'በ�ስጡ� ያለ�ን የሚያቆ�� አይ�ት',
 'protect-expiring'            => 'በ$1 (UTC) ያ�ቃ�',
+'protect-expiry-indefinite'   => 'ያ�ተወሰ�',
 'protect-cascade'             => 'በዚህ ገጽ �ስጥ የተካተተ� ገጽ �ሉ ደ�ሞ ይቆለ�?',
 'protect-cantedit'            => 'ይህንን ገጽ የማዘጋጀት �ቃድ ስለሌለ�ዎ መቆለ� አይቻሎት��',
+'protect-othertime'           => 'ሌላ የተወሰ� �ዜ�',
+'protect-othertime-op'        => 'ሌላ ጊዜ',
+'protect-otherreason'         => 'ሌላ/ተጨማሪ �ክንያት�',
+'protect-otherreason-op'      => 'ሌላ/ተጨማሪ �ክንያት',
+'protect-edit-reasonlist'     => "'ተራ የመቆለ� �ክንያቶች' ለማዘጋጀት",
+'protect-expiry-options'      => '2 ሰዓቶች:2 hours,1 ቀን:1 day,3 ቀን:3 days,1 ሳ�ንት:1 week,2 ሳ�ንት:2 weeks,1 ወር:1 month,3 ወር:3 months,6 ወር:6 months,1 አመት:1 year,ዘላለ�:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '�ቃድ�',
 'restriction-level'           => 'የመቆለ� ደረጃ�',
 'minimum-size'                => 'ቢያንስ',
@@ -1323,6 +1512,7 @@ $NEWPAGE
 'undeletepage'               => 'የተደለዘ ገጽ ለመመለስ',
 'viewdeletedpage'            => 'የተደለዙ ገጾች ለማየት',
 'undeletepagetext'           => 'እ�ዚህ ገጾች ተደለዙ� እስካ�ን �ን በመ�ገቡ �ስጥ ይገኛሉና ሊመለሱ ይቻላ�� ሆኖ� መ�ገቡ አንዳንዴ ሊደመስስ ይቻላ��',
+'undelete-fieldset-title'    => 'የጠ�ትን እትሞች ለመመ�ስ',
 'undeleteextrahelp'          => "እትሞቹን በሙሉ ለመመ�ስ� ሳጥኖቹ �ሉ ባዶ ሆ�� ይቆዩና 'ይመለስ' የሚለ�ን ይጫኑ� <br />አንዳንድ እት� ብቻ ለመመ�ስ� የተ�ለገ�ን እትሞች በየሳጥኖቹ አመ�ክተ� 'ይመለስ' ይጫኑ� <br />'ባዶ ይደረ�' ቢጫን� ማጠቃ�ያ�ና ሳጥኖቹ �ሉ እንደገና ባዶ ይሆናሉ�",
 'undeleterevisions'          => 'በመ�ገቡ $1 {{PLURAL:$1|ዕት� አለ|ዕትሞች አሉ}}',
 'undeletehistory'            => 'የተደለዘ ገጽ ሲመለስ� የተመለከቱት ዕትሞች �ሉ ወደ ዕትሞች ታሪክ ደ�ሞ ይመ�ሳሉ� ገጹ ከጠ� በኋላ በዚያ� አርዕሥት ሌላ ገጽ ቢኖር� የተመለሱት ዕትሞች ወደ ዕትሞች ታሪክ አንድላይ ይጨመራሉ�',
@@ -1359,26 +1549,27 @@ $1',
 'blanknamespace' => 'መጣጥ�ች',
 
 # Contributions
-'contributions' => 'ያባ� አስተዋጽኦች',
-'mycontris'     => 'የኔ አስተዋጽኦች�',
-'contribsub2'   => 'ለ $1 ($2)',
-'nocontribs'    => '�ን� አ�ተገኘ��',
-'uctop'         => '(ላይኛ)',
-'month'         => 'እስከዚህ ወር ድረስ�',
-'year'          => 'እስከዚህ አመት (እ.ኤ.አ.) ድረስ�-',
-
-'sp-contributions-newbies'     => 'የአዳዲስ ተጠቃሚዎች አስተዋጽዖ ብቻ እዚህ ይታይ',
-'sp-contributions-newbies-sub' => '(ለአዳዲስ ተጠቃሚዎች)',
-'sp-contributions-blocklog'    => 'የማገጃ መ�ገብ',
-'sp-contributions-search'      => 'የሰ�ን አስተዋጽኦች ለመ�ለ��',
-'sp-contributions-username'    => 'ብዕር ስ� ወይ� የ�. አድራሻ�',
-'sp-contributions-submit'      => '�ለጋ',
+'contributions'       => 'ያባ� አስተዋጽኦች',
+'contributions-title' => 'የ$1 አስተዋጽኦች',
+'mycontris'           => 'የኔ አስተዋጽኦች�',
+'contribsub2'         => 'ለ $1 ($2)',
+'nocontribs'          => '�ን� አ�ተገኘ��',
+'uctop'               => '(ላይኛ)',
+'month'               => 'እስከዚህ ወር ድረስ�',
+'year'                => 'እስከዚህ አመት (እ.ኤ.አ.) ድረስ�-',
+
+'sp-contributions-newbies'       => 'የአዳዲስ ተጠቃሚዎች አስተዋጽዖ ብቻ እዚህ ይታይ',
+'sp-contributions-newbies-sub'   => '(ለአዳዲስ ተጠቃሚዎች)',
+'sp-contributions-newbies-title' => 'የአዳዲስ ተጠቃሚዎች አስተዋጽኦች',
+'sp-contributions-blocklog'      => 'የማገጃ መ�ገብ',
+'sp-contributions-search'        => 'የሰ�ን አስተዋጽኦች ለመ�ለ��',
+'sp-contributions-username'      => 'ብዕር ስ� ወይ� የ�. አድራሻ�',
+'sp-contributions-submit'        => '�ለጋ',
 
 # What links here
 'whatlinkshere'            => 'ወዲህ የሚያያ�',
 'whatlinkshere-title'      => 'ወደ «$1» የሚያያዙት ገጾች',
 'whatlinkshere-page'       => 'ለገጽ (አርዕስት)�',
-'linklistsub'              => '(ወዲህ የሚያያ�)',
 'linkshere'                => "የሚከተሉት ገጾች ወደ '''[[:$1]]''' ተያይዘዋ��",
 'nolinkshere'              => "ወደ '''[[:$1]]''' የተያያዘ ገጽ የለ��",
 'nolinkshere-ns'           => "ባመለከቱት ክ�ለ-ዊኪ ወደ '''[[:$1]]''' የተያያዘ ገጽ የለ��",
@@ -1388,6 +1579,7 @@ $1',
 'whatlinkshere-next'       => 'ቀጥሎ $1',
 'whatlinkshere-links'      => '� ወዲህ� የሚያያ�',
 'whatlinkshere-hideredirs' => 'መ�ሪያ መንገዶች $1',
+'whatlinkshere-hidelinks'  => 'መያያዣዎች $1',
 
 # Block/unblock
 'blockip'                     => 'ተጠቃሚ�ን ለማገድ',
@@ -1424,6 +1616,7 @@ $1',
 'ipb-unblock'                 => 'ከብዕር ስ� ወይ� ከ�. አድራሻ ማገጃ ለማንሣት',
 'ipb-blocklist-addr'          => 'በ$1 ላይ አ�ን ያለ�ን ማገጃ ለመመ�ከት',
 'ipb-blocklist'               => 'አ�ን ያሉትን ማገጃዎች ለመመ�ከት',
+'ipb-blocklist-contribs'      => 'የ$1 ለ�ጦች',
 'unblockip'                   => 'ከተጠቃሚ ማገጃ ለማንሣት',
 'unblockiptext'               => 'በዚህ ማመ�ከቻ ከታገደ ተጠቃሚ ማገጃ�ን ለማንሣት ይቻላ��',
 'ipusubmit'                   => 'ማገጃ�ን ለማንሣት',
@@ -1440,12 +1633,14 @@ $1',
 'noautoblockblock'            => 'የቀጥታ ማገጃ እንዳይሠራ ተደረገ',
 'createaccountblock'          => 'ስ� ከማ�ጣት ተከለከለ',
 'emailblock'                  => 'ኢ-ሜ� ታገደ',
+'blocklist-nousertalk'        => 'የገዛ �ይይት ገጹን ማዘጋጀት አይች��',
 'ipblocklist-empty'           => 'የማገጃ �ር�ር ባዶ ���',
 'ipblocklist-no-results'      => 'የተጠየቀ� ተጠቃሚ አ�ን የታገደ አይደለ��',
 'blocklink'                   => 'ማገጃ',
 'unblocklink'                 => 'ማገጃ ለማንሣት',
 'contribslink'                => 'አስተዋጽኦች',
 'blocklogpage'                => 'የማገጃ መ�ገብ',
+'blocklog-fulllog'            => 'ሙሉ የማገጃ መ�ገብ',
 'blocklogentry'               => 'እስከ $2 ድረስ [[$1]] አገዳ $3',
 'blocklogtext'                => 'ይህ መ�ገብ ተጠቃሚዎች መቸ� ሲታገዱ ወይ� ማገጃ ሲ�ሣ የሚዘረ�ር ��� ለአ�ኑ የታገዱት ሰዎች [[Special:IPBlockList|በአ�ኑ ማገጃዎች �ር�ር]] ይታያሉ�',
 'unblocklogentry'             => 'የ$1 ማገጃ አ�ሣ',
@@ -1453,11 +1648,15 @@ $1',
 'block-log-flags-nocreate'    => 'አዲስ ብዕር ስ� ከማ�ጣት ተከለከለ',
 'block-log-flags-noautoblock' => 'የቀጥታ ማገጃ እንዳይሠራ ተደረገ',
 'block-log-flags-noemail'     => 'ኢ-ሜ� ታገደ',
+'block-log-flags-nousertalk'  => 'የገዛ �ይይት ገጹን ማዘጋጀት አይች��',
 'ipb_expiry_invalid'          => 'የሚያ�ቅበት �ዜ አይሆን��',
 'ipb_already_blocked'         => '«$1» ገና ከዚህ በ�ት ታ�ዶ ���',
+'ipb-needreblock'             => '== ገና ታ�ዷ� ==
+$1 አ�ን ገና ታ�ዷ�� �ር�ሩን ማስተካከ� �ለጉ?',
 'blockme'                     => '�ታገድ',
 'proxyblocker-disabled'       => 'ይህ ተ�ባር እንደማይሠራ ተደርጓ��',
 'proxyblocksuccess'           => 'ተደርጓ��',
+'cant-block-while-blocked'    => 'እርስዎ እየታገዱ ሌላ ተጠቃሚ ለማገድ አይችሉ��',
 
 # Developer tools
 'lockdb'              => 'መረጃ-ቤት ለመቆለ�',
@@ -1475,9 +1674,9 @@ $1',
 'databasenotlocked'   => 'መረጃ-ቤቱ የተቆለ� አይደለ��',
 
 # Move page
-'move-page'               => '«$1»ን ለማዛወር',
-'move-page-legend'        => 'የሚዛወር ገጽ',
-'movepagetext'            => "ከታች የሚገኘ� ማመ�ከቻ ለገጹ ይዞታ አዲስ አርእስት ያወጣ��
+'move-page'                 => '«$1»ን ለማዛወር',
+'move-page-legend'          => 'የሚዛወር ገጽ',
+'movepagetext'              => "ከታች የሚገኘ� ማመ�ከቻ ለገጹ ይዞታ አዲስ አርእስት ያወጣ��
 ከይዞታ� ጋራ የእትሞች ታሪክ ደ�ሞ ወደ አዲሱ ገጽ ይዛወራ��
 የቆየ� አርእስት እንደ መ�ሪያ መንገድ ለአዲሱ ገጽ ይሆና��
 ይህ ማለት ወደዚያ የሚያያ� መያያዣ �ሉ በቀጥታ ወደ አዲሱ ሥ�ራ ይወስዳ��
@@ -1488,41 +1687,55 @@ $1',
 
 '''ማስጠንቀቂያ�'''
 በጣ� ለተወደደ ወይ� ብዙ ጊዜ ለሚ�በብ ገጽ� እንዲህ ያለ ለ�ጥ በ�ጹ� ያ�ተጠበቀ ወይ� ከባድ �ጤት ያለ� ሊሆን ይችላ��  ስለዚህ እባክዎ የሚገባ መደ�ደሚያ መሆኑን አስቀድመ� ያረጋ�ጡ�",
-'movepagetalktext'        => "አብዛኛ� ጊዜ� ከዚ� ገጽ ጋራ የሚገናኘ� የ�ይይት ገጽ አንድላይ ይዛወራ�� '''�ገር �ን�'''
+'movepagetalktext'          => "አብዛኛ� ጊዜ� ከዚ� ገጽ ጋራ የሚገናኘ� የ�ይይት ገጽ አንድላይ ይዛወራ�� '''�ገር �ን�'''
 
 * ገጹን ወደማይመሳስ� ክ�ለ-ዊኪ (ለ�ሳሌ Mediawiki:) ቢያዛ�ሩት�
 * ባዶ ያ�ሆ� �ይይት ገጽ ቅድሞ ቢገ�� ወይ�
 * እታች ከሚገኘ�ን ሳጥን ��ክቱን ካጠ��
 :
 :ከ��ይይቱ ገጽ አንድላይ አይዛወሩ�� የዚያን ጊዜ የ�ይይቱን ገጽ ለማዛወር ከወደዱ በእጅ ማድረ� ያስ���ዎታ��",
-'movearticle'             => 'የቆየ አርእስት�',
-'movenotallowed'          => 'በ{{SITENAME}} ላይ ገጾችን ለማዛወር �ቃድ የለዎ��',
-'newtitle'                => 'አዲሱ አርእስት',
-'move-watch'              => 'ይህ ገጽ በተከታተሉት ገጾች ይጨመር',
-'movepagebtn'             => 'ገጹ ይዛወር',
-'pagemovedsub'            => 'መዛወሩ ተከናወ�',
-'movepage-moved'          => "<big>'''«$1» ወደ «$2» ተዛ�ሯ�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'በዚያ አርዕሥት ሌላ ገጽ አ�ን አለ� አለበለዚያ የመረጡት ስ� �ክ አይደለ� - ሌላ አርእስት ይ�ረጡ�',
-'cantmove-titleprotected' => 'አዲሱ አርዕስት ከመ�ጠር ስለተጠበቀ� ገጽ ወደዚያ� ሥ�ራ ለማዛወር አይችሉ��',
-'talkexists'              => "'''ገጹ ወደ አዲሱ አርዕስት ተዛወረ� እንጂ በአዲሱ አርዕስት የቆየ �ይይት ገጽ አስቀድሞ ስለ ኖረ የዚህ �ይይት ገጽ ሊዛወር አ�ተቻለ�� እባክዎ� በእጅ ያጋጥሙአቸ��'''",
-'movedto'                 => 'የተዛወረ ወደ',
-'movetalk'                => 'ከተቻለ� ከ��ይይቱ ገጽ ጋራ ይዛወር',
-'move-subpages'           => 'ንዑስ ገጾች ደ�ሞ ይዛወሩ',
-'move-talk-subpages'      => 'የ�ይይቱ ገጽ ንዑስ ገጾች ደ�ሞ ይዛወሩ',
-'1movedto2'               => '«$1» ወደ «[[$2]]» አዛወረ',
-'1movedto2_redir'         => '«$1» ወደ «[[$2]]» አዛወረ -- በመ�ሪያ መንገድ �ንታ',
-'movelogpage'             => 'የማዛወር መ�ገብ',
-'movelogpagetext'         => 'ይህ መ�ገብ ገጽ ሲዛወር ይመ�ገባ�� <ይመለስ> ቢጫኑ ኖሮ መዛወሩን ይገለብጣ�!',
-'movereason'              => '�ክንያት',
-'revertmove'              => 'ይመለስ',
-'delete_and_move'         => 'ማጥ�ትና ማዛወር',
-'delete_and_move_text'    => '==ማጥ�ት ያስ��ጋ�==
+'movearticle'               => 'የቆየ አርእስት�',
+'movenologin'               => 'ገና አ�ገቡ�',
+'movenologintext'           => 'ገጽ ለማዛወር [[Special:UserLogin|በብዕር ስ� መ�ባት]] ይኖርብዎታ��',
+'movenotallowed'            => 'በዚህ ዊኪ ገጾችን ለማዛወር �ቃድ የለዎ��',
+'movenotallowedfile'        => '�ይ�ን ለማዛወር �ቃድ የለዎ��',
+'cant-move-user-page'       => 'ከንዑስ ገጾች በቀር� የአባ� ገጽ ለማዛወር �ቃድ የለዎ��',
+'newtitle'                  => 'አዲሱ አርእስት',
+'move-watch'                => 'ይህ ገጽ በተከታተሉት ገጾች ይጨመር',
+'movepagebtn'               => 'ገጹ ይዛወር',
+'pagemovedsub'              => 'መዛወሩ ተከናወ�',
+'movepage-moved'            => "<big>'''«$1» ወደ «$2» ተዛ�ሯ�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'በዚያ አርዕሥት ሌላ ገጽ አ�ን አለ� አለበለዚያ የመረጡት ስ� �ክ አይደለ� - ሌላ አርእስት ይ�ረጡ�',
+'cantmove-titleprotected'   => 'አዲሱ አርዕስት ከመ�ጠር ስለተጠበቀ� ገጽ ወደዚያ� ሥ�ራ ለማዛወር አይችሉ��',
+'talkexists'                => "'''ገጹ ወደ አዲሱ አርዕስት ተዛወረ� እንጂ በአዲሱ አርዕስት የቆየ �ይይት ገጽ አስቀድሞ ስለ ኖረ የዚህ �ይይት ገጽ ሊዛወር አ�ተቻለ�� እባክዎ� በእጅ ያጋጥሙአቸ��'''",
+'movedto'                   => 'የተዛወረ ወደ',
+'movetalk'                  => 'ከተቻለ� ከ��ይይቱ ገጽ ጋራ ይዛወር',
+'move-subpages'             => 'ንዑስ ገጾች ደ�ሞ ይዛወሩ',
+'move-talk-subpages'        => 'የ�ይይቱ ገጽ ንዑስ ገጾች ደ�ሞ ይዛወሩ',
+'movepage-page-moved'       => 'ገጹ $1 ወደ $2 ተዛ�ሯ��',
+'movepage-page-unmoved'     => 'ገጹ $1 ወደ $2 ሊዛወር አ�ተቻለ��',
+'1movedto2'                 => '«$1» ወደ «[[$2]]» አዛወረ',
+'1movedto2_redir'           => '«$1» ወደ «[[$2]]» አዛወረ -- በመ�ሪያ መንገድ �ንታ',
+'move-redirect-suppressed'  => 'መ�ሪያ መንገድ ተከለከለ',
+'movelogpage'               => 'የማዛወር መ�ገብ',
+'movelogpagetext'           => 'ይህ መ�ገብ ገጽ ሲዛወር ይመ�ገባ�� <ይመለስ> ቢጫኑ ኖሮ መዛወሩን ይገለብጣ�!',
+'movereason'                => '�ክንያት',
+'revertmove'                => 'ይመለስ',
+'delete_and_move'           => 'ማጥ�ትና ማዛወር',
+'delete_and_move_text'      => '==ማጥ�ት ያስ��ጋ�==
 
 መድረሻ� ገጽ ሥ�ራ «[[:$1]]» የሚለ� ገጽ አ�ን ይኖራ�� ሌላ� ገጽ ወደዚያ እንዲዛወር እሱን ለማጥ�ት ይወድዳሉ?',
-'delete_and_move_confirm' => 'አዎን� ገጹ ይጥ�',
-'delete_and_move_reason'  => 'ለመዛወሩ ሥ�ራ እንዲገ� ጠ�',
-'selfmove'                => 'የመ�ሻ እና የመድረሻ አርዕስቶች አንድ ናቸ�� ገጽ ወደ ራሱ ለማዛወር አይቻ���',
-'immobile_namespace'      => 'የመ�ሻ ወይ� የመድረሻ አርእስት �ዩ አይ�ት ��� ከዚያ� ወይ� ወደዚያ� ክ�ለ-ዊኪ ገጽ ማዛወር አይቻ���',
+'delete_and_move_confirm'   => 'አዎን� ገጹ ይጥ�',
+'delete_and_move_reason'    => 'ለመዛወሩ ሥ�ራ እንዲገ� ጠ�',
+'selfmove'                  => 'የመ�ሻ እና የመድረሻ አርዕስቶች አንድ ናቸ�� ገጽ ወደ ራሱ ለማዛወር አይቻ���',
+'immobile-source-namespace' => 'በክ�ለ-ዊኪ "$1" ያሉት ገጾች ማዛወር አይቻ���',
+'immobile-target-namespace' => 'ገጾችን ወደ በክ�ለ-ዊኪ "$1" ማዛወር አይቻ���',
+'immobile-source-page'      => 'ይህ ገጽ የማይዛወር አይ�ት ���',
+'immobile-target-page'      => 'ወደዚያ� መድረሻ አርዕስት ማዛወር አይቻ���',
+'imagenocrossnamespace'     => '�ይ�ን ወደ ሌላ አይ�ት ክ�ለ-ዊኪ ማዛወር አይቻ���',
+'imageinvalidfilename'      => 'የመድረሻ �ይ� ስ� �ክ አይደለ��',
+'fix-double-redirects'      => 'ወደ ቀደመ� አርዕስት የሚወስዱ መ�ሪያ መንገዶች ካሉ በቀጥታ ይታደሱ',
+'move-leave-redirect'       => 'መ�ሪያ መንገድ ይኖር�',
 
 # Export
 'export'            => 'ገጾች ወደ ሌላ ዊኪ ለመላክ',
@@ -1539,7 +1752,7 @@ $1',
 'allmessagesdefault'        => 'የቆየ� ጽሕ�ት',
 'allmessagescurrent'        => 'ያ�ኑ ጽሕ�ት',
 'allmessagestext'           => 'በ«MediaWiki» ክ�ለ-ዊኪ ያሉት የድረገጽ መ�ክ መ�እክቶች ሙሉ �ር�ር ይህ ���
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''\$wgUseDatabaseMessages''' ስለ ተዘጋ '''{{ns:special}}:Allmessages''' ሊጠቀ� አይች���",
 'allmessagesfilter'         => 'የመ�ዕክት ስ� ማጣሪያ�',
 'allmessagesmodified'       => 'የተቀየሩ ብቻ ይታዩ',
@@ -1551,19 +1764,24 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'thumbnail_invalid_params' => 'ትክክለኛ ያ�ሆ� የናሙና �ቤት',
 
 # Special:Import
-'import'                   => 'ገጾች ከሌላ ዊኪ ለማስገባት',
-'importinterwiki'          => 'ከሌላ ዊኪ ማስገባት',
-'import-interwiki-history' => 'ለዚህ ገጽ የታሪክ ዕትሞች �ሉ ለመቅዳት',
-'import-interwiki-submit'  => 'ለማስገባት',
-'import-revision-count'    => '$1 {{PLURAL:$1|ዕት�|ዕትሞች}}',
-'importnopages'            => 'ለማስገባት �ን� ገጽ የለ��',
-'importfailed'             => 'ማስገባቱ አ�ተከናወ��� <nowiki>$1</nowiki>',
-'importunknownsource'      => 'ያ�ታወቀ የማስገባት መ�ሻ አይ�ት',
-'importcantopen'           => 'የማስገባት �ይ� መክ�ት አ�ተቻለ�',
-'importnotext'             => 'ባዶ ወይ� ጽሕ�ት የለ�',
-'importsuccess'            => 'ማስገባቱ ጨረሰ!',
-'import-noarticle'         => 'ለማስገባት �ን� ገጽ የለ�!',
-'import-nonewrevisions'    => 'ዕትሞቹ �ሉ ከዚህ በ�ት ገብተዋ�',
+'import'                     => 'ገጾች ከሌላ ዊኪ ለማስገባት',
+'importinterwiki'            => 'ከሌላ ዊኪ ማስገባት',
+'import-interwiki-source'    => 'መ�ሻ ዊኪ/ገጽ:',
+'import-interwiki-history'   => 'ለዚህ ገጽ የታሪክ ዕትሞች �ሉ ለመቅዳት',
+'import-interwiki-submit'    => 'ለማስገባት',
+'import-interwiki-namespace' => 'መድረሻ ክ�ለ-ዊኪ:',
+'import-upload-filename'     => 'የ�ይሉ ስ��',
+'import-comment'             => 'ማጠቃለያ�',
+'importstart'                => 'ገጾችን በማስገባት ላይ ��...',
+'import-revision-count'      => '$1 {{PLURAL:$1|ዕት�|ዕትሞች}}',
+'importnopages'              => 'ለማስገባት �ን� ገጽ የለ��',
+'importfailed'               => 'ማስገባቱ አ�ተከናወ��� <nowiki>$1</nowiki>',
+'importunknownsource'        => 'ያ�ታወቀ የማስገባት መ�ሻ አይ�ት',
+'importcantopen'             => 'የማስገባት �ይ� መክ�ት አ�ተቻለ�',
+'importnotext'               => 'ባዶ ወይ� ጽሕ�ት የለ�',
+'importsuccess'              => 'ማስገባቱ ጨረሰ!',
+'import-noarticle'           => 'ለማስገባት �ን� ገጽ የለ�!',
+'import-nonewrevisions'      => 'ዕትሞቹ �ሉ ከዚህ በ�ት ገብተዋ�',
 
 # Import log
 'importlogpage'                    => 'የገጽ ማስገባት መ�ገብ',
@@ -1630,6 +1848,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-watch'                   => 'ይህንን ገጽ ወደተከታተሉት ገጾች �ር�ር ለመጨ�ር',
 'tooltip-recreate'                => 'ገጹ የጠ� ሆኖ� እንደገና ለመ�ጠር',
 'tooltip-upload'                  => 'ለመጀመር ይጫኑ',
+'tooltip-rollback'                => 'ROLLBACK የመጨረሻ�ን አዛጋጅ ለ�ጦች በ�ጥ�ት ይገ�በጣ��',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF metadata ለዚህ ሰርቨር እንደማይሠራ ተደርጓ��',
@@ -1690,7 +1909,7 @@ $1',
 
 # Browsing diffs
 'previousdiff' => '� የ�ተኛ� ለ�ጥ',
-'nextdiff'     => 'የሚከተለ� ለ�ጥ →',
+'nextdiff'     => 'የሚቀጥለ� ለ�ጥ →',
 
 # Media information
 'imagemaxsize'         => 'በ�ይ� መ�ለጫ ገጽ ላይ የስዕ� መጠን ወሰን ቢበዛ�',
@@ -1703,7 +1922,7 @@ $1',
 'show-big-image'       => 'በሙሉ ጒ�ህ�ት ለመመ�ከት',
 'show-big-image-thumb' => '<small>የዚህ ናሙና ቅጂ ክ��� $1 × $2 �ክሰ�</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'የአዳዲስ ሥዕሎች ማሳያ አዳራሽ',
 'imagelisttext'         => '$1 የተጨመሩ ሥእሎች ወይ� �ይሎች ከታች ይዘረ�ራሉ ($2)�',
 'showhidebots'          => '(«bots» $1)',
@@ -1882,6 +2101,7 @@ $1',
 
 'exif-exposuremode-0' => 'የቀጥታ ማንሣት',
 'exif-exposuremode-1' => 'በዕጅ ማንሣት',
+'exif-exposuremode-2' => 'ቀጥተኛ ቅን�',
 
 'exif-whitebalance-0' => 'የቀጥታ �ጭ �ንባሌ',
 'exif-whitebalance-1' => 'በእጅ የተደረገ �ጭ �ንባሌ',
@@ -1939,21 +2159,21 @@ $1',
 'monthsall'        => '�ሉ',
 
 # E-mail address confirmation
-'confirmemail'            => 'ኢ-ሜ�ዎን ለማረጋገጥ',
-'confirmemail_noemail'    => 'በ[[Special:Preferences|�ርጫዎችዎ]] ትክክለኛ ኢሜ� አድራሻ አ�ሰጡ��',
-'confirmemail_text'       => 'አ�ን በ{{SITENAME}} በኩ� «ኢ-ሜ�» ለመላክ� ሆ� ለመቀበ� አድራሻዎን ማረጋገጥ �ዴታ ሆኗ�� እታች ያለ�ን በተጫኑ ጊዜ አንድ የማረጋገጫ መ�እክት ቀድሞ ወደ ሰጡት ኢሜ� አድራሻ በቀጥታ ይላካ�� በዚህ መ�እክት �ዩ ኮድ ያለበት መያያዣ ይገ�በታ�� ይህንን መያያዣ ከዚያ ቢጎብኙ ኢ-ሜ� አድራሻዎ የዛኔ ይረጋ�ጣ��',
-'confirmemail_pending'    => '<div class="error">ማረጋገጫ ኮድ ከዚህ በ�ት ገና ተ�ኮ�ዎታ�� ብዕር ስ�ዎን ያወጡ በቅርብ ጊዜ ከሆ�� አዲስ ኮድን ከመጠይቅ በ�ት �ና�ባት የተላከ� እስከሚደርስ ድረስ ጥቂት ደቂቃ መቆየት ይሻላ��</div>',
-'confirmemail_send'       => 'የማረጋገጫ ኮድ ወደኔ ኢ-ሜ� ይላክ��',
-'confirmemail_sent'       => 'የማረጋገጫ ኢ-ሜ� ቅድ� ወደ ሰጡት አድራሻ አ�ን ተ�ኳ�!',
-'confirmemail_oncreate'   => 'ማረጋገጫ ኮድ ወደ ኢ-ሜ� አድራሻዎ ተ�ኳ�� ይኸ� ኮድ ለመ�ባት አያስ����� �ገር �ን የዊኪ� ኢ-ሜ� ተ�ባር እንዲሠራ ለማድረ� ያስ��ጋ��',
-'confirmemail_sendfailed' => 'ወደሰጡት ኢሜ� አድራሻ መላክ አ�ተቻለ�� እባክዎ� ወደ [[Special:Preferences|«�ርጫዎች»]] ተመ�ሰ� የጻ�ትን አድራሻ ደንበኛ�ት ይመለከቱ�',
-'confirmemail_invalid'    => 'ይህ ኮድ አ�ተከናወ��� (�ና�ባት ጊዜ� አ����) እንደገና ይሞክሩ!',
-'confirmemail_needlogin'  => 'ኢሜ� አድራሻዎን ለማረጋገጥ $1 ያስ���ዎታ��',
-'confirmemail_success'    => 'እ-ሜ� አድራሻዎ ተረጋ�ጧ�� አ�ን ገብተ� ዊኪ�ን መጠቀ� ይችላሉ�',
-'confirmemail_loggedin'   => 'የርስዎ ኢ-ሜ� አድራሻ ተረጋ�ጧ�� አ�ን ኢ-ሜ� በ{{SITENAME}} በኩ� ለመላክ ወይ� ለመቀበ� ይችላሉ�',
-'confirmemail_error'      => 'ማረጋገጫዎን በመቆጠብ አንድ ች�ር ተ�ሣ�',
-'confirmemail_subject'    => '{{SITENAME}} email address confirmation / እ-ሜ� አድራሻ ማረጋገጫ',
-'confirmemail_body'       => 'ጤና ይስጥ��
+'confirmemail'             => 'ኢ-ሜ�ዎን ለማረጋገጥ',
+'confirmemail_noemail'     => 'በ[[Special:Preferences|�ርጫዎችዎ]] ትክክለኛ ኢሜ� አድራሻ አ�ሰጡ��',
+'confirmemail_text'        => 'አ�ን በ{{SITENAME}} በኩ� «ኢ-ሜ�» ለመላክ� ሆ� ለመቀበ� አድራሻዎን ማረጋገጥ �ዴታ ሆኗ�� እታች ያለ�ን በተጫኑ ጊዜ አንድ የማረጋገጫ መ�እክት ቀድሞ ወደ ሰጡት ኢሜ� አድራሻ በቀጥታ ይላካ�� በዚህ መ�እክት �ዩ ኮድ ያለበት መያያዣ ይገ�በታ�� ይህንን መያያዣ ከዚያ ቢጎብኙ ኢ-ሜ� አድራሻዎ የዛኔ ይረጋ�ጣ��',
+'confirmemail_pending'     => '<div class="error">ማረጋገጫ ኮድ ከዚህ በ�ት ገና ተ�ኮ�ዎታ�� ብዕር ስ�ዎን ያወጡ በቅርብ ጊዜ ከሆ�� አዲስ ኮድን ከመጠይቅ በ�ት �ና�ባት የተላከ� እስከሚደርስ ድረስ ጥቂት ደቂቃ መቆየት ይሻላ��</div>',
+'confirmemail_send'        => 'የማረጋገጫ ኮድ ወደኔ ኢ-ሜ� ይላክ��',
+'confirmemail_sent'        => 'የማረጋገጫ ኢ-ሜ� ቅድ� ወደ ሰጡት አድራሻ አ�ን ተ�ኳ�!',
+'confirmemail_oncreate'    => 'ማረጋገጫ ኮድ ወደ ኢ-ሜ� አድራሻዎ ተ�ኳ�� ይኸ� ኮድ ለመ�ባት አያስ����� �ገር �ን የዊኪ� ኢ-ሜ� ተ�ባር እንዲሠራ ለማድረ� ያስ��ጋ��',
+'confirmemail_sendfailed'  => 'ወደሰጡት ኢሜ� አድራሻ መላክ አ�ተቻለ�� እባክዎ� ወደ [[Special:Preferences|«�ርጫዎች»]] ተመ�ሰ� የጻ�ትን አድራሻ ደንበኛ�ት ይመለከቱ�',
+'confirmemail_invalid'     => 'ይህ ኮድ አ�ተከናወ��� (�ና�ባት ጊዜ� አ����) እንደገና ይሞክሩ!',
+'confirmemail_needlogin'   => 'ኢሜ� አድራሻዎን ለማረጋገጥ $1 ያስ���ዎታ��',
+'confirmemail_success'     => 'እ-ሜ� አድራሻዎ ተረጋ�ጧ�� አ�ን ገብተ� ዊኪ�ን መጠቀ� ይችላሉ�',
+'confirmemail_loggedin'    => 'የርስዎ ኢ-ሜ� አድራሻ ተረጋ�ጧ�� አ�ን ኢ-ሜ� በ{{SITENAME}} በኩ� ለመላክ ወይ� ለመቀበ� ይችላሉ�',
+'confirmemail_error'       => 'ማረጋገጫዎን በመቆጠብ አንድ ች�ር ተ�ሣ�',
+'confirmemail_subject'     => '{{SITENAME}} email address confirmation / እ-ሜ� አድራሻ ማረጋገጫ',
+'confirmemail_body'        => 'ጤና ይስጥ��
 
 የርስዎ ኢ-ሜ� አድራሻ በ$1 ለ{{SITENAME}} ብዕር ስ� «$2» ቀርቧ�� 
 
@@ -1964,6 +2184,8 @@ $3
 ይህ �ና�ባት እርስዎ ካ�ሆኑ� መያያዣ�ን አይከተሉ� 
 
 የዚህ መያያዣ� ኮድ እስከ $4 ድረስ ይሠራ��',
+'confirmemail_invalidated' => 'የኢ-ሜ� አድራሻ ማረጋገጫ ተሠረዘ�',
+'invalidateemail'          => 'የኢ-ሜ� ማረጋገጫ መሠረ�',
 
 # Scary transclusion
 'scarytranscludetoolong' => '[URL ከመጠን በላይ የረዘመ ��]',
@@ -1972,32 +2194,21 @@ $3
 'trackbackremove' => ' ([$1 ማጥ�ት])',
 
 # Delete conflict
-'deletedwhileediting' => 'ማስጠንቀቂያ� መዘጋጀት ከጀመሩ በኋላ ገጹ ጠ�ቷ�!',
+'deletedwhileediting' => "'''ማስጠንቀቂያ'''� መዘጋጀት ከጀመሩ በኋላ ገጹ ጠ�ቷ�!",
 'confirmrecreate'     => "መዘጋጀት ከጀመሩ በኋላ� ተጠቃሚ� [[User:$1|$1]] ([[User talk:$1|�ይይት]]) ገጹን አጠ�ተ� ይህን �ክንያት አቀረቡ�
 : ''$2''
 እባክዎ ገጹን እንደገና ለመ�ጠር በ�ኑ እንደ �ለጉ ያረጋ�ጡ�",
 'recreate'            => 'እንደገና ይ�ጠር',
 
-# HTML dump
-'redirectingto' => 'ወደ [[:$1]] መ�ሪያ መንገድ ማድረ�...',
-
 # action=purge
-'confirm_purge'        => 'የዚ� ገጽ ካሽ (cache) ይጠረ�?
-
-$1',
 'confirm_purge_button' => 'እሺ',
-
-# AJAX search
-'searchcontaining' => "''$1'' ላለባቸ� ገጾች ለመ����",
-'searchnamed'      => "''$1'' ለተባሉት ገጾች ለመ����",
-'articletitles'    => "በ''$1'' የሚጀመሩ ገጾች�",
-'hideresults'      => '�ጤቶች ለመደብቅ',
-'useajaxsearch'    => 'የAJAX �ለጋ ይጠቀ�',
+'confirm-purge-top'    => 'የዚ� ገጽ ካሽ (cache) ይጠረ�?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� �ተኛ� ገጽ',
 'imgmultipagenext' => 'የሚቀጥለ� ገጽ →',
 'imgmultigo'       => 'ሂድ!',
+'imgmultigoto'     => 'ወደ ገጽ# $1 ለመሄድ',
 
 # Table pager
 'table_pager_next'         => 'ቀጥሎ ገጽ',
@@ -2080,13 +2291,25 @@ $1',
 'filepath-summary' => 'ይህ �ዩ ገጽ ለ1 �ይ� ሙሉ መንገድ ይሰጣ��<br />
 ስዕ� በሙሉ ማጉላት ይታያ�� ሌላ አይ�ት �ይ� በሚገባ� �ሮ�ራ� በቀጥታ ይጀመራ��
 
-የ�ይሉ ስ� («{{ns:image}}:» የሚለ� ባዕድ መ�ሻ ሳይኖር) ከዚህ ታች ይ�ባ�',
+የ�ይሉ ስ� («{{ns:file}}:» የሚለ� ባዕድ መ�ሻ ሳይኖር) ከዚህ ታች ይ�ባ�',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch'          => 'ለቅጂ �ይሎች መ���',
+'fileduplicatesearch-legend'   => 'ለቅጂ ለመ���',
+'fileduplicatesearch-filename' => 'የ�ይ� ስ�:',
+'fileduplicatesearch-submit'   => '�ለጋ',
 
 # Special:SpecialPages
-'specialpages'               => '�ዩ ገጾች',
-'specialpages-group-other'   => 'ሌሎች �ዩ ገጾች',
-'specialpages-group-login'   => 'መ�ቢያ',
-'specialpages-group-changes' => 'የቅርቡ ለ�ጦችና መ�ገቦች',
-'specialpages-group-users'   => 'አባሎችና መብቶች',
+'specialpages'                 => '�ዩ ገጾች',
+'specialpages-group-other'     => 'ሌሎች �ዩ ገጾች',
+'specialpages-group-login'     => 'መ�ቢያ',
+'specialpages-group-changes'   => 'የቅርቡ ለ�ጦችና መ�ገቦች',
+'specialpages-group-users'     => 'አባሎችና መብቶች',
+'specialpages-group-highuse'   => 'ከ�ተኛ ጥቅ� ያላቸ� ገጾች',
+'specialpages-group-pagetools' => 'የገጽ መሣሪያዎች',
+'specialpages-group-wiki'      => 'የዊኪ መረጃና መሣርያዎች',
+
+# Special:BlankPage
+'blankpage' => 'ባዶ ገጽ',
 
 );
diff --git a/languages/messages/MessagesAn.php b/languages/messages/MessagesAn.php
index cdc7501f..40389ffa 100644
--- a/languages/messages/MessagesAn.php
+++ b/languages/messages/MessagesAn.php
@@ -13,13 +13,6 @@
 
 $fallback = 'es';
 
-$skinNames = array(
-	'standard'    => 'Clasica (Classic)',
-	'nostalgia'   => 'Recosiros (Nostalgia)',
-	'cologneblue' => 'Colonia Azul (Cologne Blue)',
-	'myskin'      => 'A mía aparenzia (MySkin)',
-	'simple'      => 'Simpla (Simple)',
-);
 
 $namespaceNames = array(
 	NS_MEDIA          => 'Media',
@@ -30,8 +23,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Descusión_usuario',
 	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => 'Descusión_$1',
-	NS_IMAGE          => 'Imachen',
-	NS_IMAGE_TALK     => 'Descusión_imachen',
+	NS_FILE           => 'Imachen',
+	NS_FILE_TALK      => 'Descusión_imachen',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Descusión_MediaWiki',
 	NS_TEMPLATE       => 'Plantilla',
@@ -56,60 +49,70 @@ $magicWords = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Reendrezeras_dobles', 'Dobles_reendrezeras', 'Endrezeras_dobles', 'Dobles_endrezeras' ),
-	'BrokenRedirects'           => array( 'Reendrezeras_trencatas', 'Endrezeras_trencatas', 'Reendrezeras_crebatas', 'Endrezeras_crebatas', 'Endrezeras_trencadas', 'Endrezeras_crebadas' ),
-	'Disambiguations'           => array( 'Desambigazions', 'Pachinas_de_desambigazión' ),
-	'Userlogin'                 => array( 'Enzetar_sesión', 'Dentrar' ),
-	'Userlogout'                => array( 'Salir', 'Rematar_sesión' ),
+	'DoubleRedirects'           => array( 'Reendrezeras dobles', 'Dobles reendrezeras', 'Endrezeras dobles', 'Dobles endrezeras' ),
+	'BrokenRedirects'           => array( 'Reendrezeras trencatas', 'Endrezeras trencatas', 'Reendrezeras crebatas', 'Endrezeras crebatas', 'Endrezeras trencadas', 'Endrezeras crebadas' ),
+	'Disambiguations'           => array( 'Desambigazions', 'Pachinas de desambigazión' ),
+	'Userlogin'                 => array( 'Enzetar sesión', 'Dentrar' ),
+	'Userlogout'                => array( 'Salir', 'Rematar sesión' ),
+	'CreateAccount'             => array( 'Creyar cuenta' ),
 	'Preferences'               => array( 'Preferenzias' ),
-	'Watchlist'                 => array( 'Lista_de_seguimiento' ),
-	'Recentchanges'             => array( 'Zaguers_cambeos', 'cambeos_rezients' ),
+	'Watchlist'                 => array( 'Lista de seguimiento' ),
+	'Recentchanges'             => array( 'Zaguers cambeos', 'cambeos rezients' ),
 	'Upload'                    => array( 'Cargar', 'Puyar' ),
-	'Imagelist'                 => array( 'Lista_d\'imáchens', 'Lista_d\'imachens' ),
-	'Listusers'                 => array( 'Lista_d\'usuarios' ),
+	'Listfiles'                 => array( 'Lista d\'imáchens', 'Lista d\'imachens' ),
+	'Newimages'                 => array( 'Nuebas imáchens', 'Nuebas imachens' ),
+	'Listusers'                 => array( 'Lista d\'usuarios' ),
+	'Listgrouprights'           => array( 'Lis' ),
 	'Statistics'                => array( 'Estadistica', 'Estatistica', 'Estadisticas', 'Estatisticas' ),
-	'Randompage'                => array( 'Pachina_aleatoria', 'Pachina_aliatoria', 'Pachina_á_l\'azar' ),
-	'Lonelypages'               => array( 'Pachinas_popiellas' ),
-	'Uncategorizedpages'        => array( 'Pachinas_sin_categorías', 'Pachinas_sin_categorizar' ),
-	'Uncategorizedcategories'   => array( 'Categorías_sin_categorías', 'Categorías_sin_categorizar' ),
-	'Uncategorizedimages'       => array( 'Imáchens_sin_categorías', 'Imáchens_sin_categorías', 'Imachens_sin_categorizar', 'Imáchens_sin_categorizar' ),
-	'Uncategorizedtemplates'    => array( 'Plantillas_sin_categorías', 'Plantillas_sin_categorizar' ),
-	'Unusedcategories'          => array( 'Categorías_no_emplegatas', 'Categorías_sin_emplegar' ),
-	'Unusedimages'              => array( 'Imáchens_no_emplegatas', 'Imáchens_sin_emplegar' ),
-	'Wantedpages'               => array( 'Pachinas_requiestas', 'Pachinas_demandatas', 'Binclos_crebatos', 'Binclos_trencatos' ),
-	'Wantedcategories'          => array( 'Categorías_requiestas', 'Categorías_demandatas' ),
-	'Mostlinked'                => array( 'Pachinas_más_enlazatas', 'Pachinas_más_binculatas' ),
-	'Mostlinkedcategories'      => array( 'Categorías_más_enlazatas', 'Categorías_más_binculatas' ),
-	'Mostlinkedtemplates'       => array( 'Plantillas_más_enlazatas', 'Plantillas_más_binculatas' ),
-	'Mostcategories'            => array( 'Pachinas_con_más_categorías' ),
-	'Mostimages'                => array( 'Imáchens_más_emplegatas', 'Imachens_más_emplegatas' ),
-	'Mostrevisions'             => array( 'Pachinas_con_más_edizions', 'Pachinas_más_editatas', 'Pachinas_con_más_bersions' ),
-	'Fewestrevisions'           => array( 'Pachinas_con_menos_edizions', 'Pachinas_menos_editatas', 'Pachinas_con_menos_bersions' ),
-	'Shortpages'                => array( 'Pachinas_más_cortas' ),
-	'Longpages'                 => array( 'Pachinas_más_largas' ),
-	'Newpages'                  => array( 'Pachinas_nuebas', 'Pachinas_más_nuebas', 'Pachinas_más_rezients', 'Pachinas_rezients' ),
-	'Ancientpages'              => array( 'Pachinas_más_biellas', 'Pachinas_biellas', 'Pachinas_más_antigas', 'Pachinas_antigas' ),
-	'Deadendpages'              => array( 'Pachinas_sin_salida', 'Pachinas_sin_de_salida' ),
-	'Protectedpages'            => array( 'Pachinas_protechitas', 'Pachinas_protechitas', 'Pachinas_protechidas' ),
-	'Protectedtitles'           => array( 'Títols_protechitos', 'Títols_protexitos', 'Títols_protechius' ),
-	'Allpages'                  => array( 'Todas_as_pachinas' ),
-	'Prefixindex'               => array( 'Pachinas_por_prefixo', 'Mirar_por_prefixo' ),
-	'Ipblocklist'               => array( 'Lista_d\'IPs_bloqueyatas', 'Lista_d\'IPs_bloquiatas', 'Lista_d\'adrezas_IP_bloqueyatas', 'Lista_d\'adrezas_IP_bloquiatas' ),
-	'Specialpages'              => array( 'Pachinas_espezials' ),
+	'Randompage'                => array( 'Pachina aleatoria', 'Pachina aliatoria', 'Pachina á l\'azar' ),
+	'Lonelypages'               => array( 'Pachinas popiellas' ),
+	'Uncategorizedpages'        => array( 'Pachinas sin categorías', 'Pachinas sin categorizar' ),
+	'Uncategorizedcategories'   => array( 'Categorías sin categorías', 'Categorías sin categorizar' ),
+	'Uncategorizedimages'       => array( 'Imáchens sin categorías', 'Imachens sin categorizar', 'Imáchens sin categorizar' ),
+	'Uncategorizedtemplates'    => array( 'Plantillas sin categorías', 'Plantillas sin categorizar' ),
+	'Unusedcategories'          => array( 'Categorías no emplegatas', 'Categorías sin emplegar' ),
+	'Unusedimages'              => array( 'Imáchens no emplegatas', 'Imáchens sin emplegar' ),
+	'Wantedpages'               => array( 'Pachinas requiestas', 'Pachinas demandatas', 'Binclos crebatos', 'Binclos trencatos' ),
+	'Wantedcategories'          => array( 'Categorías requiestas', 'Categorías demandatas' ),
+	'Wantedfiles'               => array( 'Archibos requiestos', 'Archibos demandatos' ),
+	'Wantedtemplates'           => array( 'Plantillas requiestas', 'Plantillas demandatas' ),
+	'Mostlinked'                => array( 'Pachinas más enlazatas', 'Pachinas más binculatas' ),
+	'Mostlinkedcategories'      => array( 'Categorías más enlazatas', 'Categorías más binculatas' ),
+	'Mostlinkedtemplates'       => array( 'Plantillas más enlazatas', 'Plantillas más binculatas' ),
+	'Mostcategories'            => array( 'Pachinas con más categorías' ),
+	'Mostimages'                => array( 'Imáchens más emplegatas', 'Imachens más emplegatas' ),
+	'Mostrevisions'             => array( 'Pachinas con más edizions', 'Pachinas más editatas', 'Pachinas con más bersions' ),
+	'Fewestrevisions'           => array( 'Pachinas con menos edizions', 'Pachinas menos editatas', 'Pachinas con menos bersions' ),
+	'Shortpages'                => array( 'Pachinas más cortas' ),
+	'Longpages'                 => array( 'Pachinas más largas' ),
+	'Newpages'                  => array( 'Pachinas nuebas', 'Pachinas más nuebas', 'Pachinas más rezients', 'Pachinas rezients' ),
+	'Ancientpages'              => array( 'Pachinas más biellas', 'Pachinas biellas', 'Pachinas más antigas', 'Pachinas antigas' ),
+	'Deadendpages'              => array( 'Pachinas sin salida', 'Pachinas sin de salida' ),
+	'Protectedpages'            => array( 'Pachinas protechitas', 'Pachinas protechidas' ),
+	'Protectedtitles'           => array( 'Títols protechitos', 'Títols protexitos', 'Títols protechius' ),
+	'Allpages'                  => array( 'Todas as pachinas' ),
+	'Prefixindex'               => array( 'Pachinas por prefixo', 'Mirar por prefixo' ),
+	'Ipblocklist'               => array( 'Lista d\'IPs bloqueyatas', 'Lista d\'IPs bloquiatas', 'Lista d\'adrezas IP bloqueyatas', 'Lista d\'adrezas IP bloquiatas' ),
+	'Specialpages'              => array( 'Pachinas espezials' ),
 	'Contributions'             => array( 'Contrebuzions' ),
-	'Emailuser'                 => array( 'Nimbía_mensache' ),
-	'Movepage'                  => array( 'Renombrar_pachina', 'Mober_pachina', 'Tresladar_pachina' ),
+	'Emailuser'                 => array( 'Nimbía mensache' ),
+	'Confirmemail'              => array( 'Confirmar e-mail' ),
+	'Movepage'                  => array( 'Renombrar pachina', 'Mober pachina', 'Tresladar pachina' ),
 	'Categories'                => array( 'Categorías' ),
 	'Export'                    => array( 'Esportar' ),
 	'Version'                   => array( 'Bersión' ),
-	'Allmessages'               => array( 'Toz_os_mensaches' ),
+	'Allmessages'               => array( 'Toz os mensaches' ),
+	'Log'                       => array( 'Rechistro', 'Rechistros' ),
+	'Blockip'                   => array( 'Bloqueyar' ),
+	'Undelete'                  => array( 'Restaurar' ),
 	'Import'                    => array( 'Importar' ),
-	'Mypage'                    => array( 'A_mía_pachina', 'A_mía_pachina_d\'usuario' ),
-	'Mytalk'                    => array( 'A_mía_descusión', 'A_mía_pachina_de_descusión' ),
-	'Mycontributions'           => array( 'As_mías_contrebuzions' ),
-	'Listadmins'                => array( 'Lista_d\'almenistradors' ),
-	'Listbots'                  => array( 'Lista_de_bots' ),
-	'Popularpages'              => array( 'Pachinas_populars', 'Pachinas_más_populars' ),
+	'Unwatchedpages'            => array( 'Pachinas no cosiratas', 'Pachinas sin cosirar' ),
+	'Mypage'                    => array( 'A mía pachina', 'A mía pachina d\'usuario' ),
+	'Mytalk'                    => array( 'A mía descusión', 'A mía pachina de descusión' ),
+	'Mycontributions'           => array( 'As mías contrebuzions' ),
+	'Listadmins'                => array( 'Lista d\'almenistradors' ),
+	'Listbots'                  => array( 'Lista de bots' ),
+	'Popularpages'              => array( 'Pachinas populars', 'Pachinas más populars' ),
 	'Search'                    => array( 'Mirar' ),
 );
 
@@ -151,17 +154,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Amagar as mías edizions en a lista de seguimiento',
 'tog-watchlisthidebots'       => 'Amagar edizions de bots en a lista de seguimiento',
 'tog-watchlisthideminor'      => 'Amagar edizions menors en a lista de seguimiento',
+'tog-watchlisthideliu'        => 'Amagar en a lista de seguimiento as edizions feitas por usuarios rechistratos',
+'tog-watchlisthideanons'      => 'Amagar en a lista de seguimiento as edizions feitas por usuarios anonimos.',
 'tog-nolangconversion'        => 'Desautibar conversión de bariants',
 'tog-ccmeonemails'            => 'Rezibir copias de os correus que nimbío ta atros usuarios',
 'tog-diffonly'                => "No amostrar o conteniu d'a pachina debaxo d'as esferenzias",
 'tog-showhiddencats'          => 'Amostrar categorías amagatas',
+'tog-norollbackdiff'          => 'No amostrar as diferenzias dimpués de rebertir',
 
 'underline-always'  => 'Siempre',
 'underline-never'   => 'Nunca',
 'underline-default' => "Confegurazión por defeuto d'o nabegador",
 
-'skinpreview' => '(Fer una prebatina)',
-
 # Dates
 'sunday'        => 'domingo',
 'monday'        => 'luns',
@@ -255,7 +259,7 @@ $messages = array(
 'mytalk'         => 'Pachina de descusión',
 'anontalk'       => "Pachina de descusión d'ista IP",
 'navigation'     => 'Nabego',
-'and'            => 'y',
+'and'            => '&#32;y',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatos:',
@@ -292,7 +296,7 @@ $messages = array(
 'talkpagelinktext'  => 'Descutir',
 'specialpage'       => 'Pachina Espezial',
 'personaltools'     => 'Ferramientas presonals',
-'postcomment'       => 'Adibir un comentario',
+'postcomment'       => 'Nueba sezión',
 'articlepage'       => "Beyer l'articlo",
 'talk'              => 'Descusión',
 'views'             => 'Bisualizazions',
@@ -318,8 +322,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Informazión sobre {{SITENAME}}',
 'aboutpage'            => 'Project:Sobre',
-'bugreports'           => "Informes d'errors d'o software",
-'bugreportspage'       => "Project:Informes d'errors",
 'copyright'            => 'O conteniu ye disponible baxo a lizenzia $1.',
 'copyrightpagename'    => "Dreitos d'autor de {{SITENAME}}",
 'copyrightpage'        => "{{ns:project}}:Dreitos d'autor",
@@ -342,9 +344,7 @@ $messages = array(
 
 'badaccess'        => 'Error de premisos',
 'badaccess-group0' => "No tiene premisos ta fer l'aizión que ha demandato.",
-'badaccess-group1' => "Ista aizión que ha demandato nomás ye premitita ta os usuarios d'a colla $1.",
-'badaccess-group2' => "Ista aizión nomás ye premitita ta usuarios de beluna d'istas collas: $1.",
-'badaccess-groups' => "L'aizión que ha demandato nomás ye premitita ta os usuarios de beluna d'as collas: $1.",
+'badaccess-groups' => "L'aizión que ha demandato no ye premitita que ta os usuarios {{PLURAL:$2|d'a colla|d'as collas}}: $1.",
 
 'versionrequired'     => 'Cal a bersión $1 de MediaWiki',
 'versionrequiredtext' => 'Cal a bersión $1 de MediaWiki ta fer serbir ista pachina. Ta más informazión, consulte [[Special:Version]]',
@@ -358,6 +358,8 @@ $messages = array(
 'editsection'             => 'editar',
 'editold'                 => 'editar',
 'viewsourceold'           => 'beyer codigo fuent',
+'editlink'                => 'editar',
+'viewsourcelink'          => 'beyer codigo fuent',
 'editsectionhint'         => 'Editar a sezión: $1',
 'toc'                     => 'Contenius',
 'showtoc'                 => 'amostrar',
@@ -372,13 +374,13 @@ $messages = array(
 'site-atom-feed'          => 'Canal Atom $1',
 'page-rss-feed'           => 'Canal RSS "$1"',
 'page-atom-feed'          => 'Canal Atom "$1"',
-'red-link-title'          => '$1 (encara no escrita)',
+'red-link-title'          => '$1 (a pachina no esiste)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pachina',
 'nstab-user'      => "Pachina d'usuario",
 'nstab-media'     => 'Pachina multimedia',
-'nstab-special'   => 'Espezial',
+'nstab-special'   => 'Pachina espezial',
 'nstab-project'   => "Pachina d'o proyeuto",
 'nstab-image'     => 'Imachen',
 'nstab-mediawiki' => 'Mensache',
@@ -388,7 +390,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'No se reconoxe ista aizión',
-'nosuchactiontext'  => "{{SITENAME}} no reconoxe l'aizión espezificata en l'adreza URL",
+'nosuchactiontext'  => "L'azión espezificata por a URL no ye conforme. 
+Talment s'aya entibocau en escribir a URL, u aya seguiu un binclo incorreuto. 
+Tamién podría endicar un bug en o software emplegato por {{SITENAME}}.",
 'nosuchspecialpage' => 'No esiste ixa pachina espezial',
 'nospecialpagetext' => "<big>'''A pachina espezial que ha demandato no esiste.'''</big>
 
@@ -436,7 +440,6 @@ Si no ye iste o caso, puede que aiga trobato un error en o software. Por fabor,
 'cannotdelete'         => "No se podió borrar a pachina u l'archibo espezificato. (Puestar que belatro usuario l'aiga borrato dinantes)",
 'badtitle'             => 'Títol incorreuto',
 'badtitletext'         => "O títol d'a pachina demandata ye buedo, incorreuto, u tiene un binclo interwiki mal feito. Puede contener uno u más carauters que no se pueden fer serbir en títols.",
-'perfdisabled'         => "S'ha desautibato temporalment ista opzión porque fa lenta a base de datos de traza que dengún no puede usar o wiki.",
 'perfcached'           => 'Os datos que siguen son en caché, y podrían no estar esbiellatos:',
 'perfcachedts'         => 'Istos datos se troban en a caché, que estió esbiellata por zaguer begada o $1.',
 'querypage-no-updates' => "S'han desautibato as autualizazions d'ista pachina. Por ixo, no s'esta esbiellando os datos.",
@@ -450,7 +453,7 @@ Consulta: $2',
 'protectedpagetext'    => 'Ista pachina ha estato protechita ta aprebenir a suya edizión.',
 'viewsourcetext'       => "Puede beyer y copiar o codigo fuent d'ista pachina:",
 'protectedinterface'   => "Ista pachina furne o testo d'a interfaz ta o software. Ye protechita ta pribar o bandalismo. Si creye que bi ha bella error, contaute con un almenistrador.",
-'editinginterface'     => "'''Pare cuenta:''' Ye editando una pachina emplegata ta furnir o testo d'a interfaz de {{SITENAME}}. Os cambeos en ista pachina tendrán efeuto en l'aparenzia d'a interfaz ta os atros usuarios. Ta fer traduzions d'a interfaz, puede considerar fer serbir [http://translatewiki.net/wiki/Main_Page?setlang=an Betawiki], o procheuto de localizazión de MediaWiki.",
+'editinginterface'     => "'''Pare cuenta:''' Ye editando una pachina emplegata ta furnir o testo d'a interfaz de {{SITENAME}}. Os cambeos en ista pachina tendrán efeuto en l'aparenzia d'a interfaz ta os atros usuarios. Ta fer traduzions d'a interfaz, puede considerar fer serbir [http://translatewiki.net/wiki/Main_Page?setlang=an translatewiki.net], o procheuto de localizazión de MediaWiki.",
 'sqlhidden'            => '(Consulta SQL amagata)',
 'cascadeprotected'     => 'Ista pachina ye protechita y no se puede editar porque ye encluyita en {{PLURAL:$1|a siguient pachina|as siguients pachinas}}, que son protechitas con a opzión de "cascada": $2',
 'namespaceprotected'   => "No tiene premiso ta editar as pachinas d'o espazio de nombres '''$1'''.",
@@ -460,13 +463,13 @@ Consulta: $2',
 A razón data ye ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Confegurazión incorreuta: rastriador de birus esconoixito: <i>$1</i>',
+'virus-badscanner'     => "Confegurazión incorreuta: rastriador de birus esconoixito: ''$1''",
 'virus-scanfailed'     => 'o rastreyo ha fallato (codigo $1)',
 'virus-unknownscanner' => 'antibirus esconoixito:',
 
 # Login and logout pages
 'logouttitle'                => "Fin d'a sesión",
-'logouttext'                 => "<strong>Ha rematato a sesión.</strong>
+'logouttext'                 => "'''Ha rematato a sesión.'''
 
 Puede continar nabegando por {{SITENAME}} anonimament, u puede [[Special:UserLogin|enzetar]] una nueba sesión con o mesmo nombre d'usuario u unatro diferent. Pare cuenta que, entre que se limpia a caché d'o nabegador, puet estar que bellas pachinas s'amuestren como si encara continase en a sesión anterior.",
 'welcomecreation'            => "== ¡Bienbeniu(da), $1! ==
@@ -479,7 +482,6 @@ No xublide presonalizar [[Special:Preferences|as suyas preferenzias en {{SITENAM
 'remembermypassword'         => "Remerar datos d'usuario entre sesions.",
 'yourdomainname'             => 'Dominio:',
 'externaldberror'            => "Bi abió una error d'autenticazión esterna d'a base de datos u bien no tiene premisos ta esbiellar a suya cuenta esterna.",
-'loginproblem'               => '<b>Escaizió un problema con a suya autenticazión.</b><br />¡Prebe unatra begada!',
 'login'                      => 'Enzetar sesión',
 'nav-login-createaccount'    => 'Enzetar una sesión / creyar cuenta',
 'loginprompt'                => "Ta rechistrar-se en {{SITENAME}} ha d'autibar as cookies en o nabegador.",
@@ -504,7 +506,8 @@ No xublide presonalizar [[Special:Preferences|as suyas preferenzias en {{SITENAM
 'yourvariant'                => 'Modalidat linguistica:',
 'yournick'                   => 'Siñadura:',
 'badsig'                     => 'A suya siñadura no ye conforme; comprebe as etiquetas HTML.',
-'badsiglength'               => 'A siñadura ye masiau larga. No abría de tener más de $1 {{PLURAL:$1|caráuter|caráuters}}.',
+'badsiglength'               => 'A siñadura ye masiau larga. 
+Abría de tener menos de $1 {{PLURAL:$1|caráuter|caráuters}}.',
 'email'                      => 'Adreza de correu-e',
 'prefs-help-realname'        => "* Nombre reyal (opzional): si esliche escribir-lo, se ferá serbir ta l'atribuzión d'a suya faina.",
 'loginerror'                 => 'Error en enzetar a sesión',
@@ -516,6 +519,7 @@ No xublide presonalizar [[Special:Preferences|as suyas preferenzias en {{SITENAM
 'loginsuccesstitle'          => "S'ha identificato correutament",
 'loginsuccess'               => 'Ha enzetato una sesión en {{SITENAME}} como "$1".',
 'nosuchuser'                 => 'No bi ha garra usuario clamato "$1".
+Os nombres d\'usuario son sensibles á las mayusclas.
 Comprebe si ha escrito bien o nombre u [[Special:UserLogin/signup|creye una nueba cuenta d\'usuario]].',
 'nosuchusershort'            => 'No bi ha garra usuario con o nombre "<nowiki>$1</nowiki>". Comprebe si o nombre ye bien escrito.',
 'nouserspecified'            => "Ha d'escribir un nombre d'usuario.",
@@ -536,10 +540,11 @@ Por fabor, identifique-se unatra bez malas que la reculla.',
 'eauthentsent'               => "S'ha nimbiato un correu electronico de confirmazión ta l'adreza espezificata. Antes que no se nimbíe dengún atro correu ta ixa cuenta, ha de confirmar que ixa adreza te pertenexe. Ta ixo, cal que siga as instruzions que trobará en o mensache.",
 'throttled-mailpassword'     => "Ya s'ha nimbiato un correu recordatorio con a suya palabra de paso fa menos de {{PLURAL:$1|1 ora|$1 oras}}. Ta escusar abusos, nomás se nimbia un recordatorio cada {{PLURAL:$1|ora|$1 oras}}.",
 'mailerror'                  => 'Error en nimbiar o correu: $1',
-'acct_creation_throttle_hit' => 'Lo sentimos, ya ha creyato $1 cuentas. No puede creyar más cuentas.',
-'emailauthenticated'         => 'A suya adreza de correu-e estió confirmata o $1.',
+'acct_creation_throttle_hit' => 'Os besitants ta iste wiki dende a suya adreza IP han creyato ya {{PLURAL:$1|1 cuenta|$1 cuentas}} en o zaguer día, o que ye o masimo premitito en iste periodo de tiempo. 
+Por ixo, no se pueden creyar más cuentas por agora dende ixa adreza IP.',
+'emailauthenticated'         => 'A suya adreza de correu-e estió confirmata o $2 á las $3.',
 'emailnotauthenticated'      => "A suya adreza de correu-e <strong> no ye encara confirmata </strong>. No podrá recullir garra correu t'as siguients funzions.",
-'noemailprefs'               => '<strong>Escriba una adreza de correu-e ta autibar istas carauteristicas.</strong>',
+'noemailprefs'               => 'Escriba una adreza de correu-e ta autibar istas carauteristicas.',
 'emailconfirmlink'           => 'Confirme a suya adreza de correu-e',
 'invalidemailaddress'        => "No se puet azeutar l'adreza de correu-e pues pareix que tien un formato no conforme. Escriba una adreza bien formateyata, u deixe buedo ixe campo.",
 'accountcreated'             => 'Cuenta creyata',
@@ -548,18 +553,27 @@ Por fabor, identifique-se unatra bez malas que la reculla.',
 'createaccount-text'         => 'Belún ha creyato una cuenta con o nombre "$2" en {{SITENAME}} ($4), con a palabra de paso "$3" y endicando a suya adreza de correu. Abría de dentrar-ie agora y cambiar a suya palabra de paso.
 
 Si a cuenta s\'ha creyato por error, simplament innore iste mensache.',
+'login-throttled'            => "Ha feito masiadas prebatinas ta enzertar a palabra de paso d'ista cuenta. Por fabor, aspere antes de mirar de fer-lo atra begada.",
 'loginlanguagelabel'         => 'Idioma: $1',
 
 # Password reset dialog
-'resetpass'               => "Restablir a palabra de paso d'a cuenta d'usuario",
-'resetpass_announce'      => 'Ha enzetato una sesión con una palabra de paso temporal que fue nimbiata por correu electronico. Por fabor, escriba aquí una nueba palabra de paso:',
-'resetpass_text'          => '<!-- Adiba aquí o testo -->',
-'resetpass_header'        => "Cambiar a palabra de paso d'a cuenta",
-'resetpass_submit'        => 'Cambiar a palabra de paso e identificar-se',
-'resetpass_success'       => 'A suya palabra de paso ya ye cambiata. Agora ya puede dentrar-ie...',
-'resetpass_bad_temporary' => "A palabra de paso temporal no ye conforme. Puede estar que ya aiga cambiato a suya palabra de paso u que aiga demandato o nimbío d'un atra.",
-'resetpass_forbidden'     => 'No se pueden cambiar as palabras de paso.',
-'resetpass_missing'       => 'No ha escrito datos en o formulario.',
+'resetpass'                 => 'Cambiar a palabra de paso',
+'resetpass_announce'        => 'Ha enzetato una sesión con una palabra de paso temporal que fue nimbiata por correu electronico. Por fabor, escriba aquí una nueba palabra de paso:',
+'resetpass_text'            => '<!-- Adiba aquí o testo -->',
+'resetpass_header'          => "Cambiar a palabra de paso d'a cuenta",
+'oldpassword'               => 'Palabra de paso antiga:',
+'newpassword'               => 'Nueba palabra de paso:',
+'retypenew'                 => 'Torne á escribir a nueba palabra de paso:',
+'resetpass_submit'          => 'Cambiar a palabra de paso e identificar-se',
+'resetpass_success'         => 'A suya palabra de paso ya ye cambiata. Agora ya puede dentrar-ie...',
+'resetpass_bad_temporary'   => "A palabra de paso temporal no ye conforme. Puede estar que ya aiga cambiato a suya palabra de paso u que aiga demandato o nimbío d'un atra.",
+'resetpass_forbidden'       => 'No se pueden cambiar as palabras de paso.',
+'resetpass-no-info'         => 'Debe identificar-se como usuario ta poder azeder dreitament ta ista pachina.',
+'resetpass-submit-loggedin' => 'Cambiar a palabra de paso',
+'resetpass-wrong-oldpass'   => 'A palabra de paso autual u temporal no conforme. 
+
+Puet estar que ya aiga cambeato a suya palabra de paso u aiga demandato una nueba palabra de paso temporal.',
+'resetpass-temp-password'   => 'Palabra de paso temporal:',
 
 # Edit page toolbar
 'bold_sample'     => 'Testo en negreta',
@@ -584,8 +598,8 @@ Si a cuenta s\'ha creyato por error, simplament innore iste mensache.',
 'hr_tip'          => 'Linia orizontal (en faiga un emplego amoderau)',
 
 # Edit pages
-'summary'                          => 'Resumen',
-'subject'                          => 'Tema/títol',
+'summary'                          => 'Resumen:',
+'subject'                          => 'Tema/títol:',
 'minoredit'                        => 'He feito una edizión menor',
 'watchthis'                        => 'Cosirar ista pachina',
 'savearticle'                      => 'Alzar pachina',
@@ -597,8 +611,8 @@ Si a cuenta s\'ha creyato por error, simplament innore iste mensache.',
 'missingsummary'                   => "'''Pare cuenta:''' No ha escrito garra resumen d'edizión. Si fa clic nuebament en «{{MediaWiki:Savearticle}}» a suya edizión se grabará sin resumen.",
 'missingcommenttext'               => 'Por fabor, escriba o testo astí baxo.',
 'missingcommentheader'             => "'''Pare cuenta:''' No ha escrito garra títol ta iste comentario. Si puncha un atra bez en con a rateta en \"Alzar\", a suya edizión se grabará sin títol.",
-'summary-preview'                  => "Beyer ambiesta prebia d'o resumen",
-'subject-preview'                  => "Ambiesta prebia d'o tema/títol",
+'summary-preview'                  => "Beyer ambiesta prebia d'o resumen:",
+'subject-preview'                  => "Ambiesta prebia d'o tema/títol:",
 'blockedtitle'                     => "L'usuario ye bloqueyato",
 'blockedtext'                      => "<big>'''O suyo nombre d'usuario u adreza IP ye bloqueyato.'''</big>
 
@@ -648,28 +662,28 @@ Si bi ha plegau por error, punche o botón d'o suyo nabegador ta tornar entazaga
 'anontalkpagetext'                 => "----''Ista ye a pachina de descusión d'un usuario anonimo que encara no ha creyato una cuenta, u no l'ha feito serbir. Por ixo, emos d'emplegar a suya adreza IP ta identificar-lo/a. 
 Barios usuarios pueden compartir una mesma adreza IP. 
 Si busté ye un usuario anonimo y creye que l'han escrito comentarios no relebants, [[Special:UserLogin/signup|creye una cuenta]] u [[Special:UserLogin/signup|identifique-se]] ta pribar confusions futuras con atros usuarios anonimos.''",
-'noarticletext'                    => 'Por agora no bi ha testo en ista pachina. Puede [[Special:Search/{{PAGENAME}}|mirar o títol]] en atras pachinas u [{{fullurl:{{FULLPAGENAME}}|action=edit}} prenzipiar á escribir en ista pachina].',
+'noarticletext'                    => 'Por agora no bi ha garra testo en ista pachina. Puet [[Special:Search/{{PAGENAME}}|mirar o títol d\'ista pachina]] en atras pachinas, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} mirar os rechistros relazionatos] u [{{fullurl:{{FULLPAGENAME}}|action=edit}} escribir ista pachina].',
 'userpage-userdoesnotexist'        => 'A cuenta d\'usuario "$1" no ye rechistrada. Piense si quiere creyar u editar ista pachina.',
 'clearyourcache'                   => "'''Pare cuenta: Si quiere beyer os cambeos dimpués d'alzar l'archibo, puede estar que tienga que refrescar a caché d'o suyo nabegador ta beyer os cambeos.''' '''Mozilla / Firefox / Safari:''' prete a tecla de ''Mayusclas'' mientras puncha ''Reload,'' u prete '''Ctrl-Fr''' u '''Ctrl-R''' (''Command-R'' en un Macintosh); '''Konqueror: ''' punche ''Reload'' u prete ''F5;'' '''Opera:''' limpiar a caché en ''Tools → Preferences;'' '''Internet Explorer:''' prete ''Ctrl'' mientres puncha ''Refresh,'' u prete ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => '<strong>Consello:</strong> Faga serbir o botón «Amostrar prebisualizazión» ta prebar o nuebo css/js antes de grabar-lo.',
+'usercssjsyoucanpreview'           => "'''Consello:''' Faga serbir o botón «Amostrar prebisualizazión» ta prebar o nuebo css/js antes de grabar-lo.",
 'usercsspreview'                   => "'''Remere que isto no ye que una prebisualizazión d'o suyo CSS d'usuario.'''
 '''Encara no s'ha alzato!'''",
 'userjspreview'                    => "'''Remere que sólo ye prebisualizando o suyo javascript d'usuario y encara no ye grabato!'''",
 'userinvalidcssjstitle'            => "'''Pare cuenta:''' No bi ha garra aparenzia clamata \"\$1\". Remere que as pachinas presonalizatas .css y .js tienen un títol en minusclas, p.e. {{ns:user}}:Foo/monobook.css en cuenta de {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Esbiellato)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => "<strong>Pare cuenta que isto sólo ye que l'ambiesta prebia d'a pachina; os cambeos encara no han estato alzatos!</strong>",
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Pare cuenta que isto sólo ye que l'ambiesta prebia d'a pachina; os cambeos encara no han estato alzatos!'''",
 'previewconflict'                  => "L'ambiesta prebia li amostrará l'aparenzia d'o testo dimpués d'alzar os cambeos.",
-'session_fail_preview'             => "<strong>Ya lo sentimos, pero no emos puesto alzar a suya edizión por una perduga d'os datos de sesion. Por fabor, prebe de fer-lo una atra bez, y si encara no funziona, [[Special:UserLogout|salga d'a sesión]] y torne á identificar-se.</strong>",
-'session_fail_preview_html'        => "<strong>Ya lo sentimos, pero no emos puesto prozesar a suya edizión porque os datos de sesión s'han trafegato.</strong>
+'session_fail_preview'             => "'''Ya lo sentimos, pero no emos puesto alzar a suya edizión por una perduga d'os datos de sesion. Por fabor, prebe de fer-lo una atra bez, y si encara no funziona, [[Special:UserLogout|salga d'a sesión]] y torne á identificar-se.'''",
+'session_fail_preview_html'        => "'''Ya lo sentimos, pero no emos puesto prozesar a suya edizión porque os datos de sesión s'han trafegato.'''
 
 ''Como {{SITENAME}} tiene l'HTML puro autibato, s'ha amagato l'ambiesta prebia ta aprebenir ataques en JavaScript.''
 
-<strong>Si ye mirando d'editar lechitimament, por fabor, prebe una atra bez. Si encara no funzionase alabez, prebe de [[Special:UserLogout|zarrar a sesión]] y dentrar-ie identificando-se de nuebas.</strong>",
-'token_suffix_mismatch'            => "<strong>S'ha refusato a suya edizión porque o suyo client ha esbarafundiato os caráuters de puntuazión en o editor. A edizión s'ha refusata ta pribar a corrompizión d'a pachina de testo. Isto gosa escaizer cuan se fa serbir un serbizio de proxy defeutuoso alazetato en a web.</strong>",
+'''Si ye mirando d'editar lechitimament, por fabor, prebe una atra bez. Si encara no funzionase alabez, prebe de [[Special:UserLogout|zarrar a sesión]] y dentrar-ie identificando-se de nuebas.'''",
+'token_suffix_mismatch'            => "'''S'ha refusato a suya edizión porque o suyo client ha esbarafundiato os caráuters de puntuazión en o editor. A edizión s'ha refusata ta pribar a corrompizión d'a pachina de testo. Isto gosa escaizer cuan se fa serbir un serbizio de proxy defeutuoso alazetato en a web.'''",
 'editing'                          => 'Editando $1',
 'editingsection'                   => 'Editando $1 (sezión)',
-'editingcomment'                   => 'Editando $1 (comentario)',
+'editingcomment'                   => 'Editando $1 (nueba sezión)',
 'editconflict'                     => "Conflito d'edizión: $1",
 'explainconflict'                  => "Bel atro usuario ha cambiato ista pachina dende que bustet prenzipió á editar-la.
 O cuatrón de testo superior contiene o testo d'a pachina como ye autualment.
@@ -678,21 +692,23 @@ Abrá d'encorporar os suyos cambeos en o testo esistent.
 '''Nomás''' o testo en o cuatrón superior s'alzará cuan prete o botón \"Alzar a pachina\".",
 'yourtext'                         => 'O testo suyo',
 'storedversion'                    => 'Bersión almadazenata',
-'nonunicodebrowser'                => "<strong>Pare cuenta: O suyo nabegador no cumple a norma Unicode. S'ha autibato un sistema d'edizión alternatibo que li premitirá d'editar articlos con seguridat: os caráuters no ASCII aparixerán en a caxa d'edizión como codigos exadezimals.</strong>",
-'editingold'                       => "<strong>PARE CUENTA: Ye editando una bersión antiga d'ista pachina. Si alza a pachina, toz os cambeos feitos dende ixa rebisión se tresbatirán.</strong>",
+'nonunicodebrowser'                => "'''Pare cuenta: O suyo nabegador no cumple a norma Unicode. S'ha autibato un sistema d'edizión alternatibo que li premitirá d'editar articlos con seguridat: os caráuters no ASCII aparixerán en a caxa d'edizión como codigos exadezimals.'''",
+'editingold'                       => "'''PARE CUENTA: Ye editando una bersión antiga d'ista pachina. Si alza a pachina, toz os cambeos feitos dende ixa rebisión se tresbatirán.'''",
 'yourdiff'                         => 'Esferenzias',
 'copyrightwarning'                 => "Por fabor, pare cuenta que todas as contrebuzions á {{SITENAME}} se consideran publicatas baxo a lizenzia $2 (beyer detalles en $1). Si no deseya que atra chent corricha os suyos escritos sin piedat y los destribuiga librement, alabez, no debería meter-los aquí. En publicar aquí, tamién ye declarando que busté mesmo escribió iste testo y ye dueño d'os dreitos d'autor, u bien lo copió dende o dominio publico u cualsiquier atra fuent libre.
-<strong>NO COPIE SIN PREMISO ESCRITOS CON DREITOS D'AUTOR!</strong><br />",
+'''NO COPIE SIN PREMISO ESCRITOS CON DREITOS D'AUTOR!'''<br />",
 'copyrightwarning2'                => "Por fabor, pare cuenta que todas as contrebuzions á {{SITENAME}} pueden estar editatas, cambiatas u borratas por atros colaboradors. Si no deseya que atra chent corricha os suyos escritos sin piedat y los destribuiga librement, alabez, no debería meter-los aquí. <br /> En publicar aquí, tamién ye declarando que busté mesmo escribió iste testo y ye o dueño d'os dreitos d'autor, u bien lo copió dende o dominio publico u cualsiquier atra fuent libre (beyer $1 ta más informazión). <br />
-<strong>NO COPIE SIN PREMISO ESCRITOS CON DREITOS D'AUTOR!</strong>",
-'longpagewarning'                  => '<strong>Pare cuenta: Ista pachina tiene ya $1 kilobytes; bels nabegadors pueden tener problemas en editar pachinas de 32 kB o más.
-Considere, por fabor, a posibilidat de troxar ista pachina en trestallos más chicoz.</strong>',
-'longpageerror'                    => '<strong>ERROR: O testo que ha escrito ye de $1 kilobytes, que ye mayor que a grandaria maisima de $2 kilobytes. No se puede alzar.</strong>',
-'readonlywarning'                  => '<strong>Pare cuenta: A base de datos ha estato bloqueyata por custions de mantenimiento. Por ixo, en iste inte ye imposible alzar as suyas edizions. Puede copiar y apegar o testo en un archibo y alzar-lo ta dimpués.</strong>',
-'protectedpagewarning'             => "<strong>PARE CUENTA: Ista pachina ha estato protechita ta que sólo os usuarios con premisos d'almenistrador puedan editar-la.</strong>",
+'''NO COPIE SIN PREMISO ESCRITOS CON DREITOS D'AUTOR!'''",
+'longpagewarning'                  => "'''Pare cuenta: Ista pachina tiene ya $1 kilobytes; bels nabegadors pueden tener problemas en editar pachinas de 32 kB o más.
+Considere, por fabor, a posibilidat de troxar ista pachina en trestallos más chicoz.'''",
+'longpageerror'                    => "'''ERROR: O testo que ha escrito ye de $1 kilobytes, que ye mayor que a grandaria masima de $2 kilobytes. No se puede alzar.'''",
+'readonlywarning'                  => "'''Pare cuenta: A base de datos ye bloqueyata por custions de mantenimiento. Por ixo, en iste inte ye imposible d'alzar as suyas edizions. Puede copiar y apegar o testo en un archibo y alzar-lo ta dimpués.'''
+
+A esplicazión ufierta por l'almenistrador que bloqueyó a base de datos ye ista: $1",
+'protectedpagewarning'             => "'''PARE CUENTA: Ista pachina ha estato protechita ta que sólo os usuarios con premisos d'almenistrador puedan editar-la.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Ista pachina ha estato protechita ta que nomás usuarios rechistratos puedan editar-la.",
 'cascadeprotectedwarning'          => "'''Pare cuenta:''' Ista pachina ye protechita ta que nomás os almenistrador puedan editar-la, porque ye encluyita en {{PLURAL:$1|a siguient pachina, protechita|as siguients pachinas, protechitas}} con a opzión de ''cascada'' :",
-'titleprotectedwarning'            => '<strong>PARE CUENTA:  Ista pachina ye bloqueyata ta que sólo bels usuarios puedan creyar-la.</strong>',
+'titleprotectedwarning'            => "'''PARE CUENTA:  Ista pachina ye bloqueyata ta que sólo bels usuarios puedan creyar-la.'''",
 'templatesused'                    => 'Plantillas emplegatas en ista pachina:',
 'templatesusedpreview'             => 'Plantillas emplegatas en ista ambiesta prebia:',
 'templatesusedsection'             => 'Plantillas usatas en ista sezión:',
@@ -710,17 +726,30 @@ Considere, por fabor, a posibilidat de troxar ista pachina en trestallos más ch
 
 Abría de considerar si ye reyalment nezesario continar editando ista pachina.
 Puede consultar o rechistro de borraus que s'amuestra a continuazión:",
+'deleted-notice'                   => "Ista pachina ye borrata.
+Contino s'amuestra o rechistro de borrau como referenzia.",
+'deletelog-fulllog'                => 'Beyer o rechistro completo',
+'edit-hook-aborted'                => 'Edizión albortada por o grifio (hook). 
+No dio garra esplicazión.',
+'edit-gone-missing'                => "No s'ha puesto esbiellar a pachina.
+Pareix que la esen borrau.",
+'edit-conflict'                    => "Conflito d'edizión.",
+'edit-no-change'                   => "S'ha ignorato a suya edizión, pos no s'ha feito garra cambeo ta o testo.",
+'edit-already-exists'              => "No s'ha puesto creyar una pachina nueba.
+Ya esiste.",
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Pare cuenta: Ista pachina tiene masiadas cridas á funzions de preprozeso (parser functions) costosas.
+'expensive-parserfunction-warning'        => 'Pare cuenta: Ista pachina tiene masiadas cridas ta funzions de preprozeso (parser functions) costosas.
 
-Abría de tener-ne menos de $2, por agora en tiene $1.',
+Abría de tener-ne menos de {{PLURAL:$2|$2|$2}}, y por agora en tiene {{PLURAL:$1|$1|$1}}.',
 'expensive-parserfunction-category'       => 'Pachinas con masiadas cridas á funzions de preprozeso (parser functions) costosas',
 'post-expand-template-inclusion-warning'  => "Pare cuenta: A mida d'enclusión d'a plantilla ye masiau gran.
 Bellas plantillas no se bi encluyen.",
 'post-expand-template-inclusion-category' => "Pachinas an que se brinca a mida d'enclusión d'as plantillas",
 'post-expand-template-argument-warning'   => "Pare cuenta: Ista pachina contiene á lo menos un argumento de plantilla con una mida d'espansión masiau gran. S'han omeso estos argumentos.",
 'post-expand-template-argument-category'  => 'Pachinas con argumentos de plantilla omesos',
+'parser-template-loop-warning'            => "S'ha deteutato un bucle de plantillas: [[$1]]",
+'parser-template-recursion-depth-warning' => "S'ha brincato o limite de recursión de plantillas ($1)",
 
 # "Undo" feature
 'undo-success' => "A edizión puede esfer-se. Antis d'esfer a edizión, mire-se a siguient comparanza ta comprebar que ye ixo o que quiere fer reyalment. Alabez, puede alzar os cambeos ta esfer a edizión.",
@@ -735,29 +764,28 @@ Bellas plantillas no se bi encluyen.",
 A razón endicata por $3 ye ''$2''",
 
 # History pages
-'viewpagelogs'        => "Beyer os rechistros d'ista pachina",
-'nohistory'           => "Ista pachina no tiene un istorial d'edizions.",
-'revnotfound'         => 'Bersión no trobata',
-'revnotfoundtext'     => "No se pudo trobar a bersión antiga d'a pachina demandata.
-Por fabor, rebise l'adreza que fazió serbir t'aczeder á ista pachina.",
-'currentrev'          => 'Bersión autual',
-'revisionasof'        => "Bersión d'o $1",
-'revision-info'       => "Bersión d'o $1 feita por $2",
-'previousrevision'    => '� Bersión anterior',
-'nextrevision'        => 'Bersión siguient →',
-'currentrevisionlink' => 'Beyer bersión autual',
-'cur'                 => 'aut',
-'next'                => 'siguient',
-'last'                => 'ant',
-'page_first'          => 'primeras',
-'page_last'           => 'zagueras',
-'histlegend'          => 'Leyenda: (aut) = esferenzias con a bersión autual,
+'viewpagelogs'           => "Beyer os rechistros d'ista pachina",
+'nohistory'              => "Ista pachina no tiene un istorial d'edizions.",
+'currentrev'             => 'Bersión autual',
+'currentrev-asof'        => "zaguera bersión d'o $1",
+'revisionasof'           => "Bersión d'o $1",
+'revision-info'          => "Bersión d'o $1 feita por $2", # Additionally available: $3: revision id
+'previousrevision'       => '� Bersión anterior',
+'nextrevision'           => 'Bersión siguient →',
+'currentrevisionlink'    => 'Beyer bersión autual',
+'cur'                    => 'aut',
+'next'                   => 'siguient',
+'last'                   => 'ant',
+'page_first'             => 'primeras',
+'page_last'              => 'zagueras',
+'histlegend'             => 'Leyenda: (aut) = esferenzias con a bersión autual,
 (ant) = diferenzias con a bersión anterior, m = edizión menor',
-'deletedrev'          => '[borrato]',
-'histfirst'           => 'Primeras contrebuzions',
-'histlast'            => 'Zagueras',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(buedo)',
+'history-fieldset-title' => 'Mirar en o istorial',
+'deletedrev'             => '[borrato]',
+'histfirst'              => 'Primeras contrebuzions',
+'histlast'               => 'Zagueras',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(buedo)',
 
 # Revision feed
 'history-feed-title'          => 'Istorial de bersions',
@@ -839,6 +867,7 @@ Asegure-se que iste cambio no crebará a continidat de l'istorial d'a pachina.",
 'mergehistory-invalid-destination' => 'A pachina de destino ha de tener un títol correuto.',
 'mergehistory-autocomment'         => "S'ha combinato [[:$1]] en [[:$2]]",
 'mergehistory-comment'             => "S'ha combinato [[:$1]] en [[:$2]]: $3",
+'mergehistory-same-destination'    => "As pachinas d'orichen y destín han d'estar diferents",
 
 # Merge log
 'mergelog'           => "Rechistro d'unions",
@@ -851,119 +880,200 @@ Asegure-se que iste cambio no crebará a continidat de l'istorial d'a pachina.",
 'difference'              => '(Esferenzias entre bersions)',
 'lineno'                  => 'Linia $1:',
 'compareselectedversions' => 'Confrontar as bersions trigatas',
+'visualcomparison'        => 'Comparanza bisual',
+'wikicodecomparison'      => 'Comparanza de testo wiki',
 'editundo'                => 'esfer',
 'diff-multi'              => "(S'ha amagato {{PLURAL:$1|una edizión entremeya|$1 edizions entremeyas}}.)",
+'diff-movedto'            => 'tresladato ta $1',
+'diff-styleadded'         => 'estilo $1 adibito',
+'diff-added'              => 'adibito $1',
+'diff-changedto'          => 'cambiato á $1',
+'diff-movedoutof'         => 'sacato de $1',
+'diff-styleremoved'       => 'estilo $1 sacato',
+'diff-removed'            => 'sacato $1',
+'diff-changedfrom'        => 'cambiato dende $1',
+'diff-src'                => 'codigo fuent',
+'diff-withdestination'    => 'con destín $1',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;y $1 $2',
+'diff-width'              => 'amplaria',
+'diff-height'             => 'altaria',
+'diff-p'                  => "un '''parrafo'''",
+'diff-blockquote'         => "una '''zita'''",
+'diff-h1'                 => "una '''cabezera (ran 1)'''",
+'diff-h2'                 => "una '''cabezera (ran 2)'''",
+'diff-h3'                 => "una '''cabezera (ran 3)'''",
+'diff-h4'                 => "una '''cabezera (ran 4)'''",
+'diff-h5'                 => "una '''cabezera (ran 5)'''",
+'diff-pre'                => "un '''bloque preformateyato'''",
+'diff-div'                => "una '''dibisión'''",
+'diff-ul'                 => "una '''lista desordenata'''",
+'diff-ol'                 => "una '''lista ordenata'''",
+'diff-li'                 => "un '''elemento de lista'''",
+'diff-table'              => "una '''tabla'''",
+'diff-tbody'              => "un '''conteniu de tabla'''",
+'diff-tr'                 => "una '''ringlera'''",
+'diff-td'                 => "una '''zelda'''",
+'diff-th'                 => "una '''cabezera'''",
+'diff-br'                 => "un '''brinco de ringlera'''",
+'diff-hr'                 => "una '''linia orizontal'''",
+'diff-code'               => "un '''bloque de codigo d'ordenador'''",
+'diff-dl'                 => "una '''lista de definizions'''",
+'diff-dt'                 => "un '''termín de definizión'''",
+'diff-dd'                 => "una '''definizión'''",
+'diff-input'              => "una '''dentrada'''",
+'diff-form'               => "un '''formulario'''",
+'diff-img'                => "una '''imachen'''",
+'diff-span'               => "un '''''span'''''",
+'diff-a'                  => "un '''binclo'''",
+'diff-i'                  => "'''cursibas'''",
+'diff-b'                  => "'''negreta'''",
+'diff-strong'             => "'''fuerte'''",
+'diff-em'                 => "'''enfasis'''",
+'diff-font'               => "'''tipo de letra'''",
+'diff-big'                => "'''gran'''",
+'diff-del'                => "'''borrato'''",
+'diff-tt'                 => "'''amplaria fixa'''",
+'diff-sub'                => "'''subendize'''",
+'diff-sup'                => "'''superendize'''",
+'diff-strike'             => "'''barriato'''",
 
 # Search results
-'searchresults'             => 'Resultau de mirar',
-'searchresulttext'          => "Ta más informazión sobre cómo mirar pachinas en {{SITENAME}}, consulte l'[[{{MediaWiki:Helppage}}|{{int:help}}]].",
-'searchsubtitle'            => 'Ha mirato \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|todas as pachinas que prenzipian con "$1"]] | [[Special:WhatLinksHere/$1|todas as pachinas con binclos enta "$1"]])',
-'searchsubtitleinvalid'     => 'Ha mirato "$1"',
-'noexactmatch'              => "'''No esiste garra pachina tetulata \"\$1\".''' Puede aduyar [[:\$1|creyando-la]].",
-'noexactmatch-nocreate'     => "'''No bi ha garra pachina tetulata \"\$1\".'''",
-'toomanymatches'            => "S'ha retornato masiadas coinzidenzias, por fabor, torne á prebar con una consulta diferent",
-'titlematches'              => 'Consonanzias de títols de pachina',
-'notitlematches'            => "No bi ha garra consonanzia en os títols d'as pachinas",
-'textmatches'               => "Consonanzias en o testo d'as pachinas",
-'notextmatches'             => "No bi ha garra consonanzia en os testos d'as pachinas",
-'prevn'                     => 'anteriors $1',
-'nextn'                     => 'siguiens $1',
-'viewprevnext'              => 'Beyer ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 palabra|$2 palabras}})',
-'search-result-score'       => 'Relebanzia: $1%',
-'search-redirect'           => '(reendreza $1)',
-'search-section'            => '(sezion $1)',
-'search-suggest'            => 'Quereba dezir $1?',
-'search-interwiki-caption'  => 'Procheutos chermans',
-'search-interwiki-default'  => '$1 resultaus:',
-'search-interwiki-more'     => '(más)',
-'search-mwsuggest-enabled'  => 'con socherenzias',
-'search-mwsuggest-disabled' => 'Garra socherenzia',
-'search-relatedarticle'     => 'Relazionato',
-'mwsuggest-disable'         => "Desautibar as socherenzias d'AJAX",
-'searchrelated'             => 'relazionato',
-'searchall'                 => 'toz',
-'showingresults'            => "Contino se bi {{PLURAL:$1|amuestra '''1''' resultau|amuestran '''$1''' resultaus}} prenzipiando por o numero '''$2'''.",
-'showingresultsnum'         => "Contino se bi {{PLURAL:$3|amuestra '''1''' resultau|amuestran os '''$3''' resultaus}} prenzipiando por o numero '''$2'''.",
-'showingresultstotal'       => "{{PLURAL:$3|S'amuestra contino o resultau '''$1''' de '''$3'''|S'amuestran contino os resultaus '''$1 - $2''' de '''$3'''}}",
-'nonefound'                 => "'''Pare cuenta''': Por defeuto nomás se mira en bels espazios de nombres. Si quiere mirar en toz os contenius (encluyendo pachinas de descusión, plantillas, etc), adiba o prefixo ''all:'' u clabe como prefixo o espazio de nombres deseyau.",
-'powersearch'               => 'Busca abanzata',
-'powersearch-legend'        => 'Busca abanzata',
-'powersearch-ns'            => 'Mirar en os espazios de nombres:',
-'powersearch-redir'         => 'Listar reendrezeras',
-'powersearch-field'         => 'Mirar',
-'search-external'           => 'Busca externa',
-'searchdisabled'            => 'A busca en {{SITENAME}} ye temporalment desautibata. Entremistanto, puede mirar en {{SITENAME}} fendo serbir buscadors esternos, pero pare cuenta que os suyos endizes de {{SITENAME}} puede no estar esbiellatos.',
+'searchresults'                    => 'Resultau de mirar',
+'searchresults-title'              => 'Resultaus de mirar "$1"',
+'searchresulttext'                 => "Ta más informazión sobre cómo mirar pachinas en {{SITENAME}}, consulte l'[[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchsubtitle'                   => 'Ha mirato \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|todas as pachinas que prenzipian con "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|todas as pachinas con binclos enta "$1"]])',
+'searchsubtitleinvalid'            => 'Ha mirato "$1"',
+'noexactmatch'                     => "'''No esiste garra pachina tetulata \"\$1\".''' Puede aduyar [[:\$1|creyando-la]].",
+'noexactmatch-nocreate'            => "'''No bi ha garra pachina tetulata \"\$1\".'''",
+'toomanymatches'                   => "S'ha retornato masiadas coinzidenzias, por fabor, torne á prebar con una consulta diferent",
+'titlematches'                     => 'Consonanzias de títols de pachina',
+'notitlematches'                   => "No bi ha garra consonanzia en os títols d'as pachinas",
+'textmatches'                      => "Consonanzias en o testo d'as pachinas",
+'notextmatches'                    => "No bi ha garra consonanzia en os testos d'as pachinas",
+'prevn'                            => 'anteriors $1',
+'nextn'                            => 'siguiens $1',
+'viewprevnext'                     => 'Beyer ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Opzions de busca',
+'searchmenu-exists'                => "'''Bi ha una pachina clamada \"[[\$1]]\" en ista wiki'''",
+'searchmenu-new'                   => "'''[[:\$1|Creyar]] a pachina \"[:\$1]\" en ista wiki!'''",
+'searchhelp-url'                   => 'Help:Aduya',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Beyer pachinas con iste prefixo]]',
+'searchprofile-articles'           => 'Articlos',
+'searchprofile-articles-and-proj'  => "Articlos y pachinas d'o procheuto",
+'searchprofile-project'            => "Pachinas d'o procheuto",
+'searchprofile-images'             => 'Archibos',
+'searchprofile-everything'         => 'Tot',
+'searchprofile-advanced'           => 'Abanzato',
+'searchprofile-articles-tooltip'   => 'Mirar en $1',
+'searchprofile-project-tooltip'    => 'Mirar en $1',
+'searchprofile-images-tooltip'     => 'Mirar archibos',
+'searchprofile-everything-tooltip' => 'Mirar en toz os contenius (tamién en as pachinas de descusión)',
+'searchprofile-advanced-tooltip'   => 'Mirar en os siguients espazios de nombres',
+'prefs-search-nsdefault'           => 'Mirar fendo serbir os parametros por defeuto:',
+'prefs-search-nscustom'            => 'Mirar en os siguients espazios de nombres:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 palabra|$2 palabras}})',
+'search-result-score'              => 'Relebanzia: $1%',
+'search-redirect'                  => '(reendreza $1)',
+'search-section'                   => '(sezion $1)',
+'search-suggest'                   => 'Quereba dezir $1?',
+'search-interwiki-caption'         => 'Procheutos chermans',
+'search-interwiki-default'         => '$1 resultaus:',
+'search-interwiki-more'            => '(más)',
+'search-mwsuggest-enabled'         => 'con socherenzias',
+'search-mwsuggest-disabled'        => 'Garra socherenzia',
+'search-relatedarticle'            => 'Relazionato',
+'mwsuggest-disable'                => "Desautibar as socherenzias d'AJAX",
+'searchrelated'                    => 'relazionato',
+'searchall'                        => 'toz',
+'showingresults'                   => "Contino se bi {{PLURAL:$1|amuestra '''1''' resultau|amuestran '''$1''' resultaus}} prenzipiando por o numero '''$2'''.",
+'showingresultsnum'                => "Contino se bi {{PLURAL:$3|amuestra '''1''' resultau|amuestran os '''$3''' resultaus}} prenzipiando por o numero '''$2'''.",
+'showingresultstotal'              => "Contino {{PLURAL:$4|s'amuestra o resultau '''$1''' de '''$3'''|s'amuestran os resultaus '''$1 - $2''' de '''$3'''}}",
+'nonefound'                        => "'''Pare cuenta''': Por defeuto nomás se mira en bels espazios de nombres. Si quiere mirar en toz os contenius (encluyendo pachinas de descusión, plantillas, etc), adiba o prefixo ''all:'' u clabe como prefixo o espazio de nombres deseyau.",
+'search-nonefound'                 => "No s'ha trobato garra resultau que cumpla os criterios.",
+'powersearch'                      => 'Busca abanzata',
+'powersearch-legend'               => 'Busca abanzata',
+'powersearch-ns'                   => 'Mirar en os espazios de nombres:',
+'powersearch-redir'                => 'Listar reendrezeras',
+'powersearch-field'                => 'Mirar',
+'search-external'                  => 'Busca externa',
+'searchdisabled'                   => 'A busca en {{SITENAME}} ye temporalment desautibata. Entremistanto, puede mirar en {{SITENAME}} fendo serbir buscadors esternos, pero pare cuenta que os suyos endizes de {{SITENAME}} puede no estar esbiellatos.',
 
 # Preferences page
-'preferences'              => 'Preferenzias',
-'mypreferences'            => 'Preferenzias',
-'prefs-edits'              => "Numero d'edizions:",
-'prefsnologin'             => 'No ye identificato',
-'prefsnologintext'         => 'Ha d\'aber <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} enzetato una sesión] </span> ta cambiar as preferenzias d\'usuario.',
-'prefsreset'               => "S'ha tornato as preferenzias t'as suyas baluras almadazenatas.",
-'qbsettings'               => 'Preferenzias de "Quickbar"',
-'qbsettings-none'          => 'Denguna',
-'qbsettings-fixedleft'     => 'Fixa á la zurda',
-'qbsettings-fixedright'    => 'Fixa á la dreita',
-'qbsettings-floatingleft'  => 'Flotant á la zurda',
-'qbsettings-floatingright' => 'Flotant á la dreita',
-'changepassword'           => 'Cambiar a palabra de paso',
-'skin'                     => 'Aparenzia',
-'math'                     => 'Esprisions matematicas',
-'dateformat'               => 'Formato de calendata',
-'datedefault'              => 'Sin de preferenzias',
-'datetime'                 => 'Calendata y ora',
-'math_failure'             => 'Error en o codigo',
-'math_unknown_error'       => 'error esconoxita',
-'math_unknown_function'    => 'funzión esconoxita',
-'math_lexing_error'        => 'error de lesico',
-'math_syntax_error'        => 'error de sintacsis',
-'math_image_error'         => "Bi abió una error en a combersión enta o formato PNG; comprebe que ''latex'', ''dvips'', ''gs'', y ''convert'' sigan instalatos correutament.",
-'math_bad_tmpdir'          => "No s'ha puesto escribir u creyar o direutorio temporal d'esprisions matematicas",
-'math_bad_output'          => "No s'ha puesto escribir u creyar o direutorio de salida d'esprisions matematicas",
-'math_notexvc'             => "No s'ha trobato l'archibo executable ''texvc''. Por fabor, leiga <em>math/README</em> ta confegurar-lo correutament.",
-'prefs-personal'           => 'Datos presonals',
-'prefs-rc'                 => 'Zaguers cambeos',
-'prefs-watchlist'          => 'Lista de seguimiento',
-'prefs-watchlist-days'     => "Numero de días que s'amostrarán en a lista de seguimiento:",
-'prefs-watchlist-edits'    => "Numero d'edizions que s'amostrarán en a lista ixamplata:",
-'prefs-misc'               => 'Atras preferenzias',
-'saveprefs'                => 'Alzar preferenzias',
-'resetprefs'               => "Tornar t'as preferenzias por defeuto",
-'oldpassword'              => 'Palabra de paso antiga:',
-'newpassword'              => 'Nueba palabra de paso:',
-'retypenew'                => 'Torne á escribir a nueba palabra de paso:',
-'textboxsize'              => 'Edizión',
-'rows'                     => 'Ringleras:',
-'columns'                  => 'Colunnas:',
-'searchresultshead'        => 'Mirar',
-'resultsperpage'           => "Resultaus que s'amostrarán por pachina:",
-'contextlines'             => "Linias de contexto que s'amostrarán por resultau",
-'contextchars'             => 'Caráuters de contesto por linia',
-'stub-threshold'           => 'Branquil superior ta o formateyo de <a href="#" class="stub">binclos ta borradors</a> (en bytes):',
-'recentchangesdays'        => "Días que s'amostrarán en ''zaguers cambeos'':",
-'recentchangescount'       => "Numero d'edizions que s'amostrarán en as pachinas de ''zaguers cambeos'', istorials y rechistros:",
-'savedprefs'               => "S'han alzato as suyas preferenzias.",
-'timezonelegend'           => 'Fuso orario',
-'timezonetext'             => "¹Escriba a esferenzia (en oras) entre a suya ora local y a d'o serbidor (UTC).",
-'localtime'                => 'Ora local',
-'timezoneoffset'           => 'Esferenzia¹',
-'servertime'               => 'A ora en o serbidor ye',
-'guesstimezone'            => "Emplir-lo con a ora d'o nabegador",
-'allowemail'               => "Autibar a rezepzión de correu d'atros usuarios",
-'prefs-searchoptions'      => 'Opzions de busca',
-'prefs-namespaces'         => 'Espazios de nombres',
-'defaultns'                => 'Mirar por defeuto en istos espazios de nombres:',
-'default'                  => 'por defeuto',
-'files'                    => 'Archibos',
+'preferences'               => 'Preferenzias',
+'mypreferences'             => 'Preferenzias',
+'prefs-edits'               => "Numero d'edizions:",
+'prefsnologin'              => 'No ye identificato',
+'prefsnologintext'          => 'Ha d\'aber <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} enzetato una sesión] </span> ta cambiar as preferenzias d\'usuario.',
+'prefsreset'                => "S'ha tornato as preferenzias t'as suyas baluras almadazenatas.",
+'qbsettings'                => 'Preferenzias de "Quickbar"',
+'qbsettings-none'           => 'Denguna',
+'qbsettings-fixedleft'      => 'Fixa á la zurda',
+'qbsettings-fixedright'     => 'Fixa á la dreita',
+'qbsettings-floatingleft'   => 'Flotant á la zurda',
+'qbsettings-floatingright'  => 'Flotant á la dreita',
+'changepassword'            => 'Cambiar a palabra de paso',
+'skin'                      => 'Aparenzia',
+'skin-preview'              => 'Fer una prebatina',
+'math'                      => 'Esprisions matematicas',
+'dateformat'                => 'Formato de calendata',
+'datedefault'               => 'Sin de preferenzias',
+'datetime'                  => 'Calendata y ora',
+'math_failure'              => 'Error en o codigo',
+'math_unknown_error'        => 'error esconoxita',
+'math_unknown_function'     => 'funzión esconoxita',
+'math_lexing_error'         => 'error de lesico',
+'math_syntax_error'         => 'error de sintacsis',
+'math_image_error'          => "Bi abió una error en a combersión enta o formato PNG; comprebe que ''latex'', ''dvips'', ''gs'', y ''convert'' sigan instalatos correutament.",
+'math_bad_tmpdir'           => "No s'ha puesto escribir u creyar o direutorio temporal d'esprisions matematicas",
+'math_bad_output'           => "No s'ha puesto escribir u creyar o direutorio de salida d'esprisions matematicas",
+'math_notexvc'              => "No s'ha trobato l'archibo executable ''texvc''. Por fabor, leiga <em>math/README</em> ta confegurar-lo correutament.",
+'prefs-personal'            => 'Datos presonals',
+'prefs-rc'                  => 'Zaguers cambeos',
+'prefs-watchlist'           => 'Lista de seguimiento',
+'prefs-watchlist-days'      => "Numero de días que s'amostrarán en a lista de seguimiento:",
+'prefs-watchlist-days-max'  => '(masimo 7 diyas)',
+'prefs-watchlist-edits'     => "Numero d'edizions que s'amostrarán en a lista ixamplata:",
+'prefs-watchlist-edits-max' => '(numero masimo: 1000)',
+'prefs-misc'                => 'Atras preferenzias',
+'prefs-resetpass'           => 'Cambear a palabra de paso',
+'saveprefs'                 => 'Alzar preferenzias',
+'resetprefs'                => "Tornar t'as preferenzias por defeuto",
+'textboxsize'               => 'Edizión',
+'prefs-edit-boxsize'        => "Grandaria d'a finestra d'edizión.",
+'rows'                      => 'Ringleras:',
+'columns'                   => 'Colunnas:',
+'searchresultshead'         => 'Mirar',
+'resultsperpage'            => "Resultaus que s'amostrarán por pachina:",
+'contextlines'              => "Linias de contexto que s'amostrarán por resultau",
+'contextchars'              => 'Caráuters de contesto por linia',
+'stub-threshold'            => 'Branquil superior ta o formateyo de <a href="#" class="stub">binclos ta borradors</a> (en bytes):',
+'recentchangesdays'         => "Días que s'amostrarán en ''zaguers cambeos'':",
+'recentchangesdays-max'     => '(masimo $1 {{PLURAL:$1|día|días}})',
+'recentchangescount'        => "Numero d'edizions que s'amostrarán, por defeuto, en as pachinas de zaguers cambeos, istorials y rechistros:",
+'savedprefs'                => "S'han alzato as suyas preferenzias.",
+'timezonelegend'            => 'Fuso orario',
+'timezonetext'              => "¹Escriba a esferenzia (en oras) entre a suya ora local y a d'o serbidor (UTC).",
+'localtime'                 => 'Ora local:',
+'timezoneselect'            => 'Zona oraria:',
+'timezoneuseserverdefault'  => "Usar a zona d'o serbidor",
+'timezoneuseoffset'         => 'Atra (espezifica a esferenzia)',
+'timezoneoffset'            => 'Esferenzia¹:',
+'servertime'                => 'A ora en o serbidor ye:',
+'guesstimezone'             => "Emplir-lo con a ora d'o nabegador",
+'allowemail'                => "Autibar a rezepzión de correu d'atros usuarios",
+'prefs-searchoptions'       => 'Opzions de busca',
+'prefs-namespaces'          => 'Espazios de nombres',
+'defaultns'                 => 'Mirar por defeuto en istos espazios de nombres:',
+'default'                   => 'por defeuto',
+'files'                     => 'Archibos',
 
 # User rights
 'userrights'                  => "Confegurazión d'os dreitos d'os usuarios", # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => "Confegurar collas d'usuarios",
 'userrights-user-editname'    => "Escriba un nombre d'usuario:",
 'editusergroup'               => "Editar as collas d'usuarios",
-'editinguser'                 => "S'esta cambiando os dreitos de l'usuario  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "S'esta cambiando os dreitos de l'usuario  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Editar as collas d'usuarios",
 'saveusergroups'              => "Alzar as collas d'usuarios",
 'userrights-groupsmember'     => 'Miembro de:',
@@ -1012,6 +1122,8 @@ Asegure-se que iste cambio no crebará a continidat de l'istorial d'a pachina.",
 'right-minoredit'            => 'Siñalar como edizions menors',
 'right-move'                 => 'Tresladar pachinas',
 'right-move-subpages'        => 'Tresladar as pachinas con a suyas sozpachinas',
+'right-move-rootuserpages'   => "Tresladar pachinas de l'usuario radiz",
+'right-movefile'             => 'Tresladar archibos',
 'right-suppressredirect'     => 'No creyar una reendrezera dende o nombre antigo cuan se treslade una pachina',
 'right-upload'               => 'Cargar archibos',
 'right-reupload'             => "Cargar denzima d'un archibo esistent",
@@ -1062,9 +1174,46 @@ Asegure-se que iste cambio no crebará a continidat de l'istorial d'a pachina.",
 'rightslogentry' => "ha cambiato os dreitos d'usuario de $1: de $2 a $3",
 'rightsnone'     => '(denguno)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'leyer ista pachina',
+'action-edit'                 => 'editar ista pachina',
+'action-createpage'           => 'creyar pachinas',
+'action-createtalk'           => 'creyar pachinas de descusión',
+'action-createaccount'        => "creyar ista cuenta d'usuario",
+'action-minoredit'            => 'siñalar iste cambeo como menor',
+'action-move'                 => 'tresladar ista pachina',
+'action-move-subpages'        => 'tresladar ista pachina y as suyas subpachinas',
+'action-move-rootuserpages'   => "tresladar as pachinas de l'usuario radiz",
+'action-movefile'             => 'tresladar iste archibo',
+'action-upload'               => 'cargar iste archibo',
+'action-reupload'             => "cargar denzima d'un archibo esistent",
+'action-reupload-shared'      => "cargar denzima d'iste archibo en un reposte compartito",
+'action-upload_by_url'        => 'cargar iste archibo dende una adreza URL',
+'action-writeapi'             => "fer serbir l'API d'escritura",
+'action-delete'               => 'borrar ista pachina',
+'action-deleterevision'       => 'borrar ista bersión',
+'action-deletedhistory'       => "beyer o istorial borrato d'ista pachina",
+'action-browsearchive'        => 'mirar pachinas borratas',
+'action-undelete'             => 'recuperar ista pachina',
+'action-suppressrevision'     => 'rebisar y restaurar ista bersión amagata',
+'action-suppressionlog'       => 'beyer iste rechistro pribato',
+'action-block'                => 'bloqueyar iste usuario ta que no pueda editar',
+'action-protect'              => "cambiar os libels de protezión d'ista pachina",
+'action-import'               => 'importar ista pachina dende atro wiki',
+'action-importupload'         => 'importar ista pachina dende un fichero cargato',
+'action-patrol'               => "siñalar as edizions d'atros como patrulladas",
+'action-autopatrol'           => 'siñalar as edizions propias como patrulladas',
+'action-unwatchedpages'       => 'beyer a lista de pachinas no cosiratas',
+'action-trackback'            => "nimbiar informazión d'una referenzia",
+'action-mergehistory'         => "combinar o istorial d'ista pachina",
+'action-userrights'           => "cambiar toz os dreitos d'usuario",
+'action-userrights-interwiki' => "cambiar os dreitos d'usuario en atros wikis",
+'action-siteadmin'            => 'bloqueyar o esbloqueyar a base de datos',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|cambeo|cambeos}}',
 'recentchanges'                     => 'Zaguers cambeos',
+'recentchanges-legend'              => 'Opzions sobre a pachina de zaguers cambeos',
 'recentchangestext'                 => "Siga os cambeos más rezients d'a wiki en ista pachina.",
 'recentchanges-feed-description'    => "Seguir en ista canal de notizias os cambeos más rezients d'o wiki.",
 'rcnote'                            => "Contino {{PLURAL:$1|s'amuestra o unico cambeo feito|s'amuestran os zaguers '''$1''' cambeos feitos}} en {{PLURAL:$2|o zaguer día|os zaguers '''$2''' días}}, dica o $5, $4.",
@@ -1088,6 +1237,8 @@ Asegure-se que iste cambio no crebará a continidat de l'istorial d'a pachina.",
 'rc_categories'                     => 'Limite d\'as categorías (deseparatas por "|")',
 'rc_categories_any'                 => 'Todas',
 'newsectionsummary'                 => 'Nueba sezión: /* $1 */',
+'rc-enhanced-expand'                => 'Amostrar detalles (cal JavaScript)',
+'rc-enhanced-hide'                  => 'Amagar detalles',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cambeos en pachinas relazionadas',
@@ -1108,18 +1259,18 @@ Asegure-se que iste cambio no crebará a continidat de l'istorial d'a pachina.",
 'upload_directory_read_only'  => "O serbidor web no puede escribir en o direutorio de carga d'archibos ($1).",
 'uploaderror'                 => "S'ha produzito una error en cargar l'archibo",
 'uploadtext'                  => "Faiga serbir o formulario d'o cobaxo ta cargar archibos.
-Ta beyer u mirar imáchens cargatas denantes baiga t'a [[Special:ImageList|lista d'archibos cargatos]]. As cargas y recargas tamién se rechistran en o [[Special:Log/upload|rechistro de cargas]], y os borraus en o [[Special:Log/delete|rechistro de borraus]].
+Ta beyer u mirar imáchens cargatas denantes baiga t'a [[Special:FileList|lista d'archibos cargatos]]. As cargas y recargas tamién se rechistran en o [[Special:Log/upload|rechistro de cargas]], y os borraus en o [[Special:Log/delete|rechistro de borraus]].
 
 Ta encluyir un archibo u imachen en una pachina, emplegue un binclo d'una d'istas trazas 
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Archibo.jpg]]</nowiki></tt>''' ta usar a bersion completa de l'archibo, 
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Archibo.png|200px|thumb|left|testo alternatibo]]</nowiki></tt>''' ta usar una bersión de 200 píxels d'amplaria en una caixa a la marguin cucha con 'testo alternatibo' como descripzión
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Archibo.jpg]]</nowiki></tt>''' ta usar a bersion completa de l'archibo, 
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Archibo.png|200px|thumb|left|testo alternatibo]]</nowiki></tt>''' ta usar una bersión de 200 píxels d'amplaria en una caixa a la marguin cucha con 'testo alternatibo' como descripzión
 *'''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Archibo.ogg]]</nowiki></tt>''' ta fer un binclo dreitament ta l'archibo sin amostrar-lo.",
 'upload-permitted'            => "Tipos d'archibo premititos: $1.",
 'upload-preferred'            => "Tipos d'archibo preferitos: $1.",
 'upload-prohibited'           => "Tipos d'archibo biedatos: $1.",
 'uploadlog'                   => 'rechistro de cargas',
 'uploadlogpage'               => "Rechistro de cargas d'archibos",
-'uploadlogpagetext'           => "Contino ye una lista d'os zaguers archibos cargatos. Mire-se a [[Special:NewImages|galería d'archibos nuebos]] ta tener una ambiesta más bisual.",
+'uploadlogpagetext'           => "Contino ye una lista d'os zaguers archibos cargatos. Mire-se a [[Special:NewFiles|galería d'archibos nuebos]] ta tener una ambiesta más bisual.",
 'filename'                    => "Nombre de l'archibo",
 'filedesc'                    => 'Resumen',
 'fileuploadsummary'           => 'Resumen:',
@@ -1139,21 +1290,23 @@ Ta encluyir un archibo u imachen en una pachina, emplegue un binclo d'una d'ista
 'large-file'                  => 'Se consella que os archibos no sigan mayors de $1; iste archibo ocupa $2.',
 'largefileserver'             => "A grandaria d'iste archibo ye mayor d'a que a confegurazión d'iste serbidor premite.",
 'emptyfile'                   => "Parixe que l'archibo que se miraba de cargar ye buedo; por fabor, comprebe que ixe ye reyalment l'archibo que quereba cargar.",
-'fileexists'                  => "Ya bi ha un archibo con ixe nombre. Por fabor, Por favor mire-se l'archibo esistent <strong><tt>$1</tt></strong> si no ye seguro de querer sustituyir-lo.",
-'filepageexists'              => "A pachina de descripzión ta iste archibo ya ye creyata en <strong><tt>$1</tt></strong>, pero no esiste garra archibo con iste nombre. O resumen que escriba no amaneixerá en a pachina de descripzión. Si quiere que o suyo resumen amaneixca aquí, abrá d'editar-lo manualment",
+'fileexists'                  => "Ya bi ha un archibo con ixe nombre. Por fabor, Por favor mire-se l'archibo esistent '''<tt>$1</tt>''' si no ye seguro de querer sustituyir-lo.",
+'filepageexists'              => "A pachina de descripzión ta iste archibo ya ye creyata en '''<tt>$1</tt>''', pero no esiste garra archibo con iste nombre. O resumen que escriba no amaneixerá en a pachina de descripzión. Si quiere que o suyo resumen amaneixca aquí, abrá d'editar-lo manualment",
 'fileexists-extension'        => "Ya bi ha un archibo con un nombre parexiu:<br />
-Nombre de l'archibo que ye cargando: <strong><tt>$1</tt></strong><br />
-Nombre de l'archibo ya esistent: <strong><tt>$2</tt></strong><br />
+Nombre de l'archibo que ye cargando: '''<tt>$1</tt>'''<br />
+Nombre de l'archibo ya esistent: '''<tt>$2</tt>'''<br />
 Por fabor, trigue un nombre diferent.",
 'fileexists-thumb'            => "<center>'''Archibo esistent'''</center>",
-'fileexists-thumbnail-yes'    => "Parixe que l'archibo ye una imachen prou chicota <i>(miniatura)</i>. Comprebe por fabor l'archibo <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Parixe que l'archibo ye una imachen prou chicota ''(miniatura)''. Comprebe por fabor l'archibo '''<tt>$1</tt>'''.<br />
 Si l'archibo comprebato ye a mesma imachen en tamaño orichinal no cal cargar una nueba miniatura.",
-'file-thumbnail-no'           => "O nombre de l'archibo prenzipia con <strong><tt>$1</tt></strong>. 
-Pareix que estase una imachen achiquida <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "O nombre de l'archibo prenzipia con '''<tt>$1</tt>'''. 
+Pareix que estase una imachen achiquida ''(thumbnail)''.
 Si tiene ista imachen a toda resoluzión, cargue-la, si no, por fabor, cambee o nombre de l'archibo.",
-'fileexists-forbidden'        => "Ya bi ha un archibo con iste nombre. Por fabor, cambee o nombre de l'archibo y torne á cargar-lo. [[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => 'Ya bi ha un archibo con ixe nombre en o reposte compartito. Si encara quiere cargr o fichero, por fabor, torne entazaga y faiba serbir un nuebo nombre. [[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => 'Ya bi ha un fichero con iste nombre, y no se puet sobrescribir. 
+Si encara quiere cargar ixe archibo, torne y faiga serbir un nuebo nombre. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Ya bi ha un archibo con ixe nombre en o reposte compartito. Si encara quiere cargar o fichero, por fabor, torne entazaga y faiba serbir un nuebo nombre. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => "Iste archibo ye un duplicau {{PLURAL:$1|d'o siguient archibo|d'os siguients archibos}}:",
+'file-deleted-duplicate'      => "Un archibo igual que iste ([[$1]]) s'ha borrato enantes. Debería mirar-se o istorial de borraus de l'archibo antes de continar cargando-lo atra begada.",
 'successfulupload'            => 'Cargata correutament',
 'uploadwarning'               => "Albertenzia de carga d'archibo",
 'savefile'                    => 'Alzar archibo',
@@ -1172,7 +1325,7 @@ Si tiene ista imachen a toda resoluzión, cargue-la, si no, por fabor, cambee o
 'upload-wasdeleted'           => "'''Pare cuenta: Ye cargando un archibo que ya estió borrato d'antes más.'''
 
 Abría de repensar si ye apropiato continar con a carga d'iste archibo. Aquí tiene o rechistro de borrau d'iste archibo ta que pueda comprebar a razón que se dio ta borrar-lo:",
-'filename-bad-prefix'         => 'O nombre de l\'archibo que ye cargando prenzipia por <strong>"$1"</strong>, que ye un nombre no descriptibo que gosa clabar automaticament as camaras dichitals. Por fabor, trigue un nombre más descriptibo ta iste archibo.',
+'filename-bad-prefix'         => "O nombre de l'archibo que ye cargando prenzipia por '''\"\$1\"''', que ye un nombre no descriptibo que gosa clabar automaticament as camaras dichitals. Por fabor, trigue un nombre más descriptibo ta iste archibo.",
 'filename-prefix-blacklist'   => ' #<!-- dixe ista linia esautament igual como ye --> <pre>
 # A sintacsis ye asinas:
 #   * Tot o que prenzipia por un caráuter "#" dica la fin d\'a linia ye un comentario
@@ -1207,20 +1360,21 @@ PICT # misz.
 'upload_source_url'  => ' (una URL conforme y publicament aczesible)',
 'upload_source_file' => ' (un archibo en o suyo ordenador)',
 
-# Special:ImageList
-'imagelist-summary'     => "Ista pachina espezial amuestra toz os archibos cargatos.
+# Special:ListFiles
+'listfiles-summary'     => "Ista pachina espezial amuestra toz os archibos cargatos.
 Por defeuto os zaguers archibos cargatos s'amuestran en o cobalto d'a lista.
 Fendo click en un encabezau de colunna se cambia o criterio d'ordenazión.",
-'imagelist_search_for'  => "Mirar por nombre de l'archibo:",
+'listfiles_search_for'  => "Mirar por nombre de l'archibo:",
 'imgfile'               => 'archibo',
-'imagelist'             => 'Lista de imachens',
-'imagelist_date'        => 'Calendata:',
-'imagelist_name'        => 'Nombre',
-'imagelist_user'        => 'Usuario',
-'imagelist_size'        => 'Grandaria (bytes)',
-'imagelist_description' => 'Descripzión',
-
-# Image description page
+'listfiles'             => 'Lista de imachens',
+'listfiles_date'        => 'Calendata:',
+'listfiles_name'        => 'Nombre',
+'listfiles_user'        => 'Usuario',
+'listfiles_size'        => 'Grandaria (bytes)',
+'listfiles_description' => 'Descripzión',
+'listfiles_count'       => 'Bersions',
+
+# File description page
 'filehist'                       => "Istorial de l'archibo",
 'filehist-help'                  => "Punche en una calendata/ora ta beyer l'archibo como amanixeba por ixas engüeltas.",
 'filehist-deleteall'             => 'borrar-lo tot',
@@ -1228,16 +1382,23 @@ Fendo click en un encabezau de colunna se cambia o criterio d'ordenazión.",
 'filehist-revert'                => 'esfer',
 'filehist-current'               => 'autual',
 'filehist-datetime'              => 'Calendata/Ora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => "Miniatura d'a bersión de $1",
+'filehist-nothumb'               => 'Sin de miniatura',
 'filehist-user'                  => 'Usuario',
 'filehist-dimensions'            => 'Dimensions',
 'filehist-filesize'              => "Grandaria d'o fichero",
 'filehist-comment'               => 'Comentario',
-'imagelinks'                     => 'Binclos ta la imachen',
+'imagelinks'                     => 'Binclos ta o fichero',
 'linkstoimage'                   => "{{PLURAL:$1|A pachina siguient tiene|Contino s'amuestran $1 pachinas que tienen}} binclos ta iste archibo:",
+'linkstoimage-more'              => 'Bi ha más de {{PLURAL:$1|una pachina con binclos|$1 pachinas con binclos}} enta iste archibo.
+ 
+A lista siguient nomás amuestra {{PLURAL:$1|a primer pachina con binclos|as primeras $1 pachinas con binclos}} enta iste fichero.
+Tamién puez consultar a [[Special:WhatLinksHere/$2|lista completa]].',
 'nolinkstoimage'                 => 'Denguna pachina tiene un binclo ta ista imachen.',
 'morelinkstoimage'               => 'Amostrar [[Special:WhatLinksHere/$1|más binclos]] ta iste archibo.',
 'redirectstofile'                => '{{PLURAL:$1|O siguient archibo reendreza|Os siguients $1 archibos reendrezan}} enta iste archibo:',
-'duplicatesoffile'               => "{{PLURAL:$1|O siguient archibo ye un duplicau|Os siguients $1 archibos son duplicaus}} d'iste archibo:",
+'duplicatesoffile'               => "{{PLURAL:$1|O siguient archibo ye un duplicato|Os siguients $1 archibos son duplicatos}} d'iste archibo ([[Special:FileDuplicateSearch/$2|más detalles]]):",
 'sharedupload'                   => 'Iste archibo ye compartito y puede estar que siga emplegato en atros procheutos.',
 'shareduploadwiki'               => 'Ta más informazión, consulte $1.',
 'shareduploadwiki-desc'          => "A descripzión d'a $1 en o reposte compartito s'amuestra en o cobaxo.",
@@ -1264,7 +1425,7 @@ Fendo click en un encabezau de colunna se cambia o criterio d'ordenazión.",
 # File deletion
 'filedelete'                  => 'Borrar $1',
 'filedelete-legend'           => 'Borrar archibo',
-'filedelete-intro'            => "Ye borrando '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Ye en momentos de borrar o fichero '''[[Media:$1|$1]]''' chunto con toda a suya istoria.",
 'filedelete-intro-old'        => "Ye borrando a bersión de '''[[Media:$1|$1]]''' de [$4 $3, $2].",
 'filedelete-comment'          => 'Causa:',
 'filedelete-submit'           => 'Borrar',
@@ -1272,7 +1433,6 @@ Fendo click en un encabezau de colunna se cambia o criterio d'ordenazión.",
 'filedelete-success-old'      => "S'ha borrato a bersión de '''[[Media:$1|$1]]''' de $3, $2.",
 'filedelete-nofile'           => "'''$1''' no esiste.",
 'filedelete-nofile-old'       => "No bi ha garra bersión alzata de '''$1''' con ixos atributos.",
-'filedelete-iscurrent'        => "Ye prebando de borrar a bersión más rezient d'iste archibo. Por fabor, torne en primeras ta una bersión anterior.",
 'filedelete-otherreason'      => 'Atras razons:',
 'filedelete-reason-otherlist' => 'Atra razón',
 'filedelete-reason-dropdown'  => "*Razons comuns ta borrar archibos
@@ -1299,29 +1459,31 @@ Fendo click en un encabezau de colunna se cambia o criterio d'ordenazión.",
 
 # Random page
 'randompage'         => "Una pachina á l'azar",
-'randompage-nopages' => 'No bi ha garra pachina en iste espazio de nombres.',
+'randompage-nopages' => 'No bi ha garra pachina en o espazio de nombres "$1".',
 
 # Random redirect
 'randomredirect'         => 'Ir-ie á una adreza cualsiquiera',
-'randomredirect-nopages' => 'No bi ha garra reendrezera en iste espazio de nombres.',
+'randomredirect-nopages' => 'No bi ha garra reendrezera en o espazio de nombres "$1".',
 
 # Statistics
-'statistics'             => 'Estatisticas',
-'sitestats'              => 'Estadisticas de {{SITENAME}}',
-'userstats'              => "Estadisticas d'usuario",
-'sitestatstext'          => "Bi ha un total de {{PLURAL:$1|'''1''' pachina|'''$1''' pachinas}} en a base de datos.
-Isto encluye pachinas de descusión, pachinas sobre {{SITENAME}}, borradors menimos, reendrezeras y atras que cal que no puedan estar consideratas pachinas de contenius.
-Sacando ixas pachinas, regular que bi aiga {{PLURAL:$2|1 pachina|'''$2''' pachinas}} de conteniu lechitimo.
-
-Bi ha '''$8''' {{PLURAL:$8|archibo alzato|archibos alzatos}} en o serbidor.
-
-Dende a debantadera d'o wiki bi ha abito un total de '''$3''' {{PLURAL:$3|besitas|besitas}} y '''$4''' {{PLURAL:$4|edizión de pachina|edizions de pachinas}}.
-Isto resulta en una meya de '''$5''' {{PLURAL:$5|edizión|edizions}} por pachina y '''$6''' {{PLURAL:$6|besita|besitas}} por edizión.
-
-A longaria d'a [http://www.mediawiki.org/wiki/Manual:Job_queue coda de quefers] ye de '''$7'''",
-'userstatstext'          => "Bi ha {{PLURAL:$1|'''1''' usuario rechistrato|'''$1''' usuarios rechistratos}},
-d'os que '''$2''' (o '''$4%''') {{PLURAL:$1|en ye $5|en son $5}}.",
-'statistics-mostpopular' => 'Pachinas más bistas',
+'statistics'                   => 'Estatisticas',
+'statistics-header-pages'      => 'Estatisticas de pachinas',
+'statistics-header-edits'      => "Estatisticas d'edizions",
+'statistics-header-views'      => 'Estatisticas de besitas',
+'statistics-header-users'      => "Estatisticas d'usuarios",
+'statistics-articles'          => 'Pachinas de contenito',
+'statistics-pages'             => 'Pachinas',
+'statistics-pages-desc'        => "Todas as pachinas d'o wiki, encluyendo pachinas de descusión, reendrezeras, etz.",
+'statistics-files'             => 'Archibos cargatos',
+'statistics-edits'             => 'Edizions en pachinas dende que se debantó {{SITENAME}}',
+'statistics-edits-average'     => "Meya d'edizions por pachina",
+'statistics-views-total'       => 'Total de besitas',
+'statistics-views-peredit'     => 'Besitas por edizión',
+'statistics-jobqueue'          => "Longaria d'a [http://www.mediawiki.org/wiki/Manual:Job_queue coda de treballos]",
+'statistics-users'             => '[[Special:ListUsers|Usuarios]] rechistratos',
+'statistics-users-active'      => 'Usuarios autibos',
+'statistics-users-active-desc' => 'Usuarios que han feito cualsiquier azión en {{PLURAL:$1|o zaguer día|os zaguers $1 días}}',
+'statistics-mostpopular'       => 'Pachinas más bistas',
 
 'disambiguations'      => 'Pachinas de desambigazión',
 'disambiguationspage'  => 'Template:Desambigazión',
@@ -1335,7 +1497,7 @@ Una pachina se considera pachina de desambigazión si fa serbir una plantilla pr
 'double-redirect-fixer'      => 'Apañador de reendrezeras',
 
 'brokenredirects'        => 'Reendrezeras crebatas',
-'brokenredirectstext'    => 'As siguients reendrezeras leban enta pachinas inesistents.',
+'brokenredirectstext'    => 'As siguients endrezeras leban enta pachinas inesistents.',
 'brokenredirects-edit'   => '(editar)',
 'brokenredirects-delete' => '(borrar)',
 
@@ -1365,26 +1527,30 @@ Una pachina se considera pachina de desambigazión si fa serbir una plantilla pr
 'popularpages'            => 'Pachinas populars',
 'wantedcategories'        => 'Categorías requiestas',
 'wantedpages'             => 'Pachinas requiestas',
-'missingfiles'            => 'Archibos que faltan',
+'wantedfiles'             => 'Archibos requiestos',
+'wantedtemplates'         => 'Plantillas requiestas',
 'mostlinked'              => 'Pachinas más enlazadas',
 'mostlinkedcategories'    => 'Categorías más enlazadas',
 'mostlinkedtemplates'     => 'Plantillas más binculatas',
 'mostcategories'          => 'Pachinas con más categorías',
 'mostimages'              => 'Archibos más emplegatos',
 'mostrevisions'           => 'Pachinas con más edizions',
-'prefixindex'             => 'Pachinas por prefixo',
+'prefixindex'             => 'Todas as pachinas con prefixo',
 'shortpages'              => 'Pachinas más curtas',
 'longpages'               => 'Pachinas más largas',
 'deadendpages'            => 'Pachinas sin salida',
 'deadendpagestext'        => 'As siguients pachinas no tienen binclos ta denguna atra pachina de {{SITENAME}}.',
 'protectedpages'          => 'Pachinas protechitas',
 'protectedpages-indef'    => 'Nomás protezions indefinitas',
+'protectedpages-cascade'  => 'Nomás protezions en cascada',
 'protectedpagestext'      => 'As siguients pachinas son protechitas contra edizions u treslaus',
 'protectedpagesempty'     => 'En iste inte no bi ha garra pachina protechita con ixos parametros.',
 'protectedtitles'         => 'Títols protechitos',
 'protectedtitlestext'     => 'Os siguients títols son protechitos ta pribar a suya creyazión',
 'protectedtitlesempty'    => 'En iste inte no bi ha garra títol protechito con ixos parametros.',
 'listusers'               => "Lista d'usuarios",
+'listusers-editsonly'     => 'Amostrar nomás usuarios con edizions',
+'usereditcount'           => '$1 {{PLURAL:$1|edizión|edizions}}',
 'newpages'                => 'Pachinas nuebas',
 'newpages-username'       => "Nombre d'usuario",
 'ancientpages'            => 'Pachinas más biellas',
@@ -1405,14 +1571,13 @@ Una pachina se considera pachina de desambigazión si fa serbir una plantilla pr
 'booksources-search-legend' => 'Mirar fuents de libros',
 'booksources-go'            => 'Ir-ie',
 'booksources-text'          => 'Contino ye una lista de binclos ta atros puestos an que benden libros nuebos y usatos, talment bi aiga más informazión sobre os libros que ye mirando.',
+'booksources-invalid-isbn'  => "O numero d'ISBN dato pareix que no ye conforme; comprebe si no bi ha garra error en copiar d'a fuent orichinal.",
 
 # Special:Log
 'specialloguserlabel'  => 'Usuario:',
 'speciallogtitlelabel' => 'Títol:',
 'log'                  => 'Rechistros',
 'all-logs-page'        => 'Toz os rechistros',
-'log-search-legend'    => 'Mirar rechistros',
-'log-search-submit'    => 'Ir-ie',
 'alllogstext'          => "Presentazión conchunta de toz os rechistros de  {{SITENAME}}.
 Puede reduzir o listau trigando un tipo de rechistro, o nombre de l'usuario (sensible á mayusclas), u a pachina afeutata (tamién sensible a mayusclas).",
 'logempty'             => 'No bi ha garra elemento en o rechistro con ixas carauteristicas.',
@@ -1424,6 +1589,7 @@ Puede reduzir o listau trigando un tipo de rechistro, o nombre de l'usuario (sen
 'nextpage'          => 'Siguient pachina ($1)',
 'prevpage'          => 'Pachina anterior ($1)',
 'allpagesfrom'      => 'Amostrar pachinas que prenzipien por:',
+'allpagesto'        => 'Amostrar as pachinas que rematen en:',
 'allarticles'       => 'Toz os articlos',
 'allinnamespace'    => 'Todas as pachinas (espazio $1)',
 'allnotinnamespace' => "Todas as pachinas (fueras d'o espazio de nombres $1)",
@@ -1443,40 +1609,68 @@ Se beigan tamién as [[Special:WantedCategories|categorías requiestas]].",
 'special-categories-sort-count' => 'ordenar por recuento',
 'special-categories-sort-abc'   => 'ordenar alfabeticament',
 
+# Special:DeletedContributions
+'deletedcontributions' => "Contrebuzions d'usuario borratas",
+
+# Special:LinkSearch
+'linksearch'       => 'Binclos esternos',
+'linksearch-pat'   => 'Mirar patrón:',
+'linksearch-ns'    => 'Espazio de nombres:',
+'linksearch-ok'    => 'Mirar',
+'linksearch-text'  => 'Pueden usar-se caráuters comodín como "*.wikipedia.org".<br />
+Protocolos suportados: <tt>$1</tt>',
+'linksearch-line'  => '$1 tiene un binclo dende $2',
+'linksearch-error' => "Os caráuters comodín nomás pueden apareixer en o prenzipio d'o nombre d'o sitio.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Amostrar usuarios que o nombre suyo prenzipie por:',
 'listusers-submit'   => 'Amostrar',
 'listusers-noresult' => "No s'ha trobato ixe usuario.",
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Rechistro de nuebos usuarios',
+'newuserlogpagetext'          => "Isto ye un rechistro de creyazión d'usuarios.",
+'newuserlog-byemail'          => 'Palabra de paso nimbiata por correu electronico',
+'newuserlog-create-entry'     => 'Nuebo usuario',
+'newuserlog-create2-entry'    => "s'ha creyato a nueba cuenta $1",
+'newuserlog-autocreate-entry' => 'Cuenta creyata automaticament',
+
 # Special:ListGroupRights
-'listgrouprights'          => "Dreitos d'a colla d'usuarios",
-'listgrouprights-summary'  => "Contino bi ye una lista de collas d'usuario definitas en iste wiki, con os suyos dreitos d'aczeso asoziatos. Tamién puet trobar aquí [[{{MediaWiki:Listgrouprights-helppage}}|informazión adizional]] sobre os dreitos indibiduals.",
-'listgrouprights-group'    => 'Colla',
-'listgrouprights-rights'   => 'Dreitos',
-'listgrouprights-helppage' => "Help:Dreitos d'a colla",
-'listgrouprights-members'  => '(lista de miembros)',
+'listgrouprights'                 => "Dreitos d'a colla d'usuarios",
+'listgrouprights-summary'         => "Contino bi ye una lista de collas d'usuario definitas en iste wiki, con os suyos dreitos d'aczeso asoziatos. Tamién puet trobar aquí [[{{MediaWiki:Listgrouprights-helppage}}|informazión adizional]] sobre os dreitos indibiduals.",
+'listgrouprights-group'           => 'Colla',
+'listgrouprights-rights'          => 'Dreitos',
+'listgrouprights-helppage'        => "Help:Dreitos d'a colla",
+'listgrouprights-members'         => '(lista de miembros)',
+'listgrouprights-addgroup'        => 'Puede adibir {{PLURAL:$2|colla|collas}}: $1',
+'listgrouprights-removegroup'     => 'Puede borrar {{PLURAL:$2|colla|collas}}: $1',
+'listgrouprights-addgroup-all'    => 'Puede adibir todas as collas',
+'listgrouprights-removegroup-all' => 'Puede borrar todas as collas',
 
 # E-mail user
-'mailnologin'     => "No nimbiar l'adreza",
-'mailnologintext' => "Ha d'aber [[Special:UserLogin|enzetato una sesión]] y tener una adreza de correu-e conforme en as suyas [[Special:Preferences|preferenzias]] ta nimbiar un correu eletronico ta atros usuarios.",
-'emailuser'       => 'Nimbiar un correu electronico ta iste usuario',
-'emailpage'       => "Nimbiar correu ta l'usuario",
-'emailpagetext'   => 'Puede fer serbir o formulario que bi ye contino ta nimbiar un correu eletronico á iste usuario.
+'mailnologin'      => "No nimbiar l'adreza",
+'mailnologintext'  => "Ha d'aber [[Special:UserLogin|enzetato una sesión]] y tener una adreza de correu-e conforme en as suyas [[Special:Preferences|preferenzias]] ta nimbiar un correu eletronico ta atros usuarios.",
+'emailuser'        => 'Nimbiar un correu electronico ta iste usuario',
+'emailpage'        => "Nimbiar correu ta l'usuario",
+'emailpagetext'    => 'Puede fer serbir o formulario que bi ye contino ta nimbiar un correu eletronico á iste usuario.
 L\'adreza de correu-e que endicó en as suyas [[Special:Preferences|preferenzias d\'usuario]] amaneixerá en o campo "Remitent" ta que o destinatario pueda responder-le.',
-'usermailererror' => "L'ocheto de correu retornó una error:",
-'defemailsubject' => 'Correu de {{SITENAME}}',
-'noemailtitle'    => 'No bi ha garra adreza de correu eletronico',
-'noemailtext'     => "Iste usuario no ha espezificato una adreza conforme de correu electronico, u s'ha estimato más no recullir correu electronico d'atros usuarios.",
-'emailfrom'       => 'De:',
-'emailto'         => 'Ta:',
-'emailsubject'    => 'Afer:',
-'emailmessage'    => 'Mensache:',
-'emailsend'       => 'Nimbiar',
-'emailccme'       => "Nimbiar-me una copia d'o mío mensache.",
-'emailccsubject'  => "Copia d'o suyo mensache ta $1: $2",
-'emailsent'       => 'Mensache de correu nimbiato',
-'emailsenttext'   => "S'ha nimbiato o suyo correu.",
-'emailuserfooter' => 'Iste correu-e s\'ha nimbiato por $1 ta $2 fendo serbir a funzión "Email user" de {{SITENAME}}.',
+'usermailererror'  => "L'ocheto de correu retornó una error:",
+'defemailsubject'  => 'Correu de {{SITENAME}}',
+'noemailtitle'     => 'No bi ha garra adreza de correu eletronico',
+'noemailtext'      => 'Iste usuario no ha espezificato una adreza conforme de correu electronico.',
+'nowikiemailtitle' => 'no se premiten os correus eletronicos',
+'nowikiemailtext'  => "Iste usuario ha esleyiu de no rezibir correus eletronicos d'atros usuarios.",
+'email-legend'     => 'Nimbiar un correu eletronico ta atro usuario de {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'Ta:',
+'emailsubject'     => 'Afer:',
+'emailmessage'     => 'Mensache:',
+'emailsend'        => 'Nimbiar',
+'emailccme'        => "Nimbiar-me una copia d'o mío mensache.",
+'emailccsubject'   => "Copia d'o suyo mensache ta $1: $2",
+'emailsent'        => 'Mensache de correu nimbiato',
+'emailsenttext'    => "S'ha nimbiato o suyo correu.",
+'emailuserfooter'  => 'Iste correu-e s\'ha nimbiato por $1 ta $2 fendo serbir a funzión "Email user" de {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Lista de seguimiento',
@@ -1506,12 +1700,7 @@ L\'adreza de correu-e que endicó en as suyas [[Special:Preferences|preferenzias
 'iteminvalidname'      => "Bi ha un problema con l'articlo '$1', o nombre no ye conforme...",
 'wlnote'               => "Contino se i {{PLURAL:$1|amuestra o zaguer cambeo|amuestran os zaguers '''$1''' cambeos}} en {{PLURAL:$2|a zaguer ora|as zagueras '''$2''' oras}}.",
 'wlshowlast'           => 'Amostrar as zagueras $1 horas, $2 días u $3',
-'watchlist-show-bots'  => 'Amostrar as edizions feitas por bots',
-'watchlist-hide-bots'  => 'Amagar as edizions de bots',
-'watchlist-show-own'   => 'Amostrar as mías edizions',
-'watchlist-hide-own'   => 'Amagar as mías edizions',
-'watchlist-show-minor' => 'Amostrar as edizions menors',
-'watchlist-hide-minor' => 'Amagar edizions menors',
+'watchlist-options'    => "Opzions d'a lista de seguimiento",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Cosirando...',
@@ -1554,85 +1743,104 @@ Ta cambiar as opzions d\'a suya lista de seguimiento en:
 Ta obtenir más informazión y aduya:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Borrar ista pachina',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "O conteniu yera: '$1'",
-'excontentauthor'             => "O conteniu yera: '$1' (y o suyo unico autor '$2')",
-'exbeforeblank'               => "O conteniu antis de blanquiar yera: '$1'",
-'exblank'                     => 'a pachina yera bueda',
-'delete-confirm'              => 'Borrar "$1"',
-'delete-legend'               => 'Borrar',
-'historywarning'              => 'Pare cuenta: A pachina que ba a borrar tiene un istorial de cambeos:',
-'confirmdeletetext'           => "Ye amanato á borrar d'a base de datos una pachina con tot o suyo istorial.
+# Delete
+'deletepage'             => 'Borrar ista pachina',
+'confirm'                => 'Confirmar',
+'excontent'              => "O conteniu yera: '$1'",
+'excontentauthor'        => "O conteniu yera: '$1' (y o suyo unico autor '$2')",
+'exbeforeblank'          => "O conteniu antis de blanquiar yera: '$1'",
+'exblank'                => 'a pachina yera bueda',
+'delete-confirm'         => 'Borrar "$1"',
+'delete-legend'          => 'Borrar',
+'historywarning'         => 'Pare cuenta: A pachina que ba a borrar tiene un istorial de cambeos:',
+'confirmdeletetext'      => "Ye amanato á borrar d'a base de datos una pachina con tot o suyo istorial.
 Por fabor, confirme que reyalment ye mirando de fer ixo, que entiende as consecuenzias, y que lo fa d'alcuerdo con as [[{{MediaWiki:Policy-url}}|politicas]] d'o wiki.",
-'actioncomplete'              => 'Aizión rematada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ha estato borrato.
+'actioncomplete'         => 'Aizión rematada',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ha estato borrato.
 Se beiga en $2 un rechistro d\'os borraus rezients.',
-'deletedarticle'              => 'borrato "$1"',
-'suppressedarticle'           => 's\'ha supreso "[[$1]]"',
-'dellogpage'                  => 'Rechistro de borraus',
-'dellogpagetext'              => "Contino se i amuestra una lista d'os borraus más rezients.",
-'deletionlog'                 => 'rechistro de borraus',
-'reverted'                    => 'Tornato ta una bersión anterior',
-'deletecomment'               => 'Razón ta borrar:',
-'deleteotherreason'           => 'Otras/Más razons:',
-'deletereasonotherlist'       => 'Otra razón',
-'deletereason-dropdown'       => "*Razons comuns de borrau
+'deletedarticle'         => 'borrato "$1"',
+'suppressedarticle'      => 's\'ha supreso "[[$1]]"',
+'dellogpage'             => 'Rechistro de borraus',
+'dellogpagetext'         => "Contino se i amuestra una lista d'os borraus más rezients.",
+'deletionlog'            => 'rechistro de borraus',
+'reverted'               => 'Tornato ta una bersión anterior',
+'deletecomment'          => 'Razón ta borrar:',
+'deleteotherreason'      => 'Otras/Más razons:',
+'deletereasonotherlist'  => 'Otra razón',
+'deletereason-dropdown'  => "*Razons comuns de borrau
 ** � demanda d'o mesmo autor
 ** trencadura de copyright
 ** Bandalismo",
-'delete-edit-reasonlist'      => "Editar as razons d'o borrau",
-'delete-toobig'               => "Ista pachina tiene un istorial d'edizión prou largo, con más de $1 {{PLURAL:$1|bersión|bersions}}. S'ha restrinchito o borrau d'ista mena de pachinas ta aprebenir d'a corrompizión azidental de {{SITENAME}}.",
-'delete-warning-toobig'       => "Ista pachina tiene un istorial d'edizión prou largo, con más de $1 {{PLURAL:$1|bersión|bersions}}. Si la borra puede corromper as operazions d'a base de datos de {{SITENAME}}; contine con ficazio.",
-'rollback'                    => 'Esfer edizions',
-'rollback_short'              => 'Esfer',
-'rollbacklink'                => 'Esfer',
-'rollbackfailed'              => "No s'ha puesto esfer",
-'cantrollback'                => "No se pueden esfer as edizions; o zaguer colaborador ye o unico autor d'iste articlo.",
-'alreadyrolled'               => 'No se puede esfer a zaguer edizión de [[:$1]] feita por [[User:$2|$2]] ([[User talk:$2|descusión]]|[[Special:Contributions/$2|{{int:contribslink}}]]); belatro usuario ya ha editato u esfeito una edizión en ixa pachina. 
-
-A zaguer edizión la fazió [[User:$3|$3]] ([[User talk:$3|descusión]]|[[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'O comentario d\'a edizión ye: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "S'han esfeito as edizions de [[Special:Contributions/$2|$2]] ([[User talk:$2|Descusión]]); retornando t'a zaguera bersión editada por [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "Esfeitas as edizions de $1; s'ha retornato á la zaguer bersión de $2.",
-'sessionfailure'              => 'Pareix que bi ha un problema con a suya sesión;
+'delete-edit-reasonlist' => "Editar as razons d'o borrau",
+'delete-toobig'          => "Ista pachina tiene un istorial d'edizión prou largo, con más de $1 {{PLURAL:$1|bersión|bersions}}. S'ha restrinchito o borrau d'ista mena de pachinas ta aprebenir d'a corrompizión azidental de {{SITENAME}}.",
+'delete-warning-toobig'  => "Ista pachina tiene un istorial d'edizión prou largo, con más de $1 {{PLURAL:$1|bersión|bersions}}. Si la borra puede corromper as operazions d'a base de datos de {{SITENAME}}; contine con ficazio.",
+
+# Rollback
+'rollback'         => 'Esfer edizions',
+'rollback_short'   => 'Esfer',
+'rollbacklink'     => 'Esfer',
+'rollbackfailed'   => "No s'ha puesto esfer",
+'cantrollback'     => "No se pueden esfer as edizions; o zaguer colaborador ye o unico autor d'iste articlo.",
+'alreadyrolled'    => "No se puet desfer a zaguer edizión de [[:$1]] feita por [[User:$2|$2]] ([[User talk:$2|descusión]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); belatro usuario ya ha editato u desfeito edizions en ixa pachina. 
+
+A zaguer edizión d'a pachina la fazió [[User:$3|$3]] ([[User talk:$3|descusión]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
+'editcomment'      => "O resumen d'a edizión ye: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => "S'han esfeito as edizions de [[Special:Contributions/$2|$2]] ([[User talk:$2|Descusión]]); retornando t'a zaguera bersión editada por [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "Esfeitas as edizions de $1; s'ha retornato á la zaguer bersión de $2.",
+'sessionfailure'   => 'Pareix que bi ha un problema con a suya sesión;
 s\'ha anulato ista aizión como mida de precura contra secuestros de sesión.
 Por fabor, prete "Entazaga", recargue a pachina d\'a que benió, y torne á prebar alabez.',
+
+# Protect
 'protectlogpage'              => 'Protezions de pachinas',
 'protectlogtext'              => 'Contino se i amuestra una lista de protezions y esprotezions de pachinas. Se beiga [[Special:ProtectedPages|lista de pachinas protechitas]] ta más informazión.',
 'protectedarticle'            => "s'ha protechito [[$1]]",
 'modifiedarticleprotection'   => 's\'ha cambiato o libel de protezión de "[[$1]]"',
 'unprotectedarticle'          => "s'ha esprotechito [[$1]]",
+'movedarticleprotection'      => 'camiatos os parametros de protezión de "[[$2]]" á "[[$1]]"',
 'protect-title'               => 'Protechendo "$1"',
+'prot_1movedto2'              => '[[$1]] tresladada á [[$2]]',
 'protect-legend'              => 'Confirmar protezión',
 'protectcomment'              => 'Razón:',
 'protectexpiry'               => 'Calendata de caduzidat:',
 'protect_expiry_invalid'      => 'Tiempo de zircunduzión incorreuto.',
 'protect_expiry_old'          => 'O tiempo de caduzidat ye una calendata ya pasata.',
 'protect-unchain'             => 'Confegurar premisos ta treslaus',
-'protect-text'                => "Puede beyer y cambiar o libel e protezión d'a pachina <strong><nowiki>$1</nowiki></strong>.",
-'protect-locked-blocked'      => "No puede cambiar os libels de protezión mientres ye bloqueyato. Contino se i amuestran as opzions autuals d'a pachina <strong>$1</strong>:",
+'protect-text'                => "Puede beyer y cambiar o libel e protezión d'a pachina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "No puede cambiar os libels de protezión mientres ye bloqueyato. Contino se i amuestran as opzions autuals d'a pachina '''$1''':",
 'protect-locked-dblock'       => "Os libels de protezión no se pueden cambiar por un bloqueyo autibo d'a base de datos.
-Contino se i amuestran as opzions autuals d'a pachina <strong>$1</strong>:",
-'protect-locked-access'       => "A suya cuenta no tiene premiso ta cambiar os libels de protezión d'as pachinas. Aquí bi son as propiedaz autuals d'a pachina <strong>$1</strong>:",
+Contino se i amuestran as opzions autuals d'a pachina '''$1''':",
+'protect-locked-access'       => "A suya cuenta no tiene premiso ta cambiar os libels de protezión d'as pachinas. Aquí bi son as propiedaz autuals d'a pachina '''$1''':",
 'protect-cascadeon'           => "Ista pachina ye autualment protechita por estar encluyita en {{PLURAL:$1|a siguient pachina|as siguients pachinas}}, que tienen autibata a opzión de protezión en cascada. Puede cambiar o libel de protezión d'ista pachina, pero no afeutará á la protezión en cascada.",
-'protect-default'             => '(por defeuto)',
+'protect-default'             => 'Premitir á toz os usuarios',
 'protect-fallback'            => 'Amenista o premiso "$1"',
-'protect-level-autoconfirmed' => 'bloqueyar usuarios no rechistratos',
+'protect-level-autoconfirmed' => 'Bloqueyar os usuarios nuebos y no rechistratos',
 'protect-level-sysop'         => 'Sólo almenistradors',
 'protect-summary-cascade'     => 'en cascada',
 'protect-expiring'            => 'caduca o $1 (UTC)',
+'protect-expiry-indefinite'   => 'indefinito',
 'protect-cascade'             => 'Protezión en cascada - protecher totas as pachinas encluyidas en ista.',
 'protect-cantedit'            => "No puede cambiar os libels de protezión d'ista pachina, porque no tiene premiso ta editar-la.",
+'protect-othertime'           => 'atro periodo:',
+'protect-othertime-op'        => 'atra (espezificar)',
+'protect-existing-expiry'     => 'Calendata de zircunduzión autual: $2 a las $3',
+'protect-otherreason'         => 'Atra razón:',
+'protect-otherreason-op'      => 'atra razón',
+'protect-dropdown'            => "*Razons de protezión eszesibo
+**Bandalismo eszesibo
+**Spam eszesibo
+**Guerra d'edizions
+**Pachina muit besitada",
+'protect-edit-reasonlist'     => 'Editar as razons ta protecher',
+'protect-expiry-options'      => '2 oras:2 hours,1 día:1 day,3 días:3 days,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 año:1 year,ta cutio:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Premiso:',
 'restriction-level'           => 'Libel de restrizión:',
 'minimum-size'                => 'Grandaria menima',
-'maximum-size'                => 'Grandaria maisima:',
+'maximum-size'                => 'Grandaria masima:',
 'pagesize'                    => '(bytes)',
 
 # Restrictions (nouns)
-'restriction-edit'   => 'Editar',
+'restriction-edit'   => 'Edizión',
 'restriction-move'   => 'Tresladar',
 'restriction-create' => 'Creyar',
 'restriction-upload' => 'Carga',
@@ -1647,7 +1855,7 @@ Contino se i amuestran as opzions autuals d'a pachina <strong>$1</strong>:",
 'undeletepage'                 => 'Beyer y restaurar pachinas borratas',
 'undeletepagetitle'            => "'''Contino s'amuestran as bersión borratas de [[:$1]]'''.",
 'viewdeletedpage'              => 'Beyer pachinas borratas',
-'undeletepagetext'             => "As pachinas siguiens han siu borradas, pero encara son en l'archibo y podría estar restauradas. El archibo se borra periodicamén.",
+'undeletepagetext'             => "{{PLURAL:$1|A pachina siguent ye estada borrata pera encara ye|As siguients $1 pachinas son estadas borratas pero encara son}} en l'archibo y {{PLURAL:$1|podría restaurar-se|podrían restaurar-sen}}. L'archibo se borra periodicament.",
 'undelete-fieldset-title'      => 'Restaurar bersions',
 'undeleteextrahelp'            => "Ta restaurar tot o istorial de bersions d'una pachina, deixe todas as caixetas sin siñalar y prete '''''Restaurar!'''''. Ta restaurar sólo belunas d'as bersions, siñale as caixetas correspondients á las bersions que quiere restaurar y punche dimpués en '''''Restaurar!'''''. Punchando en '''''Prenzipiar''''' se borrará o comentario y se tirarán os siñals d'as caixetas.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|bersión|bersions}} archibatas',
@@ -1655,12 +1863,13 @@ Contino se i amuestran as opzions autuals d'a pachina <strong>$1</strong>:",
 Si s'ha creyato una nueba pachina con o mesmo nombre dende que se borró a orichinal, as bersions restauradas amaneixerán antes en o istorial.",
 'undeleterevdel'               => "No s'esfará o borrau si isto resulta en o borrau parzial d'a pachina d'alto u a rebisión de l'archibo. En ixe caso, deselezione u amuestre as bersions borratas más rezients.",
 'undeletehistorynoadmin'       => "Esta pachina ye borrata. A razón d'o suyo borrau s'amuestra más t'abaixo en o resumen, asinas como os detalles d'os usuarios que eban editato a pachina antes d'o borrau. O testo completo d'istas edizions borratas ye disponible nomás ta os almenistradors.",
-'undelete-revision'            => "S'ha borrato a bersión de $1 de $2 (por $3):",
+'undelete-revision'            => 'Bersión borrata de $1 (editada por $3, o $4 á las $5):',
 'undeleterevision-missing'     => "Bersión no conforme u no trobata. Regular que o binclo sia incorreuto u que a bersión aiga estato restaurata u borrata de l'archibo.",
 'undelete-nodiff'              => "No s'ha trobato garra bersión anterior.",
 'undeletebtn'                  => 'Restaurar!',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Prenzipiar',
+'undeleteinvert'               => 'Contornar selezión',
 'undeletecomment'              => 'Razón ta restaurar:',
 'undeletedarticle'             => 'restaurata "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|Una edizión restaurata|$1 edizions restauratas}}',
@@ -1692,26 +1901,27 @@ $1',
 'blanknamespace' => '(Prenzipal)',
 
 # Contributions
-'contributions' => "Contrebuzions de l'usuario",
-'mycontris'     => 'Contrebuzions',
-'contribsub2'   => 'De $1 ($2)',
-'nocontribs'    => "No s'han trobato cambeos que concordasen con ixos criterios",
-'uctop'         => '(zaguer cambeo)',
-'month'         => 'Dende o mes (y anteriors):',
-'year'          => "Dende l'año (y anteriors):",
-
-'sp-contributions-newbies'     => "Amostrar nomás as contrebuzions d'os usuarios nuebos",
-'sp-contributions-newbies-sub' => 'Por usuarios nuebos',
-'sp-contributions-blocklog'    => 'Rechistro de bloqueyos',
-'sp-contributions-search'      => 'Mirar contrebuzions',
-'sp-contributions-username'    => "Adreza IP u nombre d'usuario:",
-'sp-contributions-submit'      => 'Mirar',
+'contributions'       => "Contrebuzions de l'usuario",
+'contributions-title' => "Contrebuzions de l'usuario $1",
+'mycontris'           => 'Contrebuzions',
+'contribsub2'         => 'De $1 ($2)',
+'nocontribs'          => "No s'han trobato cambeos que concordasen con ixos criterios",
+'uctop'               => '(zaguer cambeo)',
+'month'               => 'Dende o mes (y anteriors):',
+'year'                => "Dende l'año (y anteriors):",
+
+'sp-contributions-newbies'       => "Amostrar nomás as contrebuzions d'os usuarios nuebos",
+'sp-contributions-newbies-sub'   => 'Por usuarios nuebos',
+'sp-contributions-newbies-title' => "Contrebuzions d'os nuebos usuarios",
+'sp-contributions-blocklog'      => 'Rechistro de bloqueyos',
+'sp-contributions-search'        => 'Mirar contrebuzions',
+'sp-contributions-username'      => "Adreza IP u nombre d'usuario:",
+'sp-contributions-submit'        => 'Mirar',
 
 # What links here
 'whatlinkshere'            => 'Pachinas que enlazan con ista',
 'whatlinkshere-title'      => 'Pachinas que tienen binclos ta $1',
 'whatlinkshere-page'       => 'Pachina:',
-'linklistsub'              => '(Lista de binclos)',
 'linkshere'                => "As siguients pachinas tienen binclos enta '''[[:$1]]''':",
 'nolinkshere'              => "Denguna pachina tiene binclos ta '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Denguna pachina d'o espazio de nombres trigato tiene binclos ta '''[[:$1]]'''.",
@@ -1760,6 +1970,8 @@ as pachinas que s'han bandalizato).",
 'ipbotherreason'                  => 'Razons diferens u adizionals',
 'ipbhidename'                     => "Amagar usuario en o rechistro de bloqueyos, a lista de bloqueyos autibos y a lista d'usuarios",
 'ipbwatchuser'                    => "Cosirar as pachinas d'usuario y de descusión d'iste usuario",
+'ipballowusertalk'                => 'Premitir que iste usuario edite a suya pachina de descusión en o tiempo que ye bloqueyato',
+'ipb-change-block'                => "Rebloquyear á l'usuario con istas condizions",
 'badipaddress'                    => "L'adreza IP no ye conforme.",
 'blockipsuccesssub'               => "O bloqueyo s'ha feito correutament",
 'blockipsuccesstext'              => "L'adreza IP [[Special:Contributions/$1|$1]] ye bloqueyata. <br />Ir t'a [[Special:IPBlockList|lista d'adrezas IP bloqueyatas]] ta beyer os bloqueyos.",
@@ -1768,14 +1980,18 @@ as pachinas que s'han bandalizato).",
 'ipb-unblock'                     => 'Esbloqueyar un usuario u una IP',
 'ipb-blocklist-addr'              => 'Bloqueyos autuals de $1',
 'ipb-blocklist'                   => 'Amostrar bloqueyos autuals',
+'ipb-blocklist-contribs'          => 'Contrebuzions de $1',
 'unblockip'                       => 'Esbloqueyar usuario',
 'unblockiptext'                   => "Replene o formulario que bi ha contino ta tornar os premisos d'escritura ta una adreza IP u cuenta d'usuario que aiga estato bloqueyata.",
-'ipusubmit'                       => 'Esbloqueyar ista adreza',
+'ipusubmit'                       => 'Debantar ista bloqueyo',
 'unblocked'                       => '[[User:$1|$1]] ha estato esbloqueyato',
 'unblocked-id'                    => "S'ha sacato o bloqueyo $1",
 'ipblocklist'                     => "Adrezas IP y nombres d'usuario bloqueyatos",
 'ipblocklist-legend'              => 'Mirar un usuario bloqueyato',
 'ipblocklist-username'            => "Nombre d'usuario u adreza IP:",
+'ipblocklist-sh-userblocks'       => '$1 bloqueyos de cuentas',
+'ipblocklist-sh-tempblocks'       => '$1 bloqueyos temporals',
+'ipblocklist-sh-addressblocks'    => "$1 bloqueyos d'adrezas IP endibiduals",
 'ipblocklist-submit'              => 'Mirar',
 'blocklistline'                   => '$1, $2 ha bloqueyato á $3 ($4)',
 'infiniteblock'                   => 'infinito',
@@ -1784,25 +2000,32 @@ as pachinas que s'han bandalizato).",
 'noautoblockblock'                => 'Bloqueyo automatico desautibato',
 'createaccountblock'              => "S'ha bloqueyato a creyazión de nuebas cuentas",
 'emailblock'                      => "S'ha bloqueyato o nimbió de correus electronicos",
+'blocklist-nousertalk'            => 'No puet editar a suya propia pachina de descusión',
 'ipblocklist-empty'               => 'A lista de bloqueyos ye bueda.',
 'ipblocklist-no-results'          => "A cuenta d'usuario u adreza IP endicata no ye bloqueyata.",
 'blocklink'                       => 'bloqueyar',
 'unblocklink'                     => 'esbloqueyar',
+'change-blocklink'                => 'cambear bloque',
 'contribslink'                    => 'contrebuzions',
 'autoblocker'                     => 'Ye bloqueyato automaticament porque a suya adreza IP l\'ha feito serbir rezientement "[[User:$1|$1]]". A razón data ta bloqueyar á "[[User:$1|$1]]" estió "$2".',
 'blocklogpage'                    => 'Rechistro de bloqueyos',
+'blocklog-fulllog'                => 'Rechistro de bloqueyos completo',
 'blocklogentry'                   => "S'ha bloqueyato á [[$1]] con una durada de $2 $3",
+'reblock-logentry'                => 'cambiato o bloqueyo de [[$1]] con zircunduzión o $3 á las $2',
 'blocklogtext'                    => "Isto ye un rechistro de bloqueyos y esbloqueyos d'usuarios. As adrezas bloqueyatas automaticament no amaneixen aquí. Mire-se a [[Special:IPBlockList|lista d'adrezas IP bloqueyatas]] ta beyer a lista autual de biedas y bloqueyos.",
 'unblocklogentry'                 => 'ha esbloqueyato á "$1"',
 'block-log-flags-anononly'        => 'nomás os usuarios anonimos',
 'block-log-flags-nocreate'        => "s'ha desautibato a creyazión de cuentas",
 'block-log-flags-noautoblock'     => "s'ha desautibato o bloqueyo automatico",
 'block-log-flags-noemail'         => "s'ha desautibato o nimbío de mensaches por correu electronico",
+'block-log-flags-nousertalk'      => 'no puet editar a suya pachina de descusión',
 'block-log-flags-angry-autoblock' => "s'ha autibato l'autobloqueyo amillorato",
 'range_block_disabled'            => "A posibilidat d'os almenistradors de bloqueyar rangos d'adrezas IP ye desautibata.",
 'ipb_expiry_invalid'              => 'O tiempo de zircunduzión no ye conforme.',
 'ipb_expiry_temp'                 => "Os bloqueyos con nombre d'usuario amagato abría d'estar ta cutio.",
 'ipb_already_blocked'             => '"$1" ya yera bloqueyato',
+'ipb-needreblock'                 => "== Ya ye bloqueyato ==
+$1 ya ye bloqueyato. Quiere cambiar as condizions d'o bloqueyo?",
 'ipb_cant_unblock'                => "'''Error''': no s'ha trobato o ID de bloqueyo $1. Talment sía ya esbloqueyato.",
 'ipb_blocked_as_range'            => "Error: L'adreza IP $1 no s'ha bloqueyato dreitament y por ixo no se puede esbloqueyar. Manimenos, ye bloqueyata por estar parte d'o rango $2, que sí buede esbloqueyar-se de conchunta.",
 'ip_range_invalid'                => "O rango d'adrezas IP no ye conforme.",
@@ -1813,6 +2036,7 @@ as pachinas que s'han bandalizato).",
 'proxyblocksuccess'               => 'Feito.',
 'sorbsreason'                     => 'A suya adreza IP ye en a lista de proxies ubiertos en a DNSBL de {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'A suya adreza IP ye en a lista de proxies ubiertos en a DNSBL de {{SITENAME}}. No puede creyar una cuenta',
+'cant-block-while-blocked'        => 'No puet bloqueyar á atros usuarios en o tiempo que ye bloqueyato.',
 
 # Developer tools
 'lockdb'              => 'Trancar a base de datos',
@@ -1833,9 +2057,9 @@ Alcuerde-se-ne d'[[Special:UnlockDB|estrancar a base de datos]] dimpués de rema
 'databasenotlocked'   => 'A base de datos no ye trancata.',
 
 # Move page
-'move-page'               => 'Tresladar $1',
-'move-page-legend'        => 'Tresladar pachina',
-'movepagetext'            => "Fendo serbir o formulario siguient se cambiará o nombre d'a pachina, tresladando tot o suyo istorial t'o nuebo nombre.
+'move-page'                    => 'Tresladar $1',
+'move-page-legend'             => 'Tresladar pachina',
+'movepagetext'                 => "Fendo serbir o formulario siguient se cambiará o nombre d'a pachina, tresladando tot o suyo istorial t'o nuebo nombre.
 O títol anterior se tornará en una reendrezera ta o nuebo títol.
 Puede esbiellar automaticament as reendrezeras que plegan ta o títol orichina.
 Si s'estima más de no fer-lo, asegure-se de no deixar [[Special:DoubleRedirects|reendrezeras dobles]] u [[Special:BrokenRedirects|crebatas]].
@@ -1847,48 +2071,61 @@ Isto senifica que podrá tresladar una pachina á lo suyo títol orichinal si ha
 '''¡PARE CUENTA!'''
 Iste puede estar un cambio drastico e inasperato ta una pachina popular;
 por fabor, asegure-se d'acatar as consecuenzias que acarriará ista aizión antis de seguir entadebant.",
-'movepagetalktext'        => "A pachina de descusión asoziata será tresladata automaticament '''de no estar que:'''
+'movepagetalktext'             => "A pachina de descusión asoziata será tresladata automaticament '''de no estar que:'''
 
 *Ya esista una pachina de descusión no bueda con o nombre nuebo, u
 *Desautibe a caixeta d'abaxo.
 
 En ixos casos, si lo deseya, abrá de tresladar u combinar manualment o conteniu d'a pachina de descusión.",
-'movearticle'             => 'Tresladar pachina:',
-'movenotallowed'          => 'No tiene premisos ta tresladar pachinas.',
-'newtitle'                => 'Ta o nuebo títol',
-'move-watch'              => 'Cosirar iste articlo',
-'movepagebtn'             => 'Tresladar pachina',
-'pagemovedsub'            => 'Treslado feito correutament',
-'movepage-moved'          => "<big>S'ha tresladato '''\"\$1\"  ta \"\$2\"'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Ya bi ha una pachina con ixe nombre u o nombre que ha eslechito no ye conforme. Por fabor trigue un atro nombre.',
-'cantmove-titleprotected' => 'No puede tresladar una pachina ta íste títol porque o nuebo títol ye protechito y no puede estar creyato',
-'talkexists'              => "A pachina s'ha tresladato correutament, pero a descusión no s'ha puesto tresladar porque ya esiste una con o nuebo títol. Por fabor, encorpore manualment o suyo conteniu.",
-'movedto'                 => 'tresladato ta',
-'movetalk'                => 'Tresladar a pachina de descusión asoziata.',
-'move-subpages'           => 'Tresladar todas as sozpachinas (si ye posible)',
-'move-talk-subpages'      => "Tresladar todas as sozpachinas d'a descusión (si ye posible)",
-'movepage-page-exists'    => 'A pachina $1 ya esiste y no se puede sobrescribir automaticament.',
-'movepage-page-moved'     => "S'ha tresladato a pachina $1 ta $2.",
-'movepage-page-unmoved'   => "No s'ha puesto tresladar a pachina $1 ta $2.",
-'movepage-max-pages'      => "S'han tresladato o masimo posible de $1 {{PLURAL:$1|pachina|pachinas}} y no se tresladarán más automaticament.",
-'1movedto2'               => '[[$1]] tresladada á [[$2]]',
-'1movedto2_redir'         => '[[$1]] tresladada á [[$2]] sobre una reendrezera',
-'movelogpage'             => 'Rechistro de treslatos',
-'movelogpagetext'         => 'Contino se i amuestra una lista de pachinas tresladatas.',
-'movereason'              => 'Razón:',
-'revertmove'              => 'esfer',
-'delete_and_move'         => 'Borrar y tresladar',
-'delete_and_move_text'    => '==S\'amenista borrar a pachina==
+'movearticle'                  => 'Tresladar pachina:',
+'movenologin'                  => 'No ha enzetato sesión',
+'movenologintext'              => 'Amenista estar un usuario rechistrato y [[Special:UserLogin|aber-se identificato enzetando una sesión]] ta tresladar una pachina.',
+'movenotallowed'               => 'No tiene premisos ta tresladar pachinas.',
+'movenotallowedfile'           => 'No tien premiso ta tresladar archibos.',
+'cant-move-user-page'          => "No tien premiso ta tresladar pachinas d'usuario (fueras de subpachinas).",
+'cant-move-to-user-page'       => "No tiene premisos ta tresladar una pachina ta una pachina d'usuario (fueras de si ye ta una subpachina).",
+'newtitle'                     => 'Ta o nuebo títol',
+'move-watch'                   => 'Cosirar iste articlo',
+'movepagebtn'                  => 'Tresladar pachina',
+'pagemovedsub'                 => 'Treslado feito correutament',
+'movepage-moved'               => "<big>S'ha tresladato '''\"\$1\"  ta \"\$2\"'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => "S'ha creyato una reendrezera.",
+'movepage-moved-noredirect'    => "S'ha canzelato a creyazión d'una reendrezera.",
+'articleexists'                => 'Ya bi ha una pachina con ixe nombre u o nombre que ha eslechito no ye conforme. Por fabor trigue un atro nombre.',
+'cantmove-titleprotected'      => 'No puede tresladar una pachina ta íste títol porque o nuebo títol ye protechito y no puede estar creyato',
+'talkexists'                   => "A pachina s'ha tresladato correutament, pero a descusión no s'ha puesto tresladar porque ya esiste una con o nuebo títol. Por fabor, encorpore manualment o suyo conteniu.",
+'movedto'                      => 'tresladato ta',
+'movetalk'                     => 'Tresladar a pachina de descusión asoziata.',
+'move-subpages'                => 'Tresladar todas as sozpachinas (si ye posible)',
+'move-talk-subpages'           => "Tresladar todas as sozpachinas d'a descusión (si ye posible)",
+'movepage-page-exists'         => 'A pachina $1 ya esiste y no se puede sobrescribir automaticament.',
+'movepage-page-moved'          => "S'ha tresladato a pachina $1 ta $2.",
+'movepage-page-unmoved'        => "No s'ha puesto tresladar a pachina $1 ta $2.",
+'movepage-max-pages'           => "S'han tresladato o masimo posible de $1 {{PLURAL:$1|pachina|pachinas}} y no se tresladarán más automaticament.",
+'1movedto2'                    => '[[$1]] tresladada á [[$2]]',
+'1movedto2_redir'              => '[[$1]] tresladada á [[$2]] sobre una reendrezera',
+'move-redirect-suppressed'     => 'reendrezera eliminata',
+'movelogpage'                  => 'Rechistro de treslatos',
+'movelogpagetext'              => 'Contino se i amuestra una lista de pachinas tresladatas.',
+'movereason'                   => 'Razón:',
+'revertmove'                   => 'esfer',
+'delete_and_move'              => 'Borrar y tresladar',
+'delete_and_move_text'         => '==S\'amenista borrar a pachina==
 
 A pachina de destino ("[[:$1]]") ya esiste. Quiere borrar-la ta premitir o treslau?',
-'delete_and_move_confirm' => 'Sí, borrar a pachina',
-'delete_and_move_reason'  => 'Borrata ta premitir o treslau',
-'selfmove'                => "Os títols d'orichen y destino son os mesmos. No se puede tresladar una pachina ta ella mesma.",
-'immobile_namespace'      => "O títol de destino ye d'una mena espezial. No se puede tresladar pachinas ta iste espazio de nombres.",
-'imagenocrossnamespace'   => "No se puede tresladar un archibo ta un espazio de nombres que no sía t'archibos",
-'imagetypemismatch'       => "A nueba estensión no concuerda con o tipo d'archibo",
-'imageinvalidfilename'    => "O nombre de l'archibo obchetibo no ye conforme",
-'fix-double-redirects'    => 'Esbiellar todas as reendrezeras que plegan ta o títol orichinal',
+'delete_and_move_confirm'      => 'Sí, borrar a pachina',
+'delete_and_move_reason'       => 'Borrata ta premitir o treslau',
+'selfmove'                     => "Os títols d'orichen y destino son os mesmos. No se puede tresladar una pachina ta ella mesma.",
+'immobile-source-namespace'    => 'No puede tresladar pachinas en o espazio de nombres "$1"',
+'immobile-target-namespace'    => 'No puede tresladar pachinas enta o espazio de nombres "$1"',
+'immobile-target-namespace-iw' => 'No se puet tresladar una pachina enta un binclo interwiki.',
+'immobile-source-page'         => 'Ista pachina no se puet tresladar.',
+'immobile-target-page'         => 'No se puet tresladar ta ixe títol.',
+'imagenocrossnamespace'        => "No se puede tresladar un archibo ta un espazio de nombres que no sía t'archibos",
+'imagetypemismatch'            => "A nueba estensión no concuerda con o tipo d'archibo",
+'imageinvalidfilename'         => "O nombre de l'archibo obchetibo no ye conforme",
+'fix-double-redirects'         => 'Esbiellar todas as reendrezeras que plegan ta o títol orichinal',
+'move-leave-redirect'          => 'Deixar una reendrezera',
 
 # Export
 'export'            => 'Esportar as pachinas',
@@ -1896,7 +2133,7 @@ A pachina de destino ("[[:$1]]") ya esiste. Quiere borrar-la ta premitir o tresl
 
 Ta esportar pachinas, escriba os títols en a caixa de testo que bi ha más ta baixo, metendo un títol en cada linia, y eslicha si quiere esportar a bersión autual con as bersions anteriors y as lineas de l'istorial u nomás a bersión autual con a informazión sobre a zaguer edizión.
 
-En iste zaguer caso tamién puede usar un binclo, por exemplo [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] t'a pachina \"[[{{MediaWiki:Mainpage}}]]\".",
+En iste zaguer caso tamién puede usar un binclo, por exemplo [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] t'a pachina \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => "Encluye nomás a bersión autual, no l'istorial de bersions completo.",
 'exportnohistory'   => "----
 '''Nota:''' A esportazión de istorials de pachinas á trabiés d'iste formulario ye desautibata por problemas en o rendimiento d'o serbidor.",
@@ -1912,7 +2149,7 @@ En iste zaguer caso tamién puede usar un binclo, por exemplo [[{{ns:special}}:E
 'allmessagesdefault'        => 'Testo por defeuto',
 'allmessagescurrent'        => 'Testo autual',
 'allmessagestext'           => "Ista ye una lista de toz os mensaches disponibles en o espazio de nombres MediaWiki.
-Besite por fabor [http://www.mediawiki.org/wiki/Localisation a pachina sobre localizazión de MediaWiki] y  [http://translatewiki.net Betawiki] si deseya contrebuyir t'a localizazión cheneral de MediaWiki.",
+Besite por fabor [http://www.mediawiki.org/wiki/Localisation a pachina sobre localizazión de MediaWiki] y  [http://translatewiki.net translatewiki.net] si deseya contrebuyir t'a localizazión cheneral de MediaWiki.",
 'allmessagesnotsupportedDB' => 'Ista pachina no ye disponible porque wgUseDatabaseMessages ye desautibato.',
 'allmessagesfilter'         => "Filtrar por a etiqueta d'os mensaches:",
 'allmessagesmodified'       => 'Amostrar nomás os mensaches cambiatos',
@@ -1932,9 +2169,12 @@ Besite por fabor [http://www.mediawiki.org/wiki/Localisation a pachina sobre loc
 'import-interwiki-text'      => "Trigue un wiki y un títol de pachina ta importar.
 As calendatas d'as bersions y os nombres d'editors se mantendrán.
 Todas as importazions interwiki se rechistran en o [[Special:Log/import|rechistro d'importazions]].",
+'import-interwiki-source'    => 'Wiki/pachina fuent:',
 'import-interwiki-history'   => "Copiar todas as bersions de l'istorial d'ista pachina",
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Espazio de nombres de destín:',
+'import-upload-filename'     => "Nombre d'archibo:",
+'import-comment'             => 'Comentario:',
 'importtext'                 => "Por fabor, esporte l'archibo dende o wiki d'orichen fendo serbir a [[Special:Export|ferramienta d'esportazión]]. Alze-lo en o suyo ordenador y cargue-lo aquí.",
 'importstart'                => 'Importando pachinas...',
 'import-revision-count'      => '$1 {{PLURAL:$1|bersión|bersions}}',
@@ -1968,19 +2208,19 @@ Todas as importazions interwiki se rechistran en o [[Special:Log/import|rechistr
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|bersión|bersions}} dende $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "A mía pachina d'usuario",
+'tooltip-pt-userpage'             => "A suya pachina d'usuario",
 'tooltip-pt-anonuserpage'         => "A pachina d'usuario de l'adreza IP dende a que ye editando",
-'tooltip-pt-mytalk'               => 'A mía pachina de descusión',
+'tooltip-pt-mytalk'               => 'A suya pachina de descusión',
 'tooltip-pt-anontalk'             => 'Descusión sobre edizions feitas dende ista adreza IP',
 'tooltip-pt-preferences'          => 'As mías preferenzias',
 'tooltip-pt-watchlist'            => 'A lista de pachinas que en ye cosirando os cambeos',
-'tooltip-pt-mycontris'            => "Lista d'as mías contribuzions",
+'tooltip-pt-mycontris'            => "Lista d'as suyas contrebuzions",
 'tooltip-pt-login'                => 'Li recomendamos rechistrar-se, encara que no ye obligatorio',
 'tooltip-pt-anonlogin'            => 'Li alentamos á rechistrar-se, anque no ye obligatorio',
 'tooltip-pt-logout'               => 'Rematar a sesión',
 'tooltip-ca-talk'                 => "Descusión sobre l'articlo",
 'tooltip-ca-edit'                 => 'Puede editar ista pachina. Por fabor, faga serbir o botón de bisualizazión prebia antes de grabar.',
-'tooltip-ca-addsection'           => 'Adibir un comentario ta ista descusión',
+'tooltip-ca-addsection'           => 'Enzetar una nueba sezión',
 'tooltip-ca-viewsource'           => 'Ista pachina ye protechita, nomás puede beyer o codigo fuent',
 'tooltip-ca-history'              => "Bersions anteriors d'ista pachina.",
 'tooltip-ca-protect'              => 'Protecher ista pachina',
@@ -2027,6 +2267,8 @@ Todas as importazions interwiki se rechistran en o [[Special:Log/import|rechistr
 'tooltip-watch'                   => 'Adibir ista pachina á la suya lista de seguimiento',
 'tooltip-recreate'                => 'Recreya una pachina mesmo si ya ha estato borrata dinantes',
 'tooltip-upload'                  => 'Prenzipia a carga',
+'tooltip-rollback'                => '"Rebertir" rebierte todas as zagueras edizions d\'un mesmo usuario nomás con un clic.',
+'tooltip-undo'                    => '"Esfer" rebierte a edizión trigata y ubre a pachina d\'edizión en o modo de prebisualizazión. Premite escribir una razón en o resumen d\'edizión.',
 
 # Metadata
 'nodublincore'      => 'Metadatos Dublin Core RDF desautibatos en iste serbidor.',
@@ -2034,12 +2276,12 @@ Todas as importazions interwiki se rechistran en o [[Special:Log/import|rechistr
 'notacceptable'     => 'O serbidor wiki no puede ufrir os datos en un formato que o suyo client (nabegador) pueda leyer.',
 
 # Attribution
-'anonymous'        => 'Usuario(s) anonimo(s) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Usuario anónimo|Usuarios anónimos}} de {{SITENAME}}',
 'siteuser'         => 'Usuario $1 de {{SITENAME}}',
 'lastmodifiedatby' => 'Ista pachina estió modificata por zaguer begada á $2, $1 por $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basato en o treballo de $1.',
 'others'           => 'atros',
-'siteusers'        => 'Usuario(s) $1 de {{SITENAME}}',
+'siteusers'        => '{{PLURAL:$2|Usuario|Usuarios}} $1 de {{SITENAME}}',
 'creditspage'      => "Creditos d'a pachina",
 'nocredits'        => 'No bi ha informazión de creditos ta ista pachina.',
 
@@ -2059,6 +2301,13 @@ Todas as importazions interwiki se rechistran en o [[Special:Log/import|rechistr
 'numauthors'     => "Numero d'autors (articlo): $1",
 'numtalkauthors' => "Numero d'autors (pachina de descusión): $1",
 
+# Skin names
+'skinname-standard'    => 'Clasica (Classic)',
+'skinname-nostalgia'   => 'Recosiros (Nostalgia)',
+'skinname-cologneblue' => 'Colonia Azul (Cologne Blue)',
+'skinname-myskin'      => 'A mía aparenzia (MySkin)',
+'skinname-simple'      => 'Simpla (Simple)',
+
 # Math options
 'mw_math_png'    => 'Produzir siempre PNG',
 'mw_math_simple' => "HTML si ye muit simple, si no'n ye, PNG",
@@ -2079,10 +2328,11 @@ Todas as importazions interwiki se rechistran en o [[Special:Log/import|rechistr
 'markedaspatrollederror-noautopatrol' => 'No tiene premisos ta siñalar os suyos propios cambios como controlatos.',
 
 # Patrol log
-'patrol-log-page'   => 'Rechistro de control de bersions',
-'patrol-log-header' => 'Iste ye un rechistro de rebisions patrullatas.',
-'patrol-log-line'   => "s'ha siñalato a bersión $1 de $2 como controlata $3",
-'patrol-log-auto'   => '(automatico)',
+'patrol-log-page'      => 'Rechistro de control de bersions',
+'patrol-log-header'    => 'Iste ye un rechistro de rebisions patrullatas.',
+'patrol-log-line'      => "s'ha siñalato a bersión $1 de $2 como controlata $3",
+'patrol-log-auto'      => '(automatico)',
+'log-show-hide-patrol' => '$1 o rechistro de patrullache',
 
 # Image deletion
 'deletedrevision'                 => "S'ha borrato a bersión antiga $1",
@@ -2099,6 +2349,9 @@ $1",
 'previousdiff' => "� Ir t'a edizión anterior",
 'nextdiff'     => "Ir t'a edizión siguient →",
 
+# Visual comparison
+'visual-comparison' => 'Comparanza bisual',
+
 # Media information
 'mediawarning'         => "'''Pare cuenta''': Iste archibo puede contener codigo endino; si l'executa, podría meter en un contornillo a seguridat d'o suyo sistema.<hr />",
 'imagemaxsize'         => "Limitar as imachens en as pachinas de descripzión d'archibos á:",
@@ -2108,13 +2361,15 @@ $1",
 'file-info-size'       => "($1 × $2 píxels; grandaria de l'archibo: $3; tipo MIME: $4)",
 'file-nohires'         => '<small>No bi ha garra bersión con mayor resoluzión.</small>',
 'svg-long-desc'        => '(archibo SVG, nominalment $1 × $2 píxels, grandaria: $3)',
-'show-big-image'       => 'Imachen en a maisima resoluzión',
+'show-big-image'       => 'Imachen en a masima resoluzión',
 'show-big-image-thumb' => "<small>Grandaria d'ista ambiesta prebia: $1 × $2 píxels</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galería de nuebas imachens',
 'imagelisttext'         => "Contino bi ha una lista de '''$1''' {{PLURAL:$1|imachen ordenata|imachens ordenatas}} $2.",
 'newimages-summary'     => 'Ista pachina espezial amuestra os zaguers archibos cargatos.',
+'newimages-legend'      => 'Filtro',
+'newimages-label'       => "Nombre de l'archibo (u bella parte d'el):",
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'No bi ha cosa á beyer.',
 'ilsubmit'              => 'Mirar',
@@ -2196,7 +2451,7 @@ Se consideran nomás os elementos d'una lista (linias que escomienzan por *). O
 'exif-aperturevalue'               => 'Obredura',
 'exif-brightnessvalue'             => 'Brilura',
 'exif-exposurebiasvalue'           => "Siesco d'esposizión",
-'exif-maxaperturevalue'            => 'Obredura maisima',
+'exif-maxaperturevalue'            => 'Obredura masima',
 'exif-subjectdistance'             => 'Distanzia á o sucheto',
 'exif-meteringmode'                => 'Modo de mesura',
 'exif-lightsource'                 => 'Fuent de luz',
@@ -2317,6 +2572,18 @@ Se consideran nomás os elementos d'una lista (linias que escomienzan por *). O
 'exif-lightsource-24'  => "Bombeta de tungsteno d'estudeo ISO",
 'exif-lightsource-255' => 'Atra fuent de luz',
 
+# Flash modes
+'exif-flash-fired-0'    => 'No se disparó o flash',
+'exif-flash-fired-1'    => 'Flash disparato',
+'exif-flash-return-0'   => "no bi ha funzión de detezión d'o retorno d'a luz estroboscopica",
+'exif-flash-return-2'   => 'no se deteutó retorno de luz estroboscopica',
+'exif-flash-return-3'   => 'luz estroboscopica deteutata',
+'exif-flash-mode-1'     => 'disparo de flash forzato',
+'exif-flash-mode-2'     => 'supresión de flash forzato',
+'exif-flash-mode-3'     => 'modo automatico',
+'exif-flash-function-1' => 'Modo sin de flash',
+'exif-flash-redeye-1'   => 'modo de reduzión de güellos royos',
+
 'exif-focalplaneresolutionunit-2' => 'pulgadas',
 
 'exif-sensingmethod-1' => 'No definito',
@@ -2456,21 +2723,10 @@ $1
 Por fabor, confirme que reyalment deseya creyar l'articlo nuebament.",
 'recreate'            => 'Creyar nuebament',
 
-# HTML dump
-'redirectingto' => 'Reendrezando ta [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Limpiar a caché d'ista pachina?
-
-$1",
 'confirm_purge_button' => 'Confirmar',
-
-# AJAX search
-'searchcontaining' => "Mirar articlos que contiengan ''$1''.",
-'searchnamed'      => "Mirar articlos con o títol ''$1''.",
-'articletitles'    => "Articlos que prenzipian por ''$1''",
-'hideresults'      => 'Amagar resultaus',
-'useajaxsearch'    => 'Faiga serbir a busca en AJAX',
+'confirm-purge-top'    => "Limpiar a caché d'ista pachina?",
+'confirm-purge-bottom' => 'Si porga una pachina, se limpia a caché y fa que amaneixca a bersión más autual.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pachina anterior',
@@ -2490,10 +2746,10 @@ $1",
 'table_pager_empty'        => 'No bi ha garra resultau',
 
 # Auto-summaries
-'autosumm-blank'   => 'Pachina blanquiata',
+'autosumm-blank'   => "S'ha blanquiato a pachina",
 'autosumm-replace' => 'O conteniu s\'ha cambiato por "$1"',
 'autoredircomment' => 'Reendrezando ta [[$1]]',
-'autosumm-new'     => 'Pachina nueba: $1',
+'autosumm-new'     => "Pachina creyada con '$1'",
 
 # Live preview
 'livepreview-loading' => 'Cargando…',
@@ -2533,6 +2789,7 @@ Tamién puede fer serbir o [[Special:Watchlist/edit|editor estándar]].",
 
 # Core parser functions
 'unknown_extension_tag' => 'Etiqueta d\'estensión "$1" esconoixita',
+'duplicate-defaultsort' => "Pare cuenta: A clau d'ordenazión por defeuto «$2» anula l'anterior clau d'ordenazión por defeuto «$1».",
 
 # Special:Version
 'version'                          => 'Bersión', # Not used as normal message but as header for the special page itself
@@ -2562,13 +2819,13 @@ Tamién puede fer serbir o [[Special:Watchlist/edit|editor estándar]].",
 'filepath-summary' => "Ista pachina espezial le retorna o camín completo d'un archibo.
 As imachens s'amuestran en resoluzión completa, a resta d'archibos fan enzetar dreitament os suyos programas asoziatos.
 
-Escriba o nombre de l'archibo sin o prefixo \"{{ns:image}}:\".",
+Escriba o nombre de l'archibo sin o prefixo \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Mirar archibos duplicatos',
 'fileduplicatesearch-summary'  => 'Mirar achibos duplicatos basatos en a suya balura hash.
 
-Escriba o nombre de l\'archibo sin o prefixo "{{ns:image}}:".',
+Escriba o nombre de l\'archibo sin o prefixo "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Mirar duplicatos',
 'fileduplicatesearch-filename' => "Nombre de l'archibo:",
 'fileduplicatesearch-submit'   => 'Mirar',
@@ -2598,4 +2855,13 @@ Escriba o nombre de l\'archibo sin o prefixo "{{ns:image}}:".',
 'blankpage'              => 'Pachina en blanco',
 'intentionallyblankpage' => "Esta pachina s'ha deixato en blanco aldredes y se fa serbir ta fer prebatinas, ezt.",
 
+# External image whitelist
+'external_image_whitelist' => " #No faiga cambeos en ista linia<pre>
+#Meta debaixo fragmentos d'esprisions regulars (nomás a parte que be entre //)
+#Se mirará si istas concuerdan con os URLs d'imáchens esternas (hotlinked)
+#As que concuerden s'amostrarán como imáchens, en as que no, nomás s'amostrará un binclo t'a imachen
+#As ringleras que prenzipian por «#» se consideran comentarios
+
+#Meta toz os fragmentos de regex por denzima d'ista ringlera. No faiga cambeos en ista linia</pre>",
+
 );
diff --git a/languages/messages/MessagesAng.php b/languages/messages/MessagesAng.php
index fe0fcafe..6d0fbb94 100644
--- a/languages/messages/MessagesAng.php
+++ b/languages/messages/MessagesAng.php
@@ -5,10 +5,24 @@
  * @file
  *
  * @author JJohnson
+ * @author Omnipaedista
  * @author Spacebirdy
  * @author W�denhelm
  */
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Syndrig',
+	NS_TALK             => 'Gesprec',
+	NS_FILE             => 'Biliþ',
+	NS_FILE_TALK        => 'Biliþgesprec',
+	NS_TEMPLATE         => 'Bysen',
+	NS_TEMPLATE_TALK    => 'Bysengesprec',
+	NS_HELP             => 'Help',
+	NS_HELP_TALK        => 'Helpgesprec',
+	NS_CATEGORY         => 'Flocc',
+	NS_CATEGORY_TALK    => 'Floccgesprec',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'          => 'Undermearcian bendas:',
@@ -26,8 +40,6 @@ $messages = array(
 'underline-always' => 'Ç¢fre',
 'underline-never'  => 'NÇ£fre',
 
-'skinpreview' => '(Forescēawian)',
-
 # Dates
 'sunday'        => 'Sunnandæġ',
 'monday'        => 'M�nandæġ',
@@ -121,6 +133,7 @@ $messages = array(
 'permalink'         => 'Fæst bend',
 'print'             => 'Gemǣlan',
 'edit'              => 'Ä€dihtan',
+'create'            => 'Scieppene',
 'editthispage'      => 'Ādihtan þisne tramet',
 'delete'            => '�feorsian',
 'deletethispage'    => 'Þisne tramet �feorsian',
@@ -154,6 +167,7 @@ $messages = array(
 'mainpage-description' => 'Hēafodsīde',
 'portal'               => 'Gemǣnscipe Ingang',
 'portal-url'           => 'Project:Gemǣnscipe Ingang',
+'privacy'              => 'Ānlīepnesse þēaw',
 
 'versionrequired' => 'Fadunge $1 þæs MediaWicis nēodaþ',
 
@@ -175,6 +189,7 @@ $messages = array(
 'nstab-special'  => 'Syndrig',
 'nstab-image'    => 'MÄ“tung',
 'nstab-template' => 'Bisen',
+'nstab-help'     => 'Helptramet',
 'nstab-category' => 'Flocc',
 
 # Main script and global functions
@@ -200,7 +215,6 @@ $messages = array(
 'yourpassword'               => 'Þīn gelēafnesword',
 'yourpasswordagain'          => 'Edwrītan gelēafnesword',
 'yourdomainname'             => 'Þīn geweald',
-'loginproblem'               => '<b>Þīn inmeldung wearþ gescremed.</b><br />Eftr�mie!',
 'login'                      => 'Inmeldian',
 'nav-login-createaccount'    => 'Settan nīwne hordcleofan oþþe inmeldian',
 'userlogin'                  => 'Settan nīwne hordcleofan oþþe inmeldian',
@@ -219,12 +233,17 @@ $messages = array(
 'loginsuccesstitle'          => 'Inmeldung gesǣlde',
 'loginsuccess'               => "'''Þu eart nū inmeldod t� {{SITENAME}} sw� \"\$1\".'''",
 'nosuchuser'                 => 'Þǣr is n�n brūcere be þǣm naman "$1".
-Edscēawa þīne wrītunge, oþþe brūc þone form under t� settene nīwne brūcendhordcleofan.',
+Edscēawa þīne wrītunge, oþþe brūc þone form under t� [[Special:UserLogin/signup|settene nīwne brūcendhordcleofan]].',
 'nosuchusershort'            => 'Þǣr is n�n brūcend mid þǣm naman "<nowiki>$1</nowiki>".  Edscēawa on þīne wrītunge.',
-'acct_creation_throttle_hit' => 'Hwæt, þu hæfst gēo geseted $1 hordcleofan. Þu ne canst settan ǣnige m�ran.',
+'acct_creation_throttle_hit' => 'Hwæt, þu hæfst gēo geseted {{PLURAL:$1|1 hordcleofan|$1 -}}. Þu ne canst settan ǣnige m�ran.',
 'accountcreated'             => 'Hordcleofan gescapen',
 'loginlanguagelabel'         => 'Sprǣc: $1',
 
+# Password reset dialog
+'oldpassword' => 'Eald gelēafnesword:',
+'newpassword' => 'Nīwe gelēafnesword',
+'retypenew'   => 'Nīwe gelēafnesword edwrītan',
+
 # Edit page toolbar
 'bold_sample'     => 'Beald traht',
 'bold_tip'        => 'Beald traht',
@@ -237,13 +256,14 @@ EdscÄ“awa þīne wrÄ«tunge, oþþe brÅ«c þone form under tÅ� settene nÄ«wne brÅ
 'headline_sample' => 'Hēafodlīnan traht',
 'image_sample'    => 'Bisen.jpg',
 'image_tip'       => 'Impod biliþ',
-'media_sample'    => 'Bisen.mp3',
+'media_sample'    => 'Bisen.ogg',
 'sig_tip'         => 'Þín namansegn mid tídstempunge',
 
 # Edit pages
-'summary'                => 'Scortnes',
+'summary'                => 'Scortnes:',
 'minoredit'              => 'Þēos is lȳtlu �dihtung',
 'savearticle'            => 'Sparian tramet',
+'preview'                => 'Forescēawian',
 'showpreview'            => 'Forescēawian',
 'whitelistedittitle'     => 'Inmeldunge behófod tó ádihtenne',
 'whitelistedittext'      => 'Þu scealt $1 tó ádihtenne trametas.',
@@ -255,19 +275,19 @@ EdscÄ“awa þīne wrÄ«tunge, oþþe brÅ«c þone form under tÅ� settene nÄ«wne brÅ
 'newarticletext'         => "Þu hæfst bende t� tramete gefolgod þe nū gīet ne stendeþ.
 T� scieppene þone tramet, onginn þyddan in þǣre boxe under (sēo þone [[{{MediaWiki:Helppage}}|helptramet]] for m� gefrǣge).
 Gif þu hider misf�n c�me, cnoca þ� þīnne webbscēaweres '''on bæc''' cnæpp.",
-'usercssjsyoucanpreview' => "<strong>Rǣd:</strong> Brūc þone 'Forescēawian' cnæpp t� �fandienne þīne nīwe css/js beforan sparunge.",
+'usercssjsyoucanpreview' => "'''Rǣd:''' Brūc þone 'Forescēawian' cnæpp t� �fandienne þīne nīwe css/js beforan sparunge.",
 'updated'                => '(Ednīwod)',
 'editingcomment'         => 'Ādihtung $1 (ymbsprǣc)',
 'yourtext'               => 'Þīn traht',
-'editingold'             => '<strong>WARNUNG: Þu �dihtest ealde fadunge þisses trametes.
-Gif þu hine sparie, ǣniga onwendunga gemacod siþþan þisse fadunge bēoþ s�ðes forloren.</strong>',
+'editingold'             => "'''WARNUNG: Þu �dihtest ealde fadunge þisses trametes.
+Gif þu hine sparie, ǣniga onwendunga gemacod siþþan þisse fadunge bēoþ s�ðes forloren.'''",
 'yourdiff'               => 'T�dǣlednessa',
-'copyrightwarning2'      => 'Bidde macie n�t þæt ealla forðunga t� {{SITENAME}}
+'copyrightwarning2'      => "Bidde macie n�t þæt ealla forðunga t� {{SITENAME}}
 mæg bēon �dihted, gewended, oþþe �fyrðed fram �ðrum forðerum.
 Gif þu nelt þīne wrītunge t� bēonne �dihtod unmildheortlīce, þonne ne þafie hīe hēr.<br />
 Þu behǣtst ēac þæt þu selfa write þis, oþþe efenlǣhtest of sumre
 gemǣnscipes �gnunge oþþe gelīcum frēom horde (sēo $1 for �scungum).
-<strong>NE ÞAFIE EFENLǢHTSCIELDED WEORC BŪTAN GELĪEFNESSE!</strong>',
+'''NE ÞAFIE EFENLǢHTSCIELDED WEORC BŪTAN GELĪEFNESSE!'''",
 'longpagewarning'        => 'WARNUNG: Þes tramet is $1 kilobyta lang; sume
 webbscēaweras hæbben earfoðu mid þȳ þe hīe �dihtaþ trametas nēa oþþe lengran þonne 32kb.
 Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
@@ -301,6 +321,7 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 'searchsubtitleinvalid' => "Þu s�htest '''$1'''",
 'notextmatches'         => 'N�ne trametrahtes mæccan',
 'nextn'                 => 'nīehst $1',
+'searchhelp-url'        => 'Help:Innung',
 'showingresults'        => 'Īewan under oþ <b>$1</b> t�hīgunga onginnenda mid #<b>$2</b>.',
 'showingresultsnum'     => 'Under sind <b>$3</b> tóhígunga onginnende mid #<b>$2</b>.',
 'powersearch'           => 'SÄ“can',
@@ -310,15 +331,13 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 'mypreferences'      => 'MÄ«na foreberunga',
 'prefsnologin'       => 'Ne ingemeldod',
 'skin'               => 'Scynn',
+'skin-preview'       => 'Forescēawian',
 'dateformat'         => 'Tælmearcwīse',
 'datetime'           => 'Tælmearc and tīd',
 'math_unknown_error' => 'ungewiss gemearr',
 'prefs-rc'           => 'NÄ«wlica hweorfunga',
 'prefs-watchlist'    => 'Behealdnestalu',
 'saveprefs'          => 'Sparian',
-'oldpassword'        => 'Eald gelēafnesword:',
-'newpassword'        => 'Nīwe gelēafnesword',
-'retypenew'          => 'Nīwe gelēafnesword edwrītan',
 'rows'               => 'RÇ£wa',
 'columns'            => 'Sȳla:',
 'searchresultshead'  => 'S�cnfintan',
@@ -339,7 +358,7 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 # Recent changes
 'nchanges'        => '$1 hwierfunga',
 'recentchanges'   => 'NÄ«wlica hweorfunga',
-'rcnote'          => 'Under sind þ� æftemestan <strong>$1</strong> hweorfunga in þǣm æftemestum <strong>$2</strong> dagum.',
+'rcnote'          => "Under {{PLURAL:$1|... '''1''' ...|sind þ� æftemestan '''$1''' hweorfunga}} in {{PLURAL:$2|...|þǣm æftemestum '''$2''' dagum}}, . . $5, $4.",
 'rcnotefrom'      => 'Under sind þ� hweorfunga siþþan <b>$2</b> (oþ <b>$1</b> geīewed).',
 'rclistfrom'      => 'Īewan nīwa hweorfunga, onginnenda of $1',
 'rcshowhideminor' => '$1 lȳtla �dihtunga',
@@ -365,15 +384,15 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 
 'nolicense' => 'NÇ£nne gecorenne',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Sēcan biliþnaman:',
-'imagelist'             => 'Biliþgetalu',
-'imagelist_date'        => 'Tælmearc',
-'imagelist_name'        => 'Nama',
-'imagelist_user'        => 'Brūcend',
-'imagelist_description' => 'T�writennes',
+# Special:ListFiles
+'listfiles_search_for'  => 'Sēcan biliþnaman:',
+'listfiles'             => 'Biliþgetalu',
+'listfiles_date'        => 'Tælmearc',
+'listfiles_name'        => 'Nama',
+'listfiles_user'        => 'Brūcend',
+'listfiles_description' => 'T�writennes',
 
-# Image description page
+# File description page
 'filehist-user'  => 'Brūcend',
 'imagelinks'     => 'Biliþbendas',
 'linkstoimage'   => 'Þ� folgendan trametas bindaþ t� þissum biliðe:',
@@ -389,10 +408,6 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 # Random page
 'randompage' => 'Hlīetlic tramet',
 
-# Statistics
-'userstatstext' => "Þǣr sind '''$1''' genemnode brūcend, þ�ra þe
-'''$2''' (oþþe '''$4%''') sind bewitend (sēo $3).",
-
 'doubleredirects' => 'Twifealdlice Ymblǣderas',
 
 'brokenredirects'        => 'Gebrocene Ymblǣderas',
@@ -433,7 +448,6 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 'specialloguserlabel'  => 'Brūcend:',
 'speciallogtitlelabel' => 'Titul:',
 'log'                  => 'Cranicas',
-'log-search-submit'    => 'G�n',
 
 # Special:AllPages
 'allpages'       => 'Trametas',
@@ -452,6 +466,10 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 # Special:ListUsers
 'listusers-noresult' => 'Nǣnne brūcend gefundenne.',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Brūcend ġesceaft talu',
+'newuserlog-create-entry' => 'Nīwe brūcend',
+
 # E-mail user
 'emailfrom'     => 'Fram',
 'emailto'       => 'T�:',
@@ -462,38 +480,43 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 'emailsenttext' => 'Þīn e-mail ǣrendgewrit wearþ gesend.',
 
 # Watchlist
-'watchlist'            => 'MÄ«n behealdnestalu',
-'mywatchlist'          => 'MÄ«n behealdnestalu',
-'addedwatch'           => 'Geīeht t� wæcctale',
-'watch'                => 'Behealdan',
-'unwatch'              => 'Unbehealdan',
-'watchlistcontains'    => 'Þīn behealdnestalu hæfþ $1 {{PLURAL:$1|trameta|trametas}} inn.',
-'wlnote'               => 'Under sind þ� æftemestan $1 hweorfunga in þǣm æftemestum <b>$2</b> stundum.',
-'wlshowlast'           => 'Īewan æftemestan $1 stunda $2 daga $3',
-'watchlist-hide-minor' => 'Hȳdan smala �dihtunga',
+'watchlist'         => 'MÄ«n behealdnestalu',
+'mywatchlist'       => 'MÄ«n behealdnestalu',
+'addedwatch'        => 'Geīeht t� wæcctale',
+'watch'             => 'Behealdan',
+'unwatch'           => 'Unbehealdan',
+'watchlistcontains' => 'Þīn behealdnestalu hæfþ $1 {{PLURAL:$1|trameta|trametas}} inn.',
+'wlnote'            => 'Under sind þ� æftemestan $1 hweorfunga in þǣm æftemestum <b>$2</b> stundum.',
+'wlshowlast'        => 'Īewan æftemestan $1 stunda $2 daga $3',
 
 'enotif_newpagetext' => 'Þēs is nīwe tramet.',
 'created'            => 'gescapen',
 
-# Delete/protect/revert
-'deletepage'         => 'Ä€feorsian tramet',
-'excontent'          => "innung wæs: '$1'",
-'excontentauthor'    => "innung wæs: '$1' (and se �na forðiend wæs '[[Special:Contributions/$2|$2]]')",
-'exblank'            => 'tramet wæs ǣmtig',
-'historywarning'     => 'Warnung: Se tramet, þone þu �feorsian teohhast, hæfþ stǣre:',
-'actioncomplete'     => 'Weorcdǣd geendod',
-'deletedarticle'     => '�feorsod "[[$1]]"',
-'dellogpage'         => 'Āfeorsunge_wisb�c',
-'deletionlog'        => '�feorsunge wisb�c',
-'deletecomment'      => 'Racu for �feorsunge',
-'rollback_short'     => 'Edhwierfan',
-'rollbacklink'       => 'Edhwierfan',
-'rollbackfailed'     => 'Edhwierft misfangen',
-'editcomment'        => 'Sēo �dihtungymbsprǣc wæs: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'         => 'Ācierde �dihtunga fram [[Special:Contributions/$2|$2]] ([[User talk:$2|Gesprec]]); wendede on bæc t� ǣrran fadunge fram [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'unprotectedarticle' => 'unweardod "[[$1]]"',
-'protect-title'      => 'Weardiende "$1"',
-'restriction-type'   => 'Gelēafnes:',
+# Delete
+'deletepage'      => 'Ä€feorsian tramet',
+'excontent'       => "innung wæs: '$1'",
+'excontentauthor' => "innung wæs: '$1' (and se �na forðiend wæs '[[Special:Contributions/$2|$2]]')",
+'exblank'         => 'tramet wæs ǣmtig',
+'historywarning'  => 'Warnung: Se tramet, þone þu �feorsian teohhast, hæfþ stǣre:',
+'actioncomplete'  => 'Weorcdǣd geendod',
+'deletedarticle'  => '�feorsod "[[$1]]"',
+'dellogpage'      => 'Āfeorsunge_wisb�c',
+'deletionlog'     => '�feorsunge wisb�c',
+'deletecomment'   => 'Racu for �feorsunge',
+
+# Rollback
+'rollback_short' => 'Edhwierfan',
+'rollbacklink'   => 'Edhwierfan',
+'rollbackfailed' => 'Edhwierft misfangen',
+'editcomment'    => "Sēo �dihtungymbsprǣc wæs: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => 'Ācierde �dihtunga fram [[Special:Contributions/$2|$2]] ([[User talk:$2|Gesprec]]); wendede on bæc t� ǣrran fadunge fram [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
+'unprotectedarticle'     => 'unweardod "[[$1]]"',
+'protect-title'          => 'Weardiende "$1"',
+'prot_1movedto2'         => '[[$1]] gefered t� [[$2]]',
+'protect-expiry-options' => '1 stund:1 hour, 2 stunda:2 hours,1 dæg:1 day,3 dagas:3 days,1 wucu:1 week,2 wuca:2 weeks,1 m�naþ:1 month,3 m�nþas:3 months,6 m�nþas:6 months,1 gēar:1 year,unendiendlic:infinite', # display1:time1,display2:time2,...
+'restriction-type'       => 'Gelēafnes:',
 
 # Restrictions (nouns)
 'restriction-edit'   => 'Ä€dihtan',
@@ -517,7 +540,6 @@ Bidde behycge þæt þu bricst þone tramet int� smalrum dǣlum.',
 # What links here
 'whatlinkshere'       => 'Hwæt bindaþ hider',
 'whatlinkshere-page'  => 'Tramet:',
-'linklistsub'         => '(Getalu benda)',
 'linkshere'           => 'Þ� folgendan trametas bindaþ hider:',
 'nolinkshere'         => 'N�ne trametas bindaþ hider.',
 'isredirect'          => 'edlǣdungtramet',
@@ -598,7 +620,7 @@ Bidde cēos �ðerne naman.',
 'imagemaxsize' => 'Settan biliðu on biliþgemearcungtrametum t�:',
 'thumbsize'    => 'Þumannæglmicelnes:',
 
-# Special:NewImages
+# Special:NewFiles
 'imagelisttext' => 'Under is getalu $1 biliða gedæfted $2.',
 'noimages'      => 'N�ht t� sēonne.',
 'ilsubmit'      => 'SÄ“can',
@@ -659,28 +681,27 @@ Bidde cēos �ðerne naman.',
 'imagelistall'     => 'eall',
 'watchlistall2'    => 'eall',
 'namespacesall'    => 'eall',
+'monthsall'        => 'eall',
 
 # E-mail address confirmation
 'confirmemail_body' => 'Hwilchwega, gewēne þu of IP st�we $1, hæfþ in namanbēc gestt ǣnne hordcleofan
- "$2" mid þissum e-ǣrendes naman on {{SITENAME}}n.
+"$2" mid þissum e-ǣrendes naman on {{SITENAME}}n.
 
 T� �sēðenne þæt þes hordcleofa t� þē gebyraþ and t� openienne
 e-ǣrenda hwilcnessa on {{SITENAME}}n, opena þisne bend in þīnum webbscēawere:
 
 $3
 
-Gif þis is *n�* þū, ne folga þisne bend. Þēos �sēðungrūn forealdaþ æt $4.',
+Gif þis is *n�* þū, ne folga þisne bend.
+
+$5
+
+Þēos �sēðungrūn forealdaþ æt $4.',
 
 # Scary transclusion
 'scarytranscludefailed'  => '[Bisenfeccung getrucod for $1; sarig]',
 'scarytranscludetoolong' => '[URL is t� lang; sarig]',
 
-# HTML dump
-'redirectingto' => 'Edlǣdeþ t� [[:$1]]...',
-
-# AJAX search
-'searchnamed' => "SÄ“can gewritu genemnodu ''$1''.",
-
 # Multipage image navigation
 'imgmultigo' => 'G�n!',
 
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index 78789ba8..438dc1f6 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -14,11 +14,13 @@
  * @author Mido
  * @author Mimouni
  * @author OsamaK
+ * @author Ouda
  * @author Oxydo
  * @author Tarawneh
  * @author לערי ריינה�רט
  * @author ترجمان05
  * @author عصام بايزيدي
+ * @author نصوح
  */
 
 $linkPrefixExtension = true;
@@ -99,170 +101,6 @@ $dateFormats = array(
 	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
 );
 
-$namespaceNames = array(
-	NS_MEDIA          => 'ميديا',
-	NS_SPECIAL        => 'خاص',
-	NS_MAIN           => '',
-	NS_TALK           => 'نقاش',
-	NS_USER           => 'مستخدم',
-	NS_USER_TALK      => 'نقاش_المستخدم',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'نقاش_$1',
-	NS_IMAGE          => 'صورة',
-	NS_IMAGE_TALK     => 'نقاش_الصورة',
-	NS_MEDIAWIKI      => 'ميدياويكي',
-	NS_MEDIAWIKI_TALK => 'نقاش_ميدياويكي',
-	NS_TEMPLATE       => 'قالب',
-	NS_TEMPLATE_TALK  => 'نقاش_القالب',
-	NS_HELP           => 'مساعدة',
-	NS_HELP_TALK      => 'نقاش_المساعدة',
-	NS_CATEGORY       => 'تصني�',
-	NS_CATEGORY_TALK  => 'نقاش_التصني�',
-);
-
-$namespaceAliases = array(
-	'مل�'             => NS_MEDIA,
-);
-
-$magicWords = array(
-	'redirect'            => array( '0', '#تحويل', '#REDIRECT' ),
-	'notoc'               => array( '0', '__لا�هرس__', '__NOTOC__' ),
-	'nogallery'           => array( '0', '__لامعرض__', '__NOGALLERY__' ),
-	'forcetoc'            => array( '0', '__لصق_�هرس__', '__FORCETOC__' ),
-	'toc'                 => array( '0', '__�هرس__', '__TOC__' ),
-	'noeditsection'       => array( '0', '__لاتحريرقسم__', '__NOEDITSECTION__' ),
-	'currentmonth'        => array( '1', 'شهر_حالي', 'شهر', 'CURRENTMONTH' ),
-	'currentmonthname'    => array( '1', 'اسم_الشهر_الحالي', 'اسم_شهر_حالي', 'اسم_شهر', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen' => array( '1', 'اسم_الشهر_الحالي_المولد', 'اسم_شهر_حالي_مولد', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'  => array( '1', 'اختصار_الشهر_الحالي', 'اختصار_شهر_حالي', 'CURRENTMONTHABBREV' ),
-	'currentday'          => array( '1', 'يوم_حالي', 'يوم', 'CURRENTDAY' ),
-	'currentday2'         => array( '1', 'يوم_حالي2', 'يوم2', 'CURRENTDAY2' ),
-	'currentdayname'      => array( '1', 'اسم_اليوم_الحالي', 'اسم_يوم_حالي', 'اسم_يوم', 'CURRENTDAYNAME' ),
-	'currentyear'         => array( '1', 'عام_حالي', 'عام', 'CURRENTYEAR' ),
-	'currenttime'         => array( '1', 'وقت_حالي', 'وقت', 'CURRENTTIME' ),
-	'currenthour'         => array( '1', 'ساعة_حالية', 'ساعة', 'CURRENTHOUR' ),
-	'localmonth'          => array( '1', 'شهر_محلي', 'LOCALMONTH' ),
-	'localmonthname'      => array( '1', 'اسم_الشهر_المحلي', 'اسم_شهر_محلي', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'   => array( '1', 'اسم_الشهر_المحلي_المولد', 'اسم_شهر_محلي_مولد', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'    => array( '1', 'اختصار_الشهر_المحلي', 'اختصار_شهر_محلي', 'LOCALMONTHABBREV' ),
-	'localday'            => array( '1', 'يوم_محلي', 'LOCALDAY' ),
-	'localday2'           => array( '1', 'يوم_محلي2', 'LOCALDAY2' ),
-	'localdayname'        => array( '1', 'اسم_اليوم_المحلي', 'اسم_يوم_محلي', 'LOCALDAYNAME' ),
-	'localyear'           => array( '1', 'عام_محلي', 'LOCALYEAR' ),
-	'localtime'           => array( '1', 'وقت_محلي', 'LOCALTIME' ),
-	'localhour'           => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
-	'numberofpages'       => array( '1', 'عدد_الص�حات', 'عدد_ص�حات', 'NUMBEROFPAGES' ),
-	'numberofarticles'    => array( '1', 'عدد_المقالات', 'عدد_مقالات', 'NUMBEROFARTICLES' ),
-	'numberoffiles'       => array( '1', 'عدد_المل�ات', 'عدد_مل�ات', 'NUMBEROFFILES' ),
-	'numberofusers'       => array( '1', 'عدد_المستخدمين', 'عدد_مستخدمين', 'NUMBEROFUSERS' ),
-	'numberofedits'       => array( '1', 'عدد_التعديلات', 'عدد_تعديلات', 'NUMBEROFEDITS' ),
-	'pagename'            => array( '1', 'اسم_الص�حة', 'اسم_ص�حة', 'PAGENAME' ),
-	'pagenamee'           => array( '1', 'عنوان_الص�حة', 'عنوان_ص�حة', 'PAGENAMEE' ),
-	'namespace'           => array( '1', 'نطاق', 'NAMESPACE' ),
-	'namespacee'          => array( '1', 'عنوان_نطاق', 'NAMESPACEE' ),
-	'talkspace'           => array( '1', 'نطاق_النقاش', 'نطاق_نقاش', 'TALKSPACE' ),
-	'talkspacee'          => array( '1', 'عنوان_النقاش', 'عنوان_نقاش', 'TALKSPACEE' ),
-	'subjectspace'        => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'       => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'        => array( '1', 'اسم_الص�حة_الكامل', 'اسم_ص�حة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
-	'fullpagenamee'       => array( '1', 'عنوان_الص�حة_الكامل', 'عنوان_ص�حة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
-	'subpagename'         => array( '1', 'اسم_الص�حة_ال�رعي', 'اسم_ص�حة_�رعي', 'SUBPAGENAME' ),
-	'subpagenamee'        => array( '1', 'عنوان_الص�حة_ال�رعي', 'عنوان_ص�حة_�رعي', 'SUBPAGENAMEE' ),
-	'basepagename'        => array( '1', 'اسم_الص�حة_الأساسي', 'اسم_ص�حة_أساسي', 'BASEPAGENAME' ),
-	'basepagenamee'       => array( '1', 'عنوان_الص�حة_الأساسي', 'عنوان_ص�حة_أساسي', 'BASEPAGENAMEE' ),
-	'talkpagename'        => array( '1', 'اسم_ص�حة_النقاش', 'اسم_ص�حة_نقاش', 'TALKPAGENAME' ),
-	'talkpagenamee'       => array( '1', 'عنوان_ص�حة_النقاش', 'عنوان_ص�حة_نقاش', 'TALKPAGENAMEE' ),
-	'subjectpagename'     => array( '1', 'اسم_ص�حة_الموضوع', 'اسم_ص�حة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'    => array( '1', 'عنوان_ص�حة_الموضوع', 'عنوان_ص�حة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                 => array( '0', 'رسالة:', 'MSG:' ),
-	'subst'               => array( '0', 'نسخ:', 'إحلال:', 'SUBST:' ),
-	'msgnw'               => array( '0', 'مصدر:', 'مصدر_قالب:', 'MSGNW:' ),
-	'img_thumbnail'       => array( '1', 'تصغير', 'thumbnail', 'thumb' ),
-	'img_manualthumb'     => array( '1', 'تصغير=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'           => array( '1', 'يمين', 'right' ),
-	'img_left'            => array( '1', 'يسار', 'left' ),
-	'img_none'            => array( '1', 'بدون', 'بلا', 'none' ),
-	'img_width'           => array( '1', '$1بك', '$1عن', '$1px' ),
-	'img_center'          => array( '1', 'مركز', 'center', 'centre' ),
-	'img_framed'          => array( '1', 'إطار', 'framed', 'enframed', 'frame' ),
-	'img_frameless'       => array( '1', 'لاإطار', 'frameless' ),
-	'img_page'            => array( '1', 'ص�حة=$1', 'ص�حة $1', 'page=$1', 'page $1' ),
-	'img_upright'         => array( '1', 'معدول', 'معدول=$1', 'معدول $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'          => array( '1', 'حد', 'حدود', 'border' ),
-	'img_baseline'        => array( '1', 'خط_أساسي', 'baseline' ),
-	'img_sub'             => array( '1', '�رعي', 'sub' ),
-	'img_super'           => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
-	'img_top'             => array( '1', 'أعلى', 'top' ),
-	'img_text_top'        => array( '1', 'نص_أعلى', 'text-top' ),
-	'img_middle'          => array( '1', 'وسط', 'middle' ),
-	'img_bottom'          => array( '1', 'أس�ل', 'bottom' ),
-	'img_text_bottom'     => array( '1', 'نص_أس�ل', 'text-bottom' ),
-	'int'                 => array( '0', 'محتوى:', 'INT:' ),
-	'sitename'            => array( '1', 'اسم_الموقع', 'اسم_موقع', 'SITENAME' ),
-	'ns'                  => array( '0', 'نط:', 'NS:' ),
-	'localurl'            => array( '0', 'مسار_محلي:', 'LOCALURL:' ),
-	'localurle'           => array( '0', 'عنوان_المسار_المحلي:', 'عنوان_مسار_محلي:', 'LOCALURLE:' ),
-	'server'              => array( '0', 'خادم', 'SERVER' ),
-	'servername'          => array( '0', 'اسم_الخادم', 'اسم_خادم', 'SERVERNAME' ),
-	'scriptpath'          => array( '0', 'مسار_السكريبت', 'مسار_سكريبت', 'SCRIPTPATH' ),
-	'grammar'             => array( '0', 'قواعد_اللغة:', 'قواعد_لغة:', 'GRAMMAR:' ),
-	'notitleconvert'      => array( '0', '__لاتحويل_عنوان__', '__لاتع__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'    => array( '0', '__لاتحويل_محتوى__', '__لاتم__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'         => array( '1', 'أسبوع_حالي', 'أسبوع', 'CURRENTWEEK' ),
-	'currentdow'          => array( '1', 'يوم_حالي_مأ', 'CURRENTDOW' ),
-	'localweek'           => array( '1', 'أسبوع_محلي', 'LOCALWEEK' ),
-	'localdow'            => array( '1', 'يوم_محلي_مأ', 'LOCALDOW' ),
-	'revisionid'          => array( '1', 'رقم_النسخة', 'رقم_نسخة', 'REVISIONID' ),
-	'revisionday'         => array( '1', 'يوم_النسخة', 'يوم_نسخة', 'REVISIONDAY' ),
-	'revisionday2'        => array( '1', 'يوم_النسخة2', 'يوم_نسخة2', 'REVISIONDAY2' ),
-	'revisionmonth'       => array( '1', 'شهر_النسخة', 'شهر_نسخة', 'REVISIONMONTH' ),
-	'revisionyear'        => array( '1', 'عام_النسخة', 'عام_نسخة', 'REVISIONYEAR' ),
-	'revisiontimestamp'   => array( '1', 'طابع_وقت_النسخة', 'طابع_وقت_نسخة', 'REVISIONTIMESTAMP' ),
-	'plural'              => array( '0', 'جمع:', 'PLURAL:' ),
-	'fullurl'             => array( '0', 'عنوان_كامل:', 'FULLURL:' ),
-	'fullurle'            => array( '0', 'مسار_كامل:', 'FULLURLE:' ),
-	'lcfirst'             => array( '0', 'عنوان_كبير:', 'LCFIRST:' ),
-	'ucfirst'             => array( '0', 'عنوان_صغير:', 'UCFIRST:' ),
-	'lc'                  => array( '0', 'صغير:', 'LC:' ),
-	'uc'                  => array( '0', 'كبير:', 'UC:' ),
-	'raw'                 => array( '0', 'خام:', 'RAW:' ),
-	'displaytitle'        => array( '1', 'عرض_العنوان', 'عرض_عنوان', 'DISPLAYTITLE' ),
-	'rawsuffix'           => array( '1', 'أر', 'آر', 'R' ),
-	'newsectionlink'      => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
-	'currentversion'      => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
-	'urlencode'           => array( '0', 'كود_المسار:', 'كود_مسار:', 'URLENCODE:' ),
-	'anchorencode'        => array( '0', 'كود_الأنكور', 'كود_أنكور', 'ANCHORENCODE' ),
-	'currenttimestamp'    => array( '1', 'طابع_الوقت_الحالي', 'طابع_وقت_حالي', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'      => array( '1', 'طابع_الوقت_المحلي', 'طابع_وقت_محلي', 'LOCALTIMESTAMP' ),
-	'directionmark'       => array( '1', 'علامة_الاتجاه', 'علامة_اتجاه', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'            => array( '0', '#لغة:', '#LANGUAGE:' ),
-	'contentlanguage'     => array( '1', 'لغة_المحتوى', 'لغة_محتوى', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'    => array( '1', 'ص�حات_�ي_نطاق:', 'ص�حات_�ي_نط:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'      => array( '1', 'عدد_الإداريين', 'عدد_إداريين', 'NUMBEROFADMINS' ),
-	'formatnum'           => array( '0', 'صيغة_رقم', 'FORMATNUM' ),
-	'padleft'             => array( '0', 'باد_يسار', 'PADLEFT' ),
-	'padright'            => array( '0', 'باد_يمين', 'PADRIGHT' ),
-	'special'             => array( '0', 'خاص', 'special' ),
-	'defaultsort'         => array( '1', 'ترتيب_قياسي:', 'ترتيب_ا�تراضي:', 'م�تاح_ترتيب_قياسي:', 'م�تاح_ترتيب_ا�تراضي:', 'ترتيب_تصني�_قياسي:', 'ترتيب_تصني�_ا�تراضي:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'            => array( '0', 'مسار_المل�:', 'مسار_مل�:', 'FILEPATH:' ),
-	'tag'                 => array( '0', 'وسم', 'tag' ),
-	'hiddencat'           => array( '1', '__تصني�_مخ�ي__', '__HIDDENCAT__' ),
-	'pagesincategory'     => array( '1', 'ص�حات �ي التصني�', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'            => array( '1', 'حجم_الص�حة', 'حجم_ص�حة', 'PAGESIZE' ),
-	'staticredirect'      => array( '1', '__تحويلة_إستاتيكية__', '__تحويلة_ساكنة__', '__STATICREDIRECT__' ),
-);
-
-$skinNames = array(
-	'standard'    => 'كلاسيكية',
-	'nostalgia'   => 'نوستالجيا',
-	'cologneblue' => 'كولون بلو',
-	'monobook'    => 'مونوبوك',
-	'myskin'      => 'واجهتي',
-	'chick'       => 'تشيك',
-	'simple'      => 'بسيطة',
-	'modern'      => 'حديثة',
-);
-
 $digitTransformTable = array(
 	'0' => 'Ù ', # &#x0660;
 	'1' => 'Ù¡', # &#x0661;
@@ -278,6 +116,166 @@ $digitTransformTable = array(
 	',' => 'Ù¬', # &#x066c;
 );
 
+$namespaceNames = array(
+	NS_MEDIA            => 'ميديا',
+	NS_SPECIAL          => 'خاص',
+	NS_TALK             => 'نقاش',
+	NS_USER             => 'مستخدم',
+	NS_USER_TALK        => 'نقاش_المستخدم',
+	NS_PROJECT_TALK     => 'نقاش_$1',
+	NS_FILE             => 'مل�',
+	NS_FILE_TALK        => 'نقاش_المل�',
+	NS_MEDIAWIKI        => 'ميدياويكي',
+	NS_MEDIAWIKI_TALK   => 'نقاش_ميدياويكي',
+	NS_TEMPLATE         => 'قالب',
+	NS_TEMPLATE_TALK    => 'نقاش_القالب',
+	NS_HELP             => 'مساعدة',
+	NS_HELP_TALK        => 'نقاش_المساعدة',
+	NS_CATEGORY         => 'تصني�',
+	NS_CATEGORY_TALK    => 'نقاش_التصني�',
+);
+
+$namespaceAliases = array(
+	'وسائط' => NS_MEDIA,
+	'صورة' => NS_FILE,
+	'نقاش_الصورة' => NS_FILE_TALK,
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#تحويل', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__لا�هرس__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__لامعرض__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__لصق_�هرس__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__�هرس__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__لاتحريرقسم__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__لاعنوان__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', 'شهر_حالي', 'شهر', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'اسم_الشهر_الحالي', 'اسم_شهر_حالي', 'اسم_شهر', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'اسم_الشهر_الحالي_المولد', 'اسم_شهر_حالي_مولد', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'اختصار_الشهر_الحالي', 'اختصار_شهر_حالي', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'يوم_حالي', 'يوم', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'يوم_حالي2', 'يوم2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'اسم_اليوم_الحالي', 'اسم_يوم_حالي', 'اسم_يوم', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'عام_حالي', 'عام', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'وقت_حالي', 'وقت', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'ساعة_حالية', 'ساعة', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'شهر_محلي', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'اسم_الشهر_المحلي', 'اسم_شهر_محلي', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'اسم_الشهر_المحلي_المولد', 'اسم_شهر_محلي_مولد', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'اختصار_الشهر_المحلي', 'اختصار_شهر_محلي', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'يوم_محلي', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'يوم_محلي2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'اسم_اليوم_المحلي', 'اسم_يوم_محلي', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'عام_محلي', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'وقت_محلي', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'عدد_الص�حات', 'عدد_ص�حات', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'عدد_المقالات', 'عدد_مقالات', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'عدد_المل�ات', 'عدد_مل�ات', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'عدد_المستخدمين', 'عدد_مستخدمين', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'عدد_التعديلات', 'عدد_تعديلات', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'عدد_المشاهدات', 'عدد_مشاهدات', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', 'اسم_الص�حة', 'اسم_ص�حة', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'عنوان_الص�حة', 'عنوان_ص�حة', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'نطاق', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'عنوان_نطاق', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'نطاق_النقاش', 'نطاق_نقاش', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'عنوان_النقاش', 'عنوان_نقاش', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'اسم_الص�حة_الكامل', 'اسم_ص�حة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'عنوان_الص�حة_الكامل', 'عنوان_ص�حة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'اسم_الص�حة_ال�رعي', 'اسم_ص�حة_�رعي', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'عنوان_الص�حة_ال�رعي', 'عنوان_ص�حة_�رعي', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'اسم_الص�حة_الأساسي', 'اسم_ص�حة_أساسي', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'عنوان_الص�حة_الأساسي', 'عنوان_ص�حة_أساسي', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'اسم_ص�حة_النقاش', 'اسم_ص�حة_نقاش', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'عنوان_ص�حة_النقاش', 'عنوان_ص�حة_نقاش', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'اسم_ص�حة_الموضوع', 'اسم_ص�حة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'عنوان_ص�حة_الموضوع', 'عنوان_ص�حة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'رسالة:', 'MSG:' ),
+	'subst'                 => array( '0', 'نسخ:', 'إحلال:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'مصدر:', 'مصدر_قالب:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'تصغير', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'تصغير=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'يمين', 'right' ),
+	'img_left'              => array( '1', 'يسار', 'left' ),
+	'img_none'              => array( '1', 'بدون', 'بلا', 'none' ),
+	'img_width'             => array( '1', '$1بك', '$1عن', '$1px' ),
+	'img_center'            => array( '1', 'مركز', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'إطار', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'لاإطار', 'frameless' ),
+	'img_page'              => array( '1', 'ص�حة=$1', 'ص�حة $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'معدول', 'معدول=$1', 'معدول $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'حد', 'حدود', 'border' ),
+	'img_baseline'          => array( '1', 'خط_أساسي', 'baseline' ),
+	'img_sub'               => array( '1', '�رعي', 'sub' ),
+	'img_super'             => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
+	'img_top'               => array( '1', 'أعلى', 'top' ),
+	'img_text_top'          => array( '1', 'نص_أعلى', 'text-top' ),
+	'img_middle'            => array( '1', 'وسط', 'middle' ),
+	'img_bottom'            => array( '1', 'أس�ل', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'نص_أس�ل', 'text-bottom' ),
+	'img_link'              => array( '1', 'وصلة=$1', 'رابط=$1', 'link=$1' ),
+	'img_alt'               => array( '1', 'بديل=$1', 'alt=$1' ),
+	'int'                   => array( '0', 'محتوى:', 'INT:' ),
+	'sitename'              => array( '1', 'اسم_الموقع', 'اسم_موقع', 'SITENAME' ),
+	'ns'                    => array( '0', 'نط:', 'NS:' ),
+	'localurl'              => array( '0', 'مسار_محلي:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'عنوان_المسار_المحلي:', 'عنوان_مسار_محلي:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'خادم', 'SERVER' ),
+	'servername'            => array( '0', 'اسم_الخادم', 'اسم_خادم', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'مسار_السكريبت', 'مسار_سكريبت', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'قواعد_اللغة:', 'قواعد_لغة:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__لاتحويل_عنوان__', '__لاتع__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__لاتحويل_محتوى__', '__لاتم__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'أسبوع_حالي', 'أسبوع', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'يوم_حالي_مأ', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'أسبوع_محلي', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'يوم_محلي_مأ', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'رقم_النسخة', 'رقم_نسخة', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'يوم_النسخة', 'يوم_نسخة', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'يوم_النسخة2', 'يوم_نسخة2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'شهر_النسخة', 'شهر_نسخة', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'عام_النسخة', 'عام_نسخة', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'طابع_وقت_النسخة', 'طابع_وقت_نسخة', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'جمع:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'عنوان_كامل:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'مسار_كامل:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'عنوان_كبير:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'عنوان_صغير:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'صغير:', 'LC:' ),
+	'uc'                    => array( '0', 'كبير:', 'UC:' ),
+	'raw'                   => array( '0', 'خام:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'عرض_العنوان', 'عرض_عنوان', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', 'أر', 'آر', 'R' ),
+	'newsectionlink'        => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'كود_المسار:', 'كود_مسار:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'كود_الأنكور', 'كود_أنكور', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'طابع_الوقت_الحالي', 'طابع_وقت_حالي', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'طابع_الوقت_المحلي', 'طابع_وقت_محلي', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'علامة_الاتجاه', 'علامة_اتجاه', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#لغة:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'لغة_المحتوى', 'لغة_محتوى', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'ص�حات_�ي_نطاق:', 'ص�حات_�ي_نط:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'عدد_الإداريين', 'عدد_إداريين', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'صيغة_رقم', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'باد_يسار', 'PADLEFT' ),
+	'padright'              => array( '0', 'باد_يمين', 'PADRIGHT' ),
+	'special'               => array( '0', 'خاص', 'special' ),
+	'defaultsort'           => array( '1', 'ترتيب_قياسي:', 'ترتيب_ا�تراضي:', 'م�تاح_ترتيب_قياسي:', 'م�تاح_ترتيب_ا�تراضي:', 'ترتيب_تصني�_قياسي:', 'ترتيب_تصني�_ا�تراضي:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'مسار_المل�:', 'مسار_مل�:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'وسم', 'tag' ),
+	'hiddencat'             => array( '1', '__تصني�_مخ�ي__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'ص�حات �ي التصني�', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'حجم_الص�حة', 'حجم_ص�حة', 'PAGESIZE' ),
+	'index'                 => array( '1', '__�هرسة__', '__INDEX__' ),
+	'noindex'               => array( '1', '__لا�هرسة__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'عدد_�ي_المجموعة', 'عدد_�ي_مجموعة', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__تحويلة_إستاتيكية__', '__تحويلة_ساكنة__', '__STATICREDIRECT__' ),
+);
+
 $specialPageAliases = array(
 	'DoubleRedirects'           => array( 'تحويلات_مزدوجة' ),
 	'BrokenRedirects'           => array( 'تحويلات_مكسورة' ),
@@ -289,7 +287,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'قائمة_المراقبة' ),
 	'Recentchanges'             => array( 'أحدث_التغييرات' ),
 	'Upload'                    => array( 'ر�ع' ),
-	'Imagelist'                 => array( 'قائمة_الصور' ),
+	'Listfiles'                 => array( 'قائمة_الصور' ),
 	'Newimages'                 => array( 'صور_جديدة' ),
 	'Listusers'                 => array( 'عرض_المستخدمين', 'قائمة_المستخدمين' ),
 	'Listgrouprights'           => array( 'عرض_صلاحيات_المجموعات' ),
@@ -304,12 +302,13 @@ $specialPageAliases = array(
 	'Unusedimages'              => array( 'صور_غير_مستخدمة' ),
 	'Wantedpages'               => array( 'ص�حات_مطلوبة', 'وصلات_مكسورة' ),
 	'Wantedcategories'          => array( 'تصني�ات_مطلوبة' ),
-	'Missingfiles'              => array( 'مل�ات_م�قودة', 'صور_م�قودة' ),
+	'Wantedfiles'               => array( 'مل�ات_مطلوبة' ),
+	'Wantedtemplates'           => array( 'قوالب_مطلوبة' ),
 	'Mostlinked'                => array( 'الأكثر_وصلا' ),
 	'Mostlinkedcategories'      => array( 'أكثر_التصني�ات_وصلا', 'أكثر_التصني�ات_استخداما' ),
 	'Mostlinkedtemplates'       => array( 'أكثر_القوالب_وصلا', 'أكثر_القوالب_استخداما' ),
-	'Mostcategories'            => array( 'أكثر_الص�حات_تصني�ا' ),
 	'Mostimages'                => array( 'أكثر_الصور_وصلا' ),
+	'Mostcategories'            => array( 'أكثر_الص�حات_تصني�ا' ),
 	'Mostrevisions'             => array( 'الأكثر_تعديلا' ),
 	'Fewestrevisions'           => array( 'الأقل_تعديلا' ),
 	'Shortpages'                => array( 'ص�حات_قصيرة' ),
@@ -356,12 +355,14 @@ $specialPageAliases = array(
 	'Listbots'                  => array( 'عرض_البوتات' ),
 	'Popularpages'              => array( 'ص�حات_مشهورة' ),
 	'Search'                    => array( 'بحث' ),
-	'Resetpass'                 => array( 'ضبط_كلمة_السر' ),
+	'Resetpass'                 => array( 'ضبط_كلمة_السر', 'ص�ر_كلمة_السر' ),
 	'Withoutinterwiki'          => array( 'بدون_إنترويكي' ),
 	'MergeHistory'              => array( 'دمج_التاريخ' ),
 	'Filepath'                  => array( 'مسار_مل�' ),
 	'Invalidateemail'           => array( 'تعطيل_البريد_الإلكتروني' ),
 	'Blankpage'                 => array( 'ص�حة_�ارغة' ),
+	'LinkSearch'                => array( 'بحث_الوصلات' ),
+	'DeletedContributions'      => array( 'مساهمات_محذو�ة' ),
 );
 
 $imageFiles = array(
@@ -375,7 +376,7 @@ $imageFiles = array(
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'ضع خطا تحت الوصلات:',
-'tog-highlightbroken'         => 'أأظهر الوصلات المعطوبة <a href="" class="new">هكذا</a> (البديل: كهذا<a href="" class="internal">؟</a>).',
+'tog-highlightbroken'         => 'أظهر الوصلات المعطوبة <a href="" class="new">هكذا</a> (البديل: هكذا<a href="" class="internal">؟</a>).',
 'tog-justify'                 => 'ساو� ال�قرات',
 'tog-hideminor'               => 'أخ� التعديلات الط�ي�ة �ي أحدث التغييرات',
 'tog-extendwatchlist'         => 'مدد قائمة المراقبة لعرض كل التغييرات المطبقة',
@@ -410,17 +411,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'أخ� تعديلاتي من قائمة المراقبة',
 'tog-watchlisthidebots'       => 'أخ� تعديلات البوت من قائمة المراقبة',
 'tog-watchlisthideminor'      => 'أخ� التعديلات الط�ي�ة من قائمة المراقبة',
+'tog-watchlisthideliu'        => 'أخ� تعديلات المستخدمين المسجلين من قائمة المراقبة',
+'tog-watchlisthideanons'      => 'أخ� تعديلات المستخدمين المجهولين من قائمة المراقبة',
 'tog-nolangconversion'        => 'عطل تحويل اللهجات',
 'tog-ccmeonemails'            => 'أرسل لي نسخا من رسائل البريد الإلكتروني التي أرسلها للمستخدمين الآخرين',
 'tog-diffonly'                => 'لا تعرض محتوى الص�حة أس�ل ال�روقات',
 'tog-showhiddencats'          => 'أظهر التصني�ات المخ�ية',
+'tog-noconvertlink'           => 'عطل تحويل عناوين الوصلات',
+'tog-norollbackdiff'          => 'أزل ال�رق بعد القيام باسترجاع',
 
 'underline-always'  => 'دائما',
 'underline-never'   => 'أبدا',
 'underline-default' => 'تبعا لإعدادات المتص�ح',
 
-'skinpreview' => '(عرض)',
-
 # Dates
 'sunday'        => 'الأحد',
 'monday'        => 'الإثنين',
@@ -481,7 +484,7 @@ $messages = array(
 'category-empty'                 => "''هذا التصني� لا يحتوي حاليا على ص�حات أو ميديا.''",
 'hidden-categories'              => '{{PLURAL:$1|تصني� مخ�ي|تصني�ات مخ�ية}}',
 'hidden-category-category'       => 'تصني�ات مخ�ية', # Name of the category where hidden categories will be listed
-'category-subcat-count'          => '{{PLURAL:$2|هذا التصني� لديه �قط التصني� ال�رعي التالي.|هذا التصني� لديه {{PLURAL:$1|تصني� �رعي|$1 تصني� �رعي}}، من إجمالي $2.}}',
+'category-subcat-count'          => '{{PLURAL:$2|هذا التصني� به �قط التصني� ال�رعي التالي.|هذا التصني� به {{PLURAL:$1|تصني� �رعي|$1 تصني� �رعي}}، من إجمالي $2.}}',
 'category-subcat-count-limited'  => 'هذا التصني� به {{PLURAL:$1|تصني� �رعي|$1 تصني� �رعي}} كما يلي.',
 'category-article-count'         => '{{PLURAL:$2|هذا التصني� يحتوي �قط على الص�حة التالية.|بالأس�ل {{PLURAL:$1|مل�|$1 مل�}} �ي هذا التصني�، من إجمالي $2.}}',
 'category-article-count-limited' => 'بالأس�ل {{PLURAL:$1|ص�حة|$1 ص�حة}} �ي التصني� الحالي.',
@@ -514,7 +517,7 @@ $messages = array(
 'mytalk'         => 'نقاشي',
 'anontalk'       => 'النقاش لعنوان الأيبي هذا',
 'navigation'     => 'إبحار',
-'and'            => 'Ùˆ',
+'and'            => '&#32;Ùˆ',
 
 # Metadata in edit box
 'metadata_help' => 'بيانات ميتا:',
@@ -540,7 +543,7 @@ $messages = array(
 'create-this-page'  => 'أنشىء هذه الص�حة',
 'delete'            => 'حذ�',
 'deletethispage'    => 'احذ� هذه الص�حة',
-'undelete_short'    => 'استرجاع {{PLURAL:$1|تعديل واحد|تعديلان|$1 تعديلات|$1 تعديل|$1 تعديلا}}',
+'undelete_short'    => 'استرجاع {{PLURAL:$1|تعديل واحد|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديلا}}',
 'protect'           => 'حماية',
 'protect_change'    => 'تغيير',
 'protectthispage'   => 'احم هذه الص�حة',
@@ -551,14 +554,14 @@ $messages = array(
 'talkpagelinktext'  => 'نقاش',
 'specialpage'       => 'ص�حة خاصة',
 'personaltools'     => 'أدوات شخصية',
-'postcomment'       => 'أرسل تعليقا',
+'postcomment'       => 'قسم جديد',
 'articlepage'       => 'عرض ص�حة المحتوى',
 'talk'              => 'نقاش',
 'views'             => 'معاينة',
 'toolbox'           => 'صندوق الأدوات',
 'userpage'          => 'عرض ص�حة المستخدم',
 'projectpage'       => 'عرض ص�حة المشروع',
-'imagepage'         => 'عرض ص�حة الميديا',
+'imagepage'         => 'عرض ص�حة المل�',
 'mediawikipage'     => 'عرض ص�حة الرسالة',
 'templatepage'      => 'عرض ص�حة القالب',
 'viewhelppage'      => 'عرض ص�حة المساعدة',
@@ -567,19 +570,17 @@ $messages = array(
 'otherlanguages'    => 'بلغات أخرى',
 'redirectedfrom'    => '(تم التحويل من $1)',
 'redirectpagesub'   => 'ص�حة تحويل',
-'lastmodifiedat'    => 'آخر تعديل لهذه الص�حة كان �ي $2، $1.', # $1 date, $2 time
+'lastmodifiedat'    => 'آخر تعديل لهذه الص�حة �ي $2، $1.', # $1 date, $2 time
 'viewcount'         => 'تم عرض هذه الص�حة {{PLURAL:$1|مرة واحدة|مرتان|$1 مرات|$1 مرة}}.',
 'protectedpage'     => 'ص�حة محمية',
 'jumpto'            => 'اذهب إلى:',
-'jumptonavigation'  => 'إبحار',
+'jumptonavigation'  => 'اذهب إلى',
 'jumptosearch'      => 'بحث',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'حول {{SITENAME}}',
 'aboutpage'            => 'Project:حول',
-'bugreports'           => 'بلاغ الأخطاء',
-'bugreportspage'       => 'Project:بلاغ أخطاء',
-'copyright'            => 'المحتوى متو�ر تحت $1.',
+'copyright'            => 'المحتوى متو�ر حسب $1.',
 'copyrightpagename'    => 'حقوق النسخ �ي {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:حقوق النسخ',
 'currentevents'        => 'الأحداث الجارية',
@@ -601,15 +602,13 @@ $messages = array(
 
 'badaccess'        => 'خطأ �ي السماح',
 'badaccess-group0' => 'ليس من المسموح لك تن�يذ ال�عل الذي طلبته.',
-'badaccess-group1' => 'ال�عل الذي طلبته مقصور على المستخدمين �ي المجموعة $1.',
-'badaccess-group2' => 'ال�عل الذي طلبته مقصور على المستخدمين �ي إحدى المجموعتين $1.',
-'badaccess-groups' => 'ال�عل الذي طلبته مقصور على المستخدمين �ي إحدى المجموعات $1.',
+'badaccess-groups' => 'ال�عل الذي طلبته مقصور على المستخدمين �ي {{PLURAL:$2|المجموعة|إحدى المجموعات}}: $1.',
 
 'versionrequired'     => 'تلزم نسخة $1 من ميدياويكي',
 'versionrequiredtext' => 'تلزم النسخة $1 من ميدياويكي لاستعمال هذه الص�حة. انظر [[Special:Version|ص�حة النسخة]]',
 
 'ok'                      => 'موا�ق',
-'retrievedfrom'           => 'تم الاسترجاع من "$1"',
+'retrievedfrom'           => 'منقول من "$1"',
 'youhavenewmessages'      => 'توجد لديك $1 ($2).',
 'newmessageslink'         => 'رسائل جديدة',
 'newmessagesdifflink'     => 'آخر تغيير',
@@ -617,7 +616,9 @@ $messages = array(
 'editsection'             => 'عدل',
 'editold'                 => 'عدل',
 'viewsourceold'           => 'عرض المصدر',
-'editsectionhint'         => 'تحرير القسم: $1',
+'editlink'                => 'عدل',
+'viewsourcelink'          => 'عرض المصدر',
+'editsectionhint'         => 'حرر القسم: $1',
 'toc'                     => 'محتويات',
 'showtoc'                 => 'عرض',
 'hidetoc'                 => 'إخ�اء',
@@ -633,13 +634,13 @@ $messages = array(
 'page-atom-feed'          => '"$1" تلقيم أتوم',
 'feed-atom'               => 'أتوم',
 'feed-rss'                => 'أر إس إس',
-'red-link-title'          => '$1 (لم تتم كتابتها بعد)',
+'red-link-title'          => '$1 (الص�حة غير موجودة)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ص�حة',
 'nstab-user'      => 'ص�حة مستخدم',
 'nstab-media'     => 'ص�حة ميديا',
-'nstab-special'   => 'خاص',
+'nstab-special'   => 'ص�حة خاصة',
 'nstab-project'   => 'ص�حة مشروع',
 'nstab-image'     => 'مل�',
 'nstab-mediawiki' => 'رسالة',
@@ -649,7 +650,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'لا يوجد �عل كهذا',
-'nosuchactiontext'  => 'ال�عل �ي المسار لم يتم التعر� عليه بواسطة الويكي',
+'nosuchactiontext'  => 'ال�عل المحدد بواسطة المسار غير صحيح.
+ربما تكون قد كتبت المسار بطريقة غير صحيحة، أو اتبعت وصلة غير صحيحة.
+هذا ربما يشير أيضا إلى علة �ي {{SITENAME}}.',
 'nosuchspecialpage' => 'لا توجد ص�حة خاصة بهذا الاسم',
 'nospecialpagetext' => "<big>'''لقد طلبت ص�حة خاصة غير صحيحة.'''</big>
 
@@ -679,9 +682,9 @@ $1',
 'readonlytext'         => 'قاعدة البيانات مغلقة حاليا أمام المدخلات الجديدة والتعديلات الأخرى، السبب غالبا ما يكون الصيانة، وستعود قاعدة البيانات للوضع الطبيعي قريبا.
 
 الإداري الذي أغلق قاعدة البيانات أعطى الت�سير التالي: $1',
-'missing-article'      => 'قاعدة البيانات لم تجد النص الخاص بص�حة كان يجب أن تجدها، واسمها "$1" $2.
+'missing-article'      => 'لم تجد قاعدة البيانات النص الخاص بص�حة كان يجب أن تجدها، واسمها "$1" $2.
 
-عادة ما يحدث هذا عند اتباع �رقا قديما أو وصلة تاريخ تؤدي إلى ص�حه تم حذ�ها.
+عادة ما يحدث هذا عند اتباع �رق قديم أو وصلة تاريخ تؤدي إلى ص�حه حذ�ت.
 
 إذا لم تكن هذه هي الحالة، �المحتمل أنك وجدت خللا �ي البرنامج.
 من �ضلك أبلغ أحد [[Special:ListUsers/sysop|الإداريين]]، وأعطه وصلة إلى مسار هذه الص�حة.',
@@ -704,7 +707,6 @@ $1',
 'badtitle'             => 'عنوان سيء',
 'badtitletext'         => 'عنوان الص�حة المطلوب إما غير صحيح أو �ارغ، وربما الوصلة بين اللغات أو بين المشاريع خاطئة.
 ومن الممكن وجود رموز لا تصلح للاستخدام �ي العناوين.',
-'perfdisabled'         => 'عذرا! هذه الخاصية معطلة حاليا لأنها تبطئ قاعدة البيانات إلى حد أنه لا أحد يستطيع استخدام الويكي.',
 'perfcached'           => 'البيانات التالية مختزنة وقد لا تكون محدثة.',
 'perfcachedts'         => 'البيانات التالية مخبأة، آخر تحديث لها كان �ي $1.',
 'querypage-no-updates' => 'التحديثات لهذه الص�حة معطلة حاليا.
@@ -720,7 +722,9 @@ $1',
 'protectedpagetext'    => 'هذه الص�حة تمت حمايتها لمنع التعديل.',
 'viewsourcetext'       => 'يمكنك رؤية ونسخ مصدر هذه الص�حة:',
 'protectedinterface'   => 'هذه الص�حة تو�ر نص الواجهة للبرنامج، وهي مق�لة لمنع التخريب.',
-'editinginterface'     => "'''تحذير''': أنت تقوم بتحرير ص�حة تستخدم �ي الواجهة النصية للبرنامج. التغييرات لهذه الص�حة سو� تؤثر على مظهر واجهة المستخدم للمستخدمين الآخرين. للترجمات، من �ضلك استخدم [http://translatewiki.net/wiki/Main_Page?setlang=ar بيتاويكي]، مشروع ترجمة الميدياويكي.",
+'editinginterface'     => "'''تحذير''': أنت تقوم بتحرير ص�حة تستخدم �ي الواجهة النصية للبرنامج.
+التغييرات لهذه الص�حة سو� تؤثر على مظهر واجهة المستخدم للمستخدمين الآخرين.
+للترجمات، من �ضلك استخدم [http://translatewiki.net/wiki/Main_Page?setlang=ar بيتاويكي]، مشروع ترجمة ميدياويكي.",
 'sqlhidden'            => '(استعلام SQL مخ�ي)',
 'cascadeprotected'     => 'تمت حماية هذه الص�حة من التعديل، بسبب كونها مدمجة �ي {{PLURAL:$1|ص�حة|ص�حات}} التالية، والتي تم استعمال خاصية "حماية الص�حات المدمجة" بها:
 $2',
@@ -731,16 +735,16 @@ $2',
 السبب المعطى هو ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'سيء : ماسح �يروسات غير معرو�: <i>$1</i>',
+'virus-badscanner'     => "سيء : ماسح �يروسات غير معرو�: ''$1''",
 'virus-scanfailed'     => '�شل المسح (كود $1)',
 'virus-unknownscanner' => 'مضاد �يروسات غير معرو�:',
 
 # Login and logout pages
 'logouttitle'                => 'خروج المستخدم',
-'logouttext'                 => '<strong>أنت الآن غير مسجل الدخول.</strong>
+'logouttext'                 => "'''أنت الآن غير مسجل الدخول.'''
 
 تستطيع المتابعة باستعمال {{SITENAME}} كمجهول، أو الدخول مرة أخرى بن�س الاسم أو باسم آخر.
-من الممكن أن ترى بعض الص�حات كما لو أنك مسجل الدخول، وذلك حتى تقوم بإ�راغ الص�حات المختزنة �ي المتص�ح لديك.',
+من الممكن أن ترى بعض الص�حات كما لو أنك مسجل الدخول، وذلك حتى تقوم بإ�راغ الص�حات المختزنة �ي المتص�ح لديك.",
 'welcomecreation'            => '== مرحبا، $1! ==
 تم إنشاء حسابك.
 لا تنس أن تغير [[Special:Preferences|ت�ضيلاتك �ي {{SITENAME}}]].',
@@ -751,7 +755,6 @@ $2',
 'remembermypassword'         => 'تذكر دخولي على هذا الحاسوب',
 'yourdomainname'             => 'نطاقك:',
 'externaldberror'            => 'هناك إما خطأ �ي دخول قاعدة البيانات الخارجية أو أنه غير مسموح لك بتحديث حسابك الخارجي.',
-'loginproblem'               => '<b>حدثت مشكلة أثناء الدخول.</b><br />يرجى المحاولة مرى أخرى!',
 'login'                      => 'دخول',
 'nav-login-createaccount'    => 'دخول / إنشاء حساب',
 'loginprompt'                => 'يجب أن تكون الكوكيز لديك م�علة لتسجل الدخول إلى {{SITENAME}}.',
@@ -777,7 +780,7 @@ $2',
 'yourvariant'                => 'اللهجة:',
 'yournick'                   => 'التوقيع:',
 'badsig'                     => 'توقيع خام غير صحيح؛ تحقق من وسوم HTML.',
-'badsiglength'               => 'التوقيع طويل جدا.
+'badsiglength'               => 'توقيعك طويل جدا.
 يجب أن يكون أقل من $1 {{PLURAL:$1|حر�|حرو�}}.',
 'email'                      => 'البريد الإلكتروني',
 'prefs-help-realname'        => 'الاسم الحقيقي اختياري.
@@ -797,6 +800,7 @@ $2',
 'loginsuccesstitle'          => 'تم الدخول بشكل صحيح',
 'loginsuccess'               => "'''لقد قمت بتسجيل الدخول ل{{SITENAME}} باسم \"\$1\".'''",
 'nosuchuser'                 => 'لا يوجد مستخدم بالاسم "$1".
+أسماء المستخدمين حساسة لحالة الحرو�.
 تأكد من إملاء الاسم، أو [[Special:UserLogin/signup|قم بإنشاء حساب جديد]].',
 'nosuchusershort'            => 'لا يوجد مستخدم باسم <nowiki>$1</nowiki>".
 تأكد من إملاء الاسم.',
@@ -823,12 +827,12 @@ $2',
 'throttled-mailpassword'     => 'تم بال�عل إرسال تذكير بكلمة السر، �ي خلال الـ{{PLURAL:$1|ساعة|$1 ساعة}} الماضية.
 لمنع التخريب، تذكير واحد �قط سيتم إرساله كل {{PLURAL:$1|ساعة|$1 ساعة}}.',
 'mailerror'                  => 'خطأ أثناء إرسال البريد: $1',
-'acct_creation_throttle_hit' => 'عذرا، لقد قمت بإنشاء $1 حساب.
-لا يمكنك عمل المزيد.',
-'emailauthenticated'         => 'تم تأكيد بريدك الإلكتروني �ي $1.',
+'acct_creation_throttle_hit' => 'الزوار لهذا الويكي باستخدام عنوان الأيبي الخاص بك أنشئوا {{PLURAL:$1|1 0حساب|$1 حساب}} �ي آخر يوم، وهو الحد الأقصى المسموح به �ي هذه ال�ترة الزمنية.
+كنتيجة لذلك، الزوار باستخدام عنوان الأيبيب هذا لا يمكنهم إنشاء أي حسابات أخرى حاليا.',
+'emailauthenticated'         => 'تم تأكيد بريدك الإلكتروني �ي $2 الساعة $3.',
 'emailnotauthenticated'      => 'لم يتم التحقق من بريدك الإلكتروني.
 لن يتم إرسال رسائل لأي من الميزات التالية.',
-'noemailprefs'               => 'حدد عنوان بريد إلكتروني لت�عيل هذه الخصائص.',
+'noemailprefs'               => 'حدد عنوان بريد إلكتروني �ي ت�ضيلاتك لهذه الخصائص لتعمل.',
 'emailconfirmlink'           => 'أكد عنوان بريدك الإلكتروني',
 'invalidemailaddress'        => 'لا يمكن قبول عنوان البريد الإلكتروني حيث تبدو صيغته خاطئة.
 ضع عنوانا مضبوطا أو أ�رغ هذا الحقل.',
@@ -839,20 +843,28 @@ $2',
 ينبغي عليك تسجيل الدخول وتغيير كلمة السر الخاصة بك الآن.
 
 يمكنك تجاهل هذه الرسالة، لو تم إنشاء هذا الحساب بالخطأ.',
+'login-throttled'            => 'أنت قمت بالكثير من المحاولات الحديثة على كلمة سر هذا الحساب. من �ضلك انتظر قبل المحاولة مرة أخرى.',
 'loginlanguagelabel'         => 'اللغة: $1',
 
 # Password reset dialog
-'resetpass'               => 'أعد ضبط كلمة سر الحساب',
-'resetpass_announce'      => 'تم تسجيل دخولك بكلمة سر مؤقتة.
+'resetpass'                 => 'تغيير كلمة السر',
+'resetpass_announce'        => 'تم تسجيل دخولك بكلمة سر مؤقتة.
 للدخول بشكل نهائي، يجب عليك ضبط كلمة سر جديدة هنا:',
-'resetpass_text'          => '<!-- أض� نصا هنا -->',
-'resetpass_header'        => 'غير كلمة سر الحساب',
-'resetpass_submit'        => 'ضبط كلمة السر والدخول',
-'resetpass_success'       => 'تم تغيير كلمة السر الخاصة بك بنجاح! يتم تسجيل دخولك الآن...',
-'resetpass_bad_temporary' => 'كلمة السر المؤقتة خاطئة.
+'resetpass_text'            => '<!-- أض� نصا هنا -->',
+'resetpass_header'          => 'غير كلمة سر الحساب',
+'oldpassword'               => 'كلمة السر القديمة:',
+'newpassword'               => 'كلمة السر الجديدة:',
+'retypenew'                 => 'أعد كتابة كلمة السر الجديدة:',
+'resetpass_submit'          => 'ضبط كلمة السر والدخول',
+'resetpass_success'         => 'تم تغيير كلمة السر الخاصة بك بنجاح! يتم تسجيل دخولك الآن...',
+'resetpass_bad_temporary'   => 'كلمة السر المؤقتة خاطئة.
 ربما تم تغيير كلمة السر �عليا بنجاح أو ربما قمت بطلب كلمة سر مؤقتة جديدة.',
-'resetpass_forbidden'     => 'كلمات السر لا يمكن تغييرها',
-'resetpass_missing'       => 'لا بيانات استمارة.',
+'resetpass_forbidden'       => 'كلمات السر لا يمكن تغييرها',
+'resetpass-no-info'         => 'يجب أن تكون مسجل الدخول للوصول إلى هذه الص�حة مباشرة.',
+'resetpass-submit-loggedin' => 'تغيير كلمة السر',
+'resetpass-wrong-oldpass'   => 'كلمة سر حالية أو مؤقتة غير صحيحة.
+ربما تكون غيرت كلمة السر الخاصة بك بنجاح أو طلبت كلمة سر مؤقتة جديدة.',
+'resetpass-temp-password'   => 'كلمة سر مؤقتة:',
 
 # Edit page toolbar
 'bold_sample'     => 'نص عريض',
@@ -875,8 +887,8 @@ $2',
 'hr_tip'          => 'خط أ�قي (تجنب الاستخدام بكثرة)',
 
 # Edit pages
-'summary'                          => 'ملخص',
-'subject'                          => 'موضوع/عنوان',
+'summary'                          => 'ملخص:',
+'subject'                          => 'موضوع/عنوان:',
 'minoredit'                        => 'هذا تعديل ط�ي�',
 'watchthis'                        => 'راقب هذه الص�حة',
 'savearticle'                      => 'ح�ظ الص�حة',
@@ -885,14 +897,14 @@ $2',
 'showlivepreview'                  => 'عرض مباشر',
 'showdiff'                         => 'عرض التغييرات',
 'anoneditwarning'                  => "'''تحذير:''' لم تقم بالدخول.
-سيتم تسجيل عنوان الأيبي الخاص بك �ي تاريخ هذه الص�حة.",
+سيسجل عنوان الآيبي خاصتك �ي تاريخ هذه الص�حة.",
 'missingsummary'                   => "'''تنبيه:''' لم تقم بكتابة ملخص للتعديل.
 إذا قمت بضغط ح�ظ الص�حة مرة أخرى، �يتم ح�ظ تعديلك بدون ملخص.",
 'missingcommenttext'               => 'من �ضلك أدخل تعليقا �ي الأس�ل.',
 'missingcommentheader'             => "'''تنبيه:''' لم تقم بوضع موضوع/عنوان لهذا التعليق.
 إذا قمت بالضغط على ح�ظ الص�حة مجددا، سيتم ح�ظ تعليقك بدون عنوان.",
-'summary-preview'                  => 'عرض مسبق للملخص',
-'subject-preview'                  => 'عرض مسبق للموضوع/العنوان',
+'summary-preview'                  => 'عرض مسبق للملخص:',
+'subject-preview'                  => 'عرض مسبق للموضوع/العنوان:',
 'blockedtitle'                     => 'المستخدم ممنوع',
 'blockedtext'                      => "<big>'''اسم المستخدم أو عنوان الأيبي الخاص بك تم منعه.'''</big>
 
@@ -937,7 +949,9 @@ $2',
 'loginreqlink'                     => 'دخول',
 'loginreqpagetext'                 => 'يجب عليك $1 لتشاهد ص�حات أخرى.',
 'accmailtitle'                     => 'تم إرسال كلمة السر.',
-'accmailtext'                      => "تم إرسال كلمة السر الخاصة بـ '$1' إلى العنوان $2.",
+'accmailtext'                      => "كلمة سر مولدة عشوائيا ل[[User talk:$1|$1]] تم إرسالها إلى $2.
+
+كلمة السر لهذا الحساب الجديد يمكن تغييرها �ي ص�حة ''[[Special:ChangePassword|تغيير كلمة السر]]'' عند تسجيل الدخول.",
 'newarticle'                       => '(جديد)',
 'newarticletext'                   => "لقد تبعت وصلة لص�حة لم يتم إنشائها بعد.
 لإنشاء هذه الص�حة ابدأ الكتابة �ي الصندوق بالأس�ل (انظر �ي [[{{MediaWiki:Helppage}}|ص�حة المساعدة]] للمزيد من المعلومات).
@@ -946,36 +960,39 @@ $2',
 لذا �يجب علينا استعمال رقم الأيبي للتعر� عليه/عليها.
 مثل هذا العنوان يمكن أن يشترك �يه عدة مستخدمين.
 لو كنت مستخدما مجهولا وتشعر بأن تعليقات لا تخصك تم توجيهها إليك، من �ضلك [[Special:UserLogin/signup|أنشئ حسابا]] أو [[Special:UserLogin|سجل الدخول]] لتجنب الارتباك المستقبلي مع مستخدمين مجهولين آخرين.''",
-'noarticletext'                    => 'لا يوجد حاليا أي نص �ي هذه الص�حة، يمكنك [[Special:Search/{{PAGENAME}}|البحث عن عنوان هذه الص�حة]] �ي الص�حات الأخرى أو [{{fullurl:{{FULLPAGENAME}}|action=edit}} تعديل هذه الص�حة].',
+'noarticletext'                    => 'لا يوجد حاليا أي نص �ي هذه الص�حة.
+يمكنك [[Special:Search/{{PAGENAME}}|البحث عن عنوان هذه الص�حة]] �ي الص�حات الأخرى،
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} البحث �ي السجلات المتعلقة]،
+أو [{{fullurl:{{FULLPAGENAME}}|action=edit}} تعديل هذه الص�حة]</span>.',
 'userpage-userdoesnotexist'        => 'حساب المستخدم "$1" غير مسجل.
 من �ضلك تأكد أنك تريد إنشاء/تعديل هذه الص�حة.',
 'clearyourcache'                   => "'''ملاحظة - بعد الح�ظ, ربما ينبغي عليك إ�راغ كاش متص�حك لرؤية التغييرات.''' '''موزيللا / �اير�وكس / سا�اري:''' اضغط ''Shift'' أثناء ضغط ''Reload,'' أو اضغط أيا من ''Ctrl-F5'' أو ''Ctrl-R'' (''Command-R'' على ماكنتوش); '''كونكرر: '''اضغط ''Reload'' أو اضغط ''F5;'' '''أوبرا:''' أ�رغ الكاش �ي ''Tools → Preferences;'' '''إنترنت إكسبلورر:''' اضغط ''Ctrl'' أثناء ضغط ''Refresh,'' أو اضغط ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>ملاحظة:</strong> استعمل زر 'عرض مسبق' لتجربة النمط (CSS) أو الجا�ا سكريبت الجديد قبل ح�ظ الص�حة.",
+'usercssjsyoucanpreview'           => "'''ملاحظة:''' استعمل زر 'عرض مسبق' لتجربة النمط (CSS) أو الجا�ا سكريبت الجديد قبل ح�ظ الص�حة.",
 'usercsspreview'                   => "'''تذكر أنك تقوم بعرض الأنماط المتراصة (CSS) الخاصة بك �قط
 لم يتم ح�ظها بعد!'''",
 'userjspreview'                    => "'''تذكر أنك �قط تجرب/تعرض الجا�ا سكريبت الخاص بك، لم يتم الح�ظ بعد!'''",
 'userinvalidcssjstitle'            => "'''تحذير:''' لا توجد واجهة  \"\$1\".
 تذكر أن مل�ات ال.css و ال.js تستخدم حرو� صغيرة �ي العنوان ، كمثال {{ns:user}}:Foo/monobook.css و ليس {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(محدثة)',
-'note'                             => '<strong>ملاحظة:</strong>',
-'previewnote'                      => '<strong>تذكر، هذا �قط عرض مسبق للص�حة؛
-ولم يتم ح�ظه بعد</strong>!',
+'note'                             => "'''ملاحظة:'''",
+'previewnote'                      => "'''تذكر، هذا �قط عرض مسبق للص�حة؛
+ولم يتم ح�ظه بعد'''!",
 'previewconflict'                  => 'هذا العرض يوضح النص الموجود �ي صندوق التحرير العلوي والذي سيظهر إذا اخترت الح�ظ.',
-'session_fail_preview'             => '<strong>عذرا! لم نتمكن من ح�ظ التعديلات التي قمت بها نتيجة لضياع بيانات هذه الجلسة.
+'session_fail_preview'             => "'''عذرا! لم نتمكن من ح�ظ التعديلات التي قمت بها نتيجة لضياع بيانات هذه الجلسة.
 من �ضلك حاول مرة أخرى.
-�ي حال استمرار المشكلة حاول أن تقوم [[Special:UserLogout|بالخروج]] ومن ثم الدخول مرة أخرى.</strong>',
-'session_fail_preview_html'        => "<strong>عذرا! لم نستطع معالجة تعديلك بسبب �قدان بيانات الجلسة.</strong>
+�ي حال استمرار المشكلة حاول أن تقوم [[Special:UserLogout|بالخروج]] ومن ثم الدخول مرة أخرى.'''",
+'session_fail_preview_html'        => "'''عذرا! لم نستطع معالجة تعديلك بسبب �قدان بيانات الجلسة.'''
 
 ''لأن {{SITENAME}} بها HTML الخام م�علة، العرض المسبق مخ�ي كاحتياط ضد هجمات الجا�ا سكريبت.''
 
-<strong>إذا كانت هذه محاولة تعديل صادقة، من �ضلك حاول مرة أخرى.
-إذا كانت مازالت لا تعمل، حاول [[Special:UserLogout|تسجيل الخروج]] ثم تسجيل الدخول مجددا.</strong>",
-'token_suffix_mismatch'            => '<strong>تعديلك تم ر�ضه لأن عميلك أخطأ �ي علامات الترقيم 
+'''إذا كانت هذه محاولة تعديل صادقة، من �ضلك حاول مرة أخرى.
+إذا كانت مازالت لا تعمل، حاول [[Special:UserLogout|تسجيل الخروج]] ثم تسجيل الدخول مجددا.'''",
+'token_suffix_mismatch'            => "'''تعديلك تم ر�ضه لأن عميلك أخطأ �ي علامات الترقيم 
 �ي نص التعديل. التعديل تم ر�ضه لمنع �ساد نص المقالة.
-هذا يحدث أحيانا عندما تستخدم خدمة بروكسي مجهولة معيبة أساسها الويب.</strong>',
+هذا يحدث أحيانا عندما تستخدم خدمة بروكسي مجهولة معيبة أساسها الويب.'''",
 'editing'                          => 'تحرير $1',
 'editingsection'                   => 'تحرير $1 (قسم)',
-'editingcomment'                   => 'تحرير $1 (تعليق)',
+'editingcomment'                   => 'تعديل $1 (قسم جديد)',
 'editconflict'                     => 'تضارب �ي التحرير: $1',
 'explainconflict'                  => "لقد عدل شخص آخر هذه الص�حة بعد أن بدأت أنت بتحريرها.
 صندوق النصوص العلوي يحتوي على النص الموجود حاليا �ي الص�حة.
@@ -984,30 +1001,32 @@ $2',
 '''�قط''' ما هو موجود �ي الصندوق العلوي هو ما سيتم ح�ظه عند الضغط على زر \"ح�ظ الص�حة\".",
 'yourtext'                         => 'نصك',
 'storedversion'                    => 'النسخة المخزنة',
-'nonunicodebrowser'                => '<strong>تحذير: متص�حك لا يتوا�ق مع الترميز الموحد.
-تمت معالجة هذا لكي تتمكن من تحرير الص�حات بأمان: الحرو� التي ليست ASCII سو� تظهر �ي صندوق التحرير كأكواد سداسي عشرية.</strong>',
-'editingold'                       => '<strong> تحذير: أنت تقوم الآن بتحرير نسخة قديمة من هذه الص�حة.
-إذا قمت بح�ظها، ست�قد كا�ة التغييرات التي حدثت بعد هذه النسخة. </strong>',
+'nonunicodebrowser'                => "'''تحذير: متص�حك لا يتوا�ق مع الترميز الموحد.
+تمت معالجة هذا لكي تتمكن من تحرير الص�حات بأمان: الحرو� التي ليست ASCII سو� تظهر �ي صندوق التحرير كأكواد سداسي عشرية.'''",
+'editingold'                       => "''' تحذير: أنت تقوم الآن بتحرير نسخة قديمة من هذه الص�حة.
+إذا قمت بح�ظها، ست�قد كا�ة التغييرات التي حدثت بعد هذه النسخة. '''",
 'yourdiff'                         => 'ال�روق',
-'copyrightwarning'                 => 'من �ضلك لاحظ أن جميع المساهمات ل {{SITENAME}} خاضعة وصادرة تحت ترخيص $2 (انظر �ي $1 للمزيد من الت�اصيل)
+'copyrightwarning'                 => "من �ضلك لاحظ أن جميع المساهمات ل {{SITENAME}} خاضعة وصادرة تحت ترخيص $2 (انظر �ي $1 للمزيد من الت�اصيل)
 إذا لم ترد أن تخضع كتابتك للتعديل والتوزيع الحر، لا تضعها هنا<br />. 
 كما أنك تتعهد بأنك قمت بكتابة ما هو موجود بن�سك، أو قمت بنسخها من مصدر يخضع ضمن الملكية العامة، أو مصدر حر آخر. 
-<strong>لا ترسل أي عمل ذي حقوق مح�وظة بدون الإذن من صاحب الحق</strong>.',
-'copyrightwarning2'                => 'من �ضلك لاحظ أن حميع المشاركات �ي {{SITENAME}} يمكن أن تعدل أو تتغير أو تحذ� من قبل المشاركين الآخرين.
+'''لا ترسل أي عمل ذي حقوق مح�وظة بدون الإذن من صاحب الحق'''.",
+'copyrightwarning2'                => "من �ضلك لاحظ أن جميع المساهمات �ي {{SITENAME}} يمكن أن تعدل أو تتغير أو تزال من قبل المساهمين الآخرين.
 إذا لم تكن ترغب أن تعدل مشاركاتك بهذا الشكل، لا تضعها هنا.<br />
-أنت أيضا تقر أنك كتبت هذا بن�سك، أو نسخته من مصدر يخضع ضمن الملكية العامة، أو مصدر حر آخر (انظر $1 للت�اصيل).
-<strong>لا تض� أي نص ذي حقوق مح�وظة!</strong>',
-'longpagewarning'                  => '<strong>تحذير: هذه الص�حة حجمها $1 كيلوبايت؛
+أنت تقر أيضا أنك كتبت هذا بن�سك، أو نسخته من مصدر يخضع للملكية العامة، أو مصدر حر آخر (انظر $1 للت�اصيل).
+'''لا تض� أي عمل ذي حقوق مح�وظة بدون تصريح!'''",
+'longpagewarning'                  => "'''تحذير: هذه الص�حة حجمها $1 كيلوبايت؛
 بعض المتص�حات قد تواجه مشاكل عند محاولة تحرير ص�حات يزيد حجمها عن 32 كيلوبايت.
-يرجى تقسيم الص�حة إلى أقسام أصغر حجما.</strong>',
-'longpageerror'                    => '<strong>خطأ: النص الذي أدخلته حجمه $1 كيلوبايت، وهذا أكبر من الحد الأقصى وهو $2 كيلوبايت.
-لا يمكن ح�ظه.</strong>',
-'readonlywarning'                  => '<strong>تحذير: لقد أغلقت قاعدة البيانات للصيانة، لذلك لن تتمكن من ح�ظ التعديلات التي قمت بها حاليا.
-إذا رغبت بإمكانك أن تنسخ النص الذي تعمل عليه وتح�ظه �ي مل� نصي إلى وقت لاحق.</strong>',
-'protectedpagewarning'             => '<strong>تحذير: تمت حماية هذه الص�حة حتى يمكن للمستخدمين ذوي الصلاحيات الإدارية �قط تعديلها.</strong>',
+يرجى تقسيم الص�حة إلى أقسام أصغر حجما.'''",
+'longpageerror'                    => "'''خطأ: النص الذي أدخلته حجمه $1 كيلوبايت، وهذا أكبر من الحد الأقصى وهو $2 كيلوبايت.
+لا يمكن ح�ظه.'''",
+'readonlywarning'                  => "'''تحذير: لقد أغلقت قاعدة البيانات للصيانة، لذلك لن تتمكن من ح�ظ التعديلات التي قمت بها حاليا.
+إذا رغبت بإمكانك أن تنسخ النص الذي تعمل عليه وتح�ظه �ي مل� نصي إلى وقت لاحق.'''
+
+الإداري الذي أغلقها أعطى هذا الت�سير: $1",
+'protectedpagewarning'             => "'''تحذير: تمت حماية هذه الص�حة حتى يمكن للمستخدمين ذوي الصلاحيات الإدارية �قط تعديلها.'''",
 'semiprotectedpagewarning'         => "'''ملاحظة:''' تمت حماية هذه الص�حة بحيث يمكن للمستخدمين المسجلين �قط تعديلها.",
 'cascadeprotectedwarning'          => '<strong>تحذير: تمت حماية هذه الص�حة بحيث يستطيع المستخدمون ذوو الصلاحيات الإدارية �قط تعديلها، وذلك لكونها مدمجة �ي {{PLURAL:$1|الص�حة|الص�حات}} التالية والتي تمت حمايتها بخاصية "حماية الص�حات المدمجة":</strong>',
-'titleprotectedwarning'            => '<strong>تحذير:  تمت حماية هذه الص�حة حتى يستطيع بعض المستخدمين �قط إنشاءها.</strong>',
+'titleprotectedwarning'            => "'''تحذير:  هذه الص�حة تمت حمايتها بحيث أن [[Special:ListGroupRights|صلاحيات معينة]] مطلوبة لإنشائها.'''",
 'templatesused'                    => 'القوالب المستخدمة �ي هذه الص�حة:',
 'templatesusedpreview'             => 'القوالب المستخدمة �ي هذا العرض المسبق:',
 'templatesusedsection'             => 'القوالب المستخدمة �ي هذا القسم:',
@@ -1026,11 +1045,21 @@ $2',
 
 يجب عليك التيقن من أن الاستمرار بتحرير هذه الص�حة ملائم.
 سجل الحذ� لهذه الص�حة معروض هنا:",
+'deleted-notice'                   => 'هذه الص�حة تم حذ�ها. سجل الحذ� للص�حة معروض بالأس�ل كمرجع.',
+'deletelog-fulllog'                => 'عرض السجل الكامل',
+'edit-hook-aborted'                => 'التعديل تم تركه بواسطة الخطا�.
+لم يعط ت�سيرا.',
+'edit-gone-missing'                => 'لم يمكن تحديث الص�حة.
+يبدو أنه تم حذ�ها.',
+'edit-conflict'                    => 'تضارب تحريري.',
+'edit-no-change'                   => 'تعديلك تم تجاهله، لأنه لم يحدث أي تعديل للنص.',
+'edit-already-exists'              => 'لم يمكن إنشاء ص�حة جديدة.
+هي موجودة بال�عل.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'تحذير: هذه الص�حة تحتوي على استدعاءات دالة محلل كثيرة مكل�ة.
 
-ينبغي أن تكون أقل من $2، يوجد الآن $1.',
+ينبغي أن تكون أقل من $2 {{PLURAL:$2|استدعاء|استدعاء}}، يوجد {{PLURAL:$1|الآن $1 استدعاء|الآن $1 استدعاء}}.',
 'expensive-parserfunction-category'       => 'ص�حات يوجد بها استدعاءات دوال محلل كثيرة ومكل�ة',
 'post-expand-template-inclusion-warning'  => 'تحذير: حجم تضمين القالب كبير جدا.
 بعض القوالب لن تضمن.',
@@ -1038,6 +1067,8 @@ $2',
 'post-expand-template-argument-warning'   => 'تحذير: هذه الص�حة تحتوي على عامل قالب واحد على الأقل له حجم تمدد كبير جدا.
 هذه العوامل تم حذ�ها.',
 'post-expand-template-argument-category'  => 'ص�حات تحتوي مدخلات القالب المحذو�ة',
+'parser-template-loop-warning'            => 'تم كش� حلقة قالب: [[$1]]',
+'parser-template-recursion-depth-warning' => 'تم تجاوز حد عمق �رد القوالب ($1)',
 
 # "Undo" feature
 'undo-success' => 'يمكن استرجاع التعديل.
@@ -1053,30 +1084,29 @@ $2',
 السبب المعطى بواسطة $3 هو ''$2''",
 
 # History pages
-'viewpagelogs'        => 'عرض السجلات لهذه الص�حة',
-'nohistory'           => 'لا يوجد تاريخ للتعديلات لهذه الص�حة.',
-'revnotfound'         => 'المراجعة غير موجودة',
-'revnotfoundtext'     => 'لم يتم العثور على المراجعة القديمة من الص�حة التي طلبتها.
-من �ضلك تأكد من المسار الذي دخلت به إلى هذه الص�حة.',
-'currentrev'          => 'المراجعة الحالية',
-'revisionasof'        => 'مراجعة $1',
-'revision-info'       => 'مراجعة $1 بواسطة $2',
-'previousrevision'    => '�مراجعة أقدم',
-'nextrevision'        => 'مراجعة أحدث→',
-'currentrevisionlink' => 'المراجعة الحالية',
-'cur'                 => 'الحالي',
-'next'                => 'التالي',
-'last'                => 'السابق',
-'page_first'          => 'الأولى',
-'page_last'           => 'الأخيرة',
-'histlegend'          => 'اختيار ال�رق: علم على صناديق النسخ للمقارنة واضغط قارن بين النسخ المختارة أو الزر بالأس�ل.<br />
+'viewpagelogs'           => 'عرض السجلات لهذه الص�حة',
+'nohistory'              => 'لا يوجد تاريخ للتعديلات لهذه الص�حة.',
+'currentrev'             => 'المراجعة الحالية',
+'currentrev-asof'        => 'المراجعة الحالية بتاريخ $1',
+'revisionasof'           => 'مراجعة $1',
+'revision-info'          => 'مراجعة $1 بواسطة $2', # Additionally available: $3: revision id
+'previousrevision'       => '�مراجعة أقدم',
+'nextrevision'           => 'مراجعة أحدث→',
+'currentrevisionlink'    => 'المراجعة الحالية',
+'cur'                    => 'الحالي',
+'next'                   => 'التالي',
+'last'                   => 'السابق',
+'page_first'             => 'الأولى',
+'page_last'              => 'الأخيرة',
+'histlegend'             => 'اختيار ال�رق: علم على صناديق النسخ للمقارنة واضغط قارن بين النسخ المختارة أو الزر بالأس�ل.<br />
 م�تاح: (الحالي) = ال�رق مع النسخة الحالية
 (السابق) = ال�رق مع النسخة السابقة، ط = تغيير ط�ي�',
-'deletedrev'          => '[محذو�ة]',
-'histfirst'           => 'أول',
-'histlast'            => 'آخر',
-'historysize'         => '({{PLURAL:$1|1 بايت|$1 بايت}})',
-'historyempty'        => '(�ارغ)',
+'history-fieldset-title' => 'تص�ح التاريخ',
+'deletedrev'             => '[محذو�ة]',
+'histfirst'              => 'أول',
+'histlast'               => 'آخر',
+'historysize'            => '({{PLURAL:$1|1 بايت|$1 بايت}})',
+'historyempty'           => '(�ارغ)',
 
 # Revision feed
 'history-feed-title'          => 'تاريخ المراجعة',
@@ -1164,11 +1194,12 @@ $2',
 'mergehistory-invalid-destination' => 'الص�حة الهد� يجب أن تكون عنوانا صحيحا.',
 'mergehistory-autocomment'         => 'دمج [[:$1]] �ي [[:$2]]',
 'mergehistory-comment'             => 'دمج [[:$1]] �ي [[:$2]]: $3',
+'mergehistory-same-destination'    => 'ص�حتا المصدر والهد� لا يمكن أن تكونا ن�س الشيء',
 
 # Merge log
 'mergelog'           => 'سجل الدمج',
 'pagemerge-logentry' => 'دمج [[$1]] إلى [[$2]] (المراجعات حتى $3)',
-'revertmerge'        => 'استرجاع الدمج',
+'revertmerge'        => 'إلغاء الدمج',
 'mergelogpagetext'   => 'بالأس�ل قائمة بأحدث عمليات الدمج لتاريخ ص�حة ما إلى أخرى.',
 
 # Diffs
@@ -1176,125 +1207,206 @@ $2',
 'difference'              => '(ال�رق بين المراجعتين)',
 'lineno'                  => 'سطر $1:',
 'compareselectedversions' => 'قارن بين النسختين المختارتين',
+'visualcomparison'        => 'مقارنة بصرية',
+'wikicodecomparison'      => 'مقارنة نص الويكي',
 'editundo'                => 'رجوع',
 'diff-multi'              => '({{PLURAL:$1|مراجعة واحدة متوسطة|$1 مراجعة متوسطة}} غير معروضة.)',
+'diff-movedto'            => 'تم النقل إلى $1',
+'diff-styleadded'         => '$1 نمط تمت إضا�ته',
+'diff-added'              => '$1 تمت إضا�ته',
+'diff-changedto'          => 'تغير إلى $1',
+'diff-movedoutof'         => 'تم النقل من $1',
+'diff-styleremoved'       => '$1 نمط تمت إزالته',
+'diff-removed'            => '$1 تمت إزالته',
+'diff-changedfrom'        => 'تغير من $1',
+'diff-src'                => 'مصدر',
+'diff-withdestination'    => 'بالوجهة $1',
+'diff-with'               => '&#32;مع $1 $2',
+'diff-with-final'         => '&#32;Ùˆ $1 $2',
+'diff-width'              => 'عرض',
+'diff-height'             => 'ارت�اع',
+'diff-p'                  => "'''�قرة'''",
+'diff-blockquote'         => "'''اقتباس'''",
+'diff-h1'                 => "'''عنوان (مستوى 1)'''",
+'diff-h2'                 => "'''عنوان (مستوى 2)'''",
+'diff-h3'                 => "'''عنوان (مستوى 3)'''",
+'diff-h4'                 => "'''عنوان (مستوى 4)'''",
+'diff-h5'                 => "'''عنوان (مستوى 5)'''",
+'diff-pre'                => "'''قطعة مهيأة من قبل'''",
+'diff-div'                => "'''تقسيم'''",
+'diff-ul'                 => "'''قائمة غير مرتبة'''",
+'diff-ol'                 => "'''قائمة مرتبة'''",
+'diff-li'                 => "'''مدخلة قائمة'''",
+'diff-table'              => "'''جدول'''",
+'diff-tbody'              => "'''محتوى جدول'''",
+'diff-tr'                 => "'''ص�'''",
+'diff-td'                 => "'''خلية'''",
+'diff-th'                 => "'''عنوان'''",
+'diff-br'                 => "'''قاطع'''",
+'diff-hr'                 => "'''قاعدة أ�قية'''",
+'diff-code'               => "'''قطعة كود حاسوب'''",
+'diff-dl'                 => "'''قائمة تعري�ات'''",
+'diff-dt'                 => "'''مصطلح تعري�'''",
+'diff-dd'                 => "'''تعري�'''",
+'diff-input'              => "'''مدخل'''",
+'diff-form'               => "'''استمارة'''",
+'diff-img'                => "'''صورة'''",
+'diff-span'               => "'''سبان'''",
+'diff-a'                  => "'''وصلة'''",
+'diff-i'                  => "'''مائل'''",
+'diff-b'                  => "'''عريض'''",
+'diff-strong'             => "'''قوي'''",
+'diff-em'                 => "'''تأكيد'''",
+'diff-font'               => "'''خط'''",
+'diff-big'                => "'''كبير'''",
+'diff-del'                => "'''محذو�'''",
+'diff-tt'                 => "'''عرض ثابت'''",
+'diff-sub'                => "'''نص تحتي'''",
+'diff-sup'                => "'''نص �وقي'''",
+'diff-strike'             => "'''شطب'''",
 
 # Search results
-'searchresults'             => 'نتائج البحث',
-'searchresulttext'          => 'للمزيد من المعلومات حول البحث �ي {{SITENAME}}، انظر [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'أنت بحثت عن \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|كل الص�حات التي تبدأ ب"$1"]] | [[Special:WhatLinksHere/$1|كل الص�حات التي تصل إلى "$1"]])',
-'searchsubtitleinvalid'     => "أنت بحثت عن '''$1'''",
-'noexactmatch'              => "'''لا توجد ص�حة بالاسم \"\$1\"'''.
+'searchresults'                    => 'نتائج البحث',
+'searchresults-title'              => 'نتائج البحث عن "$1"',
+'searchresulttext'                 => 'للمزيد من المعلومات حول البحث �ي {{SITENAME}}، انظر [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'أنت بحثت عن \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|كل الص�حات التي تبدأ ب"$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|كل الص�حات التي تصل إلى "$1"]])',
+'searchsubtitleinvalid'            => "أنت بحثت عن '''$1'''",
+'noexactmatch'                     => "'''لا توجد ص�حة بالاسم \"\$1\"'''.
 يمكنك [[:\$1|إنشاء هذه الص�حة]].",
-'noexactmatch-nocreate'     => "'''لا توجد ص�حة بالاسم \"\$1\".'''",
-'toomanymatches'            => 'وجدت مطابقات كثيرة، من �ضلك جرب استعلاما مختل�ا',
-'titlematches'              => 'عنوان الص�حة يطابق',
-'notitlematches'            => 'لم يتم إيجاد أي عنوان مطابق',
-'textmatches'               => 'نص الص�حة يطابق',
-'notextmatches'             => 'لم يتم إيجاد أي نص مطابق',
-'prevn'                     => '$1 السابقة',
-'nextn'                     => '$1 التالية',
-'viewprevnext'              => 'عرض ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 كلمة|$2 كلمة}})',
-'search-result-score'       => 'الارتباط: $1%',
-'search-redirect'           => '(تحويلة $1)',
-'search-section'            => '(قسم $1)',
-'search-suggest'            => 'هل كنت تقصد: $1',
-'search-interwiki-caption'  => 'المشاريع الشقيقة',
-'search-interwiki-default'  => '$1 نتيجة:',
-'search-interwiki-more'     => '(المزيد)',
-'search-mwsuggest-enabled'  => 'مع اقتراحات',
-'search-mwsuggest-disabled' => 'لا اقتراحات',
-'search-relatedarticle'     => 'مرتبطة',
-'mwsuggest-disable'         => 'تعطيل اقتراحات أجاكس',
-'searchrelated'             => 'مرتبطة',
-'searchall'                 => 'الكل',
-'showingresults'            => "معروض بالأس�ل {{PLURAL:$1|'''1''' نتيجة|'''$1''' نتيجة}} بدءا من رقم '''$2'''.",
-'showingresultsnum'         => "معروض بالأس�ل {{PLURAL:$3|'''نتيجة واحدة'''|'''$3''' نتيجة}} بدءا من رقم'''$2'''.",
-'showingresultstotal'       => "معروض بالأس�ل {{PLURAL:$3|النتيجة '''$1''' من '''$3'''|النتائج '''$1 - $2''' من '''$3'''}}",
-'nonefound'                 => "'''ملاحظة''': �قط بعض النطاقات يتم البحث �يها ا�تراضيا.
+'noexactmatch-nocreate'            => "'''لا توجد ص�حة بالاسم \"\$1\".'''",
+'toomanymatches'                   => 'وجدت مطابقات كثيرة، من �ضلك جرب استعلاما مختل�ا',
+'titlematches'                     => 'عنوان الص�حة يطابق',
+'notitlematches'                   => 'لم يتم إيجاد أي عنوان مطابق',
+'textmatches'                      => 'نص الص�حة يطابق',
+'notextmatches'                    => 'لم يتم إيجاد أي نص مطابق',
+'prevn'                            => '$1 السابقة',
+'nextn'                            => '$1 التالية',
+'viewprevnext'                     => 'عرض ($1) ($2) ($3).',
+'searchmenu-legend'                => 'خيارات البحث',
+'searchmenu-exists'                => "*الص�حة '''[[$1]]'''",
+'searchmenu-new'                   => "'''أنشئ الص�حة \"[[:\$1]]\" �ي هذا الويكي!'''",
+'searchhelp-url'                   => 'Help:محتويات',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|تص�ح الص�حات بهذه البادئة]]',
+'searchprofile-articles'           => 'ص�حات المحتوى',
+'searchprofile-articles-and-proj'  => 'ص�حات المحتوى والمشروع',
+'searchprofile-project'            => 'ص�حات المشروع',
+'searchprofile-images'             => 'المل�ات',
+'searchprofile-everything'         => 'كل شيء',
+'searchprofile-advanced'           => 'متقدم',
+'searchprofile-articles-tooltip'   => 'ابحث �ي $1',
+'searchprofile-project-tooltip'    => 'ابحث �ي $1',
+'searchprofile-images-tooltip'     => 'ابحث عن الصور',
+'searchprofile-everything-tooltip' => 'ابحث �ي كل المحتوى (شاملا ص�حات النقاش)',
+'searchprofile-advanced-tooltip'   => 'ابحث �ي النطاقات المخصصة',
+'prefs-search-nsdefault'           => 'ابحث باستخدام الا�تراضيات:',
+'prefs-search-nscustom'            => 'ابحث �ي النطاقات المخصصة:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 كلمة|$2 كلمة}})',
+'search-result-score'              => 'الارتباط: $1%',
+'search-redirect'                  => '(تحويلة $1)',
+'search-section'                   => '(قسم $1)',
+'search-suggest'                   => 'هل كنت تقصد: $1',
+'search-interwiki-caption'         => 'المشاريع الشقيقة',
+'search-interwiki-default'         => '$1 نتيجة:',
+'search-interwiki-more'            => '(المزيد)',
+'search-mwsuggest-enabled'         => 'مع اقتراحات',
+'search-mwsuggest-disabled'        => 'لا اقتراحات',
+'search-relatedarticle'            => 'مرتبطة',
+'mwsuggest-disable'                => 'تعطيل اقتراحات أجاكس',
+'searchrelated'                    => 'مرتبطة',
+'searchall'                        => 'الكل',
+'showingresults'                   => "معروض بالأس�ل {{PLURAL:$1|'''1''' نتيجة|'''$1''' نتيجة}} بدءا من رقم '''$2'''.",
+'showingresultsnum'                => "معروض بالأس�ل {{PLURAL:$3|'''نتيجة واحدة'''|'''$3''' نتيجة}} بدءا من رقم'''$2'''.",
+'showingresultstotal'              => "معروض بالأس�ل {{PLURAL:$4|النتيجة '''$1''' من '''$3'''|النتائج '''$1 - $2''' من '''$3'''}}",
+'nonefound'                        => "'''ملاحظة''': �قط بعض النطاقات يتم البحث �يها ا�تراضيا.
 حاول بدء استعلامك ب ''all:'' للبحث �ي كل المحتوى (شاملا ص�حات النقاش، القوالب، إلى آخره)، أو استخدم النطاق المطلوب كبادئة.",
-'powersearch'               => 'بحث متقدم',
-'powersearch-legend'        => 'بحث متقدم',
-'powersearch-ns'            => 'بحث �ي النطاقات:',
-'powersearch-redir'         => 'عرض التحويلات',
-'powersearch-field'         => 'بحث عن',
-'search-external'           => 'بحث خارجي',
-'searchdisabled'            => 'البحث �ي {{SITENAME}} معطل.
+'search-nonefound'                 => 'لا توجد نتائج تطابق الاستعلام.',
+'powersearch'                      => 'بحث متقدم',
+'powersearch-legend'               => 'بحث متقدم',
+'powersearch-ns'                   => 'بحث �ي النطاقات:',
+'powersearch-redir'                => 'عرض التحويلات',
+'powersearch-field'                => 'بحث عن',
+'search-external'                  => 'بحث خارجي',
+'searchdisabled'                   => 'البحث �ي {{SITENAME}} معطل.
 يمكنك البحث من خلال جوجل �ي الوقت الحالي.
 لاحظ أن �هارسه لمحتوى {{SITENAME}} ربما تكون غير محدثة.',
 
 # Preferences page
-'preferences'              => 'ت�ضيلات',
-'mypreferences'            => 'ت�ضيلاتي',
-'prefs-edits'              => 'عدد التعديلات:',
-'prefsnologin'             => 'غير مسجل',
-'prefsnologintext'         => 'يجب أن تكون <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} مسجل الدخول]</span>  حتى تتمكن من تعديل ت�ضيلات المستخدم.',
-'prefsreset'               => 'أعيدت الت�ضيلات إلى الإعداد الا�تراضي المخزن.',
-'qbsettings'               => 'لوح سريع',
-'qbsettings-none'          => 'بلا تحديد',
-'qbsettings-fixedleft'     => 'مثبت لليسار',
-'qbsettings-fixedright'    => 'مثبت لليمين',
-'qbsettings-floatingleft'  => 'حر لليسار',
-'qbsettings-floatingright' => 'حر لليمين',
-'changepassword'           => 'غير كلمة السر',
-'skin'                     => 'واجهة',
-'math'                     => 'رياضيات',
-'dateformat'               => 'صيغة التاريخ',
-'datedefault'              => 'لا ت�ضيل',
-'datetime'                 => 'وقت وتاريخ',
-'math_failure'             => 'خطأ رياضيات',
-'math_unknown_error'       => 'خطأ غير معرو�',
-'math_unknown_function'    => 'وظي�ة غير معرو�ة',
-'math_lexing_error'        => 'خطأ �ي الصيغة',
-'math_syntax_error'        => 'خطأ �ي الصياغة',
-'math_image_error'         => '�شل التحويل لPNG؛
+'preferences'               => 'ت�ضيلات',
+'mypreferences'             => 'ت�ضيلاتي',
+'prefs-edits'               => 'عدد التعديلات:',
+'prefsnologin'              => 'غير مسجل',
+'prefsnologintext'          => 'يجب أن تكون <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} مسجل الدخول]</span>  حتى تتمكن من تعديل ت�ضيلات المستخدم.',
+'prefsreset'                => 'أعيدت الت�ضيلات إلى الإعداد الا�تراضي المخزن.',
+'qbsettings'                => 'لوح سريع',
+'qbsettings-none'           => 'بلا تحديد',
+'qbsettings-fixedleft'      => 'مثبت لليسار',
+'qbsettings-fixedright'     => 'مثبت لليمين',
+'qbsettings-floatingleft'   => 'حر لليسار',
+'qbsettings-floatingright'  => 'حر لليمين',
+'changepassword'            => 'غير كلمة السر',
+'skin'                      => 'واجهة',
+'skin-preview'              => 'عرض',
+'math'                      => 'رياضيات',
+'dateformat'                => 'صيغة التاريخ',
+'datedefault'               => 'لا ت�ضيل',
+'datetime'                  => 'وقت وتاريخ',
+'math_failure'              => 'خطأ رياضيات',
+'math_unknown_error'        => 'خطأ غير معرو�',
+'math_unknown_function'     => 'وظي�ة غير معرو�ة',
+'math_lexing_error'         => 'خطأ �ي الصيغة',
+'math_syntax_error'         => 'خطأ �ي الصياغة',
+'math_image_error'          => '�شل التحويل لPNG؛
 تحقق من تثبيت كل من Latex و dvips و gs و convert.',
-'math_bad_tmpdir'          => 'لا يمكن الكتابة إلى أو إنشاء مجلد الرياضيات المؤقت',
-'math_bad_output'          => 'لا يمكن الكتابة إلى أو إنشاء مجلد الخرج للرياضيات',
-'math_notexvc'             => 'م�قود texvc executable؛
+'math_bad_tmpdir'           => 'لا يمكن الكتابة إلى أو إنشاء مجلد الرياضيات المؤقت',
+'math_bad_output'           => 'لا يمكن الكتابة إلى أو إنشاء مجلد الخرج للرياضيات',
+'math_notexvc'              => 'م�قود texvc executable؛
 من �ضلك انظر math/README للضبط.',
-'prefs-personal'           => 'مل� المستخدم',
-'prefs-rc'                 => 'أحدث التغييرات',
-'prefs-watchlist'          => 'قائمة المراقبة',
-'prefs-watchlist-days'     => 'عدد الأيام للعرض �ي قائمة المراقبة:',
-'prefs-watchlist-edits'    => 'عدد التعديلات التي تعرض �ي قائمة المراقبة الموسعة:',
-'prefs-misc'               => 'مت�رقات',
-'saveprefs'                => 'ح�ظ',
-'resetprefs'               => 'إزالة التغييرات غير المح�وظة',
-'oldpassword'              => 'كلمة السر القديمة:',
-'newpassword'              => 'كلمة السر الجديدة:',
-'retypenew'                => 'أعد كتابة كلمة السر الجديدة:',
-'textboxsize'              => 'أبعاد صندوق النصوص',
-'rows'                     => 'ص�و�:',
-'columns'                  => 'أعمدة:',
-'searchresultshead'        => 'بحث',
-'resultsperpage'           => 'عدد النتائج �ي الص�حة:',
-'contextlines'             => 'عدد الأسطر �ي كل نتيجة:',
-'contextchars'             => 'عدد الأحر� �ي كل سطر',
-'stub-threshold'           => 'الحد لتنسيق <a href="#" class="stub">وصلة البذرة</a>:',
-'recentchangesdays'        => 'عدد الأيام المعروضة �ي أحدث التغييرات:',
-'recentchangescount'       => 'عدد التعديلات للعرض �ي أحدث التغييرات، ص�حات التواريخ والسجلات:',
-'savedprefs'               => 'تم ح�ظ ت�ضيلاتك.',
-'timezonelegend'           => 'المنطقة الزمنية',
-'timezonetext'             => '¹عدد الساعات بين توقيتك المحلي وتوقيت الخادم (UTC).',
-'localtime'                => 'الوقت المحلي',
-'timezoneoffset'           => 'ال�رق¹',
-'servertime'               => 'وقت الخادم',
-'guesstimezone'            => 'أدخل التوقيت من المتص�ح',
-'allowemail'               => 'السماح بتلقي البريد الإلكتروني من المستخدمين الآخرين',
-'prefs-searchoptions'      => 'خيارات البحث',
-'prefs-namespaces'         => 'أسماء النطاقات',
-'defaultns'                => 'ابحث �ي هذه النطاقات ا�تراضيا:',
-'default'                  => 'ا�تراضي',
-'files'                    => 'مل�ات',
+'prefs-personal'            => 'مل� المستخدم',
+'prefs-rc'                  => 'أحدث التغييرات',
+'prefs-watchlist'           => 'قائمة المراقبة',
+'prefs-watchlist-days'      => 'عدد الأيام للعرض �ي قائمة المراقبة:',
+'prefs-watchlist-days-max'  => '(حد أقصى 7 أيام)',
+'prefs-watchlist-edits'     => 'عدد التعديلات التي تعرض �ي قائمة المراقبة الموسعة:',
+'prefs-watchlist-edits-max' => '(عدد أقصى: 1000)',
+'prefs-misc'                => 'مت�رقات',
+'prefs-resetpass'           => 'غير كلمة السر',
+'saveprefs'                 => 'ح�ظ',
+'resetprefs'                => 'إزالة التغييرات غير المح�وظة',
+'textboxsize'               => 'أبعاد صندوق النصوص',
+'prefs-edit-boxsize'        => 'حجم نا�ذة التحرير.',
+'rows'                      => 'ص�و�:',
+'columns'                   => 'أعمدة:',
+'searchresultshead'         => 'بحث',
+'resultsperpage'            => 'عدد النتائج �ي الص�حة:',
+'contextlines'              => 'عدد الأسطر �ي كل نتيجة:',
+'contextchars'              => 'عدد الأحر� �ي كل سطر',
+'stub-threshold'            => 'الحد لتنسيق <a href="#" class="stub">وصلة البذرة</a>:',
+'recentchangesdays'         => 'عدد الأيام المعروضة �ي أحدث التغييرات:',
+'recentchangesdays-max'     => '(حد أقصى $1 {{PLURAL:$1|يوم|يوم}})',
+'recentchangescount'        => 'عدد التعديلات للعرض �ي أحدث التغييرات، تواريخ الص�حات، و�ي السجلات، ا�تراضيا:',
+'savedprefs'                => 'تم ح�ظ ت�ضيلاتك.',
+'timezonelegend'            => 'المنطقة الزمنية',
+'timezonetext'              => '¹عدد الساعات بين توقيتك المحلي وتوقيت الخادم (UTC).',
+'localtime'                 => 'الوقت المحلي:',
+'timezoneselect'            => 'المنطقة الزمنية:',
+'timezoneuseserverdefault'  => 'استخدم ا�تراض الخادم',
+'timezoneuseoffset'         => 'آخر (حدد ال�رق)',
+'timezoneoffset'            => 'ال�رق¹:',
+'servertime'                => 'وقت الخادم:',
+'guesstimezone'             => 'أدخل التوقيت من المتص�ح',
+'allowemail'                => 'السماح بتلقي البريد الإلكتروني من المستخدمين الآخرين',
+'prefs-searchoptions'       => 'خيارات البحث',
+'prefs-namespaces'          => 'أسماء النطاقات',
+'defaultns'                 => 'ابحث �ي هذه النطاقات ا�تراضيا:',
+'default'                   => 'ا�تراضي',
+'files'                     => 'مل�ات',
 
 # User rights
 'userrights'                  => 'إدارة صلاحيات المستخدم', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'إدارة مجموعات المستخدم',
 'userrights-user-editname'    => 'أدخل اسم مستخدم:',
 'editusergroup'               => 'تعديل مجموعات المستخدم',
-'editinguser'                 => "تغيير صلاحيات المستخدم للمستخدم '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "تغيير صلاحيات المستخدم للمستخدم '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'تعديل مجموعات المستخدم',
 'saveusergroups'              => 'ح�ظ مجموعات المستخدم',
 'userrights-groupsmember'     => 'عضو �ي:',
@@ -1343,6 +1455,8 @@ $2',
 'right-minoredit'            => 'التعليم على التعديلات كط�ي�ة',
 'right-move'                 => 'نقل الص�حات',
 'right-move-subpages'        => 'نقل الص�حات مع ص�حاتها ال�رعية',
+'right-move-rootuserpages'   => 'نقل ص�حات المستخدمين الأساسية',
+'right-movefile'             => 'نقل المل�ات',
 'right-suppressredirect'     => 'عدم إنشاء تحويلة من الاسم القديم عند نقل ص�حة',
 'right-upload'               => 'ر�ع المل�ات',
 'right-reupload'             => 'الكتابة على مل� موجود',
@@ -1393,9 +1507,46 @@ $2',
 'rightslogentry' => 'غير صلاحيات $1 من $2 إلى $3',
 'rightsnone'     => '(لا شيء)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'قراءة هذه الص�حة',
+'action-edit'                 => 'تعديل هذه الص�حة',
+'action-createpage'           => 'إنشاء الص�حات',
+'action-createtalk'           => 'إنشاء ص�حات النقاش',
+'action-createaccount'        => 'إنشاء حساب المستخدم هذا',
+'action-minoredit'            => 'التعليم على هذا التعديل كط�ي�',
+'action-move'                 => 'نقل هذه الص�حة',
+'action-move-subpages'        => 'نقل هذه الص�حة، وص�حاتها ال�رعية',
+'action-move-rootuserpages'   => 'نقل ص�حات المستخدمين الأساسية',
+'action-movefile'             => 'نقل هذا المل�',
+'action-upload'               => 'ر�ع هذا المل�',
+'action-reupload'             => 'الكتابة على هذا المل� الموجود',
+'action-reupload-shared'      => 'الكتابة على هذا المل� �ي مستودع مشترك',
+'action-upload_by_url'        => 'ر�ع هذا المل� من عنوان مسار',
+'action-writeapi'             => 'استخدام API الكتابة',
+'action-delete'               => 'حذ� هذه الص�حة',
+'action-deleterevision'       => 'حذ� هذه المراجعة',
+'action-deletedhistory'       => 'رؤية تاريخ هذه الص�حة المحذو�',
+'action-browsearchive'        => 'البحث �ي الص�حات المحذو�ة',
+'action-undelete'             => 'استرجاع هذه الص�حة',
+'action-suppressrevision'     => 'مراجعة واسترجاع هذه المراجعة المخ�ية',
+'action-suppressionlog'       => 'رؤية هذا السجل الخاص',
+'action-block'                => 'منع هذا المستخدم من التعديل',
+'action-protect'              => 'تغيير مستويات الحماية لهذه الص�حة',
+'action-import'               => 'استيراد هذه الص�حة من ويكي آخر',
+'action-importupload'         => 'استيراد هذه الص�حة من مل� مر�وع',
+'action-patrol'               => 'التعليم على تعديلات الآخرين كمراجعة',
+'action-autopatrol'           => 'جعل تعديلك معلم عليه كمراجع',
+'action-unwatchedpages'       => 'رؤية قائمة الص�حات غير المراقبة',
+'action-trackback'            => 'تن�يذ تراكباك',
+'action-mergehistory'         => 'دمج تاريخ هذه الص�حة',
+'action-userrights'           => 'تعديل كل صلاحيات المستخدم',
+'action-userrights-interwiki' => 'تعديل صلاحيات المستخدم للمستخدمين �ي الويكيات الأخرى',
+'action-siteadmin'            => 'غلق أو ر�ع غلق قاعدة البيانات',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|تغيير|تغييران|$1 تغييرات|$1 تغيير|$1 تغييرا}}',
 'recentchanges'                     => 'أحدث التغييرات',
+'recentchanges-legend'              => 'خيارات أحدث التغييرات',
 'recentchangestext'                 => 'تابع آخر التغييرات �ي الويكي من هذه الص�حة.',
 'recentchanges-feed-description'    => 'تابع أحدث التغييرات للويكي عبر هذه التلقيمة.',
 'rcnote'                            => "بالأس�ل {{PLURAL:$1|'''1''' تغيير|آخر '''$1''' تغيير}} �ي آخر {{PLURAL:$2|يوم|'''$2''' يوم}}، بدءا من $5، $4.",
@@ -1420,6 +1571,8 @@ $2',
 'rc_categories'                     => 'حصر لتصني�ات (م�رقة برمز "|")',
 'rc_categories_any'                 => 'أي',
 'newsectionsummary'                 => '/* $1 */ قسم جديد',
+'rc-enhanced-expand'                => 'عرض الت�اصيل (يتطلب جا�اسكريبت)',
+'rc-enhanced-hide'                  => 'إخ�اء الت�اصيل',
 
 # Recent changes linked
 'recentchangeslinked'          => 'تغييرات ذات علاقة',
@@ -1441,11 +1594,11 @@ $2',
 'upload_directory_read_only'  => 'مجلد الر�ع ($1) لا يمكن الكتابة عليه بواسطة خادم الويب.',
 'uploaderror'                 => 'خطأ �ي الر�ع',
 'uploadtext'                  => "استخدم الاستمارة بالأس�ل لر�ع المل�ات.
-لرؤية أو البحث �ي المل�ات المر�وعة سابقا، راجع [[Special:ImageList|قائمة المل�ات المر�وعة]]، عمليات الر�ع (وإعادة الر�ع) مسجلة �ي [[Special:Log/upload|سجل الر�ع]] وعمليات الحذ� �ي [[Special:Log/delete|سجل الحذ�]].
+لرؤية أو البحث �ي المل�ات المر�وعة سابقا، راجع [[Special:FileList|قائمة المل�ات المر�وعة]]، عمليات الر�ع (وإعادة الر�ع) مسجلة �ي [[Special:Log/upload|سجل الر�ع]] وعمليات الحذ� �ي [[Special:Log/delete|سجل الحذ�]].
 
 لإدراج صورة �ي ص�حة، استخدم الوصلات �ي الصيغ التالية:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' لاستخدام النسخة الكاملة لمل�
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|نص بديل]]</nowiki></tt>''' لاستخدام صورة عرضها 200 بكسل �ي صندوق �ي الجانب الأيسر مع 'نص بديل' كوص�
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' لاستخدام النسخة الكاملة لمل�
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|نص بديل]]</nowiki></tt>''' لاستخدام صورة عرضها 200 بكسل �ي صندوق �ي الجانب الأيسر مع 'نص بديل' كوص�
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' للوصل للمل� مباشرة بدون عرض المل�.",
 'upload-permitted'            => 'أنواع المل�ات المسموحة: $1.',
 'upload-preferred'            => 'أنواع المل�ات الم�ضلة: $1.',
@@ -1453,7 +1606,7 @@ $2',
 'uploadlog'                   => 'سجل الر�ع',
 'uploadlogpage'               => 'سجل الر�ع',
 'uploadlogpagetext'           => '�ي الأس�ل قائمة بأحدث عمليات ر�ع المل�ات.
-انظر [[Special:NewImages|معرض المل�ات الجديدة]] لعرض بصري أكثر',
+انظر [[Special:NewFiles|معرض المل�ات الجديدة]] لعرض بصري أكثر',
 'filename'                    => 'اسم المل�',
 'filedesc'                    => 'ملخص',
 'fileuploadsummary'           => 'ملخص:',
@@ -1478,27 +1631,28 @@ $2',
 'emptyfile'                   => 'يبدو أن المل� الذي ر�عته �ارغ.
 قد يكون سبب ذلك خطأ �ي كتابة الاسم.
 من �ضلك تأكد من أنك تريد �علا ر�ع هذا المل�.',
-'fileexists'                  => 'هناك مل� موجود يحمل ن�س هذا الاسم الرجاء التأكد من هذا المل� باتباع الوصلة التالية <strong><tt>$1</tt></strong> قبل القيام بتغييره.',
-'filepageexists'              => 'ص�حة الوص� لهذا المل� تم إنشاؤها بال�عل �ي <strong><tt>$1</tt></strong>، لكن لا يوجد مل� بهذا الاسم حاليا.
+'fileexists'                  => "هناك مل� موجود يحمل ن�س هذا الاسم الرجاء التأكد من هذا المل� باتباع الوصلة التالية '''<tt>$1</tt>''' قبل القيام بتغييره.",
+'filepageexists'              => "ص�حة الوص� لهذا المل� تم إنشاؤها بال�عل �ي '''<tt>$1</tt>'''، لكن لا يوجد مل� بهذا الاسم حاليا.
 الملخص الذي تدخله لن يظهر على ص�حة الوص�.
-لجعل ملخصك يظهر هناك، ستحتاج إلى تعديله يدويا',
-'fileexists-extension'        => 'يوجد مل� باسم مشابه:<br />
-اسم المل� المراد ر�عه: <strong><tt>$1</tt></strong><br />
-اسم المل� الموجود: <strong><tt>$2</tt></strong><br />
-من �ضلك اختر اسما مختل�ا.',
+لجعل ملخصك يظهر هناك، ستحتاج إلى تعديله يدويا",
+'fileexists-extension'        => "يوجد مل� باسم مشابه:<br />
+اسم المل� المراد ر�عه: '''<tt>$1</tt>'''<br />
+اسم المل� الموجود: '''<tt>$2</tt>'''<br />
+من �ضلك اختر اسما مختل�ا.",
 'fileexists-thumb'            => "<center>'''المل� الموجود'''</center>",
-'fileexists-thumbnail-yes'    => 'يبدو أن المل� مصغرا لحجم أعلى <i>(تصغير)</i>. 
-من �ضلك ا�حص المل� <strong><tt>$1</tt></strong>.<br />
-إن كان هو ن�س المل� بالحجم الأصلي �لا داعي لر�ع تصغير إضا�ي.',
-'file-thumbnail-no'           => 'يبدأ المل� ب <strong><tt>$1</tt></strong>. 
-يبدو أن المل� مصغرا لحجم أعلى <i>(تصغير)</i>.
-إذا كانت لديك الصورة �ي درجة دقة كاملة قم بر�عها، أو قم بتغيير اسم المل� من �ضلك.',
-'fileexists-forbidden'        => 'هناك مل� بن�س الاسم حاليا؛
-من �ضلك تراجع وأعطه اسما جديدا. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "يبدو أن المل� مصغرا لحجم أعلى ''(تصغير)''. 
+من �ضلك ا�حص المل� '''<tt>$1</tt>'''.<br />
+إن كان هو ن�س المل� بالحجم الأصلي �لا داعي لر�ع تصغير إضا�ي.",
+'file-thumbnail-no'           => "يبدأ المل� ب '''<tt>$1</tt>'''. 
+يبدو أن المل� مصغرا لحجم أعلى ''(تصغير)''.
+إذا كانت لديك الصورة �ي درجة دقة كاملة قم بر�عها، أو قم بتغيير اسم المل� من �ضلك.",
+'fileexists-forbidden'        => 'هناك مل� موجود بهذا الاسم بال�عل، ولا يمكن إعادة الكتابة عليه.
+لو أنك مازلت تريد ر�ع مل�ك، من �ضلك عد واستخدم اسما جديدا. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'يوجد مل� بن�س الاسم بال�عل �ي مستودع المل�ات المشترك.
 لو كنت مازلت تريد ر�ع مل�ك، من �ضلك ارجع واستخدم اسما جديدا.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'هذا المل� مكرر  {{PLURAL:$1|للمل�|للمل�ات}} التالية:',
+'file-deleted-duplicate'      => 'مل� مطابق لهذه المل� ([[$1]]) تم حذ�ه من قبل. ينبغي أن تتحقق من تاريخ الحذ� لهذا المل� قبل المتابعة بإعادة ر�عه.',
 'successfulupload'            => 'تم ر�ع المل� بنجاح',
 'uploadwarning'               => 'تحذير الر�ع',
 'savefile'                    => 'ح�ظ المل�',
@@ -1520,8 +1674,8 @@ $2',
 
 يجب عليك التيقن من أن الاستمرار بر�ع هذا المل� ملائم.
 سجل الحذ� لهذا المل� معروض هنا:",
-'filename-bad-prefix'         => 'اسم المل� الذي تر�عه يبدأ ب<strong>"$1"</strong>، وهو اسم غير وص�ي عادة يوضع تلقائيا من الكاميرات الرقمية.
-من �ضلك اختر اسما أكثر وص�ا لمل�ك.',
+'filename-bad-prefix'         => "اسم المل� الذي تر�عه يبدأ ب'''\"\$1\"'''، وهو اسم غير وص�ي عادة يوضع تلقائيا من الكاميرات الرقمية.
+من �ضلك اختر اسما أكثر وص�ا لمل�ك.",
 'filename-prefix-blacklist'   => ' #<!-- اترك هذا السطر تماما كما هو --> <pre>
 # الصيغة كالتالي: 
 #   * كل شيء من علامة "#" إلى آخر السطر هو تعليق
@@ -1562,20 +1716,21 @@ PICT # متنوع
 'upload_source_url'  => '  (مسار صحيح، يمكن الوصول إليه)',
 'upload_source_file' => ' (مل� على حاسوبك)',
 
-# Special:ImageList
-'imagelist-summary'     => 'هذه الص�حة الخاصة تعرض كل المل�ات المر�وعة.
+# Special:ListFiles
+'listfiles-summary'     => 'هذه الص�حة الخاصة تعرض كل المل�ات المر�وعة.
 ا�تراضيا آخر المل�ات المر�وعة تعرض أعلى القائمة.
 الضغط على رأس العامود يغير الترتيب.',
-'imagelist_search_for'  => 'ابحث عن اسم الميديا:',
+'listfiles_search_for'  => 'ابحث عن اسم الميديا:',
 'imgfile'               => 'مل�',
-'imagelist'             => 'قائمة المل�ات',
-'imagelist_date'        => 'تاريخ',
-'imagelist_name'        => 'اسم',
-'imagelist_user'        => 'مستخدم',
-'imagelist_size'        => 'حجم',
-'imagelist_description' => 'وص�',
-
-# Image description page
+'listfiles'             => 'قائمة المل�ات',
+'listfiles_date'        => 'تاريخ',
+'listfiles_name'        => 'اسم',
+'listfiles_user'        => 'مستخدم',
+'listfiles_size'        => 'حجم',
+'listfiles_description' => 'وص�',
+'listfiles_count'       => 'نسخ',
+
+# File description page
 'filehist'                       => 'تاريخ المل�',
 'filehist-help'                  => 'اضغط على وقت/زمن لرؤية المل� كما بدا �ي هذا الزمن.',
 'filehist-deleteall'             => 'احذ� الكل',
@@ -1583,19 +1738,26 @@ PICT # متنوع
 'filehist-revert'                => 'استرجع',
 'filehist-current'               => 'حالي',
 'filehist-datetime'              => 'وقت/زمن',
+'filehist-thumb'                 => 'صورة مصغرة',
+'filehist-thumbtext'             => 'تصغير للنسخة بتاريخ $1',
+'filehist-nothumb'               => 'لا تصغير',
 'filehist-user'                  => 'مستخدم',
 'filehist-dimensions'            => 'الأبعاد',
 'filehist-filesize'              => 'حجم المل�',
 'filehist-comment'               => 'تعليق',
-'imagelinks'                     => 'وصلات',
+'imagelinks'                     => 'وصلات المل�',
 'linkstoimage'                   => '{{PLURAL:$1|الص�حة|ال$1 ص�حة}} التالية تصل إلى هذا المل�:',
+'linkstoimage-more'              => 'أكثر من $1 {{PLURAL:$1|ص�حة تصل|ص�حة تصل}} إلى هذا المل�.
+القائمة التالية تعرض {{PLURAL:$1|أول وصلة ص�حة|أول $1 وصلة ص�حة}} إلى هذا المل� �قط.
+[[Special:WhatLinksHere/$2|قائمة كاملة]] متو�رة.',
 'nolinkstoimage'                 => 'لا توجد ص�حات تصل لهذا المل�.',
 'morelinkstoimage'               => 'عرض [[Special:WhatLinksHere/$1|المزيد من الوصلات]] إلى هذا المل�.',
 'redirectstofile'                => '{{PLURAL:$1|المل�|ال$1 مل�}} التالي يحول إلى هذا المل�:',
-'duplicatesoffile'               => '{{PLURAL:$1|المل� التالي مكرر|ال$1 مل� التالي مكررات}} لهذا المل�:',
+'duplicatesoffile'               => '{{PLURAL:$1|المل� التالي مكرر|ال$1 مل� التالي مكررات}} لهذا المل�
+([[Special:FileDuplicateSearch/$2|المزيد من الت�اصيل]]):',
 'sharedupload'                   => 'هذا المل� تم ر�عه للتشارك بين المشاريع ويمكن استخدامه �ي المشاريع الأخرى.',
 'shareduploadwiki'               => 'من �ضلك انظر $1 لمزيد من المعلومات.',
-'shareduploadwiki-desc'          => 'الوص� على $1 �ي المستودع المشترك معروض بالأس�ل.',
+'shareduploadwiki-desc'          => 'الوص� على $1 الخاصة به هناك معروض بالأس�ل.',
 'shareduploadwiki-linktext'      => 'ص�حة وص� المل�',
 'shareduploadduplicate'          => 'هذا المل� تكرار ل$1 من المستودع المشترك.',
 'shareduploadduplicate-linktext' => 'مل� آخر',
@@ -1619,7 +1781,7 @@ PICT # متنوع
 # File deletion
 'filedelete'                  => 'احذ� $1',
 'filedelete-legend'           => 'احذ� المل�',
-'filedelete-intro'            => "أنت تحذ� '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "أنت على وشك حذ� المل� '''[[Media:$1|$1]]''' مع كل تاريخه.",
 'filedelete-intro-old'        => "أنت تحذ� نسخة '''[[Media:$1|$1]]''' بتاريخ [$4 $3، $2].",
 'filedelete-comment'          => 'السبب للحذ�:',
 'filedelete-submit'           => 'حذ�',
@@ -1627,8 +1789,6 @@ PICT # متنوع
 'filedelete-success-old'      => "نسخة '''[[Media:$1|$1]]''' بتاريخ $3، $2 تم حذ�ها.",
 'filedelete-nofile'           => "'''$1''' غير موجود.",
 'filedelete-nofile-old'       => "لا توجد نسخة مؤرش�ة من '''$1''' بالعناصر المحددة.",
-'filedelete-iscurrent'        => 'أنت تحاول حذ� أحدث نسخة من هذا المل�.
-من �ضلك استرجع لنسخة أقدم أولا.',
 'filedelete-otherreason'      => 'سبب إضا�ي/آخر:',
 'filedelete-reason-otherlist' => 'سبب آخر',
 'filedelete-reason-dropdown'  => '*أسباب الحذ� الشائعة
@@ -1658,31 +1818,31 @@ PICT # متنوع
 
 # Random page
 'randompage'         => 'ص�حة عشوائية',
-'randompage-nopages' => 'لا توجد ص�حات �ي هذا النطاق.',
+'randompage-nopages' => 'لا توجد ص�حات �ي النطاق "$1".',
 
 # Random redirect
 'randomredirect'         => 'تحويلة عشوائية',
-'randomredirect-nopages' => 'لا توجد تحويلات �ي هذا النطاق.',
+'randomredirect-nopages' => 'لا توجد تحويلات �ي النطاق "$1".',
 
 # Statistics
-'statistics'             => 'إحصاءات',
-'sitestats'              => 'إحصاءات {{SITENAME}}',
-'userstats'              => 'إحصاءات المستخدم',
-'sitestatstext'          => "توجد {{PLURAL:\$1|'''1''' ص�حة|'''\$1''' ص�حة كلية}} �ي قاعدة البيانات.
-هذا يشمل \"النقاش\" ص�حات، الص�حات حول {{SITENAME}}، الصغرى \"البذور\"
-ص�حات، التحويلات، و غيرها التي غالبا لا تتأهل كص�حات محتوى.
-باستثناء هؤلاء، توجد {{PLURAL:\$2|'''1''' ص�حة| '''\$2''' ص�حة}} تعتبر على الأرجح
-{{PLURAL:\$2|ص�حة|ص�حة}} محتوى معتبرة.
-
-'''\$8''' {{PLURAL:\$8|مل�|مل�}} تم ر�عه.
-
-هناك كإجمالي '''\$3''' {{PLURAL:\$3|عرض ص�حة|عرض ص�حة}}، و '''\$4''' {{PLURAL:\$4|تعديل ص�حة|تعديل ص�حة}}
-منذ تنصيب {{SITENAME}}.
-هذا يعني '''\$5''' تعديل متوسط لكل ص�حة، و '''\$6''' عرض لكل تعديل.
-
-طول [http://www.mediawiki.org/wiki/Manual:Job_queue طابور الشغل] هو '''\$7'''.",
-'userstatstext'          => "يوجد {{PLURAL:$1|[[Special:ListUsers|مستخدم]] مسجل '''واحد'''|'''$1''' [[Special:ListUsers|مستخدم]] مسجل}}، منهم '''$2''' (أو '''$4%''') {{PLURAL:$2|لديه|لديهم}} صلاحيات $5.",
-'statistics-mostpopular' => 'أكثر الص�حات مشاهدة',
+'statistics'                   => 'إحصاءات',
+'statistics-header-pages'      => 'إحصاءات الص�حات',
+'statistics-header-edits'      => 'إحصاءات التعديلات',
+'statistics-header-views'      => 'إحصاءات المشاهدة',
+'statistics-header-users'      => 'إحصاءات المستخدمين',
+'statistics-articles'          => 'ص�حات المحتوى',
+'statistics-pages'             => 'الص�حات',
+'statistics-pages-desc'        => 'كل الص�حات �ي الويكي، بما �ي ذلك ص�حات النقاش، التحويلات، إلى آخره.',
+'statistics-files'             => 'المل�ات المر�وعة',
+'statistics-edits'             => 'تعديلات الص�حات منذ تنصيب {{SITENAME}}',
+'statistics-edits-average'     => 'متوسط التعديلات لكل ص�حة',
+'statistics-views-total'       => 'إجمالي المشاهدات',
+'statistics-views-peredit'     => 'المشاهدات لكل تعديل',
+'statistics-jobqueue'          => 'طول [http://www.mediawiki.org/wiki/Manual:Job_queue طابور الشغل]',
+'statistics-users'             => '[[Special:ListUsers|مستخدمون]] مسجلون',
+'statistics-users-active'      => 'مستخدمون نشطون',
+'statistics-users-active-desc' => 'المستخدمون الذين قاموا ب�عل �ي آخر {{PLURAL:$1|يوم|$1 يوم}}',
+'statistics-mostpopular'       => 'أكثر الص�حات مشاهدة',
 
 'disambiguations'      => 'ص�حات التوضيح',
 'disambiguationspage'  => 'Template:توضيح',
@@ -1697,7 +1857,7 @@ PICT # متنوع
 'double-redirect-fixer'      => 'مصلح التحويل',
 
 'brokenredirects'        => 'تحويلات مكسورة',
-'brokenredirectstext'    => 'التحويلات التالية تصل لص�حات غير موجودة.',
+'brokenredirectstext'    => 'التحويلات التالية تصل لص�حات غير موجودة:',
 'brokenredirects-edit'   => '(عدل)',
 'brokenredirects-delete' => '(حذ�)',
 
@@ -1727,26 +1887,30 @@ PICT # متنوع
 'popularpages'            => 'ص�حات مشهورة',
 'wantedcategories'        => 'تصني�ات مطلوبة',
 'wantedpages'             => 'ص�حات مطلوبة',
-'missingfiles'            => 'مل�ات م�قودة',
+'wantedfiles'             => 'مل�ات مطلوبة',
+'wantedtemplates'         => 'قوالب مطلوبة',
 'mostlinked'              => 'أكثر الص�حات المرتبطة بص�حات أخرى',
 'mostlinkedcategories'    => 'أكثر التصني�ات ارتباطا',
 'mostlinkedtemplates'     => 'أكثر القوالب وصلا',
 'mostcategories'          => 'أكثر الص�حات تصني�ا',
 'mostimages'              => 'أكثر المل�ات ارتباطا',
 'mostrevisions'           => 'أكثر الص�حات تعديلا',
-'prefixindex'             => '�هرس بادئة',
+'prefixindex'             => 'كل الص�حات بالبادئة',
 'shortpages'              => 'ص�حات قصيرة',
 'longpages'               => 'ص�حات طويلة',
 'deadendpages'            => 'ص�حات نهاية مسدودة',
 'deadendpagestext'        => 'الص�حات التالية لا تصل إلى ص�حات أخرى �ي {{SITENAME}}.',
 'protectedpages'          => 'ص�حات محمية',
 'protectedpages-indef'    => 'عمليات الحماية غير المحددة �قط',
+'protectedpages-cascade'  => 'الحماية المضمنة �قط',
 'protectedpagestext'      => 'الص�حات التالية محمية من النقل أو التعديل',
 'protectedpagesempty'     => 'لا توجد ص�حات محمية حاليا بهذه المحددات.',
 'protectedtitles'         => 'عناوين محمية',
 'protectedtitlestext'     => 'العناوين التالية محمية ضد الإنشاء',
 'protectedtitlesempty'    => 'لا توجد عناوين محمية حاليا بهذه المحددات.',
 'listusers'               => 'قائمة الأعضاء',
+'listusers-editsonly'     => 'عرض المستخدمين الذين قاموا بتعديلات �قط',
+'usereditcount'           => '$1 {{PLURAL:$1|تعديل|تعديل}}',
 'newpages'                => 'ص�حات جديدة',
 'newpages-username'       => 'اسم المستخدم:',
 'ancientpages'            => 'أقدم الص�حات',
@@ -1768,14 +1932,13 @@ PICT # متنوع
 'booksources-isbn'          => 'ردمك:',
 'booksources-go'            => 'اذهب',
 'booksources-text'          => 'توجد أدناه قائمة بوصلات لمواقع أخرى تبيع الكتب الجديدة والمستعملة، أيضا يمكنك أن تحصل على معلومات إضا�ية عن الكتب التي تبحث عنها من هناك:',
+'booksources-invalid-isbn'  => 'رقم ISBN المعطى لا يبدو صحيحا؛ تحقق من أخطاء النسخ من المصدر الأصلي.',
 
 # Special:Log
 'specialloguserlabel'  => 'المستخدم:',
 'speciallogtitlelabel' => 'العنوان:',
 'log'                  => 'سجلات',
 'all-logs-page'        => 'كل السجلات',
-'log-search-legend'    => 'ابحث عن سجلات',
-'log-search-submit'    => 'اذهب',
 'alllogstext'          => 'عرض شامل لكل السجلات المتو�رة �ي {{SITENAME}}. 
 باستطاعتك جعل القائمة أكثر تحديدا وذلك باختيار نوع السجل، اسم المستخدم (حساس لحالة الحرو�)، أو الص�حة المتأثرة (أيضا حساس لحالة الحرو�).',
 'logempty'             => 'لا توجد مدخلات مطابقة �ي السجل.',
@@ -1787,6 +1950,7 @@ PICT # متنوع
 'nextpage'          => 'الص�حة التالية ($1)',
 'prevpage'          => 'الص�حة السابقة ($1)',
 'allpagesfrom'      => 'عرض الص�حات بدءا من:',
+'allpagesto'        => 'اعرض الص�حات المنتهية عند:',
 'allarticles'       => 'كل الص�حات',
 'allinnamespace'    => 'كل الص�حات (�ي نطاق $1)',
 'allnotinnamespace' => 'كل الص�حات (ليست �ي نطاق $1)',
@@ -1807,41 +1971,69 @@ PICT # متنوع
 'special-categories-sort-count' => 'رتب بالعدد',
 'special-categories-sort-abc'   => 'رتب هجائيا',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'مساهمات المستخدم المحذو�ة',
+
+# Special:LinkSearch
+'linksearch'       => 'وصلات خارجية',
+'linksearch-pat'   => 'نمط البحث:',
+'linksearch-ns'    => 'النطاق:',
+'linksearch-ok'    => 'بحث',
+'linksearch-text'  => 'الكروت الخاصة مثل "*.wikipedia.org" يمكن استخدامها.<br />
+البروتوكولات المدعومة: <tt>$1</tt>',
+'linksearch-line'  => '$1 موصولة من $2',
+'linksearch-error' => 'الكروت الخاصة يمكن أن تظهر �قط �ي بداية اسم المضي�.',
+
 # Special:ListUsers
 'listusersfrom'      => 'عرض المستخدمين بدءا من:',
 'listusers-submit'   => 'عرض',
 'listusers-noresult' => 'لم يتم إيجاد مستخدم.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'سجل إنشاء المستخدمين',
+'newuserlogpagetext'          => 'هذا سجل بعمليات إنشاء المستخدمين.',
+'newuserlog-byemail'          => 'كلمة السر تم إرسالها بواسطة البريد الإلكتروني',
+'newuserlog-create-entry'     => 'مستخدم جديد',
+'newuserlog-create2-entry'    => 'أنشأ حسابا جديدا $1',
+'newuserlog-autocreate-entry' => 'الحساب تم إنشاؤه تلقائيا',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'صلاحيات مجموعات المستخدمين',
-'listgrouprights-summary'  => 'التالي قائمة بمجموعات المستخدمين المعر�ة �ي هذا الويكي، بصلاحياتهم المصاحبة.
+'listgrouprights'                 => 'صلاحيات مجموعات المستخدمين',
+'listgrouprights-summary'         => 'التالي قائمة بمجموعات المستخدمين المعر�ة �ي هذا الويكي، بصلاحياتهم المصاحبة.
 ربما تكون هناك [[{{MediaWiki:Listgrouprights-helppage}}|معلومات إضا�ية]] حول الصلاحيات المن�ردة.',
-'listgrouprights-group'    => 'المجموعة',
-'listgrouprights-rights'   => 'الصلاحيات',
-'listgrouprights-helppage' => 'Help:صلاحيات المجموعات',
-'listgrouprights-members'  => '(قائمة الأعضاء)',
+'listgrouprights-group'           => 'المجموعة',
+'listgrouprights-rights'          => 'الصلاحيات',
+'listgrouprights-helppage'        => 'Help:صلاحيات المجموعات',
+'listgrouprights-members'         => '(قائمة الأعضاء)',
+'listgrouprights-addgroup'        => 'يمكنه إضا�ة {{PLURAL:$2|المجموعة|المجموعات}}: $1',
+'listgrouprights-removegroup'     => 'يمكنه إزالة {{PLURAL:$2|المجموعة|المجموعات}}: $1',
+'listgrouprights-addgroup-all'    => 'يمكنه إضا�ة كل المجموعات',
+'listgrouprights-removegroup-all' => 'يمكنه إزالة كل المجموعات',
 
 # E-mail user
-'mailnologin'     => 'لا يوجد عنوان للإرسال',
-'mailnologintext' => 'يجب أن تقوم [[Special:UserLogin|بتسجيل الدخول]] وإدخال بريد إلكتروني صالح �ي ص�حة [[Special:Preferences|الت�ضيلات]] لتتمكن من إرسال الرسائل لمستخدمين آخرين.',
-'emailuser'       => 'إرسال رسالة لهذا المستخدم',
-'emailpage'       => 'إرسال رسالة للمستخدم',
-'emailpagetext'   => 'يمكنك استخدام الاستمارة بالأس�ل لإرسال رسالة بريد إلكتروني إلى هذا المستخدم.
+'mailnologin'      => 'لا يوجد عنوان للإرسال',
+'mailnologintext'  => 'يجب أن تقوم [[Special:UserLogin|بتسجيل الدخول]] وإدخال بريد إلكتروني صالح �ي ص�حة [[Special:Preferences|الت�ضيلات]] لتتمكن من إرسال الرسائل لمستخدمين آخرين.',
+'emailuser'        => 'إرسال رسالة لهذا المستخدم',
+'emailpage'        => 'إرسال رسالة للمستخدم',
+'emailpagetext'    => 'يمكنك استخدام الاستمارة بالأس�ل لإرسال رسالة بريد إلكتروني إلى هذا المستخدم.
 عنوان البريد الإلكتروني الذي قمت أنت بإدخاله �ي [[Special:Preferences|ت�ضيلاتك]]، سيظهر كعنوان المرسل �ي البريد الإلكتروني، حتى يصبح المتلقي قادرا على الرد عليك مباشرة.',
-'usermailererror' => 'جسم البريد أرجع خطأ:',
-'defemailsubject' => 'رسالة من {{SITENAME}}',
-'noemailtitle'    => 'لا يوجد عنوان بريد إلكتروني',
-'noemailtext'     => 'لم يحدد هذا المستخدم عنوان بريد إلكتروني صحيح، أو طلب عدم استلام الرسائل من المستخدمين الآخرين.',
-'emailfrom'       => 'من:',
-'emailto'         => 'إلى:',
-'emailsubject'    => 'الموضوع:',
-'emailmessage'    => 'الرسالة:',
-'emailsend'       => 'إرسال',
-'emailccme'       => 'أرسل لي بنسخة من رسالتي.',
-'emailccsubject'  => 'نسخة من رسالتك إلى $1: $2',
-'emailsent'       => 'تم إرسال البريد الإلكتروني',
-'emailsenttext'   => 'تم إرسال رسالتك الإلكترونية.',
-'emailuserfooter' => 'هذا البريد الإلكتروني تم إرساله بواسطة $1 إلى $2 بواسطة وظي�ة "مراسلة المستخدم" �ي {{SITENAME}}.',
+'usermailererror'  => 'جسم البريد أرجع خطأ:',
+'defemailsubject'  => 'رسالة من {{SITENAME}}',
+'noemailtitle'     => 'لا يوجد عنوان بريد إلكتروني',
+'noemailtext'      => 'لم يحدد هذا المستخدم عنوان بريد إلكتروني صحيح.',
+'nowikiemailtitle' => 'لا بريد إلكتروني مسموح به',
+'nowikiemailtext'  => 'هذا المستخدم اختار ألا يستقبل البريد الإلكتروني من المستخدمين الآخرين.',
+'email-legend'     => 'إرسال بريد إلكتروني إلى مستخدم {{SITENAME}} آخر',
+'emailfrom'        => 'من:',
+'emailto'          => 'إلى:',
+'emailsubject'     => 'الموضوع:',
+'emailmessage'     => 'الرسالة:',
+'emailsend'        => 'إرسال',
+'emailccme'        => 'أرسل لي بنسخة من رسالتي.',
+'emailccsubject'   => 'نسخة من رسالتك إلى $1: $2',
+'emailsent'        => 'تم إرسال البريد الإلكتروني',
+'emailsenttext'    => 'تم إرسال رسالتك الإلكترونية.',
+'emailuserfooter'  => 'هذا البريد الإلكتروني تم إرساله بواسطة $1 إلى $2 بواسطة وظي�ة "مراسلة المستخدم" �ي {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'قائمة مراقبتي',
@@ -1872,12 +2064,7 @@ PICT # متنوع
 'iteminvalidname'      => "مشكلة �ي المدخل '$1'، اسم غير صحيح...",
 'wlnote'               => "بالأس�ل {{PLURAL:$1|آخر تغيير|آخر '''$1''' تغيير}} �ي آخر {{PLURAL:$2|ساعة|'''$2''' ساعة}}.",
 'wlshowlast'           => 'عرض آخر $1 ساعات $2 أيام $3',
-'watchlist-show-bots'  => 'عرض تعديلات البوتات',
-'watchlist-hide-bots'  => 'إخ�اء تعديلات البوت',
-'watchlist-show-own'   => 'عرض تعديلاتي',
-'watchlist-hide-own'   => 'إخ�اء تعديلاتي',
-'watchlist-show-minor' => 'عرض التعديلات الط�ي�ة',
-'watchlist-hide-minor' => 'إخ�اء التعديلات الط�ي�ة',
+'watchlist-options'    => 'خيارات قائمة المراقبة',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'مراقبة...',
@@ -1916,87 +2103,106 @@ $NEWPAGE
 للاقتراحات والحصول على مساعدة إضا�ية:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'حذ� الص�حة',
-'confirm'                     => 'تأكيد',
-'excontent'                   => "المحتوى كان: '$1'",
-'excontentauthor'             => "المحتوى كان: '$1' (والمساهم الوحيد كان '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "المحتوى قبل الإ�راغ كان: '$1'",
-'exblank'                     => 'الص�حة كانت �ارغة',
-'delete-confirm'              => 'حذ� "$1"',
-'delete-legend'               => 'حذ�',
-'historywarning'              => 'تحذير: الص�حة التي توشك على حذ�ها لديها تاريخ:',
-'confirmdeletetext'           => 'أنت على وشك أن تقوم بحذ� ص�حة بالإضا�ة إلى كل تاريخها.
+# Delete
+'deletepage'             => 'حذ� الص�حة',
+'confirm'                => 'تأكيد',
+'excontent'              => "المحتوى كان: '$1'",
+'excontentauthor'        => "المحتوى كان: '$1' (والمساهم الوحيد كان '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "المحتوى قبل الإ�راغ كان: '$1'",
+'exblank'                => 'الص�حة كانت �ارغة',
+'delete-confirm'         => 'حذ� "$1"',
+'delete-legend'          => 'حذ�',
+'historywarning'         => 'تحذير: الص�حة التي توشك على حذ�ها لديها تاريخ:',
+'confirmdeletetext'      => 'أنت على وشك أن تقوم بحذ� ص�حة بالإضا�ة إلى كل تاريخها.
 من �ضلك التأكد من عزمك على الحذ�، وبأنك مدرك للعواقب، وبأنك تقوم بهذا بالتوا�ق مع [[{{MediaWiki:Policy-url}}|السياسة]].',
-'actioncomplete'              => 'انتهاء العملية',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" تم حذ�ها.
+'actioncomplete'         => 'انتهاء العملية',
+'deletedtext'            => '"<nowiki>$1</nowiki>" تم حذ�ها.
 انظر �ي $2 لسجل آخر عمليات الحذ�.',
-'deletedarticle'              => 'حذ� "[[$1]]"',
-'suppressedarticle'           => 'أخ�ى "[[$1]]"',
-'dellogpage'                  => 'سجل الحذ�',
-'dellogpagetext'              => 'بالأس�ل قائمة بأحدث عمليات الحذ�.',
-'deletionlog'                 => 'سجل الحذ�',
-'reverted'                    => 'استرجع لنسخة أقدم',
-'deletecomment'               => 'سبب الحذ�:',
-'deleteotherreason'           => 'سبب آخر/إضا�ي:',
-'deletereasonotherlist'       => 'سبب آخر',
-'deletereason-dropdown'       => '*أسباب الحذ� الشائعة
+'deletedarticle'         => 'حذ� "[[$1]]"',
+'suppressedarticle'      => 'أخ�ى "[[$1]]"',
+'dellogpage'             => 'سجل الحذ�',
+'dellogpagetext'         => 'بالأس�ل قائمة بأحدث عمليات الحذ�.',
+'deletionlog'            => 'سجل الحذ�',
+'reverted'               => 'استرجع لنسخة أقدم',
+'deletecomment'          => 'سبب الحذ�:',
+'deleteotherreason'      => 'سبب آخر/إضا�ي:',
+'deletereasonotherlist'  => 'سبب آخر',
+'deletereason-dropdown'  => '*أسباب الحذ� الشائعة
 ** طلب المؤل�
 ** خرق لحقوق التألي� والنشر
 ** تخريب',
-'delete-edit-reasonlist'      => 'عدل أسباب الحذ�',
-'delete-toobig'               => 'هذه الص�حة لها تاريخ تعديل كبير، أكثر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
+'delete-edit-reasonlist' => 'عدل أسباب الحذ�',
+'delete-toobig'          => 'هذه الص�حة لها تاريخ تعديل كبير، أكثر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
 حذ� مثل هذه الص�حات تم تحديده لمنع الاضطراب العرضي �ي {{SITENAME}}.',
-'delete-warning-toobig'       => 'هذه الص�حة لها تاريخ تعديل كبير، أكثر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
+'delete-warning-toobig'  => 'هذه الص�حة لها تاريخ تعديل كبير، أكثر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
 حذ�ها ربما يؤدي إلى اضطراب عمليات قاعدة البيانات �ي {{SITENAME}}؛
 استمر مع الحذر.',
-'rollback'                    => 'استرجاع التعديلات',
-'rollback_short'              => 'استرجاع',
-'rollbacklink'                => 'استرجاع',
-'rollbackfailed'              => 'لم ينجح الاسترجاع',
-'cantrollback'                => 'لم يمكن استرجاع التعديل؛
+
+# Rollback
+'rollback'         => 'استرجاع التعديلات',
+'rollback_short'   => 'استرجاع',
+'rollbacklink'     => 'استرجاع',
+'rollbackfailed'   => 'لم ينجح الاسترجاع',
+'cantrollback'     => 'لم يمكن استرجاع التعديل؛
 آخر مساهم هو المؤل� الوحيد لهذه الص�حة.',
-'alreadyrolled'               => 'لم يمكن استرجاع آخر تعديل ل[[$1]] بواسطة [[User:$2|$2]] ([[User talk:$2|نقاش]] | [[Special:Contributions/$2|{{int:contribslink}}]])؛
+'alreadyrolled'    => 'لم يمكن استرجاع آخر تعديل ل[[$1]] بواسطة [[User:$2|$2]] ([[User talk:$2|نقاش]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]])؛
 شخص آخر عدل أو استرجع الص�حة بال�عل.
 
-آخر تعديل كان بواسطة [[User:$3|$3]] ([[User talk:$3|نقاش]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'تعليق التعديل كان: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'استرجع التعديلات بواسطة [[Special:Contributions/$2|$2]] ([[User talk:$2|نقاش]]) حتى آخر نسخة بواسطة [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'استرجع تعديلات $1؛
+آخر تعديل كان بواسطة [[User:$3|$3]] ([[User talk:$3|نقاش]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "ملخص التعديل كان: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'استرجع التعديلات بواسطة [[Special:Contributions/$2|$2]] ([[User talk:$2|نقاش]]) حتى آخر نسخة بواسطة [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'استرجع تعديلات $1؛
 استرجع حتى آخر نسخة بواسطة $2.',
-'sessionfailure'              => 'يبدو أنه هناك مشكلة �ي هذه جلسة الدخول الخاصة بك؛
+'sessionfailure'   => 'يبدو أنه هناك مشكلة �ي هذه جلسة الدخول الخاصة بك؛
 لذلك �قد ألغيت هذه العملية كإجراء احترازي ضد الاختراق.
 من �ضلك اضغط على م�تاح "رجوع" لتحميل الص�حة التي جئت منها، ثم حاول مرة أخرى.',
+
+# Protect
 'protectlogpage'              => 'سجل الحماية',
 'protectlogtext'              => 'بالأس�ل قائمة بالص�حات التي تمت حمايتها أو إزالة الحماية عنها.
 انظر [[Special:ProtectedPages|قائمة الص�حات المحمية]] لقائمة بعمليات حماية الص�حات الم�علة حاليا.',
 'protectedarticle'            => 'حمى "[[$1]]"',
 'modifiedarticleprotection'   => 'غير مستوى الحماية ل"[[$1]]"',
 'unprotectedarticle'          => 'أزال حماية [[$1]]',
+'movedarticleprotection'      => 'نقل إعدادات الحماية من "[[$2]]" إلى "[[$1]]"',
 'protect-title'               => 'ضبط مستوى الحماية ل"$1"',
+'prot_1movedto2'              => '[[$1]] تم نقلها إلى [[$2]]',
 'protect-legend'              => 'تأكيد الحماية',
 'protectcomment'              => 'تعليق:',
 'protectexpiry'               => 'تنتهي �ي:',
 'protect_expiry_invalid'      => 'وقت الانتهاء غير صحيح.',
 'protect_expiry_old'          => 'وقت انتهاء المنع يقع �ي الماضي.',
 'protect-unchain'             => '�صل سماح النقل',
-'protect-text'                => 'يمكنك هنا أن تعرض وتغير مستوى الحماية للص�حة <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'لا يمكنك تغيير مستويات الحماية وأنت ممنوع.
-الإعدادات الحالية للص�حة <strong>$1</strong> هي:',
-'protect-locked-dblock'       => 'لا يمكن تغيير مستويات الحماية بسبب غلق قاعدة البيانات حاليا.
-الإعدادات الحالية للص�حة <strong>$1</strong> هي:',
-'protect-locked-access'       => 'لا يملك حسابك هذا صلاحية تغيير مستوى حماية الص�حة.
-الإعدادات الحالية للص�حة <strong>$1</strong> هي:',
+'protect-text'                => "يمكنك هنا أن تعرض وتغير مستوى الحماية للص�حة '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "لا يمكنك تغيير مستويات الحماية وأنت ممنوع.
+الإعدادات الحالية للص�حة '''$1''' هي:",
+'protect-locked-dblock'       => "لا يمكن تغيير مستويات الحماية بسبب غلق قاعدة البيانات حاليا.
+الإعدادات الحالية للص�حة '''$1''' هي:",
+'protect-locked-access'       => "لا يملك حسابك هذا صلاحية تغيير مستوى حماية الص�حة.
+الإعدادات الحالية للص�حة '''$1''' هي:",
 'protect-cascadeon'           => 'هذه الص�حة محمية لكونها مضمنة �ي {{PLURAL:$1|الص�حة|الص�حات}} التالية، والتي بها خيار حماية الص�حات المدمجة �عال.
 يمكنك تغيير مستوى حماية هذه الص�حة بدون التأثير على حماية الص�حات المدمجة الأخرى.',
-'protect-default'             => '(ا�تراضي)',
+'protect-default'             => 'السماح لكل المستخدمين',
 'protect-fallback'            => 'يتطلب السماح "$1"',
-'protect-level-autoconfirmed' => 'منع المستخدمين غير المسجلين',
+'protect-level-autoconfirmed' => 'منع المستخدمين الجدد وغير المسجلين',
 'protect-level-sysop'         => 'مدراء النظام �قط',
 'protect-summary-cascade'     => 'مضمنة',
 'protect-expiring'            => 'تنتهي �ي $1 (UTC)',
+'protect-expiry-indefinite'   => 'غير محدد',
 'protect-cascade'             => 'احم الص�حات المضمنة �ي هذه الص�حة (حماية مضمنة)',
 'protect-cantedit'            => 'لا يمكنك تغيير مستويات الحماية لهذه الص�حة، لأنك لا تمتلك الصلاحية لتعديلها.',
+'protect-othertime'           => 'وقت آخر:',
+'protect-othertime-op'        => 'وقت آخر',
+'protect-existing-expiry'     => 'تاريخ الانتهاء الموجود: $3، $2',
+'protect-otherreason'         => 'سبب آخر/إضا�ي:',
+'protect-otherreason-op'      => 'سبب آخر/إضا�ي',
+'protect-dropdown'            => '*أسباب الحماية الشائعة
+** تخريب شديد
+** سبام شديد
+** حرب تحرير معرقلة للعمل المنتج
+** ص�حة زوارها كثيرون',
+'protect-edit-reasonlist'     => 'عدل أسباب الحماية',
+'protect-expiry-options'      => '1 ساعة:1 hour,1 يوم:1 day,1 أسبوع:1 week,2 أسبوع:2 weeks,1 شهر:1 month,3 شهر:3 months,6 شهر:6 months,1 سنة:1 year,لا نهائي:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'سماح:',
 'restriction-level'           => 'مستوى الضوابط:',
 'minimum-size'                => 'الحجم الأدنى',
@@ -2019,8 +2225,8 @@ $NEWPAGE
 'undeletepage'                 => 'عرض واسترجاع الص�حات المحذو�ة',
 'undeletepagetitle'            => "'''التالي يتكون من المراجعات المحذو�ة من [[:$1]]'''.",
 'viewdeletedpage'              => 'عرض الص�حات المحذو�ة',
-'undeletepagetext'             => 'تم حذ� الص�حات التالية ولكنها مازالت �ي الأرشي� ويمكن استرجاعها.
-يمكن تنظي� الأرشي� بشكل دوري.',
+'undeletepagetext'             => 'تم حذ� {{PLURAL:$1|الص�حة|الص�حات $1}}  التالية ولكنها مازالت �ي الأرشي� ويمكن استرجاعها.
+قد ينظ� الأرشي� دوريا.',
 'undelete-fieldset-title'      => 'استرجاع المراجعات',
 'undeleteextrahelp'            => "لاسترجاع تاريخ الص�حة كاملا، اترك جميع الصناديق �ارغة واضغط '''''استرجاع'''''.
 للاسترجاع بشكل انتقائي، ضع علامة �ي الصناديق أمام المراجعات التي تريد استرجاعها، واضغط '''''استرجاع'''''.
@@ -2033,16 +2239,17 @@ $NEWPAGE
 'undeletehistorynoadmin'       => 'هذه الص�حة تم حذ�ها.
 السبب للحذ� معروض �ي الملخص بالأس�ل، إلى جانب ت�اصيل المستخدمين الذين قاموا بالتعديل على هذه الص�حة قبل حذ�ها.
 نص المراجعات المحذو�ة هذه متو�ر �قط للإداريين.',
-'undelete-revision'            => 'المراجعة المحذو�ة ل$1 (بتاريخ $2) بواسطة $3:',
+'undelete-revision'            => 'المراجعة المحذو�ة ل$1 (بتاريخ $4، الساعة $5) بواسطة $3:',
 'undeleterevision-missing'     => 'مراجعة غير صحيحة أو م�قودة.
 ربما لديك وصلة سيئة، أو ربما المراجعة تم استرجاعها أو إزالتها من الأرشي�.',
 'undelete-nodiff'              => 'لم يتم العثور على مراجعة سابقة.',
 'undeletebtn'                  => 'استرجاع',
-'undeletelink'                 => 'استرجاع',
+'undeletelink'                 => 'استعادة',
 'undeletereset'                => 'إلغاء',
+'undeleteinvert'               => 'اعكس الاختيار',
 'undeletecomment'              => 'تعليق:',
 'undeletedarticle'             => 'استرجع "[[$1]]"',
-'undeletedrevisions'           => 'تم استرجاع {{PLURAL:$1|تعديل واحد|تعديلان|$1 تعديلات|$1 تعديل|$1 تعديلا}}',
+'undeletedrevisions'           => 'تم استرجاع {{PLURAL:$1|تعديل واحد|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديلا}}',
 'undeletedrevisions-files'     => '{{PLURAL:$1|1 مراجعة|$1 مراجعة}} و {{PLURAL:$2|1 مل�|$2 مل�}} تم استرجاعها',
 'undeletedfiles'               => '{{PLURAL:$1|مل�|مل�ات}} $1 تم استرجاع',
 'cannotundelete'               => '�شل الاسترجاع؛
@@ -2073,26 +2280,27 @@ $1',
 'blanknamespace' => '(رئيسي)',
 
 # Contributions
-'contributions' => 'مساهمات المستخدم',
-'mycontris'     => 'مساهماتي',
-'contribsub2'   => 'Ù„$1 ($2)',
-'nocontribs'    => 'لم يتم العثور على تغييرات تطابق هذه المحددات.',
-'uctop'         => '(أعلى)',
-'month'         => 'من شهر (وأقدم):',
-'year'          => 'من سنة (وأقدم):',
-
-'sp-contributions-newbies'     => 'عرض مساهمات الحسابات الجديدة �قط',
-'sp-contributions-newbies-sub' => 'للحسابات الجديدة',
-'sp-contributions-blocklog'    => 'سجل المنع',
-'sp-contributions-search'      => 'بحث عن مساهمات',
-'sp-contributions-username'    => 'عنوان أيبي أو اسم مستخدم:',
-'sp-contributions-submit'      => 'بحث',
+'contributions'       => 'مساهمات المستخدم',
+'contributions-title' => 'مساهمات المستخدم ل$1',
+'mycontris'           => 'مساهماتي',
+'contribsub2'         => 'Ù„$1 ($2)',
+'nocontribs'          => 'لم يتم العثور على تغييرات تطابق هذه المحددات.',
+'uctop'               => '(أعلى)',
+'month'               => 'من شهر (وأقدم):',
+'year'                => 'من سنة (وأقدم):',
+
+'sp-contributions-newbies'       => 'عرض مساهمات الحسابات الجديدة �قط',
+'sp-contributions-newbies-sub'   => 'للحسابات الجديدة',
+'sp-contributions-newbies-title' => 'مساهمات المستخدم للحسابات الجديدة',
+'sp-contributions-blocklog'      => 'سجل المنع',
+'sp-contributions-search'        => 'بحث عن مساهمات',
+'sp-contributions-username'      => 'عنوان أيبي أو اسم مستخدم:',
+'sp-contributions-submit'        => 'بحث',
 
 # What links here
 'whatlinkshere'            => 'ماذا يصل هنا',
 'whatlinkshere-title'      => 'الص�حات التي تصل إلى "$1"',
 'whatlinkshere-page'       => 'الص�حة:',
-'linklistsub'              => '(قائمة الوصلات)',
 'linkshere'                => "الص�حات التالية تصل إلى '''[[:$1]]''':",
 'nolinkshere'              => "لا توجد ص�حات تصل إلى '''[[:$1]]'''.",
 'nolinkshere-ns'           => "لا تصل أي ص�حة إلى '''[[:$1]]''' �ي النطاق المختار.",
@@ -2139,6 +2347,8 @@ $1',
 'ipbotherreason'                  => 'سبب إضا�ي/آخر:',
 'ipbhidename'                     => 'أخ� اسم المستخدم من سجل المنع، قائمة المنع النشطة وقائمة المستخدمين',
 'ipbwatchuser'                    => 'راقب ص�حتي المستخدم والنقاش لهذا المستخدم',
+'ipballowusertalk'                => 'السماح لهذا المستخدم بتعديل ص�حة نقاشه الخاصة أثناء المنع',
+'ipb-change-block'                => 'أعد منع المستخدم بهذه الإعدادات',
 'badipaddress'                    => 'عنوان أيبي غير صحيح',
 'blockipsuccesssub'               => 'تم المنع بنجاح',
 'blockipsuccesstext'              => 'تم منع [[Special:Contributions/$1|$1]].<br />
@@ -2148,14 +2358,18 @@ $1',
 'ipb-unblock'                     => 'ر�ع المنع عن مستخدم أو عنوان أيبي',
 'ipb-blocklist-addr'              => 'عمليات المنع الموجودة ل$1',
 'ipb-blocklist'                   => 'عرض حالات المنع الحالية',
+'ipb-blocklist-contribs'          => 'المساهمات ل$1',
 'unblockip'                       => 'ر�ع منع مستخدم',
 'unblockiptext'                   => 'استخدم الاستمارة أدناه لاسترجاع صلاحية الكتابة الخاصة بعنوان أيبي أو مستخدم تم سحبها منه مسبقا.',
-'ipusubmit'                       => 'ر�ع منع هذا العنوان',
+'ipusubmit'                       => 'إزالة هذا المنع',
 'unblocked'                       => '[[User:$1|$1]] تم ر�ع منعه',
 'unblocked-id'                    => 'منع $1 تم ر�عه',
 'ipblocklist'                     => 'عناوين الأيبي وأسماء المستخدمين الممنوعة',
 'ipblocklist-legend'              => 'إيجاد مستخدم ممنوع',
 'ipblocklist-username'            => 'اسم المستخدم أو عنوان الأيبي:',
+'ipblocklist-sh-userblocks'       => '$1 عمليات منع الحسابات',
+'ipblocklist-sh-tempblocks'       => '$1 عمليات المنع المؤقتة',
+'ipblocklist-sh-addressblocks'    => '$1 عمليات منع الأيبي الم�ردة',
 'ipblocklist-submit'              => 'بحث',
 'blocklistline'                   => '$1, $2 منع $3 ($4)',
 'infiniteblock'                   => 'لا نهائي',
@@ -2164,15 +2378,19 @@ $1',
 'noautoblockblock'                => 'المنع التلقائي معطل',
 'createaccountblock'              => 'إنشاء الحسابات ممنوع.',
 'emailblock'                      => 'البريد الإلكتروني ممنوع',
+'blocklist-nousertalk'            => 'لا يمكنه تعديل ص�حة نقاشه الخاصة',
 'ipblocklist-empty'               => 'قائمة المنع �ارغة.',
 'ipblocklist-no-results'          => 'عنوان الأيبي أو اسم المستخدم المطلوب غير ممنوع.',
 'blocklink'                       => 'منع',
 'unblocklink'                     => 'ر�ع المنع',
+'change-blocklink'                => 'تغيير المنع',
 'contribslink'                    => 'مساهمات',
 'autoblocker'                     => 'تم منعك تلقائيا لأن الأيبي الخاص بك تم استخدامه مؤخرا بواسطة "[[User:$1|$1]]". 
 السبب المعطى لمنع $1 هو: "$2"',
 'blocklogpage'                    => 'سجل المنع',
+'blocklog-fulllog'                => 'سجل المنع الكامل',
 'blocklogentry'                   => 'منع "[[$1]]" ل�ترة زمنية مدتها $2 $3',
+'reblock-logentry'                => 'غير إعدادات المنع ل[[$1]] بتاريخ انتهاء $2 $3',
 'blocklogtext'                    => 'هذا سجل بعمليات المنع ور�ع المنع.
 عناوين الأيبي الممنوعة تلقائيا ليست معروضة.
 انظر [[Special:IPBlockList|عناوين الأيبي الممنوعة]] لرؤية عمليات المنع الم�علة حاليا.',
@@ -2181,11 +2399,14 @@ $1',
 'block-log-flags-nocreate'        => 'إنشاء الحسابات ممنوع',
 'block-log-flags-noautoblock'     => 'المنع التلقائي معطل',
 'block-log-flags-noemail'         => 'البريد الإلكتروني ممنوع',
+'block-log-flags-nousertalk'      => 'لا يمكن تعديل ص�حة النقاش الخاصة',
 'block-log-flags-angry-autoblock' => 'المنع التلقائي المتقدم م�عل',
 'range_block_disabled'            => 'إمكانية مدير النظام لمنع نطاق معطلة.',
 'ipb_expiry_invalid'              => 'تاريخ الانتهاء غير صحيح.',
 'ipb_expiry_temp'                 => 'عمليات منع أسماء المستخدمين المخ�ية يجب أن تكون دائمة.',
 'ipb_already_blocked'             => '"$1" ممنوع بال�عل',
+'ipb-needreblock'                 => '== ممنوع بال�عل ==
+$1 ممنوع بال�عل. هل تريد تغيير الإعدادات؟',
 'ipb_cant_unblock'                => 'خطأ: لم يتم إيجاد الممنوع $1.
 ربما تم ر�ع منعه بال�عل.',
 'ipb_blocked_as_range'            => 'خطأ: الأيبي $1 ليس ممنوعا مباشرة ولا يمكن ر�ع المنع عنه.
@@ -2201,6 +2422,7 @@ $1',
 'sorbsreason'                     => 'عنوان الأيبي الخاص بك موجود كبروكسي م�توح �ي DNSBL المستخدم بواسطة {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'عنوان الأيبي الخاص بك موجود كبروكسي م�توح �ي DNSBL المستخدم بواسطة {{SITENAME}}. 
 لا يمكنك إنشاء حساب.',
+'cant-block-while-blocked'        => 'أنت لا يمكنك منع المستخدمين الآخرين بينما أنت ممنوع.',
 
 # Developer tools
 'lockdb'              => 'ق�ل قاعدة البيانات',
@@ -2224,9 +2446,9 @@ $1',
 'databasenotlocked'   => 'قاعدة البيانات ليست مغلقة.',
 
 # Move page
-'move-page'               => 'نقل $1',
-'move-page-legend'        => 'نقل ص�حة',
-'movepagetext'            => "باستخدام  الاستمارة بالأس�ل بإمكانك أن تغير اسم الص�حة، وأن تنقل تاريخها للاسم الجديد.
+'move-page'                    => 'نقل $1',
+'move-page-legend'             => 'نقل ص�حة',
+'movepagetext'                 => "باستخدام  الاستمارة بالأس�ل بإمكانك أن تغير اسم الص�حة، وأن تنقل تاريخها للاسم الجديد.
 العنوان القديم سيصبح تحويلة للعنوان الجديد.
 يمكنك تحديث التحويلات التي تشير إلى العنوان الأصلي تلقائيا.
 لو اخترت ألا ت�عل، تأكد من عدم وجود تحويلات [[Special:DoubleRedirects|مزدوجة]] أو [[Special:BrokenRedirects|مكسورة]].
@@ -2238,51 +2460,63 @@ $1',
 '''تحذير!'''
 هذا قد يكون تغييرا كارثيا وغير متوقع لص�حة مشهورة؛
 من �ضلك تأكد من �هم عواقب هذا قبل المتابعة.",
-'movepagetalktext'        => "ص�حة النقاش المر�قة سيتم نقلها كذلك، '''إلا �ي حالة''':
+'movepagetalktext'             => "ص�حة النقاش المر�قة سيتم نقلها كذلك، '''إلا �ي حالة''':
 * توجد ص�حة نقاش غير �ارغة تحت العنوان الجديد، أو
 * قمت بإزالة اختيار الصندوق بالأس�ل.
 
 و�ي هذه الحالات، يجب عليك نقل أو دمج محتويات الص�حة يدويا، إذا رغب �ي ذلك.",
-'movearticle'             => 'انقل الص�حة:',
-'movenotallowed'          => 'أنت لا تمتلك الصلاحية لنقل الص�حات.',
-'newtitle'                => 'إلى العنوان الجديد:',
-'move-watch'              => 'راقب هذه الص�حة',
-'movepagebtn'             => 'نقل الص�حة',
-'pagemovedsub'            => 'تم النقل بنجاح',
-'movepage-moved'          => '<big>\'\'\'"$1" نقلت إلى "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'توجد ص�حة بهذا الاسم، أو أن الاسم الذي تم اختياره غير صالح.
+'movearticle'                  => 'انقل الص�حة:',
+'movenologin'                  => 'غير مسجل',
+'movenologintext'              => 'يجب أن تكون مستخدما مسجلا وأن تقوم [[Special:UserLogin|بالدخول]] لكي تنقل ص�حة.',
+'movenotallowed'               => 'أنت لا تمتلك الصلاحية لنقل الص�حات.',
+'movenotallowedfile'           => 'أنت لا تمتلك الصلاحية لنقل المل�ات.',
+'cant-move-user-page'          => 'أنت لا تمتلك الصلاحية لنقل ص�حات المستخدم الرئيسية.',
+'cant-move-to-user-page'       => 'أنت لا تمتلك الصلاحية لنقل ص�حة إلى ص�حة مستخدم (ماعدا إلى ص�حة مستخدم �رعية).',
+'newtitle'                     => 'إلى العنوان الجديد:',
+'move-watch'                   => 'راقب هذه الص�حة',
+'movepagebtn'                  => 'نقل الص�حة',
+'pagemovedsub'                 => 'تم النقل بنجاح',
+'movepage-moved'               => '<big>\'\'\'"$1" تم نقلها إلى "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'تم إنشاء تحويلة.',
+'movepage-moved-noredirect'    => 'إنشاء التحويلة تم التغاضي عنه.',
+'articleexists'                => 'توجد ص�حة بهذا الاسم، أو أن الاسم الذي تم اختياره غير صالح.
 من �ضلك اختر اسم آخر.',
-'cantmove-titleprotected' => 'لا يمكنك نقل ص�حة إلى هذا الموقع، لأن العنوان الجديد تمت حمايته ضد الإنشاء',
-'talkexists'              => "'''الص�حة ن�سها تم نقلها بنجاح، ولكن ص�حة النقاش لم يمكن نقلها لوجود ص�حة مسبقا تحت العنوان الجديد.
+'cantmove-titleprotected'      => 'لا يمكنك نقل ص�حة إلى هذا الموقع، لأن العنوان الجديد تمت حمايته ضد الإنشاء',
+'talkexists'                   => "'''الص�حة ن�سها تم نقلها بنجاح، ولكن ص�حة النقاش لم يمكن نقلها لوجود ص�حة مسبقا تحت العنوان الجديد.
 من �ضلك ادمجهما يدويا.'''",
-'movedto'                 => 'تم نقلها إلى',
-'movetalk'                => 'انقل ص�حة النقاش المر�قة',
-'move-subpages'           => 'انقل كل الص�حات ال�رعية، إذا كان هذا ممكنا',
-'move-talk-subpages'      => 'انقل كل الص�حات ال�رعية لص�حة النقاش، إذا كان هذا ممكنا',
-'movepage-page-exists'    => 'الص�حة $1 موجودة بال�عل ولا يمكن الكتابة عليها تلقائيا.',
-'movepage-page-moved'     => 'تم نقل الص�حة $1 إلى $2.',
-'movepage-page-unmoved'   => 'لم يمكن نقل الص�حة $1 إلى $2.',
-'movepage-max-pages'      => 'الحد الأقصى $1 {{PLURAL:$1|ص�حة|ص�حة}} تم نقله ولن يتم نقل المزيد تلقائيا.',
-'1movedto2'               => '[[$1]] تم نقلها إلى [[$2]]',
-'1movedto2_redir'         => '[[$1]] تم نقلها إلى [[$2]] �وق التحويلة',
-'movelogpage'             => 'سجل النقل',
-'movelogpagetext'         => 'بالأس�ل قائمة بالص�حات التي تم نقلها.',
-'movereason'              => 'السبب:',
-'revertmove'              => 'استرجاع',
-'delete_and_move'         => 'حذ� ونقل',
-'delete_and_move_text'    => '==الحذ� مطلوب==
+'movedto'                      => 'تم نقلها إلى',
+'movetalk'                     => 'انقل ص�حة النقاش المر�قة',
+'move-subpages'                => 'انقل كل الص�حات ال�رعية، إذا كان هذا ممكنا',
+'move-talk-subpages'           => 'انقل كل الص�حات ال�رعية لص�حة النقاش، إذا كان هذا ممكنا',
+'movepage-page-exists'         => 'الص�حة $1 موجودة بال�عل ولا يمكن الكتابة عليها تلقائيا.',
+'movepage-page-moved'          => 'تم نقل الص�حة $1 إلى $2.',
+'movepage-page-unmoved'        => 'لم يمكن نقل الص�حة $1 إلى $2.',
+'movepage-max-pages'           => 'الحد الأقصى $1 {{PLURAL:$1|ص�حة|ص�حة}} تم نقله ولن يتم نقل المزيد تلقائيا.',
+'1movedto2'                    => '[[$1]] تم نقلها إلى [[$2]]',
+'1movedto2_redir'              => '[[$1]] تم نقلها إلى [[$2]] �وق التحويلة',
+'move-redirect-suppressed'     => 'التحويلة تم التغاضي عنها',
+'movelogpage'                  => 'سجل النقل',
+'movelogpagetext'              => 'بالأس�ل قائمة بالص�حات التي تم نقلها.',
+'movereason'                   => 'السبب:',
+'revertmove'                   => 'استرجاع',
+'delete_and_move'              => 'حذ� ونقل',
+'delete_and_move_text'         => '==الحذ� مطلوب==
 الص�حة الهد� "[[:$1]]" موجودة بال�عل.
 هل تريد حذ�ها لإ�ساح المجال للنقل؟',
-'delete_and_move_confirm' => 'نعم، احذ� الص�حة',
-'delete_and_move_reason'  => 'تم الحذ� لإ�ساح مجال للنقل',
-'selfmove'                => 'لا يوجد اختلا� �ي عنوان المصدر والهد�؛
+'delete_and_move_confirm'      => 'نعم، احذ� الص�حة',
+'delete_and_move_reason'       => 'تم الحذ� لإ�ساح مجال للنقل',
+'selfmove'                     => 'لا يوجد اختلا� �ي عنوان المصدر والهد�؛
 لا يمكن نقل الص�حة على ن�سها.',
-'immobile_namespace'      => 'عنوان المصدر أو الهد� ذو طبيعة خاصة؛
-لا يمكن نقل الص�حات من وإلى هذا النطاق.',
-'imagenocrossnamespace'   => 'لا يمكن نقل المل� إلى نطاق غير نطاق المل�ات',
-'imagetypemismatch'       => 'امتداد المل� الجديد لا يطابق نوعه',
-'imageinvalidfilename'    => 'اسم المل� الهد� غير صحيح',
-'fix-double-redirects'    => 'حدث أي تحويلات تشير إلى العنوان الأصلي',
+'immobile-source-namespace'    => 'غير قادر على نقل الص�حات �ي النطاق "$1"',
+'immobile-target-namespace'    => 'غير قادر على نقل الص�حات إلى النطاق "$1"',
+'immobile-target-namespace-iw' => 'وصلة الإنترويكي ليست هد�ا صحيحا لنقل ص�حة.',
+'immobile-source-page'         => 'هذه الص�حة غير قابلة للنقل.',
+'immobile-target-page'         => 'غير قادر على النقل إلى العنوان الوجهة هذا.',
+'imagenocrossnamespace'        => 'لا يمكن نقل المل� إلى نطاق غير نطاق المل�ات',
+'imagetypemismatch'            => 'امتداد المل� الجديد لا يطابق نوعه',
+'imageinvalidfilename'         => 'اسم المل� الهد� غير صحيح',
+'fix-double-redirects'         => 'حدث أي تحويلات تشير إلى العنوان الأصلي',
+'move-leave-redirect'          => 'اترك تحويلة خل�ك',
 
 # Export
 'export'            => 'تصدير ص�حات',
@@ -2290,7 +2524,7 @@ $1',
 
 لتصدير ص�حات، أدخل العناوين �ي الصندوق أس�له، عنوان واحد �ي كل سطر، مع اختيار ما إذا كنت ترغب �ي النسخة الحالية بالإضا�ة إلى النسخ القديمة كاملة، أو مع معلومات تاريخ الص�حة عنها، أو �قط النسخة الحالية مع معلومات عن التعديل الأخير.
 
-�ي الحالة الأخيرة يمكنك أيضا استخدام وصلة، على سبيل المثال [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] للص�حة "[[{{MediaWiki:Mainpage}}]]".',
+�ي الحالة الأخيرة يمكنك أيضا استخدام وصلة، على سبيل المثال [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] للص�حة "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'ضمن المراجعة الحالية �قط، وليس التاريخ الكامل',
 'exportnohistory'   => "----
 ملاحظة:''' تصدير التاريخ الكامل للص�حات من خلال هذه الاستمارة تم تعطيله لأسباب تتعلق بالأداء'''",
@@ -2326,9 +2560,12 @@ $1',
 'import-interwiki-text'      => 'اختر ويكي وعنوان الص�حة للاستيراد.
 تواريخ المراجعات وأسماء المحررين سيتم ح�ظها.
 كل أ�عال الاستيراد عبر الويكي يتم تسجيلها �ي [[Special:Log/import|سجل الاستيراد]].',
+'import-interwiki-source'    => 'الويكي/الص�حة المصدر:',
 'import-interwiki-history'   => 'انسخ كل نسخ التاريخ لهذه الص�حة',
 'import-interwiki-submit'    => 'استيراد',
 'import-interwiki-namespace' => 'النطاق الهد�:',
+'import-upload-filename'     => 'اسم المل�:',
+'import-comment'             => 'تعليق:',
 'importtext'                 => 'من �ضلك صدر المل� من الويكي المصدر باستخدام [[Special:Export|أداة الاستيراد]].
 اح�ظها على حاسوبك ثم ار�عها هنا.',
 'importstart'                => 'استيراد ص�حات...',
@@ -2365,23 +2602,23 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|مراجعة واحدة|مراجعة}} من $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'ص�حة مستخدمي',
+'tooltip-pt-userpage'             => 'ص�حة المستخدم الخاصة بك',
 'tooltip-pt-anonuserpage'         => 'ص�حة المستخدم للأيبي الذي تقوم بالتحرير من خلاله',
-'tooltip-pt-mytalk'               => 'ص�حة نقاشي',
+'tooltip-pt-mytalk'               => 'ص�حة نقاشك',
 'tooltip-pt-anontalk'             => 'نقاش حول التعديلات من عنوان الأيبي هذا',
 'tooltip-pt-preferences'          => 'ت�ضيلاتي',
 'tooltip-pt-watchlist'            => 'قائمة الص�حات التي تراقب التغييرات التي تحدث بها',
-'tooltip-pt-mycontris'            => 'قائمة مساهماتي',
-'tooltip-pt-login'                => 'من الم�ضل أن تقوم بتسجيل الدخول، هذا ليس إلزاميا.',
+'tooltip-pt-mycontris'            => 'قائمة مساهماتك',
+'tooltip-pt-login'                => 'ي�ضل أن تسجل الدخول، لكنه ليس إلزاميا.',
 'tooltip-pt-anonlogin'            => 'من الم�ضل أن تقوم بتسجيل الدخول، هذا ليس إلزاميا.',
 'tooltip-pt-logout'               => 'خروج',
 'tooltip-ca-talk'                 => 'نقاش حول ص�حة المحتوى',
 'tooltip-ca-edit'                 => 'يمكنك تعديل هذه الص�حة.
 من �ضلك استخدم زر العرض المسبق قبل الح�ظ.',
-'tooltip-ca-addsection'           => 'أض� تعليقا إلى هذا النقاش.',
+'tooltip-ca-addsection'           => 'ابدأ قسما جديدا',
 'tooltip-ca-viewsource'           => 'هذه الص�حة محمية.
 يمكنك رؤية مصدرها.',
-'tooltip-ca-history'              => 'النسخ السابقة من هذه الص�حة',
+'tooltip-ca-history'              => 'النسخ السابقة لهذه الص�حة',
 'tooltip-ca-protect'              => 'احم هذه الص�حة',
 'tooltip-ca-delete'               => 'احذ� هذه الص�حة',
 'tooltip-ca-undelete'             => 'استرجع التعديلات التي تمت على هذه الص�حة قبل حذ�ها',
@@ -2389,7 +2626,7 @@ $1',
 'tooltip-ca-watch'                => 'أض� هذه الص�حة إلى قائمة مراقبتك',
 'tooltip-ca-unwatch'              => 'أزل هذه الص�حة من قائمة مراقبتك',
 'tooltip-search'                  => 'ابحث �ي {{SITENAME}}',
-'tooltip-search-go'               => 'اذهب إلى ص�حة بن�س هذا الاسم إن وجدت',
+'tooltip-search-go'               => 'اذهب إلى ص�حة بالاسم ن�سه إن وجدت',
 'tooltip-search-fulltext'         => 'ابحث �ي الص�حات عن هذا النص',
 'tooltip-p-logo'                  => 'الص�حة الرئيسية',
 'tooltip-n-mainpage'              => 'زر الص�حة الرئيسية',
@@ -2397,7 +2634,7 @@ $1',
 'tooltip-n-currentevents'         => 'مطالعة سريعة لأهم الأحداث الجارية',
 'tooltip-n-recentchanges'         => 'قائمة أحدث التغييرات �ي الويكي.',
 'tooltip-n-randompage'            => 'حمل ص�حة عشوائية',
-'tooltip-n-help'                  => 'تحتاج مساعدة؟ طالع هذه الص�حة!',
+'tooltip-n-help'                  => 'تحتاج مساعدة؟ انظر هذه الص�حة!',
 'tooltip-t-whatlinkshere'         => 'قائمة بكل ص�حات الويكي التي تصل هنا',
 'tooltip-t-recentchangeslinked'   => 'أحدث التغييرات �ي الص�حات الموصولة من هذه الص�حة',
 'tooltip-feed-rss'                => 'تلقيم أر إس إس لهذه الص�حة',
@@ -2426,6 +2663,8 @@ $1',
 'tooltip-watch'                   => 'أض� هذه الص�حة إلى قائمة مراقبتك',
 'tooltip-recreate'                => 'أعد إنشاء الص�حة رغم كونها حذ�ت',
 'tooltip-upload'                  => 'ابدأ الر�ع',
+'tooltip-rollback'                => '"استرجاع" تسترجع التعديل (التعديلات)  �ي هذه الص�حة للمساهم الأخير بضغطة واحدة.',
+'tooltip-undo'                    => '"رجوع" تسترجع هذا التعديل وت�تح نا�ذة التعديل �ي نمط العرض المسبق. تسمح بإضا�ة سبب �ي الملخص.',
 
 # Stylesheets
 'common.css'      => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على كل الواجهات */',
@@ -2437,6 +2676,8 @@ $1',
 'chick.css'       => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمي واجهة تشيك */',
 'simple.css'      => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمي واجهة سيمبل */',
 'modern.css'      => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمي واجهة مودرن */',
+'print.css'       => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على ناتج الطباعة */',
+'handheld.css'    => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على الأجهزة المحمولة بالاعتماد على الواجهة المضبوطة �ي $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => '/* الجا�اسكريبت الموضوع هنا سيتم تحميله لكل المستخدمين مع كل تحميل للص�حة. */',
@@ -2455,12 +2696,12 @@ $1',
 'notacceptable'     => 'لا يمكن لخادم الويكي تزويدك ببيانات بصيغة يستطيع عميلك قراءتها.',
 
 # Attribution
-'anonymous'        => 'مستخدم مجهول ل{{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|مستخدم مجهول|مستخدمون مجهولون}} ل{{SITENAME}}',
 'siteuser'         => 'مستخدم {{SITENAME}} $1',
 'lastmodifiedatby' => 'آخر تعديل لهذه الص�حة كان �ي $2، $1 بواسطة $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'بناء على العمل بواسطة $1.',
 'others'           => 'أخرى',
-'siteusers'        => 'مستخدم(و) {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|مستخدم|مستخدمو}} {{SITENAME}} $1',
 'creditspage'      => 'حقوق الص�حة',
 'nocredits'        => 'لا توجد معلومات حقوق متو�رة لهذه الص�حة.',
 
@@ -2481,6 +2722,16 @@ $1',
 'numauthors'     => 'عدد المحررين (ص�حة): $1',
 'numtalkauthors' => 'عدد المحررين (صح�ة نقاش): $1',
 
+# Skin names
+'skinname-standard'    => 'كلاسيك',
+'skinname-nostalgia'   => 'نوستالجيا',
+'skinname-cologneblue' => 'كولون بلو',
+'skinname-monobook'    => 'مونوبوك',
+'skinname-myskin'      => 'ماي سكين',
+'skinname-chick'       => 'تشيك',
+'skinname-simple'      => 'سيمبل',
+'skinname-modern'      => 'مودرن',
+
 # Math options
 'mw_math_png'    => 'دائما اعرض على هيئة PNG',
 'mw_math_simple' => 'اعرض على هيئة HTML للصيغ البسيطة جدا، وإلا �اعرض بهئية PNG',
@@ -2501,11 +2752,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'من غير المسموح لك التعليم على تغييراتك الشخصية كمراجعة.',
 
 # Patrol log
-'patrol-log-page'   => 'سجل المراجعة',
-'patrol-log-header' => 'هذا سجل بالمراجعات المراجعة.',
-'patrol-log-line'   => 'علم على $1 من $2 كمراجعة $3',
-'patrol-log-auto'   => '(تلقائيا)',
-'patrol-log-diff'   => 'Ù†$1',
+'patrol-log-page'      => 'سجل المراجعة',
+'patrol-log-header'    => 'هذا سجل بالمراجعات المراجعة.',
+'patrol-log-line'      => 'علم على $1 من $2 كمراجعة $3',
+'patrol-log-auto'      => '(تلقائيا)',
+'patrol-log-diff'      => 'Ù†$1',
+'log-show-hide-patrol' => '$1 سجل المراجعة',
 
 # Image deletion
 'deletedrevision'                 => 'حذ� المراجعة القديمة $1',
@@ -2522,6 +2774,9 @@ $1',
 'previousdiff' => '→ التعديل السابق',
 'nextdiff'     => 'التعديل اللاحق �',
 
+# Visual comparison
+'visual-comparison' => 'مقارنة بصرية',
+
 # Media information
 'mediawarning'         => "'''تحذير''': هذا المل� يحتوي على كود خبيث، يمكن عند تشغيله السيطرة على نظامك.<hr />",
 'imagemaxsize'         => 'حدد الصور �ي ص�حات وص� المل�ات إلى:',
@@ -2534,10 +2789,12 @@ $1',
 'show-big-image'       => 'دقة كاملة',
 'show-big-image-thumb' => '<small>حجم هذا العرض: $1 × $2 بكسل</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'معرض المل�ات الجديدة',
 'imagelisttext'         => '�يما يلي قائمة تحوي $1 {{PLURAL:$1|مل�|مل�ات}} مرتبة $2.',
 'newimages-summary'     => 'هذه الص�حة الخاصة تعرض آخر المل�ات المر�وعة.',
+'newimages-legend'      => 'اسم المل�',
+'newimages-label'       => 'اسم المل� (أو جزء منه):',
 'showhidebots'          => '($1 بوتات)',
 'noimages'              => 'لا شيء للعرض.',
 'ilsubmit'              => 'بحث',
@@ -2553,9 +2810,9 @@ $1',
 # Bad image list
 'bad_image_list' => 'الصيغة كالتالي:
 
-�قط عناصر القائمة (السطور التي تبدأ ب *) يتم أخذها �ي الاعتبار.
-أول وصلة �ي السطر يجب أن تكون وصلة لمل� سيىء.
-أي وصلات تالية �ي ن�س السطر سيتم اعتبارها استثناءات، بمعنى آخر مقالات حيث المل� يمكن أن يكون موجودا.',
+�قط عناصر القائمة (السطور التي تبدأ ب *) تؤخذ �ي الاعتبار.
+يجب أن تكون أول وصلة �ي السطر وصلة لمل� سيىء.
+أي وصلات تالية �ي السطر ن�سه تعتبر استثناءات، أي ص�حات قد يكون المل� �يها سطريا.',
 
 # Metadata
 'metadata'          => 'بيانات ميتا',
@@ -2772,6 +3029,18 @@ $1',
 'exif-lightsource-24'  => 'تنجستين ستوديو أيزو',
 'exif-lightsource-255' => 'مصدر ضوء آخر',
 
+# Flash modes
+'exif-flash-fired-0'    => 'ال�لاش لم يبدأ',
+'exif-flash-fired-1'    => 'ال�لاش بدأ',
+'exif-flash-return-0'   => 'لا دالة كش� رجوع وميض',
+'exif-flash-return-2'   => 'ضوء رجوع الوميض لم يتم كش�ه',
+'exif-flash-return-3'   => 'ضوء رجوع الوميض تم كش�ه',
+'exif-flash-mode-1'     => 'بدء �لاش إجباري',
+'exif-flash-mode-2'     => 'ضغط �لاش إجباري',
+'exif-flash-mode-3'     => 'نمط تلقائي',
+'exif-flash-function-1' => 'لا وظي�ة �لاش',
+'exif-flash-redeye-1'   => 'نمط اختزال العين الحمراء',
+
 'exif-focalplaneresolutionunit-2' => 'بوصة',
 
 'exif-sensingmethod-1' => 'غير معر�',
@@ -2921,29 +3190,18 @@ $1
 
 'unit-pixel' => 'بك',
 
-# HTML dump
-'redirectingto' => 'جاري التحويل إلى [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'امسح مختزن هذه الص�حة؟
-
-$1',
 'confirm_purge_button' => 'موا�ق',
-
-# AJAX search
-'searchcontaining' => "ابحث عن الص�حات المحتوية على ''$1''.",
-'searchnamed'      => "ابحث عن الص�حات المسماة ''$1''.",
-'articletitles'    => "الص�حات التي تبدأ ب''$1''",
-'hideresults'      => 'إخ�اء النتائج',
-'useajaxsearch'    => 'استخدم بحث أجاكس',
+'confirm-purge-top'    => 'امسح مختزن هذه الص�حة؟',
+'confirm-purge-bottom' => 'إ�راغ مختزن الص�حة يمحو المختزن ويجبر أحدث نسخة على الظهور.',
 
 # Separators for various lists, etc.
-'semicolon-separator' => 'Ø›',
+'semicolon-separator' => 'Ø›&#32;',
 'comma-separator'     => '،&#32;',
 
 # Multipage image navigation
-'imgmultipageprev' => '� الص�حة السابقة',
-'imgmultipagenext' => 'الص�حة التالية →',
+'imgmultipageprev' => '→ الص�حة السابقة',
+'imgmultipagenext' => 'الص�حة التالية �',
 'imgmultigo'       => 'اذهب!',
 'imgmultigoto'     => 'اذهب إلى ص�حة $1',
 
@@ -2959,10 +3217,10 @@ $1',
 'table_pager_empty'        => 'لا نتائج',
 
 # Auto-summaries
-'autosumm-blank'   => 'إزالة كل المحتوى من الص�حة',
+'autosumm-blank'   => 'أ�رغ الص�حة',
 'autosumm-replace' => "استبدال الص�حة ب'$1'",
 'autoredircomment' => 'تحويل إلى [[$1]]',
-'autosumm-new'     => 'ص�حة جديدة: $1',
+'autosumm-new'     => "أنشأ الص�حة ب'$1'",
 
 # Size units
 'size-bytes'     => '$1 بايت',
@@ -3071,6 +3329,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'وسم امتداد غير معرو� "$1"',
+'duplicate-defaultsort' => 'تحذير: م�تاح الترتيب الا�تراضي "$2" يتجاوز م�تاح الترتيب الا�تراضي السابق "$1".',
 
 # Special:Version
 'version'                          => 'نسخة', # Not used as normal message but as header for the special page itself
@@ -3100,13 +3359,13 @@ $1',
 'filepath-summary' => 'هذه الص�حة الخاصة تعرض المسار الكامل لمل�.
 ستعرض الصور بأقصى دقة، ستعمل أنواع المل�ات الأخرى بالبرنامج المخصص لهم مباشرة.
 
-أدخل اسم المل� بدون البادئة "{{ns:image}}:"',
+أدخل اسم المل� بدون البادئة "{{ns:file}}:"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'بحث عن مل�ات مكررة',
 'fileduplicatesearch-summary'  => 'ابحث عن المل�ات المكررة بناء على قيمة الهاش الخاصة بها.
 
-أدخل اسم المل� بدون بادئة "{{ns:image}}:".',
+أدخل اسم المل� بدون بادئة "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'بحث عن مكرر',
 'fileduplicatesearch-filename' => 'اسم المل�:',
 'fileduplicatesearch-submit'   => 'بحث',
@@ -3136,4 +3395,13 @@ $1',
 'blankpage'              => 'ص�حة �ارغة',
 'intentionallyblankpage' => 'هذه الص�حة تركت �ارغة عن قصد',
 
+# External image whitelist
+'external_image_whitelist' => '  #<pre>اترك هذا السطر تماما كما هو
+#ضع منثورات التعبيرات المنتظمة (�قط الجزء الذي يذهب بين //) بالأس�ل
+#هذه ستتم مطابقتها مع مسارات الصور الخرجية (الموصولة بشكل مباشر)
+#هذه التي تطابق سيتم عرضها كصور، غير ذلك �قط وصلة إلى الصورة سيتم عرضها
+#السطور التي تبدأ ب# تتم معاملتها كتعليقات
+
+#ضع كل منثورات التعبيرات المنتظمة �وق هذا السطر. اترك هذا السطر تماما كما هو</pre>',
+
 );
diff --git a/languages/messages/MessagesArc.php b/languages/messages/MessagesArc.php
index 8163edaa..f48aea66 100644
--- a/languages/messages/MessagesArc.php
+++ b/languages/messages/MessagesArc.php
@@ -68,7 +68,7 @@ $messages = array(
 'mypage'         => 'ܕܦ�',
 'mytalk'         => 'ܕܘܪܫ�',
 'navigation'     => '�ܠܦܪܘܬ�',
-'and'            => 'ܘ',
+'and'            => '&#32;ܘ',
 
 'errorpagetitle'    => 'ܛܥ�ܘܬ�',
 'help'              => 'ܥܘܕܪܢ�',
@@ -103,7 +103,7 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'currentevents'        => 'ܓܕ̈ܫ� ܗܫ̈��',
 'currentevents-url'    => 'Project:ܓܕ̈ܫ� ܗܫ��',
-'mainpage'             => 'ܕܦ� ܪܫ��',
+'mainpage'             => 'ܕܦ� ܪ�ܫ��',
 'mainpage-description' => 'ܕܦ� ܪܫ��',
 'portal'               => 'ܬܪܥ� ܕܟܢܫ�',
 'portal-url'           => 'Project:ܬܪܥ� ܕܟܢܫ�',
@@ -158,14 +158,14 @@ $messages = array(
 'upload'   => 'ܛܥܢ� ܦ̮ܥ�ܠ',
 'filename' => 'ܫܡ� ܕܫܘܦ�ܢ�',
 
-# Special:ImageList
-'imagelist_name' => 'ܫܡ�',
+# Special:ListFiles
+'listfiles_name' => 'ܫܡ�',
 
 # Random page
 'randompage' => 'ܡܓܠܬ� ܚܘ�ܚ�',
 
 # Miscellaneous special pages
-'move' => 'ܡܓ̰ܘܓ̰',
+'move' => 'ܫܢ�',
 
 # Book sources
 'booksources'    => 'ܙܠ',
@@ -202,7 +202,7 @@ $messages = array(
 # Namespace 8 related
 'allmessagesname' => 'ܫܡ�',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'ܛܥܘ��',
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesArn.php b/languages/messages/MessagesArn.php
index 5a730e9e..1eee043a 100644
--- a/languages/messages/MessagesArn.php
+++ b/languages/messages/MessagesArn.php
@@ -81,7 +81,7 @@ $messages = array(
 'mypage'        => 'tañi nütramkawe',
 'mytalk'        => 'Tañi nütramkawe',
 'anontalk'      => 'Tüfachi IP ñi nütramkawe',
-'and'           => 'ka',
+'and'           => '&#32;ka',
 
 'returnto'         => 'Amutun $1 püle.',
 'tagline'          => '{{SITENAME}} mew',
@@ -103,6 +103,7 @@ $messages = array(
 'newpage'          => 'We Pakina',
 'talkpage'         => 'Nütramkafinge tüfachi pakina',
 'talkpagelinktext' => 'Nütramkawe',
+'personaltools'    => 'Kisungechi küdawpeyüm',
 'articlepage'      => 'adkintun artículo',
 'talk'             => 'Nütramkawe',
 'views'            => 'Pen',
@@ -134,6 +135,7 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Elungeymi we dungu $1 mew.',
 'editsection'             => 'wirin',
 'editold'                 => 'wirin',
+'editlink'                => 'wirin',
 'showtoc'                 => 'pengelün',
 'hidetoc'                 => 'ellkan',
 'viewdeleted'             => 'Küpaadkintuymi $1 am?',
@@ -141,7 +143,7 @@ $messages = array(
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pakina',
-'nstab-user'      => 'Lludüchi',
+'nstab-user'      => 'Kellufe',
 'nstab-special'   => 'Kangelu',
 'nstab-mediawiki' => 'Dungu',
 'nstab-help'      => 'Kelluwe',
@@ -153,7 +155,7 @@ $messages = array(
 
 # Login and logout pages
 'loginpagetitle'          => 'Konün',
-'yourname'                => 'Tami lludüchi üy',
+'yourname'                => 'Tami üy',
 'yourpassword'            => 'Tami kondungu',
 'login'                   => 'Konün',
 'nav-login-createaccount' => 'Konün',
@@ -169,7 +171,7 @@ $messages = array(
 'loginlanguagelabel'      => 'Dungun: $1',
 
 # Edit pages
-'subject'            => 'Dungu/üy',
+'subject'            => 'Dungu/üy:',
 'minoredit'          => 'Tüfachi ta kiñe pichi wirin',
 'watchthis'          => 'Llaytun tüfachi pakina',
 'preview'            => 'Pen chum müley',
@@ -182,9 +184,10 @@ $messages = array(
 'template-protected' => '(Ngünaytun)',
 
 # History pages
-'page_first'   => 'wünen',
-'deletedrev'   => '[ñamümüngelu]',
-'historyempty' => '(welli)',
+'page_first'             => 'wünen',
+'history-fieldset-title' => 'Kintun pünon mew',
+'deletedrev'             => '[ñamümüngelu]',
+'historyempty'           => '(welli)',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 $2 mew', # user at time
@@ -196,31 +199,39 @@ $messages = array(
 'revdelete-hid' => 'Ellkan $1',
 
 # Diffs
-'lineno'   => 'Wirin $1:',
-'editundo' => 'wüñoeltun',
+'lineno'       => 'Wirin $1:',
+'editundo'     => 'wüñoeltun',
+'diff-movedto' => 'Nengümülu $1 püle',
+'diff-img'     => "kiñe '''ad'''",
+'diff-big'     => "'''füta'''",
+'diff-del'     => "'''Ñamümün'''",
 
 # Search results
-'viewprevnext'          => 'Pen ($1) ($2) ($3).',
-'search-interwiki-more' => '(Doy)',
-'searchall'             => 'Fill',
-'powersearch'           => 'Kintun',
-'powersearch-field'     => 'Kintun',
+'viewprevnext'                   => 'Pen ($1) ($2) ($3).',
+'searchhelp-url'                 => 'Help:Kellu',
+'searchprofile-articles-tooltip' => 'kintu $1 mew',
+'searchprofile-project-tooltip'  => 'Kintun $1 mew',
+'search-interwiki-more'          => '(Doy)',
+'searchall'                      => 'Fill',
+'powersearch'                    => 'Kintun',
+'powersearch-field'              => 'Kintun',
 
 # Preferences page
 'prefs-edits'       => 'Rakin Wirin:',
 'prefsnologin'      => 'Mülelay Konün',
+'skin-preview'      => 'Pen chum müley',
 'textboxsize'       => 'Wirin',
 'searchresultshead' => 'Kintun',
 
 # Groups
 'group'       => 'Kisuwen:',
-'group-user'  => 'Lludüchi',
+'group-user'  => 'Pu kellufe',
 'group-sysop' => 'Pu ngünefe',
 'group-all'   => '(kom pu che)',
 
-'group-user-member' => 'Lludüchi',
+'group-user-member' => 'Kellufe',
 
-'grouppage-user' => '{{ns:project}}: Lludüchi',
+'grouppage-user' => '{{ns:project}}: Pu kellufe',
 
 # Rights
 'right-edit'          => 'Wirin pakina',
@@ -234,6 +245,9 @@ $messages = array(
 # User rights log
 'rightsnone' => 'chemnorume',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-move' => 'Nengümün tüfachi pakina',
+
 # Recent changes
 'rcshowhideminor'                   => '$1 wirin pichi',
 'rcshowhidemine'                    => '$1 tañi wirin',
@@ -242,7 +256,7 @@ $messages = array(
 'show'                              => 'pengelün',
 'minoreditletter'                   => 'p',
 'newpageletter'                     => 'W',
-'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|Lludüchi|Lludüchi}} wiñamüy]',
+'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|Kellufe|Kellufe}} wiñamüy]',
 
 # Recent changes linked
 'recentchangeslinked-page' => 'Pakina ñi üy:',
@@ -253,24 +267,28 @@ $messages = array(
 
 'nolicense' => 'Chemnorume dullinnongey',
 
-# Special:ImageList
-'imagelist_name' => 'Ãœy',
-'imagelist_user' => 'Lludüchi',
+# Special:ListFiles
+'listfiles_name' => 'Ãœy',
+'listfiles_user' => 'Kellufe',
 
-# Image description page
+# File description page
 'filehist-deleteall' => 'kom ñamümün',
 'filehist-deleteone' => 'ñamümün tüfa',
-'filehist-user'      => 'Lludüchi',
+'filehist-user'      => 'Kellufe',
 
 # File deletion
-'filedelete'         => '$1 ñamümün',
-'filedelete-intro'   => "Ñamümmekeymi '''[[Media:$1|$1]]'''.",
-'filedelete-submit'  => 'Ñamümün',
-'filedelete-success' => "'''$1''' ñamümngey.",
+'filedelete'                 => '$1 ñamümün',
+'filedelete-intro'           => "Ñamümmekeymi '''[[Media:$1|$1]]'''.",
+'filedelete-submit'          => 'Ñamümün',
+'filedelete-success'         => "'''$1''' ñamümngey.",
+'filedelete-edit-reasonlist' => 'Wirin dungu ñamümgün mew',
 
 # Unused templates
 'unusedtemplateswlh' => "Kake ''enlase''",
 
+# Statistics
+'statistics-pages' => 'Pakina',
+
 'brokenredirects-edit'   => '(wirin)',
 'brokenredirects-delete' => '(ñamümün)',
 
@@ -281,7 +299,7 @@ $messages = array(
 'nviews'            => '$1 {{PLURAL:$1|pen|pen}}',
 'shortpages'        => 'Pichi pakina',
 'newpages'          => 'We pakina',
-'newpages-username' => 'Güy lludüchi',
+'newpages-username' => 'Kellufe ñi üy',
 'move'              => 'Wiñamün',
 'movethispage'      => 'Nengümün tüfachi pakina',
 
@@ -289,9 +307,8 @@ $messages = array(
 'booksources-go' => 'Amun',
 
 # Special:Log
-'specialloguserlabel'  => 'Lludüchi:',
+'specialloguserlabel'  => 'Kellufe:',
 'speciallogtitlelabel' => 'Ãœy:',
-'log-search-submit'    => 'Amun',
 
 # Special:AllPages
 'allpages'       => 'Kakelu pakina',
@@ -299,6 +316,9 @@ $messages = array(
 'allpagesnext'   => 'Inan',
 'allpagessubmit' => 'Pengelün',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Kintun',
+
 # Special:ListUsers
 'listusers-submit' => 'Pengelün',
 
@@ -308,29 +328,35 @@ $messages = array(
 'emailsend'    => 'Werkün',
 
 # Watchlist
-'watchnologin'         => 'Petu konlaymi',
-'watch'                => 'Llaytun',
-'watchthispage'        => 'Llaytun tüfachi pakina',
-'unwatch'              => 'Llaytuwelan',
-'unwatchthispage'      => 'Llaytuwelan',
-'notanarticle'         => 'Ngelay kiñe pakina',
-'watchlist-show-own'   => 'Nülan ñi wirin',
-'watchlist-hide-own'   => 'Ellkan ñi wirin',
-'watchlist-show-minor' => 'Nülan pichi wirin',
-'watchlist-hide-minor' => 'Ellkan wirin pichi',
+'watchlistfor'    => "('''$1''')",
+'watchnologin'    => 'Petu konlaymi',
+'watch'           => 'Llaytun',
+'watchthispage'   => 'Llaytun tüfachi pakina',
+'unwatch'         => 'Llaytuwelan',
+'unwatchthispage' => 'Llaytuwelan',
+'notanarticle'    => 'Ngelay kiñe pakina',
+
+# Displayed when you click the "watch" button and it is in the process of watching
+'watching'   => 'Llaytumekey...',
+'unwatching' => 'Llaytumekewelay...',
 
 'enotif_newpagetext'           => 'Tüfachi ta we pakina',
-'enotif_impersonal_salutation' => '{{SITENAME}} lludüchi',
+'enotif_impersonal_salutation' => '{{SITENAME}} kellufe',
 'created'                      => 'Llituy',
 
-# Delete/protect/revert
-'deletepage'              => 'Ñamümün tüfachi pakina',
-'delete-confirm'          => 'Ñamümüngelu "$1"',
-'delete-legend'           => 'Ñamümün',
-'deletedarticle'          => '«[[$1]]» Ñamümün',
+# Delete
+'deletepage'     => 'Ñamümün tüfachi pakina',
+'exblank'        => 'pakina wellingey',
+'delete-confirm' => 'Ñamümüngelu "$1"',
+'delete-legend'  => 'Ñamümün',
+'deletedarticle' => '«[[$1]]» Ñamümün',
+
+# Protect
+'prot_1movedto2'          => '[[$1]] wiñamngey [[$2]] püle',
 'protectexpiry'           => 'Afi:',
 'protect-level-sysop'     => 'Pu ngünefe müṯen',
 'protect-summary-cascade' => 'Trayengko',
+'protect-expiry-options'  => '1 ora:1 hour,1 aṉtü:1 day,1 semana:1 week,2 semanas:2 weeks,1 küyeṉ:1 month,3 küyeṉ:3 months,6 küyeṉ:6 months,1 tripantu:1 year,Rumel:infinite', # display1:time1,display2:time2,...
 
 # Restrictions (nouns)
 'restriction-edit'   => 'Pepiwelukay',
@@ -338,16 +364,18 @@ $messages = array(
 'restriction-create' => 'Llitun',
 
 # Undelete
-'viewdeletedpage'        => 'Pen pakina ñamümüngelu',
-'undelete-search-box'    => 'Kintun ñamümüngelu pakina',
-'undelete-search-submit' => 'Kintun',
+'viewdeletedpage'           => 'Pen pakina ñamümüngelu',
+'undelete-search-box'       => 'Kintun ñamümüngelu pakina',
+'undelete-search-submit'    => 'Kintun',
+'undelete-show-file-submit' => 'May',
 
 # Namespace form on various pages
 'blanknamespace' => '(Wüne pakina)',
 
 # Contributions
-'month' => 'Küyeṉ:',
-'year'  => 'Tripantu:',
+'contribsub2' => '$1 ($2)',
+'month'       => 'Küyeṉ:',
+'year'        => 'Tripantu:',
 
 'sp-contributions-submit' => 'Kintun',
 
@@ -357,14 +385,17 @@ $messages = array(
 
 # Block/unblock
 'ipbexpiry'          => 'Afi',
+'ipboptions'         => '2 ora:2 hours,1 aṉtü:1 day,3 aṉtü:3 days,1 semana:1 week,2 semana:2 weeks,1 küyeṉ:1 month,3 küyeṉ:3 months,6 küyeṉ:6 months,1 tripantu:1 year,rumel:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'     => 'Kakelu',
 'ipblocklist-submit' => 'Kintun',
 'expiringblock'      => 'afi $1',
+'proxyblocksuccess'  => 'Dewmangey.',
 
 # Move page
 'move-page'               => 'Nengümün $1',
 'move-page-legend'        => 'Nengümün pakina',
 'movearticle'             => 'Nengümün pakina',
+'movenologin'             => 'Konlaymi',
 'newtitle'                => 'We üy püle',
 'move-watch'              => 'Llaytun tüfachi pakina',
 'movepagebtn'             => 'Nengümün pakina',
@@ -373,24 +404,28 @@ $messages = array(
 'delete_and_move'         => 'Ñamümün ka nengümün',
 'delete_and_move_confirm' => 'May, ñamümün pakina',
 
+# Export
+'export' => 'Wiñamün pakina',
+
 # Namespace 8 related
 'allmessagesname' => 'Ãœy',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'    => 'Ñi pakina lludüchi',
+'tooltip-pt-userpage'    => 'Tañi pakina',
 'tooltip-pt-mytalk'      => 'Tañi nütramkawe',
 'tooltip-pt-logout'      => 'Tripan',
 'tooltip-ca-delete'      => 'Ñamümün tüfachi pakina',
 'tooltip-ca-move'        => 'Nengümün tüfachi pakina',
 'tooltip-search'         => 'Kintun tüfachi wiki mew',
 'tooltip-p-logo'         => 'Wüne pakina',
-'tooltip-ca-nstab-user'  => 'Pen lludüchi pakina',
+'tooltip-ca-nstab-user'  => 'Pen kellufe pakina',
 'tooltip-ca-nstab-image' => 'Pen pakina ad mew',
 'tooltip-ca-nstab-help'  => 'Pen kellupakina',
 
 # Attribution
-'siteuser' => 'Lludüchi $1 {{SITENAME}}',
-'others'   => 'fill',
+'siteuser'  => 'Kellufe $1 {{SITENAME}}',
+'others'    => 'fill',
+'siteusers' => '{{PLURAL:$2|Kellufe|Kellufe}} $1 {{SITENAME}}',
 
 # Info page
 'numedits'     => 'Rakin wirin (pakina): $1',
@@ -403,13 +438,14 @@ $messages = array(
 'previousdiff' => '� Füta wirin',
 'nextdiff'     => 'We wirin →',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Kintu',
 
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
 'hours-abbrev' => 'o',
 
 # EXIF tags
+'exif-artist'              => 'Che llitun mew',
 'exif-exposuretime-format' => '$1 sek ($2)',
 
 'exif-exposureprogram-1' => 'Chillka kellu',
diff --git a/languages/messages/MessagesArz.php b/languages/messages/MessagesArz.php
index 4c151cba..d03373fa 100644
--- a/languages/messages/MessagesArz.php
+++ b/languages/messages/MessagesArz.php
@@ -8,172 +8,184 @@
  * @author Ghaly
  * @author Meno25
  * @author Ramsis II
- * @author Ramsis1978
  */
 
 $fallback = 'ar';
 
+// (bug 16469) Override Eastern Arabic numberals, use Western
+$digitTransformTable = array(
+	'0' => '0',
+	'1' => '1',
+	'2' => '2',
+	'3' => '3',
+	'4' => '4',
+	'5' => '5',
+	'6' => '6',
+	'7' => '7',
+	'8' => '8',
+	'9' => '9',
+	'.' => '.',
+	',' => ',',
+);
+
 $namespaceNames = array(
-	NS_MEDIA          => 'ميديا',
-	NS_SPECIAL        => 'خاص',
-	NS_TALK           => 'نقاش',
-	NS_USER           => 'مستخدم',
-	NS_USER_TALK      => 'نقاش_المستخدم',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'نقاش_$1',
-	NS_IMAGE          => 'صورة',
-	NS_IMAGE_TALK     => 'نقاش_الصورة',
-	NS_MEDIAWIKI      => 'ميدياويكى',
-	NS_MEDIAWIKI_TALK => 'نقاش_ميدياويكى',
-	NS_TEMPLATE       => 'قالب',
-	NS_TEMPLATE_TALK  => 'نقاش_القالب',
-	NS_HELP           => 'مساعدة',
-	NS_HELP_TALK      => 'نقاش_المساعدة',
-	NS_CATEGORY       => 'تصني�',
-	NS_CATEGORY_TALK  => 'نقاش_التصني�',
+	NS_MEDIA            => 'ميديا',
+	NS_SPECIAL          => 'خاص',
+	NS_TALK             => 'نقاش',
+	NS_USER             => 'مستخدم',
+	NS_USER_TALK        => 'نقاش_المستخدم',
+	NS_PROJECT_TALK     => 'نقاش_$1',
+	NS_FILE             => 'مل�',
+	NS_FILE_TALK        => 'نقاش_المل�',
+	NS_MEDIAWIKI        => 'ميدياويكى',
+	NS_MEDIAWIKI_TALK   => 'نقاش_ميدياويكى',
+	NS_TEMPLATE         => 'قالب',
+	NS_TEMPLATE_TALK    => 'نقاش_القالب',
+	NS_HELP             => 'مساعدة',
+	NS_HELP_TALK        => 'نقاش_المساعدة',
+	NS_CATEGORY         => 'تصني�',
+	NS_CATEGORY_TALK    => 'نقاش_التصني�',
 );
 
 $namespaceAliases = array(
-	'مل�'             => NS_MEDIA,
+	'وسائط' => NS_MEDIA,
+	'صورة' => NS_FILE,
+	'نقاش_الصورة' => NS_FILE_TALK,
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#تحويل', '#REDIRECT' ),
-	'notoc'               => array( '0', '__لا�هرس__', '__NOTOC__' ),
-	'nogallery'           => array( '0', '__لامعرض__', '__NOGALLERY__' ),
-	'forcetoc'            => array( '0', '__لصق_�هرس__', '__FORCETOC__' ),
-	'toc'                 => array( '0', '__�هرس__', '__TOC__' ),
-	'noeditsection'       => array( '0', '__لاتحريرقسم__', '__NOEDITSECTION__' ),
-	'currentmonth'        => array( '1', 'شهر_حالى', 'شهر', 'CURRENTMONTH' ),
-	'currentmonthname'    => array( '1', 'اسم_الشهر_الحالى', 'اسم_شهر_حالى', 'اسم_شهر', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen' => array( '1', 'اسم_الشهر_الحالى_المولد', 'اسم_شهر_حالى_مولد', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'  => array( '1', 'اختصار_الشهر_الحالى', 'اختصار_شهر_حالى', 'CURRENTMONTHABBREV' ),
-	'currentday'          => array( '1', 'يوم_حالى', 'يوم', 'CURRENTDAY' ),
-	'currentday2'         => array( '1', 'يوم_حالى2', 'يوم2', 'CURRENTDAY2' ),
-	'currentdayname'      => array( '1', 'اسم_اليوم_الحالى', 'اسم_يوم_حالى', 'اسم_يوم', 'CURRENTDAYNAME' ),
-	'currentyear'         => array( '1', 'عام_حالى', 'عام', 'CURRENTYEAR' ),
-	'currenttime'         => array( '1', 'وقت_حالى', 'وقت', 'CURRENTTIME' ),
-	'currenthour'         => array( '1', 'ساعة_حالية', 'ساعة', 'CURRENTHOUR' ),
-	'localmonth'          => array( '1', 'شهر_محلى', 'LOCALMONTH' ),
-	'localmonthname'      => array( '1', 'اسم_الشهر_المحلى', 'اسم_شهر_محلى', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'   => array( '1', 'اسم_الشهر_المحلى_المولد', 'اسم_شهر_محلى_مولد', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'    => array( '1', 'اختصار_الشهر_المحلى', 'اختصار_شهر_محلى', 'LOCALMONTHABBREV' ),
-	'localday'            => array( '1', 'يوم_محلى', 'LOCALDAY' ),
-	'localday2'           => array( '1', 'يوم_محلى2', 'LOCALDAY2' ),
-	'localdayname'        => array( '1', 'اسم_اليوم_المحلى', 'اسم_يوم_محلى', 'LOCALDAYNAME' ),
-	'localyear'           => array( '1', 'عام_محلى', 'LOCALYEAR' ),
-	'localtime'           => array( '1', 'وقت_محلى', 'LOCALTIME' ),
-	'localhour'           => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
-	'numberofpages'       => array( '1', 'عدد_الص�حات', 'عدد_ص�حات', 'NUMBEROFPAGES' ),
-	'numberofarticles'    => array( '1', 'عدد_المقالات', 'عدد_مقالات', 'NUMBEROFARTICLES' ),
-	'numberoffiles'       => array( '1', 'عدد_المل�ات', 'عدد_مل�ات', 'NUMBEROFFILES' ),
-	'numberofusers'       => array( '1', 'عدد_المستخدمين', 'عدد_مستخدمين', 'NUMBEROFUSERS' ),
-	'numberofedits'       => array( '1', 'عدد_التعديلات', 'عدد_تعديلات', 'NUMBEROFEDITS' ),
-	'pagename'            => array( '1', 'اسم_الص�حة', 'اسم_ص�حة', 'PAGENAME' ),
-	'pagenamee'           => array( '1', 'عنوان_الص�حة', 'عنوان_ص�حة', 'PAGENAMEE' ),
-	'namespace'           => array( '1', 'نطاق', 'NAMESPACE' ),
-	'namespacee'          => array( '1', 'عنوان_نطاق', 'NAMESPACEE' ),
-	'talkspace'           => array( '1', 'نطاق_النقاش', 'نطاق_نقاش', 'TALKSPACE' ),
-	'talkspacee'          => array( '1', 'عنوان_النقاش', 'عنوان_نقاش', 'TALKSPACEE' ),
-	'subjectspace'        => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'       => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'        => array( '1', 'اسم_الص�حة_الكامل', 'اسم_ص�حة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
-	'fullpagenamee'       => array( '1', 'عنوان_الص�حة_الكامل', 'عنوان_ص�حة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
-	'subpagename'         => array( '1', 'اسم_الص�حة_ال�رعي', 'اسم_ص�حة_�رعي', 'SUBPAGENAME' ),
-	'subpagenamee'        => array( '1', 'عنوان_الص�حة_ال�رعى', 'عنوان_ص�حة_�رعى', 'SUBPAGENAMEE' ),
-	'basepagename'        => array( '1', 'اسم_الص�حة_الأساسى', 'اسم_ص�حة_أساسى', 'BASEPAGENAME' ),
-	'basepagenamee'       => array( '1', 'عنوان_الص�حة_الأساسى', 'عنوان_ص�حة_أساسى', 'BASEPAGENAMEE' ),
-	'talkpagename'        => array( '1', 'اسم_ص�حة_النقاش', 'اسم_ص�حة_نقاش', 'TALKPAGENAME' ),
-	'talkpagenamee'       => array( '1', 'عنوان_ص�حة_النقاش', 'عنوان_ص�حة_نقاش', 'TALKPAGENAMEE' ),
-	'subjectpagename'     => array( '1', 'اسم_ص�حة_الموضوع', 'اسم_ص�حة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'    => array( '1', 'عنوان_ص�حة_الموضوع', 'عنوان_ص�حة_المقالة SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                 => array( '0', 'رسالة:', 'MSG:' ),
-	'subst'               => array( '0', 'نسخ:', 'إحلال:', 'SUBST:' ),
-	'msgnw'               => array( '0', 'مصدر:', 'مصدر_قالب:', 'MSGNW:' ),
-	'img_thumbnail'       => array( '1', 'تصغير', 'thumbnail', 'thumb' ),
-	'img_manualthumb'     => array( '1', 'تصغير=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'           => array( '1', 'يمين', 'right' ),
-	'img_left'            => array( '1', 'يسار', 'left' ),
-	'img_none'            => array( '1', 'بدون', 'بلا', 'none' ),
-	'img_width'           => array( '1', '$1بك', '$1px' ),
-	'img_center'          => array( '1', 'مركز', 'center', 'centre' ),
-	'img_framed'          => array( '1', 'إطار', 'framed', 'enframed', 'frame' ),
-	'img_frameless'       => array( '1', 'لاإطار', 'frameless' ),
-	'img_page'            => array( '1', 'ص�حة=$1', 'ص�حة $1', 'page=$1', 'page $1' ),
-	'img_upright'         => array( '1', 'معدول', 'معدول=$1', 'معدول $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'          => array( '1', 'حد', 'حدود', 'border' ),
-	'img_baseline'        => array( '1', 'خط_أساسى', 'baseline' ),
-	'img_sub'             => array( '1', '�رعى', 'sub' ),
-	'img_super'           => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
-	'img_top'             => array( '1', 'أعلى', 'top' ),
-	'img_text_top'        => array( '1', 'نص_أعلى', 'text-top' ),
-	'img_middle'          => array( '1', 'وسط', 'middle' ),
-	'img_bottom'          => array( '1', 'أس�ل', 'bottom' ),
-	'img_text_bottom'     => array( '1', 'نص_أس�ل', 'text-bottom' ),
-	'int'                 => array( '0', 'محتوى:', 'INT:' ),
-	'sitename'            => array( '1', 'اسم_الموقع', 'اسم_موقع', 'SITENAME' ),
-	'ns'                  => array( '0', 'نط:', 'NS:' ),
-	'localurl'            => array( '0', 'مسار_محلى:', 'LOCALURL:' ),
-	'localurle'           => array( '0', 'عنوان_المسار_المحلى:', 'عنوان_مسار_محلى:', 'LOCALURLE:' ),
-	'server'              => array( '0', 'خادم', 'SERVER' ),
-	'servername'          => array( '0', 'اسم_الخادم', 'اسم_خادم', 'SERVERNAME' ),
-	'scriptpath'          => array( '0', 'مسار_السكريبت', 'مسار_سكريبت', 'SCRIPTPATH' ),
-	'grammar'             => array( '0', 'قواعد_اللغة:', 'قواعد_لغة: GRAMMAR:' ),
-	'notitleconvert'      => array( '0', '__لاتحويل_عنوان__', '__لاتع__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'    => array( '0', '__لاتحويل_محتوى__', '__لاتم__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'         => array( '1', 'أسبوع_حالى', 'أسبوع', 'CURRENTWEEK' ),
-	'currentdow'          => array( '1', 'يوم_حالي_مأ', 'CURRENTDOW' ),
-	'localweek'           => array( '1', 'أسبوع_محلى', 'LOCALWEEK' ),
-	'localdow'            => array( '1', 'يوم_محلى_مأ', 'LOCALDOW' ),
-	'revisionid'          => array( '1', 'رقم_النسخة', 'رقم_نسخة', 'REVISIONID' ),
-	'revisionday'         => array( '1', 'يوم_النسخة', 'يوم_نسخة', 'REVISIONDAY' ),
-	'revisionday2'        => array( '1', 'يوم_النسخة2', 'يوم_نسخة2', 'REVISIONDAY2' ),
-	'revisionmonth'       => array( '1', 'شهر_النسخة', 'شهر_نسخة', 'REVISIONMONTH' ),
-	'revisionyear'        => array( '1', 'عام_النسخة', 'عام_نسخة', 'REVISIONYEAR' ),
-	'revisiontimestamp'   => array( '1', 'طابع_وقت_النسخة', 'طابع_وقت_نسخة', 'REVISIONTIMESTAMP' ),
-	'plural'              => array( '0', 'جمع:', 'PLURAL:' ),
-	'fullurl'             => array( '0', 'عنوان_كامل:', 'FULLURL:' ),
-	'fullurle'            => array( '0', 'مسار_كامل:', 'FULLURLE:' ),
-	'lcfirst'             => array( '0', 'عنوان_كبير:', 'LCFIRST:' ),
-	'ucfirst'             => array( '0', 'عنوان_صغير:', 'UCFIRST:' ),
-	'lc'                  => array( '0', 'صغير:', 'LC:' ),
-	'uc'                  => array( '0', 'كبير:', 'UC:' ),
-	'raw'                 => array( '0', 'خام:', 'RAW:' ),
-	'displaytitle'        => array( '1', 'عرض_العنوان', 'عرض_عنوان', 'DISPLAYTITLE' ),
-	'rawsuffix'           => array( '1', 'أر', 'آر', 'R' ),
-	'newsectionlink'      => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
-	'currentversion'      => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
-	'urlencode'           => array( '0', 'كود_المسار:', 'كود_مسار:', 'URLENCODE:' ),
-	'anchorencode'        => array( '0', 'كود_الأنكور', 'كود_أنكور', 'ANCHORENCODE' ),
-	'currenttimestamp'    => array( '1', 'طابع_الوقت_الحالي', 'طابع_وقت_حالي', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'      => array( '1', 'طابع_الوقت_المحلى', 'طابع_وقت_محلى', 'LOCALTIMESTAMP' ),
-	'directionmark'       => array( '1', 'علامة_الاتجاه', 'علامة_اتجاه', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'            => array( '0', '#لغة:', '#LANGUAGE:' ),
-	'contentlanguage'     => array( '1', 'لغة_المحتوى', 'لغة_محتوى', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'    => array( '1', 'ص�حات_�ي_نطاق:', 'ص�حات_�ي_نط:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'      => array( '1', 'عدد_الإداريين', 'عدد_إداريين', 'NUMBEROFADMINS' ),
-	'formatnum'           => array( '0', 'صيغة_رقم', 'FORMATNUM' ),
-	'padleft'             => array( '0', 'باد_يسار', 'PADLEFT' ),
-	'padright'            => array( '0', 'باد_يمين', 'PADRIGHT' ),
-	'special'             => array( '0', 'خاص', 'special' ),
-	'defaultsort'         => array( '1', 'ترتيب_قياسى:', 'ترتيب_ا�تراضى:', 'م�تاح_ترتيب_قياسى:', 'م�تاح_ترتيب_ا�تراضى:', 'ترتيب_تصني�_قياسى:', 'ترتيب_تصني�_ا�تراضى:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'            => array( '0', 'مسار_المل�:', 'مسار_مل�:', 'FILEPATH:' ),
-	'tag'                 => array( '0', 'وسم', 'tag' ),
-	'hiddencat'           => array( '1', '__تصني�_مخ�ي__', '__HIDDENCAT__' ),
-	'pagesincategory'     => array( '1', 'ص�حات_�ي_التصني�', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'            => array( '1', 'حجم_الص�حة', 'حجم_ص�حة', 'PAGESIZE' ),
-	'staticredirect'      => array( '1', '__تحويلة_إستاتيكية__', '__تحويلة_ساكنة__', '__STATICREDIRECT__' ),
-);
-
-$skinNames = array(
-	'standard'    => 'كلاسيك',
-	'nostalgia'   => 'نوستالجيا',
-	'cologneblue' => 'كولون بلو',
-	'monobook'    => 'مونوبوك',
-	'myskin'      => 'ماى سكين',
-	'chick'       => 'تشيك',
-	'simple'      => 'سيمبل',
-	'modern'      => 'مودرن',
+	'redirect'              => array( '0', '#تحويل', '#تحويل', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__لا�هرس__', '__لا�هرس__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__لامعرض__', '__لامعرض__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__لصق_�هرس__', '__لصق_�هرس__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__�هرس__', '__�هرس__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__لاتحريرقسم__', '__لاتحريرقسم__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__لاعنوان__', '__لاعنوان__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', 'شهر_حالى', 'شهر', 'شهر_حالي', 'شهر', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'اسم_الشهر_الحالى', 'اسم_شهر_حالى', 'اسم_شهر', 'اسم_الشهر_الحالي', 'اسم_شهر_حالي', 'اسم_شهر', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'اسم_الشهر_الحالى_المولد', 'اسم_شهر_حالى_مولد', 'اسم_الشهر_الحالي_المولد', 'اسم_شهر_حالي_مولد', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'اختصار_الشهر_الحالى', 'اختصار_شهر_حالى', 'اختصار_الشهر_الحالي', 'اختصار_شهر_حالي', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'يوم_حالى', 'يوم', 'يوم_حالي', 'يوم', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'يوم_حالى2', 'يوم2', 'يوم_حالي2', 'يوم2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'اسم_اليوم_الحالى', 'اسم_يوم_حالى', 'اسم_يوم', 'اسم_اليوم_الحالي', 'اسم_يوم_حالي', 'اسم_يوم', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'عام_حالى', 'عام', 'عام_حالي', 'عام', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'وقت_حالى', 'وقت', 'وقت_حالي', 'وقت', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'ساعة_حالية', 'ساعة', 'ساعة_حالية', 'ساعة', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'شهر_محلى', 'شهر_محلي', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'اسم_الشهر_المحلى', 'اسم_شهر_محلى', 'اسم_الشهر_المحلي', 'اسم_شهر_محلي', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'اسم_الشهر_المحلى_المولد', 'اسم_شهر_محلى_مولد', 'اسم_الشهر_المحلي_المولد', 'اسم_شهر_محلي_مولد', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'اختصار_الشهر_المحلى', 'اختصار_شهر_محلى', 'اختصار_الشهر_المحلي', 'اختصار_شهر_محلي', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'يوم_محلى', 'يوم_محلي', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'يوم_محلى2', 'يوم_محلي2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'اسم_اليوم_المحلى', 'اسم_يوم_محلى', 'اسم_اليوم_المحلي', 'اسم_يوم_محلي', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'عام_محلى', 'عام_محلي', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'وقت_محلى', 'وقت_محلي', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'ساعة_محلية', 'ساعة_محلية', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'عدد_الص�حات', 'عدد_ص�حات', 'عدد_الص�حات', 'عدد_ص�حات', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'عدد_المقالات', 'عدد_مقالات', 'عدد_المقالات', 'عدد_مقالات', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'عدد_المل�ات', 'عدد_مل�ات', 'عدد_المل�ات', 'عدد_مل�ات', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'عدد_المستخدمين', 'عدد_مستخدمين', 'عدد_المستخدمين', 'عدد_مستخدمين', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'عدد_التعديلات', 'عدد_تعديلات', 'عدد_التعديلات', 'عدد_تعديلات', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'عدد_المشاهدات', 'عدد_مشاهدات', 'عدد_المشاهدات', 'عدد_مشاهدات', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', 'اسم_الص�حة', 'اسم_ص�حة', 'اسم_الص�حة', 'اسم_ص�حة', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'عنوان_الص�حة', 'عنوان_ص�حة', 'عنوان_الص�حة', 'عنوان_ص�حة', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'نطاق', 'نطاق', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'عنوان_نطاق', 'عنوان_نطاق', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'نطاق_النقاش', 'نطاق_نقاش', 'نطاق_النقاش', 'نطاق_نقاش', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'عنوان_النقاش', 'عنوان_نقاش', 'عنوان_النقاش', 'عنوان_نقاش', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'اسم_الص�حة_الكامل', 'اسم_ص�حة_كامل', 'اسم_كامل', 'اسم_الص�حة_الكامل', 'اسم_ص�حة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'عنوان_الص�حة_الكامل', 'عنوان_ص�حة_كامل', 'عنوان_كامل', 'عنوان_الص�حة_الكامل', 'عنوان_ص�حة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'اسم_الص�حة_ال�رعي', 'اسم_ص�حة_�رعي', 'اسم_الص�حة_ال�رعي', 'اسم_ص�حة_�رعي', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'عنوان_الص�حة_ال�رعى', 'عنوان_ص�حة_�رعى', 'عنوان_الص�حة_ال�رعي', 'عنوان_ص�حة_�رعي', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'اسم_الص�حة_الأساسى', 'اسم_ص�حة_أساسى', 'اسم_الص�حة_الأساسي', 'اسم_ص�حة_أساسي', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'عنوان_الص�حة_الأساسى', 'عنوان_ص�حة_أساسى', 'عنوان_الص�حة_الأساسي', 'عنوان_ص�حة_أساسي', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'اسم_ص�حة_النقاش', 'اسم_ص�حة_نقاش', 'اسم_ص�حة_النقاش', 'اسم_ص�حة_نقاش', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'عنوان_ص�حة_النقاش', 'عنوان_ص�حة_نقاش', 'عنوان_ص�حة_النقاش', 'عنوان_ص�حة_نقاش', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'اسم_ص�حة_الموضوع', 'اسم_ص�حة_المقالة', 'اسم_ص�حة_الموضوع', 'اسم_ص�حة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'عنوان_ص�حة_الموضوع', 'عنوان_ص�حة_المقالة', 'عنوان_ص�حة_الموضوع', 'عنوان_ص�حة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'رسالة:', 'رسالة:', 'MSG:' ),
+	'subst'                 => array( '0', 'نسخ:', 'إحلال:', 'نسخ:', 'إحلال:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'مصدر:', 'مصدر_قالب:', 'مصدر:', 'مصدر_قالب:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'تصغير', 'تصغير', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'تصغير=$1', 'تصغير=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'يمين', 'يمين', 'right' ),
+	'img_left'              => array( '1', 'يسار', 'يسار', 'left' ),
+	'img_none'              => array( '1', 'بدون', 'بلا', 'بدون', 'بلا', 'none' ),
+	'img_width'             => array( '1', '$1بك', '$1بك', '$1عن', '$1px' ),
+	'img_center'            => array( '1', 'مركز', 'مركز', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'إطار', 'إطار', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'لاإطار', 'لاإطار', 'frameless' ),
+	'img_page'              => array( '1', 'ص�حة=$1', 'ص�حة $1', 'ص�حة=$1', 'ص�حة $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'معدول', 'معدول=$1', 'معدول $1', 'معدول', 'معدول=$1', 'معدول $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'حد', 'حدود', 'حد', 'حدود', 'border' ),
+	'img_baseline'          => array( '1', 'خط_أساسى', 'خط_أساسي', 'baseline' ),
+	'img_sub'               => array( '1', '�رعى', '�رعي', 'sub' ),
+	'img_super'             => array( '1', 'سوبر', 'سب', 'سوبر', 'سب', 'super', 'sup' ),
+	'img_top'               => array( '1', 'أعلى', 'أعلى', 'top' ),
+	'img_text_top'          => array( '1', 'نص_أعلى', 'نص_أعلى', 'text-top' ),
+	'img_middle'            => array( '1', 'وسط', 'وسط', 'middle' ),
+	'img_bottom'            => array( '1', 'أس�ل', 'أس�ل', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'نص_أس�ل', 'نص_أس�ل', 'text-bottom' ),
+	'img_link'              => array( '1', 'وصلة=$1', 'رابط=$1', 'وصلة=$1', 'رابط=$1', 'link=$1' ),
+	'img_alt'               => array( '1', 'بديل=$1', 'بديل=$1', 'alt=$1' ),
+	'int'                   => array( '0', 'محتوى:', 'محتوى:', 'INT:' ),
+	'sitename'              => array( '1', 'اسم_الموقع', 'اسم_موقع', 'اسم_الموقع', 'اسم_موقع', 'SITENAME' ),
+	'ns'                    => array( '0', 'نط:', 'نط:', 'NS:' ),
+	'localurl'              => array( '0', 'مسار_محلى:', 'مسار_محلي:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'عنوان_المسار_المحلى:', 'عنوان_مسار_محلى:', 'عنوان_المسار_المحلي:', 'عنوان_مسار_محلي:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'خادم', 'خادم', 'SERVER' ),
+	'servername'            => array( '0', 'اسم_الخادم', 'اسم_خادم', 'اسم_الخادم', 'اسم_خادم', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'مسار_السكريبت', 'مسار_سكريبت', 'مسار_السكريبت', 'مسار_سكريبت', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'قواعد_اللغة:', 'قواعد_لغة:', 'قواعد_اللغة:', 'قواعد_لغة:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__لاتحويل_عنوان__', '__لاتع__', '__لاتحويل_عنوان__', '__لاتع__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__لاتحويل_محتوى__', '__لاتم__', '__لاتحويل_محتوى__', '__لاتم__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'أسبوع_حالى', 'أسبوع', 'أسبوع_حالي', 'أسبوع', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'يوم_حالى_مأ', 'يوم_حالي_مأ', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'أسبوع_محلى', 'أسبوع_محلي', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'يوم_محلى_مأ', 'يوم_محلي_مأ', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'رقم_النسخة', 'رقم_نسخة', 'رقم_النسخة', 'رقم_نسخة', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'يوم_النسخة', 'يوم_نسخة', 'يوم_النسخة', 'يوم_نسخة', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'يوم_النسخة2', 'يوم_نسخة2', 'يوم_النسخة2', 'يوم_نسخة2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'شهر_النسخة', 'شهر_نسخة', 'شهر_النسخة', 'شهر_نسخة', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'عام_النسخة', 'عام_نسخة', 'عام_النسخة', 'عام_نسخة', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'طابع_وقت_النسخة', 'طابع_وقت_نسخة', 'طابع_وقت_النسخة', 'طابع_وقت_نسخة', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'جمع:', 'جمع:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'عنوان_كامل:', 'عنوان_كامل:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'مسار_كامل:', 'مسار_كامل:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'عنوان_كبير:', 'عنوان_كبير:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'عنوان_صغير:', 'عنوان_صغير:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'صغير:', 'صغير:', 'LC:' ),
+	'uc'                    => array( '0', 'كبير:', 'كبير:', 'UC:' ),
+	'raw'                   => array( '0', 'خام:', 'خام:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'عرض_العنوان', 'عرض_عنوان', 'عرض_العنوان', 'عرض_عنوان', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', 'أر', 'آر', 'أر', 'آر', 'R' ),
+	'newsectionlink'        => array( '1', '__وصلة_قسم_جديد__', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'نسخة_حالية', 'نسخة_حالية', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'كود_المسار:', 'كود_مسار:', 'كود_المسار:', 'كود_مسار:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'كود_الأنكور', 'كود_أنكور', 'كود_الأنكور', 'كود_أنكور', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'طابع_الوقت_الحالي', 'طابع_وقت_حالي', 'طابع_الوقت_الحالي', 'طابع_وقت_حالي', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'طابع_الوقت_المحلى', 'طابع_وقت_محلى', 'طابع_الوقت_المحلي', 'طابع_وقت_محلي', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'علامة_الاتجاه', 'علامة_اتجاه', 'علامة_الاتجاه', 'علامة_اتجاه', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#لغة:', '#لغة:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'لغة_المحتوى', 'لغة_محتوى', 'لغة_المحتوى', 'لغة_محتوى', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'ص�حات_�ى_نطاق:', 'ص�حات_�ى_نط:', 'ص�حات_�ي_نطاق:', 'ص�حات_�ي_نط:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'عدد_الإداريين', 'عدد_إداريين', 'عدد_الإداريين', 'عدد_إداريين', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'صيغة_رقم', 'صيغة_رقم', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'باد_يسار', 'باد_يسار', 'PADLEFT' ),
+	'padright'              => array( '0', 'باد_يمين', 'باد_يمين', 'PADRIGHT' ),
+	'special'               => array( '0', 'خاص', 'خاص', 'special' ),
+	'defaultsort'           => array( '1', 'ترتيب_قياسى:', 'ترتيب_ا�تراضى:', 'م�تاح_ترتيب_قياسى:', 'م�تاح_ترتيب_ا�تراضى:', 'ترتيب_تصني�_قياسى:', 'ترتيب_تصني�_ا�تراضى:', 'ترتيب_قياسي:', 'ترتيب_ا�تراضي:', 'م�تاح_ترتيب_قياسي:', 'م�تاح_ترتيب_ا�تراضي:', 'ترتيب_تصني�_قياسي:', 'ترتيب_تصني�_ا�تراضي:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'مسار_المل�:', 'مسار_مل�:', 'مسار_المل�:', 'مسار_مل�:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'وسم', 'وسم', 'tag' ),
+	'hiddencat'             => array( '1', '__تصني�_مخ�ى__', '__تصني�_مخ�ي__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'ص�حات_�ى_التصني�', 'ص�حات �ي التصني�', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'حجم_الص�حة', 'حجم_ص�حة', 'حجم_الص�حة', 'حجم_ص�حة', 'PAGESIZE' ),
+	'index'                 => array( '1', '__�هرسة__', '__�هرسة__', '__INDEX__' ),
+	'noindex'               => array( '1', '__لا�هرسة__', '__لا�هرسة__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'عدد_�ى_المجموعة', 'عدد_�ى_مجموعة', 'عدد_�ي_المجموعة', 'عدد_�ي_مجموعة', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__تحويلة_إستاتيكية__', '__تحويلة_ساكنة__', '__تحويلة_إستاتيكية__', '__تحويلة_ساكنة__', '__STATICREDIRECT__' ),
 );
 
 $specialPageAliases = array(
@@ -187,7 +199,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'قايمة_المراقبة' ),
 	'Recentchanges'             => array( 'أحدث_التغييرات' ),
 	'Upload'                    => array( 'ر�ع' ),
-	'Imagelist'                 => array( 'قايمة_الصور' ),
+	'Listfiles'                 => array( 'قايمة_الصور' ),
 	'Newimages'                 => array( 'صور_جديدة' ),
 	'Listusers'                 => array( 'عرض_المستخدمين', 'قايمة_المستخدمين' ),
 	'Listgrouprights'           => array( 'عرض_صلاحيات_المجموعات' ),
@@ -202,12 +214,13 @@ $specialPageAliases = array(
 	'Unusedimages'              => array( 'صور_غير_مستخدمة' ),
 	'Wantedpages'               => array( 'ص�حات_مطلوبة', 'وصلات_مكسورة' ),
 	'Wantedcategories'          => array( 'تصني�ات_مطلوبة' ),
-	'Missingfiles'              => array( 'مل�ات_م�قودة', 'صور_م�قودة' ),
+	'Wantedfiles'               => array( 'مل�ات_مطلوبة' ),
+	'Wantedtemplates'           => array( 'قوالب_مطلوبة' ),
 	'Mostlinked'                => array( 'الأكثر_وصلا' ),
 	'Mostlinkedcategories'      => array( 'أكثر_التصني�ات_وصلا', 'أكثر_التصني�ات_استخداما' ),
 	'Mostlinkedtemplates'       => array( 'أكثر_القوالب_وصلا', 'أكثر_القوالب_استخداما' ),
-	'Mostcategories'            => array( 'أكثر_التصني�ات' ),
 	'Mostimages'                => array( 'أكثر_الصور' ),
+	'Mostcategories'            => array( 'أكثر_التصني�ات' ),
 	'Mostrevisions'             => array( 'أكثر_المراجعات' ),
 	'Fewestrevisions'           => array( 'أقل_المراجعات' ),
 	'Shortpages'                => array( 'ص�حات_قصيرة' ),
@@ -260,6 +273,8 @@ $specialPageAliases = array(
 	'Filepath'                  => array( 'مسار_مل�' ),
 	'Invalidateemail'           => array( 'تعطيل_البريد_الإلكترونى' ),
 	'Blankpage'                 => array( 'ص�حة_�ارغة' ),
+	'LinkSearch'                => array( 'بحث_الوصلات' ),
+	'DeletedContributions'      => array( 'مساهمات_محذو�ة' ),
 );
 
 $messages = array(
@@ -300,17 +315,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'خبى التعديلات بتاعتى من لستة المراقبة',
 'tog-watchlisthidebots'       => 'خبى التعديلات بتاعة البوت من لستة المراقبة',
 'tog-watchlisthideminor'      => 'خبى التعديلات البسيطة من لستة المراقبة',
+'tog-watchlisthideliu'        => 'خبى التعديلات بتاعة اليوزرز المتسجل دخولهم دلوقتى من لستة المراقبة',
+'tog-watchlisthideanons'      => 'خبى التعديلات بتاعة اليوزرز المجهولين من لستة المراقبة',
 'tog-nolangconversion'        => 'عطل تحويل اللهجات',
 'tog-ccmeonemails'            => 'ابعتلى  نسخ من رسايل الايميل اللى بابعتها لليوزرز التانيين',
 'tog-diffonly'                => 'ما تبين ش محتوى الص�حة تحت ال�روقات',
 'tog-showhiddencats'          => 'بين التّصني�ات المستخبية',
+'tog-noconvertlink'           => 'عطل تحويل عناوين الوصلات',
+'tog-norollbackdiff'          => 'الغى الاختلا�ات بعد ما تعمل الرول باك',
 
 'underline-always'  => 'دايما',
 'underline-never'   => 'ابدا',
 'underline-default' => 'على حسب إعدادات المتص�ح',
 
-'skinpreview' => '(عرض)',
-
 # Dates
 'sunday'        => 'الحد',
 'monday'        => 'الاتنين',
@@ -403,8 +420,8 @@ $messages = array(
 'mypage'         => 'ص�حتى',
 'mytalk'         => 'مناقشاتى',
 'anontalk'       => 'المناقشة مع عنوان الأيبى دا',
-'navigation'     => 'ابحار',
-'and'            => 'Ùˆ',
+'navigation'     => 'إستكشا�',
+'and'            => '&#32;Ùˆ',
 
 # Metadata in edit box
 'metadata_help' => 'ميتا داتا:',
@@ -441,14 +458,14 @@ $messages = array(
 'talkpagelinktext'  => 'مناقشه',
 'specialpage'       => 'ص�حة مخصوصة',
 'personaltools'     => 'ادوات شخصيه',
-'postcomment'       => 'ابعت تعليق',
+'postcomment'       => 'قسم جديد',
 'articlepage'       => 'بين ص�حة المحتوى',
 'talk'              => 'مناقشه',
 'views'             => 'مشاهده',
 'toolbox'           => 'علبة العده',
 'userpage'          => 'عرض ص�حة اليوزر',
 'projectpage'       => 'عرض ص�حة المشروع',
-'imagepage'         => 'عرض ص�حة الميديا',
+'imagepage'         => 'عرض ص�حة المل�',
 'mediawikipage'     => 'عرض ص�حة الرسالة',
 'templatepage'      => 'عرض ص�حة القالب',
 'viewhelppage'      => 'بين ص�حة المساعدة',
@@ -467,13 +484,11 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'عن {{SITENAME}}',
 'aboutpage'            => 'Project:معلومات عن',
-'bugreports'           => 'بلاغ الاخطاء',
-'bugreportspage'       => 'Project:تبليغ اخطاء',
 'copyright'            => 'المحتوى موجود تحت $1.',
 'copyrightpagename'    => 'حقوق النسخ �ى {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:حقوق النسخ',
-'currentevents'        => 'الاحداث دلوقتى',
-'currentevents-url'    => 'Project:الاحداث دلوقتى',
+'currentevents'        => 'الاخبار دلوقتى',
+'currentevents-url'    => 'Project:الاخبار دلوقتى',
 'disclaimers'          => 'اخلاء مسؤوليه',
 'disclaimerpage'       => 'Project:اخلاء مسؤوليه عمومى',
 'edithelp'             => 'مساعده �ى التعديل',
@@ -491,9 +506,7 @@ $messages = array(
 
 'badaccess'        => 'غلطه �ى السماح',
 'badaccess-group0' => 'انت مش مسموح لك تن�ذ الطلب بتاعك',
-'badaccess-group1' => 'ال�عل االلى طلبته مسموح بس لليوزرز �ى المجموعة $1.',
-'badaccess-group2' => 'ال�عل اللى طلبته مسموح بس لليوزرز �ى واحدة من المجموعات $1.',
-'badaccess-groups' => 'ال�عل الذى طلبته مسموح بيه بس لليوزرز  اللى �ى واحدة من المجموعات دى  $1.',
+'badaccess-groups' => 'ال�عل اللى طلبته مسموح بيه بس لليوزرز اللى �ى {{PLURAL:$2|المجموعة|واحده من المجموعات}}: $1.',
 
 'versionrequired'     => 'لازم نسخة $1 من ميدياويكي',
 'versionrequiredtext' => 'النسخة $1 من ميدياويكى لازم علشان تستعمل الص�حة دى.
@@ -508,6 +521,8 @@ $messages = array(
 'editsection'             => 'تعديل',
 'editold'                 => 'تعديل',
 'viewsourceold'           => 'عرض المصدر',
+'editlink'                => 'عدل',
+'viewsourcelink'          => 'عرض المصدر',
 'editsectionhint'         => 'تعديل جزء : $1',
 'toc'                     => 'المحتويات',
 'showtoc'                 => 'عرض',
@@ -522,13 +537,13 @@ $messages = array(
 'site-atom-feed'          => '$1 اتوم �ييد',
 'page-rss-feed'           => '"$1" ار‌ اس‌ اس �ييد',
 'page-atom-feed'          => '"$1" �ييد أتوم',
-'red-link-title'          => '$1 (لسة ما اتكتبت ش )',
+'red-link-title'          => '$1 (الص�حه مالهاش وجود)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ص�حة',
 'nstab-user'      => 'ص�حة يوزر',
 'nstab-media'     => 'ص�حة ميديا',
-'nstab-special'   => 'مخصوص',
+'nstab-special'   => 'ص�حه مخصوصه',
 'nstab-project'   => 'ص�حة مشروع',
 'nstab-image'     => '�ايل',
 'nstab-mediawiki' => 'رساله',
@@ -538,7 +553,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'ما�يش �عل زى كده',
-'nosuchactiontext'  => 'الويكى ما تعر�تش على الامر �ى ال URL',
+'nosuchactiontext'  => 'العمليه المتحدده �ى الـ URL مش صحيحه.
+ممكن تكون غلطت و انتا بتكتب الـ URL, او دوست على لينك مش مضبوطه.
+دا ممكن كمان يكون بيعنى انه �يه باج �ى الـ {{SITENAME}}.',
 'nosuchspecialpage' => 'ما�يش ص�حة خاصة بالاسم ده',
 'nospecialpagetext' => "<big>'''انت طلبت ص�حة مخصوصة مش صحيحة.'''</big>
 
@@ -592,7 +609,6 @@ $1',
 'cannotdelete'         => 'ما قدرناش نمسح الص�حة أو المل� المطلوب. (ممكن يكون حد تانى مسحه. )',
 'badtitle'             => 'عنوان غلط',
 'badtitletext'         => 'عنوان الص�حه المطلوب اما مش صحيح او �اضي، و ربما الوصلة بين اللغات أو بين المشاريع غلط. وممكن وجود رموز ماتصلحش للاستخدام �ى العناوين.',
-'perfdisabled'         => 'متأس�ين!  الخاصية دى اتعطلت بشكل مؤقت لأنها بتبطئ قاعدة البيانات لدرجة ان ما�يش حد ممكن يستخدم الويكي.',
 'perfcached'           => 'البيانات دى متخبية و ممكن ما تكونش متحدثة.',
 'perfcachedts'         => 'البيانات دى متخبية، آخر تحديث ليها كان �ى $1.',
 'querypage-no-updates' => 'التحديثات بتاعةالص�حة دى متعطلة دلوقتي. البيانات اللى هنا مش ح تتحدث �ى الوقت الحاضر.',
@@ -616,14 +632,14 @@ $2',
 'titleprotected'       => "العنوان دا محمى من الإنشاء بـ[[User:$1|$1]]. السبب هو ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'غلطه : ماسح �يروسات مش معرو�: <i>$1</i>',
+'virus-badscanner'     => "غلطه : ماسح �يروسات مش معرو�: ''$1''",
 'virus-scanfailed'     => 'المسح �شل(كود $1)',
 'virus-unknownscanner' => 'انتى �يروس مش معرو�:',
 
 # Login and logout pages
 'logouttitle'                => 'خروج اليوزر',
-'logouttext'                 => '<strong>أنت دلوقتى مش مسجل دخولك.</strong><br />
-تقدر تكمل استعمال {{SITENAME}} على انك مجهول، أو الدخول مرة تانية بن�س الاسم أو باسم تاني. ممكن تشو� بعض الص�حات  كأنك متسجل ، و دا علشان استعمال الص�حات المتخبية �ى المتص�ح بتاعك.',
+'logouttext'                 => "'''أنت دلوقتى مش مسجل دخولك.'''<br />
+تقدر تكمل استعمال {{SITENAME}} على انك مجهول، أو الدخول مرة تانية بن�س الاسم أو باسم تاني. ممكن تشو� بعض الص�حات  كأنك متسجل ، و دا علشان استعمال الص�حات المتخبية �ى المتص�ح بتاعك.",
 'welcomecreation'            => '== اهلاً و سهلاً يا $1! ==
 ات�تحلك حساب.
 ما تنساش تغير ت�ضيلاتك �ى {{SITENAME}}.',
@@ -634,7 +650,6 @@ $2',
 'remembermypassword'         => 'ا�تكر بيانات دخولى على  الكمبيوتر ده',
 'yourdomainname'             => 'النطاق بتاعك:',
 'externaldberror'            => 'يا إما �ى حاجة غلط �ى الدخول على قاعدة البيانات الخارجية أو انت مش مسموح لك تعمل تحديث لحسابك الخارجي.',
-'loginproblem'               => '<b>حصلت مشكلة وانت بتسجل دخولك.</b><br />لو سمحت تحاول مرة تانية!',
 'login'                      => 'دخول',
 'nav-login-createaccount'    => 'دخول / �تح حساب',
 'loginprompt'                => 'لازم تكون الكوكيز عندك م�عله علشان تقدر تدخل ل {{SITENAME}}.',
@@ -661,11 +676,11 @@ $2',
 'yournick'                   => 'الإمضا:',
 'badsig'                     => 'الامضا الخام بتاعتك مش صح.
 اتإكد من التاجز بتاعة الHTML.',
-'badsiglength'               => 'الإمضا بتاعتك طويلة جدا.
-لازم تكون اقل من $1 {{PLURAL:$1|حر�|حرو�}}.',
+'badsiglength'               => 'الامضا بتاعتك اطول م اللازم.
+لازم تكون اصغر من$1 {{PLURAL:$1|حر�|حر�}}.',
 'email'                      => 'الإيميل',
 'prefs-help-realname'        => 'الاسم الحقيقى اختيارى.
-ولو اخترت تعرض اسمك هنا هايستخدم �ى الإشارة لمساهماتك.',
+ولو اخترت تعرض اسمك هنا هايستخدم �ى الإشارة لتعديلاتك.',
 'loginerror'                 => 'غلط �ى الدخول',
 'prefs-help-email'           => 'عنوان البريد الإلكترونى اختيارى، لكن يسمح بأن يتم إرسال كلمة السر الخاصة بك إليك لو نسيتها.
 ممكن كمان تخلى اليوزرز التانيين يقدروا يتصلوا بيك  �ى ص�حتك او ص�ة المناقشة بتاعتك من غير ما يعر�و  انت مين.',
@@ -679,9 +694,10 @@ $2',
 لو سمحت تخليها تشتغل و بعدين حاول مرة تانية.',
 'noname'                     => 'انت ما حددتش اسم يوزر صحيح.',
 'loginsuccesstitle'          => 'تم الدخول بشكل صحيح',
-'loginsuccess'               => "'''تم تسجيل دخولك{{SITENAME}} باسم \"\$1\".'''",
-'nosuchuser'                 => 'ما�يش يوزر باسم "$1".
-اتاكد من تهجية الاسم، او [[Special:UserLogin/signup|ا�تح حساب جديد]].',
+'loginsuccess'               => "'''دخولك   {{SITENAME}} إتسجل بإسم \"\$1\".'''",
+'nosuchuser'                 => 'ما�يش يوزر اسمه "$1".
+اسامى اليوزر بتبقى حساسه لحالة الحر�.
+اتأكد من التهجيه, او [[Special:UserLogin/signup|ا�تح حساب جديد]].',
 'nosuchusershort'            => 'ما�يش يوزر باسم <nowiki>$1</nowiki>".
 اتاكد من تهجية الاسم.',
 'nouserspecified'            => 'لازم تحدد اسم يوزر.',
@@ -692,12 +708,11 @@ $2',
 لازم مايقلش طول الكلمه عن {{PLURAL:$1|1 حر�|$1 حر�}} وتكون مختل�ه عن اسم اليوزر بتاعك.',
 'mailmypassword'             => 'ابعتلى كلمة سر جديدة',
 'passwordremindertitle'      => 'كلمة سر مؤقته جديده ل {{SITENAME}}',
-'passwordremindertext'       => '�يه شخص ما (غالبا انت، من عنوان الاى بى $1)
-طلب كلمة سر جديده لـ{{SITENAME}} ($4).
-كلمة سر مؤقتة لليوزر "$2" تم إنشاؤها و ضبطها إلى "$3".
-لو إن ده هوه اللى إنت عايزه، عليك انك تسجل الدخول و تختار كلمة سر جديدة دلوقتى.
-
-لو إن حد تانى هوه اللى عمل الطلب ده، أو انك ا�تكرت كلمة السر بتاعتك، ومش عايز تغيرها، ممكن تتجاهل الرساله دى وتستمر �ى استخدام كلمة السر القديمة بتاعتك.',
+'passwordremindertext'       => '�يه واحد(غالبا انت، من عنوان الاى بى $1)
+طلب باسورد جديده لـ{{SITENAME}} ($4).
+�ى باسورد مؤقتة لليوزر "$2" اتعملت و و اتظبطت لـ "$3".
+لو هوه دا اللى إنت عايزه، لازم تسجل دخولك و تختار باسورد جديده دلوقتي.
+اما لو كان �ى حد تانى هوه اللى عمل الطلب ده، أو انك ا�تكرت الباسورد بتاعتك، وخلاص مش عايز تغيرها، ممكن تتجاهل الرساله دى وتستمر �ى استخدام الباسورد القديمة بتاعتك.',
 'noemail'                    => 'ما�يش ايميل متسجل  لليوزر  "$1".',
 'passwordsent'               => 'تم إرسال كلمة سر جديدة لعنوان الايميل المتسجل لليوزر "$1".
 من �ضلك حاول تسجيل الدخول مره تانيه بعد استلامها.',
@@ -708,8 +723,9 @@ $2',
 علشان منع التخريب، ح ن�كرك مرة و احدة بس كل
 {{PLURAL:$1|ساعة|$1 ساعة}}.',
 'mailerror'                  => 'غلط �ى بعتان الايميل : $1',
-'acct_creation_throttle_hit' => 'متأس�ين، انت عندك $1 حساب. مش ممكن ن�تح واحد تاني.',
-'emailauthenticated'         => 'اتأكدنا من الايميل بتاعك  �ى $1.',
+'acct_creation_throttle_hit' => 'الناس اللى دخلت ع الويكى دا باستعمال عنوان الاى بى بتاعك �تحو {{PLURAL:$1|1 حساب|$1 حساب}} � اليوم اللى �ات دا, يعنى وصلو للحد الاقصى المسموح بيه �ى ال�ترة الزمنيه المحدده..
+و عشان كدا, الزوار اللى بيدخلو بعنوان الاى بى دا مش مسموح لهم ي�تحو حسابات اكتر �ى الوقت الحالى .',
+'emailauthenticated'         => 'اتأكدنا من الايميل بتاعك �ى $2 الساعة $3.',
 'emailnotauthenticated'      => 'لسة ما اتكدناش من الايميل بتاعك.
 مش ح يتبعتلك اى  ايميلات بخصوص الميزات دي.',
 'noemailprefs'               => 'علشان الخصايص دى تشتغل لازم تحددلك عنوان ايميل.',
@@ -722,18 +738,27 @@ $2',
 'createaccount-text'         => '�ى واحد �تح حساب باسم الايمل بتاعك على {{SITENAME}} ($4) بالاسم "$2"، وبباسورد "$3". لازم تسجل دخولك دلوقتى و تغير الباسورد بتاعتك.
 
 لو سمحت تتجاهل الرسالة دى اذا الحساب دا ات�تحلك بالغلط.',
+'login-throttled'            => 'انت عملت  محاولات كتيره حديثة على كلمة سر الحساب ده.
+من �ضلك استنى قبل المحاولة مرة تانيه.',
 'loginlanguagelabel'         => 'اللغة: $1',
 
 # Password reset dialog
-'resetpass'               => 'غير الباسورد بتاعة الحساب',
-'resetpass_announce'      => 'اتسجل دخولك دلوقتى بالكود اللى اتبعتلك �ى الايميل. علشان تخلص عملية الدخول ،لازم تعملك باسورد جديدة هنا:',
-'resetpass_text'          => '<!-- أض� نصا هنا -->',
-'resetpass_header'        => 'غيّر الباسورد بتاعة الحساب',
-'resetpass_submit'        => 'اظبط الباسورد و ادخل',
-'resetpass_success'       => 'الباسورد بتاعتك اتغيرت بنجاح! دلوقتى  بنسجل دخولك...',
-'resetpass_bad_temporary' => 'الباسورد المؤقتة دى غلط. يمكن الباسورد الاصلية تكون اتغيرت بنحاح أو يمكن انت كنت طلبت باسورد مؤقتة جديدة.',
-'resetpass_forbidden'     => 'مش ممكن تغيير الباسورد',
-'resetpass_missing'       => 'ما�يش اى بيانات.',
+'resetpass'                 => 'غيّر الباسورد',
+'resetpass_announce'        => 'اتسجل دخولك دلوقتى بالكود اللى اتبعتلك �ى الايميل. علشان تخلص عملية الدخول ،لازم تعملك باسورد جديدة هنا:',
+'resetpass_text'            => '<!-- أض� نصا هنا -->',
+'resetpass_header'          => 'غيّر الباسورد بتاعة الحساب',
+'oldpassword'               => 'الباسورد القديمة:',
+'newpassword'               => 'الباسورد جديدة:',
+'retypenew'                 => 'اكتب الباسورد الجديده تانى:',
+'resetpass_submit'          => 'اظبط الباسورد و ادخل',
+'resetpass_success'         => 'الباسورد بتاعتك اتغيرت بنجاح! دلوقتى  بنسجل دخولك...',
+'resetpass_bad_temporary'   => 'الباسورد المؤقتة دى غلط. يمكن الباسورد الاصلية تكون اتغيرت بنحاح أو يمكن انت كنت طلبت باسورد مؤقتة جديدة.',
+'resetpass_forbidden'       => 'مش ممكن تغيير الباسورد',
+'resetpass-no-info'         => 'لازم تسجل دخولك علشان تقدر توصل للص�حة دى على طول.',
+'resetpass-submit-loggedin' => 'غير الباسورد',
+'resetpass-wrong-oldpass'   => 'الباسورد الحالية او المؤقته مش صحيحة. 
+انتا ممكن تكون بال�عل غيرت الباسورد بتاعتك بنجاح يا إما تكون طلبت باسورد مؤقته جديدة..',
+'resetpass-temp-password'   => 'باسورد مؤقته:',
 
 # Edit page toolbar
 'bold_sample'     => 'حرو� عريضه',
@@ -756,8 +781,8 @@ $2',
 'hr_tip'          => 'خط ا�قى (ما تستعملهموش كتير)',
 
 # Edit pages
-'summary'                          => 'ملخص',
-'subject'                          => 'راس الموضوع/موضوع',
+'summary'                          => 'ملخص:',
+'subject'                          => 'راس الموضوع/موضوع:',
 'minoredit'                        => 'التعديل ده تعديل صغير',
 'watchthis'                        => 'راقب الص�حه دى',
 'savearticle'                      => 'سيي� الص�حه',
@@ -772,8 +797,8 @@ $2',
 'missingcommenttext'               => 'لو سمحت اكتب تعليق تحت.',
 'missingcommentheader'             => "'''خد بالك:''' انت ما كتبتش عنوان\\موضوع للتعليق داز
 لو دوست على ح�ظ الص�حة مرة تانية، تعليقك ح يتح�ظ من غير عنوان.",
-'summary-preview'                  => 'برو�ه للملخص',
-'subject-preview'                  => 'برو�ة للعنوان\\الموضوع',
+'summary-preview'                  => 'برو�ه للملخص:',
+'subject-preview'                  => 'برو�ة للعنوان/للموضوع',
 'blockedtitle'                     => 'اليوزر ممنوع',
 'blockedtext'                      => "<big>'''تم منع اسم اليوزر أو عنوان الااى بى بتاعك .'''</big>
 
@@ -815,41 +840,46 @@ $2',
 'loginreqlink'                     => 'ادخل',
 'loginreqpagetext'                 => 'لازم تكون $1 علشان تشو� ص�حات تانية.',
 'accmailtitle'                     => ' كلمة السر اتبعتت .',
-'accmailtext'                      => "الباسورد بتاعة '$1' اتبعتت لـ $2.",
+'accmailtext'                      => "الباسورد بتاعة [[User talk:$1|$1]] اتبعتت لـ $2.
+
+كلمة السر لهذا الحساب الجديد يمكن تغييرها �ى ص�حة ''[[Special:ChangePassword|تغيير كلمة السر]]'' عند تسجيل الدخول.",
 'newarticle'                       => '(جديد)',
 'newarticletext'                   => "انت وصلت لص�حه مابتدتش لسه.
 علشان  تبتدى الص�حة ابتدى الكتابه �ى الصندوق اللى تحت.
 (بص على [[{{MediaWiki:Helppage}}|ص�حة المساعده]] علشان معلومات اكتر)
 لو كانت زيارتك للص�حه دى بالغلط، دوس على زرار ''رجوع'' �ى متص�ح الإنترنت عندك.",
 'anontalkpagetext'                 => "----'' ص�حة النقاش دى بتاعة يوزر مجهول لسة ما �تحش لن�سه حساب أو عنده واحد بس ما بيستعملوش. علشان كدا لازم تستعمل رقم الأيبى علشان تتعر� عليه/عليها. العنوان دا ممكن اكتر من واحد يكونو بيستعملوه. لو انت يوزر مجهول و حاسس  ان �ى تعليقات بتتوجهلك مع انك مالكش دعوة بيها ،من �ضلك [[Special:UserLogin|ا�تحلك حساب أو سجل الدخول]] علشان تتجنب اللخبطة اللى ممكن تحصل �ى المستقبل مع يوزرز مجهولين تانيين.''",
-'noarticletext'                    => 'ما�يش  دلوقتى اى نص �ى  الص�حه دى ، ممكن [[Special:Search/{{PAGENAME}}|تدور على عنوان الص�حه]] �ى الص�حات التانيه او [{{fullurl:{{FULLPAGENAME}}|action=edit}} تعدل الص�حه دى].',
+'noarticletext'                    => 'ما�يش دلوقتى اى نص �ى الص�حه دى.
+انتا ممكن [[Special:Search/{{PAGENAME}}|تدور على عنوان الص�حه دى]] �ى ص�حات تانيه,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} تدور �ى السجلات اللى ليها علاقه],
+او [{{fullurl:{{FULLPAGENAME}}|action=edit}} تعدل الص�حه دى]</span>.',
 'userpage-userdoesnotexist'        => 'حساب اليوزر "$1" مش متسجل. لو سمحت تشو� لو عايز تبتدي/تعدل الص�حة دي.',
-'clearyourcache'                   => "'''ملاحظة - بعد التسيي�,  يمكن لازم ت�رغ كاش متص�حك لرؤية التغييرات.''' '''موزيللا / �اير�وكس / سا�ارى:''' دوس على ''Shift'' أثناء ضغط ''Reload,'' أو دوس على أيا من ''Ctrl-F5'' أو ''Ctrl-R'' (''Command-R'' على ماكنتوش); '''كونكرر: '''دوس على ''Reload'' أو دوس على ''F5;'' '''أوبرا:''' �رغ الكاش �ى ''Tools → Preferences;'' '''إنترنت إكسبلورر:''' دوس على ''Ctrl'' أثناء ضغط ''Refresh,'' أو دوس على ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>ملاحظة:</strong> استعمل زرار ' عرض برو�ة' علشان تجرب النمط (CSS) أو الجا�ا سكريبت الجديد قبل ح�ظ الص�حة.",
-'usercsspreview'                   => "'''ا�تكرأنك  بتعرض  (CSS) بتاع اليوزر بس.
+'clearyourcache'                   => "'''ملاحظة - بعد التسيي�,  يمكن لازم ت�رغ كاش متص�حك علشان تشو� التغييرات.''' '''موزيللا / �اير�وكس / سا�ارى:''' دوس على ''Shift'' �ى ن�س الوقت دوس على ''Reload,'' أو دوس على اما ''Ctrl-F5'' أو ''Ctrl-R'' (''Command-R'' على ماكنتوش); '''كونكرر: '''دوس على ''Reload'' أو دوس على ''F5;'' '''أوبرا:''' �رغ الكاش �ى ''Tools → Preferences;'' '''إنترنت إكسبلورر:''' دوس على ''Ctrl'' �ى ن�س الوقت دوس على ''Refresh,'' أو دوس على ''Ctrl-F5.''",
+'usercssjsyoucanpreview'           => "'''ملاحظة:''' استعمل زرار ' عرض برو�ة' علشان تجرب النمط (CSS) أو الجا�ا سكريبت الجديد قبل ح�ظ الص�حة.",
+'usercsspreview'                   => "'''ا�تكر انك  بتعرض  (CSS) بتاع اليوزر بس.
 هى لسة ماتح�ظتش!'''",
 'userjspreview'                    => "'''أ�تكر أنك بس بتجرب/بتعرض الجا�ا سكريبت بتاع اليوزر بتاعك، و انها لسة ماتح�ظتش!'''",
 'userinvalidcssjstitle'            => "'''تحذير:'''ما�يش واجهة  \"\$1\".
 ا�تكر أن مل�ات ال.css و ال.js بتستخدم حرو� صغيرة �ى العنوان ، مثلا {{ns:user}}:Foo/monobook.css و مش {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(متحدثة)',
-'note'                             => '<strong>ملحوظه:</strong>',
-'previewnote'                      => '<strong> دى برو�ه للص�حه بس،
-ولسه ما تسيي�تش!</strong>',
+'note'                             => "'''ملحوظه:'''",
+'previewnote'                      => "''' دى برو�ه للص�حه بس،
+ولسه ما تسيي�تش!'''",
 'previewconflict'                  => 'البرو�ة دى بتبينلك �وق إزاى ح يكون شكل النص لو انت دوست على ح�ظ',
-'session_fail_preview'             => '<strong>ما قدرناش  نح�ظ التعديلات اللى قمت بيها نتيجة لضياع بيانات  الجلسه.
+'session_fail_preview'             => "'''ما قدرناش  نح�ظ التعديلات اللى قمت بيها نتيجة لضياع بيانات  الجلسه.
 الرجاء المحاولة مرة تانيه.
-�ى حال استمرار المشكلة حاول  [[Special:UserLogou|تخرج]] وتدخل مرة تانيه .</strong>',
-'session_fail_preview_html'        => "<strong>ماقدرناش نعالج تعديلك بسبب ضياع بيانات الجلسة.</strong>
+�ى حال استمرار المشكلة حاول  [[Special:UserLogou|تخرج]] وتدخل مرة تانيه .'''",
+'session_fail_preview_html'        => "'''ماقدرناش نعالج تعديلك بسبب ضياع بيانات الجلسة.'''
 
 ''لأن {{SITENAME}} بها HTML هل الخام شغاله، البرو�ه مخ�يه كاحتياط ضد هجمات الجا�ا سكريبت.''
 
-<strong>إذا كانت دى محاولة تعديل صادقه، من �ضلك حاول مرة تانيه. إذا كانت لسه مش شغاله، حاول [[Special:UserLogout|تسجيل الخروج]] و تسجيل الدخول من جديد.</strong>",
-'token_suffix_mismatch'            => '<strong>تعديلك اتر�ض لأن عميلك غلط �ى علامات الترقيم 
+'''إذا كانت دى محاولة تعديل صادقه، من �ضلك حاول مرة تانيه. إذا كانت لسه مش شغاله، حاول [[Special:UserLogout|تسجيل الخروج]] و تسجيل الدخول من جديد.'''",
+'token_suffix_mismatch'            => "'''تعديلك اتر�ض لأن عميلك غلط �ى علامات الترقيم 
 �ى نص التعديل. التعديل اتر�ض علشان ما يبوظش نص المقالة.
-دا ساعات بيحصل لما تستعمل خدمة بروكسى مجهولة بايظة أساسها الويب.</strong>',
+دا ساعات بيحصل لما تستعمل خدمة بروكسى مجهولة بايظة أساسها الويب.'''",
 'editing'                          => 'تعديل $1',
 'editingsection'                   => 'تعديل $1 (جزء)',
-'editingcomment'                   => 'تعديل $1 (تعليق)',
+'editingcomment'                   => 'تعديل $1 (قسم جديد)',
 'editconflict'                     => 'تضارب �ى التحرير: $1',
 'explainconflict'                  => "�ى واحد تانى عدل الص�حة دى  بعد ما انت ابتديت بتحريرها.
 صندوق النصوص ال�وقانى �يه النص الموجود دلوقتى �ى الص�حة.
@@ -858,29 +888,31 @@ $2',
 '''بس''' اللى موجود �ى الصندوق ال�وقانى هو اللى ح يتح�ظ لما تدوس على زرار \"ح�ظ الص�حة\".",
 'yourtext'                         => 'النص بتاعك',
 'storedversion'                    => 'النسخة المخزنة',
-'nonunicodebrowser'                => '<strong>تحذير: البراوزر بتاعك مش متوا�ق مع اليونيكود.
-اتعالج الموضوع دا علشان تقدر تعدل الص�حة بامان: الحرو� اللى مش ASCII ح تظهر �ى صندوق التحرير كأكواد سداسية عشرية.</strong>',
-'editingold'                       => '<strong>   تحذير: انت دلوقتى بتحرر نسخة قديمة من  الص�حة دى.
- ولو سيي�تها، هاتضيع كل التغييرات اللى حصلت بعد  النسخة دى. </strong>',
+'nonunicodebrowser'                => "'''تحذير: البراوزر بتاعك مش متوا�ق مع اليونيكود.
+اتعالج الموضوع دا علشان تقدر تعدل الص�حة بامان: الحرو� اللى مش ASCII ح تظهر �ى صندوق التحرير كأكواد سداسية عشرية.'''",
+'editingold'                       => "'''   تحذير: انت دلوقتى بتحرر نسخة قديمة من  الص�حة دى.
+ ولو سيي�تها، هاتضيع كل التغييرات اللى حصلت بعد  النسخة دى. '''",
 'yourdiff'                         => 'ال�روق',
-'copyrightwarning'                 => 'من �ضلك لاحظ ان كل المساهمات �ى {{SITENAME}} بتتنشر حسب شروط ترخيص $2 (بص على $1 علشان تعر�  ت�اصيل اكتر)
+'copyrightwarning'                 => "من �ضلك لاحظ ان كل المساهمات �ى {{SITENAME}} بتتنشر حسب شروط ترخيص $2 (بص على $1 علشان تعر�  ت�اصيل اكتر)
 لو مش عايز كتابتك تتعدل او تتوزع من غير مقابل و بدون اذنك ، ما تحطهاش هنا<br />. كمان انت  بتتعهد بانك كتبت كلام تعديلك بن�سك، او نسخته من مصدر يعتبر ضمن الملكيه العامه، أو مصدر حر تان.
 
-<strong>ما تحطش اى عمل له حقوق مح�وظه بدون اذن صاحب الحق</strong>.',
-'copyrightwarning2'                => 'لو سمحت تعمل حسابك ان كل مشاركاتك �ى {{SITENAME}} ممكن المشاركين التانيين يعدلوها،يغيروها، او يمسحوها خالص. لو مانتش حابب ان كتاباتك تتعدل و تتغير بالشكل دا، �ياريت ما تنشرهاش هنا.<br />.
+'''ما تحطش اى عمل له حقوق مح�وظه بدون اذن صاحب الحق'''.",
+'copyrightwarning2'                => "لو سمحت تعمل حسابك ان كل مشاركاتك �ى {{SITENAME}} ممكن المشاركين التانيين يعدلوها،يغيروها، او يمسحوها خالص. لو مانتش حابب ان كتاباتك تتعدل و تتغير بالشكل دا، �ياريت ما تنشرهاش هنا.<br />.
 و كمان انت بتدينا كلمة شر�  انك صاحب الكتابات دي، او انك نقلتها من مكان مش خاضع لحقوق النشر .(شو� الت�اصيل �ى $1 ).
-<strong>لو سمحت ما تحطش هنا اى نص خاضع لحقوق النشر من غير تصريح!</strong>.',
-'longpagewarning'                  => '<strong>تحذير: الص�حه دى حجمها $1 كيلوبايت،
+'''لو سمحت ما تحطش هنا اى نص خاضع لحقوق النشر من غير تصريح!'''.",
+'longpagewarning'                  => "'''تحذير: الص�حه دى حجمها $1 كيلوبايت،
 بعض المتص�حات (براوزرز) ممكن تواجه مشاكل لما تحاول تعديل ص�حات يزيد حجمها عن 32 كيلوبايت.
-من �ضلك ,لو امكن قسم الص�حة لص�حات اصغر �ى الحجم.</strong>',
-'longpageerror'                    => '<strong>غلط: النص اللى دخلته حجمه $1 كيلوبايت، ودا أكبر من الحد الأقصى و اللى هو $2 كيلوبايت.
-مش ممكن يتح�ظ.</strong>',
-'readonlywarning'                  => '<strong>تحذير: قاعدة البيانات اتق�لت للصيانة، و علشان كدا انت مش ح تقدر تح�ظ التعديلات اللى عملتها دلوقاي.
-لو حبيت ممكن  تنسخ النص وتح�ظه �ى مل� نصى علشان تستعمله بعدين.</strong>',
-'protectedpagewarning'             => '<strong>تحذير:الص�حة دا اتق�لت بطريقة تخلى اليوزرز السيسوبات هم بس اللى يقدرو يعدلوها.</strong>',
+من �ضلك ,لو امكن قسم الص�حة لص�حات اصغر �ى الحجم.'''",
+'longpageerror'                    => "'''غلط: النص اللى دخلته حجمه $1 كيلوبايت، ودا أكبر من الحد الأقصى و اللى هو $2 كيلوبايت.
+مش ممكن يتح�ظ.'''",
+'readonlywarning'                  => "'''تحذير: قاعدة البيانات اتق�لت للصيانة، و علشان كدا انت مش ح تقدر تح�ظ التعديلات اللى عملتها دلوقاي.
+لو حبيت ممكن  تنسخ النص وتح�ظه �ى مل� نصى علشان تستعمله بعدين.'''
+
+الإدارى اللى أغلقها أعطى هذا الت�سير: $1",
+'protectedpagewarning'             => "'''تحذير:الص�حة دى اتق�لت بطريقه تخلى اليوزرز السيسوبات هم بس اللى يقدرو يعدلوها.'''",
 'semiprotectedpagewarning'         => "'''ملاحظة:''' الص�حة  دى اتق�لت بطريقة تخلى اليوزرز المتسجلين بس هم اللى يقدرو يعدلوها.",
 'cascadeprotectedwarning'          => '<strong>تحذير: الص�حة دى اتق�لت بطريقة تخلى اليوزرز السيوبات بس هم اللى يقدرو يعدلوها، ودا علشان هى مدموجة �ى {{PLURAL:$1|الص�حة|الص�حات}} التالية واللى اتعملها حمتية بخاصية "حماية الص�حات المدموجة":</strong>',
-'titleprotectedwarning'            => '<strong>تحذير: الص�حة اتق�لت علشان مش كل اليوزرز يقدرو ينشأوها .</strong>',
+'titleprotectedwarning'            => "تحذير: الص�حة اتحمت علشان مش كل اليوزرز يقدرو يبتدوها .'''",
 'templatesused'                    => 'القوالب المستعمله �ى الص�حه دى:',
 'templatesusedpreview'             => 'القوالب المستعمله �ى البرو�ه دى:',
 'templatesusedsection'             => 'القوالب اللى بتستخدم �ى القسم دا:',
@@ -894,15 +926,24 @@ $2',
 'nocreate-loggedin'                => 'انت ما عندك ش صلاحية تعمل ص�حات جديدة.',
 'permissionserrors'                => 'غلطات �ى السماح',
 'permissionserrorstext'            => 'ما عندك ش صلاحية تعمل كدا،{{PLURAL:$1|علشان|علشان}}:',
-'permissionserrorstext-withaction' => 'أنت ما عندكش الصلاحيات ل$2، لل{{PLURAL:$1|سبب|أسباب}} دي:',
+'permissionserrorstext-withaction' => 'أنت ما عندكش الصلاحيات علشان $2، لل{{PLURAL:$1|سبب|أسباب}} ده:',
 'recreate-deleted-warn'            => "'''تحذير: انت بتعيد انشاء ص�حه اتمسحت قبل كده.'''
 لازم تتأكد من ان الاستمرار �ى تحرير الص�حه دى ملائم.
 سجل الحذ� للص�حه دى معروض هنا:",
+'deleted-notice'                   => 'الص�حة دى اتحذ�ت. سجل الحذ� للص�حة معروض تحت علشان ترجعله.',
+'deletelog-fulllog'                => 'عرض السجل الكامل',
+'edit-hook-aborted'                => 'الخطا� ساب التعديل من غير مايدى ت�سير.',
+'edit-gone-missing'                => 'لم يمكن تحديث الص�حة.
+يبدو أنه تم حذ�ها.',
+'edit-conflict'                    => 'تضارب تحريرى.',
+'edit-no-change'                   => 'تعديلك تم تجاهله، لأنه لم يحدث أى تعديل للنص.',
+'edit-already-exists'              => 'لم يمكن إنشاء ص�حة جديدة.
+هى موجودة بال�عل.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'تحذير: الص�حه دى �يهااستدعاءات دالة محلل كثيرة مكل�ة.
 
-لازم تكون أقل من $2، �يها دلوقتى $1.',
+لازم تكون أقل من $2 {{PLURAL:$2|استدعاء|استدعاء}}، يوجد {{PLURAL:$1|الآن $1 استدعاء|الآن $1 استدعاء}}..',
 'expensive-parserfunction-category'       => 'ص�حات �يها استدعاءات دوال محلل كثيرة ومكل�ة',
 'post-expand-template-inclusion-warning'  => 'تحذير: حجم تضمين القالب كبير قوي.
 بعض القوالب مش ح تتضمن.',
@@ -910,6 +951,8 @@ $2',
 'post-expand-template-argument-warning'   => 'تحذير: الص�حة  دى �يها عامل قالب واحد على الأقل ليه حجم تمدد كبير قوي.
 العوامل دى اتمسحت.',
 'post-expand-template-argument-category'  => 'ص�حات �يها مناقشات القالب المحذو�ة',
+'parser-template-loop-warning'            => 'لووب القالب المحدد: [[$1]]',
+'parser-template-recursion-depth-warning' => 'حد عمق الريكيرشيون بتاع القالب اتعدى  ($1)',
 
 # "Undo" feature
 'undo-success' => 'ممكن ترجع �ى التعديل.
@@ -925,29 +968,29 @@ $2',
 السبب إللى إداه $3 هو ''$2''",
 
 # History pages
-'viewpagelogs'        => 'عرض السجلات للص�حه دى',
-'nohistory'           => 'الص�حة دى ما لهاش تاريخ تعديل.',
-'revnotfound'         => 'النسخة مش موجودة',
-'revnotfoundtext'     => 'ما لقيناش النسخة القديمة من الص�حة اللى طلبتها. لو سمحت تتأكد من اليوأرإل اللى دخلت بيه للص�حة دي.',
-'currentrev'          => 'النسخه دلوقتى',
-'revisionasof'        => 'تعديلات من $1',
-'revision-info'       => 'نسخه $1 بواسطة $2',
-'previousrevision'    => '�نسخه اقدم',
-'nextrevision'        => 'نسخه احدث→',
-'currentrevisionlink' => 'النسخه دلوقتى',
-'cur'                 => 'دلوقتى',
-'next'                => 'اللى بعد كده',
-'last'                => 'قبل كده',
-'page_first'          => 'الأولانية',
-'page_last'           => 'الأخرانية',
-'histlegend'          => 'اختيار ال�رق: علم على صناديق النسخ للمقارنه و اضغط قارن بين النسخ المختاره او الزرار اللى تحت.<br />
+'viewpagelogs'           => 'عرض السجلات للص�حه دى',
+'nohistory'              => 'الص�حة دى ما لهاش تاريخ تعديل.',
+'currentrev'             => 'النسخه دلوقتى',
+'currentrev-asof'        => 'المراجعة الحالية بتاريخ $1',
+'revisionasof'           => 'تعديلات من $1',
+'revision-info'          => 'نسخه $1 بواسطة $2', # Additionally available: $3: revision id
+'previousrevision'       => '�نسخه اقدم',
+'nextrevision'           => 'نسخه احدث→',
+'currentrevisionlink'    => 'النسخه دلوقتى',
+'cur'                    => 'دلوقتى',
+'next'                   => 'اللى بعد كده',
+'last'                   => 'قبل كده',
+'page_first'             => 'الأولانية',
+'page_last'              => 'الأخرانية',
+'histlegend'             => 'اختيار ال�رق: علم على صناديق النسخ للمقارنه و اضغط قارن بين النسخ المختاره او الزرار اللى تحت.<br />
 م�تاح: (دلوقتى) = ال�رق مع النسخة دلوقتى
 (اللى قبل كده) = ال�رق مع النسخة اللى قبل كده، ص = تعديل صغير',
-'deletedrev'          => '[ممسوحة]',
-'histfirst'           => 'اول',
-'histlast'            => 'آخر',
-'historysize'         => '({{PLURAL:$1|1 بايت|$1 بايت}})',
-'historyempty'        => '(�اضى)',
+'history-fieldset-title' => 'تص�ح التاريخ',
+'deletedrev'             => '[ممسوحة]',
+'histfirst'              => 'اول',
+'histlast'               => 'آخر',
+'historysize'            => '({{PLURAL:$1|1 بايت|$1 بايت}})',
+'historyempty'           => '(�اضى)',
 
 # Revision feed
 'history-feed-title'          => 'تاريخ المراجعة',
@@ -1035,6 +1078,7 @@ $2',
 'mergehistory-invalid-destination' => 'الص�حة الهد� لازم تكون عنوانها صحيح.',
 'mergehistory-autocomment'         => 'دمج [[:$1]] �ى [[:$2]]',
 'mergehistory-comment'             => 'دمج [[:$1]] �ى [[:$2]]: $3',
+'mergehistory-same-destination'    => 'ص�حتا المصدر والهد� لا يمكن أن تكونا ن�س الشىء',
 
 # Merge log
 'mergelog'           => 'سجل الدمج',
@@ -1047,124 +1091,205 @@ $2',
 'difference'              => '(ال�رق بين النسخ)',
 'lineno'                  => 'سطر $1:',
 'compareselectedversions' => 'قارن بين النسختين المختارتين',
+'visualcomparison'        => 'مقارنة بصرية',
+'wikicodecomparison'      => 'مقارنة نص الويكى',
 'editundo'                => 'استرجاع',
 'diff-multi'              => '({{PLURAL:$1|نسخه واحده متوسطه|$1 نسخه متوسطه}} مش معروضه.)',
+'diff-movedto'            => 'تم النقل إلى $1',
+'diff-styleadded'         => '$1 نمط اتضا�',
+'diff-added'              => '$1 اتضا�',
+'diff-changedto'          => 'اتغير إلى $1',
+'diff-movedoutof'         => 'تم النقل من $1',
+'diff-styleremoved'       => '$1 نمط اتشال',
+'diff-removed'            => '$1 اتشال',
+'diff-changedfrom'        => 'اتغير من $1',
+'diff-src'                => 'مصدر',
+'diff-withdestination'    => 'بالوجهة $1',
+'diff-with'               => '&#32;مع $1 $2',
+'diff-with-final'         => '&#32;Ùˆ $1 $2',
+'diff-width'              => 'عرض',
+'diff-height'             => 'ارت�اع',
+'diff-p'                  => "'''�قرة'''",
+'diff-blockquote'         => "'''اقتباس'''",
+'diff-h1'                 => "'''عنوان (مستوى 1)'''",
+'diff-h2'                 => "'''عنوان (مستوى 2)'''",
+'diff-h3'                 => "'''عنوان (مستوى 3)'''",
+'diff-h4'                 => "'''عنوان (مستوى 4)'''",
+'diff-h5'                 => "'''عنوان (مستوى 5)'''",
+'diff-pre'                => "'''قطعة مهيأة من قبل'''",
+'diff-div'                => "'''تقسيم'''",
+'diff-ul'                 => "'''قائمة غير مرتبة'''",
+'diff-ol'                 => "'''قائمة مرتبة'''",
+'diff-li'                 => "'''مدخلة قائمة'''",
+'diff-table'              => "'''جدول'''",
+'diff-tbody'              => "'''محتوى جدول'''",
+'diff-tr'                 => "'''ص�'''",
+'diff-td'                 => "'''خلية'''",
+'diff-th'                 => "عنوان''''''",
+'diff-br'                 => "'''قاطع'''",
+'diff-hr'                 => "'''قاعدة أ�قية'''",
+'diff-code'               => "'''قطعة كود حاسوب'''",
+'diff-dl'                 => "'''قائمة تعري�ات'''",
+'diff-dt'                 => "'''مصطلح تعري�'''",
+'diff-dd'                 => "'''تعري�'''",
+'diff-input'              => "'''مدخل'''",
+'diff-form'               => "'''استمارة'''",
+'diff-img'                => "'''صورة'''",
+'diff-span'               => "'''سبان'''",
+'diff-a'                  => "'''وصلة'''",
+'diff-i'                  => "'''مائل'''",
+'diff-b'                  => "'''عريض'''",
+'diff-strong'             => "'''قوى'''",
+'diff-em'                 => "'''تأكيد'''",
+'diff-font'               => "'''خط'''",
+'diff-big'                => "'''كبير'''",
+'diff-del'                => "'''محذو�'''",
+'diff-tt'                 => "'''عرض ثابت'''",
+'diff-sub'                => "'''نص تحتى'''",
+'diff-sup'                => "'''نص �وقى'''",
+'diff-strike'             => "'''شطب'''",
 
 # Search results
-'searchresults'             => 'نتايج التدوير',
-'searchresulttext'          => 'لو عايز تعر� اكتر عن التدوير �ى {{SITENAME}}، شو� [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "انت كنت بتدور على '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "انت دورت على '''$1'''",
-'noexactmatch'              => "'''ما�يش  ص�حه بالاسم \"\$1\"'''.
+'searchresults'                    => 'نتايج التدوير',
+'searchresults-title'              => 'نتايج التدوير على "$1"',
+'searchresulttext'                 => 'لو عايز تعر� اكتر عن التدوير �ى {{SITENAME}}، شو� [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'انتا دورت على \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|كل الص�حات اللى بتبتدى بـ "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|كل الص�حات اللى بتوصل لـ "$1"]])',
+'searchsubtitleinvalid'            => "انت دورت على '''$1'''",
+'noexactmatch'                     => "'''ما�يش  ص�حه بالاسم \"\$1\"'''.
 ممكن [[:\$1| تبتدى الص�حه دى]].",
-'noexactmatch-nocreate'     => "'''ما�يش ص�حة بالاسم \"\$1\".'''",
-'toomanymatches'            => 'لقينا حاجات كتيرة متطابقة، لو سمحت تجرب استعلام مختل�',
-'titlematches'              => 'عنوان الص�حة زى',
-'notitlematches'            => 'مالقيناش ولا عنوان ص�حة مطابق:',
-'textmatches'               => 'نص الص�حة بيطابق',
-'notextmatches'             => 'ما لقيناش أى نص مطابق',
-'prevn'                     => '$1 اللى قبل كده',
-'nextn'                     => '$1 اللى بعد كده',
-'viewprevnext'              => 'بص ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 كلمة|$2 كلمة}})',
-'search-result-score'       => 'الارتباط: $1%',
-'search-redirect'           => '(تحويله $1)',
-'search-section'            => '(قسم $1)',
-'search-suggest'            => 'قصدك: $1',
-'search-interwiki-caption'  => 'المشاريع الشقيقة',
-'search-interwiki-default'  => '$1 نتيجة:',
-'search-interwiki-more'     => '(اأكتر)',
-'search-mwsuggest-enabled'  => 'مع اقتراحات',
-'search-mwsuggest-disabled' => 'ما�يش اقتراحات',
-'search-relatedarticle'     => 'مرتبطه',
-'mwsuggest-disable'         => 'تعطيل اقتراحات أجاكس',
-'searchrelated'             => 'مرتبطه',
-'searchall'                 => 'الكل',
-'showingresults'            => "القائمة دى بتعرض {{PLURAL:$1|'''1''' نتيجة|'''$1''' نتيجة}} من أول  رقم '''$2'''.",
-'showingresultsnum'         => "معروض تحت {{PLURAL:$3|'''نتيجة واحدة'''|'''$3''' نتيجة}} من أول من رقم'''$2'''.",
-'showingresultstotal'       => "معروض تحت {{PLURAL:$3|النتيجة '''$1''' من '''$3'''|النتايج '''$1 - $2''' من '''$3'''}}",
-'nonefound'                 => "'''ملاحظة''':  بعض النطاقات بيتدور �يها اوتوماتيكي.
+'noexactmatch-nocreate'            => "'''ما�يش ص�حة بالاسم \"\$1\".'''",
+'toomanymatches'                   => 'لقينا حاجات كتيرة متطابقة، لو سمحت تجرب استعلام مختل�',
+'titlematches'                     => 'عنوان الص�حة زى',
+'notitlematches'                   => 'مالقيناش ولا عنوان ص�حة مطابق:',
+'textmatches'                      => 'نص الص�حة بيطابق',
+'notextmatches'                    => 'ما لقيناش أى نص مطابق',
+'prevn'                            => '$1 اللى قبل كده',
+'nextn'                            => '$1 اللى بعد كده',
+'viewprevnext'                     => 'بص ($1) ($2) ($3)',
+'searchmenu-legend'                => 'اختيارات التدوير',
+'searchmenu-exists'                => "*الص�حة '''[[$1]]'''",
+'searchmenu-new'                   => "'''ابتدى الص�حه \"[[:\$1]]\" ع الويكى دا!'''",
+'searchhelp-url'                   => 'Help:محتويات',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|استعرض الص�حات اللى بتبتدى بالبري�يكس دا]]',
+'searchprofile-articles'           => 'ص�حات المحتوى',
+'searchprofile-articles-and-proj'  => 'ص�حات المحتوى & المشروع',
+'searchprofile-project'            => 'ص�حات المشروع',
+'searchprofile-images'             => 'المل�ات',
+'searchprofile-everything'         => 'كل شىء',
+'searchprofile-advanced'           => 'متقدم',
+'searchprofile-articles-tooltip'   => 'ابحث �ى $1',
+'searchprofile-project-tooltip'    => 'دور �ى $1',
+'searchprofile-images-tooltip'     => 'ابحث عن الصور',
+'searchprofile-everything-tooltip' => 'ابحث �ى كل المحتوى (شاملا ص�حات النقاش)',
+'searchprofile-advanced-tooltip'   => 'ابحث �ى النطاقات المخصصة',
+'prefs-search-nsdefault'           => 'ابحث باستخدام الا�تراضيات:',
+'prefs-search-nscustom'            => 'ابحث �ى النطاقات المخصصة:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 كلمة|$2 كلمة}})',
+'search-result-score'              => 'الارتباط: $1%',
+'search-redirect'                  => '(تحويله $1)',
+'search-section'                   => '(قسم $1)',
+'search-suggest'                   => 'قصدك: $1',
+'search-interwiki-caption'         => 'المشاريع الشقيقة',
+'search-interwiki-default'         => '$1 نتيجة:',
+'search-interwiki-more'            => '(اأكتر)',
+'search-mwsuggest-enabled'         => 'مع اقتراحات',
+'search-mwsuggest-disabled'        => 'ما�يش اقتراحات',
+'search-relatedarticle'            => 'مرتبطه',
+'mwsuggest-disable'                => 'تعطيل اقتراحات أجاكس',
+'searchrelated'                    => 'مرتبطه',
+'searchall'                        => 'الكل',
+'showingresults'                   => "القائمة دى بتعرض {{PLURAL:$1|'''1''' نتيجة|'''$1''' نتيجة}} من أول  رقم '''$2'''.",
+'showingresultsnum'                => "معروض تحت {{PLURAL:$3|'''نتيجة واحدة'''|'''$3''' نتيجة}} من أول من رقم'''$2'''.",
+'showingresultstotal'              => "معروضه تحت {{PLURAL:$4|النتيجه '''$1''' من '''$3'''|النتايج '''$1 - $2''' من '''$3'''}}",
+'nonefound'                        => "'''ملاحظة''':  بعض النطاقات بيتدور �يها اوتوماتيكي.
 حاول تبتدى تدويرك ب ''all:'' علشان تدور �ى المحتوى كله (مع ص�حات النقاش، القوالب، إلخ)، أو استخدم النطاق المطلوب كبري�يكس.",
-'powersearch'               => 'تدوير مت�صل',
-'powersearch-legend'        => 'تدوير متقدم',
-'powersearch-ns'            => 'تدوير �ى النطاقات:',
-'powersearch-redir'         => 'لستة التحويلات',
-'powersearch-field'         => 'تدوير على',
-'search-external'           => 'تدوير بره',
-'searchdisabled'            => 'التدوير �ى {{SITENAME}} متعطل.
+'search-nonefound'                 => 'لا توجد نتائج تطابق الاستعلام.',
+'powersearch'                      => 'تدوير مت�صل',
+'powersearch-legend'               => 'تدوير متقدم',
+'powersearch-ns'                   => 'تدوير �ى النطاقات:',
+'powersearch-redir'                => 'لستة التحويلات',
+'powersearch-field'                => 'تدوير على',
+'search-external'                  => 'تدوير بره',
+'searchdisabled'                   => 'التدوير �ى {{SITENAME}} متعطل.
 ممكن تدور �ى جوجل دلوقتي.
 لاحظ أن �هارسه لمحتوى {{SITENAME}} يمكن تكون مش متحدثة.',
 
 # Preferences page
-'preferences'              => 'ت�ضيلات',
-'mypreferences'            => 'ت�ضيلاتى',
-'prefs-edits'              => 'عدد التعديلات:',
-'prefsnologin'             => 'مش متسجل',
-'prefsnologintext'         => 'لازم تكون <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} مسجل الدخول]</span> علشان تقدر تعدل ت�ضيلاتك.',
-'prefsreset'               => 'الت�ضيلات اترجعت تانى زى الأول',
-'qbsettings'               => 'البار السريع',
-'qbsettings-none'          => 'ما �ى ش',
-'qbsettings-fixedleft'     => 'متثبت �ى الشمال',
-'qbsettings-fixedright'    => 'متثبت �ى اليمين',
-'qbsettings-floatingleft'  => 'عايم على الشمال',
-'qbsettings-floatingright' => 'عايم على اليمين',
-'changepassword'           => 'غير الباسورد',
-'skin'                     => 'الوش',
-'math'                     => 'رياضة',
-'dateformat'               => 'طريقة كتابة التاريخ',
-'datedefault'              => 'ما�بش ت�ضيل',
-'datetime'                 => 'وقت وتاريخ',
-'math_failure'             => 'الاعراب �شل',
-'math_unknown_error'       => 'غلط مش معرو�',
-'math_unknown_function'    => 'وظي�ة مش معرو�ة',
-'math_lexing_error'        => 'غلط �ى الكلمة',
-'math_syntax_error'        => 'غلط �ى تركيب الجملة',
-'math_image_error'         => '�شل التحويل لـ PNG ؛ 
+'preferences'               => 'ت�ضيلات',
+'mypreferences'             => 'ت�ضيلاتى',
+'prefs-edits'               => 'عدد التعديلات:',
+'prefsnologin'              => 'مش متسجل',
+'prefsnologintext'          => 'لازم تكون <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} مسجل الدخول]</span> علشان تقدر تعدل ت�ضيلاتك.',
+'prefsreset'                => 'الت�ضيلات اترجعت تانى زى الأول',
+'qbsettings'                => 'البار السريع',
+'qbsettings-none'           => 'ما �ى ش',
+'qbsettings-fixedleft'      => 'متثبت �ى الشمال',
+'qbsettings-fixedright'     => 'متثبت �ى اليمين',
+'qbsettings-floatingleft'   => 'عايم على الشمال',
+'qbsettings-floatingright'  => 'عايم على اليمين',
+'changepassword'            => 'غير الباسورد',
+'skin'                      => 'الوش',
+'skin-preview'              => 'برو�ه',
+'math'                      => 'رياضة',
+'dateformat'                => 'طريقة كتابة التاريخ',
+'datedefault'               => 'ما�بش ت�ضيل',
+'datetime'                  => 'وقت وتاريخ',
+'math_failure'              => 'الاعراب �شل',
+'math_unknown_error'        => 'غلط مش معرو�',
+'math_unknown_function'     => 'وظي�ة مش معرو�ة',
+'math_lexing_error'         => 'غلط �ى الكلمة',
+'math_syntax_error'         => 'غلط �ى تركيب الجملة',
+'math_image_error'          => '�شل التحويل لـ PNG ؛ 
 اتاكد من التثبيت المضبوط لـ :Latex و dvips و gs و convert.',
-'math_bad_tmpdir'          => 'مش ممكن الكتابة أو انشاء مجلد الرياضة الموؤقت',
-'math_bad_output'          => 'مش ممكن الكتابة لـ أو إنشاء مجلد الخرج للرياضيات',
-'math_notexvc'             => 'ضايعtexvc executable ؛ لو سمحت شو�math/README للضبط.',
-'prefs-personal'           => 'البرو�يل بتاع اليوزر',
-'prefs-rc'                 => 'اخر التغييرات',
-'prefs-watchlist'          => 'لستة المراقبة',
-'prefs-watchlist-days'     => 'عدد الأيام للعرض �ى لستة المراقبة:',
-'prefs-watchlist-edits'    => 'عدد التعديلات اللى بتتعرض �ى لستةالمراقبة المتوسعة:',
-'prefs-misc'               => 'مت�رقات',
-'saveprefs'                => 'ح�ظ',
-'resetprefs'               => 'امسح التغييرات اللى مش المح�وظة',
-'oldpassword'              => 'الباسورد القديمة:',
-'newpassword'              => 'الباسورد جديدة:',
-'retypenew'                => 'اكتب الباسورد الجديده تانى:',
-'textboxsize'              => 'تعديل',
-'rows'                     => 'ص�و�:',
-'columns'                  => 'عمدان:',
-'searchresultshead'        => 'تدوير',
-'resultsperpage'           => 'عدد النتايج �ى الص�حة:',
-'contextlines'             => 'عدد  السطور �ى كل نتيجة:',
-'contextchars'             => 'عدد  الحرو� �ى كل سطر',
-'stub-threshold'           => 'الحد لتنسيق <a href="#" class="stub">لينك البذرة</a>:',
-'recentchangesdays'        => 'عدد الأيام المعروضة �ى اخرالتغييرات:',
-'recentchangescount'       => 'عدد التعديلات للعرض �ى اخر التغييرات، ص�حات التواريخ والسجلات:',
-'savedprefs'               => 'الت�ضيلات بتاعتك اتح�ظت.',
-'timezonelegend'           => 'منطقة التوقيت',
-'timezonetext'             => '¹ال�رق �ى الساعات بين توقيتك المحلى و توقيت السير�ر (UTC).',
-'localtime'                => 'التوقيت المحلي',
-'timezoneoffset'           => 'ال�رق¹',
-'servertime'               => 'توقيت السير�ر',
-'guesstimezone'            => 'دخل التوقيت من البراوزر',
-'allowemail'               => 'السماح لليوزرز التانيين يبعتولى ايميل',
-'prefs-searchoptions'      => 'اختيارات التدوير',
-'prefs-namespaces'         => 'أسماء النطاقات',
-'defaultns'                => 'دور �ى النطاقات دى اوتوماتيكي:',
-'default'                  => 'اوتوماتيكي',
-'files'                    => 'مل�ات',
+'math_bad_tmpdir'           => 'مش ممكن الكتابة أو انشاء مجلد الرياضة الموؤقت',
+'math_bad_output'           => 'مش ممكن الكتابة لـ أو إنشاء مجلد الخرج للرياضيات',
+'math_notexvc'              => 'ضايعtexvc executable ؛ لو سمحت شو�math/README للضبط.',
+'prefs-personal'            => 'البرو�يل بتاع اليوزر',
+'prefs-rc'                  => 'اخر التغييرات',
+'prefs-watchlist'           => 'لستة المراقبة',
+'prefs-watchlist-days'      => 'عدد الأيام للعرض �ى لستة المراقبة:',
+'prefs-watchlist-days-max'  => '(الحد الاقصى 7 ايام)',
+'prefs-watchlist-edits'     => 'عدد التعديلات اللى بتتعرض �ى لستةالمراقبة المتوسعة:',
+'prefs-watchlist-edits-max' => '(الرقم الاقصى: 1000)',
+'prefs-misc'                => 'مت�رقات',
+'prefs-resetpass'           => 'غير الباسورد',
+'saveprefs'                 => 'ح�ظ',
+'resetprefs'                => 'امسح التغييرات اللى مش المح�وظة',
+'textboxsize'               => 'تعديل',
+'prefs-edit-boxsize'        => 'ك�بر الويندو بتاعة التحرير',
+'rows'                      => 'ص�و�:',
+'columns'                   => 'عمدان:',
+'searchresultshead'         => 'تدوير',
+'resultsperpage'            => 'عدد النتايج �ى الص�حة:',
+'contextlines'              => 'عدد  السطور �ى كل نتيجة:',
+'contextchars'              => 'عدد  الحرو� �ى كل سطر',
+'stub-threshold'            => 'الحد لتنسيق <a href="#" class="stub">لينك البذرة</a>:',
+'recentchangesdays'         => 'عدد الأيام المعروضة �ى اخرالتغييرات:',
+'recentchangesdays-max'     => '(الحد الاقصى $1 {{PLURAL:$1|يوم|ايام}})',
+'recentchangescount'        => 'عدد التعديلات اللى بتظهر اوتوماتيكى �ى احدث التغييرات, تواريخ الص�حه, و �ى السجلات, :',
+'savedprefs'                => 'الت�ضيلات بتاعتك اتح�ظت.',
+'timezonelegend'            => 'منطقة التوقيت',
+'timezonetext'              => '¹ال�رق �ى الساعات بين توقيتك المحلى و توقيت السير�ر (UTC).',
+'localtime'                 => 'التوقيت المحلى',
+'timezoneselect'            => 'المنطقة الزمنية:',
+'timezoneuseserverdefault'  => 'استخدم ا�تراض السر�ر',
+'timezoneuseoffset'         => 'تانى (حدد ال�رق)',
+'timezoneoffset'            => '�رق¹',
+'servertime'                => 'وقت السير�ر',
+'guesstimezone'             => 'دخل التوقيت من البراوزر',
+'allowemail'                => 'السماح لليوزرز التانيين يبعتولى ايميل',
+'prefs-searchoptions'       => 'اختيارات التدوير',
+'prefs-namespaces'          => 'أسماء النطاقات',
+'defaultns'                 => 'دور �ى النطاقات دى اوتوماتيكي:',
+'default'                   => 'اوتوماتيكي',
+'files'                     => 'مل�ات',
 
 # User rights
 'userrights'                  => 'إدارة الحقوق بتاعة اليوزر', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'إدارة مجموعات اليوزر',
 'userrights-user-editname'    => 'دخل اسم يوزر:',
 'editusergroup'               => 'تعديل مجموعات اليوزر',
-'editinguser'                 => "تغيير حقوق االيوزر بتاعة اليوزر'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "تغيير حقوق االيوزر بتاعة اليوزر'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'تعديل مجموعات اليوزر',
 'saveusergroups'              => 'ح�ظ مجموعات اليوزر',
 'userrights-groupsmember'     => 'عضو �ي:',
@@ -1213,6 +1338,8 @@ $2',
 'right-minoredit'            => 'التعليم على التعديلات كط�ي�ة',
 'right-move'                 => 'انقل الص�حات',
 'right-move-subpages'        => 'انقل الص�حات مع ص�حاتها ال�رعيه',
+'right-move-rootuserpages'   => 'انقل ص�حات جدر اليوزر',
+'right-movefile'             => 'نقل المل�ات',
 'right-suppressredirect'     => 'ما تعملش تحويلة من الاسم القديم عند نقل ص�حة',
 'right-upload'               => 'حمل المل�ات',
 'right-reupload'             => 'الكتابة على مل� موجود',
@@ -1263,9 +1390,46 @@ $2',
 'rightslogentry' => 'غير صلاحيات $1 من $2 ل $3',
 'rightsnone'     => '(�اضى)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'قراية الص�حه دى',
+'action-edit'                 => 'تعديل هذه الص�حة',
+'action-createpage'           => 'إنشاء الص�حات',
+'action-createtalk'           => 'إنشاء ص�حات النقاش',
+'action-createaccount'        => 'إنشاء حساب اليوزر ده',
+'action-minoredit'            => 'التعليم على هذا التعديل كط�ي�',
+'action-move'                 => 'نقل هذه الص�حة',
+'action-move-subpages'        => 'نقل هذه الص�حة، وص�حاتها ال�رعية',
+'action-move-rootuserpages'   => 'انقل ص�حات جدر اليوزر',
+'action-movefile'             => 'انقل المل� ده',
+'action-upload'               => 'ر�ع هذا المل�',
+'action-reupload'             => 'الكتابة على هذا المل� الموجود',
+'action-reupload-shared'      => 'الكتابة على هذا المل� �ى مستودع مشترك',
+'action-upload_by_url'        => 'ر�ع هذا المل� من عنوان مسار',
+'action-writeapi'             => 'استخدام API الكتابة',
+'action-delete'               => 'حذ� هذه الص�حة',
+'action-deleterevision'       => 'حذ� هذه المراجعة',
+'action-deletedhistory'       => 'رؤية تاريخ هذه الص�حة المحذو�',
+'action-browsearchive'        => 'البحث �ى الص�حات المحذو�ة',
+'action-undelete'             => 'استرجاع هذه الص�حة',
+'action-suppressrevision'     => 'مراجعة واسترجاع هذه المراجعة المخ�ية',
+'action-suppressionlog'       => 'رؤية هذا السجل الخاص',
+'action-block'                => 'منع  اليوزر ده من التعديل',
+'action-protect'              => 'تغيير مستويات الحماية لهذه الص�حة',
+'action-import'               => 'استيراد هذه الص�حة من ويكى آخر',
+'action-importupload'         => 'استيراد هذه الص�حة من مل� مر�وع',
+'action-patrol'               => 'التعليم على تعديلات الآخرين كمراجعة',
+'action-autopatrol'           => 'جعل تعديلك معلم عليه كمراجع',
+'action-unwatchedpages'       => 'رؤية لستة الص�حات اللى مش متراقبة',
+'action-trackback'            => 'تن�يذ تراكباك',
+'action-mergehistory'         => 'دمج تاريخ هذه الص�حة',
+'action-userrights'           => 'تعديل كل صلاحيات اليوزر',
+'action-userrights-interwiki' => 'تعديل صلاحيات اليوزر لليوزرز �ى الويكيات التانية',
+'action-siteadmin'            => 'غلق أو ر�ع غلق قاعدة البيانات',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|تعديل|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديل}}',
 'recentchanges'                     => 'اخر التعديلات',
+'recentchanges-legend'              => 'خيارات أحدث التغييرات',
 'recentchangestext'                 => 'تابع آخر التغييرات �ى الويكى على الص�حة دى.',
 'recentchanges-feed-description'    => 'تابع احدث التعديلات للويكى ده عن طريق ال�ييد ده .',
 'rcnote'                            => "�يه تحت {{PLURAL:$1|'''1''' تغيير|آخر '''$1''' تغيير}} �ى آخر {{PLURAL:$2|يوم|'''$2''' يوم}}، بدءا من $5، $4.",
@@ -1290,6 +1454,8 @@ $2',
 'rc_categories'                     => 'حصر لتصني�ات (م�صولة برمز "|")',
 'rc_categories_any'                 => 'أى',
 'newsectionsummary'                 => '/* $1 */ قسم جديد',
+'rc-enhanced-expand'                => 'عرض الت�اصيل (يتطلب جا�اسكريبت)',
+'rc-enhanced-hide'                  => 'إخ�اء الت�اصيل',
 
 # Recent changes linked
 'recentchangeslinked'          => 'تعديلات  ليها علاقه',
@@ -1311,11 +1477,11 @@ $2',
 'upload_directory_read_only'  => 'مجلد التحميل ($1) مش ممكن الكتابة عليه بواسطة سيرڨر الويب.',
 'uploaderror'                 => 'غلطه �ى التحميل',
 'uploadtext'                  => "استخدم الاستمارة لتحميل المل�ات.
-لعرض أو البحث � المل�ات المتحملة سابقا، راجع [[Special:ImageList|قايمة المل�ات المتحملة]]، عمليات التحميل والحذ� موجودة �ى [[Special:Log/upload|سجل التحميل]].
+لعرض أو البحث � المل�ات المتحملة سابقا، راجع [[Special:FileList|قايمة المل�ات المتحملة]]، عمليات التحميل والحذ� موجودة �ى [[Special:Log/upload|سجل التحميل]].
 
 علشان تحط صورة �ى ص�حة، استخدم الوصلات �ى الصيغ التالية:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' لاستخدام النسخة الكاملة لمل�
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|نص بديل]]</nowiki></tt>''' لاستخدام صورة عرضها 200 بكسل �ى صندوق �ى الجانب الأيسر مع 'نص بديل' كوص�
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' لاستخدام النسخة الكاملة لمل�
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|نص بديل]]</nowiki></tt>''' لاستخدام صورة عرضها 200 بكسل �ى صندوق �ى الجانب الأيسر مع 'نص بديل' كوص�
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' للوصل للمل� مباشرة بدون عرض المل�.",
 'upload-permitted'            => 'أنواع المل�ات المسموحة: $1.',
 'upload-preferred'            => 'أنواع المل�ات الم�ضلة: $1.',
@@ -1323,7 +1489,7 @@ $2',
 'uploadlog'                   => 'سجل التحميل',
 'uploadlogpage'               => 'سجل التحميل',
 'uploadlogpagetext'           => 'تحت �ية لستة بأحدث عمليات تحميل المل�ات.
-انظر [[Special:NewImages|معرض المل�ات الجديدة]] لعرض بصرى أكتر',
+انظر [[Special:NewFiles|معرض المل�ات الجديدة]] لعرض بصرى أكتر',
 'filename'                    => 'اسم المل�',
 'filedesc'                    => 'الخلاصة',
 'fileuploadsummary'           => 'الخلاصة:',
@@ -1348,27 +1514,28 @@ $2',
 'emptyfile'                   => 'الظاهر ان المل� اللى انت حملته طلع �اضي.
 يمكن يكون السبب هوه كتابة الاسم غلط.
 لو سمحت تتاكد من إنك �علا عايز تحمل المل� دا..',
-'fileexists'                  => '�يه  مل� موجود بالاسم ده  الرجاء التأكد من المل� ده باتباع الوصلة التالية <strong><tt>$1</tt></strong> قبل ما تغيره.',
-'filepageexists'              => 'ص�حة الوص� بتاعة الم� دا خلاص اتعملها انشاء �ى <strong><tt>$1</tt></strong>، بس ما�يش مل� بالاسم دا دلوقتى.
+'fileexists'                  => "�يه  مل� موجود بالاسم ده  الرجاء التأكد من المل� ده باتباع الوصلة التالية '''<tt>$1</tt>''' قبل ما تغيره.",
+'filepageexists'              => "ص�حة الوص� بتاعة الم� دا خلاص اتعملها انشاء �ى '''<tt>$1</tt>'''، بس ما�يش مل� بالاسم دا دلوقتى.
 الملخص اللى ح تكتبه  مش ح يظهر على ص�حة الوص�.
-علشان تخلى المل� يظهر هناك، ح تحتاج تعدله يدوي.',
-'fileexists-extension'        => '�ى مل� موجود باسم قريب:<br />
-اسم المل� اللى انت عايز تحمله: <strong><tt>$1</tt></strong><br />
-اسم المل� الموجود: <strong><tt>$2</tt></strong><br />
-لو سمحت تختار اسم تاني.',
+علشان تخلى المل� يظهر هناك، ح تحتاج تعدله يدوي.",
+'fileexists-extension'        => "�ى مل� موجود باسم قريب:<br />
+اسم المل� اللى انت عايز تحمله: '''<tt>$1</tt>'''<br />
+اسم المل� الموجود: '''<tt>$2</tt>'''<br />
+لو سمحت تختار اسم تاني.",
 'fileexists-thumb'            => "<center>'''المل� الموجود'''</center>",
-'fileexists-thumbnail-yes'    => 'الظاهر ان المل� دا عبارة عن صورة متصغرة <i>(تصغير)</i>. 
-لو سمحت تشيك على المل� <strong><tt>$1</tt></strong>.<br />
-لو كان المل� هو ن�س الصورة بالحجم الاصلي، � ما�يش داعى تحمله مرة تانية',
-'file-thumbnail-no'           => 'يبدأ المل� ب <strong><tt>$1</tt></strong>. 
-يبدو أن المل� مصتغر لحجم أعلى <i>(تصغير)</i>.
-إذا كان عندك الصورة �ى درجة دقة كامله حملها، أو غير اسم المل� من �ضلك.',
-'fileexists-forbidden'        => '�ى مل� تانى بن�س الاسم موجود
-لو سمحت ترجع تانى و تحمل المل� باسم جديد. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "الظاهر ان المل� دا عبارة عن صورة متصغرة ''(تصغير)''. 
+لو سمحت تشيك على المل� '''<tt>$1</tt>'''.<br />
+لو كان المل� هو ن�س الصورة بالحجم الاصلي، � ما�يش داعى تحمله مرة تانية",
+'file-thumbnail-no'           => "يبدأ المل� ب '''<tt>$1</tt>'''. 
+يبدو أن المل� مصتغر لحجم أعلى ''(تصغير)''.
+إذا كان عندك الصورة �ى درجة دقة كامله حملها، أو غير اسم المل� من �ضلك.",
+'fileexists-forbidden'        => '�ى مل� بن�س الاسم موجود, و ماين�عش يتكتب عليه.
+لو انتا لسه عايز تحمل المل� بتاعك, لو سمحت ترجع لورا و تستعمل اسم جديد. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => '�ى مل� بن�س الاسم دا �ى مخزن المل�ات المشترك.
 لو كنت لسه عايز تر�عه، لو سمحت ارجع وحمل المل� دا باسم جديد.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'المل� دا تكرار  {{PLURAL:$1|للمل�|للمل�ات}} دي:',
+'file-deleted-duplicate'      => '�ى مل� مطابق للمل� دا ([[$1]]) اتمسح قبل كدا. انتا لازم تشيك على تاريخ المسح بتاع المل� دا قبل ما تحمله مرة تانية',
 'successfulupload'            => 'التحميل ناجح',
 'uploadwarning'               => 'تحذير التحميل',
 'savefile'                    => 'ح�ظ المل�',
@@ -1390,8 +1557,8 @@ $2',
 
 لازم تتاكد من انك عايز تستمر �ى تحميل المل� دا.
 سجل المسح بتاع المل� دا معروض هنا علشان تبص عليه:",
-'filename-bad-prefix'         => 'اسم المل� اللى بتحمله بيبتدى بـ<strong>"$1"</strong>، واللى هو اسم مش وص�ى بيتحط غالبا من الكاميرات الديجيتال اوتوماتيكي.
-لو سمحت تختار اسم يكون بيوص� المل� بتاعك احسن من كدا.',
+'filename-bad-prefix'         => "اسم المل� اللى بتحمله بيبتدى بـ'''\"\$1\"'''، واللى هو اسم مش وص�ى بيتحط غالبا من الكاميرات الديجيتال اوتوماتيكي.
+لو سمحت تختار اسم يكون بيوص� المل� بتاعك احسن من كدا.",
 'filename-prefix-blacklist'   => ' #<!-- سيب السطر ده زى ما هوه --> <pre>
 # الصيغة كدا: 
 #   * كل حاجة من أول علامة "#" لحد أخر السطر هى تعليق
@@ -1432,20 +1599,21 @@ PICT # misc.
 'upload_source_url'  => '  (اليوأرإل صحيح وممكن توصل ليه)',
 'upload_source_file' => ' (مل� على الكمبيوتر بتاعك)',
 
-# Special:ImageList
-'imagelist-summary'     => 'الص�حة المخصوصة دى بتعرض كل المل�ات المتحملة.
+# Special:ListFiles
+'listfiles-summary'     => 'الص�حة المخصوصة دى بتعرض كل المل�ات المتحملة.
 اوتوماتيكى اخر المل�ات اللى اتحملت ح تظهر �ى اللستة من �وق.
 لو دوست على راس العمود الترتيب ح يتغير.',
-'imagelist_search_for'  => 'دور على اسم الميديا:',
+'listfiles_search_for'  => 'دور على اسم الميديا:',
 'imgfile'               => 'مل�',
-'imagelist'             => 'لستة المل�ات',
-'imagelist_date'        => 'تاريخ',
-'imagelist_name'        => 'اسم',
-'imagelist_user'        => 'يوزر',
-'imagelist_size'        => 'حجم',
-'imagelist_description' => 'وص�',
-
-# Image description page
+'listfiles'             => 'لستة المل�ات',
+'listfiles_date'        => 'تاريخ',
+'listfiles_name'        => 'اسم',
+'listfiles_user'        => 'يوزر',
+'listfiles_size'        => 'حجم',
+'listfiles_description' => 'وص�',
+'listfiles_count'       => 'نسخ',
+
+# File description page
 'filehist'                       => 'تاريخ المل�',
 'filehist-help'                  => 'اضغط على الساعه/التاريخ علشان تشو� ال�ايل زى ما كان �ى  الوقت ده.',
 'filehist-deleteall'             => 'امسح كله',
@@ -1453,19 +1621,25 @@ PICT # misc.
 'filehist-revert'                => 'استرجع',
 'filehist-current'               => 'دلوقتي',
 'filehist-datetime'              => 'الساعه / التاريخ',
+'filehist-thumb'                 => 'صورة صغيرة',
+'filehist-thumbtext'             => 'تصغير للنسخة بتاريخ $1',
+'filehist-nothumb'               => 'لا تصغير',
 'filehist-user'                  => 'يوزر',
 'filehist-dimensions'            => 'ابعاد',
 'filehist-filesize'              => 'حجم ال�ايل',
 'filehist-comment'               => 'تعليق',
-'imagelinks'                     => 'وصلات',
+'imagelinks'                     => 'لينكات المل�',
 'linkstoimage'                   => '{{PLURAL:$1|الص�حة|ال$1 ص�حة}} دى �يها وصله لل�ايل ده:',
+'linkstoimage-more'              => 'أكتر من $1 {{PLURAL:$1|ص�حة تصل|ص�حة تصل}} للمل� ده .
+القائمة التالية تعرض {{PLURAL:$1|أول وصلة ص�حة|أول $1 وصلة ص�حة}} للمل� ده بس.
+[[Special:WhatLinksHere/$2|قائمة كاملة]] متو�رة.',
 'nolinkstoimage'                 => 'ما�يش ص�حات بتوصل لل�ايل ده.',
 'morelinkstoimage'               => 'عرض [[Special:WhatLinksHere/$1|لينكات اكتر]] للمل� دا.',
 'redirectstofile'                => '{{PLURAL:$1| المل�|ال$1 مل�}} اللى جاى  بيحول للمل� دا:',
-'duplicatesoffile'               => '{{PLURAL:$1| المل�|ال$1 مل� اللى بعده}} مكررات للمل� دا:',
+'duplicatesoffile'               => '{{PLURAL:$1| المل�|ال$1 مل� اللى بعده}} متكرره من المل� ده:',
 'sharedupload'                   => 'المل� ده اتحمل علشان التشارك بين المشاريع وممكن استخدامه �ى المشاريع التانيه.',
 'shareduploadwiki'               => 'لو سمحت تشو� $1 اللى �يه معلومات زيادة.',
-'shareduploadwiki-desc'          => 'الوص� على $1 �ى المخزن المشترك معروض تحت.',
+'shareduploadwiki-desc'          => 'الوص� على $1 �ى الكومونز معروض تحت.',
 'shareduploadwiki-linktext'      => 'ص�حة وص� المل�',
 'shareduploadduplicate'          => 'المل� دا تكرار ل$1 من المخزن المشترك.',
 'shareduploadduplicate-linktext' => 'مل� تاني',
@@ -1489,7 +1663,7 @@ PICT # misc.
 # File deletion
 'filedelete'                  => 'امسح $1',
 'filedelete-legend'           => 'امسح المل�',
-'filedelete-intro'            => "أنت بتمسح '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "انتا على وشك تمسح المل�'''[[Media:$1|$1]]'''معا كل التاريخ بتاعه.",
 'filedelete-intro-old'        => '<span class="plainlinks">أنت بتمسح نسخة \'\'\'[[Media:$1|$1]]\'\'\'اللى  بتاريخ [$4 $3، $2].</span>',
 'filedelete-comment'          => 'سبب المسح:',
 'filedelete-submit'           => 'مسح',
@@ -1497,12 +1671,10 @@ PICT # misc.
 'filedelete-success-old'      => "نسخة الـ'''[[Media:$1|$1]]''' اللى بتاريخ $3، $2 اتمسحت.",
 'filedelete-nofile'           => "'''$1''' مش موجود.",
 'filedelete-nofile-old'       => "ما�يش نسخة �ى الارشي� من '''$1''' بالعناصر المتحددة.",
-'filedelete-iscurrent'        => 'أنت بتحاول تمسح أجدد نسخة من المل� دا.
-لو سمحت ترجع النسخة القديمة الاول.',
 'filedelete-otherreason'      => 'سبب زيادة/تاني:',
 'filedelete-reason-otherlist' => 'سبب تانى',
 'filedelete-reason-dropdown'  => '*أسباب المسح الشايعة
-** الاعتداء على حقوق النشر
+** مخال�ة حقوق النشر
 ** مل� متكرر',
 'filedelete-edit-reasonlist'  => 'عدل أسباب المسح',
 
@@ -1528,31 +1700,31 @@ PICT # misc.
 
 # Random page
 'randompage'         => 'ص�حة عشوائيه',
-'randompage-nopages' => 'ما�يش ص�حات �ى النطاق دا.',
+'randompage-nopages' => 'ما�يش ص�حات �ى النطاق "$1"..',
 
 # Random redirect
 'randomredirect'         => 'تحويله عشوائيه',
-'randomredirect-nopages' => 'ما�يش تحويلات �ى النطاق ده.',
+'randomredirect-nopages' => 'ما�يش تحويلات �ى النطاق"$1".',
 
 # Statistics
-'statistics'             => 'احصائيات',
-'sitestats'              => 'إحصائيات {{SITENAME}}',
-'userstats'              => 'الاحصاءات بتاعة اليوزر',
-'sitestatstext'          => "�يه{{PLURAL:\$1|'''1''' ص�حه|'''\$1''' ص�حه كليه}} �ى قاعدة البيانات.
-ده يشمل  ص�حات \"المناقشه\"، الص�حات حول {{SITENAME}}، الصغرى \"البذور\"
-ص�حات، التحويلات، و غيرها اللى غالبا ما تتأهلش كص�حات محتوى.
-باستثناء اللى، �يه {{PLURAL:\$2|'''1''' ص�حة| '''\$2''' ص�حة}} تعتبر على الأرجح
-{{PLURAL:\$2|ص�حة|ص�حة}} محتوى معتبرة.
-
-'''\$8''' {{PLURAL:\$8|مل�|مل�}} تم تحميله.
-
-�يه كإجمالى '''\$3''' {{PLURAL:\$3|عرض ص�حة|عرض ص�حة}}، و '''\$4''' {{PLURAL:\$4|تعديل ص�حة|تعديل ص�حة}}
-من تنصيب {{SITENAME}}.
-ده يعنى '''\$5''' تعديل متوسط لكل ص�حة، و '''\$6''' عرض لكل تعديل.
-
-طول [http://www.mediawiki.org/wiki/Manual:Job_queue طابور الشغل] هو '''\$7'''.",
-'userstatstext'          => "�ى {{PLURAL:$1|[[Special:ListUsers|يوزر]] متسجل '''واحد'''|'''$1''' [[Special:ListUsers|يوزر]] متسجل}}، منهم '''$2''' (أو '''$4%''') {{PLURAL:$2|عنده|عندهم}} صلاحيات $5.",
-'statistics-mostpopular' => 'اكتر ص�حات اتشا�ت',
+'statistics'                   => 'احصائيات',
+'statistics-header-pages'      => 'إحصاءات الص�حات',
+'statistics-header-edits'      => 'إحصاءات التعديلات',
+'statistics-header-views'      => 'إحصاءات المشاهدة',
+'statistics-header-users'      => 'الاحصاءات بتاعة اليوزر',
+'statistics-articles'          => 'ص�حات المحتوى',
+'statistics-pages'             => 'الص�حات',
+'statistics-pages-desc'        => 'كل الص�حات �ى الويكى، بما �يها ص�حات النقاش، التحويلات، إلى آخره.',
+'statistics-files'             => 'المل�ات المتحملة',
+'statistics-edits'             => 'تعديلات الص�حات من بداية {{SITENAME}}',
+'statistics-edits-average'     => 'متوسط التعديلات لكل ص�حة',
+'statistics-views-total'       => 'إجمالى المشاهدات',
+'statistics-views-peredit'     => 'المشاهدات لكل تعديل',
+'statistics-jobqueue'          => 'طول [http://www.mediawiki.org/wiki/Manual:Job_queue طابور الشغل]',
+'statistics-users'             => '[[Special:ListUsers|يوزرز]] مسجلين',
+'statistics-users-active'      => 'يوزرز نشطين',
+'statistics-users-active-desc' => 'اليوزرز اللى ن�ذو عمليه �ى الـ {{PLURAL:$1|يوم|$1 ايام}} اللى �اتو',
+'statistics-mostpopular'       => 'اكتر ص�حات اتشا�ت',
 
 'disambiguations'      => 'ص�حات التوضيح',
 'disambiguationspage'  => 'Template:توضيح',
@@ -1567,11 +1739,11 @@ PICT # misc.
 'double-redirect-fixer'      => 'مصلح التحويل',
 
 'brokenredirects'        => 'تحويلات مكسوره',
-'brokenredirectstext'    => 'التحويلات دى بتوصل لص�حات مش موجودة:',
+'brokenredirectstext'    => 'التحويلات دى بتودى لص�حات  مالهاش وجود:',
 'brokenredirects-edit'   => '(تحرير)',
 'brokenredirects-delete' => '(مسح)',
 
-'withoutinterwiki'         => 'ص�حات بدون وصلات للغات تانيه',
+'withoutinterwiki'         => 'ص�حات من غير وصلات للغات تانيه',
 'withoutinterwiki-summary' => 'الص�حات دى  مالهاش لينكات لنسخ بلغات تانية:',
 'withoutinterwiki-legend'  => 'بري�يكس',
 'withoutinterwiki-submit'  => 'عرض',
@@ -1597,26 +1769,30 @@ PICT # misc.
 'popularpages'            => 'ص�حات مشهورة',
 'wantedcategories'        => 'تصاني� مطلوبه',
 'wantedpages'             => 'ص�حات مطلوبه',
-'missingfiles'            => 'مل�ات ضايعة',
+'wantedfiles'             => 'مل�ات مطلوبة',
+'wantedtemplates'         => 'قوالب متعازة',
 'mostlinked'              => 'اكتر ص�حات موصولة بص�حات تانيه',
 'mostlinkedcategories'    => 'اكتر التصاني� �ى عدد الارتباطات',
 'mostlinkedtemplates'     => 'اكتر القوالب �ى عدد الوصلات',
 'mostcategories'          => 'اكتر الص�حات �ى عدد التصاني�',
 'mostimages'              => 'اكتر المل�ات �ى عدد الارتباطات',
 'mostrevisions'           => 'اكتر المقالات �ى عدد التعديلات',
-'prefixindex'             => '�هرس البري�كسات',
+'prefixindex'             => 'كل الص�حات اللى بالبر�يكس',
 'shortpages'              => 'ص�حات قصيره',
 'longpages'               => 'ص�حات طويله',
 'deadendpages'            => 'ص�حات ما بتوصلش  لحاجه',
 'deadendpagestext'        => 'الص�حات دى مابتوصلش  لص�حات تانية �ى {{SITENAME}}.',
 'protectedpages'          => 'ص�حات محميه',
 'protectedpages-indef'    => 'عمليات الحماية اللى مش متحددة بس',
+'protectedpages-cascade'  => 'الحماية المتضمنة بس',
 'protectedpagestext'      => 'الص�حات دى محمية من النقل أو التعديل',
 'protectedpagesempty'     => 'ما�يش  ص�حات محمية دلوقتى  على حسب المحددات دي.',
 'protectedtitles'         => 'عناوين محمية',
 'protectedtitlestext'     => 'العناوين دى محمية ضد الإنشاء',
 'protectedtitlesempty'    => 'ما�يش عناوين محمية دلوقتى على حسب المحددات دي.',
 'listusers'               => 'لستة الأعضاء',
+'listusers-editsonly'     => 'عرض اليوزرز اللى قاموا بتعديلات �قط',
+'usereditcount'           => '$1 {{PLURAL:$1|تعديل|تعديل}}',
 'newpages'                => 'ص�حات جديده',
 'newpages-username'       => 'اسم اليوزر:',
 'ancientpages'            => 'اقدم الص�حات',
@@ -1637,14 +1813,13 @@ PICT # misc.
 'booksources-search-legend' => 'التدوير على مصادر الكتب',
 'booksources-go'            => 'روح',
 'booksources-text'          => '�ى تحت لستة بوصلات لمواقع تانية بتبيع الكتب الجديدة والمستعملة، كمان ممكن تلاقى معلومات إضا�ية عن الكتب اللى يتدور عليها :',
+'booksources-invalid-isbn'  => 'رقم الـ ISBN اللى كتبته شكله مش صحيح؛ اتإكد من الغلطات بتاعة النسخ من المصدر الاصلى.',
 
 # Special:Log
 'specialloguserlabel'  => 'اليوزر:',
 'speciallogtitlelabel' => 'العنوان:',
 'log'                  => 'سجلات',
 'all-logs-page'        => 'كل السجلات',
-'log-search-legend'    => 'دور على سجلات',
-'log-search-submit'    => 'روح',
 'alllogstext'          => 'عرض شامل لكل السجلات الموجودة �ى {{SITENAME}}. 
 ممكن تخلى اللستة متحددة اكتر لو تختار نوع العملية، أو اسم اليوزر (حساس لحالة الحرو�)، أو الص�حة المتأثرة (برضه حساس لحالة الحرو�).',
 'logempty'             => 'ما�يش  سجلات مطابقة �ى السجل.',
@@ -1656,6 +1831,7 @@ PICT # misc.
 'nextpage'          => 'الص�حه اللى بعد كده ($1)',
 'prevpage'          => 'الص�حه اللى قبل كده ($1)',
 'allpagesfrom'      => 'عرض الص�حات بدايه من:',
+'allpagesto'        => 'اعرض الص�حات اللى بتنتهى عند:',
 'allarticles'       => 'كل المقالات',
 'allinnamespace'    => 'كل الص�حات (�ى نطاق $1)',
 'allnotinnamespace' => 'كل الص�حات (مش �ى نطاق $1)',
@@ -1676,41 +1852,69 @@ PICT # misc.
 'special-categories-sort-count' => 'رتب بالعدد',
 'special-categories-sort-abc'   => 'ترتيب ابجدي',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'تعديلات اليوزر الممسوحة',
+
+# Special:LinkSearch
+'linksearch'       => 'لينكات خارجيه',
+'linksearch-pat'   => 'نظام التدوير:',
+'linksearch-ns'    => 'النطاق:',
+'linksearch-ok'    => 'تدوير',
+'linksearch-text'  => 'الكروت الخاصة زى "*.wikipedia.org" ممكن تستعمل.<br />
+البروتوكولات المدعومة: <tt>$1</tt>',
+'linksearch-line'  => '$1 موصوله من $2',
+'linksearch-error' => 'الكروت الخاصة ممكن تبان بس  �ى بداية اسم المضي�',
+
 # Special:ListUsers
 'listusersfrom'      => 'عرض اليوزرز من أول:',
 'listusers-submit'   => 'عرض',
 'listusers-noresult' => 'ما �ى ش يوزر',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'سجل اليوزرز الجداد',
+'newuserlogpagetext'          => 'دا سجل لليوزرز الجداد',
+'newuserlog-byemail'          => 'الباسورد اتبعتت بالايميل',
+'newuserlog-create-entry'     => 'يوزر جديد',
+'newuserlog-create2-entry'    => 'الحساب الجديد المعمول $1',
+'newuserlog-autocreate-entry' => 'الحساب ات�تح اوتوماتيكي',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'حقوق مجموعات اليوزرز',
-'listgrouprights-summary'  => 'دى لستة بمجموعات اليوزرز المتعر�ة �ى الويكى دا، بالحقوق اللى معاهم.
+'listgrouprights'                 => 'حقوق مجموعات اليوزرز',
+'listgrouprights-summary'         => 'دى لستة بمجموعات اليوزرز المتعر�ة �ى الويكى دا، بالحقوق اللى معاهم.
 ممكن تلاقى معلومات زيادة عن الحقوق بتاعة كل واحد  [[{{MediaWiki:Listgrouprights-helppage}}|هنا]].',
-'listgrouprights-group'    => 'المجموعة',
-'listgrouprights-rights'   => 'الحقوق',
-'listgrouprights-helppage' => 'Help: حقوق المجموعات',
-'listgrouprights-members'  => '(لستة الأعضاء)',
+'listgrouprights-group'           => 'المجموعة',
+'listgrouprights-rights'          => 'الحقوق',
+'listgrouprights-helppage'        => 'Help: حقوق المجموعات',
+'listgrouprights-members'         => '(لستة الأعضاء)',
+'listgrouprights-addgroup'        => 'ممكن تضي� {{PLURAL:$2|المجموعة|المجموعات}}: $1',
+'listgrouprights-removegroup'     => 'ممكن تشيل {{PLURAL:$2|المجموعة|المجموعات}}: $1',
+'listgrouprights-addgroup-all'    => 'ممكن تضي� كل المجموعات',
+'listgrouprights-removegroup-all' => 'ممكن تشيل كل المجموعات',
 
 # E-mail user
-'mailnologin'     => 'ما�يش عنوان نبعت عليه',
-'mailnologintext' => 'لازم تعمل [[Special:UserLogin|تسجيل الدخول]] و تدخل ايميل صحيح �ى ص�حة [[Special:Preferences|الت�ضيلات]] علشان تقدر تبعت ايميلات لليوزرز التانيين.',
-'emailuser'       => 'ابعت ايميل لليوزر دا',
-'emailpage'       => 'ابعت ايميل لليوزر ده',
-'emailpagetext'   => 'ممكن تستعمل الاستمارة اللى تحت دى عشان تيعت ايميل لليوزر دا.
+'mailnologin'      => 'ما�يش عنوان نبعت عليه',
+'mailnologintext'  => 'لازم تعمل [[Special:UserLogin|تسجيل الدخول]] و تدخل ايميل صحيح �ى ص�حة [[Special:Preferences|الت�ضيلات]] علشان تقدر تبعت ايميلات لليوزرز التانيين.',
+'emailuser'        => 'ابعت ايميل لليوزر دا',
+'emailpage'        => 'ابعت ايميل لليوزر ده',
+'emailpagetext'    => 'ممكن تستعمل الاستمارة اللى تحت دى عشان تيعت ايميل لليوزر دا.
 عنوان الايميل اللى كتبته �ى [[Special:Preferences|الت�ضيلات بتاعتك]] ح يظهر على انه عنوان الاستمارة و بكدة اللى حيستقبله ح يقدر يرد على الايميل.',
-'usermailererror' => 'البريد رجع غلط:',
-'defemailsubject' => 'إيميل من {{SITENAME}}',
-'noemailtitle'    => 'ما�يش  عنوان ايميل',
-'noemailtext'     => 'يا إما اليوزر دا ما كتبش االايميل بتاعه صح ، أو  انه طلب ما يستلمش ايميلات من اليوزرز التانيين.',
-'emailfrom'       => 'من:',
-'emailto'         => 'لـ:',
-'emailsubject'    => 'الموضوع:',
-'emailmessage'    => 'الرساله:',
-'emailsend'       => 'إبعت',
-'emailccme'       => 'ابعتلى نسخة من الايميل اللى بعته.',
-'emailccsubject'  => 'نسخة من رسالتك ل $1: $2',
-'emailsent'       => 'الإيميل اتبعت',
-'emailsenttext'   => 'الايميل بتاعك اتبعت خلاص.',
-'emailuserfooter' => 'الايميل دا بعته $1 لـ $2 عن طريق خاصية "مراسلة اليوزر" �ى {{SITENAME}}.',
+'usermailererror'  => 'البريد رجع غلط:',
+'defemailsubject'  => 'إيميل من {{SITENAME}}',
+'noemailtitle'     => 'ما�يش  عنوان ايميل',
+'noemailtext'      => 'اليوزر دا ما كتبش االايميل بتاعه صح .',
+'nowikiemailtitle' => 'الايميلات مش مسموح بيها',
+'nowikiemailtext'  => 'اليوزر دا اختار انه ما يستقبلش ايميلات من اليوزرز التانيين.',
+'email-legend'     => 'ابعت إيميل ليوزر {{SITENAME}} تانى',
+'emailfrom'        => 'من:',
+'emailto'          => 'لـ:',
+'emailsubject'     => 'الموضوع:',
+'emailmessage'     => 'الرساله:',
+'emailsend'        => 'إبعت',
+'emailccme'        => 'ابعتلى نسخة من الايميل اللى بعته.',
+'emailccsubject'   => 'نسخة من رسالتك ل $1: $2',
+'emailsent'        => 'الإيميل اتبعت',
+'emailsenttext'    => 'الايميل بتاعك اتبعت خلاص.',
+'emailuserfooter'  => 'الايميل دا بعته $1 لـ $2 عن طريق خاصية "مراسلة اليوزر" �ى {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'لستة الص�حات اللى باراقبها',
@@ -1741,12 +1945,7 @@ PICT # misc.
 'iteminvalidname'      => "مشكلة �ى '$1'، اسم مش صحيح...",
 'wlnote'               => "تحت �ى {{PLURAL:$1|آخر تغيير|آخر '''$1''' تغيير}} �ى آخر {{PLURAL:$2|ساعة|'''$2''' ساعة}}.",
 'wlshowlast'           => 'عرض اخر $1 ساعات $2 ايام $3',
-'watchlist-show-bots'  => 'عرض تعديلات البوتات',
-'watchlist-hide-bots'  => 'تخبية تعديلات البوت',
-'watchlist-show-own'   => 'عرض تعديلاتى',
-'watchlist-hide-own'   => 'اخ�اء تعديلاتى',
-'watchlist-show-minor' => 'عرض التعديلات الط�ي�ة',
-'watchlist-hide-minor' => 'خبى التعديلات الصغيره',
+'watchlist-options'    => 'اختيارات قايمة المراقبة',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'راقب...',
@@ -1785,85 +1984,105 @@ $NEWPAGE
 للاقتراحات والحصول على مساعدة إضا�ية:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'امسح الص�حه',
-'confirm'                     => 'أكد',
-'excontent'                   => "المحتوى كان: '$1'",
-'excontentauthor'             => "المحتوى كان: '$1' (والمساهم الوحيد كان '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "المحتوى قبل الت�ضيه كان: '$1'",
-'exblank'                     => 'الص�حه كانت �اضيه',
-'delete-confirm'              => 'مسح"$1"',
-'delete-legend'               => 'مسح',
-'historywarning'              => 'تحذير: الص�حه اللى ها  تمسحها ليها تاريخ:',
-'confirmdeletetext'           => 'انت على وشك انك تمسح ص�حه أو صوره و كل تاريخها.
+# Delete
+'deletepage'             => 'امسح الص�حه',
+'confirm'                => 'أكد',
+'excontent'              => "المحتوى كان: '$1'",
+'excontentauthor'        => "المحتوى كان: '$1' (والمساهم الوحيد كان '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "المحتوى قبل الت�ضيه كان: '$1'",
+'exblank'                => 'الص�حه كانت �اضيه',
+'delete-confirm'         => 'مسح"$1"',
+'delete-legend'          => 'مسح',
+'historywarning'         => 'تحذير: الص�حه اللى ها  تمسحها ليها تاريخ:',
+'confirmdeletetext'      => 'انت على وشك انك تمسح ص�حه أو صوره و كل تاريخها.
 من �ضلك  اتأكد انك عايز المسح وبأنك �اهم نتايج  العمليه  دى. عمليات الحذ� لازم تتم بناء على [[{{MediaWiki:Policy-url}}|القواعد المت�ق عليها]].',
-'actioncomplete'              => 'العمليه خلصت',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" اتمسحت.
-بص على $2 لسجل آخر عمليات المسح.',
-'deletedarticle'              => 'اتمسحت "[[$1]]"',
-'suppressedarticle'           => 'خببى "[[$1]]"',
-'dellogpage'                  => 'سجل المسح',
-'dellogpagetext'              => 'لسته بأحدث عمليات المسح.',
-'deletionlog'                 => 'سجل المسح',
-'reverted'                    => 'استرجع لنسخة أقدم',
-'deletecomment'               => 'سبب المسح:',
-'deleteotherreason'           => 'سبب تانى/اضا�ي:',
-'deletereasonotherlist'       => 'سبب تانى',
-'deletereason-dropdown'       => '*أسباب المسح المشهورة
+'actioncomplete'         => 'العمليه خلصت',
+'deletedtext'            => '"<nowiki>$1</nowiki>" اتمسحت.
+بص على $2 علشان تشو� سجل آخر عمليات المسح.',
+'deletedarticle'         => 'اتمسحت "[[$1]]"',
+'suppressedarticle'      => 'خببى "[[$1]]"',
+'dellogpage'             => 'سجل المسح',
+'dellogpagetext'         => 'لسته بأحدث عمليات المسح.',
+'deletionlog'            => 'سجل المسح',
+'reverted'               => 'استرجع لنسخة أقدم',
+'deletecomment'          => 'سبب المسح:',
+'deleteotherreason'      => 'سبب تانى/اضا�ي:',
+'deletereasonotherlist'  => 'سبب تانى',
+'deletereason-dropdown'  => '*أسباب المسح المشهورة
 ** طلب المؤل�
 ** التعدى على حقوق النشر
 ** التخريب',
-'delete-edit-reasonlist'      => 'عدل اسباب المسح',
-'delete-toobig'               => 'الص�حه دى  ليها تاريخ تعديل كبير، أكتر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
+'delete-edit-reasonlist' => 'عدل اسباب المسح',
+'delete-toobig'          => 'الص�حه دى  ليها تاريخ تعديل كبير، أكتر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
 مسح الص�حات اللى زى دى تم تحديده لمنع الاضطراب العرضى �ى {{SITENAME}}.',
-'delete-warning-toobig'       => 'الص�حة دى ليها تاريخ تعديل كبير، أكتر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
+'delete-warning-toobig'  => 'الص�حة دى ليها تاريخ تعديل كبير، أكتر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.
 ممكن مسحها يعمل اضطراب  �ى عمليات قاعدة البيانات �ى {{SITENAME}}؛
 استمر بس خد بالك.',
-'rollback'                    => 'إرجع �ى التعديلات',
-'rollback_short'              => 'إرجع لـ ورا',
-'rollbacklink'                => 'استعاده',
-'rollbackfailed'              => 'الترجيع ما ن�عش',
-'cantrollback'                => 'ماقدرناش نرجع �ى التعديل؛ آخر مساهم هوه الوحيد اللى ساهم �ى الص�حة دي.',
-'alreadyrolled'               => 'ماقدرناش نرجع آخر تعديل للص�حة [[$1]] [[User:$2|$2]] ([[User talk:$2|نقاش]]) لأن �ى واحد عمل تعديل او ترجيع للص�حة دى قبل كده.
-
-آخر واحد  عدل الص�حة دى هوه [[User:$3|$3]] ([[User talk:$3|نقاش]]).',
-'editcomment'                 => 'تعليق التعديل كان: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'استرجع التعديلات بواسطة [[Special:Contributions/$2|$2]] ([[User talk:$2|مناقشة]]) لآخر نسخة بواسطة [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'استرجع تعديلات $1؛
+
+# Rollback
+'rollback'         => 'إرجع �ى التعديلات',
+'rollback_short'   => 'إرجع لـ ورا',
+'rollbacklink'     => 'استعاده',
+'rollbackfailed'   => 'الترجيع ما ن�عش',
+'cantrollback'     => 'ماقدرناش نرجع �ى التعديل؛ آخر مساهم هوه الوحيد اللى ساهم �ى الص�حة دي.',
+'alreadyrolled'    => 'ماقدرناش نرجع التعديل الاخير لـ [[:$1]] بتاع [[User:$2|$2]] ([[User talk:$2|نقاش]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
+�ى واحد تانى عدل الص�حه او عمل استرجاع قبل كده.
+
+اخر تعديل للص�حه دى عمله [[User:$3|$3]] ([[User talk:$3|نقاش]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "ملخص التعديل كان: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'استرجع التعديلات بواسطة [[Special:Contributions/$2|$2]] ([[User talk:$2|مناقشة]]) لآخر نسخة بواسطة [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'استرجع تعديلات $1؛
 استرجع لآخر نسخة بواسطة $2.',
-'sessionfailure'              => 'الظاهر انه �ى مشكلة �ى جلسة دخولك دى ؛
+'sessionfailure'   => 'الظاهر انه �ى مشكلة �ى جلسة دخولك دى ؛
 وعلشان كدا العملية دى اتلغت كإجراء احترازى ضد الاختراق.
 لو سمحت دوس على زرار"رجوع" علشان تحمل الص�حة اللى جيت منها مرة تانية، و بعدين حاول تاني.',
+
+# Protect
 'protectlogpage'              => 'سجل الحمايه',
 'protectlogtext'              => 'تحت �ى لستة بالص�حات اللى اعملها حماية او اتشالت منها الحماية.
 شو� [[Special:ProtectedPages|لستة الص�حات المحمية]] لستة بعمليات حماية الص�حات الشغالة دلوقتي.',
 'protectedarticle'            => 'حمى "[[$1]]"',
 'modifiedarticleprotection'   => 'غير مستوى الحماية ل"[[$1]]"',
 'unprotectedarticle'          => 'شال حماية [[$1]]',
+'movedarticleprotection'      => 'نقل إعدادات الحماية من "[[$2]]" ل "[[$1]]"',
 'protect-title'               => 'غير مستوى الحماية ل"$1"',
+'prot_1movedto2'              => '[[$1]] اتنقلت ل [[$2]]',
 'protect-legend'              => 'تأكيد الحماية',
 'protectcomment'              => 'تعليق:',
 'protectexpiry'               => 'تنتهى �ى:',
 'protect_expiry_invalid'      => 'وقت الانتهاء مش صحيح.',
 'protect_expiry_old'          => 'وقت انتهاء المنع قديم.',
 'protect-unchain'             => 'استعادة سماح النقل',
-'protect-text'                => 'ممكن هنا تعرض و تغير مستوى الحمايه للص�حه <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'انت مش ممكن تغير مستويات الحماية وأنت ممنوع.
-الإعدادات بتاعة الص�حة <strong>$1</strong> دلوقتى هي:',
-'protect-locked-dblock'       => 'ما ين�عش تغير مستويات الحماية بسبب ق�ل قاعدة البيانات دلوقتي.
-الإعدادات بتاعة الص�حة <strong>$1</strong> دلوقتى هي:',
-'protect-locked-access'       => 'حسابك ما لوش  صلاحية تغيير مستوى حماية الص�حه.
-الاعدادات الحالية للص�حه <strong>$1</strong> هى:',
+'protect-text'                => "ممكن هنا تعرض و تغير مستوى الحمايه للص�حه '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "انت مش ممكن تغير مستويات الحماية وأنت ممنوع.
+الإعدادات بتاعة الص�حة '''$1''' دلوقتى هي:",
+'protect-locked-dblock'       => "ما ين�عش تغير مستويات الحماية بسبب ق�ل قاعدة البيانات دلوقتي.
+الإعدادات بتاعة الص�حة '''$1''' دلوقتى هي:",
+'protect-locked-access'       => "حسابك ما لوش  صلاحية تغيير مستوى حماية الص�حه.
+الاعدادات الحالية للص�حه '''$1''' هى:",
 'protect-cascadeon'           => 'الص�حه دى محميه لكونها متضمنه �ى {{PLURAL:$1|الص�حه|الص�حات}} دى، واللى  �يها اختيار حماية الص�حات المتضمنه شغال.
 ممكن تغير مستوى حماية الص�حه دى بدون التأثير على حماية الص�حات المتضمنه التانيه.',
-'protect-default'             => '(ا�تراضى)',
+'protect-default'             => 'السماح لكل اليوزرات',
 'protect-fallback'            => 'محتاج  اذن "$1"',
-'protect-level-autoconfirmed' => 'منع اليوزرز اللى مش متسجلين',
+'protect-level-autoconfirmed' => 'منع اليوزرات الجداد و اللى مش متسجلين',
 'protect-level-sysop'         => 'سيسوب بس',
 'protect-summary-cascade'     => 'متضمنه',
 'protect-expiring'            => 'تنتهى �ى $1 (UTC)',
+'protect-expiry-indefinite'   => 'مش محدد',
 'protect-cascade'             => 'احمى الص�حات المتضمنه �ى الص�حه دى (حمايه مضمنه)',
 'protect-cantedit'            => 'مش ممكن تغير مستويات الحمايه للص�حه دى، لانك ماعندكش صلاحية تعديلها.',
+'protect-othertime'           => 'وقت آخر:',
+'protect-othertime-op'        => 'وقت آخر',
+'protect-existing-expiry'     => 'تاريخ الانتهاء الموجود: $3، $2',
+'protect-otherreason'         => 'سبب آخر/إضا�ى:',
+'protect-otherreason-op'      => 'سبب آخر/إضا�ى',
+'protect-dropdown'            => '*أسباب الحماية الشايعة
+** تخريب شديد
+** سبام شديد
+** حرب تحرير بتعطل العمل المنتج
+** ص�حة زوارها كتير',
+'protect-edit-reasonlist'     => 'عدل أسباب الحماية',
+'protect-expiry-options'      => '1 ساعة:1 hour,1 يوم:1 day,1 أسبوع:1 week,2 أسبوع:2 weeks,1 شهر:1 month,3 شهر:3 months,6 شهر:6 months,1 سنة:1 year,لا نهائى:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'سماح:',
 'restriction-level'           => 'مستوى القيود :',
 'minimum-size'                => 'أقل حجم',
@@ -1886,7 +2105,9 @@ $NEWPAGE
 'undeletepage'                 => 'عرض واسترجاع الص�حات المسوحة',
 'undeletepagetitle'            => "'''دا بيتكون من النسخ الممسوحة لـ[[:$1]]'''.",
 'viewdeletedpage'              => 'عرض الص�حات الممسوحة',
-'undeletepagetext'             => 'الص�حات دى إتمسحت بس لسة موجودة �ى الأرشي� و ممكن تترجع.
+'undeletepagetext'             => '{{PLURAL:$1|الص�حة دى اتمسحت بس ليه|$1الص�حات دى اتمسحت بس ليه}} موجودة �ى الارشي� و ممكن تترجع.
+
+
 الأرشي� ممكن يتنض� كل شوية.',
 'undelete-fieldset-title'      => 'رجع النسخ',
 'undeleteextrahelp'            => "علشان ترجع تاريخ الص�حة كله، سيب كل الصناديق �اضية و دوس '''''ترجيع'''''.
@@ -1900,13 +2121,14 @@ $NEWPAGE
 'undeletehistorynoadmin'       => 'الص�حة دى اتمسحت.
 سبب المسح موجود �ى الملخص اللى تحت، كمان �ى ت�اصيل اليوزرز اللى عملو تعديل على الص�حة دى قبل ما تتمسح.
 نص المراجعات الممسوحة دى متو�رة بس للاداريين.',
-'undelete-revision'            => 'المراجعة الممسوحة ل$1 (بتاريخ $2) عن طريق $3:',
+'undelete-revision'            => 'المراجعة الممسوحة ل$1 (بتاريخ $4، الساعة $5) عن طريق $3:',
 'undeleterevision-missing'     => 'مراجعة مش صحيحة أو ضايعة.
 يمكن اللينك بتاعتك بايظة، أو يمكن المراجعة اترجعت او اتشالت من الارشي�.',
 'undelete-nodiff'              => 'ما لقيناش نسخة قديمة.',
 'undeletebtn'                  => 'استعاده',
 'undeletelink'                 => 'استرجاع',
 'undeletereset'                => 'ابتدى من الأول',
+'undeleteinvert'               => 'اعكس الاختيار',
 'undeletecomment'              => 'تعليق:',
 'undeletedarticle'             => 'رجع  "[[$1]]" تاني',
 'undeletedrevisions'           => 'رجعنا تانى {{PLURAL:$1|تعديل واحد|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديل}}',
@@ -1930,7 +2152,7 @@ $NEWPAGE
 'undelete-error-long'          => 'حصلت غلطات و المل� بيترجع:
 
 $1',
-'undelete-show-file-confirm'   => 'انتا متأكد من انك عايز تشو� المراجعة الملغية بتاعة المل� "<nowiki>$1</nowiki>" من $2 �ي $3؟',
+'undelete-show-file-confirm'   => 'انتا متأكد من انك عايز تشو� المراجعة الملغية بتاعة المل� "<nowiki>$1</nowiki>" من $2 �ى $3؟',
 'undelete-show-file-submit'    => 'ايوه',
 
 # Namespace form on various pages
@@ -1939,27 +2161,27 @@ $1',
 'blanknamespace' => '(رئيسى)',
 
 # Contributions
-'contributions' => 'مساهمات اليوزر',
-'mycontris'     => 'تعديلاتى',
-'contribsub2'   => 'لليوزر $1 ($2)',
-'nocontribs'    => 'مالقيناش   تغييرات تطابق المحددات دي.',
-'uctop'         => '(�وق)',
-'month'         => 'من شهر (واللى قبل كده):',
-'year'          => 'من سنة (واللى قبل كده):',
-
-'sp-contributions-newbies'     => 'عرض مساهمات الحسابات الجديدة بس',
-'sp-contributions-newbies-sub' => 'للحسابات الجديده',
-'sp-contributions-blocklog'    => 'سجل المنع',
-'sp-contributions-search'      => 'دور على مساهمات',
-'sp-contributions-username'    => 'عنوان أيبى أو اسم يوزر:',
-'sp-contributions-submit'      => 'تدوير',
+'contributions'       => 'تعديلات اليوزر',
+'contributions-title' => 'مساهمات اليوزر ل$1',
+'mycontris'           => 'تعديلاتى',
+'contribsub2'         => 'لليوزر $1 ($2)',
+'nocontribs'          => 'مالقيناش   تغييرات تطابق المحددات دي.',
+'uctop'               => '(�وق)',
+'month'               => 'من شهر (واللى قبل كده):',
+'year'                => 'من سنة (واللى قبل كده):',
+
+'sp-contributions-newbies'       => 'عرض مساهمات الحسابات الجديدة بس',
+'sp-contributions-newbies-sub'   => 'للحسابات الجديده',
+'sp-contributions-newbies-title' => 'مساهمات  اليوزر للحسابات الجديدة',
+'sp-contributions-blocklog'      => 'سجل المنع',
+'sp-contributions-search'        => 'دور على مساهمات',
+'sp-contributions-username'      => 'عنوان أيبى أو اسم يوزر:',
+'sp-contributions-submit'        => 'تدوير',
 
 # What links here
 'whatlinkshere'            => 'ايه بيوصل هنا',
 'whatlinkshere-title'      => 'الص�حات اللى بتودى لـ "$1"',
 'whatlinkshere-page'       => 'الص�حة:',
-'whatlinkshere-barrow'     => '>',
-'linklistsub'              => '(لسته بالوصلات)',
 'linkshere'                => "الص�حات دى �يها وصله ل '''[[:$1]]''':",
 'nolinkshere'              => "ما�يش ص�حات بتوصل ل '''[[:$1]]'''.",
 'nolinkshere-ns'           => "ما�يش ص�حات بتوصل لـ '''[[:$1]]''' �ى النطاق اللى انت اختارته.",
@@ -2006,6 +2228,8 @@ $1',
 'ipbotherreason'                  => 'سبب تاني:',
 'ipbhidename'                     => 'خبى اسم اليوزر من سجل المنع، لستة المنع النشطة ولستة اليوزرز',
 'ipbwatchuser'                    => 'راقب ص�حات اليوزر و النقاش بتوع اليوزر دا',
+'ipballowusertalk'                => 'السماح لليوزر ده بتعديل ص�حة نقاشه الخاصة أثناء المنع',
+'ipb-change-block'                => 'عيد منع اليوزر بالإعدادات دى',
 'badipaddress'                    => 'عنوان أيبى مش صحيح',
 'blockipsuccesssub'               => 'المنع حصل بنجاح',
 'blockipsuccesstext'              => 'اتمنع [[Special:Contributions/$1|$1]].<br />
@@ -2015,14 +2239,18 @@ $1',
 'ipb-unblock'                     => 'ر�ع المنع عن يوزر أو عنوان أيبي',
 'ipb-blocklist-addr'              => 'عرض المنع الموجود دلوقتى  ل$1',
 'ipb-blocklist'                   => 'عرض حالات المنع الموجودة دلوقتي',
+'ipb-blocklist-contribs'          => 'مساهمات $1',
 'unblockip'                       => 'ر�ع منع يوزر',
 'unblockiptext'                   => 'استخدم الاستمارة اللى تحت علشان ترجع حق الكتابة بتاعة عنوان أيبى أو يوزر اتسحب منه الحق دا قبل كدا.',
-'ipusubmit'                       => 'ر�ع منع  العنوان ده',
+'ipusubmit'                       => 'ار�ع المنع دا',
 'unblocked'                       => 'المنع اتر�ع عن [[User:$1|$1]]',
 'unblocked-id'                    => 'منع $1 اتر�ع',
 'ipblocklist'                     => 'لستة عناوين الااى بى واسامى اليوزر الممنوعه',
 'ipblocklist-legend'              => 'دور على يوزر ممنوع',
 'ipblocklist-username'            => 'اسم اليوزر او عنوان ال اى بي.',
+'ipblocklist-sh-userblocks'       => '$1 عمليات منع الحسابات',
+'ipblocklist-sh-tempblocks'       => '$1 عمليات المنع المؤقتة',
+'ipblocklist-sh-addressblocks'    => '$1 عمليات منع الأيبى الم�ردة',
 'ipblocklist-submit'              => 'تدوير',
 'blocklistline'                   => '$1, $2 منع $3 ($4)',
 'infiniteblock'                   => 'دايم',
@@ -2031,15 +2259,19 @@ $1',
 'noautoblockblock'                => 'المنع الاوتوماتيكى متعطل',
 'createaccountblock'              => ' �تح الحسابات ممنوع',
 'emailblock'                      => 'الإيميل ممنوع',
+'blocklist-nousertalk'            => 'لا يمكنه تعديل ص�حة نقاشه الخاصة',
 'ipblocklist-empty'               => 'لستة المنع �اضية.',
 'ipblocklist-no-results'          => 'عنوان الأيبى أو اسم اليوزر المطلوب مش ممنوع.',
 'blocklink'                       => 'منع',
 'unblocklink'                     => 'ر�ع المنع',
+'change-blocklink'                => 'غير المنع',
 'contribslink'                    => 'تعديلات',
 'autoblocker'                     => 'انت اتمنعت اوتوماتيكى لأن الأيبى بتاعك استعمله "[[User:$1|$1]]" �ى ال�ترة الاخيرة.
 السبب اللى خلا $1 يتمنع هو: "$2"',
 'blocklogpage'                    => 'سجل المنع',
+'blocklog-fulllog'                => 'سجل المنع الكامل',
 'blocklogentry'                   => 'منع "[[$1]]" ل�تره زمنيه مدتها $2 $3',
+'reblock-logentry'                => 'غير إعدادات المنع ل[[$1]] بتاريخ انتهاء $2 $3',
 'blocklogtext'                    => 'دا سجل بعمليات المنع ور�ع المنع.
 عناوين الأيبى اللى اتمنعت اوتوماتيكى مش معروضة.
 شو� [[Special:IPBlockList|عناوين الأيبى الممنوعة]] علشان تشو� عمليات المنع الشغالة دلوقتي.',
@@ -2048,11 +2280,14 @@ $1',
 'block-log-flags-nocreate'        => ' �تح الحسابات ممنوع',
 'block-log-flags-noautoblock'     => 'المنع التلقائى متعطل',
 'block-log-flags-noemail'         => 'الإيميل ممنوع',
+'block-log-flags-nousertalk'      => 'لا يمكن تعديل ص�حة النقاش الخاصة',
 'block-log-flags-angry-autoblock' => 'المنع الاوتوماتيكى المتقدم مت�عل',
 'range_block_disabled'            => 'إمكانيةالسيسوب لمنع نطاق متعطلة.',
 'ipb_expiry_invalid'              => 'تاريخ الانتهاء مش صحيح.',
 'ipb_expiry_temp'                 => 'عمليات منع أسماء اليوزرز المستخبية لازم تكون على طول.',
 'ipb_already_blocked'             => '"$1" ممنوع �علا',
+'ipb-needreblock'                 => '== ممنوع بال�عل ==
+$1 ممنوع �علا. عايز تغير الإعدادات؟',
 'ipb_cant_unblock'                => 'غلطه: عنوان الااى بى الممنوع  مش موجود  $1.
 يمكن اتر�ع منعه �علا.',
 'ipb_blocked_as_range'            => 'غلط: الأيبى $1 مش ممنوع مباشرةو مش ممكن ر�ع المنع عنه.
@@ -2068,6 +2303,7 @@ $1',
 'sorbsreason'                     => 'عنوان الأيبى بتاعك موجود كبروكسى م�توح �ى DNSBL اللى بيستعمله{{SITENAME}}.',
 'sorbs_create_account_reason'     => 'عنوان الأيبى بتاعك موجود كبروكسى م�توح �ى ال DNSBL اللى بيستعمله {{SITENAME}}. 
 ما ين�عش ت�تح حساب.',
+'cant-block-while-blocked'        => 'أنت لا يمكنك منع اليوزرز التانين و أنت ممنوع.',
 
 # Developer tools
 'lockdb'              => 'اق�ل قاعدة البيانات',
@@ -2091,9 +2327,9 @@ $1',
 'databasenotlocked'   => 'قاعدة البيانات بتاعتك مش  مق�ولة.',
 
 # Move page
-'move-page'               => 'انقل $1',
-'move-page-legend'        => 'انقل الص�حة',
-'movepagetext'            => "لو استعملت النموذج ده ممكن تغير اسم الص�حه، و تنقل تاريخها للاسم الجديد.
+'move-page'                    => 'انقل $1',
+'move-page-legend'             => 'انقل الص�حة',
+'movepagetext'                 => "لو استعملت النموذج ده ممكن تغير اسم الص�حه، و تنقل تاريخها للاسم الجديد.
 هاتبتدى تحويله من العنوان القديم للص�حه بالعنوان الجديد.
 لكن،  الوصلات �ى الص�حات اللى بتتوصل بالص�حه دى مش ها تتغير؛ اتأكد من ان ما�يش  [[Special:BrokenRedirects|وصلات مقطوعه]] ، أو [[Special:DoubleRedirects|وصلات متتاليه]] ، للتأكد من أن المقالات تتصل مع بعضها بشكل مناسب.
 
@@ -2101,52 +2337,64 @@ $1',
 
 '''تحذير!'''
 نقل الص�حه ممكن يكون له اثار كبيرة، وتغييرات مش متوقعه بالنسبة للص�حات المشهوره. من �ضلك  اتأكد من �هم عواقب نقل الص�حات قبل ما تقوم بنقل الص�حه.",
-'movepagetalktext'        => "ص�حة المناقشه بتاعة المقاله هاتتنقل برضه، لو كانت موجوده. لكن ص�حة المناقشه '''مش''' هاتتنقل �ى الحالات دى:
+'movepagetalktext'             => "ص�حة المناقشه بتاعة المقاله هاتتنقل برضه، لو كانت موجوده. لكن ص�حة المناقشه '''مش''' هاتتنقل �ى الحالات دى:
 * نقل الص�حة عبر نطاقات  مختل�ه.
 *�يه  ص�حة مناقشه موجوده تحت العنوان الجديد للمقاله.
 * لو انت شلت اختيار نقل ص�حة المناقشه .
 
 و�ى الحالات  دى، لو عايز  تنقل ص�حة المناقشه  لازم تنقل أو تدمج محتوياتها  يدويا.",
-'movearticle'             => 'انقل الص�حه:',
-'movenotallowed'          => 'ماعندكش الصلاحية لنقل الص�حات.',
-'newtitle'                => 'للعنوان الجديد:',
-'move-watch'              => 'راقب الص�حه دى',
-'movepagebtn'             => 'نقل الص�حه',
-'pagemovedsub'            => 'تم  النقل بنجاح',
-'movepage-moved'          => '<big>\'\'\'"$1" اتنقلت ل"$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'يا اما �يه ص�حه  بالاسم ده، او ان الاسم اللى  تم اختياره مش صالح.
+'movearticle'                  => 'انقل الص�حه:',
+'movenologin'                  => 'مش متسجل',
+'movenologintext'              => 'لازم تكون يوزر متسجل و تعمل [[Special:UserLogin|دخول]] علشان تنقل الص�حة.',
+'movenotallowed'               => 'ماعندكش الصلاحية لنقل الص�حات.',
+'movenotallowedfile'           => 'معندكش اذن تنقل المل� ده.',
+'cant-move-user-page'          => 'أنت لا تمتلك الصلاحية لنقل ص�حات اليوزر الرئيسية.',
+'cant-move-to-user-page'       => 'أنت لا تمتلك الصلاحية لنقل ص�حة لص�حة يوزر (ماعدا لص�حة يوزر �رعية).',
+'newtitle'                     => 'للعنوان الجديد:',
+'move-watch'                   => 'راقب الص�حه دى',
+'movepagebtn'                  => 'نقل الص�حه',
+'pagemovedsub'                 => 'تم  النقل بنجاح',
+'movepage-moved'               => '<big>\'\'\'"$1" خلاص اتنقلت لـ "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '�ى تحويله اتعملت.',
+'movepage-moved-noredirect'    => 'التحويله ما اتعملتش.',
+'articleexists'                => 'يا اما �يه ص�حه  بالاسم ده، او ان الاسم اللى  تم اختياره مش صالح.
 لو سمحت اختار اسم تانى.',
-'cantmove-titleprotected' => 'ما ين�عش تنقل ص�حة للمكان دا،لأن العنوان الجديد محمى ضد الانشاء',
-'talkexists'              => "'''الص�حه دى اتنقلت لص�حة بنجاح، ولكن ص�حة المناقشه بتاعتها ما اتنقلتش  علشان �يه ص�حة مناقشه تحت العنوان الجديد.
+'cantmove-titleprotected'      => 'ما ين�عش تنقل ص�حة للمكان دا،لأن العنوان الجديد محمى ضد الانشاء',
+'talkexists'                   => "'''الص�حه دى اتنقلت لص�حة بنجاح، ولكن ص�حة المناقشه بتاعتها ما اتنقلتش  علشان �يه ص�حة مناقشه تحت العنوان الجديد.
 من �ضلك انقل محتويات ص�حة المناقشه يدويا، وادمجها مع المحتويات اللى قبل كده.'''",
-'movedto'                 => 'اتنقلت ل',
-'movetalk'                => 'انقل ص�حة المناقشه.',
-'move-subpages'           => 'انقل كل الص�حات ال�رعية، إن امكن',
-'move-talk-subpages'      => 'انقل كل الص�حات ال�رعية لص�حة النقاش، لو ممكن',
-'movepage-page-exists'    => 'الص�حة $1 موجودة �علا ومش ممكن الكتابة عليها اوتوماتيكي..',
-'movepage-page-moved'     => 'الص�حة $1 اتنقلت لـ $2.',
-'movepage-page-unmoved'   => 'ماقدرناش ننقل الص�حة $1 لـ $2.',
-'movepage-max-pages'      => 'الحد الأقصى $1 {{PLURAL:$1|ص�حة|ص�حة}} اتنقل. و ما�يش حاجة تانى ح تتنقل اوتوماتيكي.',
-'1movedto2'               => '[[$1]] اتنقلت ل [[$2]]',
-'1movedto2_redir'         => '[[$1]] انقلت لـ[[$2]] �وق التحويلة',
-'movelogpage'             => 'سجل النقل',
-'movelogpagetext'         => 'تحت �ى لستة الص�حات اللى اتنقلت.',
-'movereason'              => 'السبب:',
-'revertmove'              => 'استعاده',
-'delete_and_move'         => 'مسح ونقل',
-'delete_and_move_text'    => '==المسح مطلوب==
+'movedto'                      => 'اتنقلت ل',
+'movetalk'                     => 'انقل ص�حة المناقشه.',
+'move-subpages'                => 'انقل كل الص�حات ال�رعية، إن امكن',
+'move-talk-subpages'           => 'انقل كل الص�حات ال�رعية لص�حة النقاش، لو ممكن',
+'movepage-page-exists'         => 'الص�حة $1 موجودة �علا ومش ممكن الكتابة عليها اوتوماتيكي..',
+'movepage-page-moved'          => 'الص�حة $1 اتنقلت لـ $2.',
+'movepage-page-unmoved'        => 'ماقدرناش ننقل الص�حة $1 لـ $2.',
+'movepage-max-pages'           => 'الحد الأقصى $1 {{PLURAL:$1|ص�حة|ص�حة}} اتنقل. و ما�يش حاجة تانى ح تتنقل اوتوماتيكي.',
+'1movedto2'                    => '[[$1]] اتنقلت ل [[$2]]',
+'1movedto2_redir'              => '[[$1]] انقلت لـ[[$2]] �وق التحويلة',
+'move-redirect-suppressed'     => ' التحويل ممنوع.',
+'movelogpage'                  => 'سجل النقل',
+'movelogpagetext'              => 'تحت �ى لستة الص�حات اللى اتنقلت.',
+'movereason'                   => 'السبب:',
+'revertmove'                   => 'استعاده',
+'delete_and_move'              => 'مسح ونقل',
+'delete_and_move_text'         => '==المسح مطلوب==
 الص�حة الهد� "[[:$1]]" موجودة �علا.
 انت عايز تمسحها علشان تقدر تنقلها؟',
-'delete_and_move_confirm' => 'ايوة، امسح الص�حة',
-'delete_and_move_reason'  => 'اتمسحت علشان تسمح للنقل',
-'selfmove'                => 'عنوان المصدر والهد� هو ن�سه؛
+'delete_and_move_confirm'      => 'ايوة، امسح الص�حة',
+'delete_and_move_reason'       => 'اتمسحت علشان تسمح للنقل',
+'selfmove'                     => 'عنوان المصدر والهد� هو ن�سه؛
 مش ممكن نقل الص�حة على ن�سها.',
-'immobile_namespace'      => 'عنوان المصدر أو الهد� ليه طبيعة خاصة؛
-مش ممكن تنقل الص�حات من و للنطاق دا.',
-'imagenocrossnamespace'   => 'مش ممكن تنقل المل� لنطاق غير نطاق المل�ات',
-'imagetypemismatch'       => 'امتداد المل� الجديد مش ماشى مع نوعه',
-'imageinvalidfilename'    => 'اسم المل� الهد� مش صحيح',
-'fix-double-redirects'    => 'اعمل تحديث لاى تحويلات بتشاور على العنوان الاصلي',
+'immobile-source-namespace'    => 'غير قادر على نقل الص�حات �ى النطاق "$1"',
+'immobile-target-namespace'    => 'غير قادر على نقل الص�حات إلى النطاق "$1"',
+'immobile-target-namespace-iw' => 'لينك الانترويكى ماين�عش تكون هد� لنقل الص�حه',
+'immobile-source-page'         => 'الص�حه دى مش قابلة للنقل.',
+'immobile-target-page'         => 'غير قادر على النقل إلى العنوان الوجهة هذا.',
+'imagenocrossnamespace'        => 'مش ممكن تنقل المل� لنطاق غير نطاق المل�ات',
+'imagetypemismatch'            => 'امتداد المل� الجديد مش ماشى مع نوعه',
+'imageinvalidfilename'         => 'اسم المل� الهد� مش صحيح',
+'fix-double-redirects'         => 'اعمل تحديث لاى تحويلات بتشاور على العنوان الاصلي',
+'move-leave-redirect'          => 'سيب تحويله �ى الص�حه',
 
 # Export
 'export'            => 'تصدير ص�حات',
@@ -2154,7 +2402,7 @@ $1',
 
 علشان تصدر الص�حات، اكتب العناوين �ى الصندوق اللى تحت، عنوان واحد �ى كل السطر، و اختار اذا كنت عايز  النسخة الحالية بالإضا�ة  للنسخ القديمة كاملة أو مع معلومات تاريخ الص�حة عنها ولا بس النسخة الحالية مع معلومات عن التعديل الأخير.
 
-�ى الحالة التانية ممكن تستخدم لينك مباشرة، مثلا [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] للص�حة [[{{MediaWiki:Mainpage}}]].',
+�ى الحالة التانية ممكن تستخدم لينك مباشرة، مثلا [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] للص�حة [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'ضمن المراجعة دى بس، ومش التاريخ الكامل',
 'exportnohistory'   => "----
 ملاحظة:''' التصدير الكامل لتاريخ الص�حة  بالطريقة دى مش شغال بسبب الاداء'''",
@@ -2190,9 +2438,12 @@ $1',
 'import-interwiki-text'      => 'اختار الويكى و عنوان الص�حة اللى عاوز تستوردها.
 تواريخ التعديلات و اسامى المحررين  ح يتحا�ظ عليها.
 كل عمليات الاستيراد للترانسويكى بتتسجل �ى [[Special:Log/import|سجل الاستيراد]].',
+'import-interwiki-source'    => 'مصدر ويكي/ص�حه:',
 'import-interwiki-history'   => 'انسخ كل نسخ التاريخ للص�حة دي',
 'import-interwiki-submit'    => 'استيراد',
 'import-interwiki-namespace' => 'النطاق الهد�:',
+'import-upload-filename'     => 'اسم المل�:',
+'import-comment'             => 'تعليق:',
 'importtext'                 => 'لو سمحت تصدّر المل� من الويكى المصدر عن طريق [[Special:Export|خاصية التصدير]].
 اح�ظه على جهازك و بعدين حمله هنا.',
 'importstart'                => 'استيراد ص�حات...',
@@ -2219,7 +2470,7 @@ $1',
 'xml-error-string'           => '$1 عند السطر $2، العمود $3 (بايت $4): $5',
 'import-upload'              => 'حمل بيانات إكس إم إل',
 'import-token-mismatch'      => 'الداتا بتاعة الجلسة ضاعت. لو سمحت تحاول تاني.',
-'import-invalid-interwiki'   => 'ماين�عش تستورد من الويكي المتحدد.',
+'import-invalid-interwiki'   => 'ماين�عش تستورد من الويكى المتحدد.',
 
 # Import log
 'importlogpage'                    => 'سجل الاستيراد',
@@ -2230,20 +2481,20 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|تعديل واحد|تعديل}} من $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'ص�حتى الخاصه',
+'tooltip-pt-userpage'             => 'ص�حة اليوزر بتاعتك',
 'tooltip-pt-anonuserpage'         => 'ص�حة اليوزر للأيبى اللى انت بتعمل منه تحرير',
-'tooltip-pt-mytalk'               => 'ص�حة مناقشاتى',
+'tooltip-pt-mytalk'               => 'ص�حة النقاش بتاعتك',
 'tooltip-pt-anontalk'             => 'نقاش حوالين التعديلات من عنوان الأيبى دا',
 'tooltip-pt-preferences'          => 'ت�ضيلاتى',
 'tooltip-pt-watchlist'            => 'لسته بالص�حات اللى انت بتراقب التعديلات �يها',
-'tooltip-pt-mycontris'            => 'لسته بتعديلاتى',
+'tooltip-pt-mycontris'            => 'لستة تعديلاتك',
 'tooltip-pt-login'                => 'من الا�ضل انك تسجل دخولك، لكن ده مش شرط',
 'tooltip-pt-anonlogin'            => 'من الأ�ضل انك تسجل دخولك، لكن ده مش إجبارى.',
 'tooltip-pt-logout'               => 'خروج',
 'tooltip-ca-talk'                 => 'مناقشة ص�حة الموضوع',
 'tooltip-ca-edit'                 => 'ممكن تعدل  الص�حه دى.
 بس لو سمحت استعمل زرار البرو�ه قبل ما تسيي�ها.',
-'tooltip-ca-addsection'           => 'ضي� تعليق للمناقشه دى.',
+'tooltip-ca-addsection'           => 'ابتدى قسم جديد',
 'tooltip-ca-viewsource'           => 'الص�حه دى محميه.
 ممكن تشو� مصدرها.',
 'tooltip-ca-history'              => 'النسخ القديمة من الص�حة دي',
@@ -2259,7 +2510,7 @@ $1',
 'tooltip-p-logo'                  => 'الص�حه الرئيسيه',
 'tooltip-n-mainpage'              => 'زور الص�حه الرئيسيه',
 'tooltip-n-portal'                => 'عن المشروع، ممكن تعمل ايه، و �ين تلاقى اللى بتدور عليه',
-'tooltip-n-currentevents'         => 'مطالعه سريعه لاهم الاحداث دلوقتى',
+'tooltip-n-currentevents'         => 'مطالعه سريعه لاهم الاخبار دلوقتى',
 'tooltip-n-recentchanges'         => 'لسته بالتعديلات الجديده �ى الويكى',
 'tooltip-n-randompage'            => 'حمل ص�حة عشوائيه',
 'tooltip-n-help'                  => 'لو محتاج مساعده بص هنا',
@@ -2291,6 +2542,8 @@ $1',
 'tooltip-watch'                   => 'ضم الص�حه دى للستة الص�حات اللى بتراقبها',
 'tooltip-recreate'                => 'إنشيء الص�حة تانى مع انها اتمسحت قبل كدا',
 'tooltip-upload'                  => 'ابتدى التحميل',
+'tooltip-rollback'                => '"رول باك" بترجع التعديل (التعديلات)  �ى  الص�حة دى للمساهم الأخير بدوسة واحدة.',
+'tooltip-undo'                    => '"رجوع" بترجع  التعديل دا وبت�تح استمارة التعديل �ى شكل البرو�ة. بتسمح بإضا�ة سبب �ى الملخص.',
 
 # Stylesheets
 'common.css'      => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على كل الواجهات */',
@@ -2302,6 +2555,8 @@ $1',
 'chick.css'       => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمى واجهة تشيك */',
 'simple.css'      => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمى واجهة سيمبل */',
 'modern.css'      => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمى واجهة مودرن */',
+'print.css'       => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على ناتج الطباعة */',
+'handheld.css'    => '/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على الأجهزة المحمولة بالاعتماد على الواجهة المضبوطة �ى $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => '/*  أى جا�اسكريبت  هناح يتحمل لكل اليوزرز مع كل تحميل للص�حة. */',
@@ -2320,12 +2575,12 @@ $1',
 'notacceptable'     => 'السير�ر بتاع الويكى مش ممكن يديلك بيانات بصيغة ممكن عميلك يقراها.',
 
 # Attribution
-'anonymous'        => 'يوزر مجهول ل {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|يوزر مجهول|يوزرز مجهولين}} ل {{SITENAME}}',
 'siteuser'         => 'يوزر {{SITENAME}} $1',
 'lastmodifiedatby' => 'آخر تعديل  للص�حة دى كان �ى $2، $1 عن طريق $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'بناء على عمل $1.',
 'others'           => 'تانيين',
-'siteusers'        => 'يوزر(ز) {{SITENAME}} $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|يوزر|يوزرز}} $1',
 'creditspage'      => 'حقوق الص�حة',
 'nocredits'        => 'ما�يش معلومات حقوق متو�رة للص�حة دي.',
 
@@ -2346,6 +2601,16 @@ $1',
 'numauthors'     => 'عدد المؤل�ين المميزين (ص�حة): $1',
 'numtalkauthors' => 'عدد المؤل�ين المميزين (صح�ة نقاش): $1',
 
+# Skin names
+'skinname-standard'    => 'كلاسيك',
+'skinname-nostalgia'   => 'نوستالجيا',
+'skinname-cologneblue' => 'كولون بلو',
+'skinname-monobook'    => 'مونوبوك',
+'skinname-myskin'      => 'ماى سكين',
+'skinname-chick'       => 'تشيك',
+'skinname-simple'      => 'سيمبل',
+'skinname-modern'      => 'مودرن',
+
 # Math options
 'mw_math_png'    => 'دايما اعرض PNG',
 'mw_math_simple' => 'يا إما HTML لو بسيطة قوى أو PNG',
@@ -2366,11 +2631,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'مش مسموح ليك تعلم على تغييراتك الشخصية كأنها متراجعة.',
 
 # Patrol log
-'patrol-log-page'   => 'سجل المراجعة',
-'patrol-log-header' => 'دا سجل بالنسخ المتراجعة',
-'patrol-log-line'   => 'علم على $1 من $2 كأنها متراجعة $3',
-'patrol-log-auto'   => '(اوتوماتيكي)',
-'patrol-log-diff'   => 'Ù†$1',
+'patrol-log-page'      => 'سجل المراجعة',
+'patrol-log-header'    => 'دا سجل بالنسخ المتراجعة',
+'patrol-log-line'      => 'علم على $1 من $2 كأنها متراجعة $3',
+'patrol-log-auto'      => '(اوتوماتيكي)',
+'patrol-log-diff'      => 'Ù†$1',
+'log-show-hide-patrol' => '$1 سجل المراجعة',
 
 # Image deletion
 'deletedrevision'                 => 'مسح النسخة القديمة $1',
@@ -2387,6 +2653,9 @@ $1',
 'previousdiff' => '→ التعديل اللى قبل كده',
 'nextdiff'     => 'التعديل اللى بعد كده �',
 
+# Visual comparison
+'visual-comparison' => 'مقارنة بصرية',
+
 # Media information
 'mediawarning'         => "'''تحذير''': المل� دا �يه كود خبيث، يمكن عند تشغيله يبوظ الكمبيوتر بتاعك.<hr />",
 'imagemaxsize'         => 'حدد الصور �ى ص�حات وص� المل�ات لـ:',
@@ -2399,10 +2668,12 @@ $1',
 'show-big-image'       => 'الصورة بدقه كامله',
 'show-big-image-thumb' => '<small>حجم البرو�ه دى: $1 × $2 بكسل</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'جاليرى الصور الجديده',
 'imagelisttext'         => 'دى لستة بـ$1 {{PLURAL:$1|مل�|مل�ات}} مترتبة $2.',
 'newimages-summary'     => 'الص�حةالمخصوصة دى بتعرض آخر المل�ات المتحملة',
+'newimages-legend'      => 'اسم المل�',
+'newimages-label'       => 'اسم المل� (او حتة منه):',
 'showhidebots'          => '($1 بوتات)',
 'noimages'              => 'ما�يش حاجة للعرض.',
 'ilsubmit'              => 'تدوير',
@@ -2624,6 +2895,18 @@ $1',
 'exif-lightsource-24'  => 'تنجستين ستوديو أيزو',
 'exif-lightsource-255' => 'مصدر  نور تانى',
 
+# Flash modes
+'exif-flash-fired-0'    => 'ال�لاش ما بدأش',
+'exif-flash-fired-1'    => 'ال�لاش ابتدى',
+'exif-flash-return-0'   => 'م�يش دالة كش� رجوع وميض',
+'exif-flash-return-2'   => 'ضوء رجوع الوميض ما اتكش�ش',
+'exif-flash-return-3'   => 'ضوء رجوع الوميض تم اتكش�',
+'exif-flash-mode-1'     => 'بدء �لاش إجبارى',
+'exif-flash-mode-2'     => 'ضغط �لاش إجبارى',
+'exif-flash-mode-3'     => 'نمط أوتوماتيك',
+'exif-flash-function-1' => 'لا وظي�ة �لاش',
+'exif-flash-redeye-1'   => 'نمط اختزال العين الحمرا',
+
 'exif-focalplaneresolutionunit-2' => 'بوصة',
 
 'exif-sensingmethod-1' => 'مش متعر�',
@@ -2773,26 +3056,14 @@ $1
 
 'unit-pixel' => 'بيكس',
 
-# HTML dump
-'redirectingto' => 'بتتحول لـ [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'امسح الكاش بتاع الص�حة دي؟
-
-$1',
 'confirm_purge_button' => 'طيب',
-
-# AJAX search
-'searchcontaining' => "دور على الص�حات اللى �يها ''$1''.",
-'searchnamed'      => "دور على الص�حات اللى اسمها ''$1''.",
-'articletitles'    => "الص�حات اللى بتبتدى بـ''$1''",
-'hideresults'      => 'خبى النتايج',
-'useajaxsearch'    => 'دور بـ أجاكس',
+'confirm-purge-top'    => 'امسح الكاش بتاع الص�حة دي؟',
+'confirm-purge-bottom' => 'إ�راغ كاش ص�حة يمحو الكاش ويجبر أحدث نسخة على الظهور.',
 
 # Separators for various lists, etc.
-'semicolon-separator' => 'Ø›',
+'semicolon-separator' => 'Ø›&#32;',
 'comma-separator'     => '،&#32;',
-'autocomment-prefix'  => '-',
 
 # Multipage image navigation
 'imgmultipageprev' => '� الص�حة اللى �اتت',
@@ -2815,7 +3086,7 @@ $1',
 'autosumm-blank'   => 'مسح كل اللى �ى الص�حة',
 'autosumm-replace' => "تبديل الص�حة ب'$1'",
 'autoredircomment' => 'تحويل لـ [[$1]]',
-'autosumm-new'     => 'ص�حه جديده: $1',
+'autosumm-new'     => "ابتدا ص�حه جديده بـ '$1'",
 
 # Size units
 'size-bytes'     => '$1 بايت',
@@ -2926,6 +3197,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'تاج بتاع امتداد مش معرو� "$1"',
+'duplicate-defaultsort' => 'تحزير: زرار الترتيب الاوتوماتيكي"$2" بيوق� زرار الترتيب الاوتوماتيكي"$1" القديم.',
 
 # Special:Version
 'version'                          => 'نسخه', # Not used as normal message but as header for the special page itself
@@ -2954,13 +3226,13 @@ $1',
 'filepath-submit'  => 'المسار',
 'filepath-summary' => 'الص�حة المخصوصة دى بتعرض المسار الكامل  بتاع مل�.
 الصور بتتعرض  بدقة كاملة، أنواع المل�ات التانية ح تشتغل �ى البرنامج بتاعهم مباشرة.
-دخل اسم المل�  من غير البري�يكس "{{ns:image}}:"',
+دخل اسم المل�  من غير البري�يكس "{{ns:file}}:"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'دور على المل�ات المتكررة',
 'fileduplicatesearch-summary'  => 'دور على المل�ات المتكررة على اساس قيمة الهاش بتاعتها.
 
-دخل اسم المل� من غير البري�كس "{{ns:image}}:".',
+دخل اسم المل� من غير البري�كس "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'تدوير على متكرر',
 'fileduplicatesearch-filename' => 'اسم المل�:',
 'fileduplicatesearch-submit'   => 'تدوير',
@@ -2990,4 +3262,13 @@ $1',
 'blankpage'              => 'ص�حة �اضية',
 'intentionallyblankpage' => 'الص�حة دى متسابة �اضية بالقصد',
 
+# External image whitelist
+'external_image_whitelist' => '   #<pre>سيب السطر ده تمام كما هو
+#ضع منثورات التعبيرات المنتظمة (بس الجزء الذى يذهب بين //) بالأس�ل
+#هذه ستتم مطابقتها مع مسارات الصور الخرجية (الموصولة بشكل مباشر)
+#هذه اللى تطابق سيتم عرضها كصور، غير كده �قط وصلة إلى الصورة سيتم عرضها
+#السطور اللى تبدأ ب# تتم معاملتها كتعليقات
+
+#ضع كل منثورات التعبيرات المنتظمة �وق السطر ده. سيب السطر ده تمام كما هو</pre>',
+
 );
diff --git a/languages/messages/MessagesAs.php b/languages/messages/MessagesAs.php
index e5f26d9a..705f84f9 100644
--- a/languages/messages/MessagesAs.php
+++ b/languages/messages/MessagesAs.php
@@ -11,7 +11,71 @@
  * @author Urhixidur
  */
 
-$fallback='hi';
+$fallback='bn';
+
+$namespaceNames = array(
+	NS_MEDIA            => 'মাধ�যম',
+	NS_SPECIAL          => 'বিশেষ',
+	NS_TALK             => 'বার�তা',
+	NS_USER             => 'সদস�য',
+	NS_USER_TALK        => 'সদস�য বার�তা',
+	NS_PROJECT_TALK     => '$1 বার�তা',
+	NS_FILE             => 'চিত�র',
+	NS_FILE_TALK        => 'চিত�র বার�তা',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki বার�তা',
+	NS_TEMPLATE         => 'সা�চ',
+	NS_TEMPLATE_TALK    => 'সা�চ বার�তা',
+	NS_HELP             => 'সহায়',
+	NS_HELP_TALK        => 'সহায় বার�তা',
+	NS_CATEGORY         => 'শ�রেণী',
+	NS_CATEGORY_TALK    => 'শ�রেণী বার�তা',
+);
+
+$namespaceAliases = array(
+	'विशेष' => NS_SPECIAL,
+	'वार�ता' => NS_TALK,
+	'सदस�य' => NS_USER,
+	'सदस�य_वार�ता' => NS_USER_TALK,
+	'$1_वार�ता' => NS_PROJECT_TALK,
+	'चित�र' => NS_FILE,
+	'चित�र_वार�ता' => NS_FILE_TALK,
+	'सा�चा' => NS_TEMPLATE,
+	'सा�चा_वार�ता' => NS_TEMPLATE_TALK,
+	'श�रेणी' => NS_CATEGORY,
+	'श�रेणी_वार�ता' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'সদস�যৰ প�রবেশ' ),
+	'Userlogout'                => array( 'সদস�যৰ প�রস�থান' ),
+	'CreateAccount'             => array( 'সদস�যভ�ক�তি' ),
+	'Preferences'               => array( 'পচন�দ' ),
+	'Watchlist'                 => array( 'লক�ষ�যতালিকা' ),
+	'Recentchanges'             => array( 'শেহতীয়া কাম' ),
+	'Upload'                    => array( 'বোজাই' ),
+	'Listfiles'                 => array( 'চিত�র-তালিকা' ),
+	'Newimages'                 => array( 'নত�ন চিত�র' ),
+	'Listusers'                 => array( 'সদস�য-তালিকা' ),
+	'Listgrouprights'           => array( 'গোটৰ অধিকাৰসম�হ' ),
+	'Statistics'                => array( 'পৰিসংখ�যা' ),
+	'Randompage'                => array( 'আকস�মিক' ),
+	'Lonelypages'               => array( 'অকলশৰীয়া পৃষ�ঠা' ),
+	'Uncategorizedpages'        => array( 'অবিন�যস�ত পৃষ�ঠাসম�হ' ),
+	'Uncategorizedcategories'   => array( 'অবিন�যস�ত শ�ৰেণীসমূহ' ),
+	'Uncategorizedimages'       => array( 'অবিন�যস�ত চিত�ৰবোৰ' ),
+	'Uncategorizedtemplates'    => array( 'অবিন�যস�ত সা�চবোৰ' ),
+	'Unusedcategories'          => array( 'অব�যৱহৃত শ�ৰেণীসমূহ' ),
+	'Unusedimages'              => array( 'অব�যৱহৃত চিত�ৰবোৰ' ),
+	'Wantedcategories'          => array( 'আকাংক�ষিত শ�ৰেণীসমূহ' ),
+	'Allpages'                  => array( 'সকলোবোৰ পৃষ�ঠা' ),
+	'Specialpages'              => array( 'বিশেষ পৃষ�ঠাবোৰ' ),
+	'Contributions'             => array( 'অৱদানবোৰ' ),
+	'Mypage'                    => array( 'মোৰ পৃষ�ঠা' ),
+	'Mytalk'                    => array( 'মোৰ কথোপকথন' ),
+	'Mycontributions'           => array( 'মোৰ অৱদান' ),
+	'Popularpages'              => array( 'জনপ�ৰিয় পৃষ�ঠাসমূহ' ),
+);
 
 $digitTransformTable = array(
 	'0' => '০', # &#x09e6;
@@ -69,8 +133,6 @@ $messages = array(
 'underline-never'   => 'কেতিয়াও নহয়',
 'underline-default' => 'ব�রাউজাৰ ডিফল�ট',
 
-'skinpreview' => '(খচৰা)',
-
 # Dates
 'sunday'        => 'দেওবাৰ',
 'monday'        => 'সোমবাৰ',
@@ -152,7 +214,7 @@ $messages = array(
 'mytalk'         => 'মোৰ আলাপ',
 'anontalk'       => '�ই IP-ত যোগাযোগ কৰক',
 'navigation'     => 'দিকদৰ�শন',
-'and'            => 'আৰ�',
+'and'            => '&#32;আৰ�',
 
 # Metadata in edit box
 'metadata_help' => 'মেটাডাটা:',
@@ -215,8 +277,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}ৰ ইতিবৃত�ত',
 'aboutpage'            => 'Project:ইতিবৃত�ত',
-'bugreports'           => 'বাগ ৰিপোর�ট',
-'bugreportspage'       => 'Project:বাগ ৰিপোর�ট',
 'copyright'            => '�ই লিখনী $1 ৰ অন�তর�গত উপলব�ধ।',
 'copyrightpagename'    => '{{SITENAME}} স�বত�বাধিকাৰ',
 'copyrightpage'        => '{{ns:project}}:স�বত�ব',
@@ -239,9 +299,7 @@ $messages = array(
 
 'badaccess'        => 'অন�মতি ভ�ল',
 'badaccess-group0' => 'আপ�নি কৰিব বিছৰা কামতো কৰাৰ আধিকাৰ আপোনাৰ নাই।',
-'badaccess-group1' => '$1 গোটৰ সদস�যৰহে �ই কামতো কৰাৰ অধিকাৰ আছে।',
-'badaccess-group2' => '$1 গোটবোৰৰ মাজৰ যিকোনো �টা গোটৰ সদস�যৰহে �ই কামতো কৰাৰ অধিকাৰ আছে।',
-'badaccess-groups' => '$1 গোটবোৰৰ মাজৰ যিকোনো �টা গোটৰ সদস�যৰহে �ই কামতো কৰাৰ অধিকাৰ আছে।',
+'badaccess-groups' => '$1{{plural:$2|গোটবোৰৰ}} গোটবোৰৰ মাজৰ যিকোনো �টা গোটৰ সদস�যৰহে �ই কামতো কৰাৰ অধিকাৰ আছে।',
 
 'versionrequired'     => 'মেডিয়াৱিকিৰ $1 সংকলন থাকিব লাগিব ।',
 'versionrequiredtext' => '�ই পৃষ�ঠাটো ব�যৱহাৰ কৰিবলৈ মেডিয়াৱিকিৰ $1 সংকলন থাকিব লাগিব । [[Special:Version|সংকলন স�চী]] চাওক।',
@@ -310,7 +368,6 @@ $1',
 'badarticleerror'      => '�ই পৃষ�ঠাটোত �ই কামটো কৰিব নোৱাৰি ।',
 'badtitle'             => 'অনভিপ�রেত শিৰোণামা',
 'badtitletext'         => 'আপ�নি বিচৰা পৃষ�ঠাটোৰ শিৰোণামা অযোগ�য, খালী বা ভ�লকে জৰিত আন�তর�ভাষিক বা আন�তর�ৱিকি শিৰোণামা। ইয়াত �ক বা ততোধিক বর�ণ থাকিব পাৰে যাক শিৰোণামাত ব�যৱহাৰ কৰিব নোৱাৰি।',
-'perfdisabled'         => 'ক�ষমা কৰিব! �ই স�বিধাতো সাময়িক ভাবে বন�ধ কৰা হৈছে, কাৰণ ই তথ�যকোষ ইমানেই লেহেম কৰি দিয়ে যে কোনেও ৱিকি ব�যৱহাৰ কৰিব নোৱাৰে।',
 'perfcached'           => 'তলত দিয়া তথ�য খিনি আগতে জমা কৰি থোৱা (cached) আৰ� সাম�প�রতিক নহব পাৰে।',
 'perfcachedts'         => 'তলত দিয়া তথ�য খিনি আগতে জমা কৰি থোৱা (cached) আৰ� শেষবাৰৰ কাৰণে $1 ত নৱীকৰণ কৰা হৈছিল।',
 'querypage-no-updates' => '�ই পৃষ�ঠাটো নৱীকৰণ কৰা ৰোধ কৰা হৈছে। ইয়াৰ তথ�য �তিয়া সতেজ কৰিব নোৱাৰি।',
@@ -331,10 +388,10 @@ $1',
 
 # Login and logout pages
 'logouttitle'                => 'সদস�য প�রস�থান',
-'logouttext'                 => '<strong>আপ�নি প�রস�থান কৰিলে ।</strong>
+'logouttext'                 => "'''আপ�নি প�রস�থান কৰিলে ।'''
 
 আপ�নি বেনামী ভাবেও {{SITENAME}} ব�যৱহাৰ কৰিব পাৰে, অথবা আকৌ সেই �কে বা বেলেগ নামেৰে প�রৱেশ কৰিব পাৰে।
-যেতিয়ালৈকে আপোনাৰ ব�রাউজাৰৰ অস�থায়ী-স�মৃতি (cache memory) খালী নকৰে, তেতিয়ালৈকে কিছ�মান পৃষ�ঠাত আপ�নি প�রৱেশ কৰা ব�লি দেখ�ৱাই থাকিব পাৰে।',
+যেতিয়ালৈকে আপোনাৰ ব�রাউজাৰৰ অস�থায়ী-স�মৃতি (cache memory) খালী নকৰে, তেতিয়ালৈকে কিছ�মান পৃষ�ঠাত আপ�নি প�রৱেশ কৰা ব�লি দেখ�ৱাই থাকিব পাৰে।",
 'welcomecreation'            => '<h2>স�বাগতম, $1!</h2><p>আপোনাৰ সদস�যভ�ক�তি হৈ গৈছে|
 {{SITENAME}} ত আপোনাৰ পচন�দমতে ব�যক�তিগতকৰণ কৰি লবলৈ লব নাপাহৰিব|',
 'loginpagetitle'             => 'সদস�য প�র�ৱেশ',
@@ -343,7 +400,6 @@ $1',
 'yourpasswordagain'          => 'গ�প�তশব�দ আকৌ �বাৰ লিখক',
 'remembermypassword'         => 'মোৰ প�রৱেশ �ই কম�পিউটাৰত মনত ৰাখিব',
 'yourdomainname'             => 'আপোনাৰ দমেইন:',
-'loginproblem'               => '<b>আপোনাৰ প�রৱেশত সমস�যা হৈছে ।</b><br />আকৌ চেষ�টা কৰক!',
 'login'                      => 'প�রৱেশ',
 'nav-login-createaccount'    => 'প�রৱেশ/সদস�যভ�ক�তি',
 'loginprompt'                => '{{SITENAME}}ত প�রৱেশ কৰিবলৈ আপ�নি ক�কী সক�রীয় কৰিব লাগিব',
@@ -409,7 +465,7 @@ $1',
 'throttled-mailpassword'     => 'যোৱা $1 ঘণ�টাত গ�প�তশব�দ প�নৰ�দ�ধাৰ স�চনা পঠিওৱা হৈছে ।
 অবৈধ ব�যৱহাৰ ৰোধ কৰিবলৈ $1 ঘণ�টাত �বাৰহে গ�প�তশব�দ প�নৰ�দ�ধাৰ স�চনা পঠিওৱা হয়।',
 'mailerror'                  => 'ই-মেইল পঠোৱাত সমস�যা হৈছে: $1',
-'acct_creation_throttle_hit' => 'ক�ষমা কৰিব, আপ�নি ইতিমধ�যে $1 টা সদস�যভ�ক�তি কৰিছে। 
+'acct_creation_throttle_hit' => 'ক�ষমা কৰিব, আপ�নি ইতিমধ�যে $1 টা সদস�যভ�ক�তি কৰিছে।
 আপ�নি আৰ� অধিক সদস�যভ�ক�তি কৰিব নোৱাৰে।',
 'emailauthenticated'         => 'আপোনাৰ ই-মেইল ঠিকনাটো  $1 ত প�রমানিত কৰা হৈছে।',
 'emailnotauthenticated'      => 'আপোনাৰ ই-মেইল ঠিকনাতো �তিয়ালৈ প�রমনিত হোৱা নাই ।
@@ -431,12 +487,14 @@ $1',
 'resetpass_announce'      => 'আপ�নি ই-মেইলত পোৱা অস�থায়ী গ�প�তশব�দৰে প�রৱেশ কৰিছে।
 প�রৱেশ সম�প�র�ণ কৰিবলৈ, আপ�নি �টা নত�ন গ�প�তশব�দ দিব লাগিব:',
 'resetpass_header'        => 'গ�প�তশব�দ পূণর�স�থাপন কৰক',
+'oldpassword'             => 'পূৰণি গ�প�তশব�দ:',
+'newpassword'             => 'নত�ন গ�প�তশব�দ:',
+'retypenew'               => 'নত�ন গ�প�তশব�দ আকৌ টাইপ কৰক',
 'resetpass_submit'        => 'গ�প�তশব�দ বনাওক আৰ� প�রৱেশ কৰক',
 'resetpass_success'       => 'আপোনাৰ গ�প�তশব�দ সফলতাৰে সলনি কৰা হৈছে, �তিয়া আপ�নি প�রৱেশ কৰি আছে...',
 'resetpass_bad_temporary' => 'অস�থায়ী গ�প�তশব�দ ভ�ল ।
 হয়তো আপ�নি আগতেই গ�প�তশব�দ সলনি কৰিছে, অথবা নত�ন গ�প�তশব�দৰ কাৰণে অন�ৰোধ পঠাইছে।',
 'resetpass_forbidden'     => '{{SITENAME}} ত গ�প�তশব�দ সলনি কৰিব নোৱাৰি',
-'resetpass_missing'       => 'ফর�মৰ তথ�য নাই ।',
 
 # Edit page toolbar
 'bold_sample'     => 'শকত পাঠ�য',
@@ -459,8 +517,8 @@ $1',
 'hr_tip'          => 'পথালী ৰেখা (কমকৈ ব�যৱহাৰ কৰিব)',
 
 # Edit pages
-'summary'                => 'সাৰাংশ',
-'subject'                => 'বিষয় / শীর�ষক',
+'summary'                => 'সাৰাংশ:',
+'subject'                => 'বিষয় / শীর�ষক:',
 'minoredit'              => '�ইটো নগন�য সম�পদনা',
 'watchthis'              => '�ই পৃষ�ঠাটো অন�সৰণ-সূচীভ�ক�ত কৰক',
 'savearticle'            => 'পৃষ�ঠা সংৰাক�ষিত কৰক',
@@ -474,8 +532,8 @@ $1',
 'missingcommenttext'     => 'অন�গ�রহ কৰি তলত মন�তব�য �টা দিয়�ক।',
 'missingcommentheader'   => "'''স�মাৰক:''' আপ�নি �ই মন�তব�যটোত শিৰোণামা দিয়া নাই।
 যদি আকৌ �বাৰ সংৰক�ষিত কৰে, তেনেহলে শিৰোণামা অবিহনে সংৰক�ষিত হব।",
-'summary-preview'        => 'সাৰাংশৰ খচৰা',
-'subject-preview'        => 'বিষয়/শিৰোণামাৰ খচৰা',
+'summary-preview'        => 'সাৰাংশৰ খচৰা:',
+'subject-preview'        => 'বিষয়/শিৰোণামাৰ খচৰা:',
 'blockedtitle'           => 'সদস�যজনক অবৰোধ কৰা হৈছে',
 'blockedtext'            => "<big>'''আপোনাৰ সদস�যনাম অথবা আই-পি ঠিকণা অবৰোধ কৰা হৈছে ।'''</big>
 
@@ -527,7 +585,7 @@ $1',
 
 আপ�নি যদি ইয়ালৈ ভ�লতে আহিছে, তেনেহলে আপোনাৰ ব�রাওজাৰত (BACK) ব�তামত টিপা মাৰক।',
 'noarticletext'          => '�ই পৃষ�ঠাত বর�তমান কোনো পাঠ�য নাই| আপ�নি ৱিকিপিডিয়াৰ আন পৃষ�ঠাত [[Special:Search/{{PAGENAME}}| শিৰোণামাতো বিচাৰিব পাৰে, বা]] [{{fullurl:{{FULLPAGENAME}}|action=edit}} লিখা আৰম�ভ কৰিব পাৰে] ।',
-'previewnote'            => '<strong>মনত ৰাখিব যে �য়া কেৱল খচৰা হে, সাল-সলনিবোৰ �তিয়াও সংৰক�ষিত কৰা হোৱা নাই!</strong>',
+'previewnote'            => "'''মনত ৰাখিব যে �য়া কেৱল খচৰা হে, সাল-সলনিবোৰ �তিয়াও সংৰক�ষিত কৰা হোৱা নাই!'''",
 'editing'                => '$1 সম�পাদনা',
 'editingsection'         => '$1 (বিভাগ) সম�পদনা কৰি থকা হৈছে',
 'editingcomment'         => '$1 (মন�তব�য) সম�পাদন',
@@ -535,16 +593,16 @@ $1',
 <br />
 
 ইয়াত আপোনাৰ লিখনি দিয়াৰ লগে লগে আপ�নি আপোনা-আপ�নি প�ৰতিশ�ৰ�তি দিছে যে �ই লিখনিটো আপোনাৰ মৌলিক লিখনি, বা কোনো স�বত�বাধিকাৰ নথকা বা কোনো ৰাজহ�ৱা ৱেবছাইট বা তেনে কোনো ম�কলি উৎসৰ পৰা আহৰণ কৰা|
-<strong>স�বত�বাধিকাৰয�ক�ত কোনো সমল অন�মতি অবিহনে দাখিল নকৰে যেন!</strong>",
-'copyrightwarning2'      => 'অন�গ�ৰহ কৰি মন কৰক যে {{SITENAME}}লৈ কৰা সকলো অৱদান আন সদস�যই সম�পাদনা কৰিব, সলনি কৰিব অথবা মচি দিব পাৰে।
+'''স�বত�বাধিকাৰয�ক�ত কোনো সমল অন�মতি অবিহনে দাখিল নকৰে যেন!'''",
+'copyrightwarning2'      => "অন�গ�ৰহ কৰি মন কৰক যে {{SITENAME}}লৈ কৰা সকলো অৱদান আন সদস�যই সম�পাদনা কৰিব, সলনি কৰিব অথবা মচি দিব পাৰে।
 আপ�নি যদি আপোনাৰ লিখনি নিৰ�দয়ভাৱে সম�পাদনা কৰা ভাল নাপায়, তেনেহলে নিজৰ লিখনি ইয়াত নিদিব|<br />
 ইয়াত আপোনাৰ লিখনি দিয়াৰ লগে লগে আপ�নি আপোনা-আপ�নি প�ৰতিশ�ৰ�তি দিছে যে �ই লিখনিটো আপোনাৰ মৌলিক লিখনি, বা কোনো স�বত�বাধিকাৰ নথকা বা কোনো ৰাজহ�ৱা ৱেবছাইট বা তেনে কোনো ম�কলি উৎসৰ পৰা আহৰণ কৰা| (অধিক জানিবলৈ $1 চা�ওক)
 
-<strong>স�বত�বাধিকাৰয�ক�ত কোনো সমল অন�মতি অবিহনে দাখিল নকৰে যেন!</strong>',
-'longpagewarning'        => '<strong>সাবধান: �ই পৃষ�ঠাটো $1 কিলোবাইট আকাৰৰ; কিছ�মান ব�রাউজাৰে 32 kb বা তাতকৈ বেছি আকাৰৰ পৃষ�ঠা দেখ�ৱাবলৈ বা সম�পাদনা কৰিবলৈ অস�বিধা পাব পাৰে ।
-অন�গ�রহ কৰি �ই পৃষ�ঠাটোক সৰ� সৰ� খণ�ডত বিভক�ত কৰাৰ কথা বিবেচনা কৰক ।</strong>',
-'longpageerror'          => '<strong>ভ�ল: আপ�নি দিয়া লিখনী $1 কিলো-বাইট আকাৰৰ, যি $2 কিলো-বাইট সীমাটকৈ বেছি।
-ইয়াক সঞ�চিত কৰিব পৰা নাযাব।</strong>',
+'''স�বত�বাধিকাৰয�ক�ত কোনো সমল অন�মতি অবিহনে দাখিল নকৰে যেন!'''",
+'longpagewarning'        => "'''সাবধান: �ই পৃষ�ঠাটো $1 কিলোবাইট আকাৰৰ; কিছ�মান ব�রাউজাৰে 32 kb বা তাতকৈ বেছি আকাৰৰ পৃষ�ঠা দেখ�ৱাবলৈ বা সম�পাদনা কৰিবলৈ অস�বিধা পাব পাৰে ।
+অন�গ�রহ কৰি �ই পৃষ�ঠাটোক সৰ� সৰ� খণ�ডত বিভক�ত কৰাৰ কথা বিবেচনা কৰক ।'''",
+'longpageerror'          => "'''ভ�ল: আপ�নি দিয়া লিখনী $1 কিলো-বাইট আকাৰৰ, যি $2 কিলো-বাইট সীমাটকৈ বেছি।
+ইয়াক সঞ�চিত কৰিব পৰা নাযাব।'''",
 'templatesused'          => '�ই পৃষ�ঠাত ব�যৱহৃত ঠা�চ সম�হ',
 'templatesusedpreview'   => 'ব�যৱহৃত ঠা�চ সম�হ',
 'template-protected'     => '(স�ৰক�ষিত)',
@@ -557,24 +615,25 @@ $1',
 �ই পৃষ�ঠাটো বিলোপ কৰাৰ অভিলেখ আপোনাৰ স�বিধার�থে ইয়াত দিয়া হৈছে।",
 
 # History pages
-'viewpagelogs'        => '�ই পৃষ�ঠাৰ লগ চা�ওক|',
-'currentrev'          => 'শেহতীয়া ভাষ�য',
-'revisionasof'        => '$1 তম ভাষ�য',
-'previousrevision'    => '� আগৰ সংশোধন',
-'nextrevision'        => 'সদ�যসংশোধিত',
-'currentrevisionlink' => 'শেহতীয়া ভাষ�য',
-'cur'                 => 'বর�তমান',
-'next'                => 'পৰবর�তী',
-'last'                => 'প�র�ববর�তি',
-'page_first'          => 'প�রথম',
-'page_last'           => 'অন�তিম',
-'histlegend'          => 'পার�থক�য বাচনী: পার�থক�য চাবলৈ সংকলনবোৰৰ সম�ম�খত থকা ৰেডিও ব�টামবোৰ বাচনী কৰি �ণ�টাৰ টিপক অথবা �কেবাৰে তলত দিয়া ব�টামতো ক�লীক কৰক <br />
+'viewpagelogs'           => '�ই পৃষ�ঠাৰ লগ চা�ওক|',
+'currentrev'             => 'শেহতীয়া ভাষ�য',
+'revisionasof'           => '$1 তম ভাষ�য',
+'previousrevision'       => '� আগৰ সংশোধন',
+'nextrevision'           => 'সদ�যসংশোধিত',
+'currentrevisionlink'    => 'শেহতীয়া ভাষ�য',
+'cur'                    => 'বর�তমান',
+'next'                   => 'পৰবর�তী',
+'last'                   => 'প�র�ববর�তি',
+'page_first'             => 'প�রথম',
+'page_last'              => 'অন�তিম',
+'histlegend'             => 'পার�থক�য বাচনী: পার�থক�য চাবলৈ সংকলনবোৰৰ সম�ম�খত থকা ৰেডিও ব�টামবোৰ বাচনী কৰি �ণ�টাৰ টিপক অথবা �কেবাৰে তলত দিয়া ব�টামতো ক�লীক কৰক <br />
 লিজেণ�ড: (বর�তমান) = বর�তমানৰ সংকলনৰ লগত পার�থক�য,
 (অন�তিম) = আগৰ সংকলনৰ লগত পার�থক�য, M = অগ�ৰ�ত�বপ�র�ণ সম�পাদনা।',
-'deletedrev'          => '[বিলোপন কৰা হল]',
-'histfirst'           => 'আটাইতকৈ পূৰণি',
-'histlast'            => 'শেহতীয়া',
-'historyempty'        => '(খালী)',
+'history-fieldset-title' => 'ইতিহাসত অন�সন�ধান কৰক',
+'deletedrev'             => '[বিলোপন কৰা হল]',
+'histfirst'              => 'আটাইতকৈ পূৰণি',
+'histlast'               => 'শেহতীয়া',
+'historyempty'           => '(খালী)',
 
 # Revision feed
 'history-feed-title'       => 'সংকলন ইতিহাস',
@@ -605,6 +664,7 @@ $1',
 'prevn'                 => 'প�র�ববর�তি $1',
 'nextn'                 => 'পৰৱর�তি $1',
 'viewprevnext'          => 'চাওক ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:স�চী',
 'search-interwiki-more' => '(আৰ�)',
 'showingresults'        => "তলত #'''$2'''ৰ পৰা {{PLURAL:$1|'''1''' ফলাফল|'''$1''' ফলাফল}} দেখ�ওৱা হৈছে।",
 'powersearch'           => 'অতিসন�ধান',
@@ -632,6 +692,7 @@ $1',
 'qbsettings-floatingright' => 'সো�ফাল অস�থিৰ',
 'changepassword'           => 'গ�প�তশব�দ সলনী কৰক',
 'skin'                     => 'আৱৰন',
+'skin-preview'             => 'খচৰা',
 'math'                     => 'গণিত',
 'dateformat'               => 'তাৰিখৰ সজ�জা',
 'datedefault'              => 'বিশেষ পচন�দ নাই',
@@ -647,9 +708,6 @@ $1',
 'prefs-misc'               => 'অন�যান�য',
 'saveprefs'                => 'সঞ�চিত কৰক',
 'resetprefs'               => 'অসঞ�চিত সাল-সলনী বাতিল কৰক',
-'oldpassword'              => 'পূৰণি গ�প�তশব�দ:',
-'newpassword'              => 'নত�ন গ�প�তশব�দ:',
-'retypenew'                => 'নত�ন গ�প�তশব�দ আকৌ টাইপ কৰক',
 'textboxsize'              => 'সম�পাদন',
 'rows'                     => 'পথালী শাৰী:',
 'columns'                  => 'ঠিয় শাৰী:',
@@ -679,7 +737,7 @@ $1',
 'userrights-lookup-user'   => 'সদস�য গোটবোৰ ব�যৱস�থাপনা কৰক',
 'userrights-user-editname' => 'সদস�যনাম দিয়ক:',
 'editusergroup'            => 'সদস�য গোটবোৰ সম�পাদনা কৰক',
-'editinguser'              => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) সদস�যজনৰ অধিকাৰ সলনী কৰি থকা হৈছে।",
+'editinguser'              => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) সদস�যজনৰ অধিকাৰ সলনী কৰি থকা হৈছে।",
 'userrights-editusergroup' => 'সদস�য গোট সম�পাদনা কৰক',
 'saveusergroups'           => 'সদস�য গোট সংৰক�ষিত কৰক',
 'userrights-groupsmember'  => '�ই গোটবোৰৰ সদস�য:',
@@ -723,10 +781,10 @@ $1',
 'uploadlogpage' => 'আপলোড স�চী',
 'uploadedimage' => '"[[$1]]" আপলোড কৰা হ’ল',
 
-# Special:ImageList
-'imagelist' => 'ফাইলৰ তালিকা',
+# Special:ListFiles
+'listfiles' => 'ফাইলৰ তালিকা',
 
-# Image description page
+# File description page
 'filehist'                  => 'ফাইলৰ ইতিবৃত�ত',
 'filehist-help'             => 'ফাইলৰ আগৰ অৱ�স�থা চাবলৈ সেই তাৰিখ/সময়ত টিপা মাৰক|',
 'filehist-current'          => 'বর�তমান',
@@ -750,18 +808,7 @@ $1',
 'randompage' => 'আকস�মিক পৃষ�ঠা',
 
 # Statistics
-'statistics'    => 'পৰিসংখ�যা',
-'sitestatstext' => "তথ�যকোষত {{PLURAL:\$1|'''१''' পৃষ�ঠা আছে|'''\$1''' খন পৃষ�ঠা আছে}}।
-ইয়াৰ ভিতৰত \"বার�তা\" পৃষ�ঠা, {{SITENAME}} ৰ বিষয়ে পৃষ�ঠা, স�ক�ষ�ম \"ঠ�ঠ\" পৃষ�ঠা, নির�দেশিত পৃষ�ঠা, আৰ� অন�যান�য পৃষ�ঠা চামিল আছে, যিবোৰ হয়তো সাধাৰণ পৃষ�ঠা হিচাপে যোগ�যতা লাভ কৰা নাই।
-
-ইয়াৰ বাহিৰেও, {{PLURAL:\$2|'''१'''  পৃষ�ঠা আছে|'''\$2''' পৃষ�ঠা আছে}}, যিবোৰ হয়তো য�ক�তিসম�মত নির�দেশিত পৃষ�ঠা।
-
-'''\$8''' তা ফাইল আপলোড কৰা {{PLURAL:\$8|হৈছে|হৈছে}}।
-
-যেতিয়াৰ পৰা {{SITENAME}}ৰ নির�মাণ কৰা হৈছে, ম�ঠ {{PLURAL:\$3|পৃষ�ঠা|পৃষ�ঠা}}ক  '''\$3''' বাৰ দর�শণ কৰা হৈছে, আৰ� '''\$4''' বাৰ সম�পাদনা কৰা হৈছে।
-ইয়াৰ দ�বাৰা ব�জা যায় যে, প�রতি পৃষ�ঠা '''\$5''' বাৰ সম�পাদিত হয়, আৰ� প�রতি সম�পাদনা '''\$6''' বাৰ চোৱা হয়।
-
-The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'''.",
+'statistics' => 'পৰিসংখ�যা',
 
 'doubleredirects' => 'দ�বি-পূণঃনির�দেশিত',
 
@@ -804,60 +851,69 @@ The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'
 # Special:Categories
 'categories' => 'শ�রেণী',
 
+# Special:Log/newusers
+'newuserlog-byemail'          => 'গ�প�তশব�দ ই-মেইল কৰি পঠোৱা হৈছে',
+'newuserlog-create-entry'     => 'নত�ন সদস�য',
+'newuserlog-create2-entry'    => '$1 ক নত�ন সদস�যভ�ক�তি কৰা হল',
+'newuserlog-autocreate-entry' => 'স�বয়ংক�রীয়ভাবে নত�ন সদস�যভ�ক�তি কৰা হল',
+
 # E-mail user
 'emailuser' => '�ই সদস�যজনলৈ ই-মেইল পথাওক',
 
 # Watchlist
-'watchlist'            => 'মই অন�সৰণ কৰা পৃষ�ঠাবিলাকৰ তালিকা',
-'mywatchlist'          => 'মোৰ অন�সৰণ-তালিকা',
-'watchlistfor'         => "('''$1''' ৰ কাৰনে)",
-'addedwatch'           => 'লক�ষ�য তালিকাত অন�তর�ভ�ক�তি কৰা হল',
-'addedwatchtext'       => 'আপোনাৰ [[Special:Watchlist|লক�ষ�য তালিকাত ]]  "<nowiki>$1</nowiki>" অন�তর�ভ�ক�তি কৰা হল ।
+'watchlist'         => 'মই অন�সৰণ কৰা পৃষ�ঠাবিলাকৰ তালিকা',
+'mywatchlist'       => 'মোৰ অন�সৰণ-তালিকা',
+'watchlistfor'      => "('''$1''' ৰ কাৰনে)",
+'addedwatch'        => 'লক�ষ�য তালিকাত অন�তর�ভ�ক�তি কৰা হল',
+'addedwatchtext'    => 'আপোনাৰ [[Special:Watchlist|লক�ষ�য তালিকাত ]]  "<nowiki>$1</nowiki>" অন�তর�ভ�ক�তি কৰা হল ।
 ভৱিশ�যতে ইয়াত হোৱা সাল-সলনি আপ�নি আপোনাৰ লক�ষ�য তালিকাত দেখিব, লগতে [[Special:RecentChanges|সম�প�রতিক সাল-সলনিৰ তালিকাত]] �ই পৃষ�ঠাটো শকট আখৰত দেখিব যাতে আপ�নি সহজে ধৰিব পাৰে ।',
-'removedwatch'         => 'লক�ষ�য-তালিকাৰ পৰা আতৰোৱা হল',
-'removedwatchtext'     => '"[[:$1]]" পৃষ�ঠাটো আপোনাৰ লক�ষ�য-তালিকাৰ পৰা আতৰোৱা হৈছে ।',
-'watch'                => 'অন�সৰণাৰ�থে',
-'watchthispage'        => '�ই পৃষ�ঠাটো লক�ষ�য কৰক',
-'unwatch'              => 'অন�সৰণ কৰিব নালাগে',
-'watchlist-details'    => 'বার�তা পৃষ�ঠা সম�হ নধৰি {{PLURAL:$1|$1 পৃষ�ঠা|$1 পৃষ�ঠা}} লক�ষ�য-তালিকাত আছে।',
-'wlshowlast'           => 'যোৱা $1 ঘণ�টা $2 দিন $3 চাওক',
-'watchlist-hide-bots'  => 'যান�ত�রিক সম�পাদনাবিলাক দেখ�ৱাব নালাগে',
-'watchlist-hide-own'   => 'মোৰ সম�পাদনাবোৰ দেখ�ৱাব নালাগে',
-'watchlist-hide-minor' => 'অগ�ৰ�ত�ব�পূর�ণ সম�পাদনা ল�ক�ৱাওক',
+'removedwatch'      => 'লক�ষ�য-তালিকাৰ পৰা আতৰোৱা হল',
+'removedwatchtext'  => '"[[:$1]]" পৃষ�ঠাটো আপোনাৰ লক�ষ�য-তালিকাৰ পৰা আতৰোৱা হৈছে ।',
+'watch'             => 'অন�সৰণাৰ�থে',
+'watchthispage'     => '�ই পৃষ�ঠাটো লক�ষ�য কৰক',
+'unwatch'           => 'অন�সৰণ কৰিব নালাগে',
+'watchlist-details' => 'বার�তা পৃষ�ঠা সম�হ নধৰি {{PLURAL:$1|$1 পৃষ�ঠা|$1 পৃষ�ঠা}} লক�ষ�য-তালিকাত আছে।',
+'wlshowlast'        => 'যোৱা $1 ঘণ�টা $2 দিন $3 চাওক',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'অন�সৰণভ�ক�ত কৰা হৈ আছে.....',
 'unwatching' => 'অন�সৰণম�ক�ত কৰা হৈ আছে.....',
 
-# Delete/protect/revert
-'deletepage'                  => 'পৃষ�ঠা বিলোপ কৰক',
-'historywarning'              => 'সাবধান: আপ�নি বিলোপ কৰিব বিছৰা পৃষ�ঠাটোৰ ইতিহাস খালী নহয়।',
-'confirmdeletetext'           => 'আপ�নি পৃষ�ঠা �টা তাৰ ইতিহাসৰ সৈতে বিলোপ কৰিব ওলাইছে।
+# Delete
+'deletepage'            => 'পৃষ�ঠা বিলোপ কৰক',
+'historywarning'        => 'সাবধান: আপ�নি বিলোপ কৰিব বিছৰা পৃষ�ঠাটোৰ ইতিহাস খালী নহয়।',
+'confirmdeletetext'     => 'আপ�নি পৃষ�ঠা �টা তাৰ ইতিহাসৰ সৈতে বিলোপ কৰিব ওলাইছে।
 অন�গ�রহ কৰি নিশ�বিত কৰক যে �য়া [[{{MediaWiki:Policy-url}}|নীতিসম�মত]] । লগতে আপ�নি ইয়াৰ পৰিণাম জানে আৰ� আপ�নি �য়া কৰিব বিছাৰিছে।',
-'actioncomplete'              => 'কার�য�য সম�পূর�ণ',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ক বিলোপন কৰা হৈছে।
+'actioncomplete'        => 'কার�য�য সম�পূর�ণ',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ক বিলোপন কৰা হৈছে।
 সাম�প�রতিক বিলোপনসম�হৰ তালিকা চাবলৈ $2 চা�ওক।',
-'deletedarticle'              => '"$1" ক বাতিল কৰা হৈছে|',
-'dellogpage'                  => 'বাতিল কৰা স�চী',
-'deletecomment'               => 'বিলোপনৰ কাৰণ।',
-'deleteotherreason'           => 'আন/অতিৰিক�ত কাৰণ:',
-'deletereasonotherlist'       => 'আন কাৰণ:',
-'rollbacklink'                => 'পূৰ�ববৎ কৰিবলৈ',
+'deletedarticle'        => '"$1" ক বাতিল কৰা হৈছে|',
+'dellogpage'            => 'বাতিল কৰা স�চী',
+'deletecomment'         => 'বিলোপনৰ কাৰণ।',
+'deleteotherreason'     => 'আন/অতিৰিক�ত কাৰণ:',
+'deletereasonotherlist' => 'আন কাৰণ:',
+
+# Rollback
+'rollbacklink' => 'পূৰ�ববৎ কৰিবলৈ',
+
+# Protect
 'protectlogpage'              => 'স�ৰক�ষা স�চী',
+'prot_1movedto2'              => '$1 ক $2 লৈ স�থানান�তৰিত কৰা হল',
 'protectcomment'              => 'মন�তব�য:',
 'protectexpiry'               => 'সময় শেষ:',
 'protect_expiry_invalid'      => 'শেষ সময় ভ�ল ।',
 'protect_expiry_old'          => 'শেষ সময় পাৰ হৈ গৈছে।',
 'protect-unchain'             => 'স�থানান�তৰৰ অন�মতি দিয়ক',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰ আপ�নি চাব আৰ� সলনি কৰিব পাৰে।',
-'protect-locked-access'       => '�ই পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰ সলনি কৰাৰ অন�মতি আপোনাক দিয়া হোৱা নাই ।
-<strong>$1</strong> �ই পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰৰ গাঠনী ইয়াত আছে:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰ আপ�নি চাব আৰ� সলনি কৰিব পাৰে।",
+'protect-locked-access'       => "�ই পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰ সলনি কৰাৰ অন�মতি আপোনাক দিয়া হোৱা নাই ।
+'''$1''' �ই পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰৰ গাঠনী ইয়াত আছে:",
 'protect-default'             => '(ডিফল�ট)',
 'protect-fallback'            => '"$1" অন�মতি লাগিব',
 'protect-level-autoconfirmed' => 'নথিভ�ক�ত নোহোৱা সদস�যক বাৰণ কৰক',
 'protect-expiring'            => ' $1 (UTC) ত সময় শেষ হব',
 'protect-cascade'             => '�ই পৃষ�ঠাটোৰ লগত জৰিত সকলো পৃষ�ঠা স�ৰক�ষিত কৰক (স�ৰক�ষা জখলা)',
 'protect-cantedit'            => 'আপ�নি �ই পৃষ�ঠাটোৰ স�ৰক�ষা-স�তৰ সলনি কৰিব নোৱৰে, কাৰণ আপোনাক সেই অন�মতি দিয়া হোৱা নাই।',
+'protect-expiry-options'      => '২ ঘ�ণ�টা:2 hours,১ দিন:1 day,৩ দিন:3 days,১ সপ�তাহ:1 week,২ সপ�তাহ:2 weeks,১ মাহ:1 month,৩ মাহ:3 months,৬ মাহ:6 months,১ বছৰ:1 year,অনির�দিস�ট কাল:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'অন�মতি:',
 'restriction-level'           => 'স�ৰক�ষা-স�তৰ:',
 
@@ -885,7 +941,6 @@ The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'
 # What links here
 'whatlinkshere'       => '�ই পৃষ�ঠা ব�যৱ�হাৰ কৰিছে...',
 'whatlinkshere-title' => '$1 লৈ সংযোগ কৰা পৃষ�ঠাসম�হ',
-'linklistsub'         => 'সংযোগস�চী',
 'linkshere'           => "�ই পৃষ�ঠাটো '''[[:$1]]''' ৰ লগত সংযোজিত:",
 'nolinkshere'         => "'''[[:$1]]''' ৰ লগত কোনো পৃষ�ঠা সংযোজিত নহয়।",
 'isredirect'          => 'পূণঃনির�দেশন পৃষ�ঠা',
@@ -996,7 +1051,7 @@ The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'
 'show-big-image'       => 'সম�পূর�ণ দৃশ�য',
 'show-big-image-thumb' => '<small>�ই খচৰাৰ আকাৰ: $1 × $2 পিক�সেল </small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'নত�ন ফাইলৰ বিথীকা',
 'ilsubmit'  => 'সন�ধান কৰক',
 
diff --git a/languages/messages/MessagesAst.php b/languages/messages/MessagesAst.php
index 2034be28..3c751878 100644
--- a/languages/messages/MessagesAst.php
+++ b/languages/messages/MessagesAst.php
@@ -11,32 +11,32 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Alderique',
-	NS_USER           => 'Usuariu',
-	NS_USER_TALK      => 'Usuariu_alderique',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_alderique',
-	NS_IMAGE          => 'Imaxe',
-	NS_IMAGE_TALK     => 'Imaxe_alderique',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_alderique',
-	NS_TEMPLATE       => 'Plantía',
-	NS_TEMPLATE_TALK  => 'Plantía_alderique',
-	NS_HELP           => 'Aida',
-	NS_HELP_TALK      => 'Aida_alderique',
-	NS_CATEGORY       => 'Categoría',
-	NS_CATEGORY_TALK  => 'Categoría_alderique',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_TALK             => 'Alderique',
+	NS_USER             => 'Usuariu',
+	NS_USER_TALK        => 'Usuariu_alderique',
+	NS_PROJECT_TALK     => '$1_alderique',
+	NS_FILE             => 'Archivu',
+	NS_FILE_TALK        => 'Archivu_alderique',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_alderique',
+	NS_TEMPLATE         => 'Plantía',
+	NS_TEMPLATE_TALK    => 'Plantía_alderique',
+	NS_HELP             => 'Aida',
+	NS_HELP_TALK        => 'Aida_alderique',
+	NS_CATEGORY         => 'Categoría',
+	NS_CATEGORY_TALK    => 'Categoría_alderique',
 );
 
 $namespaceAliases = array(
+	'Imaxe' => NS_FILE,
+	'Imaxe alderique' => NS_FILE_TALK,
 	'Discusión'           => NS_TALK,
 	'Usuariu_discusión'   => NS_USER_TALK,
 	'$1_discusión'        => NS_PROJECT_TALK,
-	'Imaxen'              => NS_IMAGE,
-	'Imaxen_discusión'    => NS_IMAGE_TALK,
+	'Imaxen'              => NS_FILE,
+	'Imaxen_discusión'    => NS_FILE_TALK,
 	'MediaWiki_discusión' => NS_MEDIAWIKI_TALK,
 	'Plantilla'           => NS_TEMPLATE,
 	'Plantilla_discusión' => NS_TEMPLATE_TALK,
@@ -83,17 +83,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Esconder les mios ediciones na llista de vixilancia',
 'tog-watchlisthidebots'       => 'Esconder les ediciones de bots na llista de vixilancia',
 'tog-watchlisthideminor'      => 'Esconder les ediciones menores na llista de vixilancia',
+'tog-watchlisthideliu'        => "Ocultar ediciones d'usuarios rexistraos na llista de vixilancia",
+'tog-watchlisthideanons'      => "Ocultar ediciones d'usuarios anónimos na llista de vixilancia",
 'tog-nolangconversion'        => 'Deshabilitar la conversión de variantes de llingua',
 'tog-ccmeonemails'            => 'Mandame copies de los correos que mando a otros usuarios',
 'tog-diffonly'                => 'Nun amosar el conteníu de la páxina embaxo de les diferencies',
 'tog-showhiddencats'          => 'Amosar categoríes ocultes',
+'tog-norollbackdiff'          => 'Desanicier les diferencies depués de restaurar',
 
 'underline-always'  => 'Siempre',
 'underline-never'   => 'Nunca',
 'underline-default' => 'Valor por defeutu del navegador',
 
-'skinpreview' => '(Previsualizar)',
-
 # Dates
 'sunday'        => 'domingu',
 'monday'        => 'llunes',
@@ -187,7 +188,7 @@ $messages = array(
 'mytalk'         => "La mio páxina d'alderique",
 'anontalk'       => 'Alderique pa esta IP',
 'navigation'     => 'Navegación',
-'and'            => 'y',
+'and'            => '&#32;y',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatos:',
@@ -224,14 +225,14 @@ $messages = array(
 'talkpagelinktext'  => 'Alderique',
 'specialpage'       => 'Páxina especial',
 'personaltools'     => 'Ferramientes personales',
-'postcomment'       => 'Escribir un comentariu',
+'postcomment'       => 'Seición nueva',
 'articlepage'       => 'Ver conteníu de la páxina',
 'talk'              => 'Alderique',
 'views'             => 'Vistes',
 'toolbox'           => 'Ferramientes',
 'userpage'          => "Ver páxina d'usuariu",
 'projectpage'       => 'Ver la páxina de proyeutu',
-'imagepage'         => "Ver la páxina d'archivos multimedia",
+'imagepage'         => 'Ver la páxina de ficheros',
 'mediawikipage'     => 'Ver la páxina de mensaxe',
 'templatepage'      => 'Ver la páxina de plantía',
 'viewhelppage'      => "Ver la páxina d'aida",
@@ -250,8 +251,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Tocante a {{SITENAME}}',
 'aboutpage'            => 'Project:Tocante a',
-'bugreports'           => "Informes d'errores",
-'bugreportspage'       => "Project:Informes d'errores",
 'copyright'            => 'Esti conteníu ta disponible baxo los términos de la  $1.',
 'copyrightpagename'    => "Drechos d'autor de {{SITENAME}}",
 'copyrightpage'        => "{{ns:project}}:Derechos d'autor",
@@ -274,9 +273,7 @@ $messages = array(
 
 'badaccess'        => 'Error de permisos',
 'badaccess-group0' => "Nun tienes permisu pa executar l'aición solicitada.",
-'badaccess-group1' => "L'aición solicitada ta llimitada a usuarios del grupu $1.",
-'badaccess-group2' => "L'aición solicitada ta llimitada a usuarios d'ún de los grupos $1.",
-'badaccess-groups' => "L'aición solicitada ta llimitada a usuarios d'ún de los grupos $1.",
+'badaccess-groups' => "L'aición solicitada ta llimitada a usuarios {{PLURAL:$2|del grupu|d'ún de los grupos}}: $1.",
 
 'versionrequired'     => 'Necesítase la versión $1 de MediaWiki',
 'versionrequiredtext' => 'Necesítase la versión $1 de MediaWiki pa usar esta páxina. Ver la [[Special:Version|páxina de versión]].',
@@ -290,6 +287,8 @@ $messages = array(
 'editsection'             => 'editar',
 'editold'                 => 'editar',
 'viewsourceold'           => 'ver fonte',
+'editlink'                => 'editar',
+'viewsourcelink'          => 'amosar la fonte',
 'editsectionhint'         => 'Editar seición: $1',
 'toc'                     => 'Tabla de conteníos',
 'showtoc'                 => 'amosar',
@@ -304,13 +303,13 @@ $messages = array(
 'site-atom-feed'          => 'Canal Atom $1',
 'page-rss-feed'           => 'Canal RSS "$1"',
 'page-atom-feed'          => 'Canal Atom "$1"',
-'red-link-title'          => '$1 (tovía non escritu)',
+'red-link-title'          => '$1 (la páxina nun esiste)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Páxina',
 'nstab-user'      => "Páxina d'usuariu",
 'nstab-media'     => "Páxina d'archivu multimedia",
-'nstab-special'   => 'Especial',
+'nstab-special'   => 'Páxina especial',
 'nstab-project'   => 'Páxina de proyeutu',
 'nstab-image'     => 'Archivu',
 'nstab-mediawiki' => 'Mensaxe',
@@ -320,8 +319,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Nun esiste esa aición',
-'nosuchactiontext'  => "L'aición especificada pola URL nun ye
-reconocida pola wiki",
+'nosuchactiontext'  => "L'aición especificada pola URL nun ye válida.
+Seique escribieras mal la URL o siguieras un enllaz incorreutu.
+Tamién podría ser un bug nel software usáu por {{SITENAME}}.",
 'nosuchspecialpage' => 'Nun esiste esa páxina especial',
 'nospecialpagetext' => "<big>'''Pidisti una páxina especial non válida.'''</big>
 
@@ -374,7 +374,6 @@ Por favor informa d'esto a un [[Special:ListUsers/sysop|alministrador]], anotand
 'cannotdelete'         => 'Nun se pudo esborrar la páxina o imaxe seleicionada (seique daquién yá la esborrara).',
 'badtitle'             => 'Títulu incorreutu',
 'badtitletext'         => 'El títulu de páxina solicitáu nun ye válidu, ta vaciu o tien enllaces inter-llingua o inter-wiki incorreutos. Pue que contenga ún o más carauteres que nun puen ser usaos nos títulos.',
-'perfdisabled'         => '¡Sentímoslo muncho! Esta funcionalidá foi deshabilitada temporalmente porque allancia tanto la base de datos que naide pue usar la wiki.',
 'perfcached'           => 'Los siguientes datos tán na caché y pue que nun tean completamente actualizaos.',
 'perfcachedts'         => "Los siguientes datos tán na caché y actualizáronse la última vegada'l $1.",
 'querypage-no-updates' => "Les actualizaciones d'esta páxina tán actualmente deshabilitaes. Los datos qu'hai equí nun sedrán refrescaos nestos momentos.",
@@ -388,7 +387,7 @@ Consulta: $2',
 'protectedpagetext'    => 'Esta páxina foi candada pa evitar la so edición.',
 'viewsourcetext'       => "Pues ver y copiar el códigu fonte d'esta páxina:",
 'protectedinterface'   => "Esta páxina proporciona testu d'interfaz a l'aplicación y ta candada pa evitar el so abusu.",
-'editinginterface'     => "'''Avisu:''' Tas editando una páxina usada pa proporcionar testu d'interfaz a l'aplicación. Los cambeos nesta páxina va afeuta-yos l'apariencia de la interfaz a otros usuarios.",
+'editinginterface'     => "'''Avisu:''' Tas editando una páxina usada pa proporcionar testu d'interfaz a l'aplicación. Los cambeos nesta páxina va afeuta-yos l'apariencia de la interfaz a otros usuarios. Si quies facer traducciones, por favor participa en [http://translatewiki.net/wiki/Main_Page?setlang=ast translatewiki.net], el proyeutu de traducción de MediaWiki.",
 'sqlhidden'            => '(consulta SQL escondida)',
 'cascadeprotected'     => 'Esta páxina ta protexida d\'ediciones porque ta enxerta {{PLURAL:$1|na siguiente páxina|nes siguientes páxines}}, que {{PLURAL:$1|ta protexida|tán protexíes}} cola opción "en cascada":
 $2',
@@ -398,13 +397,13 @@ $2',
 'titleprotected'       => "Esti títulu foi protexíu de la so creación por [[User:$1|$1]]. El motivu conseñáu ye ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Configuración errónea: escáner de virus desconocíu: <i>$1</i>',
+'virus-badscanner'     => "Configuración errónea: escáner de virus desconocíu: ''$1''",
 'virus-scanfailed'     => "fallu d'escaniáu (códigu $1)",
 'virus-unknownscanner' => 'antivirus desconocíu:',
 
 # Login and logout pages
 'logouttitle'                => 'Desconexón',
-'logouttext'                 => "<strong>Yá tas desconectáu.</strong><br />
+'logouttext'                 => "'''Yá tas desconectáu.'''<br />
 
 Pues siguir usando {{SITENAME}} de forma anónima, o pues [[Special:UserLogin|volver a entrar]] como'l mesmu o como otru usuariu.
 Ten en cuenta que dalgunes páxines van continuar saliendo como si tovía tuvieres coneutáu, hasta que llimpies la caché del navegador.",
@@ -418,7 +417,6 @@ Nun t'escaezas d'escoyer les tos [[Special:Preferences|preferencies de {{SITENAM
 'remembermypassword'         => 'Recordar la mio identificación nesti ordenador',
 'yourdomainname'             => 'El to dominiu:',
 'externaldberror'            => "O hebo un error de l'autenticación esterna de la base de datos o nun tienes permisu p'actualizar la to cuenta esterna.",
-'loginproblem'               => '<b>Hebo un problema cola to identificación.</b><br />¡Inténtalo otra vuelta!',
 'login'                      => 'Entrar',
 'nav-login-createaccount'    => 'Entrar / Crear cuenta',
 'loginprompt'                => "Has tener les ''cookies'' activaes pa entrar en {{SITENAME}}.",
@@ -443,7 +441,7 @@ Nun t'escaezas d'escoyer les tos [[Special:Preferences|preferencies de {{SITENAM
 'yourvariant'                => 'Variante llingüística:',
 'yournick'                   => 'Firma:',
 'badsig'                     => 'Firma cruda non válida; comprueba les etiquetes HTML.',
-'badsiglength'               => 'El nomatu ye demasiao llargu.
+'badsiglength'               => 'La to robla ye demasiao llarga.
 Ha tener menos de $1 {{PLURAL:$1|caráuter|carauteres}}.',
 'email'                      => 'Corréu',
 'prefs-help-realname'        => "El nome real ye opcional y si decides conseñalu va ser usáu p'atribuyite'l to trabayu.",
@@ -457,7 +455,8 @@ Tamién pues escoyer permitir a los demás contautar contigo al traviés de la t
 'loginsuccesstitle'          => 'Identificación correuta',
 'loginsuccess'               => "'''Quedasti identificáu en {{SITENAME}} como \"\$1\".'''",
 'nosuchuser'                 => 'Nun hai usuariu dalu col nome "$1".
-Comprueba la ortografía, o [[Special:UserLogin/signup|crea una cuenta d\'usuariu nueva]].',
+Los nomes d\'usuariu distinguen mayúscules y minúscules.
+Comprueba la ortografía o [[Special:UserLogin/signup|crea una cuenta d\'usuariu nueva]].',
 'nosuchusershort'            => 'Nun hai nengún usuariu col nome "<nowiki>$1</nowiki>". Mira que tea bien escritu.',
 'nouserspecified'            => "Has especificar un nome d'usuariu.",
 'wrongpassword'              => 'Clave errónea.  Inténtalo otra vuelta.',
@@ -485,8 +484,9 @@ Enantes de que s'unvie nengún otru corréu a la cuenta, has siguir les instrucc
 'throttled-mailpassword'     => "Yá s'unvió un recordatoriu de la clave {{PLURAL:$1|na cabera hora|nes caberes $1 hores}}.
 Pa evitar l'abusu, namái sedrá unviáu un recordatoriu cada {{PLURAL:$1|hora|$1 hores}}.",
 'mailerror'                  => "Error unviando'l corréu: $1",
-'acct_creation_throttle_hit' => 'Yá creasti $1 cuentes. Nun pues abrir más.',
-'emailauthenticated'         => 'La to dirección de corréu confirmóse a les $1.',
+'acct_creation_throttle_hit' => "Los visitantes d'esta wiki qu'usen la to direición IP yá crearon güei {{PLURAL:$1|1 cuenta|$1 cuentes}}, que ye'l máximu almitíu nesti periodu de tiempu.
+Poro, los visitantes qu'usen esta direición IP nun pues crear más cuentes de momentu.",
+'emailauthenticated'         => "La to direición de corréu confirmóse'l $2 a les $3.",
 'emailnotauthenticated'      => 'La to direición de corréu nun ta comprobada. Hasta que se faiga, les siguientes funciones nun tarán disponibles.',
 'noemailprefs'               => "Especifica una direición de corréu pa qu'estes funcionalidaes furrulen.",
 'emailconfirmlink'           => 'Confirmar la direición de corréu',
@@ -498,17 +498,25 @@ Por favor escribi una direición con formatu afayadizu o dexa vaciu'l campu.",
 'createaccount-text'         => 'Daquién creó una cuenta pa la to direición de corréu electrónicu en {{SITENAME}} ($4) nomada "$2", asociada a la clave "$3". Habríes identificate y camudar la to clave agora.
 
 Pues inorar esti mensaxe si la cuenta foi creada por error.',
+'login-throttled'            => "Ficisti demasiaos intentos recientes cola clave d'esta cuenta. Por favor espera enantes d'intentalo otra vuelta.",
 'loginlanguagelabel'         => 'Llingua: $1',
 
 # Password reset dialog
-'resetpass'               => "Restablecer la clave d'usuariu",
-'resetpass_announce'      => "Identificástiti con una clave temporal unviada per corréu. P'acabar d'identificate has escribir equí una clave nueva:",
-'resetpass_header'        => 'Restablecer contraseña',
-'resetpass_submit'        => 'Camudar clave y identificase',
-'resetpass_success'       => '¡La to clave cambióse correutamente! Agora identificándote...',
-'resetpass_bad_temporary' => 'Clave temporal non válida. Seique yá camudaras correutamente la clave o solicitaras una nueva clave temporal.',
-'resetpass_forbidden'     => 'Les claves nun se puen camudar',
-'resetpass_missing'       => 'Nun hai datos en formulariu.',
+'resetpass'                 => 'Camudar la clave',
+'resetpass_announce'        => "Identificástiti con una clave temporal unviada per corréu. P'acabar d'identificate has escribir equí una clave nueva:",
+'resetpass_header'          => 'Camudar la clave de la cuenta',
+'oldpassword'               => 'Clave vieya:',
+'newpassword'               => 'Clave nueva:',
+'retypenew'                 => 'Repiti la nueva clave:',
+'resetpass_submit'          => 'Camudar clave y identificase',
+'resetpass_success'         => '¡La to clave cambióse correutamente! Agora identificándote...',
+'resetpass_bad_temporary'   => 'Clave temporal non válida. Seique yá camudaras correutamente la clave o solicitaras una nueva clave temporal.',
+'resetpass_forbidden'       => 'Les claves nun se puen camudar',
+'resetpass-no-info'         => "Has tar identificáu p'acceder direutamente a esta páxina.",
+'resetpass-submit-loggedin' => 'Camudar clave',
+'resetpass-wrong-oldpass'   => "La clave d'anguaño o temporal nun casa.
+Puede ser que yá la cambiaras o que solicitaste otra.",
+'resetpass-temp-password'   => 'Clave temporal:',
 
 # Edit page toolbar
 'bold_sample'     => 'Testu en negrina',
@@ -533,8 +541,8 @@ Pues inorar esti mensaxe si la cuenta foi creada por error.',
 'hr_tip'          => 'Llinia horizontal (úsala con moderación)',
 
 # Edit pages
-'summary'                          => 'Resume',
-'subject'                          => 'Asuntu/títulu',
+'summary'                          => 'Resume:',
+'subject'                          => 'Asuntu/títulu:',
 'minoredit'                        => 'Esta ye una edición menor',
 'watchthis'                        => 'Vixilar esta páxina',
 'savearticle'                      => 'Grabar páxina',
@@ -546,8 +554,8 @@ Pues inorar esti mensaxe si la cuenta foi creada por error.',
 'missingsummary'                   => "'''Recordatoriu:''' Nun escribisti un resume d'edición. Si vuelves a calcar en Guardar, la to edición sedrá guardada ensin nengún resume.",
 'missingcommenttext'               => 'Por favor, escribi un comentariu embaxo.',
 'missingcommentheader'             => "'''Recordatoriu:''' Nun-y punxisti tema/títulu a esti comentariu. Si vuelves a calcar en Guardar, la to edición va grabase ensin él.",
-'summary-preview'                  => 'Previsualización del resume',
-'subject-preview'                  => 'Previsualización del tema/títulu',
+'summary-preview'                  => 'Previsualización del resume:',
+'subject-preview'                  => 'Previsualización del tema/títulu:',
 'blockedtitle'                     => "L'usuariu ta bloquiáu",
 'blockedtext'                      => "<big>'''El to nome d'usuariu o la to direición IP foi bloquiáu.'''</big>
 
@@ -595,35 +603,38 @@ Por favor, amiesta toos estos detalles nes consultes que faigas.',
 'newarticle'                       => '(Nuevu)',
 'newarticletext'                   => 'Siguisti un enllaz a un artículu qu\'inda nun esiste. Pa crealu, empecipia a escribir na caxa d\'equí embaxo. Si llegasti equí por enquivocu, namás tienes que calcar nel botón "atrás" del to navegador.',
 'anontalkpagetext'                 => "----''Esta ye la páxina de'alderique pa un usuariu anónimu qu'inda nun creó una cuenta o que nun la usa. Pola mor d'ello ha usase la direición numérica IP pa identificalu/la. Tala IP pue ser compartida por varios usuarios. Si yes un usuariu anónimu y notes qu'hai comentarios irrelevantes empobinaos pa ti, por favor [[Special:UserLogin/signup|crea una cuenta]] o [[Special:UserLogin/signup|rexístrate]] pa evitar futures confusiones con otros usuarios anónimos.''",
-'noarticletext'                    => "Nestos momentos nun hai testu nesta páxina. Pues [[Special:Search/{{PAGENAME}}|buscar esti títulu]] n'otres páxines, o [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar ésta equí].",
+'noarticletext'                    => 'Anguaño nun hai testu nesta páxina.
+Pues [[Special:Search/{{PAGENAME}}|buscar esti títulu de páxina]] n\'otres páxines,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} buscar los rexistros rellacionaos],
+o [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar ésta equí]</span>.',
 'userpage-userdoesnotexist'        => 'La cuenta d\'usuariu "$1" nun ta rexistrada. Por favor asegúrate de que quies crear/editar esta páxina.',
 'clearyourcache'                   => "'''Nota:''' Llueu de salvar, seique tengas que llimpiar la caché del navegador pa ver los cambeos.
 *'''Mozilla / Firefox / Safari:''' caltién ''Shift'' mentes calques en ''Reload'', o calca ''Ctrl-Shift-R'' (''Cmd-Shift-R'' en Apple Mac)
 *'''IE:''' caltién ''Ctrl'' mentes calques ''Refresh'', o calca ''Ctrl-F5''
 *'''Konqueror:''' calca nel botón ''Reload'', o calca ''F5''
 *'''Opera:''' los usuarios d'Opera seique necesiten esborrar dafechu'l caché en ''Tools→Preferences''",
-'usercssjsyoucanpreview'           => "<strong>Conseyu:</strong> Usa'l bottón 'Amosar previsualización' pa probar el to nuevu CSS/JS enantes de guardalu.",
+'usercssjsyoucanpreview'           => "'''Conseyu:''' Usa'l bottón 'Amosar previsualización' pa probar el to nuevu CSS/JS enantes de guardalu.",
 'usercsspreview'                   => "'''Recuerda que namái tas previsualizando'l to CSS d'usuariu.'''
 '''¡Tovía nun ta guardáu!'''",
 'userjspreview'                    => "'''¡Recuerda que namái tas probando/previsualizando'l to JavaScript d'usuariu, entá nun se grabó!'''",
 'userinvalidcssjstitle'            => "'''Avisu:''' Nun hai piel \"\$1\". Recuerda que les páxines personalizaes .css y .js usen un títulu en minúscules, p. ex. {{ns:user}}:Foo/monobook.css en cuenta de {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Actualizao)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => "<strong>¡Alcuérdate de qu'esto ye sólo una previsualización y los cambeos entá nun se grabaron!</strong>",
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''¡Alcuérdate de qu'esto ye sólo una previsualización y los cambeos entá nun se grabaron!'''",
 'previewconflict'                  => "Esta previsualización amuesa'l testu del área d'edición d'enriba talo y como apaecerá si guardes los cambeos.",
-'session_fail_preview'             => "<strong>¡Sentímoslo muncho! Nun se pudo procesar la to edición porque hebo una perda de datos de la sesión.
-Inténtalo otra vuelta. Si nun se t'arregla, intenta salir y volver a rexistrate.</strong>",
-'session_fail_preview_html'        => "<strong>¡Sentímoslo! Nun se pudo procesar la to edición pola mor d'una perda de datos de sesión.</strong>
+'session_fail_preview'             => "'''¡Sentímoslo muncho! Nun se pudo procesar la to edición porque hebo una perda de datos de la sesión.
+Inténtalo otra vuelta. Si nun se t'arregla, intenta salir y volver a rexistrate.'''",
+'session_fail_preview_html'        => "'''¡Sentímoslo! Nun se pudo procesar la to edición pola mor d'una perda de datos de sesión.'''
 
 ''Como {{SITENAME}} tien activáu'l HTML puru, la previsualización nun s'amosará como precaución escontra ataques en JavaScript.''
 
-<strong>Si esti ye un intentu llexítimu d'edición, por favor inténtalo otra vuelta. Si tovía asina nun furrula, intenta [[Special:UserLogout|desconeutate]] y volver a identificate.</strong>",
-'token_suffix_mismatch'            => "<strong>La to edición nun foi aceutada porque'l to navegador mutiló los carauteres de puntuación
+'''Si esti ye un intentu llexítimu d'edición, por favor inténtalo otra vuelta. Si tovía asina nun furrula, intenta [[Special:UserLogout|desconeutate]] y volver a identificate.'''",
+'token_suffix_mismatch'            => "'''La to edición nun foi aceutada porque'l to navegador mutiló los carauteres de puntuación
 nel editor. La edición nun foi aceutada pa prevenir corrupciones na páxina de testu. Esto hai vegaes
-que pasa cuando tas usando un proxy anónimu basáu en web que seya problemáticu.</strong>",
+que pasa cuando tas usando un proxy anónimu basáu en web que seya problemáticu.'''",
 'editing'                          => 'Editando $1',
 'editingsection'                   => 'Editando $1 (seición)',
-'editingcomment'                   => 'Editando $1 (comentariu)',
+'editingcomment'                   => 'Editando $1 (seición nueva)',
 'editconflict'                     => "Conflictu d'edición: $1",
 'explainconflict'                  => "Daquién más camudó esta páxina dende qu'empecipiasti a editala.
 Na área de testu d'enriba ta'l testu de la páxina como ta nestos momentos.
@@ -632,26 +643,27 @@ Vas tener que fusionar los tos cambeos dientro del testu esistente.
 '''Namái''' va guardase'l testu de l'área d'enriba cuando calques en \"Guardar páxina\".",
 'yourtext'                         => 'El to testu',
 'storedversion'                    => 'Versión almacenada',
-'nonunicodebrowser'                => "<strong>AVISU: El to navegador nun cumple la norma unicode. Hai un sistema alternativu que te permite editar páxines de forma segura: los carauteres non-ASCII apaecerán na caxa d'edición como códigos hexadecimales.</strong>",
-'editingold'                       => "<strong>AVISU: Tas editando una revisión vieya d'esta páxina. Si la grabes, los cambeos que se ficieron dende esa revisión van perdese.</strong>",
+'nonunicodebrowser'                => "'''AVISU: El to navegador nun cumple la norma unicode. Hai un sistema alternativu que te permite editar páxines de forma segura: los carauteres non-ASCII apaecerán na caxa d'edición como códigos hexadecimales.'''",
+'editingold'                       => "'''AVISU: Tas editando una revisión vieya d'esta páxina. Si la grabes, los cambeos que se ficieron dende esa revisión van perdese.'''",
 'yourdiff'                         => 'Diferencies',
 'copyrightwarning'                 => "Por favor, ten en cuenta que toles contribuciones de {{SITENAME}} considérense feches públiques baxo la $2 (ver $1 pa más detalles). Si nun quies que'l to trabayu seya editáu ensin midida, nun lu pongas equí.<br />
 Amás tas dexándonos afitao qu'escribisti esto tu mesmu o que lo copiasti d'una fonte llibre de dominiu públicu o asemeyao.
-<strong>¡NUN PONGAS TRABAYOS CON DERECHOS D'AUTOR ENSIN PERMISU!</strong>",
+'''¡NUN PONGAS TRABAYOS CON DERECHOS D'AUTOR ENSIN PERMISU!'''",
 'copyrightwarning2'                => "Por favor, ten en cuenta que toles contribuciones de {{SITENAME}} puen ser editaes, alteraes o eliminaes por otros usuarios. Si nun quies que'l to trabayu seya editáu ensin midida, nun lu pongas equí.<br />
 Amás tas dexándonos afitao qu'escribisti esto tu mesmu o que lo copiasti d'una fonte
 llibre de dominiu públicu o asemeyao (ver $1 pa más detalles).
-<strong>¡NUN PONGAS TRABAYOS CON DERECHOS D'AUTOR ENSIN PERMISU!</strong>",
-'longpagewarning'                  => '<strong>AVISU: Esta páxina tien más de $1 quilobytes; dellos navegadores puen tener problemes editando páxines de 32 ó más kb. Habríes dixebrar la páxina en seiciones más pequeñes.</strong>',
-'longpageerror'                    => "<strong>ERROR: El testu qu'unviasti tien $1 quilobytes, que ye
-más que'l máximu de $2 quilobytes. Nun pue ser grabáu.</strong>",
-'readonlywarning'                  => '<strong>AVISU: La base de datos ta protexida por mantenimientu,
-polo que nun vas poder grabar les tos ediciones nestos momentos. Seique habríes copiar
-el testu nun archivu de testu y grabalu pa intentalo lluéu. </strong>',
-'protectedpagewarning'             => '<strong>AVISU: Esta páxina ta candada pa que sólo los alministradores puean editala.</strong>',
+'''¡NUN PONGAS TRABAYOS CON DERECHOS D'AUTOR ENSIN PERMISU!'''",
+'longpagewarning'                  => "'''AVISU: Esta páxina tien más de $1 quilobytes; dellos navegadores puen tener problemes editando páxines de 32 ó más kb. Habríes dixebrar la páxina en seiciones más pequeñes.'''",
+'longpageerror'                    => "'''ERROR: El testu qu'unviasti tien $1 quilobytes, que ye
+más que'l máximu de $2 quilobytes. Nun pue ser grabáu.'''",
+'readonlywarning'                  => "'''AVISU: La base de datos ta candada por mantenimientu, polo que nun vas poder guardar les tos ediciones nestos momentos.
+Seique habríes copiar el testu nun archivu de testu y guardalu pa intentalo lluéu. '''
+
+L'alministrador que la candó ufrió una esplicación: $1",
+'protectedpagewarning'             => "'''AVISU: Esta páxina ta candada pa que sólo los alministradores puean editala.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Esta páxina foi candada pa que nun puean editala namái que los usuarios rexistraos.",
 'cascadeprotectedwarning'          => "'''Avisu:''' Esta páxina ta candada pa que namái los alministradores la puean editar porque ta enxerta {{PLURAL:$1|na siguiente páxina protexida|nes siguientes páxines protexíes}} en cascada:",
-'titleprotectedwarning'            => '<strong>AVISU: Esta páxina foi candada pa que namái dalgunos usuarios puean creala.</strong>',
+'titleprotectedwarning'            => "'''AVISU: Esta páxina torgose pa que namái [[Special:ListGroupRights|dalgunos usuarios especiales]] puean creala.'''",
 'templatesused'                    => 'Plantíes usaes nesta páxina:',
 'templatesusedpreview'             => 'Plantíes usaes nesta previsualización:',
 'templatesusedsection'             => 'Plantíes usaes nesta seición:',
@@ -669,11 +681,22 @@ Pues volver atrás y editar una páxina esistente, o bien [[Special:UserLogin|id
 
 Habríes considerar si ye afechisco siguir editando esta páxina.
 Equí tienes el rexistru d'esborraos d'esta páxina:",
+'deleted-notice'                   => "Esta páxina foi eliminada.
+Como referencia, embaxo amuésase'l rexistru d'esborráu de la páxina.",
+'deletelog-fulllog'                => 'Ver el rexistru completu',
+'edit-hook-aborted'                => 'Edición albortada pol hook.
+Nun conseñó esplicación.',
+'edit-gone-missing'                => 'Nun se pudo actualizar la páxina.
+Paez que foi eliminada.',
+'edit-conflict'                    => "Conflictu d'edición.",
+'edit-no-change'                   => 'Inoróse la to edición porque nun produxo nengún cambéu nel testu.',
+'edit-already-exists'              => 'Nun se pudo crear una páxina nueva.
+Yá esiste.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Avisu: Esta páxina contién demasiaes llamaes costoses a funciones d'análisis sintáuticu.
 
-Habría tener menos de $2, y agora tien $1.",
+Habría tener menos de $2 {{PLURAL:$2|llamada|llamaes}}, y agora tien $1 {{PLURAL:$1|llamada|llamaes}}.",
 'expensive-parserfunction-category'       => "Páxines con demasiaes llamaes costoses a funciones d'análisis sintáuticu",
 'post-expand-template-inclusion-warning'  => 'Avisu: Esta páxina tien demasiaes inclusiones de plantíes.
 Dalgunes plantíes nun van ser incluyíes.',
@@ -681,6 +704,8 @@ Dalgunes plantíes nun van ser incluyíes.',
 'post-expand-template-argument-warning'   => "Avisu: Esta páxina contién a lo menos un parámetru de plantía que tien un tamañu d'espansión demasiao llargu.
 Estos parámetros van ser omitíos.",
 'post-expand-template-argument-category'  => 'Páxines con parámetros de plantía omitíos',
+'parser-template-loop-warning'            => 'Hai una rueda de plantíes: [[$1]]',
+'parser-template-recursion-depth-warning' => "Superóse'l llímite de profundidá de les plantíes ($1)",
 
 # "Undo" feature
 'undo-success' => "La edición pue esfacese. Por favor comprueba la comparanza d'embaxo pa verificar que ye eso lo que quies facer, y depués guarda los cambeos p'acabar d'esfacer la edición.",
@@ -695,29 +720,29 @@ Estos parámetros van ser omitíos.",
 El motivu dau por $3 ye ''$2''",
 
 # History pages
-'viewpagelogs'        => "Ver rexistros d'esta páxina",
-'nohistory'           => "Nun hay historial d'ediciones pa esta páxina.",
-'revnotfound'         => 'Revisión non atopada',
-'revnotfoundtext'     => "La revisión antigua de la páxina que solicitasti nun se pudo atopar. Por favor comprueba l'URL qu'usasti p'acceder a esta páxina.",
-'currentrev'          => 'Revisión actual',
-'revisionasof'        => 'Revisión a fecha de $1',
-'revision-info'       => 'Revisión a fecha de $1; $2',
-'previousrevision'    => '�Revisión anterior',
-'nextrevision'        => 'Revisión siguiente→',
-'currentrevisionlink' => 'Revisión actual',
-'cur'                 => 'act',
-'next'                => 'próximu',
-'last'                => 'cab',
-'page_first'          => 'primera',
-'page_last'           => 'cabera',
-'histlegend'          => "Seleición de diferencies: marca los botones de les versiones que quies comparar y da-y al <i>enter</i> o al botón d'abaxo.<br />
+'viewpagelogs'           => "Ver rexistros d'esta páxina",
+'nohistory'              => "Nun hay historial d'ediciones pa esta páxina.",
+'currentrev'             => 'Revisión actual',
+'currentrev-asof'        => 'Revisión actual a fecha de $1',
+'revisionasof'           => 'Revisión a fecha de $1',
+'revision-info'          => 'Revisión a fecha de $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Revisión anterior',
+'nextrevision'           => 'Revisión siguiente→',
+'currentrevisionlink'    => 'Revisión actual',
+'cur'                    => 'act',
+'next'                   => 'próximu',
+'last'                   => 'cab',
+'page_first'             => 'primera',
+'page_last'              => 'cabera',
+'histlegend'             => "Seleición de diferencies: marca los botones de les versiones que quies comparar y da-y al <i>enter</i> o al botón d'abaxo.<br />
 Lleenda: '''(act)''' = diferencies cola versión actual,
 '''(cab)''' = diferencies cola versión anterior, '''m''' = edición menor.",
-'deletedrev'          => '[esborráu]',
-'histfirst'           => 'Primera',
-'histlast'            => 'Cabera',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vaciu)',
+'history-fieldset-title' => 'Navegar pel historial',
+'deletedrev'             => '[esborráu]',
+'histfirst'              => 'Primera',
+'histlast'               => 'Cabera',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vaciu)',
 
 # Revision feed
 'history-feed-title'          => 'Historial de revisiones',
@@ -804,6 +829,7 @@ Asegúrate de qu'esti cambéu caltenga la continuidá del históricu de la páxi
 'mergehistory-invalid-destination' => 'La páxina de destín ha tener un títulu válidu.',
 'mergehistory-autocomment'         => '[[:$1]] fusionada con [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fusionada con [[:$2]]: $3',
+'mergehistory-same-destination'    => "Les páxines d'orixe y destín nun puen ser la mesma",
 
 # Merge log
 'mergelog'           => 'Rexistru de fusiones',
@@ -816,119 +842,200 @@ Asegúrate de qu'esti cambéu caltenga la continuidá del históricu de la páxi
 'difference'              => '(Diferencia ente revisiones)',
 'lineno'                  => 'Llinia $1:',
 'compareselectedversions' => 'Comparar les versiones seleicionaes',
+'visualcomparison'        => 'Comparación visual',
+'wikicodecomparison'      => 'Comparación wikitestu',
 'editundo'                => 'esfacer',
 'diff-multi'              => '({{PLURAL:$1|1 revisión intermedia non amosada|$1 revisiones intermedies non amosaes}})',
+'diff-movedto'            => 'treslladóse a $1',
+'diff-styleadded'         => 'estilu $1 añadíu',
+'diff-added'              => 'añadíu $1',
+'diff-changedto'          => 'camudáu a $1',
+'diff-movedoutof'         => 'quitó de $1',
+'diff-styleremoved'       => 'estilu $1 elimináu',
+'diff-removed'            => 'elimináu $1',
+'diff-changedfrom'        => 'camudáu dende $1',
+'diff-src'                => 'fonte',
+'diff-withdestination'    => 'con destín $1',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;y $1 $2',
+'diff-width'              => 'anchor',
+'diff-height'             => 'altor',
+'diff-p'                  => "un '''parágrafu'''",
+'diff-blockquote'         => "una '''cita'''",
+'diff-h1'                 => "un '''encabezáu (nivel 1)'''",
+'diff-h2'                 => "un '''encabezáu (nivel 2)'''",
+'diff-h3'                 => "un '''encabezáu (nivel 3)'''",
+'diff-h4'                 => "un '''encabezáu (nivel 4)'''",
+'diff-h5'                 => "un '''encabezáu (nivel 5)'''",
+'diff-pre'                => "un '''bloque preformatiáu'''",
+'diff-div'                => "una '''división'''",
+'diff-ul'                 => "una '''llista non ordenada'''",
+'diff-ol'                 => "una '''llista ordenada'''",
+'diff-li'                 => "un '''elementu de llista'''",
+'diff-table'              => "una '''tabla'''",
+'diff-tbody'              => "un '''conteníu de tabla'''",
+'diff-tr'                 => "una '''filera'''",
+'diff-td'                 => "una '''celda'''",
+'diff-th'                 => "un '''encabezáu'''",
+'diff-br'                 => "un '''saltu de llinia'''",
+'diff-hr'                 => "una '''llinia horizontal'''",
+'diff-code'               => "un '''bloque de códigu d'ordenador'''",
+'diff-dl'                 => "una '''llista de definición'''",
+'diff-dt'                 => "un '''términu de definición'''",
+'diff-dd'                 => "una '''definición'''",
+'diff-input'              => "una '''entrada'''",
+'diff-form'               => "un '''formulariu'''",
+'diff-img'                => "una '''imaxe'''",
+'diff-span'               => "una '''portada'''",
+'diff-a'                  => "un '''enllaz'''",
+'diff-i'                  => "'''cursiva'''",
+'diff-b'                  => "'''negrina'''",
+'diff-strong'             => "'''fuerte'''",
+'diff-em'                 => "'''énfasis'''",
+'diff-font'               => "'''fonte'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''elimináu'''",
+'diff-tt'                 => "'''anchor fixáu'''",
+'diff-sub'                => "'''subíndiz'''",
+'diff-sup'                => "'''superíndiz'''",
+'diff-strike'             => "'''tacháu'''",
 
 # Search results
-'searchresults'             => 'Resultaos de la busca',
-'searchresulttext'          => 'Pa más información tocante a busques en {{SITENAME}}, vete a [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Buscasti '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "Buscasti '''$1'''",
-'noexactmatch'              => "'''Nun esiste la páxina \"\$1\".''' Pues [[:\$1|crear esta páxina]].",
-'noexactmatch-nocreate'     => "'''Nun hai nenguna páxina col títulu \"\$1\".'''",
-'toomanymatches'            => 'Atopáronse demasiaes coincidencies, por favor fai una consulta diferente',
-'titlematches'              => 'Coincidencies de los títulos de la páxina',
-'notitlematches'            => 'Nun hai coincidencies nel títulu de la páxina',
-'textmatches'               => 'Coincidencies del testu de la páxina',
-'notextmatches'             => 'Nun hai coincidencies nel testu de la páxina',
-'prevn'                     => 'previos $1',
-'nextn'                     => 'siguientes $1',
-'viewprevnext'              => 'Ver ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 pallabra|$2 pallabres}})',
-'search-result-score'       => 'Relevancia: $1%',
-'search-redirect'           => '(redireición a $1)',
-'search-section'            => '(seición $1)',
-'search-suggest'            => 'Quixisti dicir: $1',
-'search-interwiki-caption'  => 'Proyeutos hermanos',
-'search-interwiki-default'  => '$1 resultaos:',
-'search-interwiki-more'     => '(más)',
-'search-mwsuggest-enabled'  => 'con suxerencies',
-'search-mwsuggest-disabled' => 'ensin suxerencies',
-'search-relatedarticle'     => 'Rellacionáu',
-'mwsuggest-disable'         => 'Desactivar les suxerencies AJAX',
-'searchrelated'             => 'rellacionáu',
-'searchall'                 => 'toos',
-'showingresults'            => "Abaxo {{PLURAL:$1|amuésase '''un''' resultáu|amuésense '''$1''' resultaos}}, entamando col #'''$2'''.",
-'showingresultsnum'         => "Abaxo {{PLURAL:$3|amuésase '''un''' resultáu|amuésense '''$3''' resultaos}}, entamando col #'''$2'''.",
-'showingresultstotal'       => "Amosando embaxo {{PLURAL:$3|el resultáu '''$1''' de '''$3'''|los resultaos '''$1 - $2''' de '''$3'''}}",
-'nonefound'                 => "'''Nota''': Por defeutu namái se busca en dalgunos de los espacios de nome. Prueba a poner delantre de la to consulta ''all:'' pa buscar en tol conteníu (inxiriendo páxines d'alderique, plantíes, etc.), o usa como prefixu l'espaciu de nome deseáu.",
-'powersearch'               => 'Buscar',
-'powersearch-legend'        => 'Busca avanzada',
-'powersearch-ns'            => 'Buscar nos espacios de nome:',
-'powersearch-redir'         => 'Llistar redireiciones',
-'powersearch-field'         => 'Buscar',
-'search-external'           => 'Busca esterna',
-'searchdisabled'            => "La busca en {{SITENAME}} ta desactivada. Mentanto, pues buscar en Google. Has fixate en que'l conteníu de los sos índices de {{SITENAME}} pue tar desfasáu.",
+'searchresults'                    => 'Resultaos de la busca',
+'searchresults-title'              => 'Resultaos de la busca pa "$1"',
+'searchresulttext'                 => 'Pa más información tocante a busques en {{SITENAME}}, vete a [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Buscasti \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|toles páxines qu\'emprimen con "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|toles páxines qu\'enllacien a "$1"]])',
+'searchsubtitleinvalid'            => "Buscasti '''$1'''",
+'noexactmatch'                     => "'''Nun esiste la páxina \"\$1\".''' Pues [[:\$1|crear esta páxina]].",
+'noexactmatch-nocreate'            => "'''Nun hai nenguna páxina col títulu \"\$1\".'''",
+'toomanymatches'                   => 'Atopáronse demasiaes coincidencies, por favor fai una consulta diferente',
+'titlematches'                     => 'Coincidencies de los títulos de la páxina',
+'notitlematches'                   => 'Nun hai coincidencies nel títulu de la páxina',
+'textmatches'                      => 'Coincidencies del testu de la páxina',
+'notextmatches'                    => 'Nun hai coincidencies nel testu de la páxina',
+'prevn'                            => 'previos $1',
+'nextn'                            => 'siguientes $1',
+'viewprevnext'                     => 'Ver ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Opciones de busca',
+'searchmenu-exists'                => "'''Hai una páxina nomada \"[[\$1]]\" nesta wiki'''",
+'searchmenu-new'                   => "'''¡Crear la páxina \"[[:\$1]]\" nesta wiki!'''",
+'searchhelp-url'                   => 'Help:Conteníos',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Restolar páxines con esti prefixu]]',
+'searchprofile-articles'           => 'Páxines de conteníu',
+'searchprofile-articles-and-proj'  => 'Páxines de conteníu y de proyeutu',
+'searchprofile-project'            => 'Páxines de proyeutu',
+'searchprofile-images'             => 'Archivos',
+'searchprofile-everything'         => 'Too',
+'searchprofile-advanced'           => 'Avanzao',
+'searchprofile-articles-tooltip'   => 'Buscar en $1',
+'searchprofile-project-tooltip'    => 'Buscar en $1',
+'searchprofile-images-tooltip'     => 'Buscar archivos',
+'searchprofile-everything-tooltip' => "Buscar tol conteníu (incluyendo páxines d'alderique)",
+'searchprofile-advanced-tooltip'   => 'Buscar en namespaces personalizaos',
+'prefs-search-nsdefault'           => 'Buscar usando los valores por defutu:',
+'prefs-search-nscustom'            => 'Buscar namespaces personalizaos:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 pallabra|$2 pallabres}})',
+'search-result-score'              => 'Relevancia: $1%',
+'search-redirect'                  => '(redireición a $1)',
+'search-section'                   => '(seición $1)',
+'search-suggest'                   => 'Quixisti dicir: $1',
+'search-interwiki-caption'         => 'Proyeutos hermanos',
+'search-interwiki-default'         => '$1 resultaos:',
+'search-interwiki-more'            => '(más)',
+'search-mwsuggest-enabled'         => 'con suxerencies',
+'search-mwsuggest-disabled'        => 'ensin suxerencies',
+'search-relatedarticle'            => 'Rellacionáu',
+'mwsuggest-disable'                => 'Desactivar les suxerencies AJAX',
+'searchrelated'                    => 'rellacionáu',
+'searchall'                        => 'toos',
+'showingresults'                   => "Abaxo {{PLURAL:$1|amuésase '''un''' resultáu|amuésense '''$1''' resultaos}}, entamando col #'''$2'''.",
+'showingresultsnum'                => "Abaxo {{PLURAL:$3|amuésase '''un''' resultáu|amuésense '''$3''' resultaos}}, entamando col #'''$2'''.",
+'showingresultstotal'              => "Amosando {{PLURAL:$4|embaxo'l resultáu '''$1''' de '''$3'''|embaxo los resultaos '''$1 - $2''' de '''$3'''}}",
+'nonefound'                        => "'''Nota''': Por defeutu namái se busca en dalgunos de los espacios de nome. Prueba a poner delantre de la to consulta ''all:'' pa buscar en tol conteníu (inxiriendo páxines d'alderique, plantíes, etc.), o usa como prefixu l'espaciu de nome deseáu.",
+'search-nonefound'                 => 'Nun hebo resultaos que concueyen cola consulta.',
+'powersearch'                      => 'Buscar',
+'powersearch-legend'               => 'Busca avanzada',
+'powersearch-ns'                   => 'Buscar nos espacios de nome:',
+'powersearch-redir'                => 'Llistar redireiciones',
+'powersearch-field'                => 'Buscar',
+'search-external'                  => 'Busca esterna',
+'searchdisabled'                   => "La busca en {{SITENAME}} ta desactivada. Mentanto, pues buscar en Google. Has fixate en que'l conteníu de los sos índices de {{SITENAME}} pue tar desfasáu.",
 
 # Preferences page
-'preferences'              => 'Preferencies',
-'mypreferences'            => 'Les mios preferencies',
-'prefs-edits'              => "Númberu d'ediciones:",
-'prefsnologin'             => 'Non identificáu',
-'prefsnologintext'         => 'Necesites tar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} identificáu]</span> pa camudar les preferencies d\'usuariu.',
-'prefsreset'               => 'Les preferencies fueron restablecíes a los valores por defeutu.',
-'qbsettings'               => 'Barra rápida',
-'qbsettings-none'          => 'Nenguna',
-'qbsettings-fixedleft'     => 'Fixa a manzorga',
-'qbsettings-fixedright'    => 'Fixa a mandrecha',
-'qbsettings-floatingleft'  => 'Flotante a manzorga',
-'qbsettings-floatingright' => 'Flotante a mandrecha',
-'changepassword'           => 'Camudar clave',
-'skin'                     => 'Apariencia',
-'math'                     => 'Fórmules matemátiques',
-'dateformat'               => 'Formatu de fecha',
-'datedefault'              => 'Ensin preferencia',
-'datetime'                 => 'Fecha y hora',
-'math_failure'             => 'Fallu al revisar la fórmula',
-'math_unknown_error'       => 'error desconocíu',
-'math_unknown_function'    => 'función desconocida',
-'math_lexing_error'        => 'Error lléxicu',
-'math_syntax_error'        => 'error de sintaxis',
-'math_image_error'         => 'Falló la convesión PNG; comprueba que tea bien la instalación de latex, dvips, gs y convert',
-'math_bad_tmpdir'          => "Nun se pue escribir o crear el direutoriu temporal 'math'",
-'math_bad_output'          => "Nun se pue escribir o crear el direutoriu de salida 'math'",
-'math_notexvc'             => "Falta l'executable 'texvc'; por favor mira 'math/README' pa configuralo.",
-'prefs-personal'           => 'Datos personales',
-'prefs-rc'                 => 'Cambeos recientes',
-'prefs-watchlist'          => 'Llista de vixilancia',
-'prefs-watchlist-days'     => "Númberu de díes qu'amosar na llista de vixilancia:",
-'prefs-watchlist-edits'    => "Númberu d'ediciones qu'amosar na llista de vixilancia espandida:",
-'prefs-misc'               => 'Varios',
-'saveprefs'                => 'Guardar preferencies',
-'resetprefs'               => 'Volver a les preferencies por defeutu',
-'oldpassword'              => 'Clave vieya:',
-'newpassword'              => 'Clave nueva:',
-'retypenew'                => 'Repiti la nueva clave:',
-'textboxsize'              => 'Edición',
-'rows'                     => 'Files:',
-'columns'                  => 'Columnes:',
-'searchresultshead'        => 'Busques',
-'resultsperpage'           => "Resultaos p'amosar per páxina:",
-'contextlines'             => "Llinies p'amosar per resultáu:",
-'contextchars'             => 'Carauteres de testu per llinia:',
-'stub-threshold'           => 'Llímite superior pa considerar como <a href="#" class="stub">enllaz a entamu</a> (bytes):',
-'recentchangesdays'        => "Díes qu'amosar nos cambeos recientes:",
-'recentchangescount'       => "Númberu d'ediciones amosaes nes páxines de cambeos recientes, historial y rexistru:",
-'savedprefs'               => 'Les tos preferencies quedaron grabaes.',
-'timezonelegend'           => 'Zona horaria',
-'timezonetext'             => '¹Diferencia horaria ente la UTC y la to hora llocal.',
-'localtime'                => 'Hora llocal',
-'timezoneoffset'           => 'Diferencia¹',
-'servertime'               => 'Hora del sirvidor',
-'guesstimezone'            => 'Obtener del navegador',
-'allowemail'               => 'Dexar a los otros usuarios mandate correos',
-'prefs-searchoptions'      => 'Opciones de busca',
-'prefs-namespaces'         => 'Espacios de nome',
-'defaultns'                => 'Buscar por defeutu nestos espacios de nome:',
-'default'                  => 'por defeutu',
-'files'                    => 'Archivos',
+'preferences'               => 'Preferencies',
+'mypreferences'             => 'Les mios preferencies',
+'prefs-edits'               => "Númberu d'ediciones:",
+'prefsnologin'              => 'Non identificáu',
+'prefsnologintext'          => 'Necesites tar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} identificáu]</span> pa camudar les preferencies d\'usuariu.',
+'prefsreset'                => 'Les preferencies fueron restablecíes a los valores por defeutu.',
+'qbsettings'                => 'Barra rápida',
+'qbsettings-none'           => 'Nenguna',
+'qbsettings-fixedleft'      => 'Fixa a manzorga',
+'qbsettings-fixedright'     => 'Fixa a mandrecha',
+'qbsettings-floatingleft'   => 'Flotante a manzorga',
+'qbsettings-floatingright'  => 'Flotante a mandrecha',
+'changepassword'            => 'Camudar clave',
+'skin'                      => 'Apariencia',
+'skin-preview'              => 'Previsualizar',
+'math'                      => 'Fórmules matemátiques',
+'dateformat'                => 'Formatu de fecha',
+'datedefault'               => 'Ensin preferencia',
+'datetime'                  => 'Fecha y hora',
+'math_failure'              => 'Fallu al revisar la fórmula',
+'math_unknown_error'        => 'error desconocíu',
+'math_unknown_function'     => 'función desconocida',
+'math_lexing_error'         => 'Error lléxicu',
+'math_syntax_error'         => 'error de sintaxis',
+'math_image_error'          => 'Falló la convesión PNG; comprueba que tea bien la instalación de latex, dvips, gs y convert',
+'math_bad_tmpdir'           => "Nun se pue escribir o crear el direutoriu temporal 'math'",
+'math_bad_output'           => "Nun se pue escribir o crear el direutoriu de salida 'math'",
+'math_notexvc'              => "Falta l'executable 'texvc'; por favor mira 'math/README' pa configuralo.",
+'prefs-personal'            => 'Datos personales',
+'prefs-rc'                  => 'Cambeos recientes',
+'prefs-watchlist'           => 'Llista de vixilancia',
+'prefs-watchlist-days'      => "Númberu de díes qu'amosar na llista de vixilancia:",
+'prefs-watchlist-days-max'  => '(7 díes máximo)',
+'prefs-watchlist-edits'     => "Númberu d'ediciones qu'amosar na llista de vixilancia espandida:",
+'prefs-watchlist-edits-max' => '(númberu máximu: 1000)',
+'prefs-misc'                => 'Varios',
+'prefs-resetpass'           => 'Camudar clave',
+'saveprefs'                 => 'Guardar preferencies',
+'resetprefs'                => 'Volver a les preferencies por defeutu',
+'textboxsize'               => 'Edición',
+'prefs-edit-boxsize'        => "Tamañu de la ventana d'edición.",
+'rows'                      => 'Files:',
+'columns'                   => 'Columnes:',
+'searchresultshead'         => 'Busques',
+'resultsperpage'            => "Resultaos p'amosar per páxina:",
+'contextlines'              => "Llinies p'amosar per resultáu:",
+'contextchars'              => 'Carauteres de testu per llinia:',
+'stub-threshold'            => 'Llímite superior pa considerar como <a href="#" class="stub">enllaz a entamu</a> (bytes):',
+'recentchangesdays'         => "Díes qu'amosar nos cambeos recientes:",
+'recentchangesdays-max'     => '(máximo $1 {{PLURAL:$1|día|díes}})',
+'recentchangescount'        => "Númberu d'ediciones amosaes nes páxines de cambeos recientes, historiales de páxines y rexistros, por defeutu:",
+'savedprefs'                => 'Les tos preferencies quedaron grabaes.',
+'timezonelegend'            => 'Zona horaria',
+'timezonetext'              => '¹Diferencia horaria ente la UTC y la to hora llocal.',
+'localtime'                 => 'Hora llocal:',
+'timezoneselect'            => 'Zona horaria:',
+'timezoneuseserverdefault'  => 'Usar el sirvidor preferíu',
+'timezoneuseoffset'         => 'Otru (especificar diferencia)',
+'timezoneoffset'            => 'Diferencia¹:',
+'servertime'                => 'Hora del sirvidor:',
+'guesstimezone'             => 'Obtener del navegador',
+'allowemail'                => 'Dexar a los otros usuarios mandate correos',
+'prefs-searchoptions'       => 'Opciones de busca',
+'prefs-namespaces'          => 'Espacios de nome',
+'defaultns'                 => 'Buscar por defeutu nestos espacios de nome:',
+'default'                   => 'por defeutu',
+'files'                     => 'Archivos',
 
 # User rights
 'userrights'                  => "Remanamientu de derechos d'usuariu", # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => "Remanamientu de grupos d'usuariu",
 'userrights-user-editname'    => "Escribi un nome d'usuariu:",
 'editusergroup'               => "Modificar grupos d'usuariu",
-'editinguser'                 => "Camudando los drechos del usuariu '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Camudando los drechos del usuariu '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Editar los grupos d'usuariu",
 'saveusergroups'              => "Guardar los grupos d'usuariu",
 'userrights-groupsmember'     => 'Miembru de:',
@@ -977,6 +1084,8 @@ Asegúrate de qu'esti cambéu caltenga la continuidá del históricu de la páxi
 'right-minoredit'            => 'Marcar ediciones como menores',
 'right-move'                 => 'Treslladar páxines',
 'right-move-subpages'        => 'Treslladar les páxines coles sos subpáxines',
+'right-move-rootuserpages'   => "Treslladar páxines d'un usuariu root",
+'right-movefile'             => 'Treslladar archivos',
 'right-suppressredirect'     => "Nun crear una redireición dende'l nome antiguu cuando se tresllada una páxina",
 'right-upload'               => 'Xubir archivos',
 'right-reupload'             => 'Sobreescribir un archivu esistente',
@@ -1027,9 +1136,46 @@ Asegúrate de qu'esti cambéu caltenga la continuidá del históricu de la páxi
 'rightslogentry' => 'camudó la pertenencia de grupu del usuariu $1 dende $2 a $3',
 'rightsnone'     => '(nengún)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lleer esta páxina',
+'action-edit'                 => 'editar esta páxina',
+'action-createpage'           => 'crear páxines',
+'action-createtalk'           => "crear páxines d'alderique",
+'action-createaccount'        => "crear esta cuenta d'usuariu",
+'action-minoredit'            => 'marcar esta edición como menor',
+'action-move'                 => 'treslladar esta páxina',
+'action-move-subpages'        => 'treslladar esta páxina y les sos subpáxines',
+'action-move-rootuserpages'   => "treslladar páxines d'un usuariu root",
+'action-movefile'             => 'treslladar esti archivu',
+'action-upload'               => 'xubir esti archivu',
+'action-reupload'             => 'sobreescribir esti archivu esistente',
+'action-reupload-shared'      => 'sustituyir esti archivu nun direutoriu compartíu',
+'action-upload_by_url'        => 'xubir esti archivu dende una direición URL',
+'action-writeapi'             => "usar l'API d'escritura",
+'action-delete'               => 'eliminar esta páxina',
+'action-deleterevision'       => 'eliminar esta revisión',
+'action-deletedhistory'       => "ver l'historial elimináu d'esta páxina",
+'action-browsearchive'        => 'buscar páxines esborraes',
+'action-undelete'             => 'restaurar esta páxina',
+'action-suppressrevision'     => 'revisar y restaurar esta revisión oculta',
+'action-suppressionlog'       => 'ver esti rexistru priváu',
+'action-block'                => "bloquiar qu'esti usuariu edite",
+'action-protect'              => 'camudar los niveles de proteición pa esta páxina',
+'action-import'               => 'importar esta páxina dende otra wiki',
+'action-importupload'         => "importar esta páxina dende una xubida d'archivu",
+'action-patrol'               => "marcar les ediciones d'otros como supervisaes",
+'action-autopatrol'           => 'marcar la to edición como supervisada',
+'action-unwatchedpages'       => 'ver la llista de páxines non vixilaes',
+'action-trackback'            => 'añader un retroenllaz',
+'action-mergehistory'         => "fusionar l'historial d'esta páxina",
+'action-userrights'           => "editar tolos drechos d'usuariu",
+'action-userrights-interwiki' => "editar los drechos d'usuariu d'usuarios d'otres wikis",
+'action-siteadmin'            => 'candar o descandar la base de datos',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|un cambéu|$1 cambeos}}',
 'recentchanges'                     => 'Cambeos recientes',
+'recentchanges-legend'              => 'Opciones de cambeos recientes',
 'recentchangestext'                 => 'Sigui los cambeos más recientes na wiki nesta páxina.',
 'recentchanges-feed-description'    => 'Sigue nesti canal los cambeos más recientes de la wiki.',
 'rcnote'                            => "Equí embaxo {{PLURAL:$1|pue vese '''1''' cambéu|puen vese los caberos '''$1''' cambeos}} {{PLURAL:$2|nel caberu día|nos caberos '''$2''' díes}}, a fecha de $5, $4.",
@@ -1053,6 +1199,8 @@ Asegúrate de qu'esti cambéu caltenga la continuidá del históricu de la páxi
 'rc_categories'                     => 'Llímite pa les categoríes (dixebrar con "|")',
 'rc_categories_any'                 => 'Cualesquiera',
 'newsectionsummary'                 => '/* $1 */ nueva seición',
+'rc-enhanced-expand'                => 'Amosar detalles (requier JavaScript)',
+'rc-enhanced-hide'                  => 'Ocultar detalles',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cambeos rellacionaos',
@@ -1073,11 +1221,11 @@ Asegúrate de qu'esti cambéu caltenga la continuidá del históricu de la páxi
 'upload_directory_read_only'  => "El sirvidor nun pue modificar el direutoriu de xubida d'archivos ($1).",
 'uploaderror'                 => 'Error de xubida',
 'uploadtext'                  => "Usa'l formulariu d'abaxo pa xubir archivos.
-Pa ver o buscar archivos xubíos previamente, vete a la [[Special:ImageList|llista d'archivos xubíos]]. Les xubíes tamién queden conseñaos nel [[Special:Log/upload|rexistru de xubíes]], y los esborraos nel [[Special:Log/delete|rexistru d'esborraos]].
+Pa ver o buscar archivos xubíos previamente, vete a la [[Special:FileList|llista d'archivos xubíos]]. Les xubíes tamién queden conseñaos nel [[Special:Log/upload|rexistru de xubíes]], y los esborraos nel [[Special:Log/delete|rexistru d'esborraos]].
 
 P'amiestar un archivu nuna páxina, usa un enllaz con ún de los siguientes formatos:
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Archivu.jpg]]</nowiki></tt>''' pa usar la versión completa del archivu
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Archivu.png|200px|thumb|left|testu alternativu]]</nowiki></tt>''' pa usar un renderizáu de 200 píxeles d'anchu nun caxellu al marxe esquierdu con 'testu alternativu' como la so descripción
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Archivu.jpg]]</nowiki></tt>''' pa usar la versión completa del archivu
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Archivu.png|200px|thumb|left|testu alternativu]]</nowiki></tt>''' pa usar un renderizáu de 200 píxeles d'anchu nun caxellu al marxe esquierdu con 'testu alternativu' como la so descripción
 *'''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Archivu.ogg]]</nowiki></tt>''' pa enllazar direutamente al archivu ensin amosar l'archivu",
 'upload-permitted'            => "Menes d'archivu permitíes: $1.",
 'upload-preferred'            => "Menes d'archivu preferíes: $1.",
@@ -1085,7 +1233,7 @@ P'amiestar un archivu nuna páxina, usa un enllaz con ún de los siguientes form
 'uploadlog'                   => 'rexistru de xubíes',
 'uploadlogpage'               => 'Rexistru de xubíes',
 'uploadlogpagetext'           => "Abaxo amuésase una llista de les xubíes d'archivos más recientes.
-Mira la [[Special:NewImages|galería d'archivos nuevos]] pa una güeyada más visual.",
+Mira la [[Special:NewFiles|galería d'archivos nuevos]] pa una güeyada más visual.",
 'filename'                    => "Nome d'archivu",
 'filedesc'                    => 'Resume',
 'fileuploadsummary'           => 'Resume:',
@@ -1098,6 +1246,7 @@ Mira la [[Special:NewImages|galería d'archivos nuevos]] pa una güeyada más vi
 'illegalfilename'             => 'El nome d\'archivu "$1" contién carauteres non permitíos en títulos de páxina. Por favor renoma l\'archivu y xúbilu otra vuelta.',
 'badfilename'                 => 'Nome de la imaxe camudáu a "$1".',
 'filetype-badmime'            => 'Los archivos de la triba MIME "$1" nun tienen permitida la xubida.',
+'filetype-bad-ie-mime'        => 'Nun puede xubise esti ficheru porque Internet Explorer deteutalu como "$1", nun ta permitíu y paez que pueda ser un ficheru peligrosu.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' ye una mena d'archivu non recomendáu.
 {{PLURAL:\$3|La mena d'archivu preferida ye|Les menes d'archivu preferíes son}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' nun ye una mena d'archivu permitida.
@@ -1106,22 +1255,24 @@ Mira la [[Special:NewImages|galería d'archivos nuevos]] pa una güeyada más vi
 'large-file'                  => 'Encamiéntase a que los archivos nun pasen de $1; esti archivu tien $2.',
 'largefileserver'             => 'Esti archivu ye mayor de lo que permite la configuración del sirvidor.',
 'emptyfile'                   => "L'archivu que xubisti paez tar vaciu. Esto podría ser pola mor d'un enquivocu nel nome l'archivu. Por favor, camienta si daveres quies xubir esti archivu.",
-'fileexists'                  => 'Yá esiste un archivu con esti nome, por favor comprueba <strong><tt>$1</tt></strong> si nun tas seguru de quere camudalu.',
-'filepageexists'              => "La páxina de descripción d'esti archivu yá foi creada en <strong><tt>$1</tt></strong>, pero nestos momentos nun esiste nengún archivu con esti nome. El resume que pongas nun va apaecer na páxina de descripción. Pa facer que'l to resume apaeza vas tener que lu editar manualmente.",
-'fileexists-extension'        => 'Yá esiste un archivu con un nome asemeyáu:<br />
-Nome del archivu que se quier xubir: <strong><tt>$1</tt></strong><br />
-Nome del archivu esistente: <strong><tt>$2</tt></strong><br />
-Por favor escueyi un nome diferente.',
+'fileexists'                  => "Yá esiste un archivu con esti nome, por favor comprueba '''<tt>$1</tt>''' si nun tas seguru de quere camudalu.",
+'filepageexists'              => "La páxina de descripción d'esti archivu yá foi creada en '''<tt>$1</tt>''', pero nestos momentos nun esiste nengún archivu con esti nome. El resume que pongas nun va apaecer na páxina de descripción. Pa facer que'l to resume apaeza vas tener que lu editar manualmente.",
+'fileexists-extension'        => "Yá esiste un archivu con un nome asemeyáu:<br />
+Nome del archivu que se quier xubir: '''<tt>$1</tt>'''<br />
+Nome del archivu esistente: '''<tt>$2</tt>'''<br />
+Por favor escueyi un nome diferente.",
 'fileexists-thumb'            => "<center>'''Archivu esistente'''</center>",
-'fileexists-thumbnail-yes'    => "L'archivu paez ser una imaxe de tamañu menguáu <i>(miniatura)</i>. Por favor comprueba l'archivu <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "L'archivu paez ser una imaxe de tamañu menguáu ''(miniatura)''. Por favor comprueba l'archivu '''<tt>$1</tt>'''.<br />
 Si l'archivu comprobáu tien el mesmu tamañu que la imaxe orixinal, nun ye necesario xubir una miniatura extra.",
-'file-thumbnail-no'           => "L'archivu entama con <strong><tt>$1</tt></strong>.
-Paez ser una imaxe de tamañu menguáu <i>(miniatura)</i>.
+'file-thumbnail-no'           => "L'archivu entama con '''<tt>$1</tt>'''.
+Paez ser una imaxe de tamañu menguáu ''(miniatura)''.
 Si tienes esta imaxe a resolución completa xúbila; si non, por favor camuda'l nome del archivu.",
-'fileexists-forbidden'        => 'Yá esiste un archivu con esti nome; por favor vuelvi atrás y xubi esti archivu con otru nome. [[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => 'Yá esiste un ficheru con esti nome, y nun pue ser renomáu.
+Si tovía asina quies xubir el ficheru, por favor vuelvi atrás y usa otru nome. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => "Yá esiste un archivu con esti nome nel direutoriu d'archivos compartíos.
-Si tovía asina quies xubir l'archivu, por favor vuelvi atrás y usa otru nome. [[Image:$1|thumb|center|$1]]",
+Si tovía asina quies xubir l'archivu, por favor vuelvi atrás y usa otru nome. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Esti archivu ye un duplicáu {{PLURAL:$1|del siguiente archivu|de los siguientes archivos}}:',
+'file-deleted-duplicate'      => 'Yá se desanició enantes un ficheru idénticu a esti ([[$1]]). Deberíes revisar el historial del ficheru enantes de xubilu otra vuelta.',
 'successfulupload'            => 'Xubida correuta',
 'uploadwarning'               => "Avisu de xubíes d'archivos",
 'savefile'                    => 'Grabar archivu',
@@ -1141,7 +1292,7 @@ Si tovía asina quies xubir l'archivu, por favor vuelvi atrás y usa otru nome.
 
 Habríes considerar si ye afechisco continuar xubiendo esti archivu.
 Amuésase equí'l rexistru d'esborraos pa esti archivu a los efeutos oportunos:",
-'filename-bad-prefix'         => 'El nome del archivu que tas xubiendo entama con <strong>"$1"</strong>, que ye un nome non descriptivu típicamente asignáu automáticamente poles cámares dixitales. Por favor escueyi un nome más descriptivu pal to archivu.',
+'filename-bad-prefix'         => "El nome del archivu que tas xubiendo entama con '''\"\$1\"''', que ye un nome non descriptivu típicamente asignáu automáticamente poles cámares dixitales. Por favor escueyi un nome más descriptivu pal to archivu.",
 
 'upload-proto-error'      => 'Protocolu incorreutu',
 'upload-proto-error-text' => "La xubida remota requier que l'URL entame por <code>http://</code> o <code>ftp://</code>.",
@@ -1165,20 +1316,21 @@ Si'l problema persiste, contauta con un [[Special:ListUsers/sysop|alministrador]
 'upload_source_url'  => ' (una URL válida y accesible públicamente)',
 'upload_source_file' => ' (un archivu del to ordenador)',
 
-# Special:ImageList
-'imagelist-summary'     => "Esta páxina especial amuesa tolos archivos xubíos.
+# Special:ListFiles
+'listfiles-summary'     => "Esta páxina especial amuesa tolos archivos xubíos.
 Por defeutu los caberos archivos xubíos amuésense a lo cimero de la llista.
 Calcando na cabecera d'una columna camúdase l'orde acordies con ella.",
-'imagelist_search_for'  => "Buscar por nome d'archivu multimedia:",
+'listfiles_search_for'  => "Buscar por nome d'archivu multimedia:",
 'imgfile'               => 'archivu',
-'imagelist'             => "Llista d'imáxenes",
-'imagelist_date'        => 'Fecha',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Usuariu',
-'imagelist_size'        => 'Tamañu',
-'imagelist_description' => 'Descripción',
-
-# Image description page
+'listfiles'             => "Llista d'imáxenes",
+'listfiles_date'        => 'Fecha',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Usuariu',
+'listfiles_size'        => 'Tamañu',
+'listfiles_description' => 'Descripción',
+'listfiles_count'       => 'Versiones',
+
+# File description page
 'filehist'                       => 'Historial del archivu',
 'filehist-help'                  => "Calca nuna fecha/hora pa ver l'archivu como taba daquélla.",
 'filehist-deleteall'             => 'esborrar too',
@@ -1186,16 +1338,22 @@ Calcando na cabecera d'una columna camúdase l'orde acordies con ella.",
 'filehist-revert'                => 'revertir',
 'filehist-current'               => 'actual',
 'filehist-datetime'              => 'Fecha/Hora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura de la versión a fecha de $1',
+'filehist-nothumb'               => 'Ensin miniatura',
 'filehist-user'                  => 'Usuariu',
 'filehist-dimensions'            => 'Dimensiones',
 'filehist-filesize'              => 'Tamañu del archivu',
 'filehist-comment'               => 'Comentariu',
-'imagelinks'                     => 'Enllaces a esta imaxe',
+'imagelinks'                     => 'Enllaces del ficheru',
 'linkstoimage'                   => '{{PLURAL:$1|La páxina siguiente enllacia|Les páxines siguientes enllacien}} a esti archivu:',
+'linkstoimage-more'              => "Más de $1 {{PLURAL:$1|páxina enllacia|páxines enllacien}} a esti archivu.
+La llista siguiente amuesa{{PLURAL:$1|'l primer enllaz de páxina| los primeros $1 enllaces de páxina}} a esti archivu namái.
+Hai disponible una [[Special:WhatLinksHere/$2|llista completa]].",
 'nolinkstoimage'                 => "Nun hai páxines qu'enllacien a esti archivu.",
 'morelinkstoimage'               => 'Ver [[Special:WhatLinksHere/$1|más enllaces]] a esti archivu.',
 'redirectstofile'                => '{{PLURAL:$1|El siguiente archivu redirixe|Los siguientes $1 archivos redirixen}} a esti archivu:',
-'duplicatesoffile'               => "{{PLURAL:$1|El siguiente archivu ye un duplicáu|Los siguientes $1 archivos son duplicaos}} d'esti archivu:",
+'duplicatesoffile'               => "{{PLURAL:$1|El siguiente archivu ye un duplicáu|Los siguientes $1 archivos son duplicaos}} d'esti archivu ([[Special:FileDuplicateSearch/$2|más detalles]]):",
 'sharedupload'                   => "L'archivu ye una xubida compartida y pue tar siendo usáu por otros proyeutos.",
 'shareduploadwiki'               => 'Por favor mira la $1 pa más información.',
 'shareduploadwiki-desc'          => "La descripción de la so $1 nel direutoriu compartíu ye l'amosada embaxo.",
@@ -1222,7 +1380,7 @@ Calcando na cabecera d'una columna camúdase l'orde acordies con ella.",
 # File deletion
 'filedelete'                  => 'Esborrar $1',
 'filedelete-legend'           => 'Esborrar archivu',
-'filedelete-intro'            => "Tas esborrando '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Tas a piques d'esborrar el ficheru '''[[Media:$1|$1]]''' xunto con tol so historial.",
 'filedelete-intro-old'        => "Tas esborrando la versión de '''[[Media:$1|$1]]''' del [$4 $3 a les $2].",
 'filedelete-comment'          => 'Comentariu:',
 'filedelete-submit'           => 'Esborrar',
@@ -1230,7 +1388,6 @@ Calcando na cabecera d'una columna camúdase l'orde acordies con ella.",
 'filedelete-success-old'      => "Eliminóse la versión de '''[[Media:$1|$1]]''' del $2 a les $3.",
 'filedelete-nofile'           => "'''$1''' nun esiste.",
 'filedelete-nofile-old'       => "Nun hai nenguna versión archivada de  '''$1''' colos atributos especificaos.",
-'filedelete-iscurrent'        => "Tas tentando de borrar la versión más reciente d'esti archivu. Por favor revierti primero a una versión más antigua.",
 'filedelete-otherreason'      => 'Otru motivu/motivu adicional:',
 'filedelete-reason-otherlist' => 'Otru motivu',
 'filedelete-reason-dropdown'  => "*Motivos comunes d'esborráu
@@ -1258,29 +1415,31 @@ Alcuérdate de comprobar otros enllaces a les plantíes enantes d'esborrales.",
 
 # Random page
 'randompage'         => 'Páxina al debalu',
-'randompage-nopages' => 'Nun hai páxines nesti espaciu de nomes.',
+'randompage-nopages' => 'Nun hai páxines nel espaciu de nomes "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redireición al debalu',
-'randomredirect-nopages' => 'Nun hai redireiciones nesti espaciu de nomes.',
+'randomredirect-nopages' => 'Nun hai redireiciones nel espaciu de nomes "$1".',
 
 # Statistics
-'statistics'             => 'Estadístiques',
-'sitestats'              => 'Estadístiques de {{SITENAME}}',
-'userstats'              => "Estadístiques d'usuariu",
-'sitestatstext'          => "Hai un total {{PLURAL:\$1|d''''una''' páxina|de '''\$1''' páxines}} na base de datos.
-Inclúi páxines d'\"alderique\" , páxines sobre {{SITENAME}}, \"entamos\" mínimos,
-redireiciones y otres que nun puen cuntar como páxines.  Ensin estes, hai {{PLURAL:\$2|'''una''' páxina|'''\$2''' páxines}} que son artículos llexítimos.
-
-Hai {{PLURAL:\$8|xubida '''una''' imaxe|xubíes '''\$8''' imáxenes}}.
-
-Hebo un total {{PLURAL:\$3|d''''una''' páxina visitada|de '''\$3''' páxines visitaes}}, y {{PLURAL:\$4|'''una''' edición|'''\$4''' ediciones}} dende qu'entamó {{SITENAME}}.
-Esto fai una media de '''\$5''' ediciones per páxina, y '''\$6''' visites per edición.
-
-La [http://www.mediawiki.org/wiki/Manual:Job_queue cola de xeres] ye de '''\$7'''.",
-'userstatstext'          => "Hai {{PLURAL:$1|'''1''' [[Special:ListUsers|usuariu]] rexistráu, del|'''$1''' [[Special:ListUsers|usuarios]] rexistraos, de los}} que
-'''$2''' (el '''$4%''') {{PLURAL:$2|tien|tienen}} privilexos de $5.",
-'statistics-mostpopular' => 'Páxines más vistes',
+'statistics'                   => 'Estadístiques',
+'statistics-header-pages'      => 'Estadístiques de páxines',
+'statistics-header-edits'      => "Estadístiques d'ediciones",
+'statistics-header-views'      => 'Estadístiques de visites',
+'statistics-header-users'      => "Estadístiques d'usuariu",
+'statistics-articles'          => 'Páxines de conteníu',
+'statistics-pages'             => 'Páxines',
+'statistics-pages-desc'        => "Toles páxines de la wiki, incluyendo páxines d'alderique, redireiciones, etc.",
+'statistics-files'             => 'Archivos xubíos',
+'statistics-edits'             => "Ediciones de páxines dende qu'entamó {{SITENAME}}",
+'statistics-edits-average'     => "Media d'ediciones per páxina",
+'statistics-views-total'       => 'Visites totales',
+'statistics-views-peredit'     => 'Visites por edición',
+'statistics-jobqueue'          => 'Llonxitú de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola de xeres]',
+'statistics-users'             => '[[Special:ListUsers|Usuarios]] rexistraos',
+'statistics-users-active'      => 'Usuarios activos',
+'statistics-users-active-desc' => 'Usuarios que realizaron una aición {{PLURAL:$1|nel caberu día|nos caberos $1 díes}}',
+'statistics-mostpopular'       => 'Páxines más vistes',
 
 'disambiguations'      => 'Páxines de dixebra',
 'disambiguationspage'  => 'Template:dixebra',
@@ -1292,7 +1451,7 @@ La [http://www.mediawiki.org/wiki/Manual:Job_queue cola de xeres] ye de '''\$7''
 'double-redirect-fixer'      => 'Iguador de redireiciones',
 
 'brokenredirects'        => 'Redireiciones rotes',
-'brokenredirectstext'    => 'Les siguientes redireiciones enllacien a páxines que nun esisten:',
+'brokenredirectstext'    => 'Les siguientes redireiciones enllacien a páxines non esistentes:',
 'brokenredirects-edit'   => '(editar)',
 'brokenredirects-delete' => '(esborrar)',
 
@@ -1322,26 +1481,30 @@ La [http://www.mediawiki.org/wiki/Manual:Job_queue cola de xeres] ye de '''\$7''
 'popularpages'            => 'Páxines populares',
 'wantedcategories'        => 'Categoríes buscaes',
 'wantedpages'             => 'Páxines buscaes',
-'missingfiles'            => 'Archivos non esistentes',
+'wantedfiles'             => 'Archivos buscaos',
+'wantedtemplates'         => 'Plantíes más buscaes',
 'mostlinked'              => 'Páxines más enllaciaes',
 'mostlinkedcategories'    => 'Categoríes más enllaciaes',
 'mostlinkedtemplates'     => 'Plantíes más enllaciaes',
 'mostcategories'          => 'Páxines con más categoríes',
 'mostimages'              => 'Archivos más enllaciaos',
 'mostrevisions'           => 'Páxines con más revisiones',
-'prefixindex'             => 'Páxines por prefixu',
+'prefixindex'             => 'Toles páxines col prefixu',
 'shortpages'              => 'Páxines curties',
 'longpages'               => 'Páxines llargues',
 'deadendpages'            => 'Páxines ensin salida',
 'deadendpagestext'        => 'Les páxines siguientes nun enllacien a páxina dala de {{SITENAME}}.',
 'protectedpages'          => 'Páxines protexíes',
 'protectedpages-indef'    => 'Namái les proteiciones permanentes',
+'protectedpages-cascade'  => 'Namái proteiciones en cascada',
 'protectedpagestext'      => "Les páxines siguientes tán protexíes escontra'l treslláu y la edición",
 'protectedpagesempty'     => 'Nun hai páxines protexíes anguaño con estos parámetros.',
 'protectedtitles'         => 'Títulos protexíos',
 'protectedtitlestext'     => 'Los siguiente títulos tán protexíos de la so creación',
 'protectedtitlesempty'    => 'Nun hai títulos protexíos anguaño con estos parámetros.',
 'listusers'               => "Llista d'usuarios",
+'listusers-editsonly'     => 'Amosar namái usuarios con ediciones',
+'usereditcount'           => '$1 {{PLURAL:$1|edición|ediciones}}',
 'newpages'                => 'Páxines nueves',
 'newpages-username'       => "Nome d'usuariu:",
 'ancientpages'            => 'Páxines más vieyes',
@@ -1362,14 +1525,13 @@ La [http://www.mediawiki.org/wiki/Manual:Job_queue cola de xeres] ye de '''\$7''
 'booksources-search-legend' => 'Busca de fontes de llibros',
 'booksources-go'            => 'Dir',
 'booksources-text'          => "Esta ye una llista d'enllaces a otros sitios que vienden llibros nuevos y usaos, y que puen tener más información sobre llibros que pueas tar guetando:",
+'booksources-invalid-isbn'  => 'El códigu ISBN que puxisti nun paez que valga; mira que te vien copiáu de la fonte orixinal.',
 
 # Special:Log
 'specialloguserlabel'  => 'Usuariu:',
 'speciallogtitlelabel' => 'Títulu:',
 'log'                  => 'Rexistros',
 'all-logs-page'        => 'Tolos rexistros',
-'log-search-legend'    => 'Buscar rexistros',
-'log-search-submit'    => 'Dir',
 'alllogstext'          => "Visualización combinada de tolos rexistros disponibles de {{SITENAME}}.
 Pues filtrar la visualización seleicionando una mena de rexistru, el nome d'usuariu (teniendo en cuenta les mayúscules y minúscules) o la páxina afectada (teniendo en cuenta tamién les mayúscules y minúscules).",
 'logempty'             => 'Nun hai coincidencies nel rexistru.',
@@ -1381,6 +1543,7 @@ Pues filtrar la visualización seleicionando una mena de rexistru, el nome d'usu
 'nextpage'          => 'Páxina siguiente ($1)',
 'prevpage'          => 'Páxina anterior ($1)',
 'allpagesfrom'      => "Amosar páxines qu'entamen por:",
+'allpagesto'        => 'Amosar páxines que finen por:',
 'allarticles'       => 'Toles páxines',
 'allinnamespace'    => 'Toles páxines (espaciu de nomes $1)',
 'allnotinnamespace' => 'Toles páxines (sacantes les del espaciu de nomes $1)',
@@ -1400,44 +1563,70 @@ Ver tamién les [[Special:WantedCategories|categoríes más buscaes]].",
 'special-categories-sort-count' => 'ordenar por tamañu',
 'special-categories-sort-abc'   => 'ordenar alfabéticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => "Contribuciones d'usuariu esborraes",
+
+# Special:LinkSearch
+'linksearch'       => 'Enllaces esternos',
+'linksearch-pat'   => 'Patrón de busca:',
+'linksearch-ns'    => 'Espaciu de nomes:',
+'linksearch-ok'    => 'Buscar',
+'linksearch-text'  => 'Puen usase comodinos como "*.wikipedia.org".<br />Protocolos almitíos: <tt>$1</tt>',
+'linksearch-line'  => '$1 enllaciáu dende $2',
+'linksearch-error' => 'Los comodinos namái puen apaecer al entamu del nome del güéspede.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Amosar usuarios emprimando dende:',
 'listusers-submit'   => 'Amosar',
 'listusers-noresult' => "Nun s'atoparon usuarios.",
 
+# Special:Log/newusers
+'newuserlogpage'              => "Rexistru de creación d'usuarios",
+'newuserlogpagetext'          => "Esti ye un rexistru de creación d'usuarios.",
+'newuserlog-byemail'          => 'clave unviada per corréu electrónicu',
+'newuserlog-create-entry'     => 'Usuariu nuevu',
+'newuserlog-create2-entry'    => 'creó una cuenta nueva pa $1',
+'newuserlog-autocreate-entry' => 'Cuenta creada automáticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => "Drechos de los grupos d'usuariu",
-'listgrouprights-summary'  => "La siguiente ye una llista de grupos d'usuariu definíos nesta wiki, colos sos drechos d'accesu asociaos.
+'listgrouprights'                 => "Drechos de los grupos d'usuariu",
+'listgrouprights-summary'         => "La siguiente ye una llista de grupos d'usuariu definíos nesta wiki, colos sos drechos d'accesu asociaos.
 Pue haber [[{{MediaWiki:Listgrouprights-helppage}}|información adicional]] tocante a drechos individuales.",
-'listgrouprights-group'    => 'Grupu',
-'listgrouprights-rights'   => 'Drechos',
-'listgrouprights-helppage' => 'Help:Drechos de grupu',
-'listgrouprights-members'  => '(llista de miembros)',
+'listgrouprights-group'           => 'Grupu',
+'listgrouprights-rights'          => 'Drechos',
+'listgrouprights-helppage'        => 'Help:Drechos de grupu',
+'listgrouprights-members'         => '(llista de miembros)',
+'listgrouprights-addgroup'        => 'Pue añader {{PLURAL:$2|grupu|grupos}}: $1',
+'listgrouprights-removegroup'     => 'Pue quitar {{PLURAL:$2|grupu|grupos}}: $1',
+'listgrouprights-addgroup-all'    => 'Pue añader tolos grupos',
+'listgrouprights-removegroup-all' => 'Pue quitar tolos grupos',
 
 # E-mail user
-'mailnologin'     => "Ensin direición d'unviu",
-'mailnologintext' => 'Has tar [[Special:UserLogin|identificáu]]
+'mailnologin'      => "Ensin direición d'unviu",
+'mailnologintext'  => 'Has tar [[Special:UserLogin|identificáu]]
 y tener una direición de corréu válida nes tos [[Special:Preferences|preferencies]]
 pa poder unviar correos a otros usuarios.',
-'emailuser'       => 'Manda-y un email a esti usuariu',
-'emailpage'       => "Corréu d'usuariu",
-'emailpagetext'   => "Pues usar el formulariu d'embaxo pa unviar un corréu electrónicu a esti usuariu.
+'emailuser'        => 'Manda-y un email a esti usuariu',
+'emailpage'        => "Corréu d'usuariu",
+'emailpagetext'    => "Pues usar el formulariu d'embaxo pa unviar un corréu electrónicu a esti usuariu.
 La direición de corréu electrónicu qu'especificasti nes [[Special:Preferences|tos preferencies d'usuariu]] va apaecer como la direición \"Dende\" del corréu, pa que'l que lo recibe seya quien a respondete direutamente a ti.",
-'usermailererror' => "L'operador de corréu devolvió un error:",
-'defemailsubject' => 'Corréu electrónicu de {{SITENAME}}',
-'noemailtitle'    => 'Ensin direición de corréu',
-'noemailtext'     => "Esti usuariu nun punxo una direición de corréu válida,
-o nun quier recibir correos d'otros usuarios.",
-'emailfrom'       => 'De:',
-'emailto'         => 'A:',
-'emailsubject'    => 'Asuntu:',
-'emailmessage'    => 'Mensaxe:',
-'emailsend'       => 'Unviar',
-'emailccme'       => 'Unviame per corréu una copia del mio mensaxe.',
-'emailccsubject'  => 'Copia del to mensaxe a $1: $2',
-'emailsent'       => 'Corréu unviáu',
-'emailsenttext'   => 'El to corréu foi unviáu.',
-'emailuserfooter' => 'Esti corréu electrónicu foi unviáu por $1 a $2 per acidu de la funxión "Manda-y un corréu a un usuariu" de {{SITENAME}}.',
+'usermailererror'  => "L'operador de corréu devolvió un error:",
+'defemailsubject'  => 'Corréu electrónicu de {{SITENAME}}',
+'noemailtitle'     => 'Ensin direición de corréu',
+'noemailtext'      => 'Esti usuariu nun especificó una direición de corréu válida.',
+'nowikiemailtitle' => "Nun se permite'l corréu electrónicu",
+'nowikiemailtext'  => "Esti usuariu nun quier recibir correos d'otros usuarios.",
+'email-legend'     => 'Unviar un corréu electrónicu a otru usuariu de {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'A:',
+'emailsubject'     => 'Asuntu:',
+'emailmessage'     => 'Mensaxe:',
+'emailsend'        => 'Unviar',
+'emailccme'        => 'Unviame per corréu una copia del mio mensaxe.',
+'emailccsubject'   => 'Copia del to mensaxe a $1: $2',
+'emailsent'        => 'Corréu unviáu',
+'emailsenttext'    => 'El to corréu foi unviáu.',
+'emailuserfooter'  => 'Esti corréu electrónicu foi unviáu por $1 a $2 per acidu de la funxión "Manda-y un corréu a un usuariu" de {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'La mio páxina de vixilancia',
@@ -1469,12 +1658,7 @@ Si más tarde quies quitala de la llista de vixilancia calca en "Dexar de vixila
 'iteminvalidname'      => "Problema col elementu '$1', nome non válidu...",
 'wlnote'               => "Abaxo {{PLURAL:$1|ta'l caberu cambéu|tán los caberos '''$1''' cambeos}} {{PLURAL:$2|na cabera hora|nes caberes '''$2''' hores}}.",
 'wlshowlast'           => 'Amosar les últimes $1 hores $2 díes $3',
-'watchlist-show-bots'  => 'Amosar ediciones de bot',
-'watchlist-hide-bots'  => 'Esconder ediciones de bots',
-'watchlist-show-own'   => 'Amosar les mios ediciones',
-'watchlist-hide-own'   => 'Esconder les mios ediciones',
-'watchlist-show-minor' => 'Amosar ediciones menores',
-'watchlist-hide-minor' => 'Esconder ediciones menores',
+'watchlist-options'    => 'Opciones de la llista de vixilancia',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vixilando...',
@@ -1514,83 +1698,102 @@ Pa camudar la configuración de la to llista de vixilancia, visita
 Más aida y sofitu:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Esborrar páxina',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "el conteníu yera: '$1'",
-'excontentauthor'             => "el conteníu yera: '$1' (y l'únicu autor yera '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "el conteníu enantes de dexar en blanco yera: '$1'",
-'exblank'                     => 'la páxina taba vacia',
-'delete-confirm'              => 'Esborrar "$1"',
-'delete-legend'               => 'Esborrar',
-'historywarning'              => 'Avisu: La páxina que vas esborrar tien historial:',
-'confirmdeletetext'           => "Tas a piques d'esborrar una páxina xunto con tol so historial.
+# Delete
+'deletepage'             => 'Esborrar páxina',
+'confirm'                => 'Confirmar',
+'excontent'              => "el conteníu yera: '$1'",
+'excontentauthor'        => "el conteníu yera: '$1' (y l'únicu autor yera '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "el conteníu enantes de dexar en blanco yera: '$1'",
+'exblank'                => 'la páxina taba vacia',
+'delete-confirm'         => 'Esborrar "$1"',
+'delete-legend'          => 'Esborrar',
+'historywarning'         => 'Avisu: La páxina que vas esborrar tien historial:',
+'confirmdeletetext'      => "Tas a piques d'esborrar una páxina xunto con tol so historial.
 Por favor confirma que ye lo que quies facer, qu'entiendes les consecuencies, y que lo tas faciendo acordies coles [[{{MediaWiki:Policy-url}}|polítiques]].",
-'actioncomplete'              => 'Aición completada',
-'deletedtext'                 => 'Esborróse "<nowiki>$1</nowiki>".
+'actioncomplete'         => 'Aición completada',
+'deletedtext'            => 'Esborróse "<nowiki>$1</nowiki>".
 Mira en $2 la llista de les últimes páxines esborraes.',
-'deletedarticle'              => 'esborró "[[$1]]"',
-'suppressedarticle'           => 'suprimió "[[$1]]"',
-'dellogpage'                  => "Rexistru d'esborraos",
-'dellogpagetext'              => 'Abaxo amuésase una llista de los artículos esborraos más recién.',
-'deletionlog'                 => 'rexistru de-esborraos',
-'reverted'                    => 'Revertida a una revisión anterior',
-'deletecomment'               => 'Motivu del esborráu:',
-'deleteotherreason'           => 'Otru motivu/motivu adicional:',
-'deletereasonotherlist'       => 'Otru motivu',
-'deletereason-dropdown'       => "*Motivos comunes d'esborráu
+'deletedarticle'         => 'esborró "[[$1]]"',
+'suppressedarticle'      => 'suprimió "[[$1]]"',
+'dellogpage'             => "Rexistru d'esborraos",
+'dellogpagetext'         => 'Abaxo amuésase una llista de los artículos esborraos más recién.',
+'deletionlog'            => 'rexistru de-esborraos',
+'reverted'               => 'Revertida a una revisión anterior',
+'deletecomment'          => 'Motivu del esborráu:',
+'deleteotherreason'      => 'Otru motivu/motivu adicional:',
+'deletereasonotherlist'  => 'Otru motivu',
+'deletereason-dropdown'  => "*Motivos comunes d'esborráu
 ** A pidimientu del autor
 ** Violación de Copyright
 ** Vandalismu",
-'delete-edit-reasonlist'      => "Editar los motivos d'esborráu",
-'delete-toobig'               => "Esta páxina tien un historial d'ediciones grande, más de $1 {{PLURAL:$1|revisión|revisiones}}.
+'delete-edit-reasonlist' => "Editar los motivos d'esborráu",
+'delete-toobig'          => "Esta páxina tien un historial d'ediciones grande, más de $1 {{PLURAL:$1|revisión|revisiones}}.
 Restrinxóse l'esborráu d'estes páxines pa evitar perturbaciones accidentales de {{SITENAME}}.",
-'delete-warning-toobig'       => "Esta páxina tien un historial d'ediciones grande, más de $1 {{PLURAL:$1|revisión|revisiones}}.
+'delete-warning-toobig'  => "Esta páxina tien un historial d'ediciones grande, más de $1 {{PLURAL:$1|revisión|revisiones}}.
 Esborralu pue perturbar les operaciones de la base de datos de {{SITENAME}};
 obra con precaución.",
-'rollback'                    => 'Revertir ediciones',
-'rollback_short'              => 'Revertir',
-'rollbacklink'                => 'revertir',
-'rollbackfailed'              => 'Falló la reversión',
-'cantrollback'                => "Nun se pue revertir la edición; el postrer collaborador ye l'únicu autor d'esta páxina.",
-'alreadyrolled'               => 'Nun se pue revertir la postrer edición de [[:$1]] fecha por [[User:$2|$2]] ([[User talk:$2|alderique]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+
+# Rollback
+'rollback'         => 'Revertir ediciones',
+'rollback_short'   => 'Revertir',
+'rollbacklink'     => 'revertir',
+'rollbackfailed'   => 'Falló la reversión',
+'cantrollback'     => "Nun se pue revertir la edición; el postrer collaborador ye l'únicu autor d'esta páxina.",
+'alreadyrolled'    => 'Nun se pue revertir la postrer edición de [[:$1]] fecha por [[User:$2|$2]] ([[User talk:$2|alderique]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 daquién más yá editó o revirtió la páxina.
 
-La postrer edición foi fecha por [[User:$3|$3]] ([[User talk:$3|alderique]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'El comentariu de la edición yera: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Revertíes les ediciones de [[Special:Contributions/$2|$2]] ([[User talk:$2|alderique]]) hasta la cabera versión de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Revertíes les ediciones de $1; camudáu a la última versión de $2.',
-'sessionfailure'              => 'Paez qu\'hai un problema cola to sesión; por precaución
+La postrer edición foi fecha por [[User:$3|$3]] ([[User talk:$3|alderique]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "El resume de la edición yera: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Revertíes les ediciones de [[Special:Contributions/$2|$2]] ([[User talk:$2|alderique]]) hasta la cabera versión de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Revertíes les ediciones de $1; camudáu a la última versión de $2.',
+'sessionfailure'   => 'Paez qu\'hai un problema cola to sesión; por precaución
 cancelóse l\'aición que pidisti. Da-y al botón "Atrás" del
 navegador pa cargar otra vuelta la páxina y vuelve a intentalo.',
+
+# Protect
 'protectlogpage'              => 'Rexistru de proteiciones',
 'protectlogtext'              => 'Esti ye un rexistru de les páxines candaes y descandaes. Consulta la [[Special:ProtectedPages|llista de páxines protexíes]] pa ver les proteiciones actives nestos momentos.',
 'protectedarticle'            => 'protexó $1',
 'modifiedarticleprotection'   => 'camudó\'l nivel de proteición de "[[$1]]"',
 'unprotectedarticle'          => 'desprotexó "[[$1]]"',
+'movedarticleprotection'      => 'treslladó los parámetros de proteición dende "[[$2]]" a "[[$1]]"',
 'protect-title'               => 'Protexendo "$1"',
+'prot_1movedto2'              => '[[$1]] treslladáu a [[$2]]',
 'protect-legend'              => 'Confirmar proteición',
 'protectcomment'              => 'Comentariu:',
 'protectexpiry'               => 'Caduca:',
 'protect_expiry_invalid'      => 'Caducidá non válida.',
 'protect_expiry_old'          => 'La fecha de caducidá ta pasada.',
 'protect-unchain'             => 'Camudar los permisos pa tresllaos',
-'protect-text'                => 'Equí pues ver y camudar el nivel de proteición de la páxina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nun pues camudar los niveles de proteición mentes teas bloquiáu. Esta
-ye la configuración actual de la páxina <strong>$1</strong>:',
+'protect-text'                => "Equí pues ver y camudar el nivel de proteición de la páxina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nun pues camudar los niveles de proteición mentes teas bloquiáu. Esta
+ye la configuración actual de la páxina '''$1''':",
 'protect-locked-dblock'       => "Los niveles de proteición nun puen ser camudaos pol mor d'un candáu activu de
-la base de datos. Esta ye la configuración actual de la páxina <strong>$1</strong>:",
-'protect-locked-access'       => 'La to cuenta nun tien permisu pa camudar los niveles de proteición de páxina.
-Esta ye la configuración actual pa la páxina <strong>$1</strong>:',
+la base de datos. Esta ye la configuración actual de la páxina '''$1''':",
+'protect-locked-access'       => "La to cuenta nun tien permisu pa camudar los niveles de proteición de páxina.
+Esta ye la configuración actual pa la páxina '''$1''':",
 'protect-cascadeon'           => "Esta páxina ta protexida nestos momentos porque ta inxerida {{PLURAL:$1|na siguiente páxina, que tien|nes siguientes páxines, que tienen}} activada la proteición en cascada. Pues camudar el nivel de proteición d'esta páxina, pero nun va afeutar a la proteición en cascada.",
-'protect-default'             => '(por defeutu)',
+'protect-default'             => 'Permitir tolos usuarios',
 'protect-fallback'            => 'Requier el permisu "$1"',
-'protect-level-autoconfirmed' => 'Bloquiar usuarios non rexistraos',
+'protect-level-autoconfirmed' => 'Bloquiar usuarios nuevos y non rexistraos',
 'protect-level-sysop'         => 'Namái alministradores',
 'protect-summary-cascade'     => 'en cascada',
 'protect-expiring'            => "caduca'l $1 (UTC)",
+'protect-expiry-indefinite'   => 'indefiníu',
 'protect-cascade'             => 'Páxines protexíes inxeríes nesta páxina (proteición en cascada)',
 'protect-cantedit'            => "Nun pues camudar los niveles de proteición d'esta páxina porque nun tienes permisu pa editala.",
+'protect-othertime'           => 'Otru periodu:',
+'protect-othertime-op'        => 'otru periodu',
+'protect-existing-expiry'     => 'Caducidá actual: $2, $3',
+'protect-otherreason'         => 'Otru motivu/motivu adicional:',
+'protect-otherreason-op'      => 'otru motivu/motivu adicional',
+'protect-dropdown'            => "*Motivos comunes de proteición
+** Vandalismu escomanáu
+** Spamming escesivu
+** Guerra d'ediciones contraproducente
+** Páxina de tráficu altu",
+'protect-edit-reasonlist'     => 'Editar los motivos de proteición',
+'protect-expiry-options'      => '2 hores:2 hours,1 día:1 day,3 díes:3 days,1 selmana:1 week,2 selmanes:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 añu:1 year,pa siempre:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permisu:',
 'restriction-level'           => 'Nivel de restricción:',
 'minimum-size'                => 'Tamañu mínimu',
@@ -1613,8 +1816,7 @@ Esta ye la configuración actual pa la páxina <strong>$1</strong>:',
 'undeletepage'                 => 'Ver y restaurar páxines esborraes',
 'undeletepagetitle'            => "'''Les siguientes son les revisiones esborraes de [[:$1]]'''.",
 'viewdeletedpage'              => 'Ver páxines esborraes',
-'undeletepagetext'             => "Les siguientes páxines foron esborraes pero tovía tán nel archivu y puen
-ser restauraes. L'archivu pue ser purgáu periódicamente.",
+'undeletepagetext'             => "{{PLURAL:$1|La siguiente páxina foi esborrada pero tovía ta nel archivu y pue ser restauráu|Les $1 páxines siguientes foron esborraes pero tovía tán nel archivu y puen ser restauraes}}. L'archivu pue ser purgáu periódicamente.",
 'undelete-fieldset-title'      => 'Restaurar revisiones',
 'undeleteextrahelp'            => "Pa restaurar tol historial de la páxina, deseleiciona toles caxelles y calca en '''''Restaurar'''''.
 Pa realizar una restauración selectiva, seleiciona les caxelles de la revisión que quies restaurar y calca en '''''Restaurar'''''.
@@ -1627,13 +1829,14 @@ del archivu. Nestos casos, tienes que desmarcar o amosar les revisiones esborrae
 'undeletehistorynoadmin'       => "Esta páxina foi esborrada. El motivu del esborráu amuésase
 nel resume d'embaxo, amás de detalles de los usuarios qu'editaron esta páxina enantes
 de ser esborrada. El testu actual d'estes revisiones esborraes ta disponible namái pa los alministradores.",
-'undelete-revision'            => 'Revisión borrada de $1 (del $2) fecha por $3:',
+'undelete-revision'            => 'Revisión esborrada de $1 ($4, a les $5) fecha por $3:',
 'undeleterevision-missing'     => "Falta la revisión o nun ye válida. Sieque l'enllaz nun seya correutu, o que la
 revisión fuera restaurada o eliminada del archivu.",
 'undelete-nodiff'              => "Nun s'atopó revisión previa.",
 'undeletebtn'                  => 'Restaurar',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Llimpiar',
+'undeleteinvert'               => 'Invertir seleición',
 'undeletecomment'              => 'Comentariu:',
 'undeletedarticle'             => 'restauró "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|1 revisión restaurada|$1 revisiones restauraes}}',
@@ -1656,6 +1859,8 @@ Consulta'l [[Special:Log/delete|rexistru d'esborraos]] pa ver los esborraos y re
 'undelete-error-long'          => "Atopáronse errores al restaurar l'archivu:
 
 $1",
+'undelete-show-file-confirm'   => '¿Tas seguru de que quies ver una versión desaniciada del ficheru "<nowiki>$1</nowiki>" del $2 a les $3?',
+'undelete-show-file-submit'    => 'Sí',
 
 # Namespace form on various pages
 'namespace'      => 'Espaciu de nomes:',
@@ -1663,26 +1868,27 @@ $1",
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contribuciones del usuariu',
-'mycontris'     => 'Les mios contribuciones',
-'contribsub2'   => 'De $1 ($2)',
-'nocontribs'    => "Nun s'atoparon cambeos que coincidan con esi criteriu.",
-'uctop'         => '(últimu cambéu)',
-'month'         => "Dende'l mes (y anteriores):",
-'year'          => "Dende l'añu (y anteriores):",
-
-'sp-contributions-newbies'     => 'Amosar namái les contribuciones de cuentes nueves',
-'sp-contributions-newbies-sub' => 'Namái les cuentes nueves',
-'sp-contributions-blocklog'    => 'Rexistru de bloqueos',
-'sp-contributions-search'      => 'Buscar contribuciones',
-'sp-contributions-username'    => "Direición IP o nome d'usuariu:",
-'sp-contributions-submit'      => 'Buscar',
+'contributions'       => 'Contribuciones del usuariu',
+'contributions-title' => "Contribuciones d'usuariu pa $1",
+'mycontris'           => 'Les mios contribuciones',
+'contribsub2'         => 'De $1 ($2)',
+'nocontribs'          => "Nun s'atoparon cambeos que coincidan con esi criteriu.",
+'uctop'               => '(últimu cambéu)',
+'month'               => "Dende'l mes (y anteriores):",
+'year'                => "Dende l'añu (y anteriores):",
+
+'sp-contributions-newbies'       => 'Amosar namái les contribuciones de cuentes nueves',
+'sp-contributions-newbies-sub'   => 'Namái les cuentes nueves',
+'sp-contributions-newbies-title' => "Contribuciones d'usuariu pa cuentes nueves",
+'sp-contributions-blocklog'      => 'Rexistru de bloqueos',
+'sp-contributions-search'        => 'Buscar contribuciones',
+'sp-contributions-username'      => "Direición IP o nome d'usuariu:",
+'sp-contributions-submit'        => 'Buscar',
 
 # What links here
 'whatlinkshere'            => "Lo qu'enllaza equí",
 'whatlinkshere-title'      => 'Páxines qu\'enllacien a "$1"',
 'whatlinkshere-page'       => 'Páxina:',
-'linklistsub'              => "(Llista d'enllaces)",
 'linkshere'                => "Les páxines siguientes enllacien a '''[[:$1]]''':",
 'nolinkshere'              => "Nenguna páxina enllaza a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nenguna páxina enllaza a '''[[:$1]]''' nel espaciu de nome conseñáu.",
@@ -1727,6 +1933,8 @@ Esto debería facese sólo pa prevenir vandalismu como indiquen les [[{{MediaWik
 'ipbotherreason'                  => 'Otru motivu/motivu adicional:',
 'ipbhidename'                     => "Ocultar el nome d'usuariu del rexistru de bloqueos, de la llista de bloqueos activos y de la llista d'usuarios",
 'ipbwatchuser'                    => "Vixilar les páxines d'usuariu y d'alderique d'esti usuariu",
+'ipballowusertalk'                => "Permite a esti usuariu editar la páxina d'alderique propia mentes ta bloquiáu",
+'ipb-change-block'                => "Volver a bloquiar l'usuariu con estos parámetros",
 'badipaddress'                    => 'IP non válida',
 'blockipsuccesssub'               => 'Bloquéu fechu correctamente',
 'blockipsuccesstext'              => "Bloquióse al usuariu [[Special:Contributions/$1|$1]].
@@ -1736,14 +1944,18 @@ Esto debería facese sólo pa prevenir vandalismu como indiquen les [[{{MediaWik
 'ipb-unblock'                     => "Desbloquiar un nome d'usuariu o direición IP",
 'ipb-blocklist-addr'              => 'Bloqueos esistentes de $1',
 'ipb-blocklist'                   => 'Ver los bloqueos esistentes',
+'ipb-blocklist-contribs'          => 'Contribuciones de $1',
 'unblockip'                       => 'Desbloquiar usuariu',
 'unblockiptext'                   => "Usa'l formulariu d'abaxo pa restablecer l'accesu d'escritura a una direicion IP o a un nome d'usuariu previamente bloquiáu.",
-'ipusubmit'                       => 'Desbloquiar esta direición',
+'ipusubmit'                       => 'Desaniciar esti bloquéu',
 'unblocked'                       => '[[User:$1|$1]] foi desbloquiáu',
 'unblocked-id'                    => 'El bloquéu $1 foi elimináu',
 'ipblocklist'                     => "Direiciones IP y nomes d'usuarios bloquiaos",
 'ipblocklist-legend'              => 'Atopar un usuariu bloquiáu',
 'ipblocklist-username'            => "Nome d'usuariu o direición IP:",
+'ipblocklist-sh-userblocks'       => '$1 los bloqueos de cuenta',
+'ipblocklist-sh-tempblocks'       => '$1 los bloqueos temporales',
+'ipblocklist-sh-addressblocks'    => "$1 los bloqueos d'IP simples",
 'ipblocklist-submit'              => 'Buscar',
 'blocklistline'                   => '$1, $2 bloquió a $3 ($4)',
 'infiniteblock'                   => 'pa siempre',
@@ -1752,14 +1964,18 @@ Esto debería facese sólo pa prevenir vandalismu como indiquen les [[{{MediaWik
 'noautoblockblock'                => 'bloquéu automáticu desactiváu',
 'createaccountblock'              => 'bloquiada la creación de cuentes',
 'emailblock'                      => 'corréu electrónicu bloquiáu',
+'blocklist-nousertalk'            => "nun pue editar la so páxina d'alderique",
 'ipblocklist-empty'               => 'La llista de bloqueos ta vacia.',
 'ipblocklist-no-results'          => "La direición IP o nome d'usuariu solicitáu nun ta bloquiáu.",
 'blocklink'                       => 'bloquiar',
 'unblocklink'                     => 'desbloquiar',
+'change-blocklink'                => 'camudar el bloquéu',
 'contribslink'                    => 'contribuciones',
 'autoblocker'                     => 'Bloquiáu automáticamente porque la to direición IP foi usada recién por "[[User:$1|$1]]". El motivu del bloquéu de $1 ye: "$2"',
 'blocklogpage'                    => 'Rexistru de bloqueos',
+'blocklog-fulllog'                => 'Rexistru de bloqueos completu',
 'blocklogentry'                   => 'bloquió [[$1]] con una caducidá de $2 $3',
+'reblock-logentry'                => 'camudó los parámetros de bloquéu de [[$1]] con una caducidá de $2 $3',
 'blocklogtext'                    => "Esti ye un rexistru de los bloqueos y desbloqueos d'usuarios.
 Les direcciones IP bloquiaes automáticamente nun salen equí.
 Pa ver los bloqueos qu'hai agora mesmo, mira na [[Special:IPBlockList|llista d'IP bloquiaes]].",
@@ -1768,11 +1984,14 @@ Pa ver los bloqueos qu'hai agora mesmo, mira na [[Special:IPBlockList|llista d'I
 'block-log-flags-nocreate'        => 'creación de cuentes deshabilitada',
 'block-log-flags-noautoblock'     => 'bloquéu automáticu deshabilitáu',
 'block-log-flags-noemail'         => 'corréu electrónicu bloquiáu',
+'block-log-flags-nousertalk'      => "nun pue editar la páxina d'alderique propia",
 'block-log-flags-angry-autoblock' => 'autobloquéu ameyoráu activáu',
 'range_block_disabled'            => "La capacidá d'alministrador pa crear bloqueos d'intervalos ta desactivada.",
 'ipb_expiry_invalid'              => 'Tiempu incorrectu.',
 'ipb_expiry_temp'                 => "Los bloqueos de nome d'usuariu escondíos han ser permanentes.",
 'ipb_already_blocked'             => '"$1" yá ta bloqueáu',
+'ipb-needreblock'                 => '== Yá bloquiáu ==
+$1 yá ta bloquiáu. ¿Quies camudar los parámetros?',
 'ipb_cant_unblock'                => "Error: Nun s'atopó'l bloquéu númberu $1. Seique yá fuera desbloquiáu.",
 'ipb_blocked_as_range'            => 'Error: La IP $1 nun ta bloquiada direutamente, polo que nun pue ser desloquiada. Sicasí, foi bloquiada como parte del intervalu $2, que pue ser desbloquiáu.',
 'ip_range_invalid'                => 'Rangu IP non válidu.',
@@ -1783,6 +2002,7 @@ Pa ver los bloqueos qu'hai agora mesmo, mira na [[Special:IPBlockList|llista d'I
 'proxyblocksuccess'               => 'Fecho.',
 'sorbsreason'                     => 'La to direición IP sal na llista de proxys abiertos en DNSBL usada por {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'La to direición IP sal na llista de proxys abiertos en DNSBL usada por {{SITENAME}}. Nun pues crear una cuenta',
+'cant-block-while-blocked'        => 'Nun pues bloquiar a otros usuarios mentes tu teas bloquiáu.',
 
 # Developer tools
 'lockdb'              => 'Protexer la base de datos',
@@ -1810,9 +2030,9 @@ na base de datos. Por favor confirma que ye lo quies facer.',
 'databasenotlocked'   => 'La base de datos nun ta candada.',
 
 # Move page
-'move-page'               => 'Treslladar $1',
-'move-page-legend'        => 'Treslladar páxina',
-'movepagetext'            => "Usando'l siguiente formulariu vas renomar una páxina, treslladando'l so historial al nuevu nome.
+'move-page'                    => 'Treslladar $1',
+'move-page-legend'             => 'Treslladar páxina',
+'movepagetext'                 => "Usando'l siguiente formulariu vas renomar una páxina, treslladando'l so historial al nuevu nome.
 El nome vieyu va convertise nuna redireición al nuevu.
 Pues actualizar redireiciones qu'enllacien al títulu orixinal automáticamente.
 Si prefieres nun lo facer, asegúrate de que nun dexes [[Special:DoubleRedirects|redireiciones dobles]] o [[Special:BrokenRedirects|rotes]].
@@ -1824,47 +2044,60 @@ Esto significa que pues volver a renomar una páxina col nome orixinal si t'enqu
 ¡AVISU!'''
 Esti pue ser un cambéu importante y inesperáu pa una páxina popular;
 por favor, asegúrate d'entender les consecuencies de lo que vas facer enantes de siguir.",
-'movepagetalktext'        => "La páxina d'alderique asociada va ser treslladada automáticamente '''a nun ser que:'''
+'movepagetalktext'             => "La páxina d'alderique asociada va ser treslladada automáticamente '''a nun ser que:'''
 *Yá esista una páxina d'alderique non vacia col nuevu nome, o
 *Desactives la caxella d'equí baxo.
 
 Nestos casos vas tener que treslladar o fusionar la páxina manualmente.",
-'movearticle'             => 'Treslladar la páxina:',
-'movenotallowed'          => 'Nun tienes permisu pa mover páxines.',
-'newtitle'                => 'Al títulu nuevu:',
-'move-watch'              => 'Vixilar esta páxina',
-'movepagebtn'             => 'Treslladar la páxina',
-'pagemovedsub'            => 'Treslláu correctu',
-'movepage-moved'          => '<big>\'\'\'"$1" treslladóse a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "Yá hai una páxina con esi nome, o'l nome qu'escoyisti nun ye válidu. Por favor, escueyi otru nome.",
-'cantmove-titleprotected' => "Nun pues mover una páxina a esti llugar porque'l nuevu títulu foi protexíu de la so creación",
-'talkexists'              => "'''La páxina treslladóse correutamente, pero non la so páxina d'alderique porque yá esiste una col títulu nuevu. Por favor, fusiónala manualmente.'''",
-'movedto'                 => 'treslladáu a',
-'movetalk'                => "Mover la páxina d'alderique asociada",
-'move-subpages'           => 'Treslladar toles subpáxines si ye posible',
-'move-talk-subpages'      => "Treslladar toles subpáxines de la páxina d'alderique si ye posible",
-'movepage-page-exists'    => 'La páxina $1 yá esiste y nun se pue sobreescribir automáticamente.',
-'movepage-page-moved'     => 'Treslladóse la páxina $1 a $2.',
-'movepage-page-unmoved'   => 'Nun se pudo treslladar la páxina $1 a $2.',
-'movepage-max-pages'      => "Treslladóse'l máximu de $1 {{PLURAL:$1|páxina|páxinees}} y nun van treslladase más automáticamente.",
-'1movedto2'               => '[[$1]] treslladáu a [[$2]]',
-'1movedto2_redir'         => '[[$1]] treslladáu a [[$2]] sobre una redireición',
-'movelogpage'             => 'Rexistru de tresllaos',
-'movelogpagetext'         => 'Esta ye la llista de páxines treslladaes.',
-'movereason'              => 'Motivu:',
-'revertmove'              => 'revertir',
-'delete_and_move'         => 'Esborrar y treslladar',
-'delete_and_move_text'    => '==Necesítase esborrar==
+'movearticle'                  => 'Treslladar la páxina:',
+'movenologin'                  => 'Non identificáu',
+'movenologintext'              => 'Tienes que ser un usuariu rexistráu y tar [[Special:UserLogin|identificáu]] pa treslladar una páxina.',
+'movenotallowed'               => 'Nun tienes permisu pa mover páxines.',
+'movenotallowedfile'           => 'Nun tienes permisu pa mover ficheros.',
+'cant-move-user-page'          => "Nun tienes permisu pa treslladar páxines d'usuariu (independientemente de les subpáxines).",
+'cant-move-to-user-page'       => "Nun tienes permisu pa treslladar una páxina a una páxina d'usuariu (sacante a una subpáxina d'usuariu).",
+'newtitle'                     => 'Al títulu nuevu:',
+'move-watch'                   => 'Vixilar esta páxina',
+'movepagebtn'                  => 'Treslladar la páxina',
+'pagemovedsub'                 => 'Treslláu correctu',
+'movepage-moved'               => '<big>\'\'\'"$1" treslladóse a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Creóse una redireición.',
+'movepage-moved-noredirect'    => "Desaniciose la creación d'una redireición.",
+'articleexists'                => "Yá hai una páxina con esi nome, o'l nome qu'escoyisti nun ye válidu. Por favor, escueyi otru nome.",
+'cantmove-titleprotected'      => "Nun pues mover una páxina a esti llugar porque'l nuevu títulu foi protexíu de la so creación",
+'talkexists'                   => "'''La páxina treslladóse correutamente, pero non la so páxina d'alderique porque yá esiste una col títulu nuevu. Por favor, fusiónala manualmente.'''",
+'movedto'                      => 'treslladáu a',
+'movetalk'                     => "Mover la páxina d'alderique asociada",
+'move-subpages'                => 'Treslladar toles subpáxines si ye posible',
+'move-talk-subpages'           => "Treslladar toles subpáxines de la páxina d'alderique si ye posible",
+'movepage-page-exists'         => 'La páxina $1 yá esiste y nun se pue sobreescribir automáticamente.',
+'movepage-page-moved'          => 'Treslladóse la páxina $1 a $2.',
+'movepage-page-unmoved'        => 'Nun se pudo treslladar la páxina $1 a $2.',
+'movepage-max-pages'           => "Treslladóse'l máximu de $1 {{PLURAL:$1|páxina|páxinees}} y nun van treslladase más automáticamente.",
+'1movedto2'                    => '[[$1]] treslladáu a [[$2]]',
+'1movedto2_redir'              => '[[$1]] treslladáu a [[$2]] sobre una redireición',
+'move-redirect-suppressed'     => 'redireición desaniciada',
+'movelogpage'                  => 'Rexistru de tresllaos',
+'movelogpagetext'              => 'Esta ye la llista de páxines treslladaes.',
+'movereason'                   => 'Motivu:',
+'revertmove'                   => 'revertir',
+'delete_and_move'              => 'Esborrar y treslladar',
+'delete_and_move_text'         => '==Necesítase esborrar==
 
 La páxina de destín "[[:$1]]" yá esiste. ¿Quies esborrala pa dexar sitiu pal treslláu?',
-'delete_and_move_confirm' => 'Sí, esborrar la páxina',
-'delete_and_move_reason'  => 'Esborrada pa facer sitiu pal treslláu',
-'selfmove'                => "Los nomes d'orixe y destín son los mesmos, nun se pue treslladar una páxina sobre ella mesma.",
-'immobile_namespace'      => "El nome d'orixe o'l de destín ye d'una triba especial; nun se puen mover páxines dende nin a esti espaciu de nomes.",
-'imagenocrossnamespace'   => "Nun se pue treslladar una imaxe a nun espaciu de nomes que nun ye d'imáxenes",
-'imagetypemismatch'       => 'La estensión nueva del archivu nun concueya cola so mena',
-'imageinvalidfilename'    => 'El nome del archivu oxetivu nun ye válidu',
-'fix-double-redirects'    => 'Actualizar cualesquier redireición que señale al títulu orixinal',
+'delete_and_move_confirm'      => 'Sí, esborrar la páxina',
+'delete_and_move_reason'       => 'Esborrada pa facer sitiu pal treslláu',
+'selfmove'                     => "Los nomes d'orixe y destín son los mesmos, nun se pue treslladar una páxina sobre ella mesma.",
+'immobile-source-namespace'    => 'Nun se puen treslladar páxines nel espaciu de nomes "$1"',
+'immobile-target-namespace'    => 'Nun se puen treslladar páxines al espaciu de nomes "$1"',
+'immobile-target-namespace-iw' => "Nun puedes mover una páxina a un enllaz d'Interwiki.",
+'immobile-source-page'         => 'Esta páxina nun ye treslladable.',
+'immobile-target-page'         => 'Nun se pue treslladar a esi títulu de destín.',
+'imagenocrossnamespace'        => "Nun se pue treslladar una imaxe a nun espaciu de nomes que nun ye d'imáxenes",
+'imagetypemismatch'            => 'La estensión nueva del archivu nun concueya cola so mena',
+'imageinvalidfilename'         => 'El nome del archivu oxetivu nun ye válidu',
+'fix-double-redirects'         => 'Actualizar cualesquier redireición que señale al títulu orixinal',
+'move-leave-redirect'          => 'Dexar una redireición detrás',
 
 # Export
 'export'            => 'Esportar páxines',
@@ -1876,7 +2109,7 @@ Pa esportar páxines, pon los títulos na caxa de testu d'embaxo, un títulu per
 y seleiciona si quies la versión actual xunto con toles versiones antigües, xunto col
 so historial, o namái la versión actual cola información de la postrer edición.
 
-Por último, tamién pues usar un enllaz: p.e. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pa la páxina \"[[{{MediaWiki:Mainpage}}]]\".",
+Por último, tamién pues usar un enllaz: p.e. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pa la páxina \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Amestar namái la revisión actual, non tol historial',
 'exportnohistory'   => "----
 '''Nota:''' Desactivóse la esportación del historial completu de páxines al traviés d'esti formulariu por motivos de rendimientu.",
@@ -1892,7 +2125,7 @@ Por último, tamién pues usar un enllaz: p.e. [[{{ns:special}}:Export/{{MediaWi
 'allmessagesdefault'        => 'Testu por defeutu',
 'allmessagescurrent'        => 'Testu actual',
 'allmessagestext'           => 'Esta ye una llista de los mensaxes de sistema disponibles nel espaciu de nomes de MediaWiki.
-Por favor visita [http://www.mediawiki.org/wiki/Localisation Llocalización de MediaWiki] y [http://translatewiki.net Betawiki] si quies contribuyer a la llocalización xenérica de MediaWiki.',
+Por favor visita [http://www.mediawiki.org/wiki/Localisation Llocalización de MediaWiki] y [http://translatewiki.net translatewiki.net] si quies contribuyer a la llocalización xenérica de MediaWiki.',
 'allmessagesnotsupportedDB' => "Nun pue usase '''{{ns:special}}:Allmessages''' porque '''\$wgUseDatabaseMessages''' ta deshabilitáu.",
 'allmessagesfilter'         => 'Filtru pal nome del mensax:',
 'allmessagesmodified'       => 'Amosar solo modificaos',
@@ -1912,9 +2145,12 @@ Por favor visita [http://www.mediawiki.org/wiki/Localisation Llocalización de M
 'import-interwiki-text'      => "Seleiciona una wiki y un títulu de páxina pa importar.
 Les feches de revisión y los nomes de los editores caltendránse.
 Toles aiciones d'importación treswiki queden rexistraes nel [[Special:Log/import|rexistru d'importaciones]].",
+'import-interwiki-source'    => 'Códigu wiki/páxina:',
 'import-interwiki-history'   => "Copiar toles versiones d'historial d'esta páxina",
 'import-interwiki-submit'    => 'Importar',
-'import-interwiki-namespace' => 'Tresferir páxines al espaciu de nome:',
+'import-interwiki-namespace' => 'Espaciu de nomes de destín:',
+'import-upload-filename'     => 'Nome del ficheru:',
+'import-comment'             => 'Comentariu:',
 'importtext'                 => "Por favor, esporta l'archivu dende la wiki d'orixe usando la [[Special:Export|utilidá d'esportación]].
 Guárdalu nel to ordenador y xúbilu equí.",
 'importstart'                => 'Importando les páxines...',
@@ -1937,6 +2173,8 @@ Guárdalu nel to ordenador y xúbilu equí.",
 'import-nonewrevisions'      => 'Toles revisiones fueran importaes previamente.',
 'xml-error-string'           => '$1 na llinia $2, col $3 (byte $4): $5',
 'import-upload'              => 'Xubir datos XML',
+'import-token-mismatch'      => 'Perdiéronse los datos de la sesión. Intentalo otra vuelta.',
+'import-invalid-interwiki'   => "Nun se puede importar d'esi wiki.",
 
 # Import log
 'importlogpage'                    => "Rexistru d'importaciones",
@@ -1947,19 +2185,19 @@ Guárdalu nel to ordenador y xúbilu equí.",
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revisión|revisiones}} dende $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "La mio páxina d'usuariu",
+'tooltip-pt-userpage'             => "La to páxina d'usuariu",
 'tooltip-pt-anonuserpage'         => "La páxina d'usuariu de la IP cola que tas editando",
-'tooltip-pt-mytalk'               => "La mio páxina d'alderique",
+'tooltip-pt-mytalk'               => "La to páxina d'alderique",
 'tooltip-pt-anontalk'             => 'Alderique de les ediciones feches con esta direición IP',
 'tooltip-pt-preferences'          => 'Les mios preferencies',
 'tooltip-pt-watchlist'            => 'Llista de les páxines nes que tas vixilando los cambeos',
-'tooltip-pt-mycontris'            => 'Llista de les mios contribuciones',
+'tooltip-pt-mycontris'            => 'Llista de les tos contribuciones',
 'tooltip-pt-login'                => 'Encamentámoste a identificate, anque nun ye obligatorio',
 'tooltip-pt-anonlogin'            => "Encamiéntasete que t'identifiques, anque nun ye obligatorio.",
 'tooltip-pt-logout'               => 'Salir',
 'tooltip-ca-talk'                 => 'Alderique tocante al conteníu de la páxina',
 'tooltip-ca-edit'                 => "Pues editar esta páxina. Por favor usa'l botón de previsualización enantes de guardar los cambeos.",
-'tooltip-ca-addsection'           => 'Añadi un comentariu a esti alderique.',
+'tooltip-ca-addsection'           => 'Emprima una seición nueva',
 'tooltip-ca-viewsource'           => 'Esta páxina ta protexida. Pues ver el so códigu fonte.',
 'tooltip-ca-history'              => "Versiones antigües d'esta páxina.",
 'tooltip-ca-protect'              => 'Protexe esta páxina',
@@ -2006,6 +2244,8 @@ Guárdalu nel to ordenador y xúbilu equí.",
 'tooltip-watch'                   => 'Amiesta esta páxina na to llista de vixilancia',
 'tooltip-recreate'                => 'Vuelve a crear la páxina magar que se tenga esborrao',
 'tooltip-upload'                  => 'Empecipiar la xubida',
+'tooltip-rollback'                => '"Revertir" elimina la edición/es d\'esta páxina fecha/es pol postrer collaborador con un solu clic.',
+'tooltip-undo'                    => '"Esfacer" revierte esta edición y abre\'l formulariu d\'edición en mou de previsualización. Permite añader un motivu nel resume.',
 
 # Metadata
 'nodublincore'      => 'Metadatos RDF Dublin Core desactivaos pa esti sirvidor.',
@@ -2013,12 +2253,12 @@ Guárdalu nel to ordenador y xúbilu equí.",
 'notacceptable'     => 'El sirvidor de la wiki nun pue suplir los datos nun formatu llexible pol to navegador.',
 
 # Attribution
-'anonymous'        => 'Usuariu/os anónimu/os de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Usuariu anónimu|Usuarios anónimos}} de {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} usuariu $1',
 'lastmodifiedatby' => "Esta páxina foi modificada per postrer vegada'l $1 a les $2 por $3.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basao nel trabayu fechu por $1.',
 'others'           => 'otros',
-'siteusers'        => '{{SITENAME}} usuariu/os $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|usuariu|usuarios}} $1',
 'creditspage'      => 'Páxina de creitos',
 'nocredits'        => 'Nun hai disponible información de creitos pa esta páxina.',
 
@@ -2059,10 +2299,12 @@ Probablemente tea causao por un enllaz a un sitiu esternu de la llista prieta.',
 'markedaspatrollederror-noautopatrol' => 'Nun pues marcar los tos propios cambeos como supervisaos.',
 
 # Patrol log
-'patrol-log-page'   => 'Rexistru de supervisión',
-'patrol-log-header' => 'Esti ye un rexistru de les revisiones supervisaes.',
-'patrol-log-line'   => 'marcó la versión $1 de $2 como supervisada $3',
-'patrol-log-auto'   => '(automática)',
+'patrol-log-page'      => 'Rexistru de supervisión',
+'patrol-log-header'    => 'Esti ye un rexistru de les revisiones supervisaes.',
+'patrol-log-line'      => 'marcó la versión $1 de $2 como supervisada $3',
+'patrol-log-auto'      => '(automática)',
+'patrol-log-diff'      => 'revisión $1',
+'log-show-hide-patrol' => '$1 rexistru de supervisión',
 
 # Image deletion
 'deletedrevision'                 => 'Esborrada la reversión vieya $1',
@@ -2079,6 +2321,9 @@ $1",
 'previousdiff' => '� Edición más antigua',
 'nextdiff'     => 'Diferencia más recién →',
 
+# Visual comparison
+'visual-comparison' => 'Comparación visual',
+
 # Media information
 'mediawarning'         => "'''Avisu''': Esti archivu pue contener códigu maliciosu, pue ser comprometío executalu nel to sistema.<hr />",
 'imagemaxsize'         => 'Llendar les imáxenes nes páxines de descripción a:',
@@ -2091,10 +2336,12 @@ $1",
 'show-big-image'       => 'Resolución completa',
 'show-big-image-thumb' => "<small>Tamañu d'esta previsualización: $1 × $2 píxeles</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => "Galería d'imáxenes nueves",
 'imagelisttext'         => "Embaxo ta la llista {{PLURAL:$1|d'un archivu ordenáu|de '''$1''' archivos ordenaos}} $2.",
 'newimages-summary'     => 'Esta páxina especial amuesa los caberos archivos xubíos.',
+'newimages-legend'      => "Nome d'archivu",
+'newimages-label'       => "Nome d'archivu (o una parte d'él):",
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Nun hai nada que ver.',
 'ilsubmit'              => 'Buscar',
@@ -2299,6 +2546,18 @@ tabla de metadatos tea recoyida. Los demás tarán escondíos por defeutu.
 'exif-lightsource-24'  => "Tungstenu ISO d'estudio",
 'exif-lightsource-255' => 'Otra fonte de lluz',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flax non disparáu',
+'exif-flash-fired-1'    => 'Flax disparáu',
+'exif-flash-return-0'   => 'ensin función de deteición de retornu estroboscópicu',
+'exif-flash-return-2'   => 'lluz de retornu estroboscópicu non detectada',
+'exif-flash-return-3'   => 'lluz de retornu estroboscópicu detectada',
+'exif-flash-mode-1'     => 'disparu de flax forciáu',
+'exif-flash-mode-2'     => 'supresión de flax forciáu',
+'exif-flash-mode-3'     => 'mou automáticu',
+'exif-flash-function-1' => 'Ensin función de flax',
+'exif-flash-redeye-1'   => "mou d'amenorgamientu de güeyos encarnaos",
+
 'exif-focalplaneresolutionunit-2' => 'pulgaes',
 
 'exif-sensingmethod-1' => 'Non definíu',
@@ -2374,7 +2633,7 @@ tabla de metadatos tea recoyida. Los demás tarán escondíos por defeutu.
 
 # External editor support
 'edit-externally'      => 'Editar esti ficheru usando una aplicación esterna',
-'edit-externally-help' => 'Pa más información echa un güeyu a les [http://www.mediawiki.org/wiki/Manual:External_editors instrucciones de configuración].',
+'edit-externally-help' => '(Pa más información echa un güeyu a les [http://www.mediawiki.org/wiki/Manual:External_editors instrucciones de configuración])',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'toos',
@@ -2446,21 +2705,10 @@ $1
 Por favor confirma que daveres quies volver a crear esta páxina.",
 'recreate'            => 'Volver a crear',
 
-# HTML dump
-'redirectingto' => 'Redireicionando a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "¿Llimpiar la caché d'esta páxina?
-
-$1",
 'confirm_purge_button' => 'Aceutar',
-
-# AJAX search
-'searchcontaining' => "Buscar páxines que contengan ''$1''.",
-'searchnamed'      => "Buscar páxines col nome ''$1''.",
-'articletitles'    => "Páxines qu'emprimen por ''$1''",
-'hideresults'      => 'Esconder resultaos',
-'useajaxsearch'    => 'Usar la busca AJAX',
+'confirm-purge-top'    => "¿Llimpiar la caché d'esta páxina?",
+'confirm-purge-bottom' => 'Purgar una páxina esborra la caché y fuercia a apaecer la versión actual más recién.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� páxina anterior',
@@ -2480,10 +2728,10 @@ $1",
 'table_pager_empty'        => 'Nun hai resultaos',
 
 # Auto-summaries
-'autosumm-blank'   => "Eliminando'l conteníu de la páxina",
+'autosumm-blank'   => 'Páxina dexada en blanco',
 'autosumm-replace' => "Sustituyendo la páxina por '$1'",
 'autoredircomment' => 'Redirixendo a [[$1]]',
-'autosumm-new'     => 'Páxina nueva: $1',
+'autosumm-new'     => "Páxina creada con '$1'",
 
 # Live preview
 'livepreview-loading' => 'Cargando…',
@@ -2522,6 +2770,7 @@ Tamién pues [[Special:Watchlist/edit|usar l'editor estándar]].",
 
 # Core parser functions
 'unknown_extension_tag' => 'Etiqueta d\'estensión "$1" desconocida',
+'duplicate-defaultsort' => 'Avisu: L\'atayu "$2" va trocar l\'atayu "$1".',
 
 # Special:Version
 'version'                          => 'Versión', # Not used as normal message but as header for the special page itself
@@ -2550,13 +2799,13 @@ Tamién pues [[Special:Watchlist/edit|usar l'editor estándar]].",
 'filepath-submit'  => 'Ruta',
 'filepath-summary' => "Esta páxina especial devuelve la ruta completa d'un archivu. Les imáxenes amuésense a resolución completa; les demás tribes d'archivu execútense direutamente col so programa asociáu.
 
-Escribi'l nome d'archivu ensin el prefixu \"{{ns:image}}:\".",
+Escribi'l nome d'archivu ensin el prefixu \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Buscar archivos duplicaos',
 'fileduplicatesearch-summary'  => 'Busca archivos duplicaos basándose nos sos valores fragmentarios.
 
-Escribi\'l nome del archivu ensin el prefixu "{{ns:image}}:".',
+Escribi\'l nome del archivu ensin el prefixu "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Buscar duplicaos',
 'fileduplicatesearch-filename' => "Nome d'archivu:",
 'fileduplicatesearch-submit'   => 'Buscar',
@@ -2586,4 +2835,13 @@ Escribi\'l nome del archivu ensin el prefixu "{{ns:image}}:".',
 'blankpage'              => 'Páxina en blanco',
 'intentionallyblankpage' => 'Esta páxina ta en blanco arrémente',
 
+# External image whitelist
+'external_image_whitelist' => " #Dexa esta llinia exautamente como ta<pre>
+#Pon los fragmentos d'espresiones regulares (namái la parte que va ente les //) debaxo
+#Esto va ser comprobao coles URLs d'imáxenes esternes (hotlinked)
+#Les que concuayen van ser visualizaes como imáxenes; si nun concuayen, namái se va amosar un enllaz a la imaxe
+#Les llinies qu'emprimen con # son trataes como comentarios
+
+#Pon tolos fragmentos regex enantes d'esta llinia. Dexa esta llinia exautamente como ta</pre>",
+
 );
diff --git a/languages/messages/MessagesAv.php b/languages/messages/MessagesAv.php
index 017a7dd3..0ffd3d31 100644
--- a/languages/messages/MessagesAv.php
+++ b/languages/messages/MessagesAv.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author MF-Warburg
  * @author MONARCH79
  * @author Phoebe
  */
@@ -21,7 +22,7 @@ $messages = array(
 'saturday'  => 'Шаммат',
 
 'mytalk' => 'Дур бахl�',
-'and'    => 'ва',
+'and'    => '&#32;ва',
 
 'errorpagetitle' => 'Гъалатl',
 'help'           => 'Кумек',
@@ -96,6 +97,9 @@ $messages = array(
 # Special:AllPages
 'allarticles' => 'Киналго макъалаби',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'ЦIи�в гIахьалчи',
+
 # Watchlist
 'watchlist' => 'Дур халгьаби�лъул �и�хl',
 'watch'     => 'хал гьабизе',
diff --git a/languages/messages/MessagesAvk.php b/languages/messages/MessagesAvk.php
index ead7d17a..e10ff00b 100644
--- a/languages/messages/MessagesAvk.php
+++ b/languages/messages/MessagesAvk.php
@@ -9,6 +9,89 @@
  * @author Wikimistusik
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Mamind',
+	NS_SPECIAL          => 'Aptaca',
+	NS_TALK             => 'Prilara',
+	NS_USER             => 'Favesik',
+	NS_USER_TALK        => 'Favesikprilara',
+	NS_PROJECT_TALK     => '$1 prilara',
+	NS_FILE             => 'Ewava',
+	NS_FILE_TALK        => 'Ewavaprilara',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki prilara',
+	NS_TEMPLATE         => 'Teza',
+	NS_TEMPLATE_TALK    => 'Tezaprilara',
+	NS_HELP             => 'Pomara',
+	NS_HELP_TALK        => 'Pomaraprilara',
+	NS_CATEGORY         => 'Loma',
+	NS_CATEGORY_TALK    => 'Lomaprilara',
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'JontolafGraskakseem' ),
+	'BrokenRedirects'           => array( 'EmpayanGraskakseem' ),
+	'Preferences'               => array( 'Lodamaceem' ),
+	'Watchlist'                 => array( 'Suzdasiki' ),
+	'Recentchanges'             => array( 'NoeltafBetakseem' ),
+	'Upload'                    => array( 'Kalvajara' ),
+	'Listfiles'                 => array( 'Ewaveem' ),
+	'Newimages'                 => array( 'WarzafEwaveem' ),
+	'Listusers'                 => array( 'Favesikeem' ),
+	'Statistics'                => array( 'Enkopaceem' ),
+	'Randompage'                => array( 'Xuyavabu' ),
+	'Lonelypages'               => array( 'GluyasikiiskafBueem' ),
+	'Uncategorizedpages'        => array( 'LomiskafBueem' ),
+	'Uncategorizedcategories'   => array( 'LomiskafLomeem' ),
+	'Uncategorizedimages'       => array( 'LomiskafEwaveem' ),
+	'Uncategorizedtemplates'    => array( 'LomiskafTezeem' ),
+	'Unusedcategories'          => array( 'MefavenLomeem' ),
+	'Unusedimages'              => array( 'MefavenEwaveem' ),
+	'Wantedpages'               => array( 'ErunBueem', 'EmpayanGluyasikieem' ),
+	'Wantedcategories'          => array( 'ErunLomeem' ),
+	'Mostlinked'                => array( 'Logluyasikikiraf' ),
+	'Mostlinkedcategories'      => array( 'LogluyasikirafLomeem' ),
+	'Mostlinkedtemplates'       => array( 'LogluyasikikirafTezeem' ),
+	'Mostcategories'            => array( 'Lolomakiraf' ),
+	'Mostimages'                => array( 'Lodewavakiraf' ),
+	'Mostrevisions'             => array( 'Lobetayan' ),
+	'Fewestrevisions'           => array( 'Lebetayan' ),
+	'Shortpages'                => array( 'TrelafBueem' ),
+	'Longpages'                 => array( 'AbrotcafBueem' ),
+	'Newpages'                  => array( 'WarzafBueem' ),
+	'Ancientpages'              => array( 'SavsafBueem' ),
+	'Deadendpages'              => array( 'AxodafBueem' ),
+	'Protectedpages'            => array( 'NendanBueem' ),
+	'Protectedtitles'           => array( 'NendanVergumvelteem' ),
+	'Allpages'                  => array( 'Bueem' ),
+	'Specialpages'              => array( 'AptafBueem' ),
+	'Contributions'             => array( 'Webekseem' ),
+	'Emailuser'                 => array( 'FavesikEmailMane' ),
+	'Confirmemail'              => array( 'EmailManeGruyera' ),
+	'Movepage'                  => array( 'BuArrundara' ),
+	'Booksources'               => array( 'NevaKliteem' ),
+	'Categories'                => array( 'Lomeem' ),
+	'Export'                    => array( 'Divburera' ),
+	'Version'                   => array( 'Siatos' ),
+	'Allmessages'               => array( 'Stakseem' ),
+	'Undelete'                  => array( 'Dimsulara' ),
+	'Import'                    => array( 'Koburera' ),
+	'Userrights'                => array( 'FavesikRokeem' ),
+	'MIMEsearch'                => array( 'MIMEAneyara' ),
+	'Unwatchedpages'            => array( 'MerupenBueem' ),
+	'Listredirects'             => array( 'Graskakseem' ),
+	'Revisiondelete'            => array( 'BetaraSulara' ),
+	'Unusedtemplates'           => array( 'MefavenTezeem' ),
+	'Randomredirect'            => array( 'XuyavafaGraskara' ),
+	'Mypage'                    => array( 'JinafuBu' ),
+	'Mytalk'                    => array( 'JinafaPrilara' ),
+	'Mycontributions'           => array( 'JinafWebekseem' ),
+	'Listadmins'                => array( 'Ristusikeem' ),
+	'Listbots'                  => array( 'Stiernikeem' ),
+	'Popularpages'              => array( 'LorupenBueem' ),
+	'Search'                    => array( 'Aneyara' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Levconhani gluyasiki se',
@@ -55,8 +138,6 @@ $messages = array(
 'underline-never'   => 'Meviele',
 'underline-default' => 'Omavafi exulesiki',
 
-'skinpreview' => '(Abdinedira)',
-
 # Dates
 'sunday'        => 'taneaviel',
 'monday'        => 'toleaviel',
@@ -143,7 +224,7 @@ $messages = array(
 'mytalk'         => 'Jinafo keyaksexo',
 'anontalk'       => 'Prilara kan IP mane',
 'navigation'     => 'Bugrablera',
-'and'            => 'is',
+'and'            => '&#32;is',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -171,7 +252,7 @@ $messages = array(
 'deletethispage'    => 'Busulara',
 'undelete_short'    => 'Dimplekura {{PLURAL:$1|tanoy betaks|$1 betaks}}',
 'protect'           => 'Nendara',
-'protect_change'    => 'betara va nendara',
+'protect_change'    => 'betara',
 'protectthispage'   => 'Bunendara',
 'unprotect'         => 'Dimnendara',
 'unprotectthispage' => 'Dimnendara va batu bu',
@@ -180,14 +261,14 @@ $messages = array(
 'talkpagelinktext'  => 'Keyaksera',
 'specialpage'       => 'Aptafu bu',
 'personaltools'     => 'Weltafa xeka se',
-'postcomment'       => 'Loplekura va sebuks',
+'postcomment'       => 'Warzaf gabot',
 'articlepage'       => 'Telizwira',
 'talk'              => 'Keyaksera',
 'views'             => 'Wira',
 'toolbox'           => 'Xekak',
 'userpage'          => 'Favesikbu',
 'projectpage'       => 'Rupera va abdumimaks bu',
-'imagepage'         => 'Ewavabu',
+'imagepage'         => 'Wira va iyeltakbu',
 'mediawikipage'     => 'Rupera va staksa bu',
 'templatepage'      => 'Rupera va teza bu',
 'viewhelppage'      => 'Rupera va pomara bu',
@@ -206,8 +287,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Icde {{SITENAME}}',
 'aboutpage'            => 'Project:Icdeuca',
-'bugreports'           => 'Roklamunsteks',
-'bugreportspage'       => 'Project:Roklamunsteks',
 'copyright'            => 'Deraykan cek kare $1.',
 'copyrightpagename'    => 'sorta {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Digirarokeem',
@@ -230,9 +309,7 @@ $messages = array(
 
 'badaccess'        => 'Noverarokla',
 'badaccess-group0' => 'Ta kucilana skura me zo rictal.',
-'badaccess-group1' => 'Kucilana skura gan favesik ke $1 lospa anton zo rictar.',
-'badaccess-group2' => 'Kucilana skura gan favesik ke tana $1 lospa anton zo rictar.',
-'badaccess-groups' => 'Kucilana skura gan favesik ke tana $1 lospa anton zo rictar.',
+'badaccess-groups' => 'Kucilana skura gan favesik ke {{PLURAL:$2|lospa|tana lospa}} anton zo rictar : $1.',
 
 'versionrequired'     => '$1 adraf siatos ke MediaWiki',
 'versionrequiredtext' => '$1 siatos ke MediaWiki tir adraf ta favera va batu bu. Voyez [[Special:Version]]',
@@ -246,6 +323,8 @@ $messages = array(
 'editsection'             => 'betara',
 'editold'                 => 'betara',
 'viewsourceold'           => 'Klitawira',
+'editlink'                => 'betara',
+'viewsourcelink'          => 'Klitawira',
 'editsectionhint'         => 'Betara va $1 gabot',
 'toc'                     => 'Luzeem',
 'showtoc'                 => 'nedira',
@@ -259,13 +338,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Rust',
 'page-rss-feed'           => '"$1" RSS Rust',
 'page-atom-feed'          => '"$1" Atom Rust',
-'red-link-title'          => '$1 (suteten)',
+'red-link-title'          => '$1 (me tisu bu)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Teliz',
 'nstab-user'      => 'Favesikbu',
 'nstab-media'     => 'Kanaca',
-'nstab-special'   => 'Aptaca',
+'nstab-special'   => 'Aptabu',
 'nstab-project'   => 'Abdumimaks bu',
 'nstab-image'     => 'Ewava',
 'nstab-mediawiki' => 'Staksa',
@@ -275,7 +354,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Megrupena tegira',
-'nosuchactiontext'  => 'Ruidanaca koe URL gan wiki me zo kagruper.',
+'nosuchactiontext'  => 'Ruidanaca koe URL gan wiki me zo kagruper.
+URL lanon tir ordajaf ok gluyajan.
+Batcoba va zvak koe talpeyot ke {{SITENAME}} dere robazer.',
 'nosuchspecialpage' => 'Mekruldesu aptafu bu',
 'nospecialpagetext' => 'Rin va aptafu bu mekagrupenu gan wiki al erul.',
 
@@ -290,7 +371,7 @@ MySQL va « <tt>$3: $4</tt> » rokla al katacer.',
 « $1 »
 skuyuna gan « $2 » fliok
 MySQL va « $3 : $4 » rokla al dimstakser.',
-'noconnect'            => 'Skalev! Golde brubezvak, dogluyara va origak tir noelton merotisa. <br />
+'noconnect'            => 'Skalev ! Golde brubezvak, dogluyara va wikiorigak tir noelton merotisa. <br />
 $1',
 'nodb'                 => 'Merotisa rebara va $1 origak',
 'cachederror'          => 'Batcoba tir ksudaks va erunu bu nume me zo ronusker',
@@ -316,8 +397,6 @@ $1',
 'cannotdelete'         => 'Sulara va bazenu bu oku ewava tir merotisa.',
 'badtitle'             => 'Rotaf vergumvelt',
 'badtitletext'         => 'Vergumvelt ke erunu bu tir volenafu ok vlardafu ike walavafi gluyasiki me tir enafi',
-'perfdisabled'         => 'Skalev! Bata fliaca ugaloron zo gritegirar
-kire va origak tuloviar maneke metan va wiki rofaver.',
 'perfcached'           => 'Vlevef orig yo tid koe palsexo nume me zo ronusked.',
 'perfcachedts'         => 'Vlevef orig yo tid koe palsexo, ise ironokafa nuskera tir $1.',
 'querypage-no-updates' => 'Nuskera va batu bu me noelon flir. Acum origeem me zo divneditir.',
@@ -331,7 +410,7 @@ Erura : $2',
 'protectedpagetext'    => 'Batu bu betaradjison zo nendar.',
 'viewsourcetext'       => 'Va buklita rowil nume roksudal :',
 'protectedinterface'   => 'Batu bu va walasikikrent ke talpeyot dafur nume ta djira va favejera zo ixatcar.',
-'editinginterface'     => "'''Obral !''' Rin va bu favenu koe talpeyotwalasiki betal. Betara va batu bu va laviuca ke favesikafi walasiki dolge ar favesik vanolatar. Kalavason, va [http://translatewiki.net/wiki/Main_Page?setlang=avk Betawiki], va MediaWiki abdumimaks va tulizukara, vay favel.",
+'editinginterface'     => "'''Obral !''' Rin va bu favenu koe talpeyotwalasiki betal. Betara va batu bu va laviuca ke favesikafi walasiki dolge ar favesik vanolatar. Kalavason, va [http://translatewiki.net/wiki/Main_Page?setlang=avk translatewiki.net], va MediaWiki abdumimaks va tulizukara, vay favel.",
 'sqlhidden'            => '(SQL kucilara palsena)',
 'cascadeprotected'     => 'Batu bu icde betara zo nendar, kire va vlevefu {{PLURAL:$1|bu|bu}} pasur, danu kan tegisa "stoyakorafa" rotisaca zo nendad : $2',
 'namespaceprotected'   => "Va bu koe '''$1''' yoltxo me robetal !",
@@ -357,7 +436,6 @@ Me vulkul da rupeson va "Lodamaceem" bu va intaf {{SITENAME}} rotuilkal.',
 'remembermypassword'         => 'Setikera va jinaf remravlem (cookie)',
 'yourdomainname'             => 'Rinaf ind',
 'externaldberror'            => 'Ont divefa origakrokla va pilkomodara ont va rinafa divefa pata me ronuskel.',
-'loginproblem'               => '<b>Pilkomodajara.</b><br />Tollwil !',
 'login'                      => 'Pilkomodá',
 'nav-login-createaccount'    => 'Pataredú oke va int dogluyá',
 'loginprompt'                => 'Ta dogluyara va {{SITENAME}} va cookie se gotutegiral.',
@@ -365,14 +443,15 @@ Me vulkul da rupeson va "Lodamaceem" bu va intaf {{SITENAME}} rotuilkal.',
 'logout'                     => 'Dimgluyá',
 'userlogout'                 => 'Dimgluyara',
 'notloggedin'                => 'Dogluyariskaf',
-'nologin'                    => '$1, kas va pata me digil ?',
+'nologin'                    => 'Kas va pata me digil ? $1.',
 'nologinlink'                => 'Pataredura',
 'createaccount'              => 'Warzon pataredú',
 'gotaccount'                 => 'Kas va pata ixam digil ? $1.',
 'gotaccountlink'             => 'Dogluyara',
 'createaccountmail'          => 'kan e-mail',
 'badretype'                  => 'Toloy suteyen remravlem tid menuxaf.',
-'userexists'                 => 'Favesikyolt rinon suteyen ixam zo faver. Va ar gokiblal.',
+'userexists'                 => 'Favesikyolt rinon suteyen ixam zo faver. 
+Va amidaf yolt gokiblal.',
 'youremail'                  => 'Jinafe internetmane',
 'username'                   => 'Favesikyolt:',
 'uid'                        => 'Favesikaf ID :',
@@ -381,7 +460,8 @@ Me vulkul da rupeson va "Lodamaceem" bu va intaf {{SITENAME}} rotuilkal.',
 'yourlanguage'               => 'Walasikiava',
 'yournick'                   => 'Sugdara tori prilara se (do <tt><nowiki>~~~</nowiki></tt>)&nbsp;',
 'badsig'                     => 'Meenafa rilafa sugdara; va HTML tcala yo stujel !',
-'badsiglength'               => 'Sugdara tir abrotcarsafa; gotir le $1 {{PLURAL:$1|staa|staa}}.',
+'badsiglength'               => 'Sugdara tir abrotcarsafa.
+Gotir le $1 {{PLURAL:$1|staa|staa}}.',
 'email'                      => '"E-mail"',
 'prefs-help-realname'        => '* <strong>Votre nom</strong> (mevrebaf): ede vaon co-bazel, mu gara va rinaf webereem zo faveter.',
 'loginerror'                 => 'Pilkomodajara',
@@ -393,13 +473,14 @@ Me vulkul da rupeson va "Lodamaceem" bu va intaf {{SITENAME}} rotuilkal.',
 'loginsuccesstitle'          => 'Pilkomodanhara.',
 'loginsuccess'               => 'Rin wetce « $1 » moe {{SITENAME}} til dogluyarakiraf.',
 'nosuchuser'                 => '« $1 » favesik me krulder.
-Ageltal da va yolt al sutekanhal, oke ta redura va warzafa favesikpata va vlevef valdig favel.',
+Sutera va favesikyolt gotir eltaykoranhafa.
+Ageltal va rinaf suteks oke [[Special:UserLogin/signup|pataredura]].',
 'nosuchusershort'            => 'Me tir favesik digis va « <nowiki>$1</nowiki> » yolt. Va sutekaks ageltal.',
 'nouserspecified'            => 'Va favesikyolt gobazel !',
 'wrongpassword'              => 'Remravlem tir volenaf. Tollwil !',
 'wrongpasswordempty'         => 'Remravlem bazeyen tir vlardaf.Vay tolon bazel !',
 'passwordtooshort'           => 'Rinaf remravlem tir meenaf ok lotrelaf. Va {{PLURAL:$1|1 staa|$1 staa}} leon goruldar ise gotir amidaf gu favesikyolt.',
-'mailmypassword'             => 'Va warzaf remravlem pu jin staksec !',
+'mailmypassword'             => 'Warzaf staksaremravlem',
 'passwordremindertitle'      => 'Rinaf warzaf remravlem moe {{SITENAME}}',
 'passwordremindertext'       => 'Kontan (lanon rin, male $1 IP mane) eruyur da pu rin va warzaf remravlem tori {{SITENAME}} staksev ($4).
 Remravlem tori "$2" favesik noelkeon tir "$3".
@@ -414,7 +495,7 @@ Veuillez vous identifier dès que vous l'aurez reçu.",
 Abdi ara staksara va pata, va bazereem ke e-mail gonaskil nume gogruyel da bata pata en tir rinafa.',
 'mailerror'                  => 'Rokla stakseson va e-mail staksa : $1',
 'acct_creation_throttle_hit' => 'Désolé, vous avez déjà créé $1 comptes. Vous ne pouvez pas en créer de nouveaux.',
-'emailauthenticated'         => 'Rinaf e-mail mane moe $1 tir tugariayan.',
+'emailauthenticated'         => 'Rinafe e-mail mane ba $2 $3 tir tugariayan.',
 'emailnotauthenticated'      => "Rinafe 'email' mane men tir pilkomodayane.
 Meka 'email' staksa icde vlevefa staava zo staksatar.",
 'noemailprefs'               => 'Ta bata kobarastaava se va email mane bazel !',
@@ -425,16 +506,18 @@ Meka 'email' staksa icde vlevefa staava zo staksatar.",
 'loginlanguagelabel'         => 'Ava : $1',
 
 # Password reset dialog
-'resetpass'               => 'Va patabeksa tolbazel !',
+'resetpass'               => 'Va patabeksa betal !',
 'resetpass_announce'      => "Rin kan ugalorafa 'email' beksa va int pilkomodayal.
 Ta da wan zo pilkomodal, va warzaf remravlem batlize gobazel :",
-'resetpass_header'        => 'Va beksa tolbazel !',
+'resetpass_header'        => 'Va remravlem gobetal !',
+'oldpassword'             => 'Savsaf remravlem',
+'newpassword'             => 'Warzaf remravlem',
+'retypenew'               => 'Va warzaf remravlem gruyel',
 'resetpass_submit'        => 'Va beksa bazel nume zo dogluyatal !',
 'resetpass_success'       => 'Rinaf remravlem kiewatcon su zo betar ! Nume rinafa dogluyara tir...',
 'resetpass_bad_temporary' => 'Meenaf ugaloraf remravlem.
 Rin lanon vaon al betanhal oke va warzaf al kucilal.',
-'resetpass_forbidden'     => 'Beksa koe {{SITENAME}} me zo robetar',
-'resetpass_missing'       => 'Me tazukorig.',
+'resetpass_forbidden'     => 'Kona beksa tir merobetana',
 
 # Edit page toolbar
 'bold_sample'     => 'Bold krent',
@@ -459,21 +542,21 @@ Rin lanon vaon al betanhal oke va warzaf al kucilal.',
 'hr_tip'          => 'Zidafi gluyasiki (me faversel)',
 
 # Edit pages
-'summary'                   => 'Vildeks',
-'subject'                   => 'Detce/vergumvelt',
-'minoredit'                 => 'Betamaks.',
-'watchthis'                 => 'Va bat teliz suzdá',
-'savearticle'               => 'Giwara',
-'preview'                   => 'Abdinedira',
-'showpreview'               => 'Abdinedira',
-'showlivepreview'           => 'Nedira va abdinedira',
-'showdiff'                  => 'Nedira va betakseem',
-'anoneditwarning'           => "'''Obral !''' Rin til medogluyayas. Rinafe IP mane ko bubetarizvot zo stragatar.",
-'missingcommenttext'        => 'Va sebuks vlevon bazel, vay !',
-'summary-preview'           => 'Abdinedira va vildeks',
-'subject-preview'           => 'Abdinedira va detce ik kroj',
-'blockedtitle'              => 'Elekan favesik',
-'blockedtext'               => '<big>\'\'\'Rinafa favesikpata oku IP mane tid elekayane.\'\'\'</big>
+'summary'                          => 'Vildeks:',
+'subject'                          => 'Detce/vergumvelt:',
+'minoredit'                        => 'Betamaks.',
+'watchthis'                        => 'Va bat teliz suzdá',
+'savearticle'                      => 'Giwara',
+'preview'                          => 'Abdinedira',
+'showpreview'                      => 'Abdinedira',
+'showlivepreview'                  => 'Nedira va abdinedira',
+'showdiff'                         => 'Nedira va betakseem',
+'anoneditwarning'                  => "'''Obral !''' Rin til medogluyayas. Rinafe IP mane ko bubetarizvot zo stragatar.",
+'missingcommenttext'               => 'Va sebuks vlevon bazel, vay !',
+'summary-preview'                  => 'Abdinedira va vildeks:',
+'subject-preview'                  => 'Abdinedira va detce ik kroj:',
+'blockedtitle'                     => 'Elekan favesik',
+'blockedtext'                      => '<big>\'\'\'Rinafa favesikpata oku IP mane tid elekayane.\'\'\'</big>
 
 Elekara skuyuna gan $1. 
 Lazava tir \'\'$2\'\'.
@@ -485,73 +568,79 @@ Lazava tir \'\'$2\'\'.
 Ta keyaksera va $1 ok konar [[{{MediaWiki:Grouppage-sysop}}|ristusik]] rotuzeral.
 Va \'"e-mail" staksara pu bat favesik\' me rofavel vaxede "e-mail" mane tir koe rinaf [[Special:Preferences|lodamaceem]] ise vaon faveson me zo elekayal.
 Rinaf tise IP mane tir $3 ise ID elekara tir #$5. Va bate ik bane mane ko kota erura vay bazel !',
-'blockednoreason'           => 'Meka bazena lazava',
-'blockedoriginalsource'     => "Klita ke '''$1''' vleveon zo nedir :",
-'blockededitsource'         => "Krent ke '''rinaf betakseem''' va '''$1''' vleveon zo betar :",
-'whitelistedittitle'        => 'Kucilan login ta sutelara',
-'whitelistedittext'         => 'Ta bubetara rin gonaskil ta $1',
-'confirmedittitle'          => 'Gruyera va e-mail eruyuna ta robetara',
-'confirmedittext'           => 'Abdi bubetara va rinafe e-mail mane gogruyel. Kan rinaf [[Special:Preferences|favesiklodamaceem]] va rinafe e-mail mane vay plekul ise tuenal !',
-'nosuchsectiontitle'        => 'Me man gabot',
-'nosuchsectiontext'         => 'Rin yawal da va metis gabot betal. Oye da $1 gabot me tir, giwaxo me tir.',
-'loginreqtitle'             => 'Kucilan favesikyolt',
-'loginreqlink'              => 'dogluyara',
-'loginreqpagetext'          => '$1 tir adrafa ta da va aru bu rodisukel.',
-'accmailtitle'              => 'Stakseyen remravlem.',
-'accmailtext'               => 'Remravlem ke « $1 » al zo stakser pu $2.',
-'newarticle'                => '(Warzaf)',
-'newarticletext'            => 'Va rinaf teliz batliz geltsutel !',
-'anontalkpagetext'          => "---- ''Vous êtes sur la page de discussion d'un utilisateur anonyme qui n'a pas encore créé un compte ou qui ne l'utilise pas. Pour cette raison, nous devons utiliser l'adresse IP numérique pour l'identifier. Une adresse de ce type peut être partagée entre plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:UserLogin|créer un compte ou vous connecter]] afin d'éviter toute future confusion.''",
-'noarticletext'             => 'Moe batu bu mek krent dure tir, vanmiae yonaru bu [[Special:Search/{{PAGENAME}}|va man buvergumvelt rotaneyal]] oke [{{fullurl:{{FULLPAGENAME}}|action=edit}} va batu bu robetal].',
-'userpage-userdoesnotexist' => '"$1" favesikpata me tir vuesteyena. Vay stujel ede va batu bu roredul ike robetal.',
-'clearyourcache'            => "'''Note :''' Après avoir sauvegardé, vous devez forcer le rechargement de la page pour voir les changements : '''Mozilla / Konqueror / Firefox''' : ''ctrl-shift-r'', '''IE''' : ''ctrl-f5'', '''Safari''' : ''cmd-shift-r''; '''Konqueror''' : ''f5''.",
-'usercssjsyoucanpreview'    => "'''Astuce :''' utilisez le bouton '''Prévisualisation''' pour tester votre nouvelle feuille css/js avant de l'enregistrer.",
-'usercsspreview'            => "'''Rappelez-vous que vous êtes en train de prévisualiser votre propre feuille css et qu'elle n'a pas encore été enregistrée !'''",
-'userjspreview'             => "'''Rappelez-vous que vous êtes en train de visualiser ou de tester votre code javascript et qu'il n'a pas encore été enregistré !'''",
-'updated'                   => '(Nuskeyen)',
-'note'                      => '<strong>Straga :</strong>',
-'previewnote'               => '<strong>Obral, bat krent anton tir abdinediks ise men tir giwayan !</strong>',
-'previewconflict'           => 'Abdinedira nedir va krent ke batu bu inde in giwayanon titir.',
-'editing'                   => 'betara va $1',
-'editingsection'            => 'betara va $1 (gabot)',
-'editingcomment'            => 'betara va $1 (sebuks)',
-'editconflict'              => 'Betarakoboda : $1',
-'explainconflict'           => "<b>Cette page a été sauvegardée après que vous avez commencé à la modifier.
+'blockednoreason'                  => 'Meka bazena lazava',
+'blockedoriginalsource'            => "Klita ke '''$1''' vleveon zo nedir :",
+'blockededitsource'                => "Krent ke '''rinaf betakseem''' va '''$1''' vleveon zo betar :",
+'whitelistedittitle'               => 'Kucilan login ta sutelara',
+'whitelistedittext'                => 'Ta bubetara rin gonaskil ta $1',
+'confirmedittitle'                 => 'Gruyera va e-mail eruyuna ta robetara',
+'confirmedittext'                  => 'Abdi bubetara va rinafe e-mail mane gogruyel. Kan rinaf [[Special:Preferences|favesiklodamaceem]] va rinafe e-mail mane vay plekul ise tuenal !',
+'nosuchsectiontitle'               => 'Me man gabot',
+'nosuchsectiontext'                => 'Rin yawal da va metis gabot betal. Oye da $1 gabot me tir, giwaxo me tir.',
+'loginreqtitle'                    => 'Kucilan favesikyolt',
+'loginreqlink'                     => 'dogluyara',
+'loginreqpagetext'                 => '$1 tir adrafa ta da va aru bu rodisukel.',
+'accmailtitle'                     => 'Stakseyen remravlem.',
+'accmailtext'                      => 'Remravlem ke « $1 » al zo stakser pu $2.',
+'newarticle'                       => '(Warzaf)',
+'newarticletext'                   => 'Va rinaf teliz batliz geltsutel !',
+'anontalkpagetext'                 => "---- ''Vous êtes sur la page de discussion d'un utilisateur anonyme qui n'a pas encore créé un compte ou qui ne l'utilise pas. Pour cette raison, nous devons utiliser l'adresse IP numérique pour l'identifier. Une adresse de ce type peut être partagée entre plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:UserLogin|créer un compte ou vous connecter]] afin d'éviter toute future confusion.''",
+'noarticletext'                    => 'Moe batu bu mek krent dure tir.
+Vanmiae yonaru bu [[Special:Search/{{PAGENAME}}|va man buvergumvelt rotaneyal]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} va gluyan log robetal],
+oke [{{fullurl:{{FULLPAGENAME}}|action=edit}} va batu bu robetal]</span>.',
+'userpage-userdoesnotexist'        => '"$1" favesikpata me tir vuesteyena. Vay stujel ede va batu bu roredul ike robetal.',
+'clearyourcache'                   => "'''Note :''' Après avoir sauvegardé, vous devez forcer le rechargement de la page pour voir les changements : '''Mozilla / Konqueror / Firefox''' : ''ctrl-shift-r'', '''IE''' : ''ctrl-f5'', '''Safari''' : ''cmd-shift-r''; '''Konqueror''' : ''f5''.",
+'usercssjsyoucanpreview'           => "'''Astuce :''' utilisez le bouton '''Prévisualisation''' pour tester votre nouvelle feuille css/js avant de l'enregistrer.",
+'usercsspreview'                   => "'''Rappelez-vous que vous êtes en train de prévisualiser votre propre feuille css et qu'elle n'a pas encore été enregistrée !'''",
+'userjspreview'                    => "'''Rappelez-vous que vous êtes en train de visualiser ou de tester votre code javascript et qu'il n'a pas encore été enregistré !'''",
+'updated'                          => '(Nuskeyen)',
+'note'                             => "'''Straga :'''",
+'previewnote'                      => "'''Obral, bat krent anton tir abdinediks ise men tir giwayan !'''",
+'previewconflict'                  => 'Abdinedira nedir va krent ke batu bu inde in giwayanon titir.',
+'editing'                          => 'betara va $1',
+'editingsection'                   => 'betara va $1 (gabot)',
+'editingcomment'                   => 'Betara va $1 (warzaf gabot)',
+'editconflict'                     => 'Betarakoboda : $1',
+'explainconflict'                  => "<b>Cette page a été sauvegardée après que vous avez commencé à la modifier.
 La zone d'édition supérieure contient le texte tel qu'il est enregistré actuellement dans la base de données. Vos modifications apparaissent dans la zone d'édition inférieure. Vous allez devoir apporter vos modifications au texte existant. Seul le texte de la zone supérieure sera sauvegardé.<br />",
-'yourtext'                  => 'Rinaf krent',
-'storedversion'             => 'Koverteyen siatos',
-'editingold'                => '<strong>Obral : rin va savsaf siatos ke batu bu betal. Ede giwal, kot betaks skuyun mali bat siatos di zo deokar.</strong>',
-'yourdiff'                  => 'Amidaceem',
-'copyrightwarning'          => 'Wetce webeks sanegan kan kredeem ke $2 nuyafa valdigarasorta, kot webeks va {{SITENAME}} zo krupter (ta lo pimtara va $1 wil). Ede me djumel da rinaf suteks yo zo robetad ise zo rotanamzilid, vaon me staksel !<br />
+'yourtext'                         => 'Rinaf krent',
+'storedversion'                    => 'Koverteyen siatos',
+'editingold'                       => "'''Obral : rin va savsaf siatos ke batu bu betal. Ede giwal, kot betaks skuyun mali bat siatos di zo deokar.'''",
+'yourdiff'                         => 'Amidaceem',
+'copyrightwarning'                 => "Wetce webeks sanegan kan kredeem ke $2 nuyafa valdigarasorta, kot webeks va {{SITENAME}} zo krupter (ta lo pimtara va $1 wil). Ede me djumel da rinaf suteks yo zo robetad ise zo rotanamzilid, vaon me staksel !<br />
 Dere, kan rinaf suteks ik suteks male sangiskafa nuyafa klita, anton webel !
-<strong>VA COPYRIGHT SUTEKS ARIEKON MERICTANON VOL WEBEL ! (do not submit copyrighted work without permission!)</strong>',
-'copyrightwarning2'         => 'Vay stragal da kot webeks va {{SITENAME}} gan ar webesik zo robetar ike zo roataler ike zo rosular. Ede me djumel da rinaf suteks yo zo robetad, vaon batliz me staksel !<br />
+'''VA COPYRIGHT SUTEKS ARIEKON MERICTANON VOL WEBEL ! (do not submit copyrighted work without permission!)'''",
+'copyrightwarning2'                => "Vay stragal da kot webeks va {{SITENAME}} gan ar webesik zo robetar ike zo roataler ike zo rosular. Ede me djumel da rinaf suteks yo zo robetad, vaon batliz me staksel !<br />
 Rin dere abdiplekul da va webeks miv suteyel ike mal sangiskafa ok gundafa nuyafa klita ksudal (va $1 loon wil).
-<strong>VA COPYRIGHT SUTEKS ARIEKON MERICTANON VOL WEBEL !</strong>',
-'longpagewarning'           => "'''WALZERA : batu bu tir kaikasu va $1 ko; konaki exulesiki va bu pokefu ok kaikefu gu 32 ko bak sutelara pofejed. Ton lopinaf gabot yo va bu rotir gosolparsal.'''",
-'longpageerror'             => '<strong>ROKLA : Atoen krent tir $1 kilobytes. Batcoba tir lodabrotcafa dam $2 kilobytes cuge. In tir merogiwan.</strong>',
-'readonlywarning'           => "'''AVERTISSEMENT : cette page est protégée pour maintenance,
+'''VA COPYRIGHT SUTEKS ARIEKON MERICTANON VOL WEBEL !'''",
+'longpagewarning'                  => "'''WALZERA : batu bu tir kaikasu va $1 ko; konaki exulesiki va bu pokefu ok kaikefu gu 32 ko bak sutelara pofejed. Ton lopinaf gabot yo va bu rotir gosolparsal.'''",
+'longpageerror'                    => "'''ROKLA : Atoen krent tir $1 kilobytes. Batcoba tir lodabrotcafa dam $2 kilobytes cuge. In tir merogiwan.'''",
+'readonlywarning'                  => "'''AVERTISSEMENT : cette page est protégée pour maintenance,
 vous ne pourrez donc pas sauvegarder vos modifications maintenant. Vous pouvez copier le texte dans un fichier et le sauver pour plus tard.'''",
-'protectedpagewarning'      => "'''WALZERA : batu bu zo nendar. Antaf ristus favesik vaon robetar.'''",
-'semiprotectedpagewarning'  => "'''Straga :''' Batu bu tir ixatcayanu nume antaf vertokayan favesik robetar.",
-'cascadeprotectedwarning'   => "'''Obral !''' Batu bu tir elekayanu enide anton ristus favesik robetar, kire in stoyakoron rupter. {{PLURAL:$1|stoyafu bu|stoyafu bu se}}",
-'titleprotectedwarning'     => '<strong>WALZERA : Batu bu zo ixatcar nume anton abic favesik vaon roredud.</strong>',
-'templatesused'             => 'Teza yo favena koe batu bu',
-'templatesusedpreview'      => 'Faven tezeem koe bata abdinedira :',
-'templatesusedsection'      => 'Faven tezeem koe bat gabot :',
-'template-protected'        => '(nendana)',
-'template-semiprotected'    => '(nendamana)',
-'hiddencategories'          => 'Batu bu tir bewafu gu {{PLURAL:$1|1 palsena loma|$1 palsena loma}}:',
-'nocreatetitle'             => 'Irutana buredura',
-'nocreatetext'              => '{{SITENAME}} va roredura va warzafu bu irutar.
+'protectedpagewarning'             => "'''WALZERA : batu bu zo nendar. Antaf ristus favesik vaon robetar.'''",
+'semiprotectedpagewarning'         => "'''Straga :''' Batu bu tir ixatcayanu nume antaf vertokayan favesik robetar.",
+'cascadeprotectedwarning'          => "'''Obral !''' Batu bu tir elekayanu enide anton ristus favesik robetar, kire in stoyakoron rupter. {{PLURAL:$1|stoyafu bu|stoyafu bu se}}",
+'titleprotectedwarning'            => "'''WALZERA : Batu bu zo ixatcar nume [[Special:ListGroupRights|aptarokeem]] tir adraf gu redura.'''",
+'templatesused'                    => 'Teza yo favena koe batu bu',
+'templatesusedpreview'             => 'Faven tezeem koe bata abdinedira :',
+'templatesusedsection'             => 'Faven tezeem koe bat gabot :',
+'template-protected'               => '(nendana)',
+'template-semiprotected'           => '(nendamana)',
+'hiddencategories'                 => 'Batu bu tir bewafu gu {{PLURAL:$1|1 palsena loma|$1 palsena loma}}:',
+'nocreatetitle'                    => 'Irutana buredura',
+'nocreatetext'                     => '{{SITENAME}} va roredura va warzafu bu irutar.
 Rodimal aze va tisu bu robetal oke [[Special:UserLogin|va int rodogluyal oke ropataredul]].',
-'nocreate-loggedin'         => 'Ko {{SITENAME}} ta redura va warzafu bu rin me zo rictal.',
-'permissionserrors'         => 'Rictajaks',
-'permissionserrorstext'     => 'Ta mana askira me zo rictal, golde {{PLURAL:$1|lazava|lazava se}}:',
-'recreate-deleted-warn'     => "'''Obral: Rin va sulayanu bu djutolredul.'''
+'nocreate-loggedin'                => 'Rin va warzafu bu me ronoredul.',
+'permissionserrors'                => 'Rictajaks',
+'permissionserrorstext'            => 'Ta mana askira me zo rictal, golde {{PLURAL:$1|lazava|lazava se}}:',
+'permissionserrorstext-withaction' => 'Rin icde $2 me zo rictal, {{PLURAL:$1|yoke|yoke}} :',
+'recreate-deleted-warn'            => "'''Obral: Rin va sulayanu bu djutolredul.'''
 
 Gokrafial ede tolredura va batu bu tir vodanhaf.
 Sulara \"log\" va batu bu krafiason batlize zo nedir :",
+'deleted-notice'                   => 'Sulayanu bu.
+"Log" sulara va batu bu vleveon vuesteson zo nedir.',
 
 # Parser/template warnings
 'expensive-parserfunction-category'      => 'Bu dem slika rozara va exulerafli',
@@ -570,28 +659,28 @@ Sulara \"log\" va batu bu krafiason batlize zo nedir :",
 Bazeyena lazava ke $3 tir ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Wira va "logs" ke batu bu',
-'nohistory'           => 'Nedoy izvot va batu bu.',
-'revnotfound'         => 'Merotrasin siatos',
-'revnotfoundtext'     => 'Abdif siatos ke batu bu me zo rodimtrasir. Ta vansara va batu bu va faveyene URL mane ageltal.',
-'currentrev'          => 'Noelaf siatos',
-'revisionasof'        => 'Siatos ba $1',
-'revision-info'       => 'Dimplekura va $1 gan $2',
-'previousrevision'    => '� Abdif siatos',
-'nextrevision'        => 'Radimif siatos →',
-'currentrevisionlink' => 'Wira va noelaf siatos',
-'cur'                 => 'noel-',
-'next'                => 'radi-',
-'last'                => 'iron-',
-'page_first'          => 'tane-',
-'page_last'           => 'iron-',
-'histlegend'          => 'Pebusiki : (noel-) = amiduca gu noelaf siatos ,
+'viewpagelogs'           => 'Wira va "logs" ke batu bu',
+'nohistory'              => 'Nedoy izvot va batu bu.',
+'currentrev'             => 'Noelaf siatos',
+'currentrev-asof'        => 'Noeltaf betaks va $1',
+'revisionasof'           => 'Siatos ba $1',
+'revision-info'          => 'Dimplekura va $1 gan $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Abdif siatos',
+'nextrevision'           => 'Radimif siatos →',
+'currentrevisionlink'    => 'Wira va noelaf siatos',
+'cur'                    => 'noel-',
+'next'                   => 'radi-',
+'last'                   => 'iron-',
+'page_first'             => 'tane-',
+'page_last'              => 'iron-',
+'histlegend'             => 'Pebusiki : (noel-) = amiduca gu noelaf siatos ,
 (iron-) = amiduca gu abdif siatos, <b>m</b> = betamaks',
-'deletedrev'          => '[sulayan]',
-'histfirst'           => 'Tel losavsaf',
-'histlast'            => 'Ironokaf',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vlardaf)',
+'history-fieldset-title' => 'Izvotexulera',
+'deletedrev'             => '[sulayan]',
+'histfirst'              => 'Tel losavsaf',
+'histlast'               => 'Ironokaf',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vlardaf)',
 
 # Revision feed
 'history-feed-title'          => 'Betarizvot',
@@ -676,8 +765,9 @@ Ta ropasusu warzafu bu yo va [[Special:Search|aneyara ko wiki]] yawal.',
 
 # Search results
 'searchresults'             => 'Aneyaradanekseem',
+'searchresults-title'       => 'Aneyaratrasiks va "$1"',
 'searchresulttext'          => 'Ta lo giva icde aneyara ko {{SITENAME}}, va [[{{MediaWiki:Helppage}}|{{int:help}}]] teliz disukel.',
-'searchsubtitle'            => 'Rin va \'\'\'[[:$1]]\'\'\' aneyayal ([[Special:Prefixindex/$1|kotu bu dem "$1" toza]] | [[Special:WhatLinksHere/$1|kotu bu gluyasu va "$1"]])',
+'searchsubtitle'            => 'Rin va \'\'\'[[:$1]]\'\'\' aneyayal ([[Special:Prefixindex/$1|kotu bu dem "$1" toza]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|kotu bu gluyasu va "$1"]])',
 'searchsubtitleinvalid'     => "Rin va '''$1''' aneyayal",
 'noexactmatch'              => "'''Manu \"\$1\" bu me tir.''' Va [[:\$1|batu bu]] roredul.",
 'noexactmatch-nocreate'     => "'''Me tir bu dem \"\$1\" vergumvelt.'''",
@@ -689,6 +779,7 @@ Ta ropasusu warzafu bu yo va [[Special:Search|aneyara ko wiki]] yawal.',
 'prevn'                     => '$1 abduef',
 'nextn'                     => '$1 radimef',
 'viewprevnext'              => 'Va ($1) ik ($2) ik ($3) disukel.',
+'searchhelp-url'            => 'Help:Pomara',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 trogarn|$2 trogarn}})',
 'search-result-score'       => 'Vadjereka : $1%',
 'search-redirect'           => '(graskara va $1)',
@@ -705,10 +796,9 @@ Ta ropasusu warzafu bu yo va [[Special:Search|aneyara ko wiki]] yawal.',
 'searchall'                 => 'kot',
 'showingresults'            => "Vlevefa nedira va {{PLURAL:$1|'''1''' trasiks|'''$1''' trasiks}} dem #'''$2''' toza.",
 'showingresultsnum'         => 'Nedira va <b>$3</b> trasiks male #<b>$2</b>.',
-'showingresultstotal'       => "Vleveon nedira va trasiks '''$1 - $2''' ke '''$3'''",
-'nonefound'                 => "<strong>Note</strong>: l'absence de résultat est souvent due à l'emploi de termes de recherche trop courants, comme « à » ou « de »,
-qui ne sont pas indexés, ou à l'emploi de plusieurs termes de recherche (seules les pages
-contenant tous les termes apparaissent dans les résultats).",
+'showingresultstotal'       => "Vleveon nedira va {{PLURAL:$4|trasiks '''$1''' va '''$3'''|trasiks '''$1 - $2''' va '''$3'''}}",
+'nonefound'                 => "'''Straga''': Anton yoltxo omavon zo aneyar.
+Kan ''all:'' laganeyal ta varafa exulera (gon keyaksexo is teza ikz-), oke wetce abdueosta va galpeno yoltxo favel.",
 'powersearch'               => 'Aneyara',
 'powersearch-legend'        => 'Aneyapara',
 'powersearch-ns'            => 'Aneyara koe yoltxo:',
@@ -722,7 +812,7 @@ contenant tous les termes apparaissent dans les résultats).",
 'mypreferences'            => 'Jinaf lodamaceem',
 'prefs-edits'              => 'Ota va betaks :',
 'prefsnologin'             => 'Dogluyariskaf',
-'prefsnologintext'         => 'Ta da va favesiklodamaceem robetal gotil [[Special:UserLogin|dogluyarakiraf]].',
+'prefsnologintext'         => 'Ede va favesiklodamaceem djubetal, gotil <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} dogluyarakiraf]</span>.',
 'prefsreset'               => 'Les préférences ont été rétablies à partir de la version enregistrée.',
 'qbsettings'               => 'Tuweltara va xekobla',
 'qbsettings-none'          => 'Mek',
@@ -753,9 +843,6 @@ contenant tous les termes apparaissent dans les résultats).",
 'prefs-misc'               => 'Gedrafa lodamaca yo',
 'saveprefs'                => 'Va lodamaceem tuená',
 'resetprefs'               => 'Va lodamceem dimplekú',
-'oldpassword'              => 'Savsaf remravlem',
-'newpassword'              => 'Warzaf remravlem',
-'retypenew'                => 'Va warzaf remravlem gruyel',
 'textboxsize'              => 'Sutelaxo',
 'rows'                     => 'Emacekeem',
 'columns'                  => 'Brizeem',
@@ -764,13 +851,13 @@ contenant tous les termes apparaissent dans les résultats).",
 'contextlines'             => 'Fuxetrasikson conhota',
 'contextchars'             => 'Fuxeconhon orkastaota',
 'recentchangesdays'        => 'Gonedin viel se koe noeltaf betakseem :',
-'recentchangescount'       => 'Vergumveltota vanmiae noeltaf betakseem',
+'recentchangescount'       => 'Omavon gonedina ota va noeltaf betakseem ik buizvot ik "log" :',
 'savedprefs'               => 'Lodamaceem su zo giwar.',
 'timezonelegend'           => 'Bartivxo',
 'timezonetext'             => "Si vous ne précisez pas de décalage horaire, c'est l'heure de l'Europe de l'ouest qui sera utilisée.",
-'localtime'                => 'Lizukaf bartiv',
-'timezoneoffset'           => 'Bartivferenuca',
-'servertime'               => 'Bartiv ke zanisiko',
+'localtime'                => 'Lizukaf bartiv :',
+'timezoneoffset'           => 'Bartivferenuca :',
+'servertime'               => 'Bartiv ke zanisiko :',
 'guesstimezone'            => 'Favera va voda ke exulesiki',
 'allowemail'               => 'Tutegirara va e-mail staksara mal ar favesik',
 'prefs-searchoptions'      => 'Aneyarikatcura',
@@ -784,7 +871,7 @@ contenant tous les termes apparaissent dans les résultats).",
 'userrights-lookup-user'      => 'Pofera va favesikeem',
 'userrights-user-editname'    => 'Va favesikyolt bazel',
 'editusergroup'               => 'Betara va favesikeem lospa',
-'editinguser'                 => "Betara va rokeem ke '''[[User:$1|$1]]''' favesik ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Betara va rokeem ke '''[[User:$1|$1]]''' favesik ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Betara va favesiklospa',
 'saveusergroups'              => 'Giwara va favesiklospa',
 'userrights-groupsmember'     => 'Bewik ke',
@@ -829,6 +916,8 @@ contenant tous les termes apparaissent dans les résultats).",
 'right-minoredit'            => 'Tcalara wetce betamaks',
 'right-move'                 => 'Buarrundara',
 'right-move-subpages'        => 'Arrundara va bu do volveybu',
+'right-move-rootuserpages'   => 'Arrundara va zaefu favesikbu',
+'right-movefile'             => 'Arrundara va iyeltak',
 'right-suppressredirect'     => 'Buarrundara va graskara male savsaf yolt me redur',
 'right-upload'               => 'Iyeltakkalvajara',
 'right-reupload'             => 'Selura va kruldes iyeltak',
@@ -870,9 +959,25 @@ contenant tous les termes apparaissent dans les résultats).",
 'rightslogtext' => 'Tir "log" va betara va favesikroka.',
 'rightsnone'    => '(mek)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'               => 'Redura va batu bu',
+'action-edit'               => 'Betara va batu bu',
+'action-createpage'         => 'Buredura',
+'action-createtalk'         => 'Keyaksexoredura',
+'action-createaccount'      => 'Redura va bata favesikpata',
+'action-move'               => 'Arrundara va batu bu',
+'action-move-subpages'      => 'Arrundara va batu bu is inaf volveybueem',
+'action-move-rootuserpages' => 'Arrundara va zaefu favesikbu',
+'action-movefile'           => 'arrundara va bat iyeltak',
+'action-upload'             => 'kalvajara va bat iyeltak',
+'action-delete'             => 'sulara va batu bu',
+'action-deleterevision'     => 'sulara va bat betaks',
+'action-browsearchive'      => 'aneyara va sulayanu bu',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|betaks|betaks}}',
 'recentchanges'                     => 'Noeltaf betakseem',
+'recentchanges-legend'              => 'Ikatcuks ke noeltaf betaks',
 'recentchangestext'                 => 'Moo batu bu va ironokaf betakseem ke {{SITENAME}} suzdal.',
 'recentchanges-feed-description'    => 'Sledara va tel lonoeltaf betakseem va wiki koo bat rust.',
 'rcnote'                            => "Vleveon {{PLURAL:$1|'''1''' betaks tir|ironokaf '''$1''' betaks tid}} bak ironokaf {{PLURAL:$2|viel|'''$2''' viel}}, wetce $5 ik $4.",
@@ -896,6 +1001,8 @@ contenant tous les termes apparaissent dans les résultats).",
 'rc_categories'                     => 'Kimara kare loma yo (solparsana kan "|")',
 'rc_categories_any'                 => 'Kon',
 'newsectionsummary'                 => '/* $1 */ warzaf gabot',
+'rc-enhanced-expand'                => 'Pintanedira (JavaScript tir adraf)',
+'rc-enhanced-hide'                  => 'Pintapalsera',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Gluyasikisuzdara',
@@ -916,18 +1023,18 @@ Bu koe [[Special:Watchlist|rinafi suzdasiki]] tid '''vastaakorafu'''.",
 'upload_directory_read_only'  => 'Sutera ko kalvajarabonja ($1) gan web zanisiko zo pour.',
 'uploaderror'                 => 'Rokla',
 'uploadtext'                  => "Ta iyeltakkalvajara, va vlevefi tazukasiki favel.
-Ta wira va kalvajayan iyeltak oku aneyara, ko [[Special:ImageList|vexala dem kalvajayan iyeltak]] grablel, kalvajaks is sulaks \"log\" tid koe [[Special:Log/upload|kalvajara \"log\"]].
+Ta wira va kalvajayan iyeltak oku aneyara, ko [[Special:FileList|vexala dem kalvajayan iyeltak]] grablel, kalvajaks is sulaks \"log\" tid koe [[Special:Log/upload|kalvajara \"log\"]].
 
 Ta kobura va iyeltak, koe tazukasiki va gluyasiki favel
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' oke
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' oke
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' ta rontifa gluyara va iyeltak.",
 'upload-permitted'            => 'Rictan iyeltakordeem : $1.',
 'upload-preferred'            => 'Abdualban iyeltakordeem : $1.',
 'upload-prohibited'           => 'Poun iyeltakordeem : $1.',
 'uploadlog'                   => "log d'upload",
 'uploadlogpage'               => "Log_d'upload",
-'uploadlogpagetext'           => 'Tir vexala dem ironokaf iyeltak yo kalvajayan mo zanisiko. Bazen bartiv tir tel ke zanisiko.',
+'uploadlogpagetext'           => 'Tir vexala dem ironokaf kalvajayan iyeltak. Va [[Special:NewFiles|ginsa dem warzaf iyeltak]] wil ta lowiafa wigara.',
 'filename'                    => 'Yolt',
 'filedesc'                    => 'Pimtara',
 'fileuploadsummary'           => 'Vildeks :',
@@ -947,17 +1054,17 @@ Ta kobura va iyeltak, koe tazukasiki va gluyasiki favel
 'large-file'                  => 'Lokiewafa da lum ke man iyeltak tir lepinaf dam $1; bat iyeltak tir $2.',
 'largefileserver'             => 'Bat iyeltak tir pwertarsaf gu gotune ke zanisiko.',
 'emptyfile'                   => 'Kalvajan iyeltak nuvelar vlardaf. Lanon golde sutejen iyeltakyolt. Vay ageltal ede va bat iyeltak en djukalvajal !',
-'fileexists'                  => 'Iyeltak dem man bat yolt ixam krulder. Vay, ageltal va <strong><tt>$1</tt></strong>. Til lanaf da va bat iyeltak djubetal ?',
-'filepageexists'              => 'Pimtarabu ke bat iyeltak ixam al zo redur ko <strong><tt>$1</tt></strong>, vexe mek iyeltak dem man yolt ixam tir. Vildeks rinon suten moe pimtarabu me awitir. Ede djumel da in batlize co-awir, nubedon co-gobetal.',
-'fileexists-extension'        => 'Iyeltak dem nuxaf yolt tir :<br />
-Yolt ke kalvajayan iyeltak : <strong><tt>$1</tt></strong><br />
-Yolt ke tis iyeltak : <strong><tt>$2</tt></strong><br />
-Va amidaf yolt vay kiblal !',
+'fileexists'                  => "Iyeltak dem man bat yolt ixam krulder. Vay, ageltal va '''<tt>$1</tt>'''. Til lanaf da va bat iyeltak djubetal ?",
+'filepageexists'              => "Pimtarabu ke bat iyeltak ixam al zo redur ko '''<tt>$1</tt>''', vexe mek iyeltak dem man yolt ixam tir. Vildeks rinon suten moe pimtarabu me awitir. Ede djumel da in batlize co-awir, nubedon co-gobetal.",
+'fileexists-extension'        => "Iyeltak dem nuxaf yolt tir :<br />
+Yolt ke kalvajayan iyeltak : '''<tt>$1</tt>'''<br />
+Yolt ke tis iyeltak : '''<tt>$2</tt>'''<br />
+Va amidaf yolt vay kiblal !",
 'fileexists-thumb'            => "<center>'''Kruldes iyeltak'''</center>",
-'fileexists-thumbnail-yes'    => 'Iyeltak nuvelar da tir lumamafa ewava <i>(aluk)</i>. Vay va <strong><tt>$1</tt></strong> iyeltak stujel.<br />
-Ede stujen iyeltak tir mila lumanhafa ewava, va aptaf aluk me kalvajal !',
-'fileexists-forbidden'        => 'Milyoltaf iyeltak ixam krulder; vay dimpil aze va memilyoltaf bat iyeltak kalvajal. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Koe pakana bonja milyoltaf iyeltak ixam tir; vay dimpil aze kan ar yolt va bat iyeltak kalvajal. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Iyeltak nuvelar da tir lumamafa ewava ''(aluk)''. Vay va '''<tt>$1</tt>''' iyeltak stujel.<br />
+Ede stujen iyeltak tir mila lumanhafa ewava, va aptaf aluk me kalvajal !",
+'fileexists-forbidden'        => 'Milyoltaf iyeltak ixam krulder; vay dimpil aze va memilyoltaf bat iyeltak kalvajal. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Koe pakana bonja milyoltaf iyeltak ixam tir; vay dimpil aze kan ar yolt va bat iyeltak kalvajal. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Bat iyeltak tir jontolaca ke {{PLURAL:$1|iyeltak|iyeltak}}:',
 'successfulupload'            => 'Ksudanhara',
 'uploadwarning'               => 'Obral !',
@@ -965,7 +1072,7 @@ Ede stujen iyeltak tir mila lumanhafa ewava, va aptaf aluk me kalvajal !',
 'uploadedimage'               => '« [[$1]] » ksudayan mo zanisiko',
 'overwroteimage'              => 'kalvajayan siatos ke "[[$1]]"',
 'uploaddisabled'              => 'Skalev, staksera va iyeltak tir gritegirayan.',
-'uploaddisabledtext'          => 'Iyeltakkalvajara ko {{SITENAME}} tir gritegirayana.',
+'uploaddisabledtext'          => 'Iyeltakkalvajara tir gritegirayana.',
 'uploadscripted'              => 'Bat iyeltak va HTML ok Script beksa rotir narujutuna gan web exulesiki ruldar.',
 'uploadcorrupt'               => 'Bat iyeltak tir avonanaf ok lumiskaf oke va mewadaf yolt digir.
 Va iyeltak gonageltal.',
@@ -994,17 +1101,17 @@ Sulara \"log\" va batu bu krafiason batlize zo nedir :",
 'upload_source_url'  => ' (enafe sanegon rovansane URL mane)',
 'upload_source_file' => ' (iyeltak koe rinafo vusiko)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Aneyara va ewavayolt :',
+# Special:ListFiles
+'listfiles_search_for'  => 'Aneyara va ewavayolt :',
 'imgfile'               => 'iyeltak',
-'imagelist'             => 'Ewavavexala',
-'imagelist_date'        => 'Evla',
-'imagelist_name'        => 'Yolt',
-'imagelist_user'        => 'Favesik',
-'imagelist_size'        => 'Lum',
-'imagelist_description' => 'Pimtara',
-
-# Image description page
+'listfiles'             => 'Ewavavexala',
+'listfiles_date'        => 'Evla',
+'listfiles_name'        => 'Yolt',
+'listfiles_user'        => 'Favesik',
+'listfiles_size'        => 'Lum',
+'listfiles_description' => 'Pimtara',
+
+# File description page
 'filehist'                       => 'Iyeltakizvot',
 'filehist-help'                  => 'Ta da va iyeltak wil dum in batoulon awir va evla/bartiv vulegal !',
 'filehist-deleteall'             => 'Sulara va kotcoba',
@@ -1012,19 +1119,21 @@ Sulara \"log\" va batu bu krafiason batlize zo nedir :",
 'filehist-revert'                => 'dimplekura',
 'filehist-current'               => 'noeltaf',
 'filehist-datetime'              => 'Evla/Bartiv',
+'filehist-thumb'                 => 'Aluk',
+'filehist-thumbtext'             => 'Aluk va siatos ke $1',
 'filehist-user'                  => 'Favesik',
 'filehist-dimensions'            => 'Lumeem',
 'filehist-filesize'              => 'Iyeltakaldo',
 'filehist-comment'               => 'Sebuks',
-'imagelinks'                     => 'Gluyasiki se',
+'imagelinks'                     => 'Yoni iyeltakgluyasiki',
 'linkstoimage'                   => 'Vlevefi {{PLURAL:$1|bugluyasiki|$1 bugluyasiki}} va bat iyeltak :',
 'nolinkstoimage'                 => 'Meku bu va bata ewava ruldar.',
 'morelinkstoimage'               => 'Rupera va [[Special:WhatLinksHere/$1|lofi skedasiki]] va bat iyeltak.',
 'redirectstofile'                => 'Vlevef {{PLURAL:$1|graskan iyeltak|$1 graskan iyeltak}} va bat iyeltak :',
-'duplicatesoffile'               => 'Bat {{PLURAL:$1|iyeltak tir|$1 iyeltak tid}} jontolaca ke bat iyeltak:',
+'duplicatesoffile'               => 'Bat {{PLURAL:$1|iyeltak tir|$1 iyeltak tid}} jontolaca ke bat iyeltak ([[Special:FileDuplicateSearch/$2|lo pinta]]) :',
 'sharedupload'                   => 'Bat iyeltak tir dof nume gan ar abdumimaks zo rofaver.',
 'shareduploadwiki'               => 'Ta lo giva va $1 vay disukel !',
-'shareduploadwiki-desc'          => 'Pimtara icde intaf $1 koe solparsani vargi vleveon zo nedir.',
+'shareduploadwiki-desc'          => 'Pimtara icde intaf $1 vleveon zo nedir.',
 'shareduploadwiki-linktext'      => 'Iyeltakpimtarabu',
 'shareduploadduplicate'          => 'Bat iyeltak tir jontolaks va $1 male solparsani vargi.',
 'shareduploadduplicate-linktext' => 'ar iyeltak',
@@ -1052,7 +1161,6 @@ Sulara \"log\" va batu bu krafiason batlize zo nedir :",
 'filedelete-success'          => "'''$1''' al zo sular.",
 'filedelete-success-old'      => '<span class="plainlinks">Siatos ke \'\'\'[[Media:$1|$1]]\'\'\' wetce $3, $2 tir sulayan.</span>',
 'filedelete-nofile'           => "'''$1''' me krulder koe {{SITENAME}}.",
-'filedelete-iscurrent'        => 'Rin yawal da va tel lonoeltaf siatos ke bat iyeltak sulal. Kal losavsaf siatos taneon vay dimplekul.',
 'filedelete-otherreason'      => 'Ara ik loplekufa lazava :',
 'filedelete-reason-otherlist' => 'Ara lazava',
 'filedelete-reason-dropdown'  => '*Giltafa sularalazava
@@ -1086,19 +1194,9 @@ Abdi sulara, setikel da va ari skedasiki va teza stujel.',
 'randomredirect-nopages' => 'Nedoy graskaks koe bato yoltxo.',
 
 # Statistics
-'statistics'             => 'Enkopaca yo',
-'sitestats'              => 'Enkopaca yo va xo',
-'userstats'              => 'Enkopaca yo va favesik',
-'sitestatstext'          => "Origak va '''\$1''' bu noelon ruldar.
-Bata ota va se \"prilarabu\" is bu icde {{SITENAME}} is yupbu is graskarabu is aru metelizkorafu bu ruldar. Divlapuson va batu bu se, '''\$2''' lanon telizkorafu bu zavzad.
-
-'''\$8''' iyeltak tid kalvajayan.
-
-'''\$3''' bu zo rupeyed ise '''\$4''' zo betayad. Va mialuk va '''\$5''' betara fuxe bu is '''\$6''' rupera fuxe betara batcoba tadler.
-
-Abrotcuca ke [http://www.mediawiki.org/wiki/Manual:Job_queue \"job queue\"] tir '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Tir '''1''' vertokayan [[Special:ListUsers|favesik]]|Tid '''$1''' vertokayan [[Special:ListUsers|favesik]]}}. Vanmiaeon '''$2''' (ok '''$4%''') va $5 roka {{PLURAL:$2|digir|digid}}.",
-'statistics-mostpopular' => 'Tel lorupen bueem',
+'statistics'              => 'Enkopaca yo',
+'statistics-header-users' => 'Enkopaca yo va favesik',
+'statistics-mostpopular'  => 'Tel lorupen bueem',
 
 'disambiguations'     => 'Bu dem milyoltaca yo',
 'disambiguationspage' => '{{ns:template}}:Milyoltaca',
@@ -1138,14 +1236,13 @@ Abrotcuca ke [http://www.mediawiki.org/wiki/Manual:Job_queue \"job queue\"] tir
 'popularpages'            => 'Tel lorupen bueem',
 'wantedcategories'        => 'Eruna loma',
 'wantedpages'             => 'Tel loderun bueem',
-'missingfiles'            => 'Gracas iyeltak',
 'mostlinked'              => 'Tel buon logluyan teliz yo',
 'mostlinkedcategories'    => 'Tel lomon logluyan teliz yo',
 'mostlinkedtemplates'     => 'Tel tezon logluyasikikiraf',
 'mostcategories'          => 'Tel lolomakiraf teliz yo',
 'mostimages'              => 'Tela logluyana ewava se',
 'mostrevisions'           => 'Tel lobetayan teliz yo',
-'prefixindex'             => 'Radimeosta',
+'prefixindex'             => 'Bu dem radimeosta',
 'shortpages'              => 'Telaf bueem',
 'longpages'               => 'Abrotcaf bueem',
 'deadendpages'            => 'Axodabueem',
@@ -1182,8 +1279,6 @@ Abrotcuca ke [http://www.mediawiki.org/wiki/Manual:Job_queue \"job queue\"] tir
 'speciallogtitlelabel' => 'Vergumvelt:',
 'log'                  => '"logs"',
 'all-logs-page'        => '"log" bueem',
-'log-search-legend'    => 'Aneyara va log',
-'log-search-submit'    => 'Rupera',
 'logempty'             => 'Mek trasiks koe "log" iyeltak.',
 'log-title-wildcard'   => 'Aneyara va vergumvelt dem mana toza',
 
@@ -1193,6 +1288,7 @@ Abrotcuca ke [http://www.mediawiki.org/wiki/Manual:Job_queue \"job queue\"] tir
 'nextpage'          => 'Radimebu ($1)',
 'prevpage'          => '($1) abdifu bu',
 'allpagesfrom'      => 'Nedira va bu se male',
+'allpagesto'        => 'Nedira va bu dem tena male :',
 'allarticles'       => 'Telizeem',
 'allinnamespace'    => 'Kotu bu ($1 yoltxo)',
 'allnotinnamespace' => 'Kotaf bueem (me koe $1 yoltxo)',
@@ -1209,11 +1305,20 @@ Abrotcuca ke [http://www.mediawiki.org/wiki/Manual:Job_queue \"job queue\"] tir
 'special-categories-sort-count' => 'Otafa mubera',
 'special-categories-sort-abc'   => 'Abavafa mubera',
 
+# Special:LinkSearch
+'linksearch'    => 'Divafi gluyasiki',
+'linksearch-ns' => 'Yoltxo :',
+'linksearch-ok' => 'Aneyara',
+
 # Special:ListUsers
 'listusersfrom'      => 'Fintara va favesikeem male :',
 'listusers-submit'   => 'Nedira',
 'listusers-noresult' => 'Mek trasiyin favesik.',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Buredura "log"',
+'newuserlog-create-entry' => 'Warzaf favesik',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Rokeem ke favesiklospa',
 'listgrouprights-group'    => 'Lospa',
@@ -1266,7 +1371,7 @@ Ta sulara va batu bu div rinafi suzdasiki, koe grablexo va « Mea suzdá » vule
 'notanarticle'         => 'Nedoy teliz',
 'notvisiblerev'        => 'Betaks sulayan',
 'watchnochange'        => 'Nedoyu rinafu suzdanu bu al zo betar bak bazena rekola',
-'watchlist-details'    => '{{PLURAL:$1|$1 nedisu bu|$1 nedisu bu}} rade prilarabueem.',
+'watchlist-details'    => '{{PLURAL:$1|$1 bu|$1 bu}} koe rinafi suzdasiki rade prilarabueem.',
 'wlheader-enotif'      => '* Email walzera tir tegisa.',
 'wlheader-showupdated' => "* Bu betayanu vielu rin ironokon worayal tir '''sulatcalakorafu'''.",
 'watchmethod-recent'   => 'ageltara va noeltaf betakseem va suzdan bueem',
@@ -1275,12 +1380,7 @@ Ta sulara va batu bu div rinafi suzdasiki, koe grablexo va « Mea suzdá » vule
 'iteminvalidname'      => 'Zvak icde « $1 » teliz : yolt tir mewadaf...',
 'wlnote'               => 'Vleveon tid tela $1 ironokafa betara mali <b>$2</b> ironokaf bartiv.',
 'wlshowlast'           => 'Nedira va ironokaf $1 bartiv isu $2 viel isu $3',
-'watchlist-show-bots'  => 'Nedira va stiernaf betakseem',
-'watchlist-hide-bots'  => 'Palsera va stiernaf betakseem',
-'watchlist-show-own'   => 'Nedira va jinaf webekseem',
-'watchlist-hide-own'   => 'Palsera va jinaf betamakseem',
-'watchlist-show-minor' => 'Nedira va betamakseem',
-'watchlist-hide-minor' => 'Palsera va betamakseem',
+'watchlist-options'    => 'Suzdasikiolkeem',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Nedis...',
@@ -1321,73 +1421,79 @@ To change your watchlist settings, visit
 Feedback and further assistance:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Busulara',
-'confirm'                     => 'Gruyé',
-'excontent'                   => 'ruldas va « $1 »',
-'excontentauthor'             => "cek tiyir : '$1' (is tanaf webesik tiyir '$2')",
-'exbeforeblank'               => 'Abdi tuvlardara, batu bu ruldayar va : $1',
-'exblank'                     => 'vlardafu bu',
-'delete-confirm'              => 'Sulara va "$1"',
-'delete-legend'               => 'Sulara',
-'historywarning'              => 'Obral : Telu bu rinon sulatanu va izvot digir :',
-'confirmdeletetext'           => 'Rin va bu is varaf izvot fu sulal.
+# Delete
+'deletepage'             => 'Busulara',
+'confirm'                => 'Gruyé',
+'excontent'              => 'ruldas va « $1 »',
+'excontentauthor'        => "cek tiyir : '$1' (is tanaf webesik tiyir '$2')",
+'exbeforeblank'          => 'Abdi tuvlardara, batu bu ruldayar va : $1',
+'exblank'                => 'vlardafu bu',
+'delete-confirm'         => 'Sulara va "$1"',
+'delete-legend'          => 'Sulara',
+'historywarning'         => 'Obral : Telu bu rinon sulatanu va izvot digir :',
+'confirmdeletetext'      => 'Rin va bu is varaf izvot fu sulal.
 Vay gruyel da djuskul ise va maletireem vangrupel ise tarkason va [[{{MediaWiki:Policy-url}}|xoverteem]] askil !',
-'actioncomplete'              => 'Skuyuna sulara',
-'deletedtext'                 => '« <nowiki>$1</nowiki> » tir sulayan.
+'actioncomplete'         => 'Skuyuna sulara',
+'deletedtext'            => '« <nowiki>$1</nowiki> » tir sulayan.
 Ta vexala dem noeltaf sulareem va $2 disukel.',
-'deletedarticle'              => 'al sular va « $1 »',
-'suppressedarticle'           => '"[[$1]]" sulayan',
-'dellogpage'                  => 'Izvot va sulareem',
-'dellogpagetext'              => 'Tir tela vexala dem noeltaf sulareem.
+'deletedarticle'         => 'al sular va « $1 »',
+'suppressedarticle'      => '"[[$1]]" sulayan',
+'dellogpage'             => 'Izvot va sulareem',
+'dellogpagetext'         => 'Tir tela vexala dem noeltaf sulareem.
 Bazen bartiv tir tel ke zanisiko.',
-'deletionlog'                 => 'izvot va sulareem',
-'reverted'                    => 'Dimplekura va tel abdif siatos',
-'deletecomment'               => 'Sularadanda',
-'deleteotherreason'           => 'Ara ik loplekufa lazava :',
-'deletereasonotherlist'       => 'Ara lazava',
-'deletereason-dropdown'       => '*Giltafa sularalazava
+'deletionlog'            => 'izvot va sulareem',
+'reverted'               => 'Dimplekura va tel abdif siatos',
+'deletecomment'          => 'Sularadanda',
+'deleteotherreason'      => 'Ara ik loplekufa lazava :',
+'deletereasonotherlist'  => 'Ara lazava',
+'deletereason-dropdown'  => '*Giltafa sularalazava
 ** Erura ke sutesik
 ** Aksara va sutesikroka
 ** Apkara',
-'delete-edit-reasonlist'      => 'Betara va sularalazava',
-'delete-toobig'               => 'Batu bu va izvotap (lo $1 {{PLURAL:$1|betara|betara}}) digir. Ta djira va waltafa empara va {{SITENAME}} sulara va manu bu zo irutar.',
-'delete-warning-toobig'       => 'Batu bu va izvotap (lo $1 {{PLURAL:$1|betara|betara}}) digir. Sulara va manu bu va skura ke origak ke {{SITENAME}} rotempar, acum obrason diotel !',
-'rollback'                    => 'nabildara va betareem',
-'rollback_short'              => 'Nabildara',
-'rollbacklink'                => 'nabildara',
-'rollbackfailed'              => 'Rodjeyesa nabildara',
-'cantrollback'                => 'Impossible de révoquer : dernier auteur est le seul à avoir modifié cet article',
-'alreadyrolled'               => 'Dimplekura va ironokafa betara va "$1" teliz gan [[User:$2|$2]] ([[User talk:$2|Prilara]]) me zo roskur; artan va teliz ixam al betar oke al dimplekur.
+'delete-edit-reasonlist' => 'Betara va sularalazava',
+'delete-toobig'          => 'Batu bu va izvotap (lo $1 {{PLURAL:$1|betara|betara}}) digir. Ta djira va waltafa empara va {{SITENAME}} sulara va manu bu zo irutar.',
+'delete-warning-toobig'  => 'Batu bu va izvotap (lo $1 {{PLURAL:$1|betara|betara}}) digir. Sulara va manu bu va skura ke origak ke {{SITENAME}} rotempar, acum obrason diotel !',
+
+# Rollback
+'rollback'         => 'nabildara va betareem',
+'rollback_short'   => 'Nabildara',
+'rollbacklink'     => 'nabildara',
+'rollbackfailed'   => 'Rodjeyesa nabildara',
+'cantrollback'     => 'Impossible de révoquer : dernier auteur est le seul à avoir modifié cet article',
+'alreadyrolled'    => 'Dimplekura va ironokafa betara va "$1" teliz gan [[User:$2|$2]] ([[User talk:$2|Prilara]]) me zo roskur; artan va teliz ixam al betar oke al dimplekur.
 
 Ironokafa betara gan [[User:$3|$3]] ([[User talk:$3|Prilara]]) zo skuyur.',
-'editcomment'                 => 'Vildeks va betara tiyir : <i>« $1 »</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Dimplekuyun betakseem ke [[Special:Contributions/$2|$2]] ([[User talk:$2|Prilara]]); dim ironokaf siatos ke [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Dimplekun betaks yo gan $1; dimpira ko ironokaf siatos ke $2.',
+'editcomment'      => "Vildeks va betara tiyir : ''« $1 »''.", # only shown if there is an edit comment
+'revertpage'       => 'Dimplekuyun betakseem ke [[Special:Contributions/$2|$2]] ([[User talk:$2|Prilara]]); dim ironokaf siatos ke [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Dimplekun betaks yo gan $1; dimpira ko ironokaf siatos ke $2.',
+
+# Protect
 'protectlogpage'              => 'Izvot va nendareem',
 'protectlogtext'              => 'Vleveon tir elekan is dimelekayan bueem. Ta vexala dem noelaf skus nendareem, va [[Special:ProtectedPages|nendan bueem]] wil.',
 'protectedarticle'            => 'va « $1 » al nendar',
 'modifiedarticleprotection'   => 'betayana nendareka va "[[$1]]"',
 'unprotectedarticle'          => 'va « $1 » al dimnendar',
 'protect-title'               => 'Nendara va « $1 »',
+'prot_1movedto2'              => '$1 arbureyen kal $2',
 'protect-legend'              => 'Va nendara gruyel',
 'protectcomment'              => 'Nendaradanda',
 'protectexpiry'               => 'Edjatena :',
 'protect_expiry_invalid'      => 'Edjatena me tir enafa.',
 'protect_expiry_old'          => 'Edjatena tir abdiugalafa.',
 'protect-unchain'             => 'Volelekara va arrundararictara',
-'protect-text'                => 'Rin va nendareka ke <strong><nowiki>$1</nowiki></strong> bu batlize rowil nume robetal.',
-'protect-locked-access'       => 'Rinafa pata va betara va nendareka me rictar.
-Noeltaf plekukseem ke <strong>$1</strong> bu batlize tid :',
+'protect-text'                => "Rin va nendareka ke '''<nowiki>$1</nowiki>''' bu batlize rowil nume robetal.",
+'protect-locked-access'       => "Rinafa pata va betara va nendareka me rictar.
+Noeltaf plekukseem ke '''$1''' bu batlize tid :",
 'protect-cascadeon'           => 'Batu bu zo nendar kire va {{PLURAL:$1|bu disu|bu yo disu}} va tegisa stoyakorafa nendara pasur. Rin va nendareka va batu bu robetal vexe batcoba va stoyakorafa nendara me vanolatar.',
-'protect-default'             => '(kabeaca)',
+'protect-default'             => 'Va kot favesik nover',
 'protect-fallback'            => 'Kucilara va "$1" rictara',
-'protect-level-autoconfirmed' => 'Elekara va patiskaf favesik',
+'protect-level-autoconfirmed' => 'Elekara va warzaf ik patiskaf favesik',
 'protect-level-sysop'         => 'Anton ristusik',
 'protect-summary-cascade'     => 'stoyakoron',
 'protect-expiring'            => 'edjatena ba $1 (UTC)',
 'protect-cascade'             => 'Nendan bueem dene batu bu (stoyakorafa nendara)',
 'protect-cantedit'            => 'Va nendarekeem va batu bu me robetal kire va betararoka me deraykal.',
+'protect-expiry-options'      => '2 bartiv:2 hours,1 viel:1 day,3 viel:3 days,1 perka:1 week,2 perka:2 weeks,1 aksat:1 month,3 aksat:3 months,6 aksat:6 months,1 tanda:1 year,kotabon:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Rictara :',
 'restriction-level'           => 'Irutareka :',
 'minimum-size'                => 'Volcugaf lum',
@@ -1443,13 +1549,14 @@ $1',
 'blanknamespace' => '(Nelkaxo)',
 
 # Contributions
-'contributions' => 'Webereem ke favesik',
-'mycontris'     => 'Jinaf webekseem',
-'contribsub2'   => 'Tori $1 ($2)',
-'nocontribs'    => 'Meka betara vadjesa va bata luda se al zo trasir.',
-'uctop'         => ' (ironokaf)',
-'month'         => 'Mali aksat (is logaveon) :',
-'year'          => 'Mali ilana (is logaveon) :',
+'contributions'       => 'Webereem ke favesik',
+'contributions-title' => 'Favesikwebekseem icde $1',
+'mycontris'           => 'Jinaf webekseem',
+'contribsub2'         => 'Tori $1 ($2)',
+'nocontribs'          => 'Meka betara vadjesa va bata luda se al zo trasir.',
+'uctop'               => ' (ironokaf)',
+'month'               => 'Mali aksat (is logaveon) :',
+'year'                => 'Mali ilana (is logaveon) :',
 
 'sp-contributions-newbies'     => 'Anton nedira va warzafavesikaf webekseem',
 'sp-contributions-newbies-sub' => 'Tori warzaf favesikeem',
@@ -1462,7 +1569,6 @@ $1',
 'whatlinkshere'            => 'Gluyarakiraf bueem',
 'whatlinkshere-title'      => 'Bu gluyasu va "$1"',
 'whatlinkshere-page'       => 'Bu :',
-'linklistsub'              => '(Gluyasikiak)',
 'linkshere'                => "Van batu bu vlevef bueem va gluyasiki ruldar : '''[[:$1]]'''",
 'nolinkshere'              => "Van batu bu nedoyu bu va gluyasiki ruldar : '''[[:$1]]'''",
 'nolinkshere-ns'           => "Koe kiblayano yoltxo meku bu gluyasikikirafu gu '''[[:$1]]'''.",
@@ -1473,6 +1579,7 @@ $1',
 'whatlinkshere-next'       => '{{PLURAL:$1|radimef|radimef $1}}',
 'whatlinkshere-links'      => '� gluyasiki se',
 'whatlinkshere-hideredirs' => '$1 graskara',
+'whatlinkshere-hidetrans'  => '$1 "transclusion"',
 'whatlinkshere-hidelinks'  => '$1 gluyasiki',
 'whatlinkshere-hideimages' => '$1 skedasiki va ewava',
 'whatlinkshere-filters'    => 'Espasiki',
@@ -1525,6 +1632,7 @@ male abdion elekayane IP mane.',
 'ipblocklist-no-results'   => 'Erune IP mane ok favesikyolt me tid elekayan.',
 'blocklink'                => 'elekara',
 'unblocklink'              => 'grielekara',
+'change-blocklink'         => 'Betara va elekara',
 'contribslink'             => 'webekseem',
 'autoblocker'              => 'Bloqué automatiquement parce que vous partagez une adresse IP avec « $1 ». Raison : « $2 ».',
 'blocklogpage'             => 'Elekara log',
@@ -1581,6 +1689,8 @@ Il peut s'agir d'un changement radical et inattendu pour un article souvent cons
 
 Dans ce cas, vous devrez renommer ou fusionner la page manuellement si vous le désirez.",
 'movearticle'             => 'Tolyoltara va teliz',
+'movenologin'             => 'Dogluyariskaf',
+'movenologintext'         => 'Ede rin va teliz co-djutolyoltal, wetce koverteyen favesik gotil [[Special:UserLogin|dogluyarakiraf]].',
 'movenotallowed'          => 'Rin me zo rictal da ko {{SITENAME}} va bu rotarrundal.',
 'newtitle'                => 'Warzaf vergumvelt',
 'move-watch'              => 'Busuzdara',
@@ -1648,6 +1758,7 @@ bu ika int me zo rotarrundar.',
 'import-interwiki-history'   => 'Ksudara va kot izvotsiatos ke batu bu',
 'import-interwiki-submit'    => 'Koburera',
 'import-interwiki-namespace' => 'Buremburera ko yoltxo :',
+'import-comment'             => 'Sebuks :',
 'importtext'                 => 'Exportez un fichier depuis le wiki source en utilisant la fonction Special:Export, sauvez la page sur votre disque puis envoyez là ici.',
 'importstart'                => 'Kobures va bu...',
 'import-revision-count'      => '$1 {{PLURAL:$1|betaks|betaks}}',
@@ -1683,7 +1794,7 @@ bu ika int me zo rotarrundar.',
 'tooltip-pt-logout'               => 'Voldogluyara',
 'tooltip-ca-talk'                 => 'Keyaksera va telizbu',
 'tooltip-ca-edit'                 => 'Va batu bu robetal. Va "Abdinedira" vulegasiki abdi giwara vay favel !',
-'tooltip-ca-addsection'           => 'Loplekura va sebuks ben bata keyaksera.',
+'tooltip-ca-addsection'           => 'Bokara va warzaf gabot',
 'tooltip-ca-viewsource'           => 'Batu bu zo nendar. Rin va klita rowil.',
 'tooltip-ca-history'              => 'Abdif siatoseem ke batu bu.',
 'tooltip-ca-protect'              => 'Nendara va batu bu',
@@ -1730,6 +1841,9 @@ bu ika int me zo rotarrundar.',
 'tooltip-watch'                   => 'Ko intafi suzdasiki va batu bu loplekú',
 'tooltip-recreate'                => 'Tolredura va bu damo abdifa sulara',
 'tooltip-upload'                  => 'Kalvajara',
+'tooltip-rollback'                => '"Rollback" kan tanoya vulegara va betaks va batu bu kal ironokaf webesik kuider',
+'tooltip-undo'                    => '"Dimbetara"  va bata betara kuider ise va tazukasiki abdiwison fenkur.
+Ise va bazera va lazava ko vildeks nover.',
 
 # Metadata
 'nodublincore'      => 'Les métadonnées « Dublin Core RDF » sont désactivées sur ce serveur.',
@@ -1797,8 +1911,8 @@ $1',
 'filedelete-current-unregistered' => '"$1" bazen iyeltak me tir koe origak.',
 
 # Browsing diffs
-'previousdiff' => '� Abdifa amiduca',
-'nextdiff'     => 'Radimifa amiduca →',
+'previousdiff' => '� Abdifa amidaca',
+'nextdiff'     => 'Radimifa amidaca →',
 
 # Media information
 'thumbsize'            => 'Aluklum :',
@@ -1810,7 +1924,7 @@ $1',
 'show-big-image'       => 'Geltraf lum',
 'show-big-image-thumb' => '<small>Lum ke bata abdinedira : $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Warzaf ewaviyeltak yo',
 'imagelisttext'         => "Tir vexala dem '''$1''' {{PLURAL:$1|iyeltak|iyeltak}} $2 pulana.",
 'newimages-summary'     => 'Batu aptafu bu va ironokaf kalvajayan iyeltakeem nedir.',
@@ -2019,7 +2133,7 @@ Kotari milconhafi gluyasiki roklon zo krafiar.',
 
 # External editor support
 'edit-externally'      => 'Betara va bat iyeltak faveson va divef talpey',
-'edit-externally-help' => 'Ta lo giva va [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] disukel !',
+'edit-externally-help' => '(Ta lo giva va [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] disukel !)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'kot',
@@ -2074,21 +2188,9 @@ This confirmation code will expire at $4.',
 'deletedwhileediting' => 'Obral : batu bu al zo sulayar mali da rin toz betayar !',
 'recreate'            => 'Tolredura',
 
-# HTML dump
-'redirectingto' => 'Graskas kal [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Palsexo ke batu bu zo gokarler ?
-
-$1',
 'confirm_purge_button' => 'En',
-
-# AJAX search
-'searchcontaining' => "Aneyara va teliz yo dem ''$1''.",
-'searchnamed'      => "Aneyara va teliz yo yoltkiraf gu ''$1''.",
-'articletitles'    => "Teliz yo tozakiraf gu ''$1''",
-'hideresults'      => 'Palsera va trasiks',
-'useajaxsearch'    => 'Favera va AJAX aneyara',
+'confirm-purge-top'    => 'Palsexo ke batu bu zo gokarler ?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� abduebu',
diff --git a/languages/messages/MessagesAy.php b/languages/messages/MessagesAy.php
index c4c2875d..4f850b93 100644
--- a/languages/messages/MessagesAy.php
+++ b/languages/messages/MessagesAy.php
@@ -15,7 +15,7 @@ $messages = array(
 'tog-underline'               => 'Sipita siqiraña',
 'tog-highlightbroken'         => 'P\'akita sipita utt\'ayaña <a href="" class="new">ukhama</a> (maykipa: ukhama<a href="" class="internal">?</a>).',
 'tog-justify'                 => "Tanta amuyanak purapt'ayaña",
-'tog-hideminor'               => 'Jichha kutikiptatanakana «Janiw taqpachäkiti» imantaña',
+'tog-hideminor'               => 'Jichha jaqukipawina sullka askiptawix imantaña',
 'tog-extendwatchlist'         => "Sarayawi jaqukipaw uñachayasuñatakiw unch'ukit waruch aqatatayaña",
 'tog-usenewrc'                => "Jichhnaki jaqukipawi waliptäta (''JavaScript'')",
 'tog-numberheadings'          => 'Titulun chinu achuraña',
@@ -25,6 +25,35 @@ $messages = array(
 'tog-editsectiononrightclick' => "(''JavaScript'') titulxat tuqina kupi suxuqiñampi tuqitaki turkawi luräña",
 'tog-showtoc'                 => 'Waruchataw uñachayaña (kimsa tituljampi uñstawitaki)',
 'tog-rememberpassword'        => "Akax jasanchirin imt'awija amtaña",
+'tog-editwidth'               => 'Akiptawit llataxa taqi anchuniwa',
+'tog-watchcreations'          => "Unch'ukit waruchatajana nayaxa uñstawix uñstayawajata yapxataña",
+'tog-watchdefault'            => "Unch'ukit waruchatajana nayaxa uñstawix turkajata yapxataña",
+'tog-watchmoves'              => "Unch'ukit waruchatajana nayaxa uñstawix sutiyarajata yapxataña",
+'tog-watchdeletion'           => "Unch'ukit waruchatajana nayaxa uñstawix phiskhurajata yapxataña",
+'tog-minordefault'            => 'Sullka askiptawpacha chimpuriña',
+'tog-previewontop'            => 'Askiptawit llataxa nayraxa uñtawikar uñachayaña',
+'tog-previewonfirst'          => 'Mayïri askiptawina uñtawikar uñachayaña',
+'tog-nocache'                 => "Uñstawita kachiñar jark'aña",
+'tog-enotifwatchlistpages'    => "Nayaru chaski jalayiriña ukja unch'ukit waruchatana mäuñstawi turkañäna",
+'tog-enotifusertalkpages'     => 'Nayaru chaski jalayiriña ukja tuqisiwit uñstawija turkañäna',
+'tog-enotifminoredits'        => 'Nayaru chaski jalayiriña uñstawina sullka askiptawimpiraki',
+'tog-enotifrevealaddr'        => 'Yatiyawita chaski jalayirinakana chaski jalayirit untjäwija uñachayaña',
+'tog-shownumberswatching'     => "Qawqha apnaqirinaka uñch'ukiskar uñacht'ayaña",
+'tog-fancysig'                => "Mayaxta rixt'a (sipitarachayatawisa)",
+'tog-externaleditor'          => "Anqa askiptiri mirq'iriña (yatxiritakiwa, jasanchirina ajalla jamuqawi wakiskiriwa)",
+'tog-externaldiff'            => "Anqa ''diff''iri mirq'iriña (yatxiritakiwa, jasanchirina ajalla jamuqawi wakiskiriwa)",
+'tog-showjumplinks'           => 'Usutataki sipitata "khänaru thuqtaña" uñachayaña',
+'tog-uselivepreview'          => "Uñtawikach'ukix mirq'iña (''JavaScript'' munawiwa) (yant'awiwaki)",
+'tog-forceeditsummary'        => "Nayaru yatiyaña ukja ch'usa askiptawit juk'aptayawi apantaskaña",
+'tog-watchlisthideown'        => "Unch'ukit waruchatana askiptawijax imantaña",
+'tog-watchlisthidebots'       => "Unch'ukit waruchatana ''bot''ta askiptawipax imantaña",
+'tog-watchlisthideminor'      => "Unch'ukit waruchatana sullka askiptawix imantaña",
+'tog-watchlisthideliu'        => "Unch'ukit waruchatana qillqt'ayasita apnaqirina askiptawipax imantaña",
+'tog-watchlisthideanons'      => "Unch'ukit waruchatana sutiwisa apnaqirina askiptawipax imantaña",
+'tog-nolangconversion'        => "Yaqha aruptaxa jark'aña",
+'tog-ccmeonemails'            => 'Chaski jalayirija nayax yaqhar apayayäta qillqaqawix nayaru apayaña',
+'tog-diffonly'                => "Manqha ''diff''nakax uñstawit yati utjawi janiw uñachayaña",
+'tog-showhiddencats'          => 'Imantata patawix uñachayaña',
 
 'underline-always' => 'Wiñaya',
 'underline-never'  => 'Janipini',
@@ -92,7 +121,7 @@ $messages = array(
 'moredotdotdot' => 'Yapa...',
 'mypage'        => 'Uñstawija',
 'navigation'    => 'Wampuña',
-'and'           => '-mpi',
+'and'           => '&#32;-mpi',
 
 'errorpagetitle'    => 'Pantja',
 'help'              => 'Yanapaña',
@@ -135,6 +164,7 @@ $messages = array(
 
 'editsection'    => 'turkaña',
 'editold'        => 'turkaña',
+'editlink'       => 'trukaña',
 'showtoc'        => 'uñachayaña',
 'site-rss-feed'  => "$1 ''RSS'' jalsuri",
 'site-atom-feed' => "$1 ''Atom'' jalsuri",
@@ -158,12 +188,12 @@ $messages = array(
 'logout'             => 'Mistuña',
 'userlogout'         => 'Mistuña',
 'yourlanguage'       => 'Aru:',
-'email'              => "Aru jalayiri (''E-mail'')",
+'email'              => 'Chaski jalayiri',
 'loginlanguagelabel' => 'Aru: $1',
 
 # Edit pages
-'summary'  => 'Juk’aptayawi',
-'subject'  => 'Yatsuwi/titulu',
+'summary'  => 'Juk’aptayawi:',
+'subject'  => 'Yatsuwi/titulu:',
 'yourdiff' => 'Jalaqtatanaka',
 
 # Preferences page
@@ -179,12 +209,12 @@ $messages = array(
 
 'license' => 'Iyawsawi:',
 
-# Special:ImageList
-'imagelist_date'        => 'Uru jakhu',
-'imagelist_user'        => 'Apnaqiri',
-'imagelist_description' => 'Uñt’ayawi',
+# Special:ListFiles
+'listfiles_date'        => 'Uru jakhu',
+'listfiles_user'        => 'Apnaqiri',
+'listfiles_description' => 'Uñt’ayawi',
 
-# Image description page
+# File description page
 'filehist-user' => 'Apnaqiri',
 
 # Miscellaneous special pages
@@ -193,7 +223,6 @@ $messages = array(
 # Special:Log
 'specialloguserlabel'  => 'Apnaqiri:',
 'speciallogtitlelabel' => 'Titulu:',
-'log-search-submit'    => 'Saraña',
 
 # Special:ListUsers
 'listusers-submit' => 'Uñachayaña',
diff --git a/languages/messages/MessagesAz.php b/languages/messages/MessagesAz.php
index 795d6b6a..a38cf1f6 100644
--- a/languages/messages/MessagesAz.php
+++ b/languages/messages/MessagesAz.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author PrinceValiant
+ * @author Sysops of az.wikipedia.org (imported 2008-08-31)
  * @author לערי ריינה�רט
  */
 
@@ -17,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'İstifadəçi_müzakirəsi',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_müzakirəsi',
-	NS_IMAGE            => 'Şəkil',
-	NS_IMAGE_TALK       => 'Şəkil_müzakirəsi',
+	NS_FILE             => 'Şəkil',
+	NS_FILE_TALK        => 'Şəkil_müzakirəsi',
 	NS_MEDIAWIKI        => 'MediyaViki',
 	NS_MEDIAWIKI_TALK   => 'MediyaViki_müzakirəsi',
 	NS_TEMPLATE         => 'Åžablon',
@@ -71,8 +72,6 @@ $messages = array(
 'underline-never'   => 'Heç zaman',
 'underline-default' => 'Susmaya görə brouzer',
 
-'skinpreview' => '(Sınaq göstərişi)',
-
 # Dates
 'sunday'        => 'Bazar',
 'monday'        => 'Bazar ert�si',
@@ -148,7 +147,7 @@ $messages = array(
 'mytalk'         => 'Danişiqlarım',
 'anontalk'       => 'Bu IP-yə aid müzakirə',
 'navigation'     => 'Rəhbər',
-'and'            => 'vÉ™',
+'and'            => '&#32;vÉ™',
 
 'errorpagetitle'    => 'Xəta',
 'returnto'          => '$1 səhifəsinə qayıt.',
@@ -201,8 +200,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} haqqında',
 'aboutpage'            => 'Project:Ä°zah',
-'bugreports'           => "Xəta mə'ruzəsı",
-'bugreportspage'       => "Project:Xəta_mə'ruzəsı",
 'copyright'            => 'Bu məzmun $1 əhatəsindədir.',
 'copyrightpagename'    => '{{SITENAME}} müəllif',
 'copyrightpage'        => '{{ns:project}}:Müəllif',
@@ -261,7 +258,7 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => 'İstifadəçi çıxış',
-'logouttext'                 => "<strong>Sistemdən çıxdınız.</strong><br /> Vikipediyanı anonim olaraq istifadə etməyə davam edəbilər, və ya eyni yaxud başqa istifadəçi adı ilə yenidən daxil ola bilərsiniz. Diqqətinizə çatdırırıq ki, ön yaddaşı (browser cache) təmizləyənə qədər bə'zi səhifələr sistemdən çıxdığınız halda da göstərilə bilər.",
+'logouttext'                 => "'''Sistemdən çıxdınız.'''<br /> Vikipediyanı anonim olaraq istifadə etməyə davam edəbilər, və ya eyni yaxud başqa istifadəçi adı ilə yenidən daxil ola bilərsiniz. Diqqətinizə çatdırırıq ki, ön yaddaşı (browser cache) təmizləyənə qədər bə'zi səhifələr sistemdən çıxdığınız halda da göstərilə bilər.",
 'welcomecreation'            => '== $1, xoş gəlmişsiniz! == Hesabınız yaradıldı. {{SITENAME}} nizamlamalarını dəyişdirməyi unutmayın.',
 'loginpagetitle'             => 'İstifadəçi Giriş Səhifəsi',
 'yourname'                   => 'İstifadəçi adı',
@@ -310,6 +307,9 @@ Xahiş edirik, e-məktubu aldıqdan sonra yenidən daxil olasınız.',
 
 # Password reset dialog
 'resetpass_text' => '<!-- Şərhinizi bura daxil edin -->',
+'oldpassword'    => 'Köhne parol:',
+'newpassword'    => 'Yeni parol:',
+'retypenew'      => 'Yeni parolu təkrar yazın:',
 
 # Edit page toolbar
 'bold_sample'     => 'Qalın mətn',
@@ -332,8 +332,8 @@ Xahiş edirik, e-məktubu aldıqdan sonra yenidən daxil olasınız.',
 'hr_tip'          => 'Horizontal cizgi',
 
 # Edit pages
-'summary'                  => 'Qısa məzmun',
-'subject'                  => 'Mövzu/başlıq',
+'summary'                  => 'Qısa məzmun:',
+'subject'                  => 'Mövzu/başlıq:',
 'minoredit'                => 'Kiçik redaktə',
 'watchthis'                => 'Bu səhifəni izlə',
 'savearticle'              => 'Səhifəni qeyd et',
@@ -352,19 +352,19 @@ Xahiş edirik, e-məktubu aldıqdan sonra yenidən daxil olasınız.',
 'newarticletext'           => "Mövcud olmayan səhifəyə olan keçidi izlədiniz. Aşağıdakı sahəyə məzmununu yazaraq bu səhifəni '''siz''' yarada bilərsiniz. (əlavə məlumat üçün [[{{MediaWiki:Helppage}}|kömək səhifəsinə]] baxın). �gər bu səhifəyə səhvən gəlmisinizsə sadəcə olaraq brauzerin '''geri''' düyməsinə vurun.",
 'anontalkpagetext'         => "----<big>'''''Bu səhifə anonim istifadəçiyə aid müzakirə səhifəsidir. Bu mesaj IP ünvana göndərilmişdir və əgər bu mesajın sizə aid olmadığını düşünürsünüzsə [[Special:UserLogin|qeydiyyatdan keçin]]. Bu zaman sizə yalnız öz fəaliyyətlərinizə görə mesaj gələcəkdir.'''''</big>",
 'noarticletext'            => "Hal-hazırda bu səhifə boşdur. Başqa səhifələrdə [[Special:Search/{{PAGENAME}}|bu səhifənin adını axtara]] bilər və ya '''[{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} səhifəni siz redaktə edəbilərsiniz]'''.",
-'previewnote'              => '<strong>Bu yalnız sınaq göstərişidir; dəyişikliklər hal-hazırda qeyd edilmemişdir!</strong>',
-'session_fail_preview'     => '<strong>Üzr istəyirik! Sizin redaktəniz saxlanılmadı. Serverdə identifikasiyanızla bağlı problemlər yaranmışdır. Lütfən bir daha təkrar edin. Problem həll olunmazsa hesabınızdan çıxın və yenidən daxil olun.</strong>',
+'previewnote'              => "'''Bu yalnız sınaq göstərişidir; dəyişikliklər hal-hazırda qeyd edilmemişdir!'''",
+'session_fail_preview'     => "'''Üzr istəyirik! Sizin redaktəniz saxlanılmadı. Serverdə identifikasiyanızla bağlı problemlər yaranmışdır. Lütfən bir daha təkrar edin. Problem həll olunmazsa hesabınızdan çıxın və yenidən daxil olun.'''",
 'editing'                  => 'RedaktÉ™ $1',
 'editingsection'           => 'Redaktə $1 (bölmə)',
 'editingcomment'           => 'Redaktə $1 (şərh)',
 'editconflict'             => 'Eyni vaxtda redaktÉ™: $1',
 'yourtext'                 => 'Metniniz',
 'storedversion'            => 'Qeyd edilmiÅŸ versiya',
-'editingold'               => '<strong>DİQQ�T:Siz bu səhifənin köhnə versiyasını redaktə edirsiniz. Məqaləni yaddaşda saxlayacağınız halda bu versiyadan sonra edilmiş hər bir dəyişiklik itiriləcək.</strong>',
+'editingold'               => "'''DİQQ�T:Siz bu səhifənin köhnə versiyasını redaktə edirsiniz. Məqaləni yaddaşda saxlayacağınız halda bu versiyadan sonra edilmiş hər bir dəyişiklik itiriləcək.'''",
 'yourdiff'                 => 'Fərqlər',
-'longpagewarning'          => '<strong>DIQQ�T:Bu səhifənin həcmi $1 kb-dır; Həcmi 32 kb yaxın və ya daha artıq olan səhifələr bəzi brouzerlərdə redaktə ilə bağlı problemlər yarada bilər. Mümkünsə səhifəni daha kiçik bölmələrə bölün.</strong>',
+'longpagewarning'          => "'''DIQQ�T:Bu səhifənin həcmi $1 kb-dır; Həcmi 32 kb yaxın və ya daha artıq olan səhifələr bəzi brouzerlərdə redaktə ilə bağlı problemlər yarada bilər. Mümkünsə səhifəni daha kiçik bölmələrə bölün.'''",
 'semiprotectedpagewarning' => "'''Qeyd:''' Bu səhifə mühafizəli olduğu üçün yalnız qeydiyyatdan keçmiş istifadəçilər redaktə edə bilərlər.",
-'titleprotectedwarning'    => '<strong>DİQQ�T:  Bu səhifə mühafizəlidir, yalnız icazəsi olan istifadəçilər onu redaktə edə bilərlər.</strong>',
+'titleprotectedwarning'    => "'''DİQQ�T:  Bu səhifə mühafizəlidir, yalnız icazəsi olan istifadəçilər onu redaktə edə bilərlər.'''",
 'templatesused'            => 'Bu səhifədə istifadə edilmiş şablonlar:',
 'template-protected'       => '(mühafizə)',
 'template-semiprotected'   => '(yarım-mühafizə)',
@@ -375,9 +375,6 @@ Xahiş edirik, e-məktubu aldıqdan sonra yenidən daxil olasınız.',
 Bu səhifə üçün silmə qeydləri aşağıda göstərilmişdir:",
 
 # History pages
-'revnotfound'         => 'Versiya tapıla bilmir',
-'revnotfoundtext'     => 'Səhifənin istədiyiniz köhnə versiyası tapıla bilmir.
-Xahiş edirik, URL ünvanını yoxlayasınız.',
 'currentrev'          => 'Hal-hazırkı versiya',
 'revisionasof'        => '$1 versiyası',
 'previousrevision'    => '��vvəlki versiya',
@@ -416,6 +413,7 @@ Açıqlama: (hh) = hal-hazırkı versiya ilə olan fərqlər,
 'prevn'              => 'əvvəlki $1',
 'nextn'              => 'sonrakı $1',
 'viewprevnext'       => 'Göstər ($1) ($2) ($3).',
+'searchhelp-url'     => 'Help:Mündəricət',
 'nonefound'          => "'''Qeyd''': �ksərən uğursuz axtarışlara indeksləşdirilməyən, geniş işlənən \"var\", \"və\" tipli sözlər və ya axtarışa bir sözdən artıq söz verildikdə (yalnız məzmununda bütün verilmiş sözlər olan səhifələr göstərilir) səbəb olur.",
 'powersearch'        => 'Axtar',
 'powersearch-legend' => 'Təkmil axtarış',
@@ -426,6 +424,7 @@ Açıqlama: (hh) = hal-hazırkı versiya ilə olan fərqlər,
 'prefs-edits'           => 'Redaktələrin sayı:',
 'changepassword'        => 'Parol dəyiş',
 'skin'                  => 'Üzlük',
+'skin-preview'          => 'Sınaq göstərişi',
 'math'                  => 'Riyaziyyat',
 'dateformat'            => 'Tarix formatı',
 'datedefault'           => 'Tərcih yox',
@@ -441,9 +440,6 @@ Açıqlama: (hh) = hal-hazırkı versiya ilə olan fərqlər,
 'prefs-misc'            => 'Digər tərcihlər',
 'saveprefs'             => 'Qeyd et',
 'resetprefs'            => 'Reset',
-'oldpassword'           => 'Köhne parol:',
-'newpassword'           => 'Yeni parol:',
-'retypenew'             => 'Yeni parolu təkrar yazın:',
 'textboxsize'           => 'RedaktÉ™',
 'rows'                  => 'Sıralar:',
 'searchresultshead'     => 'Axtar',
@@ -469,7 +465,7 @@ Açıqlama: (hh) = hal-hazırkı versiya ilə olan fərqlər,
 'userrights-lookup-user'   => 'İstifadəçi qruplarını idarə et',
 'userrights-user-editname' => 'İstifadəçi adınızı yazın:',
 'editusergroup'            => 'Redaktə İstifadəçi Qrupları',
-'editinguser'              => "RedaktÉ™ '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "RedaktÉ™ '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'İstifadəçi qruplarını redaktə et',
 'saveusergroups'           => 'İstifadəçi qrupunu qeyd et',
 
@@ -543,7 +539,7 @@ Açıqlama: (hh) = hal-hazırkı versiya ilə olan fərqlər,
 'ignorewarning'     => 'Xəbərdarlıqlara əhəmiyyət vermə və faylı saxla',
 'badfilename'       => 'Faylın adı dəyişildi. Yeni adı: "$1".',
 'emptyfile'         => 'Yüklədiyiniz fayl boşdur. Bu faylın adında olan hərf səhvi ilə bağlı ola bilər. Xahiş olunur ki, doğurdan da bu faylı yükləmək istədiyinizi yoxlayasınız.',
-'fileexists'        => 'Sizin yükləmək istədiyiniz adda fayl artıq yüklənmişdir. Lütfən <strong><tt>$1</tt></strong> keçidini yoxlayın və bu faylı yükləmək istədiyinizdən əmin olun.',
+'fileexists'        => "Sizin yükləmək istədiyiniz adda fayl artıq yüklənmişdir. Lütfən '''<tt>$1</tt>''' keçidini yoxlayın və bu faylı yükləmək istədiyinizdən əmin olun.",
 'fileexists-thumb'  => "<center>'''Mövcud şəkil'''</center>",
 'successfulupload'  => 'Yükləmə tamamlandı',
 'uploadwarning'     => 'Yükləyiş xəbərdarlıqı',
@@ -560,13 +556,13 @@ Bu səhifə üçün silmə qeydləri aşağıda göstərilmişdir:",
 'license'   => 'Lisenziya',
 'nolicense' => 'Heç biri seçilməmişdir',
 
-# Special:ImageList
-'imagelist'      => 'Fayl siyahısı',
-'imagelist_date' => 'Tarix',
-'imagelist_name' => 'Ad',
-'imagelist_user' => 'İstifadəçi',
+# Special:ListFiles
+'listfiles'      => 'Fayl siyahısı',
+'listfiles_date' => 'Tarix',
+'listfiles_name' => 'Ad',
+'listfiles_user' => 'İstifadəçi',
 
-# Image description page
+# File description page
 'imagelinks'                     => 'İstifadə edilən səhifələr',
 'shareduploadwiki-linktext'      => 'fayl təsvir səhifəsi',
 'shareduploadduplicate-linktext' => 'baÅŸqa fayl',
@@ -608,19 +604,8 @@ Bu səhifə üçün silmə qeydləri aşağıda göstərilmişdir:",
 'randomredirect' => 'İxtiyari istiqamətləndirmə',
 
 # Statistics
-'statistics'    => 'Statistika',
-'sitestats'     => '{{SITENAME}} statistika',
-'userstats'     => 'İstifadəçi statistika',
-'sitestatstext' => "{{SITENAME}}-da hal-hazırda məqalələrin sayı: '''$2'''
-
-Verilənlər bazasında yekun '''$1''' səhifə var. Buna müzakirələr, istifadəçi səhifələri, köməklər, wikipedia lahiye səhifələri, xüsusi səhifələr, istiqamətləndirmə səhifələri, boş səhifələr ilə fayllar v əşablonlar daxildir.
-
-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.
-
-Hal-hazırda [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] sayı: '''$7'''.",
-'userstatstext' => "Hal-hazırdakı '''$1''' istifadəçidən '''$2''' (və ya '''4%''') nəfər $5dir",
+'statistics'              => 'Statistika',
+'statistics-header-users' => 'İstifadəçi statistika',
 
 'disambiguations'      => 'Dəqiqləşdirmə səhifələri',
 'disambiguationspage'  => 'Şablon:dəqiqləşdirmə',
@@ -755,12 +740,6 @@ Səhifəni izləmə sıyahınızdan çıxarmaq üçün yan lovhədəki "izləmə
 'watchlistcontains'    => 'İzləmə siyahınızda $1 səhifə var.',
 'wlnote'               => "Aşağıdakılar son '''$2''' saatdakı son $1 dəyişiklikdir.",
 'wlshowlast'           => 'Bunları göstər: son $1 saatı $2 günü $3',
-'watchlist-show-bots'  => 'Bot redaktələrini göstər',
-'watchlist-hide-bots'  => 'Bot redaktələrini gizlət',
-'watchlist-show-own'   => 'Mənim redaktələrimi göstər',
-'watchlist-hide-own'   => 'Mənim redaktələrimi gizlət',
-'watchlist-show-minor' => 'Kiçik redaktələri göstər',
-'watchlist-hide-minor' => 'Kiçik redaktələri gizlət',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'İzlənilir...',
@@ -771,58 +750,64 @@ Səhifəni izləmə sıyahınızdan çıxarmaq üçün yan lovhədəki "izləmə
 'changed'            => 'dəyişdi',
 'created'            => 'yaradıldı',
 
-# Delete/protect/revert
-'deletepage'                  => 'Səhifəni sil',
-'confirm'                     => 'Təsdiq et',
-'excontent'                   => "Köhnə məzmun: '$1'",
-'excontentauthor'             => "Tərkib: '$1' (və tarixçədə fəaliyyəti qeyd edilən yeganə istifadəçi '[[Xüsusi:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Silinmədən əvvəlki məzmun: '$1'",
-'exblank'                     => 'səhifə boş',
-'delete-confirm'              => 'Silinən səhifə: "$1"',
-'historywarning'              => 'Xəbərdarlıq: Silinəcək səhifənin tarixçəsində qeyd olunmuş redaktələr var',
-'confirmdeletetext'           => 'Bu səhifə və ya fayl bütün tarixçəsi ilə birlikdə birdəfəlik silinəcək. Bunu nəzərdə tutduğunuzu və bu əməliyyatın nəticələrini başa düşdüyünüzü təsdiq edin.',
-'actioncomplete'              => 'Fəaliyyət tamamlandı',
-'deletedarticle'              => 'silindi "[[$1]]"',
-'dellogpage'                  => 'Silmə qeydləri',
-'dellogpagetext'              => '�n son silinmiş səhifələrin siyahısı.',
-'deletionlog'                 => 'Silmə jurnal qeydləri',
-'reverted'                    => 'Daha əvvəlki versiya bərpa edildi',
-'deletecomment'               => 'Silmə səbəbi',
-'deleteotherreason'           => 'Digər/əlavə səbəb:',
-'deletereasonotherlist'       => 'Digər səbəb',
-'deletereason-dropdown'       => '*�sas silmə səbəbi
+# Delete
+'deletepage'             => 'Səhifəni sil',
+'confirm'                => 'Təsdiq et',
+'excontent'              => "Köhnə məzmun: '$1'",
+'excontentauthor'        => "Tərkib: '$1' (və tarixçədə fəaliyyəti qeyd edilən yeganə istifadəçi '[[Xüsusi:Contributions/$2|$2]]')",
+'exbeforeblank'          => "Silinmədən əvvəlki məzmun: '$1'",
+'exblank'                => 'səhifə boş',
+'delete-confirm'         => 'Silinən səhifə: "$1"',
+'historywarning'         => 'Xəbərdarlıq: Silinəcək səhifənin tarixçəsində qeyd olunmuş redaktələr var',
+'confirmdeletetext'      => 'Bu səhifə və ya fayl bütün tarixçəsi ilə birlikdə birdəfəlik silinəcək. Bunu nəzərdə tutduğunuzu və bu əməliyyatın nəticələrini başa düşdüyünüzü təsdiq edin.',
+'actioncomplete'         => 'Fəaliyyət tamamlandı',
+'deletedarticle'         => 'silindi "[[$1]]"',
+'dellogpage'             => 'Silmə qeydləri',
+'dellogpagetext'         => '�n son silinmiş səhifələrin siyahısı.',
+'deletionlog'            => 'Silmə jurnal qeydləri',
+'reverted'               => 'Daha əvvəlki versiya bərpa edildi',
+'deletecomment'          => 'Silmə səbəbi',
+'deleteotherreason'      => 'Digər/əlavə səbəb:',
+'deletereasonotherlist'  => 'Digər səbəb',
+'deletereason-dropdown'  => '*�sas silmə səbəbi
 ** Müəllif istəyi
 ** Müəllif hüququ pozuntusu
 ** Vandalizm',
-'delete-edit-reasonlist'      => 'Silmə səbəblərinin redaktəsi',
-'rollback'                    => '�vvəlki versiya',
-'rollbacklink'                => 'əvvəlki halına qaytar',
-'cantrollback'                => 'Redaktə geri qaytarıla bilməz; axırıncı redaktə səhifədə olan yeganə fəaliyyətdir.',
-'revertpage'                  => '[[User:$2|$2]] tərəfindən edilmiş redaktələr geri qaytarılaraq [[User:$1|$1]] tərəfindən yaradılan sonuncu versiya bərpa olundu.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 tərəfindən edilmiş redaktələr geri qaytarıldı; $2 tərəfindən yaradılmış son versiya bərpa olundu.',
+'delete-edit-reasonlist' => 'Silmə səbəblərinin redaktəsi',
+
+# Rollback
+'rollback'         => '�vvəlki versiya',
+'rollbacklink'     => 'əvvəlki halına qaytar',
+'cantrollback'     => 'Redaktə geri qaytarıla bilməz; axırıncı redaktə səhifədə olan yeganə fəaliyyətdir.',
+'revertpage'       => '[[User:$2|$2]] tərəfindən edilmiş redaktələr geri qaytarılaraq [[User:$1|$1]] tərəfindən yaradılan sonuncu versiya bərpa olundu.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 tərəfindən edilmiş redaktələr geri qaytarıldı; $2 tərəfindən yaradılmış son versiya bərpa olundu.',
+
+# Protect
 'protectlogpage'              => 'Mühafizə etmə qeydləri',
 'protectedarticle'            => 'mühafizə edildi "[[$1]]"',
 'modifiedarticleprotection'   => '"[[$1]]" səhifəsi üçün qorunma səviyyəsi dəyişildi',
 'unprotectedarticle'          => 'mühafizə kənarlaşdırdı "[[$1]]"',
 'protect-title'               => '"$1" üçün mühafizə səviyyəsinin dəyişdirilməsi',
+'prot_1movedto2'              => '[[$1]] adı dəyişildi. Yeni adı: [[$2]]',
 'protect-legend'              => 'Qorumayı təsdiq et',
 'protectcomment'              => 'Şərh:',
 'protectexpiry'               => 'Vaxtı bitib',
 'protect_expiry_invalid'      => 'Bitmə vaxtı qüvvəsini itirmişdir',
 'protect_expiry_old'          => 'Bitmə vaxtı keçmişdir.',
-'protect-text'                => 'Siz <strong><nowiki>$1</nowiki></strong> səhifəsinin mühafizə səviyyəsini görə və dəyişə bilərsiniz.',
-'protect-locked-blocked'      => 'Səhifənin bloklu olduğu müddətdə siz mühafizə səviyyəsini dəyişə bilməzsiniz.
-<strong>$1</strong> səhifəsində hal-hazırda edə biləcəyiniz əməliyyatlar bunlardır:',
-'protect-locked-dblock'       => 'Verilənlər bazası kilidli olduğu üçün mühafizə səviyyəsi dəyişilə bilməz.
-<strong>$1</strong> səhifəsində hal-hazırda edə biləcəyiniz əməliyyatlar bunlardır:',
-'protect-locked-access'       => 'Sizin hesabınızın mühafizə səviyyəsini dəyişməyə ixtiyarı yoxdur.
-<strong>$1</strong> səhifəsində hal-hazırda edə biləcəyiniz əməliyyatlar bunlardır:',
+'protect-text'                => "Siz '''<nowiki>$1</nowiki>''' səhifəsinin mühafizə səviyyəsini görə və dəyişə bilərsiniz.",
+'protect-locked-blocked'      => "Səhifənin bloklu olduğu müddətdə siz mühafizə səviyyəsini dəyişə bilməzsiniz.
+'''$1''' səhifəsində hal-hazırda edə biləcəyiniz əməliyyatlar bunlardır:",
+'protect-locked-dblock'       => "Verilənlər bazası kilidli olduğu üçün mühafizə səviyyəsi dəyişilə bilməz.
+'''$1''' səhifəsində hal-hazırda edə biləcəyiniz əməliyyatlar bunlardır:",
+'protect-locked-access'       => "Sizin hesabınızın mühafizə səviyyəsini dəyişməyə ixtiyarı yoxdur.
+'''$1''' səhifəsində hal-hazırda edə biləcəyiniz əməliyyatlar bunlardır:",
 'protect-cascadeon'           => 'Bu səhifə mühafizəlidir, çünki bu səhifə {{PLURAL:$1|başqa bir|başqa bir}} səhifədən kaskad mühafizə edilmişdir. Siz bu səhifənin mühafizə səviyyəsini dəyişdirə bilərsiniz, bu kaskad mühafizəyə təsir etməyəcək.',
 'protect-level-autoconfirmed' => 'Anonim istifadəçiləri blokla',
 'protect-level-sysop'         => 'Yalnız idarəçilər',
 'protect-summary-cascade'     => 'kaskad mühafizə',
 'protect-expiring'            => '$1 (UTC)- tarixində vaxtı bitir',
 'protect-cascade'             => 'Kaskad mühafizəsi - bu səhifəyə daxil bütün səhifələri qoru',
+'protect-expiry-options'      => '15 dəqiqə:15 minutes,1 saat:1 hour,3 saat:3 hours,24 saat:24 hours,48 saat:48 hours,1 həftə:1 week,1 ay:1 month,qeyri-müəyyən:indefinite', # display1:time1,display2:time2,...
 'pagesize'                    => '(baytlar)',
 
 # Restrictions (nouns)
@@ -868,7 +853,6 @@ Məqalələrin bərpa edilməsi və silinməsi haqqında son dəyişiklikləri n
 
 # What links here
 'whatlinkshere'       => 'Bu səhifəyə bağlantılar',
-'linklistsub'         => '(Bağlantılar siyahı)',
 'isredirect'          => 'İstiqamətləndirmə səhifəsi',
 'istemplate'          => 'daxil olmuÅŸ',
 'whatlinkshere-prev'  => '{{PLURAL:$1|əvvəlki|əvvəlki $1}}',
@@ -1034,7 +1018,7 @@ $1',
 'file-info-size' => '($1 × $2 piksel, fayl həcmi: $3, MIME növü: $4)',
 'file-nohires'   => '<small>Daha dəqiq versiyası yoxdur.</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'    => 'Yeni faylların siyahısı',
 'showhidebots' => '($1 bot redaktÉ™)',
 'ilsubmit'     => 'Axtar',
@@ -1076,9 +1060,7 @@ $1',
 'deletedwhileediting' => 'Bu səhifə siz redaktə etməyə başladıqdan sonra silinmişdir!',
 
 # action=purge
-'confirm_purge' => 'Bu səhifə keşdən (cache) silinsin?
-
-$1',
+'confirm-purge-top' => 'Bu səhifə keşdən (cache) silinsin?',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; əvvəlki səhifə',
diff --git a/languages/messages/MessagesBa.php b/languages/messages/MessagesBa.php
index 8356e90c..20caf94d 100644
--- a/languages/messages/MessagesBa.php
+++ b/languages/messages/MessagesBa.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Ҡатнашыу�ы_м-н_фекер_алышыу', 
 	#NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_б-�а_фекер_алышыу',
-	NS_IMAGE            => 'Рә�ем',
-	NS_IMAGE_TALK       => 'Рә�ем_б-�а_фекер_алышыу',
+	NS_FILE             => 'Рә�ем',
+	NS_FILE_TALK        => 'Рә�ем_б-�а_фекер_алышыу',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_б-�а_фекер_алышыу',
 	NS_TEMPLATE         => 'Ҡалып',
@@ -106,7 +106,7 @@ $messages = array(
 'mypage'         => 'Шәх�и бит',
 'mytalk'         => 'Минең менән фекер алышыу',
 'navigation'     => 'Төп йүнәлештәр',
-'and'            => 'һәм',
+'and'            => '&#32;һәм',
 
 'errorpagetitle'   => 'Хата',
 'returnto'         => '$1 битенә ҡайтыу.',
@@ -195,14 +195,14 @@ $messages = array(
 'mailmypassword'          => 'Яңы пароль ебәрергә',
 
 # Edit pages
-'summary'        => 'Үҙгәртеүҙең ҡыҫҡа�а та�уирламаһы',
+'summary'        => 'Үҙгәртеүҙең ҡыҫҡа�а та�уирламаһы:',
 'minoredit'      => 'Әҙ генә үҙгәрештәр',
 'watchthis'      => 'Был битте күҙәтеүҙәр и�емлегенә индерергә',
 'savearticle'    => 'Яҙҙырып ҡуйырға',
 'preview'        => 'Ҡарап �ығыу',
 'showpreview'    => 'Ҡарап �ығырға',
 'showdiff'       => 'Индерелгән үҙгәрештәр',
-'previewnote'    => '<strong>Ҡарап �ығыу өлгөһө, әлегә үҙгәрештәр �ҙҙырылмаған!</strong>',
+'previewnote'    => "'''Ҡарап �ығыу өлгөһө, әлегә үҙгәрештәр �ҙҙырылмаған!'''",
 'editing'        => 'Мөхәрирләү  $1',
 'editingsection' => 'Мөхәрирләү  $1 (�екци�)',
 'editingcomment' => 'Мөхәрирләү $1 (комментарий)',
@@ -213,7 +213,7 @@ $messages = array(
 'preferences' => 'Көйләүҙәр',
 
 # User rights
-'editinguser' => "Мөхәрирләү  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser' => "Мөхәрирләү  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 
 # Groups
 'group-all' => '(бөтә)',
@@ -225,8 +225,8 @@ $messages = array(
 # Recent changes linked
 'recentchangeslinked' => 'Бәйле үҙгәртеүҙәр',
 
-# Special:ImageList
-'imagelist_user' => 'Ҡатнашыу�ы',
+# Special:ListFiles
+'listfiles_user' => 'Ҡатнашыу�ы',
 
 # MIME search
 'mimesearch' => 'MIME буйын�а �ҙләү',
@@ -237,9 +237,6 @@ $messages = array(
 # Random page
 'randompage' => 'О�раҡлы мәҡәлә',
 
-# Statistics
-'userstatstext' => "Бөтәһе '''$1''' ҡатнашыу�ы теркәлгән, шуларҙан '''$2''' ($4 %) хәким буры�тарын үтәй.",
-
 # Miscellaneous special pages
 'listusers'         => 'Ҡатнашыу�ылар и�емлеге',
 'newpages-username' => 'Ҡатнашыу�ы:',
@@ -260,6 +257,9 @@ $messages = array(
 'allpagesnext'      => 'Киләһе',
 'allpagessubmit'    => 'Үтәргә',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Ҡулланыу�ыларҙың юйылған өлөшө',
+
 # E-mail user
 'emailuser'    => 'Ҡатнашыу�ыға хат',
 'emailfrom'    => 'Кемдән',
@@ -278,7 +278,7 @@ $messages = array(
 'enotif_newpagetext' => 'Был �ңы бит.',
 'changed'            => 'үҙгәртелгән',
 
-# Delete/protect/revert
+# Delete
 'actioncomplete' => 'Ғәмәл үтәлде',
 
 # Namespace form on various pages
diff --git a/languages/messages/MessagesBar.php b/languages/messages/MessagesBar.php
index 04402330..0a91e243 100644
--- a/languages/messages/MessagesBar.php
+++ b/languages/messages/MessagesBar.php
@@ -5,29 +5,100 @@
  * @file
  *
  * @author Malafaya
+ * @author Man77
+ * @author Metalhead64
  */
 
 $fallback = 'de';
 
 $messages = array(
-'about'    => 'Ãœba',
-'mypage'   => 'Eigne Seitn',
-'mytalk'   => 'Eigne Diskussion',
-'anontalk' => 'Diskussionsseitn vo dera IP',
-
+# User preference toggles
+'tog-watchcreations' => 'Vu mia söiwa nei eigstöide Seitn automatisch beobåchtn',
+'tog-watchdefault'   => 'Vu mia söiwa beåabeitete und vu mia nei eigstöide Seitn automatisch beobåchtn',
+'tog-watchmoves'     => 'Vu mia söiwa vaschomne Seitn automatisch beobåchtn',
+'tog-watchdeletion'  => 'Vu mia söiwa glöschte Seitn automatisch beobåchtn',
+'tog-minordefault'   => 'De eigenen Ändarungen standardmäßig åis geringfügig markian',
+'tog-fancysig'       => 'Signatua ohne Valinkung zu da Benutzaseitn',
+'tog-showhiddencats' => 'Vasteckte Kategorien ãnzoang',
+
+'underline-always' => 'imma',
+'underline-never'  => 'nia',
+
+# Dates
+'sat'       => 'Sa',
+'january'   => 'Jänna',
+'april'     => 'Aprüi',
+'may_long'  => 'Mai',
+'june'      => 'Juni',
+'july'      => 'Juli',
+'august'    => 'August',
+'september' => 'Septemba',
+'october'   => 'Oktowa',
+'november'  => 'Novemba',
+'december'  => 'Dezemba',
+
+# Categories related messages
+'pagecategories'                 => '{{PLURAL:$1|Kategorie|Kategorien}}',
+'category_header'                => 'Seitn in da Kategorie „$1“',
+'subcategories'                  => 'Untakategorien',
+'category-media-header'          => 'Medien in da Kategorie „$1“',
+'category-empty'                 => "''De Kategorie enthåit momentan kane Seitn und kane Medien ned.''",
+'hidden-categories'              => '{{PLURAL:$1|Vasteckte Kategorie|Vasteckte Kategorien}}',
+'hidden-category-category'       => 'Vasteckte Kategorie', # Name of the category where hidden categories will be listed
+'category-subcat-count'          => "{{PLURAL:$2|De Kategorie enthåit netta de foignde Untakategorie:|{{PLURAL:$1|D'foignde Untakategorie is ane vu insgsamt $2 Untakategorien in dea Kategorie:|Vu insgsamt $2 Untakategorien in dea Kategorie wean $1 ãzoagt:}}}}",
+'category-subcat-count-limited'  => 'In de Kategorie {{PLURAL:$1|is de foignde Untakategorie|san de foigndn Untakategorien}} eisoatiad:',
+'category-article-count-limited' => 'De {{PLURAL:$1|foignde Seitn is|foigndn $1 Seitn san}} in dea Kategorie enthåitn:',
+'category-file-count-limited'    => "{{PLURAL:$1|D'foignde Datei is|De foigndn $1 Datein san}} in de Kategorie eisoatiad:",
+
+'mainpagetext' => 'MediaWiki is eafoigreich installiad woan.',
+
+'about'          => 'Ãœba',
+'newwindow'      => '(wiad in am neichn Fensta aufgmåcht)',
+'cancel'         => 'Ã…bbrecha',
+'qbmyoptions'    => 'Meine Seitn',
+'qbspecialpages' => 'Spezialseitn',
+'mypage'         => 'Eigne Seitn',
+'mytalk'         => 'Eigne Diskussion',
+'anontalk'       => 'Diskussionsseitn vo dera IP',
+'and'            => '&#32;und',
+
+'tagline'           => 'Aus {{SITENAME}}',
+'history'           => 'Versionen',
+'updatedmarker'     => '(gändat)',
+'printableversion'  => 'Version zum Ausdruckn',
 'edit'              => 'werkln',
+'create'            => 'Erstöin',
+'editthispage'      => 'Seitn beårbeitn',
+'create-this-page'  => 'Seitn eastöin',
 'delete'            => 'löschn',
+'deletethispage'    => 'De Seitn löschn',
+'undelete_short'    => '{{PLURAL:$1|1 Version|$1 Versionen}} wiedaheastöin',
+'protect'           => 'Schützn',
+'protect_change'    => 'ändan',
+'protectthispage'   => 'Seitn schützn',
 'unprotect'         => 'freigem',
 'unprotectthispage' => 'Schutz aufhem',
+'newpage'           => 'Neiche Seitn',
+'talkpagelinktext'  => 'bschprecha',
 'talk'              => 'bschprecha',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ãœba {{SITENAME}}',
 'aboutpage'            => 'Project:Ãœba_{{SITENAME}}',
+'disclaimers'          => 'Impressum',
 'mainpage'             => 'Hauptsaitn',
 'mainpage-description' => 'Hauptsaitn',
+'privacy'              => 'Datnschutz',
 
+'ok'                      => 'haut hi',
+'retrievedfrom'           => 'Vu „$1“',
 'youhavenewmessagesmulti' => 'Sie ham neie Nachrichten: $1',
+'editsection'             => 'werkln',
+'red-link-title'          => "$1 (de Seitn gibt's ned)",
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-special' => 'Spezialseitn',
+'nstab-image'   => 'Datei',
 
 # General errors
 'filedeleteerror' => 'De Datei „$1“ håt net glöscht wern kinna.',
@@ -40,12 +111,13 @@ $messages = array(
 'yourlanguage'               => 'Sprache vo da Benutzeroberfläche:',
 'wrongpassword'              => "Des Passwort is falsch (oda fehlt). Bitte probier's no amoi.",
 'wrongpasswordempty'         => 'Des eigemne Passwort is laar gwen. Bitte no amoi probiern.',
-'acct_creation_throttle_hit' => 'Du hosst scho $1 Benutzakonten und kinnan iatzat koane mehr oleng.',
+'acct_creation_throttle_hit' => 'Du hosst scho $1 {{PLURAL:$1|Benutzakonto|Benutzakonten}} und konnst iatzat koane mehr oleng.',
 'accountcreated'             => 'Benutzerkonto is erstellt worn',
 'accountcreatedtext'         => "'s Benutzerkonto $1 is eigricht worn.",
 
 # Edit pages
 'watchthis'          => 'De Seitn beobachtn',
+'showdiff'           => 'Ändarungen zoang',
 'whitelistedittitle' => 'Zum Bearbatn miaßn Sie si oomeidn',
 'whitelistedittext'  => 'Sie miaßn si $1, um Seiten bearbatn zum kinna.',
 'accmailtitle'       => 'Passwort is vaschickt worn',
@@ -53,14 +125,43 @@ $messages = array(
 'yourtext'           => 'Eana Text',
 
 # History pages
-'histlast' => 'Neiste',
+'histlast'     => 'Neiste',
+'historyempty' => '(laa)',
+
+# Revision deletion
+'rev-delundel' => 'zoang/vastecka',
+
+# Merge log
+'revertmerge'      => 'Vareinigung zrucknehma',
+'mergelogpagetext' => "Des is s'Logbuach vu de vareinigtn Versionsgschichtn.",
+
+# Diffs
+'history-title' => 'Versionsgschicht vu „$1“',
+'editundo'      => 'rückgängig',
+
+# Search results
+'searchresults-title'   => 'Eagebnisse vu da Suach nåch „$1“',
+'searchresulttext'      => "Fia weidare Infos üwa's Suacha schau auf'd [[{{MediaWiki:Helppage}}|Hüifeseitn]].",
+'searchsubtitle'        => 'Dei Suachãnfråg: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|ålle Seitn, de mid „$1“ ãnfãngan]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|ålle Seitn, de wås nåch „$1“ valinkn]])',
+'searchsubtitleinvalid' => 'Dei Suachãnfråg: „$1“.',
+'noexactmatch'          => "'''Es gibt ka Seitn mi'm Titl „$1“.'''
+Wãnn'st di mid dem Thema auskennst, kãnnst [[:$1|de Seitn söiwa schreim]].",
+'search-result-size'    => '$1 ({{PLURAL:$2|1 Woat|$2 Wöata}})',
+'powersearch-redir'     => 'Weidaleitungen ãnzoang',
 
 # Preferences page
 'mypreferences' => 'Eistellunga',
 
+# Recent changes
+'minoreditletter' => 'K',
+
 # Upload
+'upload'          => 'Aufelådn',
 'watchthisupload' => 'De Seitn beobachtn',
 
+# File description page
+'filehist-datetime' => 'Version vum',
+
 # Miscellaneous special pages
 'newpages'     => 'Neie Seitn',
 'ancientpages' => 'Scho länger nimma bearbate Artikel',
@@ -82,8 +183,23 @@ $messages = array(
 'mywatchlist'       => 'Beobachtungslistn',
 'watchlistanontext' => 'Sie miaßn si $1, um Eanane Beobachtungslistn zum seng oda Einträge auf ihr zum bearbatn.',
 'watchnologin'      => 'Sie san net ogmeidt',
+'watch'             => 'Beobåchtn',
 'watchthispage'     => 'Seitn beobachtn',
 'unwatch'           => 'nimma beobachten',
+'unwatchthispage'   => 'Nimma beobåchtn',
+
+# Displayed when you click the "watch" button and it is in the process of watching
+'watching' => 'Beobåchtn …',
+
+# Delete
+'deletedarticle' => 'håd „[[$1]]“ glöscht',
+
+# Protect
+'prot_1movedto2' => 'håt [[$1]] nåch [[$2]] verschom',
+
+# Namespace form on various pages
+'namespace'      => 'Nãmensraum:',
+'blanknamespace' => '(Seitn)',
 
 # Contributions
 'contributions' => 'Benutzerbeiträg',
@@ -92,20 +208,35 @@ $messages = array(
 # What links here
 'whatlinkshere' => 'Links auf de Seitn',
 
+# Block/unblock
+'blocklink'    => 'sperrn',
+'unblocklink'  => 'freigem',
+'contribslink' => 'Beiträge',
+
 # Move page
 'move-page-legend' => 'Seitn vaschiam',
 'move-watch'       => 'De Seitn beobachten',
 '1movedto2'        => 'håt [[$1]] nåch [[$2]] verschom',
 '1movedto2_redir'  => 'håt [[$1]] nåch [[$2]] verschom und dabei a Weiterleitung überschriem',
+'revertmove'       => 'zruck vaschiam',
+'delete_and_move'  => 'Löschn und vaschiam',
 
 # Namespace 8 related
 'allmessagesname'     => 'Nam',
 'allmessagescurrent'  => 'Aktuella Text',
 'allmessagestext'     => 'Des is a Listn vo de MediaWiki-Systemtexte.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesmodified' => 'Nur geänderte zoagn',
 
-# Special:NewImages
+# Tooltip help for the actions
+'tooltip-ca-move'    => 'De Seitn vaschiam',
+'tooltip-n-mainpage' => "d'Hauptseitn ãnzoang",
+'tooltip-t-upload'   => 'Datein aufelådn',
+
+# Special:NewFiles
 'newimages' => 'Neie Dateien',
 
+# 'all' in various places, this might be different for inflected languages
+'namespacesall' => 'Ã¥lle',
+
 );
diff --git a/languages/messages/MessagesBat_smg.php b/languages/messages/MessagesBat_smg.php
index 65770226..8be54be3 100644
--- a/languages/messages/MessagesBat_smg.php
+++ b/languages/messages/MessagesBat_smg.php
@@ -13,16 +13,14 @@
 $fallback = 'lt';
 
 $namespaceNames = array(
-//	NS_MEDIA            => '',
+	NS_MEDIA            => 'MedÄ—jÄ—',
 	NS_SPECIAL          => 'Specēlos',
-	NS_MAIN             => '',
 	NS_TALK             => 'AptarÄ—ms',
 	NS_USER             => 'Nauduotuos',
 	NS_USER_TALK        => 'NauduotuojÄ—_aptarÄ—ms',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_aptarÄ—ms',
-	NS_IMAGE            => 'Abruozdielis',
-	NS_IMAGE_TALK       => 'AbruozdielÄ—_aptarÄ—ms',
+	NS_FILE             => 'Abruozdielis',
+	NS_FILE_TALK        => 'AbruozdielÄ—_aptarÄ—ms',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_aptarÄ—ms',
 	NS_TEMPLATE         => 'Å abluons',
@@ -30,7 +28,7 @@ $namespaceNames = array(
 	NS_HELP             => 'Pagelba',
 	NS_HELP_TALK        => 'Pagelbas_aptarÄ—ms',
 	NS_CATEGORY         => 'KateguorÄ—jÄ—',
-	NS_CATEGORY_TALK    => 'KateguorÄ—jÄ—s_aptarÄ—ms'
+	NS_CATEGORY_TALK    => 'KateguorÄ—jÄ—s_aptarÄ—ms',
 );
 
 /**
@@ -43,8 +41,8 @@ $namespaceAliases = array(
 	'Naudotojas'            => NS_USER,
 	'Naudotojo_aptarimas'   => NS_USER_TALK,
 	'$1_aptarimas'          => NS_PROJECT_TALK,
-	'Vaizdas'               => NS_IMAGE,
-	'Vaizdo_aptarimas'      => NS_IMAGE_TALK,
+	'Vaizdas'               => NS_FILE,
+	'Vaizdo_aptarimas'      => NS_FILE_TALK,
 	'MediaWiki_aptarimas'   => NS_MEDIAWIKI_TALK,
 	'Å ablonas'              => NS_TEMPLATE,
 	'Å ablono_aptarimas'     => NS_TEMPLATE_TALK,
@@ -92,6 +90,7 @@ $messages = array(
 'tog-watchlisthideown'        => 'Kavuotė mona pakeitėmos keravuojamu sarašė',
 'tog-watchlisthidebots'       => 'Kavuotė robotu pakeitėmos keravuojamu s�rašė',
 'tog-watchlisthideminor'      => 'Kavuotė mažos pakeitėmos keravuojamu sarašė',
+'tog-watchlisthideliu'        => 'Kavuotė prisėjongosium nauduotuojum keitėmus keravuojamu s�rošė',
 'tog-nolangconversion'        => 'Ä–Å¡jongtÄ— variantu keitÄ—ma',
 'tog-ccmeonemails'            => 'Si�stė mon gromatu kopėjės, katros siontiu kėtėims nauduotojams',
 'tog-diffonly'                => 'Neruodītė poslapė torėnė puo skėrtom�s',
@@ -101,8 +100,6 @@ $messages = array(
 'underline-never'   => 'Nikumet',
 'underline-default' => 'Palē naršīklės nostatīmos',
 
-'skinpreview' => '(Parveiza)',
-
 # Dates
 'sunday'        => 'sekma dÄ—ina',
 'monday'        => 'pÄ—rmadÄ—inis',
@@ -163,6 +160,8 @@ $messages = array(
 'category-empty'           => "''Šėta kateguorėjė nūn� netor nė vėina straipsnė a faila.''",
 'hidden-categories'        => '{{PLURAL:$1|Pakavuota kateguorÄ—jÄ—|Pakavuotas kateguorÄ—jÄ—s}}',
 'hidden-category-category' => 'Pakavuotas kateguorÄ—jÄ—s', # Name of the category where hidden categories will be listed
+'category-subcat-count'    => '{{PLURAL:$2|Tuo kateguorÄ—juo Ä«r vÄ—ina subkateguorÄ—jÄ—.|{{PLURAL:$1|Ruodoma|Ruodomas|Ruodoma}} $1 {{PLURAL:$1|subkateguorÄ—jÄ—|subkateguorÄ—jÄ—s|subkateguorÄ—ju}} (Ä—Å¡ vÄ—sa Ä«r $2 {{PLURAL:$2|subkateguorÄ—jÄ—|subkateguorÄ—jÄ—s|subkateguorÄ—ju}}).}}',
+'category-article-count'   => '{{PLURAL:$2|Tuo kateguorėjuo īr vėins poslapis.|{{PLURAL:$1|Ruodoms|Ruodomė|Ruodoma}} $1 tuos kateguorėjės {{PLURAL:$1|poslapis|poslapē|poslapiu}} (ėš vėsa kateguorėjuo īr $2 {{PLURAL:$2|poslapis|poslapē|poslapiu}}).}}',
 'listingcontinuesabbrev'   => 'tes.',
 
 'about'          => 'Aple',
@@ -181,7 +180,7 @@ $messages = array(
 'mytalk'         => 'Mona aptarÄ—ms',
 'anontalk'       => 'Å Ä—ta IP aptarÄ—ms',
 'navigation'     => 'NavigacÄ—jÄ—',
-'and'            => 'Ä—r',
+'and'            => '&#32;Ä—r',
 
 # Metadata in edit box
 'metadata_help' => 'Metadoumenīs:',
@@ -208,7 +207,7 @@ $messages = array(
 'delete'            => 'TrintÄ—',
 'deletethispage'    => 'TrintÄ— ton poslapÄ—',
 'protect'           => 'Ožrakintė',
-'protect_change'    => 'pakeistÄ— apsauga',
+'protect_change'    => 'pakeistÄ—',
 'protectthispage'   => 'Ožrakintė šėta poslapi',
 'unprotect'         => 'AtrakÄ—ntÄ—',
 'unprotectthispage' => 'AtrakÄ—ntÄ— Å¡Ä—ta poslapi',
@@ -242,8 +241,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Aple {{SITENAME}}',
 'aboutpage'            => 'Project:Aple',
-'bugreports'           => 'Praneštė aple klaida',
-'bugreportspage'       => 'Project:Klaidū pranešėm�',
 'copyright'            => 'Turinīs pateikts so $1 licencėjė.',
 'copyrightpagename'    => '{{SITENAME}} autorÄ—nÄ—s teisÄ—s',
 'copyrightpage'        => '{{ns:project}}:Autuoriu teisÄ—s',
@@ -276,6 +273,8 @@ $messages = array(
 'editsection'             => 'taisītė',
 'editold'                 => 'taisītė',
 'viewsourceold'           => 'veizietÄ— Å¡altÄ—ni',
+'editlink'                => 'keistÄ—',
+'viewsourcelink'          => 'veizietÄ— kuoda',
 'editsectionhint'         => 'RedagoutÄ— skirsneli: $1',
 'toc'                     => 'Torėnīs',
 'showtoc'                 => 'ruodītė',
@@ -287,13 +286,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Å¡altÄ—nis',
 'page-rss-feed'           => '„$1“ RSS šaltėnis',
 'page-atom-feed'          => '„$1“ Atom šaltėnis',
-'red-link-title'          => '$1 (da neparašīts)',
+'red-link-title'          => '$1 (poslapis da neparašīts)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Poslapis',
 'nstab-user'      => 'NauduotuojÄ— poslapis',
 'nstab-media'     => 'AbruozdielÄ— poslapis',
-'nstab-special'   => 'Specēlos',
+'nstab-special'   => 'Specēlos poslapis',
 'nstab-project'   => 'Proujekta poslapis',
 'nstab-image'     => 'Fails',
 'nstab-mediawiki' => 'Teksts',
@@ -316,6 +315,12 @@ $messages = array(
 mažo doumenū bazės techninē pruofilaktėk�,
 puo tuo vėsks griš i sava viežes.
 Ožrakėnusiuojo admėnėstratuoriaus pateikts rakėnima paaiškėnims: $1',
+'missing-article'      => 'Doumenū bazė nerada poslapė teksta, katra ana torietu rastė, pavadėnta „$1“ $2.
+
+Paprast� tas būn dielē pasenosės skėrtoma vuo istuorėjės nūruodas i poslapi, katros bova ėštrėnts.
+
+Jēgo tas nie šėts varėjants, Tamsta mažo raduot klaida pruogramėnė ironguo.
+Prašuom aple šėt� paskelbtė [[Special:ListUsers/sysop|adminėstratori�]], nepamėršdamė nuruodītė nūruoda.',
 'missingarticle-rev'   => '(versÄ—jÄ—#: $1)',
 'missingarticle-diff'  => '(SkÄ—rt.: $1, $2)',
 'readonly_lag'         => 'Doumenū bazė bova autuomatėšk� ožrakėnta, kuol pagelbinės doumenū bazės pasvīs pagrėndine',
@@ -325,7 +330,6 @@ Ožrakėnusiuojo admėnėstratuoriaus pateikts rakėnima paaiškėnims: $1',
 'cannotdelete'         => 'Nepavīka ėštrintė nuruodīta poslapė a faila. (Mažo kažkas padarė pėrmesnis šėta)',
 'badtitle'             => 'Bluogs pavadÄ—nÄ—ms',
 'badtitletext'         => 'Nuruodīts poslapė pavadėnėms bova neleistėns, toš�ės a neteisėng� sojongts terpkalbinis a terppruojektėnis pavadėnėms. Anamė gal būtė vėins a daugiau sėmbuoliu, neleistėnū pavadėnėmūs',
-'perfdisabled'         => 'Atsiprašuom, no šėta funkcėjė īr laikėn� ėšjongta, nes tas ėpatėng� solietina doumenū bazė tēp, kū daugiau nėiks negal nauduotės pruojekto.',
 'perfcachedts'         => 'Ruodoma ėšsauguota doumenū kopėjė, katra bova atnaujėnta $1.',
 'querypage-no-updates' => 'Atnaujėnėm� tam poslapi� nūn� ėšjongtė īr. Doumenīs nūn� �ė nebus atnaujėntė.',
 'wrong_wfQuery_params' => 'Netaisingė parametr� i funkcėjė wfQuery()<br />
@@ -349,7 +353,6 @@ Ožklausėms: $2',
 'yourpasswordagain'          => 'Pakartuoket slaptažuodė:',
 'remembermypassword'         => 'AtmintÄ— Å¡Ä—ta infuormacÄ—jÄ— Å¡Ä—tom kuompioteri',
 'yourdomainname'             => 'Tamstas domens:',
-'loginproblem'               => '<b>Biedas so Tamstas prisėjongėmo.</b><br />Pabandīkėt ėš naujė!',
 'login'                      => 'PrisÄ—jongtÄ—',
 'nav-login-createaccount'    => 'Prėsėjongtė / sokortė paskīra',
 'loginprompt'                => 'Ijonkėt pakavukus, jēgo nuorėt prisėjongtė pri {{SITENAME}}.',
@@ -418,9 +421,11 @@ nebus siontamas ni vėinam žemiau ėšvardėntam puoslaugi�.',
 
 # Password reset dialog
 'resetpass_header'  => 'Atstatītė slaptažuodi',
+'oldpassword'       => 'Sens slaptažuodis:',
+'newpassword'       => 'Naus slaptažuodis:',
+'retypenew'         => 'Pakartuokėt nauja slaptažuodi:',
 'resetpass_submit'  => 'Nostatītė slaptažuodi ė prėsėjongtė',
 'resetpass_success' => 'Tamstas slaptažuodis pakeists siekmėng�! Daba prėsėjongiama...',
-'resetpass_missing' => 'Nier fuormas doumenū.',
 
 # Edit page toolbar
 'bold_sample'     => 'Pastuorints teksts',
@@ -445,22 +450,22 @@ nebus siontamas ni vėinam žemiau ėšvardėntam puoslaugi�.',
 'hr_tip'          => 'Guorizuontali linÄ—jÄ— (nenauduokÄ—t ba reikala)',
 
 # Edit pages
-'summary'                   => 'Kuomentars',
-'subject'                   => 'Tema/ontraštė',
-'minoredit'                 => 'Mažos pataisims',
-'watchthis'                 => 'KeravuotÄ— Å¡Ä—ta poslapÄ—',
-'savearticle'               => 'Ä–Å¡sauguotÄ— poslapÄ—',
-'preview'                   => 'Parveiza',
-'showpreview'               => 'Ruodītė parveiza',
-'showlivepreview'           => 'TÄ—isiuogÄ—nÄ— parvaiza',
-'showdiff'                  => 'Ruodītė skėrtomus',
-'anoneditwarning'           => "'''Diemesė:''' Tomsta nesat prisėjungės. Jūsa IP adresos būs irašīts i šiuo poslapė istuorėjė.",
-'missingsummary'            => "'''PriminÄ—ms:''' Tamsta nenuruodiet pakeitÄ—ma kuomentara. JÄ“go viel paspausÄ—t ''Ä–Å¡sauguotÄ—'', Tamstas pakeitÄ—ms bus Ä—Å¡sauguots ba anuo.",
-'missingcommenttext'        => 'Prašuom ivestė kuomentara.',
-'summary-preview'           => 'Kuomentara parvaiza',
-'subject-preview'           => 'Skėrsnelė/ontraštės parvaiza',
-'blockedtitle'              => 'Nauduotuos īr ožblokouts',
-'blockedtext'               => "<big>'''Tamstas nauduotuojė vards a IP adresos īr ožblokouts.'''</big>
+'summary'                          => 'Kuomentars:',
+'subject'                          => 'Tema/ontraštė:',
+'minoredit'                        => 'Mažos pataisims',
+'watchthis'                        => 'KeravuotÄ— Å¡Ä—ta poslapÄ—',
+'savearticle'                      => 'Ä–Å¡sauguotÄ— poslapÄ—',
+'preview'                          => 'Parveiza',
+'showpreview'                      => 'Ruodītė parveiza',
+'showlivepreview'                  => 'TÄ—isiuogÄ—nÄ— parvaiza',
+'showdiff'                         => 'Ruodītė skėrtomus',
+'anoneditwarning'                  => "'''Diemesė:''' Tomsta nesat prisėjungės. Jūsa IP adresos būs irašīts i šiuo poslapė istuorėjė.",
+'missingsummary'                   => "'''PriminÄ—ms:''' Tamsta nenuruodiet pakeitÄ—ma kuomentara. JÄ“go viel paspausÄ—t ''Ä–Å¡sauguotÄ—'', Tamstas pakeitÄ—ms bus Ä—Å¡sauguots ba anuo.",
+'missingcommenttext'               => 'Prašuom ivestė kuomentara.',
+'summary-preview'                  => 'Kuomentara parvaiza:',
+'subject-preview'                  => 'Skėrsnelė/ontraštės parvaiza:',
+'blockedtitle'                     => 'Nauduotuos īr ožblokouts',
+'blockedtext'                      => "<big>'''Tamstas nauduotuojė vards a IP adresos īr ožblokouts.'''</big>
 
 Ožbluokava $1. 
 Nuruodīta prižastis īr ''$2''.
@@ -473,65 +478,72 @@ Tamsta galÄ—t sosÄ—sÄ—iktÄ— so $1 a kÄ—tu
 [[{{MediaWiki:Grouppage-sysop}}|adminėstratuoriom]], kū aptartė ožbluokavėma.
 Tamsta negalėt nauduotės funkcėjė „Rašītė laiška tam nauduotuoj�“, jēgo nesot pateikis tėkra sava el. pašta adresa sava [[Special:Preferences|paskīruos nustatīmūs]] ė nesot ožblokouts nu anuos nauduojėma.
 Tamstas dabartėnis IP adresos īr $3, a bluokavėma ID īr #$5. Prašuom nuruodītė šėt�, kumet kreipiatės diel atbluokavėma.",
-'blockedoriginalsource'     => "Žemiau īr ruodoms '''$1''' torėnīs:",
-'blockededitsource'         => "''Tamstas keitimu'' teksts poslapiui '''$1''' īr ruodoms žemiau:",
-'whitelistedittitle'        => 'Nuorėnt redagoutė rēk prisėjongtė',
-'loginreqlink'              => 'prisÄ—jongtÄ—',
-'accmailtitle'              => 'Slaptažuodis ėšsiūsts īr.',
-'accmailtext'               => "Nauduotuojė '$1' slaptažuodis nusiūsts i $2 īr.",
-'newarticle'                => '(Naus)',
-'newarticletext'            => "Tamsta pakliovuot i nūn� neesoti poslapi.
+'blockedoriginalsource'            => "Žemiau īr ruodoms '''$1''' torėnīs:",
+'blockededitsource'                => "''Tamstas keitimu'' teksts poslapiui '''$1''' īr ruodoms žemiau:",
+'whitelistedittitle'               => 'Nuorėnt redagoutė rēk prisėjongtė',
+'loginreqlink'                     => 'prisÄ—jongtÄ—',
+'accmailtitle'                     => 'Slaptažuodis ėšsiūsts īr.',
+'accmailtext'                      => "Nauduotuojė '$1' slaptažuodis nusiūsts i $2 īr.",
+'newarticle'                       => '(Naus)',
+'newarticletext'                   => "Tamsta pakliovuot i nūn� neesoti poslapi.
 Nuoriedamė sokortė poslapi, pradiekėt rašītė žemiau esontiamė ivedima pluotė
 (platiau [[{{MediaWiki:Helppage}}|pagelbas poslapī]]).
 Jēgo pakliovuot �ė netī�iuom, paprastiausē paspauskėt naršīklės mīgtoka '''atgal'''.",
-'noarticletext'             => 'Tuo �iesu tamė poslapī nier juokė teksta, Tamsta galėt [[Special:Search/{{PAGENAME}}|ėiškuotė šėta poslapė pavadėnėma]] kėtūs poslapiūs a [{{fullurl:{{FULLPAGENAME}}|action=edit}} keistė ta poslapi].',
-'clearyourcache'            => "'''Diemesė:''' ėšsauguojus Tamst� gal prireiktė ėšvalītė Tamstas naršīklės rėnktovė, kū paveizėtomėt pakeitėmus. '''Mozilla / Safari / Konqueror:''' laikīdami ''Shift'' pasėrinkėt ''Atsi�stė ėš nauja'', a paspauskėt ''Ctrl-Shift-R'' (sėstemuo Apple Mac ''Cmd-Shift-R''); '''IE:''' laikīdamė ''Ctrl'' paspauskėt ''Atnaujėntė'', o paspauskėt ''Ctrl-F5''; '''Konqueror:''' paprastiausē paspauskėt ''Perkrautė'' mīgtoka, o paspauskėt ''F5''; '''Opera''' nauduotuojam gal prireiktė pėln� ėšvalītė anū rėnktovė ''Rakond�→Nustatīm�''.",
-'usercssjsyoucanpreview'    => '<strong>Patarėms:</strong> Nauduokit „Ruodītė parvaiza“ mīgtoka, kū ėšmiegintomiet sava naujaji CSS/JS priš ėšsaugont.',
-'usercsspreview'            => "'''Napamirškėt, kū Tamsta tėk parveizėt sava nauduotoja CSS, ans da nabova ėšsauguots!'''",
-'userjspreview'             => "'''Nepamirškėt, kū Tamsta tėk testoujat/parvaizėt sava nauduotoja ''JavaScript'', ans da nabova ėšsauguots!'''",
-'userinvalidcssjstitle'     => "'''Diemesė:''' Nė juokės ėšruodos „$1“. Napamirškėt, kū sava .css ėr .js poslapē nauduo pavadėnėma mažuosiomės raidiemis, pvz., Nauduotuos:Foo/monobook.css, o ne Nauduotuos:Foo/Monobook.css.",
-'updated'                   => '(AtnaujÄ—nta)',
-'note'                      => '<strong>Pastebiejims:</strong>',
-'previewnote'               => '<strong>Nepamėrškėt, kū tas tėkt�s pervaiza, pakeitėm� da nier ėšsauguotė!</strong>',
-'previewconflict'           => 'Šėta parvaiza paruod teksta ėš vėršotinėjė teksta redagavėma lauka tēp, k�p ans bus ruodoms, jei pasirinksėt anū ėšsauguotė.',
-'session_fail_preview'      => '<strong>Atsiprašuom! Mes nagalėm vīkdītė Tamstas keitėma diel sesėjės doumenū praradima.
-Prašuom pamiegintė vielēk. Jei šėt� napaded, pamieginkėt atsėjongtė ėr prėsėjongtė atgal.</strong>',
-'session_fail_preview_html' => "<strong>Atsėprašuom! Mes nagalėm apdoroutė Tamstas keitėma diel sesėjės doumenū praradėma.</strong>
+'noarticletext'                    => 'Tuo �iesu tamė poslapī nier juokė teksta.
+Tamsta galėt [[Special:Search/{{PAGENAME}}|ėiškuotė šėta poslapė pavadėnėma]] kėtūs poslapiūs,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ėiškuotė sosėjosiu regėstru], 
+aba [{{fullurl:{{FULLPAGENAME}}|action=edit}} keistÄ— ta poslapi].',
+'clearyourcache'                   => "'''Diemesė:''' ėšsauguojus Tamst� gal prireiktė ėšvalītė Tamstas naršīklės rėnktovė, kū paveizėtomėt pakeitėmus. '''Mozilla / Safari / Konqueror:''' laikīdami ''Shift'' pasėrinkėt ''Atsi�stė ėš nauja'', a paspauskėt ''Ctrl-Shift-R'' (sėstemuo Apple Mac ''Cmd-Shift-R''); '''IE:''' laikīdamė ''Ctrl'' paspauskėt ''Atnaujėntė'', o paspauskėt ''Ctrl-F5''; '''Konqueror:''' paprastiausē paspauskėt ''Perkrautė'' mīgtoka, o paspauskėt ''F5''; '''Opera''' nauduotuojam gal prireiktė pėln� ėšvalītė anū rėnktovė ''Rakond�→Nustatīm�''.",
+'usercssjsyoucanpreview'           => "'''Patarėms:''' Nauduokit „Ruodītė parvaiza“ mīgtoka, kū ėšmiegintomiet sava naujaji CSS/JS priš ėšsaugont.",
+'usercsspreview'                   => "'''Napamirškėt, kū Tamsta tėk parveizėt sava nauduotoja CSS, ans da nabova ėšsauguots!'''",
+'userjspreview'                    => "'''Nepamirškėt, kū Tamsta tėk testoujat/parvaizėt sava nauduotoja ''JavaScript'', ans da nabova ėšsauguots!'''",
+'userinvalidcssjstitle'            => "'''Diemesė:''' Nė juokės ėšruodos „$1“. Napamirškėt, kū sava .css ėr .js poslapē nauduo pavadėnėma mažuosiomės raidiemis, pvz., Nauduotuos:Foo/monobook.css, o ne Nauduotuos:Foo/Monobook.css.",
+'updated'                          => '(AtnaujÄ—nta)',
+'note'                             => "'''Pastebiejims:'''",
+'previewnote'                      => "'''Nepamėrškėt, kū tas tėkt�s pervaiza, pakeitėm� da nier ėšsauguotė!'''",
+'previewconflict'                  => 'Šėta parvaiza paruod teksta ėš vėršotinėjė teksta redagavėma lauka tēp, k�p ans bus ruodoms, jei pasirinksėt anū ėšsauguotė.',
+'session_fail_preview'             => "'''Atsiprašuom! Mes nagalėm vīkdītė Tamstas keitėma diel sesėjės doumenū praradima.
+Prašuom pamiegintė vielēk. Jei šėt� napaded, pamieginkėt atsėjongtė ėr prėsėjongtė atgal.'''",
+'session_fail_preview_html'        => "'''Atsėprašuom! Mes nagalėm apdoroutė Tamstas keitėma diel sesėjės doumenū praradėma.'''
 ''Kadaogi šėtom pruojekte grīnasės HTML īr ijongts, parveiza īr pasliepta k�p atsargoma prėimonė priš JavaScript atakas.''
-<strong>Jei t� teisiets keitėma bandīms, prašuom pamiegint viel. Jei šėt� napaded, pamieginkėt atsėjongtė ėr prėsėjongtė atgal.</strong>",
-'editing'                   => 'Taisuoms straipsnis - $1',
-'editingsection'            => 'Taisuoms $1 (skÄ—rsnelis)',
-'editingcomment'            => 'Taisuoms $1 (kuomentars)',
-'editconflict'              => 'Ä–Å¡preskÄ—t kuonflÄ—kta: $1',
-'yourtext'                  => 'Tamstas teksts',
-'storedversion'             => 'Ä–Å¡sauguota versÄ—jÄ—',
-'editingold'                => '<strong>ISPIEJIMS: Tamsta keitat ne naujausÄ— poslapÄ— versÄ—jÄ—.
-Jēgo ėšsauguosėt sava pakeitėmus, paskum darītė pakeitėm� prapols.</strong>',
-'yourdiff'                  => 'Skėrtom�',
-'copyrightwarning'          => 'Primenam, kū vėsks, kas patenk i {{SITENAME}}, īr laikuoma pavėišėnto palē $2 (platiau - $1). Jēgo nenuorit, kū Tamstas duovis būtou ba pasėgailiejėma keitams ė platėnams, nerašīkėt �ė.<br />
+'''Jei t� teisiets keitėma bandīms, prašuom pamiegint viel. Jei šėt� napaded, pamieginkėt atsėjongtė ėr prėsėjongtė atgal.'''",
+'editing'                          => 'Taisuoms straipsnis - $1',
+'editingsection'                   => 'Taisuoms $1 (skÄ—rsnelis)',
+'editingcomment'                   => 'Taisuoms $1 (kuomentars)',
+'editconflict'                     => 'Ä–Å¡preskÄ—t kuonflÄ—kta: $1',
+'yourtext'                         => 'Tamstas teksts',
+'storedversion'                    => 'Ä–Å¡sauguota versÄ—jÄ—',
+'editingold'                       => "'''ISPIEJIMS: Tamsta keitat ne naujausÄ— poslapÄ— versÄ—jÄ—.
+Jēgo ėšsauguosėt sava pakeitėmus, paskum darītė pakeitėm� prapols.'''",
+'yourdiff'                         => 'Skėrtom�',
+'copyrightwarning'                 => "Primenam, kū vėsks, kas patenk i {{SITENAME}}, īr laikuoma pavėišėnto palē $2 (platiau - $1). Jēgo nenuorit, kū Tamstas duovis būtou ba pasėgailiejėma keitams ė platėnams, nerašīkėt �ė.<br />
 Tamsta tēpuogi pasėžadat, kū tas īr Tamstas patėis rašīts torėnīs a kuopėjouts ėš vėišū a panašiū valnū šaltėniu.
-<strong>NEKOPĖJOUKĖT AUTUORĖNIEM TEISIEM APSAUGUOTU DARBŪ BA LEIDĖMA!</strong>',
-'longpagewarning'           => '<strong>DIEMESÄ–: Tas poslapis Ä«r $1 kilobaitu Ä—lgoma; katruos nekatruos
+'''NEKOPĖJOUKĖT AUTUORĖNIEM TEISIEM APSAUGUOTU DARBŪ BA LEIDĖMA!'''",
+'longpagewarning'                  => "'''DIEMESÄ–: Tas poslapis Ä«r $1 kilobaitu Ä—lgoma; katruos nekatruos
 naršīklės gal torietė biedū redagounant poslapius bavēk a vėrš 32 kB.
-Prašuom pamiegītė poslapi padalėntė i keleta smolkesniū daliū.</strong>',
-'readonlywarning'           => '<strong>DIEMESĖ: Doumenū bazė bova ožrakėnta teknėnē pruofilaktėk�,
+Prašuom pamiegītė poslapi padalėntė i keleta smolkesniū daliū.'''",
+'readonlywarning'                  => "'''DIEMESĖ: Doumenū bazė bova ožrakėnta teknėnē pruofilaktėk�,
 tudie negaliesÄ—t Ä—Å¡sauguotÄ— sava pakeitÄ—mu daba. Tamsta galÄ—t nosÄ—kopÄ—joutÄ— teksta i tekstÄ—ni faila
-ė paskum ikeltė ana �ė.</strong>',
-'protectedpagewarning'      => '<strong>DIEMESĖ: Šėts poslapis īr ožrakints ėr anū redagoutė gal tėk admėnėstratuorė teises torėntīs prietelē.</strong>',
-'semiprotectedpagewarning'  => "'''Pastebiejėms:''' Šėts poslapis bova ožrakėnts ėr anuo gal redagoutė tėk regėstroutė nauduotoj�.",
-'titleprotectedwarning'     => '<strong>DIEMESĖ: Tas poslapis bova ožrakėnts tēp, ka tėkt�s k�pkatrė nauduotuojē galietu ana sokortė.</strong>',
-'templatesused'             => 'Straipsnī nauduojami šabluon�:',
-'templatesusedpreview'      => 'Šabluon�, nauduotė šėtuo parvaizuo:',
-'templatesusedsection'      => 'Šabluon�, nauduotė šėtom skėrsnelī:',
-'template-protected'        => '(apsauguots)',
-'template-semiprotected'    => '(posiau apsauguots)',
-'nocreatetitle'             => 'Poslapiu kūrims aprėbuots',
-'nocreatetext'              => '{{SITENAME}} aprėbuojė galėmībe kortė naujus poslapius.
+ė paskum ikeltė ana �ė.'''",
+'protectedpagewarning'             => "'''DIEMESĖ: Šėts poslapis īr ožrakints ėr anū redagoutė gal tėk admėnėstratuorė teises torėntīs prietelē.'''",
+'semiprotectedpagewarning'         => "'''Pastebiejėms:''' Šėts poslapis bova ožrakėnts ėr anuo gal redagoutė tėk regėstroutė nauduotoj�.",
+'titleprotectedwarning'            => "'''DIEMESĖ: Tas poslapis bova ožrakėnts tēp, ka tėkt�s k�pkatrė nauduotuojē galietu ana sokortė.'''",
+'templatesused'                    => 'Straipsnī nauduojami šabluon�:',
+'templatesusedpreview'             => 'Šabluon�, nauduotė šėtuo parvaizuo:',
+'templatesusedsection'             => 'Šabluon�, nauduotė šėtom skėrsnelī:',
+'template-protected'               => '(apsauguots)',
+'template-semiprotected'           => '(posiau apsauguots)',
+'hiddencategories'                 => 'Tas poslapis prėklausa $1 {{PLURAL:$1|pakavuot� kateguorėjē|pakavuotoms kateguorėjėms|pakavuotu kateguorėju}}:',
+'nocreatetitle'                    => 'Poslapiu kūrims aprėbuots',
+'nocreatetext'                     => '{{SITENAME}} aprėbuojė galėmībe kortė naujus poslapius.
 Tamsta galėt grīžtė ė redagoutė nūn� esonti poslapi, a [[Special:UserLogin|prėsėjongtė a sokortė paskīra]].',
-'recreate-deleted-warn'     => "'''DiemesÄ—: Tomsta atkoriat poslapi, katros onkstiau bova Ä—Å¡trints.'''
+'permissionserrorstext-withaction' => 'Tamsta netorėt leidėma $2 dielē {{PLURAL:$1|tos prīžastėis|tū prīžastiu}}:',
+'recreate-deleted-warn'            => "'''DiemesÄ—: Tomsta atkoriat poslapi, katros onkstiau bova Ä—Å¡trints.'''
 
 Tomsta torėt nosprēst, a pritėnk tuoliau redagoutė šėta poslapi.
 Å Ä—ta poslapÄ— Å¡alÄ—nÄ—mu istuorÄ—jÄ— Ä«r pateikta patuogoma vardan:",
+'deleted-notice'                   => 'Tas poslapis bova Ä—Å¡trÄ—nts.
+Ėštrėnta poslapė versėju s�rašos īr pateikts paveiziejėm� žemiau.',
 
 # "Undo" feature
 'undo-success' => 'Keitėms gal būtė atšaukts. Prašuom patėkrėntė palīgėnėma, asonti žemiau, kū patvėrtėntomiet, kū Tamsta šėta ė nuorėt padarītė, ė tumet ėšsauguokit pakeitėmos, asontios žemiau, kū ožbėngtomiet keitėma atšaukėma.',
@@ -539,43 +551,48 @@ Tomsta torėt nosprēst, a pritėnk tuoliau redagoutė šėta poslapi.
 'undo-summary' => 'Atšauktė [[Special:Contributions/$2|$2]] ([[User talk:$2|Aptarėms]]) versėje $1',
 
 # History pages
-'viewpagelogs'        => 'Ruodītė šėtuo poslapė specēli�sios vaiksmos',
-'nohistory'           => 'Å Ä—ts poslapis netor keitÄ—mu istuorÄ—jÄ—s.',
-'revnotfound'         => 'VersÄ—jÄ— narasta',
-'revnotfoundtext'     => 'Nuorima poslapÄ— versÄ—jÄ— narasta. PatÄ—krÄ—nkÄ—t URL, katro patekuot i Å¡Ä—ta poslapi.',
-'currentrev'          => 'DabartÄ—nÄ— versÄ—jÄ—',
-'revisionasof'        => '$1 versÄ—jÄ—',
-'revision-info'       => '$1 versÄ—jÄ— nauduotuojÄ— $2',
-'previousrevision'    => '�Onkstesnė versėjė',
-'nextrevision'        => 'Paskesnė versėjė→',
-'currentrevisionlink' => 'DabartÄ—nÄ— versÄ—jÄ—',
-'cur'                 => 'dab',
-'next'                => 'kÄ—ts',
-'last'                => 'pask',
-'page_first'          => 'pÄ—rm',
-'page_last'           => 'pask',
-'histlegend'          => "Skėrtom� terp versėju: pažīmiekit līginamas versėjės ė spauskėt ''Enter'' klavėša a mīgtuka apatiuo.<br />
+'viewpagelogs'           => 'Ruodītė šėtuo poslapė specēli�sios vaiksmos',
+'nohistory'              => 'Å Ä—ts poslapis netor keitÄ—mu istuorÄ—jÄ—s.',
+'currentrev'             => 'DabartÄ—nÄ— versÄ—jÄ—',
+'currentrev-asof'        => 'DabartÄ—nÄ— $1 versÄ—jÄ—',
+'revisionasof'           => '$1 versÄ—jÄ—',
+'revision-info'          => '$1 versÄ—jÄ— nauduotuojÄ— $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Onkstesnė versėjė',
+'nextrevision'           => 'Paskesnė versėjė→',
+'currentrevisionlink'    => 'DabartÄ—nÄ— versÄ—jÄ—',
+'cur'                    => 'dab',
+'next'                   => 'kÄ—ts',
+'last'                   => 'pask',
+'page_first'             => 'pÄ—rm',
+'page_last'              => 'pask',
+'histlegend'             => "Skėrtom� terp versėju: pažīmiekit līginamas versėjės ė spauskėt ''Enter'' klavėša a mīgtuka apatiuo.<br />
 Žīmiejim�: (dab) = palīginims so vielibiausė versėjė,
 (pask) = palīginims so priš ta bovosia versėjė, S = mažos pataisims.",
-'deletedrev'          => '[Ä—Å¡trinta]',
-'histfirst'           => 'SeniausÄ—',
-'histlast'            => 'VielibÄ—Ì…jÄ—',
-'historyempty'        => '(nieka nier)',
+'history-fieldset-title' => 'Naršītė istuorėjuo',
+'deletedrev'             => '[Ä—Å¡trinta]',
+'histfirst'              => 'SeniausÄ—',
+'histlast'               => 'VielibÄ—Ì…jÄ—',
+'historyempty'           => '(nieka nier)',
 
 # Revision feed
 'history-feed-title'          => 'VersÄ—ju istuorÄ—jÄ—',
 'history-feed-item-nocomment' => '$1 $2', # user at time
 
 # Revision deletion
+'rev-delundel'         => 'ruodītė/kavuotė',
 'revisiondelete'       => 'TrintÄ—/atkortÄ— versÄ—jÄ—s',
 'revdelete-text'       => "'''Ėštrintuos versėjės ėr ivīkē vistėik da bus ruodomė poslapė istuorėjuo ėr specēliūju veiksmū istuorėjuo, no anū torėnė dalīs nabus vėiš� pasėikiamos.'''
 Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta torėni ėr galės ana atkortė viel par šėta pate sasaja, nabent īr nostatītė papėlduomė aprėbuojėm�.",
 'revdelete-unsuppress' => 'Å alÄ—ntÄ— apribuojÄ—mos atkortuos versÄ—jÄ—s',
 'logdelete-logentry'   => 'pakeists [[$1]] atsÄ—tÄ—kima veiziemoms',
+'revdel-restore'       => 'KeistÄ— veizÄ—muma',
 
 # History merging
 'mergehistory-success' => '$3 [[:$1]] versėju siekmėng� sojongta so [[:$2]].',
 
+# Merge log
+'revertmerge' => 'AtskÄ—rtÄ—',
+
 # Diffs
 'history-title'           => 'Poslapė „$1“ istuorėjė',
 'difference'              => '(Skėrtom� terp versėju)',
@@ -585,24 +602,39 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'diff-multi'              => '($1 {{PLURAL:$1|tarpėnis keitėms nier ruoduoms|tarpėnē keitėm� nier ruoduomė|tarpėniu keitėmu nier ruoduoma}}.)',
 
 # Search results
-'searchresults'         => 'Paėiškuos rezoltat�',
-'searchsubtitle'        => 'Ėiškuoma „[[:$1]]“',
-'searchsubtitleinvalid' => 'Jėškuom „$1“',
-'noexactmatch'          => "'''Nier anėjuokė poslapė, pavadėnta „$1“.''' Tamsta galėt [[:$1|sokortė ta poslapi]].",
-'titlematches'          => 'Straipsniu pavadėnėmu atitėkmenīs',
-'notitlematches'        => 'Juokiū pavadinėma atitikmenū',
-'textmatches'           => 'Poslapė torėnė atėtikmenīs',
-'notextmatches'         => 'Juokiū poslapė teksta atitikmenū',
-'prevn'                 => 'onkstesnius $1',
-'nextn'                 => 'paskesnius $1',
-'viewprevnext'          => 'VeizÄ—tÄ— ($1) ($2) ($3).',
-'showingresults'        => "Žemiau ruodoma lėgė '''$1''' rezoltatu pradedant #'''$2'''.",
-'showingresultsnum'     => "Žemiau ruodoma '''$3''' {{PLURAL:$3|rezoltata|rezoltatu|rezoltatu}} pradedant #'''$2'''.",
-'powersearch'           => 'Ėiškuotė',
-'powersearch-legend'    => 'Prapliesta paėiška',
-'powersearch-ns'        => 'Ėiškoutė vardū srėtīsė:',
-'powersearch-redir'     => 'ItrauktÄ— paradresavÄ—mus',
-'powersearch-field'     => 'Ėiškoutė',
+'searchresults'             => 'Paėiškuos rezoltat�',
+'searchresults-title'       => 'Paėiškuos rezoltat� "$1"',
+'searchresulttext'          => 'Daugiau infuormacėjės aple paėiška pruojektė {{SITENAME}} rasėt [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'            => 'Tamsta ėiškuojot \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|vėsė poslapē katrėi prasėded so "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|vėsė poslapē katrėi ruod i "$1"]])',
+'searchsubtitleinvalid'     => 'Jėškuom „$1“',
+'noexactmatch'              => "'''Nier anėjuokė poslapė, pavadėnta „$1“.''' Tamsta galėt [[:$1|sokortė ta poslapi]].",
+'noexactmatch-nocreate'     => "'''Nier poslapė so pavadėnėmu „$1“.'''",
+'titlematches'              => 'Straipsniu pavadėnėmu atitėkmenīs',
+'notitlematches'            => 'Juokiū pavadinėma atitikmenū',
+'textmatches'               => 'Poslapė torėnė atėtikmenīs',
+'notextmatches'             => 'Juokiū poslapė teksta atitikmenū',
+'prevn'                     => 'onkstesnius $1',
+'nextn'                     => 'paskesnius $1',
+'viewprevnext'              => 'VeizÄ—tÄ— ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Torėnīs',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 žuodis|$2 žuodē|$2 žuodiu}})',
+'search-redirect'           => '(paradresavÄ—ms $1)',
+'search-section'            => '(skīrios $1)',
+'search-suggest'            => 'Mažo nuoriejot $1',
+'search-interwiki-caption'  => 'Dokterėnē pruojekt�',
+'search-interwiki-default'  => '$1 rezoltat�:',
+'search-interwiki-more'     => '(daugiau)',
+'search-mwsuggest-enabled'  => 'so pasiūlīm�s',
+'search-mwsuggest-disabled' => 'nie pasiūlīmu',
+'showingresults'            => "Žemiau ruodoma lėgė '''$1''' rezoltatu pradedant #'''$2'''.",
+'showingresultsnum'         => "Žemiau ruodoma '''$3''' {{PLURAL:$3|rezoltata|rezoltatu|rezoltatu}} pradedant #'''$2'''.",
+'showingresultstotal'       => "Žemiau ruodom{{PLURAL:$4|s rezoltats '''$1''' ėš '''$3'''|ė rezoltat� '''$1 - $2''' ėš '''$3'''}}",
+'nonefound'                 => "'''Pastebiejėms''': Palē nutīliejėma ėiškuoma tėkt�s k�p katruosė vardū srėtīsė. Pamiegīkėt prirašītė prėišdieli ''all:'', jēgo nuorėt ėiškiuotė vėsa torėnė (tamė tarpė aptarėma poslapius, šabluonus ė tēp tuoliau), aba nauduokėt nuorėma vardū srėti k�p prėišdieli.",
+'powersearch'               => 'Ėiškuotė',
+'powersearch-legend'        => 'Prapliesta paėiška',
+'powersearch-ns'            => 'Ėiškoutė vardū srėtīsė:',
+'powersearch-redir'         => 'ItrauktÄ— paradresavÄ—mus',
+'powersearch-field'         => 'Ėiškoutė',
 
 # Preferences page
 'preferences'           => 'Nustatīm�',
@@ -612,6 +644,7 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'qbsettings-none'       => 'Neruodītė',
 'changepassword'        => 'Pakeistė slaptažuodė',
 'skin'                  => 'Ä–Å¡ruoda',
+'skin-preview'          => 'Parveiza',
 'math'                  => 'MatematÄ—ka',
 'dateformat'            => 'Datuos fuormats',
 'datetime'              => 'Data ė �iesos',
@@ -626,9 +659,6 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'prefs-misc'            => 'Ivairė nustatīm�',
 'saveprefs'             => 'Ä–Å¡sauguotÄ—',
 'resetprefs'            => 'Atstatītė nostatīmos',
-'oldpassword'           => 'Sens slaptažuodis:',
-'newpassword'           => 'Naus slaptažuodis:',
-'retypenew'             => 'Pakartuokėt nauja slaptažuodi:',
 'textboxsize'           => 'RedagavÄ—ms',
 'rows'                  => 'EilotÄ—s:',
 'columns'               => 'Štolpalē:',
@@ -655,7 +685,7 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'userrights-lookup-user'   => 'Tvarkītė nauduotuojė gropės',
 'userrights-user-editname' => 'IveskÄ—t nauduotuojÄ— varda:',
 'editusergroup'            => 'RedagoutÄ— nauduotuojÄ— gropes',
-'editinguser'              => "Taisuoms nauduotuos '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "Taisuoms nauduotuos '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'KeistÄ— nauduotuoju gropes',
 'userrights-groupsmember'  => 'Narīs:',
 'userrights-reason'        => 'Keitėma prižastis:',
@@ -685,9 +715,13 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'rightslogentry' => 'pakeista $1 gropės narīstė ėš $2 i $3. Sveikėnam!',
 'rightsnone'     => '(juokiū)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'redagoutÄ— ta poslapi',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|pakeitims|pakeitim�|pakeitimu}}',
 'recentchanges'                     => 'Vielībė̅jė pakeitėm�',
+'recentchanges-legend'              => 'Vielībuju pakeitėmu pasėrinkėm�',
 'recentchanges-feed-description'    => 'Keravuokėt patius vielībiausius pakeitėmus pruojekt� tamė šaltėnī.',
 'rcnote'                            => "Žemiau īr '''$1''' {{PLURAL:$1|paskotinis pakeitims|paskotinē pakeitim�|paskotiniu pakeitimu}} par $2 {{PLURAL:$2|paskotinė̅jė dėina|paskotėniasės '''$2''' dėinas|paskotėniuju '''$2''' dėinū}} skaitlioujant nū $4, $5.",
 'rcnotefrom'                        => 'Žemiau īr pakeitėma pradedant nū <b>$2</b> (ruodom lėgė <b>$1</b> pakeitėmu).',
@@ -710,6 +744,8 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'rc_categories'                     => 'Ruodītė tėk šėtas kateguorėjės (atskirkit nauduodamė „|“)',
 'rc_categories_any'                 => 'BikuokÄ—',
 'newsectionsummary'                 => '/* $1 */ naus skÄ—rsnelis',
+'rc-enhanced-expand'                => 'Ruodītė detales (rēk JavaScript)',
+'rc-enhanced-hide'                  => 'KavuotÄ— detales',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Sosėjėn pakeitėm�',
@@ -740,7 +776,7 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'minlength1'                 => 'Faila pavadinėms tor būtė nuors vėina raidie.',
 'filetype-missing'           => 'Fails netor galūnės (k�p pavīzdīs „.jpg“).',
 'emptyfile'                  => 'Panašu, ka fails, katra ikieliet īr toš�ias. Tas gal būtė diel klaiduos faila pavadėnėmė. Pasėtėkrinkėt a tėkr� nuorėt ikeltė šėta faila.',
-'fileexists'                 => 'Fails so tuokiu vardu jau īr, prašuom paveizėtė <strong><tt>$1</tt></strong>, jēgo nesat ožtėkrėnts, a nuorit ana parrašītė.',
+'fileexists'                 => "Fails so tuokiu vardu jau īr, prašuom paveizėtė '''<tt>$1</tt>''', jēgo nesat ožtėkrėnts, a nuorit ana parrašītė.",
 'successfulupload'           => 'Ikelt siekmėng�',
 'uploadwarning'              => 'DiemesÄ—',
 'savefile'                   => 'Ä–Å¡sauguotÄ— faila',
@@ -773,18 +809,18 @@ Kėtė admėnėstratuorē šėtom pruojekte vėsdar galės pasėiktė pasliepta
 'upload_source_url'  => ' (tėkrs, vėiš� priėinams URL)',
 'upload_source_file' => ' (fails Tamstas kompioterī)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Tas specēlus poslapis ruod vėsus ikeltus failus.
+# Special:ListFiles
+'listfiles-summary'     => 'Tas specēlus poslapis ruod vėsus ikeltus failus.
 Palē numatīma paskiausē ikeltė fail� īr ruoduomė s�roša vėršou.
 Paspaude ont štolpelė ontraštės pakeisėt ėšruokavėma.',
 'imgfile'               => 'fails',
-'imagelist'             => 'Failu s�rašos',
-'imagelist_name'        => 'PavadinÄ—ms',
-'imagelist_user'        => 'Nauduotuos',
-'imagelist_size'        => 'DÄ—doms',
-'imagelist_description' => 'Aprašīms',
+'listfiles'             => 'Failu s�rašos',
+'listfiles_name'        => 'PavadinÄ—ms',
+'listfiles_user'        => 'Nauduotuos',
+'listfiles_size'        => 'DÄ—doms',
+'listfiles_description' => 'Aprašīms',
 
-# Image description page
+# File description page
 'filehist'                  => 'AbruozdielÄ— istuorÄ—jÄ—',
 'filehist-help'             => 'Paspauskėt ont datas/�iesa, ka paveizietomėt faila tuoki, kokis ons bova tū �iesu.',
 'filehist-deleteall'        => 'trintÄ— vÄ—sus',
@@ -792,19 +828,23 @@ Paspaude ont štolpelė ontraštės pakeisėt ėšruokavėma.',
 'filehist-revert'           => 'sog�žėntė',
 'filehist-current'          => 'dabartÄ—nis',
 'filehist-datetime'         => 'Data/ÄŒiesos',
+'filehist-thumb'            => 'Miniatiūra',
+'filehist-thumbtext'        => 'Versėjės $1 miniatiūra',
 'filehist-user'             => 'Nauduotuos',
 'filehist-dimensions'       => 'Mier�',
 'filehist-filesize'         => 'Faila dÄ—doms',
 'filehist-comment'          => 'Kuomentars',
-'imagelinks'                => 'NÅ«roudas',
+'imagelinks'                => 'Faila nūruodas',
 'linkstoimage'              => '{{PLURAL:$1|Šėts poslapis|Šėtė poslapē}} nuruod i šėta faila:',
 'nolinkstoimage'            => 'I faila neruod anÄ—juoks poslapis.',
 'sharedupload'              => 'Tas fails īr ikelts bendram nauduojėm� ė gal būtė nauduojams kėtūs pruojektūs.',
 'shareduploadwiki'          => 'Veizėkiet $1 tolėmesnē infuormacėjē.',
+'shareduploadwiki-desc'     => 'Aprašīms ėš anuo $1 bendruojuo saugīkluo ruoduoms žemiau īr.',
 'shareduploadwiki-linktext' => 'faila aprašīma poslapi',
 'noimage'                   => 'Nier faila so Å¡Ä—tokio pavadÄ—nÄ—mo. Tamsta galÄ—t $1.',
 'noimage-linktext'          => 'ikeltÄ— ana',
 'uploadnewversion-linktext' => 'IkeltÄ— nauja faila versÄ—je',
+'imagepage-searchdupe'      => 'Ėiškuotė doblikoutu failu',
 
 # File deletion
 'filedelete'         => 'TrintÄ— $1',
@@ -838,10 +878,19 @@ Paspaude ont štolpelė ontraštės pakeisėt ėšruokavėma.',
 'randomredirect-nopages' => 'Šėtuo vardū srėti nier anėjuokiū paradresavėmu.',
 
 # Statistics
-'statistics'             => 'StatÄ—stÄ—ka',
-'sitestats'              => 'TÄ—nklalapÄ— statÄ—stÄ—ka',
-'userstats'              => 'Nauduotuoju statÄ—stÄ—ka',
-'statistics-mostpopular' => 'Daugiausē ruodītė poslapē',
+'statistics'               => 'StatÄ—stÄ—ka',
+'statistics-header-pages'  => 'Poslapiu statÄ—stÄ—ka',
+'statistics-header-edits'  => 'RedagavÄ—mu statÄ—stÄ—ka',
+'statistics-header-users'  => 'Nauduotuoju statÄ—stÄ—ka',
+'statistics-articles'      => 'Torėnė poslapē',
+'statistics-pages'         => 'Poslapē',
+'statistics-files'         => 'Ikeltė fail�',
+'statistics-edits'         => 'Poslapiu redagavėmu skaitlius nū {{SITENAME}} sokūrėma',
+'statistics-edits-average' => 'Vėdotėnis keitėmu skaitlius poslapi�',
+'statistics-jobqueue'      => '[http://www.mediawiki.org/wiki/Manual:Job_queue Oždoutiū eilės] ėlgoms',
+'statistics-users'         => 'Ožsėregėstravosiu [[Special:ListUsers|nauduotuoju]]',
+'statistics-users-active'  => 'Aktīviu nauduotuoju',
+'statistics-mostpopular'   => 'Daugiausē ruodītė poslapē',
 
 'disambiguations' => 'Daugiareikšmiu žuodiu poslapē',
 
@@ -876,13 +925,14 @@ Paspaude ont štolpelė ontraštės pakeisėt ėšruokavėma.',
 'unusedimages'            => 'Nenauduojamė fail�',
 'wantedcategories'        => 'NuorÄ—miausÄ—s kateguorÄ—jÄ—s',
 'wantedpages'             => 'Nuorėmiausē poslapē',
+'wantedfiles'             => 'Nuorėmė fail�',
 'mostlinked'              => 'Daugiausē ruodomė straipsnē',
 'mostlinkedcategories'    => 'Daugiausē ruodomas kateguorėjės',
 'mostlinkedtemplates'     => 'Daugiausē ruodomė šabluon�',
 'mostcategories'          => 'Straipsnē so daugiausē kateguorėju',
 'mostimages'              => 'Daugiausē ruodomė abruozdielē',
 'mostrevisions'           => 'Straipsnē so daugiausē keitėmu',
-'prefixindex'             => 'Ruodīklė palē pavadinėma pradē',
+'prefixindex'             => 'Vėsė poslapē so prīšdielio',
 'shortpages'              => 'Trompiausė poslapē',
 'longpages'               => 'Ėlgiausė poslapē',
 'deadendpages'            => 'Straipsnē-aklavėitės',
@@ -893,6 +943,7 @@ Paspaude ont štolpelė ontraštės pakeisėt ėšruokavėma.',
 'protectedtitles'         => 'Apsauguotė pavadinėm�',
 'protectedtitlesempty'    => 'Šėtou �ieso nier anėjuokė pavadinėma, katros apsauguots t�s parametr�s.',
 'listusers'               => 'S�rašos nauduotuoju',
+'listusers-editsonly'     => 'Ruodītė tėkt�s nauduotuojus katrėi īr atlėkė pakeitėmus',
 'newpages'                => 'Naujausė straipsnē',
 'newpages-username'       => 'NauduotuojÄ— vards:',
 'ancientpages'            => 'Seniausė poslapē',
@@ -916,8 +967,6 @@ katram ivīkdītė šėta funkcėjė.',
 'speciallogtitlelabel' => 'PavadÄ—nims:',
 'log'                  => 'Specēliūju veiksmū istuorėjė',
 'all-logs-page'        => 'VÄ—sos istuorÄ—jÄ—s',
-'log-search-legend'    => 'Ėiškuotė istuorėjuosė',
-'log-search-submit'    => 'Ä’k!',
 'alllogstext'          => 'Bėndra idietu failu, ėštrīnėmu, ožrakėnėmu, bluokavėmu ė prėvėlėju soteikėmu istuorėjė.
 Īr galėmībė somažintė rezoltatu skaitliu patėkslėnont vēksma tėpa, nauduotuojė a sosėjosė poslapė.',
 'logempty'             => 'Istuorėjuo nier anėjuokiū atitinkontiu atsėtėkimu.',
@@ -929,6 +978,7 @@ katram ivīkdītė šėta funkcėjė.',
 'nextpage'          => 'KÄ—ts poslapis ($1)',
 'prevpage'          => 'Onkstesnis poslapis ($1)',
 'allpagesfrom'      => 'Ruodītė poslapius pradedont nu:',
+'allpagesto'        => 'Ruodītė poslapius, basėbengėn�ios so:',
 'allarticles'       => 'Vėsė straipsnē',
 'allinnamespace'    => 'Vėsė poslapē (srėtis - $1)',
 'allnotinnamespace' => 'Vėsė poslapē (nesontīs šiuo srėtie - $1)',
@@ -942,11 +992,18 @@ katram ivīkdītė šėta funkcėjė.',
 'categories'         => 'KateguorÄ—jÄ—s',
 'categoriespagetext' => 'Pruojekte Ä«r Å¡Ä—tuos kateguorÄ—jÄ—s.',
 
+# Special:LinkSearch
+'linksearch' => 'Ėšuorėnės nūruodas',
+
 # Special:ListUsers
 'listusersfrom'      => 'Ruodītė nauduotuojus pradedont nū:',
 'listusers-submit'   => 'Ruodītė',
 'listusers-noresult' => 'Nerast anėjuokiū nauduotuoju.',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Nauduotuojė kūrėma regėstros',
+'newuserlog-create-entry' => 'Naus nauduotuos',
+
 # Special:ListGroupRights
 'listgrouprights'         => 'Nauduotuoju gropiu teisÄ—s',
 'listgrouprights-group'   => 'GropÄ—',
@@ -999,12 +1056,7 @@ Jė bikumet ožsėnuorietomiet liautėis stebietė straipsnė, spostelkat \"Nebs
 'watchlistcontains'    => 'Tamstas kervuojamu s�rašė īr $1 {{PLURAL:$1|poslapis|poslapē|poslapiu}}.',
 'wlnote'               => "Ruoduoma '''$1''' paskotėniu pakeitėmu, atlėktū par '''$2''' paskotėniu adīnu.",
 'wlshowlast'           => 'Ruodītė paskotėniu $1 adīnu, $2 dėinū a $3 pakeitėmus',
-'watchlist-show-bots'  => 'Ruodītė robotu keitėmos',
-'watchlist-hide-bots'  => 'KavuotÄ— robotu keitÄ—mos',
-'watchlist-show-own'   => 'Ruodītė mona keitėmos',
-'watchlist-hide-own'   => 'KavuotÄ— mona keitÄ—mos',
-'watchlist-show-minor' => 'Ruodītė mažos keitėmos',
-'watchlist-hide-minor' => 'Kavuotė mažos keitėmos',
+'watchlist-options'    => 'Keravuojamu s�roša pasėrinkėm�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Itraukiama i keravuojamu s�raša...',
@@ -1014,69 +1066,80 @@ Jė bikumet ožsėnuorietomiet liautėis stebietė straipsnė, spostelkat \"Nebs
 'enotif_newpagetext' => 'Tas Ä«r naus poslapis.',
 'created'            => 'sokūrė',
 
-# Delete/protect/revert
-'deletepage'                  => 'TrintÄ— poslapi',
-'confirm'                     => 'Ožtvėrtinu',
-'excontent'                   => 'boves torinīs: „$1“',
-'excontentauthor'             => 'boves torinīs: „$1“ (redagava tėkt�s „[[Special:Contributions/$2|$2]]“)',
-'exbeforeblank'               => 'priš ėštrinant torinīs bova: „$1“',
-'exblank'                     => 'poslapis bova tuš�es',
-'delete-confirm'              => 'EÅ¡trÄ—nta "$1"',
-'historywarning'              => 'DiemesÄ—: TrÄ—nams poslapis tor istuorÄ—jÄ—:',
-'confirmdeletetext'           => 'Tamsta pasÄ—rÄ—nkuot Ä—Å¡trÄ—ntÄ— poslapi a abruozdieli draugum so vÄ—sa anuo istuorÄ—jÄ—.
+# Delete
+'deletepage'            => 'TrintÄ— poslapi',
+'confirm'               => 'Ožtvėrtinu',
+'excontent'             => 'boves torinīs: „$1“',
+'excontentauthor'       => 'boves torinīs: „$1“ (redagava tėkt�s „[[Special:Contributions/$2|$2]]“)',
+'exbeforeblank'         => 'priš ėštrinant torinīs bova: „$1“',
+'exblank'               => 'poslapis bova tuš�es',
+'delete-confirm'        => 'EÅ¡trÄ—nta "$1"',
+'historywarning'        => 'DiemesÄ—: TrÄ—nams poslapis tor istuorÄ—jÄ—:',
+'confirmdeletetext'     => 'Tamsta pasÄ—rÄ—nkuot Ä—Å¡trÄ—ntÄ— poslapi a abruozdieli draugum so vÄ—sa anuo istuorÄ—jÄ—.
 Prašuom patvėrtėntė, kū Tamsta tėkr� nuorėt šėtu padarītė, žėnuot aple galėmus padarėnius, ė kū Tamsta šėt� daruot atsėžvelgdamė i [[{{MediaWiki:Policy-url}}|puolitėka]].',
-'actioncomplete'              => 'VÄ“ksmos atlÄ—kts Ä«r',
-'deletedtext'                 => '„$1“ ėštrints.
+'actioncomplete'        => 'VÄ“ksmos atlÄ—kts Ä«r',
+'deletedtext'           => '„$1“ ėštrints.
 Paskotiniu pašalinėmu istuorėjė - $2.',
-'deletedarticle'              => 'ėštrīnė „[[$1]]“',
-'dellogpage'                  => 'Pašalinėmu istuorėjė',
-'dellogpagetext'              => 'Žemiau īr pateikiams paskotiniu ėštrīnimu s�rašos.',
-'deletionlog'                 => 'pašalinėmu istuorėjė',
-'reverted'                    => 'Atkorta i onkstesne versÄ—je',
-'deletecomment'               => 'Trīnima prižastis',
-'deleteotherreason'           => 'Kėta/papėlduoma prižastis:',
-'deletereasonotherlist'       => 'Kėta prižastis',
-'deletereason-dropdown'       => '*Dažnas trīnėma prižastīs
+'deletedarticle'        => 'ėštrīnė „[[$1]]“',
+'dellogpage'            => 'Pašalinėmu istuorėjė',
+'dellogpagetext'        => 'Žemiau īr pateikiams paskotiniu ėštrīnimu s�rašos.',
+'deletionlog'           => 'pašalinėmu istuorėjė',
+'reverted'              => 'Atkorta i onkstesne versÄ—je',
+'deletecomment'         => 'Trīnima prižastis',
+'deleteotherreason'     => 'Kėta/papėlduoma prižastis:',
+'deletereasonotherlist' => 'Kėta prižastis',
+'deletereason-dropdown' => '*Dažnas trīnėma prižastīs
 ** Autorė prašīms
 ** Autorėniu teisiu pažeidėms
 ** VandalÄ—zmos',
-'rollback'                    => 'AtmestÄ— pakeitÄ—mos',
-'rollback_short'              => 'AtmestÄ—',
-'rollbacklink'                => 'atmestÄ—',
-'rollbackfailed'              => 'Atmetims napavīka',
-'alreadyrolled'               => 'Nepavīka atmestė paskotėnė [[User:$2|$2]] ([[User talk:$2|Aptarėms]]) darīta straipsnė [[$1]] keitėma;
+
+# Rollback
+'rollback'         => 'AtmestÄ— pakeitÄ—mos',
+'rollback_short'   => 'AtmestÄ—',
+'rollbacklink'     => 'atmestÄ—',
+'rollbackfailed'   => 'Atmetims napavīka',
+'alreadyrolled'    => 'Nepavīka atmestė paskotėnė [[User:$2|$2]] ([[User talk:$2|Aptarėms]]) darīta straipsnė [[$1]] keitėma;
 kažkas jau pakeitė straipsnė arba sospiejė pėrmiesnis atmestė keitėma.
 
 GalÄ—nis keitÄ—ms dÄ—rbts nauduotuojÄ— [[User:$3|$3]] ([[User talk:$3|AptarÄ—ms]]).',
-'editcomment'                 => 'Redagavėma kuomentars: „<i>$1</i>“.', # only shown if there is an edit comment
-'revertpage'                  => 'Atmests [[Special:Contributions/$2|$2]] ([[User talk:$2|Aptarėms]]) pakeitėms; sogr�žėnta nauduotuojė [[User:$1|$1]] versėjė', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Atmestė $1 keitėm�; gr�žėnta i paskotėne $2 versėje.',
-'sessionfailure'              => 'Atruod kū īr biedū so Tamstas prėsėjongėma sesėjė; šėts veiksmos bova atšaukts k�p atsargoma prėimonė priš sesėjės vuogėma.
+'editcomment'      => "Redagavėma kuomentars: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Atmests [[Special:Contributions/$2|$2]] ([[User talk:$2|Aptarėms]]) pakeitėms; sogr�žėnta nauduotuojė [[User:$1|$1]] versėjė', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Atmestė $1 keitėm�; gr�žėnta i paskotėne $2 versėje.',
+'sessionfailure'   => 'Atruod kū īr biedū so Tamstas prėsėjongėma sesėjė; šėts veiksmos bova atšaukts k�p atsargoma prėimonė priš sesėjės vuogėma.
 Prašoum paspaustė „atgal“ ėr parkrautė poslapi ėš katruo atiejot, ė pamieginkėt vielē.',
+
+# Protect
 'protectlogpage'              => 'RakinÄ—mu istuorÄ—jÄ—',
 'protectlogtext'              => 'Žemiau īr poslapė ožrakinėmu teipuogi atrakinėmu istuorėjė. Daba veikiantiu poslapiu apsaugū s�raša sorasit [[Special:ProtectedPages|apsauguotu poslapiu s�rašuo]].',
 'protectedarticle'            => 'ožrakina „[[$1]]“',
 'modifiedarticleprotection'   => 'pakeists „[[$1]]“ apsauguos līgis',
 'unprotectedarticle'          => 'atrakėna „[[$1]]“',
 'protect-title'               => 'Nustatuoms apsauguojėma līgis poslapi� „$1“',
+'prot_1movedto2'              => 'Straipsnis [[$1]] parvadints i [[$2]]',
 'protect-legend'              => 'Ožrakinėma patvėrtinėms',
 'protectcomment'              => 'Kuomentars:',
 'protectexpiry'               => 'Beng galiuotÄ—:',
 'protect_expiry_invalid'      => 'Galiuojėma �iesos īr nateisėngs.',
 'protect_expiry_old'          => 'Galiuojėma �iesos īr praėitī.',
 'protect-unchain'             => 'AtrakintÄ— parvadinÄ—ma teises',
-'protect-text'                => 'Čė Tamsta galėt paveizėtė ė pakeistė apsauguos līgi šėtuo poslapio <strong>$1</strong>.',
-'protect-locked-access'       => 'Tamstas paskīra netor teisiu keistė poslapiu apsauguos līgiu.
-Čė īr dabartėnē nustatīm� poslapi� <strong>$1</strong>:',
+'protect-text'                => "Čė Tamsta galėt paveizėtė ė pakeistė apsauguos līgi šėtuo poslapio '''$1'''.",
+'protect-locked-access'       => "Tamstas paskīra netor teisiu keistė poslapiu apsauguos līgiu.
+Čė īr dabartėnē nustatīm� poslapi� '''$1''':",
 'protect-cascadeon'           => 'Tas poslapis nūn� īr apsauguots, kadongi ons īr itraukts i {{PLURAL:$1|ta poslapi, apsauguota|tūs poslapiūs, apsauguotus}} „pakuopėnės apsauguos“ pasėrėnkėmu. Tamsta galėt pakeistė šėta poslapė apsauguos līgi, no tas nepaveiks pakuopėnės apsauguos.',
-'protect-default'             => '(palē nutīliejėma)',
+'protect-default'             => 'LeistÄ— vÄ—sÄ—ms nauduotuojams',
 'protect-fallback'            => 'Rēkalautė „$1“ teisės',
-'protect-level-autoconfirmed' => 'NalaistÄ— neregÄ—stroutÄ—m nauduotuojam',
+'protect-level-autoconfirmed' => 'Blokoutė naujē prisėregėstravosius ė neregėstroutus nauduotuojus',
 'protect-level-sysop'         => 'Tėkt�s adminėstratuorē',
 'protect-summary-cascade'     => 'pakuopÄ—nÄ— apsauga',
 'protect-expiring'            => 'beng galiuotÄ— $1 (UTC)',
 'protect-cascade'             => 'ApsaugotÄ— poslapius, itrauktus i Å¡Ä—ta poslapi (pakuopÄ—nÄ— apsauga).',
 'protect-cantedit'            => 'Tamsta negalėt keistė šėta poslapė apsauguojėma līgiu, kagongi netorėt teisiu anuo redagoutė.',
+'protect-othertime'           => 'Kėts �iesos:',
+'protect-othertime-op'        => 'kėts �iesos',
+'protect-existing-expiry'     => 'Esams rakėnėma ožsėbengėma �iesos: $3, $2',
+'protect-otherreason'         => 'Kėta/papėlduoma prīžastis:',
+'protect-otherreason-op'      => 'kėta/papėlduoma prīžastis',
+'protect-expiry-options'      => '2 adīnas:2 hours,1 dėina:1 day,3 dėinas:3 days,1 nedielė:1 week,2 nedielės:2 weeks,1 mienou:1 month,3 mienesē:3 months,6 mienesē:6 months,1 met�:1 year,omžėms:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'LaidÄ—ms:',
 'restriction-level'           => 'Aprėbuojėma līgis:',
 'minimum-size'                => 'MinÄ—malus dÄ—doms',
@@ -1115,6 +1178,7 @@ ruodoma žemiau, teipuogi kas redagava poslapi
 lėgė trīnima. Ėštrintū poslapiu tekstos īr galėmas tėk admėnėstratuoriam.',
 'undeleterevision-missing' => 'Neteisėnga a dėngosė versėjė. Tamsta mažo torėt bluoga nūruoda, a versėjė bova atkorta a pašalėnta ėš arkīva.',
 'undeletebtn'              => 'AtkortÄ—',
+'undeletelink'             => 'atstatītė',
 'undeletereset'            => 'Ä–Å¡ naujÄ—',
 'undeletecomment'          => 'Kuomentars:',
 'undeletedarticle'         => 'atkorta „[[$1]]“',
@@ -1135,12 +1199,13 @@ Parveizėkiet [[Special:Log/delete|trīnimu s�raša]], nuoriedamė rastė pasko
 'blanknamespace' => '(PagrÄ—ndinÄ—)',
 
 # Contributions
-'contributions' => 'NauduotuojÄ— duovis',
-'mycontris'     => 'Mona duovis',
-'contribsub2'   => 'NauduotuojÄ— $1 ($2)',
-'uctop'         => ' (paskotinis)',
-'month'         => 'Nu mienÄ—sÄ— (Ä—r onkstiau):',
-'year'          => 'Nu metu (Ä—r onkstiau):',
+'contributions'       => 'NauduotuojÄ— duovis',
+'contributions-title' => 'NauduotuojÄ— $1 duovis',
+'mycontris'           => 'Mona duovis',
+'contribsub2'         => 'NauduotuojÄ— $1 ($2)',
+'uctop'               => ' (paskotinis)',
+'month'               => 'Nu mienÄ—sÄ— (Ä—r onkstiau):',
+'year'                => 'Nu metu (Ä—r onkstiau):',
 
 'sp-contributions-newbies'     => 'Ruodītė tėk naujū prieteliu duovios',
 'sp-contributions-newbies-sub' => 'Naujuoms paskīruoms',
@@ -1150,18 +1215,22 @@ Parveizėkiet [[Special:Log/delete|trīnimu s�raša]], nuoriedamė rastė pasko
 'sp-contributions-submit'      => 'Ėiškuotė',
 
 # What links here
-'whatlinkshere'       => 'Sosėjėn straipsnē',
-'whatlinkshere-title' => 'Poslapē, katrėi ruod i "$1"',
-'whatlinkshere-page'  => 'Poslapis:',
-'linklistsub'         => '(Nūruodu s�rašos)',
-'linkshere'           => "Šėtė poslapē ruod i '''[[:$1]]''':",
-'nolinkshere'         => "I '''[[:$1]]''' nūruodu nier.",
-'nolinkshere-ns'      => "Nurodītuo vardū srėtī anė vėins poslapis neruod i '''[[:$1]]'''.",
-'isredirect'          => 'nukreipēmasės poslapis',
-'istemplate'          => 'iterpims',
-'whatlinkshere-prev'  => '$1 {{PLURAL:$1|onkstesnis|onkstesni|onkstesniū}}',
-'whatlinkshere-next'  => '$1 {{PLURAL:$1|kėts|kėtė|kėtū}}',
-'whatlinkshere-links' => '� nūruodas',
+'whatlinkshere'            => 'Sosėjėn straipsnē',
+'whatlinkshere-title'      => 'Poslapē, katrėi ruod i "$1"',
+'whatlinkshere-page'       => 'Poslapis:',
+'linkshere'                => "Šėtė poslapē ruod i '''[[:$1]]''':",
+'nolinkshere'              => "I '''[[:$1]]''' nūruodu nier.",
+'nolinkshere-ns'           => "Nurodītuo vardū srėtī anė vėins poslapis neruod i '''[[:$1]]'''.",
+'isredirect'               => 'nukreipēmasės poslapis',
+'istemplate'               => 'iterpims',
+'isimage'                  => 'abruozdielė nūruoda',
+'whatlinkshere-prev'       => '$1 {{PLURAL:$1|onkstesnis|onkstesni|onkstesniū}}',
+'whatlinkshere-next'       => '$1 {{PLURAL:$1|kėts|kėtė|kėtū}}',
+'whatlinkshere-links'      => '� nūruodas',
+'whatlinkshere-hideredirs' => '$1 nukreipÄ—mus',
+'whatlinkshere-hidetrans'  => '$1 itraukÄ—mus',
+'whatlinkshere-hidelinks'  => '$1 nūruodas',
+'whatlinkshere-filters'    => 'Fėltr�',
 
 # Block/unblock
 'blockip'                     => 'Ožblokoutė nauduotuoja',
@@ -1219,6 +1288,7 @@ onkstiau ožbluokoutam IP adres� a nauduotuoj�.',
 'ipblocklist-no-results'      => 'Prašuoms IP adresos a nauduotuojė vards ožblokouts nier.',
 'blocklink'                   => 'ožblokoutė',
 'unblocklink'                 => 'atbluokoutÄ—',
+'change-blocklink'            => 'keistė bluokavėma nustatīmus',
 'contribslink'                => 'duovis',
 'autoblocker'                 => 'Autuomatėnis ožbluokavėms, nes dalėnaties IP adreso so nauduotuojo "$1". Prīžastės - "$2".',
 'blocklogpage'                => 'Ožblokavėmu istuorėjė',
@@ -1257,6 +1327,8 @@ kū soprantat vėsas pasiekmes.",
 *Paliksėt žemiau asontė varnale nepažīmieta.
 Šėt�s atviej�s Tamsta sava nužiūra torėt parkeltė a apjongtė aptarėma poslapi.",
 'movearticle'             => 'ParvadintÄ— poslapi:',
+'movenologin'             => 'NeprisÄ—jongÄ—s',
+'movenologintext'         => 'Nuoriedamė parvadintė poslapi, torėt būtė ožsėregėstravės nauduotuos ė teipuogi būtė [[Special:UserLogin|prisėjongės]].',
 'newtitle'                => 'Naus pavadÄ—nÄ—ms:',
 'move-watch'              => 'KeravuotÄ— Å¡Ä—ta poslapi',
 'movepagebtn'             => 'ParvadintÄ— poslapÄ—',
@@ -1316,24 +1388,27 @@ Paskėrties straipsnis „[[:$1]]“ jau īr. A nuorėt ana ėštrintė, kū gal
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|keitims|keitim�|keitimu}} ėš $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mona nauduotuojÄ— poslapis',
+'tooltip-pt-userpage'             => 'Tamstas nauduotuojÄ— poslapis',
 'tooltip-pt-anonuserpage'         => 'Nauduotuojė poslapis Tamstas IP adres�',
-'tooltip-pt-mytalk'               => 'Mona aptarÄ—ma poslapis',
+'tooltip-pt-mytalk'               => 'Tamstas aptarÄ—ma poslapis',
 'tooltip-pt-preferences'          => 'Mona nostatīm�',
 'tooltip-pt-watchlist'            => 'Poslapiu s�rašos, katrūs Tamsta pasėrėnkuot keravuotė.',
-'tooltip-pt-mycontris'            => 'Mona darītu keitimu s�rašos',
+'tooltip-pt-mycontris'            => 'Tamstas darītu keitimu s�rašos',
 'tooltip-pt-login'                => 'Rekuomendoujam prÄ—sÄ—jongtÄ—, nuors tas nÄ—r privaluoma.',
 'tooltip-pt-logout'               => 'AtsÄ—jongtÄ—',
 'tooltip-ca-talk'                 => 'PoslapÄ— torÄ—nÄ— aptarÄ—ms',
 'tooltip-ca-edit'                 => 'Tamsta galėt keistė ta poslapi. Nepamėrškėt paspaustė parvaizuos mīgtoka priš ėšsauguodamė.',
-'tooltip-ca-addsection'           => 'PridietÄ— kuomentara i aptarÄ—ma.',
+'tooltip-ca-addsection'           => 'Pradietė nauja skīriu',
 'tooltip-ca-viewsource'           => 'Poslapis īr ožrakints. Galėt parveizėt torini.',
+'tooltip-ca-history'              => 'UnkstesnÄ—s poslapÄ— versÄ—jÄ—s.',
 'tooltip-ca-protect'              => 'Ožrakėntė šėta poslapi',
 'tooltip-ca-delete'               => 'TrÄ—ntÄ— ta poslapi',
 'tooltip-ca-move'                 => 'ParvadÄ—ntÄ— poslapi',
 'tooltip-ca-watch'                => 'Pridietė poslapi i keravuojamu s�raša',
 'tooltip-ca-unwatch'              => 'Pašalėntė poslapi ėš keravuojamu s�raša',
 'tooltip-search'                  => 'Ėiškuotė šėtom pruojektė',
+'tooltip-search-go'               => 'Ētė i poslapi su tuokiu pavadėnėmu jēgo tuoks īr',
+'tooltip-search-fulltext'         => 'Ėiškuotė poslapiu so tuokiu tekstu',
 'tooltip-p-logo'                  => 'PÄ—rms poslapis',
 'tooltip-n-mainpage'              => 'Aplonkītė pėrma poslapi',
 'tooltip-n-portal'                => 'Aple pruojekta, ka galėma vēktė, kamė ka rastė',
@@ -1343,12 +1418,15 @@ Paskėrties straipsnis „[[:$1]]“ jau īr. A nuorėt ana ėštrintė, kū gal
 'tooltip-n-help'                  => 'Vėita, katruo rasėt rūpėmus atsakīmus.',
 'tooltip-t-whatlinkshere'         => 'Poslapiu s�rašos, ruodantiu i �ė',
 'tooltip-t-recentchangeslinked'   => 'Paskotėnē pakeitėm� straipsnious, pasėikiamous ėš šėta straipsnė',
+'tooltip-feed-rss'                => 'Å Ä—ta poslapÄ— RSS Å¡altÄ—nis',
+'tooltip-feed-atom'               => 'Å Ä—ta poslapÄ— Atom Å¡altÄ—nis',
 'tooltip-t-contributions'         => 'Ruodītė šėta nauduotuojė keitėmu s�raša',
 'tooltip-t-emailuser'             => 'Si�stė gromata šėtom prietėli�',
 'tooltip-t-upload'                => 'IdietÄ— abruozdielios a medÄ—jÄ—s failos',
 'tooltip-t-specialpages'          => 'Specēliūju poslapiu s�rašos',
 'tooltip-t-print'                 => 'Šėta poslapė versėjė spausdėnėm�',
 'tooltip-t-permalink'             => 'Vėslaikėnė nūruoda i šėta poslapė versėje',
+'tooltip-ca-nstab-main'           => 'Ruodītė poslapė torėni',
 'tooltip-ca-nstab-user'           => 'Ruodītė nauduotuojė poslapi',
 'tooltip-ca-nstab-special'        => 'Šėts poslapis īr specēlosis - anuo nagalėm redagoutė.',
 'tooltip-ca-nstab-project'        => 'Ruodītė pruojekta poslapi',
@@ -1363,6 +1441,7 @@ Paskėrties straipsnis „[[:$1]]“ jau īr. A nuorėt ana ėštrintė, kū gal
 'tooltip-compareselectedversions' => 'Veizėtė abodvėju pasėrėnktū poslapė versėju skėrtomos.',
 'tooltip-watch'                   => 'Pridietė šėta poslapi i keravuojamu s�raša',
 'tooltip-recreate'                => 'Atkortė poslapi napaisant šėto, kū ans bova ėštrints',
+'tooltip-undo'                    => '"Anolioutė" atmeta ta keitėma ėr atidara unkstesnies versėjės redagavėma skvarma. Leid pridietė atmetėma prīžasti kuomentarūsė.',
 
 # Attribution
 'anonymous'        => 'NeregÄ—strouts nauduotuos',
@@ -1420,9 +1499,10 @@ Paskėrties straipsnis „[[:$1]]“ jau īr. A nuorėt ana ėštrintė, kū gal
 'show-big-image'       => 'Pėlns ėšraiškėms',
 'show-big-image-thumb' => '<small>Šėtuos parvaizos dėdums: $1 × $2 puškiu</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Naujausiu abruozdieliu galerÄ—jÄ—',
 'imagelisttext'         => "Žemiau īr '''$1''' failu s�rašos, sorūšiouts $2.",
+'newimages-label'       => 'Faila vards (ar anuo dalis):',
 'showhidebots'          => '($1 robotos)',
 'ilsubmit'              => 'Ėiškoutė',
 'bydate'                => 'palē data',
@@ -1497,18 +1577,9 @@ Vėsas kėtas nūoruodas tuo patiuo eilotie īr laikomas ėšėmtim, tas rēšk
 'deletedwhileediting' => 'DiemesÄ—: Å Ä—ts poslapis Ä—Å¡trints po Å¡Ä—ta, kumet pradiejot redagoutÄ—!',
 'recreate'            => 'AtkortÄ—',
 
-# HTML dump
-'redirectingto' => 'Paradresounama i [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'Tink',
 
-# AJAX search
-'searchcontaining' => "Ėiškuotė straipsniu, katrė prasided ''$1''.",
-'searchnamed'      => "Ėiškuotė straipsniu, so pavadėnėmu ''$1''.",
-'articletitles'    => "Straipsnē, pradedont nu ''$1''",
-'hideresults'      => 'KavuotÄ— rezoltatus',
-
 # Multipage image navigation
 'imgmultipageprev' => '� onkstesnis poslapis',
 'imgmultipagenext' => 'kėts poslapis →',
diff --git a/languages/messages/MessagesBcc.php b/languages/messages/MessagesBcc.php
index 28fbf061..4aea2092 100644
--- a/languages/messages/MessagesBcc.php
+++ b/languages/messages/MessagesBcc.php
@@ -9,101 +9,128 @@
 
 $fallback = 'fa';
 
-$skinNames = array(
-	'standard'    => 'کلاسیک',
-	'nostalgia'   => 'نوستالجیک',
-	'cologneblue' => 'نیلی کولاجن',
-	'monobook'    => 'منوبوک',
-	'myskin'      => 'منی جلد',
-	'chick'       => 'شیک',
-	'simple'      => 'ساده',
-	'modern'      => 'مدرن',
+
+$namespaceNames = array(
+	NS_MEDIA            => 'مدیا',
+	NS_SPECIAL          => 'حاص',
+	NS_TALK             => 'Ú¯Ù¾',
+	NS_USER             => 'کاربر',
+	NS_USER_TALK        => 'گپ_کاربر',
+	NS_PROJECT_TALK     => 'Ú¯Ù¾_$1',
+	NS_FILE             => 'عکس',
+	NS_FILE_TALK        => 'گپ_عکس',
+	NS_MEDIAWIKI        => 'مدیاویکی',
+	NS_MEDIAWIKI_TALK   => 'گپ_مدیاویکی',
+	NS_TEMPLATE         => 'تمپلت',
+	NS_TEMPLATE_TALK    => 'گپ_تمپلت',
+	NS_HELP             => 'Ú©Ù…Ú©',
+	NS_HELP_TALK        => 'گپ_راهنما',
+	NS_CATEGORY         => 'دسته',
+	NS_CATEGORY_TALK    => 'گپ_دسته',
+);
+
+$namespaceAliases = array(
+	'مدیا' => NS_MEDIA,
+	'ویژه' => NS_SPECIAL,
+	'بحث' => NS_TALK,
+	'کاربر' => NS_USER,
+	'بحث_کاربر' => NS_USER_TALK,
+	'بحث_$1' => NS_PROJECT_TALK,
+	'تصویر' => NS_FILE,
+	'بحث_تصویر' => NS_FILE_TALK,
+	'مدیاویکی' => NS_MEDIAWIKI,
+	'بحث_مدیاویکی' => NS_MEDIAWIKI_TALK,
+	'الگو' => NS_TEMPLATE,
+	'بحث_الگو' => NS_TEMPLATE_TALK,
+	'راهنما' => NS_HELP,
+	'بحث_راهنما' => NS_HELP_TALK,
+	'رده' => NS_CATEGORY,
+	'بحث_رده' => NS_CATEGORY_TALK,
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'دوبل غیر مستقیم' ),
-	'BrokenRedirects'         => array( 'پرشتگین غیرمستقیم' ),
-	'Disambiguations'         => array( 'ر�ع ابهام' ),
-	'Userlogin'               => array( 'ورودکاربر' ),
-	'Userlogout'              => array( 'دربیگ کاربر' ),
-	'CreateAccount'           => array( 'شرکتن حساب' ),
-	'Preferences'             => array( 'ترجیحات' ),
-	'Watchlist'               => array( 'لیست چارگ' ),
-	'Recentchanges'           => array( 'نوکین تغییرات' ),
-	'Upload'                  => array( 'آپلود' ),
-	'Imagelist'               => array( 'لیست عکس' ),
-	'Newimages'               => array( 'نوکین عکسان' ),
-	'Listusers'               => array( 'لیست کاربر' ),
-	'Listgrouprights'         => array( 'لیست حقوق گروه' ),
-	'Statistics'              => array( 'آمار' ),
-	'Randompage'              => array( 'ص�حه تصاد�ی' ),
-	'Lonelypages'             => array( 'ص�حات یتیم' ),
-	'Uncategorizedpages'      => array( 'ص�حات بی دسته' ),
-	'Uncategorizedcategories' => array( 'دستجات بی دسته' ),
-	'Uncategorizedimages'     => array( 'عکسان بی دسته' ),
-	'Uncategorizedtemplates'  => array( 'تمپلتان بی دسته' ),
-	'Unusedcategories'        => array( 'بی است�اده این دسته' ),
-	'Unusedimages'            => array( 'بی است�اده این عکس' ),
-	'Wantedpages'             => array( 'لوٹتگین ص�حات' ),
-	'Wantedcategories'        => array( 'لوٹتگین دسته' ),
-	'Missingfiles'            => array( 'گارین �ایل' ),
-	'Mostlinked'              => array( 'گیشتر لینک بوتت' ),
-	'Mostlinkedcategories'    => array( 'دستجات گیشتر لینک بوتگین' ),
-	'Mostlinkedtemplates'     => array( 'تمپلتان گیشتر لینک بوتگین' ),
-	'Mostcategories'          => array( 'گیشترین دستجات' ),
-	'Mostimages'              => array( 'گیشترین عکس' ),
-	'Mostrevisions'           => array( 'گیشترین بازبینی' ),
-	'Fewestrevisions'         => array( 'کمترین بازبینی' ),
-	'Shortpages'              => array( 'هوردین ص�حات' ),
-	'Longpages'               => array( 'مزنین ص�حات' ),
-	'Newpages'                => array( 'نوکین ص�حات' ),
-	'Ancientpages'            => array( 'ص�حات قدیمی' ),
-	'Deadendpages'            => array( 'مرتگین ص�حات' ),
-	'Protectedpages'          => array( 'ص�حات محا�ظتی' ),
-	'Protectedtitles'         => array( 'عناوین محا�ظتی' ),
-	'Allpages'                => array( 'کل ص�حات' ),
-	'Prefixindex'             => array( 'ایندکس پیشوند' ),
-	'Ipblocklist'             => array( 'لیست محدوددیت آی پی' ),
-	'Specialpages'            => array( 'حاصین ص�حات' ),
-	'Contributions'           => array( 'مشارکتان' ),
-	'Emailuser'               => array( 'ایمیل کاربر' ),
-	'Confirmemail'            => array( 'تایید ایمیل' ),
-	'Whatlinkshere'           => array( 'ای لینکی ادان هست' ),
-	'Recentchangeslinked'     => array( 'نوکین تغییرات لینک' ),
-	'Movepage'                => array( 'جاه په جاهی ص�حه' ),
-	'Blockme'                 => array( 'محدودیت من' ),
-	'Booksources'             => array( 'منابع کتاب' ),
-	'Categories'              => array( 'دستجات' ),
-	'Export'                  => array( 'درگیزگ' ),
-	'Version'                 => array( 'نسخه' ),
-	'Allmessages'             => array( 'کل کوله یان' ),
-	'Log'                     => array( 'ورودان' ),
-	'Blockip'                 => array( 'محدود آی پی' ),
-	'Undelete'                => array( 'حذ� نکتن' ),
-	'Import'                  => array( 'وارد' ),
-	'Lockdb'                  => array( 'کبلدب' ),
-	'Unlockdb'                => array( 'کلب نه کتن دب' ),
-	'Userrights'              => array( 'حقوق کاربر' ),
-	'MIMEsearch'              => array( 'گردگ میام' ),
-	'FileDuplicateSearch'     => array( 'گردگ کپی �ایل' ),
-	'Unwatchedpages'          => array( 'نه چارتگین ص�حه' ),
-	'Listredirects'           => array( 'لیست غیر مستقیمان' ),
-	'Revisiondelete'          => array( 'حذ� بازبینی' ),
-	'Unusedtemplates'         => array( 'تمپلتان بی است�اده' ),
-	'Randomredirect'          => array( 'غیرمستقیم تصاد�ی' ),
-	'Mypage'                  => array( 'منی ص�حه' ),
-	'Mytalk'                  => array( 'منی گپ' ),
-	'Mycontributions'         => array( 'منی مشارکت' ),
-	'Listadmins'              => array( 'لیست مدیران' ),
-	'Listbots'                => array( 'لیست روباتان' ),
-	'Popularpages'            => array( 'مردمی ص�حات' ),
-	'Search'                  => array( 'گردگ' ),
-	'Resetpass'               => array( 'تریتگ رمز' ),
-	'Withoutinterwiki'        => array( 'بی بین ویکی' ),
-	'MergeHistory'            => array( 'چندوبند تاریح' ),
-	'Filepath'                => array( 'مسیر �ایل' ),
-	'Invalidateemail'         => array( 'نامعتبرین ایمیل' ),
-	'Blankpage'               => array( 'ص�حه هالیک' ),
+	'DoubleRedirects'           => array( 'دوبل غیر مستقیم' ),
+	'BrokenRedirects'           => array( 'پرشتگین غیرمستقیم' ),
+	'Disambiguations'           => array( 'ر�ع ابهام' ),
+	'Userlogin'                 => array( 'ورودکاربر' ),
+	'Userlogout'                => array( 'دربیگ کاربر' ),
+	'CreateAccount'             => array( 'شرکتن حساب' ),
+	'Preferences'               => array( 'ترجیحات' ),
+	'Watchlist'                 => array( 'لیست چارگ' ),
+	'Recentchanges'             => array( 'نوکین تغییرات' ),
+	'Upload'                    => array( 'آپلود' ),
+	'Listfiles'                 => array( 'لیست عکس' ),
+	'Newimages'                 => array( 'نوکین عکسان' ),
+	'Listusers'                 => array( 'لیست کاربر' ),
+	'Listgrouprights'           => array( 'لیست حقوق گروه' ),
+	'Statistics'                => array( 'آمار' ),
+	'Randompage'                => array( 'ص�حه تصاد�ی' ),
+	'Lonelypages'               => array( 'ص�حات یتیم' ),
+	'Uncategorizedpages'        => array( 'ص�حات بی دسته' ),
+	'Uncategorizedcategories'   => array( 'دستجات بی دسته' ),
+	'Uncategorizedimages'       => array( 'عکسان بی دسته' ),
+	'Uncategorizedtemplates'    => array( 'تمپلتان بی دسته' ),
+	'Unusedcategories'          => array( 'بی است�اده این دسته' ),
+	'Unusedimages'              => array( 'بی است�اده این عکس' ),
+	'Wantedpages'               => array( 'لوٹتگین ص�حات' ),
+	'Wantedcategories'          => array( 'لوٹتگین دسته' ),
+	'Mostlinked'                => array( 'گیشتر لینک بوتت' ),
+	'Mostlinkedcategories'      => array( 'دستجات گیشتر لینک بوتگین' ),
+	'Mostlinkedtemplates'       => array( 'تمپلتان گیشتر لینک بوتگین' ),
+	'Mostcategories'            => array( 'گیشترین دستجات' ),
+	'Mostimages'                => array( 'گیشترین عکس' ),
+	'Mostrevisions'             => array( 'گیشترین بازبینی' ),
+	'Fewestrevisions'           => array( 'کمترین بازبینی' ),
+	'Shortpages'                => array( 'هوردین ص�حات' ),
+	'Longpages'                 => array( 'مزنین ص�حات' ),
+	'Newpages'                  => array( 'نوکین ص�حات' ),
+	'Ancientpages'              => array( 'ص�حات قدیمی' ),
+	'Deadendpages'              => array( 'مرتگین ص�حات' ),
+	'Protectedpages'            => array( 'ص�حات محا�ظتی' ),
+	'Protectedtitles'           => array( 'عناوین محا�ظتی' ),
+	'Allpages'                  => array( 'کل ص�حات' ),
+	'Prefixindex'               => array( 'ایندکس پیشوند' ),
+	'Ipblocklist'               => array( 'لیست محدوددیت آی پی' ),
+	'Specialpages'              => array( 'حاصین ص�حات' ),
+	'Contributions'             => array( 'مشارکتان' ),
+	'Emailuser'                 => array( 'ایمیل کاربر' ),
+	'Confirmemail'              => array( 'تایید ایمیل' ),
+	'Whatlinkshere'             => array( 'ای لینکی ادان هست' ),
+	'Recentchangeslinked'       => array( 'نوکین تغییرات لینک' ),
+	'Movepage'                  => array( 'جاه په جاهی ص�حه' ),
+	'Blockme'                   => array( 'محدودیت من' ),
+	'Booksources'               => array( 'منابع کتاب' ),
+	'Categories'                => array( 'دستجات' ),
+	'Export'                    => array( 'درگیزگ' ),
+	'Version'                   => array( 'نسخه' ),
+	'Allmessages'               => array( 'کل کوله یان' ),
+	'Log'                       => array( 'ورودان' ),
+	'Blockip'                   => array( 'محدود آی پی' ),
+	'Undelete'                  => array( 'حذ� نکتن' ),
+	'Import'                    => array( 'وارد' ),
+	'Lockdb'                    => array( 'کبلدب' ),
+	'Unlockdb'                  => array( 'کلب نه کتن دب' ),
+	'Userrights'                => array( 'حقوق کاربر' ),
+	'MIMEsearch'                => array( 'گردگ میام' ),
+	'FileDuplicateSearch'       => array( 'گردگ کپی �ایل' ),
+	'Unwatchedpages'            => array( 'نه چارتگین ص�حه' ),
+	'Listredirects'             => array( 'لیست غیر مستقیمان' ),
+	'Revisiondelete'            => array( 'حذ� بازبینی' ),
+	'Unusedtemplates'           => array( 'تمپلتان بی است�اده' ),
+	'Randomredirect'            => array( 'غیرمستقیم تصاد�ی' ),
+	'Mypage'                    => array( 'منی ص�حه' ),
+	'Mytalk'                    => array( 'منی گپ' ),
+	'Mycontributions'           => array( 'منی مشارکت' ),
+	'Listadmins'                => array( 'لیست مدیران' ),
+	'Listbots'                  => array( 'لیست روباتان' ),
+	'Popularpages'              => array( 'مردمی ص�حات' ),
+	'Search'                    => array( 'گردگ' ),
+	'Resetpass'                 => array( 'تریتگ رمز' ),
+	'Withoutinterwiki'          => array( 'بی بین ویکی' ),
+	'MergeHistory'              => array( 'چندوبند تاریح' ),
+	'Filepath'                  => array( 'مسیر �ایل' ),
+	'Invalidateemail'           => array( 'نامعتبرین ایمیل' ),
+	'Blankpage'                 => array( 'ص�حه هالیک' ),
 );
 
 $messages = array(
@@ -144,17 +171,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'منی اصلاحات آ چه لیست چارگ پناه کن',
 'tog-watchlisthidebots'       => 'اصلاحات بوت چه لیست چارگ پناه کن',
 'tog-watchlisthideminor'      => 'هوردین اصلاحات چه لیست چارگ پناه کن',
+'tog-watchlisthideliu'        => 'اصلاحات چه وارد بوتگین کاربران چه لیست چارگان پناه کن',
+'tog-watchlisthideanons'      => 'اصلاحات ناشناسین کاربرانء چه لیست چارگ پناه کن',
 'tog-nolangconversion'        => 'غیر �عال کتن بدل کتن مغایرت آن',
 'tog-ccmeonemails'            => 'په من یک کپی چه ایمیل آنی که من په دگه کاربران راه داته دیم دی',
 'tog-diffonly'                => 'چیر ت�اوت محتوای ص�حه ی پیش مدار',
 'tog-showhiddencats'          => 'پناه ین دسته یان پیش دار',
+'tog-norollbackdiff'          => 'ت�اوتء حذ� کن بعد چه اجرای یک ترینگ',
 
 'underline-always'  => 'یکسره',
 'underline-never'   => 'هچ وهد',
 'underline-default' => 'پیش�رضین بروزر',
 
-'skinpreview' => '(بازبینی)',
-
 # Dates
 'sunday'        => 'یک شنبه',
 'monday'        => 'دوشنبه',
@@ -247,7 +275,7 @@ $messages = array(
 'mytalk'         => 'منی گپ',
 'anontalk'       => 'گپ کن گون ای آی پی',
 'navigation'     => 'گردگ',
-'and'            => 'Ùˆ',
+'and'            => '&#32;Ùˆ',
 
 # Metadata in edit box
 'metadata_help' => 'متادیتا',
@@ -284,14 +312,14 @@ $messages = array(
 'talkpagelinktext'  => 'Ú¯Ù¾ Ú©Ù†',
 'specialpage'       => 'حاصین ص�حه',
 'personaltools'     => 'شخصی وسایل',
-'postcomment'       => 'یک نظر دیم دی',
+'postcomment'       => 'نوکین بخش',
 'articlepage'       => 'محتوا ص�حه به گند',
 'talk'              => 'بحث',
 'views'             => 'چارگان',
 'toolbox'           => 'جعبه ابزار',
 'userpage'          => 'به گند ص�حه کاربر',
 'projectpage'       => 'به گند ص�حه',
-'imagepage'         => 'به گند ص�حه',
+'imagepage'         => 'به چار �ایل ص�حه ءَ',
 'mediawikipage'     => 'به گند ص�حه کوله',
 'templatepage'      => 'به گند ص�حه تمپلت آ',
 'viewhelppage'      => 'به گند ص�حه کمک آ',
@@ -310,8 +338,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'باره {{SITENAME}}',
 'aboutpage'            => 'Project:باره',
-'bugreports'           => 'گزارشات باگ',
-'bugreportspage'       => 'Project:گزارشات باگ',
 'copyright'            => 'محتوا موجودانت تحت $1.',
 'copyrightpagename'    => 'حق کپی{{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:حق کپی',
@@ -334,9 +360,7 @@ $messages = array(
 
 'badaccess'        => 'حطا اجازت',
 'badaccess-group0' => 'شما مجاز نهیت عملی که درخواست کت اجرا کنیت',
-'badaccess-group1' => 'عملی که ما درخواست کتت مربوط به گروه کابران $1.',
-'badaccess-group2' => 'کاری که شما درخواست کت محدود په کاربران ته یکی چه گروهان $1.',
-'badaccess-groups' => 'کاری که شما درخواست کت محدود په کابران ته یکی چه گروهان $1.',
+'badaccess-groups' => 'کاری که شما درخواست کت محدود په کابران ته یکی چه گروهان {{PLURAL:$2|گروه|یکی چه گروهان}}: $1.',
 
 'versionrequired'     => 'نسخه $1. مدیا وی کی نیازنت',
 'versionrequiredtext' => 'نسخه $1 چه مدیا وی کی نیازنت په است�اده ای ص�حه. بچار [[Special:Version|version page]].',
@@ -350,6 +374,8 @@ $messages = array(
 'editsection'             => 'اصلاح',
 'editold'                 => 'اصلاح',
 'viewsourceold'           => 'به گند منبع ا',
+'editlink'                => 'اصلاح',
+'viewsourcelink'          => 'چارگ منبع',
 'editsectionhint'         => ': $1اصلاح انتخاب',
 'toc'                     => 'محتوا',
 'showtoc'                 => 'پیش دار',
@@ -366,13 +392,13 @@ $messages = array(
 'page-atom-feed'          => 'منبع "$1" Atom',
 'feed-atom'               => 'اتم',
 'feed-rss'                => 'ار اس اس',
-'red-link-title'          => '$1(هنگت نویسگ نه بیته)',
+'red-link-title'          => '$1 (هنگت  نیستن)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ص�حه',
 'nstab-user'      => 'ص�حه کاربر',
 'nstab-media'     => 'ص�حه مدیا',
-'nstab-special'   => 'حاصین',
+'nstab-special'   => 'حاصین ص�حات',
 'nstab-project'   => 'ص�حه پروژه',
 'nstab-image'     => '�ایل',
 'nstab-mediawiki' => 'کوله',
@@ -382,7 +408,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'نی چشین عمل',
-'nosuchactiontext'  => 'کاری که گون URL مشخص بیته گون وی کی پچاه آرگ نبیت',
+'nosuchactiontext'  => 'ای کاری که گون اای یو ار ال مشخص بیتت نامشخص انت.
+شما بلکین یو‌ارال شر ننوشتت یا رند چه هرابیت لینکی اتکگیت
+شی بلکین یک خطایی ته برنامه سایت {{SITENAME}} پیش داریت.',
 'nosuchspecialpage' => 'نی چشین حاصین ص�حه',
 'nospecialpagetext' => "<big>'''شما یک نامعتبرین ص�حه حاصین درخواست کت.'''</big>
 
@@ -436,7 +464,6 @@ $1',
 'badtitle'             => 'عنوان بد',
 'badtitletext'         => 'لوٹتگین عنوان ص�حه نامعتبر ،هالیک یا یک عنوان هرابین لینک بین زبانی یا بین وی کی انت.
 آی شاید شامل یک یا گیشترین کاراکترانت که ته عناوین است�اده نه بنت.',
-'perfdisabled'         => 'شرمنده! ای ویژگی الان غیر �عالنت شاید شی پیش داریت که دیتابیس هاموشنت که هچ کس نه تونیت وی کی است�اده کنت.',
 'perfcached'           => 'جهلیگین دیتا ذخیره بیتگنت و شاید نوک می بنت.',
 'perfcachedts'         => 'جهلیگین دیتا ذخیره بیتگنت و اهرین په روچ بیگ $1.',
 'querypage-no-updates' => 'په روچ بیگان په ای ص�حه الان غیر �عالنت. دیتا ادان الان نوکین نهنت.',
@@ -453,7 +480,7 @@ Query: $2',
 'protectedinterface'   => 'ای ص�حه �راهم آریت مداخله ی متنی په برنامه و کبل بیتت په جلوگیری چه سو است�اده.',
 'editinginterface'     => "'''هوژاری:''' شما یک ص�حه ای اصلاح کنیت که به عنوان مداخله گر متنی برنامه است�اده بیت.
 تغییرات ای ص�حه کاربرد مداخله گر په دگه کابران تاثیر هلیت.
-  [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki],  په ترجمه یان لط�ا توجه کنیت په است�اده پروژه ملکی کتن مدیا وی کی",
+  [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net],  په ترجمه یان لط�ا توجه کنیت په است�اده پروژه ملکی کتن مدیا وی کی",
 'sqlhidden'            => '(SQL درخواست پناهین)',
 'cascadeprotected'     => 'ای ص�حه محا�ظت بیت چه اصلاح چرا که آیی شامل جهلیگین {{PLURAL:$1|ص�حه, که|ص�حات, که}} محا�ظتی گون the "cascading" option turned on:
 $2',
@@ -464,16 +491,16 @@ $2',
 ای دلیل دییگ بیتت ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'تنظیم بد: ناشناسین اسکنر ویروس: <i>$1</i>',
+'virus-badscanner'     => "تنظیم بد: ناشناسین اسکنر ویروس: ''$1''",
 'virus-scanfailed'     => 'اسکن پروش وارت(کد $1)',
 'virus-unknownscanner' => 'ناشناسین آنتی ویروس:',
 
 # Login and logout pages
 'logouttitle'                => 'دربیگ کاربر',
-'logouttext'                 => '<strong> شما الان در بوتت.</strong>
+'logouttext'                 => "''' شما الان در بوتت.'''
 
 شما تونیت چه {{SITENAME}} ناشناس است�اده کنیت یا شما تونیت دگه وراد بیت گون دگه یا هما کاربر.
-توجه بیت که لهتی ص�حات شاید په داب هما وهدی که شما وراد بوتتیت پیش درگ بند تا وهدی که ذخیره بروزر وتی پاک کنیت.',
+توجه بیت که لهتی ص�حات شاید په داب هما وهدی که شما وراد بوتتیت پیش درگ بند تا وهدی که ذخیره بروزر وتی پاک کنیت.",
 'welcomecreation'            => '== وش آتکی،$1! ==
 شمی حساب شر بیت.
  مه شموشیت وتی [[Special:Preferences|{{SITENAME}} ترجیحات]] ترجیحات عوض کنیت',
@@ -484,7 +511,6 @@ $2',
 'remembermypassword'         => 'می ورود ته ای کامپیوتر په حاطر بدار',
 'yourdomainname'             => 'شمی دامین',
 'externaldberror'            => 'یک حطا دیتابیس تصدیق هویت دراییگی هست یا شما را اجازت نیست وتی حساب درایی په روچ کنیت.',
-'loginproblem'               => '<b>یک مشکلی گون شمی ورود هستت.</b><br /> دگه جهد کن!',
 'login'                      => 'ورود',
 'nav-login-createaccount'    => 'ورود/شرکتن حساب',
 'loginprompt'                => 'شما بایدن په وارد بیگ ته {{SITENAME}} کوکی �عال کنیت',
@@ -510,8 +536,8 @@ $2',
 'yourvariant'                => 'مغایر:',
 'yournick'                   => 'امضا:',
 'badsig'                     => 'نامعتبرین حامین امضا تگان HTML چک کن',
-'badsiglength'               => 'امضا باز مزنتت.
-آی بایدن چوشین  $1 {{PLURAL:$1|character|کاراکتران}}.',
+'badsiglength'               => 'شمل امضا باز مزنتت.
+آی بایدن   $1 {{PLURAL:$1|کارکاتر|کاراکتران}} مزن تر مبیت',
 'email'                      => 'ایمیل',
 'prefs-help-realname'        => 'راستین  نام اهتیاریتن. اگه شما یکی انتخاب کنیت شی په شمی کارء نشان هلگ په روت.',
 'loginerror'                 => 'حطا ورود',
@@ -528,8 +554,9 @@ $2',
 'noname'                     => 'شما یک معتبرین نام کاربر مشخص نه کتت.',
 'loginsuccesstitle'          => 'ورود مو�قیت آمیز',
 'loginsuccess'               => "''''شما الان وارد {{SITENAME}} په عنوان \"\$1\".'''",
-'nosuchuser'                 => 'هچ کاربری گون نام "$1".
-وتی املايا چک کنیت یا [[Special:UserLogin/signup|نوکین حسابی شرکنیت]]',
+'nosuchuser'                 => 'هچ کاربری گون نام "$1" نیستن.
+کاربری نام حر�ش په هور و مزنی حساس انت.
+وتی املايا چک کنیت یا [[Special:UserLogin/signup|نوکین حسابی شرکنیت]].',
 'nosuchusershort'            => 'هچ کاربری گون نام  "<nowiki>$1</nowiki>"نیستن.
 وتی املايا کنترل کنیت',
 'nouserspecified'            => 'شما باید یک نام کاربری مشخص کنیت.',
@@ -554,9 +581,9 @@ $2',
 'throttled-mailpassword'     => 'یک کلمه رمز یاد آوری پیش تر دیم دهگ بوتت ته  {{PLURAL:$1|ساعت|$1 ساعت}}  ساعت پیش.
 په جلوگرگ چه سو است�اده �قط یک کلمه رمز یاد آوری هر$1  ساعت دیم دهگ بیت.',
 'mailerror'                  => 'حطا دیم دهگ ایمیل:$1',
-'acct_creation_throttle_hit' => 'شرمنده! شما پیشتر $1  حسابی شر کتت.
-شما نه تونیت گیشتر شرکنیت.',
-'emailauthenticated'         => 'شمی آدرس ایمیل ته $1  تصدیق بوت.',
+'acct_creation_throttle_hit' => 'شرمنده، لهتی پیسرگین چارون گون شمی آی زیگ لهتی {{PLURAL:$1|1 حساب|$1 حساب}}   شر کتت , که گیشترین حد مجاز ته ای زمان انت.
+هنچوش چاروکان گون ای آی پی ن توننت گیشتر الان حساب شرکننت.',
+'emailauthenticated'         => ' $3 شمی آدرس ایمیل ته $2  تصدیق بوت.',
 'emailnotauthenticated'      => 'په آدرس ایمیل هنگت تصدیق نه بوتت.
 هچ ایمیلی په جهلیگین ویژگی دیم دهگ نه بیت.',
 'noemailprefs'               => 'یک آدرس ایمیل په کار کتن ای ویژگیان مشخص کنیت.',
@@ -570,20 +597,28 @@ $2',
 شما بایدن وارد بیت و وتی کلمه رمز الان عوض کنیت.
 
 شما شاید ای پیام شموشیت اگه ای ای حساب گون حطا شر بوتت.',
+'login-throttled'            => 'شما په کلمه رمز ای حساب باز جهد کتت نوکی. لط�ا صبر کنیت و. رندا جهد کنیت.',
 'loginlanguagelabel'         => 'زبان: $1',
 
 # Password reset dialog
-'resetpass'               => 'عوض کتن کلمه رمز حساب',
-'resetpass_announce'      => 'شما گون یک هنوکین کد ایمیل بوتگین وارد بوتءیت.
+'resetpass'                 => 'کلمه رمزءَ‌عوض کن',
+'resetpass_announce'        => 'شما گون یک هنوکین کد ایمیل بوتگین وارد بوتءیت.
 په تمام کتن ورود، شما باید یک نوکین کلمه رمز اداں شرکنیت',
-'resetpass_text'          => '<!-- متن دان هورکن -->',
-'resetpass_header'        => 'حساب کلمه رمزءَ عوض کن',
-'resetpass_submit'        => 'تنظیم کلمه رمز و ورود',
-'resetpass_success'       => 'شمی کلمه رمز گون مو�قیت عوض بون! هنو شما وارد بیگیت...',
-'resetpass_bad_temporary' => 'نامعتبر هنوکین کلمه رمز.
+'resetpass_text'            => '<!-- متن دان هورکن -->',
+'resetpass_header'          => 'حساب کلمه رمزءَ عوض کن',
+'oldpassword'               => 'کلمه رمز کهنگین:',
+'newpassword'               => 'نوکین کلمه رمز:',
+'retypenew'                 => 'کلمه رمز دگه بنویس',
+'resetpass_submit'          => 'تنظیم کلمه رمز و ورود',
+'resetpass_success'         => 'شمی کلمه رمز گون مو�قیت عوض بون! هنو شما وارد بیگیت...',
+'resetpass_bad_temporary'   => 'نامعتبر هنوکین کلمه رمز.
 شما شاید پیشتر وتی کلمه رمز آ عوض کتت یا یک نوکین هنوکین کلمه رمز لوٹتگیت.',
-'resetpass_forbidden'     => 'کلمات رمز نه توننت عوض بنت.',
-'resetpass_missing'       => 'هچ �رم دیتا',
+'resetpass_forbidden'       => 'کلمات رمز نه توننت عوض بنت.',
+'resetpass-no-info'         => 'په مستقیمین دسترسی په ای ص�حه شما بایدن وارد سایت بیت',
+'resetpass-submit-loggedin' => 'عوض کتن کلمه رمز',
+'resetpass-wrong-oldpass'   => 'کلمه رمز موقت یا هنوکین رمز شر نهنت.
+بلیکن شما الان وتی کلمه رمز عوض کتت یا یک نوکین موقتین رمزی لوٹت.',
+'resetpass-temp-password'   => 'موقتین کلمه رمز:',
 
 # Edit page toolbar
 'bold_sample'     => 'پررنگین متن',
@@ -606,8 +641,8 @@ $2',
 'hr_tip'          => 'خط ا�قی',
 
 # Edit pages
-'summary'                          => 'خلاصه',
-'subject'                          => 'موضوع/سرخط',
+'summary'                          => 'خلاصه:',
+'subject'                          => 'موضوع/سرخط:',
 'minoredit'                        => 'ای شی یک هوردین اصلاحیت',
 'watchthis'                        => 'ای ص�حه بچار',
 'savearticle'                      => 'ص�حه ذخیره کن',
@@ -622,8 +657,8 @@ $2',
 'missingcommenttext'               => 'لط�ا یک نظری وارد کنیت جهل آ',
 'missingcommentheader'             => "'''یاداوری:'' شما یک موضوع/سرخط په ای نظر وارد نکتت.
 اگر شما دگه ذخیره کلیک کنیت، شمی اصلاح بی آی ذخیره بنت.",
-'summary-preview'                  => 'خلاصه بازبینی',
-'subject-preview'                  => 'بازبین موضوع/سرخط',
+'summary-preview'                  => 'خلاصه بازبینی:',
+'subject-preview'                  => 'بازبین موضوع/سرخط:',
 'blockedtitle'                     => 'کاربر محدود بوتت',
 'blockedtext'                      => "<big>'''شمی نام کاربری یا آی پی محدود بیتت.''''</big>
 
@@ -677,29 +712,29 @@ $2',
 'noarticletext'                    => 'هنو هچ متنی ته ای ص�حه نیست، شما تونیت  [[Special:Search/{{PAGENAME}}|گردگ په عنوان ص�حه]]  ته دگه ص�حات یا [{{fullurl:{{FULLPAGENAME}}|action=edit}} ای ص�حه اصلاح کن].',
 'userpage-userdoesnotexist'        => 'حساب کاربر "$1" ثبت نهنت. لط�ا کنترل کنیت اگه شما لوٹیت ای ص�حه یا شر/اصلاح کنیت.',
 'clearyourcache'                   => "'''توجه:''' بعد چه ذخیره کتن، شما شاید مجبور بیت چه وتی ذخیره ی بروزر رد بیت تا تغییرات بگندیت. '''Mozilla / Firefox / Safari:'' ''Shift'' جهل داریت همی وهدی که کلیک کنیت ''Reload'' یا بداریت ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac);'''IE:''' ''Ctrl''  بداری وهدی که کلیک ''Refresh' یا 'Ctrl-F5''; '''Konqueror:''':  راحت کلیک کن دکمه ''Reload'' یا بدار ''F5''; '''Opera''' کاربر بایدن ته ''Tools→Preferences'' ذخیره پاک کنت.",
-'usercssjsyoucanpreview'           => "<strong>نکته:</strong> چه دکمه 'Show preview' په آزمایش کتن  CSS/JS پیش چه ذخیره کتن است�اده کن",
+'usercssjsyoucanpreview'           => "'''نکته:''' چه دکمه 'Show preview' په آزمایش کتن  CSS/JS پیش چه ذخیره کتن است�اده کن",
 'usercsspreview'                   => "''''بزان که شما �قط وتی CSS کاربری بازبینی کنین. هنگنت آیی ذخیره نه بوتت!''''",
 'userjspreview'                    => "''''په یاد دار که شما �قط وتی کاربری  JavaScript بازبینی/آزمایش کنگیت، هنگت ذخیره نه بوتت!''''",
 'userinvalidcssjstitle'            => "'''هوژاری:''هچ جلدی نیست\"\$1\".
 بزان که ص�حات .css و .js چه عناوین گون هوردین حر� است�اده کننت، مثلا {{ns:user}}:Foo/monobook.css بدل به په {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(په روچ بیتگین)',
-'note'                             => '<strong>یادداشت:</strong>',
-'previewnote'                      => '<strong>شی �قط یک بازبینی انت;
-تغییرات هنگت ذخیره نهنت. </strong>',
+'note'                             => "'''یادداشت:'''",
+'previewnote'                      => "'''شی �قط یک بازبینی انت;
+تغییرات هنگت ذخیره نهنت. '''",
 'previewconflict'                  => 'ای بازبین متنء پیش داریت ته منط�ه بالدی اصلاحی هنچوش که پیش دارگ بیت اگه شما انتخاب کنیت ذخیره',
-'session_fail_preview'             => '<strong>شرمنده! ما نه تونست شمی اصلاحء په خاطر گار کتن دیتا دیوان پردازش کنین.
-طل� دگه سعی کنیت. اگر هنگت کار نکنت یک بری [[Special:UserLogout|دربیت]] و پیدا وارد بیت.</strong>',
-'session_fail_preview_html'        => "<strong>شرمنده! ما نه تونست شمی اصلاحء په خاطر گار کتن دیتا دیوان پردازش کنین.</strong>
+'session_fail_preview'             => "'''شرمنده! ما نه تونست شمی اصلاحء په خاطر گار کتن دیتا دیوان پردازش کنین.
+طل� دگه سعی کنیت. اگر هنگت کار نکنت یک بری [[Special:UserLogout|دربیت]] و پیدا وارد بیت.'''",
+'session_fail_preview_html'        => "'''شرمنده! ما نه تونست شمی اصلاحء په خاطر گار کتن دیتا دیوان پردازش کنین.'''
 
 ''په چی که {{SITENAME}} HTML هام �عالنت، بازبین په خاطر حملات JavaScript پناهنت.''
 
-<strong> اگر شی یک قانونی تلاش اصلاحنت، دگه کوشش کنیت. اگر هنگت کار نکنت یک بری [[Special:UserLogout|دربیت]] و دگه وارد بیت.</strong>",
-'token_suffix_mismatch'            => '<strong> شمی اصلاح رد بوت په چی که شمی کلاینت نویسگ کاراکترانی په هم جتت.
+''' اگر شی یک قانونی تلاش اصلاحنت، دگه کوشش کنیت. اگر هنگت کار نکنت یک بری [[Special:UserLogout|دربیت]] و دگه وارد بیت.'''",
+'token_suffix_mismatch'            => "''' شمی اصلاح رد بوت په چی که شمی کلاینت نویسگ کاراکترانی په هم جتت.
 اصلاح رد بوت داں چه هراب بیگ متن ص�حه جلوگیری بیت.
-شی لهتی وهد پیش کت که شما چه یک هرابین سرویس پروکسی وبی است�اده کنیت.</strong>',
+شی لهتی وهد پیش کت که شما چه یک هرابین سرویس پروکسی وبی است�اده کنیت.'''",
 'editing'                          => 'اصلاح $1',
 'editingsection'                   => 'اصلاح $1(بخش)',
-'editingcomment'                   => 'اصلاح $1 (نظر)',
+'editingcomment'                   => 'اصلاح $1 (نوکین بخش)',
 'editconflict'                     => 'جنگ ورگ اصلاح: $1',
 'explainconflict'                  => "کسی دگه ای ص�حه یا عوض کتت چه وهدی که شما اصلاح آیء شروع کتء.
 بالادی ناحیه متن شامل متن ص�حه همی داب که هنگت هست.
@@ -708,29 +743,30 @@ $2',
 '''�قط''' ناحیه بالادی متن وهدی که شما دکمه  \"Save page\" ذخیره بنت.",
 'yourtext'                         => 'شمی متن',
 'storedversion'                    => 'نسخه ی ذخیره ای',
-'nonunicodebrowser'                => '<strong>هوژاری: شمی بروزر گون یونی کد تنظیم کار نکنت. یک اطرا�-کار جاهینن که شما را اجازه دنت ص�حات راحت اصلاح کنیت: non-ASCII کاراتران ته جعبه اصلاح په داب کدان hexadecimal جاه کاینت.',
-'editingold'                       => '<strong>هوژاری: شما په اصلاح کتن یک قدیمی بازبینی چه ای ص�حه ایت.
-اگر شما ایء ذخیره کتت، هر تغییری که دهگ بیتء چه ای بازبینی گار بنت.</strong>',
+'nonunicodebrowser'                => "'''هوژاری: شمی بروزر گون یونی کد تنظیم کار نکنت. یک اطرا�-کار جاهینن که شما را اجازه دنت ص�حات راحت اصلاح کنیت: non-ASCII کاراتران ته جعبه اصلاح په داب کدان hexadecimal جاه کاینت.",
+'editingold'                       => "'''هوژاری: شما په اصلاح کتن یک قدیمی بازبینی چه ای ص�حه ایت.
+اگر شما ایء ذخیره کتت، هر تغییری که دهگ بیتء چه ای بازبینی گار بنت.'''",
 'yourdiff'                         => 'ت�اوتان',
-'copyrightwarning'                 => 'لط�ا توجه بیت که کل نوشته یات ته {{SITENAME}}  تحت $2 نشر بنت.(بچار په جزیات$1).
+'copyrightwarning'                 => "لط�ا توجه بیت که کل نوشته یات ته {{SITENAME}}  تحت $2 نشر بنت.(بچار په جزیات$1).
 اگه شما لوٹیت شمی نوشتانک اصلاح و دگه چهاپ مبنت، اچه آیانا ادان مهلیت.<b/>
 شما ما را قول دهیت که وتی چیزا بنویسیت یا چه یک دامین عمومی کپی کتگیت.
-<strong> نوشتانکی که کپی رایت دارند بی اجازه ادا هور مکنیت</strong>',
-'copyrightwarning2'                => 'لط�ا توجه کنیت که کل مشارکاتن ته {{SITENAME}} شاید اصلاح, عوض و یا توسط دگه شرکت کننده آن حذ� بنت.
+''' نوشتانکی که کپی رایت دارند بی اجازه ادا هور مکنیت'''",
+'copyrightwarning2'                => "لط�ا توجه کنیت که کل مشارکاتن ته {{SITENAME}} شاید اصلاح, عوض و یا توسط دگه شرکت کننده آن حذ� بنت.
 اگر شما نه لوٹیت شمی نوشتاک گون بی رحمی اصلاح مه بنت، اچه شما آیء ادان دیم مه دهیت.<br />
 شما هنچوش ما را قول دهیت که شما شی وت نوشتت یا ایء چه یک دامین عمومی یا هنچوشین آزاتین منبع کپی کتیت.(بچار $1 په جزییات).
-<strong> نوشتاکی که حق کپی دارنت بی اجازت دیم مه دهیت!</strong>',
-'longpagewarning'                  => '<strong>هوژاری. ای ص�حه $1 کیلوبایت نت;
+''' نوشتاکی که حق کپی دارنت بی اجازت دیم مه دهیت!'''",
+'longpagewarning'                  => "'''هوژاری. ای ص�حه $1 کیلوبایت نت;
 لهتی چه بروزران شاید مشکلاتی چه دست رسی و اصلاح ص�حات گیش چه 32ک.ب داشته بنت.
-لط�ا توجه کنیت په هورد کتن ص�حه په هوردترین چنٹ. </strong>',
-'longpageerror'                    => '<strong>حطا: متنی که شما دیم داتت $1 کیلو بایتت، که چه گیشترین حد $2 کیلوبایت مزن
-آی نه تونیت ذخیره بوت.</strong>',
-'readonlywarning'                  => '<strong>هوژاری: دیتابیس به تعمیرات کبلنت، اچه شما نه تونیت وتی اصلاحات هنو ذخیره کنیت.
-شما شاید بلوٹیت متنء تع یم �ایل متنی کپی و پیست کنیت و آیء ذخیره کنیت.</strong>',
-'protectedpagewarning'             => '<strong>هوژاری: ای ص�حه په کبلنت چی که �قط کابران گون اجازت مدیر سیستم توننت آیء اصلاح کننت.</strong>',
+لط�ا توجه کنیت په هورد کتن ص�حه په هوردترین چنٹ. '''",
+'longpageerror'                    => "'''حطا: متنی که شما دیم داتت $1 کیلو بایتت، که چه گیشترین حد $2 کیلوبایت مزن
+آی نه تونیت ذخیره بوت.'''",
+'readonlywarning'                  => "'''هوژاری: دیتابیس به تعمیرات کبلنت، اچه شما نه تونیت وتی اصلاحات هنو ذخیره کنیت.
+شما شاید بلوٹیت متنء تع یم �ایل متنی کپی و پیست کنیت و آیء ذخیره کنیت.'''
+مدیری که آیء کبل کتت ای توضیحی داتت: $1",
+'protectedpagewarning'             => "'''هوژاری: ای ص�حه په کبلنت چی که �قط کابران گون اجازت مدیر سیستم توننت آیء اصلاح کننت.'''",
 'semiprotectedpagewarning'         => "''''توجه:'''' ای ص�حه کبلنت چوش که �قط ثبت نامی کابران توننت آیء اصلاح کننت.",
 'cascadeprotectedwarning'          => "''هوژاری''ای ص�حه کبلنت چوش که �قط کابران گون دسترسی مدیر سیستم توننت آییء اصلاح کننت،په چی که آیی ته چهلین حمایت آبشاری {{PLURAL:$1|ص�حات|ص�حه}}:",
-'titleprotectedwarning'            => '<strong>هوژاری: ای ص�حه کبلنت چوش که �قز لهتی کاربر تواننت آیء شر کننت.</strong>',
+'titleprotectedwarning'            => "'''هوژاری: ای ص�حه کبلنت چوش که �قط لهتی کاربر گون [[Special:ListGroupRights|خاصین حق]] تواننت آیء شر کننت.'''",
 'templatesused'                    => 'تمپلتانی که ته ای ص�حه است�اده بیت:',
 'templatesusedpreview'             => 'تلمپلت آنی که ته ای بازبینی است�اده بیت',
 'templatesusedsection'             => 'تمپلتانی که ته ای بخش به کار رونت',
@@ -749,10 +785,20 @@ $2',
 
 شما بایدن توجه کنیت که ادامه اصلاح ای ص�حه درستنت.
 آمار حذ� ای ص�حه په شمی حاطرء ادان هستن:",
+'deleted-notice'                   => 'ای ص�حه حذ� بوتت. په مراجعه جهل گور آمار حذ� پی ای ص�حه اتکگت.',
+'deletelog-fulllog'                => 'چارگ آمار کامل',
+'edit-hook-aborted'                => 'اصلاح گون قلاب بند بوت.
+توضیحی ای باره ی دهگ نه بوتت.',
+'edit-gone-missing'                => 'نه تونیت ص�حهء په روچی کنت.
+چوش که جاه کیت آیی حذ� بوتگت.',
+'edit-conflict'                    => 'جنگ اصلاحی',
+'edit-no-change'                   => 'شمی اصلاح نادید گرگ بوت، په چی که هچ تغییری په متن دهگ نه بوت.',
+'edit-already-exists'              => 'نه تونیت یک نوکین ص�حه ای شر کنت.
+هنو شی هستن.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'هوژاری: ای ص�حه شامل بازگین توار عملگر تجریه کنوک سنگیننت.
-آیی بایدن کمتر چه  $2, داشته بیت ادان هنو  $1 هست.',
+آیی بایدن کمتر چه  $2{{PLURAL:$2|توار|توار}}, داشته بیت ادان هنو  $1 هست.',
 'expensive-parserfunction-category'       => ' ص�حات گونبازگین توار عملگر تجریه کنوک',
 'post-expand-template-inclusion-warning'  => 'هوژاری: اندازه شامل تمپلت باز مزننت.
 لهتی تمپلتان هور نه بینت.',
@@ -760,6 +806,8 @@ $2',
 'post-expand-template-argument-warning'   => 'هوژاری: ای ص�حه شامل یک آرگومان تمپلت انت که اندازه ی بازنت.
 ای آرگومان آن بایدن حذ� بوتنت',
 'post-expand-template-argument-category'  => 'ص�حات شامل حذ�ی آرگومان آن تمپلت انت',
+'parser-template-loop-warning'            => 'تمپلت حقه ای درگبزگ بوت: [[$1]]',
+'parser-template-recursion-depth-warning' => 'محدودیت عمق تررگ رد بوت ($1)',
 
 # "Undo" feature
 'undo-success' => 'اصلاح برگشت نه بیت. لط�ا مقایسه جهلگینء کنترل کنیت په تایید شی که شی هما انت که شما لوٹیت، و بعدا تغغیرات جهلی په تمام کتن بر نگردگ اصلاح ذخیره کنیت.',
@@ -774,29 +822,29 @@ $2',
 دلیلی داتگین توسط $3  شی انت ''$2''",
 
 # History pages
-'viewpagelogs'        => 'آمار ای ص�حه بچار',
-'nohistory'           => 'په ای ص�حه تاریح اصلاح نیست.',
-'revnotfound'         => 'بازبینی در گیزگ نه بوت',
-'revnotfoundtext'     => 'کدیمی بازبینی چه ای ص�حه که شما لوٹیت ودیگ نه بوت. لط�ا URL که شما په رستن په ای ص�حه است�اده کنیت کنترلی کنیت.',
-'currentrev'          => 'هنوکین بازبینی',
-'revisionasof'        => 'بازبینی په عنوان $1',
-'revision-info'       => 'بازبینی په داب $1 توسط $2',
-'previousrevision'    => '�پیش ترین نسخه',
-'nextrevision'        => 'نوکین بازبینی→',
-'currentrevisionlink' => 'هنوکین بازبینی',
-'cur'                 => 'هنو',
-'next'                => 'بعدی',
-'last'                => 'اهری',
-'page_first'          => 'اولین',
-'page_last'           => 'اهرین',
-'histlegend'          => 'بخش ت�اوت: په مقایسه کتن نسخه یان گزینه انتخاب کنیت اینتر یا دکمه بجن.<br />
+'viewpagelogs'           => 'آمار ای ص�حه بچار',
+'nohistory'              => 'په ای ص�حه تاریح اصلاح نیست.',
+'currentrev'             => 'هنوکین بازبینی',
+'currentrev-asof'        => 'هنوکین بازبینی چه $1',
+'revisionasof'           => 'بازبینی په عنوان $1',
+'revision-info'          => 'بازبینی په داب $1 توسط $2', # Additionally available: $3: revision id
+'previousrevision'       => '�پیش ترین نسخه',
+'nextrevision'           => 'نوکین بازبینی→',
+'currentrevisionlink'    => 'هنوکین بازبینی',
+'cur'                    => 'هنو',
+'next'                   => 'بعدی',
+'last'                   => 'اهری',
+'page_first'             => 'اولین',
+'page_last'              => 'اهرین',
+'histlegend'             => 'بخش ت�اوت: په مقایسه کتن نسخه یان گزینه انتخاب کنیت اینتر یا دکمه بجن.<br />
 Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 (last) = ت�اوت گون بعدی نسخه, M = هوردین  اصلاح.',
-'deletedrev'          => '[حذ�]',
-'histfirst'           => 'اولین',
-'histlast'            => 'اهرین',
-'historysize'         => '({{PLURAL:$1|1 بایت|$1 بایت}})',
-'historyempty'        => '(هالیک)',
+'history-fieldset-title' => 'گردگ تاریح',
+'deletedrev'             => '[حذ�]',
+'histfirst'              => 'اولین',
+'histlast'               => 'اهرین',
+'historysize'            => '({{PLURAL:$1|1 بایت|$1 بایت}})',
+'historyempty'           => '(هالیک)',
 
 # Revision feed
 'history-feed-title'          => 'تاریح بازبینی',
@@ -882,6 +930,7 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'mergehistory-invalid-destination' => 'ص�حه مقصد باید یک معتبرین عنوانی بیت.',
 'mergehistory-autocomment'         => 'چن و بند بوت  [[:$1]] په [[:$2]]',
 'mergehistory-comment'             => 'چن و بند بوت [[:$1]] په[[:$2]]: $3',
+'mergehistory-same-destination'    => 'ص�حه مبدا و مقصد یکی نه بنت',
 
 # Merge log
 'mergelog'           => 'آمار چن وبند',
@@ -894,124 +943,205 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'difference'              => '(ت�اوتان بین نسخه یان)',
 'lineno'                  => 'خط$1:',
 'compareselectedversions' => 'مقایسه انتخاب بوتگین نسخه یان',
+'visualcomparison'        => 'مقایسه تصویری',
+'wikicodecomparison'      => 'مقایسه متن ویکی',
 'editundo'                => 'خنثی کتن',
 'diff-multi'              => '({{PLURAL:$1|یک متوسطین بازبینیان میانی}} پیش دارگ نه بیت .)',
+'diff-movedto'            => 'جاه په جاه په $1',
+'diff-styleadded'         => 'استایل $1 هور بوت',
+'diff-added'              => 'هوربوت $1',
+'diff-changedto'          => '$1 عوض بوت په',
+'diff-movedoutof'         => 'جاه په جاه بوت چه $1',
+'diff-styleremoved'       => 'استایل $1 زورگ بوت',
+'diff-removed'            => 'زورگ بوت $1',
+'diff-changedfrom'        => '$1 عوض بوتت چه طر�',
+'diff-src'                => 'منبع',
+'diff-withdestination'    => '$1 گون مقصدء',
+'diff-with'               => '&#32;گون $1 $2',
+'diff-with-final'         => '&#32;Ùˆ $1 $2',
+'diff-width'              => 'پهنات',
+'diff-height'             => 'بلندی',
+'diff-p'                  => "یک '''پاراگرا�'''",
+'diff-blockquote'         => "یک '''نقل'''",
+'diff-h1'                 => "یک '''عنوانی (سطح ۱)'''",
+'diff-h2'                 => "یک '''عنوانی (سطح ۲)'''",
+'diff-h3'                 => "یک '''عنوانی (سطح ۳)'''",
+'diff-h4'                 => "یک '''عنوانی (سطح ۴)'''",
+'diff-h5'                 => "یک '''عنوانی (سطح ۵)'''",
+'diff-pre'                => "یک '''پیش �رمتی بلوک'''",
+'diff-div'                => "یک '''بخشی'''",
+'diff-ul'                 => "یک '''لیست بی ترتییبن'''",
+'diff-ol'                 => "یک '''مرتبین لیست'''",
+'diff-li'                 => "یک '''ایتم لیست'''",
+'diff-table'              => "یک '''جدول'''",
+'diff-tbody'              => "یک '''جدول محتواء'''",
+'diff-tr'                 => "یک '''ردی�'''",
+'diff-td'                 => "یک '''سلول'''",
+'diff-th'                 => "یک '''عنوان'''",
+'diff-br'                 => "یک '''پروش'''",
+'diff-hr'                 => "یک ''' خظ ا�قی'''",
+'diff-code'               => "یک '''  بلوک کد کامپیوتری'''",
+'diff-dl'                 => "یک ''' لیست تعری�ی'''",
+'diff-dt'                 => "یک ''' تعری� موضوعء'''",
+'diff-dd'                 => "یک '''تعری�'''",
+'diff-input'              => "یک '''ورودی'''",
+'diff-form'               => "یک '''�رم'''",
+'diff-img'                => "یک '''عکس'''",
+'diff-span'               => "یک '''�اصلهء'''",
+'diff-a'                  => "یک '''لینکی'''",
+'diff-i'                  => "'''ایتالیکی'''",
+'diff-b'                  => "'''پررنگ'''",
+'diff-strong'             => "'''پرزور'''",
+'diff-em'                 => "'''تاکید'''",
+'diff-font'               => "'''�ونت'''",
+'diff-big'                => "'''مزن'''",
+'diff-del'                => "'''حذ�ی'''",
+'diff-tt'                 => "'''پهنات ثابت'''",
+'diff-sub'                => "'''چیر‌اسکریپت'''",
+'diff-sup'                => "'''سوپر‌اسکریپت'''",
+'diff-strike'             => "'''حمله چه'''",
 
 # Search results
-'searchresults'             => 'نتایج گردگ',
-'searchresulttext'          => 'په گیشترین اطلاعات گردگ باره {{SITENAME}}، بچار [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'شما گردگیت په \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|کل ص�حات شروع بنت گون "$1"]] | [[Special:WhatLinksHere/$1|کل ص�حات که لینک انت په "$1"]])',
-'searchsubtitleinvalid'     => "شما گردگیت په '''$1'''",
-'noexactmatch'              => "'''ص�حه ی گون عنوان نیست\"\$1\".'''
+'searchresults'                    => 'نتایج گردگ',
+'searchresults-title'              => 'نتایج گردگ په "$1"',
+'searchresulttext'                 => 'په گیشترین اطلاعات گردگ باره {{SITENAME}}، بچار [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'شما گردگیت په \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|کل ص�حات شروع بنت گون "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|کل ص�حات که لینک انت په "$1"]])',
+'searchsubtitleinvalid'            => "شما گردگیت په '''$1'''",
+'noexactmatch'                     => "'''ص�حه ی گون عنوان نیست\"\$1\".'''
 شما تونیت [[:\$1|ای ص�حه ی شرکنیت]].",
-'noexactmatch-nocreate'     => "'''.هچ ص�حه ای تحت عنوان \"\$1\" نیست'''",
-'toomanymatches'            => 'بازگین هم دپ درگیزگ بوت، لط�ا یک مت�اوتین درخواست آزمایش کنیت',
-'titlematches'              => 'عنوان ص�حه هم دپ نت',
-'notitlematches'            => 'هچ عنوان ص�حه هم دپ نهنت',
-'textmatches'               => 'متن ص�حه هم دپ بنت',
-'notextmatches'             => 'هچ متن ص�حه هم دپ نهنت',
-'prevn'                     => 'پیشگین $1',
-'nextn'                     => 'بعدی $1',
-'viewprevnext'              => '($1) ($2) ($3) دیدگ',
-'search-result-size'        => '$1 ({{PLURAL:$2|1کلمه|$2 کلمات}})',
-'search-result-score'       => 'ربط: $1%',
-'search-redirect'           => '(غیر مستقیم $1 )',
-'search-section'            => '(بخش $1 )',
-'search-suggest'            => 'شما را منظور ات: $1',
-'search-interwiki-caption'  => 'پروژه آن گوهار',
-'search-interwiki-default'  => '$1 نتایج:',
-'search-interwiki-more'     => '(گیشتر)',
-'search-mwsuggest-enabled'  => 'گون پیشنهاد',
-'search-mwsuggest-disabled' => 'هچ پیشنهاد',
-'search-relatedarticle'     => 'مربوطین',
-'mwsuggest-disable'         => 'پیشنهادات آژاکسیء غیر �عال کن',
-'searchrelated'             => 'مربوط',
-'searchall'                 => 'Ú©Ù„',
-'showingresults'            => "جهل پیش دارگنت تا  {{PLURAL:$1|'''1'''نتیجه|'''$1''' نتایج}} شروع بنت گون #'''$2'''.",
-'showingresultsnum'         => "جهل پیش داریت  {{PLURAL:$3|'''1''' نتیجه|'''$3''' نتایج}} شروع بیت گون #'''$2'''.",
-'showingresultstotal'       => "جهل پیش داریت  {{PLURAL:$3|نتیجه '''$1''' of '''$3'''|نتایج '''$1 - $2''' چه '''$3'''}}",
-'nonefound'                 => "'''توجه''':  �قط لهتی نام �ضا په طور پیش �رض گردگ بیتت. سعی کنیت وتی جوستء هور کنیت گون ''کل:'' په گردگ په کل محتوا (شامل ص�حات گپ، تمپلتان ودگر)، یا است�اده کنیت لوٹیگن نام �ضا په داب پیش وند.",
-'powersearch'               => 'پیشرپتگی گردگ',
-'powersearch-legend'        => 'گردگ پیشر�ته',
-'powersearch-ns'            => 'گردگ ته نام �ضا آن',
-'powersearch-redir'         => 'لیست عیرمستقیم آن',
-'powersearch-field'         => 'گردگ په',
-'search-external'           => 'حارجی گردگ',
-'searchdisabled'            => '{{SITENAME}} گردگ غیر �عالنت.
+'noexactmatch-nocreate'            => "'''.هچ ص�حه ای تحت عنوان \"\$1\" نیست'''",
+'toomanymatches'                   => 'بازگین هم دپ درگیزگ بوت، لط�ا یک مت�اوتین درخواست آزمایش کنیت',
+'titlematches'                     => 'عنوان ص�حه هم دپ نت',
+'notitlematches'                   => 'هچ عنوان ص�حه هم دپ نهنت',
+'textmatches'                      => 'متن ص�حه هم دپ بنت',
+'notextmatches'                    => 'هچ متن ص�حه هم دپ نهنت',
+'prevn'                            => 'پیشگین $1',
+'nextn'                            => 'بعدی $1',
+'viewprevnext'                     => '($1) ($2) ($3) دیدگ',
+'searchmenu-legend'                => 'گزینه یان گردگ',
+'searchmenu-exists'                => "'''ص�حه گون نام \"[[\$1]]\" ته ای ویکی نیستن'''",
+'searchmenu-new'                   => "'''شر کن ص�حه ای \"[[:\$1]]\" ته ای ویکی!'''",
+'searchhelp-url'                   => 'Help:محتوا',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|بروز ص�حات گون پیش وند]]',
+'searchprofile-articles'           => 'محتوای ص�حات',
+'searchprofile-articles-and-proj'  => 'محتوایی و پروژه ای ص�حات',
+'searchprofile-project'            => 'ص�حات پروژه',
+'searchprofile-images'             => '�ایلان',
+'searchprofile-everything'         => 'هر چیز',
+'searchprofile-advanced'           => 'پیشر�تگین',
+'searchprofile-articles-tooltip'   => 'گردگ ته $1',
+'searchprofile-project-tooltip'    => 'گردگ ته $1',
+'searchprofile-images-tooltip'     => 'گردگ په �ایلان ته',
+'searchprofile-everything-tooltip' => 'گردگ په کل محتوا (هور گون ص�حات گپ)',
+'searchprofile-advanced-tooltip'   => 'گردگ ته نام �ضایان دل واه',
+'prefs-search-nsdefault'           => 'گردگ گون پیش �رضان:',
+'prefs-search-nscustom'            => 'گردگ نام �ضایان دل واه:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1کلمه|$2 کلمات}})',
+'search-result-score'              => 'ربط: $1%',
+'search-redirect'                  => '(غیر مستقیم $1 )',
+'search-section'                   => '(بخش $1 )',
+'search-suggest'                   => 'شما را منظور ات: $1',
+'search-interwiki-caption'         => 'پروژه آن گوهار',
+'search-interwiki-default'         => '$1 نتایج:',
+'search-interwiki-more'            => '(گیشتر)',
+'search-mwsuggest-enabled'         => 'گون پیشنهاد',
+'search-mwsuggest-disabled'        => 'هچ پیشنهاد',
+'search-relatedarticle'            => 'مربوطین',
+'mwsuggest-disable'                => 'پیشنهادات آژاکسیء غیر �عال کن',
+'searchrelated'                    => 'مربوط',
+'searchall'                        => 'Ú©Ù„',
+'showingresults'                   => "جهل پیش دارگنت تا  {{PLURAL:$1|'''1'''نتیجه|'''$1''' نتایج}} شروع بنت گون #'''$2'''.",
+'showingresultsnum'                => "جهل پیش داریت  {{PLURAL:$3|'''1''' نتیجه|'''$3''' نتایج}} شروع بیت گون #'''$2'''.",
+'showingresultstotal'              => "جهل پیش داریت  {{PLURAL:$4|نتیجه '''$1''' چه '''$3'''|نتایج '''$1 - $2''' چه '''$3'''}}",
+'nonefound'                        => "'''توجه''':  �قط لهتی نام �ضا په طور پیش �رض گردگ بیتت. سعی کنیت وتی جوستء هور کنیت گون ''all:'' په گردگ په کل محتوا (شامل ص�حات گپ، تمپلتان ودگر)، یا است�اده کنیت لوٹیگن نام �ضا په داب پیش وند.",
+'search-nonefound'                 => 'نتیجه هم دپ په درخواست نیست',
+'powersearch'                      => 'پیشرپتگی گردگ',
+'powersearch-legend'               => 'گردگ پیشر�ته',
+'powersearch-ns'                   => 'گردگ ته نام �ضا آن',
+'powersearch-redir'                => 'لیست عیرمستقیم آن',
+'powersearch-field'                => 'گردگ په',
+'search-external'                  => 'حارجی گردگ',
+'searchdisabled'                   => '{{SITENAME}} گردگ غیر �عالنت.
 شما نونیت بگردیت چه طرق گوگل هم زمان.
 توجه که اندیکس آن {{SITENAME}} محتوا شاید تاریح گوستگین بنت.',
 
 # Preferences page
-'preferences'              => 'ترجیحات',
-'mypreferences'            => 'منی ترجیحات',
-'prefs-edits'              => 'تعداد اصلاحات:',
-'prefsnologin'             => 'وارد نهیت',
-'prefsnologintext'         => 'شما بایدن  <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} وارد بیت]</span> په تنظیم کتن ترجیحات.',
-'prefsreset'               => 'ترجیحات چه ذخیره ترینگ بوتنت.',
-'qbsettings'               => 'میله سریع',
-'qbsettings-none'          => 'هچ یک',
-'qbsettings-fixedleft'     => 'چپ ثابت',
-'qbsettings-fixedright'    => 'راست ثابت',
-'qbsettings-floatingleft'  => 'چپ شناور',
-'qbsettings-floatingright' => 'راست شناور',
-'changepassword'           => 'کلمه رمز عوض کن',
-'skin'                     => 'پوست',
-'math'                     => 'ریاضی',
-'dateformat'               => '�رم تاریح',
-'datedefault'              => 'هچ ترجیح',
-'datetime'                 => 'تاریح و وهد',
-'math_failure'             => 'تجزیه پروش وارت',
-'math_unknown_error'       => 'ناشناسین حطا',
-'math_unknown_function'    => 'ناشناس عملگر',
-'math_lexing_error'        => 'حطا نوشتاری',
-'math_syntax_error'        => 'حطا ساختار',
-'math_image_error'         => 'بدل کتن PNGپروش وارت;
+'preferences'               => 'ترجیحات',
+'mypreferences'             => 'منی ترجیحات',
+'prefs-edits'               => 'تعداد اصلاحات:',
+'prefsnologin'              => 'وارد نهیت',
+'prefsnologintext'          => 'شما بایدن  <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} وارد بیت]</span> په تنظیم کتن ترجیحات.',
+'prefsreset'                => 'ترجیحات چه ذخیره ترینگ بوتنت.',
+'qbsettings'                => 'میله سریع',
+'qbsettings-none'           => 'هچ یک',
+'qbsettings-fixedleft'      => 'چپ ثابت',
+'qbsettings-fixedright'     => 'راست ثابت',
+'qbsettings-floatingleft'   => 'چپ شناور',
+'qbsettings-floatingright'  => 'راست شناور',
+'changepassword'            => 'کلمه رمز عوض کن',
+'skin'                      => 'پوست',
+'skin-preview'              => 'بازین',
+'math'                      => 'ریاضی',
+'dateformat'                => '�رم تاریح',
+'datedefault'               => 'هچ ترجیح',
+'datetime'                  => 'تاریح و وهد',
+'math_failure'              => 'تجزیه پروش وارت',
+'math_unknown_error'        => 'ناشناسین حطا',
+'math_unknown_function'     => 'ناشناس عملگر',
+'math_lexing_error'         => 'حطا نوشتاری',
+'math_syntax_error'         => 'حطا ساختار',
+'math_image_error'          => 'بدل کتن PNGپروش وارت;
 کنترل کنیت په نصب latex, dvips, gs, و convert',
-'math_bad_tmpdir'          => 'نه نونیت بنویسیت یا مسیر غیر دایمی ریاضی شرکنت',
-'math_bad_output'          => 'نه تونیت بنویسیت یا مشیر خروجی ریاضی شرکنت.',
-'math_notexvc'             => 'ترکیب کتن texvc  قابل اجرا;
+'math_bad_tmpdir'           => 'نه نونیت بنویسیت یا مسیر غیر دایمی ریاضی شرکنت',
+'math_bad_output'           => 'نه تونیت بنویسیت یا مشیر خروجی ریاضی شرکنت.',
+'math_notexvc'              => 'ترکیب کتن texvc  قابل اجرا;
 لط�ا بچار math/README په تنظیم کتن.',
-'prefs-personal'           => 'نمایه کاربر',
-'prefs-rc'                 => 'نوکین تغییرات',
-'prefs-watchlist'          => 'لیست چارگ',
-'prefs-watchlist-days'     => 'روچان په پیش دارگ ته لیست چارگ',
-'prefs-watchlist-edits'    => 'گشیترین تعداد تغییرات په پیشدارگ ته پچین لیست چارگ:',
-'prefs-misc'               => 'هردابین',
-'saveprefs'                => 'ذخیره',
-'resetprefs'               => 'پاکن تغییرات ذخیره نه بوتگین',
-'oldpassword'              => 'کلمه رمز کهنگین:',
-'newpassword'              => 'نوکین کلمه رمز:',
-'retypenew'                => 'کلمه رمز دگه بنویس',
-'textboxsize'              => 'اصلاح',
-'rows'                     => 'ردی�آن«',
-'columns'                  => 'ستون‌ان:',
-'searchresultshead'        => 'گردگ',
-'resultsperpage'           => 'کلیک ته هر ص�حه:',
-'contextlines'             => 'خطوط در کلیک:',
-'contextchars'             => 'متن در خط:',
-'stub-threshold'           => 'سرحد په  <a href="#" class="stub">چنڈ لینک</a> �رمت (بایت):',
-'recentchangesdays'        => 'روچ ان به پیش دارگ ته نوکیت تغییرات:',
-'recentchangescount'       => 'تعداد اصلاحات به پیش دارگ ته نوکین تغییرات',
-'savedprefs'               => 'شمی ترجیحات ذخیره بوتن',
-'timezonelegend'           => 'وهد ملک',
-'timezonetext'             => '¹تعداد ساعاتی که شمی ملکی وهد چه زمان سرور �رق کنت (UTC).',
-'localtime'                => 'ملکی وهد',
-'timezoneoffset'           => 'اختلا�¹',
-'servertime'               => 'وهد سرور',
-'guesstimezone'            => 'پرکن چه بروزر',
-'allowemail'               => '�عال کن ایمیل چه دگه کابران',
-'prefs-searchoptions'      => 'گردگ انتخابان',
-'prefs-namespaces'         => 'نام �صا',
-'defaultns'                => 'گردگ ته ای نام �ضا آن په طور پیش �رض:',
-'default'                  => 'پیش �رض',
-'files'                    => '�ایلان',
+'prefs-personal'            => 'نمایه کاربر',
+'prefs-rc'                  => 'نوکین تغییرات',
+'prefs-watchlist'           => 'لیست چارگ',
+'prefs-watchlist-days'      => 'روچان په پیش دارگ ته لیست چارگ',
+'prefs-watchlist-days-max'  => '(حداکثر ۷ روچ)',
+'prefs-watchlist-edits'     => 'گشیترین تعداد تغییرات په پیشدارگ ته پچین لیست چارگ:',
+'prefs-watchlist-edits-max' => '(گیشترین تعداد: ۱۰۰۰)',
+'prefs-misc'                => 'هردابین',
+'prefs-resetpass'           => 'عوض کتن کلمه رمز',
+'saveprefs'                 => 'ذخیره',
+'resetprefs'                => 'پاکن تغییرات ذخیره نه بوتگین',
+'textboxsize'               => 'اصلاح',
+'prefs-edit-boxsize'        => 'حد پنجره اصلاح.',
+'rows'                      => 'ردی�آن«',
+'columns'                   => 'ستون‌ان:',
+'searchresultshead'         => 'گردگ',
+'resultsperpage'            => 'کلیک ته هر ص�حه:',
+'contextlines'              => 'خطوط در کلیک:',
+'contextchars'              => 'متن در خط:',
+'stub-threshold'            => 'سرحد په  <a href="#" class="stub">چنڈ لینک</a> �رمت (بایت):',
+'recentchangesdays'         => 'روچ ان به پیش دارگ ته نوکیت تغییرات:',
+'recentchangesdays-max'     => '(حداکثر $1 {{PLURAL:$1|روچ|روچ}})',
+'recentchangescount'        => 'تعداد اصلاحات به پیش دارگ ته نوکین تغییرات , تاریح ص�حات و ته سیاهگ به طور پیش �رض :',
+'savedprefs'                => 'شمی ترجیحات ذخیره بوتن',
+'timezonelegend'            => 'وهد ملک',
+'timezonetext'              => '¹تعداد ساعاتی که شمی ملکی وهد چه زمان سرور �رق کنت (UTC).',
+'localtime'                 => 'ملکی وهد:',
+'timezoneselect'            => 'منطقه وهد:',
+'timezoneuseserverdefault'  => 'چه پیش �رضین سرور است�اده کن',
+'timezoneuseoffset'         => 'دگر (اختلا� ءَ مشخص کنیت)',
+'timezoneoffset'            => 'اختلا�¹:',
+'servertime'                => 'وهد سرور:',
+'guesstimezone'             => 'پرکن چه بروزر',
+'allowemail'                => '�عال کن ایمیل چه دگه کابران',
+'prefs-searchoptions'       => 'گردگ انتخابان',
+'prefs-namespaces'          => 'نام �صا',
+'defaultns'                 => 'گردگ ته ای نام �ضا آن په طور پیش �رض:',
+'default'                   => 'پیش �رض',
+'files'                     => '�ایلان',
 
 # User rights
 'userrights'                  => 'مدیریت حقوق کاربر', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'مدیریت گروه کاربر',
 'userrights-user-editname'    => 'یک نام کاربری وارد کن',
 'editusergroup'               => 'اصلاح گروه کاربر',
-'editinguser'                 => "عوض کنت حقوق کاربر  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "عوض کنت حقوق کاربر  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'اصلاح گروه کاربر',
 'saveusergroups'              => 'ذخیره گروه کاربر',
 'userrights-groupsmember'     => 'عضو انت:',
@@ -1060,6 +1190,8 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'right-minoredit'            => 'نشان کن اصلاحات په داب هوردین',
 'right-move'                 => 'جاه په جاه کن ص�حات',
 'right-move-subpages'        => 'جاه په جاه کن ص�حات گون زیرص�حاتش',
+'right-move-rootuserpages'   => 'جاه په جاه کتن ص�حات کاربری اصلی',
+'right-movefile'             => 'جاه په جاه کتن �ایلان',
 'right-suppressredirect'     => 'شر نه کتن یک غیر مستقیم چه کهنگین نام وهدی که یک ص�حه ای جاه په جاه بیت',
 'right-upload'               => 'آپلود �ایلان',
 'right-reupload'             => 'هستین �ایلی اوری بنویس',
@@ -1110,9 +1242,46 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'rightslogentry' => 'عوض بوت عضویت گروهی په $1  چه $2 په $3',
 'rightsnone'     => '(هچ یک)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'وانگ این ص�حه',
+'action-edit'                 => 'اصلاح ای ص�حه',
+'action-createpage'           => 'شرکتن ای ص�حه',
+'action-createtalk'           => 'شرکتن ص�حات بحث',
+'action-createaccount'        => 'شرکتن ای حساب کاربری',
+'action-minoredit'            => 'نشان کتن ای اصلاح په داب هوردین',
+'action-move'                 => 'جاه په جاهی ای ص�حه',
+'action-move-subpages'        => 'جاه په جاه کتن ای ص�حه و زیر ص�حاتی',
+'action-move-rootuserpages'   => 'جاه په جاه کتن ص�حات کاربری اصلی',
+'action-movefile'             => 'ای �ایلءَ جاه په جاه کن',
+'action-upload'               => 'آپلود کتن ای قایل',
+'action-reupload'             => 'نویسگ سر ای موجودن �ایل',
+'action-reupload-shared'      => 'باطل کتن ای �ایل ته مخزن شریکی',
+'action-upload_by_url'        => 'آیلود کتن ای �ایل چه یک آدرس اینترنتیء',
+'action-writeapi'             => 'چه API نویسک است�اده کن',
+'action-delete'               => 'زورگ ای ص�حه',
+'action-deleterevision'       => 'حذ� ای نسخه',
+'action-deletedhistory'       => 'چارگ تاریح حذ� بوتگین ای ص�حه',
+'action-browsearchive'        => 'گردگ په زورتگین ص�حات',
+'action-undelete'             => 'حذ� نه کتن ای ص�حه',
+'action-suppressrevision'     => 'چارگ و ترینگ پناهین بازبینی',
+'action-suppressionlog'       => 'چارگ  ای خصوصین آمار',
+'action-block'                => 'ای کاربرء چه اصلاح کتن بند کن',
+'action-protect'              => 'عوص کتن سطح محا�ظت په ای ص�حه',
+'action-import'               => 'وارد کتن ای ص�حه چه دگه ویکیء',
+'action-importupload'         => 'وارد کتن ای ص�حه چه یک آپلود �ایلء',
+'action-patrol'               => 'نشان کتن اصلاح دگران په داب چارگ بیتگین',
+'action-autopatrol'           => 'نشان کتن وتی اصلاح په داب چارگ بوتگین',
+'action-unwatchedpages'       => 'چارگ لیست نچارتگین ص�حات',
+'action-trackback'            => 'ثبت یک بازتر',
+'action-mergehistory'         => 'هورکتن تاریح ای ص�حه',
+'action-userrights'           => 'اصلاح کل حقوق کاربر',
+'action-userrights-interwiki' => 'اصلاح حقوق کاربری کاربران ته دگه ویکیء',
+'action-siteadmin'            => 'کبل یا پچ کتن دینابیس',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|تغییر|تغییرات}}',
 'recentchanges'                     => 'نوکین تغییرات',
+'recentchanges-legend'              => 'گزینه ی نوکین تغییرات',
 'recentchangestext'                 => 'رندگر نوکترین تغییرات ته ویکی تی ای ص�حه.',
 'recentchanges-feed-description'    => 'آهرین تغییرات ته وی کی چه ای �ید رند گر',
 'rcnote'                            => "جهلء{{PLURAL:$1|هست '''1''' تغییری|هستن آهری '''$1''' تغییرات}} ته آهرین {{PLURAL:$2|روچ|'''$2''' روچان}}, چه$5, $4.",
@@ -1136,6 +1305,8 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'rc_categories'                     => 'محدودیت په دسته جات(دورش گون"|")',
 'rc_categories_any'                 => 'هرچی',
 'newsectionsummary'                 => '/* $1 */ نوکین بخش',
+'rc-enhanced-expand'                => 'جزییات پیش دار(جاوا اسکریپت لازمنت)',
+'rc-enhanced-hide'                  => 'پناه کتن جزییات',
 
 # Recent changes linked
 'recentchangeslinked'          => 'مربوطین تغییرات',
@@ -1157,11 +1328,11 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'upload_directory_read_only'  => 'مسیر آپلود ($1)  قابل نوشتن گون وب سرور نهنت.',
 'uploaderror'                 => 'حطا آپلود',
 'uploadtext'                  => "چه جهلگین �رم په آپلود �ایلان است�اده کنت.
-په دیستن یا گشتن پیشگین آپلودی �ایلان برو  [[Special:ImageList|لیست �ایلان آپلودی]], آپلودان و حذ�یات هنچو هستن ته [[Special:Log/upload|آمار آپلود]].
+په دیستن یا گشتن پیشگین آپلودی �ایلان برو  [[Special:FileList|لیست �ایلان آپلودی]], آپلودان و حذ�یات هنچو هستن ته [[Special:Log/upload|آمار آپلود]].
 
 په وارد کتن �ایل ته یک ص�حه ای، چه لینک ته �رم است�اده کن
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' په است�اده چه نسخه کامل �ایل
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' په است�اده چه ۲۰۰ پیکسل پهنات ته یک جعبه ته چپ
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' په است�اده چه نسخه کامل �ایل
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' په است�اده چه ۲۰۰ پیکسل پهنات ته یک جعبه ته چپ
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>'''  په مسیری لینک دهگ په �ایل بی پیش دارگ �ایل",
 'upload-permitted'            => 'مجازین نوع �ایل:  $1.',
 'upload-preferred'            => 'ترجیحی نوع �ایل:  $1.',
@@ -1169,7 +1340,7 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'uploadlog'                   => 'آپلود آمار',
 'uploadlogpage'               => 'آپلود ورودان',
 'uploadlogpagetext'           => 'جهلء یک لیست چه نوکترین آپلودان قایل هست.
-[[Special:NewImages|گالری نوکین �ایلان]]',
+[[Special:NewFiles|گالری نوکین �ایلان]]',
 'filename'                    => 'نام �ایل',
 'filedesc'                    => 'خلاصه',
 'fileuploadsummary'           => 'خلاصه:',
@@ -1193,26 +1364,27 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 'largefileserver'             => 'ای �ایل مزنتر چه حدی انت که سرور تنظیم بوتت په اجازه دهگ.',
 'emptyfile'                   => '�ایلی که شما آپلود کتت هالیک انت. شاید شی په خاطر اشتباه نه نام �ایل بیت.
 لط�ا کتنرل کنیت که آیا واقعا شما لوٹیت ای �ایلء آپلود کنیت.',
-'fileexists'                  => 'یک �ایل گون ای نام هستنت،لط�ا کنترل کن <strong><tt>$1</tt></strong> اگه شما مطمین نهیت اگه لوٹیت نامی آیء عوض کنیت.',
-'filepageexists'              => 'ص�حه توضیح په ای �ایل پیشتر شر بوتت ته <strong><tt>$1</tt></strong>, بله هچ �ایلی گون ای نام هنو نیست.
+'fileexists'                  => "یک �ایل گون ای نام هستنت،لط�ا کنترل کن '''<tt>$1</tt>''' اگه شما مطمین نهیت اگه لوٹیت نامی آیء عوض کنیت.",
+'filepageexists'              => "ص�حه توضیح په ای �ایل پیشتر شر بوتت ته '''<tt>$1</tt>''', بله هچ �ایلی گون ای نام هنو نیست.
 خلاصه ای که شما وارد کت ته ص�حه توضیح ظاهر نه بیت.
-په ظاهر کتن خلاصه ادان شما لازمنت آیء دستی اصلاح کنیت.',
-'fileexists-extension'        => 'یک �ایلی گون یک دابی نام هستن:<br />
-نام �ایلی که آپلود بیت: <strong><tt>$1</tt></strong><br />
-نام هستین �ایل:<strong><tt>$2</tt></strong><br />
-لط�ا دگه نامی بزوریت.',
+په ظاهر کتن خلاصه ادان شما لازمنت آیء دستی اصلاح کنیت.",
+'fileexists-extension'        => "یک �ایلی گون یک دابی نام هستن:<br />
+نام �ایلی که آپلود بیت: '''<tt>$1</tt>'''<br />
+نام هستین �ایل:'''<tt>$2</tt>'''<br />
+لط�ا دگه نامی بزوریت.",
 'fileexists-thumb'            => "<center>'''هستین �ایل'''</center>",
-'fileexists-thumbnail-yes'    => '�ایل به نظر رسیت که یک عکس هورد بوتگین اندازه انت. <i>(پنچی انگشت)</i>.
-لط�ا �ایل کنترل کن  <strong><tt>$1</tt></strong>.<br />
-اگر �ایل کنترلی هما عکسنت گون اصلی اندازه لازم نهنت یک پنچ انگشتی گیشین آپلود کنیت.',
-'file-thumbnail-no'           => 'نام �ایل شروع بیت گون <strong><tt>$1</tt></strong>.
-جاه کیت که یک هور بوتگین اندازه عکس ایت.<i>(پینچ انگشت)</i>.
-اگر شما را ای عکس ته وضوح کامل هست ایء آپلود کنیت یا که نام �ایل عوض کنیت لط�ا',
-'fileexists-forbidden'        => '�ایل گو ای نام الان هستنت؛
-لط�ا برگردیت و ای �ایل گون یک نوکین نامی آپلود کنیت.[[Image:$1|انگشتی|مرکز|$1]]',
+'fileexists-thumbnail-yes'    => "�ایل به نظر رسیت که یک عکس هورد بوتگین اندازه انت. ''(پنچی انگشت)''.
+لط�ا �ایل کنترل کن  '''<tt>$1</tt>'''.<br />
+اگر �ایل کنترلی هما عکسنت گون اصلی اندازه لازم نهنت یک پنچ انگشتی گیشین آپلود کنیت.",
+'file-thumbnail-no'           => "نام �ایل شروع بیت گون '''<tt>$1</tt>'''.
+جاه کیت که یک هور بوتگین اندازه عکس ایت.''(پینچ انگشت)''.
+اگر شما را ای عکس ته وضوح کامل هست ایء آپلود کنیت یا که نام �ایل عوض کنیت لط�ا",
+'fileexists-forbidden'        => '�ایل گو ای نام الان هستنت؛و نه توینت سری نویسگ بیتن.
+اگر که لوتیت ویت �ایل ءَ آپلود کنیت ,لط�ا برگردیت و ای �ایل گون یک نوکین نامی آپلود کنیت.[[File:$1|انگشتی|مرکز|$1]]',
 'fileexists-shared-forbidden' => 'یک �ایلی گون ای نام الان ته منبع مشترک �ایل هستن.
-لط�ا برگردیت و ای �ایل گون نوکین نامی آپلود کنیت.[[Image:$1|انگشتی|مرکز|$1]]',
+لط�ا برگردیت و ای �ایل گون نوکین نامی آپلود کنیت.[[File:$1|انگشتی|مرکز|$1]]',
 'file-exists-duplicate'       => 'ای �ایل کپیء چه جهلیگین  {{PLURAL:$1|�ایل|�ایلان}}:',
+'file-deleted-duplicate'      => 'یک �ایلی په داب ای �ایل ([[$1]]) پیسرتر حذ� بوتگت. شما بایدن تاریح حذ� آ �ایلء دگه بچاریت',
 'successfulupload'            => 'آپلود مو�ق',
 'uploadwarning'               => 'هوژاری آپلود',
 'savefile'                    => 'ذخیره �ایل',
@@ -1234,8 +1406,8 @@ Legend: (cur) = ت�اوتان گون هنوکین نسخه,
 
 شما بایدن توجه کنیت که آیا ادامه دهگ آپلود کتن �ایل مناسبنت.
 آمار حذ� �ایل په ای �ایل ادان په شمی حاطرء هست:",
-'filename-bad-prefix'         => 'نام  �ایلی که آپلود بیت شروع بیت گون <strong>"$1"</strong>, که یک نام بی توضیحی هنچکا اتوماتیکی گون دوربین دیجیتال دهگ بوتت.
-لط�ا یک تشریحی ترین نامی په وتی �ایل بزرویت.',
+'filename-bad-prefix'         => "نام  �ایلی که آپلود بیت شروع بیت گون '''\"\$1\"''', که یک نام بی توضیحی هنچکا اتوماتیکی گون دوربین دیجیتال دهگ بوتت.
+لط�ا یک تشریحی ترین نامی په وتی �ایل بزرویت.",
 'filename-prefix-blacklist'   => '#<!-- leave this line exactly as it is --> <pre>
 # Syntax is as follows:
 #   * Everything from a "#" character to the end of the line is a comment
@@ -1276,20 +1448,21 @@ PICT # misc.
 'upload_source_url'  => '(یک متعبرین، عمومی دسترسی انت URL)',
 'upload_source_file' => '(یک �ایل ته شمی کامپیوتر)',
 
-# Special:ImageList
-'imagelist-summary'     => 'ای حاصین ص�حه کل آپلودی �ایلانء پیش داریت.
+# Special:ListFiles
+'listfiles-summary'     => 'ای حاصین ص�حه کل آپلودی �ایلانء پیش داریت.
 به طور پیش �رض اهری �ایل آپلودی ته بالاد لیست پیش دارگ بیت.
 یک کلیکی بالاد ستون ترتیب عوض کنت.',
-'imagelist_search_for'  => 'گردگ په  مدیا:',
+'listfiles_search_for'  => 'گردگ په  مدیا:',
 'imgfile'               => '�ایل',
-'imagelist'             => 'لیست �ایل',
-'imagelist_date'        => 'تاریح',
-'imagelist_name'        => 'نام',
-'imagelist_user'        => 'کاربر',
-'imagelist_size'        => 'اندازه',
-'imagelist_description' => 'توضیح',
-
-# Image description page
+'listfiles'             => 'لیست �ایل',
+'listfiles_date'        => 'تاریح',
+'listfiles_name'        => 'نام',
+'listfiles_user'        => 'کاربر',
+'listfiles_size'        => 'اندازه',
+'listfiles_description' => 'توضیح',
+'listfiles_count'       => 'نسخ',
+
+# File description page
 'filehist'                       => 'تاریح �ایل',
 'filehist-help'                  => 'اور تاریح/زمان کلیک کنیت دان �ایلا په داب هما تاریح بگندیت',
 'filehist-deleteall'             => 'کل حذ�',
@@ -1297,12 +1470,18 @@ PICT # misc.
 'filehist-revert'                => 'واتر',
 'filehist-current'               => 'هنو',
 'filehist-datetime'              => 'تاریح/زمان',
+'filehist-thumb'                 => 'بند انگشت',
+'filehist-thumbtext'             => 'بند انگشتی عکس چه $1',
+'filehist-nothumb'               => 'بی بند انگشتی',
 'filehist-user'                  => 'کاربر',
 'filehist-dimensions'            => 'جنبه یان',
 'filehist-filesize'              => 'اندازه �ایل',
 'filehist-comment'               => 'نظر',
-'imagelinks'                     => 'لینکان',
+'imagelinks'                     => 'لینک �ایل',
 'linkstoimage'                   => 'جهلیگین {{PLURAL:$1|ص�حه |$1 ص�حات لینک}} پی ای �ایل',
+'linkstoimage-more'              => 'گیشتر چه  $1 {{PLURAL:$1|ص�حه لینکان|ص�حات لینک}} پی ای �ایل.
+جهلگین لیست {{PLURAL:$1|اولین لینک ص�حه|اولین $1 لینکان ص�حه ی}} پی ای �ایل �قط پیش داریت.
+یک [[Special:WhatLinksHere/$2|لیست کامل]] موجودنت.',
 'nolinkstoimage'                 => 'هچ ص�حه ای نیست که به ای �ایل لینک بوت.',
 'morelinkstoimage'               => 'View [[Special:WhatLinksHere/$1|گیشتر لینکان]]به ای �ایل',
 'redirectstofile'                => 'جهلیگین {{PLURAL:$1|�ایل غیر مستقیم بنت|$1 �ایلان غیر مستقیم بنت.}} به ای �ایل',
@@ -1333,7 +1512,7 @@ PICT # misc.
 # File deletion
 'filedelete'                  => 'حذ� $1',
 'filedelete-legend'           => 'حذ� �ایل',
-'filedelete-intro'            => "شما حذ� کنگت ''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "شما حذ� کنگت ''[[Media:$1|$1]]''' گون تمام آی تاریح ءَ",
 'filedelete-intro-old'        => " شما په حذ� کتن نسخه ای چه '''[[Media:$1|$1]]''' په داب چه [$4 $3, $2].",
 'filedelete-comment'          => 'دلیل په حذ�:',
 'filedelete-submit'           => 'حذ�',
@@ -1341,8 +1520,6 @@ PICT # misc.
 'filedelete-success-old'      => '<span class="plainlinks">نسخه چه \'\'\'[[Media:$1|$1]]\'\'\'  په داب چه $3, $2 حذ� بوتت.</span>',
 'filedelete-nofile'           => "'''$1'''  موجود نهنت.",
 'filedelete-nofile-old'       => "هچ نسخه آرشیوی چه'''$1'''  گون مشخصین نشان نیست.",
-'filedelete-iscurrent'        => 'شما لوٹیت نوکترین نسخه ای �ایلء حذ� کنیت.
-لط�ا اول په یک پیشرتین نسخه بدل کنیت.',
 'filedelete-otherreason'      => 'دگر/گیشترین دلیل:',
 'filedelete-reason-otherlist' => 'دگ دلیل',
 'filedelete-reason-dropdown'  => '*متداول این دلایل حذ�
@@ -1371,27 +1548,31 @@ PICT # misc.
 
 # Random page
 'randompage'         => 'تصاد�ی ص�حه',
-'randompage-nopages' => 'هچ ص�حه ای ته ای نام �ضا نیست.',
+'randompage-nopages' => '"$1" هچ ص�حه ای ته ای نام �ضا نیست.',
 
 # Random redirect
 'randomredirect'         => 'تصاد�ی غیر مستقیم',
-'randomredirect-nopages' => 'هچ غیر مستقیمی ته ای نام �ضا نیست.',
+'randomredirect-nopages' => '"$1"هچ غیر مستقیمی ته ای نام �ضا نیست.',
 
 # Statistics
-'statistics'             => 'آمار',
-'sitestats'              => '{{SITENAME}} آمار',
-'userstats'              => 'آمار کاربر',
-'sitestatstext'          => "ادان {{PLURAL:\$1|هست '''1'''ص�حه|هستن '''\$1''' کل ص�حات}}تی ای دیتابیس.
-شی شامل ص�حات  \"talk\"، ص�حاتی درباره {{SITENAME}}، هوردین ص�حات\"stub\"، غیر مستقیمان و دگه چیز که بلکین لایق ص�حات محتوا نهنت.
-غیر چه آیآن، ادان {{PLURAL:\$2|هست '''1''' ص�حه که هست یک|هستن '''\$2'''ص�حاتی  که هستن}}شاید محتوای قانونی {{PLURAL:\$2|ص�حه|ص�حات}}.
-
-'''\$8''' {{PLURAL:\$8�ایل |�ایلان}} آپلود بوتنت.
-ادان کلا '''\$3''' {{PLURAL:\$3|چارگ ص�حه|چارگ ص�حه}}, و '''\$4''' {{PLURAL:\$4|اصلاح ص�حه|اصلاحات ص�حه}} چه {{SITENAME}} بنگیج بوتت.
-شامل '''\$5''' اصلاح میانگین ته هر ص�حه و  '''\$6''' دیستن ته هر اصلاح بیت.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue] طولی انت '''\$7'''.",
-'userstatstext'          => "ادان {{PLURAL:$1هست '''1''' ثبت بوتگین[[Special:ListUsers|کاربر]]|هستن '''$1''' ثبت نامی [[Special:ListUsers|کابران]]}}, که چه آیء '''$2''' (یا'''$4%''') {{PLURAL:$2|داریت|دارنت}} $5 حقوقی.",
-'statistics-mostpopular' => 'باز چار تگین ص�حات',
+'statistics'                   => 'آمار',
+'statistics-header-pages'      => 'ص�حه ی آمار',
+'statistics-header-edits'      => 'اصلاح آمار',
+'statistics-header-views'      => 'چارگ آمار',
+'statistics-header-users'      => 'آمار کاربر',
+'statistics-articles'          => 'ص�حات محتوا',
+'statistics-pages'             => 'ص�حات',
+'statistics-pages-desc'        => 'کل ص�حات ته ویکی په داب ص�حات بحث ،غیر مستقیمان و دگه چیز.',
+'statistics-files'             => 'آپلود بیتگین �ایلان',
+'statistics-edits'             => 'اصلاح ص�حات چه وهدی که {{SITENAME}} شر بوتت',
+'statistics-edits-average'     => 'میانگین اصلاحات ته هر ص�حه ای',
+'statistics-views-total'       => 'چارگان کل',
+'statistics-views-peredit'     => 'چارگ ته هر اصلاح',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue طول کار] ای',
+'statistics-users'             => 'ثبت نامی [[Special:ListUsers|users]]',
+'statistics-users-active'      => '�عالین کاربر',
+'statistics-users-active-desc' => 'کاربرانی که ته پیشگین {{PLURAL:$1|روچ|$1 روچان}} کاری اش کتت',
+'statistics-mostpopular'       => 'باز چار تگین ص�حات',
 
 'disambiguations'      => 'ص�حات ر�ع ابهام',
 'disambiguationspage'  => 'Template:ر�ع ابهام',
@@ -1435,26 +1616,30 @@ PICT # misc.
 'popularpages'            => 'مردمی ص�حات',
 'wantedcategories'        => 'لوٹتگین دسته جات',
 'wantedpages'             => 'لوٹتگین ص�حات',
-'missingfiles'            => 'گارین �ایلان',
+'wantedfiles'             => 'لوٹتگین �ایلان',
+'wantedtemplates'         => 'لوٹتگین تمپلت',
 'mostlinked'              => 'ص�حاتی که گیشنر لینک دیگ بیتگنت',
 'mostlinkedcategories'    => 'دسته جاتی که گیشتر لینک دیگ بیتگنت',
 'mostlinkedtemplates'     => 'تمپلتانی که گیشتر لینک بیتگنت',
 'mostcategories'          => 'ص�حات گون گیشترین دسته جات',
 'mostimages'              => '�ایلان گیشنر لینک بوتیگن',
 'mostrevisions'           => 'ص�حاتی گون گیشترین بازبینی',
-'prefixindex'             => 'اندیکس پیش وند',
+'prefixindex'             => 'کل ص�حات گون پیش وند',
 'shortpages'              => 'هوردین ص�حه',
 'longpages'               => 'ص�حات مزنین',
 'deadendpages'            => 'مرتگین ص�حات',
 'deadendpagestext'        => 'جهلیگین ص�حات په ص�حات دگر لینک نهنت ته {{SITENAME}}.',
 'protectedpages'          => 'ص�حات ح�اظت بیتگین',
 'protectedpages-indef'    => '�قط محا�ظت نامحدود',
+'protectedpages-cascade'  => 'محا�ظتان آبشاری �قط',
 'protectedpagestext'      => 'جهلیگین ص�حات محا�ظت بوتگین چه اصلاح و جاه په جاه بیگ',
 'protectedpagesempty'     => 'هچ ص�حه ای گون ای پارامترآن',
 'protectedtitles'         => 'عناوین محا�ظتی',
 'protectedtitlestext'     => 'جهلیگین عناوین چه شر بیگ محا�ظتن',
 'protectedtitlesempty'    => 'هچ عنوانی هنو گو ای پارامتران محا�ظت نهنت.',
 'listusers'               => 'لیست کاربر',
+'listusers-editsonly'     => '�قط کاربرانی که اصلاحاتش هست پیش بدار',
+'usereditcount'           => '$1 {{PLURAL:$1|اصلاح|اصلاحات}}',
 'newpages'                => 'نوکین ص�حات',
 'newpages-username'       => 'نام کاربری:',
 'ancientpages'            => 'ص�حات قدیمی',
@@ -1476,14 +1661,13 @@ PICT # misc.
 'booksources-isbn'          => 'شابک:',
 'booksources-go'            => 'برو',
 'booksources-text'          => 'چهلا یک لیستی چه لینکان په دگه سایتان هست که نوکین  یا مستعمل این کتاب بها کنند و شما شاید گیشترین اطلاعات آی کتابانی باره که پرش گردیت در گیزیت:',
+'booksources-invalid-isbn'  => 'داتگین شماره کتاب چوش که جاه کیت درست نهنت, خطایانء� بچار چه اصلی جاگاه کپی کن',
 
 # Special:Log
 'specialloguserlabel'  => 'کاربر:',
 'speciallogtitlelabel' => 'عنوان:',
 'log'                  => 'ورودان',
 'all-logs-page'        => 'کل ورودان',
-'log-search-legend'    => 'گردگ په آمار',
-'log-search-submit'    => 'برو',
 'alllogstext'          => 'هور کت پیش دارگ کل موجودین آمار {{SITENAME}}.
 شما تونیت گون انتخاب یک نوع آمار،نام کاربر (حساس په هورد-مزنی)، یا متاثرین ص�حه (هنچوش حساس په هورد-مزنی) کمتری کنیت.',
 'logempty'             => 'هچ آیتم هم دپ ته آمار',
@@ -1495,6 +1679,7 @@ PICT # misc.
 'nextpage'          => 'ص�حه ی بعدی ($1)',
 'prevpage'          => ' ($1)پیشگین ص�حه',
 'allpagesfrom'      => 'پیش در ص�حات شروع بنت ته:',
+'allpagesto'        => 'پیش بدار ص�حاتی که هلنت گون:',
 'allarticles'       => 'کل ص�حات',
 'allinnamespace'    => 'کل ص�حات($1 نام �ضا)',
 'allnotinnamespace' => 'ص�حات کل (ته نام �ضا $1 نه)',
@@ -1515,41 +1700,69 @@ PICT # misc.
 'special-categories-sort-count' => 'ترتیب په اساس شمار',
 'special-categories-sort-abc'   => 'ترتیب ال�بی',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'مشارکتان کابر حذ� بوتء',
+
+# Special:LinkSearch
+'linksearch'       => 'دراین لینک ان',
+'linksearch-pat'   => 'گردگ الگو:',
+'linksearch-ns'    => 'نام �ضا:',
+'linksearch-ok'    => 'گردگ',
+'linksearch-text'  => 'تقریبانی په داب "*.wikipedia.org" شاید است�اده بیت.<br />
+داشتگین پروتوکل: <tt>$1</tt>',
+'linksearch-line'  => '$1 لینک بوتت چه $2',
+'linksearch-error' => 'تقریبیان شاید �قط ته اول نام هاست جاه کاینت.',
+
 # Special:ListUsers
 'listusersfrom'      => 'پیشدار کابرانی که شروع بنت گون:',
 'listusers-submit'   => 'پیش دار',
 'listusers-noresult' => 'هچ کابری در گیزگ نه بوت.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'ورود شرکتن کاربر',
+'newuserlogpagetext'          => '.شی یک ورودی چه شرکتن کاربر',
+'newuserlog-byemail'          => 'کلمه رمز گون ایمیل دیم دهگ بوت',
+'newuserlog-create-entry'     => 'نوکین کاربر',
+'newuserlog-create2-entry'    => 'نوکین حساب شربوت  $1',
+'newuserlog-autocreate-entry' => 'حساب اتوماتیکی شربوت',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'حقوق گروه کاربر',
-'listgrouprights-summary'  => 'جهلیگین یک لیستی چه گروهان کاربری تعری� بوتگین ته ای ویکی انت گون آیانی حق دسترسی آن همراهنت.
+'listgrouprights'                 => 'حقوق گروه کاربر',
+'listgrouprights-summary'         => 'جهلیگین یک لیستی چه گروهان کاربری تعری� بوتگین ته ای ویکی انت گون آیانی حق دسترسی آن همراهنت.
  درباره هر حقی ته ص�حه [[{{MediaWiki:Listgrouprights-helppage}}|گیشترین اطلاعات]] هستن.',
-'listgrouprights-group'    => 'گروه',
-'listgrouprights-rights'   => 'حقوق',
-'listgrouprights-helppage' => 'Help: حقوق گروه',
-'listgrouprights-members'  => '(لیست اعضا)',
+'listgrouprights-group'           => 'گروه',
+'listgrouprights-rights'          => 'حقوق',
+'listgrouprights-helppage'        => 'Help: حقوق گروه',
+'listgrouprights-members'         => '(لیست اعضا)',
+'listgrouprights-addgroup'        => 'تونیت اضا�ه کنت {{PLURAL:$2|گروه|گروهان}}: $1',
+'listgrouprights-removegroup'     => 'تونیت بزوریت {{PLURAL:$2|گروهء|گروهانء}}: $1',
+'listgrouprights-addgroup-all'    => 'تونیت کل گروهان اضا�ه کنت',
+'listgrouprights-removegroup-all' => 'تونیت کل گروهانء بزوریت',
 
 # E-mail user
-'mailnologin'     => 'هچ آدرس دیم دهگ',
-'mailnologintext' => 'شما بایدن [[Special:UserLogin|وارد بیت]] و یک معتبرین آدرس ایمیلی داشته بیت ته وتی [[Special:Preferences|ترجیحات]] په دیم داتن ایمیل په دگه کاربران',
-'emailuser'       => 'په ای کابر ایمیل دیم دی',
-'emailpage'       => 'ایمیل کاربر',
-'emailpagetext'   => 'گر ای کاربر یک معتبرین آدرس ایمیلی ته وتی ترجیحات کاربری وارد کتت،جهلگین �رم په آیء یک کوله ای دیم دنت.
+'mailnologin'      => 'هچ آدرس دیم دهگ',
+'mailnologintext'  => 'شما بایدن [[Special:UserLogin|وارد بیت]] و یک معتبرین آدرس ایمیلی داشته بیت ته وتی [[Special:Preferences|ترجیحات]] په دیم داتن ایمیل په دگه کاربران',
+'emailuser'        => 'په ای کابر ایمیل دیم دی',
+'emailpage'        => 'ایمیل کاربر',
+'emailpagetext'    => 'گر ای کاربر یک معتبرین آدرس ایمیلی ته وتی ترجیحات کاربری وارد کتت،جهلگین �رم په آیء یک کوله ای دیم دنت.
 آدرس ایمیلی که شما وارد کتت ته [[Special:Preferences|وتی ترجیحات]] په داب آدرس  "From" پیش دارگ بیت، اچه گروک ایمیل تونیت پسوء دنت.',
-'usermailererror' => 'شی ایمیل حطا پیش داشت',
-'defemailsubject' => '{{SITENAME}} ایمیل',
-'noemailtitle'    => 'هچ آدرس ایمیل',
-'noemailtext'     => 'ای کاربر یک آدرس ایمیل معتبری مشخص نه کتت یا انتخابی کت ای که چه دگه کابران ایمیل مه گریت.',
-'emailfrom'       => ':Ú†Ù‡',
-'emailto'         => 'به:',
-'emailsubject'    => 'موضوع:',
-'emailmessage'    => 'کوله:',
-'emailsend'       => 'دیم دی',
-'emailccme'       => 'یک کپی چه منی کوله په من وت ایمیل کن.',
-'emailccsubject'  => 'کپی چه شمی کوله په $1: $2',
-'emailsent'       => 'ایمیل دیم دهگ بوت',
-'emailsenttext'   => 'شمی کوله ایمیل دیم دهگ بوت.',
-'emailuserfooter' => 'این نامه الکترونیکی گون است�اده چه ویژگی «پست الکترونیکی به کاربر» {{SITENAME}} گون $1 په $2 دیم دهگ بوتت.',
+'usermailererror'  => 'شی ایمیل حطا پیش داشت',
+'defemailsubject'  => '{{SITENAME}} ایمیل',
+'noemailtitle'     => 'هچ آدرس ایمیل',
+'noemailtext'      => 'ای کاربر یک آدرس ایمیل معتبری مشخص نه کتت.',
+'nowikiemailtitle' => 'هیچ ایمیل مجاز نهنت',
+'nowikiemailtext'  => 'ای کاربر نه لوٹیت چه دگه کاربران ایمیل بگیرت.',
+'email-legend'     => 'یک ایمیلی په دگه کاربر {{SITENAME}} دیم دی',
+'emailfrom'        => ':Ú†Ù‡',
+'emailto'          => 'به:',
+'emailsubject'     => 'موضوع:',
+'emailmessage'     => 'کوله:',
+'emailsend'        => 'دیم دی',
+'emailccme'        => 'یک کپی چه منی کوله په من وت ایمیل کن.',
+'emailccsubject'   => 'کپی چه شمی کوله په $1: $2',
+'emailsent'        => 'ایمیل دیم دهگ بوت',
+'emailsenttext'    => 'شمی کوله ایمیل دیم دهگ بوت.',
+'emailuserfooter'  => 'این نامه الکترونیکی گون است�اده چه ویژگی «پست الکترونیکی به کاربر» {{SITENAME}} گون $1 په $2 دیم دهگ بوتت.',
 
 # Watchlist
 'watchlist'            => 'منی لیست چارگ',
@@ -1580,12 +1793,7 @@ PICT # misc.
 'iteminvalidname'      => "مشکل گون آیتم  '$1', نامعتبر  این نام",
 'wlnote'               => "جهلء {{PLURAL:$1|آهرین تغییر هست|آهرین هست'''$1''' تغییرات}} ته آهرین {{PLURAL:$2|ساعت|'''$2''' ساعات}}.",
 'wlshowlast'           => 'پیش دار آهرین $1  ساعات $2 روچان $3',
-'watchlist-show-bots'  => 'پیش دار اصلاحات روباتء',
-'watchlist-hide-bots'  => 'اصلاحات بت پناه کن',
-'watchlist-show-own'   => 'پیش دار منی اصلاحاتء',
-'watchlist-hide-own'   => 'منی اصلاحات آ پناه کن',
-'watchlist-show-minor' => 'پیش دار هوردین اصلاحاتء',
-'watchlist-hide-minor' => 'هوردین تغییرات پناه کن',
+'watchlist-options'    => 'گزینه یان لیست چارگ',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'چارگ بین',
@@ -1625,77 +1833,83 @@ $NEWPAGE
 نظرات و گیشترین کمک:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'حذ� ص�حه',
-'confirm'                     => 'تایید',
-'excontent'                   => "محتوا هستنت:  '$1'",
-'excontentauthor'             => "محتوا ات: '$1' (و  �قط شرکت کنندگان انت '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "محتوا پیش چه صا� بیگ بوتت : '$1'",
-'exblank'                     => 'ص�حه هالیک انت',
-'delete-confirm'              => 'حذ� "$1"',
-'delete-legend'               => 'حذ�',
-'historywarning'              => 'هوژاری: ص�حه ای که شما لوٹتیت آیآ حذ� کنیت یک تاریحی داریت:',
-'confirmdeletetext'           => 'شما لوٹیت یک ص�حه ای گون کل تاریحانی حذ� کنیت.
+# Delete
+'deletepage'             => 'حذ� ص�حه',
+'confirm'                => 'تایید',
+'excontent'              => "محتوا هستنت:  '$1'",
+'excontentauthor'        => "محتوا ات: '$1' (و  �قط شرکت کنندگان انت '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "محتوا پیش چه صا� بیگ بوتت : '$1'",
+'exblank'                => 'ص�حه هالیک انت',
+'delete-confirm'         => 'حذ� "$1"',
+'delete-legend'          => 'حذ�',
+'historywarning'         => 'هوژاری: ص�حه ای که شما لوٹتیت آیآ حذ� کنیت یک تاریحی داریت:',
+'confirmdeletetext'      => 'شما لوٹیت یک ص�حه ای گون کل تاریحانی حذ� کنیت.
 لط�ا تایید کنیت که شما چوش کنیت که شما زانیت آی ء عاقبتانآ و شی که شما ای کارآ گون [[{{MediaWiki:Policy-url}}|سیاست]] انجام دهیت',
-'actioncomplete'              => 'کار انجام بیت',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" حذ� بیت.
+'actioncomplete'         => 'کار انجام بیت',
+'deletedtext'            => '"<nowiki>$1</nowiki>" حذ� بیت.
 بگندیت $2 په ثبتی که نوکین حذ�یات',
-'deletedarticle'              => 'حذ� بوت "[[$1]]"',
-'suppressedarticle'           => 'متوق� بوت "[[$1]]"',
-'dellogpage'                  => 'حذ� ورودان',
-'dellogpagetext'              => 'جهلء یک لیستی چه نوکترین حذ�یات هست.',
-'deletionlog'                 => 'آمار حذ�',
-'reverted'                    => 'ترینگ بوت په پیشترین بازبینی',
-'deletecomment'               => 'دلیل حذ�:',
-'deleteotherreason'           => 'دگه/گیشترین دلیل:',
-'deletereasonotherlist'       => 'دگه دلیل',
-'deletereason-dropdown'       => '*متداولین دلایل حذ�
+'deletedarticle'         => 'حذ� بوت "[[$1]]"',
+'suppressedarticle'      => 'متوق� بوت "[[$1]]"',
+'dellogpage'             => 'حذ� ورودان',
+'dellogpagetext'         => 'جهلء یک لیستی چه نوکترین حذ�یات هست.',
+'deletionlog'            => 'آمار حذ�',
+'reverted'               => 'ترینگ بوت په پیشترین بازبینی',
+'deletecomment'          => 'دلیل حذ�:',
+'deleteotherreason'      => 'دگه/گیشترین دلیل:',
+'deletereasonotherlist'  => 'دگه دلیل',
+'deletereason-dropdown'  => '*متداولین دلایل حذ�
 ** درخواست نویسوک
 ** نقض حق کپی
 ** حرابکاری',
-'delete-edit-reasonlist'      => 'اصلاح کن دلایل حذ�ء',
-'delete-toobig'               => 'ص�حهء یک مزنین تاریح اصلاحی هست گیشتر چه $1 {{PLURAL:$1|بازبینی|بازبینی}}.
+'delete-edit-reasonlist' => 'اصلاح کن دلایل حذ�ء',
+'delete-toobig'          => 'ص�حهء یک مزنین تاریح اصلاحی هست گیشتر چه $1 {{PLURAL:$1|بازبینی|بازبینی}}.
 حذ� چوشین ص�حات په خاظر جلو گر چه ناگهانی ات�اق ته سایت {{SITENAME}} ممنوع بوتت.',
-'delete-warning-toobig'       => 'ای ص�حه  مزنین تاریح اصلاح هست، گیش چه  $1 {{PLURAL:$1|بازبینی|بازبینی}}.
+'delete-warning-toobig'  => 'ای ص�حه  مزنین تاریح اصلاح هست، گیش چه  $1 {{PLURAL:$1|بازبینی|بازبینی}}.
 حذ� آی شاید کار دیتابیس  {{SITENAME}} قطع کنت؛
 گون اخطار پیش روت.',
-'rollback'                    => 'پشت ترگ اصلاحات',
-'rollback_short'              => 'پشتررگ',
-'rollbacklink'                => 'عقب ترگ',
-'rollbackfailed'              => 'پشتررگ پروشت',
-'cantrollback'                => 'نه تونیت اصلاح برگردینیت؛
+
+# Rollback
+'rollback'         => 'پشت ترگ اصلاحات',
+'rollback_short'   => 'پشتررگ',
+'rollbacklink'     => 'عقب ترگ',
+'rollbackfailed'   => 'پشتررگ پروشت',
+'cantrollback'     => 'نه تونیت اصلاح برگردینیت؛
 آهری شرکت کننده �قط نویسوک ای ص�حه انت.',
-'alreadyrolled'               => 'نه تونیت ترینیت اهری اصلاح چه  [[:$1]] گون  [[User:$2|$2]] ([[User talk:$2|گپ]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+'alreadyrolled'    => 'نه تونیت ترینیت اهری اصلاح چه  [[:$1]] گون  [[User:$2|$2]] ([[User talk:$2|گپ]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
 یکی دگه پیش تر ص�حهء اصلاح کتت یا بری گردینت.
 
 آهری اصلاح توسط [[User:$3|$3]] ([[User talk:$3|گپ کن]]).',
-'editcomment'                 => 'نظر اصلاح ات:"<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'ترینت اصلاحات توسط  [[Special:Contributions/$2|$2]] ([[User talk:$2|گپ کن]])په آهری بازبینی گون [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'اصلاحات ترینگ بوتت گون $1;
+'editcomment'      => "نظر اصلاح ات:\"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'ترینت اصلاحات توسط  [[Special:Contributions/$2|$2]] ([[User talk:$2|گپ کن]])په آهری بازبینی گون [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'اصلاحات ترینگ بوتت گون $1;
 په آهری نسخه ترینگ بوتنت گون $2.',
-'sessionfailure'              => 'چوش جاه کیت که گون شمی نند  وارد بییگ مشکلی هست;
+'sessionfailure'   => 'چوش جاه کیت که گون شمی نند  وارد بییگ مشکلی هست;
 ای کار په خاطر سوء است�اده چه نندگ کنسل بوت.
 لط�ا بجنیت "back" و ص�حه ای که چه آیء اتکگیت دگه بار کنیت او راندء دگه تلاش کنیت.',
+
+# Protect
 'protectlogpage'              => 'ورودان ح�اظت',
 'protectlogtext'              => 'جهلء یک لیستی چه هست چه ص�حه پچ و بند کبلان.
 بچار [[Special:ProtectedPages|لیست ص�حات محا�ظتی]]  په لیستی محا�ظتات اجرای هنوکین ص�حه',
 'protectedarticle'            => 'محا�ظتی "[[$1]]"',
 'modifiedarticleprotection'   => 'عوض بوت سطح ح�اظت په "[[$1]]"',
 'unprotectedarticle'          => 'بی حمایت  "[[$1]]"',
+'movedarticleprotection'      => 'تنظیمات محا�ظت جاه په جاه بوت چه "[[$2]]" په "[[$1]]"',
 'protect-title'               => 'عوض کن سطح ح�اظت په  "$1"',
+'prot_1movedto2'              => '[[$1]] چاه په چاه بوت په [[$2]]',
 'protect-legend'              => 'ح�اظت تایید کن',
 'protectcomment'              => 'نظر:',
 'protectexpiry'               => 'منقضی بیت:',
 'protect_expiry_invalid'      => 'تاریح انقضای معتبر نهنت.',
 'protect_expiry_old'          => 'تاریخ انقصا ته گذشته انت.',
 'protect-unchain'             => 'اجازه یان جاه په جاهی پچ کن',
-'protect-text'                => 'شما شاید ادان سطح ح�اظت بگندیت و تغییر دیهت په ص�حه <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'شما نه تونیت سطوح ح�اظت وهدی مه محدود انت عوض کنیت.
-ادان تنظیمات هنوی په ص�حه است<strong>$1</strong>:',
-'protect-locked-dblock'       => 'سطوح ح�اظتی په خاطر یم �عالین کبل دیتابیس عوض نه  بنت.
-ادان تنظیمات هنوی په ص�حه است <strong>$1</strong>:',
-'protect-locked-access'       => 'شمی حساب اجازه نداریت سطوح ح�اظت ص�حه ی عوض کنت.
-ادان هنوکین تنظیمات هست په ص�حه <strong>$1</strong>:',
+'protect-text'                => "شما شاید ادان سطح ح�اظت بگندیت و تغییر دیهت په ص�حه '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "شما نه تونیت سطوح ح�اظت وهدی مه محدود انت عوض کنیت.
+ادان تنظیمات هنوی په ص�حه است'''$1''':",
+'protect-locked-dblock'       => "سطوح ح�اظتی په خاطر یم �عالین کبل دیتابیس عوض نه  بنت.
+ادان تنظیمات هنوی په ص�حه است '''$1''':",
+'protect-locked-access'       => "شمی حساب اجازه نداریت سطوح ح�اظت ص�حه ی عوض کنت.
+ادان هنوکین تنظیمات هست په ص�حه '''$1''':",
 'protect-cascadeon'           => 'ای ص�حه الان محا�ظت بیت چوش که آی شامل جهلی {{PLURAL:$1|ص�حات| درانت  که }} ح�اظت آبشار روشن.
 شما تونیت ای ص�حه ی سطح ح�اظت آ عوص کنیت، بله آی ء ح�اظت آبشاریء تاثیر نهلیت.',
 'protect-default'             => '(پیش �رض)',
@@ -1704,8 +1918,21 @@ $NEWPAGE
 'protect-level-sysop'         => '�قط کاربران سیستمی',
 'protect-summary-cascade'     => 'آبشاری',
 'protect-expiring'            => 'منقضی بوت $1 (UTC)',
+'protect-expiry-indefinite'   => 'نا معین',
 'protect-cascade'             => 'ح�اظت کن ص�حاتی په داب ای ص�حه (محا�ظت آبشاری)',
 'protect-cantedit'            => 'شما نه تونیت سطح حمایت ای ص�حه یا عوض کنیت، چون شما اجازه اصلاح کتن نیست',
+'protect-othertime'           => 'دگه وهدی:',
+'protect-othertime-op'        => 'دگه وهدی',
+'protect-existing-expiry'     => 'موجودین هلگی وهد:$2،$3',
+'protect-otherreason'         => 'دگه/اضا�ه این دلیل:',
+'protect-otherreason-op'      => 'دگه/اضا�ه این دلیل',
+'protect-dropdown'            => '*متداولین دلایل ح�اظت
+** بازگین هرابکاری
+** بازگین اسپم
+** اخطار هرابین اصلاح
+** مزنین ترا�یکی ص�حه',
+'protect-edit-reasonlist'     => 'اصلاح دلایل ح�اظت',
+'protect-expiry-options'      => '2 ساعت: 2 ساعت، 1 روچ: 1 روچ، 3 روچ: 3 روچ، 1 ه�ته: 1 ه�ته، 2 ه�ته: 2ه�ته، 1 ماه: 1 ماه: 2ماه، 3 ماه: 3 ماه، 6 ماه: 6 ماه، 1 سال: 1 سال، بی حد: بی حد', # display1:time1,display2:time2,...
 'restriction-type'            => 'اجازت',
 'restriction-level'           => 'سطح محدود',
 'minimum-size'                => 'هوردی اندازه',
@@ -1728,7 +1955,7 @@ $NEWPAGE
 'undeletepage'                 => 'به گند و برگردین ص�حات حذ�یء',
 'undeletepagetitle'            => "'''جهلیگین شامل حذ� بوتگین بازبینی آننت چه  [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'به گند ص�حات حذ�یء',
-'undeletepagetext'             => 'جهلیگین ص�حات حذ� بوتگنت بله هنگیت ته آرشیو هستن و توننت برگردینگ بنت.
+'undeletepagetext'             => 'جهلیگین {{PLURAL:$1|ص�حه}} حذ� بوتگنت بله هنگیت ته آرشیو هستن و توننت برگردینگ بنت.
 آرشیو شاید هر چند وهد پهک کنگ بیت.',
 'undelete-fieldset-title'      => 'ترینگ بازبینی  ان',
 'undeleteextrahelp'            => "په ترینگ کل ص�حه، کل جعبه انتخاب مه کن و کلیک کن  '''''تررین'''''.
@@ -1741,13 +1968,14 @@ $NEWPAGE
 'undeletehistorynoadmin'       => 'ای ص�حه حذ� بوتت.
 دلیل حذ� ته جهلگی خلاصه پیش دارگ بیت، گون جزییات کابرانی که ایء اصلاحش کتت پیش چه حذ� بیگ.
 متن واقعی ای بازبینی آن حذ� �قط په مدیران موجود انت.',
-'undelete-revision'            => 'حذ�ی بازبینی $1 (چه  $2) گون $3:',
+'undelete-revision'            => 'حذ�ی بازبینی $1 (چه  $4 ته $5) گون $3:',
 'undeleterevision-missing'     => 'نامعتبرین یا گارین بازبینی.
 شما شاید بدین لینکی داشته ایت یا بازبینی حذ� یا ترینگ بوتت چه آرشیو.',
 'undelete-nodiff'              => 'هچ پیشگین بازبینی درگیزگ نه بوت.',
 'undeletebtn'                  => 'باز گردینگ',
 'undeletelink'                 => 'واتر',
 'undeletereset'                => 'برگردینگ',
+'undeleteinvert'               => 'چپکایگ کتن انتخاب',
 'undeletecomment'              => 'نظر:',
 'undeletedarticle'             => 'واترینت "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|1 بازبینی|$1 بازبینی آن}} واترینگ بیت',
@@ -1781,27 +2009,27 @@ $1',
 'blanknamespace' => '(اصلی)',
 
 # Contributions
-'contributions' => 'مشارکتان کاربر',
-'mycontris'     => 'می مشارکتان',
-'contribsub2'   => 'په $1 ($2)',
-'nocontribs'    => 'هچ تغییر هم دپ گون ای معیار در نه بوت.',
-'uctop'         => '(بالا)',
-'month'         => 'چه ماه(و پیش تر):',
-'year'          => 'چه سال(و پیشتر)',
-
-'sp-contributions-newbies'     => 'پیش دار �قط مشارکتان نوکین حسایانء',
-'sp-contributions-newbies-sub' => 'په نوکین حسابان',
-'sp-contributions-blocklog'    => 'محدود کتن ورود',
-'sp-contributions-search'      => 'گردگ په مشارکتان',
-'sp-contributions-username'    => 'آدرس آی پی یا نام کاربری',
-'sp-contributions-submit'      => 'گردگ',
+'contributions'       => 'مشارکتان کاربر',
+'contributions-title' => 'مشارکتان کاربر په $1',
+'mycontris'           => 'می مشارکتان',
+'contribsub2'         => 'په $1 ($2)',
+'nocontribs'          => 'هچ تغییر هم دپ گون ای معیار در نه بوت.',
+'uctop'               => '(بالا)',
+'month'               => 'چه ماه(و پیش تر):',
+'year'                => 'چه سال(و پیشتر)',
+
+'sp-contributions-newbies'       => 'پیش دار �قط مشارکتان نوکین حسایانء',
+'sp-contributions-newbies-sub'   => 'په نوکین حسابان',
+'sp-contributions-newbies-title' => 'مشارکتان کاربر په نوکین حسابان',
+'sp-contributions-blocklog'      => 'محدود کتن ورود',
+'sp-contributions-search'        => 'گردگ په مشارکتان',
+'sp-contributions-username'      => 'آدرس آی پی یا نام کاربری',
+'sp-contributions-submit'        => 'گردگ',
 
 # What links here
 'whatlinkshere'            => 'ای لینکی که ادا هست',
 'whatlinkshere-title'      => 'ص�حاتی که لینگ بوتگنت په "$1"',
 'whatlinkshere-page'       => 'ص�حه:',
-'whatlinkshere-barrow'     => '>',
-'linklistsub'              => '(لیست کل لینکان)',
 'linkshere'                => "جهلیگی ص�حات لینک بوت '''[[:$1]]''':",
 'nolinkshere'              => "هچ لینک ص�حه ای په '''[[:$1]]'''.",
 'nolinkshere-ns'           => "هج ص�حه ای لینک نهنت په '''[[:$1]]''' ته ای انتخابی نام �ضا",
@@ -1842,11 +2070,13 @@ $1',
 'ipbenableautoblock'              => 'اتوماتیکی اهری آدرس آی پی که گون ای کاربر است�اده بوتت محدود کن، و هر چی زیر آی پی هست که سعی کننت اصلاح کننت',
 'ipbsubmit'                       => 'ای کاربرء محدود کن',
 'ipbother'                        => 'دگر وهد:',
-'ipboptions'                      => '2 ساعت: 2 ساعت، 1 روچ: 1 روچ، 3 روچ: 3 روچ، 1 ه�ته: 1 ه�ته، 2 ه�ته: 2ه�ته، 1 ماه: 1 ماه: 2ماه، 3 ماه: 3 ماه، 6 ماه: 6 ماه، 1 سال: 1 سال، بی حد: بی حد', # display1:time1,display2:time2,...
+'ipboptions'                      => '۲ ساعت:2 hours,۱ روچ:1 day,۳ روچ:3 days,۱ ه�ته:1 week,۲ ه�ته:2 weeks,۱ ماه:1 month,۳ ماه:3 months,۶ ماه:6 months,۱ سال:1 year,بی‌‌حد:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'دگر',
 'ipbotherreason'                  => 'دگر/اضا�ی ان دلیل:',
 'ipbhidename'                     => 'پناه کن نام کاربری چه آمار محدودیت، �عال کن لیست محدودیت و لیست کاربر',
 'ipbwatchuser'                    => 'بچار ای کاربرء ص�حات گپ و کاربری آ',
+'ipballowusertalk'                => 'په ای کاربر اجازت بدی  تا وتی ص�حه گپء اصلاح بکنت وهدی که محدود بیتت.',
+'ipb-change-block'                => 'بند کتن ای کاربر گون ای تنظیمات',
 'badipaddress'                    => 'نامعتبر آدرس آی پی',
 'blockipsuccesssub'               => 'محدودیت مو�ق بوت',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] محدود بوتت..<br />
@@ -1856,14 +2086,18 @@ $1',
 'ipb-unblock'                     => 'نام کاربری یا آدرس آی پی ر�ع محدودیت کن',
 'ipb-blocklist-addr'              => 'به گند هستین محدودیت په $1',
 'ipb-blocklist'                   => 'به گند هنوکین محدودیتان',
+'ipb-blocklist-contribs'          => 'مشارکت په $1',
 'unblockip'                       => 'کاربر ر�ع محدودیت کن',
 'unblockiptext'                   => 'چه ای جهلی �رم است�اده کن په ترینگ دسترسی نوشتن په یک پیشگین آدرس آی پی محدود یا نام کاربری.',
-'ipusubmit'                       => 'ای آدرسء ر�ع محدودیت کن',
+'ipusubmit'                       => 'ای محدودیتءَ بزور',
 'unblocked'                       => '[[User:$1|$1]] ر�ع محدودیت بیت.',
 'unblocked-id'                    => 'محدودیت $1  زورگ بیتت',
 'ipblocklist'                     => 'لیست محدود بیتگین آی پی و نام کاربران',
 'ipblocklist-legend'              => 'درگیزگ یم محدودین کاربری',
 'ipblocklist-username'            => 'نام کاربری یا آدرس آی پی:',
+'ipblocklist-sh-userblocks'       => '$1 بند کتن دسترسی کاربر',
+'ipblocklist-sh-tempblocks'       => '$1 بند کتن  دسترسی موقت',
+'ipblocklist-sh-addressblocks'    => '$1 بند کتن  دسترسی نشانی اینترنتی',
 'ipblocklist-submit'              => 'گردگ',
 'blocklistline'                   => '$1, $2محدود انت $3 ($4)',
 'infiniteblock'                   => 'بی حد',
@@ -1872,15 +2106,19 @@ $1',
 'noautoblockblock'                => 'اتوماتیکی محدودی غیر �عال',
 'createaccountblock'              => 'شرکتن حساب محدود انت',
 'emailblock'                      => 'ایمیل محدودانت',
+'blocklist-nousertalk'            => 'نه تونیت وتی ص�حه گپءاصلاح کنت',
 'ipblocklist-empty'               => 'لیست محدودی هالیک انت.',
 'ipblocklist-no-results'          => 'لوٹتگین نام کاربری یا آدرس آی پی محدود نهنت.',
 'blocklink'                       => 'محدود',
 'unblocklink'                     => 'ر�ع محدودیت',
+'change-blocklink'                => 'عوض کتن کبل',
 'contribslink'                    => 'مشارکتان',
 'autoblocker'                     => 'اتوماتیک کبلت په چی که شمی آدرس آی پی نوکی است�اده بوتت گون  "[[User:$1|$1]]".
 داتگین دلیل په محدود کتن $1 شی انت: "$2"',
 'blocklogpage'                    => 'بلاک ورود',
+'blocklog-fulllog'                => 'کاملین آمار محدودیت',
 'blocklogentry'                   => 'محدود بوته [[$1]] گون یک زمان انقاضای $2 $3',
+'reblock-logentry'                => 'تنظیم‌های بندکتن دسترسی [[$1]] را تغییر داتگت به هلگ بند کتن دسترسی ته $2 ساعت $3',
 'blocklogtext'                    => 'شی یک آماری چه کاران محدود و ر�ع محدودیت چه ای کاربر انت.
 اتوماتیکی محدود بوتگین آدرس آی پی ادان لیست نهنت.
 بچار [[Special:IPBlockList|لیست محدودیت آی پی]] په لیست هنوکین عملی محدودیتان و بند کتان.',
@@ -1889,11 +2127,14 @@ $1',
 'block-log-flags-nocreate'        => 'شرکتن حساب غیر �عال',
 'block-log-flags-noautoblock'     => 'اتوماتیکی محدوددیت غیر �عال',
 'block-log-flags-noemail'         => 'ایمیل محدودانت',
+'block-log-flags-nousertalk'      => 'نه تونیت ص�حه بحثء وتیء اصلاح کنیت',
 'block-log-flags-angry-autoblock' => 'بند کتن دسترسی خودکار پیشر�ته �عال انت',
 'range_block_disabled'            => 'توانایی مدیران سیستم په شرکتن محدوده محدودیت غیر �عالنت.',
 'ipb_expiry_invalid'              => 'وهد هلگ نامعتبر انت.',
 'ipb_expiry_temp'                 => 'پناهین نام کاربری محدودیاتن بایدن دایمی بنت.',
 'ipb_already_blocked'             => '"$1" الان محدودنت.',
+'ipb-needreblock'                 => '== بند بوتن دسترسی چه قبل ==
+دسترسی $1 چه قبل بند ات. آیا لوٹیت تنظیم‌های آن را تغییر دهیت؟',
 'ipb_cant_unblock'                => 'حطا: شناسگ محدودیت  $1 در گیزگ نه بوت. شاید هنگیت ر�ع محدودیت نهنت.',
 'ipb_blocked_as_range'            => 'حطا: ای پی  $1 مستقیما محدود نهنت و نه تونیت ر�ع محدودیت بیت.
 بله آی جزی چه محدوده  $2 محدود بوتت که تونیت ر�ع محدودیت بیت.',
@@ -1908,6 +2149,7 @@ $1',
 'sorbsreason'                     => 'شمی آدرس آی پی لیست بوتت په داب پچین پروکسی ته  DNSBL که است�اده بیت گون {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'شمی آدرس آی پی لیست بوتت په داب پچین پروکسی ته  دی ان ای بی ال که است�اده بیت گون {{SITENAME}}.
 شما نه تونیت حسابی شرکنیت',
+'cant-block-while-blocked'        => 'شما نه تونیت دگه کاربرانء بند کنیت وهدی که شما وت بند هستیت',
 
 # Developer tools
 'lockdb'              => 'دیتابیس کبل کن',
@@ -1931,9 +2173,9 @@ $1',
 'databasenotlocked'   => 'دیتابیس کبل نهنت.',
 
 # Move page
-'move-page'               => 'جاه په جاه کن $1',
-'move-page-legend'        => 'ص�حه جاه په جاه کن',
-'movepagetext'            => "است�اده چه جهلگی �رم یک ص�حه ای نامی آ بدل کنت، کل تاریح آیآ په نوکین نام جاه په جاه کنت.
+'move-page'                    => 'جاه په جاه کن $1',
+'move-page-legend'             => 'ص�حه جاه په جاه کن',
+'movepagetext'                 => "است�اده چه جهلگی �رم یک ص�حه ای نامی آ بدل کنت، کل تاریح آیآ په نوکین نام جاه په جاه کنت.
 گهنگین عنوان یک ص�حه غیر مستقیمی په نوکین عنوان بیت.
 لینکان په کهنگین عوض نبنت;
 مطمین بیت په خاطر [[Special:DoubleRedirects|دوتایی]] یا [[Special:BrokenRedirects|پرشتگین غیر مستقیم]].
@@ -1944,50 +2186,62 @@ $1',
 ''''هوژاری!''''  
 شی ممکننت یک تغییر آنی و نه لوٹتگین په یک معرو�ین ص�حه ای بیت;
 لص�ا مطمین بیت شما عواقب شی زانیت پیش چه دیم روگآ",
-'movepagetalktext'        => "همراهی گپان ص�حه اتوماتیک گون آی جاه په چاه بنت ''''مگر:''''
+'movepagetalktext'             => "همراهی گپان ص�حه اتوماتیک گون آی جاه په چاه بنت ''''مگر:''''
 یک ناهالیکین ص�حه گپی چیر آی ء نوکین نام بیت، یا
 شما جهلیگین باکس آ تیک مجنیت.
 ته ای موراد شما بایدن ص�حه یا دسته جاه په جاه کنی و یا آیآ چن و بند کینت.",
-'movearticle'             => 'جاه په چاهی ص�حه:',
-'movenotallowed'          => 'شما را اجازت به جاه په جاه کتن ص�حات نیست.',
-'newtitle'                => 'په نوکین عنوان:',
-'move-watch'              => 'این ص�حه یا بچار',
-'movepagebtn'             => 'جاه په جاه کن ص�حه',
-'pagemovedsub'            => 'جاه په جاهی مو�قیت بود',
-'movepage-moved'          => '<big>\'\'\'"$1" جاه په اجه بوت په"$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'ص�حه گون آن نام پیش تر هستت، یا نامی که شما زورتت نامعتبرنت.
+'movearticle'                  => 'جاه په چاهی ص�حه:',
+'movenologin'                  => 'وارد نهیت',
+'movenologintext'              => 'شما بایدن یک ثبت نامی کاربری بیت و [[Special:UserLogin|وارد بیت]]په جاه په جاه کتن یک ص�حه.',
+'movenotallowed'               => 'شما را اجازت به جاه په جاه کتن ص�حات نیست.',
+'movenotallowedfile'           => 'شما را اجارت په جاه په جاه کتن �ایلان نیستن.',
+'cant-move-user-page'          => 'شما را اجازت نیستن که ص�حات کاربر اصلیء جاه په جاه کنیت.',
+'cant-move-to-user-page'       => 'شمارء اجازت نیستن که یک ص�حه ی په ص�حه کاربری جاه په جاه کنیت( غیر چه زیر ص�حه کاربر).',
+'newtitle'                     => 'په نوکین عنوان:',
+'move-watch'                   => 'این ص�حه یا بچار',
+'movepagebtn'                  => 'جاه په جاه کن ص�حه',
+'pagemovedsub'                 => 'جاه په جاهی مو�قیت بود',
+'movepage-moved'               => '<big>\'\'\'"$1" جاه په اجه بوت په"$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'یک غیر مستقیمی شر بوت',
+'movepage-moved-noredirect'    => 'شرکتن غیر مستقیم بند بوتگ.',
+'articleexists'                => 'ص�حه گون آن نام پیش تر هستت، یا نامی که شما زورتت نامعتبرنت.
 یک دگه نامی بزوریت.',
-'cantmove-titleprotected' => 'شما نه تونیت یک ص�حه ای به ای جاگاه جاه په جاه کنیت، په چی که نوکین عنوان محا�ظت بیت چه شربیگ',
-'talkexists'              => "''''ص�حه وتی گون مو�قیت جاه په جاه بوت، بله ص�حه گپ نه نویت جاه  په جاه بیت چون که یکی ته نوکین عنوان هست.
+'cantmove-titleprotected'      => 'شما نه تونیت یک ص�حه ای به ای جاگاه جاه په جاه کنیت، په چی که نوکین عنوان محا�ظت بیت چه شربیگ',
+'talkexists'                   => "''''ص�حه وتی گون مو�قیت جاه په جاه بوت، بله ص�حه گپ نه نویت جاه  په جاه بیت چون که یکی ته نوکین عنوان هست.
 لط�ا آیآ دستی چند و بند کنیت.''''",
-'movedto'                 => 'جاه په جاه بیت په',
-'movetalk'                => 'جاه په جاه کتن ص�حه کپ همراه',
-'move-subpages'           => 'جاه په جاه کن کل زیرص�حاتء، اگر بیت',
-'move-talk-subpages'      => 'جاه په جاه کن کل زیرص�حات ص�حه گپء، اگه بیت',
-'movepage-page-exists'    => 'ص�حه  $1 هنو هستن و نه تونیت اتوماتیکی سر بنویسیت.',
-'movepage-page-moved'     => 'ص�حه  $1 جاه په جاه بیت په  $2',
-'movepage-page-unmoved'   => 'ص�حه $1نه تونیت جاه په جاه بیت په $2',
-'movepage-max-pages'      => 'گیشترین $1 {{PLURAL:$1|ص�حه|ص�حات}}جاه په جاه بوتگن  ودگه هچی اتوماتیکی جاه په جاه نه بیت.',
-'1movedto2'               => '[[$1]] چاه په چاه بوت په [[$2]]',
-'1movedto2_redir'         => '[[$1]] جاه په جاه بوت په [[$2]] غیر مستقیم',
-'movelogpage'             => 'جاه په جاهی ورود',
-'movelogpagetext'         => 'جهلء یک لیستی چه ص�حات جاه په جاه بوتگین هست',
-'movereason'              => 'دلیل:',
-'revertmove'              => 'برگردینگ',
-'delete_and_move'         => 'حذ� وجاه په جاه کن',
-'delete_and_move_text'    => '== حذ� نیاز داریت په ==
+'movedto'                      => 'جاه په جاه بیت په',
+'movetalk'                     => 'جاه په جاه کتن ص�حه کپ همراه',
+'move-subpages'                => 'جاه په جاه کن کل زیرص�حاتء، اگر بیت',
+'move-talk-subpages'           => 'جاه په جاه کن کل زیرص�حات ص�حه گپء، اگه بیت',
+'movepage-page-exists'         => 'ص�حه  $1 هنو هستن و نه تونیت اتوماتیکی سر بنویسیت.',
+'movepage-page-moved'          => 'ص�حه  $1 جاه په جاه بیت په  $2',
+'movepage-page-unmoved'        => 'ص�حه $1نه تونیت جاه په جاه بیت په $2',
+'movepage-max-pages'           => 'گیشترین $1 {{PLURAL:$1|ص�حه|ص�حات}}جاه په جاه بوتگن  ودگه هچی اتوماتیکی جاه په جاه نه بیت.',
+'1movedto2'                    => '[[$1]] چاه په چاه بوت په [[$2]]',
+'1movedto2_redir'              => '[[$1]] جاه په جاه بوت په [[$2]] غیر مستقیم',
+'move-redirect-suppressed'     => 'تغییر مسیر بند بوت',
+'movelogpage'                  => 'جاه په جاهی ورود',
+'movelogpagetext'              => 'جهلء یک لیستی چه ص�حات جاه په جاه بوتگین هست',
+'movereason'                   => 'دلیل:',
+'revertmove'                   => 'برگردینگ',
+'delete_and_move'              => 'حذ� وجاه په جاه کن',
+'delete_and_move_text'         => '== حذ� نیاز داریت په ==
 ص�حه مبدا "[[:$1]]"  که هنگت هستن.
 آیا شما لوٹیت آیء حذ� کنیت دان په حذ�‌ آیء راهی شر بیت؟',
-'delete_and_move_confirm' => 'بله، ص�حه حذ� کن',
-'delete_and_move_reason'  => 'حذ� بوت په شرکتن راه په جاه په جاه کتن',
-'selfmove'                => 'منبع و مقصد عناوین یک انت؛
+'delete_and_move_confirm'      => 'بله، ص�حه حذ� کن',
+'delete_and_move_reason'       => 'حذ� بوت په شرکتن راه په جاه په جاه کتن',
+'selfmove'                     => 'منبع و مقصد عناوین یک انت؛
 نه تونیت ص�حه ای په وتی جاگاهء جاه په جاه کنت',
-'immobile_namespace'      => 'منبع یا مقصد عنوان چه نوح حاصین انت؛
-نه تونین ص�حاتء چه یا په آی نام �ضا جاه په جاه کنت.',
-'imagenocrossnamespace'   => 'نه تونیت جاه په جاه کنت �ایل په یا نام �ضای غیر �ایلی',
-'imagetypemismatch'       => 'نوکین �ایل بند گون نوع آی هم دپ نهنت.',
-'imageinvalidfilename'    => '�ایل عکس هد� نام معتبر انت',
-'fix-double-redirects'    => 'په روچ کتن هر غیر مستقیمی که په مقاله اصلی اشاره کنت',
+'immobile-source-namespace'    => 'نه تونیت ص�حات ته نام �ضا جاه په جاه کنیت"$1"',
+'immobile-target-namespace'    => 'نه تونیت ص�حات ته نام �ضا جاه په جاه کنیت "$1"',
+'immobile-target-namespace-iw' => 'لینک بین ویکی یک معتربین مقصد په ص�حه جاه په جاهی نهنت',
+'immobile-source-page'         => 'ای ص�حه جاه په جاه نه بیت',
+'immobile-target-page'         => 'ته تونیت په مقصدین عنوان جاه په جاه بیتن.',
+'imagenocrossnamespace'        => 'نه تونیت جاه په جاه کنت �ایل په یا نام �ضای غیر �ایلی',
+'imagetypemismatch'            => 'نوکین �ایل بند گون نوع آی هم دپ نهنت.',
+'imageinvalidfilename'         => '�ایل عکس هد� نام معتبر انت',
+'fix-double-redirects'         => 'په روچ کتن هر غیر مستقیمی که په مقاله اصلی اشاره کنت',
+'move-leave-redirect'          => 'یک تغییر مسیر بل',
 
 # Export
 'export'            => 'خروج ص�حات',
@@ -1996,7 +2250,7 @@ $1',
 
 په خروج ص�حات، عناوین آیء ته جهلگی باکس وارد کن, هر عنوان ته یک حطی، و انتخاب کن که آیا شمل لوٹیت هنوکین نسخه و کل کدیمی نسخ،گون خطوط تاریح ص�حه, یا �قط هنوکین نسخه گون اطلاعاتی درباره آهری اصلاح.
 
-په اهری مورد شما تونیت هنچوش چه یک لینکی است�اده کنیت،مثلا [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] په ص�حه ی "[[{{MediaWiki:Mainpage}}]]".',
+په اهری مورد شما تونیت هنچوش چه یک لینکی است�اده کنیت،مثلا [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] په ص�حه ی "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => '�قط شامل هنوکین بازبینی، نه تاریح کامل',
 'exportnohistory'   => "----
 '''توجه:''' گردگ تاریح کامل ص�حات چه طریق ای �رم په خاطر دلایل اجرایی غیر �عال بوتت.",
@@ -2012,7 +2266,7 @@ $1',
 'allmessagesdefault'        => 'پیش �رضین متن',
 'allmessagescurrent'        => 'هنوکین متن',
 'allmessagestext'           => 'شی یک لیستی چه کوله یان موجود ته نام �ضای مدیا وی کی انت.
-لط�ا بچاریت  [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] و [http://translatewiki.net Betawiki] اگر شما لوٹیت ته ملکی کتن مدیا وی کی کمک کنیت.',
+لط�ا بچاریت  [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] و [http://translatewiki.net translatewiki.net] اگر شما لوٹیت ته ملکی کتن مدیا وی کی کمک کنیت.',
 'allmessagesnotsupportedDB' => "ای ص�حه نه تونیت است�اده بیت په چی که'''\$wgUseDatabaseMessages''' غیر �عالنت.",
 'allmessagesfilter'         => '�یلتر نام کوله:',
 'allmessagesmodified'       => '�قط پیش دار تغییر دهگ بیتیگن',
@@ -2032,9 +2286,12 @@ $1',
 'import-interwiki-text'      => 'یک ویکی و  عنوان ص�حه انتخاب کن په ورود.
 تاریح بازبینی و نامان اصلاح کنوکان دارگ بیت.
 کل کاران ورود بین ویکی وارد بیت نه [[Special:Log/import|ورود آمار]].',
+'import-interwiki-source'    => 'ویکی بن در/ص�حه:',
 'import-interwiki-history'   => 'کپی کن کل بازبینی آن تاریح په ای ص�حه',
 'import-interwiki-submit'    => 'ورود',
 'import-interwiki-namespace' => 'مقصدء نام �ضا',
+'import-upload-filename'     => '�ایلءَ نام:',
+'import-comment'             => 'نظر:',
 'importtext'                 => 'لط�ا �ایل چه منبع ویکی درگیز گون حاصین:[[Special:Export|وسیله درگیزگ]], ایء ته وتی دیسک ذخیره کن و ادان آپلود کن.',
 'importstart'                => 'وارد کنت ص�حات...',
 'import-revision-count'      => '$1 {{PLURAL:$1|بازبینی|بازبینی ان}}',
@@ -2068,19 +2325,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|بازبینی|بازبینی ان}} چه $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'ص�حه کاربری من',
+'tooltip-pt-userpage'             => 'شمی ص�حات',
 'tooltip-pt-anonuserpage'         => 'ص�حه کاربر په آی پی که شما هنو اصلاح کنیت په داب',
-'tooltip-pt-mytalk'               => 'ص�حه گپ من',
+'tooltip-pt-mytalk'               => 'شمی ص�حه گپ',
 'tooltip-pt-anontalk'             => 'بحث باره ی اصلاحات چه ای آدرس آی پی',
 'tooltip-pt-preferences'          => 'منی ترجیحات',
 'tooltip-pt-watchlist'            => 'لیست ص�حیانی که شما تغییرات آیانا رند گرگیت',
-'tooltip-pt-mycontris'            => 'لیست منی مشارکتان',
+'tooltip-pt-mycontris'            => 'لیست شمی مشارکتان',
 'tooltip-pt-login'                => 'شر ترنت که وارد بیت، بله شی اجبار نهنت',
 'tooltip-pt-anonlogin'            => 'چه شما دست بندی بیت وارد بیت، بله شی هنگت ضرورت نهنت.',
 'tooltip-pt-logout'               => 'در بیگ',
 'tooltip-ca-talk'                 => 'بحث دباره محتوای ص�حه',
 'tooltip-ca-edit'                 => 'شما تونیت ای ص�حه یا اصلاح کنیت. لط�ا چه بازبین دکمه پیش چه ذخیره کتن است�اده کنیت.',
-'tooltip-ca-addsection'           => 'په ای بحث یک نظر هور کن',
+'tooltip-ca-addsection'           => 'یک نوکین بخشی شر کن',
 'tooltip-ca-viewsource'           => 'ای ص�حه محا�ظت بوتت. شما تونیت آیی منبع آ بچاریت',
 'tooltip-ca-history'              => 'پیشگین نسخ چه ای ص�حه',
 'tooltip-ca-protect'              => 'ای ص�حه یا ح�اظت کن',
@@ -2127,6 +2384,8 @@ $1',
 'tooltip-watch'                   => 'ای ص�حه یانا ته وتی لیست چارگ هور کن',
 'tooltip-recreate'                => 'دگه شرکتن ص�حه علاوه بر شی که ای حذ� بوتت',
 'tooltip-upload'                  => 'آپلود بنگیج بوت',
+'tooltip-rollback'                => '"ترین" اصلا(ان) ته ای ص�حه چه اهزس مشارکت کنوک ته گون یک کلیک.',
+'tooltip-undo'                    => '"ترینگ" ای  اصلاح و پچ کن �رم اصلاحء ته حالت بازبینی. اجازت دن اضا�ه کتن یک دلیلی ته خلاصه',
 
 # Stylesheets
 'common.css'   => '/* CSS که اداننت په کل پوستان په کار رونت. */',
@@ -2142,12 +2401,12 @@ $1',
 'notacceptable'     => 'سروری ویکی نه تونیت دیتای ته �رمتی که شمی کلاینت بتوننت آی بوانند �راهم کنت.',
 
 # Attribution
-'anonymous'        => 'ناشناس کاربر(ان)  {{SITENAME}}',
+'anonymous'        => 'ناشناسین {{PLURAL:$1|کاربر|کاربران}} چه {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} کاربر $1',
 'lastmodifiedatby' => 'ای ص�حه اهری رندی که تغییر دهگ بیته $2, $1گون $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'براساس کار توسط $1.',
 'others'           => 'دگران',
-'siteusers'        => '{{SITENAME}} کاربر(آن) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|کاربر|کاربران}} $1',
 'creditspage'      => 'اعتبارات ص�حه',
 'nocredits'        => 'په ای ص�حه اطلاعات اعتبارات موجود نهنت.',
 
@@ -2168,6 +2427,16 @@ $1',
 'numauthors'     => 'تعداد دوراین نویسوکان (ص�حه): $1',
 'numtalkauthors' => 'تعداد مجزاین نویسوکان(ص�حه بحث): $1',
 
+# Skin names
+'skinname-standard'    => 'کلاسیک',
+'skinname-nostalgia'   => 'نوستالجیک',
+'skinname-cologneblue' => 'نیلی کولاجن',
+'skinname-monobook'    => 'منوبوک',
+'skinname-myskin'      => 'منی جلد',
+'skinname-chick'       => 'شیک',
+'skinname-simple'      => 'ساده',
+'skinname-modern'      => 'مدرن',
+
 # Math options
 'mw_math_png'    => 'یکسره PNG تحویل دی',
 'mw_math_simple' => 'HTML اگر باز سادگت یا دگه PNG',
@@ -2188,11 +2457,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'شما را اجازت نیست وتی تغییراتء په عنوان نظارت بیتگین نشان کنیت.',
 
 # Patrol log
-'patrol-log-page'   => 'آمار نظارت',
-'patrol-log-header' => 'شی آماری چه بازبینی آن گشتی انت.',
-'patrol-log-line'   => 'نشان هلگ بیتن $1 چه $2 نظارت $3',
-'patrol-log-auto'   => '(اتوماتیک)',
-'patrol-log-diff'   => 'ر$1',
+'patrol-log-page'      => 'آمار نظارت',
+'patrol-log-header'    => 'شی آماری چه بازبینی آن گشتی انت.',
+'patrol-log-line'      => 'نشان هلگ بیتن $1 چه $2 نظارت $3',
+'patrol-log-auto'      => '(اتوماتیک)',
+'patrol-log-diff'      => 'ر$1',
+'log-show-hide-patrol' => '$1  آمار گشت',
 
 # Image deletion
 'deletedrevision'                 => 'قدیمی بازبینی $1 حذ� بوت',
@@ -2209,6 +2479,9 @@ $1',
 'previousdiff' => '� پیشگین اصلاح',
 'nextdiff'     => 'نوکترین اصلاح→',
 
+# Visual comparison
+'visual-comparison' => 'مقایسه تصویری',
+
 # Media information
 'mediawarning'         => "''''هوژاری:'''' ای �ایل شاید شامل بد واهین کد بوت،اجرای آیی ته وتی سیستم شاید توا�قی بیت.<hr />",
 'imagemaxsize'         => 'محدودیت تصاویر ته �ایل ص�حات توضیح ته:',
@@ -2221,10 +2494,12 @@ $1',
 'show-big-image'       => 'کل ص�حه',
 'show-big-image-thumb' => '<small>اندازه ای بازبین:$1× $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'گالری نوکین �ایلان',
 'imagelisttext'         => "جهل یک لیستی چه  '''$1''' {{PLURAL:$1|�ایل|�ایلان}} هست که ترتیبنت $2.",
 'newimages-summary'     => 'ای حاصین ص�حه اهرین آپلود بوتگین �ایلان پیشداریت',
+'newimages-legend'      => '�یلتر',
+'newimages-label'       => 'نام �ایل ( یا چنڈی چه آيی):',
 'showhidebots'          => '(روباتان $1 )',
 'noimages'              => 'هیچی په دیستن',
 'ilsubmit'              => 'گردگ',
@@ -2495,6 +2770,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ایزو استدیو تنگستن',
 'exif-lightsource-255' => 'دگ منبع نور',
 
+# Flash modes
+'exif-flash-fired-0'    => 'بی �لاش جنگ',
+'exif-flash-fired-1'    => '�لاش جنت',
+'exif-flash-return-0'   => 'بی عملگر درگیزگ نور انعکاسی',
+'exif-flash-return-2'   => 'نور انعکاسی درگیزگ نه بوت',
+'exif-flash-return-3'   => 'نور انعکاسی درگیزگ بوت',
+'exif-flash-mode-1'     => '�لاش جنگ جبرانی',
+'exif-flash-mode-2'     => '�لاش نه جنگ جبرانی',
+'exif-flash-mode-3'     => 'اتوماتیکی حالت',
+'exif-flash-function-1' => 'بی عملگر �لاش',
+'exif-flash-redeye-1'   => 'حالت کم کتن سهری چمء',
+
 'exif-focalplaneresolutionunit-2' => 'اینچ',
 
 'exif-sensingmethod-1' => 'تعری� نه بوتگین',
@@ -2645,25 +2932,15 @@ $1
 
 'unit-pixel' => 'پیکس',
 
-# HTML dump
-'redirectingto' => 'دگه شرگنگنت په [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'ذخیره ای ص�حه پهک کنت؟
-
-$1',
 'confirm_purge_button' => 'هوبنت',
-
-# AJAX search
-'searchcontaining' => "گردگ په ص�حات شامل ''$1''.",
-'searchnamed'      => "گردگ په ص�حات په نام ''$1''.",
-'articletitles'    => "ص�حات شروع بیت گون ''$1''",
-'hideresults'      => 'پناه کن نتایجء',
-'useajaxsearch'    => 'چه گردگ آژاکسی است�اده کن',
+'confirm-purge-top'    => 'ذخیره ای ص�حه پهک کنت؟',
+'confirm-purge-bottom' => 'خالک کتن میانگیر یک ص�حه باعث بیتن که آخرین نسخهٔ آی پیش دارگ بیت.',
 
 # Separators for various lists, etc.
-'colon-separator'    => ':&#32;',
-'autocomment-prefix' => '-',
+'semicolon-separator' => ';',
+'colon-separator'     => ':&#32;',
+'autocomment-prefix'  => '-',
 
 # Multipage image navigation
 'imgmultipageprev' => '� پیشگین ص�حه',
@@ -2683,10 +2960,10 @@ $1',
 'table_pager_empty'        => 'بی نتیجه',
 
 # Auto-summaries
-'autosumm-blank'   => 'محتوا چه کل ص�حه دور کنگنت',
+'autosumm-blank'   => 'هالیکین ص�حه',
 'autosumm-replace' => "جاه په جاه کتن ص�حه گون '$1'",
 'autoredircomment' => 'غیر مستقیم روگنت په [[$1]]',
-'autosumm-new'     => 'نوکین ص�حه: $1',
+'autosumm-new'     => "شر بیتگیت ص�حه گون: '$1'",
 
 # Size units
 'size-bytes'     => '$1 ب',
@@ -2777,6 +3054,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'ناشناس برجسب الحاق  "$1"',
+'duplicate-defaultsort' => 'هژاری: ترتیب پیش �رض «$2» ترتیب پیش �رض پیشگین «$1» را باطل کنت.',
 
 # Special:Version
 'version'                          => 'نسخه', # Not used as normal message but as header for the special page itself
@@ -2806,13 +3084,13 @@ $1',
 'filepath-summary' => 'ای حاصین ص�حه مسیر کامل په یک �ایل پیش داریت.
 تصاویر گون وضوح کامل پیش دارگ بنت و دگه نوع �ایلان گون وتی برنامه یانش مستقیما پچ بنت.
 
-نام �ایل بی پسوند "{{ns:image}}:" وارد کن',
+نام �ایل بی پسوند "{{ns:file}}:" وارد کن',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'گردگ په کپی  �ایلان',
 'fileduplicatesearch-summary'  => 'گردگ په کپی �ایلان په اساس درهمین ارزش.
 
-نا �ایل بی پیش وند "{{ns:image}}:" وارد کنیت',
+نا �ایل بی پیش وند "{{ns:file}}:" وارد کنیت',
 'fileduplicatesearch-legend'   => 'گردگ په  کپی',
 'fileduplicatesearch-filename' => ':نام �ایل',
 'fileduplicatesearch-submit'   => 'گردگ',
@@ -2842,4 +3120,13 @@ $1',
 'blankpage'              => 'هالیکین ص�حه',
 'intentionallyblankpage' => 'ای ص�حه عمدا هالیک هلگ بوتت و په محک زتن ویا دگه چیز.',
 
+# External image whitelist
+'external_image_whitelist' => ' #ای خطء هنچوش که هستن بلیت<pre>
+#اصطلاحات منظمء جهل بلیت (قسمتان باید بین شی بیاینت //) جهلء
+#شی گون یو ار ال درای لینک عکسان هم دپ بیت
+#ایانی که هم دپ بنت په داب عکس پیش دارگ بنت وگرنه �قط یک لینکی په عکس پیشداریت
+#خطوطی که گون # شروع بنت په داب نظر جاه کاینت
+
+#کل بخشان رجکسء بالادء ای خظ بل. ای خط هنچوش که هست بلی</pre>',
+
 );
diff --git a/languages/messages/MessagesBcl.php b/languages/messages/MessagesBcl.php
index 00ccc257..44123ce0 100644
--- a/languages/messages/MessagesBcl.php
+++ b/languages/messages/MessagesBcl.php
@@ -5,28 +5,19 @@
  * @file
  *
  * @author Filipinayzd
- * @author Siebrand Mazeland
  * @author Steven*fung
  * @author Urhixidur
  */
 
-$skinNames = array(
-	'standard'    => 'Klasiko',
-	'simple'      => 'Simple',
-	'modern'      => 'Bago',
-);
-
 $namespaceNames = array(
 	NS_MEDIA          => 'Medio',
 	NS_SPECIAL        => 'Espesyal',
-	NS_MAIN           => '',
 	NS_TALK           => 'Olay',
 	NS_USER           => 'Paragamit',
 	NS_USER_TALK      => 'Olay_kan_paragamit',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => 'Olay_sa_$1',
-	NS_IMAGE          => 'Ladawan',
-	NS_IMAGE_TALK     => 'Olay_sa_ladawan',
+	NS_FILE           => 'Ladawan',
+	NS_FILE_TALK      => 'Olay_sa_ladawan',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Olay_sa_MediaWiki',
 	NS_TEMPLATE       => 'Plantilya',
@@ -89,8 +80,6 @@ $messages = array(
 'underline-never'   => 'Nungka',
 'underline-default' => 'Browser na normal',
 
-'skinpreview' => '(Tânawon)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Lunes',
@@ -181,7 +170,7 @@ $messages = array(
 'mytalk'         => 'An sakóng olay',
 'anontalk'       => 'Olay para sa IP na ini',
 'navigation'     => 'Nabigasyon',
-'and'            => 'asin',
+'and'            => '&#32;asin',
 
 # Metadata in edit box
 'metadata_help' => 'Mga Metadatos:',
@@ -244,8 +233,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Manonongod sa {{SITENAME}}',
 'aboutpage'            => 'Project:Manonongod',
-'bugreports'           => 'Mga reportahe nin mga salâ',
-'bugreportspage'       => 'Project:Mga reportahe nin salâ',
 'copyright'            => 'Makukua an laog sa $1.',
 'copyrightpagename'    => '{{SITENAME}} derechos nin parásurat',
 'copyrightpage'        => '{{ns:project}}:Mga derechos nin parásurat',
@@ -268,8 +255,6 @@ $messages = array(
 
 'badaccess'        => 'Salang permiso',
 'badaccess-group0' => 'Dai ka tinotogotan na gibohon an aksyon na saimong hinahagad.',
-'badaccess-group1' => 'An aksyon na saimong hinahagad limitado sa mga parágamit sa grupong $1.',
-'badaccess-group2' => 'An aksyon na saimong hinahagad limitado sa mga parágamit sa sarô sa mga grupong $1.',
 'badaccess-groups' => 'An aksyon na saimong hinahagad limitado sa mga parágamit sa sarô sa mga grupong $1.',
 
 'versionrequired'     => 'Kaipuhan an bersyon $1 kan MediaWiki',
@@ -284,6 +269,8 @@ $messages = array(
 'editsection'             => 'ligwatón',
 'editold'                 => 'Ligwatón',
 'viewsourceold'           => 'hilingón an ginikánan',
+'editlink'                => 'ligwatón',
+'viewsourcelink'          => 'hilingón an toltolan',
 'editsectionhint'         => 'Ligwatón an seksyon: $1',
 'toc'                     => 'Mga laog',
 'showtoc'                 => 'ipahilíng',
@@ -362,7 +349,6 @@ Ini an eksplikasyon kan tagamató na nagkandado kaini: $1',
 'cannotdelete'         => 'Dai naparà an pahina o file na napilî. (Pwede na naparà na ini kan ibang paragamit.)',
 'badtitle'             => 'Salâ an titulo',
 'badtitletext'         => 'Dai pwede an hinagad na titulo nin pahina, o mayong laog, o sarong titulong pan-ibang tatarámon o pan-ibang wiki na sala an pagkatakód. Pwedengigwa ining sarô o iba pang mga karakter na dai pwedeng gamiton sa mga titulo.',
-'perfdisabled'         => 'Despensa! Bawal mùna an aksyón na ini huli ta nagpapaluway ini sa base nin datos hasta dai na magamit kan iba an wiki.',
 'perfcached'           => 'Nakaabang an minasunod na mga datos, asin pwede ser na mga lumâ na.',
 'perfcachedts'         => 'Nakaabang an nagsusunod na mga datos, asin huring nabâgo sa $1.',
 'querypage-no-updates' => 'Pigpopogol mùna an mga pagbabàgo sa pahinang ini. Dai mùna mababàgo an mga datos digdi.',
@@ -383,12 +369,12 @@ $2',
 'ns-specialprotected'  => 'An mga páhinang nasa {{ns:special}} na ngaran-espacio dai pwedeng hirahón.',
 
 # Virus scanner
-'virus-badscanner'     => 'Saláng konfigurasyon: dai aram an virus scanner: <i>$1</i>',
+'virus-badscanner'     => "Saláng konfigurasyon: dai aram an virus scanner: ''$1''",
 'virus-unknownscanner' => 'dai aram an antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Magluwas an paragamit',
-'logouttext'                 => "<strong>Nakaluwas ka na.</strong><br />
+'logouttext'                 => "'''Nakaluwas ka na.'''<br />
 Pwede mo pang gamiton an {{SITENAME}} na dai nagpapabisto, o pwede ka giraray lumaog
 bilang pareho o ibang parágamit. Giromdomon tabî na an ibang mga páhina pwedeng mahiling pa na garo nakalaog ka pa, hasta limpyarón mo an abang kan ''browser'' mo.",
 'welcomecreation'            => "== Maogmang Pagdagos, $1! ==
@@ -401,7 +387,6 @@ Nagibo na an ''account'' mo. Giromdomon tabi na ribayán an saimong mga kabôtan
 'remembermypassword'         => 'Giromdomon an paglaog ko sa kompyuter na ini',
 'yourdomainname'             => "An saimong ''domain'':",
 'externaldberror'            => "Igwang nin salang panluwas pantunay kan base nin datos o dai ka pigtotogotan na bâgohon an saimong panluwas na ''account''.",
-'loginproblem'               => '<b>May problema sa paglaog mo.</b><br />Probaran giraray!',
 'login'                      => 'Maglaog',
 'nav-login-createaccount'    => 'Maglaog / maggibo nin account',
 'loginprompt'                => 'Kaipuhan may cookies ka para makalaog sa {{SITENAME}}.',
@@ -472,15 +457,21 @@ $1 na oras.',
 'loginlanguagelabel'         => 'Tataramon: $1',
 
 # Password reset dialog
-'resetpass'               => "Ipwesto giraray an sekretong panlaog kan ''account''",
-'resetpass_announce'      => "Nakalaog ka na may kodang temporaryong ''e''-sinurat. Para matapos an paglaog, kaipuhan mong magpwesto nin bâgong sekretong panlaog digdi:",
-'resetpass_text'          => '<!-- Magdugang nin teksto digdi -->',
-'resetpass_header'        => 'Ibalyó an sekretong panlaog',
-'resetpass_submit'        => 'Ipwesto an sekretong panlaog dangan maglaog',
-'resetpass_success'       => 'Naribayan na an saimong sekretong panlaog! Pigpapadagos ka na...',
-'resetpass_bad_temporary' => 'Dai pwede ining temporariong sekretong panlaog. Pwede ser na binâgo mo na an saimong sekretong panlaog o naghagad ka na nin bâgong temporariong sekretong panlaog.',
-'resetpass_forbidden'     => 'Dai pwedeng ribayan an mga sekretong panlaog sa ining wiki',
-'resetpass_missing'       => 'Mayong datos an pormulário.',
+'resetpass'                 => "Ipwesto giraray an sekretong panlaog kan ''account''",
+'resetpass_announce'        => "Nakalaog ka na may kodang temporaryong ''e''-sinurat. Para matapos an paglaog, kaipuhan mong magpwesto nin bâgong sekretong panlaog digdi:",
+'resetpass_text'            => '<!-- Magdugang nin teksto digdi -->',
+'resetpass_header'          => 'Ibalyó an sekretong panlaog',
+'oldpassword'               => 'Lumang sekretong panlaog:',
+'newpassword'               => 'Bàgong sekretong panlaog:',
+'retypenew'                 => 'Itaták giraray an bàgong panlaog:',
+'resetpass_submit'          => 'Ipwesto an sekretong panlaog dangan maglaog',
+'resetpass_success'         => 'Naribayan na an saimong sekretong panlaog! Pigpapadagos ka na...',
+'resetpass_bad_temporary'   => 'Dai pwede ining temporariong sekretong panlaog. Pwede ser na binâgo mo na an saimong sekretong panlaog o naghagad ka na nin bâgong temporariong sekretong panlaog.',
+'resetpass_forbidden'       => 'Dai pwedeng ribayan an mga sekretong panlaog sa ining wiki',
+'resetpass-submit-loggedin' => 'Ribayan an sekretong panlaog',
+'resetpass-wrong-oldpass'   => 'Saláng temporaryo o presenteng sekretong panlaog. 
+Matriumpo mo nang nailaog an sekretong panlaog o nakua an bàgong temporaryong sekretong panlaog.',
+'resetpass-temp-password'   => 'Temporaryong sekretong panlaog:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tekstong mahìbog',
@@ -505,8 +496,8 @@ $1 na oras.',
 'hr_tip'          => 'Pabalagbag na linya (use sparingly)',
 
 # Edit pages
-'summary'                   => 'Sumada',
-'subject'                   => 'Tema/pamayohan',
+'summary'                   => 'Sumada:',
+'subject'                   => 'Tema/pamayohan:',
 'minoredit'                 => 'Sadit na paghirá ini',
 'watchthis'                 => 'Bantayan an pahinang ini',
 'savearticle'               => 'Itagáma an pahina',
@@ -518,8 +509,8 @@ $1 na oras.',
 'missingsummary'            => "'''Paisi:''' Dai ka nagkaag nin sumád kan paghirâ. Kun pindotón mo giraray an Itagama, maitatagama an hirá mo na mayô kaini.",
 'missingcommenttext'        => 'Paki lâgan nin komento sa ibabâ.',
 'missingcommentheader'      => "'''Paisi:''' Dai ka nagkaag nin tema/pamayohan para sa ining komentaryo. Kun pindoton mo giraray an Itagama, maitatagama an hira mo na mayô ini.",
-'summary-preview'           => 'Patànaw nin sumada',
-'subject-preview'           => 'Patânaw nin tema/pamayohan',
+'summary-preview'           => 'Patànaw nin sumada:',
+'subject-preview'           => 'Patânaw nin tema/pamayohan:',
 'blockedtitle'              => 'Pigbágat an parágamit',
 'blockedtext'               => "<big>'''Pigbagat an pangaran o IP mo.'''</big>
 
@@ -568,24 +559,24 @@ Kun dai tinuyong nakaabot ka digdi, pindoton sana an back sa browser mo.',
 'anontalkpagetext'          => "----''Ini an pahina kan olay kan sarong parágamit na dai bisto na dai pa naggibo nin account o dai naggagamit kaini. Entonces, piggagamit mi an numero nin IP tangarig mabisto siya. Ining IP pwede gamiton kan manlain-lain na mga parágamit. Kun ika sarong paraágamit na dai bisto asin konbensido ka sa pigsasabi ka ining mga komento bakô man dapit saimo,  [[Special:UserLogin|maggibo nin'' account ''o maglaog]] tabì tangarig maibitaran an pagkaribong saimo asin sa ibang mga parágamit na dai bisto.''",
 'noarticletext'             => 'Mayo man na teksto sa páhinang ini, pwede mong [[Special:Search/{{PAGENAME}}|hanápon ining titulo nin páhina]] sa ibang mga páhina o [{{fullurl:{{FULLPAGENAME}}|action=edit}} hirahon ining páhina].',
 'clearyourcache'            => "'''Pagiromdom:''' Pagkatapos kan pagtagama, pwede ser na kaipuhan mong lawigawan an abang kan ''browser'' para mahiling mo an mga pagbabâgo. '''Mozilla / Firefox / Safari:''' doonan an ''shift'' an ''Shift'' sabay an pagpindot sa ''Reload'', o pindoton an ''Ctrl-Shift-R'' (''Cmd-Shift-R'' sa Apple Mac); '''IE:''' doonan (dai halion an muro) an ''Ctrl'' mientras sabay an pagpindot sa  ''Refresh'', o pindoton an ''Ctrl-F5''; '''Konqueror:''': pindoton sana ''Reload'', o pindoton  an ''F5''; '''Opera''' pwede ser na kaipuhan na halîon an gabos na laog kan abang sa ''Tools→Preferences''.",
-'usercssjsyoucanpreview'    => "<strong>Tip:</strong> Gamiton an 'Show preview' para testingon an bâgong CSS/JS bago magtagama.",
+'usercssjsyoucanpreview'    => "'''Tip:''' Gamiton an 'Show preview' para testingon an bâgong CSS/JS bago magtagama.",
 'usercsspreview'            => "'''Giromdomon tabî na pigpapatânaw sana saimo an CSS nin parágamit, dai pa ini nakatagama!'''",
 'userjspreview'             => "'''Giromdomon tabi na pigtetest/pighihiling mo sana an patanaw kan saimong JavaScript nin paragamit, dai pa ini naitagama!'''",
 'userinvalidcssjstitle'     => "'''Patanid:''' Mayong ''skin'' na \"\$1\". Giromdomon tabî na an .css asin .js na mga páhina naggagamit nin titulong nakasurat sa sadit na letras, halimbawa {{ns:user}}:Foo/monobook.css bakong {{ns:user}}:Foo/Monobook.css.",
 'updated'                   => '(Binàgo)',
-'note'                      => '<strong>Paisi:</strong>',
-'previewnote'               => '<strong>Patànaw sana ini; dai pa naitagama an mga pagbabàgo!</strong>',
+'note'                      => "'''Paisi:'''",
+'previewnote'               => "'''Patànaw sana ini; dai pa naitagama an mga pagbabàgo!'''",
 'previewconflict'           => 'Mahihilíng sa patànaw na ini an tekstong nasa itaas na lugar nin paghirá arog sa maipapahiling kun ini an itatagama mo.',
-'session_fail_preview'      => '<strong>Despensa! Dai mi naipadagos an paghirá mo huli sa pagkawara nin datos kan sesyon.
-Probaran tabì giraray. Kun dai man giraray magibo, probaran na magluwas dangan maglaog giraray.</strong>',
-'session_fail_preview_html' => "<strong>Despensa! Dai mi naipadagos an paghirá mo nin huli sa kawàran kan datos kan sesyon.</strong>
+'session_fail_preview'      => "'''Despensa! Dai mi naipadagos an paghirá mo huli sa pagkawara nin datos kan sesyon.
+Probaran tabì giraray. Kun dai man giraray magibo, probaran na magluwas dangan maglaog giraray.'''",
+'session_fail_preview_html' => "'''Despensa! Dai mi naipadagos an paghirá mo nin huli sa kawàran kan datos kan sesyon.'''
 
 ''Huli ta ining wiki may HTML na nakaandar, pigtago an patànaw bilang paglikay kontra sa mga atake sa JavaScript.''
 
-<strong>Kun talagang boot mong hirahón ini, probaran giraray. Kun dai pa giraray magibo, magluwas dangan maglaog giraray. </strong>",
-'token_suffix_mismatch'     => '<strong>Dai pigtogotan an paghirá mo ta sinabrit kan client mo an punctuation characters.
+'''Kun talagang boot mong hirahón ini, probaran giraray. Kun dai pa giraray magibo, magluwas dangan maglaog giraray. '''",
+'token_suffix_mismatch'     => "'''Dai pigtogotan an paghirá mo ta sinabrit kan client mo an punctuation characters.
 Dai pigtogotan ining paghirá tangarig maibitaran na maraot an teksto kan pahina.
-Nanyayari nanggad ini kun naggagamit ka nin bakong maraháy asin dai bistong web-based proxy service.</strong>',
+Nanyayari nanggad ini kun naggagamit ka nin bakong maraháy asin dai bistong web-based proxy service.'''",
 'editing'                   => 'Pigliligwat an $1',
 'editingsection'            => 'Pighihira an $1 (seksyon)',
 'editingcomment'            => 'Pighihira an $1 (komento)',
@@ -597,20 +588,20 @@ Kaipuhan mong isalak an mga pagbabàgo mo sa presenteng teksto.
 An teksto na nasa parteng itaas '''sana''' an maitatagama sa pagpindot mo kan \"Itagama an pahina\".",
 'yourtext'                  => 'Saimong teksto',
 'storedversion'             => 'Itinagamang bersyon',
-'nonunicodebrowser'         => '<strong>PATANID: An browser mo bakong unicode complaint. Igwang temporariong sistema na nakaandar para makahirá ka kan mga pahina: mahihiling an mga karakter na non-ASCII sa kahon nin paghirá bilang mga kodang hexadecimal.</strong>',
-'editingold'                => '<strong>PATANID: Pighihirá mo an pasó nang pagpakaraháy kaining pahina.
-Kun itatagama mo ini, mawawarà an mga pagbabàgong nagibo poon kan pagpakaraháy kaini.</strong>',
+'nonunicodebrowser'         => "'''PATANID: An browser mo bakong unicode complaint. Igwang temporariong sistema na nakaandar para makahirá ka kan mga pahina: mahihiling an mga karakter na non-ASCII sa kahon nin paghirá bilang mga kodang hexadecimal.'''",
+'editingold'                => "'''PATANID: Pighihirá mo an pasó nang pagpakaraháy kaining pahina.
+Kun itatagama mo ini, mawawarà an mga pagbabàgong nagibo poon kan pagpakaraháy kaini.'''",
 'yourdiff'                  => 'Mga kaibahán',
-'copyrightwarning'          => 'Giromdomon tabì na an gabos na kontribusyon sa {{SITENAME}} pigkokonsiderar na $2 (hilingón an $1 para sa mga detalye). Kun habò mong mahirá an saimomg sinurat na mayong pakimàno, dai tabì iyan isumiter digdi.<br />
+'copyrightwarning'          => "Giromdomon tabì na an gabos na kontribusyon sa {{SITENAME}} pigkokonsiderar na $2 (hilingón an $1 para sa mga detalye). Kun habò mong mahirá an saimomg sinurat na mayong pakimàno, dai tabì iyan isumiter digdi.<br />
 Pigpropromesa mo man samuyà na ika an kagsurat kaini, o kinopya mo ini sa dominiong panpubliko o sarong parehong libreng rekurso (hilingón an $1 para sa mga detalye).
-<strong>DAI TABÌ MAGSUMITIR NIN MGA GIBONG IPINAPANGALAD NA KOPYAHON NIN MAYONG PERMISO!</strong>',
-'copyrightwarning2'         => 'Giromdomon tabì na an gabos na kontribusyon sa Betawiki pwedeng hirahón, bàgohon o halion kan ibang mga parágamit. Kun habô mong mahirá an saimomg sinurat na mayong pakimàno, pues, dai tabì isumitir iyan digdi.<br />
-Pigpapangakò mo man samuyà na ika an nagsurat kaini, o pigkopya mo ini sa dominiong panpubliko o sarong parehong libreng rekurso (hilingon an $1 para sa mga detalye). <strong>DAI TABÌ MAGSUMITIR NIN MGA GIBONG IPINAPANGALAD NA KOPYAHON NIN MAYONG PERMISO!</strong>',
-'longpagewarning'           => '<strong>PATANID: $1 na kilobytes na kalabà an pahinang ini; an ibang mga browser pwedeng magkaproblema sa paghirá nin mga pahinang haros o sobra sa 32 kb.
-Paki bangâ ini sa saradit na seksyon.</strong>',
-'longpageerror'             => '<strong>SALÀ: $1 na kilobytes na kalabà an pahinang isinumitir mo, na mas halabà sa hanggan nin $2 na kilobytes. Dai pwede ining itagama.</strong>',
-'readonlywarning'           => '<strong>PATANID: Nakakandado an base nin datos para sa pagmantinir, pues, dai mo mûna pwede na itagama an mga paghirá mo. Pwede mo pa man na arogon dangan ipaskil ang teksto sa sarong dokumento arog kan MS Word asbp. asin itagama ini para sa atyan.</strong>',
-'protectedpagewarning'      => "<strong>PATANID:  Nakakandado ining pahina tangarig an mga parágamit na may priblehiyo nin ''sysop'' sana an pwedeng maghira kaini.</strong>",
+'''DAI TABÌ MAGSUMITIR NIN MGA GIBONG IPINAPANGALAD NA KOPYAHON NIN MAYONG PERMISO!'''",
+'copyrightwarning2'         => "Giromdomon tabì na an gabos na kontribusyon sa Betawiki pwedeng hirahón, bàgohon o halion kan ibang mga parágamit. Kun habô mong mahirá an saimomg sinurat na mayong pakimàno, pues, dai tabì isumitir iyan digdi.<br />
+Pigpapangakò mo man samuyà na ika an nagsurat kaini, o pigkopya mo ini sa dominiong panpubliko o sarong parehong libreng rekurso (hilingon an $1 para sa mga detalye). '''DAI TABÌ MAGSUMITIR NIN MGA GIBONG IPINAPANGALAD NA KOPYAHON NIN MAYONG PERMISO!'''",
+'longpagewarning'           => "'''PATANID: $1 na kilobytes na kalabà an pahinang ini; an ibang mga browser pwedeng magkaproblema sa paghirá nin mga pahinang haros o sobra sa 32 kb.
+Paki bangâ ini sa saradit na seksyon.'''",
+'longpageerror'             => "'''SALÀ: $1 na kilobytes na kalabà an pahinang isinumitir mo, na mas halabà sa hanggan nin $2 na kilobytes. Dai pwede ining itagama.'''",
+'readonlywarning'           => "'''PATANID: Nakakandado an base nin datos para sa pagmantinir, pues, dai mo mûna pwede na itagama an mga paghirá mo. Pwede mo pa man na arogon dangan ipaskil ang teksto sa sarong dokumento arog kan MS Word asbp. asin itagama ini para sa atyan.'''",
+'protectedpagewarning'      => "'''PATANID:  Nakakandado ining pahina tangarig an mga parágamit na may priblehiyo nin ''sysop'' sana an pwedeng maghira kaini.'''",
 'semiprotectedpagewarning'  => "'''Paisi:''' An pahinang ini isinara tangarig mga rehistradong parágamit sana an makahira kaini.",
 'cascadeprotectedwarning'   => "'''Patanid:''' Nakakandado an pahinang ini tangarig an mga parágamit na igwang pribilehyo nin sysop sana an pwedeng maghirá kaini, huli ta kabali ini sa mga kataratang protektado na {{PLURAL:$1|pahina|mga pahina}}:",
 'templatesused'             => 'Mga templato na piggamit sa pahinang ini:',
@@ -629,6 +620,9 @@ Pwede kang bumalik dangan maghirá nin presenteng pahina, o [[Special:UserLogin|
 
 Dapat mong isipon kun kaipuhan na ipadagos an paghirá kaining pahina.
 An paghalì kan historial para sa pahinang ini yaon digdi para sa saimong kombenyensya:",
+'edit-conflict'             => 'Igwang iregularidad sa pagligwat.',
+'edit-already-exists'       => 'Dai maggibo an bàgong pahina.
+Igwa na kaini.',
 
 # "Undo" feature
 'undo-success' => 'Pwedeng bawion an paghirá. Sosogon tabì an pagkakaiba sa babâ tangarig maberipikár kun ini an boot mong gibohon, dangan itagama an mga pagbabàgo sa babâ tangarig tapuson an pagbawì sa paghirá.',
@@ -642,29 +636,28 @@ An paghalì kan historial para sa pahinang ini yaon digdi para sa saimong komben
 ''$2'' an rason na pigtao ni $3",
 
 # History pages
-'viewpagelogs'        => 'Hilingón an mga usip para sa pahinang ini',
-'nohistory'           => 'Mayong paghirá nin uusipón sa pahinang ini.',
-'revnotfound'         => 'Dai nahanap an pagpakaraháy',
-'revnotfoundtext'     => 'Dai nahanap an lumang pagpakaraháy kan pahina na hinagad mo. Sosogon tabì an URL na ginamit mo sa pagabót sa pahinang ini.',
-'currentrev'          => 'Sa ngonyan na pagpakarháy',
-'revisionasof'        => 'Pagpakarháy sa $1',
-'revision-info'       => 'An pagpakarháy sa $1 ni $2',
-'previousrevision'    => '�Mas lumang pagpakarhay',
-'nextrevision'        => 'Mas bàgong pagpakarháy→',
-'currentrevisionlink' => 'Sa ngonyan na pagpakarháy',
-'cur'                 => 'ngonyan',
-'next'                => 'sunod',
-'last'                => 'huri',
-'page_first'          => 'enot',
-'page_last'           => 'huri',
-'histlegend'          => 'Kaib na pinili: markahán an mga kahon kan mga bersyon tangarig makomparar asin pindoton an enter o butones babâ.<br />
+'viewpagelogs'           => 'Hilingón an mga usip para sa pahinang ini',
+'nohistory'              => 'Mayong paghirá nin uusipón sa pahinang ini.',
+'currentrev'             => 'Sa ngonyan na pagpakarháy',
+'revisionasof'           => 'Pagpakarháy sa $1',
+'revision-info'          => 'An pagpakarháy sa $1 ni $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Mas lumang pagpakarhay',
+'nextrevision'           => 'Mas bàgong pagpakarháy→',
+'currentrevisionlink'    => 'Sa ngonyan na pagpakarháy',
+'cur'                    => 'ngonyan',
+'next'                   => 'sunod',
+'last'                   => 'huri',
+'page_first'             => 'enot',
+'page_last'              => 'huri',
+'histlegend'             => 'Kaib na pinili: markahán an mga kahon kan mga bersyon tangarig makomparar asin pindoton an enter o butones babâ.<br />
 Legend: (ngonyan) = kaibhán sa ngonyan na bersyon,
 (huri) = kaibhán sa huring bersyon, S = saradít na paghirá.',
-'deletedrev'          => '[pigparà]',
-'histfirst'           => 'Pinakaenot',
-'histlast'            => 'Pinakahúri',
-'historysize'         => '($1 bytes)',
-'historyempty'        => '(mayong laog)',
+'history-fieldset-title' => 'Rinsayon an uusipon',
+'deletedrev'             => '[pigparà]',
+'histfirst'              => 'Pinakaenot',
+'histlast'               => 'Pinakahúri',
+'historysize'            => '($1 bytes)',
+'historyempty'           => '(mayong laog)',
 
 # Revision feed
 'history-feed-title'          => 'Uusipón kan pagpakaraháy',
@@ -719,6 +712,15 @@ An ibang mga administrador sa ining wiki pwede pang maghiling kan mga nakatagong
 'compareselectedversions' => 'Ikomparar an mga piniling bersyon',
 'editundo'                => 'ibalik',
 'diff-multi'              => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} dai ipinahihiling.)',
+'diff-width'              => 'lakbáng',
+'diff-height'             => 'langkáw',
+'diff-blockquote'         => "saróng '''quote'''",
+'diff-h1'                 => "saróng '''pamayohan (tangga 1)'''",
+'diff-h2'                 => "saróng '''pamayohan (tangga 2)'''",
+'diff-h3'                 => "saróng '''pamayohan (tangga 3)'''",
+'diff-h4'                 => "saróng '''pamayohan (tangga 4)'''",
+'diff-h5'                 => "saróng '''pamayohan (tangga 5)'''",
+'diff-pre'                => "saróng '''naformat nang pagbagat'''",
 
 # Search results
 'searchresults'         => 'Hanapon an mga resulta',
@@ -735,6 +737,7 @@ An ibang mga administrador sa ining wiki pwede pang maghiling kan mga nakatagong
 'prevn'                 => 'dati $1',
 'nextn'                 => 'sunod $1',
 'viewprevnext'          => 'Hilingón ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:Mga laog',
 'search-interwiki-more' => '(dakol pa)',
 'searchall'             => 'gabos',
 'showingresults'        => "Pigpapahiling sa babâ sagkod sa {{PLURAL:$1|'''1''' resulta|'''$1''' mga resulta}} poon sa #'''$2'''.",
@@ -758,6 +761,7 @@ An ibang mga administrador sa ining wiki pwede pang maghiling kan mga nakatagong
 'qbsettings-floatingright' => 'Naglálatáw sa tûo',
 'changepassword'           => 'Ribayan an sekretong panlaog',
 'skin'                     => "''Skin''",
+'skin-preview'             => 'Tânawon',
 'math'                     => 'Mat',
 'dateformat'               => "''Format'' kan petsa",
 'datedefault'              => 'Mayong kabôtan',
@@ -779,9 +783,6 @@ An ibang mga administrador sa ining wiki pwede pang maghiling kan mga nakatagong
 'prefs-misc'               => 'Lain',
 'saveprefs'                => 'Itagama',
 'resetprefs'               => 'Ipwesto giraray',
-'oldpassword'              => 'Lumang sekretong panlaog:',
-'newpassword'              => 'Bàgong sekretong panlaog:',
-'retypenew'                => 'Itaták giraray an bàgong panlaog:',
 'textboxsize'              => 'Pighihira',
 'rows'                     => 'Mga hilera:',
 'columns'                  => 'Mga taytay:',
@@ -808,7 +809,7 @@ An ibang mga administrador sa ining wiki pwede pang maghiling kan mga nakatagong
 'userrights-lookup-user'   => 'Magmaného kan mga grupo nin parágamit',
 'userrights-user-editname' => 'Ilaog an pangaran kan parágamit:',
 'editusergroup'            => 'Hirahón an mga Grupo kan Parágamit',
-'editinguser'              => "Pighihira an parágamit na '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "Pighihira an parágamit na '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'Hirahón an mga grupo kan parágamit',
 'saveusergroups'           => 'Itagama an mga Grupo nin Páragamit',
 'userrights-groupsmember'  => 'Myembro kan:',
@@ -881,11 +882,11 @@ An ibang mga administrador sa ining wiki pwede pang maghiling kan mga nakatagong
 para makakarga nin mga ''file''.",
 'upload_directory_read_only'  => 'An directoriong pagkarga na ($1) dai puedeng suratan kan serbidor nin web.',
 'uploaderror'                 => 'Salâ an pagkarga',
-'uploadtext'                  => "Gamiton tabî an pormulario sa babâ para magkarga nin mga ''file'', para maghiling o maghanap kan mga ladawan na dating kinarga magduman tabi sa [[Special:ImageList|lista nin mga pigkargang ''file'']], an mga kinarga asin mga pinarâ nakalista man sa [[Special:Log/upload|historial nin pagkarga]].
+'uploadtext'                  => "Gamiton tabî an pormulario sa babâ para magkarga nin mga ''file'', para maghiling o maghanap kan mga ladawan na dating kinarga magduman tabi sa [[Special:FileList|lista nin mga pigkargang ''file'']], an mga kinarga asin mga pinarâ nakalista man sa [[Special:Log/upload|historial nin pagkarga]].
 
 Kun boot mong ikaag an ladawan sa páhina, gamiton tabî an takod arog kan
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' o
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' o
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' para sa direktong pagtakod sa ''file''.",
 'uploadlog'                   => 'historial nin pagkarga',
 'uploadlogpage'               => 'Ikarga an usip',
@@ -906,18 +907,18 @@ Kun boot mong ikaag an ladawan sa páhina, gamiton tabî an takod arog kan
 'large-file'                  => "Pigrerekomendár na dapat an mga ''file'' bakong mas dakula sa $1; $2 an sokol kaining ''file''.",
 'largefileserver'             => "Mas dakula an ''file'' sa pigtotogotan na sokol kan ''server''.",
 'emptyfile'                   => "Garo mayong laog an ''file'' na kinarga mo. Pwede ser na salâ ining tipo nin ''filename''. Isegurado tabî kun talagang boot mong ikarga ining ''file''.",
-'fileexists'                  => "Igwa nang ''file'' na may parehong pangaran sa ini, sosogon tabî an <strong><tt>$1</tt></strong> kun dai ka seguradong ribayan ini.",
+'fileexists'                  => "Igwa nang ''file'' na may parehong pangaran sa ini, sosogon tabî an '''<tt>$1</tt>''' kun dai ka seguradong ribayan ini.",
 'fileexists-extension'        => "May ''file'' na may parehong pangaran:<br />
-Pangaran kan pigkakargang ''file'': <strong><tt>$1</tt></strong><br />
-Pangaran kan yaon nang ''file'': <strong><tt>$2</tt></strong><br />
+Pangaran kan pigkakargang ''file'': '''<tt>$1</tt>'''<br />
+Pangaran kan yaon nang ''file'': '''<tt>$2</tt>'''<br />
 Magpili tabî nin ibang pangaran.",
 'fileexists-thumb'            => "<center>'''Presenteng ladawan'''</center>",
-'fileexists-thumbnail-yes'    => "An ''file'' garo ladawan kan pinasadit <i>(thumbnail)</i>. Sosogon tabî an ''file'' <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "An ''file'' garo ladawan kan pinasadit ''(thumbnail)''. Sosogon tabî an ''file'' '''<tt>$1</tt>'''.<br />
 Kun an sinosog na ''file'' iyo an parehong ladawan na nasa dating sokol, dai na kaipuhan magkarga nin iba pang retratito.",
-'file-thumbnail-no'           => "An ''filename'' nagpopoon sa <strong><tt>$1</tt></strong>. Garo ladawan na pinasadit ini <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "An ''filename'' nagpopoon sa '''<tt>$1</tt>'''. Garo ladawan na pinasadit ini ''(thumbnail)''.
 Kun igwa ka nin ladawan na may resolusyón na maximo ikarga tabî ini, kun dai, bâgohon tabî an pangaran nin ''file''.",
-'fileexists-forbidden'        => "Igwa nang ''file'' na may parehong pangaran; bumalik tabi asin ikarga an ''file'' sa bâgong pangaran [[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => "Igwa nang ''file'' na may parehong pangaran sa repositoryo nin mga bakas na ''file''; bumalik tabî asin ikarga an ''file'' sa bâgong pangaran. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Igwa nang ''file'' na may parehong pangaran; bumalik tabi asin ikarga an ''file'' sa bâgong pangaran [[File:$1|thumb|center|$1]]",
+'fileexists-shared-forbidden' => "Igwa nang ''file'' na may parehong pangaran sa repositoryo nin mga bakas na ''file''; bumalik tabî asin ikarga an ''file'' sa bâgong pangaran. [[File:$1|thumb|center|$1]]",
 'successfulupload'            => 'Nakarga na',
 'uploadwarning'               => 'Patanid sa pagkarga',
 'savefile'                    => "Itagama an ''file''",
@@ -936,7 +937,7 @@ Kun igwa ka nin ladawan na may resolusyón na maximo ikarga tabî ini, kun dai,
 
 Isipon tabi kun maninigo an pagkarga giraray kaini.
 An historial nin pagparâ kan ''file'' nakakaag digdi para sa konbenyensya:",
-'filename-bad-prefix'         => "An pangaran nin ''file'' na pigkakarga mo nagpopoon sa <strong>\"\$1\"</strong>, sarong pangaran na dai makapaladawan na normalmente enseguidang pigtatao kan mga kamerang digital. Magpili tabî nin pangaran nin ''file'' na mas makapaladawan.",
+'filename-bad-prefix'         => "An pangaran nin ''file'' na pigkakarga mo nagpopoon sa '''\"\$1\"''', sarong pangaran na dai makapaladawan na normalmente enseguidang pigtatao kan mga kamerang digital. Magpili tabî nin pangaran nin ''file'' na mas makapaladawan.",
 
 'upload-proto-error'      => 'Salang protocolo',
 'upload-proto-error-text' => 'An pagkargang panharayo kaipuhan nin mga URLs na nagpopoon sa  <code>http://</code> o <code>ftp://</code>.',
@@ -957,17 +958,17 @@ An historial nin pagparâ kan ''file'' nakakaag digdi para sa konbenyensya:",
 'upload_source_url'  => ' (sarong tama, na bukas sa publikong URL)',
 'upload_source_file' => " (sarong ''file'' sa kompyuter mo)",
 
-# Special:ImageList
-'imagelist_search_for'  => 'Hanápon an pangaran kan retrato:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Hanápon an pangaran kan retrato:',
 'imgfile'               => 'dokumento',
-'imagelist'             => 'Lista kan dokumento',
-'imagelist_date'        => 'Petsa',
-'imagelist_name'        => 'Pangaran',
-'imagelist_user'        => 'Parágamit',
-'imagelist_size'        => 'Sukol',
-'imagelist_description' => 'Deskripsión',
-
-# Image description page
+'listfiles'             => 'Lista kan dokumento',
+'listfiles_date'        => 'Petsa',
+'listfiles_name'        => 'Pangaran',
+'listfiles_user'        => 'Parágamit',
+'listfiles_size'        => 'Sukol',
+'listfiles_description' => 'Deskripsión',
+
+# File description page
 'filehist'                  => 'Uusipón nin file',
 'filehist-help'             => 'Magpindot kan petsa/oras para mahiling an hitsura kan file sa piniling oras.',
 'filehist-deleteall'        => 'parâon gabos',
@@ -1010,7 +1011,6 @@ An historial nin pagparâ kan ''file'' nakakaag digdi para sa konbenyensya:",
 'filedelete-success-old' => '<span class="plainlinks">An bersyón kan \'\'\'[[Media:$1|$1]]\'\'\' na ngonyan na $3, pigparâ na an $2.</span>',
 'filedelete-nofile'      => "Mayo man an '''$1''' sa ining sitio.",
 'filedelete-nofile-old'  => "Mayong bersyón na nakaarchibo kan '''$1''' na igwang kan mga piniling ''character''.",
-'filedelete-iscurrent'   => "Pigpoprobaran mong parâon an pinahuring bersyón kaining ''file''. Ibalik tabî muna sa bersyón na mas lumâ.",
 
 # MIME search
 'mimesearch'         => 'Paghanap kan MIME',
@@ -1038,23 +1038,9 @@ An historial nin pagparâ kan ''file'' nakakaag digdi para sa konbenyensya:",
 'randomredirect-nopages' => 'Mayong paglikay (redirects) didgi sa ngaran-espacio.',
 
 # Statistics
-'statistics'             => 'Mga Estadistiko',
-'sitestats'              => 'Mga estadistiko kan {{SITENAME}}',
-'userstats'              => 'Mga estadistiko nin parágamit',
-'sitestatstext'          => "Igwang {{PLURAL:\$1|nin '''1''' páhina|nin '''\$1''' mga páhina}} sa enterong base nin datos.
-Kabali digdi an mga páhinang \"olay\", mga páhinang manonongod sa {{SITENAME}}, mga \"tamboan\"
-na páhina, mga redirekta, asin mga iba pang dai pigbibilang na mga páhinang may laog.
-Kun dai bibilangon an mga ini, igwang {{PLURAL:\$2|nin '''1''' páhina|nin '''\$2''' na mga páhina}} gayod na talagang {{PLURAL:\$2|páhinang|mga páhinang}} may laog .
-
-'''\$8''' {{PLURAL:\$8|''file''|mga ''file''}} an kinarga.
-
-'''\$3''' {{PLURAL:\$3|na paghiling|mga paghiling}} an mga total na paghiling, asin '''\$4''' {{PLURAL:\$4|na hirá kan páhina|mga hirá kan páhina}}
-despues sa pagbukas kan {{SITENAME}}.
-Maabot sa '''\$5''' na hira kada páhina sa medio, asin '''\$6''' na paghiling kada hirá.
-
-'''\$7''' an labâ kan [http://www.mediawiki.org/wiki/Manual:Job_queue job queue].",
-'userstatstext'          => "{{PLURAL:$1|is '''1''' registered [[Special:mga paragamit|paragamit]]| '''$1''' an nakarehistrong [[Special:ListUsers|users]]}}, '''$2''' (or '''$4%''') kaini {{PLURAL:$2|has|may}} $5 na derechos.",
-'statistics-mostpopular' => 'mga pinaka pighiling na pahina',
+'statistics'              => 'Mga Estadistiko',
+'statistics-header-users' => 'Mga estadistiko nin parágamit',
+'statistics-mostpopular'  => 'mga pinaka pighiling na pahina',
 
 'disambiguations'      => 'Mga pahinang klaripikasyon',
 'disambiguationspage'  => 'Template:clarip',
@@ -1131,8 +1117,6 @@ An páhina pigkokonsiderar na páhina nin klaripikasyon kun naggagamit ini nin t
 'speciallogtitlelabel' => 'Titulo:',
 'log'                  => 'Mga usip',
 'all-logs-page'        => 'Gabos na usip',
-'log-search-legend'    => 'Hanapon an  mga historial',
-'log-search-submit'    => 'Dumanán',
 'alllogstext'          => 'Sinalak na hihilngon kan gabos na historial na igwa sa {{SITENAME}}. Kun boot mong pasaditon an seleksyon magpili tabî nin klase kan historial, ngaran nin parágamit, o páhinang naapektaran.',
 'logempty'             => 'Mayong angay na bagay sa historial.',
 'log-title-wildcard'   => 'Hanapon an mga titulong napopoon sa tekstong ini',
@@ -1157,11 +1141,21 @@ An páhina pigkokonsiderar na páhina nin klaripikasyon kun naggagamit ini nin t
 'categories'         => 'Mga Kategorya',
 'categoriespagetext' => 'Igwa nin laog ang mga minasunod na kategorya.',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Parâon an mga kontribusyon kan parágamit',
+
+# Special:LinkSearch
+'linksearch-ok'   => 'Hanápon',
+'linksearch-line' => '$1 an nakatakod sa $2',
+
 # Special:ListUsers
 'listusersfrom'      => 'Ipahiling an mga paragamit poon sa:',
 'listusers-submit'   => 'Ipahiling',
 'listusers-noresult' => 'Mayong nakuang parágamit.',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Bâgong parágamit',
+
 # Special:ListGroupRights
 'listgrouprights-group'  => 'Grupo',
 'listgrouprights-rights' => 'Derechos',
@@ -1221,12 +1215,6 @@ Kun boot mong halîon an páhina sa pigbabantayan mo sa maabot na panahon, pindo
 'iteminvalidname'      => "May problema sa bagay na '$1', salâ an pangaran...",
 'wlnote'               => "Mahihiling sa babâ an {{PLURAL:$1|huring pagriribay|mga huring'''$1''' pagriribay}} sa ultimong {{PLURAL:$2|oras|'''$2''' mga oras}}.",
 'wlshowlast'           => 'Ipahilíng an ultimong $1 na oras $2 na aldaw $3',
-'watchlist-show-bots'  => 'Ipahiling an mga paghirá kan mga bot',
-'watchlist-hide-bots'  => 'Tagoon mga pagliwat kan mga bot',
-'watchlist-show-own'   => 'Ipahiling an mga hira ko',
-'watchlist-hide-own'   => 'Tagoon an mga pagliwat ko',
-'watchlist-show-minor' => 'Ipahiling an mga menor na hirá',
-'watchlist-hide-minor' => 'Tagoon an saradít na pagliwat',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Pigbabantayan...',
@@ -1266,62 +1254,67 @@ Para bâgohon an pagpwesto kan saimong mga pigbabantayan, bisitahon an
 Komentaryo asin iba pang tabang:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Paraon an pahina',
-'confirm'                     => 'Kompermaron',
-'excontent'                   => "Ini an dating laog: '$1'",
-'excontentauthor'             => "ini an dating laog: '$1' (asin an unikong kontribuidor si '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Ini an dating laog bagô blinankohán: '$1'",
-'exblank'                     => 'mayong laog an páhina',
-'delete-legend'               => 'Paraon',
-'historywarning'              => 'Patanid: An pahinang paparaon mo igwa nin uusipón:',
-'confirmdeletetext'           => 'Paparaon mo sa base nin datos ining pahina kasabay an gabos na mga uusipón kaini.
+# Delete
+'deletepage'            => 'Paraon an pahina',
+'confirm'               => 'Kompermaron',
+'excontent'             => "Ini an dating laog: '$1'",
+'excontentauthor'       => "ini an dating laog: '$1' (asin an unikong kontribuidor si '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'         => "Ini an dating laog bagô blinankohán: '$1'",
+'exblank'               => 'mayong laog an páhina',
+'delete-legend'         => 'Paraon',
+'historywarning'        => 'Patanid: An pahinang paparaon mo igwa nin uusipón:',
+'confirmdeletetext'     => 'Paparaon mo sa base nin datos ining pahina kasabay an gabos na mga uusipón kaini.
 Konpirmaron tabì na talagang boot mong gibohon ini, nasasabotan mo an mga resulta, asin an piggigibo mo ini konporme sa
 [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Nagibo na',
-'deletedtext'                 => 'Pigparà na an "<nowiki>$1</nowiki>" .
+'actioncomplete'        => 'Nagibo na',
+'deletedtext'           => 'Pigparà na an "<nowiki>$1</nowiki>" .
 Hilingón tabì an $2 para mahiling an lista nin mga kaaagi pa sanang pagparà.',
-'deletedarticle'              => 'pigparà an "[[$1]]"',
-'dellogpage'                  => 'Usip nin pagparà',
-'dellogpagetext'              => 'Mahihiling sa babâ an lista kan mga pinakahuring pagparâ.',
-'deletionlog'                 => 'Historial nin pagparâ',
-'reverted'                    => 'Ibinalik sa mas naenot na pagpakarhay',
-'deletecomment'               => 'Rason sa pagparà',
-'deleteotherreason'           => 'Iba/dugang na rason:',
-'deletereasonotherlist'       => 'Ibang rason',
-'rollback'                    => 'Mga paghihira na pabalík',
-'rollback_short'              => 'pabalík',
-'rollbacklink'                => 'pabalikón',
-'rollbackfailed'              => 'Prakaso an pagbalík',
-'cantrollback'                => 'Dai pwedeng bawîon an hirá; an huring kontribuidor iyo an unikong parásurat kan páhina.',
-'alreadyrolled'               => 'Dai pwedeng ibalik an huring hirá kan [[:$1]]
+'deletedarticle'        => 'pigparà an "[[$1]]"',
+'dellogpage'            => 'Usip nin pagparà',
+'dellogpagetext'        => 'Mahihiling sa babâ an lista kan mga pinakahuring pagparâ.',
+'deletionlog'           => 'Historial nin pagparâ',
+'reverted'              => 'Ibinalik sa mas naenot na pagpakarhay',
+'deletecomment'         => 'Rason sa pagparà',
+'deleteotherreason'     => 'Iba/dugang na rason:',
+'deletereasonotherlist' => 'Ibang rason',
+
+# Rollback
+'rollback'         => 'Mga paghihira na pabalík',
+'rollback_short'   => 'pabalík',
+'rollbacklink'     => 'pabalikón',
+'rollbackfailed'   => 'Prakaso an pagbalík',
+'cantrollback'     => 'Dai pwedeng bawîon an hirá; an huring kontribuidor iyo an unikong parásurat kan páhina.',
+'alreadyrolled'    => 'Dai pwedeng ibalik an huring hirá kan [[:$1]]
 ni [[User:$2|$2]] ([[User talk:$2|Olay]]); may ibang parágamit na naghirá na o nagbalik na kaini.
 
 Huring hirá ni [[User:$3|$3]] ([[User talk:$3|Olay]]).',
-'editcomment'                 => 'Ini an nakakaag na komentaryo sa paghirá: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Binawî na mga paghirá kan [[Special:Contributions/$2|$2]] ([[User talk:$2|Magtaram]]); pigbalik sa dating bersyón ni [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Binawî na mga paghirá ni $1; pigbalik sa dating bersyón ni $2.',
-'sessionfailure'              => "Garo may problema sa paglaog mo;
+'editcomment'      => "Ini an nakakaag na komentaryo sa paghirá: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Binawî na mga paghirá kan [[Special:Contributions/$2|$2]] ([[User talk:$2|Magtaram]]); pigbalik sa dating bersyón ni [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Binawî na mga paghirá ni $1; pigbalik sa dating bersyón ni $2.',
+'sessionfailure'   => "Garo may problema sa paglaog mo;
 kinanselár ining aksyón bilang sarong paglikay kontra sa ''session hijacking''.
 Pindotón tabî an \"back\" asin ikarga giraray an páhinang ginikanan mo, dangan probarán giraray.",
+
+# Protect
 'protectlogpage'              => 'Usip nin proteksyon',
 'protectlogtext'              => 'May lista sa baba nin mga kandado asin panbawi kan kandado kan mga páhina. Hilingon an [[Special:ProtectedPages|lista kan mga pigproprotektarán na mga páhina]] para mahiling an lista kan mga proteksión nin mga páhina sa ngunyan na nakabuká.',
 'protectedarticle'            => 'protektado "[[$1]]"',
 'modifiedarticleprotection'   => 'binago an nibel nin proteksión para sa "[[$1]]"',
 'unprotectedarticle'          => 'Warang proteksión an "[[$1]]"',
 'protect-title'               => 'Pigpupuesta an nibel nin proteksión sa "$1"',
+'prot_1movedto2'              => '[[$1]] piglipat sa [[$2]]',
 'protect-legend'              => 'Kompermaron an proteksyon',
 'protectcomment'              => 'Komento:',
 'protectexpiry'               => 'Mápasó:',
 'protect_expiry_invalid'      => 'Dai pwede ining pahanon nin pagpasó.',
 'protect_expiry_old'          => 'Nakalihis na an panahon nin pagpasó.',
 'protect-unchain'             => 'Bawion an kandado sa mga permiso sa pagbalyó',
-'protect-text'                => 'Pwede mong hilingón asin bàgohon an tangga nin proteksyon digdi para sa pahina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Dai mo pwedeng bâgohon an mga tangga kan proteksyon mientras na ika nababágat. Ini an mga presenteng pwesto kan páhina <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Dai puedeng ibalyo an mga nibel kan proteksión ta may actibong kandado sa base nin datos.
-Ini an mga puesta sa ngunyan kaining páhina <strong>$1</strong>:',
-'protect-locked-access'       => 'Mayong permiso an account mo na magbàgo kan tangga nin proteksyon.
-Uya an ngonyan na mga pwesto kan pahinang <strong>$1</strong>:',
+'protect-text'                => "Pwede mong hilingón asin bàgohon an tangga nin proteksyon digdi para sa pahina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Dai mo pwedeng bâgohon an mga tangga kan proteksyon mientras na ika nababágat. Ini an mga presenteng pwesto kan páhina '''$1''':",
+'protect-locked-dblock'       => "Dai puedeng ibalyo an mga nibel kan proteksión ta may actibong kandado sa base nin datos.
+Ini an mga puesta sa ngunyan kaining páhina '''$1''':",
+'protect-locked-access'       => "Mayong permiso an account mo na magbàgo kan tangga nin proteksyon.
+Uya an ngonyan na mga pwesto kan pahinang '''$1''':",
 'protect-cascadeon'           => 'Pigproprotektaran ining pahina sa ngonyan ta sabay ini sa mga nasunod na {{PLURAL:$1|pahina, na may|mga pahina, na may}} proteksyong katarata na nakaandar. Pwede mong bàgohon an tangga nin proteksyon kaining pahina, pero mayò ning epekto sa proteksyong katarata.',
 'protect-default'             => '(normal)',
 'protect-fallback'            => 'Mangipo kan "$1" na permiso',
@@ -1331,6 +1324,7 @@ Uya an ngonyan na mga pwesto kan pahinang <strong>$1</strong>:',
 'protect-expiring'            => 'mápasó sa $1 (UTC)',
 'protect-cascade'             => 'Protektarán an mga pahinang nakaiba sa pahinang ini (proteksyon katarata)',
 'protect-cantedit'            => 'Dai mo mariribayan an mga tanggá kan proteksyon kaining pahina huli ta mayò ka nin permiso na ligwatón ini.',
+'protect-expiry-options'      => '2ng oras:2 hours,1ng aldaw:1 day,3ng aldaw:3 days,1ng semana:1 week,2ng semana:2 weeks,1ng bulan:1 month,3ng bulan:3 months,6 na bulan:6 months,1ng taon:1 year,daing kasagkoran:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permiso:',
 'restriction-level'           => 'Tanggá nin restriksyon:',
 'minimum-size'                => 'Pinaka sadit na sukol',
@@ -1414,7 +1408,6 @@ $1",
 'whatlinkshere'       => 'An nakatakod digdi',
 'whatlinkshere-title' => 'Mga pahinang nakatakod sa $1',
 'whatlinkshere-page'  => 'Pahina:',
-'linklistsub'         => '(Lista kan mga takod)',
 'linkshere'           => "An mga minasunod na pahina nakatakod sa '''[[:$1]]''':",
 'nolinkshere'         => "Mayong pahinang nakatakod sa '''[[:$1]]'''.",
 'nolinkshere-ns'      => "Mayong pahina na nakatakod sa '''[[:$1]]''' sa piniling ngaran-espacio.",
@@ -1537,6 +1530,8 @@ Pwede na dakulà asin dai seguradong pagbàgo ini kan sarong popular na pahina;
 
 Sa mga kasong iyan, kaipuhan mong ibalyo o isalak an páhina nin mano-mano kun boot mo.",
 'movearticle'             => 'Ibalyó an pahina:',
+'movenologin'             => 'Mayô sa laog',
+'movenologintext'         => 'Kaipuhan na rehistradong parágamit ka asin si [[Special:UserLogin|nakalaog]] tangarig makabalyó ka nin páhina.',
 'movenotallowed'          => 'Mayô kang permiso na ibalyó an mga pahina sa wiki na ini.',
 'newtitle'                => 'Sa bàgong titulong:',
 'move-watch'              => 'Bantayán ining pahina',
@@ -1561,7 +1556,6 @@ Igwa nang páhina na "[[:$1]]". Gusto mong parâon ini tangarig maibalyó?',
 'delete_and_move_confirm' => 'Iyo, parâon an pahina',
 'delete_and_move_reason'  => 'Pinarâ tangarig maibalyó',
 'selfmove'                => 'Pareho an páhinang ginikanan asin destinasyon; dai pwedeng ibalyó an sarong páhina sa sadiri.',
-'immobile_namespace'      => 'An titulo kan ginikanan o destinasyon sarong espesyal na tipo; dai pwedeng ibalyó an mga pahina hali or paduman sa ngaran-espacio na iyan.',
 
 # Export
 'export'            => 'Iluwas an mga pahina',
@@ -1569,7 +1563,7 @@ Igwa nang páhina na "[[:$1]]". Gusto mong parâon ini tangarig maibalyó?',
 
 Para makapadara nin mga páhina, ilaag an mga titulo sa kahon para sa teksto sa babâ, sarong titulo kada linya, dangan pilîon kun boot mo presenteng bersyón asin dating bersyón, na may mga linya kan historya, o an presenteng bersyón sana na may impormasyon manonongod sa huring hirá.
 
-Sa kaso kan huri, pwede ka man na maggamit nin takod, arog kan [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] para sa páhinang "[[{{MediaWiki:Mainpage}}]]".',
+Sa kaso kan huri, pwede ka man na maggamit nin takod, arog kan [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] para sa páhinang "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Mga presenteng pagpakarhay sana an ibali, bakong an enterong historya',
 'exportnohistory'   => "----
 '''Paisi:''' Dai pigpatogotan an pagpadara kan enterong historya kan mga páhina sa paagi kaining forma huli sa mga rasón dapit sa pagsagibo kaini.",
@@ -1584,7 +1578,7 @@ Sa kaso kan huri, pwede ka man na maggamit nin takod, arog kan [[{{ns:special}}:
 'allmessagesdefault'        => 'Tekstong normal',
 'allmessagescurrent'        => 'Presenteng teksto',
 'allmessagestext'           => 'Ini an lista kan mga mensahe sa sistema sa ngaran-espacio na MediaWiki.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "Dai pwedeng gamiton an '''{{ns:special}}:Allmessages''' ta sarado an '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Pansara nin pangaran kan mensahe:',
 'allmessagesmodified'       => 'An mga pigmodikar sana an ipahiling',
@@ -1604,6 +1598,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-interwiki-history'   => 'Kopyahon an gabos na mga bersyón para sa páhinang ini',
 'import-interwiki-submit'    => 'Ipalaog',
 'import-interwiki-namespace' => 'Ibalyó an mga páhina sa ngaran-espacio:',
+'import-comment'             => 'Komento:',
 'importtext'                 => "Ipadara tabì an ''file'' hali sa ginikanan na wiki gamit an Special:Export utility, itagama ini sa saimong disk dangan ikarga iyan digdi.",
 'importstart'                => 'Piglalaog an mga páhina...',
 'import-revision-count'      => '$1 {{PLURAL:$1|pagpakarhay|mga pagpakarhay}}',
@@ -1722,6 +1717,11 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'numauthors'     => 'Bilang kan mga parásurat na ibá (páhina): $1',
 'numtalkauthors' => 'Bilang kan mga parásurat na ibá (páhina kan orólay): $1',
 
+# Skin names
+'skinname-standard' => 'Klasiko',
+'skinname-simple'   => 'Simple',
+'skinname-modern'   => 'Bago',
+
 # Math options
 'mw_math_png'    => 'Itaô pirmi an PNG',
 'mw_math_simple' => 'HTML kun simple sana o PNG kun bakô',
@@ -1773,7 +1773,7 @@ $1",
 'show-big-image'       => 'Todong resolusyon',
 'show-big-image-thumb' => '<small>Sokol kan patânaw: $1 × $2  na pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria nin mga bàgong file',
 'imagelisttext'         => "Mahihiling sa baba an lista nin mga  '''$1''' {{PLURAL:$1|file|files}} na linain $2.",
 'showhidebots'          => '($1 na bots)',
@@ -1905,20 +1905,9 @@ $1
 Ikonpirmar tabi na talagang gusto mong gibohon giraray ining pahina.",
 'recreate'            => 'Gibohón giraray',
 
-# HTML dump
-'redirectingto' => 'Piglilikay sa [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Halîon an an aliho kaining páhina?
-
-$1',
 'confirm_purge_button' => 'Sige',
-
-# AJAX search
-'searchcontaining' => "Hanápon an mga artikulong may ''$1''.",
-'searchnamed'      => "Hanápon an mga artikulong ''$1''.",
-'articletitles'    => "Mga artikulong nagpopoon sa ''$1''",
-'hideresults'      => 'Tagôon an mga resulta',
+'confirm-purge-top'    => 'Halîon an an aliho kaining páhina?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� nakaaging pahina',
diff --git a/languages/messages/MessagesBe.php b/languages/messages/MessagesBe.php
index 3cdf9fa7..29e87933 100644
--- a/languages/messages/MessagesBe.php
+++ b/languages/messages/MessagesBe.php
@@ -10,15 +10,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Кл��ычны',
-	'nostalgia'   => '�а�тальгі�',
-	'cologneblue' => 'Кёльн�кі �мутак',
-	'monobook'    => 'Монакніга',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Цыпа'
-);
-
 $bookstoreList = array(
 	'OZ.by' => 'http://oz.by/search.phtml?what=books&isbn=$1',
 	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
@@ -47,8 +38,8 @@ $namespaceNames = array(
         NS_USER_TALK        => 'Размовы_з_удзельнікам',
 	# NS_PROJECT set by $wgMetaNamespace
         NS_PROJECT_TALK     => '$1_размовы',
-        NS_IMAGE            => 'Вы�ва',
-        NS_IMAGE_TALK       => 'Размовы_пра_вы�ву',
+        NS_FILE             => 'Вы�ва',
+        NS_FILE_TALK        => 'Размовы_пра_вы�ву',
         NS_MEDIAWIKI        => 'MediaWiki',
         NS_MEDIAWIKI_TALK   => 'Размовы_пра_MediaWiki',
         NS_TEMPLATE         => 'Шаблон',
@@ -101,17 +92,18 @@ $messages = array(
 'tog-watchlisthideown'        => '�е паказваць у назіраным �ваіх правак',
 'tog-watchlisthidebots'       => '�е паказваць у назіраным правак, зробленых робатамі',
 'tog-watchlisthideminor'      => '�е паказваць у назіраным дробных правак',
+'tog-watchlisthideliu'        => 'Без паказу правак удзельнікаў з ліку назіранага',
+'tog-watchlisthideanons'      => 'Без паказу ананімных правак з ліку назіранага',
 'tog-nolangconversion'        => 'Выключыць пераўтвар�нні вары�нтаў',
 'tog-ccmeonemails'            => 'Слаць мне копіі маіх лі�тоў',
 'tog-diffonly'                => '�е паказваць р�шты �таронкі пад розніцай',
 'tog-showhiddencats'          => 'Паказаць �хаваны� кат�горыі',
+'tog-norollbackdiff'          => '�е паказваць розніцу ў выніку адкату',
 
 'underline-always'  => 'Заў�ёды',
 'underline-never'   => '�іколі',
 'underline-default' => 'Як у браўзеры',
 
-'skinpreview' => '(перадпаказ)',
-
 # Dates
 'sunday'        => '��дзел�',
 'monday'        => 'Пан�дзелак',
@@ -201,22 +193,22 @@ $messages = array(
 'qbmyoptions'    => 'Свае �таронкі',
 'qbspecialpages' => '�дмы�ловы� �таронкі',
 'moredotdotdot'  => 'Яшч�...',
-'mypage'         => 'Сва� �таронка',
+'mypage'         => 'Ула�на� �таронка',
 'mytalk'         => 'Размовы',
 'anontalk'       => 'Размова дл� г�тага IP',
 'navigation'     => '�авігацы�',
-'and'            => 'Ñ–',
+'and'            => '&#32;Ñ–',
 
 # Metadata in edit box
 'metadata_help' => 'Метазве�ткі:',
 
 'errorpagetitle'    => 'Памылка',
 'returnto'          => 'В�рнуцца да $1.',
-'tagline'           => 'З {{GRAMMAR:родны|{{SITENAME}}}}.',
+'tagline'           => 'З пл�цоўкі {{SITENAME}}.',
 'help'              => 'Даведка',
 'search'            => 'Знай�ці',
 'searchbutton'      => 'Т�к�т',
-'go'                => 'І�ці',
+'go'                => 'Пераход',
 'searcharticle'     => '�ртыкул',
 'history'           => 'Гі�торы� �таронкі',
 'history_short'     => 'гі�торы�',
@@ -242,14 +234,14 @@ $messages = array(
 'talkpagelinktext'  => 'размова',
 'specialpage'       => '�дмы�лова� �таронка',
 'personaltools'     => '��абі�ты� прылады',
-'postcomment'       => 'Пакінуць заўвагу',
+'postcomment'       => '�овы раздзел',
 'articlepage'       => 'Паказаць �таронку зме�ціва',
 'talk'              => 'Размовы',
 'views'             => 'Віды',
 'toolbox'           => 'Прылады',
 'userpage'          => 'Паказаць �таронку ўдзельніка',
 'projectpage'       => 'Паказаць �таронку праекта',
-'imagepage'         => 'Гл. �таронку вы�вы',
+'imagepage'         => 'Гл. �таронку файла',
 'mediawikipage'     => 'Паказаць �таронку паведамленн�',
 'templatepage'      => 'Паказаць �таронку шаблона',
 'viewhelppage'      => 'Паказаць �таронку даведкі',
@@ -268,8 +260,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Пра {{GRAMMAR:вінавальны|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Пра {{GRAMMAR:вінавальны|{{SITENAME}}}}',
-'bugreports'           => 'Пра памылкі',
-'bugreportspage'       => 'Project:Паведамленні пра памылкі',
 'copyright'            => 'Мат�ры�л да�тупны на ўмовах $1.',
 'copyrightpagename'    => '�ўтар�кі� правы {{GRAMMAR:родны|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:�ўтар�кі� правы',
@@ -292,9 +282,7 @@ $messages = array(
 
 'badaccess'        => 'Памылка ў дазволах',
 'badaccess-group0' => 'Вам не дазволена выконваць аперацыю, па �кую вы зв�рталі��.',
-'badaccess-group1' => '�перацы�, па �кую вы зв�рталі��, дазволена толькі ўдзельнікам з групы $1.',
-'badaccess-group2' => '�перацы�, па �кую вы зв�рталі��, дазволена толькі ўдзельнікам з адной з груп $1.',
-'badaccess-groups' => '�перацы�, па �кую вы зв�рталі��, дазволена толькі ўдзельнікам з адной з груп $1.',
+'badaccess-groups' => '�перацы�, па �кую вы зв�рталі��, дазволена толькі ўдзельнікам у �кладзе {{PLURAL:$2|групы|адной з груп}}: $1.',
 
 'versionrequired'     => 'Патрабуецца MediaWiki вер�іі $1',
 'versionrequiredtext' => 'Каб кары�тацца г�тай �таронкай, патрабуецца MediaWiki вер�іі $1. Гл. [[Special:Version]]',
@@ -309,6 +297,8 @@ $messages = array(
 'editsection'             => 'правіць',
 'editold'                 => 'правіць',
 'viewsourceold'           => 'гл. выток',
+'editlink'                => 'правіць',
+'viewsourcelink'          => 'паказ крыніцы',
 'editsectionhint'         => 'Правіць раздзел: $1',
 'toc'                     => 'Зме�т',
 'showtoc'                 => 'паказаць',
@@ -323,13 +313,13 @@ $messages = array(
 'site-atom-feed'          => '$1 �трумень Atom',
 'page-rss-feed'           => '"$1" �трумень RSS',
 'page-atom-feed'          => '"$1" �трумень Atom',
-'red-link-title'          => '$1 (такога пакуль н�ма)',
+'red-link-title'          => '$1 (н�ма такой �таронкі)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => '�ртыкул',
-'nstab-user'      => 'Сва� Старонка',
+'nstab-user'      => 'Старонка',
 'nstab-media'     => 'Мультымеды�',
-'nstab-special'   => '�дмы�лова�',
+'nstab-special'   => '�дмы�лова� �таронка',
 'nstab-project'   => 'Старонка праекту',
 'nstab-image'     => 'Файл',
 'nstab-mediawiki' => 'Паведамленне',
@@ -339,7 +329,8 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '��ма такога дзе�нн�',
-'nosuchactiontext'  => '�ев�домае ў г�тай вік�е апі�анае ў URL дзе�нне (action)',
+'nosuchactiontext'  => '�едапушчальнае дзе�нне (action) ў URL.
+Магчымы� прычыны -- памылка ўпі�ванн� URL або пераход па н�правільнай �па�ылцы; так�ама магчыма� памылка ў праграмах, што працуюць на пл�цоўцы {{SITENAME}}.',
 'nosuchspecialpage' => '��ма такой адмы�ловай �таронкі',
 'nospecialpagetext' => "<big>'''Вы зв�рнулі�� па н�правільную адмы�ловую �таронку.'''</big>
 
@@ -394,7 +385,6 @@ $1',
 'cannotdelete'         => '�емагчыма выдаліць вызначаную �таронку ці файл (магчыма, хто�ьці іншы ўжо зрабіў г�та).',
 'badtitle'             => '��правільна� назва',
 'badtitletext'         => '�азва �таронкі, па �кую зв�рталі��, аказала�� недапушчальнай, пу�той, або н�правільна прылучанай між-моўнай ці між-вікі назвай. Магчыма, у ёй ё�ць знакі, �кі� нельга ўжываць у назвах.',
-'perfdisabled'         => 'Прабачце! Г�та� магчыма�ць была ча�ова выключана�, таму што �на �тала прычынай замаруджванн� базы зве�так на�толькі, што праца з Вікі �тала немагчымай.',
 'perfcached'           => 'Г�та ўз�ты� з к�шу зве�ткі, і �ны могуць не быць актуальнымі.',
 'perfcachedts'         => 'К�шавы� зве�ткі, дата апошн�й актуалізацыі $1.',
 'querypage-no-updates' => '�емагчыма абнавіць паказаны� зве�ткі, таму што зараз абнаўленні г�тай �таронкі не дазволены.',
@@ -420,15 +410,15 @@ $2',
 Тлумач�нне па�таноўкі пад ахову: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => '�екар�ктна� канфігурацы�: нев�домы антывіру�ны �канер: <i>$1</i>',
+'virus-badscanner'     => "�екар�ктна� канфігурацы�: нев�домы антывіру�ны �канер: ''$1''",
 'virus-scanfailed'     => 'не ўдало�� праверыць (код $1)',
 'virus-unknownscanner' => 'нев�домы антывіру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Выхад з �і�т�мы',
-'logouttext'                 => '<strong>Вы выйшлі з �і�т�мы.</strong>
+'logouttext'                 => "'''Вы выйшлі з �і�т�мы.'''
 
-Можна прац�гваць працу на {{SITENAME}} ананімна, або можна [[Special:UserLogin|ўвай�ці ў �і�т�му ізноў]], пад тым �амым або пад іншым удзельніцкім імем. Заўважце, што некаторы� �таронкі могуць паказвацца так, быццам вы �шч� не выйшлі; у такім разе тр�ба ачы�ціць к�ш вашага браўзера.',
+Можна прац�гваць працу на {{SITENAME}} ананімна, або можна [[Special:UserLogin|ўвай�ці ў �і�т�му ізноў]], пад тым �амым або пад іншым удзельніцкім імем. Заўважце, што некаторы� �таронкі могуць паказвацца так, быццам вы �шч� не выйшлі; у такім разе тр�ба ачы�ціць к�ш вашага браўзера.",
 'welcomecreation'            => '== Вітаем, $1! == Ваш  рахунак быў �твораны. �е забудзьце�� дапа�аваць �вае на�таўленні ў {{SITENAME}}.',
 'loginpagetitle'             => 'Уваход у �і�т�му',
 'yourname'                   => 'Ім� ўдзельніка',
@@ -437,7 +427,6 @@ $2',
 'remembermypassword'         => 'Пам�таць м�не',
 'yourdomainname'             => 'Ваш дамен',
 'externaldberror'            => '�бо памылка вонкавай аўт�нтыкацыі ў базе дадзеных, або вам не дазволена абнаўл�ць �вой вонкавы рахунак.',
-'loginproblem'               => '<b>Праблема пры �пробе ўваходу ў �і�т�му.</b><br />Па�прабуйце ізноў!',
 'login'                      => 'Увай�ці ў �і�т�му',
 'nav-login-createaccount'    => 'Увай�ці ў �і�т�му / �тварыць рахунак',
 'loginprompt'                => 'Каб уваходзіць у �і�т�му {{SITENAME}}, тр�ба дазволіць у браўзеры квіткі (кукі).',
@@ -463,7 +452,7 @@ $2',
 'yourvariant'                => 'Вары�нт',
 'yournick'                   => 'П�еўданім:',
 'badsig'                     => '�едапушчальны крынічны т�к�т подпі�у; праверце т�гі HTML.',
-'badsiglength'               => 'Подпі� занадта доўгі. Тр�ба, каб ён быў карацейшым за $1 {{PLURAL:$1|знак|знакаў}}.',
+'badsiglength'               => 'Занадта доўгі подпі�. Тр�ба, каб ён быў карацейшым за $1 {{PLURAL:$1|знак|знакаў}}.',
 'email'                      => 'Эл.пошта',
 'prefs-help-realname'        => 'Сапраўднае ім� паведамл�ць неабав�зкова, а калі �но паведамлена, то ім падпі�ваецца ваша праца.',
 'loginerror'                 => 'Памылка ўваходу',
@@ -475,7 +464,7 @@ $2',
 'noname'                     => 'Вы не вызначылі правільнага ім� ўдзельніка.',
 'loginsuccesstitle'          => 'Па�п�ховы ўваход у �і�т�му',
 'loginsuccess'               => "'''Ц�пер Вы ўвайшлі на {{SITENAME}} �к \"\$1\".'''",
-'nosuchuser'                 => '��ма ўдзельніка з імем "$1". Праверце правільна�ць напі�анн� або [[Special:UserLogin/signup|�тварыце новы рахунак]].',
+'nosuchuser'                 => '��ма ўдзельніка з імем "$1". Праверце правільна�ць напі�анн� або [[Special:UserLogin/signup|�тварыце новы рахунак]]. В�лікі� і малы� літары ў такіх імёнах лічацца рознымі.',
 'nosuchusershort'            => 'Удзельніка з імем "<nowiki>$1</nowiki>" не і�нуе. Праверце �го напі�анне.',
 'nouserspecified'            => 'Вы му�іце вызначыць ім� ўдзельніка.',
 'wrongpassword'              => 'Уведзены н�правільны пароль. Па�прабуйце нанова.',
@@ -498,8 +487,8 @@ $2',
 Каб туды, у далейшым, трапл�ла інша� �л.пошта ад�юль, патрабуецца выканаць ін�трукцыі, выкладзены� ў г�тым �л.паведамленні, каб пацвердзіць �ваё права на рахунак �л.пошты.',
 'throttled-mailpassword'     => '�агаданне пра пароль ужо ад�ылала�� на прац�гу апошн{{PLURAL:$1|�й гадзіны|іх $1 гадзін}}. Дзел� абароны ад злоўжыванн�ў, дазвал�ецца атрымліваць толькі адно такое нагаданне за {{PLURAL:$1|гадзіну|$1 гадзін}}.',
 'mailerror'                  => 'Памылка ад�ыланн� �л.пошты: $1',
-'acct_creation_throttle_hit' => 'У ва� ужо �твораны $1 рахункаў, і больша� колька�ць не дазвал�ецца.',
-'emailauthenticated'         => '�дра� �л.пошты пацверджаны $1.',
+'acct_creation_throttle_hit' => '�а г�тай вікі за апошні дзень �твораны {{PLURAL:$1|1 рахунак|$1 рахункаў}} наведвальнікамі з вашага адра�у IP. Больш за такі ча� не дазвал�ецца. Таму на п�ўны ча� з г�тага адра�у IP нельга �твараць новых рахункаў.',
+'emailauthenticated'         => 'Ваш адра� �л.пошты быў пацверджаны на пл�цоўцы $2 ($3).',
 'emailnotauthenticated'      => '�дра� �л.пошты �шч� не пацверджаны. Эл.пошта ў г�тых магчыма�ц�х �лацца не будзе.',
 'noemailprefs'               => 'Патр�бны адра� �л.пошты, каб дзейнічалі г�ты� магчыма�ці.',
 'emailconfirmlink'           => 'Пацвердзіце ваш адра� �л.пошты',
@@ -510,17 +499,25 @@ $2',
 'createaccount-text'         => '�а пл�цоўцы {{SITENAME}} ($4) быў �твораны рахунак удзельніка з г�тым адра�ам �л.пошты. �азва рахунку "$2", пароль "$3". Варта адразу ўвай�ці ў �і�т�му і зм�ніць пароль.
 
 Калі �твар�нне рахунку было памылковым, то на г�тае паведамленне можна не зв�ртаць увагі.',
+'login-throttled'            => 'Вы зрабілі занадта многа н�даўніх �пробаў з паролем г�тага рахунку. Пачакайце перад тым, �к �прабаваць ізноў.',
 'loginlanguagelabel'         => 'Мова: $1',
 
 # Password reset dialog
-'resetpass'               => 'Сцерці пароль рахунку',
-'resetpass_announce'      => 'Вы ўвайшлі ў �і�т�му пад тымча�овым паролем, пры�ланым �л.поштай. Каб правільна аформіць уваход, належыць вызначыць новы пароль во�ь тут:',
-'resetpass_header'        => 'Зм�ніць пароль рахунку',
-'resetpass_submit'        => '�а�тавіць пароль і ўвай�ці',
-'resetpass_success'       => 'Ваш пароль па�п�хова зменены! Ц�пер уваходзім...',
-'resetpass_bad_temporary' => '��правільны ча�овы пароль. Мабыць, Вы ўжо зм�нілі пароль ці запыталі новы ча�овы пароль.',
-'resetpass_forbidden'     => '�е дазволена м�н�ць паролі',
-'resetpass_missing'       => '��ма даных у форме.',
+'resetpass'                 => 'Зм�ніць пароль',
+'resetpass_announce'        => 'Вы ўвайшлі ў �і�т�му пад тымча�овым паролем, пры�ланым �л.поштай. Каб правільна аформіць уваход, належыць вызначыць новы пароль во�ь тут:',
+'resetpass_header'          => 'Зм�ніць пароль рахунку',
+'oldpassword'               => 'Стары пароль:',
+'newpassword'               => '�овы пароль:',
+'retypenew'                 => '�овы пароль паўторна:',
+'resetpass_submit'          => '�а�тавіць пароль і ўвай�ці',
+'resetpass_success'         => 'Ваш пароль па�п�хова зменены! Ц�пер уваходзім...',
+'resetpass_bad_temporary'   => '��правільны ча�овы пароль. Мабыць, Вы ўжо зм�нілі пароль ці запыталі новы ча�овы пароль.',
+'resetpass_forbidden'       => '�е дазволена м�н�ць паролі',
+'resetpass-no-info'         => 'Тр�ба ўвай�ці ў �і�т�му, каб зв�ртацца да г�тай �таронкі наўпро�т.',
+'resetpass-submit-loggedin' => 'Зм�ніць пароль',
+'resetpass-wrong-oldpass'   => '�едапушчальны тымча�овы ці актуальны пароль.
+Магчыма, вы ўжо зм�нілі �вой пароль ці папра�ілі новы тымча�овы.',
+'resetpass-temp-password'   => 'Тымча�овы пароль:',
 
 # Edit page toolbar
 'bold_sample'     => 'Цёмны т�к�т',
@@ -545,8 +542,8 @@ $2',
 'hr_tip'          => 'Гарызантальна� ры�а (не злоўжывайце г�тым)',
 
 # Edit pages
-'summary'                          => 'Тлумач�нне',
-'subject'                          => 'Т�ма/загаловак',
+'summary'                          => 'Тлумач�нне:',
+'subject'                          => 'Т�ма/загаловак:',
 'minoredit'                        => 'Дробна� праўка',
 'watchthis'                        => '�азіраць за г�тай �таронкай',
 'savearticle'                      => 'Запі�аць',
@@ -558,8 +555,8 @@ $2',
 'missingsummary'                   => "'''�агадваем''': вы не ўпі�алі тлумач�нн� дл� �ваёй праўкі. Калі наці�нуць Запі�аць �шч� раз, праўка будзе замацавана без тлумач�нн�.",
 'missingcommenttext'               => 'Калі ла�ка, ув�дзіце ніж�й каментарый.',
 'missingcommentheader'             => "'''Увага:''' вы нічога не ўпі�алі ў полі т�мы/загалоўку г�тай заўвагі. �аці�канне '{{:{{ns:mediawiki}}:savearticle/be}}' замацуе вашую праўку з пу�тым полем т�мы/загалоўку.",
-'summary-preview'                  => 'Перадпаказ апі�анн�',
-'subject-preview'                  => 'Перадпаказ т�мы/загалоўка',
+'summary-preview'                  => 'Перадпаказ апі�анн�:',
+'subject-preview'                  => 'Перадпаказ т�мы/загалоўка:',
 'blockedtitle'                     => 'Удзельнік заблакаваны',
 'blockedtext'                      => "<big>'''Ваша ім� ўдзельніка або адра� IP былі па�таўлены пад блок.'''</big>
 
@@ -604,29 +601,30 @@ $2',
 'newarticle'                       => '(�овы)',
 'newarticletext'                   => 'Вы перайшлі да �таронкі, �кой �шч� н�ма, і таму трапілі �юды. Каб пачаць новую �таронку, пішыце �е т�к�т у ніж�йпаказаным акне р�дагаванн� (падраб�зна�ці бач у [[{{MediaWiki:Helppage}}|даведцы]]). Калі вы тут выпадкова, про�та наці�ніце "назад" у браўзеры.',
 'anontalkpagetext'                 => "----''Г�та �таронка размовы з ананімным удзельнікам, �кі або не мае �вайго рахунку, або ім не кары�таў��. Таму дзел� �го ці �е ід�нтыфікацыі мы му�ім выкары�таць лічбавы �дра� IP. Такі адра� IP могуць дз�ліць між �абою некалькі а�об. Калі вы ананімны ўдзельнік, і лічыце, што атрымліваеце н��лушны� заўвагі,[[Special:UserLogin|зав�дзіце �абе рахунак або ўвайдзіце ў �і�т�му]], каб ва� больш не блыталі з іншымі ананімнымі ўдзельнікамі.''",
-'noarticletext'                    => 'Така� �таронка �шч� не і�нуе. Вы можаце [[Special:Search/{{PAGENAME}}|пашукаць такога т�к�ту]] ў іншых артыкулах, або [{{fullurl:{{FULLPAGENAME}}|action=edit}} �тварыць новы артыкул].',
+'noarticletext'                    => 'Старонка не ўтрымлівае т�к�ту. Вы можаце [[Special:Search/{{PAGENAME}}|пашукаць г�такай назвы]] ў іншых �таронках ці <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ў журналах],
+або [{{fullurl:{{FULLPAGENAME}}|action=edit}} папрацаваць з г�тай �таронкай]</span>.',
 'userpage-userdoesnotexist'        => 'Рахунак удзельніка "$1" не зар�гі�траваны. Праверце, ці вы жадаеце �тварыць або паправіць г�тую �таронку.',
 'clearyourcache'                   => "'''Заўвага:''' Па�л� замацоўванн�, вам можа �патр�біцца ачы�тка к�шу браўзера, каб пабачыць уне�ены� зм�ненні. '''Mozilla / Firefox / Safari:''' наці�ніце '''Reload''', утрымліваючы ''Shift'', або наці�ніце ''Ctrl-F5'' ці ''Ctrl-R'' (''Cmd-R'' на Макінтошах); '''Konqueror:''': наці�ніце ''Reload'' або ''F5''; '''Opera''': увайдзіце ў на�таўленні кары�тальніка (меню ''Tools'', падпункт ''Preferences''), там ачы�ціце к�ш; '''Internet Explorer:''' наці�ніце ''Refresh'', утрымліваючы ''Ctrl'', або наці�ніце ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>�аменка:</strong> Пакары�тайце�� кнопкай \"''{{:{{ns:mediawiki}}:showpreview}}''\", каб выпрабаваць новы код CSS/JS, ''перш'' чым �го запі�ваць.",
+'usercssjsyoucanpreview'           => "'''�аменка:''' Пакары�тайце�� кнопкай \"''{{:{{ns:mediawiki}}:showpreview}}''\", каб выпрабаваць новы код CSS/JS, ''перш'' чым �го запі�ваць.",
 'usercsspreview'                   => "'''Пам�тайце, што г�та толькі пап�р�дні паказ вашага ўла�нага CSS. Праўкі �шч� не замацаваны�!'''",
 'userjspreview'                    => "'''Пам�тайце, што г�та выпрабаванне/пап�р�дні паказ вашага ўла�нага Ява�крыпту, �кі �шч� не быў замацаваны!'''",
 'userinvalidcssjstitle'            => "'''Увага:''' ��ма вокладкі з назвай \"\$1\". Пам�тайце, што �вае �таронкі .css і .js называюцца толькі малымі літарамі, такім чынам, напр., {{ns:user}}:Foo/monobook.css, а не {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(абноўлена)',
-'note'                             => '<strong>Заўвага:</strong>',
-'previewnote'                      => '<strong>Г�та пап�р�дні паказ; праўкі �шч� не замацаваны�!</strong>',
+'note'                             => "'''Заўвага:'''",
+'previewnote'                      => "'''Г�та пап�р�дні паказ; праўкі �шч� не замацаваны�!'''",
 'previewconflict'                  => 'Г�та пап�р�дні паказ магчымага выніку замацоўванн� актуальнага �тану крынічнага т�к�ту ў верхнім т�к�тавым полі.',
-'session_fail_preview'             => '<strong>�е ўдало�� апрацаваць вашую праўку, таму што �ервер згубіў зве�ткі аб вашым �еан�е.
-Па�прабуйце, калі ла�ка, ізноў. Калі і тады не атрымаецца, па�прабуйце [[Special:UserLogout|вый�ці з �і�т�мы]] і зай�ці ізноў.</strong>',
-'session_fail_preview_html'        => "<strong>�е ўдало�� апрацаваць вашую праўку з-за таго, што згубілі�� даны� аб �еан�е.</strong>
+'session_fail_preview'             => "'''�е ўдало�� апрацаваць вашую праўку, таму што �ервер згубіў зве�ткі аб вашым �еан�е.
+Па�прабуйце, калі ла�ка, ізноў. Калі і тады не атрымаецца, па�прабуйце [[Special:UserLogout|вый�ці з �і�т�мы]] і зай�ці ізноў.'''",
+'session_fail_preview_html'        => "'''�е ўдало�� апрацаваць вашую праўку з-за таго, што згубілі�� даны� аб �еан�е.'''
 
 ''Перадпаказ не зроблены, бо на пл�цоўцы {{SITENAME}} дазволены �ыры код HTML, што робіць магчымымі атакі праз Ява�крыпт.''
 
-<strong>Калі г�та нармальна� �проба праўкі, па�прабуйце паўтарыць запі�ванне. Калі і г�та не дапаможа, па�прабуйце [[Special:UserLogout|вый�ці з �і�т�мы]] і ўвай�ці ізноў.</strong>",
-'token_suffix_mismatch'            => '<strong>Ваша праўка была адхілена, каб пазбегнуць �ап�аванн� т�к�ту �таронкі, таму што ваш браўзер пап�аваў знакі прыпынку ў квітку праўкі.
-Магчыма, прычына ў выкары�танні вамі ананімнага прок�і-�ервера, праграмы �кога працуюць некар�ктна.</strong>',
+'''Калі г�та нармальна� �проба праўкі, па�прабуйце паўтарыць запі�ванне. Калі і г�та не дапаможа, па�прабуйце [[Special:UserLogout|вый�ці з �і�т�мы]] і ўвай�ці ізноў.'''",
+'token_suffix_mismatch'            => "'''Ваша праўка была адхілена, каб пазбегнуць �ап�аванн� т�к�ту �таронкі, таму што ваш браўзер пап�аваў знакі прыпынку ў квітку праўкі.
+Магчыма, прычына ў выкары�танні вамі ананімнага прок�і-�ервера, праграмы �кога працуюць некар�ктна.'''",
 'editing'                          => 'Правім: $1',
 'editingsection'                   => 'Правім $1 (раздзел)',
-'editingcomment'                   => 'Правім: $1 (каментар)',
+'editingcomment'                   => 'Правім $1 (новы раздзел)',
 'editconflict'                     => 'Канфлікт правак: $1',
 'explainconflict'                  => "�ехта іншы зм�ніў �таронку па�л� таго, �к вы пачалі працу з ёю.
 Верхн�е т�к�тавае поле паказвае актуальны крынічны т�к�т �таронкі.
@@ -635,24 +633,26 @@ $2',
 '''Толькі''' т�к�т у верхнім полі будзе замацаваны, калі наці�нуць \"{{:{{ns:mediawiki}}:savearticle/be}}\".",
 'yourtext'                         => 'Свой т�к�т',
 'storedversion'                    => 'Захавана� вер�і�',
-'nonunicodebrowser'                => '<strong>УВ�Г�: ваш браўзер не працуе з Унікодам. Каб вы маглі кар�ктна  правіць �таронкі, ужываецца така� штука, што знакі з па-за аб��гу ASCII паказваюцца ў р�дактар�кім акне �к ша�наццаткавы� коды.</strong>',
-'editingold'                       => "<strong>УВ�Г�: Вы правіце такую вер�ію артыкула, �ка� не з'�ўл�ецца актуальнай.
-Калі вы �е зараз запішаце, то �траціце змены ў артыкуле, зроблены� па�л� колішн�га запі�у г�тай вер�іі.</strong>",
+'nonunicodebrowser'                => "'''УВ�Г�: ваш браўзер не працуе з Унікодам. Каб вы маглі кар�ктна  правіць �таронкі, ужываецца така� штука, што знакі з па-за аб��гу ASCII паказваюцца ў р�дактар�кім акне �к ша�наццаткавы� коды.'''",
+'editingold'                       => "'''УВ�Г�: Вы правіце такую вер�ію артыкула, �ка� не з'�ўл�ецца актуальнай.
+Калі вы �е зараз запішаце, то �траціце змены ў артыкуле, зроблены� па�л� колішн�га запі�у г�тай вер�іі.'''",
 'yourdiff'                         => '�дрозненні',
-'copyrightwarning'                 => 'Заўважце, што ў�е ўклады на {{SITENAME}} лічацца выданымі на ўмовах $2 (бач падраб�зна�ці на $1). Калі вы не жадаеце, каб вашы� мат�ры�лы б�зліта�на правілі��, і �вабодна ра�паў�юджвалі��, то і не аддавайце іх �юды.<br />
+'copyrightwarning'                 => "Заўважце, што ў�е ўклады на {{SITENAME}} лічацца выданымі на ўмовах $2 (бач падраб�зна�ці на $1). Калі вы не жадаеце, каб вашы� мат�ры�лы б�зліта�на правілі��, і �вабодна ра�паў�юджвалі��, то і не аддавайце іх �юды.<br />
 Так�ама вы нам аб�цаеце, што напі�алі г�та �амі, або �капіравалі з р��ур�у, �кі знаходзіцца ў публічнай ула�на�ці, або з аналагічнага �вабоднага р��ур�у.
-<strong>�Е КЛ�ДЗІЦЕ СЮДЫ, БЕЗ �ДП�ВЕД��Г� Д�ЗВОЛУ, М�ТЭРЫЯЛУ, ЯКІ �ХОЎВ�ЕЦЦ� �ЎТ�РСКІМ ПР�В�М!</strong>',
-'copyrightwarning2'                => 'Заўважце, што кожны ўклад на {{SITENAME}} можа быць папраўлены, зменены або выдалены іншымі ўдзельнікамі. Калі вы не жадаеце, каб вашы� мат�ры�лы б�зліта�на правілі��, то і не давайце іх �юды.<br />
+'''�Е КЛ�ДЗІЦЕ СЮДЫ, БЕЗ �ДП�ВЕД��Г� Д�ЗВОЛУ, М�ТЭРЫЯЛУ, ЯКІ �ХОЎВ�ЕЦЦ� �ЎТ�РСКІМ ПР�В�М!'''",
+'copyrightwarning2'                => "Заўважце, што кожны ўклад на {{SITENAME}} можа быць папраўлены, зменены або выдалены іншымі ўдзельнікамі. Калі вы не жадаеце, каб вашы� мат�ры�лы б�зліта�на правілі��, то і не давайце іх �юды.<br />
 Так�ама вы нам аб�цаеце, што напі�алі г�та �амі, або �капіравалі з р��ур�у, �кі знаходзіцца ў публічнай ула�на�ці, або з аналагічнага �вабоднага р��ур�у (бач падраб�зна�ці на $1).
-<strong>�Е КЛ�ДЗІЦЕ СЮДЫ, БЕЗ �ДП�ВЕД��Г� Д�ЗВОЛУ, М�ТЭРЫЯЛУ, ЯКІ �ХОЎВ�ЕЦЦ� �ЎТ�РСКІМ ПР�В�М!</strong>',
-'longpagewarning'                  => "<strong>УВ�Г�: Старонка да��гае аб'ёму $1 кілабайтаў; некаторы� браўзеры не адольваюць �таронак з аб'ёмам, блізкім ці большым за 32 kб.
-Падумайце, ці можна падз�ліць �таронку на некалькі меншых.</strong>",
-'longpageerror'                    => "<strong>П�МЫЛК�: немагчыма запі�аць ваш т�к�т, бо �го аб'ём $1 кілабайтаў, а дазволены мак�імум — $2 кілабайтаў.</strong>",
-'readonlywarning'                  => '<strong>УВ�Г�: зараз вы не можаце запі�аць �вае праўкі, таму што база даных зачынена на аб�лугоўванне. Магчыма, варта перане�ці ваш т�к�т у а�обны файл і запі�аць на потым.</strong>',
-'protectedpagewarning'             => '<strong>УВ�Г�:  Г�та� �таронка па�таўлена пад ахову, і таму �е могуць правіць толькі адміні�тратары. Праверце, ці Вы кіруеце�� [[{{ns:project}}:Праца з за�цераганымі �таронкамі|правіламі працы �а �таронкамі пад аховай]].</strong>',
+'''�Е КЛ�ДЗІЦЕ СЮДЫ, БЕЗ �ДП�ВЕД��Г� Д�ЗВОЛУ, М�ТЭРЫЯЛУ, ЯКІ �ХОЎВ�ЕЦЦ� �ЎТ�РСКІМ ПР�В�М!'''",
+'longpagewarning'                  => "'''УВ�Г�: Старонка да��гае аб'ёму $1 кілабайтаў; некаторы� браўзеры не адольваюць �таронак з аб'ёмам, блізкім ці большым за 32 kб.
+Падумайце, ці можна падз�ліць �таронку на некалькі меншых.'''",
+'longpageerror'                    => "'''П�МЫЛК�: немагчыма запі�аць ваш т�к�т, бо �го аб'ём $1 кілабайтаў, а дазволены мак�імум — $2 кілабайтаў.'''",
+'readonlywarning'                  => "'''УВ�Г�: зараз вы не можаце запі�аць �вае праўкі, таму што база даных зачынена на аб�лугоўванне. Магчыма, варта перане�ці ваш т�к�т у а�обны файл і запі�аць на потым.
+
+�дміні�тратар, �кі зачыніў базу, ра�тлумачыў г�та так: $1'''",
+'protectedpagewarning'             => "'''УВ�Г�:  Г�та� �таронка па�таўлена пад ахову, і таму �е могуць правіць толькі адміні�тратары. Праверце, ці Вы кіруеце�� [[{{ns:project}}:Праца з за�цераганымі �таронкамі|правіламі працы �а �таронкамі пад аховай]].'''",
 'semiprotectedpagewarning'         => "'''Увага:''' �таронка пад аховай, таму �е могуць правіць толькі р�гі�траваны� ўдзельнікі.",
 'cascadeprotectedwarning'          => "'''Увага:''' г�та� �таронка ахоўваецца, таму �е могуць правіць толькі ўдзельнікі з правамі адміні�тратара. Прычына аховы: улуч�нне г�тай �таронкі ў {{PLURAL:$1|�таронку, �ка� �таіць|�таронкі, �кі� �та�ць}} пад ка�каднай аховай:",
-'titleprotectedwarning'            => '<strong>УВ�Г�: Старонка была па�таўлена� пад такую ахову, што толькі некаторы� ўдзельнікі могуць �е правіць.</strong>',
+'titleprotectedwarning'            => "'''УВ�Г�: Старонка была па�таўлена� пад такую ахову, што толькі некаторы� ўдзельнікі могуць �е правіць.'''",
 'templatesused'                    => 'Шаблоны на г�тай �таронцы:',
 'templatesusedpreview'             => 'Шаблоны ў г�тым перадпаказе:',
 'templatesusedsection'             => 'Шаблоны ў г�тым раздзеле:',
@@ -670,11 +670,22 @@ $2',
 
 Тр�ба падумаць, ці варта далей працаваць з г�тай �таронкай.
 Во�ь журнал �ціранн�ў дл� г�тай �таронкі:",
+'deleted-notice'                   => 'Г�та� �таронка была �цёрта�.
+�іж�й паказаны журнал �ціранн�ў дл� г�тай �таронкі.',
+'deletelog-fulllog'                => 'Паказаць поўны журнал',
+'edit-hook-aborted'                => 'Праўка �пынена хукам (hook).
+Тлумач�нн�ў не было.',
+'edit-gone-missing'                => '�е ўдало�� абнавіць �таронку.
+Здаецца, што �на была �цёрта�.',
+'edit-conflict'                    => 'Канфлікт правак.',
+'edit-no-change'                   => 'Ваша� праўка была праігнаравана�, таму што не м�н�ў�� т�к�т.',
+'edit-already-exists'              => '�е ўдало�� �тварыць новую �таронку.
+Така� ўжо і�нуе.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Увага: �а �таронцы занадта шмат працаёмі�тых зваротаў да пар�ера.
+'expensive-parserfunction-warning'        => "Увага: �а �таронцы занадта шмат працаёмі�тых зваротаў да пар�ера.
 
-�алежыць мець меней за $2, а зараз ё�ць $1.',
+Тр�ба, каб зваротаў было меней за $2, а зараз ё�ць $1.<!--In this particular lingual case, there's no need for plurals at all, so let's make checker happy by adding commented out {{PLURAL:$2|call|calls}} and {{PLURAL:$1|is now $1 call|are now $1 calls}}-->",
 'expensive-parserfunction-category'       => 'Старонкі, дзе шмат працаёмі�тых зваротаў да пар�ера',
 'post-expand-template-inclusion-warning'  => "Увага: аб'ём улучанага шаблона занадта в�лікі. 
 �екаторы� шаблоны не будуць улучаны�.",
@@ -682,6 +693,8 @@ $2',
 'post-expand-template-argument-warning'   => 'Увага: на г�тай �таронцы ё�ць прынам�і адзін параметр шаблона, �кі занадта доўгі ў разгорнутым выгл�дзе.
 Такі� параметры былі прапушчаны�.',
 'post-expand-template-argument-category'  => 'Старонкі, на �кіх прапушчаны параметры шаблонаў',
+'parser-template-loop-warning'            => 'Цыклічнае ўключ�нне шаблона: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Вычарпаны ліміт глыбіні ўключ�нн� шаблонаў ($1)',
 
 # "Undo" feature
 'undo-success' => 'Праўку можна адкаціць, але праверце пап�р�дні паказ, што ніж�й, каб уп�ўніцца ў адпаведна�ці будучых зм�ненн�ў, і толькі тады запішыце іх, каб завершыць адкат праўкі.',
@@ -696,28 +709,27 @@ $2',
 Забарона зроблена ўдзельнікам [[User:$3|$3]], з такім тлумач�ннем: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Паказаць журналы дл� г�тай �таронкі',
-'nohistory'           => 'Старонка не мае гі�торыі правак.',
-'revnotfound'         => 'Вер�і� не знойдзена',
-'revnotfoundtext'     => '�е ўдало�� знай�ці ранейшую вер�ію г�тага артыкула, па �кую вы зв�рталі��.
-Праверце URL, праз �кі вы �прабавалі адкрыць �таронку.',
-'currentrev'          => '�ктуальна� вер�і�',
-'revisionasof'        => 'Вер�і� ад $1',
-'revision-info'       => 'Вер�і� ад $1, аўтар $2',
-'previousrevision'    => '� Пап�р�дн. вер�і�',
-'nextrevision'        => '�авейша� вер�і� →',
-'currentrevisionlink' => '�ктуальна� вер�і�',
-'cur'                 => 'з актуальн.',
-'next'                => 'на�туп.',
-'last'                => 'з пап�р�д.',
-'page_first'          => 'перш.',
-'page_last'           => 'апошн.',
-'histlegend'          => 'Выбар розніцы: адзначце радыё-бок�ы вер�ій, �кі� тр�ба параўнаць і наці�ніце enter або кнопку, што ўнізе.<br /> Тлумач�нне: (з актуальн.) = розніца з актуальнай вер�і�й, (з пап�р�д.) = розніца з пап�р�дн�й вер�і�й, д = дробна� праўка.',
-'deletedrev'          => '[�цёрта�]',
-'histfirst'           => 'Самае �тарое',
-'histlast'            => 'Самае новае',
-'historysize'         => '({{PLURAL:$1|1 байт|$1 байтаў}})',
-'historyempty'        => '(пу�та)',
+'viewpagelogs'           => 'Паказаць журналы дл� г�тай �таронкі',
+'nohistory'              => 'Старонка не мае гі�торыі правак.',
+'currentrev'             => '�ктуальна� вер�і�',
+'currentrev-asof'        => '�ктуальна� вер�і� на $1',
+'revisionasof'           => 'Вер�і� ад $1',
+'revision-info'          => 'Вер�і� ад $1, аўтар $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Пап�р�дн. вер�і�',
+'nextrevision'           => '�авейша� вер�і� →',
+'currentrevisionlink'    => '�ктуальна� вер�і�',
+'cur'                    => 'з актуальн.',
+'next'                   => 'на�туп.',
+'last'                   => 'з пап�р�д.',
+'page_first'             => 'перш.',
+'page_last'              => 'апошн.',
+'histlegend'             => 'Выбар розніцы: адзначце радыё-бок�ы вер�ій, �кі� тр�ба параўнаць і наці�ніце enter або кнопку, што ўнізе.<br /> Тлумач�нне: (з актуальн.) = розніца з актуальнай вер�і�й, (з пап�р�д.) = розніца з пап�р�дн�й вер�і�й, д = дробна� праўка.',
+'history-fieldset-title' => 'Прагл�д гі�торыі',
+'deletedrev'             => '[�цёрта�]',
+'histfirst'              => 'Самае �тарое',
+'histlast'               => 'Самае новае',
+'historysize'            => '({{PLURAL:$1|1 байт|$1 байтаў}})',
+'historyempty'           => '(пу�та)',
 
 # Revision feed
 'history-feed-title'          => 'Гі�торы� вер�ій',
@@ -802,6 +814,7 @@ $2',
 'mergehistory-invalid-destination' => 'М�тава� �таронка павінна мець кар�ктную назву.',
 'mergehistory-autocomment'         => "�б'�днана [[:$1]] у �клад [[:$2]]",
 'mergehistory-comment'             => "�б'�днана [[:$1]] у �клад [[:$2]]: $3",
+'mergehistory-same-destination'    => '�ельга, каб выток і м�та былі аднолькавымі',
 
 # Merge log
 'mergelog'           => "Журнал аб'�днанн�ў",
@@ -814,119 +827,200 @@ $2',
 'difference'              => '(Розніца між вер�і�мі)',
 'lineno'                  => 'Радок $1:',
 'compareselectedversions' => 'Параўнаць азначаны� вер�іі',
+'visualcomparison'        => 'Параўнанне на від',
+'wikicodecomparison'      => 'Параўнанне вікі-т�к�таў',
 'editundo'                => 'адкат',
 'diff-multi'              => '(�е паказан{{PLURAL:$1|а адна прамежкава� вер�і�|ы $1 прамежкавых вер�ій}}.)',
+'diff-movedto'            => 'перане�ена ў $1',
+'diff-styleadded'         => 'дададзены �тыль $1',
+'diff-added'              => 'дададзена $1',
+'diff-changedto'          => 'заменена на $1',
+'diff-movedoutof'         => 'выне�ена з $1',
+'diff-styleremoved'       => 'зн�ты �тыль $1',
+'diff-removed'            => '�цёртае $1',
+'diff-changedfrom'        => 'заменена $1',
+'diff-src'                => 'выток',
+'diff-withdestination'    => 'з м�тай $1',
+'diff-with'               => '&#32;у параўнанні з $1 $2',
+'diff-with-final'         => '&#32;Ñ– $1 $2',
+'diff-width'              => 'шырын�',
+'diff-height'             => 'вышын�',
+'diff-p'                  => "'''абзац'''",
+'diff-blockquote'         => "'''цытата'''",
+'diff-h1'                 => "'''загаловак (1-ы ўзровень)'''",
+'diff-h2'                 => "'''загаловак (2-і ўзровень)'''",
+'diff-h3'                 => "'''загаловак (3-і ўзровень)'''",
+'diff-h4'                 => "'''загаловак (4-ы ўзровень)'''",
+'diff-h5'                 => "'''загаловак (5-ы ўзровень)'''",
+'diff-pre'                => "'''�амафарматаваны блок'''",
+'diff-div'                => "'''падзел'''",
+'diff-ul'                 => "'''непарадкаваны �пі�'''",
+'diff-ol'                 => "'''упарадкаваны �пі�'''",
+'diff-li'                 => "'''�кладнік �пі�у'''",
+'diff-table'              => "'''табліца'''",
+'diff-tbody'              => "'''зме�ціва табліцы'''",
+'diff-tr'                 => "'''радок'''",
+'diff-td'                 => "'''клетка'''",
+'diff-th'                 => "'''загаловак'''",
+'diff-br'                 => "'''разрыў'''",
+'diff-hr'                 => "'''гарызантальна� ліні�'''",
+'diff-code'               => "'''блок камп'ютарнага т�к�ту'''",
+'diff-dl'                 => "'''�пі� вызнач�нн�ў'''",
+'diff-dt'                 => "'''т�рмін у �кладзе вызнач�нн�'''",
+'diff-dd'                 => "'''вызнач�нне'''",
+'diff-input'              => "'''увод'''",
+'diff-form'               => "'''фармул�р'''",
+'diff-img'                => "'''вы�ва'''",
+'diff-span'               => "'''аб��г'''",
+'diff-a'                  => "'''�па�ылка'''",
+'diff-i'                  => "'''кур�іў'''",
+'diff-b'                  => "'''цёмны'''",
+'diff-strong'             => "'''моцна выдзелена'''",
+'diff-em'                 => "'''выдзелена'''",
+'diff-font'               => "'''шрыфт'''",
+'diff-big'                => "'''в�лікі'''",
+'diff-del'                => "'''�цёрта'''",
+'diff-tt'                 => "'''роўнашырокі'''",
+'diff-sub'                => "'''ніжні інд�к�'''",
+'diff-sup'                => "'''верхні інд�к�'''",
+'diff-strike'             => "'''перакр��лена'''",
 
 # Search results
-'searchresults'             => 'Вынікі пошуку',
-'searchresulttext'          => 'Больш падраб�зна пра пошук на {{SITENAME}}: [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Вы шукалі \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|у�е назвы, што пачынаюцца з "$1"]] | [[Special:WhatLinksHere/$1|у�е назвы, што �па�ылаюцца на "$1"]])',
-'searchsubtitleinvalid'     => "Вы шукалі '''$1'''",
-'noexactmatch'              => "'''��ма �таронкі з назвай \"\$1\".''' Вы можаце �е [[:\$1|�тварыць]].",
-'noexactmatch-nocreate'     => "'''��ма �таронкі з назвай \"\$1\".'''",
-'toomanymatches'            => 'Знойдзена занадта шмат адпаведна�ц�ў, па�прабуйце зм�ніць шуканае.',
-'titlematches'              => 'Знойдзена ў назвах',
-'notitlematches'            => '�ічога не знойдзена ў назвах',
-'textmatches'               => 'Знойдзена ў т�к�тах',
-'notextmatches'             => '�ічога не знойдзена ў т�к�тах �таронак',
-'prevn'                     => 'пап�р�дн. $1',
-'nextn'                     => 'на�туп. $1',
-'viewprevnext'              => 'Гл. ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 �лова|$2 �ловаў}})',
-'search-result-score'       => '�дпаведна�ць: $1%',
-'search-redirect'           => '(пера�ылка $1)',
-'search-section'            => '(падраздзел $1)',
-'search-suggest'            => 'Ці хацелі вы �казаць: $1',
-'search-interwiki-caption'  => 'Сумежны� праекты',
-'search-interwiki-default'  => 'вынікі з $1:',
-'search-interwiki-more'     => '(�шч�)',
-'search-mwsuggest-enabled'  => 'з прапановамі',
-'search-mwsuggest-disabled' => 'без прапановаў',
-'search-relatedarticle'     => 'Дачын�юцца*',
-'mwsuggest-disable'         => '�е паказваць прапановаў AJAX',
-'searchrelated'             => 'маюць дачыненне',
-'searchall'                 => 'у�е',
-'showingresults'            => "�іж�й паказаны да {{PLURAL:$1|'''1''' выніку|'''$1''' вынікаў}}, пачынаючы з нумару '''$2'''.",
-'showingresultsnum'         => "�іж�й паказаны{{PLURAL:$3| '''1''' вынік|� '''$3''' вынікаў}}, пачынаючы з нумару #'''$2'''.",
-'showingresultstotal'       => "�іж�й паказаны{{PLURAL:$3| вынік '''$1''' з ліку '''$3'''|� вынікі '''$1 - $2''' з ліку '''$3'''}}",
-'nonefound'                 => "'''Увага''': прадвызначана пошук в�дзецца толькі ў некаторых пра�торах назваў. Па�прабуйце прыпі�аць да �вайго звароту пачатковае ''all:'', каб шукаць ва ў�ім зме�це (у размовах, шаблонах і г.д.), або прыпішыце да звароту патр�бную пра�тору назваў.",
-'powersearch'               => 'Знай�ці',
-'powersearch-legend'        => 'Падраб�зны пошук',
-'powersearch-ns'            => 'Шукаць у пра�торах назваў:',
-'powersearch-redir'         => 'Паказваць пера�ылкі (р�дыр�кты)',
-'powersearch-field'         => 'Што шукаць',
-'search-external'           => 'Вонкавы пошук',
-'searchdisabled'            => 'Функцы� пошуку {{SITENAME}} не працуе. Тымча�ова можна шукаць з дапамогай Google. Заўважце, што тамт�йшы� інд�к�ы зме�ту {{SITENAME}} могуць не быць актуальнымі.',
+'searchresults'                    => 'Вынікі пошуку',
+'searchresults-title'              => 'Вынікі пошуку «$1»',
+'searchresulttext'                 => 'Больш падраб�зна пра пошук на {{SITENAME}}: [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Вы шукалі \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|у�е назвы, што пачынаюцца з "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|у�е назвы, што �па�ылаюцца на "$1"]])',
+'searchsubtitleinvalid'            => "Вы шукалі '''$1'''",
+'noexactmatch'                     => "'''��ма �таронкі з назвай \"\$1\".''' Вы можаце �е [[:\$1|�тварыць]].",
+'noexactmatch-nocreate'            => "'''��ма �таронкі з назвай \"\$1\".'''",
+'toomanymatches'                   => 'Знойдзена занадта шмат адпаведна�ц�ў, па�прабуйце зм�ніць шуканае.',
+'titlematches'                     => 'Знойдзена ў назвах',
+'notitlematches'                   => '�ічога не знойдзена ў назвах',
+'textmatches'                      => 'Знойдзена ў т�к�тах',
+'notextmatches'                    => '�ічога не знойдзена ў т�к�тах �таронак',
+'prevn'                            => 'пап�р�дн. $1',
+'nextn'                            => 'на�туп. $1',
+'viewprevnext'                     => 'Гл. ($1) ($2) ($3).',
+'searchmenu-legend'                => '�а�таўленні пошуку',
+'searchmenu-exists'                => "'''�а вікі ё�ць �таронка \"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''Стварыць на г�тай вікі �таронку \"[[:\$1]]\"'''",
+'searchhelp-url'                   => 'Help:Зме�т',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Паказаць �таронкі з г�тым пр�фік�ам]]',
+'searchprofile-articles'           => '�ртыкулы',
+'searchprofile-articles-and-proj'  => '�ртыкулы і �таронкі праекта',
+'searchprofile-project'            => 'Старонкі праекта',
+'searchprofile-images'             => 'Файлы',
+'searchprofile-everything'         => 'У�ё',
+'searchprofile-advanced'           => 'Складана',
+'searchprofile-articles-tooltip'   => 'Шукаць у $1',
+'searchprofile-project-tooltip'    => 'Шукаць у $1',
+'searchprofile-images-tooltip'     => 'Шукаць файлы',
+'searchprofile-everything-tooltip' => 'Шукаць паў�юль (так�ама ў размовах)',
+'searchprofile-advanced-tooltip'   => 'Шукаць у дадатковых пра�торах назваў',
+'prefs-search-nsdefault'           => 'Шукаць �тандартна:',
+'prefs-search-nscustom'            => 'Шукаць у дадатковых пра�торах назваў:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 �лова|$2 �ловаў}})',
+'search-result-score'              => '�дпаведна�ць: $1%',
+'search-redirect'                  => '(пера�ылка $1)',
+'search-section'                   => '(падраздзел $1)',
+'search-suggest'                   => 'Ці хацелі вы �казаць: $1',
+'search-interwiki-caption'         => 'Сумежны� праекты',
+'search-interwiki-default'         => 'вынікі з $1:',
+'search-interwiki-more'            => '(�шч�)',
+'search-mwsuggest-enabled'         => 'з прапановамі',
+'search-mwsuggest-disabled'        => 'без прапановаў',
+'search-relatedarticle'            => 'Дачын�юцца*',
+'mwsuggest-disable'                => '�е паказваць прапановаў AJAX',
+'searchrelated'                    => 'маюць дачыненне',
+'searchall'                        => 'у�е',
+'showingresults'                   => "�іж�й паказаны да {{PLURAL:$1|'''1''' выніку|'''$1''' вынікаў}}, пачынаючы з нумару '''$2'''.",
+'showingresultsnum'                => "�іж�й паказаны{{PLURAL:$3| '''1''' вынік|� '''$3''' вынікаў}}, пачынаючы з нумару #'''$2'''.",
+'showingresultstotal'              => "�іж�й паказаны{{PLURAL:$4| вынік '''$1''' з ліку '''$3'''|� вынікі '''$1 - $2''' з ліку '''$3'''}}",
+'nonefound'                        => "'''Увага''': прадвызначана пошук в�дзецца толькі ў некаторых пра�торах назваў. Па�прабуйце прыпі�аць да �вайго звароту пачатковае ''all:'', каб шукаць ва ў�ім зме�це (у размовах, шаблонах і г.д.), або прыпішыце да звароту патр�бную пра�тору назваў.",
+'search-nonefound'                 => '�ічога не было знойдзена.',
+'powersearch'                      => 'Знай�ці',
+'powersearch-legend'               => 'Падраб�зны пошук',
+'powersearch-ns'                   => 'Шукаць у пра�торах назваў:',
+'powersearch-redir'                => 'Паказваць пера�ылкі (р�дыр�кты)',
+'powersearch-field'                => 'Што шукаць',
+'search-external'                  => 'Вонкавы пошук',
+'searchdisabled'                   => 'Функцы� пошуку {{SITENAME}} не працуе. Тымча�ова можна шукаць з дапамогай Google. Заўважце, што тамт�йшы� інд�к�ы зме�ту {{SITENAME}} могуць не быць актуальнымі.',
 
 # Preferences page
-'preferences'              => '�а�таўленні',
-'mypreferences'            => '�а�тáўленні',
-'prefs-edits'              => 'Колька�ць правак:',
-'prefsnologin'             => '�е ўвайшлі',
-'prefsnologintext'         => '�алежыць <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} увай�ці ў �і�т�му]</span>, каб м�н�ць �вае на�таўленні.',
-'prefsreset'               => '�а�таўленні вернуты да пачатковых з архіву.',
-'qbsettings'               => 'Хутка� �тужка',
-'qbsettings-none'          => '��ма',
-'qbsettings-fixedleft'     => 'Прымацавана злева',
-'qbsettings-fixedright'    => 'Прымацавана �права',
-'qbsettings-floatingleft'  => 'Плавае злева',
-'qbsettings-floatingright' => 'Плавае �права',
-'changepassword'           => 'Пароль',
-'skin'                     => 'Вокладка',
-'math'                     => 'Мат�матыка',
-'dateformat'               => 'Фармат даты',
-'datedefault'              => '�е вызначана',
-'datetime'                 => 'Дата і ча�',
-'math_failure'             => '�е ўдало�� разабраць',
-'math_unknown_error'       => 'нев�дома� памылка',
-'math_unknown_function'    => 'нев�дома� функцы�',
-'math_lexing_error'        => 'лек�ічна� памылка',
-'math_syntax_error'        => 'памылка �інтак�і�у',
-'math_image_error'         => '�е ўдало�� ператварыць PNG; праверце правільна�ць ін�тал�цыі пакетаў latex, dvips, gs, convert',
-'math_bad_tmpdir'          => '�емагчыма запі�аць у або �тварыць тымча�овы каталог дл� мат�матыкі',
-'math_bad_output'          => '�емагчыма запі�аць у або �тварыць выводны каталог дл� мат�матыкі',
-'math_notexvc'             => '�е знойдзены выканальны модуль texvc; аб �го на�таўленн�х чытайце ў math/README.',
-'prefs-personal'           => 'Удзельнік',
-'prefs-rc'                 => '{{:{{ns:mediawiki}}:Recentchanges/be}}',
-'prefs-watchlist'          => 'Спі� назіранага',
-'prefs-watchlist-days'     => 'За колькі дзён паказваць зм�ненні ў назіраным:',
-'prefs-watchlist-edits'    => 'Колька�ць правак дл� паказу ў разгорнутым выгл�дзе:',
-'prefs-misc'               => 'Рознае',
-'saveprefs'                => 'Запі�аць',
-'resetprefs'               => 'Да пачатковых',
-'oldpassword'              => 'Стары пароль:',
-'newpassword'              => '�овы пароль:',
-'retypenew'                => '�овы пароль паўторна:',
-'textboxsize'              => 'Праца',
-'rows'                     => 'Радкі:',
-'columns'                  => 'Калонкі:',
-'searchresultshead'        => 'Пошук',
-'resultsperpage'           => 'Вынікаў на �таронку:',
-'contextlines'             => 'Радкоў на вынік:',
-'contextchars'             => 'Кант�к�ту на радок:',
-'stub-threshold'           => 'Парог дл� паказу �па�ылкі <a href="#" class="stub">�к на пачатковы артыкул</a> (у байтах):',
-'recentchangesdays'        => 'За колькі дзён паказваць {{lc:{{:{{ns:mediawiki}}:recentchanges/be}}}}:',
-'recentchangescount'       => 'Колька�ць правак дл� паказу ў н�даўніх зм�ненн�х, гі�торыі і журналах:',
-'savedprefs'               => '�а�тáўленні замацаваны�.',
-'timezonelegend'           => 'Ча�авы по��',
-'timezonetext'             => '¹�а колькі гадзін м��цовы ча� адрозніваецца ад �ервернага (UTC).',
-'localtime'                => 'М��цовы ча�',
-'timezoneoffset'           => 'Розніца¹',
-'servertime'               => 'Ча� на �ерверы',
-'guesstimezone'            => 'Як у браўзеры',
-'allowemail'               => '�трымліваць �л.пошту ад іншых удзельнікаў',
-'prefs-searchoptions'      => 'Магчыма�ці пошуку',
-'prefs-namespaces'         => 'Пра�торы назваў',
-'defaultns'                => 'Шукаць у г�тых пра�торах назваў, калі не загадана іначай:',
-'default'                  => 'прадвызнач�нні',
-'files'                    => 'Файлы',
+'preferences'               => '�а�таўленні',
+'mypreferences'             => '�а�тáўленні',
+'prefs-edits'               => 'Колька�ць правак:',
+'prefsnologin'              => '�е ўвайшлі',
+'prefsnologintext'          => '�алежыць <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} увай�ці ў �і�т�му]</span>, каб м�н�ць �вае на�таўленні.',
+'prefsreset'                => '�а�таўленні вернуты да пачатковых з архіву.',
+'qbsettings'                => 'Хутка� �тужка',
+'qbsettings-none'           => '��ма',
+'qbsettings-fixedleft'      => 'Прымацавана злева',
+'qbsettings-fixedright'     => 'Прымацавана �права',
+'qbsettings-floatingleft'   => 'Плавае злева',
+'qbsettings-floatingright'  => 'Плавае �права',
+'changepassword'            => 'Пароль',
+'skin'                      => 'Вокладка',
+'skin-preview'              => 'перадпаказ',
+'math'                      => 'Мат�матыка',
+'dateformat'                => 'Фармат даты',
+'datedefault'               => '�е вызначана',
+'datetime'                  => 'Дата і ча�',
+'math_failure'              => '�е ўдало�� разабраць',
+'math_unknown_error'        => 'нев�дома� памылка',
+'math_unknown_function'     => 'нев�дома� функцы�',
+'math_lexing_error'         => 'лек�ічна� памылка',
+'math_syntax_error'         => 'памылка �інтак�і�у',
+'math_image_error'          => '�е ўдало�� ператварыць PNG; праверце правільна�ць ін�тал�цыі пакетаў latex, dvips, gs, convert',
+'math_bad_tmpdir'           => '�емагчыма запі�аць у або �тварыць тымча�овы каталог дл� мат�матыкі',
+'math_bad_output'           => '�емагчыма запі�аць у або �тварыць выводны каталог дл� мат�матыкі',
+'math_notexvc'              => '�е знойдзены выканальны модуль texvc; аб �го на�таўленн�х чытайце ў math/README.',
+'prefs-personal'            => 'Удзельнік',
+'prefs-rc'                  => '{{:{{ns:mediawiki}}:Recentchanges/be}}',
+'prefs-watchlist'           => 'Спі� назіранага',
+'prefs-watchlist-days'      => 'За колькі дзён паказваць зм�ненні ў назіраным:',
+'prefs-watchlist-days-max'  => '(найбольш 7 дзён)',
+'prefs-watchlist-edits'     => 'Колька�ць правак дл� паказу ў разгорнутым выгл�дзе:',
+'prefs-watchlist-edits-max' => '(мак�імум: 1000)',
+'prefs-misc'                => 'Рознае',
+'prefs-resetpass'           => 'Зм�ніць пароль',
+'saveprefs'                 => 'Запі�аць',
+'resetprefs'                => 'Да пачатковых',
+'textboxsize'               => 'Праца',
+'prefs-edit-boxsize'        => 'Памер р�дактар�кага акна.',
+'rows'                      => 'Радкі:',
+'columns'                   => 'Калонкі:',
+'searchresultshead'         => 'Пошук',
+'resultsperpage'            => 'Вынікаў на �таронку:',
+'contextlines'              => 'Радкоў на вынік:',
+'contextchars'              => 'Кант�к�ту на радок:',
+'stub-threshold'            => 'Парог дл� паказу �па�ылкі <a href="#" class="stub">�к на пачатковы артыкул</a> (у байтах):',
+'recentchangesdays'         => 'За колькі дзён паказваць {{lc:{{:{{ns:mediawiki}}:recentchanges/be}}}}:',
+'recentchangesdays-max'     => '(найбольш $1 {{PLURAL:$1|дзень|дзён}})',
+'recentchangescount'        => 'Прадвызначана� колька�ць правак дл� паказу ў н�даўніх зм�ненн�х, гі�торы�х �таронак і журналах:',
+'savedprefs'                => '�а�тáўленні замацаваны�.',
+'timezonelegend'            => 'Ча�авы по��',
+'timezonetext'              => '¹�а колькі гадзін м��цовы ча� адрозніваецца ад �ервернага (UTC).',
+'localtime'                 => 'М��цовы ча�:',
+'timezoneselect'            => 'Ча�авы по��:',
+'timezoneuseserverdefault'  => 'Як на �ерверы',
+'timezoneuseoffset'         => 'Інша� розніца',
+'timezoneoffset'            => 'Розніца¹:',
+'servertime'                => 'Ча� на �ерверы:',
+'guesstimezone'             => 'Як у браўзеры',
+'allowemail'                => '�трымліваць �л.пошту ад іншых удзельнікаў',
+'prefs-searchoptions'       => 'Магчыма�ці пошуку',
+'prefs-namespaces'          => 'Пра�торы назваў',
+'defaultns'                 => 'Шукаць у г�тых пра�торах назваў, калі не загадана іначай:',
+'default'                   => 'прадвызнач�нні',
+'files'                     => 'Файлы',
 
 # User rights
 'userrights'                  => 'Ра�парадж�нне правамі ўдзельніка', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Ра�параджацца групамі ўдзельнікаў',
 'userrights-user-editname'    => 'Ув�дзіце ім� ўдзельніка:',
 'editusergroup'               => 'Правіць групы ўдзельнікаў',
-'editinguser'                 => "Папраўл�юцца дазволы дл� ўдзельніка '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "М�н�юцца дазволы дл� ўдзельніка '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Ра�параджацца групамі ўдзельніка',
 'saveusergroups'              => 'Захаваць групы ўдзельнікаў',
 'userrights-groupsmember'     => 'У групе:',
@@ -975,6 +1069,8 @@ $2',
 'right-minoredit'            => '�значаць праўкі �к дробны�',
 'right-move'                 => 'Перано�іць �таронкі',
 'right-move-subpages'        => 'Перано�іць �таронкі разам з пад-�таронкамі',
+'right-move-rootuserpages'   => 'Перано�іць каранёвы� �таронкі ўдзельнікаў',
+'right-movefile'             => 'Перано�іць файлы',
 'right-suppressredirect'     => '�е пакідаць пера�ылку �а �тарой назвы па�л� перано�у �таронкі',
 'right-upload'               => 'Укладваць файлы',
 'right-reupload'             => 'Запі�ваць паўзверх і�нуючага файла',
@@ -1025,10 +1121,47 @@ $2',
 'rightslogentry' => 'зменена групава� прыналежна�ць $1 з $2 на $3',
 'rightsnone'     => '(н�ма)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'чытаць г�тую �таронку',
+'action-edit'                 => 'правіць г�тую �таронку',
+'action-createpage'           => '�твараць �таронкі',
+'action-createtalk'           => '�твараць размоўны� �таронкі',
+'action-createaccount'        => '�твараць г�ты рахунак удзельніка',
+'action-minoredit'            => 'значыць г�тую праўку �к дробную',
+'action-move'                 => 'перано�іць г�тую �таронку',
+'action-move-subpages'        => 'перано�іць г�тую �таронку і �е пад-�таронкі',
+'action-move-rootuserpages'   => 'перано�іць каранёвы� �таронкі ўдзельнікаў',
+'action-movefile'             => 'перане�ці г�ты файл',
+'action-upload'               => 'укладваць г�ты файл',
+'action-reupload'             => 'запі�ваць паўзверх г�тага файла',
+'action-reupload-shared'      => 'запі�ваць паўзверх г�тага файла ў �упольным �ховішчы',
+'action-upload_by_url'        => 'укладаць г�ты файл з адра�у URL',
+'action-writeapi'             => 'ужываць API запі�ванн�',
+'action-delete'               => '�ціраць г�тую �таронку',
+'action-deleterevision'       => '�ціраць г�тую вер�ію',
+'action-deletedhistory'       => 'бачыць �цёртую гі�торыю г�тай �таронкі',
+'action-browsearchive'        => 'шукаць у �цёртых �таронках',
+'action-undelete'             => 'аднаўл�ць г�тую �таронку',
+'action-suppressrevision'     => 'бачыць і аднаўл�ць г�тую �хаваную вер�ію',
+'action-suppressionlog'       => 'бачыць г�ты прыватны журнал',
+'action-block'                => 'блакаваць праўкі г�тага ўдзельніка',
+'action-protect'              => 'м�н�ць узровень аховы г�тай �таронкі',
+'action-import'               => 'імпартаваць г�тую �таронку з іншай вікі',
+'action-importupload'         => 'імпартаваць г�тую �таронку з укладзенага файла',
+'action-patrol'               => 'значыць праўкі іншых �к ухвалены�',
+'action-autopatrol'           => 'атрымліваць знак ухвалена�ці на �вае праўкі',
+'action-unwatchedpages'       => 'бачыць �пі� неназіраных �таронак',
+'action-trackback'            => 'падаваць тр�к-б�к',
+'action-mergehistory'         => "аб'�дноўваць гі�торыю г�тай �таронкі",
+'action-userrights'           => 'м�н�ць у�е дазволы ўдзельніка',
+'action-userrights-interwiki' => 'м�н�ць дазволы ўдзельнікаў на іншых вікі',
+'action-siteadmin'            => 'зачын�ць і адчын�ць базу даных',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|мена|менаў}}',
 'recentchanges'                     => '��даўні� зм�ненні',
-'recentchangestext'                 => 'Сачыце за апошнімі зменамі ў {{GRAMMAR:ме�ны|{{SITENAME}}}} на г�тай �таронцы.',
+'recentchanges-legend'              => 'Магчыма�ці паказу',
+'recentchangestext'                 => 'Г�та апошні� мены на пл�цоўцы {{SITENAME}}.',
 'recentchanges-feed-description'    => 'Сачыць за найбольш актуальнымі зм�ненн�мі ў вік�е праз г�ты �трумень навін.',
 'rcnote'                            => "�іж�й паказан{{PLURAL:$1|а '''1''' зм�ненне|ы� апошні� '''$1''' зм�ненн�ў}} за апошні{{PLURAL:$2| дзень|� '''$2''' дзён}}, паводле �тану на $5, $4.",
 'rcnotefrom'                        => '�іж�й знаходз�цца змены з <b>$2</b> (да <b>$1</b> на �таронку).',
@@ -1051,6 +1184,8 @@ $2',
 'rc_categories'                     => '�бмежаваць кат�горы�мі (разм�жоўваць знакам "|")',
 'rc_categories_any'                 => 'У�е',
 'newsectionsummary'                 => '/* $1 */ новы падраздзел',
+'rc-enhanced-expand'                => 'Паказваць падраб�зна�ці (патрабуецца Ява�крыпт)',
+'rc-enhanced-hide'                  => '�е паказваць падраб�зна�ц�ў',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Зв�заны� праўкі',
@@ -1071,7 +1206,7 @@ $2',
 'upload_directory_missing'    => '��ма каталога дл� ўкладаў ($1), і �ерверу не ўдало�� �го �тварыць.',
 'upload_directory_read_only'  => '�емагчыма дл� веб-�ервера запі�аць у каталог укладаў ($1).',
 'uploaderror'                 => 'Памылка пры ўкладанні',
-'uploadtext'                  => "З дапамогай формы, паказанай ніж�й, можна ўкладваць файлы. Каб паказаць або каб знай�ці ўкладзенае раней, тр�ба перай�ці да [[Special:ImageList|�пі�у ўкладзеных файлаў]]; так�ама ўкладанні, паўторны� ўкладанні і �ціранні адзначаюцца ў [[Special:Log/upload|журнале укладанн�ў]].
+'uploadtext'                  => "З дапамогай формы, паказанай ніж�й, можна ўкладваць файлы. Каб паказаць або каб знай�ці ўкладзенае раней, тр�ба перай�ці да [[Special:FileList|�пі�у ўкладзеных файлаў]]; так�ама ўкладанні, паўторны� ўкладанні і �ціранні адзначаюцца ў [[Special:Log/upload|журнале укладанн�ў]].
 
 Каб у�тавіць файл ў �таронку, ужываецца �па�ылка, зроблена� адным з на�тупных �по�абаў:
 * '''<tt><nowiki>[[</nowiki>image<nowiki>:File.jpg]]</nowiki></tt>''' паказвае поўную вер�ію файла
@@ -1082,7 +1217,7 @@ $2',
 'upload-prohibited'           => 'Забаронены� тыпы файлаў: $1.',
 'uploadlog'                   => 'журнал укладанн�ў',
 'uploadlogpage'               => 'Журнал укладанн�ў',
-'uploadlogpagetext'           => '�іж�й паказаны �пі� [[Special:NewImages|н�даўна ўкладзеных]] файлаў.',
+'uploadlogpagetext'           => '�іж�й паказаны �пі� [[Special:NewFiles|н�даўна ўкладзеных]] файлаў.',
 'filename'                    => '�азва файла',
 'filedesc'                    => 'Тлумач�нне',
 'fileuploadsummary'           => 'Тлумач�нне:',
@@ -1102,22 +1237,23 @@ $2',
 'large-file'                  => 'Р�камендуецца, каб файлы былі не большы� за $1; г�ты файл ёміць $2.',
 'largefileserver'             => "Г�ты файл большага аб'ёму, чым дазвал�е канфігурацы� �ервера.",
 'emptyfile'                   => 'Здаецца, што файл, укладзены вамі, пу�ты. Магчыма, здарыла�� памылка ў назве файла? Праверце, ці вы �апраўды хацелі ўкла�ці менавіта г�ты файл.',
-'fileexists'                  => 'Ужо і�нуе файл з такою назвай, праверце <strong><tt>$1</tt></strong>, калі не ўп�ўнены, што жадаеце м�н�ць �го зме�ціва.',
-'filepageexists'              => "Дл� файла з такой назвай ужо і�нуе �таронка апі�анн� <strong><tt>$1</tt></strong>, але файла з такой назвай пакуль н�ма. �пі�анне, �кое вы ўпі�алі, не з'�віцца на �таронцы апі�анн�; каб �но там з'�віла��, тр�ба �ама�тойна паправіць тую �таронку.",
-'fileexists-extension'        => 'Ужо ё�ць файл з падобнай назвай:<br />
-�азва ўкладанага файла: <strong><tt>$1</tt></strong><br />
-�азва на�ўнага файла: <strong><tt>$2</tt></strong><br />
-Выберыце іншую назву.',
+'fileexists'                  => "Ужо і�нуе файл з такою назвай, праверце '''<tt>$1</tt>''', калі не ўп�ўнены, што жадаеце м�н�ць �го зме�ціва.",
+'filepageexists'              => "Дл� файла з такой назвай ужо і�нуе �таронка апі�анн� '''<tt>$1</tt>''', але файла з такой назвай пакуль н�ма. �пі�анне, �кое вы ўпі�алі, не з'�віцца на �таронцы апі�анн�; каб �но там з'�віла��, тр�ба �ама�тойна паправіць тую �таронку.",
+'fileexists-extension'        => "Ужо ё�ць файл з падобнай назвай:<br />
+�азва ўкладанага файла: '''<tt>$1</tt>'''<br />
+�азва на�ўнага файла: '''<tt>$2</tt>'''<br />
+Выберыце іншую назву.",
 'fileexists-thumb'            => "<center>'''І�ны тут файл'''</center>",
-'fileexists-thumbnail-yes'    => 'Файл падобны на вы�ву �карочанага памеру <i>(драбніца)</i>. Праверце файл <strong><tt>$1</tt></strong>.<br />
-Калі правераны файл мае зме�т і памеры, аднолькавы� з г�тым, то дадатковае ўкладанне драбніцы непатр�бнае.',
-'file-thumbnail-no'           => '�азва файла пачынаецца з <strong><tt>$1</tt></strong>.
-Так можа называцца вы�ва зменшанага памеру <i>(драбніца)</i>.
-Калі г�та� вы�ва �апраўды запі�ана� ў найлепшым разрозненні, �кое ё�ць, то ўкладайце �е, а іначай лепей пам�н�ць назву файла.',
-'fileexists-forbidden'        => 'Ужо і�нуе файл з такою назвай; калі ла�ка, паўтарыце прац�дуру ўкладанн� файла, але з іншай назвай. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Файл падобны на вы�ву �карочанага памеру ''(драбніца)''. Праверце файл '''<tt>$1</tt>'''.<br />
+Калі правераны файл мае зме�т і памеры, аднолькавы� з г�тым, то дадатковае ўкладанне драбніцы непатр�бнае.",
+'file-thumbnail-no'           => "�азва файла пачынаецца з '''<tt>$1</tt>'''.
+Так можа называцца вы�ва зменшанага памеру ''(драбніца)''.
+Калі г�та� вы�ва �апраўды запі�ана� ў найлепшым разрозненні, �кое ё�ць, то ўкладайце �е, а іначай лепей пам�н�ць назву файла.",
+'fileexists-forbidden'        => 'Файл з такой назвай ужо ё�ць, і нельга запі�аць паўзверх �го. Калі вы жадаеце абав�зкова ўкла�ці �вой файл, то выберыце новую назву. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'У агульным �ховішчы ўжо і�нуе файл з такою назвай.
-Калі вы жадаеце ў�ё ж укла�ці �вой файл, паўтарыце прац�дуру ўкладанн�, але з іншай назвай. [[Image:$1|thumb|center|$1]]',
+Калі вы жадаеце ў�ё ж укла�ці �вой файл, паўтарыце прац�дуру ўкладанн�, але з іншай назвай. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => "Г�ты файл з'�ўл�ецца дублікатам на�тупн{{PLURAL:$1|ага файла|ых файлаў}}:",
+'file-deleted-duplicate'      => 'Файл, падобны да г�тага ([[$1]]), быў �цёрты некалі раней. Тр�ба праверыць гі�торыю таго файла перад тым, �к укладваць �го нанова.',
 'successfulupload'            => 'Па�п�ховае ўкладанне',
 'uploadwarning'               => 'Пап�р�джанне пра ўкладанне',
 'savefile'                    => 'Запі�аць файл',
@@ -1137,7 +1273,7 @@ $2',
 
 Тр�ба падумаць, ці варта ўкладваць такі файл.
 Во�ь, дзел� даведкі, журнал �ціранн�ў:",
-'filename-bad-prefix'         => '�азва файла, �кі вы ўкладаеце, пачынаецца з <strong>"$1"</strong>, што падобна на аўтаматычны�, неінфарматыўны� назвы файлаў, �кі� роб�ць лічбавы� фотаапараты. Калі ла�ка, зм�ніце назву на больш зразумелую.',
+'filename-bad-prefix'         => "�азва файла, �кі вы ўкладаеце, пачынаецца з '''\"\$1\"''', што падобна на аўтаматычны�, неінфарматыўны� назвы файлаў, �кі� роб�ць лічбавы� фотаапараты. Калі ла�ка, зм�ніце назву на больш зразумелую.",
 
 'upload-proto-error'      => '��правільны пратакол',
 'upload-proto-error-text' => 'Укладанне файла зводдаль патрабуе URL, �кі пачынаецца з <code>http://</code> або <code>ftp://</code>.',
@@ -1158,20 +1294,21 @@ $2',
 'upload_source_url'  => ' (�апраўдны, публічна да��гальны URL)',
 'upload_source_file' => ' (файл на вашай машыне)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Тут паказаны� ў�е ўкладзены� файлы.
+# Special:ListFiles
+'listfiles-summary'     => 'Тут паказаны� ў�е ўкладзены� файлы.
 Прадвызначаны парадак такі, што апошні� файлы паказваюцца ўвер�е.
 Клік на загалоўку калонкі м�н�е парадак.',
-'imagelist_search_for'  => 'Знай�ці назву вы�вы:',
+'listfiles_search_for'  => 'Знай�ці назву вы�вы:',
 'imgfile'               => 'файл',
-'imagelist'             => 'У�е файлы',
-'imagelist_date'        => 'Дата',
-'imagelist_name'        => '�азва',
-'imagelist_user'        => 'Удзельнік',
-'imagelist_size'        => 'Памер у байтах',
-'imagelist_description' => '�пі�анне',
-
-# Image description page
+'listfiles'             => 'У�е файлы',
+'listfiles_date'        => 'Дата',
+'listfiles_name'        => '�азва',
+'listfiles_user'        => 'Удзельнік',
+'listfiles_size'        => 'Памер у байтах',
+'listfiles_description' => '�пі�анне',
+'listfiles_count'       => 'Вер�іі',
+
+# File description page
 'filehist'                       => 'Гі�торы� файла',
 'filehist-help'                  => '�аці�нуць на даце з ча�ам, каб паказаць файл, �кім ён тады быў.',
 'filehist-deleteall'             => 'выдаліць у�ё',
@@ -1179,12 +1316,18 @@ $2',
 'filehist-revert'                => 'адкаціць',
 'filehist-current'               => 'актуальн.',
 'filehist-datetime'              => 'Дата і ча�',
+'filehist-thumb'                 => 'Драбніца',
+'filehist-thumbtext'             => 'Драбніца вер�іі з $1',
+'filehist-nothumb'               => 'Без драбніцы',
 'filehist-user'                  => 'Удзельнік',
 'filehist-dimensions'            => 'Памеры',
 'filehist-filesize'              => "�б'ём файла",
 'filehist-comment'               => 'Тлумач�нне',
-'imagelinks'                     => 'Спа�ылкі',
+'imagelinks'                     => 'Спа�ылкі на файл',
 'linkstoimage'                   => '�а�тупн{{PLURAL:$1|а� �таронка �па�ылаецца|ы� $1 �таронкі �па�ылаюцца}} на г�ты файл:',
+'linkstoimage-more'              => '�а г�ты файл і�нуюць �па�ылкі з больш �к $1 {{PLURAL:$1|�таронкі|�таронак}}.
+�а�тупны пералік паказвае толькі {{PLURAL:$1|першую �па�ылку|першы� $1 з іх}}.
+Так�ама ё�ць [[Special:WhatLinksHere/$2|поўны пералік]].',
 'nolinkstoimage'                 => '��ма �таронак, �кі� б �па�ылалі�� на файл.',
 'morelinkstoimage'               => 'Паказаць [[Special:WhatLinksHere/$1|больш �па�ылак]] на г�ты файл.',
 'redirectstofile'                => "�а�тупны{{PLURAL:$1| файл з'�ўл�ецца пера�ылкай|� $1 файлы з'�ўл�юцца пера�ылкамі}} да г�тага файла:",
@@ -1215,7 +1358,7 @@ $2',
 # File deletion
 'filedelete'                  => 'Выдаліць $1',
 'filedelete-legend'           => 'Выдаліць файл',
-'filedelete-intro'            => "Вы �ціраеце '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Вы збіраеце�� �церці файл '''[[Media:$1|$1]]''' разам з у�ёй �го гі�торы�й.",
 'filedelete-intro-old'        => "Вы �ціраеце вер�ію '''[[Media:$1|$1]]''' з [$4 $3, $2].",
 'filedelete-comment'          => 'Каментарый:',
 'filedelete-submit'           => 'Выдаліць',
@@ -1223,7 +1366,6 @@ $2',
 'filedelete-success-old'      => "Вер�і� '''[[Media:$1|$1]]''' з $3, $2 была �цёрта�.",
 'filedelete-nofile'           => "��і�ны файл '''$1'''.",
 'filedelete-nofile-old'       => "�е і�нуе архіўнай (�тар�йшай) вер�іі '''$1''' з такімі атрыбутамі.",
-'filedelete-iscurrent'        => 'Вы �прабуеце �церці актуальную вер�ію г�тага файла. Спачатку тр�ба адкаціць �го да адной �а �тар�йшых вер�ій.',
 'filedelete-otherreason'      => 'Інша�/дадаткова� прычына:',
 'filedelete-reason-otherlist' => 'Інша� прычына',
 'filedelete-reason-dropdown'  => '*Звычайны� прычыны �ціранн�
@@ -1250,29 +1392,31 @@ $2',
 
 # Random page
 'randompage'         => 'Выпадкова� �таронка',
-'randompage-nopages' => '��ма �таронак у г�тай пра�торы назваў.',
+'randompage-nopages' => '��ма �таронак у пра�торы назваў "$1".',
 
 # Random redirect
 'randomredirect'         => 'Выпадкова� пера�ылка',
-'randomredirect-nopages' => '��ма пера�ылак у г�тай пра�торы назваў.',
+'randomredirect-nopages' => '��ма пера�ылак у пра�торы назваў "$1".',
 
 # Statistics
-'statistics'             => 'Статы�тыка',
-'sitestats'              => '{{SITENAME}}: �таты�тычны� зве�ткі',
-'userstats'              => 'Статы�тыка ўдзельніка',
-'sitestatstext'          => "У базе даных {{PLURAL:\$1|'''1''' �таронка|'''\$1''' �таронак}}.
-У г�ты лік уваходз�ць �таронкі \"размовы\", �таронкі, �кі� датычаць �амой пл�цоўкі {{SITENAME}}, �таронкі-накіды, �таронкі-пера�ылкі і іншы� �таронкі, не ў�е з �кіх, магчыма, адно��цца да ліку зме�тавых.
-
-Па-за г�тым, {{PLURAL:\$2|'''1''' �таронка адно�іцца|'''\$2''' �таронак адно��цца}}, відаць, да ліку артыкулаў<!--{{PLURAL:\$2|page|pages}}-->.
-
-Сюды ўкладзены� '''\$8''' {{PLURAL:\$8|файл|файлы}}.
-
-Па�л� ін�тал�цыі {{SITENAME}} �таронкі прагл�далі�� '''\$3''' {{PLURAL:\$3|раз|разоў}}, і правілі�� '''\$4''' {{PLURAL:\$4|раз|разоў}}.
-Г�та дае, у ��р�днім, '''\$5''' правак на �таронку і '''\$6''' прагл�даў на зм�ненне.
-
-�б'ём [http://www.mediawiki.org/wiki/Manual:Job_queue чаргі апрацоўкі задач] �кладае '''\$7'''.",
-'userstatstext'          => "Тут {{PLURAL:$1|'''1''' р�гі�траваны [[Special:ListUsers|ўдзельнік]]|'''$1''' р�гі�траваных [[Special:ListUsers|удзельнікаў]]}}, з �кіх '''$2''' ('''$4%''') {{PLURAL:$2|мае|маюць}} правы ''$5''.",
-'statistics-mostpopular' => 'Самы� папул�рны� �таронкі',
+'statistics'                   => 'Статы�тыка',
+'statistics-header-pages'      => 'Статы�тыка �таронак',
+'statistics-header-edits'      => 'Статы�тыка правак',
+'statistics-header-views'      => 'Статы�тыка паказаў',
+'statistics-header-users'      => 'Статы�тыка ўдзельніка',
+'statistics-articles'          => 'Зм��тоўны� �таронкі',
+'statistics-pages'             => 'Старонкі',
+'statistics-pages-desc'        => 'У�е �таронкі, разам з размовамі, пера�ылкамі і інш.',
+'statistics-files'             => 'Укладзены� файлы',
+'statistics-edits'             => 'Праўкі �таронак ад ча�у ін�тал�цыі {{SITENAME}}',
+'statistics-edits-average'     => 'Колька�ць правак на 1 �таронку',
+'statistics-views-total'       => 'У�е паказы',
+'statistics-views-peredit'     => 'Колька�ць паказаў на 1 праўку',
+'statistics-jobqueue'          => 'Даўжын� [http://www.mediawiki.org/wiki/Manual:Job_queue чаргі задач]',
+'statistics-users'             => 'Registered [[Special:ListUsers|users]]',
+'statistics-users-active'      => '�ктыўны� ўдзельнікі',
+'statistics-users-active-desc' => 'Удзельнікі, �кі� хоць нешта зрабілі за апошн{{PLURAL:$1|і дзень|і� $1 дзён}}',
+'statistics-mostpopular'       => 'Самы� папул�рны� �таронкі',
 
 'disambiguations'      => '�еадназначна�ці',
 'disambiguationspage'  => '[[Шаблон:�еадназначна�ць]]',
@@ -1286,7 +1430,7 @@ $2',
 'double-redirect-fixer'      => 'Выпраўл�льнік пера�ылак',
 
 'brokenredirects'        => 'Паламаны� пера�ылкі',
-'brokenredirectstext'    => '�а�тупны� пера�ылкі �па�ылаюцца на неі�нуючы� �таронкі:',
+'brokenredirectstext'    => 'Г�ты� пера�ылкі паказваюць на �таронкі, �кіх н�ма:',
 'brokenredirects-edit'   => '(правіць)',
 'brokenredirects-delete' => '(выдаліць)',
 
@@ -1316,26 +1460,30 @@ $2',
 'popularpages'            => 'Папул�рны� �таронкі',
 'wantedcategories'        => 'Вельмі патр�бны� кат�горыі',
 'wantedpages'             => 'Вельмі патр�бны� �таронкі',
-'missingfiles'            => '��і�ны� файлы',
+'wantedfiles'             => 'Патр�бны� файлы',
+'wantedtemplates'         => 'Патр�бны� шаблоны',
 'mostlinked'              => 'Старонкі, на �кі� найча�цей �па�ылаюцца',
 'mostlinkedcategories'    => 'Кат�горыі з найбольшай колька�цю �кладнікаў',
 'mostlinkedtemplates'     => 'Шаблоны ў ча�тым выкары�танні',
 'mostcategories'          => '�ртыкулы ў найбольшай кольк. кат�горый',
 'mostimages'              => 'Вы�вы ў ча�тым выкары�танні',
 'mostrevisions'           => '�ртыкулы з найбольшай колька�цю вер�ій',
-'prefixindex'             => 'Пошук �таронак па пачатку назвы',
+'prefixindex'             => 'Старонкі з назвамі на ўзор',
 'shortpages'              => "Старонкі малога аб'ёму",
 'longpages'               => "Старонкі в�лікага аб'ёму",
 'deadendpages'            => 'Старонкі без �па�ылак',
 'deadendpagestext'        => 'Спі� �таронак без �па�ылак на тут�йшы� артыкулы.',
 'protectedpages'          => 'Старонкі пад аховай',
 'protectedpages-indef'    => 'Толькі бе�т�рміновы� аховы',
+'protectedpages-cascade'  => 'Толькі ка�кадны� за�цераганні',
 'protectedpagestext'      => 'Г�ты� �таронкі ахоўваюцца ад правак і перано�аў',
 'protectedpagesempty'     => '�і�кі� �таронкі такім чынам не ахоўваюцца.',
 'protectedtitles'         => '�азвы пад аховай',
 'protectedtitlestext'     => 'Г�ты� назвы ахоўваюцца ад �твар�нн�',
 'protectedtitlesempty'    => '��ма назваў, �кі� зараз бы ахоўвалі�� з такімі параметрамі.',
 'listusers'               => 'У�е ўдзельнікі',
+'listusers-editsonly'     => 'Толькі ўдзельнікі, �кі� маюць праўкі',
+'usereditcount'           => '$1 {{PLURAL:$1|праўка|праўкі}}',
 'newpages'                => '�овы� �таронкі',
 'newpages-username'       => 'Ім� ўдзельніка:',
 'ancientpages'            => '�ай�тар�йшы� �таронкі',
@@ -1356,14 +1504,13 @@ $2',
 'booksources-search-legend' => 'Знай�ці, дзе купіць кнігі',
 'booksources-go'            => 'Пошук',
 'booksources-text'          => '�іж�й паказаны пералік �па�ылак на іншы� �еціўны� пл�цоўкі, �кі� прадаюць новы� і б/у кнігі, і, магчыма, маюць больш зве�так пра кнігі, �кіх вы шукаеце:',
+'booksources-invalid-isbn'  => 'Г�ты ISBN не выгл�дае правільным; праверце правільна�ць капіраванн� з арыгіналу.',
 
 # Special:Log
 'specialloguserlabel'  => 'Удзельнік:',
 'speciallogtitlelabel' => 'Загаловак:',
 'log'                  => 'Журналы',
 'all-logs-page'        => 'У�е журналы',
-'log-search-legend'    => 'Знай�ці ў журналах',
-'log-search-submit'    => 'І�ці',
 'alllogstext'          => "Супольны паказ у�іх магчымых журналаў на пл�цоўцы {{SITENAME}}.
 Можна звузіць аб'ём паказу, выбіраючы тып журнала, ім� ўдзельніка (з улікам р�гі�тру літар) або �таронкі (так�ама з улікам р�гі�тру).",
 'logempty'             => '�ічога адпаведнага ў журнале не знойдзена.',
@@ -1375,12 +1522,13 @@ $2',
 'nextpage'          => '�а�тупна� �таронка ($1)',
 'prevpage'          => 'Пап�р�дн�� �таронка ($1)',
 'allpagesfrom'      => 'Паказваць �таронкі ад:',
+'allpagesto'        => 'Паказваць �таронкі, з �кіх апошн��:',
 'allarticles'       => 'У�е артыкулы',
 'allinnamespace'    => 'У�е артыкулы (пра�тора назваў $1)',
 'allnotinnamespace' => 'У�е �таронкі (не ў пра�торы назваў $1)',
 'allpagesprev'      => 'Пап�р�дн�е',
 'allpagesnext'      => '�а�тупнае',
-'allpagessubmit'    => 'І�ці',
+'allpagessubmit'    => 'Пераход',
 'allpagesprefix'    => 'Паказваць �таронкі з пр�фік�ам:',
 'allpagesbadtitle'  => 'Г�та� назва �таронкі недапушчальна� або ўтрымлівае між-моўны або між-вікавы пр�фік�. Магчыма, у назве ё�ць знак ці знакі, �кі� нельга ўжываць у назвах.',
 'allpages-bad-ns'   => '�а {{SITENAME}} пра�тора назваў "$1" не падтрымліваецца.',
@@ -1394,41 +1542,69 @@ $2',
 'special-categories-sort-count' => 'пд. колька�ці',
 'special-categories-sort-abc'   => 'пд. алфавіту',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Выдалены ўклад удзельніка',
+
+# Special:LinkSearch
+'linksearch'       => 'Вонкавы� �па�ылкі',
+'linksearch-pat'   => 'Што шукаецца:',
+'linksearch-ns'    => 'Пра�тора назваў:',
+'linksearch-ok'    => 'Знай�ці',
+'linksearch-text'  => 'Можна кары�тацца ўзорамі, напрыклад, "*.wikipedia.org".<br />
+Падтрымліваюцца пратаколы: <tt>$1</tt>',
+'linksearch-line'  => '$1, на �кі �па�ылаецца $2',
+'linksearch-error' => 'Узоры можна �тавіць толькі ў пачатак адра�у.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Паказаць удзельнікаў, пачаўшы з:',
 'listusers-submit'   => 'Паказаць',
 'listusers-noresult' => 'Удзельнікі не знойдзены�.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Журнал р�гі�трацыі ўдзельнікаў',
+'newuserlogpagetext'          => 'Г�та журнал р�гі�трацыі новых удзельнікаў.',
+'newuserlog-byemail'          => 'пароль ада�ланы �л.поштай',
+'newuserlog-create-entry'     => '�овы ўдзельнік',
+'newuserlog-create2-entry'    => '�твораны новы рахунак $1',
+'newuserlog-autocreate-entry' => 'Рахунак �твораны аўтаматычна',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Дазволы дл� груп удзельнікаў',
-'listgrouprights-summary'  => 'Г�ты пералік вызначаных у г�тай вікі груп удзельнікаў, разам з прыпі�анымі ім дазволамі.
+'listgrouprights'                 => 'Дазволы дл� груп удзельнікаў',
+'listgrouprights-summary'         => 'Г�ты пералік вызначаных у г�тай вікі груп удзельнікаў, разам з прыпі�анымі ім дазволамі.
 Даведацца больш пра а�абі�ты� дазволы можна на �таронцы [[{{MediaWiki:Listgrouprights-helppage}}]].',
-'listgrouprights-group'    => 'Група',
-'listgrouprights-rights'   => 'Дазволы',
-'listgrouprights-helppage' => 'Help:Дазволы ў групах',
-'listgrouprights-members'  => '(пералік удзельнікаў)',
+'listgrouprights-group'           => 'Група',
+'listgrouprights-rights'          => 'Дазволы',
+'listgrouprights-helppage'        => 'Help:Дазволы ў групах',
+'listgrouprights-members'         => '(пералік удзельнікаў)',
+'listgrouprights-addgroup'        => 'Можа дадаць {{PLURAL:$2|групу|групы}}: $1',
+'listgrouprights-removegroup'     => 'Можа зн�ць {{PLURAL:$2|групу|групы}}: $1',
+'listgrouprights-addgroup-all'    => 'Можа дадаць у�е групы',
+'listgrouprights-removegroup-all' => 'Можа зн�ць у�е групы',
 
 # E-mail user
-'mailnologin'     => '��ма �л.адра�у',
-'mailnologintext' => 'Тр�ба [[Special:UserLogin|ўвай�ці ў �і�т�му]] і мець пацверджаны адра� �л.пошты ў �ваіх [[Special:Preferences|на�тáўленн�х]], каб �лаць �л.пошту іншым удзельнікам.',
-'emailuser'       => 'Эл.пошта ўдзельніка',
-'emailpage'       => 'Зварот да ўдзельніка праз �л.пошту',
-'emailpagetext'   => 'Тут можна вы�лаць �л.пошту г�таму ўдзельніку.
+'mailnologin'      => '��ма �л.адра�у',
+'mailnologintext'  => 'Тр�ба [[Special:UserLogin|ўвай�ці ў �і�т�му]] і мець пацверджаны адра� �л.пошты ў �ваіх [[Special:Preferences|на�тáўленн�х]], каб �лаць �л.пошту іншым удзельнікам.',
+'emailuser'        => 'Эл.пошта ўдзельніка',
+'emailpage'        => 'Зварот да ўдзельніка праз �л.пошту',
+'emailpagetext'    => 'Тут можна вы�лаць �л.пошту г�таму ўдзельніку.
 �дра� �л.пошты, уведзены вамі ў [[Special:Preferences|�ваіх на�таўленн�х]], з\'�віцца ў полі "From" вашага лі�та, і атрымальнік зможа адказаць на ваш лі�т.',
-'usermailererror' => "Паштовы аб'ект паведамл�е пра памылку:",
-'defemailsubject' => '�л.пошта {{SITENAME}}',
-'noemailtitle'    => '��ма адра�а �лектроннай пошты',
-'noemailtext'     => 'Удзельнік не паведаміў кар�ктнага адра�у �л.пошты, або не жадае атрымліваць �л.пошту ад іншых удзельнікаў.',
-'emailfrom'       => '�д каго:',
-'emailto'         => 'Каму:',
-'emailsubject'    => 'Т�ма:',
-'emailmessage'    => 'Т�к�т:',
-'emailsend'       => '�да�лаць',
-'emailccme'       => '�трымаць копію �вайго лі�та.',
-'emailccsubject'  => 'Копі� Вашага лі�та да $1: $2',
-'emailsent'       => 'Эл.пошта ада�лана',
-'emailsenttext'   => 'Ваш лі�т �л.пошты быў ада�ланы.',
-'emailuserfooter' => 'Г�ты �л.лі�т быў вы�ланы ад $1 да $2 праз функцыю "{{:{{ns:mediawiki}}:emailuser/be}}" пл�цоўкі {{SITENAME}}.',
+'usermailererror'  => "Паштовы аб'ект паведамл�е пра памылку:",
+'defemailsubject'  => '�л.пошта {{SITENAME}}',
+'noemailtitle'     => '��ма адра�а �лектроннай пошты',
+'noemailtext'      => 'Удзельнік не паведаміў кар�ктнага адра�у �л.пошты.',
+'nowikiemailtitle' => '�е дазволена� �л.пошта',
+'nowikiemailtext'  => 'Г�ты ўдзельнік не жадае атрымліваць �л.пошты ад іншых удзельнікаў.',
+'email-legend'     => '�да�лаць �л.лі�т іншаму ўдзельніку праекта {{SITENAME}}',
+'emailfrom'        => '�д каго:',
+'emailto'          => 'Каму:',
+'emailsubject'     => 'Т�ма:',
+'emailmessage'     => 'Т�к�т:',
+'emailsend'        => '�да�лаць',
+'emailccme'        => '�трымаць копію �вайго лі�та.',
+'emailccsubject'   => 'Копі� Вашага лі�та да $1: $2',
+'emailsent'        => 'Эл.пошта ада�лана',
+'emailsenttext'    => 'Ваш лі�т �л.пошты быў ада�ланы.',
+'emailuserfooter'  => 'Г�ты �л.лі�т быў вы�ланы ад $1 да $2 праз функцыю "{{:{{ns:mediawiki}}:emailuser/be}}" пл�цоўкі {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Мой �пі� назіранага',
@@ -1461,12 +1637,7 @@ $2',
 'iteminvalidname'      => "Праблема �а �кладнікам '$1', недапушчальна� назва...",
 'wlnote'               => "�іж�й паказан{{PLURAL:$1|а апошн�е зм�ненне|ы� апошні� '''$1''' зм�ненн�ў}} за апошн{{PLURAL:$2|юю гадзіну|і� '''$2''' гадзін}}.",
 'wlshowlast'           => 'Паказваць апошні� $1 гадз. $2 дзён $3',
-'watchlist-show-bots'  => 'паказваць праўкі робатаў',
-'watchlist-hide-bots'  => 'не паказваць правак робатаў',
-'watchlist-show-own'   => 'паказваць мае праўкі',
-'watchlist-hide-own'   => 'не паказваць маіх правак',
-'watchlist-show-minor' => 'паказваць дробны� праўкі',
-'watchlist-hide-minor' => 'не паказваць дробных правак',
+'watchlist-options'    => 'Магчыма�ці назіранн�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Дапі�ваецца да назіранага...',
@@ -1505,77 +1676,96 @@ $NEWPAGE
 Зваротна� �ув�зь і далейша� дапамога:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Сцерці �таронку',
-'confirm'                     => 'Пацвердзіць',
-'excontent'                   => "т�к�т быў: '$1'",
-'excontentauthor'             => "т�к�т быў: '$1' (і адзіны аўтар: '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "зме�ціва перад ачы�ткаю было: '$1'",
-'exblank'                     => '�таронка была пу�той',
-'delete-confirm'              => 'Сцерці "$1"',
-'delete-legend'               => 'Сцерці',
-'historywarning'              => 'Увага: Старонка, �кую вы хочаце �церці, мае гі�торыю:',
-'confirmdeletetext'           => 'Вы збіраеце�� �церці �таронку разам з ц�лай �е гі�торы�й правак.
+# Delete
+'deletepage'             => 'Сцерці �таронку',
+'confirm'                => 'Пацвердзіць',
+'excontent'              => "т�к�т быў: '$1'",
+'excontentauthor'        => "т�к�т быў: '$1' (і адзіны аўтар: '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "зме�ціва перад ачы�ткаю было: '$1'",
+'exblank'                => '�таронка была пу�той',
+'delete-confirm'         => 'Сцерці "$1"',
+'delete-legend'          => 'Сцерці',
+'historywarning'         => 'Увага: Старонка, �кую вы хочаце �церці, мае гі�торыю:',
+'confirmdeletetext'      => 'Вы збіраеце�� �церці �таронку разам з ц�лай �е гі�торы�й правак.
 Пацвердзіце �вой намер зрабіць г�та, �ваё разуменне на�туп�тваў, і што вы робіце г�та ў адпаведна�ці з [[{{MediaWiki:Policy-url}}|палітыкай (а�ноўнымі правіламі)]].',
-'actioncomplete'              => 'Завершана аперацы�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" было выдалена.
+'actioncomplete'         => 'Завершана аперацы�',
+'deletedtext'            => '"<nowiki>$1</nowiki>" было выдалена.
 Бач $2 па журнал н�даўніх выдаленн�ў.',
-'deletedarticle'              => '�цёрты "[[$1]]"',
-'suppressedarticle'           => 'падаўлены "[[$1]]"',
-'dellogpage'                  => 'Журнал �ціранн�ў',
-'dellogpagetext'              => '�іж�й паказаны �пі� �амых н�даўніх �ціранн�ў.',
-'deletionlog'                 => 'журнал �ціранн�ў',
-'reverted'                    => '�дкочана да ранейшай вер�іі',
-'deletecomment'               => 'Прычына �ціранн�',
-'deleteotherreason'           => 'Іншы/дадатковы повад:',
-'deletereasonotherlist'       => 'Іншы повад',
-'deletereason-dropdown'       => '*Звычайны� прычыны �ціранн�
+'deletedarticle'         => '�цёрты "[[$1]]"',
+'suppressedarticle'      => 'падаўлены "[[$1]]"',
+'dellogpage'             => 'Журнал �ціранн�ў',
+'dellogpagetext'         => '�іж�й паказаны �пі� �амых н�даўніх �ціранн�ў.',
+'deletionlog'            => 'журнал �ціранн�ў',
+'reverted'               => '�дкочана да ранейшай вер�іі',
+'deletecomment'          => 'Прычына �ціранн�',
+'deleteotherreason'      => 'Іншы/дадатковы повад:',
+'deletereasonotherlist'  => 'Іншы повад',
+'deletereason-dropdown'  => '*Звычайны� прычыны �ціранн�
 ** Жаданне аўтара т�к�ту
 ** Паруш�нне аўтар�кага права
 ** Вандалізм',
-'delete-edit-reasonlist'      => 'Правіць прычыны �ціранн�',
-'delete-toobig'               => 'Старонка мае в�лікую гі�торыю правак, больш за $1 {{PLURAL:$1|вер�ію|вер�ій}}. Сціранне такіх �таронак было абмежавана, каб пазбегчы ўтвар�нн� выпадковых перашкод працы {{SITENAME}}.',
-'delete-warning-toobig'       => 'Старонка мае в�лікую гі�торыю правак, больш за $1 {{PLURAL:$1|вер�ію|вер�ій}}. Сціранне такіх �таронак можа перашкодзіць працы базы даных {{SITENAME}}; будзьце а�ц�рожнымі.',
-'rollback'                    => '�дкаціць праўкі',
-'rollback_short'              => '�дкат',
-'rollbacklink'                => 'адкат',
-'rollbackfailed'              => '�е ўдало�� адкаціць',
-'cantrollback'                => '�емагчыма адкаціць праўку; апошні аўтар г�та адзіны аўтар на г�тай �таронцы.',
-'alreadyrolled'               => '�емагчыма адкаціць апошнюю праўку ў [[$1]]
-аўтар�тва [[User:$2|$2]] ([[User talk:$2|Размова]]); за г�ты ча� нехта іншы ўжо правіў або адкатваў �таронку.
-
-�ўтар�тва апошн�й праўкі: [[User:$3|$3]] ([[User talk:$3|Размова]]).',
-'editcomment'                 => 'Тлумач�нне праўкі: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Праўкі аўтар�тва [[Special:Contributions/$2|$2]] ([[User talk:$2|размова]]) адкочаны�; вернута апошн�� вер�і� аўтар�тва [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '�дкочаны праўкі $1; вернута апошн�� вер�і� $2.',
-'sessionfailure'              => 'Магчыма, ё�ць праблемы з вашым �еан�ам працы ў �і�т�ме. Таму вам было адмоўлена ў выкананні дзе�нн�, каб за�церагчы�� ад захопу �еан�а. �аці�ніце "�азад", і перачытайце �таронку, з �кой вы �юды прыйшлі, тады па�прабуйце нанова.',
+'delete-edit-reasonlist' => 'Правіць прычыны �ціранн�',
+'delete-toobig'          => 'Старонка мае в�лікую гі�торыю правак, больш за $1 {{PLURAL:$1|вер�ію|вер�ій}}. Сціранне такіх �таронак было абмежавана, каб пазбегчы ўтвар�нн� выпадковых перашкод працы {{SITENAME}}.',
+'delete-warning-toobig'  => 'Старонка мае в�лікую гі�торыю правак, больш за $1 {{PLURAL:$1|вер�ію|вер�ій}}. Сціранне такіх �таронак можа перашкодзіць працы базы даных {{SITENAME}}; будзьце а�ц�рожнымі.',
+
+# Rollback
+'rollback'         => '�дкаціць праўкі',
+'rollback_short'   => '�дкат',
+'rollbacklink'     => 'адкат',
+'rollbackfailed'   => '�е ўдало�� адкаціць',
+'cantrollback'     => '�емагчыма адкаціць праўку; апошні аўтар г�та адзіны аўтар на г�тай �таронцы.',
+'alreadyrolled'    => '�емагчыма адкаціць апошнюю праўку ў [[:$1]], аўтар�тва [[User:$2|$2]] ([[User talk:$2|Talk]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
+з таго ча�у нехта іншы правіў або адкатваў г�тую �таронку.
+
+�пошн�� праўка �таронкі была аўтар�тва [[User:$3|$3]] ([[User talk:$3|Talk]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Тлумач�нне праўкі было: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Праўкі аўтар�тва [[Special:Contributions/$2|$2]] ([[User talk:$2|размова]]) адкочаны�; вернута апошн�� вер�і� аўтар�тва [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '�дкочаны праўкі $1; вернута апошн�� вер�і� $2.',
+'sessionfailure'   => 'Магчыма, ё�ць праблемы з вашым �еан�ам працы ў �і�т�ме. Таму вам было адмоўлена ў выкананні дзе�нн�, каб за�церагчы�� ад захопу �еан�а. �аці�ніце "�азад", і перачытайце �таронку, з �кой вы �юды прыйшлі, тады па�прабуйце нанова.',
+
+# Protect
 'protectlogpage'              => 'Журнал аховы',
 'protectlogtext'              => '�іж�й паказана� хроніка па�таноўкі �таронак пад ахову і здыманн� з іх аховы. Гл. [[Special:ProtectedPages|пералік �таронак пад аховай]], каб бачыць актуальную ахову �таронак.',
 'protectedarticle'            => 'пад аховай «[[$1]]»',
 'modifiedarticleprotection'   => 'зменены ўзровень аховы "[[$1]]"',
 'unprotectedarticle'          => 'зн�та� ахова з "[[$1]]"',
+'movedarticleprotection'      => 'на�таўленні аховы перане�ены� з "[[$2]]" у "[[$1]]"',
 'protect-title'               => '�хова «$1»',
+'prot_1movedto2'              => '[[$1]] перане�ена ў [[$2]]',
 'protect-legend'              => 'Пацверджанне пачатку аховы',
 'protectcomment'              => 'Прычына па�таноўкі пад ахову',
 'protectexpiry'               => 'Канчаецца:',
 'protect_expiry_invalid'      => '�едапушчальны ча� �канч�нн�.',
 'protect_expiry_old'          => 'Ча� �канч�нн� — у мінулым.',
 'protect-unchain'             => 'Дазволіць перано�ы',
-'protect-text'                => 'Тут можна пабачыць і паправіць узровень аховы дл� �таронкі <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Вы заблакаваны і не можаце м�н�ць узроўн�ў аховы. Во�ь актуальны� на�таўленні дл� �таронкі <strong>$1</strong>:',
-'protect-locked-dblock'       => '�емагчыма м�н�ць узроўні аховы, таму што база даных зараз зачынена.
-Во�ь актуальны� на�таўленні аховы дл� �таронкі <strong>$1</strong>:',
-'protect-locked-access'       => 'Ваш рахунак не мае дазволаў, патр�бных каб м�н�ць ахову �таронкі.
-Во�ь актуальны� на�таўленні дл� �таронкі <strong>$1</strong>:',
+'protect-text'                => "Тут можна пабачыць і паправіць узровень аховы дл� �таронкі '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Вы заблакаваны і не можаце м�н�ць узроўн�ў аховы. Во�ь актуальны� на�таўленні дл� �таронкі '''$1''':",
+'protect-locked-dblock'       => "�емагчыма м�н�ць узроўні аховы, таму што база даных зараз зачынена.
+Во�ь актуальны� на�таўленні аховы дл� �таронкі '''$1''':",
+'protect-locked-access'       => "Ваш рахунак не мае дазволаў, патр�бных каб м�н�ць ахову �таронкі.
+Во�ь актуальны� на�таўленні дл� �таронкі '''$1''':",
 'protect-cascadeon'           => 'Старонка зараз ахоўваецца, таму што ўлучана ў на�тупн{{PLURAL:$1|ую �таронку, на �кую|ы� �таронкі, на �кі�}} па�таўлена ка�кадна� ахова. Можна зм�ніць узровень аховы г�тай �таронкі, але вынікаў ка�каднай аховы г�та не пераможа.',
-'protect-default'             => '(прадвызначана)',
+'protect-default'             => 'Дазвал�ць у�ім удзельнікам',
 'protect-fallback'            => 'Патрабуецца дазвол "$1"',
-'protect-level-autoconfirmed' => 'Забарона дл� нер�гі�траваных удзельнікаў',
+'protect-level-autoconfirmed' => 'Забаран�ць новым і нер�гі�траваным удзельнікам',
 'protect-level-sysop'         => 'Толькі дл� адміні�тратараў',
 'protect-summary-cascade'     => 'ка�кад',
 'protect-expiring'            => '�кончыцца $1 (UTC)',
+'protect-expiry-indefinite'   => 'б��конца',
 'protect-cascade'             => 'Ка�кад - ахоўваць так�ама і ў�е ты� �таронкі, �кі ўлучаюцца ў г�тую.',
 'protect-cantedit'            => 'Вы не можаце зм�ніць узроўню за�цераганн� г�тай �таронкі, таму што не маеце дазволу, каб правіць �е.',
+'protect-othertime'           => 'Іншы ча�:',
+'protect-othertime-op'        => 'іншы ча�',
+'protect-existing-expiry'     => 'Вызначаны ча� �канч�нн�: $3, $2',
+'protect-otherreason'         => 'Інша� ці дадаткова� прычына:',
+'protect-otherreason-op'      => 'інша� ці дадаткова� прычына',
+'protect-dropdown'            => '*Звычайны� прычыны па�таноўкі аховы
+** Празмерны ўзровень вандалізму
+** Празмерны ўзровень �паму
+** Шкодна� вайна правак
+** Старонка з вы�окай наведвальна�цю',
+'protect-edit-reasonlist'     => 'Правіць прычыну аховы',
+'protect-expiry-options'      => '2 гадзіны:2 hours,1 дзень:1 day,3 дні:3 days,1 тыдзень:1 week,2 тыдні:2 weeks,1 ме��ц:1 month,3 ме��цы:3 months,6 ме��цаў:6 months,1 год:1 year,назаў�ёды:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Дазвол:',
 'restriction-level'           => '�бмежаванне на ўзроўні:',
 'minimum-size'                => "Мін. аб'ём",
@@ -1598,7 +1788,8 @@ $NEWPAGE
 'undeletepage'                 => 'Паказаць і аднавіць �цёрты� �таронкі',
 'undeletepagetitle'            => "'''�а�тупнае �кладаецца �а �цёртых вер�ій [[:$1]]'''.",
 'viewdeletedpage'              => 'Паказаць �цёрты� �таронкі',
-'undeletepagetext'             => '�а�тупны� �таронкі былі �цёрты�, але за�таюцца ў архіве і могуць быць адноўлены; аднак архіў можа перы�дычна ачышчацца.',
+'undeletepagetext'             => '�а�тупн{{PLURAL:$1|а� �таронка была �цёрта�, але за�таецца ў архіве і можа быць адноўлена�|ы� $1 �таронкі былі �цёрты�, але за�таюцца ў архіве і могуць быць адноўлены}}
+�рхіў можа перы�дычна ачышчацца.',
 'undelete-fieldset-title'      => '�днавіць вер�іі',
 'undeleteextrahelp'            => "Каб аднавіць гі�торыю �таронкі цалкам, пакіньце ў�е палі выбару без адзнак і наці�ніце '''''�днавіць'''''. Каб аднавіць вер�іі на выбар, па�таўце адзнакі ў патр�бных пал�х і наці�ніце '''''�днавіць'''''. �аці�канне '''''Да пачатковага''''' ачы�ціць і поле тлумач�нн�, і ў�е палі выбару.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|вер�і�|вер�ій}} з архіву',
@@ -1606,12 +1797,13 @@ $NEWPAGE
 Калі па�л� �ціранн� �тварала�� нова� �таронка з такой �амай назвай, то адноўлены� вер�іі з'�в�цца ў �е гі�торыі перад ча�ам �твар�нн� новай �таронкі.",
 'undeleterevdel'               => '�днаўленне не будзе выконвацца, калі ў �го выніку была б ча�ткова �цёрта� найноўша� вер�і� �таронкі або файла. У такіх выпадках тр�ба зн�ць выбар з �амых н�даўніх �цёртых вер�ій або дазволіць іх паказ.',
 'undeletehistorynoadmin'       => 'Г�та� �таронка была �цёрта�. Прычына �ціранн� паказана� ў ніж�й, разам з падраб�зна�ц�мі пра ўдзельнікаў, �кі� правілі �таронку перад �ціраннем. Сам т�к�т �цёртых вер�ій да�тупны толькі адміні�тратарам.',
-'undelete-revision'            => 'Сцёрта� вер�і� $1 (на $2); �цёр $3:',
+'undelete-revision'            => 'Сцёрта� вер�і� $1 (на момант $4 $5) аўтар�тва $3:',
 'undeleterevision-missing'     => '�екар�ктна� ці неі�нуюча� вер�і�. Магчыма, �прабавала�� н�правільна� �па�ылка, або вер�і� была адноўлена ці выдалена з архіву.',
 'undelete-nodiff'              => '�е знойдзены ні�кі� пап�р�дні� вер�іі.',
 'undeletebtn'                  => '�днавіць',
 'undeletelink'                 => 'аднавіць',
 'undeletereset'                => 'Да пачатковага',
+'undeleteinvert'               => 'Перав�рнуць выбранае',
 'undeletecomment'              => 'Каментар:',
 'undeletedarticle'             => 'адноўлены "[[$1]]"',
 'undeletedrevisions'           => '�дноўлен{{PLURAL:$1|а 1 вер�і�|ы� $1 вер�ій}}',
@@ -1643,26 +1835,27 @@ $1',
 'blanknamespace' => '(�ртыкулы)',
 
 # Contributions
-'contributions' => 'Уклад удзельніка',
-'mycontris'     => 'Уклад',
-'contribsub2'   => 'Дл� $1 ($2)',
-'nocontribs'    => '�е знойдзена менаў, адпаведных зададзеным параметрам.',
-'uctop'         => '(апошн.)',
-'month'         => '�д ме��цу (і раней):',
-'year'          => '�д году (і раней):',
-
-'sp-contributions-newbies'     => 'Паказваць толькі ўклады з новых рахункаў',
-'sp-contributions-newbies-sub' => 'З новых рахункаў',
-'sp-contributions-blocklog'    => 'Журнал забаронаў',
-'sp-contributions-search'      => 'Знай�ці ўклад',
-'sp-contributions-username'    => '�дра� IP або ім� ўдзельніка:',
-'sp-contributions-submit'      => 'Пошук',
+'contributions'       => 'Уклад удзельніка',
+'contributions-title' => 'Уклад удзельніка $1',
+'mycontris'           => 'Уклад',
+'contribsub2'         => 'Дл� $1 ($2)',
+'nocontribs'          => '�е знойдзена менаў, адпаведных зададзеным параметрам.',
+'uctop'               => '(апошн.)',
+'month'               => '�д ме��цу (і раней):',
+'year'                => '�д году (і раней):',
+
+'sp-contributions-newbies'       => 'Паказваць толькі ўклады з новых рахункаў',
+'sp-contributions-newbies-sub'   => 'З новых рахункаў',
+'sp-contributions-newbies-title' => 'Уклады ўдзельнікаў з новых рахункаў',
+'sp-contributions-blocklog'      => 'Журнал забаронаў',
+'sp-contributions-search'        => 'Знай�ці ўклад',
+'sp-contributions-username'      => '�дра� IP або ім� ўдзельніка:',
+'sp-contributions-submit'        => 'Пошук',
 
 # What links here
 'whatlinkshere'            => 'Сюды �па�ылаюцца',
 'whatlinkshere-title'      => 'Старонкі, �кі� �па�ылаюцца на "$1"',
 'whatlinkshere-page'       => 'Старонка:',
-'linklistsub'              => '(�пі� �па�ылак)',
 'linkshere'                => "Старонкі, �кі� �па�ылаюцца на '''[[:$1]]''':",
 'nolinkshere'              => "��ма �таронак, �кі� б �па�ылалі�� на '''[[:$1]]'''.",
 'nolinkshere-ns'           => "��ма �таронак, �кі� б �па�ылалі�� на '''[[:$1]]''' у г�тай пра�торы назваў.",
@@ -1708,6 +1901,8 @@ $1',
 'ipbotherreason'                  => 'Інша�/дадаткова� прычына:',
 'ipbhidename'                     => '�е паказваць ім� ўдзельніка ў журнале блокаў, пераліку актыўных блокаў і ў �пі�е ўдзельнікаў',
 'ipbwatchuser'                    => '�азіраць ула�ную і размоўную �таронкі г�тага ўдзельніка',
+'ipballowusertalk'                => 'Дазвал�ць удзельніку правіць ула�ную размоўную �таронку, калі �ам удзельнік заблакаваны',
+'ipb-change-block'                => 'Зм�ніць на�таўленні блакаванн� ўдзельніка',
 'badipaddress'                    => '�едапушчальны адра� IP',
 'blockipsuccesssub'               => 'Па�п�ховае блакаванне',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] быў заблакаваны.<br />
@@ -1717,14 +1912,18 @@ $1',
 'ipb-unblock'                     => 'Зн�ць блок з ім� ўдзельніка або адра�у IP',
 'ipb-blocklist-addr'              => '�а�ўны� блокі дл� $1',
 'ipb-blocklist'                   => 'Паказаць на�ўны� блокі',
+'ipb-blocklist-contribs'          => 'Уклад $1',
 'unblockip'                       => 'Зн�ць блок з удзельніка',
 'unblockiptext'                   => 'У форме, што ніж�й, можна в�рнуць дазвол на запі� дл� раней заблакаванага адра�у IP або ўдзельніка.',
-'ipusubmit'                       => 'Зн�ць блок з адра�а',
+'ipusubmit'                       => 'Зн�ць г�ты блок',
 'unblocked'                       => '[[User:$1|$1]] быў адблакаваны',
 'unblocked-id'                    => 'Блок $1 быў зн�ты',
 'ipblocklist'                     => 'У�е заблакаваны� IP-адра�ы і ўдзельнікі',
 'ipblocklist-legend'              => 'Знай�ці заблакаванага ўдзельніка',
 'ipblocklist-username'            => 'Удзельнік або адра� IP:',
+'ipblocklist-sh-userblocks'       => '$1 блокаў на рахунак',
+'ipblocklist-sh-tempblocks'       => '$1 тымча�овых блокаў',
+'ipblocklist-sh-addressblocks'    => '$1 блокаў на адзінкавы IP',
 'ipblocklist-submit'              => 'Шукаць',
 'blocklistline'                   => '$1, $2 заблакаваны $3 ($4)',
 'infiniteblock'                   => 'б��конца',
@@ -1733,25 +1932,32 @@ $1',
 'noautoblockblock'                => 'аўтаблок не дазволены',
 'createaccountblock'              => '�твар�нне рахунку заблакавана',
 'emailblock'                      => '�л.пошта заблакавана',
+'blocklist-nousertalk'            => 'не мае дазволу правіць ула�ную �таронку размоваў',
 'ipblocklist-empty'               => 'Спі� блокаў зараз пу�ты.',
 'ipblocklist-no-results'          => '��ма блокаў на такі адра� IP або на такое ім� ўдзельніка.',
 'blocklink'                       => 'заблакаваць',
 'unblocklink'                     => 'адблакаваць',
+'change-blocklink'                => 'зм�ніць блок',
 'contribslink'                    => 'уклад',
 'autoblocker'                     => '�ўтаматычны блок таму што вашым адра�ам IP н�даўна кары�таў�� "[[User:$1|$1]]". Блакаванне $1\'s патлумачана так: "\'\'\'$2\'\'\'"',
 'blocklogpage'                    => 'Журнал блокаў',
+'blocklog-fulllog'                => 'Поўны журнал блокаў',
 'blocklogentry'                   => 'па�таўлены блок на "[[$1]]", з ча�ам трыванн� $2 $3',
+'reblock-logentry'                => 'зменены� на�таўленні блока дл� [[$1]] з ча�ам зга�анн� $2 $3',
 'blocklogtext'                    => 'Журнал па�таноўкі і здыманн� блокаў. �ўтаматычна блакаваны� адра�ы IP тут не паказваюцца. Спі� актуальных забарон і блокаў бач у [[Special:IPBlockList|�пі�е блокаў IP]].',
 'unblocklogentry'                 => 'зн�ты блок з $1',
 'block-log-flags-anononly'        => 'толькі ананімны� ўдзельнікі',
 'block-log-flags-nocreate'        => '�твар�нне рахунку не дазволена',
 'block-log-flags-noautoblock'     => 'аўта-блок не дазволены',
 'block-log-flags-noemail'         => 'па�таўлены блок на �л.пошту',
+'block-log-flags-nousertalk'      => 'нельга правіць ула�ную размову',
 'block-log-flags-angry-autoblock' => 'дазволены палепшаны аўтаблок',
 'range_block_disabled'            => '�е дазволена адміні�тратар�ка� магчыма�ць �тавіць блокі на адра�ны� ды�пазоны.',
 'ipb_expiry_invalid'              => '�екар�ктны ча� �канч�нн�.',
 'ipb_expiry_temp'                 => 'Скрыты� блокі на імёны ўдзельнікаў му��ць быць �талымі.',
 'ipb_already_blocked'             => '"$1" ужо знаходзіцца пад блокам',
+'ipb-needreblock'                 => '== Дзейнічае блок ==
+$1 ужо знаходзіцца пад блокам. Ці жадаеце зм�ніць на�таўленні блока?',
 'ipb_cant_unblock'                => 'Памылка: не знойдзены блок з ID $1. Магчыма, ён ўжо быў зн�ты.',
 'ipb_blocked_as_range'            => '�ельга зн�ць блок з IP-адра�у $1, таму што ён заблакаваны не наўпро�т, але �к ча�тка аб��гу $2; той аб��г, у �ваю чаргу, можна разблакоўваць.',
 'ip_range_invalid'                => '��правільны аб��г IP.',
@@ -1764,6 +1970,7 @@ $1',
 'sorbsreason'                     => 'Ваш адра� IP знаходзіцца ў �пі�е забароненых адкрытых прок�і, �кім кары�таецца {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Ваш адра� IP знаходзіцца ў �пі�е забароненых адкрытых прок�і, �кім кары�таецца {{SITENAME}}.
 Вы не можаце р�гі�травацца',
+'cant-block-while-blocked'        => 'Вы не можаце блакаваць іншых, пакуль заблакаваны� �амі.',
 
 # Developer tools
 'lockdb'              => 'Замкнуць базу дадзеных',
@@ -1786,9 +1993,9 @@ $1',
 'databasenotlocked'   => 'База дадзеных не замкнута�.',
 
 # Move page
-'move-page'               => 'Перане�ці $1',
-'move-page-legend'        => 'Перане�ці �таронку',
-'movepagetext'            => "Форма, што ніж�й, перан��е �таронку пад новую назву, і так�ама перан��е пад новую назву ў�ю гі�торыю �таронкі.
+'move-page'                    => 'Перане�ці $1',
+'move-page-legend'             => 'Перане�ці �таронку',
+'movepagetext'                 => "Форма, што ніж�й, перан��е �таронку пад новую назву, і так�ама перан��е пад новую назву ў�ю гі�торыю �таронкі.
 Стара� назва ператворыцца ў пера�ылку да новай.
 Пера�ылкі, што в�лі да �тарой назвы, можна ўдакладніць аўтаматычна.
 Калі такое аўта-удакладненне не будзе рабіцца, тр�ба праверыць на�ўна�ць [[Special:DoubleRedirects|падвойных]] ці [[Special:BrokenRedirects|зламаных]] пера�ылак.
@@ -1799,49 +2006,62 @@ $1',
 '''УВ�Г�!'''
 Дл� папул�рнай �таронкі г�та можа �тацца р�зкім і нечаканым зм�неннем;
 уп�ўніце��, што разумееце на�туп�твы перано�у перад тым, �к �го зрабіць.",
-'movepagetalktext'        => "Зв�зана� �таронка размовы будзе аўтаматычна перане�ена разам з а�ноўнай, '''апроч тых выпадкаў, калі:'''
+'movepagetalktext'             => "Зв�зана� �таронка размовы будзе аўтаматычна перане�ена разам з а�ноўнай, '''апроч тых выпадкаў, калі:'''
 *І�нуе непу�та� �таронка размовы зв�зана� з новай назвай, або
 *З бок�у, што ніж�й, зн�та� адзнака.
 
 У такіх выпадках, калі г�та неабходна, тр�ба перано�іць або аб'�дноўваць �таронку размовы �ама�тойна.",
-'movearticle'             => 'Перане�ці �таронку',
-'movenotallowed'          => 'Вам не дазволена перано�іць �таронак.',
-'newtitle'                => 'Пад новую назву:',
-'move-watch'              => '�азіраць за �таронкай',
-'movepagebtn'             => 'Перане�ці �таронку',
-'pagemovedsub'            => 'Па�п�ховы перано�',
-'movepage-moved'          => '<big>\'\'\'"$1" перане�ена ў "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Старонка з такой назвай ужо і�нуе, або
+'movearticle'                  => 'Перане�ці �таронку',
+'movenologin'                  => '�е зроблены ўваход у �і�т�му',
+'movenologintext'              => 'Вы павінны быць зар�гі�траваным удзельнікам, і [[Special:UserLogin|ўвай�ці ў �і�т�му]], каб перано�іць �таронкі.',
+'movenotallowed'               => 'Вам не дазволена перано�іць �таронак.',
+'movenotallowedfile'           => 'Вы не маеце дазволу перано�іць файлы.',
+'cant-move-user-page'          => 'Вам не дазволена перано�іць �таронак кары�тальнікаў (не лічачы пад-�таронак).',
+'cant-move-to-user-page'       => 'Вам не дазволена перано�іць �таронку ў �таронку кары�тальніка (не лічачы пад-�таронак кары�тальніка).',
+'newtitle'                     => 'Пад новую назву:',
+'move-watch'                   => '�азіраць за �таронкай',
+'movepagebtn'                  => 'Перане�ці �таронку',
+'pagemovedsub'                 => 'Па�п�ховы перано�',
+'movepage-moved'               => '<big>\'\'\'"$1" перане�ена ў "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Была �творана� пера�ылка.',
+'movepage-moved-noredirect'    => '�е была �творана� пера�ылка.',
+'articleexists'                => 'Старонка з такой назвай ужо і�нуе, або
 вамі выбрана недапушчальнае ім�.
 Выберыце іншае ім�.',
-'cantmove-titleprotected' => '�емагчыма перане�ці �таронку пад г�тую назву, таму што назва ахоўваецца ад �твар�нн�',
-'talkexists'              => "'''Старонка была па�п�хова перане�ена, але не ўдало�� перане�ці �е �таронку размовы, таму што размова пад новай назвай ужо і�нуе. Вам дав�дзецца аб'�днаць размоўны� �таронкі �ама�тойна.'''",
-'movedto'                 => 'перане�ена ў',
-'movetalk'                => 'Перане�ці так�ама �таронку размовы.',
-'move-subpages'           => 'Перане�ці ў�е пад-�таронкі (калі датычыць)',
-'move-talk-subpages'      => 'Перане�ці ў�е пад-�таронкі размоўнай �таронкі (калі датычыць)',
-'movepage-page-exists'    => 'Старонка $1 ужо і�нуе і не можа быць аўтаматычна перапі�ана�.',
-'movepage-page-moved'     => 'Старонка $1 была перане�ена� ў $2.',
-'movepage-page-unmoved'   => '�е ўдало�� перане�ці �таронку $1 у $2.',
-'movepage-max-pages'      => 'Быў перане�ены дазволены мак�імум $1 {{PLURAL:$1|�таронкі|�таронак}} і больш аўтаматычных перано�аў не будзе.',
-'1movedto2'               => '[[$1]] перане�ена ў [[$2]]',
-'1movedto2_redir'         => '[[$1]] перане�ена� ў [[$2]] з выдаленнем пера�ылкі',
-'movelogpage'             => 'Журнал перано�аў',
-'movelogpagetext'         => '�іж�й падаецца �пі� перано�аў �таронак.',
-'movereason'              => 'Тлумач�нне',
-'revertmove'              => 'адкат',
-'delete_and_move'         => 'Выдаліць і перане�ці',
-'delete_and_move_text'    => '==Патрабуецца �ціранне==
+'cantmove-titleprotected'      => '�емагчыма перане�ці �таронку пад г�тую назву, таму што назва ахоўваецца ад �твар�нн�',
+'talkexists'                   => "'''Старонка была па�п�хова перане�ена, але не ўдало�� перане�ці �е �таронку размовы, таму што размова пад новай назвай ужо і�нуе. Вам дав�дзецца аб'�днаць размоўны� �таронкі �ама�тойна.'''",
+'movedto'                      => 'перане�ена ў',
+'movetalk'                     => 'Перане�ці так�ама �таронку размовы.',
+'move-subpages'                => 'Перане�ці ў�е пад-�таронкі (калі датычыць)',
+'move-talk-subpages'           => 'Перане�ці ў�е пад-�таронкі размоўнай �таронкі (калі датычыць)',
+'movepage-page-exists'         => 'Старонка $1 ужо і�нуе і не можа быць аўтаматычна перапі�ана�.',
+'movepage-page-moved'          => 'Старонка $1 была перане�ена� ў $2.',
+'movepage-page-unmoved'        => '�е ўдало�� перане�ці �таронку $1 у $2.',
+'movepage-max-pages'           => 'Быў перане�ены дазволены мак�імум $1 {{PLURAL:$1|�таронкі|�таронак}} і больш аўтаматычных перано�аў не будзе.',
+'1movedto2'                    => '[[$1]] перане�ена ў [[$2]]',
+'1movedto2_redir'              => '[[$1]] перане�ена ў [[$2]] з выдаленнем пера�ылкі',
+'move-redirect-suppressed'     => 'пера�ылка не �творана�',
+'movelogpage'                  => 'Журнал перано�аў',
+'movelogpagetext'              => '�іж�й падаецца �пі� перано�аў �таронак.',
+'movereason'                   => 'Тлумач�нне',
+'revertmove'                   => 'адкат',
+'delete_and_move'              => 'Выдаліць і перане�ці',
+'delete_and_move_text'         => '==Патрабуецца �ціранне==
 
 Ужо і�нуе артыкул з м�тавай назвай "[[:$1]]". Дык ці жадаеце �церці �го, каб зрабіць ме�ца дл� перано�у?',
-'delete_and_move_confirm' => 'Так, �церці �таронку',
-'delete_and_move_reason'  => 'Сцёрта, каб зрабіць ме�ца дл� перано�у',
-'selfmove'                => '�азвы вытока і м�ты такі� �амы�; нельга перано�іць �таронку �аму на ��бе.',
-'immobile_namespace'      => 'М�тава� назва належыць да �пецы�льнага тыпу; у г�тую пра�тору назваў немагчыма перано�іць �таронкі.',
-'imagenocrossnamespace'   => '�ельга перано�іць у не-файлавую пра�тору назваў',
-'imagetypemismatch'       => '�овы канчатак назвы файла не адпав�дае �го тыпу',
-'imageinvalidfilename'    => '�едапушчальна� назва м�тавага файла',
-'fix-double-redirects'    => '�бнавіць у�е пера�ылкі, �кі� в�дуць да пачатковай назвы',
+'delete_and_move_confirm'      => 'Так, �церці �таронку',
+'delete_and_move_reason'       => 'Сцёрта, каб зрабіць ме�ца дл� перано�у',
+'selfmove'                     => '�азвы вытока і м�ты такі� �амы�; нельга перано�іць �таронку �аму на ��бе.',
+'immobile-source-namespace'    => '�ельга перано�іць �таронкі ў пра�торы назваў "$1"',
+'immobile-target-namespace'    => '�ельга перано�іць �таронкі ў пра�торы назваў "$1"',
+'immobile-target-namespace-iw' => '�ельга перано�іць �таронку на ме�ца �па�ылкі інт�рвікі.',
+'immobile-source-page'         => '�ельга перано�іць г�тую �таронку.',
+'immobile-target-page'         => '�емагчыма перано�іць на г�тую назву.',
+'imagenocrossnamespace'        => '�ельга перано�іць у не-файлавую пра�тору назваў',
+'imagetypemismatch'            => '�овы канчатак назвы файла не адпав�дае �го тыпу',
+'imageinvalidfilename'         => '�едапушчальна� назва м�тавага файла',
+'fix-double-redirects'         => '�бнавіць у�е пера�ылкі, �кі� в�дуць да пачатковай назвы',
+'move-leave-redirect'          => 'Пакінуць пера�ылку �а �тарой назвы',
 
 # Export
 'export'            => 'Эк�партаваць �таронкі',
@@ -1849,7 +2069,7 @@ $1',
 
 Каб �к�партаваць �таронкі, упішыце іх назвы, адну на радок, у т�к�тавым полі, што ніж�й, і абазначце, ці жадаеце актуальны� вер�іі разам �а �тарымі вер�і�мі і з гі�торы�й правак, ці толькі актуальны� з інфармацы�й пра апошнюю праўку.
 
-У апошнім выпадку можна кары�тацца адмы�ловай формай �па�ылкі ў выгл�дзе, напр., [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] дл� "[[{{MediaWiki:Mainpage}}]]".',
+У апошнім выпадку можна кары�тацца адмы�ловай формай �па�ылкі ў выгл�дзе, напр., [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] дл� "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Эк�партаваць толькі актуальную вер�ію, без поўнай гі�торыі',
 'exportnohistory'   => "----
 '''Увага:''' �к�партаванне поўнай гі�торыі �таронак праз г�ту форму было забаронена, каб не траціць магутна�ці �і�т�мы.",
@@ -1884,9 +2104,12 @@ $1',
 'import-interwiki-text'      => 'Выбар вікі і назвы �таронкі дзел� імпарту.
 Даты вер�ій і імёны аўтараў будуць захаваны�.
 У�е тран�-вікавы� імпарты запі�ваюцца ў [[Special:Log/import|журнале імпартаў]].',
+'import-interwiki-source'    => 'Выточна� вікі/�таронка:',
 'import-interwiki-history'   => 'Капіраваць у�е гі�тарычны� вер�іі г�тай �таронкі',
 'import-interwiki-submit'    => 'Імпартаваць',
 'import-interwiki-namespace' => 'У пра�тору назваў:',
+'import-upload-filename'     => '�азва файла:',
+'import-comment'             => 'Каментарый:',
 'importtext'                 => 'Эк�партуйце файл з вытокавай вікі з дапамогай [[Special:Export|прылады �к�парту]], запішыце на ды�к і ўкладзіце �юды.',
 'importstart'                => 'Імпартаванне �таронак...',
 'import-revision-count'      => '$1 {{PLURAL:$1|вер�і�|вер�ій}}',
@@ -1920,19 +2143,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|вер�і�|вер�ій}} з $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Сва� �таронка',
+'tooltip-pt-userpage'             => 'Ваша ўла�на� �таронка',
 'tooltip-pt-anonuserpage'         => 'Старонка ўдзельніка дл� таго IP, з �кога вы зараз працуеце',
-'tooltip-pt-mytalk'               => 'Свае размовы',
+'tooltip-pt-mytalk'               => 'Ваша �таронка размоваў',
 'tooltip-pt-anontalk'             => 'Размовы аб праўках, зробленых з г�тага адра�у IP',
 'tooltip-pt-preferences'          => 'Свае на�тáўленні',
 'tooltip-pt-watchlist'            => 'Пералік �таронак, за зм�ненн�мі ў �кіх вы �очыце',
-'tooltip-pt-mycontris'            => 'Пералік ула�ных укладаў',
+'tooltip-pt-mycontris'            => 'Пералік вашага ўкладу',
 'tooltip-pt-login'                => 'Уваходзіць у �і�т�му неабав�зкова, але ва� вельмі запрашаюць г�так зрабіць.',
 'tooltip-pt-anonlogin'            => 'Ва� запрашаюць уваходзіць у �і�т�му, хоць г�та і не абав�зкова.',
 'tooltip-pt-logout'               => 'Вый�ці з �і�т�мы',
 'tooltip-ca-talk'                 => 'Размовы пра зме�т г�тай �таронкі',
 'tooltip-ca-edit'                 => 'Старонку можна правіць; ужывайце пап�р�дні паказ перад замацоўваннем.',
-'tooltip-ca-addsection'           => 'Дадаць заўвагу да г�тай размовы.',
+'tooltip-ca-addsection'           => 'Дадаць новы раздзел',
 'tooltip-ca-viewsource'           => 'Г�та� �таронка ахоўваецца, але можна пагл�дзець �е крынічны т�к�т.',
 'tooltip-ca-history'              => 'Ранейшы� вер�іі г�тай �таронкі.',
 'tooltip-ca-protect'              => 'Па�тавіць ахову на �таронку',
@@ -1979,6 +2202,8 @@ $1',
 'tooltip-watch'                   => 'Дапі�аць �таронку да �пі�у назіранага',
 'tooltip-recreate'                => '�днавіць �таронку, хоць �на і была �цёрта',
 'tooltip-upload'                  => 'Пачаць укладанне',
+'tooltip-rollback'                => '"�дкат" адным клікам в�ртае т�к�т, �кі быў тут перад адной ці некалькімі праўкамі апошн�га аўтара.',
+'tooltip-undo'                    => '"�дкат" �цірае г�тую праўку і адкрывае дл� перадпаказу р�дактар�кае акно. Так можна упі�ваць тлумач�нне адкату.',
 
 # Stylesheets
 'common.css'   => '/** CSS, упі�аны �юды, будзе дзейнічаць на кары�тальнікаў у�іх �вітаў */',
@@ -1994,12 +2219,12 @@ $1',
 'notacceptable'     => 'Сервер Вікі не можа прапанаваць даных у фармаце, зразумелым дл� вашай кліенцкай праграмы.',
 
 # Attribution
-'anonymous'        => '�нанімны� ўдзельнікі і ўдзельніцы {{GRAMMAR:родны|{{SITENAME}}}}',
+'anonymous'        => '�нанімны{{PLURAL:$1| ўдзельнік|� ўдзельнікі}} на пл�цоўцы {{SITENAME}}',
 'siteuser'         => 'удзельнік $1 з {{SITENAME}}',
 'lastmodifiedatby' => '�пошн�е зм�ненне �таронкі адбыло�� $2, $1 аўтар�тва $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => '�а а�нове працы $1.',
 'others'           => 'іншае',
-'siteusers'        => 'удзельнік або ўдзельнікі $1 з {{SITENAME}}',
+'siteusers'        => '{{PLURAL:$2|удзельнік|удзельнікі}} з пл�цоўкі {{SITENAME}} - $1',
 'creditspage'      => '�ўтар�тва �таронкі',
 'nocredits'        => '��ма зве�так пра аўтараў г�тай �таронкі.',
 
@@ -2019,6 +2244,16 @@ $1',
 'numauthors'     => 'Колька�ць розных аўтараў (у т�к�це): $1',
 'numtalkauthors' => 'Колька�ць розных аўтараў (у размове): $1',
 
+# Skin names
+'skinname-standard'    => 'Кла�іка',
+'skinname-nostalgia'   => '�а�тальгі�',
+'skinname-cologneblue' => 'Сіні Кёльн',
+'skinname-monobook'    => 'Манабук',
+'skinname-myskin'      => 'Май�кін',
+'skinname-chick'       => 'Чык',
+'skinname-simple'      => 'Про�та',
+'skinname-modern'      => 'Суча�на�ць',
+
 # Math options
 'mw_math_png'    => 'Заў�ёды вырабл�ць PNG',
 'mw_math_simple' => 'HTML калі вельмі про�тае, іначай PNG',
@@ -2039,10 +2274,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'Вам не дазволена значыць ула�ны� праўкі �к ухвалены�.',
 
 # Patrol log
-'patrol-log-page'   => 'Журнал ухваленых',
-'patrol-log-header' => 'Журнал ухваленых вер�ій',
-'patrol-log-line'   => 'пазначаны $1 з ліку $2 ухваленых $3',
-'patrol-log-auto'   => '(аўтаматычна)',
+'patrol-log-page'      => 'Журнал ухваленых',
+'patrol-log-header'    => 'Журнал ухваленых вер�ій',
+'patrol-log-line'      => 'пазначаны $1 з ліку $2 ухваленых $3',
+'patrol-log-auto'      => '(аўтаматычна)',
+'patrol-log-diff'      => 'вер�і� $1',
+'log-show-hide-patrol' => '$1 журнал ухваленн�ў',
 
 # Image deletion
 'deletedrevision'                 => 'Сцёрта �тара� вер�і� $1',
@@ -2059,6 +2296,9 @@ $1',
 'previousdiff' => '� Пап�р�дн�� праўка',
 'nextdiff'     => '�а�тупна� праўка →',
 
+# Visual comparison
+'visual-comparison' => 'Параўнанне на від',
+
 # Media information
 'mediawarning'         => "'''��ц�рожна''': У г�тым файле можа быць зламы�ны код, выкананне �кога можа знеб��печыць вашую �і�т�му.<hr />",
 'imagemaxsize'         => '�бмежаваны� памеры вы�ваў на адпаведных тлумачальных �таронках:',
@@ -2071,10 +2311,12 @@ $1',
 'show-big-image'       => '�айлепшае разрозненне',
 'show-big-image-thumb' => '<small>Памеры г�тага перадпаказу: $1 × $2 кропак</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '�овы� файлы',
 'imagelisttext'         => "�іж�й даецца �пі� з '''$1''' {{PLURAL:$1|файла|файлаў}} у парадку $2.",
 'newimages-summary'     => 'Тут паказаны� н�даўна ўкладзены� файлы.',
+'newimages-legend'      => 'Фільтр',
+'newimages-label'       => '�азва файла (або �е ча�тка):',
 'showhidebots'          => '($1 робатаў)',
 'noimages'              => 'Тут нічога н�ма.',
 'ilsubmit'              => 'Знай�ці',
@@ -2165,7 +2407,9 @@ $1',
 'exif-subjectlocation'             => 'Ме�цазнаходжанне прадмета',
 'exif-sensingmethod'               => 'Метад вым�р�нн�',
 'exif-filesource'                  => 'Крыніца файла',
+'exif-scenetype'                   => 'Тып прадмета',
 'exif-cfapattern'                  => 'Ма�іў колеравых фільтраў (CFA pattern)',
+'exif-customrendered'              => '�дмы�лова� апрацоўка вы�вы',
 'exif-exposuremode'                => 'Р�жым вытрымкі',
 'exif-whitebalance'                => 'Балан� белага',
 'exif-digitalzoomratio'            => 'Велічын� лікавага "зума"',
@@ -2266,6 +2510,18 @@ $1',
 'exif-lightsource-24'  => 'Студыйны� л�мпы напальванн� ISO',
 'exif-lightsource-255' => 'Інша� крыніца �в�тла',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Блі�кавіца не �працоўвала',
+'exif-flash-fired-1'    => 'Блі�кавіца �працоўвала',
+'exif-flash-return-0'   => 'без здольна�ці заўважанн� пілотнага блі�ку',
+'exif-flash-return-2'   => 'пілотны блі�к не заўважаны',
+'exif-flash-return-3'   => 'пілотны блі�к заўважаны',
+'exif-flash-mode-1'     => 'прыму�овы блі�к блі�кавіцы',
+'exif-flash-mode-2'     => 'прыму�овавае падаўленне блі�кавіцы',
+'exif-flash-mode-3'     => 'аўтаматычна� блі�кавіца',
+'exif-flash-function-1' => 'Без блі�кавіцы',
+'exif-flash-redeye-1'   => 'пам�нш�нне чырвані вач�й',
+
 'exif-focalplaneresolutionunit-2' => 'цал�ў',
 
 'exif-sensingmethod-1' => '�евызначаны',
@@ -2401,26 +2657,15 @@ $1
 
 'unit-pixel' => 'крпк',
 
-# HTML dump
-'redirectingto' => 'Пера�ылаем�� да [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Ці ачы�ціць к�ш дл� г�тай �таронкі?
-
-$1',
 'confirm_purge_button' => 'ОК',
-
-# AJAX search
-'searchcontaining' => "Знай�ці артыкулы, у �кіх ё�ць ''$1''.",
-'searchnamed'      => "Знай�ці артыкулы з назвай ''$1''.",
-'articletitles'    => "�ртыкулы, чые назвы пачынаюцца з ''$1''",
-'hideresults'      => '�е паказваць вынікаў',
-'useajaxsearch'    => 'Пошук праз AJAX',
+'confirm-purge-top'    => 'Ці ачы�ціць к�ш дл� г�тай �таронкі?',
+'confirm-purge-bottom' => '��в�ж�нне �таронкі ачышчае копію ў к�шы і вымушае паказ �амай новай вер�іі.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� пап�р�дн�� �таронка',
 'imgmultipagenext' => 'на�тупна� �таронка →',
-'imgmultigo'       => 'І�ці!',
+'imgmultigo'       => 'Пераход!',
 'imgmultigoto'     => '�а �таронку $1',
 
 # Table pager
@@ -2431,14 +2676,14 @@ $1',
 'table_pager_first'        => 'Перша� �таронка',
 'table_pager_last'         => '�пошн�� �таронка',
 'table_pager_limit'        => 'Па $1 �кладнікаў на �таронцы',
-'table_pager_limit_submit' => 'І�ці',
+'table_pager_limit_submit' => 'Пераход',
 'table_pager_empty'        => 'Без вынікаў',
 
 # Auto-summaries
 'autosumm-blank'   => 'Выдаленне ў��го зме�ту �таронкі',
 'autosumm-replace' => "Замена �таронкі на '$1'",
 'autoredircomment' => 'Пера�ылае да [[$1]]',
-'autosumm-new'     => '�ова� �таронка: $1',
+'autosumm-new'     => "�ова� �таронка: '$1'",
 
 # Live preview
 'livepreview-loading' => 'Счытваем…',
@@ -2474,6 +2719,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '�ев�дома� метка пашыр�нн� "$1"',
+'duplicate-defaultsort' => 'Увага: прадвызначана� клавіша ўпарадкаванн� "$2" зам�ніла ранейшую такую клавішу "$1".',
 
 # Special:Version
 'version'                          => 'Вер�і�', # Not used as normal message but as header for the special page itself
@@ -2503,13 +2749,13 @@ $1',
 'filepath-summary' => 'Г�та� адмы�лова� �таронка в�ртае поўны шл�х да файла.
 Вы�вы паказваюцца ў поўным памеры, іншы� тыпы файлаў адкрываюцца ў прыпі�аных да іх праграмах.
 
-Упішыце назву файла без пр�фік�у "{{ns:image}}:".',
+Упішыце назву файла без пр�фік�у "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Пошук дублікатных файлаў',
 'fileduplicatesearch-summary'  => 'Пошук дублікатных файлах на пад�таве іх х�шаў.
 
-Упішыце назву файла без пры�таўкі "{{ns:image}}:".',
+Упішыце назву файла без пры�таўкі "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Знай�ці дублікаты',
 'fileduplicatesearch-filename' => '�азва файла:',
 'fileduplicatesearch-submit'   => 'Знай�ці',
@@ -2539,4 +2785,13 @@ $1',
 'blankpage'              => 'Пу�та� �таронка',
 'intentionallyblankpage' => 'Старонка наўмы�на пакінута пу�той, і ўжываецца дл� вым�р�нн� хутка�ці і падобнага.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Г�ты радок пакіньце ў такім �амым выгл�дзе<pre>
+#Упішыце ча�ткі р�гул�рных выразаў (тое, што пішуць паміж знакамі //) ніж�й
+#Г�та будзе параўноўвацца з URL-�мі вонкавых (hotlink) вы�ваў
+#Ты�, дзе атрымаецца адпаведна�ць, будуць паказаны� �к вы�вы, а іначай толькі �к �па�ылкі
+#Радкі, �кі� пачынаюцца з знака #, лічацца каментарамі
+
+#У�е ча�ткі р�гул�рных выразаў павінны быць над г�тым радком. Сам радок пакіньце ў такім �амым выгл�дзе</pre>',
+
 );
diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php
index 7da9bb6a..b40a3e0d 100644
--- a/languages/messages/MessagesBe_tarask.php
+++ b/languages/messages/MessagesBe_tarask.php
@@ -11,17 +11,6 @@
  * @author Zedlik
  */
 
-$skinNames = array(
-	'standard'    => 'Кл��ычнае',
-	'nostalgia'   => '�а�тальгі�',
-	'cologneblue' => 'Кёльн�кі �мутак',
-	'monobook'    => 'Монакніга',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Цыпа',
-	'simple'      => 'Про�тае',
-	'modern'      => 'Суча�нае',
-);
-
 $bookstoreList = array(
 	'OZ.by' => 'http://oz.by/search.phtml?what=books&isbn=$1',
 	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
@@ -154,29 +143,29 @@ $magicWords = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'М�ды�',
-	NS_SPECIAL        => 'Сп�цы�льны�',
-	NS_MAIN           => '',
-	NS_TALK           => '�бмеркаваньне',
-	NS_USER           => 'Удзельнік',
-	NS_USER_TALK      => 'Гутаркі_ўдзельніка',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '�бмеркаваньне_$1',
-	NS_IMAGE          => 'Вы�ва',
-	NS_IMAGE_TALK     => '�бмеркаваньне_вы�вы',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => '�бмеркаваньне_MediaWiki',
-	NS_TEMPLATE       => 'Шаблён',
-	NS_TEMPLATE_TALK  => '�бмеркаваньне_шаблёну',
-	NS_HELP           => 'Дапамога',
-	NS_HELP_TALK      => '�бмеркаваньне_дапамогі',
-	NS_CATEGORY       => 'Кат�горы�',
-	NS_CATEGORY_TALK  => '�бмеркаваньне_кат�горыі'
+	NS_MEDIA            => 'М�ды�',
+	NS_SPECIAL          => 'Сп�цы�льны�',
+	NS_TALK             => '�бмеркаваньне',
+	NS_USER             => 'Удзельнік',
+	NS_USER_TALK        => 'Гутаркі_ўдзельніка',
+	NS_PROJECT_TALK     => '�бмеркаваньне_$1',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => '�бмеркаваньне_файла',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => '�бмеркаваньне_MediaWiki',
+	NS_TEMPLATE         => 'Шаблён',
+	NS_TEMPLATE_TALK    => '�бмеркаваньне_шаблёну',
+	NS_HELP             => 'Дапамога',
+	NS_HELP_TALK        => '�бмеркаваньне_дапамогі',
+	NS_CATEGORY         => 'Кат�горы�',
+	NS_CATEGORY_TALK    => '�бмеркаваньне_кат�горыі',
 );
 
 $namespaceAliases = array(
-	'Удзельніца'          => NS_USER,
-	'Гутаркі_ўдзельніцы'  => NS_USER_TALK,
+	'Удзельніца' => NS_USER,
+	'Гутаркі ўдзельніцы' => NS_USER_TALK,
+	'Вы�ва' => NS_FILE,
+	'�бмеркаваньне вы�вы' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
@@ -187,7 +176,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Сьпі�_назіраньн�' ),
 	'Recentchanges'             => array( '�пошні�_зьмены' ),
 	'Upload'                    => array( 'Загрузка' ),
-	'Imagelist'                 => array( 'Сьпі�_файлаў' ),
+	'Listfiles'                 => array( 'Сьпі�_файлаў' ),
 	'Newimages'                 => array( '�овы�_файлы' ),
 	'Listusers'                 => array( 'Сьпі�_удзельнікаў' ),
 	'Statistics'                => array( 'Статы�тыка' ),
@@ -199,6 +188,8 @@ $specialPageAliases = array(
 	'Uncategorizedtemplates'    => array( '�екат�гарызаваны�_шаблёны' ),
 	'Wantedpages'               => array( 'Запатрабаваны�_�таронкі', '�екар�ктны�_�па�ылкі' ),
 	'Wantedcategories'          => array( 'Запатрабаваны�_кат�горыі' ),
+	'Wantedfiles'               => array( 'Запатрабаваны�_файлы' ),
+	'Wantedtemplates'           => array( 'Запатрабаваны�_шаблёны' ),
 	'Shortpages'                => array( 'Кароткі�_�таронкі' ),
 	'Longpages'                 => array( 'Доўгі�_�таронкі' ),
 	'Newpages'                  => array( '�овы�_�таронкі' ),
@@ -227,8 +218,11 @@ $specialPageAliases = array(
 	'Listbots'                  => array( 'Сьпі�_робатаў' ),
 	'Popularpages'              => array( 'Папул�рны�_�таронкі' ),
 	'Search'                    => array( 'Пошук' ),
+	'Resetpass'                 => array( 'Зьм�ніць_пароль', '�чы�ьціць_пароль' ),
 	'MergeHistory'              => array( 'Гі�торы�_аб\'�днаньн�ў' ),
 	'Filepath'                  => array( 'Шл�х_да_файла' ),
+	'LinkSearch'                => array( 'Пошук_вонкавых_�па�ылак' ),
+	'DeletedContributions'      => array( 'Выдалены_ўнё�ак' ),
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
@@ -279,16 +273,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'Хаваць мае праўкі ў �ьпі�е назіраньн�',
 'tog-watchlisthidebots'       => 'Хаваць праўкі робатаў у �ьпі�е назіраньн�',
 'tog-watchlisthideminor'      => 'Хаваць дробны� праўкі ў �ьпі�е назіраньн�',
+'tog-watchlisthideliu'        => 'Хаваць праўкі зар�гі�траваных удзельнікаў і ўдзельніц у �ьпі�е назіраньн�',
+'tog-watchlisthideanons'      => 'Хаваць праўкі ананімаў у �ьпі�е назіраньн�',
 'tog-ccmeonemails'            => 'Да�ылаць мне копіі лі�тоў, �кі� � да�ылаю іншым удзельнікам і ўдзельніцам',
 'tog-diffonly'                => '�е паказваць зьме�т �таронкі пад параўнаньнем зьменаў',
 'tog-showhiddencats'          => 'Паказваць �хаваны� кат�горыі',
+'tog-norollbackdiff'          => '�е паказваць зьмены па�ьл� выкары�таньн� функцыі адкату',
 
 'underline-always'  => 'Заў�ёды',
 'underline-never'   => '�іколі',
 'underline-default' => 'Як у браўз�ры',
 
-'skinpreview' => '(Прагл�д)',
-
 # Dates
 'sunday'        => 'н�дзел�',
 'monday'        => 'пан�дзелак',
@@ -369,7 +364,7 @@ $messages = array(
 'article'        => '�ртыкул',
 'newwindow'      => '(адкрываецца ў новым акне)',
 'cancel'         => '�дм�ніць',
-'qbfind'         => 'Знай�ьці',
+'qbfind'         => 'Шукаць',
 'qbbrowse'       => 'Прагл�дзець',
 'qbedit'         => 'Р�дагаваць',
 'qbpageoptions'  => 'Г�та� �таронка',
@@ -381,7 +376,7 @@ $messages = array(
 'mytalk'         => 'Мае размовы',
 'anontalk'       => 'Гутаркі дл� г�тага IP-адра�у',
 'navigation'     => '�авігацы�',
-'and'            => 'Ñ–',
+'and'            => '&#32;Ñ–',
 
 # Metadata in edit box
 'metadata_help' => 'М�тазьве�ткі:',
@@ -418,14 +413,14 @@ $messages = array(
 'talkpagelinktext'  => 'гутаркі',
 'specialpage'       => 'Сп�цы�льна� �таронка',
 'personaltools'     => '��абі�ты� прылады',
-'postcomment'       => 'Пракам�нтаваць',
+'postcomment'       => '�ова� ��кцы�',
 'articlepage'       => 'Паказаць артыкул',
 'talk'              => 'Гутаркі',
 'views'             => 'Прагл�ды',
 'toolbox'           => 'Ін�трум�нты',
 'userpage'          => 'Паказаць �таронку ўдзельніка',
 'projectpage'       => 'Паказаць �таронку праекту',
-'imagepage'         => 'Паказаць �таронку м�ды�-файла',
+'imagepage'         => 'Паказаць �таронку файла',
 'mediawikipage'     => 'Паказаць �таронку паведамленьн�',
 'templatepage'      => 'Паказаць �таронку шаблёну',
 'viewhelppage'      => 'Паказаць �таронку дапамогі',
@@ -444,8 +439,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Пра {{GRAMMAR:вінавальны|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Пра {{GRAMMAR:вінавальны|{{SITENAME}}}}',
-'bugreports'           => 'Паведамленьні пра памылкі',
-'bugreportspage'       => 'Project:Паведамленьні пра памылкі',
 'copyright'            => 'Зьме�т �таронкі падпадае пад ліц�нзію $1.',
 'copyrightpagename'    => '�ўтар�кі� правы {{GRAMMAR:родны|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:�ўтар�кі� правы',
@@ -468,9 +461,7 @@ $messages = array(
 
 'badaccess'        => 'Памылка: не адпаведны ўзровень правоў',
 'badaccess-group0' => 'Вам не дазволена выканаць запытанае Вамі дзе�ньне.',
-'badaccess-group1' => 'Запытанае Вамі дзе�ньне дазволенае толькі ўдзельнікам з групы $1.',
-'badaccess-group2' => 'Запытанае Вамі дзе�ньне дазволенае толькі ўдзельнікам адной з групаў $1.',
-'badaccess-groups' => 'Запытанае Вамі дзе�ньне дазволенае толькі ўдзельнікам адной з групаў $1.',
+'badaccess-groups' => 'Запытанае Вамі дзе�ньне дазволенае толькі ўдзельнікам {{PLURAL:$2|з групы|адной з групаў}}: $1.',
 
 'versionrequired'     => 'Патрабуецца MediaWiki в�р�іі $1',
 'versionrequiredtext' => 'Дл� кары�таньн� г�тай �таронкай патрабуецца MediaWiki в�р�іі $1. Гл�дзіце [[Special:Version|інфармацыю пра в�р�ію]].',
@@ -485,6 +476,8 @@ $messages = array(
 'editsection'             => 'р�дагаваць',
 'editold'                 => 'р�дагаваць',
 'viewsourceold'           => 'паказаць крыніцу',
+'editlink'                => 'р�дагаваць',
+'viewsourcelink'          => 'паказаць крыніцу',
 'editsectionhint'         => 'Р�дагаваць ��кцыю «$1»',
 'toc'                     => 'Зьме�т',
 'showtoc'                 => 'паказаць',
@@ -499,13 +492,13 @@ $messages = array(
 'site-atom-feed'          => '$1 — Atom-�тужка',
 'page-rss-feed'           => '«$1» — RSS-�тужка',
 'page-atom-feed'          => '«$1» — Atom-�тужка',
-'red-link-title'          => '$1 (�шч� не напі�аны)',
+'red-link-title'          => '$1 (�таронка не і�нуе)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Старонка',
 'nstab-user'      => 'Старонка ўдзельніка/ўдзельніцы',
 'nstab-media'     => 'М�ды�',
-'nstab-special'   => 'Сп�цы�льна�',
+'nstab-special'   => 'Сп�цы�льна� �таронка',
 'nstab-project'   => 'Старонка праекту',
 'nstab-image'     => 'Файл',
 'nstab-mediawiki' => 'Паведамленьне',
@@ -515,7 +508,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '��ма такога дзе�ньн�',
-'nosuchactiontext'  => 'Дзе�ньне, пазначанае ў радку URL, не ра�пазнанае праграмным забе�ьп�ч�ньнем {{GRAMMAR:родны|{{SITENAME}}}}',
+'nosuchactiontext'  => 'Дзе�ньне, пазначанае праз URL, зь�ўл�ецца н��лушным.
+Магчыма Вы ўв�лі н��лушны URL, ці перайшлі па н��лушнай �па�ылцы.
+Г�та можа быць і памылкай у праграмным забе�ьп�ч�ньні {{GRAMMAR:родны|{{SITENAME}}}}.',
 'nosuchspecialpage' => 'Такой �п�цы�льнай �таронкі не і�нуе',
 'nospecialpagetext' => "<big>'''Вы зьв�рнулі�� на н��лушную �п�цы�льную �таронку.'''</big>
 
@@ -568,7 +563,6 @@ $1',
 'cannotdelete'         => '�емагчыма выдаліць указаную �таронку альбо вы�ву. (Магчыма, �на ўжо выдалена� кім�ьці іншым.)',
 'badtitle'             => '�екар�ктна� назва',
 'badtitletext'         => 'Запытана� назва �таронкі н��лушна� ці пу�та�, альбо н��лушна ўказана� міжмоўна� ці міжвікі назва. Яна можа ўтрымліваць �ымбалі, �кі� нельга ўжываць у назвах.',
-'perfdisabled'         => 'Прабачце! Г�та� магчыма�ьць ча�ова забл�кавана�, у �ув�зі зь перагружана�ьцю ��рв�ра {{GRAMMAR:родны|{{SITENAME}}}}.',
 'perfcached'           => '�а�тупны� зьве�ткі к�шаваны� і могуць быць �а�тар�лымі.',
 'perfcachedts'         => '�а�тупны� зьве�ткі к�шаваны� і апошні раз былі абноўлены� $1.',
 'querypage-no-updates' => '�бнаўленьні г�тай �таронкі ц�пер адключаны�. Зьве�ткі н� будуць абнаўл�цца.',
@@ -584,7 +578,7 @@ $1',
 'protectedinterface'   => 'Г�та� �таронка ўтрымлівае інт�рф�й�нае паведамленьне праграмнага забе�ьп�ч�ньн�, і �е зьмена забаронена.',
 'editinginterface'     => "'''Увага:''' Вы р�дагуеце �таронку, �ка� ўтрымлівае �ы�т�мнае паведамленьне MediaWiki.
 Яе зьмена паўплывае на вонкавы выгл�д інт�рф�й�у іншых удзельнікаў.
-Калі ла�ка, выкары�тоўвайце [http://translatewiki.net/wiki/Main_Page?setlang=be-tarask Betawiki] — праект дл� л�калізацыі MediaWiki.",
+Калі ла�ка, выкары�тоўвайце [http://translatewiki.net/wiki/Main_Page?setlang=be-tarask translatewiki.net] — праект дл� л�калізацыі MediaWiki.",
 'sqlhidden'            => '(SQL-запыт �хаваны)',
 'cascadeprotected'     => 'Г�та� �таронка абаронена� ад р�дагаваньн�, таму што �на ўключана� ў {{PLURAL:$1|на�тупную $1 �таронку, �ка� была абаронена�|на�тупны� $1 �таронкі, �кі� былі абаронены�|на�тупны� $1 �таронкі, �кі� былі абаронены�}} з актывізаванай «ка�каднай» опцы�й:
 $2',
@@ -595,16 +589,16 @@ $2',
 Прычына забароны: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => '���лушна� канфігурацы�: нев�домы антывіру�ны �кан�р: <i>$1</i>',
+'virus-badscanner'     => "���лушна� канфігурацы�: нев�домы антывіру�ны �кан�р: ''$1''",
 'virus-scanfailed'     => 'памылка �канаваньн� (код $1)',
 'virus-unknownscanner' => 'нев�домы антывіру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Выхад з �ы�т�мы',
-'logouttext'                 => '<strong>Вы выйшлі з �ы�т�мы.</strong>
+'logouttext'                 => "'''Вы выйшлі з �ы�т�мы.'''
 
 Вы можаце прац�гваць працу ў {{GRAMMAR:ме�ны|{{SITENAME}}}} ананімна, альбо можаце [[Special:UserLogin|ўвай�ьці ў �ы�т�му]] �к той жа альбо іншы ўдзельнік.
-�ле некаторы� �таронкі могуць адлю�троўвацца �к быццам Вы ў�ё �шч� ў �ы�т�ме. Каб г�тага пазьбегнуць тр�ба ачы�ьціць к�ш браўз�ра.',
+�ле некаторы� �таронкі могуць адлю�троўвацца �к быццам Вы ў�ё �шч� ў �ы�т�ме. Каб г�тага пазьбегнуць тр�ба ачы�ьціць к�ш браўз�ра.",
 'welcomecreation'            => '== Вітаем, $1! ==
 Ваш рахунак быў �твораны.
 �е забудзьце зьм�ніць Вашы� [[Special:Preferences|ў�таноўкі ў {{GRAMMAR:ме�ны|{{SITENAME}}}}]].',
@@ -615,7 +609,6 @@ $2',
 'remembermypassword'         => 'Запомніць м�не на г�тым кампутары',
 'yourdomainname'             => 'Ваш дам�н:',
 'externaldberror'            => 'Магчыма, адбыла�� памылка аўт�нтыфікацыі з дапамогай вонкавай базы зьве�так, ці Вам недазволена абнаўл�ць �вой рахунак.',
-'loginproblem'               => '<b>Узьнікла праблема пры ўваходзе ў �ы�т�му.</b><br />Па�прабуйце �шч� раз!',
 'login'                      => 'Увай�ьці',
 'nav-login-createaccount'    => 'Уваход / �твар�ньне рахунку',
 'loginprompt'                => 'Вы павінны дазволіць cookie дл� ўваходу ў {{GRAMMAR:вінавальны|{{SITENAME}}}}.',
@@ -639,8 +632,8 @@ $2',
 'yourlanguage'               => 'Мова інт�рф�й�у:',
 'yournick'                   => 'Подпі�:',
 'badsig'                     => '���лушны неапрацаваны подпі�; праверце HTML-т�гі.',
-'badsiglength'               => 'Подпі� занадта доўгі.
-Му�іць быць не даўж�й за $1 {{PLURAL:$1|�ымбаль|�ымбалі|�ымбал�ў}}.',
+'badsiglength'               => 'Ваш подпі� занадта доўгі.
+Подпі� му�іць быць не даўж�й за $1 {{PLURAL:$1|�ымбаль|�ымбалі|�ымбал�ў}}.',
 'email'                      => 'Электронна� пошта',
 'prefs-help-realname'        => 'Сапраўднае ім� паведамл�ць неабав�зкова.
 Калі Вы �го пазначыце, �но будзе выкары�тоўвацца дл� пазнач�ньн� Вашай працы.',
@@ -658,6 +651,7 @@ $2',
 'loginsuccesstitle'          => 'Па�ьп�ховы ўваход у �ы�т�му',
 'loginsuccess'               => "'''Ц�пер Вы ўвайшлі ў {{GRAMMAR:вінавальны|{{SITENAME}}}} �к «$1».'''",
 'nosuchuser'                 => '�е і�нуе ўдзельніка ці ўдзельніцы «$1».
+В�лікі� і малы� літары адрозьніваюцца ў імёнах удзельнікаў.
 Праверце напі�аньне альбо [[Special:UserLogin/signup|�тварыце новы рахунак]].',
 'nosuchusershort'            => '�е і�нуе ўдзельніка ці ўдзельніцы «<nowiki>$1</nowiki>». Праверце напі�аньне.',
 'nouserspecified'            => 'Вы му�іце пазначыць ім� ўдзельніка.',
@@ -673,17 +667,18 @@ $2',
 'noemail'                    => 'Удзельнік «$1» не пазначыў ні�кага адра�у �лектроннай пошты.',
 'passwordsent'               => '�овы пароль быў да�ланы на адра� �лектроннай пошты ўдзельніка «$1».
 Калі ла�ка, увайдзіце ў �ы�т�му па�ьл� �го атрыманьн�.',
-'blocked-mailpassword'       => 'З Вашага IP-адра�у забаронены� р�дагаваньні, а таму так�ама не да�тупна� функцы� аднаўленьн� паролю дзел� прадухіленьн� шкоды.',
+'blocked-mailpassword'       => 'З Вашага IP-адра�у забаронены� р�дагаваньні, а таму так�ама не да�тупна� функцы� аднаўленьн� паролю дл� прадухіленьн� шкоды.',
 'eauthentsent'               => 'Пацьверджаньне было да�ланае на пазначаны адра� �лектроннай пошты.
 У лі�ьце ўтрымліваюцца ін�трукцыі, па выкананьні �кіх, Вы зможаце пацьвердзіць, што адра� �апраўды належыць Вам, і на г�ты адра� будзе да�ылацца пошта ад�юль.',
 'throttled-mailpassword'     => '�апамін паролю ўжо быў да�ланы на прац�гу {{PLURAL:$1|апошн�й $1 гадзіны|апошніх $1 гадзінаў|апошніх $1 гадзінаў}}.
 Дл� прадухіленьн� злоўжываньн�ў, напамін будзе да�ылацца не ча�ьцей аднаго разу за $1 {{PLURAL:$1|гадзіну|гадзіны|гадзінаў}}.',
 'mailerror'                  => 'Памылка пры адпраўцы �лектроннай пошты: $1',
-'acct_creation_throttle_hit' => '�а жаль, Вы ўжо �тварылі $1 {{PLURAL:$1|рахунак|рахункі|рахункаў}}. Болей нельга.',
-'emailauthenticated'         => 'Ваш адра� �лектроннай пошты быў пацьверджаны $1.',
+'acct_creation_throttle_hit' => '�аведвальнікі г�тай вікі, �кі� кары�талі�� Вашым ІР-адра�ам, ужо �тварылі $1 {{PLURAL:$1|рахунак у|рахункі ў|рахункаў у}} апошні� дні, што перавышае мак�ымальную дазволеную колька�ьць за г�ты п�ры�д.
+У выніку, наведвальнікі, �кі� кары�таюцца г�тым ІР-адра�ам, н� могуць �тварыць зараз болей рахункаў.',
+'emailauthenticated'         => 'Ваш адра� �лектроннай пошты быў пацьверджаны $2 у $3.',
 'emailnotauthenticated'      => 'Ваш адра� �лектроннай пошты �шч� не пацьверджаны.
 Электронна� пошта дл� на�тупных магчыма�ьц�ў да�ылацца не будзе.',
-'noemailprefs'               => 'Вы павінны пазначыць адра� �лектроннай пошты, каб актывізаваць г�ты� магчыма�ьці.',
+'noemailprefs'               => 'Вы павінны пазначыць адра� �лектроннай пошты ў Вашых у�таноўках, каб актывізаваць г�ты� магчыма�ьці.',
 'emailconfirmlink'           => 'Пацьвердзіць Ваш адра� �лектроннай пошты',
 'invalidemailaddress'        => 'Уведзены адра� �лектроннай пошты не адпав�дае фармату адра�оў �лектроннай пошты.
 Ув�дзіце �лушны адра� �лектроннай пошты ці ачы�ьціце г�тае поле.',
@@ -693,19 +688,27 @@ $2',
 'createaccount-text'         => '�ехта �тварыў рахунак «$2» у {{GRAMMAR:ме�ны|{{SITENAME}}}} ($4) дл� Вашага адра�у �лектроннай пошты. Пароль дл� г�тага рахунку — «$3». Вам тр�ба ўвай�ьці і зьм�ніць Ваш пароль зараз.
 
 Вы можаце праігнараваць г�ты лі�т, калі г�ты рахунак быў �твораны памылкова.',
+'login-throttled'            => 'Вы зрабілі занадта шмат �пробаў уве�ьці пароль дл� г�тага рахунку. Калі ла�ка, пачакайце, перад тым, �к па�прабаваць ізноў.',
 'loginlanguagelabel'         => 'Мова: $1',
 
 # Password reset dialog
-'resetpass'               => 'Выдаліць пароль рахунку',
-'resetpass_announce'      => 'Вы ўвайшлі з дапамогай ча�овага паролю, да�ланага праз �лектронную пошту.
+'resetpass'                 => 'Зьм�ніць пароль',
+'resetpass_announce'        => 'Вы ўвайшлі з дапамогай ча�овага паролю, да�ланага праз �лектронную пошту.
 Дл� зав�рш�ньн� ўваходу ў �ы�т�му Вы му�іце ўве�ьці тут новы пароль:',
-'resetpass_header'        => 'Зьм�ніць пароль рахунку',
-'resetpass_submit'        => '�а�тавіць пароль і увай�ьці',
-'resetpass_success'       => 'Ваш пароль быў па�ьп�хова зьменены! Выконваецца ўваход у �ы�т�му…',
-'resetpass_bad_temporary' => '���лушны ча�овы пароль.
+'resetpass_header'          => 'Зьм�ніць пароль рахунку',
+'oldpassword'               => 'Стары пароль:',
+'newpassword'               => '�овы пароль:',
+'retypenew'                 => 'Паўтарыце новы пароль:',
+'resetpass_submit'          => '�а�тавіць пароль і увай�ьці',
+'resetpass_success'         => 'Ваш пароль быў па�ьп�хова зьменены! Выконваецца ўваход у �ы�т�му…',
+'resetpass_bad_temporary'   => '���лушны ча�овы пароль.
 Магчыма Вы ўжо зьм�нілі пароль альбо запыталі новы ча�овы пароль.',
-'resetpass_forbidden'     => 'Пароль н� можа быць зьменены',
-'resetpass_missing'       => '��ма зьве�так ў форме.',
+'resetpass_forbidden'       => 'Пароль н� можа быць зьменены',
+'resetpass-no-info'         => 'Дл� непа�р�днага до�тупу да г�тай �таронкі Вам неабходна ўвай�ьці ў �ы�т�му.',
+'resetpass-submit-loggedin' => 'Зьм�ніць пароль',
+'resetpass-wrong-oldpass'   => '���лушны ча�овы альбо ц�перашні пароль.
+Магчыма Вы ўжо па�ьп�хова зьм�нілі Ваш пароль альбо запыталі новы ча�овы пароль.',
+'resetpass-temp-password'   => 'Ча�овы пароль:',
 
 # Edit page toolbar
 'bold_sample'     => 'Тлу�ты т�к�т',
@@ -730,8 +733,8 @@ $2',
 'hr_tip'          => 'Гарызантальна� ліні� (не выкары�тоўвайце ча�та)',
 
 # Edit pages
-'summary'                          => 'Кароткае апі�аньне зьменаў',
-'subject'                          => 'Т�ма/назва',
+'summary'                          => 'Кароткае апі�аньне зьменаў:',
+'subject'                          => 'Т�ма/назва:',
 'minoredit'                        => 'Г�та дробна� праўка',
 'watchthis'                        => '�азіраць за г�тай �таронкай',
 'savearticle'                      => 'Захаваць �таронку',
@@ -745,8 +748,8 @@ $2',
 'missingcommenttext'               => 'Калі ла�ка, ув�дзіце кам�нтар ніж�й.',
 'missingcommentheader'             => "'''�апамін:''' Вы не пазначылі т�мы г�тага кам�нтара.
 Калі Вы наці�ьніце кнопку «Захаваць» �шч� раз, Ваш кам�нтар захаваецца б�з т�мы.",
-'summary-preview'                  => 'Пап�р�дні прагл�д апі�аньн�',
-'subject-preview'                  => 'Пап�р�дні прагл�д загалоўку',
+'summary-preview'                  => 'Пап�р�дні прагл�д апі�аньн�:',
+'subject-preview'                  => 'Пап�р�дні прагл�д загалоўку:',
 'blockedtitle'                     => 'Удзельнік забл�каваны',
 'blockedtext'                      => "<big>'''Ваш рахунак ўдзельніка ці IP-адра� быў забл�каваны.'''</big>
 
@@ -792,36 +795,37 @@ $2',
 'accmailtext'                      => 'Пароль дл� «$1» быў ада�ланы на адра� $2.',
 'newarticle'                       => '(�овы)',
 'newarticletext'                   => "Вы прыйшлі па �па�ылцы на �таронку, �ка� �шч� не і�нуе.
-Каб �тварыць �е, напішыце т�к�т у полі ніж�й (гл�дзіце [[{{MediaWiki:Helppage}}|�таронку дапамогі]] дзел� дадатковай інфармацыі).
+Каб �тварыць �е, напішыце т�к�т у полі ніж�й (гл�дзіце [[{{MediaWiki:Helppage}}|�таронку дапамогі]] дл� дадатковай інфармацыі).
 Калі Вы трапілі �юды памылкова, наці�ьніце '''назад''' у вашым браўз�ры.",
 'anontalkpagetext'                 => "----''Г�та �таронка гутарак ананімнага ўдзельніка, �кі �шч� не �тварыў �абе рахунак ці не ўжывае �го. Таму мы вымушаны� ўжываць лічбавы IP-адра� дзел� �гонай ід�нтыфікацыі. �дзін IP-адра� можа выкары�тоўвацца некалькімі ўдзельнікамі. Калі Вы — ананімны ўдзельнік і лічыце, што атрымалі не прызначаны� Вам кам�нтары, калі ла�ка, [[Special:UserLogin|зар�гі�труйце�� ці ўвайдзіце ў �ы�т�му]], каб у будучыні пазьбегнуць магчымай блытаніны зь іншымі ананімнымі ўдзельнікамі.''
 
 ''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'                    => 'Зараз т�к�т на г�тай �таронцы ад�утнічае. Вы можаце [[Special:Search/{{PAGENAME}}|пашукаць г�тую назву]] ў іншых �таронках альбо [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} р�дагаваць г�тую �таронку].',
+'noarticletext'                    => 'Ц�пер т�к�т на г�тай �таронцы ад�утнічае.
+Вы можаце [[Special:Search/{{PAGENAME}}|пашукаць г�тую назву]] ў іншых �таронках, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} пашукаць у адпаведных журналах падзе�ў] альбо [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} р�дагаваць г�тую �таронку]</span>.',
 'userpage-userdoesnotexist'        => 'Рахунак удзельніка «$1» не зар�гі�траваны. Калі ла�ка, удакладніце, ці жадаеце Вы �тварыць/р�дагаваць г�тую �таронку.',
 'clearyourcache'                   => "'''Заўвага:''' Каб пабачыць зьмены па�ьл� захаваньн�, Вам можа �патр�біцца ацы�ьціць к�ш Вашага браўз�ра. '''Mozilla / Firefox / Safari:''' трымайце ''Shift'' і наці�ьніце ''Reload'', ці наці�ьніце ''Ctrl-Shift-R'' (''Cmd-Shift-R'' на Apple Mac); '''IE:''' трымайце ''Ctrl'' і наці�ьніце ''Refresh'', ці наці�ьніце ''Ctrl-F5''; '''Konqueror:''': про�та наці�ьніце кнопку ''Reload'', ці наці�ьніце ''F5''; кары�тальнікам '''Opera''' можа �патр�біцца цалкам ачы�ьціць к�ш праз ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => '<strong>Падказка:</strong> выкары�тоўвайце кнопку «Пап�р�дні прагл�д», каб па�прабаваць новы код CSS/JS перад тым �к �го запі�аць.',
+'usercssjsyoucanpreview'           => "'''Падказка:''' выкары�тоўвайце кнопку «Пап�р�дні прагл�д», каб па�прабаваць новы код CSS/JS перад тым �к �го запі�аць.",
 'usercsspreview'                   => "'''Пам�тайце, што г�та толькі пап�р�дні прагл�д Вашага CSS. �н �шч� не запі�аны!'''",
 'userjspreview'                    => "'''Пам�тайце, што г�та толькі пап�р�дні прагл�д Вашага JavaScript, ён �шч� не запі�аны!'''",
 'userinvalidcssjstitle'            => "'''Увага:''' н�ма т�мы афармленьн� «$1».
 Пам�тайце, што ўла�ны� �таронкі .css і .js павінны мець назву, �ка� �кладаецца з малых літараў, напрыклад, {{ns:user}}:Хто�ьці/monobook.css, а не {{ns:user}}:Хто�ьці/Monobook.css.",
 'updated'                          => '(�бноўлена)',
-'note'                             => '<strong>Заўвага: </strong>',
-'previewnote'                      => '<strong>Г�та толькі пап�р�дні прагл�д і зьмены �шч� не былі захаваны�!</strong>',
+'note'                             => "'''Заўвага: '''",
+'previewnote'                      => "'''Г�та толькі пап�р�дні прагл�д і зьмены �шч� не былі захаваны�!'''",
 'previewconflict'                  => 'Г�та пап�р�дні прагл�д т�к�ту зь верхн�га вакна р�дагаваньн�, так ён будзе выгл�даць, калі Вы вырашыце �го захаваць.',
-'session_fail_preview'             => '<strong>�е атрымала�� захаваць Вашую праўку праз тое, што былі �трачаны� зьве�ткі пра ���ію.
-Калі ла�ка, па�прабуйце �шч� раз. Калі памылка н� зьнікне, па�прабуйце [[Special:UserLogout|вый�ьці з �ы�т�мы]] і ўвай�ьці ізноў.</strong>',
-'session_fail_preview_html'        => "<strong>�е атрымала�� захаваць Вашую праўку праз тое, што былі �трачаны� зьве�ткі пра ���ію.</strong>
+'session_fail_preview'             => "'''�е атрымала�� захаваць Вашую праўку праз тое, што былі �трачаны� зьве�ткі пра ���ію.
+Калі ла�ка, па�прабуйце �шч� раз. Калі памылка н� зьнікне, па�прабуйце [[Special:UserLogout|вый�ьці з �ы�т�мы]] і ўвай�ьці ізноў.'''",
+'session_fail_preview_html'        => "'''�е атрымала�� захаваць Вашую праўку праз тое, што былі �трачаны� зьве�ткі пра ���ію.'''
 
 ''Таму што ў {{GRAMMAR:ме�ны|{{SITENAME}}}} дазволена выкары�тоўваць чы�ты HTML, пап�р�дні прагл�д быў адключаны дл� за�ьц�рогі ад атакаў праз JavaScript.''
 
-<strong>Калі г�та �апраўдна� �проба р�дагаваньн�, калі ла�ка, па�прабуйце �шч� раз. Калі г�та не дапамагае, па�прабуйце [[Special:UserLogout|вый�ьці з �ы�т�мы]] і ўвай�ьці ізноў.</strong>",
-'token_suffix_mismatch'            => '<strong>Вашае р�дагаваньне было адхіленае, таму што Ваш кліент н� можа апрацоўваць знакі пунктуацыі ў акне р�дагаваньн�.
+'''Калі г�та �апраўдна� �проба р�дагаваньн�, калі ла�ка, па�прабуйце �шч� раз. Калі г�та не дапамагае, па�прабуйце [[Special:UserLogout|вый�ьці з �ы�т�мы]] і ўвай�ьці ізноў.'''",
+'token_suffix_mismatch'            => "'''Вашае р�дагаваньне было адхіленае, таму што Ваш кліент н� можа апрацоўваць знакі пунктуацыі ў акне р�дагаваньн�.
 Р�дагаваньне было �ка�аванае дл� таго, каб пазьбегнуць зьнішч�ньн� т�к�ту �таронкі.
-Такі� памылкі здараюцца, калі Вы выкары�тоўваеце ананімны прок�і-��рв�р, �кі ўтрымлівае памылкі.</strong>',
+Такі� памылкі здараюцца, калі Вы выкары�тоўваеце ананімны прок�і-��рв�р, �кі ўтрымлівае памылкі.'''",
 'editing'                          => 'Р�дагаваньне: $1',
 'editingsection'                   => 'Р�дагаваньне: $1 (��кцы�)',
-'editingcomment'                   => 'Р�дагаваньне: $1 (кам�нтар)',
+'editingcomment'                   => 'Р�дагаваньне: $1 (нова� ��кцы�)',
 'editconflict'                     => 'Канфлікт р�дагаваньн�: $1',
 'explainconflict'                  => "�ехта зьм�ніў �таронку падча� Вашага р�дагаваньн�.
 У верхнім т�к�тавым акне знаходзіцца ц�перашні зьме�т �таронкі.
@@ -830,29 +834,30 @@ $2',
 Калі Вы наці�ьніце «Захаваць зьмены», будзе захаваны '''толькі''' т�к�т верхн�га вакна.",
 'yourtext'                         => 'Ваш т�к�т',
 'storedversion'                    => 'Захавана� в�р�і�',
-'nonunicodebrowser'                => '<strong>П�ПЯРЭДЖ��Ь�Е: Ваш браўз�р не працуе з кадаваньнем UTF-8 (Unicode).
-У выніку г�тага ў�е �ымбалі н� ўключаны� ў ASCII будуць заменены� на іх ша�наццаткавы� коды.</strong>',
-'editingold'                       => '<strong>П�ПЯРЭДЖ��Ь�Е: Вы р�дагуеце �а�тар�лую в�р�ію г�тай �таронкі.
-Калі Вы па�прабуеце захаваць �е, любы� зьмены, зроблены� па�ьл� г�тай в�р�іі, будуць �трачаны�.</strong>',
+'nonunicodebrowser'                => "'''П�ПЯРЭДЖ��Ь�Е: Ваш браўз�р не працуе з кадаваньнем UTF-8 (Unicode).
+У выніку г�тага ў�е �ымбалі н� ўключаны� ў ASCII будуць заменены� на іх ша�наццаткавы� коды.'''",
+'editingold'                       => "'''П�ПЯРЭДЖ��Ь�Е: Вы р�дагуеце �а�тар�лую в�р�ію г�тай �таронкі.
+Калі Вы па�прабуеце захаваць �е, любы� зьмены, зроблены� па�ьл� г�тай в�р�іі, будуць �трачаны�.'''",
 'yourdiff'                         => '�дрозьненьні',
-'copyrightwarning'                 => 'Калі ла�ка, зьв�рніце ўвагу на тое, што ў�е дадаткі і зьмены ў {{GRAMMAR:ме�ны|{{SITENAME}}}} разгл�даюцца �к выдадзены� ў адпаведна�ьці з умовамі ліц�нзіі $2 (гл�дзіце падраб�зна�ьці на $1). Калі Вы �упраць таго, каб Вашы� мат�ры�лы неабмежавана р�дагавала�� і ра�паў�юджвала��, не дадавайце іх.<br />
+'copyrightwarning'                 => "Калі ла�ка, зьв�рніце ўвагу на тое, што ў�е дадаткі і зьмены ў {{GRAMMAR:ме�ны|{{SITENAME}}}} разгл�даюцца �к выдадзены� ў адпаведна�ьці з умовамі ліц�нзіі $2 (гл�дзіце падраб�зна�ьці на $1). Калі Вы �упраць таго, каб Вашы� мат�ры�лы неабмежавана р�дагавала�� і ра�паў�юджвала��, не дадавайце іх.<br />
 Вы так�ама абав�зуеце��, што Ваш мат�ры�л напі�аны а�абі�та Вамі або ўз�ты з грамадзкай ула�на�ьці альбо падобных вольных крыніцаў.
-<strong>�ЕЛЬГ� БЕЗ Д�ЗВОЛУ Д�Д�В�ЦЬ М�ТЭРЫЯЛЫ, �Б�РО�Е�ЫЯ �ЎТ�РСКІМ ПР�В�М!</strong>',
-'copyrightwarning2'                => 'Калі ла�ка, заўважце, што ўве�ь унё�ак ў {{GRAMMAR:вінавальны|{{SITENAME}}}} можа р�дагавацца, зьм�н�цца і выдал�цца іншымі ўдзельнікамі.
+'''�ЕЛЬГ� БЕЗ Д�ЗВОЛУ Д�Д�В�ЦЬ М�ТЭРЫЯЛЫ, �Б�РО�Е�ЫЯ �ЎТ�РСКІМ ПР�В�М!'''",
+'copyrightwarning2'                => "Калі ла�ка, заўважце, што ўве�ь унё�ак ў {{GRAMMAR:вінавальны|{{SITENAME}}}} можа р�дагавацца, зьм�н�цца і выдал�цца іншымі ўдзельнікамі.
 Калі Вы з г�тым н� згодны�, калі ла�ка, не зьм�шчайце �юды Вашы� т�к�ты.<br />
 Разьм�шч�ньнем тут т�к�таў, Вы д�кл�руеце, што Вы зь�ўл�еце�� іх аўтарам, ці Вы �капі�валі іх з крыніцы, �ка� дазвал�е вольнае выкары�таньне �ваіх т�к�таў (дзел� падраб�зна�ьц�ў гл�дзіце $1).
 
-<strong>К�ЛІ Л�СК�, �Е ЗЬМЯШЧ�ЙЦЕ ТУТ БЕЗ Д�ЗВОЛУ М�ТЭРЫЯЛЫ, ЯКІЯ �ХОЎВ�ЮЦЦ� �ЎТ�РСКІМ ПР�В�М!</strong>',
-'longpagewarning'                  => "<strong>П�ПЯРЭДЖ��Ь�Е: Г�та� �таронка ўтрымлівае $1 {{PLURAL:$1|кіл�байт|кіл�байты|кіл�байтаў}}; некаторы� браўз�ры могуць мець праблемы пры адлю�траваньні �таронак аб'ёмам болей за 32 кб.
-Калі г�та магчыма, па�прабуйце падз�ліць зьме�т �таронкі на больш дробны� ча�ткі.</strong>",
-'longpageerror'                    => "<strong>П�МЫЛК�: �б'ём т�к�ту, �кі Вы �прабуеце запі�аць �кладае $1 {{PLURAL:$1|кіл�байт|кіл�байты|кіл�байтаў}}. �б'ём �таронкі н� можа перавышаць $2 {{PLURAL:$2|кіл�байт|кіл�байты|кіл�байтаў}}. Старонка н� можа быць захавана�.</strong>",
-'readonlywarning'                  => '<strong>П�ПЯРЭДЖ��Ь�Е: База зьве�так была забл�кавана� дл� т�хнічнага аб�лугоўваньн�, таму немагчыма зараз захаваць Вашы� зьмены.
+'''К�ЛІ Л�СК�, �Е ЗЬМЯШЧ�ЙЦЕ ТУТ БЕЗ Д�ЗВОЛУ М�ТЭРЫЯЛЫ, ЯКІЯ �ХОЎВ�ЮЦЦ� �ЎТ�РСКІМ ПР�В�М!'''",
+'longpagewarning'                  => "'''П�ПЯРЭДЖ��Ь�Е: Г�та� �таронка ўтрымлівае $1 {{PLURAL:$1|кіл�байт|кіл�байты|кіл�байтаў}}; некаторы� браўз�ры могуць мець праблемы пры адлю�траваньні �таронак аб'ёмам болей за 32 кб.
+Калі г�та магчыма, па�прабуйце падз�ліць зьме�т �таронкі на больш дробны� ча�ткі.'''",
+'longpageerror'                    => "'''П�МЫЛК�: �б'ём т�к�ту, �кі Вы �прабуеце запі�аць �кладае $1 {{PLURAL:$1|кіл�байт|кіл�байты|кіл�байтаў}}. �б'ём �таронкі н� можа перавышаць $2 {{PLURAL:$2|кіл�байт|кіл�байты|кіл�байтаў}}. Старонка н� можа быць захавана�.'''",
+'readonlywarning'                  => "'''П�ПЯРЭДЖ��Ь�Е: База зьве�так была забл�кавана� дл� т�хнічнага аб�лугоўваньн�, таму немагчыма зараз захаваць Вашы� зьмены.
+Вы можаце �капі�ваць т�к�т у файл на Вашым кампутары, а пазьней захаваць �юды.'''
 
-Па�прабуйце захаваць т�к�т на Вашым кампутары, а потым захаваць �юды.</strong>',
-'protectedpagewarning'             => '<strong>П�ПЯРЭДЖ��Ь�Е: Г�та� �таронка была абаронена�, таму толькі адміні�тратары могуць р�дагаваць �е.</strong>',
+�дміні�тратар, �кі забл�каваў базу зьве�так, прапанаваў на�тупнае тлумач�ньне: $1",
+'protectedpagewarning'             => "'''П�ПЯРЭДЖ��Ь�Е: Г�та� �таронка была абаронена�, таму толькі адміні�тратары могуць р�дагаваць �е.'''",
 'semiprotectedpagewarning'         => "'''Заўвага:''' Г�та� �таронка была абаронена� і р�дагаваць �е могуць толькі зар�гі�траваны� ўдзельнікі.",
 'cascadeprotectedwarning'          => "'''Пап�р�джаньне:''' Г�та� �таронка абаронена�, толькі ўдзельнікі з правамі адміні�тратараў могуць р�дагаваць �е, таму што �на ўключана� ў {{PLURAL:$1|на�тупную ка�кадна-абароненую �таронку|на�тупны� ка�кадна-абаронены� �таронкі}}:",
-'titleprotectedwarning'            => '<strong>П�ПЯРЭДЖ��Ь�Е: Г�та� �таронка была абаронена� і �тварыць �е могуць толькі зар�гі�траваны� ўдзельнікі.</strong>',
+'titleprotectedwarning'            => "'''П�ПЯРЭДЖ��Ь�Е: г�та� �таронка была абаронена� і дл� �е �твар�ньн� патрабуюцца [[Special:ListGroupRights|адпаведны� правы]].'''",
 'templatesused'                    => '�а г�тай �таронцы выкары�таны� на�тупны� шаблёны:',
 'templatesusedpreview'             => 'У г�тым прагл�дзе выкары�таны� на�тупны� шаблёны:',
 'templatesusedsection'             => 'У г�тай ��кцыі выкары�таны� на�тупны� шаблёны:',
@@ -870,11 +875,21 @@ $2',
 
 Уп�ўніце��, што �твар�ньне г�тай �таронкі неабходнае.
 �іж�й знаходзіцца журнал выдаленьн�ў г�тай �таронкі:",
+'deleted-notice'                   => 'Г�та �таронка была выдалена�. Журнал выдаленьн�ў дл� г�тай �таронкі пададзены ніж�й.',
+'deletelog-fulllog'                => 'Паказаць журнал цалкам',
+'edit-hook-aborted'                => 'Р�дагаваньне �ка�аванае прац�дурай-перахопнікам.
+Тлумач�ньн�ў не было.',
+'edit-gone-missing'                => '�емагчыма абнавіць �таронку.
+Падобна, што �на была выдалена�.',
+'edit-conflict'                    => 'Канфлікт р�дагаваньн�ў.',
+'edit-no-change'                   => 'Вашае р�дагаваньне было праігнараванае, таму што ў т�к�т не былі ўне�ены� зьмены.',
+'edit-already-exists'              => '�емагчыма �тварыць новую �таронку.
+Яна ўжо і�нуе.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Пап�р�джаньне: Г�та� �таронка ўтрымлівае зашмат працаёмі�тых зваротаў да функцы�ў пар��ра.
+'expensive-parserfunction-warning'        => 'Пап�р�джаньне: г�та� �таронка ўтрымлівае зашмат працаёмі�тых зваротаў да функцы�ў пар��ра.
 
-Іх павінна быць н� болей за $2, а ц�пер ўтрымліваецца $1.',
+Павінна быць н� болей за $2 {{PLURAL:$2|зварот|звароты|зваротаў}}, а ц�пер ўтрымліваецца {{PLURAL:$1|$1 зварот|$1 звароты|$1 зваротаў}}.',
 'expensive-parserfunction-category'       => 'Старонкі, �кі� ўтрымліваюць зашмат працаёмі�тых зваротаў да функцы�ў пар��ра',
 'post-expand-template-inclusion-warning'  => 'Пап�р�джаньне: Памер уключаемых шаблёнаў занадта в�лікі.
 �екаторы� шаблёны н� будуць уключаны�.',
@@ -882,6 +897,8 @@ $2',
 'post-expand-template-argument-warning'   => 'Увага: Г�та� �таронка ўтрымлівае прынам�і адзін парам�тар шаблёна, �кі мае занадта в�лікі выгл�д у разгорнутым выгл�дзе.
 Г�ты� парам�тры былі прапушчаны�.',
 'post-expand-template-argument-category'  => 'Старонкі, у �кіх прапушчаны� парам�тры шаблёнаў',
+'parser-template-loop-warning'            => 'Вы�ўлены цыкль у шаблёнах: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Перавышана м�жа глыбіні р�кур�іі шаблёнаў ($1)',
 
 # "Undo" feature
 'undo-success' => 'Р�дагаваньне можа быць адмененае. Калі ла�ка, параўнайце адрозьненьні паміж в�р�і�мі, каб уп�ўніцца, што г�та адпаведны� зьмены, а потым запішыце зьмены дл� �канч�ньн� р�дагаваньн�.',
@@ -896,28 +913,28 @@ $2',
 Прычына бл�каваньн� пададзена� $3: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Паказаць журналы падзе�ў дл� г�тай �таронкі',
-'nohistory'           => 'Гі�торы� зьменаў дл� г�тай �таронкі ад�утнічае.',
-'revnotfound'         => 'В�р�і� н� знойдзена�',
-'revnotfoundtext'     => 'Ранейша� в�р�і� г�тай �таронкі н� знойдзена�. Праверце �па�ылку, празь �кую Вы �прабавалі перай�ьці на г�тую �таронку.',
-'currentrev'          => 'Ц�перашн�� в�р�і�',
-'revisionasof'        => 'В�р�і� ад $1',
-'revision-info'       => 'В�р�і� ад $1, аўтар $2',
-'previousrevision'    => '�Пап�р�дн�� в�р�і�',
-'nextrevision'        => '�а�тупна� в�р�і�→',
-'currentrevisionlink' => 'Ц�перашн�� в�р�і�',
-'cur'                 => 'ц�п',
-'next'                => 'на�тупна�',
-'last'                => 'пап�р�дн��',
-'page_first'          => 'перша�',
-'page_last'           => 'апошн��',
-'histlegend'          => 'Параўнаньне: пазначце кропкамі дзьве в�р�іі дл� параўнаньн� і наці�ьніце enter альбо кнопку ўнізе.<br />
+'viewpagelogs'           => 'Паказаць журналы падзе�ў дл� г�тай �таронкі',
+'nohistory'              => 'Гі�торы� зьменаў дл� г�тай �таронкі ад�утнічае.',
+'currentrev'             => 'Ц�перашн�� в�р�і�',
+'currentrev-asof'        => 'Ц�перашн�� в�р�і� на $1',
+'revisionasof'           => 'В�р�і� ад $1',
+'revision-info'          => 'В�р�і� ад $1, аўтар $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Пап�р�дн�� в�р�і�',
+'nextrevision'           => '�а�тупна� в�р�і� →',
+'currentrevisionlink'    => 'Ц�перашн�� в�р�і�',
+'cur'                    => 'ц�п',
+'next'                   => 'на�тупна�',
+'last'                   => 'пап�р�дн��',
+'page_first'             => 'перша�',
+'page_last'              => 'апошн��',
+'histlegend'             => 'Параўнаньне: пазначце кропкамі дзьве в�р�іі дл� параўнаньн� і наці�ьніце enter альбо кнопку ўнізе.<br />
 Тлумач�ньне: (ц�п) = адрозьненьні ад ц�перашн�й в�р�іі, (пап�р�дн��) = адрозьненьні ад пап�р�дн�й в�р�іі, д = дробна� праўка.',
-'deletedrev'          => '[выдалена�]',
-'histfirst'           => 'най�тар�йшы�',
-'histlast'            => 'найнавейшы�',
-'historysize'         => '($1 {{PLURAL:$1|байт|байты|байтаў}})',
-'historyempty'        => '(пу�та)',
+'history-fieldset-title' => 'Пошук у гі�торыі',
+'deletedrev'             => '[выдалена�]',
+'histfirst'              => 'най�тар�йшы�',
+'histlast'               => 'найнавейшы�',
+'historysize'            => '($1 {{PLURAL:$1|байт|байты|байтаў}})',
+'historyempty'           => '(пу�та)',
 
 # Revision feed
 'history-feed-title'          => 'Гі�торы� зьменаў',
@@ -1002,6 +1019,7 @@ $2',
 'mergehistory-invalid-destination' => 'М�тава� �таронка му�іць мець кар�ктную назву.',
 'mergehistory-autocomment'         => "Гі�торы� [[:$1]] аб'�днана� ў [[:$2]]",
 'mergehistory-comment'             => "Гі�торы� [[:$1]] аб'�днана� ў [[:$2]]: $3",
+'mergehistory-same-destination'    => 'Крынічна� і м�тава� �таронкі н� могуць �упадаць',
 
 # Merge log
 'mergelog'           => "Журнал аб'�днаньн�ў",
@@ -1014,122 +1032,203 @@ $2',
 'difference'              => '(�дрозьненьні паміж в�р�і�мі)',
 'lineno'                  => 'Радок $1:',
 'compareselectedversions' => 'Параўнаць выбраны� в�р�іі',
+'visualcomparison'        => 'Візуальнае параўнаньне',
+'wikicodecomparison'      => 'Параўнаньне вікі-т�к�ту',
 'editundo'                => 'адм�ніць',
 'diff-multi'              => '($1 {{PLURAL:$1|прамежна� в�р�і� не паказана�|прамежны� в�р�іі не паказаны�|прамежных в�р�і�ў не паказаны�}}.)',
+'diff-movedto'            => 'перане�ены ў $1',
+'diff-styleadded'         => 'дададзены �тыль $1',
+'diff-added'              => 'дададзены $1',
+'diff-changedto'          => 'зьменены на $1',
+'diff-movedoutof'         => 'перане�ены з $1',
+'diff-styleremoved'       => 'выдалены �тыль $1',
+'diff-removed'            => 'выдалены $1',
+'diff-changedfrom'        => 'зьменены з $1',
+'diff-src'                => 'крыніца',
+'diff-withdestination'    => 'з м�тай $1',
+'diff-with'               => '&#32;з $1 $2',
+'diff-with-final'         => '&#32;Ñ– $1 $2',
+'diff-width'              => 'шырын�',
+'diff-height'             => 'вышын�',
+'diff-p'                  => "'''абзац'''",
+'diff-blockquote'         => "'''цытата'''",
+'diff-h1'                 => "'''загаловак (1-ы ўзровень)'''",
+'diff-h2'                 => "'''загаловак (2-і ўзровень)'''",
+'diff-h3'                 => "'''загаловак (3-і ўзровень)'''",
+'diff-h4'                 => "'''загаловак (4-ы ўзровень)'''",
+'diff-h5'                 => "'''загаловак (5-ы ўзровень)'''",
+'diff-pre'                => "'''блёк зададзенага фармату'''",
+'diff-div'                => "'''падзел'''",
+'diff-ul'                 => "'''неўпарадкаваны �ьпі�'''",
+'diff-ol'                 => "'''упарадкаваны �ьпі�'''",
+'diff-li'                 => "'''�лем�нт �ьпі�у'''",
+'diff-table'              => "'''табліца'''",
+'diff-tbody'              => "'''зьме�т табліцы'''",
+'diff-tr'                 => "'''радок'''",
+'diff-td'                 => "'''�ч�йка'''",
+'diff-th'                 => "'''загаловак'''",
+'diff-br'                 => "'''разрыў'''",
+'diff-hr'                 => "'''гарызантальна� ліні�'''",
+'diff-code'               => "'''блёк кампутарнага коду'''",
+'diff-dl'                 => "'''�ьпі� азнач�ньн�ў'''",
+'diff-dt'                 => "'''т�рмін азнач�ньн�'''",
+'diff-dd'                 => "'''азнач�ньне'''",
+'diff-input'              => "'''увод'''",
+'diff-form'               => "'''форма'''",
+'diff-img'                => "'''вы�ва'''",
+'diff-span'               => "'''ды�пазон'''",
+'diff-a'                  => "'''�па�ылка'''",
+'diff-i'                  => "'''кур�іў'''",
+'diff-b'                  => "'''тлу�ты шрыфт'''",
+'diff-strong'             => "'''тлу�ты'''",
+'diff-em'                 => "'''з прыці�кам'''",
+'diff-font'               => "'''шрыфт'''",
+'diff-big'                => "'''в�лікі шрыфт'''",
+'diff-del'                => "'''выдалена'''",
+'diff-tt'                 => "'''роўнашырокі шрыфт'''",
+'diff-sub'                => "'''ніжні інд�к�'''",
+'diff-sup'                => "'''верхні інд�к�'''",
+'diff-strike'             => "'''перакр��ьлены'''",
 
 # Search results
-'searchresults'             => 'Вынікі пошуку',
-'searchresulttext'          => 'Дл� атрыманьн� больш падраб�знай інфармацыі пра пошук у {{GRAMMAR:ме�ны|{{SITENAME}}}}, гл�дзіце [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Па запыце '''[[:$1]]''' ([[Special:Prefixindex/$1|у�е �таронкі, �кі� пачынаюцца з «$1»]] | [[Special:WhatLinksHere/$1|у�е �таронкі, �кі� �па�ылаюцца на «$1»]])",
-'searchsubtitleinvalid'     => "Па запыце '''$1'''",
-'noexactmatch'              => "'''Старонкі з г�ткай назвай не і�нуе.''' Вы можаце '''[[:$1|�тварыць г�тую �таронку]]'''.",
-'noexactmatch-nocreate'     => "'''�е і�нуе �таронкі з назвай «$1».'''",
-'toomanymatches'            => 'Знойдзена зашмат �упадзеньн�ў з запытам, калі ла�ка, па�прабуйце зьм�ніць запыт',
-'titlematches'              => 'Супадзеньні ў назвах �таронак',
-'notitlematches'            => 'Супадзеньні ў назвах �таронак н� знойдзены�',
-'textmatches'               => 'Супадзеньні ў т�к�тах �таронак',
-'notextmatches'             => 'Супадзеньні ў т�к�тах �таронак н� знойдзены�',
-'prevn'                     => 'пап�р�дні� $1',
-'nextn'                     => 'на�тупны� $1',
-'viewprevnext'              => 'Паказаць ($1) ($2) ($3)',
-'search-result-size'        => '$1 ($2 {{PLURAL:$2|�лова|�ловы|�лоў}})',
-'search-result-score'       => '�дпаведна�ьць: $1%',
-'search-redirect'           => '(перанакіраваньне $1)',
-'search-section'            => '(��кцы� $1)',
-'search-suggest'            => 'Вы мелі на ўвазе: $1',
-'search-interwiki-caption'  => 'Сумежны� праекты',
-'search-interwiki-default'  => 'вынікі з $1:',
-'search-interwiki-more'     => '(�шч�)',
-'search-mwsuggest-enabled'  => 'з парадамі',
-'search-mwsuggest-disabled' => 'без парад',
-'search-relatedarticle'     => 'Зьв�заны',
-'mwsuggest-disable'         => '�дключыць AJAX-падказкі',
-'searchrelated'             => 'зьв�заны',
-'searchall'                 => 'у�е',
-'showingresults'            => "�іж�й {{PLURAL:$1|паданы|паданы�|паданы�}} да '''$1''' {{PLURAL:$1|выніку|вынікаў|вынікаў}}, пачынаючы з #<b>$2</b>.",
-'showingresultsnum'         => "�іж�й паказаны �ьпі� з '''$3''' {{PLURAL:$3|выніка|вынікаў|вынікаў}}, пачынаючы ад № '''$2'''.",
-'showingresultstotal'       => "�іж�й {{PLURAL:$3|паказаны '''$1''' вынік з '''$3'''|паказаны� вынікі '''$1 — $2''' з '''$3'''}}",
-'nonefound'                 => "'''Увага''': Па змоўчаньні пошук в�дзецца не ва ў�іх пра�торах назваў. Тр�ба дапі�аць да запыту ''у�е:'' каб шукаць па ў�ім зьме�ьце (уключаючы абмеркаваньні, шаблёны і г.д.) альбо дадаць да запыту неабходную пра�тору назваў.",
-'powersearch'               => 'Пошук',
-'powersearch-legend'        => 'Уда�каналены пошук',
-'powersearch-ns'            => 'Шукаць у пра�торах назваў:',
-'powersearch-redir'         => 'Паказваць перанакіраваньні',
-'powersearch-field'         => 'Шукаць',
-'search-external'           => 'Вонкавы пошук',
-'searchdisabled'            => 'Функцы� пошуку ў {{GRAMMAR:ме�ны|{{SITENAME}}}} адключана�.
+'searchresults'                    => 'Вынікі пошуку',
+'searchresults-title'              => 'Вынікі пошуку дл� «$1»',
+'searchresulttext'                 => 'Дл� атрыманьн� больш падраб�знай інфармацыі пра пошук у {{GRAMMAR:ме�ны|{{SITENAME}}}}, гл�дзіце [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Па запыце '''[[:$1]]''' ([[Special:Prefixindex/$1|у�е �таронкі, �кі� пачынаюцца з «$1»]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|у�е �таронкі, �кі� �па�ылаюцца на «$1»]])",
+'searchsubtitleinvalid'            => "Па запыце '''$1'''",
+'noexactmatch'                     => "'''Старонкі з г�ткай назвай не і�нуе.''' Вы можаце '''[[:$1|�тварыць г�тую �таронку]]'''.",
+'noexactmatch-nocreate'            => "'''�е і�нуе �таронкі з назвай «$1».'''",
+'toomanymatches'                   => 'Знойдзена зашмат �упадзеньн�ў з запытам, калі ла�ка, па�прабуйце зьм�ніць запыт',
+'titlematches'                     => 'Супадзеньні ў назвах �таронак',
+'notitlematches'                   => 'Супадзеньні ў назвах �таронак н� знойдзены�',
+'textmatches'                      => 'Супадзеньні ў т�к�тах �таронак',
+'notextmatches'                    => 'Супадзеньні ў т�к�тах �таронак н� знойдзены�',
+'prevn'                            => 'пап�р�дні� $1',
+'nextn'                            => 'на�тупны� $1',
+'viewprevnext'                     => 'Паказаць ($1) ($2) ($3)',
+'searchmenu-legend'                => 'У�таноўкі пошуку',
+'searchmenu-exists'                => "* Старонка '''[[$1]]'''",
+'searchmenu-new'                   => "'''Стварыць �таронку «[[:$1|$1]]» у {{GRAMMAR:ме�ны|{{SITENAME}}}}!'''",
+'searchhelp-url'                   => 'Help:Зьме�т',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Прагл�дзець �таронкі з г�тым пр�фік�ам]]',
+'searchprofile-articles'           => 'Старонкі �а зьме�там',
+'searchprofile-articles-and-proj'  => 'Старонкі �а зьме�там і �таронкі праекту',
+'searchprofile-project'            => 'Старонкі праекту',
+'searchprofile-images'             => 'Файлы',
+'searchprofile-everything'         => 'У�ё',
+'searchprofile-advanced'           => 'Пашыраны',
+'searchprofile-articles-tooltip'   => 'Пошук у $1',
+'searchprofile-project-tooltip'    => 'Пошук у $1',
+'searchprofile-images-tooltip'     => 'Пошук файлаў',
+'searchprofile-everything-tooltip' => 'Шукаць у�юды (уключна �а �таронкамі абмеркаваньн�)',
+'searchprofile-advanced-tooltip'   => 'Шукаць у дадатковых пра�торах назваў',
+'prefs-search-nsdefault'           => 'Шукаць з выкары�таньнем змоўчаньн�ў:',
+'prefs-search-nscustom'            => 'Шукаць у дадатковых пра�торах назваў:',
+'search-result-size'               => '$1 ($2 {{PLURAL:$2|�лова|�ловы|�лоў}})',
+'search-result-score'              => '�дпаведна�ьць: $1%',
+'search-redirect'                  => '(перанакіраваньне $1)',
+'search-section'                   => '(��кцы� $1)',
+'search-suggest'                   => 'Вы мелі на ўвазе: $1',
+'search-interwiki-caption'         => 'Сумежны� праекты',
+'search-interwiki-default'         => 'вынікі з $1:',
+'search-interwiki-more'            => '(�шч�)',
+'search-mwsuggest-enabled'         => 'з парадамі',
+'search-mwsuggest-disabled'        => 'без парад',
+'search-relatedarticle'            => 'Зьв�заны',
+'mwsuggest-disable'                => '�дключыць AJAX-падказкі',
+'searchrelated'                    => 'зьв�заны',
+'searchall'                        => 'у�е',
+'showingresults'                   => "�іж�й {{PLURAL:$1|паданы|паданы�|паданы�}} да '''$1''' {{PLURAL:$1|выніку|вынікаў|вынікаў}}, пачынаючы з #<b>$2</b>.",
+'showingresultsnum'                => "�іж�й паказаны �ьпі� з '''$3''' {{PLURAL:$3|выніка|вынікаў|вынікаў}}, пачынаючы ад № '''$2'''.",
+'showingresultstotal'              => "�іж�й {{PLURAL:$4|паказаны '''$1''' вынік з '''$3'''|паказаны� вынікі '''$1 — $2''' з '''$3'''}}",
+'nonefound'                        => "'''Увага''': Па змоўчваньні пошук в�дзецца не ва ў�іх пра�торах назваў. Тр�ба дапі�аць да запыту ''у�е:'' каб шукаць па ў�ім зьме�ьце (уключаючы абмеркаваньні, шаблёны і г.д.) альбо дадаць да запыту неабходную пра�тору назваў.",
+'search-nonefound'                 => 'Супадзеньн�ў па запыце н� знойдзена.',
+'powersearch'                      => 'Пошук',
+'powersearch-legend'               => 'Уда�каналены пошук',
+'powersearch-ns'                   => 'Шукаць у пра�торах назваў:',
+'powersearch-redir'                => 'Паказваць перанакіраваньні',
+'powersearch-field'                => 'Шукаць',
+'search-external'                  => 'Вонкавы пошук',
+'searchdisabled'                   => 'Функцы� пошуку ў {{GRAMMAR:ме�ны|{{SITENAME}}}} адключана�.
 Вы можаце пашукаць з дапамогай Google, але заўважце, што там інфармацы� пра �таронкі {{GRAMMAR:родны|{{SITENAME}}}} можа быць �а�тар�лай.',
 
 # Preferences page
-'preferences'              => 'У�таноўкі',
-'mypreferences'            => 'Мае ў�таноўкі',
-'prefs-edits'              => 'Колька�ьць р�дагаваньн�ў:',
-'prefsnologin'             => 'Вы не ўвайшлі ў �ы�т�му',
-'prefsnologintext'         => 'Вам тр�ба <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ўвай�ьці ў �ы�т�му]</span>, каб зьм�н�ць �вае ў�таноўкі.',
-'prefsreset'               => '�дноўлены� ў�таноўкі па змоўчаньні.',
-'qbsettings'               => 'Пан�ль хуткага до�тупу',
-'qbsettings-none'          => '�е паказваць',
-'qbsettings-fixedleft'     => 'Замацавана� зьлева',
-'qbsettings-fixedright'    => 'Замацавана� �права',
-'qbsettings-floatingleft'  => 'Рухома� зьлева',
-'qbsettings-floatingright' => 'Плавае �права',
-'changepassword'           => 'Зьм�ніць пароль',
-'skin'                     => '�фармленьне',
-'math'                     => 'Мат�матыка',
-'dateformat'               => 'Фармат даты',
-'datedefault'              => 'Па змоўчаньні',
-'datetime'                 => 'Дата і ча�',
-'math_failure'             => '�е атрымала�� разабраць',
-'math_unknown_error'       => 'нев�дома� памылка',
-'math_unknown_function'    => 'нев�дома� функцы�',
-'math_lexing_error'        => 'лек�ычна� памылка',
-'math_syntax_error'        => '�ынтак�ычна� памылка',
-'math_image_error'         => '�е атрымала�� пераўтварыць у PNG;
+'preferences'               => 'У�таноўкі',
+'mypreferences'             => 'Мае ў�таноўкі',
+'prefs-edits'               => 'Колька�ьць р�дагаваньн�ў:',
+'prefsnologin'              => 'Вы не ўвайшлі ў �ы�т�му',
+'prefsnologintext'          => 'Вам тр�ба <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ўвай�ьці ў �ы�т�му]</span>, каб зьм�н�ць �вае ў�таноўкі.',
+'prefsreset'                => '�дноўлены� ў�таноўкі па змоўчаньні.',
+'qbsettings'                => 'Пан�ль хуткага до�тупу',
+'qbsettings-none'           => '�е паказваць',
+'qbsettings-fixedleft'      => 'Замацавана� зьлева',
+'qbsettings-fixedright'     => 'Замацавана� �права',
+'qbsettings-floatingleft'   => 'Рухома� зьлева',
+'qbsettings-floatingright'  => 'Плавае �права',
+'changepassword'            => 'Зьм�ніць пароль',
+'skin'                      => '�фармленьне',
+'skin-preview'              => 'Пап�р�дні прагл�д',
+'math'                      => 'Мат�матыка',
+'dateformat'                => 'Фармат даты',
+'datedefault'               => 'Па змоўчаньні',
+'datetime'                  => 'Дата і ча�',
+'math_failure'              => '�е атрымала�� разабраць',
+'math_unknown_error'        => 'нев�дома� памылка',
+'math_unknown_function'     => 'нев�дома� функцы�',
+'math_lexing_error'         => 'лек�ычна� памылка',
+'math_syntax_error'         => '�ынтак�ычна� памылка',
+'math_image_error'          => '�е атрымала�� пераўтварыць у PNG;
 �праўдзіце дакладна�ьць у�тал�ваньн� пакетаў latex, dvips, gs, і convert',
-'math_bad_tmpdir'          => '�емагчыма запі�аць ці �тварыць ча�овую дыр�кторыю дл� мат�матыкі',
-'math_bad_output'          => '�емагчыма запі�аць ці �тварыць выходную мат�матычную дыр�кторыю',
-'math_notexvc'             => 'Выканаўчы модуль texvc н� знойдзены.
+'math_bad_tmpdir'           => '�емагчыма запі�аць ці �тварыць ча�овую дыр�кторыю дл� мат�матыкі',
+'math_bad_output'           => '�емагчыма запі�аць ці �тварыць выходную мат�матычную дыр�кторыю',
+'math_notexvc'              => 'Выканаўчы модуль texvc н� знойдзены.
 Калі ла�ка, прачытайце math/README пра �го канфігурацыю.',
-'prefs-personal'           => '��абі�ты� зьве�ткі',
-'prefs-rc'                 => '�пошні� зьмены',
-'prefs-watchlist'          => 'Сьпі� назіраньн�',
-'prefs-watchlist-days'     => 'Колька�ьць дзён дл� паказу ў �ьпі�е назіраньн�:',
-'prefs-watchlist-edits'    => 'Колька�ьць р�дагаваньн�ў дл� паказу ў пашыраным �ьпі�е назіраньн�:',
-'prefs-misc'               => 'Рознае',
-'saveprefs'                => 'Захаваць',
-'resetprefs'               => 'Скінуць',
-'oldpassword'              => 'Стары пароль:',
-'newpassword'              => '�овы пароль:',
-'retypenew'                => 'Паўтарыце новы пароль:',
-'textboxsize'              => 'Р�дагаваньне',
-'rows'                     => 'Радкоў:',
-'columns'                  => 'Слупкоў:',
-'searchresultshead'        => 'Пошук',
-'resultsperpage'           => 'Колька�ьць вынікаў на �таронцы:',
-'contextlines'             => 'Колька�ьць радкоў дл� паказу:',
-'contextchars'             => 'Колька�ьць �ымбал�ў на радок:',
-'stub-threshold'           => 'Мак�ымальны памер �таронкі дл� паказу �па�ылак <a href="#" class="stub">�к на накід</a> (у байтах):',
-'recentchangesdays'        => 'Колька�ьць дзён дл� паказу ў апошніх зьменах:',
-'recentchangescount'       => 'Колька�ьць р�дагаваньн�ў дл� паказу ў апошніх зьменах і гі�торыі, колька�ьць запі�аў у журналах падзе�ў:',
-'savedprefs'               => 'Вашы� ў�таноўкі былі захаваны�.',
-'timezonelegend'           => 'Ча�авы по��',
-'timezonetext'             => '¹�а колькі гадзінаў Ваш м��цовы ча� адрозьніваецца ад ��рв�рнага (UTC).',
-'localtime'                => 'М��цовы ча�',
-'timezoneoffset'           => 'Розьніца¹',
-'servertime'               => 'Ц�перашні ча� на ��рв�ры',
-'guesstimezone'            => 'Запоўніць з браўз�ра',
-'allowemail'               => 'Дазволіць атрыманьне лі�тоў ад іншых удзельнікаў і ўдзельніц',
-'prefs-searchoptions'      => 'Магчыма�ьці пошуку',
-'prefs-namespaces'         => 'Пра�торы назваў',
-'defaultns'                => 'Па змоўчаньні, шукаць у на�тупных пра�торах назваў:',
-'default'                  => 'па змоўчаньні',
-'files'                    => 'Файлы',
+'prefs-personal'            => '��абі�ты� зьве�ткі',
+'prefs-rc'                  => '�пошні� зьмены',
+'prefs-watchlist'           => 'Сьпі� назіраньн�',
+'prefs-watchlist-days'      => 'Колька�ьць дзён дл� паказу ў �ьпі�е назіраньн�:',
+'prefs-watchlist-days-max'  => '(мак�ымальна 7 дзён)',
+'prefs-watchlist-edits'     => 'Колька�ьць р�дагаваньн�ў дл� паказу ў пашыраным �ьпі�е назіраньн�:',
+'prefs-watchlist-edits-max' => '(мак�ымальна� колька�ьць: 1000)',
+'prefs-misc'                => 'Рознае',
+'prefs-resetpass'           => 'Зьм�ніць пароль',
+'saveprefs'                 => 'Захаваць',
+'resetprefs'                => 'Скінуць',
+'textboxsize'               => 'Р�дагаваньне',
+'prefs-edit-boxsize'        => 'Памер акна р�дагаваньн�.',
+'rows'                      => 'Радкоў:',
+'columns'                   => 'Слупкоў:',
+'searchresultshead'         => 'Пошук',
+'resultsperpage'            => 'Колька�ьць вынікаў на �таронцы:',
+'contextlines'              => 'Колька�ьць радкоў дл� паказу:',
+'contextchars'              => 'Колька�ьць �ымбал�ў на радок:',
+'stub-threshold'            => 'Мак�ымальны памер �таронкі дл� паказу �па�ылак <a href="#" class="stub">�к на накід</a> (у байтах):',
+'recentchangesdays'         => 'Колька�ьць дзён дл� паказу ў апошніх зьменах:',
+'recentchangesdays-max'     => '(мак�ымальна $1 {{PLURAL:$1|дзень|дні|дзён}})',
+'recentchangescount'        => 'Колька�ьць р�дагаваньн�ў дл� паказу ў апошніх зьменах, гі�торы�х �таронак і ў журналах, па змоўчваньні:',
+'savedprefs'                => 'Вашы� ў�таноўкі былі захаваны�.',
+'timezonelegend'            => 'Ча�авы по��',
+'timezonetext'              => '¹�а колькі гадзінаў Ваш м��цовы ча� адрозьніваецца ад ��рв�рнага (UTC).',
+'localtime'                 => 'М��цовы ча�:',
+'timezoneselect'            => 'Ча�авы по��:',
+'timezoneuseserverdefault'  => 'Выкары�тоўваць ча�авы по�� ��рв�ра',
+'timezoneuseoffset'         => 'Іншы (пазначце розьніцу ў ча�е)',
+'timezoneoffset'            => 'Розьніца¹:',
+'servertime'                => 'Ча� на ��рв�ры:',
+'guesstimezone'             => 'Запоўніць з браўз�ра',
+'allowemail'                => 'Дазволіць атрыманьне лі�тоў ад іншых удзельнікаў і ўдзельніц',
+'prefs-searchoptions'       => 'Магчыма�ьці пошуку',
+'prefs-namespaces'          => 'Пра�торы назваў',
+'defaultns'                 => 'Па змоўчаньні, шукаць у на�тупных пра�торах назваў:',
+'default'                   => 'па змоўчваньні',
+'files'                     => 'Файлы',
 
 # User rights
 'userrights'                  => 'Кіраваньне правамі ўдзельнікаў і ўдзельніц', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Кіраваньне групамі ўдзельнікаў і ўдзельніц',
 'userrights-user-editname'    => 'Ув�дзіце ім� ўдзельніка:',
 'editusergroup'               => 'Р�дагаваць групы ўдзельнікаў і ўдзельніц',
-'editinguser'                 => "Зьмена правоў удзельніка '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Зьмена правоў удзельніка '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Р�дагаваць групы ўдзельнікаў і ўдзельніц',
 'saveusergroups'              => 'Захаваць групы ўдзельнікаў і ўдзельніц',
 'userrights-groupsmember'     => 'Уваходзіць у:',
@@ -1178,6 +1277,8 @@ $2',
 'right-minoredit'            => 'пазнач�ньне р�дагаваньн�ў �к дробны�',
 'right-move'                 => 'перано� �таронак',
 'right-move-subpages'        => 'перано� �таронак разам зь іх пад�таронкамі',
+'right-move-rootuserpages'   => 'Перано� кар�нных �таронак удзельнікаў',
+'right-movefile'             => 'перайменаваньне файлаў',
 'right-suppressredirect'     => 'не �твараць перанакіраваньне �а �тарой назвы па�ьл� перано�у �таронкі',
 'right-upload'               => 'загрузка файлаў',
 'right-reupload'             => 'перазапі� і�нуючых файлаў',
@@ -1228,9 +1329,46 @@ $2',
 'rightslogentry' => 'зьменена прыналежна�ьць $1 з групы $2 да $3',
 'rightsnone'     => '(н�ма)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'чытаньне г�тай �таронкі',
+'action-edit'                 => 'р�дагаваньне г�тай �таронкі',
+'action-createpage'           => '�твар�ньне �таронак',
+'action-createtalk'           => '�твар�ньне �таронак абмеркаваньн�ў',
+'action-createaccount'        => '�твар�ньне г�тага рахунку ўдзельніка',
+'action-minoredit'            => 'пазнач�ньне г�тай праўкі �к дробнай',
+'action-move'                 => 'перано� г�тай �таронкі',
+'action-move-subpages'        => 'перано� г�тай �таронкі і �е пад�таронак',
+'action-move-rootuserpages'   => 'перано� кар�нных �таронак удзельнікаў',
+'action-movefile'             => 'перайменаваць г�ты файл',
+'action-upload'               => 'загрузку г�тага файла',
+'action-reupload'             => 'перазапі� г�тага файла',
+'action-reupload-shared'      => 'перакрыцьцё г�тага файла ў агульным �ховішчы',
+'action-upload_by_url'        => 'загрузку г�тага файла з URL-адра�у',
+'action-writeapi'             => 'выкары�таньне API дл� запі�аў',
+'action-delete'               => 'выдаленьне г�тай �таронкі',
+'action-deleterevision'       => 'выдаленьне г�тай в�р�іі',
+'action-deletedhistory'       => 'прагл�д выдаленай гі�торыі г�тай �таронкі',
+'action-browsearchive'        => 'пошук выдаленых �таронак',
+'action-undelete'             => 'аднаўленьне г�тай �таронкі',
+'action-suppressrevision'     => 'прагл�д і аднаўленьне г�тай �хаванай в�р�іі',
+'action-suppressionlog'       => 'прагл�д г�тага прыватнага журнала',
+'action-block'                => 'бл�каваньне г�тага ўдзельніка ад р�дагаваньн�ў',
+'action-protect'              => 'зьмену ўзроўню абароны г�тай �таронкі',
+'action-import'               => 'імпарт г�тай �таронкі зь іншай вікі',
+'action-importupload'         => 'імпарт г�тай �таронкі праз загрузку файла',
+'action-patrol'               => 'пазнач�ньне чужых р�дагаваньн�ў �к «патрул�ваны�»',
+'action-autopatrol'           => 'пазнач�ньне ўла�ных р�дагаваньн�ў �к «патрул�ваны�»',
+'action-unwatchedpages'       => 'прагл�д �ьпі�у �таронак, за �кімі ніхто не назірае',
+'action-trackback'            => 'адпраўку trackback',
+'action-mergehistory'         => "аб'�днаньне гі�торыі г�тай �таронкі",
+'action-userrights'           => 'р�дагаваньне правоў у�іх удзельнікаў',
+'action-userrights-interwiki' => 'р�дагаваньне правоў удзельнікаў у іншых вікі',
+'action-siteadmin'            => 'бл�каваньне і разбл�каваньне базы зьве�так',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|зьмена|зьмены|зьменаў}}',
 'recentchanges'                     => '�пошні� зьмены',
+'recentchanges-legend'              => 'У�таноўкі апошніх зьменаў',
 'recentchangestext'                 => 'Сачыце за апошнімі зьменамі ў {{GRAMMAR:ме�ны|{{SITENAME}}}} на г�тай �таронцы.',
 'recentchanges-feed-description'    => 'Сачыць за апошнімі зьменамі ў {{GRAMMAR:ме�ны|{{SITENAME}}}} праз г�тую �тужку.',
 'rcnote'                            => "�іж�й {{PLURAL:$1|пададзена '''$1''' апошн�� зьмена|пададзены� '''$1''' апошні� зьмены|пададзены� '''$1''' апошніх зьменаў}} за {{PLURAL:$2|апошні '''$2''' дзень|апошні� '''$2''' дні|апошні� '''$2''' дзён}}, па �тане на $5, $4.",
@@ -1254,6 +1392,8 @@ $2',
 'rc_categories'                     => '�бмежаваць кат�горы�мі (разьдз�л�йце знакам «|»)',
 'rc_categories_any'                 => 'У�е',
 'newsectionsummary'                 => '/* $1 */ нова� ��кцы�',
+'rc-enhanced-expand'                => 'Паказаць падраб�зна�ьці (патрабуе JavaScript)',
+'rc-enhanced-hide'                  => 'Схаваць падраб�зна�ьці',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Зьв�заны� праўкі',
@@ -1275,11 +1415,11 @@ $2',
 'upload_directory_read_only'  => 'С�рв�р н� мае правоў на запі� у дыр�кторыю загружаных файлаў ($1).',
 'uploaderror'                 => 'Памылка загрузкі',
 'uploadtext'                  => "Ужывайце форму ніж�й дл� загрузкі файлаў.
-Каб пагл�дзець ці адшукаць раней загружаны� файлы, гл�дзіце [[Special:ImageList|�ьпі� загружаных файлаў]], загрузкі так�ама запі�ваюцца ў [[Special:Log/upload|журнал загрузак]], а выдаленьні — у [[Special:Log/delete|журнал выдаленьн�ў]].
+Каб пагл�дзець ці адшукаць раней загружаны� файлы, гл�дзіце [[Special:FileList|�ьпі� загружаных файлаў]], загрузкі так�ама запі�ваюцца ў [[Special:Log/upload|журнал загрузак]], а выдаленьні — у [[Special:Log/delete|журнал выдаленьн�ў]].
 
 Каб улучыць файл у �таронку, ужывайце адзін з на�тупных вары�нтаў:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' дл� поўнай в�р�іі файла
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|Подпі� да вы�вы]]</nowiki></tt>''' дл� вы�вы шырынёй 200 пік��л�ў у рамцы і т�к�там «Подпі� да вы�вы» ў �ка�ьці подпі�у
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' дл� поўнай в�р�іі файла
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|Подпі� да вы�вы]]</nowiki></tt>''' дл� вы�вы шырынёй 200 пік��л�ў у рамцы і т�к�там «Подпі� да вы�вы» ў �ка�ьці подпі�у
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' дл� про�тай �па�ылкі на файл безь �го адлю�траваньн�.",
 'upload-permitted'            => 'Дазволены� тыпы файлаў: $1.',
 'upload-preferred'            => 'Пажаданы� тыпы файлаў: $1.',
@@ -1309,26 +1449,27 @@ $2',
 'largefileserver'             => 'Памер г�тага файла перавышае мак�ымальна дазволены.',
 'emptyfile'                   => 'Загружаны файл, здаецца, пу�ты. Магчыма г�ты адбыло�� з-за памылкі ў назьве файла.
 Удакладніце, ці Вы �апраўды жадаеце загрузіць г�ты файл.',
-'fileexists'                  => 'Файл з такой назвай ужо і�нуе. Калі ла�ка, праверце <strong><tt>$1</tt></strong>, калі Вы н� ўп�ўнены�, што жадаеце �го зам�ніць.',
-'filepageexists'              => 'Старонка апі�аньн� дл� г�тага файла ўжо і�нуе �к <strong><tt>$1</tt></strong>, але файла з такой назвай н�ма.
+'fileexists'                  => "Файл з такой назвай ужо і�нуе. Калі ла�ка, праверце '''<tt>$1</tt>''', калі Вы н� ўп�ўнены�, што жадаеце �го зам�ніць.",
+'filepageexists'              => "Старонка апі�аньн� дл� г�тага файла ўжо і�нуе �к '''<tt>$1</tt>''', але файла з такой назвай н�ма.
 �пі�аньне �кое Вы дадалі н� зь�віцца на �таронцы апі�аньн�.
-Каб �но там зь�віла��, Вам тр�ба р�дагаваць �е �ама�тойна',
-'fileexists-extension'        => 'Файл з падобнай назвай ужо і�нуе:<br />
-�азва загружанага файла: <strong><tt>$1</tt></strong><br />
-�азва і�нуючага файла: <strong><tt>$2</tt></strong><br />
-Калі ла�ка, выб�рыце іншую назву.',
+Каб �но там зь�віла��, Вам тр�ба р�дагаваць �е �ама�тойна",
+'fileexists-extension'        => "Файл з падобнай назвай ужо і�нуе:<br />
+�азва загружанага файла: '''<tt>$1</tt>'''<br />
+�азва і�нуючага файла: '''<tt>$2</tt>'''<br />
+Калі ла�ка, выб�рыце іншую назву.",
 'fileexists-thumb'            => "<center>'''І�нуючы файл'''</center>",
-'fileexists-thumbnail-yes'    => 'Верагодна файл зь�ўл�ецца паменшанай копі�й <i>(міні�турай)</i>.
-Калі ла�ка, праверце файл <strong><tt>$1</tt></strong>.<br />
-Калі правераны файл зь�ўл�ецца той жа вы�вай, то загрузка міні�туры н� мае ��н�у.',
-'file-thumbnail-no'           => '�азва файла пачынаецца з <strong><tt>$1</tt></strong>.
-Верагодна г�та паменшана� копі� вы�вы <i>(міні�тура)</i>.
-Калі Вы маеце г�тую вы�ву ў поўным памеры, загрузіце �е, альбо зьм�ніце назву файла.',
-'fileexists-forbidden'        => 'Файл з такой назвай ужо і�нуе.
-Калі ла�ка, в�рніце�� назад і загрузіце г�ты файл з новай назвай. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Верагодна файл зь�ўл�ецца паменшанай копі�й ''(міні�турай)''.
+Калі ла�ка, праверце файл '''<tt>$1</tt>'''.<br />
+Калі правераны файл зь�ўл�ецца той жа вы�вай, то загрузка міні�туры н� мае ��н�у.",
+'file-thumbnail-no'           => "�азва файла пачынаецца з '''<tt>$1</tt>'''.
+Верагодна г�та паменшана� копі� вы�вы ''(міні�тура)''.
+Калі Вы маеце г�тую вы�ву ў поўным памеры, загрузіце �е, альбо зьм�ніце назву файла.",
+'fileexists-forbidden'        => 'Файл з такой назвай ужо і�нуе і н� можа быць перапі�аны.
+Калі ла�ка, в�рніце�� назад і загрузіце г�ты файл з новай назвай. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Файл з такой назвай ужо і�нуе ў агульным �ховішчы файлаў.
-Калі Вы жадаеце загрузіць Ваш файл, в�рніце�� назад і загрузіце г�ты файл з новай назвай. [[Image:$1|thumb|center|$1]]',
+Калі Вы жадаеце загрузіць Ваш файл, в�рніце�� назад і загрузіце г�ты файл з новай назвай. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Г�ты файл дублюе {{PLURAL:$1|на�тупны файл|на�тупны� файлы}}:',
+'file-deleted-duplicate'      => 'Падобны файл ([[$1]]) ужо выдал�ў��. Калі ла�ка, пагл�дзіце гі�торыю выдаленьн�ў г�тага файла перад �го паўторнай загрузкай.',
 'successfulupload'            => 'Загрузка па�ьп�хова �кончыла��',
 'uploadwarning'               => 'Пап�р�джаньне',
 'savefile'                    => 'Захаваць файл',
@@ -1350,7 +1491,7 @@ $2',
 
 Уп�ўніце�� ў неабходна�ьці загрузкі г�тага файла.
 Журнал выдаленьн�ў дл� г�тага файла знаходзіцца ніж�й:",
-'filename-bad-prefix'         => '�азва файла, �кі Вы загружаеце, пачынаецца з <strong>«$1»</strong>. Падобны� бе���н�оўны� назвы звычайна �твараюцца аўтаматычна лічбавымі фотаапаратамі. Калі ла�ка, аб�рыце больш зразумелую назву дл� Вашага файла.',
+'filename-bad-prefix'         => "�азва файла, �кі Вы загружаеце, пачынаецца з '''«$1»'''. Падобны� бе���н�оўны� назвы звычайна �твараюцца аўтаматычна лічбавымі фотаапаратамі. Калі ла�ка, аб�рыце больш зразумелую назву дл� Вашага файла.",
 
 'upload-proto-error'      => '���лушны пратакол',
 'upload-proto-error-text' => '�ддалена� загрузка файлаў патрабуе URL-адра�, �кі пачынаецца з <code>http://</code> альбо <code>ftp://</code>.',
@@ -1372,25 +1513,26 @@ $2',
 Вы можаце па�прабаваць пад ча� меншай загрузкі �айта.',
 
 'license'            => 'Ліц�нзі�:',
-'nolicense'          => '�е выбрана�',
+'nolicense'          => '�� выбрана�',
 'license-nopreview'  => '(Прагл�д неда�тупны)',
 'upload_source_url'  => ' (�лушны, агульнада�тупны URL-адра�)',
 'upload_source_file' => ' (файл на Вашым кампутары)',
 
-# Special:ImageList
-'imagelist-summary'     => '�а г�тай �п�цы�льнай �таронцы паказаны� ў�е загружаны� файлы.
+# Special:ListFiles
+'listfiles-summary'     => '�а г�тай �п�цы�льнай �таронцы паказаны� ў�е загружаны� файлы.
 Па змоўчваньні апошні� загружаны� файлы адлю�траваны� зьверху �ьпі�у.
 �аці�ьніце на назву �лупка, каб зьм�ніць парадак �артаваньн�.',
-'imagelist_search_for'  => 'Пошук па назьве файла:',
+'listfiles_search_for'  => 'Пошук па назьве файла:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Сьпі� файлаў',
-'imagelist_date'        => 'Дата',
-'imagelist_name'        => '�азва',
-'imagelist_user'        => 'Удзельнік',
-'imagelist_size'        => 'Памер',
-'imagelist_description' => '�пі�аньне',
-
-# Image description page
+'listfiles'             => 'Сьпі� файлаў',
+'listfiles_date'        => 'Дата',
+'listfiles_name'        => '�азва',
+'listfiles_user'        => 'Удзельнік',
+'listfiles_size'        => 'Памер',
+'listfiles_description' => '�пі�аньне',
+'listfiles_count'       => 'В�р�іі',
+
+# File description page
 'filehist'                       => 'Гі�торы� файла',
 'filehist-help'                  => '�аці�ьніце на дату/ча� каб пагл�дзець, �к тады выгл�даў файл.',
 'filehist-deleteall'             => 'выдаліць у�е',
@@ -1398,22 +1540,28 @@ $2',
 'filehist-revert'                => 'в�рнуць',
 'filehist-current'               => 'ц�перашн��',
 'filehist-datetime'              => 'Дата і ча�',
+'filehist-thumb'                 => 'Міні�тура',
+'filehist-thumbtext'             => 'Міні�тура в�р�іі ад $1',
+'filehist-nothumb'               => '��ма міні�туры',
 'filehist-user'                  => 'Удзельнік',
 'filehist-dimensions'            => 'Памеры',
 'filehist-filesize'              => 'Памер файла',
 'filehist-comment'               => 'Кам�нтар',
-'imagelinks'                     => 'Спа�ылкі',
+'imagelinks'                     => 'Спа�ылкі на файл',
 'linkstoimage'                   => '{{PLURAL:$1|�а�тупна� �таронка �па�ылаецца|�а�тупны� �таронкі �па�ылаюцца}} на г�ты файл:',
+'linkstoimage-more'              => 'Больш чым $1 {{PLURAL:$1|�таронка �па�ылаецца|�таронкі �па�ылаюцца|�таронак �па�ылаюцца}} на г�ты файл.
+У г�тым �ьпі�е толькі $1 {{PLURAL:$1|�па�ылка|�па�ылкі|�па�ылак}} на г�ты файл.
+Да�тупны так�ама [[Special:WhatLinksHere/$2|поўны �ьпі�]].',
 'nolinkstoimage'                 => '�іводна� �таронка не �па�ылаецца на г�ты файл.',
 'morelinkstoimage'               => 'Паказаць [[Special:WhatLinksHere/$1|болей �па�ылак]] на г�ты файл.',
 'redirectstofile'                => '{{PLURAL:$1|�а�тупны файл перанакіроўвае|�а�тупны� файлы перанакіроўваюць}} на г�ты файл:',
-'duplicatesoffile'               => '{{PLURAL:$1|�а�тупны файл дублюе|�а�тупны� файлы дублююць}} г�ты файл:',
+'duplicatesoffile'               => '{{PLURAL:$1|�а�тупны файл дублюе|�а�тупны� файлы дублююць}} г�ты файл ([[Special:FileDuplicateSearch/$2|падраб�зна�ьці]]):',
 'sharedupload'                   => 'Г�ты файл зь�ўл�ецца агульным і можа выкары�тоўвацца іншымі праектамі.',
 'shareduploadwiki'               => 'Гл�дзіце дадатковую інфармацыю на $1.',
-'shareduploadwiki-desc'          => '�пі�аньне $1 з агульнага �ховішча паказанае ніж�й.',
-'shareduploadwiki-linktext'      => '�таронка апі�аньн� файла',
+'shareduploadwiki-desc'          => '�пі�аньне, пазначанае на $1, паказанае ніж�й.',
+'shareduploadwiki-linktext'      => '�таронцы апі�аньн� файла',
 'shareduploadduplicate'          => 'Г�ты файл дублюе $1 з агульнага �ховішча.',
-'shareduploadduplicate-linktext' => 'іншага файла',
+'shareduploadduplicate-linktext' => 'іншы файл',
 'shareduploadconflict'           => 'Г�ты файл мае такую ж назву �к і $1 з агульнага �ховішча.',
 'shareduploadconflict-linktext'  => 'іншы файл',
 'noimage'                        => '��ма файла з такой назвай, але Вы можаце $1.',
@@ -1434,7 +1582,7 @@ $2',
 # File deletion
 'filedelete'                  => 'Выдаліць $1',
 'filedelete-legend'           => 'Выдаліць файл',
-'filedelete-intro'            => "Вы выдал�еце '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Вы выдал�еце файл '''[[Media:$1|$1]]''' з у�ёй �го гі�торы�й.",
 'filedelete-intro-old'        => "Вы выдал�еце в�р�ію '''[[Media:$1|$1]]''' ад [$4 $3, $2].",
 'filedelete-comment'          => 'Прычына выдаленьн�:',
 'filedelete-submit'           => 'Выдаліць',
@@ -1442,8 +1590,6 @@ $2',
 'filedelete-success-old'      => "В�р�і� '''[[Media:$1|$1]]''' ад $3, $2 была выдалена�.",
 'filedelete-nofile'           => "Файл '''$1''' не і�нуе.",
 'filedelete-nofile-old'       => "�е і�нуе архіўнай в�р�іі '''$1''' з пазначанымі атрыбутамі.",
-'filedelete-iscurrent'        => 'Вы �прабуеце выдаліць апошнюю в�р�ію г�тага файла.
-Спачатку тр�ба в�рнуць пап�р�днюю в�р�ію.',
 'filedelete-otherreason'      => 'Інша�/дадаткова� прычына:',
 'filedelete-reason-otherlist' => 'Інша� прычына',
 'filedelete-reason-dropdown'  => '* Звычайны� прычыны выдаленьн�
@@ -1472,28 +1618,31 @@ $2',
 
 # Random page
 'randompage'         => 'Выпадкова� �таронка',
-'randompage-nopages' => 'У г�тай пра�торы назваў н�ма �таронак.',
+'randompage-nopages' => 'У пра�торы назваў «$1» н�ма �таронак.',
 
 # Random redirect
 'randomredirect'         => 'Выпадковае перанакіраваньне',
-'randomredirect-nopages' => 'У г�тай пра�торы назваў н�ма перанакіраваньн�ў.',
+'randomredirect-nopages' => 'У пра�торы назваў «$1» н�ма перанакіраваньн�ў.',
 
 # Statistics
-'statistics'             => 'Статы�тыка',
-'sitestats'              => 'Статы�тыка {{GRAMMAR:родны|{{SITENAME}}}}',
-'userstats'              => 'Статы�тыка ўдзелу',
-'sitestatstext'          => "У базе зьве�так утрымліваецца '''$1''' {{PLURAL:$1|�таронка|�таронкі|�таронак}}.
-Сюды ўваходз�ць �таронкі пра {{GRAMMAR:вінавальны|{{SITENAME}}}}, �таронкі абмеркаваньн�ў, накіды, перанакіраваньні і іншы� �таронкі �кі� н� ўлічваюцца пры падліку артыкулаў.
-�крам� іх ё�ьць '''$2''' {{PLURAL:$2|�таронка|�таронкі|�таронак}}, �кі� лічацца паўнаварта�нымі.
-
-{{PLURAL:$8|Быў загружаны '''$8''' файл|Было загружана '''$8''' файлы|Было загружана '''$8''' файлаў}}.
-
-У��го было '''$3''' {{PLURAL:$3|прагл�д|прагл�ды|прагл�даў}}, і '''$4''' {{PLURAL:$4|р�дагаваньне|р�дагаваньні|р�дагаваньн�ў}} з пачатку працы {{GRAMMAR:родны|{{SITENAME}}}}.
-Такім чынам, у ��р�днім прыходзіцца '''$5''' р�дагаваньне на адну �таронку, і '''$6''' прагл�даў на адно р�дагаваньне.
-
-Даўжын� [http://www.mediawiki.org/wiki/Manual:Job_queue чаргі заданьн�ў] �кладае '''$7'''.",
-'userstatstext'          => "Тут {{PLURAL:$1|зар�гі�траваны|зар�гі�траваны�|зар�гі�траваны�}} '''$1''' [[Special:ListUsers|{{PLURAL:$1|удзельнік|удзельнікі|удзельнікаў}}]], зь �кіх '''$2''' (ці '''$4%''') {{PLURAL:$2|мае|маюць|маюць}} правы $5.",
-'statistics-mostpopular' => '�айпапул�рнейшы� �таронкі',
+'statistics'                   => 'Статы�тыка',
+'statistics-header-pages'      => 'Статы�тыка �таронак',
+'statistics-header-edits'      => 'Статы�тыка р�дагаваньн�ў',
+'statistics-header-views'      => 'Статы�тыка прагл�даў',
+'statistics-header-users'      => 'Статы�тыка ўдзелу',
+'statistics-articles'          => 'Колька�ьць �таронак �а зьме�там',
+'statistics-pages'             => 'Колька�ьць �таронак',
+'statistics-pages-desc'        => 'У�е �таронкі ў вікі, улучна з абмеркаваньн�мі, перанакіраваньн�мі і г.д.',
+'statistics-files'             => 'Колька�ьць загружаных файлаў',
+'statistics-edits'             => 'Колька�ьць р�дагаваньн�ў �таронак з моманту ў�тал�ваньн� {{GRAMMAR:родны|{{SITENAME}}}}',
+'statistics-edits-average'     => 'С�р�дн�� колька�ьць р�дагаваньн�ў на �таронку',
+'statistics-views-total'       => '�гульна� колька�ьць прагл�даў',
+'statistics-views-peredit'     => 'Колька�ьць прагл�даў на р�дагаваньне',
+'statistics-jobqueue'          => 'Даўжын� [http://www.mediawiki.org/wiki/Manual:Job_queue чаргі заданьн�ў]',
+'statistics-users'             => '[[Special:ListUsers|Зар�гі�траваны� удзельнікі]]',
+'statistics-users-active'      => '�ктыўны� удзельнікі',
+'statistics-users-active-desc' => 'Удзельнікі, �кі� выканалі нейкае дзе�ньне ц�гам {{PLURAL:$1|апошн�га $1 дн�|апошніх $1 дзён|апошніх $1 дзён}}',
+'statistics-mostpopular'       => '�айпапул�рнейшы� �таронкі',
 
 'disambiguations'      => 'Старонкі-неадназначна�ьці',
 'disambiguationspage'  => 'Шаблён:�еадназначна�ьць',
@@ -1537,26 +1686,30 @@ $2',
 'popularpages'            => 'Папул�рны� �таронкі',
 'wantedcategories'        => 'Запатрабаваны� кат�горыі',
 'wantedpages'             => 'Запатрабаваны� �таронкі',
-'missingfiles'            => '�д�утны� файлы',
+'wantedfiles'             => 'Запатрабаваны� файлы',
+'wantedtemplates'         => 'Запатрабаваны� шаблёны',
 'mostlinked'              => 'Старонкі, на �кі� найча�ьцей �па�ылаюцца',
 'mostlinkedcategories'    => 'Кат�горыі з найбольшай колька�ьцю артыкулаў',
 'mostlinkedtemplates'     => 'Шаблёны, �кі� найча�ьцей выкары�тоўваюцца',
 'mostcategories'          => 'Старонкі з найбольшай колька�ьцю кат�горый',
 'mostimages'              => 'Файлы, на �кі� найча�ьцей �па�ылаюцца',
 'mostrevisions'           => 'Старонкі з найбольшай колька�ьцю р�дагаваньн�ў',
-'prefixindex'             => 'Пошук �таронак па пачатку назвы',
+'prefixindex'             => 'У�е �таронкі з пачаткам назваў',
 'shortpages'              => 'Кароткі� �таронкі',
 'longpages'               => 'Доўгі� �таронкі',
 'deadendpages'            => 'Тупіковы� �таронкі',
 'deadendpagestext'        => '�а�тупны� �таронкі не �па�ылаюцца на іншы� �таронкі {{GRAMMAR:родны|{{SITENAME}}}}.',
 'protectedpages'          => '�баронены� �таронкі',
 'protectedpages-indef'    => 'Толькі бе�т�рміновы� абароны',
+'protectedpages-cascade'  => 'Толькі ка�кадны� абароны',
 'protectedpagestext'      => '�а�тупны� �таронкі абаронены� ад перано�аў і р�дагаваньн�ў',
 'protectedpagesempty'     => 'Ц�пер н�ма абароненых �таронак з пазначанымі парам�трамі.',
 'protectedtitles'         => 'Забаронены� �таронкі',
 'protectedtitlestext'     => 'Ствар�ньне на�тупных �таронак забароненае',
 'protectedtitlesempty'    => 'Ц�пер н�ма абароненых назваў з пазначанымі парам�трамі.',
 'listusers'               => 'Сьпі� удзельнікаў і ўдзельніц',
+'listusers-editsonly'     => 'Паказаць толькі ўдзельнікаў, �кі� маюць р�дагаваньні',
+'usereditcount'           => '$1 {{PLURAL:$1|р�дагаваньне|р�дагаваньні|р�дагаваньн�ў}}',
 'newpages'                => '�овы� �таронкі',
 'newpages-username'       => 'Ім� ўдзельніка/ўдзельніцы:',
 'ancientpages'            => '�ай�тар�йшы� �таронкі',
@@ -1577,14 +1730,13 @@ $2',
 'booksources-search-legend' => 'Пошук кніг',
 'booksources-go'            => 'Паказаць',
 'booksources-text'          => '�іж�й знаходзіцца �ьпі� �па�ылак на іншы� �айты, �кі� прадаюць новы� і патрыманы� кнігі, і могуць так�ама мець інфармацыю пра кнігі, �кі� Вы шукаеце:',
+'booksources-invalid-isbn'  => 'Пададзены н��лушны ISBN; праверце, магчыма ўзьніклі памылкі пры перано�е нумару з арыгінальнай крыніцы.',
 
 # Special:Log
 'specialloguserlabel'  => 'Удзельнік/удзельніца:',
 'speciallogtitlelabel' => '�азва:',
 'log'                  => 'Журналы падзе�ў',
 'all-logs-page'        => 'У�е журналы падзе�ў',
-'log-search-legend'    => 'Пошук у журналах',
-'log-search-submit'    => 'Шукаць',
 'alllogstext'          => 'Суме�ны паказ у�іх журналаў падзе�ў {{GRAMMAR:родны|{{SITENAME}}}}.
 Вы можаце адфільтраваць вынікі па тыпе журналу, удзельніку ці �таронцы.',
 'logempty'             => 'Падобных запі�аў у журнале н�ма.',
@@ -1596,6 +1748,7 @@ $2',
 'nextpage'          => '�а�тупна� �таронка ($1)',
 'prevpage'          => 'Пап�р�дн�� �таронка ($1)',
 'allpagesfrom'      => 'Паказаць �таронкі, пачынаючы з:',
+'allpagesto'        => 'Паказаць �таронкі да:',
 'allarticles'       => 'У�е �таронкі',
 'allinnamespace'    => 'У�е �таронкі (пра�тора назваў: $1)',
 'allnotinnamespace' => 'У�е �таронкі (не ў пра�торы назваў $1)',
@@ -1615,41 +1768,69 @@ $2',
 'special-categories-sort-count' => '�артаваць паводле колька�ьці',
 'special-categories-sort-abc'   => '�артаваць паводле альфаб�ту',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Выдалены ўнё�ак удзельніка',
+
+# Special:LinkSearch
+'linksearch'       => 'Вонкавы� �па�ылкі',
+'linksearch-pat'   => 'Узор дл� пошуку:',
+'linksearch-ns'    => 'Пра�тора назваў:',
+'linksearch-ok'    => 'Шукаць',
+'linksearch-text'  => 'Можна ўжываць �ымбалі пад�таноўкі, напрыклад, «*.wikipedia.org».<br />
+Пратаколы, �кі� падтрымліваюцца: <tt>$1</tt>',
+'linksearch-line'  => 'Спа�ылка на $1 з $2',
+'linksearch-error' => 'Сымбалі пад�таноўкі могуць ужывацца толькі ў пачатку адра�оў.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Паказаць удзельнікаў, пачынаючы з:',
 'listusers-submit'   => 'Паказаць',
 'listusers-noresult' => 'Удзельнікі н� знойдзены�.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Журнал �твар�ньн� рахункаў',
+'newuserlogpagetext'          => 'Г�та журнал �твар�ньн� рахункаў удзельнікаў і ўдзельніц.',
+'newuserlog-byemail'          => 'Пароль ада�ланы па �лектроннай пошце',
+'newuserlog-create-entry'     => '�овы ўдзельнік',
+'newuserlog-create2-entry'    => '�твораны рахунак $1',
+'newuserlog-autocreate-entry' => 'Рахунак �твораны аўтаматычна',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Правы групаў удзельнікаў',
-'listgrouprights-summary'  => '�іж�й пададзены �ьпі� групаў удзельнікаў {{GRAMMAR:родны|{{SITENAME}}}}, разам зь іх правамі.
+'listgrouprights'                 => 'Правы групаў удзельнікаў',
+'listgrouprights-summary'         => '�іж�й пададзены �ьпі� групаў удзельнікаў {{GRAMMAR:родны|{{SITENAME}}}}, разам зь іх правамі.
 Так�ама можна пагл�дзець [[{{MediaWiki:Listgrouprights-helppage}}|дадатковую інфармацыю]] пра а�абі�ты� правы.',
-'listgrouprights-group'    => 'Група',
-'listgrouprights-rights'   => 'Правы',
-'listgrouprights-helppage' => 'Help:Правы групаў удзельнікаў',
-'listgrouprights-members'  => '(�ьпі� удзельнікаў групы)',
+'listgrouprights-group'           => 'Група',
+'listgrouprights-rights'          => 'Правы',
+'listgrouprights-helppage'        => 'Help:Правы групаў удзельнікаў',
+'listgrouprights-members'         => '(�ьпі� удзельнікаў групы)',
+'listgrouprights-addgroup'        => 'можа дадаваць {{PLURAL:$2|групу|групы}}: $1',
+'listgrouprights-removegroup'     => 'можа выдал�ць {{PLURAL:$2|групу|групы}}: $1',
+'listgrouprights-addgroup-all'    => 'можа дадаваць у�е групы',
+'listgrouprights-removegroup-all' => 'можа выдал�ць у�е групы',
 
 # E-mail user
-'mailnologin'     => '��ма адра�у атрымальніка',
-'mailnologintext' => 'Вам неабходна [[Special:UserLogin|ўвай�ьці ў �ы�т�му]] і мець пацьверджаны адра� �лектроннай пошты ў Вашых [[Special:Preferences|у�таноўках]], каб да�ылаць лі�ты іншым удзельнікам.',
-'emailuser'       => 'Да�лаць лі�т',
-'emailpage'       => 'Да�лаць лі�т ўдзельніку ці ўдзельніцы па �лектроннай пошце',
-'emailpagetext'   => 'Вы можаце выкары�тоўваць форму ніж�й, каб да�лаць г�таму ўдзельніку лі�т па �лектроннай пошце.
+'mailnologin'      => '��ма адра�у атрымальніка',
+'mailnologintext'  => 'Вам неабходна [[Special:UserLogin|ўвай�ьці ў �ы�т�му]] і мець пацьверджаны адра� �лектроннай пошты ў Вашых [[Special:Preferences|у�таноўках]], каб да�ылаць лі�ты іншым удзельнікам.',
+'emailuser'        => 'Да�лаць лі�т',
+'emailpage'        => 'Да�лаць лі�т ўдзельніку ці ўдзельніцы па �лектроннай пошце',
+'emailpagetext'    => 'Вы можаце выкары�тоўваць форму ніж�й, каб да�лаць г�таму ўдзельніку лі�т па �лектроннай пошце.
 �дра� �лектроннай пошты, �кі Вы пазначалі ў [[Special:Preferences|�ваіх у�таноўках]], будзе пазначаны ў полі лі�та «�д», і ўдзельнік зможа да�лаць на г�ты адра� адказ.',
-'usermailererror' => 'Пры ад�ыланьні пошты адбыла�� памылка:',
-'defemailsubject' => 'Электронна� пошта {{GRAMMAR:родны|{{SITENAME}}}}',
-'noemailtitle'    => '�дра� �лектроннай пошты ад�утнічае',
-'noemailtext'     => 'Г�ты удзельнік не пазначыў �лушны адра� �лектроннай пошты альбо пазначыў, што не жадае атрымліваць лі�ты ад іншых удзельнікаў.',
-'emailfrom'       => '�д:',
-'emailto'         => 'Каму:',
-'emailsubject'    => 'Т�ма:',
-'emailmessage'    => 'Паведамленьне:',
-'emailsend'       => 'Да�лаць',
-'emailccme'       => 'Да�лаць мне копію лі�та.',
-'emailccsubject'  => 'Копі� Вашага лі�та да $1: $2',
-'emailsent'       => 'Лі�т ада�ланы',
-'emailsenttext'   => 'Ваш лі�т быў ада�ланы.',
-'emailuserfooter' => 'Г�ты лі�т быў да�ланы ўдзельнікам $1 да ўдзельніка $2 з дапамогай функцыі «Да�лаць лі�т» праекту {{SITENAME}}.',
+'usermailererror'  => 'Пры ад�ыланьні пошты адбыла�� памылка:',
+'defemailsubject'  => 'Электронна� пошта {{GRAMMAR:родны|{{SITENAME}}}}',
+'noemailtitle'     => '�дра� �лектроннай пошты ад�утнічае',
+'noemailtext'      => 'Г�ты удзельнік не пазначыў �лушны адра� �лектроннай пошты.',
+'nowikiemailtitle' => '�трыманьне лі�тоў па �лектроннай пошце забароненае',
+'nowikiemailtext'  => 'Г�ты ўдзельнік не дазволіў атрымліваць лі�ты па �лектроннай пошце ад іншых удзельнікаў.',
+'email-legend'     => 'Да�лаць лі�т �лектроннай пошты іншаму ўдзельніку {{GRAMMAR:родны|{{SITENAME}}}}',
+'emailfrom'        => '�д:',
+'emailto'          => 'Каму:',
+'emailsubject'     => 'Т�ма:',
+'emailmessage'     => 'Паведамленьне:',
+'emailsend'        => 'Да�лаць',
+'emailccme'        => 'Да�лаць мне копію лі�та.',
+'emailccsubject'   => 'Копі� Вашага лі�та да $1: $2',
+'emailsent'        => 'Лі�т ада�ланы',
+'emailsenttext'    => 'Ваш лі�т быў ада�ланы.',
+'emailuserfooter'  => 'Г�ты лі�т быў да�ланы ўдзельнікам $1 да ўдзельніка $2 з дапамогай функцыі «Да�лаць лі�т» праекту {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Мой �ьпі� назіраньн�',
@@ -1682,12 +1863,7 @@ $2',
 'iteminvalidname'      => 'Праблема з �лем�нтам «$1», н��лушна� назва…',
 'wlnote'               => "�іж�й {{PLURAL:$1|паказана� '''$1''' апошн�� зьмена|паказаны� '''$1''' апошні� зьмены|паказаны� '''$1''' апошніх зьменаў}} за '''$2''' {{PLURAL:$2|гадзіну|гадзіны|гадзінаў}}.",
 'wlshowlast'           => 'Паказваць за апошні� $1 гадзінаў $2 дзён $3',
-'watchlist-show-bots'  => 'паказаць робатаў',
-'watchlist-hide-bots'  => '�хаваць робатаў',
-'watchlist-show-own'   => 'паказаць мае праўкі',
-'watchlist-hide-own'   => '�хаваць мае праўкі',
-'watchlist-show-minor' => 'паказаць дробны� праўкі',
-'watchlist-hide-minor' => '�хаваць дробны� праўкі',
+'watchlist-options'    => 'У�таноўкі �ьпі�у назіраньн�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Дадаецца ў �ьпі� назіраньн�…',
@@ -1728,84 +1904,103 @@ $NEWPAGE
 Зваротна� �ув�зь і дапамога:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Выдаліць �таронку',
-'confirm'                     => 'Пацьвердзіць',
-'excontent'                   => 'колішні зьме�т: «$1»',
-'excontentauthor'             => "зьме�т быў: «$1» (і адзіным аўтарам быў '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => 'зьме�т да ачы�ткі: «$1»',
-'exblank'                     => '�таронка была пу�та�',
-'delete-confirm'              => 'Выдаліць «$1»',
-'delete-legend'               => 'Выдаліць',
-'historywarning'              => 'Пап�р�джаньне: у �таронкі, �кую Вы зьбіраеце�� выдаліць, ё�ьць гі�торы�:',
-'confirmdeletetext'           => 'Зараз Вы выдаліце �таронку разам з у�ёй гі�торы�й зьменаў.
+# Delete
+'deletepage'             => 'Выдаліць �таронку',
+'confirm'                => 'Пацьвердзіць',
+'excontent'              => 'колішні зьме�т: «$1»',
+'excontentauthor'        => "зьме�т быў: «$1» (і адзіным аўтарам быў '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => 'зьме�т да ачы�ткі: «$1»',
+'exblank'                => '�таронка была пу�та�',
+'delete-confirm'         => 'Выдаліць «$1»',
+'delete-legend'          => 'Выдаліць',
+'historywarning'         => 'Пап�р�джаньне: у �таронкі, �кую Вы зьбіраеце�� выдаліць, ё�ьць гі�торы�:',
+'confirmdeletetext'      => 'Зараз Вы выдаліце �таронку разам з у�ёй гі�торы�й зьменаў.
 Калі ла�ка, пацьвердзіце, што Вы зьбіраеце�� г�та зрабіць і што Вы разумееце ў�е на�туп�твы, а так�ама робіце г�та ў адпаведна�ьці з [[{{MediaWiki:Policy-url}}|правіламі]].',
-'actioncomplete'              => 'Дзе�ньне завершанае',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» была выдалена�.
+'actioncomplete'         => 'Дзе�ньне завершанае',
+'deletedtext'            => '«<nowiki>$1</nowiki>» была выдалена�.
 Гл�дзіце журнал выдаленьн�ў у $2.',
-'deletedarticle'              => 'выдалена� «[[$1]]»',
-'suppressedarticle'           => '�хаваў «[[$1]]»',
-'dellogpage'                  => 'Журнал выдаленьн�ў',
-'dellogpagetext'              => 'Сьпі� апошніх выдаленьн�ў.',
-'deletionlog'                 => 'журнал выдаленьн�ў',
-'reverted'                    => 'Вернута� да пап�р�дн�й в�р�іі',
-'deletecomment'               => 'Прычына выдаленьн�:',
-'deleteotherreason'           => 'Інша�/дадаткова� прычына:',
-'deletereasonotherlist'       => 'Інша� прычына',
-'deletereason-dropdown'       => '* �гульны� прычыны выдаленьн�
+'deletedarticle'         => 'выдалена� «[[$1]]»',
+'suppressedarticle'      => '�хаваў «[[$1]]»',
+'dellogpage'             => 'Журнал выдаленьн�ў',
+'dellogpagetext'         => 'Сьпі� апошніх выдаленьн�ў.',
+'deletionlog'            => 'журнал выдаленьн�ў',
+'reverted'               => 'Вернута� да пап�р�дн�й в�р�іі',
+'deletecomment'          => 'Прычына выдаленьн�:',
+'deleteotherreason'      => 'Інша�/дадаткова� прычына:',
+'deletereasonotherlist'  => 'Інша� прычына',
+'deletereason-dropdown'  => '* �гульны� прычыны выдаленьн�
 ** Запыт аўтара/аўтаркі
 ** Паруш�ньне аўтар�кіх правоў
 ** Вандалізм',
-'delete-edit-reasonlist'      => 'Р�дагаваць прычыны выдаленьн�',
-'delete-toobig'               => 'Г�та� �таронка мае доўгую гі�торыю р�дагаваньн�ў, болей за $1 {{PLURAL:$1|в�р�ію|в�р�іі|в�р�ій}}.
+'delete-edit-reasonlist' => 'Р�дагаваць прычыны выдаленьн�',
+'delete-toobig'          => 'Г�та� �таронка мае доўгую гі�торыю р�дагаваньн�ў, болей за $1 {{PLURAL:$1|в�р�ію|в�р�іі|в�р�ій}}.
 Выдаленьне такіх �таронак было забароненае, каб пазьбегнуць праблемаў у працы {{GRAMMAR:родны|{{SITENAME}}}}.',
-'delete-warning-toobig'       => 'Г�та� �таронка мае доўгую гі�торыю р�дагаваньн�ў, больш за $1 {{PLURAL:$1|в�р�ію|в�р�іі|в�р�ій}}.
+'delete-warning-toobig'  => 'Г�та� �таронка мае доўгую гі�торыю р�дагаваньн�ў, больш за $1 {{PLURAL:$1|в�р�ію|в�р�іі|в�р�ій}}.
 Яе выдаленьне можа выклікаць праблемы ў працы базы зьве�так {{GRAMMAR:родны|{{SITENAME}}}}; будзьце а�ьц�рожны.',
-'rollback'                    => '�дм�ніць р�дагаваньні',
-'rollback_short'              => '�дкат',
-'rollbacklink'                => 'адкат',
-'rollbackfailed'              => 'Памылка адкату',
-'cantrollback'                => '�емагчыма �ка�аваць зьмену; апошні р�дактар — адзіны аўтар г�тай �таронкі.',
-'alreadyrolled'               => '�емагчыма �ка�аваць апошнюю зьмену [[:$1]], �кую зрабіў [[User:$2|$2]] ([[User talk:$2|гутаркі]]); нехта іншы ўжо зьм�ніў артыкул ці �ка�аваў зьмены.
-
-�пошні� зьмены зроблены� [[User:$3|$3]] ([[User talk:$3|гутаркі]]).',
-'editcomment'                 => 'Кам�нтар р�дагаваньн� быў: «<i>$1</i>».', # only shown if there is an edit comment
-'revertpage'                  => '�дменены� р�дагаваньні [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) да пап�р�дн�й в�р�іі [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '�дменены� р�дагаваньні $1;
+
+# Rollback
+'rollback'         => '�дм�ніць р�дагаваньні',
+'rollback_short'   => '�дкат',
+'rollbacklink'     => 'адкат',
+'rollbackfailed'   => 'Памылка адкату',
+'cantrollback'     => '�емагчыма �ка�аваць зьмену; апошні р�дактар — адзіны аўтар г�тай �таронкі.',
+'alreadyrolled'    => '�емагчыма �ка�аваць апошнюю зьмену [[:$1]], �кую зрабіў [[User:$2|$2]] ([[User talk:$2|гутаркі]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); нехта іншы ўжо зьм�ніў артыкул ці �ка�аваў зьмены.
+
+�пошні� зьмены зроблены� [[User:$3|$3]] ([[User talk:$3|гутаркі]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Кароткае апі�аньне зьменаў было: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => '�дменены� р�дагаваньні [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) да пап�р�дн�й в�р�іі [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '�дменены� р�дагаваньні $1;
 вернута� пап�р�дн�� в�р�і� $2.',
-'sessionfailure'              => 'Магчыма ўзьніклі праблемы ў Вашым ц�перашнім ��ан�е працы;
+'sessionfailure'   => 'Магчыма ўзьніклі праблемы ў Вашым ц�перашнім ��ан�е працы;
 г�та дзе�ньне было �ка�авана дл� прадухіленьн� перахвату ��ан�а.
 Калі ла�ка, наці�ьніце «назад» і перазагрузіце �таронку зь �кой Вы прыйшлі і па�прабуйце ізноў.',
+
+# Protect
 'protectlogpage'              => 'Журнал абаронаў',
 'protectlogtext'              => '�іж�й знаходзіцца �ьпі� абаронаў і зьн�цьц�ў абаронаў.
 Гл�дзіце [[Special:ProtectedPages|�ьпі� абароненых �таронак на ц�перашні момант]].',
 'protectedarticle'            => 'абаронена� «[[$1]]»',
 'modifiedarticleprotection'   => 'зьменены ўзровень абароны �таронкі «[[$1]]»',
 'unprotectedarticle'          => 'зьн�та� абарона �а �таронкі «[[$1]]»',
+'movedarticleprotection'      => 'перане�ены� у�таноўкі абароны з «[[$2]]» на «[[$1]]»',
 'protect-title'               => '�барона «$1»',
+'prot_1movedto2'              => '[[$1]] перане�ена� ў [[$2]]',
 'protect-legend'              => 'Пацьверджаньне абароны',
 'protectcomment'              => 'Кам�нтар:',
 'protectexpiry'               => 'Сканчаецца:',
 'protect_expiry_invalid'      => '���лушны ча� �канч�ньн� абароны.',
 'protect_expiry_old'          => 'Т�рмін абароны прайшоў.',
 'protect-unchain'             => 'Дазволіць перано�ы',
-'protect-text'                => 'Тут можна пагл�дзець і зьм�ніць узровень абароны �таронкі <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Вы н� можаце зьм�н�ць узровень абароны, пакуль Вы забл�каваны.
-Ц�перашні� ў�таноўкі дл� �таронкі <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Узровень абароны н� можа быць зьменены, таму што база зьве�так забл�кавана�.
-Ц�перашні� ў�таноўкі дл� �таронкі <strong>$1</strong>:',
-'protect-locked-access'       => 'Вы н� маеце правоў дл� зьмены ўзроўню абароны �таронкі.
-Ц�перашні� наладкі �таронкі <strong>$1</strong>:',
+'protect-text'                => "Тут можна пагл�дзець і зьм�ніць узровень абароны �таронкі '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Вы н� можаце зьм�н�ць узровень абароны, пакуль Вы забл�каваны.
+Ц�перашні� ў�таноўкі дл� �таронкі '''$1''':",
+'protect-locked-dblock'       => "Узровень абароны н� можа быць зьменены, таму што база зьве�так забл�кавана�.
+Ц�перашні� ў�таноўкі дл� �таронкі '''$1''':",
+'protect-locked-access'       => "Вы н� маеце правоў дл� зьмены ўзроўню абароны �таронкі.
+Ц�перашні� наладкі �таронкі '''$1''':",
 'protect-cascadeon'           => 'Г�та� �таронка ча�ова абаронена�, таму што �на ўключана� ў {{PLURAL:$1|на�тупную �таронку, �ка� абаронена�|на�тупны� �таронкі, �кі� абаронены�|на�тупны� �таронкі, �кі� абаронены�}} ка�каднай абаронай.
 Вы можаце зьм�ніць узровень абароны, але г�та не паўплывае на ка�кадную абарону.',
-'protect-default'             => '(па змоўчаньні)',
+'protect-default'             => 'Дазволіць у�ім ўдзельнікам',
 'protect-fallback'            => 'Патр�бны дазвол «$1»',
-'protect-level-autoconfirmed' => '�бараніць ад ананімных і новых удзельнікаў',
+'protect-level-autoconfirmed' => 'Бл�каваць новых і ананімных удзельнікаў',
 'protect-level-sysop'         => 'Толькі адміні�тратары',
 'protect-summary-cascade'     => 'ка�кадна�',
 'protect-expiring'            => '�канчаецца $1 (UTC)',
+'protect-expiry-indefinite'   => 'бе�т�рмінова',
 'protect-cascade'             => '�баран�ць �таронкі, �кі� ўключаны� ў г�тую �таронку (ка�кадна� абарона)',
 'protect-cantedit'            => 'Вы н� можаце зьм�ніць узровень абароны г�тай �таронкі, таму што Вы н� маеце дазволу на �е р�дагаваньне.',
+'protect-othertime'           => 'Іншы т�рмін:',
+'protect-othertime-op'        => 'іншы т�рмін',
+'protect-existing-expiry'     => '�а�ўны ча� �канч�ньн�: $3, $2',
+'protect-otherreason'         => 'Інша�/дадаткова� прычына:',
+'protect-otherreason-op'      => 'інша�/дадаткова� прычына',
+'protect-dropdown'            => '*Звычайны� прычыны абароны
+** Ча�ты вандалізм
+** Празьмерны �пам
+** �епрадукцыйна� вайна р�дагаваньн�ў
+** Папул�рна� �таронка',
+'protect-edit-reasonlist'     => 'Р�дагаваць прычыны абароны',
+'protect-expiry-options'      => '1 гадзіна:1 hour,1 дзень:1 day,1 тыдзень:1 week,2 тыдні:2 weeks,1 ме��ц:1 month,3 ме��цы:3 months,6 ме��цаў:6 months,1 год:1 year,назаў�ёды:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Дазвол:',
 'restriction-level'           => 'Узровень абмежаваньн�:',
 'minimum-size'                => 'Мінімальны памер',
@@ -1828,7 +2023,7 @@ $NEWPAGE
 'undeletepage'                 => 'Прагл�д і аднаўленьне выдаленых �таронак',
 'undeletepagetitle'            => "'''�іж�й паданы� выдалены� в�р�іі [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Паказаць выдалены� �таронкі',
-'undeletepagetext'             => '�а�тупны� �таронкі былі выдалены�, але �ны знаходз�цца ў архіве і могуць быць адноўлены�.
+'undeletepagetext'             => '{{PLURAL:$1|�а�тупна� �таронка была выдалена�, але �на знаходз�цца ў архіве і можа быць адноўлена�|�а�тупны� �таронкі былі выдалены�, але �ны знаходз�цца ў архіве і могуць быць адноўлены�}}.
 �рхіў п�ры�дычна чы�ьціцца.',
 'undelete-fieldset-title'      => '�днавіць в�р�іі',
 'undeleteextrahelp'            => "Дл� поўнага аднаўленьн� �таронкі, пакіньце ў�е адзнакі н�вызначнымі і наці�ьніце '''''�днавіць'''''.
@@ -1841,13 +2036,14 @@ $NEWPAGE
 'undeletehistorynoadmin'       => 'Г�та� �таронка была выдалена�.
 Прычына выдаленьн� пададзена ніж�й, разам �а зьве�ткамі ўдзельніка, �кі р�дагаваў �таронку перад выдаленьнем.
 Т�к�т выдаленай �таронкі могуць гл�дзець толькі адміні�тратары.',
-'undelete-revision'            => 'Выдалена� в�р�і� $1 (ад $2) ўдзельніка $3:',
+'undelete-revision'            => 'Выдалена� в�р�і� $1 (ад $5 $4) ўдзельніка $3:',
 'undeleterevision-missing'     => '�екар�ктна� ці неі�нуюча� в�р�і�.
 Верагодна Вы кары�талі�� н��лушнай �па�ылкай, альбо, магчыма, в�р�і� была выдалена� з архіву.',
 'undelete-nodiff'              => 'Пап�р�дн�� в�р�і� н� знойдзена�.',
 'undeletebtn'                  => '�днавіць',
 'undeletelink'                 => 'аднавіць',
 'undeletereset'                => '�чы�ьціць',
+'undeleteinvert'               => '�дваротны выбар',
 'undeletecomment'              => 'Кам�нтар:',
 'undeletedarticle'             => 'адноўлена� «[[$1]]»',
 'undeletedrevisions'           => '{{PLURAL:$1|адноўлена� $1 в�р�і�|адноўлены� $1 в�р�іі|адноўлены� $1 в�р�ій}}',
@@ -1880,26 +2076,27 @@ $1',
 'blanknamespace' => '�ртыкул',
 
 # Contributions
-'contributions' => 'Унё�ак',
-'mycontris'     => 'Мой унё�ак',
-'contribsub2'   => 'Дл� $1 ($2)',
-'nocontribs'    => '�� знойдзена зьменаў, �кі� адпав�даюць г�тым крыт�ры�м.',
-'uctop'         => ' (апошн��)',
-'month'         => '�д ме��ца (і раней):',
-'year'          => '�д году (і раней):',
-
-'sp-contributions-newbies'     => 'Паказаць унё�ак толькі з новых рахункаў',
-'sp-contributions-newbies-sub' => 'Унё�ак пачынаючых',
-'sp-contributions-blocklog'    => 'журнал бл�каваньн�ў',
-'sp-contributions-search'      => 'Пошук унё�ку',
-'sp-contributions-username'    => 'IP-адра� альбо ім� ўдзельніка/ўдзельніцы:',
-'sp-contributions-submit'      => 'Шукаць',
+'contributions'       => 'Унё�ак',
+'contributions-title' => 'Унё�ак удзельніка $1',
+'mycontris'           => 'Мой унё�ак',
+'contribsub2'         => 'Дл� $1 ($2)',
+'nocontribs'          => '�� знойдзена зьменаў, �кі� адпав�даюць г�тым крыт�ры�м.',
+'uctop'               => ' (апошн��)',
+'month'               => '�д ме��ца (і раней):',
+'year'                => '�д году (і раней):',
+
+'sp-contributions-newbies'       => 'Паказаць унё�ак толькі з новых рахункаў',
+'sp-contributions-newbies-sub'   => 'Унё�ак пачынаючых',
+'sp-contributions-newbies-title' => 'Унё�ак удзельнікаў з новых рахункаў',
+'sp-contributions-blocklog'      => 'журнал бл�каваньн�ў',
+'sp-contributions-search'        => 'Пошук унё�ку',
+'sp-contributions-username'      => 'IP-адра� альбо ім� ўдзельніка/ўдзельніцы:',
+'sp-contributions-submit'        => 'Шукаць',
 
 # What links here
 'whatlinkshere'            => 'Спа�ылкі на �таронку',
 'whatlinkshere-title'      => 'Старонкі, �кі� �па�ылаюцца на $1',
 'whatlinkshere-page'       => 'Старонка:',
-'linklistsub'              => '(Сьпі� �па�ылак)',
 'linkshere'                => "�а�тупны� �таронкі �па�ылаюцца на '''[[:$1]]''':",
 'nolinkshere'              => "�іводна� �таронка не �па�ылаецца на '''[[:$1]]'''.",
 'nolinkshere-ns'           => "�іводна� �таронка не �па�ылаецца на '''[[:$1]]''' з выбранай пра�торы назваў.",
@@ -1943,6 +2140,8 @@ $1',
 'ipbotherreason'                  => 'Інша�/дадаткова� прычына:',
 'ipbhidename'                     => 'Схаваць ім� ўдзельніка ў журнале бл�каваньн�ў, �ьпі�е забл�каваных і �ьпі�е ўдзельнікаў',
 'ipbwatchuser'                    => '�азіраць за �таронкай удзельніка і �го размовамі',
+'ipballowusertalk'                => 'Дазволіць г�таму ўдзельніку р�дагаваць ула�ную �таронку размоваў, калі ён забл�каваны',
+'ipb-change-block'                => 'Зьм�ніць парам�тры бл�каваньн�',
 'badipaddress'                    => '�екар�ктны IP-адра�',
 'blockipsuccesssub'               => 'Бл�каваньне па�ьп�ховае',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] быў забл�каваны/была забл�кавана�.
@@ -1952,14 +2151,18 @@ $1',
 'ipb-unblock'                     => 'Разбл�каваць рахунак ўдзельніка ці IP-адра�',
 'ipb-blocklist-addr'              => '�а�ўны� бл�каваньні дл� $1',
 'ipb-blocklist'                   => 'Паказаць і�нуючы� бл�каваньні',
+'ipb-blocklist-contribs'          => 'Унё�ак $1',
 'unblockip'                       => 'Разбл�каваць удзельніка',
 'unblockiptext'                   => 'Кары�тайце�� формай паданай ніж�й дл� аднаўленьн� магчыма�ьці р�дагаваньн� дл� раней забл�каванага IP-адра�у альбо рахунку ўдзельніка.',
-'ipusubmit'                       => 'Разбл�каваць г�ты IP-адра�',
+'ipusubmit'                       => 'Зьн�ць г�та бл�каваньне',
 'unblocked'                       => '[[User:$1|$1]] быў разбл�каваны.',
 'unblocked-id'                    => 'Бл�каваньне $1 зьн�тае',
 'ipblocklist'                     => 'Забл�каваны� IP-адра�ы і імёны удзельнікаў',
 'ipblocklist-legend'              => 'Пошук забл�каванага ўдзельніка',
 'ipblocklist-username'            => 'Ім� ўдзельніка/ўдзельніцы альбо IP-адра�:',
+'ipblocklist-sh-userblocks'       => '$1 бл�каваньні рахунку',
+'ipblocklist-sh-tempblocks'       => '$1 ча�овы� бл�каваньні',
+'ipblocklist-sh-addressblocks'    => '$1 бл�каваньні а�обных IP-адра�оў',
 'ipblocklist-submit'              => 'Шукаць',
 'blocklistline'                   => '$1, $2 забл�каваў $3 ($4)',
 'infiniteblock'                   => 'назаў�ёды',
@@ -1968,25 +2171,32 @@ $1',
 'noautoblockblock'                => 'аўтаматычнае бл�каваньне адключанае',
 'createaccountblock'              => '�твар�ньне рахунку забл�каванае',
 'emailblock'                      => 'да�ылка лі�тоў забаронена�',
+'blocklist-nousertalk'            => 'н� можа р�дагаваць ула�ную �таронку размоваў',
 'ipblocklist-empty'               => 'Сьпі� бл�каваньн�ў пу�ты.',
 'ipblocklist-no-results'          => 'Паданы IP-адра� альбо ім� ўдзельніка не забл�каваны�.',
 'blocklink'                       => 'забл�каваць',
 'unblocklink'                     => 'разбл�каваць',
+'change-blocklink'                => 'зьм�ніць бл�каваньне',
 'contribslink'                    => 'унё�ак',
 'autoblocker'                     => "Вы аўтаматычна забл�каваны�, таму што Ваш IP-адра� н�даўна ўжываў�� «[[User:$1|$1]]». Прычына бл�каваньн� $1 на�тупна�: «'''$2'''»",
 'blocklogpage'                    => 'Журнал бл�каваньн�ў',
+'blocklog-fulllog'                => 'Поўны журнал бл�каваньн�ў',
 'blocklogentry'                   => 'забл�каваны [[$1]] на т�рмін: $2 $3',
+'reblock-logentry'                => 'зьменены� парам�тры бл�каваньн� дл� [[$1]] на т�рмін: з $2 да $3',
 'blocklogtext'                    => 'Г�та журнал уліку бл�каваньн�ў і разбл�каваньн�ў удзельнікаў. �ўтаматычна забл�каваны� IP-адра�ы не пазначаны�. Гл�дзіце [[Special:IPBlockList|�ьпі� забл�каваных IP-адра�оў]], каб пабачыць дзейны� ў г�ты момант бл�каваньні.',
 'unblocklogentry'                 => 'разбл�каваны $1',
 'block-log-flags-anononly'        => 'толькі ананімны� ўдзельнікі',
 'block-log-flags-nocreate'        => '�твар�ньне рахункаў забароненае',
 'block-log-flags-noautoblock'     => 'аўтаматычнае бл�каваньне адключанае',
 'block-log-flags-noemail'         => '�лектронна� пошта забл�кавана�',
+'block-log-flags-nousertalk'      => 'н� можа р�дагаваць ула�ную �таронку размоваў',
 'block-log-flags-angry-autoblock' => 'уключанае палепшанае аўтабл�каваньне',
 'range_block_disabled'            => '�дміні�тратарам забаронена бл�каваць ды�пазоны.',
 'ipb_expiry_invalid'              => '���лушны т�рмін бл�каваньн�.',
 'ipb_expiry_temp'                 => 'Бл�каваньні �а �хаваньнем ім� ўдзельніка павінны быць бе�т�рміновымі.',
 'ipb_already_blocked'             => '«$1» ужо забл�каваны',
+'ipb-needreblock'                 => '== Ужо забл�каваны ==
+$1 ужо забл�каваны. Вы жадаеце зьм�ніць парам�тры?',
 'ipb_cant_unblock'                => 'Памылка: ID бл�каваньн� $1 н� знойдзена. Верагодна �но было ўжо зьн�тае.',
 'ipb_blocked_as_range'            => 'Памылка: IP-адра� $1 быў забл�каваны наўпро�т і н� можа быць разбл�каваны.
 Тым н� менш, ён належыць да ды�пазону $2, �кі можа быць разбл�каваны.',
@@ -2000,6 +2210,7 @@ $1',
 'sorbsreason'                     => 'Ваш IP-адра� знаходзіцца ў �ьпі�е адкрытых прок�і ў DNSBL, �кім кары�таецца {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Ваш IP-адра� знаходзіцца ў �ьпі�е адкрытых прок�і ў DNSBL, �кім кары�таецца {{SITENAME}}.
 Вы н� зможаце �тварыць рахунак',
+'cant-block-while-blocked'        => 'Вы н� можаце бл�каваць іншых удзельнікаў, пакуль Вы �амі забл�каваны�.',
 
 # Developer tools
 'lockdb'              => 'Забл�каваць базу зьве�так',
@@ -2023,9 +2234,9 @@ $1',
 'databasenotlocked'   => 'База зьве�так не забл�кавана�.',
 
 # Move page
-'move-page'               => 'Перане�ьці $1',
-'move-page-legend'        => 'Перане�ьці �таронку',
-'movepagetext'            => "З дапамогай г�тай формы Вы можаце зьм�ніць назву і гі�торыю �таронкі.
+'move-page'                    => 'Перане�ьці $1',
+'move-page-legend'             => 'Перане�ьці �таронку',
+'movepagetext'                 => "З дапамогай г�тай формы Вы можаце зьм�ніць назву і гі�торыю �таронкі.
 Стара� назва будзе перанакіроўваць на новую.
 Вы можаце аўтаматычна абнавіць перанакіраваньні на першапачатковую назву.
 Калі вы адмовіце��, уп�ўніце�� ў ад�утна�ьці [[Special:DoubleRedirects|падвойных]] ці [[Special:BrokenRedirects|н��лушных перанакіраваньн�ў]].
@@ -2036,49 +2247,61 @@ $1',
 '''П�ПЯРЭДЖ��Ь�Е!'''
 Зьмена назвы можа прыве�ьці да нечаканых зьменаў папул�рных �таронак;
 калі ла�ка, уп�ўніце��, што Вы разумееце на�туп�твы такіх зьменаў.",
-'movepagetalktext'        => "Старонка абмеркаваньн� будзе перане�ена� разам з а�ноўнай �таронкай, '''за выключ�ньнем:'''
+'movepagetalktext'             => "Старонка абмеркаваньн� будзе перане�ена� разам з а�ноўнай �таронкай, '''за выключ�ньнем:'''
 * �е пу�та� �таронка абмеркаваньн� ўжо і�нуе пад новай назвай, альбо
 * Вы не па�тавілі адзнаку ў полі ніж�й.
 
 У такіх выпадках, Вы можаце перане�ьці ці аб'�днаць �таронку абмеркаваньн� �ама�тойна.",
-'movearticle'             => 'Перане�ьці �таронку:',
-'movenotallowed'          => 'Вы н� маеце дазволу на перано� �таронак.',
-'newtitle'                => '�ова� назва:',
-'move-watch'              => '�азіраць за г�тай �таронкай',
-'movepagebtn'             => 'Перане�ьці �таронку',
-'pagemovedsub'            => 'Па�ьп�ховы перано�',
-'movepage-moved'          => "<big>'''Старонка «$1» была перане�ена� ў «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Старонка з такой назвай ужо і�нуе, альбо абрана� Вамі назва недапушчальна�. Калі ла�ка, аб�рыце іншую назву.',
-'cantmove-titleprotected' => '�емагчыма перане�ьці �таронку, таму што нова� назва знаходзіцца ў �ьпі�е забароненых',
-'talkexists'              => "'''Старонка па�ьп�хова перане�ена�, але не атрымала�� перане�ьці �таронку абмеркаваньн�, таму што �таронка з такой назвай ужо і�нуе. Калі ла�ка, аб'�днайце т�к�ты �ама�тойна.'''",
-'movedto'                 => 'перане�ена� ў',
-'movetalk'                => 'Перане�ьці так�ама �таронку абмеркаваньн�.',
-'move-subpages'           => 'Перане�ьці ў�ё пад�таронкі, калі г�та магчыма',
-'move-talk-subpages'      => 'Перане�ьці ў�ё пад�таронкі �таронкі абмеркаваньн�, калі г�та магчыма',
-'movepage-page-exists'    => 'Старонка $1 ужо і�нуе і н� можа быць перапі�ана аўтаматычна.',
-'movepage-page-moved'     => 'Старонка $1 перане�ена� ў $2.',
-'movepage-page-unmoved'   => 'Старонка $1 н� можа быць перане�ена� ў $2.',
-'movepage-max-pages'      => '$1 {{PLURAL:$1|�таронка была перане�ена�|�таронкі былі перане�ены�|�таронак былі перане�ены�}} — г�та дазволены мак�ымум, больш аўтаматычных перано�аў н� будзе.',
-'1movedto2'               => '[[$1]] перане�ена� ў [[$2]]',
-'1movedto2_redir'         => '[[$1]] перане�ена� ў [[$2]] з выдаленьнем перанакіраваньн�',
-'movelogpage'             => 'Журнал перано�аў',
-'movelogpagetext'         => '�іж�й пададзены �ьпі� перане�еных �таронак.',
-'movereason'              => 'Прычына:',
-'revertmove'              => 'адкат',
-'delete_and_move'         => 'Выдаліць і перане�ьці',
-'delete_and_move_text'    => '==Патрабуецца выдаленьне==
+'movearticle'                  => 'Перане�ьці �таронку:',
+'movenologin'                  => 'Вы не ўвайшлі ў �ы�т�му',
+'movenologintext'              => 'Вам неабходна [[Special:UserLogin|ўвай�ьці ў �ы�т�му]], каб перане�ьці �таронкі.',
+'movenotallowed'               => 'Вы н� маеце дазволу на перано� �таронак.',
+'movenotallowedfile'           => 'Вы н� маеце правоў на перайменаваньне файлаў.',
+'cant-move-user-page'          => 'Вы н� маеце правоў дл� перано�у �таронак удзельнікаў (апрача пад�таронак).',
+'cant-move-to-user-page'       => 'Вы н� маеце правоў дл� перано�у �таронкі ў пра�тору ўдзельніка (апрача пад�таронак).',
+'newtitle'                     => '�ова� назва:',
+'move-watch'                   => '�азіраць за г�тай �таронкай',
+'movepagebtn'                  => 'Перане�ьці �таронку',
+'pagemovedsub'                 => 'Па�ьп�ховы перано�',
+'movepage-moved'               => "<big>'''Старонка «$1» была перане�ена� ў «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Перанакіраваньне было �творана.',
+'movepage-moved-noredirect'    => 'Перанакіраваньне не было �творанае.',
+'articleexists'                => 'Старонка з такой назвай ужо і�нуе, альбо абрана� Вамі назва недапушчальна�. Калі ла�ка, аб�рыце іншую назву.',
+'cantmove-titleprotected'      => '�емагчыма перане�ьці �таронку, таму што нова� назва знаходзіцца ў �ьпі�е забароненых',
+'talkexists'                   => "'''Старонка па�ьп�хова перане�ена�, але не атрымала�� перане�ьці �таронку абмеркаваньн�, таму што �таронка з такой назвай ужо і�нуе. Калі ла�ка, аб'�днайце т�к�ты �ама�тойна.'''",
+'movedto'                      => 'перане�ена� ў',
+'movetalk'                     => 'Перане�ьці так�ама �таронку абмеркаваньн�.',
+'move-subpages'                => 'Перане�ьці ў�ё пад�таронкі, калі г�та магчыма',
+'move-talk-subpages'           => 'Перане�ьці ў�ё пад�таронкі �таронкі абмеркаваньн�, калі г�та магчыма',
+'movepage-page-exists'         => 'Старонка $1 ужо і�нуе і н� можа быць перапі�ана аўтаматычна.',
+'movepage-page-moved'          => 'Старонка $1 перане�ена� ў $2.',
+'movepage-page-unmoved'        => 'Старонка $1 н� можа быць перане�ена� ў $2.',
+'movepage-max-pages'           => '$1 {{PLURAL:$1|�таронка была перане�ена�|�таронкі былі перане�ены�|�таронак былі перане�ены�}} — г�та дазволены мак�ымум, больш аўтаматычных перано�аў н� будзе.',
+'1movedto2'                    => '[[$1]] перане�ена� ў [[$2]]',
+'1movedto2_redir'              => '[[$1]] перане�ена� ў [[$2]] з выдаленьнем перанакіраваньн�',
+'move-redirect-suppressed'     => 'перанакіраваньне забаронена',
+'movelogpage'                  => 'Журнал перано�аў',
+'movelogpagetext'              => '�іж�й пададзены �ьпі� перане�еных �таронак.',
+'movereason'                   => 'Прычына:',
+'revertmove'                   => 'адкат',
+'delete_and_move'              => 'Выдаліць і перане�ьці',
+'delete_and_move_text'         => '==Патрабуецца выдаленьне==
 М�тава� �таронка «[[:$1]]» ужо і�нуе.
 Ці жадаеце Вы �е выдаліць, каб вызваліць ме�ца дл� перано�у?',
-'delete_and_move_confirm' => 'Так, выдаліць �таронку',
-'delete_and_move_reason'  => 'Выдалена�, каб вызваліць ме�ца дл� перано�у',
-'selfmove'                => 'Крынічна� і м�тава� назвы �упадаюць;
+'delete_and_move_confirm'      => 'Так, выдаліць �таронку',
+'delete_and_move_reason'       => 'Выдалена�, каб вызваліць ме�ца дл� перано�у',
+'selfmove'                     => 'Крынічна� і м�тава� назвы �упадаюць;
 немагчыма перане�ьці �таронку �аму на ��бе.',
-'immobile_namespace'      => 'Крынічна� ці м�тава� назва належыць да �п�цы�льнага тыпу;
-немагчыма перане�ьці з г�тай ці ў г�тую пра�тору назваў.',
-'imagenocrossnamespace'   => '�ельга перане�ьці файл у н�-файлавую пра�тору назваў',
-'imagetypemismatch'       => '�овае пашыр�ньне файла не адпав�дае �го тыпу',
-'imageinvalidfilename'    => '���лушна� назва м�тавага файла',
-'fix-double-redirects'    => '�бнавіць у�е перанакіраваньні на першапачатковую назву',
+'immobile-source-namespace'    => '�емагчыма перано�іць �таронкі ў пра�торы назваў «$1»',
+'immobile-target-namespace'    => '�емагчыма перано�іць �таронкі ў пра�тору назваў «$1»',
+'immobile-target-namespace-iw' => 'Інт�рвікі-�па�ылка — н��лушна� назва дл� перано�у �таронкі.',
+'immobile-source-page'         => 'Г�тую �таронку нельга перано�іць.',
+'immobile-target-page'         => '�емагчыма перане�ьці �таронку пад г�тую назву.',
+'imagenocrossnamespace'        => '�ельга перане�ьці файл у н�-файлавую пра�тору назваў',
+'imagetypemismatch'            => '�овае пашыр�ньне файла не адпав�дае �го тыпу',
+'imageinvalidfilename'         => '���лушна� назва м�тавага файла',
+'fix-double-redirects'         => '�бнавіць у�е перанакіраваньні на першапачатковую назву',
+'move-leave-redirect'          => 'Пакінуць перанакіраваньне',
 
 # Export
 'export'            => 'Эк�партаваць �таронкі',
@@ -2087,7 +2310,7 @@ $1',
 
 Каб �к�партаваць �таронкі, ув�дзіце назвы �таронак у т�к�тавае поле ніж�й, адну назву ў адзін радок, і аб�рыце жадаеце Вы ц�перашнюю в�р�ію разам з у�імі пап�р�днімі в�р�і�мі і гі�торы�й р�дагаваньн�ў, ці толькі ц�перашнюю в�р�ію з інфармацы�й пра апошн�е р�дагаваньне.
 
-У апошнім выпадку Вы можаце так�ама �кары�тацца �па�ылкай, напрыклад, [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] дл� «[[{{MediaWiki:Mainpage}}]]».',
+У апошнім выпадку Вы можаце так�ама �кары�тацца �па�ылкай, напрыклад, [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] дл� «[[{{MediaWiki:Mainpage}}]]».',
 'exportcuronly'     => 'Эк�партаваць толькі ц�перашнюю в�р�ію, б�з поўнай гі�торыі',
 'exportnohistory'   => "----
 '''Заўвага:''' �к�партаваньне поўнай гі�торыі �таронак з дапамогай г�тай формы было адключанае праз прычыны прадукцыйна�ьці �ы�т�мы.",
@@ -2102,7 +2325,8 @@ $1',
 'allmessagesname'           => '�азва',
 'allmessagesdefault'        => 'Т�к�т па змоўчаньні',
 'allmessagescurrent'        => 'Ц�перашні т�к�т',
-'allmessagestext'           => 'Сьпі� у�іх �ы�т�мных паведамленьн�ў, �кі� і�нуюць у пра�торы назваў MediaWiki.',
+'allmessagestext'           => 'Сьпі� у�іх �ы�т�мных паведамленьн�ў, �кі� і�нуюць у пра�торы назваў MediaWiki.
+Калі ла�ка, наведайце [http://www.mediawiki.org/wiki/Localisation �таронку пра л�калізацыю MediaWiki] і [http://translatewiki.net translatewiki.net], калі Вы жадаеце ўдзельнічаць у перакладзе MediaWiki.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:AllMessages''' не падтрымліваецца, таму што адключанае '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Фільтар р�гул�рных выразаў:',
 'allmessagesmodified'       => 'Паказаць толькі зьменены�',
@@ -2122,9 +2346,12 @@ $1',
 'import-interwiki-text'      => '�б�рыце вікі і назву �таронкі дл� імпартаваньн�.
 Даты зьменаў і імёны аўтараў будуць захаваны�.
 У�е дзе�ньні імпартаваньн� паміж вікі запі�ваюцца ў [[Special:Log/import|журнал імпартаваньн�ў]].',
+'import-interwiki-source'    => 'Крынічна� вікі/�таронка:',
 'import-interwiki-history'   => 'Капі�ваць гі�торыю �таронкі цалкам',
 'import-interwiki-submit'    => 'Імпартаваць',
 'import-interwiki-namespace' => 'М�тава� пра�тора назваў:',
+'import-upload-filename'     => '�азва файла:',
+'import-comment'             => 'Кам�нтар:',
 'importtext'                 => 'Калі ла�ка, �к�партуйце файл з крынічнай вікі з дапамогай [[Special:Export|прылады �к�парту]].
 Захавайце �го на �вой ды�к, а потым загрузіце �юды.',
 'importstart'                => 'Імпартаваньне �таронак…',
@@ -2162,19 +2389,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|в�р�і�|в�р�іі|в�р�ій}} з $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Ма� �таронка ўдзельніка',
+'tooltip-pt-userpage'             => 'Ваша �таронка ўдзельніка',
 'tooltip-pt-anonuserpage'         => 'Старонка ўдзельніка дл� IP-адра�у, зь �кога Вы р�дагуеце',
-'tooltip-pt-mytalk'               => 'Ма� �таронка размоваў',
+'tooltip-pt-mytalk'               => 'Ваша �таронка размоваў',
 'tooltip-pt-anontalk'             => 'Старонка гутарак пра р�дагаваньні, зроблены� з г�тага IP-адра�у',
 'tooltip-pt-preferences'          => 'Мае ў�таноўкі',
 'tooltip-pt-watchlist'            => 'Сьпі� �таронак, за зьменамі �кіх Вы назіраеце',
-'tooltip-pt-mycontris'            => 'Мой унё�ак',
+'tooltip-pt-mycontris'            => 'Ваш унё�ак',
 'tooltip-pt-login'                => 'Ва� запрашаюць увай�ьці, хац� г�та і неабав�зкова.',
 'tooltip-pt-anonlogin'            => 'Уваход у �ы�т�му вітаецца, хац� ён не абав�зковы.',
 'tooltip-pt-logout'               => 'Вый�ьці',
 'tooltip-ca-talk'                 => '�бмеркаваньне зьме�ту �таронкі',
 'tooltip-ca-edit'                 => 'Вы можаце р�дагаваць г�тую �таронку. Калі ла�ка, ужывайце кнопку прагл�ду перад захаваньнем.',
-'tooltip-ca-addsection'           => 'Дадаць кам�нтар да г�тага абмеркаваньн�.',
+'tooltip-ca-addsection'           => 'Пачаць новую ��кцыю',
 'tooltip-ca-viewsource'           => 'Г�та� �таронка абаронена�. �ле можна пагл�дзець �е крынічны т�к�т.',
 'tooltip-ca-history'              => 'Мінулы� в�р�іі г�тай �таронкі.',
 'tooltip-ca-protect'              => '�бараніць г�тую �таронку',
@@ -2221,6 +2448,9 @@ $1',
 'tooltip-watch'                   => 'Дадаць г�тую �таронку ў Ваш �ьпі� назіраньн�',
 'tooltip-recreate'                => '�днавіць �таронку, н� гледз�чы на тое, што �на была выдалена�',
 'tooltip-upload'                  => 'Пачаць загрузку',
+'tooltip-rollback'                => '«�дкат» в�ртае р�дагаваньні пап�р�дн�га ўдзельніка адным клікам.',
+'tooltip-undo'                    => '«�дм�ніць» — �ка�оўвае г�тае р�дагаваньне і адкрывае акно р�дагаваньн� ў р�жыме прагл�ду.
+Дазвал�е дадаваць прычыну адкату ў апі�аньне зьменаў.',
 
 # Metadata
 'nodublincore'      => 'М�тазьве�ткі Dublin Core RDF забаронены� на г�тым ��рв�ры.',
@@ -2228,12 +2458,12 @@ $1',
 'notacceptable'     => 'Вікі-��рв�р н� можа адлю�траваць зьве�ткі ў выгл�дзе, �кі здольны прачытаць Ваш браўз�р.',
 
 # Attribution
-'anonymous'        => '�нанімны� ўдзельнікі і ўдзельніцы {{GRAMMAR:родны|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|�нанімны ўдзельнік ці ўдзельніца|�нанімны� ўдзельнікі і ўдзельніцы}} {{GRAMMAR:родны|{{SITENAME}}}}',
 'siteuser'         => 'Удзельнік/удзельніца {{GRAMMAR:родны|{{SITENAME}}}} $1',
 'lastmodifiedatby' => 'Г�тую �таронку апошні раз р�дагаваў $3 $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => '�а а�нове працы $1.',
 'others'           => 'іншы�',
-'siteusers'        => 'Удзельнік(і) {{grammar:родны|{{SITENAME}}}} $1',
+'siteusers'        => '{{PLURAL:$2|Удзельнік|Удзельнікі}} {{GRAMMAR:родны|{{SITENAME}}}} $1',
 'creditspage'      => 'Падз�кі',
 'nocredits'        => '��ма інфармацыі пра аўтараў г�тай �таронкі.',
 
@@ -2254,6 +2484,16 @@ $1',
 'numauthors'     => 'Колька�ьць розных аўтараў і аўтарак (�таронкі): $1',
 'numtalkauthors' => 'Колька�ьць розных аўтараў і аўтарак (�таронкі абмеркаваньн�): $1',
 
+# Skin names
+'skinname-standard'    => 'Кл��ычнае',
+'skinname-nostalgia'   => '�а�тальгі�',
+'skinname-cologneblue' => 'Кёльн�кі �мутак',
+'skinname-monobook'    => 'Монакніга',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Цыпа',
+'skinname-simple'      => 'Про�тае',
+'skinname-modern'      => 'Суча�нае',
+
 # Math options
 'mw_math_png'    => 'Заў�ёды паказваць �к PNG',
 'mw_math_simple' => 'HTML у про�тых выпадках, інакш PNG',
@@ -2274,10 +2514,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'Вам не дазволена пазначаць Вашы� ўла�ны� зьмены �к «патрул�ваны�».',
 
 # Patrol log
-'patrol-log-page'   => 'Журнал патрул�ваньн�ў',
-'patrol-log-header' => 'Г�та журнал патрул�ваных в�р�і�ў.',
-'patrol-log-line'   => 'пазначана $1 з $2 патрул�ваных $3',
-'patrol-log-auto'   => '(аўтаматычна)',
+'patrol-log-page'      => 'Журнал патрул�ваньн�ў',
+'patrol-log-header'    => 'Г�та журнал патрул�ваных в�р�і�ў.',
+'patrol-log-line'      => 'пазначана $1 з $2 патрул�ваных $3',
+'patrol-log-auto'      => '(аўтаматычна)',
+'patrol-log-diff'      => 'в�р�і� $1',
+'log-show-hide-patrol' => '$1 журнал патрул�ваньн�ў',
 
 # Image deletion
 'deletedrevision'                 => 'Выдалена� �тара� в�р�і� $1',
@@ -2294,6 +2536,9 @@ $1',
 'previousdiff' => '� Пап�р�дн�� зьмена',
 'nextdiff'     => '�а�тупна� зьмена →',
 
+# Visual comparison
+'visual-comparison' => 'Візуальнае параўнаньне',
+
 # Media information
 'mediawarning'         => "'''Пап�р�джаньне''': г�ты файл можа ўтрымліваць зламы�ны код, выкананьне �кога можа нашкодзіць вашай �ы�т�ме.<hr />",
 'imagemaxsize'         => '�бм�жоўваць памер вы�ваў на �таронках апі�аньн� да:',
@@ -2306,10 +2551,12 @@ $1',
 'show-big-image'       => '�айлепшае разрозьненьне',
 'show-big-image-thumb' => '<small>Памер пры пап�р�днім прагл�дзе: $1 × $2 {{PLURAL:$2|пік��ль|пік��лі|пік��л�ў}}</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Галер�� новых файлаў',
 'imagelisttext'         => "�іж�й пададзены �ьпі� з '''$1''' {{PLURAL:$1|файла|файлаў|файлаў}}, ад�артаваных $2.",
 'newimages-summary'     => 'Г�та� �п�цы�льна� �таронка паказвае н�даўна загружаны� файлы.',
+'newimages-legend'      => 'Фільтар',
+'newimages-label'       => '�азва файла (альбо �е ча�тка):',
 'showhidebots'          => '($1 робатаў)',
 'noimages'              => 'Вы�вы ад�утнічаюць.',
 'ilsubmit'              => 'Шукаць',
@@ -2519,6 +2766,18 @@ $1',
 'exif-lightsource-24'  => '�тудыйна� л�мпа �тандарту ISO',
 'exif-lightsource-255' => 'Інша� крыніца �ьв�тла',
 
+# Flash modes
+'exif-flash-fired-0'    => 'У�пышка не �працавала',
+'exif-flash-fired-1'    => 'У�пышка �працавала',
+'exif-flash-return-0'   => 'б�з функцыі пап�р�дн�й у�пышкі',
+'exif-flash-return-2'   => 'адваротны імпуль� пап�р�дн�й у�пышкі не атрыманы',
+'exif-flash-return-3'   => 'адваротны імпуль� пап�р�дн�й у�пышкі атрыманы',
+'exif-flash-mode-1'     => 'прыму�ова� ў�пышка',
+'exif-flash-mode-2'     => 'прыму�овае падаўленьне ў�пышкі',
+'exif-flash-mode-3'     => 'аўтаматычны р�жым',
+'exif-flash-function-1' => 'Без у�пышкі',
+'exif-flash-redeye-1'   => 'р�жым пам�нш�ньн� �ф�кту чырвоных вач�й',
+
 'exif-focalplaneresolutionunit-2' => 'цал�ў',
 
 'exif-sensingmethod-1' => '��вызначаны',
@@ -2658,21 +2917,10 @@ $1
 
 'unit-pixel' => 'пк�',
 
-# HTML dump
-'redirectingto' => 'Перанакіраваньне на [[$1]]…',
-
 # action=purge
-'confirm_purge'        => '�чы�ьціць к�ш г�тай �таронкі?
-
-$1',
-'confirm_purge_button' => 'Так',
-
-# AJAX search
-'searchcontaining' => "Пошук �таронак, �кі� ўтрымліваюць ''$1''.",
-'searchnamed'      => "Пошук �таронак з назвай ''$1''.",
-'articletitles'    => "Старонкі, �кі� пачынаюцца з ''$1''",
-'hideresults'      => 'Схаваць вынікі',
-'useajaxsearch'    => 'Выкары�тоўваць AJAX-пошук',
+'confirm_purge_button' => 'Добра',
+'confirm-purge-top'    => '�чы�ьціць к�ш г�тай �таронкі?',
+'confirm-purge-bottom' => '�чы�тка к�шу �таронкі прыв�дзе да адлю�траваньн� �е апошн�й в�р�іі.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� пап�р�дн�� �таронка',
@@ -2692,10 +2940,10 @@ $1',
 'table_pager_empty'        => '�� знойдзена',
 
 # Auto-summaries
-'autosumm-blank'   => 'Зьме�т �таронкі выдалены цалкам',
+'autosumm-blank'   => 'Выдалены ўве�ь зьме�т �таронкі',
 'autosumm-replace' => "Старонка заменена� на '$1'",
 'autoredircomment' => 'Перанакіроўвае на [[$1]]',
-'autosumm-new'     => '�ова� �таронка: $1',
+'autosumm-new'     => "Створана �таронка �а зьме�там '$1'",
 
 # Size units
 'size-bytes'     => '$1 б',
@@ -2743,6 +2991,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '�ев�домы т�г пашыр�ньн� «$1»',
+'duplicate-defaultsort' => 'Пап�р�джаньне: Ключ �артыроўкі па змоўчваньні «$2» зам�н�е пап�р�дні ключ �артыроўкі па змоўчваньні «$1».',
 
 # Special:Version
 'version'                          => 'В�р�і�', # Not used as normal message but as header for the special page itself
@@ -2772,13 +3021,13 @@ $1',
 'filepath-summary' => 'Г�та� �п�цы�льна� �таронка в�ртае поўны шл�х да файла.
 Вы�вы паказаны� ў поўным выгл�дзе, а�татні� тыпы файлаў адкрываюцца прыпі�анымі да іх праграмамі.
 
-Ув�дзіце назву файла б�з пр�фік�у «{{ns:image}}:»',
+Ув�дзіце назву файла б�з пр�фік�у «{{ns:file}}:»',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Пошук дублікатаў файлаў',
 'fileduplicatesearch-summary'  => 'Пошук аднолькавых файлаў на пад�таве іх х�шаў.
 
-Ув�дзіце назву файла б�з пр�фік�у «{{ns:image}}:».',
+Ув�дзіце назву файла б�з пр�фік�у «{{ns:file}}:».',
 'fileduplicatesearch-legend'   => 'Пошук аднолькавых файлаў',
 'fileduplicatesearch-filename' => '�азва файла:',
 'fileduplicatesearch-submit'   => 'Шукаць',
@@ -2808,4 +3057,13 @@ $1',
 'blankpage'              => 'Пу�та� �таронка',
 'intentionallyblankpage' => 'Г�та� �таронка наўмы�на пакінута� пу�той',
 
+# External image whitelist
+'external_image_whitelist' => ' #Пакіньце г�ты радок такім, �кі ён ё�ьць<pre>
+#Зьм��ьціце ча�ткі р�гул�рных выразаў (толькі ча�тку �ка� знаходзіцца паміж //) ніж�й
+#Яны будуць �уадне�ены� з URL-адра�амі вонкавых вы�ваў
+#Ты�, �кі� будуць па�аваць будуць паказвацца �к вы�вы, а�татні� толькі �к �па�ылкі
+#Радкі, пазначаны� #, лічыцца кам�нтарамі
+
+#Зьм��ьціце ў�е ча�ткі р�гул�рных выразаў над г�тым радком. Сам радок пакіньце ў такім жа выгл�дзе</pre>',
+
 );
diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index 2a70b2ed..f98aaaf7 100644
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -17,37 +17,30 @@
 $fallback8bitEncoding = 'windows-1251';
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Меди�',
-	NS_SPECIAL        => 'Специални',
-	NS_MAIN           => '',
-	NS_TALK           => 'Бе�еда',
-	NS_USER           => 'Потребител',
-	NS_USER_TALK      => 'Потребител_бе�еда',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_бе�еда',
-	NS_IMAGE          => 'Картинка',
-	NS_IMAGE_TALK     => 'Картинка_бе�еда',
-	NS_MEDIAWIKI      => 'Меди�Уики',
-	NS_MEDIAWIKI_TALK => 'Меди�Уики_бе�еда',
-	NS_TEMPLATE       => 'Шаблон',
-	NS_TEMPLATE_TALK  => 'Шаблон_бе�еда',
-	NS_HELP           => 'Помощ',
-	NS_HELP_TALK      => 'Помощ_бе�еда',
-	NS_CATEGORY       => 'Категори�',
-	NS_CATEGORY_TALK  => 'Категори�_бе�еда',
+	NS_MEDIA            => 'Меди�',
+	NS_SPECIAL          => 'Специални',
+	NS_TALK             => 'Бе�еда',
+	NS_USER             => 'Потребител',
+	NS_USER_TALK        => 'Потребител_бе�еда',
+	NS_PROJECT_TALK     => '$1_бе�еда',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Файл_бе�еда',
+	NS_MEDIAWIKI        => 'Меди�Уики',
+	NS_MEDIAWIKI_TALK   => 'Меди�Уики_бе�еда',
+	NS_TEMPLATE         => 'Шаблон',
+	NS_TEMPLATE_TALK    => 'Шаблон_бе�еда',
+	NS_HELP             => 'Помощ',
+	NS_HELP_TALK        => 'Помощ_бе�еда',
+	NS_CATEGORY         => 'Категори�',
+	NS_CATEGORY_TALK    => 'Категори�_бе�еда',
 );
 
-$skinNames = array(
-	'standard'    => 'Кла�ика',
-	'nostalgia'   => '�о�талги�',
-	'cologneblue' => 'Кьолн�ко �иньо',
-	'monobook'    => 'Монобук',
-	'myskin'      => 'Мо�т облик',
-	'chick'       => 'Пиленце',
-	'simple'      => 'Семпъл',
-	'modern'      => 'Модерен',
+$namespaceAliases = array(
+	'Картинка' => NS_FILE,
+	'Картинка бе�еда' => NS_FILE_TALK,
 );
 
+
 $datePreferences = false;
 
 $bookstoreList = array(
@@ -138,85 +131,87 @@ $magicWords = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Двойни_прена�очвани�' ),
-	'BrokenRedirects'           => array( '�евалидни_прена�очвани�' ),
-	'Disambiguations'           => array( 'По��нителни_�траници' ),
-	'Userlogin'                 => array( 'Реги�триране_или_влизане' ),
+	'DoubleRedirects'           => array( 'Двойни прена�очвани�' ),
+	'BrokenRedirects'           => array( '�евалидни прена�очвани�' ),
+	'Disambiguations'           => array( 'По��нителни �траници' ),
+	'Userlogin'                 => array( 'Реги�триране или влизане' ),
 	'Userlogout'                => array( 'Излизане' ),
-	'CreateAccount'             => array( 'Създаване_на_�метка' ),
+	'CreateAccount'             => array( 'Създаване на �метка' ),
 	'Preferences'               => array( '�а�тройки' ),
-	'Watchlist'                 => array( 'Спи�ък_за_наблюдение' ),
-	'Recentchanges'             => array( 'По�ледни_промени' ),
+	'Watchlist'                 => array( 'Спи�ък за наблюдение' ),
+	'Recentchanges'             => array( 'По�ледни промени' ),
 	'Upload'                    => array( 'Качване' ),
-	'Imagelist'                 => array( 'Файлове' ),
-	'Newimages'                 => array( '�ови_файлове' ),
+	'Listfiles'                 => array( 'Файлове' ),
+	'Newimages'                 => array( '�ови файлове' ),
 	'Listusers'                 => array( 'Потребители' ),
+	'Listgrouprights'           => array( 'Групови права' ),
 	'Statistics'                => array( 'Стати�тика' ),
-	'Randompage'                => array( 'Случайна_�траница' ),
-	'Lonelypages'               => array( 'Страници_�ираци' ),
-	'Uncategorizedpages'        => array( '�екатегоризирани_�траници' ),
-	'Uncategorizedcategories'   => array( '�екатегоризирани_категории' ),
-	'Uncategorizedimages'       => array( '�екатегоризирани_картинки' ),
-	'Uncategorizedtemplates'    => array( '�екатегоризирани_шаблони' ),
-	'Unusedcategories'          => array( '�еизползвани_категории' ),
-	'Unusedimages'              => array( '�еизползвани_картинки' ),
-	'Wantedpages'               => array( 'Желани_�траници' ),
-	'Wantedcategories'          => array( 'Желани_категории' ),
-	'Mostlinked'                => array( '�ай-препращани_�траници' ),
-	'Mostlinkedcategories'      => array( '�ай-препращани_категории' ),
-	'Mostlinkedtemplates'       => array( '�ай-препращани_шаблони' ),
-	'Mostcategories'            => array( 'Страници_�_най-много_категории' ),
-	'Mostimages'                => array( '�ай-препращани_картинки' ),
-	'Mostrevisions'             => array( 'Страници_�_най-много_вер�ии' ),
-	'Fewestrevisions'           => array( 'Страници_�_най-малко_вер�ии' ),
-	'Shortpages'                => array( 'Кратки_�траници' ),
-	'Longpages'                 => array( 'Дълги_�траници' ),
-	'Newpages'                  => array( '�ови_�траници' ),
-	'Ancientpages'              => array( 'Стари_�траници' ),
-	'Deadendpages'              => array( 'Задънени_�траници' ),
-	'Protectedpages'            => array( 'Защитени_�траници' ),
-	'Protectedtitles'           => array( 'Защитени_заглави�' ),
-	'Allpages'                  => array( 'В�ички_�траници' ),
-	'Prefixindex'               => array( 'В�ички_�траници_(�_пред�тавка)' ),
-	'Ipblocklist'               => array( 'Блокирани_потребители' ),
-	'Specialpages'              => array( 'Специални_�траници' ),
+	'Randompage'                => array( 'Случайна �траница' ),
+	'Lonelypages'               => array( 'Страници �ираци' ),
+	'Uncategorizedpages'        => array( '�екатегоризирани �траници' ),
+	'Uncategorizedcategories'   => array( '�екатегоризирани категории' ),
+	'Uncategorizedimages'       => array( '�екатегоризирани картинки' ),
+	'Uncategorizedtemplates'    => array( '�екатегоризирани шаблони' ),
+	'Unusedcategories'          => array( '�еизползвани категории' ),
+	'Unusedimages'              => array( '�еизползвани картинки' ),
+	'Wantedpages'               => array( 'Желани �траници' ),
+	'Wantedcategories'          => array( 'Желани категории' ),
+	'Mostlinked'                => array( '�ай-препращани �траници' ),
+	'Mostlinkedcategories'      => array( '�ай-препращани категории' ),
+	'Mostlinkedtemplates'       => array( '�ай-препращани шаблони' ),
+	'Mostcategories'            => array( 'Страници � най-много категории' ),
+	'Mostimages'                => array( '�ай-препращани картинки' ),
+	'Mostrevisions'             => array( 'Страници � най-много вер�ии' ),
+	'Fewestrevisions'           => array( 'Страници � най-малко вер�ии' ),
+	'Shortpages'                => array( 'Кратки �траници' ),
+	'Longpages'                 => array( 'Дълги �траници' ),
+	'Newpages'                  => array( '�ови �траници' ),
+	'Ancientpages'              => array( 'Стари �траници' ),
+	'Deadendpages'              => array( 'Задънени �траници' ),
+	'Protectedpages'            => array( 'Защитени �траници' ),
+	'Protectedtitles'           => array( 'Защитени заглави�' ),
+	'Allpages'                  => array( 'В�ички �траници' ),
+	'Prefixindex'               => array( 'В�ички �траници (� пред�тавка)' ),
+	'Ipblocklist'               => array( 'Блокирани потребители' ),
+	'Specialpages'              => array( 'Специални �траници' ),
 	'Contributions'             => array( 'Прино�и' ),
-	'Emailuser'                 => array( 'Пи�мо_на_потребител' ),
-	'Confirmemail'              => array( 'Потвърждаване_на_е-поща' ),
-	'Whatlinkshere'             => array( 'Какво_�очи_на�ам' ),
-	'Recentchangeslinked'       => array( 'Свързани_промени' ),
-	'Movepage'                  => array( 'Преме�тване_на_�траница' ),
-	'Blockme'                   => array( 'Блокирай_ме' ),
-	'Booksources'               => array( 'Източници_на_книги' ),
+	'Emailuser'                 => array( 'Пи�мо на потребител' ),
+	'Confirmemail'              => array( 'Потвърждаване на е-поща' ),
+	'Whatlinkshere'             => array( 'Какво �очи на�ам' ),
+	'Recentchangeslinked'       => array( 'Свързани промени' ),
+	'Movepage'                  => array( 'Преме�тване на �траница' ),
+	'Blockme'                   => array( 'Блокирай ме' ),
+	'Booksources'               => array( 'Източници на книги' ),
 	'Categories'                => array( 'Категории' ),
 	'Export'                    => array( 'Изна��не' ),
 	'Version'                   => array( 'Вер�и�' ),
-	'Allmessages'               => array( 'Си�темни_�ъобщени�' ),
+	'Allmessages'               => array( 'Си�темни �ъобщени�' ),
 	'Log'                       => array( 'Дневници' ),
 	'Blockip'                   => array( 'Блокиране' ),
 	'Undelete'                  => array( 'Въз�танов�ване' ),
 	'Import'                    => array( 'Вна��не' ),
-	'Lockdb'                    => array( 'Заключване_на_БД' ),
-	'Unlockdb'                  => array( 'Отключване_на_БД' ),
-	'Userrights'                => array( 'Потребител�ки_права' ),
+	'Lockdb'                    => array( 'Заключване на БД' ),
+	'Unlockdb'                  => array( 'Отключване на БД' ),
+	'Userrights'                => array( 'Потребител�ки права' ),
 	'MIMEsearch'                => array( 'MIME-тър�ене' ),
-	'FileDuplicateSearch'       => array( 'Повтар�щи_�е_файлове' ),
-	'Unwatchedpages'            => array( '�енаблюдавани_�траници' ),
+	'FileDuplicateSearch'       => array( 'Повтар�щи �е файлове' ),
+	'Unwatchedpages'            => array( '�енаблюдавани �траници' ),
 	'Listredirects'             => array( 'Прена�очвани�' ),
-	'Revisiondelete'            => array( 'Изтриване_на_вер�ии' ),
-	'Unusedtemplates'           => array( '�еизползвани_шаблони' ),
-	'Randomredirect'            => array( 'Случайно_прена�очване' ),
-	'Mypage'                    => array( 'Мо�та_�траница' ),
-	'Mytalk'                    => array( 'Мо�та_бе�еда' ),
-	'Mycontributions'           => array( 'Моите_прино�и' ),
+	'Revisiondelete'            => array( 'Изтриване на вер�ии' ),
+	'Unusedtemplates'           => array( '�еизползвани шаблони' ),
+	'Randomredirect'            => array( 'Случайно прена�очване' ),
+	'Mypage'                    => array( 'Мо�та �траница' ),
+	'Mytalk'                    => array( 'Мо�та бе�еда' ),
+	'Mycontributions'           => array( 'Моите прино�и' ),
 	'Listadmins'                => array( '�дмини�тратори' ),
 	'Listbots'                  => array( 'Ботове' ),
-	'Popularpages'              => array( '�ай-по�ещавани_�траници' ),
+	'Popularpages'              => array( '�ай-по�ещавани �траници' ),
 	'Search'                    => array( 'Тър�ене' ),
-	'Resetpass'                 => array( 'Изтриване_на_парола' ),
-	'Withoutinterwiki'          => array( 'Без_междууикита' ),
-	'MergeHistory'              => array( 'И�тори�_на_�ливането' ),
-	'Filepath'                  => array( 'Път_към_файл' ),
+	'Resetpass'                 => array( 'Изтриване на парола' ),
+	'Withoutinterwiki'          => array( 'Без междууикита' ),
+	'MergeHistory'              => array( 'И�тори� на �ливането' ),
+	'Filepath'                  => array( 'Път към файл' ),
+	'Invalidateemail'           => array( 'Отм�на на е-поща' ),
 );
 
 $linkTrail = '/^([a-zабвгдежзийклмнопр�туфхцчшщъыь�ю�]+)(.*)$/sDu';
@@ -261,17 +256,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Скриване на моите редакции в �пи�ъка ми за наблюдение',
 'tog-watchlisthidebots'       => 'Скриване на редакциите на ботове в �пи�ъка ми за наблюдение',
 'tog-watchlisthideminor'      => 'Скриване на малките промени в �пи�ъка ми за наблюдение',
+'tog-watchlisthideliu'        => 'Скриване на редакциите от влезли потребители от �пи�ъка за наблюдение',
+'tog-watchlisthideanons'      => 'Скриване на редакциите от анонимни потребители в �пи�ъка за наблюдение',
 'tog-nolangconversion'        => 'Без преобразувани� при различни езикови варианти',
 'tog-ccmeonemails'            => 'Получаване на копи� на пи�мата, които пращам на другите потребители',
 'tog-diffonly'                => 'Без показване на �ъдържанието на �траницата при преглед на разлики',
 'tog-showhiddencats'          => 'Показване на �критите категории',
+'tog-norollbackdiff'          => 'Пропу�кане на разликовата връзка �лед извършване на отм�на на редакции',
 
 'underline-always'  => 'Винаги',
 'underline-never'   => '�икога',
 'underline-default' => 'Според на�тройките на браузъра',
 
-'skinpreview' => '(Предварителен преглед)',
-
 # Dates
 'sunday'        => 'недел�',
 'monday'        => 'понеделник',
@@ -365,7 +361,7 @@ $messages = array(
 'mytalk'         => 'Мо�та бе�еда',
 'anontalk'       => 'Бе�еда за адре�а',
 'navigation'     => '�авигаци�',
-'and'            => 'и',
+'and'            => '&#32;и',
 
 # Metadata in edit box
 'metadata_help' => 'Метаданни:',
@@ -402,7 +398,7 @@ $messages = array(
 'talkpagelinktext'  => 'Бе�еда',
 'specialpage'       => 'Специална �траница',
 'personaltools'     => 'Лични ин�трументи',
-'postcomment'       => 'О�тав�не на �ъобщение',
+'postcomment'       => '�ов раздел',
 'articlepage'       => 'Преглед на �траница',
 'talk'              => 'Бе�еда',
 'views'             => 'Прегледи',
@@ -428,8 +424,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'За {{SITENAME}}',
 'aboutpage'            => 'Project:За {{SITENAME}}',
-'bugreports'           => 'Съобщени� за грешки',
-'bugreportspage'       => 'Project:Съобщени� за грешки',
 'copyright'            => 'Съдържанието е до�тъпно при у�лови�та на $1.',
 'copyrightpagename'    => '�втор�ки права в {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:�втор�ки права',
@@ -452,9 +446,7 @@ $messages = array(
 
 'badaccess'        => 'Грешка при до�тъп',
 'badaccess-group0' => '��мате права да извършите и�каното дей�твие',
-'badaccess-group1' => 'И�каното дей�твие могат да изпълн�т �амо потребители от групата $1.',
-'badaccess-group2' => 'И�каното дей�твие могат да изпълн�т �амо потребители от групите $1.',
-'badaccess-groups' => 'И�каното дей�твие могат да изпълн�т �амо потребители от групите $1.',
+'badaccess-groups' => 'И�каното дей�твие могат да изпълн�т �амо потребители от {{PLURAL:$2|група|н�ко� от �ледните групи:}} $1.',
 
 'versionrequired'     => 'Изи�ква �е вер�и� $1 на Меди�Уики',
 'versionrequiredtext' => 'Използването на тази �траница изи�ква вер�и� $1 на �офтуера Меди�Уики. Вижте [[Special:Version|текущата използвана вер�и�]].',
@@ -469,6 +461,8 @@ $messages = array(
 'editsection'             => 'редактиране',
 'editold'                 => 'редактиране',
 'viewsourceold'           => 'преглед на кода',
+'editlink'                => 'редактиране',
+'viewsourcelink'          => 'преглед на кода',
 'editsectionhint'         => 'Редактиране на раздел: $1',
 'toc'                     => 'Съдържание',
 'showtoc'                 => 'показване',
@@ -483,7 +477,7 @@ $messages = array(
 'site-atom-feed'          => 'Еми�и� на Atom за $1',
 'page-rss-feed'           => 'Еми�и� на RSS за „$1“',
 'page-atom-feed'          => 'Еми�и� на Atom за „$1“',
-'red-link-title'          => '$1 (�траницата в�е още не �ъще�твува)',
+'red-link-title'          => '$1 (�траницата не �ъще�твува)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Страница',
@@ -499,7 +493,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '��ма такова дей�твие',
-'nosuchactiontext'  => 'Дей�твието, указано от мрежови� адре�, не �е разпознава от �и�темата.',
+'nosuchactiontext'  => 'Дей�твието, указано в интернет адре�а, е невалидно.
+Може би �те допу�нали грешка в изпи�ването на адре�а или �те по�ледвали некоректна хипервръзка.
+Проблемът може да �е дължи и на грешка в �офтуера на {{SITENAME}}.',
 'nosuchspecialpage' => '��ма такава �пециална �траница',
 'nospecialpagetext' => "<big>'''Отправихте за�вка за невалидна �пециална �траница.'''</big>
 
@@ -551,7 +547,6 @@ $1',
 'cannotdelete'         => 'Указаната �траница или файл не можа да бъде изтрит(а). Възможно е вече да е изтрит(а) от н�кой друг.',
 'badtitle'             => '�евалидно заглавие',
 'badtitletext'         => 'Желаното заглавие на �траница е невалидно, празно или неправилна препратка към друго уики. Възможно е да �ъдържа знаци, които не �а позволени в заглави�.',
-'perfdisabled'         => 'Съжал�ваме! Това �вой�тво е временно изключено, защото забав� базата от данни дотам, че никой не може да използва уикито.',
 'perfcached'           => 'Следните данни �а извлечени от �клада и затова може да не отговар�т на текущото �ъ�то�ние:',
 'perfcachedts'         => 'Данните �а �кладирани и обновени за по�ледно на $1.',
 'querypage-no-updates' => 'Обнов�ването на тази �траница в момента е изключено. За�ега данните тук н�ма да бъдат обнов�вани.',
@@ -565,7 +560,8 @@ $1',
 'protectedpagetext'    => 'Тази �траница е заключена за редактиране.',
 'viewsourcetext'       => 'Можете да разгледате и да копирате кодa на �траницата:',
 'protectedinterface'   => 'Тази �траница �ъдържа тек�т, нужен за работата на �и�темата. Т� е защитена против редактиране, за да �е предотврат�т възможни злоупотреби.',
-'editinginterface'     => "'''Внимание:''' Редактирате �траница, ко�то �е използва за интерфей�а на �офтуера. Пром�ната й ще повли�е на външни� вид на уикито.",
+'editinginterface'     => "'''Внимание:''' Редактирате �траница, ко�то �е използва за интерфей�а на �офтуера. Пром�ната й ще повли�е на външни� вид на уикито.
+За превеждане обми�лете използването на [http://translatewiki.net/wiki/Main_Page?setlang=bg translatewiki.net], проектът за локализиране на MediaWiki.",
 'sqlhidden'            => '(За�вка на SQL — �крита)',
 'cascadeprotected'     => 'Тази �траница е защитена против редактиране, защото е включена в {{PLURAL:$1|�ледната �траница, ко�то от �во� �трана има|�ледните �траници, които от �во� �трана имат}} ка�кадна защита:
 $2',
@@ -576,15 +572,15 @@ $2',
 По�очената причина е ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Лоша конфигураци�: непознат �кенер за виру�и: <i>$1</i>',
+'virus-badscanner'     => "Лоша конфигураци�: непознат �кенер за виру�и: ''$1''",
 'virus-scanfailed'     => '�канирането не �получи (код $1)',
 'virus-unknownscanner' => 'непознат антивиру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Излизане от �и�темата',
-'logouttext'                 => '<strong>Изл�зохте от �и�темата.</strong>
+'logouttext'                 => "'''Изл�зохте от �и�темата.'''
 
-Можете да продължите да използвате {{SITENAME}} анонимно или да влезете отново като друг потребител. Обърнете внимание, че н�кои �траници в�е още ще �е показват така, ��каш �те влезли, докато не изтриете кеш-паметта на браузъра.',
+Можете да продължите да използвате {{SITENAME}} анонимно или да влезете отново като друг потребител. Обърнете внимание, че н�кои �траници в�е още ще �е показват така, ��каш �те влезли, докато не изтриете кеш-паметта на браузъра.",
 'welcomecreation'            => '== Добре дошли, $1! ==
 
 Вашата �метка беше у�пешно открита. Сега можете да промените на�тройките на {{SITENAME}} по ваш вку�.',
@@ -595,7 +591,6 @@ $2',
 'remembermypassword'         => 'Запомн�не на паролата',
 'yourdomainname'             => 'Домейн:',
 'externaldberror'            => 'Или е �танала грешка в базата от данни при външното удо�товер�ване, или не ви е позволено да обнов�вате външната �и �метка.',
-'loginproblem'               => '<strong>Имаше проблем � влизането ви.</strong><br />Опитайте отново!',
 'login'                      => 'Влизане',
 'nav-login-createaccount'    => 'Реги�триране или влизане',
 'loginprompt'                => "За влизане в {{SITENAME}} е необходимо да въведете потребител�кото �и име и парола и да нати�нете бутона '''Влизане''', като, за да бъде това у�пешно, би�квитките (cookies) тр�бва да �а разрешени в браузъра ви.
@@ -623,8 +618,8 @@ $2',
 'yourvariant'                => 'Вариант',
 'yournick'                   => 'Подпи�:',
 'badsig'                     => 'Избрани�т подпи� не е валиден. Проверете HTML-етикетите!',
-'badsiglength'               => 'Подпи�ът е твърде дълъг.
-Мак�имално допу�тимата дължина на подпи� е $1 {{PLURAL:$1|знак|знака}}.',
+'badsiglength'               => 'Ваши�т подпи� е твърде дълъг.
+Подпи�ите не могат да надвишават $1 {{PLURAL:$1|знак|знака}}.',
 'email'                      => 'Е-поща',
 'prefs-help-realname'        => '* <strong>И�тин�ко име</strong> <em>(незадължително)</em>: �ко го по�очите, на него ще бъдат припи�ани вашите прино�и.',
 'loginerror'                 => 'Грешка при влизане',
@@ -635,7 +630,9 @@ $2',
 'noname'                     => '�е указахте валидно потребител�ко име.',
 'loginsuccesstitle'          => 'У�пешно влизане',
 'loginsuccess'               => "'''Вл�зохте в {{SITENAME}} като „$1“.'''",
-'nosuchuser'                 => '�е �ъще�твува потребител � име „$1“. Проверете изпи�ването или [[Special:UserLogin/signup|�ъздайте нова �метка]].',
+'nosuchuser'                 => '�е �ъще�твува потребител � име „$1“. 
+Потребител�ките имена �а чув�твителни на малки и главни букви.
+Проверете изпи�ването или [[Special:UserLogin/signup|�ъздайте нова �метка]].',
 'nosuchusershort'            => '�е �ъще�твува потребител � името „<nowiki>$1</nowiki>“. Проверете изпи�ването.',
 'nouserspecified'            => '�еобходимо е да �е по�очи потребител�ко име.',
 'wrongpassword'              => 'Въведената парола е невалидна. Опитайте отново.',
@@ -657,10 +654,11 @@ $2',
 'throttled-mailpassword'     => 'Функци�та за напомн�не на паролата е използвана през {{PLURAL:$1|по�ледни� един ча�|по�ледните $1 ча�а}}.
 За предотврат�ване на злоупотреби е разрешено да �е изпраща не повече от едно напомн�не в рамките на {{PLURAL:$1|един ча�|$1 ча�а}}.',
 'mailerror'                  => 'Грешка при изпращане на пи�мо: $1',
-'acct_creation_throttle_hit' => 'Съжал�ваме, вече �те �ъздали $1 �метки и н�мате право на повече.',
-'emailauthenticated'         => '�дре�ът на електронната ви поща беше потвърден на $1.',
+'acct_creation_throttle_hit' => 'През по�ледното денонощие, през този IP-адре� по�етители на това уики �а �ъздали {{PLURAL:$1|1 �метка |$1 �метки}}, което е мак�имални�т допу�тим брой за този период.
+В резултат, към момента не могат да �ъздават повече потребител�ки �метки през този IP-адре�.',
+'emailauthenticated'         => '�дре�ът на електронната ви поща беше потвърден на $2 в $3.',
 'emailnotauthenticated'      => '�дре�ът на електронната ви поща <strong>не е потвърден</strong>. ��ма да получавате пи�ма за нико� от �ледните възможно�ти.',
-'noemailprefs'               => '<strong>�е е указан адре� за електронна поща</strong>, функциите н�ма да работ�т.',
+'noemailprefs'               => 'За да работ�т тези функционално�ти, тр�бва да по�очите адре� на електронна поща в �воите на�тройки.',
 'emailconfirmlink'           => 'Потвърждаване на адре�а за електронна поща',
 'invalidemailaddress'        => 'Въведени�т адре� не може да бъде приет, тъй като не �ъответ�тва на формата на адре� за електронна поща. Въведете коректен адре� или о�тавете полето празно.',
 'accountcreated'             => 'Потребител�ката �метка беше �ъздадена',
@@ -669,18 +667,26 @@ $2',
 'createaccount-text'         => '��кой е �ъздал �метка за $2 в {{SITENAME}} ($4) и е по�очил този адре� за електронна поща. Паролата за „$2“ е „$3“. �еобходимо е да влезете в �и�темата и да �мените паролата �и.
 
 Можете да пренебрегнете това �ъобщение, ако �метката е �ъздадена по грешка.',
+'login-throttled'            => '�а�коро �те направили твърде много опити да въведете паролата за тази �метка. Мол�, изчакайте изве�тно време преди да опитате отново.',
 'loginlanguagelabel'         => 'Език: $1',
 
 # Password reset dialog
-'resetpass'               => 'См�на на паролата',
-'resetpass_announce'      => 'Вл�зохте � временен код, получен по електронната поща. Сега е нужно да �и изберете нова парола:',
-'resetpass_text'          => '<!-- Тук добавете тек�т -->',
-'resetpass_header'        => 'Пром�на на парола',
-'resetpass_submit'        => 'Избиране на парола и влизане',
-'resetpass_success'       => 'Паролата ви беше �менена! Сега влизате…',
-'resetpass_bad_temporary' => '�евалидна временна парола. Възможно е вече да �те променили паролата �и или пък да �те пои�кали нова временна парола.',
-'resetpass_forbidden'     => '�е е разрешена �м�на на паролата',
-'resetpass_missing'       => 'Лип�ват формул�рни данни.',
+'resetpass'                 => 'Пром�на на парола',
+'resetpass_announce'        => 'Вл�зохте � временен код, получен по електронната поща. Сега е нужно да �и изберете нова парола:',
+'resetpass_text'            => '<!-- Тук добавете тек�т -->',
+'resetpass_header'          => 'Пром�на на парола',
+'oldpassword'               => 'Стара парола:',
+'newpassword'               => '�ова парола:',
+'retypenew'                 => '�ова парола повторно:',
+'resetpass_submit'          => 'Избиране на парола и влизане',
+'resetpass_success'         => 'Паролата ви беше �менена! Сега влизате…',
+'resetpass_bad_temporary'   => '�евалидна временна парола. Възможно е вече да �те променили паролата �и или пък да �те пои�кали нова временна парола.',
+'resetpass_forbidden'       => '�е е разрешена �м�на на паролата',
+'resetpass-no-info'         => 'За да до�тъпвате тази �траница директно, необходимо е да влезете в �и�темата.',
+'resetpass-submit-loggedin' => 'Пром�на на паролата',
+'resetpass-wrong-oldpass'   => '�евалидна временна или текуща парола. 
+Възможно е вече у�пешно да �те �менили паролата �и или да �те пои�кали нова временна парола.',
+'resetpass-temp-password'   => 'Временна парола:',
 
 # Edit page toolbar
 'bold_sample'     => 'Получер тек�т',
@@ -705,8 +711,8 @@ $2',
 'hr_tip'          => 'Хоризонтална лини� (използвайте пе�теливо)',
 
 # Edit pages
-'summary'                          => 'Резюме',
-'subject'                          => 'Тема/заглавие',
+'summary'                          => 'Резюме:',
+'subject'                          => 'Тема/заглавие:',
 'minoredit'                        => 'Това е малка пром�на',
 'watchthis'                        => '�аблюдаване на �траницата',
 'savearticle'                      => 'Съхран�ване',
@@ -718,8 +724,8 @@ $2',
 'missingsummary'                   => "'''�апомн�не:''' �е е въведено кратко опи�ание на промените. При повторно нати�кане на бутона „Съхран�ване“, редакци�та ще бъде �ъхранена без резюме.",
 'missingcommenttext'               => 'По-долу въведете вашето �ъобщение.',
 'missingcommentheader'             => "'''�апомн�не:''' �е е въведено заглавие на коментара. При повторно нати�кане на бутона „Съхран�ване“, редакци�та ще бъде запи�ана без такова.",
-'summary-preview'                  => 'Предварителен преглед на резюмето',
-'subject-preview'                  => 'Предварителен преглед на заглавието',
+'summary-preview'                  => 'Предварителен преглед на резюмето:',
+'subject-preview'                  => 'Предварителен преглед на заглавието:',
 'blockedtitle'                     => 'Потребител�т е блокиран',
 'blockedtext'                      => "<big>'''Вашето потребител�ко име (или IP-адре�) беше блокирано.'''</big>
 
@@ -770,28 +776,28 @@ $2',
 'anontalkpagetext'                 => "----''Това е ди�ку�ионната �траница на анонимен потребител, който в�е още н�ма реги�трирана �метка или не � използва, затова �е налага да използваме IP-адре�, за да го идентифицираме. Такъв адре� може да �е �подел� от н�колко потребители.''
 
 ''�ко �те анонимен потребител и ми�лите, че тези неуме�тни коментари �а отправени към ва�, [[Special:UserLogin/signup|реги�трирайте �е]] или [[Special:UserLogin|влезте в �и�темата]], за да избегнете евентуално бъдещо объркване � други анонимни потребители.''",
-'noarticletext'                    => 'Тази �траница в�е още не �ъще�твува. Можете да [[Special:Search/{{PAGENAME}}|потър�ите за заглавието на �траницата]] в други �траници или [{{fullurl:{{FULLPAGENAME}}|action=edit}} да � �ъздадете].',
+'noarticletext'                    => 'Тази �траница в�е още не �ъще�твува. Можете да [[Special:Search/{{PAGENAME}}|потър�ите за заглавието на �траницата]] в други �траници, да <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} потър�ите в дневниците] или [{{fullurl:{{FULLPAGENAME}}|action=edit}} да � �ъздадете]</span>.',
 'userpage-userdoesnotexist'        => '��ма реги�трирана потребител�ка �метка за „$1“. Изи�ква �е потвърждение, че желаете да �ъздадете/редактирате тази �траница?',
 'clearyourcache'                   => "'''Бележка:''' След �ъхранението е необходимо да изтриете кеша на браузъра, за да видите промените:
 '''Mozilla / Firefox / Safari:''' нати�нете бутона ''Shift'' и щракнете върху ''Презареждане'' (''Reload''), или изберете клавишната комбинаци� ''Ctrl-Shift-R'' (''Cmd-Shift-R'' за Apple Mac);
 '''IE:''' нати�нете ''Ctrl'' и щракнете върху ''Refresh'', или клавишната комбинаци� ''CTRL-F5'';
 '''Konqueror:''' щракнете върху ''Презареждане'' или нати�нете ''F5'';
 '''Opera:''' веро�тно е необходимо да изчи�тите кеша през менюто ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => '<strong>Съвет:</strong> Използвайте бутона „Предварителен преглед“, за да изпробвате нови� код на CSS/Джава�крипт преди �ъхранението.',
+'usercssjsyoucanpreview'           => "'''Съвет:''' Използвайте бутона „Предварителен преглед“, за да изпробвате нови� код на CSS/Джава�крипт преди �ъхранението.",
 'usercsspreview'                   => "'''�е забрав�йте, че това е �амо предварителен преглед на кода на CSS. Страницата в�е още не е �ъхранена!'''",
 'userjspreview'                    => "'''�е забрав�йте, че това е �амо изпробване/предварителен преглед на кода на Джава�крипт. Страницата в�е още не е �ъхранена!'''",
 'userinvalidcssjstitle'            => "'''Внимание:''' �е �ъще�твува облик „$1“. �еобходимо е да �е знае, че имената на потребител�ките ви �траници за CSS и Джава�крипт тр�бва да �е �ъ�то�т от малки букви, например: „{{ns:user}}:Иван/monobook.css“ (а не „{{ns:user}}:Иван/Monobook.css“).",
 'updated'                          => '(обновена)',
-'note'                             => '<strong>Забележка:</strong>',
-'previewnote'                      => '<strong>Това е �амо предварителен преглед. Промените в�е още не �а �ъхранени!</strong>',
+'note'                             => "'''Забележка:'''",
+'previewnote'                      => "'''Това е �амо предварителен преглед. Промените в�е още не �а �ъхранени!'''",
 'previewconflict'                  => 'Този предварителен преглед отраз�ва тек�та в горната тек�това кути� така, както би �е показал, ако �ъхраните.',
-'session_fail_preview'             => '<strong>За �ъжаление редакци�та ви не у�п� да бъде обработена поради загуба на данните за текущата �е�и�. Опитайте отново. �ко в�е още не работи, опитайте да [[Special:UserLogout|излезете]] и да влезете отново.</strong>',
-'session_fail_preview_html'        => "<strong>За �ъжаление редакци�та ви не беше запи�ана поради изтичането на �е�и�та ви.</strong>
+'session_fail_preview'             => "'''За �ъжаление редакци�та ви не у�п� да бъде обработена поради загуба на данните за текущата �е�и�. Опитайте отново. �ко в�е още не работи, опитайте да [[Special:UserLogout|излезете]] и да влезете отново.'''",
+'session_fail_preview_html'        => "'''За �ъжаление редакци�та ви не беше запи�ана поради изтичането на �е�и�та ви.'''
 
 ''Тъй като {{SITENAME}} приема обикновен HTML, предварителни�т преглед е �крит като предпазна м�рка �рещу атаки чрез Джава�крипт.''
 
-<strong>Опитайте отново. �ко в�е още не �работва, пробвайте да [[Special:UserLogout|излезете]] и влезете отново.</strong>",
-'token_suffix_mismatch'            => '<strong>Редакци�та ви беше отхвърлена, защото браузърът ви е развалил пунктуационните знаци в редакционната отметка. Евентуалното �ъхранение би унищожило �ъдържанието на �траницата. Пон�кога това �е �лучва при използването на грешно работещи анонимни междинни �ървъри.</strong>',
+'''Опитайте отново. �ко в�е още не �работва, пробвайте да [[Special:UserLogout|излезете]] и влезете отново.'''",
+'token_suffix_mismatch'            => "'''Редакци�та ви беше отхвърлена, защото браузърът ви е развалил пунктуационните знаци в редакционната отметка. Евентуалното �ъхранение би унищожило �ъдържанието на �траницата. Пон�кога това �е �лучва при използването на грешно работещи анонимни междинни �ървъри.'''",
 'editing'                          => 'Редактиране на „$1“',
 'editingsection'                   => 'Редактиране на „$1“ (раздел)',
 'editingcomment'                   => 'Редактиране на „$1“ (нов раздел)',
@@ -801,31 +807,33 @@ $2',
 За да бъдат и те �ъхранени, е необходимо ръчно да ги преме�тите в горното поле, тъй като '''един�твено''' тек�тът в него ще бъде �ъхранен при нати�кането на бутона „Съхран�ване“.",
 'yourtext'                         => 'Ваши�т тек�т',
 'storedversion'                    => 'Съхранена вер�и�',
-'nonunicodebrowser'                => '<strong>В�ИМ��ИЕ: Браузърът ви не поддържа Уникод. За да можете �покойно да редактирате �траници, в�ички �имволи, невключени в ASCII-таблицата, ще бъдат заменени � ше�тнаде�етични кодове.</strong>',
-'editingold'                       => '<strong>В�ИМ��ИЕ: Редактирате о�тар�ла вер�и� на �траницата.
-�ко �ъхраните, в��какви промени, направени �лед тази вер�и�, ще бъдат изгубени.</strong>',
+'nonunicodebrowser'                => "'''В�ИМ��ИЕ: Браузърът ви не поддържа Уникод. За да можете �покойно да редактирате �траници, в�ички �имволи, невключени в ASCII-таблицата, ще бъдат заменени � ше�тнаде�етични кодове.'''",
+'editingold'                       => "'''В�ИМ��ИЕ: Редактирате о�тар�ла вер�и� на �траницата.
+�ко �ъхраните, в��какви промени, направени �лед тази вер�и�, ще бъдат изгубени.'''",
 'yourdiff'                         => 'Разлики',
-'copyrightwarning'                 => 'Обърнете внимание, че в�ички прино�и към {{SITENAME}} �е публикуват при у�лови�та на $2 (за подробно�ти вижте $1).
+'copyrightwarning'                 => "Обърнете внимание, че в�ички прино�и към {{SITENAME}} �е публикуват при у�лови�та на \$2 (за подробно�ти вижте \$1).
 �ко не �те �ъгла�ни вашата пи�мена работа да бъде промен�на и разпро�тран�вана без ограничени�, не � публикувайте.<br />
 
-Също потвърждавате, че <strong>вие</strong> �те напи�али материала или �те използвали <strong>�вободни ре�ур�и</strong> — <em>обще�твено до�то�ние</em> или друг �вободен източник.
+Също потвърждавате, че '''вие''' �те напи�али материала или �те използвали '''�вободни ре�ур�и''' — <em>обще�твено до�то�ние</em> или друг �вободен източник.
 �ко �те ползвали чужди материали, за които имате разрешение, непременно по�очете източника.
 
-<div style="font-variant:small-caps"><strong>�е публикувайте произведени� � автор�ки права без разрешение!</strong></div>',
-'copyrightwarning2'                => 'Обърнете внимание, че в�ички прино�и към {{SITENAME}} могат да бъдат редактирани, промен�ни или премахвани от о�таналите �ътрудници.
+<div style=\"font-variant:small-caps\">'''�е публикувайте произведени� � автор�ки права без разрешение!'''</div>",
+'copyrightwarning2'                => "Обърнете внимание, че в�ички прино�и към {{SITENAME}} могат да бъдат редактирани, промен�ни или премахвани от о�таналите �ътрудници.
 �ко не �те �ъгла�ни вашата пи�мена работа да бъде промен�на без ограничени�, не � публикувайте.<br />
-Също потвърждавате, че <strong>вие</strong> �те напи�али материала или �те използвали <strong>�вободни ре�ур�и</strong> — <em>обще�твено до�то�ние</em> или друг �вободен източник (за подробно�ти вижте $1).
+Също потвърждавате, че '''вие''' �те напи�али материала или �те използвали '''�вободни ре�ур�и''' — <em>обще�твено до�то�ние</em> или друг �вободен източник (за подробно�ти вижте \$1).
 �ко �те ползвали чужди материали, за които имате разрешение, непременно по�очете източника.
 
-<div style="font-variant:small-caps"><strong>�е публикувайте произведени� � автор�ки права без разрешение!</strong></div>',
-'longpagewarning'                  => '<strong>В�ИМ��ИЕ: Страницата има размер $1 килобайта; н�кои браузъри могат да имат проблеми при редактиране на �траници по-големи от 32 kB.
-Обми�лете дали �траницата не може да �е раздели на н�колко по-малки ча�ти.</strong>',
-'longpageerror'                    => '<strong>ГРЕШК�: Тек�тът, който пращате, е � големина $1 килобайта, което надвишава позволени� мак�имум от $2 килобайта. Заради това не може да бъде �ъхранен.</strong>',
-'readonlywarning'                  => '<strong>В�ИМ��ИЕ: Базата от данни беше затворена за поддръжка, затова в момента промените ви не могат да бъдат �ъхранени. �ко желаете, можете да �ъхраните �траницата като тек�тов файл и да �е опитате да � публикувате по-къ�но.</strong>',
-'protectedpagewarning'             => '<strong>В�ИМ��ИЕ: Страницата е защитена и �амо админи�тратори могат да � редактират.</strong>',
+<div style=\"font-variant:small-caps\">'''�е публикувайте произведени� � автор�ки права без разрешение!'''</div>",
+'longpagewarning'                  => "'''В�ИМ��ИЕ: Страницата има размер $1 килобайта; н�кои браузъри могат да имат проблеми при редактиране на �траници по-големи от 32 kB.
+Обми�лете дали �траницата не може да �е раздели на н�колко по-малки ча�ти.'''",
+'longpageerror'                    => "'''ГРЕШК�: Тек�тът, който пращате, е � големина $1 килобайта, което надвишава позволени� мак�имум от $2 килобайта. Заради това не може да бъде �ъхранен.'''",
+'readonlywarning'                  => "'''В�ИМ��ИЕ: Базата от данни беше затворена за поддръжка, затова в момента промените ви не могат да бъдат �ъхранени. �ко желаете, можете да �ъхраните �траницата като тек�тов файл и да �е опитате да � публикувате по-къ�но.'''
+
+�дмини�траторът, който е затворил базата от данни, е по�очил �ледната причина: $1",
+'protectedpagewarning'             => "'''В�ИМ��ИЕ: Страницата е защитена и �амо админи�тратори могат да � редактират.'''",
 'semiprotectedpagewarning'         => "'''Забележка:''' Страница е защитена, като �амо реги�трирани потребители могат да � редактират.",
 'cascadeprotectedwarning'          => "'''Внимание:''' Страницата е защитена, като �амо потребители � админи�тратор�ки права могат да � редактират. Т� е включена в {{PLURAL:$1|�ледната �траница|�ледните �траници}} � ка�кадна защита:",
-'titleprotectedwarning'            => '<strong>В�ИМ��ИЕ:  Тази �траница беше заключена и �амо н�кои потребители могат да � �ъздадат.</strong>',
+'titleprotectedwarning'            => "'''В�ИМ��ИЕ:  Тази �траница беше заключена и [[Special:ListGroupRights|�амо н�кои]] потребители могат да � �ъздадат.'''",
 'templatesused'                    => 'Шаблони, използвани на �траницата:',
 'templatesusedpreview'             => 'Шаблони, използвани в предварителни� преглед:',
 'templatesusedsection'             => 'Шаблони, използвани в този раздел:',
@@ -843,17 +851,27 @@ $2',
 
 Обми�лете добре дали е уме�тно повторното �ъздаване на �траницата.
 За ваша информаци� по-долу е по�очена причината за предишното изтриване на �траницата:",
+'deleted-notice'                   => 'Тази �траница е била изтрита. За �правка, погледнете по-долу запи�ите за тази �траница в Дневника на изтривани�та.',
+'deletelog-fulllog'                => 'Преглед на пълни� дневник',
+'edit-gone-missing'                => 'Страницата не можа да �е обнови.
+Веро�тно междувременно е била изтрита.',
+'edit-conflict'                    => 'Редакционен конфликт.',
+'edit-no-change'                   => 'Вашата редакци� беше игнорирана, тъй като не �ъдържа промени по тек�та.',
+'edit-already-exists'              => '�е можа да �е �ъздаде нова �траница.
+Такава вече �ъще�твува.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Внимание: Тази �траница прекалено много пъти използва ре�ур�оемки пар�ерни функции.
 
-В момента има $1, тр�бва да �а по-малко от $2.',
+В момента има {{PLURAL:$1|$1 обръщение|$1 обръщени�}} към такива функции, а тр�бва да {{PLURAL:$1|е|�а}} по-малко от $2.',
 'expensive-parserfunction-category'       => 'Страници, които прекалено много пъти използват ре�ур�оемки пар�ерни функции',
 'post-expand-template-inclusion-warning'  => 'Внимание: Размерът за включване на този шаблон е твърде гол�м.
 ��кои шаблони н�ма да бъдат включени.',
 'post-expand-template-inclusion-category' => 'Страници, �ъдържащи шаблони � превишени размери на включеното �ъдържание',
 'post-expand-template-argument-warning'   => 'Внимание: Тази �траница �ъдържа поне един параметър на шаблон, който има твърде гол�м размер при разгръщане. Тези параметри б�ха пропу�нати.',
 'post-expand-template-argument-category'  => 'Страници, �ъдържащи шаблони � пропу�нати параметри',
+'parser-template-loop-warning'            => 'Открито зацикл�не на шаблон: [[$1]]',
+'parser-template-recursion-depth-warning' => '�адвишен лимит на дълбочината при шаблонна рекур�и� ($1)',
 
 # "Undo" feature
 'undo-success' => 'Редакци�та може да бъде върната. Прегледайте долното �равнение и �е уверете, че наи�тина и�кате да го направите. След това �ъхранете �траницата, за да извършите връщането.',
@@ -868,28 +886,28 @@ $2',
 Причината, изложена от $3, е ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Преглед на извършените админи�тративни дей�тви� по �траницата',
-'nohistory'           => '��ма редакционна и�тори� за тази �траница.',
-'revnotfound'         => 'Вер�и�та не е открита',
-'revnotfoundtext'     => 'Желаната �тара вер�и� на �траницата не беше открита. Проверете адре�а, който използвахте за до�тъп до �траницата.',
-'currentrev'          => 'Текуща вер�и�',
-'revisionasof'        => 'Вер�и� от $1',
-'revision-info'       => 'Вер�и� от $1 на $2',
-'previousrevision'    => '�По-�тара вер�и�',
-'nextrevision'        => 'По-нова вер�и�→',
-'currentrevisionlink' => 'преглед на текущата вер�и�',
-'cur'                 => 'тек',
-'next'                => '�лед',
-'last'                => 'пред',
-'page_first'          => 'първа',
-'page_last'           => 'по�ледна',
-'histlegend'          => '<em>Разлики:</em> Изберете вер�иите, които желаете да �равните, чрез превключвателите �рещу т�х и нати�нете &lt;Enter&gt; или бутона за �равнение.<br />
+'viewpagelogs'           => 'Преглед на извършените админи�тративни дей�тви� по �траницата',
+'nohistory'              => '��ма редакционна и�тори� за тази �траница.',
+'currentrev'             => 'Текуща вер�и�',
+'currentrev-asof'        => 'Текуща вер�и� към $1',
+'revisionasof'           => 'Вер�и� от $1',
+'revision-info'          => 'Вер�и� от $1 на $2', # Additionally available: $3: revision id
+'previousrevision'       => '�По-�тара вер�и�',
+'nextrevision'           => 'По-нова вер�и�→',
+'currentrevisionlink'    => 'преглед на текущата вер�и�',
+'cur'                    => 'тек',
+'next'                   => '�лед',
+'last'                   => 'пред',
+'page_first'             => 'първа',
+'page_last'              => 'по�ледна',
+'histlegend'             => '<em>Разлики:</em> Изберете вер�иите, които желаете да �равните, чрез превключвателите �рещу т�х и нати�нете &lt;Enter&gt; или бутона за �равнение.<br />
 <em>Легенда:</em> (<strong>тек</strong>) = разлика � текущата вер�и�, (<strong>пред</strong>) = разлика � предишната вер�и�, <strong>м</strong>&nbsp;=&nbsp;малка пром�на',
-'deletedrev'          => '[изтрита]',
-'histfirst'           => 'Първи',
-'histlast'            => 'По�ледни',
-'historysize'         => '({{PLURAL:$1|1 байт|$1 байта}})',
-'historyempty'        => '(празна)',
+'history-fieldset-title' => 'Тър�ене в и�тори�та',
+'deletedrev'             => '[изтрита]',
+'histfirst'              => 'Първи',
+'histlast'               => 'По�ледни',
+'historysize'            => '({{PLURAL:$1|1 байт|$1 байта}})',
+'historyempty'           => '(празна)',
 
 # Revision feed
 'history-feed-title'          => 'Редакционна и�тори�',
@@ -971,6 +989,7 @@ $2',
 'mergehistory-invalid-destination' => 'Целевата �траница тр�бва да притежава коректно име.',
 'mergehistory-autocomment'         => 'Сл�та [[:$1]] в [[:$2]]',
 'mergehistory-comment'             => 'Сл�та [[:$1]] в [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Изходната и целевата �траница не могат да �ъвпадат',
 
 # Merge log
 'mergelog'           => 'Дневник на �ливани�та',
@@ -983,119 +1002,186 @@ $2',
 'difference'              => '(Разлики между вер�иите)',
 'lineno'                  => 'Ред $1:',
 'compareselectedversions' => 'Сравнение на избраните вер�ии',
+'visualcomparison'        => 'Визуално �равн�ване',
+'wikicodecomparison'      => 'Уикитек�тово �равн�ване',
 'editundo'                => 'връщане',
 'diff-multi'              => '({{PLURAL:$1|Една междинна вер�и� не е показана|$1 междинни вер�ии не �а показани}}.)',
+'diff-styleadded'         => '$1 добавен �тил',
+'diff-styleremoved'       => '$1 премахнат �тил',
+'diff-src'                => 'изходна �траница',
+'diff-withdestination'    => '� целева �траница $1',
+'diff-with'               => '&#32;� $1 $2',
+'diff-with-final'         => '&#32;и $1 $2',
+'diff-width'              => 'ширина',
+'diff-height'             => 'ви�очина',
+'diff-p'                  => "'''параграф'''",
+'diff-blockquote'         => "'''блок � цитат'''",
+'diff-h1'                 => "'''заглавие на раздел (ниво 1)'''",
+'diff-h2'                 => "'''заглавие на раздел (ниво 2)'''",
+'diff-h3'                 => "'''заглавие на раздел (ниво 3)'''",
+'diff-h4'                 => "'''заглавие на раздел (ниво 4)'''",
+'diff-h5'                 => "'''заглавие на раздел (ниво 5)'''",
+'diff-pre'                => "'''блок � предварително форматиран тек�т'''",
+'diff-ul'                 => "'''неномериран �пи�ък'''",
+'diff-ol'                 => "'''номериран �пи�ък'''",
+'diff-li'                 => "'''елемент от �пи�ък'''",
+'diff-table'              => "'''таблица'''",
+'diff-tbody'              => "'''�ъдържание на таблица'''",
+'diff-tr'                 => "'''ред'''",
+'diff-td'                 => "'''клетка'''",
+'diff-hr'                 => "'''хоризонтална лини�'''",
+'diff-code'               => "'''блок � програмен код'''",
+'diff-dl'                 => "'''�пи�ък от дефиниции'''",
+'diff-dt'                 => "'''термин'''",
+'diff-dd'                 => "'''дефиници�'''",
+'diff-form'               => "'''формул�р'''",
+'diff-img'                => "'''картинка'''",
+'diff-a'                  => "'''препратка'''",
+'diff-i'                  => "'''кур�ив'''",
+'diff-b'                  => "'''получер'''",
+'diff-font'               => "'''шрифт'''",
+'diff-del'                => "'''изтрито'''",
+'diff-tt'                 => "'''фик�ирана ширина'''",
+'diff-sub'                => "'''долен индек�'''",
+'diff-sup'                => "'''горен индек�'''",
+'diff-strike'             => "'''зачертано'''",
 
 # Search results
-'searchresults'             => 'Резултати от тър�енето',
-'searchresulttext'          => 'За повече информаци� отно�но тър�енето в {{SITENAME}}, вижте [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'За за�вка „[[:$1]]“',
-'searchsubtitleinvalid'     => 'За за�вка „$1“',
-'noexactmatch'              => "В {{SITENAME}} не �ъще�твува �траница � това заглавие. Можете да � '''[[:$1|�ъздадете]]'''.",
-'noexactmatch-nocreate'     => "'''�е �ъще�твува �траница „$1“.'''",
-'toomanymatches'            => 'Б�ха открити твърде много �ъвпадени�, опитайте � различна за�вка',
-'titlematches'              => 'Съответ�тви� в заглави�та на �траници',
-'notitlematches'            => '��ма �ъответ�тви� в заглави�та на �траници',
-'textmatches'               => 'Съответ�тви� в тек�та на �траници',
-'notextmatches'             => '��ма �ъответ�тви� в тек�та на �траници',
-'prevn'                     => 'предишни $1',
-'nextn'                     => '�ледващи $1',
-'viewprevnext'              => 'Преглед ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|една дума|$2 думи}})',
-'search-result-score'       => 'Релевантно�т: $1%',
-'search-redirect'           => '(прена�очване $1)',
-'search-section'            => '(раздел $1)',
-'search-suggest'            => 'Веро�тно имахте предвид: $1',
-'search-interwiki-caption'  => 'Сродни проекти',
-'search-interwiki-default'  => '$1 резултата:',
-'search-interwiki-more'     => '(още)',
-'search-mwsuggest-enabled'  => '� предположени�',
-'search-mwsuggest-disabled' => 'без предположени�',
-'search-relatedarticle'     => 'Свързани',
-'mwsuggest-disable'         => 'Изключване на AJAX предположени�та',
-'searchrelated'             => '�вързани',
-'searchall'                 => 'в�ички',
-'showingresults'            => "Показване на до {{PLURAL:$1|'''1''' резултат|'''$1''' резултата}}, като �е започва от номер '''$2'''.",
-'showingresultsnum'         => "Показване на {{PLURAL:$3|'''1''' резултат|'''$3''' резултата}}, като �е започва от номер '''$2'''.",
-'showingresultstotal'       => "По-долу {{PLURAL:$3|е показан резултат '''$1''' от '''$3'''|�а показани резултати от '''$1''' до '''$2''' от общо '''$3'''}}",
-'nonefound'                 => "'''Забележка''': Безрезултатните тър�ени� че�то �а причинени от това, че �е тър��т о�новни думи като „има“ или „от“, които не �е индек�ират, или от това, че �е тър��т повече от една думи, тъй като �е показват �амо �траници, �ъдържащи в�ички зададени пон�ти�.",
-'powersearch'               => 'Тър�ене',
-'powersearch-legend'        => 'Разширено тър�ене',
-'powersearch-ns'            => 'Тър�ене в именни про�тран�тва:',
-'powersearch-redir'         => 'Спи�ък на прена�очвани�та',
-'powersearch-field'         => 'Тър�ене на',
-'search-external'           => 'Външно тър�ене',
-'searchdisabled'            => 'Тър�енето в {{SITENAME}} е временно изключено. Междувременно можете да тър�ите чрез Google. Обърнете внимание, че �ъхранените при т�х �траници най-веро�тно �а о�тарели.',
+'searchresults'                    => 'Резултати от тър�енето',
+'searchresults-title'              => 'Резултати от тър�енето за „$1“',
+'searchresulttext'                 => 'За повече информаци� отно�но тър�енето в {{SITENAME}}, вижте [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'За за�вка „[[:$1]]“ ([[Special:Prefixindex/$1|в�ички �траници, които започват � „$1“]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|в�ички �траници, които �очат към „$1“]])',
+'searchsubtitleinvalid'            => 'За за�вка „$1“',
+'noexactmatch'                     => "В {{SITENAME}} не �ъще�твува �траница � това заглавие. Можете да � '''[[:$1|�ъздадете]]'''.",
+'noexactmatch-nocreate'            => "'''�е �ъще�твува �траница „$1“.'''",
+'toomanymatches'                   => 'Б�ха открити твърде много �ъвпадени�, опитайте � различна за�вка',
+'titlematches'                     => 'Съответ�тви� в заглави�та на �траници',
+'notitlematches'                   => '��ма �ъответ�тви� в заглави�та на �траници',
+'textmatches'                      => 'Съответ�тви� в тек�та на �траници',
+'notextmatches'                    => '��ма �ъответ�тви� в тек�та на �траници',
+'prevn'                            => 'предишни $1',
+'nextn'                            => '�ледващи $1',
+'viewprevnext'                     => 'Преглед ($1) ($2) ($3).',
+'searchmenu-legend'                => '�а�тройки на тър�енето',
+'searchmenu-exists'                => "'''В това уики не �ъще�твува �траница � името „[[$1]]“'''",
+'searchmenu-new'                   => "'''Създаване на �траницата „[[:$1]]“ в това уики!'''",
+'searchhelp-url'                   => 'Help:Съдържание',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Преглеждане на �траниците � тази пред�тавка]]',
+'searchprofile-articles'           => 'Страници �ъ� �ъдържание',
+'searchprofile-articles-and-proj'  => 'Съдържание & проектни �траници',
+'searchprofile-project'            => 'Проектни �траници',
+'searchprofile-images'             => 'Файлове',
+'searchprofile-everything'         => 'В�ичко',
+'searchprofile-articles-tooltip'   => 'Тър�ене в $1',
+'searchprofile-project-tooltip'    => 'Тър�ене в $1',
+'searchprofile-images-tooltip'     => 'Тър�ене на файлове',
+'searchprofile-everything-tooltip' => 'Тър�ене в ц�лото �ъдържание (вкл ди�ку�ионните �траници)',
+'searchprofile-advanced-tooltip'   => 'Тър�ене в избрани именни про�тран�тва',
+'prefs-search-nsdefault'           => 'Тър�ене � на�тройките по подразбиране:',
+'prefs-search-nscustom'            => 'Тър�ене в избрани именни про�тран�тва:',
+'search-result-size'               => '$1 ({{PLURAL:$2|една дума|$2 думи}})',
+'search-result-score'              => 'Релевантно�т: $1%',
+'search-redirect'                  => '(прена�очване $1)',
+'search-section'                   => '(раздел $1)',
+'search-suggest'                   => 'Веро�тно имахте предвид: $1',
+'search-interwiki-caption'         => 'Сродни проекти',
+'search-interwiki-default'         => '$1 резултата:',
+'search-interwiki-more'            => '(още)',
+'search-mwsuggest-enabled'         => '� предположени�',
+'search-mwsuggest-disabled'        => 'без предположени�',
+'search-relatedarticle'            => 'Свързани',
+'mwsuggest-disable'                => 'Изключване на AJAX предположени�та',
+'searchrelated'                    => '�вързани',
+'searchall'                        => 'в�ички',
+'showingresults'                   => "Показване на до {{PLURAL:$1|'''1''' резултат|'''$1''' резултата}}, като �е започва от номер '''$2'''.",
+'showingresultsnum'                => "Показване на {{PLURAL:$3|'''1''' резултат|'''$3''' резултата}}, като �е започва от номер '''$2'''.",
+'showingresultstotal'              => "По-долу {{PLURAL:$4|е показан резултат '''$1''' от '''$3'''|�а показани резултати от '''$1''' до '''$2''' от общо '''$3'''}}",
+'nonefound'                        => "'''Забележка''': Тър�енето по подразбиране �е �вежда �амо до н�кои именни про�тран�тва.
+Опитайте пак, като отбележите в за�вката �и префик�а ''all:'', за тър�ене из ц�лото �ъдържание на базата данни (включително ди�ку�ионни �траници, шаблони и т.н.) или използвайте желаното именно про�тран�тво като префик�.",
+'search-nonefound'                 => '��ма резултати, които да отговар�т на за�вката.',
+'powersearch'                      => 'Тър�ене',
+'powersearch-legend'               => 'Разширено тър�ене',
+'powersearch-ns'                   => 'Тър�ене в именни про�тран�тва:',
+'powersearch-redir'                => 'Спи�ък на прена�очвани�та',
+'powersearch-field'                => 'Тър�ене на',
+'search-external'                  => 'Външно тър�ене',
+'searchdisabled'                   => 'Тър�енето в {{SITENAME}} е временно изключено. Междувременно можете да тър�ите чрез Google. Обърнете внимание, че �ъхранените при т�х �траници най-веро�тно �а о�тарели.',
 
 # Preferences page
-'preferences'              => '�а�тройки',
-'mypreferences'            => 'Моите на�тройки',
-'prefs-edits'              => 'Брой редакции:',
-'prefsnologin'             => '�е �те влезли',
-'prefsnologintext'         => '�еобходимо е <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} да влезете]</span>, за да може да промен�те потребител�ките �и на�тройки.',
-'prefsreset'               => 'Текущите промени б�ха отменени.',
-'qbsettings'               => 'Лента за бърз избор',
-'qbsettings-none'          => 'Без меню',
-'qbsettings-fixedleft'     => '�еподвижно вл�во',
-'qbsettings-fixedright'    => '�еподвижно вд��но',
-'qbsettings-floatingleft'  => 'Плаващо вл�во',
-'qbsettings-floatingright' => 'Плаващо вд��но',
-'changepassword'           => 'См�на на парола',
-'skin'                     => 'Облик',
-'math'                     => 'Математиче�ки формули',
-'dateformat'               => 'Формат на датата',
-'datedefault'              => 'Без предпочитание',
-'datetime'                 => 'Дата и ча�',
-'math_failure'             => '�еу�пех при разбора',
-'math_unknown_error'       => 'непозната грешка',
-'math_unknown_function'    => 'непозната функци�',
-'math_lexing_error'        => 'лек�икална грешка',
-'math_syntax_error'        => '�интактична грешка',
-'math_image_error'         => 'Превръщането към PNG не �получи. Проверете дали latex, dvips, gs и convert �а правилно ин�талирани.',
-'math_bad_tmpdir'          => '�евъзможно е пи�ането във или �ъздаването на временна директори� за математиче�ките операции',
-'math_bad_output'          => '�евъзможно е пи�ането във или �ъздаването на изход�ща директори� за математиче�ките операции',
-'math_notexvc'             => 'Лип�ва изпълними�т файл на texvc. Прегледайте math/README за информаци� отно�но конфигурирането.',
-'prefs-personal'           => 'Потребител�ки данни',
-'prefs-rc'                 => 'По�ледни промени',
-'prefs-watchlist'          => 'Спи�ък за наблюдение',
-'prefs-watchlist-days'     => 'Брой дни, които да �е показват в �пи�ъка за наблюдение:',
-'prefs-watchlist-edits'    => 'Брой редакции, които �е показват в разширени� �пи�ък за наблюдение:',
-'prefs-misc'               => 'Други на�тройки',
-'saveprefs'                => 'Съхран�ване',
-'resetprefs'               => 'Отм�на на текущите промени',
-'oldpassword'              => 'Стара парола:',
-'newpassword'              => '�ова парола:',
-'retypenew'                => '�ова парола повторно:',
-'textboxsize'              => 'Редактиране',
-'rows'                     => 'Редове:',
-'columns'                  => 'Колони:',
-'searchresultshead'        => 'Тър�ене',
-'resultsperpage'           => 'Резултати на �траница:',
-'contextlines'             => 'Редове за резултат:',
-'contextchars'             => 'Знаци от контек�та на ред:',
-'stub-threshold'           => 'Праг за форматиране на <a href="#" class="stub">препратки към мъничета</a>:',
-'recentchangesdays'        => 'Брой дни в по�ледни промени:',
-'recentchangescount'       => 'Брой редакции в по�ледни промени:',
-'savedprefs'               => 'Вашите на�тройки б�ха �ъхранени.',
-'timezonelegend'           => 'Ча�ова зона',
-'timezonetext'             => 'Бро�т ча�ове, � които вашето ме�тно време �е различава от това на �ървъра (UTC).',
-'localtime'                => 'Ме�тно време',
-'timezoneoffset'           => 'Отме�тване¹',
-'servertime'               => 'Време на �ървъра',
-'guesstimezone'            => 'Попълване чрез браузъра',
-'allowemail'               => 'Възможно�т за получаване на пи�ма от други потребители',
-'prefs-searchoptions'      => '�а�тройки за тър�ене',
-'prefs-namespaces'         => 'Именни про�тран�тва',
-'defaultns'                => 'Тър�ене в тези именни про�тран�тва по подразбиране:',
-'default'                  => 'по подразбиране',
-'files'                    => 'Файлове',
+'preferences'               => '�а�тройки',
+'mypreferences'             => 'Моите на�тройки',
+'prefs-edits'               => 'Брой редакции:',
+'prefsnologin'              => '�е �те влезли',
+'prefsnologintext'          => '�еобходимо е <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} да влезете]</span>, за да може да промен�те потребител�ките �и на�тройки.',
+'prefsreset'                => 'Текущите промени б�ха отменени.',
+'qbsettings'                => 'Лента за бърз избор',
+'qbsettings-none'           => 'Без меню',
+'qbsettings-fixedleft'      => '�еподвижно вл�во',
+'qbsettings-fixedright'     => '�еподвижно вд��но',
+'qbsettings-floatingleft'   => 'Плаващо вл�во',
+'qbsettings-floatingright'  => 'Плаващо вд��но',
+'changepassword'            => 'См�на на парола',
+'skin'                      => 'Облик',
+'skin-preview'              => 'предварителен преглед',
+'math'                      => 'Математиче�ки формули',
+'dateformat'                => 'Формат на датата',
+'datedefault'               => 'Без предпочитание',
+'datetime'                  => 'Дата и ча�',
+'math_failure'              => '�еу�пех при разбора',
+'math_unknown_error'        => 'непозната грешка',
+'math_unknown_function'     => 'непозната функци�',
+'math_lexing_error'         => 'лек�икална грешка',
+'math_syntax_error'         => '�интактична грешка',
+'math_image_error'          => 'Превръщането към PNG не �получи. Проверете дали latex, dvips, gs и convert �а правилно ин�талирани.',
+'math_bad_tmpdir'           => '�евъзможно е пи�ането във или �ъздаването на временна директори� за математиче�ките операции',
+'math_bad_output'           => '�евъзможно е пи�ането във или �ъздаването на изход�ща директори� за математиче�ките операции',
+'math_notexvc'              => 'Лип�ва изпълними�т файл на texvc. Прегледайте math/README за информаци� отно�но конфигурирането.',
+'prefs-personal'            => 'Потребител�ки данни',
+'prefs-rc'                  => 'По�ледни промени',
+'prefs-watchlist'           => 'Спи�ък за наблюдение',
+'prefs-watchlist-days'      => 'Брой дни, които да �е показват в �пи�ъка за наблюдение:',
+'prefs-watchlist-days-max'  => '(най-много 7 дни)',
+'prefs-watchlist-edits'     => 'Брой редакции, които �е показват в разширени� �пи�ък за наблюдение:',
+'prefs-watchlist-edits-max' => '(мак�имален брой: 1000)',
+'prefs-misc'                => 'Други на�тройки',
+'prefs-resetpass'           => 'Пром�на на паролата',
+'saveprefs'                 => 'Съхран�ване',
+'resetprefs'                => 'Отм�на на текущите промени',
+'textboxsize'               => 'Редактиране',
+'prefs-edit-boxsize'        => 'Размер на прозореца за редактиране.',
+'rows'                      => 'Редове:',
+'columns'                   => 'Колони:',
+'searchresultshead'         => 'Тър�ене',
+'resultsperpage'            => 'Резултати на �траница:',
+'contextlines'              => 'Редове за резултат:',
+'contextchars'              => 'Знаци от контек�та на ред:',
+'stub-threshold'            => 'Праг за форматиране на <a href="#" class="stub">препратки към мъничета</a>:',
+'recentchangesdays'         => 'Брой дни в по�ледни промени:',
+'recentchangesdays-max'     => '(най-много $1 {{PLURAL:$1|ден|дни}})',
+'recentchangescount'        => 'Брой запи�и за показване в �пи�ъка � по�ледни промени, и�ториите на �траниците и дневниците:',
+'savedprefs'                => 'Вашите на�тройки б�ха �ъхранени.',
+'timezonelegend'            => 'Ча�ова зона',
+'timezonetext'              => 'Бро�т ча�ове, � които вашето ме�тно време �е различава от това на �ървъра (UTC).',
+'localtime'                 => 'Ме�тно време:',
+'timezoneselect'            => 'Ча�ова зона:',
+'timezoneuseserverdefault'  => 'По подразбиране от �ървъра',
+'timezoneuseoffset'         => 'Друга (по�очете отме�тване)',
+'timezoneoffset'            => 'Отме�тване¹:',
+'servertime'                => 'Време на �ървъра:',
+'guesstimezone'             => 'Попълване чрез браузъра',
+'allowemail'                => 'Възможно�т за получаване на пи�ма от други потребители',
+'prefs-searchoptions'       => '�а�тройки за тър�ене',
+'prefs-namespaces'          => 'Именни про�тран�тва',
+'defaultns'                 => 'Тър�ене в тези именни про�тран�тва по подразбиране:',
+'default'                   => 'по подразбиране',
+'files'                     => 'Файлове',
 
 # User rights
 'userrights'                  => 'Управление на потребител�ките права', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Управл�ване на потребител�ките групи',
 'userrights-user-editname'    => 'Потребител�ко име:',
 'editusergroup'               => 'Редактиране на потребител�ките групи',
-'editinguser'                 => "Пром�на на потребител�ките права на потребител '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Пром�на на потребител�ките права на потребител '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Редактиране на потребител�ките групи',
 'saveusergroups'              => 'Съхран�ване на потребител�ките групи',
 'userrights-groupsmember'     => 'Член на:',
@@ -1144,6 +1230,7 @@ $2',
 'right-minoredit'            => 'отбел�зване като малка пром�на',
 'right-move'                 => 'преме�тване на �траници',
 'right-move-subpages'        => 'преме�тване на �траници и техните под�траници',
+'right-movefile'             => 'Преме�тване на файлове',
 'right-suppressredirect'     => 'без �ъздаване на прена�очване от �тарото име при преме�тване на �траница',
 'right-upload'               => 'качване на файлове',
 'right-reupload'             => 'презапи�ване на �ъще�твуващ файл',
@@ -1194,9 +1281,43 @@ $2',
 'rightslogentry' => 'промени потребител�ката група на $1 от $2 в $3',
 'rightsnone'     => '(никакви)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'четене на �траницата',
+'action-edit'                 => 'редактиране на тази �траница',
+'action-createpage'           => '�ъздаване на �траници',
+'action-createtalk'           => '�ъздаване на ди�ку�ионни �траници',
+'action-createaccount'        => '�ъздаване на тази потребител�ка �метка',
+'action-minoredit'            => 'отбел�зване на редакци�та като малка',
+'action-move'                 => 'преме�тване на �траницата',
+'action-move-subpages'        => 'преме�тване на �траницата и нейните под�траници',
+'action-movefile'             => 'преме�тване на този файл',
+'action-upload'               => 'качване на файла',
+'action-reupload'             => '�ъхранение на файл върху вече �ъще�твуващ',
+'action-reupload-shared'      => 'предефиране на едноименен файл от общото мултимедийно хранилище',
+'action-upload_by_url'        => 'качване на този файл от URL адре�',
+'action-delete'               => 'изтриване на �траницата',
+'action-deleterevision'       => 'изтриване на тази вер�и�',
+'action-deletedhistory'       => 'преглеждане на изтритата и�тори� на тази �траница',
+'action-browsearchive'        => 'тър�ене на изтрити �траници',
+'action-undelete'             => 'въз�танов�ване на тази �траница',
+'action-suppressrevision'     => 'преглеждане и въз�танов�ване на тази �крита вер�и�',
+'action-suppressionlog'       => 'преглеждане на този поверителен дневник',
+'action-block'                => 'блокиране на редакциите на този потребител',
+'action-protect'              => 'промен�не на нивото на защита на тази �траница',
+'action-import'               => 'вна��не на тази �траница от друго уики',
+'action-patrol'               => 'отбел�зване на чуждите редакции като проверени',
+'action-autopatrol'           => 'отбел�зване на �об�твените редакции като автоматично патрулирани',
+'action-unwatchedpages'       => 'преглеждане на �пи�ъка � ненаблюдавани �траници',
+'action-trackback'            => 'о�тав�не на обратна �леда',
+'action-mergehistory'         => '�ливане на и�тори�та на тази �траница',
+'action-userrights'           => 'редактиране на в�ички потребител�ки права',
+'action-userrights-interwiki' => 'редактиране на потребител�ките права на потребители от други уикита',
+'action-siteadmin'            => 'заключване и отключване на базата от данни',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|пром�на|промени}}',
 'recentchanges'                     => 'По�ледни промени',
+'recentchanges-legend'              => 'Опции на �пи�ъка � по�ледни промени',
 'recentchangestext'                 => "Про�лед�ване на по�ледните промени в {{SITENAME}}.
 
 Легенда: '''тек''' = разлика на текущата вер�и�,
@@ -1223,6 +1344,8 @@ $2',
 'rc_categories'                     => 'Само от категории (разделител „|“)',
 'rc_categories_any'                 => 'Ко�то и да е',
 'newsectionsummary'                 => '�ова тема /* $1 */',
+'rc-enhanced-expand'                => 'Показване на детайли (изи�ква JavaScript)',
+'rc-enhanced-hide'                  => 'Скриване на детайли',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Свързани промени',
@@ -1242,9 +1365,9 @@ $2',
 'upload_directory_read_only'  => 'Сървърът н�ма до�тъп за пи�ане в директори�та за качване „$1“.',
 'uploaderror'                 => 'Грешка при качване',
 'uploadtext'                  => "Формул�рът по-долу �лужи за качване на файлове, които ще могат да �е използват в �траниците.
-За преглеждане и тър�ене на вече качените файлове може да �е използва [[Special:ImageList|�пи�ъка � качени файлове]]. Качвани�та и изтривани�та �е запи�ват в [[Special:Log/upload|дневника на качвани�та]].
+За преглеждане и тър�ене на вече качените файлове може да �е използва [[Special:FileList|�пи�ъка � качени файлове]]. Качвани�та и изтривани�та �е запи�ват в [[Special:Log/upload|дневника на качвани�та]].
 
-За включване на файл в �траница, може да �е използва една от �ледните препратки: '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:картинка.jpg|алтернативен тек�т]]</nowiki>''' за изображени� или '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:звук.ogg]]</nowiki>''' за звукови файлове.",
+За включване на файл в �траница, може да �е използва една от �ледните препратки: '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:картинка.jpg|алтернативен тек�т]]</nowiki>''' за изображени� или '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:звук.ogg]]</nowiki>''' за звукови файлове.",
 'upload-permitted'            => 'Разрешени файлови формати: $1.',
 'upload-preferred'            => 'Предпочитани файлови формати: $1.',
 'upload-prohibited'           => '�епозволени файлови формати: $1.',
@@ -1263,33 +1386,35 @@ $2',
 'illegalfilename'             => 'Името на файла „$1“ �ъдържа знаци, които не �а позволени в заглави� на �траници. Преименувайте файла и �е опитайте да го качите отново.',
 'badfilename'                 => 'Файлът беше преименуван на „$1“.',
 'filetype-badmime'            => '�е е разрешено качването на файлове � MIME-тип „$1“.',
+'filetype-bad-ie-mime'        => 'Този файл не може да бъде качен, защото Internet Explorer го разпознава като "$1", което е отхвърлен и потенциално опа�ен файлов формат.',
 'filetype-unwanted-type'      => "'''„.$1“''' е нежелан файлов формат. {{PLURAL:$3|Преопръчителни�т файлов формат е|Препоръчителните файлови формати �а}} $2.",
 'filetype-banned-type'        => "'''„.$1“''' не е позволен файлов формат. {{PLURAL:$3|Позволени�т файлов формат е|Позволените файлови формати �а}} $2.",
 'filetype-missing'            => 'Файлът н�ма разширение (напр. „.jpg“).',
 'large-file'                  => '�е �е препоръчва файловете да �е по-големи от $1; този файл е $2.',
 'largefileserver'             => 'Файлът е по-гол�м от допу�тими� от �ървъра размер.',
 'emptyfile'                   => 'Качени�т от ва� файл е празен. Това може да е предизвикано от грешка в името на файла. Уверете �е дали наи�тина желаете да го качите.',
-'fileexists'                  => 'Вече �ъще�твува файл � това име! Прегледайте <strong><tt>$1</tt></strong>, ако не �те �игурни, че желаете да го промените.',
-'filepageexists'              => 'Опи�ателната �траница за този файл вече е �ъздадена на <strong><tt>$1</tt></strong>, въпреки че файл � това име в момента не �ъще�твува. Въведеното резюме н�ма да бъде добавено и показано на опи�ателната �траница. За да бъде показано, �траницата тр�бва да бъде редактирана ръчно.',
-'fileexists-extension'        => 'Съще�твува файл �ъ� �ходно име:<br />
-Име на качвани� файл: <strong><tt>$1</tt></strong><br />
-Име на �ъще�твуващи� файл: <strong><tt>$2</tt></strong><br />
-Има разлика един�твено в разширени�та на файловете, израз�ваща �е в ползване на малки и главни букви. Проверете дали файловете не �а еднакви.',
+'fileexists'                  => "Вече �ъще�твува файл � това име! Прегледайте '''<tt>$1</tt>''', ако не �те �игурни, че желаете да го промените.",
+'filepageexists'              => "Опи�ателната �траница за този файл вече е �ъздадена на '''<tt>$1</tt>''', въпреки че файл � това име в момента не �ъще�твува. Въведеното резюме н�ма да бъде добавено и показано на опи�ателната �траница. За да бъде показано, �траницата тр�бва да бъде редактирана ръчно.",
+'fileexists-extension'        => "Съще�твува файл �ъ� �ходно име:<br />
+Име на качвани� файл: '''<tt>$1</tt>'''<br />
+Име на �ъще�твуващи� файл: '''<tt>$2</tt>'''<br />
+Има разлика един�твено в разширени�та на файловете, израз�ваща �е в ползване на малки и главни букви. Проверете дали файловете не �а еднакви.",
 'fileexists-thumb'            => "<center>'''Съще�твуваща картинка'''</center>",
-'fileexists-thumbnail-yes'    => 'Изглежда, че файлът е картинка � намален размер <i>(миникартинка)</i>. Проверете файла <strong><tt>$1</tt></strong>.<br />
-�ко �ъще�твуващи�т файл пред�тавл�ва оригиналната вер�и� на картинката, н�ма нужда да �е качва неин умален вариант.',
-'file-thumbnail-no'           => 'Файловото име започва � <strong><tt>$1</tt></strong>. Изглежда, че е картинка � намален размер <i>(миникартинка)</i>.
-�ко разполагате � вер�и� в пълна разделителна �по�обно�т, качете не�. В противен �лучай �менете името на този файл.',
-'fileexists-forbidden'        => 'Вече �ъще�твува файл � това име!
-Върнете �е и качете файла � ново име. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Изглежда, че файлът е картинка � намален размер ''(миникартинка)''. Проверете файла '''<tt>$1</tt>'''.<br />
+�ко �ъще�твуващи�т файл пред�тавл�ва оригиналната вер�и� на картинката, н�ма нужда да �е качва неин умален вариант.",
+'file-thumbnail-no'           => "Файловото име започва � '''<tt>$1</tt>'''. Изглежда, че е картинка � намален размер ''(миникартинка)''.
+�ко разполагате � вер�и� в пълна разделителна �по�обно�т, качете не�. В противен �лучай �менете името на този файл.",
+'fileexists-forbidden'        => 'Вече �ъще�твува файл � това име, който не може да бъде презапи�ан!
+�ко желаете да качите ваши� файл, върнете �е и го качете � ново име. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'В �поделеното хранилище за файлове вече �ъще�твува файл � това име.
-�ко в�е още желаете да качите ваши� файл, върнете �е и качете файла � ново име. [[Image:$1|thumb|center|$1]]',
+�ко в�е още желаете да качите ваши� файл, върнете �е и качете файла � ново име. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Този файл �е повтар� �ъ� {{PLURAL:$1|�ледни� файл|�ледните файлове}}:',
+'file-deleted-duplicate'      => 'Идентичен � този файл ([[$1]]) вече е бил изтриван. И�тори�та на изтриването на файла �ледва да �е провери, преди да �е при�тъпи към повторното му качване.',
 'successfulupload'            => 'Качването беше у�пешно',
 'uploadwarning'               => 'Предупреждение при качване',
 'savefile'                    => 'Съхран�ване на файл',
-'uploadedimage'               => 'качена „[[$1]]“',
-'overwroteimage'              => 'качена е нова вер�и� на „[[$1]]“',
+'uploadedimage'               => 'качи „[[$1]]“',
+'overwroteimage'              => 'качи нова вер�и� на „[[$1]]“',
 'uploaddisabled'              => 'Качвани�та �а забранени.',
 'uploaddisabledtext'          => 'Качването на файлове е забранено.',
 'uploadscripted'              => 'Файлът �ъдържа HTML или �криптов код, който може да бъде погрешно  интерпретиран от браузъра.',
@@ -1303,7 +1428,7 @@ $2',
 'upload-wasdeleted'           => "'''Внимание: Качвате файл, който вече е бил изтрит.'''
 
 Преценете дали е удачно да продължите � качването на файла. За ваше удоб�тво, ето запи�а за него в дневника на изтривани�та:",
-'filename-bad-prefix'         => 'Името на файла, който качвате, започва � <strong>„$1“</strong>, което е неопи�ателно име, типично задавано по автоматичен начин от цифровите камери или апарати. Изберете по-опи�ателно име на файла.',
+'filename-bad-prefix'         => "Името на файла, който качвате, започва � '''„$1“''', което е неопи�ателно име, типично задавано по автоматичен начин от цифровите камери или апарати. Изберете по-опи�ателно име на файла.",
 
 'upload-proto-error'      => '�еправилен протокол',
 'upload-proto-error-text' => 'Изи�ква �е адре� започващ � <code>http://</code> или <code>ftp://</code>.',
@@ -1324,20 +1449,21 @@ $2',
 'upload_source_url'  => ' (правилен, публично до�тъпен интернет-адре�)',
 'upload_source_file' => ' (файл на ваши� компютър)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Тази �пециална �траница показва в�ички качени файлове.
+# Special:ListFiles
+'listfiles-summary'     => 'Тази �пециална �траница показва в�ички качени файлове.
 По подразбиране по�ледно качените файлове �е показват най-ви�око в �пи�ъка.
 Сортирането �е промен� � щракване в заглавна клетка на колоната.',
-'imagelist_search_for'  => 'Тър�ене по име на файла:',
+'listfiles_search_for'  => 'Тър�ене по име на файла:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Спи�ък на файловете',
-'imagelist_date'        => 'Дата',
-'imagelist_name'        => 'Име на файла',
-'imagelist_user'        => 'Потребител',
-'imagelist_size'        => 'Размер',
-'imagelist_description' => 'Опи�ание',
-
-# Image description page
+'listfiles'             => 'Спи�ък на файловете',
+'listfiles_date'        => 'Дата',
+'listfiles_name'        => 'Име на файла',
+'listfiles_user'        => 'Потребител',
+'listfiles_size'        => 'Размер',
+'listfiles_description' => 'Опи�ание',
+'listfiles_count'       => 'Вер�ии',
+
+# File description page
 'filehist'                       => 'И�тори� на файла',
 'filehist-help'                  => 'Избирането на дата/ча� ще покаже как е изглеждал файлът към онзи момент.',
 'filehist-deleteall'             => 'изтриване на в�ички',
@@ -1345,19 +1471,25 @@ $2',
 'filehist-revert'                => 'връщане',
 'filehist-current'               => 'текуща',
 'filehist-datetime'              => 'Дата/Ча�',
+'filehist-thumb'                 => 'Миникартинка',
+'filehist-thumbtext'             => 'Миникартинка на вер�и�та към $1',
+'filehist-nothumb'               => '��ма миникартинка',
 'filehist-user'                  => 'Потребител',
 'filehist-dimensions'            => 'Размер',
 'filehist-filesize'              => 'Размер на файла',
 'filehist-comment'               => 'Коментар',
 'imagelinks'                     => 'Препратки към файла',
 'linkstoimage'                   => '{{PLURAL:$1|Следната �траница �очи|Следните $1 �траници �очат}} към файла:',
+'linkstoimage-more'              => 'Към този файл {{PLURAL:$1|препраща|препращат}} повече от $1 {{PLURAL:$1|�траница|�траници}}.
+Спи�ъкът по-долу показва �амо {{PLURAL:$1|първата �траница, ко�то препраща|първите $1 �траници, които препращат}} към файла.
+�а разположение е и [[Special:WhatLinksHere/$2|пълни�т �пи�ък]].',
 'nolinkstoimage'                 => '��ма �траници, �очещи към файла.',
 'morelinkstoimage'               => 'Можете да видите [[Special:WhatLinksHere/$1|още препратки]] към този файл.',
 'redirectstofile'                => '{{PLURAL:$1|Следни�т файл прена�очва|Следните $1 файла прена�очват}} към този файл:',
-'duplicatesoffile'               => '{{PLURAL:$1|Следни�т файл �е повтар�|Следните $1 файла �е повтар�т}} � този файл:',
+'duplicatesoffile'               => '{{PLURAL:$1|Следни�т файл �е повтар�|Следните $1 файла �е повтар�т}} � този файл ([[Special:FileDuplicateSearch/$2|повече подробно�ти]]):',
 'sharedupload'                   => 'Този файл е �поделен и може да бъде използван от други проекти.',
 'shareduploadwiki'               => 'Разгледайте $1 за повече информаци�.',
-'shareduploadwiki-desc'          => 'Следва опи�анието от $1 от �поделеното хранилище.',
+'shareduploadwiki-desc'          => 'Следва опи�анието от $1.',
 'shareduploadwiki-linktext'      => 'опи�ателната �траница на файла',
 'shareduploadduplicate'          => 'Този файл �е повтар� � $1 от �поделеното мултимедийно хранилище.',
 'shareduploadduplicate-linktext' => 'друг файл',
@@ -1381,7 +1513,7 @@ $2',
 # File deletion
 'filedelete'                  => 'Изтриване на $1',
 'filedelete-legend'           => 'Изтриване на файл',
-'filedelete-intro'            => "�а път �те да изтриете '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "�а път �те да изтриете '''[[Media:$1|$1]]''' заедно � ц�лата му редакционна и�тори�.",
 'filedelete-intro-old'        => "Изтривате вер�и�та на '''[[Media:$1|$1]]''' към [$4 $3, $2].",
 'filedelete-comment'          => 'Коментар:',
 'filedelete-submit'           => 'Изтриване',
@@ -1389,7 +1521,6 @@ $2',
 'filedelete-success-old'      => "Вер�и�та на '''[[Media:$1|$1]]''' към $3, $2 е била изтрита.",
 'filedelete-nofile'           => "Файлът '''$1''' не �ъще�твува.",
 'filedelete-nofile-old'       => "�е �ъще�твува архивна вер�и� на '''$1''' � указаните параметри.",
-'filedelete-iscurrent'        => 'Опитвате �е да изтриете по�ледната вер�и� на този файл. Първо направете възвръщане към по-�тара вер�и�.',
 'filedelete-otherreason'      => 'Друга/допълнителна причина:',
 'filedelete-reason-otherlist' => 'Друга причина',
 'filedelete-reason-dropdown'  => '*Общи причини за изтриване
@@ -1416,27 +1547,31 @@ $2',
 
 # Random page
 'randompage'         => 'Случайна �траница',
-'randompage-nopages' => 'В това именно про�тран�тво н�ма �траници.',
+'randompage-nopages' => 'В именно про�тран�тво „$1“ н�ма �траници.',
 
 # Random redirect
 'randomredirect'         => 'Случайно прена�очване',
-'randomredirect-nopages' => 'В това именно про�тран�тво н�ма прена�очвани�.',
+'randomredirect-nopages' => 'В именно про�тран�тво „$1“ н�ма прена�очвани�.',
 
 # Statistics
-'statistics'             => 'Стати�тика',
-'sitestats'              => 'Стати�тика на {{SITENAME}}',
-'userstats'              => 'Потребители',
-'sitestatstext'          => "Базата от данни �ъдържа {{PLURAL:$1|'''една''' �траница|'''$1''' �траници}}.
-Това включва в�ички �траници от в�ички именни про�тран�тва в {{SITENAME}} (''О�новно'', Бе�еда, Потребител, Категори� и т.н.). Измежду т�х {{PLURAL:$2|'''една''' �траница �е �м�та за дей�твителна|'''$2''' �траници �е �м�тат за дей�твителни}} (бро�т �е �амо �траниците от о�новното именно про�тран�тво, като �е изключват прена�очвани� и �траници, не�ъдържащи препратки).
-
-{{PLURAL:$8|Бил е качен '''един''' файл|Били �а качени '''$8''' файла}}.
-
-Имало е {{PLURAL:$3|'''един''' преглед на �траница|'''$3''' прегледа на �траници}} и {{PLURAL:$4|'''една''' редакци�|'''$4''' редакции}} от пу�кането на {{SITENAME}}.
-Това прави �редно по '''$5''' редакции на �траница и по '''$6''' прегледа на редакци�.
-
-Дължината на [http://www.mediawiki.org/wiki/Manual:Job_queue работната опашка] е '''$7'''.",
-'userstatstext'          => "Има {{PLURAL:$1|'''1''' [[Special:ListUsers|реги�триран потребител]]|'''$1''' [[Special:ListUsers|реги�трирани потребители]]}} и '''$2''' {{PLURAL:$2|потребител|потребители}} (или '''$4%''') � права на $5.",
-'statistics-mostpopular' => '�ай-преглеждани �траници',
+'statistics'                   => 'Стати�тика',
+'statistics-header-pages'      => 'Стати�тики за �траницата',
+'statistics-header-edits'      => 'Стати�тики за редакциите',
+'statistics-header-views'      => 'Преглеждане на �тати�тиките',
+'statistics-header-users'      => 'Потребители',
+'statistics-articles'          => 'Съдържателни �траници',
+'statistics-pages'             => 'Страници',
+'statistics-pages-desc'        => 'В�ички �траници в уикито, включително ди�ку�ионни, прена�очващи �траници и т.н.',
+'statistics-files'             => 'Качени файлове',
+'statistics-edits'             => 'Брой редакции по �траници от началото на {{SITENAME}}',
+'statistics-edits-average'     => 'Средно редакции на �траница',
+'statistics-views-total'       => 'Общо прегледи',
+'statistics-views-peredit'     => 'Прегледи на редакци�',
+'statistics-jobqueue'          => 'Дължина на [http://www.mediawiki.org/wiki/Manual:Job_queue работната опашка]',
+'statistics-users'             => 'Реги�трирани [[Special:ListUsers|потребители]]',
+'statistics-users-active'      => '�ктивни потребители',
+'statistics-users-active-desc' => 'Потребители, направили редакци� през {{PLURAL:$1|по�ледни� ден|по�ледните $1 дни}}',
+'statistics-mostpopular'       => '�ай-преглеждани �траници',
 
 'disambiguations'      => 'По��нителни �траници',
 'disambiguationspage'  => 'Template:По��нение',
@@ -1478,26 +1613,30 @@ $2',
 'popularpages'            => '�ай-по�ещавани �траници',
 'wantedcategories'        => 'Желани категории',
 'wantedpages'             => 'Желани �траници',
-'missingfiles'            => 'Лип�ващи файлове',
+'wantedfiles'             => 'Желани файлове',
+'wantedtemplates'         => 'Желани шаблони',
 'mostlinked'              => '�ай-препращани �траници',
 'mostlinkedcategories'    => '�ай-препращани категории',
 'mostlinkedtemplates'     => '�ай-препращани шаблони',
 'mostcategories'          => 'Страници � най-много категории',
 'mostimages'              => '�ай-препращани картинки',
 'mostrevisions'           => 'Страници � най-много вер�ии',
-'prefixindex'             => 'В�ички �траници (� пред�тавка)',
+'prefixindex'             => 'В�ички �траници � пред�тавка',
 'shortpages'              => 'Кратки �траници',
 'longpages'               => 'Дълги �траници',
 'deadendpages'            => 'Задънени �траници',
 'deadendpagestext'        => 'Следните �траници н�мат препратки към други �траници от {{SITENAME}}.',
 'protectedpages'          => 'Защитени �траници',
 'protectedpages-indef'    => 'Само без�рочни защити',
+'protectedpages-cascade'  => 'Само ка�кадни защити',
 'protectedpagestext'      => 'Следните �траници �а защитени против редактиране или преме�тване',
 'protectedpagesempty'     => 'В момента н�ма защитени �траници � тези параметри.',
 'protectedtitles'         => 'Защитени заглави�',
 'protectedtitlestext'     => 'Следните заглави� �а защитени �рещу �ъздаване',
 'protectedtitlesempty'    => 'В момента н�ма заглави�, защитени � тези параметри.',
 'listusers'               => 'Спи�ък на потребителите',
+'listusers-editsonly'     => 'Показване �амо на потребители � редакции',
+'usereditcount'           => '$1 {{PLURAL:$1|редакци�|редакции}}',
 'newpages'                => '�ови �траници',
 'newpages-username'       => 'Потребител:',
 'ancientpages'            => 'Стари �траници',
@@ -1518,14 +1657,13 @@ $2',
 'booksources-search-legend' => 'Тър�ене на информаци� за книга',
 'booksources-go'            => 'Тър�ене',
 'booksources-text'          => 'По-долу е �пи�ъкът от връзки към други �айтове, продаващи нови и използвани книги или имащи повече информаци� за книгите, които тър�ите:',
+'booksources-invalid-isbn'  => 'Предо�тавени�т ISBN изглежда е невалиден; проверете за грешки и копирайте от оригинални� източник.',
 
 # Special:Log
 'specialloguserlabel'  => 'Потребител:',
 'speciallogtitlelabel' => 'Заглавие:',
 'log'                  => 'Дневници',
 'all-logs-page'        => 'В�ички дневници',
-'log-search-legend'    => 'Претър�ване на дневниците',
-'log-search-submit'    => 'Отиване',
 'alllogstext'          => 'Сме�ено показване на запи�и от в�ички налични дневници в {{SITENAME}}.
 Можете да ограничите прегледа, като изберете вид на дневника, потребител�ко име или определена �траница.',
 'logempty'             => 'Дневникът не �ъдържа запи�и, отговар�щи на избрани� критерий.',
@@ -1537,6 +1675,7 @@ $2',
 'nextpage'          => 'Следваща �траница ($1)',
 'prevpage'          => 'Предходна �траница ($1)',
 'allpagesfrom'      => 'Показване на �траниците, като �е започва от:',
+'allpagesto'        => 'Показване на �траници, завършващи на:',
 'allarticles'       => 'В�ички �траници',
 'allinnamespace'    => 'В�ички �траници (именно про�тран�тво $1)',
 'allnotinnamespace' => 'В�ички �траници (без именно про�тран�тво $1)',
@@ -1556,40 +1695,67 @@ $2',
 'special-categories-sort-count' => '�ортиране по брой',
 'special-categories-sort-abc'   => '�ортиране по азбучен ред',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Изтрити прино�и на потребител',
+
+# Special:LinkSearch
+'linksearch'       => 'Външни препратки',
+'linksearch-pat'   => 'Тър�ене по:',
+'linksearch-ns'    => 'Именно про�тран�тво:',
+'linksearch-ok'    => 'Тър�ене',
+'linksearch-text'  => 'Възможна е употребата на заме�тващи знаци като: "*.wikipedia.org".<br />Поддържани протоколи: <tt>$1</tt>',
+'linksearch-line'  => '$1 � препратка от $2',
+'linksearch-error' => 'Заме�тващите знаци могат да �то�т �амо в началото на името на хо�та.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Показване на потребителите, започвайки от:',
 'listusers-submit'   => 'Показване',
 'listusers-noresult' => '��ма намерени потребители.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Дневник на реги�трациите',
+'newuserlogpagetext'          => 'В този дневник �е запи�ват реги�трациите на потребители.',
+'newuserlog-byemail'          => 'паролата е изпратена по е-поща',
+'newuserlog-create-entry'     => '�ов потребител',
+'newuserlog-create2-entry'    => '�ъздаде новата �метка $1',
+'newuserlog-autocreate-entry' => '�втоматично �ъздадена �метка',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Права по потребител�ки групи',
-'listgrouprights-summary'  => 'По-долу на тази �траница е показан �пи�ък на групите потребители в това уики � а�оциираните им права за до�тъп. Допълнителна информаци� за отделните права може да бъде намерена [[{{MediaWiki:Listgrouprights-helppage}}|тук]].',
-'listgrouprights-group'    => 'Група',
-'listgrouprights-rights'   => 'Права',
-'listgrouprights-helppage' => 'Help:Права на групите',
-'listgrouprights-members'  => '(�пи�ък на членовете)',
+'listgrouprights'                 => 'Права по потребител�ки групи',
+'listgrouprights-summary'         => 'По-долу на тази �траница е показан �пи�ък на групите потребители в това уики � а�оциираните им права за до�тъп. Допълнителна информаци� за отделните права може да бъде намерена [[{{MediaWiki:Listgrouprights-helppage}}|тук]].',
+'listgrouprights-group'           => 'Група',
+'listgrouprights-rights'          => 'Права',
+'listgrouprights-helppage'        => 'Help:Права на групите',
+'listgrouprights-members'         => '(�пи�ък на членовете)',
+'listgrouprights-addgroup'        => 'Може да добав� {{PLURAL:$2|група|групи}}: $1',
+'listgrouprights-removegroup'     => 'Може да премахва {{PLURAL:$2|група|групи}}: $1',
+'listgrouprights-addgroup-all'    => 'Може да добав� в�ички групи',
+'listgrouprights-removegroup-all' => 'Може да премахва в�ички групи',
 
 # E-mail user
-'mailnologin'     => '��ма електронна поща',
-'mailnologintext' => '�еобходимо е да [[Special:UserLogin|влезете]] и да по�очите валидна електронна поща в [[Special:Preferences|на�тройките]] �и, за да може да пращате пи�ма на други потребители.',
-'emailuser'       => 'Пи�мо до потребител�',
-'emailpage'       => 'Пращане пи�мо на потребител',
-'emailpagetext'   => 'Можете да използвате формул�ра по-долу, за да изпратите електронно пи�мо на този потребител.
+'mailnologin'      => '��ма електронна поща',
+'mailnologintext'  => '�еобходимо е да [[Special:UserLogin|влезете]] и да по�очите валидна електронна поща в [[Special:Preferences|на�тройките]] �и, за да може да пращате пи�ма на други потребители.',
+'emailuser'        => 'Пи�мо до потребител�',
+'emailpage'        => 'Пращане пи�мо на потребител',
+'emailpagetext'    => 'Можете да използвате формул�ра по-долу, за да изпратите електронно пи�мо на този потребител.
 �дре�ът, който �е въвели в [[Special:Preferences|на�тройките �и]], ще �е по�ви в полето „От“ на пи�мото, така че получател�т ще е в �ъ�то�ние да ви отговори.',
-'usermailererror' => 'Пощен�ки�т обект даде грешка:',
-'defemailsubject' => 'Пи�мо от {{SITENAME}}',
-'noemailtitle'    => '��ма електронна поща',
-'noemailtext'     => 'Потребител�т не е по�очил валидна електронна поща или е избрал да не получава пи�ма от други потребители.',
-'emailfrom'       => 'От:',
-'emailto'         => 'До:',
-'emailsubject'    => 'Отно�но:',
-'emailmessage'    => 'Съобщение:',
-'emailsend'       => 'Изпращане',
-'emailccme'       => 'Изпращане на копие на пи�мото до автора.',
-'emailccsubject'  => 'Копие на пи�мото ви до $1: $2',
-'emailsent'       => 'Пи�мото е изпратено',
-'emailsenttext'   => 'Пи�мото ви беше изпратено.',
-'emailuserfooter' => 'Това пи�мо беше изпратено от $1 на $2 чрез функци�та „Изпращане на пи�мо до потребител�“ на {{SITENAME}}.',
+'usermailererror'  => 'Пощен�ки�т обект даде грешка:',
+'defemailsubject'  => 'Пи�мо от {{SITENAME}}',
+'noemailtitle'     => '��ма електронна поща',
+'noemailtext'      => 'Този потребител не е по�очил валиден адре� за електронна поща.',
+'nowikiemailtitle' => '�епозволена електронна поща',
+'nowikiemailtext'  => 'Този потребител е избрал да не получава електронна поща от други потребители.',
+'email-legend'     => 'Изпращане на електронно пи�мо до друг потребител на {{SITENAME}}',
+'emailfrom'        => 'От:',
+'emailto'          => 'До:',
+'emailsubject'     => 'Отно�но:',
+'emailmessage'     => 'Съобщение:',
+'emailsend'        => 'Изпращане',
+'emailccme'        => 'Изпращане на копие на пи�мото до автора.',
+'emailccsubject'   => 'Копие на пи�мото ви до $1: $2',
+'emailsent'        => 'Пи�мото е изпратено',
+'emailsenttext'    => 'Пи�мото ви беше изпратено.',
+'emailuserfooter'  => 'Това пи�мо беше изпратено от $1 на $2 чрез функци�та „Изпращане на пи�мо до потребител�“ на {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Мо�т �пи�ък за наблюдение',
@@ -1620,12 +1786,7 @@ $2',
 'iteminvalidname'      => 'Проблем � „$1“, грешно име…',
 'wlnote'               => "{{PLURAL:$1|Показана е по�ледната пром�на|Показани �а по�ледните '''$1''' промени}} през {{PLURAL:$2|по�ледни� ча�|по�ледните '''$2''' ча�а}}.",
 'wlshowlast'           => 'Показване на по�ледните $1 ча�а $2 дни $3',
-'watchlist-show-bots'  => 'Показване на ботове',
-'watchlist-hide-bots'  => 'Скриване на ботове',
-'watchlist-show-own'   => 'Показване на моите прино�и',
-'watchlist-hide-own'   => 'Скриване на моите прино�и',
-'watchlist-show-minor' => 'Показване на малки промени',
-'watchlist-hide-minor' => 'Скриване на малки промени',
+'watchlist-options'    => 'Опции на �пи�ъка за наблюдение',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '�аблюдение…',
@@ -1664,55 +1825,61 @@ $NEWPAGE
 
 Обратна връзка и помощ: {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Изтриване',
-'confirm'                     => 'Потвърждаване',
-'excontent'                   => '�ъдържанието беше: „$1“',
-'excontentauthor'             => '�ъдържанието беше: „$1“ (като един�твени�т автор беше [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => 'премахнато преди това �ъдържание: „$1“',
-'exblank'                     => '�траницата беше празна',
-'delete-confirm'              => 'Изтриване на „$1“',
-'delete-legend'               => 'Изтриване',
-'historywarning'              => 'Внимание: Страницата, ко�то ще изтриете, има и�тори�:',
-'confirmdeletetext'           => '�а път �те безвъзвратно да изтриете �траница или файл, заедно � ц�лата прилежаща редакционна и�тори�, от базата от данни.
+# Delete
+'deletepage'             => 'Изтриване',
+'confirm'                => 'Потвърждаване',
+'excontent'              => '�ъдържанието беше: „$1“',
+'excontentauthor'        => '�ъдържанието беше: „$1“ (като един�твени�т автор беше [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'премахнато преди това �ъдържание: „$1“',
+'exblank'                => '�траницата беше празна',
+'delete-confirm'         => 'Изтриване на „$1“',
+'delete-legend'          => 'Изтриване',
+'historywarning'         => 'Внимание: Страницата, ко�то ще изтриете, има и�тори�:',
+'confirmdeletetext'      => '�а път �те безвъзвратно да изтриете �траница или файл, заедно � ц�лата прилежаща редакционна и�тори�, от базата от данни.
 Потвърдете, че и�кате това, разбирате по�лед�тви�та и правите това в �ъответ�твие � [[{{MediaWiki:Policy-url}}|лини�та на поведение]].',
-'actioncomplete'              => 'Дей�твието беше изпълнено',
-'deletedtext'                 => 'Страницата „<nowiki>$1</nowiki>“ беше изтрита. Вижте $2 за запи� на по�ледните изтривани�.',
-'deletedarticle'              => 'изтри „[[$1]]“',
-'suppressedarticle'           => 'премахна "[[$1]]"',
-'dellogpage'                  => 'Дневник на изтривани�та',
-'dellogpagetext'              => 'Спи�ък на по�ледните изтривани�.',
-'deletionlog'                 => 'дневник на изтривани�та',
-'reverted'                    => 'Възвръщане към предишна вер�и�',
-'deletecomment'               => 'Причина за изтриването',
-'deleteotherreason'           => 'Друга/допълнителна причина:',
-'deletereasonotherlist'       => 'Друга причина',
-'deletereason-dropdown'       => '*Стандартни причини за изтриване
+'actioncomplete'         => 'Дей�твието беше изпълнено',
+'deletedtext'            => 'Страницата „<nowiki>$1</nowiki>“ беше изтрита. Вижте $2 за запи� на по�ледните изтривани�.',
+'deletedarticle'         => 'изтри „[[$1]]“',
+'suppressedarticle'      => 'премахна "[[$1]]"',
+'dellogpage'             => 'Дневник на изтривани�та',
+'dellogpagetext'         => 'Спи�ък на по�ледните изтривани�.',
+'deletionlog'            => 'дневник на изтривани�та',
+'reverted'               => 'Възвръщане към предишна вер�и�',
+'deletecomment'          => 'Причина за изтриването',
+'deleteotherreason'      => 'Друга/допълнителна причина:',
+'deletereasonotherlist'  => 'Друга причина',
+'deletereason-dropdown'  => '*Стандартни причини за изтриване
 ** По молба на автора
 ** �арушение на автор�ки права
 ** Вандализъм',
-'delete-edit-reasonlist'      => 'Редактиране на причините за изтриване',
-'delete-toobig'               => 'Тази �траница има гол�ма редакционна и�тори� � над $1 {{PLURAL:$1|вер�и�|вер�ии}}. Изтриването на такива �траници е ограничено, за да �е предотврат�т евентуални поражени� на {{SITENAME}}.',
-'delete-warning-toobig'       => 'Тази �траница има гол�ма редакционна и�тори� � над $1 {{PLURAL:$1|вер�и�|вер�ии}}. Възможно е изтриването да наруши н�кои операции в базата данни на {{SITENAME}}; необходимо е о�обено внимание при продължаване на дей�твието.',
-'rollback'                    => 'Отм�на на промените',
-'rollback_short'              => 'Отм�на',
-'rollbacklink'                => 'отм�на',
-'rollbackfailed'              => 'Отм�ната не �получи',
-'cantrollback'                => '�е може да �е извърши отм�на на редакциите. По�ледни�т редактор е и един�твен автор на �траницата.',
-'alreadyrolled'               => 'Редакци�та на [[:$1]], направена от [[User:$2|$2]] ([[User talk:$2|Бе�еда]] | [[Special:Contributions/$2|{{int:contribslink}}]]), не може да бъде отменена. ��кой друг вече е редактирал �траницата или е отменил промените.
-
-По�ледната редакци� е на [[User:$3|$3]] ([[User talk:$3|Бе�еда]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => "Коментарът на редакци�та е бил: „''$1''“.", # only shown if there is an edit comment
-'revertpage'                  => 'Премахване на [[Special:Contributions/$2|редакции на $2]] ([[User talk:$2|бе�еда]]); възвръщане към по�ледната вер�и� на [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Отменени редакции на $1; възвръщане към по�ледната вер�и� на $2.',
-'sessionfailure'              => 'Изглежда има проблем �ъ� �е�и�та ви; дей�твието беше отказано като предпазна м�рка �рещу крадене на �е�и�та. �ати�нете бутона за връщане на браузъра, презаредете �траницата, от ко�то �те дошли, и опитайте отново.',
+'delete-edit-reasonlist' => 'Редактиране на причините за изтриване',
+'delete-toobig'          => 'Тази �траница има гол�ма редакционна и�тори� � над $1 {{PLURAL:$1|вер�и�|вер�ии}}. Изтриването на такива �траници е ограничено, за да �е предотврат�т евентуални поражени� на {{SITENAME}}.',
+'delete-warning-toobig'  => 'Тази �траница има гол�ма редакционна и�тори� � над $1 {{PLURAL:$1|вер�и�|вер�ии}}. Възможно е изтриването да наруши н�кои операции в базата данни на {{SITENAME}}; необходимо е о�обено внимание при продължаване на дей�твието.',
+
+# Rollback
+'rollback'         => 'Отм�на на промените',
+'rollback_short'   => 'Отм�на',
+'rollbacklink'     => 'отм�на',
+'rollbackfailed'   => 'Отм�ната не �получи',
+'cantrollback'     => '�е може да �е извърши отм�на на редакциите. По�ледни�т редактор е и един�твен автор на �траницата.',
+'alreadyrolled'    => 'Редакци�та на [[:$1]], направена от [[User:$2|$2]] ([[User talk:$2|Бе�еда]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]), не може да бъде отменена. ��кой друг вече е редактирал �траницата или е отменил промените.
+
+По�ледната редакци� е на [[User:$3|$3]] ([[User talk:$3|Бе�еда]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Резюмето на редакци�та беше: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Премахване на [[Special:Contributions/$2|редакции на $2]] ([[User talk:$2|бе�еда]]); възвръщане към по�ледната вер�и� на [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Отменени редакции на $1; възвръщане към по�ледната вер�и� на $2.',
+'sessionfailure'   => 'Изглежда има проблем �ъ� �е�и�та ви; дей�твието беше отказано като предпазна м�рка �рещу крадене на �е�и�та. �ати�нете бутона за връщане на браузъра, презаредете �траницата, от ко�то �те дошли, и опитайте отново.',
+
+# Protect
 'protectlogpage'              => 'Дневник на защитата',
 'protectlogtext'              => 'Спи�ък на защитите и техните �вал�ни� за �траницата.
 Можете да прегледате и [[Special:ProtectedPages|�пи�ъка на текущо защитените �траници]].',
-'protectedarticle'            => 'защитаване на „[[$1]]“',
-'modifiedarticleprotection'   => '�м�на на нивото на защита на „[[$1]]“',
-'unprotectedarticle'          => '�вал�не на защитата на „[[$1]]“',
+'protectedarticle'            => 'защити „[[$1]]“',
+'modifiedarticleprotection'   => '�мени нивото на защита на „[[$1]]“',
+'unprotectedarticle'          => '�вали защитата на „[[$1]]“',
+'movedarticleprotection'      => 'преме�тване на на�тройките за защита от „[[$2]]“ на „[[$1]]“',
 'protect-title'               => 'Защитаване на „$1“',
+'prot_1movedto2'              => '„[[$1]]“ преме�тена като „[[$2]]“',
 'protect-legend'              => 'Потвърждение на защитата',
 'protectcomment'              => 'Коментар:',
 'protectexpiry'               => 'Изтичане:',
@@ -1720,18 +1887,31 @@ $NEWPAGE
 'protect_expiry_old'          => 'Времето на изтичане лежи в миналото.',
 'protect-unchain'             => 'Позвол�ване на преме�твани�та',
 'protect-text'                => 'Тук можете да прегледате и промените нивото на защита на �траницата „[[$1]]“. Желателно е да �е придържате към [[{{ns:project}}:Защитена �траница|ръководните принципи на проекта]].',
-'protect-locked-blocked'      => '��мате правото да промен�те нивата на защита на �траниците, докато �те блокиран(а). Ето текущите на�тройки за �траницата „<strong>$1</strong>“:',
-'protect-locked-dblock'       => '�ивата на защита на �траниците не могат да бъдат промен�ни, защото базата от данни е заключена. Ето текущите на�тройки за �траницата „<strong>$1</strong>“:',
-'protect-locked-access'       => '��мате правото да промен�те нивата на защита на �траниците. Ето текущите на�тройки за �траницата „<strong>$1</strong>“:',
+'protect-locked-blocked'      => "��мате правото да промен�те нивата на защита на �траниците, докато �те блокиран(а). Ето текущите на�тройки за �траницата „'''$1'''“:",
+'protect-locked-dblock'       => "�ивата на защита на �траниците не могат да бъдат промен�ни, защото базата от данни е заключена. Ето текущите на�тройки за �траницата „'''$1'''“:",
+'protect-locked-access'       => "��мате правото да промен�те нивата на защита на �траниците. Ето текущите на�тройки за �траницата „'''$1'''“:",
 'protect-cascadeon'           => 'Тази �траница е защитена против редактиране, защото е включена в {{PLURAL:$1|�ледната �траница, ко�то от �во� �трана има|�ледните �траници, които от �во� �трана имат}} ка�кадна защита. Можете да промените нивото на защита на �траницата, но това н�ма да повли�е върху ка�кадната защита.',
 'protect-default'             => '(по подразбиране)',
 'protect-fallback'            => '�еобходими �а права на „$1“',
-'protect-level-autoconfirmed' => 'Блокиране на нереги�трирани потребители',
+'protect-level-autoconfirmed' => 'Блокиране на нови и нереги�трирани потребители',
 'protect-level-sysop'         => 'Само за админи�тратори',
 'protect-summary-cascade'     => 'ка�кадно',
 'protect-expiring'            => 'изтича на $1 (UTC)',
+'protect-expiry-indefinite'   => 'без�рочно',
 'protect-cascade'             => 'Ка�кадна защита — защита на в�ички �траници, включени в на�то�щата �траница.',
 'protect-cantedit'            => '�е можете да промените нивото на защита на тази �траницата, защото н�мате права да � редактирате.',
+'protect-othertime'           => 'Друг �рок:',
+'protect-othertime-op'        => 'друг �рок',
+'protect-existing-expiry'     => 'О�таващо време: $2, $3',
+'protect-otherreason'         => 'Друга/допълнителна причина:',
+'protect-otherreason-op'      => 'друга/допълнителна причина',
+'protect-dropdown'            => '* Стандартни причини за защита на �траници
+** Че�т обект на вандализъм
+** Че�т обект на �пам
+** Редактор�ка война
+** Страница, изи�кваща много �ървърни ре�ур�и',
+'protect-edit-reasonlist'     => 'Редактиране на причините за защита',
+'protect-expiry-options'      => 'два ча�а:2 hours,един ден:1 day,три дни:3 days,една �едмица:1 week,две �едмици:2 weeks,един ме�ец:1 month,три ме�еца:3 months,ше�т ме�еца:6 months,една година:1 year,без�рочно:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Съ�то�ние на защитата:',
 'restriction-level'           => '�иво на защитата:',
 'minimum-size'                => 'Минимален размер',
@@ -1754,8 +1934,7 @@ $NEWPAGE
 'undeletepage'                 => 'Преглед и въз�танов�ване на изтрити �траници',
 'undeletepagetitle'            => "'''По-долу е показан �пи�ък на изтритите вер�ии на [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Преглед на изтрити �траници',
-'undeletepagetext'             => 'Следните �траници б�ха изтрити, но �е намират в�е още
-в архива и могат да бъдат въз�тановени. �рхивът може да �е почи�тва от време на време.',
+'undeletepagetext'             => '{{PLURAL:$1|Следната �траница беше изтрита, но в�е още �е намира в архива и може да бъде въз�тановена|Следните $1 �траници б�ха изтрити, но в�е още �е намират в архива и могат да бъдат въз�тановени}}. �рхивът може да �е почи�тва от време на време.',
 'undelete-fieldset-title'      => 'Въз�танов�ване на вер�ии',
 'undeleteextrahelp'            => "За пълно въз�танов�ване на и�тори�та на �траницата, не �лагайте отметки и нати�нете '''''Въз�танов�ване'''''.
 За ча�тично въз�танов�ване отметнете тези вер�ии на �траницата, които тр�бва да бъдат въ�тановени, и нати�нете '''''Въз�танов�ване'''''.
@@ -1765,14 +1944,15 @@ $NEWPAGE
 �ко �лед изтриването е �ъздадена �траница �ъ� �ъщото име, въз�тановените вер�ии ще �е по�в�т като по-ранна и�тори�, а текущата вер�и� на �траницата н�ма да бъде заменена автоматично. Също така обърнете внимание, че ограничени�та, приложени върху вер�иите, ще �е загуб�т �лед въз�танов�ването.',
 'undeleterevdel'               => 'Въз�танов�ването н�ма да бъде изпълнено, ако би довело до ча�тично изтриване на актуалната вер�и�. В такъв �лучай актуалната вер�и� не тр�бва да бъде избирана или пък �ъ�то�нието й тр�бва да бъде променено на нормална (не�крита) вер�и�. Вер�иите на файлове, които н�мате право да преглеждате, н�ма да бъдат въз�тановени.',
 'undeletehistorynoadmin'       => 'Тази �траница е била изтрита. В резюмето отдолу е по�очена причината за това, заедно � информаци� за потребителите, редактирали �траницата преди изтриването й. Конкретното �ъдържание на изтритите вер�ии е до�тъпно �амо за админи�тратори.',
-'undelete-revision'            => 'Изтрита вер�и� на $1 (към $2) от $3:',
+'undelete-revision'            => 'Изтрита вер�и� на $1 (към $4, в $5) от $3:',
 'undeleterevision-missing'     => '�еправилна или лип�ваща вер�и�. Може да �те по�ледвали грешна препратка или указаната вер�и� да е била въз�тановена или премахната от архива',
 'undelete-nodiff'              => '�е е открита предишна редакци�.',
 'undeletebtn'                  => 'Въз�танов�ване',
 'undeletelink'                 => 'въз�танов�ване',
 'undeletereset'                => 'Изчи�тване',
+'undeleteinvert'               => 'Обръщане на избора',
 'undeletecomment'              => 'Коментар:',
-'undeletedarticle'             => '„[[$1]]“ беше въз�тановена',
+'undeletedarticle'             => 'въз�танови „[[$1]]“',
 'undeletedrevisions'           => '{{PLURAL:$1|Една вер�и� беше въз�тановена|$1 вер�ии б�ха въз�тановени}}',
 'undeletedrevisions-files'     => '{{PLURAL:$1|Една вер�и�|$1 вер�ии}} и {{PLURAL:$1|един файл|$2 файла}} б�ха въз�тановени',
 'undeletedfiles'               => '{{PLURAL:$1|Един файл беше въз�тановен|$1 файла б�ха въз�тановени}}',
@@ -1802,26 +1982,27 @@ $1',
 'blanknamespace' => '(О�новно)',
 
 # Contributions
-'contributions' => 'Прино�и',
-'mycontris'     => 'Моите прино�и',
-'contribsub2'   => 'За $1 ($2)',
-'nocontribs'    => '�е �а намерени промени, отговар�щи на критери�.',
-'uctop'         => ' (по�ледна)',
-'month'         => 'Ме�ец:',
-'year'          => 'Година:',
-
-'sp-contributions-newbies'     => 'Показване �амо на прино�ите на нови потребители',
-'sp-contributions-newbies-sub' => 'на нови потребители',
-'sp-contributions-blocklog'    => 'Дневник на блокирани�та',
-'sp-contributions-search'      => 'Тър�ене на прино�и',
-'sp-contributions-username'    => 'IP-адре� или потребител�ко име:',
-'sp-contributions-submit'      => 'Тър�ене',
+'contributions'       => 'Прино�и',
+'contributions-title' => 'Потребител�ки прино�и за $1',
+'mycontris'           => 'Моите прино�и',
+'contribsub2'         => 'За $1 ($2)',
+'nocontribs'          => '�е �а намерени промени, отговар�щи на критери�.',
+'uctop'               => ' (по�ледна)',
+'month'               => 'Ме�ец:',
+'year'                => 'Година:',
+
+'sp-contributions-newbies'       => 'Показване �амо на прино�ите на нови потребители',
+'sp-contributions-newbies-sub'   => 'на нови потребители',
+'sp-contributions-newbies-title' => 'Потребител�ки прино�и за нови �метки',
+'sp-contributions-blocklog'      => 'Дневник на блокирани�та',
+'sp-contributions-search'        => 'Тър�ене на прино�и',
+'sp-contributions-username'      => 'IP-адре� или потребител�ко име:',
+'sp-contributions-submit'        => 'Тър�ене',
 
 # What links here
 'whatlinkshere'            => 'Какво �очи на�ам',
 'whatlinkshere-title'      => 'Страници, които �очат към „$1“',
 'whatlinkshere-page'       => 'Страница:',
-'linklistsub'              => '(Спи�ък � препратки)',
 'linkshere'                => "Следните �траници �очат към '''[[:$1]]''':",
 'nolinkshere'              => "��ма �траници, �очещи към '''[[:$1]]'''.",
 'nolinkshere-ns'           => "��ма �траници, �очещи към '''[[:$1]]''' в избраното именно про�тран�тво.",
@@ -1869,23 +2050,29 @@ $1',
 'ipbotherreason'                  => 'Друга/допълнителна причина:',
 'ipbhidename'                     => 'Скриване на потребител�кото име/IP-адре� в дневника на блокирани�та, в �пи�ъка � текущите блокирани� и в �пи�ъка на потребителите',
 'ipbwatchuser'                    => '�аблюдаване на потребител�ката �траница и бе�едата на този потребител',
+'ipballowusertalk'                => 'Позвол�ване на потребител� да редактира �об�твената �и бе�еда докато е блокиран',
+'ipb-change-block'                => 'Повторно блокиране на потребител� � тези на�тройки',
 'badipaddress'                    => '�евалиден IP-адре�',
 'blockipsuccesssub'               => 'Блокирането беше у�пешно',
-'blockipsuccesstext'              => '„[[Special:Contributions/$1|$1]]“ беше блокиран.<br />
-Вижте [[Special:IPBlockList|�пи�ъка на блокираните потребители]], за да прегледате в�ички блокирани�.',
+'blockipsuccesstext'              => 'Потребител [[Special:Contributions/$1|$1]] беше блокиран(а).<br />
+Можете да прегледате пълни� [[Special:IPBlockList|�пи�ък на блокираните потребители]].',
 'ipb-edit-dropdown'               => 'Причини за блокиране',
 'ipb-unblock-addr'                => 'Отблокиране на $1',
 'ipb-unblock'                     => 'Отблокиране на потребител�ко име IP-адре�',
 'ipb-blocklist-addr'              => 'Преглед на текущите блокирани� на $1',
 'ipb-blocklist'                   => 'Преглед на текущите блокирани�',
+'ipb-blocklist-contribs'          => 'Прино�и за $1',
 'unblockip'                       => 'Отблокиране на потребител',
 'unblockiptext'                   => 'Използвайте долни� формул�р, за да въз�тановите правото на пи�ане на по-рано блокиран IP-адре� или потребител.',
-'ipusubmit'                       => 'Отблокиране на адре�а',
+'ipusubmit'                       => 'Свал�не на блокирането',
 'unblocked'                       => '[[User:$1|$1]] беше отблокиран.',
 'unblocked-id'                    => 'Блок № $1 беше премахнат',
 'ipblocklist'                     => 'Спи�ък на блокирани IP-адре�и и потребители',
 'ipblocklist-legend'              => 'Откриване на блокиран потребител',
 'ipblocklist-username'            => 'Потребител�ко име или IP адре�:',
+'ipblocklist-sh-userblocks'       => '$1 блокирани потребител�ки �метки',
+'ipblocklist-sh-tempblocks'       => '$1 временни блокирани�',
+'ipblocklist-sh-addressblocks'    => '$1 блокирани отделни IP-адре�а',
 'ipblocklist-submit'              => 'Тър�ене',
 'blocklistline'                   => '$1, $2 е блокирал $3 ($4)',
 'infiniteblock'                   => 'неограничено',
@@ -1894,27 +2081,34 @@ $1',
 'noautoblockblock'                => 'автоблокировката е изключена',
 'createaccountblock'              => '�ъздаването на �метки е блокирано',
 'emailblock'                      => 'е-пощен�ката у�луга е блокирана',
+'blocklist-nousertalk'            => 'забрана за редактиране на личната бе�еда',
 'ipblocklist-empty'               => 'Спи�ъкът на блокирани�та е празен.',
 'ipblocklist-no-results'          => 'Указани�т IP-адре� или потребител не е блокиран.',
 'blocklink'                       => 'блокиране',
 'unblocklink'                     => 'отблокиране',
+'change-blocklink'                => 'пром�на на параметрите на блокирането',
 'contribslink'                    => 'прино�и',
 'autoblocker'                     => 'Б�хте блокиран автоматично, тъй като неотдавна IP-адре�ът ви е бил ползван от блокирани� в момента потребител [[User:$1|$1]]. Причината за неговото блокиране е: „$2“.',
 'blocklogpage'                    => 'Дневник на блокирани�та',
-'blocklogentry'                   => 'блокиране на „[[$1]]“ �ъ� �рок на изтичане $2 $3',
+'blocklog-fulllog'                => 'Пълен дневник на блокирани�та',
+'blocklogentry'                   => 'блокира [[$1]] �ъ� �рок на изтичане $2 $3',
+'reblock-logentry'                => 'промени параметрите на блокирането на [[$1]] �ъ� �рок на изтричане $2 $3',
 'blocklogtext'                    => 'Тази �траница �ъдържа дневник на блокирани�та и отблокирани�та, извършени от този потребител.
 �втоматично блокираните IP-адре�и не �а показани.
 Вижте [[Special:IPBlockList|�пи�ъка на блокираните IP-адре�и]] за текущото �ъ�то�ние на блокирани�та.',
-'unblocklogentry'                 => 'отблокиране на „$1“',
+'unblocklogentry'                 => 'отблокира $1',
 'block-log-flags-anononly'        => '�амо анонимни потребители',
 'block-log-flags-nocreate'        => '�ъздаването на �метки е изключено',
 'block-log-flags-noautoblock'     => 'автоблокировката е изключена',
 'block-log-flags-noemail'         => 'е-пощен�ката у�луга е блокирана',
+'block-log-flags-nousertalk'      => 'забрана за редактиране на личната бе�еда',
 'block-log-flags-angry-autoblock' => 'разширената автоблокировка е включена',
 'range_block_disabled'            => 'Възможно�тта на админи�траторите да задават интервали при IP-адре�ите е изключена.',
 'ipb_expiry_invalid'              => '�евалиден �рок на изтичане.',
 'ipb_expiry_temp'                 => 'Скритите потребител�ки имена тр�бва да �е блокират без�рочно.',
 'ipb_already_blocked'             => '„$1“ е вече блокиран',
+'ipb-needreblock'                 => '== Вече е блокиран ==
+$1 е вече блокиран. Желаете ли да промените на�тройките?',
 'ipb_cant_unblock'                => 'Грешка: �е е намерен блок � номер $1. Веро�тно потребител�т е вече отблокиран.',
 'ipb_blocked_as_range'            => 'Грешка: IP-адре�ът $1 не може да бъде разблокиран, тъй като е ча�т от блокирани� реги�тър $2. Можете да разблокирате адре�а, като разблокирате цели� реги�тър.',
 'ip_range_invalid'                => '�евалиден интервал за IP-адре�и.',
@@ -1925,6 +2119,7 @@ $1',
 'proxyblocksuccess'               => 'Готово.',
 'sorbsreason'                     => 'Ваши�т IP-адре� е запи�ан като анонимно до�тъпен междинен �ървър в DNSBL на {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Ваши�т IP-адре� е запи�ан като анонимно до�тъпен междинен �ървър в DNSBL на {{SITENAME}}. �е можете да �ъздадете �метка.',
+'cant-block-while-blocked'        => '�е можете да блокирате други потребители, докато �ам(а) �те блокиран(а).',
 
 # Developer tools
 'lockdb'              => 'Заключване на базата от данни',
@@ -1947,9 +2142,9 @@ $1',
 'databasenotlocked'   => 'Базата от данни не е заключена.',
 
 # Move page
-'move-page'               => 'Преме�тване на $1',
-'move-page-legend'        => 'Преме�тване на �траница',
-'movepagetext'            => "По�ред�твом долни� формул�р можете да преименувате �траница, преме�твайки ц�лата й и�тори� на новото име. Старото заглавие ще �е превърне в прена�очваща �траница.
+'move-page'                 => 'Преме�тване на $1',
+'move-page-legend'          => 'Преме�тване на �траница',
+'movepagetext'              => "По�ред�твом долни� формул�р можете да преименувате �траница, преме�твайки ц�лата й и�тори� на новото име. Старото заглавие ще �е превърне в прена�очваща �траница.
 Препратките към �тарата �траница н�ма да бъдат променени; затова проверете за двойни или невалидни прена�очвани�.
 Вие �ами би тр�бвало да �е убедите в това, дали препратките продължават да �очат там, където �е предполага.
 
@@ -1957,48 +2152,58 @@ $1',
 
 '''В�ИМ��ИЕ!'''
 Това може да е гол�ма и неочаквана пром�на за изве�тна �траница. Уверете �е, че разбирате по�лед�тви�та, преди да продължите.",
-'movepagetalktext'        => "�ко �ъще�твува, �ъответната ди�ку�ионна �траница ще бъде преме�тена автоматично заедно � не�, '''о�вен ако:'''
+'movepagetalktext'          => "�ко �ъще�твува, �ъответната ди�ку�ионна �траница ще бъде преме�тена автоматично заедно � не�, '''о�вен ако:'''
 * не ме�тите �траницата от едно именно про�тран�тво в друго,
 * вече �ъще�твува непразна ди�ку�ионна �траница � това име или
 * не �те отметнали долната кутийка.
 
 В тези �лучаи, ако желаете, ще е необходимо да преме�тите �траницата ръчно.",
-'movearticle'             => 'Преме�тване на �траница:',
-'movenotallowed'          => '��мате права за преме�тване на �траници.',
-'newtitle'                => 'Към ново заглавие:',
-'move-watch'              => '�аблюдаване на �траницата',
-'movepagebtn'             => 'Преме�тване',
-'pagemovedsub'            => 'Преме�тването беше у�пешно',
-'movepage-moved'          => "<big>'''Страницата „$1“ беше преме�тена под името „$2“.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Вече �ъще�твува �траница � това име или името, което �те избрали, е невалидно. Изберете друго име.',
-'cantmove-titleprotected' => 'Страницата не може да бъде преме�тена под новото заглавие, тъй като то е защитено от �ъздаване',
-'talkexists'              => "'''Страницата беше у�пешно преме�тена, но без �ъответната ди�ку�ионна �траница, защото под новото име има една �ъще�твуваща. Обединете ги ръчно.'''",
-'movedto'                 => 'преме�тена като',
-'movetalk'                => 'Преме�тване и на ди�ку�ионната �траница, ако е приложимо.',
-'move-subpages'           => 'Преме�тване на в�ички �траници ако е приложимо',
-'move-talk-subpages'      => 'Преме�тване на в�ички под�траници на бе�едата ако е приложимо',
-'movepage-page-exists'    => 'Страницата $1 вече �ъще�твува и н�ма да бъде автоматично презапи�ана.',
-'movepage-page-moved'     => 'Страницата $1 беше преме�тена като $2.',
-'movepage-page-unmoved'   => 'Страницата $1 не може да бъде преме�тена като $2.',
-'movepage-max-pages'      => 'Преме�тен беше мак�имални�т брой от $1 {{PLURAL:$1|�траница|�траници}} и повече �траници н�ма да бъдат преме�твани автоматично.',
-'1movedto2'               => '„[[$1]]“ преме�тена като „[[$2]]“',
-'1movedto2_redir'         => '„[[$1]]“ преме�тена като „[[$2]]“ (върху прена�очване)',
-'movelogpage'             => 'Дневник на преме�твани�та',
-'movelogpagetext'         => 'По-долу е показан �пи�ък на преме�твани�та.',
-'movereason'              => 'Причина:',
-'revertmove'              => 'връщане',
-'delete_and_move'         => 'Изтриване и преме�тване',
-'delete_and_move_text'    => '== �аложително изтриване ==
+'movearticle'               => 'Преме�тване на �траница:',
+'movenologin'               => '�е �те влезли',
+'movenologintext'           => '�еобходимо е да [[Special:UserLogin|влезете]], за да може да преме�твате �траници.',
+'movenotallowed'            => '��мате права за преме�тване на �траници.',
+'movenotallowedfile'        => '��мате права да преме�твате файлове.',
+'cant-move-user-page'       => '��мате нужните права на до�тъп, за да ме�тите потребител�ки �траници (можете да ме�тите �амо под�траници).',
+'cant-move-to-user-page'    => '��мате нужните права на до�тъп, за да извършвате преме�тване на �траници върху потребител�ки �траници (можете да ме�тите �амо върху под�траници от потребител�кото про�тран�тво).',
+'newtitle'                  => 'Към ново заглавие:',
+'move-watch'                => '�аблюдаване на �траницата',
+'movepagebtn'               => 'Преме�тване',
+'pagemovedsub'              => 'Преме�тването беше у�пешно',
+'movepage-moved'            => "<big>'''Страницата „$1“ беше преме�тена под името „$2“.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'   => 'Беше �ъздадено прена�очване.',
+'articleexists'             => 'Вече �ъще�твува �траница � това име или името, което �те избрали, е невалидно. Изберете друго име.',
+'cantmove-titleprotected'   => 'Страницата не може да бъде преме�тена под новото заглавие, тъй като то е защитено от �ъздаване',
+'talkexists'                => "'''Страницата беше у�пешно преме�тена, но без �ъответната ди�ку�ионна �траница, защото под новото име има една �ъще�твуваща. Обединете ги ръчно.'''",
+'movedto'                   => 'преме�тена като',
+'movetalk'                  => 'Преме�тване и на ди�ку�ионната �траница, ако е приложимо.',
+'move-subpages'             => 'Преме�тване на в�ички �траници ако е приложимо',
+'move-talk-subpages'        => 'Преме�тване на в�ички под�траници на бе�едата ако е приложимо',
+'movepage-page-exists'      => 'Страницата $1 вече �ъще�твува и н�ма да бъде автоматично презапи�ана.',
+'movepage-page-moved'       => 'Страницата $1 беше преме�тена като $2.',
+'movepage-page-unmoved'     => 'Страницата $1 не може да бъде преме�тена като $2.',
+'movepage-max-pages'        => 'Преме�тен беше мак�имални�т брой от $1 {{PLURAL:$1|�траница|�траници}} и повече �траници н�ма да бъдат преме�твани автоматично.',
+'1movedto2'                 => 'преме�ти „[[$1]]“ като „[[$2]]“',
+'1movedto2_redir'           => 'преме�ти „[[$1]]“ като „[[$2]]“ (върху прена�очване)',
+'movelogpage'               => 'Дневник на преме�твани�та',
+'movelogpagetext'           => 'По-долу е показан �пи�ък на преме�твани�та.',
+'movereason'                => 'Причина:',
+'revertmove'                => 'връщане',
+'delete_and_move'           => 'Изтриване и преме�тване',
+'delete_and_move_text'      => '== �аложително изтриване ==
 
 Целевата �траница „[[:$1]]“ вече �ъще�твува. И�кате ли да � изтриете, за да о�вободите м��то за преме�тването?',
-'delete_and_move_confirm' => 'Да, и�кам да изтри� тази �траница.',
-'delete_and_move_reason'  => 'Изтрита, за да �е о�вободи м��то за преме�тване',
-'selfmove'                => 'Страницата не може да бъде преме�тена, тъй като целевото име �ъвпада � първоначалното й заглавие.',
-'immobile_namespace'      => 'Целевото заглавие е от �пециален тип. �е е възможно ме�тенето на �траници в това именно про�тран�тво.',
-'imagenocrossnamespace'   => '�евъзможно е да �е преме�тват картинки извън това именно про�тран�тво',
-'imagetypemismatch'       => '�овото разширение на файла не �ъвпада � типа му',
-'imageinvalidfilename'    => 'Целевото име на файл е невалидно',
-'fix-double-redirects'    => 'Обнов�ване на в�ички двойни прена�очвани�, които �очат към оригиналното заглавие',
+'delete_and_move_confirm'   => 'Да, и�кам да изтри� тази �траница.',
+'delete_and_move_reason'    => 'Изтрита, за да �е о�вободи м��то за преме�тване',
+'selfmove'                  => 'Страницата не може да бъде преме�тена, тъй като целевото име �ъвпада � първоначалното й заглавие.',
+'immobile-source-namespace' => '�е могат да �е ме�т�т �траници в именно про�тран�тво "$1"',
+'immobile-target-namespace' => '�е е възможно преме�тването на �траници в именното про�тран�тво „$1“',
+'immobile-source-page'      => 'Тази �траница не може да бъде преме�твана.',
+'immobile-target-page'      => '�е може да �е извърши преме�тване върху това целево заглавие.',
+'imagenocrossnamespace'     => '�евъзможно е да �е преме�тват картинки извън това именно про�тран�тво',
+'imagetypemismatch'         => '�овото разширение на файла не �ъвпада � типа му',
+'imageinvalidfilename'      => 'Целевото име на файл е невалидно',
+'fix-double-redirects'      => 'Обнов�ване на в�ички двойни прена�очвани�, които �очат към оригиналното заглавие',
+'move-leave-redirect'       => 'О�тав�не на прена�очваща �траница от �тарото към новото заглавие',
 
 # Export
 'export'            => 'Изна��не на �траници',
@@ -2006,7 +2211,7 @@ $1',
 
 За да изне�ете н�колко �траници, въвеждайте в��ко ново заглавие на '''нов ред'''. След това изберете дали и�кате �амо текущата вер�и� (заедно � информаци� за по�ледната редакци�) или в�ички вер�ии (заедно � текущата) на �траницата.
 
-�ко желаете �амо текущата вер�и�, бихте могли да използвате препратка от вида [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] за �траницата [[{{MediaWiki:Mainpage}}]].",
+�ко желаете �амо текущата вер�и�, бихте могли да използвате препратка от вида [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] за �траницата [[{{MediaWiki:Mainpage}}]].",
 'exportcuronly'     => 'Включване �амо на текущата вер�и�, а не на ц�лата и�тори�',
 'exportnohistory'   => "----
 '''Важно:''' Изна��нето на пълната и�тори� на �траниците е забранено, защото много забав� уикито.",
@@ -2022,7 +2227,7 @@ $1',
 'allmessagesdefault'        => 'Тек�т по подразбиране',
 'allmessagescurrent'        => 'Текущ тек�т',
 'allmessagestext'           => 'Тази �траница �ъдържа �пи�ък на �и�темните �ъобщени� от именното про�тран�тво „Меди�Уики“.
-По�етете [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] и [http://translatewiki.net Betawiki], ако желаете да доприне�ете за общата локализаци� на �офтуера Меди�Уики.',
+По�етете [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] и [http://translatewiki.net translatewiki.net], ако желаете да доприне�ете за общата локализаци� на �офтуера Меди�Уики.',
 'allmessagesnotsupportedDB' => "Тази �траница не може да бъде използвана, тъй като е изключена възможно�тта '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Филтриране на �ъобщени�та по име:',
 'allmessagesmodified'       => 'Показване �амо на променените',
@@ -2042,9 +2247,12 @@ $1',
 'import-interwiki-text'      => 'Изберете уики и име на �траницата.
 Датите на редакциите и имената на авторите ще бъдат запазени.
 В�ички операции при вна��нето от друго уики �е запи�ват в [[Special:Log/import|дневника на вна��ни�та]].',
+'import-interwiki-source'    => 'Изходно уики/�траница:',
 'import-interwiki-history'   => 'Копиране на в�ички вер�ии на �траницата',
 'import-interwiki-submit'    => 'Вна��не',
 'import-interwiki-namespace' => 'Целево именно про�тран�тво:',
+'import-upload-filename'     => 'Име на файл:',
+'import-comment'             => 'Коментар:',
 'importtext'                 => 'Изне�ете файла от изходното уики чрез ин�трумента „[[Special:Export]]“, �ъхранете го на ди�ка �и и го качете тук.',
 'importstart'                => 'Вна��не на �траници…',
 'import-revision-count'      => '$1 {{PLURAL:$1|вер�и�|вер�ии}}',
@@ -2090,7 +2298,7 @@ $1',
 'tooltip-pt-logout'               => 'Излизане от {{SITENAME}}',
 'tooltip-ca-talk'                 => 'Бе�еда отно�но �траницата',
 'tooltip-ca-edit'                 => 'Можете да редактирате �траницата. Използвайте бутона за предварителен преглед преди да �ъхраните.',
-'tooltip-ca-addsection'           => 'Добав�не на коментар към �траницата',
+'tooltip-ca-addsection'           => 'Започване на нов раздел',
 'tooltip-ca-viewsource'           => 'Страницата е защитена. Можете да разгледате изходни� й код.',
 'tooltip-ca-history'              => 'Предишни вер�ии на �траницата',
 'tooltip-ca-protect'              => 'Защитаване на �траницата',
@@ -2137,6 +2345,9 @@ $1',
 'tooltip-watch'                   => 'Добав�не на �траницата към �пи�ъка ви за наблюдение',
 'tooltip-recreate'                => 'Въз�танов�ване на �траницата незави�имо, че е била изтрита',
 'tooltip-upload'                  => 'Започване на качването',
+'tooltip-rollback'                => 'Чрез командата "отм�на" може � едно щракване на мишката да �е върне по�ледователно�тта от редакции в тази �траница на по�ледни� потребител в и�тори�та.',
+'tooltip-undo'                    => 'Препратката „връщане“ премахва тази редакци� и отвар� �траницата за редактиране в режим на предварителен преглед. 
+В полето за резюме може да �е впише причина за връщането.',
 
 # Stylesheets
 'common.css'   => '/* Чрез редактиране на този файл ще промените в�ички облици */',
@@ -2152,12 +2363,12 @@ $1',
 'notacceptable'     => 'Сървърът не може да предо�тави данни във формат, който да �е разпознава от клиента ви.',
 
 # Attribution
-'anonymous'        => '�нонимен потребител(и) на {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|�нонимен потребител|�нонимни потребители}}на {{SITENAME}}',
 'siteuser'         => 'потребител на {{SITENAME}} $1',
 'lastmodifiedatby' => 'По�ледната пром�на на �траницата е извършена от $3 на $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'О�новаващо �е върху работа на $1.',
 'others'           => 'други',
-'siteusers'        => 'потребителите на {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|потребител�т|потребителите}} на {{SITENAME}} $1',
 'creditspage'      => 'Библиографи� и източници',
 'nocredits'        => '��ма въведени източници или библиографи�.',
 
@@ -2177,6 +2388,16 @@ $1',
 'numauthors'     => 'Брой различни автори (�траница): $1',
 'numtalkauthors' => 'Брой различни автори (ди�ку�ионна �траница): $1',
 
+# Skin names
+'skinname-standard'    => 'Кла�ика',
+'skinname-nostalgia'   => '�о�талги�',
+'skinname-cologneblue' => 'Кьолн�ко �иньо',
+'skinname-monobook'    => 'Монобук',
+'skinname-myskin'      => 'Мо�т облик',
+'skinname-chick'       => 'Пиленце',
+'skinname-simple'      => 'Семпъл',
+'skinname-modern'      => 'Модерен',
+
 # Math options
 'mw_math_png'    => 'Използване винаги на PNG',
 'mw_math_simple' => 'HTML при опро�тен TeX, иначе PNG',
@@ -2197,11 +2418,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '�е е разрешено да маркирате �воите редакции като проверени.',
 
 # Patrol log
-'patrol-log-page'   => 'Дневник на патрула',
-'patrol-log-header' => 'Тази �траница �ъдържа дневник на проверените вер�ии.',
-'patrol-log-line'   => 'отбел�за $1 от $2 като проверена $3',
-'patrol-log-auto'   => '(автоматично)',
-'patrol-log-diff'   => 'вер�и� $1',
+'patrol-log-page'      => 'Дневник на патрула',
+'patrol-log-header'    => 'Тази �траница �ъдържа дневник на проверените вер�ии.',
+'patrol-log-line'      => 'отбел�за $1 от $2 като проверена $3',
+'patrol-log-auto'      => '(автоматично)',
+'patrol-log-diff'      => 'вер�и� $1',
+'log-show-hide-patrol' => '$1 на Дневника на патрула',
 
 # Image deletion
 'deletedrevision'                 => 'Изтрита �тара вер�и� $1',
@@ -2218,6 +2440,9 @@ $1',
 'previousdiff' => '� По-�тара редакци�',
 'nextdiff'     => 'По-нова редакци� →',
 
+# Visual comparison
+'visual-comparison' => 'Визуално �равн�ване',
+
 # Media information
 'mediawarning'         => "'''Внимание''': Възможно е файлът да �ъдържа злонамерен програмен код, чието изпълнение да доведе до повреди в �и�темата ви.
 <hr />",
@@ -2231,10 +2456,12 @@ $1',
 'show-big-image'       => 'Пълна разделителна �по�обно�т',
 'show-big-image-thumb' => '<small>Размер на предварителни� преглед: $1 × $2 пик�ела</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Галери� на новите файлове',
 'imagelisttext'         => "Спи�ък от {{PLURAL:$1|един файл|'''$1''' файла, �ортирани $2}}.",
 'newimages-summary'     => 'Тази �пециална �траница показва по�ледно качените файлове.',
+'newimages-legend'      => 'Име на файл',
+'newimages-label'       => 'Име на файл (или ча�т от него):',
 'showhidebots'          => '($1 на ботове)',
 'noimages'              => '��ма нищо.',
 'ilsubmit'              => 'Тър�ене',
@@ -2406,12 +2633,24 @@ $1',
 'exif-lightsource-9'   => 'хубаво време',
 'exif-lightsource-10'  => 'облачно',
 'exif-lightsource-11'  => 'С�нка',
+'exif-lightsource-12'  => 'Дневна флуоре�центна (D 5700 – 7100K)',
+'exif-lightsource-13'  => 'Дневна б�ла флуоре�центна (N 4600 – 5400K)',
+'exif-lightsource-14'  => 'Студена б�ла флуоре�центна (W 3900 – 4500K)',
+'exif-lightsource-15'  => 'Б�ла флуоре�центна (WW 3200 – 3700K)',
 'exif-lightsource-17'  => 'Стандартна �ветлина тип A',
 'exif-lightsource-18'  => 'Стандартна �ветлина тип B',
 'exif-lightsource-19'  => 'Стандартна �ветлина тип C',
 'exif-lightsource-24'  => 'Студийна лампа �тандарт ISO',
 'exif-lightsource-255' => 'друг източник на �ветлина',
 
+# Flash modes
+'exif-flash-fired-0'  => 'без �веткавица',
+'exif-flash-fired-1'  => '�ъ� �веткавица',
+'exif-flash-mode-1'   => 'задължително �ъ� �веткавица',
+'exif-flash-mode-2'   => 'задължително без �веткавица',
+'exif-flash-mode-3'   => 'автоматичен режим',
+'exif-flash-redeye-1' => 'Корекци� на ефекта „червени очи“',
+
 'exif-focalplaneresolutionunit-2' => 'инчове',
 
 'exif-sensingmethod-1' => '�еопределено',
@@ -2552,21 +2791,9 @@ $1
 Потвърдете, че наи�тина желаете да �ъздадете �траницата отново.",
 'recreate'            => '�ово �ъздаване',
 
-# HTML dump
-'redirectingto' => 'Прена�очване към [[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'Изчи�тване на �кладираното копие на �траницата?
-
-$1',
 'confirm_purge_button' => 'Добре',
-
-# AJAX search
-'searchcontaining' => "Тър�ене на �татии, �ъдържащи ''$1''.",
-'searchnamed'      => "Тър�ене на �татии, чиито имена �ъдържат ''$1''.",
-'articletitles'    => "Страници, започващи � ''$1''",
-'hideresults'      => 'Скриване на резултатите',
-'useajaxsearch'    => 'Използване на AJAX-тър�ене',
+'confirm-purge-top'    => 'Изчи�тване на �кладираното копие на �траницата?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� предишна �траница',
@@ -2654,11 +2881,11 @@ $1',
 'filepath-submit'  => 'Път',
 'filepath-summary' => 'Тази �пециална �траница връща пълни� път до даден файл. Изображени�та �е показват в пълната им разделителна �по�обно�т, а други типове файлове �е отвар�т направо � приложени�та, � които �а а�оциирани.
 
-Името на файла �е изпи�ва без пред�тавката „{{ns:image}}:“',
+Името на файла �е изпи�ва без пред�тавката „{{ns:file}}:“',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Тър�ене на повтар�щи �е файлове',
-'fileduplicatesearch-summary'  => 'Въведете име на файл (без пред�тавката „{{ns:image}}:“), за да потър�ите повтар�щи го файлове въз о�нова на неговата хеш �тойно�т.',
+'fileduplicatesearch-summary'  => 'Въведете име на файл (без пред�тавката „{{ns:file}}:“), за да потър�ите повтар�щи го файлове въз о�нова на неговата хеш �тойно�т.',
 'fileduplicatesearch-legend'   => 'Тър�ене на повтар�щ �е файл',
 'fileduplicatesearch-filename' => 'Име на файл:',
 'fileduplicatesearch-submit'   => 'Тър�ене',
diff --git a/languages/messages/MessagesBi.php b/languages/messages/MessagesBi.php
index 49d000cb..d3897f83 100644
--- a/languages/messages/MessagesBi.php
+++ b/languages/messages/MessagesBi.php
@@ -63,7 +63,7 @@ $messages = array(
 'qbspecialpages' => 'Ol spesel pej',
 'mypage'         => 'Pej blong mi',
 'mytalk'         => 'Tingting blong mi',
-'and'            => 'mo',
+'and'            => '&#32;mo',
 
 'edit'             => 'Jenisim hem',
 'newpage'          => 'Mekem niu pej',
@@ -89,8 +89,8 @@ $messages = array(
 # Preferences page
 'servertime' => 'Taem blong server',
 
-# Special:ImageList
-'imagelist_name' => 'Nem',
+# Special:ListFiles
+'listfiles_name' => 'Nem',
 
 # Miscellaneous special pages
 'shortpages' => 'Ol smol pej',
@@ -123,7 +123,7 @@ $messages = array(
 'tooltip-n-mainpage' => 'Go long Nambawan Pej',
 'tooltip-minoredit'  => 'Em i stap wan smol jenis',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1 bot)',
 
 # EXIF tags
diff --git a/languages/messages/MessagesBm.php b/languages/messages/MessagesBm.php
index 475b3db1..d5dbafa0 100644
--- a/languages/messages/MessagesBm.php
+++ b/languages/messages/MessagesBm.php
@@ -34,7 +34,7 @@ $messages = array(
 'qbspecialpages' => 'Nyɛw kɛrɛnkɛrɛnnen',
 'mypage'         => "N'ka nyÉ›",
 'mytalk'         => "N'ka baronyÉ›",
-'and'            => 'ani',
+'and'            => '&#32;ani',
 
 'help'           => 'Dɛmɛ',
 'search'         => 'Nyini',
@@ -121,7 +121,7 @@ $messages = array(
 # Attribution
 'others' => 'wɛrɛ',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Nyini',
 
 # Special:SpecialPages
diff --git a/languages/messages/MessagesBn.php b/languages/messages/MessagesBn.php
index b662437f..cfbb742c 100644
--- a/languages/messages/MessagesBn.php
+++ b/languages/messages/MessagesBn.php
@@ -10,17 +10,30 @@
  */
 
 $namespaceNames = array(
-	NS_SPECIAL        => 'বিশেষ',
-	NS_MAIN           => '',
-	NS_TALK           => 'আলাপ',
-	NS_USER           => 'ব�যবহারকারী',
-	NS_USER_TALK      => 'ব�যবহারকারী_আলাপ',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_আলাপ',
-	NS_IMAGE          => 'চিত�র',
-	NS_IMAGE_TALK     => 'চিত�র_আলাপ',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_আলাপ'
+	NS_MEDIA            => 'মিডিয়া',
+	NS_SPECIAL          => 'বিশেষ',
+	NS_TALK             => 'আলাপ',
+	NS_USER             => 'ব�যবহারকারী',
+	NS_USER_TALK        => 'ব�যবহারকারী_আলাপ',
+	NS_PROJECT_TALK     => '$1_আলোচনা',
+	NS_FILE             => 'চিত�র',
+	NS_FILE_TALK        => 'চিত�র_আলোচনা',
+	NS_MEDIAWIKI        => 'মিডিয়াউইকি',
+	NS_MEDIAWIKI_TALK   => 'মিডিয়াউইকি_আলোচনা',
+	NS_TEMPLATE         => 'টেমপ�লেট',
+	NS_TEMPLATE_TALK    => 'টেমপ�লেট_আলোচনা',
+	NS_HELP             => 'সাহায�য',
+	NS_HELP_TALK        => 'সাহায�য_আলোচনা',
+	NS_CATEGORY         => 'বিষয়শ�রেণী',
+	NS_CATEGORY_TALK    => 'বিষয়শ�রেণী_আলোচনা',
 );
+
+$namespaceAliases = array(
+	'$1_আলাপ' => NS_PROJECT_TALK,
+	'চিত�র_আলাপ' => NS_FILE_TALK,
+	'MediaWiki_আলাপ' => NS_FILE_TALK,
+);
+
 $datePreferences = false;
 $digitTransformTable = array(
 	'0' => '০',
@@ -73,6 +86,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'আমার সম�পাদনাগ�লি আমার নজরতালিকায় না দেখানো হোক',
 'tog-watchlisthidebots'       => 'বটের করা সম�পাদনাগ�লি নজরতালিকায় না দেখানো হোক',
 'tog-watchlisthideminor'      => 'অন�ল�লেখ�য সম�পাদনাগ�লো নজর তালিকায় না দেখানো হোক',
+'tog-watchlisthideliu'        => 'নজরতালিকাতে অ�যাকাউন�টে লগ-ইন করা ব�যবহারকারীদের সম�পাদনা আড়ালে রাখা হোক',
+'tog-watchlisthideanons'      => 'নজরতালিকাতে বেনামী ব�যবহারকারীদের সম�পাদনা আড়ালে রাখা হোক',
 'tog-nolangconversion'        => 'বিকল�প র�পান�তর রোধ করো',
 'tog-ccmeonemails'            => 'অন�য ব�যবহারকারীর কাছে আমার পাঠানো ইমেইলের �কটি অন�লিপি আমাকে পাঠানো হোক',
 'tog-diffonly'                => 'পার�থক�যের নিচে পাতার বিষয়বস�ত� না দেখানো হোক',
@@ -82,8 +97,6 @@ $messages = array(
 'underline-never'   => 'কখনো নয়',
 'underline-default' => 'ব�রাউজারে যেমনভাবে নির�দিষ�ট করা আছে',
 
-'skinpreview' => '(প�রাকদর�শন)',
-
 # Dates
 'sunday'        => 'রবিবার',
 'monday'        => 'সোমবার',
@@ -174,7 +187,7 @@ $messages = array(
 'mytalk'         => 'আমার আলাপ',
 'anontalk'       => '�ই বেনামী ব�যবহারকারীর আলাপের পাতা',
 'navigation'     => 'পরিভ�রমণ',
-'and'            => '�বং',
+'and'            => '&#32;�বং',
 
 # Metadata in edit box
 'metadata_help' => 'অধিউপাত�ত (metadata):',
@@ -237,8 +250,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} বৃত�তান�ত',
 'aboutpage'            => 'Project:বৃত�তান�ত',
-'bugreports'           => 'ত�র�টি বিবরণী',
-'bugreportspage'       => 'Project:ত�র�টি বিবরণী',
 'copyright'            => '$1 �র আওতায় প�রাপ�য।',
 'copyrightpagename'    => '{{SITENAME}} কপিরাইট',
 'copyrightpage'        => '{{ns:project}}:কপিরাইটসমূহ',
@@ -261,9 +272,7 @@ $messages = array(
 
 'badaccess'        => 'অন�মোদন ত�র�টি',
 'badaccess-group0' => 'আপনি যে কাজের জন�য অন�রোধ করেছেন, যে কাজটি সম�পন�ন করার অন�মতি নাই',
-'badaccess-group1' => 'আপনার অন�রোধকৃত কাজের করার অন�মতি শ�ধ� $1 গ�র�পের ব�যবহারকারীদেরই আছে।',
-'badaccess-group2' => 'আপনি যে কাজটি করতে চাচ�ছেন তা কেবল $1 দলের �কজন ব�যবহারকারী করতে পারেন।',
-'badaccess-groups' => 'আপনি যে কাজটি করতে চাচ�ছেন তা কেবল $1 দলের �কজন ব�যবহারকারী করতে পারেন।',
+'badaccess-groups' => 'আপনি যে কাজটি করতে চাচ�ছেন তা কেবল {{PLURAL:$2|�ই দলের|�ই দলগ�লির যেকোন �কটির}} �কজন সদস�য ব�যবহারকারী সম�পাদন করতে পারেন: $1।',
 
 'versionrequired'     => 'মিডিয়াউইকির $1 সংস�করণ প�রয়োজন',
 'versionrequiredtext' => '�ই পাতাটি ব�যবহার করার জন�য মিডিয়াউইকির $1 নং সংস�করণ প�রয়োজন। [[Special:Version|সংস�করণ পাতা]] দেখ�ন।',
@@ -277,6 +286,8 @@ $messages = array(
 'editsection'             => 'সম�পাদনা',
 'editold'                 => 'সম�পাদনা কর�ন',
 'viewsourceold'           => 'উৎস দেখাও',
+'editlink'                => 'সম�পাদনা',
+'viewsourcelink'          => 'সোর�স দেখ�ন',
 'editsectionhint'         => 'পরিচ�ছেদ সম�পাদনা: $1',
 'toc'                     => 'পরিচ�ছেদসমূহ',
 'showtoc'                 => 'দেখাও',
@@ -353,7 +364,6 @@ $1',
 'cannotdelete'         => '�ই পাতা বা ফাইলটি মোছা সম�ভব হল না। (সম�ভবতঃ অন�য কেউ আগেই �টিকে ম�ছে ফেলেছে)',
 'badtitle'             => 'শিরোনামটি গ�রহনযোগ�য নয়।',
 'badtitletext'         => 'অন�রোধকৃত পাতার শিরোনামটি অবৈধ, খালি কিংবা কোন ভ�ল আন�তঃভাষা বা আন�তঃউইকি শিরোনাম সংযোগ ছিল। �টিতে সম�ভবত �মন �ক (�কাধিক) ক�যারেক�টার আছে, যা (যেগ�লি) শিরোনামে ব�যবহারযোগ�য নয়।',
-'perfdisabled'         => 'দ�ঃখিত! �ই ফিচারটি সাময়িকভাবে নিষ�ক�রিয় করা হয়েছে, কারণ �টি ডাটাবেজকে �ত ধীর করে দেয় যে কেউ উইকি ব�যবহার করতে পারেন না।',
 'perfcached'           => 'নিচের উপাত�তগ�লো ক�যাশ থেকে নেয়া �বং সম�পূর�ণ হালনাগাদকৃত না-ও হতে পারে:',
 'perfcachedts'         => 'নিচের উপাত�তগ�লো ক�যাশ থেকে নেয়া �বং $1 তারিখে হালনাগাদ করা হয়েছে।',
 'querypage-no-updates' => '�ই পাতার জন�য হালনাগাদ নিষ�ক�রিয় করা হয়েছে। �খানে রাখা উপাত�ত � ম�হূর�তে রিফ�রেশ করা হবে না।',
@@ -367,7 +377,7 @@ $1',
 'protectedpagetext'    => 'সম�পাদনা �ড়াতে � পাতাটির ব�যবহার নিয়ন�ত�রণ করা হয়েছে।',
 'viewsourcetext'       => '� পাতাটি আপনি দেখতে �বং উৎসের অন�লিপি নিতে পারবেন:',
 'protectedinterface'   => '�ই পাতার বিষয়বস�ত� উইকি সফটওয়�যারের �কটি ইন�টারফেস বার�তা প�রদান করে, তাই �টিকে স�রক�ষিত করে রাখা হয়েছে।',
-'editinginterface'     => "'''সতর�কীকরণ:''' আপনি �মন �কটি পাতা সম�পাদনা করছেন যা সফটওয়�যারের জন�য ইন�টারফেস টেক�সট প�রদান করে। �ই পাতাতে সংঘটিত পরিবর�তন ব�যবহারকারী ইন�টারফেসে প�রভাব ফেলবে, যা অন�য ব�যবহারকারীরা দেখতে পাবেন। অন�বাদের জন�য অন�গ�রহ করে [http://translatewiki.net/wiki/Main_Page?setlang=bn Betawiki] ব�যবহার করার ব�যাপারটি বিবেচনা কর�ন। �টি মিডিয়াউইকি স�থানীয়করণ প�রকল�প।",
+'editinginterface'     => "'''সতর�কীকরণ:''' আপনি �মন �কটি পাতা সম�পাদনা করছেন যা সফটওয়�যারের জন�য ইন�টারফেস টেক�সট প�রদান করে। �ই পাতাতে সংঘটিত পরিবর�তন ব�যবহারকারী ইন�টারফেসে প�রভাব ফেলবে, যা অন�য ব�যবহারকারীরা দেখতে পাবেন। অন�বাদের জন�য অন�গ�রহ করে [http://translatewiki.net/wiki/Main_Page?setlang=bn translatewiki.net] ব�যবহার করার ব�যাপারটি বিবেচনা কর�ন। �টি মিডিয়াউইকি স�থানীয়করণ প�রকল�প।",
 'sqlhidden'            => '(�স কিউ �ল কোয়েরি ল�কানো আছে)',
 'cascadeprotected'     => '�ই পাতাটি সম�পাদনা থেকে স�রক�ষিত, কারণ পাতাটি নিচের {{PLURAL:$1|টি পাতার|টি পাতার}} অন�তর�গত, যে পাতা(গ�লি) "প�রপাতাকার" (cascading) বৈশিষ�ট�য সহযোগে স�রক�ষিত করা হয়েছে:
 $2',
@@ -381,9 +391,9 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'ব�যবহারকারীর প�রস�থান (logout)',
-'logouttext'                 => '<strong>আপনি �ইমাত�র আপনার �কাউন�ট থেকে প�রস�থান করেছেন।</strong>
+'logouttext'                 => "'''আপনি �ইমাত�র আপনার �কাউন�ট থেকে প�রস�থান করেছেন।'''
 � পরিস�থিতিতে আপনি বেনামে {{SITENAME}} ব�যবহার করতে পারেন, কিংবা �কই বা পৃথক নামে [[Special:UserLogin|আবার প�রবেশ করতে]] পারেন। 
-লক�ষ�য কর�ন যে, �র কোন কোন পাতা �খনও �মনভাবে দেখাতে পারে যাতে মনে হবে আপনি আগের অবস�থাতেই আছেন। �ক�ষেত�রে আপনাকে আপনার ব�রাওজারের ক�যাশ পরিষ�কার (clear browser cache) করে নিতে হবে।',
+লক�ষ�য কর�ন যে, �র কোন কোন পাতা �খনও �মনভাবে দেখাতে পারে যাতে মনে হবে আপনি আগের অবস�থাতেই আছেন। �ক�ষেত�রে আপনাকে আপনার ব�রাওজারের ক�যাশ পরিষ�কার (clear browser cache) করে নিতে হবে।",
 'welcomecreation'            => '== স�বাগতম $1! ==
 আপনার অ�যাকাউন�ট তৈরী হয়েছে।
 আপনার [[Special:Preferences|{{SITENAME}} পছন�দসমূহ]]  স�থির করে নিতে ভ�লবেন না কিন�ত�।',
@@ -394,7 +404,6 @@ $2',
 'remembermypassword'         => 'আমাকে পরবর�তীতে মনে রাখা হোক',
 'yourdomainname'             => 'আপনার ডোমেইন',
 'externaldberror'            => 'হয় কোন বহিঃস�থ যাচাইকরণ ডাটাবেজ ত�র�টি ঘটেছে অথবা আপনার বহিঃস�থ অ�যাকাউন�ট হালনাগাদ করার অন�মতি নেই।',
-'loginproblem'               => '<b>আপনার লগ�‌-ইন করতে সমস�যা হচ�ছে।</b><br />আবার চেষ�টা কর�ন!',
 'login'                      => 'প�রবেশ কর�ন',
 'nav-login-createaccount'    => 'প�রবেশ/নত�ন অ�যাকাউন�ট',
 'loginprompt'                => '{{SITENAME}}-তে সংয�ক�ত হতে চাইলে আপনার ব�রাওজারের ক�কি (cookies) অবশ�যই সক�রিয় (enabled) করতে হবে|',
@@ -450,7 +459,7 @@ $2',
 'blocked-mailpassword'       => 'আপনার আইপি ঠিকানাটি থেকে সম�পাদনা করতে বাধা আছে, তাই �ই ঠিকানার অপব�যবহার করে শব�দচাবি ফেরত আনতে দেয়া যাবে না।',
 'eauthentsent'               => 'মনোনীত ই-মেইল ঠিকানায় �কটি নিশ�চিতকরণ ই-মেইল পাঠানো হয়েছে।
 অ�যাকাউন�টটিতে অন�য যে কোন ই-মেইল পাঠানোর আগে আপনাকে �ই ই-মেইলের নির�দেশগ�লি অন�সরণ করতে হবে, যাতে অ�যাকাউন�টটি যে আসলেই আপনার, তা নিশ�চিত হয়।',
-'throttled-mailpassword'     => 'বিগত {{PLURAL:$1|ঘন�টার|$1 ঘন�টার}} মধ�যে ইতিমধ�যেই �কবার শব�দচাবি বদলের তথ�য পাঠানো হয়েছে। অপব�যবহার রোধে প�রতি {PLURAL:$1|ঘন�টায়|$1 ঘন�টায়}} কেবল �কবার শব�দচাবি বদলের তথ�য পাঠানো যাবে।',
+'throttled-mailpassword'     => 'বিগত {{PLURAL:$1|ঘন�টার|$1 ঘন�টার}} মধ�যে ইতিমধ�যেই �কবার শব�দচাবি বদলের তথ�য পাঠানো হয়েছে। অপব�যবহার রোধে প�রতি {{PLURAL:$1|ঘন�টায়|$1 ঘন�টায়}} কেবল �কবার শব�দচাবি বদলের তথ�য পাঠানো যাবে।',
 'mailerror'                  => 'ইমেইল পাঠাতে সমস�যা: $1',
 'acct_creation_throttle_hit' => 'দ�ঃখিত, আপনি ইতিমধ�যে $1টি অ�যাকাউন�ট তৈরী করেছেন৷ �র বেশী আপনি তৈরী করতে পারবেন না৷',
 'emailauthenticated'         => 'আপনার ই-মেইল ঠিকানাটি $1 তারিখে নিশ�চিত করা হয়েছে।',
@@ -471,11 +480,13 @@ $2',
 'resetpass_announce'      => 'আপন ই-মেইলকৃত সংকেত দ�বারা লগ-ইন আছেন। লগ-ইন পদ�ধতি সম�পূর�ণ করতে আপনাকে অবশ�যই �কটি নত�ন শব�দচাবি গ�রহণ করতে হবে:',
 'resetpass_text'          => '<!-- �খানে লেখা যোগ কর�ন -->',
 'resetpass_header'        => 'শব�দচাবি পরিবর�তন করো',
+'oldpassword'             => 'প�রনো শব�দচাবি',
+'newpassword'             => 'নত�ন শব�দচাবি:',
+'retypenew'               => 'নত�ন শব�দচাবি আবার টাইপ কর�ন:',
 'resetpass_submit'        => 'শব�দচাবি দাও �বং লগ�‌-ইন করো',
 'resetpass_success'       => 'আপনার শব�দচাবি সাফল�যের সাথে পরিবর�তীত হয়েছে! �খন আপনি তে লগ-ইন হচ�ছেন...',
 'resetpass_bad_temporary' => 'অস�থায়ী শব�দচাবিটি ভ�ল। আপনি হয়তো ইতিমধ�যে সফলভাবে শব�দচাবি পরিবর�তন করেছেন অথবা নত�ন অস�থায়ী শব�দচাবির জন�য অন�রোধ করেছেন।',
 'resetpass_forbidden'     => 'শব�দচাবি পরিবর�তন করা সম�ভব নয়',
-'resetpass_missing'       => 'কোন ফর�ম উপাত�ত নেই।',
 
 # Edit page toolbar
 'bold_sample'     => 'গাঢ় লেখা',
@@ -498,8 +509,8 @@ $2',
 'hr_tip'          => 'অন�ভূমিক রেখা (কৃচ�ছ�রতার সাথে ব�যবহার কর�ন)',
 
 # Edit pages
-'summary'                   => 'সম�পাদনা সারাংশ',
-'subject'                   => 'বিষয়/শিরোনাম',
+'summary'                   => 'সম�পাদনা সারাংশ:',
+'subject'                   => 'বিষয়/শিরোনাম:',
 'minoredit'                 => 'অন�ল�লেখ�য',
 'watchthis'                 => 'নজরে রাখ�ন',
 'savearticle'               => 'সংরক�ষণ',
@@ -511,8 +522,8 @@ $2',
 'missingsummary'            => "'''খেয়াল কর�ন''':  আপনি কিন�ত� সম�পাদনার সারাংশ দেননি। আবার যদি \"সংরক�ষণ\" বোতামে ক�লিক করেন, তাহলে � সারাংশ বাক�যটি ছাড়াই আপনার সম�পাদনা সংরক�ষিত হবে।",
 'missingcommenttext'        => 'দয়াকরে নিচে মন�তব�য যোগ কর�ন।',
 'missingcommentheader'      => "'''মনে রাখবেন:''' আপনি �ই মন�তব�যের জন�য কোন বিষয়/শিরোনাম দেননি। আপনি যদি সংরক�ষণ বোতাম ক�লিক করেন, তাহলে আপনার সম�পাদনা কোন বিষয়/শিরোনাম ছাড়াই সংরক�ষিত হবে।",
-'summary-preview'           => 'সারাংশ প�রাকদর�শন',
-'subject-preview'           => 'বিষয়/শিরোনাম প�রাকদর�শন',
+'summary-preview'           => 'সারাংশ প�রাকদর�শন:',
+'subject-preview'           => 'বিষয়/শিরোনাম প�রাকদর�শন:',
 'blockedtitle'              => 'ব�যবহারকারীকে বাধা দেয়া হয়েছে',
 'blockedtext'               => "আপনার ব�যবহারকারী নাম বা আইপি ঠিকানার ঊপর নিষেধাজ�ঞা আরোপিত হয়েছে।
 
@@ -567,22 +578,22 @@ $1 নিষেধাজà§�ঞা আরোপ করেছেন। নিষà§
 '''কংকারার:''' কেবল ''রিলোড'' ক�লিক করলেই বা ''F5'' চাপলেই চলবে; 
 '''অপেরা:''' ''Tools→Preferences''-� গিয়ে ক�যাশ পরিষ�কার করে নিন;
 '''ইন�টারনেট �ক�সপ�লোরার:''' ''কন�ট�রোল'' চেপে ধরে ''রিফ�রেশ''-� ক�লিক কর�ন, কিংবা ''কন�ট�রোল-F5'' চাপ�ন।",
-'usercssjsyoucanpreview'    => '<strong>অণ�সহায়িকা:</strong> "প�রাকদর�শন" বোতাম ব�যবহার করে আপনার নত�ন সি�স�স/জাভাস�ক�রিপ�ট সংরক�ষণের আগে পরীক�ষা করে দেখ�ন।',
+'usercssjsyoucanpreview'    => "'''অণ�সহায়িকা:''' \"প�রাকদর�শন\" বোতাম ব�যবহার করে আপনার নত�ন সি�স�স/জাভাস�ক�রিপ�ট সংরক�ষণের আগে পরীক�ষা করে দেখ�ন।",
 'usercsspreview'            => "'''মনে রাখবেন আপনি আপনার জন�য বরাদ�ধকৃত সি�স�স প�রাকদর�শন করছেন।
 �টা �খনও সংরক�ষণ করা হয়নি!'''",
 'userjspreview'             => "'''মনে রাখ�ন আপনি আপনার ব�যবহারকারী জাভাস�ক�রিপ�ট কেবলমাত�র পরীক�ষা/প�রাকদর�শন করছেন। �টা �খনও সংরক�ষণ করা হয়নি!'''",
 'userinvalidcssjstitle'     => "'''সতর�কীকরণ:''' \"\$1\" নামে কোন আবরণ নেই। মনে রাখবেন, পছন�দমাফিক .css �বং .js পাতাগ�লি ছোট হাতের শিরোনাম ব�যবহার করে, যেমন {{ns:user}}:Foo/monobook.css; কিন�ত� �রকম শিরোনাম নয়: {{ns:user}}:Foo/Monobook.css",
 'updated'                   => '(হালনাগাদ)',
-'note'                      => '<strong>নোট:</strong>',
-'previewnote'               => '<strong>�টি প�রাকদর�শন মাত�র। কোনো পরিবর�তন �খনও সংরক�ষণ করা হয়নি!</strong>',
+'note'                      => "'''নোট:'''",
+'previewnote'               => "'''�টি প�রাকদর�শন মাত�র। কোনো পরিবর�তন �খনও সংরক�ষণ করা হয়নি!'''",
 'previewconflict'           => '�ই প�রাকদর�শনটি সম�পাদনা ক�ষেত�রের উপরের অংশটির টেক�সট সংরক�ষণ করলে যেরকম দেখাবে, তা দেখাচ�ছে।',
-'session_fail_preview'      => '<strong>দ�ঃখিত! সেশন ডাটা হারিয়ে যাওয়ার কারণে আপনার সম�পাদনাটি সংরক�ষণ করা সম�ভব হয়নি। দয়া করে লেখাটি আবার জমা দেয়ার চেষ�টা কর�ন। যদি �তেও কাজ না হয়, তবে অ�যাকাউন�ট থেকে বেরিয়ে গিয়ে আবার অ�যাকাউন�টে প�রবেশ করে চেষ�টা কর�ন।</strong>',
-'session_fail_preview_html' => "<strong>দ�ঃখিত! সেশন উপাত�ত হারিয়ে যাওয়ার কারণে আমরা আপনার সম�পাদনাটি প�রক�রিয়া করতে পারিনি।</strong>
+'session_fail_preview'      => "'''দ�ঃখিত! সেশন ডাটা হারিয়ে যাওয়ার কারণে আপনার সম�পাদনাটি সংরক�ষণ করা সম�ভব হয়নি। দয়া করে লেখাটি আবার জমা দেয়ার চেষ�টা কর�ন। যদি �তেও কাজ না হয়, তবে অ�যাকাউন�ট থেকে বেরিয়ে গিয়ে আবার অ�যাকাউন�টে প�রবেশ করে চেষ�টা কর�ন।'''",
+'session_fail_preview_html' => "'''দ�ঃখিত! সেশন উপাত�ত হারিয়ে যাওয়ার কারণে আমরা আপনার সম�পাদনাটি প�রক�রিয়া করতে পারিনি।'''
 
 ''{{SITENAME}}-� raw HTML সক�রিয় আছে বলে জাভাস�ক�রিপ�টভিত�তিক আক�রমণ থেকে প�রতিরক�ষার জন�য প�রাকদর�শনটি দেখানো হচ�ছে না।''
 
-<strong>যদি �টি সম�পাদনার �কটি বৈধ প�রচেষ�টা হয়, তবে অন�গ�রহ করে আবার চেষ�টা কর�ন। যদি তারপরেও কাজ না হয়, তবে অ�যাকাউন�ট থেকে বেরিয়ে গিয়ে আবার প�রবেশ করে চেষ�টা কর�ন।</strong>",
-'token_suffix_mismatch'     => '<strong>আপনার সম�পাদনাটি প�রত�যাখ�যান করা হয়েছে, কারণ আপনার ক�লায়েন�ট প�রোগ�রামটি সম�পাদনা টেক�সটের বিরামচিহ�নগ�লি গ�লিয়ে ফেলেছে। পাতাটির টেক�সটে যাতে ক�ষতি না হয় সেজন�য সম�পাদনাটি প�রত�যাখ�যান করা হয়েছে। আপনি কোন ত�র�টিপূর�ণ ওয়েব-ভিত�তিক বেনামী প�রক�সি সেবা ব�যবহার করলে �রকম হতে পারে।</strong>',
+'''যদি �টি সম�পাদনার �কটি বৈধ প�রচেষ�টা হয়, তবে অন�গ�রহ করে আবার চেষ�টা কর�ন। যদি তারপরেও কাজ না হয়, তবে অ�যাকাউন�ট থেকে বেরিয়ে গিয়ে আবার প�রবেশ করে চেষ�টা কর�ন।'''",
+'token_suffix_mismatch'     => "'''আপনার সম�পাদনাটি প�রত�যাখ�যান করা হয়েছে, কারণ আপনার ক�লায়েন�ট প�রোগ�রামটি সম�পাদনা টেক�সটের বিরামচিহ�নগ�লি গ�লিয়ে ফেলেছে। পাতাটির টেক�সটে যাতে ক�ষতি না হয় সেজন�য সম�পাদনাটি প�রত�যাখ�যান করা হয়েছে। আপনি কোন ত�র�টিপূর�ণ ওয়েব-ভিত�তিক বেনামী প�রক�সি সেবা ব�যবহার করলে �রকম হতে পারে।'''",
 'editing'                   => 'সম�পাদনা করছেন: $1',
 'editingsection'            => 'সম�পাদনা করছেন $1 (অন�চ�ছেদ)',
 'editingcomment'            => 'সম�পাদনা করছেন $1 (মন�তব�য)',
@@ -594,22 +605,22 @@ $1 নিষেধাজà§�ঞা আরোপ করেছেন। নিষà§
 আপনি \"সংরক�ষণ\" চাপলে '''শ�ধ�মাত�র''' টেক�সট �লাকার উপরের অংশটি সংরক�ষিত হবে।",
 'yourtext'                  => 'আপনার লেখা বিষয়বস�ত�',
 'storedversion'             => 'সংরক�ষিত সংস�করণ',
-'nonunicodebrowser'         => '<strong>সতর�কীকরণ: আপনার ব�রাউজার ইউনিকোড-বন�ধ�ভাবাপন�ন নয়। আপনি যাতে বিপদ ছাড়াই পাতা সম�পাদনা করতে পারেন, সে জন�য সমাধান আছে: অ-আস�কি ক�যারেক�টারগ�লি হেক�সাডেসিমাল কোড হিসেবে দেখানো হবে।</strong>',
-'editingold'                => '<strong>সতর�কীকরণ: আপনি �ই পাতাটির �কটি প�রনো সংস�করণ সম�পাদনা করছেন।
-যদি আপনি �টি সংরক�ষণ করেন, তবে � সংস�করণের পরবর�তী অন�য সব সংশোধন হারিয়ে যাবে।</strong>',
+'nonunicodebrowser'         => "'''সতর�কীকরণ: আপনার ব�রাউজার ইউনিকোড-বন�ধ�ভাবাপন�ন নয়। আপনি যাতে বিপদ ছাড়াই পাতা সম�পাদনা করতে পারেন, সে জন�য সমাধান আছে: অ-আস�কি ক�যারেক�টারগ�লি হেক�সাডেসিমাল কোড হিসেবে দেখানো হবে।'''",
+'editingold'                => "'''সতর�কীকরণ: আপনি �ই পাতাটির �কটি প�রনো সংস�করণ সম�পাদনা করছেন।
+যদি আপনি �টি সংরক�ষণ করেন, তবে � সংস�করণের পরবর�তী অন�য সব সংশোধন হারিয়ে যাবে।'''",
 'yourdiff'                  => 'পার�থক�য',
-'copyrightwarning'          => 'অন�গ�রহ করে লক�ষ�য কর�ন {{SITENAME}}-তে সমস�ত অবদান $2-�র আওতায় প�রাপ�য (বিস�তারিত $1-তে দেখ�ন)। আপনার জমা দেয়া লেখা যে কেউ হৃদয়হীনভাবে সম�পাদনা করতে �বং যথেচ�ছভাবে প�নর�বিতরণ করতে পারেন। আপনি যদি � ব�যাপারে �কমত না হন, তাহলে �খানে আপনার লেখা জমা দেবেন না।<br />
+'copyrightwarning'          => "অন�গ�রহ করে লক�ষ�য কর�ন {{SITENAME}}-তে সমস�ত অবদান $2-�র আওতায় প�রাপ�য (বিস�তারিত $1-তে দেখ�ন)। আপনার জমা দেয়া লেখা যে কেউ হৃদয়হীনভাবে সম�পাদনা করতে �বং যথেচ�ছভাবে প�নর�বিতরণ করতে পারেন। আপনি যদি � ব�যাপারে �কমত না হন, তাহলে �খানে আপনার লেখা জমা দেবেন না।<br />
 আপনি আরো প�রতিজ�ঞা করছেন যে, �ই লেখাগ�লো আপনি নিজে লিখেছেন, বা সাধারণের ব�যবহারের জন�য উন�ম�ক�ত কোন উৎস থেকে সংগ�রহ করেছেন।
-<strong>স�বত�ব সংরক�ষিত কোন লেখা স�বত�বাধিকারীর অন�মতি ছাড়া �খানে জমা দেবেন না!</strong>',
-'copyrightwarning2'         => 'দয়া করে লক�ষ�য কর�ন: {{SITENAME}}-�র �ই ভ�ক�তিতে আপনার লেখা বা অবদান অন�যান�য ব�যবহারকারীরা পরিবর�তন বা পরিবর�ধন করতে, �মনকি ম�ছে ফেলতে পারবেন। {{SITENAME}} � আপনার সকল লেখালেখি/অবদান গন� ফ�রি ডক�মেন�টেশনের ($1) আওতায় বিনামূল�যে প�রাপ�য ও হস�তান�তরযোগ�য। আপনার জমা দেয়া লেখা যে কেউ হৃদয়হীনভাবে সম�পাদনা করতে �বং যথেচ�ছভাবে ব�যবহার করতে পারেন। আপনি যদি � ব�যাপারে �কমত না হন, তাহলে �খানে আপনার লেখা জমা দেবেন না। আপনি আরো প�রতিজ�ঞা করছেন যে, �ই লেখাগ�লো আপনি নিজে লিখেছেন (তবে কোন মৌলিক গবেষণা নয়) বা সাধারণের ব�যবহারের জন�য উন�ম�ক�ত কোন উৎস থেকে সংগ�রহ করেছেন। <strong>স�বত�ব সংরক�ষিত কোন লেখা স�বত�বাধিকারীর অন�মতি ছাড়া �খানে জমা দেবেন না।</strong>',
-'longpagewarning'           => '<strong>সতর�কীকরণ: �ই পাতাটি $1 কিলোবাইট দীর�ঘ; কিছ� ব�রাউজারে ৩২ কিলোবাইটের চেয়ে দীর�ঘ পাতা সম�পাদনা করতে সমস�যা হতে পারে।
-অন�গ�রহ করে পাতাটিকে �কাধিক ক�ষ�দ�রতর অংশে ভাগ করার চেষ�টা কর�ন।</strong>',
-'longpageerror'             => '<strong>ত�র�টি: আপনার জমা দেয়া টেক�সটের পরিমাণ $1 কিলোবাইট, যা সর�বোচ�চ সীমা $2 কিলোবাইটের চেয়ে বেশি। �টি সংরক�ষণ করা সম�ভব নয়।</strong>',
-'readonlywarning'           => '<strong>সতর�কীকরণ: রক�ষণাবেক�ষণের জন�য ডাটাবেজ বন�ধ রাখা হয়েছে, তাই আপনি আপনার সম�পাদনাগ�লি �ই ম�হূর�তে সংরক�ষণ করতে পারবেন না। আপনি ইচ�ছা করলে টেক�সটটি কাট-অ�যান�ড-পেস�ট করে কোন টেক�সট ফাইলে ভবিষ�যতের জন�য সংরক�ষণ করে রাখতে পারেন।</strong>',
-'protectedpagewarning'      => '<strong>সতর�কীকরণ: �ই পাতাটি বন�ধ করা হয়েছে; কেবলমাত�র প�রশাসক মর�যাদার ব�যবহারকারীরাই �টি সম�পাদনা করতে পারবেন।</strong>',
+'''স�বত�ব সংরক�ষিত কোন লেখা স�বত�বাধিকারীর অন�মতি ছাড়া �খানে জমা দেবেন না!'''",
+'copyrightwarning2'         => "দয়া করে লক�ষ�য কর�ন: {{SITENAME}}-�র �ই ভ�ক�তিতে আপনার লেখা বা অবদান অন�যান�য ব�যবহারকারীরা পরিবর�তন বা পরিবর�ধন করতে, �মনকি ম�ছে ফেলতে পারবেন। {{SITENAME}} � আপনার সকল লেখালেখি/অবদান গন� ফ�রি ডক�মেন�টেশনের ($1) আওতায় বিনামূল�যে প�রাপ�য ও হস�তান�তরযোগ�য। আপনার জমা দেয়া লেখা যে কেউ হৃদয়হীনভাবে সম�পাদনা করতে �বং যথেচ�ছভাবে ব�যবহার করতে পারেন। আপনি যদি � ব�যাপারে �কমত না হন, তাহলে �খানে আপনার লেখা জমা দেবেন না। আপনি আরো প�রতিজ�ঞা করছেন যে, �ই লেখাগ�লো আপনি নিজে লিখেছেন (তবে কোন মৌলিক গবেষণা নয়) বা সাধারণের ব�যবহারের জন�য উন�ম�ক�ত কোন উৎস থেকে সংগ�রহ করেছেন। '''স�বত�ব সংরক�ষিত কোন লেখা স�বত�বাধিকারীর অন�মতি ছাড়া �খানে জমা দেবেন না।'''",
+'longpagewarning'           => "'''সতর�কীকরণ: �ই পাতাটি $1 কিলোবাইট দীর�ঘ; কিছ� ব�রাউজারে ৩২ কিলোবাইটের চেয়ে দীর�ঘ পাতা সম�পাদনা করতে সমস�যা হতে পারে।
+অন�গ�রহ করে পাতাটিকে �কাধিক ক�ষ�দ�রতর অংশে ভাগ করার চেষ�টা কর�ন।'''",
+'longpageerror'             => "'''ত�র�টি: আপনার জমা দেয়া টেক�সটের পরিমাণ $1 কিলোবাইট, যা সর�বোচ�চ সীমা $2 কিলোবাইটের চেয়ে বেশি। �টি সংরক�ষণ করা সম�ভব নয়।'''",
+'readonlywarning'           => "'''সতর�কীকরণ: রক�ষণাবেক�ষণের জন�য ডাটাবেজ বন�ধ রাখা হয়েছে, তাই আপনি আপনার সম�পাদনাগ�লি �ই ম�হূর�তে সংরক�ষণ করতে পারবেন না। আপনি ইচ�ছা করলে টেক�সটটি কাট-অ�যান�ড-পেস�ট করে কোন টেক�সট ফাইলে ভবিষ�যতের জন�য সংরক�ষণ করে রাখতে পারেন।'''",
+'protectedpagewarning'      => "'''সতর�কীকরণ: �ই পাতাটি বন�ধ করা হয়েছে; কেবলমাত�র প�রশাসক মর�যাদার ব�যবহারকারীরাই �টি সম�পাদনা করতে পারবেন।'''",
 'semiprotectedpagewarning'  => "'''নোট:''' �ই পাতাটির ব�যবহার নিয়ন�ত�রণ করা হয়েছে তাই নিবন�ধনকৃত ব�যবহারকারী �টি সম�পাদনা করতে পারবেন।",
 'cascadeprotectedwarning'   => "'''সতর�কীকরণ:''' �ই পাতাটি বন�ধ করা হয়েছে, যাতে কেবল প�রশাসকের ক�ষমতাবিশিষ�ট ব�যবহারকারীরা �টি সম�পাদনা করতে পারেন, কারণ �ই পাতাটি নিচের প�রপাতাকারে স�রক�ষিত (cascade-protected) {{PLURAL:$1|টি পাতায়|টি পাতায়}} অন�তর�ভ�ক�ত আছে:",
-'titleprotectedwarning'     => '<strong>সতর�কীকরণ: �ই পাতাটি বন�ধ করা আছে, যাতে কেবলমাত�র কিছ� ব�যবহারকারী �টি সৃষ�টি করতে পারেন।</strong>',
+'titleprotectedwarning'     => "'''সতর�কীকরণ: �ই পাতাটি বন�ধ করা আছে, যাতে কেবলমাত�র কিছ� ব�যবহারকারী �টি সৃষ�টি করতে পারেন।'''",
 'templatesused'             => '�ই পাতায় ব�যবহৃত টেম�পলেট:',
 'templatesusedpreview'      => '�ই প�রাকদর�শনে ব�যবহৃত টেম�পলেটসমূহ:',
 'templatesusedsection'      => '�ই অন�চ�ছেদে ব�যবহৃত টেম�পলেটসমূহ:',
@@ -625,6 +636,10 @@ $1 নিষেধাজà§�ঞা আরোপ করেছেন। নিষà§
 
 আপনি পাতাটি আর সম�পাদনা করবেন কি না বিবেচনা করে দেখ�ন।
 আপনার স�বিধার�থে পাতাটির অবল�প�তি লগ �খানে দেয়া হল:",
+'deletelog-fulllog'         => 'সম�পূর�ণ লগ দেখ�ন',
+'edit-conflict'             => 'সম�পাদনা সংঘাত।',
+'edit-already-exists'       => 'নত�ন পাতা সৃষ�টি করা যায়নি।
+পাতাটি ইতিমধ�যেই বিদ�যমান।',
 
 # "Undo" feature
 'undo-success' => 'সম�পাদনাটি বাতিল করা যাবে। অন�গ�রহ করে নিচের ত�লনাটি পরীক�ষা করে দেখ�ন ও নিশ�চিত কর�ন যে �টাই আপনি করতে চান, �বং তারপর নিচের সম�পাদনাগ�লি সংরক�ষণ করে সম�পাদনাটির বাতিল প�রক�রিয়া সমাপ�ত কর�ন।',
@@ -638,28 +653,27 @@ $1 নিষেধাজà§�ঞা আরোপ করেছেন। নিষà§
 $3-�র দেয়া কারণ হল ''$2''",
 
 # History pages
-'viewpagelogs'        => '�ই পাতার জন�য লগ�‌গ�লো দেখ�ন',
-'nohistory'           => '�ই পাতার কোন সম�পাদনার ইতিহাস নাই।',
-'revnotfound'         => 'সংশোধন খ�জে পাওয়া যাচ�ছে না',
-'revnotfoundtext'     => 'আপনির পাতাটির যে প�রনো সংস�করণটি অন�রোধ করেছেন, তা খ��জে পাওয়া যায়নি। পাতাটিতে যাবার জন�য আপনি যে URL-টি ব�যবহার করেছিলেন, অন�গ�রহ করে সেটি পরীক�ষা করে দেখ�ন।',
-'currentrev'          => 'বর�তমান সংশোধন',
-'revisionasof'        => '$1 তারিখের সংশোধন',
-'revision-info'       => '$1-� $2-�র করা সংশোধন',
-'previousrevision'    => '�প�র�বের সংস�করণ',
-'nextrevision'        => 'পরবর�তী সংস�করণ→',
-'currentrevisionlink' => 'বর�তমান সংশোধন',
-'cur'                 => 'বর�তমান',
-'next'                => 'পরবর�তী',
-'last'                => 'পূর�ববর�তী',
-'page_first'          => 'প�রথম',
-'page_last'           => 'শেষ',
-'histlegend'          => 'পার�থক�য (Diff) নির�বাচন: যে সংস�করণগ�লো ত�লনা করতে চান, সেগ�লো চিহ�নিত করে �ন�টার বা নিচের বোতামটি টিপ�ন।<br />
+'viewpagelogs'           => '�ই পাতার জন�য লগ�‌গ�লো দেখ�ন',
+'nohistory'              => '�ই পাতার কোন সম�পাদনার ইতিহাস নাই।',
+'currentrev'             => 'বর�তমান সংশোধন',
+'revisionasof'           => '$1 তারিখের সংশোধন',
+'revision-info'          => '$1-� $2-�র করা সংশোধন', # Additionally available: $3: revision id
+'previousrevision'       => '�প�র�বের সংস�করণ',
+'nextrevision'           => 'পরবর�তী সংস�করণ→',
+'currentrevisionlink'    => 'বর�তমান সংশোধন',
+'cur'                    => 'বর�তমান',
+'next'                   => 'পরবর�তী',
+'last'                   => 'পূর�ববর�তী',
+'page_first'             => 'প�রথম',
+'page_last'              => 'শেষ',
+'histlegend'             => 'পার�থক�য (Diff) নির�বাচন: যে সংস�করণগ�লো ত�লনা করতে চান, সেগ�লো চিহ�নিত করে �ন�টার বা নিচের বোতামটি টিপ�ন।<br />
 নির�দেশিকা: (বর�তমান) = বর�তমান সংস�করণের সাথে পার�থক�য,(পূর�ববর�তী) =  পূর�বের সংস�করণের সাথে পার�থক�য, অ = অন�ল�লেখ�য সম�পাদনা।',
-'deletedrev'          => '[অবল�প�ত]',
-'histfirst'           => 'সবচেয়ে প�রনো',
-'histlast'            => 'সাম�প�রতিক',
-'historysize'         => '({{PLURAL:$1|১ বাইট|$1 বাইট}})',
-'historyempty'        => '(খালি)',
+'history-fieldset-title' => 'ব�রাউজ ইতিহাস',
+'deletedrev'             => '[অবল�প�ত]',
+'histfirst'              => 'সবচেয়ে প�রনো',
+'histlast'               => 'সাম�প�রতিক',
+'historysize'            => '({{PLURAL:$1|১ বাইট|$1 বাইট}})',
+'historyempty'           => '(খালি)',
 
 # Revision feed
 'history-feed-title'          => 'সংশোধন ইতিহাস',
@@ -754,7 +768,7 @@ $3-�র দেয়া কারণ হল ''$2''",
 # Search results
 'searchresults'             => 'অন�সন�ধানের ফলাফল',
 'searchresulttext'          => '{{SITENAME}} � অন�সন�ধানের ব�যাপারে আরও তথ�যের জন�য [[{{MediaWiki:Helppage}}|{{int:help}}]] দেখ�ন।',
-'searchsubtitle'            => 'আপনি অন�সন�ধান করেছেন \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" দিয়ে শ�র� হওয়া সকল পাতাসমূহ]] | [[Special:WhatLinksHere/$1|"$1" �র সাথে সংয�ক�ত সকল পাতা]])',
+'searchsubtitle'            => 'আপনি অন�সন�ধান করেছেন \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" দিয়ে শ�র� হওয়া সকল পাতাসমূহ]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" �র সাথে সংয�ক�ত সকল পাতা]])',
 'searchsubtitleinvalid'     => "আপনি অন�সন�ধান করেছেন '''$1'''",
 'noexactmatch'              => "'''\"\$1\" শিরোনামের কোন পাতা নেই।''' আপনি [[:\$1|পাতাটি সৃষ�টি করতে পারেন]]।",
 'noexactmatch-nocreate'     => "'''\"\$1\" শিরোনামের কোন পাতা নেই।'''",
@@ -765,6 +779,7 @@ $3-�র দেয়া কারণ হল ''$2''",
 'prevn'                     => 'পূর�ববর�তী $1টি',
 'nextn'                     => 'পরবর�তী $1টি',
 'viewprevnext'              => '($1) ($2) ($3) দেখানো হোক।',
+'searchhelp-url'            => 'Help:সহায়িকা',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 শব�দ|$2 শব�দসমূহ}})',
 'search-result-score'       => 'মিলেছে: $1%',
 'search-redirect'           => '(প�নর�নিদেশনা $1)',
@@ -803,6 +818,7 @@ $3-�র দেয়া কারণ হল ''$2''",
 'qbsettings-floatingright' => 'ভাসমান ডান',
 'changepassword'           => 'শব�দচাবি (password) পরিবর�তন',
 'skin'                     => 'আবরণ (Skin)',
+'skin-preview'             => 'প�রাকদর�শন',
 'math'                     => 'গণিত',
 'dateformat'               => 'তারিখের ফরম�যাট',
 'datedefault'              => 'কোন পছন�দ নেই',
@@ -824,9 +840,6 @@ $3-�র দেয়া কারণ হল ''$2''",
 'prefs-misc'               => 'বিবিধ',
 'saveprefs'                => 'সংরক�ষণ করো',
 'resetprefs'               => 'আবার শ�র� করো',
-'oldpassword'              => 'প�রনো শব�দচাবি',
-'newpassword'              => 'নত�ন শব�দচাবি:',
-'retypenew'                => 'নত�ন শব�দচাবি আবার টাইপ কর�ন:',
 'textboxsize'              => 'সম�পাদনা',
 'rows'                     => 'সারি:',
 'columns'                  => 'কলাম:',
@@ -856,7 +869,7 @@ $3-�র দেয়া কারণ হল ''$2''",
 'userrights-lookup-user'   => 'ব�যবহারকারী দল ব�যবস�থাপনা কর�ন',
 'userrights-user-editname' => 'ব�যবহারকারীর নাম লিখ�ন:',
 'editusergroup'            => 'ব�যবহারকারীর দল সম�পাদনা করো',
-'editinguser'              => "ব�যবহারকারী সম�পাদনা করছেন '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "ব�যবহারকারী সম�পাদনা করছেন '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'ব�যবহারকারীর দল সম�পাদনা করো',
 'saveusergroups'           => 'ব�যবহারকারীর দল সংরক�ষণ করো',
 'userrights-groupsmember'  => 'সদস�য:',
@@ -948,11 +961,11 @@ $3-�র দেয়া কারণ হল ''$2''",
 'uploadnologintext'           => 'আপলোড করতে হলে আপনাকে অবশ�যই আগে [[Special:UserLogin|লগ-ইন]] করতে হবে।',
 'upload_directory_read_only'  => 'আপলোড ডিরেক�টরিটি ($1) ওয়েবসার�ভার কর�তৃক লিখনযোগ�য নয়।',
 'uploaderror'                 => 'আপলোড � সমস�যা হয়েছে',
-'uploadtext'                  => "ফাইল আপলোড করতে নিচের ফরমটি ব�যবহার কর�ন। পূর�বে আপলোড করা ফাইল দেখতে বা খ��জতে হলে [[Special:ImageList|পূর�বে আপলোড করা ফাইল �র তালিকা]] দেখ�ন। আপলোড করা ফাইল �র নাম  [[Special:Log/upload|আপলোডের ইতিহাস তালিকায়]] যোগ হয়ে থাকে।
+'uploadtext'                  => "ফাইল আপলোড করতে নিচের ফরমটি ব�যবহার কর�ন। পূর�বে আপলোড করা ফাইল দেখতে বা খ��জতে হলে [[Special:FileList|পূর�বে আপলোড করা ফাইল �র তালিকা]] দেখ�ন। আপলোড করা ফাইল �র নাম  [[Special:Log/upload|আপলোডের ইতিহাস তালিকায়]] যোগ হয়ে থাকে।
 
 কোনো নিবন�ধে ছবি যোগ করতে হলে নিচের উদাহরণ অন�যায়ী সংযোগ দিনঃ
-'''<nowiki>[[{{ns:image}}:file.jpg]]</nowiki>''',
-'''<nowiki>[[{{ns:image}}:file.png|alt text]]</nowiki>''' অথবা
+'''<nowiki>[[{{ns:file}}:file.jpg]]</nowiki>''',
+'''<nowiki>[[{{ns:file}}:file.png|alt text]]</nowiki>''' অথবা
 '''<nowiki>[[{{ns:media}}:file.ogg]]</nowiki>'''",
 'upload-permitted'            => 'যেসব ফাইলের ধরন অন�মোদিত: $1।',
 'upload-preferred'            => 'যেসব ফাইলের ধরন পছন�দনীয়: $1।',
@@ -978,18 +991,18 @@ $3-�র দেয়া কারণ হল ''$2''",
 'large-file'                  => '$1-�র চেয়ে বড় আকারের ফাইল স�পারিশ করা হয় না; �ই ফাইলটি $2।',
 'largefileserver'             => 'সার�ভারে যতখানি অন�মোদিত তার চেয়ে �ই ফাইলের আকার বড়।',
 'emptyfile'                   => 'আপনি যে ফাইলটি আপলোড করেছেন, তা খালি মনে হচ�ছে। ফাইলের নামে টাইপিং ত�র�টির কারণে �রকম হতে পারে। অন�গ�রহ করে পরীক�ষা করে দেখ�ন আপনি আসলেই �ই ফাইলটি আপলোড করতে চান কি না।',
-'fileexists'                  => '�ই নামের �কটি ফাইল ইতিমধ�যেই বিদ�যমান। অন�গ�রহ করে <strong><tt>$1</tt></strong> পরীক�ষা করে দেখ�ন, যদি আপনি �টি পরিবর�তনের ব�যাপারে নিশ�চিত না হন।',
-'fileexists-extension'        => '�কই নামের আরেকটি ফাইল আছে:<br />
-আপলোড করা ফাইলের নাম: <strong><tt>$1</tt></strong><br />
-�কই নামে বর�তমান ফাইলের নাম: <strong><tt>$2</tt></strong><br />
-অন�গ�রহ করে �কটি ভিন�ন নাম পছন�দ কর�ন।',
+'fileexists'                  => "�ই নামের �কটি ফাইল ইতিমধ�যেই বিদ�যমান। অন�গ�রহ করে '''<tt>$1</tt>''' পরীক�ষা করে দেখ�ন, যদি আপনি �টি পরিবর�তনের ব�যাপারে নিশ�চিত না হন।",
+'fileexists-extension'        => "�কই নামের আরেকটি ফাইল আছে:<br />
+আপলোড করা ফাইলের নাম: '''<tt>$1</tt>'''<br />
+�কই নামে বর�তমান ফাইলের নাম: '''<tt>$2</tt>'''<br />
+অন�গ�রহ করে �কটি ভিন�ন নাম পছন�দ কর�ন।",
 'fileexists-thumb'            => "<center>'''বিদ�যমান ছবি'''</center>",
-'fileexists-thumbnail-yes'    => 'ফাইলটি �কটি সংক�ষেপিত আকারের ছবি <i>(থাম�বনেইল)</i> বলে মনে হচ�ছে। অন�গ�রহ করে <strong><tt>$1</tt></strong> ফাইলটি পরীক�ষা করে দেখ�ন।<br />
-যদি পরীক�ষাকৃত ফাইলটি �কই ছবির মূল আকার হয়, তবে �কটি অতিরিক�ত থাম�বনেইল আপলোড করার প�রয়োজন নেই।',
-'file-thumbnail-no'           => 'ফাইলনামটি <strong><tt>$1</tt></strong> দিয়ে শ�র� হয়েছে। মনে হচ�ছে, �টি �কটি সংক�চিত আকারের ছবি  <i>(থাম�বনেইল)</i>।
-আপনার কাছে যদি পূর�ণ রেজোলিউশনের ছবিটি থাকে, তবে সেটি আপলোড কর�ন, নত�বা অন�গ�রহ করে ফাইলনামটি পরিবর�তন কর�ন।',
-'fileexists-forbidden'        => '�ই নামের �কটি ফাইল ইতিমধ�যেই বিদ�যমান; অন�গ�রহ করে গিয়ে ফেরত যান �বং �কটি নত�ন নামের অধীনে �ই ফাইলটি আপলোড কর�ন। [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'অংশীদারী ফাইল ভাণ�ডারে �ই নামের �কটি ফাইল ইতিমধ�যেই বিদ�যমান; অন�গ�রহ করে গিয়ে ফেরত যান �বং �কটি নত�ন নামের অধীনে �ই ফাইলটি আপলোড কর�ন। [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "ফাইলটি �কটি সংক�ষেপিত আকারের ছবি ''(থাম�বনেইল)'' বলে মনে হচ�ছে। অন�গ�রহ করে '''<tt>$1</tt>''' ফাইলটি পরীক�ষা করে দেখ�ন।<br />
+যদি পরীক�ষাকৃত ফাইলটি �কই ছবির মূল আকার হয়, তবে �কটি অতিরিক�ত থাম�বনেইল আপলোড করার প�রয়োজন নেই।",
+'file-thumbnail-no'           => "ফাইলনামটি '''<tt>$1</tt>''' দিয়ে শ�র� হয়েছে। মনে হচ�ছে, �টি �কটি সংক�চিত আকারের ছবি  ''(থাম�বনেইল)''।
+আপনার কাছে যদি পূর�ণ রেজোলিউশনের ছবিটি থাকে, তবে সেটি আপলোড কর�ন, নত�বা অন�গ�রহ করে ফাইলনামটি পরিবর�তন কর�ন।",
+'fileexists-forbidden'        => '�ই নামের �কটি ফাইল ইতিমধ�যেই বিদ�যমান; অন�গ�রহ করে গিয়ে ফেরত যান �বং �কটি নত�ন নামের অধীনে �ই ফাইলটি আপলোড কর�ন। [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'অংশীদারী ফাইল ভাণ�ডারে �ই নামের �কটি ফাইল ইতিমধ�যেই বিদ�যমান; অন�গ�রহ করে গিয়ে ফেরত যান �বং �কটি নত�ন নামের অধীনে �ই ফাইলটি আপলোড কর�ন। [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'আপলোড সফল হয়েছে',
 'uploadwarning'               => 'আপলোড সতর�কবাণী',
 'savefile'                    => 'সংরক�ষণ',
@@ -1008,7 +1021,7 @@ $3-�র দেয়া কারণ হল ''$2''",
 
 �ই ফাইলটি আপলোড করা উচিত কি না বিবেচনা করে দেখ�ন।
 ফাইলটির অবল�প�তি লগ আপনার স�বিধার�থে �খানে দেওয়া হল:",
-'filename-bad-prefix'         => 'আপনি যে ফাইলটি আপলোড করছেন, তার নাম <strong>"$1"</strong> দিয়ে শ�র� হয়েছে। � ধরনের নাম সাধারণত ডিজিটাল ক�যামেরাগ�লি স�বয়ংক�রিয়ভাবে দিয়ে থাকে �বং �গ�লি ব�যাখ�যামূলক নয়। অন�গ�রহ করে আপনার ফাইলের জন�য আরও ব�যাখ�যামূলক �কটি নাম পছন�দ কর�ন।',
+'filename-bad-prefix'         => "আপনি যে ফাইলটি আপলোড করছেন, তার নাম '''\"\$1\"''' দিয়ে শ�র� হয়েছে। � ধরনের নাম সাধারণত ডিজিটাল ক�যামেরাগ�লি স�বয়ংক�রিয়ভাবে দিয়ে থাকে �বং �গ�লি ব�যাখ�যামূলক নয়। অন�গ�রহ করে আপনার ফাইলের জন�য আরও ব�যাখ�যামূলক �কটি নাম পছন�দ কর�ন।",
 
 'upload-proto-error'      => 'ভ�ল প�রোটোকল',
 'upload-proto-error-text' => 'দূরবর�তী আপলোডের জন�য URLগ�লি <code>http://</code> বা <code>ftp://</code> দিয়ে শ�র� হওয়া আবশ�যক।',
@@ -1029,17 +1042,17 @@ $3-�র দেয়া কারণ হল ''$2''",
 'upload_source_url'  => ' (�কটি বৈধ, উন�ম�ক�ত URL)',
 'upload_source_file' => ' (আপনার কম�পিউটারের �কটি ফাইল)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'ছবির নাম অন�সন�ধান:',
+# Special:ListFiles
+'listfiles_search_for'  => 'ছবির নাম অন�সন�ধান:',
 'imgfile'               => 'ফাইল',
-'imagelist'             => 'ছবির তালিকা',
-'imagelist_date'        => 'তারিখ',
-'imagelist_name'        => 'নাম',
-'imagelist_user'        => 'ব�যবহারকারী',
-'imagelist_size'        => 'আকার',
-'imagelist_description' => 'বিবরণ',
-
-# Image description page
+'listfiles'             => 'ছবির তালিকা',
+'listfiles_date'        => 'তারিখ',
+'listfiles_name'        => 'নাম',
+'listfiles_user'        => 'ব�যবহারকারী',
+'listfiles_size'        => 'আকার',
+'listfiles_description' => 'বিবরণ',
+
+# File description page
 'filehist'                  => 'ফাইলের ইতিহাস',
 'filehist-help'             => 'তারিখ/সময়ে ক�লিক করে দেখ�ন ফাইলটি তখন কী অবস�থায় ছিল।',
 'filehist-deleteall'        => 'সব ম�ছে ফেল�ন',
@@ -1082,7 +1095,6 @@ $3-�র দেয়া কারণ হল ''$2''",
 'filedelete-success-old' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' ফাইলটির �ই $3, $2 সংস�করণটি ম�ছে ফেলা হয়েছে।</span>',
 'filedelete-nofile'      => "{{SITENAME}}-� '''$1''' ফাইলটির কোন অস�তিত�ব নেই।",
 'filedelete-nofile-old'  => "নির�দেশিত বৈশিষ�ট�যগ�লির জন�য '''$1'''-�র কোন আর�কাইভ সংস�করণ নেই।",
-'filedelete-iscurrent'   => 'আপনি �ই ফাইলটির সবচেয়ে সাম�প�রতিক সংস�করণটি ম�ছে ফেলার চেষ�টা করছেন। অন�গ�রহ করে প�রথমে �কটি পূর�বতন সংস�করণে ফাইলটিকে ফেরত নিন।',
 
 # MIME search
 'mimesearch'         => 'MIME অন�সন�ধান',
@@ -1110,14 +1122,9 @@ $3-�র দেয়া কারণ হল ''$2''",
 'randomredirect-nopages' => '�ই নামস�থানে কোন প�নর�নির�দেশ নেই।',
 
 # Statistics
-'statistics'             => 'পরিসংখ�যান',
-'sitestats'              => 'সাইট পরিসংখ�যান',
-'userstats'              => 'ব�যবহারকারীর পরিসংখ�যান',
-'sitestatstext'          => "ডাটাবেসে সর�বমোট {{PLURAL:\$1|'''1''' টি|'''\$1''' গ�লো}} পাতা আছে।�গ�লোর মধ�যে রয়েছে \"আলাপ\" পাতাগ�লো, {{SITENAME}} বিষয়ক পাতাগ�লো, '''অসম�পূর�ণ''' (stub) পাতাগ�লো, প�নর�নিদেশগ�লো, �বং অন�যান�য আরও পাতা যেগ�লোতে সম�ভবত বিষয়বস�ত�র অভাব রয়েছে। �গ�লো বাদে � উইকিতে সম�ভবত {{PLURAL:\$2|'''1''' টি|'''\$2''' গ�লো}} পাতা আছে যেগ�লোতে যথেষ�ট পরিমাণ বিষয়বস�ত� সংযোজিত হয়েছে। '''\$8'''টি ফাইল আপলোড করা হয়েছে। � {{SITENAME}} স�থাপন করার পর থেকে মোট '''\$3''' বার দেখা হয়েছে, �বং '''\$4''' বার সম�পাদনা করা হয়েছে। তাতে প�রতি পাতা গড়ে '''\$5''' বার সম�পাদিত �বং প�রতি সম�পাদনায় '''\$6''' বার দেখা হয়েছে।
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue কাজের সারির] দৈর�ঘ�য '''\$7'''।",
-'userstatstext'          => "'''$1''' জন নিবন�ধিত ব�যবহারকারী আছেন। ��দের মধ�যে '''$2''' (বা '''$4%''') জন প�রশাসক ($3 দেখ�ন)।",
-'statistics-mostpopular' => 'সবচেয়ে বেশী বার দেখা পাতাসমূহ',
+'statistics'              => 'পরিসংখ�যান',
+'statistics-header-users' => 'ব�যবহারকারীর পরিসংখ�যান',
+'statistics-mostpopular'  => 'সবচেয়ে বেশী বার দেখা পাতাসমূহ',
 
 'disambiguations'      => 'দ�ব�যর�থতা-দূরীকরণ পাতাসমূহ',
 'disambiguationspage'  => 'Template:দ�ব�যর�থতা_নিরসন',
@@ -1197,8 +1204,6 @@ $3-�র দেয়া কারণ হল ''$2''",
 'speciallogtitlelabel' => 'শিরোনাম:',
 'log'                  => 'লগগ�লি',
 'all-logs-page'        => 'সব লগ',
-'log-search-legend'    => 'লগগ�লির জন�য অন�সন�ধান করা হোক',
-'log-search-submit'    => 'চলো',
 'alllogstext'          => '{{SITENAME}}-�র সবগ�লি লগের সম�মিলিত প�রদর�শন।
 আপনি লগের ধরন, ব�যবহারকারীর নাম, বা পাতার নাম নির�বাচন করে প�রদর�শনটির আকার কমিয়ে আনতে পারেন।',
 'logempty'             => 'মিলে যায় �মন কিছ� লগে পাওয়া যায়নি।',
@@ -1224,11 +1229,29 @@ $3-�র দেয়া কারণ হল ''$2''",
 'categories'         => 'বিষয়শ�রেণীসমূহ',
 'categoriespagetext' => '� উইকিতে বর�তমান বিষয়শ�রেণীসমূহ:',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'ম�ছে ফেলা ব�যবহারকারী অবদান',
+
+# Special:LinkSearch
+'linksearch'      => 'ওয়েব লিঙ�কসমূহ অন�সন�ধান করো',
+'linksearch-pat'  => 'অন�সন�ধান প�যাটার�ণ:',
+'linksearch-ns'   => 'নামস�থান:',
+'linksearch-ok'   => 'অন�সন�ধান',
+'linksearch-line' => '$2 থেকে $1 তে লিঙ�ক করা হয়েছে',
+
 # Special:ListUsers
 'listusersfrom'      => 'সেই সব ব�যবহারকারী দেখাও যাদের নাম �ই অক�ষর দিয়ে শ�র�:',
 'listusers-submit'   => 'দেখানো হোক',
 'listusers-noresult' => 'কোন ব�যবহারকারী খ��জে পাওয়া যায়নি।',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'ব�যবহারকারী সৃষ�টি লগ',
+'newuserlogpagetext'          => '�টি নত�ন ব�যবহারকারী সৃষ�টির লগ',
+'newuserlog-byemail'          => 'শব�দচাবি ইমেইলের মাধ�যমে পাঠানো হয়েছে',
+'newuserlog-create-entry'     => 'নত�ন ব�যবহারকারী',
+'newuserlog-create2-entry'    => '$1-�র জন�য অ�যাকাউন�ট সৃষ�টি করা হয়েছে',
+'newuserlog-autocreate-entry' => 'সয়ংক�রিয় ভাবে অ�যাকাউন�ট তৈরি হয়েছে',
+
 # E-mail user
 'mailnologin'     => 'প�রাপকের ঠিকানা নেই',
 'mailnologintext' => "অন�য ব�যবহারকারীদেরকে ই-মেইল পাঠাতে হলে আপনাকে অবশ�যই আগে [[Special:UserLogin|লগ-ইন]] করতে হবে �বং ''[[Special:Preferences|আপনার পছন�দ তালিকায়]] আপনার ই-মেইল ঠিকানাটি ঠিকমত দিতে হবে।",
@@ -1282,12 +1305,6 @@ $3-�র দেয়া কারণ হল ''$2''",
 'iteminvalidname'      => "'$1'নং আইটেমে সমস�যা, অবৈধ নাম...",
 'wlnote'               => "নিচে বিগত {{PLURAL:$2|১ ঘন�টায়|'''$2''' ঘন�টায়}} সংঘটিত {{PLURAL:$1|শেষ ১টি পরিবর�তন|শেষ '''$1'''টি পরিবর�তন}} দেখানো হল।",
 'wlshowlast'           => 'দেখাও সর�বশেষ  $1 ঘন�টা $2 দিন $3',
-'watchlist-show-bots'  => 'বট দ�বারা সম�পাদনাগ�লো দেখাও',
-'watchlist-hide-bots'  => 'বট দ�বারা সম�পাদনাগ�লো দেখিও না',
-'watchlist-show-own'   => 'আমার সম�পাদনাগ�লো দেখাও',
-'watchlist-hide-own'   => 'আমার সম�পাদনাগ�লো দেখিও না',
-'watchlist-show-minor' => 'অন�ল�লেখ�য সম�পাদনাগ�লো দেখাও',
-'watchlist-hide-minor' => 'অন�ল�লেখ�য সম�পাদনাগ�লো দেখিও না',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'নজর রাখা হচ�ছে...',
@@ -1326,64 +1343,69 @@ $NEWPAGE
 ফিডব�যাক ও আরও সহযোগিতার জন�য:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'পাতাটি ম�ছে ফেলা হোক',
-'confirm'                     => 'নিশ�চিত কর�ন',
-'excontent'                   => "বিষয়বস�ত� ছিল: '$1'",
-'excontentauthor'             => "বিষয়বস�ত� ছিল: '$1' (�বং �কমাত�র অবদানকারী ছিলেন '$2')",
-'exbeforeblank'               => "ম�ছে ফেলার আগে বিষয়বস�ত� ছিল: '$1'",
-'exblank'                     => 'পাতাটি খালি ছিল',
-'delete-legend'               => 'ম�ছে ফেল�ন',
-'historywarning'              => 'সতর�কীকরণ: আপনি যে পাতাটি ম�ছতে যাচ�ছেন তার �কটি ইতিহাস আছে:',
-'confirmdeletetext'           => 'আপনি �কটি পাতা সেটির সমস�ত ইতিহাসসহ ম�ছে ফেলতে যাচ�ছেন।
+# Delete
+'deletepage'            => 'পাতাটি ম�ছে ফেলা হোক',
+'confirm'               => 'নিশ�চিত কর�ন',
+'excontent'             => "বিষয়বস�ত� ছিল: '$1'",
+'excontentauthor'       => "বিষয়বস�ত� ছিল: '$1' (�বং �কমাত�র অবদানকারী ছিলেন '$2')",
+'exbeforeblank'         => "ম�ছে ফেলার আগে বিষয়বস�ত� ছিল: '$1'",
+'exblank'               => 'পাতাটি খালি ছিল',
+'delete-legend'         => 'ম�ছে ফেল�ন',
+'historywarning'        => 'সতর�কীকরণ: আপনি যে পাতাটি ম�ছতে যাচ�ছেন তার �কটি ইতিহাস আছে:',
+'confirmdeletetext'     => 'আপনি �কটি পাতা সেটির সমস�ত ইতিহাসসহ ম�ছে ফেলতে যাচ�ছেন।
 অন�গ�রহ করে নিশ�চিত কর�ন আপনি আসলেই �টি করতে চান, আপনি �র ফলাফল সম�পর�কে অবহিত, �বং আপনি [[{{MediaWiki:Policy-url}}|নীতিমালা]] মেনে �টি করছেন।',
-'actioncomplete'              => 'কাজটি নিষ�পন�ন হয়েছে',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ম�ছে ফেলা হয়েছে। সাম�প�রতিক ম�ছে ফেলার ঘটনাগ�লো $2-� দেখ�ন।',
-'deletedarticle'              => '"[[$1]]" ম�ছে ফেলা হয়েছে।',
-'dellogpage'                  => 'পাতা অবল�প�তি লগ�',
-'dellogpagetext'              => 'নিচে সবচেয়ে সাম�প�রতিক অবল�প�তিগ�লোর �কাটি তালিকা দেওয়া হল।',
-'deletionlog'                 => 'পাতা অবল�প�তি লগ�',
-'reverted'                    => 'পূর�ববর�তী সংস�করণে ফিরে যাওয়া সফল হয়েছে।',
-'deletecomment'               => 'ম�ছে ফেলার কারণ:',
-'deleteotherreason'           => 'অন�য/অতিরিক�ত কারণ:',
-'deletereasonotherlist'       => 'অন�য কারণ',
-'deletereason-dropdown'       => '*ম�ছে ফেলার সাধারণ কারণগ�লি
+'actioncomplete'        => 'কাজটি নিষ�পন�ন হয়েছে',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ম�ছে ফেলা হয়েছে। সাম�প�রতিক ম�ছে ফেলার ঘটনাগ�লো $2-� দেখ�ন।',
+'deletedarticle'        => '"[[$1]]" ম�ছে ফেলা হয়েছে।',
+'dellogpage'            => 'পাতা অবল�প�তি লগ�',
+'dellogpagetext'        => 'নিচে সবচেয়ে সাম�প�রতিক অবল�প�তিগ�লোর �কাটি তালিকা দেওয়া হল।',
+'deletionlog'           => 'পাতা অবল�প�তি লগ�',
+'reverted'              => 'পূর�ববর�তী সংস�করণে ফিরে যাওয়া সফল হয়েছে।',
+'deletecomment'         => 'ম�ছে ফেলার কারণ:',
+'deleteotherreason'     => 'অন�য/অতিরিক�ত কারণ:',
+'deletereasonotherlist' => 'অন�য কারণ',
+'deletereason-dropdown' => '*ম�ছে ফেলার সাধারণ কারণগ�লি
 ** লেখকের অন�রোধ
 ** কপিরাইট ভঙ�গ
 ** ধ�বংসপ�রবণতা',
-'delete-toobig'               => '�ই পাতার অনেক বড় সম�পাদনার ইতিহাস রয়েছে, যা $1 সংশোধনের বেশি। {{SITENAME}} �র দূর�ঘটনাজনিত সমস�যা �ড়াতে �ই ধরনের পাতা ম�ছার ব�যপারে সীমাবদ�ধতা আরোপ করা হয়েছে।',
-'rollback'                    => 'সম�পাদনা ফিরিয়ে নিন',
-'rollback_short'              => 'ফিরিয়ে নিন',
-'rollbacklink'                => 'রোলব�যাক',
-'rollbackfailed'              => 'রোলব�যাক ব�যর�থ',
-'cantrollback'                => 'পূর�বের সংস�করণে ফেরত যাওয়া সম�ভব হল না, সর�বশেষ সম�পাদনাকারী �ই নিবন�ধটির �কমাত�র লেখক।',
-'alreadyrolled'               => '[[:$1]] পাতায় [[User:$2|$2]] ([[User talk:$2|আলাপ]])-�র করা শেষ সম�পাদনাটি রোলব�যাক করা যায়নি; অন�য কেউ ইতিমধ�যে পাতাটি সম�পাদনা বা রোলব�যাক করেছেন।
+'delete-toobig'         => '�ই পাতার অনেক বড় সম�পাদনার ইতিহাস রয়েছে, যা $1 সংশোধনের বেশি। {{SITENAME}} �র দূর�ঘটনাজনিত সমস�যা �ড়াতে �ই ধরনের পাতা ম�ছার ব�যপারে সীমাবদ�ধতা আরোপ করা হয়েছে।',
+
+# Rollback
+'rollback'         => 'সম�পাদনা ফিরিয়ে নিন',
+'rollback_short'   => 'ফিরিয়ে নিন',
+'rollbacklink'     => 'রোলব�যাক',
+'rollbackfailed'   => 'রোলব�যাক ব�যর�থ',
+'cantrollback'     => 'পূর�বের সংস�করণে ফেরত যাওয়া সম�ভব হল না, সর�বশেষ সম�পাদনাকারী �ই নিবন�ধটির �কমাত�র লেখক।',
+'alreadyrolled'    => '[[:$1]] পাতায় [[User:$2|$2]] ([[User talk:$2|আলাপ]])-�র করা শেষ সম�পাদনাটি রোলব�যাক করা যায়নি; অন�য কেউ ইতিমধ�যে পাতাটি সম�পাদনা বা রোলব�যাক করেছেন।
 
 শেষ সম�পাদনা করেছেন [[User:$3|$3]] ([[User talk:$3|আলাপ]])।',
-'editcomment'                 => 'সম�পাদনা মন�তব�যটি ছিল: "<i>$1</i>"।', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User_talk:$2|আলাপ]]) �র সম�পাদিত সংস�করণ হতে [[User:$1|$1]] �র সম�পাদিত সর�বশেষ সংস�করণে ফেরত যাওয়া হয়েছে।', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1-�র সম�পাদনাগ�লি পূর�বাবস�থায় ফিরিয়ে নেওয়া হয়েছে; $2-�র করা শেষ সংস�করণে পাতাটি ফেরত নেওয়া হয়েছে।',
-'sessionfailure'              => 'আপনার লগ ইন সেশনে �কটি সমস�যা হয়েছে বলে মনে হচ�ছে;
+'editcomment'      => "সম�পাদনা মন�তব�যটি ছিল: \"''\$1''\"।", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User_talk:$2|আলাপ]]) �র সম�পাদিত সংস�করণ হতে [[User:$1|$1]] �র সম�পাদিত সর�বশেষ সংস�করণে ফেরত যাওয়া হয়েছে।', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1-�র সম�পাদনাগ�লি পূর�বাবস�থায় ফিরিয়ে নেওয়া হয়েছে; $2-�র করা শেষ সংস�করণে পাতাটি ফেরত নেওয়া হয়েছে।',
+'sessionfailure'   => 'আপনার লগ ইন সেশনে �কটি সমস�যা হয়েছে বলে মনে হচ�ছে;
 সেশন হাইজ�যাক প�রতিরোধের উপায় হিসেবে �ই কাজটি বাতিল করা হয়েছে।
 অন�গ�রহ ব�রাউজারের "back" বোতাম চাপ�ন �বং যে পাতা থেকে �সেছিলেন, তা রিলোড কর�ন �বং আবার চেষ�টা কর�ন।',
+
+# Protect
 'protectlogpage'              => 'স�রক�ষা লগ�‌',
 'protectlogtext'              => 'নিচে পাতা বন�ধ ও খোলার �কটি তালিকা দেয়া হল। বর�তমানে সক�রিয় পাতার স�রক�ষাগ�লির তালিকা দেখতে [[Special:ProtectedPages|স�রক�ষিত পাতার তালিকা]] দেখ�ন।',
 'protectedarticle'            => 'স�রক�ষিত "[[$1]]"',
 'modifiedarticleprotection'   => '"[[$1]]"-�র জন�য স�রক�ষার স�তর পরিবর�তন করা হয়েছে',
 'unprotectedarticle'          => '"[[$1]]"-�র স�রক�ষা সরিয়ে নেওয়া হয়েছে',
 'protect-title'               => '"$1" স�রক�ষিত করা হচ�ছে',
+'prot_1movedto2'              => '[[$1]]-কে [[$2]]-� সরিয়ে নেওয়া হয়েছে',
 'protect-legend'              => 'স�রক�ষা নিশ�চিত কর�ন',
 'protectcomment'              => 'স�রক�ষার কারণ',
 'protectexpiry'               => 'মেয়াদোত�তীর�ণ হবে:',
 'protect_expiry_invalid'      => 'মেয়াদোত�তীর�ণ সময় অবৈধ।',
 'protect_expiry_old'          => 'মেয়াদোত�তীর�ণ সময় অতীতে অবস�থিত।',
 'protect-unchain'             => 'স�থানান�তরের অন�মতিগ�লি খ�লে দেওয়া হোক',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> পাতাটির জন�য স�রক�ষার স�তর আপনি �খানে দেখতে ও পরিবর�তন করতে পারেন।',
-'protect-locked-blocked'      => 'বাধাপ�রাপ�ত অবস�থায় আপনি পাতাটির স�রক�ষা স�তর পরিবর�তন করতে পারবেন না। �খানে <strong>$1</strong> পাতাটির বর�তমান সেটিংস দেওয়া হল:',
-'protect-locked-dblock'       => 'ডাটাবেজ বন�ধ থাকায় স�রক�ষা স�তর পরিবর�তন করা যাবে না।
-�খানে <strong>$1</strong> পাতাটির বর�তমান সেটিংস দেওয়া হল:',
-'protect-locked-access'       => 'আপনার অ�যাকাউন�ট থেকে পাতার স�রক�ষা স�তর পরিবর�তন করার অন�মতি নেই।
-�খানে <strong>$1</strong> পাতাটির বর�তমান সেটিংস দেওয়া হল:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' পাতাটির জন�য স�রক�ষার স�তর আপনি �খানে দেখতে ও পরিবর�তন করতে পারেন।",
+'protect-locked-blocked'      => "বাধাপ�রাপ�ত অবস�থায় আপনি পাতাটির স�রক�ষা স�তর পরিবর�তন করতে পারবেন না। �খানে '''$1''' পাতাটির বর�তমান সেটিংস দেওয়া হল:",
+'protect-locked-dblock'       => "ডাটাবেজ বন�ধ থাকায় স�রক�ষা স�তর পরিবর�তন করা যাবে না।
+�খানে '''$1''' পাতাটির বর�তমান সেটিংস দেওয়া হল:",
+'protect-locked-access'       => "আপনার অ�যাকাউন�ট থেকে পাতার স�রক�ষা স�তর পরিবর�তন করার অন�মতি নেই।
+�খানে '''$1''' পাতাটির বর�তমান সেটিংস দেওয়া হল:",
 'protect-cascadeon'           => '�ই পাতাটি বর�তমানে স�রক�ষিত আছে, কারণ পাতাটি নিচের {{PLURAL:$1|টি পাতায়|টি পাতায়}} অন�তর�ভ�ক�ত, যাতে (যেগ�লিতে) প�রপাতাকারে স�রক�ষা চাল� আছে। আপনি �ই পাতাটির স�রক�ষা স�তর পরিবর�তন করতে পারেন, তবে �টি প�রপাতাকার স�রক�ষাটিতে কোন পরিবর�তন সাধন করবে না।',
 'protect-default'             => '(আদি)',
 'protect-fallback'            => '"$1" অন�মতি দরকার',
@@ -1393,6 +1415,7 @@ $NEWPAGE
 'protect-expiring'            => '$1 (UTC) সময়ে মেয়াদোত�তীর�ণ',
 'protect-cascade'             => '�ই পাতায় অন�তর�ভ�ক�ত পাতাগ�লিও স�রক�ষিত করা হোক (প�রপাতাকার স�রক�ষা)',
 'protect-cantedit'            => 'আপনি �ই পাতার স�রক�ষার স�তর পরিবর�তন করতে পারবেন না, কারণ আপনার তা সম�পাদনা করার অন�মতি নেই।',
+'protect-expiry-options'      => '২ ঘন�টা:2 hours,১ দিন:1 day,৩ দিন:3 days,১ সপ�তাহ:1 week,২ সপ�তাহ:2 weeks,১ মাস:1 month,৩ মাস:3 months,৬ মাস:6 months,১ বছর:1 year,অসীম:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'অন�মতি:',
 'restriction-level'           => 'বাধার স�তর:',
 'minimum-size'                => 'ন�যূনতম আকার',
@@ -1473,7 +1496,6 @@ $1',
 'whatlinkshere'       => 'সংযোগকারী পাতাসমূহ',
 'whatlinkshere-title' => 'যে পাতাগ�লি থেকে "$1"-�র প�রতি সংযোগ আছে',
 'whatlinkshere-page'  => 'পাতা:',
-'linklistsub'         => '(সংযোগসমূহের তালিকা)',
 'linkshere'           => "নিচের পাতাসমূহ '''[[:$1]]''' পাতায় সংয�ক�ত আছে:",
 'nolinkshere'         => "কোনো পাতা থেকে '''[[:$1]]''' পাতায় সংযোগ নেই।",
 'nolinkshere-ns'      => "নির�বাচিত নামস�থানে '''[[:$1]]'''-�র প�রতি কোন পাতা থেকে সংযোগ নেই।",
@@ -1604,6 +1626,8 @@ $1',
 
 �সব ক�ষেত�রে আপনি চাইলে নিজের হাতে পাতাটিকে সরাতে বা �কত�রীকরণ করতে পারেন।",
 'movearticle'             => 'যে পাতা সরিয়ে ফেলা হবে',
+'movenologin'             => 'অ�যাকাউন�টে প�রবেশ করা হয়নি',
+'movenologintext'         => 'কোন পাতা সরিয়ে ফেলতে চাইলে আপনাকে অবশ�যই �কজন নিবন�ধিত ব�যবহারকারী হতে হবে ও অ�যাকাউন�টে [[Special:UserLogin|প�রবেশ]] করতে হবে।',
 'movenotallowed'          => 'আপনার {{SITENAME}}-তে পাতা সরানোর অন�মতি নেই।',
 'newtitle'                => '�ই নত�ন শিরোনামে',
 'move-watch'              => '�ই পাতাটি নজরে রাখ�ন',
@@ -1628,7 +1652,6 @@ $1',
 'delete_and_move_confirm' => 'হ�যা�, পাতাটি ম�ছে ফেলা হোক',
 'delete_and_move_reason'  => 'স�থানান�তরের স�বার�থে ম�ছে ফেলা হয়েছে',
 'selfmove'                => 'উৎস ও গন�তব�য পাতা �কই শিরোনামের; কোন পাতা �কই শিরোনামের আরেক পাতায় সরানো যাবে না।',
-'immobile_namespace'      => 'উৎস বা গন�তব�য পাতা বিশেষ ধরনের; � নামস�থানে বা � নামস�থান থেকে পাতা সরানো যাবে না।',
 
 # Export
 'export'            => 'রপ�তানি পাতাগ�লি',
@@ -1636,7 +1659,7 @@ $1',
 
 পাতা রপ�তানি করতে চাইলে নিচের টেক�সট বাক�সে শিরোনামগ�লি প�রবেশ করান, প�রতি লাইনে �কটি শিরোনাম দিয়ে, �বং নির�বাচন কর�ন আপনি বর�তমান সংস�করণসহ সবগ�লি প�রনো সংস�করণ পাতার ইতিহাসের লাইনসহ রপ�তানি করতে চান, নাকি কেবল সর�বশেষ সম�পাদনাটির তথ�যসহ বর�তমান সংস�করণটি রপ�তানি করতে চান।
 
-দ�বিতীয় ক�ষেত�রটিতে আপনি �কটি সংযোগও ব�যবহার করতে পারেন, যেমন "[[{{MediaWiki:Mainpage}}]]" পাতাটির জন�য [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]।',
+দ�বিতীয় ক�ষেত�রটিতে আপনি �কটি সংযোগও ব�যবহার করতে পারেন, যেমন "[[{{MediaWiki:Mainpage}}]]" পাতাটির জন�য [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]।',
 'exportcuronly'     => 'সম�পূর�ণ ইতিহাস নয়, কেবল বর�তমান সংশোধনটি অন�তর�ভ�ক�ত করা হোক',
 'exportnohistory'   => "----
 '''লক�ষ�য কর�ন:''' কর�মদক�ষতা-সম�পর�কিত কারণের জন�য �ই ফর�মের মাধ�যমে কোন পাতার সমগ�র ইতিহাস রপ�তানি করা নিষ�ক�রিয় করা হয়েছে।",
@@ -1651,7 +1674,7 @@ $1',
 'allmessagesdefault'        => 'আদি টেক�সট',
 'allmessagescurrent'        => 'বর�তমান টেক�সট',
 'allmessagestext'           => 'নিচে মিডিয়াউইকি: নামস�থানে অন�তর�ভ�ক�ত সিস�টেম বার�তাগ�লোর তালিকা দেওয়া হল।
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' ব�যবহার করা যাবে না কারণ '''\$wgUseDatabaseMessages''' বন�ধ করে রাখা আছে।",
 'allmessagesfilter'         => 'বার�তা নামের ফিল�টার:',
 'allmessagesmodified'       => 'শ�ধ� পরিবর�তিত অংশগ�লো দেখাও',
@@ -1674,6 +1697,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-interwiki-history'   => '�ই পাতার সমস�ত ইতিহাসের সংস�করণের অন�লিপি করা হোক',
 'import-interwiki-submit'    => 'আমদানি',
 'import-interwiki-namespace' => 'পাতাগ�লি �ই নামস�থানে স�থানান�তর করা হোক:',
+'import-comment'             => 'মন�তব�য:',
 'importtext'                 => 'অন�গ�রহ করে Special:Export সরঞ�জামটি ব�যবহার করে ফাইলটি উৎস উইকি থেকে রপ�তানি কর�ন, আপনার ডিস�কে �টি সংরক�ষণ  কর�ন �বং তারপর সেটি �খানে আপলোড কর�ন।',
 'importstart'                => 'পাতা আমদানি করা হচ�ছে...',
 'import-revision-count'      => '$1 {{PLURAL:$1|টি সংশোধন|টি সংশোধন}}',
@@ -1842,7 +1866,7 @@ $1',
 'show-big-image'       => 'পূর�ণ রেজোলিউশন',
 'show-big-image-thumb' => '<small>আকারের প�রাকদর�শন: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'নত�ন ফাইলের গ�যালারি',
 'imagelisttext'         => 'নিচে $1টি ফাইলের �কটি তালিকা $2 সাজিয়ে দেখানো হল।',
 'showhidebots'          => '($1 বট)',
@@ -2179,21 +2203,9 @@ $1
 আপনি সত�যিই যে পাতাটি প�নরায় সৃষ�টি করতে চান, তা দয়া করে নিশ�চিত কর�ন।",
 'recreate'            => 'প�নরায় তৈরি করো',
 
-# HTML dump
-'redirectingto' => '[[:$1]] পাতায় প�নঃনির�দেশিত হচ�ছে...',
-
 # action=purge
-'confirm_purge'        => '�ই পাতার ক�যাশে পরিষ�কার করতে চান?
-
-$1',
 'confirm_purge_button' => 'ঠিক আছে',
-
-# AJAX search
-'searchcontaining' => "''$1'' আছে �মন নিবন�ধগ�লো অন�সন�ধান করো।",
-'searchnamed'      => "''$1'' শিরোনামের পাতা অন�সন�ধান করো।",
-'articletitles'    => "যেসব পাতা ''$1'' দিয়ে শ�র� হয়েছে, তাদের তালিকা",
-'hideresults'      => 'ফলাফলগ�লো দেখিও না',
-'useajaxsearch'    => '�জ�যাক�স (AJAX) অন�সন�ধান ব�যবহার করা হোক',
+'confirm-purge-top'    => '�ই পাতার ক�যাশে পরিষ�কার করতে চান?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� পূর�ববর�তী পাতা',
diff --git a/languages/messages/MessagesBo.php b/languages/messages/MessagesBo.php
index ff4da83b..7042d55f 100644
--- a/languages/messages/MessagesBo.php
+++ b/languages/messages/MessagesBo.php
@@ -137,7 +137,7 @@ $messages = array(
 'email'              => 'དྲ་འཕྲིན�',
 
 # Edit pages
-'summary'      => 'བསྡུས་དོན�',
+'summary'      => 'བསྡུས་དོན�:',
 'minoredit'    => 'འདི་རྩོམ་སྒྲིག་ཚར་མེད�',
 'watchthis'    => 'དྲ་ངོས་འདི་ལ་མཉམ་འཇོག་པ�',
 'savearticle'  => 'དྲ་ངོས་ཉར་བ�',
@@ -222,6 +222,7 @@ $messages = array(
 
 # Move page
 'movearticle' => 'སྤོར་ངོས�',
+'movenologin' => 'ནང་འཛུལ་བྱས་མེད�',
 'move-watch'  => 'དྲ་ངོས་འདི་ལ་མཉམ་འཇོག་པ�',
 'movereason'  => 'རྒྱུ་མཚན�',
 
@@ -234,7 +235,7 @@ $messages = array(
 'tooltip-ca-move'        => 'ཨཾོབེ༹་ �ིས་ པགེ་',
 'tooltip-p-logo'         => 'གཙོ་ངོས�',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'འཚོལ�',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesBpy.php b/languages/messages/MessagesBpy.php
index 30186c17..ee70f7cd 100644
--- a/languages/messages/MessagesBpy.php
+++ b/languages/messages/MessagesBpy.php
@@ -8,6 +8,8 @@
  * @author Uttam Singha, Dec 2006
  */
 
+$fallback='bn';
+
 $digitTransformTable = array(
 	'0' => '০',
 	'1' => '১',
@@ -30,8 +32,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'আতাক�রার_য়�যারী',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_য়�যারী',
-	NS_IMAGE          => 'ছবি',
-	NS_IMAGE_TALK     => 'ছবি_য়�যারী',
+	NS_FILE           => 'ছবি',
+	NS_FILE_TALK      => 'ছবি_য়�যারী',
 	NS_MEDIAWIKI      => 'মিডিয়াউইকি',
 	NS_MEDIAWIKI_TALK => 'মিডিয়াউইকির_য়�যারী',
 	NS_TEMPLATE       => 'মডেল',
@@ -89,8 +91,6 @@ $messages = array(
 'underline-never'   => 'স�পৌনা',
 'underline-default' => 'বাউজারগত যেসারে আসিল',
 
-'skinpreview' => '(মিল�লেখ)',
-
 # Dates
 'sunday'        => 'লাম�ইসিং',
 'monday'        => 'নিংথৌকাপা',
@@ -178,7 +178,7 @@ $messages = array(
 'mytalk'         => 'মর য়�যারি-পরি',
 'anontalk'       => 'অচিনা �গর য়�যারির পাতা',
 'navigation'     => 'দিশা-ধর�নী',
-'and'            => 'বারো',
+'and'            => '&#32;বারো',
 
 # Metadata in edit box
 'metadata_help' => 'মেটাডাটা:',
@@ -241,8 +241,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}র বারে',
 'aboutpage'            => 'Project:বারে',
-'bugreports'           => 'লাল বিবরণী',
-'bugreportspage'       => 'Project:লাল_বিবরণী',
 'copyright'            => '$1-র মাত�ঙে �হানর মেথেলহানি পানা �করের।',
 'copyrightpagename'    => '{{SITENAME}} স�বত�তাধিকারহান',
 'copyrightpage'        => '{{ns:project}}:স�বত�তাধিকারহানি',
@@ -265,8 +263,6 @@ $messages = array(
 
 'badaccess'        => 'য়�যাথাঙে লালসে',
 'badaccess-group0' => 'তি যে কামহানর হেইচা করিসত, তরতা অহান করানির য়�যাথাং নেই।',
-'badaccess-group1' => 'তি যে কামহানর হেইচা করিসত, অহান করানির য়�যাথাং হ�দ�দা $1 গ�র�পরতা আসে।',
-'badaccess-group2' => 'তি যে কামহানর হেইচা করিসত, অহান করানির য়�যাথাং হ�দ�দা $1 গ�র�পর আতাক�রারতা আসে।',
 'badaccess-groups' => 'তি যে কামহানর হেইচা করিসত, অহান করানির য়�যাথাং হ�দ�দা $1 গ�র�পরতা আসে।',
 
 'ok'                  => 'চ�মিসে',
@@ -367,6 +363,9 @@ $messages = array(
 'accountcreated'             => '�কাউন�টহান হঙকরানি ইল',
 'accountcreatedtext'         => 'আতাক�রা $1 -র কা �কাউন�টহান হঙকরানি ইল।',
 
+# Password reset dialog
+'retypenew' => 'ন�ৱা খন�তাচাবি বারো টাইপ কর:',
+
 # Edit page toolbar
 'bold_sample'     => 'গাঢ়পা ৱাহি',
 'bold_tip'        => 'গাঢ়পা ৱাহি',
@@ -388,8 +387,8 @@ $messages = array(
 'hr_tip'          => 'পাথারি খাস (খানি করা ইয়া আতা)',
 
 # Edit pages
-'summary'                => 'সারমর�ম',
-'subject'                => 'বিষয়/চিঙনাঙ',
+'summary'                => 'সারমর�ম:',
+'subject'                => 'বিষয়/চিঙনাঙ:',
 'minoredit'              => '�হান হ�র�-ম�র� সম�পাদনাহানহে।',
 'watchthis'              => 'পাতা�হান খিয়ালে থ',
 'savearticle'            => 'পাতাহান ইত�কর',
@@ -397,7 +396,7 @@ $messages = array(
 'showpreview'            => 'আগচা',
 'showdiff'               => 'পতাসিতা দেহাদে',
 'anoneditwarning'        => "'''সিঙ�ইসঃ''' তি লগইন নাকরিসত। পতানির ইতিহাসহাত তর IP addressহান সিজিল ইতই।",
-'summary-preview'        => 'সারমর�মর আগচা',
+'summary-preview'        => 'সারমর�মর আগচা:',
 'blockedtitle'           => 'আতাক�রাগরে থেপ করানি অসে',
 'blockedtext'            => "<big>'''তর আতাক�রা নাঙহান নাইলেউ আইপি ঠিকানাহানরে থেপকরানি অসে।'''</big>
 
@@ -420,17 +419,17 @@ $messages = array(
 'anontalkpagetext'       => "''�হান অচিনা অতার য়�যারির পাতাহান। �রে আইপি ঠিকানা (IP Address) �হানাত�ত লগ-ইন নাকরিয়া পতানিত মেইক�ষ� অসিল। আক�ক�স ক�ষেন�তামে আইপি ঠিকানা হামেসা বদল অর, বিশেষ করিয়া ডায়াল-আপ ইন�টারনেট, প�রক�সি সার�ভার মাহি ক�ষেত�র �তা সিলরতা, বারো আগত�ত বপ ব�যবহারকারেক�রার ক�ষেত�রত প�রযোজ�য ইতে পারে। অহানে তি নিশ�চকে �রে আইপি �হাত�ত উইকিপিডিয়াত হমিয়া কোন য়�যারী দেখর, অহান তরে নিঙকরিয়া নাউ ইতে পারে। অহানে হাবিত�ত হবা অর, তি যদি [[Special:UserLogin|লগ-ইন করর, বা নৱা �কাউন�ট খ�লর]] অহানব�লতেউ লগ-ইন করলে ক�ঙগউ তর আইপি ঠিকানাহান, বারো অহানর মাত�ঙে তর অবস�থানহান স�পকরেউ হার না পেইবা।''",
 'noarticletext'          => '�পাগা �রে পাতাত কোন টেক�সট নেই। তি মনেইলে হের পাতাহান [[Special:Search/{{PAGENAME}}|�রে চিঙনাঙল বিসারা পারর]] নাইলে [{{fullurl:{{FULLPAGENAME}}|action=edit}} �রে পাতা �হান পতা পারর]।',
 'clearyourcache'         => "'''খিয়াল থ:''' তর পছনহানি রক�ষা করানির থাঙনাত পতাহানি চানার কা তর ব�রাউজারর ক�যাশ লাল�য়া যানা লাগতে পারে। '''মোজিলা/ফায়ারফক�স/সাফারি:''' শিফট কী চিপিয়া থয়া রিলোড-� ক�লিক কর, নাইলে ''কন�ট�রোল-শিফট-R''(�পল ম�যাক-� ''কমান�ড-শিফট-R'') আকপাকে চিপা; '''ইন�টারনেট �ক�সপ�লোরার:''' ''কন�ট�রোল'' চিপিয়া থয়া রিফ�রেশ-� ক�লিক কর, নাইলে ''কন�ট�রোল-F5'' চিপা; '''কংকারার:''' হ�দ�দা রিলোড ক�লিক করলে বা F5 চিপিলে চলতই; '''অপেরা''' আতাক�রাই ''Tools→Preferences''-� গিয়া কাশ সম�পূর�ণ ঙক�ষি করানি লাগতে পারে।",
-'previewnote'            => '<strong>�হান হ�দ�দা আগচাহান;
-ফারাকহান �পাগাউ ইত� করানি নাইসে!</strong>',
+'previewnote'            => "'''�হান হ�দ�দা আগচাহান;
+ফারাকহান �পাগাউ ইত� করানি নাইসে!'''",
 'editing'                => 'পতানি চলের $1',
 'editingsection'         => '$1র পতানি চলের (ডেংগ)',
 'yourtext'               => 'তর ইকরা বিষয়হানি',
 'yourdiff'               => 'ফারাকহানি',
-'copyrightwarning'       => 'দয়া করিয়া খিয়াল কর {{SITENAME}}-ত হারি অবদান $2-র মাত�ঙে পাসিতা (আরাকউ হবাকরে $1-ত চা)। তর জমা দিয়াসত লেখা যেগউ বে-রিদয় ইয়া পতিতে পারে বারো যেসারে খ�শি অসারে বিলিতে পারে। তি যদি �হানর বারে �কমত নার, অতা ইলে তর লেখা �হাত জমা নাদি।<br />
+'copyrightwarning'       => "দয়া করিয়া খিয়াল কর {{SITENAME}}-ত হারি অবদান $2-র মাত�ঙে পাসিতা (আরাকউ হবাকরে $1-ত চা)। তর জমা দিয়াসত লেখা যেগউ বে-রিদয় ইয়া পতিতে পারে বারো যেসারে খ�শি অসারে বিলিতে পারে। তি যদি �হানর বারে �কমত নার, অতা ইলে তর লেখা �হাত জমা নাদি।<br />
 তি আরাকউ ৱাশাক করর যে, �রে লেখা �হান তি নিজে ইকিসতহান, নাইলে  হাব�বির কা উন�ম�ক�ত কোন উৎস আহাত�ত পাসতহান।
-<strong>স�বত�ব সংরক�ষিত অসে অসাদে কোন লেখা স�বত�বাধিকারীর য়�যাথাঙ না ল�ইয়া �হাত জমা না দিস!</strong>',
-'longpagewarning'        => '<strong>সিঙ�ইস: �রে পাতা �হান $1 কিলোবাইট ডাঙর; ব�রাউজার আকেইগত ৩২ কিলোবাইটর গজে ডাঙর পাতানিত বেরা ইতে পারে।
-দয়া করিয়া পাতা �হানরে হ�রকা হ�রকা কত অংশত খেইকরানির হতনা কর।</strong>',
+'''স�বত�ব সংরক�ষিত অসে অসাদে কোন লেখা স�বত�বাধিকারীর য়�যাথাঙ না ল�ইয়া �হাত জমা না দিস!'''",
+'longpagewarning'        => "'''সিঙ�ইস: �রে পাতা �হান $1 কিলোবাইট ডাঙর; ব�রাউজার আকেইগত ৩২ কিলোবাইটর গজে ডাঙর পাতানিত বেরা ইতে পারে।
+দয়া করিয়া পাতা �হানরে হ�রকা হ�রকা কত অংশত খেইকরানির হতনা কর।'''",
 'templatesused'          => 'পাতাহান মডেল বরাসিতা:',
 'templatesusedpreview'   => 'আগচা �হানাত মিহিসে মডেল:',
 'template-protected'     => '(ল�করিসি)',
@@ -446,7 +445,7 @@ $messages = array(
 'viewpagelogs'        => 'পাতাহানর লগ চা',
 'currentrev'          => 'হাদি�হানর পতানি',
 'revisionasof'        => 'রিভিসনহান $1 পেয়া',
-'revision-info'       => '$1 পেয়া  $2-� পতাসেতা',
+'revision-info'       => '$1 পেয়া  $2-� পতাসেতা', # Additionally available: $3: revision id
 'previousrevision'    => '�প�রানা পতানিহান',
 'nextrevision'        => 'ন�ৱা ভার�সনহান→',
 'currentrevisionlink' => 'হাদি �হানর পতানি',
@@ -471,19 +470,20 @@ $messages = array(
 'diff-multi'              => '({{PLURAL:$1|হমব�কর রিভিসন আহান|$1 হমব�কর রিভিসন হানি}} দেহাদেনা �হাত না মিহিসে।)',
 
 # Search results
-'noexactmatch' => "'''\"\$1\" চিংনাঙর কোন পাতা নেই।'''
+'noexactmatch'   => "'''\"\$1\" চিংনাঙর কোন পাতা নেই।'''
 তি [[:\$1|পাতা �হান হঙকরে পারর]]।",
-'prevn'        => 'পিসেদে $1',
-'nextn'        => 'থাংনাত $1',
-'viewprevnext' => 'চা ($1) ($2) ($3)',
-'powersearch'  => '�ডভান�স বিসারানি',
+'prevn'          => 'পিসেদে $1',
+'nextn'          => 'থাংনাত $1',
+'viewprevnext'   => 'চা ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:পাংলাক',
+'powersearch'    => '�ডভান�স বিসারানি',
 
 # Preferences page
 'preferences'    => 'পছনহানি',
 'mypreferences'  => 'মর পছন',
 'changepassword' => 'খন�তাচাবি(password) পতা',
+'skin-preview'   => 'আগচা',
 'saveprefs'      => 'ইত�',
-'retypenew'      => 'ন�ৱা খন�তাচাবি বারো টাইপ কর:',
 'columns'        => 'দ�রগিঃ',
 'allowemail'     => 'আরতা(ব�যবহার করেক�রা)ই ইমেইল করানির য়�যাথাং দে।',
 
@@ -529,10 +529,10 @@ $messages = array(
 'uploadedimage'   => 'আপলোডকরানি অইল "[[$1]]"',
 'watchthisupload' => 'পাতা�হান খিয়ালে থ',
 
-# Special:ImageList
-'imagelist' => 'ছবির তালিকা',
+# Special:ListFiles
+'listfiles' => 'ছবির তালিকা',
 
-# Image description page
+# File description page
 'filehist'                  => 'ফাইলর ইতিহাস',
 'filehist-help'             => 'দিন/সময়-র গজে যাতিলে ঔ খেন�তাম পেয়া হঙিসে ফাইলগ চ পারতেই।',
 'filehist-current'          => '�পাগা',
@@ -638,24 +638,21 @@ $messages = array(
 'emailuser' => 'আতাক�রাগরে ইমেইল কর',
 
 # Watchlist
-'watchlist'            => 'মর তালাবি',
-'mywatchlist'          => 'মর তালাবি',
-'watchlistfor'         => "('''$1'''-র কা)",
-'addedwatch'           => 'তালাবির তালিকাহাত থনা ইল',
-'addedwatchtext'       => "\"<nowiki>\$1</nowiki>\" পাতা �হান তর [[Special:Watchlist|আহির-আর�ম তালিকা]]-ত তিলকরানি ইল। পিসেদে �রে পাতা �হান বারো পাতা �হানর লগে সাকেই আসে য়�যারী পাতাত অইতই হারি জাতর পতানি �হানাত তিলকরানি অইতই। অতাবাদেউ [[Special:RecentChanges|হাদি �হানর পতানিহানি]]-ত পাতা �হানরে '''গাঢ়করা''' মেয়েকে দেহা দেনা অইতই যাতে তি ন�ঙিকরে পাতা �হান চিনে পারবেতা।
+'watchlist'         => 'মর তালাবি',
+'mywatchlist'       => 'মর তালাবি',
+'watchlistfor'      => "('''$1'''-র কা)",
+'addedwatch'        => 'তালাবির তালিকাহাত থনা ইল',
+'addedwatchtext'    => "\"<nowiki>\$1</nowiki>\" পাতা �হান তর [[Special:Watchlist|আহির-আর�ম তালিকা]]-ত তিলকরানি ইল। পিসেদে �রে পাতা �হান বারো পাতা �হানর লগে সাকেই আসে য়�যারী পাতাত অইতই হারি জাতর পতানি �হানাত তিলকরানি অইতই। অতাবাদেউ [[Special:RecentChanges|হাদি �হানর পতানিহানি]]-ত পাতা �হানরে '''গাঢ়করা''' মেয়েকে দেহা দেনা অইতই যাতে তি ন�ঙিকরে পাতা �হান চিনে পারবেতা।
 
 পিসেদে তি পাতা �হানরে থেইকরানি মনেইলে \"আহির-আর�মেত�ত থেইকরেদে\" ট�যাবগত ক�লিক করিস৷",
-'removedwatch'         => 'তালাবির পাতাত�ত গ�সাদে',
-'removedwatchtext'     => '�রে পাতা "[[:$1]]" �হান গ�সানি ইলতা [[Special:Watchlist|তর তালাবির]] পাতাত�ত।',
-'watch'                => 'তালাবি',
-'watchthispage'        => 'পাতা�হান খিয়ালে থ',
-'unwatch'              => 'তালাবি নেই',
-'unwatchthispage'      => 'তালাবি �রাদেনা',
-'watchlist-details'    => '{{PLURAL:$1|$1 পাতা|$1 পাতাহানি}} চানাঅসিল অতার কোন য়�যারির পাতা নেই।',
-'wlshowlast'           => 'গেলগা $1 ঘন�টা $2 দিনর $3 দেখাদে',
-'watchlist-hide-bots'  => 'বোটর পতানি থেইকর',
-'watchlist-hide-own'   => 'মি পতাস�তা গ�র',
-'watchlist-hide-minor' => 'হ�রকা পতানি থেইকর',
+'removedwatch'      => 'তালাবির পাতাত�ত গ�সাদে',
+'removedwatchtext'  => '�রে পাতা "[[:$1]]" �হান গ�সানি ইলতা [[Special:Watchlist|তর তালাবির]] পাতাত�ত।',
+'watch'             => 'তালাবি',
+'watchthispage'     => 'পাতা�হান খিয়ালে থ',
+'unwatch'           => 'তালাবি নেই',
+'unwatchthispage'   => 'তালাবি �রাদেনা',
+'watchlist-details' => '{{PLURAL:$1|$1 পাতা|$1 পাতাহানি}} চানাঅসিল অতার কোন য়�যারির পাতা নেই।',
+'wlshowlast'        => 'গেলগা $1 ঘন�টা $2 দিনর $3 দেখাদে',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'চা...',
@@ -663,31 +660,36 @@ $messages = array(
 
 'changed' => 'পতেসে',
 
-# Delete/protect/revert
-'deletepage'                  => 'পাতাহান প�স',
-'confirm'                     => 'লেপকরানি',
-'historywarning'              => 'সিঙ�ইস: তি যে পাতাহান প�সানিত লেপ�ইসত �হানর ইতিহাস আহান আসে:',
-'confirmdeletetext'           => 'তি যে পাতাহান প�সানি লেপ�ইসত অহানর লগে ইতিহাসহানউ প�সতই।
+# Delete
+'deletepage'            => 'পাতাহান প�স',
+'confirm'               => 'লেপকরানি',
+'historywarning'        => 'সিঙ�ইস: তি যে পাতাহান প�সানিত লেপ�ইসত �হানর ইতিহাস আহান আসে:',
+'confirmdeletetext'     => 'তি যে পাতাহান প�সানি লেপ�ইসত অহানর লগে ইতিহাসহানউ প�সতই।
 তি লেপকর যে তি �হান করতেই ব�লিয়া, বারো তি �হানর পিসহান হারপাসত লগে [[{{MediaWiki:Policy-url}}|পলিসিহান]] ইলয়া তি কাম�হান করানিত লেপ�ইসত।',
-'actioncomplete'              => 'কামহান লমিল।',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" প�সানি অইল।
+'actioncomplete'        => 'কামহান লমিল।',
+'deletedtext'           => '"<nowiki>$1</nowiki>" প�সানি অইল।
 চা $2 �হার বারে আগে আসে প�সানির লাতংগ।',
-'deletedarticle'              => 'প�সানিইল "[[$1]]"',
-'dellogpage'                  => 'প�সিসিতার লাতংগ',
-'deletecomment'               => 'প�সানির কারনহান:',
-'deleteotherreason'           => 'আরাক/উপরি কারন:',
-'deletereasonotherlist'       => 'আর আর কারন',
-'rollbacklink'                => 'রোলবেক',
-'cantrollback'                => 'আগেকার সঙস�করনহাত আলথকে যানা ন�ৱারল�, লমিলগা সম�পদনাকরেক�রা অগ পাতা অহানর আকখ�লা লেখকগ।',
+'deletedarticle'        => 'প�সানিইল "[[$1]]"',
+'dellogpage'            => 'প�সিসিতার লাতংগ',
+'deletecomment'         => 'প�সানির কারনহান:',
+'deleteotherreason'     => 'আরাক/উপরি কারন:',
+'deletereasonotherlist' => 'আর আর কারন',
+
+# Rollback
+'rollbacklink' => 'রোলবেক',
+'cantrollback' => 'আগেকার সঙস�করনহাত আলথকে যানা ন�ৱারল�, লমিলগা সম�পদনাকরেক�রা অগ পাতা অহানর আকখ�লা লেখকগ।',
+
+# Protect
 'protectlogpage'              => 'ল�করানির লগ',
+'prot_1movedto2'              => '[[$1]]-রে [[$2]]-ত গ�সানি ইল',
 'protectcomment'              => 'মতহান:',
 'protectexpiry'               => 'মিয়াদহান লালর:',
 'protect_expiry_invalid'      => 'খেন�তাম লিতনাহান লাল�ইসে।',
 'protect_expiry_old'          => 'বাতিলর খেন�তামহান আগেকার তারিখে পরিসে।',
 'protect-unchain'             => 'গ�সানি পারানির য়�যাথাঙ ম�কা',
-'protect-text'                => 'তি চেইলে <strong><nowiki>$1</nowiki> পাতাহানর ল�করানির মাত�রাহান চানা বারো সিলকরানি পারর</strong>।',
-'protect-locked-access'       => 'তরতা পাতা ল�করে পারানির মত য়�যাথাঙ নেই।
-পাতাহান <strong>$1</strong>র �পাগার পাজালানিহান:',
+'protect-text'                => "তি চেইলে '''<nowiki>$1</nowiki> পাতাহানর ল�করানির মাত�রাহান চানা বারো সিলকরানি পারর'''।",
+'protect-locked-access'       => "তরতা পাতা ল�করে পারানির মত য়�যাথাঙ নেই।
+পাতাহান '''$1'''র �পাগার পাজালানিহান:",
 'protect-cascadeon'           => '�রে পাতাহান �পাগা ল�করানি অসে, কারণ পাতাহানর তলে {{PLURAL:$1|পাতা আহানাত|পাতা হানিত}} অন�তর�ভ�ক�ত ইসে, যেহানাত আগপাতাকরেক�রাতাত ল�করানিহান আসে। তি চেইলে অহান সিলকরে পারর, তবে �রে আগপাতাকরেক�রাতাত কোন বদালা নাইব।',
 'protect-default'             => '(ডিফল�ট)',
 'protect-fallback'            => 'য়�যাথাং "$1" দরকার',
@@ -697,6 +699,7 @@ $messages = array(
 'protect-expiring'            => '$1 (আমাস) খেন�তামে মিয়াদহান লাল�ইতই',
 'protect-cascade'             => '�রে পাতাত মিহিসে পাতাহানি তালাবি করানি অক (আগপাতাকরেক�রা তালাবি)',
 'protect-cantedit'            => 'ল�করিসি পাতাহানরে তি সিলকরে নারবে, কিদিয়া ব�ল�লে তরতা পতানির য়�যাথাঙ নেই।',
+'protect-expiry-options'      => '২ ঘন�টা:2 hours,১ দিন:1 day,৩ দিন:3 days,হাপ�তা আহান:1 week,হাপ�তা দ�হান:2 weeks,মাহা আহান:1 month,৩ মাহা:3 months,৬ মাহা:6 months,বসর আহান:1 year,লম নেই সময়:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'য়�যাথাঙ:',
 'restriction-level'           => 'ল�করানির থাক:',
 
@@ -725,7 +728,6 @@ $messages = array(
 # What links here
 'whatlinkshere'       => 'যে পাতাহানিত�ত �হানাত মিলাপ আসে',
 'whatlinkshere-title' => 'পাতাহানি $1 -ত মিলাপ আসে',
-'linklistsub'         => '(মিলাপর লাতংগ)',
 'linkshere'           => "থাঙনার পাতাহানি '''[[:$1]]'''র লগে মিলাপ আসে:",
 'nolinkshere'         => "পাতা '''[[:$1]]'''হানাত কোন মিলাপ নেই।",
 'isredirect'          => 'ব�লনদের পাতা',
@@ -858,7 +860,7 @@ $messages = array(
 'show-big-image'       => 'প�ল�লাপ রিজলিউশন',
 'show-big-image-thumb' => '<small>আগচা হানর সাইজহান: $1 × $2 পিক�সেলস</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'ন�ৱা ফাইলর গ�যালারিগ',
 'ilsubmit'  => 'বিসারা',
 'bydate'    => 'তারিখর সিজিলন',
@@ -902,13 +904,8 @@ $messages = array(
 'confirmemail_loggedin'   => 'তর ই-মেইল ঠিকানাহার লেপকরানিহান চ�মিল।',
 
 # action=purge
-'confirm_purge'        => 'পাতা �হানর ক�যাশহান ঙক�ষি করানি মনারতা? 
-
-$1',
 'confirm_purge_button' => 'চ�মিসে',
-
-# AJAX search
-'articletitles' => "যে পাতাহানি ''$1'' ন অকরাগ, অতার তালিকা",
+'confirm-purge-top'    => 'পাতা �হানর ক�যাশহান ঙক�ষি করানি মনারতা?',
 
 # Auto-summaries
 'autoredircomment' => '[[$1]]-ত যানার বারো-র�নিদেশ করানি ইল',
diff --git a/languages/messages/MessagesBqi.php b/languages/messages/MessagesBqi.php
index 891a9867..4211b51c 100644
--- a/languages/messages/MessagesBqi.php
+++ b/languages/messages/MessagesBqi.php
@@ -49,6 +49,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'قایم کردن اصلاحات مو  زه لیست پیگیریها',
 'tog-watchlisthidebots'       => 'قایم کردن اصلاحات بوت زه لیست پیگیریها',
 'tog-watchlisthideminor'      => 'قایم کردن اصلاحات ریز زه لیست پیگیریها',
+'tog-watchlisthideliu'        => 'قایم کردن اصلاحات انجام وابیده  بوسیله کاربران داخل سیستم وابیده زه لیست پیگیریها',
+'tog-watchlisthideanons'      => 'قایم کردن اصلاحات انجام شده بوسیله کاربران داخل سیستم نشده زه لیست پیگیری',
 'tog-ccmeonemails'            => 'ارسال کپی امیلهایی که مو به  کاربران دیه ارسال کردم به مو',
 'tog-diffonly'                => 'نشو نده ص�حه ای که دارای محتوای مت�اوت زیره',
 'tog-showhiddencats'          => 'نشودادن دسته بندیهای قایم شده',
@@ -179,8 +181,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'درباره {{SITENAME}}',
 'aboutpage'            => 'Project:درباره',
-'bugreports'           => 'گزارشهای مهم',
-'bugreportspage'       => 'Project:گزارشهای مهم',
 'copyright'            => 'محتوا باای شماره قابل دسترسیه
  $1.',
 'copyrightpagename'    => '{{SITENAME}} کپی رایت',
@@ -204,6 +204,8 @@ $messages = array(
 
 'badaccess'        => 'خطا :اجازه بگیر',
 'badaccess-group0' => 'ایسا اجازه انجام کاری که خواستین را ندارین',
+'badaccess-groups' => 'او کاری که ایسا درخواست کردین �قط سی کاربرانیه که من ای  گروهن
+{{PLURAL:$2|آن گروه|یکی زه گروهها}}: $1.',
 
 'versionrequired'     => 'یه نسخه زه نیازمندیهای ویکی مدیا 
 $1',
@@ -290,6 +292,9 @@ $1',
 لط�ا بعد از دریا�ت آن داخل سیستم بوین.',
 'eauthentsent'            => 'یه نامه الکترونیکی سی تایید نشانی پست الکترونیکی به نشانی مورنظر ارسال وابید. قبل زه یو که نامه دیگری قابل ارسال به این نشانی بوه، وا دستورهایی که در آن نامه اویده را جهت تأیید ای مساله که ای نشانی مال ایسانه اجرا کنین.',
 
+# Password reset dialog
+'retypenew' => 'تایپ دوباره رمز:',
+
 # Edit page toolbar
 'bold_sample'     => 'متن گپ نما',
 'bold_tip'        => 'متن گپ نما',
@@ -312,6 +317,8 @@ $1',
 'hr_tip'          => 'خط ا�قی (کم است�اده کنین)',
 
 # Edit pages
+'summary'                => 'خلاصه:',
+'subject'                => 'موضوع/سرخط:',
 'minoredit'              => 'ای یه اصلاح ریزه-رز',
 'watchthis'              => 'پیگیری ای ص�حه',
 'savearticle'            => 'ص�حه ضبط بوه',
@@ -320,6 +327,7 @@ $1',
 'showdiff'               => 'نشودادن تغییرات',
 'anoneditwarning'        => "'''توجه:''' ایسا داخل سیستم نوابیدین.
 آی پی آدرستو درگزارش اصلاح ص�حه ضبط ابوه.",
+'summary-preview'        => 'پیش نمایش - خلاصه:',
 'blockedtext'            => ' "<big>\'\'\'دسترسی نام کاربری یا نشانی اینترنتی ایسا بسته وابیده.\'\'\'</big>
 ای کار توسط $1 انجام شده‌است.
 دلیلی که گده اینه: $2\'\'
@@ -338,8 +346,8 @@ $1',
 سی ایجاد ص�حه، داخل مستطیل زیر شروع به تایپ کنین (سی اطلاعات بیشتر به [[{{ns:project}}:راهنما|ص�حه راهنما]] برین).
 ایر اشتباهی ایچو اویدین دکمه «برگشت» مرورگرتو را بزنین.',
 'noarticletext'          => ' الان ای ص�حه متنی نداره، ایسا ترین [[Special:Search/{{PAGENAME}}عنوان ای ص�حه را در ص�حه‌های دیگر جستجو کنین]] یا [{{fullurl:{{FULLPAGENAME}}|action=edit}} ای ص�حه را اصلاح کنین].',
-'previewnote'            => '<strong>ای �قط یه پیش نمایشه;
-تغییراتی که ایسا دادین هنی ضبط نوابیده!</strong>',
+'previewnote'            => "'''ای �قط یه پیش نمایشه;
+تغییراتی که ایسا دادین هنی ضبط نوابیده!'''",
 'editing'                => 'درحال اصلاح $1',
 'editingsection'         => 'درحال اصلاح $1 (قسمت)',
 'copyrightwarning'       => "لط�اً دقت کنین که درنظر گریده ابوه که همه شراکتهای ایسا  {{SITENAME}} تحت «$2» منتشر ابون ). 
@@ -348,10 +356,10 @@ $1',
 (سی دیدن  جزئیات بیشتر به $1 برین
 
 ایر نه خوین نوشته‌هاتو بی‌رحمانه اصلاح بوه و به دلخواه ارسال بوه، ایچو ن�رستن.<br />
-درضمن ایسادارین به ایما قول ادین که خودتو یونه نوشتین یا هونه زه یک منبع آزاد با مالکیت عمومی یا مثل هو ورداشتین. <strong>کارهای دارای کارهای دارای حق کپی رایت را بی‌اجازه ن�رستین!</strong>',",
-'longpagewarning'        => '<strong>هشدار: ای ص�حه $1 کیلوبایت طول داره؛
+درضمن ایسادارین به ایما قول ادین که خودتو یونه نوشتین یا هونه زه یک منبع آزاد با مالکیت عمومی یا مثل هو ورداشتین. '''کارهای دارای کارهای دارای حق کپی رایت را بی‌اجازه ن�رستین!'''',",
+'longpagewarning'        => "'''هشدار: ای ص�حه $1 کیلوبایت طول داره؛
 بعضی زه مرورگرها ممکنه با اصلاح ص�حات نزدیک به ۳۲ کیلوبایت یا طولانی‌تر زه آن مشکلاتی داشته بون.
-لط�اً درمورد خرد کردن ای ص�حه به قسمت‌های کوچکتر �کر کنین.</strong>',
+لط�اً درمورد خرد کردن ای ص�حه به قسمت‌های کوچکتر �کر کنین.'''",
 'templatesused'          => 'قالبهای است�اده شده من ای ص�حه:',
 'templatesusedpreview'   => 'قالبها  یا الگوهای است�اده وابیده در ای پیش نمایش:',
 'template-protected'     => '(تحت حمایت)',
@@ -363,7 +371,7 @@ $1',
 'viewpagelogs'        => 'نشودادن نمایه ها سی ای ص�حه',
 'currentrev'          => 'نسخه جاری',
 'revisionasof'        => 'اصلاح $1',
-'revision-info'       => 'یه نسخه اصلاح شده درتاریخ  $1 بوسیله $2',
+'revision-info'       => 'یه نسخه اصلاح شده درتاریخ  $1 بوسیله $2', # Additionally available: $3: revision id
 'previousrevision'    => '� اصلاح قبلی',
 'nextrevision'        => 'نسخه بعدی →',
 'currentrevisionlink' => 'نسخه جاری',
@@ -389,17 +397,17 @@ $1',
 'diff-multi'              => '({{PLURAL:$1|یه اصلاح میانی|$1 اصلاحات میانی}} نشو داده نوابیده.)',
 
 # Search results
-'noexactmatch' => "'''ص�حه ای باای عنوان نه  \"\$1\".'''
+'noexactmatch'   => "'''ص�حه ای باای عنوان نه  \"\$1\".'''
 ایسا ترین [[:\$1| ای ص�حه را ایجاد کنین]].",
-'prevn'        => 'قبلی $1',
-'nextn'        => 'بعدی $1',
-'viewprevnext' => 'مشاهده ($1) ($2) ($3)',
-'powersearch'  => 'جستجوی کاملتر',
+'prevn'          => 'قبلی $1',
+'nextn'          => 'بعدی $1',
+'viewprevnext'   => 'مشاهده ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:محتوا',
+'powersearch'    => 'جستجوی کاملتر',
 
 # Preferences page
 'preferences'   => 'اولویتها',
 'mypreferences' => 'اولویتهای مو',
-'retypenew'     => 'تایپ دوباره رمز:',
 
 'grouppage-sysop' => '{{ns:project}}:مدیران',
 
@@ -441,10 +449,10 @@ $1',
 'uploadlogpage' => 'نمایه آپلود',
 'uploadedimage' => 'آپلود وابید "[[$1]]"',
 
-# Special:ImageList
-'imagelist' => 'لیست �ایل',
+# Special:ListFiles
+'listfiles' => 'لیست �ایل',
 
-# Image description page
+# File description page
 'filehist'                  => 'گزارش تاریخی �ایل',
 'filehist-help'             => 'رو تاریخ‌ها کلیک کنید تا نسخه مرتبط را ببینین.',
 'filehist-current'          => 'جاری',
@@ -546,53 +554,55 @@ $2',
 'emailuser' => 'امیل ای کاربر',
 
 # Watchlist
-'watchlist'            => 'لیست پیگیریهای مو',
-'mywatchlist'          => 'لیست پیگیریهای مو',
-'watchlistfor'         => "(سی '''$1''')",
-'addedwatch'           => 'اضا� وابید به لیست پیگیری',
-'addedwatchtext'       => "ص�حه «<nowiki>$1</nowiki>» به [[Special:Watchlist|لیست پی‌گیری‌های ]] ایسا   
+'watchlist'         => 'لیست پیگیریهای مو',
+'mywatchlist'       => 'لیست پیگیریهای مو',
+'watchlistfor'      => "(سی '''$1''')",
+'addedwatch'        => 'اضا� وابید به لیست پیگیری',
+'addedwatchtext'    => "ص�حه «<nowiki>$1</nowiki>» به [[Special:Watchlist|لیست پی‌گیری‌های ]] ایسا   
 اضا� وابید.
 تغییرات این ص�حه و ص�حه صحبت مر بوطه اش در آینده ایچو لیست ابوه. به‌علاوه، ای ص�حه، سی واضح‌تر دیده وابیدن در [[Special:RecentChanges|�هرست تغییرات اخیر]] به شکل <b>سیاه</b> ایا.
 
 ایر بعدا خواستین ای  ص�حه زه لیست پی‌گیریهاتو ورداشته بوه، رو «'''عدم پی‌گیری'''» در بالای ص�حه کلیک کنین.",
-'removedwatch'         => 'زه لیست پیگیری حذ� وابید',
-'removedwatchtext'     => 'آن ص�حه"[[:$1]]" جابجا وابیده زه[[Special:لیست پیگیری|لیست پیگیری ایسا]].',
-'watch'                => 'پی‌گیری',
-'watchthispage'        => 'پیگیری ای ص�حه',
-'unwatch'              => 'عدم پیگیری',
-'watchlist-details'    => '{{PLURAL:$1|$1 ص�حه|$1 ص�حات}} درلیست پیگیری ایسا, ص�حات صحبت حساب نیبوه.',
-'wlshowlast'           => 'نمایش آخرین $1 ساعت $2 روز $3',
-'watchlist-hide-bots'  => 'قایم کردن اصلاحات بوت یا ربات',
-'watchlist-hide-own'   => 'قایم کردن اصلاحات مو',
-'watchlist-hide-minor' => 'قایم کردن اصلاحات ریز',
+'removedwatch'      => 'زه لیست پیگیری حذ� وابید',
+'removedwatchtext'  => 'آن ص�حه"[[:$1]]" جابجا وابیده زه[[Special:لیست پیگیری|لیست پیگیری ایسا]].',
+'watch'             => 'پی‌گیری',
+'watchthispage'     => 'پیگیری ای ص�حه',
+'unwatch'           => 'عدم پیگیری',
+'watchlist-details' => '{{PLURAL:$1|$1 ص�حه|$1 ص�حات}} درلیست پیگیری ایسا, ص�حات صحبت حساب نیبوه.',
+'wlshowlast'        => 'نمایش آخرین $1 ساعت $2 روز $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'درحال پیگیری...',
 'unwatching' => 'درحالت عدم پیگیری...',
 
-# Delete/protect/revert
-'deletepage'                  => 'حذ� ص�حه',
-'historywarning'              => 'توجه: آن ص�حه ای که ایسا اخوین حذ� کنین گزارش تاریخی داره:',
-'confirmdeletetext'           => 'ایسا اخوین یه ص�حه بلند با همه گزارش تاریخی هونه حذ� کنین.
+# Delete
+'deletepage'            => 'حذ� ص�حه',
+'historywarning'        => 'توجه: آن ص�حه ای که ایسا اخوین حذ� کنین گزارش تاریخی داره:',
+'confirmdeletetext'     => 'ایسا اخوین یه ص�حه بلند با همه گزارش تاریخی هونه حذ� کنین.
 لط�ا کان�یرم یا تائید کنین که تمایل وقصد ای کار را دارین, وایسا دوین یا می دانید نتایج وآثار ای کار را, و ایسا انجام ادین ای کار را مطابق با [[{{MediaWiki:Policy-url}}|سیاست‌ها]].',
-'actioncomplete'              => 'عمل  مربوطه راکامل کن',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" حذ� وابیده.
+'actioncomplete'        => 'عمل  مربوطه راکامل کن',
+'deletedtext'           => '"<nowiki>$1</nowiki>" حذ� وابیده.
 بوین $2 سی ثبت حذ� آخر.',
-'deletedarticle'              => 'حذ� وابید "[[$1]]"',
-'dellogpage'                  => 'نمایه _ حذ�',
-'deletecomment'               => 'دلیل سی حذ�:',
-'deleteotherreason'           => 'دیه/دلیل اضا�ی:',
-'deletereasonotherlist'       => 'دلیل دیه',
-'rollbacklink'                => 'عقب گرد',
+'deletedarticle'        => 'حذ� وابید "[[$1]]"',
+'dellogpage'            => 'نمایه _ حذ�',
+'deletecomment'         => 'دلیل سی حذ�:',
+'deleteotherreason'     => 'دیه/دلیل اضا�ی:',
+'deletereasonotherlist' => 'دلیل دیه',
+
+# Rollback
+'rollbacklink' => 'عقب گرد',
+
+# Protect
 'protectlogpage'              => 'نمایه ح�اظت وحمایت',
+'prot_1movedto2'              => '[[$1]] جابجا وابید به[[$2]]',
 'protectcomment'              => 'توضیح:',
 'protectexpiry'               => 'سپری وابیده ها:',
 'protect_expiry_invalid'      => 'با سپری وابیدن وقت غیر معتبره.',
 'protect_expiry_old'          => 'سپری وابیدن وقت مربوط به گذشته.',
 'protect-unchain'             => 'واز کردن جابجایی با اجازه گرئدن',
-'protect-text'                => 'ایسا ممکنه بوینین وتغییر بدین سطح حمایت زه ای ص�حه<strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'حساب کاربری ایسا اجازه تغییر سطح حمایت ای ص�حه را نداره.
-ای چونه تنظیمات جاری سی آن ص�حه <strong>$1</strong>:',
+'protect-text'                => "ایسا ممکنه بوینین وتغییر بدین سطح حمایت زه ای ص�حه'''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "حساب کاربری ایسا اجازه تغییر سطح حمایت ای ص�حه را نداره.
+ای چونه تنظیمات جاری سی آن ص�حه '''$1''':",
 'protect-cascadeon'           => 'ای ص�حه  در حال حاضر ح�اظت وحمایت وابیده چون که در {{PLURAL:$1|ص�حه|ص�حات}}
 زیر که گزینه ح�اظت وحمایت موجی {{PLURAL:$1|آن|آن‌ها}} �عال هده ،
 ایسا ترین سطح ح�اظت ای ص�حه را تغییر بدین اما ای کارنتره تاثیری رو 
@@ -605,6 +615,7 @@ $2',
 'protect-expiring'            => 'سپری وابیده $1 (UTC)',
 'protect-cascade'             => 'حمایت ص�حات دربرگیرنده در ای ص�حه (cascading protection)',
 'protect-cantedit'            => 'ایسا نترین تغییر بدین سطوح حمایتی ای ص�حه را, زیرا ایسا اجازه اصلاح آن را ندارین.',
+'protect-expiry-options'      => '۲ ساعت:2 hours,۱ روز:1 day,۳ روز:3 days,۱ ه�ته:1 week,۲ ه�ته:2 weeks,۱ ماه:1 month,۳ ماه:3 months,۶ ماه:6 months,۱ سال:1 year,بی‌پایان:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'اجازه:',
 'restriction-level'           => 'سطح محدودیت:',
 
@@ -754,6 +765,7 @@ $2',
 'tooltip-watch'                   => 'اضا� کردن ای ص�حه به �هرست مشاهداتتان',
 'tooltip-recreate'                => 'دوباره درست کردن ص�حه ای که زه رو کینه وغرض پاک وابیده',
 'tooltip-upload'                  => 'شروع آپلود',
+'tooltip-rollback'                => '"اعاده" برگرداندن به وضع اولیه سی ای ص�حه که بخاطر مشارکت  آخر اصلاح وابیده بایک کلیک',
 
 # Browsing diffs
 'previousdiff' => '� اصلاح قدیمی',
@@ -766,7 +778,7 @@ $2',
 'show-big-image'       => 'تصویر با قابلیت ت�کیک کامل',
 'show-big-image-thumb' => '<کوچیک>اندازه پیش نمایش: $1 × $2 پیکسلها</کوچیک>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'گالری �ایلهای تازه',
 
 # Bad image list
diff --git a/languages/messages/MessagesBr.php b/languages/messages/MessagesBr.php
index 320002c3..60742ce8 100644
--- a/languages/messages/MessagesBr.php
+++ b/languages/messages/MessagesBr.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Als-Holder
  * @author Fulup
  * @author לערי ריינה�רט
  */
@@ -17,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Kaozeadenn_Implijer',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Kaozeadenn_$1',
-	NS_IMAGE          => 'Skeudenn',
-	NS_IMAGE_TALK     => 'Kaozeadenn_Skeudenn',
+	NS_FILE           => 'Skeudenn',
+	NS_FILE_TALK      => 'Kaozeadenn_Skeudenn',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Kaozeadenn_MediaWiki',
 	NS_TEMPLATE       => 'Patrom',
@@ -29,14 +30,45 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Kaozeadenn_Rummad'
 );
 
-$skinNames = array(
-	'standard'    => 'Standard',
-	'nostalgia'   => 'Melkoni',
-	'cologneblue' => 'Glaz Kologn',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Plogig',
-	'simple'      => 'Eeun',
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'AdksaoùDoubl' ),
+	'BrokenRedirects'           => array( 'AdkasoùTorr' ),
+	'Disambiguations'           => array( 'Digejañ' ),
+	'CreateAccount'             => array( 'KrouiñKont' ),
+	'Preferences'               => array( 'Penndibaboù' ),
+	'Watchlist'                 => array( 'Roll evezhiañ' ),
+	'Recentchanges'             => array( 'KemmoùDiwezhañ' ),
+	'Upload'                    => array( 'Pellgargañ' ),
+	'Listfiles'                 => array( 'RollSkeudennoù' ),
+	'Newimages'                 => array( 'SkeudennoùNevez' ),
+	'Statistics'                => array( 'Stadegoù' ),
+	'Newpages'                  => array( 'PajennoùNevez' ),
+	'Ancientpages'              => array( 'PajennoùKozh' ),
+	'Categories'                => array( 'Rummadoù' ),
+	'Export'                    => array( 'Ezporzhiañ' ),
+	'Version'                   => array( 'Stumm' ),
+	'Undelete'                  => array( 'Diziverkañ' ),
+	'Import'                    => array( 'Enporzhiañ' ),
+	'Mypage'                    => array( 'MaFajenn' ),
+	'Search'                    => array( 'Klask' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#ADKAS', '#REDIRECT' ),
+	'img_right'             => array( '1', 'dehou', 'right' ),
+	'img_left'              => array( '1', 'kleiz', 'left' ),
+	'img_none'              => array( '1', 'netra', 'none' ),
+	'img_center'            => array( '1', 'kreiz', 'center', 'centre' ),
+	'img_top'               => array( '1', 'krec\'h', 'top' ),
+	'img_middle'            => array( '1', 'kreiz', 'middle' ),
+	'img_bottom'            => array( '1', 'traoñ', 'bottom' ),
+	'server'                => array( '0', 'SERVIJER', 'SERVER' ),
+	'grammar'               => array( '0', 'YEZHADUR:', 'GRAMMAR:' ),
+	'plural'                => array( '0', 'LIESTER:', 'PLURAL:' ),
+	'currentversion'        => array( '1', 'STUMMRED', 'CURRENTVERSION' ),
+	'language'              => array( '0', '#YEZH:', '#LANGUAGE:' ),
+	'special'               => array( '0', 'dibar', 'special' ),
 );
 
 $bookstoreList = array(
@@ -55,7 +87,7 @@ $dateFormats = array(
 );
 
 $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
-$linkTrail = "/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄË�ÖÜÀÈÙ]+)(.*)$/sDu";
+$linkTrail = "/^((?:c\'h|C\'H|C\'h|c’h|C’H|C’h|[a-zA-ZàâçéèêîôûäëïöüùñÇÉÂÊÎÔÛÄË�ÖÜÀÈÙÑ])+)(.*)$/sDu";
 
 $messages = array(
 # User preference toggles
@@ -95,17 +127,18 @@ $messages = array(
 'tog-watchlisthideown'        => "Kuzhat ma c'hemmoù er rollad evezhiañ",
 'tog-watchlisthidebots'       => 'Kuzhat kemmoù ar botoù er rollad evezhiañ',
 'tog-watchlisthideminor'      => "Kuzhat ar c'hemmoù dister er rollad evezhiañ",
+'tog-watchlisthideliu'        => 'Er roll evezhiañ, kuzhat kemmoù an implijerien kevreet.',
+'tog-watchlisthideanons'      => 'Er roll evezhiañ, kuzhat kemmoù an implijerien dianav',
 'tog-nolangconversion'        => "Diweredekaat an treiñ diforc'hioù yezh",
 'tog-ccmeonemails'            => 'Kas din un eilenn eus ar posteloù a gasan da implijerien all',
 'tog-diffonly'                => "Arabat diskouez danvez ar pennadoù dindan an diforc'hioù",
 'tog-showhiddencats'          => 'Diskouez ar rummadoù kuzhet',
+'tog-norollbackdiff'          => 'Na ziskouez an diff goude un distaoladenn',
 
 'underline-always'  => 'Atav',
 'underline-never'   => 'Morse',
 'underline-default' => 'Diouzh ar merdeer',
 
-'skinpreview' => '(Rakwelet)',
-
 # Dates
 'sunday'        => 'Sul',
 'monday'        => 'Lun',
@@ -199,7 +232,7 @@ $messages = array(
 'mytalk'         => "Ma c'haozeadennoù",
 'anontalk'       => "Kaozeal gant ar chomlec'h IP-mañ",
 'navigation'     => 'Merdeiñ',
-'and'            => 'ha(g)',
+'and'            => '&#32;ha(g)',
 
 # Metadata in edit box
 'metadata_help' => 'Metaroadennoù :',
@@ -236,14 +269,14 @@ $messages = array(
 'talkpagelinktext'  => 'Kaozeal',
 'specialpage'       => 'Pajenn zibar',
 'personaltools'     => 'Ostilhoù personel',
-'postcomment'       => 'Ouzhpennañ e soñj',
+'postcomment'       => 'Rann nevez',
 'articlepage'       => 'Sellet ouzh ar pennad',
 'talk'              => 'Kaozeal',
 'views'             => 'Gweladennoù',
 'toolbox'           => 'Boest ostilhoù',
 'userpage'          => 'Pajenn implijer',
 'projectpage'       => 'Pajenn meta',
-'imagepage'         => 'Pajenn skeudenn',
+'imagepage'         => 'Gwelet pajenn ar restr',
 'mediawikipage'     => "Sellet ouzh pajenn ar c'hemennadennoù",
 'templatepage'      => 'Gwelet patrom ar bajenn',
 'viewhelppage'      => 'Gwelet ar bajenn skoazell',
@@ -262,8 +295,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Diwar-benn {{SITENAME}}',
 'aboutpage'            => 'Project:Diwar-benn',
-'bugreports'           => 'Teul an drein',
-'bugreportspage'       => 'Project:Teul an drein',
 'copyright'            => "Danvez a c'haller implijout dindan $1.",
 'copyrightpagename'    => 'aotre {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Gwirioù aozer (Copyright)',
@@ -286,9 +317,7 @@ $messages = array(
 
 'badaccess'        => 'Fazi aotre',
 'badaccess-group0' => "N'oc'h ket aotreet da seveniñ ar pezh hoc'h eus goulennet.",
-'badaccess-group1' => 'Miret eo an ober-mañ evit an dud er strollad $1 hepken.',
-'badaccess-group2' => 'Miret eo an ober-mañ evit an dud en unan eus ar strolladoù $1 hepken.',
-'badaccess-groups' => 'Miret eo an ober-mañ evit an dud en unan eus ar strolladoù $1 hepken.',
+'badaccess-groups' => 'Miret eo an ober-mañ evit an implijerien zo {{PLURAL:$2|er strollad|en unan eus ar strolladoù}} : $1.',
 
 'versionrequired'     => 'Rekis eo Stumm $1 MediaWiki',
 'versionrequiredtext' => 'Rekis eo stumm $1 MediaWiki evit implijout ar bajenn-mañ. Sellit ouzh [[Special:Version]]',
@@ -302,6 +331,8 @@ $messages = array(
 'editsection'             => 'kemmañ',
 'editold'                 => 'kemmañ',
 'viewsourceold'           => 'gwelet ar vammenn',
+'editlink'                => 'kemmañ',
+'viewsourcelink'          => 'gwelet an tarzh',
 'editsectionhint'         => 'Kemmañ ar rann : $1',
 'toc'                     => 'Taolenn',
 'showtoc'                 => 'diskouez',
@@ -316,13 +347,13 @@ $messages = array(
 'site-atom-feed'          => 'Lanv Atom evit $1',
 'page-rss-feed'           => 'Lanv RSS evit "$1"',
 'page-atom-feed'          => 'Lanv Atom evit "$1"',
-'red-link-title'          => "$1 (n'eo ket bet savet c'hoazh)",
+'red-link-title'          => "$1 (n'eus ket eus ar bajenn-mañ)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pennad',
 'nstab-user'      => 'Pajenn implijer',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Dibar',
+'nstab-special'   => 'Pajenn dibar',
 'nstab-project'   => 'Diwar-benn',
 'nstab-image'     => 'Skeudenn',
 'nstab-mediawiki' => 'Kemennadenn',
@@ -332,7 +363,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Ober dianav',
-'nosuchactiontext'  => "N'eo ket anavezet gant ar wiki an ober spisaet en Url.",
+'nosuchactiontext'  => "Direizh eo an ober spisaet en URL.
+Marteze hoc'h eus graet ur fazi bizskrivañ en URL pe heuliet ul liamm kamm.
+Marteze zo un draen er meziant implijet gant {{SITENAME}} ivez.",
 'nosuchspecialpage' => "N'eus ket eus ar bajenn zibar-mañ",
 'nospecialpagetext' => "Goulennet hoc'h eus ur bajenn zibar n'eo ket anavezet gant ar wiki.",
 
@@ -380,7 +413,6 @@ Kasit keloù d'ur [[Special:ListUsers/sysop|merer]], en ur verkañ dezhañ choml
 'cannotdelete'         => 'Dibosupl da ziverkañ ar bajenn pe ar skeudenn spisaet.',
 'badtitle'             => 'Titl fall',
 'badtitletext'         => "Faziek pe c'houllo eo titl ar bajenn goulennet; pe neuze eo faziek al liamm etreyezhel",
-'perfdisabled'         => "Ho tigarez! Diweredekaet eo bet an arc'hwel-mañ evit poent rak gorrekaat a ra ar bank roadennoù kement ha ma n'hall ket mui den implijout ar wiki.",
 'perfcached'           => "Krubuilhet eo ar roadennoù da-heul ha marteze n'int ket bet hizivaet.",
 'perfcachedts'         => "Krubuilhet eo ar roadennoù-mañ; hizivaet int bet da ziwezhañ d'an $1.",
 'querypage-no-updates' => 'Diweredekaet eo an hizivaat evit ar bajenn-mañ. Evit poent ne vo ket nevesaet ar roadennoù amañ.',
@@ -394,7 +426,7 @@ Goulenn : $2",
 'protectedpagetext'    => "Prennet eo bet ar bajenn-mañ. N'haller ket degas kemmoù enni.",
 'viewsourcetext'       => 'Gallout a rit gwelet hag eilañ danvez ar bajenn-mañ',
 'protectedinterface'   => 'Testenn ar bajenn-mañ a dalvez evit etrefas ar meziant. Setu perak eo bet gwarezet ar bajenn.',
-'editinginterface'     => "'''Diwallit :''' Emaoc'h oc'h adaozañ ur bajenn a dalvez da sevel skridoù evit etrefas ar meziant. Ar c'hemmoù graet d'ar bajenn-mañ a zegaso kemmoù war etrefas an holl implijerien. Mar fell deoc'h skoazellañ evit treiñ traoù, soñjit kentoc'h implijout [http://translatewiki.net/wiki/Main_Page?setlang=br Betawiki], ar raktres evit lec'helaat MediaWiki.",
+'editinginterface'     => "'''Diwallit :''' Emaoc'h oc'h adaozañ ur bajenn a dalvez da sevel skridoù evit etrefas ar meziant. Ar c'hemmoù graet d'ar bajenn-mañ a zegaso kemmoù war etrefas an holl implijerien. Mar fell deoc'h skoazellañ evit treiñ traoù, soñjit kentoc'h implijout [http://translatewiki.net/wiki/Main_Page?setlang=br translatewiki.net], ar raktres evit lec'helaat MediaWiki.",
 'sqlhidden'            => '(Reked SQL kuzhet)',
 'cascadeprotected'     => 'Gwarezet eo ar bajenn-mañ; n\'haller ket degas kemmoù enni peogwir he c\'haver er {{PLURAL:$1|bajenn|pajennoù}} da-heul zo bet gwarezet en ur zibab an dibarzh "skalierad" :
 $2',
@@ -405,7 +437,7 @@ $2',
 Setu amañ perak ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Kefluniadur fall : skanner viruzoù dianav : <i>$1</i>',
+'virus-badscanner'     => "Kefluniadur fall : skanner viruzoù dianav : ''$1''",
 'virus-scanfailed'     => "Skannadenn c'hwitet (kod $1)",
 'virus-unknownscanner' => 'diviruzer dianav :',
 
@@ -424,7 +456,6 @@ Na zisoñjit ket resisaat ho [[Special:Preferences|penndibaboù evit {{SITENAME}
 'remembermypassword'         => "Derc'hel soñj eus ma ger-tremen (toupin)",
 'yourdomainname'             => 'Ho tomani',
 'externaldberror'            => "Pe ez eus bet ur fazi gwiriekaat diavaez er bank titouroù pe n'oc'h ket aotreet da nevesaat ho kont diavaez.",
-'loginproblem'               => '<b>Kudenn zisklêriañ.</b><br />Klaskit en-dro !',
 'login'                      => 'Disklêriañ',
 'nav-login-createaccount'    => 'Krouiñ ur gont pe en em lugañ',
 'loginprompt'                => "Ret eo deoc'h bezañ gweredekaet an toupinoù evit bezañ luget ouzh {{SITENAME}}.",
@@ -464,6 +495,7 @@ Gallout a rit lezel tud all da vont e darempred ganeoc'h dre ho pajennoù implij
 'loginsuccesstitle'          => "Disklêriet oc'h.",
 'loginsuccess'               => 'Luget oc\'h bremañ war {{SITENAME}} evel "$1".',
 'nosuchuser'                 => 'N\'eus ket eus an implijer "$1".
+Kizidik eo anv an implijer ouzh ar pennlizherennoù
 Gwiriit eo bet skrivet mat an anv ganeoc\'h pe [[Special:UserLogin/signup|krouit ur gont nevez]].',
 'nosuchusershort'            => "N'eus perzhiad ebet gantañ an anv « <nowiki>$1</nowiki> ». Gwiriit ar reizhskrivadur.",
 'nouserspecified'            => "Ret eo deoc'h spisaat un anv implijer.",
@@ -489,8 +521,8 @@ A-raok na vije kaset postel ebet d'ar gont-se e vo ret deoc'h heuliañ ar c'huzu
 'throttled-mailpassword'     => "Kaset ez eus bet deoc'h ur postel degas soñj e-kerzh an
 {{PLURAL:$1|eurvezh|$1 eurvezh}} ziwezhañ. Evit mirout ouzh nep gaou ne gaser nemet ur postel a-seurt-se dre {{PLURAL:$1|eurvezh|$1 eurvezh}}.",
 'mailerror'                  => 'Fazi en ur gas ar postel : $1',
-'acct_creation_throttle_hit' => "Ho tigarez, krouet ez eus bet $1 (c'h)gont ganeoc'h dija. N'hallit ket krouiñ unan nevez.",
-'emailauthenticated'         => "Gwiriet eo bet ho chomlec'h postel d'an $1.",
+'acct_creation_throttle_hit' => "{{PLURAL:$1|1 gont|$1 kont}} zo bet krouet c'hoazh nevez zo dre ho chomlec'h IP gant gweladennerien d'ar wiki-mañ, ar pezh zo an niver brasañ aotreet. Dre se, n'hall ket ket ar weladennerien a implij an IP-mañ krouiñ kontoù mui evit ar mare.",
+'emailauthenticated'         => "Gwiriet eo bet ho chomlec'h postel d'an $2 da $3.",
 'emailnotauthenticated'      => "N'eo ket bet gwiriekaet ho chomlec'h postel evit c'hoazh. Ne vo ket tu da gas postel ebet deoc'h evit hini ebet eus an dezverkoù dindan.",
 'noemailprefs'               => "Merkit ur chomlec'h postel mar fell deoc'h ez afe an arc'hwelioù-mañ en-dro.",
 'emailconfirmlink'           => "Kadarnait ho chomlec'h postel",
@@ -503,18 +535,25 @@ Merkit ur chomlec'h reizh pe goullonderit ar vaezienn-mañ.",
 Mat e vefe deoc\'h en em lugañ ha cheñch ho ker-tremen bremañ.
 
 Na daolit ket evezh ouzh ar c\'hemenn-mañ m\'eo bet krouet ar gont dre fazi.',
+'login-throttled'            => "Re oc'h eus klasket mont ouzh ger-tremen ar gont-mañ. Gortozit a-raok klask en-dro.",
 'loginlanguagelabel'         => 'Yezh : $1',
 
 # Password reset dialog
-'resetpass'               => 'Adsevel ar ger-tremen',
-'resetpass_announce'      => "En em enrollet oc’h dre ur ger-tremen da c'hortoz kaset deoc'h dre bostel. A-benn bezañ enrollet da vat e rankit spisaat ur ger-tremen nevez amañ :",
-'resetpass_text'          => '<!-- Ouzhpennañ testenn amañ -->',
-'resetpass_header'        => 'Adsevel ar ger-tremen',
-'resetpass_submit'        => 'Kemmañ ar ger-tremen hag en em lugañ',
-'resetpass_success'       => "Kemmet mat eo bet ho ker-temen ! Emaoc'h oc'h en em lugañ e-barzh...",
-'resetpass_bad_temporary' => "Ger-tremen da c'hortoz faziek. Marteze hoc'h eus cheñchet ho ker-tremen dija pe hoc'h eus goulennet ur ger-tremen da c'hortoz all.",
-'resetpass_forbidden'     => "N'haller ket cheñch ar gerioù-termen",
-'resetpass_missing'       => "N'eus bet lakaet titour ebet.",
+'resetpass'                 => 'Kemmañ ger-tremen',
+'resetpass_announce'        => "En em enrollet oc’h dre ur ger-tremen da c'hortoz kaset deoc'h dre bostel. A-benn bezañ enrollet da vat e rankit spisaat ur ger-tremen nevez amañ :",
+'resetpass_text'            => '<!-- Ouzhpennañ testenn amañ -->',
+'resetpass_header'          => 'Kemmañ ger-tremen ar gont',
+'oldpassword'               => 'Ger-tremen kozh',
+'newpassword'               => 'Ger-tremen nevez :',
+'retypenew'                 => 'Kadarnaat ar ger-tremen nevez',
+'resetpass_submit'          => 'Kemmañ ar ger-tremen hag en em lugañ',
+'resetpass_success'         => "Kemmet mat eo bet ho ker-temen ! Emaoc'h oc'h en em lugañ e-barzh...",
+'resetpass_bad_temporary'   => "Ger-tremen da c'hortoz faziek. Marteze hoc'h eus cheñchet ho ker-tremen dija pe hoc'h eus goulennet ur ger-tremen da c'hortoz all.",
+'resetpass_forbidden'       => "N'haller ket cheñch ar gerioù-termen",
+'resetpass-no-info'         => "Ret eo deoc'h bezañ luget a-benn mont d'ar bajenn-se war-eeun.",
+'resetpass-submit-loggedin' => 'Kemmañ ar ger-tremen',
+'resetpass-wrong-oldpass'   => "Direizh eo ar ger-tremen a-vremañ pe da c'hortoz.",
+'resetpass-temp-password'   => "Ger-tremen da c'hortoz :",
 
 # Edit page toolbar
 'bold_sample'     => 'Testenn dev',
@@ -539,8 +578,8 @@ Na daolit ket evezh ouzh ar c\'hemenn-mañ m\'eo bet krouet ar gont dre fazi.',
 'hr_tip'          => 'Liamm a-led (arabat implijout re)',
 
 # Edit pages
-'summary'                          => 'Diverrañ&nbsp;',
-'subject'                          => 'Danvez/titl',
+'summary'                          => 'Diverrañ&nbsp;:',
+'subject'                          => 'Danvez/titl:',
 'minoredit'                        => 'Kemm dister',
 'watchthis'                        => 'Evezhiañ ar pennad-mañ',
 'savearticle'                      => 'Enrollañ',
@@ -552,8 +591,8 @@ Na daolit ket evezh ouzh ar c\'hemenn-mañ m\'eo bet krouet ar gont dre fazi.',
 'missingsummary'                   => "'''Taolit evezh:''' N'hoc'h eus ket lakaet tamm testenn diverrañ ebet evit ho kemmoù. Mar klikit war enrollañ en-dro, e vo enrollet ho testenn evel m'emañ hepmuiken.",
 'missingcommenttext'               => "Skrivit hoc'h evezhiadenn a-is.",
 'missingcommentheader'             => "'''Taolit evezh:''' N'hoc'h eus ket lakaet tamm danvez/titl ebet evit hoc'h evezhiadenn. Mar klikit war enrollañ en-dro, e vo enrollet ho testenn evel m'emañ hepmuiken.",
-'summary-preview'                  => 'Rakwelet an diverrañ',
-'subject-preview'                  => 'Rakwelet danvez/titl',
+'summary-preview'                  => 'Rakwelet an diverrañ:',
+'subject-preview'                  => 'Rakwelet danvez/titl:',
 'blockedtitle'                     => 'Implijer stanket',
 'blockedtext'                      => "<big>'''Stanket eo bet ho kont implijer pe ho chomlec'h IP'''</big>
 
@@ -602,52 +641,56 @@ Merkit mat an titouroù-se war kement goulenn savet ganeoc'h.
 'newarticle'                       => '(Nevez)',
 'newarticletext'                   => 'Skrivit amañ testenn ho pennad.',
 'anontalkpagetext'                 => "---- ''Homañ eo ar bajenn gaozeal evit un implijer(ez) dianv n'eus ket c'hoazh krouet kont ebet pe na implij ket anezhi. Setu perak e rankomp ober gant ar chomlec'h IP niverel evit disklêriañ anezhañ/i. Gallout a ra ur chomlec'h a seurt-se bezañ rannet etre meur a implijer(ez). Ma'z oc'h un implijer(ez) dianv ha ma stadit ez eus bet kaset deoc'h kemennadennoù na sellont ket ouzhoc'h, gallout a rit [[Special:UserLogin|krouiñ ur gont pe en em lugañ]] kuit a vagañ muioc'h a gemmesk.",
-'noarticletext'                    => "N'eus evit poent tamm skrid ebet war ar bajenn-mañ, gallout a rit [[Special:Search/{{PAGENAME}}|klask an titl anezhañ]] war pajennoù all pe [{{fullurl:{{FULLPAGENAME}}|action=edit}} kemmañ ar bajenn diouzhtu].",
+'noarticletext'                    => 'N\'eus tamm skrid ebet war ar bajenn-mañ evit poent.
+Gallout a rit [[Special:Search/{{PAGENAME}}|klask an titl anezhi]] e pajennoù all,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} klask en oberiadennoù liammet], pe [{{fullurl:{{FULLPAGENAME}}|action=edit}} krouiñ ar bajenn]</span>.',
 'userpage-userdoesnotexist'        => 'N\'eo ket enrollet ar gont "$1". Merkit ma fell deoc\'h krouiñ/kemmañ ar bajenn-mañ.',
 'clearyourcache'                   => "'''Notenn :''' Goude bezañ enrollet ho pajenn e rankot freskaat krubuilh ho merdeer a-bennn gwelet ar c'hemmoù : '''Mozilla / Firefox / Safari : ''' dalc'hit ''Pennlizherenn'' en ur glikañ war ''Adkargañ'', pe pouezañ war ''Ctrl-F5'' pe ''Ctrl-R'' (''Command-R'' war ur Macintosh); '''Konqueror: '''klikañ war ''Adkargañ'' pe pouezañ war ''F5;'' '''Opera:''' riñsañ ar grubuilh e ''Ostilhoù → Penndibaboù;'' '''Internet Explorer:''' derc'hel ''Ctrl'' en ur glikañ war ''Freskaat,'' pe pouezañ war ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Tun :</strong> Grit gant ar bouton '''Rakwelet''' evit testiñ ho follenn CSS/JS nevez a-raok enrollañ anezhi.",
+'usercssjsyoucanpreview'           => "'''Tun :''' Grit gant ar bouton '''Rakwelet''' evit testiñ ho follenn CSS/JS nevez a-raok enrollañ anezhi.",
 'usercsspreview'                   => "'''Dalc'hit soñj n'emaoc'h nemet o rakwelet ho follenn CSS deoc'h.'''
 '''N'eo ket bet enrollet evit c'hoazh!'''",
 'userjspreview'                    => "'''Dalc'hit soñj emaoc'h o rakwelet pe o testiñ ho kod javascript deoc'h ha n'eo ket bet enrollet c'hoazh!'''",
 'userinvalidcssjstitle'            => "'''Diwallit:''' N'eus tamm gwiskadur \"\$1\" ebet. Ho pez soñj e vez implijet lizherennoù bihan goude an anv implijer hag ar veskell / gant ar pajennoù personel dezho un astenn .css ha .js; da skouer eo mat ar follenn stil {{ns:user}}:Foo/monobook.css ha faziek an hini {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Hizivaet)',
-'note'                             => '<strong>Notenn :</strong>',
-'previewnote'                      => "<strong>Diwallit mat, n'eus nemet ur rakweled eus an destenn-mañ, n'eo ket enrollet c'hoazh!</strong>",
+'note'                             => "'''Notenn :'''",
+'previewnote'                      => "'''Diwallit mat, n'eus nemet ur rakweled eus an destenn-mañ, n'eo ket enrollet c'hoazh!'''",
 'previewconflict'                  => 'Gant ar rakweled e teu testenn ar bajenn war wel evel ma vo pa vo bet enrollet.',
-'session_fail_preview'             => "<strong>Ho tigarez! N'eus ket bet tu da enrollañ ho kemmoù rak kollet eo bet roadennoù an dalc'h. Klaskit en-dro mar plij. Ma ne'z a ket en-dro c'hoazh, klaskit dilugañ ho kont ha lugañ en-dro.</strong>",
-'session_fail_preview_html'        => "<strong>Ho tigarez! N'omp ket bet gouest da enrollañ ho kemmoù rak kollet ez eus bet roadennoù e-kerzh an dalc'h.</strong>
+'session_fail_preview'             => "'''Ho tigarez! N'eus ket bet tu da enrollañ ho kemmoù rak kollet eo bet roadennoù an dalc'h. Klaskit en-dro mar plij. Ma ne'z a ket en-dro c'hoazh, klaskit dilugañ ho kont ha lugañ en-dro.'''",
+'session_fail_preview_html'        => "'''Ho tigarez! N'omp ket bet gouest da enrollañ ho kemmoù rak kollet ez eus bet roadennoù e-kerzh an dalc'h.'''
 
 ''Gweredekaet eo al linenoù HTML e {{SITENAME}}. Rak-se eo kuzh ar rakweledoù a-benn en em zifenn diouzh an tagadennoù JavaScript.''
 
-<strong>Mard e oa onest ar c'hemmoù oc'h eus klasket degas, klaskit en-dro. Mar ned a ket en-dro, klaskit dilugañ ha lugañ en-dro (pe digevreañ/kevreañ).</strong>",
-'token_suffix_mismatch'            => "<strong>Distaolet eo bet ar c'hemmoù degaset ganeoc'h abalamour ma oa bet kemmesket an arouezennoù poentadur gant ho merdeer en daveer kemmañ. Distaolet eo bet ar c'hemmoù kuit na vije breinet ar bajennad skrid.
-C'hoarvezout a ra a-wechoù pa implijit ur servijer proksi dreinek dizanav.</strong>",
+'''Mard e oa onest ar c'hemmoù oc'h eus klasket degas, klaskit en-dro. Mar ned a ket en-dro, klaskit dilugañ ha lugañ en-dro (pe digevreañ/kevreañ).'''",
+'token_suffix_mismatch'            => "'''Distaolet eo bet ar c'hemmoù degaset ganeoc'h abalamour ma oa bet kemmesket an arouezennoù poentadur gant ho merdeer en daveer kemmañ. Distaolet eo bet ar c'hemmoù kuit na vije breinet ar bajennad skrid.
+C'hoarvezout a ra a-wechoù pa implijit ur servijer proksi dreinek dizanav.'''",
 'editing'                          => "oc'h aozañ $1",
 'editingsection'                   => "oc'h aozañ $1 (rann)",
-'editingcomment'                   => "oc'h aozañ $1 (soñj)",
+'editingcomment'                   => "Oc'h kemmañ $1 (rann nevez)",
 'editconflict'                     => 'tabut kemmañ : $1',
 'explainconflict'                  => "<b>Enrollet eo bet ar bajenn-mañ war-lerc'h m'ho pefe kroget d'he c'hemmañ.
 E-krec'h an takad aozañ emañ an destenn evel m'emañ enrollet bremañ er bank roadennoù. Ho kemmoù deoc'h a zeu war wel en takad aozañ traoñ. Ret e vo deoc'h degas ho kemmoù d'an destenn zo evit poent. N'eus nemet an destenn zo en takad krec'h a vo saveteet.</b><br />",
 'yourtext'                         => 'Ho testenn',
 'storedversion'                    => 'Stumm enrollet',
-'nonunicodebrowser'                => "<strong>DIWALLIT: N'eo ket skoret an Unicode gant ho merdeer. Un diskoulm da c'hortoz zo bet kavet evit ma c'hallfec'h degas kemmoù er pennadoù : dont a raio war wel an arouezennoù an-ASCII er prenestr skridaozañ evel kodoù eizhdekvedennel.</strong>",
-'editingold'                       => "<strong>Diwallit : o kemm ur stumm kozh eus ar bajenn-mañ emaoc'h. Mard enrollit bremañ e vo kollet an holl gemmoù bet graet abaoe ar stumm-se.</strong>",
+'nonunicodebrowser'                => "'''DIWALLIT: N'eo ket skoret an Unicode gant ho merdeer. Un diskoulm da c'hortoz zo bet kavet evit ma c'hallfec'h degas kemmoù er pennadoù : dont a raio war wel an arouezennoù an-ASCII er prenestr skridaozañ evel kodoù eizhdekvedennel.'''",
+'editingold'                       => "'''Diwallit : o kemm ur stumm kozh eus ar bajenn-mañ emaoc'h. Mard enrollit bremañ e vo kollet an holl gemmoù bet graet abaoe ar stumm-se.'''",
 'yourdiff'                         => "Diforc'hioù",
 'copyrightwarning'                 => "Sellet e vez ouzh an holl degasadennoù graet war {{SITENAME}} evel ouzh degasadennoù a zouj da dermenoù ar $2 (Sellet ouzh $1 evit gouzout hiroc'h). Mar ne fell ket deoc'h e vefe embannet ha skignet ho skridoù, arabat kas anezho.<br />
 Heñveldra, prometiñ a rit kemer perzh dre zegas skridoù savet ganeoc'h hepken pe tennet eus ur vammenn frank a wirioù.
-<strong>NA IMPLIJIT KET LABOURIOÙ GANT GWIRIOÙ AOZER (COPYRIGHT) HEP AOTRE D'OBER KEMENT-SE!</strong>",
-'copyrightwarning2'                => "Notit mat e c'hall kement degasadenn graet ganeoc'h war {{SITENAME}} bezañ kemmet, adaozet pe lamet kuit gant an implijerien all. Mar ne fell ket deoc'h e vije kemmet-digemmet ar pezh hoc'h eus skrivet na gemerit ket perzh er raktres-mañ.<br /> Gouestlañ a rit ivez eo bet savet ar boued spered ganeoc'h pe eilet diwar ur vammenn frank a wirioù pe en domani foran (gwelet $1 evit gouzout hiroc'h). <strong>NA IMPLIJIT KET LABOURIOÙ GANT GWIRIOÙ AOZER HEP AOTRE D'OBER KEMENT-SE!</strong>",
-'longpagewarning'                  => "<strong>KEMENN DIWALL: $1 ko eo hed ar bajenn-mañ;
+'''NA IMPLIJIT KET LABOURIOÙ GANT GWIRIOÙ AOZER (COPYRIGHT) HEP AOTRE D'OBER KEMENT-SE!'''",
+'copyrightwarning2'                => "Notit mat e c'hall kement degasadenn graet ganeoc'h war {{SITENAME}} bezañ kemmet, adaozet pe lamet kuit gant an implijerien all. Mar ne fell ket deoc'h e vije kemmet-digemmet ar pezh hoc'h eus skrivet na gemerit ket perzh er raktres-mañ.<br /> Gouestlañ a rit ivez eo bet savet ar boued spered ganeoc'h pe eilet diwar ur vammenn frank a wirioù pe en domani foran (gwelet $1 evit gouzout hiroc'h). '''NA IMPLIJIT KET LABOURIOÙ GANT GWIRIOÙ AOZER HEP AOTRE D'OBER KEMENT-SE!'''",
+'longpagewarning'                  => "'''KEMENN DIWALL: $1 ko eo hed ar bajenn-mañ;
 merdeerioù zo o deus poan da verañ ar pajennoù tro-dro pe en tu all da 32 ko pa vezont savet.
-Marteze e c'hallfec'h rannañ ar bajenn e rannoù bihanoc'h.</strong>",
-'longpageerror'                    => "<strong>FAZI: $1 kilobit hir eo an destenn lakaet ganeoc'h, ar pezh zo hiroc'h eget $2 kilobit, ar vent vrasañ aotreet. N'haller ket enrollañ.</strong>",
-'readonlywarning'                  => "<strong>KEMENN DIWALL: stanket eo bet ar bajenn-mañ evit bezañ trezalc'het,
-n'oc'h ket evit enrollañ ho kemmoù diouzhtu eta. Gallout a rit eilañ an destenn en ur restr hag enrollañ anezhi diwezhatoc'hik.</strong>",
-'protectedpagewarning'             => "<strong>KEMENN DIWALL: Stanket eo bet ar bajenn-mañ.
-N'eus nemet an implijerien ganto ar statud merour a c'hall degas kemmoù enni.</strong>",
+Marteze e c'hallfec'h rannañ ar bajenn e rannoù bihanoc'h.'''",
+'longpageerror'                    => "'''FAZI: $1 kilobit hir eo an destenn lakaet ganeoc'h, ar pezh zo hiroc'h eget $2 kilobit, ar vent vrasañ aotreet. N'haller ket enrollañ.'''",
+'readonlywarning'                  => "'''KEMENN DIWALL : stanket eo an diaz titouroù a-benn bezañ trezalc'het; setu ne viot ket evit enrollañ ho kemmoù diouzhtu-diouzhtu eta. 
+Gallout a rit eilañ-pegañ an destenn en ur restr skrid all hag enrollañ anezhi a-benn diwezhatoc'hik.'''
+
+Setu an displegadenn lakaet gant ar merour en deus stanket an traoù : $1",
+'protectedpagewarning'             => "'''KEMENN DIWALL: Stanket eo bet ar bajenn-mañ.
+N'eus nemet an implijerien ganto ar statud merour a c'hall degas kemmoù enni.'''",
 'semiprotectedpagewarning'         => "''Notenn :''' Gwarezet eo ar bajenn-mañ; n'eus nemet an implijerien bet krouet ur gont ganto a c'hall degas kemmoù enni.",
 'cascadeprotectedwarning'          => "'''Diwallit :''' Prennet eo ar bajenn-mañ. N'eus nemet ar verourien a c'hall degas kemmoù enni peogwir he c'haver e-touez ar {{PLURAL:\$1|bajenn|pajennoù}} da-heul zo bet gwarezet en ur zibab an dibarzh \"skalierad\" :",
-'titleprotectedwarning'            => "<strong>WARNING:  Gwarezet eo bet ar bajenn-mañ e doare ma n'hallo bezañ krouet nemet gant implijerien zo.</strong>",
+'titleprotectedwarning'            => "'''DIWALLIT :  Gwarezet eo bet ar bajenn-mañ e doare ma ranker kaout [[Special:ListGroupRights|gwirioù dibar]] a-benn krouiñ anezhi.'''",
 'templatesused'                    => 'Patromoù implijet war ar bajenn-mañ :',
 'templatesusedpreview'             => 'Patromoù implijet er rakweled-mañ :',
 'templatesusedsection'             => 'Patromoù implijet er rann-mañ :',
@@ -666,11 +709,22 @@ Gallout a rit mont war-gil ha degas kemmoù en ur bajenn zo anezhi dija, pe [[Sp
 
 En em soñjit ervat ha talvoudus eo kenderc'hel krouiñ ar bajenn.
 Deoc'h da c'houzout, aze emañ marilh an diverkadenn :",
+'deleted-notice'                   => 'Diverket eo bet ar bajenn-mañ.
+Dindan emañ merket dave istor an diverkadennoù.',
+'deletelog-fulllog'                => 'Gwelet ar marilh klok',
+'edit-hook-aborted'                => "C'hwitet ar c'hemmañ gant un astenn.
+Abeg dianav.",
+'edit-gone-missing'                => 'Dibosupl hizivaat ar bajenn.
+Diverket eo bet evit doare.',
+'edit-conflict'                    => 'Kemmañ an dizemglev',
+'edit-no-change'                   => "N'eo ket bet kemeret ho tegasadenn e kont rak ne oa ket bet kemmet netra en destenn.",
+'edit-already-exists'              => "N'eus ket bet gallet krouiñ ur bajenn nevez.
+Krouet e oa bet c'hoazh.",
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Diwallit : Re a c'halvoù koustus e-keñver an arc'hwelioù parser zo gant ar bajenn-mañ.
 
-Dleout a rafe bezañ nebeutoc'h eget $2, ha $1 zo.",
+Dleout a rafe bezañ nebeutoc'h eget $2 {{PLURAL:$2|galv|galv}}, ha {{PLURAL:$1|$1 galv|$1 galv}} zo.",
 'expensive-parserfunction-category'       => "Pagjennoù enno re a c'halvoù koustus e-keñver an arc'hwelioù parser.",
 'post-expand-template-inclusion-warning'  => 'Diwallit : re a batromoù zo war ar bajenn-mañ. 
 Lod anezho a vo lakaet a-gostez.',
@@ -678,6 +732,7 @@ Lod anezho a vo lakaet a-gostez.',
 'post-expand-template-argument-warning'   => 'Diwallit : war ar bajenn-mañ ez eus eus da nebeutañ un arventenn eus ur patrom zo re vras.
 A-gostez eo bet lezet an arventenn-se.',
 'post-expand-template-argument-category'  => 'Pajennoù enno arventennoù patrom bet lezet a-gostez',
+'parser-template-loop-warning'            => "Patrom e kelc'h detektet : [[$1]]",
 
 # "Undo" feature
 'undo-success' => "Gallout a reer disteurel ar c'hemmoù-mañ. Gwiriit, mar plij, gant ar geñveriadenn a-is evit bezañ sur eo an dra-se a fell deoc'h ober; goude-se enrollit ar c'hemmoù a-is a-benn echuiñ disteurel ar c'hemmoù.",
@@ -692,29 +747,29 @@ A-gostez eo bet lezet an arventenn-se.',
 An abeg roet gant $3 zo ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Gwelet ar marilhoù evit ar bajenn-mañ',
-'nohistory'           => "Ar bajenn-mañ n'he deus tamm istor ebet.",
-'revnotfound'         => "N'eo ket bet kavet ar stumm-mañ",
-'revnotfoundtext'     => "N'eo ket bet kavet stumm kent ar bajenn-mañ. Gwiriit an URL lakaet ganeoc'h evit mont d'ar bajenn-mañ.",
-'currentrev'          => 'Stumm a-vremañ pe stumm red',
-'revisionasof'        => 'Stumm eus an $1',
-'revision-info'       => 'Stumm eus an $1 gant $2',
-'previousrevision'    => '� Stumm kent',
-'nextrevision'        => "Stumm war-lerc'h →",
-'currentrevisionlink' => 'Gwelet ar stumm red',
-'cur'                 => 'red',
-'next'                => 'goude',
-'last'                => 'diwez',
-'page_first'          => 'kentañ',
-'page_last'           => 'diwezhañ',
-'histlegend'          => "Sellet ouzh an diforc'hioù : lakait un ask adal d'ar stummoù a fell deoc'h keñveriañ ha pouezit war kadarnaat pe war ar bouton en traoñ.<br />
+'viewpagelogs'           => 'Gwelet ar marilhoù evit ar bajenn-mañ',
+'nohistory'              => "Ar bajenn-mañ n'he deus tamm istor ebet.",
+'currentrev'             => 'Stumm a-vremañ pe stumm red',
+'currentrev-asof'        => 'Stumm red eus an $1',
+'revisionasof'           => 'Stumm eus an $1',
+'revision-info'          => 'Stumm eus an $1 gant $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Stumm kent',
+'nextrevision'           => "Stumm war-lerc'h →",
+'currentrevisionlink'    => 'Gwelet ar stumm red',
+'cur'                    => 'red',
+'next'                   => 'goude',
+'last'                   => 'diwez',
+'page_first'             => 'kentañ',
+'page_last'              => 'diwezhañ',
+'histlegend'             => "Sellet ouzh an diforc'hioù : lakait un ask adal d'ar stummoù a fell deoc'h keñveriañ ha pouezit war kadarnaat pe war ar bouton en traoñ.<br />
 Alc'hwez : (red) = diforc'hioù gant ar stumm a-vremañ,
 (diwez) = diforc'hioù gant ar stumm kent, D = kemm dister",
-'deletedrev'          => '[diverket]',
-'histfirst'           => 'Kentañ',
-'histlast'            => 'Diwezhañ',
-'historysize'         => '({{PLURAL:$1|$1 okted|$1 okted}})',
-'historyempty'        => '(goullo)',
+'history-fieldset-title' => 'Furchal en istor',
+'deletedrev'             => '[diverket]',
+'histfirst'              => 'Kentañ',
+'histlast'               => 'Diwezhañ',
+'historysize'            => '({{PLURAL:$1|$1 okted|$1 okted}})',
+'historyempty'           => '(goullo)',
 
 # Revision feed
 'history-feed-title'          => "Istor ar c'hemmoù",
@@ -799,6 +854,7 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'mergehistory-invalid-destination' => 'Ret eo da anv ar bajenn dal bezañ reizh.',
 'mergehistory-autocomment'         => 'Kendeuzet [[:$1]] gant [[:$2]]',
 'mergehistory-comment'             => 'Kendeuzet [[:$1]] gant [[:$2]] : $3',
+'mergehistory-same-destination'    => "N'hall ket ar pajennoù kein hag ar pajennoù tal bezañ an hevelep re",
 
 # Merge log
 'mergelog'           => "Marilh ar c'hendeuzadennoù.",
@@ -811,49 +867,96 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'difference'              => "(Diforc'hioù etre ar stummoù)",
 'lineno'                  => 'Linenn $1:',
 'compareselectedversions' => 'Keñveriañ ar stummoù diuzet',
+'visualcomparison'        => 'Keñveriañ dre welet',
+'wikicodecomparison'      => 'Keñveriañ dre Wikiskrid',
 'editundo'                => 'disteuler',
 'diff-multi'              => "({{PLURAL:$1|Ur reizhadenn da c'hortoz|$1 reizhadenn da c'hortoz}} kuzhet.)",
+'diff-movedto'            => 'kaset da $1',
+'diff-styleadded'         => 'Stil $1 ouzhpennet',
+'diff-added'              => '$1 ouzhpennet',
+'diff-changedto'          => 'kemmet war-du $1',
+'diff-movedoutof'         => "dilec'hiet er-maez eus $1",
+'diff-styleremoved'       => 'stil $1 tennet kuit',
+'diff-removed'            => '$1 tennet kuit',
+'diff-changedfrom'        => 'kemmet abaoe $1',
+'diff-src'                => 'tarzh',
+'diff-withdestination'    => 'gant ar pal $1',
+'diff-with'               => '&#32;gant $1 $2',
+'diff-with-final'         => '&#32;ha $1 $2',
+'diff-width'              => 'ledander',
+'diff-height'             => 'uhelder',
+'diff-p'                  => "ur '''rannbennad'''",
+'diff-blockquote'         => "un '''arroud'''",
+'diff-h1'                 => "un '''talbenn (live 1)'''",
+'diff-h2'                 => "un '''talbenn (live 2)'''",
+'diff-h3'                 => "un '''talbenn (live 3)'''",
+'diff-h4'                 => "un '''talbenn (live 4)'''",
+'diff-h5'                 => "un '''talbenn (live 5)'''",
+'diff-table'              => "un '''daolenn'''",
+'diff-tr'                 => "ul '''linenn'''",
+'diff-td'                 => "ur '''gellig'''",
+'diff-br'                 => "un '''torr'''",
+'diff-img'                => "ur '''skeudenn'''",
+'diff-a'                  => "ul '''liamm'''",
+'diff-i'                  => "'''italeg'''",
+'diff-b'                  => "'''tev'''",
+'diff-strong'             => "'''kreñv'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''bras'''",
+'diff-del'                => "'''diverket'''",
+'diff-sub'                => "'''isskript'''",
+'diff-sup'                => "'''usskript'''",
 
 # Search results
-'searchresults'             => "Disoc'h ar c'hlask",
-'searchresulttext'          => "Evit kaout muioc'h a ditouroù diwar-benn ar c'hlask e {{SITENAME}}, sellet ouzh [[{{MediaWiki:Helppage}}|{{int:help}}]].",
-'searchsubtitle'            => 'Evit ar goulenn "[[:$1]]"',
-'searchsubtitleinvalid'     => 'Evit ar goulenn "$1"',
-'noexactmatch'              => "'''N'eus pajenn ebet anvet \"\$1\".''' Gallout a rit [[:\$1|krouiñ ar bajenn]].",
-'noexactmatch-nocreate'     => "'''N'eus pajenn ebet anvet \"\$1\".'''",
-'toomanymatches'            => 'Re a respontoù a glot gant ar goulenn, klaskit gant ur goulenn all',
-'titlematches'              => 'Klotadurioù gant an titloù',
-'notitlematches'            => "N'emañ ar ger(ioù) goulennet e titl pennad ebet",
-'textmatches'               => 'Klotadurioù en testennoù',
-'notextmatches'             => "N'emañ ar ger(ioù) goulennet e testenn pennad ebet",
-'prevn'                     => '$1 kent',
-'nextn'                     => "$1 war-lerc'h",
-'viewprevnext'              => 'Gwelet ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 ger|$2 ger}})',
-'search-result-score'       => 'Klotadusted : $1%',
-'search-redirect'           => '(adkas $1)',
-'search-section'            => '(rann $1)',
-'search-suggest'            => "N'hoc'h eus ket soñjet kentoc'h e : $1",
-'search-interwiki-caption'  => 'Raktresoù kar',
-'search-interwiki-default'  => "$1 disoc'h :",
-'search-interwiki-more'     => "(muioc'h)",
-'search-mwsuggest-enabled'  => 'gant kinnigoù',
-'search-mwsuggest-disabled' => 'hep kinnigoù',
-'search-relatedarticle'     => "Disoc'hoù kar",
-'mwsuggest-disable'         => 'Diweredekaat kinnigoù AJAX',
-'searchrelated'             => "disoc'hoù kar",
-'searchall'                 => 'An holl',
-'showingresults'            => "Diskouez betek {{PLURAL:$1|'''1''' disoc'h|'''$1''' disoc'h}} o kregiñ gant #'''$2'''.",
-'showingresultsnum'         => "Diskouez {{PLURAL:$3|'''1''' disoc'h|'''$3''' disoc'h}} o kregiñ gant #'''$2'''.",
-'showingresultstotal'       => "O tiskouez a-is {{PLURAL:$3|disoc'h '''$1''' diwar '''$3'''|disoc'hoù '''$1 - $2''' diwar ''$3'''}}",
-'nonefound'                 => "'''Notenn''' : dre ziouer ne glasker nemet en esaouennoù anv zo. Klaskit spisaat '''holl :''' evit klask e pep lec'h (e-barzh ar pajennoù-kaozeal, ar patromoù, hag all), pe dibabit an esaouenn anv a zere.",
-'powersearch'               => 'Klask',
-'powersearch-legend'        => 'Klask araokaet',
-'powersearch-ns'            => 'Klask en esaouennoù anv :',
-'powersearch-redir'         => 'Roll an adkasoù',
-'powersearch-field'         => 'Klask',
-'search-external'           => 'Klask diavaez',
-'searchdisabled'            => "<p>Diweredekaet eo bet an arc'hwel klask war an destenn a-bezh evit ur frapad rak ur samm re vras e oa evit ar servijer. Emichañs e vo tu d'e adlakaat pa vo ur servijer galloudusoc'h ganeomp. Da c'hortoz e c'hallit klask gant Google:</p>",
+'searchresults'                  => "Disoc'h ar c'hlask",
+'searchresults-title'            => 'Disoc\'hoù klask evit "$1"',
+'searchresulttext'               => "Evit gouzout hiroc'h diwar-benn ar c'hlask e {{SITENAME}}, sellet ouzh [[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchsubtitle'                 => 'Klasket hoc\'h eus \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|an holl bajennoù a grog gant "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|an holl bajennoù enno ul liamm war-du "$1"]])',
+'searchsubtitleinvalid'          => "Klasket hoc'h eus '''$1'''",
+'noexactmatch'                   => "'''N'eus pajenn ebet anvet \"\$1\".''' Gallout a rit [[:\$1|krouiñ anezhi]].",
+'noexactmatch-nocreate'          => "'''N'eus pajenn ebet anvet \"\$1\".'''",
+'toomanymatches'                 => 'Re a respontoù a glot gant ar goulenn, klaskit gant ur goulenn all',
+'titlematches'                   => 'Klotadurioù gant an titloù',
+'notitlematches'                 => "N'emañ ar ger(ioù) goulennet e titl pennad ebet",
+'textmatches'                    => 'Klotadurioù en testennoù',
+'notextmatches'                  => "N'emañ ar ger(ioù) goulennet e testenn pennad ebet",
+'prevn'                          => '$1 kent',
+'nextn'                          => "$1 war-lerc'h",
+'viewprevnext'                   => 'Gwelet ($1) ($2) ($3).',
+'searchmenu-legend'              => 'Dibarzhioù klask',
+'searchhelp-url'                 => 'Help:Skoazell',
+'searchprofile-project'          => 'Pajennoù ar raktres',
+'searchprofile-images'           => 'Restroù',
+'searchprofile-everything'       => 'Pep tra',
+'searchprofile-advanced'         => 'Araokaet',
+'searchprofile-articles-tooltip' => 'Klask e $1',
+'searchprofile-project-tooltip'  => 'Klask e $1',
+'searchprofile-images-tooltip'   => 'Klask ar restroù',
+'search-result-size'             => '$1 ({{PLURAL:$2|1 ger|$2 ger}})',
+'search-result-score'            => 'Klotadusted : $1%',
+'search-redirect'                => '(adkas $1)',
+'search-section'                 => '(rann $1)',
+'search-suggest'                 => "N'hoc'h eus ket soñjet kentoc'h e : $1",
+'search-interwiki-caption'       => 'Raktresoù kar',
+'search-interwiki-default'       => "$1 disoc'h :",
+'search-interwiki-more'          => "(muioc'h)",
+'search-mwsuggest-enabled'       => 'gant kinnigoù',
+'search-mwsuggest-disabled'      => 'hep kinnigoù',
+'search-relatedarticle'          => "Disoc'hoù kar",
+'mwsuggest-disable'              => 'Diweredekaat kinnigoù AJAX',
+'searchrelated'                  => "disoc'hoù kar",
+'searchall'                      => 'An holl',
+'showingresults'                 => "Diskouez betek {{PLURAL:$1|'''1''' disoc'h|'''$1''' disoc'h}} o kregiñ gant #'''$2'''.",
+'showingresultsnum'              => "Diskouez {{PLURAL:$3|'''1''' disoc'h|'''$3''' disoc'h}} o kregiñ gant #'''$2'''.",
+'showingresultstotal'            => "O tiskouez a-is {{PLURAL:$4|disoc'h '''$1''' diwar '''$3'''|disoc'hoù '''$1 - $2''' diwar ''$3'''}}",
+'nonefound'                      => "'''Notenn''' : dre ziouer ne glasker nemet en esaouennoù anv zo. Klaskit spisaat ho koulenn gant '''all :''' evit klask e pep lec'h (e-barzh ar pajennoù-kaozeal, ar patromoù, hag all), pe dibabit an esaouenn anv a zere.",
+'powersearch'                    => 'Klask',
+'powersearch-legend'             => 'Klask araokaet',
+'powersearch-ns'                 => 'Klask en esaouennoù anv :',
+'powersearch-redir'              => 'Roll an adkasoù',
+'powersearch-field'              => 'Klask',
+'search-external'                => 'Klask diavaez',
+'searchdisabled'                 => "<p>Diweredekaet eo bet an arc'hwel klask war an destenn a-bezh evit ur frapad rak ur samm re vras e oa evit ar servijer. Emichañs e vo tu d'e adlakaat pa vo ur servijer galloudusoc'h ganeomp. Da c'hortoz e c'hallit klask gant Google:</p>",
 
 # Preferences page
 'preferences'              => 'Penndibaboù',
@@ -870,6 +973,7 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'qbsettings-floatingright' => 'War-neuñv a-zehou',
 'changepassword'           => 'Kemmañ ar ger-tremen',
 'skin'                     => 'Gwiskadur',
+'skin-preview'             => 'Rakwelet',
 'math'                     => 'Tres jedoniel',
 'dateformat'               => 'Stumm an deiziad',
 'datedefault'              => 'Dre ziouer',
@@ -891,9 +995,6 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'prefs-misc'               => 'Penndibaboù liesseurt',
 'saveprefs'                => 'Enrollañ ar penndibaboù',
 'resetprefs'               => 'Adlakaat ar penndibaboù kent',
-'oldpassword'              => 'Ger-tremen kozh',
-'newpassword'              => 'Ger-tremen nevez :',
-'retypenew'                => 'Kadarnaat ar ger-tremen nevez',
 'textboxsize'              => 'Prenestr skridaozañ',
 'rows'                     => 'Linennoù :',
 'columns'                  => 'Bannoù',
@@ -903,13 +1004,14 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'contextchars'             => 'Niver a arouezennoù kendestenn dre linenn',
 'stub-threshold'           => 'Bevenn uhelañ evit al <a href="#" class="stub">liammoù war-du an danvez pennadoù</a> (okted) :',
 'recentchangesdays'        => "Niver a zevezhioù da ziskouez er c'hemmoù diwezhañ :",
-'recentchangescount'       => "Niver a ditloù er c'hemmoù diwezhañ",
+'recentchangescount'       => "Niver a gemmoù da ziskouez er c'hemmoù diwezhañ, er pajennoù istor hag er marilhoù, dre ziouer",
 'savedprefs'               => 'Enrollet eo bet ar penndibaboù.',
 'timezonelegend'           => 'Takad eur',
 'timezonetext'             => "Mar ne resisait ket al linkadur eur e vo graet gant eur Europa ar C'hornôg dre ziouer.",
-'localtime'                => "Eur lec'hel",
-'timezoneoffset'           => 'Linkadur eur',
-'servertime'               => 'Eur ar servijer',
+'localtime'                => "Eur lec'hel :",
+'timezoneselect'           => 'Takad eur :',
+'timezoneoffset'           => 'Linkadur eur¹ :',
+'servertime'               => 'Eur ar servijer :',
 'guesstimezone'            => 'Ober gant talvoudenn ar merdeer',
 'allowemail'               => 'Aotren ar posteloù a-berzh implijerien all',
 'prefs-searchoptions'      => 'Dibarzhioù klask',
@@ -923,7 +1025,7 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'userrights-lookup-user'      => 'Merañ strolladoù an implijer',
 'userrights-user-editname'    => 'Lakait un anv implijer :',
 'editusergroup'               => 'Kemmañ ar strolladoù implijerien',
-'editinguser'                 => "Kemmañ gwirioù an implijer '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Kemmañ gwirioù an implijer '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Kemmañ strolladoù an implijer',
 'saveusergroups'              => 'Enrollañ ar strolladoù implijer',
 'userrights-groupsmember'     => 'Ezel eus :',
@@ -1022,9 +1124,20 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'rightslogentry' => 'en/he deus cheñchet gwirioù implijer $1 a oa $2 hag a zo bet lakaet da $3',
 'rightsnone'     => '(netra)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit'           => 'degas kemmoù war ar bajenn-mañ',
+'action-createpage'     => 'krouiñ pajennoù',
+'action-createaccount'  => 'krouiñ ar gont implijer-mañ',
+'action-move'           => "dilec'hiañ ar bajenn-mañ",
+'action-move-subpages'  => "dilec'hiañ ar bajenn-mañ hag an ispajennoù anezhi",
+'action-upload'         => 'enporzhiañ ar restr-mañ',
+'action-delete'         => 'diverkañ ar bajenn-mañ',
+'action-deleterevision' => 'diverkañ ar stumm-mañ',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|kemm|kemm}}',
 'recentchanges'                     => 'Kemmoù diwezhañ',
+'recentchanges-legend'              => "Dibarzhioù ar c'hemmoù diwezhañ",
 'recentchangestext'                 => "Dre ar bajenn-mañ e c'hallit heuliañ ar c'hemmoù diwezhañ bet degaset d'ar wiki.",
 'recentchanges-feed-description'    => "Heuilhit ar c'hemmoù diwezhañ er wiki el lusk-mañ.",
 'rcnote'                            => "Setu aze an {{PLURAL:$1|'''1''' change|'''$1''' kemm diwezhañ}} bet c'hoarvezet e-pad an {{PLURAL:$2|deiz|'''$2''' deiz}} diwezhañ, savet d'an $4 da $5.",
@@ -1048,6 +1161,8 @@ Gwiriit ne vo ket torret red istor ar bajenn gant ar c'hemm-mañ.",
 'rc_categories'                     => 'Bevenn ar rummadoù (dispartiañ gant "|")',
 'rc_categories_any'                 => 'An holl',
 'newsectionsummary'                 => '/* $1 */ rann nevez',
+'rc-enhanced-expand'                => 'Diskouez ar munudoù (JavaScript rekis)',
+'rc-enhanced-hide'                  => 'Kuzhat munudoù',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Heuliañ al liammoù',
@@ -1070,11 +1185,11 @@ evit eilañ restroù war ar servijer.",
 'upload_directory_read_only'  => "N'hall ket ar servijer skrivañ e renkell ar c'hargadennoù ($1).",
 'uploaderror'                 => 'Fazi',
 'uploadtext'                  => "Grit gant ar furmskrid a-is evit enporzhiañ restroù war ar servijer.
-Evit sellet pe klask skeudennoù bet enporzhiet a-raok sellit ouzh [[Special:ImageList|roll ar skeudennoù]]. Kavet e vo ar skeudennoù enporzhiet war [[Special:Log/upload|marilh ar pajennoù enporzhiet]] hag an diverkadennoù war [[Special:Log/delete|istor an diverkadennoù]].
+Evit sellet pe klask skeudennoù bet enporzhiet a-raok sellit ouzh [[Special:FileList|roll ar skeudennoù]]. Kavet e vo ar skeudennoù enporzhiet war [[Special:Log/upload|marilh ar pajennoù enporzhiet]] hag an diverkadennoù war [[Special:Log/delete|istor an diverkadennoù]].
 
 Evit enklozañ ur skeudenn en ur pennad, lakait er pennad-se ul liamm skrivet evel-henn :
-*'''<code><nowiki>[[</nowiki>{{ns:image}}<nowiki>:anv_ar_restr.jpg]]</nowiki></code>''' evit diskouez ar restr en he spider brasañ ;
-*'''<code><nowiki>[[</nowiki>{{ns:image}}<nowiki>:anv_ar_restr.png|deskrivadenn]]</nowiki></code>''' evit ober gant ur munud 200 piksel ledander er ur voest a-gleiz enni \"testenn zeskrivañ\" da zeskrivadenn 
+*'''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:anv_ar_restr.jpg]]</nowiki></code>''' evit diskouez ar restr en he spider brasañ ;
+*'''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:anv_ar_restr.png|deskrivadenn]]</nowiki></code>''' evit ober gant ur munud 200 piksel ledander er ur voest a-gleiz enni \"testenn zeskrivañ\" da zeskrivadenn 
 *'''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:anv_ar_restr.ogg]]</nowiki></code>''' evit sevel ul liamm war-eeun war-du ar restr hep diskouez anezhi.",
 'upload-permitted'            => 'Seurtoù restroù aotreet : $1.',
 'upload-preferred'            => 'Seurtoù restroù gwellañ : $1.',
@@ -1082,7 +1197,7 @@ Evit enklozañ ur skeudenn en ur pennad, lakait er pennad-se ul liamm skrivet ev
 'uploadlog'                   => 'marilh ar pajennoù enporzhiet',
 'uploadlogpage'               => 'Marilh ar pajennoù enporzhiet',
 'uploadlogpagetext'           => "Setu a-is marilh ar restroù diwezhañ bet karget war ar servijer.
-S.o [[Special:NewImages|rann ar skeudennoù nevez]] evit kaout ur sell gwiroc'h",
+S.o [[Special:NewFiles|rann ar skeudennoù nevez]] evit kaout ur sell gwiroc'h",
 'filename'                    => 'Anv&nbsp;',
 'filedesc'                    => 'Deskrivadur&nbsp;',
 'fileuploadsummary'           => 'Diverrañ :',
@@ -1102,21 +1217,21 @@ S.o [[Special:NewImages|rann ar skeudennoù nevez]] evit kaout ur sell gwiroc'h"
 'large-file'                  => "Erbediñ a reer ne vefe ket brasoc'h ar restroù eget $1; $2 eo ment ar restr-mañ.",
 'largefileserver'             => "Brasoc'h eo ar restr-mañ eget ar pezh a c'hall ar servijer aotren.",
 'emptyfile'                   => "Evit doare eo goullo ar restr bet karget ganeoc'h. Moarvat eo abalamour d'an tipo en anv ar restr. Gwiriit mat e fell deoc'h pellgargañ ar restr-mañ.",
-'fileexists'                  => "Ur restr all gant an anv-se zo c'hoazh. Trugarez da wiriañ <strong><tt>$1</tt></strong>. Ha sur oc'h da gaout c'hoant da gemmañ ar restr-mañ ?",
-'filepageexists'              => "Amañ <strong><tt>$1</tt></strong> eo bet krouet ar bajenn zeskrivañ evit ar restr-mañ, padal n'eus ket restr ebet dezhi an anv-se evit c'hoazh. An diverradenn skrivet ganeoc'h ne erlec'hio ket an destenn a oa a-raok ; ret e vije deoc'h kemmañ ar bajenn gant an dorn.",
+'fileexists'                  => "Ur restr all gant an anv-se zo c'hoazh. Trugarez da wiriañ '''<tt>$1</tt>'''. Ha sur oc'h da gaout c'hoant da gemmañ ar restr-mañ ?",
+'filepageexists'              => "Amañ '''<tt>$1</tt>''' eo bet krouet ar bajenn zeskrivañ evit ar restr-mañ, padal n'eus ket restr ebet dezhi an anv-se evit c'hoazh. An diverradenn skrivet ganeoc'h ne erlec'hio ket an destenn a oa a-raok ; ret e vije deoc'h kemmañ ar bajenn gant an dorn.",
 'fileexists-extension'        => "Bez' ez eus dija ur restr gant an anv-se war-bouez nebeut :<br />
-Anv ar restr pellgarget : <strong><tt>$1</tt></strong><br />
-Anv ar restr zo anezhi dija : <strong><tt>$2</tt></strong><br />
+Anv ar restr pellgarget : '''<tt>$1</tt>'''<br />
+Anv ar restr zo anezhi dija : '''<tt>$2</tt>'''<br />
 An diforc'h nemetañ zo war pennlizherenn an astenn. Gwiriit eo disheñvel ar restroù ha klaskit en-dro.",
 'fileexists-thumb'            => "<center>'''Skeudenn zo anezhi'''</center>",
-'fileexists-thumbnail-yes'    => "Evit doare ez eus ur skeudenn krennet he ment eus ar restr <i>(thumbnail)</i>. Gwiriit ar restr <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Evit doare ez eus ur skeudenn krennet he ment eus ar restr ''(thumbnail)''. Gwiriit ar restr '''<tt>$1</tt>'''.<br />
 Mard eo an hevelep skeudenn ha hini ar restr orin zo gwelloc'h he ferzhded n'eo ket dav pellgargañ ur stumm krennet ouzhpenn.",
-'file-thumbnail-no'           => "Kregiñ a ra anv ar restr gant <strong><tt>$1</tt></strong>. 
-Evit doare eo ur skeudenn krennet he ment <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "Kregiñ a ra anv ar restr gant '''<tt>$1</tt>'''. 
+Evit doare eo ur skeudenn krennet he ment ''(thumbnail)''.
 Ma'z eus ganeoc'h ur skeudenn uhel he fizhder, pellgargit anezhi; a-hend-all cheñchit anv ar restr.",
-'fileexists-forbidden'        => "Ur restr all gant an anv-se zo c'hoazh; kit war ho kiz hag enporzhiit ar restr dindan un anv all [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Ur restr all gant an anv-se zo c'hoazh; kit war ho kiz hag enporzhiit ar restr dindan un anv all [[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => "Ur restr all dezhi an hevelep anv zo c'hoazh er c'havlec'h eskemm restroù.
-Mar fell deoc'h enporzhiañ ar restr-mañ da vat, kit war ho kiz hag enporzhiit anezhi adarre dindan un anv all. [[Image:$1|thumb|center|$1]]",
+Mar fell deoc'h enporzhiañ ar restr-mañ da vat, kit war ho kiz hag enporzhiit anezhi adarre dindan un anv all. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Un eil eus ar {{PLURAL:$1|restr|restroù}} da-heul eo ar restr-mañ :',
 'successfulupload'            => 'Eiladenn kaset da benn vat',
 'uploadwarning'               => 'Diwallit!',
@@ -1138,7 +1253,7 @@ Gwiriit anezhi mar plij.',
 
 En em soñjit ervat ha mat eo kenderc'hel da enporzhiañ ar restr-mañ.
 Kavit amañ ar marilh diverkañ evit ar restr-mañ :",
-'filename-bad-prefix'         => "Anv ar restr emaoc'h oc'h enporzhiañ a grog gant <strong>\"\$1\"</strong>, da lavaret eo un anv dizeskrivus roet alies ent emgefre gant luc'hskeudennerezioù niverel. Dibabit un anv splannoc'h evit deskrivañ ar restr.",
+'filename-bad-prefix'         => "Anv ar restr emaoc'h oc'h enporzhiañ a grog gant '''\"\$1\"''', da lavaret eo un anv dizeskrivus roet alies ent emgefre gant luc'hskeudennerezioù niverel. Dibabit un anv splannoc'h evit deskrivañ ar restr.",
 'filename-prefix-blacklist'   => " #<!-- leave this line exactly as it is --> <pre>
 # Setu penaos emañ an ereadur :
 #   * Pep tra adal un arouezenn \"#\" betek dibenn al linenn a ya d'ober un notenn
@@ -1176,20 +1291,20 @@ Ma talc'h ar gudenn, kit e darempred gant [[Special:ListUsers/sysop|merourien ar
 'upload_source_url'  => " (Un URL reizh a c'hall bezañ tizhet gant an holl)",
 'upload_source_file' => " (ur restr war hoc'h urzhiataer)",
 
-# Special:ImageList
-'imagelist-summary'     => 'Diskouez a ra ar bajenn zibar-mañ an holl restroù bet enporzhiet.
+# Special:ListFiles
+'listfiles-summary'     => 'Diskouez a ra ar bajenn zibar-mañ an holl restroù bet enporzhiet.
 Dre ziouer e teu ar restroù enporzhiet da ziwezhañ e laez ar roll.
 Klikañ war penn ar bann a cheñch an urzh kinnig.',
-'imagelist_search_for'  => 'Klask anv ar skeudenn :',
+'listfiles_search_for'  => 'Klask anv ar skeudenn :',
 'imgfile'               => 'restr',
-'imagelist'             => 'Roll ar skeudennoù',
-'imagelist_date'        => 'Deiziad',
-'imagelist_name'        => 'Anv',
-'imagelist_user'        => 'Implijer',
-'imagelist_size'        => 'Ment (e bitoù)',
-'imagelist_description' => 'Deskrivadur',
-
-# Image description page
+'listfiles'             => 'Roll ar skeudennoù',
+'listfiles_date'        => 'Deiziad',
+'listfiles_name'        => 'Anv',
+'listfiles_user'        => 'Implijer',
+'listfiles_size'        => 'Ment (e bitoù)',
+'listfiles_description' => 'Deskrivadur',
+
+# File description page
 'filehist'                       => 'Istor ar restr',
 'filehist-help'                  => 'Klikañ war un deiziad/eur da welet ar restr evel ma oa da neuze.',
 'filehist-deleteall'             => 'diverkañ pep tra',
@@ -1197,11 +1312,13 @@ Klikañ war penn ar bann a cheñch an urzh kinnig.',
 'filehist-revert'                => 'disteuler',
 'filehist-current'               => 'red',
 'filehist-datetime'              => 'Deiziad/Eur',
+'filehist-thumb'                 => 'Munud',
+'filehist-thumbtext'             => 'Munud eus stumm an $1',
 'filehist-user'                  => 'Implijer',
 'filehist-dimensions'            => 'Mentoù',
 'filehist-filesize'              => 'Ment ar restr',
 'filehist-comment'               => 'Notenn',
-'imagelinks'                     => 'Liammoù war-du ar skeudenn',
+'imagelinks'                     => "Liammoù d'ar restr",
 'linkstoimage'                   => "Liammet eo ar {{PLURAL:$1|bajenn-mañ|$1 ar pajennoù-mañ}} d'ar restr-mañ :",
 'nolinkstoimage'                 => "N'eus liamm ebet war-du ar skeudenn-mañ war pajenn ebet.",
 'morelinkstoimage'               => 'Gwelet [[Special:WhatLinksHere/$1|liammoù ouzhpenn]] war-du ar restr-mañ.',
@@ -1209,7 +1326,7 @@ Klikañ war penn ar bann a cheñch an urzh kinnig.',
 'duplicatesoffile'               => 'Un eil eus ar restr-mañ eo ar {{PLURAL:$1|restr da-heul|$1 restr da-heul}} :',
 'sharedupload'                   => 'Rannet eo ar restr-mañ. Gallout a ra bezañ implijet evit raktresoù all.',
 'shareduploadwiki'               => "Gwelit an $1 mar plij evit gouzout hiroc'h.",
-'shareduploadwiki-desc'          => "Diskouezet eo a-is an deskrivadur a-zivout $1 er c'havlec'h rannet.",
+'shareduploadwiki-desc'          => 'Diskouezet eo a-is an deskrivadur a-zivout $1.',
 'shareduploadwiki-linktext'      => 'pajenn deskrivañ ar restr',
 'shareduploadduplicate'          => 'Un eil eus $1 eus ur sanailh rannet eo ar restr-mañ.',
 'shareduploadduplicate-linktext' => 'ur restr all',
@@ -1241,7 +1358,6 @@ Klikañ war penn ar bann a cheñch an urzh kinnig.',
 'filedelete-success-old'      => "Diverket eo bet ar stumm '''[[Media:$1|$1]]''' eus an $2 da $3.",
 'filedelete-nofile'           => "N'eus ket eus '''$1'''.",
 'filedelete-nofile-old'       => "N'eus stumm diellaouet ebet eus '''$1''' gant an dezverkoù lakaet.",
-'filedelete-iscurrent'        => "Emaoc'h o klask diverkañ doare diwezhañ ar restr-mañ. Distroit d'ur stumm koshoc'h da gentañ.",
 'filedelete-otherreason'      => 'Abeg all/ouzhpenn :',
 'filedelete-reason-otherlist' => 'Abeg all',
 'filedelete-reason-dropdown'  => "*Abegoù diverkañ boas
@@ -1275,22 +1391,9 @@ Klikañ war penn ar bann a cheñch an urzh kinnig.',
 'randomredirect-nopages' => "N'eus pajenn adkas ebet en esaouenn anv-mañ.",
 
 # Statistics
-'statistics'             => 'Stadegoù',
-'sitestats'              => "Stadegoù al lec'hienn",
-'userstats'              => 'Stadegoù implijer',
-'sitestatstext'          => "En holl ez eus {{PLURAL:\$1|'''1''' pajenn|'''\$1''' pajenn}} er bank roadennoù.
-Er sifr-mañ emañ ar pajennoù \"kaozeal\", ar pajennoù a denn da {{SITENAME}}, an danvez-pennadoù, ar pajennoù adkas ha meur a seurt pajenn all n'haller ket sellet outo evel pennadoù da vat.
-Mar lakaer ar pajennoù-se er-maez e chom {{PLURAL:\$2|'''1''' pajenn|'''\$2''' pajenn}} zo moarvat gwir pennadoù.
-
-Abaoe m'eo bet savet {{SITENAME}} ez eus bet sellet ouzh '''\$3''' {{PLURAL:\$3|pajenn|pajenn}} en holl, ha degaset kemmoù war '''\$4''' {{PLURAL:\$4|pajenn|pajenn}}.
-
-'''\$8''' {{PLURAL:\$8|restr|restr}} zo bet karget.
-
-Sed a ra e-tro '''\$5''' kemm dre bajenn ha '''\$6''' selladenn evit pep kemm.
-
-Hirder al [http://www.mediawiki.org/wiki/Manual:Job_queue lostennad labour] zo par da '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|'''1''' [[Special:ListUsers|implijer]] enrollet|'''$1''' [[Special:ListUsers|implijer]] enrollet}} zo; en o zouez ez eus '''$2''' (pe '''$4%''') {{PLURAL:$2|gant|gant}} gwirioù $5.",
-'statistics-mostpopular' => 'Pajennoù muiañ sellet',
+'statistics'              => 'Stadegoù',
+'statistics-header-users' => 'Stadegoù implijer',
+'statistics-mostpopular'  => 'Pajennoù muiañ sellet',
 
 'disambiguations'      => 'Pajennoù digejañ',
 'disambiguationspage'  => 'Project:Liammoù_ouzh_ar_pajennoù_disheñvelaat',
@@ -1334,20 +1437,20 @@ Sellet e vez ouzh ur bajenn evel ouzh ur bajenn digejañ ma ra gant ur patrom li
 'popularpages'            => 'Pajennoù sellet ar muiañ',
 'wantedcategories'        => 'Rummadoù a vank',
 'wantedpages'             => 'Pajennoù goulennet ar muiañ',
-'missingfiles'            => 'Restroù a vank',
 'mostlinked'              => 'Pajennoù dezho al liammoù niverusañ',
 'mostlinkedcategories'    => 'Rummadoù dezho al liammoù niverusañ',
 'mostlinkedtemplates'     => 'Patromoù implijet ar muiañ',
 'mostcategories'          => 'Pennadoù rummatet ar muiañ',
 'mostimages'              => 'Skeudennoù implijet ar muiañ',
 'mostrevisions'           => 'Pennadoù bet kemmet ar muiañ',
-'prefixindex'             => 'An holl bajennoù dre o lizherenn gentañ',
+'prefixindex'             => 'An holl bajennoù a grog gant...',
 'shortpages'              => 'Pennadoù berr',
 'longpages'               => 'Pennadoù hir',
 'deadendpages'            => 'Pajennoù dall (hep liamm diabarzh)',
 'deadendpagestext'        => "Ar pajennoù da-heul n'int ket liammet ouzh pajenn ebet all eus {{SITENAME}}.",
 'protectedpages'          => 'Pajennoù gwarezet',
 'protectedpages-indef'    => 'Gwarezoù da badout hepken',
+'protectedpages-cascade'  => 'Gwarez dre skalierad hepken',
 'protectedpagestext'      => "Gwarezet eo ar pajennoù da-heul; n'haller na degas kemmoù enno nag o dilec'hiañ",
 'protectedpagesempty'     => "N'eus pajenn gwarezet ebet gant an arventennoù-mañ evit poent.",
 'protectedtitles'         => 'Titloù gwarezet',
@@ -1381,8 +1484,6 @@ Sellet e vez ouzh ur bajenn evel ouzh ur bajenn digejañ ma ra gant ur patrom li
 'speciallogtitlelabel' => 'Titl :',
 'log'                  => 'Marilhoù',
 'all-logs-page'        => 'An holl varilhoù',
-'log-search-legend'    => 'Klask er rolloù',
-'log-search-submit'    => 'Mont',
 'alllogstext'          => "Diskwel a-gevret an holl varilhoù hegerz war {{SITENAME}}. 
 Gallout a rit strishaat ar mod diskwel en ur zibab ar marilh, an anv implijer (diwallit ouzh ar pennlizherennoù) pe ar bajenn a fell deoc'h (memes tra).",
 'logempty'             => 'Goullo eo istor ar bajenn-mañ.',
@@ -1394,6 +1495,7 @@ Gallout a rit strishaat ar mod diskwel en ur zibab ar marilh, an anv implijer (d
 'nextpage'          => "Pajenn war-lerc'h ($1)",
 'prevpage'          => 'Pajenn gent ($1)',
 'allpagesfrom'      => 'Diskouez ar pajennoù adal :',
+'allpagesto'        => 'Diskouez ar pajennoù betek :',
 'allarticles'       => 'An holl bennadoù',
 'allinnamespace'    => 'An holl bajennoù (esaouenn $1)',
 'allnotinnamespace' => "An holl bajennoù (ar re n'emaint ket en esaouenn anv $1)",
@@ -1413,11 +1515,29 @@ Gwelet ivez ar [[Special:WantedCategories|rummadoù a vank]].',
 'special-categories-sort-count' => 'Urzhiañ dre gont',
 'special-categories-sort-abc'   => 'urzh al lizherenneg',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Degasadennoù diverket un implijer',
+
+# Special:LinkSearch
+'linksearch'      => 'Liammoù diavaez',
+'linksearch-pat'  => 'Klask an droienn :',
+'linksearch-ns'   => 'Esaouenn anv :',
+'linksearch-ok'   => 'Klask',
+'linksearch-line' => '$1 gant ul liamm adal $2',
+
 # Special:ListUsers
 'listusersfrom'      => 'Diskouez anv an implijerien adal :',
 'listusers-submit'   => 'Diskouez',
 'listusers-noresult' => "N'eus bet kavet implijer ebet.",
 
+# Special:Log/newusers
+'newuserlogpage'              => "Marilh ar c'hontoù krouet",
+'newuserlogpagetext'          => "Marilh krouiñ ar c'hontoù implijer.",
+'newuserlog-byemail'          => 'ger-tremen kaset dre bostel',
+'newuserlog-create-entry'     => 'Implijer nevez',
+'newuserlog-create2-entry'    => 'kont krouet evit $1',
+'newuserlog-autocreate-entry' => 'Kont krouet ent emgefre',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Gwirioù ar strolladoù implijer',
 'listgrouprights-summary'  => 'Da-heul ez eus ur roll eus ar strolladoù implijerien termenet war ar wiki-mañ, gant ar gwirioù moned stag outo.
@@ -1483,12 +1603,7 @@ Evit tennañ ar bajenn-mañ a-ziwar ho rollad evezhiañ. klikit war "Paouez da e
 'iteminvalidname'      => "Ur gudenn zo gant ar pennad « $1 » : n'eo ket mat e anv...",
 'wlnote'               => 'A-is emañ an $1 kemm diwezhañ abaoe an <b>$2</b> eurvezh diwezhañ.',
 'wlshowlast'           => 'Diskouez an $1 eurvezh $2 devezh diwezhañ $3',
-'watchlist-show-bots'  => 'Diskouez kemmoù ar robotoù',
-'watchlist-hide-bots'  => 'Kuzhat kemmoù ar botoù',
-'watchlist-show-own'   => "Diskouez ma c'hemmoù",
-'watchlist-hide-own'   => "Kuzhat ma c'hemmoù",
-'watchlist-show-minor' => "Diskouez ar c'hemmoù dister",
-'watchlist-hide-minor' => "Kuzhat ar c'hemmoù dister",
+'watchlist-options'    => 'Dibarzhioù ar roll evezhiañ',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Heuliet...',
@@ -1526,81 +1641,87 @@ A-benn kemmañ doare ho rollad evezhiañ, sellit ouzh {{fullurl:{{ns:special}}:W
 Evezhiadennoù ha skoazell pelloc\'h :
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Diverkañ ur bajenn',
-'confirm'                     => 'Kadarnaat',
-'excontent'                   => "endalc'had '$1'",
-'excontentauthor'             => "an danvez a oa : '$1' (ha '[[Special:Contributions/$2|$2]]' a oa bet an implijer nemetañ)",
-'exbeforeblank'               => "A-raok diverkañ e oa an endalc'had : '$1'",
-'exblank'                     => "pajenn c'houllo",
-'delete-confirm'              => 'Diverkañ "$1"',
-'delete-legend'               => 'Diverkañ',
-'historywarning'              => "Diwallit: War-nes diverkañ ur bajenn ganti un istor emaoc'h :",
-'confirmdeletetext'           => "War-nes diverkañ da viken ur bajenn pe ur skeudenn eus ar bank roadennoù emaoc'h. Diverket e vo ivez an holl stummoù kozh stag outi.
+# Delete
+'deletepage'             => 'Diverkañ ur bajenn',
+'confirm'                => 'Kadarnaat',
+'excontent'              => "endalc'had '$1'",
+'excontentauthor'        => "an danvez a oa : '$1' (ha '[[Special:Contributions/$2|$2]]' a oa bet an implijer nemetañ)",
+'exbeforeblank'          => "A-raok diverkañ e oa an endalc'had : '$1'",
+'exblank'                => "pajenn c'houllo",
+'delete-confirm'         => 'Diverkañ "$1"',
+'delete-legend'          => 'Diverkañ',
+'historywarning'         => "Diwallit: War-nes diverkañ ur bajenn ganti un istor emaoc'h :",
+'confirmdeletetext'      => "War-nes diverkañ da viken ur bajenn pe ur skeudenn eus ar bank roadennoù emaoc'h. Diverket e vo ivez an holl stummoù kozh stag outi.
 Kadarnait, mar plij, eo mat an dra-se hoc'h eus c'hoant da ober, e komprenit mat an heuliadoù, hag e rit se diouzh ar [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Diverkadenn kaset da benn',
-'deletedtext'                 => '"Diverket eo bet <nowiki>$1</nowiki>".
+'actioncomplete'         => 'Diverkadenn kaset da benn',
+'deletedtext'            => '"Diverket eo bet <nowiki>$1</nowiki>".
 Sellet ouzh $2 evit roll an diverkadennoù diwezhañ.',
-'deletedarticle'              => 'diverket "$1"',
-'suppressedarticle'           => 'diverket "[[$1]]"',
-'dellogpage'                  => 'Roll ar pajennoù diverket',
-'dellogpagetext'              => 'Setu roll ar pajennnoù diwezhañ bet diverket.',
-'deletionlog'                 => 'roll an diverkadennoù',
-'reverted'                    => 'Adlakaat ar stumm kent',
-'deletecomment'               => 'Abeg an diverkadenn',
-'deleteotherreason'           => 'Abegoù/traoù all :',
-'deletereasonotherlist'       => 'Abeg all',
-'deletereason-dropdown'       => "*Abegoù diverkañ boazetañ
+'deletedarticle'         => 'diverket "$1"',
+'suppressedarticle'      => 'diverket "[[$1]]"',
+'dellogpage'             => 'Roll ar pajennoù diverket',
+'dellogpagetext'         => 'Setu roll ar pajennnoù diwezhañ bet diverket.',
+'deletionlog'            => 'roll an diverkadennoù',
+'reverted'               => 'Adlakaat ar stumm kent',
+'deletecomment'          => 'Abeg an diverkadenn',
+'deleteotherreason'      => 'Abegoù/traoù all :',
+'deletereasonotherlist'  => 'Abeg all',
+'deletereason-dropdown'  => "*Abegoù diverkañ boazetañ
 ** Goulenn gant saver ar pennad
 ** Gaou ouzh ar gwirioù perc'hennañ
 ** Vandalerezh",
-'delete-edit-reasonlist'      => 'Kemmañ a ra an abegoù diverkañ',
-'delete-toobig'               => 'Bras eo istor ar bajenn-mañ, ouzhpenn $1 {{PLURAL:$1|stumm|stumm}} zo. Bevennet eo bet an diverkañ pajennoù a-seurt-se kuit da zegas reuz war {{SITENAME}} dre fazi .',
-'delete-warning-toobig'       => "Bras eo istor ar bajenn-mañ, ouzhpenn {{PLURAL:$1|stumm|stumm}} zo. 
+'delete-edit-reasonlist' => 'Kemmañ a ra an abegoù diverkañ',
+'delete-toobig'          => 'Bras eo istor ar bajenn-mañ, ouzhpenn $1 {{PLURAL:$1|stumm|stumm}} zo. Bevennet eo bet an diverkañ pajennoù a-seurt-se kuit da zegas reuz war {{SITENAME}} dre fazi .',
+'delete-warning-toobig'  => "Bras eo istor ar bajenn-mañ, ouzhpenn {{PLURAL:$1|stumm|stumm}} zo. 
 Diverkañ anezhi a c'hallo degas reuz war mont en-dro diaz titouroù {{SITENAME}}; 
 taolit evezh bras.",
-'rollback'                    => "disteuler ar c'hemmoù",
-'rollback_short'              => 'Disteuler',
-'rollbacklink'                => 'disteuler',
-'rollbackfailed'              => "C'hwitet eo bet an distaoladenn",
-'cantrollback'                => 'Dibosupl da zisteuler: an aozer diwezhañ eo an hini nemetañ da vezañ kemmet ar pennad-mañ',
-'alreadyrolled'               => "Dibosupl eo disteuler ar c'hemm diwezhañ graet e [[:$1]]
+
+# Rollback
+'rollback'         => "disteuler ar c'hemmoù",
+'rollback_short'   => 'Disteuler',
+'rollbacklink'     => 'disteuler',
+'rollbackfailed'   => "C'hwitet eo bet an distaoladenn",
+'cantrollback'     => 'Dibosupl da zisteuler: an aozer diwezhañ eo an hini nemetañ da vezañ kemmet ar pennad-mañ',
+'alreadyrolled'    => "Dibosupl eo disteuler ar c'hemm diwezhañ graet e [[:$1]]
 gant [[User:$2|$2]] ([[User talk:$2|Talk]]); kemmet pe distaolet eo bet c'hoazh gant unan bennak all.
 
 Ar c'hemm diwezhañ a oa gant [[User:$3|$3]] ([[User talk:$3|Talk]]).",
-'editcomment'                 => 'Diverradenn ar c\'hemm a oa: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "Kemmoù distaolet gant [[Special:Contributions/$2|$2]] ([[User talk:$2|Kaozeal]]); adlakaet d'ar stumm diwezhañ a-gent gant [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Disteuler kemmoù $1; distreiñ da stumm diwezhañ $2.',
-'sessionfailure'              => 'Evit doare ez eus ur gudenn gant ho talc\'h;
+'editcomment'      => "Diverradenn ar c'hemm a oa: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => "Kemmoù distaolet gant [[Special:Contributions/$2|$2]] ([[User talk:$2|Kaozeal]]); adlakaet d'ar stumm diwezhañ a-gent gant [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Disteuler kemmoù $1; distreiñ da stumm diwezhañ $2.',
+'sessionfailure'   => 'Evit doare ez eus ur gudenn gant ho talc\'h;
 Nullet eo bet an ober-mañ a-benn en em wareziñ diouzh an tagadennoù preizhañ.
 Klikit war "kent" hag adkargit ar bajenn oc\'h deuet drezi; goude klaskit en-dro.',
+
+# Protect
 'protectlogpage'              => 'Log_gwareziñ',
 'protectlogtext'              => 'Kavit a-is ur roll pajennoù gwarezet ha diwarezet. Sellet ouzh ar [[Special:ProtectedPages|roll ar pajennoù gwarezet]] evit kaout roll ar pajennoù gwarezet bremañ.',
 'protectedarticle'            => 'en/he deus gwarezet [[$1]]',
 'modifiedarticleprotection'   => 'Kemmañ live gwareziñ "[[$1]]"',
 'unprotectedarticle'          => 'en/he deus diwarezet [[$1]]',
 'protect-title'               => 'Stankañ "$1"',
+'prot_1movedto2'              => '[[$1]] adkaset war-du [[$2]]',
 'protect-legend'              => 'Kadarnaat ar stankañ',
 'protectcomment'              => 'Abeg ar stankañ',
 'protectexpiry'               => 'Termen',
 'protect_expiry_invalid'      => 'Direizh eo termen ar prantad.',
 'protect_expiry_old'          => 'Echuet eo ar prantad termen.',
 'protect-unchain'             => 'Dibrennañ an aotreoù adenvel',
-'protect-text'                => "Amañ e c'hallit gwelet ha cheñch live gwareziñ ar bajenn <strong><nowiki>$1</nowiki></strong>.",
-'protect-locked-blocked'      => 'E-keit ha ma viot stanket ne viot ket evit cheñch al live gwareziñ. Setu aze arventennoù a-vremañ ar bajenn <strong>$1</strong>:',
+'protect-text'                => "Amañ e c'hallit gwelet ha cheñch live gwareziñ ar bajenn '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "E-keit ha ma viot stanket ne viot ket evit cheñch al live gwareziñ. Setu aze arventennoù a-vremañ ar bajenn '''$1''':",
 'protect-locked-dblock'       => "N'haller ket cheñch al liveoù gwareziñ rk prennet eo an diaz titouroù.
-Setu doare a-vremañ ar bajenn <strong>$1</strong>:",
+Setu doare a-vremañ ar bajenn '''$1''':",
 'protect-locked-access'       => "N'eo ket aotreet ho kont da zegas kemmoù e live gwareziñ ur bajenn.
-Setu an doare a-vremañ evit ar bajenn-mañ <strong>$1</strong>:",
+Setu an doare a-vremañ evit ar bajenn-mañ '''$1''':",
 'protect-cascadeon'           => "Gwarezet eo ar bajenn-mañ peogwir he c'haver er {{PLURAL:$1|bajenn|pajennoù}} da-heul zo gweredekaet enno ar gwareziñ dre skalierad. Gallout a rit kemmañ al live gwareziñ met ne cheñcho ket ar gwareziñ dre skalierad.",
-'protect-default'             => '(dre ziouer)',
+'protect-default'             => 'Aotren an holl implijerien',
 'protect-fallback'            => 'Ezhomm zo aotre "$1"',
-'protect-level-autoconfirmed' => "Stankañ an implijerien n'int ket enrollet",
+'protect-level-autoconfirmed' => "Stankañ an implijerien nevez hag ar re n'int ket enrollet",
 'protect-level-sysop'         => 'Merourien hepken',
 'protect-summary-cascade'     => 'Gwareziñ dre skalierad',
 'protect-expiring'            => "a zeu d'e dermen d'an $1",
 'protect-cascade'             => 'Gwareziñ dre skalierad - gwareziñ a ra an holl bajennoù zo er bajenn-mañ. ARABAT IMPLIJOUT.',
 'protect-cantedit'            => "N'oc'h ket evit cheñch live gwareziñ ar bajenn-mañ rak n'oc'h ket aotreet da zegas kemmoù enni.",
+'protect-expiry-options'      => '2 eurvezh:2 hours,1 devezh:1 day,3 devezh:3 days,1 sizhunvezh:1 week,2 sizhunvezh:2 weeks,1 mizvezh:1 month,3 mizvezh:3 months,6 mizvezh:6 months,1 bloaz:1 year,da viken:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Aotre',
 'restriction-level'           => 'Live strishaat :',
 'minimum-size'                => 'Ment vihanañ',
@@ -1635,7 +1756,7 @@ Mar klikit war '''''Adderaouiñ''''' e vo naetaet ar stern diverrañ hag al logo
 Ma'z eus bet krouet ur bajenn nevez dezhi an hevelep anv abaoe an diverkadenn, e teuio war wel ar c'hemmoù assavet er roll istor kent ha ne vo ket erlec'hiet ar stumm red en un doare emgefre ken.",
 'undeleterevdel'               => 'Ne vo ket adsavet ar stumm-se eus ar bajenn ma talvez kement ha diverkañ evit darn an doare diwezhañ anezhi. En degouezh-mañ e rankit diaskañ pe diguzhat ar stummoù diverket da ziwezhañ.',
 'undeletehistorynoadmin'       => "Diverket eo bet ar pennad-mañ. Displeget eo perak en diverradenn a-is, war un dro gant munudoù an implijerien o deus bet degaset kemmoù er bajenn a-raok na vije diverket. N'eus nemet ar verourien a c'hall tapout krog war an destenn bet diverket.",
-'undelete-revision'            => 'Stumm diverket eus $1 (gwiriadenn eus an $2) gant $3 :',
+'undelete-revision'            => 'Stumm diverket eus $1, (gwiriadenn eus $4 da $5) gant $3 :',
 'undeleterevision-missing'     => "Stumm fall pe diank. Pe hoc'h eus heuliet ul liamm fall, pe eo bet diziverket ar stumm pe c'hoazh eo bet lamet diouzh an dielloù.",
 'undelete-nodiff'              => "N'eus bet kavet stumm kent ebet.",
 'undeletebtn'                  => 'Diziverkañ!',
@@ -1670,13 +1791,14 @@ $1',
 'blanknamespace' => '(Pennañ)',
 
 # Contributions
-'contributions' => 'Degasadennoù an implijer',
-'mycontris'     => 'Ma degasadennnoù',
-'contribsub2'   => 'Evit $1 ($2)',
-'nocontribs'    => "N'eus bet kavet kemm ebet o klotañ gant an dezverkoù-se.",
-'uctop'         => ' (diwezhañ)',
-'month'         => 'Abaoe miz (hag a-raok) :',
-'year'          => 'Abaoe bloaz (hag a-raok) :',
+'contributions'       => 'Degasadennoù an implijer',
+'contributions-title' => 'Degasadennoù an implijer evit $1',
+'mycontris'           => 'Ma degasadennnoù',
+'contribsub2'         => 'Evit $1 ($2)',
+'nocontribs'          => "N'eus bet kavet kemm ebet o klotañ gant an dezverkoù-se.",
+'uctop'               => ' (diwezhañ)',
+'month'               => 'Abaoe miz (hag a-raok) :',
+'year'                => 'Abaoe bloaz (hag a-raok) :',
 
 'sp-contributions-newbies'     => "Diskouez hepken degasadennoù ar c'hontoù nevez",
 'sp-contributions-newbies-sub' => 'Evit an implijerien nevez',
@@ -1689,7 +1811,6 @@ $1',
 'whatlinkshere'            => 'Pajennoù liammet',
 'whatlinkshere-title'      => 'Pajennoù liammet ouzh "$1"',
 'whatlinkshere-page'       => 'Pajenn :',
-'linklistsub'              => '(Roll al liammoù)',
 'linkshere'                => "Ar pajennoù a-is zo enno ul liamm a gas war-du '''[[:$1]]''':",
 'nolinkshere'              => "N'eus pajenn ebet enni ul liamm war-du '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Pajenn ebet n'eo liammet ouzh '''[[:$1]]''' en esaouenn anv dibabet.",
@@ -1764,6 +1885,7 @@ Roit a-is an abeg resis (o verkañ, da skouer, roll ar pajennoù bet graet gaou
 'ipblocklist-no-results'          => "An anv implier pe ar chomlec'h IP goulennet n'eo ket stanket anezhañ.",
 'blocklink'                       => 'stankañ',
 'unblocklink'                     => 'distankañ',
+'change-blocklink'                => 'Kemmañ ar stankadenn',
 'contribslink'                    => 'degasadennoù',
 'autoblocker'                     => 'Emstanket rak rannañ a rit ur chomlec\'h IP gant "$1". Abeg : "$2".',
 'blocklogpage'                    => 'Log stankañ',
@@ -1828,6 +1950,8 @@ bezit sur e komprenit mat an heuliadoù a-raok kenderc'hel ganti.",
 
 En degouezh-se e rankot adenvel pe gendeuziñ ar bajenn c'hwi hoc'h-unan ma karit.",
 'movearticle'             => "Dilec'hiañ ar pennad",
+'movenologin'             => 'Diluget',
+'movenologintext'         => 'Evit adenvel ur pennad e rankit bezañ [[Special:UserLogin|luget]] evel un implijer enrollet.',
 'movenotallowed'          => "N'oc'h ket aotreet da zilec'hiañ pajennoù.",
 'newtitle'                => 'anv nevez',
 'move-watch'              => 'Evezhiañ ar bajenn-mañ',
@@ -1860,7 +1984,6 @@ Diverkañ anezhañ a fell deoc'h ober evit reiñ lec'h d'an adkas ?",
 'delete_and_move_confirm' => 'Ya, diverkañ ar bajenn',
 'delete_and_move_reason'  => "Diverket evit ober lec'h d'an adkas",
 'selfmove'                => "Heñvel eo titl ar poent loc'hañ ha hini ar pal; n'haller ket adkas ur bajenn war-du he lec'h orin.",
-'immobile_namespace'      => "Dibarek eo titl ar vammenn pe ar pal; n'haller ket adenvel pajennoù war-du an esaouenn anv-mañ.",
 'imagenocrossnamespace'   => "N'haller ket dilec'hiañ ur skeudenn war-du un esaouenn anv n'eo ket hini ur skeudenn.",
 'imagetypemismatch'       => 'Ne glot ket astenn nevez ar restr gant ar furmad-mañ.',
 'imageinvalidfilename'    => 'Fall eo anv ar restr tal',
@@ -1906,6 +2029,7 @@ Miret eo an holl enporzhiadennoù etrewiki e-barzh [[Special:Log/import|log an e
 'import-interwiki-history'   => 'Eilañ holl stummoù istor ar bajenn-mañ',
 'import-interwiki-submit'    => 'Enporzhiañ',
 'import-interwiki-namespace' => 'Treuzkas ar pajennoù en esaouenn anv :',
+'import-comment'             => 'Notenn :',
 'importtext'                 => "Ezporzhiit ur restr adal ar wiki orin en ur implij an arc'hwel Special:Export, enrollit ar bajenn war ho pladenn ha degasit anezhi amañ.",
 'importstart'                => "Oc'h enporzhiañ pajennoù...",
 'import-revision-count'      => '$1 stumm',
@@ -1937,19 +2061,19 @@ Miret eo an holl enporzhiadennoù etrewiki e-barzh [[Special:Log/import|log an e
 'import-logentry-interwiki-detail' => '$1 kemm adal $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Ma fajenn implijer',
+'tooltip-pt-userpage'             => 'Ho pajenn implijer',
 'tooltip-pt-anonuserpage'         => "Ar bajenn implijer evit ar c'homlec'h IP implijet ganeoc'h",
-'tooltip-pt-mytalk'               => 'Ma fajenn gaozeal',
+'tooltip-pt-mytalk'               => 'Ho pajenn gaozeal',
 'tooltip-pt-anontalk'             => "Kaozeadennoù diwar-benn ar c'hemmoù graet adal ar chomlec'h-mañ",
 'tooltip-pt-preferences'          => 'Ma fenndibaboù',
 'tooltip-pt-watchlist'            => "Roll ar pajennoù evezhiet ganeoc'h.",
-'tooltip-pt-mycontris'            => 'Roll ma degasadennoù',
+'tooltip-pt-mycontris'            => 'Roll ho tegasadennoù',
 'tooltip-pt-login'                => "Daoust ma n'eo ket ret, ec'h aliomp deoc'h d'en em lugañ.",
 'tooltip-pt-anonlogin'            => "Daoust ma n'eo ket ret, ec'h aliomp deoc'h d'en em lugañ.",
 'tooltip-pt-logout'               => 'Dilugañ',
 'tooltip-ca-talk'                 => 'Kaozeadennoù diwar-benn ar pennad',
 'tooltip-ca-edit'                 => 'Gallout a rit degas kemmoù er bajenn-mañ. Implijit ar stokell Rakwelet a-raok enrollañ, mar plij.',
-'tooltip-ca-addsection'           => 'Kemerit perzh er gaoz-mañ.',
+'tooltip-ca-addsection'           => 'Kregiñ gant ur rann nevez.',
 'tooltip-ca-viewsource'           => 'Gwarezet eo ar bajenn-mañ. Gallout a rit gwelet an danvez anezhañ memes tra.',
 'tooltip-ca-history'              => 'Stummoù kozh ar bajenn-mañ gant an aozerien anezhi.',
 'tooltip-ca-protect'              => 'Gwareziñ ar bajenn-mañ',
@@ -1996,6 +2120,9 @@ Miret eo an holl enporzhiadennoù etrewiki e-barzh [[Special:Log/import|log an e
 'tooltip-watch'                   => 'Ouzhpennañ ar bajenn-mañ ouzh ho rollad evezhiañ',
 'tooltip-recreate'                => 'Adkrouiñ ar bajenn ha pa vije bet diverket a-raok',
 'tooltip-upload'                  => 'Kregiñ da enporzhiañ',
+'tooltip-rollback'                => "\"Disteuler\" a zistaol en ur c'hlik ar c'hemm(où) bet degaset d'ar bajenn-mañ gant an implijer diwezhañ.",
+'tooltip-undo'                    => '"Dizober" a zistaol ar c\'hemm-mañ hag a zigor ar prenestr skridaozañ er mod rakwelet.
+Talvezout a ra da ouzhpennañ un displegadenn er c\'hombod diverrañ.',
 
 # Stylesheets
 'common.css'   => '/** Talvezout a raio ar CSS lakaet amañ evit an holl gwiskadurioù */',
@@ -2012,12 +2139,12 @@ Miret eo an holl enporzhiadennoù etrewiki e-barzh [[Special:Log/import|log an e
 'notacceptable'     => "N'eo ket ar servijer wiki-mañ evit pourchas stlennoù en ur furmad lennus evit ho arval.",
 
 # Attribution
-'anonymous'        => 'Implijer(ez) dianv eus {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|implijer|implijer}} dianv eus {{SITENAME}}',
 'siteuser'         => 'Implijer(ez) $1 eus {{SITENAME}}',
 'lastmodifiedatby' => "Kemmet eo bet ar bajenn-mañ da ziwezhañ d'an/ar $2, $1 gant $3", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Diazezet war labour $1.',
 'others'           => 're all',
-'siteusers'        => 'Implijer(ez) $1 eus {{SITENAME}}',
+'siteusers'        => '$1 {{PLURAL:$2|implijer|implijer}} eus {{SITENAME}}',
 'creditspage'      => 'Pajennoù kredoù',
 'nocredits'        => "N'eus tamm titour kred hegerz ebet evit ar bajenn-mañ.",
 
@@ -2038,6 +2165,16 @@ Sur a-walc'h abalamour d'ul liamm enni a gas d'ul lec'hienn ziavaez berzet.",
 'numauthors'     => 'Niver a aozerien zisheñvel (pennad) : $1',
 'numtalkauthors' => 'Niver a aozerien zisheñvel (pajenn gaozeal) : $1',
 
+# Skin names
+'skinname-standard'    => 'Standard',
+'skinname-nostalgia'   => 'Melkoni',
+'skinname-cologneblue' => 'Glaz Kologn',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Plogig',
+'skinname-simple'      => 'Eeun',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Produiñ atav ur skeudenn PNG',
 'mw_math_simple' => "HTML m'eo eeun-kenañ, a-hend-all ober gant PNG",
@@ -2090,7 +2227,7 @@ $1',
 'show-big-image'       => 'Pizhder leun',
 'show-big-image-thumb' => '<small>Ment ar rakweled-mañ : $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Roll ar skeudennoù nevez',
 'imagelisttext'         => 'Setu ur roll $1 skeudenn rummet $2.',
 'newimages-summary'     => 'Diskouez a ra ar bajenn zibar-mañ roll ar restroù diwezhañ bet enporzhiet.',
@@ -2372,7 +2509,7 @@ Kement liamm all war an hevelep linenn a seller outañ evel un nemedenn, da skou
 
 # External editor support
 'edit-externally'      => 'Kemmañ ar restr-mañ dre un arload diavaez',
-'edit-externally-help' => "Gwelet skoazell an [http://www.mediawiki.org/wiki/Manual:External_editors arloadoù diavaez] a-benn gouzout hiroc'h.",
+'edit-externally-help' => "(Gwelet [http://www.mediawiki.org/wiki/Manual:External_editors erbedadennoù staliañ an aozer diavaez] a-benn gouzout hiroc'h).",
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'an holl',
@@ -2440,21 +2577,9 @@ $1
 Kadarnait mar plij e fell deoc'h krouiñ ar pennad-mañ da vat.",
 'recreate'            => 'Adkrouiñ',
 
-# HTML dump
-'redirectingto' => "Oc'h adkas da [[:$1]]...",
-
 # action=purge
-'confirm_purge'        => 'Spurjañ krubuilh ar bajenn-mañ?
-
-$1',
 'confirm_purge_button' => 'Mat eo',
-
-# AJAX search
-'searchcontaining' => "Klask ar pennadoù enno ''$1''.",
-'searchnamed'      => "Klask ar pennadoù anvet ''$1''.",
-'articletitles'    => "Pennadoù a grog gant ''$1''",
-'hideresults'      => "Kuzhat an disoc'hoù",
-'useajaxsearch'    => 'Grit gant ar klask AJAX',
+'confirm-purge-top'    => 'Spurjañ krubuilh ar bajenn-mañ?',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; pajenn gent',
@@ -2559,13 +2684,13 @@ Klaskit rakwelet er mod boutin.',
 'filepath-submit'  => 'Hent moned',
 'filepath-summary' => 'Diskouez a ra ar bajenn-mañ hent moned klok ur restr. Diskouezet eo ar skeudennoù gant ur pizhder uhel, erounit a ra ar restroù all war-eeun gant o frogramm stag.
 
-Merkit anv ar restr hep ar rakger "{{ns:image}} :"',
+Merkit anv ar restr hep ar rakger "{{ns:file}} :"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Klask ar restroù e doubl',
 'fileduplicatesearch-summary'  => 'Klask restroù e doubl war diazez talvoudennoù darnek.
 
-Merkañ anv ar restr hep ar rakger "{{ns:image}}:"',
+Merkañ anv ar restr hep ar rakger "{{ns:file}}:"',
 'fileduplicatesearch-legend'   => 'Klask un doubl',
 'fileduplicatesearch-filename' => 'Anv ar restr :',
 'fileduplicatesearch-submit'   => 'Klask',
diff --git a/languages/messages/MessagesBs.php b/languages/messages/MessagesBs.php
index 83afa6fa..9f0b9bc3 100644
--- a/languages/messages/MessagesBs.php
+++ b/languages/messages/MessagesBs.php
@@ -15,14 +15,12 @@
 $namespaceNames = array(
 	NS_MEDIA            => 'Medija',
 	NS_SPECIAL          => 'Posebno',
-	NS_MAIN             => '',
 	NS_TALK             => 'Razgovor',
 	NS_USER             => 'Korisnik',
 	NS_USER_TALK        => 'Razgovor_sa_korisnikom',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Razgovor_{{grammar:instrumental|$1}}',
-	NS_IMAGE            => 'Slika',
-	NS_IMAGE_TALK       => 'Razgovor_o_slici',
+	NS_FILE             => 'Datoteka',
+	NS_FILE_TALK        => 'Razgovor_o_datoteci',
 	NS_MEDIAWIKI        => 'MedijaViki',
 	NS_MEDIAWIKI_TALK   => 'Razgovor_o_MedijaVikiju',
 	NS_TEMPLATE         => 'Å ablon',
@@ -33,8 +31,98 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Razgovor_o_kategoriji',
 );
 
-$skinNames = array(
-	'Obi�na', 'Nostalgija', 'Kelnsko plavo'
+$namespaceAliases = array(
+	'Slika' => NS_FILE,
+	'Razgovor_o_datoteci' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'DvostrukaPreusmjerenja' ),
+	'BrokenRedirects'           => array( 'NedovrsenaPreusmjerenja' ),
+	'Disambiguations'           => array( 'Cvor' ),
+	'Userlogin'                 => array( 'KorisnickaPrijava' ),
+	'Userlogout'                => array( 'KorisnickaOdjava' ),
+	'CreateAccount'             => array( 'NapraviRacun' ),
+	'Preferences'               => array( 'Postavke' ),
+	'Watchlist'                 => array( 'ListaPracenja' ),
+	'Recentchanges'             => array( 'NedavneIzmjene' ),
+	'Upload'                    => array( 'Postavljanje' ),
+	'Listfiles'                 => array( 'ListaSlika' ),
+	'Newimages'                 => array( 'NoveSlike' ),
+	'Listusers'                 => array( 'ListaKorisnika' ),
+	'Listgrouprights'           => array( 'ListaKorisnickihPrava' ),
+	'Statistics'                => array( 'Statistike' ),
+	'Randompage'                => array( 'SlucajniClanak' ),
+	'Lonelypages'               => array( 'Siromasci' ),
+	'Uncategorizedpages'        => array( 'StraniceBezKategorije' ),
+	'Uncategorizedcategories'   => array( 'KategorijeBezKategorije' ),
+	'Uncategorizedimages'       => array( 'SlikeBezKategorije' ),
+	'Uncategorizedtemplates'    => array( 'SabloniBezKategorije' ),
+	'Unusedcategories'          => array( 'NekoristeneKategorije' ),
+	'Unusedimages'              => array( 'NekoristeneSlike' ),
+	'Wantedpages'               => array( 'ZatrazeneStranice', 'ZatrazeniClanci' ),
+	'Wantedcategories'          => array( 'ZatrazeneKategorije' ),
+	'Wantedfiles'               => array( 'ZatrazeneDatoteke' ),
+	'Wantedtemplates'           => array( 'ZatrazeniSabloni' ),
+	'Mostlinked'                => array( 'NajcesceLinkovano' ),
+	'Mostlinkedcategories'      => array( 'NajcesceLinkovaneKategorije', 'NajcesceKoristeneKategorije' ),
+	'Mostlinkedtemplates'       => array( 'NajcesceLinkovaniSabloni', 'NajcesceKoristeniSabloni' ),
+	'Mostimages'                => array( 'NajcesceSlike' ),
+	'Mostcategories'            => array( 'NajcesceKategorije' ),
+	'Mostrevisions'             => array( 'NajcesceRevizije' ),
+	'Fewestrevisions'           => array( 'NajmanjeRevizija' ),
+	'Shortpages'                => array( 'KratkeStranice' ),
+	'Longpages'                 => array( 'DugeStranice' ),
+	'Newpages'                  => array( 'NoveStranice' ),
+	'Ancientpages'              => array( 'NajstarijeStranice' ),
+	'Deadendpages'              => array( 'MrtveStranice' ),
+	'Protectedpages'            => array( 'ZasticeneStranice' ),
+	'Protectedtitles'           => array( 'ZasticeniNazivi' ),
+	'Allpages'                  => array( 'SveStranice' ),
+	'Prefixindex'               => array( 'IndeksPrefiksa' ),
+	'Ipblocklist'               => array( 'ListaBlokiranjaPrekoIP' ),
+	'Specialpages'              => array( 'SpecijalneStranice' ),
+	'Contributions'             => array( 'Doprinos' ),
+	'Emailuser'                 => array( 'EmailKorisnika' ),
+	'Confirmemail'              => array( 'PotvrdiEmail' ),
+	'Whatlinkshere'             => array( 'StaJeLinkovanoOvdje' ),
+	'Recentchangeslinked'       => array( 'PovezaneNedavneIzmjene' ),
+	'Movepage'                  => array( 'PreusmjeriStranicu' ),
+	'Blockme'                   => array( 'BlokirajMe' ),
+	'Booksources'               => array( 'KnjizniIzvori' ),
+	'Categories'                => array( 'Kategorije' ),
+	'Export'                    => array( 'Izvoz' ),
+	'Version'                   => array( 'Verzija' ),
+	'Allmessages'               => array( 'SvePoruke' ),
+	'Log'                       => array( 'Protokol', 'Protokoli' ),
+	'Blockip'                   => array( 'BlokirajIP' ),
+	'Undelete'                  => array( 'PovratBrisanog' ),
+	'Import'                    => array( 'Uvoz' ),
+	'Lockdb'                    => array( 'ZakljucajDB' ),
+	'Unlockdb'                  => array( 'OdkljucajDB' ),
+	'Userrights'                => array( 'KorisnickaPrava' ),
+	'MIMEsearch'                => array( 'MIMEPretraga' ),
+	'FileDuplicateSearch'       => array( 'PotragaDuplihFajlova' ),
+	'Unwatchedpages'            => array( 'NepregledaneStranice' ),
+	'Listredirects'             => array( 'ListaPreusmjeravanja' ),
+	'Revisiondelete'            => array( 'VratiBrisanje' ),
+	'Unusedtemplates'           => array( 'NekoristeniSabloni' ),
+	'Randomredirect'            => array( 'SlucajnoPreusmjerenje' ),
+	'Mypage'                    => array( 'MojaStranica' ),
+	'Mytalk'                    => array( 'MojRazgovor' ),
+	'Mycontributions'           => array( 'MojiDoprinosi' ),
+	'Listadmins'                => array( 'ListaAdministratora' ),
+	'Listbots'                  => array( 'ListaBotova' ),
+	'Popularpages'              => array( 'PopularneStranice' ),
+	'Search'                    => array( 'Pretraga' ),
+	'Resetpass'                 => array( 'PonistiLozinku' ),
+	'Withoutinterwiki'          => array( 'BezInterwiki' ),
+	'MergeHistory'              => array( 'SpojiHistoriju' ),
+	'Filepath'                  => array( 'PutDoDatoteke' ),
+	'Invalidateemail'           => array( 'PogresanEmail' ),
+	'Blankpage'                 => array( 'PraznaStranica' ),
+	'LinkSearch'                => array( 'PotragaLinkova' ),
+	'DeletedContributions'      => array( 'ObrisaniDoprinosi' ),
 );
 
 $magicWords = array(
@@ -132,16 +220,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'Sakrij moje izmjene sa spiska praćenih �lanaka',
 'tog-watchlisthidebots'       => 'Sakrij izmjene botova sa spiska praćenih �lanaka',
 'tog-watchlisthideminor'      => 'Sakrij zanemarljive izmjene sa spiska mojih praćenja',
+'tog-watchlisthideliu'        => 'Sakrij promjene prijavljenih korisnika sa liste praćenja',
+'tog-watchlisthideanons'      => 'Sakrij promjene anonimnih korisnika sa liste praćenja',
 'tog-ccmeonemails'            => 'Pošalji mi kopije emailova koje pošaljem drugim korisnicima',
 'tog-diffonly'                => 'Ne prikazuj sadržaj stranice ispod prikaza razlika',
 'tog-showhiddencats'          => 'Prikaži skrivene kategorije',
+'tog-norollbackdiff'          => 'Nakon vraćanja zanemari prikaz razlika',
 
 'underline-always'  => 'Uvijek',
 'underline-never'   => 'Nikad',
 'underline-default' => 'Po podešavanjima preglednika',
 
-'skinpreview' => '(Pregled)',
-
 # Dates
 'sunday'        => 'nedelja',
 'monday'        => 'ponedeljak',
@@ -196,7 +285,7 @@ $messages = array(
 
 # Categories related messages
 'pagecategories'                 => '{{PLURAL:$1|Kategorija|Kategorije}}',
-'category_header'                => 'ÄŒlanaka u kategoriji "$1"',
+'category_header'                => 'ÄŒlanci u kategoriji "$1"',
 'subcategories'                  => 'Potkategorije',
 'category-media-header'          => 'Mediji u kategoriji "$1"',
 'category-empty'                 => "''Ova kategorija trenutno ne sadrži �lanke ni medije.''",
@@ -234,7 +323,7 @@ $messages = array(
 'mytalk'         => 'Moj razgovor',
 'anontalk'       => 'Razgovor za ovu IP adresu',
 'navigation'     => 'Navigacija',
-'and'            => 'i',
+'and'            => '&#32;i',
 
 # Metadata in edit box
 'metadata_help' => 'Metapodaci:',
@@ -260,7 +349,7 @@ $messages = array(
 'create-this-page'  => 'Napravi ovu stranicu',
 'delete'            => 'Obriši',
 'deletethispage'    => 'Obriši ovu stranicu',
-'undelete_short'    => 'Vrati obrisanih {{PLURAL:$1|$1 izmjenu|$1 izmjena}}',
+'undelete_short'    => 'Vrati obrisanih {{PLURAL:$1|$1 izmjenu|$1 izmjene|$1 izmjena}}',
 'protect'           => 'Zaštitite',
 'protect_change'    => 'promijeni',
 'protectthispage'   => 'Zaštitite ovu stranicu',
@@ -271,14 +360,14 @@ $messages = array(
 'talkpagelinktext'  => 'Razgovor',
 'specialpage'       => 'Posebna Stranica',
 'personaltools'     => 'Li�ni alati',
-'postcomment'       => 'Pošaljite komentar',
+'postcomment'       => 'Nova sekcija',
 'articlepage'       => 'Pogledaj �lanak',
 'talk'              => 'Razgovor',
 'views'             => 'Pregledi',
 'toolbox'           => 'Traka sa alatima',
 'userpage'          => 'Pogledaj korisni�ku stranicu',
 'projectpage'       => 'Pogledaj stranu o ovoj strani',
-'imagepage'         => 'Pogledajte stranicu slike',
+'imagepage'         => 'Pogledajte stranicu datoteke',
 'mediawikipage'     => 'Pogledaj stranicu sa porukama',
 'templatepage'      => 'Pogledajte stranicu za Å¡ablone',
 'viewhelppage'      => 'Pogledajte stranicu za pomoć',
@@ -297,8 +386,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'O projektu {{SITENAME}}',
 'aboutpage'            => 'Project:O_projektu_{{SITENAME}}',
-'bugreports'           => 'Prijavite grešku',
-'bugreportspage'       => 'Project:Prijave_grešaka',
 'copyright'            => 'Svi sadržaji podliježu "$1" licenci.',
 'copyrightpagename'    => '{{SITENAME}} autorska prava',
 'copyrightpage'        => '{{ns:project}}:Autorska_prava',
@@ -321,22 +408,24 @@ $messages = array(
 
 'badaccess'        => 'Greška pri odobrenju',
 'badaccess-group0' => 'Nije vam dozvoljeno izvršiti akciju koju ste zahtjevali.',
-'badaccess-group1' => 'Akcija koju ste htjeli napraviti je ograni�ena za korisnike grupe $1.',
-'badaccess-group2' => 'Akcija koju ste htjeli napraviti je ograni�ena za korisnike iz jedne od grupa $1.',
-'badaccess-groups' => 'Ovu akciju mogu izvršiti samo korisnici iz jedne od grupa $1.',
+'badaccess-groups' => 'Akcija koju ste zahtjevali je ograni�ena na korisnike iz {{PLURAL:$2|ove grupe|jedne od grupa}}: $1.',
 
 'versionrequired'     => 'Potrebna je verzija $1 MediaWikija',
 'versionrequiredtext' => 'Potrebna je verzija $1 MediaWikija da bi se koristila ova strana. Pogledaj [[Special:Version|verziju]].',
 
 'ok'                      => 'da',
+'pagetitle'               => '$1 - {{SITENAME}}',
 'retrievedfrom'           => 'Dobavljeno iz "$1"',
 'youhavenewmessages'      => 'Imate $1 ($2).',
 'newmessageslink'         => 'novih poruka',
 'newmessagesdifflink'     => 'posljednja promjena',
 'youhavenewmessagesmulti' => 'Imate nove poruke na $1',
 'editsection'             => 'uredi',
+'editsection-brackets'    => '[$1]',
 'editold'                 => 'uredi',
 'viewsourceold'           => 'pogledaj izvor',
+'editlink'                => 'uredi',
+'viewsourcelink'          => 'pogledaj izvor',
 'editsectionhint'         => 'Uredi sekciju: $1',
 'toc'                     => 'Sadržaj',
 'showtoc'                 => 'prikaži',
@@ -351,13 +440,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom izvor',
 'page-rss-feed'           => '"$1" RSS izvor',
 'page-atom-feed'          => '"$1" Atom izvor',
-'red-link-title'          => '$1 (nije još napisan)',
+'red-link-title'          => '$1 (stranica ne postoji)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ÄŒlanak',
 'nstab-user'      => 'Korisni�ka stranica',
 'nstab-media'     => 'Mediji',
-'nstab-special'   => 'Posebna',
+'nstab-special'   => 'Posebna stranica',
 'nstab-project'   => 'ÄŒlanak',
 'nstab-image'     => 'Datoteka',
 'nstab-mediawiki' => 'Poruka',
@@ -367,8 +456,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Nema takve akcije',
-'nosuchactiontext'  => 'Akcija navedena u URL-u nije
-prepoznata od strane {{SITENAME}} softvera.',
+'nosuchactiontext'  => 'Akcija navedena u URL-u nije valjana.
+Možda ste pogriješili pri unosu URL-a ili ste slijedili pokvaren link.
+Moguće je i da je ovo greška u {{SITENAME}} softveru.',
 'nosuchspecialpage' => 'Nema takve posebne stranice',
 'nospecialpagetext' => 'Tražili ste posebnu stranicu, koju {{SITENAME}} softver nije prepoznao.',
 
@@ -409,22 +499,22 @@ Molimo Vas da ovo prijavite [[Special:ListUsers/sysop|administratoru]] sa navođ
 'internalerror'        => 'Unutrašnja greška',
 'internalerror_info'   => 'Interna greška: $1',
 'filecopyerror'        => 'Ne može se kopirati "$1" na "$2".',
-'filerenameerror'      => 'Ne može se promjeniti ime fajla "$1" to "$2".',
-'filedeleteerror'      => 'Ne može se izbrisati fajl "$1".',
+'filerenameerror'      => 'Ne može se promjeniti ime datoteke "$1" u "$2".',
+'filedeleteerror'      => 'Ne može se izbrisati datoteka "$1".',
 'directorycreateerror' => 'Nije moguće napraviti direkciju "$1".',
-'filenotfound'         => 'Ne može se naći fajl "$1".',
-'fileexistserror'      => 'Nemoguće je napisati fajl "$1": fajl već postoji',
+'filenotfound'         => 'Ne može se naći datoteka "$1".',
+'fileexistserror'      => 'Nemoguće je napisati datoteku "$1": datoteka već postoji',
 'unexpected'           => 'Neo�ekivana vrijednost: "$1"="$2".',
-'formerror'            => 'Greška:  ne može se poslati upitnik',
+'formerror'            => 'Greška: ne može se poslati upitnik',
 'badarticleerror'      => 'Ova akcija ne može biti izvršena na ovoj stranici.',
-'cannotdelete'         => 'Ne može se obrisati navedena stranica ili slika.  (Moguće je da ju je neko drugi već obrisao.)',
+'cannotdelete'         => 'Ne može se obrisati navedena stranica ili datoteka.
+Moguće je da ju je neko drugi već obrisao.',
 'badtitle'             => 'Loš naslov',
 'badtitletext'         => 'Zahtjevani naslov stranice je bio neispravan, prazan ili neispravno povezan međujezi�ki ili interviki naslov.',
-'perfdisabled'         => 'Žao nam je!  Ova mogućnost je privremeno onemogućena jer usporava bazu do te mjere da više niko ne može da koristi viki.',
 'perfcached'           => 'Slijedeći podaci su keširani i možda neće biti u potpunosti ažurirani.',
-'perfcachedts'         => 'Sljedeći podaci se nalaze u memoriji i zadnji put su ažurirani $1.',
+'perfcachedts'         => 'Slijedeći podaci se nalaze u memoriji i zadnji put su ažurirani $1.',
 'querypage-no-updates' => 'Ažuriranje ove stranice je isklju�eno.
-Podaci koji se ovdje nalaze ne moraju biti aktualni.',
+Podaci koji se ovdje nalaze ne moraju biti aktuelni.',
 'wrong_wfQuery_params' => 'Neta�ni parametri za wfQuery()<br />
 Funkcija: $1<br />
 Pretraga: $2',
@@ -437,36 +527,36 @@ Pretraga: $2',
 'protectedinterface'   => 'Ova stranica je zaštićena jer sadrži tekst MediaWiki programa.',
 'editinginterface'     => "'''Upozorenje:''' Mijenjate stranicu koja sadrži aktivan tekst programa.
 Promjene na ovoj stranici dovode i do promjena za druge korisnike.
-Za prijevode, molimo Vas koristite [http://translatewiki.net/wiki/Main_Page?setlang=bs Betawiki], projekt prijevoda za MediaWiki.",
+Za prijevode, molimo Vas koristite [http://translatewiki.net/wiki/Main_Page?setlang=bs translatewiki.net], projekt prijevoda za MediaWiki.",
 'sqlhidden'            => '(SQL pretraga sakrivena)',
-'cascadeprotected'     => 'Uređivanje ove sranice je zabranjeno jer sadrži {{PLURAL:$1|stranicu zaštićeu|stranice zaštićene}} od uređivanja iz razloga:
+'cascadeprotected'     => 'Uređivanje ove stranice je zabranjeno jer sadrži {{PLURAL:$1|stranicu zaštićenu|stranice zaštićene}} od uređivanja iz razloga:
 $2',
 'namespaceprotected'   => "Vi nemate dozvulu da mijenjate stranicu '''$1'''.",
 'customcssjsprotected' => 'Nemate dozvolu za mijenjanje ove stranice jer sadrži osobne postavke nekog drugog korisnika.',
 'ns-specialprotected'  => 'Specijalne stranice se ne mogu uređivati.',
-'titleprotected'       => "Naslov stranice je zaštićen od postavljanja od strane korisnika [[User:$1|$1]].
-Iz razloga ''$2''.",
+'titleprotected'       => 'Naslov stranice je zaštićen od postavljanja od strane korisnika [[User:$1|$1]].
+Iz razloga "\'\'$2\'\'".',
 
 # Virus scanner
-'virus-badscanner'     => 'Loša konfiguracija: nepoznati anti-virus program: <i>$1</i>',
-'virus-scanfailed'     => 'kontrolisani fajlovi (code $1)',
+'virus-badscanner'     => "Loša konfiguracija: nepoznati anti-virus program: ''$1''",
+'virus-scanfailed'     => 'skeniranje nije uspjelo (code $1)',
 'virus-unknownscanner' => 'nepoznati anti-virus program:',
 
 # Login and logout pages
 'logouttitle'                => 'Odjavite se',
-'logouttext'                 => '<strong>Sad ste odjavljeni.</strong><br />
-Možete nastaviti da koristite {{SITENAME}} anonimno, ili se ponovo prijaviti
-kao isti ili kao drugi korisnik.  Obratite pažnju da neke stranice mogu nastaviti da se prikazuju kao da ste još uvijek prijavljeni, dok ne o�istite keš svog brauzera.',
+'logouttext'                 => "'''Sad ste odjavljeni.'''
+
+Možete nastaviti da koristite {{SITENAME}} anonimno, ili se ponovo [[Special:UserLogin|prijaviti]] kao isti ili kao drugi korisnik.
+Obratite pažnju da neke stranice mogu nastaviti da se prikazuju kao da ste još uvijek prijavljeni, dok ne o�istite keš svog preglednika.",
 'welcomecreation'            => '<h2>Dobro došli, $1!</h2><p>Vaš nalog je napravljen.
 Ne zaboravite da prilagodite sebi svoja podešavanja.',
 'loginpagetitle'             => 'Prijavljivanje',
 'yourname'                   => 'Korisni�ko ime:',
 'yourpassword'               => 'Å ifra:',
-'yourpasswordagain'          => 'Ponovite lozinku',
+'yourpasswordagain'          => 'Ponovite Å¡ifru:',
 'remembermypassword'         => 'Zapamti šifru za iduće posjete',
-'yourdomainname'             => 'Vaš domen',
+'yourdomainname'             => 'Vaš domen:',
 'externaldberror'            => 'Došlo je do greške pri vanjskoj autorizaciji baze podataka ili vam nije dopušteno osvježavanje Vašeg vanjskog korisni�kog ra�una.',
-'loginproblem'               => '<b>Bilo je problema sa vašim prijavljivanjem.</b><br />Probajte ponovo!',
 'login'                      => 'Prijavi se',
 'nav-login-createaccount'    => 'Prijavi se / Registruj se',
 'loginprompt'                => "Morate imati kola�iće ('''cookies''') omogućene da biste se prijavili na {{SITENAME}}.",
@@ -483,17 +573,18 @@ Ne zaboravite da prilagodite sebi svoja podešavanja.',
 'badretype'                  => 'Lozinke koje ste unijeli se ne poklapaju.',
 'userexists'                 => 'Korisni�ko ime koje ste unijeli je već u upotrebi.
 Molimo Vas da izaberete drugo ime.',
-'youremail'                  => 'E-pošta *',
+'youremail'                  => 'E-pošta:',
 'username'                   => 'Korisni�ko ime:',
 'uid'                        => 'Korisni�ki ID:',
 'prefs-memberingroups'       => 'ÄŒlan {{PLURAL:$1|grupe|grupa}}:',
-'yourrealname'               => 'Vaše pravo ime *',
+'yourrealname'               => 'Vaše pravo ime:',
 'yourlanguage'               => 'Jezik:',
+'yourvariant'                => 'Varijanta:',
 'yournick'                   => 'Nadimak (za potpise):',
 'badsig'                     => 'Loš sirovi potpis.
 Provjerite HTML tagove.',
-'badsiglength'               => 'Potpis je predug.
-Mora biti ispod $1 {{PLURAL:$1|karakter|karaktera}}.',
+'badsiglength'               => 'Vaš potpis je predug.
+Mora biti manji od $1 {{PLURAL:$1|znaka|znaka|znakova}}.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Pravo ime nije obavezno.
 Ako izaberete da date ime, biće korišteno za pripisivanje za vaš rad.',
@@ -506,7 +597,9 @@ Također omogućuje drugim korisnicima da vas kontaktiraju preko vaše korisni�
 'noname'                     => 'Niste izabrali ispravno korisni�ko ime.',
 'loginsuccesstitle'          => 'Prijavljivanje uspješno',
 'loginsuccess'               => "'''Sad ste prijavljeni na {{SITENAME}} kao \"\$1\".'''",
-'nosuchuser'                 => 'Ne postoji korisnik sa imenom "$1". Provjerite vaše kucanje, ili [[Special:UserLogin/signup|napravite novi korisni�ki ra�un]].',
+'nosuchuser'                 => 'Ne postoji korisnik sa imenom "$1".
+Korisni�ka imena razlikuju velika i mala slova.
+Provjerite vaše kucanje ili [[Special:UserLogin/signup|napravite novi korisni�ki ra�un]].',
 'nosuchusershort'            => 'Ne postoji korisnik sa imenom "<nowiki>$1</nowiki>".
 Provjerite da li ste dobro ukucali.',
 'nouserspecified'            => 'Morate izabrati korisni�ko ime.',
@@ -534,9 +627,9 @@ Prije nego što pošaljemo daljnje poruke, molimo vas da otvorite e-mail i slije
 'throttled-mailpassword'     => 'Već Vam je poslan e-mail za promjenu lozinke u {{PLURAL:$1|zadnjih sat vremena|zadnja $1 sata|zadnjih $1 sati}}.
 Da bi se sprije�ila zloupotreba, može se poslati samo jedan e-mail za promjenu lozinke {{PLURAL:$1|svakih sat vremena|svaka $1 sata|svakih $1 sati}}.',
 'mailerror'                  => 'Greška pri slanju e-pošte: $1',
-'acct_creation_throttle_hit' => 'Žao nam je, već ste otvorili $1 korisni�kih ra�una.
-Ne možete otvoriti više ra�una.',
-'emailauthenticated'         => 'Vaša e-mail adresa je potvrđena $1.',
+'acct_creation_throttle_hit' => 'Posjetioci na ovoj wiki koji koriste Vašu IP adresu su već napravili {{PLURAL:$1|$1 ra�un|$1 ra�una}} u zadnjih nekoliko dana, što je najveći broj dopuštenih napravljenih ra�una za ovaj period.
+Kao rezultat, posjetioci koji koriste ovu IP adresu ne mogu trenutno praviti više ra�una.',
+'emailauthenticated'         => 'Vaša e-mail adresa je autentificirana na $2 u $3.',
 'emailnotauthenticated'      => 'Vaša e-mail adresa još nije autentificirana.
 Nijedan e-mail neće biti poslan za bilo koju uslugu od slijedećih.',
 'noemailprefs'               => 'Unesite e-mail adresu za osposobljavanje slijedećih usluga.',
@@ -550,20 +643,29 @@ Molimo vas da unesete ispravnu adresu ili ostavite prazno polje.',
 Trebali biste se prijaviti i promjeniti Å¡ifru.
 
 Možete ignorisati ovu poruku, ako je korisni�ki ra�un napravljen greškom.',
+'login-throttled'            => 'Previše puta ste pokušali unijeti šifru za korisni�ki ra�un.
+Molimo vas da sa�ekate prije nego što pokušate ponovo.',
 'loginlanguagelabel'         => 'Jezik: $1',
 
 # Password reset dialog
-'resetpass'               => 'Resetuj korisni�ku lozinku',
-'resetpass_announce'      => 'Prijavili ste se sa privremenim kodom koji ste dobili na e-mail.
+'resetpass'                 => 'Promijeni korisni�ku šifru',
+'resetpass_announce'        => 'Prijavili ste se sa privremenim kodom koji ste dobili na e-mail.
 Da biste završili prijavu, morate unijeti novu šifru ovdje:',
-'resetpass_text'          => '<!-- Unesi tekst ovdje -->',
-'resetpass_header'        => 'Obnovi šifru za ra�un',
-'resetpass_submit'        => 'Odredi Å¡ifru i prijavi se',
-'resetpass_success'       => 'Vaša šifra je uspiješno promjenjena! Prijava u toku...',
-'resetpass_bad_temporary' => 'Nevažeća privremena šifra.
+'resetpass_text'            => '<!-- Unesi tekst ovdje -->',
+'resetpass_header'          => 'Obnovi šifru za ra�un',
+'oldpassword'               => 'Stara Å¡ifra:',
+'newpassword'               => 'Nova Å¡ifra:',
+'retypenew'                 => 'Ukucajte ponovo novu Å¡ifru:',
+'resetpass_submit'          => 'Odredi Å¡ifru i prijavi se',
+'resetpass_success'         => 'Vaša šifra je uspiješno promjenjena! Prijava u toku...',
+'resetpass_bad_temporary'   => 'Nevažeća privremena šifra.
 Možda ste već promjenili šifru ili ste zatražili novu privremenu šifru.',
-'resetpass_forbidden'     => 'Å ifre ne mogu biti promjenjene',
-'resetpass_missing'       => 'Forma ne sadrži tražene podatke.',
+'resetpass_forbidden'       => 'Å ifre ne mogu biti promjenjene',
+'resetpass-no-info'         => 'Morate biti prijavljeni da bi ste pristupili ovoj stranici direktno.',
+'resetpass-submit-loggedin' => 'Promijeni Å¡ifru',
+'resetpass-wrong-oldpass'   => 'Privremena ili trenutna Å¡ifra nije validna. 
+Možda ste već uspješno promijenili Vašu šifru ili ste tražili novu privremenu šifru.',
+'resetpass-temp-password'   => 'Privremena Å¡ifra:',
 
 # Edit page toolbar
 'bold_sample'     => 'Podebljan tekst',
@@ -583,13 +685,13 @@ Možda ste već promjenili šifru ili ste zatražili novu privremenu šifru.',
 'image_sample'    => 'ime_slike.jpg',
 'image_tip'       => 'Uklopljena slika',
 'media_sample'    => 'ime_medija_fajla.ogg',
-'media_tip'       => 'Putanja ka multimedijalnom fajlu',
+'media_tip'       => 'Putanja ka multimedijalnoj datoteci',
 'sig_tip'         => 'Vaš potpis sa trenutnim vremenom',
 'hr_tip'          => 'Horizontalna linija (koristite oskudno)',
 
 # Edit pages
-'summary'                          => 'Sažetak',
-'subject'                          => 'Tema/naslov',
+'summary'                          => 'Sažetak:',
+'subject'                          => 'Tema/naslov:',
 'minoredit'                        => 'Ovo je mala izmjena',
 'watchthis'                        => 'Prati ovu stranicu',
 'savearticle'                      => 'Sa�uvaj',
@@ -603,8 +705,8 @@ Ako kliknete na Sa�uvaj, Vaša izmjena će biti sa�uvana bez sažetka.",
 'missingcommenttext'               => 'Molimo unesite komentar ispod.',
 'missingcommentheader'             => "'''Podsjetnik:''' Niste napisati temu/naslov za ovaj komentar.
 Ako ponovo kliknete na '''Sa�uvaj �lanak''', vaše izmjene će biti spašene bez teme/naslova.",
-'summary-preview'                  => 'Pregled sažetka',
-'subject-preview'                  => 'Pregled tema/naslova',
+'summary-preview'                  => 'Pregled sažetka:',
+'subject-preview'                  => 'Pregled tema/naslova:',
 'blockedtitle'                     => 'Korisnik je blokiran',
 'blockedtext'                      => "<big>'''Vaše korisni�ko ime ili IP adresa je blokirana.'''</big>
 
@@ -652,17 +754,17 @@ Pošto sekcija $1 ne postoji, nije moguće spremiti Vaše promjene.',
 'accmailtitle'                     => 'Lozinka poslata.',
 'accmailtext'                      => "Lozinka za nalog '$1' je poslata na adresu $2.",
 'newarticle'                       => '(Novi)',
-'newarticletext'                   => "'''Došli ste na stranicu koja još nema sadržaja.'''<br />
+'newarticletext'                   => "Došli ste na stranicu koja još nema sadržaja.
 *Ako želite unijeti sadržaj, po�nite tipkati u prozor ispod ovog teksta.
 *Ako vam treba pomoć, idite na [[{{MediaWiki:Helppage}}|stranicu za pomoć]].
-*Ako ste ovamo dospjeli slu�ajno, kliknite dugme \"Nazad\" (''Back'') u svom internet pregleda�u.",
-'anontalkpagetext'                 => "----''Ovo je stranica za razgovor za anonimnog korisnika koji još nije napravio nalog ili ga ne koristi.  Zbog toga moramo da koristimo broj�anu IP adresu kako bismo odentifikovali njega ili nju.  Takvu adresu može dijeliti više korisnika.  Ako ste anonimni korisnik i mislite da su vam upućene nebitne primjedbe, molimo Vas da [[Special:UserLogin|napravite nalog ili se prijavite]] da biste izbjegli buduću zabunu sa ostalim anonimnim korisnicima.''",
-'noarticletext'                    => "<div style=\"border: 1px solid #ccc; padding: 7px;\">'''{{SITENAME}} još nema ovaj �lanak.'''
-* Da zapo�nete �lanak, kliknite '''[{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} uredite ovu stranicu]'''.
-* [[Special:Search/{{PAGENAME}}|Pretraži {{PAGENAME}}]] u ostalim �lancima
-----
-* '''Ukoliko ste napravili ovaj �lanak u posljednjih nekoliko minuta i još se nije pojavio, postoji mogućnost da je server u zastoju zbog osvježavanja baze podataka.''' Molimo Vas da probate sa <span class=\"plainlinks\">[{{fullurl:{{PAGENAME}}|action=purge}} osvježavanjem]<span> ili sa�ekajte i provjerite kasnije ponovo prije ponovnog pravljenja �lanka.
-* Ako ste napravili �lanak pod ovim imenom ranije, moguće je da je bio izbrisan.  Potražite '''{{FULLPAGENAME}}''' [{{fullurl:Special:Log|type=delete&page={{FULLPAGENAMEE}}}} u spisku brisanja].",
+*Ako ste ovamo dospjeli slu�ajno, kliknite dugme \"Nazad\" (''Back'') u svom internet pregledniku.",
+'anontalkpagetext'                 => "----''Ovo je stranica za razgovor za anonimnog korisnika koji još nije napravio nalog ili ga ne koristi.
+Zbog toga moramo da koristimo broj�anu IP adresu kako bismo identifikovali njega ili nju.
+Takvu adresu može dijeliti više korisnika.
+Ako ste anonimni korisnik i mislite da su vam upućene nebitne primjedbe, molimo Vas da [[Special:UserLogin/signup|napravite nalog]] ili se [[Special:UserLogin|prijavite]] da biste izbjegli buduću zabunu sa ostalim anonimnim korisnicima.''",
+'noarticletext'                    => 'Na ovoj stranici trenutno nema teksta.
+Možete [[Special:Search/{{PAGENAME}}|tražiti naslov ove stranice]] na drugim stranicama.
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} tražiti u povezanim zapisima] ili [{{fullurl:{{FULLPAGENAME}}|action=edit}} urediti ovu stranicu]</span>.',
 'userpage-userdoesnotexist'        => 'Korisni�ki ra�un "$1" nije registrovan.
 Molimo provjerite da li želite napraviti/izmijeniti ovu stranicu.',
 'clearyourcache'                   => "'''Pažnja: Nakon što sa�uvate izmjene, morate \"osvježiti\" keš memoriju vašeg pretraživa�a da bi ste vidjeli nova podešenja.'''
@@ -670,29 +772,29 @@ Molimo provjerite da li želite napraviti/izmijeniti ovu stranicu.',
 '''Konqueror:''' klikni na ''Reload'' ili pritisnite dugme ''F5'';
 '''Opera:''' o�istite \"keš\" preko izbornika ''Tools → Preferences'';
 '''Internet Explorer:''' držite tipku ''Ctrl'' i kliknite na ''Refresh'' ili pritisnite ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>Pažnja:</strong> Koristite 'Prikaži izgled' dugme da testirate svoj novi CSS/JS prije nego što sa�uvate.",
+'usercssjsyoucanpreview'           => "'''Pažnja:''' Koristite 'Prikaži izgled' dugme da testirate svoj novi CSS/JS prije nego što sa�uvate.",
 'usercsspreview'                   => "'''Zapamtite ovo je samo izgled Vašeg CSS-a.'''
 '''Ovaj pregled još uvijek nije sa�uvan!'''",
 'userjspreview'                    => "'''Zapamtite ovo je samo izgled vaše JavaScript-e, još uvijek nije sa�uvan!'''",
 'userinvalidcssjstitle'            => "'''Upozorenje:''' Ne postoji interfejs pod imenom \"\$1\".
 Ne zaboravite da imena stranica s .css i .js kodom po�inju malim slovom, npr. {{ns:user}}:Foo/monobook.css, a ne {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Osvježeno)',
-'note'                             => '<strong>Pažnja:</strong>',
-'previewnote'                      => '<strong>Ovo je samo pregled; izmjene stranice nisu još sa�uvane!</strong>',
+'note'                             => "'''Pažnja:'''",
+'previewnote'                      => "'''Ovo je samo pregled; izmjene stranice nisu još sa�uvane!'''",
 'previewconflict'                  => 'Ovaj pregled reflektuje tekst u gornjem polju
 kako će izgledati ako pritisnete "Sa�uvaj �lanak".',
-'session_fail_preview'             => '<strong>Izvinjavamo se! Nismo mogli obraditi vašu izmjenu zbog gubitka podataka o prijavi. Molimo pokušajte ponovno. Ako i dalje ne bude radilo, pokušajte se [[Special:UserLogout|odjaviti]] i ponovno prijaviti.</strong>',
-'session_fail_preview_html'        => "<strong>Žao nam je! Nismo mogli da obradimo vašu izmjenu zbog gubitka podataka.</strong>
+'session_fail_preview'             => "'''Izvinjavamo se! Nismo mogli obraditi vašu izmjenu zbog gubitka podataka o prijavi. Molimo pokušajte ponovno. Ako i dalje ne bude radilo, pokušajte se [[Special:UserLogout|odjaviti]] i ponovno prijaviti.'''",
+'session_fail_preview_html'        => "'''Žao nam je! Nismo mogli da obradimo vašu izmjenu zbog gubitka podataka.'''
 
 ''Zbog toga što {{SITENAME}} ima omogućen izvorni HTML, predpregled je sakriven kao predostrožnost protiv JavaScript napada.''
 
-<strong>Ako ste pokušali da napravite pravu izmjenu, molimo pokušajte ponovo. Ako i dalje ne radi, pokušajte da se [[Special:UserLogout|odjavite]] i ponovo prijavite.</strong>",
-'token_suffix_mismatch'            => '<strong>Vaša izmjena nije prihvaćena jer je Vaš web preglednik ubacio znakove interpunkcije u token uređivanja.
+'''Ako ste pokušali da napravite pravu izmjenu, molimo pokušajte ponovo. Ako i dalje ne radi, pokušajte da se [[Special:UserLogout|odjavite]] i ponovo prijavite.'''",
+'token_suffix_mismatch'            => "'''Vaša izmjena nije prihvaćena jer je Vaš web preglednik ubacio znakove interpunkcije u token uređivanja.
 Izmjena je odba�ena da bi se sprije�ilo uništavanje teksta stranice.
-To se događa ponekad kad korisite problemati�ni anonimni proxy koji je baziran na web-u.</strong>',
+To se događa ponekad kad korisite problemati�ni anonimni proxy koji je baziran na web-u.'''",
 'editing'                          => 'Uređujete $1',
 'editingsection'                   => 'Uređujete $1 (dio)',
-'editingcomment'                   => 'Uređujete $1 (komentar)',
+'editingcomment'                   => 'Uređujete $1 (nova sekcija)',
 'editconflict'                     => 'Sukobljenje izmjene: $1',
 'explainconflict'                  => 'Neko drugi je promjenio ovu stranicu otkad ste Vi po�eli da je mjenjate.
 Gornje tekstualno polje sadrži tekst stranice koji trenutno postoji.
@@ -702,38 +804,39 @@ Moraćete da unesete svoje promjene u postojeći tekst.
 pritisnete "Sa�uvaj".<br />',
 'yourtext'                         => 'Vaš tekst',
 'storedversion'                    => 'Uskladištena verzija',
-'nonunicodebrowser'                => '<strong>UPOZORENJE: Vaš preglednik ne podržava Unicode zapis znakova.
-Molimo Vas promijenite ga prije sljedećeg uređivanja �lanaka. Znakovi koji nisu po ASCII standardu će se u prozoru za izmjene pojaviti kao heksadecimalni kodovi.</strong>',
-'editingold'                       => '<strong>PAŽNJA:  Vi mijenjate stariju
+'nonunicodebrowser'                => "'''UPOZORENJE: Vaš preglednik ne podržava Unicode zapis znakova.
+Molimo Vas promijenite ga prije sljedećeg uređivanja �lanaka. Znakovi koji nisu po ASCII standardu će se u prozoru za izmjene pojaviti kao heksadecimalni kodovi.'''",
+'editingold'                       => "'''PAŽNJA:  Vi mijenjate stariju
 reviziju ove stranice.
-Ako je snimite, sve promjene u�injene od ove revizije će biti izgubljene.</strong>',
+Ako je snimite, sve promjene u�injene od ove revizije će biti izgubljene.'''",
 'yourdiff'                         => 'Razlike',
-'copyrightwarning'                 => 'Za sve priloge poslate na projekat {{SITENAME}} smatramo da su objavljeni pod $2 (konsultujte $1 za detalje).
+'copyrightwarning'                 => "Za sve priloge poslate na projekat {{SITENAME}} smatramo da su objavljeni pod $2 (konsultujte $1 za detalje).
 Ukoliko ne želite da vaši �lanci budu podložni izmjenama i slobodnom rasturanju i objavljivanju,
 nemojte ih slati ovdje. Takođe, slanje �lanka podrazumijeva i vašu izjavu da ste ga napisali sami, ili da ste ga kopirali iz izvora u javnom domenu ili sli�nog slobodnog izvora.
 
-<strong>NEMOJTE SLATI RAD ZAŠTIĆEN AUTORSKIM PRAVIMA BEZ DOZVOLE AUTORA!</strong>',
-'copyrightwarning2'                => 'Zapamtite da svaki doprinos na stranici {{SITENAME}} može biti izmijenjen, promijenjen ili uklonjen od strane ostalih korisnika. Ako ne želite da ovo desi sa Vašim tekstom, onda ga nemojte slati ovdje.<br />
+'''NEMOJTE SLATI RAD ZAŠTIĆEN AUTORSKIM PRAVIMA BEZ DOZVOLE AUTORA!'''",
+'copyrightwarning2'                => "Zapamtite da svaki doprinos na stranici {{SITENAME}} može biti izmijenjen, promijenjen ili uklonjen od strane ostalih korisnika. Ako ne želite da ovo desi sa Vašim tekstom, onda ga nemojte slati ovdje.<br />
 Takođe nam garantujete da ste ovo Vi napisali, ili da ste ga kopirali iz javne domene ili sli�nog slobodnog izvora informacija (pogledajte $1 za više detalja).
-<strong>NE ŠALJITE AUTORSKIM PRAVOM ZAŠTIĆENE TEKSTOVE BEZ DOZVOLE!</strong>',
-'longpagewarning'                  => '<strong>PAŽNJA: Ova stranica ima $1 kilobajta; neki
+'''NE ŠALJITE AUTORSKIM PRAVOM ZAŠTIĆENE TEKSTOVE BEZ DOZVOLE!'''",
+'longpagewarning'                  => "'''PAŽNJA: Ova stranica ima $1 kilobajta; neki
 preglednici mogu imati problema kad uređujete stranice skoro ili veće od 32 kilobajta.
-Molimo Vas da razmotrite razbijanje stranice na manje dijelove.</strong>',
-'longpageerror'                    => '<strong>Greška: Tekst, koji ste poslali, je dug $1 kilobajta, što je veće od maksimuma, koji iznosi $2 kilobajta. 
-Stranica ne može biti spremljena.</strong>',
-'readonlywarning'                  => '<strong>PAŽNJA:  Baza je zaklju�ana zbog održavanja,
-tako da nećete moći da sa�uvate svoje izmjene za sada.  Možda želite da kopirate
-i nalijepite tekst u tekst editor i sa�uvate ga za kasnije.</strong>',
-'protectedpagewarning'             => '<strong>PAŽNJA: Ova stranica je zaklju�ana tako da samo korisnici sa administratorskim privilegijama mogu da je mijenjaju.</strong>',
+Molimo Vas da razmotrite razbijanje stranice na manje dijelove.'''",
+'longpageerror'                    => "'''Greška: Tekst, koji ste poslali, je dug $1 kilobajta, što je veće od maksimuma, koji iznosi $2 kilobajta. 
+Stranica ne može biti spremljena.'''",
+'readonlywarning'                  => "'''PAŽNJA: Baza je zaklju�ana zbog održavanja, tako da nećete moći da sa�uvate svoje izmjene za sada. 
+Možda želite da kopirate i nalijepite tekst u tekst editor i sa�uvate ga za kasnije.'''
+
+Administrator koji je zaklju�ao bazu je naveo slijedeće objašnjenje: $1",
+'protectedpagewarning'             => "'''PAŽNJA: Ova stranica je zaklju�ana tako da samo korisnici sa administratorskim privilegijama mogu da je mijenjaju.'''",
 'semiprotectedpagewarning'         => "'''Pažnja:''' Ova stranica je zaklju�ana tako da je samo registrovani korisnici mogu uređivati.",
 'cascadeprotectedwarning'          => "'''Upozorenje:''' Ova stranica je zaklju�ana tako da je samo administratori mogu mijenjati, jer je ona uklju�ena u {{PLURAL:$1|ovu, lan�anu povezanu, zaštićenu stranicu|sljedeće, lan�ano povezane, zaštićene stranice}}:",
-'titleprotectedwarning'            => '<strong>UPOZORENJE: Ova stranica je zaklju�ana i samo određeni korisnici je mogu napraviti.</strong>',
+'titleprotectedwarning'            => "'''UPOZORENJE: Ova stranica je zaklju�ana tako da su potrebna [[Special:ListGroupRights|posebna prava]] da se ona napravi.'''",
 'templatesused'                    => 'Å abloni koji su upotrebljeni na ovoj stranici:',
 'templatesusedpreview'             => 'Å abloni prikazani u ovom pregledu:',
 'templatesusedsection'             => 'Šabloni korišteni u ovoj sekciji:',
 'template-protected'               => '(zaštićeno)',
 'template-semiprotected'           => '(polu-zaštićeno)',
-'hiddencategories'                 => 'Ova stranica pripada u {{PLURAL:$1|jednu skrivenu kategoriju|$1 skrivene kategorije|$1 skrivenih kategorija}}:',
+'hiddencategories'                 => 'Ova stranica pripada u {{PLURAL:$1|$1 skrivenu kategoriju|$1 skrivene kategorije|$1 skrivenih kategorija}}:',
 'edittools'                        => '<!-- Ovaj tekst će biti prikazan ispod formi za uređivanje i postavljanje. -->',
 'nocreatetitle'                    => 'Pravljenje stranica ograni�eno',
 'nocreatetext'                     => 'Na {{SITENAME}} je zabranjeno postavljanje novih stranica. 
@@ -745,11 +848,22 @@ Možete se vratiti i uređivati već postojeće stranice ili se [[Special:UserLo
 'recreate-deleted-warn'            => "'''Upozorenje: Postavljate stranicu koja je prethodno brisana.'''
 
 Razmotrite je li nastavljanje uređivanja ove stranice u skladu s pravilima. Za vašu informaciju slijedi evidencija brisanja s obrazloženjem za prethodno brisanje:",
+'deleted-notice'                   => 'Ova stranica je obrisana.
+Zapis brisanja stranice je prikazan ispod kao referenca.',
+'deletelog-fulllog'                => 'Vidi potpuni zapis',
+'edit-hook-aborted'                => 'Izmjena je poništena putem interfejsa.
+Nije ponuđeno nikakvo objašnjenje.',
+'edit-gone-missing'                => 'Stranica se nije mogla osvježiti.
+Izgleda da je obrisana.',
+'edit-conflict'                    => 'Sukob izmjena.',
+'edit-no-change'                   => 'Vaša izmjena je ignorirana, jer nije bilo promjena teksta stranice.',
+'edit-already-exists'              => 'Stranica nije mogla biti kreirana.
+Izgleda da već postoji.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Upozorenje: Ova stranica sadrži previše opterećujućih poziva parserskih funkcija.
+'expensive-parserfunction-warning'        => 'Upozorenje: Ova stranica sadrži previše poziva opterećujućih parserskih funkcija.
 
-Trebalo bi da ima manje od $2, a sada ih ima $1.',
+Trebalo bi imati manje od $2 {{PLURAL:$2|poziv|poziva}}, a sad ima {{PLURAL:$1|$1 poziv|$1 poziva}}.',
 'expensive-parserfunction-category'       => 'Stranice sa previše poziva parserskih funkcija',
 'post-expand-template-inclusion-warning'  => 'Pažnja: Šablon koji je uklju�en je prevelik.
 Neki šabloni neće biti uklju�eni.',
@@ -757,6 +871,8 @@ Neki šabloni neće biti uklju�eni.',
 'post-expand-template-argument-warning'   => 'Upozorenje: Ova stranica sadrži najmanje jedan argument u šablonu koji ima preveliku veli�inu.
 Ovakvi argumenti se trebaju izbjegavati.',
 'post-expand-template-argument-category'  => 'Stranice koje sadrže nedostajuće argumente u šablonu',
+'parser-template-loop-warning'            => 'Otkrivena kružna greška u šablonu: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Dubina uklju�ivanja šablona prekora�ena ($1)',
 
 # "Undo" feature
 'undo-success' => 'Izmjena se može vratiti.
@@ -772,30 +888,29 @@ Molimo da provjerite usporedbu ispod da budete sigurni da to želite u�initi, a
 Razlog koji je naveo $3 je ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Pogledaj protokol ove stranice',
-'nohistory'           => 'Ne postoji istorija izmjena za ovu stranicu.',
-'revnotfound'         => 'Revizija nije pronađena',
-'revnotfoundtext'     => 'Starija revizija ove stranice koju ste zatražili nije nađena.
-Molimo Vas da provjerite URL pomoću kojeg ste pristupili ovoj stranici.',
-'currentrev'          => 'Trenutna revizija',
-'revisionasof'        => 'Revizija od $1',
-'revision-info'       => 'Izmjena od $1 korisnika $2',
-'previousrevision'    => '�Starije izmjene',
-'nextrevision'        => 'Novija izmjena →',
-'currentrevisionlink' => 'Trenutna verzija',
-'cur'                 => 'tren',
-'next'                => 'slijed',
-'last'                => 'posl',
-'page_first'          => 'prva',
-'page_last'           => 'zadnja',
-'histlegend'          => 'Odabir razlika: ozna�ite radio dugme verzija koje uspoređujete i pritistnite enter ili dugme na dnu. <br />
-Objašnjenje: (tren) = razlika sa trenutnom verzijom,
-(posl) = razlika sa prethodnom verzijom, M = mala izmjena.',
-'deletedrev'          => '[izbrisano]',
-'histfirst'           => 'Najstarije',
-'histlast'            => 'Najnovije',
-'historysize'         => '({{PLURAL:$1|1 bajt|$1 bajta|$1 bajtova}})',
-'historyempty'        => '(prazno)',
+'viewpagelogs'           => 'Pogledaj protokol ove stranice',
+'nohistory'              => 'Ne postoji historija izmjena za ovu stranicu.',
+'currentrev'             => 'Trenutna revizija',
+'currentrev-asof'        => 'Trenutna revizija na dan $1',
+'revisionasof'           => 'Revizija od $1',
+'revision-info'          => 'Izmjena od $1 korisnika $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Starije izmjene',
+'nextrevision'           => 'Novija izmjena →',
+'currentrevisionlink'    => 'Trenutna verzija',
+'cur'                    => 'tren',
+'next'                   => 'slijed',
+'last'                   => 'preth',
+'page_first'             => 'prva',
+'page_last'              => 'zadnja',
+'histlegend'             => "Odabir razlika: ozna�ite radio dugme verzija koje uspoređujete i pritistnite enter ili dugme na dnu. <br />
+Objašnjenje: '''(tren)''' = razlika sa trenutnom verzijom,
+'''(preth)''' = razlika sa prethodnom verzijom, '''m''' = mala izmjena.",
+'history-fieldset-title' => 'Pretraga historije',
+'deletedrev'             => '[izbrisano]',
+'histfirst'              => 'Najstarije',
+'histlast'               => 'Najnovije',
+'historysize'            => '({{PLURAL:$1|1 bajt|$1 bajta|$1 bajtova}})',
+'historyempty'           => '(prazno)',
 
 # Revision feed
 'history-feed-title'          => 'Historija izmjena',
@@ -878,6 +993,7 @@ Korištenje navigacionih linkova će resetovati ovaj stupac.',
 'mergehistory-invalid-destination' => 'Ciljna stranica mora imati validan naslov.',
 'mergehistory-autocomment'         => 'Spoji [[:$1]] u [[:$2]]',
 'mergehistory-comment'             => 'Spojeno [[:$1]] u [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Izvorne i odredišne stranice ne mogu biti iste',
 
 # Merge log
 'mergelog'           => 'Zapis spajanja',
@@ -890,126 +1006,206 @@ Korištenje navigacionih linkova će resetovati ovaj stupac.',
 'difference'              => '(Razlika između revizija)',
 'lineno'                  => 'Linija $1:',
 'compareselectedversions' => 'Uporedite ozna�ene verzije',
+'visualcomparison'        => 'Vizuelna usporedba',
+'wikicodecomparison'      => 'Usporedba wikiteksta',
 'editundo'                => 'ukloni ovu izmjenu',
 'diff-multi'              => '({{plural:$1|Nije prikazana jedna međuverzija|Nisu prikazane $1 međuverzije|Nije prikazano $1 međuverzija}})',
+'diff-movedto'            => 'preusmjereno na $1',
+'diff-styleadded'         => 'dodan $1 stil',
+'diff-added'              => '$1 dodan',
+'diff-changedto'          => 'promijenjeno u $1',
+'diff-movedoutof'         => 'uklonjeno iz $1',
+'diff-styleremoved'       => '$1 stil uklonjen',
+'diff-removed'            => '$1 uklonjen',
+'diff-changedfrom'        => 'promijenjeno od $1',
+'diff-src'                => 'izvorno',
+'diff-withdestination'    => 'sa odredištem $1',
+'diff-with'               => '&#32;sa $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;i $1 $2',
+'diff-width'              => 'Å¡irina',
+'diff-height'             => 'visina',
+'diff-p'                  => "'''paragraf'''",
+'diff-blockquote'         => "'''blok'''",
+'diff-h1'                 => "'''naslov (nivo 1)'''",
+'diff-h2'                 => "'''naslov (nivo 2)'''",
+'diff-h3'                 => "'''naslov (nivo 3)'''",
+'diff-h4'                 => "'''naslov (nivo 4)'''",
+'diff-h5'                 => "'''naslov (nivo 5)'''",
+'diff-pre'                => "'''formatirani blok'''",
+'diff-div'                => "'''element bloka'''",
+'diff-ul'                 => "'''neporedani spisak'''",
+'diff-ol'                 => "'''poredani spisak'''",
+'diff-li'                 => "'''stavka spiska'''",
+'diff-table'              => "'''tabela'''",
+'diff-tbody'              => "'''sadržaj tabele'''",
+'diff-tr'                 => "'''redak'''",
+'diff-td'                 => "'''polje'''",
+'diff-th'                 => "'''zaglavlje'''",
+'diff-br'                 => "'''prijelom'''",
+'diff-hr'                 => "'''vodoravna linija'''",
+'diff-code'               => "'''ra�unarski kod'''",
+'diff-dl'                 => "'''spisak definicija'''",
+'diff-dt'                 => "'''definisan pojam'''",
+'diff-dd'                 => "'''definicija'''",
+'diff-input'              => "'''unos'''",
+'diff-form'               => "'''obrazac'''",
+'diff-img'                => "'''slika'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''poveznica'''",
+'diff-i'                  => "'''ukošeno'''",
+'diff-b'                  => "'''podebljano'''",
+'diff-strong'             => "'''jako'''",
+'diff-em'                 => "'''naglašeno'''",
+'diff-font'               => "'''slova'''",
+'diff-big'                => "'''veliko'''",
+'diff-del'                => "'''obrisano'''",
+'diff-tt'                 => "'''određena širina'''",
+'diff-sub'                => "'''subskipt'''",
+'diff-sup'                => "'''faktor'''",
+'diff-strike'             => "'''precrtano'''",
 
 # Search results
-'searchresults'             => 'Rezultati pretrage',
-'searchresulttext'          => 'Za više informacija o pretraživanju {{SITENAME}}, pogledajte [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Tražili ste \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sve stranice koje po�inju sa "$1"]] | [[Special:WhatLinksHere/$1|sve stranice koje vode do "$1"]])',
-'searchsubtitleinvalid'     => 'Tražili ste $1',
-'noexactmatch'              => "'''Nema stranice sa imenom \"\$1\".'''
+'searchresults'                    => 'Rezultati pretrage',
+'searchresults-title'              => 'Rezultati pretrage za "$1"',
+'searchresulttext'                 => 'Za više informacija o pretraživanju {{SITENAME}}, pogledajte [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Tražili ste \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sve stranice koje po�inju sa "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|sve stranice koje vode do "$1"]])',
+'searchsubtitleinvalid'            => 'Tražili ste $1',
+'noexactmatch'                     => "'''Nema stranice sa imenom \"\$1\".'''
 
 Možete [[:\$1|da napravite �lanak sa tim naslovom]].
 
 ::*'''''<u>Opomena: Nemojte kopirati materijale za koje nemate dozvolu!</u>'''''",
-'noexactmatch-nocreate'     => "'''Ne postoji stranica sa naslovom \"\$1\".'''",
-'toomanymatches'            => 'Pronađeno je previše rezultata, molimo pokušajte unijeti konkretniji izraz',
-'titlematches'              => 'Naslov �lanka odgovara',
-'notitlematches'            => 'Naslov �lanka ne odgovara.',
-'textmatches'               => 'Tekst stranice odgovara',
-'notextmatches'             => 'Tekst �lanka ne odgovara',
-'prevn'                     => 'prethodnih $1',
-'nextn'                     => 'slijedećih $1',
-'viewprevnext'              => 'Pogledaj ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 rije�|$2 rije�i}})',
-'search-result-score'       => 'Relevantnost: $1%',
-'search-redirect'           => '(preusmjeravanje $1)',
-'search-section'            => '(sekcija $1)',
-'search-suggest'            => 'Da li ste mislili: $1',
-'search-interwiki-caption'  => 'Srodni projekti',
-'search-interwiki-default'  => '$1 rezultati:',
-'search-interwiki-more'     => '(više)',
-'search-mwsuggest-enabled'  => 'sa sugestijama',
-'search-mwsuggest-disabled' => 'bez sugestija',
-'search-relatedarticle'     => 'Povezano',
-'mwsuggest-disable'         => 'Onemogući AJAX prijedloge',
-'searchrelated'             => 'povezano',
-'searchall'                 => 'sve',
-'showingresults'            => "Dole {{PLURAL:$1|je prikazan '''1''' rezultat|su prikazana '''$1''' rezultata|je prikazano '''$1''' rezultata}} po�ev od '''$2'''.",
-'showingresultsnum'         => "Dole {{PLURAL:$3|je prikazan '''1''' rezultat|su prikazana '''$3''' rezultata|je prikazano '''$3''' rezultata}} po�ev od '''$2'''.",
-'showingresultstotal'       => "Ispod je {{PLURAL:$3|prikazan '''$1''' rezultat od '''$3'''|prikazano '''$1 - $2''' rezultata od '''$3'''}}",
-'nonefound'                 => "'''Pažnja''': neuspješne pretrage su
-�esto izazvane traženjem �estih rije�i kao \"je\" ili \"od\",
-koje nisu indeksirane, ili navođenjem više od jednog izraza za traženje (samo stranice
-koje sadrže sve izraze koji se traže će se pojaviti u rezultatima).",
-'powersearch'               => 'Traži',
-'powersearch-legend'        => 'Napredna pretraga',
-'powersearch-ns'            => 'Pretraga u imenskim prostorima:',
-'powersearch-redir'         => 'Spisak preusmjerenja',
-'powersearch-field'         => 'Traži',
-'search-external'           => 'Vanjska pretraga',
-'searchdisabled'            => '<p>Izvinjavamo se!  Puno pretraga teksta je privremeno onemogućena.  U međuvremenu, možete koristiti Google za pretragu.  Indeks može biti stariji.',
+'noexactmatch-nocreate'            => "'''Ne postoji stranica sa naslovom \"\$1\".'''",
+'toomanymatches'                   => 'Pronađeno je previše rezultata, molimo pokušajte unijeti konkretniji izraz',
+'titlematches'                     => 'Naslov �lanka odgovara',
+'notitlematches'                   => 'Naslov �lanka ne odgovara.',
+'textmatches'                      => 'Tekst stranice odgovara',
+'notextmatches'                    => 'Tekst �lanka ne odgovara',
+'prevn'                            => 'prethodnih $1',
+'nextn'                            => 'slijedećih $1',
+'viewprevnext'                     => 'Pogledaj ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opcije pretrage',
+'searchmenu-exists'                => "'''Postoji stranica pod nazivom \"[[\$1]]\" na ovoj wiki'''",
+'searchmenu-new'                   => "'''Napravi stranicu \"[[:\$1|\$1]]\" na ovoj wiki!'''",
+'searchhelp-url'                   => 'Help:Sadržaj',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Pregledaj stranice sa ovim prefiksom]]',
+'searchprofile-articles'           => 'Stranice sadržaja',
+'searchprofile-articles-and-proj'  => 'Stranice sadržaja i projekata',
+'searchprofile-project'            => 'Stranice projekta',
+'searchprofile-images'             => 'Datoteke',
+'searchprofile-everything'         => 'Sve',
+'searchprofile-advanced'           => 'Napredno',
+'searchprofile-articles-tooltip'   => 'Pretraga u $1',
+'searchprofile-project-tooltip'    => 'Pretraga u $1',
+'searchprofile-images-tooltip'     => 'Traži datoteke',
+'searchprofile-everything-tooltip' => 'Pretraži sve sadržaje (ukljujući i stranice za razgovor)',
+'searchprofile-advanced-tooltip'   => 'Traži u ostalim imenskim prostorima',
+'prefs-search-nsdefault'           => 'Pretraga uz pretpostavljeno:',
+'prefs-search-nscustom'            => 'Pretraga u ostalim imenskim prostorima:',
+'search-result-size'               => '$1 ({{PLURAL:$2|$2 rije�|$2 rije�i}})',
+'search-result-score'              => 'Relevantnost: $1%',
+'search-redirect'                  => '(preusmjeravanje $1)',
+'search-section'                   => '(sekcija $1)',
+'search-suggest'                   => 'Da li ste mislili: $1',
+'search-interwiki-caption'         => 'Srodni projekti',
+'search-interwiki-default'         => '$1 rezultati:',
+'search-interwiki-more'            => '(više)',
+'search-mwsuggest-enabled'         => 'sa sugestijama',
+'search-mwsuggest-disabled'        => 'bez sugestija',
+'search-relatedarticle'            => 'Povezano',
+'mwsuggest-disable'                => 'Onemogući AJAX prijedloge',
+'searchrelated'                    => 'povezano',
+'searchall'                        => 'sve',
+'showingresults'                   => "Dole {{PLURAL:$1|je prikazan '''1''' rezultat|su prikazana '''$1''' rezultata|je prikazano '''$1''' rezultata}} po�ev od '''$2'''.",
+'showingresultsnum'                => "Dole {{PLURAL:$3|je prikazan '''1''' rezultat|su prikazana '''$3''' rezultata|je prikazano '''$3''' rezultata}} po�ev od '''$2'''.",
+'showingresultstotal'              => "Ispod {{PLURAL:$4|je prikazan rezultat '''$1''' od '''$3'''|su prikazani rezultati '''$1 - $2''' od ukupno '''$3'''}}",
+'nonefound'                        => "'''Pažnja''': Po pretpostavljenim postavkama pretražuju se samo neki imenski prostori.
+Pokušajte u Vaš upit uklju�iti prefiks ''all:'' da bi ste pretražili sav sadržaj (uklju�ujući stranice za razgovor, šablone i sl.) ili koristite željeni imenski prostor kao prefiks.",
+'search-nonefound'                 => 'Nisu pronađeni rezultati koji odgovaraju upitu.',
+'powersearch'                      => 'Traži',
+'powersearch-legend'               => 'Napredna pretraga',
+'powersearch-ns'                   => 'Pretraga u imenskim prostorima:',
+'powersearch-redir'                => 'Spisak preusmjerenja',
+'powersearch-field'                => 'Traži',
+'search-external'                  => 'Vanjska pretraga',
+'searchdisabled'                   => '<p>Izvinjavamo se!  Puno pretraga teksta je privremeno onemogućena.  U međuvremenu, možete koristiti Google za pretragu.  Indeks može biti stariji.',
 
 # Preferences page
-'preferences'              => 'Podešavanja',
-'mypreferences'            => 'Moje postavke',
-'prefs-edits'              => 'Broj izmjena:',
-'prefsnologin'             => 'Niste prijavljeni',
-'prefsnologintext'         => 'Da biste mogli podešavati korisni�ka podešavanja, morate <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} biti prijavljeni]</span>.',
-'prefsreset'               => 'Podešavanja su vraćena na prvotne vrijednosti.',
-'qbsettings'               => 'Podešavanja brze palete',
-'qbsettings-none'          => 'Nikakva',
-'qbsettings-fixedleft'     => 'Pri�vršćena lijevo',
-'qbsettings-fixedright'    => 'Pri�vršćena desno',
-'qbsettings-floatingleft'  => 'Plutajuća lijevo',
-'qbsettings-floatingright' => 'Plutajući desno',
-'changepassword'           => 'Promjeni lozinku',
-'skin'                     => 'Koža',
-'math'                     => 'Prikazivanje matematike',
-'dateformat'               => 'Format datuma',
-'datedefault'              => 'Nije bitno',
-'datetime'                 => 'Datum i vrijeme',
-'math_failure'             => 'Neuspjeh pri parsiranju',
-'math_unknown_error'       => 'nepoznata greška',
-'math_unknown_function'    => 'nepoznata funkcija',
-'math_lexing_error'        => 'rije�ni�ka greška',
-'math_syntax_error'        => 'sintaksna greška',
-'math_image_error'         => 'PNG konverzija neuspješna; provjerite ta�nu instalaciju latex-a, dvips-a, gs-a i convert-a',
-'math_bad_tmpdir'          => 'Ne može se napisati ili napraviti privremeni matemati�ni direktorijum',
-'math_bad_output'          => 'Ne može se napisati ili napraviti direktorijum za matemati�ni izvještaj.',
-'math_notexvc'             => 'Nedostaje izvršno texvc; molimo Vas da pogledate math/README da podesite.',
-'prefs-personal'           => 'Korisni�ki podaci',
-'prefs-rc'                 => 'Podešavanja nedavnih izmjena',
-'prefs-watchlist'          => 'Praćeni �lanci',
-'prefs-watchlist-days'     => 'Broj dana za prikaz u spisku praćenja:',
-'prefs-watchlist-edits'    => 'Najveći broj izmjena za prikaz u proširenom spisku praćenja:',
-'prefs-misc'               => 'Ostala podešavanja',
-'saveprefs'                => 'Sa�uvajte podešavanja',
-'resetprefs'               => 'Vrati podešavanja',
-'oldpassword'              => 'Stara lozinka:',
-'newpassword'              => 'Nova lozinka:',
-'retypenew'                => 'Ukucajte ponovo novu lozinku:',
-'textboxsize'              => 'Veli�ine tekstualnog polja',
-'rows'                     => 'Redova',
-'columns'                  => 'Kolona',
-'searchresultshead'        => 'Podešavanja rezultata pretrage',
-'resultsperpage'           => 'Pogodaka po stranici:',
-'contextlines'             => 'Linija po pogotku:',
-'contextchars'             => 'Karaktera konteksta po liniji:',
-'stub-threshold'           => 'Formatiranje <a href="#" class="stub">linkova stranica u za�etku</a> (bajtova):',
-'recentchangesdays'        => 'Broj dana za prikaz u nedavnim izmjenama:',
-'recentchangescount'       => 'Broj naslova u nedavnim izmjenama:',
-'savedprefs'               => 'Vaša podešavanja su sa�uvana.',
-'timezonelegend'           => 'Vremenska zona',
-'timezonetext'             => 'Unesite broj sati za koji se Vaše lokalno vrijeme razlikuje od serverskog vremena (UTC).',
-'localtime'                => 'Lokalno vrijeme',
-'timezoneoffset'           => 'Odstupanje',
-'servertime'               => 'Vrijeme na serveru',
-'guesstimezone'            => 'Popuni iz preglednika',
-'allowemail'               => 'Dozvoli e-poštu od ostalih korisnika',
-'prefs-searchoptions'      => 'Opcije pretrage',
-'prefs-namespaces'         => 'Imenski prostori',
-'defaultns'                => 'Uobi�ajeno tražite u ovim imenskim prostorima:',
-'default'                  => 'standardno',
-'files'                    => 'Datoteke',
+'preferences'               => 'Podešavanja',
+'mypreferences'             => 'Moje postavke',
+'prefs-edits'               => 'Broj izmjena:',
+'prefsnologin'              => 'Niste prijavljeni',
+'prefsnologintext'          => 'Da biste mogli podešavati korisni�ka podešavanja, morate <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} biti prijavljeni]</span>.',
+'prefsreset'                => 'Podešavanja su vraćena na prvotne vrijednosti.',
+'qbsettings'                => 'Podešavanja brze palete',
+'qbsettings-none'           => 'Nikakva',
+'qbsettings-fixedleft'      => 'Pri�vršćena lijevo',
+'qbsettings-fixedright'     => 'Pri�vršćena desno',
+'qbsettings-floatingleft'   => 'Plutajuća lijevo',
+'qbsettings-floatingright'  => 'Plutajući desno',
+'changepassword'            => 'Promjeni Å¡ifru',
+'skin'                      => 'Koža',
+'skin-preview'              => 'Pregled',
+'math'                      => 'Prikazivanje matematike',
+'dateformat'                => 'Format datuma',
+'datedefault'               => 'Nije bitno',
+'datetime'                  => 'Datum i vrijeme',
+'math_failure'              => 'Neuspjeh pri parsiranju',
+'math_unknown_error'        => 'nepoznata greška',
+'math_unknown_function'     => 'nepoznata funkcija',
+'math_lexing_error'         => 'rije�ni�ka greška',
+'math_syntax_error'         => 'sintaksna greška',
+'math_image_error'          => 'PNG konverzija neuspješna; provjerite ta�nu instalaciju latex-a, dvips-a, gs-a i convert-a',
+'math_bad_tmpdir'           => 'Ne može se napisati ili napraviti privremeni matemati�ni direktorijum',
+'math_bad_output'           => 'Ne može se napisati ili napraviti direktorijum za matemati�ni izvještaj.',
+'math_notexvc'              => 'Nedostaje izvršno texvc; molimo Vas da pogledate math/README da podesite.',
+'prefs-personal'            => 'Korisni�ki podaci',
+'prefs-rc'                  => 'Podešavanja nedavnih izmjena',
+'prefs-watchlist'           => 'Praćeni �lanci',
+'prefs-watchlist-days'      => 'Broj dana za prikaz u spisku praćenja:',
+'prefs-watchlist-days-max'  => '(najviše 7 dana)',
+'prefs-watchlist-edits'     => 'Najveći broj izmjena za prikaz u proširenom spisku praćenja:',
+'prefs-watchlist-edits-max' => '(najveći broj: 1000)',
+'prefs-misc'                => 'Ostala podešavanja',
+'prefs-resetpass'           => 'Promijeni Å¡ifru',
+'saveprefs'                 => 'Sa�uvajte podešavanja',
+'resetprefs'                => 'Vrati podešavanja',
+'textboxsize'               => 'Veli�ine tekstualnog polja',
+'prefs-edit-boxsize'        => 'Veli�ina prozora za uređivanje.',
+'rows'                      => 'Redova',
+'columns'                   => 'Kolona',
+'searchresultshead'         => 'Podešavanja rezultata pretrage',
+'resultsperpage'            => 'Pogodaka po stranici:',
+'contextlines'              => 'Linija po pogotku:',
+'contextchars'              => 'Karaktera konteksta po liniji:',
+'stub-threshold'            => 'Formatiranje <a href="#" class="stub">linkova stranica u za�etku</a> (bajtova):',
+'recentchangesdays'         => 'Broj dana za prikaz u nedavnim izmjenama:',
+'recentchangesdays-max'     => '(najviše $1 {{PLURAL:$1|dan|dana}})',
+'recentchangescount'        => 'Broj naslova za prikaz u nedavnim izmjenama, historijama stranice i zapisnicima, po pretpostavkama:',
+'savedprefs'                => 'Vaša podešavanja su sa�uvana.',
+'timezonelegend'            => 'Vremenska zona',
+'timezonetext'              => 'Unesite broj sati za koji se Vaše lokalno vrijeme razlikuje od serverskog vremena (UTC).',
+'localtime'                 => 'Lokalno vrijeme:',
+'timezoneselect'            => 'Vremenska zona:',
+'timezoneuseserverdefault'  => 'Koristi postavke servera',
+'timezoneuseoffset'         => 'Ostalo (odredi odstupanje)',
+'timezoneoffset'            => 'Odstupanje¹:',
+'servertime'                => 'Vrijeme na serveru:',
+'guesstimezone'             => 'Popuni iz preglednika',
+'allowemail'                => 'Dozvoli e-poštu od ostalih korisnika',
+'prefs-searchoptions'       => 'Opcije pretrage',
+'prefs-namespaces'          => 'Imenski prostori',
+'defaultns'                 => 'Uobi�ajeno tražite u ovim imenskim prostorima:',
+'default'                   => 'standardno',
+'files'                     => 'Datoteke',
 
 # User rights
 'userrights'                  => 'Postavke korisni�kih prava', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Menadžment korisni�kih grupa',
 'userrights-user-editname'    => 'Unesi korisni�ko ime:',
 'editusergroup'               => 'Uredi korisni�ke grupe',
-'editinguser'                 => "Mijenjate korisni�ka prava korisnika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Mijenjate korisni�ka prava korisnika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Uredi korisni�ke grupe',
 'saveusergroups'              => 'Sa�uvaj korisni�ke grupe',
 'userrights-groupsmember'     => 'ÄŒlan:',
@@ -1022,8 +1218,8 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatima).",
 'userrights-nodatabase'       => 'Baza podataka $1 ne postoji ili nije lokalna baza.',
 'userrights-nologin'          => 'Morate se [[Special:UserLogin|prijaviti]] sa administratorskim ra�unom da bi ste mogli postavljati korisni�ka prava.',
 'userrights-notallowed'       => 'Vaš korisni�ki ra�un nema privilegije da dodaje prava korisnika.',
-'userrights-changeable-col'   => 'Grupe koje možete mijenati',
-'userrights-unchangeable-col' => 'Grupe koje ne možete mijenati',
+'userrights-changeable-col'   => 'Grupe koje možete mijenjati',
+'userrights-unchangeable-col' => 'Grupe koje ne možete mijenjati',
 
 # Groups
 'group'               => 'Grupa:',
@@ -1058,6 +1254,8 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatima).",
 'right-minoredit'            => 'Ozna�avanje izmjena kao malih',
 'right-move'                 => 'Preusmjeravanje stranica',
 'right-move-subpages'        => 'Preusmjeravanje stranica sa svim podstranicama',
+'right-move-rootuserpages'   => 'Premještanje stranica osnovnih korisnika',
+'right-movefile'             => 'Premještanje datoteka',
 'right-suppressredirect'     => 'Ne pravi preusmjeravanje sa starog imena pri preusmjeravanju stranica',
 'right-upload'               => 'Postavljanje datoteka',
 'right-reupload'             => 'Postavljanje nove verzije datoteke',
@@ -1108,9 +1306,46 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatima).",
 'rightslogentry' => 'promjena �lanstva u grupi za $1 sa $2 na $3',
 'rightsnone'     => '(nema)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '�itate ovu stranicu',
+'action-edit'                 => 'uređujete ovu stranicu',
+'action-createpage'           => 'napravite stranicu',
+'action-createtalk'           => 'kreirate stranice za razgovor',
+'action-createaccount'        => 'napravite ovaj korisni�ki ra�un',
+'action-minoredit'            => 'da ozna�ite ovu izmjenu kao malu',
+'action-move'                 => 'premjestite ovu stranicu',
+'action-move-subpages'        => 'premjestite ovu stranicu, i njene podstranice',
+'action-move-rootuserpages'   => 'premjestite stranice osnovnog korisnika',
+'action-movefile'             => 'premjesti ovu datoteku',
+'action-upload'               => 'postavljate ovu datoteku',
+'action-reupload'             => 'stavite novu verziju postojeće datoteke',
+'action-reupload-shared'      => 'postavite ovu datoteku iz zajedni�ke ostave',
+'action-upload_by_url'        => 'postavite ovu datoteku putem URL adrese',
+'action-writeapi'             => "koristite ''write API'' opciju",
+'action-delete'               => 'obrišete ovu stranicu',
+'action-deleterevision'       => 'obrišete ovu reviziju',
+'action-deletedhistory'       => 'gledate obrisanu historiju ove stranice',
+'action-browsearchive'        => 'pretražujete obrisane stranice',
+'action-undelete'             => 'vratite ovu stranicu',
+'action-suppressrevision'     => 'pregledate i vratite ovu skrivenu reviziju',
+'action-suppressionlog'       => 'vidite ovaj privatni zapis',
+'action-block'                => 'blokirate uređivanje ovog korisnika',
+'action-protect'              => 'promijeniti nivo zaštite za ovu stranicu',
+'action-import'               => 'uvozite ovu stranicu iz druge wiki',
+'action-importupload'         => 'uvezete ovu stranicu putem postavljanja datoteke',
+'action-patrol'               => 'ozna�ite izmjene drugih kao patrolirane',
+'action-autopatrol'           => 'Vaše izmjene budu ozna�ene kao patrolirane',
+'action-unwatchedpages'       => 'pregledate spisak nepraćenih stranica',
+'action-trackback'            => "pošaljete ''trackback''",
+'action-mergehistory'         => 'spajate historiju ove stranice',
+'action-userrights'           => 'uređujete sva korisni�ka prava',
+'action-userrights-interwiki' => 'uređujete korisni�ka prava korisnika na drugim wikijima',
+'action-siteadmin'            => 'zaklju�avate ili otklju�avate bazu podataka',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|promjena|promjene|promjena}}',
 'recentchanges'                     => 'Nedavne izmjene',
+'recentchanges-legend'              => 'Postavke nedavnih izmjena',
 'recentchangestext'                 => 'Na ovoj stranici možete pratiti nedavne izmjene.',
 'recentchanges-feed-description'    => 'Na ovoj stranici možete pratiti nedavne izmjene.',
 'rcnote'                            => "Ispod {{PLURAL:$1|je '''$1''' promjena|su '''$1''' zadnje promjene|su '''$1''' zadnjih promjena}} u {{PLURAL:$2|posljednjem '''$2''' danu|posljednja '''$2''' dana|posljednjih '''$2''' dana}}, od $4, $5.",
@@ -1130,10 +1365,13 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatima).",
 'minoreditletter'                   => 'm',
 'newpageletter'                     => 'N',
 'boteditletter'                     => 'b',
+'sectionlink'                       => '→',
 'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|korisnik|korisnika}} koji pregledaju]',
 'rc_categories'                     => 'Ograni�i na kategorije (razdvojene sa "|")',
 'rc_categories_any'                 => 'Sve',
 'newsectionsummary'                 => '/* $1 */ nova sekcija',
+'rc-enhanced-expand'                => 'Pokaži detalje (neophodna JavaScript)',
+'rc-enhanced-hide'                  => 'Sakrij detalje',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Srodne izmjene',
@@ -1156,11 +1394,11 @@ da bi ste slali fajlove.',
 'upload_directory_read_only'  => 'Folder za postavljanje ($1) na webserveru je postavljen samo za �itanje.',
 'uploaderror'                 => 'Greška pri slanju',
 'uploadtext'                  => "Koristite formu ispod za postavljanje datoteka.
-Da bi ste vidjeli ili pretražili ranije postavljene datoteke, pogledajte [[Special:ImageList|spisak postavljenih datoteka]], ponovna postavljanja su također zapisana u [[Special:Log/upload|zapisnik postavljanja]], a brisanja u [[Special:Log/delete|zapisnik brisanja]].
+Da bi ste vidjeli ili pretražili ranije postavljene datoteke, pogledajte [[Special:FileList|spisak postavljenih datoteka]], ponovna postavljanja su također zapisana u [[Special:Log/upload|zapisnik postavljanja]], a brisanja u [[Special:Log/delete|zapisnik brisanja]].
 
 Da bi ste prikazali datoteku na stranici, koristite link na jedan od slijedećih na�ina:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Datoteka.jpg]]</nowiki></tt>''' da upotrijebite potpunu veziju datoteke
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Datoteka.png|200px|thumb|lijevo|opis slike]]</nowiki></tt>''' da upotrijebite smanjeni prikaz Å¡irine 200 piksela unutar okvira, s lijevim poravnanjem i ''opisom slike''.
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Datoteka.jpg]]</nowiki></tt>''' da upotrijebite potpunu veziju datoteke
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Datoteka.png|200px|thumb|lijevo|opis slike]]</nowiki></tt>''' da upotrijebite smanjeni prikaz Å¡irine 200 piksela unutar okvira, s lijevim poravnanjem i ''opisom slike''.
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Datoteka.ogg]]</nowiki></tt>''' za direkno povezivanje datoteke bez njenog prikazivanja",
 'upload-permitted'            => 'Podržane vrste datoteka: $1.',
 'upload-preferred'            => 'Preferirane vrste datoteka: $1.',
@@ -1168,7 +1406,7 @@ Da bi ste prikazali datoteku na stranici, koristite link na jedan od slijedećih
 'uploadlog'                   => 'log slanja',
 'uploadlogpage'               => 'Protokol postavljanja',
 'uploadlogpagetext'           => 'Ispod je spisak najskorijih slanja.',
-'filename'                    => 'Ime fajla',
+'filename'                    => 'Ime datoteke',
 'filedesc'                    => 'Opis',
 'fileuploadsummary'           => 'Sažetak:',
 'filestatus'                  => 'Status autorskih prava:',
@@ -1191,24 +1429,26 @@ Molimo Vas da promijenite ime datoteke i pokušate da je ponovo postavite.',
 Ova datoteka je velika $2.',
 'largefileserver'             => 'Ova datoteka je veća nego što server dopušta.',
 'emptyfile'                   => 'Fajl koji ste poslali je prazan. Ovo je moguće zbog greške u imenu fajla. Molimo Vas da provjerite da li stvarno želite da pošaljete ovaj fajl.',
-'fileexists'                  => 'Fajl sa ovim imenom već postoji.  Molimo Vas da provjerite <strong><tt>$1</tt></strong> ako niste sigurni da li želite da ga promjenite.',
-'filepageexists'              => 'Opis stranice za ovu datoteku je već napravljen ovdje <strong><tt>$1</tt></strong>, ali datoteka sa ovim nazivom trenutno ne postoji.
+'fileexists'                  => "Fajl sa ovim imenom već postoji.  Molimo Vas da provjerite '''<tt>$1</tt>''' ako niste sigurni da li želite da ga promjenite.",
+'filepageexists'              => "Opis stranice za ovu datoteku je već napravljen ovdje '''<tt>$1</tt>''', ali datoteka sa ovim nazivom trenutno ne postoji.
 Sažetak koji ste naveli neće se pojaviti na stranici opisa.
-Da bi se Vaš opis ovdje našao, potrebno je da ga ru�no uredite',
-'fileexists-extension'        => 'Datoteka sa sli�nim nazivom postoji:<br />
-Naziv datoteke koja se postavlja: <strong><tt>$1</tt></strong><br />
-Naziv postojeće datoteke: <strong><tt>$2</tt></strong><br />
-Molimo Vas da izaberete druga�iji naziv.',
+Da bi se Vaš opis ovdje našao, potrebno je da ga ru�no uredite",
+'fileexists-extension'        => "Datoteka sa sli�nim nazivom postoji:<br />
+Naziv datoteke koja se postavlja: '''<tt>$1</tt>'''<br />
+Naziv postojeće datoteke: '''<tt>$2</tt>'''<br />
+Molimo Vas da izaberete druga�iji naziv.",
 'fileexists-thumb'            => "<center>'''Postojeća datoteka'''</center>",
-'fileexists-thumbnail-yes'    => 'Izgleda da je datoteka slika smanjene veli�ine <i>("thumbnail")</i>.
-Molimo provjerite datoteku <strong><tt>$1</tt></strong>.<br />
-Ako je provjerena datoteka ista slika originalne veli�ine, nije potrebno postavljati dodatnu sliku.',
-'file-thumbnail-no'           => 'Naziv datoteke po�inje sa <strong><tt>$1</tt></strong>.
-Izgleda da se radi o smanjenoj slici <i>("thumbnail")</i>.
-Ako imate ovu sliku u punoj rezoluciji, postavite nju; ili promijenite naslov ove datoteke.',
-'fileexists-forbidden'        => 'Fajl sa ovim imenom već postoji; molimo Vas da se vratite i pošaljete ovaj fajl pod novim imenom. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Datoteka sa ovim imenom već postoji u zajedni�koj ostavi; molimo Vas da se vratite i pošaljete ovu datoteku pod novim imenom. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Izgleda da je datoteka slika smanjene veli�ine ''(\"thumbnail\")''.
+Molimo provjerite datoteku '''<tt>\$1</tt>'''.<br />
+Ako je provjerena datoteka ista slika originalne veli�ine, nije potrebno postavljati dodatnu sliku.",
+'file-thumbnail-no'           => "Naziv datoteke po�inje sa '''<tt>\$1</tt>'''.
+Izgleda da se radi o smanjenoj slici ''(\"thumbnail\")''.
+Ako imate ovu sliku u punoj rezoluciji, postavite nju; ili promijenite naslov ove datoteke.",
+'fileexists-forbidden'        => 'Datoteka sa ovim imenom već postoji i ne može biti prepisana.
+Ako i dalje želite da postavite ovu datoteku, molimo Vas da se vratite i pošaljete ovu datoteku pod novim imenom. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Datoteka sa ovim imenom već postoji u zajedni�koj ostavi; molimo Vas da se vratite i pošaljete ovu datoteku pod novim imenom. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ova datoteka je dvojnik {{PLURAL:$1|slijedećoj datoteci|slijedećim datotekama}}:',
+'file-deleted-duplicate'      => 'Datoteka koje je identi�na ovoj datoteci ([[$1]]) je ranije bila obrisana. Trebate provjeriti historiju brisanja te datoteke prije nego što nastavite sa njenim ponovnim postavljanjem.',
 'successfulupload'            => 'Uspješno slanje',
 'uploadwarning'               => 'Upozorenje pri slanju',
 'savefile'                    => 'Sa�uvaj fajl',
@@ -1230,8 +1470,22 @@ Prije nego Å¡to nastavite da je ponovno postavite trebate provjeriti $1.',
 
 Potrebno je da razmotrite da li je uredu nastaviti sa postavljanjem ove datoteke.
 Zapis brisanja za ovu datoteku je prikazan ovdje kao referenca:",
-'filename-bad-prefix'         => 'Naziv datoteke koju postavljate po�inje sa <strong>"$1"</strong>, što je naziv koji obi�no automatski dodjeljuju digitalni fotoaparati i kamere.
-Molimo Vas da odaberete naziv datoteke koji opisuje njen sadržaj.',
+'filename-bad-prefix'         => "Naziv datoteke koju postavljate po�inje sa '''\"\$1\"''', što je naziv koji obi�no automatski dodjeljuju digitalni fotoaparati i kamere.
+Molimo Vas da odaberete naziv datoteke koji opisuje njen sadržaj.",
+'filename-prefix-blacklist'   => ' #<!-- ostavite ovu liniju onakvom kakva jeste --> <pre>
+# Sintaksa je slijedeća:
+#   * Sve od karaktera "#" pa do kraja je komentar
+#   * Svaka neprazna linija je prefiks za tipi�na imena datoteka koja automatski dodjeljuje digitalna kamera
+CIMG # Casio
+DSC_ # Nikon
+DSCF # Fuji
+DSCN # Nikon
+DUW # neki mobilni telefoni
+IMG # generic
+JD # Jenoptik
+MGP # Pentax
+PICT # razni
+ #</pre> <!-- ostavite ovu liniju onakvom kakva jeste -->',
 
 'upload-proto-error'      => 'Pogrešan protokol',
 'upload-proto-error-text' => 'Postavljanje sa vanjske lokacije zahtjeva URL-ove koji po�inju sa <code>http://</code> ili <code>ftp://</code>.',
@@ -1258,20 +1512,21 @@ Možda možete pokušati kada bude manje opterećenje.',
 'upload_source_url'  => ' (validni, javno dostupni URL)',
 'upload_source_file' => ' (datoteka na Vašem ra�unaru)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ova specijalna stranica prikazuje sve postavljene datoteke.
+# Special:ListFiles
+'listfiles-summary'     => 'Ova specijalna stranica prikazuje sve postavljene datoteke.
 Uobi�ajeno je da posljednja postavljena datoteka bude prikazana na vrhu spiska.
 Klikom na zaglavlje kolone možete promjeniti na�in sortiranja.',
-'imagelist_search_for'  => 'Traži medije po imenu:',
+'listfiles_search_for'  => 'Traži medije po imenu:',
 'imgfile'               => 'datoteka',
-'imagelist'             => 'Spisak slika',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Naziv',
-'imagelist_user'        => 'Korisnik',
-'imagelist_size'        => 'Veli�ina',
-'imagelist_description' => 'Opis',
-
-# Image description page
+'listfiles'             => 'Spisak slika',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Naziv',
+'listfiles_user'        => 'Korisnik',
+'listfiles_size'        => 'Veli�ina',
+'listfiles_description' => 'Opis',
+'listfiles_count'       => 'Verzije',
+
+# File description page
 'filehist'                       => 'Historija datoteke',
 'filehist-help'                  => 'Kliknite na datum/vrijeme da vidite verziju datoteke iz tog vremena.',
 'filehist-deleteall'             => 'izbriši sve',
@@ -1279,20 +1534,26 @@ Klikom na zaglavlje kolone možete promjeniti na�in sortiranja.',
 'filehist-revert'                => 'vrati',
 'filehist-current'               => 'trenutno',
 'filehist-datetime'              => 'Datum/Vrijeme',
+'filehist-thumb'                 => 'Smanjeni pregled',
+'filehist-thumbtext'             => 'Smanjeni pregled verzije na dan $1',
+'filehist-nothumb'               => 'Bez smanjenog pregleda',
 'filehist-user'                  => 'Korisnik',
 'filehist-dimensions'            => 'Dimenzije',
 'filehist-filesize'              => 'Veli�ina datoteke',
 'filehist-comment'               => 'Komentar',
-'imagelinks'                     => 'Upotreba slike',
+'imagelinks'                     => 'Linkovi datoteke',
 'linkstoimage'                   => '{{PLURAL:$1|Slijedeća stranica koristi|Slijedećih $1 stranica koriste}} ovu sliku:',
+'linkstoimage-more'              => 'Više od $1 {{PLURAL:$1|datoteke|datoteka}} je povezano s ovom datotekom.
+Slijedeći spisak pokazuje samo {{PLURAL:$1|prvu stranicu povezanu|prve $1 stranice povezane|prvih $1 stranica povezanih}} s ovom datotekom.
+Ovdje je dostupan [[Special:WhatLinksHere/$2|potpuni spisak]].',
 'nolinkstoimage'                 => 'Nema stranica koje koriste ovu sliku.',
 'morelinkstoimage'               => 'Vidi [[Special:WhatLinksHere/$1|ostale linkove]] prema ovoj datoteci.',
 'redirectstofile'                => '{{PLURAL:$1|Slijedeća datoteka|Slijedeće $1 datoteke|Slijedećih $1 datoteka}} preusmjerava prema ovoj datoteci:',
-'duplicatesoffile'               => '{{PLURAL:$1|Slijedeća datoteka je dvojnik|Slijedeće $1 datoteke su dvojnici}} ove datoteke:',
+'duplicatesoffile'               => '{{PLURAL:$1|Slijedeća datoteka je dvojnik|Slijedeće $1 datoteke su dvojnici}} ove datoteke ([[Special:FileDuplicateSearch/$2|detaljnije]]):',
 'sharedupload'                   => 'Ova datoteka se nalazi na [[Commons:Po�etna strana|Wikimedia Commons]] i može se koristiti i na drugim projektima.',
 'shareduploadwiki'               => 'Molimo pogledajte $1 za više informacija.',
-'shareduploadwiki-desc'          => 'Opis njene $1 na zajedni�kom repozitoriju je prikazan ispod.',
-'shareduploadwiki-linktext'      => 'stranice opisa datoteke',
+'shareduploadwiki-desc'          => 'Opis na njenoj $1 je prikazan ispod.',
+'shareduploadwiki-linktext'      => 'stranici opisa datoteke',
 'shareduploadduplicate'          => 'Ova datoteka je dvojnik $1 iz zajedni�kog repozitorija.',
 'shareduploadduplicate-linktext' => 'drugoj datoteci',
 'shareduploadconflict'           => 'Ova datoteka ima isti naziv kao i $1 iz zajedni�kog repozitorija.',
@@ -1315,7 +1576,7 @@ Klikom na zaglavlje kolone možete promjeniti na�in sortiranja.',
 # File deletion
 'filedelete'                  => 'Obriši $1',
 'filedelete-legend'           => 'Obriši datoteku',
-'filedelete-intro'            => "Brišete datoteku '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Brišete datoteku '''[[Media:$1|$1]]''' zajedno sa svom njenom historijom.",
 'filedelete-intro-old'        => "Brišete verziju datoteke '''[[Media:$1|$1]]''' od [$4 $3, $2].",
 'filedelete-comment'          => 'Razlog brisanja:',
 'filedelete-submit'           => 'Obriši',
@@ -1323,7 +1584,6 @@ Klikom na zaglavlje kolone možete promjeniti na�in sortiranja.',
 'filedelete-success-old'      => "Verzija datoeke '''[[Media:$1|$1]]''' od $3, $2 je obrisana.",
 'filedelete-nofile'           => "'''$1''' ne postoji.",
 'filedelete-nofile-old'       => "Ne postoji arhivirana verzija '''$1''' sa navedenim atributima.",
-'filedelete-iscurrent'        => 'Pokušavate obrisati najskoriju verziju ove datoteke. Molimo Vas da je prethodno vratite na raniju verziju.',
 'filedelete-otherreason'      => 'Ostali/dodatni razlozi:',
 'filedelete-reason-otherlist' => 'Ostali razlozi',
 'filedelete-reason-dropdown'  => '*Uobi�ajeni razlozi brisanja
@@ -1352,30 +1612,31 @@ Prije brisanja provjerite da li druge stranice vode na te Å¡ablone.',
 
 # Random page
 'randompage'         => 'Slu�ajna stranica',
-'randompage-nopages' => 'Nema stranica u ovom imenskom prostoru.',
+'randompage-nopages' => 'Nema stranica u imenskom prostoru "$1".',
 
 # Random redirect
 'randomredirect'         => 'Slu�ajno preusmjerenje',
-'randomredirect-nopages' => 'Ne postoje preusmjerenja u ovom imenskom prostoru.',
+'randomredirect-nopages' => 'Ne postoje preusmjerenja u imenskom prostoru "$1".',
 
 # Statistics
-'statistics'             => 'Statistike',
-'sitestats'              => 'Statistika sajta',
-'userstats'              => 'Statistike korisnika',
-'sitestatstext'          => "{{SITENAME}} trenutno ima {{PLURAL:$2|jedan '''1''' �lanak|'''$2''' �lanka|'''$2''' �lanaka}}.
-
-Ovaj broj isklju�uje preusmjerenja, stranice za razgovor, stranice sa opisom slike, korisni�ke stranice, šablone, stranice za pomoć, �lanke bez poveznica, i stranice o projektu {{SITENAME}}.
-
-Totalni broj stranica u bazi je:  '''$1'''.
-
-{{PLURAL:$8|Postavljena je 1 datoteka|Postavljene su '''$8''' datoteke|Postavljeno je '''$8''' datoteka}}.
-
-Bilo je {{PLURAL:$3|'''$3''' pogled|pogleda}} stranica i {{PLURAL:$4|izmjena|izmjene|izmjena}} izmjena otkad je {{SITENAME}} instaliran.
-To izađe u prosjeku oko '''$5''' izmjena po stranici i '''$6''' pogleda po izmjeni.
-
-Dužina [http://meta.wikimedia.org/wiki/Help:Job_queue �ekanja za obradu naredbe] na serveru iznosi '''$7'''.",
-'userstatstext'          => "Postoji {{PLURAL:$1| '''1''' rigistrovan [[Special:ListUsers|korisnik]]| '''$1''' registriranih [[Special:ListUsers|korisnika]]}}, od kojih '''$2''' (ili '''$4%''') {{PLURAL:$2|ima|imaju}} $5 prava.",
-'statistics-mostpopular' => 'Najviše pregledane stranice',
+'statistics'                   => 'Statistike',
+'statistics-header-pages'      => 'Statistike stranice',
+'statistics-header-edits'      => 'Statistike izmjena',
+'statistics-header-views'      => 'Statistike pregleda',
+'statistics-header-users'      => 'Statistike korisnika',
+'statistics-articles'          => 'Stranice sadržaja',
+'statistics-pages'             => 'Stranice',
+'statistics-pages-desc'        => 'Sve stranice na wikiju, uklju�ujući stranice za razgovor, preusmjerenja itd.',
+'statistics-files'             => 'Broj postavljenih datoteka',
+'statistics-edits'             => 'Broj izmjena od kako je instalirana {{SITENAME}}',
+'statistics-edits-average'     => 'Prosje�no izmjena po stranici',
+'statistics-views-total'       => 'Ukupno pregleda',
+'statistics-views-peredit'     => 'Pogleda po izmjeni',
+'statistics-jobqueue'          => 'Dužina [http://www.mediawiki.org/wiki/Manual:Job_queue akcija na �ekanju]',
+'statistics-users'             => 'Registrovani [[Special:ListUsers|korisnici]]',
+'statistics-users-active'      => 'Aktivni korisnici',
+'statistics-users-active-desc' => 'Korisnici koju su izvršili akciju u toku {{PLURAL:$1|zadnjeg dana|zadnja $1 dana|zadnjih $1 dana}}',
+'statistics-mostpopular'       => 'Najviše pregledane stranice',
 
 'disambiguations'      => 'Stranice za višezna�ne odrednice',
 'disambiguationspage'  => '{{ns:template}}:Višezna�na odrednica',
@@ -1389,7 +1650,7 @@ Stranica se smatra �vorom, ukoliko koristi šablon koji je povezan sa spiskom [
 'double-redirect-fixer'      => 'Popravlja� preusmjerenja',
 
 'brokenredirects'        => 'Pokvarena preusmjerenja',
-'brokenredirectstext'    => 'Sledeća preusmjerenja su povezana na nepostojeći �lanak:',
+'brokenredirectstext'    => 'Slijedeća preusmjerenja vode na nepostojeći stranice:',
 'brokenredirects-edit'   => '(uredi)',
 'brokenredirects-delete' => '(obriši)',
 
@@ -1419,26 +1680,30 @@ Stranica se smatra �vorom, ukoliko koristi šablon koji je povezan sa spiskom [
 'popularpages'            => 'Popularne stranice',
 'wantedcategories'        => 'Tražene kategorije',
 'wantedpages'             => 'Tražene stranice',
-'missingfiles'            => 'Nedostajuće datoteke',
+'wantedfiles'             => 'Tražene datoteke',
+'wantedtemplates'         => 'Potrebni Å¡abloni',
 'mostlinked'              => 'Članci sa najviše linkova',
 'mostlinkedcategories'    => 'Kategorije sa najviše linkova',
 'mostlinkedtemplates'     => 'Najviše upotrebljavani šabloni',
 'mostcategories'          => 'Članci sa najviše kategorija',
 'mostimages'              => 'Najviše linkovane slike',
 'mostrevisions'           => 'Članci sa najviše izmjena',
-'prefixindex'             => 'Prefiks naslova',
+'prefixindex'             => 'Sve stranice sa prefiksom',
 'shortpages'              => 'Kratke stranice',
 'longpages'               => 'Duga�ke stranice',
 'deadendpages'            => 'Stranice bez internih veza',
 'deadendpagestext'        => 'Slijedeće stranice nisu povezane s drugim stranicama na {{SITENAME}}.',
 'protectedpages'          => 'Zaštićene stranice',
 'protectedpages-indef'    => 'Samo neograni�ena zaštićenja',
+'protectedpages-cascade'  => 'Samo prenosive zaštite',
 'protectedpagestext'      => 'Slijedeće stranice su zaštićene od izmjena i premještanja',
 'protectedpagesempty'     => 'Trenutno nijedna stranica nije zaštićena s ovim parametrima.',
 'protectedtitles'         => 'Zaštićeni naslovi',
 'protectedtitlestext'     => 'Članci sa slijedećim naslovima su zaštićeni od kreiranja.',
 'protectedtitlesempty'    => 'Nema naslova zaštićenih �lanaka sa ovim parametrima.',
 'listusers'               => 'Spisak korisnika',
+'listusers-editsonly'     => 'Pokaži samo korisnike koji su uređivali',
+'usereditcount'           => '$1 {{PLURAL:$1|izmjena|izmjene}}',
 'newpages'                => 'Nove stranice',
 'newpages-username'       => 'Korisni�ko ime:',
 'ancientpages'            => 'Najstarije stranice',
@@ -1463,14 +1728,13 @@ na kome bi se izvela ova funkcija.',
 'booksources-search-legend' => 'Traži književne izvore',
 'booksources-go'            => 'Idi',
 'booksources-text'          => 'Ispod se nalazi spisak vanjskih linkova na ostale stranice koje prodaju nove ili korištene knjige kao i stranice koje mogu da imaju važnije podatke o knjigama koje tražite:',
+'booksources-invalid-isbn'  => 'Navedeni ISBN broj nije validan; molimo da provjerite da li je došlo do greške pri kopiranju iz prvobitnog izvora.',
 
 # Special:Log
 'specialloguserlabel'  => 'Korisnik:',
 'speciallogtitlelabel' => 'Naslov:',
 'log'                  => 'Protokoli',
 'all-logs-page'        => 'Svi registri',
-'log-search-legend'    => 'Pretraga zapisa',
-'log-search-submit'    => 'Idi',
 'alllogstext'          => 'Zajedni�ki prikaz svih dostupnih zapisa sa {{SITENAME}}. 
 Možete specificirati prikaz izabiranjem specifi�nog spiska, korisni�kog imena ili promjenjenog �lanka (razlikovati velika slova).',
 'logempty'             => 'Ne postoji takav zapis.',
@@ -1482,6 +1746,7 @@ Možete specificirati prikaz izabiranjem specifi�nog spiska, korisni�kog imena
 'nextpage'          => 'Sljedeća strana ($1)',
 'prevpage'          => 'Prethodna stranica ($1)',
 'allpagesfrom'      => 'Prikaži stranice po�ev od:',
+'allpagesto'        => 'Prikaži stranice koje završavaju na:',
 'allarticles'       => 'Svi �lanci',
 'allinnamespace'    => 'Sve stranice (imenski prostor $1)',
 'allnotinnamespace' => 'Sve stranice (van imenskog prostora $1)',
@@ -1502,44 +1767,71 @@ Vidi također [[Special:WantedCategories|zatražene kategorije]].',
 'special-categories-sort-count' => 'sortiranje po broju',
 'special-categories-sort-abc'   => 'sortiraj po abecedi',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Obrisani doprinosi korisnika',
+
+# Special:LinkSearch
+'linksearch'       => 'Vanjski linkovi',
+'linksearch-pat'   => 'Šema traženja:',
+'linksearch-ns'    => 'Imenski prostor:',
+'linksearch-ok'    => 'Traži',
+'linksearch-text'  => 'Općeniti izrazi poput "*.wikipedia.org" se mogu koristiti.<br />
+Podržani protokoli: <tt>$1</tt>',
+'linksearch-line'  => '$1 je povezan od $2',
+'linksearch-error' => 'Džokeri se mogu pojavljivati samo na po�etku naziva servera.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Prikaži korisnike koji po�inju sa:',
 'listusers-submit'   => 'Pokaži',
 'listusers-noresult' => 'Nije pronađen korisnik.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Zapis novih korisnika',
+'newuserlogpagetext'          => 'Ovo je zapis o registraciji novih korisnika.',
+'newuserlog-byemail'          => 'Å¡ifra je poslana putem e-maila',
+'newuserlog-create-entry'     => 'Novi korisnik',
+'newuserlog-create2-entry'    => 'napravljen novi ra�un za $1',
+'newuserlog-autocreate-entry' => 'Ra�un napravljen automatski',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Prava korisni�kih grupa',
-'listgrouprights-summary'  => 'Slijedi spisak korisni�kih grupa na ovoj wiki, s njihovim pravima pristupa.
+'listgrouprights'                 => 'Prava korisni�kih grupa',
+'listgrouprights-summary'         => 'Slijedi spisak korisni�kih grupa na ovoj wiki, s njihovim pravima pristupa.
 O svakoj od njih postoje i [[{{MediaWiki:Listgrouprights-helppage}}|dodatne informacije]].',
-'listgrouprights-group'    => 'Grupa',
-'listgrouprights-rights'   => 'Prava',
-'listgrouprights-helppage' => 'Help:Grupna prava',
-'listgrouprights-members'  => '(spisak �lanova)',
+'listgrouprights-group'           => 'Grupa',
+'listgrouprights-rights'          => 'Prava',
+'listgrouprights-helppage'        => 'Help:Grupna prava',
+'listgrouprights-members'         => '(spisak �lanova)',
+'listgrouprights-addgroup'        => 'Mogu dodati {{PLURAL:$2|grupu|grupe}}: $1',
+'listgrouprights-removegroup'     => 'Mogu ukloniti {{PLURAL:$2|grupu|grupe}}: $1',
+'listgrouprights-addgroup-all'    => 'Može dodavati sve grupe',
+'listgrouprights-removegroup-all' => 'Može ukloniti sve grupe',
 
 # E-mail user
-'mailnologin'     => 'Nema adrese za slanje',
-'mailnologintext' => 'Morate biti [[Special:UserLogin|prijavljeni]]
+'mailnologin'      => 'Nema adrese za slanje',
+'mailnologintext'  => 'Morate biti [[Special:UserLogin|prijavljeni]]
 i imati ispravnu adresu e-pošte u vašim [[Special:Preferences|podešavanjima]]
 da biste slali e-poštu drugim korisnicima.',
-'emailuser'       => 'Pošalji e-poštu ovom korisniku',
-'emailpage'       => 'Pošalji e-pismo korisniku',
-'emailpagetext'   => 'Možete korisiti formu ispod za slanje e-mail poruka ovom korisniku.
+'emailuser'        => 'Pošalji e-poštu ovom korisniku',
+'emailpage'        => 'Pošalji e-pismo korisniku',
+'emailpagetext'    => 'Možete korisiti formu ispod za slanje e-mail poruka ovom korisniku.
 E-mail adresa koju ste unijeli u [[Special:Preferences|Vašim korisni�kim postavkama]] će biti prikazana kao adresa pošiljaoca, tako da će primaoc poruke moći da Vam odgovori.',
-'usermailererror' => 'Objekat pošte je vratio grešku:',
-'defemailsubject' => '{{SITENAME}} e-pošta',
-'noemailtitle'    => 'Nema adrese e-pošte',
-'noemailtext'     => 'Ovaj korisnik nije naveo ispravnu adresu e-pošte,
-ili je izabrao da ne prima e-poštu od drugih korisnika.',
-'emailfrom'       => 'Od:',
-'emailto'         => 'Za:',
-'emailsubject'    => 'Tema:',
-'emailmessage'    => 'Poruka:',
-'emailsend'       => 'Pošalji',
-'emailccme'       => 'Pošalji mi kopiju moje poruke.',
-'emailccsubject'  => 'Kopiraj Vašu poruku za $1: $2',
-'emailsent'       => 'Poruka poslata',
-'emailsenttext'   => 'Vaša poruka je poslata e-poštom.',
-'emailuserfooter' => 'Ovaj e-mail je poslao $1 korisniku $2 putem funkcije "Pošalji e-mail korisniku" sa {{SITENAME}}.',
+'usermailererror'  => 'Objekat pošte je vratio grešku:',
+'defemailsubject'  => '{{SITENAME}} e-pošta',
+'noemailtitle'     => 'Nema adrese e-pošte',
+'noemailtext'      => 'Ovaj korisnik nije naveo ispravnu adresu e-pošte.',
+'nowikiemailtitle' => 'E-mail nije dopušten',
+'nowikiemailtext'  => 'Ovaj korisnik je odabrao da ne prima e-mail poštu od drugih korisnika.',
+'email-legend'     => 'Slanje e-maila drugom {{SITENAME}} korisniku',
+'emailfrom'        => 'Od:',
+'emailto'          => 'Za:',
+'emailsubject'     => 'Tema:',
+'emailmessage'     => 'Poruka:',
+'emailsend'        => 'Pošalji',
+'emailccme'        => 'Pošalji mi kopiju moje poruke.',
+'emailccsubject'   => 'Kopiraj Vašu poruku za $1: $2',
+'emailsent'        => 'Poruka poslata',
+'emailsenttext'    => 'Vaša poruka je poslata e-poštom.',
+'emailuserfooter'  => 'Ovaj e-mail je poslao $1 korisniku $2 putem funkcije "Pošalji e-mail korisniku" sa {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Praćeni �lanci',
@@ -1571,12 +1863,7 @@ Ako kasnije želite da uklonite stranicu sa vašeg spiska praćenih �lanaka, kl
 'iteminvalidname'      => "Problem sa '$1', neispravno ime...",
 'wlnote'               => "Ispod je {{PLURAL:$1|najskorija izmjena|'''$1''' najskorije izmjene|'''$1''' najskorijih izmjena}} na�injenih {{PLURAL:$2|posljednjeg sata|u posljednjih '''$2''' sata|u posljednjih '''$2''' sati}}.",
 'wlshowlast'           => 'Prikaži poslednjih $1 sati $2 dana $3',
-'watchlist-show-bots'  => 'Pokaži izmjene botova',
-'watchlist-hide-bots'  => 'Sakrij botove',
-'watchlist-show-own'   => 'Prikaži moje izmjene',
-'watchlist-hide-own'   => 'Sakrij moje izmjene',
-'watchlist-show-minor' => 'Prikaži male izmjene',
-'watchlist-hide-minor' => 'Sakrij male izmjene',
+'watchlist-options'    => 'Opcije spiska praćenja',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Pratim...',
@@ -1617,82 +1904,101 @@ Da promjenite podešavanja vezana za spisak praćenenih �lanaka posjetite
 Fidbek i dalja pomoć:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Obrišite stranicu',
-'confirm'                     => 'Potvrdite',
-'excontent'                   => "sadržaj je bio: '$1'",
-'excontentauthor'             => "sadržaj je bio: '$1' (i jedini korisnik koji je mijenjao bio je '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "sadržaj prije brisanja je bio: '$1'",
-'exblank'                     => 'stranica je bila prazna',
-'delete-confirm'              => 'Brisanje "$1"',
-'delete-legend'               => 'Obriši',
-'historywarning'              => 'Upozorenje:  Stranica koju želite da obrišete ima historiju:',
-'confirmdeletetext'           => 'Brisanjem ćete obrisati stranicu ili sliku zajedno sa historijom iz baze podataka, ali će se iste moći vratiti kasnije. 
+# Delete
+'deletepage'             => 'Obrišite stranicu',
+'confirm'                => 'Potvrdite',
+'excontent'              => "sadržaj je bio: '$1'",
+'excontentauthor'        => "sadržaj je bio: '$1' (i jedini korisnik koji je mijenjao bio je '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "sadržaj prije brisanja je bio: '$1'",
+'exblank'                => 'stranica je bila prazna',
+'delete-confirm'         => 'Brisanje "$1"',
+'delete-legend'          => 'Obriši',
+'historywarning'         => 'Upozorenje:  Stranica koju želite da obrišete ima historiju:',
+'confirmdeletetext'      => 'Brisanjem ćete obrisati stranicu ili sliku zajedno sa historijom iz baze podataka, ali će se iste moći vratiti kasnije. 
 Molim potvrdite svoju namjeru, da razumijete posljedice i da ovo radite u skladu sa [[{{MediaWiki:Policy-url}}|pravilima]].',
-'actioncomplete'              => 'Akcija završena',
-'deletedtext'                 => 'ÄŒlanak "<nowiki>$1</nowiki>" je obrisan.
+'actioncomplete'         => 'Akcija završena',
+'deletedtext'            => 'ÄŒlanak "<nowiki>$1</nowiki>" je obrisan.
 Pogledajte $2 za zapis o skorašnjim brisanjima.',
-'deletedarticle'              => 'obrisan "[[$1]]"',
-'suppressedarticle'           => 'promijeni vidljivost od "[[$1]]"',
-'dellogpage'                  => 'Protokol brisanja',
-'dellogpagetext'              => 'Ispod je spisak najskorijih brisanja.',
-'deletionlog'                 => 'zapis brisanja',
-'reverted'                    => 'Vraćeno na prijašnju reviziju',
-'deletecomment'               => 'Razlog brisanja:',
-'deleteotherreason'           => 'Ostali/dodatni razlozi:',
-'deletereasonotherlist'       => 'Ostali razlozi',
-'deletereason-dropdown'       => '*Uobi�ajeni razlozi brisanja
+'deletedarticle'         => 'obrisan "[[$1]]"',
+'suppressedarticle'      => 'promijeni vidljivost od "[[$1]]"',
+'dellogpage'             => 'Protokol brisanja',
+'dellogpagetext'         => 'Ispod je spisak najskorijih brisanja.',
+'deletionlog'            => 'zapis brisanja',
+'reverted'               => 'Vraćeno na prijašnju reviziju',
+'deletecomment'          => 'Razlog brisanja:',
+'deleteotherreason'      => 'Ostali/dodatni razlozi:',
+'deletereasonotherlist'  => 'Ostali razlozi',
+'deletereason-dropdown'  => '*Uobi�ajeni razlozi brisanja
 ** Zahtjev autora
 ** Kršenje autorskih prava
 ** Vandalizam',
-'delete-edit-reasonlist'      => 'Uredi razloge brisanja',
-'delete-toobig'               => 'Ova stranica ima veliku historju promjena, preko $1 {{PLURAL:$1|revizije|revizija}}.
+'delete-edit-reasonlist' => 'Uredi razloge brisanja',
+'delete-toobig'          => 'Ova stranica ima veliku historju promjena, preko $1 {{PLURAL:$1|revizije|revizija}}.
 Brisanje takvih stranica nije dopušteno da bi se sprije�ilo slu�ajno preopterećenje servera na kojem je {{SITENAME}}.',
-'delete-warning-toobig'       => 'Ova stranica ima veliku historiju izmjena, preko $1 {{PLURAL:$1|izmjene|izmjena}}.
+'delete-warning-toobig'  => 'Ova stranica ima veliku historiju izmjena, preko $1 {{PLURAL:$1|izmjene|izmjena}}.
 Njeno brisanje može dovesti do opterećenja operacione baze na {{SITENAME}};
 nastavite s oprezom.',
-'rollback'                    => 'Vrati izmjene',
-'rollback_short'              => 'Vrati',
-'rollbacklink'                => 'vrati',
-'rollbackfailed'              => 'Vraćanje nije uspjelo',
-'cantrollback'                => 'Ne može se vratiti izmjena; poslednji autor je ujedno i jedini.',
-'alreadyrolled'               => 'Ne može se vratiti posljednja izmjena [[:$1]] od korisnika [[User:$2|$2]] ([[User talk:$2|razgovor]] | [[Special:Contributions/$2|{{int:contribslink}}]]); neko drugi je već izmjenio ili vratio �lanak.
-
-Posljednja izmjena je bila od korisnika [[User:$3|$3]] ([[User talk:$3|razgovor]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Komentar izmjene je: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Vraćene izmjene $2 na poslednju izmjenu korisnika $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Poništene izmjene korisnika $1;
+
+# Rollback
+'rollback'         => 'Vrati izmjene',
+'rollback_short'   => 'Vrati',
+'rollbacklink'     => 'vrati',
+'rollbackfailed'   => 'Vraćanje nije uspjelo',
+'cantrollback'     => 'Ne može se vratiti izmjena; poslednji autor je ujedno i jedini.',
+'alreadyrolled'    => 'Ne može se vratiti posljednja izmjena [[:$1]] od korisnika [[User:$2|$2]] ([[User talk:$2|razgovor]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); neko drugi je već izmjenio ili vratio �lanak.
+
+Posljednja izmjena je bila od korisnika [[User:$3|$3]] ([[User talk:$3|razgovor]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Sažetak izmjene je bio: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Vraćene izmjene $2 na poslednju izmjenu korisnika $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Poništene izmjene korisnika $1;
 vraćeno na posljednju verziju koju je sa�uvao $2.',
-'sessionfailure'              => "Izgleda da postoji problem sa vašom sesijom; ova akcija je otkazana kao prevencija protiv napadanja sesija. Kliknite \"back\" (''nazad'') i osvježite stranicu sa koje ste došli, i opet pokušajte.",
+'sessionfailure'   => "Izgleda da postoji problem sa vašom sesijom; ova akcija je otkazana kao prevencija protiv napadanja sesija. Kliknite \"back\" (''nazad'') i osvježite stranicu sa koje ste došli, i opet pokušajte.",
+
+# Protect
 'protectlogpage'              => 'Protokol zaklju�avanja',
 'protectlogtext'              => 'Ispod je spisak zaštićenja stranice.',
 'protectedarticle'            => 'stranica "[[$1]]" je zaštićena',
 'modifiedarticleprotection'   => 'promijenjen stepen zaštite za "[[$1]]"',
 'unprotectedarticle'          => 'odštićena "$1"',
+'movedarticleprotection'      => 'podešavanja zaštite premještena sa "[[$2]]" na "[[$1]]"',
 'protect-title'               => 'Zaštićuje se "$1"',
+'prot_1movedto2'              => '�lanak [[$1]] premješten na [[$2]]',
 'protect-legend'              => 'Potvrdite zaštitu',
 'protectcomment'              => 'Komentar:',
 'protectexpiry'               => 'Isti�e:',
 'protect_expiry_invalid'      => 'Upisani vremenski rok nije valjan.',
 'protect_expiry_old'          => 'Upisani vremenski rok je u prošlosti.',
 'protect-unchain'             => 'Deblokirajte dozvole premještanja',
-'protect-text'                => 'Ovdje možete gledati i izmjeniti level zaštite za stranicu <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Ne možete promijeniti nivo zaštite dok ste blokirani.
-Ovo su trenutne postavke za stranicu <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Nivoi zaštite se ne mogu mijenjati jer je aktivna baza podataka zaklju�ana.
-Trenutna postavka za stranicu <strong>$1</strong> je:',
-'protect-locked-access'       => 'Nemate ovlasti za mijenjanje stepena zaštite.
-Slijede trenutne postavke stranice <strong>$1</strong>:',
+'protect-text'                => "Ovdje možete gledati i izmjeniti level zaštite za stranicu '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Ne možete promijeniti nivo zaštite dok ste blokirani.
+Ovo su trenutne postavke za stranicu '''$1''':",
+'protect-locked-dblock'       => "Nivoi zaštite se ne mogu mijenjati jer je aktivna baza podataka zaklju�ana.
+Trenutna postavka za stranicu '''$1''' je:",
+'protect-locked-access'       => "Nemate ovlasti za mijenjanje stepena zaštite.
+Slijede trenutne postavke stranice '''$1''':",
 'protect-cascadeon'           => 'Ova stranica je tenutno zaštićena jer je uklju�ena u {{PLURAL:$1|stranicu, koja ima|stranice, koje imaju|stranice, koje imaju}} uklju�enu prenosnu zaštitu. 
 Možete promijeniti stepen zaštite ove stranice, ali to neće uticati na prenosnu zaštitu.',
-'protect-default'             => '(standardno)',
+'protect-default'             => 'Dopusti svim korisnicima',
 'protect-fallback'            => 'Potrebno je imati "$1" ovlasti',
-'protect-level-autoconfirmed' => 'Blokiraj neregistrovane korisnike',
+'protect-level-autoconfirmed' => 'Blokiraj nove i neregistrovane korisnike',
 'protect-level-sysop'         => 'Samo administratori',
 'protect-summary-cascade'     => 'prenosna zaštita',
 'protect-expiring'            => 'isti�e $1 (UTC)',
+'protect-expiry-indefinite'   => 'neograni�eno',
 'protect-cascade'             => 'Zaštiti sve stranice koje su uklju�ene u ovu (kaskadna zaštita)',
 'protect-cantedit'            => 'Ne možete mijenjati nivo zaštite ove stranice, jer nemate prava da je uređujete.',
+'protect-othertime'           => 'Ostali period:',
+'protect-othertime-op'        => 'ostali period',
+'protect-existing-expiry'     => 'Postojeće vrijeme isticanja: $3, $2',
+'protect-otherreason'         => 'Ostali/dodatni razlozi:',
+'protect-otherreason-op'      => 'ostali/dodatni razlozi',
+'protect-dropdown'            => '*Uobi�ajeni razlozi zaštite
+** Prekomjerni vandalizam
+** Prekomjerno spamovanje
+** Ne produktivni rat izmjena
+** Stranica velikog prometa',
+'protect-edit-reasonlist'     => 'Uredi razloge zaštićavanja',
+'protect-expiry-options'      => '15 minuta:15 min,1 sat:1 hour,2 sata:2 hours,6 sati:6 hours,12 sati:12 hours,1 dan:1 day,3 dana:3 days,1 sedmica:1 week,2 sedmice:2 weeks,1 mjesec:1 month,3 mjeseca:3 months,6 mjeseci:6 months,1 godine:1 year,zauvijek:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Dopuštenje:',
 'restriction-level'           => 'Stepen ograni�enja:',
 'minimum-size'                => 'Najmanja veli�ina',
@@ -1715,8 +2021,8 @@ Možete promijeniti stepen zaštite ove stranice, ali to neće uticati na prenos
 'undeletepage'                 => 'Pogledaj i vrati izbrisane stranice',
 'undeletepagetitle'            => "'''Slijedeći sadržaj prikazuje obrisane revizije od [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Pogledaj izbrisane stranice',
-'undeletepagetext'             => 'Sledeće stranice su izbrisane ali su još uvijek u arhivi i
-mogu biti vraćene.  Arhiva moše biti periodi�no �išćena.',
+'undeletepagetext'             => '{{PLURAL:$1|Slijedeća $1 stranica je obrisana|Slijedeće $1 stranice su obrisane|Slijedećih $1 je obrisano}} ali su još uvijek u arhivi i mogu biti vraćene.
+Arhiva moše biti periodi�no �išćena.',
 'undelete-fieldset-title'      => 'Vraćanje revizija',
 'undeleteextrahelp'            => "Da vratite cijeli �lanak, ostavite sve kutijice neozna�ene i kliknite '''''Vrati'''''.
 Da bi izvršili selektivno vraćanje �lanaka, odaberite kutijice koje odgovaraju revizijama koje želite vratiti, i kliknite '''''Vrati'''''.
@@ -1727,13 +2033,14 @@ Ako je nova stranica istog imena napravljena od brisanja, vraćene revizije će
 'undeleterevdel'               => 'Vraćanje obrisanog se neće izvršiti ako bi rezultiralo da zaglavlje stranice ili revizija datoteke bude djelomi�no obrisano.
 U takvim slu�ajevima, morate ukloniti ozna�ene ili otkriti sakrivene najskorije obrisane revizije.',
 'undeletehistorynoadmin'       => 'Ova stranica je izbrisana.  Ispod se nalazi dio istorije brisanja i istorija revizija izbrisane stranice.  Tekst izbrisane stranice je vidljiv samo korisnicima koji su administratori.',
-'undelete-revision'            => 'Obrisana revizija $1 od $2 od strane $3:',
+'undelete-revision'            => 'Obrisana revizija stranice $1 (dana $4, u $5) od strane $3:',
 'undeleterevision-missing'     => 'Nepoznata ili nedostajuća revizija.
 Možda ste unijeli pogrešan link, ili je revizija vraćena ili uklonjena iz arhive.',
 'undelete-nodiff'              => 'Nije pronađena ranija revizija.',
 'undeletebtn'                  => 'Vrati',
 'undeletelink'                 => 'vrati',
 'undeletereset'                => 'O�isti',
+'undeleteinvert'               => 'Izmijeni odabir',
 'undeletecomment'              => 'Komentar:',
 'undeletedarticle'             => 'vraćeno "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|$1 revizija vraćena|$1 revizije vraćene|$1 revizija vraćeno}}',
@@ -1767,26 +2074,27 @@ $1',
 'blanknamespace' => '(Glavno)',
 
 # Contributions
-'contributions' => 'Doprinosi korisnika',
-'mycontris'     => 'Moj doprinos',
-'contribsub2'   => 'Za $1 ($2)',
-'nocontribs'    => 'Nisu nađene promjene koje zadovoljavaju ove uslove.',
-'uctop'         => ' (vrh)',
-'month'         => 'Od mjeseca (i ranije):',
-'year'          => 'Od godine (i ranije):',
-
-'sp-contributions-newbies'     => 'Prikaži samo doprinose novih korisnika',
-'sp-contributions-newbies-sub' => 'Za nove korisnike',
-'sp-contributions-blocklog'    => 'Evidencija blokiranja',
-'sp-contributions-search'      => 'Pretraga doprinosa',
-'sp-contributions-username'    => 'IP adresa ili korisni�ko ime:',
-'sp-contributions-submit'      => 'Traži',
+'contributions'       => 'Doprinosi korisnika',
+'contributions-title' => 'Doprinosi korisnika $1',
+'mycontris'           => 'Moj doprinos',
+'contribsub2'         => 'Za $1 ($2)',
+'nocontribs'          => 'Nisu nađene promjene koje zadovoljavaju ove uslove.',
+'uctop'               => ' (vrh)',
+'month'               => 'Od mjeseca (i ranije):',
+'year'                => 'Od godine (i ranije):',
+
+'sp-contributions-newbies'       => 'Prikaži samo doprinose novih korisnika',
+'sp-contributions-newbies-sub'   => 'Za nove korisnike',
+'sp-contributions-newbies-title' => 'Doprinosi novih korisnika',
+'sp-contributions-blocklog'      => 'Evidencija blokiranja',
+'sp-contributions-search'        => 'Pretraga doprinosa',
+'sp-contributions-username'      => 'IP adresa ili korisni�ko ime:',
+'sp-contributions-submit'        => 'Traži',
 
 # What links here
 'whatlinkshere'            => 'Å ta je povezano ovdje',
 'whatlinkshere-title'      => 'Stranice koje vode na "$1"',
 'whatlinkshere-page'       => 'Stranica:',
-'linklistsub'              => '(Spisak veza)',
 'linkshere'                => "Sljedeći �lanci vode na '''[[:$1]]''':",
 'nolinkshere'              => "Nema linkova na '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nijedna stranica nije povezana sa '''[[:$1]]''' u odabranom imenskom prostoru.",
@@ -1808,7 +2116,7 @@ $1',
 'blockiptext'                     => 'Upotrebite donji upitnik da biste uklonili prava pisanja sa određene IP adrese ili korisni�kog imena.  Ovo bi trebalo da bude urađeno samo da bi se sprije�io vandalizam, i u skladu sa [[{{MediaWiki:Policy-url}}|smjernicama]]. Unesite konkretan razlog ispod (na primjer, navodeći koje stranice su vandalizovane).',
 'ipaddress'                       => 'IP adresa:',
 'ipadressorusername'              => 'IP adresa ili korisni�ko ime:',
-'ipbexpiry'                       => 'Trajanje',
+'ipbexpiry'                       => 'Isti�e:',
 'ipbreason'                       => 'Razlog',
 'ipbreasonotherlist'              => 'Ostali razlozi',
 'ipbreason-dropdown'              => '*Naj�ešći razlozi blokiranja
@@ -1830,6 +2138,8 @@ $1',
 'ipbotherreason'                  => 'Ostali/dodatni razlozi:',
 'ipbhidename'                     => 'Sakrij korisni�ko ime iz zapisa blokiranja, spiska aktivnih blokiranja i spisak korisnika',
 'ipbwatchuser'                    => 'Prati korisni�ku stranicu i stranicu za razgovor ovog korisnika',
+'ipballowusertalk'                => 'Dopusti ovom korisniku da mijenja vlastitu stranicu za razgovor dok je blokiran',
+'ipb-change-block'                => 'Ponovno blokiraj korisnika sa novim postavkama',
 'badipaddress'                    => 'Pogrešna IP adresa',
 'blockipsuccesssub'               => 'Blokiranje je uspjelo',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] je blokiran.
@@ -1839,16 +2149,20 @@ $1',
 'ipb-unblock'                     => 'Deblokiraj korisni�ko ime ili IP adresu',
 'ipb-blocklist-addr'              => 'Postojeće blokade za $1',
 'ipb-blocklist'                   => 'Vidi postojeće blokade',
+'ipb-blocklist-contribs'          => 'Doprinosi za $1',
 'unblockip'                       => 'Odblokiraj korisnika',
 'unblockiptext'                   => 'Upotrebite donji upitnik da bi ste vratili
 pravo pisanja ranije blokiranoj IP adresi
 ili korisni�kom imenu.',
-'ipusubmit'                       => 'Deblokirajte ovog korisnika',
+'ipusubmit'                       => 'Ukloni ovu blokadu',
 'unblocked'                       => '[[User:$1|$1]] je deblokiran',
 'unblocked-id'                    => 'Blokada ID oznake $1 je uklonjena',
 'ipblocklist'                     => 'Spisak blokiranih IP adresa i korisni�kih imena',
 'ipblocklist-legend'              => 'Traži blokiranog korisnika',
 'ipblocklist-username'            => 'Korisni�ko ime ili IP adresa:',
+'ipblocklist-sh-userblocks'       => '$1 blokade ra�una',
+'ipblocklist-sh-tempblocks'       => '$1 privremene blokade',
+'ipblocklist-sh-addressblocks'    => '$1 pojedina�ne IP blokade',
 'ipblocklist-submit'              => 'Traži',
 'blocklistline'                   => '$1, $2 blokirao korisnika $3 ($4)',
 'infiniteblock'                   => 'nije ograni�ena',
@@ -1857,25 +2171,32 @@ ili korisni�kom imenu.',
 'noautoblockblock'                => 'automatsko blokiranje onemogućeno',
 'createaccountblock'              => 'blokirano pravljenje ra�una',
 'emailblock'                      => 'e-mail blokiran',
+'blocklist-nousertalk'            => 'ne može uređivati vlastitu stranicu za razgovor',
 'ipblocklist-empty'               => 'Spisak blokiranja je prazan.',
 'ipblocklist-no-results'          => 'Tražena IP adresa ili korisni�ko ime nisu blokirani.',
 'blocklink'                       => 'blokirajte',
 'unblocklink'                     => 'deblokiraj',
+'change-blocklink'                => 'promijeni blokadu',
 'contribslink'                    => 'doprinosi',
 'autoblocker'                     => 'Automatski ste blokirani jer dijelite IP adresu sa "$1".  Razlog za blokiranje je: "\'\'\'$2\'\'\'"',
 'blocklogpage'                    => 'Evidencija blokiranja',
+'blocklog-fulllog'                => 'Potpuni spisak zapisa blokiranja',
 'blocklogentry'                   => 'je blokirao [[$1]] sa vremenom isticanja blokade od $2 $3',
+'reblock-logentry'                => 'promjena postavki blokiranja za [[$1]] sa vremenom isteka u $2 $3',
 'blocklogtext'                    => 'Ovo je istorija blokiranja i deblokiranja korisnika.  Automatsko blokirane IP adrese nisu uspisane ovde.  Pogledajte [[Special:IPBlockList|blokirane IP adrese]] za spisak trenutnih zabrana i blokiranja.',
 'unblocklogentry'                 => 'deblokiran $1',
 'block-log-flags-anononly'        => 'samo anonimni korisnici',
 'block-log-flags-nocreate'        => 'pravljenje ra�una onemogućeno',
 'block-log-flags-noautoblock'     => 'automatsko blokiranje onemogućeno',
 'block-log-flags-noemail'         => 'e-mail je blokiran',
+'block-log-flags-nousertalk'      => 'ne može uređivati vlastitu stranicu za razgovor',
 'block-log-flags-angry-autoblock' => 'omogućeno napredno autoblokiranje',
 'range_block_disabled'            => 'Administratorska mogućnost da blokira grupe je isklju�ena.',
 'ipb_expiry_invalid'              => 'Pogrešno vrijeme trajanja.',
 'ipb_expiry_temp'                 => 'Sakrivene blokade korisni�kih imena moraju biti stalne.',
 'ipb_already_blocked'             => '"$1" je već blokiran',
+'ipb-needreblock'                 => '== Već blokirano ==
+$1 je već blokiran. Da li želite promijeniti postavke?',
 'ipb_cant_unblock'                => 'Greška: Blokada sa ID oznakom $1 nije pronađena.
 Možda je već deblokirana.',
 'ipb_blocked_as_range'            => 'Greška: IP adresa $1 nije direktno blokirana i ne može se deblokirati.
@@ -1889,6 +2210,7 @@ Međutim, možda je blokirana kao dio bloka $2, koji se ne može deblokirati.',
 'sorbsreason'                     => 'Vaša IP adresa je prikazana kao otvoreni proxy u DNSBL koji koristi {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Vaša IP adresa je prikazana kao otvoreni proxy u DNSBL korišten od {{SITENAME}}.
 Ne možete napraviti ra�un',
+'cant-block-while-blocked'        => 'Ne možete blokirati druge korisnike dok ste blokirani.',
 
 # Developer tools
 'lockdb'              => 'Zaklju�ajte bazu',
@@ -1916,9 +2238,9 @@ Ako želite otklju�ati ili zaklju�ati bazu, ova datoteka mora biti omogućena
 'databasenotlocked'   => 'Baza podataka je zaklju�ana.',
 
 # Move page
-'move-page'               => 'Preusmjeravanje $1',
-'move-page-legend'        => 'Premjestite stranicu',
-'movepagetext'            => "Korištenjem ovog formulara možete preusmjeriti �lanak 
+'move-page'                    => 'Preusmjeravanje $1',
+'move-page-legend'             => 'Premjestite stranicu',
+'movepagetext'                 => "Korištenjem ovog formulara možete preusmjeriti �lanak 
 zajedno sa stranicom za diskusiju tog �lanka.
 
 Članak pod starim imenom će postati stranica koja preusmjerava 
@@ -1935,49 +2257,62 @@ preusmjerite.
 '''Pažnja!'''
 Imajte na umu da preusmjeravanje popularnog �lanka može biti 
 drasti�na i neo�ekivana promjena za korisnike.",
-'movepagetalktext'        => "Odgovarajuća stranica za razgovor, ako postoji, će automatski biti premještena istovremeno '''osim:'''
+'movepagetalktext'             => "Odgovarajuća stranica za razgovor, ako postoji, će automatski biti premještena istovremeno '''osim:'''
 *Ako premještate stranicu preko imenskih prostora,
 *Neprazna stranica za razgovor već postoji pod novim imenom, ili
 *Od�ekirajte donju kutiju.
 
 U tim slu�ajevima, moraćete ru�no da premjestite stranicu ukoliko to želite.",
-'movearticle'             => 'Premjestite stranicu',
-'movenotallowed'          => 'Nemate dopuštenje za premještanje stranica.',
-'newtitle'                => 'Novi naslov',
-'move-watch'              => 'Prati ovu stranicu',
-'movepagebtn'             => 'premjestite stranicu',
-'pagemovedsub'            => 'Premještanje uspjelo',
-'movepage-moved'          => '<big>\'\'\'"$1" je premještena na "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Stranica pod tim imenom već postoji, ili je ime koje ste izabrali neispravno.  Molimo Vas da izaberete drugo ime.',
-'cantmove-titleprotected' => 'Ne možete premjestiti stranicu na ovu lokaciju, jer je novi naslov zaštićen od pravljenja',
-'talkexists'              => 'Sama stranica je uspješno premještena, ali
+'movearticle'                  => 'Premjestite stranicu',
+'movenologin'                  => 'Niste prijavljeni',
+'movenologintext'              => 'Morate biti registrovani korisnik i [[Special:UserLogin|prijavljeni]] da biste premjestili stranicu.',
+'movenotallowed'               => 'Nemate dopuštenje za premještanje stranica.',
+'movenotallowedfile'           => 'Nemate dopuštenja da premještanje datoteke.',
+'cant-move-user-page'          => 'Nemate dopuštenje da premještate korisni�ke stranice (bez podstranica).',
+'cant-move-to-user-page'       => 'Nemate dopuštenje da premjestite stranicu na korisni�ku stranicu (osim na korisni�ku podstranicu).',
+'newtitle'                     => 'Novi naslov',
+'move-watch'                   => 'Prati ovu stranicu',
+'movepagebtn'                  => 'premjestite stranicu',
+'pagemovedsub'                 => 'Premještanje uspjelo',
+'movepage-moved'               => '<big>\'\'\'"$1" je premještena na "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Preusmjerenje je napravljeno.',
+'movepage-moved-noredirect'    => 'Pravljenje preusmjerenja je onemogućeno.',
+'articleexists'                => 'Stranica pod tim imenom već postoji, ili je ime koje ste izabrali neispravno.  Molimo Vas da izaberete drugo ime.',
+'cantmove-titleprotected'      => 'Ne možete premjestiti stranicu na ovu lokaciju, jer je novi naslov zaštićen od pravljenja',
+'talkexists'                   => 'Sama stranica je uspješno premještena, ali
 stranica za razgovor nije mogla biti premještena jer takva već postoji na novom naslovu.  Molimo Vas da ih spojite ru�no.',
-'movedto'                 => 'premještena na',
-'movetalk'                => 'Premjestite "stranicu za razgovor" takođe, ako je moguće.',
-'move-subpages'           => 'Premjesti sve podstranice, ako je moguće',
-'move-talk-subpages'      => 'Premjesti sve podstranice stranice za razgovor, ako je moguće',
-'movepage-page-exists'    => 'Stranica $1 već postoji i ne može biti automatski zamijenjena.',
-'movepage-page-moved'     => 'Stranica $1 je premještena na $2.',
-'movepage-page-unmoved'   => 'Stranica $1 ne može biti premještena na $2.',
-'movepage-max-pages'      => 'Maksimum od $1 {{PLURAL:$1|stranice|stranice|stranica}} je premješteno i više nije moguće premjestiti automatski.',
-'1movedto2'               => '�lanak [[$1]] premješten na [[$2]]',
-'1movedto2_redir'         => 'stranica [[$1]] premještena u stranicu [[$2]] putem preusmjerenja',
-'movelogpage'             => 'Protokol premještanja',
-'movelogpagetext'         => 'Ispod je spisak stranica koje su premještene.',
-'movereason'              => 'Razlog:',
-'revertmove'              => 'vrati',
-'delete_and_move'         => 'Brisanje i premještanje',
-'delete_and_move_text'    => '==Brisanje neophodno==
+'movedto'                      => 'premještena na',
+'movetalk'                     => 'Premjestite "stranicu za razgovor" takođe, ako je moguće.',
+'move-subpages'                => 'Premjesti sve podstranice, ako je moguće',
+'move-talk-subpages'           => 'Premjesti sve podstranice stranice za razgovor, ako je moguće',
+'movepage-page-exists'         => 'Stranica $1 već postoji i ne može biti automatski zamijenjena.',
+'movepage-page-moved'          => 'Stranica $1 je premještena na $2.',
+'movepage-page-unmoved'        => 'Stranica $1 ne može biti premještena na $2.',
+'movepage-max-pages'           => 'Maksimum od $1 {{PLURAL:$1|stranice|stranice|stranica}} je premješteno i više nije moguće premjestiti automatski.',
+'1movedto2'                    => '�lanak [[$1]] premješten na [[$2]]',
+'1movedto2_redir'              => 'stranica [[$1]] premještena u stranicu [[$2]] putem preusmjerenja',
+'move-redirect-suppressed'     => 'preusmjeravanje onemogućeno',
+'movelogpage'                  => 'Protokol premještanja',
+'movelogpagetext'              => 'Ispod je spisak stranica koje su premještene.',
+'movereason'                   => 'Razlog:',
+'revertmove'                   => 'vrati',
+'delete_and_move'              => 'Brisanje i premještanje',
+'delete_and_move_text'         => '==Brisanje neophodno==
 Odredišna stranica "[[:$1]]" već postoji.
 Da li je želite obrisati kako bi ste mogli izvršiti premještanje?',
-'delete_and_move_confirm' => 'Da, obriši stranicu',
-'delete_and_move_reason'  => 'Obrisano da bi se napravio prostor za premještanje',
-'selfmove'                => 'Izvorni i ciljani naziv su isti; strana ne može da se premjesti preko same sebe.',
-'immobile_namespace'      => 'Izvorni ili odredišni naslov je specijalnog tipa; ne mogu se premještati stranice iz i u taj imenski prostor.',
-'imagenocrossnamespace'   => 'Ne može se premjestiti datoteka u nedatote�ni imenski prostor',
-'imagetypemismatch'       => 'Ekstenzija nove datoteke ne odgovara njenom tipu',
-'imageinvalidfilename'    => 'Ciljno ime datoteke nije valjano',
-'fix-double-redirects'    => 'Ažuriraj sva preusmjerenja koja vode ka originalnom naslovu',
+'delete_and_move_confirm'      => 'Da, obriši stranicu',
+'delete_and_move_reason'       => 'Obrisano da bi se napravio prostor za premještanje',
+'selfmove'                     => 'Izvorni i ciljani naziv su isti; strana ne može da se premjesti preko same sebe.',
+'immobile-source-namespace'    => 'Ne mogu premjestiti stranice u imenski prostor "$1"',
+'immobile-target-namespace'    => 'Ne mogu se premjestiti stranice u imenski prostor "$1"',
+'immobile-target-namespace-iw' => 'Međuwiki link nije validno odredište premještanja stranice.',
+'immobile-source-page'         => 'Ova stranica se ne može premještati.',
+'immobile-target-page'         => 'Ne može se preusmjeriti na taj odredišni naslov.',
+'imagenocrossnamespace'        => 'Ne može se premjestiti datoteka u nedatote�ni imenski prostor',
+'imagetypemismatch'            => 'Ekstenzija nove datoteke ne odgovara njenom tipu',
+'imageinvalidfilename'         => 'Ciljno ime datoteke nije valjano',
+'fix-double-redirects'         => 'Ažuriraj sva preusmjerenja koja vode ka originalnom naslovu',
+'move-leave-redirect'          => 'Ostavi preusmjerenje',
 
 # Export
 'export'            => 'Izvezite stranice',
@@ -1985,7 +2320,7 @@ Da li je želite obrisati kako bi ste mogli izvršiti premještanje?',
 
 Za izvoz stranica unesite njihove naslove u polje ispod, jedan naslov po retku, i ozna�ite želite li trenuta�nu verziju zajedno sa svim prijašnjima, ili samo trenutnu verziju sa informacijom o zadnjoj promjeni.
 
-U drugom slu�aju možete koristiti i vezu, npr. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] za �lanak [[{{MediaWiki:Mainpage}}]].',
+U drugom slu�aju možete koristiti i vezu, npr. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] za �lanak [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Uklju�ite samo trenutnu reviziju, ne cijelu istoriju',
 'exportnohistory'   => "----
 '''Pažnja:''' Izvoz cjelokupne historije stranica preko ovog obrasca je onemogućeno iz tehni�kih razloga.",
@@ -2020,9 +2355,12 @@ U drugom slu�aju možete koristiti i vezu, npr. [[{{ns:special}}:Export/{{Media
 'import-interwiki-text'      => 'Izaberi wiki i naslov stranice za uvoz.
 Datumi revizija i imena autora će biti sa�uvani.
 Sve akcije pri međuwiki uvozu će biti zapisane u [[Special:Log/import|zapisu uvoza]].',
+'import-interwiki-source'    => 'Izvorna wiki/stranica:',
 'import-interwiki-history'   => 'Kopiraj sve verzije historije za ovu stranicu',
 'import-interwiki-submit'    => 'Uvoz',
 'import-interwiki-namespace' => 'Odredišni imenski prostor:',
+'import-upload-filename'     => 'Naziv datoteke:',
+'import-comment'             => 'Komentar:',
 'importtext'                 => 'Molimo Vas da izvezete datoteku iz izvornog wikija koristeći [[Special:Export|izvoz]], sa�uvajte ga kod sebe i pošaljite ovdje.',
 'importstart'                => 'Uvoz stranica...',
 'import-revision-count'      => '$1 {{PLURAL:$1|revizija|revizije|revizija}}',
@@ -2059,19 +2397,19 @@ Nedostaje privremeni folder.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revizija|revizije|revizija}} od $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Moja korisni�ka stranica',
+'tooltip-pt-userpage'             => 'Vaša korisni�ka stranica',
 'tooltip-pt-anonuserpage'         => 'Korisni�ka stranica za ip koju Vi uređujete kao',
-'tooltip-pt-mytalk'               => 'Moja stranica za razgovor',
+'tooltip-pt-mytalk'               => 'Vaša stranica za razgovor',
 'tooltip-pt-anontalk'             => 'Razgovor o doprinosu sa ove IP adrese',
 'tooltip-pt-preferences'          => 'Moja podešavanja',
 'tooltip-pt-watchlist'            => 'Spisak �lanaka koje pratite.',
-'tooltip-pt-mycontris'            => 'Spisak mog doprinosa',
+'tooltip-pt-mycontris'            => 'Spisak vašeg doprinosa',
 'tooltip-pt-login'                => 'Predlažemo da se prijavite, ali nije obvezno.',
 'tooltip-pt-anonlogin'            => 'Prijava nije obavezna, ali donosi mnogo koristi.',
 'tooltip-pt-logout'               => 'Odjava sa projekta {{SITENAME}}',
 'tooltip-ca-talk'                 => 'Razgovor o sadržaju',
 'tooltip-ca-edit'                 => 'Možete da uređujete ovaj �lanak. Molimo Vas, koristite dugme "Prikaži izgled',
-'tooltip-ca-addsection'           => 'Dodajte svoj komentar.',
+'tooltip-ca-addsection'           => 'Zapo�nite novu sekciju.',
 'tooltip-ca-viewsource'           => 'Ovaj �lanak je zaklju�an. Možete ga samo vidjeti ili kopirati kod.',
 'tooltip-ca-history'              => 'Prethodne verzije ove stranice.',
 'tooltip-ca-protect'              => 'Zaštitite stranicu od budućih izmjena',
@@ -2118,6 +2456,33 @@ Nedostaje privremeni folder.',
 'tooltip-watch'                   => 'Dodajte ovu stranicu na Vaš spisak praćenih �lanaka',
 'tooltip-recreate'                => 'Ponovno pravljenje stranice iako je već brisana',
 'tooltip-upload'                  => 'Zapo�ni postavljanje',
+'tooltip-rollback'                => 'Brzo vraćanje izmjene(izmjena) ove stranice posljednjeg uređiva�a jednim klikom.',
+'tooltip-undo'                    => 'Vraća posljednju izmjenu i otvara formu za uređivanje u modu pregleda.
+Dopušta unos razloga u sažetak.',
+
+# Stylesheets
+'common.css'      => '/* CSS umetnut ovdje primijenit će se na sve skinove */',
+'standard.css'    => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Standard skin */',
+'nostalgia.css'   => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Nostalgia skin */',
+'cologneblue.css' => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Cologne Blue skin */',
+'monobook.css'    => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Monobook skin */',
+'myskin.css'      => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Myskin skin */',
+'chick.css'       => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Chick skin */',
+'simple.css'      => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Simple skin */',
+'modern.css'      => '/* CSS umetnut ovdje uticat će na korisnike koji koriste Modern skin */',
+'print.css'       => '/* CSS umetnut ovdje uticat će na izgled isprintane stranice */',
+'handheld.css'    => '/* CSS umetnut ovdje uticat će na ru�ne sprave koji rade na skinu konfigurisanom u $wgHandheldStyle */',
+
+# Scripts
+'common.js'      => '/* Bilo koja JavaScript će biti u�itana za sve korisnike pri svakom u�itavanju stranice. */',
+'standard.js'    => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Standard skin */',
+'nostalgia.js'   => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Nostalgia skin */',
+'cologneblue.js' => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Cologne Blue skin */',
+'monobook.js'    => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste MonoBook skin */',
+'myskin.js'      => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Myskin skin */',
+'chick.js'       => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Chick skin */',
+'simple.js'      => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Simple skin */',
+'modern.js'      => '/* Bilo koja JavaScript će biti u�itana za sve korisnike koji koriste Modern skin */',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF metapodaci onemogućeni za ovaj server.',
@@ -2125,12 +2490,12 @@ Nedostaje privremeni folder.',
 'notacceptable'     => 'Viki server ne može da pruži podatke u onom formatu koji Vaš klijent može da pro�ita.',
 
 # Attribution
-'anonymous'        => 'Anonimni korisnik od {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonimni korisnik|$1 anonimna korisnika|$1 anonimnih korisnika}} projekta {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} korisnik $1',
 'lastmodifiedatby' => 'Ovu stranicu je posljednji put promjenio $3, u $2, $1', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Bazirano na radu od strane korisnika $1.',
 'others'           => 'ostali',
-'siteusers'        => '{{SITENAME}} korisnik (korisnici) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|korisnik|korisnika}} $1',
 'creditspage'      => 'Autori stranice',
 'nocredits'        => 'Autori ove stranice nisu navedeni.',
 
@@ -2151,6 +2516,16 @@ Ovo je vjerovatno izazvao vezom ka vanjskoj nepoželjnoj stranici.',
 'numauthors'     => 'Broj razli�itih autora (stranice): $1',
 'numtalkauthors' => 'Broj razli�itih autora (stranice za razgovor): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasi�no',
+'skinname-nostalgia'   => 'Nostalgija',
+'skinname-cologneblue' => 'Kelnsko plavo',
+'skinname-monobook'    => 'MonoKnjiga',
+'skinname-myskin'      => 'MojaKoža',
+'skinname-chick'       => 'Pile (chick)',
+'skinname-simple'      => 'Jednostavna',
+'skinname-modern'      => 'Moderna',
+
 # Math options
 'mw_math_png'    => 'Uvijek prikaži kao PNG',
 'mw_math_simple' => 'HTML ako je jednostavno, ina�e PNG',
@@ -2171,10 +2546,12 @@ Ovo je vjerovatno izazvao vezom ka vanjskoj nepoželjnoj stranici.',
 'markedaspatrollederror-noautopatrol' => 'Nije Vam dopušteno da vlastite izmjene ozna�avate patroliranim.',
 
 # Patrol log
-'patrol-log-page'   => 'Zapisnik patroliranja',
-'patrol-log-header' => 'Ovdje se nalazi zapis patroliranih revizija.',
-'patrol-log-line'   => 'ozna�eno $1 od $2 patrolirano $3',
-'patrol-log-auto'   => '(automatsko)',
+'patrol-log-page'      => 'Zapisnik patroliranja',
+'patrol-log-header'    => 'Ovdje se nalazi zapis patroliranih revizija.',
+'patrol-log-line'      => 'ozna�eno $1 od $2 patrolirano $3',
+'patrol-log-auto'      => '(automatsko)',
+'patrol-log-diff'      => 'revizija $1',
+'log-show-hide-patrol' => '$1 zapis patroliranja',
 
 # Image deletion
 'deletedrevision'                 => 'Obrisana stara revizija $1',
@@ -2191,6 +2568,9 @@ $1',
 'previousdiff' => '� Starija izmjena',
 'nextdiff'     => 'Novija izmjena →',
 
+# Visual comparison
+'visual-comparison' => 'Vizuelna usporedba',
+
 # Media information
 'mediawarning'         => "'''Upozorenje''': Ovaj fajl sadrži loš kod, njegovim izvršavanjem možete da ugrozite Vaš sistem.
 <hr />",
@@ -2204,10 +2584,12 @@ $1',
 'show-big-image'       => 'Vidi sliku u punoj veli�ini (rezoluciji)',
 'show-big-image-thumb' => '<small>Veli�ina ovoga prikaza: $1 × $2 piksela</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerija novih slika',
 'imagelisttext'         => "Ispod je spisak od '''$1''' {{PLURAL:$1|datoteke|datoteke|datoteka}} poređanih $2.",
 'newimages-summary'     => 'Ova specijalna stranica prikazuje posljednje postavljene datoteke.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Ime datoteke (ili dio imena):',
 'showhidebots'          => '($1 botove)',
 'noimages'              => 'Ništa za prikazati.',
 'ilsubmit'              => 'Traži',
@@ -2409,9 +2791,25 @@ Svi drugi linkovi u istoj liniji se smatraju izuzecima, npr. kod stranica gdje s
 'exif-lightsource-17'  => 'Standardno svjetlo A',
 'exif-lightsource-18'  => 'Standardno svjetlo B',
 'exif-lightsource-19'  => 'Standardno svjetlo C',
+'exif-lightsource-20'  => 'D55',
+'exif-lightsource-21'  => 'D65',
+'exif-lightsource-22'  => 'D75',
+'exif-lightsource-23'  => 'D50',
 'exif-lightsource-24'  => 'ISO studio volfram',
 'exif-lightsource-255' => 'Ostali izvori svjetlosti',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Blijesak nije radio',
+'exif-flash-fired-1'    => 'Blijesak radio',
+'exif-flash-return-0'   => 'blijesak nije poslao nikakav odziv',
+'exif-flash-return-2'   => 'nije otkriven blijesak',
+'exif-flash-return-3'   => 'otkriven blijesak',
+'exif-flash-mode-1'     => 'obavezan rad blijeska',
+'exif-flash-mode-2'     => 'obavezno izbjegavanje blijeska',
+'exif-flash-mode-3'     => 'automatski na�in',
+'exif-flash-function-1' => 'Bez funkcije blijeska',
+'exif-flash-redeye-1'   => 'na�in redukcije "crvenila o�iju"',
+
 'exif-focalplaneresolutionunit-2' => 'in�i',
 
 'exif-sensingmethod-1' => 'Nedefinisan',
@@ -2422,6 +2820,8 @@ Svi drugi linkovi u istoj liniji se smatraju izuzecima, npr. kod stranica gdje s
 'exif-sensingmethod-7' => 'Trilinearni senzor',
 'exif-sensingmethod-8' => 'Sekvencijalni senzor boje linija',
 
+'exif-filesource-3' => 'DSC',
+
 'exif-scenetype-1' => 'Direktno fotografisana slika',
 
 'exif-customrendered-0' => 'Normalni proces',
@@ -2549,21 +2949,12 @@ $1
 Molimo Vas da potvrdite da stvarno želite da ponovo napravite ovaj �lanak.",
 'recreate'            => 'Ponovno napravi',
 
-# HTML dump
-'redirectingto' => 'Preusmjeravam na [[$1]]...',
+'unit-pixel' => 'px',
 
 # action=purge
-'confirm_purge'        => 'O�isti keš ove stranice?
-
-$1',
 'confirm_purge_button' => 'U redu',
-
-# AJAX search
-'searchcontaining' => "Pretraga za stranicama koje sadrže ''$1''.",
-'searchnamed'      => "Traži stranice na nazivom ''$1''.",
-'articletitles'    => "Stranice koje po�inju sa ''$1''",
-'hideresults'      => 'Sakrij rezultate',
-'useajaxsearch'    => 'Koristi AJAX pretragu',
+'confirm-purge-top'    => 'Da li želite obrisati keš ove stranice?',
+'confirm-purge-bottom' => 'Ispražnjava keš stranice i prikazuje najsvježiju verziju.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� prethodna stranica',
@@ -2583,10 +2974,16 @@ $1',
 'table_pager_empty'        => 'Bez rezultata',
 
 # Auto-summaries
-'autosumm-blank'   => 'Uklanjanje cjelokupnog sadržaja stranice',
+'autosumm-blank'   => 'Uklanjanje sadržaja stranice',
 'autosumm-replace' => "Zamjena stranice sa '$1'",
 'autoredircomment' => 'Preusmjereno na [[$1]]',
-'autosumm-new'     => 'Nova stranica: $1',
+'autosumm-new'     => "Napravljena stranica sa '$1'",
+
+# Size units
+'size-bytes'     => '$1 B',
+'size-kilobytes' => '$1 KB',
+'size-megabytes' => '$1 MB',
+'size-gigabytes' => '$1 GB',
 
 # Live preview
 'livepreview-loading' => 'Punjenje…',
@@ -2626,10 +3023,69 @@ Također možete [[Special:Watchlist/edit|koristiti standardni uređiva�]].',
 'watchlisttools-raw'  => 'Uređivanje praćenih stranica u okviru praćenja.',
 
 # Iranian month names
-'iranian-calendar-m1' => 'Farvardin (Iranski kalendar)',
+'iranian-calendar-m1'  => 'Farvardin (Iranski kalendar)',
+'iranian-calendar-m2'  => 'Ordibehesht',
+'iranian-calendar-m3'  => 'Khordad',
+'iranian-calendar-m4'  => 'Tir',
+'iranian-calendar-m5'  => 'Mordad',
+'iranian-calendar-m6'  => 'Shahrivar',
+'iranian-calendar-m7'  => 'Mehr',
+'iranian-calendar-m8'  => 'Aban',
+'iranian-calendar-m9'  => 'Azar',
+'iranian-calendar-m10' => 'Dey',
+'iranian-calendar-m11' => 'Bahman',
+'iranian-calendar-m12' => 'Esfand',
+
+# Hijri month names
+'hijri-calendar-m1'  => 'Muharem',
+'hijri-calendar-m2'  => 'Safer',
+'hijri-calendar-m3'  => 'Rebiul-evel',
+'hijri-calendar-m4'  => 'Rebiul-ahir',
+'hijri-calendar-m5'  => 'Džumadel-ula',
+'hijri-calendar-m6'  => 'Džumadel-uhra',
+'hijri-calendar-m7'  => 'Redžeb',
+'hijri-calendar-m8'  => 'Å aban',
+'hijri-calendar-m9'  => 'Ramazan',
+'hijri-calendar-m10' => 'Å eval',
+'hijri-calendar-m11' => 'Zulkada',
+'hijri-calendar-m12' => 'Zulhidže',
+
+# Hebrew month names
+'hebrew-calendar-m1'      => 'Tishrei',
+'hebrew-calendar-m2'      => 'Cheshvan',
+'hebrew-calendar-m3'      => 'Kislev',
+'hebrew-calendar-m4'      => 'Tevet',
+'hebrew-calendar-m5'      => 'Shevat',
+'hebrew-calendar-m6'      => 'Adar',
+'hebrew-calendar-m6a'     => 'Adar I',
+'hebrew-calendar-m6b'     => 'Adar II',
+'hebrew-calendar-m7'      => 'Nisan',
+'hebrew-calendar-m8'      => 'Iyar',
+'hebrew-calendar-m9'      => 'Sivan',
+'hebrew-calendar-m10'     => 'Tamuz',
+'hebrew-calendar-m11'     => 'Av',
+'hebrew-calendar-m12'     => 'Elul',
+'hebrew-calendar-m1-gen'  => 'Tishrei',
+'hebrew-calendar-m2-gen'  => 'Cheshvan',
+'hebrew-calendar-m3-gen'  => 'Kislev',
+'hebrew-calendar-m4-gen'  => 'Tevet',
+'hebrew-calendar-m5-gen'  => 'Shevat',
+'hebrew-calendar-m6-gen'  => 'Adar',
+'hebrew-calendar-m6a-gen' => 'Adar I',
+'hebrew-calendar-m6b-gen' => 'Adar II',
+'hebrew-calendar-m7-gen'  => 'Nisan',
+'hebrew-calendar-m8-gen'  => 'Iyar',
+'hebrew-calendar-m9-gen'  => 'Sivan',
+'hebrew-calendar-m10-gen' => 'Tamuz',
+'hebrew-calendar-m11-gen' => 'Av',
+'hebrew-calendar-m12-gen' => 'Elul',
+
+# Signatures
+'timezone-utc' => 'KSV',
 
 # Core parser functions
 'unknown_extension_tag' => 'Nepoznata oznaka ekstenzije "$1"',
+'duplicate-defaultsort' => 'Upozorenje: Postavljeni klju� sortiranja "$2" zamjenjuje raniji klju� "$1".',
 
 # Special:Version
 'version'                          => 'Verzija', # Not used as normal message but as header for the special page itself
@@ -2656,16 +3112,16 @@ Također možete [[Special:Watchlist/edit|koristiti standardni uređiva�]].',
 'filepath'         => 'Putanja datoteke',
 'filepath-page'    => 'Datoteka:',
 'filepath-submit'  => 'Putanja',
-'filepath-summary' => 'Ova posebna stranica prikazuje potpunu putanju do datoteke.
-Slike su prikazane u punoj rezoluciji, ostale vrste datoteka se mogu direktno otvoriti s programima kojima su povezani.
+'filepath-summary' => 'Ova posebna stranica prikazuje potpunu putanju za datoteku.
+Slike su prikazane u punoj veli�ini, ostale vrste datoteka su prikazane direktno sa, s njima povezanim, programom.
 
-Unesite ime datoteke bez prefiksa "{{ns:image}}:".',
+Unesite ime datoteke bez "{{ns:file}}:" prefiksa.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Pretraga za duplim datotekama',
-'fileduplicatesearch-summary'  => "Potraga za datotekama dvojnicima na bazi njihove ''hash'' vrijednosti.
+'fileduplicatesearch-summary'  => 'Pretraga za duplim datotekama na bazi njihove haš vrijednosti.
 
-Unesite ime datoteke bez prefiksa \"{{ns:image}}:\".",
+Unesite ime datoteke bez "{{ns:file}}:" prefiksa.',
 'fileduplicatesearch-legend'   => 'Pretraga za dvojnicima',
 'fileduplicatesearch-filename' => 'Ime datoteke:',
 'fileduplicatesearch-submit'   => 'Traži',
@@ -2695,4 +3151,13 @@ Unesite ime datoteke bez prefiksa \"{{ns:image}}:\".",
 'blankpage'              => 'Prazna stranica',
 'intentionallyblankpage' => 'Ova stranica je namjerno ostavljena prazna',
 
+# External image whitelist
+'external_image_whitelist' => ' #Ostavite ovu liniju onakva kakva je<pre>
+#Stavite obi�ne fragmente opisa (samo dio koji ide između //) ispod
+#Ovi će biti spojeni sa URLovima sa vanjskih (eksternih) slika
+#One koji se spoje biće prikazane kao slike, u suprotnom će se prikazati samo link
+#Linije koje po�inju sa # se tretiraju kao komentari
+
+#Stavite sve regex fragmente iznad ove linije. Ostavite ovu liniju onakvu kakva je</pre>',
+
 );
diff --git a/languages/messages/MessagesBug.php b/languages/messages/MessagesBug.php
index d31b93e1..27c8c8f6 100644
--- a/languages/messages/MessagesBug.php
+++ b/languages/messages/MessagesBug.php
@@ -68,7 +68,7 @@ $messages = array(
 'mytalk'         => 'Bicarana iyya',
 'anontalk'       => 'Bicarana IP édé',
 'navigation'     => 'Navigasi',
-'and'            => 'na',
+'and'            => '&#32;na',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -134,6 +134,8 @@ $messages = array(
 'editsection'     => 'padécéŋ',
 'editold'         => 'padécéŋ',
 'viewsourceold'   => 'ita sumber',
+'editlink'        => 'padécéŋ',
+'viewsourcelink'  => 'ita sumber',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Leppa',
@@ -187,6 +189,9 @@ $messages = array(
 'loginerror'              => 'Éro log attama',
 'mailmypassword'          => 'E-mail pasewodo baru',
 
+# Password reset dialog
+'oldpassword' => 'Pasewodo matoa:',
+
 # Edit page toolbar
 'bold_tip'    => 'Teks maumpek',
 'italic_tip'  => 'Teks Italik',
@@ -198,7 +203,7 @@ $messages = array(
 'showpreview'      => 'Ita pribiu',
 'showlivepreview'  => 'Pribiu live',
 'showdiff'         => 'Mita perubahan',
-'summary-preview'  => 'Pribiu summary',
+'summary-preview'  => 'Pribiu summary:',
 'blockedtitle'     => 'Papaké riblok',
 'accmailtitle'     => 'Ada sandi ni riantarak.',
 'accmailtext'      => 'Ada sandi "$1" riantarak ri $2.',
@@ -234,12 +239,30 @@ $messages = array(
 'revdelete-hid'          => 'tapo $1',
 
 # Diffs
-'editundo' => 'undo',
+'editundo'             => 'undo',
+'diff-movedto'         => 'naésu ri $1',
+'diff-changedto'       => 'naséllé ri $1',
+'diff-movedoutof'      => 'naéssu polé $1',
+'diff-removed'         => '$1 ripeddéni',
+'diff-changedfrom'     => 'naséllé polé $1',
+'diff-src'             => 'sumber',
+'diff-with'            => '&#32;sibawa $1 $2',
+'diff-with-additional' => '$1 $2',
+'diff-with-final'      => '&#32;na $1 $2',
+'diff-height'          => 'lampé',
+'diff-input'           => "séuwa '''input'''",
+'diff-a'               => "séuwa '''linke'''",
+'diff-i'               => "'''italik'''",
+'diff-b'               => "'''umpek'''",
+'diff-strong'          => "'''terek'''",
+'diff-big'             => "'''loppo'''",
+'diff-del'             => "'''ripeddé'''",
 
 # Search results
 'searchsubtitle'        => "Masappa iko '''[[:$1]]'''",
 'searchsubtitleinvalid' => "Massappa iko '''$1'''",
 'viewprevnext'          => 'Ita ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:Lise',
 'search-redirect'       => '(redirect $1)',
 
 # Preferences page
@@ -249,7 +272,6 @@ $messages = array(
 'prefs-watchlist'   => 'Watchlist',
 'prefs-misc'        => 'Misc',
 'saveprefs'         => 'Taro',
-'oldpassword'       => 'Pasewodo matoa:',
 'textboxsize'       => 'Mapadécéŋ',
 'searchresultshead' => 'Masappa',
 
@@ -285,10 +307,10 @@ $messages = array(
 'upload'    => 'Lureng berkas',
 'uploadbtn' => 'Lureng berkas',
 
-# Special:ImageList
-'imagelist_name' => 'Aseŋ',
+# Special:ListFiles
+'listfiles_name' => 'Aseŋ',
 
-# Image description page
+# File description page
 'filehist-user'       => 'Papaké',
 'filehist-dimensions' => 'Dimensi',
 'imagelinks'          => 'Liŋke',
@@ -315,6 +337,11 @@ $messages = array(
 'randompage'         => 'Leppa random',
 'randompage-nopages' => 'Degaga leppa rilaleŋ iyyé namespaceë.',
 
+# Statistics
+'statistics-articles' => 'Leppa liseë',
+'statistics-pages'    => 'Leppaë',
+'statistics-files'    => 'File-file nalise menré',
+
 # Miscellaneous special pages
 'ancientpages' => 'Leppa talloa',
 'move'         => 'Paleccé',
@@ -347,17 +374,21 @@ Halamang bicara éréngé gabungan halamang bicara pada wettu depan didaftarkan
 
 Apak ida ronnak mappedde halamang édé ri daftar jagaan, klik \"Mangedda jaga\" pada kolom ri sedde.",
 
-# Delete/protect/revert
+# Delete
 'actioncomplete' => 'Proses makkapo',
 'dellogpage'     => 'Log peddé-peddé',
 
+# Protect
+'prot_1movedto2' => '[[$1]] ésuk ri [[$2]]',
+
 # Namespace form on various pages
 'blanknamespace' => '(Utama)',
 
 # What links here
-'whatlinkshere'       => 'Pranala ri halamang édé',
-'whatlinkshere-page'  => 'Leppa:',
-'whatlinkshere-links' => '� liŋke',
+'whatlinkshere'          => 'Pranala ri halamang édé',
+'whatlinkshere-page'     => 'Leppa:',
+'whatlinkshere-backlink' => '� $1',
+'whatlinkshere-links'    => '� liŋke',
 
 # Block/unblock
 'ipblocklist-submit' => 'Sappa',
@@ -365,18 +396,20 @@ Apak ida ronnak mappedde halamang édé ri daftar jagaan, klik \"Mangedda jaga\"
 'contribslink'       => 'kontrib',
 
 # Move page
-'articleexists'           => 'Halamang béla ida pile ni ujuk, a dek essa.
+'articleexists'             => 'Halamang béla ida pile ni ujuk, a dek essa.
 Silakan pile aseng laing.',
-'1movedto2'               => '[[$1]] ésuk ri [[$2]]',
-'1movedto2_redir'         => '[[$1]] rileccé lao ri[[$2]] paké redirect',
-'movelogpage'             => 'Log leccé',
-'movereason'              => 'Saba:',
-'delete_and_move'         => 'Peddé nappa paleccé',
-'delete_and_move_text'    => '==Mapeddé riperelu==
+'1movedto2'                 => '[[$1]] ésuk ri [[$2]]',
+'1movedto2_redir'           => '[[$1]] rileccé lao ri[[$2]] paké redirect',
+'movelogpage'               => 'Log leccé',
+'movereason'                => 'Saba:',
+'delete_and_move'           => 'Peddé nappa paleccé',
+'delete_and_move_text'      => '==Mapeddé riperelu==
 Leppa destinasi "[[:$1]]" purani eŋka.
 Eloko peddéï supaya weddiŋi mapalecé?',
-'delete_and_move_confirm' => "Iyé', peddé iyaro leppa",
-'delete_and_move_reason'  => 'Ripeddé supaya weddiŋi mapalecé',
+'delete_and_move_confirm'   => "Iyé', peddé iyaro leppa",
+'delete_and_move_reason'    => 'Ripeddé supaya weddiŋi mapalecé',
+'immobile-source-namespace' => 'Leppa-leppa rilaleŋna namespace "$1"ë de\'na ullé ripaleccé',
+'immobile-source-page'      => "Iyyedé leppaë de'na ullé ripaleccé.",
 
 # Namespace 8 related
 'allmessages'        => 'Maneng pappaseng',
@@ -401,7 +434,7 @@ Eloko peddéï supaya weddiŋi mapalecé?',
 # Media information
 'imagemaxsize' => 'Gangkai rapang pada keterangan rapang ri halamang hingga:',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Sappa',
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesCa.php b/languages/messages/MessagesCa.php
index 20a7ef75..27ceb93d 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -21,12 +21,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Clàssic',
-	'nostalgia'   => 'Nostàlgia',
-	'cologneblue' => 'Colònia blava',
-);
-
 $bookstoreList = array(
 	'Catàleg Col·lectiu de les Universitats de Catalunya' => 'http://ccuc.cbuc.es/cgi-bin/vtls.web.gateway?searchtype=control+numcard&searcharg=$1',
 	'Totselsllibres.com' => 'http://www.totselsllibres.com/tel/publi/busquedaAvanzadaLibros.do?ISBN=$1',
@@ -34,24 +28,27 @@ $bookstoreList = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discussió',
-	NS_USER           => 'Usuari',
-	NS_USER_TALK      => 'Usuari_Discussió',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_Discussió',
-	NS_IMAGE          => 'Imatge',
-	NS_IMAGE_TALK     => 'Imatge_Discussió',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_Discussió',
-	NS_TEMPLATE       => 'Plantilla',
-	NS_TEMPLATE_TALK  => 'Plantilla_Discussió',
-	NS_HELP           => 'Ajuda',
-	NS_HELP_TALK      => 'Ajuda_Discussió',
-	NS_CATEGORY       => 'Categoria',
-	NS_CATEGORY_TALK  => 'Categoria_Discussió',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_TALK             => 'Discussió',
+	NS_USER             => 'Usuari',
+	NS_USER_TALK        => 'Usuari_Discussió',
+	NS_PROJECT_TALK     => '$1_Discussió',
+	NS_FILE             => 'Fitxer',
+	NS_FILE_TALK        => 'Fitxer_Discussió',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discussió',
+	NS_TEMPLATE         => 'Plantilla',
+	NS_TEMPLATE_TALK    => 'Plantilla_Discussió',
+	NS_HELP             => 'Ajuda',
+	NS_HELP_TALK        => 'Ajuda_Discussió',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Categoria_Discussió',
+);
+
+$namespaceAliases = array(
+	'Imatge' => NS_FILE,
+	'Imatge_Discussió' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
@@ -71,61 +68,75 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'img_right'           => array( '1', 'right', 'dreta' ),
-	'img_left'            => array( '1', 'left', 'esquerra' ),
-	'displaytitle'        => array( '1', 'DISPLAYTITLE', 'T�TOL' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:', 'ORDENA:' ),
+	'numberofarticles'      => array( '1', 'NOMBRED\'ARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'NOMBRED\'ARXIUS', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'NOMBRED\'USUARIS', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'NOMBRED\'EDICIONS', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'NOMDELAPLANA', 'PAGENAME' ),
+	'img_right'             => array( '1', 'dreta', 'right' ),
+	'img_left'              => array( '1', 'esquerra', 'left' ),
+	'img_border'            => array( '1', 'vora', 'border' ),
+	'img_link'              => array( '1', 'enllaç=$1', 'link=$1' ),
+	'displaytitle'          => array( '1', 'T�TOL', 'DISPLAYTITLE' ),
+	'language'              => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
+	'special'               => array( '0', 'especial', 'special' ),
+	'defaultsort'           => array( '1', 'ORDENA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'pagesize'              => array( '1', 'MIDADELAPLANA', 'PAGESIZE' ),
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Redireccions_dobles' ),
-	'BrokenRedirects'           => array( 'Redireccions_rompudes' ),
+	'DoubleRedirects'           => array( 'Redireccions dobles' ),
+	'BrokenRedirects'           => array( 'Redireccions rompudes' ),
 	'Disambiguations'           => array( 'Desambiguacions' ),
-	'Userlogin'                 => array( 'Registre_i_entrada' ),
-	'Userlogout'                => array( 'Finalitza_sessió' ),
+	'Userlogin'                 => array( 'Registre i entrada' ),
+	'Userlogout'                => array( 'Finalitza sessió' ),
+	'CreateAccount'             => array( 'Crea compte' ),
 	'Preferences'               => array( 'Preferències' ),
-	'Watchlist'                 => array( 'Llista_de_seguiment' ),
-	'Recentchanges'             => array( 'Canvis_recents' ),
+	'Watchlist'                 => array( 'Llista de seguiment' ),
+	'Recentchanges'             => array( 'Canvis recents' ),
 	'Upload'                    => array( 'Carrega' ),
-	'Imagelist'                 => array( 'Imatges' ),
-	'Newimages'                 => array( 'Imatges_noves' ),
+	'Listfiles'                 => array( 'Imatges' ),
+	'Newimages'                 => array( 'Imatges noves' ),
 	'Listusers'                 => array( 'Usuaris' ),
+	'Listgrouprights'           => array( 'Drets dels grups d\'usuaris' ),
 	'Statistics'                => array( 'Estadístiques' ),
-	'Randompage'                => array( 'Article_aleatori', 'Atzar', 'Aleatori' ),
-	'Lonelypages'               => array( 'Pàgines_òrfenes' ),
-	'Uncategorizedpages'        => array( 'Pàgines_sense_categoria' ),
-	'Uncategorizedcategories'   => array( 'Categories_sense_categoria' ),
-	'Uncategorizedimages'       => array( 'Imatges_sense_categoria' ),
-	'Uncategorizedtemplates'    => array( 'Plantilles_sense_categoria' ),
-	'Unusedcategories'          => array( 'Categories_no_usades' ),
-	'Unusedimages'              => array( 'Imatges_no_usades' ),
-	'Wantedpages'               => array( 'Pàgines_demanades' ),
-	'Wantedcategories'          => array( 'Categories_demanades' ),
-	'Mostlinked'                => array( 'Pàgines_més_enllaçades' ),
-	'Mostlinkedcategories'      => array( 'Categories_més_útils' ),
-	'Mostlinkedtemplates'       => array( 'Plantilles_més_útils' ),
-	'Mostcategories'            => array( 'Pàgines_amb_més_categories' ),
-	'Mostimages'                => array( 'Imatges_més_útils' ),
-	'Mostrevisions'             => array( 'Pàgines_més_editades' ),
-	'Fewestrevisions'           => array( 'Pàgines_menys_editades' ),
-	'Shortpages'                => array( 'Pàgines_curtes' ),
-	'Longpages'                 => array( 'Pàgines_llargues' ),
-	'Newpages'                  => array( 'Pàgines_noves' ),
-	'Ancientpages'              => array( 'Pàgines_velles' ),
+	'Randompage'                => array( 'Article aleatori', 'Atzar', 'Aleatori' ),
+	'Lonelypages'               => array( 'Pàgines òrfenes' ),
+	'Uncategorizedpages'        => array( 'Pàgines sense categoria' ),
+	'Uncategorizedcategories'   => array( 'Categories sense categoria' ),
+	'Uncategorizedimages'       => array( 'Imatges sense categoria' ),
+	'Uncategorizedtemplates'    => array( 'Plantilles sense categoria' ),
+	'Unusedcategories'          => array( 'Categories no usades' ),
+	'Unusedimages'              => array( 'Imatges no usades' ),
+	'Wantedpages'               => array( 'Pàgines demanades' ),
+	'Wantedcategories'          => array( 'Categories demanades' ),
+	'Wantedfiles'               => array( 'Arxius demanats' ),
+	'Mostlinked'                => array( 'Pàgines més enllaçades' ),
+	'Mostlinkedcategories'      => array( 'Categories més útils' ),
+	'Mostlinkedtemplates'       => array( 'Plantilles més útils' ),
+	'Mostcategories'            => array( 'Pàgines amb més categories' ),
+	'Mostimages'                => array( 'Imatges més útils' ),
+	'Mostrevisions'             => array( 'Pàgines més editades' ),
+	'Fewestrevisions'           => array( 'Pàgines menys editades' ),
+	'Shortpages'                => array( 'Pàgines curtes' ),
+	'Longpages'                 => array( 'Pàgines llargues' ),
+	'Newpages'                  => array( 'Pàgines noves' ),
+	'Ancientpages'              => array( 'Pàgines velles' ),
 	'Deadendpages'              => array( 'Atzucacs' ),
-	'Protectedpages'            => array( 'Pàgines_protegides' ),
-	'Allpages'                  => array( 'Llista_de_pàgines' ),
-	'Prefixindex'               => array( 'Cerca_per_prefix' ),
-	'Ipblocklist'               => array( 'Usuaris_blocats' ),
-	'Specialpages'              => array( 'Pàgines_especials' ),
+	'Protectedpages'            => array( 'Pàgines protegides' ),
+	'Protectedtitles'           => array( 'Títols protegits' ),
+	'Allpages'                  => array( 'Llista de pàgines' ),
+	'Prefixindex'               => array( 'Cerca per prefix' ),
+	'Ipblocklist'               => array( 'Usuaris blocats' ),
+	'Specialpages'              => array( 'Pàgines especials' ),
 	'Contributions'             => array( 'Contribucions' ),
-	'Emailuser'                 => array( 'Envia_missatge' ),
+	'Emailuser'                 => array( 'Envia missatge' ),
+	'Confirmemail'              => array( 'Confirma adreça' ),
 	'Whatlinkshere'             => array( 'Enllaços' ),
 	'Recentchangeslinked'       => array( 'Seguiment' ),
 	'Movepage'                  => array( 'Reanomena' ),
 	'Blockme'                   => array( 'Bloca\'m' ),
-	'Booksources'               => array( 'Fonts_bibliogràfiques' ),
-	'Categories'                => array( 'Categories' ),
+	'Booksources'               => array( 'Fonts bibliogràfiques' ),
 	'Export'                    => array( 'Exporta' ),
 	'Version'                   => array( 'Versió' ),
 	'Allmessages'               => array( 'Missatges', 'MediaWiki' ),
@@ -133,23 +144,29 @@ $specialPageAliases = array(
 	'Blockip'                   => array( 'Bloca' ),
 	'Undelete'                  => array( 'Restaura' ),
 	'Import'                    => array( 'Importa' ),
-	'Lockdb'                    => array( 'Bloca_bd' ),
-	'Unlockdb'                  => array( 'Desbloca_bd' ),
+	'Lockdb'                    => array( 'Bloca bd' ),
+	'Unlockdb'                  => array( 'Desbloca bd' ),
 	'Userrights'                => array( 'Drets' ),
-	'MIMEsearch'                => array( 'Cerca_MIME' ),
-	'Unwatchedpages'            => array( 'Pàgines_desateses' ),
+	'MIMEsearch'                => array( 'Cerca MIME' ),
+	'FileDuplicateSearch'       => array( 'Cerca fitxers duplicats' ),
+	'Unwatchedpages'            => array( 'Pàgines desateses' ),
 	'Listredirects'             => array( 'Redireccions' ),
-	'Revisiondelete'            => array( 'Esborra_versió' ),
-	'Unusedtemplates'           => array( 'Plantilles_no_usades' ),
-	'Randomredirect'            => array( 'Redirecció_aleatòria' ),
-	'Mypage'                    => array( 'Pàgina_personal' ),
-	'Mytalk'                    => array( 'Discussió_personal' ),
-	'Mycontributions'           => array( 'Contribucions_pròpies' ),
+	'Revisiondelete'            => array( 'Esborra versió' ),
+	'Unusedtemplates'           => array( 'Plantilles no usades' ),
+	'Randomredirect'            => array( 'Redirecció aleatòria' ),
+	'Mypage'                    => array( 'Pàgina personal' ),
+	'Mytalk'                    => array( 'Discussió personal' ),
+	'Mycontributions'           => array( 'Contribucions pròpies' ),
 	'Listadmins'                => array( 'Administradors' ),
-	'Popularpages'              => array( 'Pàgines_populars' ),
+	'Listbots'                  => array( 'Bots' ),
+	'Popularpages'              => array( 'Pàgines populars' ),
 	'Search'                    => array( 'Cerca' ),
-	'Resetpass'                 => array( 'Reinicia_contrasenya' ),
-	'Withoutinterwiki'          => array( 'Sense_interwiki' ),
+	'Resetpass'                 => array( 'Reinicia contrasenya' ),
+	'Withoutinterwiki'          => array( 'Sense interwiki' ),
+	'MergeHistory'              => array( 'Fusiona historial' ),
+	'Blankpage'                 => array( 'Pàgina en blanc', 'Blanc' ),
+	'LinkSearch'                => array( 'Enllaços web', 'Busca enllaços', 'Recerca d\'enllaços web' ),
+	'DeletedContributions'      => array( 'Contribucions esborrades' ),
 );
 
 $linkTrail = '/^([a-zàèéíòóúç·ïü\']+)(.*)$/sDu';
@@ -192,17 +209,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Amaga les meues edicions de la llista de seguiment',
 'tog-watchlisthidebots'       => 'Amaga de la llista de seguiment les edicions fetes per usuaris bots',
 'tog-watchlisthideminor'      => 'Amaga les edicions menors de la llista de seguiment',
+'tog-watchlisthideliu'        => "Amaga a la llista les edicions d'usuaris registrats",
+'tog-watchlisthideanons'      => "Amaga a la llista les edicions d'usuaris anònims",
 'tog-nolangconversion'        => 'Desactiva la conversió de variants',
 'tog-ccmeonemails'            => "Envia'm còpies dels missatges que enviï als altres usuaris.",
 'tog-diffonly'                => 'Amaga el contingut de la pàgina davall de la taula de diferències',
 'tog-showhiddencats'          => 'Mostra les categories ocultes',
+'tog-norollbackdiff'          => 'Omet la pàgina de diferències després de realitzar una reversió',
 
 'underline-always'  => 'Sempre',
 'underline-never'   => 'Mai',
 'underline-default' => 'Configuració per defecte del navegador',
 
-'skinpreview' => '(prova)',
-
 # Dates
 'sunday'        => 'diumenge',
 'monday'        => 'dilluns',
@@ -296,7 +314,7 @@ $messages = array(
 'mytalk'         => 'Discussió',
 'anontalk'       => "Discussió d'aquesta IP",
 'navigation'     => 'Navegació',
-'and'            => 'i',
+'and'            => '&#32;i',
 
 # Metadata in edit box
 'metadata_help' => 'Metadades:',
@@ -333,14 +351,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discussió',
 'specialpage'       => 'Pàgina especial',
 'personaltools'     => "Eines de l'usuari",
-'postcomment'       => 'Envia un comentari',
+'postcomment'       => 'Nova secció',
 'articlepage'       => 'Mostra la pàgina',
 'talk'              => 'Discussió',
 'views'             => 'Vistes',
 'toolbox'           => 'Eines',
 'userpage'          => "Visualitza la pàgina d'usuari",
 'projectpage'       => 'Visualitza la pàgina del projecte',
-'imagepage'         => 'Visualitza la pàgina del fitxer multimèdia',
+'imagepage'         => 'Visualitza la pàgina del fitxer',
 'mediawikipage'     => 'Visualitza la pàgina de missatges',
 'templatepage'      => 'Visualitza la pàgina de plantilla',
 'viewhelppage'      => "Visualitza la pàgina d'ajuda",
@@ -359,8 +377,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Quant al projecte {{SITENAME}}',
 'aboutpage'            => 'Project:Quant a',
-'bugreports'           => "Informes d'errors del programari",
-'bugreportspage'       => "Project:Informes d'errors",
 'copyright'            => "El contingut és disponible sota els termes d'una llicència $1",
 'copyrightpagename'    => '{{SITENAME}}, tots els drets reservats',
 'copyrightpage'        => "{{ns:project}}:Drets d'autor",
@@ -383,9 +399,7 @@ $messages = array(
 
 'badaccess'        => 'Error de permisos',
 'badaccess-group0' => "No teniu permisos per a executar l'acció que heu soŀlicitat.",
-'badaccess-group1' => "L'acció que heu soŀlicitat es limita als usuaris del grup $1.",
-'badaccess-group2' => "L'acció que heu soŀlicitat es limita als usuaris d'algun dels grups següents: $1.",
-'badaccess-groups' => "L'acció que heu soŀlicitat es limita als usuaris d'un dels grups $1.",
+'badaccess-groups' => "L'acció que heu soŀlicitat es limita als usuaris {{PLURAL:$2|del grup|dels grups}}: $1.",
 
 'versionrequired'     => 'Cal la versió $1 del MediaWiki',
 'versionrequiredtext' => 'Cal la versió $1 del MediaWiki per a utilitzar aquesta pàgina. Vegeu [[Special:Version]]',
@@ -399,6 +413,8 @@ $messages = array(
 'editsection'             => 'edita',
 'editold'                 => 'edita',
 'viewsourceold'           => 'mostra codi font',
+'editlink'                => 'edita',
+'viewsourcelink'          => 'mostra codi font',
 'editsectionhint'         => 'Edita la secció: $1',
 'toc'                     => 'Contingut',
 'showtoc'                 => 'desplega',
@@ -413,7 +429,7 @@ $messages = array(
 'site-atom-feed'          => 'Canal Atom $1',
 'page-rss-feed'           => '«$1» RSS Feed',
 'page-atom-feed'          => 'Canal Atom «$1»',
-'red-link-title'          => "$1 (no s'ha escrit encara)",
+'red-link-title'          => '$1 (encara no existeix)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pàgina',
@@ -429,7 +445,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'No es reconeix aquesta operació',
-'nosuchactiontext'  => "El programari wiki que fa servir {{SITENAME}} no reconeix l'operació especificada per l'adreça URL",
+'nosuchactiontext'  => "L'acció especificada per la URL no és vàlida.
+Potser heu escrit malament la URL o heu seguit un enllaç incorrecte.
+Això també pot ser causat per un error al programari utilitzat pel projecte {{SITENAME}}.",
 'nosuchspecialpage' => 'No es troba la pàgina especial que busqueu',
 'nospecialpagetext' => 'La pàgina especial que demaneu no és vàlida. Vegeu la llista de pàgines especials en [[Special:SpecialPages]].',
 
@@ -480,7 +498,6 @@ Aviseu-ho llavors a un [[Special:ListUsers/sysop|administrador]], deixant-li cla
 'cannotdelete'         => "No s'ha pogut esborrar la pàgina o el fitxer especificat, o potser ja ha estat esborrat per algú altre.",
 'badtitle'             => 'El títol no és correcte',
 'badtitletext'         => 'El títol de la pàgina que heu introduït no és correcte, és en blanc o conté un enllaç trencat amb un altre projecte. També podria contenir algun caràcter no acceptat als títols de pàgina.',
-'perfdisabled'         => "S'ha inhabilitat temporalment aquesta funcionalitat perquè sobrecarrega la base de dades fins al punt d'inutilitzar el programari wiki.",
 'perfcached'           => 'Tot seguit es mostren les dades que es troben a la memòria cau, i podria no tenir els últims canvis del dia:',
 'perfcachedts'         => 'Tot seguit es mostra les dades que es troben a la memòria cau, la darrera actualització de la qual fou el $1.',
 'querypage-no-updates' => "S'ha inhabilitat l'actualització d'aquesta pàgina. Les dades que hi contenen podrien no estar al dia.",
@@ -494,7 +511,7 @@ Consulta: $2',
 'protectedpagetext'    => 'Aquesta pàgina està protegida i no pot ser editada.',
 'viewsourcetext'       => "Podeu visualitzar i copiar la font d'aquesta pàgina:",
 'protectedinterface'   => "Aquesta pàgina conté cadenes de text per a la interfície del programari, i és protegida per a previndre'n abusos.",
-'editinginterface'     => "'''Avís:''' Esteu editant una pàgina que conté cadenes de text per a la interfície d'aquest programari. Tingueu en compte que els canvis que es fan a aquesta pàgina afecten a l'aparença de la interfície d'altres usuaris. Pel que fa a les traduccions, plantegeu-vos utilitzar la [http://translatewiki.net/wiki/Main_Page?setlang=ca Betawiki], el projecte de traducció de MediaWiki.",
+'editinginterface'     => "'''Avís:''' Esteu editant una pàgina que conté cadenes de text per a la interfície d'aquest programari. Tingueu en compte que els canvis que es fan a aquesta pàgina afecten a l'aparença de la interfície d'altres usuaris. Pel que fa a les traduccions, plantegeu-vos utilitzar la [http://translatewiki.net/wiki/Main_Page?setlang=ca translatewiki.net], el projecte de traducció de MediaWiki.",
 'sqlhidden'            => '(consulta SQL oculta)',
 'cascadeprotected'     => "Aquesta pàgina està protegida i no es pot editar perquè està inclosa en {{PLURAL:$1|la següent pàgina, que té|les següents pàgines, que tenen}} activada l'opció de «protecció en cascada»:
 $2",
@@ -505,15 +522,15 @@ $2",
 Els seus motius han estat: «''$2''».",
 
 # Virus scanner
-'virus-badscanner'     => 'Mala configuració: antivirus desconegut: <i>$1</i>',
+'virus-badscanner'     => "Mala configuració: antivirus desconegut: ''$1''",
 'virus-scanfailed'     => 'escaneig fallit (codi $1)',
 'virus-unknownscanner' => 'antivirus desconegut:',
 
 # Login and logout pages
 'logouttitle'                => 'Fi de la sessió',
-'logouttext'                 => '<strong>Heu finalitzat la vostra sessió.</strong><br />
+'logouttext'                 => "'''Heu finalitzat la vostra sessió.'''<br />
 Podeu continuar utilitzant {{SITENAME}} de forma anònima, o podeu [[Special:UserLogin|iniciar una sessió una altra vegada]] amb el mateix o un altre usuari. 
-Tingueu en compte que algunes pàgines poden continuar mostrant-se com si encara estiguéssiu en una sessió, fins que buideu la memòria cau del vostre navegador.',
+Tingueu en compte que algunes pàgines poden continuar mostrant-se com si encara estiguéssiu en una sessió, fins que buideu la memòria cau del vostre navegador.",
 'welcomecreation'            => "== Us donem la benvinguda, $1! ==
 
 S'ha creat el vostre compte. 
@@ -525,7 +542,6 @@ No oblideu de canviar les vostres [[Special:Preferences|preferències de {{SITEN
 'remembermypassword'         => 'Recorda la contrasenya entre sessions',
 'yourdomainname'             => 'El vostre domini',
 'externaldberror'            => "Hi ha hagut una fallida en el servidor d'autenticació externa de la base de dades i no teniu permís per a actualitzar el vostre compte d'accès extern.",
-'loginproblem'               => "<strong>S'ha produït un problema en iniciar la sessió.</strong><br />Proveu-ho de nou!",
 'login'                      => 'Inici de sessió',
 'nav-login-createaccount'    => 'Inicia una sessió / crea un compte',
 'loginprompt'                => 'Heu de tenir les galetes habilitades per a poder iniciar una sessió a {{SITENAME}}.',
@@ -550,8 +566,8 @@ No oblideu de canviar les vostres [[Special:Preferences|preferències de {{SITEN
 'yourvariant'                => 'Variant lingüística:',
 'yournick'                   => 'Signatura:',
 'badsig'                     => 'La signatura que heu inserit no és vàlida; verifiqueu les etiquetes HTML que heu emprat.',
-'badsiglength'               => "La signatura és massa llarga.
-Ha de tenir menys {{PLURAL:$1|d'$1 càracter|de $1 caràcters}}.",
+'badsiglength'               => 'La signatura és massa llarga.
+Ha de tenir com a molt {{PLURAL:$1|un caràcter|$1 caràcters}}.',
 'email'                      => 'Adreça electrònica',
 'prefs-help-realname'        => "* Nom real (opcional): si escolliu donar aquesta informació serà utilitzada per a donar-vos l'atribució de la vostra feina.",
 'loginerror'                 => "Error d'inici de sessió",
@@ -564,7 +580,7 @@ També podeu contactar amb altres usuaris a través de la vostra pàgina d'usuar
 'loginsuccesstitle'          => "S'ha iniciat la sessió amb èxit",
 'loginsuccess'               => 'Heu iniciat la sessió a {{SITENAME}} com a «$1».',
 'nosuchuser'                 => "No hi ha cap usuari anomenat «$1».
-Reviseu-ne l'ortografia, o [[Special:UserLogin/signup|creeu un compte d'usuari nou]].",
+Reviseu-ne l'ortografia (recordeu que es distingeixen les majúscules i minúscules), o [[Special:UserLogin/signup|creeu un compte d'usuari nou]].",
 'nosuchusershort'            => 'No hi ha cap usuari anomenat «<nowiki>$1</nowiki>». Comproveu que ho hàgiu escrit correctament.',
 'nouserspecified'            => "Heu d'especificar un nom d'usuari.",
 'wrongpassword'              => 'La contrasenya que heu introduït és incorrecta. Torneu-ho a provar.',
@@ -586,8 +602,9 @@ Inicieu una sessió després que la rebeu.",
 'eauthentsent'               => "S'ha enviat un correu electrònic a la direcció especificada. Abans no s'envïi cap altre correu electrònic a aquesta adreça, cal verificar que és realment vostra. Per tant, cal que seguiu les instruccions presents en el correu electrònic que se us ha enviat.",
 'throttled-mailpassword'     => "Ja se us ha enviat un recordatori de contrasenya en {{PLURAL:$1|l'última hora|les últimes $1 hores}}. Per a prevenir abusos, només s'envia un recordatori de contrasenya cada {{PLURAL:$1|hora|$1 hores}}.",
 'mailerror'                  => "S'ha produït un error en enviar el missatge: $1",
-'acct_creation_throttle_hit' => 'Ho sentim, ja teniu $1 comptes creats i no és permès de tenir-ne més.',
-'emailauthenticated'         => "S'ha autenticat la vostra adreça electrònica a $1.",
+'acct_creation_throttle_hit' => "Des de la vostra adreça IP ja {{PLURAL:$1|s'ha creat un compte|s'han creat $1 comptes}} en l'últim dia i aquest és el màxim permès en aquest wiki per aquest període de temps.
+Així, des d'aquesta adreça IP no es poden crear més comptes actualment.",
+'emailauthenticated'         => "S'ha autenticat la vostra adreça electrònica el $2 a les $3.",
 'emailnotauthenticated'      => 'La vostra adreça de correu electrònic <strong>encara no està autenticada</strong>. No rebrà cap missatge de correu electrònic per a cap de les següents funcionalitats.',
 'noemailprefs'               => 'Especifiqueu una adreça electrònica per a activar aquestes característiques.',
 'emailconfirmlink'           => 'Confirmeu la vostra adreça electrònica',
@@ -600,18 +617,27 @@ Introduïu una adreça amb un format adequat o bé buideu el camp.",
 ($4) amb la vostra adreça de correu electrònic. La contrasenya per a l'usuari «$2» és «$3». Hauríeu d'accedir al compte i canviar-vos aquesta contrasenya quan abans millor.
 
 Si no hi teniu cap relació i aquest compte ha estat creat per error, simplement ignoreu el missatge.",
+'login-throttled'            => "Heu realitzat massa intents amb la contrasenya d'aquest compte.
+Si us plau, esperi abans de tornar-ho a intentar.",
 'loginlanguagelabel'         => 'Llengua: $1',
 
 # Password reset dialog
-'resetpass'               => 'Reinicia la contrasenya del compte',
-'resetpass_announce'      => 'Heu iniciat la sessió amb un codi temporal enviat per correu electrònic. Per a finalitzar-la, heu de definir una nova contrasenya ací:',
-'resetpass_text'          => '<!-- Afegiu-hi un text -->',
-'resetpass_header'        => 'Canvia la contrasenya del compte',
-'resetpass_submit'        => 'Definiu una contrasenya i inicieu una sessió',
-'resetpass_success'       => "S'ha canviat la vostra contrasenya amb èxit! Ara ja podeu iniciar-hi una sessió...",
-'resetpass_bad_temporary' => 'La contrasenya temporal no és vàlida. Potser ja havíeu canviat la vostra contrasenya o heu soŀlicitat una nova contrasenya temporal.',
-'resetpass_forbidden'     => 'No poden canviar-se les contrasenyes',
-'resetpass_missing'       => 'No hi ha cap dada de formulari.',
+'resetpass'                 => 'Canvia la contrasenya',
+'resetpass_announce'        => 'Heu iniciat la sessió amb un codi temporal enviat per correu electrònic. Per a finalitzar-la, heu de definir una nova contrasenya ací:',
+'resetpass_text'            => '<!-- Afegiu-hi un text -->',
+'resetpass_header'          => 'Canvia la contrasenya del compte',
+'oldpassword'               => 'Contrasenya antiga',
+'newpassword'               => 'Contrasenya nova',
+'retypenew'                 => 'Torneu a escriure la nova contrasenya:',
+'resetpass_submit'          => 'Definiu una contrasenya i inicieu una sessió',
+'resetpass_success'         => "S'ha canviat la vostra contrasenya amb èxit! Ara ja podeu iniciar-hi una sessió...",
+'resetpass_bad_temporary'   => 'La contrasenya temporal no és vàlida. Potser ja havíeu canviat la vostra contrasenya o heu soŀlicitat una nova contrasenya temporal.',
+'resetpass_forbidden'       => 'No poden canviar-se les contrasenyes',
+'resetpass-no-info'         => "Heu d'estar registrats en un compte per a poder accedir directament a aquesta pàgina.",
+'resetpass-submit-loggedin' => 'Canvia la contrasenya',
+'resetpass-wrong-oldpass'   => 'Contrasenya actual o temporal no vàlida.
+Deveu haver canviat la vostra contrasenya o demanat una nova contrasenya temporal.',
+'resetpass-temp-password'   => 'Contrasenya temporal:',
 
 # Edit page toolbar
 'bold_sample'     => 'Text en negreta',
@@ -636,8 +662,8 @@ Si no hi teniu cap relació i aquest compte ha estat creat per error, simplement
 'hr_tip'          => 'Línia horitzontal (feu-la servir amb moderació)',
 
 # Edit pages
-'summary'                          => 'Resum',
-'subject'                          => 'Tema/capçalera',
+'summary'                          => 'Resum:',
+'subject'                          => 'Tema/capçalera:',
 'minoredit'                        => 'Aquesta és una edició menor',
 'watchthis'                        => 'Vigila aquesta pàgina',
 'savearticle'                      => 'Desa la pàgina',
@@ -649,8 +675,8 @@ Si no hi teniu cap relació i aquest compte ha estat creat per error, simplement
 'missingsummary'                   => "'''Recordatori''': Heu deixat en blanc el resum de l'edició. Si torneu a clicar al botó de desar, l'edició es guardarà sense resum.",
 'missingcommenttext'               => 'Introduïu un comentari a continuació.',
 'missingcommentheader'             => "'''Recordatori:''' No heu proporcionat un assumpte/encapçalament per al comentari. Si cliqueu al botó Torna a desar, la vostra contribució se desarà sense cap.",
-'summary-preview'                  => 'Previsualització del resum',
-'subject-preview'                  => 'Previsualització de tema/capçalera',
+'summary-preview'                  => 'Previsualització del resum:',
+'subject-preview'                  => 'Previsualització de tema/capçalera:',
 'blockedtitle'                     => "L'usuari està blocat",
 'blockedtext'                      => "<big>'''S'ha procedit al blocatge del vostre compte d'usuari o la vostra adreça IP.'''</big>
 
@@ -700,30 +726,33 @@ Per a crear-la, comenceu a escriure en l'espai de sota
 (vegeu l'[[{{MediaWiki:Helppage}}|ajuda]] per a més informació).
 Si sou ací per error, simplement cliqueu al botó «Enrere» del vostre navegador.",
 'anontalkpagetext'                 => "----''Aquesta és la pàgina de discussió d'un usuari anònim que encara no ha creat un compte o que no fa servir el seu nom registrat. Per tant, hem de fer servir la seua adreça IP numèrica per a identificar-lo. Una adreça IP pot ser compartida per molts usuaris. Si sou un usuari anònim, i trobeu que us han adreçat comentaris inoportuns, si us plau, [[Special:UserLogin/signup|creeu-vos un compte]], o [[Special:UserLogin|entreu en el vostre compte]] si ja en teniu un, per a evitar futures confusions amb altres usuaris anònims.''",
-'noarticletext'                    => 'En aquest moment no hi ha text en aquesta pàgina. Podeu [[Special:Search/{{PAGENAME}}|cercar-ne el títol]] en altres pàgines o [{{fullurl:{{FULLPAGENAME}}|action=edit}} començar a escriure-hi].',
+'noarticletext'                    => 'Actualment no hi ha text en aquesta pàgina.
+Podeu [[Special:Search/{{PAGENAME}}|cercar aquest títol]] en altres pàgines,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} cercar en els registres]
+o [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar aquesta pàgina]</span>.',
 'userpage-userdoesnotexist'        => "Atenció: El compte d'usuari «$1» no està registrat. En principi no hauríeu de crear ni editar aquesta pàgina.",
 'clearyourcache'                   => "'''Nota:''' Després de desar, heu de posar al dia la memòria cau del vostre navegador per veure els canvis. '''Mozilla / Firefox / Safari:''' Premeu ''Shift'' mentre cliqueu ''Actualitza'' (Reload), o premeu ''Ctrl+F5'' o ''Ctrl+R'' (''Cmd+R'' en un Mac Apple); '''Internet Explorer:''' premeu ''Ctrl'' mentre cliqueu ''Actualitza'' (Refresh), o premeu ''Ctrl+F5''; '''Konqueror:''': simplement cliqueu el botó ''Recarregar'' (Reload), o premeu ''F5''; '''Opera''' haureu d'esborrar completament la vostra memòria cau (caché) a ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => '<strong>Consell:</strong> Utilitzeu el botó «Mostra previsualització» per probar el vostre nou CSS/JS abans de desar-lo.',
+'usercssjsyoucanpreview'           => "'''Consell:''' Utilitzeu el botó «Mostra previsualització» per probar el vostre nou CSS/JS abans de desar-lo.",
 'usercsspreview'                   => "'''Recordeu que esteu previsualitzant el vostre CSS d'usuari.'''
 '''Encara no s'ha desat!'''",
 'userjspreview'                    => "'''Recordeu que només estau provant/previsualitzant el vostre JavaScript, encara no ho heu desat!'''",
 'userinvalidcssjstitle'            => "'''Atenció:''' No existeix l'aparença «$1». Recordeu que les subpàgines personalitzades amb extensions .css i .js utilitzen el títol en minúscules, per exemple, {{ns:user}}:NOM/monobook.css no és el mateix que {{ns:user}}:NOM/Monobook.css.",
 'updated'                          => '(Actualitzat)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => "<strong>Açò només és una previsualització, els canvis de la qual encara no s'han desat!</strong>",
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Açò només és una previsualització, els canvis de la qual encara no s'han desat!'''",
 'previewconflict'                  => "Aquesta previsualització reflecteix, a l'àrea
 d'edició superior, el text tal i com apareixerà si trieu desar-lo.",
-'session_fail_preview'             => "<strong>No s'ha pogut processar la vostra edició a causa d'una pèrdua de dades de la sessió.
-Si us plau, proveu-ho una altra vegada. Si continués sense funcionar, proveu de [[Special:UserLogout|finalitzar la sessió]] i torneu a iniciar-ne una.</strong>",
-'session_fail_preview_html'        => "<strong>Ho sentim, no s'han pogut processar les vostres modificacions a causa d'una pèrdua de dades de la sessió.</strong>
+'session_fail_preview'             => "'''No s'ha pogut processar la vostra edició a causa d'una pèrdua de dades de la sessió.
+Si us plau, proveu-ho una altra vegada. Si continués sense funcionar, proveu de [[Special:UserLogout|finalitzar la sessió]] i torneu a iniciar-ne una.'''",
+'session_fail_preview_html'        => "'''Ho sentim, no s'han pogut processar les vostres modificacions a causa d'una pèrdua de dades de la sessió.'''
 
 ''Com que el projecte {{SITENAME}} té habilitat l'ús de codi HTML cru, s'ha amagat la previsualització com a prevenció contra atacs mitjançant codis JavaScript.''
 
-<strong>Si es tracta d'una contribució legítima, si us plau, intenteu-ho una altra vegada. Si continua havent-hi problemes, [[Special:UserLogout|finalitzeu la sessió]] i torneu a iniciar-ne una.</strong>",
-'token_suffix_mismatch'            => "<strong>S'ha rebutjat la vostra edició perquè el vostre client ha fet malbé els caràcters de puntuació en el testimoni d'edició. S'ha rebutjat l'edició per a evitar la corrupció del text de la pàgina. Açò passa a vegades quan s'utilitza un servei web de servidor intermediari anònim amb problemes.</strong>",
+'''Si es tracta d'una contribució legítima, si us plau, intenteu-ho una altra vegada. Si continua havent-hi problemes, [[Special:UserLogout|finalitzeu la sessió]] i torneu a iniciar-ne una.'''",
+'token_suffix_mismatch'            => "'''S'ha rebutjat la vostra edició perquè el vostre client ha fet malbé els caràcters de puntuació en el testimoni d'edició. S'ha rebutjat l'edició per a evitar la corrupció del text de la pàgina. Açò passa a vegades quan s'utilitza un servei web de servidor intermediari anònim amb problemes.'''",
 'editing'                          => "S'està editant $1",
 'editingsection'                   => "S'està editant $1 (secció)",
-'editingcomment'                   => "S'està editant $1 (comentari)",
+'editingcomment'                   => "S'està editant $1 (nova secció)",
 'editconflict'                     => "Conflicte d'edició: $1",
 'explainconflict'                  => "Algú més ha canviat aquesta pàgina des que l'heu editada.
 L'àrea de text superior conté el text de la pàgina com existeix actualment.
@@ -732,25 +761,27 @@ Haureu de fusionar els vostres canvis en el text existent.
 '''Només''' el text de l'àrea superior es desarà quan premeu el botó «Desa la pàgina».",
 'yourtext'                         => 'El vostre text',
 'storedversion'                    => 'Versió emmagatzemada',
-'nonunicodebrowser'                => "<strong>ALERTA: El vostre navegador no és compatible amb unicode, si us plau canvieu-lo abans d'editar cap pàgina: els caràcters que no són ASCII apareixeran en el quadre d'edició com a codis hexadecimals.</strong>",
-'editingold'                       => '<strong>AV�S: Esteu editant una revisió desactualitzada de la pàgina.
-Si la deseu, es perdran els canvis que hàgiu fet des de llavors.</strong>',
+'nonunicodebrowser'                => "'''ALERTA: El vostre navegador no és compatible amb unicode, si us plau canvieu-lo abans d'editar cap pàgina: els caràcters que no són ASCII apareixeran en el quadre d'edició com a codis hexadecimals.'''",
+'editingold'                       => "'''AV�S: Esteu editant una revisió desactualitzada de la pàgina.
+Si la deseu, es perdran els canvis que hàgiu fet des de llavors.'''",
 'yourdiff'                         => 'Diferències',
 'copyrightwarning'                 => "Si us plau, tingueu en compte que totes les contribucions per al projecte {{SITENAME}} es consideren com a publicades sota els termes de la llicència $2 (vegeu-ne més detalls a $1). Si no desitgeu la modificació i distribució lliure dels vostres escrits sense el vostre consentiment, no els poseu ací.<br />
-A més a més, en enviar el vostre text, doneu fe que és vostra l'autoria, o bé de fonts en el domini públic o recursos lliures similars. Heu de saber que aquest <strong>no</strong> és el cas de la majoria de pàgines que hi ha a Internet.
-<strong>No feu servir textos amb drets d'autor sense permís!</strong>",
+A més a més, en enviar el vostre text, doneu fe que és vostra l'autoria, o bé de fonts en el domini públic o recursos lliures similars. Heu de saber que aquest '''no''' és el cas de la majoria de pàgines que hi ha a Internet.
+'''No feu servir textos amb drets d'autor sense permís!'''",
 'copyrightwarning2'                => "Si us plau, tingueu en compte que totes les contribucions al projecte {{SITENAME}} poden ser corregides, alterades o esborrades per altres usuaris. Si no desitgeu la modificació i distribució lliure dels vostres escrits sense el vostre consentiment, no els poseu ací.<br />
 A més a més, en enviar el vostre text, doneu fe que és vostra l'autoria, o bé de fonts en el domini públic o altres recursos lliures similars (consulteu $1 per a més detalls).
-<strong>No feu servir textos amb drets d'autor sense permís!</strong>",
-'longpagewarning'                  => "<strong>ATENCIÓ: Aquesta pàgina fa $1 kB; hi ha navegadors que poden presentar problemes editant pàgines que s'acostin o sobrepassin els 32 kB. Intenteu, si és possible, dividir la pàgina en seccions més petites.</strong>",
-'longpageerror'                    => '<strong>ERROR: El text que heu introduït és de $1 kB i  sobrepassa el màxim permès de $2 kB. Per tant, no es desarà.</strong>',
-'readonlywarning'                  => '<strong>ADVERTÈNCIA: La base de dades està tancada per manteniment
-i no podeu desar les vostres contribucions en aquests moments. podeu retallar i enganxar el codi
-en un fitxer de text i desar-lo més tard.</strong>',
-'protectedpagewarning'             => '<strong>ATENCIÓ: Aquesta pàgina està bloquejada i només pot ser editada per usuaris administradors.</strong>',
+'''No feu servir textos amb drets d'autor sense permís!'''",
+'longpagewarning'                  => "'''ATENCIÓ: Aquesta pàgina fa $1 kB; hi ha navegadors que poden presentar problemes editant pàgines que s'acostin o sobrepassin els 32 kB. Intenteu, si és possible, dividir la pàgina en seccions més petites.'''",
+'longpageerror'                    => "'''ERROR: El text que heu introduït és de $1 kB i  sobrepassa el màxim permès de $2 kB. Per tant, no es desarà.'''",
+'readonlywarning'                  => "'''ADVERTÈNCIA: La base de dades està tancada per manteniment
+i no podeu desar les vostres contribucions en aquests moments. Podeu retallar i enganxar el codi
+en un fitxer de text i desar-lo més tard.'''
+
+L'administrador que l'ha tancada n'ha donat aquesta justificació: $1",
+'protectedpagewarning'             => "'''ATENCIÓ: Aquesta pàgina està bloquejada i només pot ser editada per usuaris administradors.'''",
 'semiprotectedpagewarning'         => "'''Atenció:''' Aquesta pàgina està bloquejada i només pot ser editada per usuaris registrats.",
 'cascadeprotectedwarning'          => "'''Atenció:''' Aquesta pàgina està protegida de forma que només la poden editar els administradors, ja que està inclosa a {{PLURAL:$1|la següent pàgina|les següents pàgines}} amb l'opció de «protecció en cascada» activada:",
-'titleprotectedwarning'            => '<strong>ATENCIÓ: Aquesta pàgina està protegida de tal manera que només certs usuaris poden crear-la.</strong>',
+'titleprotectedwarning'            => "'''ATENCIÓ: Aquesta pàgina està protegida de tal manera que es necessiten uns [[Special:ListGroupRights|drets específics]] per a poder crear-la.'''",
 'templatesused'                    => 'Aquesta pàgina fa servir les següents plantilles:',
 'templatesusedpreview'             => 'Plantilles usades en aquesta previsualització:',
 'templatesusedsection'             => 'Plantilles usades en aquesta secció:',
@@ -769,11 +800,22 @@ Podeu editar les planes ja existents o bé [[Special:UserLogin|entrar en un comp
 
 Hauríeu de considerar si és realment necessari continuar editant aquesta pàgina.
 A continuació s'ofereix el registre d'esborraments de la pàgina:",
+'deleted-notice'                   => "Aquesta pàgina ha estat esborrada.
+A continuació us mostrem com a referència el registre d'esborraments de la pàgina.",
+'deletelog-fulllog'                => 'Veure tot el registre',
+'edit-hook-aborted'                => "Edició avortada pel hook.
+No s'ha donat cap explicació.",
+'edit-gone-missing'                => "No s'ha pogut actualitzar la pàgina.
+Sembla haver estat esborrada.",
+'edit-conflict'                    => "Conflicte d'edició.",
+'edit-no-change'                   => 'La vostra edició ha estat ignorada perquè no feia cap canvi al text.',
+'edit-already-exists'              => "No s'ha pogut crear una pàgina.
+Ja existeix.",
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Atenció: Aquesta pàgina conté massa crides a funcions parserfunction complexes.
 
-Actualment hi ha $1 crides i n'haurien de ser menys de $2.",
+Actualment n'hi ha {{PLURAL:$1|$1|$1}} i, com a molt, {{PLURAL:$2|hauria|haurien}} de ser $2.",
 'expensive-parserfunction-category'       => 'Pàgines amb massa crides de parser function',
 'post-expand-template-inclusion-warning'  => "Avís: La mida d'inclusió de la plantilla és massa gran.
 No s'inclouran algunes plantilles.",
@@ -781,6 +823,8 @@ No s'inclouran algunes plantilles.",
 'post-expand-template-argument-warning'   => "Avís: Aquesta pàgina conté com a mínim un argument de plantilla que té una mida d'expansió massa llarga.
 Se n'han omès els arguments.",
 'post-expand-template-argument-category'  => "Pàgines que contenen arguments de plantilla que s'han omès",
+'parser-template-loop-warning'            => "S'ha detectat un bucle de plantilla: [[$1]]",
+'parser-template-recursion-depth-warning' => "S'ha excedit el límit de recursivitat de plantilles ($1)",
 
 # "Undo" feature
 'undo-success' => "Pot desfer-se la modificació. Si us plau, reviseu la comparació de sota per a assegurar-vos que és el que voleu fer; llavors deseu els canvis per a finalitzar la desfeta de l'edició.",
@@ -795,29 +839,28 @@ Se n'han omès els arguments.",
 El motiu donat per $3 és ''$2''",
 
 # History pages
-'viewpagelogs'        => "Visualitza els registres d'aquesta pàgina",
-'nohistory'           => 'No hi ha un historial de revisions per a aquesta pàgina.',
-'revnotfound'         => 'Revisió no trobada',
-'revnotfoundtext'     => "No s'ha pogut trobar la revisió antiga de la pàgina que demanàveu.
-Reviseu l'URL que heu emprat per a accedir-hi.",
-'currentrev'          => 'Revisió actual',
-'revisionasof'        => 'Revisió de $1',
-'revision-info'       => 'Revisió de $1; $2',
-'previousrevision'    => '�Versió més antiga',
-'nextrevision'        => 'Versió més nova→',
-'currentrevisionlink' => 'Versió actual',
-'cur'                 => 'act',
-'next'                => 'seg',
-'last'                => 'prev',
-'page_first'          => 'primera',
-'page_last'           => 'última',
-'histlegend'          => 'Simbologia: (act) = diferència amb la versió actual,
+'viewpagelogs'           => "Visualitza els registres d'aquesta pàgina",
+'nohistory'              => 'No hi ha un historial de revisions per a aquesta pàgina.',
+'currentrev'             => 'Revisió actual',
+'currentrev-asof'        => 'Revisió de $1',
+'revisionasof'           => 'Revisió de $1',
+'revision-info'          => 'Revisió de $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Versió més antiga',
+'nextrevision'           => 'Versió més nova→',
+'currentrevisionlink'    => 'Versió actual',
+'cur'                    => 'act',
+'next'                   => 'seg',
+'last'                   => 'prev',
+'page_first'             => 'primera',
+'page_last'              => 'última',
+'histlegend'             => 'Simbologia: (act) = diferència amb la versió actual,
 (prev) = diferència amb la versió anterior, m = edició menor',
-'deletedrev'          => '[suprimit]',
-'histfirst'           => 'El primer',
-'histlast'            => 'El darrer',
-'historysize'         => '({{PLURAL:$1|1 octet|$1 octets}})',
-'historyempty'        => '(buit)',
+'history-fieldset-title' => "Cerca a l'historial",
+'deletedrev'             => '[suprimit]',
+'histfirst'              => 'El primer',
+'histlast'               => 'El darrer',
+'historysize'            => '({{PLURAL:$1|1 octet|$1 octets}})',
+'historyempty'           => '(buit)',
 
 # Revision feed
 'history-feed-title'          => 'Historial de revisió',
@@ -900,6 +943,7 @@ Assegureu-vos que aquest canvi mantindrà la continuïtat històrica de la pàgi
 'mergehistory-invalid-destination' => 'La pàgina de destinació ha de tenir un títol vàlid.',
 'mergehistory-autocomment'         => '[[:$1]] fusionat en [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fusionat en [[:$2]]: $3',
+'mergehistory-same-destination'    => "Les pàgines d'origen i de destinació no poden ser la mateixa",
 
 # Merge log
 'mergelog'           => 'Registre de fusions',
@@ -912,119 +956,200 @@ Assegureu-vos que aquest canvi mantindrà la continuïtat històrica de la pàgi
 'difference'              => '(Diferència entre revisions)',
 'lineno'                  => 'Línia $1:',
 'compareselectedversions' => 'Compara les versions seleccionades',
+'visualcomparison'        => 'Comparació visual',
+'wikicodecomparison'      => 'Comparació del text en format wiki',
 'editundo'                => 'desfés',
 'diff-multi'              => '(Hi ha {{PLURAL:$1|una revisió intermèdia|$1 revisions intermèdies}})',
+'diff-movedto'            => 'mogut a $1',
+'diff-styleadded'         => 'estil $1 afegit',
+'diff-added'              => '$1 afegit',
+'diff-changedto'          => 'canviat a $1',
+'diff-movedoutof'         => 'mogut des de $1',
+'diff-styleremoved'       => 'estil $1 eliminat',
+'diff-removed'            => '$1 eliminat',
+'diff-changedfrom'        => 'canviat de $1',
+'diff-src'                => 'origen',
+'diff-withdestination'    => 'amb destinació $1',
+'diff-with'               => '&#32;amb $1 $2',
+'diff-with-final'         => '&#32;i $1 $2',
+'diff-width'              => 'amplada',
+'diff-height'             => 'alçada',
+'diff-p'                  => "un '''paràgraf'''",
+'diff-blockquote'         => "una '''citació'''",
+'diff-h1'                 => "una '''capçalera (nivell 1)'''",
+'diff-h2'                 => "una '''capçalera (nivell 2)'''",
+'diff-h3'                 => "una '''capçalera (nivell 3)'''",
+'diff-h4'                 => "una '''capçalera (nivell 4)'''",
+'diff-h5'                 => "una '''capçalera (nivell 5)'''",
+'diff-pre'                => "un '''bloc preformatat'''",
+'diff-div'                => "una '''bloc de divisió'''",
+'diff-ul'                 => "una '''llista no ordenada'''",
+'diff-ol'                 => "una '''llista ordenada'''",
+'diff-li'                 => "un '''element de la llista'''",
+'diff-table'              => "una '''taula'''",
+'diff-tbody'              => "un '''contingut de taula'''",
+'diff-tr'                 => "una '''fila'''",
+'diff-td'                 => "una '''ceŀla'''",
+'diff-th'                 => "una '''capçalera'''",
+'diff-br'                 => "un '''salt de línia'''",
+'diff-hr'                 => "una '''línia horitzontal'''",
+'diff-code'               => "un '''bloc de codi informàtic'''",
+'diff-dl'                 => "una '''llista de definicions'''",
+'diff-dt'                 => "un '''terme de definició'''",
+'diff-dd'                 => "una '''definició'''",
+'diff-input'              => "un '''''input'''''",
+'diff-form'               => "un '''formulari'''",
+'diff-img'                => "una '''imatge'''",
+'diff-span'               => "un '''''span'''''",
+'diff-a'                  => "un '''enllaç'''",
+'diff-i'                  => "'''cursiva'''",
+'diff-b'                  => "'''negreta'''",
+'diff-strong'             => "'''fort'''",
+'diff-em'                 => "'''èmfasi'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''gran'''",
+'diff-del'                => "'''esborrat'''",
+'diff-tt'                 => "'''monoespaiat'''",
+'diff-sub'                => "'''subíndex'''",
+'diff-sup'                => "'''superíndex'''",
+'diff-strike'             => "'''barrat'''",
 
 # Search results
-'searchresults'             => 'Resultats de la cerca',
-'searchresulttext'          => 'Per a més informació de les cerques del projecte {{SITENAME}}, aneu a [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Heu cercat '''[[:$1]]'''  ([[Special:Prefixindex/$1|totes les pàgines que comencen amb «$1»]] | [[Special:WhatLinksHere/$1|totes les pàgines que enllacen amb «$1»]])",
-'searchsubtitleinvalid'     => "Heu cercat '''$1'''",
-'noexactmatch'              => "'''No hi ha cap pàgina anomenada «$1».''' Si voleu, podeu ajudar [[:$1|creant-la]].",
-'noexactmatch-nocreate'     => "'''No hi ha cap pàgina amb títol «$1».'''",
-'toomanymatches'            => "S'han retornat masses coincidències. Proveu-ho amb una consulta diferent.",
-'titlematches'              => 'Coincidències de títol de la pàgina',
-'notitlematches'            => 'No hi ha cap coincidència de títol de pàgina',
-'textmatches'               => 'Coincidències de text de pàgina',
-'notextmatches'             => 'No hi ha cap coincidència de text de pàgina',
-'prevn'                     => '$1 anteriors',
-'nextn'                     => '$1 següents',
-'viewprevnext'              => 'Vés a ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 paraula|$2 paraules}})',
-'search-result-score'       => 'Rellevància: $1%',
-'search-redirect'           => '(redirigeix a $1)',
-'search-section'            => '(secció $1)',
-'search-suggest'            => 'Volíeu dir: $1',
-'search-interwiki-caption'  => 'Projectes germans',
-'search-interwiki-default'  => '$1 resultats:',
-'search-interwiki-more'     => '(més)',
-'search-mwsuggest-enabled'  => 'amb suggeriments',
-'search-mwsuggest-disabled' => 'cap suggeriment',
-'search-relatedarticle'     => 'Relacionat',
-'mwsuggest-disable'         => 'Inhabilita els suggeriments en AJAX',
-'searchrelated'             => 'relacionat',
-'searchall'                 => 'tots',
-'showingresults'            => 'Tot seguit es {{PLURAL:$1|mostra el resultat|mostren els <b>$1</b> resultats començant pel número <b>$2</b>}}.',
-'showingresultsnum'         => 'Tot seguit es {{PLURAL:$3|llista el resultat|llisten els <b>$3</b> resultats començant pel número <b>$2</b>}}.',
-'showingresultstotal'       => "A continuació {{PLURAL:$3|es mostra el resultat '''$1''' de '''$3'''|es mostren els resultats '''$1 - $2''' de '''$3'''}}",
-'nonefound'                 => "'''Nota''': Només se cerca en alguns espais de noms per defecte. Proveu d'afegir el prefix ''all:'' a la vostra consulta per a cercar a tot el contingut (incloent-hi les pàgines de discussió, les plantilles, etc.), o feu servir l'espai de noms on vulgueu cercar com a prefix.",
-'powersearch'               => 'Cerca avançada',
-'powersearch-legend'        => 'Cerca avançada',
-'powersearch-ns'            => 'Cerca als espais de noms:',
-'powersearch-redir'         => 'Mostra redireccions',
-'powersearch-field'         => 'Cerca',
-'search-external'           => 'Cerca externa',
-'searchdisabled'            => 'La cerca dins el projecte {{SITENAME}} està inhabilitada. Mentrestant, podeu cercar a través de Google, però tingueu en compte que la seua base de dades no estarà actualitzada.',
+'searchresults'                    => 'Resultats de la cerca',
+'searchresults-title'              => 'Resultats de la recerca de «$1»',
+'searchresulttext'                 => 'Per a més informació de les cerques del projecte {{SITENAME}}, aneu a [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Heu cercat '''[[:$1]]'''  ([[Special:Prefixindex/$1|totes les pàgines que comencen amb «$1»]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|totes les pàgines que enllacen amb «$1»]])",
+'searchsubtitleinvalid'            => "Heu cercat '''$1'''",
+'noexactmatch'                     => "'''No hi ha cap pàgina anomenada «$1».''' Si voleu, podeu ajudar [[:$1|creant-la]].",
+'noexactmatch-nocreate'            => "'''No hi ha cap pàgina amb títol «$1».'''",
+'toomanymatches'                   => "S'han retornat masses coincidències. Proveu-ho amb una consulta diferent.",
+'titlematches'                     => 'Coincidències de títol de la pàgina',
+'notitlematches'                   => 'No hi ha cap coincidència de títol de pàgina',
+'textmatches'                      => 'Coincidències de text de pàgina',
+'notextmatches'                    => 'No hi ha cap coincidència de text de pàgina',
+'prevn'                            => '$1 anteriors',
+'nextn'                            => '$1 següents',
+'viewprevnext'                     => 'Vés a ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opcions de cerca',
+'searchmenu-exists'                => "'''Hi ha una pàgina anomenada «[[$1]]» en aquest wiki'''",
+'searchmenu-new'                   => "'''Creeu la pàgina «[[:$1]]» en aquest wiki!'''",
+'searchhelp-url'                   => 'Help:Ajuda',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Mostra pàgines amb aquest prefix]]',
+'searchprofile-articles'           => 'Pàgines de contingut',
+'searchprofile-articles-and-proj'  => 'Pàgines de contingut i de projecte',
+'searchprofile-project'            => 'Pàgines del projecte',
+'searchprofile-images'             => 'Fitxers',
+'searchprofile-everything'         => 'Tot',
+'searchprofile-advanced'           => 'Avançat',
+'searchprofile-articles-tooltip'   => 'Cerca a $1',
+'searchprofile-project-tooltip'    => 'Cerca a $1',
+'searchprofile-images-tooltip'     => 'Cerca fitxers',
+'searchprofile-everything-tooltip' => "Cerca tot tipus de contingut (s'hi inclouen pàgines de discussió)",
+'searchprofile-advanced-tooltip'   => 'Cerca als espais de noms predefinits',
+'prefs-search-nsdefault'           => 'Cerca usant paràmetres per defecte:',
+'prefs-search-nscustom'            => 'Cerca espais predefinits:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 paraula|$2 paraules}})',
+'search-result-score'              => 'Rellevància: $1%',
+'search-redirect'                  => '(redirigeix a $1)',
+'search-section'                   => '(secció $1)',
+'search-suggest'                   => 'Volíeu dir: $1',
+'search-interwiki-caption'         => 'Projectes germans',
+'search-interwiki-default'         => '$1 resultats:',
+'search-interwiki-more'            => '(més)',
+'search-mwsuggest-enabled'         => 'amb suggeriments',
+'search-mwsuggest-disabled'        => 'cap suggeriment',
+'search-relatedarticle'            => 'Relacionat',
+'mwsuggest-disable'                => 'Inhabilita els suggeriments en AJAX',
+'searchrelated'                    => 'relacionat',
+'searchall'                        => 'tots',
+'showingresults'                   => 'Tot seguit es {{PLURAL:$1|mostra el resultat|mostren els <b>$1</b> resultats començant pel número <b>$2</b>}}.',
+'showingresultsnum'                => 'Tot seguit es {{PLURAL:$3|llista el resultat|llisten els <b>$3</b> resultats començant pel número <b>$2</b>}}.',
+'showingresultstotal'              => "A continuació {{PLURAL:$4|es mostra el resultat '''$1''' de '''$3'''|es mostren els resultats '''$1 - $2''' de '''$3'''}}",
+'nonefound'                        => "'''Nota''': Només se cerca en alguns espais de noms per defecte. Proveu d'afegir el prefix ''all:'' a la vostra consulta per a cercar a tot el contingut (incloent-hi les pàgines de discussió, les plantilles, etc.), o feu servir l'espai de noms on vulgueu cercar com a prefix.",
+'search-nonefound'                 => 'No hi ha resultats que coincideixin amb la cerca.',
+'powersearch'                      => 'Cerca avançada',
+'powersearch-legend'               => 'Cerca avançada',
+'powersearch-ns'                   => 'Cerca als espais de noms:',
+'powersearch-redir'                => 'Mostra redireccions',
+'powersearch-field'                => 'Cerca',
+'search-external'                  => 'Cerca externa',
+'searchdisabled'                   => 'La cerca dins el projecte {{SITENAME}} està inhabilitada. Mentrestant, podeu cercar a través de Google, però tingueu en compte que la seua base de dades no estarà actualitzada.',
 
 # Preferences page
-'preferences'              => 'Preferències',
-'mypreferences'            => 'Preferències',
-'prefs-edits'              => "Nombre d'edicions:",
-'prefsnologin'             => 'No heu iniciat cap sessió',
-'prefsnologintext'         => 'Heu d\'estar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autenticats]</span> per a seleccionar les preferències d\'usuari.',
-'prefsreset'               => "Les preferències han estat respostes des d'emmagatzematge.",
-'qbsettings'               => 'Quickbar',
-'qbsettings-none'          => 'Cap',
-'qbsettings-fixedleft'     => 'Fixa a la esquerra',
-'qbsettings-fixedright'    => 'Fixa a la dreta',
-'qbsettings-floatingleft'  => "Surant a l'esquerra",
-'qbsettings-floatingright' => 'Surant a la dreta',
-'changepassword'           => 'Canvia la contrasenya',
-'skin'                     => 'Aparença',
-'math'                     => 'Com es mostren les fórmules',
-'dateformat'               => 'Format de la data',
-'datedefault'              => 'Cap preferència',
-'datetime'                 => 'Data i hora',
-'math_failure'             => "No s'ha pogut entendre",
-'math_unknown_error'       => 'error desconegut',
-'math_unknown_function'    => 'funció desconeguda',
-'math_lexing_error'        => 'error de lèxic',
-'math_syntax_error'        => 'error de sintaxi',
-'math_image_error'         => "Hi ha hagut una errada en la conversió cap el format PNG; verifiqueu la instaŀlació de ''latex'', ''dvips'', ''gs'' i ''convert''.",
-'math_bad_tmpdir'          => 'No ha estat possible crear el directori temporal de math o escriure-hi dins.',
-'math_bad_output'          => "No ha estat possible crear el directori d'eixida de math o escriure-hi dins.",
-'math_notexvc'             => "No s'ha trobat el fitxer executable ''texvc''; si us plau, vegeu math/README per a configurar-lo.",
-'prefs-personal'           => "Perfil d'usuari",
-'prefs-rc'                 => 'Canvis recents',
-'prefs-watchlist'          => 'Llista de seguiment',
-'prefs-watchlist-days'     => 'Nombre de dies per mostrar en la llista de seguiment:',
-'prefs-watchlist-edits'    => 'Nombre de modificacions a mostrar en una llista estesa de seguiment:',
-'prefs-misc'               => 'Altres preferències',
-'saveprefs'                => 'Desa les preferències',
-'resetprefs'               => 'Esborra els canvis no guardats',
-'oldpassword'              => 'Contrasenya antiga',
-'newpassword'              => 'Contrasenya nova',
-'retypenew'                => 'Torneu a escriure la nova contrasenya:',
-'textboxsize'              => 'Dimensions de la caixa de text',
-'rows'                     => 'Files',
-'columns'                  => 'Columnes',
-'searchresultshead'        => 'Preferències de la cerca',
-'resultsperpage'           => 'Resultats a mostrar per pàgina',
-'contextlines'             => 'Línies a mostrar per resultat',
-'contextchars'             => 'Caràcters de context per línia',
-'stub-threshold'           => 'Límit per a formatar l\'enllaç com <a href="#" class="stub">esborrany</a> (en octets):',
-'recentchangesdays'        => 'Dies a mostrar en els canvis recents:',
-'recentchangescount'       => 'Nombre de títols en canvis recents',
-'savedprefs'               => "S'han desat les vostres preferències",
-'timezonelegend'           => 'Fus horari',
-'timezonetext'             => "¹El nombre d'hores de diferència entre la vostra hora local i la del servidor (UTC).",
-'localtime'                => 'Hora local',
-'timezoneoffset'           => 'Diferència',
-'servertime'               => 'Hora del servidor',
-'guesstimezone'            => 'Omple-ho des del navegador',
-'allowemail'               => "Habilita el correu electrònic des d'altres usuaris",
-'prefs-searchoptions'      => 'Preferències de la cerca',
-'prefs-namespaces'         => 'Espais de noms',
-'defaultns'                => 'Busca per defecte en els següents espais de noms:',
-'default'                  => 'per defecte',
-'files'                    => 'Fitxers',
+'preferences'               => 'Preferències',
+'mypreferences'             => 'Preferències',
+'prefs-edits'               => "Nombre d'edicions:",
+'prefsnologin'              => 'No heu iniciat cap sessió',
+'prefsnologintext'          => 'Heu d\'estar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autenticats]</span> per a seleccionar les preferències d\'usuari.',
+'prefsreset'                => "Les preferències han estat respostes des d'emmagatzematge.",
+'qbsettings'                => 'Quickbar',
+'qbsettings-none'           => 'Cap',
+'qbsettings-fixedleft'      => 'Fixa a la esquerra',
+'qbsettings-fixedright'     => 'Fixa a la dreta',
+'qbsettings-floatingleft'   => "Surant a l'esquerra",
+'qbsettings-floatingright'  => 'Surant a la dreta',
+'changepassword'            => 'Canvia la contrasenya',
+'skin'                      => 'Aparença',
+'skin-preview'              => 'prova',
+'math'                      => 'Com es mostren les fórmules',
+'dateformat'                => 'Format de la data',
+'datedefault'               => 'Cap preferència',
+'datetime'                  => 'Data i hora',
+'math_failure'              => "No s'ha pogut entendre",
+'math_unknown_error'        => 'error desconegut',
+'math_unknown_function'     => 'funció desconeguda',
+'math_lexing_error'         => 'error de lèxic',
+'math_syntax_error'         => 'error de sintaxi',
+'math_image_error'          => "Hi ha hagut una errada en la conversió cap el format PNG; verifiqueu la instaŀlació de ''latex'', ''dvips'', ''gs'' i ''convert''.",
+'math_bad_tmpdir'           => 'No ha estat possible crear el directori temporal de math o escriure-hi dins.',
+'math_bad_output'           => "No ha estat possible crear el directori d'eixida de math o escriure-hi dins.",
+'math_notexvc'              => "No s'ha trobat el fitxer executable ''texvc''; si us plau, vegeu math/README per a configurar-lo.",
+'prefs-personal'            => "Perfil d'usuari",
+'prefs-rc'                  => 'Canvis recents',
+'prefs-watchlist'           => 'Llista de seguiment',
+'prefs-watchlist-days'      => 'Nombre de dies per mostrar en la llista de seguiment:',
+'prefs-watchlist-days-max'  => '(màxim set dies)',
+'prefs-watchlist-edits'     => 'Nombre de modificacions a mostrar en una llista estesa de seguiment:',
+'prefs-watchlist-edits-max' => '(nombre màxim: 1000)',
+'prefs-misc'                => 'Altres preferències',
+'prefs-resetpass'           => 'Canvia la contrasenya',
+'saveprefs'                 => 'Desa les preferències',
+'resetprefs'                => 'Esborra els canvis no guardats',
+'textboxsize'               => "Caixa d'edició",
+'prefs-edit-boxsize'        => "Mida de la finestra d'edició.",
+'rows'                      => 'Files',
+'columns'                   => 'Columnes',
+'searchresultshead'         => 'Preferències de la cerca',
+'resultsperpage'            => 'Resultats a mostrar per pàgina',
+'contextlines'              => 'Línies a mostrar per resultat',
+'contextchars'              => 'Caràcters de context per línia',
+'stub-threshold'            => 'Límit per a formatar l\'enllaç com <a href="#" class="stub">esborrany</a> (en octets):',
+'recentchangesdays'         => 'Dies a mostrar en els canvis recents:',
+'recentchangesdays-max'     => '(màxim $1 {{PLURAL:$1|dia|dies}})',
+'recentchangescount'        => "Nombre d'edicions a mostrar per defecte als canvis recents, historials de pàgina i registres:",
+'savedprefs'                => "S'han desat les vostres preferències",
+'timezonelegend'            => 'Fus horari',
+'timezonetext'              => "¹El nombre d'hores de diferència entre la vostra hora local i la del servidor (UTC).",
+'localtime'                 => 'Hora local:',
+'timezoneselect'            => 'Zona horària:',
+'timezoneuseserverdefault'  => 'Usa hora del servidor',
+'timezoneuseoffset'         => 'Altres (especifiqueu la diferència)',
+'timezoneoffset'            => 'Diferència¹:',
+'servertime'                => 'Hora del servidor:',
+'guesstimezone'             => 'Omple-ho des del navegador',
+'allowemail'                => "Habilita el correu electrònic des d'altres usuaris",
+'prefs-searchoptions'       => 'Preferències de la cerca',
+'prefs-namespaces'          => 'Espais de noms',
+'defaultns'                 => 'Busca per defecte en els següents espais de noms:',
+'default'                   => 'per defecte',
+'files'                     => 'Fitxers',
 
 # User rights
 'userrights'                  => "Gestió dels permisos d'usuari", # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => "Gestiona els grups d'usuari",
 'userrights-user-editname'    => "Introduïu un nom d'usuari:",
 'editusergroup'               => "Edita els grups d'usuaris",
-'editinguser'                 => "S'està canviant els permisos de l'usuari '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "S'està canviant els permisos de l'usuari '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Edita els grups d'usuaris",
 'saveusergroups'              => "Desa els grups d'usuari",
 'userrights-groupsmember'     => 'Membre de:',
@@ -1073,6 +1198,8 @@ Assegureu-vos que aquest canvi mantindrà la continuïtat històrica de la pàgi
 'right-minoredit'            => 'Marcar les edicions com a menors',
 'right-move'                 => 'Moure pàgines',
 'right-move-subpages'        => 'Moure pàgines amb les seves subpàgines',
+'right-move-rootuserpages'   => "Moure pàgines d'usuari root",
+'right-movefile'             => 'Moure fitxers',
 'right-suppressredirect'     => 'No crear redireccions quan es reanomena una pàgina',
 'right-upload'               => 'Carregar fitxers',
 'right-reupload'             => "Carregar al damunt d'un fitxer existent",
@@ -1123,9 +1250,46 @@ Assegureu-vos que aquest canvi mantindrà la continuïtat històrica de la pàgi
 'rightslogentry' => "heu modificat els drets de l'usuari «$1» del grup $2 al de $3",
 'rightsnone'     => '(cap)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'llegir aquesta pàgina',
+'action-edit'                 => 'editar aquesta pàgina',
+'action-createpage'           => 'crear pàgines',
+'action-createtalk'           => 'crear pàgines de discussió',
+'action-createaccount'        => "crear aquest compte d'usuari",
+'action-minoredit'            => 'marcar aquesta edició com a menor',
+'action-move'                 => 'moure aquesta pàgina',
+'action-move-subpages'        => 'moure aquesta pàgina, i llurs subpàgines',
+'action-move-rootuserpages'   => "moure pàgines d'usuari root",
+'action-movefile'             => 'moure aquest fitxer',
+'action-upload'               => 'carregar aquest fitxer',
+'action-reupload'             => 'substituir aquest fitxer',
+'action-reupload-shared'      => 'substituir aquest fitxer en un dipòsit compartit',
+'action-upload_by_url'        => "carregar aquest fitxer des d'una adreça URL",
+'action-writeapi'             => "fer servir l'API d'escriptura",
+'action-delete'               => 'esborrar aquesta pàgina',
+'action-deleterevision'       => 'esborrar aquesta revisió',
+'action-deletedhistory'       => "visualitzar l'historial esborrat d'aquesta pàgina",
+'action-browsearchive'        => 'cercar pàgines esborrades',
+'action-undelete'             => 'recuperar aquesta pàgina',
+'action-suppressrevision'     => 'revisar i recuperar aquesta revisió oculta',
+'action-suppressionlog'       => 'visualitzar aquest registre privat',
+'action-block'                => 'blocar aquest usuari per a què no pugui editar',
+'action-protect'              => "canviar els nivells de protecció d'aquesta pàgina",
+'action-import'               => "importar aquesta pàgina des d'un altre wiki",
+'action-importupload'         => "importar aquesta pàgina mitjançant la càrrega des d'un fitxer",
+'action-patrol'               => 'marcar les edicions dels altres com a supervisades',
+'action-autopatrol'           => 'marcar les vostres edicions com a supervisades',
+'action-unwatchedpages'       => 'visualitzar la llista de pàgines no vigilades',
+'action-trackback'            => 'enviar una referència',
+'action-mergehistory'         => "fusionar l'historial d'aquesta pàgina",
+'action-userrights'           => "modificar tots els permisos d'usuari",
+'action-userrights-interwiki' => "modificar permisos d'usuari en altres wikis",
+'action-siteadmin'            => 'bloquejar o desbloquejar la base de dades',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|canvi|canvis}}',
 'recentchanges'                     => 'Canvis recents',
+'recentchanges-legend'              => 'Opcions de canvis recents',
 'recentchangestext'                 => 'Seguiu els canvis recents del projecte {{SITENAME}} en aquesta pàgina.',
 'recentchanges-feed-description'    => 'Segueix en aquest canal els canvis més recents del wiki.',
 'rcnote'                            => 'A continuació hi ha {{PLURAL:$1|el darrer canvi|els darrers <strong>$1</strong> canvis}} en {{PLURAL:$2|el darrer dia|els darrers <strong>$2</strong> dies}}, actualitzats a les $5 del $4.',
@@ -1149,6 +1313,8 @@ Assegureu-vos que aquest canvi mantindrà la continuïtat històrica de la pàgi
 'rc_categories'                     => 'Limita a les categories (separades amb "|")',
 'rc_categories_any'                 => 'Qualsevol',
 'newsectionsummary'                 => '/* $1 */ secció nova',
+'rc-enhanced-expand'                => 'Mostra detalls (requereix JavaScript)',
+'rc-enhanced-hide'                  => 'Amagar detalls',
 
 # Recent changes linked
 'recentchangeslinked'          => "Seguiment d'enllaços",
@@ -1171,11 +1337,11 @@ per a penjar-hi fitxers.",
 'upload_directory_read_only'  => 'El servidor web no pot escriure al directori de càrrega ($1)',
 'uploaderror'                 => "S'ha produït un error en l'intent de carregar",
 'uploadtext'                  => "Feu servir el formulari de sota per a carregar fitxers.
-Per a visualitzar o cercar fitxers que s'hagen carregat prèviament, aneu a la [[Special:ImageList|llista de fitxers carregats]]. Les càrregues es registren en el [[Special:Log/upload|registre de càrregues]] i els fitxers esborrats en el [[Special:Log/delete|registre d'esborrats]].
+Per a visualitzar o cercar fitxers que s'hagen carregat prèviament, aneu a la [[Special:FileList|llista de fitxers carregats]]. Les càrregues es registren en el [[Special:Log/upload|registre de càrregues]] i els fitxers esborrats en el [[Special:Log/delete|registre d'esborrats]].
 
 Per a incloure una imatge en una pàgina, feu un enllaç en una de les formes següents:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fitxer.jpg]]</nowiki></tt>''' per a usar la versió completa del fitxer;
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fitxer.png|200px|thumb|esquerra|text alternatiu]]</nowiki></tt>''' per una presentació de 200 píxels d'amplada en un requadre justificat a l'esquerra amb «text alternatiu» com a descripció;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fitxer.jpg]]</nowiki></tt>''' per a usar la versió completa del fitxer;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fitxer.png|200px|thumb|esquerra|text alternatiu]]</nowiki></tt>''' per una presentació de 200 píxels d'amplada en un requadre justificat a l'esquerra amb «text alternatiu» com a descripció;
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fitxer.ogg]]</nowiki></tt>''' per a enllaçar directament amb un fitxer de so.",
 'upload-permitted'            => 'Tipus de fitxer permesos: $1.',
 'upload-preferred'            => 'Tipus de fitxer preferits: $1.',
@@ -1183,7 +1349,7 @@ Per a incloure una imatge en una pàgina, feu un enllaç en una de les formes se
 'uploadlog'                   => 'registre de càrregues',
 'uploadlogpage'               => 'Registre de càrregues',
 'uploadlogpagetext'           => "A sota hi ha una llista dels fitxers que s'han carregat més recentment.
-Vegeu la [[Special:NewImages|galeria de nous fitxers]] per a una presentació més visual.",
+Vegeu la [[Special:NewFiles|galeria de nous fitxers]] per a una presentació més visual.",
 'filename'                    => 'Nom de fitxer',
 'filedesc'                    => 'Resum',
 'fileuploadsummary'           => 'Resum:',
@@ -1203,22 +1369,24 @@ Vegeu la [[Special:NewImages|galeria de nous fitxers]] per a una presentació mÃ
 'large-file'                  => 'Els fitxers importants no haurien de ser més grans de $1; aquest fitxer ocupa $2.',
 'largefileserver'             => 'Aquest fitxer és més gran del que el servidor permet.',
 'emptyfile'                   => 'El fitxer que heu carregat sembla estar buit. Açò por ser degut a un mal caràcter en el nom del fitxer. Si us plau, reviseu si realment voleu carregar aquest arxiu.',
-'fileexists'                  => 'Ja hi existeix un fitxer amb aquest nom, si us plau, verifiqueu <strong><tt>$1</tt></strong> si no esteu segurs de voler substituir-lo.',
-'filepageexists'              => "La pàgina de descripció d'aquest fitxer ja ha estat creada (<strong><tt>$1</tt></strong>), però de moment no hi ha cap arxiu amb aquest nom. La descripció que heu posat no apareixerà a la pàgina de descripció. Si voleu que hi aparegui haureu d'editar-la manualment.",
-'fileexists-extension'        => 'Ja existeix un fitxer amb un nom semblant:<br />
-Nom del fitxer que es puja: <strong><tt>$1</tt></strong><br />
-Nom del fitxer existent: <strong><tt>$2</tt></strong><br />
-Si us plau, trieu un nom diferent.',
+'fileexists'                  => "Ja hi existeix un fitxer amb aquest nom, si us plau, verifiqueu '''<tt>$1</tt>''' si no esteu segurs de voler substituir-lo.",
+'filepageexists'              => "La pàgina de descripció d'aquest fitxer ja ha estat creada ('''<tt>$1</tt>'''), però de moment no hi ha cap arxiu amb aquest nom. La descripció que heu posat no apareixerà a la pàgina de descripció. Si voleu que hi aparegui haureu d'editar-la manualment.",
+'fileexists-extension'        => "Ja existeix un fitxer amb un nom semblant:<br />
+Nom del fitxer que es puja: '''<tt>$1</tt>'''<br />
+Nom del fitxer existent: '''<tt>$2</tt>'''<br />
+Si us plau, trieu un nom diferent.",
 'fileexists-thumb'            => "<center>'''Fitxer existent'''</center>",
-'fileexists-thumbnail-yes'    => 'Aquest fitxer sembla ser una imatge en mida reduïda (<em>miniatura</em>). Comproveu si us plau el fitxer <strong><tt>$1</tt></strong>.<br />
-Si el fitxer és la mateixa imatge a mida original, no cal carregar cap miniatura més.',
-'file-thumbnail-no'           => 'El nom del fitxer comença per <strong><tt>$1</tt></strong>.
-Sembla ser una imatge de mida reduïda <i>(miniatura)</i>.
-Si teniu la imatge en resolució completa, pugeu-la, sinó mireu de canviar-li el nom, si us plau.',
-'fileexists-forbidden'        => 'Ja hi existeix un fitxer amb aquest nom; si us plau, torneu enrere i carregueu aquest fitxer sota un altre nom. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Aquest fitxer sembla ser una imatge en mida reduïda (<em>miniatura</em>). Comproveu si us plau el fitxer '''<tt>$1</tt>'''.<br />
+Si el fitxer és la mateixa imatge a mida original, no cal carregar cap miniatura més.",
+'file-thumbnail-no'           => "El nom del fitxer comença per '''<tt>$1</tt>'''.
+Sembla ser una imatge de mida reduïda ''(miniatura)''.
+Si teniu la imatge en resolució completa, pugeu-la, sinó mireu de canviar-li el nom, si us plau.",
+'fileexists-forbidden'        => 'Ja hi existeix un fitxer amb aquest nom i no es pot sobreescriure.
+Si us plau, torneu enrere i carregueu aquest fitxer sota un altre nom. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Ja hi ha un fitxer amb aquest nom al fons comú de fitxers.
-Si us plau, si encara desitgeu carregar el vostre fitxer, torneu enrera i carregueu-ne una còpia amb un altre nom. [[Image:$1|thumb|center|$1]]',
+Si us plau, si encara desitgeu carregar el vostre fitxer, torneu enrera i carregueu-ne una còpia amb un altre nom. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Aquest fitxer és un duplicat {{PLURAL:$1|del fitxer |dels següents fitxers:}}',
+'file-deleted-duplicate'      => "Un fitxer idèntic a aquest ([[$1]]) ha estat esborrat amb anterioritat. Hauríeu de comprovar el registre d'esborrat del fitxer abans de tornar-lo a carregar.",
 'successfulupload'            => "El fitxer s'ha carregat amb èxit",
 'uploadwarning'               => 'Avís de càrrega',
 'savefile'                    => 'Desa el fitxer',
@@ -1238,7 +1406,7 @@ Si us plau, si encara desitgeu carregar el vostre fitxer, torneu enrera i carreg
 
 Hauríeu de considerar si és realment adequat continuar carregant aquest fitxer, perquè potser també acaba eliminat.
 A continuació teniu el registre d'eliminació per a que pugueu comprovar els motius que van portar a la seua eliminació:",
-'filename-bad-prefix'         => 'El nom del fitxer que esteu penjant comença amb <strong>«$1»</strong>, que és un nom no descriptiu que les càmeres digitals normalment assignen de forma automàtica. Trieu un de més descriptiu per al vostre fitxer.',
+'filename-bad-prefix'         => "El nom del fitxer que esteu penjant comença amb '''«$1»''', que és un nom no descriptiu que les càmeres digitals normalment assignen de forma automàtica. Trieu un de més descriptiu per al vostre fitxer.",
 
 'upload-proto-error'      => 'El protocol és incorrecte',
 'upload-proto-error-text' => 'Per a les càrregues remotes cal que els URL comencin amb <code>http://</code> o <code>ftp://</code>.',
@@ -1259,20 +1427,21 @@ A continuació teniu el registre d'eliminació per a que pugueu comprovar els mo
 'upload_source_url'  => ' (un URL vàlid i accessible públicament)',
 'upload_source_file' => ' (un fitxer en el vostre ordinador)',
 
-# Special:ImageList
-'imagelist-summary'     => "Aquesta pàgina especial mostra tots els fitxers carregats.
+# Special:ListFiles
+'listfiles-summary'     => "Aquesta pàgina especial mostra tots els fitxers carregats.
 Per defecte, els darrers en ser carregats apareixen al principi de la llista.
 Clicant al capdamunt de les columnes podeu canviar-ne l'ordenació.",
-'imagelist_search_for'  => "Cerca el nom d'un fitxer de medis:",
+'listfiles_search_for'  => "Cerca el nom d'un fitxer de medis:",
 'imgfile'               => 'fitxer',
-'imagelist'             => 'Llista de fitxers',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nom',
-'imagelist_user'        => 'Usuari',
-'imagelist_size'        => 'Mida (octets)',
-'imagelist_description' => 'Descripció',
-
-# Image description page
+'listfiles'             => 'Llista de fitxers',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nom',
+'listfiles_user'        => 'Usuari',
+'listfiles_size'        => 'Mida (octets)',
+'listfiles_description' => 'Descripció',
+'listfiles_count'       => 'Versions',
+
+# File description page
 'filehist'                       => 'Historial del fitxer',
 'filehist-help'                  => 'Cliqueu una data/hora per veure el fitxer tal com era aleshores.',
 'filehist-deleteall'             => 'elimina-ho tot',
@@ -1280,19 +1449,25 @@ Clicant al capdamunt de les columnes podeu canviar-ne l'ordenació.",
 'filehist-revert'                => 'reverteix',
 'filehist-current'               => 'actual',
 'filehist-datetime'              => 'Data/hora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura per a la versió de $1',
+'filehist-nothumb'               => 'Sense miniatura',
 'filehist-user'                  => 'Usuari',
 'filehist-dimensions'            => 'Dimensions',
 'filehist-filesize'              => 'Mida del fitxer',
 'filehist-comment'               => 'Comentari',
 'imagelinks'                     => 'Enllaços a la imatge',
 'linkstoimage'                   => '{{PLURAL:$1|La següent pàgina enllaça|Les següents pàgines enllacen}} a aquesta imatge:',
+'linkstoimage-more'              => "Hi ha més de $1 {{PLURAL:$1|pàgina que enllaça|pàgines que enllaçen}} a aquest fitxer.
+La següent llista només mostra {{PLURAL:$1|la primera d'elles|les primeres $1 d'aquestes pàgines}}.
+Podeu consultar la [[Special:WhatLinksHere/$2|llista completa]].",
 'nolinkstoimage'                 => 'No hi ha pàgines que enllacin aquesta imatge.',
 'morelinkstoimage'               => 'Visualitza [[Special:WhatLinksHere/$1|més enllaços]] que porten al fitxer.',
 'redirectstofile'                => '{{PLURAL:$1|El fitxer següent redirigeix cap aquest fitxer|Els següents $1 fitxers redirigeixen cap aquest fitxer:}}',
-'duplicatesoffile'               => "{{PLURAL:$1|Aquest fitxer és un duplicat de|A continuació s'indiquen els $1 duplicats d'aquest fitxer:}}",
+'duplicatesoffile'               => "{{PLURAL:$1|Aquest fitxer és un duplicat del que apareix a continuació|A continuació s'indiquen els $1 duplicats d'aquest fitxer}} ([[Special:FileDuplicateSearch/$2|vegeu-ne més detalls]]):",
 'sharedupload'                   => 'Aquest fitxer està compartit i poden utilitzar-lo altres projectes.',
-'shareduploadwiki'               => 'Consulteu $1 per a més informació.',
-'shareduploadwiki-desc'          => 'La descripció a la $1 del repositori compartit es mostra a continuació.',
+'shareduploadwiki'               => 'Consulteu la $1 per a més informació.',
+'shareduploadwiki-desc'          => 'La $1 en el repositori compartit es mostra a continuació.',
 'shareduploadwiki-linktext'      => 'pàgina de descripció del fitxer',
 'shareduploadduplicate'          => "El fitxer és un duplicat de $1 d'un repositori compartit.",
 'shareduploadduplicate-linktext' => 'un altre fitxer',
@@ -1316,7 +1491,7 @@ Clicant al capdamunt de les columnes podeu canviar-ne l'ordenació.",
 # File deletion
 'filedelete'                  => 'Suprimeix $1',
 'filedelete-legend'           => 'Suprimeix el fitxer',
-'filedelete-intro'            => "Esteu eliminant '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Esteu eliminant el fitxer '''[[Media:$1|$1]]''' juntament amb el seu historial.",
 'filedelete-intro-old'        => "Esteu eliminant la versió de '''[[Media:$1|$1]]''' com de [$4 $3, $2].",
 'filedelete-comment'          => 'Comentari:',
 'filedelete-submit'           => 'Suprimeix',
@@ -1324,7 +1499,6 @@ Clicant al capdamunt de les columnes podeu canviar-ne l'ordenació.",
 'filedelete-success-old'      => "<span class=\"plainlinks\">La versió de '''[[Media:\$1|\$1]]''' s'ha eliminat el \$2 a les \$3.</span>",
 'filedelete-nofile'           => "'''$1''' no existeix.",
 'filedelete-nofile-old'       => "No hi ha cap versió arxivada de '''$1''' amb els atributs especificats.",
-'filedelete-iscurrent'        => "Esteu provant de suprimir la versió més recent d'aquest fitxer. Revertiu a una versió més antiga abans.",
 'filedelete-otherreason'      => 'Motius alternatius/addicionals:',
 'filedelete-reason-otherlist' => 'Altres motius',
 'filedelete-reason-dropdown'  => "*Motius d'eliminació comuns
@@ -1351,31 +1525,31 @@ Clicant al capdamunt de les columnes podeu canviar-ne l'ordenació.",
 
 # Random page
 'randompage'         => "Pàgina a l'atzar",
-'randompage-nopages' => "No hi ha cap pàgina en l'espai de noms.",
+'randompage-nopages' => "No hi ha cap pàgina en l'espai de noms «$1».",
 
 # Random redirect
 'randomredirect'         => "Redirecció a l'atzar",
-'randomredirect-nopages' => "No hi ha cap redirecció a l'espai de noms.",
+'randomredirect-nopages' => "No hi ha cap redirecció a l'espai de noms «$1».",
 
 # Statistics
-'statistics'             => 'Estadístiques',
-'sitestats'              => 'Estadístiques del lloc',
-'userstats'              => "Estadístiques d'usuari",
-'sitestatstext'          => "Hi ha {{PLURAL:$1|una única pàgina|un total de '''$1''' pàgines}} en la base de dades.
-Això inclou pàgines de discussió, pàgines sobre el projecte {{SITENAME}}, pàgines mínimes,
-redireccions, i altres que probablement no es poden classificar com a articles.
-Excloent-les, hi ha {{PLURAL:$2|una única pàgina que es pugui considerar article legítim|'''$2''' pàgines que probablement són articles legítims}}.
-
-S'{{PLURAL:$8|ha penjat un únic fitxer|han penjat '''$8''' fitxers}}.
-
-Hi ha hagut un total d{{PLURAL:$3|'una única visita|e '''$3''' visites}} a pàgines, i {{PLURAL:$4|una edició|'''$4''' edicions}} de pàgina
-des que el programari s'ha configurat.
-Això resulta en una mitjana {{PLURAL:$5|d'una edició|de '''$5''' edicions}} per pàgina,
-i {{PLURAL:$6|'''$6''' visita|'''$6''' visites}} per edició.
-
-La mida de la [http://www.mediawiki.org/wiki/Manual:Job_queue cua de treballs] és '''$7'''.",
-'userstatstext'          => "Hi ha {{PLURAL:$1|'''1''' usuari registrat i, a més,|'''$1''' usuaris registrats, dels quals}} {{PLURAL:$2|un (el '''$4%''') té|'''$2''' (el '''$4%''') tenen}} drets de: $5.",
-'statistics-mostpopular' => 'Pàgines més visualitzades',
+'statistics'                   => 'Estadístiques',
+'statistics-header-pages'      => 'Estadístiques de pàgines',
+'statistics-header-edits'      => "Estadístiques d'edicions",
+'statistics-header-views'      => 'Visualitza estadístiques',
+'statistics-header-users'      => "Estadístiques d'usuari",
+'statistics-articles'          => 'Pàgines de contingut',
+'statistics-pages'             => 'Pàgines',
+'statistics-pages-desc'        => 'Totes les pàgines del wiki, incloent les pàgines de discussió, redireccions, etc.',
+'statistics-files'             => 'Fitxers carregats',
+'statistics-edits'             => 'Edicions en pàgines des que el projecte {{SITENAME}} fou instaŀlat',
+'statistics-edits-average'     => 'Edicions per pàgina de mitjana',
+'statistics-views-total'       => 'Visualitzacions totals',
+'statistics-views-peredit'     => 'Visualitzacions per edició',
+'statistics-jobqueue'          => 'Longitud de la [http://www.mediawiki.org/wiki/Manual:Job_queue cua de treballs]',
+'statistics-users'             => '[[Special:ListUsers|Usuaris]] registrats',
+'statistics-users-active'      => 'Usuaris actius',
+'statistics-users-active-desc' => "Usuaris que han dut a terme alguna acció en {{PLURAL:$1|l'últim dia|els últims $1 dies}}",
+'statistics-mostpopular'       => 'Pàgines més visualitzades',
 
 'disambiguations'      => 'Pàgines de desambiguació',
 'disambiguationspage'  => 'Template:Desambiguació',
@@ -1420,26 +1594,30 @@ Cada fila conté enllaços a la segona i tercera redirecció, així com la prime
 'popularpages'            => 'Pàgines populars',
 'wantedcategories'        => 'Categories demanades',
 'wantedpages'             => 'Pàgines demanades',
-'missingfiles'            => 'Arxius que falten',
+'wantedfiles'             => 'Fitxers demanats',
+'wantedtemplates'         => 'Plantilles demanades',
 'mostlinked'              => 'Pàgines més enllaçades',
 'mostlinkedcategories'    => 'Categories més utilitzades',
 'mostlinkedtemplates'     => 'Plantilles més usades',
 'mostcategories'          => 'Pàgines que utilitzen més categories',
 'mostimages'              => 'Fitxers més enllaçats',
 'mostrevisions'           => 'Pàgines més modificades',
-'prefixindex'             => 'Cercar per prefix',
+'prefixindex'             => 'Totes les pàgines per prefix',
 'shortpages'              => 'Pàgines curtes',
 'longpages'               => 'Pàgines llargues',
 'deadendpages'            => 'Pàgines atzucac',
 'deadendpagestext'        => "Aquestes pàgines no tenen enllaços a d'altres pàgines del projecte {{SITENAME}}.",
 'protectedpages'          => 'Pàgines protegides',
 'protectedpages-indef'    => 'Només proteccions indefinides',
+'protectedpages-cascade'  => 'Només proteccions en cascada',
 'protectedpagestext'      => 'Les pàgines següents estan protegides perquè no es puguin editar o reanomenar',
 'protectedpagesempty'     => 'No hi ha cap pàgina protegida per ara',
 'protectedtitles'         => 'Títols protegits',
 'protectedtitlestext'     => 'Els títols següents estan protegits de crear-se',
 'protectedtitlesempty'    => 'No hi ha cap títol protegit actualment amb aquests paràmetres.',
 'listusers'               => "Llistat d'usuaris",
+'listusers-editsonly'     => 'Mostra només usuaris amb edicions',
+'usereditcount'           => '$1 {{PLURAL:$1|edició|edicions}}',
 'newpages'                => 'Pàgines noves',
 'newpages-username'       => "Nom d'usuari:",
 'ancientpages'            => 'Pàgines més antigues',
@@ -1460,14 +1638,13 @@ Cada fila conté enllaços a la segona i tercera redirecció, així com la prime
 'booksources-search-legend' => 'Cerca fonts de llibres',
 'booksources-go'            => 'Vés-hi',
 'booksources-text'          => "A sota hi ha una llista d'enllaços d'altres llocs que venen llibres nous i de segona mà, i també podrien tenir més informació dels llibres que esteu cercant:",
+'booksources-invalid-isbn'  => "El codi ISBN donat no és vàlid. Comproveu si l'heu copiat correctament.",
 
 # Special:Log
 'specialloguserlabel'  => 'Usuari:',
 'speciallogtitlelabel' => 'Títol:',
 'log'                  => 'Registres',
 'all-logs-page'        => 'Tots els registres',
-'log-search-legend'    => 'Cerca als registres',
-'log-search-submit'    => 'Vés-hi',
 'alllogstext'          => "Presentació combinada de tots els registres disponibles de {{SITENAME}}.
 Podeu reduir l'extensió seleccionant el tipus de registre, el nom del usuari (distingeix entre majúscules i minúscules), o la pàgina afectada (també en distingeix).",
 'logempty'             => 'No hi ha cap coincidència en el registre.',
@@ -1479,6 +1656,7 @@ Podeu reduir l'extensió seleccionant el tipus de registre, el nom del usuari (d
 'nextpage'          => 'Pàgina següent ($1)',
 'prevpage'          => 'Pàgina anterior ($1)',
 'allpagesfrom'      => 'Mostra les pàgines que comencin per:',
+'allpagesto'        => 'Mostra pàgines que acabin en:',
 'allarticles'       => 'Totes les pàgines',
 'allinnamespace'    => "Totes les pàgines (de l'espai de noms $1)",
 'allnotinnamespace' => "Totes les pàgines (que no són a l'espai de noms $1)",
@@ -1498,43 +1676,70 @@ Vegeu també [[Special:WantedCategories|les categories soŀlicitades]].",
 'special-categories-sort-count' => 'ordena per recompte',
 'special-categories-sort-abc'   => 'ordena alfabèticament',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribucions esborrades',
+
+# Special:LinkSearch
+'linksearch'       => 'Enllaços externs',
+'linksearch-pat'   => 'Patró de cerca:',
+'linksearch-ns'    => 'Espai de noms:',
+'linksearch-ok'    => 'Cerca',
+'linksearch-text'  => 'Es poden fer servir caràcters comodí com «*.wikipedia.org».<br />Protocols admesos: <tt>$1</tt>',
+'linksearch-line'  => '$1 enllaçat a $2',
+'linksearch-error' => "Els caràcters comodí només poden aparèixer a l'inici de l'url.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostra usuaris començant per:',
 'listusers-submit'   => 'Mostra',
 'listusers-noresult' => "No s'han trobat coincidències de noms d'usuaris. Si us plau, busqueu també amb variacions per majúscules i minúscules.",
 
+# Special:Log/newusers
+'newuserlogpage'              => "Registre de creació de l'usuari",
+'newuserlogpagetext'          => 'Aquest és un registre de creació de nous usuaris.',
+'newuserlog-byemail'          => 'contrasenya enviada per correu electrònic',
+'newuserlog-create-entry'     => 'Nou usuari',
+'newuserlog-create2-entry'    => "s'ha creat un compte per a $1",
+'newuserlog-autocreate-entry' => 'Compte creat automàticament',
+
 # Special:ListGroupRights
-'listgrouprights'          => "Drets dels grups d'usuaris",
-'listgrouprights-summary'  => "A continuació hi ha una llista dels grups d'usuaris definits en aquest wiki, així com dels seus drets d'accés associats.
+'listgrouprights'                 => "Drets dels grups d'usuaris",
+'listgrouprights-summary'         => "A continuació hi ha una llista dels grups d'usuaris definits en aquest wiki, així com dels seus drets d'accés associats.
 Pot ser que hi hagi més informació sobre drets individuals [[{{MediaWiki:Listgrouprights-helppage}}|aquí]].",
-'listgrouprights-group'    => 'Grup',
-'listgrouprights-rights'   => 'Drets',
-'listgrouprights-helppage' => 'Help:Drets del grup',
-'listgrouprights-members'  => '(llista de membres)',
+'listgrouprights-group'           => 'Grup',
+'listgrouprights-rights'          => 'Drets',
+'listgrouprights-helppage'        => 'Help:Drets del grup',
+'listgrouprights-members'         => '(llista de membres)',
+'listgrouprights-addgroup'        => 'Pot afegir {{PLURAL:$2|grup|grups}}: $1',
+'listgrouprights-removegroup'     => 'Pot treure {{PLURAL:$2|grup|grups}}: $1',
+'listgrouprights-addgroup-all'    => 'Pot afegir tots els grups',
+'listgrouprights-removegroup-all' => 'Pot treure tots els grups',
 
 # E-mail user
-'mailnologin'     => "No enviïs l'adreça",
-'mailnologintext' => "Heu d'haver [[Special:UserLogin|entrat]]
+'mailnologin'      => "No enviïs l'adreça",
+'mailnologintext'  => "Heu d'haver [[Special:UserLogin|entrat]]
 i tenir una direcció electrònica vàlida en les vostres [[Special:Preferences|preferències]]
 per enviar un correu electrònic a altres usuaris.",
-'emailuser'       => 'Envia un missatge de correu electrònic a aquest usuari',
-'emailpage'       => 'Correu electrònic a usuari',
-'emailpagetext'   => "Podeu usar el següent formulari per a enviar un missatge de correu electrònic a aquest usuari.
+'emailuser'        => 'Envia un missatge de correu electrònic a aquest usuari',
+'emailpage'        => 'Correu electrònic a usuari',
+'emailpagetext'    => "Podeu usar el següent formulari per a enviar un missatge de correu electrònic a aquest usuari.
 L'adreça electrònica que heu entrat en [[Special:Preferences|les vostres preferències d'usuari]] apareixerà com a remitent del correu electrònic, de manera que el destinatari us podrà respondre directament.",
-'usermailererror' => "L'objecte de correu ha retornat un error:",
-'defemailsubject' => 'Adreça correl de {{SITENAME}}',
-'noemailtitle'    => 'No hi ha cap adreça electrònica',
-'noemailtext'     => "Aquest usuari no ha especificat una adreça electrònica vàlida, o ha escollit no rebre correu electrònic d'altres usuaris.",
-'emailfrom'       => 'De:',
-'emailto'         => 'Per a:',
-'emailsubject'    => 'Assumpte:',
-'emailmessage'    => 'Missatge:',
-'emailsend'       => 'Envia',
-'emailccme'       => "Envia'm una còpia del meu missatge.",
-'emailccsubject'  => 'Còpia del vostre missatge a $1: $2',
-'emailsent'       => 'Correu electrònic enviat',
-'emailsenttext'   => 'El vostre correu electrònic ha estat enviat.',
-'emailuserfooter' => "Aquest missatge de correu electrònic l'ha enviat $1 a $2 amb la funció «e-mail» del projecte {{SITENAME}}.",
+'usermailererror'  => "L'objecte de correu ha retornat un error:",
+'defemailsubject'  => 'Adreça correl de {{SITENAME}}',
+'noemailtitle'     => 'No hi ha cap adreça electrònica',
+'noemailtext'      => 'Aquest usuari no ha especificat una adreça electrònica vàlida.',
+'nowikiemailtitle' => 'No es permet el correu electrònic',
+'nowikiemailtext'  => "Aquest usuari ha escollir no rebre missatges electrònics d'altres usuaris.",
+'email-legend'     => 'Enviar un correu electrònic a un altre usuari de {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'Per a:',
+'emailsubject'     => 'Assumpte:',
+'emailmessage'     => 'Missatge:',
+'emailsend'        => 'Envia',
+'emailccme'        => "Envia'm una còpia del meu missatge.",
+'emailccsubject'   => 'Còpia del vostre missatge a $1: $2',
+'emailsent'        => 'Correu electrònic enviat',
+'emailsenttext'    => 'El vostre correu electrònic ha estat enviat.',
+'emailuserfooter'  => "Aquest missatge de correu electrònic l'ha enviat $1 a $2 amb la funció «e-mail» del projecte {{SITENAME}}.",
 
 # Watchlist
 'watchlist'            => 'Llista de seguiment',
@@ -1569,12 +1774,7 @@ Si voleu deixar de vigilar la pàgina, cliqueu sobre l'enllaç de «Desatén» d
 'iteminvalidname'      => "Hi ha un problema amb l'element '$1': el nom no és vàlid...",
 'wlnote'               => 'A sota hi ha {{PLURAL:$1|el darrer canvi|els darrers $1 canvis}} en {{PLURAL:$2|la darrera hora|les darreres $2 hores}}.',
 'wlshowlast'           => '<small>- Mostra les darreres $1 hores, els darrers $2 dies o $3</small>',
-'watchlist-show-bots'  => 'Mostra les edicions dels bots',
-'watchlist-hide-bots'  => 'Amaga les edicions dels bots',
-'watchlist-show-own'   => 'Mostra les edicions pròpies',
-'watchlist-hide-own'   => 'Amaga les edicions pròpies',
-'watchlist-show-minor' => 'Mostra les edicions menors',
-'watchlist-hide-minor' => 'Amaga les edicions menors',
+'watchlist-options'    => 'Opcions de la llista de seguiment',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => "S'està vigilant...",
@@ -1613,60 +1813,66 @@ Per a canviar les opcions de la vostra llista de seguiment aneu a:
 Suggeriments i ajuda:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Elimina la pàgina',
-'confirm'                     => 'Confirma',
-'excontent'                   => 'el contingut era: «$1»',
-'excontentauthor'             => "el contingut era: «$1» (i l'únic coŀlaborador era [[Special:Contributions/$2|$2]])",
-'exbeforeblank'               => "el contingut abans d'estar en blanc era: '$1'",
-'exblank'                     => 'la pàgina estava en blanc',
-'delete-confirm'              => 'Elimina «$1»',
-'delete-legend'               => 'Elimina',
-'historywarning'              => 'Avís: La pàgina que eliminareu té un historial:',
-'confirmdeletetext'           => "Esteu a punt d'esborrar de forma permanent una pàgina o imatge i tot el seu historial de la base de dades.
+# Delete
+'deletepage'             => 'Elimina la pàgina',
+'confirm'                => 'Confirma',
+'excontent'              => 'el contingut era: «$1»',
+'excontentauthor'        => "el contingut era: «$1» (i l'únic coŀlaborador era [[Special:Contributions/$2|$2]])",
+'exbeforeblank'          => "el contingut abans d'estar en blanc era: '$1'",
+'exblank'                => 'la pàgina estava en blanc',
+'delete-confirm'         => 'Elimina «$1»',
+'delete-legend'          => 'Elimina',
+'historywarning'         => 'Avís: La pàgina que eliminareu té un historial:',
+'confirmdeletetext'      => "Esteu a punt d'esborrar de forma permanent una pàgina o imatge i tot el seu historial de la base de dades.
 Confirmeu que realment ho voleu fer, que enteneu les
 conseqüències, i que el que esteu fent està d'acord amb la [[{{MediaWiki:Policy-url}}|política]] del projecte.",
-'actioncomplete'              => "S'ha realitzat l'acció de manera satisfactòria.",
-'deletedtext'                 => '«<nowiki>$1</nowiki>» ha estat esborrat.
+'actioncomplete'         => "S'ha realitzat l'acció de manera satisfactòria.",
+'deletedtext'            => '«<nowiki>$1</nowiki>» ha estat esborrat.
 Vegeu $2 per a un registre dels esborrats més recents.',
-'deletedarticle'              => 'eliminat «[[$1]]»',
-'suppressedarticle'           => "s'ha suprimit «[[$1]]»",
-'dellogpage'                  => "Registre d'eliminació",
-'dellogpagetext'              => 'Davall hi ha una llista dels esborraments més recents.',
-'deletionlog'                 => "Registre d'esborrats",
-'reverted'                    => 'Invertit amb una revisió anterior',
-'deletecomment'               => 'Motiu per a ser esborrat:',
-'deleteotherreason'           => 'Motius diferents o addicionals:',
-'deletereasonotherlist'       => 'Altres motius',
-'deletereason-dropdown'       => "*Motius freqüents d'esborrat
+'deletedarticle'         => 'eliminat «[[$1]]»',
+'suppressedarticle'      => "s'ha suprimit «[[$1]]»",
+'dellogpage'             => "Registre d'eliminació",
+'dellogpagetext'         => 'Davall hi ha una llista dels esborraments més recents.',
+'deletionlog'            => "Registre d'esborrats",
+'reverted'               => 'Invertit amb una revisió anterior',
+'deletecomment'          => 'Motiu per a ser esborrat:',
+'deleteotherreason'      => 'Motius diferents o addicionals:',
+'deletereasonotherlist'  => 'Altres motius',
+'deletereason-dropdown'  => "*Motius freqüents d'esborrat
 ** Demanada per l'autor
 ** Violació del copyright
 ** Vandalisme
 ** Proves
 ** Error en el nom
 ** Fer lloc a un trasllat",
-'delete-edit-reasonlist'      => "Edita els motius d'eliminació",
-'delete-toobig'               => "Aquesta pàgina té un historial d'edicions molt gran, amb més de $1 {{PLURAL:$1|canvi|canvis}}. L'eliminació d'aquestes pàgines està restringida per a prevenir que hi pugui haver un desajustament seriós de la base de dades de tot el projecte {{SITENAME}} per accident.",
-'delete-warning-toobig'       => "Aquesta pàgina té un historial d'edicions molt gran, amb més de $1 {{PLURAL:$1|canvi|canvis}}. Eliminar-la podria suposar un seriós desajustament de la base de dades de tot el projecte {{SITENAME}}; aneu en compte abans dur a terme l'acció.",
-'rollback'                    => 'Reverteix edicions',
-'rollback_short'              => 'Revoca',
-'rollbacklink'                => 'Reverteix',
-'rollbackfailed'              => "No s'ha pogut revocar",
-'cantrollback'                => "No s'ha pogut revertir les edicions; el darrer coŀlaborador és l'únic autor de la pàgina.",
-'alreadyrolled'               => "No es pot revertir a la darrera edició de [[:$1]]
-per l'usuari [[User:$2|$2]] ([[User talk:$2|Discussió]]); algú altre ha editat o revertit la pàgina.
-
-La darrera edició ha estat feta per l'usuari [[User:$3|$3]] ([[User talk:$3|Discussió]] | [[Special:Contributions/$3|{{int:contribslink}}]]).",
-'editcomment'                 => "El comentari d'edició ha estat: «<i>$1</i>».", # only shown if there is an edit comment
-'revertpage'                  => "Revertides les edicions de [[Special:Contributions/$2|$2]] ([[User talk:$2|discussió]]). S'ha recuperat la darrera versió de l'usuari [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "Edicions revertides de $1; s'ha canviat a la darrera versió de $2.",
-'sessionfailure'              => "Sembla que hi ha problema amb la vostra sessió. Aquesta acció ha estat anuŀlada en prevenció de pirateig de sessió. Si us plau, pitgeu «Torna», i recarregueu la pàgina des d'on veniu, després intenteu-ho de nou.",
+'delete-edit-reasonlist' => "Edita els motius d'eliminació",
+'delete-toobig'          => "Aquesta pàgina té un historial d'edicions molt gran, amb més de $1 {{PLURAL:$1|canvi|canvis}}. L'eliminació d'aquestes pàgines està restringida per a prevenir que hi pugui haver un desajustament seriós de la base de dades de tot el projecte {{SITENAME}} per accident.",
+'delete-warning-toobig'  => "Aquesta pàgina té un historial d'edicions molt gran, amb més de $1 {{PLURAL:$1|canvi|canvis}}. Eliminar-la podria suposar un seriós desajustament de la base de dades de tot el projecte {{SITENAME}}; aneu en compte abans dur a terme l'acció.",
+
+# Rollback
+'rollback'         => 'Reverteix edicions',
+'rollback_short'   => 'Revoca',
+'rollbacklink'     => 'Reverteix',
+'rollbackfailed'   => "No s'ha pogut revocar",
+'cantrollback'     => "No s'ha pogut revertir les edicions; el darrer coŀlaborador és l'únic autor de la pàgina.",
+'alreadyrolled'    => "No es pot revertir la darrera edició de [[:$1]]
+de l'usuari [[User:$2|$2]] ([[User talk:$2|Discussió]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]). Algú altre ja ha editat o revertit la pàgina.
+
+La darrera edició ha estat feta per l'usuari [[User:$3|$3]] ([[User talk:$3|Discussió]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
+'editcomment'      => "El resum d'edició ha estat: «$1».", # only shown if there is an edit comment
+'revertpage'       => "Revertides les edicions de [[Special:Contributions/$2|$2]] ([[User talk:$2|discussió]]). S'ha recuperat la darrera versió de l'usuari [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "Edicions revertides de $1; s'ha canviat a la darrera versió de $2.",
+'sessionfailure'   => "Sembla que hi ha problema amb la vostra sessió. Aquesta acció ha estat anuŀlada en prevenció de pirateig de sessió. Si us plau, pitgeu «Torna», i recarregueu la pàgina des d'on veniu, després intenteu-ho de nou.",
+
+# Protect
 'protectlogpage'              => 'Registre de protecció',
 'protectlogtext'              => 'Aquest és el registre de proteccions i desproteccions. Vegeu la [[Special:ProtectedPages|llista de pàgines protegides]] per a la llista de les pàgines que actualment tenen alguna protecció.',
 'protectedarticle'            => 'protegit «[[$1]]»',
 'modifiedarticleprotection'   => "s'ha canviat el nivell de protecció «[[$1]]»",
 'unprotectedarticle'          => '«[[$1]]» desprotegida',
+'movedarticleprotection'      => 'ajustaments de protecció moguts de «[[$2]]» a «[[$1]]»',
 'protect-title'               => 'Canviant la protecció de «$1»',
+'prot_1movedto2'              => '[[$1]] mogut a [[$2]]',
 'protect-legend'              => 'Confirmeu la protecció',
 'protectcomment'              => 'Motiu de la protecció',
 'protectexpiry'               => "Data d'expiració",
@@ -1674,21 +1880,34 @@ La darrera edició ha estat feta per l'usuari [[User:$3|$3]] ([[User talk:$3|Dis
 'protect_expiry_old'          => 'El temps de termini ja ha passat.',
 'protect-unchain'             => 'Permet diferent nivell de protecció per editar i per moure',
 'protect-text'                => 'Aquí podeu visualitzar i canviar el nivell de protecció de la pàgina «<nowiki>$1</nowiki>». Assegureu-vos de seguir les polítiques existents.',
-'protect-locked-blocked'      => 'No podeu canviar els nivells de protecció mentre estigueu bloquejats. Ací hi ha els
-paràmetres actuals de la pàgina <strong>$1</strong>:',
+'protect-locked-blocked'      => "No podeu canviar els nivells de protecció mentre estigueu bloquejats. Ací hi ha els
+paràmetres actuals de la pàgina '''$1''':",
 'protect-locked-dblock'       => "No poden canviar-se els nivells de protecció a casa d'un bloqueig actiu de la base de dades.
-Ací hi ha els paràmetres actuals de la pàgina <strong>$1</strong>:",
-'protect-locked-access'       => 'El vostre compte no té permisos per a canviar els nivells de protecció de la pàgina.
-Ací es troben els paràmetres actuals de la pàgina <strong>$1</strong>:',
+Ací hi ha els paràmetres actuals de la pàgina '''$1''':",
+'protect-locked-access'       => "El vostre compte no té permisos per a canviar els nivells de protecció de la pàgina.
+Ací es troben els paràmetres actuals de la pàgina '''$1''':",
 'protect-cascadeon'           => "Aquesta pàgina es troba protegida perquè està inclosa en {{PLURAL:$1|la següent pàgina que té|les següents pàgines que tenen}} activada una protecció en cascada. Podeu canviar el nivell de protecció d'aquesta pàgina però això no afectarà la protecció en cascada.",
-'protect-default'             => '(per defecte)',
+'protect-default'             => 'Permet tots els usuaris',
 'protect-fallback'            => 'Cal el permís de «$1»',
-'protect-level-autoconfirmed' => 'Bloca els usuaris no registrats',
+'protect-level-autoconfirmed' => 'Bloca els usuaris novells i no registrats',
 'protect-level-sysop'         => 'Bloqueja tots els usuaris excepte administradors',
 'protect-summary-cascade'     => 'en cascada',
 'protect-expiring'            => 'expira el dia $1 (UTC)',
+'protect-expiry-indefinite'   => 'indefinit',
 'protect-cascade'             => 'Protecció en cascada: protegeix totes les pàgines i plantilles incloses en aquesta.',
 'protect-cantedit'            => "No podeu canviar els nivells de protecció d'aquesta pàgina, perquè no teniu permisos per a editar-la.",
+'protect-othertime'           => 'Un altre termini:',
+'protect-othertime-op'        => 'un altre termini',
+'protect-existing-expiry'     => "Data d'expiració existent: $2 a les $3",
+'protect-otherreason'         => 'Altres motius:',
+'protect-otherreason-op'      => 'altres motius',
+'protect-dropdown'            => "*Motius comuns de protecció
+** Vandalisme excessiu
+** Spam excessiu
+** Guerra d'edicions improductiva
+** Pàgina amb alt trànsit",
+'protect-edit-reasonlist'     => 'Edita motius de protecció',
+'protect-expiry-options'      => '2 hores:2 hours,1 dia:1 day,3 dies:3 days,1 setmana:1 week,2 setmanes:2 weeks,1 mes:1 month,3 mesos:3 months,6 mesos:6 months,1 any:1 year,infinit:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permís:',
 'restriction-level'           => 'Nivell de restricció:',
 'minimum-size'                => 'Mida mínima',
@@ -1711,7 +1930,7 @@ Ací es troben els paràmetres actuals de la pàgina <strong>$1</strong>:',
 'undeletepage'                 => 'Mostra i restaura pàgines esborrades',
 'undeletepagetitle'            => "'''A continuació teniu revisions eliminades de [[:$1]]'''.",
 'viewdeletedpage'              => 'Visualitza les pàgines eliminades',
-'undeletepagetext'             => "S'han eliminat les pàgines següents però encara són a l'arxiu i poden ser restaurades. Pot netejar-se l'arxiu periòdicament.",
+'undeletepagetext'             => "S'ha eliminat {{PLURAL:|la pàgina $1, però encara és a l'arxiu i pot ser restaurada|les pàgines $1, però encara són a l'arxiu i poden ser restaurades}}. Pot netejar-se l'arxiu periòdicament.",
 'undelete-fieldset-title'      => 'Restaura revisions',
 'undeleteextrahelp'            => "Per a restaurar la pàgina sencera, deixeu totes les caselles sense seleccionar i
 cliqueu a  '''''Restaura'''''.
@@ -1727,12 +1946,13 @@ Si s'hagués creat una nova pàgina amb el mateix nom d'ençà que la vàreu esb
 En aqueixos casos, heu de desmarcar o mostrar les revisions eliminades més noves.",
 'undeletehistorynoadmin'       => "S'ha eliminat la pàgina. El motiu es mostra
 al resum a continuació, juntament amb detalls dels usuaris que l'havien editat abans de la seua eliminació. El text de les revisions eliminades només és accessible als administradors.",
-'undelete-revision'            => "S'ha eliminat la revisió de $1 de $2 (per $3):",
+'undelete-revision'            => "S'ha eliminat la revisió de $1 (des del dia $4 a les $5), revisat per $3:",
 'undeleterevision-missing'     => "La revisió no és vàlida o no hi és. Podeu tenir-hi un enllaç incorrecte, o bé pot haver-se restaurat o eliminat de l'arxiu.",
 'undelete-nodiff'              => "No s'ha trobat cap revisió anterior.",
 'undeletebtn'                  => 'Restaura!',
 'undeletelink'                 => 'restaura',
 'undeletereset'                => 'Reinicia',
+'undeleteinvert'               => 'Invertir selecció',
 'undeletecomment'              => 'Comentari:',
 'undeletedarticle'             => 'restaurat «[[$1]]»',
 'undeletedrevisions'           => '{{PLURAL:$1|Una revisió restaurada|$1 revisions restaurades}}',
@@ -1764,26 +1984,27 @@ $1",
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => "Contribucions de l'usuari",
-'mycontris'     => 'Contribucions',
-'contribsub2'   => 'Per $1 ($2)',
-'nocontribs'    => "No s'ha trobat canvis que encaixessin amb aquests criteris.",
-'uctop'         => '(actual)',
-'month'         => 'Mes (i anteriors):',
-'year'          => 'Any (i anteriors):',
-
-'sp-contributions-newbies'     => 'Mostra les contribucions dels usuaris novells',
-'sp-contributions-newbies-sub' => 'Per a novells',
-'sp-contributions-blocklog'    => 'Registre de bloquejos',
-'sp-contributions-search'      => 'Cerca les contribucions',
-'sp-contributions-username'    => "Adreça IP o nom d'usuari:",
-'sp-contributions-submit'      => 'Cerca',
+'contributions'       => "Contribucions de l'usuari",
+'contributions-title' => "Contribucions de l'usuari $1",
+'mycontris'           => 'Contribucions',
+'contribsub2'         => 'Per $1 ($2)',
+'nocontribs'          => "No s'ha trobat canvis que encaixessin amb aquests criteris.",
+'uctop'               => '(actual)',
+'month'               => 'Mes (i anteriors):',
+'year'                => 'Any (i anteriors):',
+
+'sp-contributions-newbies'       => 'Mostra les contribucions dels usuaris novells',
+'sp-contributions-newbies-sub'   => 'Per a novells',
+'sp-contributions-newbies-title' => "Contribucions dels comptes d'usuari més nous",
+'sp-contributions-blocklog'      => 'Registre de bloquejos',
+'sp-contributions-search'        => 'Cerca les contribucions',
+'sp-contributions-username'      => "Adreça IP o nom d'usuari:",
+'sp-contributions-submit'        => 'Cerca',
 
 # What links here
 'whatlinkshere'            => 'Què hi enllaça',
 'whatlinkshere-title'      => 'Pàgines que enllacen amb $1',
 'whatlinkshere-page'       => 'Pàgina:',
-'linklistsub'              => "(Llista d'enllaços)",
 'linkshere'                => "Les següents pàgines enllacen amb '''[[:$1]]''':",
 'nolinkshere'              => "Cap pàgina no enllaça amb '''[[:$1]]'''.",
 'nolinkshere-ns'           => "No s'enllaça cap pàgina a '''[[:$1]]''' en l'espai de noms triat.",
@@ -1832,6 +2053,8 @@ quines pàgines en concret estan sent vandalitzades).",
 'ipbotherreason'                  => 'Altres motius o addicionals:',
 'ipbhidename'                     => "Amaga el nom d'usuari del registre de bloquejos, activa la llista de bloqueig i d'usuaris",
 'ipbwatchuser'                    => "Vigila les pàgines d'usuari i de discussió de l'usuari",
+'ipballowusertalk'                => "Permet que l'usuari editi la seva pàgina de discussió durant el bloqueig",
+'ipb-change-block'                => "Torna a blocar l'usuari amb aquests paràmetres",
 'badipaddress'                    => "L'adreça IP no té el format correcte.",
 'blockipsuccesssub'               => "S'ha blocat amb èxit",
 'blockipsuccesstext'              => "L'usuari «[[Special:Contributions/$1|$1]]» ha estat blocat.
@@ -1841,6 +2064,7 @@ quines pàgines en concret estan sent vandalitzades).",
 'ipb-unblock'                     => 'Desbloca un usuari o una adreça IP',
 'ipb-blocklist-addr'              => 'Bloquejos existents per $1',
 'ipb-blocklist'                   => 'Llista els bloquejos existents',
+'ipb-blocklist-contribs'          => 'Contribucions de $1',
 'unblockip'                       => "Desbloca l'usuari",
 'unblockiptext'                   => "Empreu el següent formulari per restaurar
 l'accés a l'escriptura a una adreça IP o un usuari prèviament bloquejat.",
@@ -1850,6 +2074,9 @@ l'accés a l'escriptura a una adreça IP o un usuari prèviament bloquejat.",
 'ipblocklist'                     => "Llista d'adreces IP i noms d'usuaris blocats",
 'ipblocklist-legend'              => 'Cerca un usuari blocat',
 'ipblocklist-username'            => "Nom d'usuari o adreça IP:",
+'ipblocklist-sh-userblocks'       => '$1 bloquejos de comptes',
+'ipblocklist-sh-tempblocks'       => '$1 bloquejos temporals',
+'ipblocklist-sh-addressblocks'    => "$1 bloquejos d'una sola adreça IP",
 'ipblocklist-submit'              => 'Cerca',
 'blocklistline'                   => '$1, $2 bloca $3 ($4)',
 'infiniteblock'                   => 'infinit',
@@ -1858,25 +2085,32 @@ l'accés a l'escriptura a una adreça IP o un usuari prèviament bloquejat.",
 'noautoblockblock'                => "S'ha inhabilitat el bloqueig automàtic",
 'createaccountblock'              => "s'ha blocat la creació de nous comptes",
 'emailblock'                      => "s'ha blocat l'enviament de correus electrònics",
+'blocklist-nousertalk'            => 'no se li permet editar la pàgina de discussió pròpia',
 'ipblocklist-empty'               => 'La llista de bloqueig està buida.',
 'ipblocklist-no-results'          => "La adreça IP soŀlicitada o nom d'usuari està bloquejada.",
 'blocklink'                       => 'bloca',
 'unblocklink'                     => 'desbloca',
+'change-blocklink'                => 'canvia el blocatge',
 'contribslink'                    => 'contribucions',
 'autoblocker'                     => 'Heu estat blocat perquè compartiu adreça IP amb «$1». Motiu: «$2»',
 'blocklogpage'                    => 'Registre de bloquejos',
+'blocklog-fulllog'                => 'Registre complet de bloquejos',
 'blocklogentry'                   => "s'ha blocat «[[$1]]» per a un període de $2 $3",
+'reblock-logentry'                => 'canviades les opcions del blocatge a [[$1]] amb caducitat a $2, $3',
 'blocklogtext'                    => "Això és una relació de accions de bloqueig i desbloqueig. Les adreces IP bloquejades automàticament no apareixen. Vegeu la [[Special:IPBlockList|llista d'usuaris actualment bloquejats]].",
 'unblocklogentry'                 => 'desbloquejat $1',
 'block-log-flags-anononly'        => 'només els usuaris anònims',
 'block-log-flags-nocreate'        => "s'ha desactivat la creació de comptes",
 'block-log-flags-noautoblock'     => 'sense bloqueig automàtic',
 'block-log-flags-noemail'         => 'correu-e blocat',
+'block-log-flags-nousertalk'      => 'no se li permet editar la pàgina de discussió pròpia',
 'block-log-flags-angry-autoblock' => 'autoblocatge avançat activat',
 'range_block_disabled'            => 'La facultat dels administradors per a crear bloquejos de rang està desactivada.',
 'ipb_expiry_invalid'              => "Data d'acabament no vàlida.",
 'ipb_expiry_temp'                 => "Els blocatges amb ocultació de nom d'usuari haurien de ser permanents.",
 'ipb_already_blocked'             => '«$1» ja està blocat',
+'ipb-needreblock'                 => "== Usuari bloquejat ==
+L'usuari $1 ja està blocat. Voleu canviar-ne els paràmetres del blocatge?",
 'ipb_cant_unblock'                => "Errada: No s'ha trobat el núm. ID de bloqueig $1. És possible que ja s'haguera desblocat.",
 'ipb_blocked_as_range'            => "Error: L'adreça IP $1 no està blocada directament i per tant no pot ésser desbloquejada. Ara bé, sí que ho està per formar part del rang $2 que sí que pot ser desblocat.",
 'ip_range_invalid'                => 'Rang de IP no vàlid.',
@@ -1887,6 +2121,7 @@ l'accés a l'escriptura a una adreça IP o un usuari prèviament bloquejat.",
 'proxyblocksuccess'               => 'Fet.',
 'sorbsreason'                     => "La vostra adreça IP està llistada com a servidor intermediari (''proxy'') obert dins la llista negra de DNS que fa servir el projecte {{SITENAME}}.",
 'sorbs_create_account_reason'     => "La vostra adreça IP està llistada com a servidor intermediari (''proxy'') obert a la llista negra de DNS que utilitza el projecte {{SITENAME}}. No podeu crear-vos-hi un compte",
+'cant-block-while-blocked'        => 'No podeu blocar altres usuaris quan esteu bloquejat.',
 
 # Developer tools
 'lockdb'              => 'Bloca la base de dades',
@@ -1914,9 +2149,9 @@ Recordeu-vos de [[Special:UnlockDB|treure el bloqueig]] quan hàgiu acabat el ma
 'databasenotlocked'   => 'La base de dades no està bloquejada.',
 
 # Move page
-'move-page'               => 'Mou $1',
-'move-page-legend'        => 'Reanomena la pàgina',
-'movepagetext'            => "Amb el formulari següent reanomenareu una pàgina, movent tot el seu historial al nou nom.
+'move-page'                    => 'Mou $1',
+'move-page-legend'             => 'Reanomena la pàgina',
+'movepagetext'                 => "Amb el formulari següent reanomenareu una pàgina, movent tot el seu historial al nou nom.
 El títol anterior es convertirà en una redirecció al títol que hàgiu creat.
 Podeu actualitzar automàticament els enllaços a l'antic títol de la pàgina.
 Si no ho feu, assegureu-vos de verificar que no deixeu redireccions [[Special:DoubleRedirects|dobles]] o [[Special:BrokenRedirects|trencades]].
@@ -1928,50 +2163,64 @@ Això significa que podeu reanomenar de nou una pàgina al seu títol original s
 '''ADVERTÈNCIA!'''
 Açò pot ser un canvi dràstic i inesperat en una pàgina que sigui popular;
 assegureu-vos d'entendre les conseqüències que comporta abans de seguir endavant.",
-'movepagetalktext'        => "La pàgina de discussió associada, si existeix, serà traslladada automàticament '''a menys que:'''
+'movepagetalktext'             => "La pàgina de discussió associada, si existeix, serà traslladada automàticament '''a menys que:'''
 *Ja existeixi una pàgina de discussió no buida amb el nom nou, o
 *Hàgiu desseleccionat la opció de sota.
 
 En aquests casos, haureu de traslladar o fusionar la pàgina manualment si ho desitgeu.",
-'movearticle'             => 'Reanomena la pàgina',
-'movenotallowed'          => 'No teniu permís per a moure pàgines.',
-'newtitle'                => 'A títol nou',
-'move-watch'              => 'Vigila aquesta pàgina',
-'movepagebtn'             => 'Reanomena la pàgina',
-'pagemovedsub'            => 'Reanomenament amb èxit',
-'movepage-moved'          => "<big>'''«$1» s'ha mogut a «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Ja existeix una pàgina amb aquest nom, o el nom que heu triat no és vàlid.
+'movearticle'                  => 'Reanomena la pàgina',
+'movenologin'                  => "No sou a dins d'una sessió",
+'movenologintext'              => "Heu de ser un usuari registrat i estar [[Special:UserLogin|dintre d'una sessió]]
+per reanomenar una pàgina.",
+'movenotallowed'               => 'No teniu permís per a moure pàgines.',
+'movenotallowedfile'           => 'No teniu el permís per a moure fitxers.',
+'cant-move-user-page'          => "No teniu permís per a moure pàgines d'usuari (independentment de les subpàgines).",
+'cant-move-to-user-page'       => "No teniu permís per a moure una pàgina a una pàgina d'usuari (independentment de poder fer-ho cap a una subpàgina d'usuari).",
+'newtitle'                     => 'A títol nou',
+'move-watch'                   => 'Vigila aquesta pàgina',
+'movepagebtn'                  => 'Reanomena la pàgina',
+'pagemovedsub'                 => 'Reanomenament amb èxit',
+'movepage-moved'               => "<big>'''«$1» s'ha mogut a «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => "S'ha creat una redirecció.",
+'movepage-moved-noredirect'    => "La creació d'una redirecció s'ha suprimit.",
+'articleexists'                => 'Ja existeix una pàgina amb aquest nom, o el nom que heu triat no és vàlid.
 Trieu-ne un altre, si us plau.',
-'cantmove-titleprotected' => "No podeu moure una pàgina a aquesta ubicació, perquè s'ha protegit la creació del títol nou",
-'talkexists'              => "S'ha reanomenat la pàgina amb èxit, però la pàgina de discussió no s'ha pogut moure car ja no existeix en el títol nou.
+'cantmove-titleprotected'      => "No podeu moure una pàgina a aquesta ubicació, perquè s'ha protegit la creació del títol nou",
+'talkexists'                   => "S'ha reanomenat la pàgina amb èxit, però la pàgina de discussió no s'ha pogut moure car ja no existeix en el títol nou.
 
 Incorporeu-les manualment, si us plau.",
-'movedto'                 => 'reanomenat a',
-'movetalk'                => 'Mou la pàgina de discussió associada',
-'move-subpages'           => "Mou totes les pàgines (si s'escau)",
-'move-talk-subpages'      => "Mou totes les subpàgines de la discussió (si s'escau)",
-'movepage-page-exists'    => "La pàgina $1 ja existeix i no pot sobreescriure's automàticament.",
-'movepage-page-moved'     => 'La pàgina $1 ha estat traslladada a $2.',
-'movepage-page-unmoved'   => "La pàgina $1 no s'ha pogut moure a $2.",
-'movepage-max-pages'      => "{{PLURAL:$1|S'ha mogut una pàgina|S'han mogut $1 pàgines}} que és el nombre màxim, i per tant no se'n mourà automàticament cap més.",
-'1movedto2'               => "[[$1]] s'ha reanomenat com [[$2]]",
-'1movedto2_redir'         => "[[$1]] s'ha reanomenat com [[$2]] amb una redirecció",
-'movelogpage'             => 'Registre de reanomenaments',
-'movelogpagetext'         => 'Vegeu la llista de les darreres pàgines reanomenades.',
-'movereason'              => 'Motiu',
-'revertmove'              => 'reverteix',
-'delete_and_move'         => 'Elimina i trasllada',
-'delete_and_move_text'    => "==Cal l'eliminació==
+'movedto'                      => 'reanomenat a',
+'movetalk'                     => 'Mou la pàgina de discussió associada',
+'move-subpages'                => "Mou totes les pàgines (si s'escau)",
+'move-talk-subpages'           => "Mou totes les subpàgines de la discussió (si s'escau)",
+'movepage-page-exists'         => "La pàgina $1 ja existeix i no pot sobreescriure's automàticament.",
+'movepage-page-moved'          => 'La pàgina $1 ha estat traslladada a $2.',
+'movepage-page-unmoved'        => "La pàgina $1 no s'ha pogut moure a $2.",
+'movepage-max-pages'           => "{{PLURAL:$1|S'ha mogut una pàgina|S'han mogut $1 pàgines}} que és el nombre màxim, i per tant no se'n mourà automàticament cap més.",
+'1movedto2'                    => "[[$1]] s'ha reanomenat com [[$2]]",
+'1movedto2_redir'              => "[[$1]] s'ha reanomenat com [[$2]] amb una redirecció",
+'move-redirect-suppressed'     => 'redirecció suprimida',
+'movelogpage'                  => 'Registre de reanomenaments',
+'movelogpagetext'              => 'Vegeu la llista de les darreres pàgines reanomenades.',
+'movereason'                   => 'Motiu',
+'revertmove'                   => 'reverteix',
+'delete_and_move'              => 'Elimina i trasllada',
+'delete_and_move_text'         => "==Cal l'eliminació==
 
 La pàgina de destinació, «[[:$1]]», ja existeix. Voleu eliminar-la per a fer lloc al trasllat?",
-'delete_and_move_confirm' => 'Sí, esborra la pàgina',
-'delete_and_move_reason'  => "S'ha eliminat per a permetre el reanomenament",
-'selfmove'                => "Els títols d'origen i de destinació coincideixen: no és possible de reanomenar una pàgina a si mateixa.",
-'immobile_namespace'      => "El títol d'origen o de destinació és d'un tipus especial; no és possible reanomenar pàgines a aquest espai de noms.",
-'imagenocrossnamespace'   => 'No es pot moure la imatge a un espai de noms on no li correspon',
-'imagetypemismatch'       => 'La nova extensió de fitxer no coincideix amb el seu tipus',
-'imageinvalidfilename'    => 'El nom de fitxer indicat no és vàlid',
-'fix-double-redirects'    => "Actualitza també les redireccions que apuntin a l'article original",
+'delete_and_move_confirm'      => 'Sí, esborra la pàgina',
+'delete_and_move_reason'       => "S'ha eliminat per a permetre el reanomenament",
+'selfmove'                     => "Els títols d'origen i de destinació coincideixen: no és possible de reanomenar una pàgina a si mateixa.",
+'immobile-source-namespace'    => 'No es poden moure pàgines de l\'espai de noms "$1"',
+'immobile-target-namespace'    => 'No es poden moure pàgines cap a l\'espai de noms "$1"',
+'immobile-target-namespace-iw' => "No es poden moure pàgines a l'enllaç interwiki",
+'immobile-source-page'         => 'Aquesta pàgina no es pot moure.',
+'immobile-target-page'         => 'No es pot moure cap a una destinació amb aquest títol.',
+'imagenocrossnamespace'        => 'No es pot moure la imatge a un espai de noms on no li correspon',
+'imagetypemismatch'            => 'La nova extensió de fitxer no coincideix amb el seu tipus',
+'imageinvalidfilename'         => 'El nom de fitxer indicat no és vàlid',
+'fix-double-redirects'         => "Actualitza també les redireccions que apuntin a l'article original",
+'move-leave-redirect'          => 'Deixar enrera una redirecció',
 
 # Export
 'export'            => 'Exporta les pàgines',
@@ -1979,7 +2228,7 @@ La pàgina de destinació, «[[:$1]]», ja existeix. Voleu eliminar-la per a fer
 
 Per a exportar pàgines, escriviu els títols que desitgeu al quadre de text de sota, un títol per línia, i seleccioneu si desitgeu o no la versió actual juntament amb totes les versions antigues, amb la pàgina d'historial, o només la pàgina actual amb la informació de la darrera modificació.
 
-En el darrer cas, podeu fer servir un enllaç com ara [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] per a la pàgina «[[{{MediaWiki:Mainpage}}]]».",
+En el darrer cas, podeu fer servir un enllaç com ara [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] per a la pàgina «[[{{MediaWiki:Mainpage}}]]».",
 'exportcuronly'     => "Exporta únicament la versió actual en voltes de l'historial sencer",
 'exportnohistory'   => "----
 '''Nota:''' s'ha inhabilitat l'exportació sencera d'historial de pàgines mitjançant aquest formulari a causa de problemes de rendiment del servidor.",
@@ -1994,7 +2243,7 @@ En el darrer cas, podeu fer servir un enllaç com ara [[{{ns:special}}:Export/{{
 'allmessagesname'           => 'Etiqueta',
 'allmessagesdefault'        => 'Text per defecte',
 'allmessagescurrent'        => 'Text actual',
-'allmessagestext'           => "Tot seguit hi ha una llista dels missatges del sistema que es troben a l'espai de noms ''MediaWiki''. La traducció genèrica d'aquests missatges no s'hauria de fer localment sinó a la traducció del programari MediaWiki. Si voleu ajudar-hi visiteu [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] i [http://translatewiki.net Betawiki].",
+'allmessagestext'           => "Tot seguit hi ha una llista dels missatges del sistema que es troben a l'espai de noms ''MediaWiki''. La traducció genèrica d'aquests missatges no s'hauria de fer localment sinó a la traducció del programari MediaWiki. Si voleu ajudar-hi visiteu [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] i [http://translatewiki.net translatewiki.net].",
 'allmessagesnotsupportedDB' => "No es pot processar '''{{ns:special}}:Allmessages''' perquè la variable '''\$wgUseDatabaseMessages''' està desactivada.",
 'allmessagesfilter'         => 'Cerca etiqueta de missatge:',
 'allmessagesmodified'       => 'Mostra només missatges modificats',
@@ -2014,9 +2263,12 @@ En el darrer cas, podeu fer servir un enllaç com ara [[{{ns:special}}:Export/{{
 'import-interwiki-text'      => "Trieu un web basat en wiki i un títol de pàgina per a importar.
 Es conservaran les dates de les versions i els noms dels editors.
 Totes les accions d'importació interwiki es conserven al [[Special:Log/import|registre d'importacions]].",
+'import-interwiki-source'    => "Pàgina/wiki d'origen:",
 'import-interwiki-history'   => "Copia totes les versions de l'historial d'aquesta pàgina",
 'import-interwiki-submit'    => 'Importa',
 'import-interwiki-namespace' => 'Espai de noms de destinació:',
+'import-upload-filename'     => 'Nom de fitxer:',
+'import-comment'             => 'Comentari:',
 'importtext'                 => "Exporteu el fitxer des del wiki d'origen utilitzant l'[[Special:Export|eina d'exportació]]. 
 Deseu-lo al vostre ordinador i carregueu-ne una còpia ací.",
 'importstart'                => "S'estan important pàgines...",
@@ -2051,7 +2303,7 @@ Deseu-lo al vostre ordinador i carregueu-ne una còpia ací.",
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revisió|revisions}} de $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "La meua pàgina d'usuari",
+'tooltip-pt-userpage'             => "La vostra pàgina d'usuari",
 'tooltip-pt-anonuserpage'         => "La pàgina d'usuari per la ip que utilitzeu",
 'tooltip-pt-mytalk'               => 'La vostra pàgina de discussió.',
 'tooltip-pt-anontalk'             => 'Discussió sobre les edicions per aquesta adreça ip.',
@@ -2063,7 +2315,7 @@ Deseu-lo al vostre ordinador i carregueu-ne una còpia ací.",
 'tooltip-pt-logout'               => "Finalitza la sessió d'usuari",
 'tooltip-ca-talk'                 => "Discussió sobre el contingut d'aquesta pàgina.",
 'tooltip-ca-edit'                 => 'Podeu editar aquesta pàgina. Si us plau, previsualitzeu abans de desar.',
-'tooltip-ca-addsection'           => 'Afegeix un comentari a aquesta discussió.',
+'tooltip-ca-addsection'           => 'Comença una nova secció',
 'tooltip-ca-viewsource'           => 'Aquesta pàgina està protegida. Podeu veure el seu codi font.',
 'tooltip-ca-history'              => "Versions antigues d'aquesta pàgina.",
 'tooltip-ca-protect'              => 'Protegeix aquesta pàgina.',
@@ -2110,6 +2362,9 @@ Deseu-lo al vostre ordinador i carregueu-ne una còpia ací.",
 'tooltip-watch'                   => 'Afegiu aquesta pàgina a la vostra llista de seguiment',
 'tooltip-recreate'                => 'Recrea la pàgina malgrat hagi estat suprimida',
 'tooltip-upload'                  => 'Inicia la càrrega',
+'tooltip-rollback'                => "«Rollback» reverteix les edicions del darrer contribuïdor d'aquesta pàgina en un clic.",
+'tooltip-undo'                    => '«Desfés» reverteix aquesta edició i obre un formulari de previsualització.
+Permet afegir un motiu al resum.',
 
 # Stylesheets
 'common.css'   => '/* Editeu aquest fitxer per personalitzar totes les aparences per al lloc sencer */',
@@ -2124,12 +2379,12 @@ Deseu-lo al vostre ordinador i carregueu-ne una còpia ací.",
 'notacceptable'     => 'El servidor wiki no pot oferir dades en un format que el client no pot llegir.',
 
 # Attribution
-'anonymous'        => 'Usuaris anònims del projecte {{SITENAME}}',
+'anonymous'        => 'Usuari{{PLURAL:$1| anònim|s anònims}} del projecte {{SITENAME}}',
 'siteuser'         => 'Usuari $1 del projecte {{SITENAME}}',
 'lastmodifiedatby' => 'Va modificar-se la pàgina per darrera vegada el $2, $1 per $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basat en les contribucions de $1.',
 'others'           => 'altres',
-'siteusers'        => '{{SITENAME}} usuaris $1',
+'siteusers'        => 'Usuari{{PLURAL:$2||s}} $1 de {{SITENAME}}',
 'creditspage'      => 'Títols de la pàgina',
 'nocredits'        => 'No hi ha títols disponibles per aquesta pàgina.',
 
@@ -2150,6 +2405,11 @@ Això deu ser degut per un enllaç a un lloc extern inclòs a la llista negra.',
 'numauthors'     => "Nombre d'autors (pàgina): $1",
 'numtalkauthors' => "Nombre d'autors (pàgina de discussió): $1",
 
+# Skin names
+'skinname-standard'    => 'Clàssic',
+'skinname-nostalgia'   => 'Nostàlgia',
+'skinname-cologneblue' => 'Colònia blava',
+
 # Math options
 'mw_math_png'    => 'Produeix sempre PNG',
 'mw_math_simple' => 'HTML si és molt simple, si no PNG',
@@ -2170,10 +2430,12 @@ Això deu ser degut per un enllaç a un lloc extern inclòs a la llista negra.',
 'markedaspatrollederror-noautopatrol' => 'No podeu marcar les vostres pròpies modificacions com a supervisades.',
 
 # Patrol log
-'patrol-log-page'   => 'Registre de supervisió',
-'patrol-log-header' => 'Això és un registre de les revisions patrullades.',
-'patrol-log-line'   => "s'ha marcat la versió $1 de $2 com a supervisat $3",
-'patrol-log-auto'   => '(automàtic)',
+'patrol-log-page'      => 'Registre de supervisió',
+'patrol-log-header'    => 'Això és un registre de les revisions patrullades.',
+'patrol-log-line'      => 'ha marcat $3 la $1 de «$2» com a supervisada',
+'patrol-log-auto'      => '(automàticament)',
+'patrol-log-diff'      => 'revisió $1',
+'log-show-hide-patrol' => '$1 el registre de patrulla',
 
 # Image deletion
 'deletedrevision'                 => "S'ha eliminat la revisió antiga $1.",
@@ -2190,6 +2452,9 @@ $1",
 'previousdiff' => "� Vés a l'edició anterior",
 'nextdiff'     => "Vés a l'edició següent →",
 
+# Visual comparison
+'visual-comparison' => 'Comparació visual',
+
 # Media information
 'mediawarning'         => "'''Advertència''': Aquest fitxer podria contenir codi maliciós, si l'executeu podeu comprometre la seguretat del vostre sistema.<hr />",
 'imagemaxsize'         => "Limita les imatges de les pàgines de descripció d'imatges a:",
@@ -2202,10 +2467,12 @@ $1",
 'show-big-image'       => 'Imatge en màxima resolució',
 'show-big-image-thumb' => "<small>Mida d'aquesta previsualització: $1 × $2 píxels</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria de nous fitxers',
 'imagelisttext'         => "Llista {{PLURAL:$1|d'un sol fitxer|de '''$1''' fitxers ordenats $2}}.",
 'newimages-summary'     => 'Aquesta pàgina especial mostra els darrers fitxers carregats.',
+'newimages-legend'      => 'Nom del fitxer',
+'newimages-label'       => "Nom de fitxer (o part d'ell):",
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Res per veure.',
 'ilsubmit'              => 'Cerca',
@@ -2316,7 +2583,7 @@ La resta d'enllaços de la línia són les excepcions, és a dir, les pàgines o
 'exif-focallengthin35mmfilm'       => 'Distància focal per a peŀlícula de 35 mm',
 'exif-scenecapturetype'            => "Tipus de captura d'escena",
 'exif-gaincontrol'                 => "Control d'escena",
-'exif-contrast'                    => 'Contrast',
+'exif-contrast'                    => 'Taädam',
 'exif-saturation'                  => 'Saturació',
 'exif-sharpness'                   => 'Nitidesa',
 'exif-devicesettingdescription'    => 'Descripció dels paràmetres del dispositiu',
@@ -2415,6 +2682,18 @@ La resta d'enllaços de la línia són les excepcions, és a dir, les pàgines o
 'exif-lightsource-24'  => "Bombeta de tungstè d'estudi ISO",
 'exif-lightsource-255' => 'Altre font de llum',
 
+# Flash modes
+'exif-flash-fired-0'    => "No s'ha disparat el flaix",
+'exif-flash-fired-1'    => 'Flaix disparat',
+'exif-flash-return-0'   => 'no hi ha funció de detecció del retorn de la llum estroboscòpica',
+'exif-flash-return-2'   => "no s'ha detectat retorn de llum estroboscòpica",
+'exif-flash-return-3'   => "s'ha detectat retorn de llum estroboscòpica",
+'exif-flash-mode-1'     => 'disparada de flaix obligatòria',
+'exif-flash-mode-2'     => 'tret de flash suprimit',
+'exif-flash-mode-3'     => 'mode automàtic',
+'exif-flash-function-1' => 'Sense funció de flaix',
+'exif-flash-redeye-1'   => "reducció d'ulls vermells",
+
 'exif-focalplaneresolutionunit-2' => 'polzades',
 
 'exif-sensingmethod-1' => 'Indefinit',
@@ -2564,21 +2843,10 @@ $1
 Confirmeu que realment voleu tornar-la a crear.",
 'recreate'            => 'Torna a crear',
 
-# HTML dump
-'redirectingto' => "S'està redirigint a [[:$1]]...",
-
 # action=purge
-'confirm_purge'        => "Voleu buidar la memòria cau d'aquesta pàgina?
-
-$1",
 'confirm_purge_button' => "D'acord",
-
-# AJAX search
-'searchcontaining' => "Cerca pàgines que continguin ''$1''.",
-'searchnamed'      => "Cerca pàgines que s'anomenin ''$1''.",
-'articletitles'    => "Pàgines que comencen amb ''$1''",
-'hideresults'      => 'Amaga els resultats',
-'useajaxsearch'    => 'Utilitza la cerca en AJAX',
+'confirm-purge-top'    => "Voleu buidar la memòria cau d'aquesta pàgina?",
+'confirm-purge-bottom' => "Purgar una pàgina força que hi aparegui la versió més actual i n'esborra la memòria cau.",
 
 # Multipage image navigation
 'imgmultipageprev' => '� pàgina anterior',
@@ -2598,10 +2866,10 @@ $1",
 'table_pager_empty'        => 'Sense resultats',
 
 # Auto-summaries
-'autosumm-blank'   => "S'ha suprimit tot el contingut de la pàgina",
+'autosumm-blank'   => 'Pàgina blanquejada',
 'autosumm-replace' => 'Contingut canviat per «$1».',
 'autoredircomment' => 'Redirecció a [[$1]]',
-'autosumm-new'     => 'Pàgina nova, amb el contingut: «$1».',
+'autosumm-new'     => 'Es crea la pàgina amb «$1».',
 
 # Live preview
 'livepreview-loading' => "S'està carregant…",
@@ -2641,6 +2909,7 @@ També podeu [[Special:Watchlist/edit|utilitzar l'editor estàndard]].",
 
 # Core parser functions
 'unknown_extension_tag' => "Etiqueta d'extensió desconeguda «$1»",
+'duplicate-defaultsort' => 'Atenció: La clau d\'ordenació per defecte "$2" invalida l\'anterior clau "$1".',
 
 # Special:Version
 'version'                          => 'Versió', # Not used as normal message but as header for the special page itself
@@ -2670,13 +2939,13 @@ També podeu [[Special:Watchlist/edit|utilitzar l'editor estàndard]].",
 'filepath-summary' => "Aquesta pàgina especial retorna un camí complet d'un fitxer.
 Les imatges es mostren en plena resolució; altres tipus de fitxer s'incien amb el seu programa associat directament.
 
-Introduïu el nom del fitxer sense el prefix «{{ns:image}}»:",
+Introduïu el nom del fitxer sense el prefix «{{ns:file}}»:",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Cerca fitxers duplicats',
 'fileduplicatesearch-summary'  => "Cerca fitxers duplicats d'acord amb el seu valor de resum.
 
-Introduïu el nom del fitxer sense el prefix «{{ns:image}}:».",
+Introduïu el nom del fitxer sense el prefix «{{ns:file}}:».",
 'fileduplicatesearch-legend'   => 'Cerca duplicats',
 'fileduplicatesearch-filename' => 'Nom del fitxer:',
 'fileduplicatesearch-submit'   => 'Cerca',
@@ -2706,4 +2975,13 @@ Introduïu el nom del fitxer sense el prefix «{{ns:image}}:».",
 'blankpage'              => 'Pàgina en blanc',
 'intentionallyblankpage' => 'Pàgina intencionadament en blanc',
 
+# External image whitelist
+'external_image_whitelist' => " #Deixeu aquesta línia exactament igual com està<pre>
+#Poseu fragments de expressions regulars (regexps) (només la part entre els //) a sota
+#Aquests fragments es correspondran amb les URL d'imatges externes
+#Aquelles que hi coincideixin es mostraran com a imatges, les que no es mostraran com a enllaços
+#Les línies que començen amb un # es tracten com a comentaris
+
+#Poseu tots els fragments regex al damunt d'aquesta línia. Deixeu aquesta línia exactament com està</pre>",
+
 );
diff --git a/languages/messages/MessagesCbk_zam.php b/languages/messages/MessagesCbk_zam.php
index c396710d..78743ee1 100644
--- a/languages/messages/MessagesCbk_zam.php
+++ b/languages/messages/MessagesCbk_zam.php
@@ -50,14 +50,11 @@ $messages = array(
 'changed' => 'cambiao',
 'created' => 'creao',
 
-# Delete/protect/revert
+# Delete
 'actioncomplete' => 'Accion completo',
 
 # Block/unblock
 'blockip'           => 'Prohibi con el usario',
 'blockipsuccesssub' => 'El prohibicion es confirmado',
 
-# AJAX search
-'articletitles' => "Maga articulo que ta prinsipa con ''$1''",
-
 );
diff --git a/languages/messages/MessagesCdo.php b/languages/messages/MessagesCdo.php
index e52bbdce..ffe6610b 100644
--- a/languages/messages/MessagesCdo.php
+++ b/languages/messages/MessagesCdo.php
@@ -99,7 +99,7 @@ $messages = array(
 'mytalk'         => 'Ngu�i gì t�̤-lâung',
 'anontalk'       => 'Cī ciáh IP gì t�̤-lâung-hiĕk',
 'navigation'     => 'Īng-dô̤',
-'and'            => 'gâe̤ng',
+'and'            => '&#32;gâe̤ng',
 
 'returnto'         => 'Du�ng kó̤ $1.',
 'tagline'          => 'Lài-nguòng: {{SITENAME}}',
@@ -211,7 +211,7 @@ S�̤ kī só-gé̤ṳ-kó gì gu�ng-lī-uòng cūng-ku�ng g�i-sék: $1',
 
 # Login and logout pages
 'logouttitle'                => 'Ê̤ṳng-hô láuk-chók',
-'logouttext'                 => "<strong>Nṳ̄ hiêng-câi láuk-chók l�u.</strong><br />
+'logouttext'                 => "'''Nṳ̄ hiêng-câi láuk-chók l�u.'''<br />
 Nṳ̄ â̤-s�i s�i mò̤-miàng hu�ng-sék gié-sṳ̆k găk {{SITENAME}} gè̤-dēng láuk, nṳ̄ iâ â̤-s�i s�i dè̤ng-iông gì dióng-hô̤ hĕ̤k-ci� bĕk-nó̤h bĭk dióng-hô̤ gái láuk-diē. Di�h gé l�̤, nṳ̄ báuk-l�ng-ké ká̤-chṳ̄ (''browser cache'') nâ mò̤ tĕ̤ng táh gó̤ uâ, ô gì hiĕk giăng â̤ hiēng-sê nṳ̄ gó muôi láuk-chók.",
 'welcomecreation'            => '== Huăng-ngìng gu�ng-lìng, $1! ==
 
@@ -221,7 +221,6 @@ Nṳ̄ gì dióng-hô̤ Ä«-gÄ­ng kÅ­i hÅ�̤ lÄ�u. DÄ�ng nṳ̄ â̤-sÄ�i siÅ­-gÄ
 'yourpassword'               => 'Mĭk-m�',
 'yourpasswordagain'          => 'Dṳ̀ng-sĭng páh diē mĭk-m�',
 'remembermypassword'         => 'Giéu cī gá diêng-n�̤ gé diâng ngu�i gì dióng-hô̤ gâe̤ng mĭk-m�.',
-'loginproblem'               => '<b>Nṳ̄ láuk-diē chók ông-dà̤ l�u.</b><br />Gái ché si�h â!',
 'login'                      => 'Láuk-diē',
 'loginprompt'                => 'Páh kŭi cookies ciáh â̤ diē {{SITENAME}}.',
 'userlogin'                  => 'Láuk-diē / kŭi dióng-hô̤',
@@ -259,6 +258,11 @@ Siŭ gáu hâiu, chi�ng gái láuk diē si�h làu.',
 'accountcreatedtext'         => '$1 gì ê̤ṳng-hô dióng-hô̤ ī-gĭng châung-gióng l�u.',
 'loginlanguagelabel'         => 'Ngṳ̄-ngiòng: $1',
 
+# Password reset dialog
+'oldpassword' => 'Gô mĭk-m�:',
+'newpassword' => 'Sĭng mĭk-m�:',
+'retypenew'   => 'Káuk-nêng sĭng mĭk-m�:',
+
 # Edit page toolbar
 'bold_sample'     => 'Chŭ-t�̤ ùng-cê',
 'bold_tip'        => 'Chŭ-t�̤ ùng-cê',
@@ -271,8 +275,8 @@ Siŭ gáu hâiu, chi�ng gái láuk diē si�h làu.',
 'media_tip'       => 'Mùi-t�̤ ùng-giông lièng-giék',
 
 # Edit pages
-'summary'                  => 'Cūng-giék',
-'subject'                  => 'Dà̤-mĕ̤k/biĕu-dà̤',
+'summary'                  => 'Cūng-giék:',
+'subject'                  => 'Dà̤-mĕ̤k/biĕu-dà̤:',
 'minoredit'                => 'Guó-éu siŭ-g�i',
 'watchthis'                => 'Gáng-sê ci� hiĕk',
 'savearticle'              => 'B�̤-còng ci� hiĕk',
@@ -281,7 +285,7 @@ Siŭ gáu hâiu, chi�ng gái láuk diē si�h làu.',
 'showdiff'                 => 'Káng g�i-biéng gì buô-hông',
 'anoneditwarning'          => "'''GĪNG-GÓ̤:''' Nṳ̄ muôi láuk-diē.
 Nṳ̄ gì IP dê-cī â̤ ké̤ṳk gé di�h ci� hiĕk-miêng siŭ-g�i lĭk-sṳ̄ diē-sié.",
-'summary-preview'          => 'Cūng-giék ché-káng',
+'summary-preview'          => 'Cūng-giék ché-káng:',
 'blockedtitle'             => 'Ê̤ṳng-hô ké̤ṳk hŭng-s�̤ l�u',
 'loginreqtitle'            => 'Chi�ng sĕng láuk-diē',
 'loginreqlink'             => 'Láuk-diē',
@@ -293,18 +297,18 @@ Nṳ̄ gì IP dê-cī â̤ ké̤ṳk gé di�h ci� hiĕk-miêng siŭ-g�i lĭk-
 'anontalkpagetext'         => "----''Cī ti�ng t�̤-lâung-hiĕk mò̤ gó-dêng gì dióng-hô̤, nâ ô 1 ciáh IP dê-cī. Chi�ng cé̤ṳ-é: K�̤-nèng ng-nié 1 ciáh nè̤ng s�i-ê̤ṳng cī ciáh IP dê-cī. I�k-sṳ̄ nṳ̄ gó muôi kŭi 1 ciáh dióng-hô̤ bêng-chi� giéng-gáe̤k ci� làu-uâ sê làu ké̤ṳk nṳ̄ gì, chi�ng nṳ̄ [[Special:UserLogin|kŭi 1 ciáh dióng-hô̤ hĕ̤k-ci� láuk-diē]], cêu â̤ piáh-miēng ī-hâiu gái huák-sĕng cūng-ku�ng ông-dà̤.''",
 'noarticletext'            => 'Ci� hiĕk-miêng gà̤-dēng mò̤ ùng-cê. Nṳ̄ â̤-s�i găk gì-tă hiĕk-miêng [[Special:Search̤/{{PAGENAME}}|sìng-t�̤ ĭ gì biĕu-dà̤]] hĕ̤k-ci� [{{fullurl:{{FULLPAGENAME}}|action=edit}} cê-gă si�].',
 'clearyourcache'           => "'''Cé̤ṳ-é:''' B�̤-còng cĭ hâiu, k�̤-nèng di�h tĕ̤ng táh báuk-l�ng-ké gì ká̤-chṳ̄ ciáh â̤ káng-giéng di�h g�i-biéng. '''Mozilla / Firefox / Safari:''' áik ''Reload'' sèng-âu áik diâng ''Shift'', hĕ̤k-ci� áik ''Ctrl-Shift-R'' (Apple Mac sê ''Cmd-Shift-R''); '''IE:''' áik ''Refresh'' sèng-âu áik diâng ''Ctrl'', hĕ̤k-ci� áik ''Ctrl-F5''; '''Konqueror:''' nâ s�i áik ''Reload'', hĕ̤k-ci� áik ''F5''; '''Opera''' ê̤ṳng-hô buóh tĕ̤ng táh ká̤-chṳ̄, chi�ng s�i gă-sĭ ''Tools→Preferences''.",
-'previewnote'              => '<strong>Cé̤ṳ-é: Cuòi nâ sê ché káng ùng-cê gì iông-sék; nṳ̄ sū có̤ gì siŭ-g�i gó muôi b�̤-còng!</strong>',
+'previewnote'              => "'''Cé̤ṳ-é: Cuòi nâ sê ché káng ùng-cê gì iông-sék; nṳ̄ sū có̤ gì siŭ-g�i gó muôi b�̤-còng!'''",
 'editing'                  => 'Siŭ-g�i $1',
 'editingsection'           => 'Siŭ-g�i $1 (dâung)',
 'editingcomment'           => 'Siŭ-g�i $1 (pàng-lâung)',
 'editconflict'             => 'Siŭ-g�i dó̤i-chṳ̆ng: $1',
 'explainconflict'          => 'Bĕk-nè̤ng di�h nṳ̄ t�-sĕng siŭ-g�i cī miêng hiĕk gì sèng-âu ô có̤ gì-tă siŭ-g�i. Gà̤-dēng gì bēng-bēng hiēng-sê gì sê hiêng-câi có̤i sĭng gì bēng-bu�ng. Nṳ̄ sū có̤ gì g�i-biéng găk â-d�̤ gì bēng-bēng diē-sié. Nṳ̄ sṳ̆-iéu găk gà̤-dēng gì bēng-bēng diē-sié cīng-hăk nṳ̄ lâng ciáh nè̤ng sū có̤ gì g�i-biéng. I�k-gu� nṳ̄ dĭk-ciék áik "B�̤-còng ci� hiĕk", <b>nâ ô</b> gà̤-dēng bēng-bēng diē-sié gì ùng-cê â̤ ké̤ṳk b�̤-còng.',
 'yourtext'                 => 'Nṳ̄ gì ùng-cê',
-'editingold'               => '<strong>GĪNG-GÓ̤: Nṳ̄ hiêng-câi l�̤ siŭ-g�i ci� hiĕk-miêng ī-gĭng guó-gĭ gì bēng-bu�ng. Nṳ̄ nâ b�̤-còng ĭ, cī ciáh gô bēng-bu�ng cĭ-hâiu gì siŭ-g�i cêu mò̤ l�u.</strong>',
+'editingold'               => "'''GĪNG-GÓ̤: Nṳ̄ hiêng-câi l�̤ siŭ-g�i ci� hiĕk-miêng ī-gĭng guó-gĭ gì bēng-bu�ng. Nṳ̄ nâ b�̤-còng ĭ, cī ciáh gô bēng-bu�ng cĭ-hâiu gì siŭ-g�i cêu mò̤ l�u.'''",
 'yourdiff'                 => 'Chă-biék',
-'longpagewarning'          => "<strong>Gīng-gó̤: Bu�ng hiĕk ô $1 chiĕng-cê-ciék (''kilobyte'') dòng; ô si�h piĕ báuk-l�ng-ké (''browser'') mò̤ nièng-ngài piĕng-cĭk 32 chiĕng-cê-ciék c�̤-êu hĕ̤k-ci� gă dòng gì hiĕk. Chi�ng sṳ̆-liòng ci�ng ci� hiĕk tiáh có̤ gă d�i gì dâung.</strong>",
-'readonlywarning'          => '<strong>Gīng-gó̤: Ôi l�u mì-hô bu�ng câng, só-gé̤ṳ-kó ké̤ṳk s�̤ kī l�u, gó-chṳ̄ cī-lùng nṳ̄ mò̤ nièng-ngài b�̤-còng nṳ̄ gì siŭ-g�i. Chi�ng sĕng b�̤-còng di�h nṳ̄ diêng-n�̤ bu�ng-dê, dīng nék-gū mâing gái ché.</strong>',
-'protectedpagewarning'     => '<strong>GĪNG-GÓ̤: Ci� hiĕk ī-gĭng ké̤ṳk s�̤ kī go̤ l�u, nâ ô gu�ng-lī-uòng â̤ siŭ-g�i ĭ.</strong>',
+'longpagewarning'          => "'''Gīng-gó̤: Bu�ng hiĕk ô $1 chiĕng-cê-ciék (''kilobyte'') dòng; ô si�h piĕ báuk-l�ng-ké (''browser'') mò̤ nièng-ngài piĕng-cĭk 32 chiĕng-cê-ciék c�̤-êu hĕ̤k-ci� gă dòng gì hiĕk. Chi�ng sṳ̆-liòng ci�ng ci� hiĕk tiáh có̤ gă d�i gì dâung.'''",
+'readonlywarning'          => "'''Gīng-gó̤: Ôi l�u mì-hô bu�ng câng, só-gé̤ṳ-kó ké̤ṳk s�̤ kī l�u, gó-chṳ̄ cī-lùng nṳ̄ mò̤ nièng-ngài b�̤-còng nṳ̄ gì siŭ-g�i. Chi�ng sĕng b�̤-còng di�h nṳ̄ diêng-n�̤ bu�ng-dê, dīng nék-gū mâing gái ché.'''",
+'protectedpagewarning'     => "'''GĪNG-GÓ̤: Ci� hiĕk ī-gĭng ké̤ṳk s�̤ kī go̤ l�u, nâ ô gu�ng-lī-uòng â̤ siŭ-g�i ĭ.'''",
 'semiprotectedpagewarning' => "'''Cé̤ṳ-é:''' Ci� hiĕk-miêng ī-gĭng ké̤ṳk b�̤-hô, gó-chṳ̄ nâ ô láuk-diē gì ê̤ṳng-hô â̤-s�i siŭ-g�i ĭ.",
 'templatesused'            => 'Ci� hiĕk gà̤-dēng gì muò-bēng:',
 'templatesusedpreview'     => 'Ci� ché-káng-hiĕk gà̤-dēng gì muò-bēng:',
@@ -364,6 +368,7 @@ Siók-mìng: (dÄ�ng) = gâe̤ng dék sÄ­ng bÄ“ng-buÅ�ng bÄ«-piâng, (sèng) = gÃ
 'prevn'                 => 'sèng $1 hâung',
 'nextn'                 => 'â $1 hâung',
 'viewprevnext'          => 'Káng ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Mŭk-li�h',
 'showingresults'        => "Hiēng-sê téng #<b>$2</b> kăi-sṳ̄ gì {{PLURAL:$1|'''1'''|'''$1'''}} bĭk giék-gu�.",
 'showingresultsnum'     => "Hiēng-sê téng #<b>$2</b> kăi-sṳ̄ gì {{PLURAL:$3|'''1'''|'''$3'''}} bĭk giék-gu�.",
 
@@ -385,9 +390,6 @@ Siók-mìng: (dÄ�ng) = gâe̤ng dék sÄ­ng bÄ“ng-buÅ�ng bÄ«-piâng, (sèng) = gÃ
 'prefs-misc'            => 'Gì-tă',
 'saveprefs'             => 'B�̤-còng',
 'resetprefs'            => 'Dṳ̀ng-sĭng siék-diâng',
-'oldpassword'           => 'Gô mĭk-m�:',
-'newpassword'           => 'Sĭng mĭk-m�:',
-'retypenew'             => 'Káuk-nêng sĭng mĭk-m�:',
 'searchresultshead'     => 'Sìng-t�̤',
 'resultsperpage'        => 'Mūi hiĕk hu�ng-ông-liông:',
 'recentchangescount'    => 'Cī-b�ng g�i-biéng gì dà̤-mĕ̤k:',
@@ -453,7 +455,7 @@ Siók-mìng: (dÄ�ng) = gâe̤ng dék sÄ­ng bÄ“ng-buÅ�ng bÄ«-piâng, (sèng) = gÃ
 'uploadedfiles'     => 'Siông-duòng ùng-giông',
 'ignorewarning'     => 'Mò̤ sê̤ṳ gīng-gó̤ b�̤-còng ùng-giông.',
 'ignorewarnings'    => 'Mò̤ sê̤ṳ gīng-gó̤',
-'fileexists'        => 'Ī-gĭng ô si�h bĭk dè̤ng miàng ùng-giông, nṳ̄ nâ mâ̤ káuk-dêng nṳ̄ sê-ng-sê d�ng-cĭng páh-sáung g�i-biéng ĭ, chi�ng giēng-chă <strong><tt>$1</tt></strong>.',
+'fileexists'        => "Ī-gĭng ô si�h bĭk dè̤ng miàng ùng-giông, nṳ̄ nâ mâ̤ káuk-dêng nṳ̄ sê-ng-sê d�ng-cĭng páh-sáung g�i-biéng ĭ, chi�ng giēng-chă '''<tt>$1</tt>'''.",
 'successfulupload'  => 'Siông-diòng sìng-gŭng',
 'uploadwarning'     => 'Siông-duòng gīng-gó̤',
 'savefile'          => 'B�̤-còng ùng-giông',
@@ -463,15 +465,15 @@ Siók-mìng: (dÄ�ng) = gâe̤ng dék sÄ­ng bÄ“ng-buÅ�ng bÄ«-piâng, (sèng) = gÃ
 'destfilename'      => 'Mŭk-biĕu ùng-giông-miàng:',
 'watchthisupload'   => 'Gáng-sê ci� hiĕk',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'ùng-giông',
-'imagelist'      => 'Ùng-giông dăng-dăng',
-'imagelist_date' => 'NÄ­k-gÄ­',
-'imagelist_name' => 'Miàng',
-'imagelist_user' => 'Ê̤ṳng-hô',
-'imagelist_size' => 'Chióh-cháung',
+'listfiles'      => 'Ùng-giông dăng-dăng',
+'listfiles_date' => 'NÄ­k-gÄ­',
+'listfiles_name' => 'Miàng',
+'listfiles_user' => 'Ê̤ṳng-hô',
+'listfiles_size' => 'Chióh-cháung',
 
-# Image description page
+# File description page
 'imagelinks'                => 'Lièng-giék',
 'linkstoimage'              => 'Â-d�̤ gì hiĕk-miêng lièng gáu ci� ùng-giông:',
 'nolinkstoimage'            => 'Mò̤ hiĕk-miêng lièng gáu ci� ùng-giông.',
@@ -497,15 +499,8 @@ Siók-mìng: (dÄ�ng) = gâe̤ng dék sÄ­ng bÄ“ng-buÅ�ng bÄ«-piâng, (sèng) = gÃ
 'randomredirect' => 'Mu�ng káng dṳ̀ng-sĭng dêng-hióng',
 
 # Statistics
-'statistics'    => 'Só-gé̤ṳ',
-'sitestats'     => '{{SITENAME}} só-gé̤ṳ',
-'userstats'     => 'Ê̤ṳng-hô só-gé̤ṳ',
-'sitestatstext' => "Só-gé̤ṳ-kó diē-lié gê̤ṳng-cūng ô '''$1''' piĕng ùng-ci�ng. Bău-guăk t�̤-lâung-hiĕk, gâe̤ng {{SITENAME}} si�ng-guăng gì, muôi si� h�̤ gì, gâe̤ng gì-tă cék-liông mâ̤ gèng gì ùng-ci�ng. Nâ mò̤ sáung hī piĕ ùng-ci�ng, tūng-biáng ô '''$2''' piĕng hù-hăk biĕu-cūng gì ùng-ci�ng.
-
-'''$8''' bĭk ùng-giông ké̤ṳk siông-diòng.
-
-Téng bu�ng câng kiū siék gáu gĭng-dáng, ĭ ī-gĭng ké̤ṳk nè̤ng siŭ-g�i '''$4''' làu, bìng-gĭng si�h piĕng ùng-ci�ng ké̤ṳk nè̤ng siŭ-g�i '''$5''' làu.",
-'userstatstext' => "Gê̤ṳng-cūng ô '''{{PLURAL:$1|1|$1}}''' ciáh cé̤ṳ-cháh ê̤ṳng-hô, gì-dṳ̆ng '''{{PLURAL:$1|1|$2}}$2''' ciáh ('''$4%''') sê $5.",
+'statistics'              => 'Só-gé̤ṳ',
+'statistics-header-users' => 'Ê̤ṳng-hô só-gé̤ṳ',
 
 'brokenredirects-edit'   => '(g�i)',
 'brokenredirects-delete' => '(chēng)',
@@ -567,6 +562,16 @@ Téng bu�ng câng kiū siék gáu gĭng-dáng, ĭ ī-gĭng ké̤ṳk nè̤ng si
 # Special:Categories
 'categories' => 'Lôi-biék',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Ké̤ṳk chēng lâi gì ê̤ṳng-hô góng-hióng',
+
+# Special:LinkSearch
+'linksearch-ok' => 'Sìng-t�̤',
+
+# Special:Log/newusers
+'newuserlogpage'          => 'Kŭi dióng-hô̤ nĭk-cé',
+'newuserlog-create-entry' => 'Sĭng ê̤ṳng-hô',
+
 # E-mail user
 'emailuser'       => 'Gié diêng-piĕ ké̤ṳk ĭ',
 'emailpage'       => 'Gié diêng-piĕ ké̤ṳk ĭ',
@@ -581,65 +586,66 @@ Téng bu�ng câng kiū siék gáu gĭng-dáng, ĭ ī-gĭng ké̤ṳk nè̤ng si
 'emailsenttext'   => 'Nṳ̄ gì diêng-piĕ siĕu-sék ī-gĭng gié chók l�u.',
 
 # Watchlist
-'watchlist'            => 'Ngu�i gì gáng-sê-dăng',
-'mywatchlist'          => 'Ngu�i gì gáng-sê-dăng',
-'watchlistfor'         => "('''$1''' gì)",
-'nowatchlist'          => 'Nṳ̄ gì gáng-sê-dăng gà̤-dēng mò̤ dèu-mĕ̤k.',
-'watchnologin'         => 'Mò̤ láuk diē',
-'addedwatch'           => 'Gă-tiĕng gáu gáng-sê-dăng',
-'addedwatchtext'       => "\"[[:\$1]]\" ī-gĭng gă-tiĕng gáu nṳ̄ gì [[Special:Watchlist|gáng-sê-dăng]] l�u. Â-nĭk, ci� hiĕk gâe̤ng ĭ t�̤-lâung hiĕk gì g�i-biéng cêu â̤ hiēng-sê di�h hē̤-nē̤; bêng-chi�, nṳ̄ gáng-sê gì hiĕk găk \"[[Special:RecentChanges|Có̤i-gê̤ṳng gì g�i-biéng]]\" dăng-dăng gà̤-dēng gì cê-t�̤ â̤ có̤ '''chŭ-chŭ-nuóh'''.
+'watchlist'         => 'Ngu�i gì gáng-sê-dăng',
+'mywatchlist'       => 'Ngu�i gì gáng-sê-dăng',
+'watchlistfor'      => "('''$1''' gì)",
+'nowatchlist'       => 'Nṳ̄ gì gáng-sê-dăng gà̤-dēng mò̤ dèu-mĕ̤k.',
+'watchnologin'      => 'Mò̤ láuk diē',
+'addedwatch'        => 'Gă-tiĕng gáu gáng-sê-dăng',
+'addedwatchtext'    => "\"[[:\$1]]\" ī-gĭng gă-tiĕng gáu nṳ̄ gì [[Special:Watchlist|gáng-sê-dăng]] l�u. Â-nĭk, ci� hiĕk gâe̤ng ĭ t�̤-lâung hiĕk gì g�i-biéng cêu â̤ hiēng-sê di�h hē̤-nē̤; bêng-chi�, nṳ̄ gáng-sê gì hiĕk găk \"[[Special:RecentChanges|Có̤i-gê̤ṳng gì g�i-biéng]]\" dăng-dăng gà̤-dēng gì cê-t�̤ â̤ có̤ '''chŭ-chŭ-nuóh'''.
 
 I�k-sṳ̄ nṳ̄ buóh-si�ng téng nṳ̄ gáng-sê-dăng gà̤-dēng dṳ̀ lâi ci� hiĕk, áik kóng-cié-dèu (''sidebar'') siông gì \"ng-s�i gáng-sê\", cêu â̤-s�i l�u.",
-'removedwatch'         => 'Téng gáng-sê-dăng dṳ̀ lâi l�u',
-'removedwatchtext'     => '"[[:$1]]" hiĕk ī-gĭng téng nṳ̄ gì gáng-sê-dăng gà̤-dēng chēng lâi gó̤.',
-'watch'                => 'Gáng-sê',
-'watchthispage'        => 'Gáng-sê ci� hiĕk',
-'unwatch'              => 'Ng-s�i gáng-sê',
-'watchnochange'        => 'Nṳ̄ gì gáng-sê hiĕk-miêng cī-b�ng dŭ mò̤ nè̤ng dŭng.',
-'watchlist-details'    => '{{PLURAL:$1|$1|$1}} ti�ng hiĕk ké̤ṳk gáng-sê, mò̤ bău-guăk t�̤-lâung-hiĕk.',
-'wlshowlast'           => 'Hiēng-sê có̤i hâiu $1 dēng-cṳ̆ng $2 gĕ̤ng $3',
-'watchlist-show-bots'  => 'Hiēng-sê gĭ-ké-nè̤ng siŭ-g�i',
-'watchlist-hide-bots'  => 'Káung kī gĭ-ké-nè̤ng siŭ-g�i',
-'watchlist-show-own'   => 'Hiēng-sê ngu�i gì siŭ-g�i',
-'watchlist-hide-own'   => 'Káung kī ngu�i gì siŭ-g�i',
-'watchlist-hide-minor' => 'Káung kī guó-éu siŭ-g�i',
+'removedwatch'      => 'Téng gáng-sê-dăng dṳ̀ lâi l�u',
+'removedwatchtext'  => '"[[:$1]]" hiĕk ī-gĭng téng nṳ̄ gì gáng-sê-dăng gà̤-dēng chēng lâi gó̤.',
+'watch'             => 'Gáng-sê',
+'watchthispage'     => 'Gáng-sê ci� hiĕk',
+'unwatch'           => 'Ng-s�i gáng-sê',
+'watchnochange'     => 'Nṳ̄ gì gáng-sê hiĕk-miêng cī-b�ng dŭ mò̤ nè̤ng dŭng.',
+'watchlist-details' => '{{PLURAL:$1|$1|$1}} ti�ng hiĕk ké̤ṳk gáng-sê, mò̤ bău-guăk t�̤-lâung-hiĕk.',
+'wlshowlast'        => 'Hiēng-sê có̤i hâiu $1 dēng-cṳ̆ng $2 gĕ̤ng $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching' => 'Gáng-sê...',
 
 'enotif_newpagetext' => 'Cuòi sê sĭng hiĕk.',
 
-# Delete/protect/revert
-'deletepage'                  => 'Chēng hiĕk',
-'confirm'                     => 'Káuk-nêng',
-'excontent'                   => "nô̤i-ṳ̀ng sê: '$1'",
-'excontentauthor'             => "nô̤i-ṳ̀ng sê: '$1' (bêng-chi� cáuk-ci� nâ ô '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "dù táh cĭ-sèng gì nô̤i-ṳ̀ng sê: '$1'",
-'historywarning'              => 'Gīng-gó̤: Nṳ̄ buóh-ái chēng lâi gì hiĕk-miêng ô lĭk-sṳ̄:',
-'confirmdeletetext'           => 'Nṳ̄ cūng-bê ci�ng ci� hiĕk-miêng hĕ̤k ùng-giông lièng ĭ găk só-gé̤ṳ-kó gì lĭk-sṳ̄ ciòng-buô chēng lâi. Chi�ng nṳ̄ káuk-nêng: nṳ̄ d�ng-cĭng buóh si�ng cūng-ku�ng có̤, nṳ̄ liēu-g�i cūng-ku�ng có̤ gì hâiu-gu�, bêng-chi� nṳ̄ cūng-ku�ng có̤ sê hù-hăk [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Cék-hèng sìng-gŭng',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ī-gĭng ké̤ṳk chēng lâi go̤ l�u. Cī-b�ng chēng hiĕk gì gé-li�h dŭ gé di�h $2.',
-'deletedarticle'              => 'chēng lâi "[[$1]]"',
-'dellogpage'                  => 'Chēng hiĕk nĭk-cé',
-'dellogpagetext'              => 'Â-d�̤ sê gé-li�h cī-b�ng chēng hiĕk gì dăng-dăng.',
-'deletionlog'                 => 'chēng hiĕk nĭk-cé',
-'deletecomment'               => 'Buóh chēng gì nguòng-ĭng',
-'rollback'                    => 'Gâe̤ng siŭ-g�i du�ng kó̤',
-'rollback_short'              => 'Du�ng',
-'rollbacklink'                => 'du�ng',
-'rollbackfailed'              => 'Du�ng mâ̤ kó̤',
-'cantrollback'                => 'Mò̤ bâing-huák huòi-tó̤i siŭ-g�i; sèng 1 ciáh góng-hióng-ci� sê ci� hiĕk mì-ék gì cáuk-ci�.',
-'alreadyrolled'               => 'Mò̤ nièng-ngài huòi-tó̤i [[User:$2|$2]] ([[User talk:$2|T�̤-lâung]]) có̤i âu sū có̤ gì [[$1]] siŭ-g�i; bĕk-nè̤ng ī-gĭng siū-gái hĕ̤k-ci� huòi-tó̤i ci� hiĕk-miêng go̤ l�u.
+# Delete
+'deletepage'        => 'Chēng hiĕk',
+'confirm'           => 'Káuk-nêng',
+'excontent'         => "nô̤i-ṳ̀ng sê: '$1'",
+'excontentauthor'   => "nô̤i-ṳ̀ng sê: '$1' (bêng-chi� cáuk-ci� nâ ô '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'     => "dù táh cĭ-sèng gì nô̤i-ṳ̀ng sê: '$1'",
+'historywarning'    => 'Gīng-gó̤: Nṳ̄ buóh-ái chēng lâi gì hiĕk-miêng ô lĭk-sṳ̄:',
+'confirmdeletetext' => 'Nṳ̄ cūng-bê ci�ng ci� hiĕk-miêng hĕ̤k ùng-giông lièng ĭ găk só-gé̤ṳ-kó gì lĭk-sṳ̄ ciòng-buô chēng lâi. Chi�ng nṳ̄ káuk-nêng: nṳ̄ d�ng-cĭng buóh si�ng cūng-ku�ng có̤, nṳ̄ liēu-g�i cūng-ku�ng có̤ gì hâiu-gu�, bêng-chi� nṳ̄ cūng-ku�ng có̤ sê hù-hăk [[{{MediaWiki:Policy-url}}]].',
+'actioncomplete'    => 'Cék-hèng sìng-gŭng',
+'deletedtext'       => '"<nowiki>$1</nowiki>" ī-gĭng ké̤ṳk chēng lâi go̤ l�u. Cī-b�ng chēng hiĕk gì gé-li�h dŭ gé di�h $2.',
+'deletedarticle'    => 'chēng lâi "[[$1]]"',
+'dellogpage'        => 'Chēng hiĕk nĭk-cé',
+'dellogpagetext'    => 'Â-d�̤ sê gé-li�h cī-b�ng chēng hiĕk gì dăng-dăng.',
+'deletionlog'       => 'chēng hiĕk nĭk-cé',
+'deletecomment'     => 'Buóh chēng gì nguòng-ĭng',
+
+# Rollback
+'rollback'       => 'Gâe̤ng siŭ-g�i du�ng kó̤',
+'rollback_short' => 'Du�ng',
+'rollbacklink'   => 'du�ng',
+'rollbackfailed' => 'Du�ng mâ̤ kó̤',
+'cantrollback'   => 'Mò̤ bâing-huák huòi-tó̤i siŭ-g�i; sèng 1 ciáh góng-hióng-ci� sê ci� hiĕk mì-ék gì cáuk-ci�.',
+'alreadyrolled'  => 'Mò̤ nièng-ngài huòi-tó̤i [[User:$2|$2]] ([[User talk:$2|T�̤-lâung]]) có̤i âu sū có̤ gì [[$1]] siŭ-g�i; bĕk-nè̤ng ī-gĭng siū-gái hĕ̤k-ci� huòi-tó̤i ci� hiĕk-miêng go̤ l�u.
 
 Có̤i âu gì siŭ-g�i sê [[User:$3|$3]] ([[User talk:$3|T�̤-lâung]]) sū có̤ gì.',
-'editcomment'                 => 'Siŭ-g�i pàng-lâung sê: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) sū có̤ gì siŭ-g�i du�ng kó̤ [[User:$1|$1]] gì sèng 1 bĭk bēng-bu�ng', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'editcomment'    => "Siŭ-g�i pàng-lâung sê: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) sū có̤ gì siŭ-g�i du�ng kó̤ [[User:$1|$1]] gì sèng 1 bĭk bēng-bu�ng', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'B�̤-hô nĭk-cé',
 'protect-title'               => 'B�̤-hô "$1"',
+'prot_1movedto2'              => '[[$1]] iè gáu [[$2]]',
 'protect-legend'              => 'Káuk-nêng b�̤-hô',
 'protectcomment'              => 'B�̤-hô gì nguòng-ĭng',
 'protect-level-autoconfirmed' => 'Hŭng-s�̤ mò̤ cé̤ṳ-cháh ê̤ṳng-hô̤',
 'protect-level-sysop'         => 'Nâ gu�ng-lī-uòng',
+'protect-expiry-options'      => '2 dēng-cṳ̆ng:2 hours,1 gĕ̤ng:1 day,3 gĕ̤ng:3 days,1 l�̤-buái:1 week,2 l�̤-buái:2 weeks,1 month:1 ngu�k-nĭk,3 ngu�k-nĭk:3 months,6 ngu�k-nĭk:6 months,1 nièng:1 year,īng-u�ng:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Guòng-âing:',
 'restriction-level'           => 'Âing-cié dēng-gék:',
 'minimum-size'                => 'Có̤i nâung chióh-cháung',
@@ -687,7 +693,6 @@ Có̤i âu gì siŭ-g�i sê [[User:$3|$3]] ([[User talk:$3|T�̤-lâung]]) sū
 # What links here
 'whatlinkshere'       => 'Diē-nē̤ lièng gáu cē̤-nē̤',
 'whatlinkshere-title' => 'Lièng gáu $1 gì hiĕk-miêng',
-'linklistsub'         => '(Lièng-giék dăng-dăng)',
 'linkshere'           => "Â-d�̤ gì hiĕk-miêng lièng gáu '''[[:$1]]''':",
 'nolinkshere'         => "Mò̤ hiĕk-miêng lièng gáu '''[[:$1]]'''.",
 'isredirect'          => 'dṳ̀ng-sĭng dêng-hióng hiĕk',
@@ -769,6 +774,8 @@ Cé̤ṳ-é, nâ ô găk sĭng dà̤-mĕ̤k gô-d�̤ mò̤ ùng-ci�ng (mò̤ b
 
 Nâ cūng-ku�ng, nṳ̄ â̤-s�i cê-gă iè-dông hĕ̤k-ci� sê hăk-biáng hiĕk-miêng.",
 'movearticle'             => 'Iè-dông ùng-ci�ng',
+'movenologin'             => 'Muôi láuk-diē',
+'movenologintext'         => 'Sĕng [[Special:UserLogin|láuk-diē]] ciáh â̤-s�i iè-dông hiĕk-miêng.',
 'newtitle'                => 'Gáu sĭng dà̤-mĕ̤k',
 'move-watch'              => 'Gáng-sê ci� hiĕk',
 'movepagebtn'             => 'Iè-dông hiĕk-miêng',
@@ -813,7 +820,7 @@ Nâ cūng-ku�ng, nṳ̄ â̤-s�i cê-gă iè-dông hĕ̤k-ci� sê hăk-biáng
 # Media information
 'file-nohires' => '<small>Cuòi sê có̤i duâi chióh-cháung.</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1 gĭ-ké-nè̤ng)',
 'ilsubmit'     => 'Sìng-t�̤',
 'bydate'       => 'áng nĭk-gĭ',
@@ -858,15 +865,9 @@ Nâ-sÄ�i Ä­ *ng-sê* nṳ̄, chiÄ�ng mÅ�̤h chák Ä­. Gáu $4, káuk-nêng-mÄ� Ã
 'deletedwhileediting' => 'Gīng-gó̤: Cī miêng hiĕk găk nṳ̄ kī-chiū siŭ-g�i cĭ hâiu ké̤ṳk chēng lâi go̤ l�u!',
 'recreate'            => 'Dṳ̀ng-sĭng kŭi',
 
-# HTML dump
-'redirectingto' => 'Dṳ̀ng-sĭng dêng-hióng gáu [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'H�̤',
 
-# AJAX search
-'hideresults' => 'Káung kī giék-gu�',
-
 # Multipage image navigation
 'imgmultipageprev' => '� sèng 1 hiĕk',
 'imgmultipagenext' => 'â 1 hiĕk →',
diff --git a/languages/messages/MessagesCe.php b/languages/messages/MessagesCe.php
index 3a11f1c1..e08c65a8 100644
--- a/languages/messages/MessagesCe.php
+++ b/languages/messages/MessagesCe.php
@@ -14,14 +14,12 @@ $fallback = 'ru';
 $namespaceNames = array(
 	NS_MEDIA          => 'Медйа',
 	NS_SPECIAL        => 'Башхо',
-	NS_MAIN           => '',
 	NS_TALK           => 'Дийца',
 	NS_USER           => 'Юзер',
 	NS_USER_TALK      => 'Юзери_дийца',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_Дийца',
-	NS_IMAGE          => 'Сурт',
-	NS_IMAGE_TALK     => 'Сурти_дийца',
+	NS_FILE           => 'Сурт',
+	NS_FILE_TALK      => 'Сурти_дийца',
 	NS_MEDIAWIKI      => 'МедйаВики',
 	NS_MEDIAWIKI_TALK => 'МедйаВики_дийца',
 	NS_TEMPLATE       => 'Дакъа',
@@ -65,7 +63,7 @@ $messages = array(
 'qbfind'    => 'Лахар',
 'mytalk'    => 'Сан цІера дийцар',
 'anontalk'  => 'ХІар IP-адре�и дийцар',
-'and'       => 'а',
+'and'       => '&#32;а',
 
 'errorpagetitle'    => 'ГІалат',
 'help'              => 'ГIo',
@@ -154,8 +152,11 @@ $messages = array(
 'accountcreatedtext' => '$1 юзер аккаунт кхоллна.',
 'loginlanguagelabel' => 'Мотт: $1',
 
+# Password reset dialog
+'newpassword' => 'Керла тешаман дош:',
+
 # Edit pages
-'summary'         => 'Хийцами комментарий',
+'summary'         => 'Хийцами комментарий:',
 'minoredit'       => 'Жим Хийцам',
 'watchthis'       => 'TI�ргалдеш таптарш юккхе �зде',
 'savearticle'     => 'ДIа�зде Таптар',
@@ -178,15 +179,17 @@ $messages = array(
 # Diffs
 'editundo' => '�аца',
 
+# Search results
+'searchhelp-url' => 'Help:ГIo',
+
 # Preferences page
 'mypreferences'   => '�ан на�тройки',
 'changepassword'  => 'Тешаман дош хийцар хьам',
 'prefs-watchlist' => 'тергалдеш таптарш',
-'newpassword'     => 'Керла тешаман дош:',
 'textboxsize'     => 'Xийца',
 
 # User rights
-'editinguser' => "Хийца юзер '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser' => "Хийца юзер '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 
 # Recent changes
 'recentchanges' => 'Керла хийцамаш',
@@ -200,9 +203,9 @@ $messages = array(
 'upload'   => 'Чуоза Файл',
 'filename' => 'файл цIе',
 
-# Special:ImageList
-'imagelist_name' => 'Файли цІе',
-'imagelist_user' => 'юзер',
+# Special:ListFiles
+'listfiles_name' => 'Файли цІе',
+'listfiles_user' => 'юзер',
 
 # Random page
 'randompage' => 'Ца хууш ни�делла таптар',
@@ -227,6 +230,10 @@ $messages = array(
 # Special:Categories
 'categories' => 'Тобаш',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Керла юзери терахь',
+'newuserlog-create-entry' => 'Керла Юзер',
+
 # E-mail user
 'emailuser'       => 'Кехат Язде Юзеран',
 'defemailsubject' => '{{SITENAME}} и-пошта',
@@ -239,11 +246,14 @@ $messages = array(
 'watch'        => 'зен',
 'wlshowlast'   => 'Гайт тІаьххара $1 �ахьташ $2 денош $3',
 
-# Delete/protect/revert
+# Delete
 'confirm'     => 'Бакъдар',
 'dellogpage'  => 'ДІадайан таптараш',
 'deletionlog' => 'дІадайан таптараш',
 
+# Protect
+'prot_1movedto2' => '«[[$1]]» хийцина - «[[$2]]»',
+
 # Namespace form on various pages
 'blanknamespace' => '(Коьртаниг)',
 
@@ -283,7 +293,7 @@ $messages = array(
 # Media information
 'show-big-image' => 'Доккха де �урт',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Керла файлаш галерей',
 
 'exif-scenetype-1' => 'Сурт �фотографировано напр�мую',
diff --git a/languages/messages/MessagesCeb.php b/languages/messages/MessagesCeb.php
index f0fdb5d6..c0347715 100644
--- a/languages/messages/MessagesCeb.php
+++ b/languages/messages/MessagesCeb.php
@@ -10,6 +10,55 @@
  * @author לערי ריינה�רט
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Medya',
+	NS_SPECIAL          => 'Espesyal',
+	NS_TALK             => 'Hisgot',
+	NS_USER             => 'Gumagamit',
+	NS_USER_TALK        => 'Hisgot_sa_Gumagamit',
+	NS_PROJECT_TALK     => 'Hisgot_sa_$1',
+	NS_FILE             => 'Payl',
+	NS_FILE_TALK        => 'Hisgot_sa_Payl',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Hisgot_sa_MediaWiki',
+	NS_TEMPLATE         => 'Plantilya',
+	NS_TEMPLATE_TALK    => 'Hisgot_sa_Plantilya',
+	NS_HELP             => 'Tabang',
+	NS_HELP_TALK        => 'Hisgot_sa_Tabang',
+	NS_CATEGORY         => 'Kategoriya',
+	NS_CATEGORY_TALK    => 'Hisgot_sa_Kategoriya',
+);
+
+$namespaceAliases = array(
+	'Hisgot_sa$1' => NS_PROJECT_TALK,
+	'Imahen' => NS_FILE,
+	'Hisgot_sa_Imahen' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'DoblengRedirekta' ),
+	'BrokenRedirects'           => array( 'BuakngaRedirekta' ),
+	'Disambiguations'           => array( 'Mga Pagklaro' ),
+	'CreateAccount'             => array( 'Paghimo\'gAkawnt' ),
+	'Preferences'               => array( 'Mga Preperensya' ),
+	'Watchlist'                 => array( 'Gibantayan' ),
+	'Recentchanges'             => array( 'Bag-ongGiusab' ),
+	'Upload'                    => array( 'Pagsumiter' ),
+	'Listfiles'                 => array( 'Listahan sa Imahen' ),
+	'Newimages'                 => array( 'Bag-ongImahen' ),
+	'Statistics'                => array( 'Estadistika' ),
+	'Randompage'                => array( 'Bisan-unsa', 'Bisan-unsangPanid' ),
+	'Lonelypages'               => array( 'Nag-inusarangPanid', 'Sinagop nga Panid' ),
+	'Allpages'                  => array( 'TanangPanid' ),
+	'Contributions'             => array( 'Mga Tampo' ),
+	'Categories'                => array( 'Mga Kategoriya' ),
+	'Version'                   => array( 'Bersiyon' ),
+	'Mypage'                    => array( 'AkongPanid' ),
+	'Mytalk'                    => array( 'AkongHisgot' ),
+	'Mycontributions'           => array( 'AkongTampo' ),
+	'Search'                    => array( 'Pangita' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'            => 'Binadlisan nga mga sumpay:',
@@ -39,8 +88,6 @@ $messages = array(
 'underline-always' => 'Kanunay',
 'underline-never'  => 'Ayaw',
 
-'skinpreview' => '(Paunang tan-aw)',
-
 # Dates
 'sunday'        => 'Dominggo',
 'monday'        => 'Lunes',
@@ -125,7 +172,7 @@ $messages = array(
 'mytalk'         => 'Akong hisgot',
 'anontalk'       => 'Panghisgot-hisgot alang niining IP',
 'navigation'     => 'Tabok-tabok',
-'and'            => 'ug',
+'and'            => '&#32;ug',
 
 'returnto'          => 'Balik sa $1.',
 'tagline'           => 'Gikan sa {{SITENAME}}',
@@ -197,8 +244,6 @@ $messages = array(
 'privacypage'          => 'Project:Palisiya sa pribasidad',
 
 'badaccess-group0' => 'Wala ikaw tugoti sa pagpadayon sa aksyon nga imong gipangayo.',
-'badaccess-group1' => 'Ang aksyon nga imong gipangayo mahimo lamang ihatag sa mga miyembro sa grupong $1.',
-'badaccess-group2' => 'Ang aksyon nga imong gipangayo mahimo lamang ihatag sa mga miyembro sa mga grupong $1.',
 'badaccess-groups' => 'Ang aksyon nga imong gipangayo mahimo lamang ihatag sa mga miyembro sa mga grupong $1.',
 
 'versionrequired'     => 'Gikinahanglan ang Bersyong $1 sa MediaWiki',
@@ -256,7 +301,6 @@ $1",
 'badtitle'            => 'Bati nga titulo',
 'badtitletext'        => 'Ang gihangyong titulo sa panid mahimong inbalido, walay sulod, o nasayop og sumpay nga inter-pinulongan o inter-wiki nga titulo.
 Basin aduna kini usa o daghan pang mga karakter nga dili magamit isip titulo.',
-'perfdisabled'        => "Pasayloa, ang kini nga  ''feature'' temporaryong gihunong tungod kay gipahinay niini ang ''database'' sa punto nga dili na magamit ang wiki.",
 'viewsource'          => 'Tan-awa ang ginikanan',
 'ns-specialprotected' => 'Ang mga espesyal nga panid dili mausban.',
 
@@ -268,7 +312,6 @@ Ayaw kalimot sa pag-usab sa imong [[Special:Preferences|{{SITENAME}} mga prepere
 'loginpagetitle'          => 'Pagdayon sa tiggamit',
 'yourname'                => 'Ngalan sa tiggamit:',
 'remembermypassword'      => 'Hinumdomi ako niini nga kompyuter',
-'loginproblem'            => "<b>Naay kakulian sa imong pagpaila.</b><br />Sulayi'g usab!",
 'login'                   => 'Sulod',
 'nav-login-createaccount' => 'Rehistro / Dayon',
 'userlogin'               => 'Rehistro / Dayon',
@@ -292,7 +335,7 @@ Palihug pagpili og lain nga ngalan.',
 'hr_tip'        => 'Pahigda nga linya (palihog usahay ra gamita)',
 
 # Edit pages
-'summary'                   => 'Mubong sugid',
+'summary'                   => 'Mubong sugid:',
 'minoredit'                 => 'Ginagmay lang nga kausaban',
 'watchthis'                 => 'Bantayi kining maong panid',
 'savearticle'               => 'Tipigi ang panid',
@@ -307,13 +350,13 @@ Aron mahimo ang maong panid, pagtayp sa kahon sa ubos (tan-awa ang [[{{MediaWiki
 Kon miabot ka dinhi pinaagi sa usa ka sayop, palihog tuploka ang back nga tuplokanan sa imong brawser.',
 'noarticletext'             => 'Sa kasamtangan walay sulod nga teksto ang kining panid, pwede nimong  [[Special:Search/{{PAGENAME}}|pangitaon kining titulo sa panid]] sa ubang mga panid o [{{fullurl:{{FULLPAGENAME}}|action=edit}} usba kining panid].',
 'userpage-userdoesnotexist' => 'Ang akawnt sa tiggamit nga "$1" wala marehistro. Palihug tan-awa kon buot nimong himoon/usbon ang kining panid.',
-'previewnote'               => '<strong>Hinumdomi nga kini usa lang ka paunang tan-aw; wala pa matipigi ang imong giusab!</strong>',
+'previewnote'               => "'''Hinumdomi nga kini usa lang ka paunang tan-aw; wala pa matipigi ang imong giusab!'''",
 'editing'                   => 'Nagausab sa $1',
 'yourtext'                  => 'Imong gisulat',
 'yourdiff'                  => 'Mga kalainan',
-'copyrightwarning'          => 'Palihog hinumdomi nga ang tanang kontribusyon sa {{SITENAME}} giisip nga ubos sa $2 (basaha ang $1 alang sa dugang detalye). Kon dili nimo buot nga ang imong mga sinulat mausab ni bisan kinsa ug maapud-apod bisan dili ka pangayoan og pagtugot, ayaw sila ibutang dinhi.<br />
+'copyrightwarning'          => "Palihog hinumdomi nga ang tanang kontribusyon sa {{SITENAME}} giisip nga ubos sa $2 (basaha ang $1 alang sa dugang detalye). Kon dili nimo buot nga ang imong mga sinulat mausab ni bisan kinsa ug maapud-apod bisan dili ka pangayoan og pagtugot, ayaw sila ibutang dinhi.<br />
 Nagatimaan ka usab nga ikaw mismo ang nagsulat niini, o gikopya nimo kini gikan sa usa ka publikong rekursos o susamang libreng rekursos.
-<strong>AYAW PAGBUTANG DINHI OG MGA BINUHAT NGA MAY NANAG-IYA SA KATUNGOD SA PAGPATIK NGA WA KAY PERMISO!</strong>',
+'''AYAW PAGBUTANG DINHI OG MGA BINUHAT NGA MAY NANAG-IYA SA KATUNGOD SA PAGPATIK NGA WA KAY PERMISO!'''",
 'templatesused'             => 'Ang mga plantilyang gigamit niini nga panid:',
 'template-protected'        => '(giprotektahan)',
 
@@ -328,16 +371,18 @@ Nagatimaan ka usab nga ikaw mismo ang nagsulat niini, o gikopya nimo kini gikan
 'editundo'                => 'i-way bili',
 
 # Search results
-'noexactmatch' => "'''Walay panid nga ginganla'g \"\$1\".'''
+'noexactmatch'   => "'''Walay panid nga ginganla'g \"\$1\".'''
 Mahimo mong [[:\$1|isulat kini nga panid]].",
-'prevn'        => 'miaging $1',
-'nextn'        => 'sunod $1',
-'viewprevnext' => 'Tan-awa sa ($1) ($2) ($3)',
-'powersearch'  => 'Abansadong pagpangita',
+'prevn'          => 'miaging $1',
+'nextn'          => 'sunod $1',
+'viewprevnext'   => 'Tan-awa sa ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Mga sulod',
+'powersearch'    => 'Abansadong pagpangita',
 
 # Preferences page
 'mypreferences' => 'Akong preperensiya',
 'prefs-edits'   => 'Gidaghanon sa nausab:',
+'skin-preview'  => 'Paunang tan-aw',
 'saveprefs'     => 'Tipigi',
 
 # Recent changes
@@ -359,7 +404,7 @@ Ang mga panid sa [[Special:Watchlist|imong gibantayan]] '''nakalugom'''.",
 # Upload
 'upload' => 'Pagsumiter og payl',
 
-# Image description page
+# File description page
 'filehist'          => 'Kaagi sa payl',
 'filehist-help'     => 'I-klik ang petsa/oras aron makit-an ang hulagway sa payl niadtong panahona.',
 'filehist-current'  => 'kasamtangan',
@@ -386,6 +431,12 @@ Ang mga panid sa [[Special:Watchlist|imong gibantayan]] '''nakalugom'''.",
 'categoriespagetext'          => 'Ang mosunod nga mga kategoriya adunay sulod nga panid o medya.',
 'special-categories-sort-abc' => 'han-aya nga paalpabetikal',
 
+# Special:Log/newusers
+'newuserlogpagetext'       => "Kini mao ang ''log'' sa bag-ong namugnang mga gumagamit.",
+'newuserlog-byemail'       => "ang pasword gipadala na pinaagi sa ''e-mail''",
+'newuserlog-create-entry'  => 'Bag-ong gumagamit',
+'newuserlog-create2-entry' => "naghimo'g akawnt alang kang $1",
+
 # Watchlist
 'mywatchlist' => 'Akong gibantayan',
 'watch'       => 'Bantayi',
@@ -395,7 +446,7 @@ Ang mga panid sa [[Special:Watchlist|imong gibantayan]] '''nakalugom'''.",
 'watching'   => 'Gibantayan...',
 'unwatching' => 'Gipasagdan...',
 
-# Delete/protect/revert
+# Delete
 'deletedarticle' => 'gitangtang "[[$1]]"',
 
 # Contributions
diff --git a/languages/messages/MessagesCh.php b/languages/messages/MessagesCh.php
index 5f086ed3..c03f8b1a 100644
--- a/languages/messages/MessagesCh.php
+++ b/languages/messages/MessagesCh.php
@@ -9,6 +9,21 @@
  * @author Magalahi
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Espesiat',
+	NS_TALK             => 'Kombetsasion',
+	NS_USER             => 'Muna\'sesetbi',
+	NS_USER_TALK        => 'Kombetsasion_ni_muna\'sesetbi',
+	NS_PROJECT_TALK     => 'Kombetsasion_nu_$1',
+	NS_FILE             => 'Litratu',
+	NS_FILE_TALK        => 'Kombetsasion_ni_litratu',
+	NS_HELP             => 'Ayudo',
+	NS_HELP_TALK        => 'Kombetsasion_ni_ayudo',
+	NS_CATEGORY         => 'Katigoria',
+	NS_CATEGORY_TALK    => 'Kombetsasion_ni_katigoria',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'            => "Na'raya i inachetton:",
@@ -43,8 +58,6 @@ $messages = array(
 'underline-never'   => "Ni ngai'an",
 'underline-default' => 'Plantan orihinat ni Browser',
 
-'skinpreview' => "(Na'annok)",
-
 # Dates
 'sunday'        => 'Damenggo',
 'monday'        => 'Lunes',
@@ -129,7 +142,7 @@ $messages = array(
 'mytalk'         => 'Kombetsasion-hu',
 'anontalk'       => 'Kuentusiyi i IP este',
 'navigation'     => 'Nabegasion',
-'and'            => 'yan',
+'and'            => '&#32;yan',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -212,8 +225,6 @@ $messages = array(
 
 'badaccess'        => 'Lachi gi petmisu',
 'badaccess-group0' => "Ti siña un cho'gue i aksion ni finaisen-mu.",
-'badaccess-group1' => "Solamente masedi i grupun $1 chumo'gue i aksion ni finaisen-mu.",
-'badaccess-group2' => "Solamente masedi i muna'sesetbi ni grupun $1 chumo'gue i aksion ni finaisen-mu.",
 'badaccess-groups' => "Solamente masedi i muna'sesetbi ni grupun $1 chumo'gue i aksion ni finaisen-mu.",
 
 'versionrequired'     => 'Manesita i rebision $1 MediaWiki',
@@ -282,7 +293,7 @@ Ha nå'i i rason ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => "Logout ni muna'sesetbi",
-'logouttext'                 => "<strong>Malog-out hao på'go.</strong>
+'logouttext'                 => "'''Malog-out hao på'go.'''
 
 Siña hao kumontinua manu'usa {{SITENAME}} sin nå'an, pat siña uma'log ta'lo pat siña un usa otra na nå'an muna'sesetbi.
 Fanapunta na pålu na påhina siha para u na'annok na ma'log-in hao, asta ki un funas iyo-mu browser cache.",
@@ -295,7 +306,6 @@ Munga mamalefa tumulaika ga'ña-mu {{SITENAME}}.",
 'yourpasswordagain'          => "Taip ta'lo i password:",
 'remembermypassword'         => "Na'hasso iyo-ku login gi este na komputer",
 'yourdomainname'             => 'Lugat-mu:',
-'loginproblem'               => "<b>Guåha problema gi iyo-mu login.</b><br />Chagi ta'lo!",
 'login'                      => 'Log in',
 'nav-login-createaccount'    => "HÃ¥lom / fa'tinas kuenta-mu",
 'loginprompt'                => "Un nesita muna'sedi cookies para un log in gi {{SITENAME}}.",
@@ -374,6 +384,9 @@ Ti para u na'hanao ni sigienti na inayek siha.",
 'loginlanguagelabel'         => 'Lengguahe: $1',
 
 # Password reset dialog
+'oldpassword'      => 'Password bihu:',
+'newpassword'      => 'Password nuebu:',
+'retypenew'        => "Na'tekla nuebu na password:",
 'resetpass_submit' => "Po'lo i password ya log in",
 
 # Edit page toolbar
@@ -396,8 +409,8 @@ Ti para u na'hanao ni sigienti na inayek siha.",
 'hr_tip'          => "RÃ¥ya ni umadespatta (uho' fan)",
 
 # Edit pages
-'summary'                          => 'Sumaria',
-'subject'                          => "Suhetu/titulo mo'na",
+'summary'                          => 'Sumaria:',
+'subject'                          => "Suhetu/titulo mo'na:",
 'minoredit'                        => "Dikike' este na tiniliaka",
 'watchthis'                        => 'Pulan este na påhina',
 'savearticle'                      => 'Såtba i påhina',
@@ -411,8 +424,8 @@ An un yemme' Såtba ta'lo, para u såtba i tinilaika-mu sin sumaria.",
 'missingcommenttext'               => "NÃ¥'ye kommentu gi papa'.",
 'missingcommentheader'             => "'''Nina'hasso:''' Ti un tuge' suhetu/titulon må'gas para i kommentu.
 Yanggen un yemme' \"Såtba\" ta'lo, masåtba tinilaika-mu sin titulo.",
-'summary-preview'                  => 'Ripasun sumaria',
-'subject-preview'                  => 'Ripasun suhetu/titulo',
+'summary-preview'                  => 'Ripasun sumaria:',
+'subject-preview'                  => 'Ripasun suhetu/titulo:',
 'blockedtitle'                     => "Machoma' i muna'sesetbi",
 'blockedtext'                      => "<big>'''Machomma' i na'an-mu muna'sesetbi pat IP-mu.'''</big>
 
@@ -468,12 +481,12 @@ An un muna'sesetbi taina'an hao ya manñiente hao na guåha na kommentu ti prisi
 'userpage-userdoesnotexist'        => 'Ti marehistra i kuenata muna\'sesetbi "$1". Pot fabot chek kao malago\' hao un fa\'tinas/tulaika este na påhina.',
 'usercsspreview'                   => "'''Hasso fan na un ripapasa iyo-mu CSS muna'sesetbi, trabiha ti masåtba ha'!'''",
 'userjspreview'                    => "'''Hasso fan na un chachagi/ripapasa iyo-mu JavaScript muna'sesetbi, trabiha ti masåtba ha'!'''",
-'note'                             => '<strong>Fanapunta:</strong>',
-'previewnote'                      => '<strong>Annok este para manripasa;
-ti mas�åtba trabiha i tinilaika-mu!</strong>',
+'note'                             => "'''Fanapunta:'''",
+'previewnote'                      => "'''Annok este para manripasa;
+ti mas�åtba trabiha i tinilaika-mu!'''",
 'previewconflict'                  => "Este na ripasu ha na'annok i tinige' gi i kahon tumulaika gi sanhilo' kumu para u annok an un såtba ha'.",
-'session_fail_preview'             => "<strong>Dispensa! Ti siña in na'fo'na i tinilaika-mu sa' guåha fina'lingun infotmasion sesion.
-Pot fabot chagi ta'lo. Yanggen ti siña u såtba ta'lo, chagi muna'logout yan na'login ta'lo.</strong>",
+'session_fail_preview'             => "'''Dispensa! Ti siña in na'fo'na i tinilaika-mu sa' guåha fina'lingun infotmasion sesion.
+Pot fabot chagi ta'lo. Yanggen ti siña u såtba ta'lo, chagi muna'logout yan na'login ta'lo.'''",
 'editing'                          => 'Tumulaika $1',
 'editingsection'                   => 'Tumulaika $1 (patte)',
 'editingcomment'                   => 'Tulalaika $1 (komentu)',
@@ -485,17 +498,17 @@ Para un nesita muna'daña i tinilaika-mu yan i guinaha.
 '''I tinige' gi hilo' ha'''' para u såtba annai un yemme' \"Såtba i påhina\".",
 'yourtext'                         => "Tinige'-mu",
 'storedversion'                    => 'Tinilaika masåtba',
-'editingold'                       => "<strong>ADAHI: Un tulalaika un ribision påhina gus bihu.
-Yanggen un såtba ha', para u fana'malingu i tinilaika siha despues di enao na ribision.</strong>",
+'editingold'                       => "'''ADAHI: Un tulalaika un ribision påhina gus bihu.
+Yanggen un såtba ha', para u fana'malingu i tinilaika siha despues di enao na ribision.'''",
 'yourdiff'                         => 'Diferensia',
 'copyrightwarning'                 => "Pot fabot, fanapunta fan na makonsidera manmasotta todus i kontribusion gi {{SITENAME}} papa' i $2 (atan $1 para i attikulu siha).
 Yanggen munga hao na matulaika i tinige'-mu yan malamaña ya mana'apåttao ta'lo maseha månu, pues munga ma po'lu guini.<br />
 Un promette ham lokkue' na hågu ha' i tituge', pat un kopia ha' gi un lugat publika pat otru na lugat dibåtde.
-<strong>MUNGA MANFA'BURESI NA GAIDIRECHU I MANTITUGE'!</strong>",
+'''MUNGA MANFA'BURESI NA GAIDIRECHU I MANTITUGE'!'''",
 'copyrightwarning2'                => "Pot fabot, fanapunta fan na siña i otru na muna'sesetbi siha tumulaika/munasuha todus i kontribusion gi {{SITENAME}}.
 Yanggen munga hao na matulaika i tinige'-mu yan malamaña ya mana'apåttao ta'lo maseha månu, pues munga ma po'lu guini.<br />
 Un promette ham lokkue' na hågu ha' i tituge', pat un kopia ha' gi un lugat publika pat otru na lugat dibåtde (atan $1 para i attikulu siha).
-<strong>MUNGA MANFA'BURESI NA GAIDIRECHU I MANTITUGE'!</strong>",
+'''MUNGA MANFA'BURESI NA GAIDIRECHU I MANTITUGE'!'''",
 'templatesused'                    => "I plantiyas siha ni ma'usa gi påhina:",
 'templatesusedpreview'             => "I plantiyas ni ma'usa gi ripasu:",
 'templatesusedsection'             => "Plantiyas siha ni ma'usa gi este na seksion:",
@@ -530,11 +543,9 @@ Nina'i i rasion ''$2'' as $3",
 # History pages
 'viewpagelogs'        => 'Atan i historian påhina',
 'nohistory'           => "Tåya' historian tinilaika este na påhina.",
-'revnotfound'         => "Timasodda' i ribision",
-'revnotfoundtext'     => "Ti siña masodda' i tinilaika i påhina ni finaisen-mu. Pot fabot chek i URL ni un usa para i finatto-mu gi påhina.",
 'currentrev'          => 'Tinilaika modetnu',
 'revisionasof'        => 'Maribisa ginen $1',
-'revision-info'       => 'Tinilaika ginen $1 as $2',
+'revision-info'       => 'Tinilaika ginen $1 as $2', # Additionally available: $3: revision id
 'previousrevision'    => "�Ribision mas amko'",
 'nextrevision'        => 'Mas nuebu na tinilaika→',
 'currentrevisionlink' => 'I mas nuebu na tinilaika',
@@ -654,6 +665,7 @@ Siña un [[:\$1|fa'tinas i påhina]].",
 'prevn'                     => "$1 ni manmå'pos",
 'nextn'                     => "$1 ni manmamaila'",
 'viewprevnext'              => 'Atan i ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:Guinaha',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 na palabra|$2 na palabra siha}})',
 'search-result-score'       => 'Prinisisu: $1%',
 'search-redirect'           => "(na'dirihi $1)",
@@ -696,6 +708,7 @@ Fanapunta na fana'an ti gus nuebu i listan-ñiha i guinahan {{SITENAME}}.",
 'qbsettings-floatingright' => "Mamå'ya gi agapa'",
 'changepassword'           => 'Tulaika password',
 'skin'                     => 'LÃ¥ssas',
+'skin-preview'             => "Na'annok",
 'math'                     => 'Math',
 'dateformat'               => 'Plantiyas fecha',
 'datedefault'              => "TÃ¥ya' prifirensia",
@@ -713,9 +726,6 @@ Fanapunta na fana'an ti gus nuebu i listan-ñiha i guinahan {{SITENAME}}.",
 'prefs-misc'               => 'Misc',
 'saveprefs'                => 'SÃ¥tba',
 'resetprefs'               => "Na'funas i tinilaika ti manma'såtba siha",
-'oldpassword'              => 'Password bihu:',
-'newpassword'              => 'Password nuebu:',
-'retypenew'                => "Na'tekla nuebu na password:",
 'textboxsize'              => 'Tumulaika',
 'rows'                     => 'Fila siha:',
 'columns'                  => 'Kolumna siha:',
@@ -784,10 +794,10 @@ Fanapunta na fana'an ti gus nuebu i listan-ñiha i guinahan {{SITENAME}}.",
 'uploadlogpage' => "Na'kåtga i log",
 'uploadedimage' => 'mana\'kåtga hulu\' "[[$1]]"',
 
-# Special:ImageList
-'imagelist' => 'Listan atkibu',
+# Special:ListFiles
+'listfiles' => 'Listan atkibu',
 
-# Image description page
+# File description page
 'filehist'                  => 'Historian atkibu',
 'filehist-help'             => "Yemme' i fecha/ora para un li'e' i atkibu annai annok guihi na momentu.",
 'filehist-current'          => "pa'go",
@@ -820,16 +830,6 @@ Fanapunta na fana'an ti gus nuebu i listan-ñiha i guinahan {{SITENAME}}.",
 'randomredirect' => "Muna'dirihi maseha manu guatu",
 
 # Statistics
-'sitestatstext'          => "Guåha {{PLURAL:\$1|'''1''' na påhina|'''\$1''' na påhina siha}} gi database.
-Konsiste este yan påhinan \"kombetsasion\", påhinan {{SITENAME}}, påhinan \"stub\" ni mandikike', påhina ni manmadirihi ta'lo, yan otru na klåse påhina siha ni ti manmakonsidera påhina magåhet.
-Fuera di enao, guåha {{PLURAL:\$2|'''1''' na påhina|are '''\$2''' na påhina siha}} ni kasi {{PLURAL:\$2|påhina magåhet|påhina magåhet siha}}.
-
-Guåha '''\$8''' {{PLURAL:\$8|na atkibu ni makåtga hulu'|na atkibu siha ni manmakåtga hulu'}}.
-
-Guåha '''\$3''' {{PLURAL:\$3|na inatan påhina|na inatan påhina siha}}, yan '''\$4''' {{PLURAL:\$4|na tinilaikan påhina|na tinilaikan påhina siha}} desde mafa'tinas {{SITENAME}}.
-Masumma '''\$5''' na medianun tinilaika kada påhina, yan '''\$6''' na inatan kada tinilaika.
-
-'''\$7''' i mineddong [http://www.mediawiki.org/wiki/Manual:Job_queue job queue].",
 'statistics-mostpopular' => "PÃ¥hina siha ni mas ma'atan",
 
 'disambiguations'     => "Ti mania'abak na påhina siha",
@@ -882,7 +882,6 @@ Masumma '''\$5''' na medianun tinilaika kada påhina, yan '''\$6''' na inatan ka
 'speciallogtitlelabel' => 'Titulo:',
 'log'                  => 'Logs',
 'all-logs-page'        => 'Todu i logs siha',
-'log-search-submit'    => 'HÃ¥nao',
 
 # Special:AllPages
 'allpages'       => 'Todu i påhina siha',
@@ -900,54 +899,59 @@ Masumma '''\$5''' na medianun tinilaika kada påhina, yan '''\$6''' na inatan ka
 'special-categories-sort-count' => 'såttea pot tinefong',
 'special-categories-sort-abc'   => 'såttea pot i atfabetu',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Aligao',
+
 # E-mail user
 'emailuser' => "Na'e-mail i muna'sesetbi este",
 
 # Watchlist
-'watchlist'            => 'Listan pinilan-hu',
-'mywatchlist'          => 'Listan pinilan-hu',
-'watchlistfor'         => "(para '''$1''')",
-'addedwatch'           => "Mapo'lo gi listan pinilan",
-'addedwatchtext'       => "Mana'suha i påhina \"[[:\$1]]\" para iyo-mu [[Special:Watchlist|Listan pinilan]].
+'watchlist'         => 'Listan pinilan-hu',
+'mywatchlist'       => 'Listan pinilan-hu',
+'watchlistfor'      => "(para '''$1''')",
+'addedwatch'        => "Mapo'lo gi listan pinilan",
+'addedwatchtext'    => "Mana'suha i påhina \"[[:\$1]]\" para iyo-mu [[Special:Watchlist|Listan pinilan]].
 I tinilaika siha mo'na gi tiempo kontodu i påhinan kombetsasion siha para u fana'lista guihi, yan para u '''na'potpot''' i påhina gi halom [[Special:RecentChanges|i listan tinilaika gi halacha]] para un ayek ha' mas libianu.",
-'removedwatch'         => "Mana'suha gi listan pinilan",
-'removedwatchtext'     => 'Mana\'suha i påhinan "[[:$1]]" gi [[Special:Watchlist|listan pinilan-mu]].',
-'watch'                => 'Pulan',
-'watchthispage'        => 'Pulan este na påhina',
-'unwatch'              => 'Basta mapulan',
-'watchlist-details'    => '{{PLURAL:$1|$1 påhina|$1 na påhina siha}} un pupulan, sin i påhinan kombetsasion siha.',
-'wlshowlast'           => "Na'annok $1 na ora yan $2 na diha siha gi halacha $3",
-'watchlist-hide-bots'  => "NÃ¥'na' i tinilaikan bot",
-'watchlist-hide-own'   => "NÃ¥'na' i tinilaika-hu",
-'watchlist-hide-minor' => "NÃ¥'na' i tinilaika siha ni mandikike'",
+'removedwatch'      => "Mana'suha gi listan pinilan",
+'removedwatchtext'  => 'Mana\'suha i påhinan "[[:$1]]" gi [[Special:Watchlist|listan pinilan-mu]].',
+'watch'             => 'Pulan',
+'watchthispage'     => 'Pulan este na påhina',
+'unwatch'           => 'Basta mapulan',
+'watchlist-details' => '{{PLURAL:$1|$1 påhina|$1 na påhina siha}} un pupulan, sin i påhinan kombetsasion siha.',
+'wlshowlast'        => "Na'annok $1 na ora yan $2 na diha siha gi halacha $3",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Mamulan...',
 'unwatching' => 'Pumapara mamulan...',
 
-# Delete/protect/revert
-'deletepage'                  => "Na'suha i påhina",
-'historywarning'              => "Adahi: Guåha historia-ña ni påhina na para un na'suha:",
-'confirmdeletetext'           => "Para un na'suha i påhina kontodu i historia-ña.
+# Delete
+'deletepage'            => "Na'suha i påhina",
+'historywarning'        => "Adahi: Guåha historia-ña ni påhina na para un na'suha:",
+'confirmdeletetext'     => "Para un na'suha i påhina kontodu i historia-ña.
 Konfotme fan na este i malago'-mu, na kumonprende hao hiniyong-ña, yan tumattiyi [[{{MediaWiki:Policy-url}}|i polisia]] ni bidada-mu.",
-'actioncomplete'              => 'Funhayan i aksion',
-'deletedtext'                 => 'Mana\'suha "<nowiki>$1</nowiki>".
+'actioncomplete'        => 'Funhayan i aksion',
+'deletedtext'           => 'Mana\'suha "<nowiki>$1</nowiki>".
 Chek $2 para i historian muna\'suha gi halacha.',
-'deletedarticle'              => 'Mana\'suha "[[$1]]"',
-'dellogpage'                  => "Historian muna'suha",
-'deletecomment'               => "Rason ni muna'suha:",
-'deleteotherreason'           => 'Otru na rason:',
-'deletereasonotherlist'       => 'Otru rason',
-'rollbacklink'                => 'tulaika tatte',
+'deletedarticle'        => 'Mana\'suha "[[$1]]"',
+'dellogpage'            => "Historian muna'suha",
+'deletecomment'         => "Rason ni muna'suha:",
+'deleteotherreason'     => 'Otru na rason:',
+'deletereasonotherlist' => 'Otru rason',
+
+# Rollback
+'rollbacklink' => 'tulaika tatte',
+
+# Protect
 'protectlogpage'              => 'I historian proteksion',
+'prot_1movedto2'              => 'Makånya [[$1]] påra [[$2]]',
 'protectcomment'              => 'Komentu:',
 'protectexpiry'               => 'Munhåyan:',
 'protect_expiry_invalid'      => 'Lachi i oran funhåyan.',
 'protect_expiry_old'          => 'Esta maloffan i oran funhåyan.',
 'protect-unchain'             => "Na'suha i petmisun kinanya",
-'protect-text'                => 'Siña un tulaika i nibet proteksion ni påhina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Ti nahong i petmisu kuenta-mu tumulaika nibet proteksion ni påhina siha.
-Estague taiguini i nibet i påhina <strong>$1</strong>:',
+'protect-text'                => "Siña un tulaika i nibet proteksion ni påhina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Ti nahong i petmisu kuenta-mu tumulaika nibet proteksion ni påhina siha.
+Estague taiguini i nibet i påhina '''$1''':",
 'protect-fallback'            => 'Afuetsas "$1" na petmisu',
 'protect-level-autoconfirmed' => "Chomma' i muna'sesetbi siha ti manma'rehistra",
 'protect-expiring'            => 'munhåyan gi $1 (UTC)',
@@ -982,7 +986,6 @@ Estague taiguini i nibet i påhina <strong>$1</strong>:',
 # What links here
 'whatlinkshere'       => "HÃ¥fa ha na'chetton guini",
 'whatlinkshere-title' => 'I påhina siha ni mana\'chetton yan "$1"',
-'linklistsub'         => '(Listan inachetton siha)',
 'linkshere'           => "Umachetton i sigienten påhina siha yan '''[[:$1]]''':",
 'nolinkshere'         => "Taya' umachetton yan '''[[:$1]]'''.",
 'isredirect'          => 'dirihi i påhina',
@@ -1103,7 +1106,7 @@ Ayek fan otru nå'an-ña.",
 'show-big-image'       => 'Magåhet mineddong-ña',
 'show-big-image-thumb' => '<small>Mineddong i ripasu: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Galarian atkibu mannuebu siha',
 'ilsubmit'  => 'Aligao',
 
diff --git a/languages/messages/MessagesChr.php b/languages/messages/MessagesChr.php
index fed3f34b..9d48a10c 100644
--- a/languages/messages/MessagesChr.php
+++ b/languages/messages/MessagesChr.php
@@ -4,9 +4,17 @@
  * @ingroup Language
  * @file
  *
+ * @author Maximillion Pegasus
  */
 
 $messages = array(
+# Dates
+'january'  => 'U�Ꮈ��',
+'february' => 'KᎠᎦᎵ',
+'march'    => 'Ꭰ��',
+'april'    => '�Ꮆ�',
+'june'     => 'DᎡᎭᎷ�',
+
 'about'          => 'Ꭼ����',
 'article'        => 'Ꭴ��Ꭼ',
 'qbpageinfo'     => 'ᎦᎷᎯ��',
@@ -24,6 +32,7 @@ $messages = array(
 'talk'             => 'Ꭷ�ᎮᎸ�',
 'toolbox'          => 'ᎪᎱ�� Ꭼ����� Ꭷ��Ꭲ',
 'otherlanguages'   => 'Ꭽ�Ꮎ�� �Ꭲ �Ꭶ��Ꭿ��',
+'jumptosearch'     => 'Ꭱ�t',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutpage'            => 'Project:Ꭼ����',
@@ -36,6 +45,12 @@ $messages = array(
 'nstab-main'     => 'Ꭴ��Ꭼ',
 'nstab-category' => '�ᎦᎪ�',
 
+# General errors
+'viewsource' => 'DᎢᎧ��Ꭲ DᎢ�ᎴᎲ�Ꭼ',
+
+# Diffs
+'editundo' => 'IᎬᎾ���',
+
 # Search results
 'powersearch' => 'Ꭰ���',
 
@@ -54,7 +69,10 @@ $messages = array(
 # Random page
 'randompage' => 'Ꭴ���Ꭺ� Ꭴ���',
 
-# Delete/protect/revert
+# Watchlist
+'watch' => 'WᎠ�',
+
+# Delete
 'actioncomplete' => 'Ꭰ����Ꭿ',
 
 # What links here
@@ -63,7 +81,7 @@ $messages = array(
 # Block/unblock
 'proxyblocksuccess' => 'Ꭰ���Ꭿ.',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Ꭰ���',
 
 # Special:SpecialPages
diff --git a/languages/messages/MessagesCo.php b/languages/messages/MessagesCo.php
index 2f5beb1a..32244ae4 100644
--- a/languages/messages/MessagesCo.php
+++ b/languages/messages/MessagesCo.php
@@ -78,7 +78,7 @@ $messages = array(
 'mytalk'         => 'E mo discussioni',
 'anontalk'       => 'Discussione per istu indirizzu IP',
 'navigation'     => 'Navigazione',
-'and'            => 'è',
+'and'            => '&#32;è',
 
 'errorpagetitle'   => 'Errore',
 'returnto'         => 'Vultà à $1.',
@@ -171,6 +171,9 @@ $messages = array(
 'accountcreatedtext'         => "U registramentu di l'utilizatore $1 hè statu fattu.",
 'loginlanguagelabel'         => 'Lingua: $1',
 
+# Password reset dialog
+'retypenew' => 'Scrive torna a nova parulla secreta:',
+
 # Edit page toolbar
 'image_sample' => 'Esempiu.jpg',
 
@@ -197,7 +200,6 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 'cantcreateaccounttitle' => 'Registramentu micca pussibile',
 
 # History pages
-'revnotfound' => 'Revisione micca truvata',
 'currentrev'  => 'Ultima revisione',
 'page_first'  => 'prima',
 'deletedrev'  => '[supprimatu]',
@@ -222,7 +224,6 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 'math_syntax_error' => 'errore di sintassa',
 'prefs-rc'          => 'Ultimi cambiamenti',
 'prefs-watchlist'   => 'Articuli seguitati',
-'retypenew'         => 'Scrive torna a nova parulla secreta:',
 'columns'           => 'Culonne:',
 'searchresultshead' => 'Ricerca',
 'localtime'         => 'Ora lucale',
@@ -230,7 +231,7 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 'files'             => 'Schedarii',
 
 # User rights
-'editinguser'             => "Mudifica di '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'             => "Mudifica di '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-groupsmember' => 'Membru di:',
 
 # Groups
@@ -273,13 +274,13 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 
 'upload-file-error' => 'Errore internu',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'schedariu',
-'imagelist_date' => 'Data',
-'imagelist_name' => 'Nome',
-'imagelist_user' => 'Utilizatore',
+'listfiles_date' => 'Data',
+'listfiles_name' => 'Nome',
+'listfiles_user' => 'Utilizatore',
 
-# Image description page
+# File description page
 'filehist'         => "Cronolugia di l'imagine",
 'filehist-user'    => 'Utilizatore',
 'imagelinks'       => 'Ligami',
@@ -292,9 +293,8 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 'randompage' => 'Pagina à casu',
 
 # Statistics
-'statistics' => 'Statistiche',
-'sitestats'  => "Statistiche nant'à {{SITENAME}} in lingua corsa",
-'userstats'  => "Statistiche nant'à l'utilizatori",
+'statistics'              => 'Statistiche',
+'statistics-header-users' => "Statistiche nant'à l'utilizatori",
 
 'brokenredirects-edit' => '(mudificà)',
 
@@ -330,6 +330,10 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 # Special:Categories
 'categories' => 'Categurie',
 
+# Special:LinkSearch
+'linksearch-ns' => 'Spaziu:',
+'linksearch-ok' => 'Ricerca',
+
 # Special:ListUsers
 'listusers-submit' => 'Mustrà',
 
@@ -340,29 +344,27 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 'emailsend'    => 'Invià',
 
 # Watchlist
-'watchlist'            => 'Articuli seguitati',
-'mywatchlist'          => 'Articuli seguitati',
-'watchlistfor'         => "(di l'ultizatore '''$1''')",
-'addedwatch'           => "Aghjuntu à u listinu di l'articuli seguitati",
-'watch'                => 'Seguità',
-'watchlist-show-bots'  => 'Mustrà mudificazione di boti',
-'watchlist-show-own'   => 'Mustrà e mo cuntribuzioni',
-'watchlist-hide-own'   => 'Piattà e mo cuntribuzioni',
-'watchlist-show-minor' => 'Mustrà i cambiamenti minori',
-'watchlist-hide-minor' => 'Piattà i cambiamenti minori',
+'watchlist'    => 'Articuli seguitati',
+'mywatchlist'  => 'Articuli seguitati',
+'watchlistfor' => "(di l'ultizatore '''$1''')",
+'addedwatch'   => "Aghjuntu à u listinu di l'articuli seguitati",
+'watch'        => 'Seguità',
 
 'enotif_reset'       => 'Marcà tutte e pagine visitate',
 'enotif_newpagetext' => 'Ista hè una pagina nova.',
 'changed'            => 'cambiatu',
 'created'            => 'creatu',
 
-# Delete/protect/revert
-'deletepage'                  => 'Supprimà a pagina',
-'excontent'                   => "u cuntenutu era: '$1'",
-'excontentauthor'             => "u cuntenutu era: '$1' (è u solu cuntributore era '[[Special:Contributions/$2|$2]]')",
-'exblank'                     => 'a pagina era biota',
-'actioncomplete'              => 'Azzione compia',
+# Delete
+'deletepage'      => 'Supprimà a pagina',
+'excontent'       => "u cuntenutu era: '$1'",
+'excontentauthor' => "u cuntenutu era: '$1' (è u solu cuntributore era '[[Special:Contributions/$2|$2]]')",
+'exblank'         => 'a pagina era biota',
+'actioncomplete'  => 'Azzione compia',
+
+# Protect
 'protectedarticle'            => 'prutettu "[[$1]]"',
+'prot_1movedto2'              => 'hà mossu [[$1]] à [[$2]]',
 'protect-legend'              => 'Cunfirmà a prutezzione',
 'protect-level-autoconfirmed' => 'Bluccà i cuntributori micca arrighjistrati',
 
@@ -462,7 +464,7 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 # Media information
 'show-big-image' => 'Imagine in alta resoluzione',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1 boti)',
 'noimages'     => 'Nulla da vede.',
 'ilsubmit'     => 'Ricerca',
@@ -494,10 +496,6 @@ U to indirizzu IP serà registratu indu a cronolugia di ista pagina.",
 # action=purge
 'confirm_purge_button' => "D'accordu",
 
-# AJAX search
-'articletitles' => "Articuli chì cumincianu cù ''$1''",
-'hideresults'   => 'Piattà i risultati',
-
 # Table pager
 'table_pager_next'  => 'Prossima pagina',
 'table_pager_first' => 'Prima pagina',
diff --git a/languages/messages/MessagesCrh_cyrl.php b/languages/messages/MessagesCrh_cyrl.php
index 34148891..0ed751f9 100644
--- a/languages/messages/MessagesCrh_cyrl.php
+++ b/languages/messages/MessagesCrh_cyrl.php
@@ -26,8 +26,8 @@ $namespaceNames = array(
     NS_USER_TALK                 => 'Къулланыджы_музакере�и',
     # NS_PROJECT set by $wgMetaNamespace
     NS_PROJECT_TALK              => '$1_музакере�и',
-    NS_IMAGE                     => 'Ре�им',
-    NS_IMAGE_TALK                => 'Ре�им_музакере�и',
+    NS_FILE                      => 'Ре�им',
+    NS_FILE_TALK                 => 'Ре�им_музакере�и',
     NS_MEDIAWIKI                 => 'МедиаВики',
     NS_MEDIAWIKI_TALK            => 'МедиаВики_музакере�и',
     NS_TEMPLATE                  => 'Шаблон',
@@ -46,8 +46,8 @@ $namespaceAliases = array(
 	"Qullanıcı"             => NS_USER,
 	"Qullanıcı_muzakeresi"  => NS_USER_TALK,
 	"$1_muzakeresi"         => NS_PROJECT_TALK,
-	"Resim"                 => NS_IMAGE,
-	"Resim_muzakeresi"      => NS_IMAGE_TALK,
+	"Resim"                 => NS_FILE,
+	"Resim_muzakeresi"      => NS_FILE_TALK,
 	"MediaViki"             => NS_MEDIAWIKI,
 	"MediaViki_muzakeresi"  => NS_MEDIAWIKI_TALK,
 	'Åžablon'                => NS_TEMPLATE,
@@ -58,15 +58,6 @@ $namespaceAliases = array(
 	'Kategoriya_muzakeresi' => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-    'standard'    => 'Стандарт',
-    'nostalgia'   => '�о�тальги�',
-    'cologneblue' => 'Кёльн а�ретлиги',
-    'monobook'    => 'MonoBook',
-    'myskin'      => 'Озь ре�имлеме',
-    'chick'       => 'Чипче',
-    'simple'      => '�дий'
-);
 
 $datePreferences = array(
     'default',
@@ -119,8 +110,8 @@ $messages = array(
 'tog-numberheadings'          => 'Серлеваларны автоматик номераландыр',
 'tog-showtoolbar'             => 'Денъишиклик �пкъан вакъытта �рдымджы дёгмелерни ко�ьтер. (JavaScript)',
 'tog-editondblclick'          => 'Саифени чифт ба�ып денъиштирмеге башла (JavaScript)',
-'tog-editsection'             => 'Болюмлерни [денъиштир] багълантыларны иле денъиштирме акъкъы бер',
-'tog-editsectiononrightclick' => 'Болюм �ерлева�ына онъ ба�ып болюмде денъишикликке изин бер. (JavaScript)',
+'tog-editsection'             => 'Болюклерни [денъиштир] багълантыларны иле денъиштирме акъкъы бер',
+'tog-editsectiononrightclick' => 'Болюк �ерлева�ына онъ ба�ып болюкте денъишикликке рух�ет бер. (JavaScript)',
 'tog-showtoc'                 => 'Мундеридже джедвели ко�ьтер (3 данеден зи�де �ерлева�ы олгъан �аифелер ичюн)',
 'tog-rememberpassword'        => 'Парольни хатырла',
 'tog-editwidth'               => 'Язув пенджере�и там кенишликте ол�ун',
@@ -146,6 +137,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Козетюв джедвелимден меним денъишикликлеримни гизле',
 'tog-watchlisthidebots'       => 'Козетюв джедвелимден бот денъишикликлерини гизле',
 'tog-watchlisthideminor'      => 'Козетюв джедвелимден кичик денъишикликлерни гизле',
+'tog-watchlisthideliu'        => 'Козетюв джедвелимде къайдлы къулланыджылар тарафындан �пылгъан денъишикликлерни ко�ьтерме',
+'tog-watchlisthideanons'      => 'Козетюв джедвелимде къайд�ыз (аноним) къулланыджылар тарафындан �пылгъан денъишикликлерни ко�ьтерме',
 'tog-nolangconversion'        => 'Язув �и�тема�ы вариантлары денъиштирювни ишлетме',
 'tog-ccmeonemails'            => 'Дигер къулланыджыларгъа ёллагъан мектюплеримнинъ копи�ларыны манъа да ёлла',
 'tog-diffonly'                => 'Тенъештирме �аифелеринде �аифенинъ ��а� мундеридже�ини ко�ьтерме',
@@ -155,8 +148,6 @@ $messages = array(
 'underline-never'   => '��ла',
 'underline-default' => 'Браузер къарар бер�ин',
 
-'skinpreview' => '(Ог бакъув)',
-
 # Dates
 'sunday'        => 'Базар',
 'monday'        => 'Базар�рте�и',
@@ -250,7 +241,7 @@ $messages = array(
 'mytalk'         => 'Музакере �аифем',
 'anontalk'       => 'Бу IP-нинъ музакере�и',
 'navigation'     => 'Сайтта ёл тапув',
-'and'            => 'ве',
+'and'            => '&#32;ве',
 
 # Metadata in edit box
 'metadata_help' => 'Мета малюматы:',
@@ -287,14 +278,14 @@ $messages = array(
 'talkpagelinktext'  => 'Музакере',
 'specialpage'       => 'Мах�у� Саифе',
 'personaltools'     => 'Шах�ий алетлер',
-'postcomment'       => 'Теф�ир �з',
+'postcomment'       => 'Янъы болюк',
 'articlepage'       => 'Саифеге бар',
 'talk'              => 'Музакере',
 'views'             => 'Корюнишлер',
 'toolbox'           => '�летлер',
 'userpage'          => 'Къулланыджы �аифе�ини ко�ьтер',
 'projectpage'       => 'Проект �аифе�ини ко�ьтер',
-'imagepage'         => 'Медиа файл �аифе�ини ко�ьтер',
+'imagepage'         => 'Файл �аифе�ини ко�ьтер',
 'mediawikipage'     => 'Бе�нат �аифе�ини ко�ьтер',
 'templatepage'      => 'Шаблон �аифе�ини ко�ьтер',
 'viewhelppage'      => 'Ярдым �аифе�ини ко�ьтер',
@@ -313,8 +304,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} акъкъында',
 'aboutpage'            => 'Project:�къкъында',
-'bugreports'           => 'Хаталар акъкъында ��абатлар',
-'bugreportspage'       => 'Project:Хаталар акъкъында ��абатлар',
 'copyright'            => 'Малюмат $1 бина�н кечилип ола.',
 'copyrightpagename'    => '{{SITENAME}} му�ллифлик акълары',
 'copyrightpage'        => '{{ns:project}}:Му�ллифлик акълары',
@@ -337,9 +326,7 @@ $messages = array(
 
 'badaccess'        => 'Изин хата�ы',
 'badaccess-group0' => 'Япаджакъ олгъан арекетинъизни �пмагъа акъкъынъыз ёкъ.',
-'badaccess-group1' => 'Япаджакъ олгъан арекетинъизни тек $1 группа�ынынъ къулланыджылары �пып олалар.',
-'badaccess-group2' => 'Япаджакъ олгъан арекетинъизни тек $1 группаларынынъ къулланыджылары �пып олалар.',
-'badaccess-groups' => 'Япаджакъ олгъан арекетинъизни тек $1 группаларынынъ къулланыджылары �пып олалар.',
+'badaccess-groups' => 'Япаджакъ олгъан арекетинъизни тек ашагъыдаки $2 группагъа аза олгъан къулланыджылары �пып олалар: $1.',
 
 'versionrequired'     => 'MediaWiki-нинъ $1 вер�и��ы керек',
 'versionrequiredtext' => 'Бу �аифени къулланмакъ ичюн MediaWiki-нинъ $1 вер�и��ы керек. [[Special:Version|Вер�и�]] �аифе�ине бакъ.',
@@ -353,7 +340,9 @@ $messages = array(
 'editsection'             => 'денъиштир',
 'editold'                 => 'денъиштир',
 'viewsourceold'           => 'менбаны корь',
-'editsectionhint'         => 'Денъиштирильген болюм: $1',
+'editlink'                => 'денъиштир',
+'viewsourcelink'          => 'менба кодуны ко�ьтер',
+'editsectionhint'         => 'Денъиштирильген болюк: $1',
 'toc'                     => 'Мундеридже',
 'showtoc'                 => 'ко�ьтер',
 'hidetoc'                 => 'гизле',
@@ -367,7 +356,7 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom лента�ы',
 'page-rss-feed'           => '«$1» - RSS лента�ы',
 'page-atom-feed'          => '«$1» - Atom лента�ы',
-'red-link-title'          => '$1 (даа �зылмагъан)',
+'red-link-title'          => '$1 (бойле �аифе ёкъ)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Саифе',
@@ -422,7 +411,7 @@ MySQL «$3: $4» хата�ыны бильдирди.',
 'readonly_lag'         => 'Малюмат база�ынынъ �килемджи �ервери бирлемджи �ерверинен �инхронизирленгендже малюмат база�ы денъиштирильмеме�и ичюн автоматик оларакъ блок �тильди.',
 'internalerror'        => 'Ички хата',
 'internalerror_info'   => 'Ички хата: $1',
-'filecopyerror'        => '"$1" файлы "$2" файлына копирленип оламай.',
+'filecopyerror'        => '"$1" файлы "$2" файлына копи�ланып оламай.',
 'filerenameerror'      => 'файлнынъ "$1" деген ады "$2" оларакъ денъиштирилип оламай.',
 'filedeleteerror'      => '"$1" файлы ёкъ �тилип оламай.',
 'directorycreateerror' => '"$1" директори��ы �ратылып оламай.',
@@ -434,7 +423,6 @@ MySQL «$3: $4» хата�ыны бильдирди.',
 'cannotdelete'         => 'Бельгиленген �аифе � да корюниш ёкъ �тилип оламады. (башкъа бир къулланыджы тарафындан ёкъ �тильген ола билир).',
 'badtitle'             => 'Рух�ет�из �ерлева',
 'badtitletext'         => 'И�тенильген �аифе ады догъру дегиль, бош �хут интервики � да тиллерара ады догъру бельгиленмеген. Ихтималы бар ки, �аифе адында ��акълангъан ишаретлер къулланыладыр.',
-'perfdisabled'         => '�фу �тинъиз! Бу ху�у�иет, малюмат база�ыны къулланыламайджакъ дереджеде �вашлаткъаны ичюн, мувакъкъат къулланымдан чыкъарылды.',
 'perfcached'           => 'Малюматлар даа �вельджеден азырлангъан ола билир. Бу �ебептен ��кирген ола билир!',
 'perfcachedts'         => '�шагъыда к�ште �акълангъан малюмат булуна, �онъки �нъарув заманы: $1.',
 'querypage-no-updates' => 'Бу �аифени денъиштирмеге шимди изин ёкъ. Бу малюмат аман �нъартылмайджакъ.',
@@ -446,9 +434,9 @@ MySQL «$3: $4» хата�ыны бильдирди.',
 'actionthrottled'      => '�рекет токъталды',
 'actionthrottledtext'  => 'Спамгъа къаршы куреш �ебебинден бу арекетни аз вакъыт ичинде чокъ кере текрарлап оламай�ынъыз. Мумкюн олгъан къарардан зи�де арекет �птынъыз. Бир къач дакъкъадан �онъ текрарлап бакъынъыз.',
 'protectedpagetext'    => 'Бу �аифени ким�е денъиштирме�ин деп о блок �тильди.',
-'viewsourcetext'       => 'Саифенинъ кодуны козьден кечирип копирлей биле�инъиз:',
+'viewsourcetext'       => 'Саифенинъ кодуны козьден кечирип копи�лай биле�инъиз:',
 'protectedinterface'   => 'Бу �аифеде �и�тема интерфей�ининъ метини булунгъаны ичюн мында хата чыкъма�ын деп денъишиклик �пмакъ ��акъ.',
-'editinginterface'     => "'''Тенби''': MediaWiki �и�тема бе�натылы бир �аифени денъиштирмекте�инъиз. Бу �аифедеки денъишикликлер къулланыджы интерфей� корюнишини дигер къулланыджылар ичюн де денъиштиреджек. Лютфен, терджимелер ичюн [http://translatewiki.net/wiki/Main_Page?setlang=crh Betawiki] �айтыны (MediaWiki ре�мий локализаци� проекти) къулланынъыз.",
+'editinginterface'     => "'''Тенби''': MediaWiki �и�тема бе�натылы бир �аифени денъиштирмекте�инъиз. Бу �аифедеки денъишикликлер къулланыджы интерфей� корюнишини дигер къулланыджылар ичюн де денъиштиреджек. Лютфен, терджимелер ичюн [http://translatewiki.net/wiki/Main_Page?setlang=crh translatewiki.net] �айтыны (MediaWiki ре�мий локализаци� проекти) къулланынъыз.",
 'sqlhidden'            => '(SQL и�тинтагъы �акълы)',
 'cascadeprotected'     => 'Бу �аифени денъиштирип оламаз�ынъыз, чюнки ка�кад къорчалав алтында булунгъан {{PLURAL:$1|�аифеге|�аифелерге}} мен�юптир:
 $2',
@@ -460,9 +448,9 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'Отурымны къапат',
-'logouttext'                 => '<strong>Отурымны къапаттынъыз.</strong>
+'logouttext'                 => "'''Отурымны къапаттынъыз.'''
 
-Шимди {{SITENAME}} �айтыны аноним оларакъ къулланып ола�ынъыз, � да �нъыдан [[Special:UserLogin|отурым ачып]] ола�ынъыз (и�тер айны къулланыджы адынен, и�тер башкъа бир къулланыджы адынен). Web браузеринъиз к�шини темизлегендже базы �аифелер �анки ал� даа отурымынъыз ачыкъ �кен киби корюнип олур.',
+Шимди {{SITENAME}} �айтыны аноним оларакъ къулланып ола�ынъыз, � да �нъыдан [[Special:UserLogin|отурым ачып]] ола�ынъыз (и�тер айны къулланыджы адынен, и�тер башкъа бир къулланыджы адынен). Web браузеринъиз к�шини темизлегендже базы �аифелер �анки ал� даа отурымынъыз ачыкъ �кен киби корюнип олур.",
 'welcomecreation'            => '== Хош кельдинъиз, $1! ==
 Э�абынъыз ачылды.
 Бу �айтнынъ [[Special:Preferences|�азламаларыны]] шах�ынъызгъа коре денъиштирмеге унутманъыз.',
@@ -473,7 +461,6 @@ $2',
 'remembermypassword'         => 'Бу компьютерде мени хатырла',
 'yourdomainname'             => 'Домен адынъыз',
 'externaldberror'            => 'Отурымынъыз ачылгъанда бир хата олды. Бу тыш ��абынъызгъа денъишиклик �пмагъа акъкъынъыз олмаювындан мейдангъа келип ола.',
-'loginproblem'               => '<b>Отурымынъыз ачылгъанда проблема чыкъты.</b><br />Бир даа �тинъиз!',
 'login'                      => 'Отурым ач',
 'nav-login-createaccount'    => 'Отурым ач / Къайд ол',
 'loginprompt'                => 'Отурым ачмакъ ичюн «cookies»ге изин бермели�инъиз.',
@@ -498,7 +485,7 @@ $2',
 'yourvariant'                => 'Тиль �айлавы:',
 'yournick'                   => 'Сизинъ лагъабынъыз (имзаларда ко�ьтериледжек):',
 'badsig'                     => 'Янълыш имза. HTML т�глерининъ догърулыгъыны бакъынъыз.',
-'badsiglength'               => 'Къарардан зи�де узун имзадыр, $1-ден зи�де ишареттен ибарет олма�ы мумкюн дегиль.',
+'badsiglength'               => 'Къарардан зи�де узун имзадыр, $1 зи�де ишареттен ибарет олма�ы мумкюн дегиль.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => '�дынъыз (меджбурий дегильдир): Эгер бельгиле�енъиз, �аифелердеки денъишикликлерин кимнинъ �пкъаныны ко�ьтермек ичюн къулланыладжакъ.',
 'loginerror'                 => 'Отурым ачма хата�ы',
@@ -529,10 +516,10 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 'eauthentsent'               => 'Бельгиленген e-mail адре�ине адре�ни денъиштирюв та�дыкъыны �орайджакъ бир мектюп ёлланды. Эм де мектюпте бу e-mail адре�ине керчектен �из �аип�инъиз деп та�дыкъламакъ ичюн �пылма�ы керек арекетлер та�вир �тильген.',
 'throttled-mailpassword'     => 'Пароль хатырлатув функци��ы �нди �онъки $1 �аат девамында ишлетильген �ди. $1 �аат ичинде тек бир хатырлатув ишлетмек мумкюн.',
 'mailerror'                  => 'Почта йиберильгенде бир хата мейдангъа кельди: $1',
-'acct_creation_throttle_hit' => '$1 дане къулланыджы ��апны ачтыргъан алда�ынъыз. Даа зи�де ачтырамаз�ынъыз.',
-'emailauthenticated'         => 'E-mail адре�инъиз $1-нен тенъештирильди.',
+'acct_creation_throttle_hit' => 'Сиз �нди $1 дане къулланыджы ��абыны ачтынъыз. Даа зи�де ачтырамаз�ынъыз.',
+'emailauthenticated'         => 'E-mail адре�инъиз $2 $3 тарихында та�дыкъланды.',
 'emailnotauthenticated'      => 'E-mail адре�инъиз та�дыкъланмады, викининъ e-mail иле багълы функци�лары чалышмайджакъ.',
-'noemailprefs'               => 'E-mail адре�инъизни бельгилемегенинъиз ичюн, викининъ e-mail иле багълы функци�лары чалышмайджакъ.',
+'noemailprefs'               => 'Бу функци�ларнынъ чалышма�ы ичюн бир e-mail адре�и бельгиленъиз.',
 'emailconfirmlink'           => 'E-mail адре�инъизни та�дыкъланъыз',
 'invalidemailaddress'        => 'Язгъан адре�инъиз e-mail �тандартларында олмагъаны ичюн къабул �тильмеди. Лютфен, догъру адре�ни �зынъыз � да къутуны бош къалдырынъыз.',
 'accountcreated'             => 'Э�ап ачылды',
@@ -541,17 +528,20 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 'createaccount-text'         => 'Бирев �изинъ e-mail адре�ини бельгилеп {{SITENAME}} �айтында ($4) "$2" адлы бир ��ап �ратты. Шу ��ап ичюн пароль бойледир: "$3". Сиз отурым ачып паролинъизни шимди денъиштирмек керек�инъиз.
 
 Ишбу аккаунт хата оларакъ �ратылгъан ол�а бу бе�натны игнор �тип ола�ынъыз.',
+'login-throttled'            => 'Бу ��ап ичюн парольни пек чокъ кере кир�етип бакътынъыз. Лютфен, къайта кир�етмезден �вель бираз бекленъиз.',
 'loginlanguagelabel'         => 'Тиль: $1',
 
 # Password reset dialog
-'resetpass'               => 'Бу ��апнынъ паролини �ыфырла',
+'resetpass'               => 'Парольни денъиштир',
 'resetpass_announce'      => 'Мувакъкъат код ва�та�ынен кирдинъиз. Киришни тамамламакъ ичюн �нъы парольни мында къоюнъыз:',
 'resetpass_header'        => 'Э�апнынъ паролини денъиштир',
+'oldpassword'             => 'Э�ки пароль',
+'newpassword'             => 'Янъы пароль',
+'retypenew'               => 'Янъы парольни текрар �зынъыз',
 'resetpass_submit'        => 'Пароль къойып кир',
 'resetpass_success'       => 'Паролинъиз мувафакъиетнен денъиштирильди! Отурымынъыз ачылмакъта...',
 'resetpass_bad_temporary' => 'Мувакъкъат паролинъиз �нълыштыр. Ола билир ки, �из �нди паролинъизни мувафакъиетнен денъиштирген � да e-mail-ге �нъы бир пароль ёлламагъа риджа �ткендир�инъиз.',
 'resetpass_forbidden'     => 'Пароль денъиштирмек ��акъ',
-'resetpass_missing'       => 'Форма боштыр.',
 
 # Edit page toolbar
 'bold_sample'     => 'Къалын �зылыш',
@@ -576,8 +566,8 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 'hr_tip'          => 'Горизонталь �ызыкъ (пек �ыкъ къулланманъыз)',
 
 # Edit pages
-'summary'                          => 'Денъишиклик къы�къа тарифи',
-'subject'                          => 'Мевзу/�ерлева',
+'summary'                          => 'Денъишиклик къы�къа та�вири:',
+'subject'                          => 'Мевзу/�ерлева:',
 'minoredit'                        => 'Кичик денъишиклик',
 'watchthis'                        => 'Саифени козет',
 'savearticle'                      => 'Саифени �акъла',
@@ -589,8 +579,8 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 'missingsummary'                   => "'''Хатырлатма.''' Денъиштирмелеринъизни къы�къадан тариф �тмединъиз. «Саифени �акъла» дёгме�ине текрар ба�ув иле денъиштирмелеринъиз теф�ир�из �акъланаджакълар.",
 'missingcommenttext'               => 'Лютфен, ашагъыда теф�ир �зынъыз.',
 'missingcommentheader'             => "'''Хатырлатув:''' Теф�ир �ерлева�ыны бельгилемединъиз. «Саифени �акъла» дёгме�ине текрар ба�къан �онъ теф�иринъиз �ерлева�ыз �акъланыр.",
-'summary-preview'                  => 'Бакъып чыкъув тарифи',
-'subject-preview'                  => 'Бакъып чыкъув �ерлева�ы',
+'summary-preview'                  => 'Бакъып чыкъув та�вири:',
+'subject-preview'                  => 'Бакъып чыкъув �ерлева�ы:',
 'blockedtitle'                     => 'Къулланыджы блок �тильди.',
 'blockedtext'                      => "<big>'''Э�абынъыз � да IP адре�инъиз блок �тильди.'''</big>
 
@@ -623,8 +613,8 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 'whitelistedittext'                => 'Саифени денъиштирмек ичюн $1 керек�инъиз.',
 'confirmedittitle'                 => 'E-mail адре�ини та�дыкъламакъ л�зимдир',
 'confirmedittext'                  => 'Саифени денъиштирмеден �вель e-mail адре�инъизни та�дыкъламалы�ынъыз. Лютфен, [[Special:Preferences|�азламалар �аифе�инде]] e-mail адре�инъизни кир�етинъиз ве та�дыкъланъыз.',
-'nosuchsectiontitle'               => 'Ойле болюм ёкъ',
-'nosuchsectiontext'                => 'Мевджут олмагъан болюмни денъиштирип бакътынъыз. $1 болюми ёкъ олгъаны ичюн метнинъиз �акъланаджакъ ери ёкъ.',
+'nosuchsectiontitle'               => 'Ойле болюк ёкъ',
+'nosuchsectiontext'                => 'Бар олмагъан болюкни денъиштирип бакътынъыз. $1 болюги ёкъ олгъаны ичюн метнинъиз �акъланаджакъ ери ёкъ.',
 'loginreqtitle'                    => 'Отурым ачмалы�ынъыз',
 'loginreqlink'                     => 'отурым ач',
 'loginreqpagetext'                 => 'Башкъа �аифелерни бакъмакъ ичюн $1 борджлу�ынъыз.',
@@ -641,23 +631,23 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 '''Konqueror:''' �аифени �нъыдан юкле дёгме�ине � да F5 ба�ып;
 '''Opera:''' ''Tools → Preferences'' меню�инде к�шни темизлеп;
 '''Internet Explorer:''' ''Ctrl'' ба�ылы �кенде �аифени �нъыдан юклеп � да ''Ctrl-F5'' ба�ып.",
-'usercssjsyoucanpreview'           => "<strong>Тев�ие:</strong> Саифени �акъламаздан �вель '''бакъып чыкъ''' дёгме�ине ба�ып �пкъан �нъы �аифенъизни козьден кечиринъиз.",
+'usercssjsyoucanpreview'           => "'''Тев�ие:''' Саифени �акъламаздан �вель '''бакъып чыкъ''' дёгме�ине ба�ып �пкъан �нъы �аифенъизни козьден кечиринъиз.",
 'usercsspreview'                   => "'''Унутманъыз, бу тек бакъып чыкъув - къулланыджы CSS файлынъыз ал� даа �акъланмады!'''",
 'userjspreview'                    => "'''Унутманъыз, �из шимди тек те�т �те�инъиз � да бакъып чыкъув коре�инъиз - къулланыджы JavaScript'и шимдилик �акъланмады.'''",
 'userinvalidcssjstitle'            => "'''Ихтар:''' \"\$1\" адынен бир тема ёкътыр. тема-ады.css ве .js файлларынынъ адлары кичик афир иле �змакъ керек, �ни {{ns:user}}:Темель/'''M'''onobook.css дегиль, {{ns:user}}:Темель/'''m'''onobook.css.",
 'updated'                          => '(Янъарды)',
-'note'                             => '<strong>Ихтар:</strong>',
-'previewnote'                      => '<strong>Бу тек бакъып чыкъув, метин ал� даа �акъланмагъан!</strong>',
+'note'                             => "'''Ихтар:'''",
+'previewnote'                      => "'''Бу тек бакъып чыкъув, метин ал� даа �акъланмагъан!'''",
 'previewconflict'                  => 'Бу бакъып чыкъув юкъары тарир пенджере�индеки метиннинъ �акъланувдан �онъ оладжакъ корюнишини ак� �те.',
-'session_fail_preview'             => '<strong> Сервер �из �пкъан денъиштирмелерни �е��и� идентификаторы джоюлгъаны �ебебинден �акълап оламады.
+'session_fail_preview'             => "''' Сервер �из �пкъан денъиштирмелерни �е��и� идентификаторы джоюлгъаны �ебебинден �акълап оламады.
 Бу вакътынджа проблемадыр. Лютфен, текрар �акълап бакъынъыз. 
-Бундан да �онъ олып чыкъма�а, малюмат локаль файлгъа �акъланъыз да браузеринъизни бир къапатып ачынъыз.</strong>',
-'session_fail_preview_html'        => '<strong>�фу �тинъиз! HTML �е��и�нынъ малюматлары гъайып олгъаны �ебебинден �изинъ денъиштирмелеринъизни къабул �тмеге имк�н ёкътыр.</strong>',
-'token_suffix_mismatch'            => '<strong>Сизинъ программанъыз тарир пенджере�инде пунктуаци� ишаретлерини догъру ишлемегени ичюн �пкъан денъишиклигинъиз къабул олунмады. Денъишиклик �аифенинъ метни корюнишининъ бозулмама�ы ичюн л�гъу �тильди.
-Бунынъ киби проблемалар анонимизирлеген хаталы web-прок�илер къулланувдан чыкъып олалар.</strong>',
+Бундан да �онъ олып чыкъма�а, малюмат локаль файлгъа �акъланъыз да браузеринъизни бир къапатып ачынъыз.'''",
+'session_fail_preview_html'        => "'''�фу �тинъиз! HTML �е��и�нынъ малюматлары гъайып олгъаны �ебебинден �изинъ денъиштирмелеринъизни къабул �тмеге имк�н ёкътыр.'''",
+'token_suffix_mismatch'            => "'''Сизинъ программанъыз тарир пенджере�инде пунктуаци� ишаретлерини догъру ишлемегени ичюн �пкъан денъишиклигинъиз къабул олунмады. Денъишиклик �аифенинъ метни корюнишининъ бозулмама�ы ичюн л�гъу �тильди.
+Бунынъ киби проблемалар анонимизирлеген хаталы web-прок�илер къулланувдан чыкъып олалар.'''",
 'editing'                          => '"$1" �аифе�ини денъиштирмекте�инъиз',
-'editingsection'                   => '"$1" �аифе�инде болюм денъиштирмекте�инъиз',
-'editingcomment'                   => '$1 �аифе�ине бе�нат къошмакъта�ынъыз.',
+'editingsection'                   => '"$1" �аифе�инде болюк денъиштирмекте�инъиз',
+'editingcomment'                   => '$1 �аифе�ини денъиштирмекте�инъиз (�нъы болюк)',
 'editconflict'                     => 'Денъишиклик зыт кетюви: $1',
 'explainconflict'                  => "Сиз �аифени денъиштирген вакъытта башкъа бири де денъишиклик �пты.
 Юкъарыдаки �зы �аифенинъ шимдики алыны ко�ьтере.
@@ -666,27 +656,29 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 \"Саифени �акъла\"гъа ба�къанда '''тек''' юкъарыдаки �зы �акъланаджакъ.",
 'yourtext'                         => 'Сизинъ метнинъиз',
 'storedversion'                    => 'Сакълангъан метин',
-'nonunicodebrowser'                => '<strong>ТЕ�БИ: Браузеринъизде Unicode кодлама�ы танылмаз. Саифелер денъиштиргенде бутюн ASCII олмагъан ишаретлернинъ ерине оларнынъ оналтылыкъ коду �зылыр.</strong>',
-'editingold'                       => '<strong>ДИКЪКЪ�Т: Саифенинъ ��ки бир вер�и��ында денъишиклик �пмакъта�ынъыз.
-Сакълагъанынъызда бу тарихлы вер�и�дан кунюмизге къадар олгъан денъишикликлер ёкъ оладжакъ.</strong>',
+'nonunicodebrowser'                => "'''ТЕ�БИ: Браузеринъизде Unicode кодлама�ы танылмаз. Саифелер денъиштиргенде бутюн ASCII олмагъан ишаретлернинъ ерине оларнынъ оналтылыкъ коду �зылыр.'''",
+'editingold'                       => "'''ДИКЪКЪ�Т: Саифенинъ ��ки бир вер�и��ында денъишиклик �пмакъта�ынъыз.
+Сакълагъанынъызда бу тарихлы вер�и�дан кунюмизге къадар олгъан денъишикликлер ёкъ оладжакъ.'''",
 'yourdiff'                         => 'Фаркълар',
-'copyrightwarning'                 => '<strong>Лютфен, дикъкъат:</strong> {{SITENAME}} �айтына къошулгъан бутюн и��елер <i>$2</i> мукъавеле�и даире�индедир (таф�ил�т ичюн $1 �аифе�ине бакъынъыз).
+'copyrightwarning'                 => "'''Лютфен, дикъкъат:''' {{SITENAME}} �айтына къошулгъан бутюн и��елер <i>$2</i> мукъавеле�и даире�индедир (таф�ил�т ичюн $1 �аифе�ине бакъынъыз).
 Къошкъан и��енъизнинъ башкъа ин�анлар тарафындан аджыма�ызджа денъиштирильме�ини � да азат тарзда ве �ынъыр�ызджа башкъа ерлерге дагъытылма�ыны и�теме�енъиз, и��е къошманъыз.<br />
-�йрыджа, мында и��е къошып, бу и��енинъ озюнъиз тарафындан �зылгъанына, � да джемааткъа ачыкъ бир менбадан � да башкъа бир азат менбадан копирленгенине гаранти� берген ола�ынъыз.<br />
-<strong><center>МУЭЛЛИФЛИК �КЪКЪЫ�Е� КЪОРЧ�Л��ГЪ�� ИЧ БИР МЕТИ��И МЫ�Д� РУХСЕТСИЗ КЪОШМ��ЪЫЗ!</center></strong>',
-'copyrightwarning2'                => '<strong>Лютфен, дикъкъат:</strong> {{SITENAME}} �айтына �из къошкъан бутюн и��елер башкъа бир къулланыджы тарафындан денъиштирилип � да ёкъ �тилип олур. Къошкъан и��енъизнинъ башкъа ин�анлар тарафындан аджыма�ызджа денъиштирильме�ини � да азат тарзда ве �ынъыр�ызджа башкъа ерлерге дагъытылма�ыны и�теме�енъиз, и��е къошманъыз.<br />
-�йрыджа, мында и��е къошып, бу и��енинъ озюнъиз тарафындан �зылгъанына, � да джемааткъа ачыкъ бир менбадан � да башкъа бир азат менбадан копирленгенине гаранти� берген ола�ынъыз ($1 бакъынъыз).<br />
-<strong>МУЭЛЛИФЛИК �КЪКЪЫ�Е� КЪОРЧ�Л��ГЪ�� ИЧ БИР МЕТИ��И МЫ�Д� РУХСЕТСИЗ КЪОШМ��ЪЫЗ!</strong>',
-'longpagewarning'                  => '<strong>ТЕ�БИ: Бу �аифе $1 килобайт буюклигиндедир; базы браузерлер денъишиклик �пкъан вакъытта 32 kb ве у�тю буюкликлерде проблемалар �шап олур. Саифени болюмлерге айырмагъа тырышынъыз.</strong>',
-'longpageerror'                    => '<strong>ТЕ�БИ: Бу �аифе $1 килобайт буюклигиндедир. �замий (мак�ималь) изинли буюклик и�е $2 килобайт. Бу �аифе �акъланып оламаз.</strong>',
-'readonlywarning'                  => '<strong>ДИКЪКЪ�Т: Бакъым �ебеби иле малюмат база�ы ал-азырда килитлидир. Бу �ебептен денъишикликлеринъиз шимди �акъланамамакъта. Язгъанларынъызны башкъа бир �дитор программа�ына алып �акълап олур ве даа �онъ текрар мында кетирип �акълап олур�ынъыз</strong>',
-'protectedpagewarning'             => '<strong>ТЕ�БИ: Бу �аифе къорчалав алтына алынгъан ве �лынъыз админи�траторлар тарафындан денъиштирилип олур.</strong>',
+�йрыджа, мында и��е къошып, бу и��енинъ озюнъиз тарафындан �зылгъанына, � да джемааткъа ачыкъ бир менбадан � да башкъа бир азат менбадан копи�лангъанына гаранти� берген ола�ынъыз.<br />
+'''<center>МУЭЛЛИФЛИК �КЪКЪЫ�Е� КЪОРЧ�Л��ГЪ�� ИЧ БИР МЕТИ��И МЫ�Д� РУХСЕТСИЗ КЪОШМ��ЪЫЗ!</center>'''",
+'copyrightwarning2'                => "'''Лютфен, дикъкъат:''' {{SITENAME}} �айтына �из къошкъан бутюн и��елер башкъа бир къулланыджы тарафындан денъиштирилип � да ёкъ �тилип олур. Къошкъан и��енъизнинъ башкъа ин�анлар тарафындан аджыма�ызджа денъиштирильме�ини � да азат тарзда ве �ынъыр�ызджа башкъа ерлерге дагъытылма�ыны и�теме�енъиз, и��е къошманъыз.<br />
+�йрыджа, мында и��е къошып, бу и��енинъ озюнъиз тарафындан �зылгъанына, � да джемааткъа ачыкъ бир менбадан � да башкъа бир азат менбадан копи�лангъанына гаранти� берген ола�ынъыз ($1 бакъынъыз).<br />
+'''МУЭЛЛИФЛИК �КЪКЪЫ�Е� КЪОРЧ�Л��ГЪ�� ИЧ БИР МЕТИ��И МЫ�Д� РУХСЕТСИЗ КЪОШМ��ЪЫЗ!'''",
+'longpagewarning'                  => "'''ТЕ�БИ: Бу �аифе $1 килобайт буюклигиндедир; базы браузерлер денъишиклик �пкъан вакъытта 32 kb ве у�тю буюкликлерде проблемалар �шап олур. Саифени парчаларгъа айырмагъа тырышынъыз.'''",
+'longpageerror'                    => "'''ТЕ�БИ: Бу �аифе $1 килобайт буюклигиндедир. �замий (мак�ималь) изинли буюклик и�е $2 килобайт. Бу �аифе �акъланып оламаз.'''",
+'readonlywarning'                  => "'''ТЕ�БИ: Бакъым �ебеби иле малюмат база�ы ал-азырда килитлидир. Бу �ебептен денъишикликлеринъиз шимди �акълап олама�ынъыз. Язгъанларынъызны башкъа бир �дитор программа�ына алып �акълап олур ве даа �онъ текрар мында кетирип �акълап олур�ынъыз'''
+
+Малюмат база�ыны килитлеген админи�тратор озь арекетини бойле анълатты: $1",
+'protectedpagewarning'             => "'''ТЕ�БИ: Бу �аифе къорчалав алтына алынгъан ве �лынъыз админи�траторлар тарафындан денъиштирилип олур.'''",
 'semiprotectedpagewarning'         => "'''Тенби''': Бу �аифе тек къайдлы къулланыджылар тарафындан денъиштирилип олур.",
 'cascadeprotectedwarning'          => "'''Тенби:''' Бу �аифени тек «�дмини�траторлар» группа�ына кирген къулланыджылар денъиштирип олалар, чюнки о ка�кад къорчалав алтында булунгъан {{PLURAL:$1|�аифеге|�аифелерге}} мен�юптир:",
-'titleprotectedwarning'            => '<strong>ТЕ�БИ: Бу �аифе къорчалав алтындадыр, тек еткили къулланыджылар оны �ратып олалар.</strong>',
+'titleprotectedwarning'            => "'''ТЕ�БИ: Бу �аифе къорчалав алтындадыр, тек еткили къулланыджылар оны �ратып олалар.'''",
 'templatesused'                    => 'Бу �аифеде къулланылгъан шаблонлар:',
 'templatesusedpreview'             => 'Сиз бакъып чыкъкъан �аифенъизде къулланылгъан шаблонлар:',
-'templatesusedsection'             => 'Бу болюмде къулланылгъан шаблонлар:',
+'templatesusedsection'             => 'Бу болюкте къулланылгъан шаблонлар:',
 'template-protected'               => '(къорчалав алтында)',
 'template-semiprotected'           => '(къы�мен къорчалав алтында)',
 'hiddencategories'                 => 'Бу �аифе $1 гизли категори�гъа мен�юптир:',
@@ -700,6 +692,14 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 'recreate-deleted-warn'            => "'''Дикъкъат: �вельдже ёкъ �тильген �аифени �нъыдан �ратмагъа тырыша�ынъыз.'''
 
 Бу �аифени керчектен де �нъыдан �ратмагъа и�тей�инъизми? �шагъыда ёкъ �тилюв журналы булуна.",
+'deleted-notice'                   => 'Бу �аифе ёкъ �тильди.
+�къ �тюв журналындан къайдлары ашагъыда ко�ьтериле.',
+'edit-gone-missing'                => 'Саифенинъ �нъарувы мумкюн дегиль.
+Ола биле ки, о ёкъ �тильгендир.',
+'edit-conflict'                    => 'Денъишикликлер конфликти.',
+'edit-no-change'                   => 'Япкъан денъишиклигинъиз �акъланмагъан, чюнки метинде бир тюрлю денъишиклик �пылмады.',
+'edit-already-exists'              => 'Янъы �аифени �ратмакъ мумкюн дегиль.
+О �нди мевджут.',
 
 # "Undo" feature
 'undo-success' => 'Денъишиклик л�гъу �тилип ола. Лютфен, айны бу денъишикликлер мени меракъландыра деп �мин олмакъ ичюн вер�и�лар тенъештирилювини козьден кечирип денъишикликлерни тамамен �пмакъ ичюн «Саифени �акъла» дёгме�ине ба�ынъыз.',
@@ -713,28 +713,28 @@ $2 къулланыджы�ы ичюн �нъы пароль будыр <code>$3
 $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Бу �аифенинъ журналларыны ко�ьтер',
-'nohistory'           => 'Бу �аифенинъ кечмиш вер�и��ы ёкъ.',
-'revnotfound'         => 'Вер�и� тапылмады',
-'revnotfoundtext'     => 'Саифенинъ ��ки вер�и��ы тапылмады. Лютфен, бу �аифеге кирмек ичюн къуллангъан багълантынъызнынъ догърулыгъыны тешкеринъиз.',
-'currentrev'          => '�л-азырки вер�и�',
-'revisionasof'        => 'Саифенинъ $1 тарихындаки алы',
-'revision-info'       => 'Саифенинъ $2 тарафындан олуштырылгъан $1 тарихындаки алы',
-'previousrevision'    => '� Эвельки алы',
-'nextrevision'        => 'Сонъраки алы →',
-'currentrevisionlink' => '�нъ �нъы алыны ко�ьтер',
-'cur'                 => 'фаркъ',
-'next'                => '�онъраки',
-'last'                => '�онъки',
-'page_first'          => 'ильк',
-'page_last'           => '�онъки',
-'histlegend'          => "(фаркъ) = ал-азырки вер�и� иле арадаки фаркъ,
+'viewpagelogs'           => 'Бу �аифенинъ журналларыны ко�ьтер',
+'nohistory'              => 'Бу �аифенинъ кечмиш вер�и��ы ёкъ.',
+'currentrev'             => '�л-азырки вер�и�',
+'currentrev-asof'        => '$1 тарихында �онъки оларакъ денъиштирильген �аифенинъ шимдики алы',
+'revisionasof'           => 'Саифенинъ $1 тарихындаки алы',
+'revision-info'          => 'Саифенинъ $2 тарафындан олуштырылгъан $1 тарихындаки алы', # Additionally available: $3: revision id
+'previousrevision'       => '� Эвельки алы',
+'nextrevision'           => 'Сонъраки алы →',
+'currentrevisionlink'    => '�нъ �нъы алыны ко�ьтер',
+'cur'                    => 'фаркъ',
+'next'                   => '�онъраки',
+'last'                   => '�онъки',
+'page_first'             => 'ильк',
+'page_last'              => '�онъки',
+'histlegend'             => "(фаркъ) = ал-азырки вер�и� иле арадаки фаркъ,
 (�онъки) = �вельки вер�и� иле арадаки фаркъ, '''к''' = кичик денъишиклик",
-'deletedrev'          => '[ёкъ �тильди]',
-'histfirst'           => 'Энъ ��ки',
-'histlast'            => 'Энъ �нъы',
-'historysize'         => '({{PLURAL:$1|1 байт|$1 байт}})',
-'historyempty'        => '(бош)',
+'history-fieldset-title' => 'Кечмишке бакъ',
+'deletedrev'             => '[ёкъ �тильди]',
+'histfirst'              => 'Энъ ��ки',
+'histlast'               => 'Энъ �нъы',
+'historysize'            => '({{PLURAL:$1|1 байт|$1 байт}})',
+'historyempty'           => '(бош)',
 
 # Revision feed
 'history-feed-title'          => 'Денъишикликлер тарихы',
@@ -765,10 +765,11 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 
 # Search results
 'searchresults'             => 'Къыдырув нетиджелери',
+'searchresults-title'       => '«$1» ичюн къыдырув нетиджелери',
 'searchresulttext'          => '{{SITENAME}} ичинде къыдырув �пмакъ ху�у�ында малюмат алмакъ ичюн [[{{MediaWiki:Helppage}}|{{int:help}}]] �аифе�ине бакъып ола�ынъыз.',
-'searchsubtitle'            => 'Къыдырылгъан: "[[:$1]]" ([[Special:Prefixindex/$1|"$1" иле башлангъан бутюн �аифелер]] | [[Special:WhatLinksHere/$1|"$1" �аифе�ине багъланты олгъан бутюн �аифелер]])',
+'searchsubtitle'            => 'Къыдырылгъан: "[[:$1]]" ([[Special:Prefixindex/$1|"$1" иле башлангъан бутюн �аифелер]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" �аифе�ине багъланты олгъан бутюн �аифелер]])',
 'searchsubtitleinvalid'     => "Сиз буны къыдырдынъыз '''$1'''",
-'noexactmatch'              => "'''\"\$1\" �ерлевалы бир �аифе тапыламады.''' Бу �аифенинъ �зылма�ыны �из [[:\$1|башлатып ола�ынъыз]].",
+'noexactmatch'              => "'''\"\$1\" �ерлевалы бир �аифе тапыламады.''' Бу �аифени озюнъиз [[:\$1|�ратып ола�ынъыз]].",
 'noexactmatch-nocreate'     => "'''«$1» адлы �аифе ёкъ.'''",
 'titlematches'              => 'Макъале ады бир келе',
 'notitlematches'            => 'Ич бир �ерлевада тапыламады',
@@ -777,10 +778,11 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'prevn'                     => '�вельки $1',
 'nextn'                     => '�онъраки $1',
 'viewprevnext'              => '($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Мундеридже',
 'search-result-size'        => '$1 ($2 �ёз)',
 'search-result-score'       => 'Уйгъунлыкъ: $1 %',
 'search-redirect'           => '(ёллама $1)',
-'search-section'            => '(болюм $1)',
+'search-section'            => '(болюк $1)',
 'search-suggest'            => 'Бунымы демеге и�тединъиз: $1',
 'search-interwiki-caption'  => 'Къардаш проектлер',
 'search-interwiki-default'  => '$1 нетидже:',
@@ -792,6 +794,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'searchall'                 => '�пи�и',
 'showingresults'            => "�шагъыда №&nbsp;<strong>$2</strong>ден башлап {{PLURAL:$1|'''1''' нетидже|'''$1''' нетидже}} булуна.",
 'showingresultsnum'         => "�шагъыда №&nbsp;'''$2'''ден башлап {{PLURAL:$3|'''1''' нетидже|'''$3''' нетидже}} булуна.",
+'showingresultstotal'       => "�шагъыда {{PLURAL:$4|'''$3''' данеден '''$1''' нетидже ко�ьтерильген|'''$3''' данеден '''$1 — $2''' нетидже ко�ьтерильген}}",
 'nonefound'                 => "'''Ихтар.''' �дийдже�ине къыдырув бутюн и�им фезаларында �пылмай. Бутюн и�им фезаларында (бу джумледен къулланыджылар �убетлери, шаблонлар ве ил�хре) къыдырмакъ ичюн ''all:'' �зыны къулланынъыз � да керекли и�им феза�ыны бельгиленъиз.",
 'powersearch'               => 'Къыдыр',
 'search-external'           => 'Тыш къыдырув',
@@ -807,6 +810,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'qbsettings'            => 'Вызлы иришим �утун �азламалары',
 'changepassword'        => 'Пароль денъиштир',
 'skin'                  => 'Ре�имлеме',
+'skin-preview'          => 'Бакъып чыкъув',
 'math'                  => 'Ри�зий (математик) ишаретлер',
 'dateformat'            => 'Тарих ко�ьтерими',
 'datedefault'           => 'Стандарт',
@@ -823,9 +827,6 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'prefs-misc'            => 'Дигер �азламалар',
 'saveprefs'             => 'Денъишикликлерни �акъла',
 'resetprefs'            => 'Сакъланмагъан �азламаларны ильк алына кетир',
-'oldpassword'           => 'Э�ки пароль',
-'newpassword'           => 'Янъы пароль',
-'retypenew'             => 'Янъы парольни текрар �зынъыз',
 'textboxsize'           => 'Саифе �зув пенджере�и',
 'rows'                  => 'Сатыр',
 'columns'               => 'Сутун',
@@ -834,13 +835,13 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'contextlines'          => 'Тапылгъан �аифе ичюн айрылгъан �атыр �айы�ы',
 'contextchars'          => 'Сатырдаки ариф �айы�ы',
 'recentchangesdays'     => 'Сонъки денъишикликлер �аифе�инде ко�ьтериледжек кунь �айы�ы:',
-'recentchangescount'    => 'Чешит-тюрлю джедвель ве журналларда ко�ьтерильген денъишикликлер �айы�ы:',
+'recentchangescount'    => 'Чешит-тюрлю джедвель ве журналларда ко�ьтерильген денъишикликлер ог бельгиленген �айы�ы:',
 'savedprefs'            => 'Сазламаларынъыз �акъланды.',
 'timezonelegend'        => 'Саат къушагъы',
 'timezonetext'          => 'Вики �ервери (UTC/GMT) иле аранъыздаки �аат фаркъы. (Украина ве Тюркие ичюн +02:00)',
-'localtime'             => 'Сизинъ ерли вакътынъыз',
-'timezoneoffset'        => 'Саат фаркъы',
-'servertime'            => 'Вики �ерверинде шимдики �аат',
+'localtime'             => 'Ерли вакъыт:',
+'timezoneoffset'        => 'Саат фаркъы¹:',
+'servertime'            => 'Сервернинъ �ааты:',
 'guesstimezone'         => 'Браузеринъиз �изинъ еринъизге толдур�ын',
 'allowemail'            => 'Дигер къулланыджылар манъа e-mail мектюплери ёллап ол�ун',
 'prefs-searchoptions'   => 'Къыдырув �азламалары',
@@ -854,7 +855,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'userrights-lookup-user'   => 'Къулланыджы группаларныны идаре �т',
 'userrights-user-editname' => 'Озь къулланыджы адынъызны �зынъыз:',
 'editusergroup'            => 'Къулланыджы группалары низамла',
-'editinguser'              => "'''[[User:$1|$1]]''' къулланыджы�ынынъ ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) изинлери денъиштирмекте�инъиз",
+'editinguser'              => "'''[[User:$1|$1]]''' къулланыджы�ынынъ ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) изинлери денъиштирмекте�инъиз",
 'userrights-editusergroup' => 'Къулланыджы группалары низамла',
 'userrights-groupsmember'  => '�за�ы олгъан группаларынъыз:',
 
@@ -881,6 +882,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|денъишиклик|денъишиклик}}',
 'recentchanges'                     => 'Сонъки денъишикликлер',
+'recentchanges-legend'              => 'Сонъки денъишикликлер �азламалары',
 'recentchangestext'                 => 'Япылгъан �нъ �онъки денъишикликлерни бу �аифеде корип ола�ынъыз.',
 'recentchanges-feed-description'    => 'Бу лента ва�та�ынен викиде �онъки денъишикликлерни козет.',
 'rcnote'                            => "$4 $5 тарихында �онъки {{PLURAL:$2|куньде|'''$2''' куньде}} �пылгъан '''{{PLURAL:$1|1|$1}}''' денъишиклик:",
@@ -903,7 +905,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|къулланыджы|къулланыджы}} козете]',
 'rc_categories'                     => 'Тек категори�лардан («|» иле айырыла)',
 'rc_categories_any'                 => 'Эр анги',
-'newsectionsummary'                 => '/* $1 */ �нъы болюм',
+'newsectionsummary'                 => '/* $1 */ �нъы болюк',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Багълы денъишикликлер',
@@ -922,11 +924,11 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'upload_directory_read_only'  => 'Web �ерверининъ ($1) джузьданына файллар �акъламагъа акълары ёкътыр.',
 'uploaderror'                 => 'Юклеме хата�ы',
 'uploadtext'                  => "Файллар юклемек ичюн ашагъыдаки форманы къулланынъыз.
-Эвельдже юкленген ре�им тапмакъ � да бакъмакъ ичюн [[Special:ImageList|юкленген файллар джедвелине]] кечинъиз, бундан гъайры файл юкленюв ве ёкъ �тилюв къайдларыны [[Special:Log/upload|юкленюв журналында]] ве [[Special:Log/delete|ёкъ �тилюв журналында]] тапып ола�ынъыз.
+Эвельдже юкленген ре�им тапмакъ � да бакъмакъ ичюн [[Special:FileList|юкленген файллар джедвелине]] кечинъиз, бундан гъайры файл юкленюв ве ёкъ �тилюв къайдларыны [[Special:Log/upload|юкленюв журналында]] ве [[Special:Log/delete|ёкъ �тилюв журналында]] тапып ола�ынъыз.
 
 Саифеде ре�им къулланмакъ ичюн бойле шекилли багълантылар къулланынъыз: 
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' файлнынъ там вер�и��ыны къулланмакъ ичюн,
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|tarif]]</nowiki></tt>''' бир тариф иле 200 пик�ель бир ре�им къулланмакъ ичюн,
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' файлнынъ там вер�и��ыны къулланмакъ ичюн,
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|tarif]]</nowiki></tt>''' бир тариф иле 200 пик�ель бир ре�им къулланмакъ ичюн,
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' файлгъа ва�та�ыз багъланты ичюн.",
 'upload-permitted'            => 'Изинли файл чешитлери: $1.',
 'upload-preferred'            => 'И�тенильген файл чешитлери: $1.',
@@ -934,7 +936,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'uploadlog'                   => 'юклеме журналы',
 'uploadlogpage'               => 'Файл юклеме журналы',
 'uploadlogpagetext'           => '�шагъыда �нъ �онъки къошулгъан файлларнынъ джедвели булуна.
-Даа корьгезмели корюниш ичюн [[Special:NewImages|�нъы файллар галере��ына]] бакъынъыз.',
+Даа корьгезмели корюниш ичюн [[Special:NewFiles|�нъы файллар галере��ына]] бакъынъыз.',
 'filename'                    => 'Файл',
 'filedesc'                    => 'Файлгъа аит къы�къа тариф',
 'fileuploadsummary'           => 'Къы�къа тариф:',
@@ -944,7 +946,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'ignorewarning'               => 'Тенбини игнор �тип файлны юкле.',
 'ignorewarnings'              => 'Тенбини игнор �т',
 'minlength1'                  => 'Файлнынъ ады �нъ аздан бир арифтен ибарет олмалы.',
-'illegalfilename'             => '"$1" файлынынъ адында �ерлева ичюн ��акълы ишаретлер мевджут. Лютфен, файл адыны денъиштирип �нъыдан юклеп бакъынъыз.',
+'illegalfilename'             => '"$1" файлынынъ адында �ерлева ичюн ��акълы ишаретлер бар. Лютфен, файл адыны денъиштирип �нъыдан юклеп бакъынъыз.',
 'badfilename'                 => 'Файл ады $1 оларакъ денъиштирильди.',
 'filetype-badmime'            => '"$1" MIME чешитиндеки файллар юклеме ��акълыдыр.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' — и�тенильмеген файл чешити. 
@@ -957,23 +959,23 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'emptyfile'                   => 'Ихтимал ки, юкленген файл бош.
 Ихтималлы �ебеп - файл адландырув хата�ыдыр.
 Лютфен, тамам бу файлны юклемеге и�тейджек �кенинъизни тешкеринъиз.',
-'fileexists'                  => 'Бу и�имде бир файл мевджуттир. Лютфен, �гер �из денъиштирмектен �мин олма�анъыз башта <strong><tt>$1</tt></strong> файлына козь ташланъыз.',
-'filepageexists'              => 'Бу файл ичюн та�вир �аифе�и �нди �пылгъан (<strong><tt>$1</tt></strong>), л�кин бу адда бир файл ёкътыр. Язылгъан та�вир ре�им та�вир �аифе�инде ко�ьтерильмейджек. Янъы бир та�вир къошмакъ ичюн оны къолнен денъиштирмеге меджбур�ынъыз.',
-'fileexists-extension'        => 'Бунъа ошагъан адда бир файл мевджуттир:<br />
-Юкленген файлнынъ ады: <strong><tt>$1</tt></strong><br />
-Мевджут олгъан файлнынъ ады: <strong><tt>$2</tt></strong><br />
-Лютфен, башкъа бир ад �айлап �зынъыз.',
+'fileexists'                  => "Бу и�имде бир файл �нди бар. Лютфен, �гер �из денъиштирмектен �мин олма�анъыз башта '''<tt>$1</tt>''' файлына козь ташланъыз.",
+'filepageexists'              => "Бу файл ичюн та�вир �аифе�и �нди �пылгъан ('''<tt>$1</tt>'''), л�кин бу адда бир файл ёкътыр. Язылгъан та�вир ре�им та�вир �аифе�инде ко�ьтерильмейджек. Янъы бир та�вир къошмакъ ичюн оны къолнен денъиштирмеге меджбур�ынъыз.",
+'fileexists-extension'        => "Бунъа ошагъан адда бир файл бар:<br />
+Юкленген файлнынъ ады: '''<tt>$1</tt>'''<br />
+Мевджут олгъан файлнынъ ады: '''<tt>$2</tt>'''<br />
+Лютфен, башкъа бир ад �айлап �зынъыз.",
 'fileexists-thumb'            => "<center>'''Мевджут файл'''</center>",
-'fileexists-thumbnail-yes'    => 'Бельки де бу файл бир кучюльген копи�дыр (thumbnail). Лютфен, <strong><tt>$1</tt></strong> файлыны тешкеринъиз.<br />
-Эгер бельгиленген файл айны шу ре�им ол�а, онынъ кучюльген копи��ыны айры оларакъ юклемек аджети ёкътыр.',
-'file-thumbnail-no'           => 'Файлнынъ ады <strong><tt>$1</tt></strong>нен башлана. Бельки де бу ре�имнинъ уфакълаштырылгъан бир копи��ыдыр <i>(thumbnail)</i>.
-Эгер �изде бу ре�им там буюклигинде бар ол�а, лютфен, оны юкленъинъиз � да файлнынъ адыны денъиштиринъиз.',
-'fileexists-forbidden'        => 'Бу и�имде бир файл мевджуттир.
-Лютфен, кери къайтынъыз, файл и�мини денъиштирип �нъыдан юкленъиз.
-[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Файллар умумий тутулгъан еринде бу и�имде бир файл мевджуттир.
+'fileexists-thumbnail-yes'    => "Бельки де бу файл бир кучюльген копи�дыр (thumbnail). Лютфен, '''<tt>$1</tt>''' файлыны тешкеринъиз.<br />
+Эгер бельгиленген файл айны шу ре�им ол�а, онынъ кучюльген копи��ыны айры оларакъ юклемек аджети ёкътыр.",
+'file-thumbnail-no'           => "Файлнынъ ады '''<tt>$1</tt>'''нен башлана. Бельки де бу ре�имнинъ уфакълаштырылгъан бир копи��ыдыр ''(thumbnail)''.
+Эгер �изде бу ре�им там буюклигинде бар ол�а, лютфен, оны юкленъинъиз � да файлнынъ адыны денъиштиринъиз.",
+'fileexists-forbidden'        => 'Бу и�имде бир файл �нди бар, ве узерине �зыламай.
+Файлынъызны �нъыдан юклемеге и�те�енъиз, лютфен, кери къайтып �нъы бир и�им къулланынъыз.
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Файллар умумий тутулгъан еринде бу и�имде бир файл �нди бар.
 Эгер бу файлны �п бир юклемеге и�те�енъиз, кери къайтынъыз ве файл и�мини денъиштирип �нъыдан юкленъиз.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Бу файл ашагъыдаки {{PLURAL:$1|файлнынъ|файлларнынъ}} дубликаты ола:',
 'successfulupload'            => 'Юкленюв беджерильди',
 'uploadwarning'               => 'Тенби',
@@ -982,19 +984,19 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'overwroteimage'              => '"[[$1]]" �нъы вер�и��ы юкленди',
 'uploaddisabled'              => 'Юклеме ��акълыдыр.',
 'uploaddisabledtext'          => 'Файл юклеме ��акълыдыр.',
-'uploadscripted'              => 'Бу файлда браузер тарафындан �нълышнен ишленип олур HTML коду � да �крипт мевджут.',
+'uploadscripted'              => 'Бу файлда браузер тарафындан �нълышнен ишленип олур HTML коду � да �крипт бар.',
 'uploadcorrupt'               => 'Бу файл � зарарланды, � да �нълыш узантылы. Лютфен, файлны тешкерип �нъыдан юклеп бакъынъыз.',
 'uploadvirus'                 => 'Бу файл виру�лыдыр! $1 бакъынъыз',
 'sourcefilename'              => 'Юклемеге и�тегенинъиз файл:',
 'destfilename'                => 'Файлнынъ и�тенильген ады:',
 'upload-maxfilesize'          => '�замий (мак�ималь) файл буюклиги: $1',
 'watchthisupload'             => 'Бу файлны козетюв джедвелине кир�ет',
-'filewasdeleted'              => 'Бу и�имде бир файл мевджут �ди, амма ёкъ �тильген �ди. Лютфен, текрар юклемеден �вель $1 тешкеринъиз.',
+'filewasdeleted'              => 'Бу и�имде бир файл бар �ди, амма ёкъ �тильген �ди. Лютфен, текрар юклемеден �вель $1 тешкеринъиз.',
 'upload-wasdeleted'           => "'''Дикъкъат: Эвельде ёкъ �тильген файлны юклемекте�инъиз.'''
 
 Эр алда бу файлны юклемеге девам �тмеге и�тей�инъизми?
 Бу файл ичюн ёкъ �тювнинъ журналыны мында бакъып ола�ынъыз:",
-'filename-bad-prefix'         => 'Сиз юклеген файлнынъ ады <strong>"$1"</strong>-нен башлана. Бу, адетиндже, ракъамлы фотоаппаратлардан файл адына �зылгъан мана�ыз ишаретлердир. Лютфен, бу файл ичюн анълыджа бир ад �айлап �зынъыз.',
+'filename-bad-prefix'         => "Сиз юклеген файлнынъ ады '''\"\$1\"'''-нен башлана. Бу, адетиндже, ракъамлы фотоаппаратлардан файл адына �зылгъан мана�ыз ишаретлердир. Лютфен, бу файл ичюн анълыджа бир ад �айлап �зынъыз.",
 
 'upload-proto-error'      => 'Янълыш протокол',
 'upload-proto-error-text' => 'Интернеттен бир ре�им файлы юклемеге и�те�енъиз адре� <code>http://</code> � да <code>ftp://</code>нен башламалы.',
@@ -1015,20 +1017,20 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'upload_source_url'  => ' (догъру, публик тарзда кирмеге му�аадели интернет адре�)',
 'upload_source_file' => ' (компьютеринъиздеки файл)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Бу мах�у� �аифе бутюн юкленген файлларны ко�ьтере.
+# Special:ListFiles
+'listfiles-summary'     => 'Бу мах�у� �аифе бутюн юкленген файлларны ко�ьтере.
 Якъынларда юкленген файллар джедвельнинъ юкъары�ында ко�ьтериле.
 Сутун �ерлева�ына бир ба�ув �ортирлеменинъ тертибини денъиштирир.',
-'imagelist_search_for'  => 'Файл адыны къыдырув:',
+'listfiles_search_for'  => 'Файл адыны къыдырув:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Ре�им джедвели',
-'imagelist_date'        => 'Тарих',
-'imagelist_name'        => 'Файл ады',
-'imagelist_user'        => 'Къулланыджы',
-'imagelist_size'        => 'Буюклик',
-'imagelist_description' => 'Та�вир',
-
-# Image description page
+'listfiles'             => 'Ре�им джедвели',
+'listfiles_date'        => 'Тарих',
+'listfiles_name'        => 'Файл ады',
+'listfiles_user'        => 'Къулланыджы',
+'listfiles_size'        => 'Буюклик',
+'listfiles_description' => 'Та�вир',
+
+# File description page
 'filehist'                  => 'Файлнынъ кечмиши',
 'filehist-help'             => 'Файлнынъ керекли аньки алыны корьмек ичюн тарихкъа/�ааткъа ба�ынъыз.',
 'filehist-deleteall'        => '�пи�ини ёкъ �т',
@@ -1040,7 +1042,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'filehist-dimensions'       => 'Эн × бой',
 'filehist-filesize'         => 'Файл буюклиги',
 'filehist-comment'          => 'Изаат',
-'imagelinks'                => 'Файлны къуллангъан �аифелер',
+'imagelinks'                => 'Файл багълантылары',
 'linkstoimage'              => 'Бу файлгъа багъланты олгъан $1 �аифе:',
 'nolinkstoimage'            => 'Бу файлгъа багълангъан �аифе ёкъ.',
 'sharedupload'              => 'Бу файл ортакъ фезагъа юкленген ве дигер проектлерде де къулланылгъан бир файл ола билир.',
@@ -1074,29 +1076,16 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 
 # Random page
 'randompage'         => 'Те�адюфий �аифе',
-'randompage-nopages' => 'Бу и�им феза�ында ич бир �аифе ёкъ.',
+'randompage-nopages' => '"$1" и�им феза�ында ич бир �аифе ёкъ.',
 
 # Random redirect
 'randomredirect'         => 'Те�адюфий ёллама �аифе�и',
-'randomredirect-nopages' => 'Бу и�им феза�ында ич бир ёллама �аифе�и ёкъ.',
+'randomredirect-nopages' => '"$1" и�им феза�ында ич бир ёллама �аифе�и ёкъ.',
 
 # Statistics
-'statistics'             => 'Стати�тика',
-'sitestats'              => '{{SITENAME}} �тати�тика�ы',
-'userstats'              => 'Къулланыджы �тати�тика�ы',
-'sitestatstext'          => "{{SITENAME}} �айтында ал-азырда '''{{PLURAL:\$2|1 кечерли �аифе|\$2 кечерли �аифе}}''' мевджуттир.
-
-Бу джумледен; \"ёллама\", \"музакере\", \"ре�им\", \"къулланыджы\", \"�рдым\", \"{{SITENAME}}\", \"шаблон\" и�им фезаларындакилер ве ички багъланты�ыз �аифелер кир�етильмеди. Кечерли �аифе �айы�ына бу �аифелернинъ �айы�ы �кленгенде и�е топлам '''\$1''' �аифе мевджуттир.
-
-\$8 дане файл юкленди.
-
-Сайт къурулгъанындан бу куньге къадар топлам '''\$4''' �аифе денъишиклиги ве �аифе башына тахминен '''\$5''' и��е къошулды.
-
-Топлам �аифе ко�ьтерильме �айы�ы '''\$3''', денъишиклик башына ко�ьтерме �айы�ы '''\$6''' олды.
-
-Шимдики [http://www.mediawiki.org/wiki/Manual:Job_queue иш �ыра�ы] �айы�ы '''\$7'''.",
-'userstatstext'          => "�л-азырда '''{{PLURAL:$1|1|$1}}''' къайдлы къулланыджымыз бар. Булардан '''{{PLURAL:$2|1|$2}}''' (� да '''$4%''') дане�и - $5.",
-'statistics-mostpopular' => 'Энъ �ыкъ бакъылгъан �аифелер',
+'statistics'              => 'Стати�тика',
+'statistics-header-users' => 'Къулланыджы �тати�тика�ы',
+'statistics-mostpopular'  => 'Энъ �ыкъ бакъылгъан �аифелер',
 
 'disambiguations'      => 'Чокъ маналы терминлер �аифелери',
 'disambiguationspage'  => 'Template:disambig',
@@ -1108,7 +1097,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'doubleredirectstext' => 'Эр �атырда, �кинджи ёллама метнининъ ильк �атырынынъ (умумен �кинджи ёлламанынъ да ишарет �тмек керек олгъаны "а�ыл" макъ�атнынъ) �нында ильк ве �кинджи ёлламагъа багълантылар бар.',
 
 'brokenredirects'        => 'Бар олмагъан �аифеге �пылгъан ёлламалар',
-'brokenredirectstext'    => '�шагъыдки ёллама, мевджут олмагъан бир �аифеге ишарет �те.',
+'brokenredirectstext'    => '�шагъыдаки ёлламалар бар олмагъан �аифелерге багъланты берелер:',
 'brokenredirects-edit'   => '(денъиштир)',
 'brokenredirects-delete' => '(ёкъ �т)',
 
@@ -1135,13 +1124,15 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'popularpages'            => 'Попул�р �аифелер',
 'wantedcategories'        => 'И�тенильген категори�лар',
 'wantedpages'             => 'И�тенильген �аифелер',
+'wantedfiles'             => 'И�тенильген файллар',
+'wantedtemplates'         => 'И�тенильген шаблонлар',
 'mostlinked'              => 'Озюне �нъ зи�де багъланты берильген �аифелер',
 'mostlinkedcategories'    => 'Энъ чокъ �аифеге �аип категори�лар',
 'mostlinkedtemplates'     => 'Озюне �нъ зи�де багъланты берильген шаблонлар',
 'mostcategories'          => 'Энъ зи�де категори�гъа багълангъан �аифелер',
 'mostimages'              => 'Энъ чокъ къулланылгъан ре�имлер',
 'mostrevisions'           => 'Энъ чокъ денъишикликке огърагъан �аифелер',
-'prefixindex'             => 'Префик� джедвели',
+'prefixindex'             => 'Префик�нен бутюн �аифелер',
 'shortpages'              => 'Къы�къа �аифелер',
 'longpages'               => 'Узун �аифелер',
 'deadendpages'            => 'Башкъа �аифелерге багъланты�ы олмагъан �аифелер',
@@ -1168,8 +1159,6 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'speciallogtitlelabel' => 'Серлева:',
 'log'                  => 'Журналлар',
 'all-logs-page'        => 'Бутюн журналлар',
-'log-search-legend'    => 'Журнал къыдырув',
-'log-search-submit'    => 'Къыдыр',
 'logempty'             => 'Журналда бир кельген малюмат ёкъ.',
 'log-title-wildcard'   => 'Бу ишаретлерден башлангъан �ерлеваларны къыдыр',
 
@@ -1201,6 +1190,13 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'listusers-submit'   => 'Ко�ьтер',
 'listusers-noresult' => 'Ич бир къулланыджы тапылмады.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Янъы къулланыджы журналы',
+'newuserlogpagetext'          => 'Энъ �онъки къайд олгъан къулланыджы журналы.',
+'newuserlog-create-entry'     => 'Янъы къулланыджы',
+'newuserlog-create2-entry'    => '�нъы ��ап �ратты $1',
+'newuserlog-autocreate-entry' => 'Э�ап автоматик оларакъ �ратылды',
+
 # E-mail user
 'mailnologin'     => 'Мектюп ёлланаджакъ адре�и ёкътыр',
 'mailnologintext' => 'Дигер къулланыджыларгъа �лектрон мектюплер ёллап олмакъ ичюн [[Special:UserLogin|отурым ачмалы�ынъыз]] ве [[Special:Preferences|�азламаларынъызда]] мевджут олгъан e-mail адре�ининъ �аиби олмалы�ынъыз.',
@@ -1211,7 +1207,7 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'usermailererror' => 'E-mail бе�наты ёллангъан вакъытта хата олып чыкъты',
 'defemailsubject' => '{{SITENAME}} e-mail',
 'noemailtitle'    => 'E-mail адре�и ёкътыр',
-'noemailtext'     => 'Бу къулланыджы � мевджут олгъан �лектрон почта адре�ини �змагъан, � да башкъа къулланыджылардан мектюп алувдан вазгечкен.',
+'noemailtext'     => 'Бу къулланыджы уйгъун �лектрон почта адре�ини бильдирмеген.',
 'emailfrom'       => 'Кимден:',
 'emailto'         => 'Кимге:',
 'emailsubject'    => 'Мектюп мевзу�ы:',
@@ -1247,16 +1243,11 @@ $3 мына бойле бир �ебеп бельгиледи: ''$2''",
 'wlheader-showupdated' => "* Сонъки зи�ретинъизден �онъраки �аифе денъишикликлери '''къалын''' оларакъ ко�ьтерильди.",
 'watchmethod-recent'   => '�онъки денъишикликлер ара�ында козеткен �аифелеринъиз къыдырыла',
 'watchmethod-list'     => 'козетюв джедвелиндеки �аифелер тешкериле',
-'watchlistcontains'    => 'Сизинъ козетюв джедвелинъизде {{PLURAL:$1|1|$1}} �аифе мевджуттир.',
+'watchlistcontains'    => 'Сизинъ козетюв джедвелинъизде {{PLURAL:$1|1|$1}} �аифе бар.',
 'iteminvalidname'      => '"$1" �аифе�и муна�ебетинен проблема олып чыкъты, �льверишли олмагъан и�имдир…',
 'wlnote'               => "�шагъыда �онъки {{PLURAL:$2|�аат|'''$2''' �аат}} ичинде �пылгъан �онъки {{PLURAL:$1|денъишиклик|'''$1''' денъишиклик}} ко�ьтериле.",
 'wlshowlast'           => 'Сонъки $2 кунь $1 �аат ичюн $3 ко�ьтер',
-'watchlist-show-bots'  => 'Ботлар денъишикликлерини ко�ьтер',
-'watchlist-hide-bots'  => 'Ботлар денъишикликлерини гизле',
-'watchlist-show-own'   => 'Меним денъишикликлеримни ко�ьтер',
-'watchlist-hide-own'   => 'Меним денъишикликлеримни гизле',
-'watchlist-show-minor' => 'Кичик денъишикликлерни ко�ьтер',
-'watchlist-hide-minor' => 'Кичик денъишикликлерни гизле',
+'watchlist-options'    => 'Козетюв джедвели �азламалары',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Козетюв джедвелине кир�етильмекте...',
@@ -1295,57 +1286,63 @@ e-mail: $PAGEEDITOR_EMAIL
 Ярдым ве теклифлер ичюн:
 {{fullurl:Help:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Саифени ёкъ �т',
-'confirm'                     => 'Та�дыкъла',
-'excontent'                   => "��ки метин: '$1'",
-'excontentauthor'             => "��ки метин: '$1' ('$2' и��е къошкъан тек бир къулланыджы)",
-'exbeforeblank'               => "�къ �тильмеген �вельки метин: '$1'",
-'exblank'                     => '�аифе метини бош',
-'historywarning'              => 'Тенби: Сиз ёкъ �тмек узьре олгъан �аифенинъ кечмиши бардыр:',
-'confirmdeletetext'           => 'Бир �аифени � да ре�имни бутюн кечмиши иле бирликте малюмат база�ындан къалыджы оларакъ ёкъ �тмек узьре�инъиз.
+# Delete
+'deletepage'            => 'Саифени ёкъ �т',
+'confirm'               => 'Та�дыкъла',
+'excontent'             => "��ки метин: '$1'",
+'excontentauthor'       => "��ки метин: '$1' ('$2' и��е къошкъан тек бир къулланыджы)",
+'exbeforeblank'         => "�къ �тильмеген �вельки метин: '$1'",
+'exblank'               => '�аифе метини бош',
+'historywarning'        => 'Тенби: Сиз ёкъ �тмек узьре олгъан �аифенинъ кечмиши бардыр:',
+'confirmdeletetext'     => 'Бир �аифени � да ре�имни бутюн кечмиши иле бирликте малюмат база�ындан къалыджы оларакъ ёкъ �тмек узьре�инъиз.
 Лютфен, нетиджелерини анълагъанынъызны ве [[{{MediaWiki:Policy-url}}|ёкъ �тюв политика�ына]] уйгъунлыгъыны дикъкъаткъа алып, буны �пмагъа и�тегенинъизни та�дыкъланъыз.',
-'actioncomplete'              => 'Ишлем тамамланды.',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ёкъ �тильди.
+'actioncomplete'        => 'Ишлем тамамланды.',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ёкъ �тильди.
 �къын заманда ёкъ �тильгенлерни корьмек ичюн: $2.',
-'deletedarticle'              => '"[[$1]]" ёкъ �тильди',
-'dellogpage'                  => '�къ �тюв журналы',
-'dellogpagetext'              => '�шагъыдаки джедвель �онъки ёкъ �тюв журналыдыр.',
-'deletionlog'                 => 'ёкъ �тюв журналы',
-'reverted'                    => 'Эвельки вер�и� кери кетирильди',
-'deletecomment'               => '�къ �тюв �ебеби',
-'deleteotherreason'           => 'Дигер/ил�вели �ебеп:',
-'deletereasonotherlist'       => 'Дигер �ебеп',
-'rollback'                    => 'денъишикликлерни кери ал',
-'rollback_short'              => 'кери ал',
-'rollbacklink'                => '��ки алына кетир',
-'rollbackfailed'              => 'кери алув ишлеми мувафакъиет�из',
-'cantrollback'                => 'Денъишикликлер кери алынамай, �онъки денъиштирген киши �аифенинъ тек бир му�ллифидир',
-'editcomment'                 => 'Денъиштирме изааты: "<i>$1</i>" �ди.', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|музакере]]) тарафындан �пылгъан денъишикликлер кери алынып, [[User:$1|$1]] тарафындан денъиштирильген �вельки вер�и� кери кетирильди.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'deletedarticle'        => '"[[$1]]" ёкъ �тильди',
+'dellogpage'            => '�къ �тюв журналы',
+'dellogpagetext'        => '�шагъыдаки джедвель �онъки ёкъ �тюв журналыдыр.',
+'deletionlog'           => 'ёкъ �тюв журналы',
+'reverted'              => 'Эвельки вер�и� кери кетирильди',
+'deletecomment'         => '�къ �тюв �ебеби',
+'deleteotherreason'     => 'Дигер/ил�вели �ебеп:',
+'deletereasonotherlist' => 'Дигер �ебеп',
+
+# Rollback
+'rollback'       => 'денъишикликлерни кери ал',
+'rollback_short' => 'кери ал',
+'rollbacklink'   => '��ки алына кетир',
+'rollbackfailed' => 'кери алув ишлеми мувафакъиет�из',
+'cantrollback'   => 'Денъишикликлер кери алынамай, �онъки денъиштирген киши �аифенинъ тек бир му�ллифидир',
+'editcomment'    => "Денъиштирме изааты: \"''\$1''\" �ди.", # only shown if there is an edit comment
+'revertpage'     => '[[Special:Contributions/$2|$2]] ([[User talk:$2|музакере]]) тарафындан �пылгъан денъишикликлер кери алынып, [[User:$1|$1]] тарафындан денъиштирильген �вельки вер�и� кери кетирильди.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'Къорчалав журналы',
 'protectlogtext'              => 'Къорчалавгъа алув/чыкъарув иле багълы денъишикликлер журналыны корьмекте�инъиз.
 Къорчалав алтына алынгъан �аифелер там джедвели [[Special:ProtectedPages|бу �аифеде]] корип ола�ынъыз.',
 'protectedarticle'            => '"[[$1]]" къорчалав алтына алынды',
 'unprotectedarticle'          => 'къорчалав чыкъарлыды: "[[$1]]"',
+'prot_1movedto2'              => '"[[$1]]" �аифе�ининъ ады "[[$2]]" оларакъ денъиштирильди',
 'protect-legend'              => 'Къорчалавны та�дыкъла',
 'protectcomment'              => 'Къорчалав алтына алув �ебеби',
 'protectexpiry'               => 'Битиш тарихы:',
 'protect_expiry_invalid'      => 'Битиш тарихы �нълыш.',
 'protect_expiry_old'          => 'Битиш заманы кечмиштедир.',
 'protect-unchain'             => 'Саифе ады денъиштирюв килитини чыкъар',
-'protect-text'                => '<strong>[[<nowiki>$1</nowiki>]]</strong> �аифе�ининъ къорчалав �евие�ини мындан корип олур ве денъиштирип ола�ынъыз.',
-'protect-locked-access'       => 'Къулланыджы ��абынъыз �аифенинъ къорчалав �евиелерини денъиштирме етки�ине �аип дегиль. <strong>$1</strong> �аифе�ининъ шимдики �азламалары шуларыдыр:',
+'protect-text'                => "'''[[<nowiki>$1</nowiki>]]''' �аифе�ининъ къорчалав �евие�ини мындан корип олур ве денъиштирип ола�ынъыз.",
+'protect-locked-access'       => "Къулланыджы ��абынъыз �аифенинъ къорчалав �евиелерини денъиштирме етки�ине �аип дегиль. '''$1''' �аифе�ининъ шимдики �азламалары шуларыдыр:",
 'protect-cascadeon'           => 'Бу �аифе шимди къорчалав алтындадыр, чюнки ашагъыда джедвелленген ве ка�кадлы къорчалав алтындаки $1 �аифеде къулланыла.
 Бу �аифенинъ къорчалав �евие�ини денъиштирип ола�ынъыз, амма ка�кадлы къорчалав те�ир �тильмейджек.',
-'protect-default'             => '(�тандарт)',
+'protect-default'             => 'Бутюн къулланыджыларгъа рух�ет бер',
 'protect-fallback'            => '«$1» изни керектир',
-'protect-level-autoconfirmed' => 'къайд олунмагъан денъиштирме�ин',
+'protect-level-autoconfirmed' => 'Къайд�ыз ве �нъы къулланыджыларны блок �т',
 'protect-level-sysop'         => 'тек админи�траторлар',
 'protect-summary-cascade'     => 'ка�кадлы',
 'protect-expiring'            => 'бите: $1 (UTC)',
 'protect-cascade'             => 'Бу �аифеде къулланылгъан бутюн �аифелерни къорчалавгъа ал (ка�кадлы къорчалав)',
 'protect-cantedit'            => 'Бу �аифенинъ къорчалав �евие�ини денъиштирип оламаз�ынъыз, чюнки буны �пмагъа еткинъиз ёкъ.',
+'protect-expiry-options'      => '2 �аат:2 hours,1 кунь:1 day,3 кунь:3 days,1 афта:1 week,2 афта:2 weeks,1 ай:1 month,3 ай:3 months,6 ай:6 months,1 йыл:1 year,муддет�из:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Рух�ети:',
 'restriction-level'           => 'Рух�ет �евие�и:',
 'minimum-size'                => '��гъарий (минималь) буюклик',
@@ -1377,13 +1374,14 @@ e-mail: $PAGEEDITOR_EMAIL
 'blanknamespace' => '(Э�а�)',
 
 # Contributions
-'contributions' => 'Къулланыджынынъ и��елери',
-'mycontris'     => 'И��елерим',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Бу критерийлерге уйгъан денъишиклик тапыламады',
-'uctop'         => '(�онъки)',
-'month'         => 'Бу ай (ве ондан �рте):',
-'year'          => 'Бу �ене (ве ондан �рте):',
+'contributions'       => 'Къулланыджынынъ и��елери',
+'contributions-title' => '$1 къулланыджы�ынынъ и��елери',
+'mycontris'           => 'И��елерим',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Бу критерийлерге уйгъан денъишиклик тапыламады',
+'uctop'               => '(�онъки)',
+'month'               => 'Бу ай (ве ондан �рте):',
+'year'                => 'Бу �ене (ве ондан �рте):',
 
 'sp-contributions-newbies'     => 'Тек �нъы къулланыджыларнынъ и��елерини ко�ьтер',
 'sp-contributions-newbies-sub' => 'Янъы къулланыджылар ичюн',
@@ -1396,7 +1394,6 @@ e-mail: $PAGEEDITOR_EMAIL
 'whatlinkshere'       => 'Саифеге багълантылар',
 'whatlinkshere-title' => '$1 �аифе�ине багъланты олгъан �аифелер',
 'whatlinkshere-page'  => 'Саифе:',
-'linklistsub'         => '(Багъланты джедвели)',
 'linkshere'           => "Бу �аифелер '''[[:$1]]''' �аифе�ине багъланты�ы олгъан:",
 'nolinkshere'         => "'''[[:$1]]''' �аифе�ине багълангъан �аифе ёкъ.",
 'nolinkshere-ns'      => "Сайлангъан и�им феза�ында '''[[:$1]]''' �аифе�ине багълангъан �аифе ёкътыр.",
@@ -1423,7 +1420,7 @@ e-mail: $PAGEEDITOR_EMAIL
 'blockipsuccesstext'      => '"$1" бан �тильди.
 <br />[[Special:IPBlockList|IP адре�и бан �тильгенлер]] джедвелине бакъынъыз .',
 'unblockip'               => 'Къулланыджынынъ бан �тювини чыкъар',
-'ipusubmit'               => 'Бу адре�нинъ бан �тювини чыкъар',
+'ipusubmit'               => 'Бу блок �тмени чыкъар',
 'ipblocklist'             => 'Блок �тильген къулланыджылар ве IP адре�лери',
 'blocklistline'           => '$1, $2 блок �тти: $3 ($4)',
 'infiniteblock'           => 'муддет�из',
@@ -1450,28 +1447,30 @@ e-mail: $PAGEEDITOR_EMAIL
 'movepagetext'            => "�шагъыдаки форманы къулланып �аифенинъ адыны денъиштирилир. Бунынънен берабер денъишиклик журналы да �нъы адгъа авуштырылыр.
 Э�ки ад �нъы адгъа ёллама олур. Э�ки �ерлевагъа ёллама �аифелерни автоматик оларакъ �нъартып ола�ынъыз. Бу ишлеми автоматик �пмагъа и�теме�енъиз, бутюн [[Special:DoubleRedirects|чифт]] ве [[Special:BrokenRedirects|йыртыкъ]] ёллама �аифелерини озюнъиз тюзетмеге меджбур олур�ынъыз. Багълантылар �ндиден берли догъру чалышма�ындан �мин олмалы�ынъыз.
 
-Янъы адда бир ад затен мевджут ол�а, ад денъишиклиги '''�пылмайджакъ''', анджакъ мевджут олгъан �аифе ёллама � да бош ол�а ад денъишиклиги мумкюн оладжакъ. Бу демек ки, �аифе адыны �нълыштан денъиштирген ол�анъыз деминки адыны кери къайтарып ола�ынъыз, амма мевджут олгъан �аифени те�адюфен ёкъ �талмай�ынъыз.
+Янъы адда бир ад �нди бар ол�а, ад денъишиклиги '''�пылмайджакъ''', анджакъ мевджут олгъан �аифе ёллама � да бош ол�а ад денъишиклиги мумкюн оладжакъ. Бу демек ки, �аифе адыны �нълыштан денъиштирген ол�анъыз деминки адыны кери къайтарып ола�ынъыз, амма мевджут олгъан �аифени те�адюфен ёкъ �талмай�ынъыз.
 
 '''ТЕ�БИ!'''
 �д денъиштирюв попул�р �аифелер ичюн буюк денъишмелерге �ебеп ола билир. Лютфен, денъишикликни �пмадан �вель ола биледжеклерни козь огюне алынъыз.",
-'movepagetalktext'        => "Къошулгъан музакере �аифе�ининъ де (мевджут ол�а)
+'movepagetalktext'        => "Къошулгъан музакере �аифе�ининъ де (бар ол�а)
 ады автоматик тарзда денъиштириледжек. '''Му�те�налар:'''
 
-* �йны бу адда бош олмагъан бир музакере �аифе�и �нди мевджуттир;
+* �йны бу адда бош олмагъан бир музакере �аифе�и �нди бар;
 * �шагъыдаки бошлукъкъа ишарет къоймадынъыз.
 
 Бойле алларда, керек ол�а, �аифелерни къолнен ташымагъа � да бирлештирмеге меджбур олур�ынъыз.",
 'movearticle'             => 'Э�ки ад',
+'movenologin'             => 'Отурым ачмадынъыз',
+'movenologintext'         => 'Саифенинъ адыны денъиштирип олмакъ ичюн [[Special:UserLogin|отурым ачынъыз]].',
 'movenotallowed'          => 'Саифелер адларыны денъиштирмеге изининъиз ёкъ.',
 'newtitle'                => 'Янъы ад',
 'move-watch'              => 'Бу �аифени козет',
 'movepagebtn'             => '�дыны денъиштир',
 'pagemovedsub'            => '�д денъишиклиги тамамланды',
 'movepage-moved'          => "<big>'''«$1» �аифе�ининъ ады «$2» оларакъ денъиштирильди'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Бу адда бир �аифе �нди мевджут � да �из �згъан ад ��акълы.
+'articleexists'           => 'Бу адда бир �аифе �нди бар � да �из �згъан ад ��акълы.
 Лютфен, башкъа бир ад �айлап �зынъыз.',
 'cantmove-titleprotected' => 'Сиз �згъан �нъы ад ��акълыдыр, бунынъ ичюн �аифе адыны денъиштирмекнинъ чаре�и ёкъ.',
-'talkexists'              => "'''Саифенинъ ады денъиштирильди, амма музакере �аифе�ининъ адыны денъиштирмеге мумкюнлик ёкътыр, чюнки айны бу адда бир �аифе �нди мевджуттир. Лютфен, буларны къолнен бирлештиринъиз.'''",
+'talkexists'              => "'''Саифенинъ ады денъиштирильди, амма музакере �аифе�ининъ адыны денъиштирмеге мумкюнлик ёкътыр, чюнки айны бу адда бир �аифе �нди бар. Лютфен, буларны къолнен бирлештиринъиз.'''",
 'movedto'                 => 'ады денъиштирильди:',
 'movetalk'                => 'Музакере �аифе�ининъ адыны денъиштир.',
 '1movedto2'               => '"[[$1]]" �аифе�ининъ ады "[[$2]]" оларакъ денъиштирильди',
@@ -1483,11 +1482,10 @@ e-mail: $PAGEEDITOR_EMAIL
 'delete_and_move'         => '�къ �т ве адыны денъиштир',
 'delete_and_move_text'    => '==�къ �тмек л�зимдир==
 
-«[[:$1]]» �аифе�и �нди мевджут. �дыны денъиштирип олмакъ ичюн оны ёкъ �тмеге и�тей�инъизми?',
+«[[:$1]]» �аифе�и �нди бар. �дыны денъиштирип олмакъ ичюн оны ёкъ �тмеге и�тей�инъизми?',
 'delete_and_move_confirm' => 'Эбет, бу �аифени ёкъ �т',
 'delete_and_move_reason'  => 'И�им денъиштирип олмакъ ичюн ёкъ �тильди',
 'selfmove'                => 'Бу �аифенинъ адыны денъиштирмеге имк�н ёкътыр, чюнки а�ыл иле �нъы адлары бир келе.',
-'immobile_namespace'      => 'Бу �аифенинъ адыны денъиштирмеге имк�н ёкътыр, чюнки �нъы � да �к�и адында резерв �тильген �рдымджы �ёз бардыр.',
 
 # Export
 'export' => 'Саифелерни �к�порт �т',
@@ -1498,7 +1496,7 @@ e-mail: $PAGEEDITOR_EMAIL
 'allmessagesdefault'  => 'Оригиналь метин',
 'allmessagescurrent'  => 'Шимди къулланылгъан метин',
 'allmessagestext'     => 'Ишбу джедвель MediaWiki-де мевджут олгъан бутюн �и�тема бе�натларынынъ джедвелидир.
-MediaWiki интерфей�ининъ чешит тиллерге терджиме �тювде иштирак �тмеге и�те�енъиз [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] ве [http://translatewiki.net Betawiki] �аифелерине зи�рет �тинъиз.',
+MediaWiki интерфей�ининъ чешит тиллерге терджиме �тювде иштирак �тмеге и�те�енъиз [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] ве [http://translatewiki.net translatewiki.net] �аифелерине зи�рет �тинъиз.',
 'allmessagesfilter'   => 'Метин айрыштырыджы фильтры:',
 'allmessagesmodified' => 'Тек денъиштирильгенлерни ко�ьтер',
 
@@ -1509,23 +1507,26 @@ MediaWiki интерфейÑ�ининъ чешит тиллерге терджиÐ
 'thumbnail_invalid_params' => 'Янълыш thumbnail параметри',
 'thumbnail_dest_directory' => 'И�тенильген директори�ны �ратмакънынъ ич чаре�и ёкъ',
 
+# Special:Import
+'import-comment' => 'Изаат:',
+
 # Import log
 'importlogpage' => 'Импорт журналы',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Шах�ий �аифем',
+'tooltip-pt-userpage'             => 'Сизинъ къулланыджы �аифенъиз',
 'tooltip-pt-anonuserpage'         => 'IP адре�им ичюн къулланыджы �аифе�и',
-'tooltip-pt-mytalk'               => 'Музакере �аифем',
+'tooltip-pt-mytalk'               => 'Сизинъ музакере �аифенъиз',
 'tooltip-pt-anontalk'             => 'Бу IP адре�инден �пылгъан денъишикликлерни музакере �т',
 'tooltip-pt-preferences'          => 'Сазламаларым (на�тройкаларым)',
 'tooltip-pt-watchlist'            => 'Мен козетювге алгъан �аифелер',
-'tooltip-pt-mycontris'            => 'Къошкъан и��елеримнинъ джедвели',
+'tooltip-pt-mycontris'            => 'Къошкъан и��елеринъизнинъ джедвели',
 'tooltip-pt-login'                => 'Отурым ачманъыз тев�ие олуныр амма меджбур дегиль�инъиз.',
 'tooltip-pt-anonlogin'            => 'Отурым ачманъыз тев�ие олуныр амма меджбур дегиль�инъиз.',
 'tooltip-pt-logout'               => 'Отурымны къапат',
 'tooltip-ca-talk'                 => 'Саифедеки малюмат иле багълы зан бельгиле',
 'tooltip-ca-edit'                 => 'Бу �аифени денъиштирип ола�ынъыз. Сакъламаздан �вель бакъып чыкъмагъа унутманъыз.',
-'tooltip-ca-addsection'           => 'Бу музакереге теф�ир къошунъыз.',
+'tooltip-ca-addsection'           => 'Янъы болюк ач',
 'tooltip-ca-viewsource'           => 'Бу �аифе къорчалав алтында. Менба кодуны тек корип ола�ынъыз, денъиштирип оламай�ынъыз.',
 'tooltip-ca-history'              => 'Бу �аифенинъ кечмиш вер�и�лары.',
 'tooltip-ca-protect'              => 'Бу �аифени къорчала',
@@ -1582,12 +1583,12 @@ MediaWiki интерфейÑ�ининъ чешит тиллерге терджиÐ
 'notacceptable'     => 'Вики-�ервер браузеринъиз окъуп оладжакъ форматында малюмат бералмай.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}} �айтынынъ ад�ыз (аноним) къулланыджылары',
+'anonymous'        => '{{SITENAME}} �айтынынъ  $1 ад�ыз (аноним) къулланыджы�ы',
 'siteuser'         => '{{SITENAME}} къулланыджы $1',
 'lastmodifiedatby' => 'Саифе �нъ �онъки $3 тарафындан $2, $1 тарихында денъиштирильди.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 менба�ына бина�н.',
 'others'           => 'дигерлери',
-'siteusers'        => '{{SITENAME}} къулланыджылар $1',
+'siteusers'        => '{{SITENAME}} �айтынынъ $2 къулланыджы�ы $1',
 'creditspage'      => 'Тешеккюрлер',
 'nocredits'        => 'Бу �аифе ичюн къулланыджылар джедвели ёкъ.',
 
@@ -1607,6 +1608,15 @@ MediaWiki интерфейÑ�ининъ чешит тиллерге терджиÐ
 'numauthors'     => 'Му�ллиф �айы�ы (�аифе): $1',
 'numtalkauthors' => 'Му�ллиф �айы�ы (музакере �аифе�и): $1',
 
+# Skin names
+'skinname-standard'    => 'Стандарт',
+'skinname-nostalgia'   => '�о�тальги�',
+'skinname-cologneblue' => 'Кёльн а�ретлиги',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Озь ре�имлеме',
+'skinname-chick'       => 'Чипче',
+'skinname-simple'      => '�дий',
+
 # Math options
 'mw_math_png'    => 'Даима PNG ре�им форматына чевир',
 'mw_math_simple' => 'Пек ба�ит ол�а HTML, ёкъ�а PNG',
@@ -1639,7 +1649,7 @@ MediaWiki интерфейÑ�ининъ чешит тиллерге терджиÐ
 'show-big-image'       => 'Там чезинирлик',
 'show-big-image-thumb' => '<small>Бакъып чыкъувда ре�им буюклиги: $1 × $2 пик�ель</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Янъы ре�имлер',
 'imagelisttext'         => "�шагъыдаки джедвельде $2 коре тизильген {{PLURAL:$1|'''1''' файлдыр|'''$1''' файлдыр}}.",
 'showhidebots'          => '(ботларны $1)',
@@ -1797,21 +1807,9 @@ $1
 Саифени �нъыдан �ратмагъа и�те�енъиз, лютфен, буны та�дыкъланъыз.",
 'recreate'            => 'Саифени �нъыдан �рат',
 
-# HTML dump
-'redirectingto' => '�ллама [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Саифе к�шини темизле�инми?
-
-$1',
 'confirm_purge_button' => 'Ок',
-
-# AJAX search
-'searchcontaining' => "''$1'' деген �ёзлер иле �аифелерни къыдырув.",
-'searchnamed'      => "''$1'' адлы �аифелерни къыдырув.",
-'articletitles'    => "''$1'' иле башлагъан �аифелерни къыдырув.",
-'hideresults'      => '�етиджелерни гизле',
-'useajaxsearch'    => 'AJAX къыдырувы къуллан',
+'confirm-purge-top'    => 'Саифе к�шини темизле�инми?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� �вельки �аифе',
@@ -1833,7 +1831,7 @@ $1',
 'autosumm-blank'   => 'Саифе бошатылды',
 'autosumm-replace' => "Саифедеки малюмат '$1' иле денъиштирильди",
 'autoredircomment' => '[[$1]] �аифе�ине ёлланды',
-'autosumm-new'     => 'Янъы �аифе: $1',
+'autosumm-new'     => "Янъы �аифе �ратылды. Мундеридже�и: '$1'",
 
 # Live preview
 'livepreview-loading' => 'Юкленмекте…',
diff --git a/languages/messages/MessagesCrh_latn.php b/languages/messages/MessagesCrh_latn.php
index 4d2317c9..4dafadc4 100644
--- a/languages/messages/MessagesCrh_latn.php
+++ b/languages/messages/MessagesCrh_latn.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
     NS_USER_TALK                 => 'Qullanıcı_muzakeresi',
     # NS_PROJECT set by $wgMetaNamespace
     NS_PROJECT_TALK              => '$1_muzakeresi',
-    NS_IMAGE                     => 'Resim',
-    NS_IMAGE_TALK                => 'Resim_muzakeresi',
+    NS_FILE                      => 'Resim',
+    NS_FILE_TALK                 => 'Resim_muzakeresi',
     NS_MEDIAWIKI                 => 'MediaViki',
     NS_MEDIAWIKI_TALK            => 'MediaViki_muzakeresi',
     NS_TEMPLATE                  => 'Åžablon',
@@ -42,8 +42,8 @@ $namespaceAliases = array(
 	"Къулланыджы"            => NS_USER,
 	"Къулланыджы_музакере�и" => NS_USER_TALK,
 	"$1_музакере�и"          => NS_PROJECT_TALK,
-	"Ре�им"                  => NS_IMAGE,
-	"Ре�им_музакере�и"       => NS_IMAGE_TALK,
+	"Ре�им"                  => NS_FILE,
+	"Ре�им_музакере�и"       => NS_FILE_TALK,
 	"МедиаВики"              => NS_MEDIAWIKI,
 	"МедиаВики_музакере�и"   => NS_MEDIAWIKI_TALK,
 	'Шаблон'                 => NS_TEMPLATE,
@@ -54,15 +54,6 @@ $namespaceAliases = array(
 	'Категори�_музакере�и'   => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-    'standard'    => 'Standart',
-    'nostalgia'   => 'Nostalgiya',
-    'cologneblue' => 'Köln asretligi',
-    'monobook'    => 'MonoBook',
-    'myskin'      => 'Öz resimleme',
-    'chick'       => 'Çipçe',
-    'simple'      => 'Adiy'
-);
 
 $datePreferences = array(
     'default',
@@ -117,8 +108,8 @@ $messages = array(
 'tog-numberheadings'          => 'Serlevalarnı avtomatik nomeralandır',
 'tog-showtoolbar'             => 'Deñişiklik yapqan vaqıtta yardımcı dögmelerni köster. (JavaScript)',
 'tog-editondblclick'          => 'Saifeni çift basıp deñiştirmege başla (JavaScript)',
-'tog-editsection'             => 'Bölümlerni [deñiştir] bağlantılarnı ile deñiştirme aqqı ber',
-'tog-editsectiononrightclick' => 'Bölüm serlevasına oñ basıp bölümde deñişiklikke izin ber. (JavaScript)',
+'tog-editsection'             => 'Bölüklerni [deñiştir] bağlantılarnı ile deñiştirme aqqı ber',
+'tog-editsectiononrightclick' => 'Bölük serlevasına oñ basıp bölükte deñişiklikke ruhset ber. (JavaScript)',
 'tog-showtoc'                 => 'Münderice cedveli köster (3 daneden ziyade serlevası olğan saifeler içün)',
 'tog-rememberpassword'        => 'Parolni hatırla',
 'tog-editwidth'               => 'Yazuv penceresi tam keniÅŸlikte olsun',
@@ -144,6 +135,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Közetüv cedvelimden menim deñişikliklerimni gizle',
 'tog-watchlisthidebots'       => 'Közetüv cedvelimden bot deñişikliklerini gizle',
 'tog-watchlisthideminor'      => 'Közetüv cedvelimden kiçik deñişikliklerni gizle',
+'tog-watchlisthideliu'        => 'Közetüv cedvelimde qaydlı qullanıcılar tarafından yapılğan deñişikliklerni kösterme',
+'tog-watchlisthideanons'      => 'Közetüv cedvelimde qaydsız (anonim) qullanıcılar tarafından yapılğan deñişikliklerni kösterme',
 'tog-nolangconversion'        => 'Yazuv sisteması variantları deñiştirüvni işletme',
 'tog-ccmeonemails'            => 'Diger qullanıcılarğa yollağan mektüplerimniñ kopiyalarını maña da yolla',
 'tog-diffonly'                => 'Teñeştirme saifelerinde saifeniñ esas mündericesini kösterme',
@@ -153,8 +146,6 @@ $messages = array(
 'underline-never'   => 'Asla',
 'underline-default' => 'Brauzer qarar bersin',
 
-'skinpreview' => '(Ög baquv)',
-
 # Dates
 'sunday'        => 'Bazar',
 'monday'        => 'Bazarertesi',
@@ -248,7 +239,7 @@ $messages = array(
 'mytalk'         => 'Muzakere saifem',
 'anontalk'       => 'Bu IP-niñ muzakeresi',
 'navigation'     => 'Saytta yol tapuv',
-'and'            => 've',
+'and'            => '&#32;ve',
 
 # Metadata in edit box
 'metadata_help' => 'Meta malümatı:',
@@ -285,14 +276,14 @@ $messages = array(
 'talkpagelinktext'  => 'Muzakere',
 'specialpage'       => 'Mahsus Saife',
 'personaltools'     => 'Åžahsiy aletler',
-'postcomment'       => 'Tefsir yaz',
+'postcomment'       => 'Yañı bölük',
 'articlepage'       => 'Saifege bar',
 'talk'              => 'Muzakere',
 'views'             => 'Körünişler',
 'toolbox'           => 'Aletler',
 'userpage'          => 'Qullanıcı saifesini köster',
 'projectpage'       => 'Proyekt saifesini köster',
-'imagepage'         => 'Media fayl saifesini köster',
+'imagepage'         => 'Fayl saifesini köster',
 'mediawikipage'     => 'Beyanat saifesisni köster',
 'templatepage'      => 'Şablon saifesini köster',
 'viewhelppage'      => 'Yardım saifesini köster',
@@ -311,8 +302,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} aqqında',
 'aboutpage'            => 'Project:Aqqında',
-'bugreports'           => 'Hatalar aqqında esabatlar',
-'bugreportspage'       => 'Project:Hatalar aqqında esabatlar',
 'copyright'            => 'Malümat $1 binaen keçilip ola.',
 'copyrightpagename'    => '{{SITENAME}} müelliflik aqları',
 'copyrightpage'        => '{{ns:project}}:Müelliflik aqları',
@@ -335,9 +324,7 @@ $messages = array(
 
 'badaccess'        => 'İzin hatası',
 'badaccess-group0' => 'Yapacaq olğan areketiñizni yapmağa aqqıñız yoq.',
-'badaccess-group1' => 'Yapacaq olğan areketiñizni tek $1 gruppasınıñ qullanıcıları yapıp olаlar.',
-'badaccess-group2' => 'Yapacaq olğan areketiñizni tek $1 gruppalarınıñ qullanıcıları yapıp olalar.',
-'badaccess-groups' => 'Yapacaq olğan areketiñizni tek $1 gruppalarınıñ qullanıcıları yapıp olalar.',
+'badaccess-groups' => 'Yapacaq olğan areketiñizni tek aşağıdaki $2 gruppağa aza оlğan qullanıcıları yapıp olalar: $1.',
 
 'versionrequired'     => 'MediaWikiniñ $1 versiyası kerek',
 'versionrequiredtext' => 'Bu saifeni qullanmaq içün MediaWikiniñ $1 versiyası kerek. [[Special:Version|Versiya]] saifesine baq.',
@@ -351,7 +338,9 @@ $messages = array(
 'editsection'             => 'deñiştir',
 'editold'                 => 'deñiştir',
 'viewsourceold'           => 'menbanı kör',
-'editsectionhint'         => 'Deñiştirilgen bölüm: $1',
+'editlink'                => 'deñiştir',
+'viewsourcelink'          => 'menba kоdunı köster',
+'editsectionhint'         => 'Deñiştirilgen bölük: $1',
 'toc'                     => 'Münderice',
 'showtoc'                 => 'köster',
 'hidetoc'                 => 'gizle',
@@ -365,7 +354,7 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom lentası',
 'page-rss-feed'           => '"$1" - RSS lentası',
 'page-atom-feed'          => '"$1" - Atom lentası',
-'red-link-title'          => '$1 (daa yazılmağan)',
+'red-link-title'          => '$1 (böyle saife yоq)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Saife',
@@ -420,19 +409,18 @@ Lütfen, URL yazıp bundan [[Special:ListUsers/sysop|administratorğa]] haber be
 'readonly_lag'         => 'Malümat bazasınıñ ekilemci serveri birlemci serverinen sinhronizirlengence malümat bazası deñiştirilmemesi içün avtomatik olaraq blok etildi.',
 'internalerror'        => 'İçki hata',
 'internalerror_info'   => 'İçki hata: $1',
-'filecopyerror'        => '"$1" faylı "$2" faylına kopirlenip olamay.',
+'filecopyerror'        => '"$1" faylı "$2" faylına kopiyalanıp olamay.',
 'filerenameerror'      => 'faylnıñ "$1" degen adı "$2" olaraq deñiştirilip olamay.',
 'filedeleteerror'      => '"$1" faylı yoq etilip olamay.',
 'directorycreateerror' => '"$1" direktoriyası yaratılıp olamay.',
 'filenotfound'         => '"$1" faylı tapılıp olamay.',
-'fileexistserror'      => '"$1" faylı saqlanıp olamay. Öyle fayl endi mevcüt.',
+'fileexistserror'      => '"$1" faylı saqlanıp olamay. Öyle fayl endi mevcut.',
 'unexpected'           => 'beklenmegen deger: "$1"="$2".',
 'formerror'            => 'Hata: formanıñ malümatını yollamaqnıñ iç çaresi yoq',
 'badarticleerror'      => 'Siz yapmağa istegen işlev bu saifede yapılıp оlamay.',
 'cannotdelete'         => 'Belgilengen saife ya da körüniş yoq etilip olamadı. (başqa bir qullanıcı tarafından yoq etilgen ola bilir).',
 'badtitle'             => 'Ruhsetsiz serleva',
 'badtitletext'         => 'İstenilgen saife adı doğru degil, boş yahut interviki ya da tillerara adı doğru belgilenmegen. İhtimalı bar ki, saife adında yasaqlanğan işaretler qullanıladır.',
-'perfdisabled'         => 'Afu etiñiz! Bu hususiyet, malümat bazasını qullanılamaycaq derecede yavaşlatqanı içün, muvaqqat qullanımdan çıqarıldı.',
 'perfcached'           => 'Malümatlar daa evelceden azırlanğan ola bilir. Bu sebepten eskirgen ola bilir!',
 'perfcachedts'         => 'Aşağıda keşte saqlanğan malümat buluna, soñki yañaruv zamanı: $1.',
 'querypage-no-updates' => 'Bu saifeni deñiştirmege şimdi izin yoq. Bu malümat aman yañartılmaycaq.',
@@ -444,9 +432,9 @@ Funktsiya: $1<br />
 'actionthrottled'      => 'Areket toqtaldı',
 'actionthrottledtext'  => 'Spamğa qarşı küreş sebebinden bu areketni az vaqıt içinde çoq kere tekrarlap olamaysıñız. Mümkün olğan qarardan ziyade areket yaptıñız. Bir qaç daqqadan soñ tekrarlap baqıñız.',
 'protectedpagetext'    => 'Bu saifeni kimse deñiştirmesin dep o blok etildi.',
-'viewsourcetext'       => 'Saifeniñ kodunı közden keçirip kopirley bilesiñiz:',
+'viewsourcetext'       => 'Saifeniñ kodunı közden keçirip kopiyalay bilesiñiz:',
 'protectedinterface'   => 'Bu saifede sistema interfeysiniñ metini bulunğanı içün mında hata çıqmasın dep deñişiklik yapmaq yasaq.',
-'editinginterface'     => "'''Tenbi''': MediaWiki sistema beyanatılı bir saifeni deñiştirmektesiñiz. Bu saifedeki deñişiklikler qullanıcı interfeys körünişini diger qullanıcılar içün de deñiştirecek. Lütfen, tercimeler içün [http://translatewiki.net/wiki/Main_Page?setlang=crh Betawiki] saytını (MediaWiki resmiy lokalizatsiya proyekti) qullanıñız.",
+'editinginterface'     => "'''Tenbi''': MediaWiki sistema beyanatılı bir saifeni deñiştirmektesiñiz. Bu saifedeki deñişiklikler qullanıcı interfeys körünişini diger qullanıcılar içün de deñiştirecek. Lütfen, tercimeler içün [http://translatewiki.net/wiki/Main_Page?setlang=crh translatewiki.net] saytını (MediaWiki resmiy lokalizatsiya proyekti) qullanıñız.",
 'sqlhidden'            => '(SQL istintağı saqlı)',
 'cascadeprotected'     => 'Bu saifeni deñiştirip olamazsıñız, çünki kaskad qorçalav altında bulunğan {{PLURAL:$1|saifege|saifelerge}} mensüptir:
 $2',
@@ -458,9 +446,9 @@ Sebep: ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Oturımnı qapat',
-'logouttext'                 => '<strong>Oturımnı qapattıñız.</strong>
+'logouttext'                 => "'''Oturımnı qapattıñız.'''
 
-Şimdi {{SITENAME}} saytını anonim olaraq qullanıp olasıñız, ya da yañıdan [[Special:UserLogin|oturım açıp]] olasıñız (ister aynı qullanıcı adınen, ister başqa bir qullanıcı adınen). Web brauzeriñiz keşini temizlegence bazı saifeler sanki alâ daa oturımıñız açıq eken kibi körünip olur.',
+Şimdi {{SITENAME}} saytını anonim olaraq qullanıp olasıñız, ya da yañıdan [[Special:UserLogin|oturım açıp]] olasıñız (ister aynı qullanıcı adınen, ister başqa bir qullanıcı adınen). Web brauzeriñiz keşini temizlegence bazı saifeler sanki alâ daa oturımıñız açıq eken kibi körünip olur.",
 'welcomecreation'            => '== Hoş keldiñiz, $1! ==
 Esabıñız açıldı.
 Bu saytnıñ [[Special:Preferences|sazlamalarını]] şahsıñızğa köre deñiştirmege unutmañız.',
@@ -471,7 +459,6 @@ Bu saytnıñ [[Special:Preferences|sazlamalarını]] şahsıñızğa köre deñi
 'remembermypassword'         => 'Bu kompyuterde meni hatırla',
 'yourdomainname'             => 'Domen adıñız',
 'externaldberror'            => 'Oturımıñız açılğanda bir hata oldı. Bu tış esabıñızğa deñişiklik yapmağa aqqıñız olmayuvından meydanğa kelip ola.',
-'loginproblem'               => '<b>Oturımıñız açılğanda problema çıqtı.</b><br />Bir daa etiñiz!',
 'login'                      => 'Oturım aç',
 'nav-login-createaccount'    => 'Oturım aç / Qayd ol',
 'loginprompt'                => 'Oturım açmaq içün "cookies"ge izin bermelisiñiz.',
@@ -496,7 +483,7 @@ Bu saytnıñ [[Special:Preferences|sazlamalarını]] şahsıñızğa köre deñi
 'yourvariant'                => 'Til saylavı:',
 'yournick'                   => 'Siziñ lağabıñız (imzalarda kösterilecek):',
 'badsig'                     => 'Yañlış imza. HTML tegleriniñ doğrulığını baqıñız.',
-'badsiglength'               => 'Qarardan ziyade uzun imzadır, $1-den ziyade işaretten ibaret olması mümkün degil.',
+'badsiglength'               => 'Qarardan ziyade uzun imzadır, $1 ziyade işaretten ibaret olması mümkün degil.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Adıñız (mecburiy degildir): Eger belgileseñiz, saifelerdeki deñişikliklerini kimniñ yapqanını köstermek içün qullanılacaq.',
 'loginerror'                 => 'Oturım açma hatası',
@@ -527,10 +514,10 @@ Eger de yañı parol talap etmegen olsañız ya da eski paroliñizni bilseñiz b
 'eauthentsent'               => 'Belgilengen e-mail adresine adresni deñiştirüv tasdıqını soraycaq bir mektüp yollandı. Em de mektüpte bu e-mail adresine kerçekten siz saipsiñiz dep tasdıqlamaq içün yapılması kerek areketler tasvir etilgen.',
 'throttled-mailpassword'     => 'Parol hatırlatuv funktsiyası endi soñki $1 saat devamında işletilgen edi. $1 saat içinde tek bir hatırlatuv işletmek mümkün.',
 'mailerror'                  => 'Poçta yiberilgende bir hata meydanğa keldi: $1',
-'acct_creation_throttle_hit' => '$1 dane qullanıcı esapnı açtırğan aldasıñız. Daa ziyade açtıramazsıñız.',
-'emailauthenticated'         => 'E-mail adresiñiz $1-nen teñeştirildi.',
+'acct_creation_throttle_hit' => 'Siz endi $1 dane qullanıcı esabını açtıñız. Daa ziyade açtıramazsıñız.',
+'emailauthenticated'         => 'E-mail adresiñiz $2 $3 tarihında tasdıqlandı.',
 'emailnotauthenticated'      => 'E-mail adresiñiz tasdıqlanmadı, vikiniñ e-mail ile bağlı funktsiyaları çalışmaycaq.',
-'noemailprefs'               => 'E-mail adresiñizni belgilemegeniñiz içün, vikiniñ e-mail ile bağlı funktsiyaları çalışmaycaq.',
+'noemailprefs'               => 'Bu funktsiyalarnıñ çalışması içün bir e-mail adresi belgileñiz.',
 'emailconfirmlink'           => 'E-mail adresiñizni tasdıqlañız',
 'invalidemailaddress'        => 'Yazğan adresiñiz e-mail standartlarında olmağanı içün qabul etilmedi. Lütfen, doğru adresni yazıñız ya da qutunı boş qaldırıñız.',
 'accountcreated'             => 'Esap açıldı',
@@ -541,17 +528,20 @@ Eger de yañı parol talap etmegen olsañız ya da eski paroliñizni bilseñiz b
 Siz oturım açıp paroliñizni şimdi deñiştirmek kereksiñiz.
 
 İşbu esap hata olaraq yaratılğan olsa bu beyanatnı ignor etip olasıñız.',
+'login-throttled'            => 'Bu esap içün parolni pek çoq kere kirsetip baqtıñız. Lütfen, qayta kirsetmezden evel biraz bekleñiz.',
 'loginlanguagelabel'         => 'Til: $1',
 
 # Password reset dialog
-'resetpass'               => 'Bu esapnıñ parolini sıfırla',
+'resetpass'               => 'Parolni deñiştir',
 'resetpass_announce'      => 'Muvaqqat kod vastasınen kirdiñiz. Kirişni tamamlamaq içün yañı parolni mında qoyuñız:',
 'resetpass_header'        => 'Esapnıñ parolini deñiştir',
+'oldpassword'             => 'Eski parol',
+'newpassword'             => 'Yañı parol',
+'retypenew'               => 'Yañı parolni tekrar yazıñız',
 'resetpass_submit'        => 'Parol qoyıp kir',
 'resetpass_success'       => 'Paroliñiz muvafaqiyetnen deñiştirildi! Oturımıñız açılmaqta...',
 'resetpass_bad_temporary' => 'Muvaqqat paroliñiz yañlıştır. Ola bilir ki, siz endi paroliñizni muvafaqiyetnen deñiştirgen ya da e-mail-ge yañı bir parol yollamağa rica etkendirsiñiz.',
 'resetpass_forbidden'     => 'Parol deñiştirmek yasaq',
-'resetpass_missing'       => 'Forma boştır.',
 
 # Edit page toolbar
 'bold_sample'     => 'Qalın yazılış',
@@ -576,8 +566,8 @@ Siz oturım açıp paroliñizni şimdi deñiştirmek kereksiñiz.
 'hr_tip'          => 'Gorizontal sızıq (pek sıq qullanmañız)',
 
 # Edit pages
-'summary'                          => 'Deñişiklik qısqa tarifi',
-'subject'                          => 'Mevzu/serleva',
+'summary'                          => 'Deñişiklik qısqa tasviri:',
+'subject'                          => 'Mevzu/serleva:',
 'minoredit'                        => 'Kiçik deñişiklik',
 'watchthis'                        => 'Saifeni közet',
 'savearticle'                      => 'Saifeni saqla',
@@ -589,8 +579,8 @@ Siz oturım açıp paroliñizni şimdi deñiştirmek kereksiñiz.
 'missingsummary'                   => "'''Hatırlatma.''' Deñiştirmeleriñizni qısqadan tarif etmediñiz. \"Saifeni saqla\" dögmesine tekrar basuv ile deñiştirmeleriñiz tefsirsiz saqlanacaqlar.",
 'missingcommenttext'               => 'Lütfen, aşağıda tefsir yazıñız.',
 'missingcommentheader'             => "'''Hatırlatuv:''' Tefsir serlevasını belgilemediñiz. \"Saifeni saqla\" dögmesine tekrar basqan soñ tefsiriñiz serlevasız saqlanır.",
-'summary-preview'                  => 'Baqıp çıquv tarifi',
-'subject-preview'                  => 'Baqıp çıquv serlevası',
+'summary-preview'                  => 'Baqıp çıquv tasviri:',
+'subject-preview'                  => 'Baqıp çıquv serlevası:',
 'blockedtitle'                     => 'Qullanıcı blok etildi.',
 'blockedtext'                      => '<big>\'\'\'Esabıñız ya da IP adresiñiz blok etildi.\'\'\'</big>
 
@@ -622,8 +612,8 @@ IP adresiñiz — $3, blok etüv identifikatorı — #$5. Lütfen, administrator
 'whitelistedittext'                => 'Saifeni deñiştirmek içün $1 kereksiñiz.',
 'confirmedittitle'                 => 'E-mail adresini tasdıqlamaq lâzimdir',
 'confirmedittext'                  => 'Saifeni deñiştirmeden evel e-mail adresiñizni tasdıqlamalısıñız. Lütfen, [[Special:Preferences|sazlamalar saifesinde]] e-mail adresiñizni kirsetiñiz ve tasdıqlañız.',
-'nosuchsectiontitle'               => 'Öyle bölüm yoq',
-'nosuchsectiontext'                => 'Mevcüt olmağan bölümni deñiştirip baqtıñız. $1 bölümi yoq olğanı içün metniñiz saqlanacaq yeri yoq.',
+'nosuchsectiontitle'               => 'Öyle bölük yoq',
+'nosuchsectiontext'                => 'Bar olmağan bölükni deñiştirip baqtıñız. $1 bölügi yoq olğanı içün metniñiz saqlanacaq yeri yoq.',
 'loginreqtitle'                    => 'Oturım açmalısıñız',
 'loginreqlink'                     => 'oturım aç',
 'loginreqpagetext'                 => 'Başqa saifelerni baqmaq içün $1 borclusıñız.',
@@ -641,24 +631,24 @@ Eger siz anonim qullanıcı olsañız ve sizge kelgen beyanatlarnı yañlıştan
 '''Konqueror:''' saifeni yañıdan yükle dögmesine ya da F5 basıp;
 '''Opera:''' ''Tools → Preferences'' menüsinde keşni temizlep;
 '''Internet Explorer:''' ''Ctrl'' basılı ekende saifeni yañıdan yüklep ya da ''Ctrl-F5'' basıp.",
-'usercssjsyoucanpreview'           => "<strong>Tevsiye:</strong> Saifeni saqlamazdan evel '''baqıp çıq''' dögmesine basıp yapqan yañı saifeñizni közden keçiriñiz.",
+'usercssjsyoucanpreview'           => "'''Tevsiye:''' Saifeni saqlamazdan evel '''baqıp çıq''' dögmesine basıp yapqan yañı saifeñizni közden keçiriñiz.",
 'usercsspreview'                   => "'''Unutmañız, bu tek baqıp çıquv - qullanıcı CSS faylıñız alâ daa saqlanmadı!'''",
 'userjspreview'                    => "'''Unutmañız, siz şimdi tek test etesiñiz ya da baqıp çıquv köresiñiz - qullanıcı JavaScript'i şimdilik saqlanmadı.'''",
 'userinvalidcssjstitle'            => "'''İhtar:''' \"\$1\" adınen bir tema yoqtır. tema-adı.css ve .js fayllarınıñ adları kiçik afir ile yazmaq kerek, yani {{ns:user}}:Temel/'''M'''onobook.css degil, {{ns:user}}:Temel/'''m'''onobook.css.",
 'updated'                          => '(Yañardı)',
-'note'                             => '<strong>Ä°htar:</strong>',
-'previewnote'                      => '<strong>Bu tek baqıp çıquv, metin alâ daa saqlanmağan!</strong>',
+'note'                             => "'''Ä°htar:'''",
+'previewnote'                      => "'''Bu tek baqıp çıquv, metin alâ daa saqlanmağan!'''",
 'previewconflict'                  => 'Bu baqıp çıquv yuqarı tarir penceresindeki metinniñ saqlanuvdan soñ olacaq körünişini aks ete.',
-'session_fail_preview'             => '<strong> Server siz yapqan deñiştirmelerni sessiya identifikatorı
+'session_fail_preview'             => "''' Server siz yapqan deñiştirmelerni sessiya identifikatorı
 coyulğanı sebebinden saqlap olamadı. Bu vaqtınca problemadır. Lütfen, tekrar saqlap baqıñız.
 Bundan da soñ olıp çıqmasa, malümat lokal faylğa saqlañız da brauzeriñizni bir qapatıp
-açıñız.</strong>',
-'session_fail_preview_html'        => '<strong>Afu etiñiz! HTML sessiyanıñ malümatları ğayıp olğanı sebebinden siziñ deñiştirmeleriñizni qabul etmege imkân yoqtır.</strong>',
-'token_suffix_mismatch'            => '<strong>Siziñ programmañız tarir penceresinde punktuatsiya işaretlerini doğru işlemegeni içün yapqan deñişikligiñiz qabul olunmadı. Deñişiklik saifeniñ metni körünişiniñ bozulmaması içün lâğu etildi.
-Bunıñ kibi problemalar anonimizirlegen hatalı web-proksiler qullanuvdan çıqıp olalar.</strong>',
+açıñız.'''",
+'session_fail_preview_html'        => "'''Afu etiñiz! HTML sessiyanıñ malümatları ğayıp olğanı sebebinden siziñ deñiştirmeleriñizni qabul etmege imkân yoqtır.'''",
+'token_suffix_mismatch'            => "'''Siziñ programmañız tarir penceresinde punktuatsiya işaretlerini doğru işlemegeni içün yapqan deñişikligiñiz qabul olunmadı. Deñişiklik saifeniñ metni körünişiniñ bozulmaması içün lâğu etildi.
+Bunıñ kibi problemalar anonimizirlegen hatalı web-proksiler qullanuvdan çıqıp olalar.'''",
 'editing'                          => '"$1" saifesini deñiştirmektesiñiz',
-'editingsection'                   => '"$1" saifesinde bölüm deñiştirmektesiñiz',
-'editingcomment'                   => '$1 saifesine beyanat qоşmaqtasıñız.',
+'editingsection'                   => '"$1" saifesinde bölük deñiştirmektesiñiz',
+'editingcomment'                   => '$1 saifesini deñiştirmektesiñiz (yañı bölük)',
 'editconflict'                     => 'Deñişiklik zıt ketüvi: $1',
 'explainconflict'                  => "Siz saifeni deñiştirgen vaqıtta başqa biri de deñişiklik yaptı.
 Yuqarıdaki yazı saifeniñ şimdiki alını köstere.
@@ -666,33 +656,35 @@ Siziñ deñişiklikleriñiz altqa kösterildi. Şimdi yapqan deñişiklikleriñi
 \"Saifeni saqla\"ğa basqanda '''tek''' yuqarıdaki yazı saqlanacaq.",
 'yourtext'                         => 'Siziñ metniñiz',
 'storedversion'                    => 'SaqlanÄŸan metin',
-'nonunicodebrowser'                => '<strong>TENBİ: Brauzeriñizde Unicode kodlaması tanılmaz. Saifeler deñiştirgende bütün ASCII olmağan işaretlerniñ yerine olarnıñ onaltılıq kodu yazılır.</strong>',
-'editingold'                       => '<strong>DİQQAT: Saifeniñ eski bir versiyasında deñişiklik yapmaqtasıñız.
-Saqlağanıñızda bu tarihlı versiyadan künümizge qadar olğan deñişiklikler yoq olacaq.</strong>',
+'nonunicodebrowser'                => "'''TENBİ: Brauzeriñizde Unicode kodlaması tanılmaz. Saifeler deñiştirgende bütün ASCII olmağan işaretlerniñ yerine olarnıñ onaltılıq kodu yazılır.'''",
+'editingold'                       => "'''DİQQAT: Saifeniñ eski bir versiyasında deñişiklik yapmaqtasıñız.
+Saqlağanıñızda bu tarihlı versiyadan künümizge qadar olğan deñişiklikler yoq olacaq.'''",
 'yourdiff'                         => 'Farqlar',
-'copyrightwarning'                 => '<strong>Lütfen, diqqat:</strong> {{SITENAME}} saytına qoşulğan bütün isseler <i>$2</i> muqavelesi dairesindedir (tafsilât içün $1 saifesine baqıñız).
+'copyrightwarning'                 => "'''Lütfen, diqqat:''' {{SITENAME}} saytına qoşulğan bütün isseler <i>$2</i> muqavelesi dairesindedir (tafsilât içün $1 saifesine baqıñız).
 Qoşqan isseñizniñ başqa insanlar tarafından acımasızca deñiştirilmesini ya da azat tarzda ve sıñırsızca başqa yerlerge dağıtılmasını istemeseñiz, isse qoşmañız.<br />
-Ayrıca, mında isse qoşıp, bu isseniñ özüñiz tarafından yazılğanına, ya da cemaatqa açıq bir menbadan ya da başqa bir azat menbadan kopirlengenine garantiya bergen olasıñız.<br />
-<strong><center>MÜELLİFLİK AQQINEN QORÇALANĞAN İÇ BİR METİNNİ MINDA RUHSETSİZ QOŞMAÑIZ!</center></strong>',
-'copyrightwarning2'                => '<strong>Lütfen, diqqat:</strong> {{SITENAME}} saytına siz qoşqan bütün isseler başqa bir qullanıcı tarafından deñiştirilip ya da yoq etilip olur. Qoşqan isseñizniñ başqa insanlar tarafından acımasızca deñiştirilmesini ya da azat tarzda ve sıñırsızca başqa yerlerge dağıtılmasını istemeseñiz, isse qoşmañız.<br />
-Ayrıca, mında isse qoşıp, bu isseniñ özüñiz tarafından yazılğanına, ya da cemaatqa açıq bir menbadan ya da başqa bir azat menbadan kopirlengenine garantiya bergen olasıñız ($1 baqıñız).<br />
-<strong>MÜELLİFLİK AQQINEN QORÇALANĞAN İÇ BİR METİNNİ MINDA RUHSETSİZ QOŞMAÑIZ!</strong>',
-'longpagewarning'                  => '<strong>TENBİ: Bu saife $1 kilobayt büyükligindedir; bazı brauzerler deñişiklik yapqan vaqıtta 32 kb ve üstü büyükliklerde problemalar yaşap olur. Saifeni bölümlerge ayırmağa tırışıñız.</strong>',
-'longpageerror'                    => '<strong>TENBİ: Bu saife $1 kilobayt büyükligindedir. Azamiy (maksimal) izinli büyüklik ise $2 kilobayt. Bu saife saqlanıp olamaz.</strong>',
-'readonlywarning'                  => '<strong>DİQQAT: Baqım sebebi ile malümat bazası al-azırda kilitlidir. Bu sebepten deñişiklikleriñiz şimdi saqlanamamaqta. Yazğanlarıñıznı başqa bir editor programmasına alıp saqlap olur ve daa soñ tekrar mında ketirip saqlap olursıñız</strong>',
-'protectedpagewarning'             => '<strong>TENBİ: Bu saife qorçalav altına alınğan ve yalıñız administratorlar tarafından deñiştirilip olur.</strong>',
+Ayrıca, mında isse qoşıp, bu isseniñ özüñiz tarafından yazılğanına, ya da cemaatqa açıq bir menbadan ya da başqa bir azat menbadan kopiyalanğanına garantiya bergen olasıñız.<br />
+'''<center>MÜELLİFLİK AQQINEN QORÇALANĞAN İÇ BİR METİNNİ MINDA RUHSETSİZ QOŞMAÑIZ!</center>'''",
+'copyrightwarning2'                => "'''Lütfen, diqqat:''' {{SITENAME}} saytına siz qoşqan bütün isseler başqa bir qullanıcı tarafından deñiştirilip ya da yoq etilip olur. Qoşqan isseñizniñ başqa insanlar tarafından acımasızca deñiştirilmesini ya da azat tarzda ve sıñırsızca başqa yerlerge dağıtılmasını istemeseñiz, isse qoşmañız.<br />
+Ayrıca, mında isse qoşıp, bu isseniñ özüñiz tarafından yazılğanına, ya da cemaatqa açıq bir menbadan ya da başqa bir azat menbadan kopiyalanğanına garantiya bergen olasıñız ($1 baqıñız).<br />
+'''MÜELLİFLİK AQQINEN QORÇALANĞAN İÇ BİR METİNNİ MINDA RUHSETSİZ QOŞMAÑIZ!'''",
+'longpagewarning'                  => "'''TENBİ: Bu saife $1 kilobayt büyükligindedir; bazı brauzerler deñişiklik yapqan vaqıtta 32 kb ve üstü büyükliklerde problemalar yaşap olur. Saifeni parçalarğa ayırmağa tırışıñız.'''",
+'longpageerror'                    => "'''TENBİ: Bu saife $1 kilobayt büyükligindedir. Azamiy (maksimal) izinli büyüklik ise $2 kilobayt. Bu saife saqlanıp olamaz.'''",
+'readonlywarning'                  => "'''TENBİ: Baqım sebebi ile malümat bazası al-azırda kilitlidir. Bu sebepten deñişiklikleriñiz şimdi saqlap olamasıñız. Yazğanlarıñıznı başqa bir editor programmasına alıp saqlap olur ve daa soñ tekrar mında ketirip saqlap olursıñız'''
+
+Malümat bazasını kilitlegen administratоr öz areketini böyle añlattı: $1",
+'protectedpagewarning'             => "'''TENBİ: Bu saife qorçalav altına alınğan ve yalıñız administratorlar tarafından deñiştirilip olur.'''",
 'semiprotectedpagewarning'         => "'''Tenbi''': Bu saife tek qaydlı qullanıcılar tarafından deñiştirilip olur.",
 'cascadeprotectedwarning'          => "'''Tenbi:''' Bu saifeni tek \"Administratorlar\" gruppasına kirgen qullanıcılar deñiştirip olalar, çünki o kaskad qorçalav altında bulunğan {{PLURAL:\$1|saifege|saifelerge}} mensüptir:",
-'titleprotectedwarning'            => '<strong>TENBİ: Bu saife qorçalav altındadır, tek yetkili qullanıcılar onı yaratıp olalar.</strong>',
+'titleprotectedwarning'            => "'''TENBİ: Bu saife qorçalav altındadır, tek yetkili qullanıcılar onı yaratıp olalar.'''",
 'templatesused'                    => 'Bu saifede qullanılğan şablonlar:',
 'templatesusedpreview'             => 'Siz baqıp çıqqan saifeñizde qullanılğan şablonlar:',
-'templatesusedsection'             => 'Bu bölümde qullanılğan şablonlar:',
+'templatesusedsection'             => 'Bu bölükte qullanılğan şablonlar:',
 'template-protected'               => '(qorçalav altında)',
 'template-semiprotected'           => '(qısmen qorçalav altında)',
 'hiddencategories'                 => 'Bu saife $1 gizli kategoriyağa mensüptir:',
 'nocreatetitle'                    => 'Saife yaratuv sıñırlıdır',
 'nocreatetext'                     => '{{SITENAME}} saytında yañı saife yaratuv sıñırlıdır.
-Keri qaytıp mevcüt olğan saifeni deñiştire, [[Special:UserLogin|oturım aça ya da yañı bir esap yaratıp olasıñız]].',
+Keri qaytıp mevcut olğan saifeni deñiştire, [[Special:UserLogin|oturım aça ya da yañı bir esap yaratıp olasıñız]].',
 'nocreate-loggedin'                => 'Yañı saifeler yaratmağa iziniñiz yoqtır.',
 'permissionserrors'                => 'İrişim aqlarınıñ hataları',
 'permissionserrorstext'            => 'Bunı yapmağa iziniñiz yoqtır. {{PLURAL:$1|Sebep|Sebepler}}:',
@@ -700,6 +692,14 @@ Keri qaytıp mevcüt olğan saifeni deñiştire, [[Special:UserLogin|oturım aç
 'recreate-deleted-warn'            => "'''Diqqat: evelce yoq etilgen saifeni yañıdan yaratmağa tırışasıñız.'''
 
 Bu saifeni kerçekten de yañıdan yaratmağa isteysiñizmi? Aşağıda yoq etilüv jurnalı buluna.",
+'deleted-notice'                   => 'Bu saife yoq etildi.
+Yoq etüv jurnalından qaydları aşağıda kösterile.',
+'edit-gone-missing'                => 'Saifeniñ yañaruvı mümkün degil.
+Ola bile ki, o yoq etilgendir.',
+'edit-conflict'                    => 'Deñişiklikler konflikti.',
+'edit-no-change'                   => 'Yapqan deñişikligiñiz saqlanmağan, çünki metinde bir türlü deñişiklik yapılmadı.',
+'edit-already-exists'              => 'Yañı saifeni yaratmaq mümkün degil.
+O endi mevcut.',
 
 # "Undo" feature
 'undo-success' => 'Deñişiklik lâğu etile bile. Lütfen, aynı bu deñişiklikler meni meraqlandıra dep emin olmaq içün versiyalar teñeştirilüvini közden keçirip deñişikliklerni tamamen yapmaq içün "Saifeni saqla" dögmesine basıñız.',
@@ -713,34 +713,34 @@ Bu saifeni kerçekten de yañıdan yaratmağa isteysiñizmi? Aşağıda yoq etil
 $3 mına böyle bir sebep belgiledi: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Bu saifeniñ jurnallarını köster',
-'nohistory'           => 'Bu saifeniñ keçmiş versiyası yoq.',
-'revnotfound'         => 'Versiya tapılmadı',
-'revnotfoundtext'     => 'Saifeniñ eski versiyası tapılmadı. Lütfen, bu saifege kirmek içün qullanğan bağlantıñıznıñ doğrulığını teşkeriñiz.',
-'currentrev'          => 'Al-azırki versiya',
-'revisionasof'        => 'Saifeniñ $1 tarihındaki alı',
-'revision-info'       => 'Saifeniñ $2 tarafından oluştırılğan $1 tarihındaki alı',
-'previousrevision'    => '� Evelki alı',
-'nextrevision'        => 'Soñraki alı →',
-'currentrevisionlink' => 'eñ yañı alını köster',
-'cur'                 => 'farq',
-'next'                => 'soñraki',
-'last'                => 'soñki',
-'page_first'          => 'ilk',
-'page_last'           => 'soñki',
-'histlegend'          => "(farq) = al-azırki versiya ile aradaki farq,
+'viewpagelogs'           => 'Bu saifeniñ jurnallarını köster',
+'nohistory'              => 'Bu saifeniñ keçmiş versiyası yoq.',
+'currentrev'             => 'Al-azırki versiya',
+'currentrev-asof'        => '$1 tarihında sоñki оlaraq deñiştirilgen saifeniñ şimdiki alı',
+'revisionasof'           => 'Saifeniñ $1 tarihındaki alı',
+'revision-info'          => 'Saifeniñ $2 tarafından oluştırılğan $1 tarihındaki alı', # Additionally available: $3: revision id
+'previousrevision'       => '� Evelki alı',
+'nextrevision'           => 'Soñraki alı →',
+'currentrevisionlink'    => 'eñ yañı alını köster',
+'cur'                    => 'farq',
+'next'                   => 'soñraki',
+'last'                   => 'soñki',
+'page_first'             => 'ilk',
+'page_last'              => 'soñki',
+'histlegend'             => "(farq) = al-azırki versiya ile aradaki farq,
 (soñki) = evelki versiya ile aradaki farq, '''k''' = kiçik deñişiklik",
-'deletedrev'          => '[yoq etildi]',
-'histfirst'           => 'Eñ eski',
-'histlast'            => 'Eñ yañı',
-'historysize'         => '({{PLURAL:$1|1 bayt|$1 bayt}})',
-'historyempty'        => '(boÅŸ)',
+'history-fieldset-title' => 'Keçmişke baq',
+'deletedrev'             => '[yoq etildi]',
+'histfirst'              => 'Eñ eski',
+'histlast'               => 'Eñ yañı',
+'historysize'            => '({{PLURAL:$1|1 bayt|$1 bayt}})',
+'historyempty'           => '(boÅŸ)',
 
 # Revision feed
 'history-feed-title'          => 'Deñişiklikler tarihı',
 'history-feed-description'    => 'Vikide bu saifeniñ deñişiklikler tarihı',
 'history-feed-item-nocomment' => '$2 üstünde $1', # user at time
-'history-feed-empty'          => 'İstenilgen saife mevcüt degil.
+'history-feed-empty'          => 'Ä°stenilgen saife mevcut degil.
 O yoq eilgen ya da adı deñiştirilgen ola bile.
 Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 
@@ -765,10 +765,11 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 
 # Search results
 'searchresults'             => 'Qıdıruv neticeleri',
+'searchresults-title'       => '"$1" içün qıdıruv neticeleri',
 'searchresulttext'          => '{{SITENAME}} içinde qıdıruv yapmaq hususında malümat almaq içün [[{{MediaWiki:Helppage}}|{{int:help}}]] saifesine baqıp olasıñız.',
-'searchsubtitle'            => 'Qıdırılğan: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" ile başlanğan bütün saifeler]] | [[Special:WhatLinksHere/$1|"$1" saifesine bağlantı olğan bütün saifeler]])',
+'searchsubtitle'            => 'Qıdırılğan: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" ile başlanğan bütün saifeler]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" saifesine bağlantı olğan bütün saifeler]])',
 'searchsubtitleinvalid'     => "Siz bunı qıdırdıñız '''$1'''",
-'noexactmatch'              => "'''\"\$1\" serlevalı bir saife tapılamadı.''' Bu saifeniñ yazılmasını siz [[:\$1|başlatıp olasıñız]].",
+'noexactmatch'              => "'''\"\$1\" serlevalı bir saife tapılamadı.''' Bu saifeni özüñiz [[:\$1|yaratıp olasıñız]].",
 'noexactmatch-nocreate'     => "'''\"\$1\" adlı saife yoq.'''",
 'titlematches'              => 'Saife adı bir kele',
 'notitlematches'            => 'İç bir serlevada tapılamadı',
@@ -777,10 +778,11 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'prevn'                     => 'evelki $1',
 'nextn'                     => 'soñraki $1',
 'viewprevnext'              => '($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Münderice',
 'search-result-size'        => '$1 ($2 söz)',
 'search-result-score'       => 'Uyğunlıq: $1%',
 'search-redirect'           => '(yollama $1)',
-'search-section'            => '(bölüm $1)',
+'search-section'            => '(bölük $1)',
 'search-suggest'            => 'Bunımı demege istediñiz: $1',
 'search-interwiki-caption'  => 'Qardaş prоyektler',
 'search-interwiki-default'  => '$1 netice:',
@@ -792,6 +794,7 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'searchall'                 => 'episi',
 'showingresults'            => "Aşağıda №&nbsp;<strong>$2</strong>den başlap {{PLURAL:$1|'''1''' netice|'''$1''' netice}} buluna.",
 'showingresultsnum'         => "Aşağıda №&nbsp;'''$2'''den başlap {{PLURAL:$3|'''1''' netice|'''$3''' netice}} buluna.",
+'showingresultstotal'       => "Aşağıda {{PLURAL:$4|'''$3''' daneden '''$1''' netice kösterilgen|'''$3''' daneden '''$1 — $2''' netice kösterilgen}}",
 'nonefound'                 => "'''İhtar.''' Adiycesine qıdıruv bütün isim fezalarında yapılmay. Bütün isim fezalarında (bu cümleden qullanıcılar subetleri, şablonlar ve ilâhre) qıdırmaq içün ''all:'' yazını qullanıñız ya da kerekli isim fezasını belgileñiz.",
 'powersearch'               => 'Qıdır',
 'search-external'           => 'Tış qıdıruv',
@@ -807,6 +810,7 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'qbsettings'            => 'Vızlı irişim sutun sazlamaları',
 'changepassword'        => 'Parol deñiştir',
 'skin'                  => 'Resimleme',
+'skin-preview'          => 'Baqıp çıquv',
 'math'                  => 'Riyaziy (matematik) iÅŸaretler',
 'dateformat'            => 'Tarih kösterimi',
 'datedefault'           => 'Standart',
@@ -823,9 +827,6 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'prefs-misc'            => 'Diger sazlamalar',
 'saveprefs'             => 'Deñişikliklerni saqla',
 'resetprefs'            => 'Saqlanmağan sazlamalarnı ilk alına ketir',
-'oldpassword'           => 'Eski parol',
-'newpassword'           => 'Yañı parol',
-'retypenew'             => 'Yañı parolni tekrar yazıñız',
 'textboxsize'           => 'Saife yazuv penceresi',
 'rows'                  => 'Satır',
 'columns'               => 'Sutun',
@@ -834,13 +835,13 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'contextlines'          => 'Tapılğan saife içün ayrılğan satır sayısı',
 'contextchars'          => 'Satırdaki arif sayısı',
 'recentchangesdays'     => 'Soñki deñişiklikler saifesinde kösterilecek kün sayısı:',
-'recentchangescount'    => 'Çeşit-türlü cedvel ve jurnallarda kösterilgen deñişiklikler sayısı:',
+'recentchangescount'    => 'Çeşit-türlü cedvel ve jurnallarda kösterilgen deñişiklikler ög belgilengen sayısı:',
 'savedprefs'            => 'Sazlamalarıñız saqlandı.',
 'timezonelegend'        => 'Saat quşağı',
 'timezonetext'          => 'Viki serveri (UTC/GMT) ile arañızdaki saat farqı. (Ukraina ve Türkiye içün +02:00)',
-'localtime'             => 'Siziñ yerli vaqtıñız',
-'timezoneoffset'        => 'Saat farqı',
-'servertime'            => 'Viki serverinde ÅŸimdiki saat',
+'localtime'             => 'Yerli vaqıt:',
+'timezoneoffset'        => 'Saat farqı¹:',
+'servertime'            => 'Serverniñ saatı:',
 'guesstimezone'         => 'Brauzeriñiz siziñ yeriñizge toldursın',
 'allowemail'            => 'Diger qullanıcılar maña e-mail mektüpleri yollap olsun',
 'prefs-searchoptions'   => 'Qıdıruv sazlamaları',
@@ -854,7 +855,7 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'userrights-lookup-user'   => 'Qullanıcı gruppalarnını idare et',
 'userrights-user-editname' => 'Öz qullanıcı adıñıznı yazıñız:',
 'editusergroup'            => 'Qullanıcı gruppaları nizamla',
-'editinguser'              => "'''[[User:$1|$1]]''' qullanıcısınıñ ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) izinlerini deñiştirmektesiñiz",
+'editinguser'              => "'''[[User:$1|$1]]''' qullanıcısınıñ ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) izinlerini deñiştirmektesiñiz",
 'userrights-editusergroup' => 'Qullanıcı gruppaları nizamla',
 'userrights-groupsmember'  => 'Azası оlğan gruppalarıñız:',
 
@@ -881,6 +882,7 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|deñişiklik|deñişiklik}}',
 'recentchanges'                     => 'Soñki deñişiklikler',
+'recentchanges-legend'              => 'Soñki deñişiklikler sazlamaları',
 'recentchangestext'                 => 'Yapılğan eñ soñki deñişikliklerni bu saifede körip olasıñız.',
 'recentchanges-feed-description'    => 'Bu lenta vastasınen vikide soñki deñişikliklerni közet.',
 'rcnote'                            => "$4 $5 tarihında soñki {{PLURAL:$2|künde|'''$2''' künde}} yapılğan '''{{PLURAL:$1|1|$1}}''' deñişiklik:",
@@ -903,13 +905,13 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|qullanıcı|qullanıcı}} közete]',
 'rc_categories'                     => 'Tek kategoriyalardan ("|" ile ayırıla)',
 'rc_categories_any'                 => 'Er angi',
-'newsectionsummary'                 => '/* $1 */ yañı bölüm',
+'newsectionsummary'                 => '/* $1 */ yañı bölük',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Bağlı deñişiklikler',
 'recentchangeslinked-title'    => '"$1" ile bağlı deñişiklikler',
 'recentchangeslinked-noresult' => 'Saylanğan vaqıtta bağlı saifelerde iç deñişiklik yoq edi.',
-'recentchangeslinked-summary'  => "Bu mahsus saifede bağlı saifelerde soñki yapqan deñişiklikler cedveli mevcüt. [[Special:Watchlist|Közetüv cedveliñiz]]deki saifeler '''qalın''' olaraq kösterile.",
+'recentchangeslinked-summary'  => "Bu mahsus saifede bağlı saifelerde soñki yapqan deñişiklikler cedveli mevcut. [[Special:Watchlist|Közetüv cedveliñiz]]deki saifeler '''qalın''' olaraq kösterile.",
 
 # Upload
 'upload'                      => 'Fayl yükle',
@@ -918,15 +920,15 @@ Vikide bu saifege oşağan saifelerni [[Special:Search|tapıp baqıñız]].',
 'reuploaddesc'                => 'Yükleme formasına keri qayt.',
 'uploadnologin'               => 'Oturım açmadıñız',
 'uploadnologintext'           => 'Fayl yüklep olmaq içün [[Special:UserLogin|oturım açmaq]] kereksiñiz.',
-'upload_directory_missing'    => 'Yüklemeler içün direktoriya ($1) mevcüt degil ve veb-server tarafından yapılıp olamay.',
+'upload_directory_missing'    => 'Yüklemeler içün direktoriya ($1) mevcut degil ve veb-server tarafından yapılıp olamay.',
 'upload_directory_read_only'  => 'Web serverniñ ($1) cüzdanına fayllar saqlamağa aqları yoqtır.',
 'uploaderror'                 => 'Yükleme hatası',
 'uploadtext'                  => "Fayllar yüklemek içün aşağıdaki formanı qullanıñız.
-Evelce yüklengen resim tapmaq ya da baqmaq içün [[Special:ImageList|yüklengen fayllar cedveline]] keçiñiz, bundan ğayrı fayl yüklenüv ve yoq etilüv qaydlarını [[Special:Log/upload|yüklenüv jurnalında]] ve [[Special:Log/delete|yoq etilüv jurnalında]] tapıp olasıñız.
+Evelce yüklengen resim tapmaq ya da baqmaq içün [[Special:FileList|yüklengen fayllar cedveline]] keçiñiz, bundan ğayrı fayl yüklenüv ve yoq etilüv qaydlarını [[Special:Log/upload|yüklenüv jurnalında]] ve [[Special:Log/delete|yoq etilüv jurnalında]] tapıp olasıñız.
 
 Saifede resim qullanmaq içün böyle şekilli bağlantılar qullanıñız: 
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' faylnıñ tam versiyasını qullanmaq içün,
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|tarif]]</nowiki></tt>''' bir tarif ile 200 piksel bir resim qullanmaq içün,
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' faylnıñ tam versiyasını qullanmaq içün,
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|tarif]]</nowiki></tt>''' bir tarif ile 200 piksel bir resim qullanmaq içün,
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' faylğa vastasız bağlantı içün.",
 'upload-permitted'            => 'İzinli fayl çeşitleri: $1.',
 'upload-preferred'            => 'İstenilgen fayl çeşitleri: $1.',
@@ -934,7 +936,7 @@ Saifede resim qullanmaq içün böyle şekilli bağlantılar qullanıñız:
 'uploadlog'                   => 'yükleme jurnalı',
 'uploadlogpage'               => 'Fayl yükleme jurnalı',
 'uploadlogpagetext'           => 'Aşağıda eñ soñki qоşulğan fayllarnıñ cedveli buluna.
-Daa körgezmeli körüniş içün [[Special:NewImages|yañı fayllar galereyasına]] baqıñız.',
+Daa körgezmeli körüniş içün [[Special:NewFiles|yañı fayllar galereyasına]] baqıñız.',
 'filename'                    => 'Fayl',
 'filedesc'                    => 'Faylğa ait qısqa tarif',
 'fileuploadsummary'           => 'Qısqa tarif:',
@@ -944,7 +946,7 @@ Daa körgezmeli körüniş içün [[Special:NewImages|yañı fayllar galereyası
 'ignorewarning'               => 'Tenbini ignor etip faylnı yükle.',
 'ignorewarnings'              => 'Tenbini ignor et',
 'minlength1'                  => 'Faylnıñ adı eñ azdan bir ariften ibaret olmalı.',
-'illegalfilename'             => '"$1" faylınıñ adında serleva içün yasaqlı işaretler mevcüt. Lütfen, fayl adını deñiştirip yañıdan yüklep baqıñız.',
+'illegalfilename'             => '"$1" faylınıñ adında serleva içün yasaqlı işaretler bar. Lütfen, fayl adını deñiştirip yañıdan yüklep baqıñız.',
 'badfilename'                 => 'Fayl adı $1 olaraq deñiştirildi.',
 'filetype-badmime'            => '"$1" MIME çeşitindeki fayllar yükleme yasaqlıdır.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' — istenilmegen fayl çeşiti. 
@@ -956,22 +958,23 @@ Daa körgezmeli körüniş içün [[Special:NewImages|yañı fayllar galereyası
 'largefileserver'             => 'Bu faylnıñ uzunlığı serverde izin berilgenden büyükçedir.',
 'emptyfile'                   => 'İhtimal ki, yüklengen fayl boş. İhtimallı sebep - fayl adlandıruv
 hatasıdır. Lütfen, tamam bu faylnı yüklemege isteycek ekeniñizni teşkeriñiz.',
-'fileexists'                  => 'Bu isimde bir fayl mevcüttir. Lütfen, eger siz deñiştirmekten emin olmasañız başta <strong><tt>$1</tt></strong> faylına köz taşlañız.',
-'filepageexists'              => 'Bu fayl içün tasvir saifesi endi yapılğan (<strong><tt>$1</tt></strong>), lâkin bu adda bir fayl yoqtır. Yazılğan tasvir resim tasvir saifesinde kösterilmeycek. Yañı bir tasvir qоşmaq içün onı qolnen deñiştirmege mecbursıñız.',
-'fileexists-extension'        => 'Buña oşağan adda bir fayl mevcüttir:<br />
-Yüklengen faylnıñ adı: <strong><tt>$1</tt></strong><br />
-Mevcüt olğan faylnıñ adı: <strong><tt>$2</tt></strong><br />
-Lütfen, başqa bir ad saylap yazıñız.',
-'fileexists-thumb'            => "<center>'''Mevcüt fayl'''</center>",
-'fileexists-thumbnail-yes'    => 'Belki de bu fayl bir küçülgen kopiyadır (thumbnail). Lütfen, <strong><tt>$1</tt></strong> faylını teşkeriñiz.<br />
-Eger belgilengen fayl aynı şu resim olsa, onıñ küçülgen kopiyasını ayrı olaraq yüklemek aceti yoqtır.',
-'file-thumbnail-no'           => 'Faylnıñ adı <strong><tt>$1</tt></strong>nen başlana. Belki de bu resimniñ ufaqlaştırılğan bir kopiyasıdır <i>(thumbnail)</i>.
-Eger sizde bu resim tam büyükliginde bar olsa, lütfen, onı yükleñiñiz ya da faylnıñ adını deñiştiriñiz.',
-'fileexists-forbidden'        => 'Bu isimde bir fayl mevcüttir. Lütfen, keri qaytıñız, fayl ismini
-deñiştirip yañıdan yükleñiz. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Fayllar umumiy tutulğan yerinde bu isimde bir fayl mevcüttir.
+'fileexists'                  => "Bu isimde bir fayl endi bar. Lütfen, eger siz deñiştirmekten emin olmasañız başta '''<tt>$1</tt>''' faylına köz taşlañız.",
+'filepageexists'              => "Bu fayl içün tasvir saifesi endi yapılğan ('''<tt>$1</tt>'''), lâkin bu adda bir fayl yoqtır. Yazılğan tasvir resim tasvir saifesinde kösterilmeycek. Yañı bir tasvir qоşmaq içün onı qolnen deñiştirmege mecbursıñız.",
+'fileexists-extension'        => "Buña oşağan adda bir fayl bar:<br />
+Yüklengen faylnıñ adı: '''<tt>$1</tt>'''<br />
+Mevcut olğan faylnıñ adı: '''<tt>$2</tt>'''<br />
+Lütfen, başqa bir ad saylap yazıñız.",
+'fileexists-thumb'            => "<center>'''Mevcut fayl'''</center>",
+'fileexists-thumbnail-yes'    => "Belki de bu fayl bir küçülgen kopiyadır (thumbnail). Lütfen, '''<tt>$1</tt>''' faylını teşkeriñiz.<br />
+Eger belgilengen fayl aynı şu resim olsa, onıñ küçülgen kopiyasını ayrı olaraq yüklemek aceti yoqtır.",
+'file-thumbnail-no'           => "Faylnıñ adı '''<tt>$1</tt>'''nen başlana. Belki de bu resimniñ ufaqlaştırılğan bir kopiyasıdır ''(thumbnail)''.
+Eger sizde bu resim tam büyükliginde bar olsa, lütfen, onı yükleñiñiz ya da faylnıñ adını deñiştiriñiz.",
+'fileexists-forbidden'        => 'Bu isimde bir fayl endi bar, ve üzerine yazılamay.
+Faylıñıznı yañıdan yüklemege isteseñiz, lütfen, keri qaytıp yañı bir isim qullanıñız.
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Fayllar umumiy tutulÄŸan yerinde bu isimde bir fayl endi bar.
 Eger bu faylnı ep bir yüklemege isteseñiz, keri qaytıñız ve fayl ismini deñiştirip yañıdan yükleñiz.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Bu fayl aşağıdaki {{PLURAL:$1|faylnıñ|fayllarnıñ}} dublikatı ola:',
 'successfulupload'            => 'Yüklenüv becerildi',
 'uploadwarning'               => 'Tenbi',
@@ -980,19 +983,19 @@ Eger bu faylnı ep bir yüklemege isteseñiz, keri qaytıñız ve fayl ismini de
 'overwroteimage'              => '"[[$1]]" yañı versiyası yüklendi',
 'uploaddisabled'              => 'Yükleme yasaqlıdır.',
 'uploaddisabledtext'          => 'Fayl yükleme yasaqlıdır.',
-'uploadscripted'              => 'Bu faylda brauzer tarafından yañlışnen işlenip olur HTML kodu ya da skript mevcüt.',
+'uploadscripted'              => 'Bu faylda brauzer tarafından yañlışnen işlenip olur HTML kodu ya da skript bar.',
 'uploadcorrupt'               => 'Bu fayl ya zararlandı, ya da yañlış uzantılı. Lütfen, faylnı teşkerip yañıdan yüklep baqıñız.',
 'uploadvirus'                 => 'Bu fayl viruslıdır! $1 baqıñız',
 'sourcefilename'              => 'Yüklemege istegeniñiz fayl:',
 'destfilename'                => 'Faylnıñ istenilgen adı:',
 'upload-maxfilesize'          => 'Azamiy (maksimal) fayl büyükligi: $1',
 'watchthisupload'             => 'Bu faylnı közetüv cedveline kirset',
-'filewasdeleted'              => 'Bu isimde bir fayl mevcüt edi, amma yoq etilgen edi. Lütfen, tekrar yüklemeden evel $1 teşkeriñiz.',
+'filewasdeleted'              => 'Bu isimde bir fayl bar edi, amma yoq etilgen edi. Lütfen, tekrar yüklemeden evel $1 teşkeriñiz.',
 'upload-wasdeleted'           => "'''Diqqat: Evelde yoq etilgen faylnı yüklemektesiñiz.'''
 
 Er alda bu faylnı yüklemege devam etmege isteysiñizmi?
 Bu fayl içün yoq etüvniñ jurnalını mında baqıp olasıñız:",
-'filename-bad-prefix'         => 'Siz yüklegen faylnıñ adı <strong>"$1"</strong>-nen başlana. Bu, adetince, raqamlı fotoapparatlardan fayl adına yazılğan manasız işaretlerdir. Lütfen, bu fayl içün añlıca bir ad saylap yazıñız.',
+'filename-bad-prefix'         => "Siz yüklegen faylnıñ adı '''\"\$1\"'''-nen başlana. Bu, adetince, raqamlı fotoapparatlardan fayl adına yazılğan manasız işaretlerdir. Lütfen, bu fayl içün añlıca bir ad saylap yazıñız.",
 
 'upload-proto-error'      => 'Yañlış protokol',
 'upload-proto-error-text' => 'İnternetten bir resim faylı yüklemege isteseñiz adres <code>http://</code> ya da <code>ftp://</code>nen başlamalı.',
@@ -1013,20 +1016,20 @@ Bu fayl içün yoq etüvniñ jurnalını mında baqıp olasıñız:",
 'upload_source_url'  => ' (doğru, püblik tarzda kirmege musaadeli internet adres)',
 'upload_source_file' => ' (kompyuteriñizdeki fayl)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Bu mahsus saife bütün yüklengen fayllarnı köstere.
+# Special:ListFiles
+'listfiles-summary'     => 'Bu mahsus saife bütün yüklengen fayllarnı köstere.
 Yaqınlarda yüklengen fayllar cedvelniñ yuqarısında kösterile.
 Sutun serlevasına bir basuv sortirlemeniñ tertibini deñiştirir.',
-'imagelist_search_for'  => 'Fayl adını qıdıruv:',
+'listfiles_search_for'  => 'Fayl adını qıdıruv:',
 'imgfile'               => 'fayl',
-'imagelist'             => 'Resim cedveli',
-'imagelist_date'        => 'Tarih',
-'imagelist_name'        => 'Fayl adı',
-'imagelist_user'        => 'Qullanıcı',
-'imagelist_size'        => 'Büyüklik',
-'imagelist_description' => 'Tasvir',
-
-# Image description page
+'listfiles'             => 'Resim cedveli',
+'listfiles_date'        => 'Tarih',
+'listfiles_name'        => 'Fayl adı',
+'listfiles_user'        => 'Qullanıcı',
+'listfiles_size'        => 'Büyüklik',
+'listfiles_description' => 'Tasvir',
+
+# File description page
 'filehist'                  => 'Faylnıñ keçmişi',
 'filehist-help'             => 'Faylnıñ kerekli anki alını körmek içün tarihqa/saatqa basıñız.',
 'filehist-deleteall'        => 'episini yoq et',
@@ -1038,7 +1041,7 @@ Sutun serlevasına bir basuv sortirlemeniñ tertibini deñiştirir.',
 'filehist-dimensions'       => 'En × boy',
 'filehist-filesize'         => 'Fayl büyükligi',
 'filehist-comment'          => 'Ä°zaat',
-'imagelinks'                => 'Faylnı qullanğan saifeler',
+'imagelinks'                => 'Fayl bağlantıları',
 'linkstoimage'              => 'Bu faylğa bağlantı olğan $1 saife:',
 'nolinkstoimage'            => 'Bu faylÄŸa baÄŸlanÄŸan saife yoq.',
 'sharedupload'              => 'Bu fayl ortaq fezağa yüklengen ve diger proyektlerde de qullanılğan bir fayl ola bilir.',
@@ -1072,29 +1075,16 @@ Sutun serlevasına bir basuv sortirlemeniñ tertibini deñiştirir.',
 
 # Random page
 'randompage'         => 'Tesadüfiy saife',
-'randompage-nopages' => 'Bu isim fezasında iç bir saife yoq.',
+'randompage-nopages' => '"$1" isim fezasında iç bir saife yoq.',
 
 # Random redirect
 'randomredirect'         => 'Tesadüfiy yollama saifesi',
-'randomredirect-nopages' => 'Bu isim fezasında iç bir yollama saifesi yoq.',
+'randomredirect-nopages' => '"$1" isim fezasında iç bir yollama saifesi yoq.',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => '{{SITENAME}} statistikası',
-'userstats'              => 'Qullanıcı statistikası',
-'sitestatstext'          => "{{SITENAME}} saytında al-azırda '''{{PLURAL:\$2|1 keçerli saife|\$2 keçerli saife}}''' mevcüttir.
-
-Bu cümleden; \"yollama\", \"muzakere\", \"resim\", \"qullanıcı\", \"yardım\", \"{{SITENAME}}\", \"şablon\" isim fezalarındakiler ve içki bağlantısız saifeler kirsetilmedi. Keçerli saife sayısına bu saifelerniñ sayısı eklengende ise toplam '''\$1''' saife mevcüttir.
-
-\$8 dane fayl yüklendi.
-
-Sayt qurulğanından bu künge qadar toplam '''\$4''' saife deñişikligi ve saife başına tahminen '''\$5''' isse qoşuldı.
-
-Toplam saife kösterilme sayısı '''\$3''', deñişiklik başına kösterme sayısı '''\$6''' oldı.
-
-Şimdiki [http://www.mediawiki.org/wiki/Manual:Job_queue iş sırası] sayısı '''\$7'''.",
-'userstatstext'          => "Al-azırda '''{{PLURAL:$1|1|$1}}''' qaydlı qullanıcımız bar. Bulardan '''{{PLURAL:$2|1|$2}}''' (ya da '''$4%''') danesi - $5.",
-'statistics-mostpopular' => 'Eñ sıq baqılğan saifeler',
+'statistics'              => 'Statistika',
+'statistics-header-users' => 'Qullanıcı statistikası',
+'statistics-mostpopular'  => 'Eñ sıq baqılğan saifeler',
 
 'disambiguations'      => 'Çoq manalı terminler saifeleri',
 'disambiguationspage'  => '{{ns:template}}:disambig',
@@ -1106,7 +1096,7 @@ Eger saifede, [[MediaWiki:Disambiguationspage]] saifesinde adı keçken şablon
 'doubleredirectstext' => 'Er satırda, ekinci yollama metniniñ ilk satırınıñ (umumen ekinci yollamanıñ da işaret etmek kerek olğanı "asıl" maqsatnıñ) yanında ilk ve ekinci yollamağa bağlantılar bar.',
 
 'brokenredirects'        => 'Bar olmağan saifege yapılğan yollamalar',
-'brokenredirectstext'    => 'Aşağıdki yollama, mevcüt olmağan bir saifege işaret ete.',
+'brokenredirectstext'    => 'Aşağıdaki yollamalar bar olmağan saifelerge bağlantı bereler:',
 'brokenredirects-edit'   => '(deñiştir)',
 'brokenredirects-delete' => '(yoq et)',
 
@@ -1133,13 +1123,15 @@ Eger saifede, [[MediaWiki:Disambiguationspage]] saifesinde adı keçken şablon
 'popularpages'            => 'Populâr saifeler',
 'wantedcategories'        => 'Ä°stenilgen kategoriyalar',
 'wantedpages'             => 'Ä°stenilgen saifeler',
+'wantedfiles'             => 'Ä°stenilgen fayllar',
+'wantedtemplates'         => 'İstenilgen şablоnlar',
 'mostlinked'              => 'Özüne eñ ziyade bağlantı berilgen saifeler',
 'mostlinkedcategories'    => 'Eñ çoq saifege saip kategoriyalar',
 'mostlinkedtemplates'     => 'Özüne eñ ziyade bağlantı berilgen şablonlar',
 'mostcategories'          => 'Eñ ziyade kategoriyağa bağlanğan saifeler',
 'mostimages'              => 'Eñ çoq qullanılğan resimler',
 'mostrevisions'           => 'Eñ çoq deñişiklikke oğrağan saifeler',
-'prefixindex'             => 'Prefiks cedveli',
+'prefixindex'             => 'Prefiksnen bütün saifeler',
 'shortpages'              => 'Qısqa saifeler',
 'longpages'               => 'Uzun saifeler',
 'deadendpages'            => 'Başqa saifelerge bağlantısı olmağan saifeler',
@@ -1166,8 +1158,6 @@ Eger saifede, [[MediaWiki:Disambiguationspage]] saifesinde adı keçken şablon
 'speciallogtitlelabel' => 'Serleva:',
 'log'                  => 'Jurnallar',
 'all-logs-page'        => 'Bütün jurnallar',
-'log-search-legend'    => 'Jurnal qıdıruv',
-'log-search-submit'    => 'Qıdır',
 'logempty'             => 'Jurnalda bir kelgen malümat yoq.',
 'log-title-wildcard'   => 'Bu işaretlerden başlanğan serlevalarnı qıdır',
 
@@ -1199,9 +1189,16 @@ Mında [[Special:UnusedCategories|qullanılmağan kategoriyalar]] kösterilmegen
 'listusers-submit'   => 'Köster',
 'listusers-noresult' => 'İç bir qullanıcı tapılmadı.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Yañı qullanıcı jurnalı',
+'newuserlogpagetext'          => 'Eñ sоñki qayd оlğan qullanıcı jurnalı.',
+'newuserlog-create-entry'     => 'Yañı qullanıcı',
+'newuserlog-create2-entry'    => 'yañı esap yarattı $1',
+'newuserlog-autocreate-entry' => 'Esap avtomatik olaraq yaratıldı',
+
 # E-mail user
 'mailnologin'     => 'Mektüp yollanacaq adresi yoqtır',
-'mailnologintext' => 'Diger qullanıcılarğa elektron mektüpler yollap olmaq içün [[Special:UserLogin|oturım açmalısıñız]] ve [[Special:Preferences|sazlamalarıñızda]] mevcüt olğan e-mail adresiniñ saibi olmalısıñız.',
+'mailnologintext' => 'Diger qullanıcılarğa elektron mektüpler yollap olmaq içün [[Special:UserLogin|oturım açmalısıñız]] ve [[Special:Preferences|sazlamalarıñızda]] mevcut olğan e-mail adresiniñ saibi olmalısıñız.',
 'emailuser'       => 'Qullanıcığa mektüp',
 'emailpage'       => 'Qullanıcığa elektron mektüp yolla',
 'emailpagetext'   => 'Aşağıdaki formanı toldurıp bu qullanıcığa mektüp yollap olursıñız.
@@ -1209,7 +1206,7 @@ Mında [[Special:UnusedCategories|qullanılmağan kategoriyalar]] kösterilmegen
 'usermailererror' => 'E-mail beyanatı yollanğan vaqıtta hata olıp çıqtı',
 'defemailsubject' => '{{SITENAME}} e-mail',
 'noemailtitle'    => 'E-mail adresi yoqtır',
-'noemailtext'     => 'Bu qullanıcı ya mevcüt olğan elektron poçta adresini yazmağan, ya da başqa qullanıcılardan mektüp aluvdan vazgeçken.',
+'noemailtext'     => 'Bu qullanıcı uyğun elektron poçta adresini bildirmegen.',
 'emailfrom'       => 'Kimden:',
 'emailto'         => 'Kimge:',
 'emailsubject'    => 'Mektüp mevzusı:',
@@ -1244,16 +1241,11 @@ Birazdan soñ közetüv cedveliñizden bir de bir saifeni yoq etmege isteseñiz
 'wlheader-showupdated' => "* Soñki ziyaretiñizden soñraki saife deñişiklikleri '''qalın''' olaraq kösterildi.",
 'watchmethod-recent'   => 'soñki deñişiklikler arasında közetken saifeleriñiz qıdırıla',
 'watchmethod-list'     => 'közetüv cedvelindeki saifeler teşkerile',
-'watchlistcontains'    => 'Siziñ közetüv cedveliñizde {{PLURAL:$1|1|$1}} saife mevcüttir.',
+'watchlistcontains'    => 'Siziñ közetüv cedveliñizde {{PLURAL:$1|1|$1}} saife bar.',
 'iteminvalidname'      => '"$1" saifesi munasebetinen problema olıp çıqtı, elverişli olmağan isimdir…',
 'wlnote'               => "Aşağıda soñki {{PLURAL:$2|saat|'''$2''' saat}} içinde yapılğan soñki {{PLURAL:$1|deñişiklik|'''$1''' deñişiklik}} kösterile.",
 'wlshowlast'           => 'Soñki $2 kün $1 saat içün $3 köster',
-'watchlist-show-bots'  => 'Botlar deñişikliklerini köster',
-'watchlist-hide-bots'  => 'Botlar deñişikliklerini gizle',
-'watchlist-show-own'   => 'Menim deñişikliklerimni köster',
-'watchlist-hide-own'   => 'Menim deñişikliklerimni gizle',
-'watchlist-show-minor' => 'Kiçik deñişikliklerni köster',
-'watchlist-hide-minor' => 'Kiçik deñişikliklerni gizle',
+'watchlist-options'    => 'Közetüv cedveli sazlamaları',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Közetüv cedveline kirsetilmekte...',
@@ -1292,57 +1284,63 @@ Sazlamalarnı deñiştirmek içün:
 Yardım ve teklifler içün:
 {{fullurl:Help:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Saifeni yoq et',
-'confirm'                     => 'Tasdıqla',
-'excontent'                   => "eski metin: '$1'",
-'excontentauthor'             => "eski metin: '$1' ('$2' isse qoşqan tek bir qullanıcı)",
-'exbeforeblank'               => "Yoq etilmegen evelki metin: '$1'",
-'exblank'                     => 'saife metini boÅŸ',
-'historywarning'              => 'Tenbi: Siz yoq etmek üzre olğan saifeniñ keçmişi bardır:',
-'confirmdeletetext'           => 'Bir saifeni ya da resimni bütün keçmişi ile birlikte malümat bazasından qalıcı olaraq yoq etmek üzresiñiz.
+# Delete
+'deletepage'            => 'Saifeni yoq et',
+'confirm'               => 'Tasdıqla',
+'excontent'             => "eski metin: '$1'",
+'excontentauthor'       => "eski metin: '$1' ('$2' isse qoşqan tek bir qullanıcı)",
+'exbeforeblank'         => "Yoq etilmegen evelki metin: '$1'",
+'exblank'               => 'saife metini boÅŸ',
+'historywarning'        => 'Tenbi: Siz yoq etmek üzre olğan saifeniñ keçmişi bardır:',
+'confirmdeletetext'     => 'Bir saifeni ya da resimni bütün keçmişi ile birlikte malümat bazasından qalıcı olaraq yoq etmek üzresiñiz.
 Lütfen, neticelerini añlağanıñıznı ve [[{{MediaWiki:Policy-url}}|yoq etüv politikasına]] uyğunlığını diqqatqa alıp, bunı yapmağa istegeniñizni tasdıqlañız.',
-'actioncomplete'              => 'İşlem tamamlandı.',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" yoq etildi.
+'actioncomplete'        => 'İşlem tamamlandı.',
+'deletedtext'           => '"<nowiki>$1</nowiki>" yoq etildi.
 yaqın zamanda yoq etilgenlerni körmek içün: $2.',
-'deletedarticle'              => '"[[$1]]" yoq etildi',
-'dellogpage'                  => 'Yoq etüv jurnalı',
-'dellogpagetext'              => 'Aşağıdaki cedvel soñki yoq etüv jurnalıdır.',
-'deletionlog'                 => 'yoq etüv jurnalı',
-'reverted'                    => 'Evelki versiya keri ketirildi',
-'deletecomment'               => 'Yoq etüv sebebi',
-'deleteotherreason'           => 'Diger/ilâveli sebep:',
-'deletereasonotherlist'       => 'Diger sebep',
-'rollback'                    => 'deñişikliklerni keri al',
-'rollback_short'              => 'keri al',
-'rollbacklink'                => 'eski alına ketir',
-'rollbackfailed'              => 'keri aluv iÅŸlemi muvafaqiyetsiz',
-'cantrollback'                => 'Deñişiklikler keri alınamay, soñki deñiştirgen kişi saifeniñ tek bir müellifidir',
-'editcomment'                 => 'Deñiştirme izaatı: "<i>$1</i>" edi.', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|muzakere]]) tarafından yapılğan deñişiklikler keri alınıp, [[User:$1|$1]] tarafından deñiştirilgen evelki versiya keri ketirildi.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'deletedarticle'        => '"[[$1]]" yoq etildi',
+'dellogpage'            => 'Yoq etüv jurnalı',
+'dellogpagetext'        => 'Aşağıdaki cedvel soñki yoq etüv jurnalıdır.',
+'deletionlog'           => 'yoq etüv jurnalı',
+'reverted'              => 'Evelki versiya keri ketirildi',
+'deletecomment'         => 'Yoq etüv sebebi',
+'deleteotherreason'     => 'Diger/ilâveli sebep:',
+'deletereasonotherlist' => 'Diger sebep',
+
+# Rollback
+'rollback'       => 'deñişikliklerni keri al',
+'rollback_short' => 'keri al',
+'rollbacklink'   => 'eski alına ketir',
+'rollbackfailed' => 'keri aluv iÅŸlemi muvafaqiyetsiz',
+'cantrollback'   => 'Deñişiklikler keri alınamay, soñki deñiştirgen kişi saifeniñ tek bir müellifidir',
+'editcomment'    => "Deñiştirme izaatı: \"''\$1''\" edi.", # only shown if there is an edit comment
+'revertpage'     => '[[Special:Contributions/$2|$2]] ([[User talk:$2|muzakere]]) tarafından yapılğan deñişiklikler keri alınıp, [[User:$1|$1]] tarafından deñiştirilgen evelki versiya keri ketirildi.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'Qorçalav jurnalı',
 'protectlogtext'              => 'Qorçalavğa aluv/çıqaruv ile bağlı deñişiklikler jurnalını körmektesiñiz.
 Qorçalav altına alınğan saifeler tam cedveli [[Special:ProtectedPages|bu saifede]] körip olasıñız.',
 'protectedarticle'            => '"[[$1]]" qorçalav altına alındı',
 'unprotectedarticle'          => 'qorçalav çıqarlıdı: "[[$1]]"',
+'prot_1movedto2'              => '"[[$1]]" saifesiniñ adı "[[$2]]" olaraq deñiştirildi',
 'protect-legend'              => 'Qorçalavnı tasdıqla',
 'protectcomment'              => 'Qorçalav altına aluv sebebi',
 'protectexpiry'               => 'Bitiş tarihı:',
 'protect_expiry_invalid'      => 'Bitiş tarihı yañlış.',
 'protect_expiry_old'          => 'Bitiş zamanı keçmiştedir.',
 'protect-unchain'             => 'Saife adı deñiştirüv kilitini çıqar',
-'protect-text'                => '<strong>[[<nowiki>$1</nowiki>]]</strong> saifesiniñ qorçalav seviyesini mından körip olur ve deñiştirip olasıñız.',
-'protect-locked-access'       => 'Qullanıcı esabıñız saifeniñ qorçalav seviyelerini deñiştirme yetkisine saip degil. <strong>$1</strong> saifesiniñ şimdiki sazlamaları şularıdır:',
+'protect-text'                => "'''[[<nowiki>$1</nowiki>]]''' saifesiniñ qorçalav seviyesini mından körip olur ve deñiştirip olasıñız.",
+'protect-locked-access'       => "Qullanıcı esabıñız saifeniñ qorçalav seviyelerini deñiştirme yetkisine saip degil. '''$1''' saifesiniñ şimdiki sazlamaları şularıdır:",
 'protect-cascadeon'           => 'Bu saife şimdi qorçalav altındadır, çünki aşağıda cedvellengen ve kaskadlı qorçalav altındaki $1 saifede qullanıla.
 Bu saifeniñ qorçalav seviyesini deñiştirip olasıñız, amma kaskadlı qorçalav tesir etilmeycek.',
-'protect-default'             => '(standart)',
+'protect-default'             => 'Bütün qullanıcılarğa ruhset ber',
 'protect-fallback'            => '"$1" izni kerektir',
-'protect-level-autoconfirmed' => 'qayd olunmağan deñiştirmesin',
+'protect-level-autoconfirmed' => 'Qaydsız ve yañı qullanıcılarnı blоk et',
 'protect-level-sysop'         => 'tek administratorlar',
 'protect-summary-cascade'     => 'kaskadlı',
 'protect-expiring'            => 'bite: $1 (UTC)',
 'protect-cascade'             => 'Bu saifede qullanılğan bütün saifelerni qorçalavğa al (kaskadlı qorçalav)',
 'protect-cantedit'            => 'Bu saifeniñ qorçalav seviyesini deñiştirip olamazsıñız, çünki bunı yapmağa yetkiñiz yoq.',
+'protect-expiry-options'      => '2 saat:2 hours,1 kün:1 day,3 kün:3 days,1 afta:1 week,2 afta:2 weeks,1 ay:1 month,3 ay:3 months,6 ay:6 months,1 yıl:1 year,müddetsiz:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ruhseti:',
 'restriction-level'           => 'Ruhset seviyesi:',
 'minimum-size'                => 'Asğariy (minimal) büyüklik',
@@ -1374,13 +1372,14 @@ Bu saifeniñ qorçalav seviyesini deñiştirip olasıñız, amma kaskadlı qorç
 'blanknamespace' => '(Esas)',
 
 # Contributions
-'contributions' => 'Qullanıcınıñ isseleri',
-'mycontris'     => 'isselerim',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Bu kriteriylerge uyğan deñişiklik tapılamadı',
-'uctop'         => '(soñki)',
-'month'         => 'Bu ay (ve ondan erte):',
-'year'          => 'Bu sene (ve ondan erte):',
+'contributions'       => 'Qullanıcınıñ isseleri',
+'contributions-title' => '$1 qullanıcısınıñ isseleri',
+'mycontris'           => 'isselerim',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Bu kriteriylerge uyğan deñişiklik tapılamadı',
+'uctop'               => '(soñki)',
+'month'               => 'Bu ay (ve ondan erte):',
+'year'                => 'Bu sene (ve ondan erte):',
 
 'sp-contributions-newbies'     => 'Tek yañı qullanıcılarnıñ isselerini köster',
 'sp-contributions-newbies-sub' => 'Yañı qullanıcılar içün',
@@ -1393,7 +1392,6 @@ Bu saifeniñ qorçalav seviyesini deñiştirip olasıñız, amma kaskadlı qorç
 'whatlinkshere'       => 'Saifege bağlantılar',
 'whatlinkshere-title' => '$1 saifesine bağlantı olğan saifeler',
 'whatlinkshere-page'  => 'Saife:',
-'linklistsub'         => '(Bağlantı cedveli)',
 'linkshere'           => "Bu saifeler '''[[:$1]]''' saifesine bağlantısı olğan:",
 'nolinkshere'         => "'''[[:$1]]''' saifesine baÄŸlanÄŸan saife yoq.",
 'nolinkshere-ns'      => "Saylanğan isim fezasında '''[[:$1]]''' saifesine bağlanğan saife yoqtır.",
@@ -1420,7 +1418,7 @@ Bu saifeniñ qorçalav seviyesini deñiştirip olasıñız, amma kaskadlı qorç
 'blockipsuccesstext'      => '"$1" ban etildi.
 <br />[[Special:IPBlockList|IP adresi ban etilgenler]] cedveline baqıñız .',
 'unblockip'               => 'Qullanıcınıñ ban etüvini çıqar',
-'ipusubmit'               => 'Bu adresniñ ban etüvini çıqar',
+'ipusubmit'               => 'Bu blok etmeni çıqar',
 'ipblocklist'             => 'Blok etilgen qullanıcılar ve IP adresleri',
 'blocklistline'           => '$1, $2 blok etti: $3 ($4)',
 'infiniteblock'           => 'müddetsiz',
@@ -1447,28 +1445,29 @@ Bu saifeniñ qorçalav seviyesini deñiştirip olasıñız, amma kaskadlı qorç
 'movepagetext'            => "Aşağıdaki formanı qullanıp saifeniñ adını deñiştirilir. Bunıñnen beraber deñişiklik jurnalı da yañı adğa avuştırılır.
 Eski ad yañı adğa yollama olur. Eski serlevağa yollama saifelerni avtomatik olaraq yañartıp olasıñız. Bu işlemi avtomatik yapmağa istemeseñiz, bütün [[Special:DoubleRedirects|çift]] ve [[Special:BrokenRedirects|yırtıq]] yollama saifelerini özüñiz tüzetmege mecbur olursıñız. Bağlantılar endiden berli doğru çalışmasından emin olmalısıñız.
 
-Yañı adda bir ad zaten mevcüt olsa, ad deñişikligi '''yapılmaycaq''', ancaq mevcüt olğan saife yollama ya da boş olsa ad deñişikligi mümkün olacaq. Bu demek ki, saife adını yañlıştan deñiştirgen olsañız deminki adını keri qaytarıp olasıñız, amma mevcüt olğan saifeni tesadüfen yoq etalmaysıñız.
+Yañı adda bir ad endi bar olsa, ad deñişikligi '''yapılmaycaq''', ancaq mevcut olğan saife yollama ya da boş olsa ad deñişikligi mümkün olacaq. Bu demek ki, saife adını yañlıştan deñiştirgen olsañız deminki adını keri qaytarıp olasıñız, amma mevcut olğan saifeni tesadüfen yoq etalmaysıñız.
 
 '''TENBÄ°!'''
 Ad deñiştirüv populâr saifeler içün büyük deñişmelerge sebep ola bilir. Lütfen, deñişiklikni yapmadan evel ola bileceklerni köz ögüne alıñız.",
-'movepagetalktext'        => "Qoşulğan muzakere saifesiniñ de (mevcüt olsa)
-adı avtomatik tarzda deñiştirilecek. '''Müstesnalar:'''
+'movepagetalktext'        => "Qoşulğan muzakere saifesiniñ de (bar olsa) adı avtomatik tarzda deñiştirilecek. '''Müstesnalar:'''
 
-*Aynı bu isimde boş olmağan bir muzakere saifesi endi mevcüttir;
+*Aynı bu isimde boş olmağan bir muzakere saifesi endi bar;
 *Aşağıdaki boşluqqa işaret qoymadıñız.
 
 Böyle allarda, kerek olsa, saifelerni qolnen taşımağa ya da birleştirmege mecbur olursıñız.",
 'movearticle'             => 'Eski ad',
+'movenologin'             => 'Oturım açmadıñız',
+'movenologintext'         => 'Saifeniñ adını deñiştirip olmaq içün [[Special:UserLogin|oturım açıñız]].',
 'movenotallowed'          => 'Saifeler adlarını deñiştirmege iziniñiz yoq.',
 'newtitle'                => 'Yañı ad',
 'move-watch'              => 'Bu saifeni közet',
 'movepagebtn'             => 'Adını deñiştir',
 'pagemovedsub'            => 'Ad deñişikligi tamamlandı',
 'movepage-moved'          => '<big>\'\'\'"$1" saifesiniñ adı "$2" olaraq deñiştirildi\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Bu adda bir saife endi mevcüt ya da siz yazğan ad yasaqlı.
+'articleexists'           => 'Bu adda bir saife endi bar ya da siz yazğan ad yasaqlı.
 Lütfen, başqa bir ad saylap yazıñız.',
 'cantmove-titleprotected' => 'Siz yazğan yañı ad yasaqlıdır, bunıñ içün saife adını deñiştirmekniñ çaresi yoq.',
-'talkexists'              => "'''Saifeniñ adı deñiştirildi, amma muzakere saifesiniñ adını deñiştirmege mümkünlik yoqtır, çünki aynı bu adda bir saife endi mevcüttir. Lütfen, bularnı qolnen birleştiriñiz.'''",
+'talkexists'              => "'''Saifeniñ adı deñiştirildi, amma muzakere saifesiniñ adını deñiştirmege mümkünlik yoqtır, çünki aynı bu adda bir saife endi bar. Lütfen, bularnı qolnen birleştiriñiz.'''",
 'movedto'                 => 'adı deñiştirildi:',
 'movetalk'                => 'Muzakere saifesiniñ adını deñiştir.',
 '1movedto2'               => '"[[$1]]" saifesiniñ adı "[[$2]]" olaraq deñiştirildi',
@@ -1478,13 +1477,12 @@ Lütfen, başqa bir ad saylap yazıñız.',
 'movereason'              => 'Sebep',
 'revertmove'              => 'Kerige al',
 'delete_and_move'         => 'Yoq et ve adını deñiştir',
-'delete_and_move_text'    => '==Yoq etmek lâzimdir==
+'delete_and_move_text'    => '== Yoq etmek lâzimdir ==
 
-"[[:$1]]" saifesi endi mevcüt. Adını deñiştirip olmaq içün onı yoq etmege isteysiñizmi?',
+"[[:$1]]" saifesi endi bar. Adını deñiştirip olmaq içün onı yoq etmege isteysiñizmi?',
 'delete_and_move_confirm' => 'Ebet, bu saifeni yoq et',
 'delete_and_move_reason'  => 'İsim deñiştirip olmaq içün yoq etildi',
 'selfmove'                => 'Bu saifeniñ adını deñiştirmege imkân yoqtır, çünki asıl ile yañı adları bir kele.',
-'immobile_namespace'      => 'Bu saifeniñ adını deñiştirmege imkân yoqtır, çünki yañı ya da eksi adında rezerv etilgen yardımcı söz bardır.',
 
 # Export
 'export' => 'Saifelerni eksport et',
@@ -1494,8 +1492,8 @@ Lütfen, başqa bir ad saylap yazıñız.',
 'allmessagesname'     => 'Ä°sim',
 'allmessagesdefault'  => 'Original metin',
 'allmessagescurrent'  => 'Şimdi qullanılğan metin',
-'allmessagestext'     => 'İşbu cedvel MediaWikide mevcüt olğan bütün sistema beyanatlarınıñ cedvelidir.
-MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege isteseñiz [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] ve [http://translatewiki.net Betawiki] saifelerine ziyaret etiñiz.',
+'allmessagestext'     => 'İşbu cedvel MediaWikide mevcut olğan bütün sistema beyanatlarınıñ cedvelidir.
+MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege isteseñiz [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] ve [http://translatewiki.net translatewiki.net] saifelerine ziyaret etiñiz.',
 'allmessagesfilter'   => 'Metin ayrıştırıcı filtrı:',
 'allmessagesmodified' => 'Tek deñiştirilgenlerni köster',
 
@@ -1506,23 +1504,26 @@ MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege istese
 'thumbnail_invalid_params' => 'Yañlış thumbnail parametri',
 'thumbnail_dest_directory' => 'İstenilgen direktoriyanı yaratmaqnıñ iç çaresi yoq',
 
+# Special:Import
+'import-comment' => 'Ä°zaat:',
+
 # Import log
 'importlogpage' => 'İmport jurnalı',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Åžahsiy saifem',
+'tooltip-pt-userpage'             => 'Siziñ qullanıcı saifeñiz',
 'tooltip-pt-anonuserpage'         => 'IP adresim içün qullanıcı saifesi',
-'tooltip-pt-mytalk'               => 'Muzakere saifem',
+'tooltip-pt-mytalk'               => 'Siziñ muzakere saifeñiz',
 'tooltip-pt-anontalk'             => 'Bu IP adresinden yapılğan deñişikliklerni muzakere et',
 'tooltip-pt-preferences'          => 'Sazlamalarım (nastroykalarım)',
 'tooltip-pt-watchlist'            => 'Men közetüvge alğan saifeler',
-'tooltip-pt-mycontris'            => 'Qoşqan isselerimniñ cedveli',
+'tooltip-pt-mycontris'            => 'Qoşqan isseleriñizniñ cedveli',
 'tooltip-pt-login'                => 'Oturım açmañız tevsiye olunır amma mecbur degilsiñiz.',
 'tooltip-pt-anonlogin'            => 'Oturım açmañız tevsiye olunır amma mecbur degilsiñiz.',
 'tooltip-pt-logout'               => 'Oturımnı qapat',
 'tooltip-ca-talk'                 => 'Saifedeki malümat ile bağlı zan belgile',
 'tooltip-ca-edit'                 => 'Bu saifeni deñiştirip olasıñız. Saqlamazdan evel baqıp çıqmağa unutmañız.',
-'tooltip-ca-addsection'           => 'Bu muzakerege tefsir qоşuñız.',
+'tooltip-ca-addsection'           => 'Yañı bölük aç',
 'tooltip-ca-viewsource'           => 'Bu saife qorçalav altında. Menba kodunı tek körip olasıñız, deñiştirip olamaysıñız.',
 'tooltip-ca-history'              => 'Bu saifeniñ keçmiş versiyaları.',
 'tooltip-ca-protect'              => 'Bu saifeni qorçala',
@@ -1532,7 +1533,7 @@ MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege istese
 'tooltip-ca-watch'                => 'Bu saifeni közetüvge al',
 'tooltip-ca-unwatch'              => 'Bu saifeni közetmekni taşla',
 'tooltip-search'                  => '{{SITENAME}} saytında qıdıruv yap',
-'tooltip-search-go'               => 'Bu adda saife mevcüt olsa, oña bar',
+'tooltip-search-go'               => 'Bu adda saife mevcut olsa, oña bar',
 'tooltip-search-fulltext'         => 'Bu metini olğan saifeler qıdır',
 'tooltip-p-logo'                  => 'BaÅŸ saife',
 'tooltip-n-mainpage'              => 'Başlanğıç saifesine qaytıñız',
@@ -1579,12 +1580,12 @@ MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege istese
 'notacceptable'     => 'Viki-server brauzeriñiz oqup olacaq formatında malümat beralmay.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}} saytınıñ adsız (anonim) qullanıcıları',
+'anonymous'        => '{{SITENAME}} saytınıñ $1 adsız (anonim) qullanıcıları',
 'siteuser'         => '{{SITENAME}} qullanıcı $1',
 'lastmodifiedatby' => 'Saife eñ soñki $3 tarafından $2, $1 tarihında deñiştirildi.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 menbasına binaen.',
 'others'           => 'digerleri',
-'siteusers'        => '{{SITENAME}} qullanıcılar $1',
+'siteusers'        => '{{SITENAME}} saytınıñ $2 qullanıcısı $1',
 'creditspage'      => 'Teşekkürler',
 'nocredits'        => 'Bu saife içün qullanıcılar cedveli yoq.',
 
@@ -1604,6 +1605,15 @@ MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege istese
 'numauthors'     => 'Müellif sayısı (saife): $1',
 'numtalkauthors' => 'Müellif sayısı (muzakere saifesi): $1',
 
+# Skin names
+'skinname-standard'    => 'Standart',
+'skinname-nostalgia'   => 'Nostalgiya',
+'skinname-cologneblue' => 'Köln asretligi',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Öz resimleme',
+'skinname-chick'       => 'Çipçe',
+'skinname-simple'      => 'Adiy',
+
 # Math options
 'mw_math_png'    => 'Daima PNG resim formatına çevir',
 'mw_math_simple' => 'Pek basit olsa HTML, yoqsa PNG',
@@ -1636,7 +1646,7 @@ MediaWiki interfeysiniñ çeşit tillerge tercime etüvde iştirak etmege istese
 'show-big-image'       => 'Tam çezinirlik',
 'show-big-image-thumb' => '<small>Baqıp çıquvda resim büyükligi: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Yañı resimler',
 'imagelisttext'         => "Aşağıdaki cedvelde $2 köre tizilgen {{PLURAL:$1|'''1''' fayldır|'''$1''' fayldır}}.",
 'showhidebots'          => '(botlarnı $1)',
@@ -1795,21 +1805,9 @@ $1
 Saifeni yañıdan yaratmağa isteseñiz, lütfen, bunı tasdıqlañız.",
 'recreate'            => 'Saifeni yañıdan yarat',
 
-# HTML dump
-'redirectingto' => 'Yollama [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Saife keÅŸini temizlesinmi?
-
-$1',
 'confirm_purge_button' => 'Ok',
-
-# AJAX search
-'searchcontaining' => "''$1'' degen sözler ile saifelerni qıdıruv.",
-'searchnamed'      => "''$1'' adlı saifelerni qıdıruv.",
-'articletitles'    => "''$1'' ile başlağan saifelerni qıdıruv.",
-'hideresults'      => 'Neticelerni gizle',
-'useajaxsearch'    => 'AJAX qıdıruvı qullan',
+'confirm-purge-top'    => 'Saife keÅŸini temizlesinmi?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� evelki saife',
@@ -1831,7 +1829,7 @@ $1',
 'autosumm-blank'   => 'Saife boşatıldı',
 'autosumm-replace' => "Saifedeki malümat '$1' ile deñiştirildi",
 'autoredircomment' => '[[$1]] saifesine yollandı',
-'autosumm-new'     => 'Yañı saife: $1',
+'autosumm-new'     => "Yañı saife yaratıldı. Mündericesi: '$1'",
 
 # Live preview
 'livepreview-loading' => 'Yüklenmekte…',
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index c06298f2..6e0222d9 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -12,6 +12,7 @@
  * @author Michawiki
  * @author Mormegil
  * @author Reaperman
+ * @author Urhixidur
  * @author לערי ריינה�רט
  */
 
@@ -26,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Uživatel_diskuse',
 	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_diskuse',
-	NS_IMAGE          => 'Soubor',
-	NS_IMAGE_TALK     => 'Soubor_diskuse',
+	NS_FILE           => 'Soubor',
+	NS_FILE_TALK      => 'Soubor_diskuse',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_diskuse',
 	NS_TEMPLATE       => 'Å ablona',
@@ -41,15 +42,6 @@ $namespaceNames = array(
 /**
  * Skin names. If any key is not specified, the English one will be used.
  */
-$skinNames = array(
-	'standard'    => 'Klasický',
-	'nostalgia'   => 'Nostalgie',
-	'cologneblue' => 'Kolínská modř',
-	'myskin'      => 'Můj vzhled',
-	'chick'       => 'Kuře',
-	'simple'      => 'Jednoduchý',
-	'modern'      => 'Moderní',
-);
 
 /**
  * Date formats list for Special:Preferences
@@ -256,7 +248,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Watchlist', 'Sledované_stránky' ),
 	'Recentchanges'             => array( 'Recentchanges', 'Poslední_změny', 'Posledni_zmeny' ),
 	'Upload'                    => array( 'Upload', 'Na�íst_soubor', 'Nacist_soubor' ),
-	'Imagelist'                 => array( 'Imagelist', 'Seznam_souborů' ),
+	'Listfiles'                 => array( 'Listfiles', 'Seznam_souborů' ),
 	'Newimages'                 => array( 'Newimages', 'Galerie_nových_obrázků' ),
 	'Listusers'                 => array( 'Listusers', 'Uživatelé', 'Uzivatele' ),
 	'Statistics'                => array( 'Statistics', 'Statistiky' ),
@@ -268,6 +260,7 @@ $specialPageAliases = array(
 	'Uncategorizedtemplates'    => array( 'Uncategorizedtemplates', 'Nekategorizované_šablony' ),
 	'Unusedcategories'          => array( 'Unusedcategories', 'Nepoužívané_kategorie', 'Nepouzivane_kategorie' ),
 	'Unusedimages'              => array( 'Unusedimages', 'Nepoužívané_soubory', 'Nepouzivane_soubory' ),
+	'Wantedtemplates'           => array( 'WantedTemplates', 'Chybějící šablony' ),
 	'Mostlinked'                => array( 'Mostlinked', 'Nejodkazovanější_stránky', 'Nejodkazovanejsi_stranky' ),
 	'Mostlinkedcategories'      => array( 'Mostlinkedcategories', 'Nejpoužívanější_kategorie', 'Nejpouzivanejsi_kategorie' ),
 	'Mostlinkedtemplates'       => array( 'Mostlinkedtemplates', 'Nejpoužívanější_šablony', 'Nejpouzavanejsi_sablony' ),
@@ -351,17 +344,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Na seznamu sledovaných stránek skrýt moje editace',
 'tog-watchlisthidebots'       => 'Na seznamu sledovaných stránek skrýt editace botů',
 'tog-watchlisthideminor'      => 'Skrýt malé editace z mých sledovaných stránek',
+'tog-watchlisthideliu'        => 'Na seznamu sledovaných stránek skrýt editace přihlášených uživatelů',
+'tog-watchlisthideanons'      => 'Na seznamu sledovaných stránek skrýt editace nepřihlášených uživatelů',
 'tog-nolangconversion'        => 'Vypnout konverzi variant',
 'tog-ccmeonemails'            => 'Zasílat mi kopie e-mailů, které pošlu jiným uživatelům',
 'tog-diffonly'                => 'Nezobrazovat obsah stránky pod rozdílem verzí',
 'tog-showhiddencats'          => 'Zobrazit skryté kategorie',
+'tog-norollbackdiff'          => 'Po vrácení změny nezobrazovat porovnání rozdílů',
 
 'underline-always'  => 'Vždy',
 'underline-never'   => 'Nikdy',
 'underline-default' => 'Podle prohlíže�e',
 
-'skinpreview' => '(Náhled)',
-
 # Dates
 'sunday'        => 'neděle',
 'monday'        => 'pondělí',
@@ -430,7 +424,7 @@ $messages = array(
 'category-file-count-limited'    => 'Tato kategorie obsahuje {{PLURAL:$1|následující soubor|následující $1 soubory|následujících $1 souborů}}.',
 'listingcontinuesabbrev'         => 'pokra�.',
 
-'mainpagetext'      => "<big>'''MediaWiki bylo úspěšně nainstalováno.'''</big>",
+'mainpagetext'      => "<big>'''MediaWiki byla úspěšně nainstalována.'''</big>",
 'mainpagedocfooter' => '[http://meta.wikimedia.org/wiki/Help:Contents Uživatelská příru�ka] vám napoví, jak MediaWiki používat.
 
 == Za�ínáme ==
@@ -455,7 +449,7 @@ $messages = array(
 'mytalk'         => 'Moje diskuse',
 'anontalk'       => 'Diskuse k této IP adrese',
 'navigation'     => 'Navigace',
-'and'            => 'a',
+'and'            => '&#32;a',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -492,7 +486,7 @@ $messages = array(
 'talkpagelinktext'  => 'diskuse',
 'specialpage'       => 'Speciální stránka',
 'personaltools'     => 'Osobní nástroje',
-'postcomment'       => 'Přidat komentář',
+'postcomment'       => 'Nová sekce',
 'articlepage'       => 'Prohlédnout si stránku',
 'talk'              => 'Diskuse',
 'views'             => 'Zobrazení',
@@ -518,8 +512,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'O&nbsp;{{grammar:6sg|{{SITENAME}}}}',
 'aboutpage'            => 'Project:{{SITENAME}}',
-'bugreports'           => 'Hlášení chyb',
-'bugreportspage'       => 'Project:Chyby',
 'copyright'            => 'Obsah je dostupný pod $1.',
 'copyrightpagename'    => 'podmínek {{grammar:2sg|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:Autorské právo',
@@ -542,9 +534,7 @@ $messages = array(
 
 'badaccess'        => 'Nedostate�ná oprávnění',
 'badaccess-group0' => 'Nemáte oprávnění k provedení požadované �innosti.',
-'badaccess-group1' => 'Požadovanou �innost smějí provádět jen uživatelé ve skupině $1.',
-'badaccess-group2' => 'Požadovanou �innost smějí provádět jen uživatelé ve skupinách $1.',
-'badaccess-groups' => 'Požadovanou �innost smějí provádět jen uživatelé ve skupinách $1.',
+'badaccess-groups' => 'Požadovanou �innost smějí provádět jen uživatelé ve {{PLURAL:$2|skupině|skupinách}} $1.',
 
 'versionrequired'     => 'Vyžadováno MediaWiki verze $1',
 'versionrequiredtext' => 'Pro použití této stránky je vyžadováno MediaWiki verze $1. Vizte [[Special:Version|stránku verze]].',
@@ -559,6 +549,8 @@ $messages = array(
 'editsection'             => 'editovat',
 'editold'                 => 'editovat',
 'viewsourceold'           => 'zobrazit zdroj',
+'editlink'                => 'editovat',
+'viewsourcelink'          => 'ukázat zdroj',
 'editsectionhint'         => 'Editace �ásti $1',
 'toc'                     => 'Obsah',
 'showtoc'                 => 'zobrazit',
@@ -573,13 +565,13 @@ $messages = array(
 'site-atom-feed'          => 'Atom kanál {{grammar:2sg|$1}}.',
 'page-rss-feed'           => 'RSS kanál stránky „$1“',
 'page-atom-feed'          => 'Atom kanál stránky „$1“',
-'red-link-title'          => '$1 (dosud nevytvořeno)',
+'red-link-title'          => '$1 (stránka neexistuje)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Stránka',
 'nstab-user'      => 'Uživatelova stránka',
 'nstab-media'     => 'Soubor',
-'nstab-special'   => 'Speciální',
+'nstab-special'   => 'Speciální stránka',
 'nstab-project'   => 'Stránka projektu',
 'nstab-image'     => 'Soubor',
 'nstab-mediawiki' => 'Hlášení',
@@ -589,7 +581,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Neznámý úkon',
-'nosuchactiontext'  => 'Tato wiki nezná �innost (action) uvedenou v URL.',
+'nosuchactiontext'  => 'Činnost („action“) uvedená v URL je neplatná.
+Zřejmě jste se překlepli při zadávání adresy nebo jste klikli na chybný odkaz.
+Může se ale jednat také o chybu {{grammar:2sg|{{SITENAME}}}}.',
 'nosuchspecialpage' => 'Neexistující speciální stránka',
 'nospecialpagetext' => "<big>'''Zadali jste neplatnou speciální stránku.'''</big>
 
@@ -641,7 +635,6 @@ Pokud toto není váš případ, možná jste nalezli chybu v software. Prosíme
 'cannotdelete'         => 'Nebylo možné smazat zvolenou stránku ani soubor. (Možná už byla smazána někým jiným.)',
 'badtitle'             => 'Neplatný název',
 'badtitletext'         => 'Požadovaný název stránky byl neplatný, prázdný nebo obsahoval nesprávnou předponu mezijazykového �i interwiki odkazu. Možná obsahoval znaky, které v názvu nejsou dovoleny.',
-'perfdisabled'         => 'Omlouváme se. Tato služba byla do�asně znepřístupněna, protože zpomalovala databázi natolik, že nikdo nemohl používat wiki.',
 'perfcached'           => 'Následující data jsou z cache a nemusí být plně aktuální:',
 'perfcachedts'         => 'Následující data jsou z cache, která byla naposledy aktualizována $1.',
 'querypage-no-updates' => 'Aktualizace této stránky je vypnuta. Data nyní nebudou obnovována.',
@@ -655,7 +648,7 @@ Dotaz: $2',
 'protectedpagetext'    => 'Tato stránka byla zam�ena, takže ji nelze editovat.',
 'viewsourcetext'       => 'Můžete si prohlédnout a zkopírovat zdrojový kód této stránky:',
 'protectedinterface'   => 'Tato stránka obsahuje text softwarového rozhraní a smějí ji editovat jen správci.',
-'editinginterface'     => "'''Upozornění:''' Editujete stránku, která definuje texty rozhraní. Změny této stránky ovlivní vzhled uživatelského rozhraní všem uživatelům.",
+'editinginterface'     => "'''Upozornění:''' Editujete stránku, která definuje texty rozhraní. Změny této stránky ovlivní vzhled uživatelského rozhraní všem uživatelům. Při úpravách �eského překladu zvažte použití [http://translatewiki.net/wiki/Main_Page?setlang=cs Betawiki], projektu pro lokalizaci MediaWiki.",
 'sqlhidden'            => '(SQL dotaz skryt)',
 'cascadeprotected'     => 'Tato stránka je zam�ena, neboť je vložena do {{PLURAL:$1|následující stránky zam�ené|následujících stránek zam�ených|následujících stránek zam�ených}} kaskádovým zámkem:
 $2',
@@ -665,7 +658,7 @@ $2',
 'titleprotected'       => "Stránku s tímto názvem nelze založit, protože název zamknul uživatel [[User:$1|$1]] s odůvodněním: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Špatná konfigurace: neznámý antivirový program: <i>$1</i>',
+'virus-badscanner'     => "Špatná konfigurace: neznámý antivirový program: ''$1''",
 'virus-scanfailed'     => 'prověřování selhalo (kód $1)',
 'virus-unknownscanner' => 'neznámý antivirus:',
 
@@ -683,8 +676,6 @@ Nezapomeňte si upravit [[Special:Preferences|nastavení {{grammar:2sg|{{SITENAM
 'remembermypassword'         => 'Trvalé přihlášení',
 'yourdomainname'             => 'Vaše doména',
 'externaldberror'            => 'Bu� nastala chyba externí autentiza�ní databáze, nebo nemáte dovoleno měnit svůj externí ú�et.',
-'loginproblem'               => '<strong>Nastal problém při vašem přihlášení.</strong><br />
-Zkuste to znovu!',
 'login'                      => 'Přihlaste se',
 'nav-login-createaccount'    => 'Přihlášení / vytvoření ú�tu',
 'loginprompt'                => 'K přihlášení do {{grammar:2sg|{{SITENAME}}}} musíte mít povoleny cookies.',
@@ -709,7 +700,7 @@ Zkuste to znovu!',
 'yourvariant'                => 'Jazyková varianta',
 'yournick'                   => 'Podpis:',
 'badsig'                     => 'Chybný podpis, zkontrolujte syntaxi HTML.',
-'badsiglength'               => 'Podpis je příliš dlouhý. Musí být kratší než {{PLURAL:$1|znak|znaky|znaků}}.',
+'badsiglength'               => 'Váš podpis je příliš dlouhý. Musí být kratší než $1 {{PLURAL:$1|znak|znaky|znaků}}.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Skute�né jméno (volitelné): pokud ho zadáte, bude použito pro ozna�ení autorství vaší práce.',
 'loginerror'                 => 'Chyba při přihlašování',
@@ -720,7 +711,7 @@ Zkuste to znovu!',
 'noname'                     => 'Musíte uvést jméno svého ú�tu.',
 'loginsuccesstitle'          => 'Přihlášení uspělo',
 'loginsuccess'               => 'Nyní jste přihlášen na {{grammar:6sg|{{SITENAME}}}} jako uživatel „$1“.',
-'nosuchuser'                 => 'Neexistuje uživatel se jménem „$1“. Zkontrolujte zápis, nebo si [[Special:UserLogin/signup|vytvořte nový ú�et]].',
+'nosuchuser'                 => 'Neexistuje uživatel se jménem „$1“. U uživatelských jmen se rozlišují malá/velká písmena. Zkontrolujte zápis, nebo si [[Special:UserLogin/signup|vytvořte nový ú�et]].',
 'nosuchusershort'            => 'Neexistuje uživatel se jménem „<nowiki>$1</nowiki>“. Zkontrolujte zápis.',
 'nouserspecified'            => 'Musíte zadat uživatelské jméno.',
 'wrongpassword'              => 'Vámi uvedené heslo nesouhlasí. Zkuste to znovu.',
@@ -745,8 +736,8 @@ Před tím, než vám na tuto adresu budou moci být zasílány další zprávy,
 'throttled-mailpassword'     => 'Heslo již bylo jednou zasláno během uplynulých $1 hodin.
 Heslo může být zasláno jen jednou za $1 {{PLURAL:$1|hodinu|hodiny|hodin}}.',
 'mailerror'                  => 'Chyba při zasílání e-mailu: $1',
-'acct_creation_throttle_hit' => 'Omlouváme se, ale už jste vytvořil(a) $1 {{PLURAL:$1|ú�et|ú�ty|ú�tů}}. Žádný další už nemůžete vytvořit.',
-'emailauthenticated'         => 'Vaše e-mailová adresa byla ověřena $1.',
+'acct_creation_throttle_hit' => 'Uživatelé přicházející z vaší IP adresy už dnes vytvořili $1 {{PLURAL:$1|ú�et|ú�ty|ú�tů}}, což je dovolené maximum. Proto v tuto chvíli není dovoleno z této IP adresy další ú�ty zakládat.',
+'emailauthenticated'         => 'Vaše e-mailová adresa byla ověřena dne $2 v $3.',
 'emailnotauthenticated'      => 'Vaše e-mailová adresa dosud nebyla ověřena a e-mailové funkce do té doby nejsou dostupné.',
 'noemailprefs'               => 'Pro zprovoznění následujících možností musíte zadat svou e-mailovou adresu.',
 'emailconfirmlink'           => 'Podvr�te svou e-mailovou adresu',
@@ -760,18 +751,26 @@ Heslo: „$3“
 Měli byste se co nejdřív přihlásit a změnit si heslo.
 
 Pokud byl ú�et vytvořen omylem, považujte tuto zprávu za bezpředmětnou.',
+'login-throttled'            => 'Provedli jste v krátké době příliš mnoho pokusů zadat heslo k tomuto ú�tu. Po�kejte chvíli, než to zkusíte znovu.',
 'loginlanguagelabel'         => 'Jazyk: $1',
 
 # Password reset dialog
-'resetpass'               => 'Nové nastavení hesla ú�tu',
-'resetpass_announce'      => 'Přihlašujete se do�asným heslem zaslaným e-mailem. Přihlášení lze dokon�it po nastavení nového trvalého hesla.',
-'resetpass_text'          => '<!-- Sem přidejte text -->',
-'resetpass_header'        => 'Změna hesla',
-'resetpass_submit'        => 'Nastavit heslo a přihlásit se',
-'resetpass_success'       => 'Vaše heslo bylo úspěšně změněno. Probíhá přihlašování…',
-'resetpass_bad_temporary' => 'Neplatné do�asné heslo. Možná již bylo heslo úspěšně změněno nebo někdo znovu požádal o nové do�asné heslo.',
-'resetpass_forbidden'     => 'Hesla nelze změnit.',
-'resetpass_missing'       => 'Ve formuláři nejsou žádná data.',
+'resetpass'                 => 'Změna hesla',
+'resetpass_announce'        => 'Přihlašujete se do�asným heslem zaslaným e-mailem. Přihlášení lze dokon�it po nastavení nového trvalého hesla.',
+'resetpass_text'            => '<!-- Sem přidejte text -->',
+'resetpass_header'          => 'Změna hesla',
+'oldpassword'               => 'Staré heslo:',
+'newpassword'               => 'Nové heslo:',
+'retypenew'                 => 'Napište znovu nové heslo',
+'resetpass_submit'          => 'Nastavit heslo a přihlásit se',
+'resetpass_success'         => 'Vaše heslo bylo úspěšně změněno. Probíhá přihlašování…',
+'resetpass_bad_temporary'   => 'Neplatné do�asné heslo. Možná již bylo heslo úspěšně změněno nebo někdo znovu požádal o nové do�asné heslo.',
+'resetpass_forbidden'       => 'Hesla nelze změnit.',
+'resetpass-no-info'         => 'K této stránce mají přímý přístup jen přihlášení uživatelé.',
+'resetpass-submit-loggedin' => 'Změnit heslo',
+'resetpass-wrong-oldpass'   => 'Nesprávné do�asné nebo aktuální heslo.
+Možná jste si již úspěšně heslo změnili, nebo jste si vyžádali nové do�asné heslo.',
+'resetpass-temp-password'   => 'Do�asné heslo:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tu�ný text',
@@ -796,8 +795,8 @@ Pokud byl ú�et vytvořen omylem, považujte tuto zprávu za bezpředmětnou.',
 'hr_tip'          => 'Vodorovná �ára (používejte střídmě)',
 
 # Edit pages
-'summary'                          => 'Shrnutí editace',
-'subject'                          => 'Předmět/nadpis',
+'summary'                          => 'Shrnutí editace:',
+'subject'                          => 'Předmět/nadpis:',
 'minoredit'                        => 'Tato změna je malá editace.',
 'watchthis'                        => 'Sledovat tuto stránku',
 'savearticle'                      => 'Uložit změny',
@@ -809,8 +808,8 @@ Pokud byl ú�et vytvořen omylem, považujte tuto zprávu za bezpředmětnou.',
 'missingsummary'                   => "'''Připomenutí:''' Nezadali jste shrnutí editace. Pokud ještě jednou kliknete na Uložit změny, bude vaše editace zapsána bez shrnutí.",
 'missingcommenttext'               => 'Zadejte komentář',
 'missingcommentheader'             => "'''Připomenutí:''' Nezadali jste předmět/nadpis pro tento komentář. Pokud ještě jednou kliknete na Uložit změny, bude vaše editace zapsána i bez toho.",
-'summary-preview'                  => 'Náhled shrnutí',
-'subject-preview'                  => 'Náhled předmětu/nadpisu',
+'summary-preview'                  => 'Náhled shrnutí:',
+'subject-preview'                  => 'Náhled předmětu/nadpisu:',
 'blockedtitle'                     => 'Uživatel zablokován',
 'blockedtext'                      => "<big>'''Vaší IP adrese �i uživatelskému jménu byla zablokována možnost editace.'''</big>
 
@@ -858,32 +857,33 @@ Prosíme, uve�te tyto údaje při komunikaci se správci.",
 Pokud ji chcete vytvořit, napište text do ráme�ku níže a stiskněte tla�ítko ''Uložit změny''. Další rady najdete v [[{{MediaWiki:Helppage}}|nápovědě]].
 Pokud jste zde omylem, stiskněte ve svém prohlíže�i tla�ítko ''Zpět''.",
 'anontalkpagetext'                 => "----''Toto je diskusní stránka anonymního uživatele, který si dosud nevytvořil ú�et nebo ho nepoužívá. K&nbsp;jeho identifikaci proto musíme používat �íselnou IP adresu. Takovou IP adresu může sdílet několik uživatelů. Pokud jste anonymní uživatel a&nbsp;máte za to, že jsou vám adresovány irelevantní komentáře, prosíme, [[Special:UserLogin/signup|vytvořte si ú�et]] nebo [[Special:UserLogin|se přihlaste]], vyhnete se tím budoucí záměně s&nbsp;jinými anonymními uživateli.''",
-'noarticletext'                    => 'Tato stránka zatím neobsahuje žádný text, můžete [[Special:Search/{{PAGENAME}}|zkusit tento název vyhledat]] na jiných stránkách, nebo [{{fullurl:{{FULLPAGENAME}}|action=edit}} tuto stránku založit].',
+'noarticletext'                    => 'Tato stránka zatím neobsahuje žádný text.
+Můžete [[Special:Search/{{PAGENAME}}|zkusit tento název vyhledat]] na jiných stránkách, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} prohlédnout si příslušné protokolovací záznamy] nebo [{{fullurl:{{FULLPAGENAME}}|action=edit}} tuto stránku založit]</span>.',
 'userpage-userdoesnotexist'        => 'Uživatelský ú�et „$1“ není zaregistrován. Zkontrolujte zda skute�ně chcete vytvořit �i editovat tuto stránku.',
 'clearyourcache'                   => "'''Poznámka:''' Po uložení musíte smazat cache vašeho prohlíže�e, jinak změny neuvidíte: '''Mozilla / Firefox:''' ''Ctrl-Shift-R'', '''IE:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror''': ''F5''.",
-'usercssjsyoucanpreview'           => '<strong>Tip:</strong> Použijte tla�ítko „Ukázat náhled“ k testování vašeho nového CSS/JS před uložením.',
+'usercssjsyoucanpreview'           => "'''Tip:''' Použijte tla�ítko „Ukázat náhled“ k testování vašeho nového CSS/JS před uložením.",
 'usercsspreview'                   => "'''Pamatujte, že si prohlížíte jen náhled vašeho uživatelského CSS.'''
 '''Zatím nebylo uloženo!'''",
 'userjspreview'                    => "'''Pamatujte, že testujete a prohlížíte pouze náhled vašeho uživatelského JavaScriptu, dosud nebyl uložen!'''",
 'userinvalidcssjstitle'            => "'''Varování:''' Vzhled „$1“ neexistuje. Nezapomeňte, že uživatelské .css a .js soubory používají malá písmena, např. {{ns:user}}:{{BASEPAGENAME}}/monobook.css, nikoli {{ns:user}}:{{BASEPAGENAME}}/Monobook.css.",
 'updated'                          => '(Změna uložena)',
-'note'                             => '<strong>Poznámka:</strong>&nbsp;',
-'previewnote'                      => '<strong>Pamatujte, že toto je pouze náhled, změny zatím nebyly uloženy!</strong>',
+'note'                             => "'''Poznámka:'''&nbsp;",
+'previewnote'                      => "'''Pamatujte, že toto je pouze náhled, změny zatím nebyly uloženy!'''",
 'previewconflict'                  => 'Tento náhled ukazuje text tak, jak bude vypadat po uložení stránky.',
-'session_fail_preview'             => '<strong>Váš požadavek se nepodařilo zpracovat kvůli ztrátě dat z relace.
+'session_fail_preview'             => "'''Váš požadavek se nepodařilo zpracovat kvůli ztrátě dat z relace.
 Zkuste to prosím znovu.
-Pokud se tento problém bude opakovat, zkuste se [[Special:UserLogout|odhlásit]] a znovu přihlásit.</strong>',
-'session_fail_preview_html'        => "<strong>Váš požadavek se nepodařilo zpracovat kvůli ztrátě dat z relace.</strong>
+Pokud se tento problém bude opakovat, zkuste se [[Special:UserLogout|odhlásit]] a znovu přihlásit.'''",
+'session_fail_preview_html'        => "'''Váš požadavek se nepodařilo zpracovat kvůli ztrátě dat z relace.'''
 
 ''Jelikož má {{SITENAME}} zapnuto používání neomezeného HTML, náhled se kvůli prevenci proti útokům JavaScriptem nezobrazuje.''
 
-<strong>Pokud jde o zamýšlenou editaci, zkuste to prosím znovu. Pokud se tento problém bude opakovat, zkuste se [[Special:UserLogout|odhlásit]] a znovu přihlásit.</strong>",
-'token_suffix_mismatch'            => '<strong>Vaše editace byla odmítnuta, protože Váš prohlíže� komolí některé znaky v editovaném textu.
+'''Pokud jde o zamýšlenou editaci, zkuste to prosím znovu. Pokud se tento problém bude opakovat, zkuste se [[Special:UserLogout|odhlásit]] a znovu přihlásit.'''",
+'token_suffix_mismatch'            => "'''Vaše editace byla odmítnuta, protože Váš prohlíže� komolí některé znaky v editovaném textu.
 Editace byla odmítnuta, aby se zabránilo poškození textu stránky.
-Toto se může někdy stát pokud používáte chybující webový anonymizér.</strong>',
+Toto se může někdy stát pokud používáte chybující webový anonymizér.'''",
 'editing'                          => 'Editace stránky $1',
 'editingsection'                   => 'Editace stránky $1 (�ást)',
-'editingcomment'                   => 'Editace stránky $1 (komentář)',
+'editingcomment'                   => 'Editace stránky $1 (nová sekce)',
 'editconflict'                     => 'Edita�ní konflikt: $1',
 'explainconflict'                  => "Někdo změnil stránku po zapo�etí vaší editace.
 Výše vidíte aktuální text stránky.
@@ -892,20 +892,22 @@ Musíte slou�it své změny se stávajícím textem.
 '''Pouze''' výše uvedený text zůstane uchován po kliknutí na „Uložit“.",
 'yourtext'                         => 'Váš text',
 'storedversion'                    => 'Uložená verze',
-'nonunicodebrowser'                => '<strong>UPOZORNĚN�: Váš prohlíže� není schopen pracovat se znaky Unicode. Abyste mohli tuto stránku bezpe�ně editovat, je použita pomůcka: všechny znaky mimo ASCII jsou zobrazeny v hexadecimálních kódech.</strong>',
-'editingold'                       => '<strong>VAROV�N�: Nyní editujete zastaralou verzi této stránky. Když ji uložíte, všechny pozdější změny se ztratí.</strong>',
+'nonunicodebrowser'                => "'''UPOZORNĚN�: Váš prohlíže� není schopen pracovat se znaky Unicode. Abyste mohli tuto stránku bezpe�ně editovat, je použita pomůcka: všechny znaky mimo ASCII jsou zobrazeny v hexadecimálních kódech.'''",
+'editingold'                       => "'''VAROV�N�: Nyní editujete zastaralou verzi této stránky. Když ji uložíte, všechny pozdější změny se ztratí.'''",
 'yourdiff'                         => 'Rozdíly',
-'copyrightwarning'                 => 'Všechny příspěvky do {{grammar:2sg|{{SITENAME}}}} jsou zveřejňovány podle $2 (podrobnosti najdete na $1). Pokud si nepřejete, aby váš text byl nemilosrdně upravován a volně šířen, pak ho do {{grammar:2sg|{{SITENAME}}}} neukládejte.<br />
-Uložením příspěvku se zavazujete, že je vaším dílem nebo je zkopírován ze zdrojů, které nejsou chráněny autorským právem (tzv. <em>public domain</em>). <strong>Nekopírujte díla chráněná autorským právem bez dovolení!</strong>',
-'copyrightwarning2'                => 'Uvědomte si, že všechny příspěvky do {{grammar:2sg|{{SITENAME}}}} mohou být ostatními uživateli upraveny, pozměněny �i odstraněny. Pokud si nepřejete, aby váš text byl nemilosrdně upravován, pak ho do {{grammar:2sg|{{SITENAME}}}} neukládejte.<br />
-Uložením příspěvku se zavazujete, že je vaším dílem nebo je zkopírován ze zdrojů, které nejsou chráněny autorským právem (tzv. <em>public domain</em>), podrobnosti najdete na $1. <strong>Nekopírujte díla chráněná autorským právem bez dovolení!</strong>',
+'copyrightwarning'                 => "Všechny příspěvky do {{grammar:2sg|{{SITENAME}}}} jsou zveřejňovány podle $2 (podrobnosti najdete na $1). Pokud si nepřejete, aby váš text byl nemilosrdně upravován a volně šířen, pak ho do {{grammar:2sg|{{SITENAME}}}} neukládejte.<br />
+Uložením příspěvku se zavazujete, že je vaším dílem nebo je zkopírován ze zdrojů, které nejsou chráněny autorským právem (tzv. <em>public domain</em>). '''Nekopírujte díla chráněná autorským právem bez dovolení!'''",
+'copyrightwarning2'                => "Uvědomte si, že všechny příspěvky do {{grammar:2sg|{{SITENAME}}}} mohou být ostatními uživateli upraveny, pozměněny �i odstraněny. Pokud si nepřejete, aby váš text byl nemilosrdně upravován, pak ho do {{grammar:2sg|{{SITENAME}}}} neukládejte.<br />
+Uložením příspěvku se zavazujete, že je vaším dílem nebo je zkopírován ze zdrojů, které nejsou chráněny autorským právem (tzv. <em>public domain</em>), podrobnosti najdete na $1. '''Nekopírujte díla chráněná autorským právem bez dovolení!'''",
 'longpagewarning'                  => 'VAROV�N�: Tato stránka je $1 KiB dlouhá; některé prohlíže�e mohou mít problémy s editováním stran, které se blíží nebo jsou delší než 32 KiB. Prosíme, zvažte rozdělení stránky na více �ástí.',
-'longpageerror'                    => '<strong>CHYBA: Pokoušíte se uložit text o velikosti $1 KiB, při�emž dovolené maximum je $2 KiB. Vaše editace nemůže být uložena.</strong>',
-'readonlywarning'                  => 'VAROV�N�: Databáze byla uzam�ena kvůli údržbě, takže nebudete moci uložit své změny. Můžete si okopírovat text do souboru a uložit ho na později.',
-'protectedpagewarning'             => '<strong>Varování:</strong> Tato stránka byla zam�ena, takže ji mohou editovat pouze správci.',
+'longpageerror'                    => "'''CHYBA: Pokoušíte se uložit text o velikosti $1 KiB, při�emž dovolené maximum je $2 KiB. Vaše editace nemůže být uložena.'''",
+'readonlywarning'                  => "'''VAROV�N�: Databáze byla uzam�ena kvůli údržbě, takže nebudete moci uložit své změny. Můžete si okopírovat text do souboru a uložit ho na později.'''
+
+Správce serveru, který databázi zamkl, poskytl toto zdůvodnění: $1",
+'protectedpagewarning'             => "'''Varování:''' Tato stránka byla zam�ena, takže ji mohou editovat pouze správci.",
 'semiprotectedpagewarning'         => '<strong>Poznámka:</strong> Tato stránka byla zam�ena, takže ji mohou editovat pouze registrovaní uživatelé.',
 'cascadeprotectedwarning'          => "'''Varování:''' Tato stránka byla zam�ena, takže ji mohou editovat pouze správci. Je vložena na následující, kaskádním zámkem  {{PLURAL:$1|zam�enou, stránku|zam�ené, stránky|zam�ené, stránky}}:",
-'titleprotectedwarning'            => '<strong>POZOR:  Tento název byl uzam�en, pouze někteří uživatelé zde mohou založit stránku.</strong>',
+'titleprotectedwarning'            => "'''VAROV�N�: Tato stránka byla uzam�ena, takže k jejímu založení jsou potřeba [[Special:ListGroupRights|zvláštní oprávnění]].'''",
 'templatesused'                    => 'Šablony používané na této stránce:',
 'templatesusedpreview'             => 'Šablony používané v tomto náhledu:',
 'templatesusedsection'             => 'Šablony používané v této �ásti stránky:',
@@ -924,11 +926,20 @@ Můžete se vrátit a editovat již existující stránku, nebo [[Special:UserLo
 
 Ujistěte se, že je vhodné pokra�ovat v editaci stránky.
 Níže vidíte výpis z knihy smazaných stránek pro tuto stránku:",
+'deleted-notice'                   => 'Tato stránka byla smazána.
+Podrobnosti lze zjistit z níže uvedeného výpisu knihy smazaných stránek.',
+'deletelog-fulllog'                => 'Celá kniha smazaných stránek',
+'edit-hook-aborted'                => 'Editace byla zrušena přípojným bodem bez bližšího vysvětlení.',
+'edit-gone-missing'                => 'Stránku se nepodařilo aktualizovat.
+Zřejmě byla smazána.',
+'edit-conflict'                    => 'Edita�ní konflikt.',
+'edit-no-change'                   => 'Vaše editace byla ignorována, protože nedošlo k žádné změně textu.',
+'edit-already-exists'              => 'Nepodařilo se vytvořit novou stránku, protože již existuje.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Varování: Tato stránka obsahuje příliš mnoho volání výkonnostně náro�ných funkcí parseru.
 
-Je jich $1. Mělo by jich být méně než $2.',
+Povolený limit je $2, v sou�asné chvíli však {{PLURAL:$1|zde jedno volání je|zde jsou $2 volání|zde je $2 volání}}.',
 'expensive-parserfunction-category'       => 'Stránky s příliš vysokým po�tem volání funkcí parseru.',
 'post-expand-template-inclusion-warning'  => 'Varování: Objem vkládaných šablon je příliš velký.
 Některé šablony nebudou vloženy.',
@@ -936,6 +947,8 @@ Některé šablony nebudou vloženy.',
 'post-expand-template-argument-warning'   => 'Varování: Tato stránka obsahuje alespoň jeden argument šablony, který je po rozbalení příliš velký.
 Tyto argumenty byly vynechány.',
 'post-expand-template-argument-category'  => 'Stránky obsahující vynechané argumenty šablon',
+'parser-template-loop-warning'            => 'Nalezena smy�ka šablon: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Překro�en limit hloubky rekurzivního vkládání šablon ($1)',
 
 # "Undo" feature
 'undo-success' => 'Editace může být zrušena. Zkontrolujte a pak potvr�te změny zobrazené níže.',
@@ -950,27 +963,27 @@ Tyto argumenty byly vynechány.',
 $3 uvádí toto zdůvodnění: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Zobrazit protokolovací záznamy k této stránce',
-'nohistory'           => 'O této stránce neexistuje historie editací.',
-'revnotfound'         => 'Verze nenalezena',
-'revnotfoundtext'     => 'Nelze najít starou verzi, kterou žádáte. Zkuste prosím zkontrolovat URL hledané stránky.',
-'currentrev'          => 'Aktuální verze',
-'revisionasof'        => 'Verze z $1',
-'revision-info'       => 'Verze z $1; $2',
-'previousrevision'    => '� Starší verze',
-'nextrevision'        => 'Novější verze →',
-'currentrevisionlink' => 'zobrazit aktuální verzi',
-'cur'                 => 'te�',
-'next'                => 'násl',
-'last'                => 'předchozí',
-'page_first'          => 'první',
-'page_last'           => 'poslední',
-'histlegend'          => '(te�) = rozdíly oproti nynější verzi, (předchozí) = rozdíly oproti předchozí verzi, <b>m</b> = malá editace',
-'deletedrev'          => '[smazáno]',
-'histfirst'           => 'Nejstarší',
-'histlast'            => 'Nejnovější',
-'historysize'         => '({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtů}})',
-'historyempty'        => '(prázdné)',
+'viewpagelogs'           => 'Zobrazit protokolovací záznamy k této stránce',
+'nohistory'              => 'O této stránce neexistuje historie editací.',
+'currentrev'             => 'Aktuální verze',
+'currentrev-asof'        => 'Aktuální verze z $1',
+'revisionasof'           => 'Verze z $1',
+'revision-info'          => 'Verze z $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Starší verze',
+'nextrevision'           => 'Novější verze →',
+'currentrevisionlink'    => 'zobrazit aktuální verzi',
+'cur'                    => 'te�',
+'next'                   => 'násl',
+'last'                   => 'předchozí',
+'page_first'             => 'první',
+'page_last'              => 'poslední',
+'histlegend'             => '(te�) = rozdíly oproti nynější verzi, (předchozí) = rozdíly oproti předchozí verzi, <b>m</b> = malá editace',
+'history-fieldset-title' => 'Procházení historie',
+'deletedrev'             => '[smazáno]',
+'histfirst'              => 'Nejstarší',
+'histlast'               => 'Nejnovější',
+'historysize'            => '({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtů}})',
+'historyempty'           => '(prázdné)',
 
 # Revision feed
 'history-feed-title'          => 'Historie editací',
@@ -997,7 +1010,7 @@ podrobnosti o smazání mohou být uvedeny v [{{fullurl:Special:Log/delete|page=
 'revisiondelete'              => 'Smazat/obnovit revize',
 'revdelete-nooldid-title'     => 'Nezadána revize',
 'revdelete-nooldid-text'      => 'Nezvolili jste revize, na které chcete tuto funkci použít.',
-'revdelete-selected'          => "'''{{PLURAL:$2|Vybrána $1 revize|Vybrány $1 revize|Vybráno $1 revizí}} stránky '''[[:$1]]:''''''",
+'revdelete-selected'          => "'''{{PLURAL:$2|Vybraná|Vybrané}} revize stránky [[:$1]]:'''",
 'logdelete-selected'          => "'''{{PLURAL:$1|Vybraná protokolovaná událost|Vybrané protokolované události}}:'''",
 'revdelete-text'              => "'''Smazané verze a události budou nadále zobrazeny v historii stránky a protokolovacích záznamech, ale jejich text nebude veřejně dostupný.'''
 
@@ -1007,7 +1020,7 @@ pokud to provozovatel serveru nezakázal.",
 'revdelete-hide-text'         => 'Skrýt text revize',
 'revdelete-hide-name'         => 'Skrýt událost a cíl',
 'revdelete-hide-comment'      => 'Skrýt edita�ní komentář',
-'revdelete-hide-user'         => 'Skrýt uživatelovu IP adresu',
+'revdelete-hide-user'         => 'Skrýt uživatelské jméno/IP adresu',
 'revdelete-hide-restricted'   => 'Tato omezení aplikovat i na správce',
 'revdelete-suppress'          => 'Skrýt data i před správci',
 'revdelete-hide-image'        => 'Skrýt obsah souboru',
@@ -1055,6 +1068,7 @@ Ujistěte se, že tato změna udrží souvislost a posloupnost verzí v historii
 'mergehistory-invalid-destination' => 'Cílová stránka musí mít platný název.',
 'mergehistory-autocomment'         => 'Slou�ena stránka [[:$1]] do stránky [[:$2]]',
 'mergehistory-comment'             => 'Slou�ena stránka [[:$1]] do stránky [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Zdrojová a cílová stránka se nemůžou shodovat',
 
 # Merge log
 'mergelog'           => 'Kniha slu�ování',
@@ -1067,119 +1081,201 @@ Ujistěte se, že tato změna udrží souvislost a posloupnost verzí v historii
 'difference'              => '(Rozdíly mezi verzemi)',
 'lineno'                  => 'Řádka $1:',
 'compareselectedversions' => 'Porovnat vybrané verze',
+'visualcomparison'        => 'Porovnání vzhledu',
+'wikicodecomparison'      => 'Porovnání wikitextu',
 'editundo'                => 'zrušit editaci',
 'diff-multi'              => '({{PLURAL:$1|Není zobrazena jedna mezilehlá verze|Nejsou zobrazeny $1 mezilehlé verze|Není zobrazeno $1 mezilehlých verzí}}.)',
+'diff-movedto'            => 'změněno na $1',
+'diff-styleadded'         => 'přidán styl $1',
+'diff-added'              => 'přidáno $1',
+'diff-changedto'          => 'změněno na $1',
+'diff-movedoutof'         => 'změněno z $1',
+'diff-styleremoved'       => 'odstraněn styl $1',
+'diff-removed'            => 'odstraněno $1',
+'diff-changedfrom'        => 'změněno z $1',
+'diff-src'                => 'zdroj',
+'diff-withdestination'    => 'směřující na $1',
+'diff-with'               => '&#32;s atributy $1 $2',
+'diff-with-final'         => '&#32;a $1 $2',
+'diff-width'              => 'šířka',
+'diff-height'             => 'výška',
+'diff-p'                  => "'''odstavec'''",
+'diff-blockquote'         => "'''bloková citace'''",
+'diff-h1'                 => "'''nadpis (1. úroveň)'''",
+'diff-h2'                 => "'''nadpis (2. úroveň)'''",
+'diff-h3'                 => "'''nadpis (3. úroveň)'''",
+'diff-h4'                 => "'''nadpis (4. úroveň)'''",
+'diff-h5'                 => "'''nadpis (5. úroveň)'''",
+'diff-pre'                => "'''předformátovaný text'''",
+'diff-div'                => "'''blokový element'''",
+'diff-ul'                 => "'''ne�íslovaný seznam'''",
+'diff-ol'                 => "'''�íslovaný seznam'''",
+'diff-li'                 => "'''položka seznamu'''",
+'diff-table'              => "'''tabulka'''",
+'diff-tbody'              => "'''tělo tabulky'''",
+'diff-tr'                 => "'''řádek'''",
+'diff-td'                 => "'''buňka'''",
+'diff-th'                 => "'''hlavi�ka'''",
+'diff-br'                 => "'''zalomení'''",
+'diff-hr'                 => "'''vodorovná �ára'''",
+'diff-code'               => "'''blok zdrojového textu'''",
+'diff-dl'                 => "'''seznam definic'''",
+'diff-dt'                 => "'''definovaný pojem'''",
+'diff-dd'                 => "'''definice'''",
+'diff-input'              => "'''vstupní pole'''",
+'diff-form'               => "'''formulář'''",
+'diff-img'                => "'''obrázek'''",
+'diff-span'               => "'''řádkový element'''",
+'diff-a'                  => "'''odkaz'''",
+'diff-i'                  => "'''kurzíva'''",
+'diff-b'                  => "'''ztu�nění'''",
+'diff-strong'             => "'''zvýraznění zesílením'''",
+'diff-em'                 => "'''zvýraznění náklonem'''",
+'diff-font'               => "'''písmo'''",
+'diff-big'                => "'''zvětšení'''",
+'diff-del'                => "'''smazané'''",
+'diff-tt'                 => "'''pevná šířka'''",
+'diff-sub'                => "'''dolní index'''",
+'diff-sup'                => "'''horní index'''",
+'diff-strike'             => "'''přeškrtnutí'''",
 
 # Search results
-'searchresults'             => 'Výsledky hledání',
-'searchresulttext'          => 'Pro více informací o tom, jak hledat na {{grammar:6sg|{{SITENAME}}}}, se podívejte do [[{{MediaWiki:Helppage}}|nápovědy]].',
-'searchsubtitle'            => 'Hledáno „[[:$1]]“',
-'searchsubtitleinvalid'     => 'Hledáno „$1“',
-'noexactmatch'              => "'''Neexistuje žádná stránka s názvem \"\$1\".''' Můžete ji však [[:\$1|vytvořit]].",
-'noexactmatch-nocreate'     => "'''Neexistuje žádná stránka s názvem „$1“.'''",
-'toomanymatches'            => 'Požadavku odpovídá příliš mnoho záznamů, zkuste jiný dotaz.',
-'titlematches'              => 'Stránky s odpovídajícím názvem',
-'notitlematches'            => 'Žádné stránky názvem neodpovídají.',
-'textmatches'               => 'Stránky s odpovídajícím textem',
-'notextmatches'             => 'Žádné stránky textem neodpovídají.',
-'prevn'                     => '$1 předchozích',
-'nextn'                     => '$1 následujících',
-'viewprevnext'              => 'Ukázat ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 slovo|$2 slova|$2 slov}})',
-'search-result-score'       => 'Relevantnost: $1 %',
-'search-redirect'           => '(přesměrování $1)',
-'search-section'            => '(�ást $1)',
-'search-suggest'            => 'Mysleli jste: $1',
-'search-interwiki-caption'  => 'Sesterské projekty',
-'search-interwiki-default'  => 'Výsledky z $1:',
-'search-interwiki-more'     => '(více)',
-'search-mwsuggest-enabled'  => 's návrhy',
-'search-mwsuggest-disabled' => 'bez návrhů',
-'search-relatedarticle'     => 'Související',
-'mwsuggest-disable'         => 'Vypnout ajaxové napovídání',
-'searchrelated'             => 'související',
-'searchall'                 => 'vše',
-'showingresults'            => 'Zobrazuji <strong>$1</strong> {{PLURAL:$1|výsledek|výsledky|výsledků}} po�ínaje od <strong>$2</strong>.',
-'showingresultsnum'         => 'Zobrazuji <strong>$3</strong> {{PLURAL:$3|výsledek|výsledky|výsledků}} po�ínaje od <strong>$2</strong>.',
-'showingresultstotal'       => "{{PLURAL:$3|Zobrazuje se výsledek '''$1''' z&nbsp;'''$3'''|Zobrazují se výsledky '''$1–$2''' z&nbsp;'''$3'''}}",
-'nonefound'                 => '<strong>Poznámka</strong>: neúspěšná hledání jsou �asto důsledkem zadání slov, která nejsou indexována, nebo uvedením mnoha slov najednou (ve výsledku se objeví jen ty stránky, které obsahují všechna zadaná slova).',
-'powersearch'               => 'Hledání',
-'powersearch-legend'        => 'Rozšířené vyhledávání',
-'powersearch-ns'            => 'Hledat ve jmenných prostorech:',
-'powersearch-redir'         => 'Vypsat přesměrování',
-'powersearch-field'         => 'Vyhledat',
-'search-external'           => 'Externí hledání',
-'searchdisabled'            => '<p>Omlouváme se. Plnotextové vyhledávání je do�asně nedostupné. Zatím můžete zkusit vyhledávání Googlem; je ale možné, že jeho výsledky nemusí být aktuální.</p>',
+'searchresults'                    => 'Výsledky hledání',
+'searchresults-title'              => 'Výsledky hledání „$1“',
+'searchresulttext'                 => 'Pro více informací o tom, jak hledat na {{grammar:6sg|{{SITENAME}}}}, se podívejte do [[{{MediaWiki:Helppage}}|nápovědy]].',
+'searchsubtitle'                   => "Hledáno '''[[:$1]]''' ([[Special:Prefixindex/$1|seznam stránek za�ínajících „$1“]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|seznam stránek odkazujících na „$1“]])",
+'searchsubtitleinvalid'            => 'Hledáno „$1“',
+'noexactmatch'                     => "'''Neexistuje žádná stránka s názvem „$1“.''' Můžete ji však [[:$1|vytvořit]].",
+'noexactmatch-nocreate'            => "'''Neexistuje žádná stránka s názvem „$1“.'''",
+'toomanymatches'                   => 'Požadavku odpovídá příliš mnoho záznamů, zkuste jiný dotaz.',
+'titlematches'                     => 'Stránky s odpovídajícím názvem',
+'notitlematches'                   => 'Žádné stránky názvem neodpovídají.',
+'textmatches'                      => 'Stránky s odpovídajícím textem',
+'notextmatches'                    => 'Žádné stránky textem neodpovídají.',
+'prevn'                            => '$1 předchozích',
+'nextn'                            => '$1 následujících',
+'viewprevnext'                     => 'Ukázat ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Možnosti hledání',
+'searchmenu-exists'                => "*Stránka '''[[$1]]'''",
+'searchmenu-new'                   => "'''Vytvořte na této wiki stránku „[[:$1]]�!'''",
+'searchhelp-url'                   => 'Help:Obsah',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Zobrazit stránky, jejichž název za�íná „$1“]]',
+'searchprofile-articles'           => 'Články',
+'searchprofile-articles-and-proj'  => 'Obsahové i projektové stránky',
+'searchprofile-project'            => 'Projektové stránky',
+'searchprofile-images'             => 'Soubory',
+'searchprofile-everything'         => 'VÅ¡echno',
+'searchprofile-advanced'           => 'Pokro�ilé',
+'searchprofile-articles-tooltip'   => 'Prohledávat: $1',
+'searchprofile-project-tooltip'    => 'Prohledávat: $1',
+'searchprofile-images-tooltip'     => 'Hledat obrázky a další soubory',
+'searchprofile-everything-tooltip' => 'Prohledávat veškerý obsah (v�etně diskusních stránek)',
+'searchprofile-advanced-tooltip'   => 'Nastavit jmenné prostory, ve kterých se má hledat',
+'prefs-search-nsdefault'           => 'Používat implicitní nastavení:',
+'prefs-search-nscustom'            => 'Prohledávat tyto jmenné prostory:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 slovo|$2 slova|$2 slov}})',
+'search-result-score'              => 'Relevantnost: $1 %',
+'search-redirect'                  => '(přesměrování $1)',
+'search-section'                   => '(�ást $1)',
+'search-suggest'                   => 'Mysleli jste: $1',
+'search-interwiki-caption'         => 'Sesterské projekty',
+'search-interwiki-default'         => 'Výsledky z $1:',
+'search-interwiki-more'            => '(více)',
+'search-mwsuggest-enabled'         => 's návrhy',
+'search-mwsuggest-disabled'        => 'bez návrhů',
+'search-relatedarticle'            => 'Související',
+'mwsuggest-disable'                => 'Vypnout ajaxové napovídání',
+'searchrelated'                    => 'související',
+'searchall'                        => 'vše',
+'showingresults'                   => 'Zobrazuji <strong>$1</strong> {{PLURAL:$1|výsledek|výsledky|výsledků}} po�ínaje od <strong>$2</strong>.',
+'showingresultsnum'                => 'Zobrazuji <strong>$3</strong> {{PLURAL:$3|výsledek|výsledky|výsledků}} po�ínaje od <strong>$2</strong>.',
+'showingresultstotal'              => "{{PLURAL:$4|Zobrazuje se výsledek '''$1''' z&nbsp;'''$3'''|Zobrazují se výsledky '''$1–$2''' z&nbsp;'''$3'''}}",
+'nonefound'                        => "'''Poznámka''': Standardně se hledá jen v některých jmenných prostorech.
+Pokud na za�átek dotazu přidáte ''all:'', bude se hledat všude (v�etně diskusí, šablon atd.), případně místo toho napište název požadovaného jmenného prostoru.",
+'search-nonefound'                 => 'Na váš dotaz nebyly nalezeny žádné výsledky.',
+'powersearch'                      => 'Hledání',
+'powersearch-legend'               => 'Rozšířené vyhledávání',
+'powersearch-ns'                   => 'Hledat ve jmenných prostorech:',
+'powersearch-redir'                => 'Vypsat přesměrování',
+'powersearch-field'                => 'Vyhledat',
+'search-external'                  => 'Externí hledání',
+'searchdisabled'                   => '<p>Omlouváme se. Plnotextové vyhledávání je do�asně nedostupné. Zatím můžete zkusit vyhledávání Googlem; je ale možné, že jeho výsledky nemusí být aktuální.</p>',
 
 # Preferences page
-'preferences'              => 'Nastavení',
-'mypreferences'            => 'Nastavení',
-'prefs-edits'              => 'Po�et editací:',
-'prefsnologin'             => 'Nejste přihlášen(a)!',
-'prefsnologintext'         => 'Pokud chcete měnit uživatelská nastavení, musíte se <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} přihlásit]</span>.',
-'prefsreset'               => 'Nastavení vráceno.',
-'qbsettings'               => 'Nastavení lišty nástrojů',
-'qbsettings-none'          => 'Žádný',
-'qbsettings-fixedleft'     => 'Leží vlevo',
-'qbsettings-fixedright'    => 'Leží vpravo',
-'qbsettings-floatingleft'  => 'Plovoucí vlevo',
-'qbsettings-floatingright' => 'Plovoucí vpravo',
-'changepassword'           => 'Změna hesla',
-'skin'                     => 'Vzhled',
-'math'                     => 'Matematika',
-'dateformat'               => 'Formát data',
-'datedefault'              => 'Implicitní',
-'datetime'                 => 'Datum a �as',
-'math_failure'             => 'Nelze pochopit',
-'math_unknown_error'       => 'neznámá chyba',
-'math_unknown_function'    => 'neznámá funkce',
-'math_lexing_error'        => 'chyba při lexingu',
-'math_syntax_error'        => 'syntaktická chyba',
-'math_image_error'         => 'Selhala konverze do PNG; zkontrolujte správnou instalaci latexu, dvips, gs a convertu',
-'math_bad_tmpdir'          => 'Nelze zapsat nebo vytvořit do�asný adresář pro matematiku',
-'math_bad_output'          => 'Nelze zapsat nebo vytvořit adresář pro výstup matematiky',
-'math_notexvc'             => 'Chybí spustitelný texvc; podívejte se prosím do math/README na konfiguraci.',
-'prefs-personal'           => 'Údaje o uživateli',
-'prefs-rc'                 => 'Poslední změny',
-'prefs-watchlist'          => 'Sledované stránky',
-'prefs-watchlist-days'     => 'Po�et dní zobrazených ve sledovaných stránkách:',
-'prefs-watchlist-edits'    => 'Po�et editací zobrazených na zdokonalených sledovaných stránkách:',
-'prefs-misc'               => 'Různé',
-'saveprefs'                => 'Uložit nastavení',
-'resetprefs'               => 'Vrátit původní nastavení',
-'oldpassword'              => 'Staré heslo:',
-'newpassword'              => 'Nové heslo:',
-'retypenew'                => 'Napište znovu nové heslo',
-'textboxsize'              => 'Editace',
-'rows'                     => 'Řádky',
-'columns'                  => 'Sloupce',
-'searchresultshead'        => 'Vyhledávání',
-'resultsperpage'           => 'Po�et výsledků na jedné stránce',
-'contextlines'             => 'Po�et řádek zobrazených z každé nalezené stránky',
-'contextchars'             => 'Po�et znaků kontextu na každé řádce',
-'stub-threshold'           => 'Limit pro formátování odkazu jako <a href="#" class="stub">pahýl</a> (v bajtech):',
-'recentchangesdays'        => 'Po�et dní zobrazených v posledních změnách:',
-'recentchangescount'       => 'Po�et zobrazených záznamů v posledních změnách, historii a knihách záznamů:',
-'savedprefs'               => 'Vaše nastavení bylo uloženo.',
-'timezonelegend'           => 'Časové pásmo',
-'timezonetext'             => '¹O kolik se váš místní �as liší od �asu na serveru (UTC).',
-'localtime'                => 'Místní �asové pásmo',
-'timezoneoffset'           => 'Posun',
-'servertime'               => 'Aktuální �as na serveru',
-'guesstimezone'            => 'Na�íst z prohlíže�e',
-'allowemail'               => 'Povolit e-mail od ostatních uživatelů',
-'prefs-searchoptions'      => 'Možnosti vyhledávání',
-'prefs-namespaces'         => 'Jmenné prostory',
-'defaultns'                => 'Implicitně hledat v těchto jmenných prostorech:',
-'default'                  => 'implicitní',
-'files'                    => 'Soubory',
+'preferences'               => 'Nastavení',
+'mypreferences'             => 'Nastavení',
+'prefs-edits'               => 'Po�et editací:',
+'prefsnologin'              => 'Nejste přihlášen(a)!',
+'prefsnologintext'          => 'Pokud chcete měnit uživatelská nastavení, musíte se <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} přihlásit]</span>.',
+'prefsreset'                => 'Nastavení vráceno.',
+'qbsettings'                => 'Nastavení lišty nástrojů',
+'qbsettings-none'           => 'Žádný',
+'qbsettings-fixedleft'      => 'Leží vlevo',
+'qbsettings-fixedright'     => 'Leží vpravo',
+'qbsettings-floatingleft'   => 'Plovoucí vlevo',
+'qbsettings-floatingright'  => 'Plovoucí vpravo',
+'changepassword'            => 'Změna hesla',
+'skin'                      => 'Vzhled',
+'skin-preview'              => 'Náhled',
+'math'                      => 'Matematika',
+'dateformat'                => 'Formát data',
+'datedefault'               => 'Implicitní',
+'datetime'                  => 'Datum a �as',
+'math_failure'              => 'Nelze pochopit',
+'math_unknown_error'        => 'neznámá chyba',
+'math_unknown_function'     => 'neznámá funkce',
+'math_lexing_error'         => 'chyba při lexingu',
+'math_syntax_error'         => 'syntaktická chyba',
+'math_image_error'          => 'Selhala konverze do PNG; zkontrolujte správnou instalaci latexu, dvips, gs a convertu',
+'math_bad_tmpdir'           => 'Nelze zapsat nebo vytvořit do�asný adresář pro matematiku',
+'math_bad_output'           => 'Nelze zapsat nebo vytvořit adresář pro výstup matematiky',
+'math_notexvc'              => 'Chybí spustitelný texvc; podívejte se prosím do math/README na konfiguraci.',
+'prefs-personal'            => 'Údaje o uživateli',
+'prefs-rc'                  => 'Poslední změny',
+'prefs-watchlist'           => 'Sledované stránky',
+'prefs-watchlist-days'      => 'Po�et dní zobrazených ve sledovaných stránkách:',
+'prefs-watchlist-days-max'  => '(maximálně 7 dní)',
+'prefs-watchlist-edits'     => 'Po�et editací zobrazených na zdokonalených sledovaných stránkách:',
+'prefs-watchlist-edits-max' => '(maximum: 1000)',
+'prefs-misc'                => 'Různé',
+'prefs-resetpass'           => 'Změnit heslo',
+'saveprefs'                 => 'Uložit nastavení',
+'resetprefs'                => 'Vrátit původní nastavení',
+'textboxsize'               => 'Editace',
+'prefs-edit-boxsize'        => 'Velikost edita�ního okna:',
+'rows'                      => 'Řádky',
+'columns'                   => 'Sloupce',
+'searchresultshead'         => 'Vyhledávání',
+'resultsperpage'            => 'Po�et výsledků na jedné stránce',
+'contextlines'              => 'Po�et řádek zobrazených z každé nalezené stránky',
+'contextchars'              => 'Po�et znaků kontextu na každé řádce',
+'stub-threshold'            => 'Limit pro formátování odkazu jako <a href="#" class="stub">pahýl</a> (v bajtech):',
+'recentchangesdays'         => 'Po�et dní zobrazených v posledních změnách:',
+'recentchangesdays-max'     => '(maximálně $1 {{PLURAL:$1|den|dny|dní}})',
+'recentchangescount'        => 'Po�et záznamů implicitně zobrazených v posledních změnách, historii a knihách záznamů:',
+'savedprefs'                => 'Vaše nastavení bylo uloženo.',
+'timezonelegend'            => 'Časové pásmo',
+'timezonetext'              => '¹O kolik se váš místní �as liší od �asu na serveru (UTC).',
+'localtime'                 => 'Místní �as:',
+'timezoneselect'            => 'Časové pásmo:',
+'timezoneuseserverdefault'  => 'Použít nastavení serveru',
+'timezoneuseoffset'         => 'Jiné (zadejte posun)',
+'timezoneoffset'            => 'Posun¹:',
+'servertime'                => 'ÄŒas na serveru:',
+'guesstimezone'             => 'Na�íst z prohlíže�e',
+'allowemail'                => 'Povolit e-mail od ostatních uživatelů',
+'prefs-searchoptions'       => 'Možnosti vyhledávání',
+'prefs-namespaces'          => 'Jmenné prostory',
+'defaultns'                 => 'Implicitně hledat v těchto jmenných prostorech:',
+'default'                   => 'implicitní',
+'files'                     => 'Soubory',
 
 # User rights
 'userrights'                  => 'Správa uživatelských skupin', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Spravovat uživatelské skupiny',
 'userrights-user-editname'    => 'Zadejte uživatelské jméno:',
 'editusergroup'               => 'Upravit uživatelské skupiny',
-'editinguser'                 => "Úprava práv uživatele '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Úprava práv uživatele '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Upravit uživatelské skupiny',
 'saveusergroups'              => 'Uložit uživatelské skupiny',
 'userrights-groupsmember'     => 'ÄŒlen skupin:',
@@ -1228,6 +1324,8 @@ Ujistěte se, že tato změna udrží souvislost a posloupnost verzí v historii
 'right-minoredit'            => 'Ozna�ování editací jako malé',
 'right-move'                 => 'Přesun stránek',
 'right-move-subpages'        => 'Přesunování stránek i s jejich podstránkami',
+'right-move-rootuserpages'   => 'Přesouvání kořenových uživatelských stránek',
+'right-movefile'             => 'Přesouvání souborů',
 'right-suppressredirect'     => 'Nevytváření přesměrování po přesunu stránky',
 'right-upload'               => 'Nahrávání souborů',
 'right-reupload'             => 'Přepisování existujících souborů',
@@ -1278,9 +1376,46 @@ Ujistěte se, že tato změna udrží souvislost a posloupnost verzí v historii
 'rightslogentry' => 'změnil pro $1 zařazení ve skupinách z $2 na $3',
 'rightsnone'     => '(žádné)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'pře�íst tuto stránku',
+'action-edit'                 => 'upravit tuto stránku',
+'action-createpage'           => 'vytvářet stránky',
+'action-createtalk'           => 'vytvářet diskusní stránky',
+'action-createaccount'        => 'vytvořit tento uživatelský ú�et',
+'action-minoredit'            => 'ozna�it tuto editaci jako malou',
+'action-move'                 => 'přesunout tuto stránku',
+'action-move-subpages'        => 'přesunout tuto stránku a její podstránky',
+'action-move-rootuserpages'   => 'přesouvat kořenové uživatelské stránky',
+'action-movefile'             => 'přesunout tento soubor',
+'action-upload'               => 'nahrát tento soubor',
+'action-reupload'             => 'přepsat tento existující soubor',
+'action-reupload-shared'      => 'upřednostnit tento soubor před souborem ze sdíleného úložiště',
+'action-upload_by_url'        => 'nahrát tento soubor z URL adresy',
+'action-writeapi'             => 'používat API pro zápis',
+'action-delete'               => 'smazat tuto stránku',
+'action-deleterevision'       => 'smazat tuto revizi',
+'action-deletedhistory'       => 'zobrazit historii smazaných revizí této stránky',
+'action-browsearchive'        => 'hledat smazané stránky',
+'action-undelete'             => 'obnovit tuto stránku',
+'action-suppressrevision'     => 'zkontrolovat a obnovit tuto skrytou revizi',
+'action-suppressionlog'       => 'zobrazit tento soukromý záznam',
+'action-block'                => 'znemožnit tomuto uživateli editování',
+'action-protect'              => 'změnit úrovně ochrany této stránky',
+'action-import'               => 'importovat tuto stránku z jiné wiki',
+'action-importupload'         => 'importovat tuto stránku z nahraného souboru',
+'action-patrol'               => 'ozna�it úpravy ostatních jako zhlédnuté',
+'action-autopatrol'           => 'ozna�it vlastní úpravy jako zhlédnuté',
+'action-unwatchedpages'       => 'zobrazit seznam nesledovaných stránek',
+'action-trackback'            => 'poslat trackback',
+'action-mergehistory'         => 'slou�it historii této stránky',
+'action-userrights'           => 'upravovat práva všech uživatelů',
+'action-userrights-interwiki' => 'upravovat práva uživatelů na jiných wiki',
+'action-siteadmin'            => 'zamykat nebo odemykat databázi',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|změna|změny|změn}}',
 'recentchanges'                     => 'Poslední změny',
+'recentchanges-legend'              => 'Možnosti posledních změn',
 'recentchangestext'                 => 'Sledujte poslední změny na {{grammar:6sg|{{SITENAME}}}} na této stránce.',
 'recentchanges-feed-description'    => 'Na tomto kanále sledujte poslední změny na {{grammar:6sg|{{SITENAME}}}}.',
 'rcnote'                            => 'Níže {{plural:$1|je poslední|jsou poslední|je posledních}} <strong>$1</strong> {{plural:$1|změna|změny|změn}} za {{PLURAL:$2|poslední|poslední|posledních}} <strong>$2</strong> {{plural:$2|den|dny|dnů}} před $4, $5.',
@@ -1305,6 +1440,8 @@ $3',
 'rc_categories'                     => 'Omezit na kategorie (oddělené „|“)',
 'rc_categories_any'                 => 'VÅ¡echny',
 'newsectionsummary'                 => 'Nová sekce /* $1 */',
+'rc-enhanced-expand'                => 'Zobrazit detaily (vyžaduje JavaScript)',
+'rc-enhanced-hide'                  => 'Skrýt detaily',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Související změny',
@@ -1324,11 +1461,11 @@ $3',
 'upload_directory_missing'    => 'Adresář pro nahrávání souborů ($1) chybí a webový server ho nedokáže vytvořit.',
 'upload_directory_read_only'  => 'Do adresáře pro na�ítané soubory ($1) nemá webserver právo zápisu.',
 'uploaderror'                 => 'Při na�ítání došlo k chybě',
-'uploadtext'                  => "Níže uvedený formulář slouží k na�tení souborů. Již na�tené soubory si můžete prohlížet a hledat pomocí [[Special:ImageList|seznamu na�tených souborů]], každé na�tení se také zaznamenává do [[Special:Log/upload|knihy na�tení]], smazání jsou v [[Special:Log/delete|knize smazaných stránek]].
+'uploadtext'                  => "Níže uvedený formulář slouží k na�tení souborů. Již na�tené soubory si můžete prohlížet a hledat pomocí [[Special:FileList|seznamu na�tených souborů]], každé na�tení se také zaznamenává do [[Special:Log/upload|knihy na�tení]], smazání jsou v [[Special:Log/delete|knize smazaných stránek]].
 
 Pro vložení obrázku do stránky použijte jeden z následujících způsobů zápisu:
-* '''<code><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Soubor.jpg]]</nowiki></code>''' do stránky vloží celý obrázek,
-* '''<code><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Soubor.png|thumb|left|Popisek]]</nowiki></code>''' vloží náhled v ráme�ku zarovnaném na levý okraj, s popiskem „Popisek“,
+* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Soubor.jpg]]</nowiki></code>''' do stránky vloží celý obrázek,
+* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Soubor.png|thumb|left|Popisek]]</nowiki></code>''' vloží náhled v ráme�ku zarovnaném na levý okraj, s popiskem „Popisek“,
 * '''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Soubor.ogg]]</nowiki></code>''' vloží přímý odkaz na soubor, aniž by se zobrazoval ve stránce.",
 'upload-permitted'            => 'Povolené formáty souborů: $1.',
 'upload-preferred'            => 'Upřednostňované formáty souborů: $1.',
@@ -1355,21 +1492,24 @@ Pro vložení obrázku do stránky použijte jeden z následujících způsobů
 'large-file'                  => 'Doporu�uje se, aby délka souboru nepřesahovala $1, tento soubor má $2.',
 'largefileserver'             => 'Velikost tohoto souboru překra�uje limit nastavený na serveru.',
 'emptyfile'                   => 'Soubor, který jste vložili, se zdá být prázdný. Mohl to způsobit překlep v názvu souboru. Prosím zkontrolujte, zda jste opravdu chtěli vložit tento soubor.',
-'fileexists'                  => 'Soubor s tímto jménem již existuje, prosím podívejte se na <strong><tt>$1</tt></strong>, pokud nevíte jistě, zda chcete tento soubor nahradit.',
-'filepageexists'              => 'Popisná stránka pro soubor s tímto jménem již existuje na <strong><tt>$1</tt></strong>, avšak soubor s tímto jménem dosud neexistuje. Shrnutí, které zde uvedete, se na popisné stránce nezobrazí. Budete muset příslušnou stránku editovat ru�ně.',
-'fileexists-extension'        => 'Již existuje soubor s podobným jménem:<br />
-Jméno na�ítaného souboru: <strong><tt>$1</tt></strong><br />
-Jméno existujícího souboru: <strong><tt>$2</tt></strong><br />
-Vyberte jiné jméno.',
+'fileexists'                  => "Soubor s tímto jménem již existuje, prosím podívejte se na '''<tt>$1</tt>''', pokud nevíte jistě, zda chcete tento soubor nahradit.",
+'filepageexists'              => "Popisná stránka pro soubor s tímto jménem již existuje na '''<tt>$1</tt>''', avšak soubor s tímto jménem dosud neexistuje. Shrnutí, které zde uvedete, se na popisné stránce nezobrazí. Budete muset příslušnou stránku editovat ru�ně.",
+'fileexists-extension'        => "Již existuje soubor s podobným jménem:<br />
+Jméno na�ítaného souboru: '''<tt>$1</tt>'''<br />
+Jméno existujícího souboru: '''<tt>$2</tt>'''<br />
+Vyberte jiné jméno.",
 'fileexists-thumb'            => "<center>'''Existující soubor:'''</center>",
-'fileexists-thumbnail-yes'    => 'Toto soubor je možná obrázek ve zmenšené velikosti <i>(náhled)</i>. Zkontrolujte soubor <strong><tt>$1</tt></strong>.<br />
-Pokud je zmiňovaný soubor větší, ale jinak stejný, není potřeba zvlášť na�ítat jeho zmenšenou verzi.',
-'file-thumbnail-no'           => 'Jméno souboru za�íná na <strong><tt>$1</tt></strong>.
-Možná to je obrázek ve zmenšené velikosti <i>(náhled)</i>.
-Na�těte soubor v plném rozlišením, pokud je k dispozici, nebo změňte jméno souboru.',
-'fileexists-forbidden'        => 'Soubor s tímto názvem již existuje; vraťte se a zvolte jiný název. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Soubor s tímto názvem již existuje ve sdíleném úložišti. Pokud přesto chcete váš soubor na�íst, vraťte se a zvolte jiný název. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Tento soubor je zřejmě obrázek ve zmenšené velikosti ''(náhled)''. Zkontrolujte soubor '''<tt>$1</tt>'''.<br />
+Pokud je zmiňovaný soubor větší, ale jinak stejný, není potřeba zvlášť na�ítat jeho zmenšenou verzi.",
+'file-thumbnail-no'           => "Jméno souboru za�íná na '''<tt>$1</tt>'''.
+Možná to je obrázek ve zmenšené velikosti ''(náhled)''.
+Na�těte soubor v plném rozlišením, pokud je k dispozici, nebo změňte jméno souboru.",
+'fileexists-forbidden'        => 'Soubor s tímto názvem již existuje a není dovoleno ho přepsat.
+Pokud chcete přesto soubor na�íst, vraťte se a zvolte jiný název.
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Soubor s tímto názvem již existuje ve sdíleném úložišti. Pokud přesto chcete váš soubor na�íst, vraťte se a zvolte jiný název. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Tento soubor je duplikát {{PLURAL:$1|následujícího souboru|následujících souborů}}:',
+'file-deleted-duplicate'      => 'Identický soubor k tomuto ([[$1]]) byl již dříve smazán. Před tím, než soubor znovu nahrajete, byste měli zkontrolovat záznamy o předchozím smazání.',
 'successfulupload'            => 'Na�tení úspěšně provedeno!',
 'uploadwarning'               => 'Varování',
 'savefile'                    => 'Uložit soubor',
@@ -1389,7 +1529,7 @@ Na�těte soubor v plném rozlišením, pokud je k dispozici, nebo změňte jmé
 
 Zvažte zda je vhodné pokra�ovat v na�ítání tohoto souboru.
 Zde je příslušný výpis z knihy smazaných stránek:",
-'filename-bad-prefix'         => 'Jméno souboru, který na�ítáte, za�íná na <strong>„$1“</strong>, což je nevhodné jméno, obvykle automaticky přiřazované digitálním fotoaparátem. Zvolte jméno, která váš soubor lépe popíše.',
+'filename-bad-prefix'         => "Jméno souboru, který na�ítáte, za�íná na '''„$1“''', což je nevhodné jméno, obvykle automaticky přiřazované digitálním fotoaparátem. Zvolte jméno, která váš soubor lépe popíše.",
 'filename-prefix-blacklist'   => ' #<!-- tuto řádku ponechte beze změny --> <pre>
 # Používá se následující syntaxe:
 #   * Cokoli od znaku „#“ až do konce řádky je komentář
@@ -1424,20 +1564,21 @@ PICT # různé
 'upload_source_url'  => ' (platné, veřejně přístupné URL)',
 'upload_source_file' => ' (soubor na vašem po�íta�i)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Tato speciální stránka zobrazuje všechny na�tené soubory.
+# Special:ListFiles
+'listfiles-summary'     => 'Tato speciální stránka zobrazuje všechny na�tené soubory.
 Ve výchozím stavu je poslední na�tený soubor nahoře.
 Kliknutím na hlavi�ku sloupce můžete změnit řazení.',
-'imagelist_search_for'  => 'Hledat obrázek podle názvu:',
+'listfiles_search_for'  => 'Hledat soubor podle názvu:',
 'imgfile'               => 'soubor',
-'imagelist'             => 'Seznam na�tených obrázků',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Název',
-'imagelist_user'        => 'Uživatel',
-'imagelist_size'        => 'Velikost (bajtů)',
-'imagelist_description' => 'Popis',
-
-# Image description page
+'listfiles'             => 'Seznam souborů',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Název',
+'listfiles_user'        => 'Uživatel',
+'listfiles_size'        => 'Velikost (bajtů)',
+'listfiles_description' => 'Popis',
+'listfiles_count'       => 'Verze',
+
+# File description page
 'filehist'                       => 'Historie souboru',
 'filehist-help'                  => 'Kliknutím na datum a �as se zobrazí tehdejší verze souboru.',
 'filehist-deleteall'             => 'smazat vše',
@@ -1445,19 +1586,25 @@ Kliknutím na hlavi�ku sloupce můžete změnit řazení.',
 'filehist-revert'                => 'vrátit zpět',
 'filehist-current'               => 'sou�asná',
 'filehist-datetime'              => 'Datum a �as',
+'filehist-thumb'                 => 'Náhled',
+'filehist-thumbtext'             => 'Náhled verze z $1',
+'filehist-nothumb'               => 'Bez náhledu',
 'filehist-user'                  => 'Uživatel',
 'filehist-dimensions'            => 'Rozměry',
 'filehist-filesize'              => 'Velikost souboru',
 'filehist-comment'               => 'Komentář',
-'imagelinks'                     => 'Odkazy k souboru',
+'imagelinks'                     => 'Odkazy na soubor',
 'linkstoimage'                   => 'Na soubor {{plural:$1|odkazuje tato stránka|odkazují tyto stránky}}:',
+'linkstoimage-more'              => 'Na tento soubor {{PLURAL:$1|odkazuje více stránek|odkazují více než $1 stránky|odkazuje více než $1 stránek}}.
+Následující seznam zobrazuje pouze {{PLURAL:$1|tu první|první $1|prvních $1}}.
+Můžete si prohlédnout [[Special:WhatLinksHere/$2|úplný seznam]].',
 'nolinkstoimage'                 => 'Na tento soubor neodkazuje žádná stránka.',
 'morelinkstoimage'               => 'Zobrazit [[Special:WhatLinksHere/$1|další odkazy]] na tento soubor.',
 'redirectstofile'                => '{{plural:$1|Následující soubor přesměrovává|Následující $1 soubory přesměrovávají|Následujících $1 souborů přesměrovává}} na tento soubor:',
-'duplicatesoffile'               => '{{plural:$1|Následující soubor je duplikát|Následující $1 soubory jsou duplikáty|Následujících $1 souborů jsou duplikáty}} tohoto souboru:',
+'duplicatesoffile'               => '{{plural:$1|Následující soubor je duplikát|Následující $1 soubory jsou duplikáty|Následujících $1 souborů jsou duplikáty}} tohoto souboru ([[Special:FileDuplicateSearch/$2|podrobnosti]]):',
 'sharedupload'                   => 'Tento soubor je sdílený a může být používán ostatními projekty.',
 'shareduploadwiki'               => 'Více informací obsahuje $1.',
-'shareduploadwiki-desc'          => 'Níže je zobrazen popis, který obsahuje jeho $1 na sdíleném úložišti.',
+'shareduploadwiki-desc'          => 'Níže jsou zobrazeny informace, které obsahuje jeho tamější $1.',
 'shareduploadwiki-linktext'      => 'stránka s popisem souboru',
 'shareduploadduplicate'          => 'Tento soubor je duplikát souboru $1 ze sdíleného úložiště.',
 'shareduploadduplicate-linktext' => 'další soubor',
@@ -1481,7 +1628,7 @@ Kliknutím na hlavi�ku sloupce můžete změnit řazení.',
 # File deletion
 'filedelete'                  => 'Smazání souboru $1',
 'filedelete-legend'           => 'Smazat soubor',
-'filedelete-intro'            => "Chystáte se smazat '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Chystáte se smazat soubor '''[[Media:$1|$1]]''' i s celou historií.",
 'filedelete-intro-old'        => "Chystáte se smazat verzi souboru '''[[Media:$1|$1]]''' z [$4 $3 $2].",
 'filedelete-comment'          => 'Důvod smazání:',
 'filedelete-submit'           => 'Smazat',
@@ -1489,7 +1636,6 @@ Kliknutím na hlavi�ku sloupce můžete změnit řazení.',
 'filedelete-success-old'      => "Verze souboru '''[[Media:$1|$1]]''' z $3 $2 byla smazána.",
 'filedelete-nofile'           => "Soubor '''$1''' neexistuje.",
 'filedelete-nofile-old'       => "Neexistuje archivní verze souboru '''$1''' s udávanými atributy.",
-'filedelete-iscurrent'        => 'Pokoušíte se smazat sou�asnou verzi souboru. Nejprve navraťte starší verzi souboru.',
 'filedelete-otherreason'      => 'Jiný �i další důvod:',
 'filedelete-reason-otherlist' => 'Zadejte níže důvod mazání nebo vyberte z tohoto seznamu',
 'filedelete-reason-dropdown'  => '*Obvyklé důvody smazání
@@ -1517,25 +1663,31 @@ Vstup: <code>typ obsahu/podtyp</code>, napÅ™. <code>image/jpeg</code>.',
 
 # Random page
 'randompage'         => 'Náhodná stránka',
-'randompage-nopages' => 'V tomto jmenném prostoru nejsou žádné stránky.',
+'randompage-nopages' => 'Ve jmenném prostoru „$1“ nejsou žádné stránky.',
 
 # Random redirect
 'randomredirect'         => 'Náhodné přesměrování',
-'randomredirect-nopages' => 'V tomto jmenném prostoru není žádné přesměrování.',
+'randomredirect-nopages' => 'Ve jmenném prostoru „$1“ nejsou žádná přesměrování.',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => 'Statistika {{grammar:2sg|{{SITENAME}}}}',
-'userstats'              => 'O uživatelích',
-'sitestatstext'          => "V databázi je celkem '''$1''' {{PLURAL:$1|stránka|stránky|stránek}}. Toto �íslo zahrnuje diskusní stránky, stránky o {{grammar:6sg|{{SITENAME}}}}, pahýly, přesměrování a další, které pravděpodobně nelze hodnotit jako obsahové stránky. Kromě nich zbývá '''$2''' pravděpodobně {{PLURAL:$2|skute�ná obsahová stránka|skute�né obsahové stránky|skute�ných obsahových stránek}}.
-
-{{PLURAL:$8|Byl na�ten|Byly na�teny|Bylo na�teno}} '''$8''' {{PLURAL:$8|obrázek|obrázky|obrázků}}.
-
-Od založení wiki bylo navštíveno celkem '''$3''' stránek a editováno '''$4'''krát. To �iní v průměru '''$5''' editací na stránku a '''$6''' návštěv na editaci.
-
-Aktuální délka fronty údržby je '''$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Je|Jsou|Je}} zde '''$1''' {{PLURAL:$1|registrovaný [[Special:ListUsers|uživatel]]|registrovaní [[Special:ListUsers|uživatelé]]|registrovaných [[Special:ListUsers|uživatelů]]}}, z&nbsp;toho '''$2''' (což je '''$4&nbsp;%''') {{PLURAL:$2|má|mají|má}} práva $5.",
-'statistics-mostpopular' => 'Nej�tenější stránky',
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Statistika stránek',
+'statistics-header-edits'      => 'Statistika editací',
+'statistics-header-views'      => 'Statistika zobrazení',
+'statistics-header-users'      => 'O uživatelích',
+'statistics-articles'          => 'Obsahové stránky',
+'statistics-pages'             => 'Stránky',
+'statistics-pages-desc'        => 'Všechny stránky na wiki v�etně diskusí, přesměrování apod.',
+'statistics-files'             => 'Na�tené soubory',
+'statistics-edits'             => 'Po�et editací od založení wiki',
+'statistics-edits-average'     => 'Průměrný po�et editací na stránku',
+'statistics-views-total'       => 'Celkový po�et zobrazení',
+'statistics-views-peredit'     => 'Po�et zobrazení na editaci',
+'statistics-jobqueue'          => 'Délka [http://www.mediawiki.org/wiki/Manual:Job_queue fronty údržby]',
+'statistics-users'             => 'Registrovaní [[Special:ListUsers|uživatelé]]',
+'statistics-users-active'      => 'Aktivní uživatelé',
+'statistics-users-active-desc' => 'Uživatelé, kteří v {{plural:$1|posledním dni|posledních $1 dnech}} provedli nějakou operaci',
+'statistics-mostpopular'       => 'Nej�tenější stránky',
 
 'disambiguations'      => 'Stránky odkazující na rozcestníky',
 'disambiguationspage'  => 'Template:Rozcestník',
@@ -1547,7 +1699,7 @@ Aktuální délka fronty údržby je '''$7'''.",
 'double-redirect-fixer'      => 'Opravář přesměrování',
 
 'brokenredirects'        => 'Přerušená přesměrování',
-'brokenredirectstext'    => 'Tato přesměrování vedou na neexistující stránky.',
+'brokenredirectstext'    => 'Tato přesměrování vedou na neexistující stránky:',
 'brokenredirects-edit'   => '(editovat)',
 'brokenredirects-delete' => '(smazat)',
 
@@ -1573,11 +1725,12 @@ Aktuální délka fronty údržby je '''$7'''.",
 'uncategorizedimages'     => 'Nekategorizované soubory',
 'uncategorizedtemplates'  => 'Nekategorizované šablony',
 'unusedcategories'        => 'Nepoužívané kategorie',
-'unusedimages'            => 'Nepoužívané obrázky a soubory',
+'unusedimages'            => 'Nepoužívané soubory',
 'popularpages'            => 'Nejnavštěvovanější stránky',
 'wantedcategories'        => 'Žádané kategorie',
 'wantedpages'             => 'Požadované stránky',
-'missingfiles'            => 'Chybějící soubory',
+'wantedfiles'             => 'Chybějící soubory',
+'wantedtemplates'         => 'Chybějící šablony',
 'mostlinked'              => 'Nejodkazovanější stránky',
 'mostlinkedcategories'    => 'Nejpoužívanější kategorie',
 'mostlinkedtemplates'     => 'Nejvkládanější šablony',
@@ -1591,12 +1744,15 @@ Aktuální délka fronty údržby je '''$7'''.",
 'deadendpagestext'        => 'Následující stránky neodkazují na žádnou jinou stránku {{grammar:2sg|{{SITENAME}}}}.',
 'protectedpages'          => 'Zam�ené stránky',
 'protectedpages-indef'    => 'Pouze zámky na neur�ito',
+'protectedpages-cascade'  => 'Pouze kaskádové zámky',
 'protectedpagestext'      => 'Následující stránky jsou zam�eny nebo polozam�eny pro editaci nebo přesun:',
 'protectedpagesempty'     => 'Žádná stránka není zam�ena s těmito parametry.',
 'protectedtitles'         => 'Zam�ené názvy stránek',
 'protectedtitlestext'     => 'Následující názvy jsou zam�eny a nelze na nich zakládat stránky',
 'protectedtitlesempty'    => 'S těmito parametry nejsou zam�eny žádné názvy.',
 'listusers'               => 'Uživatelé',
+'listusers-editsonly'     => 'Zobrazit pouze uživatele s editacemi',
+'usereditcount'           => '$1 {{PLURAL:$1|editace|editace|editací}}',
 'newpages'                => 'Nejnovější stránky',
 'newpages-username'       => 'Uživatelské jméno:',
 'ancientpages'            => 'Nejdéle needitované stránky',
@@ -1617,14 +1773,13 @@ Aktuální délka fronty údržby je '''$7'''.",
 'booksources-search-legend' => 'Vyhledat knižní zdroje',
 'booksources-go'            => 'Vyhledat',
 'booksources-text'          => 'Níže je seznam odkazů na servery prodávající knihy, nebo které mohou mít další informace o knihách, které hledáte.',
+'booksources-invalid-isbn'  => 'Zadané ISBN se zdá být nevalidní. Zkontrolujte jej s originálním zdrojem.',
 
 # Special:Log
 'specialloguserlabel'  => 'Uživatel:',
 'speciallogtitlelabel' => 'Název:',
 'log'                  => 'Protokolovací záznamy',
 'all-logs-page'        => 'Všechny záznamy',
-'log-search-legend'    => 'Hledání v protokolovacích záznamech',
-'log-search-submit'    => 'Hledat',
 'alllogstext'          => 'Spole�né zobrazení všech dostupných protokolovacích záznamů pro {{grammar:4sg|{{SITENAME}}}}.
 Zobrazení můžete zúžit výběrem typu záznamu, uživatelského jména (záleží na velikosti písmen) nebo dot�ené stránky (také záleží na velikosti písmen).',
 'logempty'             => 'Protokol neobsahuje žádný odpovídající záznam.',
@@ -1636,6 +1791,7 @@ Zobrazení můžete zúžit výběrem typu záznamu, uživatelského jména (zá
 'nextpage'          => 'Další stránka ($1)',
 'prevpage'          => 'Předchozí stránka ($1)',
 'allpagesfrom'      => 'Zobrazit stránky po�ínaje od:',
+'allpagesto'        => 'Zobrazit stránky do:',
 'allarticles'       => 'Všechny stránky',
 'allinnamespace'    => 'Všechny stránky (jmenný prostor $1)',
 'allnotinnamespace' => 'Všechny stránky (mimo jmenný prostor $1)',
@@ -1655,42 +1811,70 @@ Možná Vás budou zajímat [[Special:WantedCategories|žádané kategorie]].',
 'special-categories-sort-count' => 'seřadit podle po�tu',
 'special-categories-sort-abc'   => 'seřadit abecedně',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Smazané editace uživatele',
+
+# Special:LinkSearch
+'linksearch'       => 'Externí odkazy',
+'linksearch-pat'   => 'Vyhledávací vzor:',
+'linksearch-ns'    => 'Jmenný prostor:',
+'linksearch-ok'    => 'Hledat',
+'linksearch-text'  => 'Lze používat zástupné znaky, např. „*.wikipedia.org“.<br />
+Podporované protokoly: <tt>$1</tt>',
+'linksearch-line'  => '$2 odkazuje na $1',
+'linksearch-error' => 'Zástupné znaky lze použít jen na za�átku doménového jména.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Zobrazit uživatele po�ínaje od:',
 'listusers-submit'   => 'Ukázat',
 'listusers-noresult' => 'Nenalezen žádný uživatel.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Kniha nových uživatelů',
+'newuserlogpagetext'          => 'Toto je záznam nově zaregistrovaných uživatelů.',
+'newuserlog-byemail'          => 'heslo zasláno e-mailem',
+'newuserlog-create-entry'     => 'Nově založený uživatel',
+'newuserlog-create2-entry'    => 'založil ú�et $1',
+'newuserlog-autocreate-entry' => 'Ú�et vytvořen automaticky',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Práva skupin uživatelů',
-'listgrouprights-summary'  => 'Toto je seznam uživatelských skupin definovaných na této wiki a&nbsp;jejich přístupových práv.
+'listgrouprights'                 => 'Práva skupin uživatelů',
+'listgrouprights-summary'         => 'Toto je seznam uživatelských skupin definovaných na této wiki a&nbsp;jejich přístupových práv.
 
 [[{{MediaWiki:Listgrouprights-helppage}}|Podrobné informace o&nbsp;jednotlivých právech]]',
-'listgrouprights-group'    => 'Skupina',
-'listgrouprights-rights'   => 'Práva',
-'listgrouprights-helppage' => 'Help:Práva skupiny',
-'listgrouprights-members'  => '(seznam �lenů)',
+'listgrouprights-group'           => 'Skupina',
+'listgrouprights-rights'          => 'Práva',
+'listgrouprights-helppage'        => 'Help:Práva skupiny',
+'listgrouprights-members'         => '(seznam �lenů)',
+'listgrouprights-addgroup'        => 'Přidávání uživatelů do {{PLURAL:$2|skupiny|skupin}} $1',
+'listgrouprights-removegroup'     => 'Vyřazování uživatelů ze {{PLURAL:$2|skupiny|skupin}} $1',
+'listgrouprights-addgroup-all'    => 'Přidávání uživatelů do libovolné skupiny',
+'listgrouprights-removegroup-all' => 'Vyřazování uživatelů z libovolné skupiny',
 
 # E-mail user
-'mailnologin'     => 'Bez odesílací adresy',
-'mailnologintext' => 'Pokud chcete posílat e-maily jiným uživatelům, musíte se [[Special:UserLogin|přihlásit]] a mít platnou e-mailovou adresu ve svém [[Special:Preferences|nastavení]].',
-'emailuser'       => 'Poslat e-mail',
-'emailpage'       => 'Poslat e-mail',
-'emailpagetext'   => 'Pomocí níže zobrazeného formuláře můžete tomuto uživateli poslat zprávu e-mailem.
+'mailnologin'      => 'Bez odesílací adresy',
+'mailnologintext'  => 'Pokud chcete posílat e-maily jiným uživatelům, musíte se [[Special:UserLogin|přihlásit]] a mít platnou e-mailovou adresu ve svém [[Special:Preferences|nastavení]].',
+'emailuser'        => 'Poslat e-mail',
+'emailpage'        => 'Poslat e-mail',
+'emailpagetext'    => 'Pomocí níže zobrazeného formuláře můžete tomuto uživateli poslat zprávu e-mailem.
 E-mailová adresa, kterou máte uvedenu v [[Special:Preferences|nastavení]], se objeví jako adresa odesílatele pošty, aby vám adresát mohl odpovědět přímo.',
-'usermailererror' => 'Chyba poštovního programu:',
-'defemailsubject' => 'E-mail z {{grammar:2sg|{{SITENAME}}}}',
-'noemailtitle'    => 'Bez e-mailové adresy',
-'noemailtext'     => 'Tento uživatel bu� nezadal platnou adresu nebo zakázal přijímat zprávy od jiných uživatelů.',
-'emailfrom'       => 'Od:',
-'emailto'         => 'Komu:',
-'emailsubject'    => 'Předmět:',
-'emailmessage'    => 'Zpráva:',
-'emailsend'       => 'Odeslat',
-'emailccme'       => 'Poslat kopii zprávy na můj e-mail',
-'emailccsubject'  => 'Kopie Vaší zprávy pro uživatele $1: $2',
-'emailsent'       => 'Zpráva odeslána',
-'emailsenttext'   => 'Váš e-mail byl odeslán.',
-'emailuserfooter' => 'Tento e-mail byl odeslán z {{grammar:2sg|{{SITENAME}}}} pomocí funkce „Poslat e-mail“; odeslal ho uživatel $1 uživateli $2',
+'usermailererror'  => 'Chyba poštovního programu:',
+'defemailsubject'  => 'E-mail z {{grammar:2sg|{{SITENAME}}}}',
+'noemailtitle'     => 'Bez e-mailové adresy',
+'noemailtext'      => 'Tento uživatel nezadal platnou e-mailovou adresu.',
+'nowikiemailtitle' => 'E-mail není povolen',
+'nowikiemailtext'  => 'Tento uživatel si nepřeje dostávat e-maily od ostatních uživatelů.',
+'email-legend'     => 'Odeslání e-mailu jinému uživateli {{GRAMMAR:2sg|{{SITENAME}}}}',
+'emailfrom'        => 'Od:',
+'emailto'          => 'Komu:',
+'emailsubject'     => 'Předmět:',
+'emailmessage'     => 'Zpráva:',
+'emailsend'        => 'Odeslat',
+'emailccme'        => 'Poslat kopii zprávy na můj e-mail',
+'emailccsubject'   => 'Kopie Vaší zprávy pro uživatele $1: $2',
+'emailsent'        => 'Zpráva odeslána',
+'emailsenttext'    => 'Váš e-mail byl odeslán.',
+'emailuserfooter'  => 'Tento e-mail byl odeslán z {{grammar:2sg|{{SITENAME}}}} pomocí funkce „Poslat e-mail“; odeslal ho uživatel $1 uživateli $2',
 
 # Watchlist
 'watchlist'            => 'Sledované stránky',
@@ -1720,12 +1904,7 @@ E-mailová adresa, kterou máte uvedenu v [[Special:Preferences|nastavení]], se
 'iteminvalidname'      => 'Problém s položkou „$1“, neplatný název…',
 'wlnote'               => 'Níže je {{PLURAL:$1|poslední změna|poslední $1 změny|posledních $1 změn}} za {{PLURAL:$2|poslední|poslední|posledních}} <b>$2</b> {{PLURAL:$2|hodinu|hodiny|hodin}}.',
 'wlshowlast'           => 'Ukázat posledních $1 hodin $2 dnů $3',
-'watchlist-show-bots'  => 'ukázat roboty',
-'watchlist-hide-bots'  => 'skrýt roboty',
-'watchlist-show-own'   => 'ukázat mé editace',
-'watchlist-hide-own'   => 'skrýt mé editace',
-'watchlist-show-minor' => 'ukázat malé editace',
-'watchlist-hide-minor' => 'skrýt malé editace',
+'watchlist-options'    => 'Možnosti sledovaných stránek',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Přidávám na seznam sledovaných stránek…',
@@ -1764,76 +1943,95 @@ Pro změnu nastavení navštivte
 Rady a kontakt:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Smazat stránku',
-'confirm'                     => 'Potvrdit',
-'excontent'                   => 'obsah byl: „$1“',
-'excontentauthor'             => 'obsah byl: „$1“ (a jediným přispěvatelem byl „[[Special:Contributions/$2|$2]]“)',
-'exbeforeblank'               => 'obsah před vyprázdněním byl: „$1“',
-'exblank'                     => 'stránka byla prázdná',
-'delete-confirm'              => 'Smazání stránky „$1“',
-'delete-legend'               => 'Smazat',
-'historywarning'              => 'Varování: Stránka, jíž chcete smazat, má historii:',
-'confirmdeletetext'           => 'Chystáte se smazat stránku s celou její historií. Prosím potvr�te, že to opravdu chcete u�init, že si uvědomujete důsledky a že je to v souladu s [[{{MediaWiki:Policy-url}}|pravidly]].',
-'actioncomplete'              => 'Provedeno',
-'deletedtext'                 => 'Stránka nebo soubor „<nowiki>$1</nowiki>“ byla smazána. $2 zaznamenává poslední smazání.',
-'deletedarticle'              => 'maže „$1“',
-'suppressedarticle'           => 'potla�il „[[$1]]“',
-'dellogpage'                  => 'Kniha smazaných stránek',
-'dellogpagetext'              => 'Zde je seznam posledních smazaných stránek.',
-'deletionlog'                 => 'Kniha smazaných stránek',
-'reverted'                    => 'Obnovení předchozí verze',
-'deletecomment'               => 'Důvod smazání:',
-'deleteotherreason'           => 'Jiný �i další důvod:',
-'deletereasonotherlist'       => 'Zadejte níže důvod mazání nebo vyberte z tohoto seznamu',
-'deletereason-dropdown'       => '*Obvyklé důvody smazání
+# Delete
+'deletepage'             => 'Smazat stránku',
+'confirm'                => 'Potvrdit',
+'excontent'              => 'obsah byl: „$1“',
+'excontentauthor'        => 'obsah byl: „$1“ (a jediným přispěvatelem byl „[[Special:Contributions/$2|$2]]“)',
+'exbeforeblank'          => 'obsah před vyprázdněním byl: „$1“',
+'exblank'                => 'stránka byla prázdná',
+'delete-confirm'         => 'Smazání stránky „$1“',
+'delete-legend'          => 'Smazat',
+'historywarning'         => 'Varování: Stránka, jíž chcete smazat, má historii:',
+'confirmdeletetext'      => 'Chystáte se smazat stránku s celou její historií. Prosím potvr�te, že to opravdu chcete u�init, že si uvědomujete důsledky a že je to v souladu s [[{{MediaWiki:Policy-url}}|pravidly]].',
+'actioncomplete'         => 'Provedeno',
+'deletedtext'            => 'Stránka nebo soubor „<nowiki>$1</nowiki>“ byla smazána. $2 zaznamenává poslední smazání.',
+'deletedarticle'         => 'maže „$1“',
+'suppressedarticle'      => 'potla�il „[[$1]]“',
+'dellogpage'             => 'Kniha smazaných stránek',
+'dellogpagetext'         => 'Zde je seznam posledních smazaných stránek.',
+'deletionlog'            => 'Kniha smazaných stránek',
+'reverted'               => 'Obnovení předchozí verze',
+'deletecomment'          => 'Důvod smazání:',
+'deleteotherreason'      => 'Jiný �i další důvod:',
+'deletereasonotherlist'  => 'Zadejte níže důvod mazání nebo vyberte z tohoto seznamu',
+'deletereason-dropdown'  => '*Obvyklé důvody smazání
 ** Na žádost autora
 ** Porušení autorských práv
 ** Vandalismus',
-'delete-edit-reasonlist'      => 'Editovat důvody smazání',
-'delete-toobig'               => 'Tato stránka má velkou historii editací, přes $1 {{plural:$1|verzi|verze|verzí}}. Mazání takových stránek je omezeno, aby se předešlo nechtěnému narušení {{grammar:2sg|{{SITENAME}}}}.',
-'delete-warning-toobig'       => 'Tato stránka má velkou historii editací, přes $1 {{plural:$1|verzi|verze|verzí}}. Mazání takových stránek může narušit databázové operace {{grammar:2sg|{{SITENAME}}}}; postupujte opatrně.',
-'rollback'                    => 'Vrátit zpět editace',
-'rollback_short'              => 'Vrátit zpět',
-'rollbacklink'                => 'vrácení zpět',
-'rollbackfailed'              => 'Nešlo vrátit zpět',
-'cantrollback'                => 'Nelze vrátit zpět poslední editaci, neboť poslední přispěvatel je jediným autorem této stránky.',
-'alreadyrolled'               => 'Nelze vrátit zpět poslední editaci [[:$1]] od uživatele [[User:$2|$2]] ([[User talk:$2|diskuse]] | [[Special:Contributions/$2|{{int:contribslink}}]]), protože někdo jiný již stránku editoval nebo vrátil tuto změnu zpět.
-
-Poslední editaci této stránky provedl(a) [[User:$3|$3]] ([[User talk:$3|diskuse]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Shrnutí editace bylo: <i>„$1“</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Editace uživatele „$2“ vrácena do předchozího stavu, jehož autorem je „$1“.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Editace uživatele $1 byla vrácena na poslední verzi od uživatele $2.',
-'sessionfailure'              => 'Zřejmě je nějaký problém s vaším přihlášením;
+'delete-edit-reasonlist' => 'Editovat důvody smazání',
+'delete-toobig'          => 'Tato stránka má velkou historii editací, přes $1 {{plural:$1|verzi|verze|verzí}}. Mazání takových stránek je omezeno, aby se předešlo nechtěnému narušení {{grammar:2sg|{{SITENAME}}}}.',
+'delete-warning-toobig'  => 'Tato stránka má velkou historii editací, přes $1 {{plural:$1|verzi|verze|verzí}}. Mazání takových stránek může narušit databázové operace {{grammar:2sg|{{SITENAME}}}}; postupujte opatrně.',
+
+# Rollback
+'rollback'         => 'Vrátit zpět editace',
+'rollback_short'   => 'Vrátit zpět',
+'rollbacklink'     => 'vrácení zpět',
+'rollbackfailed'   => 'Nešlo vrátit zpět',
+'cantrollback'     => 'Nelze vrátit zpět poslední editaci, neboť poslední přispěvatel je jediným autorem této stránky.',
+'alreadyrolled'    => 'Nelze vrátit zpět poslední editaci [[:$1]] od uživatele [[User:$2|$2]] ([[User talk:$2|diskuse]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]), protože někdo jiný již stránku editoval nebo vrátil tuto změnu zpět.
+
+Poslední editaci této stránky provedl(a) [[User:$3|$3]] ([[User talk:$3|diskuse]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Shrnutí editace bylo: ''„$1“''.", # only shown if there is an edit comment
+'revertpage'       => 'Editace uživatele „$2“ vrácena do předchozího stavu, jehož autorem je „$1“.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Editace uživatele $1 byla vrácena na poslední verzi od uživatele $2.',
+'sessionfailure'   => 'Zřejmě je nějaký problém s vaším přihlášením;
 vámi požadovaná �innost byla stornována jako prevence před neoprávněným přístupem.
 Stiskněte tla�ítko „zpět“, obnovte stránku, ze které jste přišli a zkuste �innost znovu.',
+
+# Protect
 'protectlogpage'              => 'Kniha zam�ení',
 'protectlogtext'              => 'Níže je uveden seznam všech zam�ení a odem�ení stránek.',
 'protectedarticle'            => 'zamyká „[[$1]]“',
 'modifiedarticleprotection'   => 'mění zámek stránky "[[$1]]"',
 'unprotectedarticle'          => 'odemyká „[[$1]]“',
+'movedarticleprotection'      => 'nastavení zámků přesunuto z „[[$2]]“ na „[[$1]]“',
 'protect-title'               => 'Zamyká se „$1“',
+'prot_1movedto2'              => 'Stránka [[$1]] přemístěna na stránku [[$2]]',
 'protect-legend'              => 'Potvrdit zam�ení',
 'protectcomment'              => 'Důvod zam�ení',
 'protectexpiry'               => 'Čas vypršení',
 'protect_expiry_invalid'      => 'Čas vypršení je chybný.',
 'protect_expiry_old'          => 'Čas vypršení již minul.',
 'protect-unchain'             => 'Oddělené ovládání zámku přesunů',
-'protect-text'                => 'Zde si můžete prohlédnout �i změnit nastavení zámků stránky <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nemůžete měnit nastavení zámků pokud jste zablokován. Sou�asné nastavení pro tuto stránku je: <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Nastavení zámků nejde změnit kvůli zam�ení databáze.
-Sou�asné nastavení pro tuto stránku je: <strong>$1</strong>:',
-'protect-locked-access'       => 'Tento ú�et nemá povoleno měnit nastavení zámků.
-Sou�asné nastavení pro tuto stránku je: <strong>$1</strong>:',
+'protect-text'                => "Zde si můžete prohlédnout �i změnit nastavení zámků stránky '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nemůžete měnit nastavení zámků pokud jste zablokován. Sou�asné nastavení pro tuto stránku je: '''$1''':",
+'protect-locked-dblock'       => "Nastavení zámků nejde změnit kvůli zam�ení databáze.
+Sou�asné nastavení pro tuto stránku je: '''$1''':",
+'protect-locked-access'       => "Tento ú�et nemá povoleno měnit nastavení zámků.
+Sou�asné nastavení pro tuto stránku je: '''$1''':",
 'protect-cascadeon'           => 'Tato stránka je právě zam�ena, protože je vložena do {{PLURAL:$1|následující stránky zam�ené|následujících stránek zam�ených|následujících stránek zam�ených}} kaskádovým zámkem. Můžete změnit zámky pro tuto stránku, ale nebude to mít žádný vliv na kaskádové zam�ení.',
-'protect-default'             => '(odem�eno)',
+'protect-default'             => 'Povolit všem',
 'protect-fallback'            => 'Vyžaduje povolení "$1"',
-'protect-level-autoconfirmed' => 'Pouze registrovaní',
+'protect-level-autoconfirmed' => 'Zakázat novým a neregistrovaným uživatelům',
 'protect-level-sysop'         => 'Pouze správci',
 'protect-summary-cascade'     => 'kaskádový',
 'protect-expiring'            => 'vyprší $1 (UTC)',
+'protect-expiry-indefinite'   => 'do odvolání',
 'protect-cascade'             => 'Kaskádní zámek - zamkne všechny stránky vložené do této stránky.',
 'protect-cantedit'            => 'Nemůžete měnit nastavení zámků této stránky, protože nemáte povoleno tuto stránku editovat.',
+'protect-othertime'           => 'Jiný �as vypršení:',
+'protect-othertime-op'        => 'jiný �as',
+'protect-existing-expiry'     => 'Sou�asný �as vypršení: $2, $3',
+'protect-otherreason'         => 'Jiný nebo další důvod:',
+'protect-otherreason-op'      => 'jiný/další důvod',
+'protect-dropdown'            => '*Obvyklé důvody zam�ení
+** Opakovaný vandalismus
+** Vkládání reklamních externích odkazů
+** Edita�ní válka
+** Často používaná stránka',
+'protect-edit-reasonlist'     => 'Editace seznamu důvodů zam�ení',
+'protect-expiry-options'      => '1 hodina:1 hour,1 den:1 day,1 týden:1 week,2 týdny:2 weeks,1 měsíc:1 month,3 měsíce:3 months,6 měsíců:6 months,1 rok:1 year,do odvolání:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Omezení:',
 'restriction-level'           => 'Úroveň omezení:',
 'minimum-size'                => 'Min. velikost',
@@ -1856,19 +2054,21 @@ Sou�asné nastavení pro tuto stránku je: <strong>$1</strong>:',
 'undeletepage'                 => 'Prohlédnout si a obnovit smazanou stránku',
 'undeletepagetitle'            => "'''Níže jsou smazané verze stránky [[:$1]]'''.",
 'viewdeletedpage'              => 'Zobrazení smazané stránky',
-'undeletepagetext'             => 'Tyto stránky jsou smazány, avšak dosud archivovány, a proto je možno je obnovit. Archiv může být pravidelně vyprazdňován.',
+'undeletepagetext'             => '{{PLURAL:$1|Následující stránka byla smazána, ale je dosud v archivu, takže je možno ji obnovit|Následující $1 stránky byly smazány, ale jsou dosud v archivu, takže je možno je obnovit|Následujících $1 stránek bylo smazáno, ale jsou dosud v archivu, takže je možno je obnovit}}.
+Archiv může být pravidelně vyprazdňován.',
 'undelete-fieldset-title'      => 'Obnovit revize',
 'undeleteextrahelp'            => "Pro úplné obnovení stránky s kompletní historií ponechte všechny �tvere�ky nezaškrtnuté a klikněte na '''''Obnovit'''''. Pro �áste�né obnovení zaškrtněte �tvere�ky u obnovovaných revizí a klikněte na '''''Obnovit'''''. Kliknutí na '''''Reset''''' vyprázdní komentář a zruší všechna zaškrtnutí.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|verze je archivována|verze jsou archivovány|verzí je archivováno}}',
 'undeletehistory'              => 'Pokud stránku obnovíte, budou  v historii obnoveny všechny verze. Pokud byla vytvořena nová stránka se stejným jménem jako smazaná, obnovené verze se zapíší na starší místo v historii novější stránky.',
 'undeleterevdel'               => 'Obnovení nebude provedeno, pokud by vedlo k �áste�nému odstranění aktuální verze stránky. V takovém případě musíte odzna�it nebo odkrýt nejnovější smazanou verzi.',
 'undeletehistorynoadmin'       => 'Tato stránka byla smazána. Důvod smazání je uveden níže, spolu s informacemi o uživatelích, kteří tuto stránku před smazáním editovali. Samotný text stránky je dostupný pouze správcům.',
-'undelete-revision'            => 'Smazaná verze stránky $1 (z $2) - $3:',
+'undelete-revision'            => 'Smazaná verze stránky $1 (z $4 dne $5) od uživatele $3:',
 'undeleterevision-missing'     => 'Nesprávná nebo chybějící revize. Možná máte špatný odkaz, nebo revize byla obnovena �i odstraněna z archivu.',
 'undelete-nodiff'              => 'Nebyla nalezena žádná předchozí verze.',
 'undeletebtn'                  => 'Obnovit',
 'undeletelink'                 => 'obnovit',
 'undeletereset'                => 'Resetovat',
+'undeleteinvert'               => 'Invertovat výběr',
 'undeletecomment'              => 'Komentář:',
 'undeletedarticle'             => 'obnovuje „[[$1]]“',
 'undeletedrevisions'           => '{{PLURAL:$1|Obnovena $1 verze|Obnoveny $1 verze|Obnoveno $1 verzí}}',
@@ -1900,26 +2100,27 @@ $1',
 'blanknamespace' => '(Hlavní)',
 
 # Contributions
-'contributions' => 'Příspěvky uživatele',
-'mycontris'     => 'Mé příspěvky',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Nenalezeny žádné změny vyhovující kritériím.',
-'uctop'         => ' (aktuální)',
-'month'         => 'Do měsíce:',
-'year'          => 'Do roku:',
-
-'sp-contributions-newbies'     => 'Zobrazit příspěvky nově založených ú�tů',
-'sp-contributions-newbies-sub' => 'Noví uživatelé',
-'sp-contributions-blocklog'    => 'Kniha zablokování',
-'sp-contributions-search'      => 'Zobrazení příspěvků',
-'sp-contributions-username'    => 'IP adresa nebo uživatelské jméno:',
-'sp-contributions-submit'      => 'Zobrazit',
+'contributions'       => 'Příspěvky uživatele',
+'contributions-title' => 'Příspěvky uživatele $1',
+'mycontris'           => 'Mé příspěvky',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Nenalezeny žádné změny vyhovující kritériím.',
+'uctop'               => ' (aktuální)',
+'month'               => 'Do měsíce:',
+'year'                => 'Do roku:',
+
+'sp-contributions-newbies'       => 'Zobrazit příspěvky nově založených ú�tů',
+'sp-contributions-newbies-sub'   => 'Noví uživatelé',
+'sp-contributions-newbies-title' => 'Příspěvky nových uživatelů',
+'sp-contributions-blocklog'      => 'Kniha zablokování',
+'sp-contributions-search'        => 'Zobrazení příspěvků',
+'sp-contributions-username'      => 'IP adresa nebo uživatelské jméno:',
+'sp-contributions-submit'        => 'Zobrazit',
 
 # What links here
 'whatlinkshere'            => 'Odkazuje sem',
 'whatlinkshere-title'      => 'Stránky odkazující na „$1“',
 'whatlinkshere-page'       => 'Strana:',
-'linklistsub'              => '(Seznam odkazů)',
 'linkshere'                => "Na '''[[:$1]]''' odkazují tyto stránky:",
 'nolinkshere'              => "Žádná stránka na '''[[:$1]]''' neodkazuje.",
 'nolinkshere-ns'           => "Ve zvoleném jmenném prostoru na '''[[:$1]]''' neodkazuje žádná stránka.",
@@ -1963,8 +2164,10 @@ Udejte přesný důvod níže (například ocitujte, které stránky byly poško
 'ipboptions'                      => '2 hodiny:2 hours,1 den:1 day,3 dny:3 days,1 týden:1 week,2 týdny:2 weeks,1 měsíc:1 month,3 měsíce:3 months,6 měsíců:6 months,1 rok:1 year,do odvolání:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'jiný',
 'ipbotherreason'                  => 'Jiný nebo další důvod:',
-'ipbhidename'                     => 'Skrýt uživatelské jméno v&nbsp;knize zablokování, seznamu probíhajících bloků a&nbsp;seznamu uživatelů',
+'ipbhidename'                     => 'Skrýt uživatelské jméno v knize zablokování, seznamu probíhajících bloků a seznamu uživatelů',
 'ipbwatchuser'                    => 'Sledovat uživatelskou a diskusní stranu tohoto uživatele',
+'ipballowusertalk'                => 'Umožnit tomuto uživateli i při zablokování editovat svou diskusní stránku',
+'ipb-change-block'                => 'Znovu zablokovat uživatele s tímto nastavením',
 'badipaddress'                    => 'Neplatná IP adresa',
 'blockipsuccesssub'               => 'Zablokování uspělo',
 'blockipsuccesstext'              => 'Uživatel „[[Special:Contributions/$1|$1]]“ je zablokován.<br />
@@ -1974,6 +2177,7 @@ Můžete si prohlédnout [[Special:IPBlockList|seznam zablokovaných uživatelů
 'ipb-unblock'                     => 'Odblokovat uživatele nebo IP adresu',
 'ipb-blocklist-addr'              => 'Probíhající bloky uživatele $1',
 'ipb-blocklist'                   => 'Zobrazit probíhající bloky',
+'ipb-blocklist-contribs'          => 'Příspěvky uživatele $1',
 'unblockip'                       => 'Odblokovat uživatele',
 'unblockiptext'                   => 'Tímto formulářem je možno obnovit právo blokované IP adresy �i uživatele opět přispívat do {{grammar:2sg|{{SITENAME}}}}.',
 'ipusubmit'                       => 'Odblokovat',
@@ -1982,6 +2186,9 @@ Můžete si prohlédnout [[Special:IPBlockList|seznam zablokovaných uživatelů
 'ipblocklist'                     => 'Blokované IP adresy a uživatelská jména',
 'ipblocklist-legend'              => 'Hledat zablokovaného uživatele',
 'ipblocklist-username'            => 'Jméno nebo IP adresa:',
+'ipblocklist-sh-userblocks'       => '$1 zablokované ú�ty',
+'ipblocklist-sh-tempblocks'       => '$1 do�asná zablokování',
+'ipblocklist-sh-addressblocks'    => '$1 blokování jedné IP adresy',
 'ipblocklist-submit'              => 'Hledat',
 'blocklistline'                   => '$1 $2 zablokoval $3 ($4)',
 'infiniteblock'                   => 'do odvolání',
@@ -1990,25 +2197,32 @@ Můžete si prohlédnout [[Special:IPBlockList|seznam zablokovaných uživatelů
 'noautoblockblock'                => 'bez autoblokování',
 'createaccountblock'              => 'vytváření ú�tů zablokováno',
 'emailblock'                      => 'e-mail blokován',
+'blocklist-nousertalk'            => 'nemůže editovat svou diskusní stránku',
 'ipblocklist-empty'               => 'Seznam probíhajících bloků je prázdný.',
 'ipblocklist-no-results'          => 'Požadovaná IP adresa nebo uživatelské jméno není blokováno.',
 'blocklink'                       => 'zablokovat',
 'unblocklink'                     => 'uvolnit',
+'change-blocklink'                => 'změnit blok',
 'contribslink'                    => 'příspěvky',
 'autoblocker'                     => 'Automaticky zablokováno, protože sdílíte IP adresu s „$1“. Důvod zablokování tohoto uživatele: „$2“.',
 'blocklogpage'                    => 'Kniha zablokování',
+'blocklog-fulllog'                => 'Celá kniha zablokování',
 'blocklogentry'                   => 'blokuje „[[$1]]“ s �asem vypršení $2 $3',
+'reblock-logentry'                => 'mění nastavení bloku „[[$1]]“ s �asem vypršení $2 $3',
 'blocklogtext'                    => 'Toto je kniha úkonů blokování a odblokování uživatelů. Automaticky blokované IP adresy nejsou vypsány. Podívejte se na [[Special:IPBlockList|seznam blokování IP]] s vý�tem aktuálních zákazů a blokování.',
 'unblocklogentry'                 => 'odblokovává „$1“',
 'block-log-flags-anononly'        => 'jen nepřihl.',
 'block-log-flags-nocreate'        => 'vytváření ú�tů zablokováno',
 'block-log-flags-noautoblock'     => 'automatické blokování vypnuto',
 'block-log-flags-noemail'         => 'e-maily zablokovány',
+'block-log-flags-nousertalk'      => 'nemůže editovat svou diskusní stránku',
 'block-log-flags-angry-autoblock' => 'rozšířené automatické blokování zapnuto',
 'range_block_disabled'            => 'Blokování rozsahů IP adres je zakázáno.',
 'ipb_expiry_invalid'              => 'Neplatný �as vypršení.',
 'ipb_expiry_temp'                 => 'Blokování skrytých uživatelských jmen by měla být trvalá.',
 'ipb_already_blocked'             => '„$1“ již je zablokován.',
+'ipb-needreblock'                 => '== Již zablokován(a) ==
+$1 je již zablokován(a). Chcete změnit nastavení bloku?',
 'ipb_cant_unblock'                => 'Chyba: Blokování s ID $1 nebylo nalezeno. Uživatel již možná byl odblokován.',
 'ipb_blocked_as_range'            => 'Chyba: IP adresa $1 není blokována přímo a tak ji nelze odblokovat. Je �ástí zablokovaného rozsahu $2, který může být odblokován.',
 'ip_range_invalid'                => 'Neplatný IP rozsah.',
@@ -2019,6 +2233,7 @@ Můžete si prohlédnout [[Special:IPBlockList|seznam zablokovaných uživatelů
 'proxyblocksuccess'               => 'Hotovo.',
 'sorbsreason'                     => 'Vaše IP adresa je uvedena na seznamu DNSBL jako otevřený proxy server.',
 'sorbs_create_account_reason'     => 'Vaše IP adresa je uvedena na seznamu DNSBL jako otevřený proxy server. Z této adresy si nemůžete založit ú�et',
+'cant-block-while-blocked'        => 'Nemůžete blokovat jiné uživatele, když jste zablokován(a).',
 
 # Developer tools
 'lockdb'              => 'Zamknout databázi',
@@ -2039,50 +2254,63 @@ Můžete si prohlédnout [[Special:IPBlockList|seznam zablokovaných uživatelů
 'databasenotlocked'   => 'Databáze není uzam�ena.',
 
 # Move page
-'move-page'               => 'Přesunout „$1“',
-'move-page-legend'        => 'Přesunout stránku',
-'movepagetext'            => 'Pomocí tohoto formuláře změníte název stránky a přesunete i celou její historii pod nový název. Původní název se stane přesměrováním na nový název. Odkazy na předchozí název <i>nebudou</i> změněny. <b>VAROV�N�!</b> Toto může drastická a ne�ekaná změna pro oblíbené stránky. Ujistěte se, prosím, že chápete důsledky vašeho kroku před tím, než změnu provedete.',
-'movepagetalktext'        => "Přidružená diskusní stránka, pokud existuje, bude automaticky přesunuta spole�ně se stránkou, '''pokud:'''
+'move-page'                    => 'Přesunout „$1“',
+'move-page-legend'             => 'Přesunout stránku',
+'movepagetext'                 => 'Pomocí tohoto formuláře změníte název stránky a přesunete i celou její historii pod nový název. Původní název se stane přesměrováním na nový název. Odkazy na předchozí název <i>nebudou</i> změněny. <b>VAROV�N�!</b> Toto může drastická a ne�ekaná změna pro oblíbené stránky. Ujistěte se, prosím, že chápete důsledky vašeho kroku před tím, než změnu provedete.',
+'movepagetalktext'             => "Přidružená diskusní stránka, pokud existuje, bude automaticky přesunuta spole�ně se stránkou, '''pokud:'''
 * Dosud neexistuje neprázdná diskusní stránka pod novým jménem a
 * nezrušíte křížek ve formuláři.
 
 V těchto případech musíte přesunout nebo slou�it stránky manuálně, jestliže si to přejete.",
-'movearticle'             => 'Přesunout stránku:',
-'movenotallowed'          => 'Nemáte oprávnění k přesunu stránek.',
-'newtitle'                => 'Na nový název:',
-'move-watch'              => 'Sledovat tuto stránku',
-'movepagebtn'             => 'Přesunout stránku',
-'pagemovedsub'            => 'Úspěšně přesunuto',
-'movepage-moved'          => "<big>'''Stránka „$1“ byla přesunuta na „$2“'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Takto nazvaná stránka již existuje, nebo Vámi zvolený název je neplatný. Zvolte jiný název.',
-'cantmove-titleprotected' => 'Stránku nelze přesunout na zadané místo, protože název je uzam�en proti vytváření',
-'talkexists'              => 'Stránka byla přesunuta úspěšně, ale diskusní stránka přesunuta být nemohla, neboť pod novým názvem již nějaká stránka existuje. Prove�te prosím ru�ní slou�ení.',
-'movedto'                 => 'přesunuto na',
-'movetalk'                => 'Přesunout také diskusní stránku, existuje-li.',
-'move-subpages'           => 'Přesunout i všechny podstránky, je-li to možné',
-'move-talk-subpages'      => 'Přesunout i všechny podstránky diskusní stránky, je-li to možné',
-'movepage-page-exists'    => 'Stránka $1 již existuje a nemůže být automaticky přepsána.',
-'movepage-page-moved'     => 'Stránka $1 byla přesunuta na $2.',
-'movepage-page-unmoved'   => 'Stránka $1 nemůže být přesunuta na $2.',
-'movepage-max-pages'      => '{{PLURAL:$1|Byla přesunuta maximálně povolená jedna stránka|Byly přesunuty maximálně povolené $1 stránky|Bylo přesunuto maximálně povolených $1 stránek}}, více jich už automaticky přesunuto nebude.',
-'1movedto2'               => 'Stránka [[$1]] přemístěna na stránku [[$2]]',
-'1movedto2_redir'         => 'Stránka [[$1]] přemístěna na stránku [[$2]] s výměnou přesměrování',
-'movelogpage'             => 'Kniha přesunů',
-'movelogpagetext'         => 'Toto je záznam všech přesunů stránek.',
-'movereason'              => 'Důvod:',
-'revertmove'              => 'vrátit',
-'delete_and_move'         => 'Smazat a přesunout',
-'delete_and_move_text'    => '==Je potřeba smazání==
+'movearticle'                  => 'Přesunout stránku:',
+'movenologin'                  => 'Nejste přihlášen(a)!',
+'movenologintext'              => 'Pro přesouvání stránek se musíte [[Special:UserLogin|přihlásit]].',
+'movenotallowed'               => 'Nemáte oprávnění k přesunu stránek.',
+'movenotallowedfile'           => 'Nemáte právo přesouvat soubory',
+'cant-move-user-page'          => 'Nemáte oprávnění přesouvat uživatelské stránky.',
+'cant-move-to-user-page'       => 'Nemáte oprávnění přesouvat na uživatelskou stránku (pouze na podstránku uživatelské stránky).',
+'newtitle'                     => 'Na nový název:',
+'move-watch'                   => 'Sledovat tuto stránku',
+'movepagebtn'                  => 'Přesunout stránku',
+'pagemovedsub'                 => 'Úspěšně přesunuto',
+'movepage-moved'               => "<big>'''Stránka „$1“ byla přesunuta na „$2“'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Bylo vytvořeno přesměrování.',
+'movepage-moved-noredirect'    => 'Přesměrování nebylo vytvořeno.',
+'articleexists'                => 'Takto nazvaná stránka již existuje, nebo Vámi zvolený název je neplatný. Zvolte jiný název.',
+'cantmove-titleprotected'      => 'Stránku nelze přesunout na zadané místo, protože název je uzam�en proti vytváření',
+'talkexists'                   => 'Stránka byla přesunuta úspěšně, ale diskusní stránka přesunuta být nemohla, neboť pod novým názvem již nějaká stránka existuje. Prove�te prosím ru�ní slou�ení.',
+'movedto'                      => 'přesunuto na',
+'movetalk'                     => 'Přesunout také diskusní stránku, existuje-li.',
+'move-subpages'                => 'Přesunout i všechny podstránky, je-li to možné',
+'move-talk-subpages'           => 'Přesunout i všechny podstránky diskusní stránky, je-li to možné',
+'movepage-page-exists'         => 'Stránka $1 již existuje a nemůže být automaticky přepsána.',
+'movepage-page-moved'          => 'Stránka $1 byla přesunuta na $2.',
+'movepage-page-unmoved'        => 'Stránka $1 nemůže být přesunuta na $2.',
+'movepage-max-pages'           => '{{PLURAL:$1|Byla přesunuta maximálně povolená jedna stránka|Byly přesunuty maximálně povolené $1 stránky|Bylo přesunuto maximálně povolených $1 stránek}}, více jich už automaticky přesunuto nebude.',
+'1movedto2'                    => 'Stránka [[$1]] přemístěna na stránku [[$2]]',
+'1movedto2_redir'              => 'Stránka [[$1]] přemístěna na stránku [[$2]] s výměnou přesměrování',
+'move-redirect-suppressed'     => 'přesměrování potla�eno',
+'movelogpage'                  => 'Kniha přesunů',
+'movelogpagetext'              => 'Toto je záznam všech přesunů stránek.',
+'movereason'                   => 'Důvod:',
+'revertmove'                   => 'vrátit',
+'delete_and_move'              => 'Smazat a přesunout',
+'delete_and_move_text'         => '==Je potřeba smazání==
 
 Cílová stránka „[[:$1]]“ již existuje. Přejete si ji smazat pro uvolnění místa pro přesun?',
-'delete_and_move_confirm' => 'Ano, smazat cílovou stránku',
-'delete_and_move_reason'  => 'Smazáno pro umožnění přesunu',
-'selfmove'                => 'Původní a nový název jsou stejné; nelze stránku přesunout na sebe samu.',
-'immobile_namespace'      => 'Nový název je speciálního druhu; z a do tohoto jmenného prostoru nelze stránky přesouvat.',
-'imagenocrossnamespace'   => 'Nelze přesunout mimo jmenný prostor Soubor:',
-'imagetypemismatch'       => 'Nová přípona souboru neodpovídá jeho typu',
-'imageinvalidfilename'    => 'Název cílového souboru není platný',
-'fix-double-redirects'    => 'Opravit všechna přesměrování směřující na původní název',
+'delete_and_move_confirm'      => 'Ano, smazat cílovou stránku',
+'delete_and_move_reason'       => 'Smazáno pro umožnění přesunu',
+'selfmove'                     => 'Původní a nový název jsou stejné; nelze stránku přesunout na sebe samu.',
+'immobile-source-namespace'    => 'Stránky ve jmenném prostoru „$1“ nelze přesouvat',
+'immobile-target-namespace'    => 'Stránky nelze přesouvat do jmenného prostoru „$1“',
+'immobile-target-namespace-iw' => 'Mezijazykový odkaz není validní cíl při přesouvání stránky.',
+'immobile-source-page'         => 'Tuto stránku nelze přesouvat.',
+'immobile-target-page'         => 'Stránku nelze přesunout na zadaný název.',
+'imagenocrossnamespace'        => 'Nelze přesunout mimo jmenný prostor Soubor:',
+'imagetypemismatch'            => 'Nová přípona souboru neodpovídá jeho typu',
+'imageinvalidfilename'         => 'Název cílového souboru není platný',
+'fix-double-redirects'         => 'Opravit všechna přesměrování směřující na původní název',
+'move-leave-redirect'          => 'Ponechat přesměrování',
 
 # Export
 'export'            => 'Exportovat stránky',
@@ -2090,7 +2318,7 @@ Cílová stránka „[[:$1]]“ již existuje. Přejete si ji smazat pro uvolně
 
 Do níže uvedeného edita�ního pole zadejte názvy stránek, které chcete exportovat; každý řádek jeden název. Zvolte také, zda se mají exportovat i starší verze stránky v�etně informací v historii editací, nebo jen aktuální verze s informací o poslední editaci.
 
-V druhém případě můžete také používat přímý odkaz, např. pomocí [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] se vyexportuje „[[{{MediaWiki:Mainpage}}]]“.',
+V druhém případě můžete také používat přímý odkaz, např. pomocí [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] se vyexportuje „[[{{MediaWiki:Mainpage}}]]“.',
 'exportcuronly'     => 'Zahrnout jen sou�asnou verzi, ne plnou historii',
 'exportnohistory'   => "----
 '''Poznámka:''' export plných historií prostřednictvím tohoto formuláře byl z výkonnostních důvodů zakázán.",
@@ -2123,9 +2351,12 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'import'                     => 'Import stránek',
 'importinterwiki'            => 'Import mezi wiki',
 'import-interwiki-text'      => 'Pro import zvolte zdrojovou wiki a název stránky. Data revizí a jména autorů budou zachována. Všechny importy se zaznamenávají do [[Special:Log/import|knihy importů]].',
+'import-interwiki-source'    => 'Zdrojová wiki/stránka:',
 'import-interwiki-history'   => 'Zkopírovat všechny historické verze této stránky',
 'import-interwiki-submit'    => 'Importovat',
 'import-interwiki-namespace' => 'Cílový jmenný prostor:',
+'import-upload-filename'     => 'Jméno souboru:',
+'import-comment'             => 'Zdůvodnění:',
 'importtext'                 => 'Prosím exportujte soubor ze zdrojové wiki pomocí nástroje [[Special:Export|{{ns:special}}:Export]], uložte jej na svůj disk a nahrajte ho sem.',
 'importstart'                => 'Stránky se importují…',
 'import-revision-count'      => '$1 {{PLURAL:$1|revize|revize|revizí}}',
@@ -2159,19 +2390,19 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revizi|revize|revizí}} z $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Moje uživatelská stránka',
+'tooltip-pt-userpage'             => 'Vaše uživatelská stránka',
 'tooltip-pt-anonuserpage'         => 'Uživatelská stránka pro IP adresu, ze které editujete',
-'tooltip-pt-mytalk'               => 'Moje diskusní stránka',
+'tooltip-pt-mytalk'               => 'Vaše diskusní stránka',
 'tooltip-pt-anontalk'             => 'Diskuse o editacích provedených z této IP adresy',
 'tooltip-pt-preferences'          => 'Moje nastavení',
 'tooltip-pt-watchlist'            => 'Seznam stránek, jejichž změny sleduji',
-'tooltip-pt-mycontris'            => 'Seznam mých příspěvků',
+'tooltip-pt-mycontris'            => 'Seznam vašich příspěvků',
 'tooltip-pt-login'                => 'Doporu�ujeme vám přihlásit se, ovšem není to povinné.',
 'tooltip-pt-anonlogin'            => 'Doporu�ujeme vám přihlásit se, ovšem není to povinné.',
 'tooltip-pt-logout'               => 'Odhlásit se',
 'tooltip-ca-talk'                 => 'Diskuse ke stránce',
 'tooltip-ca-edit'                 => 'Tuto stránku můžete editovat. Prosíme použijte tla�ítko Ukázat náhled před uložením.',
-'tooltip-ca-addsection'           => 'Přidat k této diskusi svůj komentář.',
+'tooltip-ca-addsection'           => 'Za�ít novou sekci',
 'tooltip-ca-viewsource'           => 'Tato stránka je zam�ena. Můžete si prohlédnout její zdrojový kód.',
 'tooltip-ca-history'              => 'Starší verze této stránky.',
 'tooltip-ca-protect'              => 'Zamknout tuto stránku.',
@@ -2218,6 +2449,8 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'tooltip-watch'                   => 'Přidat stránku do seznamu sledovaných',
 'tooltip-recreate'                => 'Obnovit stánku i když byla smazána',
 'tooltip-upload'                  => 'Odesílání souboru',
+'tooltip-rollback'                => '„Vrácení zpět“ jedním kliknutím zruší všechny editace provedené posledním uživatelem.',
+'tooltip-undo'                    => '„Zrušit editaci“ otevře okno editace, které neobsahuje změny provedené v rušené editaci. Je možné doplnit zdůvodnění do shrnutí editace.',
 
 # Stylesheets
 'common.css'      => '/* Zde uvedené CSS bude ovlivňovat všechny styly */',
@@ -2229,6 +2462,8 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'chick.css'       => '/* Zde uvedené CSS bude ovlivňovat pouze styl „Kuře“ */',
 'simple.css'      => '/* Zde uvedené CSS bude ovlivňovat pouze styl „Jednoduchý“ */',
 'modern.css'      => '/* Zde uvedené CSS bude ovlivňovat pouze styl „Moderní“ */',
+'print.css'       => '/* Zde uvedené CSS bude ovlivňovat tiskový výstup */',
+'handheld.css'    => '/* Zde uvedené CSS bude ovlivňovat přenosná zařízení vycházející ze stylu nastaveného v proměnné $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => '/* Zde uvedený JavaScript bude použit pro všechny uživatele při na�tení každé stránky.  */',
@@ -2247,12 +2482,12 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'notacceptable'     => 'Tento wiki server není schopen poskytnout data ve formátu, který by váš klient byl schopen pře�íst.',
 
 # Attribution
-'anonymous'        => 'anonymní uživatel(é) {{GRAMMAR:2sg|{{SITENAME}}}}',
+'anonymous'        => 'anonymní {{PLURAL:$1|uživatel|uživatelé|uživatelé}} {{GRAMMAR:2sg|{{SITENAME}}}}',
 'siteuser'         => 'uživatel {{grammar:2sg|{{SITENAME}}}} $1',
 'lastmodifiedatby' => 'Tuto stránku naposledy měnil $3 v $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Do textu přispěli $1.',
 'others'           => 'ostatní',
-'siteusers'        => 'uživatel(é) {{grammar:2sg|{{SITENAME}}}} $1',
+'siteusers'        => '{{PLURAL:$2|uživatel|uživatelé|uživatelé}} {{grammar:2sg|{{SITENAME}}}} $1',
 'creditspage'      => 'Zásluhy za stránku',
 'nocredits'        => 'K této stránce neexistuje informace o zásluhách.',
 
@@ -2272,6 +2507,15 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'numauthors'     => 'Po�et různých autorů (obsahová stránka): $1',
 'numtalkauthors' => 'Po�et různých autorů (diskusní stránka): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasický',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Kolínská modř',
+'skinname-myskin'      => 'Můj vzhled',
+'skinname-chick'       => 'Kuře',
+'skinname-simple'      => 'Jednoduchý',
+'skinname-modern'      => 'Moderní',
+
 # Math options
 'mw_math_png'    => 'Vždy jako PNG',
 'mw_math_simple' => 'Jednoduché jako HTML, jinak PNG',
@@ -2292,10 +2536,12 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'markedaspatrollederror-noautopatrol' => 'Nemáte dovoleno ozna�ovat vlastní editace jako prověřené.',
 
 # Patrol log
-'patrol-log-page'   => 'Kniha prověřených editací',
-'patrol-log-header' => 'Toto je kniha prověřených verzí.',
-'patrol-log-line'   => 'ozna�uje revizi $1 stránky $2 za prověřenou $3',
-'patrol-log-auto'   => '(automaticky)',
+'patrol-log-page'      => 'Kniha prověřených editací',
+'patrol-log-header'    => 'Toto je kniha prověřených verzí.',
+'patrol-log-line'      => 'ozna�uje $1 stránky $2 za prověřenou $3',
+'patrol-log-auto'      => '(automaticky)',
+'patrol-log-diff'      => 'revizi $1',
+'log-show-hide-patrol' => '$1 knihu záznamů patroly',
 
 # Image deletion
 'deletedrevision'                 => 'Smazána stará revize $1',
@@ -2312,6 +2558,9 @@ $1',
 'previousdiff' => '� Porovnání se starší verzí',
 'nextdiff'     => 'Porovnání s novější verzí →',
 
+# Visual comparison
+'visual-comparison' => 'Porovnání vzhledu',
+
 # Media information
 'mediawarning'         => "'''Upozornění''': Tento soubor může obsahovat škodlivý kód, spuštěním můžete ohrozit svůj po�íta�.<hr />",
 'imagemaxsize'         => 'Omezit obrázky na stránkách s popiskem na:',
@@ -2324,10 +2573,12 @@ $1',
 'show-big-image'       => 'Obrázek ve vyšším rozlišení',
 'show-big-image-thumb' => '<small>Velikost tohoto náhledu je: $1 × $2 pixelů</small>',
 
-# Special:NewImages
-'newimages'             => 'Galerie nových obrázků',
-'imagelisttext'         => "Níže je {{PLURAL:$1|jeden obrázek|seznam '''$1'''&nbsp;obrázků seřazených $2|seznam '''$1'''&nbsp;obrázků seřazených $2}}.",
+# Special:NewFiles
+'newimages'             => 'Galerie nových souborů',
+'imagelisttext'         => "Níže je {{plural:$1|jeden soubor|seznam '''$1'''&nbsp;souborů seřazených $2|seznam '''$1'''&nbsp;souborů seřazených $2}}.",
 'newimages-summary'     => 'Na této speciální stránce se zobrazují poslední na�tené soubory.',
+'newimages-legend'      => 'Filtr',
+'newimages-label'       => 'Název souboru (nebo jeho �ást):',
 'showhidebots'          => '($1 roboty)',
 'noimages'              => 'Není co zobrazit.',
 'ilsubmit'              => 'Hledat',
@@ -2530,6 +2781,18 @@ Obsahuje pouze seznam s odrážkami (řádka zaÄ�íná s *). První odkaz na Å™Ã
 'exif-lightsource-24'  => 'ISO studiová žárovka',
 'exif-lightsource-255' => 'Jiný světelný zdroj',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Blesk nebyl použit',
+'exif-flash-fired-1'    => 'Blesk byl použit',
+'exif-flash-return-0'   => 'funkce pro rozpoznání odrazů blesku není k dispozici',
+'exif-flash-return-2'   => 'odraz blesku nebyl zaznamenán',
+'exif-flash-return-3'   => 'byl zaznamenán odraz blesku',
+'exif-flash-mode-1'     => 'vynucené použití blesku',
+'exif-flash-mode-2'     => 'použití blesku zakázáno',
+'exif-flash-mode-3'     => 'automatický režim',
+'exif-flash-function-1' => 'Blesk není k dispozici',
+'exif-flash-redeye-1'   => 'režim potla�ení jevu �ervených o�í',
+
 'exif-focalplaneresolutionunit-2' => 'in',
 
 'exif-sensingmethod-1' => 'Není známo',
@@ -2672,21 +2935,10 @@ $1
 Opravdu si přejete znovu tuto stránku založit?',
 'recreate'            => 'Znovu založit',
 
-# HTML dump
-'redirectingto' => 'Přesměrovává se na [[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'Aktualizovat cachovanou verzi této stránky?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Hledat stránky obsahující ''$1''.",
-'searchnamed'      => "Hledat stránky pojmenované ''$1''.",
-'articletitles'    => "Stránky za�ínající ''$1''",
-'hideresults'      => 'Skrýt výsledky',
-'useajaxsearch'    => 'Použít při hledání AJAX',
+'confirm-purge-top'    => 'Aktualizovat cachovanou verzi této stránky?',
+'confirm-purge-bottom' => 'Aktualizace stránky vymaže cache a vynutí zobrazení nejaktuálnější verze.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� předchozí stránka',
@@ -2706,10 +2958,10 @@ $1',
 'table_pager_empty'        => 'Nic nebylo nalezeno',
 
 # Auto-summaries
-'autosumm-blank'   => 'Vyprázdnění stránky',
+'autosumm-blank'   => 'Stránka vyprázdněna',
 'autosumm-replace' => 'Obsah stránky nahrazen textem „$1“',
 'autoredircomment' => 'Přesměrování na [[$1]]',
-'autosumm-new'     => 'Nová stránka: $1',
+'autosumm-new'     => 'Založena nová stránka: $1',
 
 # Size units
 'size-kilobytes' => '$1 kB',
@@ -2789,6 +3041,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'Neznámá zna�ka rozšíření: „$1“',
+'duplicate-defaultsort' => 'Upozornění: Implicitní klí� řazení (DEFAULTSORTKEY) „$2“ přepisuje dříve nastavenou hodnotu „$1“.',
 
 # Special:Version
 'version'                          => 'Verze', # Not used as normal message but as header for the special page itself
@@ -2817,13 +3070,13 @@ $1',
 'filepath-submit'  => 'Cesta',
 'filepath-summary' => 'Tato speciální stránka vrátí úplnou cestu k souboru. Obrázky se zobrazí v plném rozlišení, jiné typy souborů se otevřenou v  přiřazených programech.
 
-Jméno souboru vkládejte bez ozna�ení "{{ns:image}}:" .',
+Jméno souboru vkládejte bez ozna�ení "{{ns:file}}:" .',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Hledání duplicitních souborů',
 'fileduplicatesearch-summary'  => 'Hledání duplicitních souborů vychází z hodnoty hashovací funkce.
 
-Zadejte jméno souboru bez ozna�ení "{{ns:image}}:".',
+Zadejte jméno souboru bez ozna�ení "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Hledání duplikátů',
 'fileduplicatesearch-filename' => 'Jméno souboru:',
 'fileduplicatesearch-submit'   => 'Hledat',
@@ -2853,4 +3106,13 @@ Zadejte jméno souboru bez ozna�ení "{{ns:image}}:".',
 'blankpage'              => 'Prázdná stránka',
 'intentionallyblankpage' => 'Tato stránka je úmyslně prázdná. Používá se na měření výkonnosti atd.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Tuto řádku ponechte beze změny.<pre>
+#Níže uve�te fragmenty regulárních výrazů (pouze �ást mezi //).
+#Tyto výrazy se aplikují na URL vkládaných externích obrázků.
+#Ty, které vyhoví, se zobrazí jako obrázek; ostatní pouze jako externí odkaz.
+#Řádky za�ínající znakem # se považují za komentáře.
+
+#Všechny regulární výrazy uve�te nad touto řádkou. Tuto řádku ponechte beze změny.</pre>',
+
 );
diff --git a/languages/messages/MessagesCsb.php b/languages/messages/MessagesCsb.php
index 63cb57d3..4a6547c7 100644
--- a/languages/messages/MessagesCsb.php
+++ b/languages/messages/MessagesCsb.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Kaszeba
  * @author MinuteElectron
  * @author Warszk
  * @author לערי ריינה�רט
@@ -18,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Diskùsëjô_brëkòwnika',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Diskùsëjô_$1',
-	NS_IMAGE            => 'Òbrôzk',
-	NS_IMAGE_TALK       => 'Diskùsëjô_òbrôzków',
+	NS_FILE             => 'Òbrôzk',
+	NS_FILE_TALK        => 'Diskùsëjô_òbrôzków',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Diskùsëjô_MediaWiki',
 	NS_TEMPLATE         => 'Szablóna',
@@ -60,8 +61,8 @@ $messages = array(
 'tog-enotifrevealaddr'        => 'Pòkażë mòją adresã e-mail w òdkôzëwùjącym mailu',
 'tog-shownumberswatching'     => 'Pòkażë lëczba ùzérającëch brëkòwników',
 'tog-fancysig'                => 'Prosti pòdpisënk (bez aùtomatnëch lënków)',
-'tog-externaleditor'          => 'Brëkùjë domëslno bùtnowégò editora',
-'tog-externaldiff'            => 'Brëkùjë domëslno bùtnowégò nôrzãdza diff',
+'tog-externaleditor'          => 'Brëkùjë domëslno bùtnowégò editora (blós dlô ekspertów, je nót ekstra nastôwów w twòjim kòmpùtrze)',
+'tog-externaldiff'            => 'Brëkùjë domëslno bùtnowégò nôrzãdza diff (blós dlô ekspertów.je nót ekstra nastôwów w twòjim kòmpùtrze)',
 'tog-showjumplinks'           => 'Włączë lënczi przëstãpù "òbaczë téż"',
 'tog-uselivepreview'          => 'Brëkùjë wtimczasnegò pòdzérkù (JavaScript) (eksperimentalné)',
 'tog-forceeditsummary'        => 'Pëtôj przed wéńdzenim do pùstégò pòdrechòwania edicëji',
@@ -76,8 +77,6 @@ $messages = array(
 'underline-never'   => 'Nigdë',
 'underline-default' => 'Domëslny przezérnik',
 
-'skinpreview' => '(Pòdzérk)',
-
 # Dates
 'sunday'        => 'niedzéla',
 'monday'        => 'pòniédzôłk',
@@ -131,11 +130,12 @@ $messages = array(
 'dec'           => 'gòd',
 
 # Categories related messages
-'pagecategories'        => '{{PLURAL:$1|Kategòrëjô|Kategòrëje}}',
-'category_header'       => 'Artikle w kategòrëji "$1"',
-'subcategories'         => 'Pòdkategòrëje',
-'category-media-header' => 'Media w kategòrëji "$1"',
-'category-empty'        => "''Ta ktegòrëja nie zamëkô w se terô niżódnëch artiklów ni mediów.''",
+'pagecategories'         => '{{PLURAL:$1|Kategòrëjô|Kategòrëje}}',
+'category_header'        => 'Artikle w kategòrëji "$1"',
+'subcategories'          => 'Pòdkategòrëje',
+'category-media-header'  => 'Media w kategòrëji "$1"',
+'category-empty'         => "''Ta ktegòrëja nie zamëkô w se terô niżódnëch artiklów ni mediów.''",
+'listingcontinuesabbrev' => 'kònt.',
 
 'mainpagetext' => "<big>'''MediaWiki òsta zainstalowónô.'''</big>",
 
@@ -155,61 +155,80 @@ $messages = array(
 'mytalk'         => 'Diskùsëjô',
 'anontalk'       => 'Diskùsëjô dlô ti IP-adresë',
 'navigation'     => 'Nawigacëjô',
-'and'            => 'ë',
+'and'            => '&#32;ë',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
 
-'errorpagetitle'   => 'Brida',
-'returnto'         => 'Wôrcë sã do starnë: $1.',
-'tagline'          => 'Z {{SITENAME}}',
-'help'             => 'Pòmòc',
-'search'           => 'Szëkba',
-'searchbutton'     => 'Szëkba',
-'go'               => 'Biôj!',
-'searcharticle'    => 'Biôj!',
-'history'          => 'Historëjô starnë',
-'history_short'    => 'Historëjô',
-'updatedmarker'    => 'aktualizowóne òd mòji slédny wizytë',
-'info_short'       => 'Wëdowiédza',
-'printableversion' => 'Wersëjô do drëkù',
-'print'            => 'Drëkùjë',
-'edit'             => 'Edicëjô',
-'editthispage'     => 'Editëjë ną starnã',
-'delete'           => 'Rëmôj',
-'deletethispage'   => 'Rëmôj tã starnã',
-'protect'          => 'Zazychrëjë',
-'unprotect'        => 'Òdzychrëjë',
-'talkpagelinktext' => 'Diskùsëjô',
-'specialpage'      => 'Specjalnô starna',
-'personaltools'    => 'Priwatné przërëchtënczi',
-'postcomment'      => 'Dôj dopòwiesc',
-'articlepage'      => 'Starna artikla',
-'talk'             => 'Diskùsëjô',
-'views'            => 'Pòdzérków',
-'toolbox'          => 'Przërëchtënczi',
-'imagepage'        => 'Starna òbrôzka',
-'viewtalkpage'     => 'Starna diskùsëji',
-'otherlanguages'   => 'W jinëch jãzëkach',
-'redirectedfrom'   => '(Przeczerowóné z $1)',
-'lastmodifiedat'   => 'Na starna bëła slédno editowónô ò $2, $1;', # $1 date, $2 time
-'viewcount'        => 'Na starna je òbzéranô ju {{PLURAL:$1|jeden rôz|$1 razy}}',
-'protectedpage'    => 'Starna je zazychrowónô',
-'jumpto'           => 'Skòczë do:',
-'jumptonavigation' => 'nawigacëji',
-'jumptosearch'     => 'szëkbë',
+'errorpagetitle'    => 'Brida',
+'returnto'          => 'Wôrcë sã do starnë: $1.',
+'tagline'           => 'Z {{SITENAME}}',
+'help'              => 'Pòmòc',
+'search'            => 'Szëkba',
+'searchbutton'      => 'Szëkba',
+'go'                => 'Biôj!',
+'searcharticle'     => 'Biôj!',
+'history'           => 'Historëjô starnë',
+'history_short'     => 'Historëjô',
+'updatedmarker'     => 'aktualizowóne òd mòji slédny wizytë',
+'info_short'        => 'Wëdowiédza',
+'printableversion'  => 'Wersëjô do drëkù',
+'permalink'         => 'Prosti lënk',
+'print'             => 'Drëkùjë',
+'edit'              => 'Edicëjô',
+'create'            => 'Ùsôdzë',
+'editthispage'      => 'Editëjë ną starnã',
+'create-this-page'  => 'Ùsôdzë nã starnã',
+'delete'            => 'Rëmôj',
+'deletethispage'    => 'Rëmôj tã starnã',
+'protect'           => 'Zazychrëjë',
+'protect_change'    => 'zmieni',
+'protectthispage'   => 'Zazychrëjë nã starnã',
+'unprotect'         => 'Òdzychrëjë',
+'unprotectthispage' => 'Òdzychrëjë nã starnã',
+'newpage'           => 'Nowô starna',
+'talkpage'          => 'Diskùsëjô starnë',
+'talkpagelinktext'  => 'Diskùsëjô',
+'specialpage'       => 'Specjalnô starna',
+'personaltools'     => 'Priwatné przërëchtënczi',
+'postcomment'       => 'Dôj dopòwiesc',
+'articlepage'       => 'Starna artikla',
+'talk'              => 'Diskùsëjô',
+'views'             => 'Pòdzérków',
+'toolbox'           => 'Przërëchtënczi',
+'userpage'          => 'Wëskrzëni starnã brëkòwnika',
+'projectpage'       => 'Wëskrzëni stranã ùdbë',
+'imagepage'         => 'Starna òbrôzka',
+'mediawikipage'     => 'Wëskrzëni starnã wiadła',
+'templatepage'      => 'Wëskrzëni starnã wëzdrzatkù',
+'viewhelppage'      => 'Wëskrzëni starnã pòmòcë',
+'categorypage'      => 'Wëskrzëni starnã kategòrëji',
+'viewtalkpage'      => 'Starna diskùsëji',
+'otherlanguages'    => 'W jinëch jãzëkach',
+'redirectedfrom'    => '(Przeczerowóné z $1)',
+'redirectpagesub'   => 'Przeczerëjë starnã',
+'lastmodifiedat'    => 'Na starna bëła slédno editowónô ò $2, $1;', # $1 date, $2 time
+'viewcount'         => 'Na starna je òbzéranô ju {{PLURAL:$1|jeden rôz|$1 razy}}',
+'protectedpage'     => 'Starna je zazychrowónô',
+'jumpto'            => 'Skòczë do:',
+'jumptonavigation'  => 'nawigacëji',
+'jumptosearch'      => 'szëkbë',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ã’ {{SITENAME}}',
 'aboutpage'            => 'Project:Ã’_{{SITENAME}}',
 'copyright'            => 'Zamkłosc hewòtny starnë je ùżëczónô wedle reglów $1.',
+'copyrightpage'        => '{{ns:project}}:Ùsôdzkòwé_prawa',
 'disclaimers'          => 'Prawné zastrzedżi',
 'disclaimerpage'       => 'Project:General_disclaimer',
 'edithelp'             => 'Pòmòc do edicëji',
+'edithelppage'         => 'Help:Editowanié starnë',
 'mainpage'             => 'Przédnô starna',
 'mainpage-description' => 'Przédnô starna',
 'portal'               => 'Pòrtal wëcmaniznë',
 'portal-url'           => 'Project:Pòrtal wëcmaniznë',
+'privacy'              => 'Priwatnota',
+'privacypage'          => 'Project:Priwatnota',
 
 'badaccess' => 'Procëmprawne ùdowierzenie',
 
@@ -217,20 +236,34 @@ $messages = array(
 'versionrequiredtext' => 'Bë brëkòwac ną starnã wëmôgónô je wersëjô $1 MediaWiki. Òbaczë starnã [[Special:Version]]',
 
 'ok'                      => 'Jo!',
+'retrievedfrom'           => 'Z "$1"',
 'youhavenewmessages'      => 'Môsz $1 ($2).',
 'newmessageslink'         => 'nowe wiadła',
+'newmessagesdifflink'     => 'slédnô zmiana',
 'youhavenewmessagesmulti' => 'Môsz nowé klëczi: $1',
 'editsection'             => 'Edicëjô',
 'editold'                 => 'Edicëjô',
+'viewsourceold'           => 'wëskrzëni zdrój',
+'editlink'                => 'editëje',
+'viewsourcelink'          => 'wëskrzëni zdrój',
+'editsectionhint'         => 'Editëjë dzél: $1',
 'toc'                     => 'Spisënk zamkłoscë',
 'showtoc'                 => 'pokôż',
 'hidetoc'                 => 'zatacë',
 'viewdeleted'             => 'Òbaczë $1',
+'feedlinks'               => 'Pòwrózk:',
+'site-rss-feed'           => 'Pòwrózk RSS dlô $1',
+'site-atom-feed'          => 'Pòwrózk Atom dlô $1',
+'page-rss-feed'           => 'Pòwrózk RSS dlô "$1"',
+'page-atom-feed'          => 'Pòwrózk Atom dlô "$1"',
+'feed-atom'               => 'Atom',
+'feed-rss'                => 'RSS',
+'red-link-title'          => '$1 (felëje starna)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikel',
 'nstab-user'      => 'Starna brëkòwnika',
-'nstab-special'   => 'Specjalnô',
+'nstab-special'   => 'Specjalnô starna',
 'nstab-project'   => 'meta-starna',
 'nstab-image'     => 'Òbrôzk',
 'nstab-mediawiki' => 'ògłosënk',
@@ -246,6 +279,12 @@ $messages = array(
 'error'            => 'Fela',
 'databaseerror'    => 'Fela w pòdôwkòwi baze',
 'readonly'         => 'Baza pòdôwków je zablokòwónô',
+'missing-article'  => 'W baze pòdôwków felëje zamkłosc starnë "$1" $2.
+
+Zwëczajno je to sparłãczoné òdsélaniém do nieaktualnégò lënka nierównoscë dwóch wersëjów starnë abò do rëmniãti wersëji starnë.
+
+Jeżlë tak nie je, mòżlëwé je, że je to problem sparłãczony z felą w softwôrze.
+Mòże to zgłoszëc [[Special:ListUsers/sysop|sprôwnikòwi]], pòdając adresã URL.',
 'internalerror'    => 'Bënowô fela',
 'filecopyerror'    => 'Ni mòże skòpérowac lopka "$1" do "$2".',
 'filerenameerror'  => 'Ni mòże zmienic miona lopka "$1" na "$2".',
@@ -257,7 +296,8 @@ $messages = array(
 'badtitletext'     => 'Pòdóny titel starnë je òchëbny. Gwësno są w nim znaczi, chtërnëch brëkòwanié je zakôzané abò je pùsti.',
 'viewsource'       => 'Zdrojowi tekst',
 'viewsourcefor'    => 'dlô $1',
-'editinginterface' => "'''ÒSTRZÉGA:''' Editëjesz starnã jaka je brëkòwónô dlô dotegòwóniô tekstu interfejsu dlô soft-wôrë. Wszëtczé zmianë tu zrobioné bãdze widzec na interfejse brëkòwnika.",
+'editinginterface' => "'''ÒSTRZÉGA:''' Editëjesz starnã, jakô zamëkô w se tekst interfejsu softwôrë. Wszëtczé zmianë tu zrobioné bãdze widzec na interfejse jinszëch brëkòwników.
+Przemëszlë dolmaczënié na [http://translatewiki.net/wiki/Main_Page?setlang=csb translatewiki.net], ekstra ùdbie lokalizacëji softwôrë MediaWiki.",
 
 # Login and logout pages
 'logouttitle'                => 'Wëlogòwanié brëkòwnika',
@@ -274,7 +314,7 @@ $messages = array(
 'logout'                     => 'Wëlogùjë mie',
 'userlogout'                 => 'Wëlogòwanié',
 'notloggedin'                => 'Felëje logòwóniô',
-'nologin'                    => 'Nié môsz logina? $1.',
+'nologin'                    => 'Ni môsz kònta? $1.',
 'nologinlink'                => 'Ùsôdzë kònto',
 'createaccount'              => 'Założë nowé kònto',
 'gotaccount'                 => 'Masz ju kònto? $1.',
@@ -282,89 +322,189 @@ $messages = array(
 'createaccountmail'          => 'òb e-mail',
 'badretype'                  => 'Wprowadzone parole jinaczą sã midze sobą.',
 'userexists'                 => 'To miono brëkòwnika je ju w ùżëcym. Proszã wëbrac jiné miono.',
+'youremail'                  => 'E-mail:',
 'username'                   => 'Miono brëkòwnika:',
 'uid'                        => 'ID brëkòwnika:',
 'yourrealname'               => 'Twòje jistné miono*',
 'yourlanguage'               => 'Twój jãzëk:',
 'yourvariant'                => 'Wariant:',
-'yournick'                   => 'Przezwëstkò (nick):',
+'yournick'                   => 'Pòdpisënk:',
 'badsig'                     => 'Òchëbny pòdpisënk, sprôwdzë tadżi HTML.',
-'badsiglength'               => 'To miono je za dłudżé. Mô bëc mni jakno $1 céchów.',
+'badsiglength'               => 'Pòdpisënk je za dłudżi. 
+Mô bëc mni jakno $1 {{PLURAL:$1|znak|znaczi/znaków}}.',
+'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Prôwdzewi miono je òptacjowé a czej je dôsz, òstanié ùżëté do pòdpisaniô Twòjégò wkłôdu',
 'loginerror'                 => 'Fela logòwaniô',
-'prefs-help-email'           => 'Adresa e-mail je òptacëjnô, le pòzwôlô òna jinëm na kòntakt z Tobą bez starnã brëkòwnika abò starnã diskùsëji nie pòkazëjąc Twòjich pòdôwków.',
+'prefs-help-email'           => 'Adresa e-mail je òptacëjnô, zezwôlô równak sélac do ce nową parolã jak tã zabëjesz.
+Mòżesz zezwòlëc jinszim brëkòwniką na łączbã z Tobą przez Twòją starnã abò starnã diskùsëji, bez mùszebnotë wëskrzënianiô swòjich pòdôwków.',
 'loginsuccesstitle'          => 'ùdałé logòwanié',
 'loginsuccess'               => 'Të jes wlogòwóny do {{SITENAME}} jakno "$1".',
-'nosuchuser'                 => 'Nie da taczégò brëkòwnika "$1". Sprôwdzë pisënk abò wëfùlujë fòrmular bë założëc nowé kònto.',
+'nosuchuser'                 => 'Nie dô brëkòwnika ò mionie "$1". 
+Sprôwdzë pisënk abò [[Special:UserLogin/signup|ùsôdzë nowé kònto]].',
+'nouserspecified'            => 'Mùszisz pòdac miono brëkòwnika.',
+'wrongpassword'              => 'Lëchô parola.
+Spróbùjë znowa.',
+'wrongpasswordempty'         => 'Wpisónô parola je pùstô
+Spróbùjë znowa.',
+'passwordtooshort'           => 'Twòjô parola je lëchô abò za krótkô.
+Mùszi zamëkac w se co nômni $1 {{PLURAL:$1|céch|céchë|céchów}} ë bëc jinszô jakno Twòje miono brëkòwnika.',
+'mailmypassword'             => 'Wëslë nową parolã e-mailą',
+'passwordremindertitle'      => 'Nowô doczasnô parola dlô {{SITENAME}}',
 'passwordremindertext'       => 'Chtos (prôwdëjuwerno Të, z adresë $1) pòprosëł ò wësłanié nowi parolë dopùscënkù do {{SITENAME}} ($4). Aktualnô parola dlô brëkòwnika "$2" je "$3". Nôlepi mdze czej wlogùjesz sã terô ë zarô zmienisz parolã.',
 'noemail'                    => 'W baze ni ma email-adresë dlô brëkòwnika "$1".',
-'acct_creation_throttle_hit' => 'Môsz zrobiony ju $1 kontów. Nie mòżesz miec ju wicy.',
-'emailauthenticated'         => 'Twòjô adresa e-mail òsta pòcwierdzonô $1.',
+'acct_creation_throttle_hit' => 'Môsz ùsôdzoné ju {{PLURAL:$1|1 kònto|$1 kontów}}. 
+Ni mòżesz miec ju wicy.',
+'emailauthenticated'         => 'Twòjô adresa e-mail òsta pòcwierdzonô $2 ò $3.',
 'accountcreated'             => 'Konto założone',
 'accountcreatedtext'         => 'Konto brëkòwnika dlô $1 je założone.',
+'createaccount-title'        => 'Kònto ùsôdzoné dlô {{SITENAME}}',
+
+# Password reset dialog
+'oldpassword' => 'Stôrô parola:',
+'newpassword' => 'Nowô parola',
+'retypenew'   => 'Napiszë nową parolã jesz rôz',
 
 # Edit page toolbar
-'bold_sample'   => 'Wëtłëszczony drëk',
-'bold_tip'      => 'Wëtłëszczony drëk',
-'nowiki_sample' => 'Wstôw tuwò niesfòrmatowóny tekst',
-'nowiki_tip'    => 'Ignorëjë wiki-fòrmatowanié',
-'hr_tip'        => 'Wòdorównô (horizontalnô) linijô (brëkùjë szpôrowno)',
+'bold_sample'     => 'Wëtłëszczony drëk',
+'bold_tip'        => 'Wëtłëszczony drëk',
+'italic_sample'   => 'Ùchëłi tekst',
+'italic_tip'      => 'Ùchëłi tekst (italic)',
+'link_sample'     => 'Titel lënka',
+'link_tip'        => 'Bënowi lënk',
+'extlink_sample'  => 'http://www.example.com titel lënka',
+'extlink_tip'     => 'Bùtnowi lënk (pamiãtôj ò http:// prefiks)',
+'headline_sample' => 'Tekst nagłówka',
+'headline_tip'    => 'Nagłówk 2 lédżi',
+'math_sample'     => 'Wstôwi tuwò fòrmùłã',
+'math_tip'        => 'Matematicznô fòrmùła (LaTeX)',
+'nowiki_sample'   => 'Wstôw tuwò niesfòrmatowóny tekst',
+'nowiki_tip'      => 'Ignorëjë wiki-fòrmatowanié',
+'image_sample'    => 'Przëmiôr.jpg',
+'image_tip'       => 'Òbsôdzony lopk (n.p. òbrôzk)',
+'media_sample'    => 'Przëmiôr.ogg',
+'media_tip'       => 'Lënk lopka',
+'sig_tip'         => 'Twój pòdpisënk z datumã a czasã',
+'hr_tip'          => 'Hòrizontalnô linijô (brëkùjë szpórowno)',
 
 # Edit pages
-'summary'               => 'Pòdrechòwanié',
-'minoredit'             => 'Drobnô edicëjô.',
-'watchthis'             => 'Ùzérôj',
-'savearticle'           => 'Zapiszë artikel',
-'preview'               => 'Pòdzérk',
-'showpreview'           => 'Pòdzérk',
-'showlivepreview'       => 'Pòdzérk',
-'showdiff'              => 'Pòkażë zmianë',
-'anoneditwarning'       => "'''Bôczë:''' Të nie je wlogòwóny. Twòjô adresa IP mdze zapisónô w historëji edicëji ti starnë.",
-'blockedtitle'          => 'Brëkòwnik je zascëgóny',
-'blockedtext'           => "Twòje kònto abò ë IP-adresa òstałë zascëgòwóné przez $1. Pòdónô przëczëna to:<br />''$2''.<br />Bë zgwësnic sprawã zablokòwaniô mòżesz skòntaktowac sã z $1 abò jińszim [[{{MediaWiki:Grouppage-sysop}}|administratorã]].
-
-Boczë, że të nie mòżesz stądka sélac e-mailów, jeżlë nié môsz jesz zaregisterowóné e-mailowé adresë w [[Special:Preferences|nastôwach]].
-
-Twòjô adresa IP to $3. Proszã dodôj nã adresã we wszëtczich pëtaniach.",
-'blockedoriginalsource' => "Zdrój '''$1''' je niżi:",
-'blockededitsource'     => "Tekst '''Twòjëch edicëji''' do '''$1''' je niżi:",
-'whitelistedittitle'    => 'Bë editowac je nót sã wlogòwac',
-'accmailtitle'          => 'Parola wësłónô.',
-'accmailtext'           => 'Parola dlô "$1" je wësłónô do $2.',
-'newarticletext'        => "Môsz przëszłi z lënkù do starnë jaka jesz nie òbstoji.
+'summary'                => 'Pòdrechòwanié:',
+'subject'                => 'Téma/nagłówk:',
+'minoredit'              => 'To je drobnô edicëjô',
+'watchthis'              => 'Ùzérôj',
+'savearticle'            => 'Zapiszë artikel',
+'preview'                => 'Pòdzérk',
+'showpreview'            => 'Wëskrzëni pòdzérk',
+'showlivepreview'        => 'Pòdzérk',
+'showdiff'               => 'Wëskrzëni zmianë',
+'anoneditwarning'        => "'''Bôczë:''' Të nie je wlogòwóny. Twòjô adresa IP mdze zapisónô w historëji edicëji ti starnë.",
+'blockedtitle'           => 'Brëkòwnik je zascëgóny',
+'blockedtext'            => "<big>'''Twòje kònto abò ë IP-adresa òstałë zablokòwóné.'''</big>
+
+Zablokòwôł je $1. 
+Pòdónô przëczëna to:''$2''.
+
+ * Zôczątk blokadë: $8
+ * Kùńc blokadë: $6
+ * Cél blokadë: $7
+
+
+Bë zgwësnic sprawã zablokòwaniô mòżesz skòntaktowac sã z $1 abò jińszim [[{{MediaWiki:Grouppage-sysop}}|administratorã]].
+Boczë, że të ni mòżesz stądka sélac e-mailów, jeżlë nié môsz jesz zaregisterowóné e-mailowé adresë w [[Special:Preferences|nastôwach]].
+Twòjô aktualnô adresa IP to $3, a zablokòwónô adresa ID to #$5. 
+Proszëmë pòdac wëższé pòdôłczi przë wszëtczich pëtaniach.",
+'blockedoriginalsource'  => "Zdrój '''$1''' je niżi:",
+'blockededitsource'      => "Tekst '''Twòjëch edicëji''' do '''$1''' je niżi:",
+'whitelistedittitle'     => 'Bë editowac je nót sã wlogòwac',
+'accmailtitle'           => 'Parola wësłónô.',
+'accmailtext'            => 'Parola dlô "$1" je wësłónô do $2.',
+'newarticle'             => '(Nowi)',
+'newarticletext'         => "Môsz przëszłi z lënkù do starnë jaka jesz nie òbstoji.
 Bë ùsôdzëc artikel, naczni pisac w kastce niżi (òb. [[{{MediaWiki:Helppage}}|starnã pòmòcë]]
 dlô wicy wëdowiédzë).
 Jeżlë jes të tuwò bez zmiłkã, le klëkni w swòjim przezérnikù knąpã '''nazôd'''.",
-'anontalkpagetext'      => "----''To je starna dyskùsëji anonimòwiégò brëkòwnika, chtëren nie zrobił jesz kònta dlô se, abò gò nie brëkùje.
+'anontalkpagetext'       => "----''To je starna dyskùsëji anonimòwiégò brëkòwnika, chtëren nie zrobił jesz kònta dlô se, abò gò nie brëkùje.
+Abë gò rozpòznac, ùżëwómë adresów IP.
 Takô adresa IP, mòże bëc brëkòwónô òb wiele lëdzy.
-Eżlë klëczi na ti starnie nie są sczérowóne do ce, tedë [[Special:UserLogin|zrobi sobie nowé kònto]] abò zalogùje sã, bë niechac zmiłczi z jinëma anonimòwima brëkòwnikama.''",
-'clearyourcache'        => "'''Bôczë:''' Pò zapisanim, mòże bãdzesz mùszôł òminąc pamiãc przezérnika bë òbaczëc zmianë. '''Mozilla / Firefox / Safari:''' przëtrzëmôj ''Shift'' òbczas klëkaniô na ''Reload'', abò wcësni ''Ctrl-Shift-R'' (''Cmd-Shift-R'' na kòmpùtrach Mac); '''IE:''' przëtrzëmôj ''Ctrl'' òbczas klëkaniô na ''Refresh'', abò wcësni ''Ctrl-F5''; '''Konqueror''': prosto klëkni na knąpã ''Reload'', abò wcësni ''F5''; brëkòwnicë '''Operë''' bãdą mést mùszële wëczëszczëc pamiãc w ''Tools→Preferences''.",
-'previewnote'           => '<strong>To je blós pòdzérk - artikel jesz nie je zapisóny!</strong>',
-'editing'               => 'Edicëjô $1',
-'explainconflict'       => 'Chtos sfórtowôł wprowadzëc swòją wersëjã artikla òbczôs Twòji edicëji. Górné pòle edicëji zamëkô w se tekst starnë aktualno zapisóny w pòdôwkòwi baze. Twòje zmianë są w dólnym pòlu edicëji. Bë wprowadzëc swòje zmianë mùszisz zmòdifikòwac tekst z górnégò pòla. <b>Blós</b> tekst z górnégò pòla mdze zapisóny w baze czej wcësniesz "Zapiszë".',
-'yourtext'              => 'Twój tekst',
-'yourdiff'              => 'Zjinaczi',
-'copyrightwarning'      => 'Bôczë, że wszëtczé edicëje w {{SITENAME}} są wprowadzané pòd zastrzégą $2 (òb. $1 dlô detalów). Jeżlë nie chcesz bë to co napiszesz bëło editowóné czë kòpijowóné, tedë nie zacwierdzôj nëch edicëjów.<br />Zacwierdzając zmianë dôwôsz parolã, że to co môsz napisóné je Twòjégò aùtorstwa, abò skòpijowóné z dostónków public domain abò jinëch wòlnëch licencëjów. <strong>NIE DODÔWÔJ CËZËCH TEKSTÓW BEZ ZEZWÒLENIÔ!</strong>',
-'copyrightwarning2'     => 'Bôczë, że wszëtczé edicëje w {{SITENAME}} mògą bëc editowóné, zmienióné abò rëmniãté bez jinëch brëkòwników. Jeżlë nie chcesz bë Twòja robòta bëła editowónô, tedë nie zacwierdzôj nëch edicëjów.<br />Zacwierdzając zmianë dôwôsz parolã, że to co môsz napisóné je Twòjégò aùtorstwa, abò skòpijowóné z dostónków public domain abò jinëch wòlnëch licencëjów. <strong>NIE DODÔWÔJ CËZËCH TEKSTÓW BEZ ZEZWÒLENIÔ!</strong>',
-'readonlywarning'       => 'BÔCZËNK: Pòdôwkòwô baza òsta sztërkòwô zablokòwónô dlô administracëjnëch célów. Nie mòże tej timczasã zapisac nowi wersëje artikla. Bédëjemë przeniesc ji tekst do priwatnégò lopka
-(wëtnij/wstôw) ë zachòwac na pózni.',
-'templatesused'         => 'Szablónë ùżëti w tim artiklu:',
+Jeżlë jes anonimòwim brëkòwnikã ë ùwôżôsz, że te wiadła nie są do ce sczerowóne, tedë [[Special:UserLogin|ùsôdzë nowé kònto]] abò zalogùje sã, bë niechac niezrozmeiniô z jinëma anonimòwima brëkòwnikama.''",
+'clearyourcache'         => "'''Bôczë: Pò zapisanim, mòże bãdzesz mùszôł òminąc pamiãc przezérnika bë òbaczëc zmianë.''' 
+'''Mozilla / Firefox / Safari:''' przëtrzëmôj ''Shift'' òbczas klëkaniô na ''Zladëjë znowa'', abò wcësni ''Ctrl-F5'' abò ''Ctrl-R'' (''Command-R'' na kòmpùtrach Mac); 
+'''Konqueror:''': klëkni na knąpã ''Zladëjë znowa'', abò wcësni ''F5''; 
+'''Opera:''' wëczëszczë pòdrãczną pamiãc w ''Tools→Preferences''; 
+'''Internet Explorer:'''przëtrzëmôj ''Ctrl'' òbczas klëkaniô na ''Zladëjë znowa'', abò wcësni ''Ctrl-F5''.",
+'updated'                => '(Zaktualnioné)',
+'previewnote'            => "'''To je blós pòdzérk - artikel jesz nie je zapisóny!'''",
+'editing'                => 'Edicëjô $1',
+'editingsection'         => 'Edicëjô $1 (dzél)',
+'explainconflict'        => 'Chtos sfórtowôł wprowadzëc swòją wersëjã artikla òbczôs Twòji edicëji. Górné pòle edicëji zamëkô w se tekst starnë aktualno zapisóny w pòdôwkòwi baze. Twòje zmianë są w dólnym pòlu edicëji. Bë wprowadzëc swòje zmianë mùszisz zmòdifikòwac tekst z górnégò pòla. <b>Blós</b> tekst z górnégò pòla mdze zapisóny w baze czej wcësniesz "Zapiszë".',
+'yourtext'               => 'Twój tekst',
+'yourdiff'               => 'Zjinaczi',
+'copyrightwarning'       => "Bôczë, że wszëtczé edicëje w {{SITENAME}} są wprowadzané pòd zastrzégą $2 (òb. $1 dlô detalów). Jeżlë nie chcesz bë to co napiszesz bëło editowóné czë kòpijowóné, tedë nie zacwierdzôj nëch edicëjów.<br />Zacwierdzając zmianë dôwôsz parolã, że to co môsz napisóné je Twòjégò aùtorstwa, abò skòpijowóné z dostónków public domain abò jinëch wòlnëch licencëjów. '''NIE DODÔWÔJ CËZËCH TEKSTÓW BEZ ZEZWÒLENIÔ!'''",
+'copyrightwarning2'      => "Bôczë, że wszëtczé edicëje w {{SITENAME}} mògą bëc editowóné, zmienióné abò rëmniãté bez jinëch brëkòwników. 
+Jeżlë nie chcesz bë Twòja robòta bëła editowónô, tedë nie dodôwôj ji tuwò.<br />
+Zacwierdzając zmianë dôwôsz zgòdã na to, że to co môsz napisóné je Twòjégò aùtorstwa, abò skòpijowóné z dostónków public domain abò jinëch wòlnëch licencëjów (zdrzë za detalama na $1). 
+'''NIE DODÔWÔJ ROBÒTË CHRONIONY ÙSÔDZKÒWIMA PRAWAMA BEZ ZEZWÒLENIÔ!'''",
+'readonlywarning'        => "'''BÔCZËNK: Pòdôwkòwô baza òsta sztërkòwô zablokòwónô dlô administracjowich célów. Ni mòże tej timczasã zapisac nowi wersëji artikla. 
+Bédëjemë przeniesc ji tekst do priwatnégò lopka (wëtnij/wstôw) ë ùchòwac na pózni.'''
+
+Administrator, chtëren jã zablokòwôł, pòdôł przëczënã: $1",
+'templatesused'          => 'Szablónë ùżëti w tim artiklu:',
+'template-protected'     => '(zazychrowónô)',
+'template-semiprotected' => '(dzélowò zazychrowóné)',
 
 # History pages
-'cur'        => 'aktualnô',
-'last'       => 'pòslédnô',
-'histlegend' => 'Legenda: (aktualnô) = różnice w przërównanim do aktualny wersëje,
+'currentrev'             => 'Aktualnô wersëjô',
+'revisionasof'           => 'Wersëjô z $1',
+'previousrevision'       => '� Stôrszô wersëjô',
+'nextrevision'           => 'Nowszô wersëjô →',
+'currentrevisionlink'    => 'Aktualnô wersëjô',
+'cur'                    => 'aktualnô',
+'last'                   => 'pòslédnô',
+'page_first'             => 'zôczątk',
+'page_last'              => 'kùńc',
+'histlegend'             => 'Legenda: (aktualnô) = różnice w przërównanim do aktualny wersëje,
 (wczasniészô) = różnice w przërównanim do wczasniészi wersëje, D = drobné edicëje',
+'history-fieldset-title' => 'Przezérôj historëjã',
+'histfirst'              => 'Stôrszé',
+'histlast'               => 'Nowszé',
+
+# Revision feed
+'history-feed-item-nocomment' => '$1 ò $2', # user at time
+
+# Revision deletion
+'rev-delundel'   => 'pòkażë/zatacë',
+'revdel-restore' => 'Zjinaczë widzawnotã',
+
+# Merge log
+'revertmerge' => 'Rozdzélë',
 
 # Diffs
+'history-title'           => 'Historëjô wersëji dlô "$1"',
 'difference'              => '(różnice midzë wersëjama)',
 'lineno'                  => 'Lëniô $1:',
 'compareselectedversions' => 'Przërównôj wëbróné wersëje',
+'editundo'                => 'doprowadzë nazôd',
 
 # Search results
-'noexactmatch' => "'''Nie dô starnë z dokładno taczim titlã \"\$1\"'''. Mòżesz [[:\$1|zrobic ną starnã]].",
-'viewprevnext' => 'Òbaczë ($1) ($2) ($3).',
-'powersearch'  => 'Szëkba',
+'searchresults'             => 'Skùtczi szëkbë',
+'searchresults-title'       => 'Skùtczi szëkbë za "$1"',
+'searchresulttext'          => 'Dlô dobëcô wicy wëdowiédzë ò szëkbie na {{GRAMMAR:D.lp|{{SITENAME}}}}, zdrzë na [[{{MediaWiki:Helppage}}|starnë pòmòcë]].',
+'searchsubtitle'            => 'Skùtczi szëkbë za \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|starnë naczënającé sã òd "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|starnë, chtërné lënkùją do "$1"]])',
+'noexactmatch'              => "'''Nie dô starnë z dokładno taczim titlã \"\$1\"'''. Mòżesz [[:\$1|zrobic ną starnã]].",
+'notitlematches'            => 'Ni nalazłé w titlach',
+'prevn'                     => 'wczasniészé $1',
+'nextn'                     => 'nôslédné $1',
+'viewprevnext'              => 'Òbaczë ($1) ($2) ($3).',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 słowò|$2 słowa|$2 słów}})',
+'search-section'            => '(dzél $1)',
+'search-interwiki-caption'  => 'Sosterné ùdbë',
+'search-interwiki-more'     => '(wicy)',
+'search-mwsuggest-enabled'  => 'z sugestëjama',
+'search-mwsuggest-disabled' => 'bez sugestëjów',
+'powersearch'               => 'Szëkba',
+'powersearch-legend'        => 'Awansowónô szëkba',
+'powersearch-ns'            => 'Szëkba w rumach mionów:',
+'powersearch-redir'         => 'Lësta przeczerowaniów',
+'powersearch-field'         => 'Szëkba za',
 
 # Preferences page
 'preferences'           => 'Preferencëje',
@@ -374,6 +514,7 @@ Eżlë klëczi na ti starnie nie są sczérowóne do ce, tedë [[Special:UserLog
 'qbsettings'            => 'Sztrépk chùtczégò przistãpù',
 'changepassword'        => 'Zmiana parolë',
 'skin'                  => 'Wëzdrzatk',
+'skin-preview'          => 'Pòdzérk',
 'math'                  => 'Matematika',
 'dateformat'            => 'Fòrmat datumù',
 'datedefault'           => 'Felëje preferencëji',
@@ -382,14 +523,11 @@ Eżlë klëczi na ti starnie nie są sczérowóne do ce, tedë [[Special:UserLog
 'prefs-personal'        => 'Pòdôwczi brëkòwnika',
 'prefs-rc'              => 'Slédné edicëje',
 'prefs-watchlist'       => 'Lësta ùzérónëch artiklów',
-'prefs-watchlist-days'  => 'Maksymalnô lëczba dniów dlô wëskrzëniwóniô na lësce ùzérónëch artiklów:',
+'prefs-watchlist-days'  => 'Wielëna dniów dlô wëskrzëniwaniô na lësce ùzérónëch artiklów:',
 'prefs-watchlist-edits' => 'Maksymalnô lëczba edicëjów do pòkazaniô w rozszérzoné lësce ùzérónëch artiklów:',
 'prefs-misc'            => 'Jine',
 'saveprefs'             => 'Zapiszë',
-'resetprefs'            => 'Wëczëszczë',
-'oldpassword'           => 'Stôrô parola:',
-'newpassword'           => 'Nowô parola',
-'retypenew'             => 'Napiszë nową parolã jesz rôz',
+'resetprefs'            => 'Wëczëszczë niezapisóné zmianë',
 'textboxsize'           => 'Edicëjô',
 'rows'                  => 'Régów:',
 'columns'               => 'Kòlumnów:',
@@ -403,23 +541,30 @@ Eżlë klëczi na ti starnie nie są sczérowóne do ce, tedë [[Special:UserLog
 'savedprefs'            => 'Twòjé nastôwë òstałë zapisóné.',
 'timezonelegend'        => 'Czasowô cona',
 'timezonetext'          => '¹Lëczba gòdzënów różnicë midze twòjim môlowim czasã a czasã na serwerze (UTC).',
-'localtime'             => 'Twòja czasowô cona',
-'timezoneoffset'        => 'Różnica¹',
-'servertime'            => 'Aktualny czas serwera',
+'localtime'             => 'Môlowi czas:',
+'timezoneoffset'        => 'Różnica¹:',
+'servertime'            => 'Czas serwera:',
 'guesstimezone'         => 'Wezmi z przezérnika',
 'allowemail'            => 'Włączë mòżlewòtã sélaniô e-mailów òd jinëch brëkòwników',
 'defaultns'             => 'Domëslno przeszëkùjë nôslédné rëmnotë mionów:',
 'files'                 => 'Lopczi',
 
 # User rights
-'editinguser' => "Edicëjô brëkòwnika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser' => "Zmiana praw brëkòwnika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
+
+# Groups
+'group-sysop' => 'Sprôwnicë',
 
 'grouppage-sysop' => '{{ns:project}}:Administratorzë',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'editëjë tã starnã',
+
 # Recent changes
 'recentchanges'                  => 'Slédné edicëje',
 'recentchangestext'              => 'Na starna prezentérëje historëjã slédnëch edicëjów w {{SITENAME}}.',
 'recentchanges-feed-description' => 'Pòdstrzegô slédny zmianë w tim pòwrózkù.',
+'rcnote'                         => "Niżi {{PLURAL:$1|nachôdô sã '''1''' slédnô zjinaka zrobionô|nachôdają sã '''$1''' slédné zjinaczi zrobioné|nachôdô sã '''$1''' slédnych zjinaków zrobionëch}} w {{PLURAL:$2|slédnégò dnia|slédnych '''$2''' dniach}}, rëchùjąc òd $5 dnia $4.",
 'rcnotefrom'                     => "Niżi są zmianë òd '''$2''' (pòkazóné do '''$1''').",
 'rclistfrom'                     => 'Pòkażë nowé zmianë òd $1',
 'rcshowhideminor'                => '$1 môłé zmianë',
@@ -429,18 +574,37 @@ Eżlë klëczi na ti starnie nie są sczérowóne do ce, tedë [[Special:UserLog
 'rcshowhidepatr'                 => '$1 òbzérónë edicëje',
 'rcshowhidemine'                 => '$1 mòjé edicëje',
 'rclinks'                        => 'Pòkażë slédnëch $1 zmianów zrobionëch òb slédné $2 dniów<br />$3',
+'diff'                           => 'jinosc',
+'hist'                           => 'hist.',
 'hide'                           => 'zatacë',
 'show'                           => 'pokôż',
 'minoreditletter'                => 'D',
+'newpageletter'                  => 'N',
+'boteditletter'                  => 'b',
+'rc-enhanced-expand'             => 'Pòkażë detale (wëmôgô JavaScript)',
+'rc-enhanced-hide'               => 'Zatacë detale',
 
 # Recent changes linked
-'recentchangeslinked' => 'Zmianë w dolënkòwónëch',
+'recentchangeslinked'          => 'Zmianë w dolënkòwónëch',
+'recentchangeslinked-title'    => 'Zjinaczi w lënkòwónëch z "$1"',
+'recentchangeslinked-backlink' => '� $1',
+'recentchangeslinked-summary'  => "Niżi nachôdô sã lësta slédnëch zjinaków na lënkòwónëch starnach z pòdóny starnë (abò we wszëtczich starnach przënôleżącëch do pòdóny kategòrëji).
+Starnë z [[Special:Watchlist|lëstë ùzérónëch artiklów]] są '''pògrëbioné'''.",
+'recentchangeslinked-page'     => 'Miono starnë:',
+'recentchangeslinked-to'       => 'Wëskrzëni zjinaczi nié na lënkòwónëch starnach, blós na starnach lënkùjącëch do pòdóny starnë',
 
 # Upload
 'upload'            => 'Wladënk lopka',
+'uploadbtn'         => 'Wladëjë lopk',
 'reupload'          => 'Wëslë jesz rôz',
 'uploadnologin'     => 'Felënk logòwaniô',
-'uploadtext'        => '<strong>STOP!</strong> Nigle wladëjesz jaczi lopk,\\nprzeczëtôj regle wladowaniô lopków ë ùgwësnij sã, że wladëwającë gò òstóniesz z\\nnima w zgòdze.\\n<p>Jeżle chcesz przezdrzec abò przeszëkac do terô wladowóné lopczi,\\nprzeńdzë do [[Special:ImageList|lëstë wladowónëch lopków]].\\nWszëtczé wladënczi ë rëmania są òdnotérowóné w\\nspecjalnëch zestôwkach: [[Special:Log/upload|wladënczi]] ë [[Special:Log/delete|rëmóné]].\\n<p>Bë wëslac nowi lopk do zòbrazowaniô Twòjégò artikla wëzwëskùj \\nhewòtny fòrmùlar.\\nW wikszoscë przezérników ùzdrzesz knąpã <i>Browse...</i>\\nabò <i>Przezérôj...</i>, chtëren ùmożlëwi Cë òtemkniãcé sztandardowégò\\nòkna wëbiérkù lopka. Wëbranié lopka sprawi wstôwienié jegò miona\\nw tekstowim pòlu kòl knąpë.\\nZaznaczającë pasowné pòle, mùszisz téż pòcwierdzëc, ëż sélającë\\nlopk nie gwôłcësz nikògò autorsczich praw.\\nWladënk zacznie sã pò wcësniãcym <i>Wladëjë lopk</i>.\\nTo mòże sztërk zdérowac, òsoblëwò jeżle ni môsz chùtczégò dopùscënkù do internetu.\\n<p>Preferowónyma fòrmatama są: JPEG dlô òdjimków, PNG dlô céchùnków\\në òbrôzków ze znankama ikònów, ôs OGG dlô zwãków. Bë nie dac przińc do lëchòrozmieniów nadôwôj lopkom miona sparłãczóné z jich zamkłoscą.\\nBë wstôwic òbrôzk do artikla, wpiszë lënk:\\n<b><nowiki>[[</nowiki>{{ns:image}}<nowiki>:miono.jpg]]</nowiki></b> abò <b><nowiki>[[</nowiki>{{ns:image}}<nowiki>:miono.png|òpcjonalny tekst]]</nowiki></b>.\\nDlô zwãkòwëch lopków lënk mdze wëzdrzôł tak: <b><nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki></b>.\\n<p>Prosymë wdarzëc, ëż tak samò jak w przëtrôfkù zwëczajnëch starnów {{SITENAME}},\\njińszi brëkòwnicë mògą editowac abò rëmac wladowóné przez Ce lopczi,\\njeżle mdą dbë, że to mdze lepi służëc całi ùdbie {{SITENAME}}.\\nTwòje prawò do sélaniégò lopków mòże bëc Cë òdebróné, eżle nadùżëjesz systemë.',
+'uploadtext'        => "Brëkùjë negò fòrmùlara do wladënkù lopków.
+Jeżlë chcesz przezdrzec abò szëkac w dotenczas wladowónëch lopkach, biéj do [[Special:FileList|lësta lopków]]. Kòżdi wladënk je registrowóny w [[Special:Log/upload|registrze wladënkù]], a rëmniãcé w [[Special:Log/delete|registrze rëmaniô]].
+
+Abë dodac lopk do starnë, ùżëjë ùniższegò lënka wedle nôslédnëch mùstrów:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Lopk.jpg]]</nowiki></tt>''' wëskrzëni całi lopk
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Lopk.png|200px|thumb|left|pòdpisënk òbrôzka]]</nowiki></tt>''' wëskrzëni z lewi starnë, przë ùbrzégù, miniaturkã w szérzë 200 pikslów w ramie, z nôdpisã 'pòdpisënk òbrôzka'
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Lopk.ogg]]</nowiki></tt>''' òtemknie prosti lënk do lopka bez wëskrzënianiô sómegò lopka",
 'uploadlog'         => 'Lësta wladënków',
 'uploadlogpage'     => 'Dołączoné',
 'uploadlogpagetext' => 'Hewò je lësta slédno wladowónëch lopków.\\nWszëtczé gòdzënë tikają conë ùniwersalnégò czasë.',
@@ -456,31 +620,35 @@ Eżlë klëczi na ti starnie nie są sczérowóne do ce, tedë [[Special:UserLog
 'uploadedimage'     => 'wladënk: "$1"',
 'uploaddisabled'    => 'Przeprôszómë! Mòżlëwòta wladënkù lopków na nen serwer òsta wëłączonô.',
 
-# Special:ImageList
-'imagelist'      => 'Lësta òbrôzków',
-'imagelist_user' => 'Brëkòwnik',
-
-# Image description page
-'filehist-user'  => 'Brëkòwnik',
-'imagelinks'     => 'Lënczi do lopka',
-'linkstoimage'   => 'Hewò są starnë, jaczé òdwòłëją sã do negò lopka:',
-'nolinkstoimage' => 'Niżódnô starna nie òdwòłëje sã do negò lopka.',
+# Special:ListFiles
+'listfiles'      => 'Lësta òbrôzków',
+'listfiles_user' => 'Brëkòwnik',
+
+# File description page
+'filehist'                  => 'Historëjô lopka',
+'filehist-current'          => 'aktualny',
+'filehist-datetime'         => 'Datum/Czas',
+'filehist-user'             => 'Brëkòwnik',
+'filehist-dimensions'       => 'Miara',
+'filehist-filesize'         => 'Miara lopka',
+'filehist-comment'          => 'Òpisënk',
+'imagelinks'                => 'Lënczi lopka',
+'linkstoimage'              => '{{PLURAL:$1|Hewò je starna jakô òdwòłëje|Hewò są starnë jaczé òdwòłëją}} sã do negò lopka:',
+'nolinkstoimage'            => 'Niżódnô starna nie òdwòłëje sã do negò lopka.',
+'uploadnewversion-linktext' => 'Wladëjë nową wersëjã negò lopka',
+
+# List redirects
+'listredirects' => 'Lësta przeczerowaniów',
+
+# Unused templates
+'unusedtemplates' => 'Pùsté szablónë',
 
 # Random page
 'randompage' => 'Kawlowô starna',
 
 # Statistics
-'sitestats'     => 'Statistika artiklów',
-'userstats'     => 'Statistika brëkòwników',
-'sitestatstext' => "W pòdôwkòwi baze je w sëmie '''$1''' starn.
-Na wielëna zamëkô w se starnë ''Diskùsëji'', starnë ò {{SITENAME}}, starnë ôrtë ''stub'' (ùzémk), starnë przeczerowóniô, ë jińszé, chtërné grãdo je klasyfikòwac jakno artikle.
-Bez nëch to prôwdëjuwerno da '''$2''' starn artiklów.
-
-'''$8''' lopków òsta załadowónëch.
-
-Bëło w sëmie '''$3''' òdwiôdënów ë '''$4''' edicëji òd sztótu, czej miôł plac upgrade soft-wôrë. Dôwó to strzédno $5 edicëji na jedną starnã ë $6 òdwiôdënów na jedną edicëjã.
-
-Długòta [http://www.mediawiki.org/wiki/Manual:Job_queue rédżi robòtë] je '''$7'''.",
+'statistics'              => 'Statisticzi',
+'statistics-header-users' => 'Statistika brëkòwników',
 
 'disambiguationspage' => 'Template:Starnë_ùjednoznacznieniô',
 
@@ -488,33 +656,48 @@ Długòta [http://www.mediawiki.org/wiki/Manual:Job_queue rédżi robòtë] je '
 
 'brokenredirects' => 'Zerwóné przeczerowania',
 
+'withoutinterwiki' => 'Starnë bez jãzëkòwich lënków',
+
 # Miscellaneous special pages
-'nlinks'            => '$1 lënków',
-'lonelypages'       => 'Niechóné starnë',
-'unusedimages'      => 'Nie wëzwëskóné òbrôzczi',
-'popularpages'      => 'Nôwidzalszé starnë',
-'wantedpages'       => 'Nônótniészé starnë',
-'shortpages'        => 'Nôkrótszé starnë',
-'longpages'         => 'Nôdłëgszé starnë',
-'listusers'         => 'Lësta brëkòwników',
-'newpages'          => 'Nowé starnë',
-'newpages-username' => 'Miono brëkòwnika:',
-'ancientpages'      => 'Nôstarszé starnë',
-'move'              => 'Przeniesë',
-'movethispage'      => 'Przeniesë',
-'notargettitle'     => 'Nie da taczi starnë',
+'nbytes'                  => '$1 {{PLURAL:$1|bajt|bajtë|bajtów}}',
+'nlinks'                  => '$1 {{PLURAL:$1|lënk|lënków}}',
+'lonelypages'             => 'Niechóné starnë',
+'uncategorizedpages'      => 'Starnë bez kategòrëji',
+'uncategorizedcategories' => 'Kategòrëje bez kategòrizacëji',
+'uncategorizedimages'     => 'Lopczi bez kategòrëji',
+'uncategorizedtemplates'  => 'Szablónë bez kategòrëji',
+'unusedcategories'        => 'Pùsté kategòrëje',
+'unusedimages'            => 'Nie wëzwëskóné òbrôzczi',
+'popularpages'            => 'Nôwidzalszé starnë',
+'wantedpages'             => 'Nônótniészé starnë',
+'shortpages'              => 'Nôkrótszé starnë',
+'longpages'               => 'Nôdłëgszé starnë',
+'protectedpages'          => 'Zazychrowóné starnë',
+'listusers'               => 'Lësta brëkòwników',
+'newpages'                => 'Nowé starnë',
+'newpages-username'       => 'Miono brëkòwnika:',
+'ancientpages'            => 'Nôstarszé starnë',
+'move'                    => 'Przeniesë',
+'movethispage'            => 'Przeniesë',
+'notargettitle'           => 'Nie da taczi starnë',
+'pager-newer-n'           => '{{PLURAL:$1|1 nowszi|$1 nowszé|$1 nowszich}}',
+'pager-older-n'           => '{{PLURAL:$1|1 stôrszi|$1 stôrszé|$1 stôrszich}}',
 
 # Book sources
-'booksources' => 'Ksążczi',
+'booksources'    => 'Ksążczi',
+'booksources-go' => 'Biéj',
 
 # Special:Log
-'specialloguserlabel' => 'Brëkòwnik:',
-'log'                 => 'Lodżi',
-'alllogstext'         => 'Sparłãczone registrë wësłónëch lopków, rëmónëch starn, zazychrowaniô, blokòwaniô ë nadôwaniô ùdowierzeniów. Mòżesz zawãżëc wëszłosc òb wëbranié ôrtu registru, miona brëkòwnika abò miona zajimnej dlô ce starnë.',
+'specialloguserlabel'  => 'Brëkòwnik:',
+'speciallogtitlelabel' => 'Titel:',
+'log'                  => 'Lodżi',
+'alllogstext'          => 'Sparłãczoné registrë wszëtczich ôrtów dzejaniô dlô {{SITENAME}}.
+Mòżesz zawãżëc wëszłosc przez wëbranié ôrtu registru, miona brëkòwnika abò miona zajimny dlô ce starnë.',
 
 # Special:AllPages
 'allpages'          => 'Wszëtczé starnë',
 'alphaindexline'    => '$1 --> $2',
+'nextpage'          => 'Nôslédnô starna ($1)',
 'allpagesfrom'      => 'Starnë naczënające sã na:',
 'allarticles'       => 'Wszëtczé artikle',
 'allinnamespace'    => 'Wszëtczé starnë (w rumie $1)',
@@ -527,16 +710,20 @@ Długòta [http://www.mediawiki.org/wiki/Manual:Job_queue rédżi robòtë] je '
 # Special:Categories
 'categories' => 'Kategòrëje',
 
+# Special:LinkSearch
+'linksearch' => 'Bùtnowé lënczi',
+
 # E-mail user
 'emailuser'       => 'Wëslë e-maila do negò brëkòwnika',
 'emailpage'       => 'Sélajë e-mail do brëkòwnika',
 'defemailsubject' => 'E-mail òd {{SITENAME}}',
 'noemailtitle'    => 'Felënk email-adresë',
-'emailfrom'       => 'Ã’d',
-'emailto'         => 'Do',
-'emailsubject'    => 'Téma',
-'emailmessage'    => 'Wiadło',
+'emailfrom'       => 'Ã’d:',
+'emailto'         => 'Do:',
+'emailsubject'    => 'Téma:',
+'emailmessage'    => 'Wiadło:',
 'emailsend'       => 'Wëslë',
+'emailccme'       => 'Sélôj mie e-mailã kòpijã wiadła.',
 
 # Watchlist
 'watchlist'            => 'Lësta ùzérónëch artiklów',
@@ -554,45 +741,64 @@ Czej chcesz remôc starnã z lëste ùzéronëch artiklów, klikni ''Òprzestôj
 'unwatch'              => 'Òprzestôj ùzerac',
 'unwatchthispage'      => 'Òprzestôj ùzerac ną starnã',
 'notanarticle'         => 'To nie je artikel',
-'watchlist-details'    => 'Ùzéróné môsz {{PLURAL:$1|$1 artikel|$1 artikle (-ów)}}, nie rechùjąc diskùsëjów.',
+'watchlist-details'    => 'Ùzérôsz {{PLURAL:$1|$1 artikel|$1 artikle/-ów}}, nie rechùjąc diskùsëjów.',
 'wlheader-showupdated' => "* Artiklë jakczé òsta zmienioné òd Twòji slédny wizytë są wëapratnioné '''pògrëbieniém'''",
 'watchmethod-list'     => 'szëkba ùzérónëch artiklów westrzód pòslédnëch edicëjów',
-'watchlistcontains'    => 'Wielëna artiklów na Twòji lësce ùzérónëch: $1.',
+'watchlistcontains'    => 'Na twòji lësce ùzérónëch artiklów {{PLURAL:$1|je 1 strana|są $1 starnë|je $1 starnów}}.',
 'wlnote'               => "Niżi môsz wëskrzënioné {{PLURAL:$1|slédną zmianã|'''$1''' slédnëch zmianów}} zrobioné òb {{PLURAL:$2|gòdzënã|'''$2''' gòdzënë/gòdzënów}}.",
 'wlshowlast'           => 'Pòkażë zmianë z $1 gòdzënów $2 dni $3',
-'watchlist-show-bots'  => 'Pòkażë edicëje bòtów',
-'watchlist-hide-bots'  => 'Zatacë edicëje bòtów',
-'watchlist-show-own'   => 'Pòkażë mòjé edicëje',
-'watchlist-hide-own'   => 'Zatacë mòjé edicëje',
-'watchlist-show-minor' => 'Pòkażë môłé edicëje',
-'watchlist-hide-minor' => 'Zatacë môłé edicëje',
+
+# Displayed when you click the "watch" button and it is in the process of watching
+'watching'   => 'Ùzéróm...',
+'unwatching' => 'Ju ni ùzéróm...',
 
 'enotif_reset' => 'Òznaczë wszëtczé artiklë jakno òbëzdrzóné',
 'changed'      => 'zmienioné',
 'created'      => 'zrobionô',
 
-# Delete/protect/revert
-'deletepage'         => 'Rëmôj starnã',
-'confirm'            => 'Pòcwierdzë',
-'excontent'          => 'Zamkłosc starnë "$1"',
-'actioncomplete'     => 'Òperacëjô wëkònónô',
-'dellogpage'         => 'Rëmóné',
-'deletionlog'        => 'register rëmaniów',
-'deletecomment'      => 'Przëczëna rëmaniô',
-'rollback'           => 'Copnij edicëjã',
-'rollbacklink'       => 'copnij',
-'rollbackfailed'     => 'Nie szło copnąc zmianë',
-'alreadyrolled'      => 'Nie jidze copnąc slédnej zmianë starnë [[:$1]], chtërnej ùsôdzcą je [[User:$2|$2]] ([[User talk:$2|Diskùsëjô]]).
-Chtos jiny ju editowôł starnã abò copnął zmianë.
-
-Ùsôdzcą slédnej zmianë je terô [[User:$3|$3]] ([[User talk:$3|Diskùsëjô]]).',
-'protectedarticle'   => 'zazychrowónô [[$1]]',
-'unprotectedarticle' => 'òdzychrowóny [[$1]]',
-'protect-legend'     => 'Pòcwierdzë zazychrowanié',
-'protectcomment'     => 'Przëczëna zazychrowóniô',
+# Delete
+'deletepage'     => 'Rëmôj starnã',
+'confirm'        => 'Pòcwierdzë',
+'excontent'      => 'Zamkłosc starnë "$1"',
+'actioncomplete' => 'Òperacëjô wëkònónô',
+'deletedarticle' => 'rëmniãté przez "[[$1]]"',
+'dellogpage'     => 'Rëmóné',
+'deletionlog'    => 'register rëmaniów',
+'deletecomment'  => 'Przëczëna rëmaniô',
+
+# Rollback
+'rollback'       => 'Copnij edicëjã',
+'rollbacklink'   => 'copnij',
+'rollbackfailed' => 'Nie szło copnąc zmianë',
+'alreadyrolled'  => 'Ni mòże copnąc slédny edicëji starnë [[:$1]], chtërny ùsôdzcą je [[User:$2|$2]] ([[User talk:$2|Diskùsëjô]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
+chtos jiny ju zeditowôł starnã abò copnął zmianë.
+
+Slédnym ùsódzcą starnë bëł [[User:$3|$3]] ([[User talk:$3|Diskùsëjô]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+
+# Protect
+'protectedarticle'            => 'zazychrowónô [[$1]]',
+'unprotectedarticle'          => 'òdzychrowóny [[$1]]',
+'prot_1movedto2'              => '$1 przeniesłé do $2',
+'protect-legend'              => 'Pòcwierdzë zazychrowanié',
+'protectcomment'              => 'Przëczëna zazychrowóniô',
+'protectexpiry'               => 'Wëgasô pò:',
+'protect_expiry_invalid'      => 'Lëchi czas wëgasniãcô.',
+'protect_expiry_old'          => 'Czas wëgasniãcô leżi w przińdnocë.',
+'protect-default'             => 'Zezwòlë wszëtczim brëkòwnikòm',
+'protect-fallback'            => 'Wëmôgô prawów "$1"',
+'protect-level-autoconfirmed' => 'Blokùjë nowich ë nieregistrowónëch brëkòwników',
+'protect-level-sysop'         => 'blós sprôwnicë (sysopë)',
+'protect-summary-cascade'     => 'kaskadowanié',
+'protect-expiring'            => 'wëgasô $1 (UTC)',
+'protect-cascade'             => 'Zazychrëjë wszëtczé starnë zamkłé na ti starnie (kaskadowé zazychrowanié)',
+'protect-cantedit'            => 'Ni mòżesz zmieniac lédżi zazychrowaniô ti starnë, kò ni môsz dosc prawa do ji edicëji.',
+'restriction-type'            => 'Przistãp:',
+'restriction-level'           => 'Léga bezpieczi:',
 
 # Undelete
 'viewdeletedpage' => 'Òbaczë rëmóne starnë',
+'undeletebtn'     => 'Doprowôdzë nazôd',
+'undeletelink'    => 'doprowôdzë nazôd',
 
 # Namespace form on various pages
 'namespace'      => 'Rum mionów:',
@@ -607,15 +813,21 @@ Chtos jiny ju editowôł starnã abò copnął zmianë.
 'month'         => 'Òd miesąca (ë wczasni):',
 'year'          => 'Òd rokù (ë wczasni):',
 
-'sp-contributions-newbies'  => 'Pòkażë edicëjã blós nowich brëkòwników',
-'sp-contributions-search'   => 'Szëkba za edicëjama',
-'sp-contributions-username' => 'Adresa IP abò miono brëkòwnika:',
-'sp-contributions-submit'   => 'Szëkôj',
+'sp-contributions-newbies'     => 'Pòkażë edicëjã blós nowich brëkòwników',
+'sp-contributions-newbies-sub' => 'Dlô nowich brëkòwników',
+'sp-contributions-search'      => 'Szëkba za edicëjama',
+'sp-contributions-username'    => 'Adresa IP abò miono brëkòwnika:',
+'sp-contributions-submit'      => 'Szëkôj',
 
 # What links here
-'whatlinkshere' => 'Lënkùjącé',
-'linkshere'     => 'Do ny starnë òdwòłëją sã hewòtné starnë:',
-'isredirect'    => 'starna przeczerowaniô',
+'whatlinkshere'         => 'Lënkùjącé',
+'whatlinkshere-title'   => 'Starnë lënkùjącé do "$1"',
+'whatlinkshere-page'    => 'Starna:',
+'linkshere'             => "Do '''[[:$1]]''' lënkùją hewòtné starnë:",
+'nolinkshere'           => "Niżódnô starna nie lënkùje do '''[[:$1]]'''.",
+'isredirect'            => 'starna przeczerowaniô',
+'whatlinkshere-links'   => '� lëkùjącé',
+'whatlinkshere-filters' => 'Filtrë',
 
 # Block/unblock
 'blockip'            => 'Zascëgôj IP-adresã',
@@ -625,8 +837,11 @@ Chtos jiny ju editowôł starnã abò copnął zmianë.
 'blockipsuccesssub'  => 'Zascëgónié dało sã',
 'blockipsuccesstext' => 'Brëkòwnik [[Special:Contributions/$1|$1]] òstał zascëgóny.<br />
 Biéj do [[Special:IPBlockList|lëstë zascëgónëch adresów IP]] abë òbaczëc zascëdżi.',
+'ipblocklist'        => 'Lësta zablokòwónëch adresów IP ë mionów brëkòwników',
 'blocklistline'      => '$1, $2 zascëgôł $3 ($4)',
-'blocklink'          => 'zascëgôj',
+'blocklink'          => 'blokùjë',
+'unblocklink'        => 'òdblokùjë',
+'change-blocklink'   => 'zmieni blokòwanié',
 'contribslink'       => 'wkłôd',
 'autoblocker'        => 'Zablokòwóno ce aùtomatnie, ga brëkùjesz ti sami adresë IP co brëkòwnik "[[User:$1|$1]]". Przëczënô blokòwóniô $1 to: "\'\'\'$2\'\'\'".',
 'proxyblocksuccess'  => 'Fertich.',
@@ -637,13 +852,19 @@ Biéj do [[Special:IPBlockList|lëstë zascëgónëch adresów IP]] abë òbaczÃ
 # Move page
 'move-page-legend'        => 'Przeniesë starnã',
 'movearticle'             => 'Przeniesë artikel',
+'movenologin'             => 'Felënk logòwaniô',
+'newtitle'                => 'Nowi titel:',
+'move-watch'              => 'Ùzérôj tã starnã',
 'movepagebtn'             => 'Przeniesë starnã',
 'pagemovedsub'            => 'Przeniesenié darzëło sã',
+'movepage-moved'          => '<big>\'\'\'"$1" òsta przeniosłô do "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
 'articleexists'           => 'Starna ò taczim mionie ju je abò nie je òno bezzmiłkòwé. Wëbierzë nowé miono.',
 'movedto'                 => 'przeniesłô do',
 'movetalk'                => 'Przeniesë téż starnã <i>Diskùsëje</i>, jeżle je to mòżlëwé.',
 '1movedto2'               => '$1 przeniesłé do $2',
 '1movedto2_redir'         => '[[$1]] przeniesłé do [[$2]] nad przeczérowanim',
+'movereason'              => 'Przëczëna:',
+'revertmove'              => 'copnij',
 'delete_and_move'         => 'Rëmôj ë przeniesë',
 'delete_and_move_confirm' => 'Jo, rëmôj ną starnã',
 
@@ -656,25 +877,68 @@ Biéj do [[Special:IPBlockList|lëstë zascëgónëch adresów IP]] abë òbaczÃ
 'allmessagesdefault'        => 'Domëslny tekst',
 'allmessagescurrent'        => 'Terny tekst',
 'allmessagestext'           => 'To je zestôwk systemòwëch ògłosów przistãpnëch w rumie mion MediaWiki.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Proszã zazdrzë na [http://www.mediawiki.org/wiki/Localisation Lokalizacëjô MediaWiki] ë [http://translatewiki.net translatewiki.net] jeżlë chcesz dolmaczëc softwôrã MediaWiki.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' nie mòże bëc brëkòwónô, temù że '''\$wgUseDatabaseMessages''' je wëłączony.",
 'allmessagesfilter'         => 'Filter mion ògłosów:',
 'allmessagesmodified'       => 'Pòkażë blós zjinaczone',
 
+# Thumbnails
+'thumbnail-more' => 'Zwiszi',
+
 # Special:Import
 'import' => 'Impòrtëjë starnë',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'    => 'Mòja starna brëkòwnika',
-'tooltip-pt-mytalk'      => 'Mòja starna diskùsëji',
-'tooltip-pt-preferences' => 'Mòje nastôwë',
-'tooltip-pt-watchlist'   => 'Lësta artiklów jaczé òbzérôsz za zmianama',
-'tooltip-pt-mycontris'   => 'Lësta mòjich edicëjów',
-'tooltip-pt-logout'      => 'Wëlogòwanié',
-'tooltip-watch'          => 'Dodôj ną starnã do lëstë ùzérónëch',
+'tooltip-pt-userpage'           => 'Twòja starna brëkòwnika',
+'tooltip-pt-mytalk'             => 'Twòjô starna diskùsëji',
+'tooltip-pt-preferences'        => 'Mòje nastôwë',
+'tooltip-pt-watchlist'          => 'Lësta artiklów jaczé òbzérôsz za zmianama',
+'tooltip-pt-mycontris'          => 'Lësta twòjich edicëjów',
+'tooltip-pt-login'              => 'Rôczimë do wlogòwaniô sã, nie je to równak mùszebné.',
+'tooltip-pt-logout'             => 'Wëlogòwanié',
+'tooltip-ca-talk'               => 'Diskùsëjô zamkłoscë ti starnë',
+'tooltip-ca-edit'               => 'Mòżesz editowac nã starnã.
+Proszã brëkòwac knąpë pòdzérkù przed zapisaniém.',
+'tooltip-ca-viewsource'         => 'Na starna je zazychrowónô.
+Mòżesz òbaczëc ji zdrój.',
+'tooltip-ca-history'            => 'Stôrszé wersëje ti starnë',
+'tooltip-ca-protect'            => 'Zazychrëjë nã starnã',
+'tooltip-ca-delete'             => 'Rëmôj nã starnã',
+'tooltip-ca-move'               => 'Przeniesë starnã',
+'tooltip-ca-watch'              => 'Dodôj nã starnã do twòji lëstë ùzéraniô',
+'tooltip-ca-unwatch'            => 'Rëmôj nã starnã z twòji lëstë ùzéraniô',
+'tooltip-search'                => 'Szëkba {{SITENAME}}',
+'tooltip-search-go'             => 'Biéj do starnë z akùratno taczim mionã, jeżlë takô je',
+'tooltip-search-fulltext'       => 'Szëkba za wpisónym tesktã na starnach',
+'tooltip-n-mainpage'            => 'Òbôczë przédną starnã',
+'tooltip-n-portal'              => 'Ò ti ùdbie, co mòżesz zrobic, co a gdze mòżesz nalezc.',
+'tooltip-n-currentevents'       => 'Dobëjë spódkòwą wëdowiédzã ò slédnych wëdarzeniach',
+'tooltip-n-recentchanges'       => 'Lësta slédnych zjinaków na ti wikipedijë.',
+'tooltip-n-randompage'          => 'Wëskrzëni kawlową starnã',
+'tooltip-n-help'                => 'Wëskrzëni starnë pòmòcë.',
+'tooltip-t-whatlinkshere'       => 'Lësta wszëtczich starnów wiki lënkùjącëch tuwò',
+'tooltip-t-recentchangeslinked' => 'Slédné zjinaczi na starnach, do chtërnëch na starna lënkùje',
+'tooltip-feed-rss'              => 'Pòwrózk RSS dlô ti starnë',
+'tooltip-feed-atom'             => 'Pòwrôzk Atom dlô ti starnë',
+'tooltip-t-emailuser'           => 'Wëslë e-mail do tegò brëkòwnika',
+'tooltip-t-upload'              => 'Wladëjë lopczi',
+'tooltip-t-specialpages'        => 'Lësta specjalnëch starnów',
+'tooltip-t-print'               => 'Wersëjô ti starnë do drëkù',
+'tooltip-t-permalink'           => 'Prosti lënk do ti wersëji starnë',
+'tooltip-ca-nstab-main'         => 'Wëskrzëni starnã zamkłoscë',
+'tooltip-ca-nstab-user'         => 'Wëskrzëni starnã brëkòwnika',
+'tooltip-ca-nstab-special'      => 'To je specjlanô starna, chtërny ni mòżesz editowac',
+'tooltip-ca-nstab-project'      => 'Òbôczë starnã ùdbë',
+'tooltip-ca-nstab-image'        => 'Wëskrzëni starnã lopka',
+'tooltip-ca-nstab-help'         => 'Wëskrzëni starnã pòmòcë',
+'tooltip-ca-nstab-category'     => 'Wëskrzëni starnã kategòrëji',
+'tooltip-save'                  => 'Zapiszë zmianë',
+'tooltip-preview'               => 'Proszã òbôczëc zmianë w pòdzérkù przed jich zapisaniém!',
+'tooltip-diff'                  => 'Wëskrzëni zjinaczi wprowôdzoné w teksce.',
+'tooltip-watch'                 => 'Dodôj ną starnã do lëstë ùzérónëch',
 
 # Attribution
-'anonymous'        => 'Anonimòwi brëkòwnik/-cë  {{SITENAME}}',
+'anonymous'        => 'Anonimòwi {{PLURAL:$1|brëkòwnik|brëkòwnicë}} na {{SITENAME}}',
 'siteuser'         => 'Brëkòwnik {{SITENAME}} $1',
 'lastmodifiedatby' => 'Na starna bëła slédno editowónô $2, $1 przez $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Òpiarté na prôcë $1.',
@@ -692,16 +956,33 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'mw_math_mathml' => 'Wëskrzëniwôj jakno MathML jeżlë mòżlëwé (eksperimentalné)',
 
 # Browsing diffs
-'previousdiff' => '� Pòprzédnô różnica',
-'nextdiff'     => 'Pòstãpnô różnica →',
+'previousdiff' => '� Pòprzédnô edicëjô',
+'nextdiff'     => 'Nôslédnô edicëjô →',
 
 # Media information
-'imagemaxsize' => 'Limitëjë òbrôzczi na starnie òpisënkù òbrôzków do:',
-'thumbsize'    => 'Miara miniaturków:',
+'imagemaxsize'   => 'Ògrańczë na starnie òpisënkù òbrôzków jich miarã do:',
+'thumbsize'      => 'Miara miniaturków:',
+'file-info-size' => '($1 × $2 pikslów, miara lopka: $3, ôrt MIME: $4)',
+'file-nohires'   => '<small>Felëje wikszô miara.</small>',
+'show-big-image' => 'Fùl miara',
 
-# Special:NewImages
-'ilsubmit' => 'Szëkôj',
-'bydate'   => 'wedle datumù',
+# Special:NewFiles
+'newimages' => 'Galerëjô nowich lopków',
+'ilsubmit'  => 'Szëkôj',
+'bydate'    => 'wedle datumù',
+
+# Bad image list
+'bad_image_list' => 'Fòrmat do wpisaniô je jakno niżi:
+
+Blós elementë lëstë (réżczi naczynającé sã òd *) bãdą ùwzglãdniwóné.
+Pierszi lënk w réżczi mùãzi bëc lënkã do zakazónegò lopka. 
+Nôslédné lënczi w réżce bãdą ùwzglãdniwóné jakno wëjimczi – są to miona starnów, na chtërnëch lopk ò zakazónym mionie mòze bëc brëkòwóny.',
+
+# Metadata
+'metadata' => 'Pòdôwczi meta',
+
+# External editor support
+'edit-externally' => 'Editëjë nen lopk brëkùjąc bùtnowi aplikacëji',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'wszëtczé',
@@ -713,9 +994,6 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 # E-mail address confirmation
 'confirmemail_loggedin' => 'Twòjô adresa e-mail òsta pòcwierdzona.',
 
-# AJAX search
-'articletitles' => "Artikle naczënającë sã na ''$1''",
-
 # Multipage image navigation
 'imgmultigo' => 'Biéj!',
 
diff --git a/languages/messages/MessagesCu.php b/languages/messages/MessagesCu.php
index 3f6d071c..780af186 100644
--- a/languages/messages/MessagesCu.php
+++ b/languages/messages/MessagesCu.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Omnipaedista
  * @author Svetko
  * @author Wolliger Mensch
  * @author ОйЛ
@@ -17,24 +18,22 @@ $separatorTransformTable = array(
 $linkPrefixExtension = true;
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Срѣ�дь�тва',
-	NS_SPECIAL        => '�аро�чьна',
-	NS_MAIN           => '',
-	NS_TALK           => 'Бє�ѣ�да',
-	NS_USER           => 'По�льꙃєватєл҄ь',
-	NS_USER_TALK      => 'По�льꙃєватєлꙗ_бє�ѣ�да',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '{{grammar:genitive|$1}}_бє�ѣ�да',
-	NS_IMAGE          => 'Ви�дъ',
-	NS_IMAGE_TALK     => 'Ви�да_бє�ѣ�да',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_бє�ѣ�да',
-	NS_TEMPLATE       => 'Обра�ь�ць',
-	NS_TEMPLATE_TALK  => 'Обра�ьца�_бє�ѣ�да',
-	NS_HELP           => 'По�мощь',
-	NS_HELP_TALK      => 'По�мощи_бє�ѣ�да',
-	NS_CATEGORY       => 'Катигорі�ꙗ',
-	NS_CATEGORY_TALK  => 'Катигорі�ѩ_бє�ѣ�да',
+	NS_MEDIA            => 'Срѣ�дь�тва',
+	NS_SPECIAL          => '�аро_чьна',
+	NS_TALK             => 'Бє�ѣ�да',
+	NS_USER             => 'По�льꙃєватєл҄ь',
+	NS_USER_TALK        => 'По�льꙃєватєлꙗ_бє�ѣ�да',
+	NS_PROJECT_TALK     => '{{grammar:genitive|$1}}_бє�ѣ�да',
+	NS_FILE             => 'Дѣ�ло',
+	NS_FILE_TALK        => 'Дѣ�ла_бє�ѣ�да',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_бє�ѣ�да',
+	NS_TEMPLATE         => 'Обра�ь�ць',
+	NS_TEMPLATE_TALK    => 'Обра�ьца�_бє�ѣ�да',
+	NS_HELP             => 'По�мощь',
+	NS_HELP_TALK        => 'По�мощи бє�ѣ�да',
+	NS_CATEGORY         => 'Катигорі�ꙗ',
+	NS_CATEGORY_TALK    => 'Катигорі�ѩ_бє�ѣ�да',
 );
 
 $namespaceAliases = array(
@@ -44,8 +43,10 @@ $namespaceAliases = array(
 	'Польѕевател҄ь'                  => NS_USER,
 	'Польѕевател_бе�ѣда'             => NS_USER_TALK,
 	'{{grammar:genitive|$1}}_бе�ѣда' => NS_PROJECT_TALK,
-	'Видъ'                           => NS_IMAGE,
-	'Вида_бе�ѣда'                    => NS_IMAGE_TALK,
+	'Ви�дъ'                          => NS_FILE,
+	'Видъ'                           => NS_FILE,
+	'Ви�да_бє�ѣ�да'                   => NS_FILE_TALK,
+	'Вида_бе�ѣда'                    => NS_FILE_TALK,
 	'MediaWiki_бе�ѣда'               => NS_MEDIAWIKI_TALK,
 	'Образьць'                       => NS_TEMPLATE,
 	'Образьца_бе�ѣда'                => NS_TEMPLATE_TALK,
@@ -144,7 +145,7 @@ $messages = array(
 'mypage'         => 'моꙗ� �трани�ца',
 'mytalk'         => 'моꙗ� бє�ѣ�да',
 'navigation'     => 'пла�ваниѥ',
-'and'            => 'и',
+'and'            => '&#32;и',
 
 'errorpagetitle'   => 'бла�на',
 'help'             => 'по�мощь',
@@ -195,6 +196,9 @@ $messages = array(
 'newmessagesdifflink' => 'по�лѣ�дьнꙗ мѣ�на',
 'editsection'         => 'и�пра�ви',
 'editold'             => 'и�пра�ви',
+'viewsourceold'       => '�трани�цѧ и�то�чьнъ о�бра�ъ',
+'editlink'            => 'и�пра�ви',
+'viewsourcelink'      => '�трани�цѧ и�то�чьнъ о�бра�ъ',
 'showtoc'             => 'ви�ждь',
 'hidetoc'             => '�ъкрꙑи',
 'viewdeleted'         => '$1 ви�дєти хо�щєши ;',
@@ -213,7 +217,8 @@ $messages = array(
 'nstab-category'  => 'катигорі�ꙗ',
 
 # General errors
-'viewsource' => '�трани�цѧ и�то�чьнъ о�бра�ъ',
+'viewsource'    => '�трани�цѧ и�то�чьнъ о�бра�ъ',
+'viewsourcefor' => 'бо $1',
 
 # Login and logout pages
 'logouttitle'             => 'и�̾хо�дъ',
@@ -232,6 +237,7 @@ $messages = array(
 'userexists'              => '�ѫщє по�льꙃєватєлꙗ и�мѧ пь�а � ино и�обрѧщи',
 'username'                => 'по�льꙃєватєлꙗ и�мѧ :',
 'uid'                     => 'по�льꙃєватєлꙗ чи�ло� :',
+'yourrealname'            => 'и��тиньно и�мѧ :',
 'yourlanguage'            => 'ѩ�ꙑ�къ :',
 'yournick'                => 'аѵто�графъ :',
 'loginerror'              => 'Въхода блазна',
@@ -243,14 +249,14 @@ $messages = array(
 'extlink_sample' => 'http://www.example.com �ъвѧ��и и�мѧ',
 
 # Edit pages
-'summary'            => 'опь�а�ниѥ',
+'summary'            => 'опь�а�ниѥ :',
 'minoredit'          => 'ма�лаꙗ мѣ�на',
 'watchthis'          => '�и �трани�цѧ блюдє�ниѥ',
 'savearticle'        => '�ъхранѥ�ниѥ',
 'loginreqlink'       => 'Въниди',
 'newarticle'         => '(но�въ)',
 'clearyourcache'     => '<big>��РОЧИ�ТО:</big> По �ъхранѥ�нии мо�жєши обити� �воѥго� �ъмотри�ла �ъхра�нъ да ви�дѣлъ би мѣ�нꙑ � Mozilla ли Firefox ли Safari ли жьмꙑ�и Shift а мꙑ�шиѭ жьми� Reload и�ли жьми� Ctrl-Shift-R (Cmd-Shift-R вън Apple Mac)  � Konqueror ли жьми� кро�мѣ Reload и�ли F5 � О�пєрꙑ по�льꙃєватєльмъ мо�жєть бꙑ�ти ноужда� пльнѣ пони�чьжити и�хъ �ъмотри�ла �ъхра�нъ въ Tools > Preferences � IE ли жьмꙑ�и Ctrl а мꙑ�шиѭ жьми� Refresh и�ли жьми� Ctrl-F5',
-'note'               => '<strong>��РОЧИ�ТО:</strong>',
+'note'               => "'''��РОЧИ�ТО:'''",
 'editing'            => 'и�правлѥ�ниѥ: $1',
 'editingsection'     => 'и�правлѥ�ниѥ � $1 � (чѧ��ть)',
 'templatesused'      => '�ѥѩ �трани�цѧ �҄и обра�ьци� по�льꙃоуѭтъ �ѧ �ѫ�тъ :',
@@ -262,16 +268,23 @@ $messages = array(
 'last'         => 'п�҃лд',
 'page_first'   => 'прь�ва �трани�ца',
 'page_last'    => 'по�лѣ�дьнꙗ �трани�ца',
+'histlast'     => 'по�лѣ�дьнꙗ',
 'historyempty' => '(поу��то)',
 
 # Revision feed
-'history-feed-title' => 'мѣ�нъ ї�торі�ꙗ',
+'history-feed-title'          => 'мѣ�нъ ї�торі�ꙗ',
+'history-feed-item-nocomment' => '$1 при $2', # user at time
 
 # Revision deletion
 'revdelete-uname' => 'по�льꙃєватєлꙗ и�мѧ',
 
+# Diffs
+'diff-with'       => '&#32;�ъ $1 $2',
+'diff-with-final' => '&#32;и $1 $2',
+
 # Search results
 'searchresults'            => 'и�ка�ниꙗ ито�гъ',
+'searchprofile-images'     => 'дѣ�ла',
 'search-result-size'       => '$1 ({{PLURAL:$2|$2 �ло�во|$2 �ло�ва|$2 �ловє��ъ}})',
 'search-interwiki-caption' => 'ро�дь�твьна опꙑть�твова�ниꙗ',
 'searchall'                => 'вь�ꙗ�',
@@ -325,22 +338,25 @@ $messages = array(
 'recentchangeslinked-page' => '�трани�цѧ и�мѧ :',
 
 # Upload
-'upload'           => 'положє�ниѥ дѣ�ла',
-'uploadbtn'        => 'положє�ниѥ дѣ�ла',
-'uploadlog'        => 'дѣ�лъ положє�ниꙗ ї�торі�ꙗ',
-'uploadlogpage'    => 'дѣ�лъ положє�ниꙗ ї�торі�ꙗ',
-'successfulupload' => 'дѣ�ло положєно ѥ��тъ',
-'uploadedimage'    => '� [[$1]] � положє�нъ ѥ��тъ',
-'watchthisupload'  => '�и �трани�цѧ блюдє�ниѥ',
-
-# Special:ImageList
+'upload'            => 'положє�ниѥ дѣ�ла',
+'uploadbtn'         => 'положє�ниѥ дѣ�ла',
+'uploadlog'         => 'дѣ�лъ положє�ниꙗ ї�торі�ꙗ',
+'uploadlogpage'     => 'дѣ�лъ положє�ниꙗ ї�торі�ꙗ',
+'filename'          => 'дѣ�ла и�мѧ',
+'filedesc'          => 'опь�а�ниѥ',
+'fileuploadsummary' => 'опь�а�ниѥ:',
+'successfulupload'  => 'дѣ�ло положєно ѥ��тъ',
+'uploadedimage'     => '� [[$1]] � положє�нъ ѥ��тъ',
+'watchthisupload'   => '�и �трани�цѧ блюдє�ниѥ',
+
+# Special:ListFiles
 'imgfile'        => 'дѣ�ло',
-'imagelist'      => 'дѣ�лъ ката�логъ',
-'imagelist_name' => 'и�мѧ',
-'imagelist_user' => 'по�льꙃєватєл҄ь',
-'imagelist_size' => 'мѣ�ра',
+'listfiles'      => 'дѣ�лъ ката�логъ',
+'listfiles_name' => 'и�мѧ',
+'listfiles_user' => 'по�льꙃєватєл҄ь',
+'listfiles_size' => 'мѣ�ра',
 
-# Image description page
+# File description page
 'filehist-deleteone' => 'поничьжє�ниѥ',
 'filehist-current'   => 'нꙑнѣщьн҄ь о�бра�ъ',
 'filehist-user'      => 'по�льꙃєватєл҄ь',
@@ -360,17 +376,12 @@ $messages = array(
 'randomredirect' => 'прѣнаправлѥ�ниє въ нє�аа�пѫ',
 
 # Statistics
-'statistics'    => 'Статї�тїка',
-'sitestats'     => '{{SITENAME}} �татї�тїка',
-'userstats'     => 'Польѕевателъ �татї�тїка',
-'sitestatstext' => "Сьдє '''$1''' {{PLURAL:$1|�трани�ца ѥ��тъ|�трани�ци ѥ��тє|�трани�цѧ �ѫ�тъ|�трани�ць �ѫ�тъ}} · по�рѣдѣ {{PLURAL:$1|ѩже|ѥюжє|ихъжє|ихъжє}} и бє�ѣдꙑ · и �траницѧ о {{SITENAME}} · и ꙃѣло малꙑ члѣ�ни · и прѣнаправлѥниꙗ · и дроугꙑ� �траницѧ �ѫ�тъ · ѩжє и�тиньнꙑ члѣ�ни нє �ѫ�тъ � Бєжихъ Википєдїи '''$2''' {{PLURAL:$2|�трани�ца ѥ��тъ|�трани�ци ѥ��тє|�трани�цѧ �ѫ�тъ|�трани�ць �ѫ�тъ}} ѩжє {{PLURAL:$2|и�тиньна члѣ�нъ ѥ�тъ|и�тиньнѣ члѣ�на ѥ��тє|и�тиньнꙑ члѣ�ни �ѫ�тъ|и�тиньнꙑ члѣ�ни �ѫ�тъ}}
-
-Такождє '''$8''' {{PLURAL:$8|дѣло положєно ѥ�тъ|дѣлѣ положєно ѥ�тє|дѣла положєно �ѫ�тъ|дѣлъ положєно �ѫ�тъ}}
-
-О прьваѥго {{grammar:genitive|{{SITENAME}}}} дьнє '''$4''' {{PLURAL:$4|и�правлѥ�ниѥ �ътворѥно ѥ��тъ|и�правлѥ�нии �ътворѥнѣ ѥ��тє|и�правлѥ�ниꙗ �ътворѥно �ѫ�тъ|и�правлѥ�нии �ътворѥно �ѫ�тъ}} � Сѥ значитъ ꙗко кажьдо �траница '''$5''' и�правлѥниꙗ иматъ · а къжьдо мѣ�на '''$6''' {{PLURAL:$6|ра�ъ �ъмощрѥна бѣ|ра�а �ъмощрѥна бѣашєтє|ра�ъ �ъмощрѥна бѣ|ра�ъ �ъмощрѥна бѣашѧ}}  
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Дѣ�и�твъ чрѣ�дꙑ] дльгота '''$7''' ѥ��тъ",
-'userstatstext' => "С҄ьдє $1 [[Special:ListUsers|{{plural:$1|по�льꙃєватєл҄ь|по�льꙃеватєлꙗ|п�ольꙃєватєлє|по�льꙃєватєлъ}}]] {{plural:$1|ѥ��тъ|ѥ��тє|�ѫ�тъ|�ѫ�тъ}} · {{plural:$1|ижажє|ижєюжє|ижихъжє|ижихъжє}} '''$2''' (или '''$4%''') {{plural:$5|[[Project:Съмотри�тєлє|{{plural:$2|�ъмотри�тєл҄ь|�ъмотри�тєлє|�ъмотри�тєлє|�ъмотри�тєлъ}}]]}} {{plural:$2|ѥ��тъ|ѥ��тє|�ѫ�тъ|�ѫ�тъ}}",
+'statistics'              => 'Статї�тїка',
+'statistics-header-users' => 'по�льꙃєватєлъ �татї�тїка',
+'statistics-articles'     => 'и�тиньнꙑ члѣ�ни',
+'statistics-pages'        => '�трани�цѧ',
+'statistics-files'        => 'положєнꙑ дѣла�',
+'statistics-jobqueue'     => '[http://www.mediawiki.org/wiki/Manual:Job_queue Дѣ�и�твъ чрѣ�дꙑ] дльгота',
 
 'disambiguations'     => 'мъного�ъмꙑ��лиꙗ',
 'disambiguationspage' => 'Template:мъного�ъмꙑ��лиѥ',
@@ -395,7 +406,6 @@ $messages = array(
 'speciallogtitlelabel' => '�трани�цѧ и�мѧ :',
 'log'                  => 'ї�торі�ѩ',
 'all-logs-page'        => 'вь�ѩ� ї�торі�ѩ',
-'log-search-submit'    => 'прѣиди�',
 
 # Special:AllPages
 'allpages'       => 'вь�ѩ� �трани�цѧ',
@@ -407,11 +417,22 @@ $messages = array(
 # Special:Categories
 'categories' => 'катигорі�ѩ',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'пони�чьжєнꙑ добродѣꙗ�ниꙗ',
+
+# Special:LinkSearch
+'linksearch-ok' => 'ищи�',
+
 # Special:ListUsers
 'listusers-submit' => 'ви�ждь',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'но�въ мѣ��тъ �ътворѥ�ниꙗ ї�торі�ꙗ',
+'newuserlog-create-entry'     => 'но�въ по�льꙃєватєл҄ь',
+'newuserlog-autocreate-entry' => 'по�льꙃєватєлꙗ мѣ��то аѵтомати�чьно �ътворєно� ѥ��тъ',
+
 # E-mail user
-'emailuser' => 'По�ъли епї�толѫ',
+'emailuser' => 'по�ъли єпї�толѫ',
 
 # Watchlist
 'watchlist'      => 'моꙗ� блюдє�ниꙗ',
@@ -429,18 +450,21 @@ $messages = array(
 
 'created' => '�ътворѥ�нъ ѥ��тъ',
 
-# Delete/protect/revert
-'deletepage'          => 'поничьжє�ниѥ',
-'excontent'           => "вънѫтри бѣ: '$1'",
-'excontentauthor'     => "вънѫтри� бѣ : '$1' (и по�лѣ�дьн҄ии дѣ�тєл҄ь бѣ '[[Special:Contributions/$2|$2]]')",
-'delete-legend'       => 'поничьжє�ниѥ',
-'actioncomplete'      => 'дѣ�и�тво �ътворєно� ѥ��тъ',
-'deletedtext'         => '�трани�ца � <nowiki>$1</nowiki> � поничьжєна ѥ��тъ � 
+# Delete
+'deletepage'      => 'поничьжє�ниѥ',
+'excontent'       => "вънѫтри бѣ: '$1'",
+'excontentauthor' => "вънѫтри� бѣ : '$1' (и по�лѣ�дьн҄ии дѣ�тєл҄ь бѣ '[[Special:Contributions/$2|$2]]')",
+'delete-legend'   => 'поничьжє�ниѥ',
+'actioncomplete'  => 'дѣ�и�тво �ътворєно� ѥ��тъ',
+'deletedtext'     => '�трани�ца � <nowiki>$1</nowiki> � поничьжєна ѥ��тъ � 
 виждь � $2 � по�лѣ�дьнъ поничьжє�ниѩ дѣлꙗ�',
-'deletedarticle'      => '� [[$1]] � поничьжє�нъ ѥ��тъ',
-'dellogpage'          => 'поничьжє�ниꙗ ї�торі�ꙗ',
-'deletionlog'         => 'поничьжє�ниꙗ ї�торі�ꙗ',
+'deletedarticle'  => '� [[$1]] � поничьжє�нъ ѥ��тъ',
+'dellogpage'      => 'поничьжє�ниꙗ ї�торі�ꙗ',
+'deletionlog'     => 'поничьжє�ниꙗ ї�торі�ꙗ',
+
+# Protect
 'protectlogpage'      => '�абранѥ�ниꙗ ї�торі�ꙗ',
+'prot_1movedto2'      => '� [[$1]] � нарєчє�нъ � [[$2]] � ѥ��тъ',
 'protect-level-sysop' => 'то�лико �ъмотри�тєлє',
 
 # Restrictions (nouns)
@@ -516,7 +540,7 @@ $messages = array(
 'svg-long-desc'  => '(дѣ�ло SVG · обꙑ�чьнъ о�бра�ъ : $1 × $2 п҃ѯ · дѣ�ла мѣ�ра : $3)',
 'show-big-image' => 'пль�нъ ви�да о�бра�ъ',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'ищи�',
 
 # EXIF tags
diff --git a/languages/messages/MessagesCv.php b/languages/messages/MessagesCv.php
index c1722e31..4311c794 100644
--- a/languages/messages/MessagesCv.php
+++ b/languages/messages/MessagesCv.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Хутшăнаканăн_канашлу_�траници',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_�ӳт�е_�вмалли',
-	NS_IMAGE            => 'Ӳкерчĕк',
-	NS_IMAGE_TALK       => 'Ӳкерчĕке_�ӳт�е_�вмалли',
+	NS_FILE             => 'Ӳкерчĕк',
+	NS_FILE_TALK        => 'Ӳкерчĕке_�ӳт�е_�вмалли',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_�ӳт�е_�вмалли',
 	NS_TEMPLATE         => 'Шаблон',
@@ -82,8 +82,6 @@ $messages = array(
 'underline-never'   => '�ихăçан та',
 'underline-default' => 'Браузер ĕнерлевĕ�ене у�ă курмалла',
 
-'skinpreview' => '(Малтанхи курăну)',
-
 # Dates
 'sunday'        => 'выр�арникун',
 'monday'        => 'Тунтикун',
@@ -177,7 +175,7 @@ $messages = array(
 'mytalk'         => 'Ман канашлу �траници',
 'anontalk'       => 'Çак IP-адре�а �ӳт�е �вни',
 'navigation'     => 'Меню',
-'and'            => 'тата',
+'and'            => '&#32;тата',
 
 # Metadata in edit box
 'metadata_help' => 'Метаданнăй�ем:',
@@ -240,8 +238,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} çинчен',
 'aboutpage'            => 'Project:çинчен',
-'bugreports'           => 'Йăнăш çинчен пĕлтерни',
-'bugreportspage'       => 'Project:Йăнăш�ен пĕтĕмлетĕвĕ',
 'copyright'            => 'Ку ăшлăх $1 килĕшӳллĕн �арăлать.',
 'copyrightpagename'    => '{{SITENAME}} проектăн автор прави�ем',
 'copyrightpage'        => '{{ns:project}}:�втор прави�ем',
@@ -264,8 +260,6 @@ $messages = array(
 
 'badaccess'        => 'До�туп йăнăшĕ',
 'badaccess-group0' => 'Э�ир ыйтакан ĕçе тăвайма�тăр',
-'badaccess-group1' => 'Ку ĕçе $1 шутне кĕрекен хутшăнакан кăна тума пултарать.',
-'badaccess-group2' => 'Ку ĕçе $1 шутне кĕрекен хутшăнакан кăна тума пултарать.',
 'badaccess-groups' => 'Ку ĕçе $1 шутне кĕрекен хутшăнакан кăна тума пултарать.',
 
 'versionrequired'     => 'MediaWiki-н $1 вер�ийĕ кирлĕ',
@@ -359,7 +353,6 @@ $1',
 'cannotdelete'         => 'Э�ир кăтартнă �траницăна е файла кăлар�а пăрахайма�тпăр. Ăна, тен, урăххи кăлар�а пăрахнă?',
 'badtitle'             => 'Ку �т килĕшме�т',
 'badtitletext'         => 'Э�ир кăтартнă �тать� �чĕ тĕрĕ� мар, пушă, е чĕлхе хушшинчипе интервики �чĕ тĕрĕ� мар. Ятра у�ă курма юраман паллă�ене çырнинче пулма пултарать.',
-'perfdisabled'         => 'Каçарăр та, �ервер йывăррăн ĕçленине пула ку ĕçе вăхăтлăха тума май çук.',
 'perfcached'           => 'Ку даннăй�ене к�шран илнĕ, çавна май унта юлашки улшăну�ем палăрма�ăр пултараççĕ.',
 'perfcachedts'         => 'Ку даннăй�ене к�шран илнĕ, юлашки хут вăл $1 вăхăтра çĕнелнĕ.',
 'querypage-no-updates' => 'Ку �траницăна хальхи вăхăтра улăштарма чарнă. Ку даннăй�ене хальхи вăхăтра çĕнетме май çук.',
@@ -381,7 +374,7 @@ $1',
 Çак �ăлтава кăтартнă: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Ĕнерлев йăнăшĕ. Виру� �канерĕ паллă мар: <i>$1</i>',
+'virus-badscanner'     => "Ĕнерлев йăнăшĕ. Виру� �канерĕ паллă мар: ''$1''",
 'virus-scanfailed'     => '�кенерланă чухнехи йăнăш (код $1)',
 'virus-unknownscanner' => 'паллă мар антивиру�:',
 
@@ -397,7 +390,6 @@ $1',
 'yourpasswordagain'          => 'Вăрттăн �ăмах тепре çырăр:',
 'remembermypassword'         => 'Ку компьютер çинче мана а�ту�а хăвармалла',
 'yourdomainname'             => 'Сирĕн домен',
-'loginproblem'               => '<span style="color:red">Хутшăнакана палаймарăмăр.</span>',
 'login'                      => 'Сайта кĕр',
 'nav-login-createaccount'    => 'Сайта кĕр / реги�трацилен',
 'loginprompt'                => 'Сайта кĕре� те�ен �ирĕн «cookies»-па у�ă курма ирĕк памалла.',
@@ -452,10 +444,11 @@ $1',
 'loginlanguagelabel'         => 'Чĕлхе: $1',
 
 # Password reset dialog
-'resetpass'         => 'Хутшăнаканăн вăрттăн �ăмахне çĕнете��и',
-'resetpass_header'  => 'Пароле пăрахăçла',
-'resetpass_submit'  => 'Вăрттăн �ăмаха ларт�а �айта кĕр',
-'resetpass_missing' => 'Формăра даннăй�ем çук.',
+'resetpass'        => 'Хутшăнаканăн вăрттăн �ăмахне çĕнете��и',
+'resetpass_header' => 'Пароле пăрахăçла',
+'oldpassword'      => 'Кивě пароль',
+'newpassword'      => 'Çěнě пароль',
+'resetpass_submit' => 'Вăрттăн �ăмаха ларт�а �айта кĕр',
 
 # Edit page toolbar
 'bold_sample'    => 'Çурмахулăм тек�т',
@@ -477,8 +470,8 @@ $1',
 'hr_tip'         => 'Горизонтальлĕ йĕр (�ахалтарах у�ă курăр)',
 
 # Edit pages
-'summary'                => 'Улшăну�ен кĕ�ке ăнлантарăвĕ',
-'subject'                => 'Тема',
+'summary'                => 'Улшăну�ен кĕ�ке ăнлантарăвĕ:',
+'subject'                => 'Тема:',
 'minoredit'              => 'Кунта пěчěк улшăну�ем кăна кěртнě',
 'watchthis'              => 'Ку �траницăна кěртекен  улшăну�ем  хыççăн �ăнамалла',
 'savearticle'            => 'Страницăна çыр�а хур',
@@ -488,8 +481,8 @@ $1',
 'showdiff'               => 'Кĕртнĕ улшăну�ем',
 'anoneditwarning'        => "'''��ăрхăр''': Э�ир �айта хăвăр çинчен пĕлтермен, çавăнпа та ку �траницăна улăштарнин журналне �ирĕн IP-адре�а çыр�а хума тивĕ.",
 'missingcommenttext'     => '��ларах, тарха�шăн, хăвар пĕлтерĕве çырăр.',
-'summary-preview'        => 'Ăнлантару çапла пулĕ',
-'subject-preview'        => 'Стать� �чĕ çапла пулĕ',
+'summary-preview'        => 'Ăнлантару çапла пулĕ:',
+'subject-preview'        => 'Стать� �чĕ çапла пулĕ:',
 'blockedtitle'           => 'Хутшăнакана ĕçлеме чарнă',
 'blockedtext'            => "<big>'''Ку аккаунта е IP-адре�а ĕçлеме чарнă.'''</big>
 
@@ -521,8 +514,8 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'usercsspreview'         => "'''�н манăр, ��ир �ирĕн css файл епле пула��ине çеç куратăр, ăна халлĕхе çыр�а хуман!'''",
 'userjspreview'          => "'''��тăвăр, ку �ирĕн javascript-файлăн малтанхи курăмĕ кăна, ăна хальлĕхе çыр�а хуман!'''",
 'updated'                => '(Çĕнелнĕ)',
-'note'                   => '<strong>Ăнлантаркăч:</strong>',
-'previewnote'            => '<strong>Ку �траницăна халлěхе çыр�а хуман. Э�ир ку �траницă мěнле пула��ине кăна куратăр!</strong>',
+'note'                   => "'''Ăнлантаркăч:'''",
+'previewnote'            => "'''Ку �траницăна халлěхе çыр�а хуман. Э�ир ку �траницă мěнле пула��ине кăна куратăр!'''",
 'previewconflict'        => 'Çӳлти чӳречере ��ир халĕ çыр�а хур�ан тек�т епле курăннине куратăр.',
 'editing'                => '$1 тӳрлетни',
 'editingsection'         => '$1 тӳрлетни (�тать� разделě)',
@@ -531,9 +524,9 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'yourtext'               => 'Сирĕн тек�т',
 'storedversion'          => '��ту�а хăварнă вер�и',
 'yourdiff'               => 'Уйрăмлăх�ем',
-'copyrightwarning'       => 'Э�ир кĕртнĕ, е улăштарнă пур �тать��ен тек�чĕ�ем $2 ($1 пăхăр) лизензине пăхăнаççĕ. Енчен те ��ир кĕртнĕ тек�та пурте у�ă курма, тӳрлет�е улăштарма пултарнипе килĕшме�тĕр пул�ан кунта ăна ан кĕртĕр. <br /> Çавăн пекех ��ир кĕртнĕ тек�тăн е авторĕ, е ăна ирĕклĕ у�ă курма юракан çăлкуç�енчен илнине çирĕплететĕр. <br /> <strong>�ВТОР ПР�ВИСЕМПЕ ХӲТĔЛЕ�Ĕ М�ТЕРИ�ЛСЕ�Е �� КĔРТĔР!</strong>',
-'protectedpagewarning'   => '<strong>�СĂРХ�ТТ�Р�И: ку �траницăна улшăну�ем кĕрте��инчен хӳтĕленĕ, ăна тӳрлетме админи�тратор�ем кăна пултараççĕ.</strong>',
-'titleprotectedwarning'  => '<strong>��ăрхаттару. Ку �траницăпа ĕçлеме чарнă, ăна хăш-пĕр хутшăнакан кăна хатерлеме пултарать.</strong>',
+'copyrightwarning'       => "Э�ир кĕртнĕ, е улăштарнă пур �тать��ен тек�чĕ�ем $2 ($1 пăхăр) лизензине пăхăнаççĕ. Енчен те ��ир кĕртнĕ тек�та пурте у�ă курма, тӳрлет�е улăштарма пултарнипе килĕшме�тĕр пул�ан кунта ăна ан кĕртĕр. <br /> Çавăн пекех ��ир кĕртнĕ тек�тăн е авторĕ, е ăна ирĕклĕ у�ă курма юракан çăлкуç�енчен илнине çирĕплететĕр. <br /> '''�ВТОР ПР�ВИСЕМПЕ ХӲТĔЛЕ�Ĕ М�ТЕРИ�ЛСЕ�Е �� КĔРТĔР!'''",
+'protectedpagewarning'   => "'''�СĂРХ�ТТ�Р�И: ку �траницăна улшăну�ем кĕрте��инчен хӳтĕленĕ, ăна тӳрлетме админи�тратор�ем кăна пултараççĕ.'''",
+'titleprotectedwarning'  => "'''��ăрхаттару. Ку �траницăпа ĕçлеме чарнă, ăна хăш-пĕр хутшăнакан кăна хатерлеме пултарать.'''",
 'templatesused'          => 'Ку �траница çинче у�ă курнă шаблон�ем:',
 'templatesusedpreview'   => 'Пăхакан �траница çинче у�ă курнă шаблон�ем:',
 'templatesusedsection'   => 'Ку пайра у�ă курнă шаблон�ем:',
@@ -555,10 +548,9 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 # History pages
 'viewpagelogs'        => 'Ку �траницăн журналĕ�ене пăха��и',
 'nohistory'           => 'Ку �траницăн улшăну�ен журналĕ çук.',
-'revnotfound'         => 'Вер�и тупăнмарĕ',
 'currentrev'          => 'Хальхи вер�и',
 'revisionasof'        => '$1 вер�и',
-'revision-info'       => '$1 вер�ийĕ; $2',
+'revision-info'       => '$1 вер�ийĕ; $2', # Additionally available: $3: revision id
 'previousrevision'    => '&larr;Малтанхи вер�и',
 'nextrevision'        => 'Çěнěрех вер�и→',
 'currentrevisionlink' => 'хальхи вер�и çине куç',
@@ -608,6 +600,7 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'textmatches'        => 'Стать��енчи тек�т пĕрпеклĕхĕ',
 'prevn'              => 'малтанхи $1',
 'nextn'              => 'малалли $1',
+'searchhelp-url'     => 'Help:Пулăшу',
 'showingresults'     => '��ларах ��ир <b>#$2</b> пуçла�а кăтартнă <b>$1</b> йĕркене куратăр.',
 'powersearch'        => '�нлă шырав',
 'powersearch-legend' => '�нлă шырав',
@@ -620,6 +613,7 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'qbsettings'         => '�авигаци хăми',
 'changepassword'     => 'Пароле улăштар',
 'skin'               => 'Ерешленӳ',
+'skin-preview'       => 'Малтанхи курăну',
 'dateformat'         => 'Дата формачĕ',
 'datedefault'        => 'Палăртман чухнехи',
 'math_syntax_error'  => '�интак�и� йăнăшĕ',
@@ -627,8 +621,6 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'prefs-watchlist'    => 'Сăнав �пи�окĕ',
 'prefs-misc'         => 'Ытти ĕнерлев�ем',
 'saveprefs'          => 'Çыр�а хур',
-'oldpassword'        => 'Кивě пароль',
-'newpassword'        => 'Çěнě пароль',
 'textboxsize'        => 'Тӳрлетни',
 'rows'               => 'Йěрке�ем',
 'columns'            => 'Юпа�ем:',
@@ -742,18 +734,18 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'upload_source_url'  => ' (тĕрĕ�, пурте курма пултаракан интертетел адре�ĕ)',
 'upload_source_file' => ' (�ирĕн компьютер çинчи файл)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ку �тарлă �траницăра ��ир пур кĕртнĕ файл�ене куратăр.
+# Special:ListFiles
+'listfiles-summary'     => 'Ку �тарлă �траницăра ��ир пур кĕртнĕ файл�ене куратăр.
 �умай пулма�ть кĕртни�ем çулте вырнаçнă.
 Юпа тăррине пу��ан йĕркелӳ майĕ улшăнĕ.',
-'imagelist_search_for'  => 'Ӳкерчĕк �чĕ тăрăх шырани:',
-'imagelist'             => 'Ӳкерчěк�ен �пи�окě',
-'imagelist_name'        => 'Файл �чĕ',
-'imagelist_user'        => 'Хутшăнакан',
-'imagelist_size'        => 'Виçи',
-'imagelist_description' => 'Ăнлантаркăч',
-
-# Image description page
+'listfiles_search_for'  => 'Ӳкерчĕк �чĕ тăрăх шырани:',
+'listfiles'             => 'Ӳкерчěк�ен �пи�окě',
+'listfiles_name'        => 'Файл �чĕ',
+'listfiles_user'        => 'Хутшăнакан',
+'listfiles_size'        => 'Виçи',
+'listfiles_description' => 'Ăнлантаркăч',
+
+# File description page
 'filehist'                  => 'Файл и�торийĕ',
 'imagelinks'                => 'С�ылкă�ем',
 'linkstoimage'              => 'Çак �траницă�ем ку файл çине кăтартаççĕ:',
@@ -773,7 +765,6 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'filedelete-submit'           => 'Кăлар�а пăрах',
 'filedelete-success'          => "'''$1''' кăлар�а пăрахрăмăр.",
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\'-ăн $3, $2 вăхăтри вер�ине кăлар�а пăрахнă.</span>',
-'filedelete-iscurrent'        => 'Э�ир ку файлăн юлашки вер�ине кăлар�а пăраха�шăн. Тарха�шăн, файла малтан кивĕ вер�инчен пĕрин патне те пулин тавăрăр.',
 'filedelete-otherreason'      => 'Урăх �ăлтав:',
 'filedelete-reason-otherlist' => 'Урăх �ăлтав',
 
@@ -798,9 +789,8 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'randomredirect' => 'Ăн�ăртран илнĕ куçару',
 
 # Statistics
-'sitestats'              => 'Сайт �тати�тики',
-'userstats'              => 'Хутшăнакан�ен �тати�тики',
-'statistics-mostpopular' => 'Чи нумай пăхакан �траницă�ем',
+'statistics-header-users' => 'Хутшăнакан�ен �тати�тики',
+'statistics-mostpopular'  => 'Чи нумай пăхакан �траницă�ем',
 
 'disambiguations'      => '�умай пĕлтерĕшлĕ �тать��ене кăтартакан �траницă�ем',
 'disambiguationspage'  => 'Template:Disambig',
@@ -858,7 +848,6 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'specialloguserlabel' => 'Хутшăнакан:',
 'log'                 => 'Журнал�ем',
 'all-logs-page'       => 'Журнал�ем',
-'log-search-submit'   => 'Туп',
 
 # Special:AllPages
 'allpages'         => 'Пěтěм �траницă�ем',
@@ -902,27 +891,21 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'emailsenttext'   => 'Сирĕн �лектронлă çырăва леçрĕмĕр.',
 
 # Watchlist
-'watchlist'            => 'Пăх�а тăракан �траницă�ем �пи�окĕ',
-'mywatchlist'          => 'Ман �ăнав �пи�окĕ',
-'nowatchlist'          => 'Э�ир пăх�а тăракан �траницă�ен �пи�окĕ пушă.',
-'watchnologin'         => 'Си�темăна хăвăр �та каламалла',
-'watchnologintext'     => 'Сăнав �пи�окне улăштармашкăн �ирĕн �и�темăна [[Special:UserLogin|хăвăр �та каламалла]].',
-'addedwatch'           => 'Сăнамалли шутне кĕртрĕмĕр',
-'addedwatchtext'       => '«[[:$1]]» �траницăна �ирĕн [[Special:Watchlist|�ăнав �пи�ока]] хушрăмăр. Малашне [[Special:RecentChanges|юлашки улшăну�ене кăтартакан �траницăра]] унпа çыхăннă улшăну�ене хылăм шрифтпа курăнĕç.
+'watchlist'        => 'Пăх�а тăракан �траницă�ем �пи�окĕ',
+'mywatchlist'      => 'Ман �ăнав �пи�окĕ',
+'nowatchlist'      => 'Э�ир пăх�а тăракан �траницă�ен �пи�окĕ пушă.',
+'watchnologin'     => 'Си�темăна хăвăр �та каламалла',
+'watchnologintext' => 'Сăнав �пи�окне улăштармашкăн �ирĕн �и�темăна [[Special:UserLogin|хăвăр �та каламалла]].',
+'addedwatch'       => 'Сăнамалли шутне кĕртрĕмĕр',
+'addedwatchtext'   => '«[[:$1]]» �траницăна �ирĕн [[Special:Watchlist|�ăнав �пи�ока]] хушрăмăр. Малашне [[Special:RecentChanges|юлашки улшăну�ене кăтартакан �траницăра]] унпа çыхăннă улшăну�ене хылăм шрифтпа курăнĕç.
 Енчен те �ирĕн ку �траницăна �ăна� кăмăл пĕт�ен, «ан �ăна» пу�кăч çине пу�ăр.',
-'removedwatch'         => 'Сăнамалли �пи�окран кăлар�а пăрахнă',
-'removedwatchtext'     => '«[[:$1]]» �траницăна �ирĕн �ăнамалли �пи�окран кăлар�а пăрахнă.',
-'watch'                => 'Сăна',
-'watchthispage'        => 'Ку �траницăна �ăна�а тăр',
-'unwatch'              => 'ан �ăна',
-'unwatchthispage'      => 'Сăнама пăрах',
-'notanarticle'         => 'Ку �тать� мар',
-'watchlist-show-bots'  => 'Бот�ен ĕçне кăтарт',
-'watchlist-hide-bots'  => 'Бот�ен ĕçне пытар',
-'watchlist-show-own'   => 'Ман тӳрлетӳ�ене кăтарт',
-'watchlist-hide-own'   => 'Ман тӳрлетӳ�ене пытар',
-'watchlist-show-minor' => 'Пĕчĕк тӳрлетӳ�ене кăтарт',
-'watchlist-hide-minor' => 'Пĕчĕк тӳрлетӳ�ене пытар',
+'removedwatch'     => 'Сăнамалли �пи�окран кăлар�а пăрахнă',
+'removedwatchtext' => '«[[:$1]]» �траницăна �ирĕн �ăнамалли �пи�окран кăлар�а пăрахнă.',
+'watch'            => 'Сăна',
+'watchthispage'    => 'Ку �траницăна �ăна�а тăр',
+'unwatch'          => 'ан �ăна',
+'unwatchthispage'  => 'Сăнама пăрах',
+'notanarticle'     => 'Ку �тать� мар',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Сăнамалли�ем шутне хуша��и…',
@@ -934,29 +917,34 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'created'            => 'хатĕрленĕ',
 'enotif_anon_editor' => '$1 анонимлă хутшăнакан',
 
-# Delete/protect/revert
-'deletepage'                  => 'Кăлар�а парахнă �тать��ем',
-'confirm'                     => 'Çирĕплетни',
-'excontent'                   => 'ăшлăхĕ: «$1»',
-'excontentauthor'             => 'ăшлăхĕ: «$1» ([[Special:Contributions/$2|$2]] пĕччен кăна улшăну�ем кĕртнĕ)',
-'exblank'                     => '�траница пушă пулнă',
-'actioncomplete'              => 'Турăмăр',
-'deletedtext'                 => '«$1» кăлар�а парахрăмăр.
+# Delete
+'deletepage'        => 'Кăлар�а парахнă �тать��ем',
+'confirm'           => 'Çирĕплетни',
+'excontent'         => 'ăшлăхĕ: «$1»',
+'excontentauthor'   => 'ăшлăхĕ: «$1» ([[Special:Contributions/$2|$2]] пĕччен кăна улшăну�ем кĕртнĕ)',
+'exblank'           => '�траница пушă пулнă',
+'actioncomplete'    => 'Турăмăр',
+'deletedtext'       => '«$1» кăлар�а парахрăмăр.
 Юлашки кăлар�а пăрахнă �тать��ен �пи�окне курмашкăн кунта пăхăр: $2.',
-'suppressedarticle'           => '«[[$1]]» пытарнă',
-'dellogpage'                  => 'Кăлар�а пăрахни�ем',
-'dellogpagetext'              => '��ларах ��ир юлашки кăлар�а пăрахнă �тать��ене куратăр.',
-'deletionlog'                 => 'кăлар�а пăрахни�ем',
-'reverted'                    => 'Малтанхи вер�ине тавăрнă',
-'deletecomment'               => 'Кăлар�а пăрахнин �ăлтавĕ',
-'rollback'                    => 'Тÿрлетÿ�ене ка�лла куçара��и',
-'rollback_short'              => 'Ка�лла куçара��и',
-'rollbacklink'                => 'ка�лла тавăр',
-'rollbackfailed'              => 'Ка�лла куçарнă çухна йăнăш тухнă',
+'suppressedarticle' => '«[[$1]]» пытарнă',
+'dellogpage'        => 'Кăлар�а пăрахни�ем',
+'dellogpagetext'    => '��ларах ��ир юлашки кăлар�а пăрахнă �тать��ене куратăр.',
+'deletionlog'       => 'кăлар�а пăрахни�ем',
+'reverted'          => 'Малтанхи вер�ине тавăрнă',
+'deletecomment'     => 'Кăлар�а пăрахнин �ăлтавĕ',
+
+# Rollback
+'rollback'       => 'Тÿрлетÿ�ене ка�лла куçара��и',
+'rollback_short' => 'Ка�лла куçара��и',
+'rollbacklink'   => 'ка�лла тавăр',
+'rollbackfailed' => 'Ка�лла куçарнă çухна йăнăш тухнă',
+
+# Protect
 'protectlogpage'              => 'Хӳтĕлев журналĕ',
 'protectlogtext'              => '��ларах ��ир �тать��ене хӳтĕленин тата хӳтĕлев паллине пăрахаçланин журналне куратăр.',
 'protectedarticle'            => '«[[$1]]» �траницăна хӳтĕлерĕмĕр',
 'unprotectedarticle'          => '«[[$1]]» �траницăн хӳтĕлевне пăрахăçланă',
+'prot_1movedto2'              => '$1 $2 çине куçарнă',
 'protectcomment'              => 'Страницăна хӳтĕленин �ăлтавĕ',
 'protectexpiry'               => 'Пĕтет:',
 'protect-level-autoconfirmed' => 'Стать�на çĕнĕрен реги�трациленнĕ, е пачах та реги�трациленменни�енчен хӳтĕле',
@@ -988,7 +976,6 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 
 # What links here
 'whatlinkshere'       => 'Кунта килекен ��ылкă�ем',
-'linklistsub'         => '(��ылкă�ен �пи�окĕ)',
 'linkshere'           => "Çак �траницă�ем '''[[:$1]]''' çине ил�е килеççĕ:",
 'nolinkshere'         => "'''[[:$1]]''' �траница çине ытти �траницă�енчен килме пулма�ть.",
 'whatlinkshere-links' => '� ��ылкă�ем',
@@ -1020,6 +1007,7 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 # Move page
 'move-page-legend'        => 'Страницăна куçарнă',
 'movearticle'             => 'Страницăн �тне улăштар',
+'movenologin'             => 'Си�тема �ирĕн �та пĕлме�т',
 'newtitle'                => 'Çĕнĕ �т',
 'move-watch'              => 'Ку �траницăна �ăнамалли�ем шутне хуш',
 'movepagebtn'             => 'Страницăн �тне улăштар',
@@ -1129,7 +1117,7 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'file-info-size' => '($1 × $2 пик�ел, файл пы�ăкăше: $3, MIME-тĕ�ĕ: $4)',
 'file-nohires'   => '<small>Пы�ăкрах калăпăшли çук.</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'         => 'Çĕнĕ файл�ен галерейи',
 'newimages-summary' => 'Ку �тарлă �траницăра ��ир нумай пулма�ть кĕртнĕ файл�ене куратăр',
 'noimages'          => 'Ӳкерчĕк�ем çук.',
@@ -1173,14 +1161,6 @@ $1 хутшăнакан патне, е ытти [[{{MediaWiki:Grouppage-sysop}}|
 'deletedwhileediting' => '��ăрхăр: ��ир тӳрлетнĕ вăхăтра ку �траницăна кăлар�а парахнă!',
 'recreate'            => 'Çĕнĕрен пуçла',
 
-# HTML dump
-'redirectingto' => '[[:$1]] çине куçаракан �траница …',
-
-# AJAX search
-'searchcontaining' => 'Ăшĕ�енче «$1» пур �тать��ене шыратпăр.',
-'searchnamed'      => '$1 �тлă �тать��ене шыратпăр',
-'articletitles'    => '«$1»-ран пуçланакан �тать��ем',
-
 # Multipage image navigation
 'imgmultipageprev' => '� малтанхи �траница',
 'imgmultipagenext' => 'тепĕр �траница →',
diff --git a/languages/messages/MessagesCy.php b/languages/messages/MessagesCy.php
index 07cb045b..a2e18190 100644
--- a/languages/messages/MessagesCy.php
+++ b/languages/messages/MessagesCy.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => "Sgwrs_Defnyddiwr",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => "Sgwrs_$1",
-	NS_IMAGE          => "Delwedd",
-	NS_IMAGE_TALK     => "Sgwrs_Delwedd",
+	NS_FILE           => "Delwedd",
+	NS_FILE_TALK      => "Sgwrs_Delwedd",
 	NS_MEDIAWIKI      => "MediaWici",
 	NS_MEDIAWIKI_TALK => "Sgwrs_MediaWici",
 	NS_TEMPLATE       => "Nodyn",
@@ -31,11 +31,6 @@ $namespaceNames = array(
 	NS_HELP_TALK	  => "Sgwrs Cymorth"
 );
 
-$skinNames = array(
-	'standard'    => 'Safonol',
-	'nostalgia'   => 'Hiraeth',
-	'cologneblue' => 'Glas Cwlen',
-);
 
 $defaultDateFormat = 'dmy';
 
@@ -136,7 +131,7 @@ $messages = array(
 'tog-watchdefault'            => 'Ychwanegu tudalen at fy rhestr gwylio wrth i mi ei golygu',
 'tog-watchmoves'              => 'Ychwanegu tudalen at fy rhestr gwylio wrth i mi ei symud.',
 'tog-watchdeletion'           => 'Ychwanegu tudalennau at fy rhestr gwylio wrth i mi eu dileu',
-'tog-minordefault'            => 'Marciwch pob golygiad fel un bach',
+'tog-minordefault'            => 'Marcio pob golygiad fel un bach',
 'tog-previewontop'            => 'Dangos y rhagolwg uwchben yn hytrach nag o dan y bocs golygu.',
 'tog-previewonfirst'          => 'Dangos rhagolwg ar y golygiad cyntaf',
 'tog-nocache'                 => 'Analluogi storio tudalennau mewn celc',
@@ -154,16 +149,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'Cuddio fy ngolygiadau fy hunan yn fy rhestr gwylio',
 'tog-watchlisthidebots'       => 'Cuddio golygiadau bot yn fy rhestr gwylio',
 'tog-watchlisthideminor'      => 'Cuddio golygiadau bychain rhag y rhestr gwylio',
+'tog-watchlisthideliu'        => 'Cuddio golygiadau gan ddefnyddwyr mewngofnodedig rhag y rhestr gwylio',
+'tog-watchlisthideanons'      => 'Cuddio golygiadau gan ddefnyddwyr anhysbys rhag y rhestr gwylio',
 'tog-ccmeonemails'            => 'Anfoner copi ataf pan anfonaf e-bost at ddefnyddiwr arall',
 'tog-diffonly'                => "Peidio â dangos cynnwys y dudalen islaw'r gymhariaeth ar dudalennau cymharu",
 'tog-showhiddencats'          => 'Dangos categorïau cuddiedig',
+'tog-norollbackdiff'          => 'Peidio â dangos cymhariaeth ar ôl gwrthdroi golygiad',
 
 'underline-always'  => 'Bob amser',
 'underline-never'   => 'Byth',
 'underline-default' => 'Rhagosodyn y porwr',
 
-'skinpreview' => '(Rhagolwg)',
-
 # Dates
 'sunday'        => 'Dydd Sul',
 'monday'        => 'Dydd Llun',
@@ -257,7 +253,7 @@ $messages = array(
 'mytalk'         => 'Fy sgwrs',
 'anontalk'       => 'Sgwrs ar gyfer y cyfeiriad IP hwn',
 'navigation'     => 'Panel llywio',
-'and'            => 'a/ac',
+'and'            => '&#32;a/ac',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -294,14 +290,14 @@ $messages = array(
 'talkpagelinktext'  => 'Sgwrs',
 'specialpage'       => 'Tudalen Arbennig',
 'personaltools'     => 'Offer personol',
-'postcomment'       => 'Postiwch sylw',
+'postcomment'       => 'Adran newydd',
 'articlepage'       => 'Dangos tudalen yn y prif barth',
 'talk'              => 'Sgwrs',
 'views'             => 'Golygon',
 'toolbox'           => 'Blwch offer',
 'userpage'          => 'Gwyliwch dudalen y defnyddiwr',
 'projectpage'       => 'Gweld tudalen y wici',
-'imagepage'         => 'Gweld tudalen y ffeil clyweled',
+'imagepage'         => 'Gweld tudalen y ffeil',
 'mediawikipage'     => 'Gweld tudalen y neges',
 'templatepage'      => 'Dangos y dudalen templed',
 'viewhelppage'      => 'Dangos y dudalen gymorth',
@@ -320,8 +316,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ynglŷn â {{SITENAME}}',
 'aboutpage'            => 'Project:Ynglŷn â {{SITENAME}}',
-'bugreports'           => 'Adroddiadau diffygion',
-'bugreportspage'       => 'Project:Adroddiadau diffygion',
 'copyright'            => "Mae'r cynnwys ar gael o dan $1.",
 'copyrightpagename'    => 'Hawlfraint {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Hawlfraint',
@@ -344,9 +338,7 @@ $messages = array(
 
 'badaccess'        => 'Gwall caniatâd',
 'badaccess-group0' => 'Ni chaniateir i chi wneud y weithred y ceisiasoch amdani.',
-'badaccess-group1' => "Dim ond defnyddwyr yng ngrŵp $1 sy'n cael gwneud y weithred y ceisiasoch amdani.",
-'badaccess-group2' => "Dim ond defnyddwyr o blith y grwpiau $1 sy'n cael gwneud y weithred y ceisiasoch amdani.",
-'badaccess-groups' => "Dim ond defnyddwyr o blith y grwpiau $1 sy'n cael gwneud y weithred y ceisiasoch amdani.",
+'badaccess-groups' => "Dim ond defnyddwyr o blith y {{PLURAL:$2|grwp|grwp|grwpiau|grwpiau|grwpiau|grwpiau}} $1 sy'n cael gwneud y weithred y gofynwyd amdani.",
 
 'versionrequired'     => 'Mae angen fersiwn $1 y meddalwedd MediaWiki',
 'versionrequiredtext' => "Mae angen fersiwn $1 y meddalwedd MediaWiki er mwyn gwneud defnydd o'r dudalen hon. Gweler y dudalen am y [[Special:Version|fersiwn]].",
@@ -360,6 +352,8 @@ $messages = array(
 'editsection'             => 'golygu',
 'editold'                 => 'golygu',
 'viewsourceold'           => 'dangos y tarddiad',
+'editlink'                => 'golygu',
+'viewsourcelink'          => 'dangos côd y dudalen',
 'editsectionhint'         => "Golygu'r adran: $1",
 'toc'                     => 'Taflen Cynnwys',
 'showtoc'                 => 'dangos',
@@ -373,13 +367,13 @@ $messages = array(
 'site-atom-feed'          => 'Porthiant Atom $1',
 'page-rss-feed'           => "Porthiant RSS '$1'",
 'page-atom-feed'          => "Porthiant Atom '$1'",
-'red-link-title'          => '$1 (heb ei greu eto)',
+'red-link-title'          => "$1 (does dim tudalen o'r enw hwn i gael)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Tudalen',
 'nstab-user'      => 'Tudalen defnyddiwr',
 'nstab-media'     => 'Tudalen cyfrwng',
-'nstab-special'   => 'Arbennig',
+'nstab-special'   => 'Tudalen arbennig',
 'nstab-project'   => 'Tudalen y wici',
 'nstab-image'     => 'Ffeil',
 'nstab-mediawiki' => 'Neges',
@@ -389,7 +383,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => "Dim gweithred o'r fath",
-'nosuchactiontext'  => "Dydi'r wici ddim yn adnabod y weithred yn y cyfeiriad URL.",
+'nosuchactiontext'  => "Nid yw'r weithred sydd ynghlwm wrth y cyfeiriad URL yn un dilys.
+Efallai eich bod wedi camdeipio'r URL, neu eich bod wedi dilyn cyswllt gwallus.
+Neu efallai fod byg ar {{SITENAME}}.",
 'nosuchspecialpage' => 'Y dudalen arbennig ddim yn bod',
 'nospecialpagetext' => "<big>'''Dyw'r wici ddim yn adnabod y dudalen arbennig y gofynnwyd amdani.'''</big>
 
@@ -442,7 +438,6 @@ A fyddech gystal â gwneud adroddiad ar hwn at [[Special:ListUsers/sysop|weinydd
 'cannotdelete'         => "Mae'n amhosib dileu'r dudalen neu'r ddelwedd hon. (Efallai fod rhywun arall eisoes wedi'i dileu).",
 'badtitle'             => 'Teitl gwael',
 'badtitletext'         => "Mae'r teitl a ofynnwyd amdano yn annilys, yn wag, neu cysylltu'n anghywir rhwng ieithoedd neu wicïau. Gall fod ynddo un nod neu ragor na ellir eu defnyddio mewn teitlau.",
-'perfdisabled'         => "Ymddiheurwn! Mae'r nodwedd hon wedi'i analluogi dros dro gan ei bod yn ormod o dreth ar y databas.",
 'perfcached'           => "Mae'r wybodaeth ganlynol yn gopi cadw; mae'n bosib nad y fersiwn diweddaraf ydyw.",
 'perfcachedts'         => 'Rhoddwyd y data canlynol ar gadw mewn celc a ddiweddarwyd ddiwethaf am $1.',
 'querypage-no-updates' => "Ar hyn o bryd, nid yw'r meddalwedd wedi ei osod i ddiweddaru data'r dudalen hon.",
@@ -457,7 +452,7 @@ Ceisiwch eto ymhen rhai munudau.",
 'protectedpagetext'    => "Mae'r dudalen hon wedi'i diogelu rhag cael ei golygu.",
 'viewsourcetext'       => 'Cewch weld a chopïo côd y dudalen:',
 'protectedinterface'   => 'Testun ar gyfer rhyngwyneb y wici yw cynnwys y dudalen hon. Clowyd y dudalen er mwyn ei diogeli.',
-'editinginterface'     => "'''Dalier sylw:''' Rydych yn golygu tudalen sy'n rhan o destun rhyngwyneb y meddalwedd. Bydd newidiadau i'r dudalen hon yn effeithio ar y rhyngwyneb a ddefnyddir gan eraill. Os am gyfieithu'r neges, ystyriwch ddefnyddio [http://translatewiki.net/wiki/Main_Page?setlang=cy Betawiki], sef y prosiect MediaWiki sy'n hyrwyddo creu wicïau amlieithog.",
+'editinginterface'     => "'''Dalier sylw:''' Rydych yn golygu tudalen sy'n rhan o destun rhyngwyneb y meddalwedd. Bydd newidiadau i'r dudalen hon yn effeithio ar y rhyngwyneb a ddefnyddir gan eraill. Os am gyfieithu'r neges, ystyriwch ddefnyddio [http://translatewiki.net/wiki/Main_Page?setlang=cy translatewiki.net], sef y prosiect MediaWiki sy'n hyrwyddo creu wicïau amlieithog.",
 'sqlhidden'            => '(cuddiwyd chwiliad SQL)',
 'cascadeprotected'     => "Diogelwyd y dudalen hon rhag ei newid, oherwydd ei bod wedi ei chynnwys yn y {{PLURAL:$1|dudalen ganlynol|dudalen ganlynol|tudalennau canlynol|tudalennau canlynol|tudalennau canlynol|tudalennau canlynol}}, a {{PLURAL:$1|honno yn ei thro wedi ei|honno yn ei thro wedi ei|rheiny yn eu tro wedi eu|rheiny yn eu tro wedi eu|rheiny yn eu tro wedi eu|rheiny yn eu tro wedi eu}} diogelu, a'r dewisiad 'sgydol' ynghynn:
 $2",
@@ -472,10 +467,10 @@ Rhoddwyd y rheswm hwn - ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => "Allgofnodi'r defnyddiwr",
-'logouttext'                 => '<strong>Rydych wedi allgofnodi.</strong>
+'logouttext'                 => "'''Rydych wedi allgofnodi.'''
 
 Gallwch ddefnyddio {{SITENAME}} yn anhysbys, neu fe allwch [[Special:UserLogin|fewngofnodi eto]] wrth yr un un enw neu wrth enw arall. 
-Sylwer y bydd rhai tudalennau yn parhau i ymddangos fel ag yr oeddent pan oeddech wedi mewngofnodi hyd nes i chi glirio celc eich porwr.',
+Sylwer y bydd rhai tudalennau yn parhau i ymddangos fel ag yr oeddent pan oeddech wedi mewngofnodi hyd nes i chi glirio celc eich porwr.",
 'welcomecreation'            => "==Croeso, $1!==
 Mae eich cyfrif wedi'i greu. 
 Cofiwch osod y [[Special:Preferences|dewisiadau]] sydd fwyaf hwylus i chi ar {{SITENAME}}.",
@@ -486,7 +481,6 @@ Cofiwch osod y [[Special:Preferences|dewisiadau]] sydd fwyaf hwylus i chi ar {{S
 'remembermypassword'         => "Y cyfrifiadur hwn i gofio'r cyfrinair",
 'yourdomainname'             => 'Eich parth',
 'externaldberror'            => "Naill ai: cafwyd gwall dilysu allanol ar databas neu: ar y llaw arall efallai nad oes hawl gennych chi i ddiwygio'ch cyfrif allanol.",
-'loginproblem'               => '<b>Ni lwyddodd y mewngofnodi.</b><br />Ceisiwch eto!',
 'login'                      => 'Mewngofnodi',
 'nav-login-createaccount'    => 'Mewngofnodi',
 'loginprompt'                => "Mae'n rhaid galluogi cwcis er mwyn mewngofnodi i {{SITENAME}}.",
@@ -511,8 +505,8 @@ Cofiwch osod y [[Special:Preferences|dewisiadau]] sydd fwyaf hwylus i chi ar {{S
 'yourvariant'                => 'Amrywiad',
 'yournick'                   => 'Eich llysenw (fel llofnod):',
 'badsig'                     => 'Llofnod crai annilys; gwiriwch y tagiau HTML.',
-'badsiglength'               => "Mae'r llysenw'n rhy hir. 
-Rhaid iddo fod yn llai na $1 {{PLURAL:$1|llythyren|lythyren|lythyren|lythyren|llythyren|llythyren}} o hyd.",
+'badsiglength'               => "Mae'ch llysenw'n rhy hir. 
+Rhaid iddo fod yn llai na(g) $1 {{PLURAL:$1|llythyren|lythyren|lythyren|llythyren|llythyren|llythyren}} o hyd.",
 'email'                      => 'E-bost',
 'prefs-help-realname'        => '* Enw iawn (dewisol): Os ydych yn dewis ei roi, fe fydd yn cael ei ddefnyddio er mwyn rhoi cydnabyddiaeth i chi am eich gwaith.',
 'loginerror'                 => 'Problem mewngofnodi',
@@ -525,7 +519,8 @@ Gallwch hefyd adael i eraill anfon e-bost atoch trwy'r cyswllt ar eich tudalen d
 'loginsuccesstitle'          => 'Llwyddodd y mewngofnodi',
 'loginsuccess'               => "'''Yr ydych wedi mewngofnodi i {{SITENAME}} wrth yr enw \"\$1\".'''",
 'nosuchuser'                 => "Does yna'r un defnyddiwr â'r enw \"\$1\".
-Sicrhewch eich bod chi wedi'i sillafu'n gywir, neu [[Special:UserLogin/signup|crëwch gyfrif newydd]].",
+Mae'r rhaglen yn gwahaniaethu rhwng llythrennau bach a mawr.
+Sicrhewch eich bod chi wedi sillafu'r enw'n gywir, neu [[Special:UserLogin/signup|crëwch gyfrif newydd]].",
 'nosuchusershort'            => 'Does dim defnyddiwr o\'r enw "<nowiki>$1</nowiki>". Gwiriwch eich sillafu.',
 'nouserspecified'            => "Mae'n rhaid nodi enw defnyddiwr.",
 'wrongpassword'              => "Nid yw'r cyfrinair a deipiwyd yn gywir. Rhowch gynnig arall arni, os gwelwch yn dda.",
@@ -539,15 +534,17 @@ Mae cyfrinair dros dro, sef "$3", wedi ei greu ar gyfer y defnyddiwr "$2". Os ma
 Os mai rhywun arall a holodd am y cyfrinair, ynteu eich bod wedi cofio\'r hen gyfrinair, ac nac ydych am newid y cyfrinair, rhydd i chi anwybyddu\'r neges hon a pharhau i ddefnyddio\'r cyfrinair gwreiddiol.',
 'noemail'                    => "Does dim cyfeiriad e-bost yng nghofnodion y defnyddiwr '$1'.",
 'passwordsent'               => 'Mae cyfrinair newydd wedi\'i ddanfon at gyfeiriad e-bost cofrestredig "$1". Mewngofnodwch eto ar ôl i chi dderbyn y cyfrinair, os gwelwch yn dda.',
+'blocked-mailpassword'       => 'Gan fod eich cyfeiriad IP wedi ei atal rhag golygu, ni ellir adfer y cyfrinair.',
 'eauthentsent'               => 'Anfonwyd e-bost o gadarnhâd at y cyfeiriad a benwyd.
 Cyn y gellir anfon unrhywbeth arall at y cyfeiriad hwnnw rhaid i chi ddilyn y cyfarwyddiadau yn yr e-bost hwnnw er mwyn cadarnhau bod y cyfeiriad yn un dilys.',
 'throttled-mailpassword'     => "Anfonwyd e-bost atoch i'ch atgoffa o'ch cyfrinair eisoes, yn ystod y $1 {{PLURAL:$1|awr|awr|awr|awr|awr|awr}} diwethaf.
 Er mwyn rhwystro camddefnydd, dim ond un e-bost i'ch atgoffa o'ch cyfrinair gaiff ei anfon bob yn $1 {{PLURAL:$1|awr|awr|awr|awr|awr|awr}}.",
 'mailerror'                  => 'Gwall wrth ddanfon e-bost: $1',
-'acct_creation_throttle_hit' => 'Rydych chi wedi creu $1 cyfrif yn barod. Ni chewch greu rhagor.',
-'emailauthenticated'         => 'Cadarnhawyd eich cyfeiriad e-bost ar $1.',
+'acct_creation_throttle_hit' => "Mae ymwelwyr sy'n defnyddio'ch cyfeiriad IP wedi creu $1 {{PLURAL:$1|cyfrif|cyfrif|gyfrif|chyfrif|chyfrif|cyfrif}} yn ystod y diwrnod diwethaf, sef y mwyafswm a ganiateir mewn diwrnod.
+Felly ni chaiff defnyddwyr sy'n defnyddio'r cyfeiriad IP hwn greu rhagor o gyfrifon ar hyn o bryd.",
+'emailauthenticated'         => 'Cadarnhawyd eich cyfeiriad e-bost am $3 ar $2.',
 'emailnotauthenticated'      => "Nid yw eich cyfeiriad e-bost wedi'i ddilysu eto. Ni fydd unrhyw negeseuon e-bost yn cael eu hanfon atoch ar gyfer y nodweddion canlynol.",
-'noemailprefs'               => "<strong>Mae'n rhaid i chi gynnig cyfeiriad e-bost er mwyn i'r nodweddion hyn weithio.</strong>",
+'noemailprefs'               => "Mae'n rhaid i chi gynnig cyfeiriad e-bost er mwyn i'r nodweddion hyn weithio.",
 'emailconfirmlink'           => 'Cadarnhewch eich cyfeiriad e-bost',
 'invalidemailaddress'        => 'Ni allwn dderbyn y cyfeiriad e-bost gan fod ganddo fformat annilys. Mewnbynnwch cyfeiriad dilys neu gwagiwch y maes hwnnw, os gwelwch yn dda.',
 'accountcreated'             => 'Crëwyd y cyfrif',
@@ -556,19 +553,28 @@ Er mwyn rhwystro camddefnydd, dim ond un e-bost i'ch atgoffa o'ch cyfrinair gaif
 'createaccount-text'         => 'Creodd rhywun gyfrif o\'r enw $2 ar {{SITENAME}} ($4) ar gyfer y cyfeiriad e-bost hwn. "$3" yw\'r cyfrinair ar gyfer "$2". Dylech fewngofnodi a newid eich cyfrinair yn syth.
 
 Rhydd ichi anwybyddu\'r neges hon os mai camgymeriad oedd creu\'r cyfrif.',
+'login-throttled'            => 'Rydych wedi ceisio defnyddio cyfrinair y cyfrif hwn gormod o weithiau ar unwaith.
+Oedwch ychydig cyn mentro eto.',
 'loginlanguagelabel'         => 'Iaith: $1',
 
 # Password reset dialog
-'resetpass'               => 'Ailosod cyfrinair y cyfrif',
-'resetpass_announce'      => "Fe wnaethoch fewngofnodi gyda chôd dros dro oddi ar e-bost.
+'resetpass'                 => 'Newid cyfrinair y cyfrif',
+'resetpass_announce'        => "Fe wnaethoch fewngofnodi gyda chôd dros dro oddi ar e-bost.
 Er mwyn cwblhau'r mewngofnodi, rhaid i chi osod cyfrinair newydd fel hyn:",
-'resetpass_header'        => 'Newid cyfrinair y cyfrif',
-'resetpass_submit'        => 'Gosod y cyfrinair a mewngofnodi',
-'resetpass_success'       => "Llwyddodd y newid i'ch cyfrinair! Wrthi'n mewngofnodi...",
-'resetpass_bad_temporary' => 'Cyfrinair dros dro annilys.
+'resetpass_header'          => 'Newid cyfrinair y cyfrif',
+'oldpassword'               => 'Hen gyfrinair:',
+'newpassword'               => 'Cyfrinair newydd:',
+'retypenew'                 => 'Ail-deipiwch y cyfrinair newydd:',
+'resetpass_submit'          => 'Gosod y cyfrinair a mewngofnodi',
+'resetpass_success'         => "Llwyddodd y newid i'ch cyfrinair! Wrthi'n mewngofnodi...",
+'resetpass_bad_temporary'   => 'Cyfrinair dros dro annilys.
 Efallai eich bod eisoes wedi llwyddo newid eich cyfrinair neu eich bod wedi gwneud cais am gyfrinair dros dro newydd.',
-'resetpass_forbidden'     => 'Ni ellir newid cyfrineiriau',
-'resetpass_missing'       => 'Dim data ar y ffurflen.',
+'resetpass_forbidden'       => 'Ni ellir newid cyfrineiriau',
+'resetpass-no-info'         => 'Ni allwch fynd at y dudalen hon yn uniongyrchol heblaw eich bod wedi mewngofnodi.',
+'resetpass-submit-loggedin' => 'Newidier y cyfrinair',
+'resetpass-wrong-oldpass'   => "Mae'r cyfrinair dros dro neu gyfredol yn annilys.
+Gall fod eich bod wedi llwyddo newid eich cyfrinair eisoes neu eich bod wedi gofyn am gyfrinair dros dro newydd.",
+'resetpass-temp-password'   => 'Cyfrinair dros dro:',
 
 # Edit page toolbar
 'bold_sample'     => 'Testun cryf',
@@ -587,14 +593,14 @@ Efallai eich bod eisoes wedi llwyddo newid eich cyfrinair neu eich bod wedi gwne
 'nowiki_tip'      => "Anwybyddu'r gystrawen wici",
 'image_sample'    => 'Enghraifft.jpg',
 'image_tip'       => 'Ffeil mewnosodol',
-'media_sample'    => 'Example.mp3',
+'media_sample'    => 'Example.ogg',
 'media_tip'       => 'Cyswllt ffeil media',
 'sig_tip'         => 'Eich llofnod gyda stamp amser',
 'hr_tip'          => "Llinell lorweddol (peidiwch â'i gor-ddefnyddio)",
 
 # Edit pages
-'summary'                          => 'Crynodeb',
-'subject'                          => 'Pwnc/pennawd',
+'summary'                          => 'Crynodeb:',
+'subject'                          => 'Pwnc/pennawd:',
 'minoredit'                        => 'Golygiad bychan yw hwn',
 'watchthis'                        => 'Gwylier y dudalen hon',
 'savearticle'                      => "Cadw'r dudalen",
@@ -607,8 +613,8 @@ Efallai eich bod eisoes wedi llwyddo newid eich cyfrinair neu eich bod wedi gwne
 Os y pwyswch eto ar 'Cadw'r dudalen' caiff y golygiad ei gadw heb nodyn.",
 'missingcommenttext'               => 'Rhowch eich sylwadau isod.',
 'missingcommentheader'             => "'''Nodyn:''' Nid ydych wedi cynnig unrhywbeth yn y blwch 'Pwnc/Pennawd:'. Os y cliciwch 'Cadw'r dudalen' eto fe gedwir y golygiad heb bennawd.",
-'summary-preview'                  => "Rhagolwg o'r crynodeb",
-'subject-preview'                  => 'Rhagolwg pwnc/pennawd',
+'summary-preview'                  => "Rhagolwg o'r crynodeb:",
+'subject-preview'                  => 'Rhagolwg pwnc/pennawd:',
 'blockedtitle'                     => "Mae'r defnyddiwr hwn wedi cael ei flocio",
 'blockedtext'                      => "<big>'''Mae eich enw defnyddiwr neu gyfeiriad IP wedi cael ei flocio.'''</big>
 
@@ -657,32 +663,35 @@ Gosodwch eich cyfeiriad e-bost drwy eich [[Special:Preferences|dewisiadau defnyd
 I greu'r dudalen, dechreuwch deipio yn y blwch isod (gweler y [[{{MediaWiki:Helppage}}|dudalen gymorth]] am fwy o wybodaeth).
 Os daethoch yma ar ddamwain, cliciwch botwm '''n&ocirc;l''' y porwr.",
 'anontalkpagetext'                 => "---- ''Dyma dudalen sgwrs defnyddiwr sydd heb greu cyfrif, neu nad yw'n defnyddio'i gyfrif. Mae'n rhaid i ni ddefnyddio'r cyfeiriad IP i'w (h)adnabod. Mae'n bosib fod sawl defnyddiwr yn rhannu'r un cyfeiriad IP. Os ydych chi'n ddefnyddiwr anhysbys ac yn teimlo'ch bod wedi derbyn sylwadau amherthnasol, [[Special:UserLogin/signup|crëwch gyfrif]] neu [[Special:UserLogin|mewngofnodwch]] i osgoi dryswch gyda defnyddwyr anhysbys o hyn ymlaen.''",
-'noarticletext'                    => "Mae'r dudalen hon yn wag. Gallwch [[Special:Search/{{PAGENAME}}|chwilio am y teitl hwn]] ar dudalennau eraill neu [{{fullurl:{{FULLPAGENAME}}|action=edit}} golygu'r dudalen].",
+'noarticletext'                    => "Mae'r dudalen hon yn wag ar hyn o bryd. 
+Gallwch [[Special:Search/{{PAGENAME}}|chwilio am y teitl hwn]] ar dudalennau eraill, <span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} chwilio drwy'r logiau perthnasol], neu [{{fullurl:{{FULLPAGENAME}}|action=edit}} golygu'r dudalen]</span>.",
 'userpage-userdoesnotexist'        => 'Nid oes defnyddiwr a\'r enw "$1" yn bod. Gwnewch yn siwr eich bod am greu/golygu\'r dudalen hon.',
 'clearyourcache'                   => "'''Sylwer - Wedi i chi roi'r dudalen ar gadw, efallai y bydd angen mynd heibio celc eich porwr er mwyn gweld y newidiadau.''' 
 '''Mozilla / Firefox / Safari:''' pwyswch ar ''Shift'' tra'n clicio ''Ail-lwytho/Reload'', neu gwasgwch ''Ctrl-F5'' neu ''Ctrl-R'' (''Command-R'' ar Macintosh); '''Konqueror:''' cliciwch y botwm ''Ail-lwytho/Reload'', neu gwasgwch ''F5''; '''Opera:''' gwacewch y celc yn llwyr trwy ''Offer → Dewisiadau / Tools→Preferences''; '''Internet Explorer:''' pwyswch ar ''Ctrl'' tra'n clicio ''Adnewyddu/Refresh'', neu gwasgwch ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Defnyddiwch y botwm 'Dangos rhagolwg' er mwyn profi eich CSS/JS newydd cyn ei gadw.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Defnyddiwch y botwm 'Dangos rhagolwg' er mwyn profi eich CSS/JS newydd cyn ei gadw.",
 'usercsspreview'                   => "'''Cofiwch - dim ond rhagolwg o'ch CSS defnyddiwr yw hwn.'''
 '''Nid yw wedi'i gadw eto!'''",
 'userjspreview'                    => "'''Cofiwch -- dim ond rhagolwg o'ch JavaScript yw hwn; nid yw wedi'i gadw eto!'''",
+'userinvalidcssjstitle'            => "'''Rhybudd:''' Nid oes gwedd o'r enw \"\$1\".
+Cofiwch bod y tudalennau .css a .js yn defnyddio llythrennau bach, e.e. {{ns:user}}:Foo/monobook.css yn hytrach na {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Diweddariad)',
-'note'                             => '<strong>Dalier sylw:</strong>',
-'previewnote'                      => "<strong>Cofiwch taw rhagolwg yw hwn; nid yw'r dudalen wedi ei chadw eto.</strong>",
+'note'                             => "'''Dalier sylw:'''",
+'previewnote'                      => "'''Cofiwch taw rhagolwg yw hwn; nid yw'r dudalen wedi ei chadw eto.'''",
 'previewconflict'                  => "Mae'r rhagolwg hwn yn dangos y testun yn yr ardal golygu uchaf, fel ag y byddai'n ymddangos petaech yn rhoi'r dudalen ar gadw.",
-'session_fail_preview'             => "<strong>Ymddiheurwn! Methwyd prosesu eich golygiad gan fod rhan o ddata'r sesiwn wedi'i golli. Ceisiwch eto. 
-Os digwydd yr un peth eto, ceisiwch [[Special:UserLogout|allgofnodi]] ac yna mewngofnodi eto.</strong>",
-'session_fail_preview_html'        => "<strong>Ymddiheurwn! Methwyd prosesu eich golygiad gan fod rhan o ddata'r sesiwn wedi'i golli.</strong>
+'session_fail_preview'             => "'''Ymddiheurwn! Methwyd prosesu eich golygiad gan fod rhan o ddata'r sesiwn wedi'i golli. Ceisiwch eto. 
+Os digwydd yr un peth eto, ceisiwch [[Special:UserLogout|allgofnodi]] ac yna mewngofnodi eto.'''",
+'session_fail_preview_html'        => "'''Ymddiheurwn! Methwyd prosesu eich golygiad gan fod rhan o ddata'r sesiwn wedi'i golli.'''
 
 ''Oherwydd bod HTML amrwd ar waith ar {{SITENAME}}, cuddir y rhagolwg er mwyn gochel rhag ymosodiad JavaScript.''
 
-<strong>Os ydych am wneud golygiad dilys, ceisiwch eto. 
-Os methwch unwaith eto, ceisiwch [[Special:UserLogout|allgofnodi]] ac yna mewngofnodi unwaith eto.</strong>",
-'token_suffix_mismatch'            => "<strong>Gwrthodwyd eich golygiad oherwydd bod eich gweinydd cleient wedi gwneud cawl o'r atalnodau yn y tocyn golygu.
+'''Os ydych am wneud golygiad dilys, ceisiwch eto. 
+Os methwch unwaith eto, ceisiwch [[Special:UserLogout|allgofnodi]] ac yna mewngofnodi unwaith eto.'''",
+'token_suffix_mismatch'            => "'''Gwrthodwyd eich golygiad oherwydd bod eich gweinydd cleient wedi gwneud cawl o'r atalnodau yn y tocyn golygu.
 Gwrthodwyd y golygiad rhag i destun y dudalen gael ei lygru. 
-Weithiau fe ddigwydd hyn wrth ddefnyddio dirprwy-wasanaeth anhysbys gwallus yn seiliedig ar y we.</strong>",
+Weithiau fe ddigwydd hyn wrth ddefnyddio dirprwy-wasanaeth anhysbys gwallus yn seiliedig ar y we.'''",
 'editing'                          => 'Yn golygu $1',
 'editingsection'                   => 'Yn golygu $1 (adran)',
-'editingcomment'                   => 'Yn golygu $1 (esboniad)',
+'editingcomment'                   => 'Yn golygu $1 (adran newydd)',
 'editconflict'                     => 'Cyd-ddigwyddiad golygu: $1',
 'explainconflict'                  => "Mae rhywun arall wedi newid y dudalen hon ers i chi ddechrau ei golygu hi.
 Mae'r ardal testun uchaf yn cynnwys testun y dudalen fel y mae hi rwan.
@@ -691,26 +700,28 @@ Bydd yn rhaid i chi gyfuno eich newidiadau chi a'r testun sydd yn bodoli eisioes
 '''Dim ond''' y testun yn yr ardal testun <b>uchaf</b> fydd yn cael ei roi ar gadw pan wasgwch y botwm \"Cadw'r dudalen\".",
 'yourtext'                         => 'Eich testun',
 'storedversion'                    => "Fersiwn o'r storfa",
-'nonunicodebrowser'                => '<strong>RHYBUDD: Nid yw eich porwr yn cydymffurfio ag Unicode. Serch hyn, mae modd i chi olygu tudalennau: bydd nodau sydd ddim yn rhan o ASCII yn ymddangos yn y blwch golygu fel codau hecsadegol.</strong>',
-'editingold'                       => "<strong>RHYBUDD: Rydych chi'n golygu hen ddiwygiad o'r dudalen hon. Os caiff ei chadw, bydd unrhyw newidiadau diweddarach yn cael eu colli.</strong>",
+'nonunicodebrowser'                => "'''RHYBUDD: Nid yw eich porwr yn cydymffurfio ag Unicode. Serch hyn, mae modd i chi olygu tudalennau: bydd nodau sydd ddim yn rhan o ASCII yn ymddangos yn y blwch golygu fel codau hecsadegol.'''",
+'editingold'                       => "'''RHYBUDD: Rydych chi'n golygu hen ddiwygiad o'r dudalen hon. Os caiff ei chadw, bydd unrhyw newidiadau diweddarach yn cael eu colli.'''",
 'yourdiff'                         => 'Gwahaniaethau',
 'copyrightwarning'                 => "Mae pob cyfraniad i {{SITENAME}} yn cael ei ryddhau o dan termau'r Drwydded Ddogfen Rhydd ($2) (gwelwch $1 am fanylion). Os nad ydych chi'n fodlon i'ch gwaith gael ei olygu heb drugaredd, neu i gopïau ymddangos ar draws y we, peidiwch a'i gyfrannu yma.<br />
 Rydych chi'n cadarnhau mai chi yw awdur y cyfraniad, neu eich bod chi wedi'i gopïo o'r parth cyhoeddus (''public domain'') neu rywle rhydd tebyg. '''Nid''' yw'r mwyafrif o wefannau yn y parth cyhoeddus.
 
-<strong>PEIDIWCH Â CHYFRANNU GWAITH O DAN HAWLFRAINT HEB GANIATÂD!</strong>",
+'''PEIDIWCH Â CHYFRANNU GWAITH O DAN HAWLFRAINT HEB GANIATÂD!'''",
 'copyrightwarning2'                => "Sylwch fod pob cyfraniad i {{SITENAME}} yn cael ei ryddhau o dan termau'r Drwydded Ddogfen Rhydd (gwelwch $1 am fanylion).
 Os nad ydych chi'n fodlon i'ch gwaith gael ei olygu heb drugaredd, neu i gopïau ymddangos ar draws y we, peidiwch a'i gyfrannu yma.<br />
 Rydych chi'n cadarnhau mai chi yw awdur y cyfraniad, neu eich bod chi wedi'i gopïo o'r parth cyhoeddus (''public domain'') neu rywle rhydd tebyg.<br />
-<strong>PEIDIWCH Â CHYFRANNU GWAITH O DAN HAWLFRAINT HEB GANIATÂD!</strong>",
-'longpagewarning'                  => "<strong>RHYBUDD: Mae'r dudalen hon yn $1 cilobeit o hyd; mae rhai porwyr yn cael trafferth wrth lwytho tudalennau sy'n hirach na 32 kb.
-Byddai'n dda o beth llunio sawl tudalen llai o hyd o ddeunydd y dudalen hon.</strong>",
-'longpageerror'                    => "<strong>GWALL: Mae'r testun yr ydych wedi ei osod yma yn $1 cilobeit o hyd, ac yn hwy na'r hyd eithaf o $2 cilobeit.
-Ni ellir ei roi ar gadw.</strong>",
-'readonlywarning'                  => "<strong>RHYBUDD: Mae'r databas wedi'i gloi am gyfnod er mwyn cynnal a chadw, felly fyddwch chi ddim yn gallu cadw'ch golygiadau ar hyn o bryd. Rydyn ni'n argymell eich bod chi'n copïo a gludo'r testun i ffeil a'i gadw ar eich disg tan bod y sustem yn weithredol eto.</strong>",
-'protectedpagewarning'             => "<strong>RHYBUDD: Mae'r dudalen hon wedi'i diogelu. Dim ond gweinyddwyr sydd yn gallu ei golygu.</strong>",
+'''PEIDIWCH Â CHYFRANNU GWAITH O DAN HAWLFRAINT HEB GANIATÂD!'''",
+'longpagewarning'                  => "'''RHYBUDD: Mae'r dudalen hon yn $1 cilobeit o hyd; mae rhai porwyr yn cael trafferth wrth lwytho tudalennau sy'n hirach na 32 kb.
+Byddai'n dda o beth llunio sawl tudalen llai o hyd o ddeunydd y dudalen hon.'''",
+'longpageerror'                    => "'''GWALL: Mae'r testun yr ydych wedi ei osod yma yn $1 cilobeit o hyd, ac yn hwy na'r hyd eithaf o $2 cilobeit.
+Ni ellir ei roi ar gadw.'''",
+'readonlywarning'                  => "'''RHYBUDD: Mae'r databas wedi'i gloi am gyfnod er mwyn cynnal a chadw, felly fyddwch chi ddim yn gallu cadw'ch golygiadau ar hyn o bryd. Rydyn ni'n argymell eich bod chi'n copïo a gludo'r testun i ffeil a'i gadw ar eich disg tan bod y sustem yn weithredol eto.'''
+
+Cynigiodd y gweinyddwr a glodd y databas y rheswm hwn dros ei gloi: $1",
+'protectedpagewarning'             => "'''RHYBUDD: Mae'r dudalen hon wedi'i diogelu. Dim ond gweinyddwyr sydd yn gallu ei golygu.'''",
 'semiprotectedpagewarning'         => "'''Sylwer:''' Mae'r dudalen hon wedi ei chloi; dim ond defnyddwyr cofrestredig a allant ei golygu.",
 'cascadeprotectedwarning'          => "'''Dalier sylw:''' Mae'r dudalen hon wedi ei diogelu fel nad ond defnyddwyr â galluoedd gweinyddwyr sy'n gallu ei newid, oherwydd ei bod yn rhan o'r {{PLURAL:$1|dudalen ganlynol|dudalen ganlynol|tudalennau canlynol|tudalennau canlynol|tudalennau canlynol|tudalennau canlynol}} sydd wedi {{PLURAL:$1|ei|ei|eu|eu|eu|eu}} sgydol-ddiogelu.",
-'titleprotectedwarning'            => "<strong>RHYBUDD:  Mae'r dudalen hon wedi ei chloi; dim ond rhai defnyddwyr a allant ei chreu.</strong>",
+'titleprotectedwarning'            => "'''RHYBUDD:  Mae'r dudalen hon wedi ei chloi; dim ond rhai defnyddwyr sydd â'r [[Special:ListGroupRights|gallu]] i'w chreu.'''",
 'templatesused'                    => 'Nodiadau a ddefnyddir yn y dudalen hon:',
 'templatesusedpreview'             => 'Nodiadau a ddefnyddir yn y rhagolwg hwn:',
 'templatesusedsection'             => 'Nodiadau a ddefnyddir yn yr adran hon:',
@@ -727,6 +738,15 @@ Ni ellir ei roi ar gadw.</strong>",
 
 Ystyriwch a fyddai'n dda o beth i barhau i olygu'r dudalen hon.
 Dyma lòg dileu'r dudalen, er gwybodaeth:",
+'deleted-notice'                   => "Dilëwyd y dudalen hon.
+Dangosir lòg dileu'r dudalen isod.",
+'deletelog-fulllog'                => 'Gweld y lòg cyfan',
+'edit-gone-missing'                => "Ni ellid diweddaru'r dudalen.
+Ymddengys iddi gael ei dileu.",
+'edit-conflict'                    => 'Cyd-ddigwyddiad golyu.',
+'edit-no-change'                   => 'Anwybyddwyd eich golygiad, gan na newidiwyd y testun.',
+'edit-already-exists'              => 'Ni ellid creu tudalen newydd.
+Mae ar gael yn barod.',
 
 # Parser/template warnings
 'post-expand-template-inclusion-category' => "Tudalennau a phatrymlun ynddynt sy'n fwy na chyfyngiad y meddalwedd",
@@ -744,29 +764,29 @@ Dyma lòg dileu'r dudalen, er gwybodaeth:",
 Y rheswm a roddwyd dros y bloc gan $3 yw ''$2''.",
 
 # History pages
-'viewpagelogs'        => "Dangos logiau'r dudalen hon",
-'nohistory'           => "Does dim hanes golygu i'r dudalen hon.",
-'revnotfound'         => "Ni ddaethpwyd o hyd i'r diwygiad",
-'revnotfoundtext'     => "Ni ddaethpwyd o hyd i'r hen ddiwygiad o'r dudalen y gofynnwyd amdano. Gwnewch yn siwr fod yr URL yn gywir os gwelwch yn dda.",
-'currentrev'          => 'Diwygiad cyfoes',
-'revisionasof'        => 'Diwygiad $1',
-'revision-info'       => 'Y fersiwn a roddwyd ar gadw am $1 gan $2',
-'previousrevision'    => '� at y diwygiad blaenorol',
-'nextrevision'        => 'At y diwygiad dilynol →',
-'currentrevisionlink' => 'Y diwygiad cyfoes',
-'cur'                 => 'cyf',
-'next'                => 'nesaf',
-'last'                => 'cynt',
-'page_first'          => 'cyntaf',
-'page_last'           => 'olaf',
-'histlegend'          => "Cymharu dau fersiwn: marciwch y cylchoedd ar y ddau fersiwn i'w cymharu, yna pwyswch ar 'return' neu'r botwm 'Cymharer y fersiynau dewisedig'.<br />
+'viewpagelogs'           => "Dangos logiau'r dudalen hon",
+'nohistory'              => "Does dim hanes golygu i'r dudalen hon.",
+'currentrev'             => 'Diwygiad cyfoes',
+'currentrev-asof'        => 'Y diwygiad cyfredol, am $1',
+'revisionasof'           => 'Diwygiad $1',
+'revision-info'          => 'Y fersiwn a roddwyd ar gadw am $1 gan $2', # Additionally available: $3: revision id
+'previousrevision'       => '� at y diwygiad blaenorol',
+'nextrevision'           => 'At y diwygiad dilynol →',
+'currentrevisionlink'    => 'Y diwygiad cyfoes',
+'cur'                    => 'cyf',
+'next'                   => 'nesaf',
+'last'                   => 'cynt',
+'page_first'             => 'cyntaf',
+'page_last'              => 'olaf',
+'histlegend'             => "Cymharu dau fersiwn: marciwch y cylchoedd ar y ddau fersiwn i'w cymharu, yna pwyswch ar 'return' neu'r botwm 'Cymharer y fersiynau dewisedig'.<br />
 Eglurhad: (cyf.) = gwahaniaethau rhyngddo a'r fersiwn cyfredol,
 (cynt) = gwahaniaethau rhyngddo a'r fersiwn cynt, B = golygiad bychan",
-'deletedrev'          => '[dilëwyd]',
-'histfirst'           => 'Cynharaf',
-'histlast'            => 'Diweddaraf',
-'historysize'         => '({{PLURAL:$1|$1 beit|$1 beit|$1 feit|$1 beit|$1 beit|$1 beit}})',
-'historyempty'        => '(gwag)',
+'history-fieldset-title' => "Chwilio drwy'r hanes",
+'deletedrev'             => '[dilëwyd]',
+'histfirst'              => 'Cynharaf',
+'histlast'               => 'Diweddaraf',
+'historysize'            => '({{PLURAL:$1|$1 beit|$1 beit|$1 feit|$1 beit|$1 beit|$1 beit}})',
+'historyempty'           => '(gwag)',
 
 # Revision feed
 'history-feed-title'          => 'Hanes diwygio',
@@ -835,6 +855,7 @@ Pan yn gwneud hyn dylid sicrhau nad yw dilyniant hanes tudalennau yn cael ei ddi
 'mergehistory-merge'               => "Gellir cyfuno'r diwygiadau canlynol o [[:$1]] i'r dudalen [[:$2]]. Defnyddiwch y botymau radio i gyfuno dim ond y diwygiadau a grewyd hyd at yr amser penodedig. Sylwch y bydd y golofn botwm radio yn cael ei hail-osod pan ddefnyddir y cysylltau llywio.",
 'mergehistory-go'                  => 'Dangos y golygiadau y gellir eu cyfuno',
 'mergehistory-submit'              => 'Cyfuner y diwygiadau',
+'mergehistory-empty'               => 'Ni ellir cyfuno unrhyw ddiwygiadau.',
 'mergehistory-success'             => "Cyfunwyd $3 {{PLURAL:$3|diwygiad|diwygiad|ddiwygiad|diwygiad|diwygiad|diwygiad}} o [[:$1]] yn llwyddiannus i'r dudalen [[:$2]].",
 'mergehistory-fail'                => "Methodd y cyfuno hanes; a wnewch wirio paramedrau'r dudalen a'r amser unwaith eto.",
 'mergehistory-no-source'           => "Nid yw'r dudalen gwreiddiol $1 yn bod.",
@@ -843,6 +864,7 @@ Pan yn gwneud hyn dylid sicrhau nad yw dilyniant hanes tudalennau yn cael ei ddi
 'mergehistory-invalid-destination' => 'Rhaid bod teitl dilys gan y dudalen cyrchfan.',
 'mergehistory-autocomment'         => 'Cyfunwyd [[:$1]] tu mewn i [[:$2]]',
 'mergehistory-comment'             => 'Cyfunwyd [[:$1]] tu mewn i [[:$2]]: $3',
+'mergehistory-same-destination'    => "Ni all y tudalen gwreiddiol a'r cyrchfan fod yr un enw",
 
 # Merge log
 'mergelog'           => 'Lòg cyfuno',
@@ -855,121 +877,190 @@ Pan yn gwneud hyn dylid sicrhau nad yw dilyniant hanes tudalennau yn cael ei ddi
 'difference'              => '(Gwahaniaethau rhwng diwygiadau)',
 'lineno'                  => 'Llinell $1:',
 'compareselectedversions' => 'Cymharer y fersiynau dewisedig',
+'visualcomparison'        => "Cymharu â'r llygad",
+'wikicodecomparison'      => "Cymharu'r testun wici",
 'editundo'                => 'dadwneud',
 'diff-multi'              => '(Ni ddangosir {{PLURAL:$1|yr $1 diwygiad|yr $1 diwygiad|y $1 ddiwygiad|y $1 diwygiad|y $1 diwygiad|y $1 diwygiad}} rhyngol.)',
+'diff-movedto'            => 'wedi symud i $1',
+'diff-added'              => 'wedi ychwanegu $1',
+'diff-changedto'          => 'newidiwyd i $1',
+'diff-movedoutof'         => "wedi'i symud oddi ar $1",
+'diff-removed'            => 'tynnwyd $1',
+'diff-changedfrom'        => 'wedi newid o $1',
+'diff-src'                => 'gwreiddiol',
+'diff-width'              => 'lled',
+'diff-height'             => 'uchder',
+'diff-p'                  => "'''paragraff'''",
+'diff-blockquote'         => "'''dyfyniad'''",
+'diff-h1'                 => "'''pennawd (lefel 1)'''",
+'diff-h2'                 => "'''pennawd (lefel 2)'''",
+'diff-h3'                 => "'''pennawd (lefel 3)'''",
+'diff-h4'                 => "'''pennawd (lefel 4)'''",
+'diff-h5'                 => "'''pennawd (lefel 5)'''",
+'diff-div'                => "'''rhaniad'''",
+'diff-ul'                 => "'''rhestr heb ei drefnu'''",
+'diff-ol'                 => "'''rhestr trefnedig'''",
+'diff-table'              => "'''tabl'''",
+'diff-tbody'              => "'''cynnwys tabl'''",
+'diff-tr'                 => "'''rhes'''",
+'diff-td'                 => "'''cell'''",
+'diff-th'                 => "'''pennawd'''",
+'diff-br'                 => "'''toriad'''",
+'diff-dl'                 => "'''rhestr diffiniadau'''",
+'diff-dd'                 => "'''diffiniad'''",
+'diff-input'              => "'''mewnbwn'''",
+'diff-form'               => "'''ffurflen'''",
+'diff-img'                => "'''delwedd'''",
+'diff-a'                  => "'''cyswllt'''",
+'diff-i'                  => "'''italig'''",
+'diff-b'                  => "'''print trwm'''",
+'diff-strong'             => "'''cryf'''",
+'diff-em'                 => "'''pwyslais'''",
+'diff-font'               => "'''ffont'''",
+'diff-big'                => "'''mawr'''",
+'diff-del'                => "'''wedi ei ddileu'''",
+'diff-tt'                 => "'''lled penodol'''",
+'diff-sub'                => "'''isysgrif'''",
+'diff-sup'                => "'''uwchysgrif'''",
 
 # Search results
-'searchresults'             => "Canlyniadau'r chwiliad",
-'searchresulttext'          => 'Am fwy o wybodaeth am chwilio {{SITENAME}}, gwelwch [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Chwiliwyd am \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|pob tudalen yn dechrau gyda "$1"]] | [[Special:WhatLinksHere/$1|pob tudalen sy\'n cysylltu â "$1"]])',
-'searchsubtitleinvalid'     => "Chwiliwyd am '''$1'''",
-'noexactmatch'              => "'''Nid oes tudalen a'r enw '$1' yn bod.''' Gallwch [[:$1|greu'r dudalen]].",
-'noexactmatch-nocreate'     => "'''Does dim tudalen a'r enw '$1' yn bod.'''",
-'toomanymatches'            => "Cafwyd hyd i ormod o enghreifftiau o'r term chwilio; ceisiwch chwilio am derm arall",
-'titlematches'              => 'Teitlau erthygl yn cyfateb',
-'notitlematches'            => 'Does dim teitl yn cyfateb',
-'textmatches'               => 'Testun erthygl yn cyfateb',
-'notextmatches'             => 'Does dim testun yn cyfateb',
-'prevn'                     => 'y $1 cynt',
-'nextn'                     => 'y $1 nesaf',
-'viewprevnext'              => 'Dangos ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|dim geiriau|$2 gair|$2 air|$2 gair|$2 gair|$2 gair|}})',
-'search-result-score'       => 'Perthnasedd: $1%',
-'search-redirect'           => '(ailgyfeiriad $1)',
-'search-section'            => '(adran $1)',
-'search-suggest'            => 'Ai am hyn y chwiliwch: $1',
-'search-interwiki-caption'  => 'Chwaer-brosiectau',
-'search-interwiki-default'  => 'Y canlyniadau o $1:',
-'search-interwiki-more'     => '(rhagor)',
-'search-mwsuggest-enabled'  => 'gydag awgrymiadau',
-'search-mwsuggest-disabled' => 'dim awgrymiadau',
-'search-relatedarticle'     => 'Cysylltiedig',
-'mwsuggest-disable'         => 'Analluogi awgrymiadau AJAX',
-'searchrelated'             => 'cysylltiedig',
-'searchall'                 => 'oll',
-'showingresults'            => "Yn dangos $1 {{PLURAL:$1|canlyniad|canlyniad|ganlyniad|chanlyniad|chanlyniad|canlyniad}} isod gan ddechrau gyda rhif '''$2'''.",
-'showingresultsnum'         => "Yn dangos $3 {{PLURAL:$3|canlyniad|canlyniad|ganlyniad|chanlyniad|chanlyniad|canlyniad}} isod gan ddechrau gyda rhif '''$2'''.",
-'showingresultstotal'       => "Yn dangos {{PLURAL:$3|canlyniad '''$1'''|canlyniad '''$1'''|canlyniadau '''$1 - $2'''|canlyniadau '''$1 - $2'''|canlyniadau '''$1 - $2'''|canlyniadau '''$1 - $2'''}} o'r cyfanswm '''$3'''",
-'nonefound'                 => "'''Sylwer''': Dim ond rhai parthau sy'n cael eu chwilio'n ddiofyn. Os ydych am chwilio'r holl barthau (gan gynnwys tudalennau sgwrs, nodiadau, ayb) teipiwch ''all:'' o flaen yr enw. Os am chwilio parth arbennig teipiwch ''enw'r parth:'' o flaen yr enw.",
-'powersearch'               => 'Chwilio',
-'powersearch-legend'        => 'Chwiliad uwch',
-'powersearch-ns'            => 'Chwilio yn y parthau:',
-'powersearch-redir'         => 'Rhestru ailgyfeiriadau',
-'powersearch-field'         => 'Chwilier am',
-'search-external'           => 'Chwiliad allanol',
-'searchdisabled'            => "Mae'r teclyn chwilio ar {{SITENAME}} wedi'i analluogi dros dro.
+'searchresults'                    => "Canlyniadau'r chwiliad",
+'searchresults-title'              => 'Canlyniadau chwilio am "$1"',
+'searchresulttext'                 => 'Am fwy o wybodaeth am chwilio {{SITENAME}}, gwelwch [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Chwiliwyd am \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|pob tudalen yn dechrau gyda "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|pob tudalen sy\'n cysylltu â "$1"]])',
+'searchsubtitleinvalid'            => "Chwiliwyd am '''$1'''",
+'noexactmatch'                     => "'''Nid oes tudalen a'r enw '$1' yn bod.''' Gallwch [[:$1|greu'r dudalen]].",
+'noexactmatch-nocreate'            => "'''Does dim tudalen a'r enw '$1' yn bod.'''",
+'toomanymatches'                   => "Cafwyd hyd i ormod o enghreifftiau o'r term chwilio; ceisiwch chwilio am derm arall",
+'titlematches'                     => 'Teitlau erthygl yn cyfateb',
+'notitlematches'                   => 'Does dim teitl yn cyfateb',
+'textmatches'                      => 'Testun erthygl yn cyfateb',
+'notextmatches'                    => 'Does dim testun yn cyfateb',
+'prevn'                            => 'y $1 cynt',
+'nextn'                            => 'y $1 nesaf',
+'viewprevnext'                     => 'Dangos ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Dewisiadau chwilio',
+'searchmenu-exists'                => "'''Mae tudalen o'r enw \"[[\$1]]\" ar y wici hwn'''",
+'searchmenu-new'                   => "'''Creu'r dudalen \"[[:\$1]]\" ar y wici hwn!'''",
+'searchhelp-url'                   => 'Help:Cymorth',
+'searchmenu-prefix'                => "[[Special:PrefixIndex/$1|Chwilio drwy tudalennau gyda'r rhagddodiad hwn]]",
+'searchprofile-articles'           => 'Tudalennau pwnc',
+'searchprofile-articles-and-proj'  => 'Tudalennau pwnc a phrosiect',
+'searchprofile-project'            => 'Tudalennau prosiect',
+'searchprofile-images'             => 'Ffeiliau',
+'searchprofile-everything'         => 'Popeth',
+'searchprofile-advanced'           => 'Uwch',
+'searchprofile-articles-tooltip'   => 'Chwilio drwy $1',
+'searchprofile-project-tooltip'    => 'Chwilio drwy $1',
+'searchprofile-images-tooltip'     => 'Chwilio am ffeiliau',
+'searchprofile-everything-tooltip' => "Chwilio'r cynnwys gyfan (gan gynnwys tudalennau sgwrs)",
+'searchprofile-advanced-tooltip'   => 'Chwilio drwy parthau dewisol',
+'prefs-search-nsdefault'           => "Chwilio gyda'r gosodiadau diofyn:",
+'prefs-search-nscustom'            => 'Chwilio drwy parthau dewisol:',
+'search-result-size'               => '$1 ({{PLURAL:$2|dim geiriau|$2 gair|$2 air|$2 gair|$2 gair|$2 gair|}})',
+'search-result-score'              => 'Perthnasedd: $1%',
+'search-redirect'                  => '(ailgyfeiriad $1)',
+'search-section'                   => '(adran $1)',
+'search-suggest'                   => 'Ai am hyn y chwiliwch: $1',
+'search-interwiki-caption'         => 'Chwaer-brosiectau',
+'search-interwiki-default'         => 'Y canlyniadau o $1:',
+'search-interwiki-more'            => '(rhagor)',
+'search-mwsuggest-enabled'         => 'gydag awgrymiadau',
+'search-mwsuggest-disabled'        => 'dim awgrymiadau',
+'search-relatedarticle'            => 'Cysylltiedig',
+'mwsuggest-disable'                => 'Analluogi awgrymiadau AJAX',
+'searchrelated'                    => 'cysylltiedig',
+'searchall'                        => 'oll',
+'showingresults'                   => "Yn dangos $1 {{PLURAL:$1|canlyniad|canlyniad|ganlyniad|chanlyniad|chanlyniad|canlyniad}} isod gan ddechrau gyda rhif '''$2'''.",
+'showingresultsnum'                => "Yn dangos $3 {{PLURAL:$3|canlyniad|canlyniad|ganlyniad|chanlyniad|chanlyniad|canlyniad}} isod gan ddechrau gyda rhif '''$2'''.",
+'showingresultstotal'              => "Yn dangos {{PLURAL:$4|canlyniad '''$1'''|canlyniad '''$1'''|canlyniadau '''$1 - $2'''|canlyniadau '''$1 - $2'''|canlyniadau '''$1 - $2'''|canlyniadau '''$1 - $2'''}} o'r cyfanswm '''$3'''",
+'nonefound'                        => "'''Sylwer''': Dim ond rhai parthau sy'n cael eu chwilio'n ddiofyn. Os ydych am chwilio'r holl barthau (gan gynnwys tudalennau sgwrs, nodiadau, ayb) teipiwch ''all:'' o flaen yr enw. Os am chwilio parth arbennig teipiwch ''enw'r parth:'' o flaen yr enw.",
+'search-nonefound'                 => "Ni chafwyd dim canlyniadau i'r ymholiad.",
+'powersearch'                      => 'Chwilio',
+'powersearch-legend'               => 'Chwiliad uwch',
+'powersearch-ns'                   => 'Chwilio yn y parthau:',
+'powersearch-redir'                => 'Rhestru ailgyfeiriadau',
+'powersearch-field'                => 'Chwilier am',
+'search-external'                  => 'Chwiliad allanol',
+'searchdisabled'                   => "Mae'r teclyn chwilio ar {{SITENAME}} wedi'i analluogi dros dro.
 Yn y cyfamser gallwch chwilio drwy Google.
 Cofiwch y gall mynegeion Google o gynnwys {{SITENAME}} fod ar ei hôl hi.",
 
 # Preferences page
-'preferences'              => 'Dewisiadau',
-'mypreferences'            => 'fy newisiadau',
-'prefs-edits'              => 'Nifer y golygiadau:',
-'prefsnologin'             => 'Nid ydych wedi mewngofnodi',
-'prefsnologintext'         => 'Rhaid i chi <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} fewngofnodi]</span> er mwyn gosod eich dewisiadau defnyddiwr.',
-'prefsreset'               => "Mae'r dewisiadau wedi cael eu hail-osod o'r storfa.",
-'qbsettings'               => 'Panel llywio',
-'qbsettings-none'          => 'Dim',
-'qbsettings-fixedleft'     => 'Sefydlog ar y chwith',
-'qbsettings-fixedright'    => 'Sefydlog ar y dde',
-'qbsettings-floatingleft'  => 'Yn arnofio ar y chwith',
-'qbsettings-floatingright' => 'Yn arnofio ar y dde',
-'changepassword'           => 'Newid y cyfrinair',
-'skin'                     => 'Croen',
-'math'                     => 'Mathemateg',
-'dateformat'               => 'Fformat dyddiad',
-'datedefault'              => 'Dim dewisiad',
-'datetime'                 => 'Dyddiad ac amser',
-'math_failure'             => 'Wedi methu dosrannu',
-'math_unknown_error'       => 'gwall anhysbys',
-'math_unknown_function'    => 'ffwythiant anhysbys',
-'math_lexing_error'        => 'gwall lecsio',
-'math_syntax_error'        => 'gwall cystrawen',
-'math_image_error'         => "Trosiad PNG wedi methu; gwiriwch fod latex, dvips, a gs wedi'u sefydlu'n gywir cyn trosi.",
-'math_bad_tmpdir'          => 'Yn methu creu cyfeiriadur mathemateg dros dro, nac ysgrifennu iddo',
-'math_bad_output'          => 'Yn methu creu cyfeiriadur allbwn mathemateg nac ysgrifennu iddo',
-'math_notexvc'             => 'Rhaglen texvc yn eisiau; gwelwch math/README er mwyn ei chyflunio.',
-'prefs-personal'           => 'Data defnyddiwr',
-'prefs-rc'                 => 'Newidiadau diweddar',
-'prefs-watchlist'          => 'Rhestr gwylio',
-'prefs-watchlist-days'     => "Nifer y diwrnodau i'w dangos yn y rhestr gwylio:",
-'prefs-watchlist-edits'    => "Nifer y golygiadau i'w dangos wrth ehangu'r rhestr gwylio:",
-'prefs-misc'               => 'Amrywiol',
-'saveprefs'                => "Cadw'r dewisiadau",
-'resetprefs'               => "Clirio'r darpar newidiadau",
-'oldpassword'              => 'Hen gyfrinair:',
-'newpassword'              => 'Cyfrinair newydd:',
-'retypenew'                => 'Ail-deipiwch y cyfrinair newydd:',
-'textboxsize'              => 'Golygu',
-'rows'                     => 'Rhesi:',
-'columns'                  => 'Colofnau:',
-'searchresultshead'        => 'Chwilio',
-'resultsperpage'           => 'Cyfradd taro fesul tudalen:',
-'contextlines'             => "Nifer y llinellau i'w dangos ar gyfer pob hit:",
-'contextchars'             => 'Nifer y llythrennau a nodau eraill i bob llinell:',
-'stub-threshold'           => 'Trothwy ar gyfer fformatio <a href="#" class="stub">cyswllt eginyn</a> (beitiau):',
-'recentchangesdays'        => "Nifer y diwrnodau i'w dangos yn 'newidiadau diweddar':",
-'recentchangescount'       => "Nifer y golygiadau i'w dangos ar dudalennau newidiadau diweddar, hanes, a logiau:",
-'savedprefs'               => 'Mae eich dewisiadau wedi cael eu cadw.',
-'timezonelegend'           => 'Ardal amser',
-'timezonetext'             => '¹Nifer yr oriau o wahaniaeth rhwng eich amser lleol ac amser y gweinydd (UTC).',
-'localtime'                => 'Amser lleol',
-'timezoneoffset'           => 'Atred¹',
-'servertime'               => 'Amser y gweinydd yw',
-'guesstimezone'            => 'Llenwi oddi wrth y porwr',
-'allowemail'               => 'Galluogi e-bost oddi wrth ddefnyddwyr eraill',
-'prefs-searchoptions'      => 'Dewisiadau chwilio',
-'prefs-namespaces'         => 'Parthau',
-'defaultns'                => 'Chwiliwch y parthau rhagosodedig isod:',
-'default'                  => 'rhagosodyn',
-'files'                    => 'Ffeiliau',
+'preferences'               => 'Dewisiadau',
+'mypreferences'             => 'fy newisiadau',
+'prefs-edits'               => 'Nifer y golygiadau:',
+'prefsnologin'              => 'Nid ydych wedi mewngofnodi',
+'prefsnologintext'          => 'Rhaid i chi <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} fewngofnodi]</span> er mwyn gosod eich dewisiadau defnyddiwr.',
+'prefsreset'                => "Mae'r dewisiadau wedi cael eu hail-osod o'r storfa.",
+'qbsettings'                => 'Panel llywio',
+'qbsettings-none'           => 'Dim',
+'qbsettings-fixedleft'      => 'Sefydlog ar y chwith',
+'qbsettings-fixedright'     => 'Sefydlog ar y dde',
+'qbsettings-floatingleft'   => 'Yn arnofio ar y chwith',
+'qbsettings-floatingright'  => 'Yn arnofio ar y dde',
+'changepassword'            => 'Newid y cyfrinair',
+'skin'                      => 'Gwedd',
+'skin-preview'              => 'Rhagolwg',
+'math'                      => 'Mathemateg',
+'dateformat'                => 'Fformat dyddiad',
+'datedefault'               => 'Dim dewisiad',
+'datetime'                  => 'Dyddiad ac amser',
+'math_failure'              => 'Wedi methu dosrannu',
+'math_unknown_error'        => 'gwall anhysbys',
+'math_unknown_function'     => 'ffwythiant anhysbys',
+'math_lexing_error'         => 'gwall lecsio',
+'math_syntax_error'         => 'gwall cystrawen',
+'math_image_error'          => "Trosiad PNG wedi methu; gwiriwch fod latex, dvips, a gs wedi'u sefydlu'n gywir cyn trosi.",
+'math_bad_tmpdir'           => 'Yn methu creu cyfeiriadur mathemateg dros dro, nac ysgrifennu iddo',
+'math_bad_output'           => 'Yn methu creu cyfeiriadur allbwn mathemateg nac ysgrifennu iddo',
+'math_notexvc'              => 'Rhaglen texvc yn eisiau; gwelwch math/README er mwyn ei chyflunio.',
+'prefs-personal'            => 'Data defnyddiwr',
+'prefs-rc'                  => 'Newidiadau diweddar',
+'prefs-watchlist'           => 'Rhestr gwylio',
+'prefs-watchlist-days'      => "Nifer y diwrnodau i'w dangos yn y rhestr gwylio:",
+'prefs-watchlist-days-max'  => '(hyd at 7 diwrnod)',
+'prefs-watchlist-edits'     => "Nifer y golygiadau i'w dangos wrth ehangu'r rhestr gwylio:",
+'prefs-watchlist-edits-max' => '(hyd at uchafswm o 1000)',
+'prefs-misc'                => 'Amrywiol',
+'prefs-resetpass'           => 'Newid y cyfrinair',
+'saveprefs'                 => "Cadw'r dewisiadau",
+'resetprefs'                => "Clirio'r darpar newidiadau",
+'textboxsize'               => 'Golygu',
+'prefs-edit-boxsize'        => 'Maint y blwch testun.',
+'rows'                      => 'Rhesi:',
+'columns'                   => 'Colofnau:',
+'searchresultshead'         => 'Chwilio',
+'resultsperpage'            => 'Cyfradd taro fesul tudalen:',
+'contextlines'              => "Nifer y llinellau i'w dangos ar gyfer pob hit:",
+'contextchars'              => 'Nifer y llythrennau a nodau eraill i bob llinell:',
+'stub-threshold'            => 'Trothwy ar gyfer fformatio <a href="#" class="stub">cyswllt eginyn</a> (beitiau):',
+'recentchangesdays'         => "Nifer y diwrnodau i'w dangos yn 'newidiadau diweddar':",
+'recentchangesdays-max'     => '(hyd at $1 {{PLURAL:$1||diwrnod|ddiwrnod|diwrnod|diwrnod|diwrnod}})',
+'recentchangescount'        => "Nifer y golygiadau i'w dangos yn ddiofyn ar dudalennau newidiadau diweddar, hanes, a logiau:",
+'savedprefs'                => 'Mae eich dewisiadau wedi cael eu cadw.',
+'timezonelegend'            => 'Ardal amser',
+'timezonetext'              => '¹Nifer yr oriau o wahaniaeth rhwng eich amser lleol ac amser y gweinydd (UTC).',
+'localtime'                 => 'Amser lleol:',
+'timezoneselect'            => 'Cylchfa amser:',
+'timezoneuseserverdefault'  => 'Amser y gweinydd',
+'timezoneuseoffset'         => 'Arall (nodwch yr atred)',
+'timezoneoffset'            => 'Atred¹:',
+'servertime'                => 'Amser y gweinydd:',
+'guesstimezone'             => 'Llenwi oddi wrth y porwr',
+'allowemail'                => 'Galluogi e-bost oddi wrth ddefnyddwyr eraill',
+'prefs-searchoptions'       => 'Dewisiadau chwilio',
+'prefs-namespaces'          => 'Parthau',
+'defaultns'                 => 'Chwiliwch y parthau rhagosodedig isod:',
+'default'                   => 'rhagosodyn',
+'files'                     => 'Ffeiliau',
 
 # User rights
 'userrights'                  => 'Rheoli galluoedd defnyddwyr', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Rheoli grwpiau defnyddiwr',
 'userrights-user-editname'    => 'Rhowch enw defnyddiwr:',
 'editusergroup'               => 'Golygu Grwpiau Defnyddwyr',
-'editinguser'                 => "Newid galluoedd y defnyddiwr '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Newid galluoedd y defnyddiwr '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Golygu grwpiau defnyddwyr',
 'saveusergroups'              => "Cadw'r Grwpiau Defnyddwyr",
 'userrights-groupsmember'     => 'Yn aelod o:',
@@ -1015,10 +1106,12 @@ Cofiwch y gall mynegeion Google o gynnwys {{SITENAME}} fod ar ei hôl hi.",
 'right-minoredit'            => "Marcio golygiadau'n rhai bychain",
 'right-move'                 => 'Symud tudalennau',
 'right-move-subpages'        => "Symud tudalennau gyda'u his-dudalennau",
+'right-movefile'             => 'Symud ffeiliau',
 'right-suppressredirect'     => "Peidio â chreu ailgyfeiriad o'r hen enw wrth symud tudalen",
 'right-upload'               => 'Uwchlwytho ffeiliau',
 'right-reupload'             => 'Trosysgrifo ffeil sydd eisoes yn bod',
 'right-reupload-own'         => "Trosysgrifo ffeil sydd eisoes yn bod ac wedi ei uwchlwytho gennych chi'ch hunan",
+'right-upload_by_url'        => 'Uwchlwytho ffeil oddi ar gyfeiriad URL',
 'right-autoconfirmed'        => 'Golygu tudalennau sydd wedi eu lled-ddiogelu',
 'right-delete'               => 'Dileu tudalennau',
 'right-bigdelete'            => 'Dileu tudalennau a hanes llwythog iddynt',
@@ -1047,9 +1140,41 @@ Cofiwch y gall mynegeion Google o gynnwys {{SITENAME}} fod ar ei hôl hi.",
 'rightslogentry' => "wedi gosod $1 yn aelod o'r grŵp $3 (grŵp cynt $2)",
 'rightsnone'     => '(dim)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'darllen y dudalen',
+'action-edit'                 => "golygu'r dudalen",
+'action-createpage'           => 'creu tudalennau',
+'action-createtalk'           => 'creu tudalennau sgwrs',
+'action-createaccount'        => "creu'r cyfrif defnyddiwr hwn",
+'action-minoredit'            => "marcio'r golygiad yn un bach",
+'action-move'                 => 'symud y dudalen',
+'action-move-subpages'        => "symud y dudalen a'i is-dudalennau",
+'action-movefile'             => 'symud y ffeil hon',
+'action-upload'               => "uwchlwytho'r ffeil",
+'action-reupload'             => 'trosysgrifo ffeil sydd eisoes ar gael',
+'action-upload_by_url'        => "uuchlwytho'r ffeil o gyfeiriad URL",
+'action-delete'               => "dileu'r dudalen",
+'action-deleterevision'       => "dileu'r golygiad",
+'action-deletedhistory'       => 'gweld hanes dilëedig y dudalen hon',
+'action-browsearchive'        => 'chwilio drwy tudalennau dilëedig',
+'action-undelete'             => "dad-ddileu'r dudalen",
+'action-suppressrevision'     => 'gweld ac adfer y golygiad cudd hwn',
+'action-suppressionlog'       => 'gweld y lòg preifat hwn',
+'action-block'                => 'atal y defnyddiwr hwn rhag golygu',
+'action-protect'              => 'newid lefelau gwarchod y dudalen hon',
+'action-import'               => "mewnforio'r dudalen hon o wici arall",
+'action-importupload'         => "mewnforio'r dudalen hon drwy uwchlwytho ffeil XML",
+'action-patrol'               => 'marcio bod golygiad defnyddiwr arall wedi derbyn ymweliad patrôl',
+'action-unwatchedpages'       => 'gweld rhestr y tudalennau heb neb yn eu gwylio',
+'action-mergehistory'         => 'cyfuno hanes y dudalen hon',
+'action-userrights'           => 'golygu holl alluoedd y defnyddwyr',
+'action-userrights-interwiki' => 'golygu galluoedd y defnyddwyr ar wicïau eraill',
+'action-siteadmin'            => "cloi neu ddatgloi'r databas",
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|newid|newid|newid|newid|newid|o newidiadau}}',
 'recentchanges'                     => 'Newidiadau diweddar',
+'recentchanges-legend'              => "Dewisiadau'r newidiadau diweddar",
 'recentchangestext'                 => "Dilynwch y newidiadau diweddaraf i'r wici ar y dudalen hon.",
 'recentchanges-feed-description'    => "Dilynwch y newidiadau diweddaraf i'r wici gyda'r porthiant hwn.",
 'rcnote'                            => "Isod mae'r '''$1''' newid diweddaraf yn ystod y {{PLURAL:$2|diwrnod|diwrnod|deuddydd|tridiau|'''$2''' diwrnod|'''$2''' diwrnod}} diwethaf, hyd at $5, $4.",
@@ -1073,6 +1198,8 @@ Cofiwch y gall mynegeion Google o gynnwys {{SITENAME}} fod ar ei hôl hi.",
 'rc_categories'                     => 'Cyfyngu i gategorïau (gwahanwch gyda "|")',
 'rc_categories_any'                 => 'Unrhyw un',
 'newsectionsummary'                 => '/* $1 */ adran newydd',
+'rc-enhanced-expand'                => 'Dangos y manylion (angen JavaScript)',
+'rc-enhanced-hide'                  => "Cuddio'r manylion",
 
 # Recent changes linked
 'recentchangeslinked'          => 'Newidiadau perthnasol',
@@ -1092,11 +1219,11 @@ Cofiwch y gall mynegeion Google o gynnwys {{SITENAME}} fod ar ei hôl hi.",
 'upload_directory_read_only'  => "Ni all y gweinydd ysgrifennu i'r cyfeiriadur uwchlwytho ($1).",
 'uploaderror'                 => "Gwall tra'n uwchlwytho ffeil",
 'uploadtext'                  => "Defnyddiwch y ffurflen isod i uwchlwytho ffeiliau.
-I weld a chwilio am ffeiliau sydd eisoes wedi eu huwchlwytho ewch at y [[Special:ImageList|rhestr o'r ffeiliau sydd wedi eu huwchlwytho]]. I weld cofnodion uwchlwytho a dileu ffeiliau ewch at y [[Special:Log/upload|lòg uwchlwytho]] neu'r [[Special:Log/delete|lòg dileu]].
+I weld a chwilio am ffeiliau sydd eisoes wedi eu huwchlwytho ewch at y [[Special:FileList|rhestr o'r ffeiliau sydd wedi eu huwchlwytho]]. I weld cofnodion uwchlwytho a dileu ffeiliau ewch at y [[Special:Log/upload|lòg uwchlwytho]] neu'r [[Special:Log/delete|lòg dileu]].
 
 I osod ffeil mewn tudalen defnyddiwch gyswllt wici, ar un o'r ffurfiau canlynol:
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Ffeil.jpg]]</nowiki><tt>''', er mwyn defnyddio fersiwn llawn y ffeil
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Ffeil.png|200px|bawd|chwith|testun amgen]]</nowiki><tt>''' a wnaiff dangos llun 200 picsel o led mewn bocs ar yr ochr chwith, a'r testun 'testun amgen' wrth ei odre
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Ffeil.jpg]]</nowiki><tt>''', er mwyn defnyddio fersiwn llawn y ffeil
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Ffeil.png|200px|bawd|chwith|testun amgen]]</nowiki><tt>''' a wnaiff dangos llun 200 picsel o led mewn bocs ar yr ochr chwith, a'r testun 'testun amgen' wrth ei odre
 *'''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Ffeil.ogg]]</nowiki><tt>''' a fydd yn arwain yn syth at y ffeil heb arddangos y ffeil.",
 'upload-permitted'            => 'Mathau o ffeiliau a ganiateir: $1',
 'upload-preferred'            => 'Mathau ffeil dewisol: $1.',
@@ -1104,7 +1231,7 @@ I osod ffeil mewn tudalen defnyddiwch gyswllt wici, ar un o'r ffurfiau canlynol:
 'uploadlog'                   => 'lòg uwchlwytho',
 'uploadlogpage'               => 'Lòg uwchlwytho',
 'uploadlogpagetext'           => "Isod mae rhestr o'r uwchlwythiadau ffeiliau <nowiki>diweddaraf</nowiki>.
-Gweler y [[Special:NewImages|galeri o ffeiliau newydd]] i fwrw golwg drostynt.",
+Gweler y [[Special:NewFiles|galeri o ffeiliau newydd]] i fwrw golwg drostynt.",
 'filename'                    => "Enw'r ffeil",
 'filedesc'                    => 'Crynodeb',
 'fileuploadsummary'           => 'Crynodeb:',
@@ -1117,34 +1244,37 @@ Gweler y [[Special:NewImages|galeri o ffeiliau newydd]] i fwrw golwg drostynt.",
 'illegalfilename'             => 'Mae\'r enw ffeil "$1" yn cynnwys nodau sydd wedi\'u gwahardd mewn teitlau tudalennau. Ail-enwch y ffeil ac uwchlwythwch hi eto os gwelwch yn dda.',
 'badfilename'                 => 'Mae enw\'r ffeil wedi\'i newid i "$1".',
 'filetype-badmime'            => "Ni chaniateir uwchlwytho ffeiliau o'r math MIME '$1'.",
+'filetype-bad-ie-mime'        => 'Ni ellir uwchlwytho\'r ffeil hon oherwydd y byddai Internet Explorer yn ei adnabod fel "$1", sef math annilys o ffeil sydd efallai hefyd yn beryglus.',
 'filetype-unwanted-type'      => "Mae'r math '''\".\$1\"''' o ffeil yn anghymeradwy.  Mae'n well defnyddio ffeil {{PLURAL:\$3|o'r math|o'r math|o'r mathau|o'r mathau|o'r mathau|o'r mathau}} \$2.",
 'filetype-banned-type'        => "Ni chaniateir ffeiliau o'r math '''\".\$1\"'''.  \$2 yw'r {{PLURAL:\$3|math|math|mathau|mathau|mathau|mathau}} o ffeil a ganiateir.",
 'filetype-missing'            => "Nid oes gan y ffeil hon estyniad (megis '.jpg').",
 'large-file'                  => "Argymhellir na ddylai ffeil fod yn fwy na $1. Mae'r ffeil hwn yn $2 o faint.",
 'largefileserver'             => "Mae'r ffeil yn fwy na'r hyn mae'r gweinydd yn ei ganiatau.",
 'emptyfile'                   => "Ymddengys fod y ffeil a uwchlwythwyd yn wag. Efallai bod gwall teipio yn enw'r ffeil. Sicrhewch eich bod wir am uwchlwytho'r ffeil.",
-'fileexists'                  => "Mae ffeil gyda'r enw hwn eisoes yn bodoli; gwiriwch <strong><tt>$1</tt></strong> os nad ydych yn sicr bod angen ei newid.",
+'fileexists'                  => "Mae ffeil gyda'r enw hwn eisoes yn bodoli; gwiriwch '''<tt>$1</tt>''' os nad ydych yn sicr bod angen ei newid.",
 'fileexists-extension'        => "Mae ffeil ag enw tebyg eisoes yn bod:<br />
-Enw'r ffeil ar fin ei uwchlwytho: <strong><tt>$1</tt></strong><br />
-Enw'r ffeil sydd eisoes yn bod: <strong><tt>$2</tt></strong><br />
+Enw'r ffeil ar fin ei uwchlwytho: '''<tt>$1</tt>'''<br />
+Enw'r ffeil sydd eisoes yn bod: '''<tt>$2</tt>'''<br />
 Dewiswch enw arall os gwelwch yn dda.",
 'fileexists-thumb'            => "<center>'''Y ddelwedd eisoes ar glawr'''</center>",
-'fileexists-thumbnail-yes'    => "Ymddengys bod delwedd wedi ei leihau <i>(bawd)</i> ar y ffeil. Cymharwch gyda'r ffeil <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Ymddengys bod delwedd wedi ei leihau ''(bawd)'' ar y ffeil. Cymharwch gyda'r ffeil '''<tt>$1</tt>'''.<br />
 Os mai'r un un llun ar ei lawn faint sydd ar yr ail ffeil yna does dim angen uwchlwytho llun ychwanegol o faint bawd.",
-'file-thumbnail-no'           => "Mae <strong><tt>$1</tt></strong> ar ddechrau enw'r ffeil. 
-Mae'n ymddangos felly bod y ddelwedd wedi ei leihau <i>(maint bawd)</i>.
+'file-thumbnail-no'           => "Mae '''<tt>$1</tt>''' ar ddechrau enw'r ffeil. 
+Mae'n ymddangos felly bod y ddelwedd wedi ei leihau ''(maint bawd)''.
 Os yw'r ddelwedd ar ei lawn faint gallwch barhau i'w uwchlwytho. Os na, newidiwch enw'r ffeil, os gwelwch yn dda.",
-'fileexists-forbidden'        => "Mae ffeil gyda'r enw hwn eisoes yn bodoli; ewch nôl ac uwchlwythwch y ffeil o dan enw newydd.
-[[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Mae ffeil gyda'r enw hwn eisoes ar gael, ac ni ellir ei throsysgrifo.
+Os ydych am uwchlwytho'ch ffeil, ewch nôl ac uwchlwythwch hi ac enw newydd arni.
+[[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => "Mae ffeil gyda'r enw hwn eisoes yn bodoli yn y storfa ffeiliau cyfrannol.
 Ewch nôl ac uwchlwythwch y ffeil gydag enw gwahanol iddo.
-[[Image:$1|thumb|center|$1]]",
+[[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => "Dyblgeb yw'r ffeil hwn o'r {{PLURAL:$1|ffeil|ffeil|ffeiliau|ffeiliau|ffeiliau|ffeiliau}} sy'n dilyn:",
+'file-deleted-duplicate'      => "Mae ffeil union debyg i hon ([$1]) eisoes wedi cael ei dileu. Dylech edrych ar hanes dileu'r ffeil honno cyn bwrw ati i'w llwytho unwaith eto.",
 'successfulupload'            => 'Wedi llwyddo uwchlwytho',
 'uploadwarning'               => 'Rhybudd uwchlwytho',
 'savefile'                    => "Cadw'r ffeil",
-'uploadedimage'               => '"[[$1]]" wedi\'i llwytho',
-'overwroteimage'              => "uwchlwythwyd fersiwn newydd o '[[$1]]'",
+'uploadedimage'               => 'wedi llwytho "[[$1]]"',
+'overwroteimage'              => 'wedi uwchlwytho fersiwn newydd o "[[$1]]"',
 'uploaddisabled'              => "Ymddiheurwn; mae uwchlwytho wedi'i analluogi.",
 'uploaddisabledtext'          => 'Analluogwyd uwchlwytho ffeiliau ar y wefan hon.',
 'uploadscripted'              => "Mae'r ffeil hon yn cynnwys HTML neu sgript a all achosi problemau i borwyr gwe.",
@@ -1154,11 +1284,13 @@ Ewch nôl ac uwchlwythwch y ffeil gydag enw gwahanol iddo.
 'destfilename'                => 'Enw ffeil y cyrchfan:',
 'upload-maxfilesize'          => 'Maint mwyaf ffeil: $1',
 'watchthisupload'             => 'Gwylier y dudalen hon',
+'filewasdeleted'              => "Cafodd ffeil o'r enw hwn eisoes ei uwchlwytho ac yna ei dileu.
+Dylech ddarllen y $1 cyn bwrw ati i'w uwchlwytho unwaith eto.",
 'upload-wasdeleted'           => "'''Rhybudd: Rydych yn uwchlwytho ffeil sydd eisoes wedi ei dileu.'''
 
 Ail-feddyliwch a ddylech barhau i uwchlwytho'r ffel hon.
 Dyma'r lòg dileu ar gyfer y ffeil i chi gael gweld:",
-'filename-bad-prefix'         => "Mae'r enw ar y ffeil yr ydych yn ei uwchlwytho yn dechrau gyda <strong>\"\$1\"</strong>. Mae'r math hwn o enw diystyr fel arfer yn cael ei osod yn awtomatig gan gamerâu digidol. Mae'n well gosod enw sy'n disgrifio'r ffeil arno.",
+'filename-bad-prefix'         => "Mae'r enw ar y ffeil yr ydych yn ei uwchlwytho yn dechrau gyda '''\"\$1\"'''. Mae'r math hwn o enw diystyr fel arfer yn cael ei osod yn awtomatig gan gamerâu digidol. Mae'n well gosod enw sy'n disgrifio'r ffeil arno.",
 
 'upload-proto-error'      => 'Protocol gwallus',
 'upload-proto-error-text' => "Rhaid cael URLs yn dechrau gyda <code>http://</code> neu <code>ftp://</code> wrth uwchlwytho'n bell.",
@@ -1185,20 +1317,21 @@ Efallai yr hoffech rhoi cynnig arni ar adeg llai prysur.',
 'upload_source_url'  => " (URL dilys, ar gael i'r cyhoedd)",
 'upload_source_file' => ' (ffeil ar eich cyfrifiadur)',
 
-# Special:ImageList
-'imagelist-summary'     => "Rhestr yr holl ffeiliau sydd wedi eu huwchlwytho sydd ar y dudalen hon. 
+# Special:ListFiles
+'listfiles-summary'     => "Rhestr yr holl ffeiliau sydd wedi eu huwchlwytho sydd ar y dudalen hon. 
 Trefnir y rhestr yn ôl amser uwchlwytho, gyda'r diweddaraf ar flaen y rhestr.
 Gallwch newid trefn y rhestr trwy bwyso ar bennawd colofn.",
-'imagelist_search_for'  => "Chwilio am enw'r ddelwedd:",
+'listfiles_search_for'  => "Chwilio am enw'r ddelwedd:",
 'imgfile'               => 'ffeil',
-'imagelist'             => "Rhestr o'r holl ffeiliau",
-'imagelist_date'        => 'Dyddiad',
-'imagelist_name'        => 'Enw',
-'imagelist_user'        => 'Defnyddiwr',
-'imagelist_size'        => 'Maint',
-'imagelist_description' => 'Disgrifiad',
-
-# Image description page
+'listfiles'             => "Rhestr o'r holl ffeiliau",
+'listfiles_date'        => 'Dyddiad',
+'listfiles_name'        => 'Enw',
+'listfiles_user'        => 'Defnyddiwr',
+'listfiles_size'        => 'Maint',
+'listfiles_description' => 'Disgrifiad',
+'listfiles_count'       => 'Fersiynau',
+
+# File description page
 'filehist'                       => 'Hanes y ffeil',
 'filehist-help'                  => 'Cliciwch ar ddyddiad/amser i weld y ffeil fel ag yr oedd bryd hynny.',
 'filehist-deleteall'             => 'eu dileu i gyd',
@@ -1206,6 +1339,9 @@ Gallwch newid trefn y rhestr trwy bwyso ar bennawd colofn.",
 'filehist-revert'                => 'gwrthdroi',
 'filehist-current'               => 'cyfredol',
 'filehist-datetime'              => 'Dyddiad/Amser',
+'filehist-thumb'                 => 'Mân-lun',
+'filehist-thumbtext'             => 'Mân-lun y fersiwn am $1',
+'filehist-nothumb'               => 'Dim mân-lun',
 'filehist-user'                  => 'Defnyddiwr',
 'filehist-dimensions'            => 'Hyd a lled',
 'filehist-filesize'              => 'Maint y ffeil',
@@ -1215,11 +1351,11 @@ Gallwch newid trefn y rhestr trwy bwyso ar bennawd colofn.",
 'nolinkstoimage'                 => 'Nid oes cyswllt ar unrhyw dudalen yn arwain at y ffeil hon.',
 'morelinkstoimage'               => 'Gweld [[Special:WhatLinksHere/$1|rhagor o gysylltiadau]] at y ffeil hon.',
 'redirectstofile'                => "Mae'r {{PLURAL:$1||ffeil|$1 ffeil|$1 ffeil|$1 ffeil|$1 ffeil}} canlynol yn ailgyfeirio at y ffeil hon:",
-'duplicatesoffile'               => "Mae'r {{PLURAL:$1||ffeil|$1 ffeil|$1 ffeil|$1 ffeil|$1 ffeil}} canlynol yn union debyg i'r ffeil hon:",
+'duplicatesoffile'               => "Mae'r {{PLURAL:$1||ffeil|$1 ffeil|$1 ffeil|$1 ffeil|$1 ffeil}} canlynol yn union debyg i'r ffeil hon ([[Special:FileDuplicateSearch/$2|rhagor o fanylion]]):",
 'sharedupload'                   => "Mae'r ffeil hon ar gael i'w rannu, felly gall fod ar waith ar brosiectau eraill.",
 'shareduploadwiki'               => 'Gwelwch $1 am fwy o fanylion.',
-'shareduploadwiki-desc'          => 'Dangosir isod y disgrifiad sydd ar $1 yn y gronfa ar y cyd.',
-'shareduploadwiki-linktext'      => 'dudalen disgrifiad y ffeil',
+'shareduploadwiki-desc'          => 'Dangosir isod y disgrifiad ohoni sydd yno ar $1.',
+'shareduploadwiki-linktext'      => 'dudalen ddisgrifiad y ffeil',
 'shareduploadduplicate'          => "Mae'r ffeil hon yn union debyg i $1 o'r storfa cyfrannol.",
 'shareduploadduplicate-linktext' => 'ffeil arall',
 'shareduploadconflict'           => "Mae $1 o'r storfa cyfrannol a'r un enw arni â hon.",
@@ -1242,7 +1378,7 @@ Gallwch newid trefn y rhestr trwy bwyso ar bennawd colofn.",
 # File deletion
 'filedelete'                  => 'Dileu $1',
 'filedelete-legend'           => "Dileu'r ffeil",
-'filedelete-intro'            => "Rydych ar fin dileu '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Rydych ar fin dileu'r ffeil '''[[Media:$1|$1]]''' ynghyd â'i holl hanes.",
 'filedelete-intro-old'        => "You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $3, $2].",
 'filedelete-comment'          => 'Sylw:',
 'filedelete-submit'           => 'Dileer',
@@ -1250,7 +1386,6 @@ Gallwch newid trefn y rhestr trwy bwyso ar bennawd colofn.",
 'filedelete-success-old'      => "The version of '''[[Media:$1|$1]]''' as of $3, $2 has been deleted.",
 'filedelete-nofile'           => "Ni chafwyd '''$1'''.",
 'filedelete-nofile-old'       => "Nid oes fersiwn o '''$1''' gyda'r priodoleddau a enwir yn yr archif.",
-'filedelete-iscurrent'        => "Rydych yn ceisio dileu'r fersiwn diweddaraf o'r ffeil hwn. Rhaid gwrthdroi i fersiwn gynt yn gyntaf.",
 'filedelete-otherreason'      => 'Rheswm arall/ychwanegol:',
 'filedelete-reason-otherlist' => 'Rheswm arall',
 'filedelete-reason-dropdown'  => '*Rhesymau cyffredin dros ddileu
@@ -1275,37 +1410,42 @@ Gallwch newid trefn y rhestr trwy bwyso ar bennawd colofn.",
 
 # Random page
 'randompage'         => 'Tudalen ar hap',
-'randompage-nopages' => 'Does dim tudalennau yn y parth hwn.',
+'randompage-nopages' => 'Does dim tudalennau yn y parth "$1".',
 
 # Random redirect
 'randomredirect'         => 'Tudalen ailgyfeirio ar hap',
-'randomredirect-nopages' => 'Does dim tudalennau ailgyfeirio yn y parth hwn.',
+'randomredirect-nopages' => 'Does dim tudalennau ailgyfeirio yn y parth "$1".',
 
 # Statistics
-'statistics'             => 'Ystadegau',
-'sitestats'              => 'Ystadegau {{SITENAME}}',
-'userstats'              => 'Ystadegau defnyddwyr',
-'sitestatstext'          => "Mae '''\$1''' {{PLURAL:\$1|tudalen i gyd|tudalen|dudalen i gyd|tudalen i gyd|thudalen i gyd|o dudalennau i gyd}} ar y databas.
-Mae hyn yn cynnwys tudalennau \"sgwrs\", tudalennau ynglŷn â {{SITENAME}}, egin erthyglau cwta, ailgyfeiriadau, a thudalennau eraill nad ydynt yn erthyglau go iawn. Ag eithrio'r rhain, mae'n debyg bod yna '''\$2''' {{PLURAL:\$2|erthygl|erthygl|erthygl|erthygl|erthygl|erthygl}} yn y wici.
-
-{{PLURAL:\$1|Ni chafodd unrhyw ffeil ei|Cafodd '''\$8''' ffeil ei|Cafodd '''\$8''' ffeil eu|Cafodd '''\$8''' ffeil eu|Cafodd '''\$8''' ffeil eu|Cafodd '''\$8''' ffeil eu}} huwchlwytho.
-
-Ers sefydlu'r meddalwedd {{PLURAL:\$3|ni chafwyd unrhyw|cafwyd '''\$3'''|cafwyd '''\$3'''|cafwyd '''\$3'''|cafwyd '''\$3'''|cafwyd '''\$3'''}} ymweliad â'r wefan o wefannau eraill a{{PLURAL:\$4|c ni chafwyd unrhyw olygiad|c '''\$4''' golygiad| '''\$4''' olygiad| '''\$4''' golygiad| '''\$4''' golygiad| '''\$4''' golygiad}} i dudalennau.
-Ar gyfartaledd felly, bu '''\$5''' golygiad i bob tudalen, a '''\$6''' ymweliad â thudalen ar gyfer pob golygiad.
-
-Hyd y [http://www.mediawiki.org/wiki/Manual:Job_queue rhes dasgau] yw '''\$7'''.",
-'userstatstext'          => "Mae '''$1''' {{PLURAL:$1|[[Special:ListUsers|defnyddiwr]]|[[Special:ListUsers|defnyddiwr]]|[[Special:ListUsers|ddefnyddiwr]]|[[Special:ListUsers|defnyddiwr]]|[[Special:ListUsers|defnyddiwr]]|[[Special:ListUsers|defnyddiwr]]}} ar y cofrestr defnyddwyr.
-Mae gan '''$2''' (neu '''$4%''') ohonynt alluoedd $5.",
-'statistics-mostpopular' => "Tudalennau sy'n derbyn ymweliad amlaf",
+'statistics'                   => 'Ystadegau',
+'statistics-header-pages'      => 'Ystadegau tudalennau',
+'statistics-header-edits'      => 'Ystadegau golygiadau',
+'statistics-header-views'      => 'Ystadegau ymweliadau',
+'statistics-header-users'      => 'Ystadegau defnyddwyr',
+'statistics-articles'          => 'Tudalennau cynnwys',
+'statistics-pages'             => 'Tudalennau',
+'statistics-pages-desc'        => 'Pob tudalen yn y wici, gan gynnwys tudalennau sgwrs, ailgyfeiriadau, ayb.',
+'statistics-files'             => 'Ffeiliau wedi eu huwchlwytho',
+'statistics-edits'             => 'Golygiadau ers y dechrau ar {{SITENAME}}',
+'statistics-edits-average'     => "Golygiadau'r dudalen, ar gyfartaledd",
+'statistics-views-total'       => 'Cyfanswm yr ymweliadau',
+'statistics-views-peredit'     => 'Ymweliadau i bob golygiad:',
+'statistics-jobqueue'          => 'Hyd y [http://www.mediawiki.org/wiki/Manual:Job_queue llinell tasgau]',
+'statistics-users'             => '[[Special:ListUsers|Defnyddwyr]] cofrestredig',
+'statistics-users-active'      => 'Defnyddwyr gweithgar',
+'statistics-users-active-desc' => 'Defnyddwyr sydd wedi gweithredu unwaith neu ragor yn ystod y {{PLURAL:$1||diwrnod|deuddydd|tridiau|$1 diwrnod|$1 diwrnod}} diwethaf',
+'statistics-mostpopular'       => "Tudalennau sy'n derbyn ymweliad amlaf",
 
 'disambiguations'      => 'Tudalennau gwahaniaethu',
 'disambiguations-text' => "Mae'r tudalennau canlynol yn cysylltu â thudalennau gwahaniaethu. Yn hytrach dylent gysylltu'n syth â'r erthygl briodol.<br />Diffinir tudalen yn dudalen gwahaniaethu pan mae'n cynnwys un o'r nodiadau '[[MediaWiki:Disambiguationspage|tudalen gwahaniaethu]]'.",
 
-'doubleredirects'     => 'Ailgyfeiriadau dwbl',
-'doubleredirectstext' => "Mae pob rhes yn cynnwys cysylltiad i'r ddau ail-gyfeiriad cyntaf, ynghyd â chyrchfan yr ail ailgyfeiriad. Fel arfer bydd hyn yn rhoi'r gwir dudalen y dylai'r tudalennau cynt gyfeirio ati.",
+'doubleredirects'            => 'Ailgyfeiriadau dwbl',
+'doubleredirectstext'        => "Mae pob rhes yn cynnwys cysylltiad i'r ddau ail-gyfeiriad cyntaf, ynghyd â chyrchfan yr ail ailgyfeiriad. Fel arfer bydd hyn yn rhoi'r gwir dudalen y dylai'r tudalennau cynt gyfeirio ati.",
+'double-redirect-fixed-move' => "Symudwyd [[$1]], a'i droi'n ailgyfeiriad at [[$2]]",
+'double-redirect-fixer'      => 'Redirect fixer',
 
 'brokenredirects'        => "Ailgyfeiriadau wedi'u torri",
-'brokenredirectstext'    => "Mae'r ailgyfeiriadau isod yn cysylltu â thudalennau sydd heb eu creu eto.",
+'brokenredirectstext'    => "Mae'r ailgyfeiriadau isod yn cysylltu â thudalennau nad ydynt ar gael:",
 'brokenredirects-edit'   => '(golygu)',
 'brokenredirects-delete' => '(dileu)',
 
@@ -1335,26 +1475,30 @@ Mae gan '''$2''' (neu '''$4%''') ohonynt alluoedd $5.",
 'popularpages'            => 'Erthyglau poblogaidd',
 'wantedcategories'        => 'Categorïau sydd eu hangen',
 'wantedpages'             => 'Erthyglau sydd eu hangen',
-'missingfiles'            => 'Ffeiliau yn eisiau',
+'wantedfiles'             => 'Ffeiliau sydd eu hangen',
+'wantedtemplates'         => 'Nodiadau sydd eu hangen',
 'mostlinked'              => 'Tudalennau yn nhrefn nifer y cysylltiadau iddynt',
 'mostlinkedcategories'    => 'Categorïau yn nhrefn nifer eu haelodau',
 'mostlinkedtemplates'     => 'Nodiadau yn nhrefn nifer y cysylltiadau iddynt',
 'mostcategories'          => 'Erthyglau yn nhrefn nifer eu categorïau',
 'mostimages'              => 'Ffeiliau yn nhrefn nifer y cysylltiadau iddynt',
 'mostrevisions'           => 'Tudalennau yn nhrefn nifer golygiadau',
-'prefixindex'             => 'Mynegai rhagddodiaid',
+'prefixindex'             => 'Pob tudalen yn ôl parth',
 'shortpages'              => 'Erthyglau byr',
 'longpages'               => 'Tudalennau hirion',
 'deadendpages'            => 'Tudalennau heb gysylltiadau ynddynt',
 'deadendpagestext'        => "Nid oes cysylltiad yn arwain at dudalen arall oddi wrth yr un o'r tudalennau isod.",
 'protectedpages'          => 'Tudalennau wedi eu diogelu',
 'protectedpages-indef'    => 'A ddiogelwyd yn ddi-derfyn yn unig',
+'protectedpages-cascade'  => 'A sgydol-ddiogelwyd yn unig',
 'protectedpagestext'      => "Mae'r tudalennau hyn wedi eu diogelu rhag cael eu symud na'u golygu",
 'protectedpagesempty'     => "Does dim tudalennau wedi eu diogelu gyda'r paramedrau hyn.",
 'protectedtitles'         => 'Teitlau wedi eu diogelu',
 'protectedtitlestext'     => "Diogelwyd rhag creu tudalennau gyda'r teitlau hyn",
 'protectedtitlesempty'    => "Ar hyn o bryd nid oes unrhyw deitlau wedi eu diogelu a'r paramedrau hyn.",
 'listusers'               => 'Rhestr defnyddwyr',
+'listusers-editsonly'     => 'Dangos y defnyddwyr hynny sydd wedi golygu rhywbeth yn unig',
+'usereditcount'           => '$1 {{PLURAL:$1|golygiad|golygiad|olygiad|golygiad|golygiad|o olygiadau}}',
 'newpages'                => 'Erthyglau newydd',
 'newpages-username'       => 'Enw defnyddiwr:',
 'ancientpages'            => 'Erthyglau hynaf',
@@ -1373,14 +1517,13 @@ Mae gan '''$2''' (neu '''$4%''') ohonynt alluoedd $5.",
 'booksources-search-legend' => 'Chwilier am lyfrau',
 'booksources-go'            => 'Mynd',
 'booksources-text'          => "Mae'r rhestr isod yn cynnwys cysylltiadau i wefannau sy'n gwerthu llyfrau newydd a rhai ail-law. Mae rhai o'r gwefannau hefyd yn cynnig gwybodaeth pellach am y llyfrau hyn:",
+'booksources-invalid-isbn'  => "Ymddengys nad yw'r rhif ISBN hwn yn ddilys; efallai y cafwyd gwall wrth drosglwyddo'r rhif.",
 
 # Special:Log
 'specialloguserlabel'  => 'Defnyddiwr:',
 'speciallogtitlelabel' => 'Teitl:',
 'log'                  => 'Logiau',
 'all-logs-page'        => 'Pob lòg',
-'log-search-legend'    => 'Chwilio am logiau',
-'log-search-submit'    => 'Eler',
 'alllogstext'          => "Mae pob cofnod yn holl logiau {{SITENAME}} wedi cael eu rhestru yma.
 Gallwch weld chwiliad mwy penodol trwy ddewis y math o lòg, enw'r defnyddiwr, neu'r dudalen benodedig.
 Sylwer bod llythrennau mawr neu fach o bwys i'r chwiliad.",
@@ -1393,6 +1536,7 @@ Sylwer bod llythrennau mawr neu fach o bwys i'r chwiliad.",
 'nextpage'          => 'Y bloc nesaf gan ddechrau gyda ($1)',
 'prevpage'          => 'Y bloc cynt gan ddechrau gyda ($1)',
 'allpagesfrom'      => 'Dangos pob tudalen gan ddechrau o:',
+'allpagesto'        => 'Dangos pob tudalen hyd at:',
 'allarticles'       => 'Pob erthygl',
 'allinnamespace'    => 'Pob tudalen (parth $1)',
 'allnotinnamespace' => 'Pob tudalen (heblaw am y parth $1)',
@@ -1412,42 +1556,66 @@ Gweler hefyd [[Special:WantedCategories|categorïau sydd eu hangen]].",
 'special-categories-sort-count' => 'trefnu yn ôl nifer',
 'special-categories-sort-abc'   => 'trefnu yn ôl yr wyddor',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Cyfraniadau defnyddiwr i dudalennau dilëedig',
+
+# Special:LinkSearch
+'linksearch'     => 'Cysylltiadau allanol',
+'linksearch-pat' => 'Patrwm chwilio:',
+'linksearch-ns'  => 'Parth:',
+'linksearch-ok'  => 'Chwilio',
+
 # Special:ListUsers
 'listusersfrom'      => 'Dangos y defnyddwyr gan ddechrau â:',
 'listusers-submit'   => 'Dangos',
 'listusers-noresult' => "Dim defnyddiwr i'w gael.",
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Lòg creu cyfrifon defnyddwyr newydd',
+'newuserlogpagetext'          => 'Dyma lòg creu cyfrifon defnyddwyr newydd.',
+'newuserlog-byemail'          => 'anfonwyd y cyfrinair trwy e-bost',
+'newuserlog-create-entry'     => 'Defnyddiwr newydd',
+'newuserlog-create2-entry'    => 'wedi creu cyfrif newydd ar gyfer $1',
+'newuserlog-autocreate-entry' => "Cyfrif wedi ei greu'n awtomatig",
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Galluoedd grwpiau defnyddwyr',
-'listgrouprights-summary'  => "Dyma restr o'r grwpiau defnyddwyr sydd i'w cael ar y wici hon, ynghyd â galluoedd aelodau'r gwahanol grwpiau. Cewch wybodaeth pellach am y gwahanol alluoedd ar y [[{{MediaWiki:Listgrouprights-helppage}}|dudalen gymorth]].",
-'listgrouprights-group'    => 'Grŵp',
-'listgrouprights-rights'   => 'Galluoedd',
-'listgrouprights-helppage' => 'Help:Galluoedd yn ôl grŵp',
-'listgrouprights-members'  => '(rhestr aelodau)',
+'listgrouprights'                 => 'Galluoedd grwpiau defnyddwyr',
+'listgrouprights-summary'         => "Dyma restr o'r grwpiau defnyddwyr sydd i'w cael ar y wici hon, ynghyd â galluoedd aelodau'r gwahanol grwpiau. Cewch wybodaeth pellach am y gwahanol alluoedd ar y [[{{MediaWiki:Listgrouprights-helppage}}|dudalen gymorth]].",
+'listgrouprights-group'           => 'Grŵp',
+'listgrouprights-rights'          => 'Galluoedd',
+'listgrouprights-helppage'        => 'Help:Galluoedd yn ôl grŵp',
+'listgrouprights-members'         => '(rhestr aelodau)',
+'listgrouprights-addgroup'        => "Yn gallu ychwanegu'r {{PLURAL:$2|grŵp|grŵp|grwpiau|grwpiau|grwpiau|grwpiau}}: $1",
+'listgrouprights-removegroup'     => "Yn gallu tynnu'r {{PLURAL:$2|grŵp|grŵp|grwpiau|grwpiau|grwpiau|grwpiau}}: $1",
+'listgrouprights-addgroup-all'    => "Yn gallu ychwanegu'r holl grwpiau",
+'listgrouprights-removegroup-all' => "Yn gallu tynnu'r holl grwpiau",
 
 # E-mail user
-'mailnologin'     => "Does dim cyfeiriad i'w anfon iddo",
-'mailnologintext' => 'Rhaid eich bod wedi [[Special:UserLogin|mewngofnodi]]
+'mailnologin'      => "Does dim cyfeiriad i'w anfon iddo",
+'mailnologintext'  => 'Rhaid eich bod wedi [[Special:UserLogin|mewngofnodi]]
 a bod cyfeiriad e-bost dilys yn eich [[Special:Preferences|dewisiadau]]
 er mwyn medru anfon e-bost at ddefnyddwyr eraill.',
-'emailuser'       => 'Anfon e-bost at y defnyddiwr hwn',
-'emailpage'       => 'Anfon e-bost at ddefnyddiwr',
-'emailpagetext'   => "Os yw'r cyfeiriad e-bost sydd yn newisiadau'r defnyddiwr hwn yn un dilys, gellir anfon neges ato o'i ysgrifennu ar y ffurflen isod. 
+'emailuser'        => 'Anfon e-bost at y defnyddiwr hwn',
+'emailpage'        => 'Anfon e-bost at ddefnyddiwr',
+'emailpagetext'    => "Os yw'r cyfeiriad e-bost sydd yn newisiadau'r defnyddiwr hwn yn un dilys, gellir anfon neges ato o'i ysgrifennu ar y ffurflen isod. 
 Bydd y cyfeiriad e-bost a osodoch yn eich [[Special:Preferences|dewisiadau chithau]] yn ymddangos ym maes \"Oddi wrth\" yr e-bost, fel bod y defnyddiwr arall yn gallu anfon ateb atoch.",
-'usermailererror' => 'Dychwelwyd gwall gan y rhaglen e-bost:',
-'defemailsubject' => 'E-bost {{SITENAME}}',
-'noemailtitle'    => 'Dim cyfeiriad e-bost',
-'noemailtext'     => "Mae'r defnyddiwr hwn naill ai heb roi cyfeiriad e-bost dilys, neu mae wedi dewis peidio â derbyn e-bost oddi wrth ddefnyddwyr eraill.",
-'emailfrom'       => 'Oddi wrth:',
-'emailto'         => 'At:',
-'emailsubject'    => 'Pwnc:',
-'emailmessage'    => 'Neges:',
-'emailsend'       => 'Anfon',
-'emailccme'       => "Anfoner gopi o'r neges e-bost ataf.",
-'emailccsubject'  => "Copi o'ch neges at $1: $2",
-'emailsent'       => "Neges e-bost wedi'i hanfon",
-'emailsenttext'   => 'Mae eich neges e-bost wedi cael ei hanfon.',
-'emailuserfooter' => 'Anfonwyd yr e-bost hwn oddi wrth $1 at $2 trwy ddefnyddio\'r teclyn "Anfon e-bost at ddefnyddiwr" ar {{SITENAME}}.',
+'usermailererror'  => 'Dychwelwyd gwall gan y rhaglen e-bost:',
+'defemailsubject'  => 'E-bost {{SITENAME}}',
+'noemailtitle'     => 'Dim cyfeiriad e-bost',
+'noemailtext'      => "Nid yw'r defnyddiwr hwn wedi gosod cyfeiriad e-bost dilys.",
+'nowikiemailtitle' => 'Ni chaniateir e-bostio',
+'nowikiemailtext'  => "Mae'r defnyddiwr hwn wedi dewis peidio derbyn e-byst oddi wrth ddefnyddwyr eraill.",
+'email-legend'     => 'Anfon e-bost at ddefnyddiwr {{SITENAME}} arall',
+'emailfrom'        => 'Oddi wrth:',
+'emailto'          => 'At:',
+'emailsubject'     => 'Pwnc:',
+'emailmessage'     => 'Neges:',
+'emailsend'        => 'Anfon',
+'emailccme'        => "Anfoner gopi o'r neges e-bost ataf.",
+'emailccsubject'   => "Copi o'ch neges at $1: $2",
+'emailsent'        => "Neges e-bost wedi'i hanfon",
+'emailsenttext'    => 'Mae eich neges e-bost wedi cael ei hanfon.',
+'emailuserfooter'  => 'Anfonwyd yr e-bost hwn oddi wrth $1 at $2 trwy ddefnyddio\'r teclyn "Anfon e-bost at ddefnyddiwr" ar {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Fy rhestr gwylio',
@@ -1480,12 +1648,7 @@ Os ydych am ddiddymu'r dudalen o'r rhestr gwylio, cliciwch ar \"Stopio gwylio\"
 'iteminvalidname'      => "Problem gyda'r eitem '$1', enw annilys...",
 'wlnote'               => "{{PLURAL:$1|Ni fu unrhyw newid|Isod mae'r '''$1''' newid diweddaraf|Isod mae'r '''$1''' newid diweddaraf|Isod mae'r '''$1''' newid diweddaraf|Isod mae'r '''$1''' newid diweddaraf|Isod mae'r '''$1''' newid diweddaraf}} yn ystod {{PLURAL:$2||yr awr|y ddwyawr|y teirawr|y <b>$2</b> awr|y(r) <b>$2</b> awr}} ddiwethaf.",
 'wlshowlast'           => "Dangoser newidiadau'r $1 awr ddiwethaf neu'r $2 {{PLURAL:$2|diwrnod|diwrnod|ddiwrnod|diwrnod|diwrnod|diwrnod}} diwethaf neu'r $3 newidiadau.",
-'watchlist-show-bots'  => 'Dangos golygiadau bot',
-'watchlist-hide-bots'  => 'Cuddio golygiadau bot',
-'watchlist-show-own'   => 'Dangos fy ngolygiadau',
-'watchlist-hide-own'   => 'Cuddio fy ngolygiadau',
-'watchlist-show-minor' => 'Dangos golygiadau bychain',
-'watchlist-hide-minor' => 'Cuddio golygiadau bychain',
+'watchlist-options'    => 'Dewisiadau ar gyfer y rhestr gwylio',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => "Wrthi'n ychwanegu...",
@@ -1524,82 +1687,101 @@ I newid eich gosodiadau gwylio, ymwelwch â
 Am fwy o gymorth ac adborth:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Dilëer y dudalen',
-'confirm'                     => 'Cadarnhau',
-'excontent'                   => "y cynnwys oedd: '$1'",
-'excontentauthor'             => "y cynnwys oedd: '$1' (a'r unig gyfrannwr oedd '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "y cynnwys cyn blancio oedd: '$1'",
-'exblank'                     => 'roedd y dudalen yn wag',
-'delete-confirm'              => 'Dileu "$1"',
-'delete-legend'               => 'Dileu',
-'historywarning'              => "Rhybudd: mae hanes i'r dudalen rydych ar fin ei dileu.",
-'confirmdeletetext'           => "Rydych chi ar fin dileu tudalen neu ddelwedd, ynghŷd â'i hanes, o'r data-bas, a hynny'n barhaol.
+# Delete
+'deletepage'             => 'Dilëer y dudalen',
+'confirm'                => 'Cadarnhau',
+'excontent'              => "y cynnwys oedd: '$1'",
+'excontentauthor'        => "y cynnwys oedd: '$1' (a'r unig gyfrannwr oedd '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "y cynnwys cyn blancio oedd: '$1'",
+'exblank'                => 'roedd y dudalen yn wag',
+'delete-confirm'         => 'Dileu "$1"',
+'delete-legend'          => 'Dileu',
+'historywarning'         => "Rhybudd: mae hanes i'r dudalen rydych ar fin ei dileu.",
+'confirmdeletetext'      => "Rydych chi ar fin dileu tudalen neu ddelwedd, ynghŷd â'i hanes, o'r data-bas, a hynny'n barhaol.
 Os gwelwch yn dda, cadarnhewch eich bod chi wir yn bwriadu gwneud hyn, eich bod yn deall y canlyniadau, ac yn ei wneud yn ôl [[{{MediaWiki:Policy-url}}|polisïau {{SITENAME}}]].",
-'actioncomplete'              => "Wedi cwblhau'r weithred",
-'deletedtext'                 => 'Mae "<nowiki>$1</nowiki>" wedi\'i ddileu.
+'actioncomplete'         => "Wedi cwblhau'r weithred",
+'deletedtext'            => 'Mae "<nowiki>$1</nowiki>" wedi\'i ddileu.
 Gwelwch y $2 am gofnod o\'r dileuon diweddar.',
-'deletedarticle'              => 'wedi dileu "[[$1]]"',
-'suppressedarticle'           => 'cuddiwyd "[[$1]]"',
-'dellogpage'                  => 'Log dileuon',
-'dellogpagetext'              => "Ceir rhestr isod o'r dileadau diweddaraf.",
-'deletionlog'                 => 'log dileuon',
-'reverted'                    => "Wedi gwrthdroi i'r golygiad cynt",
-'deletecomment'               => 'Esboniad am y dileu:',
-'deleteotherreason'           => 'Rheswm arall:',
-'deletereasonotherlist'       => 'Rheswm arall',
-'deletereason-dropdown'       => "*Rhesymau arferol dros ddileu
+'deletedarticle'         => 'wedi dileu "[[$1]]"',
+'suppressedarticle'      => 'cuddiwyd "[[$1]]"',
+'dellogpage'             => 'Log dileuon',
+'dellogpagetext'         => "Ceir rhestr isod o'r dileadau diweddaraf.",
+'deletionlog'            => 'lòg dileuon',
+'reverted'               => "Wedi gwrthdroi i'r golygiad cynt",
+'deletecomment'          => 'Esboniad am y dileu:',
+'deleteotherreason'      => 'Rheswm arall:',
+'deletereasonotherlist'  => 'Rheswm arall',
+'deletereason-dropdown'  => "*Rhesymau arferol dros ddileu
 ** Ar gais yr awdur
 ** Torri'r hawlfraint
 ** Fandaliaeth",
-'delete-edit-reasonlist'      => 'Golygu rhesymau dileu',
-'delete-toobig'               => "Cafwyd dros $1 {{PLURAL:$#|o olygiadau}} i'r dudalen hon.
+'delete-edit-reasonlist' => 'Golygu rhesymau dileu',
+'delete-toobig'          => "Cafwyd dros $1 {{PLURAL:$#|o olygiadau}} i'r dudalen hon.
 Cyfyngwyd ar y gallu i ddileu tudalennau sydd wedi eu golygu cymaint â hyn, er mwyn osgoi amharu ar weithrediad databas {{SITENAME}} yn ddamweiniol.",
-'delete-warning-toobig'       => "Cafwyd dros $1 {{PLURAL:$#|o olygiadau}} i'r dudalen hon.
+'delete-warning-toobig'  => "Cafwyd dros $1 {{PLURAL:$#|o olygiadau}} i'r dudalen hon.
 Gallai dileu tudalen, gyda hanes golygu cymaint â hyn iddi, beri dryswch i weithrediadau'r databas ar {{SITENAME}}; ewch ati'n ofalus.",
-'rollback'                    => 'Gwrthdroi golygiadau',
-'rollback_short'              => 'Gwrthdroi',
-'rollbacklink'                => 'gwrthdroi',
-'rollbackfailed'              => 'Methodd y gwrthdroi',
-'cantrollback'                => "Wedi methu gwrthdroi'r golygiad; y cyfrannwr diwethaf oedd unig awdur y dudalen hon.",
-'alreadyrolled'               => "Nid yw'n bosib dadwneud y golygiad diwethaf i'r dudalen [[:$1|$1]] gan [[User:$2|$2]] ([[User talk:$2|Sgwrs]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+
+# Rollback
+'rollback'         => 'Gwrthdroi golygiadau',
+'rollback_short'   => 'Gwrthdroi',
+'rollbacklink'     => 'gwrthdroi',
+'rollbackfailed'   => 'Methodd y gwrthdroi',
+'cantrollback'     => "Wedi methu gwrthdroi'r golygiad; y cyfrannwr diwethaf oedd unig awdur y dudalen hon.",
+'alreadyrolled'    => "Nid yw'n bosib dadwneud y golygiad diwethaf i'r dudalen [[:$1|$1]] gan [[User:$2|$2]] ([[User talk:$2|Sgwrs]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 mae rhywun arall eisoes wedi dadwneud y golygiad neu wedi golygu'r dudalen.
 
-[[User:$3|$3]] ([[User talk:$3|Sgwrs]] | [[Special:Contributions/$3|{{int:contribslink}}]]) a wnaeth y golygiad diwethaf.",
-'editcomment'                 => 'Crynodeb y golygiad oedd: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Wedi gwrthdroi golygiadau gan [[Special:Contributions/$2|$2]] ([[User talk:$2|Sgwrs]]); wedi adfer y golygiad diweddaraf gan [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "Gwrthdrowyd y golygiadau gan $1; 
+[[User:$3|$3]] ([[User talk:$3|Sgwrs]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) a wnaeth y golygiad diwethaf.",
+'editcomment'      => "Crynodeb y golygiad oedd: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Wedi gwrthdroi golygiadau gan [[Special:Contributions/$2|$2]] ([[User talk:$2|Sgwrs]]); wedi adfer y golygiad diweddaraf gan [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "Gwrthdrowyd y golygiadau gan $1; 
 wedi gwrthdroi i'r golygiad olaf gan $2.",
-'sessionfailure'              => "Mae'n debyg fod yna broblem gyda'ch sesiwn mewngofnodi; diddymwyd y weithred er mwyn diogelu'r sustem rhag ddefnyddwyr maleisus. Gwasgwch botwm 'nôl' eich porwr ac ail-lwythwch y dudalen honno, yna ceisiwch eto.",
+'sessionfailure'   => "Mae'n debyg fod yna broblem gyda'ch sesiwn mewngofnodi; diddymwyd y weithred er mwyn diogelu'r sustem rhag ddefnyddwyr maleisus. Gwasgwch botwm 'nôl' eich porwr ac ail-lwythwch y dudalen honno, yna ceisiwch eto.",
+
+# Protect
 'protectlogpage'              => 'Lòg diogelu',
 'protectlogtext'              => "Isod mae rhestr o bob gweithred diogelu (a dad-ddiogelu) tudalen.
 Mae'r tudalennau sydd wedi eu diogelu ar hyn o bryd wedi eu rhestri ar y [[Special:ProtectedPages|rhestr tudalennau wedi eu diogelu]].",
 'protectedarticle'            => "wedi diogelu '[[$1]]'",
 'modifiedarticleprotection'   => 'wedi newid y lefel diogelu ar gyfer "[[$1]]"',
 'unprotectedarticle'          => 'wedi dad-ddiogelu "[[$1]]"',
+'movedarticleprotection'      => 'wedi symud y gosodiadau gwarchod o "[[$2]]" i "[[$1]]"',
 'protect-title'               => "Newid y lefel diogelu ar gyfer '$1'",
+'prot_1movedto2'              => 'wedi symud [[$1]] i [[$2]]',
 'protect-legend'              => "Cadarnháu'r diogelu",
 'protectcomment'              => 'Sylw:',
 'protectexpiry'               => 'Yn dod i ben:',
 'protect_expiry_invalid'      => 'Amser terfynu annilys.',
 'protect_expiry_old'          => "Mae'r amser darfod yn y gorffennol.",
 'protect-unchain'             => "Datgloi'r cyfyngiadau ar symud tudalen",
-'protect-text'                => 'Yma, gallwch weld a newid y lefel diogelu ar gyfer y dudalen <strong><nowiki>$1</nowiki></strong>.',
+'protect-text'                => "Yma, gallwch weld a newid y lefel diogelu ar gyfer y dudalen '''<nowiki>$1</nowiki>'''.",
 'protect-locked-blocked'      => "Ni allwch newid y lefel diogelu tra eich bod wedi eich blocio.
-Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen <strong>$1</strong>:",
+Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen '''$1''':",
 'protect-locked-dblock'       => "Ni ellir newid y lefel diogelu gan fod y databas dan glo.
-Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen <strong>$1</strong>:",
+Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen '''$1''':",
 'protect-locked-access'       => "Nid yw'r gallu i newid lefel diogelu ar dudalen ynghlwm wrth eich cyfrif defnyddiwr.
-Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen <strong>$1</strong>:",
+Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen '''$1''':",
 'protect-cascadeon'           => "Mae'r dudalen hon wedi ei diogelu ar hyn o bryd oherwydd ei bod wedi ei chynnwys yn y {{PLURAL:$1|dudalen|dudalen|tudalennau|tudalennau|tudalennau|tudalennau}} canlynol sydd wedi {{PLURAL:$1|ei|ei|eu|eu|eu|eu}} sgydol-diogelu.  Gallwch newid lefel diogelu'r dudalen hon, ond ni fydd hynny'n effeithio ar y sgydol-ddiogelu.",
-'protect-default'             => '(rhagosodedig)',
+'protect-default'             => "Caniatáu'r gallu i bob defnyddiwr",
 'protect-fallback'            => 'Mynnu\'r gallu "$1"',
-'protect-level-autoconfirmed' => 'Blocio defnyddwyr heb gyfrif',
+'protect-level-autoconfirmed' => "Blocio defnyddwyr newydd a'r rhai heb gyfrif",
 'protect-level-sysop'         => 'Gweinyddwyr yn unig',
 'protect-summary-cascade'     => 'sgydol',
 'protect-expiring'            => 'yn dod i ben am $1 (UTC)',
+'protect-expiry-indefinite'   => 'amhenodol',
 'protect-cascade'             => 'Diogelwch dudalennau sydd wedi eu cynnwys yn y dudalen hon (diogelu sgydol)',
 'protect-cantedit'            => "Ni allwch newid lefel diogelu'r dudalen hon, am nad yw'r gallu i olygu'r dudalen ganddoch.",
+'protect-othertime'           => 'Cyfnod arall:',
+'protect-othertime-op'        => 'cyfnod arall',
+'protect-existing-expiry'     => "Ar hyn o bryd daw'r gwarchod i ben am: $3, $2",
+'protect-otherreason'         => 'Rheswm arall:',
+'protect-otherreason-op'      => 'rheswm arall',
+'protect-dropdown'            => '*Rhesymau cyffredin dros ddiogelu
+** Fandaliaeth yn rhemp
+** Sbam yn rhemp
+** Ymrafael golygu gwrthgynhyrchiol
+** Tudalen aml ei defnydd',
+'protect-edit-reasonlist'     => "Golygu'r rhesymau dros ddiogelu",
+'protect-expiry-options'      => '2 awr:2 hours,ddiwrnod:1 day,3 niwrnod:3 days,wythnos:1 week,bythefnos:2 weeks,fis:1 month,3 mis:3 months,6 mis:6 months,flwyddyn:1 year,5 mlynedd:5 years,amhenodol:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Cyfyngiad:',
 'restriction-level'           => 'Lefel cyfyngu:',
 'minimum-size'                => 'Maint lleiaf',
@@ -1622,7 +1804,7 @@ Dyma'r gosodiadau diogelu cyfredol ar gyfer y dudalen <strong>$1</strong>:",
 'undeletepage'                 => 'Gweld ac adfer tudalennau dilëedig',
 'undeletepagetitle'            => "'''Dyma'r diwygiadau dilëedig o [[:$1|$1]]'''.",
 'viewdeletedpage'              => "Gweld tudalennau sydd wedi'u dileu",
-'undeletepagetext'             => "Mae'r tudalennau isod wedi cael eu dileu ond mae cofnod ohonynt o hyd yn yr archif, felly mae'n bosibl eu hadfer. 
+'undeletepagetext'             => "Mae'r {{PLURAL:$1|tudalennau|dudalen|tudalennau|tudalennau|tudalennau|tudalennau}} isod wedi cael eu dileu ond mae cofnod ohonynt o hyd yn yr archif, felly mae'n bosibl eu hadfer. 
 Gall yr archif gael ei glanhau o dro i dro.",
 'undelete-fieldset-title'      => 'Dewis ac adfer diwygiadau',
 'undeleteextrahelp'            => "I adfer hanes gyfan y dudalen, gadewch pob blwch ticio'n wag a phwyswch y botwm '''''Adfer'''''. I adfer rhai diwygiadau'n unig, ticiwch y blychau ar gyfer y diwygiadau yr ydych am eu hadfer, yna pwyswch ar '''''Adfer'''''. Os y pwyswch ar '''''Ailosod''''' bydd y blwch sylwadau a phob blwch ticio yn gwacáu.",
@@ -1632,13 +1814,14 @@ Os oes tudalen newydd o'r un enw wedi cael ei chreu ers y dilëad, fe ddangosir
 'undeleterevdel'               => "Ni fydd yr adfer yn cael ei chyflawni pe byddai peth o'r diwygiad blaen i'r dudalen neu'r ffeil yn cael ei dileu oherwydd yr adfer.
 Os hynny, rhaid i chi dad-ticio neu datguddio'r diwygiad dilëedig diweddaraf.",
 'undeletehistorynoadmin'       => "Mae'r dudalen hon wedi'i dileu. Dangosir y rheswm am y dileu isod, gyda manylion o'r holl ddefnyddwyr sydd wedi golygu'r dudalen cyn y dileu. Dim ond gweinyddwyr sydd yn gallu gweld testun y diwygiadau i'r dudalen.",
-'undelete-revision'            => 'Testun y golygiad gan $3 o $1 (fel ag yr oedd am $2), a ddilëwyd:',
+'undelete-revision'            => 'Testun y golygiad gan $3 o $1 (fel ag yr oedd am $5 ar $4), a ddilëwyd:',
 'undeleterevision-missing'     => "Y diwygiad yn annilys neu yn eisiau.
 Mae'n bosib bod nam ar y cyswllt, neu fod y diwygiad eisoes wedi ei adfer neu wedi ei ddileu o'r archif.",
 'undelete-nodiff'              => 'Ni chafwyd hyd i olygiad cynharach.',
 'undeletebtn'                  => 'Adfer!',
 'undeletelink'                 => 'adfer',
 'undeletereset'                => 'Ailosod',
+'undeleteinvert'               => "Troi'r dewis tu chwith",
 'undeletecomment'              => 'Sylwadau:',
 'undeletedarticle'             => 'wedi adfer "[[$1]]"',
 'undeletedrevisions'           => 'wedi adfer $1 {{PLURAL:$1|diwygiad|diwygiad|ddiwygiad|diwygiad|diwygiad|diwygiad}}',
@@ -1672,26 +1855,27 @@ $1',
 'blanknamespace' => '(Prif)',
 
 # Contributions
-'contributions' => "Cyfraniadau'r defnyddiwr",
-'mycontris'     => 'Fy nghyfraniadau',
-'contribsub2'   => 'Dros $1 ($2)',
-'nocontribs'    => "Heb ddod o hyd i newidiadau gyda'r maen prawf hwn.",
-'uctop'         => '(cyfredol)',
-'month'         => 'Cyfraniadau hyd at fis:',
-'year'          => 'Cyfraniadau hyd at y flwyddyn:',
-
-'sp-contributions-newbies'     => 'Dangos cyfraniadau gan gyfrifon newydd yn unig',
-'sp-contributions-newbies-sub' => 'Ar gyfer cyfrifon newydd',
-'sp-contributions-blocklog'    => 'Lòg blocio',
-'sp-contributions-search'      => 'Chwilio am gyfraniadau',
-'sp-contributions-username'    => 'Cyfeiriad IP neu enw defnyddiwr:',
-'sp-contributions-submit'      => 'Chwilier',
+'contributions'       => "Cyfraniadau'r defnyddiwr",
+'contributions-title' => "Cyfraniadau'r defnyddiwr $1",
+'mycontris'           => 'Fy nghyfraniadau',
+'contribsub2'         => 'Dros $1 ($2)',
+'nocontribs'          => "Heb ddod o hyd i newidiadau gyda'r maen prawf hwn.",
+'uctop'               => '(cyfredol)',
+'month'               => 'Cyfraniadau hyd at fis:',
+'year'                => 'Cyfraniadau hyd at y flwyddyn:',
+
+'sp-contributions-newbies'       => 'Dangos cyfraniadau gan gyfrifon newydd yn unig',
+'sp-contributions-newbies-sub'   => 'Ar gyfer cyfrifon newydd',
+'sp-contributions-newbies-title' => 'Cyfraniadau defnyddwyr newydd',
+'sp-contributions-blocklog'      => 'Lòg blocio',
+'sp-contributions-search'        => 'Chwilio am gyfraniadau',
+'sp-contributions-username'      => 'Cyfeiriad IP neu enw defnyddiwr:',
+'sp-contributions-submit'        => 'Chwilier',
 
 # What links here
 'whatlinkshere'            => "Beth sy'n cysylltu yma",
 'whatlinkshere-title'      => 'Tudalennau sy\'n cysylltu â "$1"',
 'whatlinkshere-page'       => 'Tudalen:',
-'linklistsub'              => '(Rhestr cysylltiadau)',
 'linkshere'                => "Mae'r tudalennau isod yn cysylltu â '''[[:$1]]''':",
 'nolinkshere'              => "Nid oes cyswllt ar unrhyw dudalen arall yn arwain at '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nid oes cyswllt ar unrhyw dudalen yn y parth dewisedig yn arwain at '''[[:$1]]'''.",
@@ -1708,15 +1892,15 @@ $1',
 'whatlinkshere-filters'    => 'Hidlau',
 
 # Block/unblock
-'blockip'                     => "Blocio'r defnyddiwr",
-'blockip-legend'              => "Blocio'r defnyddiwr",
-'blockiptext'                 => "Defnyddiwch y ffurflen isod i flocio cyfeiriad IP neu ddefnyddiwr rhag ysgrifennu i'r databas. Dylech chi ddim ond gwneud hyn er mwyn rhwystro fandaliaeth a chan ddilyn [[{{MediaWiki:Policy-url}}|polisi'r wici]]. Llenwch y rheswm am y bloc yn y blwch isod -- dywedwch pa dudalen sydd wedi cael ei fandaleiddio.",
-'ipaddress'                   => 'Cyfeiriad IP:',
-'ipadressorusername'          => 'Cyfeiriad IP neu enw defnyddiwr:',
-'ipbexpiry'                   => 'Am gyfnod o:',
-'ipbreason'                   => 'Rheswm:',
-'ipbreasonotherlist'          => 'Rheswm arall',
-'ipbreason-dropdown'          => '*Rhesymau cyffredin dros flocio
+'blockip'                         => "Blocio'r defnyddiwr",
+'blockip-legend'                  => "Blocio'r defnyddiwr",
+'blockiptext'                     => "Defnyddiwch y ffurflen isod i flocio cyfeiriad IP neu ddefnyddiwr rhag ysgrifennu i'r databas. Dylech chi ddim ond gwneud hyn er mwyn rhwystro fandaliaeth a chan ddilyn [[{{MediaWiki:Policy-url}}|polisi'r wici]]. Llenwch y rheswm am y bloc yn y blwch isod -- dywedwch pa dudalen sydd wedi cael ei fandaleiddio.",
+'ipaddress'                       => 'Cyfeiriad IP:',
+'ipadressorusername'              => 'Cyfeiriad IP neu enw defnyddiwr:',
+'ipbexpiry'                       => 'Am gyfnod:',
+'ipbreason'                       => 'Rheswm:',
+'ipbreasonotherlist'              => 'Rheswm arall',
+'ipbreason-dropdown'              => '*Rhesymau cyffredin dros flocio
 ** Gosod gwybodaeth anghywir
 ** Dileu cynnwys tudalennau
 ** Gosod cysylltiadau spam i wefannau eraill
@@ -1724,72 +1908,87 @@ $1',
 ** Ymddwyn yn fygythiol/tarfu
 ** Camddefnyddio cyfrifon niferus
 ** Enw defnyddiwr annerbyniol',
-'ipbanononly'                 => 'Blocio defnyddwyr anhysbys yn unig',
-'ipbcreateaccount'            => 'Atal y gallu i greu cyfrif',
-'ipbemailban'                 => 'Atal y defnyddiwr rhag anfon e-bost',
-'ipbenableautoblock'          => "Blocio'n awtomatig y cyfeiriad IP diwethaf y defnyddiodd y defnyddiwr hwn, ac unrhyw gyfeiriad IP arall y bydd yn ceisio defnyddio i olygu ohono.",
-'ipbsubmit'                   => 'Blociwch y defnyddiwr hwn',
-'ipbother'                    => 'Cyfnod arall:',
-'ipboptions'                  => 'o 2 awr:2 hours,o ddiwrnod:1 day,o 3 niwrnod:3 days,o wythnos:1 week,o bythefnos:2 weeks,o fis:1 month,o 3 mis:3 months,o 6 mis:6 months,o flwyddyn:1 year,o 5 mlynedd:5 years,amhenodol:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'arall',
-'ipbotherreason'              => 'Rheswm arall:',
-'ipbhidename'                 => "Cuddio'r enw defnyddiwr o'r lòg blocio, rhestr y blociau cyfredol a'r rhestr defnyddwyr",
-'ipbwatchuser'                => 'Gwylio tudalen defnyddiwr a thudalen sgwrs y defnyddiwr hwn',
-'badipaddress'                => 'Cyfeiriad IP annilys.',
-'blockipsuccesssub'           => 'Y blocio wedi llwyddo',
-'blockipsuccesstext'          => 'Mae cyfeiriad IP [[Special:Contributions/$1|$1]] wedi cael ei flocio.
+'ipbanononly'                     => 'Blocio defnyddwyr anhysbys yn unig',
+'ipbcreateaccount'                => 'Atal y gallu i greu cyfrif',
+'ipbemailban'                     => 'Atal y defnyddiwr rhag anfon e-bost',
+'ipbenableautoblock'              => "Blocio'n awtomatig y cyfeiriad IP diwethaf y defnyddiodd y defnyddiwr hwn, ac unrhyw gyfeiriad IP arall y bydd yn ceisio defnyddio i olygu ohono.",
+'ipbsubmit'                       => 'Blociwch y defnyddiwr hwn',
+'ipbother'                        => 'Cyfnod arall:',
+'ipboptions'                      => 'o 2 awr:2 hours,o ddiwrnod:1 day,o 3 niwrnod:3 days,o wythnos:1 week,o bythefnos:2 weeks,o fis:1 month,o 3 mis:3 months,o 6 mis:6 months,o flwyddyn:1 year,o 5 mlynedd:5 years,amhenodol:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'                  => 'arall',
+'ipbotherreason'                  => 'Rheswm arall:',
+'ipbhidename'                     => "Cuddio'r enw defnyddiwr o'r lòg blocio, rhestr y blociau cyfredol a'r rhestr defnyddwyr",
+'ipbwatchuser'                    => 'Gwylio tudalen defnyddiwr a thudalen sgwrs y defnyddiwr hwn',
+'ipballowusertalk'                => "Galluogi'r defnyddiwr hwn i olygu ei dudalen sgwrs ei hun tra bod bloc arno",
+'ipb-change-block'                => "Ailflocio'r defnyddiwr hwn gyda'r gosodiadau hyn",
+'badipaddress'                    => 'Cyfeiriad IP annilys.',
+'blockipsuccesssub'               => 'Y blocio wedi llwyddo',
+'blockipsuccesstext'              => 'Mae cyfeiriad IP [[Special:Contributions/$1|$1]] wedi cael ei flocio.
 <br />Gwelwch [[Special:IPBlockList|restr y blociau IP]] er mwyn arolygu blociau.',
-'ipb-edit-dropdown'           => "Golygu'r rhesymau dros flocio",
-'ipb-unblock-addr'            => 'Datflocio $1',
-'ipb-unblock'                 => 'Datflocio enw defnyddiwr neu cyfeiriad IP',
-'ipb-blocklist-addr'          => 'Y blociau cyfredol ar gyfer $1',
-'ipb-blocklist'               => 'Dangos y blociau cyfredol',
-'unblockip'                   => 'Dadflocio defnyddiwr',
-'unblockiptext'               => "Defnyddiwch y ffurflen isod i ail-alluogi golygiadau gan ddefnyddiwr neu o gyfeiriad IP a fu gynt wedi'i flocio.",
-'ipusubmit'                   => 'Datflociwch y cyfeiriad hwn',
-'unblocked'                   => 'Mae [[User:$1|$1]] wedi cael ei ddad-flocio',
-'unblocked-id'                => 'Tynnwyd y bloc $1',
-'ipblocklist'                 => "Cyfeiriadau IP ac enwau defnyddwyr sydd wedi'u blocio",
-'ipblocklist-legend'          => 'Dod o hyd i ddefnyddiwr sydd wedi ei flocio',
-'ipblocklist-username'        => "Enw'r defnyddiwr neu ei gyfeiriad IP:",
-'ipblocklist-submit'          => 'Chwilier',
-'blocklistline'               => '$1, $2 wedi blocio $3 ($4)',
-'infiniteblock'               => 'bloc parhaus',
-'expiringblock'               => 'yn dod i ben $1',
-'anononlyblock'               => 'ataliwyd dim ond pan nad yw wedi mewngofnodi',
-'noautoblockblock'            => 'analluogwyd blocio awtomatig',
-'createaccountblock'          => 'ataliwyd y gallu i greu cyfrif',
-'emailblock'                  => 'rhwystrwyd e-bostio',
-'ipblocklist-empty'           => "Mae'r rhestr blociau'n wag.",
-'ipblocklist-no-results'      => 'Nid yw cyfeiriad IP neu enw defnyddiwr yr ymholiad wedi ei flocio.',
-'blocklink'                   => 'blocio',
-'unblocklink'                 => 'dadflocio',
-'contribslink'                => 'cyfraniadau',
-'autoblocker'                 => 'Rydych chi wedi cael eich blocio yn awtomatig gan eich bod chi\'n rhannu cyfeiriad IP gyda "[[User:$1|$1]]". Dyma\'r rheswm a roddwyd dros flocio $1: "$2".',
-'blocklogpage'                => 'Lòg blociau',
-'blocklogentry'               => 'wedi blocio "[[$1]]" am gyfnod $2 $3',
-'blocklogtext'                => "Dyma lòg o'r holl weithredoedd blocio a datflocio. Nid yw'r cyfeiriadau IP sydd wedi cael eu blocio'n awtomatig ar y rhestr. Gweler [[Special:IPBlockList|rhestr y blociau IP]] am restr y blociau a'r gwaharddiadau sydd yn weithredol ar hyn o bryd.",
-'unblocklogentry'             => 'wedi dadflocio $1',
-'block-log-flags-anononly'    => 'defnyddwyr anhysbys yn unig',
-'block-log-flags-nocreate'    => 'analluogwyd creu cyfrif',
-'block-log-flags-noautoblock' => 'analluogwyd blocio awtomatig',
-'block-log-flags-noemail'     => 'analluogwyd e-bostio',
-'range_block_disabled'        => 'Ar hyn o bryd nid yw gweinyddwyr yn gallu blocio ystod o gyfeiriadau IP.',
-'ipb_expiry_invalid'          => 'Amser terfynu yn annilys.',
-'ipb_expiry_temp'             => "Rhaid i floc ar ddefnyddiwr fod yn barhaus os am guddio'r enw.",
-'ipb_already_blocked'         => 'Mae "$1" eisoes wedi ei flocio',
-'ipb_cant_unblock'            => "Gwall: Ni chafwyd hyd i'r bloc a'r ID $1.
+'ipb-edit-dropdown'               => "Golygu'r rhesymau dros flocio",
+'ipb-unblock-addr'                => 'Datflocio $1',
+'ipb-unblock'                     => 'Datflocio enw defnyddiwr neu cyfeiriad IP',
+'ipb-blocklist-addr'              => 'Y blociau cyfredol ar gyfer $1',
+'ipb-blocklist'                   => 'Dangos y blociau cyfredol',
+'ipb-blocklist-contribs'          => 'Cyfraniadau $1',
+'unblockip'                       => 'Dadflocio defnyddiwr',
+'unblockiptext'                   => "Defnyddiwch y ffurflen isod i ail-alluogi golygiadau gan ddefnyddiwr neu o gyfeiriad IP a fu gynt wedi'i flocio.",
+'ipusubmit'                       => "Tynnu'r bloc",
+'unblocked'                       => 'Mae [[User:$1|$1]] wedi cael ei ddad-flocio',
+'unblocked-id'                    => 'Tynnwyd y bloc $1',
+'ipblocklist'                     => "Cyfeiriadau IP ac enwau defnyddwyr sydd wedi'u blocio",
+'ipblocklist-legend'              => 'Dod o hyd i ddefnyddiwr sydd wedi ei flocio',
+'ipblocklist-username'            => "Enw'r defnyddiwr neu ei gyfeiriad IP:",
+'ipblocklist-sh-userblocks'       => '$1 blociau parhaus ar gyfrifon',
+'ipblocklist-sh-tempblocks'       => '$1 blociau dros dro',
+'ipblocklist-sh-addressblocks'    => '$1 blociau IP unigol',
+'ipblocklist-submit'              => 'Chwilier',
+'blocklistline'                   => '$1, $2 wedi blocio $3 ($4)',
+'infiniteblock'                   => 'bloc parhaus',
+'expiringblock'                   => 'yn dod i ben $1',
+'anononlyblock'                   => 'ataliwyd dim ond pan nad yw wedi mewngofnodi',
+'noautoblockblock'                => 'analluogwyd blocio awtomatig',
+'createaccountblock'              => 'ataliwyd y gallu i greu cyfrif',
+'emailblock'                      => 'rhwystrwyd e-bostio',
+'blocklist-nousertalk'            => 'ni all olygu ei dudalen sgwrs ei hun',
+'ipblocklist-empty'               => "Mae'r rhestr blociau'n wag.",
+'ipblocklist-no-results'          => 'Nid yw cyfeiriad IP neu enw defnyddiwr yr ymholiad wedi ei flocio.',
+'blocklink'                       => 'blocio',
+'unblocklink'                     => 'dadflocio',
+'change-blocklink'                => 'newid y bloc',
+'contribslink'                    => 'cyfraniadau',
+'autoblocker'                     => 'Rydych chi wedi cael eich blocio yn awtomatig gan eich bod chi\'n rhannu cyfeiriad IP gyda "[[User:$1|$1]]". Dyma\'r rheswm a roddwyd dros flocio $1: "$2".',
+'blocklogpage'                    => 'Lòg blociau',
+'blocklog-fulllog'                => 'Lòg blocio llawn',
+'blocklogentry'                   => 'wedi blocio "[[$1]]" am gyfnod $2 $3',
+'reblock-logentry'                => 'wedi newid y gosodiadau blocio ar [[$1]], gan ddod i ben am $2 $3',
+'blocklogtext'                    => "Dyma lòg o'r holl weithredoedd blocio a datflocio. Nid yw'r cyfeiriadau IP sydd wedi cael eu blocio'n awtomatig ar y rhestr. Gweler [[Special:IPBlockList|rhestr y blociau IP]] am restr y blociau a'r gwaharddiadau sydd yn weithredol ar hyn o bryd.",
+'unblocklogentry'                 => 'wedi dadflocio $1',
+'block-log-flags-anononly'        => 'defnyddwyr anhysbys yn unig',
+'block-log-flags-nocreate'        => 'analluogwyd creu cyfrif',
+'block-log-flags-noautoblock'     => 'analluogwyd blocio awtomatig',
+'block-log-flags-noemail'         => 'analluogwyd e-bostio',
+'block-log-flags-nousertalk'      => 'ni all olygu ei dudalen sgwrs ei hun',
+'block-log-flags-angry-autoblock' => 'galluogwyd blocio awtomatig uwch',
+'range_block_disabled'            => 'Ar hyn o bryd nid yw gweinyddwyr yn gallu blocio ystod o gyfeiriadau IP.',
+'ipb_expiry_invalid'              => 'Amser terfynu yn annilys.',
+'ipb_expiry_temp'                 => "Rhaid i floc ar ddefnyddiwr fod yn barhaus os am guddio'r enw.",
+'ipb_already_blocked'             => 'Mae "$1" eisoes wedi ei flocio',
+'ipb-needreblock'                 => "== Wedi blocio'n barod ==
+Mae $1 wedi ei flocio'n barod. Ydych chi am newid y gosodiadau?",
+'ipb_cant_unblock'                => "Gwall: Ni chafwyd hyd i'r bloc a'r ID $1.
 Hwyrach ei fod wedi ei ddad-flocio'n barod.",
-'ipb_blocked_as_range'        => "Gwall: Nid yw'r IP $1 wedi ei blocio'n uniongyrchol ac felly ni ellir ei datflocio. Wedi dweud hynny, y mae'n rhan o'r amrediad $2 sydd wedi ei blocio; gellir datflocio'r amrediad.",
-'ip_range_invalid'            => 'Dewis IP annilys.',
-'blockme'                     => 'Blocier fi',
-'proxyblocker'                => 'Dirprwy-flociwr',
-'proxyblocker-disabled'       => 'Analluogwyd y swyddogaeth hon.',
-'proxyblockreason'            => "Mae eich cyfeiriad IP wedi'i flocio gan ei fod yn ddirprwy agored (open proxy). Cysylltwch â'ch gweinyddwr rhyngrwyd neu gymorth technegol er mwyn eu hysbysu am y broblem ddifrifol yma.",
-'proxyblocksuccess'           => 'Wedi llwyddo.',
-'sorbsreason'                 => 'Mae eich cyfeiriad IP wedi cael ei osod ymhlith y dirprwyon agored ar y Rhestr DNS Gwaharddedig a ddefnyddir gan {{SITENAME}}.',
-'sorbs_create_account_reason' => 'Mae eich cyfeiriad IP wedi cael ei osod ymhlith y dirprwyon agored ar y Rhestr DNS Gwaharddedig a ddefnyddir gan {{SITENAME}}.
+'ipb_blocked_as_range'            => "Gwall: Nid yw'r IP $1 wedi ei blocio'n uniongyrchol ac felly ni ellir ei datflocio. Wedi dweud hynny, y mae'n rhan o'r amrediad $2 sydd wedi ei blocio; gellir datflocio'r amrediad.",
+'ip_range_invalid'                => 'Dewis IP annilys.',
+'blockme'                         => 'Blocier fi',
+'proxyblocker'                    => 'Dirprwy-flociwr',
+'proxyblocker-disabled'           => 'Analluogwyd y swyddogaeth hon.',
+'proxyblockreason'                => "Mae eich cyfeiriad IP wedi'i flocio gan ei fod yn ddirprwy agored (open proxy). Cysylltwch â'ch gweinyddwr rhyngrwyd neu gymorth technegol er mwyn eu hysbysu am y broblem ddifrifol yma.",
+'proxyblocksuccess'               => 'Wedi llwyddo.',
+'sorbsreason'                     => 'Mae eich cyfeiriad IP wedi cael ei osod ymhlith y dirprwyon agored ar y Rhestr DNS Gwaharddedig a ddefnyddir gan {{SITENAME}}.',
+'sorbs_create_account_reason'     => 'Mae eich cyfeiriad IP wedi cael ei osod ymhlith y dirprwyon agored ar y Rhestr DNS Gwaharddedig a ddefnyddir gan {{SITENAME}}.
 Ni allwch greu cyfrif.',
+'cant-block-while-blocked'        => 'Ni allwch flocio defnyddwyr eraill tra bod bloc arnoch chithau.',
 
 # Developer tools
 'lockdb'              => "Cloi'r databas",
@@ -1809,9 +2008,9 @@ Cofiwch [[Special:UnlockDB|ddatgloi'r]] databas pan fydd y gwaith cynnal ar ben.
 'databasenotlocked'   => "Nid yw'r databas ar glo.",
 
 # Move page
-'move-page'               => 'Symud $1',
-'move-page-legend'        => 'Symud tudalen',
-'movepagetext'            => "Wrth ddefnyddio'r ffurflen isod byddwch yn ail-enwi tudalen, gan symud ei hanes gyfan i'r enw newydd.
+'move-page'                 => 'Symud $1',
+'move-page-legend'          => 'Symud tudalen',
+'movepagetext'              => "Wrth ddefnyddio'r ffurflen isod byddwch yn ail-enwi tudalen, gan symud ei hanes gyfan i'r enw newydd.
 Bydd yr hen deitl yn troi'n dudalen ail-gyfeirio i'r teitl newydd.
 Gallwch ddewis bod y meddalwedd yn cywiro tudalennau ailgyfeirio oedd yn arwain at yr hen deitl yn awtomatig.
 Os nad ydych yn dewis hyn, yna byddwch gystal â thrwsio [[Special:DoubleRedirects|ail-gyfeiriadau dwbl]] ac [[Special:BrokenRedirects|ail-gyfeiriadau tor]] eich hunan.
@@ -1824,44 +2023,56 @@ Hefyd, mae'n amhosibl ysgrifennu dros ben tudalen sydd yn bodoli'n barod.
 '''DALIER SYLW!'''
 Gall hwn fod yn newid sydyn a llym i dudalen boblogaidd;
 gnewch yn siwr eich bod chi'n deall y canlyniadau cyn mynd ati.",
-'movepagetalktext'        => "Bydd y dudalen sgwrs yn symud gyda'r dudalen hon '''onibai:'''
+'movepagetalktext'          => "Bydd y dudalen sgwrs yn symud gyda'r dudalen hon '''onibai:'''
 *bod tudalen sgwrs wrth yr enw newydd yn bodoli'n barod
 *bod y blwch isod heb ei farcio.
 
 Os felly, gallwch symud y dudalen sgwrs neu ei gyfuno ar ôl symud y dudalen ei hun.",
-'movearticle'             => 'Symud y dudalen:',
-'movenotallowed'          => 'Nid oes caniatâd gennych i symud tudalennau.',
-'newtitle'                => "I'r teitl newydd:",
-'move-watch'              => 'Gwylier y dudalen hon',
-'movepagebtn'             => 'Symud tudalen',
-'pagemovedsub'            => 'Y symud wedi llwyddo',
-'movepage-moved'          => '<big>\'\'\'Symudwyd y dudalen "$1" i "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "Mae tudalen gyda'r darpar enw yn bodoli'n barod, neu mae eich darpar enw yn annilys.
+'movearticle'               => 'Symud y dudalen:',
+'movenologin'               => 'Nid ydych wedi mewngofnodi',
+'movenologintext'           => "Mae'n rhaid bod yn ddefnyddiwr cofrestredig a'ch bod wedi [[Special:UserLogin|mewngofnodi]] cyn medru symud tudalen.",
+'movenotallowed'            => 'Nid oes caniatâd gennych i symud tudalennau.',
+'movenotallowedfile'        => "Nid yw'r gallu ganddoch i symud ffeiliau.",
+'cant-move-user-page'       => "Nid yw'r gallu ganddoch i symud tudalennau defnyddwyr (heblaw am isdudalennau).",
+'cant-move-to-user-page'    => "Nid yw'r gallu ganddoch i symud tudalen i dudalen defnyddiwr (heblaw am i isdudalen defnyddiwr).",
+'newtitle'                  => "I'r teitl newydd:",
+'move-watch'                => 'Gwylier y dudalen hon',
+'movepagebtn'               => 'Symud y dudalen',
+'pagemovedsub'              => 'Y symud wedi llwyddo',
+'movepage-moved'            => '<big>\'\'\'Symudwyd y dudalen "$1" i "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'   => 'Gosodwyd ail-gyfeiriad.',
+'movepage-moved-noredirect' => 'Ni osodwyd tudalen ailgyfeirio.',
+'articleexists'             => "Mae tudalen gyda'r darpar enw yn bodoli'n barod, neu mae eich darpar enw yn annilys.
 Dewiswch enw arall os gwelwch yn dda.",
-'talkexists'              => "'''Mae'r dudalen wedi'i symud yn llwyddiannus, ond nid oedd hi'n bosibl symud y dudalen sgwrs oherwydd bod yna dudalen sgwrs gyda'r enw newydd yn bodoli'n barod. Cyfunwch y ddwy dudalen, os gwelwch yn dda.'''",
-'movedto'                 => 'symud i',
-'movetalk'                => 'Symud y dudalen sgwrs hefyd',
-'move-subpages'           => 'Symud unrhyw is-dudalennau',
-'move-talk-subpages'      => "Symud unrhyw is-dudalennau i'r dudalen sgwrs",
-'movepage-page-exists'    => "Mae'r dudalen $1 eisoes ar gael ac ni ellir ysgrifennu drosto yn awtomatig.",
-'movepage-page-moved'     => 'Symudwyd y dudalen $1 i $2.',
-'movepage-page-unmoved'   => 'Ni ellid symud y dudalen $1 i $2.',
-'movepage-max-pages'      => 'Symudwyd yr uchafswm o $1 {{PLURAL:$1|tudalen|dudalen|dudalen|tudalen|thudalen|tudalen}} y gellir eu symud yn awtomatig.',
-'1movedto2'               => 'wedi symud [[$1]] i [[$2]]',
-'1movedto2_redir'         => 'Wedi symud [[$1]] i [[$2]] trwy ailgyfeiriad.',
-'movelogpage'             => 'Lòg symud tudalennau',
-'movelogpagetext'         => "Isod mae rhestr y tudalennau sydd wedi'u symud",
-'movereason'              => 'Rheswm:',
-'revertmove'              => 'symud nôl',
-'delete_and_move'         => 'Dileu a symud',
-'delete_and_move_text'    => "==Angen dileu==
+'talkexists'                => "'''Mae'r dudalen wedi'i symud yn llwyddiannus, ond nid oedd hi'n bosibl symud y dudalen sgwrs oherwydd bod yna dudalen sgwrs gyda'r enw newydd yn bodoli'n barod. Cyfunwch y ddwy dudalen, os gwelwch yn dda.'''",
+'movedto'                   => 'symud i',
+'movetalk'                  => 'Symud y dudalen sgwrs hefyd',
+'move-subpages'             => 'Symud unrhyw is-dudalennau',
+'move-talk-subpages'        => "Symud unrhyw is-dudalennau i'r dudalen sgwrs",
+'movepage-page-exists'      => "Mae'r dudalen $1 eisoes ar gael ac ni ellir ysgrifennu drosto yn awtomatig.",
+'movepage-page-moved'       => 'Symudwyd y dudalen $1 i $2.',
+'movepage-page-unmoved'     => 'Ni ellid symud y dudalen $1 i $2.',
+'movepage-max-pages'        => 'Symudwyd yr uchafswm o $1 {{PLURAL:$1|tudalen|dudalen|dudalen|tudalen|thudalen|tudalen}} y gellir eu symud yn awtomatig.',
+'1movedto2'                 => 'wedi symud [[$1]] i [[$2]]',
+'1movedto2_redir'           => 'Wedi symud [[$1]] i [[$2]] trwy ailgyfeiriad.',
+'move-redirect-suppressed'  => 'ataliwyd ailgyfeirio',
+'movelogpage'               => 'Lòg symud tudalennau',
+'movelogpagetext'           => "Isod mae rhestr y tudalennau sydd wedi'u symud",
+'movereason'                => 'Rheswm:',
+'revertmove'                => 'symud nôl',
+'delete_and_move'           => 'Dileu a symud',
+'delete_and_move_text'      => "==Angen dileu==
 
 Mae'r erthygl \"[[:\$1]]\" yn bodoli'n barod. Ydych chi am ddileu'r erthygl er mwyn cwblhau'r symudiad?",
-'delete_and_move_confirm' => "Ie, dileu'r dudalen",
-'delete_and_move_reason'  => "Wedi'i dileu er mwyn symud tudalen arall yn ei lle.",
-'selfmove'                => "Mae'r teitlau hen a newydd yn union yr un peth;
+'delete_and_move_confirm'   => "Ie, dileu'r dudalen",
+'delete_and_move_reason'    => "Wedi'i dileu er mwyn symud tudalen arall yn ei lle.",
+'selfmove'                  => "Mae'r teitlau hen a newydd yn union yr un peth;
 nid yw'n bosib cyflawnu'r symud.",
-'immobile_namespace'      => "Mae teitl y dudalen gwreiddiol neu'r cyrchfan yn arbennig; ni ellir symud tudalennau i'r parth hwnnw nag oddi wrtho.",
+'immobile-source-namespace' => 'Ni ellir symud tudalennau yn y parth "$1".',
+'immobile-target-namespace' => 'Ni ellir symud tudalennau i\'r parth "$1".',
+'immobile-source-page'      => 'Ni ellir symud y dudalen hon.',
+'fix-double-redirects'      => "Yn diwygio unrhyw ailgyfeiriadau sy'n cysylltu i'r teitl gwreiddiol",
+'move-leave-redirect'       => 'Gadael ailgyfeiriad ar ôl',
 
 # Export
 'export'            => 'Allforio tudalennau',
@@ -1869,7 +2080,7 @@ nid yw'n bosib cyflawnu'r symud.",
 
 I allforio tudalennau, teipiwch y teitlau yn y bocs testun isod, bobi linell i'r teitlau; a dewis p'un ai ydych chi eisiau'r diwygiad presennol a'r holl fersiynnau blaenorol, gyda hanes y dudalen; ynteu a ydych am y diwygiad presennol a'r wybodaeth am y golygiad diweddaraf yn unig.
 
-Yn achos yr ail ddewis, mae modd defnyddio cyswllt, e.e. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] ar gyfer y dudalen \"[[{{MediaWiki:Mainpage}}]]\".",
+Yn achos yr ail ddewis, mae modd defnyddio cyswllt, e.e. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] ar gyfer y dudalen \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Cynnwys y diwygiad diweddaraf yn unig, nid yr hanes llawn',
 'exportnohistory'   => "----
 '''Sylwer:''' er mwyn peidio â gor-lwytho'r gweinydd, analluogwyd allforio hanes llawn y tudalennau.",
@@ -1885,7 +2096,7 @@ Yn achos yr ail ddewis, mae modd defnyddio cyswllt, e.e. [[{{ns:special}}:Export
 'allmessagesdefault'        => 'Testun rhagosodedig',
 'allmessagescurrent'        => 'Testun cyfredol',
 'allmessagestext'           => "Dyma restr o'r holl negeseuon yn y parth MediaWici.
-Os ydych am gyfrannu at y gwaith o gyfieithu ar gyfer holl prosiectau MediaWiki ar y cyd, mae croeso i chi ymweld â [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] a [http://translatewiki.net Betawiki].",
+Os ydych am gyfrannu at y gwaith o gyfieithu ar gyfer holl prosiectau MediaWiki ar y cyd, mae croeso i chi ymweld â [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] a [http://translatewiki.net translatewiki.net].",
 'allmessagesnotsupportedDB' => "Nid yw '''{{ns:special}}:PobNeges''' yn cael ei gynnal gan fod '''\$wgUseDatabaseMessages''' wedi ei ddiffodd.",
 'allmessagesfilter'         => 'Hidl enw neges:',
 'allmessagesmodified'       => 'Dangos y rhai a ddiwygiwyd yn unig',
@@ -1902,13 +2113,18 @@ Os ydych am gyfrannu at y gwaith o gyfieithu ar gyfer holl prosiectau MediaWiki
 # Special:Import
 'import'                     => 'Mewnforio tudalennau',
 'importinterwiki'            => 'Mewnforiad traws-wici',
+'import-interwiki-source'    => 'Wici/tudalen y gwreiddiol:',
+'import-interwiki-history'   => 'Copïer yr holl fersiynau yn hanes y dudalen hon',
 'import-interwiki-submit'    => 'Mewnforio',
 'import-interwiki-namespace' => 'Parth y cyrchir ato:',
+'import-upload-filename'     => "Enw'r ffeil:",
+'import-comment'             => 'Sylw:',
 'importtext'                 => "Os gwelwch yn dda, allforiwch y ffeil o'r wici gwreiddiol gan ddefnyddio'r nodwedd <b>Special:Export</b>, cadwch hi i'ch disg, ac uwchlwythwch hi fan hyn.",
 'importstart'                => "Wrthi'n mewnforio...",
 'import-revision-count'      => '$1 {{PLURAL:$1|diwygiad|diwygiad|ddiwygiad|diwygiad|diwygiad|diwygiad}}',
 'importnopages'              => "Dim tudalennau i gael i'w mewnforio.",
 'importfailed'               => 'Mewnforio wedi methu: $1',
+'importunknownsource'        => "Y gwreiddiol i'w fewnforio o fath anhysbys",
 'importcantopen'             => "Ni ellid agor y ffeil i'w fewnforio",
 'importbadinterwiki'         => 'Cyswllt rhyngwici gwallus',
 'importnotext'               => 'Gwag, neu heb destun',
@@ -1916,27 +2132,39 @@ Os ydych am gyfrannu at y gwaith o gyfieithu ar gyfer holl prosiectau MediaWiki
 'importhistoryconflict'      => "Mae adolygiadau yn yr hanes yn croesgyffwrdd (efallai eich bod chi wedi mewnforio'r dudalen o'r blaen)",
 'importnosources'            => "Ni ddiffiniwyd unrhyw ffynonellau mewnforio traws-wici, ac mae uwchlwytho hanesion yn uniongyrchol wedi'i analluogi.",
 'importnofile'               => 'Ni uwchlwythwyd unrhyw ffeil mewnforio.',
+'importuploaderrorsize'      => "Methodd yr uwchlwytho.
+Mae'r ffeil yn fwy na'r maint y gellir ei uwchlwytho.",
+'importuploaderrorpartial'   => "Methodd yr uwchlwytho.
+Dim ond rhan o'r ffeil sydd wedi ei huwchlwytho.",
+'importuploaderrortemp'      => 'Methodd yr uwchlwytho.
+Mae ffolder dros dro yn eisiau.',
+'import-noarticle'           => "Ni chafwyd tudalen i'w mewnforio!",
+'import-nonewrevisions'      => "Mae'r holl ddiwygiadau eisoes wedi eu mewnforio.",
 'xml-error-string'           => '$1 ar linell $2, col $3 (beit $4): $5',
+'import-upload'              => 'Uwchlwytho data XML',
+'import-token-mismatch'      => "Collwyd data'r sesiwn. Ceisiwch eto.",
+'import-invalid-interwiki'   => "Ni ellir uwchlwytho o'r wici dewisedig.",
 
 # Import log
 'importlogpage'                    => 'Lòg mewnforio',
+'import-logentry-upload'           => 'wedi mewnforio [[$1]] trwy uwchlwytho ffeil',
 'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|diwygiad|diwygiad|ddiwygiad|diwygiad|diwygiad|diwygiad}}',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|diwygiad|diwygiad|ddiwygiad|diwygiad|diwygiad|diwygiad}} o $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Fy nhudalen defnyddiwr',
+'tooltip-pt-userpage'             => 'Eich tudalen defnyddiwr',
 'tooltip-pt-anonuserpage'         => 'Y tudalen defnyddiwr ar gyfer y cyfeiriad IP yr ydych yn ei ddefnyddio wrth olygu',
-'tooltip-pt-mytalk'               => 'Fy nhudalen sgwrs',
+'tooltip-pt-mytalk'               => 'Eich tudalen sgwrs',
 'tooltip-pt-anontalk'             => "Sgwrs ynglŷn â golygiadau o'r cyfeiriad IP hwn",
 'tooltip-pt-preferences'          => 'Fy newisiadau',
 'tooltip-pt-watchlist'            => 'Rydych yn dilyn hynt y tudalennau sydd ar y rhestr hon',
-'tooltip-pt-mycontris'            => 'Fy nghyfraniadau yn nhrefn amser',
+'tooltip-pt-mycontris'            => 'Rhestr eich cyfraniadau yn nhrefn amser',
 'tooltip-pt-login'                => "Fe'ch anogir i fewngofnodi, er nad oes rhaid gwneud.",
 'tooltip-pt-anonlogin'            => "Fe'ch anogir i fewngofnodi, er nad oes rhaid gwneud.",
 'tooltip-pt-logout'               => 'Allgofnodi',
 'tooltip-ca-talk'                 => 'Sgwrsio am y dudalen',
 'tooltip-ca-edit'                 => "Gallwch olygu'r dudalen hon. Da o beth fyddai defnyddio'r botwm 'Dangos rhagolwg' cyn rhoi ar gadw.",
-'tooltip-ca-addsection'           => "Ychwanegu sylw i'r drafodaeth",
+'tooltip-ca-addsection'           => 'Ychwanegu adran newydd',
 'tooltip-ca-viewsource'           => "Mae'r dudalen hon wedi'i diogelu. Gallwch weld y côd yma.",
 'tooltip-ca-history'              => "Fersiynau cynt o'r dudalen hon.",
 'tooltip-ca-protect'              => "Diogelu'r dudalen hon",
@@ -1983,6 +2211,9 @@ Os ydych am gyfrannu at y gwaith o gyfieithu ar gyfer holl prosiectau MediaWiki
 'tooltip-watch'                   => "Ychwanegu'r dudalen hon at eich rhestr gwylio",
 'tooltip-recreate'                => "Ail-greu'r dudalen serch iddi gael ei dileu",
 'tooltip-upload'                  => 'Dechrau uwchlwytho',
+'tooltip-rollback'                => "Yn troi golygiad(au) y defnyddiwr diwethaf i'r dudalen hon yn ôl gydag un clic.",
+'tooltip-undo'                    => 'Mae "dadwneud" yn troi\'r golygiad hwn yn ôl ac yn dangos rhagolwg o\'r golygiad adferedig.
+Gellir ychwanegu rheswm dros y dadwneud yn y crynodeb.',
 
 # Metadata
 'nodublincore'      => "Mae metadata RDF 'Dublin Core' wedi cael ei analluogi ar y gwasanaethwr hwn.",
@@ -1990,12 +2221,12 @@ Os ydych am gyfrannu at y gwaith o gyfieithu ar gyfer holl prosiectau MediaWiki
 'notacceptable'     => "Dydy gweinydd y wici ddim yn medru rhoi'r data mewn fformat darllenadwy i'ch cleient.",
 
 # Attribution
-'anonymous'        => 'Defnyddwyr anhysbys {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Defnyddiwr|Defnyddiwr|Defnyddwyr|Defnyddwyr|Defnyddwyr|Defnyddwyr}} anhysbys {{SITENAME}}',
 'siteuser'         => 'Defnyddiwr {{SITENAME}} $1',
 'lastmodifiedatby' => 'Newidiwyd y dudalen hon ddiwethaf $2, $1 gan $3', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Yn seiliedig ar waith gan $1.',
 'others'           => 'eraill',
-'siteusers'        => 'Defnyddwyr {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Defnyddiwr|Defnyddiwr|Defnyddwyr|Defnyddwyr|Defnyddwyr|Defnyddwyr}} {{SITENAME}} $1',
 'creditspage'      => "Cydnabyddiaethau'r dudalen",
 'nocredits'        => "Does dim cydnabyddiaethau i'r dudalen hon.",
 
@@ -2016,6 +2247,11 @@ Achos hyn yn fwy na thebyg yw presenoldeb cysylltiad i wefan ar y rhestr gwahard
 'numauthors'     => "Nifer yr awduron (o'r dudalen): $1",
 'numtalkauthors' => "Nifer yr awduron (o'r dudalen sgwrs): $1",
 
+# Skin names
+'skinname-standard'    => 'Safonol',
+'skinname-nostalgia'   => 'Hiraeth',
+'skinname-cologneblue' => 'Glas Cwlen',
+
 # Math options
 'mw_math_png'    => 'Arddangos symbolau mathemateg fel delwedd PNG bob amser',
 'mw_math_simple' => 'HTML os yn syml iawn, PNG fel arall',
@@ -2025,14 +2261,21 @@ Achos hyn yn fwy na thebyg yw presenoldeb cysylltiad i wefan ar y rhestr gwahard
 'mw_math_mathml' => 'MathML os yn bosib (arbrofol)',
 
 # Patrolling
+'markedaspatrolled'                   => 'Gosodwyd marc ei bod wedi derbyn ymweliad patrôl',
+'markedaspatrolledtext'               => 'Wedi gosod marc bod y golygiad dewisedig wedi derbyn ymweliad patrôl.',
 'rcpatroldisabled'                    => "Patrol y Newidiadau Diweddar wedi'i analluogi",
 'rcpatroldisabledtext'                => 'Analluogwyd y nodwedd Patrol y Newidiadau Diweddar.',
+'markedaspatrollederror'              => 'Ni ellir gosod marc ymweliad patrôl',
+'markedaspatrollederrortext'          => "Rhaid nodi'r union olygiad sydd angen marc ymweliad patrôl.",
 'markedaspatrollederror-noautopatrol' => "Ni chaniateir i chi farcio'ch newidiadau eich hunan fel rhai derbyniol.",
 
 # Patrol log
-'patrol-log-page' => 'Lòg patrolio',
-'patrol-log-line' => 'wedi marcio bod fersiwn $1 o $2 wedi derbyn ymweliad patrôl $3',
-'patrol-log-auto' => '(awtomatig)',
+'patrol-log-page'      => 'Lòg patrolio',
+'patrol-log-header'    => "Mae'r lòg hwn yn dangos y golygiadau sydd wedi derbyn ymweliad patrôl.",
+'patrol-log-line'      => 'wedi marcio bod $1 o $2 wedi derbyn ymweliad patrôl $3',
+'patrol-log-auto'      => '(awtomatig)',
+'patrol-log-diff'      => 'golygiad $1',
+'log-show-hide-patrol' => '$1 lòg patrolio',
 
 # Image deletion
 'deletedrevision'                 => 'Wedi dileu hen ddiwygiad $1.',
@@ -2049,6 +2292,9 @@ $1",
 'previousdiff' => '� Y fersiwn gynt',
 'nextdiff'     => 'Y fersiwn dilynol →',
 
+# Visual comparison
+'visual-comparison' => "Cymharu â'r llygad",
+
 # Media information
 'mediawarning'         => "'''Rhybudd''': Gallasai'r ffeil hon gynnwys côd maleisus; os ydyw mae'n bosib y bydd eich cyfrifiadur yn cael ei danseilio wrth lwytho'r ffeil.
 <hr />",
@@ -2062,10 +2308,12 @@ $1",
 'show-big-image'       => 'Maint llawn',
 'show-big-image-thumb' => '<small>Maint y rhagolwg: $1 × $2 picsel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Oriel y ffeiliau newydd',
 'imagelisttext'         => "Isod mae rhestr {{PLURAL:$1|gwag o ffeiliau|o '''$1''' ffeil|o '''$1''' ffeil wedi'u trefnu $2|o '''$1''' ffeil wedi'u trefnu $2|o '''$1''' o ffeiliau wedi'u trefnu $2|o '''$1''' o ffeiliau wedi'u trefnu $2|}}.",
 'newimages-summary'     => "Mae'r dudalen arbennig hon yn dangos y ffeiliau a uwchlwythwyd yn ddiweddar.",
+'newimages-legend'      => 'Hidlo',
+'newimages-label'       => "Enw'r ffeil (neu ran ohono):",
 'showhidebots'          => '($1 botiau)',
 'noimages'              => "Does dim byd i'w weld.",
 'ilsubmit'              => 'Chwilio',
@@ -2170,6 +2418,7 @@ Cuddir y meysydd eraill trwy ragosodiad.
 'exif-contrast'                    => 'Cyferbyniad',
 'exif-saturation'                  => 'Dirlawnder',
 'exif-sharpness'                   => 'Eglurder',
+'exif-devicesettingdescription'    => "Disgrifiad o osodiadau'r ddyfais",
 'exif-imageuniqueid'               => 'ID unigryw y ddelwedd',
 'exif-gpslatituderef'              => "Lledred i'r Gogledd neu i'r De",
 'exif-gpslatitude'                 => 'Lledred',
@@ -2186,10 +2435,15 @@ Cuddir y meysydd eraill trwy ragosodiad.
 'exif-gpsspeed'                    => 'Cyflymder y derbynnydd GPS',
 'exif-gpstrack'                    => 'Cyfeiriad symud',
 'exif-gpsimgdirection'             => 'Cyfeiriad y ddelwedd',
+'exif-gpsdestlatitude'             => 'Lledred y cyrchfan',
+'exif-gpsdestlongitude'            => 'Hydred y cyrchfan',
 'exif-gpsdestdistance'             => 'Pellter i ben y daith',
 'exif-gpsareainformation'          => "Enw'r parth GPS",
 'exif-gpsdatestamp'                => 'Dyddiad GPS',
 
+# EXIF attributes
+'exif-compression-1' => 'Heb ei gywasgu',
+
 'exif-unknowndate' => 'Dyddiad anhysbys',
 
 'exif-orientation-1' => 'Normal', # 0th row: top; 0th column: left
@@ -2204,7 +2458,14 @@ Cuddir y meysydd eraill trwy ragosodiad.
 'exif-componentsconfiguration-0' => "ddim i'w gael",
 
 'exif-exposureprogram-0' => 'Heb ei gosod',
+'exif-exposureprogram-1' => 'Hunan-ddewis',
 'exif-exposureprogram-2' => 'Rhaglen normal',
+'exif-exposureprogram-3' => 'Hunan-ddewis yr agorfa',
+'exif-exposureprogram-4' => 'Hunan-ddewis cyflymder y caead',
+'exif-exposureprogram-5' => 'Rhaglen creadigol (blaenoriaeth i ddyfnder ffocws)',
+'exif-exposureprogram-6' => 'Rhaglen digwyddiad (yn tueddu at gyflymder caead uchel)',
+'exif-exposureprogram-7' => "Modd portread (ar gyfer lluniau agos a'r cefndir yn aneglur)",
+'exif-exposureprogram-8' => 'Modd tirlun (ar gyfer tirluniau wedi ffocysu ar y cefndir)',
 
 'exif-subjectdistance-value' => '$1 medr',
 
@@ -2219,25 +2480,37 @@ Cuddir y meysydd eraill trwy ragosodiad.
 
 'exif-lightsource-0'   => 'Anhysbys',
 'exif-lightsource-1'   => 'Golau dydd',
-'exif-lightsource-2'   => 'Fflworoleuol',
+'exif-lightsource-2'   => 'Fflworolau',
+'exif-lightsource-3'   => 'Twngsten (golau gwynias)',
 'exif-lightsource-4'   => 'Fflach',
 'exif-lightsource-9'   => 'Tywydd braf',
 'exif-lightsource-10'  => 'Tywydd cymylog',
 'exif-lightsource-11'  => 'Cysgod',
+'exif-lightsource-12'  => 'Fflworolau golau dydd (D 5700 – 7100K)',
+'exif-lightsource-13'  => 'Fflworolau gwyn golau dydd (N 4600 – 5400K)',
+'exif-lightsource-14'  => 'Fflworolau gwyn oeraidd (W 3900 – 4500K)',
+'exif-lightsource-15'  => 'Fflworolau gwyn (WW 3200 – 3700K)',
 'exif-lightsource-17'  => 'Lamp hirgoes A',
 'exif-lightsource-18'  => 'Lamp hirgoes B',
 'exif-lightsource-19'  => 'Lamp hirgoes C',
+'exif-lightsource-24'  => 'Twngsten stiwdio ISO',
 'exif-lightsource-255' => "Tarddiad arall i'r goleuni",
 
+# Flash modes
+'exif-flash-fired-0' => 'Ni daniodd y fflach',
+'exif-flash-fired-1' => 'Taniodd y fflach',
+
 'exif-focalplaneresolutionunit-2' => 'modfeddi',
 
 'exif-sensingmethod-1' => 'Heb ei ddiffinio',
 
+'exif-scenetype-1' => "Delwedd wedi ei dynnu'n uniongyrchol",
+
 'exif-customrendered-0' => 'Proses normal',
 'exif-customrendered-1' => "Proses wedi'i addasu",
 
 'exif-exposuremode-0' => 'Dinoethi awtomatig',
-'exif-exposuremode-1' => "Dinoethiad wedi'i osod â llaw",
+'exif-exposuremode-1' => 'Hunan-ddewis hyd y dinoethiad',
 
 'exif-scenecapturetype-0' => 'Safonol',
 'exif-scenecapturetype-1' => 'Tirlun',
@@ -2355,21 +2628,10 @@ $1
 Cadarnhewch eich bod chi wir am ail-greu'r erthygl.",
 'recreate'            => 'Ail-greu',
 
-# HTML dump
-'redirectingto' => "Wrthi'n ailgyfeirio i [[:$1]]...",
-
 # action=purge
-'confirm_purge'        => "Clirio'r dudalen o'r storfa?
-
-$1",
 'confirm_purge_button' => 'Iawn',
-
-# AJAX search
-'searchcontaining' => "Chwilio am dudalennau yn cynnwys ''$1''.",
-'searchnamed'      => "Chwilio am dudalennau a'r enw ''$1''.",
-'articletitles'    => "Erthyglau'n dechrau gyda: ''$1''",
-'hideresults'      => "Cuddio'r canlyniadau",
-'useajaxsearch'    => 'Chwilio gyda AJAX',
+'confirm-purge-top'    => "Clirio'r dudalen o'r storfa?",
+'confirm-purge-bottom' => "Mae carthu tudalen yn clirio'r celc ac yn gorfodi'r fersiwn diweddaraf i ymddangos.",
 
 # Multipage image navigation
 'imgmultipageprev' => "� i'r dudalen gynt",
@@ -2389,10 +2651,10 @@ $1",
 'table_pager_empty'        => 'Dim canlyniadau',
 
 # Auto-summaries
-'autosumm-blank'   => "Yn gwacau'r dudalen yn llwyr",
+'autosumm-blank'   => "Wedi gwacáu'r dudalen yn llwyr",
 'autosumm-replace' => "Gwacawyd y dudalen a gosod y canlynol yn ei le: '$1'",
 'autoredircomment' => 'Yn ailgyfeirio at [[$1]]',
-'autosumm-new'     => 'Tudalen newydd: $1',
+'autosumm-new'     => "Crewyd tudalen newydd yn dechrau gyda '$1'",
 
 # Live preview
 'livepreview-loading' => "Wrthi'n llwytho…",
@@ -2429,26 +2691,28 @@ Gallwch hefyd [[Special:Watchlist/edit|ddefnyddio'r rhestr arferol]].",
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag estyniad anhysbys "$1"',
+'duplicate-defaultsort' => 'Rhybudd: Mae\'r allwedd trefnu diofyn "$2" yn gwrthwneud yr allwedd trefnu diofyn blaenorol "$1".',
 
 # Special:Version
-'version'                       => 'Fersiwn', # Not used as normal message but as header for the special page itself
-'version-extensions'            => 'Estyniadau gosodedig',
-'version-specialpages'          => 'Tudalennau arbennig',
-'version-parserhooks'           => 'Bachau dosrannydd',
-'version-variables'             => 'Newidynnau',
-'version-other'                 => 'Arall',
-'version-mediahandlers'         => 'Trinyddion cyfryngau',
-'version-hooks'                 => 'Bachau',
-'version-extension-functions'   => 'Ffwythiannau estyn',
-'version-parser-extensiontags'  => 'Tagiau estyn dosrannydd',
-'version-parser-function-hooks' => 'Bachau ffwythiant dosrannu',
-'version-hook-name'             => "Enw'r bachyn",
-'version-hook-subscribedby'     => 'Tanysgrifwyd gan',
-'version-version'               => 'Fersiwn',
-'version-license'               => 'Trwydded',
-'version-software'              => 'Meddalwedd gosodedig',
-'version-software-product'      => 'Cynnyrch',
-'version-software-version'      => 'Fersiwn',
+'version'                          => 'Fersiwn', # Not used as normal message but as header for the special page itself
+'version-extensions'               => 'Estyniadau gosodedig',
+'version-specialpages'             => 'Tudalennau arbennig',
+'version-parserhooks'              => 'Bachau dosrannydd',
+'version-variables'                => 'Newidynnau',
+'version-other'                    => 'Arall',
+'version-mediahandlers'            => 'Trinyddion cyfryngau',
+'version-hooks'                    => 'Bachau',
+'version-extension-functions'      => 'Ffwythiannau estyn',
+'version-parser-extensiontags'     => 'Tagiau estyn dosrannydd',
+'version-parser-function-hooks'    => 'Bachau ffwythiant dosrannu',
+'version-skin-extension-functions' => 'Ffwythiannau estyn y wedd',
+'version-hook-name'                => "Enw'r bachyn",
+'version-hook-subscribedby'        => 'Tanysgrifwyd gan',
+'version-version'                  => 'Fersiwn',
+'version-license'                  => 'Trwydded',
+'version-software'                 => 'Meddalwedd gosodedig',
+'version-software-product'         => 'Cynnyrch',
+'version-software-version'         => 'Fersiwn',
 
 # Special:FilePath
 'filepath'         => 'Llwybr y ffeil',
@@ -2457,13 +2721,13 @@ Gallwch hefyd [[Special:Watchlist/edit|ddefnyddio'r rhestr arferol]].",
 'filepath-summary' => 'Mae\'r dudalen arbennig hon yn adrodd llwybr ffeil yn gyfan.
 Dangosir delweddau ar eu llawn maint, dechreuir ffeiliau o fathau eraill yn uniongyrchol gan y rhaglen cysylltiedig.
 
-Rhowch enw\'r ffeil heb y rhagddodiad "{{ns:image}}:".',
+Rhowch enw\'r ffeil heb y rhagddodiad "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Chwilio am ffeiliau dyblyg',
 'fileduplicatesearch-summary'  => 'Chwilier am ffeiliau dyblyg ar sail ei werth stwnsh.
 
-Rhowch enw\'r ffeil heb y rhagddodiad "{{ns:image}}:".',
+Rhowch enw\'r ffeil heb y rhagddodiad "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Chwilio am ddyblygeb',
 'fileduplicatesearch-filename' => "Enw'r ffeil:",
 'fileduplicatesearch-submit'   => 'Chwilier',
@@ -2493,4 +2757,13 @@ Rhowch enw\'r ffeil heb y rhagddodiad "{{ns:image}}:".',
 'blankpage'              => 'Tudalen wag',
 'intentionallyblankpage' => 'Gadawyd y dudalen hon yn wag o fwriad',
 
+# External image whitelist
+'external_image_whitelist' => " #Leave this line exactly as it is<pre>
+#Gosodwch darnau o ymadroddion rheolaidd (y rhan sy'n cael ei osod rhwng y //) isod
+#Caiff y rhain eu cysefeillio gyda URL y delweddau allanol (a chyswllt poeth atynt)
+#Dangosir y rhai sy'n cysefeillio fel delweddau; dangosir cyswllt at y ddelwedd yn unig ar gyfer y lleill
+#Caiff y llinellau sy'n dechrau gyda # eu trin fel sylwadau
+
+#Put all regex fragments above this line. Leave this line exactly as it is</pre>",
+
 );
diff --git a/languages/messages/MessagesDa.php b/languages/messages/MessagesDa.php
index 7dd58524..f06d2894 100644
--- a/languages/messages/MessagesDa.php
+++ b/languages/messages/MessagesDa.php
@@ -5,19 +5,19 @@
  * @file
  *
  * @author Anders Wegge Jakobsen <awegge@gmail.com>
- * @author Boivie
  * @author EPO
  * @author H92
  * @author Jan Friberg
  * @author Jon Harald Søby
  * @author Lars J. Helbo <lars.helbo@gmail.com>
  * @author MinuteElectron
+ * @author Morten LJ
  * @author Najami
  * @author Peter Andersen
- * @author Ranveig
  * @author Remember the dot
- * @author S.Örvarr.S
  * @author Sir48
+ * @author Slomox
+ * @author Svip
  * @author Urhixidur
  */
 
@@ -30,8 +30,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Brugerdiskussion',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1-diskussion',
-	NS_IMAGE          => 'Billede',
-	NS_IMAGE_TALK     => 'Billeddiskussion',
+	NS_FILE           => 'Billede',
+	NS_FILE_TALK      => 'Billeddiskussion',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki-diskussion',
 	NS_TEMPLATE       => 'Skabelon',
@@ -42,13 +42,6 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Kategoridiskussion'
 );
 
-$skinNames = array(
-	'standard'      => 'Klassik',
-	'nostalgia'     => 'Nostalgi',
-	'cologneblue'   => 'Kølnerblå',
-	'monobook'      => 'MonoBook',
-	'chick'         => 'chick'
-);
 
 $bookstoreList = array(
 	"Bibliotek.dk" => "http://bibliotek.dk/vis.php?base=dfa&origin=kommando&field1=ccl&term1=is=$1&element=L&start=1&step=10",
@@ -56,90 +49,101 @@ $bookstoreList = array(
 	'inherit' => true,
 );
 
+
+
+
 $separatorTransformTable = array(',' => '.', '.' => ',' );
 $linkTrail = '/^([a-zæøå]+)(.*)$/sDu';
 
+/**
+ * Alternate names of special pages. All names are case-insensitive. The first
+ * listed alias will be used as the default. Aliases from the fallback 
+ * localisation (usually English) will be included by default. 
+ * 
+ * This array may be altered at runtime using the LanguageGetSpecialPageAliases 
+ * hook.
+ */
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Dobbelte_omdirigeringer' ),
-	'BrokenRedirects'           => array( 'Defekte_omdirigeringer' ),
-	'Disambiguations'           => array( 'Flertydige_artikler' ),
-	'Userlogin'                 => array( 'Log_på', 'Brugerlogin' ),
-	'Userlogout'                => array( 'Brugerlogout' ),
-	'CreateAccount'             => array( 'Opret_konto' ),
+	'DoubleRedirects'           => array( 'Dobbelte omdirigeringer' ),
+	'BrokenRedirects'           => array( 'Defekte omdirigeringer' ),
+	'Disambiguations'           => array( 'Flertydige sider' ),
+	'Userlogin'                 => array( 'Log på', 'Brugerlogind' ),
+	'Userlogout'                => array( 'Brugerlogud' ),
+	'CreateAccount'             => array( 'Opret konto' ),
 	'Preferences'               => array( 'Indstillinger' ),
 	'Watchlist'                 => array( 'Overvågningsliste' ),
-	'Recentchanges'             => array( 'Seneste_ændringer' ),
-	'Upload'                    => array( 'Upload' ),
-	'Imagelist'                 => array( 'Filer', 'Filliste' ),
-	'Newimages'                 => array( 'Nye_filer' ),
+	'Recentchanges'             => array( 'Seneste ændringer' ),
+	'Listfiles'                 => array( 'Filer', 'Filliste' ),
+	'Newimages'                 => array( 'Nye filer' ),
 	'Listusers'                 => array( 'Brugerliste', 'Bruger' ),
+	'Listgrouprights'           => array( 'Grupperettighedsliste' ),
 	'Statistics'                => array( 'Statistik' ),
-	'Randompage'                => array( 'Tilfældig_side' ),
-	'Lonelypages'               => array( 'Forældreløse_sider' ),
-	'Uncategorizedpages'        => array( 'Ukategoriserede_sider' ),
-	'Uncategorizedcategories'   => array( 'Ukategoriserede_kategorier' ),
-	'Uncategorizedimages'       => array( 'Ukategoriserede_filer' ),
-	'Uncategorizedtemplates'    => array( 'Ukategoriserede_skabeloner' ),
-	'Unusedcategories'          => array( 'Ubrugte_kategorier' ),
-	'Unusedimages'              => array( 'Ubrugte_filer' ),
-	'Wantedpages'               => array( 'Ønskede_sider' ),
-	'Wantedcategories'          => array( 'Ønskede_kategorier' ),
-	'Mostlinked'                => array( 'Sider_med_flest_henvisninger' ),
-	'Mostlinkedcategories'      => array( 'Kategorier_med_flest_sider' ),
-	'Mostlinkedtemplates'       => array( 'Hyppigst_brugte_skabeloner' ),
-	'Mostcategories'            => array( 'Sider_med_flest_kategorier' ),
-	'Mostimages'                => array( 'Mest_brugte_filer' ),
-	'Mostrevisions'             => array( 'Artikler_med_flest_redigeringer' ),
-	'Fewestrevisions'           => array( 'Artikler_med_færrest_redigeringer' ),
-	'Shortpages'                => array( 'Korteste_sider' ),
-	'Longpages'                 => array( 'Længste_sider' ),
-	'Newpages'                  => array( 'Nye_sider' ),
-	'Ancientpages'              => array( 'Ældste_sider' ),
+	'Randompage'                => array( 'Tilfældig side' ),
+	'Lonelypages'               => array( 'Forældreløse sider' ),
+	'Uncategorizedpages'        => array( 'Ukategoriserede sider' ),
+	'Uncategorizedcategories'   => array( 'Ukategoriserede kategorier' ),
+	'Uncategorizedimages'       => array( 'Ukategoriserede filer' ),
+	'Uncategorizedtemplates'    => array( 'Ukategoriserede skabeloner' ),
+	'Unusedcategories'          => array( 'Ubrugte kategorier' ),
+	'Unusedimages'              => array( 'Ubrugte filer' ),
+	'Wantedpages'               => array( 'Ønskede sider' ),
+	'Wantedcategories'          => array( 'Ønskede kategorier' ),
+	'Mostlinked'                => array( 'Sider med flest henvisninger' ),
+	'Mostlinkedcategories'      => array( 'Kategorier med flest sider' ),
+	'Mostlinkedtemplates'       => array( 'Hyppigst brugte skabeloner' ),
+	'Mostcategories'            => array( 'Sider med flest kategorier' ),
+	'Mostimages'                => array( 'Mest brugte filer' ),
+	'Mostrevisions'             => array( 'Sider med flest redigeringer' ),
+	'Fewestrevisions'           => array( 'Sider med færrest redigeringer' ),
+	'Shortpages'                => array( 'Korteste sider' ),
+	'Longpages'                 => array( 'Længste sider' ),
+	'Newpages'                  => array( 'Nye sider' ),
+	'Ancientpages'              => array( 'Ældste sider' ),
 	'Deadendpages'              => array( 'Blindgydesider' ),
-	'Protectedpages'            => array( 'Beskyttede_sider' ),
-	'Protectedtitles'           => array( 'Beskyttede_titler' ),
-	'Allpages'                  => array( 'Alle_sider' ),
+	'Protectedpages'            => array( 'Beskyttede sider' ),
+	'Protectedtitles'           => array( 'Beskyttede titler' ),
+	'Allpages'                  => array( 'Alle sider' ),
 	'Prefixindex'               => array( 'Præfiksindeks' ),
-	'Ipblocklist'               => array( 'Blokerede_adresser' ),
+	'Ipblocklist'               => array( 'Blokerede adresser' ),
 	'Specialpages'              => array( 'Specialsider' ),
 	'Contributions'             => array( 'Bidrag' ),
 	'Emailuser'                 => array( 'E-Mail' ),
-	'Confirmemail'              => array( 'Bekræft_e-mail' ),
-	'Whatlinkshere'             => array( 'Hvad_linker_hertil' ),
-	'Recentchangeslinked'       => array( 'Relaterede_ændringer' ),
-	'Movepage'                  => array( 'Flyt_side' ),
+	'Confirmemail'              => array( 'Bekræft e-mail' ),
+	'Whatlinkshere'             => array( 'Hvad linker hertil' ),
+	'Recentchangeslinked'       => array( 'Relaterede ændringer' ),
+	'Movepage'                  => array( 'Flyt side' ),
 	'Blockme'                   => array( 'Proxyspærring' ),
 	'Booksources'               => array( 'ISBN-søgning' ),
 	'Categories'                => array( 'Kategorier' ),
 	'Export'                    => array( 'Eksporter' ),
-	'Version'                   => array( 'Version' ),
 	'Allmessages'               => array( 'MediaWiki-systemmeddelelser' ),
 	'Log'                       => array( 'Loglister' ),
-	'Blockip'                   => array( 'Bloker_adresse' ),
+	'Blockip'                   => array( 'Bloker adresse' ),
 	'Undelete'                  => array( 'Gendannelse' ),
-	'Import'                    => array( 'Import' ),
+	'Import'                    => array( 'Importere' ),
 	'Lockdb'                    => array( 'Databasespærring' ),
 	'Unlockdb'                  => array( 'Databaseåbning' ),
 	'Userrights'                => array( 'Brugerrettigheder' ),
 	'MIMEsearch'                => array( 'MIME-type-søgning' ),
 	'FileDuplicateSearch'       => array( 'Filduplikatsøgning' ),
-	'Unwatchedpages'            => array( 'Uovervågede_sider' ),
+	'Unwatchedpages'            => array( 'Uovervågede sider' ),
 	'Listredirects'             => array( 'Henvisninger' ),
 	'Revisiondelete'            => array( 'Versionssletning' ),
-	'Unusedtemplates'           => array( 'Ubrugte_skabeloner' ),
-	'Randomredirect'            => array( 'Tilfældig_henvisning' ),
-	'Mypage'                    => array( 'Min_brugerside' ),
-	'Mytalk'                    => array( 'Min_diskussionsside' ),
-	'Mycontributions'           => array( 'Mine_bidrag' ),
+	'Unusedtemplates'           => array( 'Ubrugte skabeloner' ),
+	'Randomredirect'            => array( 'Tilfældig henvisning' ),
+	'Mypage'                    => array( 'Min brugerside' ),
+	'Mytalk'                    => array( 'Min diskussionsside' ),
+	'Mycontributions'           => array( 'Mine bidrag' ),
 	'Listadmins'                => array( 'Administratorer' ),
-	'Listbots'                  => array( 'Botter' ),
-	'Popularpages'              => array( 'Populære_sider' ),
+	'Listbots'                  => array( 'Robotter' ),
+	'Popularpages'              => array( 'Populære sider' ),
 	'Search'                    => array( 'Søgning' ),
-	'Resetpass'                 => array( 'Nulstil_kodeord' ),
-	'Withoutinterwiki'          => array( 'Manglende_interwikilinks' ),
-	'MergeHistory'              => array( 'Sammenfletning_af_historikker' ),
+	'Resetpass'                 => array( 'Nulstil kodeord' ),
+	'Withoutinterwiki'          => array( 'Manglende interwikilinks' ),
+	'MergeHistory'              => array( 'Sammenfletning af historikker' ),
 	'Filepath'                  => array( 'Filsti' ),
-	'Invalidateemail'           => array( 'Ugyldiggør_e-mail' ),
+	'Invalidateemail'           => array( 'Ugyldiggør e-mail' ),
+	'DeletedContributions'      => array( 'Slettede bidrag' ),
 );
 
 $dateFormats = array(
@@ -168,7 +172,7 @@ $messages = array(
 'tog-showtoolbar'             => 'Vis værktøjslinje til redigering (JavaScript)',
 'tog-editondblclick'          => 'Redigér sider med dobbeltklik (JavaScript)',
 'tog-editsection'             => 'Redigér afsnit ved hjælp af [redigér]-henvisninger',
-'tog-editsectiononrightclick' => 'Redigér afsnit ved at klikke på deres titler (JavaScript)',
+'tog-editsectiononrightclick' => 'Redigér afsnit ved at højreklikke på deres titler (JavaScript)',
 'tog-showtoc'                 => 'Vis indholdsfortegnelse (i artikler med mere end tre afsnit)',
 'tog-rememberpassword'        => 'Husk adgangskode til næste besøg fra denne computer',
 'tog-editwidth'               => 'Redigeringsboksen har fuld bredde',
@@ -194,17 +198,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Skjul egne ændringer i overvågningslisten',
 'tog-watchlisthidebots'       => 'Skjul ændringer fra bots i overvågningslisten',
 'tog-watchlisthideminor'      => 'Skjul mindre ændringer i overvågningslisten',
+'tog-watchlisthideliu'        => 'Skjul indloggede brugeres redigeringer i overvågningslisten',
+'tog-watchlisthideanons'      => 'Skjul anonyme brugeres redigeringer i overvågningslisten',
 'tog-nolangconversion'        => 'Deaktiver konverteringer af sprogvarianter',
 'tog-ccmeonemails'            => 'Send mig kopier af e-mails, som jeg sender til andre brugere.',
 'tog-diffonly'                => 'Vis ved versionssammenligninger kun forskelle, ikke hele siden',
 'tog-showhiddencats'          => 'Show hidden categories',
+'tog-norollbackdiff'          => 'Vis ikke forskel efter tilbagerulning',
 
 'underline-always'  => 'altid',
 'underline-never'   => 'aldrig',
 'underline-default' => 'efter browserindstilling',
 
-'skinpreview' => '(Forhåndsvisning)',
-
 # Dates
 'sunday'        => 'søndag',
 'monday'        => 'mandag',
@@ -292,7 +297,7 @@ $messages = array(
 'mytalk'         => 'Min diskussion',
 'anontalk'       => 'Diskussionsside for denne IP-adresse',
 'navigation'     => 'Navigation',
-'and'            => 'og',
+'and'            => '&#32;og',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -355,8 +360,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Om {{SITENAME}}',
 'aboutpage'            => 'Project:Om',
-'bugreports'           => 'Fejlrapporter',
-'bugreportspage'       => 'Project:Fejlrapporter',
 'copyright'            => 'Indholdet er udgivet under $1.',
 'copyrightpagename'    => '{{SITENAME}} ophavsret',
 'copyrightpage'        => '{{ns:project}}:Ophavsret',
@@ -379,8 +382,6 @@ $messages = array(
 
 'badaccess'        => 'Manglende rettigheder',
 'badaccess-group0' => 'Du har ikke de nødvendige rettigheder til denne handling.',
-'badaccess-group1' => 'Denne handling kan kun udføres af brugere, som tilhører gruppen „$1“.',
-'badaccess-group2' => 'Denne handling kan kun udføres af brugere, som tilhører en af grupperne „$1“.',
 'badaccess-groups' => 'Denne handling kan kun udføres af brugere, som tilhører en af grupperne „$1“.',
 
 'versionrequired'     => 'Kræver version $1 af MediaWiki',
@@ -395,6 +396,8 @@ $messages = array(
 'editsection'             => 'redigér',
 'editold'                 => 'redigér',
 'viewsourceold'           => 'vis kildekode',
+'editlink'                => 'redigér',
+'viewsourcelink'          => 'vis kildekode',
 'editsectionhint'         => 'Rediger afsnit: $1',
 'toc'                     => 'Indholdsfortegnelse',
 'showtoc'                 => 'vis',
@@ -471,7 +474,6 @@ det, og husk at fortælle hvilken URL du har fulgt.',
 'cannotdelete'         => 'Kunne ikke slette siden eller filen der blev angivet.',
 'badtitle'             => 'Forkert titel',
 'badtitletext'         => 'Den ønskede sides titel var ikke tilladt, tom eller siden er forkert henvist fra en {{SITENAME}} på et andet sprog.',
-'perfdisabled'         => 'Denne funktion er desværre midlertidigt afbrudt, fordi den belaster databasen meget hårdt og i en sådan grad, at siden bliver meget langsom. Funktionen bliver forhåbentlig omskrevet i den nærmeste fremtid (måske af dig, det er jo open source!).',
 'perfcached'           => 'Følgende data er gemt i cachen, det er muligvis ikke helt opdateret:',
 'perfcachedts'         => 'Disse data stammer fra cachen, sidste update: $1',
 'querypage-no-updates' => "'''Aktualiseringsfunktionen for denne side er pt. deaktiveret. Dataene bliver indtil videre ikke fornyet.'''",
@@ -492,10 +494,10 @@ $2',
 'namespaceprotected'   => 'Du har ikke rettigheder til t redigere sider i $1-navnerummet.',
 'customcssjsprotected' => 'Du har ikke rettigheder til at redigere denne side, da den indeholder en anden brugers personlige indstillinger.',
 'ns-specialprotected'  => 'Sider i navnerummet {{ns:special}} kan ikke redigeres.',
-'titleprotected'       => 'Dette sidenavn er beskyttet mod oprettelse af [[User:$1|$1]]. Begrundelsen for beskyttelsen er <i>$2</i>.',
+'titleprotected'       => "Dette sidenavn er beskyttet mod oprettelse af [[User:$1|$1]]. Begrundelsen for beskyttelsen er ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Konfigurationsfejl: ukendt virus-scanner: <i>$1</i>',
+'virus-badscanner'     => "Konfigurationsfejl: ukendt virus-scanner: ''$1''",
 'virus-scanfailed'     => 'virus-scan fejlede med fejlkode $1',
 'virus-unknownscanner' => 'ukendt virus-scanner:',
 
@@ -513,7 +515,6 @@ Din konto er blevet oprettet. Glem ikke at personliggøre dine {{SITENAME}}-inds
 'remembermypassword'         => 'Husk min adgangskode til næste gang.',
 'yourdomainname'             => 'Dit domænenavn',
 'externaldberror'            => 'Der er opstået en fejl i en ekstern adgangsdatabase, eller du har ikke rettigheder til at opdatere denne.',
-'loginproblem'               => '<b>Der har været et problem med at få dig logget på.</b><br />Prøv igen!',
 'login'                      => 'Log på',
 'nav-login-createaccount'    => 'Opret en konto eller log på',
 'loginprompt'                => 'Du skal have cookies slået til for at kunne logge på {{SITENAME}}.',
@@ -529,11 +530,11 @@ Din konto er blevet oprettet. Glem ikke at personliggøre dine {{SITENAME}}-inds
 'createaccountmail'          => 'via e-mail',
 'badretype'                  => 'De indtastede adgangskoder er ikke ens.',
 'userexists'                 => 'Det brugernavn du har valgt er allerede i brug. Vælg venligst et andet brugernavn.',
-'youremail'                  => 'Din e-mail-adresse *',
+'youremail'                  => 'Din e-mail-adresse:',
 'username'                   => 'Brugernavn:',
-'uid'                        => 'Bruger-ID:',
+'uid'                        => 'Bruger-id:',
 'prefs-memberingroups'       => 'Medlem af {{PLURAL:$1|gruppen|grupperne}}:',
-'yourrealname'               => 'Dit rigtige navn*',
+'yourrealname'               => 'Dit rigtige navn:',
 'yourlanguage'               => 'Ønsket sprog',
 'yourvariant'                => 'Sprogvariant',
 'yournick'                   => 'Dit kaldenavn (til signaturer)',
@@ -569,18 +570,18 @@ kan du bare ignorere denne mail og fortsætte med at bruge dit gamle password.',
 'noemail'                    => 'Der er ikke oplyst en e-mail-adresse for bruger "$1".',
 'passwordsent'               => 'En ny adgangskode er sendt til e-mail-adressen,
 som er registreret for "$1".
-Du bør logge på og ændre din adgangskode straks efter du har modtaget e-mail\'en.',
+Du bør logge på og ændre din adgangskode straks efter du har modtaget e-mailen.',
 'blocked-mailpassword'       => 'Din IP-adresse er spærret for ændring af sider. For at forhindre misbrug, er det heller ikke muligt, at bestille et nyt password.',
-'eauthentsent'               => 'En bekrftelsesmail er sendt til den angivne E-mail-adresse.
+'eauthentsent'               => 'En bekræftelsesmail er sendt til den angivne e-mail-adresse.
 
-Før en E-mail kan modtages af andre brugere af {{SITENAME}}-mailfunktionen, skal adressen og dens tilhørsforhold til denne bruger bekræftes. Følg venligst anvisningerne i denne mail.',
+Før en e-mail kan modtages af andre brugere af {{SITENAME}}-mailfunktionen, skal adressen og dens tilhørsforhold til denne bruger bekræftes. Følg venligst anvisningerne i denne mail.',
 'throttled-mailpassword'     => 'Indenfor {{PLURAL:$1|den sidste time|de sidste $1 timer}} er der allerede sendt et nyt password. For at forhindre misbrug af funktionen, kan der kun bestilles et nyt password en gang for hver {{PLURAL:$1|time|$1 timer}}.',
 'mailerror'                  => 'Fejl ved afsendelse af e-mail: $1',
 'acct_creation_throttle_hit' => 'Du har allerede oprettet $1 kontoer. Du kan ikke oprette flere.',
 'emailauthenticated'         => 'Din e-mail-adresse blev bekræftet på $1.',
 'emailnotauthenticated'      => 'Din e-mail-adresse er endnu ikke bekræftet og de avancerede e-mail-funktioner er slået fra indtil bekræftelse har fundet sted (d.u.a.). Log ind med den midlertidige adgangskode, der er blevet sendt til dig, for at bekræfte, eller bestil et nyt på loginsiden.',
-'noemailprefs'               => 'Angiv en E-mail-adresse, så følgende funktioner er til rådighed.',
-'emailconfirmlink'           => 'Bekræft E-mail-adressen (autentificering).',
+'noemailprefs'               => 'Angiv en e-mail-adresse, så følgende funktioner er til rådighed.',
+'emailconfirmlink'           => 'Bekræft e-mail-adressen (autentificering).',
 'invalidemailaddress'        => 'E-mail-adressen kan ikke accepteres da den tilsyneladende har et ugyldigt format. Skriv venligst en e-mail-adresse med et korrekt format eller tøm feltet.',
 'accountcreated'             => 'Brugerkonto oprettet',
 'accountcreatedtext'         => 'Brugerkontoen $1 er oprettet.',
@@ -589,18 +590,27 @@ Før en E-mail kan modtages af andre brugere af {{SITENAME}}-mailfunktionen, ska
 ($4). Password for "$2" er "$3". Du opfordres til at logge ind, og ændre kodeordet omgående.
 
 Denne besked kan ignorewres, hvis denne konto er oprettet som følge af en fejl.',
+'login-throttled'            => 'Du har forsøgt at logge ind med forkert adgangskode til denne konto for mange gange.
+Vent, før du prøver igen.',
 'loginlanguagelabel'         => 'Sprog: $1',
 
 # Password reset dialog
-'resetpass'               => 'Nulstille password for brugerkonto',
-'resetpass_announce'      => 'Log på med den via e-mail tilsendte password. For at afslutte tilmeldingen, skal du nu vælge et nyt password.',
-'resetpass_text'          => '<!-- Tilføj tekst her -->',
-'resetpass_header'        => 'Nulstille password',
-'resetpass_submit'        => 'Send password og log på',
-'resetpass_success'       => 'Dit password er nu ændret. Nu følger tilmelding …',
-'resetpass_bad_temporary' => 'Ugyldigt foreløbigt password. Du har allerede ændret dit password eller bestilt et nyt foreløbigt password.',
-'resetpass_forbidden'     => 'Dette password kan ikke ændres.',
-'resetpass_missing'       => 'Tom formular.',
+'resetpass'                 => 'Nulstille password for brugerkonto',
+'resetpass_announce'        => 'Log på med den via e-mail tilsendte password. For at afslutte tilmeldingen, skal du nu vælge et nyt password.',
+'resetpass_text'            => '<!-- Tilføj tekst her -->',
+'resetpass_header'          => 'Nulstille password',
+'oldpassword'               => 'Gammel adgangskode',
+'newpassword'               => 'Ny adgangskode',
+'retypenew'                 => 'Gentag ny adgangskode',
+'resetpass_submit'          => 'Send password og log på',
+'resetpass_success'         => 'Dit password er nu ændret. Nu følger tilmelding …',
+'resetpass_bad_temporary'   => 'Ugyldigt foreløbigt password. Du har allerede ændret dit password eller bestilt et nyt foreløbigt password.',
+'resetpass_forbidden'       => 'Dette password kan ikke ændres.',
+'resetpass-no-info'         => 'Du skal være logget på for at komme direkte til denne side.',
+'resetpass-submit-loggedin' => 'Skift adgangskode',
+'resetpass-wrong-oldpass'   => 'Ugyldig midlertidig eller gældende adgangskode. 
+Du har muligvis allerede skiftet din adgangskode eller anmodet om en ny midlertidig kode.',
+'resetpass-temp-password'   => 'Midlertidig adgangskode',
 
 # Edit page toolbar
 'bold_sample'     => 'Fed tekst',
@@ -619,14 +629,14 @@ Denne besked kan ignorewres, hvis denne konto er oprettet som følge af en fejl.
 'nowiki_tip'      => 'Ignorer wikiformatering',
 'image_sample'    => 'Eksempel.jpg',
 'image_tip'       => 'Indlejret billede',
-'media_sample'    => 'Eksempel.mp3',
+'media_sample'    => 'Eksempel.ogg',
 'media_tip'       => 'Henvisning til multimediefil',
 'sig_tip'         => 'Din signatur med tidsstempel',
 'hr_tip'          => 'Horisontal linje (brug den sparsomt)',
 
 # Edit pages
-'summary'                          => 'Beskrivelse',
-'subject'                          => 'Emne/overskrift',
+'summary'                          => 'Beskrivelse:',
+'subject'                          => 'Emne/overskrift:',
 'minoredit'                        => 'Dette er en mindre ændring.',
 'watchthis'                        => 'Overvåg denne artikel',
 'savearticle'                      => 'Gem side',
@@ -638,8 +648,8 @@ Denne besked kan ignorewres, hvis denne konto er oprettet som følge af en fejl.
 'missingsummary'                   => "'''Bemærk:''' du har ikke angivet en redigeringsbeskrivelse. Hvis du atter trykker på „Gem“, gemmes ændringerne uden resume.",
 'missingcommenttext'               => 'Indtast venligst et resume.',
 'missingcommentheader'             => "'''BEMÆRK:''' du har ikke angivet en overskrift i feltet „Emne:“. Hvis du igen trykker på „Gem side“, gemmes bearbejdningen uden overskrift.",
-'summary-preview'                  => 'Forhåndsvisning af resumelinien',
-'subject-preview'                  => 'Forhåndsvisning af emnet',
+'summary-preview'                  => 'Forhåndsvisning af resumelinien:',
+'subject-preview'                  => 'Forhåndsvisning af emnet:',
 'blockedtitle'                     => 'Brugeren er blokeret',
 'blockedtext'                      => "<big>'''Dit brugernavn eller din IP-adresse er blevet blokeret.'''</big>
 
@@ -670,8 +680,8 @@ Din blokerings-ID er $5. Angiv venligst denne ID ved alle henvendelser.',
 'blockededitsource'                => "Kildekoden fra '''Dine ændringer''' til '''$1''':",
 'whitelistedittitle'               => 'Log på for at redigere',
 'whitelistedittext'                => 'Du skal $1 for at kunne ændre artikler.',
-'confirmedittitle'                 => 'For at kunne bearbejde er bekræftelsen af E-mail-adressen nødvendig.',
-'confirmedittext'                  => 'Du skal først bekræfte E-mail-adressen, før du kan lave ændringer. Udfyld og bekræft din E-mail-adresse i dine [[Special:Preferences|Indstillinger]].',
+'confirmedittitle'                 => 'For at kunne bearbejde er bekræftelsen af e-mail-adressen nødvendig.',
+'confirmedittext'                  => 'Du skal først bekræfte e-mail-adressen, før du kan lave ændringer. Udfyld og bekræft din e-mail-adresse i dine [[Special:Preferences|Indstillinger]].',
 'nosuchsectiontitle'               => 'Afsnit findes ikke',
 'nosuchsectiontext'                => 'Du forsøgte at ændre det ikke eksisterende afsnit $1. Det er dog kun muligt at ændre eksisterende afsnit.',
 'loginreqtitle'                    => 'Log på nødvendigt',
@@ -685,22 +695,22 @@ Din blokerings-ID er $5. Angiv venligst denne ID ved alle henvendelser.',
 'noarticletext'                    => "'''{{SITENAME}} har ikke nogen side med præcis dette navn.''' * Du kan '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} starte siden {{PAGENAME}}]''' * Eller [[Special:Search/{{PAGENAME}}|søge efter {{PAGENAME}}]] i andre artikler ---- * Hvis du har oprettet denne artikel indenfor de sidste få minutter, så kan de skyldes at der er lidt forsinkelse i opdateringen af {{SITENAME}}s cache. Vent venligst og tjek igen senere om artiklen dukker op, inden du forsøger at oprette artiklen igen.",
 'userpage-userdoesnotexist'        => 'Brugerkontoen "$1" findes ikke. Overvej om du ønsker at oprette eller redigere denne side.',
 'clearyourcache'                   => "'''Bemærk''', efter at have gemt, er du nødt til at tømme din browsers cache for at kunne se ændringerne. '''Mozilla / Firefox / Safari''': hold ''shifttasten'' nede og klik på ''reload'' eller tryk på ''control-shift-r'' (Mac: ''cmd-shift-r''); '''Internet Explorer''': hold ''controltasten'' nede og klik på ''refresh'' eller tryk på ''control-F5''; '''Konqueror''': klik på ''reload'' eller tryk på ''F5''",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Brug knappen 'forhåndsvisning' til at teste dit nye css/js før du gemmer.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Brug knappen 'forhåndsvisning' til at teste dit nye css/js før du gemmer.",
 'usercsspreview'                   => "'''Husk at du kun tester/forhåndsviser dit eget css, den er ikke gemt endnu!'''",
 'userjspreview'                    => "'''Husk at du kun tester/forhåndsviser dit eget javascript, det er ikke gemt endnu!'''",
 'userinvalidcssjstitle'            => "'''Advarsel:''' Der findes intet skin „$1“. Tænk på, at brugerspecifikke .css- og .js-sider begynder med små bogstaver, altså f.eks. ''{{ns:user}}:Hansen/monobook.css'' og ikke ''{{ns:user}}:Hansen/Monobook.css''.",
 'updated'                          => '(Opdateret)',
-'note'                             => '<strong>Bemærk:</strong>',
+'note'                             => "'''Bemærk:'''",
 'previewnote'                      => 'Husk at dette er kun en forhåndsvisning, siden er ikke gemt endnu!',
 'previewconflict'                  => 'Denne forhåndsvisning er resultatet af den redigérbare tekst ovenfor, sådan vil det komme til at se ud hvis du vælger at gemme teksten.',
-'session_fail_preview'             => '<strong>Din ændring kunne ikke gemmes, da dine sessionsdata er gået tabt.
-Prøv venligst igen. Hvis problemet fortsætter, log af og log på igen.</strong>',
-'session_fail_preview_html'        => "<strong>Din ændring kunne ikke gemmes, da dine sessionsdata er gået tabt.</strong>
+'session_fail_preview'             => "'''Din ændring kunne ikke gemmes, da dine sessionsdata er gået tabt.
+Prøv venligst igen. Hvis problemet fortsætter, log af og log på igen.'''",
+'session_fail_preview_html'        => "'''Din ændring kunne ikke gemmes, da dine sessionsdata er gået tabt.'''
 
 ''Da ren HTM er aktiveret i denne Wiki, er forhåndsvisningen blændet ud for at forebygge JavaScript-angreb.''
 
-<strong>Forsøg venligst igen. Hvis problemet fortsætter, log af og log på igen.</strong>",
-'token_suffix_mismatch'            => '<strong>Din redigering er afvist, da din browser har forvansket tegnsætningen i redigeringskontrolfilen. Afvisningen sker for at forhindre utilsigtede ændringer i artiklen. Denne fejl opstår nogle gange, når du redigerer gennem en fejlprogrammeret webbaseret anonymiseringstjeneste.</strong>',
+'''Forsøg venligst igen. Hvis problemet fortsætter, log af og log på igen.'''",
+'token_suffix_mismatch'            => "'''Din redigering er afvist, da din browser har forvansket tegnsætningen i redigeringskontrolfilen. Afvisningen sker for at forhindre utilsigtede ændringer i artiklen. Denne fejl opstår nogle gange, når du redigerer gennem en fejlprogrammeret webbaseret anonymiseringstjeneste.'''",
 'editing'                          => 'Redigerer $1',
 'editingsection'                   => 'Redigerer $1 (afsnit)',
 'editingcomment'                   => 'Redigerer $1 (kommentar)',
@@ -712,27 +722,27 @@ Du er nødt til at sammenflette dine ændringer med den eksisterende tekst.
 <b>Kun</b> teksten i den øverste tekstboks vil blive gemt når du trykker "Gem side".<br />',
 'yourtext'                         => 'Din tekst',
 'storedversion'                    => 'Den gemte version',
-'nonunicodebrowser'                => '<strong>Advarsel: Din browser er ikke unicode-kompatibel, skift eller opdater din browser før du redigerer en artikel.</strong>',
-'editingold'                       => '<strong>ADVARSEL: Du redigerer en gammel version af denne side.
-Hvis du gemmer den, vil alle ændringer foretaget siden denne revision blive overskrevet.</strong>',
+'nonunicodebrowser'                => "'''Advarsel: Din browser er ikke unicode-kompatibel, skift eller opdater din browser før du redigerer en artikel.'''",
+'editingold'                       => "'''ADVARSEL: Du redigerer en gammel version af denne side.
+Hvis du gemmer den, vil alle ændringer foretaget siden denne revision blive overskrevet.'''",
 'yourdiff'                         => 'Forskelle',
-'copyrightwarning'                 => '<strong>Husk: <big>kopier ingen websider</big>, som ikke tilhører dig selv, brug <big>ingen ophavsretsligt beskyttede værker</big> uden tilladelse fra ejeren!</strong><br />
-Du lover os hermed, at du selv <strong>har skrevet teksten</strong>, at teksten tilhører almenheden, er (<strong>public domain</strong>), eller at <strong>ophavsrets-indehaveren</strong> har givet sin <strong>tilladelse</strong>. Hvis denne tekst allerede er offentliggkort andre steder, skriv det venligst på diskussionssiden.
-<i>Bemærk venligst, at alle {{SITENAME}}-artikler automatisk står under „$2“ (se $1 for detaljer). Hvis du ikke vil, at dit arbejde her ændres og udbredes af andre, så tryk ikke på „Gem“.</i>',
-'copyrightwarning2'                => 'Bemærk venligst, at alle artikler på {{SITENAME}} kan bearbejdes, ændres eller slettes af andre brugere.
+'copyrightwarning'                 => "'''Husk: <big>kopier ingen websider</big>, som ikke tilhører dig selv, brug <big>ingen ophavsretsligt beskyttede værker</big> uden tilladelse fra ejeren!'''<br />
+Du lover os hermed, at du selv '''har skrevet teksten''', at teksten tilhører almenheden, er ('''public domain'''), eller at '''ophavsrets-indehaveren''' har givet sin '''tilladelse'''. Hvis denne tekst allerede er offentliggkort andre steder, skriv det venligst på diskussionssiden.
+<i>Bemærk venligst, at alle {{SITENAME}}-artikler automatisk står under „$2“ (se $1 for detaljer). Hvis du ikke vil, at dit arbejde her ændres og udbredes af andre, så tryk ikke på „Gem“.</i>",
+'copyrightwarning2'                => "Bemærk venligst, at alle artikler på {{SITENAME}} kan bearbejdes, ændres eller slettes af andre brugere.
 Læg ingen tekster ind, hvis du ikke kan acceptere at disse kan ændres.
 
 Du bekræfter hermed også, at du selv har skrevet denne tekst eller kopieret den fra en offentlig kilde
-(se $1 for detaljer). <strong>OVERFØR IKKE OPHAVSRETSLIGT BESKYTTET INDHOLD!</strong>',
-'longpagewarning'                  => '<strong>ADVARSEL: Denne side er $1 kilobyte stor; nogle browsere kan have problemer med at redigere sider der nærmer sig eller er større end 32 kb. 
-Overvej om siden kan opdeles i mindre dele.</strong>',
-'longpageerror'                    => '<strong>FEJL: Teksten, som du ville gemme, er $1 kB stor. Det er større end det tilladet maksimum på $2 kB. Det er ikke muligt at gemme.</strong>',
-'readonlywarning'                  => '<strong>ADVARSEL: Databasen er låst på grund af vedligeholdelse,
-så du kan ikke gemme dine ændringer lige nu. Det kan godt være en god ide at kopiere din tekst til en tekstfil, så du kan gemme den til senere.</strong>',
-'protectedpagewarning'             => '<strong>ADVARSEL: Denne side er skrivebeskyttet, så kun administratorer kan redigere den.</strong>',
+(se $1 for detaljer). '''OVERFØR IKKE OPHAVSRETSLIGT BESKYTTET INDHOLD!'''",
+'longpagewarning'                  => "'''ADVARSEL: Denne side er $1 kilobyte stor; nogle browsere kan have problemer med at redigere sider der nærmer sig eller er større end 32 kb. 
+Overvej om siden kan opdeles i mindre dele.'''",
+'longpageerror'                    => "'''FEJL: Teksten, som du ville gemme, er $1 kB stor. Det er større end det tilladet maksimum på $2 kB. Det er ikke muligt at gemme.'''",
+'readonlywarning'                  => "'''ADVARSEL: Databasen er låst på grund af vedligeholdelse,
+så du kan ikke gemme dine ændringer lige nu. Det kan godt være en god ide at kopiere din tekst til en tekstfil, så du kan gemme den til senere.'''",
+'protectedpagewarning'             => "'''ADVARSEL: Denne side er skrivebeskyttet, så kun administratorer kan redigere den.'''",
 'semiprotectedpagewarning'         => "'''Halv spærring:''' Siden er spærret, så kun registrerede brugere kan ændre den.",
 'cascadeprotectedwarning'          => "'''BEMÆRK: Denne side er skrivebeskyttet, så den kun kan ændres af brugere med Administratorrettigheder. Den er indeholdt i nedenstående {{PLURAL:$1|side|sider}}, som er skrivebeskyttet med tilvalg af nedarvende sidebeskyttelse:'''",
-'titleprotectedwarning'            => '<strong>ADVARSEL:  Den side er låst så kun nogle brugere kan oprette den.</strong>',
+'titleprotectedwarning'            => "'''ADVARSEL:  Den side er låst så kun nogle brugere kan oprette den.'''",
 'templatesused'                    => 'Skabeloner der er brugt på denne side:',
 'templatesusedpreview'             => 'Følgende skabeloner bruges af denne artikelforhåndsvisning:',
 'templatesusedsection'             => 'Følgende skabeloner bruges af dette afsnit:',
@@ -750,11 +760,20 @@ så du kan ikke gemme dine ændringer lige nu. Det kan godt være en god ide at
  
 Overvej om det er passende at genoprette siden. De slettede versioner for 
 denne side er vist nedenfor:",
+'deleted-notice'                   => 'Denne side er blevet slettet.
+Siden slettelog er vist nedenfor.',
+'deletelog-fulllog'                => 'Se hele loggen',
+'edit-hook-aborted'                => 'Redigering afbrudt af en programfunktion. Ingen tilknyttet forklaring.',
+'edit-gone-missing'                => 'Kunne ikke opdatere siden. 
+Den ser du til at være slettet.',
+'edit-conflict'                    => 'Redigeringskonflikt.',
+'edit-no-change'                   => 'Din ændring ignoreredes, fordi der ikke var ændring af teksten.',
+'edit-already-exists'              => 'En ny side kunne ikke oprettes, fordi den allerede findes.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Advarsel: Denne side indeholder ligeledes mange bekostelig analysere funktion opringninger.
+'expensive-parserfunction-warning'        => 'Advarsel: Der er for mange beregningstunge oversætter-funktionskald på denne side.
 
-Det burde være mindre end $2, der er nu $1.',
+Der bør være færre end $2, lige nu er der $1.',
 'expensive-parserfunction-category'       => 'Sider med for mange beregningstunge oversætter-funktioner',
 'post-expand-template-inclusion-warning'  => 'Advarsel: Der er tilføjet for mange skabeloner til denne side, så nogle af dem bliver ikke vist..',
 'post-expand-template-inclusion-category' => 'Sider der indeholder for mange skabeloner',
@@ -763,7 +782,7 @@ Det burde være mindre end $2, der er nu $1.',
 
 # "Undo" feature
 'undo-success' => 'Ændringen er nu annulleret. Kontroller venligst bearbejdningen i sammenligningen og klik så på „Gem side“, for at gemme den.',
-'undo-failure' => '<span class="error">Ændringen kunne ikke annulleres, da det pågældende afsnit i mellemtiden er ændret.</span>',
+'undo-failure' => 'Ændringen kunne ikke annulleres, da det pågældende afsnit i mellemtiden er ændret.',
 'undo-norev'   => 'Ændringen kunne ikke annuleres fordi den ikke eksisterer eller er blevet slettet.',
 'undo-summary' => 'Fjerner version $1 af [[Special:Contributions/$2|$2]] ([[User talk:$2|diskussion]])',
 
@@ -772,29 +791,27 @@ Det burde være mindre end $2, der er nu $1.',
 'cantcreateaccount-text' => "Oprettelsen af en brugerkonto fra IP-adressen <b>$1</b> er spærret af [[User:$3|$3]]. Årsagen til blokeringen er angivet som ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vis loglister for denne side',
-'nohistory'           => 'Der er ingen versionshistorik for denne side.',
-'revnotfound'         => 'Versionen er ikke fundet',
-'revnotfoundtext'     => 'Den gamle version af den side du spurgte efter kan
-ikke findes. Kontrollér den URL du brugte til at få adgang til denne side.',
-'currentrev'          => 'Nuværende version',
-'revisionasof'        => 'Versionen fra $1',
-'revision-info'       => 'Version fra $1 til $2',
-'previousrevision'    => '�Ældre version',
-'nextrevision'        => 'Nyere version→',
-'currentrevisionlink' => 'se nuværende version',
-'cur'                 => 'nuværende',
-'next'                => 'næste',
-'last'                => 'forrige',
-'page_first'          => 'Startem',
-'page_last'           => 'Enden',
-'histlegend'          => 'Forklaring: (nuværende) = forskel til den nuværende
+'viewpagelogs'           => 'Vis loglister for denne side',
+'nohistory'              => 'Der er ingen versionshistorik for denne side.',
+'currentrev'             => 'Nuværende version',
+'revisionasof'           => 'Versionen fra $1',
+'revision-info'          => 'Version fra $1 af $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Ældre version',
+'nextrevision'           => 'Nyere version→',
+'currentrevisionlink'    => 'se nuværende version',
+'cur'                    => 'nuværende',
+'next'                   => 'næste',
+'last'                   => 'forrige',
+'page_first'             => 'Starten',
+'page_last'              => 'Enden',
+'histlegend'             => 'Forklaring: (nuværende) = forskel til den nuværende
 version, (forrige) = forskel til den forrige version, M = mindre ændring',
-'deletedrev'          => '[slettet]',
-'histfirst'           => 'Ældste',
-'histlast'            => 'Nyeste',
-'historysize'         => '($1 {{PLURAL:$1|Byte|Bytes}})',
-'historyempty'        => '(tom)',
+'history-fieldset-title' => 'Find dato',
+'deletedrev'             => '[slettet]',
+'histfirst'              => 'Ældste',
+'histlast'               => 'Nyeste',
+'historysize'            => '($1 {{PLURAL:$1|Byte|Bytes}})',
+'historyempty'           => '(tom)',
 
 # Revision feed
 'history-feed-title'          => 'Versionshistorie',
@@ -892,6 +909,7 @@ Vær opmæksom på at bevare kontinuiteten i sidehistorikken.
 
 # Search results
 'searchresults'             => 'Søgeresultater',
+'searchresults-title'       => 'Søgeresultater for "$1"',
 'searchresulttext'          => 'For mere information om søgning på {{SITENAME}}, se [[{{MediaWiki:Helppage}}|{{int:help}}]].',
 'searchsubtitle'            => 'Til din søgning „[[:$1]]“.',
 'searchsubtitleinvalid'     => 'Til din søgning „$1“.',
@@ -905,6 +923,7 @@ Vær opmæksom på at bevare kontinuiteten i sidehistorikken.
 'prevn'                     => 'forrige $1',
 'nextn'                     => 'næste $1',
 'viewprevnext'              => 'Vis ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Hjælp',
 'search-result-size'        => '$1 ({{PLURAL:$2|et ord|$2 ord}})',
 'search-result-score'       => 'Relevans: $1%',
 'search-redirect'           => '(omdiriger $1)',
@@ -946,10 +965,11 @@ Vær opmæksom på at bevare kontinuiteten i sidehistorikken.
 'qbsettings-floatingright' => 'Flydende højre',
 'changepassword'           => 'Skift adgangskode',
 'skin'                     => 'Udseende',
+'skin-preview'             => 'Forhåndsvisning',
 'math'                     => 'Matematiske formler',
 'dateformat'               => 'Datoformat',
 'datedefault'              => 'Standard',
-'datetime'                 => 'Dato og klokkeslet',
+'datetime'                 => 'Dato og klokkeslæt',
 'math_failure'             => 'Fejl i matematikken',
 'math_unknown_error'       => 'ukendt fejl',
 'math_unknown_function'    => 'ukendt funktion',
@@ -967,9 +987,6 @@ Vær opmæksom på at bevare kontinuiteten i sidehistorikken.
 'prefs-misc'               => 'Forskelligt',
 'saveprefs'                => 'Gem indstillinger',
 'resetprefs'               => 'Gendan indstillinger',
-'oldpassword'              => 'Gammel adgangskode',
-'newpassword'              => 'Ny adgangskode',
-'retypenew'                => 'Gentag ny adgangskode',
 'textboxsize'              => 'Redigering',
 'rows'                     => 'Rækker',
 'columns'                  => 'Kolonner',
@@ -984,10 +1001,10 @@ Vær opmæksom på at bevare kontinuiteten i sidehistorikken.
 'timezonelegend'           => 'Tidszone',
 'timezonetext'             => 'Indtast antal timer din lokale tid er forskellig fra serverens tid (UTC). Der bliver automatisk tilpasset til dansk tid, ellers skulle man for eksempel for dansk vintertid, indtaste "1" (og "2" når vi er på sommertid).',
 'localtime'                => 'Lokaltid',
-'timezoneoffset'           => 'Forskel',
+'timezoneoffset'           => 'Forskel¹:',
 'servertime'               => 'Serverens tid er nu',
 'guesstimezone'            => 'Hent tidszone fra browseren',
-'allowemail'               => 'Tillade E-mails fra andre brugere.',
+'allowemail'               => 'Tillade e-mails fra andre brugere.',
 'prefs-searchoptions'      => 'Søgeindstillinger',
 'prefs-namespaces'         => 'Navnerum',
 'defaultns'                => 'Søg som standard i disse navnerum:',
@@ -1144,7 +1161,7 @@ Vær opmæksom på at bevare kontinuiteten i sidehistorikken.
 'upload_directory_missing'    => 'upload-kataloget ($1) findes ikke. Webserveren har ikke mulighed for at oprette kataloget.',
 'upload_directory_read_only'  => 'Webserveren har ingen skriverettigheder for upload-kataloget ($1).',
 'uploaderror'                 => 'Fejl under oplægning af fil',
-'uploadtext'                  => "<strong>STOP!</strong> Før du lægger filer op her, så vær sikker på du har læst og følger {{SITENAME}}s [[{{MediaWiki:Policy-url}}|politik om brug af billeder]]. Følg venligst disse retningslinjer: * Angiv tydeligt hvor filen stammer fra * Brug et beskrivende filnavn, så det er til at se hvad filen indeholder * Tjek i [[Special:ImageList|listen over filer]] om filen allerede er lagt op
+'uploadtext'                  => "<strong>STOP!</strong> Før du lægger filer op her, så vær sikker på du har læst og følger {{SITENAME}}s [[{{MediaWiki:Policy-url}}|politik om brug af billeder]]. Følg venligst disse retningslinjer: * Angiv tydeligt hvor filen stammer fra * Brug et beskrivende filnavn, så det er til at se hvad filen indeholder * Tjek i [[Special:FileList|listen over filer]] om filen allerede er lagt op
 
 Brug formularen herunder til at lægge nye filer op, som kan bruges i dine artikler.
 På de fleste browsere vil du se en \"Browse...\" knap eller en \"Gennemse...\" knap, som vil bringe dig til dit styresystems standard-dialog til åbning af filer.
@@ -1152,8 +1169,8 @@ Når du vælger en fil, vil navnet på filen dukke op i tekstfeltet ved siden af
 Du skal også bekræfte, at du ikke er ved at bryde nogens ophavsret. Det gør du ved at sætte et mærke i tjekboksen. Vælg \"Læg en fil op\"-knappen for at lægge filen op. Dette kan godt tage lidt tid hvis du har en langsom internetforbindelse. De foretrukne formater er JPEG til fotografiske billeder, PNG til tegninger og andre små billeder, og OGG til lyd.
 
 For at bruge et billede i en artikel, så brug en henvisning af denne type
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:fil.jpg]]</nowiki>''' eller
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:fil.png|alternativ tekst]]</nowiki>''' eller
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:fil.jpg]]</nowiki>''' eller
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:fil.png|alternativ tekst]]</nowiki>''' eller
 
 For at indlejre '''mediefiler''' ind, bruges f.eks.:
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:fil.ogg<nowiki>]]</nowiki></tt>'''
@@ -1185,18 +1202,18 @@ Læg mærke til at præcis som med alle andre sider, så kan og må andre gerne
 'largefileserver'             => 'Filen er større end den på serveren indstillede maksimale størrelse.',
 'emptyfile'                   => 'Filen du lagde op lader til at være tom. Det kan skyldes en slåfejl i filnavnet. Kontroller om du virkelig ønsker at lægge denne fil op.',
 'fileexists'                  => 'En fil med det navn findes allerede, tjek venligst $1 om du er sikker på du vil ændre den.',
-'filepageexists'              => 'Siden med beskrivelse af denne fil er allerede oprettet på <strong><tt>$1</tt></strong>, men der eksisterer ikke en fil med dette navn. Den beskrivelse du kan angive nedenfor vil derfor ikke blive brugt. For at få din beskrivelse vist, skal du selv redigere beskrivelsessiden.',
-'fileexists-extension'        => 'En fil med lignende navn findes allerede:<br />
-Navnet på den valgte fil: <strong><tt>$1</tt></strong><br />
-Navnet på den eksisterende fil: <strong><tt>$2</tt></strong><br />
-Kun filendelsen adskiller sig med store og små bogstaver. Kontroller venligst om filerne har samme indhold.',
+'filepageexists'              => "Siden med beskrivelse af denne fil er allerede oprettet på '''<tt>$1</tt>''', men der eksisterer ikke en fil med dette navn. Den beskrivelse du kan angive nedenfor vil derfor ikke blive brugt. For at få din beskrivelse vist, skal du selv redigere beskrivelsessiden.",
+'fileexists-extension'        => "En fil med lignende navn findes allerede:<br />
+Navnet på den valgte fil: '''<tt>$1</tt>'''<br />
+Navnet på den eksisterende fil: '''<tt>$2</tt>'''<br />
+Kun filendelsen adskiller sig med store og små bogstaver. Kontroller venligst om filerne har samme indhold.",
 'fileexists-thumb'            => "<center>'''Eksisterende billede'''</center>",
-'fileexists-thumbnail-yes'    => 'Det ser ud som om filen indeholder et billede i reduceret størrelse <i>(thumbnail)</i>. Kontroller filen <strong><tt>$1</tt></strong>.<br />
-Hvis det er billedet i original størrelse, er det ikke nødvendigt at uploade et separat forhåndsvisningsbillede.',
-'file-thumbnail-no'           => 'Filnavnet begynder med <strong><tt>$1</tt></strong>. Det tyder på et billede i reduceret format <i>(thumbnail)</i>.
-Kontroller om du har billedet i fuld størrelse og upload det under det originale navn.',
-'fileexists-forbidden'        => 'Der findes allerede en fil med dette navn. GÃ¥ tilbage og upload filen under et andet navn. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Der findes allerede en fil med dette navn. GÃ¥ tilbage og upload filen under et andet navn. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Det ser ud som om filen indeholder et billede i reduceret størrelse ''(thumbnail)''. Kontroller filen '''<tt>$1</tt>'''.<br />
+Hvis det er billedet i original størrelse, er det ikke nødvendigt at uploade et separat forhåndsvisningsbillede.",
+'file-thumbnail-no'           => "Filnavnet begynder med '''<tt>$1</tt>'''. Det tyder på et billede i reduceret format ''(thumbnail)''.
+Kontroller om du har billedet i fuld størrelse og upload det under det originale navn.",
+'fileexists-forbidden'        => 'Der findes allerede en fil med dette navn. GÃ¥ tilbage og upload filen under et andet navn. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Der findes allerede en fil med dette navn. GÃ¥ tilbage og upload filen under et andet navn. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Denne fil er en bublet af {{PLURAL:$1|den nedenstående fil|de nedenstående $1 filer}}:',
 'successfulupload'            => 'Oplægningen er gennemført',
 'uploadwarning'               => 'Advarsel',
@@ -1217,7 +1234,7 @@ Kontroller om du har billedet i fuld størrelse og upload det under det original
 
 Overvej om det er passende at fortsætte med uploadet.
 Sletningsloggen for denne fil er gengivet herunder.",
-'filename-bad-prefix'         => 'Navnet på filen du er ved at lægge op begynder med <strong>"$1"</strong>. Dette er et ikkebeskrivende navn, der typisk er skabt automatisk af et digitalkamera. Vær venlig at vælge et mere beskrivende navn på dit billede.',
+'filename-bad-prefix'         => "Navnet på filen du er ved at lægge op begynder med '''\"\$1\"'''. Dette er et ikkebeskrivende navn, der typisk er skabt automatisk af et digitalkamera. Vær venlig at vælge et mere beskrivende navn på dit billede.",
 
 'upload-proto-error'      => 'Forkert protokol',
 'upload-proto-error-text' => 'Adressen skal begynde med <code>http://</code> eller <code>ftp://</code>.',
@@ -1238,18 +1255,18 @@ Sletningsloggen for denne fil er gengivet herunder.",
 'upload_source_url'  => ' (gyldig, offentligt tillgængelig URL)',
 'upload_source_file' => ' (en fil på din computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Denne specialside viser alle uploadede filer. Standardmæssigt vises de sidst uploadede filer først. Med et klik på spalteoverskriften kan sorteringen vendes om eller der kan sorteres efter en anden spalte.',
-'imagelist_search_for'  => 'Søge efter fil:',
+# Special:ListFiles
+'listfiles-summary'     => 'Denne specialside viser alle uploadede filer. Standardmæssigt vises de sidst uploadede filer først. Med et klik på spalteoverskriften kan sorteringen vendes om eller der kan sorteres efter en anden spalte.',
+'listfiles_search_for'  => 'Søge efter fil:',
 'imgfile'               => 'Fil',
-'imagelist'             => 'Billedliste',
-'imagelist_date'        => 'Dato',
-'imagelist_name'        => 'Navn',
-'imagelist_user'        => 'Bruger',
-'imagelist_size'        => 'Størrelse (Byte)',
-'imagelist_description' => 'Beskrivelse',
-
-# Image description page
+'listfiles'             => 'Billedliste',
+'listfiles_date'        => 'Dato',
+'listfiles_name'        => 'Navn',
+'listfiles_user'        => 'Bruger',
+'listfiles_size'        => 'Størrelse (Byte)',
+'listfiles_description' => 'Beskrivelse',
+
+# File description page
 'filehist'                       => 'Filhistorik',
 'filehist-help'                  => 'Klik på en dato/tid for at se den version af filen.',
 'filehist-deleteall'             => 'slet alle',
@@ -1301,7 +1318,6 @@ Sletningsloggen for denne fil er gengivet herunder.",
 'filedelete-success-old'      => '<span class="plainlinks">En gamllem version af \'\'\'[[Media:$1|$1]]\'\'\' fra $2, $3 er blevet slettet.</span>',
 'filedelete-nofile'           => "'''$1''' findes ikke på dette websted.",
 'filedelete-nofile-old'       => "Der findes ikke en version af '''$1''' fra $2, $3.",
-'filedelete-iscurrent'        => 'Du har forsøgt at slette den nyeste version. Gendan en tidligere udgave først.',
 'filedelete-otherreason'      => 'Anden/uddybende begrundelse:',
 'filedelete-reason-otherlist' => 'Anden begrundelse',
 'filedelete-reason-dropdown'  => '*Hyppige sletningsbegrundelser
@@ -1336,25 +1352,9 @@ Sletningsloggen for denne fil er gengivet herunder.",
 'randomredirect-nopages' => 'I dette navnerum findes ingen henvisninger.',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Statistiske oplysninger om {{SITENAME}}',
-'userstats'              => 'Statistik om brugere på {{SITENAME}}',
-'sitestatstext'          => "Der er {{PLURAL:\$1|'''1''' side|'''\$1''' sider ialt}} i databasen.
-Dette tal indeholder \"diskussion\"-sider, sider om {{SITENAME}}, minimale \"stub\"
-sider, omdirigeringssider og andre sider der sikkert ikke kan kaldes artikler.
-Hvis man udelader disse, så er der {{PLURAL:\$2|'''1''' side|'''\$2''' sider}} som sandsynligvis er virkelige
-indholds{{PLURAL:\$2|side|sider}}. 
-
-'''\$8''' {{PLURAL:\$8|fil|filer}} er blevet uploadet.
-
-Der har været ialt '''\$3''' {{PLURAL:\$3|sidevisning|sidevisninger}}, og '''\$4''' {{PLURAL:\$4|sideændring|sideændringer}}
-siden {{SITENAME}} blev oprettet.
-Det bliver til '''\$5''' gennemsnitlige ændringer pr. side, og '''\$6''' visninger pr. ændring.
-
-[http://meta.wikimedia.org/wiki/Help:Job_queue job queue] længden er '''\$7'''.",
-'userstatstext'          => "Der findes '''$1''' {{PLURAL:$1|registreret|registrerede}} [[Special:ListUsers|brugere]].
-deraf har '''$2''' (=$4%) $5-rettigheder.",
-'statistics-mostpopular' => 'Mest besøgte sider',
+'statistics'              => 'Statistik',
+'statistics-header-users' => 'Statistik om brugere på {{SITENAME}}',
+'statistics-mostpopular'  => 'Mest besøgte sider',
 
 'disambiguations'      => 'Artikler med flertydige titler',
 'disambiguationspage'  => 'Template:Flertydig',
@@ -1396,7 +1396,6 @@ deraf har '''$2''' (=$4%) $5-rettigheder.",
 'popularpages'            => 'Populære artikler',
 'wantedcategories'        => 'Brugte men ikke anlagte kategorier',
 'wantedpages'             => 'Ønskede artikler',
-'missingfiles'            => 'Manglende filer',
 'mostlinked'              => 'Sider med flest henvisninger',
 'mostlinkedcategories'    => 'Mest brugte kategorier',
 'mostlinkedtemplates'     => 'Hyppigst brugte skabeloner',
@@ -1442,8 +1441,6 @@ deraf har '''$2''' (=$4%) $5-rettigheder.",
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Loglister',
 'all-logs-page'        => 'Alle loglister',
-'log-search-legend'    => 'Gennemsøg logs',
-'log-search-submit'    => 'Søg',
 'alllogstext'          => 'Samlet visning af oplægningslog, sletningslog, blokeringslog, bureaukratlog og listen over beskyttede sider. Du kan sortere i visningen ved at vælge type, brugernavn og/eller en udvalgt side.',
 'logempty'             => 'Intet passende fundet.',
 'log-title-wildcard'   => 'Titel begynder med …',
@@ -1453,7 +1450,7 @@ deraf har '''$2''' (=$4%) $5-rettigheder.",
 'alphaindexline'    => '$1 til $2',
 'nextpage'          => 'Næste side ($1)',
 'prevpage'          => 'Forrige side ($1)',
-'allpagesfrom'      => 'Vis sider startende fra:',
+'allpagesfrom'      => 'Vis sider startende med:',
 'allarticles'       => 'Alle artikler',
 'allinnamespace'    => 'Alle sider (i $1 navnerummet)',
 'allnotinnamespace' => 'Alle sider (ikke i $1 navnerummet)',
@@ -1471,20 +1468,43 @@ deraf har '''$2''' (=$4%) $5-rettigheder.",
 'special-categories-sort-count' => 'sorter efter antal',
 'special-categories-sort-abc'   => 'sorter alfabetisk',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Slettede brugerbidrag',
+
+# Special:LinkSearch
+'linksearch'       => 'Søg i weblinks',
+'linksearch-pat'   => 'Søg efter links til:',
+'linksearch-ns'    => 'Navnerum:',
+'linksearch-ok'    => 'Søg',
+'linksearch-text'  => 'Wildcards som "*.wikipedia.org" kan benyttes.<br />Understøttede protokoller: <tt>$1</tt>',
+'linksearch-line'  => '$2 linker til $1',
+'linksearch-error' => 'Wildcards må kun benyttes i starten af hostnavnet.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Vis brugere fra:',
 'listusers-submit'   => 'Vis',
 'listusers-noresult' => 'Ingen bruger fundet.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Brugeroprettelseslog',
+'newuserlogpagetext'       => 'Dette er en log over de senest oprettede brugere.',
+'newuserlog-byemail'       => 'kodeord tilsendt pr. e-mail',
+'newuserlog-create-entry'  => 'Ny bruger',
+'newuserlog-create2-entry' => 'oprettede brugerkonto for $1',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Brugergrupperettigheder',
-'listgrouprights-summary'  => 'Denne side vider de brugergrupper der er defineret på denne wiki og de enkelte gruppers rettigheder.
+'listgrouprights'                 => 'Brugergrupperettigheder',
+'listgrouprights-summary'         => 'Denne side vider de brugergrupper der er defineret på denne wiki og de enkelte gruppers rettigheder.
 
 Der findes muligvis [[{{MediaWiki:Listgrouprights-helppage}}|yderligere information]] om de enkelte rettigheder.',
-'listgrouprights-group'    => 'Gruppe',
-'listgrouprights-rights'   => 'Rettigheder',
-'listgrouprights-helppage' => 'Help:Grupperettigheder',
-'listgrouprights-members'  => '(vis medlemmer)',
+'listgrouprights-group'           => 'Gruppe',
+'listgrouprights-rights'          => 'Rettigheder',
+'listgrouprights-helppage'        => 'Help:Grupperettigheder',
+'listgrouprights-members'         => '(vis medlemmer)',
+'listgrouprights-addgroup'        => 'Kan tildele grupper: $1',
+'listgrouprights-removegroup'     => 'Kan fjerne grupper: $1',
+'listgrouprights-addgroup-all'    => 'Kan tilføje alle grupper',
+'listgrouprights-removegroup-all' => 'Kan fjerne alle grupper',
 
 # E-mail user
 'mailnologin'     => 'Du er ikke logget på',
@@ -1501,7 +1521,7 @@ Der findes muligvis [[{{MediaWiki:Listgrouprights-helppage}}|yderligere informat
 'emailsubject'    => 'Emne:',
 'emailmessage'    => 'Besked:',
 'emailsend'       => 'Send',
-'emailccme'       => 'Send en kopi af denne E-mail til mig',
+'emailccme'       => 'Send en kopi af denne e-mail til mig',
 'emailccsubject'  => 'Kopi sendes til $1: $2',
 'emailsent'       => 'E-mail sendt',
 'emailsenttext'   => 'Din e-mail er blevet sendt.',
@@ -1535,12 +1555,7 @@ Der findes muligvis [[{{MediaWiki:Listgrouprights-helppage}}|yderligere informat
 'iteminvalidname'      => "Problem med '$1', ugyldigt navn...",
 'wlnote'               => "Nedenfor ses de seneste $1 {{PLURAL:$1|ændring|ændringer}} i {{PLURAL:$2|den sidste time|'''de sidste $2 timer}}'''.",
 'wlshowlast'           => 'Vis de seneste $1 timer $2 dage $3',
-'watchlist-show-bots'  => 'Vise bot-ændringer',
-'watchlist-hide-bots'  => 'Skjule bot-ændringer',
-'watchlist-show-own'   => 'vise egne ændringer',
-'watchlist-hide-own'   => 'skjule egne ændringer',
-'watchlist-show-minor' => 'vise små ændringer',
-'watchlist-hide-minor' => 'skjule små ændringer',
+'watchlist-options'    => 'Indstillinger for overvågningslisten',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Overvåge …',
@@ -1577,54 +1592,59 @@ Besøg {{fullurl:Special:Watchlist/edit}} for at ændre indstillingerne for din
 Tilbagemelding og yderligere hjælp:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Slet side',
-'confirm'                     => 'Bekræft',
-'excontent'                   => "indholdet var: '$1'",
-'excontentauthor'             => "indholdet var: '$1' (og den eneste forfatter var '$2')",
-'exbeforeblank'               => "indholdet før siden blev tømt var: '$1'",
-'exblank'                     => 'siden var tom',
-'delete-confirm'              => 'Slet "$1"',
-'delete-legend'               => 'Slet',
-'historywarning'              => 'Advarsel: Siden du er ved at slette har en historie:',
-'confirmdeletetext'           => 'Du er ved permanent at slette en side
+# Delete
+'deletepage'             => 'Slet side',
+'confirm'                => 'Bekræft',
+'excontent'              => "indholdet var: '$1'",
+'excontentauthor'        => "indholdet var: '$1' (og den eneste forfatter var '$2')",
+'exbeforeblank'          => "indholdet før siden blev tømt var: '$1'",
+'exblank'                => 'siden var tom',
+'delete-confirm'         => 'Slet "$1"',
+'delete-legend'          => 'Slet',
+'historywarning'         => 'Advarsel: Siden du er ved at slette har en historie:',
+'confirmdeletetext'      => 'Du er ved permanent at slette en side
 eller et billede sammen med hele den tilhørende historie fra databasen. Bekræft venligst at du virkelig vil gøre dette, at du forstår konsekvenserne, og at du gør dette i overensstemmelse med
 [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Gennemført',
-'deletedtext'                 => '"$1" er slettet. Se $2 for en fortegnelse over de nyeste sletninger.',
-'deletedarticle'              => 'slettede "$1"',
-'suppressedarticle'           => 'skjulte "[[$1]]"',
-'dellogpage'                  => 'Sletningslog',
-'dellogpagetext'              => 'Herunder vises de nyeste sletninger. Alle tider er serverens tid.',
-'deletionlog'                 => 'sletningslog',
-'reverted'                    => 'Gendannet en tidligere version',
-'deletecomment'               => 'Begrundelse for sletning',
-'deleteotherreason'           => 'Anden/uddybende begrundelse:',
-'deletereasonotherlist'       => 'Anden begrundelse',
-'deletereason-dropdown'       => '
+'actioncomplete'         => 'Gennemført',
+'deletedtext'            => '"$1" er slettet. Se $2 for en fortegnelse over de nyeste sletninger.',
+'deletedarticle'         => 'slettede "$1"',
+'suppressedarticle'      => 'skjulte "[[$1]]"',
+'dellogpage'             => 'Sletningslog',
+'dellogpagetext'         => 'Herunder vises de nyeste sletninger. Alle tider er serverens tid.',
+'deletionlog'            => 'sletningslog',
+'reverted'               => 'Gendannet en tidligere version',
+'deletecomment'          => 'Begrundelse for sletning',
+'deleteotherreason'      => 'Anden/uddybende begrundelse:',
+'deletereasonotherlist'  => 'Anden begrundelse',
+'deletereason-dropdown'  => '
 *Hyppige sletningsårsager
 ** Efter forfatters ønske
 ** Overtrædelse af ophavsret
 ** Hærværk',
-'delete-edit-reasonlist'      => 'Ret sletningsbegrundelser',
-'delete-toobig'               => 'Denne side har en stor historik, over {{PLURAL:$1|en version|$1 versioner}}. Sletning af sådanne sider er begrænset blevet for at forhindre utilsigtet forstyrrelse af {{SITENAME}}.',
-'delete-warning-toobig'       => 'Denne side har en stor historik, over {{PLURAL:$1|en version|$1 versioner}} versioner, slettes den kan det forstyrre driften af {{SITENAME}}, gå forsigtigt frem.',
-'rollback'                    => 'Fjern redigeringer',
-'rollback_short'              => 'Fjern redigering',
-'rollbacklink'                => 'fjern redigering',
-'rollbackfailed'              => 'Kunne ikke fjerne redigeringen',
-'cantrollback'                => 'Kan ikke fjerne redigering; den sidste bruger er den eneste forfatter.',
-'alreadyrolled'               => 'Kan ikke fjerne den seneste redigering af [[:$1]] foretaget af [[User:$2|$2]] ([[User talk:$2|diskussion]]); en anden har allerede redigeret siden eller fjernet redigeringen. Den seneste redigering er foretaget af [[User:$3|$3]] ([[User talk:$3|diskussion]]).',
-'editcomment'                 => 'Kommentaren til redigeringen var: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Gendannelse til seneste version ved $1, fjerner ændringer fra $2', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "$1's ændringer er fjernet, gendannet til den seneste version af $2.",
-'sessionfailure'              => 'Der lader til at være et problem med din loginsession; denne handling blev annulleret som en sikkerhedsforanstaltning mod kapring af sessionen. Tryk på "tilbage"-knappen og genindlæs den side du kom fra, og prøv dernæst igen.',
+'delete-edit-reasonlist' => 'Ret sletningsbegrundelser',
+'delete-toobig'          => 'Denne side har en stor historik, over {{PLURAL:$1|en version|$1 versioner}}. Sletning af sådanne sider er begrænset blevet for at forhindre utilsigtet forstyrrelse af {{SITENAME}}.',
+'delete-warning-toobig'  => 'Denne side har en stor historik, over {{PLURAL:$1|en version|$1 versioner}} versioner, slettes den kan det forstyrre driften af {{SITENAME}}, gå forsigtigt frem.',
+
+# Rollback
+'rollback'         => 'Fjern redigeringer',
+'rollback_short'   => 'Fjern redigering',
+'rollbacklink'     => 'fjern redigering',
+'rollbackfailed'   => 'Kunne ikke fjerne redigeringen',
+'cantrollback'     => 'Kan ikke fjerne redigering; den sidste bruger er den eneste forfatter.',
+'alreadyrolled'    => 'Kan ikke fjerne den seneste redigering af [[:$1]] foretaget af [[User:$2|$2]] ([[User talk:$2|diskussion]]); en anden har allerede redigeret siden eller fjernet redigeringen. Den seneste redigering er foretaget af [[User:$3|$3]] ([[User talk:$3|diskussion]]).',
+'editcomment'      => "Kommentaren til redigeringen var: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Gendannelse til seneste version ved $1, fjerner ændringer fra $2', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "$1's ændringer er fjernet, gendannet til den seneste version af $2.",
+'sessionfailure'   => 'Der lader til at være et problem med din loginsession; denne handling blev annulleret som en sikkerhedsforanstaltning mod kapring af sessionen. Tryk på "tilbage"-knappen og genindlæs den side du kom fra, og prøv dernæst igen.',
+
+# Protect
 'protectlogpage'              => 'Liste_over_beskyttede_sider',
 'protectlogtext'              => 'Herunder er en liste med sider der er blevet beskyttet/har fået fjernet beskyttelsen.',
 'protectedarticle'            => '[[$1]] beskyttet',
 'modifiedarticleprotection'   => 'ændrede beskyttelsen af "[[$1]]"',
 'unprotectedarticle'          => 'fjernet beskyttelse af [[$1]]',
 'protect-title'               => 'Ændre beskyttelse af "$1"',
+'prot_1movedto2'              => '$1 flyttet til $2',
 'protect-legend'              => 'Bekræft beskyttelse',
 'protectcomment'              => 'Begrundelse for beskyttelse',
 'protectexpiry'               => 'Udløb',
@@ -1632,9 +1652,9 @@ eller et billede sammen med hele den tilhørende historie fra databasen. Bekræf
 'protect_expiry_old'          => 'Udløbstiden ligger i fortiden.',
 'protect-unchain'             => 'Ændre flytningsbeskyttelse',
 'protect-text'                => "Her kan beskyttelsesstatus for siden '''$1''' ses og ændres.",
-'protect-locked-blocked'      => 'Du kan ikke ændre sidens status, da din brugerkonto er spærret. Her er de aktuelle beskyttelsesindstillinger for siden <strong>„$1“:</strong>',
-'protect-locked-dblock'       => 'Databasen er spærret, sidebeskyttelsen kan derfor ikke ændres. her er de aktuelle beskyttelsesindstillinger for siden <strong>„$1“:</strong>',
-'protect-locked-access'       => 'Den brugerkonto har ikke de nødvendige rettigheder til at ændre sidebeskyttelsen. Her er de aktuelle beskyttelsesindstillinger for siden <strong>„$1“:</strong>',
+'protect-locked-blocked'      => "Du kan ikke ændre sidens status, da din brugerkonto er spærret. Her er de aktuelle beskyttelsesindstillinger for siden '''„$1“:'''",
+'protect-locked-dblock'       => "Databasen er spærret, sidebeskyttelsen kan derfor ikke ændres. her er de aktuelle beskyttelsesindstillinger for siden '''„$1“:'''",
+'protect-locked-access'       => "Den brugerkonto har ikke de nødvendige rettigheder til at ændre sidebeskyttelsen. Her er de aktuelle beskyttelsesindstillinger for siden '''„$1“:'''",
 'protect-cascadeon'           => 'Denne side er del af en nedarvet skrivebeskyttelse. Wen er indeholdt i nedenstående {{PLURAL:$1|side|sider}}, som er skrivebeskyttet med tilvalg af "nedarvende sidebeskyttelse" Sidebeskyttelsen kan ændres for denne side, det påvirker dog ikke kaskadespærringen:',
 'protect-default'             => 'Alle (Standard)',
 'protect-fallback'            => 'Kræv "$1"-tilladelse',
@@ -1644,6 +1664,7 @@ eller et billede sammen med hele den tilhørende historie fra databasen. Bekræf
 'protect-expiring'            => 'til $1 (UTC)',
 'protect-cascade'             => 'Nedarvende spærring – alle skabeloner, som er indbundet i denne side spærres også.',
 'protect-cantedit'            => 'Du kan ikke ændre beskyttelsesniveau for denne side, da du ikke kan redigere fden.',
+'protect-expiry-options'      => '1 time:1 hour,2 timer:2 hours,6 timer:6 hours,1 dag:1 day,3 dage:3 days,1 uge:1 week,2 uger:2 weeks,1 måned:1 month,3 måneder:3 months,1 år:1 year,ubegrænset:indefinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Beskyttelsesstatus',
 'restriction-level'           => 'Beskyttelseshøjde',
 'minimum-size'                => 'Mindste størrelse',
@@ -1718,13 +1739,14 @@ $1',
 'blanknamespace' => '(Artikler)',
 
 # Contributions
-'contributions' => 'Brugerbidrag',
-'mycontris'     => 'Mine bidrag',
-'contribsub2'   => 'For $1 ($2)',
-'nocontribs'    => 'Ingen ændringer er fundet som opfylder disse kriterier.',
-'uctop'         => ' (seneste)',
-'month'         => 'MÃ¥ned:',
-'year'          => 'Ã…r:',
+'contributions'       => 'Brugerbidrag',
+'contributions-title' => 'Brugerbidrag for $1',
+'mycontris'           => 'Mine bidrag',
+'contribsub2'         => 'For $1 ($2)',
+'nocontribs'          => 'Ingen ændringer er fundet som opfylder disse kriterier.',
+'uctop'               => ' (seneste)',
+'month'               => 'MÃ¥ned:',
+'year'                => 'Ã…r:',
 
 'sp-contributions-newbies'     => 'Vis kun bidrag fra nye brugere',
 'sp-contributions-newbies-sub' => 'For nybegyndere',
@@ -1737,7 +1759,6 @@ $1',
 'whatlinkshere'            => 'Hvad henviser hertil',
 'whatlinkshere-title'      => 'Sider der linker til "$1"',
 'whatlinkshere-page'       => 'Side:',
-'linklistsub'              => '(Henvisningsliste)',
 'linkshere'                => "De følgende sider henviser til '''„[[:$1]]“''':",
 'nolinkshere'              => "Ingen sider henviser til '''„[[:$1]]“'''.",
 'nolinkshere-ns'           => "Ingen side henviser til '''„[[:$1]]“''' i det valgte navnerum.",
@@ -1866,6 +1887,10 @@ $1',
 
 I disse tilfælde er du nødt til at flytte eller sammenflette siden manuelt.",
 'movearticle'             => 'Flyt side',
+'movenologin'             => 'Ikke logget på',
+'movenologintext'         => 'Du skal være registreret bruger og være [[Special:UserLogin|logget på]]
+
+for at flytte en side.',
 'movenotallowed'          => 'Du har ikke rettigheder til at flytte sider.',
 'newtitle'                => 'Til ny titel',
 'move-watch'              => 'Denne side overvåges',
@@ -1897,7 +1922,6 @@ Artiklen "[[:$1]]" eksisterer allerede. Vil du slette den for at lave plads til
 'delete_and_move_confirm' => 'Slette eksisterende side før flytning',
 'delete_and_move_reason'  => 'Slet for at lave plads til flyningen',
 'selfmove'                => 'Begge sider har samme navn. Man kan ikke flytte en side oven i sig selv.',
-'immobile_namespace'      => 'MÃ¥ltitlen er en speciel type; man kan ikke flytte sider ind i det navnerum.',
 'imagenocrossnamespace'   => 'Filer kan ikke flyttes til et navnerum der ikke indeholder filer',
 'imagetypemismatch'       => 'Den nye filendelse passer ikke til filtypen',
 'imageinvalidfilename'    => 'Destinationsnavnet er ugyldigt',
@@ -1942,6 +1966,7 @@ Alle Transwiki import-aktioner protokolleres i [[Special:Log/import|import-logge
 'import-interwiki-history'   => 'Importer alle versioner af denne side',
 'import-interwiki-submit'    => 'Importer',
 'import-interwiki-namespace' => 'Importer  siderne i navnerummet:',
+'import-comment'             => 'Kommentar:',
 'importtext'                 => "Eksportér filen fra kilde-wiki'en ved hjælp af værktøjet Special:Export, gem den på din harddisk og læg den op her.",
 'importstart'                => 'Importere sider …',
 'import-revision-count'      => '– {{PLURAL:$1|1 version|$1 versioner}}',
@@ -2052,7 +2077,7 @@ Alle Transwiki import-aktioner protokolleres i [[Special:Log/import|import-logge
 'lastmodifiedatby' => 'Denne side blev senest ændret $2, $1 af $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Baseret på arbejde af $1.',
 'others'           => 'andre',
-'siteusers'        => '{{SITENAME}} bruger(e) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|bruger|brugere}} $1',
 'creditspage'      => 'Sidens forfattere',
 'nocredits'        => 'Der er ingen forfatteroplysninger om denne side.',
 
@@ -2072,6 +2097,16 @@ Alle Transwiki import-aktioner protokolleres i [[Special:Log/import|import-logge
 'numauthors'     => 'Antal forskellige forfattere (artikel): $1',
 'numtalkauthors' => 'Antal forskellige forfattere (diskussionsside): $1',
 
+# Skin names
+'skinname-standard'    => 'Klassik',
+'skinname-nostalgia'   => 'Nostalgi',
+'skinname-cologneblue' => 'Kølnerblå',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Eget udseende',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Enkelt',
+'skinname-modern'      => 'Moderne',
+
 # Math options
 'mw_math_png'    => 'Vis altid som PNG',
 'mw_math_simple' => 'HTML hvis meget simpel ellers PNG',
@@ -2125,7 +2160,7 @@ $1',
 'show-big-image'       => 'Version i større opløsning',
 'show-big-image-thumb' => '<small>Størrelse af forhåndsvisning: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galleri med de nyeste billeder',
 'imagelisttext'         => 'Herunder er en liste med $1 {{PLURAL:$1|billede|billeder}} sorteret $2.',
 'newimages-summary'     => 'Denne specialside viser de nyeste uploadede billeder og filer.',
@@ -2420,30 +2455,30 @@ Kun indholdet af lister (linjer startende med *) bliver brugt. Den første henvi
 
 # E-mail address confirmation
 'confirmemail'             => 'Bekræft e-mail-adressen',
-'confirmemail_noemail'     => 'Du har ikke angivet en gyldig E-mail-adresse i din [[Special:Preferences|brugerprofil]].',
-'confirmemail_text'        => '{{SITENAME}} kræver, at du bekræfter en E-mail-adresse (autentificering), før du kan bruge de udvidede E-mail-funktioner. Med et klik på kontrolfeltet forneden sendes en E-mail til dig. Denne E-mail indeholder et link med en bekræftelseskode. Med et klik på dette link bekræftes, at E-mail-adressen er gyldig.',
+'confirmemail_noemail'     => 'Du har ikke angivet en gyldig e-mail-adresse i din [[Special:Preferences|brugerprofil]].',
+'confirmemail_text'        => '{{SITENAME}} kræver, at du bekræfter en e-mail-adresse (autentificering), før du kan bruge de udvidede e-mail-funktioner. Med et klik på kontrolfeltet forneden sendes en e-mail til dig. Denne e-mail indeholder et link med en bekræftelseskode. Med et klik på dette link bekræftes, at e-mail-adressen er gyldig.',
 'confirmemail_pending'     => '<div class="error">En bekræftelsesmail er allerede sendt til dig. Hvis du først for nylig har oprettet brugerkontoen, vent da et par minutter på denne e-mail, før du bestiller en ny kode.</div>',
 'confirmemail_send'        => 'Send bekræftelseskode',
 'confirmemail_sent'        => 'Bekræftelses-e-amil afsendt.',
-'confirmemail_oncreate'    => 'En bekræftelseskode er sendt til din E-mail-adresse. Denne kode skal ikke bruges til anmeldelsen, den kræves dog til aktiveringen af E-mail-funktionerne indenfor Wikien.',
-'confirmemail_sendfailed'  => 'Bekræftelsesmailen kunne ikke afsendes. Kontroller at E-mail-adressen er korrekt.
+'confirmemail_oncreate'    => 'En bekræftelseskode er sendt til din e-mail-adresse. Denne kode skal ikke bruges til anmeldelsen, den kræves dog til aktiveringen af e-mail-funktionerne indenfor Wikien.',
+'confirmemail_sendfailed'  => 'Bekræftelsesmailen kunne ikke afsendes. Kontroller at e-mail-adressen er korrekt.
 
 Rückmeldung des Mailservers: $1',
 'confirmemail_invalid'     => 'Ugyldig bekræftelseskode. Kodens gyldighed er muligvis udløbet.',
-'confirmemail_needlogin'   => 'Du skal $1 for at bekræfte E-mail-adressen.',
+'confirmemail_needlogin'   => 'Du skal $1 for at bekræfte e-mail-adressen.',
 'confirmemail_success'     => 'E-mail-adressen er nu bekræftet. Du kan nu logge på.',
 'confirmemail_loggedin'    => 'E-mail-adressen er nu bekræftet.',
-'confirmemail_error'       => 'Der skete en fejl ved bekræftelsen af E-mail-adressen.',
-'confirmemail_subject'     => '[{{SITENAME}}] - bekræftelse af E-mail-adressen',
+'confirmemail_error'       => 'Der skete en fejl ved bekræftelsen af e-mail-adressen.',
+'confirmemail_subject'     => '[{{SITENAME}}] - bekræftelse af e-mail-adressen',
 'confirmemail_body'        => 'Hej,
 
-Nogen med IP-adresse $1, sandsynligvis dig, har bestilt en bekræftelse af denne E-mail-adresse til brugerkontoen "$2" på {{SITENAME}}.
+Nogen med IP-adresse $1, sandsynligvis dig, har bestilt en bekræftelse af denne e-mail-adresse til brugerkontoen "$2" på {{SITENAME}}.
 
-For at aktivere E-mail-funktionen for {{SITENAME}} (igen) og for at bekræfte, at denne brugerkonto virkelig hører til din E-mail-adresse og dermed til dig, bedes du åbne det følgende link i din browser: $3
+For at aktivere e-mail-funktionen for {{SITENAME}} (igen) og for at bekræfte, at denne brugerkonto virkelig hører til din e-mail-adresse og dermed til dig, bedes du åbne det følgende link i din browser: $3
 
 Bekræftelseskoden er gyldig indtil følgende tidspunkt: $4
 
-Hvis denne E-mail-adresse *ikke* hører til den anførte brugerkonto, skal du i stedet åbne dette link i din browser: $5
+Hvis denne e-mail-adresse *ikke* hører til den anførte brugerkonto, skal du i stedet åbne dette link i din browser: $5
 
 -- 
 {{SITENAME}}: {{fullurl:{{Mediawiki:mainpage}}}}',
@@ -2465,27 +2500,17 @@ $1
 'trackbackdeleteok' => 'Trackback blev slettet.',
 
 # Delete conflict
-'deletedwhileediting' => '<span class="error">Bemærk: Det blev forsøgt at slette denne side, efter at du var begyndt, at ændre den! 
+'deletedwhileediting' => 'Bemærk: Det blev forsøgt at slette denne side, efter at du var begyndt, at ændre den! 
 Kig i [{{fullurl:Special:Log|type=delete&page=}}{{FULLPAGENAMEE}} slette-loggen], 
-hvorfor siden blev slettet. Hvis du gemmer siden bliver den oprettet igen.</span>',
+hvorfor siden blev slettet. Hvis du gemmer siden bliver den oprettet igen.',
 'confirmrecreate'     => "Bruger [[User:$1|$1]] ([[User talk:$1|Diskussion]]) har slettet denne side, efter at du begyndte at ændre den. Begrundelsen lyder:
 : ''$2''
 Bekræft venligst, at du virkelig vil oprette denne side igen.",
 'recreate'            => 'Opret igen',
 
-# HTML dump
-'redirectingto' => 'Videresendt til [[:$1]]',
-
 # action=purge
-'confirm_purge'        => 'Slette denne side fra serverens cache? $1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Søger efter sider, hvori ''$1'' forekommer.",
-'searchnamed'      => "Søger efter sider, hvis navn indeholder ''$1''.",
-'articletitles'    => "Sider, som begynder med ''$1''",
-'hideresults'      => 'Skjul',
-'useajaxsearch'    => 'Brug AJAX-søgning',
+'confirm-purge-top'    => 'Slette denne side fra serverens cache?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� forrige side',
@@ -2572,13 +2597,13 @@ Bekræft venligst, at du virkelig vil oprette denne side igen.",
 'filepath-submit'  => 'Vis sti',
 'filepath-summary' => 'Denne specialside giver et direkte link til en fil. Billder vises i fuld opløsning og andre mediatyper vil blive aktiveret med deres tilhærende program.
 
-Angiv filnavnet uden "{{ns:image}}:"-præfix.',
+Angiv filnavnet uden "{{ns:file}}:"-præfix.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Find dubletfiler',
 'fileduplicatesearch-summary'  => 'Find dublerede filer baseret på deres hash-værdi.
 
-Angiv filnavnet uden "{{ns:image}}:"-præfix.',
+Angiv filnavnet uden "{{ns:file}}:"-præfix.',
 'fileduplicatesearch-legend'   => 'Find dubletfiler.',
 'fileduplicatesearch-filename' => 'Filnavn:',
 'fileduplicatesearch-submit'   => 'Find',
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 43a27deb..c0ad1870 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -5,8 +5,11 @@
  * @file
  *
  * @author Church of emacs
+ * @author Duesentrieb
  * @author Jimmy Collins <jimmy.collins@web.de>
+ * @author Li-sung
  * @author Melancholie
+ * @author Meno25
  * @author Metalhead64
  * @author MichaelFrey
  * @author Omnipaedista
@@ -18,6 +21,7 @@
  * @author Revolus
  * @author Spacebirdy
  * @author Tim Bartel (avatar) <wikipedistik@computerkultur.org> small changes
+ * @author UV
  * @author Umherirrender
  * @author W (aka Wuzur)
  * @author לערי ריינה�רט
@@ -26,14 +30,12 @@
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Spezial',
-	NS_MAIN             => '',
 	NS_TALK             => 'Diskussion',
 	NS_USER             => 'Benutzer',
 	NS_USER_TALK        => 'Benutzer_Diskussion',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_Diskussion',
-	NS_IMAGE            => 'Bild',
-	NS_IMAGE_TALK       => 'Bild_Diskussion',
+	NS_FILE             => 'Datei',
+	NS_FILE_TALK        => 'Datei_Diskussion',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskussion',
 	NS_TEMPLATE         => 'Vorlage',
@@ -41,20 +43,15 @@ $namespaceNames = array(
 	NS_HELP             => 'Hilfe',
 	NS_HELP_TALK        => 'Hilfe_Diskussion',
 	NS_CATEGORY         => 'Kategorie',
-	NS_CATEGORY_TALK    => 'Kategorie_Diskussion'
+	NS_CATEGORY_TALK    => 'Kategorie_Diskussion',
 );
 
-$skinNames = array(
-	'standard'      => 'Klassik',
-	'nostalgia'     => 'Nostalgie',
-	'cologneblue'   => 'Kölnisch Blau',
-	'monobook'      => 'MonoBook',
-	'myskin'        => 'MySkin',
-	'chick'         => 'Küken',
-	'simple'        => 'Einfach',
-	'modern'        => 'Modern'
+$namespaceAliases = array(
+	'Bild' => NS_FILE,
+	'Bild_Diskussion' => NS_FILE_TALK,
 );
 
+
 $bookstoreList = array(
 	'abebooks.de' => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1',
 	'amazon.de' => 'http://www.amazon.de/exec/obidos/ISBN=$1',
@@ -66,14 +63,6 @@ $bookstoreList = array(
 $separatorTransformTable = array(',' => '.', '.' => ',' );
 $linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
 
-/**
- * Alternate names of special pages. All names are case-insensitive. The first
- * listed alias will be used as the default. Aliases from the fallback
- * localisation (usually English) will be included by default.
- *
- * This array may be altered at runtime using the LanguageGetSpecialPageAliases
- * hook.
- */
 $specialPageAliases = array(
 	'DoubleRedirects'           => array( 'Doppelte_Weiterleitungen' ),
 	'BrokenRedirects'           => array( 'Kaputte_Weiterleitungen' ),
@@ -85,7 +74,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Beobachtungsliste' ),
 	'Recentchanges'             => array( 'Letzte_Änderungen' ),
 	'Upload'                    => array( 'Hochladen' ),
-	'Imagelist'                 => array( 'Dateien', 'Dateiliste' ),
+	'Listfiles'                 => array( 'Dateien', 'Dateiliste' ),
 	'Newimages'                 => array( 'Neue_Dateien' ),
 	'Listusers'                 => array( 'Benutzer' ),
 	'Listgrouprights'           => array( 'Gruppenrechte' ),
@@ -100,12 +89,13 @@ $specialPageAliases = array(
 	'Unusedimages'              => array( 'Unbenutzte_Dateien' ),
 	'Wantedpages'               => array( 'Gewünschte_Seiten' ),
 	'Wantedcategories'          => array( 'Gewünschte_Kategorien' ),
-	'Missingfiles'              => array( 'Fehlende_Dateien' ),
+	'Wantedfiles'               => array( 'Fehlende_Dateien' ),
+	'Wantedtemplates'           => array( 'Fehlende_Vorlagen' ),
 	'Mostlinked'                => array( 'Meistverlinkte_Seiten' ),
 	'Mostlinkedcategories'      => array( 'Meistbenutzte_Kategorien' ),
 	'Mostlinkedtemplates'       => array( 'Meistbenutzte_Vorlagen' ),
-	'Mostcategories'            => array( 'Meistkategorisierte_Seiten' ),
 	'Mostimages'                => array( 'Meistbenutzte_Dateien' ),
+	'Mostcategories'            => array( 'Meistkategorisierte_Seiten' ),
 	'Mostrevisions'             => array( 'Meistbearbeitete_Seiten' ),
 	'Fewestrevisions'           => array( 'Wenigstbearbeitete_Seiten' ),
 	'Shortpages'                => array( 'Kürzeste_Seiten' ),
@@ -116,8 +106,8 @@ $specialPageAliases = array(
 	'Protectedpages'            => array( 'Geschützte_Seiten' ),
 	'Protectedtitles'           => array( 'Gesperrte_Titel' ),
 	'Allpages'                  => array( 'Alle_Seiten' ),
-	'Prefixindex'               => array( 'Präfixindex' ) ,
-	'Ipblocklist'               => array( 'Gesperrte_IPs' ),
+	'Prefixindex'               => array( 'Präfixindex' ),
+	'Ipblocklist'               => array( 'Liste der Sperren', 'Gesperrte_IPs' ),
 	'Specialpages'              => array( 'Spezialseiten' ),
 	'Contributions'             => array( 'Beiträge' ),
 	'Emailuser'                 => array( 'E-Mail' ),
@@ -129,7 +119,6 @@ $specialPageAliases = array(
 	'Booksources'               => array( 'ISBN-Suche' ),
 	'Categories'                => array( 'Kategorien' ),
 	'Export'                    => array( 'Exportieren' ),
-	'Version'                   => array( 'Version' ),
 	'Allmessages'               => array( 'MediaWiki-Systemnachrichten' ),
 	'Log'                       => array( 'Logbuch' ),
 	'Blockip'                   => array( 'Sperren' ),
@@ -152,11 +141,14 @@ $specialPageAliases = array(
 	'Listbots'                  => array( 'Bots' ),
 	'Popularpages'              => array( 'Beliebteste_Seiten' ),
 	'Search'                    => array( 'Suche' ),
-	'Resetpass'                 => array( 'Passwort_zurücksetzen' ),
+	'Resetpass'                 => array( 'Passwort_ändern', 'Passwort_zurücksetzen' ),
 	'Withoutinterwiki'          => array( 'Fehlende_Interwikis' ),
 	'MergeHistory'              => array( 'Versionsgeschichten_vereinen' ),
 	'Filepath'                  => array( 'Dateipfad' ),
 	'Invalidateemail'           => array( 'E-Mail_nicht_bestaetigen' ),
+	'Blankpage'                 => array( 'Leerseite' ),
+	'LinkSearch'                => array( 'Weblink-Suche' ),
+	'DeletedContributions'      => array( 'Gelöschte Beiträge' ),
 );
 
 $datePreferences = array(
@@ -192,19 +184,138 @@ $dateFormats = array(
 	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns'
 );
 
+$magicWords = array(
+	'notoc'                 => array( '0', '__KEIN_INHALTSVERZEICHNIS__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__KEINE_GALERIE__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__INHALTSVERZEICHNIS_ERZWINGEN__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__INHALTSVERZEICHNIS__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__ABSCHNITTE_NICHT_BEARBEITEN__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'JETZIGER_MONAT', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'JETZIGER_MONATSNAME', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'JETZIGER_MONATSNAME_GENITIV', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'JETZIGER_MONATSNAME_KURZ', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'JETZIGER_KALENDERTAG', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'JETZIGER_KALENDERTAG_2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'JETZIGER_WOCHENTAG', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'JETZIGES_JAHR', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'JETZIGE_UHRZEIT', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'JETZIGE_STUNDE', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'JETZIGER_KALENDERMONAT', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'LOKALER_MONATSNAME', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'LOKALER_MONATSNAME_GENITIV', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'LOKALER_MONATSNAME_KURZ', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'LOKALER_KALENDERTAG', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'LOKALER_KALENDERTAG_2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'LOKALER_WOCHENTAG', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'LOKALES_JAHR', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'LOKALE_UHRZEIT', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'LOKALE_STUNDE', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'SEITENANZAHL', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'DATEIANZAHL', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'BENUTZERANZAHL', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'BEARBEITUNGSANZAHL', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'BETRACHTUNGEN', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', 'SEITENNAME', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'SEITENNAME_URL', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'NAMENSRAUM', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'NAMENSRAUM_URL', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'DISKUSSIONSNAMENSRAUM', 'DISK_NR', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'DISKUSSIONSNAMENSRAUM_URL', 'DISK_NR_URL', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'HAUPTNAMENSRAUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'HAUPTNAMENSRAUM_URL', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'VOLLER_SEITENNAME', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'VOLLER_SEITENNAME_URL', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'UNTERSEITE', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'UNTERSEITE_URL', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'OBERSEITE', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'OBERSEITE_URL', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'DISKUSSIONSSEITE', 'DISK', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'DISKUSSIONSSEITE_URL', 'DISK_URL', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'HAUPTSEITE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'HAUPTSEITE_URL', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subst'                 => array( '0', 'ERS:', 'SUBST:' ),
+	'img_thumbnail'         => array( '1', 'miniatur', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'miniatur=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'rechts', 'right' ),
+	'img_left'              => array( '1', 'links', 'left' ),
+	'img_none'              => array( '1', 'ohne', 'none' ),
+	'img_center'            => array( '1', 'zentriert', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'gerahmt', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'rahmenlos', 'frameless' ),
+	'img_page'              => array( '1', 'seite=$1', 'seite $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'hochkant', 'hochkant=$1', 'hochkant $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'rand', 'border' ),
+	'img_link'              => array( '1', 'verweis=$1', 'link=$1' ),
+	'img_alt'               => array( '1', 'alternativtext=$1', 'alt=$1' ),
+	'int'                   => array( '0', 'NACHRICHT:', 'INT:' ),
+	'sitename'              => array( '1', 'PROJEKTNAME', 'SITENAME' ),
+	'ns'                    => array( '0', 'NR:', 'NS:' ),
+	'localurl'              => array( '0', 'LOKALE_URL:', 'LOCALURL:' ),
+	'scriptpath'            => array( '0', 'SKRIPTPFAD', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'GRAMMATIK', 'GRAMMAR:' ),
+	'currentweek'           => array( '1', 'JETZIGE_KALENDERWOCHE', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'JETZIGER_WOCHENTAG_ZAHL', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'LOKALE_KALENDERWOCHE', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'LOKALER_WOCHENTAG_ZAHL', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'REVISIONSID', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'REVISIONSTAG', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'REVISIONSTAG2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'REVISIONSMONAT', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'REVISIONSJAHR', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'REVISIONSZEITSTEMPEL', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'PLURAL', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'VOLLSTÄNDIGE_URL:', 'FULLURL:' ),
+	'lcfirst'               => array( '0', 'INITIAL_KLEIN:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'INITIAL_GROSS:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'KLEIN:', 'LC:' ),
+	'uc'                    => array( '0', 'GROSS:', 'UC:' ),
+	'raw'                   => array( '0', 'ROH:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'SEITENTITEL', 'DISPLAYTITLE' ),
+	'newsectionlink'        => array( '1', '__PLUS_LINK__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'JETZIGE_VERSION', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'URLENKODIERT:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'SPRUNGMARKEENKODIERT:', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'JETZIGER_ZEITSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'LOKALER_ZEITSTEMPEL', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'TEXTAUSRICHTUNG', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#SPRACHE:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'INHALTSSPRACHE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'SEITEN_IM_NAMENSRAUM:', 'SEITEN_NR:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'ADMINANZAHL', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'ZAHLENFORMAT', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'FÃœLLENLINKS', 'PADLEFT' ),
+	'padright'              => array( '0', 'FÃœLLENRECHTS', 'PADRIGHT' ),
+	'special'               => array( '0', 'spezial', 'special' ),
+	'defaultsort'           => array( '1', 'SORTIERUNG:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'DATEIPFAD:', 'FILEPATH:' ),
+	'hiddencat'             => array( '1', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'SEITEN_IN_KATEGORIE', 'SEITEN_KAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'SEITENGRÖSSE', 'PAGESIZE' ),
+	'index'                 => array( '1', '__INDIZIEREN__', '__INDEX__' ),
+	'noindex'               => array( '1', '__NICHT_INDIZIEREN__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'BENUTZER_IN_GRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__PERMANENTE_WEITERLEITUNG__', '__STATICREDIRECT__' ),
+);
+
+$imageFiles = array(
+	'button-bold'     => 'de/button_bold.png',
+	'button-italic'   => 'de/button_italic.png',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Links unterstreichen:',
-'tog-highlightbroken'         => 'Links auf leere Seiten hervorheben <a href="" class="new">Beispiel</a> (Alternative: wie dieser<a href="" class="internal">?</a>).',
+'tog-highlightbroken'         => 'Links auf nicht vorhandene Seiten hervorheben <a href="" class="new">Beispiel</a> (Alternative: wie dieser<a href="" class="internal">?</a>)',
 'tog-justify'                 => 'Text als Blocksatz',
 'tog-hideminor'               => 'Kleine Änderungen ausblenden',
 'tog-extendwatchlist'         => 'Erweiterte Beobachtungsliste',
 'tog-usenewrc'                => 'Erweiterte Darstellung (benötigt JavaScript)',
 'tog-numberheadings'          => 'Ãœberschriften automatisch nummerieren',
 'tog-showtoolbar'             => 'Bearbeiten-Werkzeugleiste anzeigen',
-'tog-editondblclick'          => 'Seiten mit Doppelklick bearbeiten (JavaScript)',
-'tog-editsection'             => 'Links zum Bearbeiten einzelner Absätze anzeigen',
-'tog-editsectiononrightclick' => 'Einzelne Absätze per Rechtsklick bearbeiten (JavaScript)',
+'tog-editondblclick'          => 'Seiten mit Doppelklick bearbeiten (benötigt JavaScript)',
+'tog-editsection'             => 'Links zum Bearbeiten einzelner Abschnitte anzeigen',
+'tog-editsectiononrightclick' => 'Einzelne Abschnitte per Rechtsklick bearbeiten (benötigt JavaScript)',
 'tog-showtoc'                 => 'Anzeigen eines Inhaltsverzeichnisses bei Seiten mit mehr als drei Ãœberschriften',
 'tog-rememberpassword'        => 'Benutzer soll auf diesem Computer dauerhaft angemeldet bleiben',
 'tog-editwidth'               => 'Text-Eingabefeld mit voller Breite',
@@ -224,23 +335,25 @@ $messages = array(
 'tog-fancysig'                => 'Signatur ohne Verlinkung zur Benutzerseite',
 'tog-externaleditor'          => 'Externen Editor als Standard benutzen (nur für Experten, es müssen spezielle Einstellungen auf dem eigenen Computer vorgenommen werden)',
 'tog-externaldiff'            => 'Externes Diff-Programm als Standard benutzen (nur für Experten, es müssen spezielle Einstellungen auf dem eigenen Computer vorgenommen werden)',
-'tog-showjumplinks'           => '„Wechseln-zu“-Links ermöglichen',
-'tog-uselivepreview'          => 'Live-Vorschau nutzen (JavaScript) (experimentell)',
+'tog-showjumplinks'           => '„Wechseln zu“-Links aktivieren',
+'tog-uselivepreview'          => 'Live-Vorschau nutzen (benötigt JavaScript) (experimentell)',
 'tog-forceeditsummary'        => 'Warnen, wenn beim Speichern die Zusammenfassung fehlt',
 'tog-watchlisthideown'        => 'Eigene Bearbeitungen ausblenden',
 'tog-watchlisthidebots'       => 'Bearbeitungen durch Bots ausblenden',
 'tog-watchlisthideminor'      => 'Kleine Bearbeitungen ausblenden',
+'tog-watchlisthideliu'        => 'Bearbeitungen angemeldeter Benutzer ausblenden',
+'tog-watchlisthideanons'      => 'Bearbeitungen anonymer Benutzer (IP-Adressen) ausblenden',
 'tog-nolangconversion'        => 'Konvertierung von Sprachvarianten deaktivieren',
 'tog-ccmeonemails'            => 'Schicke mir Kopien der E-Mails, die ich anderen Benutzern sende',
 'tog-diffonly'                => 'Zeige beim Versionsvergleich nur die Unterschiede, nicht die vollständige Seite',
 'tog-showhiddencats'          => 'Zeige versteckte Kategorien',
+'tog-noconvertlink'           => 'Konvertierung des Titels deaktivieren',
+'tog-norollbackdiff'          => 'Unterschied nach dem Zurücksetzen unterdrücken',
 
 'underline-always'  => 'immer',
 'underline-never'   => 'nie',
 'underline-default' => 'abhängig von Browsereinstellung',
 
-'skinpreview' => '(Vorschau)',
-
 # Dates
 'sunday'        => 'Sonntag',
 'monday'        => 'Montag',
@@ -334,7 +447,7 @@ $messages = array(
 'mytalk'         => 'Eigene Diskussion',
 'anontalk'       => 'Diskussionsseite dieser IP',
 'navigation'     => 'Navigation',
-'and'            => 'und',
+'and'            => '&#32;und',
 
 # Metadata in edit box
 'metadata_help' => 'Metadaten:',
@@ -371,7 +484,7 @@ $messages = array(
 'talkpagelinktext'  => 'Diskussion',
 'specialpage'       => 'Spezialseite',
 'personaltools'     => 'Persönliche Werkzeuge',
-'postcomment'       => 'Kommentar hinzufügen',
+'postcomment'       => 'Neuer Abschnitt',
 'articlepage'       => 'Seite',
 'talk'              => 'Diskussion',
 'views'             => 'Ansichten',
@@ -397,8 +510,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ãœber {{SITENAME}}',
 'aboutpage'            => 'Project:Ãœber_{{SITENAME}}',
-'bugreports'           => 'Kontakt',
-'bugreportspage'       => 'Project:Kontakt',
 'copyright'            => 'Inhalt ist verfügbar unter der $1.',
 'copyrightpagename'    => '{{SITENAME}} Urheberrecht',
 'copyrightpage'        => '{{ns:project}}:Urheberrecht',
@@ -421,9 +532,7 @@ $messages = array(
 
 'badaccess'        => 'Keine ausreichenden Rechte',
 'badaccess-group0' => 'Du hast nicht die erforderliche Berechtigung für diese Aktion.',
-'badaccess-group1' => 'Diese Aktion ist beschränkt auf Benutzer, die der Gruppe „$1“ angehören.',
-'badaccess-group2' => 'Diese Aktion ist beschränkt auf Benutzer, die einer der Gruppen „$1“ angehören.',
-'badaccess-groups' => 'Diese Aktion ist beschränkt auf Benutzer, die einer der Gruppen „$1“ angehören.',
+'badaccess-groups' => 'Diese Aktion ist beschränkt auf Benutzer, die {{PLURAL:$2|der Gruppe|einer der Gruppen}} „$1“ angehören.',
 
 'versionrequired'     => 'Version $1 von MediaWiki ist erforderlich',
 'versionrequiredtext' => 'Version $1 von MediaWiki ist erforderlich, um diese Seite zu nutzen. Siehe die [[Special:Version|Versionsseite]]',
@@ -438,6 +547,8 @@ $messages = array(
 'editsection'             => 'Bearbeiten',
 'editold'                 => 'Bearbeiten',
 'viewsourceold'           => 'Quelltext zeigen',
+'editlink'                => 'bearbeiten',
+'viewsourcelink'          => 'Quelltext einsehen',
 'editsectionhint'         => 'Abschnitt bearbeiten: $1',
 'toc'                     => 'Inhaltsverzeichnis',
 'showtoc'                 => 'Anzeigen',
@@ -459,7 +570,7 @@ $messages = array(
 'nstab-user'      => 'Benutzerseite',
 'nstab-media'     => 'Media',
 'nstab-special'   => 'Spezialseite',
-'nstab-project'   => 'Portalseite',
+'nstab-project'   => 'Projektseite',
 'nstab-image'     => 'Datei',
 'nstab-mediawiki' => 'MediaWiki-Systemtext',
 'nstab-template'  => 'Vorlage',
@@ -468,7 +579,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Diese Aktion gibt es nicht',
-'nosuchactiontext'  => 'Die in der URL angegebene Aktion wird von MediaWiki nicht unterstützt.',
+'nosuchactiontext'  => 'Die in der URL angegebene Aktion wird von MediaWiki nicht unterstützt.
+Es kann ein Schreibfehler in der URL vorliegen oder es wurde ein fehlerhafter Link angeklickt.
+Es kann sich auch um einen Bug auf {{SITENAME}} handeln.',
 'nosuchspecialpage' => 'Spezialseite nicht vorhanden',
 'nospecialpagetext' => "<big>'''Die aufgerufene Spezialseite ist nicht vorhanden.'''</big>
 
@@ -477,7 +590,8 @@ Alle verfügbaren Spezialseiten sind in der [[Special:SpecialPages|Liste der Spe
 # General errors
 'error'                => 'Fehler',
 'databaseerror'        => 'Fehler in der Datenbank',
-'dberrortext'          => 'Es gab einen Syntaxfehler in der Datenbankabfrage.
+'dberrortext'          => 'Es ist ein Datenbankfehler aufgetreten.
+Der Grund kann ein Timeout sein, der Ausfall eines Servers oder auch ein Programmierfehler.
 Die letzte Datenbankabfrage lautete: <blockquote><tt>$1</tt></blockquote> aus der Funktion „<tt>$2</tt>“.
 MySQL meldete den Fehler „<tt>$3: $4</tt>“.',
 'dberrortextcl'        => 'Es gab einen Syntaxfehler in der Datenbankabfrage.
@@ -515,7 +629,6 @@ Falls dies nicht der Fall ist, hast du eventuell einen Fehler in der Software ge
 'cannotdelete'         => 'Die gewählte Seite kann nicht gelöscht werden. Möglicherweise wurde sie bereits entfernt.',
 'badtitle'             => 'Ungültiger Titel',
 'badtitletext'         => 'Der Titel der angeforderten Seite ist ungültig, leer oder ein ungültiger Sprachlink von einem anderen Wiki.',
-'perfdisabled'         => "'''Entschuldigung!''' Diese Funktion wurde wegen Überlastung des Servers vorübergehend deaktiviert.",
 'perfcached'           => 'Die folgenden Daten stammen aus dem Cache und sind möglicherweise nicht aktuell:',
 'perfcachedts'         => 'Diese Daten stammen aus dem Cache, letztes Update: $1',
 'querypage-no-updates' => "'''Die Aktualisierungsfunktion für diese Seite ist zur Zeit deaktiviert. Die Daten werden bis auf weiteres nicht erneuert.'''",
@@ -529,7 +642,9 @@ Abfrage: $2',
 'protectedpagetext'    => 'Diese Seite ist für das Bearbeiten gesperrt.',
 'viewsourcetext'       => 'Quelltext dieser Seite:',
 'protectedinterface'   => 'Diese Seite enthält Text für das Sprach-Interface der Software und ist gesperrt, um Missbrauch zu verhindern.',
-'editinginterface'     => "'''Warnung:''' Diese Seite enthält von der MediaWiki-Software benutzten Text. Änderungen wirken sich auf die Benutzeroberfläche aus.",
+'editinginterface'     => "'''Warnung:''' Diese Seite enthält von der MediaWiki-Software benutzten Text.
+Änderungen wirken sich auf die Benutzeroberfläche aus.
+Für Übersetzungen ziehe bitte in Betracht, diese im [http://translatewiki.net/wiki/Main_Page?setlang=de Translatewiki], dem MediaWiki-Lokalisierungsprojekt, durchzuführen.",
 'sqlhidden'            => '(SQL-Abfrage versteckt)',
 'cascadeprotected'     => 'Diese Seite ist zur Bearbeitung gesperrt. Sie ist in die {{PLURAL:$1|folgende Seite|folgenden Seiten}} eingebunden, die mittels der Kaskadensperroption geschützt {{PLURAL:$1|ist|sind}}:
 $2',
@@ -540,18 +655,19 @@ $2',
 Die Sperre wurde durch [[User:$1|$1]] mit der Begründung ''„$2“'' eingerichtet.",
 
 # Virus scanner
-'virus-badscanner'     => 'Fehlerhafte Konfiguration: unbekannter Virenscanner: <i>$1</i>',
+'virus-badscanner'     => "Fehlerhafte Konfiguration: unbekannter Virenscanner: ''$1''",
 'virus-scanfailed'     => 'Scan fehlgeschlagen (code $1)',
 'virus-unknownscanner' => 'Unbekannter Virenscanner:',
 
 # Login and logout pages
 'logouttitle'                => 'Benutzer-Abmeldung',
-'logouttext'                 => '<strong>Du bist nun abgemeldet.</strong>
+'logouttext'                 => "'''Du bist nun abgemeldet.'''
 
-Du kannst {{SITENAME}} jetzt anonym weiter benutzen, oder dich erneut unter dem selben oder einem anderen Benutzernamen [[Special:UserLogin|anmelden]].',
+Du kannst {{SITENAME}} jetzt anonym weiter benutzen, oder dich erneut unter dem selben oder einem anderen Benutzernamen [[Special:UserLogin|anmelden]].",
 'welcomecreation'            => '== Willkommen, $1! ==
 
-Dein Benutzerkonto wurde eingerichtet. Vergiss nicht, deine Einstellungen anzupassen.',
+Dein Benutzerkonto wurde eingerichtet.
+Vergiss nicht, deine [[Special:Preferences|{{SITENAME}}-Einstellungen]] anzupassen.',
 'loginpagetitle'             => 'Benutzer-Anmeldung',
 'yourname'                   => 'Benutzername:',
 'yourpassword'               => 'Passwort:',
@@ -559,7 +675,6 @@ Dein Benutzerkonto wurde eingerichtet. Vergiss nicht, deine Einstellungen anzupa
 'remembermypassword'         => 'auf diesem Computer dauerhaft anmelden',
 'yourdomainname'             => 'Deine Domain:',
 'externaldberror'            => 'Entweder es liegt ein Fehler bei der externen Authentifizierung vor, oder du darfst dein externes Benutzerkonto nicht aktualisieren.',
-'loginproblem'               => "'''Es gab ein Problem mit deiner Anmeldung.'''<br />Bitte versuche es nochmal!",
 'login'                      => 'Anmelden',
 'nav-login-createaccount'    => 'Anmelden',
 'loginprompt'                => 'Zur Anmeldung müssen Cookies aktiviert sein.',
@@ -591,13 +706,13 @@ Dein Benutzerkonto wurde eingerichtet. Vergiss nicht, deine Einstellungen anzupa
 'prefs-help-email'           => 'Die Angabe einer E-Mail ist optional, ermöglicht aber die Zusendung eines Ersatzpasswortes, wenn du dein Passwort vergessen hast.
 Mit anderen Benutzer kannst du auch über die Benutzerdiskussionsseiten Kontakt aufnehmen, ohne dass du deine Identität offenlegen musst.',
 'prefs-help-email-required'  => 'Es wird eine gültige E-Mail-Adresse benötigt.',
-'nocookiesnew'               => 'Der Benutzerzugang wurde erstellt, aber du bist nicht eingeloggt. {{SITENAME}} benötigt für diese Funktion Cookies, bitte aktiviere diese und logge dich dann mit deinem neuen Benutzernamen und dem zugehörigen Passwort ein.',
-'nocookieslogin'             => '{{SITENAME}} benutzt Cookies zum Einloggen der Benutzer. Du hast Cookies deaktiviert, bitte aktiviere diese und versuchen es erneut.',
+'nocookiesnew'               => 'Der Benutzerzugang wurde erstellt, aber du bist nicht angemeldet. {{SITENAME}} benötigt für diese Funktion Cookies, bitte aktiviere diese und melde dich dann mit deinem neuen Benutzernamen und dem zugehörigen Passwort an.',
+'nocookieslogin'             => '{{SITENAME}} benutzt Cookies zur Anmeldung der Benutzer. Du hast Cookies deaktiviert, bitte aktiviere diese und versuchen es erneut.',
 'noname'                     => 'Du musst einen gültigen Benutzernamen angeben.',
 'loginsuccesstitle'          => 'Anmeldung erfolgreich',
 'loginsuccess'               => 'Du bist jetzt als „$1“ bei {{SITENAME}} angemeldet.',
 'nosuchuser'                 => 'Der Benutzername „$1“ existiert nicht.
-Überprüfe die Schreibweise oder [[Special:UserLogin/signup|melde dich als neuer Benutzer an]].',
+Überprüfe die Schreibweise (Groß-/Kleinschreibung beachten) oder [[Special:UserLogin/signup|melde dich als neuer Benutzer an]].',
 'nosuchusershort'            => 'Der Benutzername „<nowiki>$1</nowiki>“ existiert nicht. Bitte überprüfe die Schreibweise.',
 'nouserspecified'            => 'Bitte gib einen Benutzernamen an.',
 'wrongpassword'              => 'Das Passwort ist falsch (oder fehlt). Bitte versuche es erneut.',
@@ -621,10 +736,12 @@ Bitte melde dich damit an, sobald du es erhalten hast. Das alte Passwort bleibt
 Bevor eine E-Mail von anderen Benutzern über die E-Mail-Funktion empfangen werden kann, muss die Adresse und ihre tatsächliche Zugehörigkeit zu diesem Benutzerkonto erst bestätigt werden. Bitte befolge die Hinweise in der Bestätigungs-E-Mail.',
 'throttled-mailpassword'     => 'Es wurde innerhalb der letzten {{PLURAL:$1|Stunde|$1 Stunden}} bereits ein neues Passwort angefordert. Um einen Missbrauch der Funktion zu verhindern, kann nur {{PLURAL:$1|einmal pro Stunde|alle $1 Stunden}} ein neues Passwort angefordert werden.',
 'mailerror'                  => 'Fehler beim Senden der E-Mail: $1',
-'acct_creation_throttle_hit' => 'Du hast schon $1 Benutzerkonten angelegt und kannst jetzt keine weiteren mehr anlegen.',
-'emailauthenticated'         => 'Deine E-Mail-Adresse wurde bestätigt: $1.',
+'acct_creation_throttle_hit' => 'Besucher dieses Wikis, die deine IP-Adresse verwenden, haben innerhalb des letzten Tages {{PLURAL:$1|1 Benutzerkonto|$1 Benutzerkonten}} erstellt, was die maximal erlaubte Anzahl in dieser Zeitperiode ist.
+
+Besucher, die diese IP-Adresse verwenden, können momentan keine Benutzerkonten mehr erstellen.',
+'emailauthenticated'         => 'Deine E-Mail-Adresse wurde am $2 um $3 Uhr bestätigt.',
 'emailnotauthenticated'      => 'Deine E-Mail-Adresse ist noch nicht bestätigt. Die folgenden E-Mail-Funktionen stehen erst nach erfolgreicher Bestätigung zur Verfügung.',
-'noemailprefs'               => 'Gib eine E-Mail-Adresse an, damit die nachfolgenden Funktionen zur Verfügung stehen.',
+'noemailprefs'               => 'Gib eine E-Mail-Adresse in den Einstellungen an, damit die nachfolgenden Funktionen zur Verfügung stehen.',
 'emailconfirmlink'           => 'E-Mail-Adresse bestätigen (authentifizieren).',
 'invalidemailaddress'        => 'Die E-Mail-Adresse wird nicht akzeptiert, weil sie ein ungültiges Format (eventuell ungültige Zeichen) zu haben scheint. Bitte gib eine korrekte Adresse ein oder leere das Feld.',
 'accountcreated'             => 'Benutzerkonto erstellt',
@@ -633,18 +750,26 @@ Bevor eine E-Mail von anderen Benutzern über die E-Mail-Funktion empfangen werd
 'createaccount-text'         => 'Es wurde für dich ein Benutzerkonto „$2“ auf {{SITENAME}} ($4) erstellt. Das automatisch generierte Passwort für „$2“ ist „$3“. Du solltest dich nun anmelden und das Passwort ändern.
 
 Falls das Benutzerkonto irrtümlich angelegt wurde, kannst du diese Nachricht ignorieren.',
+'login-throttled'            => 'Du hast zu oft vergeblich versucht, dich unter diesem Benutzernamen anzumelden. Bitte warte, bevor du es erneut probierst.',
 'loginlanguagelabel'         => 'Sprache: $1',
 
 # Password reset dialog
-'resetpass'               => 'Passwort für Benutzerkonto zurücksetzen',
-'resetpass_announce'      => 'Anmeldung mit dem per E-Mail zugesandten Code. Um die Anmeldung abzuschließen, musst du jetzt ein neues Passwort wählen.',
-'resetpass_text'          => '<!-- Ergänze den Text hier -->',
-'resetpass_header'        => 'Passwort ändern',
-'resetpass_submit'        => 'Passwort übermitteln und anmelden',
-'resetpass_success'       => 'Dein Passwort wurde erfolgreich geändert. Es folgt die Anmeldung …',
-'resetpass_bad_temporary' => 'Ungültiges vorläufiges Passwort. Du hast bereits dein Passwort erfolgreich geändert oder ein neues, vorläufiges Passwort angefordert.',
-'resetpass_forbidden'     => 'Das Passwort kann nicht geändert werden.',
-'resetpass_missing'       => 'Leeres Formular',
+'resetpass'                 => 'Passwort ändern',
+'resetpass_announce'        => 'Anmeldung mit dem per E-Mail zugesandten Code. Um die Anmeldung abzuschließen, musst du jetzt ein neues Passwort wählen.',
+'resetpass_text'            => '<!-- Ergänze den Text hier -->',
+'resetpass_header'          => 'Passwort ändern',
+'oldpassword'               => 'Altes Passwort:',
+'newpassword'               => 'Neues Passwort:',
+'retypenew'                 => 'Neues Passwort (nochmal):',
+'resetpass_submit'          => 'Passwort übermitteln und anmelden',
+'resetpass_success'         => 'Dein Passwort wurde erfolgreich geändert. Es folgt die Anmeldung …',
+'resetpass_bad_temporary'   => 'Ungültiges vorläufiges Passwort. Du hast bereits dein Passwort erfolgreich geändert oder ein neues, vorläufiges Passwort angefordert.',
+'resetpass_forbidden'       => 'Das Passwort kann nicht geändert werden.',
+'resetpass-no-info'         => 'Du musst dich anmelden, um auf diese Seite direkt zuzugreifen.',
+'resetpass-submit-loggedin' => 'Passwort ändern',
+'resetpass-wrong-oldpass'   => 'Ungültiges temporäres oder aktuelles Passwort.
+Möglicherweise hast du dein Passwort bereits erfolgreich geändert oder ein neues temporäres Passwort beantragt.',
+'resetpass-temp-password'   => 'Temporäres Passwort:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fetter Text',
@@ -669,8 +794,8 @@ Falls das Benutzerkonto irrtümlich angelegt wurde, kannst du diese Nachricht ig
 'hr_tip'          => 'Horizontale Linie (sparsam verwenden)',
 
 # Edit pages
-'summary'                          => 'Zusammenfassung',
-'subject'                          => 'Betreff',
+'summary'                          => 'Zusammenfassung:',
+'subject'                          => 'Betreff:',
 'minoredit'                        => 'Nur Kleinigkeiten wurden verändert',
 'watchthis'                        => 'Diese Seite beobachten',
 'savearticle'                      => 'Seite speichern',
@@ -682,8 +807,8 @@ Falls das Benutzerkonto irrtümlich angelegt wurde, kannst du diese Nachricht ig
 'missingsummary'                   => "'''Hinweis:''' Du hast keine Zusammenfassung angegeben. Wenn du erneut auf „Seite speichern“ klickst, wird deine Änderung ohne Zusammenfassung übernommen.",
 'missingcommenttext'               => 'Bitte gib eine Zusammenfassung ein.',
 'missingcommentheader'             => "'''ACHTUNG:''' Du hast keine Überschrift im Feld „Betreff:“ eingegeben. Wenn du erneut auf „Seite speichern“ klickst, wird deine Bearbeitung ohne Überschrift gespeichert.",
-'summary-preview'                  => 'Vorschau der Zusammenfassungszeile',
-'subject-preview'                  => 'Vorschau des Betreffs',
+'summary-preview'                  => 'Vorschau der Zusammenfassungszeile:',
+'subject-preview'                  => 'Vorschau des Betreffs:',
 'blockedtitle'                     => 'Benutzer ist gesperrt',
 'blockedtext'                      => 'Dein Benutzername oder deine IP-Adresse wurde von $1 gesperrt. Als Grund wurde angegeben:
 
@@ -743,33 +868,35 @@ Du kannst $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administrato
 'newarticle'                       => '(Neu)',
 'newarticletext'                   => 'Hier den Text der neuen Seite eintragen. Bitte nur in ganzen Sätzen schreiben und keine urheberrechtsgeschützten Texte anderer kopieren.',
 'anontalkpagetext'                 => "----''Diese Seite dient dazu, einem nicht angemeldeten Benutzer Nachrichten zu hinterlassen. Es wird seine IP-Adresse zur Identifizierung verwendet. IP-Adressen können von mehreren Benutzern gemeinsam verwendet werden. Wenn du mit den Kommentaren auf dieser Seite nichts anfangen kannst, richten sie sich vermutlich an einen früheren Inhaber deiner IP-Adresse und du kannst sie ignorieren. Du kannst dir auch ein [[Special:UserLogin/signup|Benutzerkonto erstellen]] oder dich [[Special:UserLogin|anmelden]], um künftig Verwechslungen mit anderen anonymen Benutzern zu vermeiden.''",
-'noarticletext'                    => '(Diese Seite enthält momentan noch keinen Text)',
+'noarticletext'                    => 'Diese Seite enthält momentan noch keinen Text.
+Du kannst diesen Titel auf den anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]],
+<span class="plainlinks"> in den zugehörigen [{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} Logbüchern suchen] oder dieser Seite [{{fullurl:{{FULLPAGENAME}}|action=edit}} bearbeiten]</span>.',
 'userpage-userdoesnotexist'        => 'Das Benutzerkonto „$1“ ist nicht vorhanden. Bitte prüfe, ob du diese Seite wirklich erstellen/bearbeiten willst.',
 'clearyourcache'                   => "'''Hinweis - Leere nach dem Speichern den Browser-Cache, um die Änderungen sehen zu können:''' '''Mozilla/Firefox/Safari:''' ''Shift'' gedrückt halten und auf ''Aktualisieren'' klicken oder alternativ entweder ''Strg-F5'' oder ''Strg-R'' (''Befehlstaste-R'' bei Macintosh) drücken; '''Konqueror: '''Auf ''Aktualisieren'' klicken oder ''F5'' drücken; '''Opera:''' Cache unter ''Extras → Einstellungen'' leeren; '''Internet Explorer:''' ''Strg-F5'' drücken oder ''Strg'' gedrückt halten und dabei ''Aktualisieren'' anklicken.",
-'usercssjsyoucanpreview'           => '<strong>Tipp:</strong> Benutze den Vorschau-Button, um dein neues CSS/JS vor dem Speichern zu testen.',
+'usercssjsyoucanpreview'           => "'''Tipp:''' Benutze den Vorschau-Button, um dein neues CSS/JS vor dem Speichern zu testen.",
 'usercsspreview'                   => "== Vorschau Deines Benutzer-CSS ==
 '''Beachte:''' Nach dem Speichern musst du deinen Browser anweisen, die neue Version zu laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userjspreview'                    => "== Vorschau Deines Benutzer-JavaScript ==
 '''Beachte:''' Nach dem Speichern musst du deinen Browser anweisen, die neue Version zu laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userinvalidcssjstitle'            => "'''Achtung:''' Skin „$1“ existiert nicht. Bedenke, dass benutzerspezifische .css- und .js-Seiten mit einem Kleinbuchstaben anfangen müssen, also beispielsweise ''{{ns:user}}:Mustermann/monobook.css'' an Stelle von ''{{ns:user}}:Mustermann/Monobook.css''.",
 'updated'                          => '(Geändert)',
-'note'                             => '<strong>Hinweis:</strong>',
-'previewnote'                      => '<strong>Dies ist nur eine Vorschau, die Seite wurde noch nicht gespeichert!</strong>',
+'note'                             => "'''Hinweis:'''",
+'previewnote'                      => "'''Dies ist nur eine Vorschau, die Seite wurde noch nicht gespeichert!'''",
 'previewconflict'                  => 'Diese Vorschau gibt den Inhalt des oberen Textfeldes wieder. So wird der Artikel aussehen, wenn du jetzt speicherst.',
-'session_fail_preview'             => '<strong>Deine Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.
+'session_fail_preview'             => "'''Deine Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.
 Bitte versuche es erneut, indem du unter der folgenden Textvorschau nochmals auf „Seite speichern“ klickst.
-Sollte das Problem bestehen bleiben, [[Special:UserLogout|melde dich ab]] und danach wieder an.</strong>',
-'session_fail_preview_html'        => "<strong>Deine Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.</strong>
+Sollte das Problem bestehen bleiben, [[Special:UserLogout|melde dich ab]] und danach wieder an.'''",
+'session_fail_preview_html'        => "'''Deine Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.'''
 
 ''Da in {{SITENAME}} das Speichern von reinem HTML aktiviert ist, wurde die Vorschau ausgeblendet, um JavaScript-Attacken vorzubeugen.''
 
-<strong>Bitte versuche es erneut, indem du unter der folgenden Textvorschau nochmals auf „Seite speichern“ klickst.
-Sollte das Problem bestehen bleiben, [[Special:UserLogout|melde dich ab]] und danach wieder an.</strong>",
-'token_suffix_mismatch'            => '<strong>Deine Bearbeitung wurde zurückgewiesen, da dein Browser Zeichen im Bearbeiten-Token verstümmelt hat.
-Eine Speicherung kann den Seiteninhalt zerstören. Dies geschieht bisweilen durch die Benutzung eines anonymen Proxy-Dienstes, der fehlerhaft arbeitet.</strong>',
+'''Bitte versuche es erneut, indem du unter der folgenden Textvorschau nochmals auf „Seite speichern“ klickst.
+Sollte das Problem bestehen bleiben, [[Special:UserLogout|melde dich ab]] und danach wieder an.'''",
+'token_suffix_mismatch'            => "'''Deine Bearbeitung wurde zurückgewiesen, da dein Browser Zeichen im Bearbeiten-Token verstümmelt hat.
+Eine Speicherung kann den Seiteninhalt zerstören. Dies geschieht bisweilen durch die Benutzung eines anonymen Proxy-Dienstes, der fehlerhaft arbeitet.'''",
 'editing'                          => 'Bearbeiten von $1',
-'editingsection'                   => 'Bearbeiten von $1 (Absatz)',
-'editingcomment'                   => 'Bearbeiten von $1 (Kommentar)',
+'editingsection'                   => 'Bearbeiten von $1 (Abschnitt)',
+'editingcomment'                   => 'Bearbeiten von $1 (Neuer Abschnitt)',
 'editconflict'                     => 'Bearbeitungskonflikt: $1',
 'explainconflict'                  => "Jemand anders hat diese Seite geändert, nachdem du angefangen hast diese zu bearbeiten.
 Das obere Textfeld enthält den aktuellen Stand.
@@ -778,26 +905,28 @@ Bitte füge deine Änderungen in das obere Textfeld ein.
 '''Nur''' der Inhalt des oberen Textfeldes wird gespeichert, wenn du auf „Seite speichern“ klickst!",
 'yourtext'                         => 'Dein Text',
 'storedversion'                    => 'Gespeicherte Version',
-'nonunicodebrowser'                => '<strong>Achtung:</strong> Dein Browser kann Unicode-Zeichen nicht richtig verarbeiten. Bitte verwende einen anderen Browser um Seiten zu bearbeiten.',
-'editingold'                       => '<strong>ACHTUNG: Du bearbeitest eine alte Version dieser Seite. Wenn du speicherst, werden alle neueren Versionen überschrieben.</strong>',
+'nonunicodebrowser'                => "'''Achtung:''' Dein Browser kann Unicode-Zeichen nicht richtig verarbeiten. Bitte verwende einen anderen Browser um Seiten zu bearbeiten.",
+'editingold'                       => "'''ACHTUNG: Du bearbeitest eine alte Version dieser Seite. Wenn du speicherst, werden alle neueren Versionen überschrieben.'''",
 'yourdiff'                         => 'Unterschiede',
-'copyrightwarning'                 => '<strong>Bitte <big>kopiere keine Webseiten</big>, die nicht deine eigenen sind, benutzen <big>keine urheberrechtlich geschützten Werke</big> ohne Erlaubnis des Copyright-Inhabers!</strong><br />
-Du gibst uns hiermit deine Zusage, dass du den Text <strong>selbst verfasst</strong> hast, dass der Text Allgemeingut (<strong>public domain</strong>) ist, oder dass der <strong>Copyright-Inhaber</strong> seine <strong>Zustimmung</strong> gegeben hat. Falls dieser Text bereits woanders veröffentlicht wurde, weise bitte auf der Diskussionsseite darauf hin.
-<i>Bitte beachte, dass alle {{SITENAME}}-Beiträge automatisch unter der „$2“ stehen (siehe $1 für Details). Falls du nicht möchtest, dass deine Arbeit hier von anderen verändert und verbreitet wird, dann drücke nicht auf „Seite speichern“.</i>',
-'copyrightwarning2'                => 'Bitte beachte, dass alle Beiträge zu {{SITENAME}} von anderen Mitwirkenden bearbeitet, geändert oder gelöscht werden können.
+'copyrightwarning'                 => "'''Bitte <big>kopiere keine Webseiten</big>, die nicht deine eigenen sind, benutze <big>keine urheberrechtlich geschützten Werke</big> ohne Erlaubnis des Urhebers!'''<br />
+Du gibst uns hiermit deine Zusage, dass du den Text '''selbst verfasst''' hast, dass der Text Allgemeingut '''(public domain)''' ist, oder dass der '''Urheber''' seine '''Zustimmung''' gegeben hat. Falls dieser Text bereits woanders veröffentlicht wurde, weise bitte auf der Diskussionsseite darauf hin.
+<i>Bitte beachte, dass alle {{SITENAME}}-Beiträge automatisch unter der „$2“ stehen (siehe $1 für Details). Falls du nicht möchtest, dass deine Arbeit hier von anderen verändert und verbreitet wird, dann drücke nicht auf „Seite speichern“.</i>",
+'copyrightwarning2'                => "Bitte beachte, dass alle Beiträge zu {{SITENAME}} von anderen Mitwirkenden bearbeitet, geändert oder gelöscht werden können.
 Reiche hier keine Texte ein, falls du nicht willst, dass diese ohne Einschränkung geändert werden können.
 
 Du bestätigst hiermit auch, dass du diese Texte selbst geschrieben hast oder diese von einer gemeinfreien Quelle kopiert hast
-(siehe $1 für weitere Details). <strong>ÜBERTRAGE OHNE GENEHMIGUNG KEINE URHEBERRECHTLICH GESCHÜTZTEN INHALTE!</strong>',
-'longpagewarning'                  => '<strong>WARNUNG: Diese Seite ist $1 KB groß; einige Browser könnten Probleme haben, Seiten zu bearbeiten, die größer als 32 KB sind.
-Überlege bitte, ob eine Aufteilung der Seite in kleinere Abschnitte möglich ist.</strong>',
-'longpageerror'                    => '<strong>FEHLER: Der Text, den du zu speichern versuchst, ist $1 KB groß. Das ist größer als das erlaubte Maximum von $2 KB – Speicherung nicht möglich.</strong>',
-'readonlywarning'                  => '<strong>WARNUNG: Die Datenbank wurde während der Seitenbearbeitung für Wartungsarbeiten gesperrt, so dass du die Seite im Moment nicht
-speichern kannst. Sichere den Text und versuche die Änderungen später einzuspielen.</strong>',
-'protectedpagewarning'             => '<strong>ACHTUNG: Diese Seite wurde gesperrt. Nur Benutzer mit Administratorrechten können die Seite bearbeiten.</strong>',
+(siehe $1 für weitere Details). '''ÜBERTRAGE OHNE GENEHMIGUNG KEINE URHEBERRECHTLICH GESCHÜTZTEN INHALTE!'''",
+'longpagewarning'                  => "'''WARNUNG: Diese Seite ist $1 KB groß; einige Browser könnten Probleme haben, Seiten zu bearbeiten, die größer als 32 KB sind.
+Überlege bitte, ob eine Aufteilung der Seite in kleinere Abschnitte möglich ist.'''",
+'longpageerror'                    => "'''FEHLER: Der Text, den du zu speichern versuchst, ist $1 KB groß. Das ist größer als das erlaubte Maximum von $2 KB – Speicherung nicht möglich.'''",
+'readonlywarning'                  => "'''ACHTUNG: Die Datenbank wurde für Wartungsarbeiten gesperrt, so dass deine Änderungen derzeit nicht gespeichert werden können.
+Sichere den Text bitte lokal auf deinem Computer und versuche zu einem späteren Zeitpunkt, die Änderungen zu übertragen.'''
+
+Grund für die Sperre: $1",
+'protectedpagewarning'             => "'''ACHTUNG: Diese Seite wurde gesperrt. Nur Benutzer mit Administratorrechten können die Seite bearbeiten.'''",
 'semiprotectedpagewarning'         => "'''Halbsperrung:''' Die Seite wurde so gesperrt, dass nur registrierte Benutzer diese ändern können.",
 'cascadeprotectedwarning'          => "'''ACHTUNG: Diese Seite wurde gesperrt, so dass sie nur durch Benutzer mit Administratorrechten bearbeitet werden kann. Sie ist in die {{PLURAL:$1|folgende Seite|folgenden Seiten}} eingebunden, die mittels der Kaskadensperroption geschützt {{PLURAL:$1|ist|sind}}:'''",
-'titleprotectedwarning'            => '<strong>ACHTUNG: Die Seitenerstellung wurde gesperrt. Nur bestimmte Benutzergruppen können die Seite erstellen.</strong>',
+'titleprotectedwarning'            => "'''ACHTUNG: Die Seitenerstellung wurde gesperrt. Nur Benutzer mit [[Special:ListGroupRights|speziellen Rechten]] können die Seite erstellen.'''",
 'templatesused'                    => 'Folgende Vorlagen werden von dieser Seite verwendet:',
 'templatesusedpreview'             => 'Folgende Vorlagen werden von dieser Seitenvorschau verwendet:',
 'templatesusedsection'             => 'Folgende Vorlagen werden von diesem Abschnitt verwendet:',
@@ -816,20 +945,30 @@ speichern kannst. Sichere den Text und versuche die Änderungen später einzuspi
 
 Bitte prüfe sorgfältig, ob die erneute Seitenerstellung den Richtlinien entspricht.
 Zu deiner Information folgt das Lösch-Logbuch mit der Begründung für die vorhergehende Löschung:",
+'deleted-notice'                   => 'Diese Seite wurde gelöscht. Es folgt ein Auszug aus dem Lösch-Logbuch für diese Seite.',
+'deletelog-fulllog'                => 'Vollständiges Lösch-Logbuch',
+'edit-hook-aborted'                => 'Die Bearbeitung wurde ohne Erklärung durch eine Schnittstelle abgebrochen.',
+'edit-gone-missing'                => 'Die Seite konnt nicht aktualisiert werden.
+Sie wurde anscheinend gelöscht.',
+'edit-conflict'                    => 'Bearbeitungskonflikt.',
+'edit-no-change'                   => 'Deine Bearbeitung wurde ignoriert, da keine Änderung an dem Text vorgenommen wurde.',
+'edit-already-exists'              => 'Die neue Seite konnte nicht erstellt werden, da sie bereits vorhanden ist.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Achtung: Diese Seite enthält zu viele Aufrufe aufwändiger Parserfunktionen.
- 
-Es dürfen nicht mehr als $2 Aufrufe sein, aktuell sind es $1 Aufrufe.',
+'expensive-parserfunction-warning'        => 'Achtung: Diese Seite enthält zu viele Aufrufe aufwendiger Parserfunktionen.
+
+Es {{PLURAL:$2|darf nicht mehr als 1 Aufruf|dürfen nicht mehr als $1 Aufrufe}} sein.',
 'expensive-parserfunction-category'       => 'Seiten, die aufwändige Parserfunktionen zu oft aufrufen',
 'post-expand-template-inclusion-warning'  => 'Warnung: Die Größe eingebundener Vorlagen ist zu groß, einige Vorlagen können nicht eingebunden werden.',
 'post-expand-template-inclusion-category' => 'Seiten, in denen die maximale Größe eingebundener Vorlagen überschritten ist',
 'post-expand-template-argument-warning'   => 'Warnung: Diese Seite enthält mindestens ein Argument in einer Vorlage, das expandiert zu groß ist. Diese Argumente werden ignoriert.',
 'post-expand-template-argument-category'  => 'Seiten, die ignorierte Vorlagenargumente enthalten',
+'parser-template-loop-warning'            => 'Vorlagenschleife entdeckt: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Vorlagenrekursionstiefengrenze überschritten ($1)',
 
 # "Undo" feature
 'undo-success' => 'Um die Änderung rückgängig zu machen, bitte die Bearbeitung in der Vergleichsansicht kontrollieren und dann auf „Seite speichern“ klicken.',
-'undo-failure' => '<span class="error">Die Änderung konnte nicht rückgängig gemacht werden, da der betroffene Abschnitt zwischenzeitlich verändert wurde.</span>',
+'undo-failure' => 'Die Änderung konnte nicht rückgängig gemacht werden, da der betroffene Abschnitt zwischenzeitlich verändert wurde.',
 'undo-norev'   => 'Die Bearbeitung konnte nicht rückgängig gemacht werden, da sie nicht vorhanden ist oder gelöscht wurde.',
 'undo-summary' => 'Änderung $1 von [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) wurde rückgängig gemacht.',
 
@@ -840,29 +979,29 @@ Es dürfen nicht mehr als $2 Aufrufe sein, aktuell sind es $1 Aufrufe.',
 Grund der Sperre: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Logbücher für diese Seite anzeigen',
-'nohistory'           => 'Es gibt keine Versionsgeschichte für diese Seite.',
-'revnotfound'         => 'Diese Version wurde nicht gefunden.',
-'revnotfoundtext'     => 'Die Version dieser Seite, nach der du suchst, konnte nicht gefunden werden. Bitte überprüfe die URL dieser Seite.',
-'currentrev'          => 'Aktuelle Version',
-'revisionasof'        => 'Version vom $1',
-'revision-info'       => 'Dies ist eine alte Version. Zeitpunkt der Bearbeitung: $1 durch $2.',
-'previousrevision'    => '� Nächstältere Version',
-'nextrevision'        => 'Nächstjüngere Version →',
-'currentrevisionlink' => 'Aktuelle Version',
-'cur'                 => 'Aktuell',
-'next'                => 'Nächste',
-'last'                => 'Vorherige',
-'page_first'          => 'Anfang',
-'page_last'           => 'Ende',
-'histlegend'          => 'Zur Anzeige der Änderungen einfach die zu vergleichenden Versionen auswählen und die Schaltfläche „{{int:compareselectedversions}}“ klicken.<br />
+'viewpagelogs'           => 'Logbücher für diese Seite anzeigen',
+'nohistory'              => 'Es gibt keine Versionsgeschichte für diese Seite.',
+'currentrev'             => 'Aktuelle Version',
+'currentrev-asof'        => 'Aktuelle Version vom $1',
+'revisionasof'           => 'Version vom $1',
+'revision-info'          => 'Dies ist eine alte Version. Zeitpunkt der Bearbeitung: $1 durch $2.', # Additionally available: $3: revision id
+'previousrevision'       => '� Nächstältere Version',
+'nextrevision'           => 'Nächstjüngere Version →',
+'currentrevisionlink'    => 'Aktuelle Version',
+'cur'                    => 'Aktuell',
+'next'                   => 'Nächste',
+'last'                   => 'Vorherige',
+'page_first'             => 'Anfang',
+'page_last'              => 'Ende',
+'histlegend'             => 'Zur Anzeige der Änderungen einfach die zu vergleichenden Versionen auswählen und die Schaltfläche „{{int:compareselectedversions}}“ klicken.<br />
 * (Aktuell) = Unterschied zur aktuellen Version, (Vorherige) = Unterschied zur vorherigen Version
 * Uhrzeit/Datum = Version zu dieser Zeit, Benutzername/IP-Adresse des Bearbeiters, K = Kleine Änderung',
-'deletedrev'          => '[gelöscht]',
-'histfirst'           => 'Älteste',
-'histlast'            => 'Neueste',
-'historysize'         => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
-'historyempty'        => '(leer)',
+'history-fieldset-title' => 'Suche in der Versionsgeschichte',
+'deletedrev'             => '[gelöscht]',
+'histfirst'              => 'Älteste',
+'histlast'               => 'Neueste',
+'historysize'            => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
+'historyempty'           => '(leer)',
 
 # Revision feed
 'history-feed-title'          => 'Versionsgeschichte',
@@ -940,6 +1079,7 @@ Stelle sicher, dass die Versionsgeschichte eines Artikels historisch korrekt ist
 'mergehistory-invalid-destination' => 'Zielseite muss ein gültiger Seitenname sein.',
 'mergehistory-autocomment'         => '„[[:$1]]“ vereinigt nach „[[:$2]]“',
 'mergehistory-comment'             => '„[[:$1]]“ vereinigt nach „[[:$2]]“: $3',
+'mergehistory-same-destination'    => 'Ausgangs- und Zielseite dürfen nicht identisch sein',
 
 # Merge log
 'mergelog'           => 'Vereinigungs-Logbuch',
@@ -952,120 +1092,201 @@ Stelle sicher, dass die Versionsgeschichte eines Artikels historisch korrekt ist
 'difference'              => '(Unterschied zwischen Versionen)',
 'lineno'                  => 'Zeile $1:',
 'compareselectedversions' => 'Gewählte Versionen vergleichen',
+'visualcomparison'        => 'Visueller Vergleich',
+'wikicodecomparison'      => 'Wikitext-Vergleich',
 'editundo'                => 'rückgängig',
-'diff-multi'              => '(Der Versionsvergleich bezieht {{PLURAL:$1|1 dazwischen liegende Version|$1 dazwischen liegende Versionen}} mit ein.)',
+'diff-multi'              => '(Der Versionsvergleich bezieht {{PLURAL:$1|1 dazwischenliegende Version|$1 dazwischenliegende Versionen}} mit ein.)',
+'diff-movedto'            => 'verschoben nach $1',
+'diff-styleadded'         => '$1-Style ergänzt',
+'diff-added'              => '$1 hinzugefügt',
+'diff-changedto'          => 'verändert nach $1',
+'diff-movedoutof'         => 'verschoben aus $1',
+'diff-styleremoved'       => '$1-Style entfernt',
+'diff-removed'            => '$1 entfernt',
+'diff-changedfrom'        => 'verändert von $1',
+'diff-src'                => 'Quelle',
+'diff-withdestination'    => 'mit Ziel $1',
+'diff-with'               => '&#32;mit $1 $2',
+'diff-with-final'         => '&#32;und $1 $2',
+'diff-width'              => 'Breite',
+'diff-height'             => 'Höhe',
+'diff-p'                  => "ein '''Absatz'''",
+'diff-blockquote'         => "einen '''Block'''",
+'diff-h1'                 => "eine '''Ãœberschrift (1. Ordnung)'''",
+'diff-h2'                 => "eine '''Ãœberschrift (2. Ordnung)'''",
+'diff-h3'                 => "eine '''Ãœberschrift (3. Ordnung)'''",
+'diff-h4'                 => "eine '''Ãœberschrift (4. Ordnung)'''",
+'diff-h5'                 => "eine '''Ãœberschrift (5. Ordnung)'''",
+'diff-pre'                => "einen '''formattierten Block'''",
+'diff-div'                => "ein '''Blockelement'''",
+'diff-ul'                 => "eine '''Liste'''",
+'diff-ol'                 => "eine '''numerierte Liste'''",
+'diff-li'                 => "einen '''Listeneintrag'''",
+'diff-table'              => "eine '''Tabelle'''",
+'diff-tbody'              => "ein '''Tabelleninhalt'''",
+'diff-tr'                 => "eine '''Zeile'''",
+'diff-td'                 => "eine '''Zelle'''",
+'diff-th'                 => "eine '''Spaltenüberschrift'''",
+'diff-br'                 => "einen '''Zeilenumbruch'''",
+'diff-hr'                 => "eine '''horizontale Linie'''",
+'diff-code'               => "einen '''Bereich Computercode'''",
+'diff-dl'                 => "eine '''Definitionsliste'''",
+'diff-dt'                 => "ein '''Definitionsterm'''",
+'diff-dd'                 => "eine '''Definition'''",
+'diff-input'              => "eine '''Eingabe'''",
+'diff-form'               => "ein '''Formular'''",
+'diff-img'                => "ein '''Bild'''",
+'diff-span'               => "ein '''Span'''",
+'diff-a'                  => "einen '''Link'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''fett'''",
+'diff-strong'             => "'''hervorgehoben'''",
+'diff-em'                 => "'''betont'''",
+'diff-font'               => "'''Schriftart'''",
+'diff-big'                => "'''groß'''",
+'diff-del'                => "'''gelöscht'''",
+'diff-tt'                 => "'''feste Weite'''",
+'diff-sub'                => "'''tiefgestellt'''",
+'diff-sup'                => "'''hochgestellt'''",
+'diff-strike'             => "'''durchgestrichen'''",
 
 # Search results
-'searchresults'             => 'Suchergebnisse',
-'searchresulttext'          => 'Für mehr Informationen zur Suche siehe die [[{{MediaWiki:Helppage}}|Hilfeseite]].',
-'searchsubtitle'            => 'Deine Suchanfrage: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|alle mit „$1“ beginnenden Seiten]] | [[Special:WhatLinksHere/$1|alle Seiten, die nach „$1“ verlinken]])',
-'searchsubtitleinvalid'     => 'Deine Suchanfrage: „$1“.',
-'noexactmatch'              => "'''Es existiert keine Seite mit dem Titel „$1“.'''
+'searchresults'                    => 'Suchergebnisse',
+'searchresults-title'              => 'Suchergebnisse für „$1“',
+'searchresulttext'                 => 'Für mehr Informationen zur Suche siehe die [[{{MediaWiki:Helppage}}|Hilfeseite]].',
+'searchsubtitle'                   => 'Deine Suchanfrage: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|alle mit „$1“ beginnenden Seiten]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alle Seiten, die nach „$1“ verlinken]])',
+'searchsubtitleinvalid'            => 'Deine Suchanfrage: „$1“.',
+'noexactmatch'                     => "'''Es existiert keine Seite mit dem Titel „$1“.'''
 Wenn du dich mit dem Thema auskennst, kannst du selbst [[:$1|die Seite verfassen]].",
-'noexactmatch-nocreate'     => "'''Es existiert keine Seite mit dem Titel „$1“.'''",
-'toomanymatches'            => 'Die Anzahl der Suchergebnisse ist zu groß, bitte versuche eine andere Abfrage.',
-'titlematches'              => 'Ãœbereinstimmungen mit Seitentiteln',
-'notitlematches'            => 'Keine Ãœbereinstimmungen mit Seitentiteln',
-'textmatches'               => 'Ãœbereinstimmungen mit Inhalten',
-'notextmatches'             => 'Keine Ãœbereinstimmungen mit Inhalten',
-'prevn'                     => 'vorherige $1',
-'nextn'                     => 'nächste $1',
-'viewprevnext'              => 'Zeige ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 Wort|$2 Wörter}})',
-'search-result-score'       => 'Relevanz: $1 %',
-'search-redirect'           => '(Weiterleitung $1)',
-'search-section'            => '(Abschnitt $1)',
-'search-suggest'            => 'Meintest du „$1“?',
-'search-interwiki-caption'  => 'Schwesterprojekte',
-'search-interwiki-default'  => '$1 Ergebnisse:',
-'search-interwiki-more'     => '(weitere)',
-'search-mwsuggest-enabled'  => 'mit Vorschlägen',
-'search-mwsuggest-disabled' => 'keine Vorschläge',
-'search-relatedarticle'     => 'Verwandte',
-'mwsuggest-disable'         => 'Vorschläge per Ajax deaktivieren',
-'searchrelated'             => 'verwandt',
-'searchall'                 => 'alle',
-'showingresults'            => "Hier {{PLURAL:$1|ist '''1''' Ergebnis|sind '''$1''' Ergebnisse}}, beginnend mit Nummer '''$2.'''",
-'showingresultsnum'         => "Hier {{PLURAL:$3|ist '''1''' Ergebnis|sind '''$3''' Ergebnisse}}, beginnend mit Nummer '''$2.'''",
-'showingresultstotal'       => "Es {{PLURAL:$3|folgt Suchergebnis '''$1''' von '''$3:'''|folgen die Suchergebnisse '''$1–$2''' von '''$3:'''}}",
-'nonefound'                 => "'''Hinweis:''' Es werden standardmäßig nur einige Namensräume durchsucht. Setze ''all:'' vor deinen Suchbegriff, um alle Seiten (inkl. Diskussionsseiten, Vorlagen usw.) zu durchsuchen oder gezielt den Namen des zu durchsuchenden Namensraumes.",
-'powersearch'               => 'Erweiterte Suche',
-'powersearch-legend'        => 'Erweiterte Suche',
-'powersearch-ns'            => 'Suche in Namensräumen:',
-'powersearch-redir'         => 'Weiterleitungen anzeigen',
-'powersearch-field'         => 'Suche nach:',
-'search-external'           => 'Externe Suche',
-'searchdisabled'            => 'Die {{SITENAME}}-Suche ist deaktiviert. Du kannst unterdessen mit Google suchen. Bitte bedenke, dass der Suchindex für {{SITENAME}} veraltet sein kann.',
+'noexactmatch-nocreate'            => "'''Es existiert keine Seite mit dem Titel „$1“.'''",
+'toomanymatches'                   => 'Die Anzahl der Suchergebnisse ist zu groß, bitte versuche eine andere Abfrage.',
+'titlematches'                     => 'Ãœbereinstimmungen mit Seitentiteln',
+'notitlematches'                   => 'Keine Ãœbereinstimmungen mit Seitentiteln',
+'textmatches'                      => 'Ãœbereinstimmungen mit Inhalten',
+'notextmatches'                    => 'Keine Ãœbereinstimmungen mit Inhalten',
+'prevn'                            => 'vorherige $1',
+'nextn'                            => 'nächste $1',
+'viewprevnext'                     => 'Zeige ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Suchoptionen',
+'searchmenu-exists'                => "* Seite '''[[$1]]'''",
+'searchmenu-new'                   => "'''Erstelle die Seite „[[:$1|$1]]“ in diesem Wiki.'''",
+'searchhelp-url'                   => 'Help:Hilfe',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Zeige alle Seiten, die mit dem Suchbegriff anfangen]]',
+'searchprofile-articles'           => 'Inhaltsseiten',
+'searchprofile-articles-and-proj'  => 'Inhaltsseiten & Projekt',
+'searchprofile-project'            => 'Projekt',
+'searchprofile-images'             => 'Dateien',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Erweitert',
+'searchprofile-articles-tooltip'   => 'Suchen in $1',
+'searchprofile-project-tooltip'    => 'Suchen in $1',
+'searchprofile-images-tooltip'     => 'Nach Bildern suchen',
+'searchprofile-everything-tooltip' => 'Gesamten Inhalt durchsuchen (inklusive Diskussionsseiten)',
+'searchprofile-advanced-tooltip'   => 'Suche in weiteren Namensräumen',
+'prefs-search-nsdefault'           => 'Standard-Namensräume:',
+'prefs-search-nscustom'            => 'Suche in weiteren Namensräumen:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 Wort|$2 Wörter}})',
+'search-result-score'              => 'Relevanz: $1 %',
+'search-redirect'                  => '(Weiterleitung von „$1“)',
+'search-section'                   => '(Abschnitt $1)',
+'search-suggest'                   => 'Meintest du „$1“?',
+'search-interwiki-caption'         => 'Schwesterprojekte',
+'search-interwiki-default'         => '$1 Ergebnisse:',
+'search-interwiki-more'            => '(weitere)',
+'search-mwsuggest-enabled'         => 'mit Vorschlägen',
+'search-mwsuggest-disabled'        => 'keine Vorschläge',
+'search-relatedarticle'            => 'Verwandte',
+'mwsuggest-disable'                => 'Vorschläge per Ajax deaktivieren',
+'searchrelated'                    => 'verwandt',
+'searchall'                        => 'alle',
+'showingresults'                   => "Hier {{PLURAL:$1|ist '''1''' Ergebnis|sind '''$1''' Ergebnisse}}, beginnend mit Nummer '''$2.'''",
+'showingresultsnum'                => "Hier {{PLURAL:$3|ist '''1''' Ergebnis|sind '''$3''' Ergebnisse}}, beginnend mit Nummer '''$2.'''",
+'showingresultstotal'              => "Es {{PLURAL:$4|folgt Suchergebnis '''$1''' von '''$3:'''|folgen die Suchergebnisse '''$1–$2''' von '''$3:'''}}",
+'nonefound'                        => "'''Hinweis:''' Es werden standardmäßig nur einige Namensräume durchsucht. Setze ''all:'' vor deinen Suchbegriff, um alle Seiten (inkl. Diskussionsseiten, Vorlagen usw.) zu durchsuchen oder gezielt den Namen des zu durchsuchenden Namensraumes.",
+'search-nonefound'                 => 'Für deine Suchanfrage wurden keine Ergebnisse gefunden.',
+'powersearch'                      => 'Erweiterte Suche',
+'powersearch-legend'               => 'Erweiterte Suche',
+'powersearch-ns'                   => 'Suche in Namensräumen:',
+'powersearch-redir'                => 'Weiterleitungen anzeigen',
+'powersearch-field'                => 'Suche nach:',
+'search-external'                  => 'Externe Suche',
+'searchdisabled'                   => 'Die {{SITENAME}}-Suche ist deaktiviert. Du kannst unterdessen mit Google suchen. Bitte bedenke, dass der Suchindex für {{SITENAME}} veraltet sein kann.',
 
 # Preferences page
-'preferences'              => 'Einstellungen',
-'mypreferences'            => 'Einstellungen',
-'prefs-edits'              => 'Anzahl der Bearbeitungen:',
-'prefsnologin'             => 'Nicht angemeldet',
-'prefsnologintext'         => 'Du musst <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} angemeldet]</span> sein, um deine Einstellungen ändern zu können.',
-'prefsreset'               => 'Die Eingaben wurden verworfen, es erfolgte keine Speicherung.',
-'qbsettings'               => 'Seitenleiste',
-'qbsettings-none'          => 'Keine',
-'qbsettings-fixedleft'     => 'Links, fest',
-'qbsettings-fixedright'    => 'Rechts, fest',
-'qbsettings-floatingleft'  => 'Links, schwebend',
-'qbsettings-floatingright' => 'Rechts, schwebend',
-'changepassword'           => 'Passwort ändern',
-'skin'                     => 'Skin',
-'math'                     => 'TeX',
-'dateformat'               => 'Datumsformat',
-'datedefault'              => 'Standard',
-'datetime'                 => 'Datum und Zeit',
-'math_failure'             => 'Parser-Fehler',
-'math_unknown_error'       => 'Unbekannter Fehler',
-'math_unknown_function'    => 'Unbekannte Funktion ',
-'math_lexing_error'        => "'Lexing'-Fehler",
-'math_syntax_error'        => 'Syntaxfehler',
-'math_image_error'         => 'die PNG-Konvertierung schlug fehl',
-'math_bad_tmpdir'          => 'Das temporäre Verzeichnis für mathematische Formeln kann nicht angelegt oder beschrieben werden.',
-'math_bad_output'          => 'Das Zielverzeichnis für mathematische Formeln kann nicht angelegt oder beschrieben werden.',
-'math_notexvc'             => 'Das texvc-Programm wurde nicht gefunden. Bitte math/README beachten.',
-'prefs-personal'           => 'Benutzerdaten',
-'prefs-rc'                 => 'Anzeige von „Letzte Änderungen“',
-'prefs-watchlist'          => 'Beobachtungsliste',
-'prefs-watchlist-days'     => 'Anzahl der Tage, die die Beobachtungsliste standardmäßig umfassen soll:',
-'prefs-watchlist-edits'    => 'Maximale Zahl der Einträge:',
-'prefs-misc'               => 'Verschiedenes',
-'saveprefs'                => 'Einstellungen speichern',
-'resetprefs'               => 'Eingaben verwerfen',
-'oldpassword'              => 'Altes Passwort:',
-'newpassword'              => 'Neues Passwort:',
-'retypenew'                => 'Neues Passwort (nochmal):',
-'textboxsize'              => 'Bearbeiten',
-'rows'                     => 'Zeilen',
-'columns'                  => 'Spalten',
-'searchresultshead'        => 'Suche',
-'resultsperpage'           => 'Treffer pro Seite:',
-'contextlines'             => 'Zeilen pro Treffer:',
-'contextchars'             => 'Zeichen pro Zeile:',
-'stub-threshold'           => 'Linkformatierung <a href="#" class="stub">kleiner Seiten</a> (in Byte):',
-'recentchangesdays'        => 'Anzahl der Tage, die die Liste der „Letzten Änderungen“ standardmäßig umfassen soll:',
-'recentchangescount'       => 'Anzahl der Einträge in „Letzte Änderungen“, der Versionsgeschichte und den Logbüchern:',
-'savedprefs'               => 'Deine Einstellungen wurden gespeichert.',
-'timezonelegend'           => 'Zeitzone',
-'timezonetext'             => '¹Gib die Anzahl der Stunden ein, die zwischen deiner Zeitzone und UTC liegen.',
-'localtime'                => 'Ortszeit:',
-'timezoneoffset'           => 'Unterschied¹:',
-'servertime'               => 'Aktuelle Zeit auf dem Server:',
-'guesstimezone'            => 'Vom Browser übernehmen',
-'allowemail'               => 'E-Mail-Empfang von anderen Benutzern ermöglichen',
-'prefs-searchoptions'      => 'Suchoptionen',
-'prefs-namespaces'         => 'Namensräume',
-'defaultns'                => 'In diesen Namensräumen soll standardmäßig gesucht werden:',
-'default'                  => 'Voreinstellung',
-'files'                    => 'Dateien',
+'preferences'               => 'Einstellungen',
+'mypreferences'             => 'Einstellungen',
+'prefs-edits'               => 'Anzahl der Bearbeitungen:',
+'prefsnologin'              => 'Nicht angemeldet',
+'prefsnologintext'          => 'Du musst <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} angemeldet]</span> sein, um deine Einstellungen ändern zu können.',
+'prefsreset'                => 'Die Eingaben wurden verworfen, es erfolgte keine Speicherung.',
+'qbsettings'                => 'Seitenleiste',
+'qbsettings-none'           => 'Keine',
+'qbsettings-fixedleft'      => 'Links, fest',
+'qbsettings-fixedright'     => 'Rechts, fest',
+'qbsettings-floatingleft'   => 'Links, schwebend',
+'qbsettings-floatingright'  => 'Rechts, schwebend',
+'changepassword'            => 'Passwort ändern',
+'skin'                      => 'Skin',
+'skin-preview'              => 'Vorschau',
+'math'                      => 'TeX',
+'dateformat'                => 'Datumsformat',
+'datedefault'               => 'Standard',
+'datetime'                  => 'Datum und Zeit',
+'math_failure'              => 'Parser-Fehler',
+'math_unknown_error'        => 'Unbekannter Fehler',
+'math_unknown_function'     => 'Unbekannte Funktion ',
+'math_lexing_error'         => '„Lexing“-Fehler',
+'math_syntax_error'         => 'Syntaxfehler',
+'math_image_error'          => 'die PNG-Konvertierung schlug fehl',
+'math_bad_tmpdir'           => 'Das temporäre Verzeichnis für mathematische Formeln kann nicht angelegt oder beschrieben werden.',
+'math_bad_output'           => 'Das Zielverzeichnis für mathematische Formeln kann nicht angelegt oder beschrieben werden.',
+'math_notexvc'              => 'Das texvc-Programm wurde nicht gefunden. Bitte math/README beachten.',
+'prefs-personal'            => 'Benutzerdaten',
+'prefs-rc'                  => 'Anzeige von „Letzte Änderungen“',
+'prefs-watchlist'           => 'Beobachtungsliste',
+'prefs-watchlist-days'      => 'Anzahl der Tage, die die Beobachtungsliste standardmäßig umfassen soll:',
+'prefs-watchlist-days-max'  => '(Maximal 7 Tage)',
+'prefs-watchlist-edits'     => 'Maximale Zahl der Einträge:',
+'prefs-watchlist-edits-max' => '(Maximale Anzahl: 1000)',
+'prefs-misc'                => 'Verschiedenes',
+'prefs-resetpass'           => 'Passwort ändern',
+'saveprefs'                 => 'Einstellungen speichern',
+'resetprefs'                => 'Eingaben verwerfen',
+'textboxsize'               => 'Bearbeiten',
+'prefs-edit-boxsize'        => 'Größe des Bearbeitungsfensters:',
+'rows'                      => 'Zeilen',
+'columns'                   => 'Spalten',
+'searchresultshead'         => 'Suche',
+'resultsperpage'            => 'Treffer pro Seite:',
+'contextlines'              => 'Zeilen pro Treffer:',
+'contextchars'              => 'Zeichen pro Zeile:',
+'stub-threshold'            => 'Linkformatierung <a href="#" class="stub">kleiner Seiten</a> (in Byte):',
+'recentchangesdays'         => 'Anzahl der Tage, die die Liste der „Letzten Änderungen“ standardmäßig umfassen soll:',
+'recentchangesdays-max'     => '(Maximal $1 {{PLURAL:$1|Tag|Tage}})',
+'recentchangescount'        => 'Anzahl der Einträge in der Liste der letzten Änderungen, der Versionsgeschichte und den Logbüchern:',
+'savedprefs'                => 'Deine Einstellungen wurden gespeichert.',
+'timezonelegend'            => 'Zeitzone',
+'timezonetext'              => '¹Gib die Anzahl der Stunden ein, die zwischen deiner Zeitzone und UTC liegen.',
+'localtime'                 => 'Ortszeit:',
+'timezoneselect'            => 'Zeitzone:',
+'timezoneuseserverdefault'  => 'Standardzeit des Servers',
+'timezoneuseoffset'         => 'Andere (Unterschied angeben)',
+'timezoneoffset'            => 'Unterschied¹:',
+'servertime'                => 'Aktuelle Zeit auf dem Server:',
+'guesstimezone'             => 'Vom Browser übernehmen',
+'allowemail'                => 'E-Mail-Empfang von anderen Benutzern ermöglichen',
+'prefs-searchoptions'       => 'Suchoptionen',
+'prefs-namespaces'          => 'Namensräume',
+'defaultns'                 => 'In diesen Namensräumen soll standardmäßig gesucht werden:',
+'default'                   => 'Voreinstellung',
+'files'                     => 'Dateien',
 
 # User rights
 'userrights'                  => 'Benutzerrechteverwaltung', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Verwalte Gruppenzugehörigkeit',
 'userrights-user-editname'    => 'Benutzername:',
 'editusergroup'               => 'Benutzerrechte bearbeiten',
-'editinguser'                 => "Ändere Benutzerrechte von '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ändere Benutzerrechte von '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Benutzer-Gruppenzugehörigkeit bearbeiten',
 'saveusergroups'              => 'Gruppenzugehörigkeit ändern',
 'userrights-groupsmember'     => 'Mitglied von:',
@@ -1113,6 +1334,8 @@ Wenn du dich mit dem Thema auskennst, kannst du selbst [[:$1|die Seite verfassen
 'right-minoredit'            => 'Bearbeitungen als klein markieren',
 'right-move'                 => 'Seiten verschieben',
 'right-move-subpages'        => 'Seiten inklusive Unterseiten verschieben',
+'right-move-rootuserpages'   => 'Haupt-Benutzerseiten verschieben',
+'right-movefile'             => 'Dateien verschieben',
 'right-suppressredirect'     => 'Beim Verschieben die Erstellung einer Weiterleitung unterdrücken',
 'right-upload'               => 'Dateien hochladen',
 'right-reupload'             => 'Ãœberschreiben einer vorhandenen Datei',
@@ -1163,12 +1386,49 @@ Wenn du dich mit dem Thema auskennst, kannst du selbst [[:$1|die Seite verfassen
 'rightslogentry' => 'änderte die Benutzerrechte für „[[$1]]“ von „$2“ auf „$3“',
 'rightsnone'     => '(–)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'die Seite zu lesen',
+'action-edit'                 => 'die Seite zu bearbeiten',
+'action-createpage'           => 'Seiten zu erstellen',
+'action-createtalk'           => 'Diskussionsseiten zu erstellen',
+'action-createaccount'        => 'ein Benutzerkonto zu erstellen',
+'action-minoredit'            => 'diese Bearbeitung als klein zu markieren',
+'action-move'                 => 'die Seite zu verschieben',
+'action-move-subpages'        => 'diese Seite und zugehörige Unterseiten zu verschieben',
+'action-move-rootuserpages'   => 'Haupt-Benutzerseiten zu verschieben',
+'action-movefile'             => 'Diese Datei verschieben',
+'action-upload'               => 'Dateien hochzuladen',
+'action-reupload'             => 'die vorhandene Datei zu überschreiben',
+'action-reupload-shared'      => 'diese Datei aus dem gemeinsam genutzten Repositorium zu überschreiben',
+'action-upload_by_url'        => 'Dateien von einer Webadresse (URL) hochzuladen',
+'action-writeapi'             => 'die API mit Schreibzugriffen zu verwenden',
+'action-delete'               => 'Seiten zu löschen',
+'action-deleterevision'       => 'Versionen zu löschen',
+'action-deletedhistory'       => 'Liste der gelöschten Versionen zu sehen',
+'action-browsearchive'        => 'nach gelöschten Seiten zu suchen',
+'action-undelete'             => 'die Seite wiederherzustellen',
+'action-suppressrevision'     => 'die versteckte Version einzusehen und wiederherzustellen',
+'action-suppressionlog'       => 'das private Logbuch einzusehen',
+'action-block'                => 'den Benutzer zu sperren',
+'action-protect'              => 'den Schutzstatus von Seiten zu ändern',
+'action-import'               => 'Seiten aus einem anderen Wiki zu importieren',
+'action-importupload'         => 'Seiten über das Hochladen einer Datei zu importieren',
+'action-patrol'               => 'die Bearbeitungen andere Benutzer zu kontrollieren',
+'action-autopatrol'           => 'eigene Bearbeitungen als kontrolliert zu markieren',
+'action-unwatchedpages'       => 'die Liste der unbeobachteten Seiten einzusehen',
+'action-trackback'            => 'einen Trackback zu übertragen',
+'action-mergehistory'         => 'die Versionengeschichten von Seiten zu vereinen',
+'action-userrights'           => 'Benutzerrechte zu ändern',
+'action-userrights-interwiki' => 'die Rechte von Benutzern in anderen Wikis zu ändern',
+'action-siteadmin'            => 'die Datenbank zu sperren oder freizugeben',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|Änderung|Änderungen}}',
 'recentchanges'                     => 'Letzte Änderungen',
+'recentchanges-legend'              => 'Anzeigeoptionen',
 'recentchangestext'                 => "Auf dieser Seite kannst du die letzten Änderungen auf '''{{SITENAME}}''' nachverfolgen.",
 'recentchanges-feed-description'    => 'Verfolge mit diesem Feed die letzten Änderungen in {{SITENAME}}.',
-'rcnote'                            => "Angezeigt {{PLURAL:$1|wird '''1''' Änderung|werden die letzten '''$1''' Änderungen}} {{PLURAL:$2|des letzten Tages|der letzten '''$2''' Tage}}. Stand: $4, $5. (<b><tt>Neu</tt></b>&nbsp;– neuer Eintrag; <b><tt>K</tt></b>&nbsp;– kleine Änderung; <b><tt>B</tt></b>&nbsp;– Änderung durch einen Bot; ''(± Zahl)''&nbsp;– Größenänderung in Byte)",
+'rcnote'                            => "Angezeigt {{PLURAL:$1|wird '''1''' Änderung|werden die letzten '''$1''' Änderungen}} {{PLURAL:$2|des letzten Tages|der letzten '''$2''' Tage}}. Stand: $4, $5. (<b><tt>N</tt></b>&nbsp;– neuer Eintrag; <b><tt>K</tt></b>&nbsp;– kleine Änderung; <b><tt>B</tt></b>&nbsp;– Änderung durch einen Bot; ''(± Zahl)''&nbsp;– Größenänderung in Byte)",
 'rcnotefrom'                        => "Angezeigt werden die Änderungen seit '''$2''' (max. '''$1''' Einträge).",
 'rclistfrom'                        => 'Nur Änderungen seit $1 zeigen.',
 'rcshowhideminor'                   => 'Kleine Änderungen $1',
@@ -1190,6 +1450,8 @@ Wenn du dich mit dem Thema auskennst, kannst du selbst [[:$1|die Seite verfassen
 'rc_categories_any'                 => 'Alle',
 'rc-change-size'                    => '$1 {{PLURAL:$1|Byte|Bytes}}',
 'newsectionsummary'                 => 'Neuer Abschnitt /* $1 */',
+'rc-enhanced-expand'                => 'Details anzeigen (benötigt JavaScript)',
+'rc-enhanced-hide'                  => 'Details verstecken',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Änderungen an verlinkten Seiten',
@@ -1209,9 +1471,9 @@ Wenn du dich mit dem Thema auskennst, kannst du selbst [[:$1|die Seite verfassen
 'upload_directory_missing'    => 'Das Upload-Verzeichnis ($1) fehlt und konnte durch den Webserver auch nicht erstellt werden.',
 'upload_directory_read_only'  => 'Der Webserver hat keine Schreibrechte für das Upload-Verzeichnis ($1).',
 'uploaderror'                 => 'Fehler beim Hochladen',
-'uploadtext'                  => "Benutze dieses Formular, um neue Dateien hochzuladen. 
+'uploadtext'                  => "Benutze dieses Formular, um neue Dateien hochzuladen.
 
-Gehe zu der [[Special:ImageList|Liste hochgeladener Dateien]], um vorhandene Dateien zu suchen und anzuzeigen. Siehe auch das [[Special:Log/upload|Datei-]] und [[Special:Log/upload|Lösch-Logbuch]].
+Gehe zu der [[Special:FileList|Liste hochgeladener Dateien]], um vorhandene Dateien zu suchen und anzuzeigen. Siehe auch das [[Special:Log/upload|Datei-]] und [[Special:Log/delete|Lösch-Logbuch]].
 
 Klicke auf '''„Durchsuchen …“''', um einen Dateiauswahl-Dialog zu öffnen.
 Nach der Auswahl einer Datei wird der Dateiname im Textfeld '''„Quelldatei“''' angezeigt.
@@ -1219,8 +1481,8 @@ Bestätige dann die Lizenz-Vereinbarung und klicke anschließend auf '''„Datei
 Dies kann eine Weile dauern, besonders bei einer langsamen Internet-Verbindung.
 
 Um ein '''Bild''' in einer Seite zu verwenden, schreibe an Stelle des Bildes zum Beispiel:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:Datei.jpg<nowiki>]]</nowiki></tt>'''
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:Datei.jpg|Link-Text<nowiki>]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:Datei.jpg<nowiki>]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:Datei.jpg|Link-Text<nowiki>]]</nowiki></tt>'''
 
 Um '''Mediendateien''' einzubinden, verwende zum Beispiel:
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:Datei.ogg<nowiki>]]</nowiki></tt>'''
@@ -1232,7 +1494,7 @@ Bitte beachte, dass, genau wie bei normalen Seiteninhalten, andere Benutzer dein
 'upload-prohibited'           => 'Nicht erlaubte Dateitypen: $1.',
 'uploadlog'                   => 'Datei-Logbuch',
 'uploadlogpage'               => 'Datei-Logbuch',
-'uploadlogpagetext'           => 'Dies ist das Logbuch der hochgeladenen Dateien, siehe auch die [[Special:NewImages|Galerie neuer Dateien]] für einen visuellen Überblick.',
+'uploadlogpagetext'           => 'Dies ist das Logbuch der hochgeladenen Dateien, siehe auch die [[Special:NewFiles|Galerie neuer Dateien]] für einen visuellen Überblick.',
 'filename'                    => 'Dateiname',
 'filedesc'                    => 'Beschreibung',
 'fileuploadsummary'           => 'Beschreibung/Quelle:',
@@ -1252,22 +1514,23 @@ Bitte beachte, dass, genau wie bei normalen Seiteninhalten, andere Benutzer dein
 'large-file'                  => 'Die Dateigröße sollte nach Möglichkeit $1 nicht überschreiten. Diese Datei ist $2 groß.',
 'largefileserver'             => 'Die Datei ist größer als die vom Server eingestellte Maximalgröße.',
 'emptyfile'                   => 'Die hochgeladene Datei ist leer. Der Grund kann ein Tippfehler im Dateinamen sein. Bitte kontrolliere, ob du die Datei wirklich hochladen willst.',
-'fileexists'                  => 'Eine Datei mit diesem Namen existiert bereits. Wenn du auf „Datei speichern“ klickst, wird die Datei überschrieben. Bitte prüfe <strong><tt>$1</tt></strong>, wenn du dir nicht sicher bist.',
-'filepageexists'              => 'Eine Beschreibungsseite wurde bereits als <strong><tt>$1</tt></strong> erstellt, es ist aber keine Datei mit diesem Namen vorhanden. Die eingegebene Beschreibung wird nicht auf die Beschreibungsseite übernommen. Die Beschreibungsseite musst du nach dem Hochladen der Datei noch manuell bearbeiten.',
-'fileexists-extension'        => 'Eine Datei mit ähnlichem Namen existiert bereits:<br />
-Name der hochzuladenden Datei: <strong><tt>$1</tt></strong><br />
-Name der vorhandenen Datei: <strong><tt>$2</tt></strong><br />
-Nur die Dateiendung unterscheidet sich in Groß-/Kleinschreibung. Bitte prüfe, ob die Dateien inhaltlich identisch sind.',
+'fileexists'                  => "Eine Datei mit diesem Namen existiert bereits. Wenn du auf „Datei speichern“ klickst, wird die Datei überschrieben. Bitte prüfe '''<tt>$1</tt>''', wenn du dir nicht sicher bist.",
+'filepageexists'              => "Eine Beschreibungsseite wurde bereits als '''<tt>$1</tt>''' erstellt, es ist aber keine Datei mit diesem Namen vorhanden. Die eingegebene Beschreibung wird nicht auf die Beschreibungsseite übernommen. Die Beschreibungsseite musst du nach dem Hochladen der Datei noch manuell bearbeiten.",
+'fileexists-extension'        => "Eine Datei mit ähnlichem Namen existiert bereits:<br />
+Name der hochzuladenden Datei: '''<tt>$1</tt>'''<br />
+Name der vorhandenen Datei: '''<tt>$2</tt>'''<br />
+Nur die Dateiendung unterscheidet sich in Groß-/Kleinschreibung. Bitte prüfe, ob die Dateien inhaltlich identisch sind.",
 'fileexists-thumb'            => "<center>'''Vorhandene Datei'''</center>",
-'fileexists-thumbnail-yes'    => 'Bei der Datei scheint es sich um ein Bild verringerter Größe <i>(thumbnail)</i> zu handeln. Bitte prüfe die Datei <strong><tt>$1</tt></strong>.<br />
-Wenn es sich um das Bild in Originalgröße handelt, so braucht kein separates Vorschaubild hochgeladen zu werden.',
-'file-thumbnail-no'           => 'Der Dateiname beginnt mit <strong><tt>$1</tt></strong>. Dies deutet auf ein Bild verringerter Größe <i>(thumbnail)</i> hin.
-Bitte prüfe, ob du das Bild in voller Auflösung vorliegen hast und lade dieses unter dem Originalnamen hoch.',
-'fileexists-forbidden'        => 'Unter diesem Namen existiert bereits eine Datei. Bitte gehe zurück und lade diese Datei unter einem anderen Namen hoch. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Bei der Datei scheint es sich um ein Bild verringerter Größe ''(thumbnail)'' zu handeln. Bitte prüfe die Datei '''<tt>$1</tt>'''.<br />
+Wenn es sich um das Bild in Originalgröße handelt, so braucht kein separates Vorschaubild hochgeladen zu werden.",
+'file-thumbnail-no'           => "Der Dateiname beginnt mit '''<tt>$1</tt>'''. Dies deutet auf ein Bild verringerter Größe ''(thumbnail)'' hin.
+Bitte prüfe, ob du das Bild in voller Auflösung vorliegen hast und lade dieses unter dem Originalnamen hoch.",
+'fileexists-forbidden'        => 'Unter diesem Namen existiert bereits eine Datei und sie kann nicht überschrieben werden. Bitte gehe zurück und lade die Datei unter einem anderen Namen hoch. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Unter diesem Namen existiert bereits eine Datei im zentralen Medienarchiv.
 Wenn du diese Datei trotzdem hochladen möchtest, gehe bitte zurück und ändere den Namen.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Diese Datei ist ein Duplikat der folgenden {{PLURAL:$1|Datei|$1 Dateien}}:',
+'file-deleted-duplicate'      => 'Eine identische Datei dieser Datei ([[$1]]) wurde früher gelöscht. Überprüfe das Lösch-Logbuch, bevor du sie hochlädst.',
 'successfulupload'            => 'Erfolgreich hochgeladen',
 'uploadwarning'               => 'Warnung',
 'savefile'                    => 'Datei speichern',
@@ -1287,8 +1550,8 @@ Wenn du diese Datei trotzdem hochladen möchtest, gehe bitte zurück und ändere
 
 Bitte prüfe sorgfältig, ob das erneute Hochladen den Richtlinien entspricht.
 Zu deiner Information folgt das Lösch-Logbuch mit der Begründung für die vorhergehende Löschung:",
-'filename-bad-prefix'         => 'Der Dateiname beginnt mit <strong>„$1“</strong>. Dies ist im allgemeinen der von einer Digitalkamera vorgegebene Dateiname und daher nicht sehr aussagekräftig.
-Bitte gib der Datei einen Namen, der den Inhalt besser beschreibt.',
+'filename-bad-prefix'         => "Der Dateiname beginnt mit '''„$1“'''. Dies ist im allgemeinen der von einer Digitalkamera vorgegebene Dateiname und daher nicht sehr aussagekräftig.
+Bitte gib der Datei einen Namen, der den Inhalt besser beschreibt.",
 'filename-prefix-blacklist'   => ' #<!-- Diese Zeile darf nicht verändert werden! --> <pre>
 #  Syntax:
 #   * Alles von einem #-Zeichen bis zum Ende der Zeile ist ein Kommentar
@@ -1326,18 +1589,19 @@ Wenn das Problem weiter besteht, informiere einen [[Special:ListUsers/sysop|Syst
 'upload_source_url'  => ' (gültige, öffentlich zugängliche URL)',
 'upload_source_file' => ' (eine Datei auf deinem Computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Diese Spezialseite listet alle hochgeladenen Dateien auf. Standardmäßig werden die zuletzt hochgeladenen Dateien zuerst angezeigt. Durch einen Klick auf die Spaltenüberschriften kann die Sortierung umgedreht werden oder es kann nach einer anderen Spalte sortiert werden.',
-'imagelist_search_for'  => 'Suche nach Datei:',
+# Special:ListFiles
+'listfiles-summary'     => 'Diese Spezialseite listet alle hochgeladenen Dateien auf. Standardmäßig werden die zuletzt hochgeladenen Dateien zuerst angezeigt. Durch einen Klick auf die Spaltenüberschriften kann die Sortierung umgedreht werden oder es kann nach einer anderen Spalte sortiert werden.',
+'listfiles_search_for'  => 'Suche nach Datei:',
 'imgfile'               => 'Datei',
-'imagelist'             => 'Dateiliste',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Name',
-'imagelist_user'        => 'Benutzer',
-'imagelist_size'        => 'Größe',
-'imagelist_description' => 'Beschreibung',
-
-# Image description page
+'listfiles'             => 'Dateiliste',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Name',
+'listfiles_user'        => 'Benutzer',
+'listfiles_size'        => 'Größe',
+'listfiles_description' => 'Beschreibung',
+'listfiles_count'       => 'Versionen',
+
+# File description page
 'filehist'                       => 'Dateiversionen',
 'filehist-help'                  => 'Klicke auf einen Zeitpunkt, um diese Version zu laden.',
 'filehist-deleteall'             => 'Alle Versionen löschen',
@@ -1345,19 +1609,25 @@ Wenn das Problem weiter besteht, informiere einen [[Special:ListUsers/sysop|Syst
 'filehist-revert'                => 'zurücksetzen',
 'filehist-current'               => 'aktuell',
 'filehist-datetime'              => 'Version vom',
+'filehist-thumb'                 => 'Vorschaubild',
+'filehist-thumbtext'             => 'Vorschaubild für Version vom $1',
+'filehist-nothumb'               => 'Kein Vorschaubild vorhanden',
 'filehist-user'                  => 'Benutzer',
 'filehist-dimensions'            => 'Maße',
 'filehist-filesize'              => 'Dateigröße',
 'filehist-comment'               => 'Kommentar',
-'imagelinks'                     => 'Verwendung',
+'imagelinks'                     => 'Dateiverwendungen',
 'linkstoimage'                   => 'Die {{PLURAL:$1|folgende Seite verwendet|folgenden $1 Seiten verwenden}} diese Datei:',
+'linkstoimage-more'              => 'Mehr als {{PLURAL:$1|eine Seite verlinkt|$1 Seiten verlinken}} auf diese Datei.
+Die folgende Liste zeigt nur {{PLURAL:$1|den ersten Link|die ersten $1 Links}} auf diese Datei.
+Eine [[Special:WhatLinksHere/$2|vollständige Liste]] ist verfügbar.',
 'nolinkstoimage'                 => 'Keine Seite benutzt diese Datei.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Weitere Links]] für diese Datei.',
 'redirectstofile'                => 'Die {{PLURAL:$1|folgende Datei leitet|folgenden $1 Dateien leiten}} auf diese Datei weiter:',
-'duplicatesoffile'               => 'Die {{PLURAL:$1|folgende Datei ist ein Duplikat|folgenden $1 Dateien sind Duplikate}} dieser Datei:',
+'duplicatesoffile'               => 'Die {{PLURAL:$1|folgende Datei ist ein Duplikat|folgenden $1 Dateien sind Duplikate}} dieser Datei ([[Special:FileDuplicateSearch/$2|weitere Details]]):',
 'sharedupload'                   => 'Diese Datei ist ein gemeinsam genutzter Upload und kann von anderen Projekten verwendet werden.',
 'shareduploadwiki'               => 'Für weitere Informationen siehe die $1.',
-'shareduploadwiki-desc'          => 'Es folgt der Inhalt der $1 aus dem gemeinsam benutzten Repositorium.',
+'shareduploadwiki-desc'          => 'Es folgt der Inhalt der $1.',
 'shareduploadwiki-linktext'      => 'Datei-Beschreibungsseite',
 'shareduploadduplicate'          => 'Diese Datei ist ein Duplikat $1 aus dem gemeinsam genutzten Repositorium.',
 'shareduploadduplicate-linktext' => 'dieser anderen Datei',
@@ -1381,7 +1651,7 @@ Wenn das Problem weiter besteht, informiere einen [[Special:ListUsers/sysop|Syst
 # File deletion
 'filedelete'                  => 'Lösche „$1“',
 'filedelete-legend'           => 'Lösche Datei',
-'filedelete-intro'            => "Du löschst die Datei '''„[[Media:$1|$1]]“'''.",
+'filedelete-intro'            => "Du löschst die Datei '''„[[Media:$1|$1]]“''' inklusive ihrer Versionsgeschichte.",
 'filedelete-intro-old'        => "Du löschst von der Datei '''„[[Media:$1|$1]]“''' die [$4 Version vom $2, $3 Uhr].",
 'filedelete-comment'          => 'Grund:',
 'filedelete-submit'           => 'Löschen',
@@ -1389,7 +1659,6 @@ Wenn das Problem weiter besteht, informiere einen [[Special:ListUsers/sysop|Syst
 'filedelete-success-old'      => "Von der Datei '''„[[Media:$1|$1]]“''' wurde die Version vom $2, $3 Uhr gelöscht.",
 'filedelete-nofile'           => "'''„$1“''' ist nicht vorhanden.",
 'filedelete-nofile-old'       => "Es gibt von '''„$1“''' keine archivierte Version mit den angegebenen Attributen.",
-'filedelete-iscurrent'        => 'Du versuchst die aktuelle Version dieser Datei zu löschen. Bitte setze diese vorher auf eine ältere Version zurück.',
 'filedelete-otherreason'      => 'Anderer/ergänzender Grund:',
 'filedelete-reason-otherlist' => 'Anderer Grund',
 'filedelete-reason-dropdown'  => '
@@ -1418,31 +1687,31 @@ Wenn das Problem weiter besteht, informiere einen [[Special:ListUsers/sysop|Syst
 
 # Random page
 'randompage'         => 'Zufällige Seite',
-'randompage-nopages' => 'In diesem Namensraum sind keine Seiten vorhanden.',
+'randompage-nopages' => 'Im Namensraum „$1“ sind keine Seiten vorhanden.',
 
 # Random redirect
 'randomredirect'         => 'Zufällige Weiterleitung',
-'randomredirect-nopages' => 'In diesem Namensraum sind keine Weiterleitungen vorhanden.',
+'randomredirect-nopages' => 'Im Namensraum „$1“ sind keine Weiterleitungen vorhanden.',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Seitenstatistik',
-'userstats'              => 'Benutzerstatistik',
-'sitestatstext'          => "Es gibt insgesamt '''$1''' {{PLURAL:$1|Seite|Seiten}} in der Datenbank.
-Das schließt Diskussionsseiten, Seiten über {{SITENAME}}, kleine Seiten, Weiterleitungen und andere Seiten ein,
-die eventuell nicht als Seiten gewertet werden können.
-
-Diese ausgenommen gibt es '''$2''' {{PLURAL:$2|Seite|Seiten}}, die als Seite gewertet werden {{PLURAL:$2|kann|können}}.
-
-Insgesamt {{PLURAL:$8|wurde '''1''' Datei|wurden '''$8''' Dateien}} hochgeladen.
-
-Insgesamt gab es '''$3''' {{PLURAL:$3|Seitenabruf|Seitenabrufe}} und '''$4''' {{PLURAL:$4|Seitenbearbeitung|Seitenbearbeitungen}} seit {{SITENAME}} eingerichtet wurde.
-Daraus ergeben sich '''$5''' Bearbeitungen pro Seite und '''$6''' Seitenabrufe pro Bearbeitung.
-
-Länge der [http://www.mediawiki.org/wiki/Manual:Job_queue Auftragswarteschlange]: '''$7'''",
-'userstatstext'          => "Es gibt '''$1''' {{PLURAL:$1|registrierten|registrierte}} [[Special:ListUsers|Benutzer]].
-Davon {{PLURAL:$2|hat|haben}} '''$2''' Benutzer (=$4 %) $5-Rechte.",
-'statistics-mostpopular' => 'Meistbesuchte Seiten',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Seitenstatistik',
+'statistics-header-edits'      => 'Bearbeitungsstatistik',
+'statistics-header-views'      => 'Seitenaufrufstatistik',
+'statistics-header-users'      => 'Benutzerstatistik',
+'statistics-articles'          => 'Inhaltsseiten',
+'statistics-pages'             => 'Seiten',
+'statistics-pages-desc'        => 'Alle Seiten in diesem Wiki, inklusive Diskussionsseiten, Weiterleitungen usw.',
+'statistics-files'             => 'Hochgeladene Dateien',
+'statistics-edits'             => 'Seitenbearbeitungen',
+'statistics-edits-average'     => 'Bearbeitungen pro Seite im Durchschnitt',
+'statistics-views-total'       => 'Seitenaufrufe gesamt',
+'statistics-views-peredit'     => 'Seitenaufrufe pro Bearbeitung',
+'statistics-jobqueue'          => 'Länge der [http://www.mediawiki.org/wiki/Manual:Job_queue Auftragswarteschlange]',
+'statistics-users'             => 'Registrierte [[Special:ListUsers|Benutzer]]',
+'statistics-users-active'      => 'Aktive Benutzer',
+'statistics-users-active-desc' => 'Benutzer mit Bearbeitungen {{PLURAL:$1|in den letzten 24 Stunden|in den vergangenen $1 Tagen}}',
+'statistics-mostpopular'       => 'Meistbesuchte Seiten',
 
 'disambiguations'      => 'Begriffsklärungsseiten',
 'disambiguationspage'  => 'Template:Begriffsklärung',
@@ -1485,7 +1754,8 @@ Jede Zeile enthält Links zu der ersten und zweiten Weiterleitung sowie das Ziel
 'popularpages'            => 'Beliebteste Seiten',
 'wantedcategories'        => 'Benutzte, aber nicht angelegte Kategorien',
 'wantedpages'             => 'Gewünschte Seiten',
-'missingfiles'            => 'Fehlende Dateien',
+'wantedfiles'             => 'Fehlende Dateien',
+'wantedtemplates'         => 'Fehlende Vorlagen',
 'mostlinked'              => 'Häufig verlinkte Seiten',
 'mostlinkedcategories'    => 'Meistbenutzte Kategorien',
 'mostlinkedtemplates'     => 'Meistbenutzte Vorlagen',
@@ -1499,12 +1769,15 @@ Jede Zeile enthält Links zu der ersten und zweiten Weiterleitung sowie das Ziel
 'deadendpagestext'        => 'Aus den folgenden Seiten wird nicht aus {{SITENAME}} verwiesen.',
 'protectedpages'          => 'Geschützte Seiten',
 'protectedpages-indef'    => 'Nur unbeschränkt geschützte Seiten zeigen',
+'protectedpages-cascade'  => 'Nur Seiten mit Kaskadenschutz',
 'protectedpagestext'      => 'Diese Spezialseite zeigt alle vor dem Verschieben oder Bearbeiten geschützten Seiten.',
 'protectedpagesempty'     => 'Aktuell sind keine Seiten mit diesen Parametern geschützt.',
 'protectedtitles'         => 'Gesperrte Titel',
 'protectedtitlestext'     => 'Die folgenden Titel wurden zur Neuerstellung gesperrt.',
 'protectedtitlesempty'    => 'Zur Zeit sind mit den angegebenen Parametern keine Seiten zur Neuerstellung gesperrt.',
 'listusers'               => 'Benutzerverzeichnis',
+'listusers-editsonly'     => 'Zeige nur Benutzer mit Beiträgen',
+'usereditcount'           => '$1 {{PLURAL:$1|Bearbeitung|Bearbeitungen}}',
 'newpages'                => 'Neue Seiten',
 'newpages-username'       => 'Benutzername:',
 'ancientpages'            => 'Seit längerem unbearbeitete Seiten',
@@ -1525,14 +1798,14 @@ Jede Zeile enthält Links zu der ersten und zweiten Weiterleitung sowie das Ziel
 'booksources-search-legend' => 'Suche nach Bezugsquellen für Bücher',
 'booksources-go'            => 'Suchen',
 'booksources-text'          => 'Dies ist eine Liste mit Links zu Internetseiten, die neue und gebrauchte Bücher verkaufen. Dort kann es auch weitere Informationen über die Bücher geben. {{SITENAME}} ist mit keinem dieser Anbieter geschäftlich verbunden.',
+'booksources-invalid-isbn'  => 'Vermutlich ist die ISBN ungültig.
+Bitte prüfe, ob korrekt von der Quelle übertragen wurde.',
 
 # Special:Log
 'specialloguserlabel'  => 'Benutzer:',
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Logbücher',
 'all-logs-page'        => 'Alle Logbücher',
-'log-search-legend'    => 'Logbücher durchsuchen',
-'log-search-submit'    => 'Suchen',
 'alllogstext'          => 'Dies ist die kombinierte Anzeige aller in {{SITENAME}} geführten Logbücher.
 Die Ausgabe kann durch die Auswahl des Logbuchtyps, des Benutzers oder des Seitentitels eingeschränkt werden (Groß-/Kleinschreibung muss beachtet werden).',
 'logempty'             => 'Keine passenden Einträge.',
@@ -1544,6 +1817,7 @@ Die Ausgabe kann durch die Auswahl des Logbuchtyps, des Benutzers oder des Seite
 'nextpage'          => 'Nächste Seite ($1)',
 'prevpage'          => 'Vorherige Seite ($1)',
 'allpagesfrom'      => 'Seiten anzeigen ab:',
+'allpagesto'        => 'Seiten anzeigen bis:',
 'allarticles'       => 'Alle Seiten',
 'allinnamespace'    => 'Alle Seiten (Namensraum: $1)',
 'allnotinnamespace' => 'Alle Seiten (nicht im $1 Namensraum)',
@@ -1563,41 +1837,68 @@ Siehe auch die Liste der [[Special:WantedCategories|gewünschten Kategorien]].',
 'special-categories-sort-count' => 'Sortierung nach Anzahl',
 'special-categories-sort-abc'   => 'Sortierung nach Alphabet',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Gelöschte Beiträge',
+
+# Special:LinkSearch
+'linksearch'       => 'Weblink-Suche',
+'linksearch-pat'   => 'Suchmuster:',
+'linksearch-ns'    => 'Namensraum:',
+'linksearch-ok'    => 'Suchen',
+'linksearch-text'  => 'Diese Spezialseite ermöglicht die Suche nach Seiten, in denen bestimmte Weblinks enthalten sind. Dabei können Wildcards wie beispielsweise <tt>*.example.com</tt> benutzt werden.<br />Unterstützte Protokolle: <tt>$1</tt>',
+'linksearch-line'  => '$1 ist verlinkt von $2',
+'linksearch-error' => 'Wildcards können nur am Anfang der URL verwendet werden.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Zeige Benutzer ab:',
 'listusers-submit'   => 'Zeige',
 'listusers-noresult' => 'Keinen Benutzer gefunden.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Neuanmeldungs-Logbuch',
+'newuserlogpagetext'          => 'Dies ist ein Logbuch für neu erstellte Benutzerkonten.',
+'newuserlog-byemail'          => 'das Passwort wurde per E-Mail versandt',
+'newuserlog-create-entry'     => 'Benutzer wurde neu registriert',
+'newuserlog-create2-entry'    => 'erstellte neues Benutzerkonto „$1“',
+'newuserlog-autocreate-entry' => 'Benutzerkonto wurde automatisch erstellt',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Benutzergruppen-Rechte',
-'listgrouprights-summary'  => 'Dies ist eine Liste der in diesem Wiki definierten Benutzergruppen und der damit verbundenen Rechte.
+'listgrouprights'                 => 'Benutzergruppen-Rechte',
+'listgrouprights-summary'         => 'Dies ist eine Liste der in diesem Wiki definierten Benutzergruppen und der damit verbundenen Rechte.
 Zusätzliche Informationen über einzelne Rechte können [[{{MediaWiki:Listgrouprights-helppage}}|hier]] gefunden werden.',
-'listgrouprights-group'    => 'Gruppe',
-'listgrouprights-rights'   => 'Rechte',
-'listgrouprights-helppage' => 'Help:Gruppenrechte',
-'listgrouprights-members'  => '(Mitgliederliste)',
+'listgrouprights-group'           => 'Gruppe',
+'listgrouprights-rights'          => 'Rechte',
+'listgrouprights-helppage'        => 'Help:Gruppenrechte',
+'listgrouprights-members'         => '(Mitgliederliste)',
+'listgrouprights-addgroup'        => 'Kann Benutzer zu {{PLURAL:$2|dieser Gruppe|diesen Gruppen}} hinzufügen: $1',
+'listgrouprights-removegroup'     => 'Kann Benutzer aus {{PLURAL:$2|dieser Gruppe|diesen Gruppen}} entfernen: $1',
+'listgrouprights-addgroup-all'    => 'Kann Benutzer zu allen Gruppen hinzufügen',
+'listgrouprights-removegroup-all' => 'Kann Benutzer aus allen Gruppen entfernen',
 
 # E-mail user
-'mailnologin'     => 'Fehler beim E-Mail-Versand',
-'mailnologintext' => 'Du musst [[Special:UserLogin|angemeldet sein]] und eine bestätigte E-Mail-Adresse in deinen [[Special:Preferences|Einstellungen]] eingetragen haben, um anderen Benutzern E-Mails schicken zu können.',
-'emailuser'       => 'E-Mail an diesen Benutzer',
-'emailpage'       => 'E-Mail an Benutzer',
-'emailpagetext'   => 'Du kannst dem Benutzer mit dem unten stehenden Formular eine E-Mail senden.
+'mailnologin'      => 'Fehler beim E-Mail-Versand',
+'mailnologintext'  => 'Du musst [[Special:UserLogin|angemeldet sein]] und eine bestätigte E-Mail-Adresse in deinen [[Special:Preferences|Einstellungen]] eingetragen haben, um anderen Benutzern E-Mails schicken zu können.',
+'emailuser'        => 'E-Mail an diesen Benutzer',
+'emailpage'        => 'E-Mail an Benutzer',
+'emailpagetext'    => 'Du kannst dem Benutzer mit dem unten stehenden Formular eine E-Mail senden.
 Als Absender wird die E-Mail-Adresse aus deinen [[Special:Preferences|Einstellungen]] eingetragen, damit der Benutzer dir antworten kann.',
-'usermailererror' => 'Das E-Mail-Objekt gab einen Fehler zurück:',
-'defemailsubject' => '{{SITENAME}}-E-Mail',
-'noemailtitle'    => 'Keine E-Mail-Adresse',
-'noemailtext'     => 'Dieser Benutzer hat keine gültige E-Mail-Adresse angegeben oder möchte keine E-Mail von anderen Benutzern empfangen.',
-'emailfrom'       => 'Von:',
-'emailto'         => 'An:',
-'emailsubject'    => 'Betreff:',
-'emailmessage'    => 'Nachricht:',
-'emailsend'       => 'Senden',
-'emailccme'       => 'Sende eine Kopie der E-Mail an mich',
-'emailccsubject'  => 'Kopie deiner Nachricht an $1: $2',
-'emailsent'       => 'E-Mail verschickt',
-'emailsenttext'   => 'Deine E-Mail wurde verschickt.',
-'emailuserfooter' => 'Diese E-Mail wurde von {{SITENAME}}-Benutzer „$1“ an „$2“ gesendet.',
+'usermailererror'  => 'Das E-Mail-Objekt gab einen Fehler zurück:',
+'defemailsubject'  => '{{SITENAME}}-E-Mail',
+'noemailtitle'     => 'Keine E-Mail-Adresse',
+'noemailtext'      => 'Dieser Benutzer hat keine gültige E-Mail-Adresse angegeben.',
+'nowikiemailtitle' => 'E-Mail-Versand nicht möglich',
+'nowikiemailtext'  => 'Dieser Benutzer möchte keine E-Mails von anderen Benutzern erhalten.',
+'email-legend'     => 'E-Mail an einen anderen {{SITENAME}}-Benutzer senden',
+'emailfrom'        => 'Von:',
+'emailto'          => 'An:',
+'emailsubject'     => 'Betreff:',
+'emailmessage'     => 'Nachricht:',
+'emailsend'        => 'Senden',
+'emailccme'        => 'Sende eine Kopie der E-Mail an mich',
+'emailccsubject'   => 'Kopie deiner Nachricht an $1: $2',
+'emailsent'        => 'E-Mail verschickt',
+'emailsenttext'    => 'Deine E-Mail wurde verschickt.',
+'emailuserfooter'  => 'Diese E-Mail wurde von {{SITENAME}}-Benutzer „$1“ an „$2“ gesendet.',
 
 # Watchlist
 'watchlist'            => 'Beobachtungsliste',
@@ -1632,18 +1933,13 @@ Wenn du die Seite wieder von deiner Beobachtungsliste entfernen möchtest, klick
 'iteminvalidname'      => 'Problem mit dem Eintrag „$1“, ungültiger Name.',
 'wlnote'               => "Es {{PLURAL:$1|folgt die letzte Änderung|folgen die letzten '''$1''' Änderungen}} der letzten {{PLURAL:$2|Stunde|'''$2''' Stunden}}.",
 'wlshowlast'           => 'Zeige die Änderungen der letzten $1 Stunden, $2 Tage oder $3.',
-'watchlist-show-bots'  => 'Bot-Änderungen einblenden',
-'watchlist-hide-bots'  => 'Bot-Änderungen ausblenden',
-'watchlist-show-own'   => 'Eigene Änderungen einblenden',
-'watchlist-hide-own'   => 'Eigene Änderungen ausblenden',
-'watchlist-show-minor' => 'Kleine Änderungen einblenden',
-'watchlist-hide-minor' => 'Kleine Änderungen ausblenden',
+'watchlist-options'    => 'Anzeigeoptionen',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Beobachten …',
 'unwatching' => 'Nicht beobachten …',
 
-'enotif_mailer'                => '{{SITENAME}} E-Mail-Benachrichtigungsdienst',
+'enotif_mailer'                => '{{SITENAME}}-E-Mail-Benachrichtigungsdienst',
 'enotif_reset'                 => 'Alle Seiten als besucht markieren',
 'enotif_newpagetext'           => 'Das ist eine neue Seite.',
 'enotif_impersonal_salutation' => '{{SITENAME}}-Benutzer',
@@ -1667,64 +1963,70 @@ Kontakt zum Bearbeiter:
 E-Mail: $PAGEEDITOR_EMAIL
 Wiki: $PAGEEDITOR_WIKI
 
-Es werden solange keine weiteren Benachrichtigungsmails gesendet, bis du die Seite wieder besucht hast. Auf deiner Beobachtungsliste kannst du alle Benachrichtigungsmarker zusammen zurücksetzen.
+Es werden solange keine weiteren Benachrichtigungs-E-Mails gesendet, bis du die Seite wieder besucht hast. Auf deiner Beobachtungsliste kannst du alle Benachrichtigungsmarker zusammen zurücksetzen.
 
-             Dein freundliches {{SITENAME}} Benachrichtigungssystem
+             Dein freundliches {{SITENAME}}-Benachrichtigungssystem
 
 --
 Um die Einstellungen deiner Beobachtungsliste anzupassen, besuche: {{fullurl:Special:Watchlist/edit}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Seite löschen',
-'confirm'                     => 'Bestätigen',
-'excontent'                   => "Alter Inhalt: '$1'",
-'excontentauthor'             => 'Inhalt war: „$1“ (einziger Bearbeiter: [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => "Inhalt vor dem Leeren der Seite: '$1'",
-'exblank'                     => 'Seite war leer',
-'delete-confirm'              => 'Löschen von „$1“',
-'delete-legend'               => 'Löschen',
-'historywarning'              => 'Achtung, die Seite, die du löschen möchtest, hat eine Versionsgeschichte:',
-'confirmdeletetext'           => 'Du bist dabei, eine Seite mit allen zugehörigen älteren Versionen zu löschen. Bitte bestätige dazu, dass du dir der Konsequenzen bewusst bist, und dass du in Übereinstimmung mit den [[{{MediaWiki:Policy-url}}|Richtlinien]] handelst.',
-'actioncomplete'              => 'Aktion beendet',
-'deletedtext'                 => '„<nowiki>$1</nowiki>“ wurde gelöscht. Im $2 findest du eine Liste der letzten Löschungen.',
-'deletedarticle'              => 'hat „[[$1]]“ gelöscht',
-'suppressedarticle'           => 'veränderte die Sichtbarkeit von „[[$1]]“',
-'dellogpage'                  => 'Lösch-Logbuch',
-'dellogpagetext'              => 'Dies ist das Logbuch der gelöschten Seiten und Dateien.',
-'deletionlog'                 => 'Lösch-Logbuch',
-'reverted'                    => 'Auf eine alte Version zurückgesetzt',
-'deletecomment'               => 'Grund der Löschung:',
-'deleteotherreason'           => 'Anderer/ergänzender Grund:',
-'deletereasonotherlist'       => 'Anderer Grund',
-'deletereason-dropdown'       => '
+# Delete
+'deletepage'             => 'Seite löschen',
+'confirm'                => 'Bestätigen',
+'excontent'              => 'Alter Inhalt: „$1“',
+'excontentauthor'        => 'Inhalt war: „$1“ (einziger Bearbeiter: [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'Inhalt vor dem Leeren der Seite: „$1“',
+'exblank'                => 'Seite war leer',
+'delete-confirm'         => 'Löschen von „$1“',
+'delete-legend'          => 'Löschen',
+'historywarning'         => 'Achtung, die Seite, die du löschen möchtest, hat eine Versionsgeschichte:',
+'confirmdeletetext'      => 'Du bist dabei, eine Seite mit allen zugehörigen älteren Versionen zu löschen. Bitte bestätige dazu, dass du dir der Konsequenzen bewusst bist, und dass du in Übereinstimmung mit den [[{{MediaWiki:Policy-url}}|Richtlinien]] handelst.',
+'actioncomplete'         => 'Aktion beendet',
+'deletedtext'            => '„<nowiki>$1</nowiki>“ wurde gelöscht. Im $2 findest du eine Liste der letzten Löschungen.',
+'deletedarticle'         => 'hat „[[$1]]“ gelöscht',
+'suppressedarticle'      => 'veränderte die Sichtbarkeit von „[[$1]]“',
+'dellogpage'             => 'Lösch-Logbuch',
+'dellogpagetext'         => 'Dies ist das Logbuch der gelöschten Seiten und Dateien.',
+'deletionlog'            => 'Lösch-Logbuch',
+'reverted'               => 'Auf eine alte Version zurückgesetzt',
+'deletecomment'          => 'Grund der Löschung:',
+'deleteotherreason'      => 'Anderer/ergänzender Grund:',
+'deletereasonotherlist'  => 'Anderer Grund',
+'deletereason-dropdown'  => '
 * Allgemeine Löschgründe
 ** Wunsch des Autors
 ** Urheberrechtsverletzung
 ** Vandalismus',
-'delete-edit-reasonlist'      => 'Löschgründe bearbeiten',
-'delete-toobig'               => 'Diese Seite hat mit mehr als $1 {{PLURAL:$1|Version|Versionen}} eine sehr lange Versionsgeschichte. Das Löschen solcher Seiten wurde eingeschränkt, um eine versehentliche Überlastung der Server zu verhindern.',
-'delete-warning-toobig'       => 'Diese Seite hat mit mehr als $1 {{PLURAL:$1|Version|Versionen}} eine sehr lange Versionsgeschichte. Das Löschen kann zu Störungen im Datenbankbetrieb führen.',
-'rollback'                    => 'Zurücksetzen der Änderungen',
-'rollback_short'              => 'Zurücksetzen',
-'rollbacklink'                => 'Zurücksetzen',
-'rollbackfailed'              => 'Zurücksetzen gescheitert',
-'cantrollback'                => 'Die Änderung kann nicht zurückgesetzt werden, da es keine früheren Autoren gibt.',
-'alreadyrolled'               => 'Das Zurücksetzen der Änderungen von [[User:$2|$2]] ([[User talk:$2|Diskussion]], [[Special:Contributions/$2|{{int:contribslink}}]]) an [[:$1]] ist gescheitert, da in der Zwischenzeit ein anderer Benutzer die Seite geändert hat.
-
-Die letzte Änderung stammt von [[User:$3|$3]] ([[User talk:$3|Diskussion]], [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Der Änderungskommentar lautet: „<i>$1</i>“.', # only shown if there is an edit comment
-'revertpage'                  => 'Änderungen von [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) rückgängig gemacht und letzte Version von [[User:$1|$1]] wiederhergestellt', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Die Änderungen von $1 wurden rückgängig gemacht und die letzte Version von $2 wurde wiederhergestellt.',
-'sessionfailure'              => 'Es gab ein Problem mit der Ãœbertragung deiner Benutzerdaten.
+'delete-edit-reasonlist' => 'Löschgründe bearbeiten',
+'delete-toobig'          => 'Diese Seite hat mit mehr als $1 {{PLURAL:$1|Version|Versionen}} eine sehr lange Versionsgeschichte. Das Löschen solcher Seiten wurde eingeschränkt, um eine versehentliche Überlastung der Server zu verhindern.',
+'delete-warning-toobig'  => 'Diese Seite hat mit mehr als $1 {{PLURAL:$1|Version|Versionen}} eine sehr lange Versionsgeschichte. Das Löschen kann zu Störungen im Datenbankbetrieb führen.',
+
+# Rollback
+'rollback'         => 'Zurücksetzen der Änderungen',
+'rollback_short'   => 'Zurücksetzen',
+'rollbacklink'     => 'Zurücksetzen',
+'rollbackfailed'   => 'Zurücksetzen gescheitert',
+'cantrollback'     => 'Die Änderung kann nicht zurückgesetzt werden, da es keine früheren Autoren gibt.',
+'alreadyrolled'    => 'Das Zurücksetzen der Änderungen von [[User:$2|$2]] ([[User talk:$2|Diskussion]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) an [[:$1]] ist gescheitert, da in der Zwischenzeit ein anderer Benutzer die Seite geändert hat.
+
+Die letzte Änderung stammt von [[User:$3|$3]] ([[User talk:$3|Diskussion]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Die Änderungszusammenfassung lautet: ''„$1“''.", # only shown if there is an edit comment
+'revertpage'       => 'Änderungen von [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) rückgängig gemacht und letzte Version von [[User:$1|$1]] wiederhergestellt', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Die Änderungen von $1 wurden rückgängig gemacht und die letzte Version von $2 wurde wiederhergestellt.',
+'sessionfailure'   => 'Es gab ein Problem mit der Ãœbertragung deiner Benutzerdaten.
 Diese Aktion wurde daher sicherheitshalber abgebrochen, um eine falsche Zuordnung deiner Änderungen zu einem anderen Benutzer zu verhindern.
 Bitte gehe zurück und versuche den Vorgang erneut auszuführen.',
+
+# Protect
 'protectlogpage'              => 'Seitenschutz-Logbuch',
 'protectlogtext'              => 'Dies ist das Seitenschutz-Logbuch.
 Siehe die [[Special:ProtectedPages|Liste der geschützten Seiten]] für alle aktuell geschützten Seiten.',
 'protectedarticle'            => 'schützte „[[$1]]“',
 'modifiedarticleprotection'   => 'änderte den Schutz von „[[$1]]“',
 'unprotectedarticle'          => 'hob den Schutz von „[[$1]]“ auf',
+'movedarticleprotection'      => 'übertrug den Seitenschutz von „[[$2]]“ auf „[[$1]]“',
 'protect-title'               => 'Schutz ändern von „$1“',
+'prot_1movedto2'              => 'hat „[[$1]]“ nach „[[$2]]“ verschoben',
 'protect-legend'              => 'Seitenschutzstatus ändern',
 'protectcomment'              => 'Grund:',
 'protectexpiry'               => 'Sperrdauer:',
@@ -1732,18 +2034,31 @@ Siehe die [[Special:ProtectedPages|Liste der geschützten Seiten]] für alle akt
 'protect_expiry_old'          => 'Die Sperrzeit liegt in der Vergangenheit.',
 'protect-unchain'             => 'Verschiebeschutz ändern',
 'protect-text'                => 'Hier kannst du den Schutzstatus für die Seite „$1“ einsehen und ändern.',
-'protect-locked-blocked'      => 'Du kannst den Seitenschutz nicht ändern, da dein Benutzerkonto gesperrt ist. Hier sind die aktuellen Seitenschutz-Einstellungen für die Seite <strong>„$1“:</strong>',
-'protect-locked-dblock'       => 'Die Datenbank ist gesperrt, der Seitenschutz kann daher nicht geändert werden. Hier sind die aktuellen Seitenschutz-Einstellungen für die Seite <strong>„$1“:</strong>',
-'protect-locked-access'       => 'Dein Benutzerkonto verfügt nicht über die notwendigen Rechte zur Änderung des Seitenschutzes. Hier sind die aktuellen Seitenschutzeinstellungen für die Seite <strong>„$1“:</strong>',
+'protect-locked-blocked'      => "Du kannst den Seitenschutz nicht ändern, da dein Benutzerkonto gesperrt ist. Hier sind die aktuellen Seitenschutz-Einstellungen für die Seite '''„$1“:'''",
+'protect-locked-dblock'       => "Die Datenbank ist gesperrt, der Seitenschutz kann daher nicht geändert werden. Hier sind die aktuellen Seitenschutz-Einstellungen für die Seite '''„$1“:'''",
+'protect-locked-access'       => "Dein Benutzerkonto verfügt nicht über die notwendigen Rechte zur Änderung des Seitenschutzes. Hier sind die aktuellen Seitenschutzeinstellungen für die Seite '''„$1“:'''",
 'protect-cascadeon'           => 'Diese Seite ist gegenwärtig Teil einer Kaskadensperre. Sie ist in die {{PLURAL:$1|folgende Seite|folgenden Seiten}} eingebunden, welche durch die Kaskadensperroption geschützt {{PLURAL:$1|ist|sind}}. Der Seitenschutzstatus kann für diese Seite geändert werden, dies hat jedoch keinen Einfluss auf die Kaskadensperre:',
-'protect-default'             => 'Alle (Standard)',
+'protect-default'             => 'Alle Benutzer',
 'protect-fallback'            => 'Es wird die „$1“-Berechtigung benötigt.',
-'protect-level-autoconfirmed' => 'Sperrung für nicht registrierte Benutzer',
+'protect-level-autoconfirmed' => 'Sperrung für neue und nicht registrierte Benutzer',
 'protect-level-sysop'         => 'Nur Administratoren',
 'protect-summary-cascade'     => 'kaskadierend',
-'protect-expiring'            => 'bis $1 (UTC)',
+'protect-expiring'            => 'bis $2, $3 Uhr (UTC)',
+'protect-expiry-indefinite'   => 'unbeschränkt',
 'protect-cascade'             => 'Kaskadierende Sperre – alle in diese Seite eingebundenen Vorlagen werden ebenfalls gesperrt.',
 'protect-cantedit'            => 'Du kannst die Sperre dieser Seite nicht ändern, da du keine Berechtigung zum Bearbeiten der Seite hast.',
+'protect-othertime'           => 'Andere Sperrdauer:',
+'protect-othertime-op'        => 'andere Sperrdauer',
+'protect-existing-expiry'     => 'Aktuelles Seitenschutzende: $2, $3 Uhr',
+'protect-otherreason'         => 'Anderer/ergänzender Grund:',
+'protect-otherreason-op'      => 'anderer/ergänzender Grund',
+'protect-dropdown'            => '*Allgemeine Schutzgründe
+** Weblink-Spam
+** Editwar
+** Häufig eingebundene Vorlage
+** Seite mit hoher Besucherzahl',
+'protect-edit-reasonlist'     => 'Schutzgründe bearbeiten',
+'protect-expiry-options'      => '1 Stunde:1 hour,2 Stunden:2 hours,6 Stunden:6 hours,1 Tag:1 day,3 Tage:3 days,1 Woche:1 week,2 Wochen:2 weeks,1 Monat:1 month,3 Monate:3 months,1 Jahr:1 year,Unbeschränkt:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Schutzstatus',
 'restriction-level'           => 'Schutzhöhe',
 'minimum-size'                => 'Mindestgröße',
@@ -1766,7 +2081,7 @@ Siehe die [[Special:ProtectedPages|Liste der geschützten Seiten]] für alle akt
 'undeletepage'                 => 'Gelöschte Seite wiederherstellen',
 'undeletepagetitle'            => "'''Die folgende Ausgabe zeigt die gelöschten Versionen von [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Gelöschte Seiten anzeigen',
-'undeletepagetext'             => 'Die folgenden Seiten wurden gelöscht und können von Administratoren wiederhergestellt werden:',
+'undeletepagetext'             => 'Die {{PLURAL:$1|folgende Seite wurde gelöscht und kann|folgenden $1 Seiten wurden gelöscht und können}} von Administratoren wiederhergestellt werden:',
 'undelete-fieldset-title'      => 'Wiederherstellen',
 'undeleteextrahelp'            => '* Um die Seite komplett mit allen Versionen wiederherzustellen, wähle keine Version aus, gib eine Begründung an und klicke auf „Wiederherstellen“.
 * Möchtest du nur bestimmte Versionen wiederherstellen, so wähle diese bitte einzeln anhand der Markierungen aus, gib eine Begründung an und klicke dann auf „Wiederherstellen“.
@@ -1779,12 +2094,13 @@ In diesem Fall darf die aktuellste Version nicht markiert werden oder ihr Status
 'undeletehistorynoadmin'       => 'Diese Seite wurde gelöscht. Der Grund für die Löschung ist in der Zusammenfassung angegeben,
 genauso wie Details zum letzten Benutzer, der diese Seite vor der Löschung bearbeitet hat.
 Der aktuelle Text der gelöschten Seite ist nur Administratoren zugänglich.',
-'undelete-revision'            => 'Gelöschte Version von $1 - $2, $3:',
+'undelete-revision'            => 'Gelöschte Version von $1 (vom $4 um $5 Uhr), $3:',
 'undeleterevision-missing'     => 'Ungültige oder fehlende Version. Entweder ist der Link falsch oder die Version wurde aus dem Archiv wiederhergestellt oder entfernt.',
 'undelete-nodiff'              => 'Keine vorhergehende Version vorhanden.',
 'undeletebtn'                  => 'Wiederherstellen',
 'undeletelink'                 => 'wiederherstellen',
 'undeletereset'                => 'Abbrechen',
+'undeleteinvert'               => 'Auswahl umkehren',
 'undeletecomment'              => 'Begründung:',
 'undeletedarticle'             => 'hat „[[$1]]“ wiederhergestellt',
 'undeletedrevisions'           => '{{PLURAL:$1|1 Version wurde|$1 Versionen wurden}} wiederhergestellt',
@@ -1816,26 +2132,27 @@ $1',
 'blanknamespace' => '(Seiten)',
 
 # Contributions
-'contributions' => 'Benutzerbeiträge',
-'mycontris'     => 'Eigene Beiträge',
-'contribsub2'   => 'Für $1 ($2)',
-'nocontribs'    => 'Es wurden keine Benutzerbeiträge mit diesen Kriterien gefunden.',
-'uctop'         => '(aktuell)',
-'month'         => 'und Monat:',
-'year'          => 'bis Jahr:',
-
-'sp-contributions-newbies'     => 'Zeige nur Beiträge neuer Benutzer',
-'sp-contributions-newbies-sub' => 'Für Neulinge',
-'sp-contributions-blocklog'    => 'Sperrlogbuch',
-'sp-contributions-search'      => 'Suche nach Benutzerbeiträgen',
-'sp-contributions-username'    => 'IP-Adresse oder Benutzername:',
-'sp-contributions-submit'      => 'Suchen',
+'contributions'       => 'Benutzerbeiträge',
+'contributions-title' => 'Benutzerbeiträge von „$1“',
+'mycontris'           => 'Eigene Beiträge',
+'contribsub2'         => 'Für $1 ($2)',
+'nocontribs'          => 'Es wurden keine Benutzerbeiträge mit diesen Kriterien gefunden.',
+'uctop'               => '(aktuell)',
+'month'               => 'und Monat:',
+'year'                => 'bis Jahr:',
+
+'sp-contributions-newbies'       => 'Zeige nur Beiträge neuer Benutzer',
+'sp-contributions-newbies-sub'   => 'Für Neulinge',
+'sp-contributions-newbies-title' => 'Benutzerbeiträge von neuen Benutzern',
+'sp-contributions-blocklog'      => 'Sperr-Logbuch',
+'sp-contributions-search'        => 'Suche nach Benutzerbeiträgen',
+'sp-contributions-username'      => 'IP-Adresse oder Benutzername:',
+'sp-contributions-submit'        => 'Suchen',
 
 # What links here
 'whatlinkshere'            => 'Links auf diese Seite',
 'whatlinkshere-title'      => 'Seiten, die auf „$1“ verlinken',
 'whatlinkshere-page'       => 'Seite:',
-'linklistsub'              => '(Linkliste)',
 'linkshere'                => "Die folgenden Seiten verlinken auf '''„[[:$1]]“''':",
 'nolinkshere'              => "Keine Seite verlinkt auf '''„[[:$1]]“'''.",
 'nolinkshere-ns'           => "Keine Seite verlinkt auf '''„[[:$1]]“''' im gewählten Namensraum.",
@@ -1884,6 +2201,8 @@ Bitte gib den Grund für die Sperre an.',
 'ipbotherreason'                  => 'Andere/ergänzende Begründung:',
 'ipbhidename'                     => 'Benutzername im Sperr-Logbuch, der Liste aktiver Sperren und dem Benutzerverzeichnis verstecken.',
 'ipbwatchuser'                    => 'Benutzer(diskussions)seite beobachten',
+'ipballowusertalk'                => 'Benutzer darf eigene Diskussionsseiten während seiner Sperre bearbeiten',
+'ipb-change-block'                => 'Sperre mit diesen Sperrparametern erneuern',
 'badipaddress'                    => 'Die IP-Adresse hat ein falsches Format.',
 'blockipsuccesssub'               => 'Sperre erfolgreich',
 'blockipsuccesstext'              => 'Der Benutzer/die IP-Adresse [[Special:Contributions/$1|$1]] wurde gesperrt.<br />
@@ -1893,6 +2212,7 @@ Zur Aufhebung der Sperre siehe die [[Special:IPBlockList|Liste aller aktiven Spe
 'ipb-unblock'                     => 'IP-Adresse/Benutzer freigeben',
 'ipb-blocklist-addr'              => 'Aktuelle Sperre für „$1“ anzeigen',
 'ipb-blocklist'                   => 'Alle aktuellen Sperren anzeigen',
+'ipb-blocklist-contribs'          => 'Benutzerbeiträge für „$1“',
 'unblockip'                       => 'IP-Adresse freigeben',
 'unblockiptext'                   => 'Mit diesem Formular kannst du eine IP-Adresse oder einen Benutzer freigeben.',
 'ipusubmit'                       => 'Freigeben',
@@ -1901,6 +2221,9 @@ Zur Aufhebung der Sperre siehe die [[Special:IPBlockList|Liste aller aktiven Spe
 'ipblocklist'                     => 'Gesperrte IP-Adressen und Benutzernamen',
 'ipblocklist-legend'              => 'Suche nach einem gesperrten Benutzer',
 'ipblocklist-username'            => 'Benutzername oder IP-Adresse:',
+'ipblocklist-sh-userblocks'       => 'Benutzersperren $1',
+'ipblocklist-sh-tempblocks'       => 'Befristete Sperren $1',
+'ipblocklist-sh-addressblocks'    => 'IP-Sperren $1',
 'ipblocklist-submit'              => 'Suchen',
 'blocklistline'                   => '$1, $2 sperrte $3 (bis $4)',
 'infiniteblock'                   => 'unbegrenzt',
@@ -1909,14 +2232,18 @@ Zur Aufhebung der Sperre siehe die [[Special:IPBlockList|Liste aller aktiven Spe
 'noautoblockblock'                => 'Autoblock deaktiviert',
 'createaccountblock'              => 'Erstellung von Benutzerkonten gesperrt',
 'emailblock'                      => 'E-Mail-Versand gesperrt',
+'blocklist-nousertalk'            => 'darf eigene Diskussionsseite nicht bearbeiten',
 'ipblocklist-empty'               => 'Die Liste enthält keine Einträge.',
 'ipblocklist-no-results'          => 'Die gesuchte IP-Adresse/der Benutzername ist nicht gesperrt.',
 'blocklink'                       => 'Sperren',
 'unblocklink'                     => 'Freigeben',
+'change-blocklink'                => 'Sperre ändern',
 'contribslink'                    => 'Beiträge',
 'autoblocker'                     => 'Automatische Sperre, da du eine gemeinsame IP-Adresse mit [[User:$1|Benutzer:$1]] benutzt. Grund: „$2“.',
 'blocklogpage'                    => 'Benutzersperr-Logbuch',
+'blocklog-fulllog'                => 'Vollständiges Benutzersperr-Logbuch',
 'blocklogentry'                   => 'sperrte „[[$1]]“ für den Zeitraum: $2 $3',
+'reblock-logentry'                => 'änderte die Sperre für „[[$1]]“ für den Zeitraum: $2 $3',
 'blocklogtext'                    => 'Dies ist das Logbuch über Sperrungen und Entsperrungen von Benutzern und IP-Adressen.
 Automatisch gesperrte IP-Adressen werden nicht erfasst.
 Siehe die [[Special:IPBlockList|{{int:ipblocklist}}]] für alle aktiven Sperren.',
@@ -1925,11 +2252,14 @@ Siehe die [[Special:IPBlockList|{{int:ipblocklist}}]] für alle aktiven Sperren.
 'block-log-flags-nocreate'        => 'Erstellung von Benutzerkonten gesperrt',
 'block-log-flags-noautoblock'     => 'Autoblock deaktiviert',
 'block-log-flags-noemail'         => 'E-Mail-Versand gesperrt',
+'block-log-flags-nousertalk'      => 'darf eigene Diskussionsseite nicht bearbeiten',
 'block-log-flags-angry-autoblock' => 'erweiterter Autoblock aktiviert',
 'range_block_disabled'            => 'Die Möglichkeit, ganze Adressräume zu sperren, ist nicht aktiviert.',
 'ipb_expiry_invalid'              => 'Die eingegebene Dauer ist ungültig.',
 'ipb_expiry_temp'                 => 'Versteckte Benutzernamens-Sperren sollen permanent sein.',
 'ipb_already_blocked'             => '„$1“ wurde bereits gesperrt.',
+'ipb-needreblock'                 => '== Sperre vorhanden ==
+„$1“ ist bereits gesperrt. Möchtest du die Sperrparameter ändern?',
 'ipb_cant_unblock'                => 'Fehler: Sperr-ID $1 nicht gefunden. Die Sperre wurde bereits aufgehoben.',
 'ipb_blocked_as_range'            => 'Fehler: Die IP-Adresse $1 wurde als Teil der Bereichssperre $2 indirekt gesperrt. Eine Entsperrung von $1 alleine ist nicht möglich.',
 'ip_range_invalid'                => 'Ungültiger IP-Adressbereich.',
@@ -1940,6 +2270,7 @@ Siehe die [[Special:IPBlockList|{{int:ipblocklist}}]] für alle aktiven Sperren.
 'proxyblocksuccess'               => 'Fertig.',
 'sorbsreason'                     => 'Die IP-Adresse ist in der DNSBL von {{SITENAME}} als offener PROXY gelistet.',
 'sorbs_create_account_reason'     => 'Die IP-Adresse ist in der DNSBL von {{SITENAME}} als offener PROXY gelistet. Das Anlegen neuer Benutzer ist nicht möglich.',
+'cant-block-while-blocked'        => 'Du darfst keine anderen Benutzer sperren, während du selber gesperrt bist.',
 
 # Developer tools
 'lockdb'              => 'Datenbank sperren',
@@ -1959,12 +2290,12 @@ Siehe die [[Special:IPBlockList|{{int:ipblocklist}}]] für alle aktiven Sperren.
 'databasenotlocked'   => 'Die Datenbank ist nicht gesperrt.',
 
 # Move page
-'move-page'               => 'Verschiebe „$1“',
-'move-page-legend'        => 'Seite verschieben',
-'movepagetext'            => "Mit diesem Formular kannst du eine Seite umbenennen (mitsamt allen Versionen).
+'move-page'                    => 'Verschiebe „$1“',
+'move-page-legend'             => 'Seite verschieben',
+'movepagetext'                 => "Mit diesem Formular kannst du eine Seite umbenennen (mitsamt allen Versionen).
 Der alte Titel wird zum neuen weiterleiten.
 Du kannst Weiterleitungen, die auf den Originaltitel verlinken, automatisch korrigieren lassen.
-Falls du dies nicht tust, prüfe auf [[Special:DoubleRedirects|doppelte]] oder [[Special:BrokenRedirects|defekte Weiterleitungen]].
+Falls du dies nicht tust, prüfe auf [[Special:DoubleRedirects|doppelte]] oder [[Special:BrokenRedirects|kaputte Weiterleitungen]].
 Du bist dafür verantwortlich, dass Links weiterhin auf das korrekte Ziel zeigen.
 
 Die Seite wird '''nicht''' verschoben, wenn es bereits eine Seite mit demselben Namen gibt, sofern diese nicht leer oder eine Weiterleitung ohne Versionsgeschichte ist. Dies bedeutet, dass du die Seite zurück verschieben kannst, wenn du einen Fehler gemacht hast. Du kannst hingegen keine Seite überschreiben.
@@ -1972,49 +2303,62 @@ Die Seite wird '''nicht''' verschoben, wenn es bereits eine Seite mit demselben
 '''Warnung'''
 Die Verschiebung kann weitreichende und unerwartete Folgen für beliebte Seiten haben.
 Du solltest daher die Konsequenzen verstanden haben, bevor du fortfährst.",
-'movepagetalktext'        => "Die dazugehörige Diskussionsseite wird, sofern vorhanden, mitverschoben, '''es sei denn:'''
+'movepagetalktext'             => "Die dazugehörige Diskussionsseite wird, sofern vorhanden, mitverschoben, '''es sei denn:'''
 *Es existiert bereits eine Diskussionsseite mit diesem Namen, oder
 *du wählst die unten stehende Option ab.
 
 In diesen Fällen musst du, falls gewünscht, den Inhalt der Seite von Hand verschieben oder zusammenführen.
 
 Bitte den '''neuen''' Titel unter '''Ziel''' eintragen, darunter die Umbenennung bitte '''begründen.'''",
-'movearticle'             => 'Seite verschieben:',
-'movenotallowed'          => 'Du hast keine Berechtigung, Seiten zu verschieben.',
-'newtitle'                => 'Ziel:',
-'move-watch'              => 'Diese Seite beobachten',
-'movepagebtn'             => 'Seite verschieben',
-'pagemovedsub'            => 'Verschiebung erfolgreich',
-'movepage-moved'          => "<big>'''Die Seite „$1“ wurde nach „$2“ verschoben.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Unter diesem Namen existiert bereits eine Seite. Bitte wähle einen anderen Namen.',
-'cantmove-titleprotected' => 'Die Verschiebung kann nicht durchgeführt werden, da der Zieltitel zur Erstellung gesperrt ist.',
-'talkexists'              => 'Die Seite selbst wurde erfolgreich verschoben, aber die zugehörige Diskussions-Seite nicht, da bereits eine mit dem neuen Titel existiert. Bitte gleiche die Inhalte von Hand ab.',
-'movedto'                 => 'verschoben nach',
-'movetalk'                => 'Die Diskussionsseite mitverschieben, wenn möglich',
-'move-subpages'           => 'Alle Unterseiten, falls vorhanden, mitverschieben',
-'move-talk-subpages'      => 'Alle Unterseiten von Diskussionsseiten, falls vorhanden, mitverschieben',
-'movepage-page-exists'    => 'Die Seite „$1“ ist bereits vorhanden und kann nicht automatisch überschrieben werden.',
-'movepage-page-moved'     => 'Die Seite „$1“ wurde nach „$2“ verschoben.',
-'movepage-page-unmoved'   => 'Die Seite „$1“ konnte nicht nach „$2“ verschoben werden.',
-'movepage-max-pages'      => 'Die Maximalanzahl von $1 {{PLURAL:$1|Seite|Seiten}} wurde verschoben, Alle weiteren Seiten können nicht automatisch verschoben werden.',
-'1movedto2'               => 'hat „[[$1]]“ nach „[[$2]]“ verschoben',
-'1movedto2_redir'         => 'hat „[[$1]]“ nach „[[$2]]“ verschoben und dabei eine Weiterleitung überschrieben',
-'movelogpage'             => 'Verschiebungs-Logbuch',
-'movelogpagetext'         => 'Dies ist eine Liste aller verschobenen Seiten.',
-'movereason'              => 'Begründung:',
-'revertmove'              => 'zurück verschieben',
-'delete_and_move'         => 'Löschen und Verschieben',
-'delete_and_move_text'    => '==Zielseite vorhanden, löschen?==
+'movearticle'                  => 'Seite verschieben:',
+'movenologin'                  => 'Du bist nicht angemeldet',
+'movenologintext'              => 'Du musst ein registrierter Benutzer und [[Special:UserLogin|angemeldet]] sein, um eine Seite zu verschieben.',
+'movenotallowed'               => 'Du hast keine Berechtigung, Seiten zu verschieben.',
+'movenotallowedfile'           => 'Du hast keine Berechtigung, Dateien zu verschieben.',
+'cant-move-user-page'          => 'Du hast keine Berechtigung, Benutzerhauptseiten zu verschieben.',
+'cant-move-to-user-page'       => 'Du hast nicht die Berechtigung, Seiten auf eine Benutzerseite zu verschieben (mit Ausnahme von Benutzerunterseiten).',
+'newtitle'                     => 'Ziel:',
+'move-watch'                   => 'Diese Seite beobachten',
+'movepagebtn'                  => 'Seite verschieben',
+'pagemovedsub'                 => 'Verschiebung erfolgreich',
+'movepage-moved'               => "<big>'''Die Seite „$1“ wurde nach „$2“ verschoben.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Es wurde eine Weiterleitung erstellt.',
+'movepage-moved-noredirect'    => 'Die Erstellung einer Weiterleitung wurde unterdrückt.',
+'articleexists'                => 'Unter diesem Namen existiert bereits eine Seite. Bitte wähle einen anderen Namen.',
+'cantmove-titleprotected'      => 'Die Verschiebung kann nicht durchgeführt werden, da der Zieltitel zur Erstellung gesperrt ist.',
+'talkexists'                   => 'Die Seite selbst wurde erfolgreich verschoben, aber die zugehörige Diskussionsseite nicht, da bereits eine mit dem neuen Titel existiert. Bitte gleiche die Inhalte von Hand ab.',
+'movedto'                      => 'verschoben nach',
+'movetalk'                     => 'Die Diskussionsseite mitverschieben, wenn möglich',
+'move-subpages'                => 'Alle Unterseiten, falls vorhanden, mitverschieben',
+'move-talk-subpages'           => 'Alle Unterseiten von Diskussionsseiten, falls vorhanden, mitverschieben',
+'movepage-page-exists'         => 'Die Seite „$1“ ist bereits vorhanden und kann nicht automatisch überschrieben werden.',
+'movepage-page-moved'          => 'Die Seite „$1“ wurde nach „$2“ verschoben.',
+'movepage-page-unmoved'        => 'Die Seite „$1“ konnte nicht nach „$2“ verschoben werden.',
+'movepage-max-pages'           => 'Die Maximalanzahl von $1 {{PLURAL:$1|Seite|Seiten}} wurde verschoben, Alle weiteren Seiten können nicht automatisch verschoben werden.',
+'1movedto2'                    => 'hat „[[$1]]“ nach „[[$2]]“ verschoben',
+'1movedto2_redir'              => 'hat „[[$1]]“ nach „[[$2]]“ verschoben und dabei eine Weiterleitung überschrieben',
+'move-redirect-suppressed'     => 'Weiterleitung unterdrückt',
+'movelogpage'                  => 'Verschiebungs-Logbuch',
+'movelogpagetext'              => 'Dies ist eine Liste aller verschobenen Seiten.',
+'movereason'                   => 'Begründung:',
+'revertmove'                   => 'zurück verschieben',
+'delete_and_move'              => 'Löschen und Verschieben',
+'delete_and_move_text'         => '== Löschung erforderlich ==
 
 Die Seite „[[:$1]]“ existiert bereits. Möchtest du diese löschen, um die Seite verschieben zu können?',
-'delete_and_move_confirm' => 'Zielseite für die Verschiebung löschen',
-'delete_and_move_reason'  => 'gelöscht, um Platz für Verschiebung zu machen',
-'selfmove'                => 'Ursprungs- und Zielname sind gleich; eine Seite kann nicht auf sich selbst verschoben werden.',
-'immobile_namespace'      => 'Der Quell- oder Zielnamensraum ist geschützt; Verschiebungen in diesen Namensraum hinein oder aus diesem heraus sind nicht möglich.',
-'imagenocrossnamespace'   => 'Dateien können nicht aus dem {{ns:file}}-Namensraum heraus verschoben werden',
-'imagetypemismatch'       => 'Die neue Dateierweiterung ist nicht mit der alten identisch',
-'imageinvalidfilename'    => 'Der Ziel-Dateiname ist ungültig',
-'fix-double-redirects'    => 'Nach dem Verschieben doppelte Weiterleitungen auflösen',
+'delete_and_move_confirm'      => 'Zielseite für die Verschiebung löschen',
+'delete_and_move_reason'       => 'gelöscht, um Platz für Verschiebung zu machen',
+'selfmove'                     => 'Ursprungs- und Zielname sind gleich; eine Seite kann nicht auf sich selbst verschoben werden.',
+'immobile-source-namespace'    => 'Seiten des „$1“-Namensraums können nicht verschoben werden',
+'immobile-target-namespace'    => 'Seiten können nicht in den „$1“-Namensraum verschoben werden',
+'immobile-target-namespace-iw' => 'Interwiki-Link ist kein gültiges Ziel für Seitenverschiebungen.',
+'immobile-source-page'         => 'Diese Seite ist nicht verschiebbar.',
+'immobile-target-page'         => 'Es kann nicht auf diese Zielseite verschoben werden.',
+'imagenocrossnamespace'        => 'Dateien können nicht aus dem {{ns:file}}-Namensraum heraus verschoben werden',
+'imagetypemismatch'            => 'Die neue Dateierweiterung ist nicht mit der alten identisch',
+'imageinvalidfilename'         => 'Der Ziel-Dateiname ist ungültig',
+'fix-double-redirects'         => 'Nach dem Verschieben doppelte Weiterleitungen auflösen',
+'move-leave-redirect'          => 'Weiterleitung erstellen',
 
 # Export
 'export'            => 'Seiten exportieren',
@@ -2023,7 +2367,7 @@ Die Datei kann in ein anderes MediaWiki-Wiki über die [[Special:Import|Importfu
 
 Trage den oder die entsprechenden Seitentitel in das folgende Textfeld ein (pro Zeile jeweils nur für eine Seite).
 
-Alternativ ist der Export auch mit der Syntax [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] möglich, beispielsweise für die [[{{MediaWiki:Mainpage}}]].',
+Alternativ ist der Export auch mit der Syntax [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] möglich, beispielsweise für die [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Nur die aktuelle Version der Seite exportieren',
 'exportnohistory'   => "----
 '''Hinweis:''' Der Export kompletter Versionsgeschichten ist aus Performancegründen bis auf weiteres nicht möglich.",
@@ -2038,7 +2382,8 @@ Alternativ ist der Export auch mit der Syntax [[{{ns:special}}:Export/{{MediaWik
 'allmessagesname'           => 'Name',
 'allmessagesdefault'        => 'Standardtext',
 'allmessagescurrent'        => 'Aktueller Text',
-'allmessagestext'           => 'Dies ist eine Liste der MediaWiki-Systemtexte.',
+'allmessagestext'           => 'Dies ist eine Liste der MediaWiki-Systemtexte.
+Besuche die Seiten [http://www.mediawiki.org/wiki/Localisation MediaWiki-Lokalisierung] und [http://translatewiki.net translatewiki.net], wenn du dich an der Lokalisierung von MediaWiki beteiligen möchtest.',
 'allmessagesnotsupportedDB' => 'Diese Spezialseite steht nicht zur Verfügung, da sie über den Parameter <tt>$wgUseDatabaseMessages</tt> deaktiviert wurde.',
 'allmessagesfilter'         => 'Nachrichtennamensfilter:',
 'allmessagesmodified'       => 'Nur geänderte anzeigen',
@@ -2058,9 +2403,12 @@ Alternativ ist der Export auch mit der Syntax [[{{ns:special}}:Export/{{MediaWik
 'import-interwiki-text'      => 'Wähle ein Wiki und eine Seite zum Importieren aus.
 Die Versionsdaten und Benutzernamen bleiben dabei erhalten.
 Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] protokolliert.',
+'import-interwiki-source'    => 'Quell-Wiki/-Seite:',
 'import-interwiki-history'   => 'Importiere alle Versionen dieser Seite',
 'import-interwiki-submit'    => 'Import',
 'import-interwiki-namespace' => 'Zielnamensraum:',
+'import-upload-filename'     => 'Dateiname:',
+'import-comment'             => 'Grund:',
 'importtext'                 => 'Auf dieser Spezialseite können über die [[Special:Export|Exportfunktion]] im Quellwiki exportierte Seiten in dieses Wiki importiert werden.',
 'importstart'                => 'Importiere Seite …',
 'import-revision-count'      => '– {{PLURAL:$1|1 Version|$1 Versionen}}',
@@ -2094,19 +2442,19 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|Version|Versionen}} von $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Eigene Benutzerseite',
+'tooltip-pt-userpage'             => 'Deine Benutzerseite',
 'tooltip-pt-anonuserpage'         => 'Benutzerseite der IP-Adresse von der aus du Änderungen durchführst',
-'tooltip-pt-mytalk'               => 'Eigene Diskussionsseite',
+'tooltip-pt-mytalk'               => 'Deine Diskussionsseite',
 'tooltip-pt-anontalk'             => 'Diskussion über Änderungen von dieser IP-Adresse',
 'tooltip-pt-preferences'          => 'Eigene Einstellungen',
 'tooltip-pt-watchlist'            => 'Liste der beobachteten Seiten',
-'tooltip-pt-mycontris'            => 'Liste eigener Beiträge',
-'tooltip-pt-login'                => 'Sich einzuloggen wird zwar gerne gesehen, ist aber keine Pflicht.',
-'tooltip-pt-anonlogin'            => 'Sich einzuloggen wird zwar gerne gesehen, ist aber keine Pflicht.',
+'tooltip-pt-mycontris'            => 'Liste deiner Beiträge',
+'tooltip-pt-login'                => 'Sich anzumelden wird zwar gerne gesehen, ist aber keine Pflicht.',
+'tooltip-pt-anonlogin'            => 'Sich anzumelden wird zwar gerne gesehen, ist aber keine Pflicht.',
 'tooltip-pt-logout'               => 'Abmelden',
 'tooltip-ca-talk'                 => 'Diskussion zum Seiteninhalt',
 'tooltip-ca-edit'                 => 'Seite bearbeiten. Bitte vor dem Speichern die Vorschaufunktion benutzen.',
-'tooltip-ca-addsection'           => 'Einen Kommentar zu dieser Diskussion hinzufügen.',
+'tooltip-ca-addsection'           => 'Neuen Abschnitt beginnen',
 'tooltip-ca-viewsource'           => 'Diese Seite ist geschützt. Der Quelltext kann angesehen werden.',
 'tooltip-ca-history'              => 'Frühere Versionen dieser Seite',
 'tooltip-ca-protect'              => 'Diese Seite schützen',
@@ -2153,6 +2501,8 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'tooltip-watch'                   => 'Füge diese Seite deiner Beobachtungsliste hinzu',
 'tooltip-recreate'                => 'Seite neu erstellen, obwohl sie gelöscht wurde.',
 'tooltip-upload'                  => 'Hochladen starten',
+'tooltip-rollback'                => 'Macht alle letzten Änderungen der Seite, die vom gleichen Benutzer vorgenommen worden sind, durch nur einen Klick rückgängig.',
+'tooltip-undo'                    => 'Macht lediglich diese eine Änderung rückgängig und zeigt das Resultat in der Vorschau an, damit in der Zusammenfassungszeile eine Begründung angegeben werden kann.',
 
 # Stylesheets
 'common.css'      => '/* CSS an dieser Stelle wirkt sich auf alle Skins aus */',
@@ -2170,7 +2520,18 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'myskin.css'      => '/* CSS an dieser Stelle wirkt sich auf den MySkin-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'chick.css'       => '/* CSS an dieser Stelle wirkt sich auf den Küken-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'simple.css'      => '/* CSS an dieser Stelle wirkt sich auf den Einfach-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
-'modern.css'      => '/* CSS an dieser Stelle wirkt sich auf den Modern-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
+'modern.css'      => '/* CSS an dieser Stelle wirkt sich auf den Modern-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */
+
+/* Kleinschreibung in Navigationsbereichen verhindern */
+.portlet h5, 
+.portlet h6, 
+#p-personal ul, 
+#p-cactions li a, 
+#preftoc a {
+    text-transform: none;
+}',
+'print.css'       => '/* CSS an dieser Stelle wirkt sich auf die Druckausgabe aus */',
+'handheld.css'    => '/* CSS an dieser Stelle wirkt sich auf Handheld-Geräte, basierend auf den in $wgHandheldStyle konfigurierten Skin, aus */',
 
 # Scripts
 'common.js'      => '/* Das folgende JavaScript wird für alle Benutzer geladen. */',
@@ -2189,12 +2550,12 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'notacceptable'     => 'Der Wiki-Server kann die Daten nicht für dein Ausgabegerät aufbereiten.',
 
 # Attribution
-'anonymous'        => 'Anonyme(r) Benutzer auf {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonymer Benutzer|Anonyme Benutzer}} auf {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Benutzer $1',
 'lastmodifiedatby' => 'Diese Seite wurde zuletzt am $1 um $2 Uhr von $3 geändert.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basiert auf der Arbeit von $1',
 'others'           => 'andere',
-'siteusers'        => '{{SITENAME}}-Benutzer $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|Benutzer|Benutzer}} $1',
 'creditspage'      => 'Seiteninformationen',
 'nocredits'        => 'Für diese Seite sind keine Informationen vorhanden.',
 
@@ -2202,7 +2563,7 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'spamprotectiontitle' => 'Spamschutzfilter',
 'spamprotectiontext'  => 'Die Seite, die du speichern willst, wurde vom Spamschutzfilter blockiert. Das liegt wahrscheinlich an einem Link auf eine externe Seite.',
 'spamprotectionmatch' => "'''Der folgende Text wurde vom Spamfilter gefunden: ''$1'''''",
-'spambot_username'    => 'MediaWiki Spam-Säuberung',
+'spambot_username'    => 'MediaWiki-Spam-Säuberung',
 'spam_reverting'      => 'Letzte Version ohne Links zu $1 wiederhergestellt.',
 'spam_blanking'       => 'Alle Versionen enthielten Links zu $1, bereinigt.',
 
@@ -2214,6 +2575,16 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'numauthors'     => 'Anzahl der Autoren: $1',
 'numtalkauthors' => 'Anzahl der Diskussionsteilnehmer: $1',
 
+# Skin names
+'skinname-standard'    => 'Klassik',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Kölnisch Blau',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Küken',
+'skinname-simple'      => 'Einfach',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Immer als PNG darstellen',
 'mw_math_simple' => 'Einfaches TeX als HTML darstellen, sonst PNG',
@@ -2234,11 +2605,12 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'markedaspatrollederror-noautopatrol' => 'Es ist nicht erlaubt, eigene Bearbeitungen als kontrolliert zu markieren.',
 
 # Patrol log
-'patrol-log-page'   => 'Kontroll-Logbuch',
-'patrol-log-header' => 'Dies ist das Kontroll-Logbuch.',
-'patrol-log-line'   => 'hat $1 von „$2“ als kontrolliert markiert $3',
-'patrol-log-auto'   => '(automatisch)',
-'patrol-log-diff'   => 'Version $1',
+'patrol-log-page'      => 'Kontroll-Logbuch',
+'patrol-log-header'    => 'Dies ist das Kontroll-Logbuch.',
+'patrol-log-line'      => 'hat $1 von „$2“ als kontrolliert markiert $3',
+'patrol-log-auto'      => '(automatisch)',
+'patrol-log-diff'      => 'Version $1',
+'log-show-hide-patrol' => 'Kontroll-Logbuch $1',
 
 # Image deletion
 'deletedrevision'                 => 'alte Version: $1',
@@ -2255,6 +2627,9 @@ $1',
 'previousdiff' => '� Zum vorherigen Versionsunterschied',
 'nextdiff'     => 'Zum nächsten Versionsunterschied →',
 
+# Visual comparison
+'visual-comparison' => 'Visueller Vergleich',
+
 # Media information
 'mediawarning'         => "'''Warnung:''' Diese Art von Datei kann böswilligen Programmcode enthalten. Durch das Herunterladen und Öffnen der Datei kann dein Computer beschädigt werden.<hr />",
 'imagemaxsize'         => 'Maximale Bildgröße auf Bildbeschreibungsseiten:',
@@ -2267,10 +2642,12 @@ $1',
 'show-big-image'       => 'Version in höherer Auflösung',
 'show-big-image-thumb' => '<small>Größe der Voransicht: $1 × $2 Pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Neue Dateien',
 'imagelisttext'         => "Hier ist eine Liste von '''$1''' {{PLURAL:$1|Datei|Dateien}}, sortiert $2.",
 'newimages-summary'     => 'Diese Spezialseite zeigt die zuletzt hochgeladenen Dateien an.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Dateiname (oder ein Teil davon):',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'Keine Dateien gefunden.',
 'ilsubmit'              => 'Suchen',
@@ -2425,9 +2802,9 @@ Darauf folgende Seitenlinks in derselben Zeile definieren Ausnahmen, in deren Ko
 'exif-orientation-2' => 'Horizontal gespiegelt', # 0th row: top; 0th column: right
 'exif-orientation-3' => 'Um 180° gedreht', # 0th row: bottom; 0th column: right
 'exif-orientation-4' => 'Vertikal gespiegelt', # 0th row: bottom; 0th column: left
-'exif-orientation-5' => 'Entgegen dem Uhrzeigersinn um 90° gedreht und dann vertikal gespiegelt', # 0th row: left; 0th column: top
-'exif-orientation-6' => 'Um 90° in Uhrzeigersinn gedreht', # 0th row: right; 0th column: top
-'exif-orientation-7' => 'Um 90° in Uhrzeigersinn gedreht und dann vertikal gespiegelt', # 0th row: right; 0th column: bottom
+'exif-orientation-5' => 'Entgegen dem Uhrzeigersinn um 90° gedreht und vertikal gespiegelt', # 0th row: left; 0th column: top
+'exif-orientation-6' => 'Um 90° im Uhrzeigersinn gedreht', # 0th row: right; 0th column: top
+'exif-orientation-7' => 'Um 90° im Uhrzeigersinn gedreht und vertikal gespiegelt', # 0th row: right; 0th column: bottom
 'exif-orientation-8' => 'Um 90° entgegen dem Uhrzeigersinn gedreht', # 0th row: left; 0th column: bottom
 
 'exif-planarconfiguration-1' => 'Grobformat',
@@ -2474,6 +2851,18 @@ Darauf folgende Seitenlinks in derselben Zeile definieren Ausnahmen, in deren Ko
 'exif-lightsource-24'  => 'ISO Studio Kunstlicht',
 'exif-lightsource-255' => 'Andere Lichtquelle',
 
+# Flash modes
+'exif-flash-fired-0'    => 'kein Blitz',
+'exif-flash-fired-1'    => 'Blitz ausgelöst',
+'exif-flash-return-0'   => 'Blitz sendet keine Daten',
+'exif-flash-return-2'   => 'keine Reflexion des Blitz festgestellt',
+'exif-flash-return-3'   => 'Reflexion des Blitz festgestellt',
+'exif-flash-mode-1'     => 'erzwungenes Blitzen',
+'exif-flash-mode-2'     => 'Blitz abgeschaltet',
+'exif-flash-mode-3'     => 'Automatik',
+'exif-flash-function-1' => 'Keine Blitzfunktion',
+'exif-flash-redeye-1'   => 'Rotaugen Reduktion',
+
 'exif-focalplaneresolutionunit-2' => 'Zoll',
 
 'exif-sensingmethod-1' => 'Undefiniert',
@@ -2610,26 +2999,17 @@ $1
 'trackbackdeleteok' => 'Trackback wurde erfolgreich gelöscht.',
 
 # Delete conflict
-'deletedwhileediting' => '<span class="error">Achtung: Diese Seite wurde gelöscht, nachdem du angefangen hast sie zu bearbeiten!
-Im [{{fullurl:Special:Log|type=delete&page=}}{{FULLPAGENAMEE}} Lösch-Logbuch] findest du den Grund für die Löschung. Wenn du die Seite speicherst, wird sie neu angelegt.</span>',
+'deletedwhileediting' => 'Achtung: Diese Seite wurde gelöscht, nachdem du angefangen hast sie zu bearbeiten!
+Im [{{fullurl:Special:Log|type=delete&page=}}{{FULLPAGENAMEE}} Lösch-Logbuch] findest du den Grund für die Löschung. Wenn du die Seite speicherst, wird sie neu angelegt.',
 'confirmrecreate'     => "Benutzer [[User:$1|$1]] ([[User talk:$1|Diskussion]]) hat diese Seite gelöscht, nachdem du angefangen hast, sie zu bearbeiten. Die Begründung lautete:
 :''$2''
 Bitte bestätige, dass du diese Seite wirklich neu erstellen möchten.",
 'recreate'            => 'Erneut anlegen',
 
-# HTML dump
-'redirectingto' => 'Weitergeleitet nach [[:$1]]',
-
 # action=purge
-'confirm_purge'        => 'Diese Seite aus dem Server-Cache löschen? $1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Suche nach Seiten, in denen ''$1'' vorkommt.",
-'searchnamed'      => "Suche nach Seiten, deren Name ''$1'' enthält.",
-'articletitles'    => "Seiten, die mit ''$1'' beginnen",
-'hideresults'      => 'Verbergen',
-'useajaxsearch'    => 'Benutze AJAX-unterstützte Suche',
+'confirm-purge-top'    => 'Diese Seite aus dem Server-Cache löschen?',
+'confirm-purge-bottom' => 'Leert den Cache einer Seite und erzwingt die Anzeige der aktuellen Version.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� vorige Seite',
@@ -2650,9 +3030,9 @@ Bitte bestätige, dass du diese Seite wirklich neu erstellen möchten.",
 
 # Auto-summaries
 'autosumm-blank'   => 'Die Seite wurde geleert.',
-'autosumm-replace' => "Der Seiteninhalt wurde durch einen anderen Text ersetzt: '$1'",
+'autosumm-replace' => 'Der Seiteninhalt wurde durch einen anderen Text ersetzt: „$1“',
 'autoredircomment' => 'Weiterleitung nach [[$1]] erstellt',
-'autosumm-new'     => 'Die Seite wurde neu angelegt: $1',
+'autosumm-new'     => 'Die Seite wurde neu angelegt: „$1“',
 
 # Size units
 'size-bytes'     => '$1 Bytes',
@@ -2695,6 +3075,7 @@ Du kannst auch die [[Special:Watchlist/edit|Standard-Bearbeitungsseite]] benutze
 
 # Core parser functions
 'unknown_extension_tag' => 'Unbekannter Extension-Tag „$1“',
+'duplicate-defaultsort' => 'Achtung: Der Sortierungsschlüssel „$2“ überschreibt den vorher verwendeten Schlüssel „$1“.',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2723,13 +3104,13 @@ Du kannst auch die [[Special:Watchlist/edit|Standard-Bearbeitungsseite]] benutze
 'filepath-submit'  => 'Pfad suchen',
 'filepath-summary' => 'Mit dieser Spezialseite lässt sich der komplette Pfad der aktuellen Version einer Datei ohne Umweg abfragen. Die angefragte Datei wird direkt dargestellt bzw. mit der verknüpften Anwendung gestartet.
 
-Die Eingabe muss ohne den Zusatz „{{ns:image}}:“ erfolgen.',
+Die Eingabe muss ohne den Zusatz „{{ns:file}}:“ erfolgen.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Datei-Duplikat-Suche',
 'fileduplicatesearch-summary'  => 'Suche nach Datei-Duplikaten auf Basis ihres Hash-Wertes.
 
-Die Eingabe muss ohne den Zusatz „{{ns:image}}:“ erfolgen.',
+Die Eingabe muss ohne den Zusatz „{{ns:file}}:“ erfolgen.',
 'fileduplicatesearch-legend'   => 'Suche nach Duplikaten',
 'fileduplicatesearch-filename' => 'Dateiname:',
 'fileduplicatesearch-submit'   => 'Suchen',
@@ -2759,4 +3140,12 @@ Die Eingabe muss ohne den Zusatz „{{ns:image}}:“ erfolgen.',
 'blankpage'              => 'Leere Seite',
 'intentionallyblankpage' => 'Diese Seite ist absichtlich ohne Inhalt. Sie wird für Benchmarks verwendet.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Diese Zeile nicht verändern<pre>
+#Untenstehend können Fragmente regulärer Ausdrücke (der Teil zwischen den //) eingegeben werden.
+#Diese werden mit den URLs von Bildern aus externen Quellen verglichen
+#Ein positiver Vergleich führt zur Anzeige des Bildes, andernfalls wird das Bild nur als Link angezeigt
+#Zeilen, die mit einem # beginnen, werden als Kommentar behandelt
+#Fragmente regulärer Ausdrücke nach dieser Zeile eintragen. Diese Zeile nicht verändern</pre>',
+
 );
diff --git a/languages/messages/MessagesDe_formal.php b/languages/messages/MessagesDe_formal.php
index 62497872..d227cddf 100644
--- a/languages/messages/MessagesDe_formal.php
+++ b/languages/messages/MessagesDe_formal.php
@@ -4,10 +4,12 @@
  * @ingroup Language
  * @file
  *
+ * @author ChrisiPK
  * @author Imre
  * @author Jimmy Collins <jimmy.collins@web.de>
  * @author Leithian
  * @author MichaelFrey
+ * @author Michawiki
  * @author Pill
  * @author Raimond Spekking (Raymond) <raimond.spekking@gmail.com> since January 2007
  * @author Tim Bartel (avatar) <wikipedia@computerkultur.org> formal addressing
@@ -19,8 +21,6 @@ $fallback = 'de';
 
 $messages = array(
 # User preference toggles
-'tog-underline'        => 'Links unterstreichen:',
-'tog-nocache'          => 'Seitencache deaktivieren',
 'tog-enotifrevealaddr' => 'Ihre E-Mail-Adresse wird in Benachrichtigungs-E-Mails angezeigt.',
 
 'mainpagedocfooter' => 'Hilfe zur Benutzung und Konfiguration der Wiki-Software finden Sie im [http://meta.wikimedia.org/wiki/Help:Contents Benutzerhandbuch].
@@ -50,15 +50,15 @@ Falls dies nicht der Fall ist, haben Sie eventuell einen Fehler in der Software
 'customcssjsprotected' => 'Sie sind nicht berechtigt, diese Seite zu bearbeiten, da sie zu den persönlichen Einstellungen eines anderen Benutzers gehört.',
 
 # Login and logout pages
-'logouttext'                 => '<strong>Sie sind nun abgemeldet.</strong>
+'logouttext'                 => "'''Sie sind nun abgemeldet.'''
 
-Sie können {{SITENAME}} jetzt anonym weiter benutzen, oder sich erneut unter dem selben oder einem anderen Benutzernamen [[Special:UserLogin|anmelden]].',
+Sie können {{SITENAME}} jetzt anonym weiter benutzen, oder sich erneut unter dem selben oder einem anderen Benutzernamen [[Special:UserLogin|anmelden]].",
 'welcomecreation'            => '== Willkommen, $1! ==
 
-Ihr Benutzerkonto wurde eingerichtet. Vergessen Sie nicht, Ihre Einstellungen anzupassen.',
+Ihr Benutzerkonto wurde eingerichtet.
+Vergessen Sie nicht, Ihre [[Special:Preferences|{{SITENAME}}-Einstellungen]] anzupassen.',
 'yourdomainname'             => 'Ihre Domain:',
 'externaldberror'            => 'Entweder es liegt ein Fehler bei der externen Authentifizierung vor, oder Sie dürfen Ihr externes Benutzerkonto nicht aktualisieren.',
-'loginproblem'               => "'''Es gab ein Problem mit Ihrer Anmeldung.'''<br />Bitte versuchen Sie es noch einmal!",
 'nologin'                    => 'Sie haben kein Benutzerkonto? $1.',
 'gotaccount'                 => 'Haben Sie bereits ein Benutzerkonto? $1.',
 'userexists'                 => 'Dieser Benutzername ist schon vergeben. Bitte wählen Sie einen anderen.',
@@ -66,12 +66,14 @@ Ihr Benutzerkonto wurde eingerichtet. Vergessen Sie nicht, Ihre Einstellungen an
 'prefs-help-email'           => 'Die Angabe einer E-Mail ist optional, ermöglicht aber die Zusendung eines Ersatzpasswortes, wenn Sie Ihr Passwort vergessen haben.
 Mit anderen Benutzer können Sie auch über die Benutzerdiskussionsseiten Kontakt aufnehmen, ohne dass Sie Ihre Identität offenlegen müssen.',
 'prefs-help-email-required'  => 'Es wird eine gültige E-Mail-Adresse benötigt.',
-'nocookiesnew'               => 'Der Benutzerzugang wurde erstellt, aber Sie sind nicht eingeloggt. {{SITENAME}} benötigt für diese Funktion Cookies, bitte aktivieren Sie diese und loggen sich dann mit Ihrem neuen Benutzernamen und dem zugehörigen Passwort ein.',
-'nocookieslogin'             => '{{SITENAME}} benutzt Cookies zum Einloggen der Benutzer. Sie haben Cookies deaktiviert, bitte aktivieren Sie diese und versuchen es erneut.',
+'nocookiesnew'               => 'Der Benutzerzugang wurde erstellt, aber Sie sind nicht angemeldet.
+{{SITENAME}} benötigt für diese Funktion Cookies, bitte aktivieren Sie diese und melden sich dann mit Ihrem neuen Benutzernamen und dem zugehörigen Passwort an.',
+'nocookieslogin'             => '{{SITENAME}} benutzt Cookies zur Anmeldung der Benutzer.
+Sie haben Cookies deaktiviert, bitte aktivieren Sie diese und versuchen es erneut.',
 'noname'                     => 'Sie müssen einen gültigen Benutzernamen angeben.',
 'loginsuccess'               => 'Sie sind jetzt als „$1“ bei {{SITENAME}} angemeldet.',
 'nosuchuser'                 => 'Der Benutzername „$1“ existiert nicht.
-Überprüfen Sie die Schreibweise oder [[Special:UserLogin/signup|melden Sie sich als neuer Benutzer an]].',
+Überprüfen Sie die Schreibweise (Groß-/Kleinschreibung beachten) oder [[Special:UserLogin/signup|melden Sie sich als neuer Benutzer an]].',
 'nosuchusershort'            => 'Der Benutzername „<nowiki>$1</nowiki>“ existiert nicht. Bitte überprüfen Sie die Schreibweise.',
 'nouserspecified'            => 'Bitte geben Sie einen Benutzernamen an.',
 'wrongpassword'              => 'Das Passwort ist falsch (oder fehlt). Bitte versuchen Sie es erneut.',
@@ -89,19 +91,26 @@ Bitte melden Sie sich damit an, sobald sie es erhalten haben. Das alte Passwort
 'eauthentsent'               => 'Eine Bestätigungs-E-Mail wurde an die angegebene Adresse verschickt.
 
 Bevor eine E-Mail von anderen Benutzern über die E-Mail-Funktion empfangen werden kann, muss die Adresse und ihre tatsächliche Zugehörigkeit zu diesem Benutzerkonto erst bestätigt werden. Bitte befolgen Sie die Hinweise in der Bestätigungs-E-Mail.',
-'acct_creation_throttle_hit' => 'Sie haben schon $1 Benutzerkonten angelegt und können jetzt keine weiteren mehr anlegen.',
-'emailauthenticated'         => 'Ihre E-Mail-Adresse wurde bestätigt: $1.',
+'acct_creation_throttle_hit' => 'Besucher dieses Wikis, die Ihre IP-Adresse verwenden, haben innerhalb des letzten Tages {{PLURAL:$1|1 Benutzerkonto|$1 Benutzerkonten}} erstellt, was die maximal erlaubte Anzahl in dieser Zeitperiode ist.
+
+Besucher, die diese IP-Adresse verwenden, können momentan keine Benutzerkonten mehr erstellen.',
+'emailauthenticated'         => 'Ihre E-Mail-Adresse wurde am $2 um $3 Uhr bestätigt.',
 'emailnotauthenticated'      => 'Ihre E-Mail-Adresse ist noch nicht bestätigt. Die folgenden E-Mail-Funktionen stehen erst nach erfolgreicher Bestätigung zur Verfügung.',
-'noemailprefs'               => 'Geben Sie eine E-Mail-Adresse an, damit die nachfolgenden Funktionen zur Verfügung stehen.',
+'noemailprefs'               => 'Geben Sie eine E-Mail-Adresse in den Einstellungen an, damit die nachfolgenden Funktionen zur Verfügung stehen.',
 'invalidemailaddress'        => 'Die E-Mail-Adresse wird nicht akzeptiert, weil sie ein ungültiges Format (eventuell ungültige Zeichen) zu haben scheint. Bitte geben Sie eine korrekte Adresse ein oder leeren Sie das Feld.',
 'createaccount-text'         => 'Es wurde für Sie ein Benutzerkonto „$2“ auf {{SITENAME}} ($4) erstellt. Das automatisch generierte Passwort für „$2“ ist „$3“. Sie sollten sich nun anmelden und das Passwort ändern.
 
 Falls das Benutzerkonto irrtümlich angelegt wurde, können Sie diese Nachricht ignorieren.',
+'login-throttled'            => 'Sie haben zu oft vergeblich versucht, sich unter diesem Benutzernamen anzumelden.
+Bitte warten Sie, bevor Sie es erneut probieren.',
 
 # Password reset dialog
 'resetpass_announce'      => 'Anmeldung mit dem per E-Mail zugesandten Code. Um die Anmeldung abzuschließen, müssen Sie jetzt ein neues Passwort wählen.',
 'resetpass_success'       => 'Ihr Passwort wurde erfolgreich geändert. Es folgt die Anmeldung …',
 'resetpass_bad_temporary' => 'Ungültiges vorläufiges Passwort. Sie haben bereits Ihr Passwort erfolgreich geändert oder ein neues, vorläufiges Passwort angefordert.',
+'resetpass-no-info'       => 'Sie müssen sich anmelden, um auf diese Seite direkt zuzugreifen.',
+'resetpass-wrong-oldpass' => 'Ungültiges temporäres oder aktuelles Passwort.
+Möglicherweise haben Sie Ihr Passwort bereits erfolgreich geändert oder ein neues temporäres Passwort beantragt.',
 
 # Edit page toolbar
 'sig_tip' => 'Ihre Signatur mit Zeitstempel',
@@ -160,45 +169,47 @@ Sie können $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administra
 'anontalkpagetext'                 => "----''Diese Seite dient dazu, einem nicht angemeldeten Benutzer Nachrichten zu hinterlassen. Es wird seine IP-Adresse zur Identifizierung verwendet. IP-Adressen können von mehreren Benutzern gemeinsam verwendet werden. Wenn Sie mit den Kommentaren auf dieser Seite nichts anfangen können, richten sie sich vermutlich an einen früheren Inhaber Ihrer IP-Adresse und Sie können sie ignorieren. Sie können sich auch ein [[Special:UserLogin/signup|Benutzerkonto erstellen]] oder sich [[Special:UserLogin|anmelden]], um künftig Verwechslungen mit anderen anonymen Benutzern zu vermeiden.''",
 'userpage-userdoesnotexist'        => 'Das Benutzerkonto „$1“ ist nicht vorhanden. Bitte prüfen Sie, ob Sie diese Seite wirklich erstellen/bearbeiten möchten.',
 'clearyourcache'                   => "'''Hinweis - Leeren Sie nach dem Speichern den Browser-Cache, um die Änderungen sehen zu können:''' '''Mozilla/Firefox/Safari:''' ''Shift'' gedrückt halten und auf ''Aktualisieren'' klicken oder alternativ entweder ''Strg-F5'' oder ''Strg-R'' (''Befehlstaste-R'' bei Macintosh) drücken; '''Konqueror: '''Auf ''Aktualisieren'' klicken oder ''F5'' drücken; '''Opera:''' Cache unter ''Extras → Einstellungen'' leeren; '''Internet Explorer:''' ''Strg-F5'' drücken oder ''Strg'' gedrückt halten und dabei auf ''Aktualisieren'' klicken.",
-'usercssjsyoucanpreview'           => '<strong>Tipp:</strong> Benutzen Sie den Vorschau-Button, um Ihr neues CSS/JS vor dem Speichern zu testen.',
+'usercssjsyoucanpreview'           => "'''Tipp:''' Benutzen Sie den Vorschau-Button, um Ihr neues CSS/JS vor dem Speichern zu testen.",
 'usercsspreview'                   => "== Vorschau Ihres Benutzer-CSS ==
 '''Hinweis:''' Nach dem Speichern müssen Sie Ihren Browser anweisen, die neue Version zu laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userjspreview'                    => "== Vorschau Ihres Benutzer-JavaScript ==
 '''Hinweis:''' Nach dem Speichern müssen Sie Ihren Browser anweisen, die neue Version zu laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userinvalidcssjstitle'            => "'''Warnung:''' Es existiert kein Skin „$1“. Bitte bedenken Sie, dass benutzerspezifische .css- und .js-Seiten mit einem Kleinbuchstaben anfangen müssen, also z.B. ''{{ns:user}}:Mustermann/monobook.css'' an Stelle von ''{{ns:user}}:Mustermann/Monobook.css''.",
 'previewconflict'                  => 'Diese Vorschau gibt den Inhalt des oberen Textfeldes wieder. So wird die Seite aussehen, wenn Sie jetzt speichern.',
-'session_fail_preview'             => '<strong>Ihre Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.
+'session_fail_preview'             => "'''Ihre Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.
 Bitte versuchen Sie es erneut, indem Sie unter der folgenden Textvorschau nochmals auf „Seite speichern“ klicken.
-Sollte das Problem bestehen bleiben, [[Special:UserLogout|melden Sie sich ab]] und danach wieder an.</strong>',
-'session_fail_preview_html'        => "<strong>Ihre Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.</strong>
+Sollte das Problem bestehen bleiben, [[Special:UserLogout|melden Sie sich ab]] und danach wieder an.'''",
+'session_fail_preview_html'        => "'''Ihre Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.'''
 
 ''Da in {{SITENAME}} das Speichern von reinem HTML aktiviert ist, wurde die Vorschau ausgeblendet, um JavaScript-Attacken vorzubeugen.''
 
-<strong>Bitte versuchen Sie es erneut, indem Sie unter der folgenden Textvorschau nochmals auf „Seite speichern“ klicken.
-Sollte das Problem bestehen bleiben, [[Special:UserLogout|melden Sie sich ab]] und danach wieder an.</strong>",
-'token_suffix_mismatch'            => '<strong>Ihre Bearbeitung wurde zurückgewiesen, da Ihr Browser Zeichen im Bearbeiten-Token verstümmelt hat.
-Eine Speicherung kann den Seiteninhalt zerstören. Dies geschieht bisweilen durch die Benutzung eines anonymen Proxy-Dienstes, der fehlerhaft arbeitet.</strong>',
+'''Bitte versuchen Sie es erneut, indem Sie unter der folgenden Textvorschau nochmals auf „Seite speichern“ klicken.
+Sollte das Problem bestehen bleiben, [[Special:UserLogout|melden Sie sich ab]] und danach wieder an.'''",
+'token_suffix_mismatch'            => "'''Ihre Bearbeitung wurde zurückgewiesen, da Ihr Browser Zeichen im Bearbeiten-Token verstümmelt hat.
+Eine Speicherung kann den Seiteninhalt zerstören. Dies geschieht bisweilen durch die Benutzung eines anonymen Proxy-Dienstes, der fehlerhaft arbeitet.'''",
 'explainconflict'                  => "Jemand anders hat diese Seite geändert, nachdem Sie angefangen haben diese zu bearbeiten.
 Das obere Textfeld enthält den aktuellen Stand.
 Das untere Textfeld enthält Ihre Änderungen.
 Bitte fügen Sie Ihre Änderungen in das obere Textfeld ein.
 '''Nur''' der Inhalt des oberen Textfeldes wird gespeichert, wenn Sie auf „Seite speichern“ klicken!",
 'yourtext'                         => 'Ihr Text',
-'nonunicodebrowser'                => '<strong>Achtung:</strong> Ihr Browser kann Unicode-Zeichen nicht richtig verarbeiten. Bitte verwenden Sie einen anderen Browser um Seiten zu bearbeiten.',
-'editingold'                       => '<strong>ACHTUNG: Sie bearbeiten eine alte Version dieser Seite. Wenn Sie speichern, werden alle neueren Versionen überschrieben.</strong>',
-'copyrightwarning'                 => '<strong>Bitte <big>kopieren Sie keine Webseiten</big>, die nicht Ihre eigenen sind, benutzen Sie <big>keine urheberrechtlich geschützten Werke</big> ohne Erlaubnis des Copyright-Inhabers!</strong><br />
-Sie geben uns hiermit Ihre Zusage, dass Sie den Text <strong>selbst verfasst</strong> haben, dass der Text Allgemeingut (<strong>public domain</strong>) ist, oder dass der <strong>Copyright-Inhaber</strong> seine <strong>Zustimmung</strong> gegeben hat. Falls dieser Text bereits woanders veröffentlicht wurde, weisen Sie bitte auf der Diskussionsseite darauf hin.
-<i>Bitte beachten Sie, dass alle {{SITENAME}}-Beiträge automatisch unter der „$2“ stehen (siehe $1 für Details). Falls Sie nicht möchten, dass Ihre Arbeit hier von anderen verändert und verbreitet wird, dann drücken Sie nicht auf „Seite speichern“.</i>',
-'copyrightwarning2'                => 'Bitte beachten Sie, dass alle Beiträge zu {{SITENAME}} von anderen Mitwirkenden bearbeitet, geändert oder gelöscht werden können.
+'nonunicodebrowser'                => "'''Achtung:''' Ihr Browser kann Unicode-Zeichen nicht richtig verarbeiten. Bitte verwenden Sie einen anderen Browser um Seiten zu bearbeiten.",
+'editingold'                       => "'''ACHTUNG: Sie bearbeiten eine alte Version dieser Seite. Wenn Sie speichern, werden alle neueren Versionen überschrieben.'''",
+'copyrightwarning'                 => "'''Bitte <big>kopieren Sie keine Webseiten</big>, die nicht Ihre eigenen sind, benutzen Sie <big>keine urheberrechtlich geschützten Werke</big> ohne Erlaubnis des Copyright-Inhabers!'''<br />
+Sie geben uns hiermit Ihre Zusage, dass Sie den Text '''selbst verfasst''' haben, dass der Text Allgemeingut ('''public domain''') ist, oder dass der '''Copyright-Inhaber''' seine '''Zustimmung''' gegeben hat. Falls dieser Text bereits woanders veröffentlicht wurde, weisen Sie bitte auf der Diskussionsseite darauf hin.
+<i>Bitte beachten Sie, dass alle {{SITENAME}}-Beiträge automatisch unter der „$2“ stehen (siehe $1 für Details). Falls Sie nicht möchten, dass Ihre Arbeit hier von anderen verändert und verbreitet wird, dann drücken Sie nicht auf „Seite speichern“.</i>",
+'copyrightwarning2'                => "Bitte beachten Sie, dass alle Beiträge zu {{SITENAME}} von anderen Mitwirkenden bearbeitet, geändert oder gelöscht werden können.
 Reichen Sie keine Texte ein, falls Sie nicht wollen, dass diese ohne Einschränkung geändert werden können.
 
 Sie bestätigen hiermit auch, dass Sie diese Texte selbst geschrieben haben oder diese von einer gemeinfreien Quelle kopiert haben
-(siehe $1 für weitere Details). <strong>ÜBERTRAGEN SIE OHNE GENEHMIGUNG KEINE URHEBERRECHTLICH GESCHÜTZTEN INHALTE!</strong>',
-'longpagewarning'                  => '<strong>WARNUNG: Diese Seite ist $1 kB groß; einige Browser könnten Probleme haben, Seiten zu bearbeiten, die größer als 32 kB sind.
-Überlegen Sie bitte, ob eine Aufteilung der Seite in kleinere Abschnitte möglich ist.</strong>',
-'longpageerror'                    => '<strong>FEHLER: Den Text den Sie versucht haben zu speichern ist $1 KB groß. Das ist größer als das erlaubte Maximum von $2 KB – Speicherung nicht möglich.</strong>',
-'readonlywarning'                  => '<strong>WARNUNG: Die Datenbank wurde während der Seitenbearbeitung für Wartungsarbeiten gesperrt, so dass Sie die Seite im Moment nicht
-speichern können. Sichern Sie den Text und versuchen Sie die Änderungen später einzuspielen.</strong>',
+(siehe $1 für weitere Details). '''ÜBERTRAGEN SIE OHNE GENEHMIGUNG KEINE URHEBERRECHTLICH GESCHÜTZTEN INHALTE!'''",
+'longpagewarning'                  => "'''WARNUNG: Diese Seite ist $1 kB groß; einige Browser könnten Probleme haben, Seiten zu bearbeiten, die größer als 32 kB sind.
+Überlegen Sie bitte, ob eine Aufteilung der Seite in kleinere Abschnitte möglich ist.'''",
+'longpageerror'                    => "'''FEHLER: Den Text den Sie versucht haben zu speichern ist $1 KB groß. Das ist größer als das erlaubte Maximum von $2 KB – Speicherung nicht möglich.'''",
+'readonlywarning'                  => "'''ACHTUNG: Die Datenbank wurde für Wartungsarbeiten gesperrt, so dass Ihre Änderungen derzeit nicht gespeichert werden können.
+Sichern Sie den Text bitte lokal auf Ihrem Computer und versuchen Sie zu einem späteren Zeitpunkt, die Änderungen zu übertragen.'''
+
+Grund für die Sperre: $1",
 'nocreatetext'                     => 'Auf {{SITENAME}} wurde das Erstellen neuer Seiten eingeschränkt. Sie können bestehende Seiten ändern oder sich [[Special:UserLogin|anmelden]].',
 'nocreate-loggedin'                => 'Sie haben keine Berechtigung, neue Seiten zu erstellen.',
 'permissionserrorstext'            => 'Sie sind nicht berechtigt, die Aktion auszuführen. {{PLURAL:$1|Grund|Gründe}}:',
@@ -208,9 +219,7 @@ speichern können. Sichern Sie den Text und versuchen Sie die Änderungen späte
 
 Bitte prüfen Sie sorgfältig, ob die erneute Seitenerstellung den Richtlinien entspricht.
 Zu Ihrer Information folgt das Lösch-Logbuch mit der Begründung für die vorhergehende Löschung:",
-
-# History pages
-'revnotfoundtext' => 'Die Version dieser Seite, nach der Sie suchen, konnte nicht gefunden werden. Bitte überprüfen Sie die URL dieser Seite.',
+'edit-no-change'                   => 'Ihre Bearbeitung wurde ignoriert, da keine Änderung an dem Text vorgenomme wurde.',
 
 # Revision deletion
 'rev-deleted-text-view'  => '<div class="mw-warning plainlinks">Diese Version wurde gelöscht und ist nicht mehr öffentlich einsehbar.
@@ -225,7 +234,7 @@ Stellen Sie sicher, dass die Versionsgeschichte eines Artikels historisch korrek
 'mergehistory-fail'   => 'Versionsvereinigung nicht möglich, bitte prüfen Sie die Seite und die Zeitangaben.',
 
 # Search results
-'searchsubtitle'        => 'Ihre Suchanfrage: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|alle mit „$1“ beginnenden Seiten]] | [[Special:WhatLinksHere/$1|alle Seiten, die nach „$1“ verlinken]])',
+'searchsubtitle'        => 'Ihre Suchanfrage: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|alle mit „$1“ beginnenden Seiten]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alle Seiten, die nach „$1“ verlinken]])',
 'searchsubtitleinvalid' => 'Ihre Suchanfrage: „$1“.',
 'noexactmatch'          => "'''Es existiert keine Seite mit dem Titel „$1“.'''
 Wenn Sie sich mit dem Thema auskennen, können Sie selbst die [[:$1|die Seite verfassen]].",
@@ -261,7 +270,7 @@ Seiten auf Ihrer [[Special:Watchlist|Beobachtungsliste]] sind '''fett''' dargest
 'uploadnologintext'           => 'Sie müssen [[Special:UserLogin|angemeldet sein]], um Dateien hochladen zu können.',
 'uploadtext'                  => "Benutzen Sie dieses Formular, um neue Dateien hochzuladen. 
 
-Gehen Sie zu der [[Special:ImageList|Liste hochgeladener Dateien]], um vorhandene Dateien zu suchen und anzuzeigen. Siehe auch das [[Special:Log/upload|Datei-]]- und [[Special:Log/upload|Lösch-Logbuch]].
+Gehen Sie zu der [[Special:FileList|Liste hochgeladener Dateien]], um vorhandene Dateien zu suchen und anzuzeigen. Siehe auch das [[Special:Log/upload|Datei-]]- und [[Special:Log/upload|Lösch-Logbuch]].
 
 Klicken Sie auf '''„Durchsuchen …“''', um einen Dateiauswahl-Dialog zu öffnen.
 Nach der Auswahl einer Datei wird der Dateiname im Textfeld '''„Quelldatei“''' angezeigt.
@@ -269,8 +278,8 @@ Bestätigen Sie dann die Lizenz-Vereinbarung und klicken Sie anschließend auf '
 Dies kann eine Weile dauern, besonders bei einer langsamen Internet-Verbindung.
 
 Um ein '''Bild''' in einer Seite zu verwenden, schreiben Sie an Stelle des Bildes zum Beispiel:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:Datei.jpg<nowiki>]]</nowiki></tt>'''
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:Datei.jpg|Link-Text<nowiki>]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:Datei.jpg<nowiki>]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:Datei.jpg|Link-Text<nowiki>]]</nowiki></tt>'''
 
 Um '''Mediendateien''' einzubinden, verwenden Sie zum Beispiel:
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:Datei.ogg<nowiki>]]</nowiki></tt>'''
@@ -279,29 +288,30 @@ Um '''Mediendateien''' einzubinden, verwenden Sie zum Beispiel:
 Bitte beachten Sie, dass, genau wie bei normalen Seiteninhalten, andere Benutzer Ihre Dateien löschen oder verändern können.",
 'illegalfilename'             => 'Der Dateiname „$1“ enthält mindestens ein nicht erlaubtes Zeichen. Bitte benennen Sie die Datei um und versuchen Sie sie erneut hochzuladen.',
 'emptyfile'                   => 'Die hochgeladene Datei ist leer. Der Grund kann ein Tippfehler im Dateinamen sein. Bitte kontrollieren Sie, ob Sie die Datei wirklich hochladen wollen.',
-'fileexists'                  => 'Eine Datei mit diesem Namen existiert bereits. Wenn Sie auf „Datei speichern“ klicken, wird die Datei überschrieben. Bitte prüfen Sie <strong><tt>$1</tt></strong>, wenn Sie sich nicht sicher sind.',
-'filepageexists'              => 'Eine Beschreibungsseite wurde bereits als <strong><tt>$1</tt></strong> erstellt, es ist aber keine Datei mit diesem Namen vorhanden. Die eingegebene Beschreibung wird nicht auf die Beschreibungsseite übernommen. Die Beschreibungsseite müssen Sie nach dem Hochladen der Datei noch manuell bearbeiten.',
-'fileexists-extension'        => 'Eine Datei mit ähnlichem Namen existiert bereits:<br />
-Name der hochzuladenden Datei: <strong><tt>$1</tt></strong><br />
-Name der vorhandenen Datei: <strong><tt>$2</tt></strong><br />
-Nur die Dateiendung unterscheidet sich in Groß-/Kleinschreibung. Bitte prüfen Sie, ob die Dateien inhaltlich identisch sind.',
+'fileexists'                  => "Eine Datei mit diesem Namen existiert bereits. Wenn Sie auf „Datei speichern“ klicken, wird die Datei überschrieben. Bitte prüfen Sie '''<tt>$1</tt>''', wenn Sie sich nicht sicher sind.",
+'filepageexists'              => "Eine Beschreibungsseite wurde bereits als '''<tt>$1</tt>''' erstellt, es ist aber keine Datei mit diesem Namen vorhanden. Die eingegebene Beschreibung wird nicht auf die Beschreibungsseite übernommen. Die Beschreibungsseite müssen Sie nach dem Hochladen der Datei noch manuell bearbeiten.",
+'fileexists-extension'        => "Eine Datei mit ähnlichem Namen existiert bereits:<br />
+Name der hochzuladenden Datei: '''<tt>$1</tt>'''<br />
+Name der vorhandenen Datei: '''<tt>$2</tt>'''<br />
+Nur die Dateiendung unterscheidet sich in Groß-/Kleinschreibung. Bitte prüfen Sie, ob die Dateien inhaltlich identisch sind.",
 'fileexists-thumb'            => "<center>'''Vorhandenes Bild'''</center>",
-'fileexists-thumbnail-yes'    => 'Bei der Datei scheint es sich um ein Bild verringerter Größe <i>(thumbnail)</i> zu handeln. Bitte prüfen Sie die Datei <strong><tt>$1</tt></strong>.<br />
-Wenn es sich um das Bild in Originalgröße handelt, so braucht kein separates Vorschaubild hochgeladen zu werden.',
-'file-thumbnail-no'           => 'Der Dateiname beginnt mit <strong><tt>$1</tt></strong>. Dies deutet auf ein Bild verringerter Größe <i>(thumbnail)</i> hin.
-Bitte prüfen Sie, ob Sie das Bild in voller Auflösung vorliegen haben und laden dieses unter dem Originalnamen hoch.',
-'fileexists-forbidden'        => 'Unter diesem Namen existiert bereits eine Datei. Bitte gehen Sie zurück und laden Sie diese Datei unter einem anderen Namen hoch. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Bei der Datei scheint es sich um ein Bild verringerter Größe ''(thumbnail)'' zu handeln. Bitte prüfen Sie die Datei '''<tt>$1</tt>'''.<br />
+Wenn es sich um das Bild in Originalgröße handelt, so braucht kein separates Vorschaubild hochgeladen zu werden.",
+'file-thumbnail-no'           => "Der Dateiname beginnt mit '''<tt>$1</tt>'''. Dies deutet auf ein Bild verringerter Größe ''(thumbnail)'' hin.
+Bitte prüfen Sie, ob Sie das Bild in voller Auflösung vorliegen haben und laden dieses unter dem Originalnamen hoch.",
+'fileexists-forbidden'        => 'Unter diesem Namen existiert bereits eine Datei und sie kann nicht überschrieben werden. Bitte gehen Sie zurück und laden Sie die Datei unter einem anderen Namen hoch. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Unter diesem Namen existiert bereits eine Datei im zentralen Medienarchiv.
 Wenn Sie diese Datei trotzdem hochladen möchten, gehen Sie bitte zurück und ändern den Namen.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
+'file-deleted-duplicate'      => 'Eine identische Datei dieser Datei ([[$1]]) wurde früher gelöscht. Überprüfen Sie das Lösch-Logbuch, bevor Sie sie hochladen.',
 'uploadcorrupt'               => 'Die Datei ist beschädigt oder hat eine falsche Datei-Erweiterung. Bitte überprüfen Sie die Datei und wiederholen Sie den Hochlade-Vorgang.',
 'filewasdeleted'              => 'Eine Datei mit diesem Namen wurde schon einmal hochgeladen und zwischenzeitlich wieder gelöscht. Bitte prüfen Sie zuerst den Eintrag im $1, bevor Sie die Datei wirklich speichern.',
 'upload-wasdeleted'           => "'''Achtung: Sie laden eine Datei hoch, die bereits früher gelöscht wurde.'''
 
 Bitte prüfen Sie sorgfältig, ob das erneute Hochladen den Richtlinien entspricht.
 Zu Ihrer Information folgt das Lösch-Logbuch mit der Begründung für die vorhergehende Löschung:",
-'filename-bad-prefix'         => 'Der Dateiname beginnt mit <strong>„$1“</strong>. Dies ist im allgemeinen der von einer Digitalkamera vorgegebene Dateiname und daher nicht sehr aussagekräftig.
-Bitte geben Sie der Datei einen Namen, der den Inhalt besser beschreibt.',
+'filename-bad-prefix'         => "Der Dateiname beginnt mit '''„$1“'''. Dies ist im allgemeinen der von einer Digitalkamera vorgegebene Dateiname und daher nicht sehr aussagekräftig.
+Bitte geben Sie der Datei einen Namen, der den Inhalt besser beschreibt.",
 
 'upload-file-error-text' => 'Bei der Erstellung einer temporären Datei auf dem Server ist ein interner Fehler aufgetreten.
 Bitte informieren Sie einen [[Special:ListUsers/sysop|System-Administrator]].',
@@ -315,7 +325,7 @@ Wenn das Problem weiter besteht, informieren Sie einen [[Special:ListUsers/sysop
 
 'upload_source_file' => ' (eine Datei auf Ihrem Computer)',
 
-# Image description page
+# File description page
 'filehist-help' => 'Klicken Sie auf einen Zeitpunkt, um diese Version zu laden.',
 'noimage'       => 'Eine Datei mit diesem Namen existiert nicht, Sie können sie jedoch $1.',
 
@@ -323,9 +333,8 @@ Wenn das Problem weiter besteht, informieren Sie einen [[Special:ListUsers/sysop
 'filerevert-intro' => "Sie setzen die Datei '''[[Media:$1|$1]]''' auf die [$4 Version vom $2, $3 Uhr] zurück.",
 
 # File deletion
-'filedelete-intro'     => "Sie löschen die Datei '''„[[Media:$1|$1]]“'''.",
+'filedelete-intro'     => "Sie löschen die Datei '''„[[Media:$1|$1]]“''' inklusive ihrer Versionsgeschichte.",
 'filedelete-intro-old' => "Sie löschen von der Datei '''„[[Media:$1|$1]]“''' die [$4 Version vom $2, $3 Uhr].",
-'filedelete-iscurrent' => 'Sie versuchen die aktuelle Version dieser Datei zu löschen. Bitte setzen Sie diese vorher auf eine ältere Version zurück.',
 
 # Unused templates
 'unusedtemplatestext' => 'Diese Seite listet alle Seiten im {{ns:template}}-Namensraum auf, die nicht in anderen Seiten eingebunden sind.
@@ -335,6 +344,10 @@ Wenn das Problem weiter besteht, informieren Sie einen [[Special:ListUsers/sysop
 'unusedimagestext' => 'Bitte beachten Sie, dass andere Webseiten diese Datei mit einer direkten URL verlinken können. Diese wird nicht als Verwendung erkannt, so dass die Datei hier aufgeführt wird.',
 'notargettext'     => 'Sie haben nicht angegeben, auf welche Seite diese Funktion angewendet werden soll.',
 
+# Book sources
+'booksources-invalid-isbn' => 'Vermutlich ist die ISBN ungültig.
+Bitte prüfen Sie, ob korrekt von der Quelle übertragen wurde.',
+
 # E-mail user
 'mailnologintext' => 'Sie müssen [[Special:UserLogin|angemeldet sein]] und eine bestätigte E-Mail-Adresse in Ihren [[Special:Preferences|Einstellungen]] eingetragen haben, um anderen Benutzern E-Mails schicken zu können.',
 'emailpagetext'   => 'Sie könnent dem Benutzer mit dem unten stehenden Formular eine E-Mail senden.
@@ -372,23 +385,27 @@ Kontakt zum Bearbeiter:
 E-Mail: $PAGEEDITOR_EMAIL
 Wiki: $PAGEEDITOR_WIKI
 
-Es werden solange keine weiteren Benachrichtigungsmails gesendet, bis Sie die Seite wieder besucht haben. Auf Ihrer Beobachtungsliste könenn Sie alle Benachrichtigungsmarker zusammen zurücksetzen.
+Es werden solange keine weiteren Benachrichtigungs-E-Mails gesendet, bis Sie die Seite wieder besucht haben. Auf Ihrer Beobachtungsliste können Sie alle Benachrichtigungsmarker zusammen zurücksetzen.
 
              Das freundliche {{SITENAME}}-Benachrichtigungssystem
 
 --
 Um die Einstellungen Ihrer Beobachtungsliste anzupassen, besuchen Sie: {{fullurl:Special:Watchlist/edit}}',
 
-# Delete/protect/revert
-'historywarning'         => 'Achtung, die Seite, die Sie löschen möchten, hat eine Versionsgeschichte:',
-'confirmdeletetext'      => 'Sie sind dabei, eine Seite mit allen zugehörigen älteren Versionen zu löschen. Bitte bestätigen Sie, dass Sie sich der Konsequenzen bewusst sind, und dass Sie in Übereinstimmung mit den [[{{MediaWiki:Policy-url}}|Richtlinien]] handeln.',
-'deletedtext'            => '„<nowiki>$1</nowiki>“ wurde gelöscht. Im $2 finden Sie eine Liste der letzten Löschungen.',
-'sessionfailure'         => 'Es gab ein Problem mit der Ãœbertragung Ihrer Benutzerdaten.
+# Delete
+'historywarning'    => 'Achtung, die Seite, die Sie löschen möchten, hat eine Versionsgeschichte:',
+'confirmdeletetext' => 'Sie sind dabei, eine Seite mit allen zugehörigen älteren Versionen zu löschen. Bitte bestätigen Sie, dass Sie sich der Konsequenzen bewusst sind, und dass Sie in Übereinstimmung mit den [[{{MediaWiki:Policy-url}}|Richtlinien]] handeln.',
+'deletedtext'       => '„<nowiki>$1</nowiki>“ wurde gelöscht. Im $2 finden Sie eine Liste der letzten Löschungen.',
+
+# Rollback
+'sessionfailure' => 'Es gab ein Problem mit der Ãœbertragung Ihrer Benutzerdaten.
 Diese Aktion wurde daher sicherheitshalber abgebrochen, um eine falsche Zuordnung Ihrer Änderungen zu einem anderen Benutzer zu verhindern.
 Bitte gehen Sie zurück und versuchen Sie den Vorgang erneut auszuführen.',
+
+# Protect
 'protect-text'           => 'Hier können Sie den Schutzstatus für die Seite „$1“ einsehen und ändern.',
-'protect-locked-blocked' => 'Sie können den Seitenschutz nicht ändern, da Ihr Benutzerkonto gesperrt ist. Hier sind die aktuellen Seitenschutz-Einstellungen für die Seite <strong>„$1“:</strong>',
-'protect-locked-access'  => 'Ihr Benutzerkonto verfügt nicht über die notwendigen Rechte zur Änderung des Seitenschutzes. Hier sind die aktuellen Seitenschutzeinstellungen für die Seite <strong>„$1“:</strong>',
+'protect-locked-blocked' => "Sie können den Seitenschutz nicht ändern, da Ihr Benutzerkonto gesperrt ist. Hier sind die aktuellen Seitenschutz-Einstellungen für die Seite '''„$1“:'''",
+'protect-locked-access'  => "Ihr Benutzerkonto verfügt nicht über die notwendigen Rechte zur Änderung des Seitenschutzes. Hier sind die aktuellen Seitenschutzeinstellungen für die Seite '''„$1“:'''",
 'protect-cantedit'       => 'Sie können die Sperre dieser Seite nicht ändern, da Sie keine Berechtigung zum Bearbeiten der Seite haben.',
 
 # Undelete
@@ -406,22 +423,25 @@ Im [[Special:Log/delete|Lösch-Logbuch]] finden Sie eine Übersicht der gelösch
 'undelete-show-file-confirm' => 'Sind Sie sicher, dass Sie eine gelöschte Version der Datei „<nowiki>$1</nowiki>“ vom $2, $3 Uhr sehen wollen?',
 
 # Block/unblock
-'blockiptext'      => 'Mit diesem Formular sperren Sie eine IP-Adresse oder einen Benutzernamen, so dass von dort keine Änderungen mehr vorgenommen werden können.
+'blockiptext'              => 'Mit diesem Formular sperren Sie eine IP-Adresse oder einen Benutzernamen, so dass von dort keine Änderungen mehr vorgenommen werden können.
 Dies sollte nur erfolgen, um Vandalismus zu verhindern und in Ãœbereinstimmung mit den [[{{MediaWiki:Policy-url}}|Richtlinien]].
 Bitte geben Sie den Grund für die Sperre an.',
-'unblockiptext'    => 'Mit diesem Formular können Sie eine IP-Adresse oder einen Benutzer freigeben.',
-'autoblocker'      => 'Automatische Sperre, da Sie eine gemeinsame IP-Adresse mit [[User:$1|Benutzer:$1]] benutzen. Grund: „$2“.',
-'proxyblockreason' => 'Ihre IP-Adresse wurde gesperrt, da sie ein offener Proxy ist. Bitte kontaktieren Sie Ihren Internet-Provider oder Ihre Systemadministratoren und informieren Sie sie über dieses mögliche Sicherheitsproblem.',
+'unblockiptext'            => 'Mit diesem Formular können Sie eine IP-Adresse oder einen Benutzer freigeben.',
+'autoblocker'              => 'Automatische Sperre, da Sie eine gemeinsame IP-Adresse mit [[User:$1|Benutzer:$1]] benutzen. Grund: „$2“.',
+'ipb-needreblock'          => '== Sperre vorhanden ==
+„$1“ ist bereits gesperrt. Möchten Sie die Sperrparameter ändern?',
+'proxyblockreason'         => 'Ihre IP-Adresse wurde gesperrt, da sie ein offener Proxy ist. Bitte kontaktieren Sie Ihren Internet-Provider oder Ihre Systemadministratoren und informieren Sie sie über dieses mögliche Sicherheitsproblem.',
+'cant-block-while-blocked' => 'Sie dürfen keine anderen Benutzer sperren, während Sie selbst gesperrt sind.',
 
 # Developer tools
 'locknoconfirm'     => 'Sie haben das Bestätigungsfeld nicht markiert.',
 'lockdbsuccesstext' => 'Die {{SITENAME}}-Datenbank wurde gesperrt.<br />Bitte geben Sie die Datenbank [[Special:UnlockDB|wieder frei]], sobald die Wartung abgeschlossen ist.',
 
 # Move page
-'movepagetext'         => "Mit diesem Formular können Sie eine Seite umbenennen (mitsamt allen Versionen).
+'movepagetext'           => "Mit diesem Formular können Sie eine Seite umbenennen (mitsamt allen Versionen).
 Der alte Titel wird zum neuen weiterleiten.
 Sie können Weiterleitungen, die auf den Originaltitel verlinken, automatisch korrigieren lassen.
-Falls Sie dies nicht tun, prüfen Sie auf [[Special:DoubleRedirects|doppelte]] oder [[Special:BrokenRedirects|defekte Weiterleitungen]].
+Falls Sie dies nicht tun, prüfen Sie auf [[Special:DoubleRedirects|doppelte]] oder [[Special:BrokenRedirects|kaputte Weiterleitungen]].
 Sie sind dafür verantwortlich, dass Links weiterhin auf das korrekte Ziel zeigen.
 
 Die Seite wird '''nicht''' verschoben, wenn es bereits eine Seite mit demselben Namen gibt, sofern diese nicht leer oder eine Weiterleitung ohne Versionsgeschichte ist. Dies bedeutet, dass Sie die Seite zurück verschieben können, wenn Sie einen Fehler gemacht haben. Sie können hingegen keine Seite überschreiben.
@@ -429,17 +449,21 @@ Die Seite wird '''nicht''' verschoben, wenn es bereits eine Seite mit demselben
 '''Warnung'''
 Die Verschiebung kann weitreichende und unerwartete Folgen für beliebte Seiten haben.
 Sie sollten daher die Konsequenzen verstanden haben, bevor Sie fortfahren.",
-'movepagetalktext'     => "Die dazugehörige Diskussionsseite wird, sofern vorhanden, mitverschoben, '''es sei denn:'''
+'movepagetalktext'       => "Die dazugehörige Diskussionsseite wird, sofern vorhanden, mitverschoben, '''es sei denn:'''
 *Es existiert bereits eine Diskussionsseite mit diesem Namen, oder
 *Sie wählen die unten stehende Option ab.
 
 In diesen Fällen müssen Sie, falls gewünscht, den Inhalt der Seite von Hand verschieben oder zusammenführen.
 
 Bitte den '''neuen''' Titel unter '''Ziel''' eintragen, darunter die Umbenennung bitte '''begründen.'''",
-'movenotallowed'       => 'Sie haben keine Berechtigung, Seiten zu verschieben.',
-'articleexists'        => 'Unter diesem Namen existiert bereits eine Seite. Bitte wählen Sie einen anderen Namen.',
-'talkexists'           => 'Die Seite selbst wurde erfolgreich verschoben, aber die zugehörige Diskussions-Seite nicht, da bereits eine mit dem neuen Titel existiert. Bitte gleichen Sie die Inhalte von Hand ab.',
-'delete_and_move_text' => '==Zielseite vorhanden, löschen?==
+'movenologintext'        => 'Sie müssen ein registrierter Benutzer und [[Special:UserLogin|angemeldet]] sein, um eine Seite zu verschieben.',
+'movenotallowed'         => 'Sie haben keine Berechtigung, Seiten zu verschieben.',
+'movenotallowedfile'     => 'Sie haben keine Berechtigung, Dateien zu verschieben.',
+'cant-move-user-page'    => 'Sie haben keine Berechtigung, Benutzerhauptseiten zu verschieben.',
+'cant-move-to-user-page' => 'Sie haben nicht die Berechtigung, Seiten auf eine Benutzerseite zu verschieben (mit Ausnahme von Benutzerunterseiten).',
+'articleexists'          => 'Unter diesem Namen existiert bereits eine Seite. Bitte wählen Sie einen anderen Namen.',
+'talkexists'             => 'Die Seite selbst wurde erfolgreich verschoben, aber die zugehörige Diskussionsseite nicht, da bereits eine mit dem neuen Titel existiert. Bitte gleichen Sie die Inhalte von Hand ab.',
+'delete_and_move_text'   => '== Löschung erforderlich ==
 
 Die Seite „[[:$1]]“ existiert bereits. Möchten Sie diese löschen, um die Seite verschieben zu können?',
 
@@ -449,7 +473,11 @@ Die Datei kann in ein anderes MediaWiki-Wiki über die [[Special:Import|Importfu
 
 Tragen Sie den oder die entsprechenden Seitentitel in das folgende Textfeld ein (pro Zeile jeweils nur für eine Seite).
 
-Alternativ ist der Export auch mit der Syntax [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] möglich, beispielsweise für die [[{{MediaWiki:Mainpage}}]].',
+Alternativ ist der Export auch mit der Syntax [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] möglich, beispielsweise für die [[{{MediaWiki:Mainpage}}]].',
+
+# Namespace 8 related
+'allmessagestext' => 'Dies ist eine Liste der MediaWiki-Systemtexte.
+Besuchen Sie die Seiten [http://www.mediawiki.org/wiki/Localisation MediaWiki-Lokalisierung] und [http://translatewiki.net translatewiki.net], wenn Sie sich an der Lokalisierung von MediaWiki beteiligen möchten.',
 
 # Special:Import
 'import-interwiki-text' => 'Wählen Sie ein Wiki und eine Seite zum Importieren aus.
@@ -458,7 +486,10 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'import-token-mismatch' => 'Verlust der Sessiondaten. Bitte versuchen Sie es erneut.',
 
 # Tooltip help for the actions
+'tooltip-pt-userpage'     => 'Ihre Benutzerseite',
 'tooltip-pt-anonuserpage' => 'Benutzerseite der IP-Adresse, von der aus Sie Änderungen durchführen',
+'tooltip-pt-mytalk'       => 'Ihre Diskussionsseite',
+'tooltip-pt-mycontris'    => 'Liste Ihrer Beiträge',
 'tooltip-n-mainpage'      => 'Besuchen Sie die Hauptseite',
 'tooltip-n-portal'        => 'Über das Portal, was Sie tun können, wo was zu finden ist',
 'tooltip-watch'           => 'Fügt diese Seite Ihrer Beobachtungsliste hinzu',
@@ -507,9 +538,9 @@ $5
 Dieser Bestätigungscode ist gültig bis $4.',
 
 # Delete conflict
-'deletedwhileediting' => '<span class="error">Achtung: Diese Seite wurde gelöscht, nachdem Sie angefangen haben sie zu bearbeiten!
+'deletedwhileediting' => 'Achtung: Diese Seite wurde gelöscht, nachdem Sie angefangen haben sie zu bearbeiten!
 Im [{{fullurl:Special:Log|type=delete&page=}}{{FULLPAGENAMEE}} Lösch-Logbuch] finden Sie den Grund für die Löschung.
-Wenn Sie die Seite speichern, wird sie neu angelegt.</span>',
+Wenn Sie die Seite speichern, wird sie neu angelegt.',
 'confirmrecreate'     => "Benutzer [[User:$1|$1]] ([[User talk:$1|Diskussion]]) hat diese Seite gelöscht, nachdem Sie angefangen haben, sie zu bearbeiten. Die Begründung lautete:
 : ''$2''
 Bitte bestätigen Sie, dass Sie diese Seite wirklich neu erstellen möchten.",
diff --git a/languages/messages/MessagesDiq.php b/languages/messages/MessagesDiq.php
index 750578ef..f9d1cb0a 100644
--- a/languages/messages/MessagesDiq.php
+++ b/languages/messages/MessagesDiq.php
@@ -10,62 +10,63 @@
 
 $messages = array(
 # User preference toggles
-'tog-underline'               => 'Bınê gıreyan de xete bıance:',
-'tog-highlightbroken'         => 'Gıreyanê vengan {a href="" class="new"}wına{/a} (alternative: wına{a 
+'tog-underline'               => 'Bınê gırêyan de xete bıance:',
+'tog-highlightbroken'         => 'Gırêyanê vengan {a href="" class="new"}wına{/a} (alternative: wına{a 
 href="" class="internal"}?{/a}) bımocne.',
 'tog-justify'                 => 'Nuşte dı kıştan ser bıazne',
-'tog-hideminor'               => 'Vurnayışanê şenıkan perra „vurnayışê peyêni“ de bınımne',
-'tog-extendwatchlist'         => 'Lista seyr-kerdışia hirakerdiye',
-'tog-usenewrc'                => "Lista vurnayışanê peyênana hirakerdiye (''JavaScript'' lazımo)",
+'tog-hideminor'               => 'Vurnayışanê şenıkan pela „vurnayışê peyêni“ de bınımne',
+'tog-extendwatchlist'         => 'Lista seyr-kerdışia herakerdiye',
+'tog-usenewrc'                => "Lista vurnayışanê peyênana herakerdiye (''JavaScript'' lazımo)",
 'tog-numberheadings'          => 'Sernuşteyan be xo numre cışane',
-'tog-showtoolbar'             => 'Goceganê hacetanê vurnayışi bımocne (JavaScript)',
-'tog-editondblclick'          => 'Pê dı rey tıknayış perre sero bıxebetiye (JavaScript)',
-'tog-editsection'             => 'Vurnayışê tek tek qısman rê gıreyan bımocne',
-'tog-editsectiononrightclick' => 'Sernuştey qısıman sero be gocega raşte tıknaene bıvurne (JavaScript)',
-'tog-showtoc'                 => 'Tabloyê tedeesteyan bımocne (de perranê be hirê sernuşteyan ra vêşêri de)',
+'tog-showtoolbar'             => 'Goceganê hacetanê vurnayışi bımocne (JavaScript lazımo)',
+'tog-editondblclick'          => 'Pê dı rey tıknayış pele sero bıxebetiye (JavaScript lazımo)',
+'tog-editsection'             => 'Gırêyanê [bıvurne] sera qısımê vurnayışi feal ke',
+'tog-editsectiononrightclick' => 'Sernuştey qısıman sero be gocega raşte tıknayene bıvurne (JavaScript lazımo)',
+'tog-showtoc'                 => 'Tabloyê tedeesteyan bımocne (de pelanê be hirê sernuşteyan ra vêşêri de)',
 'tog-rememberpassword'        => 'Parola mı bia xo viri',
-'tog-editwidth'               => 'Verınina perra cıdayışê nuştey tam bıaso',
-'tog-watchcreations'          => 'Perrê ke mı afernaê, lista mına seyr-kerdışi ke',
-'tog-watchdefault'            => 'Perrê ke mı vurnaê, lista mına seyr-kerdışi ke',
-'tog-watchmoves'              => 'Perrê ke mı kırışnaê, lista mına seyr-kerdışi ke',
-'tog-watchdeletion'           => 'Perrê ke mı esterıtê, lista mına seyr-kerdışi ke',
-'tog-minordefault'            => 'Vurnayışanê xo pêroine ‘vurnayışo qıckek’ nışan bıde',
-'tog-previewontop'            => 'Verqayti perra nuştışi ser de bımocne',
+'tog-editwidth'               => 'Verıniya pela cıdayışê nuştey tam bıaso',
+'tog-watchcreations'          => 'Pelê ke mı afernayê, lista mına seyr-kerdışi ke',
+'tog-watchdefault'            => 'Pelê ke mı vurnayê, lista mına seyr-kerdışi ke',
+'tog-watchmoves'              => 'Pelê ke mı kırışnayê, lista mına seyr-kerdışi ke',
+'tog-watchdeletion'           => 'Pelê ke mı esterıtê, lista mına seyr-kerdışi ke',
+'tog-minordefault'            => 'Vurnayışanê xo pêrune ‘vurnayışo qıckek’ nışan bıde',
+'tog-previewontop'            => 'Verqayti pela nuştışi ser de bımocne',
 'tog-previewonfirst'          => 'Vurnayışo verên de verqayti tım bımocne',
-'tog-nocache'                 => 'Perran mia xo viri',
-'tog-enotifwatchlistpages'    => 'Perra ke ez seyr kenan eke vurnê mı rê e-mail bırışe',
-'tog-enotifusertalkpages'     => 'Pela mına werênayışi ke vurnê, mı rê e-mail bırışe',
+'tog-nocache'                 => 'Pelan mia xo viri',
+'tog-enotifwatchlistpages'    => 'Pela ke ez seyr kenan eke vurnayê mı rê e-mail bırışe',
+'tog-enotifusertalkpages'     => 'Pela mına werênayışi ke vurnayê, mı rê e-mail bırışe',
 'tog-enotifminoredits'        => 'Vurnayışanê qıckekan de ki mı rê e-mail bırışe',
 'tog-enotifrevealaddr'        => 'E-mailadresa mı emailanê xeberan de bımocne',
 'tog-shownumberswatching'     => 'Amarê karberanê seyrkerdoğan bımocne',
-'tog-fancysig'                => 'İmza xame (bê gıreo otomatik be perra karberan ser)',
+'tog-fancysig'                => 'İmza xame (bê gırêo otomatik be pela karberan ser)',
 'tog-externaleditor'          => 'Editorê teberi standard bıxebetne (tenya seba ekspertano, komputerê şıma de ayarê xususiy lazımê)',
 'tog-externaldiff'            => 'Têverşanayışan pê programê teberi vıraze (tenya seba ekspertano, komputerê şıma de ayarê xususiy lazımê)',
 'tog-showjumplinks'           => 'Gırey "şo"y feal ke',
-'tog-uselivepreview'          => 'Verqayto cınde bıgurene/bıxebetne (JavaScript) (hewna cerrebnayış dero)',
+'tog-uselivepreview'          => 'Verqayto cınde bıxebetne (JavaScript lazımo) (hewna cerrebnayış dero)',
 'tog-forceeditsummary'        => 'Mı ke xulasa kerde cı vira, hay be mı ser de',
 'tog-watchlisthideown'        => 'Vurnayışanê mı lista mına seyr-kerdışi de bınımne',
 'tog-watchlisthidebots'       => 'Vurnayışanê boti lista mına seyr-kerdışi de bınımne',
 'tog-watchlisthideminor'      => 'Vurnayışanê qıckekan lista mına seyr-kerdışi de bınımne',
+'tog-watchlisthideliu'        => 'Lista seyrkerdışi ra vurnayışanê karberanê cıkewteyan bınımne',
+'tog-watchlisthideanons'      => 'Lista seyrkerdışi ra vurnayışanê karberanê anoniman bınımne',
 'tog-ccmeonemails'            => 'E-mailanê ke ez karberanê binan rê rışenan, mı rê kopya inan bırışe',
 'tog-diffonly'                => 'Qıyasê verziyonan de tek ferqan bımocne, perra butıne nê',
 'tog-showhiddencats'          => 'Kategoriyanê dızdine bımocne',
+'tog-norollbackdiff'          => 'Peyserardene ra dıme ferqi caverde',
 
 'underline-always'  => 'Tım',
 'underline-never'   => 'Qet',
 'underline-default' => 'Qerar cıgeyraoği dest dero',
 
-'skinpreview' => '(Verqayt)',
-
 # Dates
-'sunday'        => 'YewÅŸeme',
+'sunday'        => 'Kırê',
 'monday'        => 'Dışeme',
 'tuesday'       => 'Sêşeme',
 'wednesday'     => 'Çarşeme',
 'thursday'      => 'PhancÅŸeme',
-'friday'        => 'Yene',
+'friday'        => 'Êne',
 'saturday'      => 'Åžeme',
-'sun'           => 'YwÅŸ',
+'sun'           => 'Kır',
 'mon'           => 'DÅŸm',
 'tue'           => 'SÅŸm',
 'wed'           => 'Çrş',
@@ -83,19 +84,19 @@ href="" class="internal"}?{/a}) bımocne.',
 'september'     => 'KeÅŸkelun',
 'october'       => 'Tışrino Verên',
 'november'      => 'Tışrino Peyên',
-'december'      => 'Qanun',
+'december'      => 'Kanun',
 'january-gen'   => 'Çeley',
 'february-gen'  => 'Şıbate',
-'march-gen'     => 'Adare',
+'march-gen'     => 'Adari',
 'april-gen'     => 'Nisane',
 'may-gen'       => 'Gulane',
-'june-gen'      => 'Hezirane',
-'july-gen'      => 'Temmuze',
+'june-gen'      => 'Hezirani',
+'july-gen'      => 'Temmuzi',
 'august-gen'    => 'Tebaxe',
 'september-gen' => 'KeÅŸkeluni',
 'october-gen'   => 'Tışrinê Verêni',
 'november-gen'  => 'Tışrinê Peyêni',
-'december-gen'  => 'Qanuni',
+'december-gen'  => 'Kanuni',
 'jan'           => 'Çel',
 'feb'           => 'Åžbt',
 'mar'           => 'Adr',
@@ -107,11 +108,11 @@ href="" class="internal"}?{/a}) bımocne.',
 'sep'           => 'KÅŸk',
 'oct'           => 'TÅŸv',
 'nov'           => 'TÅŸp',
-'dec'           => 'Qan',
+'dec'           => 'Kan',
 
 # Categories related messages
-'pagecategories'           => '{{PLURAL:$1|Kategoriya|Kategoriyê}} perre',
-'category_header'          => 'Nuşteyê ke kategoriya "$1"(-i/-an) derê.',
+'pagecategories'           => '{{PLURAL:$1|Kategoriye|Kategoriy}}',
+'category_header'          => 'Pelê ke kategoriya "$1" derê',
 'subcategories'            => 'Kategoriyê bınêni',
 'category-media-header'    => 'Medyawa ke kategoriya "$1" (-i/-an) dera',
 'category-empty'           => "''Ena kategoriye de hewna qet nuştey ya ki medyay çıniyê.''",
@@ -143,7 +144,7 @@ href="" class="internal"}?{/a}) bımocne.',
 'mytalk'         => 'Perra mına werênayışi',
 'anontalk'       => 'Perra werênayışê nê IPy',
 'navigation'     => 'pusula',
-'and'            => 'u',
+'and'            => '&#32;u',
 
 'errorpagetitle'    => 'Xeta',
 'returnto'          => 'Peyser ÅŸo $1.',
@@ -165,9 +166,9 @@ href="" class="internal"}?{/a}) bımocne.',
 'create-this-page'  => 'Na pele bınuse',
 'delete'            => 'bıestere',
 'deletethispage'    => 'Ena pele bıestere',
-'undelete_short'    => 'Vurnayışê $1 peyser bia',
+'undelete_short'    => '{{PLURAL:$1|yew vurnayışi|$1 vurnayışan}} meestere',
 'protect'           => 'kılit ke',
-'protect_change'    => 'kılit-kerdene bıvurne',
+'protect_change'    => 'bıvurne',
 'protectthispage'   => 'Ena perre kılit ke',
 'unprotect'         => 'ake',
 'unprotectthispage' => 'Ena perre ake',
@@ -200,8 +201,6 @@ href="" class="internal"}?{/a}) bımocne.',
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Heqa {{SITENAME}} de',
 'aboutpage'            => 'Project:Heqa',
-'bugreports'           => 'Xebera xeteyan',
-'bugreportspage'       => 'Project:Xebera xeteyan',
 'copyright'            => 'Nuştey bınê Lisansê $1 de vêrenê.',
 'copyrightpagename'    => 'Heqa telifê {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Heqê telifi',
@@ -231,6 +230,8 @@ href="" class="internal"}?{/a}) bımocne.',
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'bıvurne',
 'viewsourceold'           => 'çımey bıvêne',
+'editlink'                => 'bıvurne',
+'viewsourcelink'          => 'çımey bıvêne',
 'editsectionhint'         => 'Qısımê vurnayışi: $1',
 'toc'                     => 'Tedeestey',
 'showtoc'                 => 'bımocne',
@@ -242,13 +243,13 @@ href="" class="internal"}?{/a}) bımocne.',
 'feed-invalid'            => 'Tipê weyikerdışê beğşê nêvêrdey.',
 'site-rss-feed'           => 'Weyi-kerdışê $1 RSSi',
 'site-atom-feed'          => 'Weyi-kerdışê $1 Atomi',
-'red-link-title'          => '$1 (heta nıka nênusiyao)',
+'red-link-title'          => '$1 (pele çina)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'nuÅŸte',
 'nstab-user'      => 'Pela Karberi',
 'nstab-media'     => 'Pela Medya',
-'nstab-special'   => 'xas',
+'nstab-special'   => 'Pela xase',
 'nstab-project'   => 'Pela Procey',
 'nstab-image'     => 'Dosya',
 'nstab-mediawiki' => 'Mesaj',
@@ -266,7 +267,6 @@ Seba /qandê lista pelanê xasanê vêrdeyan kerem ke: [[Special:SpecialPages|{{
 # General errors
 'error'               => 'Äželet',
 'badtitle'            => 'Sernameya xırabe',
-'perfdisabled'        => 'Qusır de seyrmeke! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.',
 'viewsource'          => 'Çımey bıvêne',
 'viewsourcefor'       => 'Seba / qandê $1',
 'viewsourcetext'      => 'To şikinay çımey na pele bıvêne u kopya kerê:',
@@ -304,9 +304,16 @@ If you choose to provide it, this will be used for giving you attribution for yo
 'passwordtooshort'          => 'Parola to nêvêrena ya ki zaf kılma.
 It must have at least $1 characters and be different from your username.',
 'mailmypassword'            => 'E-mail sera parola newiye bırışe',
+'accountcreated'            => 'Hesab vıraciya',
 'loginlanguagelabel'        => 'Zıwan: $1',
 
+# Password reset dialog
+'oldpassword' => 'Parola kıhane:',
+'newpassword' => 'Parola newiye:',
+'retypenew'   => 'Parola newiye tekrar ke:',
+
 # Edit pages
+'summary'      => 'Xulasa:',
 'savearticle'  => 'Ena pele qeyd ke',
 'preview'      => 'Verqayt',
 'showpreview'  => 'Verqayti bımocne',
@@ -328,6 +335,8 @@ It must have at least $1 characters and be different from your username.',
 'editundo' => 'peyser biya',
 
 # Search results
+'searchhelp-url'     => 'Help:Tedeestey',
+'search-result-size' => '$1 ({{PLURAL:$2|1 çekuye|$2 çekuy}})',
 'powersearch'        => 'Cıgeyrayışo hera',
 'powersearch-legend' => 'Cıgeyrayışo hera',
 'powersearch-ns'     => 'Cayanê nameyan de cıgeyrayış:',
@@ -338,13 +347,11 @@ It must have at least $1 characters and be different from your username.',
 # Preferences page
 'mypreferences'   => 'tercihê mı',
 'qbsettings-none' => 'çino',
+'skin-preview'    => 'Verqayt',
 'prefs-personal'  => 'Pela karberi',
 'prefs-rc'        => 'Vurnayışê peyêni',
 'prefs-watchlist' => 'Lista seyr-kerdışi',
 'saveprefs'       => 'Qeyd ke',
-'oldpassword'     => 'Parola kıhane:',
-'newpassword'     => 'Parola newiye:',
-'retypenew'       => 'Parola newiye tekrar ke:',
 'timezonelegend'  => 'Warey saete',
 'files'           => 'Dosyey',
 
@@ -372,17 +379,17 @@ It must have at least $1 characters and be different from your username.',
 'filesource' => 'Çımey:',
 'savefile'   => 'Dosya qeyd ke',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'dosya',
-'imagelist'      => 'Lista Dosya',
-'imagelist_date' => 'Tarix',
-'imagelist_user' => 'Karber',
+'listfiles'      => 'Lista Dosya',
+'listfiles_date' => 'Tarix',
+'listfiles_user' => 'Karber',
 
-# Image description page
+# File description page
 'filehist'          => 'Tarixê dosya',
 'filehist-datetime' => 'Tarix/Zeman',
 'filehist-user'     => 'Karber',
-'imagelinks'        => 'Pelê ke tede xebıtiyenê',
+'imagelinks'        => 'Gıreyê dosya',
 'noimage-linktext'  => 'Bar ke',
 
 # File deletion
@@ -417,7 +424,6 @@ It must have at least $1 characters and be different from your username.',
 
 # Special:Log
 'specialloguserlabel' => 'Karber:',
-'log-search-submit'   => 'Åžo',
 
 # Special:AllPages
 'alphaindexline' => '$1 ra $2ine',
@@ -441,8 +447,11 @@ It must have at least $1 characters and be different from your username.',
 'watching'   => 'Seyr ke...',
 'unwatching' => 'Seyr meke...',
 
-# Delete/protect/revert
-'deletepage'   => 'Pele bıestere',
+# Delete
+'deletepage'            => 'Pele bıestere',
+'deletereasonotherlist' => 'Sebebo bin',
+
+# Rollback
 'rollbacklink' => 'peyser bia',
 
 # Restrictions (nouns)
@@ -454,8 +463,12 @@ It must have at least $1 characters and be different from your username.',
 # Contributions
 'mycontris' => 'iştırakê mı',
 
+'sp-contributions-newbies'  => 'Tenya iştıraqanê karberanê neweyan bımocne',
+'sp-contributions-username' => 'Adresa IPy ya ki namey karberi:',
+
 # What links here
 'whatlinkshere'       => 'Gırey be pele',
+'whatlinkshere-page'  => 'Pele:',
 'whatlinkshere-links' => '� gırey',
 
 # Block/unblock
@@ -466,31 +479,40 @@ It must have at least $1 characters and be different from your username.',
 Sebebê kılit-biyayışê $1\'i: "$2"o',
 'blocklogpage' => 'Protokolê kıliti',
 
+# Move page
+'1movedto2'  => '[[$1]] berd be [[$2]]',
+'movereason' => 'Sebeb:',
+
 # Thumbnails
 'thumbnail-more' => 'Gırd ke',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'     => 'Pela mına karberi',
-'tooltip-pt-mytalk'       => 'Pela mına werênayışi',
-'tooltip-pt-login'        => 'Seba cıkotışi şıma rê dewato, labelê no zeruri niyo.',
-'tooltip-ca-talk'         => 'Pela tedeesteyan sero werênayış',
-'tooltip-ca-edit'         => 'Tı eşkenay na pele bıvurnê.
+'tooltip-pt-userpage'      => 'Pela şımawa karberi',
+'tooltip-pt-mytalk'        => 'Pela şımawa werênayışi',
+'tooltip-pt-login'         => 'Seba cıkotışi şıma rê dewato, labelê no zeruri niyo.',
+'tooltip-pt-logout'        => 'Veciye',
+'tooltip-ca-talk'          => 'Pela tedeesteyan sero werênayış',
+'tooltip-ca-edit'          => 'Tı eşkenay na pele bıvurnê.
 Kerem ke, qeyd-kerdış ra ver gozega verqayti bıxebıtne.',
-'tooltip-search'          => 'Zerrey {{SITENAME}} de cıgeyre',
-'tooltip-n-mainpage'      => 'Pela Seri bıvêne',
-'tooltip-n-portal'        => 'Heqa projey de, tı çı eşkenay bıkerê, koti çiy vêniyenê',
-'tooltip-n-currentevents' => 'Vurnayışanê peyênan de melumatê pey bıvêne',
-'tooltip-n-recentchanges' => 'Wiki de lista vurnayışanê peyênan.',
-'tooltip-n-randompage'    => 'Kamci pele ke raÅŸt amey bar ke',
-'tooltip-n-help'          => 'Cayê doş-kerdışi.',
-'tooltip-t-whatlinkshere' => 'Lista pelanê wikiya pêroina ke tiya gırê bena',
-'tooltip-t-upload'        => 'Dosya bar ke',
-'tooltip-t-specialpages'  => 'Lista pelanê xasanê pêroinan bımocne',
+'tooltip-search'           => 'Zerrey {{SITENAME}} de cıgeyre',
+'tooltip-search-go'        => 'Ebe nê namey şo yew pele, eke esta',
+'tooltip-search-fulltext'  => 'Seba nê meqaley pelan saye ke',
+'tooltip-n-mainpage'       => 'Pela Seri bıvêne',
+'tooltip-n-portal'         => 'Heqa projey de, tı çı eşkenay bıkerê, koti çiy vêniyenê',
+'tooltip-n-currentevents'  => 'Vurnayışanê peyênan de melumatê pey bıvêne',
+'tooltip-n-recentchanges'  => 'Wiki de lista vurnayışanê peyênan.',
+'tooltip-n-randompage'     => 'Kamci pele ke raÅŸt amey bar ke',
+'tooltip-n-help'           => 'Cayê doş-kerdışi.',
+'tooltip-t-whatlinkshere'  => 'Lista pelanê wikiya pêroina ke tiya gırê bena',
+'tooltip-t-upload'         => 'Dosya bar ke',
+'tooltip-t-specialpages'   => 'Lista pelanê xasanê pêroinan bımocne',
+'tooltip-ca-nstab-main'    => 'Pela tedeesteyan bıvêne',
+'tooltip-ca-nstab-special' => 'Na yew pelê da xususiya, şıma nêşenê nae bıvurnê',
 
 # Attribution
 'lastmodifiedatby' => 'Ena pele tewr peyên roca $2, $1 by $3. de biya rocaniye', # $1 date, $2 time, $3 user
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Cıgeyre',
 
 # Bad image list
@@ -502,9 +524,6 @@ Na rêze de her gırêyo bin zey istisna vêniyeno, yanê pelê ke dosya beno ke
 
 'exif-gaincontrol-0' => 'çino',
 
-# AJAX search
-'articletitles' => "Perri be ''$1'' dest cı kenê",
-
 # Special:FilePath
 'filepath-page' => 'Dosya:',
 
diff --git a/languages/messages/MessagesDsb.php b/languages/messages/MessagesDsb.php
index 0e4cef03..a5e30fa1 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -17,34 +17,29 @@
 
 $fallback = 'de';
 
-$skinNames = array(
-	'standard'    => 'Klasiski',
-	'nostalgia'   => 'Nostalgiski',
-	'cologneblue' => 'Kölnski Módry',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'Mój šat',
-	'chick'       => 'Kurjetko',
-	'simple'      => 'Jadnorje',
-);
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Medija',
-	NS_SPECIAL        => 'Specialne',
-	NS_TALK           => 'Diskusija',
-	NS_USER           => 'Wužywaŕ',
-	NS_USER_TALK      => 'Diskusija_wužywarja',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_diskusija',
-	NS_IMAGE          => 'Wobraz',
-	NS_IMAGE_TALK     => 'Diskusija_wó_wobrazu',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_diskusija',
-	NS_TEMPLATE       => 'Pśedłoga',
-	NS_TEMPLATE_TALK  => 'Diskusija_wó_pśedłoze',
-	NS_HELP           => 'Pomoc',
-	NS_HELP_TALK      => 'Diskusija_wó_pomocy',
-	NS_CATEGORY       => 'Kategorija',
-	NS_CATEGORY_TALK  => 'Diskusija_wó_kategoriji',
+	NS_MEDIA            => 'Medija',
+	NS_SPECIAL          => 'Specialne',
+	NS_TALK             => 'Diskusija',
+	NS_USER             => 'Wužywaŕ',
+	NS_USER_TALK        => 'Diskusija_wužywarja',
+	NS_PROJECT_TALK     => '$1 diskusija',
+	NS_FILE             => 'Dataja',
+	NS_FILE_TALK        => 'Diskusija wó dataji',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskusija',
+	NS_TEMPLATE         => 'Pśedłoga',
+	NS_TEMPLATE_TALK    => 'Diskusija_wó_pśedłoze',
+	NS_HELP             => 'Pomoc',
+	NS_HELP_TALK        => 'Diskusija_wó_pomocy',
+	NS_CATEGORY         => 'Kategorija',
+	NS_CATEGORY_TALK    => 'Diskusija_wó_kategoriji',
+);
+
+$namespaceAliases = array(
+	'Wobraz' => NS_FILE,
+	'Diskusija_wó_wobrazu' => NS_FILE_TALK,
 );
 
 $datePreferences = array(
@@ -62,82 +57,88 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Dwójne_dalejpósrědnjenja' ),
-	'BrokenRedirects'           => array( 'Njefunkcioněrujuce_dalejpósrědnjenja' ),
-	'Disambiguations'           => array( 'Wótkaze_ku_rozjasnjenju_wopśimjeśa' ),
-	'Userlogin'                 => array( 'Pśizjawiś_se' ),
-	'Userlogout'                => array( 'Wótzjawiś_se' ),
+	'DoubleRedirects'           => array( 'Dwójne dalejpósrědnjenja' ),
+	'BrokenRedirects'           => array( 'Njefunkcioněrujuce dalejpósrědnjenja' ),
+	'Disambiguations'           => array( 'Wótkaze ku rozjasnjenju wopśimjeśa' ),
+	'Userlogin'                 => array( 'Pśizjawiś se' ),
+	'Userlogout'                => array( 'Wótzjawiś se' ),
+	'CreateAccount'             => array( 'Wužywarske konto załožyś' ),
 	'Preferences'               => array( 'Nastajenja' ),
 	'Watchlist'                 => array( 'Wobglědowańka' ),
-	'Recentchanges'             => array( 'Slědne_změny' ),
+	'Recentchanges'             => array( 'Slědne změny' ),
 	'Upload'                    => array( 'UploadowaÅ›' ),
-	'Imagelist'                 => array( 'Lisćina_datajow' ),
-	'Newimages'                 => array( 'Nowe_dataje' ),
+	'Listfiles'                 => array( 'Lisćina datajow' ),
+	'Newimages'                 => array( 'Nowe dataje' ),
 	'Listusers'                 => array( 'Wužywarje' ),
+	'Listgrouprights'           => array( 'Kupkowe pšawa' ),
 	'Statistics'                => array( 'Statistika' ),
-	'Randompage'                => array( 'Pśipadny_bok' ),
-	'Lonelypages'               => array( 'Wósyrośone_boki' ),
-	'Uncategorizedpages'        => array( 'Njekategorizěrowane_boki' ),
-	'Uncategorizedcategories'   => array( 'Njekategorizěrowane_kategorije' ),
-	'Uncategorizedimages'       => array( 'Njekategorizěrowane_dataje' ),
-	'Uncategorizedtemplates'    => array( 'Njekategorizěrowane_pśedłogi' ),
-	'Unusedcategories'          => array( 'Njewužywane_kategorije' ),
-	'Unusedimages'              => array( 'Njewužywane_dataje' ),
-	'Wantedpages'               => array( 'Póžedane_boki' ),
-	'Wantedcategories'          => array( 'Póžedane_kategorije' ),
-	'Mostlinked'                => array( 'Boki', 'na_kótarež_wjeźo_nejwěcej_wótkazow' ),
-	'Mostlinkedcategories'      => array( 'Nejwěcej_wužywane_kategorije' ),
-	'Mostlinkedtemplates'       => array( 'Nejwěcej_wužywane_pśedłogi' ),
-	'Mostcategories'            => array( 'Boki_z_nejwěcej_kategorijami' ),
-	'Mostimages'                => array( 'Nejwěcej_wužywane_dataje' ),
-	'Mostrevisions'             => array( 'Nejwěcej_wobźěłane_boki' ),
-	'Fewestrevisions'           => array( 'Nejmjenjej_wobźěłane_boki' ),
-	'Shortpages'                => array( 'Nejkrotše_boki' ),
-	'Longpages'                 => array( 'Nejdlěše_boki' ),
-	'Newpages'                  => array( 'Nowe_boki' ),
-	'Ancientpages'              => array( 'Nejstarše_boki' ),
-	'Deadendpages'              => array( 'Boki', 'kenž_su_slěpe_gasy' ),
-	'Protectedpages'            => array( 'Šćitane_boki' ),
-	'Protectedtitles'           => array( 'Šćitane_title' ),
-	'Allpages'                  => array( 'WÅ¡ykne_boki' ),
-	'Prefixindex'               => array( 'Indeks_prefiksow' ),
-	'Ipblocklist'               => array( 'Blokěrowane_IPje' ),
-	'Specialpages'              => array( 'Specialne_boki' ),
+	'Randompage'                => array( 'Pśipadny bok' ),
+	'Lonelypages'               => array( 'Wósyrośone boki' ),
+	'Uncategorizedpages'        => array( 'Njekategorizěrowane boki' ),
+	'Uncategorizedcategories'   => array( 'Njekategorizěrowane kategorije' ),
+	'Uncategorizedimages'       => array( 'Njekategorizěrowane dataje' ),
+	'Uncategorizedtemplates'    => array( 'Njekategorizěrowane pśedłogi' ),
+	'Unusedcategories'          => array( 'Njewužywane kategorije' ),
+	'Unusedimages'              => array( 'Njewužywane dataje' ),
+	'Wantedpages'               => array( 'Póžedane boki' ),
+	'Wantedcategories'          => array( 'Póžedane kategorije' ),
+	'Mostlinked'                => array( 'Boki na kótarež wjeźo nejwěcej wótkazow' ),
+	'Mostlinkedcategories'      => array( 'Nejwěcej wužywane kategorije' ),
+	'Mostlinkedtemplates'       => array( 'Nejwěcej wužywane pśedłogi' ),
+	'Mostcategories'            => array( 'Boki z nejwěcej kategorijami' ),
+	'Mostimages'                => array( 'Nejwěcej wužywane dataje' ),
+	'Mostrevisions'             => array( 'Nejwěcej wobźěłane boki' ),
+	'Fewestrevisions'           => array( 'Nejmjenjej wobźěłane boki' ),
+	'Shortpages'                => array( 'Nejkrotše boki' ),
+	'Longpages'                 => array( 'Nejdlěše boki' ),
+	'Newpages'                  => array( 'Nowe boki' ),
+	'Ancientpages'              => array( 'Nejstarše boki' ),
+	'Deadendpages'              => array( 'Boki kenž su slěpe gasy' ),
+	'Protectedpages'            => array( 'Šćitane boki' ),
+	'Protectedtitles'           => array( 'Šćitane title' ),
+	'Allpages'                  => array( 'WÅ¡ykne boki' ),
+	'Prefixindex'               => array( 'Indeks prefiksow' ),
+	'Ipblocklist'               => array( 'Blokěrowane IPje' ),
+	'Specialpages'              => array( 'Specialne boki' ),
 	'Contributions'             => array( 'Pśinoski' ),
 	'Emailuser'                 => array( 'E-mail' ),
-	'Confirmemail'              => array( 'E-mail_wobkšuśiś' ),
-	'Whatlinkshere'             => array( 'Lisćina_wótkazow' ),
-	'Recentchangeslinked'       => array( 'Změny_na_zalinkowanych_bokach' ),
+	'Confirmemail'              => array( 'E-mail wobkšuśiś' ),
+	'Whatlinkshere'             => array( 'Lisćina wótkazow' ),
+	'Recentchangeslinked'       => array( 'Změny na zalinkowanych bokach' ),
 	'Movepage'                  => array( 'Pśesunuś' ),
 	'Blockme'                   => array( 'Proksy-blokěrowanje' ),
-	'Booksources'               => array( 'Pytaś_pó_ISBN' ),
+	'Booksources'               => array( 'Pytaś pó ISBN' ),
 	'Categories'                => array( 'Kategorije' ),
 	'Export'                    => array( 'Eksportěrowaś' ),
 	'Version'                   => array( 'Wersija' ),
-	'Allmessages'               => array( 'Systemowe_powěsći' ),
+	'Allmessages'               => array( 'Systemowe powěsći' ),
 	'Log'                       => array( 'Protokole' ),
 	'Blockip'                   => array( 'Blokěrowaś' ),
 	'Undelete'                  => array( 'Nawrośiś' ),
 	'Import'                    => array( 'Importěrowaś' ),
-	'Lockdb'                    => array( 'Datowu_banku_blokěrowaś' ),
-	'Unlockdb'                  => array( 'Datowu_banku_zasej_spśistupniś' ),
-	'Userrights'                => array( 'Pšawa_wužywarjow' ),
-	'MIMEsearch'                => array( 'Pytaś_pó_MIME-typje' ),
-	'Unwatchedpages'            => array( 'Boki', 'kenž_njejsu_we_wobglědowańkach' ),
+	'Lockdb'                    => array( 'Datowu banku blokěrowaś' ),
+	'Unlockdb'                  => array( 'Datowu banku zasej spśistupniś' ),
+	'Userrights'                => array( 'Pšawa wužywarjow' ),
+	'MIMEsearch'                => array( 'Pytaś pó MIME-typje' ),
+	'FileDuplicateSearch'       => array( 'Pytanje datajowych duplikatow' ),
+	'Unwatchedpages'            => array( 'Boki kenž njejsu we wobglědowańkach' ),
 	'Listredirects'             => array( 'Pśesměrowanja' ),
-	'Revisiondelete'            => array( 'Wulašowanje_wersijow' ),
-	'Unusedtemplates'           => array( 'Njewužywane_pśedłogi' ),
-	'Randomredirect'            => array( 'Pśipadne_pśesměrowanje' ),
-	'Mypage'                    => array( 'Mój_bok' ),
-	'Mytalk'                    => array( 'Mója_diskusija' ),
-	'Mycontributions'           => array( 'Móje_pśinoski' ),
+	'Revisiondelete'            => array( 'Wulašowanje wersijow' ),
+	'Unusedtemplates'           => array( 'Njewužywane pśedłogi' ),
+	'Randomredirect'            => array( 'Pśipadne pśesměrowanje' ),
+	'Mypage'                    => array( 'Mój bok' ),
+	'Mytalk'                    => array( 'Mója diskusija' ),
+	'Mycontributions'           => array( 'Móje pśinoski' ),
 	'Listadmins'                => array( 'Administratory' ),
 	'Listbots'                  => array( 'Boty' ),
-	'Popularpages'              => array( 'Woblubowane_boki' ),
+	'Popularpages'              => array( 'Woblubowane boki' ),
 	'Search'                    => array( 'PytaÅ›' ),
-	'Resetpass'                 => array( 'Šćitne_gronidło_slědk_stajiś' ),
-	'Withoutinterwiki'          => array( 'Interwikije_feluju' ),
-	'MergeHistory'              => array( 'Stawizny_wersijow_zjadnośiś' ),
+	'Resetpass'                 => array( 'Šćitne gronidło slědk stajiś' ),
+	'Withoutinterwiki'          => array( 'Interwikije feluju' ),
+	'MergeHistory'              => array( 'Stawizny wersijow zjadnośiś' ),
+	'Filepath'                  => array( 'Datajowa sćažka' ),
+	'Invalidateemail'           => array( 'E-mail njewobkšuśis' ),
+	'Blankpage'                 => array( 'Prozny bok' ),
 );
 
 $messages = array(
@@ -178,17 +179,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Móje změny na wobglědowańskej lisćinje schowaś',
 'tog-watchlisthidebots'       => 'Změny awtomatiskich programow (botow) na wobglědowańskej lisćinje schowaś',
 'tog-watchlisthideminor'      => 'Małe změny na wobglědowańskej lisćinje schowaś',
+'tog-watchlisthideliu'        => 'Změny pśizjawjonych wužywarjow z wobglědowańki schowaś',
+'tog-watchlisthideanons'      => 'Změny anonymnych wužywarjow z wobglědowańki schowaś',
 'tog-nolangconversion'        => 'Konwertěrowanje rěcnych wariantow znjemóžniś',
 'tog-ccmeonemails'            => 'Kopije e-mailow dostaś, kótarež drugim wužywarjam pósćelom',
 'tog-diffonly'                => 'Pśi pśirownowanju wersijow jano rozdźěle pokazaś',
 'tog-showhiddencats'          => 'Schowane kategorije pokazaÅ›',
+'tog-norollbackdiff'          => 'Rozdźěl pó slědkstajenju zanjechaś',
 
 'underline-always'  => 'pśecej',
 'underline-never'   => 'žednje',
 'underline-default' => 'pó standarźe browsera',
 
-'skinpreview' => '(Pśeglěd)',
-
 # Dates
 'sunday'        => 'Njeźela',
 'monday'        => 'Pónjeźele',
@@ -282,7 +284,7 @@ $messages = array(
 'mytalk'         => 'mója diskusija',
 'anontalk'       => 'Diskusija z toÅ› teju IP',
 'navigation'     => 'Nawigacija',
-'and'            => 'a',
+'and'            => '&#32;a',
 
 # Metadata in edit box
 'metadata_help' => 'Metadaty:',
@@ -319,14 +321,14 @@ $messages = array(
 'talkpagelinktext'  => 'diskusija',
 'specialpage'       => 'Specialny bok',
 'personaltools'     => 'Wósobinske pomocne srědki',
-'postcomment'       => 'Komentar pśidaś',
+'postcomment'       => 'Nowy wótrězk',
 'articlepage'       => 'Nastawk',
 'talk'              => 'Diskusija',
 'views'             => 'Naglědy',
 'toolbox'           => 'Pomocne srědki',
 'userpage'          => 'Wužywarski bok pokazaś',
 'projectpage'       => 'Projektowy bok pokazaÅ›',
-'imagepage'         => 'Bok medijowych datajow pokazaÅ›',
+'imagepage'         => 'Datajowy bok se woglědaś',
 'mediawikipage'     => 'Nastawk pokazaÅ›',
 'templatepage'      => 'Pśedłogu pokazaś',
 'viewhelppage'      => 'Pomocny bok pokazaÅ›',
@@ -345,8 +347,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Wó {{GRAMMAR:lokatiw|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Wó_{{GRAMMAR:lokatiw|{{SITENAME}}}}',
-'bugreports'           => 'Raporty wó zmólkach',
-'bugreportspage'       => 'Project:Raporty wó zmólkach',
 'copyright'            => 'Wopśimjeśe stoj pód $1.',
 'copyrightpagename'    => '{{SITENAME}} stwóriśelske pšawo',
 'copyrightpage'        => '{{ns:project}}:Stwóriśelske pšawo',
@@ -369,9 +369,7 @@ $messages = array(
 
 'badaccess'        => 'Njamaš trěbnu dowólnosć.',
 'badaccess-group0' => 'Njamaš trěbnu dowólnosć za toś tu akciju.',
-'badaccess-group1' => 'Jano wužywarje kupki $1 maju pšawo toś tu akciju wuwjasć.',
-'badaccess-group2' => 'Jano wužywarje kupkow(u) $1 maju pšawo toś tu akciju wuwjasć.',
-'badaccess-groups' => 'Jano wužywarje kupkow(u) $1 maju pšawo toś tu akciju wuwjasć.',
+'badaccess-groups' => 'Akcija, kótaruž sy póžedał, wogranicujo se na wužywarjow w {{PLURAL:$2|kupce|jadnej z kupkow}}: $1.',
 
 'versionrequired'     => 'Wersija $1 softwary MediaWiki trěbna',
 'versionrequiredtext' => 'Wersija $1 softwary MediaWiki jo trěbna, aby toś ten bok se mógał wužywaś. Glědaj [[Special:Version|Wersijowy bok]]',
@@ -385,6 +383,8 @@ $messages = array(
 'editsection'             => 'wobźěłaś',
 'editold'                 => 'wobźěłaś',
 'viewsourceold'           => 'glědaś žrědło',
+'editlink'                => 'wobźěłaś',
+'viewsourcelink'          => 'Žrědło zwobrazniś',
 'editsectionhint'         => 'Wótrězk wobźěłaś: $1',
 'toc'                     => 'Wopśimjeśe',
 'showtoc'                 => 'pokazaÅ›',
@@ -399,13 +399,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Feed',
 'page-rss-feed'           => '"$1" RSS Feed',
 'page-atom-feed'          => '"$1" Atom Feed',
-'red-link-title'          => '$1 (dotychměst njenapórany)',
+'red-link-title'          => '$1 (bok njeeksistěrujo)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Nastawk',
 'nstab-user'      => 'Wužywarski bok',
 'nstab-media'     => 'Medije',
-'nstab-special'   => 'specialny bok',
+'nstab-special'   => 'Specialny bok',
 'nstab-project'   => 'Projektowy bok',
 'nstab-image'     => 'Dataja',
 'nstab-mediawiki' => 'Powěźeńka',
@@ -415,7 +415,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'ToÅ› tu akciju njedajo',
-'nosuchactiontext'  => 'Akcija, kótaruž URL pódajo, se wót wikija njepódpěrujo.',
+'nosuchactiontext'  => 'Akcija, kótaruž URL pódawa, jo njepłaśiwa.
+Sy se snaź zapisał pśi zapódaśu URL abo sy slědował wopacnemu wótkazoju.
+To by mógło teke programěrowańska zmólka w {{GRAMMAR:lokatiw|{{SITENAME}}}} byś.',
 'nosuchspecialpage' => 'Toś ten specialny bok njeeksistěrujo',
 'nospecialpagetext' => "<big>'''Toś ten specialny bok w toś tom wikiju njeeksistěrujo'''</big>
 
@@ -463,7 +465,6 @@ Pšosym daj to a pśisłušny URL [[Special:ListUsers/sysop|administratoroju]] k
 'cannotdelete'         => 'Njejo móžno wuzwólony bok abo dataju wulašowaś. Snaź jo to južo něchten drugi cynił.',
 'badtitle'             => 'Njepłaśecy nadpis',
 'badtitletext'         => 'Nadpis pominanego boka jo był njepłaśecy, prozny abo njekorektny nadpis, póchadajucy z mjazyrěcnego abo interwikijowego wótkaza. Snaź wopśimjejo jadno abo wěcej znamuškow, kótarež njejsu w nadpisach dowólone.',
-'perfdisabled'         => "'''Wódaj!''' Toś ta funkcija jo wochylu znjemóžnjona, dokulaž su serwery datoweje banki pśeliš wobśěžowane.",
 'perfcached'           => 'Toś te daty póchadaju z pufrowaka a mógu toś njeaktualne byś.',
 'perfcachedts'         => 'Toś te daty póchadaju z pufrowaka, slědna aktualizacija: $1',
 'querypage-no-updates' => 'Aktualizěrowanje toś togo boka jo se znjemóžniło. Daty how se nejžpjerwjej raz njeaktualizěruju.',
@@ -477,7 +478,7 @@ Wótpšašanje: $2',
 'protectedpagetext'    => 'Wobźěłanje toś togo boka jo se znjemóžniło.',
 'viewsourcetext'       => 'Žrědłowy tekst togo boka móžoš se woglědaś a kopěrowaś:',
 'protectedinterface'   => 'Toś ten bok wopśimujo tekst za rěcny zwjerch softwary. Jogo wobźěłowanje jo se znjemóžniło, aby se znjewužywanjeju zadorało.',
-'editinginterface'     => "'''Warnowanje:''' Wobźěłujoš bok, kótaryž se wužywa, aby se tekst za pówjerch software MediaWiki k dispoziciji stajił. Změny na toś tom boku buźo wuglědanje wužywarskego pówjercha za drugich wužywarjow wobwliwowaś. Wužywaj pšosym za pśełožki [http://translatewiki.net/wiki/Main_Page?setlang=dsb Betawiki], projekt MediaWiki za lokalizacije.",
+'editinginterface'     => "'''Warnowanje:''' Wobźěłujoš bok, kótaryž se wužywa, aby se tekst za pówjerch software MediaWiki k dispoziciji stajił. Změny na toś tom boku buźo wuglědanje wužywarskego pówjercha za drugich wužywarjow wobwliwowaś. Wužywaj pšosym za pśełožki [http://translatewiki.net/wiki/Main_Page?setlang=dsb translatewiki.net], projekt MediaWiki za lokalizacije.",
 'sqlhidden'            => '(Wótpšašanje SQL schowane)',
 'cascadeprotected'     => 'Za toś ten bok jo se wobźěłowanje znjemóžniło, dokulaž jo zawězany do {{PLURAL:$1|slědujucego boka|slědujuceju bokowu|slědujucych bokow}}, {{PLURAL:$1|kótaryž jo|kótarejž stej|kótarež su}} pśez kaskadowu opciju {{PLURAL:$1|šćitany|šćitanej|šćitane}}: $2',
 'namespaceprotected'   => "Njejsy wopšawnjony, boki w rumje: '''$1''' wobźěłaś.",
@@ -486,15 +487,15 @@ Wótpšašanje: $2',
 'titleprotected'       => "Bok z toś tym mjenim bu wót [[User:$1|$1]] pśeśiwo napóranjeju šćitany. Pśicyna jo ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Å patna konfiguracija: njeznaty wirusowy scanner: <i>$1</i>',
+'virus-badscanner'     => "Å patna konfiguracija: njeznaty wirusowy scanner: ''$1''",
 'virus-scanfailed'     => 'Scannowanje jo se njeraźiło (kod $1)',
 'virus-unknownscanner' => 'njeznaty antiwirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Wužywarja wótzjawiś',
-'logouttext'                 => '<strong>Sy se něnto wótzjawił.</strong>
+'logouttext'                 => "'''Sy se něnto wótzjawił.'''
 Móžoš {{SITENAME}} anomymnje dalej wužywaś abo móžoš [[Special:UserLogin|se znowego pśizjawiś]] ako samski abo hynakšy wužywaŕ.
-Źiwaj na to, až někotare boki se dalej tak zwobraznjuju ako by hyšći pśizjawjeny był, až njewuproznijoš cache swójego wobglědowaka.',
+Źiwaj na to, až někotare boki se dalej tak zwobraznjuju ako by hyšći pśizjawjeny był, až njewuproznijoš cache swójego wobglědowaka.",
 'welcomecreation'            => '== Witaj, $1! ==
 
 Twójo konto jo se załožyło. Njezabydni změniś swóje [[Special:Preferences|nastajenja {{SITENAME}}]].',
@@ -505,7 +506,6 @@ Twójo konto jo se załožyło. Njezabydni změniś swóje [[Special:Preferences
 'remembermypassword'         => 'Šćitne gronidło na toś tom computerje składowaś',
 'yourdomainname'             => 'Twója domejna',
 'externaldberror'            => 'Abo jo wustupiła eksterna zmólka awtentifikacije datoweje banki, abo njesmějoš swójo eksterne wužywarske konto aktualizěrowaś.',
-'loginproblem'               => "'''Problem z pśizjawjenim.'''<br />Pšosym hyšći raz wopytaś !",
 'login'                      => 'Pśizjawiś se',
 'nav-login-createaccount'    => 'Pśizjawiś se',
 'loginprompt'                => 'Za pśizjawjenje do boka {{SITENAME}} muse se cookije dopušćiś.',
@@ -530,7 +530,7 @@ Twójo konto jo se załožyło. Njezabydni změniś swóje [[Special:Preferences
 'yourvariant'                => 'Warianta:',
 'yournick'                   => 'Pódpismo:',
 'badsig'                     => 'Signatura njejo dobra; pšosym HTML pśekontrolěrowaś.',
-'badsiglength'               => 'Pódpismo jo pśedłujko. Musy mjenjej ako $1 {{PLURAL:$1|pismik|pismikowu|pismiki|pismikow}} měś.',
+'badsiglength'               => 'Twója signatura jo pśedłujka. Musy mjenjej ako $1 {{PLURAL:$1|znamješko|znamješce|znamješka|znamješkow}} měś.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Realne mě jo opcionalne. Jolic až jo zapódajośo wužywa se za pódpisanje wašych pśinoskow.',
 'loginerror'                 => 'Zmólka pśi pśizjawjenju',
@@ -541,7 +541,8 @@ Twójo konto jo se załožyło. Njezabydni změniś swóje [[Special:Preferences
 'noname'                     => 'Njejsy žedno płaśece wužywarske mě zapódał.',
 'loginsuccesstitle'          => 'Pśizjawjenje wuspěšne',
 'loginsuccess'               => "'''Sy něnto ako „$1� w {{GRAMMAR:lokatiw|{{SITENAME}}}} pśizjawjony.'''",
-'nosuchuser'                 => 'Wužywarske mě „$1“ njeeksistěrujo. Pśeglěduj pšawopis abo [[Special:UserLogin/signup|załož nowe konto]].',
+'nosuchuser'                 => 'Wužywaŕ z mjenim „$1“ njeeksistěrujo. Wužywarske mjenja źiwaju na wjelikopisanje.
+Pśeglěduj pšawopis abo [[Special:UserLogin/signup|załož nowe konto]].',
 'nosuchusershort'            => 'Wužywarske mě „<nowiki>$1</nowiki>“ njeeksistěrujo. Pśeglěduj pšawopis.',
 'nouserspecified'            => 'Pšosym pódaj wužywarske mě.',
 'wrongpassword'              => 'Zapódane šćitne gronidło njejo pšawe. Pšosym wopytaj hyšći raz.',
@@ -549,10 +550,10 @@ Twójo konto jo se załožyło. Njezabydni změniś swóje [[Special:Preferences
 'passwordtooshort'           => 'Twójo gronidło jo njepłaśiwe abo pśeliš krotke. Wóno dej nanejmjenjej {{PLURAL:$|1 pismik|$1 pismika|$1 pismiki|$1 pismikow}} měś a njesmějo se z wužywarskim mjenim makaś.',
 'mailmypassword'             => 'Nowe gronidło pśipósłaś',
 'passwordremindertitle'      => 'Nowe nachylne pótajmne słowo za {{SITENAME}}',
-'passwordremindertext'       => 'Něchten z adresu $1 (nejskerjej ty) jo se wupšosył nowe gronidło za {{SITENAME}} ($4).
-Nachylne gronidło za wužywarja "$2" jo se napórało a jo něnto "$3". Jolic jo to twój wótglěd było, musyš se něnto pśijawiś a wubraś nowe gronidło.
+'passwordremindertext'       => 'Něchten z IP-adresu $1 (nejskerjej ty) jo se wupšosył nowe gronidło za {{SITENAME}} ($4).
+Nachylne gronidło za wužywarja "$2" jo se napórało a jo něnto "$3". Jolic jo to twój wótglěd było, musyš se něnto pśijawiś a wubraś nowe gronidło. 
 
-Jolic jo něchten drugi wó nowe šćitne gronidło pšosył abo ty sy se zasej na swójo gronidło dopomnjeł  a njocoš wěcej jo změniś, móžoš toś tu powěsć ignorěrowaś a swójo stare gronidło dalej wužywaś.',
+Jolic jo něchten drugi wó nowe šćitne gronidło pšosył abo ty sy se zasej dopomnjeł na swójo gronidło  a njocoš wěcej jo změniś, móžoš toś tu powěsć ignorěrowaś a swójo stare gronidło dalej wužywaś.',
 'noemail'                    => 'Wužywaŕ „$1“ njejo e-mailowu adresu zapódał.',
 'passwordsent'               => 'Nowe šćitne gronidło jo se wótpósłało na e-mailowu adresu wužywarja „$1“.
 Pšosym pśizjaw se zasej, gaž jo dostanjoš.',
@@ -562,10 +563,11 @@ Pšosym pśizjaw se zasej, gaž jo dostanjoš.',
 Nježli až wótpósćelo se dalšna e-mail na to wužywarske konto, dejš slědowaś instrukcije w powěsći a tak wobkšuśiś, až konto jo wót wěrnosći twójo.',
 'throttled-mailpassword'     => 'W běgu {{PLURAL:$1|slědneje $1 góźiny|slědnjeju $1 góźinowu|slědnych $1 góźinow}} jo se južo raz wó nowe šćitne gronidło pšosyło. Aby se znjewužywanje wobinuło, wótpósćelo se jano jadno šćitne gronidło w běgu {{PLURAL:$1|$1 góźiny|$1 góźinowu|$1 góźinow}}.',
 'mailerror'                  => 'Zmólka pśi wótpósłanju e-maila: $1',
-'acct_creation_throttle_hit' => 'Wódaj, ty sy južo wutwórił {{PLURAL:$1|$1 wužywarske konto|$1 wužiwarskej konśe|$1 wužywarske konta}}. Wěcej njejo móžno.',
-'emailauthenticated'         => 'Twója e-mailowa adresa jo wobkšuśona: $1.',
+'acct_creation_throttle_hit' => 'Woglědowarje toś togo wikija, kótarež wužywaju twóju IP-adresu su napórali {{PLURAL:$1|1 konto|$1 konśe|$1 konta|$1 kontow}} slědny źeń. To jo maksimalna dowólona licba za toś tu periodu.
+Woglědowarje, kótarež wužywaju toś tu IP-adresu njamógu tuchylu dalšne konta napóraś.',
+'emailauthenticated'         => 'Twója e-mailowa adresa jo se $2 $3 goź. wobkšuśiła.',
 'emailnotauthenticated'      => 'Twója e-mailowa adresa njejo hyšći wobkšuśona. E-mailowe funkcije móžoš aklej pó wuspěšnem wobkšuśenju wužywaś.',
-'noemailprefs'               => 'Zapódaj e-mailowu adresu, aby toś te funkcije aktiwizěrował.',
+'noemailprefs'               => 'Zapódaj e-mailowu adresu w swójich nastajenjach, aby toś te funkcije stali k dispoziciji.',
 'emailconfirmlink'           => 'Wobkšuś swóju e-mailowu adresu.',
 'invalidemailaddress'        => 'Toś ta e-mailowa adresa njamóžo se akceptěrowaś, dokulaž zda se, až jo njepłaśiwy format. Pšošym zapódaj adresu w korektnem formaśe abo wuprozń to pólo.',
 'accountcreated'             => 'Wužywarske konto jo se wutwóriło.',
@@ -574,18 +576,26 @@ Nježli až wótpósćelo se dalšna e-mail na to wužywarske konto, dejš slěd
 'createaccount-text'         => 'Něchten jo konto za twóje e-mailowu adresu na {{GRAMMAR:lokatiw|{{SITENAME}}}} ($4) z mjenim "$2", z pótajmnym słowom "$3", wutwórił. Dejš se pśizjawiś a swóje pótajmne słowo něnt změniś.
 
 Móžoš toś te zdźělenje ignorowaś, jolic toś te konto jo se jano zamólnje wutwóriło.',
+'login-throttled'            => 'Sy pśecesto wopytał gronidło konta zapódaś. Pócakaj pšosym, nježli až wopytajoš znowego.',
 'loginlanguagelabel'         => 'Rěc: $1',
 
 # Password reset dialog
-'resetpass'               => 'Šćitne gronidło za konta nastajiś.',
-'resetpass_announce'      => 'Sy z nachylnym e-mailowym šćitnym gronidłom pśizjawjony. Aby pśizjawjenje zakóńcył, zapódaj how nowe šćitne gronidło:',
-'resetpass_text'          => '<!-- Dodaj how tekst -->',
-'resetpass_header'        => 'Kontowe gronidło změniś',
-'resetpass_submit'        => 'Šćitne gronidło nastajiś a se pśizjawiś',
-'resetpass_success'       => 'Twójo nowe šćitne gronidło jo nastajone. Něnto se pśizjaw …',
-'resetpass_bad_temporary' => 'Nachylne e-mailowe šćitne gronidło njejo korektne. Sy swójo šćitne gronidło južo pśeměnił(a) abo wó nowe nachylne gronidło pšošył(a).',
-'resetpass_forbidden'     => 'Gronidła njedaju se změniś',
-'resetpass_missing'       => 'Prozny formular.',
+'resetpass'                 => 'Gronidło změniś',
+'resetpass_announce'        => 'Sy z nachylnym e-mailowym šćitnym gronidłom pśizjawjony. Aby pśizjawjenje zakóńcył, zapódaj how nowe šćitne gronidło:',
+'resetpass_text'            => '<!-- Dodaj how tekst -->',
+'resetpass_header'          => 'Kontowe gronidło změniś',
+'oldpassword'               => 'Stare šćitne gronidło:',
+'newpassword'               => 'Nowe šćitne gronidło:',
+'retypenew'                 => 'Nowe šćitne gronidło (hyšći raz):',
+'resetpass_submit'          => 'Šćitne gronidło nastajiś a se pśizjawiś',
+'resetpass_success'         => 'Twójo nowe šćitne gronidło jo nastajone. Něnto se pśizjaw …',
+'resetpass_bad_temporary'   => 'Nachylne e-mailowe šćitne gronidło njejo korektne. Sy swójo šćitne gronidło južo pśeměnił(a) abo wó nowe nachylne gronidło pšošył(a).',
+'resetpass_forbidden'       => 'Gronidła njedaju se změniś',
+'resetpass-no-info'         => 'Dejš pśizjawjony byś, aby direktny pśistup na toś ten bok měł.',
+'resetpass-submit-loggedin' => 'Gronidło změniś',
+'resetpass-wrong-oldpass'   => 'Njepłaśiwe nachylne abo aktualne gronidło.
+Sy snaź swójo gronidło južo wuspěšnje změnił abo nowe nachylne gronidło pominał.',
+'resetpass-temp-password'   => 'Nachylne gronidło:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tucny tekst',
@@ -610,8 +620,8 @@ Móžoš toś te zdźělenje ignorowaś, jolic toś te konto jo se jano zamólnj
 'hr_tip'          => 'Horicontalna linija (rědko wužywaś)',
 
 # Edit pages
-'summary'                          => 'Zespominanje',
-'subject'                          => 'Tema/Nadpismo',
+'summary'                          => 'Zespominanje:',
+'subject'                          => 'Tema/Nadpismo:',
 'minoredit'                        => 'Snadna změna',
 'watchthis'                        => 'Toś ten bok wobglědowaś',
 'savearticle'                      => 'Bok składowaś',
@@ -623,8 +633,8 @@ Móžoš toś te zdźělenje ignorowaś, jolic toś te konto jo se jano zamólnj
 'missingsummary'                   => "'''Pokazka:''' Njejsy žedno zespominanje zapódał. Gaž kliknjoš na \"Składowaś\" składujo se bok bźez zespominanja.",
 'missingcommenttext'               => 'Pšosym zespominanje zapódaś.',
 'missingcommentheader'             => "'''WARNOWANJE:''' Njejsy žedno nadpismo zapódał. Gaž kliknjoš na \"Składowaś\", składujo se twójo wobźěłanje mimo nadpisma.",
-'summary-preview'                  => 'Pśeglěd zespominanja',
-'subject-preview'                  => 'Pśeglěd nadpisma',
+'summary-preview'                  => 'Pśeglěd zespominanja:',
+'subject-preview'                  => 'Pśeglěd nadpisma:',
 'blockedtitle'                     => 'Wužywaŕ jo se blokěrował',
 'blockedtext'                      => "<big>'''Twójo wužywarske mě abo IP-adresa stej se blokěrowałej.'''</big>
 
@@ -673,29 +683,29 @@ Zapśimjejśo pšosym wše górjejce pomjenjowane drobnosći do wšych napšašo
 Aby bok wutwórił, ga napiš do kašćika spózy.
 (Dokradnjejše informacije pód: [[{{MediaWiki:Helppage}}|help page]]).',
 'anontalkpagetext'                 => "---- ''Toś jo diskusijny bok za anonymnego wužywarja, kótaryž njejo dotychměst žedno wužywarske konto załožył abo swójo konto njewužywa. Togodla dejmy numerisku IP-adresu wužywaś, aby jogo/ju identificěrowali. Taka IP-adresa dajo se wót wšakich wužywarjow wužywaś. Jolic sy anonymny wužywaŕ a se mysliš, až su se njerelewantne komentary na tebje měrili, [[Special:UserLogin/signup|załož konto]] abo [[Special:UserLogin|pśizjaw se]], aby se w pśichoźe zmuśenje z drugimi anonymnymi wužywarjami wobinuł.''",
-'noarticletext'                    => 'Dotychměst njewopśimjejo toś ten bok hyšći žeden tekst. Móžoš w drugich bokach [[Special:Search/{{PAGENAME}}|za napismom togo boka pytaś]] abo [{{fullurl:{{FULLPAGENAME}}|action=edit}} toś ten bok wobźěłaś].',
+'noarticletext'                    => 'Dotychměst toś ten bok hyšći njewopśimujo žeden tekst. Móžoš w drugich bokach [[Special:Search/{{PAGENAME}}|titel togo boka pytaś]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} wótpowědne protokole pytaś] abo [{{fullurl:{{FULLPAGENAME}}|action=edit}} toś ten bok wobźěłaś]</span>.',
 'userpage-userdoesnotexist'        => 'Wužywarske konto "$1" njejo zregistrěrowane. Pšosym pśeglědaj, lěc coš toś ten bok wopšawdu napóraś/wobźěłaś.',
 'clearyourcache'                   => "'''Pokazka: Jo móžno, až dejš wuprozniś cache wobglědowaka, aby změny wiźeł.'''
 '''Mozilla/Firefox/Safari:''' Źarź ''Umsch'' tłocony, mjaztym až kliknjoš ''Znowego'' abo tłoc pak ''Strg-F5'' pak ''Strg-R'' (''Command-R'' na Makintošu); '''Konqueror: '''Klikni ''' na ''Aktualisieren'' abo tłoc ''F5;'' '''Opera:''' wuprozni cache w ''Extras -> Eisntellungen;'' '''Internet Explorer:''' źarź ''Strg'' tłocony, mjaztym až kliknjoš na ''Aktualisieren'' abo tłoc ''Strg-F5.''",
-'usercssjsyoucanpreview'           => '<strong>Pokazka:</strong> Wužywaj tłocydło "Pśeglěd", aby swój nowy css/js testował, nježli až jen składujoš.',
+'usercssjsyoucanpreview'           => "'''Pokazka:''' Wužywaj tłocydło \"Pśeglěd\", aby swój nowy css/js testował, nježli až jen składujoš.",
 'usercsspreview'                   => "'''Źiwaj na to, až wobglědujoš se jano pśeglěd swójogo wužywarskego CSS. Njejo se hyšći składował!'''",
 'userjspreview'                    => "== Pśeglěd Wašogo wužywarskego JavaScripta ==
 '''Glědaj:''' Pó składowanju musyš swójomu browseroju kazaś, aby nowu wersiju pokazał: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userinvalidcssjstitle'            => "'''Warnowanje:''' Njeeksistěrujo šat „$1“. Pšosym mysli na to, až wužywaju .css- a .js-boki mały pismik, na pś. ''{{ns:user}}:Pśikładowa/monobook.css'' město ''{{ns:user}}:Pśikładowa/Monobook.css''.",
 'updated'                          => '(Zaktualizěrowane)',
-'note'                             => '<strong>Pokazka:</strong>',
-'previewnote'                      => '<strong>To jo jano pśeglěd, bok njejo hyšći składowany!</strong>',
+'note'                             => "'''Pokazka:'''",
+'previewnote'                      => "'''To jo jano pśeglěd, bok njejo hyšći składowany!'''",
 'previewconflict'                  => 'Toś ten pśeglěd wótbłyšćujo tekst górjejcnego póla. Bok buźo tak wuglědaś, jolic jen něnto składujoš.',
-'session_fail_preview'             => '<strong>Wódaj! Twójo wobźěłanje njejo se mógało składowaś, dokulaž su daty twójogo pósejźenja se zgubili. Pšosym wopytaj hyšći raz. Jolic až to pón pśecej hyšći njejźo, wopytaj se wótzjawiś a zasej pśizjawiś.</strong>',
-'session_fail_preview_html'        => "<strong>Wódaj! Twójo wobźěłanje njejo se mógało składowaś, dokulaž su daty twójogo pósejźenja se zgubili.</strong>
+'session_fail_preview'             => "'''Wódaj! Twójo wobźěłanje njejo se mógało składowaś, dokulaž su daty twójogo pósejźenja se zgubili. Pšosym wopytaj hyšći raz. Jolic až to pón pśecej hyšći njejźo, wopytaj se wótzjawiś a zasej pśizjawiś.'''",
+'session_fail_preview_html'        => "'''Wódaj! Twójo wobźěłanje njejo se mógało składowaś, dokulaž su daty twójogo pósejźenja se zgubili.'''
 
 ''Dokulaž {{SITENAME}} ma cysty html aktiwizěrowany, jo pśeglěd se zacynił - ako šćit pśeśiwo JavaScriptowym atakam.''
 
-<strong>Jo-lic to legitiměrowane wobźěłanje, wopytaj hyšći raz. Gaž to zasej njejźo, wopytaj se wót- a zasej pśizjawiś.</strong>",
-'token_suffix_mismatch'            => '<strong>Twójo wobźěłanje jo se wótpokazało, dokulaž jo twój browser znamuška we wobźěłańskem tokenje rozsekał. Składowanje by mógało wopśimjeśe boka znicyś. Take casy se źejo, gaž wužywaš web-bazěrowanu, zmólkatu, anonymnu proksy-słužbu.</strong>',
+'''Jo-lic to legitiměrowane wobźěłanje, wopytaj hyšći raz. Gaž to zasej njejźo, wopytaj se wót- a zasej pśizjawiś.'''",
+'token_suffix_mismatch'            => "'''Twójo wobźěłanje jo se wótpokazało, dokulaž jo twój browser znamuška we wobźěłańskem tokenje rozsekał. Składowanje by mógało wopśimjeśe boka znicyś. Take casy se źejo, gaž wužywaš web-bazěrowanu, zmólkatu, anonymnu proksy-słužbu.'''",
 'editing'                          => 'Wobźěłanje boka $1',
 'editingsection'                   => 'Wobźěłanje boka $1 (wótrězk)',
-'editingcomment'                   => 'Wobźěłanje boka $1 (komentar)',
+'editingcomment'                   => '$1 (nowy wótrězk) se wobźěłujo',
 'editconflict'                     => 'Wobźěłański konflikt: $1',
 'explainconflict'                  => "Něchten drugi jo bok změnił, pó tym, až sy zachopił jen wobźěłaś.
 Górjejcne tekstowe pólo wopśimjejo tekst boka, ako tuchylu eksistěrujo.
@@ -704,22 +714,24 @@ Pšosym zapódaj twóje změny do górjejcnego tekstowego póla.
 '''Jano''' wopśimjeśe górjejcnego tekstowego póla se składujo, gaž tłocyš na \"składowaś\".",
 'yourtext'                         => 'Twój tekst',
 'storedversion'                    => 'Składowana wersija',
-'nonunicodebrowser'                => '<strong>Glědaj:</strong> Twój browser njamóžo unicodowe znamuška pšawje pśeźěłaś. Pšosym wužywaj hynakšy browser.',
-'editingold'                       => '<strong>Glědaj: Wobźěłajoš staru wersiju toś togo boka. Gaž składujoš, zgubiju se wšykne nowše wersije.</strong>',
+'nonunicodebrowser'                => "'''Glědaj:''' Twój browser njamóžo unicodowe znamuška pšawje pśeźěłaś. Pšosym wužywaj hynakšy browser.",
+'editingold'                       => "'''Glědaj: Wobźěłajoš staru wersiju toś togo boka. Gaž składujoš, zgubiju se wšykne nowše wersije.'''",
 'yourdiff'                         => 'Rozdźěle',
-'copyrightwarning'                 => 'Pšosym buź se togo wědobny, až wšykne pśinoski na {{SITENAME}} se wózjawiju pód $2 (za detajle glědaj $1). Jolic až njocoš, až twój tekst se mimo zmilnosći wobźěłujo a za spódobanim drugich redistribuěrujo, pón njeskładuj jen how.<br />
+'copyrightwarning'                 => "Pšosym buź se togo wědobny, až wšykne pśinoski na {{SITENAME}} se wózjawiju pód $2 (za detajle glědaj $1). Jolic až njocoš, až twój tekst se mimo zmilnosći wobźěłujo a za spódobanim drugich redistribuěrujo, pón njeskładuj jen how.<br />
 Ty teke wobkšuśijoš, až sy tekst sam napisał abo sy jen wót public domainy resp. wót pódobneje lichotneje resursy kopěrował.
 
-<strong>NJEWÓZJAW WÓT COPYRIGHTA ŠĆITANE ŹĚ�A MIMO DOWÓLNOSĆI!</strong>',
-'copyrightwarning2'                => 'Pšosym buź se togo wědobny, až wšykne pśinoski na {{SITENAME}} mógu wót drugich wužywarjow se wobźěłaś, narownaś abo wulašowaś. Jolic až njocoš, až twój tekst se mimo zmilnosći wobźěłujo, ga pón jen how njeskładuj.<br /> Ty teke wobkšuśijoš, až sy tekst sam napisał abo sy jen wót public domainy resp. wót pódobneje lichotneje resursy kopěrował (glědaj $1 za dalše detaile). <strong>NJEWÓZJAW WÓT COPYRIGHTA ŠĆITANE ŹĚ�A MIMO DOWÓLNOSĆI!</strong>',
-'longpagewarning'                  => '<strong>GLĚDAJ: Toś ten bok wopśimjejo $1 kilobajtow; někotare wobglŽŽědowaki mógu měś problemy z wobźěłowanim bokow, kótarež su wětše ako 32 kb.
-Pšosym pśemysli, jolic njamóžo se bok na mjeńše wótrězki rozdźěliś.</strong>',
-'longpageerror'                    => '<strong>Zmólka: Tekst, kótaryž coš składowaś jo $1 KB wjeliki. To jo wěcej, ako dowólony maksimum ($2 KB). Składowanje njejo móžno.</strong>',
-'readonlywarning'                  => '<strong>WARNOWANJE: Datowa banka jo se za wótwardowanje zacyniła. Togodla njebuźo tebje tuchylu móžno, twóje wobźěłanja składowaś. Jolic až coš, ga móžoš tekst kopěrowaś a w tekstowej dataji składowaś, aby jen pózdźej how wózjawił.</strong>',
+'''NJEWÓZJAW WÓT COPYRIGHTA ŠĆITANE ŹĚ�A MIMO DOWÓLNOSĆI!'''",
+'copyrightwarning2'                => "Pšosym buź se togo wědobny, až wšykne pśinoski na {{SITENAME}} mógu wót drugich wužywarjow se wobźěłaś, narownaś abo wulašowaś. Jolic až njocoš, až twój tekst se mimo zmilnosći wobźěłujo, ga pón jen how njeskładuj.<br /> Ty teke wobkšuśijoš, až sy tekst sam napisał abo sy jen wót public domainy resp. wót pódobneje lichotneje resursy kopěrował (glědaj $1 za dalše detaile). '''NJEWÓZJAW WÓT COPYRIGHTA ŠĆITANE ŹĚ�A MIMO DOWÓLNOSĆI!'''",
+'longpagewarning'                  => "'''GLĚDAJ: Toś ten bok wopśimjejo $1 kilobajtow; někotare wobglŽŽědowaki mógu měś problemy z wobźěłowanim bokow, kótarež su wětše ako 32 kb.
+Pšosym pśemysli, jolic njamóžo se bok na mjeńše wótrězki rozdźěliś.'''",
+'longpageerror'                    => "'''Zmólka: Tekst, kótaryž coš składowaś jo $1 KB wjeliki. To jo wěcej, ako dowólony maksimum ($2 KB). Składowanje njejo móžno.'''",
+'readonlywarning'                  => "'''WARNOWANJE: Datowa banka jo se za wótwardowanje zacyniła, togodla njebuźo tuchylu móžno, twóje změny składowaś. Jolic až coš, ga móžoš tekst do tekstoweje dataje kopěrowaś a pózdźej składowaś.'''
+
+Administrator, kenž jo ju zastajił, su toś tu pśicynu pódał: $1",
 'protectedpagewarning'             => "'''Glědaj: Toś ten bok jo se zakazał, tak až jano sysopowe wužywarje mógu jen wobźěłaś.'''",
 'semiprotectedpagewarning'         => "'''Markuj:''' Toś ten bok jo se zakazał, tak až jano registrěrowane wužywarje mógu jen wobźěłaś.",
 'cascadeprotectedwarning'          => "'''Glědaj: Toś ten bok jo se zakazał, tak až jano wužywarje ze sysopowymi priwiliegijami mógu jen wobźěłaś, dokulaž jo zawězana do {{PLURAL:$1|slědujucego boka|slědujuceju bokowu|slědujucych bokow}}, {{PLURAL:$1|kótaryž jo šćitany|kótarejž stej šćitanej|kótarež su šćitane}} z pomocu kaskadoweje zakazanskeje opcije.'''",
-'titleprotectedwarning'            => '<strong>WARNOWANJE: Toś ten bok bu zakazany, tak až jano wěste wužywarje mógu jen napóraś.</strong>',
+'titleprotectedwarning'            => "'''WARNOWANJE: Toś ten bok bu zakazany, tak až [[Special:ListGroupRights|wósebne pšawa]] su trěbne, aby jen napórał.'''",
 'templatesused'                    => 'Za toś ten bok su se slědujuce pśedłogi wužywali:',
 'templatesusedpreview'             => 'Za toś ten pśeglěd su slědujuce pśedłogi se wužywali:',
 'templatesusedsection'             => 'W toś tom wótrězku su slědujuce pśedłogi se wužywali:',
@@ -737,20 +749,32 @@ Pšosym pśemysli, jolic njamóžo se bok na mjeńše wótrězki rozdźěliś.</
 
 Pšosym pśespytuj kradosćiwje, lic wótpowědujo dalšne wótnowjenje bokow směrnicam.
 Aby se mógał informěrowaś, slědujo how wulašowanski log-zapis, w kótaremž namakajoš teke pśicyny wulašowanja.",
+'deleted-notice'                   => 'Toś ten bok jo se wulašował. Protokol wulašowanjow za toś ten bok pódawa se dołojce ako referenca.',
+'deletelog-fulllog'                => 'Dopołny protokol se wobglědaś',
+'edit-hook-aborted'                => 'Wobźěłanje pśez kokulu pśetergnjony.
+Njejo žedne wujasnjenje.',
+'edit-gone-missing'                => 'Njejo móžno było bok aktualizěrowaś.
+Zda sem až jo wulašowany.',
+'edit-conflict'                    => 'Wobźěłański konflikt.',
+'edit-no-change'                   => 'Wašo wobźěłanje jo se ignorěrowało, dokulaž tekst njejo se změnił.',
+'edit-already-exists'              => 'Njejo móžno było nowy bok napóraś.
+Eksistěrujo južo.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Warnowanje: Toś ten bok wopśimujo pśewjele wołanjow parserowych funkcijow wupominajucuych wusoke wugbaśe.
+'expensive-parserfunction-warning'        => 'Warnowanje: Toś ten bok wopśimujo pśewjele wołanjow parserowych funkcijow wupominajucych wusoke wugbaśe.
 
-Njesměju wěcej nježli $2 {{PLURAL:$2|wołanja|wołanjowu|wołanjow|wołanjow}}, něnto {{PLURAL:$1|jo|stej|su|jo}} $1.',
+Njesmějo daś wěcej nježli $2 {{PLURAL:$2|wołanja|wołanjowu|wołanjow|wołanjow}}, něnto {{PLURAL:$1|jo $1 wołanje|stej $1 wołani|su $1 wołanja|jo $1 wołanjow}}.',
 'expensive-parserfunction-category'       => 'Boki z pśewjele paerserowymi funkcijami, kótarež pominaju sebje wusoke wugbaśe.',
 'post-expand-template-inclusion-warning'  => 'Warnowanje: Wjelikosć zapśěgnjonych pśedłogow jo pśewjelika. Někotare pśedłogi se njezapśěgu.',
 'post-expand-template-inclusion-category' => 'Boki, w kótarychž maksimalna wjelikosć zapśěgnjonych pśedłogow jo pśekšocona.',
 'post-expand-template-argument-warning'   => 'Warnowanje: Toś ten bok wopśimujo nanejmjenjej jaden argument w pśedłoze, kótaryž jo pśwjeliki pó ekspanděrowanju. Toś te argumenty se wuwóstajiju.',
 'post-expand-template-argument-category'  => 'Boki, kótarež wuwóstajone pśedłogowe argumenty wopśimuju',
+'parser-template-loop-warning'            => 'Pśedłogowa šlejfa namakana: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limit rekursijneje dłymi pśedłogi pśekšocony ($1)',
 
 # "Undo" feature
 'undo-success' => 'Wobźěłanje móžo se wótpóraś. Pšosym pśeglěduj dołojcne pśirownowanje aby se wěsty był, až to wót wěrnosći coš, a pón składuj změny, aby se wobźěłanje doskóńcnje wótpórało.',
-'undo-failure' => '<span class="error">Změna njejo se mógała wótpóraś, dokulaž jo něchten pótrjefjony wótrězk mjaztym změnił.</span>',
+'undo-failure' => 'Změna njejo se mógała wótpóraś, dokulaž jo něchten pótrjefjony wótrězk mjaztym změnił.',
 'undo-norev'   => 'Změna njeda se wótwrośiś, dokulaž njeeksistě�ujo abo jo se wulašowała.',
 'undo-summary' => 'Wersija $1 wót [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]) jo se anulěrowała',
 
@@ -761,31 +785,31 @@ Njesměju wěcej nježli $2 {{PLURAL:$2|wołanja|wołanjowu|wołanjow|wołanjow}
 Pśicyna, kótaruž $3 jo zapódał, jo ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Protokole boka pokazaÅ›',
-'nohistory'           => 'Stawizny wobźěłanja za toś ten bok njeeksistěruju.',
-'revnotfound'         => 'Wersija njejo se namakała.',
-'revnotfoundtext'     => 'Njejo móžno było, wersiju togo boka namakaś, za kótaremž sy pytał. Pšosym kontrolěruj zapódanu URL.',
-'currentrev'          => 'Aktualna wersija',
-'revisionasof'        => 'Wersija z $1',
-'revision-info'       => 'Wersija z $1 wót wužywarja $2',
-'previousrevision'    => '� Zachadna rewizija',
-'nextrevision'        => 'Pśiduca wersija →',
-'currentrevisionlink' => 'Aktualna wersija',
-'cur'                 => 'aktualny',
-'next'                => 'pśiduce',
-'last'                => 'zachadne',
-'page_first'          => 'zachopjeńk',
-'page_last'           => 'kóńc',
-'histlegend'          => 'Aby se změny pokazali, dejtej se pśirownanskej wersiji wuzwóliś. Pón dej se "enter" abo dołojcne tłocanko (button) tłocyś.<br />
+'viewpagelogs'           => 'Protokole boka pokazaÅ›',
+'nohistory'              => 'Stawizny wobźěłanja za toś ten bok njeeksistěruju.',
+'currentrev'             => 'Aktualna wersija',
+'currentrev-asof'        => 'Aktualna wersija wót $1',
+'revisionasof'           => 'Wersija z $1',
+'revision-info'          => 'Wersija z $1 wót wužywarja $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Zachadna rewizija',
+'nextrevision'           => 'Pśiduca wersija →',
+'currentrevisionlink'    => 'Aktualna wersija',
+'cur'                    => 'aktualny',
+'next'                   => 'pśiduce',
+'last'                   => 'zachadne',
+'page_first'             => 'zachopjeńk',
+'page_last'              => 'kóńc',
+'histlegend'             => 'Aby se změny pokazali, dejtej se pśirownanskej wersiji wuzwóliś. Pón dej se "enter" abo dołojcne tłocanko (button) tłocyś.<br />
 
 Legenda:
 * (Aktualne) = Rozdźěl k aktualnej wersiji, (pśedchadna) = rozdźěl k pśedchadnej wersiji
 * Cas/datum = W toś tom casu aktualna wersija, wužywarske mě/IP-adresa wobźěłarja, D = drobna změna',
-'deletedrev'          => '[wulašowane]',
-'histfirst'           => 'nejstarše',
-'histlast'            => 'nejnowše',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byta|$1 byty}})',
-'historyempty'        => '(prozne)',
+'history-fieldset-title' => 'W stawiznach pytaÅ›',
+'deletedrev'             => '[wulašowane]',
+'histfirst'              => 'nejstarše',
+'histlast'               => 'nejnowše',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byta|$1 byty}})',
+'historyempty'           => '(prozne)',
 
 # Revision feed
 'history-feed-title'          => 'Stawizny wersijow',
@@ -862,6 +886,7 @@ Zaruc, až historija wersijow nastawka jo njepśetergnjona.',
 'mergehistory-invalid-destination' => 'Celowy bok musy měś dobre nadpismo.',
 'mergehistory-autocomment'         => '„[[:$1]]“ do „[[:$2]]“ zjadnośeny',
 'mergehistory-comment'             => '„[[:$1]]“ do „[[:$2]]“ zjadnośeny: $3',
+'mergehistory-same-destination'    => 'Žrědłowy bok a celowy bok njesmějotej identiskej byś',
 
 # Merge log
 'mergelog'           => 'Protokol zjadnośenja',
@@ -874,120 +899,201 @@ Zaruc, až historija wersijow nastawka jo njepśetergnjona.',
 'difference'              => '(rozdźěle mjazy wersijoma/wersijami)',
 'lineno'                  => 'Rědka $1:',
 'compareselectedversions' => 'Wuzwólonej wersiji pśirownaś',
+'visualcomparison'        => 'Wizuelne pśirownanje',
+'wikicodecomparison'      => 'Pśirownanje wikiteksta',
 'editundo'                => 'wótwrośiś',
 'diff-multi'              => '(Pśirownanje wersijow(u) wopśimjejo teke {{PLURAL:$1|mjaz tutyma lažecu wersiju|$1 mjaz tutyma lažecej wersiji|$1 mjaz tutyma lažece wersije}}.)',
+'diff-movedto'            => 'pśesunjony do $1',
+'diff-styleadded'         => 'Stil $1 pśidany',
+'diff-added'              => '$1 pśidany',
+'diff-changedto'          => 'pśeměnjony do $1',
+'diff-movedoutof'         => 'pśesunjony z $1',
+'diff-styleremoved'       => 'Stil $1 wótwónoźony',
+'diff-removed'            => '$1 wótwónoźony',
+'diff-changedfrom'        => 'pśeměnjony z $1',
+'diff-src'                => 'žrědło',
+'diff-withdestination'    => 'z celom $1',
+'diff-with'               => '&#32;z $1 $2',
+'diff-with-final'         => '&#32;a $1 $2',
+'diff-width'              => 'šyrokosć',
+'diff-height'             => 'wusokosć',
+'diff-p'                  => "'''wótstawk'''",
+'diff-blockquote'         => "'''blokowy citat'''",
+'diff-h1'                 => "'''nadpismo (1. rownina)'''",
+'diff-h2'                 => "'''nadpismo (2. rownina)'''",
+'diff-h3'                 => "'''nadpismo (3. rownina)'''",
+'diff-h4'                 => "'''nadpismo (4. rownina)'''",
+'diff-h5'                 => "'''nadpismo (5. rownina)'''",
+'diff-pre'                => "'''předpformatěrowany blok'''",
+'diff-div'                => "'''blokowy element'''",
+'diff-ul'                 => "'''njenumerěrowana lisćina'''",
+'diff-ol'                 => "'''numerěrowana lisćina'''",
+'diff-li'                 => "'''lisćinowy zapisk'''",
+'diff-table'              => "'''tabela'''",
+'diff-tbody'              => "'''tabelowe wopśimjeśe'''",
+'diff-tr'                 => "'''rěd'''",
+'diff-td'                 => "'''cela'''",
+'diff-th'                 => "'''słupowe nadpismo'''",
+'diff-br'                 => "'''Å‚amanje'''",
+'diff-hr'                 => "'''horicontalna linija'''",
+'diff-code'               => "'''blok z komputerowym kodom'''",
+'diff-dl'                 => "'''definiciska lisćina'''",
+'diff-dt'                 => "'''definiciske zapśimjeśe'''",
+'diff-dd'                 => "'''definicija'''",
+'diff-input'              => "'''zapódaśe'''",
+'diff-form'               => "'''formular'''",
+'diff-img'                => "'''wobraz'''",
+'diff-span'               => "'''smužkowy element'''",
+'diff-a'                  => "'''wótkaz'''",
+'diff-i'                  => "'''kursiwny'''",
+'diff-b'                  => "'''tucny'''",
+'diff-strong'             => "'''mócny'''",
+'diff-em'                 => "'''wuzwignjenje'''",
+'diff-font'               => "'''pismowa družyna'''",
+'diff-big'                => "'''wjeliki'''",
+'diff-del'                => "'''wulašowany'''",
+'diff-tt'                 => "'''kšuta šyrokosć'''",
+'diff-sub'                => "'''dłymoko stajony'''",
+'diff-sup'                => "'''wusoko stajony'''",
+'diff-strike'             => "'''pśešmarnuś'''",
 
 # Search results
-'searchresults'             => 'Wuslědki pytanja',
-'searchresulttext'          => 'Za wěcej informacijow wó pśepytowanju {{GRAMMAR:genitiw|{{SITENAME}}}} glědaj [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Sy pytał za \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|wše boki, kótarež zachopiju se z "$1"]] | [[Special:WhatLinksHere/$1|wše wótkaze, kótarež wótkazuju do "$1"]])',
-'searchsubtitleinvalid'     => 'Ty sy pytał „$1“.',
-'noexactmatch'              => "'''Bok z napismom „$1“ njeeksistěrujo.'''
+'searchresults'                    => 'Wuslědki pytanja',
+'searchresults-title'              => 'Pytańske wuslědki za "$1"',
+'searchresulttext'                 => 'Za wěcej informacijow wó pśepytowanju {{GRAMMAR:genitiw|{{SITENAME}}}} glědaj [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Sy pytał za \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|wše boki, kótarež zachopiju se z "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|wše wótkaze, kótarež wótkazuju do "$1"]])',
+'searchsubtitleinvalid'            => 'Ty sy pytał „$1“.',
+'noexactmatch'                     => "'''Bok z napismom „$1“ njeeksistěrujo.'''
 Móžoš bok ale teke [[:$1|sam załožyś]].",
-'noexactmatch-nocreate'     => "'''Njama boka z nadpismom \"\$1\".'''",
-'toomanymatches'            => 'Pśewjele pytańskich wuslědkow, pšosym wopytaj druge wótpšašanje.',
-'titlematches'              => 'boki z wótpowědujucym napismom',
-'notitlematches'            => 'Boki z wótpowědujucym napismom njeeksistěruju.',
-'textmatches'               => 'Boki z wótpowědujucym tekstom',
-'notextmatches'             => 'Boki z wótpowědujucym tekstom njeeksistěruju.',
-'prevn'                     => 'zachadne $1',
-'nextn'                     => 'pśiduce $1',
-'viewprevnext'              => 'PokazaÅ› ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 słowow|$2 słowje|$2 słowa|$2 słowow}})',
-'search-result-score'       => 'Relewanca: $1 %',
-'search-redirect'           => '(pśesměrowanje $1)',
-'search-section'            => '(sekcija $1)',
-'search-suggest'            => 'Měnijašo: $1?',
-'search-interwiki-caption'  => 'Sotšine projekty',
-'search-interwiki-default'  => '$1 wuslědki:',
-'search-interwiki-more'     => '(wěcej)',
-'search-mwsuggest-enabled'  => 'z naraźenjami',
-'search-mwsuggest-disabled' => 'žedne naraźenja',
-'search-relatedarticle'     => 'swójźbne',
-'mwsuggest-disable'         => 'Naraźenja pśez AJAX znjemóžniś',
-'searchrelated'             => 'swójźbne',
-'searchall'                 => 'wše',
-'showingresults'            => "How {{PLURAL:|jo '''1''' wuslědk|stej '''$1''' wuslědka|su '''$1''' wuslědki}} wót cysła '''$2'''.",
-'showingresultsnum'         => "How {{PLURAL:$3|jo '''1''' wuslědk|stej '''$3''' wuslědka|su '''$3''' wuslědki}} wót cysła '''$2'''.",
-'showingresultstotal'       => "{{PLURAL:$3|Slědujo wuslědk '''$1''' z '''$3'''|Slědujotej wuslědka '''$1 – $2''' z '''$3'''|Slěduju wuslědki '''$1 – $2''' z '''$3'''|Slědujo wuslědkow '''$1 – $2''' z '''$3'''}}",
-'nonefound'                 => "'''Pokazka''': Jano někótare mjenjowe rumy se standarnje pytaju. Wopytaj za swóje wótpšašanje prefiks ''all:'' wužywać, aby cełe wopśimjeśe pytał (inkluziwnje diskusijnych bokow, pśedłogi atd.) abo wužyj póžedany mjenjowy rum ako prefiks.",
-'powersearch'               => 'Rozšyrjone pytanje',
-'powersearch-legend'        => 'Rozšyrjone pytanje',
-'powersearch-ns'            => 'W mjenjowych rumach pytaÅ›:',
-'powersearch-redir'         => 'Dalejpósrědnjenja nalistowaś',
-'powersearch-field'         => 'PytaÅ› za:',
-'search-external'           => 'Eksterne pytanje',
-'searchdisabled'            => 'Pytanje we {{SITENAME}} jo se deaktiwěrowało. Tak dłujko móžoš w googlu pytaś. Pšosym wobmysli, až móžo pytanski indeks za {{SITENAME}} njeaktualny byś.',
+'noexactmatch-nocreate'            => "'''Njama boka z nadpismom \"\$1\".'''",
+'toomanymatches'                   => 'Pśewjele pytańskich wuslědkow, pšosym wopytaj druge wótpšašanje.',
+'titlematches'                     => 'boki z wótpowědujucym napismom',
+'notitlematches'                   => 'Boki z wótpowědujucym napismom njeeksistěruju.',
+'textmatches'                      => 'Boki z wótpowědujucym tekstom',
+'notextmatches'                    => 'Boki z wótpowědujucym tekstom njeeksistěruju.',
+'prevn'                            => 'zachadne $1',
+'nextn'                            => 'pśiduce $1',
+'viewprevnext'                     => 'PokazaÅ› ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Pytańske opcije',
+'searchmenu-exists'                => "'''Jo bok z mjenim \"[[\$1]]\" na toÅ› tom wikiju'''",
+'searchmenu-new'                   => "'''Napóraj bok \"[[:\$1|\$1]]\" na toś tom wikiju!'''",
+'searchhelp-url'                   => 'Help:Pomoc',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Boki z toś tym prefiksom pśepytaś]]',
+'searchprofile-articles'           => 'Wopśimjeśowe boki',
+'searchprofile-articles-and-proj'  => 'Wopśimjeśowe & projektowe boki',
+'searchprofile-project'            => 'Projektowe boki',
+'searchprofile-images'             => 'Dataje',
+'searchprofile-everything'         => 'WÅ¡ykno',
+'searchprofile-advanced'           => 'Rozšyrjony',
+'searchprofile-articles-tooltip'   => 'W $1 pytaÅ›',
+'searchprofile-project-tooltip'    => 'W $1 pytaÅ›',
+'searchprofile-images-tooltip'     => 'Za datajami pytaÅ›',
+'searchprofile-everything-tooltip' => 'Cełe wopsímjeśe pśepytaś (inkluziwnje diskusijne boki)',
+'searchprofile-advanced-tooltip'   => 'W swójskich mjenjowych rumach pytaś',
+'prefs-search-nsdefault'           => 'Ze standardnymi nastajenjami pytaÅ›',
+'prefs-search-nscustom'            => 'Swójske mjenjowe rumy pśepytaś:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 słowow|$2 słowje|$2 słowa|$2 słowow}})',
+'search-result-score'              => 'Relewanca: $1 %',
+'search-redirect'                  => '(pśesměrowanje $1)',
+'search-section'                   => '(sekcija $1)',
+'search-suggest'                   => 'Měnijašo: $1?',
+'search-interwiki-caption'         => 'Sotšine projekty',
+'search-interwiki-default'         => '$1 wuslědki:',
+'search-interwiki-more'            => '(wěcej)',
+'search-mwsuggest-enabled'         => 'z naraźenjami',
+'search-mwsuggest-disabled'        => 'žedne naraźenja',
+'search-relatedarticle'            => 'swójźbne',
+'mwsuggest-disable'                => 'Naraźenja pśez AJAX znjemóžniś',
+'searchrelated'                    => 'swójźbne',
+'searchall'                        => 'wše',
+'showingresults'                   => "How {{PLURAL:|jo '''1''' wuslědk|stej '''$1''' wuslědka|su '''$1''' wuslědki}} wót cysła '''$2'''.",
+'showingresultsnum'                => "How {{PLURAL:$3|jo '''1''' wuslědk|stej '''$3''' wuslědka|su '''$3''' wuslědki}} wót cysła '''$2'''.",
+'showingresultstotal'              => "{{PLURAL:$4|Slědujo wuslědk '''$1''' z '''$3'''|Slědujotej wuslědka '''$1 – $2''' z '''$3'''|Slěduju wuslědki '''$1 – $2''' z '''$3'''|Slědujo wuslědkow '''$1 – $2''' z '''$3'''}}",
+'nonefound'                        => "'''Pokazka''': Jano někótare mjenjowe rumy se standarnje pytaju. Wopytaj za swóje wótpšašanje prefiks ''all:'' wužywać, aby cełe wopśimjeśe pytał (inkluziwnje diskusijnych bokow, pśedłogi atd.) abo wužyj póžedany mjenjowy rum ako prefiks.",
+'search-nonefound'                 => 'Njejsu se wuslědki namakali, kótarež wótpowěduju napšašowanjeju.',
+'powersearch'                      => 'Rozšyrjone pytanje',
+'powersearch-legend'               => 'Rozšyrjone pytanje',
+'powersearch-ns'                   => 'W mjenjowych rumach pytaÅ›:',
+'powersearch-redir'                => 'Dalejpósrědnjenja nalistowaś',
+'powersearch-field'                => 'PytaÅ› za:',
+'search-external'                  => 'Eksterne pytanje',
+'searchdisabled'                   => 'Pytanje we {{SITENAME}} jo se deaktiwěrowało. Tak dłujko móžoš w googlu pytaś. Pšosym wobmysli, až móžo pytanski indeks za {{SITENAME}} njeaktualny byś.',
 
 # Preferences page
-'preferences'              => 'Nastajenja',
-'mypreferences'            => 'móje nastajenja',
-'prefs-edits'              => 'Licba wobźěłanjow:',
-'prefsnologin'             => 'Njejsy pśizjawjony',
-'prefsnologintext'         => 'Musyš se <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} pśizjawiś]</span>, aby mógał swóje nastajenja změniś.',
-'prefsreset'               => 'Nastajenja su ze składa se wótnowili. Twóje změny njejsu se składowali.',
-'qbsettings'               => 'Bocna lejstwa',
-'qbsettings-none'          => 'Žedne',
-'qbsettings-fixedleft'     => 'nalěwo fiksěrowane',
-'qbsettings-fixedright'    => 'napšawo fiksěrowane',
-'qbsettings-floatingleft'  => 'nalěwo se znosujuce',
-'qbsettings-floatingright' => 'napšawo se znosujuce',
-'changepassword'           => 'Šćitne gronidło změniś',
-'skin'                     => 'Å at',
-'math'                     => 'Math',
-'dateformat'               => 'Format datuma',
-'datedefault'              => 'Standard',
-'datetime'                 => 'Datum a cas',
-'math_failure'             => 'Zmólka',
-'math_unknown_error'       => 'njeznata zmólka',
-'math_unknown_function'    => 'njeznata funkcija',
-'math_lexing_error'        => 'leksikaliska zmólka',
-'math_syntax_error'        => 'syntaktiska zmólka',
-'math_image_error'         => 'PNG-konwertěrowanje njejo se raźiło. Glědaj, lic su latex, dvips gs abo konwertěruj pšawje instalěrowane.',
-'math_bad_tmpdir'          => 'Njejo móžno temporarny zapisk za matematiske formule załožyś resp. do njogo pisaś.',
-'math_bad_output'          => 'Njejo móžno celowy zapisk za matematiske formule załožyś resp. do njogo pisaś.',
-'math_notexvc'             => 'Program texvc felujo. Pšosym glědaj do math/README.',
-'prefs-personal'           => 'Wužywarski profil',
-'prefs-rc'                 => 'Aktualne změny',
-'prefs-watchlist'          => 'Wobglědowańka',
-'prefs-watchlist-days'     => 'Licba dnjow, kenž maju se we wobglědowańkach pokazaś:',
-'prefs-watchlist-edits'    => 'Maksimalna licba změnow, kenž maju w rozšyrjonej lisćinje wobglědowańkow se pokazaś:',
-'prefs-misc'               => 'WÅ¡ake nastajenja',
-'saveprefs'                => 'Składowaś',
-'resetprefs'               => 'Njeskłaźone změny zachyśiś',
-'oldpassword'              => 'Stare šćitne gronidło:',
-'newpassword'              => 'Nowe šćitne gronidło:',
-'retypenew'                => 'Nowe šćitne gronidło (hyšći raz):',
-'textboxsize'              => 'Wobźěłaś',
-'rows'                     => 'Rědki:',
-'columns'                  => 'SÅ‚upy:',
-'searchresultshead'        => 'PytaÅ›',
-'resultsperpage'           => 'Wuslědki na bok:',
-'contextlines'             => 'Rědki na wuslědk:',
-'contextchars'             => 'Znamuška na rědku:',
-'stub-threshold'           => 'Formatěrowanje  <a href="#" class="stub">wótkaza na zarodk</a> (w bytach):',
-'recentchangesdays'        => 'Licba dnjow, kenž se pokazuju w "slědnych změnach":',
-'recentchangescount'       => 'Licba změnow w „Aktualne změny“, wersiskich stawiznach a protokolach:',
-'savedprefs'               => 'Twóje nastajenja su se składowali.',
-'timezonelegend'           => 'Casowa cona',
-'timezonetext'             => '¹Pódaj licbu góźinow, kótarež laže mjazy twójeju casoweju conu a UTC.',
-'localtime'                => 'Městny cas:',
-'timezoneoffset'           => 'Rozdźěl¹:',
-'servertime'               => 'Aktualny cas na serwerje:',
-'guesstimezone'            => 'Z browsera pśewześ',
-'allowemail'               => 'Dostawanje e-mailow drugich wužywarjow zmóžniś.',
-'prefs-searchoptions'      => 'Pytańske opcije',
-'prefs-namespaces'         => 'Mjenjowe rumy',
-'defaultns'                => 'Standardnje ma se w toÅ› tych mjenjowych rumach pytaÅ›:',
-'default'                  => 'Standard',
-'files'                    => 'Dataje',
+'preferences'               => 'Nastajenja',
+'mypreferences'             => 'móje nastajenja',
+'prefs-edits'               => 'Licba wobźěłanjow:',
+'prefsnologin'              => 'Njejsy pśizjawjony',
+'prefsnologintext'          => 'Musyš se <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} pśizjawiś]</span>, aby mógał swóje nastajenja změniś.',
+'prefsreset'                => 'Nastajenja su ze składa se wótnowili. Twóje změny njejsu se składowali.',
+'qbsettings'                => 'Bocna lejstwa',
+'qbsettings-none'           => 'Žedne',
+'qbsettings-fixedleft'      => 'nalěwo fiksěrowane',
+'qbsettings-fixedright'     => 'napšawo fiksěrowane',
+'qbsettings-floatingleft'   => 'nalěwo se znosujuce',
+'qbsettings-floatingright'  => 'napšawo se znosujuce',
+'changepassword'            => 'Šćitne gronidło změniś',
+'skin'                      => 'Å at',
+'skin-preview'              => 'Pśeglěd',
+'math'                      => 'Math',
+'dateformat'                => 'Format datuma',
+'datedefault'               => 'Standard',
+'datetime'                  => 'Datum a cas',
+'math_failure'              => 'Zmólka',
+'math_unknown_error'        => 'njeznata zmólka',
+'math_unknown_function'     => 'njeznata funkcija',
+'math_lexing_error'         => 'leksikaliska zmólka',
+'math_syntax_error'         => 'syntaktiska zmólka',
+'math_image_error'          => 'PNG-konwertěrowanje njejo se raźiło. Glědaj, lic su latex, dvips gs abo konwertěruj pšawje instalěrowane.',
+'math_bad_tmpdir'           => 'Njejo móžno temporarny zapisk za matematiske formule załožyś resp. do njogo pisaś.',
+'math_bad_output'           => 'Njejo móžno celowy zapisk za matematiske formule załožyś resp. do njogo pisaś.',
+'math_notexvc'              => 'Program texvc felujo. Pšosym glědaj do math/README.',
+'prefs-personal'            => 'Wužywarski profil',
+'prefs-rc'                  => 'Aktualne změny',
+'prefs-watchlist'           => 'Wobglědowańka',
+'prefs-watchlist-days'      => 'Licba dnjow, kenž maju se we wobglědowańkach pokazaś:',
+'prefs-watchlist-days-max'  => '(maksimalnje 7 dnjow)',
+'prefs-watchlist-edits'     => 'Maksimalna licba změnow, kenž maju w rozšyrjonej lisćinje wobglědowańkow se pokazaś:',
+'prefs-watchlist-edits-max' => '(maksimalna licba: 1000)',
+'prefs-misc'                => 'WÅ¡ake nastajenja',
+'prefs-resetpass'           => 'Gronidło změniś',
+'saveprefs'                 => 'Składowaś',
+'resetprefs'                => 'Njeskłaźone změny zachyśiś',
+'textboxsize'               => 'Wobźěłaś',
+'prefs-edit-boxsize'        => 'Wjelikosć wobźěłowańskego wokna',
+'rows'                      => 'Rědki:',
+'columns'                   => 'SÅ‚upy:',
+'searchresultshead'         => 'PytaÅ›',
+'resultsperpage'            => 'Wuslědki na bok:',
+'contextlines'              => 'Rědki na wuslědk:',
+'contextchars'              => 'Znamuška na rědku:',
+'stub-threshold'            => 'Formatěrowanje  <a href="#" class="stub">wótkaza na zarodk</a> (w bytach):',
+'recentchangesdays'         => 'Licba dnjow, kenž se pokazuju w "slědnych změnach":',
+'recentchangesdays-max'     => '(maksimalnje $1 {{PLURAL:$1|źeń|dnja|dny|dnjow}})',
+'recentchangescount'        => 'Licba změnow w „Aktualne změny“, stawiznach boka a w protokolach pó standarźe:',
+'savedprefs'                => 'Twóje nastajenja su se składowali.',
+'timezonelegend'            => 'Casowa cona',
+'timezonetext'              => '¹Pódaj licbu góźinow, kótarež laže mjazy twójeju casoweju conu a UTC.',
+'localtime'                 => 'Městny cas:',
+'timezoneselect'            => 'Casowa cona',
+'timezoneuseserverdefault'  => 'Standard serwera wužywaś',
+'timezoneuseoffset'         => 'Drugi (pódaj wótchylenje)',
+'timezoneoffset'            => 'Rozdźěl¹:',
+'servertime'                => 'Cas serwera:',
+'guesstimezone'             => 'Z browsera pśewześ',
+'allowemail'                => 'Dostawanje e-mailow drugich wužywarjow zmóžniś.',
+'prefs-searchoptions'       => 'Pytańske opcije',
+'prefs-namespaces'          => 'Mjenjowe rumy',
+'defaultns'                 => 'Standardnje ma se w toÅ› tych mjenjowych rumach pytaÅ›:',
+'default'                   => 'Standard',
+'files'                     => 'Dataje',
 
 # User rights
 'userrights'                  => 'Zastojanje wužywarskich pšawow', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Wužywarske kupki zastojaś',
 'userrights-user-editname'    => 'Wužywarske mě:',
 'editusergroup'               => 'Wužywarske kupki wobźěłaś.',
-'editinguser'                 => "Změnjaju se wužywarske pšawa wužywarja '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Změnjaju se wužywarske pšawa wužywarja '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Pšawa wužywarskich kupkow wobźěłaś',
 'saveusergroups'              => 'Wužywarske kupki składowaś',
 'userrights-groupsmember'     => 'CÅ‚onk kupki:',
@@ -1036,6 +1142,8 @@ Móžoš bok ale teke [[:$1|sam załožyś]].",
 'right-minoredit'            => 'Změny ako snadne markěrowaś',
 'right-move'                 => 'pśesunuś boki',
 'right-move-subpages'        => 'Boki ze swójimi pódbokami pśesunuś',
+'right-move-rootuserpages'   => 'Głowne wužywarske boki pśesunuś',
+'right-movefile'             => 'Dataje pśesunuś',
 'right-suppressredirect'     => 'Pśi pśesunjenju žedne dalejpósrědnjenje ze starego mjenja napóraś',
 'right-upload'               => 'lódowaś dataje',
 'right-reupload'             => 'Eksistěrujucu dataju pśepisaś',
@@ -1086,9 +1194,46 @@ Móžoš bok ale teke [[:$1|sam załožyś]].",
 'rightslogentry' => 'Pśisłušnosć ku kupce jo se za „[[$1]]“ změniła wót „$2“ na „$3“.',
 'rightsnone'     => '(nic)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'toÅ› ten bok cytaÅ›',
+'action-edit'                 => 'toś ten bok wobźěłaś',
+'action-createpage'           => 'Boki napóraś',
+'action-createtalk'           => 'Diskusijne boki napóraś',
+'action-createaccount'        => 'Toś to wužywarske konto napóraś',
+'action-minoredit'            => 'toś tu změnu ako snadnu markěrowaś',
+'action-move'                 => 'toś ten bok pśesunuś',
+'action-move-subpages'        => 'toś ten bok a jogo pódboki pśesunuś',
+'action-move-rootuserpages'   => 'głowne wužywarske boki pśesunuś',
+'action-movefile'             => 'Toś tu dataju pśesunuś',
+'action-upload'               => 'toÅ› tu dataju nagraÅ›',
+'action-reupload'             => 'toś tu eksistěrujucu dataju pśepisaś',
+'action-reupload-shared'      => 'toś tu dataju w zgroamdnem repozitoriumje pśepisaś',
+'action-upload_by_url'        => 'toÅ› tu dataju z webadrese (URL) nagraÅ›',
+'action-writeapi'             => 'API za pisanje wužywaś',
+'action-delete'               => 'ToÅ› ten bok lasowaÅ›',
+'action-deleterevision'       => 'Toś tu wersiju lašowaś',
+'action-deletedhistory'       => 'Stawizny wulašowanjow toś togo boka zwobrazniś',
+'action-browsearchive'        => 'wulašowane boki pytaś',
+'action-undelete'             => 'Toś ten bok wótnowiś',
+'action-suppressrevision'     => 'schowanu wersiju pśeglědaś a wótnowiś',
+'action-suppressionlog'       => 'toÅ› ten priwatny protokol zwobrazniÅ›',
+'action-block'                => 'Toś tomu wužiwarjeju wobźěłowanje zawoboraś',
+'action-protect'              => 'Šćitowe stopnje za toś ten bok změniś',
+'action-import'               => 'toś ten bok z drugego wikija importěrowaś',
+'action-importupload'         => 'toś ten bok z datajowego nagraśa importěrowaś',
+'action-patrol'               => 'změny drugich wužywarjow ako doglědowane markěrowaś',
+'action-autopatrol'           => 'twóju změnu ako doglědowanu markěrowaś daś',
+'action-unwatchedpages'       => 'lisćinu njewobglědowanych bokow zwobrazniś',
+'action-trackback'            => 'trackback pósłaś',
+'action-mergehistory'         => 'Stawizny toś togo boka zjadnośiś',
+'action-userrights'           => 'wše wužywarske pšawa wobźěłaś',
+'action-userrights-interwiki' => 'wužywarske pšawa wužywarjow w drugich wikijach wobźěłaś',
+'action-siteadmin'            => 'datowu banku zastajiś abo wótworiś',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|změna|změnje|změny}}',
 'recentchanges'                     => 'Aktualne změny',
+'recentchanges-legend'              => 'Opcije aktualnych změnow',
 'recentchangestext'                 => "How móžoš slědne změny we '''{{GRAMMAR:lokatiw|{{SITENAME}}}}''' slědowaś.",
 'recentchanges-feed-description'    => 'Slěduj z toś tym zapódaśim nejaktualnjejše změny we {{GRAMMAR:lokatiw|{{SITENAME}}}}.',
 'rcnote'                            => "Dołojce {{PLURAL:$1|jo '''1''' změna|stej slědnej '''$1''' změnje|su slědne '''$1''' změny}} w {{PLURAL:$2|slědnem dnju|slědnyma '''$2''' dnjoma|slědnych '''$2''' dnjach}}, staw wót $4, $5.",
@@ -1112,6 +1257,8 @@ Móžoš bok ale teke [[:$1|sam załožyś]].",
 'rc_categories'                     => 'Jano boki z kategorijow (źělone z pomocu „|“):',
 'rc_categories_any'                 => 'wše',
 'newsectionsummary'                 => 'Nowy wótrězk /* $1 */',
+'rc-enhanced-expand'                => 'Drobnosći pokazaś (pomina se JavaScript)',
+'rc-enhanced-hide'                  => 'Drobnosći schowaś',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Změny w zwězanych bokach',
@@ -1134,11 +1281,11 @@ Boki na [[Special:Watchlist|wobglědowańce]] su '''tucne'''.",
 'uploaderror'                 => 'Zmólka pśi uploadowanju',
 'uploadtext'                  => "Wužyj toś ten formular za nagraśe nowych datajow.
 
-Źi na [[Special:ImageList|lisćinu nagratych datajow]], aby mógł južo nagrate dataje se wobglědaś abo pytaś, nagraśa protokolěruju se w [[Special:Log/upload|protokolu nagraśow]], wulašowanja w [[Special:Log/upload|protokolu wulašowanjow]].
+Źi na [[Special:FileList|lisćinu nagratych datajow]], aby mógł južo nagrate dataje se wobglědaś abo pytaś, nagraśa protokolěruju se w [[Special:Log/upload|protokolu nagraśow]], wulašowanja w [[Special:Log/upload|protokolu wulašowanjow]].
 
 Aby dataju do boka zapśimjeł, wužyj wótkaz slědujuceje formy
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Dataja.jpg]]</nowiki></tt>''', aby wužywał połnu wersiju dataje
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Dataja.png|200px|thumb|left|alternatiwny tekst]]</nowiki></tt>''', aby wužywał wobraz we wjelikosću 200 pikselow w kašćiku na lěwej kšomje z alternatiwnym tekstom ako wopisanje
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Dataja.jpg]]</nowiki></tt>''', aby wužywał połnu wersiju dataje
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Dataja.png|200px|thumb|left|alternatiwny tekst]]</nowiki></tt>''', aby wužywał wobraz we wjelikosću 200 pikselow w kašćiku na lěwej kšomje z alternatiwnym tekstom ako wopisanje
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Dataja.ogg]]</nowiki></tt>''', aby direktnje na dataju wótkazował, bźez togo až dataja se zwobraznijo.",
 'upload-permitted'            => 'Dowolone datajowe typy: $1.',
 'upload-preferred'            => 'Preferěrowane datajowe typy: $1.',
@@ -1146,7 +1293,7 @@ Aby dataju do boka zapśimjeł, wužyj wótkaz slědujuceje formy
 'uploadlog'                   => 'datajowy protokol',
 'uploadlogpage'               => 'Datajowy protokol',
 'uploadlogpagetext'           => 'Dołojce jo lisćina nejnowšych datajowych nagraśow.
-Glědaj [[Special:NewImages|galeriju nowych datajow]] za wizuelny pśeglěd.',
+Glědaj [[Special:NewFiles|galeriju nowych datajow]] za wizuelny pśeglěd.',
 'filename'                    => 'MÄ› dataje',
 'filedesc'                    => 'Zespominanje',
 'fileuploadsummary'           => 'Zespominanje:',
@@ -1168,21 +1315,22 @@ Glědaj [[Special:NewImages|galeriju nowych datajow]] za wizuelny pśeglěd.',
 'large-file'                  => 'Pó móžnosći njedejała dataja wětša byś ako $1. Toś ta dataja jo $2 wjelika.',
 'largefileserver'             => 'Dataja jo wětša ako serwer dopušćijo.',
 'emptyfile'                   => 'Dataja jo prozna. Pśicyna togo móžo byś zmólka w mjenju dataje. Kontrolěruj pšosym, lic coš dataju napšawdu uploadowaś.',
-'fileexists'                  => 'Dataja z toś tym mjenim južo eksistěrujo. Tłocyš-lic na "Dataju składowaś", ga se dataja pśepišo. Pšosym kontrolěruj <strong><tt>$1</tt></strong>, gaž njejsy se kradu wěsty.',
-'filepageexists'              => 'Wopisański bok za toś tu dataju bu južo na <strong><tt>$1</tt></strong> napórany, ale dataja z toś tym mjenim njeeksistěrujo. Zespominanje, kótarež sy zapódał, se na wopisańskem boku njezjawijo. Aby se twóje zespominanje tam zjawiło, dejš jen manuelnje wobźěłaś.',
-'fileexists-extension'        => 'Eksistěrujo južo dataja z pódobnym mjenim:<br />
-Mě dataje, kótaraž dej se uploadowaś: <strong><tt>$1</tt></strong><br />
-Mě eksistěrujuceje dataje: <strong><tt>$2</tt></strong><br />
-Wuzwól nowe mě, jolic až sy se wěsty, až dataji njejstej identiskej.',
+'fileexists'                  => "Dataja z toś tym mjenim južo eksistěrujo. Tłocyš-lic na \"Dataju składowaś\", ga se dataja pśepišo. Pšosym kontrolěruj '''<tt>\$1</tt>''', gaž njejsy se kradu wěsty.",
+'filepageexists'              => "Wopisański bok za toś tu dataju bu južo na '''<tt>$1</tt>''' napórany, ale dataja z toś tym mjenim njeeksistěrujo. Zespominanje, kótarež sy zapódał, se na wopisańskem boku njezjawijo. Aby se twóje zespominanje tam zjawiło, dejš jen manuelnje wobźěłaś.",
+'fileexists-extension'        => "Eksistěrujo južo dataja z pódobnym mjenim:<br />
+Mě dataje, kótaraž dej se uploadowaś: '''<tt>$1</tt>'''<br />
+Mě eksistěrujuceje dataje: '''<tt>$2</tt>'''<br />
+Wuzwól nowe mě, jolic až sy se wěsty, až dataji njejstej identiskej.",
 'fileexists-thumb'            => "<center>'''Eksistěrujucy wobraz'''</center>",
-'fileexists-thumbnail-yes'    => 'Zazdaśim ma wobraz reducěrowanu wjelikosć <i>(thumbnail)</i>. Kontrolěruj pšosym dataju <strong><tt>$1</tt></strong>.<br />
-Jadna-lic se wó wobraz w originalnej wjelikosći, pón njejo notne, separatny pśeglědowy wobraz uploadowaś.',
-'file-thumbnail-no'           => 'Mě dataje zachopijo z <strong><tt>$1</tt></strong>. Zda se, až to jo wobraz z reducěrowaneju wjelikosću. <i>(thumbnail)</i>.
-Jolic maš toś ten wobraz w połnem rozeznaśu, nagraj jen, howac změń pšosym mě dataje.',
-'fileexists-forbidden'        => 'Dataja z toś tym mjenim južo eksistěrujo. Pšosym nawroś se a uploaduj dataju z hynakšym mjenim. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Zazdaśim ma wobraz reducěrowanu wjelikosć ''(thumbnail)''. Kontrolěruj pšosym dataju '''<tt>$1</tt>'''.<br />
+Jadna-lic se wó wobraz w originalnej wjelikosći, pón njejo notne, separatny pśeglědowy wobraz uploadowaś.",
+'file-thumbnail-no'           => "Mě dataje zachopijo z '''<tt>$1</tt>'''. Zda se, až to jo wobraz z reducěrowaneju wjelikosću. ''(thumbnail)''.
+Jolic maš toś ten wobraz w połnem rozeznaśu, nagraj jen, howac změń pšosym mě dataje.",
+'fileexists-forbidden'        => 'Dataja z toś tym mjenim južo eksistěrujo a njedajo se pśepisaś. Jolic coš hyšći swóju dataju nagraś, źi pšosym slědk a wuž nowe mě. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Dataja z toś tym mjenim južo eksistěrujo w zgromadnej chowarni. Jolic hyšći coš nagraś swóju dataju, źi pšosym slědk a wužyj nowe mě.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Toś ta dataja jo duplikat {{PLURAL:$1|slědujuceje dataje|slědujuceju datajow|slědujucych datajow|slědujucych datajow}}:',
+'file-deleted-duplicate'      => 'Dataja, kótaraž jo identiska z toś teju dataju ([[$1]]) jo se pjerwjej wulašowała. Ty měł stawizny wulašowanja toś teje dataje pśeglědaś, pjerwjej až pokšacujoš z jeje zasejnagrawanjom.',
 'successfulupload'            => 'Upload jo był wuspěšny.',
 'uploadwarning'               => 'Warnowanje',
 'savefile'                    => 'Dataju składowaś',
@@ -1202,7 +1350,7 @@ Jolic maš toś ten wobraz w połnem rozeznaśu, nagraj jen, howac změń pšosy
 
 Pšosym kontrolěruj, lic wótpowědujo nowy upload směrnicam.
 Aby se mógał informěrowaś jo how log-lisćina z pśicynu wulašowanja:",
-'filename-bad-prefix'         => 'Mě dataje, kótaruž uploadujoš, zachopijo na <strong>„$1“</strong>. Take mě jo wót digitalneje kamery pśedpódane a toś wjele njewugroni. Pšosym pómjeni dataju tak, aby mě wěcej wó jeje wopśimjeśu wugroniło.',
+'filename-bad-prefix'         => "Mě dataje, kótaruž uploadujoš, zachopijo na '''„$1“'''. Take mě jo wót digitalneje kamery pśedpódane a toś wjele njewugroni. Pšosym pómjeni dataju tak, aby mě wěcej wó jeje wopśimjeśu wugroniło.",
 'filename-prefix-blacklist'   => ' #<!-- Njezměń nic na toś tej rědce! --> <pre>
 # Syntaksa jo slědujuca:
 #   * Wšykno wót "#" znamuška až ku kóńcoju rědki jo komentar.
@@ -1237,18 +1385,19 @@ PICT # misc.
 'upload_source_url'  => ' (płaśeca, zjawnje pśistupna URL)',
 'upload_source_file' => ' (dataja na twójom kompjuterje)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Toś ten specialny bok nalicyjo wšykne uploadowane dataje. Normalnje pokazuje se te dataje, ako su slědne se uploadowali, ako prědne w lisćinje. Tłocenje na napise špaltow změnijo sortěrowanje.',
-'imagelist_search_for'  => 'Za medijowym mjenim pytaÅ›:',
+# Special:ListFiles
+'listfiles-summary'     => 'Toś ten specialny bok nalicyjo wšykne uploadowane dataje. Normalnje pokazuje se te dataje, ako su slědne se uploadowali, ako prědne w lisćinje. Tłocenje na napise špaltow změnijo sortěrowanje.',
+'listfiles_search_for'  => 'Za medijowym mjenim pytaÅ›:',
 'imgfile'               => 'dataja',
-'imagelist'             => 'Lisćina datajow',
-'imagelist_date'        => 'datum',
-'imagelist_name'        => 'mÄ› dataje',
-'imagelist_user'        => 'wužywaŕ',
-'imagelist_size'        => 'Wjelikosć (byte)',
-'imagelist_description' => 'Zespominanje',
-
-# Image description page
+'listfiles'             => 'Lisćina datajow',
+'listfiles_date'        => 'datum',
+'listfiles_name'        => 'mÄ› dataje',
+'listfiles_user'        => 'wužywaŕ',
+'listfiles_size'        => 'Wjelikosć (byte)',
+'listfiles_description' => 'Zespominanje',
+'listfiles_count'       => 'Wersije',
+
+# File description page
 'filehist'                       => 'Stawizny dataje',
 'filehist-help'                  => 'Tłoc na datum/cas aby tencasna wersija se lodowała.',
 'filehist-deleteall'             => 'Wšykno wulašowaś',
@@ -1256,19 +1405,25 @@ PICT # misc.
 'filehist-revert'                => 'Slědk wześ',
 'filehist-current'               => 'něntejšny',
 'filehist-datetime'              => 'datum/cas',
+'filehist-thumb'                 => 'Pśeglědowy wobraz',
+'filehist-thumbtext'             => 'Pśeglědowy wobraz za wersiju wót $1',
+'filehist-nothumb'               => 'Žeden pśeglědowy wobraz',
 'filehist-user'                  => 'Wužywaŕ',
 'filehist-dimensions'            => 'rozměry',
 'filehist-filesize'              => 'Wjelikosć dataje',
 'filehist-comment'               => 'Komentar',
-'imagelinks'                     => 'Wótkaze',
+'imagelinks'                     => 'Datajowe wótkaze',
 'linkstoimage'                   => '{{PLURAL:$1|Slědujucy bok wótkazujo|Slědujucej $1 boka wótkazujotej|Slědujuce $1 boki wótkazuju|Slědujucych $1 bokow wótkazujo}} na toś tu dataju:',
+'linkstoimage-more'              => 'Wěcej nježli $1 {{PLURAL:$1|bok wótkazujo|boka wótkazujotej|boki wótkazuju|bokow wótkazujo}} na toś tu dataju.
+Slědujuca lisćina pokazujo jano {{PLURAL:$1|prědny wótkaz|prědnej $1 wótkaza|prědne $1 wótkaze|prědnych $1 wótkazow}} k toś tej dataji.
+[[Special:WhatLinksHere/$2|Dopołna lisćina]] stoj k dispoziciji.',
 'nolinkstoimage'                 => 'Žedne boki njewótkazuju na toś tu dataju.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Dalšne wótkazy]] k toś tej dataji wobglědaś.',
 'redirectstofile'                => '{{PLURAL:$1|Slědujuca dataja dalej pósrědnja|Slědujucej $1 dataji dalej pósrědnjatej|slědujuce $1 dataje dalej póšrědnjaju|Slědujucych $1 datajow dalej pósrědnja}} k toś tej dataji:',
-'duplicatesoffile'               => '{{PLURAL:$1|Slědujuca dataja jo duplikat|Slědujucej $1 dataji stej duplikata|Slědujuce dataje $1 su duplikaty|Slědujucych $1 datajow jo duplikaty}} toś teje dataje:',
+'duplicatesoffile'               => '{{PLURAL:$1|Slědujuca dataja jo duplikat|Slědujucej $1 dataji stej duplikata|Slědujuce dataje $1 su duplikaty|Slědujucych $1 datajow jo duplikaty}} toś teje dataje ([[Special:FileDuplicateSearch/$2|dalšne drobnostki]])::',
 'sharedupload'                   => 'Toś ta dataja se gromaźe wužywa - snaź teke w drugich projektach.',
 'shareduploadwiki'               => 'Za dalšne informacije glědaj $1.',
-'shareduploadwiki-desc'          => 'Wopisanje na $1 w zgromadnem skłaźišću Wikimedia commons se dołojce pókazujo.',
+'shareduploadwiki-desc'          => 'Wopisanje na $1 se dołojce pókazujo.',
 'shareduploadwiki-linktext'      => 'boku wopisanja dataje',
 'shareduploadduplicate'          => 'Toś ta dataja jo duplikat $1 z gromaźe wužywaneje chowarnje.',
 'shareduploadduplicate-linktext' => 'druga dataja',
@@ -1292,7 +1447,7 @@ PICT # misc.
 # File deletion
 'filedelete'                  => 'Wulašowaś $1',
 'filedelete-legend'           => 'Wulašowaś dataje',
-'filedelete-intro'            => "Ty wulašujoš '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Lašujoš dataju '''[[Media:$1|$1]]''' gromaźe z jeje cełymi stawiznami.",
 'filedelete-intro-old'        => "Wulašujoš [$4 wersiju wót $2, $3 góź.] dataje '''„[[Media:$1|$1]]“'''.",
 'filedelete-comment'          => 'Komentar:',
 'filedelete-submit'           => 'Wulašowaś',
@@ -1300,7 +1455,6 @@ PICT # misc.
 'filedelete-success-old'      => "Wersija wót $2, $3 góź. dataje '''[[Media:$1|$1]]''' jo se wulašowała.",
 'filedelete-nofile'           => "'''$1''' njeekistěrujo.",
 'filedelete-nofile-old'       => "Njejo archiwowana wersija '''$1''' z pódanymi atributami.",
-'filedelete-iscurrent'        => 'Wopytajoš aktualnu wersiju toś teje dataje wulašowaś. Pšosym aktiwěruj pśed tym staršu wersiju.',
 'filedelete-otherreason'      => 'Druga/pśidatna pśicyna:',
 'filedelete-reason-otherlist' => 'Druga pśicyna',
 'filedelete-reason-dropdown'  => '*Powšykne pśicyny za lašowanja
@@ -1327,30 +1481,31 @@ PICT # misc.
 
 # Random page
 'randompage'         => 'Pśipadny nastawk',
-'randompage-nopages' => 'W toś tom rumje njejsu žedne boki.',
+'randompage-nopages' => 'W mjenjowem rumje "$1" njejsu žedne boki.',
 
 # Random redirect
 'randomredirect'         => 'Pśipadne dalejpósrědnjenje',
-'randomredirect-nopages' => 'W toś tom mjenjowem rumje njeeksistěruju žedne dalejpósrědnjenja.',
+'randomredirect-nopages' => 'W mjenjowem rumje "$1" njejsu dalejpósrědnjenja.',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => 'Statistika {{SITENAME}}',
-'userstats'              => 'Statistika wužywarjow',
-'sitestatstext'          => "W datowej bance {{PLURAL:$1|jo dogromady '''1''' bok|stej dogromady '''$1''' boka|su dogromady '''$1''' boki}}. To wobpśimjejo teke diskusijne boki, boki wó {{SITENAME}}, małe boki, dalejpósrědnjenja a dalšne boki, kótarež njamógu se ewentuelnje ako boki gódnośiś.
-
-Jolic toś te boki se wótlicuju, {{PLURAL:$2|jo '''1''' bok|stej '''$2''' boka|su '''$2''' boki}}, {{PLURAL:$2|kótaryž móžo|kótarejž móžotej|kótarež mógu}} se gódnośiś ako nastawk.
-
-Dogromady jo se uploadowało '''$8''' {{PLURAL:$8|dataja|dataji|dataje}}.
-
-Dogromady {{PLURAL:$3|běšo|běštej|běchu}} '''$3''' {{PLURAL:$3|wótwołanje|wótwołani|wótwołanja}} a '''$4''' {{PLURAL:$4|wobźěłanje|wobźěłani|wobźěłanja}} wót togo casa, až {{SITENAME}} jo se zarědował(o|a).
-
-To wucynjujo '''$5''' {{PLURAL:$5|wobźěłanje|wobźěłani|wobźěłanja}} na bok a '''$6''' {{PLURAL:$6|wótwołanje|wótwołani|wótwołanja}} na wobźěłanje.
-
-Dłujkosć [http://www.mediawiki.org/wiki/Manual:Job_queue „Job queue“]: '''$7'''",
-'userstatstext'          => "Dajo '''$1''' {{PLURAL:$1|registrěrowanego|registrěrowaneju|registrěrowanych}} [[Special:ListUsers|{{PLURAL:$1|wužywarja|wužywarjowu|wužywarjow}}]].
-Wót togo {{PLURAL:$2|jo|stej|su}} '''$2''' (=$4 %) $5.",
-'statistics-mostpopular' => 'Nejwěcej woglědane boki',
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Statistika bokow',
+'statistics-header-edits'      => 'Statistika změnow',
+'statistics-header-views'      => 'Statistiku zwobrazniÅ›',
+'statistics-header-users'      => 'Statistika wužywarjow',
+'statistics-articles'          => 'Wopśimjeśowe boki',
+'statistics-pages'             => 'Boki',
+'statistics-pages-desc'        => 'Wše boki w toś tom wikiju, inkluziwnje diskusijne boki, dalejpósrědnjenja atd.',
+'statistics-files'             => 'Nagrate dataje',
+'statistics-edits'             => 'Změny bokow wót załoženja {{SITENAME}}',
+'statistics-edits-average'     => 'Změny na bok w pśerězku',
+'statistics-views-total'       => 'Zwobraznjenja dogromady',
+'statistics-views-peredit'     => 'Zwobraznjenja na změnu',
+'statistics-jobqueue'          => 'Dłujkosć [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue]',
+'statistics-users'             => 'Zregistrěrowane [[Special:ListUsers|wužywarje]]',
+'statistics-users-active'      => 'Aktiwne wužywarje',
+'statistics-users-active-desc' => 'Wužywarje, kótarež su {{PLURAL:$1|cora|w slědnyma $1 dnjoma|w slědnych $1 dnjach|w slědnych $1 dnjach}} aktiwne byli',
+'statistics-mostpopular'       => 'Nejwěcej woglědane boki',
 
 'disambiguations'      => 'Rozjasnjenja zapśimjeśow',
 'disambiguationspage'  => 'Template:Rozjasnjenje zapśimjeśow',
@@ -1395,26 +1550,30 @@ Bok wobjadnawa se ako bok wujasnjenja zapśimjeśa, gaž wótkazujo na nju [[Med
 'popularpages'            => 'Woblubowane boki',
 'wantedcategories'        => 'Póžedane kategorije',
 'wantedpages'             => 'Póžedane boki',
-'missingfiles'            => 'Felujuce dataje',
+'wantedfiles'             => 'Póžedane dataje',
+'wantedtemplates'         => 'Brachujuce pśedłogi',
 'mostlinked'              => 'Nejcesćej zalinkowane boki',
 'mostlinkedcategories'    => 'Nejcesćej wužywane kategorije',
 'mostlinkedtemplates'     => 'Nejcesćej wužywane psedłogi',
 'mostcategories'          => 'Boki z nejwěcej kategorijami',
 'mostimages'              => 'Nejcesćej wótkazane dataje',
 'mostrevisions'           => 'Boki z nejwěcej wersijami',
-'prefixindex'             => 'WÅ¡ykne nastawki (z prefiksom)',
+'prefixindex'             => 'WÅ¡ykne boki z prefiksom',
 'shortpages'              => 'Krotke nastawki',
 'longpages'               => 'DÅ‚ujke nastawki',
 'deadendpages'            => 'Nastawki bźez wótkazow',
 'deadendpagestext'        => 'Slědujuce boki njewótkazuju na druge boki we {{GRAMMAR:lokatiw|{{SITENAME}}}}.',
 'protectedpages'          => 'Šćitane boki',
 'protectedpages-indef'    => 'Jano boki pokazaś, kótarež su na njewěsty cas šćitane',
+'protectedpages-cascade'  => 'Jano boki z kaskadowym šćitom',
 'protectedpagestext'      => 'Slědujuce boki njamgu se mimo wósebnych pšawow wobźěłaś resp. pśesuwaś',
 'protectedpagesempty'     => 'Z toś tymi parametrami njejsu tuchylu žedne boki šćitane.',
 'protectedtitles'         => 'Šćitane titele',
 'protectedtitlestext'     => 'Slědujuce titele su pśeśiwo twórjenjoju šćitane.',
 'protectedtitlesempty'    => 'Tuchylu njejsu žedne boki z pódanych parametrami šćitane.',
 'listusers'               => 'Lisćina wužywarjow',
+'listusers-editsonly'     => 'Jano wužywarjow ze změnami pokazaś',
+'usereditcount'           => '$1 {{PLURAL:$1|změna|změnje|změny|změnow}}',
 'newpages'                => 'Nowe boki',
 'newpages-username'       => 'Wužywarske mě:',
 'ancientpages'            => 'Nejstarše boki',
@@ -1435,14 +1594,13 @@ Bok wobjadnawa se ako bok wujasnjenja zapśimjeśa, gaž wótkazujo na nju [[Med
 'booksources-search-legend' => 'Knigłowe žrědła pytaś',
 'booksources-go'            => 'PytaÅ›',
 'booksources-text'          => 'To jo lisćina z wótkazami na internetowe boki, kótarež pśedawaju nowe a trjebane knigły. Tam mógu teke dalšne informacije wó knigłach byś. {{SITENAME}} njezwisujo góspodarski z žednym z toś tych póbitowarjow.',
+'booksources-invalid-isbn'  => 'Pódane ISBN-cysło njezda se płaśiwe byś; pséglědaj za zmólkami, z tym až kopěrujoš z originalnego žrědła.',
 
 # Special:Log
 'specialloguserlabel'  => 'Wužywaŕ:',
 'speciallogtitlelabel' => 'Nadpismo:',
 'log'                  => 'Protokole',
 'all-logs-page'        => 'WÅ¡ykne protokole',
-'log-search-legend'    => 'Protokole pytaÅ›',
-'log-search-submit'    => 'Start',
 'alllogstext'          => 'To jo kombiněrowane zwobraznjenje wšyknych we {{GRAMMAR:lokatiw|{{SITENAME}}}} k dispoziciji stojecych protokolow. Móžoš naglěd pśez wubraśe protokolowego typa, wužywarskego mjenja (pód źiwanim wjelikopisanja) abo pótrjefjonego boka (teke pód źiwanim wjelikopisanja) wobgranicowaś.',
 'logempty'             => 'Žedne se góźece zapise njeeksistěruju.',
 'log-title-wildcard'   => 'Pytaś nadpismo, kótarež zachopijo z ...',
@@ -1453,6 +1611,7 @@ Bok wobjadnawa se ako bok wujasnjenja zapśimjeśa, gaž wótkazujo na nju [[Med
 'nextpage'          => 'Slědujucy bok ($1)',
 'prevpage'          => 'Pśedchadny bok ($1)',
 'allpagesfrom'      => 'Boki pokazaś wót:',
+'allpagesto'        => 'Boki zwobrazniś, kótarež kóńce se na:',
 'allarticles'       => 'WÅ¡ykne nastawki',
 'allinnamespace'    => 'WÅ¡ykne boki (mjenjowy rum: $1)',
 'allnotinnamespace' => 'WÅ¡ykne boki (nic w mjenjowem rumje $1)',
@@ -1470,40 +1629,68 @@ Bok wobjadnawa se ako bok wujasnjenja zapśimjeśa, gaž wótkazujo na nju [[Med
 'special-categories-sort-count' => 'pśewuběrowaś pó licbje',
 'special-categories-sort-abc'   => 'pśewuběrowaś pó alfabeśe',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Wulašowane wužywarske pśinoski',
+
+# Special:LinkSearch
+'linksearch'       => 'Eksterne wótkaze',
+'linksearch-pat'   => 'Pytański muster:',
+'linksearch-ns'    => 'Mjenjowy rum:',
+'linksearch-ok'    => 'PytaÅ›',
+'linksearch-text'  => 'Jo móžno zastupne znamješka kaž "*.wikipedia.org" wužywaś.<br />
+Pódpěrane protokole: <tt>$1</tt>',
+'linksearch-line'  => '$1 wótkazany z $2',
+'linksearch-error' => 'Zasupne znamješko daju se jano na zachopjeńku URL wužywaś.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Pokaž wužywarjow wót:',
 'listusers-submit'   => 'PokazaÅ›',
 'listusers-noresult' => 'Žeden wužywaŕ njejo se namakał.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Protokol nowych wužywarjow',
+'newuserlogpagetext'          => 'To jo protokol wó nowych wužywarskich kontow.',
+'newuserlog-byemail'          => 'Pótajne słowo bu pśez e-mail pósłane.',
+'newuserlog-create-entry'     => 'Nowy wužywaŕ',
+'newuserlog-create2-entry'    => 'Nowe konto za $1 napórane.',
+'newuserlog-autocreate-entry' => 'Wužywarske konto bu awtomatiski napórane',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Pšawa wužywarskeje kupki',
-'listgrouprights-summary'  => 'To jo lisćina wužywarskich kupkow definěrowanych w toś tom wikiju z jich zwězanymi pśistupnymi pšawami. Móžo [[{{MediaWiki:Listgrouprights-helppage}}|pśidatne informacije]] wó jadnotliwych pšawach daś.',
-'listgrouprights-group'    => 'Kupka',
-'listgrouprights-rights'   => 'PÅ¡awa',
-'listgrouprights-helppage' => 'Help:Kupkowe pšawa',
-'listgrouprights-members'  => '(lisćina cłonkow)',
+'listgrouprights'                 => 'Pšawa wužywarskeje kupki',
+'listgrouprights-summary'         => 'To jo lisćina wužywarskich kupkow definěrowanych w toś tom wikiju z jich zwězanymi pśistupnymi pšawami. Móžo [[{{MediaWiki:Listgrouprights-helppage}}|pśidatne informacije]] wó jadnotliwych pšawach daś.',
+'listgrouprights-group'           => 'Kupka',
+'listgrouprights-rights'          => 'PÅ¡awa',
+'listgrouprights-helppage'        => 'Help:Kupkowe pšawa',
+'listgrouprights-members'         => '(lisćina cłonkow)',
+'listgrouprights-addgroup'        => 'Móžo pśidaś {{PLURAL:$2|kupku|kupce|kupki|kupkow}}: $1',
+'listgrouprights-removegroup'     => 'Móžo wótwónoźeś {{PLURAL:$2|kupku|kupce|kupki|kupkow}}: $1',
+'listgrouprights-addgroup-all'    => 'Móžo pśidaś wšykne kupki',
+'listgrouprights-removegroup-all' => 'Móžo wótwónoźeś wšykne kupki',
 
 # E-mail user
-'mailnologin'     => 'Njejo móžno e-mailku pósłaś.',
-'mailnologintext' => 'Dejš [[Special:UserLogin|pśizjawjony]] byś a płaśiwu e-mailowu adresu w swójich [[Special:Preferences|nastajenjach]] měś, aby drugim wužywarjam e-mail pósłał.',
-'emailuser'       => 'Toś tomu wužywarjeju e-mail pósłaś',
-'emailpage'       => 'E-mail wužywarjeju',
-'emailpagetext'   => 'Móžoš slědujucy formular wužywaś, aby toś tomu wužywarjeju e-mail pósłał.
+'mailnologin'      => 'Njejo móžno e-mailku pósłaś.',
+'mailnologintext'  => 'Dejš [[Special:UserLogin|pśizjawjony]] byś a płaśiwu e-mailowu adresu w swójich [[Special:Preferences|nastajenjach]] měś, aby drugim wužywarjam e-mail pósłał.',
+'emailuser'        => 'Toś tomu wužywarjeju e-mail pósłaś',
+'emailpage'        => 'E-mail wužywarjeju',
+'emailpagetext'    => 'Móžoš slědujucy formular wužywaś, aby toś tomu wužywarjeju e-mail pósłał.
 E-mailowa adresa, kótaruž sy zapódał w [[Special:Preferences|swójich wužywarskich nastajenjach]], zjawi se ako adresa w pólu "Wót" e-maile, aby dostawaŕ móžo śi direktnje wótegroniś.',
-'usermailererror' => 'E-mailowy objekt jo zmólku wrośił.',
-'defemailsubject' => '{{SITENAME}} e-mail',
-'noemailtitle'    => 'E-mailowa adresa felujo.',
-'noemailtext'     => 'Toś ten wužywaŕ njama aktualnu emailowu adresu, abo njoco dostawaś powěsći wót drugich wužywarjow.',
-'emailfrom'       => 'Wót:',
-'emailto'         => 'Komu:',
-'emailsubject'    => 'Tema:',
-'emailmessage'    => 'Powěsć:',
-'emailsend'       => 'Wótpósłaś',
-'emailccme'       => 'Pósćel mě kopiju e-maila.',
-'emailccsubject'  => 'Kopija Twójeje powěsći na $1: $2',
-'emailsent'       => 'e-mail wótposłany',
-'emailsenttext'   => 'Twój e-mail jo se wótpósłał.',
-'emailuserfooter' => 'Toś ta e-mailka jo se z pomocu funkcije "Toś tomu wužywarjeju e-mail pósłaś" na {{SITENAME}} wót $1 do $2 pósłała.',
+'usermailererror'  => 'E-mailowy objekt jo zmólku wrośił.',
+'defemailsubject'  => '{{SITENAME}} e-mail',
+'noemailtitle'     => 'E-mailowa adresa felujo.',
+'noemailtext'      => 'Toś ten wužywaŕ njejo pódał płaśiwu e-mailowu adresu.',
+'nowikiemailtitle' => 'Žedna e-mail dowólona',
+'nowikiemailtext'  => 'Toś ten wužywaŕ njoco žednu e-mail wót drugich wužywarjow dostaś.',
+'email-legend'     => 'Drugemu wužywarjeju {{SITENAME}} e-mail pósłaś',
+'emailfrom'        => 'Wót:',
+'emailto'          => 'Komu:',
+'emailsubject'     => 'Tema:',
+'emailmessage'     => 'Powěsć:',
+'emailsend'        => 'Wótpósłaś',
+'emailccme'        => 'Pósćel mě kopiju e-maila.',
+'emailccsubject'   => 'Kopija Twójeje powěsći na $1: $2',
+'emailsent'        => 'e-mail wótposłany',
+'emailsenttext'    => 'Twój e-mail jo se wótpósłał.',
+'emailuserfooter'  => 'Toś ta e-mailka jo se z pomocu funkcije "Toś tomu wužywarjeju e-mail pósłaś" na {{SITENAME}} wót $1 do $2 pósłała.',
 
 # Watchlist
 'watchlist'            => 'Wobglědowańka',
@@ -1537,12 +1724,7 @@ Coš-lic bok zasej z twójich wobglědowańkow wulašowaś, kliknij na wótpowě
 'iteminvalidname'      => 'Problem ze zapisom „$1“, njepłaśece mě.',
 'wlnote'               => "{{PLURAL:$1|Slědujo slědna změna|slědujotej '''$1''' slědnej změnje|slěduju slědne '''$1''' změny}} {{PLURAL:$2|slědneje góźiny|slědneju '''$2''' góźinowu|slědnych '''$2''' góźinow}}.",
 'wlshowlast'           => 'Pokaž změny slědnych $1 góźinow, $2 dnjow abo $3 (w slědnych 30 dnjach).',
-'watchlist-show-bots'  => 'Wobźěłanja awtomatiskich programow (botow) pokazaś',
-'watchlist-hide-bots'  => 'Wobźěłanja awtomatiskich programow (botow) schowaś',
-'watchlist-show-own'   => 'Móje wobźěłanja pokazaś',
-'watchlist-hide-own'   => 'Móje wobźěłanja schowaś',
-'watchlist-show-minor' => 'Pokazaś małe wobźěłanja',
-'watchlist-hide-minor' => 'Schowaś małe wobźěłanja',
+'watchlist-options'    => 'Opcije wobglědowańki',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Wobglědowaś …',
@@ -1578,56 +1760,62 @@ Dalšne e-mailowe powěsći se tak dłujko njepósćelu, až njejsy bok zasej wo
 --
 Aby nastajenja twójich wobglědowańkow změnił, woglědaj: {{fullurl:Special:Watchlist/edit}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Bok wulašowaś',
-'confirm'                     => 'Wobkšuśiś',
-'excontent'                   => "wopśimjeśe jo było: '$1'",
-'excontentauthor'             => "wopśimjeśe jo było: '$1' (a jadnu�ki wobźěłaŕ jo był '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Wopśimjeśe do wuprozdnjenja jo było: '$1'",
-'exblank'                     => 'bok jo był prozny',
-'delete-confirm'              => '„$1“ lašowaś',
-'delete-legend'               => 'Lašowaś',
-'historywarning'              => 'Glědaj! Bok, kótaryž coš wulašowaś, ma stawizny:',
-'confirmdeletetext'           => 'Coš bok abo dataju ze wšyknymi pśisłušnymi wersijami na pśecej wulašowaś. Pšosym wobkšuś, až sy se wědobny, kake konsekwency móžo to měś, a až jadnaš pó [[{{MediaWiki:Policy-url}}|směrnicach]].',
-'actioncomplete'              => 'Akcija jo se wugbała.',
-'deletedtext'                 => '„<nowiki>$1</nowiki>“ jo se wulašował(a/o). W $2 namakajoš lisćinu slědnych wulašowanjow.',
-'deletedarticle'              => 'wulašowane "[[$1]]"',
-'suppressedarticle'           => '"[[$1]]" pódtłocony',
-'dellogpage'                  => 'log-lisćina wulašowanjow',
-'dellogpagetext'              => 'How jo log-lisćina wulašowanych bokow a datajow.',
-'deletionlog'                 => 'log-lisćina wulašowanjow',
-'reverted'                    => 'Nawrośone na staršu wersiju',
-'deletecomment'               => 'Pśicyna wulašowanja:',
-'deleteotherreason'           => 'Druga/pśidatna pśicyna:',
-'deletereasonotherlist'       => 'Druga pśicyna',
-'deletereason-dropdown'       => '* Powšykne pśicyny za lašowanja
+# Delete
+'deletepage'             => 'Bok wulašowaś',
+'confirm'                => 'Wobkšuśiś',
+'excontent'              => "wopśimjeśe jo było: '$1'",
+'excontentauthor'        => "wopśimjeśe jo było: '$1' (a jadnu�ki wobźěłaŕ jo był '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "Wopśimjeśe do wuprozdnjenja jo było: '$1'",
+'exblank'                => 'bok jo był prozny',
+'delete-confirm'         => '„$1“ lašowaś',
+'delete-legend'          => 'Lašowaś',
+'historywarning'         => 'Glědaj! Bok, kótaryž coš wulašowaś, ma stawizny:',
+'confirmdeletetext'      => 'Coš bok abo dataju ze wšyknymi pśisłušnymi wersijami na pśecej wulašowaś. Pšosym wobkšuś, až sy se wědobny, kake konsekwency móžo to měś, a až jadnaš pó [[{{MediaWiki:Policy-url}}|směrnicach]].',
+'actioncomplete'         => 'Akcija jo se wugbała.',
+'deletedtext'            => '„<nowiki>$1</nowiki>“ jo se wulašował(a/o). W $2 namakajoš lisćinu slědnych wulašowanjow.',
+'deletedarticle'         => 'wulašowane "[[$1]]"',
+'suppressedarticle'      => '"[[$1]]" pódtłocony',
+'dellogpage'             => 'log-lisćina wulašowanjow',
+'dellogpagetext'         => 'How jo log-lisćina wulašowanych bokow a datajow.',
+'deletionlog'            => 'log-lisćina wulašowanjow',
+'reverted'               => 'Nawrośone na staršu wersiju',
+'deletecomment'          => 'Pśicyna wulašowanja:',
+'deleteotherreason'      => 'Druga/pśidatna pśicyna:',
+'deletereasonotherlist'  => 'Druga pśicyna',
+'deletereason-dropdown'  => '* Powšykne pśicyny za lašowanja
 ** Žycenje awtora
 ** Pśekśiwjenje stworiśelskego pšawa
 ** Wandalizm',
-'delete-edit-reasonlist'      => 'Pśicyny za lašowanje wobźěłaś',
-'delete-toobig'               => 'Toś ten bok ma z wěcej nježli $1 {{PLURAL:$1|wersiju|wersijomaj|wersijami|wersijami}} dłujku historiju. Lašowanje takich bokow bu wobgranicowane, aby wobškoźenju {{GRAMMAR:genitiw|{{SITENAME}}}} z pśigódy zajźowało.',
-'delete-warning-toobig'       => 'Toś ten bok ma z wěcej ako $1 {{PLURAL:$1|wersiju|wersijomaj|wersijami|wersijami}} dłujke stawizny. Jich wulašowanje móžo źěło datoweje banki na {{SITENAME}} kazyś;
+'delete-edit-reasonlist' => 'Pśicyny za lašowanje wobźěłaś',
+'delete-toobig'          => 'Toś ten bok ma z wěcej nježli $1 {{PLURAL:$1|wersiju|wersijomaj|wersijami|wersijami}} dłujku historiju. Lašowanje takich bokow bu wobgranicowane, aby wobškoźenju {{GRAMMAR:genitiw|{{SITENAME}}}} z pśigódy zajźowało.',
+'delete-warning-toobig'  => 'Toś ten bok ma z wěcej ako $1 {{PLURAL:$1|wersiju|wersijomaj|wersijami|wersijami}} dłujke stawizny. Jich wulašowanje móžo źěło datoweje banki na {{SITENAME}} kazyś;
 póstupujśo z glědanim.',
-'rollback'                    => 'Wobźěłanja slědk wześ',
-'rollback_short'              => 'anulěrowaś',
-'rollbacklink'                => 'anulěrowaś',
-'rollbackfailed'              => 'Slědkwześe njejo se raźiło.',
-'cantrollback'                => 'Njejo móžno změnu slědk wześ, slědny pśinosowaŕ jo jadnu�ki awtor boka.',
-'alreadyrolled'               => 'Njejo móžno slědnu změnu w nastawku [[:$1]] wót [[User:$2|$2]] ([[User talk:$2|diskusija]] | [[Special:Contributions/$2|{{int:contribslink}}]]) slědk wześ; drugi wužywaŕ jo mjaztym bok změnił abo južo slědk stajił .
-
-Slědnu změnu k bokoju jo pśewjadł [[User:$3|$3]] ([[User talk:$3|diskusija]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Komentar ku slědnej změnje jo był: „<i>$1</i>“.', # only shown if there is an edit comment
-'revertpage'                  => 'Změny wužywarja [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]) su se wótwrośili a slědna wersija wužywarja [[User:$1|$1]] jo se wótnowiła.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Změny wót $1 su se slědk wzeli a slědna wersija wót $2 jo zasej se nawrośiła.',
-'sessionfailure'              => 'Problem z twójim wužywarskim pósejźenim jo se wujawił.
+
+# Rollback
+'rollback'         => 'Wobźěłanja slědk wześ',
+'rollback_short'   => 'anulěrowaś',
+'rollbacklink'     => 'anulěrowaś',
+'rollbackfailed'   => 'Slědkwześe njejo se raźiło.',
+'cantrollback'     => 'Njejo móžno změnu slědk wześ, slědny pśinosowaŕ jo jadnu�ki awtor boka.',
+'alreadyrolled'    => 'Njejo móžno slědnu změnu w nastawku [[:$1]] wót [[User:$2|$2]] ([[User talk:$2|diskusija]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) slědk wześ; drugi wužywaŕ jo mjaztym bok změnił abo južo slědk stajił .
+
+Slědnu změnu k bokoju jo pśewjadł [[User:$3|$3]] ([[User talk:$3|diskusija]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Zapominanje k slědnej změnje jo było: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Změny wužywarja [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]) su se wótwrośili a slědna wersija wužywarja [[User:$1|$1]] jo se wótnowiła.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Změny wót $1 su se slědk wzeli a slědna wersija wót $2 jo zasej se nawrośiła.',
+'sessionfailure'   => 'Problem z twójim wužywarskim pósejźenim jo se wujawił.
 Wěstoty dla jo akcija se pśetergnuła, aby se zadorało wopacnemu pśirědowanjoju twójeje změny drugemu wužywarjeju.
 Pšosym nawroś se na bok, wót kótaregož sy pśišeł a wopytaj hyšći raz.',
+
+# Protect
 'protectlogpage'              => 'Log-lisćina šćitanych bokow.',
 'protectlogtext'              => 'To jo log-lisćina šćitanych bokow. Glědaj do [[Special:ProtectedPages|lisćiny šćitanych bokow]], aby wiźeł wšykne aktualnje šćitane boki.',
 'protectedarticle'            => 'Bok „[[$1]]“ jo se šćitał.',
 'modifiedarticleprotection'   => 'Šćitanska rownina za „[[$1]]“ jo se změniła.',
 'unprotectedarticle'          => 'Šćit za „[[$1]]“ jo se wótpórał.',
+'movedarticleprotection'      => 'šćitowe nastajenja z "[[$2]]" do "[[$1]]" psésunjone',
 'protect-title'               => 'Šćit boka „$1“ změniś',
+'prot_1movedto2'              => '„[[$1]]“ pśesunjone na „[[$2]]“',
 'protect-legend'              => 'Šćitanje wobkšuśiś',
 'protectcomment'              => 'Komentar:',
 'protectexpiry'               => 'cas wótběžy:',
@@ -1635,18 +1823,31 @@ Pšosym nawroś se na bok, wót kótaregož sy pśišeł a wopytaj hyšći raz.'
 'protect_expiry_old'          => 'Zapódany cas jo wótběžał.',
 'protect-unchain'             => 'Šćit pśed pśesunjenim změniś',
 'protect-text'                => "How móžoš status šćita boka '''<nowiki>$1</nowiki>''' wobglědowaś a jen změniś.",
-'protect-locked-blocked'      => 'Njamóžoš status šćita togo boka změniś, dokulaž jo twójo wužywarske konto se blokěrowało. How su aktualne nastajenja šćita za bok <strong>„$1“:</strong>.',
-'protect-locked-dblock'       => 'Datowa banka jo zamknjona a toś njejo móžno šćit boka změniś. How su aktualne nastajenja šćita za bok <strong>„$1“:</strong>.',
-'protect-locked-access'       => 'Wašo wužywarske konto njama notne pšawa za změnu šćita toś togo boka. How su aktualne nastajenja šćita boka <strong>„$1“:</strong>.',
+'protect-locked-blocked'      => "Njamóžoš status šćita togo boka změniś, dokulaž jo twójo wužywarske konto se blokěrowało. How su aktualne nastajenja šćita za bok '''„$1“:'''.",
+'protect-locked-dblock'       => "Datowa banka jo zamknjona a toś njejo móžno šćit boka změniś. How su aktualne nastajenja šćita za bok '''„$1“:'''.",
+'protect-locked-access'       => "Wašo wužywarske konto njama notne pšawa za změnu šćita toś togo boka. How su aktualne nastajenja šćita boka '''„$1“:'''.",
 'protect-cascadeon'           => 'Toś ten bok jo tuchylu šćitany, dokulaž jo zawězany do {{PLURAL:$1|slědujucego boka|slědujuceju bokowu|slědujucych bokow}}, źož kaskadowy šćit jo aktiwěrowany. Status šćita móžo se za toś ten bok změniś, to ale njewówliwujo kaskadowy šćit:',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Wšyknym wužywarjam dowóliś',
 'protect-fallback'            => 'Slědujuce pšawo jo notne: „$1“.',
-'protect-level-autoconfirmed' => 'Za njeregistrěrowane wužywarje blokěrowaś',
+'protect-level-autoconfirmed' => 'Nowych a njeregistrěrowanych wužywarjow blokěrowaś',
 'protect-level-sysop'         => 'Jano administratory',
 'protect-summary-cascade'     => 'kaskaděrujucy',
 'protect-expiring'            => 'kóńcy $1 (UTC)',
+'protect-expiry-indefinite'   => 'njewobgranicowany',
 'protect-cascade'             => 'Kaskaděrujucy šćit – wšykne pśedłogi, kótarež su zawězane do toś togo boka, tejerownosći se zamknu.',
 'protect-cantedit'            => 'Njamóžoš šćitne rowniny toś tego boka změniś, dokulaž njamaš dowólnosć toś ten bok wobźěłaś.',
+'protect-othertime'           => 'Drugi cas:',
+'protect-othertime-op'        => 'drugi cas',
+'protect-existing-expiry'     => 'Eksistěrujucy cas pśepadnjenja: $2, $3',
+'protect-otherreason'         => 'Druga/pśidatna pśicyna:',
+'protect-otherreason-op'      => 'Druga/pśidatna pśicyna',
+'protect-dropdown'            => '*Powšykne šćitowe pśicyny
+** Ekscesiwny wanadalizm
+** Ekscesiwne spamowanje
+** Wobźěłańska wójna
+** Bok z wusokim datowym wobchadom',
+'protect-edit-reasonlist'     => 'Šćitne pśicyny wobźěłaś',
+'protect-expiry-options'      => '1 góźina:1 hour,1 źeń:1 day,1 tyźeń:1 week,2 tyźenja:2 weeks,1 mjasec:1 month,3 mjasece:3 months,6 mjasecy:6 months,1 lěto:1 year,na nimjer:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Status šćita',
 'restriction-level'           => 'Rownina šćita:',
 'minimum-size'                => 'Minimalna wjelikosć',
@@ -1669,7 +1870,8 @@ Pšosym nawroś se na bok, wót kótaregož sy pśišeł a wopytaj hyšći raz.'
 'undeletepage'                 => 'Wulašowane boki pokazaś a nawrośiś.',
 'undeletepagetitle'            => "'''Slědujuce wudaśe wobstoj z wulašowanych wersijow wót [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Wulašowane boki pokazaś',
-'undeletepagetext'             => 'Slědujuce boki su se wulašowali a mógu wót administratorow zasej se nawrośiś:',
+'undeletepagetext'             => '{{PLURAL:$1|Slědujucy bok jo se wulašował, ale jo|Slědujucej $1 boka stej se wulašowałej, ale stej|Slědujuce $1 boki su se wulašowali, ale su|Slědujucych $1 bokow jo se wulašowało, ale jo}} hyšći w archiwje a {{PLURAL:$1|dajo|dajotej|daju|dajo}} se nawrośiś.
+Archiw dajo se periodiski wuprozniÅ›.',
 'undelete-fieldset-title'      => 'Wersije wótnowiś',
 'undeleteextrahelp'            => "Aby wšyknymi wersijami boka nawrośiś, wóstaj wšykne kontrolowe kašćiki prozne a klikni na zapódaj '''''Nawrośíś'''''.
 Aby jano wěste wersije nawrośił, wubjeŕ kašćiki, kótarež wótpowěduju wersijam, kótarež maju se nawrośiś a klikni na '''''Nawrośiś'''''.
@@ -1680,12 +1882,13 @@ Joli až jo se wutwórił nowy bok ze samskim mjenim wót casa wulašowanja, naw
 'undeleterevdel'               => 'Nawrośenje njejo móžne, gaž wjeźo k nejwušemu bokoju abo datajowej wersiji, kótaraž se pó źělach lašujo. 
 W takich padach dejš nejnowše wulašowane wersije markěroanje abo schowanje wótpóraś.',
 'undeletehistorynoadmin'       => 'Toś ten bok jo se wulašował. Pśicyna wulašowanja pokazujo se w zespominanju. Tam stoje teke nadrobnosći wó wužywarjach, kótarež su bok pśed wulašowanim wobźěłali. Aktualny tekst toś tych wulašowanych wersijow jo jano administratoram pśistupny.',
-'undelete-revision'            => 'Wulašowane wersije wót $1 - $2, $3:',
+'undelete-revision'            => 'Wulašowana wersija boka $1 (wót $4, $5) wót $3:',
 'undeleterevision-missing'     => 'Njepłaśeca abo felujuca wersija. Snaź jo link wopacny abo wersija jo z archiwa se nawrośiła resp. wulašowała.',
 'undelete-nodiff'              => 'Žedne něgajšne wersije',
 'undeletebtn'                  => 'Wulašowaś',
 'undeletelink'                 => 'wótnowiś',
 'undeletereset'                => 'Slědk wześ',
+'undeleteinvert'               => 'Wuběrk pśewobrośiś',
 'undeletecomment'              => 'Wobtwarźenje:',
 'undeletedarticle'             => 'bok „[[$1]]“ nawrośony',
 'undeletedrevisions'           => '{{PLURAL:$1|1 wersija jo se nawrośiła|$1 wersiji stej se nawrośiłej|$1 wersije su se nawrośili}}.',
@@ -1717,26 +1920,27 @@ $1',
 'blanknamespace' => '(Nastawki)',
 
 # Contributions
-'contributions' => 'Wužywarske pśinoski',
-'mycontris'     => 'Móje pśinoski',
-'contribsub2'   => 'Za $1 ($2)',
-'nocontribs'    => 'Za toś te kriterije njejsu žedne změny se namakali.',
-'uctop'         => '(aktualny)',
-'month'         => 'wót mjaseca (a jěsnjej):',
-'year'          => 'wót lěta (a jěsnjej):',
-
-'sp-contributions-newbies'     => 'Pśinoski jano za nowych wužywarjow pokazaś',
-'sp-contributions-newbies-sub' => 'Za nowackow',
-'sp-contributions-blocklog'    => 'Log-lisćina blokěrowanjow',
-'sp-contributions-search'      => 'Pśinoski pytaś',
-'sp-contributions-username'    => 'IP-adresa abo wužywarske mě:',
-'sp-contributions-submit'      => 'PytaÅ›',
+'contributions'       => 'Wužywarske pśinoski',
+'contributions-title' => 'Wužywarske pśinoski wót $1',
+'mycontris'           => 'Móje pśinoski',
+'contribsub2'         => 'Za $1 ($2)',
+'nocontribs'          => 'Za toś te kriterije njejsu žedne změny se namakali.',
+'uctop'               => '(aktualny)',
+'month'               => 'wót mjaseca (a jěsnjej):',
+'year'                => 'wót lěta (a jěsnjej):',
+
+'sp-contributions-newbies'       => 'Pśinoski jano za nowych wužywarjow pokazaś',
+'sp-contributions-newbies-sub'   => 'Za nowackow',
+'sp-contributions-newbies-title' => 'Wužywarske pśinoski nowych kontow',
+'sp-contributions-blocklog'      => 'Log-lisćina blokěrowanjow',
+'sp-contributions-search'        => 'Pśinoski pytaś',
+'sp-contributions-username'      => 'IP-adresa abo wužywarske mě:',
+'sp-contributions-submit'        => 'PytaÅ›',
 
 # What links here
 'whatlinkshere'            => 'Wótkaze na toś ten bok',
 'whatlinkshere-title'      => 'Boki, kótarež wótkazuju na "$1"',
 'whatlinkshere-page'       => 'bok:',
-'linklistsub'              => '(Lisćina wótkazow)',
 'linkshere'                => "Toś te boki wótkazuju na '''„[[:$1]]“''':",
 'nolinkshere'              => "Žedne boki njewótkazuju na '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Žedne boki we wubranem mjenjowem rumje njewótkazuju na '''[[:$1]]'''.",
@@ -1780,6 +1984,8 @@ $1',
 'ipbotherreason'                  => 'Hynakša/dalšna pśicyna:',
 'ipbhidename'                     => 'Wužywarske mě z protokola blokěrowanjow, lisćiny aktiwnych blokěrowanjow a lisćiny wužywarjow schowaś',
 'ipbwatchuser'                    => 'Wužywarski a diskusijny bok toś togo wužywarja wobglědowaś',
+'ipballowusertalk'                => 'Toś tomu wužywarjeju dowóliś swój diskusijny bok wobźěłaś, mjazytm až jo blokěrowany.',
+'ipb-change-block'                => 'Wužywarja z toś tymi nastajenjami znowego blokěrowaś',
 'badipaddress'                    => 'IP-adresa jo njekorektna',
 'blockipsuccesssub'               => 'Wuspěšnje blokěrowane',
 'blockipsuccesstext'              => 'Wužywaŕ/IP-adresa [[Special:Contributions/$1|$1]] jo se blokěrował(a).<br />
@@ -1789,14 +1995,18 @@ Glědaj do [[Special:IPBlockList|lisćiny aktiwnych blokěrowanjow]].',
 'ipb-unblock'                     => 'Wužywarske mě abo IP-adresu dopušćiś',
 'ipb-blocklist-addr'              => 'Eksistěrujuce blokěrowanja za $1',
 'ipb-blocklist'                   => 'Wšykne aktualne blokěrowanja pokazaś',
+'ipb-blocklist-contribs'          => 'Pśinoski za $1',
 'unblockip'                       => 'Wužywarja dopušćiś',
 'unblockiptext'                   => 'Z pomocu dołojcnego formulara móžotej IP-adresa abo wužywaŕ zasej se dopušćiś.',
-'ipusubmit'                       => 'adresu dopušćiś',
+'ipusubmit'                       => 'Toś to blokěrowanje wótpóraś',
 'unblocked'                       => 'Wužywaŕ [[User:$1|$1]] jo zasej se dopušćił.',
 'unblocked-id'                    => '$1 jo se dopušćił(a).',
 'ipblocklist'                     => 'Blokěrowane IP-adrese a wužywarske mjenja',
 'ipblocklist-legend'              => 'Blokěrowanego wužywarja pytaś',
 'ipblocklist-username'            => 'Wužywarske mě abo IP-adresa:',
+'ipblocklist-sh-userblocks'       => 'Kontowe blokěrowanja $1',
+'ipblocklist-sh-tempblocks'       => 'nachylne blokěrowanja $1',
+'ipblocklist-sh-addressblocks'    => 'Blokěrowanja jadnotliwych IP $1',
 'ipblocklist-submit'              => 'PytaÅ›',
 'blocklistline'                   => '$1, $2 jo blokěrował $3 (až do $4)',
 'infiniteblock'                   => 'njewobgranicowany',
@@ -1805,14 +2015,18 @@ Glědaj do [[Special:IPBlockList|lisćiny aktiwnych blokěrowanjow]].',
 'noautoblockblock'                => 'awtomatiske blokěrowanje znjemóžnjone',
 'createaccountblock'              => 'wutwórjenje wužywarskich kontow znjemóžnjone',
 'emailblock'                      => 'Pósłanje e-mailow jo se blokěrowało.',
+'blocklist-nousertalk'            => 'njemóžno swójski diskusijny bok wobźěłaś',
 'ipblocklist-empty'               => 'Lisćina jo prozna.',
 'ipblocklist-no-results'          => 'Póžedana IP-Adresa abo wužywarske mě njejstej blokěrowanej.',
 'blocklink'                       => 'blokěrowaś',
 'unblocklink'                     => 'dopušćiś',
+'change-blocklink'                => 'Blokěrowanje změniś',
 'contribslink'                    => 'pśinoski',
 'autoblocker'                     => 'Twója IP-adresa jo awtomatiski se blokěrowała, dokulaž jo ju wužywał „$1“. Pśicyna blokěrowanja wužywarja „$1“ jo: „$2“.',
 'blocklogpage'                    => 'Log-lisćina blokěrowanjow',
+'blocklog-fulllog'                => 'Dopołny protokol blokěrowanjow',
 'blocklogentry'                   => '[[$1]] blokěrujo se na $2 $3',
+'reblock-logentry'                => 'jo změnił blokěrowańske nastajenja za [[$1]] z casom spadnjenja $2 $3',
 'blocklogtext'                    => 'To jo log-lisćina blokěrowanjow a dopušćenjow.
 IP-adresy, ako su awtomatiski se blokěrowali, se njepokažu.
 Na boce [[Special:IPBlockList|Lisćina blokěrowanych IP-adresow a wužywarskich mjenjow]] jo móžno, akualne blokěrowanja pśeglědowaś.',
@@ -1821,11 +2035,14 @@ Na boce [[Special:IPBlockList|Lisćina blokěrowanych IP-adresow a wužywarskich
 'block-log-flags-nocreate'        => 'stwórjenje konta jo se znjemóžniło',
 'block-log-flags-noautoblock'     => 'awtomatiske blokěrowanje jo deaktiwěrowane',
 'block-log-flags-noemail'         => 'e-mailowanje jo blokěrowane',
+'block-log-flags-nousertalk'      => 'njejo móžno swójski diskusijny bok wobźěłaś',
 'block-log-flags-angry-autoblock' => 'pólěpšone awtomatsike blokěrowanje zmóžnjone',
 'range_block_disabled'            => 'Móžnosć administratora, blokěrowaś cełe adresowe rumy, njejo aktiwěrowana.',
 'ipb_expiry_invalid'              => 'Pódany cas jo njepłaśecy.',
 'ipb_expiry_temp'                 => 'Blokěrowanja schowanych wužywarskich mjenjow deje permanentne byś.',
 'ipb_already_blocked'             => '"$1" jo južo blokěrowany.',
+'ipb-needreblock'                 => '== Južo zablokěrowany ==
+$1 jo južo zablokěrowany. Coš nastajenja změniś?',
 'ipb_cant_unblock'                => 'Zmólka: Blokěrowańska ID $1 njejo se namakała. Blokěrowanje jo było južo wótpórane.',
 'ipb_blocked_as_range'            => 'Zmólka: IP-adresa $1 njejo direktnje blokěrowana a njeda se wótblokěrowaś. Jo pak ako źěl wobcerka $2 blokěrowana, kótaryž da se wótblokěrowaś.',
 'ip_range_invalid'                => 'Njepłaśecy wobłuk IP-adresow.',
@@ -1836,6 +2053,7 @@ Na boce [[Special:IPBlockList|Lisćina blokěrowanych IP-adresow a wužywarskich
 'proxyblocksuccess'               => 'Gótowe.',
 'sorbsreason'                     => 'Twója IP-adresa jo w DNSBL we {{GRAMMAR:lokatiw|{{SITENAME}}}} zapisana ako wócynjony proxy.',
 'sorbs_create_account_reason'     => 'Twója IP-adresa jo w DNSBL {{GRAMMAR:genitiw|{{SITENAME}}}} ako wócynjony proxy zapisana. Njejo móžno, nowe wužywarske konta załožowaś.',
+'cant-block-while-blocked'        => 'Njesmějoš žednych drugich wužywarjow blokěrowaś, mjaztym až ty sy blokěrowany.',
 
 # Developer tools
 'lockdb'              => 'Datowu banku zamknuÅ›',
@@ -1856,9 +2074,9 @@ Na boce [[Special:IPBlockList|Lisćina blokěrowanych IP-adresow a wužywarskich
 'databasenotlocked'   => 'Datowa banka njejo zamknjona.',
 
 # Move page
-'move-page'               => '$1 pśesunuś',
-'move-page-legend'        => 'Bok pśesunuś',
-'movepagetext'            => "Z pomocu slědujucego formulara móžoš bok pśemjenjowaś, pśi comž se jogo wersije k nowemu mjenjoju pśesuwaju.
+'move-page'                    => '$1 pśesunuś',
+'move-page-legend'             => 'Bok pśesunuś',
+'movepagetext'                 => "Z pomocu slědujucego formulara móžoš bok pśemjenjowaś, pśi comž se jogo wersije k nowemu mjenjoju pśesuwaju.
 Stary titel wordujo dalejpósrědnjeński bok k nowemu titeloju.
 Móžoš awtomatiski aktualizěrowaś dalejposrědkowanja, kótarež pokazuju na originalny titel.
 Jolic njocoš, pśeglědaj za [[Special:DoubleRedirects|dwójnymi]] abo [[Special:BrokenRedirects|defektnymi daleposrědkowanjami]].
@@ -1869,47 +2087,60 @@ Sy zagronity, až wótkaze wjedu tam, źož maju wjasć.
 '''WARNOWANJE!'''
 To móžo byś drastiska a njewocakowana změna za popularny bok;
 pšosym zawěsć, až konsekwency rozmijoš, nježli až pókšacujoš.",
-'movepagetalktext'        => "Pśisłušny diskusijny bok se sobu pśesunjo, '''ale nic gaž:'''
+'movepagetalktext'             => "Pśisłušny diskusijny bok se sobu pśesunjo, '''ale nic gaž:'''
 * eksistěrujo južo diskusijny bok z toś tym mjenim, abo gaž
 * wótwólijoš toś tu funkciju.
 
 W toś tyma padoma dej wopśimjeśe boka manualnje se pśesunuś resp. gromadu wjasć, jolic až to coš.",
-'movearticle'             => 'Bok pśesunuś',
-'movenotallowed'          => 'Njamaš pšawo pśesuwaś boki.',
-'newtitle'                => 'nowy nadpis:',
-'move-watch'              => 'Toś ten bok wobglědowaś',
-'movepagebtn'             => 'Bok pśesunuś',
-'pagemovedsub'            => 'Bok jo se pśesunuł.',
-'movepage-moved'          => '<big>\'\'\'Bok "$1" jo se do "$2" pśesunuł.\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Bok z takim mjenim južo eksistěrujo abo mě, kótarež sćo wuwzólił jo njepłaśece. Pšosym wuzwól nowe mě.',
-'cantmove-titleprotected' => 'Njamóžoš bok k toś tomu městnoju pśesunuś, dokulaž nowy titel jo pśeśiwo napóranjeju šćitany.',
-'talkexists'              => 'Samy bok jo se pśesunuł, ale pśisłušny diskusijny bok nic, dokulaž eksistěrujo južo taki bok z nowym mjenim. Pšosym pśirownaj wopśimjeśi manualnje.',
-'movedto'                 => 'pśesunjony do',
-'movetalk'                => 'Diskusijny bok sobu pśesunuś.',
-'move-subpages'           => 'Wše pódboki, jolic eksistěruju, sobu pśesunuś',
-'move-talk-subpages'      => 'Wše pódboki diskusijnych bokow, jolic eksistěruju, sobu pśesunuś',
-'movepage-page-exists'    => 'Bok $1 južo eksistěrujo a njedajo se awtomatiski pśepisaś.',
-'movepage-page-moved'     => 'Bok $1 jo se do $2 pśesunuł.',
-'movepage-page-unmoved'   => 'Bok $1 njejo se do $2 pśesunuś dał.',
-'movepage-max-pages'      => 'Maksimalna licba $1 {{PLURAL:$1|boka|bokowu|bokow|bokow}} jo se pśesunuła a žedne dalšne wěcej njedaje se awtomatiski pśesunuś.',
-'1movedto2'               => '„[[$1]]“ pśesunjone na „[[$2]]“',
-'1movedto2_redir'         => 'Nastawk „[[$1]]“ jo se pśesunuł na „[[$2]]“. Pśi tom jo jadno dalejpósrědnjenje se pśepisało.',
-'movelogpage'             => 'Protokol pśesunjenjow',
-'movelogpagetext'         => 'How jo lisćina wšyknych pśesunjonych bokow.',
-'movereason'              => 'Pśicyna',
-'revertmove'              => 'nawrośiś',
-'delete_and_move'         => 'Wulašowaś a pśesunuś',
-'delete_and_move_text'    => '==Celowy bok eksistěrujo - wulašowaś??==
+'movearticle'                  => 'Bok pśesunuś',
+'movenologin'                  => 'Njepśizjawjony(a)',
+'movenologintext'              => 'Aby mógał bok pśesunuś, dejš byś [[Special:UserLogin|pśizjawjony wužywaŕ]].',
+'movenotallowed'               => 'Njamaš pšawo pśesuwaś boki.',
+'movenotallowedfile'           => 'Njamaš pšawo dataje pśesunuś.',
+'cant-move-user-page'          => 'Njamaš pšawo wužywarske boki pśesunuś (mimo pódbokow).',
+'cant-move-to-user-page'       => 'Njamaš pšawo bok k wužywarskemu bokoju pśesunuś (z wuwześim k wužywarskemu pódbokoju).',
+'newtitle'                     => 'nowy nadpis:',
+'move-watch'                   => 'Toś ten bok wobglědowaś',
+'movepagebtn'                  => 'Bok pśesunuś',
+'pagemovedsub'                 => 'Bok jo se pśesunuł.',
+'movepage-moved'               => '<big>\'\'\'Bok "$1" jo se do "$2" pśesunuł.\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Dalejpósrědnjenje jo se napórało.',
+'movepage-moved-noredirect'    => 'Napóranje dalejpósrědnjenja jo se pódtłocyło.',
+'articleexists'                => 'Bok z takim mjenim južo eksistěrujo abo mě, kótarež sćo wuwzólił jo njepłaśece. Pšosym wuzwól nowe mě.',
+'cantmove-titleprotected'      => 'Njamóžoš bok k toś tomu městnoju pśesunuś, dokulaž nowy titel jo pśeśiwo napóranjeju šćitany.',
+'talkexists'                   => 'Samy bok jo se pśesunuł, ale pśisłušny diskusijny bok nic, dokulaž eksistěrujo južo taki bok z nowym mjenim. Pšosym pśirownaj wopśimjeśi manualnje.',
+'movedto'                      => 'pśesunjony do',
+'movetalk'                     => 'Diskusijny bok sobu pśesunuś.',
+'move-subpages'                => 'Wše pódboki, jolic eksistěruju, sobu pśesunuś',
+'move-talk-subpages'           => 'Wše pódboki diskusijnych bokow, jolic eksistěruju, sobu pśesunuś',
+'movepage-page-exists'         => 'Bok $1 južo eksistěrujo a njedajo se awtomatiski pśepisaś.',
+'movepage-page-moved'          => 'Bok $1 jo se do $2 pśesunuł.',
+'movepage-page-unmoved'        => 'Bok $1 njejo se do $2 pśesunuś dał.',
+'movepage-max-pages'           => 'Maksimalna licba $1 {{PLURAL:$1|boka|bokowu|bokow|bokow}} jo se pśesunuła a žedne dalšne wěcej njedaje se awtomatiski pśesunuś.',
+'1movedto2'                    => '„[[$1]]“ pśesunjone na „[[$2]]“',
+'1movedto2_redir'              => 'Nastawk „[[$1]]“ jo se pśesunuł na „[[$2]]“. Pśi tom jo jadno dalejpósrědnjenje se pśepisało.',
+'move-redirect-suppressed'     => 'dakejpósrědnjenje pódtłocone',
+'movelogpage'                  => 'Protokol pśesunjenjow',
+'movelogpagetext'              => 'How jo lisćina wšyknych pśesunjonych bokow.',
+'movereason'                   => 'Pśicyna',
+'revertmove'                   => 'nawrośiś',
+'delete_and_move'              => 'Wulašowaś a pśesunuś',
+'delete_and_move_text'         => '==Celowy bok eksistěrujo - wulašowaś??==
 
 Bok „[[:$1]]“ južo eksistěrujo. Coš jen wulašowaś, aby mógał toś ten bok pśesunuś?',
-'delete_and_move_confirm' => 'Jo, toś ten bok wulašowaś',
-'delete_and_move_reason'  => 'wulašowane, aby było městno za pśesunjenje',
-'selfmove'                => 'Wuchadne a celowe mě stej identiskej; njejo móžno, bok na sam se pśesunuś.',
-'immobile_namespace'      => 'Wuchadne abo celowe mě jo šćitane; njejo móžno, boki z togo resp. do togo mjenjowego ruma pśesuwaś.',
-'imagenocrossnamespace'   => 'Dataja njedajo se pśesunuś do mjenjowego ruma, kótarež njejo za dataje.',
-'imagetypemismatch'       => 'Nowy datajowy sufiks swójomu typoju njewótpowědujo',
-'imageinvalidfilename'    => 'Mě celoweje dataje jo njepłaśiwe',
-'fix-double-redirects'    => 'Dalejpósrědnjenja, kótarež wótkazuju na originalny titel, aktualizěrowaś',
+'delete_and_move_confirm'      => 'Jo, toś ten bok wulašowaś',
+'delete_and_move_reason'       => 'wulašowane, aby było městno za pśesunjenje',
+'selfmove'                     => 'Wuchadne a celowe mě stej identiskej; njejo móžno, bok na sam se pśesunuś.',
+'immobile-source-namespace'    => 'Boki w mjenjowem rumje "$1" njedaju se pśesunuś',
+'immobile-target-namespace'    => 'Boki njedaju se do mjenjowego ruma "$1" pśesunuś',
+'immobile-target-namespace-iw' => 'Interwiki-wótkaz njejo płaśiwy cel za pśesunjenja bokow.',
+'immobile-source-page'         => 'Toś ten bok njedajo se pśesunuś.',
+'immobile-target-page'         => 'Njejo móžno na toś ten celowy bok pśesunuś.',
+'imagenocrossnamespace'        => 'Dataja njedajo se pśesunuś do mjenjowego ruma, kótarež njejo za dataje.',
+'imagetypemismatch'            => 'Nowy datajowy sufiks swójomu typoju njewótpowědujo',
+'imageinvalidfilename'         => 'Mě celoweje dataje jo njepłaśiwe',
+'fix-double-redirects'         => 'Dalejpósrědnjenja, kótarež wótkazuju na originalny titel, aktualizěrowaś',
+'move-leave-redirect'          => 'Daleposrědnjenje zawóstajiś',
 
 # Export
 'export'            => 'Boki eksportěrowaś',
@@ -1917,7 +2148,7 @@ Bok „[[:$1]]“ južo eksistěrujo. Coš jen wulašowaś, aby mógał toś ten
 
 Za eksportěrowanje bokow zapódaj nadpisma do dołojcnego tekstowogo póla, jadno nadpismo na smužku, a wuzwól nowe a stare wersije z wótkazami stawiznow boka abo jano aktualnu wersiju z informacijami wó slědnjej změnje.
 
-W slědnem padźe móžoš teke wótkaz wužywaś, na pś. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] za bok "[[{{MediaWiki:Mainpage}}]]".',
+W slědnem padźe móžoš teke wótkaz wužywaś, na pś. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] za bok "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Jano aktualne wersije, bźez stawiznow',
 'exportnohistory'   => "----
 '''Pokazka:''' Eksportěrowanje cełych stawiznow bokow pśez toś ten formular njejo dla performancowych pśicyn tuchylu móžne.",
@@ -1933,7 +2164,7 @@ W slědnem padźe móžoš teke wótkaz wužywaś, na pś. [[{{ns:special}}:Expo
 'allmessagesdefault'        => 'Standardny tekst',
 'allmessagescurrent'        => 'Aktualny tekst',
 'allmessagestext'           => 'How jo lisćina systemowych powěsćow w mjenowem rumje MediaWiki.
-Pšosym wobglědaj [http://www.mediawiki.org/wiki/Localisation lokalizaciju MediaWiki] a [http://translatewiki.net Betawiki], jolic coš k lokalizaciji MediaWiki pśinosowaś.',
+Pšosym wobglědaj [http://www.mediawiki.org/wiki/Localisation lokalizaciju MediaWiki] a [http://translatewiki.net translatewiki.net], jolic coš k lokalizaciji MediaWiki pśinosowaś.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' njejo tuchylu móžno, dokulaž jo datowa banka offline.",
 'allmessagesfilter'         => 'Filter za mjenja powěsćow:',
 'allmessagesmodified'       => 'Jano změnjone pokazaś',
@@ -1953,9 +2184,12 @@ Pšosym wobglědaj [http://www.mediawiki.org/wiki/Localisation lokalizaciju Medi
 'import-interwiki-text'      => 'Wuzwól wiki a bok za importěrowanje.
 Datumy wersijow a wužywarske mjenja pśi tym se njezměniju.
 Wšykne transwiki-importowe akcije protokolěruju se w [[Special:Log/import|log-lisćinje importow]].',
+'import-interwiki-source'    => 'Žrědłowy wiki/bok:',
 'import-interwiki-history'   => 'Importěruj wšykne wersije toś togo boka',
 'import-interwiki-submit'    => 'Importěrowaś',
 'import-interwiki-namespace' => 'Celowy mjenjowy rum:',
+'import-upload-filename'     => 'Datajowe mÄ›:',
+'import-comment'             => 'Komentar:',
 'importtext'                 => 'Eksportěruj pšosym dataju ze žredlowego wikija z pomocu [[Special:Export|eksporteje funkcije]]. Składuj ju na swójom licadle a nagraj su sem.',
 'importstart'                => 'Importěrowanje bokow...',
 'import-revision-count'      => '$1 {{PLURAL:$1|wersija|wersiji|wersije}}',
@@ -1989,19 +2223,19 @@ Wšykne transwiki-importowe akcije protokolěruju se w [[Special:Log/import|log-
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|$1 wersija|$1 wersiji|$1 wersije}} wót $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mój wužywarski bok',
+'tooltip-pt-userpage'             => 'Twój wužywarski bok',
 'tooltip-pt-anonuserpage'         => 'Wužywarski bok za IP-adresu, z kótarejuž bok wobźěłajoš',
-'tooltip-pt-mytalk'               => 'Mój diskusijny bok',
+'tooltip-pt-mytalk'               => 'Twój diskusijny bok',
 'tooltip-pt-anontalk'             => 'Diskusija wó změnach z tuteje IP-adresy.',
 'tooltip-pt-preferences'          => 'Móje pśistajenja',
 'tooltip-pt-watchlist'            => 'Lisćina wobglědowańkow',
-'tooltip-pt-mycontris'            => 'Lisćina mójich pśinoskow',
+'tooltip-pt-mycontris'            => 'Lisćina twójich pśinoskow',
 'tooltip-pt-login'                => 'Pśizjawjenje njejo obligatoriske, ale lubje witane.',
 'tooltip-pt-anonlogin'            => 'Pśizjawjenje njejo obligatoriske, ale lubje witane.',
 'tooltip-pt-logout'               => 'Wótzjawiś',
 'tooltip-ca-talk'                 => 'Diskusija wó wopśimjeśu boka',
 'tooltip-ca-edit'                 => 'Móžoš bok wobźěłaś. Nježlic składujoš, wužywaj pšosym funkciju "pśeglěd".',
-'tooltip-ca-addsection'           => 'Komentar k diskusiji pśidaś.',
+'tooltip-ca-addsection'           => 'Nowy wótrězk zachopiś',
 'tooltip-ca-viewsource'           => 'Bok jo šćitany. Jo móžno, žrědłowy tekst woglědaś.',
 'tooltip-ca-history'              => 'Něgajšne wersije togo boka.',
 'tooltip-ca-protect'              => 'Toś ten bok šćitaś',
@@ -2048,6 +2282,9 @@ Wšykne transwiki-importowe akcije protokolěruju se w [[Special:Log/import|log-
 'tooltip-watch'                   => 'Toś ten bok wobglědowańkam dodaś',
 'tooltip-recreate'                => 'Bok nawrośiś, lěcrowno jo był wulašowany',
 'tooltip-upload'                  => 'Z uploadowanim zachopiÅ›',
+'tooltip-rollback'                => '"Roolback" anulěrujo změny slědnego wužywarja na toś tom boku z jadnym kliknjenim.',
+'tooltip-undo'                    => 'Anulěrujo toś tu změnu a wócynijo wobźěłański formular w pśeglědowem modusu.
+W zespominanju dajo se pśicyna pódaś.',
 
 # Stylesheets
 'common.css'   => '/** Na toś tom městnje wustatkujo se CSS na wšykne šaty. */',
@@ -2063,12 +2300,12 @@ Wšykne transwiki-importowe akcije protokolěruju se w [[Special:Log/import|log-
 'notacceptable'     => 'Wiki-serwer njamóžo daty za twój klient wobźěłaś.',
 
 # Attribution
-'anonymous'        => '{{PLURAL:$|Anonymny wužywaŕ|Anonymnej wužywarja|Anonymne wužywarje}} na {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonymny wužywaŕ|Anonymnej wužywarja|Anonymne wužywarje}} na {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-wužywaŕ $1',
 'lastmodifiedatby' => 'Toś ten bok jo slědny raz se wobźěłał $2, $1 góź. wót wužywarja $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Bazěrujo na źěle $1',
 'others'           => 'druge',
-'siteusers'        => '{{SITENAME}}-wužywaŕ $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|wužywaŕ|wužiwarja|wužywarje}} $1',
 'creditspage'      => 'Informacija wó boku',
 'nocredits'        => 'Njeeksistěruju žedne informacije za toś ten bok.',
 
@@ -2088,6 +2325,16 @@ Wšykne transwiki-importowe akcije protokolěruju se w [[Special:Log/import|log-
 'numauthors'     => 'Licba awtorow: $1',
 'numtalkauthors' => 'Licba diskutěrujucych: $1',
 
+# Skin names
+'skinname-standard'    => 'Klasiski',
+'skinname-nostalgia'   => 'Nostalgiski',
+'skinname-cologneblue' => 'Kölnski Módry',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Mój šat',
+'skinname-chick'       => 'Kurjetko',
+'skinname-simple'      => 'Jadnorje',
+'skinname-modern'      => 'Moderny',
+
 # Math options
 'mw_math_png'    => 'Pśecej ako PNG zwobrazniś.',
 'mw_math_simple' => 'Jadnory TeX ako HTML, howacej PNG',
@@ -2108,10 +2355,12 @@ Wšykne transwiki-importowe akcije protokolěruju se w [[Special:Log/import|log-
 'markedaspatrollederror-noautopatrol' => 'Njesmějoš swóje změny ako kontrolěrowane markěrowaś.',
 
 # Patrol log
-'patrol-log-page'   => 'Log-lisćina kontrolow',
-'patrol-log-header' => 'To jo protokol pśekontrolowanych wersijow.',
-'patrol-log-line'   => 'markěrował $1 wót $2 ako kontrolěrowane $3.',
-'patrol-log-auto'   => '(awtomatiski)',
+'patrol-log-page'      => 'Log-lisćina kontrolow',
+'patrol-log-header'    => 'To jo protokol pśekontrolowanych wersijow.',
+'patrol-log-line'      => 'markěrował $1 wót $2 ako kontrolěrowane $3.',
+'patrol-log-auto'      => '(awtomatiski)',
+'patrol-log-diff'      => 'Wersija $1',
+'log-show-hide-patrol' => 'Protokol doglědowanja $1',
 
 # Image deletion
 'deletedrevision'                 => 'wulašowana stara wersija: $1',
@@ -2128,6 +2377,9 @@ $1',
 'previousdiff' => '� pśedchadna změna',
 'nextdiff'     => 'Pśiduca změna →',
 
+# Visual comparison
+'visual-comparison' => 'Wizuelne pśirownanje',
+
 # Media information
 'mediawarning'         => "'''Glědaj!''' Toś ta sorta datajow móžo wopśimjeś złosny programowy kod. Ześěgnjo-lic a wócynijo-lic se dataja, móžo se Twój kompjuter wobškóźeś.<hr />",
 'imagemaxsize'         => 'Wobgranicuj wjelikosć wobrazow na bokach z wopisowanim wobrazow na:',
@@ -2140,10 +2392,12 @@ $1',
 'show-big-image'       => 'Połne optiske wótgranicowanje.',
 'show-big-image-thumb' => '<small>wjelikosć pśeglěda: $1 × $2 pikselow</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Nowe dataje',
 'imagelisttext'         => "How jo lisćina '''$1''' {{PLURAL:$1|dataje|datajowu|datajow}}, sortěrowane $2.",
 'newimages-summary'     => 'Toś ten specialny bok pokazujo wobraze a dataje, kótarež ako slědne su se uploadowali.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Datajowe mě (abo źěl z togo):',
 'showhidebots'          => '(awtomatiske programy (boty) $1)',
 'noimages'              => 'Žedne dataje njejsu se namakali.',
 'ilsubmit'              => 'PytaÅ›',
@@ -2350,6 +2604,18 @@ Slědujuce wótkaze w tej samej smužce se za wuwześa naglědaju, w kótarychž
 'exif-lightsource-24'  => 'ISO studijowe swětło',
 'exif-lightsource-255' => 'Druge žrědło swětła',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Błysk njejo se zapusćił',
+'exif-flash-fired-1'    => 'Błysk jo se zapusćił',
+'exif-flash-return-0'   => 'žedna funkcija za nadejźenje refleksije fotobłyska',
+'exif-flash-return-2'   => 'Refleksija fotobłyska njejo se nadejšła',
+'exif-flash-return-3'   => 'Refleksija fotobłyska jo se nadejšła',
+'exif-flash-mode-1'     => 'wunuźone błysknjenje',
+'exif-flash-mode-2'     => 'wunuźone błysknjenje pódtłocone',
+'exif-flash-mode-3'     => 'awtomatiski modus',
+'exif-flash-function-1' => 'Njejo błyskowa funkcija',
+'exif-flash-redeye-1'   => 'Modus redukcije cerwjenych wócow',
+
 'exif-focalplaneresolutionunit-2' => 'cole',
 
 'exif-sensingmethod-1' => 'Njedefiněrujobny',
@@ -2486,19 +2752,10 @@ $1
 Pšosym wobkšuśiś, až napšawdu coš ten bok zasej wutwóriś.",
 'recreate'            => 'Wótnowótki wutwóriś',
 
-# HTML dump
-'redirectingto' => 'Pśeadresěrowanje do [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Wulašowaś cache togo boka? $1',
 'confirm_purge_button' => 'W pórědku.',
-
-# AJAX search
-'searchcontaining' => "Nastawki pytaś, do kótarychž słuša tekst ''$1''.",
-'searchnamed'      => "PytaÅ› nastawki z mjenim ''$1''",
-'articletitles'    => "Nastawki, kótarež zachopiju z ''$1''",
-'hideresults'      => 'rezultat schowaÅ›',
-'useajaxsearch'    => 'Pytanje z AJAX wužywaś',
+'confirm-purge-top'    => 'Wulašowaś cache togo boka?',
+'confirm-purge-bottom' => 'Wuproznijo cache a wunuzijo zwobraznjenje aktualneje wersije.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� slědny bok',
@@ -2518,10 +2775,10 @@ Pšosym wobkšuśiś, až napšawdu coš ten bok zasej wutwóriś.",
 'table_pager_empty'        => 'Žedne wuslědki',
 
 # Auto-summaries
-'autosumm-blank'   => 'Bok se wulašujo.',
+'autosumm-blank'   => 'Bok jo se wuproznił',
 'autosumm-replace' => "Bok narownajo se z: '$1'",
 'autoredircomment' => 'Pśesměrowanje na [[$1]]',
-'autosumm-new'     => 'Nowy bok: $1',
+'autosumm-new'     => "Jo napórał bok z '$1'",
 
 # Live preview
 'livepreview-loading' => 'Lodowanje …',
@@ -2573,6 +2830,7 @@ Móžoš teke [[Special:Watchlist/edit|standardny editor wužywaś]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Njeznaty tag rozšyrjenja „$1“',
+'duplicate-defaultsort' => 'Glědaj: Standardny sortěrowański kluc (DEFAULT SORT KEY) "$2" pśepišo pjerwjej wužyty kluc "$1".',
 
 # Special:Version
 'version'                          => 'Wersija', # Not used as normal message but as header for the special page itself
@@ -2601,13 +2859,13 @@ Móžoš teke [[Special:Watchlist/edit|standardny editor wužywaś]].',
 'filepath-submit'  => 'Droga',
 'filepath-summary' => 'Toś ten specialny bok wróśa dopołnu drogu za dataju. Wobraze se w połnym wótgranicowanju pokazuju, druge datajowe typy se ze zwězanym programom direktnje startuju.
 
-Zapódaj datajowe mě bźez dodanka "{{ns:image}}:".',
+Zapódaj datajowe mě bźez dodanka "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Za duplikatnymi datajami pytaÅ›',
 'fileduplicatesearch-summary'  => 'Za datajowymi duplikatami na zakłaźe gótnoty hash pytaś.
 
-Zapódaj datajowe mě bźez prefiksa "{{ns:image}}:".',
+Zapódaj datajowe mě bźez prefiksa "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'pytaÅ› duplikata',
 'fileduplicatesearch-filename' => 'Datajowe mÄ›:',
 'fileduplicatesearch-submit'   => 'PytaÅ›',
@@ -2637,4 +2895,13 @@ Zapódaj datajowe mě bźez prefiksa "{{ns:image}}:".',
 'blankpage'              => 'Prozny bok',
 'intentionallyblankpage' => 'Toś ten bok jo z wótglědom prozny.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Wóstaj toś tu smužku rowno tak jo<pre>
+#Zapódaj fragmenty regularnych wurazow (jano źěl mjazy //) dołojce
+#Toś te budu se pśirunowaś z URL ekseternych wobrazow
+#Te, kótarež makaju se, zwobraznuju se ako wobraze, howac pokažo se jano wótkaz k wobrazoju
+#Ze smužkami, kótarež zachopiju se z #, wobchadaju ako z komentarami
+
+#Staj wše fragmenty regularnych wurazow nad smužku. Wóstaj toś tu smužku rowno tak jo</pre>',
+
 );
diff --git a/languages/messages/MessagesDv.php b/languages/messages/MessagesDv.php
index 6528498a..7b3168a3 100644
--- a/languages/messages/MessagesDv.php
+++ b/languages/messages/MessagesDv.php
@@ -11,6 +11,46 @@
 
 $rtl = true;
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Þ€Þ§Þ‡Þ°ÞžÞ¦',
+	NS_TALK             => 'ÞšÞ¨Þ”Þ§Þ�Þª',
+	NS_USER             => 'Þ‰Þ¬Þ‰Þ°Þ„Þ¦ÞƒÞª',
+	NS_FILE             => 'ÞŠÞ¦Þ‡Þ¨Þ�Þ°',
+	NS_FILE_TALK        => 'ÞŠÞ¦Þ‡Þ¨Þ�Þ°_ÞšÞ¨Þ”Þ§Þ�Þª',
+	NS_MEDIAWIKI        => 'Þ‰Þ©Þ‘Þ¨Þ‡Þ§ÞˆÞ¨Þ†Þ©',
+	NS_MEDIAWIKI_TALK   => 'Þ‰Þ©Þ‘Þ¨Þ”Þ§ÞˆÞ¨Þ†Þ¨_ÞšÞ¨Þ”Þ§Þ�Þª',
+	NS_TEMPLATE         => 'ފަންވަތް',
+	NS_TEMPLATE_TALK    => 'ފަންވަތް_ޚިޔާ�ު',
+	NS_HELP             => 'Þ‡Þ¬Þ€Þ©',
+	NS_HELP_TALK        => 'Þ‡Þ¬Þ€Þ©_ÞšÞ¨Þ”Þ§Þ�Þª',
+	NS_CATEGORY         => 'Þ¤Þ¨Þ�Þ°Þ‰Þª',
+	NS_CATEGORY_TALK    => 'Þ¤Þ¨Þ�Þ°Þ‰Þª_ÞšÞ¨Þ”Þ§Þ�Þª',
+);
+
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'ÞˆÞ¦Þ‹Þ¬ÞˆÞ¦Þ‘Þ¦Þ‡Þ¨ÞŽÞ¦Þ‚Þ°Þ‚Þ¦ÞˆÞ§' ),
+	'Userlogout'                => array( 'Þ„Þ­ÞƒÞ¦Þ�Þ° ÞˆÞ¦Þ‘Þ¦Þ‡Þ¨ÞŽÞ¦Þ‚Þ°Þ‚Þ¦ÞˆÞ§' ),
+	'CreateAccount'             => array( 'Þ‰Þ¬Þ‰Þ°Þ„Þ¦ÞƒÞªÞ†Þ¦Þ‚Þ° Þ€Þ§Þ�Þ¨Þ�Þ°Þ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§' ),
+	'Preferences'               => array( 'ތަރުޖީހުތައް' ),
+	'Recentchanges'             => array( 'އެންމެ ފަހުގެ ބަދަ�ްތައް' ),
+	'Upload'                    => array( 'ÞŠÞ®Þ‚ÞªÞ‡Þ°ÞˆÞ§' ),
+	'Listfiles'                 => array( 'ÞŠÞ¦Þ‡Þ¨Þ�Þ° Þ�Þ¨Þ�Þ°Þ“Þ°' ),
+	'Newimages'                 => array( 'Þ‡Þ§ ÞŠÞ¦Þ‡Þ¨Þ�Þ°' ),
+	'Randompage'                => array( 'Þ†Þ®Þ‚Þ°Þ‰Þ¬ÞˆÞ¬Þ�Þ° Þ�Þ¦ÞŠÞ°Þ™Þ§Þ‡Þ¬Þ‡Þ°' ),
+	'Uncategorizedtemplates'    => array( 'ޤި�ްމުކުރެވިފައި ނުވާ ފަންވަތް' ),
+	'Unusedcategories'          => array( 'ބޭނުން ނުކުރާ ޤި�ްމުތައް' ),
+	'Unusedimages'              => array( 'Þ„Þ­Þ‚ÞªÞ‚Þ° Þ‚ÞªÞ†ÞªÞƒÞ§ ÞŠÞ¦Þ‡Þ¨Þ�Þ°' ),
+	'Shortpages'                => array( 'ކުރު �ަފްޙާތައް' ),
+	'Longpages'                 => array( 'ދިގު �ަފްޙާތައް' ),
+	'Newpages'                  => array( 'އާ �ަފްހާތައް' ),
+	'Protectedpages'            => array( 'ދިފާޢުކުރެވިފައިވާ �ަފްޙާތައް' ),
+	'Allpages'                  => array( 'Þ€ÞªÞƒÞ¨Þ€Þ§ Þ�Þ¦ÞŠÞ°Þ™Þ§Þ‡Þ¬Þ‡Þ°' ),
+	'Ipblocklist'               => array( 'Þ„Þ°Þ�Þ®Þ†Þ° Þ†ÞªÞƒÞ¬ÞˆÞ¨ÞŠÞ¦Þ‡Þ¨ÞˆÞ§ Þ�Þ¨Þ�Þ°Þ“Þ°' ),
+	'Specialpages'              => array( 'ޙާއް�ަ �ަފްޙާތައް' ),
+	'Contributions'             => array( 'Þ™Þ¨Þ‡Þ°Þ�Þ§' ),
+	'Emailuser'                 => array( 'Þ‰Þ¬Þ‰Þ°Þ„Þ¦ÞƒÞ¦Þ�Þ° Þ‡Þ©-Þ‰Þ¬Þ‡Þ¨Þ�Þ° ÞŠÞ®Þ‚ÞªÞˆÞ§' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-hideminor'    => 'ކުޑަ ކުޑަ އުނި އިތުރުތައް ފަހު ބަދަ�ު އިން ފޮރުއްވަވާ',
@@ -77,7 +117,7 @@ $messages = array(
 'qbmyoptions'   => 'މަގޭ �ަފްހާ ތައް',
 'mytalk'        => 'Þ‰Þ¦ÞŽÞ­ ÞˆÞ§Þ€Þ¦Þ†Þ¦',
 'navigation'    => 'Þ�Þ¦Þ‰ÞªÞŽÞ§',
-'and'           => 'Þ‡Þ¦Þ‹Þ¨',
+'and'           => '&#32;Þ‡Þ¦Þ‹Þ¨',
 
 'errorpagetitle'    => 'Þ†ÞªÞ�Þ°',
 'returnto'          => 'Þ‡Þ¦Þ‚Þ„ÞªÞƒÞ§ $1 Þ‡Þ¦Þ�Þ° ÞˆÞ¦Þ‘Þ¦Þ‡Þ¨ÞŽÞ¦Þ‚Þ°Þ‚Þ¦ÞˆÞ§!',
@@ -179,6 +219,9 @@ $messages = array(
 'mailmypassword'             => 'Þ�Þ¨Þ‡Þ°ÞƒÞªÞ„Þ¦Þ�Þ° Þ‡Þ©Þ‰Þ­Þ�ÞªÞ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§',
 'acct_creation_throttle_hit' => 'މާފު ކުރައްވާ، އެހެނީ ތިޔަބޭފުޅާ ވަނީ ކުރީއް�ުރެ $1 މެންބަރުކަން ހޯއްދަވާފައި އެހެންވީމާ އިތުރަ�ް �ިބިވަޑައެއް ނުގަންނަވާނެ.',
 
+# Password reset dialog
+'oldpassword' => 'Þ†ÞªÞƒÞ©ÞŽÞ¬ Þ�Þ¨Þ‡Þ°ÞƒÞªÞ„Þ¦Þ�Þ°:',
+
 # Edit page toolbar
 'bold_sample'     => 'ބޯ އިބާރާތް',
 'bold_tip'        => 'ބޯ އިބާރާތް',
@@ -187,8 +230,8 @@ $messages = array(
 'headline_sample' => '�ުރުހީގެ އިބާރާތް',
 
 # Edit pages
-'summary'                  => 'Þ€ÞªÞ�Þ§Þ�Þ§',
-'subject'                  => 'Þ‰Þ§Þ‡Þ°Þ‹Þ§/Þ�ÞªÞƒÞªÞ€Þ©',
+'summary'                  => 'Þ€ÞªÞ�Þ§Þ�Þ§:',
+'subject'                  => 'Þ‰Þ§Þ‡Þ°Þ‹Þ§/Þ�ÞªÞƒÞªÞ€Þ©:',
 'minoredit'                => 'މިއީ ކުޑަކުޑަ އުނިއިތުރެކެވެ',
 'watchthis'                => 'Þ‰Þ¨ ÞžÞ¦ÞŠÞ°Þ™Þ§Þ‡Þ¦Þ�Þ° Þ‚Þ¦Þ’Þ¦ÞƒÞªÞ„Þ¦Þ€Þ¦Þ‡Þ°Þ“Þ¦ÞˆÞ§',
 'savearticle'              => 'ÞžÞ¦ÞŠÞ°Þ™Þ§ ÞƒÞ¦Þ‡Þ°Þ†Þ§Þ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§',
@@ -231,13 +274,13 @@ $messages = array(
 'compareselectedversions' => 'އިހުތިޔާރު ކުރެވިފައިވާ ނު�ްހާތައް އަޅައިކިޔުއްވާ',
 
 # Search results
-'viewprevnext' => 'Þ„Þ¦Þ‡Þ°Þ�Þ¦ÞˆÞ§($1) ($2) ($3).',
+'viewprevnext'   => 'Þ„Þ¦Þ‡Þ°Þ�Þ¦ÞˆÞ§($1) ($2) ($3).',
+'searchhelp-url' => 'Help:ފިހުރި�ްތު',
 
 # Preferences page
 'preferences'    => 'ތަރުޖީހުތައް',
 'mypreferences'  => 'މަގޭ ތަރުޖީހުތައް',
 'changepassword' => 'Þ�Þ¨Þ‡Þ°ÞƒÞªÞ„Þ¦Þ�Þ° Þ„Þ¦Þ‹Þ¦Þ�ÞªÞ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§',
-'oldpassword'    => 'Þ†ÞªÞƒÞ©ÞŽÞ¬ Þ�Þ¨Þ‡Þ°ÞƒÞªÞ„Þ¦Þ�Þ°:',
 'columns'        => 'ކޮ�ަންތައް:',
 'files'          => 'ފައި�ުތައް',
 
@@ -265,19 +308,18 @@ $messages = array(
 'uploadedfiles'     => 'ފޮނުވިފައިވާ ފައި�ުތައް',
 'uploadwarning'     => 'ÞŠÞ¦Þ‡Þ¨Þ�ÞªÞŠÞ®Þ‚ÞªÞ‡Þ°ÞˆÞªÞ‰ÞªÞŽÞ¬ Þ†ÞªÞƒÞ¨Þ‚Þ° Þ‹Þ¬ÞˆÞ­ Þ‡Þ¨Þ‚Þ°Þ’Þ§ÞƒÞª',
 
-# Special:ImageList
-'imagelist' => 'ފައި�ުތަކުގެ ފިހުރި�ްތު',
+# Special:ListFiles
+'listfiles' => 'ފައި�ުތަކުގެ ފިހުރި�ްތު',
 
-# Image description page
+# File description page
 'imagelinks' => 'ފާ�ަންތައް',
 
 # Random page
 'randompage' => 'Þ†Þ®Þ‚Þ°Þ‰Þ¬ÞˆÞ¬Þ�Þ° ÞžÞ¦ÞŠÞ°Þ™Þ§Þ‡Þ¬Þ‡Þ°',
 
 # Statistics
-'statistics' => 'ތަފާ�ްހި�ާބުތައް',
-'sitestats'  => 'ވިކިޕީޑިއާ ގެ ތަފާ�ްހި�ާބު',
-'userstats'  => 'މެންބަރުގެ ތަފާ�ްހި�ާބު',
+'statistics'              => 'ތަފާ�ްހި�ާބުތައް',
+'statistics-header-users' => 'މެންބަރުގެ ތަފާ�ްހި�ާބު',
 
 'brokenredirects' => 'އޮޅިފައިވާ މި�ްރާބުތައް',
 
@@ -321,14 +363,19 @@ $messages = array(
 
 'changed' => 'Þ„Þ¦Þ‹Þ¦Þ�ÞªÞ†ÞªÞƒÞ¬ÞˆÞ¨Þ‡Þ°Þ–Þ¬',
 
-# Delete/protect/revert
-'deletepage'         => 'ÞžÞ¦ÞŠÞ°Þ™Þ§ ÞŠÞ®Þ€Þ¬Þ�Þ¦Þ‡Þ°ÞˆÞ§',
-'confirm'            => 'Þ”Þ¦ÞŽÞ©Þ‚Þ°',
-'confirmdeletetext'  => 'ތިޔަބޭފުޅާ ތިޔަ އުޅުއްވަނީ ޞަފްޙާއެއް ނުވަތަ ތަޞްވީރެއް އެއާ ގުޅިފައިވާ ހުރިހާ ތާރީހަކާއެކު ކޮ�ާރުން ފޮހެ�ައްވާ�ެވެ. މިކަން މިގޮތަ�ް ކުރައްވަން ބޭނުންފުޅުކަން ޔަގީން ކުރައްވާ�ެވެ. އަދި މިކަމުން ނުކުމެދާނެ ނަތީޖާއެއް ވެ�ް ތިޔަ ބޭފުޅާއަ�ް ރަނގަޅަ�ް އެނގިވަޑައިގަންނަވަންވާނެއެވެ. އަދި ތިޔަކަން ތިކުރެއްވެނީ [[{{MediaWiki:Policy-url}}|ވިކިޕީޑިއާ ގެ �ިޔާ�ަތާ]] އެއްގޮތަ�ްތޯ ވެ�ް ބައް�ަވައި ޔަގީން ކުރައްވާ�ެވެ!',
-'actioncomplete'     => 'Þ‡Þ¦Þ‰Þ¦Þ�Þª ÞŠÞªÞƒÞ¨Þ€Þ¦Þ‰Þ¦ÞˆÞ¬Þ‡Þ°Þ–Þ¬',
-'deletecomment'      => 'ÞŠÞ®Þ€Þ¬Þ�Þ¦Þ‡Þ°ÞˆÞ§ Þ�Þ¦Þ„Þ¦Þ„Þª',
-'cantrollback'       => 'އުނިއިތުރު އިއާދައެއް ނުކުރެވޭނެ؛ އެހެނީ އެންމެ ފަހު އުނިއިތުރުގައި ހިއް�ާވި ފަރާތަކީ މިޞަފްޙާގެ ހަމައެކަނި މުއައް�ިފެވެ.',
+# Delete
+'deletepage'        => 'ÞžÞ¦ÞŠÞ°Þ™Þ§ ÞŠÞ®Þ€Þ¬Þ�Þ¦Þ‡Þ°ÞˆÞ§',
+'confirm'           => 'Þ”Þ¦ÞŽÞ©Þ‚Þ°',
+'confirmdeletetext' => 'ތިޔަބޭފުޅާ ތިޔަ އުޅުއްވަނީ ޞަފްޙާއެއް ނުވަތަ ތަޞްވީރެއް އެއާ ގުޅިފައިވާ ހުރިހާ ތާރީހަކާއެކު ކޮ�ާރުން ފޮހެ�ައްވާ�ެވެ. މިކަން މިގޮތަ�ް ކުރައްވަން ބޭނުންފުޅުކަން ޔަގީން ކުރައްވާ�ެވެ. އަދި މިކަމުން ނުކުމެދާނެ ނަތީޖާއެއް ވެ�ް ތިޔަ ބޭފުޅާއަ�ް ރަނގަޅަ�ް އެނގިވަޑައިގަންނަވަންވާނެއެވެ. އަދި ތިޔަކަން ތިކުރެއްވެނީ [[{{MediaWiki:Policy-url}}|ވިކިޕީޑިއާ ގެ �ިޔާ�ަތާ]] އެއްގޮތަ�ްތޯ ވެ�ް ބައް�ަވައި ޔަގީން ކުރައްވާ�ެވެ!',
+'actioncomplete'    => 'Þ‡Þ¦Þ‰Þ¦Þ�Þª ÞŠÞªÞƒÞ¨Þ€Þ¦Þ‰Þ¦ÞˆÞ¬Þ‡Þ°Þ–Þ¬',
+'deletecomment'     => 'ÞŠÞ®Þ€Þ¬Þ�Þ¦Þ‡Þ°ÞˆÞ§ Þ�Þ¦Þ„Þ¦Þ„Þª',
+
+# Rollback
+'cantrollback' => 'އުނިއިތުރު އިއާދައެއް ނުކުރެވޭނެ؛ އެހެނީ އެންމެ ފަހު އުނިއިތުރުގައި ހިއް�ާވި ފަރާތަކީ މިޞަފްޙާގެ ހަމައެކަނި މުއައް�ިފެވެ.',
+
+# Protect
 'unprotectedarticle' => '"[[$1]]" Þ‹Þ¨ÞŠÞ§Þ‡ÞªÞ†ÞªÞƒÞªÞ‚Þ° Þ€ÞªÞ‡Þ°Þ“Þ§Þ�Þ¬ÞˆÞ¨Þ‡Þ°Þ–Þ¬',
+'prot_1movedto2'     => '[[$1]] Þ‡Þ¦Þ�Þ° Þ‚Þ¦ÞŽÞªÞ�ÞªÞ†ÞªÞƒÞ¬ÞˆÞ¨ÞŠÞ¦Þ‡Þ¨ [[$2]]',
 
 # Restrictions (nouns)
 'restriction-edit' => 'އުނިއިތުރު ގެންނަވާ',
@@ -388,7 +435,7 @@ $messages = array(
 'tooltip-pt-logout'  => 'Þ„Þ­ÞƒÞ¦Þ�Þ°ÞˆÞ¦Þ‘Þ¦Þ‡Þ¨ÞŽÞ¦Þ‚Þ°Þ‚Þ¦ÞˆÞ§',
 'tooltip-n-mainpage' => 'Þ‰Þ¦Þ‡Þ¨ Þ�Þ¦ÞŠÞ°Þ™Þ§Þ‡Þ¦Þ�Þ° ÞˆÞ¦Þ¦Þ‘Þ¦Þ‡Þ¨ÞŽÞ¦Þ‚Þ°Þ‚Þ¦ÞˆÞ§',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1 Þ�Þ¬Þ‡Þ°Þ“Þ¨)',
 'ilsubmit'     => 'Þ€Þ¯Þ‡Þ°Þ‹Þ¦ÞˆÞ§',
 
@@ -408,9 +455,6 @@ $messages = array(
 # E-mail address confirmation
 'confirmemail' => 'Þ‡Þ©Þ‰Þ­Þ�Þª Þ‡Þ¬Þ‘Þ°ÞƒÞ¬Þ�Þ° Þ”Þ¦ÞŽÞ©Þ‚Þ°Þ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§',
 
-# HTML dump
-'redirectingto' => 'Þ‰Þ¨Þ�Þ°ÞƒÞ§Þ„Þª Þ†ÞªÞƒÞ¬ÞˆÞ¬Þ‚Þ© [[:$1]] Þ‡Þ¦Þ�Þ°...',
-
 # action=purge
 'confirm_purge_button' => 'ÞƒÞ¦Þ‚ÞŽÞ¦Þ…Þª',
 
diff --git a/languages/messages/MessagesDz.php b/languages/messages/MessagesDz.php
index aebfced6..01c5217b 100644
--- a/languages/messages/MessagesDz.php
+++ b/languages/messages/MessagesDz.php
@@ -120,8 +120,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} གི་ས�ོར་ལས�',
 'aboutpage'            => 'Project:ས�ོར་ལས�',
-'bugreports'           => 'ས�ྱོན་གྱི་སྙན་ཞུ�',
-'bugreportspage'       => 'Project:ས�ྱོན་གྱི་སྙན་ཞུ�',
 'copyrightpage'        => '{{ns:project}}:འདྲ་བཤུས་འབད་ཆ�',
 'currentevents'        => 'ད་ལྟོའི་བྱུང་ལས�',
 'currentevents-url'    => 'Project:ད་ལྟོའི་བྱུང་ལས�',
@@ -207,6 +205,9 @@ $messages = array(
 'eauthentsent'            => 'ངེས་དཔྱད་གློག་འཕྲིན་འདི་ གདམ་�་བར�ྱབས་ཡོད་པའི་གློག་འཕྲིན་�་བྱང་ལུ་ བ�ང་ཡོདཔ�
 གཞན་གློག་འཕྲིན་གང་རུང་ རྩིས་�ོ་ནང་མ་ག�ང་པའི་ཧེ་མ་ རྩིས་�ོ་འདི་�ྱོད་ར་གི་ཨིན་པའི་ངེས་དཔྱད་འབད་ནི་ལུ་ གློག་འཕྲིན་ནང་གི་བཀོད་རྒྱ་དང་འ�ྲིལ་དགོཔ་ཨིན�',
 
+# Password reset dialog
+'retypenew' => 'ཆོག་ཡིག་གསརཔ་ལོག་ཡིག་དཔར་ར�ྱབས:',
+
 # Edit page toolbar
 'bold_sample'     => 'ཚིག་ཡིག་རྒྱགས་པ�',
 'bold_tip'        => 'ཚིག་ཡིག་རྒྱགས་པ�',
@@ -228,8 +229,8 @@ $messages = array(
 'hr_tip'          => '�ད་སྙོམས་གྲལ་�ིག་ (ཉུང་སུ་སྦེ་ལག་ལེན་འ�བ)',
 
 # Edit pages
-'summary'                => 'བཅུད་དོན�',
-'subject'                => 'དོན་ཚན་/གཙོ་དོན�',
+'summary'                => 'བཅུད་དོན�:',
+'subject'                => 'དོན་ཚན་/གཙོ་དོན�:',
 'minoredit'              => 'འདི་ གལ་གནད་ཆུང་བའི་ཞུན་དག་ཅིག་ཨིན�',
 'watchthis'              => 'ཤོག་ལེབ་འདི་ལུ་བལྟ�',
 'savearticle'            => 'ཤོག་ལེབ་སྲུངས�',
@@ -238,7 +239,7 @@ $messages = array(
 'showdiff'               => 'བསྒྱུར་བཅོས་ཚུ་སྟོན�',
 'anoneditwarning'        => "'''ཉེན་བརྡ:''' �ྱོད་ཀྱིས་ ནང་བས�ྱོད་མ་འབད་བས�
 �ྱོད་ཀྱི་ ཨའི་པི་�་བྱང་འདི་ ཤོག་ལེབ་ཀྱི་ཞུན་དག་སྤྱོད་ཤུལ་འདི་ནང་ �ོ་བཀོད་འབད་དེ་བཞག་འོང་�",
-'summary-preview'        => 'བཅུད་དོན་སྔོན་ལྟ�',
+'summary-preview'        => 'བཅུད་དོན་སྔོན་ལྟ�:',
 'blockedtext'            => "<big>'''�ྱོད་ཀྱི་ ལག་ལེན་པའི་མིང་ ཡང་ན་ ཨའི་པི་�་བྱང་འདི་ བཀག་དམ་འབད་ཡོདཔ�'''</big>
 
 དེ་ཡང་ $1 གིས་ བཀག་ཡོདཔ� བཀག་དགོ་པའི་རྒྱུ་མཚན་འདི་  ''$2''ཨིན་པས�
@@ -255,14 +256,14 @@ $messages = array(
 ཤོག་ལེབ་གསརཔ་བཟོ་ནི་ལུ་ འོག་གི་སྒྲོམ་ནང་ ཡིག་དཔར་ར�ྱབས་ (བརྡ་དོན་�་གསལ་གྱི་དོན་ལུ་ [[{{MediaWiki:Helppage}}|help page]] ལུ་བལྟ་)�
 གལ་སྲིད་འཛོལ་�ེ་ཡར་སོང་པ་ཅིན་ '''རྒྱབ་''' ཨེབ་རྟ་ལུ་ ཨེབ་ག�ང་འབད�",
 'noarticletext'          => 'ད་ལྟོ་ ཤོག་ལེབ་འདི་ནང་ ཚིག་ཡིག་མེདཔ་ཨིནམ་དང་ �ྱོད་ཀྱིས་ [[Special:Search/{{PAGENAME}}| ཤོག་ལེབ་མགོ་མིང་འདི་ ]] ཤོག་ལེབ་གཞན་ནང་ལས་འཚོལ་བ�ུབ་ ཡང་ན་ [{{fullurl:{{FULLPAGENAME}}|action=edit}} ཤོག་ལེབ་འདི་ ཞུན་དག་འབད་བ�ུབ�]',
-'previewnote'            => '<strong>འདི་ སྔོན་ལྟ་ར�ྱངམ་ཅིག་ཨིན་  བསྒྱུར་བཅོས་ཚུ་ ད་ལྟོ་ཚུན་མ་སྲུངས་པས་!</strong>',
+'previewnote'            => "'''འདི་ སྔོན་ལྟ་ར�ྱངམ་ཅིག་ཨིན་  བསྒྱུར་བཅོས་ཚུ་ ད་ལྟོ་ཚུན་མ་སྲུངས་པས་!'''",
 'editing'                => '$1 ཞུན་དག་འབད་དོ�',
 'editingsection'         => '$1 (དབྱེ་ཚན་)འདི་ ཞུན་དག་འབད་ནི�',
-'copyrightwarning'       => '{{SITENAME}} ལུ་ ཕུལ་མི་ཞལ་འདེབས་ཚུ་  $2 གི་འོག་ལུ་ གསར་བ�ོན་འབད་ནིའི་ཆ་འཇོག་གྲུབ་ཡོདཔ་(�་གསལ་གྱི་དོན་ལས་ $1 ལུ་བལྟ་)� གལ་སྲིད་ �ྱོད་རའི་འབྲི་ལཱ་འདི་ ཞུན་དག་དང་ལོག་བཀྲམ་མ་འབད་ནི་ཨིན་པ་ཅིན་ ནཱ་ལུ་མ་ཕུལ�<br />
+'copyrightwarning'       => "{{SITENAME}} ལུ་ ཕུལ་མི་ཞལ་འདེབས་ཚུ་  $2 གི་འོག་ལུ་ གསར་བ�ོན་འབད་ནིའི་ཆ་འཇོག་གྲུབ་ཡོདཔ་(�་གསལ་གྱི་དོན་ལས་ $1 ལུ་བལྟ་)� གལ་སྲིད་ �ྱོད་རའི་འབྲི་ལཱ་འདི་ ཞུན་དག་དང་ལོག་བཀྲམ་མ་འབད་ནི་ཨིན་པ་ཅིན་ ནཱ་ལུ་མ་ཕུལ�<br />
 དེ་མ་ཚད་�ྱོད་ཀྱིས་ ང་བཅས་ལུ་ དེ་�ྱོད་རང་གིས་བྲིས་འབྲི�་དང་ མི་མང་ཌོ་མཱེན་ ཡང་ན་ རྒྱུ་�ུངས་སྟོང་མར་ནང་ལས་འདྲ་བཤུས་བར�ྱབས་ར�ྱབ་ཨིནམ་སྦེ་ བཤདཔ་ཨིན་པས�
-<strong>གནང་བ་མེད་པར་ འདྲ་བཤུས་དབང་ཆ་ཅན་གྱི་ལཱ་མ་ཕུལ་!</strong>',
-'longpagewarning'        => '<strong>ཉེན་བརྡ་: ཤོག་ལེབ་འདི་རིང་ཚད་ ཀི་ལོ་བའིཊིསི་ $1 ཡོདཔ་དང་ བརྡ་འཚོལ་ལ་ལོ་ཅིག་ནང་ ཀི་ལོ་བའིཊི་ ༣༢ ལས་ལྷག་སྟེ་ཡོད་པའི་ཤོག་ལེབ་ ཞུན་དག་འབད་ནི་ལུ་དཀའ་ངལ་འབྱུང་དོ་ཡོདཔ་ཨིན�
-ཤོག་ལེབ་འདི་ བགོ་བཤའ་ར�ྱབ་སྟེ་ཆུང་ཀུ་བཟོ་ནི་ལུ་ཆ་འཇོག་འབད་གནང་�</strong>',
+'''གནང་བ་མེད་པར་ འདྲ་བཤུས་དབང་ཆ་ཅན་གྱི་ལཱ་མ་ཕུལ་!'''",
+'longpagewarning'        => "'''ཉེན་བརྡ་: ཤོག་ལེབ་འདི་རིང་ཚད་ ཀི་ལོ་བའིཊིསི་ $1 ཡོདཔ་དང་ བརྡ་འཚོལ་ལ་ལོ་ཅིག་ནང་ ཀི་ལོ་བའིཊི་ ༣༢ ལས་ལྷག་སྟེ་ཡོད་པའི་ཤོག་ལེབ་ ཞུན་དག་འབད་ནི་ལུ་དཀའ་ངལ་འབྱུང་དོ་ཡོདཔ་ཨིན�
+ཤོག་ལེབ་འདི་ བགོ་བཤའ་ར�ྱབ་སྟེ་ཆུང་ཀུ་བཟོ་ནི་ལུ་ཆ་འཇོག་འབད་གནང་�'''",
 'templatesused'          => 'ཤོག་ལེབ་འདི་གུ་ལག་ལེན་འ�བ་ཡོད་པའི་ཊེམ་པེལེཊི:',
 'templatesusedpreview'   => 'སྔོན་ལྟ་འདི་ནང་ལག་ལེན་འ�བ་ཡོད་པའི་ཊེམ་པེལེཊི:',
 'template-protected'     => '(ཉེན་ས�ྱོབ་འབད་ཡོདཔ�)',
@@ -278,7 +279,7 @@ $messages = array(
 'viewpagelogs'        => 'ཤོག་ལེབ་འདི་གི་ལོགསི་སྟོན�',
 'currentrev'          => 'ད་ལྟོའི་བས�ྱར་ཞིབ�',
 'revisionasof'        => '$1 གི་བས�ྱར་ཞིབ�',
-'revision-info'       => '$2 གིས་ $1 ཚུན་གྱི་བས�ྱར་ཞིབ�',
+'revision-info'       => '$2 གིས་ $1 ཚུན་གྱི་བས�ྱར་ཞིབ�', # Additionally available: $3: revision id
 'previousrevision'    => '�བས�ྱར་ཞིབ་རྙིངམ�',
 'nextrevision'        => 'བས�ྱར་ཞིབ་གསརཔ་→',
 'currentrevisionlink' => 'ད་ལྟོའི་བས�ྱར་ཞིབ�',
@@ -304,17 +305,17 @@ $messages = array(
 'diff-multi'              => '({{PLURAL:$1|བར་ནའི་བས�ྱར་ཞིབ་གཅིག་|$1 བར་ནའི་བས�ྱར་ཞིབ་ཚུ་}} མ་སྟོན་པས�)',
 
 # Search results
-'noexactmatch' => "'''མགོ་མིང་ \"\$1\" ཅན་མའི་ཤོག་ལེབ་མེད�'''
+'noexactmatch'   => "'''མགོ་མིང་ \"\$1\" ཅན་མའི་ཤོག་ལེབ་མེད�'''
 �ྱོད་ཀྱིས་ [[:\$1|ཤོག་ལེབ་འདི་ གསརཔ་བཟོ་ཚུགས�]]",
-'prevn'        => 'ཧེ་མའི་ $1',
-'nextn'        => 'ཤུལ་མའི་ $1',
-'viewprevnext' => '($1) ($2) ($3) སྟོན�',
-'powersearch'  => 'མ�ོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ�',
+'prevn'          => 'ཧེ་མའི་ $1',
+'nextn'          => 'ཤུལ་མའི་ $1',
+'viewprevnext'   => '($1) ($2) ($3) སྟོན�',
+'searchhelp-url' => 'Help:ནང་དོན�',
+'powersearch'    => 'མ�ོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ�',
 
 # Preferences page
 'preferences'   => 'དགའ་གདམ�',
 'mypreferences' => 'ངེ་གི་དགའ་གདམ�',
-'retypenew'     => 'ཆོག་ཡིག་གསརཔ་ལོག་ཡིག་དཔར་ར�ྱབས:',
 
 'grouppage-sysop' => '{{ns:project}}:བདག་ས�ྱོང་པ�',
 
@@ -356,10 +357,10 @@ $messages = array(
 'uploadlogpage' => 'ལོག་ས�ྱེལ་བཙུགས་འབད�',
 'uploadedimage' => '"[[$1]]" ས�ྱེལ་བཙུགས་འབད་ཡོདཔ�',
 
-# Special:ImageList
-'imagelist' => 'ཡིག་སྣོད་�ོ་ཡིག�',
+# Special:ListFiles
+'listfiles' => 'ཡིག་སྣོད་�ོ་ཡིག�',
 
-# Image description page
+# File description page
 'filehist'                  => 'ཡིག་སྣོད་སྤྱོད་ཤུལ�',
 'filehist-help'             => 'ཡིག་སྣོད་འདི་ དེ་བསྒང་སྟོན་དོ་བཟུམ་སྦེ་ བལྟ་ནི་གི་དོན་ལུ་ ཚེས་གྲངས་/ཆུ་ཚོད་གུ་ ཨེབ་ག�ང་འབད�',
 'filehist-current'          => 'ད་ལྟོ�',
@@ -460,50 +461,52 @@ $messages = array(
 'emailuser' => 'ལག་ལེན་པ་ལུ་ གློག་འཕྲིན་ག�ང་',
 
 # Watchlist
-'watchlist'            => 'ངེ་གི་བལྟ་ཞིབ་�ོ་ཡིག�',
-'mywatchlist'          => 'ངེ་གི་བལྟ་ཞིབ་�ོ་ཡིག�',
-'watchlistfor'         => "('''$1''' གི་དོན་ལུ་)",
-'addedwatch'           => 'བལྟ་ཞིབ་�ོ་ཡིག་ལུ་�་ས�ོང་ར�ྱབ་ཅི�',
-'addedwatchtext'       => "ཤོག་ལེབ་  \"[[:\$1]]\" འདི་ �ྱོད་རའི་ [[Special:Watchlist|watchlist]] ལུ་ �་ས�ོང་བར�ྱབས་ནུག�\\n
+'watchlist'         => 'ངེ་གི་བལྟ་ཞིབ་�ོ་ཡིག�',
+'mywatchlist'       => 'ངེ་གི་བལྟ་ཞིབ་�ོ་ཡིག�',
+'watchlistfor'      => "('''$1''' གི་དོན་ལུ་)",
+'addedwatch'        => 'བལྟ་ཞིབ་�ོ་ཡིག་ལུ་�་ས�ོང་ར�ྱབ་ཅི�',
+'addedwatchtext'    => "ཤོག་ལེབ་  \"[[:\$1]]\" འདི་ �ྱོད་རའི་ [[Special:Watchlist|watchlist]] ལུ་ �་ས�ོང་བར�ྱབས་ནུག�\\n
 ཤོག་ལེབ་དེ་ལུ་མ་འོངས་བསྒྱུར་བཅོས་དང་ དེ་གི་འབྲེལ་ཡོད་བློ་ཤོག་འདི་ དེ་�ར་�ོ་བཀོད་འབད་ནི་དང་ འཇམ་�ོང་�ོ་སྦེ་གདམ་�་བར�ྱབ་ཚུགས་ནི་གི་དོན་ལུ་  ཤོག་ལེབ་འདི་ [[Special:RecentChanges|list of recent changes]] ནང་ལུ་ '''མངོན་གསལ་''' སྦེ་འབྱུང་འོང་�",
-'removedwatch'         => 'བལྟ་ཞིབ་�ོ་ཡིག་ནང་ལས་བ�ོན་བཀོག་ཡོདཔ�',
-'removedwatchtext'     => 'ཤོག་ལེབ་  "[[:$1]]" འདི་ �ྱོད་རའི་བལྟ་ཞིབ་�ོ་ཡིག་ནང་ལས་ བ�ོན་བཀོག་ནུག�',
-'watch'                => 'བལྟ་ཞིབ་འབད�',
-'watchthispage'        => 'ཤོག་ལེབ་འདི་ལྟ�',
-'unwatch'              => 'བལྟ་བཤོལ�',
-'watchlist-details'    => '{{PLURAL:$1|$1 ཤོག་ལེབ་|$1 ཤོག་ལེབ་ཚུ་}} �ག་ཆེ་བའི་བློ་ཤོག་ བལྟ་ཞིབ་མ་འབད་བས�',
-'wlshowlast'           => 'མཇུག་གི་ ཆུ་ཚོད་ $1 ཉིནམ་ $2  $3 སྟོན་',
-'watchlist-hide-bots'  => 'བོཊི་ཞུན་དག་ཚུ་སྦ�',
-'watchlist-hide-own'   => 'ངེ་གི་ཞུན་དག་ཚུ་སྦ�',
-'watchlist-hide-minor' => 'གལ་གནད་ཆུང་བའི་ཞུན་དག་ཚུ་སྦ�',
+'removedwatch'      => 'བལྟ་ཞིབ་�ོ་ཡིག་ནང་ལས་བ�ོན་བཀོག་ཡོདཔ�',
+'removedwatchtext'  => 'ཤོག་ལེབ་  "[[:$1]]" འདི་ �ྱོད་རའི་བལྟ་ཞིབ་�ོ་ཡིག་ནང་ལས་ བ�ོན་བཀོག་ནུག�',
+'watch'             => 'བལྟ་ཞིབ་འབད�',
+'watchthispage'     => 'ཤོག་ལེབ་འདི་ལྟ�',
+'unwatch'           => 'བལྟ་བཤོལ�',
+'watchlist-details' => '{{PLURAL:$1|$1 ཤོག་ལེབ་|$1 ཤོག་ལེབ་ཚུ་}} �ག་ཆེ་བའི་བློ་ཤོག་ བལྟ་ཞིབ་མ་འབད་བས�',
+'wlshowlast'        => 'མཇུག་གི་ ཆུ་ཚོད་ $1 ཉིནམ་ $2  $3 སྟོན་',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'བལྟ་ཞིབ་འབད་དོ་་་',
 'unwatching' => 'བལྟ་ཞིབ་འབད་བཤོལ་དོ་་་',
 
-# Delete/protect/revert
-'deletepage'                  => 'ཤོག་ལེབ་བ�ོན་ག�ང་�',
-'historywarning'              => 'ཉེན་བརྡ་: �ྱོད་ཀྱིས་ བ�ོན་བཀོག་ནི་འབད་མི་ཤོག་ལེབ་ནང་སྤྱོད་ཤུལ་འདུག་:',
-'confirmdeletetext'           => '�ྱོད་ཀྱིས་ ཤོག་ལེབ་དང་དེའི་སྤྱོད་ཤུལ་ བ�ོན་ག�ང་ནི་འབད་དོ�
+# Delete
+'deletepage'            => 'ཤོག་ལེབ་བ�ོན་ག�ང་�',
+'historywarning'        => 'ཉེན་བརྡ་: �ྱོད་ཀྱིས་ བ�ོན་བཀོག་ནི་འབད་མི་ཤོག་ལེབ་ནང་སྤྱོད་ཤུལ་འདུག་:',
+'confirmdeletetext'     => '�ྱོད་ཀྱིས་ ཤོག་ལེབ་དང་དེའི་སྤྱོད་ཤུལ་ བ�ོན་ག�ང་ནི་འབད་དོ�
 �ྱོད་ཀྱིས་འདི་འབད་ནི་དང་ དེ་འབད་བ་ཅིན་ དེ་གི་འབྲེལ་འབྱུང་ དེ་ལས་ �ྱོད་ཀྱིས་འབད་མི་འདི་  [[{{MediaWiki:Policy-url}}| སྲིད་བྱུས་]] དང་འ�ྲིལ་�ེ་ཨིན་པའི་ངེས་དཔྱད་འབད་གནང་�',
-'actioncomplete'              => 'བྱ་ལས་མཇུག་བསྡུ�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" འདི་ བ�ོན་བཀོག་ནུག�
+'actioncomplete'        => 'བྱ་ལས་མཇུག་བསྡུ�',
+'deletedtext'           => '"<nowiki>$1</nowiki>" འདི་ བ�ོན་བཀོག་ནུག�
 འཕྲལ་�མས་ལུ་བ�ོན་བཀོག་མི་�ོ་གི་དོན་ལུ་ $2 ལུ་བལྟ�',
-'deletedarticle'              => '"[[$1]]" བ�ོན་ག�ང་ཡོདཔ�',
-'dellogpage'                  => 'བ�ོན་ག�ང་ཡོད་པའི་ལོག�',
-'deletecomment'               => 'བ�ོན་བ�ང་དགོ་པའི་རྒྱུ་མཚན་:',
-'deleteotherreason'           => 'གཞན་/�་ས�ོང་ཅན་གྱི་རྒྱུ་མཚན�',
-'deletereasonotherlist'       => 'རྒྱུ་མཚན་གཞན�',
-'rollbacklink'                => 'རྒྱབ་སྒྲིལ�',
+'deletedarticle'        => '"[[$1]]" བ�ོན་ག�ང་ཡོདཔ�',
+'dellogpage'            => 'བ�ོན་ག�ང་ཡོད་པའི་ལོག�',
+'deletecomment'         => 'བ�ོན་བ�ང་དགོ་པའི་རྒྱུ་མཚན་:',
+'deleteotherreason'     => 'གཞན་/�་ས�ོང་ཅན་གྱི་རྒྱུ་མཚན�',
+'deletereasonotherlist' => 'རྒྱུ་མཚན་གཞན�',
+
+# Rollback
+'rollbacklink' => 'རྒྱབ་སྒྲིལ�',
+
+# Protect
 'protectlogpage'              => 'ཉེན་ས�ྱོབ་ལོག�',
+'prot_1movedto2'              => '[[$1]] འདི་ [[$2]] ལུ་སྤོ་བཤུད་འབད་ཡོདཔ�',
 'protectcomment'              => 'བསམ་བཀོད:',
 'protectexpiry'               => 'དུས་ཡོལ:',
 'protect_expiry_invalid'      => 'དུས་ཡོལ་དུས་ཚོད་འདི་ ནུས་མེད་ཨིན་པས�',
 'protect_expiry_old'          => 'དུས་ཡོལ་དུས་ཚོད་འདི་ཚར་ནུག�',
 'protect-unchain'             => 'སྤོ་བཤུད་ཀྱི་གནང་བ་ཕྱེ�',
-'protect-text'                => '�ྱོད་ཀྱིས་ ནཱ་ལུ་ ཤོག་ལེབ་ <strong><nowiki>$1</nowiki></strong> གི་དོན་ལུ་ ཉེན་ས�ྱོབ་གནས་རིམ་འདི་བསྒྱུར་བཅོས་ར�ྱབ་བ�ུབ�',
-'protect-locked-access'       => '�ྱོད་ཀྱི་རྩིས་�ོ་ནང་ ཤོག་ལེབ་ཉེན་ས�ྱོབ་གནས་རིམ་བསྒྱུར་བཅོས་འབད་ནིའི་གནང་བ་མིན་འདུག�
-ད་ལྟོ་ནཱ་ལུ་ཡོད་པའི་སྒྲིག་སྟངས་འདི་ ཤོག་ལེབ་ <strong>$1</strong> གི་དོན་ལུ་ཨིན་:',
+'protect-text'                => "�ྱོད་ཀྱིས་ ནཱ་ལུ་ ཤོག་ལེབ་ '''<nowiki>$1</nowiki>''' གི་དོན་ལུ་ ཉེན་ས�ྱོབ་གནས་རིམ་འདི་བསྒྱུར་བཅོས་ར�ྱབ་བ�ུབ�",
+'protect-locked-access'       => "�ྱོད་ཀྱི་རྩིས་�ོ་ནང་ ཤོག་ལེབ་ཉེན་ས�ྱོབ་གནས་རིམ་བསྒྱུར་བཅོས་འབད་ནིའི་གནང་བ་མིན་འདུག�
+ད་ལྟོ་ནཱ་ལུ་ཡོད་པའི་སྒྲིག་སྟངས་འདི་ ཤོག་ལེབ་ '''$1''' གི་དོན་ལུ་ཨིན་:",
 'protect-cascadeon'           => 'འོག་གི་ཀསི་ཀེ་ཌིངཉེན་ས�ྱོབ་ཤུགས་ཅན་བཟོ་ཡོད་པའི་ {{PLURAL:$1|ཤོག་ལེབ| ཤོག་ལེབ་་ཚུ་}} གི་གྲངས་སུ་ཚུད་ཡོདཔ་ལས་ ཤོག་ལེབ་འདི་ ད་ལྟོ་ཉེན་ས�ྱོབ་འབད་དེ་འདུག�
 �ྱོད་ཀྱིས་ ཤོག་ལེབ་འདི་གི་ཉེན་ས�ྱོབ་གནས་རིམ་འདི་ བསྒྱུར་བཅོས་འབད་ཚུགས་རུང་ ཀསི་ཀ་ཌིང་ཉེན་ས�ྱོབ་ལུ་མི་གནོད�',
 'protect-default'             => '(སྔོན་སྒྲིག�)',
@@ -514,6 +517,7 @@ $messages = array(
 'protect-expiring'            => '$1 (UTC) དུས་ཡོལ�་ཨིན�',
 'protect-cascade'             => 'ཤོག་ལེབ་(ཀེསི་ཀེ་ཌིང་ཉེན་ས�ྱོབ་) ཀྱི་གྲངས་སུ་ཚུད་མི་ཉེན་ས�ྱོབ་ཤོག་ལེབ�',
 'protect-cantedit'            => '�ྱོད་ལུ་ ཞུན་དག་གི་གནང་བ་མེདཔ་ལས་ ཤོག་ལེབ་འདི་གི་ཉེན་ས�ྱོབ་གནས་རིམ་བསྒྱུར་མི་ཚུགས�',
+'protect-expiry-options'      => 'ཆུ་ཚོད་ ༢:2 hours,ཉིནམ་ ༡:1 day,ཉིནམ་ ༣:3 days,བདུན་ཕྲག་ ༡:1 week,བདུན་ཕྲག་ ༢:2 weeks,ཟླ�་ ༡:1 month,ཟླ�་ ༣:3 months,ཟླ�་ ༦:6 months,ལོ་ ༡:1 year,ཚད་ལས་འདས་པ་:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'གནང་བ:',
 'restriction-level'           => 'མི་ཆོག་པའི་གནས་རིམ:',
 
@@ -539,7 +543,6 @@ $messages = array(
 # What links here
 'whatlinkshere'       => 'ནཱ་ལུ་ ག་ཅི་འབྲེལ་མ�ུད་འོང་ནི་མས�',
 'whatlinkshere-title' => '$1 དང་འབྲེལ་མ�ུད་ཡོད་པའི་ཤོག་ལེབ�',
-'linklistsub'         => '(འབྲེལ་ལམ་�ོ་ཡིག�)',
 'linkshere'           => "འོག་གི་ཤོག་ལེབ་ཚུ་ '''[[:$1]]''' ལུ་ འབྲེལ་མ�ུད་འབད་ཨིན:",
 'nolinkshere'         => "'''[[:$1]]''' ལུ་ ཤོག་ལེབ་འབྲེལ་མ�ུད་མིན་འདུག�",
 'isredirect'          => 'སླར་ལོག་ཤོག་ལེབ�',
@@ -656,7 +659,7 @@ $messages = array(
 'show-big-image'       => 'ཧུམ་ཆ་གང་�',
 'show-big-image-thumb' => '<small>སྔོན་ལྟའི་ཚད་: $1 × $2 པིག་སེལསི་</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'ཡིག་སྣོད་གསར་པའི་སྟོན་�ང་�',
 
 # Bad image list
diff --git a/languages/messages/MessagesEe.php b/languages/messages/MessagesEe.php
index 15f64db5..7ce2012c 100644
--- a/languages/messages/MessagesEe.php
+++ b/languages/messages/MessagesEe.php
@@ -81,7 +81,7 @@ $messages = array(
 'qbspecialpages' => 'Axa tɔxewo',
 'mypage'         => 'Axa nye',
 'navigation'     => 'Mɔtabiala',
-'and'            => 'kpakple',
+'and'            => '&#32;kpakple',
 
 'errorpagetitle'   => 'Vodada',
 'returnto'         => 'GbugbÉ” yi $1.',
@@ -109,12 +109,12 @@ $messages = array(
 'jumptosearch'     => 'dii',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'aboutsite'         => '{{SITENAME}} Å‹utinya',
+'aboutsite'         => 'Nusi {{SITENAME}} nye',
 'aboutpage'         => 'Project:ÅŠutinya',
 'copyright'         => 'Nusiwo le afii le $1 mɔɖeɖea te.',
 'copyrightpagename' => '{{SITENAME}} mɔɖeɖewo',
 'copyrightpage'     => '{{ns:project}}:Mɔɖeɖewo',
-'currentevents'     => 'Nusiwo le dzɔdzɔm',
+'currentevents'     => 'AmaneÉ›',
 'currentevents-url' => 'Project:Nusiwo le dzɔdzɔm',
 'disclaimers'       => 'Nuxlɔ̃amenyawo',
 'edithelp'          => 'Kpekpeɖeŋu na etɔtrɔ',
@@ -147,20 +147,22 @@ $messages = array(
 'viewsourcefor' => '$1 tɔwo',
 
 # Login and logout pages
-'login'                   => 'Ge É–e eme',
-'nav-login-createaccount' => 'GeÉ–e me / ÅŠlÉ” Å‹kÉ”',
-'userlogin'               => 'Ge É–e eme / Å‹lÉ” Å‹kÉ” daÉ–i',
-'logout'                  => 'Do le eme',
-'userlogout'              => 'Do le eme',
-'nologin'                 => 'Wòmeŋlɔ ŋkɔ oa? $1.',
-'nologinlink'             => 'ÅŠlÉ” Å‹kÉ” daÉ–i',
-'createaccount'           => 'ÅŠlÉ” Å‹kÉ” daÉ–i',
-'gotaccount'              => 'Wò ŋlɔ ŋkɔ xoxoa? $1.',
-'gotaccountlink'          => 'Ge É–e eme',
-'yourlanguage'            => 'Gbe:',
-'loginsuccesstitle'       => 'Wò ge ɖe eme azɔ̃.',
-'loginsuccess'            => "'''Wò le {{SITENAME}} me fifia abe \"\$1\" ene.'''",
-'loginlanguagelabel'      => 'Gbe: $1',
+'login'                      => 'Ge É–e eme',
+'nav-login-createaccount'    => 'GeÉ–e me / ÅŠlÉ” Å‹kÉ”',
+'userlogin'                  => 'Ge É–e eme / Å‹lÉ” Å‹kÉ” daÉ–i',
+'logout'                     => 'Do le eme',
+'userlogout'                 => 'Do le eme',
+'nologin'                    => 'Wòmeŋlɔ ŋkɔ oa? $1.',
+'nologinlink'                => 'ÅŠlÉ” Å‹kÉ” daÉ–i',
+'createaccount'              => 'ÅŠlÉ” Å‹kÉ” daÉ–i',
+'gotaccount'                 => 'Wò ŋlɔ ŋkɔ xoxoa? $1.',
+'gotaccountlink'             => 'Ge É–e eme',
+'yourlanguage'               => 'Gbe:',
+'loginsuccesstitle'          => 'Wò ge ɖe eme azɔ̃.',
+'loginsuccess'               => "'''Wò le {{SITENAME}} me fifia abe \"\$1\" ene.'''",
+'acct_creation_throttle_hit' => 'Taflatse, wòŋlɔ {{PLURAL:$1|1 ŋkɔ|$1 ŋkɔwo}} xoxo.
+Wòmageteŋu agbugbɔ aŋlɔe o.',
+'loginlanguagelabel'         => 'Gbe: $1',
 
 # Edit page toolbar
 'sig_tip' => 'Dzesiwò kple gaƒoƒoa',
@@ -173,13 +175,13 @@ $messages = array(
 'showdiff'         => 'Fia tɔtrɔwo',
 'newarticle'       => '(Yeye)',
 'newarticletext'   => "Eva ɖo axa si gɔme womedze haɖeke o. Ne wòadi be yeadze egɔme la, dze nuŋlɔm ɖe go sia me le afi sia ɖome (kpɔ [[{{MediaWiki:Helppage}}|kpekpeɖeŋu nyawo]] na kpekpeɖeŋu bubuwo). Ne wòme ɖoe be yeava afii hafi o la, ekema tia '''megbe''' eye wòa gbugbɔ ayi afisi wòtso va.",
-'previewnote'      => '<strong>Wole afii fiam do Å‹gÉ”, wome dzrae É–o haÉ–eke o!</strong>',
+'previewnote'      => "'''Wole afii fiam do Å‹gÉ”, wome dzrae É–o haÉ–eke o!'''",
 'editing'          => '$1 na etɔtrɔ',
-'copyrightwarning' => 'Taflatse, mítsɔe be nusiwo katã netsɔ kpe ɖe {{SITENAME}} ŋu lii fãa le $2 la nu (kpɔ $1 me nyawo). Ne madze ŋuwò be amebubuwo natrɔ asi le nusiwo newɔ ŋuti o, eye woagbugbɔ dɔsiwo newɔ ama na amebubuwo fãa o la, mega dae ɖe afisia o.<br /> Wòle ŋugbe dom na mí bena wò ŋutɔe ŋlɔ nusiawo, alo etsɔe tso afisi mɔɖeɖe li fãa be amesiame na tsɔ nuwo tso afima fãa. <strong>MEGA DA NUSIWO ŊU MƆƉEƉE MELI NA O ƉE AFISIA O!</strong>',
+'copyrightwarning' => "Taflatse, mítsɔe be nusiwo katã netsɔ kpe ɖe {{SITENAME}} ŋu lii fãa le $2 la nu (kpɔ $1 me nyawo). Ne madze ŋuwò be amebubuwo natrɔ asi le nusiwo newɔ ŋuti o, eye woagbugbɔ dɔsiwo newɔ ama na amebubuwo fãa o la, mega dae ɖe afisia o.<br /> Wòle ŋugbe dom na mí bena wò ŋutɔe ŋlɔ nusiawo, alo etsɔe tso afisi mɔɖeɖe li fãa be amesiame na tsɔ nuwo tso afima fãa. '''MEGA DA NUSIWO ŊU MƆƉEƉE MELI NA O ƉE AFISIA O!'''",
 
 # History pages
 'revisionasof'        => 'Tataa le $1',
-'revision-info'       => 'Tataa le $1 si $2 wÉ”',
+'revision-info'       => 'Tataa le $1 si $2 wÉ”', # Additionally available: $3: revision id
 'previousrevision'    => '� Tata xoxoa',
 'nextrevision'        => 'Tata yeyea →',
 'currentrevisionlink' => 'Tata susuea',
@@ -213,21 +215,22 @@ Wòateŋu [[:\$1|adze axa sia gɔme]].",
 'mypreferences' => 'NyeÆ’e didiwo',
 
 # Recent changes
-'recentchanges'   => 'Tɔtrɔ yeyewo',
-'rcnote'          => "Afisia wofia {{PLURAL:$1|tɔtrɔ '''1''' susue|tɔtrɔ '''$1''' susuewo}} le {{PLURAL:$2|ŋkeke si|ŋkeke '''$2''' mamleawo siwo}} vayi la me, le $5, $4.",
-'rcnotefrom'      => 'Tɔtrɔwo siwo wowɔ tso <b>$2</b> (wofia vaseɖe <b>$1</b>) le afii.',
-'rclistfrom'      => 'Fia tɔtrɔ yeyewo tso $1',
-'rcshowhideminor' => '$1 tɔtrɔ suewo',
-'rcshowhideliu'   => '$1 ezãla siwo ŋlɔ ŋkɔ',
-'rcshowhideanons' => '$1 ŋkɔ maŋlɔlawo',
-'rcshowhidemine'  => '$1 nyeƒe tɔtrɔwo',
-'rclinks'         => 'Fia tɔtrɔ $1 mamleawo le ŋkeke $2 siwo vayi me<br />$3',
-'diff'            => 'tɔtrɔ',
-'hist'            => 'xoxo',
-'hide'            => 'Ɣla',
-'show'            => 'Fia',
-'minoreditletter' => 's',
-'newpageletter'   => 'Y',
+'recentchanges'        => 'Tɔtrɔ yeyewo',
+'recentchanges-legend' => 'Tatiawo na tɔtrɔ yeyewo',
+'rcnote'               => "Afisia wofia {{PLURAL:$1|tɔtrɔ '''1''' susue|tɔtrɔ '''$1''' susuewo}} le {{PLURAL:$2|ŋkeke si|ŋkeke '''$2''' mamleawo siwo}} vayi la me, le $5, $4.",
+'rcnotefrom'           => 'Tɔtrɔwo siwo wowɔ tso <b>$2</b> (wofia vaseɖe <b>$1</b>) le afii.',
+'rclistfrom'           => 'Fia tɔtrɔ yeyewo tso $1',
+'rcshowhideminor'      => '$1 tɔtrɔ suewo',
+'rcshowhideliu'        => '$1 ezãla siwo ŋlɔ ŋkɔ',
+'rcshowhideanons'      => '$1 ŋkɔ maŋlɔlawo',
+'rcshowhidemine'       => '$1 nyeƒe tɔtrɔwo',
+'rclinks'              => 'Fia tɔtrɔ $1 mamleawo le ŋkeke $2 siwo vayi me<br />$3',
+'diff'                 => 'tɔtrɔ',
+'hist'                 => 'xoxo',
+'hide'                 => 'Ɣla',
+'show'                 => 'Fia',
+'minoreditletter'      => 's',
+'newpageletter'        => 'Y',
 
 # Recent changes linked
 'recentchangeslinked'       => 'Tɔtrɔ siwo kaa afii',
@@ -237,7 +240,7 @@ Wòateŋu [[:\$1|adze axa sia gɔme]].",
 'upload'    => 'Ɖo agbalẽ ɖa',
 'uploadbtn' => 'Ɖo agbalẽ ɖa',
 
-# Image description page
+# File description page
 'filehist-help'     => 'Tia ŋkeke/gaƒoƒo ɖeka ne wòadi be yea kpɔ axa sia ƒe tata le ɣemaɣi',
 'filehist-datetime' => 'ÅŠkeke/GaÆ’oÆ’o',
 'filehist-user'     => 'Ezãla',
@@ -281,19 +284,27 @@ Wòateŋu [[:\$1|adze axa sia gɔme]].",
 'allinnamespace' => 'Axawo katã ($1 namespace)',
 'allpagessubmit' => 'Yi',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Dii',
+
+# Special:Log/newusers
+'newuserlog-create-entry'  => 'Nuŋlɔla yeye',
+'newuserlog-create2-entry' => 'woŋlɔ ŋkɔ na $1',
+
 # Watchlist
-'watchlistfor'         => "(na '''$1''')",
-'watch'                => 'Le ŋku ɖe eŋu',
-'watchthispage'        => 'Le Å‹ku É–e axa sia Å‹u',
-'wlshowlast'           => 'Fia gaÆ’oÆ’o $1 Å‹keke $2 mamleawo. $3',
-'watchlist-hide-own'   => 'Ɣla nyeƒe tɔtrɔwo',
-'watchlist-show-minor' => 'Fia tɔtrɔ suewo',
-'watchlist-hide-minor' => 'Ɣla tɔtrɔ suewo',
-
-# Delete/protect/revert
-'deletepage'                  => 'Tutu axa sia',
-'deletedarticle'              => 'wotutu "[[$1]]"',
+'watchlistfor'  => "(na '''$1''')",
+'watch'         => 'Le ŋku ɖe eŋu',
+'watchthispage' => 'Le Å‹ku É–e axa sia Å‹u',
+'wlshowlast'    => 'Fia gaÆ’oÆ’o $1 Å‹keke $2 mamleawo. $3',
+
+# Delete
+'deletepage'     => 'Tutu axa sia',
+'deletedarticle' => 'wotutu "[[$1]]"',
+
+# Protect
+'prot_1movedto2'              => '[[$1]] wohee yi [[$2]]',
 'protect-level-autoconfirmed' => 'Xemɔ na ŋkɔmaŋlɔlawo',
+'protect-expiry-options'      => 'gaƒoƒo 2:2 hours,ŋkeke 1:1 day,ŋkeke 3:3 days,kɔsiɖa 1:1 week,kɔsiɖa 2:2 weeks,ɣleti 1:1 month,ɣleti 3:3 months,ɣleti 6:6 months,ƒe 1:1 year,tegbe:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Mɔɖeɖe:',
 
 # Undelete
@@ -366,7 +377,7 @@ Wòateŋu akpɔ alesi woŋlɔe.',
 'previousdiff' => '� Tata xoxoa',
 'nextdiff'     => 'Tɔtrɔ yeyea →',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Nutata yeyewo',
 
 # External editor support
diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index 10b96dad..6a4422d9 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -27,38 +27,36 @@
   * http://forum.pasok.gr
   * version 1.0 (initial release)
   *
-  *The project for the translation of MediaWiki into Greek
-  *was undertaken by a group of ICT volunteers working under
-  *the auspices of the Greek political party PASOK.
+  * The project for the translation of MediaWiki into Greek
+  * was undertaken by a group of ICT volunteers working under
+  * the auspices of the Greek political party PASOK.
   *
-  *The idea behind this effort was  to provide an extensible,
-  *easy-to-use and non-intimidating tool for content development
-  *and project management, to be used throughout the administrative
-  *and political structure of PASOK by staff, volunteers, party members
-  *and elected officials (all of whom possess varying degrees of ICT skills).
+  * The idea behind this effort was  to provide an extensible,
+  * easy-to-use and non-intimidating tool for content development
+  * and project management, to be used throughout the administrative
+  * and political structure of PASOK by staff, volunteers, party members
+  * and elected officials (all of whom possess varying degrees of ICT skills).
   *
-  *The PASOK ICT team and the volunteers who worked on this project are
-  *now returning the translated interface to the Open-Source Community
-  *with over 98% of the messages translated into user-friendly Greek.
+  * The PASOK ICT team and the volunteers who worked on this project are
+  * now returning the translated interface to the Open-Source Community
+  * with over 98% of the messages translated into user-friendly Greek.
   *
-  *We hope that it will be used as a tool by other civil society organizations
-  *in Greece, and that it will enhance the collective creation and the dissemination
-  *of knowledge - an essential component of the democratic process.
+  * We hope that it will be used as a tool by other civil society organizations
+  * in Greece, and that it will enhance the collective creation and the dissemination
+  * of knowledge - an essential component of the democratic process.
   */
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Μέσον',
+	NS_MEDIA            => 'Μέσο',
 	NS_SPECIAL          => 'Ειδικό',
-	NS_MAIN	            => '',
-	NS_TALK	            => 'Συζήτηση',
+	NS_TALK             => 'Συζήτηση',
 	NS_USER             => 'Χ�ήστης',
 	NS_USER_TALK        => 'Συζήτηση_χ�ήστη',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_συζήτηση',
-	NS_IMAGE            => 'Εικόνα',
-	NS_IMAGE_TALK       => 'Συζήτηση_εικόνας',
+	NS_FILE             => 'Α�χείο',
+	NS_FILE_TALK        => 'Συζήτηση_α�χείου',
 	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
+	NS_MEDIAWIKI_TALK   => 'Συζήτηση_MediaWiki',
 	NS_TEMPLATE         => 'Π�ότυπο',
 	NS_TEMPLATE_TALK    => 'Συζήτηση_π�οτ�που',
 	NS_HELP             => 'Βοήθεια',
@@ -66,6 +64,99 @@ $namespaceNames = array(
 	NS_CATEGORY         => 'Κατηγο�ία',
 	NS_CATEGORY_TALK    => 'Συζήτηση_κατηγο�ίας',
 );
+
+$namespaceAliases = array(
+	'Μέσον' => NS_MEDIA,
+	'Εικόνα' => NS_FILE,
+	'Συζήτηση_εικόνας' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'ΔιπλέςΑνακατευθ�νσεις' ),
+	'BrokenRedirects'           => array( 'ΛανθασμένεςΑνακατευθ�νσεις' ),
+	'Disambiguations'           => array( 'Αποσαφηνίσεις' ),
+	'Userlogin'                 => array( 'Σ�νδεσηΧ�ήστη' ),
+	'Userlogout'                => array( 'Αποσ�νδεσηΧ�ήστη' ),
+	'CreateAccount'             => array( 'Δημιου�γίαΛογα�ιασμο�' ),
+	'Preferences'               => array( 'Π�οτιμήσεις' ),
+	'Watchlist'                 => array( 'ΛίσταΠα�ακολο�θησης' ),
+	'Recentchanges'             => array( 'Π�όσφατεςΑλλαγές' ),
+	'Upload'                    => array( 'Επιφό�τωση' ),
+	'Listfiles'                 => array( 'ΚατάλογοςΑ�χείων' ),
+	'Newimages'                 => array( '�έαΑ�χεία' ),
+	'Listusers'                 => array( 'ΚατάλογοςΧ�ηστών' ),
+	'Listgrouprights'           => array( 'ΚατάλογοςΔικαιωμάτωνΧ�ηστών' ),
+	'Statistics'                => array( 'Στατιστικά' ),
+	'Randompage'                => array( 'Τυχαία' ),
+	'Lonelypages'               => array( 'Ο�φανέςΣελίδες' ),
+	'Uncategorizedpages'        => array( 'ΣελίδεςΧω�ίςΚατηγο�ία' ),
+	'Uncategorizedcategories'   => array( 'Κατηγο�ίεςΧω�ίςΚατηγο�ία' ),
+	'Uncategorizedimages'       => array( 'Α�χείαΧω�ίςΚατηγο�ία' ),
+	'Uncategorizedtemplates'    => array( 'Π�ότυπαΧω�ίςΚατηγο�ία' ),
+	'Unusedcategories'          => array( 'Αχ�ησιμοποίητεςΚατηγο�ίες' ),
+	'Unusedimages'              => array( 'Αχ�ησιμοποίηταΑ�χεία' ),
+	'Wantedpages'               => array( 'ΕπιθυμητέςΣελίδες' ),
+	'Wantedcategories'          => array( 'ΕπιθυμητέςΚατηγο�ίες' ),
+	'Wantedfiles'               => array( 'ΕπιθυμητάΑ�χεία' ),
+	'Mostlinked'                => array( 'Πε�ισσότε�οΣυνδεδεμένες' ),
+	'Mostlinkedcategories'      => array( 'Πολυχ�ησιμοποιημένεςΚατηγο�ίες' ),
+	'Mostlinkedtemplates'       => array( 'Πολυχ�ησιμοποιημέναΠ�ότυπα' ),
+	'Mostimages'                => array( 'Πολυχ�ησιμοποιημέναΑ�χεία' ),
+	'Mostcategories'            => array( 'Πε�ισσότε�εςΚατηγο�ίες' ),
+	'Mostrevisions'             => array( 'Πε�ισσότε�εςΕπεξε�γασίες' ),
+	'Fewestrevisions'           => array( 'Λιγότε�εςΕπεξε�γασίες' ),
+	'Shortpages'                => array( 'Μικ�έςΣελίδες' ),
+	'Longpages'                 => array( 'Μακ�ιέςΣελίδες' ),
+	'Newpages'                  => array( '�έεςΣελίδες' ),
+	'Ancientpages'              => array( 'Α�χαίεςΣελίδες' ),
+	'Deadendpages'              => array( 'ΑδιέξοδεςΣελίδες' ),
+	'Protectedpages'            => array( 'Π�οστατευμένεςΣελίδες' ),
+	'Protectedtitles'           => array( 'Π�οστετευμένοιΤίτλοι' ),
+	'Allpages'                  => array( 'ΌλεςΟιΣελίδες' ),
+	'Prefixindex'               => array( 'Ευ�ετή�ιοΠ�οθεμάτων' ),
+	'Ipblocklist'               => array( 'ΚατάλογοςΦ�αγώνIP' ),
+	'Specialpages'              => array( 'ΕιδικέςΣελίδες' ),
+	'Contributions'             => array( 'Συνεισφο�ές' ),
+	'Emailuser'                 => array( 'EmailΧ�ήστη' ),
+	'Confirmemail'              => array( 'ΕπιβεβαίωσηEmail' ),
+	'Whatlinkshere'             => array( 'ΤιΣυνδέειΕδώ' ),
+	'Recentchangeslinked'       => array( 'ΣχετικέςΑλλαγές' ),
+	'Movepage'                  => array( 'ΜετακίνησηΣελίδας' ),
+	'Blockme'                   => array( 'Φ�αγήΣεΜένα' ),
+	'Booksources'               => array( 'ΠηγέςΒιβλίων' ),
+	'Categories'                => array( 'Κατηγο�ίες' ),
+	'Export'                    => array( 'Εξαγωγή' ),
+	'Version'                   => array( 'Έκδοση' ),
+	'Allmessages'               => array( 'ΌλαΤαΜην�ματα' ),
+	'Log'                       => array( 'Μητ�ώο' ),
+	'Blockip'                   => array( 'Φ�αγήIP' ),
+	'Undelete'                  => array( 'Αναί�εσηΔιαγ�αφής' ),
+	'Import'                    => array( 'Εισαγωγή' ),
+	'Lockdb'                    => array( 'ΚλείδωμαΒάσης' ),
+	'Unlockdb'                  => array( 'ΞεκλείδωμαΒάσης' ),
+	'Userrights'                => array( 'ΔικαιώματαΧ�ηστών' ),
+	'MIMEsearch'                => array( 'ΑναζήτησηMIME' ),
+	'FileDuplicateSearch'       => array( 'ΑναζήτησηΔιπλώνΑ�χείων' ),
+	'Unwatchedpages'            => array( 'ΜηΠα�ακολουθο�μενεςΣελίδες' ),
+	'Listredirects'             => array( 'ΚατάλογοςΑνακατευθ�νσεων' ),
+	'Revisiondelete'            => array( 'Διαγ�αφήΈκδοσης' ),
+	'Unusedtemplates'           => array( 'ΜηΧ�ησιμοποιο�μεναΠ�ότυπα' ),
+	'Randomredirect'            => array( 'ΤυχαίαΑνακατε�θυνση' ),
+	'Mypage'                    => array( 'ΗΣελίδαΜου' ),
+	'Mytalk'                    => array( 'ΗΣυζήτησήΜου' ),
+	'Mycontributions'           => array( 'ΟιΣυνεισφο�έςΜου' ),
+	'Listadmins'                => array( 'ΚατάλογοςΔιαχει�ιστών' ),
+	'Listbots'                  => array( 'ΚατάλογοςBot' ),
+	'Popularpages'              => array( 'ΔημοφιλείςΣελίδες' ),
+	'Search'                    => array( 'Αναζήτηση' ),
+	'Resetpass'                 => array( 'Α�χικοποίησηΚωδικο�' ),
+	'Withoutinterwiki'          => array( 'Χω�ίςInterwiki' ),
+	'MergeHistory'              => array( 'ΣυγχώνευσηΙστο�ικο�' ),
+	'Filepath'                  => array( 'Διε�θυνσηΑ�χείου' ),
+	'Blankpage'                 => array( 'ΚενήΣελίδα' ),
+	'DeletedContributions'      => array( 'Διαγ�αμμένεςΣυνεισφο�ές' ),
+);
+
 $fallback8bitEncoding = 'iso-8859-7';
 $separatorTransformTable = array(',' => '.', '.' => ',' );
 $linkTrail = '/^([a-z]+)(.*)$/sD';
@@ -270,16 +361,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Απόκ�υψε τις επεξε�γασίες μου απο τη λίστα πα�ακολο�θησης',
 'tog-watchlisthidebots'       => 'Απόκ�υψε τις επεξε�γασίες των bots από τη λίστα πα�ακολο�θησης',
 'tog-watchlisthideminor'      => 'Απόκ�υψε τις μικ�ής σημασίας επεξε�γασίες από τη λίστα πα�ακολο�θησης',
+'tog-watchlisthideliu'        => 'Απόκ�υψη επεξε�γασιών συνδεδεμένων χ�ηστών από τη λίστα πα�ακολο�θησης',
+'tog-watchlisthideanons'      => 'Απόκ�υψη επεξε�γασιών ανων�μων χ�ηστών από τη λίστα πα�ακολο�θησης',
 'tog-nolangconversion'        => 'Απενε�γοποίησε τη μετατ�οπή μεταβλητών',
 'tog-ccmeonemails'            => 'Στείλε μου αντίγ�αφα των μηνυμάτων ηλεκτ�ονικο� ταχυδ�ομείου που στέλνω σε άλλους χ�ήστες',
 'tog-diffonly'                => 'Μην εμφανίζεις το πε�ιεχόμενο της σελίδας κάτω από τις διαφο�ές των εκδόσεων',
 'tog-showhiddencats'          => 'Εμφάνιση κ�υμμένων κατηγο�ιών',
+'tog-noconvertlink'           => 'Απενε�γοποίησε την μετατ�οπή τίτλου συνδέσμου',
+'tog-norollbackdiff'          => 'Πα�άλειψη διαφο�άς μετά την εκτέλεση επαναφο�άς',
 
 'underline-always'  => 'Πάντα',
 'underline-never'   => 'Ποτέ',
-'underline-default' => 'Όπως ο�ίζεται από τον browser σας.',
-
-'skinpreview' => '(π�οεπισκόπηση)',
+'underline-default' => 'Π�οεπιλογή του browser',
 
 # Dates
 'sunday'        => 'Κυ�ιακή',
@@ -349,7 +442,7 @@ $messages = array(
 'category-file-count-limited'    => '{{PLURAL:$1|Το ακόλουθο α�χείο είναι|Τα ακόλουθα $1 α�χεία είναι}} στην τ�έχουσα κατηγο�ία.',
 'listingcontinuesabbrev'         => 'συνεχίζεται...',
 
-'mainpagetext'      => 'To λογισμικό MediaWiki εγκαταστάθηκε με επιτυχία.',
+'mainpagetext'      => "<big>'''To λογισμικό MediaWiki εγκαταστάθηκε με επιτυχία.'''</big>",
 'mainpagedocfooter' => 'Πε�ισσότε�ες πλη�οφο�ίες σχετικά με τη χ�ήση και με τη ��θμιση πα�αμέτ�ων θα β�είτε στους συνδέσμους: [http://meta.wikimedia.org/wiki/MediaWiki_localisation Οδηγίες για τ�οποποίηση του πε�ιβάλλοντος ε�γασίας] και [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Εγχει�ίδιο χ�ήστη].',
 
 'about'          => 'Σχετικά',
@@ -368,7 +461,7 @@ $messages = array(
 'mytalk'         => 'Οι συζητήσεις μου',
 'anontalk'       => 'Οι συζητήσεις αυτής της διε�θυνσης IP',
 'navigation'     => 'Πλοήγηση',
-'and'            => 'και',
+'and'            => '&#32;και',
 
 # Metadata in edit box
 'metadata_help' => 'Μεταδεδομένα:',
@@ -405,14 +498,14 @@ $messages = array(
 'talkpagelinktext'  => 'Συζήτηση',
 'specialpage'       => 'Σελίδα λειτου�γιών',
 'personaltools'     => 'Π�οσωπικά ε�γαλεία',
-'postcomment'       => 'Καταχω�ίστε ένα σχόλιο.',
+'postcomment'       => '�έο τμήμα',
 'articlepage'       => 'Εμφάνιση σελίδας κειμένου',
 'talk'              => 'Συζήτηση',
 'views'             => 'Εμφανίσεις',
 'toolbox'           => 'Ε�γαλεία',
 'userpage'          => 'Εμφάνιση σελίδας χ�ήστη',
 'projectpage'       => 'Εμφάνιση σελίδας βοήθειας',
-'imagepage'         => 'Εμφάνιση σελίδας εικόνων',
+'imagepage'         => 'Εμφάνιση σελίδας α�χείου',
 'mediawikipage'     => 'Π�οβολή σελίδας μην�ματος',
 'templatepage'      => 'Π�οβολή σελίδας π�οτ�που',
 'viewhelppage'      => 'Π�οβολή σελίδας βοήθειας',
@@ -431,8 +524,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Σχετικά με τον ιστότοπο {{SITENAME}}',
 'aboutpage'            => 'Project:Σχετικά',
-'bugreports'           => 'Αναφο�ές σφαλμάτων',
-'bugreportspage'       => 'Project:Αναφο�ά σφάλματος',
 'copyright'            => 'Το πε�ιεχόμενο είναι διαθέσιμο σ�μφωνα με την $1.',
 'copyrightpagename'    => '{{SITENAME}} δικαιώματα πνευματικής ιδιοκτησίας',
 'copyrightpage'        => '{{ns:project}}:Πνευματικά Δικαιώματα',
@@ -455,9 +546,7 @@ $messages = array(
 
 'badaccess'        => 'Ακατάλληλη άδεια',
 'badaccess-group0' => 'Δεν επιτ�έπεται να εκτελέσετε την ενέ�γεια που ζητήσατε.',
-'badaccess-group1' => 'Η ενέ�γεια που ζητήσατε είναι πε�ιο�ισμένη σε χ�ήστες της ομάδας $1.',
-'badaccess-group2' => 'Η ενέ�γεια που ζητήσατε είναι πε�ιο�ισμένη σε χ�ήστες σε μία από τις ομάδες $1.',
-'badaccess-groups' => 'Η ενέ�γεια που ζητήσατε είναι πε�ιο�ισμένη σε χ�ήστες σε μία από τις ομάδες $1.',
+'badaccess-groups' => 'Η ενέ�γεια που ζητήσατε είναι πε�ιο�ισμένη σε χ�ήστες σε {{PLURAL:$2|μία ομάδα|μία από τις ομάδες}}: $1.',
 
 'versionrequired'     => 'Απαιτείται η έκδοση $1 του MediaWiki.',
 'versionrequiredtext' => 'Για να χ�ησιμοποιήσετε αυτή τη σελίδα απαιτείται η έκδοση $1 του MediaWiki . Βλ. [[Special:Έκδοση]]',
@@ -471,6 +560,8 @@ $messages = array(
 'editsection'             => 'επεξε�γασία',
 'editold'                 => 'επεξε�γασία',
 'viewsourceold'           => 'εμφάνιση κώδικα',
+'editlink'                => 'επεξε�γασία',
+'viewsourcelink'          => 'εμφάνιση κώδικα',
 'editsectionhint'         => 'Επεξε�γασία ενότητας: $1',
 'toc'                     => 'Πίνακας πε�ιεχομένων',
 'showtoc'                 => 'εμφάνιση',
@@ -485,13 +576,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Συνδ�ομή',
 'page-rss-feed'           => '"$1" RSS Συνδ�ομή',
 'page-atom-feed'          => '"$1" Atom Συνδ�ομή',
-'red-link-title'          => '$1 (δεν έχει ακόμα γ�αφτεί)',
+'red-link-title'          => '$1 (η σελίδα δεν υπά�χει)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Ά�θ�ο',
 'nstab-user'      => 'Σελίδα χ�ήστη',
 'nstab-media'     => 'Ηλεκτ�ονικά μέσα',
-'nstab-special'   => 'Σελίδα λειτου�γιών',
+'nstab-special'   => 'Ειδική σελίδα',
 'nstab-project'   => 'Σχετικά με',
 'nstab-image'     => 'Α�χείο',
 'nstab-mediawiki' => 'Μήνυμα',
@@ -501,7 +592,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Δεν υπά�χει τέτοια ενέ�γεια.',
-'nosuchactiontext'  => 'Η ενέ�γεια που καθο�ίστηκε από την διε�θυνση URL δεν αναγνω�ίζεται από το Wiki.',
+'nosuchactiontext'  => 'Η ενέ�γεια που καθο�ίστηκε από την διε�θυνση URL είναι μη έγκυ�η.
+Ενδέχεται να πληκτ�ολογήσατε λάνθασμένα την διε�θυνση URL ή να ακολουθήσατε έναν μη έγκυ�ο σ�νδεσμο.
+Μπο�εί επίσης να ευθ�νεται καποιο σφάλμα του λογισμικο� που χ�ησιμοποιεί ο ιστότοπος {{SITENAME}}.',
 'nosuchspecialpage' => 'Δεν υπά�χει τέτοια σελίδα λειτου�γιών.',
 'nospecialpagetext' => "<big>'''Ζητήσατε μια άκυ�η σελίδα λειτου�γιών.'''</big>
 
@@ -543,7 +636,6 @@ $1',
 'cannotdelete'         => 'Αδ�νατη η διαγ�αφή της συγκεκ�ιμένης σελίδας ή εικόνας (Ενδεχομένως να έχει ήδη διαγ�αφεί από άλλο χ�ήστη.)',
 'badtitle'             => 'Ακατάλληλος τίτλος',
 'badtitletext'         => 'Ο τίτλος της σελίδας που ζητήσατε είναι άκυ�ος ή κενός ή π�όκειται για έναν εσφαλμένα συνδεδεμένο διαγλωσσικό τίτλο (ή εσφαλμένα συνδεδεμένο τίτλο ανάμεσα σε διαφο�ετικά Wiki).',
-'perfdisabled'         => 'Λυπο�μαστε! Αυτή η λειτου�γία έχει π�οσω�ινά απενε�γοποιηθεί επειδή επιβ�αδ�νει τη βάση δεδομένων σε βαθμό που κανένας χ�ήστης δεν μπο�εί να χ�ησιμοποιήσει το Wiki.',
 'perfcached'           => 'Τα δεδομένα που ακολουθο�ν είναι cached και είνα πιθανόν να μην είναι πλή�ως ενημε�ωμένα:',
 'perfcachedts'         => 'Τα ακόλουθα δεδομένα είναι καταχω�ημένα στη λανθάνουσα μνήμη, και ενημε�ώθηκαν τελευταία στις $1.',
 'querypage-no-updates' => 'Οι ενημε�ώσεις για αυτή τη σελίδα είναι απενε�γοποιημένες. Τα δεδομένα εδώ δεν θα ανανεωθο�ν π�ος το πα�όν.',
@@ -557,7 +649,7 @@ $1',
 'protectedpagetext'    => 'Αυτή η σελίδα έχει κλειδωθεί για αποτ�οπή επεξε�γασίας της.',
 'viewsourcetext'       => 'Μπο�είτε να δείτε και να αντιγ�άψετε τον κώδικα αυτής της σελίδας:',
 'protectedinterface'   => 'Αυτή η σελίδα πα�έχει κείμενο διεπαφής για το λογισμικό, και έχει κλειδωθεί για π�όληψη τυχόν βανδαλισμο�.',
-'editinginterface'     => "'''Π�οσοχή:''' Επεξε�γάζεστε μια σελίδα η οποία χ�ησιμοποιείται για να πα�έχει κείμενο διεπαφής για το λογισμικό. Αλλαγές σε αυτή τη σελίδα θα επη�εάσουν την εμφάνιση της διεπαφής χ�ήστη για τους άλλους χ�ήστες. Εάν θέλετε να διο�θώσετε τη μετάφ�αση, μπο�είτε να χ�ησιμοποιήσετε το [http://translatewiki.net/wiki/Main_Page?setlang=el Betawiki], που ασχολείται με τις μεταφ�άσεις των μηνυμάτων MediaWiki.",
+'editinginterface'     => "'''Π�οσοχή:''' Επεξε�γάζεστε μια σελίδα η οποία χ�ησιμοποιείται για να πα�έχει κείμενο διεπαφής για το λογισμικό. Αλλαγές σε αυτή τη σελίδα θα επη�εάσουν την εμφάνιση της διεπαφής χ�ήστη για τους άλλους χ�ήστες. Εάν θέλετε να διο�θώσετε τη μετάφ�αση, μπο�είτε να χ�ησιμοποιήσετε το [http://translatewiki.net/wiki/Main_Page?setlang=el translatewiki.net], που ασχολείται με τις μεταφ�άσεις των μηνυμάτων MediaWiki.",
 'sqlhidden'            => '(το αίτημα SQL δεν εμφανίζεται)',
 'cascadeprotected'     => 'Αυτή η σελίδα έχει π�οστατευθεί από επεξε�γασία, επειδή πε�ιλαμβάνεται στις ακόλουθες {{PLURAL:$1|σελίδα|σελίδες}}, που είναι π�οστατευμένες με την ενε�γοποιημένη "διαδοχική" π�οστασία στο:
 $2',
@@ -568,14 +660,14 @@ $2',
 Ο λόγος που δίνεται είναι ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Λάθος ��θμιση: άγνωστος ανιχνευτής ιών: <i>$1</i>',
+'virus-badscanner'     => "Λάθος ��θμιση: άγνωστος ανιχνευτής ιών: ''$1''",
 'virus-scanfailed'     => 'Η σά�ωση απέτυχε (κώδικας $1)',
 'virus-unknownscanner' => 'άγνωστο αντιικό:',
 
 # Login and logout pages
 'logouttitle'                => 'Έξοδος χ�ήστη',
-'logouttext'                 => '<strong>Έχετε αποσυνδεθεί.</strong>
-Μπο�είτε να πα�αμείνετε στο {{SITENAME}} ανώνυμα, ή μπο�είτε [[Special:UserLogin|να συνδεθείτε ξανά]] με το ίδιο ή με διαφο�ετικό (εάν έχετε) όνομα χ�ήστη. Έχετε υπόψη σας πως α�κετές σελίδες θα συνεχίσουν να εμφανίζονται κανονικά, σαν να μην έχετε αποσυνδεθεί, μέχ�ι να καθα�ίσετε τη λανθάνουσα μνήμη του φυλλομετ�ητή σας.',
+'logouttext'                 => "'''Έχετε αποσυνδεθεί.'''
+Μπο�είτε να πα�αμείνετε στο {{SITENAME}} ανώνυμα, ή μπο�είτε [[Special:UserLogin|να συνδεθείτε ξανά]] με το ίδιο ή με διαφο�ετικό (εάν έχετε) όνομα χ�ήστη. Έχετε υπόψη σας πως α�κετές σελίδες θα συνεχίσουν να εμφανίζονται κανονικά, σαν να μην έχετε αποσυνδεθεί, μέχ�ι να καθα�ίσετε τη λανθάνουσα μνήμη του φυλλομετ�ητή σας.",
 'welcomecreation'            => '== Καλώς ήλθατε, $1! ==
 Ο λογα�ιασμός σας έχει δημιου�γηθεί.
 Μην ξεχάσετε να �υθμίσετε τις [[Special:Preferences|π�οτιμήσεις]] σας στο {{SITENAME}}.',
@@ -586,7 +678,6 @@ $2',
 'remembermypassword'         => 'Διατή�ηση του κωδικο� π�όσβασης σε αυτόν τον υπολογιστή',
 'yourdomainname'             => 'Το domain σας:',
 'externaldberror'            => 'Συνέβη εξωτε�ικό σφάλμα πιστοποίησης στη βάση δεδομένων ή δεν σας έχει επιτ�απεί να ενημε�ώσετε τον εξωτε�ικό σας λογα�ιασμό.',
-'loginproblem'               => '<b>Εμφανίστηκε π�όβλημα κατά την είσοδό σας.</b><br />Πα�ακαλο�με δοκιμάστε ξανά!',
 'login'                      => 'Είσοδος',
 'nav-login-createaccount'    => 'Δημιου�γία Λογα�ιασμο�/Είσοδος',
 'loginprompt'                => 'Π�έπει να έχετε ενε�γοποιήσει τα cookies για να συνδεθείτε στο {{SITENAME}}.',
@@ -601,19 +692,19 @@ $2',
 'gotaccountlink'             => 'Συνδεθείτε',
 'createaccountmail'          => 'Με ηλεκτ�ονικό ταχυδ�ομείο',
 'badretype'                  => 'Οι κωδικοί που έχετε δηλώσει δεν συμφωνο�ν μεταξ� τους.',
-'userexists'                 => 'Το όνομα χ�ήστη που συμπλη�ώσατε είναι ήδη σε χ�ήση. Διαλέξτε ένα άλλο όνομα.',
+'userexists'                 => 'Το όνομα χ�ήστη που εισαγάγατε ήδη χ�ησιμοποιείται. Πα�ακαλο�με, διαλέξτε διαφο�ετικό.',
 'youremail'                  => 'Ηλεκτ�ονική διε�θυνση*',
 'username'                   => 'Όνομα χ�ήστη:',
 'uid'                        => 'Α�ιθμός αναγνώ�ισης χ�ήστη:',
 'prefs-memberingroups'       => 'Μέλος {{PLURAL:$1|ομάδας|ομάδων}}:',
-'yourrealname'               => 'Όνομα και επώνυμο*',
+'yourrealname'               => 'Π�αγματικό όνομα:',
 'yourlanguage'               => 'Γλώσσα:',
 'yourvariant'                => 'Η γλώσσα που χ�ησιμοποιείτε',
 'yournick'                   => 'Υπογ�αφή:',
 'badsig'                     => 'Άκυ�η υπογ�αφή raw: ελέγξτε τις ετικέτες HTML.',
-'badsiglength'               => 'Η υπογ�αφή είναι πολ� μεγάλη. 
+'badsiglength'               => 'Η υπογ�αφή σας είναι πολ� μεγάλη. 
 Π�έπει να είναι κάτω από $1 {{PLURAL:$1|χα�ακτή�α|χα�ακτή�ες}}.',
-'email'                      => 'αλληλογ�αφία',
+'email'                      => 'Ηλεκτ�ονικό ταχυδ�ομείο',
 'prefs-help-realname'        => '* Π�αγματικό όνομα (π�οαι�ετικό): εφόσον εισάγετε το όνομά σας, αυτό θα μπο�εί να χ�ησιμοποιηθεί για να αναγνω�ιστεί η δουλειά σας.',
 'loginerror'                 => 'Σφάλμα σ�νδεσης',
 'prefs-help-email'           => 'Το ηλεκτ�ονικό ταχυδ�ομείο είναι π�οαι�ετικό, ωστόσο δίνει τη δυνατότητα να σας αποσταλεί ένας νέος κωδικός στην πε�ίπτωση που ξεχάσετε τον κωδικό σας.
@@ -625,6 +716,7 @@ $2',
 'loginsuccesstitle'          => 'Επιτυχής σ�νδεση',
 'loginsuccess'               => 'Είστε συνδεδεμένος(-η) στο {{SITENAME}} ως "$1".',
 'nosuchuser'                 => 'Δεν υπά�χει χ�ήστης με το όνομα "$1".
+Τα ονόματα χ�ηστών είναι ευαίσθητα σε κεφαλαιογ�άμματη και μικ�ογ�άμματη γ�αφή.
 Ελέγξτε την ο�θογ�αφία ή [[Special:UserLogin/signup|δημιου�γήστε ένα νέο λογα�ιασμό]].',
 'nosuchusershort'            => 'Δεν υπά�χει χ�ήστης με το όνομα "<nowiki>$1</nowiki>". Πα�ακαλο�με ελέγξτε την ο�θογ�αφία.',
 'nouserspecified'            => 'Π�έπει να ο�ίσετε ένα όνομα χ�ήστη.',
@@ -633,7 +725,7 @@ $2',
 'passwordtooshort'           => 'Ο κωδικός σας είναι ή λανθασμένος ή πολ� σ�ντομος. 
 Π�έπει να πε�ιέχει τουλάχιστον {{PLURAL:$1|1 χα�ακτή�α|$1 χα�ακτή�ες}} και να διαφέ�ει από το όνομα χ�ήστη σας.',
 'mailmypassword'             => 'Αποστολή νέου κωδικο�',
-'passwordremindertitle'      => 'Καινο��ιος π�οσω�ινός κωδικός για το {{SITENAME}}',
+'passwordremindertitle'      => 'Καινο��γιος π�οσω�ινός κωδικός για το {{SITENAME}}',
 'passwordremindertext'       => 'Κάποιος (πιθανώς εσείς, από την διε�θυνση IP $1) ζήτησε να σας στείλουμε ένα νέο κωδικό π�όσβασης για τον ιστότοπο {{SITENAME}} ($4). Ο κωδικός π�όσβασης για το χ�ήστη "$2" είναι τώ�α "$3". Αν το κάνατε εσείς, θα π�έπει να συνδεθείτε και να αλλάξετε τον κωδικό π�όσβασης σας τώ�α.
 
 Αν κάποιος άλλος έκανε αυτή την αίτηση ή αν έχετε θυμηθεί τον κωδικό π�όσβασης σας και δεν επιθυμείτε πλέον να τον αλλάξετε, μπο�είτε να αγνοήσετε αυτό το μήνυμα και να συνεχίσετε να χ�ησιμοποιείτε τον παλιό κωδικό π�όσβασης σας.',
@@ -646,11 +738,12 @@ $2',
 'throttled-mailpassword'     => 'Μια υπενθ�μιση για τον κωδικό π�όσβασης έχει ήδη σταλεί, μέσα {{PLURAL:$1|στην τελευταία ώ�α|στις τελευταίες $1 ώ�ες}}. 
 Για την αποφυγή κατάχ�ησης, μόνο μια υπενθ�μιση για τον κωδικό π�όσβασης θα στέλνεται ανά {{PLURAL:$1|ώ�α|$1 ώ�ες}}.',
 'mailerror'                  => 'Σφάλμα στην αποστολή του μην�ματος: $1',
-'acct_creation_throttle_hit' => 'Λυπο�μαστε, έχετε ήδη δημιου�γήσει $1 λογα�ιασμο�ς και δεν μπο�είτε να δημιου�γήσετε άλλους.',
-'emailauthenticated'         => 'Η ηλεκτ�ονική σας διε�θυνση επιβεβαιώθηκε στις $1.',
+'acct_creation_throttle_hit' => 'Επισκέπτες αυτο� του wiki με την διε�θυνση IP σας έχουν ήδη δημιου�γήσει {{PLURAL:$1|ένα λογα�ιασμό|$1 λογα�ιασμο�ς}}, κατά την τελευταία μία ημέ�α, που είναι και ο μέγιστος επιτ�επόμενος α�ιθμός. 
+Ως αποτέλεσμα, επισκέπτες αυτο� του wiki με αυτήν την διε�θυνση IP δεν μπο�ο�ν αυτή την στιγμή να δημιου�γήσουν πε�ισσότε�ους λογα�ιασμο�ς.',
+'emailauthenticated'         => 'Η ηλεκτ�ονική σας διε�θυνση επιβεβαιώθηκε στις $2, ώ�α $3.',
 'emailnotauthenticated'      => 'Η ηλεκτ�ονική σας διε�θυνση δεν έχει επαληθευτεί ακόμα. 
 Κανένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου δεν θα σταλεί για τις ακόλουθες λειτου�γίες.',
-'noemailprefs'               => '<strong>Δεν έχει ο�ισθεί ηλεκτ�ονική διε�θυνση</strong>, οι λειτου�γίες που ακολουθο�ν δεν θα είναι δυνατόν να ολοκλη�ωθο�ν.',
+'noemailprefs'               => 'Δεν έχει ο�ισθεί ηλεκτ�ονική διε�θυνση, οι λειτου�γίες που ακολουθο�ν δεν θα είναι δυνατόν να ολοκλη�ωθο�ν.',
 'emailconfirmlink'           => 'Επαληθε�στε την ηλεκτ�ονική σας διε�θυνση',
 'invalidemailaddress'        => 'Η ηλεκτ�ονική διε�θυνση δεν μπο�εί να γίνει δεκτή γιατί ενδεχομένως δεν έχει έγκυ�η μο�φή. Πα�ακαλο�με συμπλη�ώστε μια σωστά διαμο�φωμένη διε�θυνση ή αφήστε το πεδίο κενό.',
 'accountcreated'             => 'Ο λογα�ιασμός δημιου�γήθηκε',
@@ -659,18 +752,27 @@ $2',
 'createaccount-text'         => 'Κάποιος δημιο��γησε έναν λογα�ιασμό για τη διε�θυνση email σας στο {{SITENAME}} ($4) με το όνομα "$2", με κωδικό π�όσβασης "$3". Θα π�έπει να συνδεθείτε και να αλλάξετε τον κωδικό π�όσβασής σας τώ�α.
 
 Μπο�είτε να αγνοήσετε αυτό το μήνυμα, αν αυτός ο λογα�ιασμός δημιου�γήθηκε εσφαλμένα.',
+'login-throttled'            => 'Τελευταία κάνατε πά�α πολλές δοκιμές πάνω στον κωδικό αυτο� του λογα�ιασμο�.
+Πα�ακαλο�με πε�ιμένετε π�οτο� ξαναδοκιμάσετε.',
 'loginlanguagelabel'         => 'Γλώσσα: $1',
 
 # Password reset dialog
-'resetpass'               => 'Επαναφο�ά κωδικο� π�όσβασης για τον λογα�ιασμό',
-'resetpass_announce'      => 'Συνδεθήκατε με ένα π�οσω�ινό κωδικό, σταλμένο με e-mail. Για να ολοκλη�ώσετε την σ�νδεση, π�έπει να στείλετε ένα νέο κωδικό εδώ:',
-'resetpass_text'          => '<!-- Π�οσθέστε κείμενο εδώ -->',
-'resetpass_header'        => 'Επαναφο�ά κωδικο� π�όσβασης',
-'resetpass_submit'        => 'Δώστε κωδικό π�όσβασης και συνδεθείτε',
-'resetpass_success'       => 'Ο κωδικός π�όσβασής σας άλλαξε επιτυχώς! Τώ�α σας συνδέουμε...',
-'resetpass_bad_temporary' => 'Άκυ�ος π�οσω�ινός κωδικός π�όσβασης. Μπο�εί ήδη να έχετε αλλάξει επιτυχώς τον κωδικό π�όσβασής σας ή να έχετε ζητήσει ένα νέο π�οσω�ινό κωδικό π�όσβασης.',
-'resetpass_forbidden'     => 'Οι κωδικοί π�όσβασης δεν μπο�ο�ν να αλλαχθο�ν',
-'resetpass_missing'       => 'Η φό�μα δεν πε�ιέχει δεδομένα.',
+'resetpass'                 => 'Αλλαγή κωδικο� π�όσβασης',
+'resetpass_announce'        => 'Συνδεθήκατε με ένα π�οσω�ινό κωδικό, σταλμένο με e-mail. Για να ολοκλη�ώσετε την σ�νδεση, π�έπει να στείλετε ένα νέο κωδικό εδώ:',
+'resetpass_text'            => '<!-- Π�οσθέστε κείμενο εδώ -->',
+'resetpass_header'          => 'Αλλαγή κωδικο� π�όσβασης',
+'oldpassword'               => 'Παλιός κωδικός',
+'newpassword'               => '�έος κωδικός π�όσβασης',
+'retypenew'                 => 'Πληκτ�ολογήστε ξανά το νέο κωδικό.',
+'resetpass_submit'          => 'Δώστε κωδικό π�όσβασης και συνδεθείτε',
+'resetpass_success'         => 'Ο κωδικός π�όσβασής σας άλλαξε επιτυχώς! Τώ�α σας συνδέουμε...',
+'resetpass_bad_temporary'   => 'Άκυ�ος π�οσω�ινός κωδικός π�όσβασης. Μπο�εί ήδη να έχετε αλλάξει επιτυχώς τον κωδικό π�όσβασής σας ή να έχετε ζητήσει ένα νέο π�οσω�ινό κωδικό π�όσβασης.',
+'resetpass_forbidden'       => 'Οι κωδικοί π�όσβασης δεν μπο�ο�ν να αλλαχθο�ν',
+'resetpass-no-info'         => 'Π�έπει να είστε συνδεδεμένος για να δείτε αυτήν την σελίδα απευθείας',
+'resetpass-submit-loggedin' => 'Αλλαγή κωδικο�',
+'resetpass-wrong-oldpass'   => 'Λάθος π�οσω�ινός ή κανονικός κωδικός. 
+Μπο�εί να έχετε ήδη αλλάξει επιτυχώς τον κωδικό σας ή να έχετε ζητήσει έναν νέο π�οσω�ινό κωδικό.',
+'resetpass-temp-password'   => 'Π�οσω�ινός κωδικός:',
 
 # Edit page toolbar
 'bold_sample'     => 'Έντονο κείμενο',
@@ -695,8 +797,8 @@ $2',
 'hr_tip'          => 'Ο�ιζόντια γ�αμμή (να χ�ησιμοποιείται με μέτ�ο!)',
 
 # Edit pages
-'summary'                          => 'Σ�νοψη',
-'subject'                          => 'Θέμα/επικεφαλίδα',
+'summary'                          => 'Σ�νοψη:',
+'subject'                          => 'Θέμα/επικεφαλίδα:',
 'minoredit'                        => 'Αλλαγή μικ�ής κλίμακας',
 'watchthis'                        => 'Πα�ακολο�θηση αυτής της σελίδας',
 'savearticle'                      => 'Αποθήκευση σελίδας',
@@ -708,8 +810,8 @@ $2',
 'missingsummary'                   => "'''Υπενθ�μιση:''' Δεν έχετε συμπλη�ώσει τη σ�νοψη επεξε�γασίας. Αν κάνετε κλικ στο κουμπί Αποθήκευση πάλι, η επεξε�γασία σας θα αποθηκευτεί χω�ίς σ�νοψη.",
 'missingcommenttext'               => 'Πα�ακαλώ εισάγετε ένα σχόλιο πα�ακάτω.',
 'missingcommentheader'             => "'''Υπενθ�μιση:''' Δεν έχετε καθο�ίσει ένα θέμα/επικεφαλίδα για αυτό το σχόλιο. Αν κάνετε κλικ στο κουμπί Αποθήκευση πάλι, η επεξε�γασία σας θα αποθηκευτεί χω�ίς θέμα ή επικεφαλίδα.",
-'summary-preview'                  => 'Π�οεπισκόπηση σ�νοψης',
-'subject-preview'                  => 'Π�οεπισκόπηση θέματος/επικεφαλίδας',
+'summary-preview'                  => 'Π�οεπισκόπηση σ�νοψης:',
+'subject-preview'                  => 'Π�οεπισκόπηση θέματος/επικεφαλίδας:',
 'blockedtitle'                     => 'Ο χ�ήστης έχει υποστεί φ�αγή.',
 'blockedtext'                      => "<big>'''Το όνομα χ�ήστη σας ή η διε�θυνση IP σας έχει υποστεί φ�αγή.'''</big>
 
@@ -756,52 +858,56 @@ $2',
 'newarticletext'                   => "Ακολουθήσατε ένα σ�νδεσμο π�ος μια σελίδα που δεν υπά�χει ακόμα. Για να δημιου�γήσετε τη σελίδα, α�χίστε να γ�άφετε το κείμενό σας στο πλαίσιο (δείτε τη [[{{MediaWiki:Helppage}}|Σελίδα βοήθειας]] για πε�ισσότε�ες πλη�οφο�ίες).
 Αν έχετε β�εθεί εδώ κατά λάθος, απλώς πατήστε '''επιστ�οφή (back)''' στον browser του υπολογιστή σας.",
 'anontalkpagetext'                 => "----''Αυτή η σελίδα συζήτησης π�οο�ίζεται για ανώνυμο χ�ήστη που δεν έχει δημιου�γήσει ακόμα λογα�ιασμό ή που δεν τον χ�ησιμοποιεί. Έτσι για την ταυτοποίηση ενός ανώνυμου χ�ήστη χ�ησιμοποιείται η διε�θυνση IP του. Είναι όμως πιθανόν η διε�θυνση αυτή να είναι κοινή για πολλο�ς διαφο�ετικο�ς χ�ήστες.  Αν είστε ανώνυμος χ�ήστης και νομίζετε ότι άσχετα σχόλια απευθ�νθηκαν σε σας, πα�ακαλο�με να [[Special:UserLogin/signup|δημιου�γήσετε ένα λογα�ιασμό]] ή να  [[Special:UserLogin|συνδεθείτε]] για να αποφε�γεται η μελλοντική σ�γχυση με άλλους ανώνυμους χ�ήστες.''",
-'noarticletext'                    => 'Δεν υπά�χει τώ�α κείμενο σε αυτή τη σελίδα, μπο�είτε να [[Special:Search/{{PAGENAME}}|αναζητήσετε αυτόν τον τίτλο σελίδας]] σε άλλες σελίδες ή να [{{fullurl:{{FULLPAGENAME}}|action=edit}} επεξε�γαστείτε τη σελίδα αυτή].',
+'noarticletext'                    => 'Δεν υπά�χει π�ος το πα�όν κείμενο σε αυτή τη σελίδα. Μπο�είτε να [[Special:Search/{{PAGENAME}}|αναζητήσετε αυτόν τον τίτλο σελίδας]] σε άλλες σελίδες, 
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} να αναζητήσετε τα σχετικά ιστο�ικά],
+ή να [{{fullurl:{{FULLPAGENAME}}|action=edit}} επεξε�γαστείτε τη σελίδα αυτή].',
 'userpage-userdoesnotexist'        => 'Ο Λογα�ιασμός του χ�ήστη "$1" δεν είναι καταχω�ημένος. Πα�ακαλώ δείτε αν θα θέλατε να δημιου�γήσετε/επεξε�γαστείτε αυτή τη σελίδα.',
 'clearyourcache'                   => "'''Σημείωση:''' Μετά την αποθήκευση, θα χ�ειαστεί να καθα�ίσετε την cache στον browser σας για να μπο�έσετε να δείτε τις αλλαγές: '''Mozilla / Firefox / Safari:''' κ�ατώντας το ''Shift'' κάντε κλικ στο ''Ανανέωση'', ή πατήστε ''Ctrl-F5'' ή ''Ctrl-R''. '''Konqueror:''' κάντε κλικ στο ''Reload'' ή πατήστε ''F5''. '''Opera:''' : Πηγαίνετε ''Ε�γαλεία → Π�οτιμήσεις''. '''Internet Explorer:''' κ�ατώντας το ''Ctrl'' κάντε κλικ στο ''Ανανέωση'' ή πατήστε ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => '<strong>Χ�ήσιμη συμβουλή:</strong> Χ�ησιμοποιήστε το κουμπί "Π�οεπισκόπηση" για να ελέγξτε τα νέα σας CSS/JS π�ιν τα αποθηκε�σετε.',
+'usercssjsyoucanpreview'           => "'''Χ�ήσιμη συμβουλή:''' Χ�ησιμοποιήστε το κουμπί \"Π�οεπισκόπηση\" για να ελέγξτε τα νέα σας CSS/JS π�ιν τα αποθηκε�σετε.",
 'usercsspreview'                   => "'''Σας υπενθυμίζουμε ότι κάνετε απλώς έλεγχο/π�οεπισκόπηση του CSS του χ�ήστη -δεν το έχετε ακόμα αποθηκε�σει! '''",
 'userjspreview'                    => "'''Σας υπενθυμίζουμε ότι κάνετε απλώς έλεγχο/π�οεπισκόπηση του JavaScript του χ�ήστη -δεν το έχετε ακόμα αποθηκε�σει!'''",
 'userinvalidcssjstitle'            => "'''Π�οσοχή:''' Δεν υπά�χει skin με τίτλο \"\$1\". Θυμηθείτε οι π�οσα�μοσμένες σελίδες .css και .js χ�ησιμοποιο�ν έναν τίτλο με μικ�ά γ�άμματα, π.χ. {{ns:user}}:Foo/monobook.css σε αντίθεση με το {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Ενημε�ώθηκε)',
-'note'                             => '<strong>Π�οσοχή: </strong>',
-'previewnote'                      => '<strong>Σας υπενθυμίζουμε ότι βλέπετε μόνον την π�οεπισκόπηση -δεν έχετε ακόμα αποθηκε�σει τις αλλαγές σας!</strong>',
+'note'                             => "'''Π�οσοχή: '''",
+'previewnote'                      => "'''Σας υπενθυμίζουμε ότι βλέπετε μόνον την π�οεπισκόπηση -δεν έχετε ακόμα αποθηκε�σει τις αλλαγές σας!'''",
 'previewconflict'                  => 'Αυτή η π�οεπισκόπηση απεικονίζει το κείμενο στην επάνω πε�ιοχή επεξε�γασίας κειμένου, όπως θα εμφανιστεί εάν επιλέξετε να το αποθηκε�σετε.',
-'session_fail_preview'             => '<strong>Συγγνώμη! Δεν μπο�ο�σαμε να διεκπε�αιώσουμε την επεξε�γασία σας λόγω απώλειας των δεδομένων της συνεδ�ίας.
-Πα�ακαλώ π�οσπαθήστε ξανά. Αν δεν δουλε�ει ξανά, δοκιμάστε να αποσυνδεθείτε και να συνδεθείτε πάλι.</strong>',
-'session_fail_preview_html'        => "<strong>Λυπο�μαστε! Δεν μπο�έσαμε να διεκπε�αιώσουμε την επεξε�γασία σας λόγω απώλειας των δεδομένων της συνεδ�ίας.</strong>
+'session_fail_preview'             => "'''Συγγνώμη! Δεν μπο�ο�σαμε να διεκπε�αιώσουμε την επεξε�γασία σας λόγω απώλειας των δεδομένων της συνεδ�ίας.
+Πα�ακαλώ π�οσπαθήστε ξανά. Αν δεν δουλε�ει ξανά, δοκιμάστε να αποσυνδεθείτε και να συνδεθείτε πάλι.'''",
+'session_fail_preview_html'        => "'''Λυπο�μαστε! Δεν μπο�έσαμε να διεκπε�αιώσουμε την επεξε�γασία σας λόγω απώλειας των δεδομένων της συνεδ�ίας.'''
 
 ''Επειδή το {{SITENAME}} επιτ�έπει την εισαγωγή ακατέ�γαστου HTML, η π�οεπισκόπηση είναι κ�υμμένη ως π�οφ�λαξη ενάντια σε επιθέσεις με Javascript.''
 
-<strong>Αν αυτή είναι μια έγκυ�η π�οσπάθεια επεξε�γασίας, πα�ακαλώ π�οσπαθήστε ξανά. Αν πάλι δε δουλε�ει, δοκιμάστε να αποσυνδεθείτε και να συνδεθείτε πάλι.</strong>",
-'token_suffix_mismatch'            => '<strong>Η επεξε�γασία σας απο��ίφθηκε γιατί το π�όγ�αμμα-πελάτη σας κατακ�εο��γησε τους χα�ακτή�ες στίξης στο κουπόνι επεξε�γασίας. Η επεξε�γασία απο��ίφθηκε για να αποφευχθεί η πα�αφθο�ά του κειμένου της σελίδας.
-Αυτό με�ικές φο�ές συμβαίνει όταν χ�ησιμοποιείται ένας ανώνυμος διακομιστής μεσολάβησης διαθέσιμος μέσω του παγκόσμιου ιστο� με σφάλματα.</strong>',
+'''Αν αυτή είναι μια έγκυ�η π�οσπάθεια επεξε�γασίας, πα�ακαλώ π�οσπαθήστε ξανά. Αν πάλι δε δουλε�ει, δοκιμάστε να αποσυνδεθείτε και να συνδεθείτε πάλι.'''",
+'token_suffix_mismatch'            => "'''Η επεξε�γασία σας απο��ίφθηκε γιατί το π�όγ�αμμα-πελάτη σας κατακ�εο��γησε τους χα�ακτή�ες στίξης στο κουπόνι επεξε�γασίας. Η επεξε�γασία απο��ίφθηκε για να αποφευχθεί η πα�αφθο�ά του κειμένου της σελίδας.
+Αυτό με�ικές φο�ές συμβαίνει όταν χ�ησιμοποιείται ένας ανώνυμος διακομιστής μεσολάβησης διαθέσιμος μέσω του παγκόσμιου ιστο� με σφάλματα.'''",
 'editing'                          => 'Επεξε�γασία $1',
 'editingsection'                   => 'Επεξε�γασία $1 (τμήμα)',
-'editingcomment'                   => 'Επεξε�γασία $1 (σχόλια)',
+'editingcomment'                   => 'Επεξε�γασία $1 (νέο τμήμα)',
 'editconflict'                     => 'Σ�γκ�ουση επεξε�γασίας: $1',
 'explainconflict'                  => 'Κάποιος άλλος χ�ήστης έχει αλλάξει αυτή τη σελίδα από τότε που α�χίσατε να την επεξε�γάζεστε. Στο επάνω τμήμα β�ίσκεται το τ�έχον κείμενο της σελίδας. Οι δικές σας αλλαγές εμφανίζονται στο κάτω τμήμα. Θα π�έπει να ενσωματώσετε τις αλλαγές σας στο τ�έχον κείμενο. <b>Μόνο</b> το επάνω τμήμα θα αποθηκευθεί όταν πατήσετε "Αποθήκευση σελίδας".<p>',
 'yourtext'                         => 'Το κείμενό σας',
 'storedversion'                    => 'Αποθηκευμένη έκδοση',
-'nonunicodebrowser'                => '<strong>ΠΡΟΣΟΧΗ! Ο φυλλομετ�ητής σας δεν είναι συμβατός με το unicode. Μία π�οσω�ινή λ�ση διατίθεται για να μπο�έσετε να επεξε�γαστείτε σελίδες με ασφάλεια: μη-ASCII χα�ακτή�ες θα φαίνονται στο πλαίσιο επεξε�γασίας ως δεκαεξαδικοί κωδικοί.</strong><br />',
-'editingold'                       => '<strong>ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Επεξε�γάζεστε μια παλιότε�η αναθεώ�ηση αυτής της σελίδας. Αν π�οσπαθείστε να την αποθηκε�σετε, όσες αλλαγές έχουν γίνει π�ιν από αυτή την αναθεώ�ηση θα χαθο�ν.</strong><br />',
+'nonunicodebrowser'                => "'''ΠΡΟΣΟΧΗ! Ο φυλλομετ�ητής σας δεν είναι συμβατός με το unicode. Μία π�οσω�ινή λ�ση διατίθεται για να μπο�έσετε να επεξε�γαστείτε σελίδες με ασφάλεια: μη-ASCII χα�ακτή�ες θα φαίνονται στο πλαίσιο επεξε�γασίας ως δεκαεξαδικοί κωδικοί.'''<br />",
+'editingold'                       => "'''ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Επεξε�γάζεστε μια παλιότε�η αναθεώ�ηση αυτής της σελίδας. Αν π�οσπαθείστε να την αποθηκε�σετε, όσες αλλαγές έχουν γίνει π�ιν από αυτή την αναθεώ�ηση θα χαθο�ν.'''<br />",
 'yourdiff'                         => 'Διαφο�ές',
-'copyrightwarning'                 => 'Ολες οι συνεισφο�ές στο {{SITENAME}} θεω�ο�νται ότι δημοσιε�ονται σ�μφωνα με την $2 (Βλ. $1 για λεπτομέ�ειες).
+'copyrightwarning'                 => "Ολες οι συνεισφο�ές στο {{SITENAME}} θεω�ο�νται ότι δημοσιε�ονται σ�μφωνα με την $2 (Βλ. $1 για λεπτομέ�ειες).
 Αν δεν επιθυμείτε τα κείμενά σας να τα επεξε�γαστο�ν κατά την κ�ίση τους άλλοι χ�ήστες και να τα διαδώσουν κατά βο�ληση, πα�ακαλο�με να μην τα ανα�τήσετε σε αυτό το χώ�ο. Ό,τι συνεισφέ�ετε στο χώ�ο αυτό σε κείμενα, διαγ�άμματα, στοιχεία ή εικόνες π�έπει να είναι δικά σας έ�γα ή να ανήκουν στο δημόσιο τομέα (public domain) ή να π�οέ�χονται από ελε�θε�ες ή ανοιχτές πηγές με �ητή άδεια αναδημοσίευσης. <br />
 
 Τέλος βεβαιώνετε πως ό,τι γ�άφετε σε αυτό τον χώ�ο είναι π�ωτότυπο δικό σας έ�γο και, άσχετα με την έκτασή του, δεν έχει εκχω�ηθεί σε τ�ίτους η δημοσίευση και η εκμετάλλευσή του.
-<strong>ΠΑΡΑΚΑΛΟΥΜΕ �Α ΜΗ� Α�ΑΡΤΗΣΕΤΕ ΚΕΙΜΕ�Α ΤΡΙΤΩ� ΕΑ� ΔΕ� ΕΧΕΤΕ ΤΗ� ΑΔΕΙΑ ΤΟΥ ΙΔΙΟΚΤΗΤΗ ΤΟΥ COPYRIGHT!</strong>',
-'copyrightwarning2'                => 'Σημειώστε ότι όλες οι συνεισφο�ές στον ιστότοπο {{SITENAME}} μπο�ο�ν να υποστο�ν επεξε�γασία, να αλλαχθο�ν, ή να αφαι�εθο�ν από άλλους συνεισφέ�οντες. Αν δεν θέλετε τα γ�απτά σας να υποστο�ν επεξε�γασία κατά βο�ληση, τότε μην τα τοποθετήσετε σε αυτό το χώ�ο.<br />
+'''ΠΑΡΑΚΑΛΟΥΜΕ �Α ΜΗ� Α�ΑΡΤΗΣΕΤΕ ΚΕΙΜΕ�Α ΤΡΙΤΩ� ΕΑ� ΔΕ� ΕΧΕΤΕ ΤΗ� ΑΔΕΙΑ ΤΟΥ ΙΔΙΟΚΤΗΤΗ ΤΟΥ COPYRIGHT!'''",
+'copyrightwarning2'                => "Σημειώστε ότι όλες οι συνεισφο�ές στον ιστότοπο {{SITENAME}} μπο�ο�ν να υποστο�ν επεξε�γασία, να αλλαχθο�ν, ή να αφαι�εθο�ν από άλλους συνεισφέ�οντες. Αν δεν θέλετε τα γ�απτά σας να υποστο�ν επεξε�γασία κατά βο�ληση, τότε μην τα τοποθετήσετε σε αυτό το χώ�ο.<br />
 Επίσης μας υπόσχεστε πως ό,τι γ�άφετε είναι δικό σας, ή αντιγ�αμμένο από μια πηγή που είναι κοινό κτήμα, ή μια πα�όμοια ελε�θε�η πηγή (δείτε $1 για λεπτομέ�ειες).
-<strong>ΠΑΡΑΚΑΛΟΥΜΕ �Α ΜΗ� ΤΟΠΟΘΕΤΕΙΤΕ Π�ΕΥΜΑΤΙΚΑ ΚΑΤΟΧΥΡΩΜΕ�Ο ΕΡΓΟ ΧΩΡΙΣ ΑΔΕΙΑ!</strong>',
+'''ΠΑΡΑΚΑΛΟΥΜΕ �Α ΜΗ� ΤΟΠΟΘΕΤΕΙΤΕ Π�ΕΥΜΑΤΙΚΑ ΚΑΤΟΧΥΡΩΜΕ�Ο ΕΡΓΟ ΧΩΡΙΣ ΑΔΕΙΑ!'''",
 'longpagewarning'                  => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η σελίδα έχει μέγεθος $1 kb. Είναι πιθανόν με�ικοί browser να πα�ουσιάσουν π�οβλήματα στην επεξε�γασία σελίδων της τάξης των 32 kb και άνω. Μπο�είτε να αποφ�γετε το π�όβλημα κόβοντας τη σελίδα σε μικ�ότε�α τμήματα.<br />',
-'longpageerror'                    => '<strong>ΣΦΑΛΜΑ: Το κείμενο που αποστείλατε έχει μήκος $1 κιλομπάιτ,
-το οποίο είναι μεγαλ�τε�ο από το μέγιστο των $2 κιλομπάιτ. Δεν μπο�εί να αποθηκευτεί.</strong>',
-'readonlywarning'                  => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η βάση δεδομένων έχει κλειδωθεί π�οσω�ινά για συντή�ηση και δεν θα μπο�έσετε να αποθηκε�σετε αυτά που έχετε επεξε�γαστεί.  Μπο�είτε αν θέλετε να αποθηκε�σετε το κείμενο στον υπολογιστή σας (με αποκοπή-και-επικόλληση) και να το ξαναχ�ησιμοποιήσετε α�γότε�α όταν η συντή�ηση θα έχει ολοκλη�ωθεί.',
+'longpageerror'                    => "'''ΣΦΑΛΜΑ: Το κείμενο που αποστείλατε έχει μήκος $1 κιλομπάιτ,
+το οποίο είναι μεγαλ�τε�ο από το μέγιστο των $2 κιλομπάιτ. Δεν μπο�εί να αποθηκευτεί.'''",
+'readonlywarning'                  => "'''ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η βάση δεδομένων έχει κλειδωθεί για συντή�ηση, έτσι δεν θα μπο�έσετε να αποθηκε�σετε αυτά που έχετε επεξε�γαστεί. Μπο�είτε αν θέλετε να αποθηκε�σετε το κείμενο σε α�χείο κειμένου (με αποκοπή-και-επικόλληση) για να το χ�ησιμοποιήσετε α�γότε�α.'''
+
+Ο διαχει�ιστής που την κλείδωσε έδωσε την εξής εξήγηση: $1",
 'protectedpagewarning'             => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:  Η σελίδα αυτή έχει κλειδωθεί -η οποιαδήποτε επεξε�γασία της μπο�εί να γίνει μόνον από διαχει�ιστές. Βεβαιωθείτε πως ακολουθείτε [[{{ns:project}}:Σελίδες_υπό_π�οστασία|τους κανόνες για τις υπό π�οστασία σελίδες]].<br />',
 'semiprotectedpagewarning'         => "'''Σημείωση:''' Αυτή η σελίδα έχει κλειδωθεί ώστε μόνο εγγεγ�αμμένοι χ�ήστες να μπο�ο�ν να την επεξε�γαστο�ν.",
 'cascadeprotectedwarning'          => "'''Π�οσοχή:''' Αυτή η σελίδα έχει κλειδωθεί ώστε μόνο χ�ήστες με δικαιώματα διαχει�ιστή συστήματος (sysop) να μπο�ο�ν να την επεξε�γαστο�ν, επειδή πε�ιλαμβάνεται {{PLURAL:$1|στην|στις}} {{PLURAL:$1|ακόλουθη|ακόλουθες}} διαδοχικά (cascaded) {{PLURAL:$1|π�οστατευμένη|π�οστατευμένες}} {{PLURAL:$1|σελίδα|σελίδες}}:",
-'titleprotectedwarning'            => '<strong>ΠΡΟΣΟΧΗ!  Αυτή η σελίδα έχει κλειδωθεί ώστε μόνο με�ικοί χ�ήστες να μπο�ο�ν να την δημιου�γήσουν.</strong>',
+'titleprotectedwarning'            => "'''ΠΡΟΣΟΧΗ!  Αυτή η σελίδα έχει κλειδωθεί ώστε μόνο χ�ήστες με [[Special:ListGroupRights|συγκεκ�ιμένα δικαιώματα]] να μπο�ο�ν να την δημιου�γήσουν.'''",
 'templatesused'                    => 'Π�ότυπα που χ�ησιμοποιο�νται στη σελίδα αυτή:',
 'templatesusedpreview'             => 'Π�ότυπα που χ�ησιμοποιο�νται σε αυτή την π�οεπισκόπηση:',
 'templatesusedsection'             => 'Π�ότυπα που χ�ησιμοποιο�νται σε αυτή την ενότητα:',
@@ -820,15 +926,31 @@ $2',
 
 Θα π�έπει να σκεφτείτε αν θα έπ�επε να συνεχίσετε να επεξε�γάζεστε αυτή τη σελίδα.
 Το α�χείο διαγ�αφής δίνεται εδώ για διευκόλυνση:",
+'deleted-notice'                   => 'Αυτή η σελίδα έχει διαγ�αφεί.
+Το α�χείο διαγ�αφών της σελίδας πα�έχεται πα�ακάτω για πα�απομπή.',
+'deletelog-fulllog'                => 'Δείτε το πλή�ες α�χείο',
+'edit-hook-aborted'                => 'Η επεξε�γασία ματαιώθηκε από το hook.
+Δεν έδωσε εξήγηση.',
+'edit-gone-missing'                => 'Δεν ήταν εφικτό να ενημε�ωθεί η σελίδα.
+Φαίνεται πως έχει διαγ�αφεί.',
+'edit-conflict'                    => 'Σ�γκ�ουση επεξε�γασιών.',
+'edit-no-change'                   => 'Η επεξε�γασία σας αγνοήθηκε, επειδή δεν έγινε καμία αλλαγή στο κείμενο.',
+'edit-already-exists'              => 'Δεν ήταν εφικτό να δημιου�γηθεί η νέα σελίδα.
+Υπά�χει ήδη.',
 
 # Parser/template warnings
+'expensive-parserfunction-warning'        => 'Π�οειδοποίηση: Αυτή η σελίδα πε�ιέχει πά�α πολ� ακ�ιβό αναλυτή λειτου�γικών κλήσεων.
+
+Π�έπει να πε�ιέχει λιγότε�ες από $2 {{PLURAL:$2|κλήση|κλήσεις}}, τώ�α {{PLURAL:$1|υπά�χει $1 κλήση|υπά�χουν $1 κλήσεις}}.',
 'expensive-parserfunction-category'       => 'Σελίδες με πα�α πολ� ακ�ιβές αναλυτικές λειτου�γικές κλήσεις',
 'post-expand-template-inclusion-warning'  => 'Π�οειδοποίηση: Ο α�ιθμός π�οτ�πων που πε�ιέχονται είναι πολ� μεγάλος.
 Κάποια π�ότυπα δεν θα συμπε�ιληφθο�ν.',
 'post-expand-template-inclusion-category' => 'Σελίδες όπου ο α�ιθμός π�οτ�πων που πε�ιέχονται υπε�βαίνεται',
-'post-expand-template-argument-warning'   => 'Π�οειδοποίηση: Αυτή η σελίδα πε�ιέχει τουλάχιστον ένα π�ότυπο επιχει�ήματος το οποίο θα έχει πολ� μεγάλο α�ιθμό ανάπτυξης.
-Αυτά τα επιχεί�ηματα έχουν πα�αλειφθεί.',
-'post-expand-template-argument-category'  => 'Σελίδες που πε�ιέχουν πα�αλειπόμενα επιχει�ήματα π�οτ�πων',
+'post-expand-template-argument-warning'   => 'Π�οειδοποίηση: Αυτή η σελίδα πε�ιέχει τουλάχιστον μια πα�άμετ�ο π�οτ�που η οποία έχει πολ� μεγάλο μέγεθος ανάπτυξης.
+Αυτές οι πα�άμετ�οι έχουν πα�αλειφθεί.',
+'post-expand-template-argument-category'  => 'Σελίδες που πε�ιέχουν πα�αλειπόμενες πα�αμέτ�ους π�οτ�πων',
+'parser-template-loop-warning'            => 'Εντοπίστηκε π�ότυπο σε β�όχο: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Το ό�ιο του μάκ�ους της αναδ�ομής του π�ότυπου έχει ξεπε�αστεί ($1)',
 
 # "Undo" feature
 'undo-success' => 'Η επεξε�γασία μπο�εί να αναστ�αφεί. Πα�ακαλώ ελέγξτε την σ�γκ�ιση πα�ακάτω για να επιβεβαιώσετε ότι αυτό είναι το οποίο θέλετε να κάνετε, και έπειτα αποθηκε�στε τις αλλαγές πα�ακάτω για να τελειώσετε την αναστ�οφή της επεξε�γασίας.',
@@ -843,29 +965,29 @@ $2',
 Ο λόγος που δόθηκε από τον $3 είναι ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Δείτε τα α�χεία καταγ�αφών για αυτή τη σελίδα',
-'nohistory'           => 'Δεν υπά�χει ιστο�ικό επεξε�γασίας για αυτή τη σελίδα.',
-'revnotfound'         => 'Η αναθεώ�ηση δεν β�έθηκε.',
-'revnotfoundtext'     => 'Η παλιά αναθεώ�ηση της σελίδας που ζητήσατε δεν ήταν δυνατόν να β�εθεί. Πα�ακαλο�με ελέγξτε τo URL που χ�ησιμοποιήσατε για να φτάσετε σε αυτήν τη σελίδα.',
-'currentrev'          => 'Τ�έχουσα αναθεώ�ηση',
-'revisionasof'        => 'Αναθεώ�ηση της $1',
-'revision-info'       => 'Έκδοση στις $1 υπό τον/την $2',
-'previousrevision'    => '&larr;Παλιότε�η αναθεώ�ηση',
-'nextrevision'        => '�εώτε�η αναθεώ�ηση&rarr;',
-'currentrevisionlink' => 'εμφάνιση της τ�έχουσας αναθεώ�ησης',
-'cur'                 => 'τ�έχουσα',
-'next'                => 'επόμενη',
-'last'                => 'τελευταία',
-'page_first'          => 'π�ώτη',
-'page_last'           => 'τελευταία',
-'histlegend'          => 'Σ�γκ�ιση διαφο�ών: Επιλέξτε τις εκδόσεις που θέλετε να συγκ�ίνετε και πατήστε enter ή κάντε κλικ στην μπά�α "Σ�γκ�ιση...". <br />
+'viewpagelogs'           => 'Δείτε τα α�χεία καταγ�αφών για αυτή τη σελίδα',
+'nohistory'              => 'Δεν υπά�χει ιστο�ικό επεξε�γασίας για αυτή τη σελίδα.',
+'currentrev'             => 'Τ�έχουσα αναθεώ�ηση',
+'currentrev-asof'        => 'Πα�ο�σα αναθεώ�ηση της $1',
+'revisionasof'           => 'Αναθεώ�ηση της $1',
+'revision-info'          => 'Έκδοση στις $1 υπό τον/την $2', # Additionally available: $3: revision id
+'previousrevision'       => '&larr;Παλιότε�η αναθεώ�ηση',
+'nextrevision'           => '�εώτε�η αναθεώ�ηση&rarr;',
+'currentrevisionlink'    => 'εμφάνιση της τ�έχουσας αναθεώ�ησης',
+'cur'                    => 'τ�έχουσα',
+'next'                   => 'επόμενη',
+'last'                   => 'τελευταία',
+'page_first'             => 'π�ώτη',
+'page_last'              => 'τελευταία',
+'histlegend'             => 'Σ�γκ�ιση διαφο�ών: Επιλέξτε τις εκδόσεις που θέλετε να συγκ�ίνετε και πατήστε enter ή κάντε κλικ στην μπά�α "Σ�γκ�ιση...". <br />
 Υπόμνημα: (τ�έχον) = διαφο�ές με την τ�έχουσα έκδοση,
 (τελευταίο) = διαφο�ές με την π�οηγο�μενη έκδοση, μ = αλλαγές μικ�ής κλίμακας.',
-'deletedrev'          => '[διαγ�άφτηκε]',
-'histfirst'           => 'Η πιο παλιά',
-'histlast'            => 'Η πιο π�όσφατη',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(άδειο)',
+'history-fieldset-title' => 'Αναζήτηση στο ιστο�ικό',
+'deletedrev'             => '[διαγ�άφτηκε]',
+'histfirst'              => 'Η πιο παλιά',
+'histlast'               => 'Η πιο π�όσφατη',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(άδειο)',
 
 # Revision feed
 'history-feed-title'          => 'Ιστο�ικό εκδόσεων',
@@ -922,11 +1044,14 @@ $2',
 'revdelete-restricted'        => 'εφά�μοσε πε�ιο�ισμο�ς στους sysops',
 'revdelete-unrestricted'      => 'αφαί�εσε πε�ιο�ισμο�ς στους sysops',
 'revdelete-hid'               => 'αποκ��φθηκε το $1',
+'revdelete-unhid'             => 'εμφάνιση $1',
 'revdelete-log-message'       => '$1 για $2 {{PLURAL:$2|έκδοση|εκδόσεις}}',
 'logdelete-log-message'       => '$1 για $2 {{PLURAL:$2|γεγονός|γεγονότα}}',
 
 # Suppression log
-'suppressionlog' => 'Κατάλογος διαγ�αφών',
+'suppressionlog'     => 'Κατάλογος διαγ�αφών',
+'suppressionlogtext' => 'Πα�ακάτω β�ίσκεται μία λίστα με τις διαγ�αφές και τις φ�αγές τις σχετικές με πε�ιεχόμενο που έχει κ�υφθεί από τους διαχει�ιστές. 
+Δείτε την [[Special:IPBlockList|λίστα φ�αγών IP]] για τις πα�ο�σες λειτου�γικές απαγο�ε�σεις και φ�αγές.',
 
 # History merging
 'mergehistory'                     => 'Συγχώνευση ιστο�ικών σελίδων',
@@ -948,6 +1073,7 @@ $2',
 'mergehistory-invalid-destination' => 'Η σελίδα π�οο�ισμο� π�έπει να είναι έγκυ�ος τίτλος.',
 'mergehistory-autocomment'         => 'Το [[:$1]] συγχωνε�θηκε στο [[:$2]]',
 'mergehistory-comment'             => 'Το [[:$1]] συγχωνε�θηκε στο [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Οι σελίδες π�οέλευσης και π�οο�ισμο� δεν μπο�ο�ν να είναι οι ίδιες',
 
 # Merge log
 'mergelog'           => 'Συγχώνευση λογα�ιασμο�',
@@ -960,119 +1086,208 @@ $2',
 'difference'              => '(Διαφο�ές μεταξ� αναθεω�ήσεων)',
 'lineno'                  => 'Γ�αμμή $1:',
 'compareselectedversions' => 'Σ�γκ�ιση των εκδόσεων που έχουν επιλεγεί',
+'visualcomparison'        => 'Οπτική σ�γκ�ιση',
+'wikicodecomparison'      => 'Σ�γκ�ιση wikitext',
 'editundo'                => 'αναί�εση',
 'diff-multi'              => '({{PLURAL:$1|Μία ενδιάμεση αναθεώ�ηση|$1 ενδιάμεσες αναθεω�ήσεις}} δεν εμφανίζονται.)',
+'diff-movedto'            => 'μετακινήθηκε στο $1',
+'diff-styleadded'         => '$1 στυλ π�οστέθηκε',
+'diff-added'              => '$1 π�οστέθηκε',
+'diff-changedto'          => 'άλλαξε σε $1',
+'diff-movedoutof'         => 'μετακινήθηκε από το $1',
+'diff-styleremoved'       => '$1 στυλ έχει αφαι�εθεί',
+'diff-removed'            => 'Το $1 αφαι�έθηκε',
+'diff-changedfrom'        => 'άλλαξε από $1',
+'diff-src'                => 'πηγή',
+'diff-withdestination'    => 'με π�οο�ισμό $1',
+'diff-with'               => '&#32;με $1 $2',
+'diff-with-final'         => '&#32;και $1 $2',
+'diff-width'              => 'πλάτος',
+'diff-height'             => '�ψος',
+'diff-p'                  => "μια '''πα�άγ�αφος'''",
+'diff-blockquote'         => "ένα '''απόφθεγμα'''",
+'diff-h1'                 => "μία '''επικεφαλίδα (επιπέδου 1)'''",
+'diff-h2'                 => "μία '''επικεφαλίδα (επιπέδου 2)'''",
+'diff-h3'                 => "μία '''επικεφαλίδα (επιπέδου 3)'''",
+'diff-h4'                 => "μία '''επικεφαλίδα (επιπέδου 4)'''",
+'diff-h5'                 => "μία '''επικεφαλίδα (επιπέδου 5)'''",
+'diff-pre'                => "ένα '''π�οδιαμο�φωμένο μπλοκ'''",
+'diff-div'                => "μια '''κατηγο�ία'''",
+'diff-ul'                 => "μια '''αταξινόμητη λίστα'''",
+'diff-ol'                 => "μια '''ταξινομημένη λίστα'''",
+'diff-li'                 => "ένα '''αντικείμενο λίστας'''",
+'diff-table'              => "ένας '''πίνακας'''",
+'diff-tbody'              => "το '''πε�ιεχόμενο ενός πίνακα'''",
+'diff-tr'                 => "μια '''σει�ά'''",
+'diff-td'                 => "ένα '''κελί'''",
+'diff-th'                 => "μια '''επικεφαλίδα'''",
+'diff-br'                 => "ένα '''κενό'''",
+'diff-hr'                 => "μια '''ο�ιζόντια γ�αμμή'''",
+'diff-code'               => "ένας '''αποκλεισμός υπολογιστικο� κώδικα'''",
+'diff-dl'                 => "μια '''λίστα ο�ισμών'''",
+'diff-dt'                 => "ένας '''ό�ος ο�ισμο�'''",
+'diff-dd'                 => "ένας '''ο�ισμός'''",
+'diff-input'              => "μια '''εισ�οή'''",
+'diff-form'               => "μια '''φό�μα'''",
+'diff-img'                => "μια '''εικόνα'''",
+'diff-span'               => "μία '''έκταση'''",
+'diff-a'                  => "ένας '''σ�νδεσμος'''",
+'diff-i'                  => "'''πλάγια γ�άμματα'''",
+'diff-b'                  => "'''έντονο'''",
+'diff-strong'             => "'''δυνατό'''",
+'diff-em'                 => "'''έμφαση'''",
+'diff-font'               => "'''γ�αμματοσει�ά'''",
+'diff-big'                => "'''μεγάλο'''",
+'diff-del'                => "'''διαγ�αμμένο'''",
+'diff-tt'                 => "'''�υθμισμένο πλάτος'''",
+'diff-sub'                => "'''υπογεγ�αμμένα'''",
+'diff-sup'                => "'''υπε�γεγ�αμμένα'''",
+'diff-strike'             => "'''εγκά�σια διαγ�αφή'''",
 
 # Search results
-'searchresults'             => 'Αποτελέσματα αναζήτησης',
-'searchresulttext'          => 'Για πε�ισσότε�ες πλη�οφο�ίες σχετικά με την αναζήτηση στο {{SITENAME}}, βλ. [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Κ�ιτή�ια αναζήτησης: "[[:$1]]"',
-'searchsubtitleinvalid'     => 'Κ�ιτή�ια αναζήτησης: "$1"',
-'noexactmatch'              => "'''Δεν υπά�χει καμία σελίδα με τίτλο «$1».''' Μπο�είτε να [[:$1|δημιου�γήσετε αυτή τη σελίδα]].",
-'noexactmatch-nocreate'     => "'''Δεν υπά�χει καμία σελίδα με τον τίτλο \"\$1\".'''",
-'toomanymatches'            => 'Ανταποκ�ίνονται πά�α πολλές πε�ιπτώσεις, πα�ακαλο�με δοκιμάστε μια διαφο�ετική ε�ώτηση',
-'titlematches'              => 'Τίτλοι ά�θ�ων που ανταποκ�ίνονται',
-'notitlematches'            => 'Δεν υπά�χουν αντίστοιχοι τίτλοι σελίδων.',
-'textmatches'               => 'Κείμενα σελίδων που ανταποκ�ίνονται:',
-'notextmatches'             => 'Δεν υπά�χουν αντίστοιχα κείμενα σελίδων.',
-'prevn'                     => '$1 π�οηγουμένων',
-'nextn'                     => '$1 επομένων',
-'viewprevnext'              => 'Εμφάνιση ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 λέξη|$2 λέξεις}})',
-'search-result-score'       => 'Σχετικότητα: $1%',
-'search-redirect'           => '(ανακατε�θυνση $1)',
-'search-section'            => '(τομέας $1)',
-'search-suggest'            => 'Μήπως εννοο�σατε: $1',
-'search-interwiki-caption'  => 'Αδελφά π�ότζεκτ',
-'search-interwiki-default'  => '$1 αποτελέσματα:',
-'search-interwiki-more'     => '(πε�ισσότε�α)',
-'search-mwsuggest-enabled'  => 'με υποδείξεις',
-'search-mwsuggest-disabled' => 'χω�ίς υποδείξεις',
-'search-relatedarticle'     => 'Σχετικά',
-'mwsuggest-disable'         => 'Απενε�γοποίηση των π�οτάσεων AJAX',
-'searchrelated'             => 'σχετικά',
-'searchall'                 => 'όλα',
-'showingresults'            => "Δείτε πα�ακάτω μέχ�ι τα {{PLURAL:$1|'''1'''αποτέλεσμα|'''$1''' αποτελέσματα}} ξεκινώντας με #'''$2'''.",
-'showingresultsnum'         => "Εμφάνιση {{PLURAL:$3|'''1''' αποτελέσματος|'''$3''' αποτελεσμάτων}} α�χίζοντας με #'''$2'''.",
-'nonefound'                 => "'''Σημείωση''': Οι ανεπιτυχείς αναζητήσεις οφείλονται συνήθως στο ότι έχουμε συμπε�ιλάβει στα κ�ιτή�ια πολ� συνηθισμένες λέξεις, όπως \"έχει\" ή \"από\" (που δεν υπά�χουν στο ευ�ετή�ιο) ή στο ότι π�οκαθο�ίσαμε πολλά κ�ιτή�ια αναζήτησης ταυτοχ�όνως. (Στην τελευταία πε�ίπτωση, μόνον οι σελίδες που πε�ιέχουν ''όλα'' τα κ�ιτή�ια αναζήτησης θα εμφανιστο�ν στα αποτελέσματα).<br />",
-'powersearch'               => 'Αναλυτική αναζήτηση',
-'powersearch-legend'        => 'Αναλυτική αναζήτηση',
-'powersearch-redir'         => 'Κατάλογος ανακατευθ�νσεων',
-'powersearch-field'         => 'Αναζήτηση για',
-'search-external'           => 'Εξωτε�ική αναζήτηση',
-'searchdisabled'            => 'Η αναζήτηση για τον ιστότοπο "{{SITENAME}}" είναι απενε�γοποιημένη. Μπο�είτε να αναζητήσετε μέσω του Google εν τω μεταξ�. Σημειώστε ότι οι κατάλογοί τους για το πε�ιεχόμενο του ιστοτόπου "{{SITENAME}}" μπο�εί να είναι απα�χαιωμένοι.',
+'searchresults'                    => 'Αποτελέσματα αναζήτησης',
+'searchresults-title'              => 'Αποτελέσματα αναζήτησης για "$1"',
+'searchresulttext'                 => 'Για πε�ισσότε�ες πλη�οφο�ίες σχετικά με την αναζήτηση στο {{SITENAME}}, βλ. [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Αναζητήσατε για τον ό�ο \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|όλες οι σελίδες των οποίων ο τίτλος α�χίζει με τον ό�ο "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|όλες οι σελίδες που πε�ιέχουν συνδέσμους π�ος τον ό�ο "$1"]])',
+'searchsubtitleinvalid'            => 'Κ�ιτή�ια αναζήτησης: "$1"',
+'noexactmatch'                     => "'''Δεν υπά�χει καμία σελίδα με τίτλο «$1».'''<br />
+Μπο�είτε να [[:$1|δημιου�γήσετε αυτή τη σελίδα]].",
+'noexactmatch-nocreate'            => "'''Δεν υπά�χει καμία σελίδα με τον τίτλο \"\$1\".'''",
+'toomanymatches'                   => 'Ανταποκ�ίνονται πά�α πολλές πε�ιπτώσεις, πα�ακαλο�με δοκιμάστε μια διαφο�ετική ε�ώτηση',
+'titlematches'                     => 'Τίτλοι ά�θ�ων που ανταποκ�ίνονται',
+'notitlematches'                   => 'Δεν υπά�χουν αντίστοιχοι τίτλοι σελίδων.',
+'textmatches'                      => 'Κείμενα σελίδων που ανταποκ�ίνονται:',
+'notextmatches'                    => 'Δεν υπά�χουν αντίστοιχα κείμενα σελίδων.',
+'prevn'                            => '$1 π�οηγουμένων',
+'nextn'                            => '$1 επομένων',
+'viewprevnext'                     => 'Εμφάνιση ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Επιλογές αναζήτησης',
+'searchmenu-exists'                => "'''Υπά�χει μια σελίδα που ονομάζεται \"[[:\$1]]\" σε αυτό το βίκι'''",
+'searchmenu-new'                   => "'''Δημιου�γήστε τη σελίδα \"[[:\$1]]\" σε αυτό το βίκι!'''",
+'searchhelp-url'                   => 'Help:Πε�ιεχόμενα',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Πλοηγηθείτε σε σελίδες με αυτό το π�όθεμα]]',
+'searchprofile-articles'           => 'Σελίδες πε�ιεχόμενου',
+'searchprofile-articles-and-proj'  => 'Σελίδες πε�ιεχομένου & εγχει�ήματος',
+'searchprofile-project'            => 'Σελίδες εγχει�ήματος',
+'searchprofile-images'             => 'Α�χεία',
+'searchprofile-everything'         => 'Οτιδήποτε',
+'searchprofile-advanced'           => 'Π�οχω�ημένο',
+'searchprofile-articles-tooltip'   => 'Αναζήτηση στο $1',
+'searchprofile-project-tooltip'    => 'Αναζήτηση στο $1',
+'searchprofile-images-tooltip'     => 'Αναζήτηση α�χείων',
+'searchprofile-everything-tooltip' => 'Αναζήτηση σε όλο το πε�ιεχόμενο (συμπε�ιλαμβανομένων των σελίδων συζήτησης)',
+'searchprofile-advanced-tooltip'   => 'Αναζήτηση σε συγκεκ�ιμένες πε�ιοχές',
+'prefs-search-nsdefault'           => 'Αναζήτηση χ�ησιμοποιώντας τις π�οεπιλεγμένες �υθμίσεις:',
+'prefs-search-nscustom'            => 'Αναζήτηση σε συγκεκ�ιμένες πε�ιοχές:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 λέξη|$2 λέξεις}})',
+'search-result-score'              => 'Σχετικότητα: $1%',
+'search-redirect'                  => '(ανακατε�θυνση $1)',
+'search-section'                   => '(ενότητα $1)',
+'search-suggest'                   => 'Μήπως εννοο�σατε: $1',
+'search-interwiki-caption'         => 'Αδελφικά εγχει�ήματα',
+'search-interwiki-default'         => '$1 αποτελέσματα:',
+'search-interwiki-more'            => '(πε�ισσότε�α)',
+'search-mwsuggest-enabled'         => 'με υποδείξεις',
+'search-mwsuggest-disabled'        => 'χω�ίς υποδείξεις',
+'search-relatedarticle'            => 'Σχετικά',
+'mwsuggest-disable'                => 'Απενε�γοποίηση των π�οτάσεων AJAX',
+'searchrelated'                    => 'σχετικά',
+'searchall'                        => 'όλα',
+'showingresults'                   => "Δείτε πα�ακάτω μέχ�ι τα {{PLURAL:$1|'''1'''αποτέλεσμα|'''$1''' αποτελέσματα}} ξεκινώντας με #'''$2'''.",
+'showingresultsnum'                => "Εμφάνιση {{PLURAL:$3|'''1''' αποτελέσματος|'''$3''' αποτελεσμάτων}} α�χίζοντας με #'''$2'''.",
+'showingresultstotal'              => "Πα�ακάτω {{PLURAL:$4|το αποτέλεσμα '''$1''' του '''$3''' εμφανίζεται|τα αποτελέσματα '''$1 - $2''' του '''$3''' εμφανίζονται}}",
+'nonefound'                        => "'''Σημείωση''': Οι ανεπιτυχείς αναζητήσεις οφείλονται συνήθως στο ότι έχουμε συμπε�ιλάβει στα κ�ιτή�ια μόνο συγκεκ�ιμένες πε�ιοχές ονομάτων. Δοκιμάστε να π�οσθέσετε το π�όθεμα ''all:'' - ''όλα:'' στην αναζήτηση για να ψάξετε σε όλα τα πε�ιεχόμενα (συμπε�ιλαμβανόμενων των σελίδων συζητήσεως, π�οτ�πων κτλ.) ή χ�ησιμοποιήστε την επιθυμητή πε�ιοχή ονομάτων.",
+'search-nonefound'                 => 'Δεν υπά�χουν αποτελέσματα που να ται�ιάζουν με την αναζήτησή σας.',
+'powersearch'                      => 'Αναλυτική αναζήτηση',
+'powersearch-legend'               => 'Αναλυτική αναζήτηση',
+'powersearch-ns'                   => 'Αναζήτηση στις πε�ιοχές ονομάτων:',
+'powersearch-redir'                => 'Κατάλογος ανακατευθ�νσεων',
+'powersearch-field'                => 'Αναζήτηση για',
+'search-external'                  => 'Εξωτε�ική αναζήτηση',
+'searchdisabled'                   => 'Η αναζήτηση για τον ιστότοπο "{{SITENAME}}" είναι απενε�γοποιημένη. Μπο�είτε να αναζητήσετε μέσω του Google εν τω μεταξ�. Σημειώστε ότι οι κατάλογοί τους για το πε�ιεχόμενο του ιστοτόπου "{{SITENAME}}" μπο�εί να είναι απα�χαιωμένοι.',
 
 # Preferences page
-'preferences'              => 'Π�οτιμήσεις',
-'mypreferences'            => 'Οι π�οτιμήσεις μου',
-'prefs-edits'              => 'Α�ιθμός επεξε�γασιών:',
-'prefsnologin'             => 'Δεν έχετε συνδεθεί.',
-'prefsnologintext'         => 'Π�έπει να έχετε <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} συνδεθεί]</span> για να καθο�ίσετε τις π�οτιμήσεις χ�ήστη.',
-'prefsreset'               => 'Οι π�οτιμήσεις σας έχουν αποκατασταθεί σ�μφωνα με την αποθηκευμένη έκδοσή τους.',
-'qbsettings'               => 'Γ�ήγο�η π�όσβαση',
-'qbsettings-none'          => 'Καμία',
-'qbsettings-fixedleft'     => 'Σταθε�ά α�ιστε�ά',
-'qbsettings-fixedright'    => 'Σταθε�ά δεξιά',
-'qbsettings-floatingleft'  => 'Πλανώμενα α�ιστε�ά',
-'qbsettings-floatingright' => 'Πλανώμενα δεξιά',
-'changepassword'           => 'Αλλαγή κωδικο�',
-'skin'                     => 'Οπτική ο�γάνωση (skin)',
-'math'                     => 'Απόδοση μαθηματικών',
-'dateformat'               => 'Μο�φή ημε�ομηνίας',
-'datedefault'              => 'Χω�ίς π�οτίμηση',
-'datetime'                 => 'Ημε�ομηνία και ώ�α',
-'math_failure'             => 'Δεν μπό�εσε να γίνει ανάλυση του ό�ου.',
-'math_unknown_error'       => 'Άγνωστο λάθος',
-'math_unknown_function'    => 'άγνωστη συνά�τηση',
-'math_lexing_error'        => 'Σφάλμα στην λεξική ανάλυση',
-'math_syntax_error'        => 'Λάθος σ�νταξης',
-'math_image_error'         => 'Η μετατ�οπή σε PNG απέτυχε. Πα�ακαλο�με ελέγξτε ότι έχουν εγκατασταθεί σωστά τα latex, dvips, gs, και ξαναπ�οσπαθήστε!',
-'math_bad_tmpdir'          => 'Δεν είναι δυνατή η δημιου�γία μαθηματικών δεδομένων (ή η εγγ�αφή σε π�οσω�ινό κατάλογο)',
-'math_bad_output'          => 'Δεν είναι δυνατή η δημιου�γία  μαθηματικών δεδομένων (ή η εγγ�αφή σε κατάλογο εξόδου)',
-'math_notexvc'             => 'Λείπει το εκτελέσιμο texvc -πα�ακαλο�με συμβουλευτείτε το math/README για να �υθμίσετε τις πα�αμέτ�ους.',
-'prefs-personal'           => 'Στοιχεία χ�ήστη',
-'prefs-rc'                 => 'Π�όσφατες αλλαγές και εμφάνιση πολ� σ�ντομων ά�θ�ων',
-'prefs-watchlist'          => 'Λίστα πα�ακολο�θησης',
-'prefs-watchlist-days'     => 'Ημέ�ες π�ος εμφάνιση στη λίστα πα�ακολο�θησης:',
-'prefs-watchlist-edits'    => 'Α�ιθμός επεξε�γασιών π�ος εμφάνιση στην εκτεταμένη λίστα πα�ακολο�θησης:',
-'prefs-misc'               => 'Διάφο�ες �υθμίσεις',
-'saveprefs'                => 'Αποθηκε�στε',
-'resetprefs'               => 'Επαναφο�ά π�οτιμήσεων',
-'oldpassword'              => 'Παλιός κωδικός',
-'newpassword'              => '�έος κωδικός π�όσβασης',
-'retypenew'                => 'Πληκτ�ολογήστε ξανά το νέο κωδικό.',
-'textboxsize'              => 'Επεξε�γασία',
-'rows'                     => 'Σει�ές',
-'columns'                  => 'Στήλες',
-'searchresultshead'        => 'Αποτελέσματα αναζήτησης/Ρυθμίσεις',
-'resultsperpage'           => 'Αποτελέσματα ανά σελίδα',
-'contextlines'             => 'Σει�ές που θα εμφανίζονται ανά αποτέλεσμα',
-'contextchars'             => 'Α�ιθμός χα�ακτή�ων στο εμφανιζόμενο κείμενο',
-'stub-threshold'           => 'Κατώφλι για μο�φοποίηση <span class="mw-stub-example">συνδέσμου επεκτάσιμου</span>:',
-'recentchangesdays'        => 'Ημέ�ες π�ος εμφάνιση στις π�όσφατες αλλαγές:',
-'recentchangescount'       => 'Α�ιθμός τίτλων στις π�όσφατες αλλαγές',
-'savedprefs'               => 'Οι π�οτιμήσεις σας έχουν αποθηκευτεί.',
-'timezonelegend'           => 'Ζώνη ώ�ας',
-'timezonetext'             => 'Συμπλη�ώστε τον α�ιθμό των ω�ών κατά τις οποίες η τοπική σας ώ�α διαφέ�ει από την ώ�α του server (UTC).',
-'localtime'                => 'Εμφάνιση τοπικής ώ�ας',
-'timezoneoffset'           => 'Διαφο�ά ω�ών',
-'servertime'               => 'Η ώ�α του διακομιστή είναι:',
-'guesstimezone'            => 'Συμπλή�ωση μέσω του browser',
-'allowemail'               => 'Ενε�γοποίηση πα�αλαβής μην�ματος ηλεκτ�ονικο� ταχυδ�ομείου από άλλους χ�ήστες',
-'prefs-searchoptions'      => 'Επιλογές αναζήτησης',
-'defaultns'                => 'Π�οκαθο�ισμένη αναζήτηση στις πε�ιοχές:',
-'default'                  => 'Π�οκαθο�ισμένο',
-'files'                    => 'Α�χεία',
+'preferences'               => 'Π�οτιμήσεις',
+'mypreferences'             => 'Οι π�οτιμήσεις μου',
+'prefs-edits'               => 'Α�ιθμός επεξε�γασιών:',
+'prefsnologin'              => 'Δεν έχετε συνδεθεί.',
+'prefsnologintext'          => 'Π�έπει να έχετε <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} συνδεθεί]</span> για να καθο�ίσετε τις π�οτιμήσεις χ�ήστη.',
+'prefsreset'                => 'Οι π�οτιμήσεις σας έχουν αποκατασταθεί σ�μφωνα με την αποθηκευμένη έκδοσή τους.',
+'qbsettings'                => 'Γ�ήγο�η π�όσβαση',
+'qbsettings-none'           => 'Καμία',
+'qbsettings-fixedleft'      => 'Σταθε�ά α�ιστε�ά',
+'qbsettings-fixedright'     => 'Σταθε�ά δεξιά',
+'qbsettings-floatingleft'   => 'Πλανώμενα α�ιστε�ά',
+'qbsettings-floatingright'  => 'Πλανώμενα δεξιά',
+'changepassword'            => 'Αλλαγή κωδικο�',
+'skin'                      => 'Οπτική ο�γάνωση (skin)',
+'skin-preview'              => 'Π�οεπισκόπηση',
+'math'                      => 'Απόδοση μαθηματικών',
+'dateformat'                => 'Μο�φή ημε�ομηνίας',
+'datedefault'               => 'Χω�ίς π�οτίμηση',
+'datetime'                  => 'Ημε�ομηνία και ώ�α',
+'math_failure'              => 'Δεν μπό�εσε να γίνει ανάλυση του ό�ου.',
+'math_unknown_error'        => 'άγνωστο σφάλμα',
+'math_unknown_function'     => 'άγνωστη συνά�τηση',
+'math_lexing_error'         => 'Σφάλμα στην λεξική ανάλυση',
+'math_syntax_error'         => 'Λάθος σ�νταξης',
+'math_image_error'          => 'Η μετατ�οπή σε PNG απέτυχε. Πα�ακαλο�με ελέγξτε ότι έχουν εγκατασταθεί σωστά τα latex, dvips, gs, και ξαναπ�οσπαθήστε!',
+'math_bad_tmpdir'           => 'Δεν είναι δυνατή η δημιου�γία μαθηματικών δεδομένων (ή η εγγ�αφή σε π�οσω�ινό κατάλογο)',
+'math_bad_output'           => 'Δεν είναι δυνατή η δημιου�γία  μαθηματικών δεδομένων (ή η εγγ�αφή σε κατάλογο εξόδου)',
+'math_notexvc'              => 'Λείπει το εκτελέσιμο texvc -πα�ακαλο�με συμβουλευτείτε το math/README για να �υθμίσετε τις πα�αμέτ�ους.',
+'prefs-personal'            => 'Στοιχεία χ�ήστη',
+'prefs-rc'                  => 'Π�όσφατες αλλαγές και εμφάνιση πολ� σ�ντομων ά�θ�ων',
+'prefs-watchlist'           => 'Λίστα πα�ακολο�θησης',
+'prefs-watchlist-days'      => 'Ημέ�ες π�ος εμφάνιση στη λίστα πα�ακολο�θησης:',
+'prefs-watchlist-days-max'  => '(μέγιστο 7 μέ�ες)',
+'prefs-watchlist-edits'     => 'Α�ιθμός επεξε�γασιών π�ος εμφάνιση στην εκτεταμένη λίστα πα�ακολο�θησης:',
+'prefs-watchlist-edits-max' => '(μέγιστος α�ιθμός: 1000)',
+'prefs-misc'                => 'Διάφο�ες �υθμίσεις',
+'prefs-resetpass'           => 'Αλλαγή κωδικο�',
+'saveprefs'                 => 'Αποθήκευση',
+'resetprefs'                => 'Επαναφο�ά π�οτιμήσεων',
+'textboxsize'               => 'Επεξε�γασία',
+'prefs-edit-boxsize'        => 'Μέγεθος του πα�αθ��ου επεξε�γασίας.',
+'rows'                      => 'Σει�ές',
+'columns'                   => 'Στήλες',
+'searchresultshead'         => 'Αποτελέσματα αναζήτησης/Ρυθμίσεις',
+'resultsperpage'            => 'Αποτελέσματα ανά σελίδα',
+'contextlines'              => 'Σει�ές που θα εμφανίζονται ανά αποτέλεσμα',
+'contextchars'              => 'Α�ιθμός χα�ακτή�ων στο εμφανιζόμενο κείμενο',
+'stub-threshold'            => 'Κατώφλι για μο�φοποίηση <span class="mw-stub-example">συνδέσμου επεκτάσιμου</span>:',
+'recentchangesdays'         => 'Ημέ�ες π�ος εμφάνιση στις π�όσφατες αλλαγές:',
+'recentchangesdays-max'     => '($1 {{PLURAL:$1|ημέ�α|ημέ�ες}} το μέγιστο)',
+'recentchangescount'        => 'Α�ιθμός επεξε�γασιών που να εμφανίζονται στις π�όσφατες αλλαγές και τα ιστο�ικά σελίδων σαν π�οκαθο�ισμένη επιλογή.',
+'savedprefs'                => 'Οι π�οτιμήσεις σας έχουν αποθηκευτεί.',
+'timezonelegend'            => 'Ζώνη ώ�ας',
+'timezonetext'              => 'Συμπλη�ώστε τον α�ιθμό των ω�ών κατά τις οποίες η τοπική σας ώ�α διαφέ�ει από την ώ�α του server (UTC).',
+'localtime'                 => 'Εμφάνιση τοπικής ώ�ας:',
+'timezoneselect'            => 'Ζώνη ώ�ας:',
+'timezoneuseserverdefault'  => 'Χ�ησιμοποίηση των π�οεπιλογών του εξυπη�ετητή',
+'timezoneuseoffset'         => 'Ἀλλη (καθο�ισμός της διαφο�άς)',
+'timezoneoffset'            => 'Διαφο�ά ω�ών¹:',
+'servertime'                => 'Η ώ�α του διακομιστή:',
+'guesstimezone'             => 'Συμπλή�ωση μέσω του browser',
+'allowemail'                => 'Ενε�γοποίηση πα�αλαβής μην�ματος ηλεκτ�ονικο� ταχυδ�ομείου από άλλους χ�ήστες',
+'prefs-searchoptions'       => 'Επιλογές αναζήτησης',
+'prefs-namespaces'          => 'Πε�ιοχές ονομάτων',
+'defaultns'                 => 'Αναζήτηση σε αυτές τις πε�ιοχές ονομάτων από π�οεπιλογή:',
+'default'                   => 'Π�οκαθο�ισμένο',
+'files'                     => 'Α�χεία',
 
 # User rights
 'userrights'                  => 'Διαχεί�ιση δικαιωμάτων χ�ηστών', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Διαχεί�ιση ομάδων χ�ηστών',
 'userrights-user-editname'    => 'Δηλώστε όνομα χ�ήστη:',
-'editusergroup'               => "Επεξε�γασία 'Ομάδα Χ�ηστών'",
-'editinguser'                 => "Αλλαγή των δικαιωμάτων χ�ήστη γα το χ�ήστη '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editusergroup'               => 'Επεξε�γασία ομάδων χ�ηστών',
+'editinguser'                 => "Αλλαγή των δικαιωμάτων χ�ήστη γα το χ�ήστη '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Επεξε�γασία ομάδων χ�ηστών',
 'saveusergroups'              => 'Αποθήκευση ομάδων χ�ηστών',
 'userrights-groupsmember'     => 'Μέλος της ομάδας:',
+'userrights-groups-help'      => 'Μπο�είτε να τ�οποποιήσετε τις ομάδες στις οποίες είναι αυτός ο χ�ήστης:
+* Ένα κουτί με check δηλώνει ότι ο χ�ήστης ανήκει σε αυτήν την ομάδα.
+* Ένα κουτί χω�ίς check δηλώνει ότι ο χ�ήστης δεν ανήκει σε αυτήν την ομάδα.
+* Ένας αστε�ίσκος (*) δηλώνει ότι δεν μπο�είτε να αφαι�έσετε την ομάδα αφο� την π�όσθεσετε ή και το αντίστ�οφο.',
 'userrights-reason'           => 'Λόγος για αλλαγή:',
 'userrights-no-interwiki'     => 'Δεν έχετε άδεια να επεξε�γαστείτε τα δικαιώματα χ�ηστών σε άλλα wiki.',
 'userrights-nodatabase'       => 'Η βάση δεδομένων $1 δεν υπά�χει ή δεν είναι τοπική.',
@@ -1088,6 +1303,7 @@ $2',
 'group-bot'           => 'Bots',
 'group-sysop'         => 'Διαχει�ιστές',
 'group-bureaucrat'    => 'Γ�αφειοκ�άτες',
+'group-suppress'      => 'Πα�ατη�ητές',
 'group-all'           => '(όλοι)',
 
 'group-user-member'          => 'Χ�ήστης',
@@ -1095,38 +1311,69 @@ $2',
 'group-bot-member'           => 'Bot',
 'group-sysop-member'         => 'Διαχει�ιστής',
 'group-bureaucrat-member'    => 'Γ�αφειοκ�άτης',
+'group-suppress-member'      => 'Πα�ατη�ητής',
 
 'grouppage-user'          => '{{ns:project}}:Χ�ήστες',
-'grouppage-autoconfirmed' => '{{ns:project}}:Αυτοεπιβεβαιωμένοι χ�ήστες',
+'grouppage-autoconfirmed' => '{{ns:project}}:Αυτόματα επιβεβαιωμένοι χ�ήστες',
 'grouppage-bot'           => '{{ns:project}}:Bots',
 'grouppage-sysop'         => '{{ns:project}}:Διαχει�ιστές',
 'grouppage-bureaucrat'    => '{{ns:project}}:Γ�αφειοκ�άτες',
+'grouppage-suppress'      => '{{ns:project}}:Πα�ό�αμα',
 
 # Rights
-'right-read'           => 'Ανάγνωση σελίδων',
-'right-edit'           => 'Επεξε�γασία σελίδων',
-'right-createpage'     => 'Δημιου�γία σελίδων (που δεν είναι σελίδες συζήτησης)',
-'right-createtalk'     => 'Δημιου�γία σελίδων συζήτησης',
-'right-createaccount'  => 'Δημιου�γία νέων λογα�ιασμών χ�ηστών',
-'right-move'           => 'Μετακίνηση σελίδων',
-'right-move-subpages'  => 'Μετακινήστε τις σελίδες μαζί με τις υποσελίδες τους',
-'right-upload'         => 'Επιφό�τωση α�χείων',
-'right-upload_by_url'  => 'Επιφό�τωση ενός α�χείου από μία διε�θυνση URL',
-'right-autoconfirmed'  => 'Επεξε�γασία ημιπ�οστατευμένων σελίδων',
-'right-delete'         => 'Διαγ�αφή σελίδων',
-'right-bigdelete'      => 'Διαγ�αφή σελίδων με εκτεταμένες ιστο�ίες',
-'right-browsearchive'  => 'Αναζήτηση στις διεγ�αμμένες σελίδες',
-'right-undelete'       => 'Ανάκληση διαγ�αφής μίας σελίδας',
-'right-editprotected'  => 'Επεξε�γασία π�οστατευμένων σελίδων (χω�ίς διαδοχική π�οστασία)',
-'right-import'         => 'Εισαγωγή σελίδων από άλλα wikis',
-'right-importupload'   => 'Εισαγωγή σελίδων από φό�τωση α�χείου',
-'right-patrol'         => "Σημείωση επεξε�γασιών άλλων χ�ηστών ως 'υπό πα�ακολο�θηση'",
-'right-autopatrol'     => "�α σημειώνονται αυτόματα οι επεξε�γασίες κάποιου ως 'υπό πα�ακολο�θηση'",
-'right-patrolmarks'    => "Δείτε τις σημειώσεις 'υπό πα�ακολο�θηση' των π�οσφάτων αλλαγών",
-'right-unwatchedpages' => 'Δείτε μια λίστα σελίδων που δεν πα�ακολουθο�νται',
-'right-mergehistory'   => 'Συγχώνευση της ιστο�ίας των σελίδων',
-'right-userrights'     => 'Επεξε�γαστείτε όλα τα δικαιώματα χ�ήστη',
-'right-siteadmin'      => 'Κλειδώστε και ξεκλειδώστε τη βάση δεδομένων',
+'right-read'                 => 'Ανάγνωση σελίδων',
+'right-edit'                 => 'Επεξε�γασία σελίδων',
+'right-createpage'           => 'Δημιου�γία σελίδων (που δεν είναι σελίδες συζήτησης)',
+'right-createtalk'           => 'Δημιου�γία σελίδων συζήτησης',
+'right-createaccount'        => 'Δημιου�γία νέων λογα�ιασμών χ�ηστών',
+'right-minoredit'            => 'Σημείωση των επεξε�γασιών ως μικ�ής κλίμακας',
+'right-move'                 => 'Μετακίνηση σελίδων',
+'right-move-subpages'        => 'Μετακίνηση σελίδων μαζί με τις υποσελίδες τους',
+'right-move-rootuserpages'   => 'Μετακίνηση κεντ�ικών σελίδων χ�ηστών',
+'right-movefile'             => 'Μετακίνηση α�χείων',
+'right-suppressredirect'     => 'Μη δημιου�γία ανακατε�θυνσης από το παλιό όνομα κατά τη μετακίνηση μιας σελίδας',
+'right-upload'               => 'Επιφό�τωση α�χείων',
+'right-reupload'             => 'Αντικατάσταση ενός ήδη υπά�χοντος α�χείου',
+'right-reupload-own'         => 'Αντικατάσταση ενός ήδη υπά�χοντος α�χείου που έχει ανέβει από κάποιον',
+'right-reupload-shared'      => 'Τοπική υπε�κάλυψη α�χείων στο κοινό αποθηκευτή�ιο πολυμέσων',
+'right-upload_by_url'        => 'Επιφό�τωση ενός α�χείου από μία διε�θυνση URL',
+'right-purge'                => 'Καθα�ισμός της cache του ιστότοπου για μια σελίδα χω�ίς επιβεβαίωση',
+'right-autoconfirmed'        => 'Επεξε�γασία ημιπ�οστατευμένων σελίδων',
+'right-bot'                  => 'Μεταχεί�ιση ως αυτόματη διε�γασία',
+'right-nominornewtalk'       => 'Μη ενε�γοποίηση της ειδοποίησης «Έχετε νέο μήνυμα» σε πε�ίπτωση μικ�ών αλλαγών στις σελίδες συζήτησης',
+'right-apihighlimits'        => 'Χ�ήση μεγαλ�τε�ων ο�ίων στις αιτήσεις π�ος το API',
+'right-writeapi'             => 'Χ�ήση του API για επεξε�γασία',
+'right-delete'               => 'Διαγ�αφή σελίδων',
+'right-bigdelete'            => 'Διαγ�αφή σελίδων με εκτεταμένο ιστο�ικό',
+'right-deleterevision'       => 'Διαγ�αφή και επαναφο�ά συγκεκ�ιμένων εκδόσεων σελίδων',
+'right-deletedhistory'       => 'Π�οβολή διαγ�αμμένων εκδόσεων του ιστο�ικο�, χω�ίς το σχετικό κείμενο',
+'right-browsearchive'        => 'Αναζήτηση στις διαγ�αμμένες σελίδες',
+'right-undelete'             => 'Ανάκληση διαγ�αφής μίας σελίδας',
+'right-suppressrevision'     => 'Επιθεώ�ηση και αποκατάσταση αναθεω�ήσεων κ�υμμένων από τους διαχει�ιστές',
+'right-suppressionlog'       => 'Π�οβολή ιδιωτικών καταγ�αφών',
+'right-block'                => 'Φ�αγή άλλων χ�ηστών από την επεξε�γασία',
+'right-blockemail'           => 'Φ�αγή ενός χ�ήστη από την αποστολή ηλεκτ�ονικών μηνυμάτων',
+'right-hideuser'             => 'Φ�αγή ενός ονόματος χ�ήστη, αποκ��βοντάς το από το κοινό',
+'right-ipblock-exempt'       => 'Πα�άκαμψη φ�αγών σε διευθ�νσεις IP, αυτόματων φ�αγών και φ�αγών σε IP range',
+'right-proxyunbannable'      => 'Πα�άκαμψη αυτόματων φ�αγών σε proxies',
+'right-protect'              => 'Αλλαγή των επιπέδων π�οστασίας και επεξε�γασία π�οστατευμένων σελίδων',
+'right-editprotected'        => 'Επεξε�γασία π�οστατευμένων σελίδων (χω�ίς διαδοχική π�οστασία)',
+'right-editinterface'        => 'Επεξε�γασία της διασ�νδεσης χ�ήστη',
+'right-editusercssjs'        => 'Μεταγ�αφή των α�χείων CSS και JS άλλων χ�ηστών',
+'right-rollback'             => 'Γ�ήγο�η αναστ�οφή των επεξε�γασιών του τελευταίου χ�ήστη που επεξε�γάστηκε μια σελίδα',
+'right-markbotedits'         => 'Σήμανση επαναφε�όμενων επεξε�γασιών ως επεξε�γασίες μποτ',
+'right-noratelimit'          => '�α μην επη�εάζεται από τα ό�ια �υθμο�',
+'right-import'               => 'Εισαγωγή σελίδων από άλλα wikis',
+'right-importupload'         => 'Εισαγωγή σελίδων από φό�τωση α�χείου',
+'right-patrol'               => 'Σήμανση επεξε�γασιών άλλων χ�ηστών ως ελεγμένες',
+'right-autopatrol'           => 'Αυτόματη σημείωση των επεξε�γασιών τους ως ελεγμένες',
+'right-patrolmarks'          => "Δείτε τις σημειώσεις 'υπό πα�ακολο�θηση' των π�οσφάτων αλλαγών",
+'right-unwatchedpages'       => 'Δείτε μια λίστα σελίδων που δεν πα�ακολουθο�νται',
+'right-trackback'            => 'Υποβολή ανασυνδέσμου',
+'right-mergehistory'         => 'Συγχώνευση του ιστο�ικο� των σελίδων',
+'right-userrights'           => 'Τ�οποποίηση όλων των δικαιωμάτων χ�ηστών',
+'right-userrights-interwiki' => 'Τ�οποποίηση δικαιωμάτων χ�ηστών σε άλλα wiki',
+'right-siteadmin'            => 'Κλείδωμα και ξεκλείδωμα της βάσης δεδομένων',
 
 # User rights log
 'rightslog'      => 'Α�χείο καταγ�αφών δικαιωμάτων χ�ηστών',
@@ -1134,11 +1381,48 @@ $2',
 'rightslogentry' => 'η ιδιότητα μέλους ομάδας για τον/την $1 από $2 σε $3 άλλαξε',
 'rightsnone'     => '(κανένα)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'να διαβάσετε αυτή τη σελίδα',
+'action-edit'                 => 'να επεξε�γαστείτε αυτή τη σελίδα',
+'action-createpage'           => 'να δημιου�γήσετε σελίδες',
+'action-createtalk'           => 'να δημιου�γήσετε σελίδες συζήτησης',
+'action-createaccount'        => 'να δημιου�γήσετε αυτό το λογα�ιασμό χ�ήστη',
+'action-minoredit'            => 'να σημειώσετε αυτή την επεξε�γασία σαν «μικ�ής κλίμακας»',
+'action-move'                 => 'να μετακινήσετε αυτή τη σελίδα',
+'action-move-subpages'        => 'να μετακινήσετε αυτή τη σελίδα, καθώς και τις υποσελίδες της',
+'action-move-rootuserpages'   => 'να μετακινήσετε κεντ�ικές σελίδες χ�ηστών',
+'action-movefile'             => 'να μετακινήσετε αυτό το α�χείο',
+'action-upload'               => 'να επιφο�τώσετε αυτό το α�χείο',
+'action-reupload'             => 'να ανεβάσετε νέα έκδοση αυτο� του υπά�χοντος α�χείου',
+'action-reupload-shared'      => 'να υπε�καλ�ψετε αυτό το α�χείο στο κοινό αποθετή�ιο',
+'action-upload_by_url'        => 'να επιφο�τώσετε αυτό το α�χείο από μια διε�θυνση URL',
+'action-writeapi'             => 'να χ�ησιμοποιήσετε το API για εγγ�αφή',
+'action-delete'               => 'να διαγ�άψετε αυτή τη σελίδα',
+'action-deleterevision'       => 'να διαγ�άψετε αυτή την έκδοση',
+'action-deletedhistory'       => 'να δείτε το διαγ�αμμένο ιστο�ικό αυτής της σελίδας',
+'action-browsearchive'        => 'να ε�ευνήσετε για διαγ�αμμένες σελίδες',
+'action-undelete'             => 'να ακυ�ώσετε τη διαγ�αφή αυτής της σελίδας',
+'action-suppressrevision'     => 'να επιθεω�ήσετε και αποκαταστήσετε αυτή την κ�υμμένη αναθεώ�ηση',
+'action-suppressionlog'       => 'να δείτε αυτόν τον ιδιωτικό κατάλογο',
+'action-block'                => 'να φ�άξετε τις επεξε�γασίες αυτο� του χ�ήστη',
+'action-protect'              => 'να αλλάξετε τα επίπεδα π�οστασίας για αυτή τη σελίδα',
+'action-import'               => 'να εισάγετε αυτή τη σελίδα από άλλο wiki',
+'action-importupload'         => 'να εισάγετε αυτή τη σελίδα από φό�τωση α�χείου',
+'action-patrol'               => 'να επισημάνετε τις επεξε�γασίες άλλων ως ελεγμένες',
+'action-autopatrol'           => 'να επισημάνετε την επεξε�γασία σας ως ελεγμένη',
+'action-unwatchedpages'       => 'να εμφανίσετε τον κατάλογο μη πα�ακολουθο�μενων σελίδων',
+'action-trackback'            => 'να υποβάλλετε ανασ�νδεσμο',
+'action-mergehistory'         => 'να συγχωνε�σετε το ιστο�ικό αυτής της σελίδας',
+'action-userrights'           => 'να επεξε�γαστείτε όλα τα δικαιώματα χ�ηστών',
+'action-userrights-interwiki' => 'να επεξε�γαστείτε τα δικαιώματα χ�ηστών σε άλλα βίκι',
+'action-siteadmin'            => 'να κλειδώσετε ή ξεκλειδώσετε τη βάση δεδομένων',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|αλλαγή|αλλαγές}}',
 'recentchanges'                     => 'Π�όσφατες αλλαγές',
+'recentchanges-legend'              => 'Επιλογές των π�όσφατων αλλαγών',
 'recentchangestext'                 => 'Πα�ακολουθείστε σε αυτή τη σελίδα τις πιο π�όσφατες αλλαγές στο Wiki.',
-'recentchanges-feed-description'    => 'Πα�ακολο�θησε τις πιο π�όσφατες αλλαγές στο wiki σε αυτή την πε�ίληψη.',
+'recentchanges-feed-description'    => 'Πα�ακολουθείστε τις πιο π�όσφατες αλλαγές στο wiki σε αυτή τη �οή δεδομένων.',
 'rcnote'                            => "Πα�ακάτω {{PLURAL:$1|υπά�χει '''1''' αλλαγή|υπά�χουν οι τελευταίες '''$1''' αλλαγές}} στο διάστημα {{PLURAL:$2|της τελευταίας ημέ�ας|των τελευταίων '''$2''' ημε�ών}}, από τις $5, $4 και εξής.",
 'rcnotefrom'                        => 'Ακολουθο�ν οι αλλαγές από <b>$2</b> (εμφάνιση <b>$1</b> αλλαγών max).',
 'rclistfrom'                        => 'Εμφάνιση νέων αλλαγών α�χίζοντας από $1',
@@ -1160,6 +1444,8 @@ $2',
 'rc_categories'                     => 'Πε�ιό�ισε στις κατηγο�ίες (διαχω�ίστε τις με "|")',
 'rc_categories_any'                 => 'Οποιαδήποτε',
 'newsectionsummary'                 => '/* $1 */ νέα ενότητα',
+'rc-enhanced-expand'                => 'Εμφάνιση λεπτομε�ειών (απαιτείται JavaScript)',
+'rc-enhanced-hide'                  => 'Απόκ�υψη λεπτομε�ειών',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Σχετικές αλλαγές',
@@ -1168,6 +1454,7 @@ $2',
 'recentchangeslinked-summary'  => "Αυτός είναι ένα κατάλογος αλλαγών που έγιναν π�όσφατα σε σελίδες που συνδέονται από μια καθο�ισμένη σελίδα (ή σε μέλη μιας καθο�ισμένης κατηγο�ίας).
 Σελίδες στην [[Special:Watchlist|λίστα πα�ακολο�θησής]] σας είναι '''έντονες'''.",
 'recentchangeslinked-page'     => 'Όνομα σελίδας:',
+'recentchangeslinked-to'       => 'Εμφάνιση των αλλαγών στις σελίδες που είναι συνδεδεμένες με την δεδομένη σελίδα',
 
 # Upload
 'upload'                      => 'Φό�τωση α�χείου',
@@ -1176,33 +1463,21 @@ $2',
 'reuploaddesc'                => 'Επιστ�οφή στη φό�μα φό�τωσης',
 'uploadnologin'               => 'Δεν έχετε συνδεθεί!',
 'uploadnologintext'           => 'Για να φο�τώσετε α�χεία π�έπει π�ώτα να [[Special:UserLogin|συνδεθείτε]].',
+'upload_directory_missing'    => 'Λείπει το αποθηκευτή�ιο επιφο�τώσεων ($1) και δεν μπο�εί να δημιου�γηθεί από τον webserver.',
 'upload_directory_read_only'  => 'Δεν είναι δυνατή η εγγ�αφή στον κατάλογο ($1) από τον server.',
 'uploaderror'                 => 'Σφάλμα στη φό�τωση α�χείου',
-'uploadtext'                  => "Π�ιν π�οχω�ήσετε στη φό�τωση α�χείων σε αυτό το χώ�ο βεβαιωθείτε πως διαβάσατε και πως ακολουθείτε τους [[{{ns:project}}:Κανόνες_χ�ήσης_εικόνων|Κανόνες χ�ήσης εικόνων]].
-
-Μπο�είτε να δείτε ή να αναζητήσετε εικόνες που έχουν φο�τωθεί κατά το πα�ελθόν κάτω από το σ�νδεσμο [[Special:ImageList|Κατάλογος εικόνων που έχουν φο�τωθεί]].
-Οι φο�τώσεις και οι διαγ�αφές έχουν καταγ�αφεί στη σελίδα
-[[{{ns:project}}:Καταγ�αφές_φό�τωσης|Καταγ�αφές φό�τωσης]].
-
-Χ�ησιμοποιήστε την πα�ακάτω φό�μα για να φο�τώσετε νέα α�χεία εικόνας που θα χ�ησιμοποιηθο�ν στον οπτικό εμπλουτισμό των σελίδων. Στους πε�ισσότε�ους browsers υπά�χει ένα κουμπί \"Browse...\" το οποίο εμφανίζει το πεδίο διαλόγου του συστήματός σας για το άνοιγμα α�χείων. Αν επιλέξετε ένα α�χείο, το όνομά τoυ θα συμπλη�ωθέι αυτόματα στο πεδίο κειμένου που β�ίσκεται δίπλα στο κουμπί. Μην ξεχάστε να επιβεβαιώσετε (σημειώνοντας το ανάλογο κουτάκι) πως με τη φό�τωση του συγκεκ�ιμένου α�χείου δεν πα�αβιάζετε πνευματικά δικαιώματα.
-
-Πατήστε το κουμπί \"Upload\" για να ολοκλη�ωθεί η φό�τωση.
-Η διαδικασία μπο�εί να δια�κέσει λίγο πε�ισσότε�ο αν διαθέτετε α�γή σ�νδεση με το internet.
+'uploadtext'                  => "Μπο�είτε να χ�ησιμοποιήσετε την πα�ακάτω φό�μα για να επιφο�τώσετε α�χεία. Για να δείτε ήδη επιφο�τωμένα α�χεία, πηγαίνετε στη [[Special:FileList|λίστα επιφο�τωμένων α�χείων]] ή στο [[Special:Log/upload|ιστο�ικό επιφο�τώσεων]]. Οι διαγ�αφές έχουν καταγ�αφεί στη σελίδα [[Special:Log/delete|α�χείο διαγ�αφών]].
 
-Οι π�οτιμώμενες μο�φές α�χείου είναι: JPEG για φωτογ�αφίες, PNG για σχήματα και άλλες εικόνες και OGG για α�χεία ήχου. Δώστε πε�ιγ�αφικά ονόματα στα α�χεία σας για να αποφευχθεί τυχόν σ�γχυση.
-
-Για να συμπε�ιληφθεί μια εικόνα σε μια σελίδα, χ�ησιμοποιήστε συνδέσμους της μο�φής
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.jpg]]</nowiki>''' ή
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.png|alt text]]</nowiki>''' ή
-'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki>''' για α�χεία ήχου.
-
-Σας πα�ακαλο�με να λάβετε υπ΄όψη σας ότι, ακ�ιβώς όπως συμβαίνει με τις σελίδες Wiki, είναι δυνατόν άλλοι χ�ήστες να επεξε�γαστο�ν ή να διαγ�άψουν κατά την κ�ίση τους α�χεία που έχετε φο�τώσει. Έχετε επίσης υπ΄όψη σας πως είναι δυνατόν να υποστείτε φ�αγή σαν χ�ήστης αν διαπιστωθεί πως έχετε κάνει κατάχ�ηση του συστήματος.<br />",
-'upload-permitted'            => 'Επιτ�επτοί τ�ποι α�χείου: $1.',
+Για να συμπε�ιληφθεί μια εικόνα σε μια σελίδα, χ�ησιμοποιήστε συνδέσμους της μο�φής:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' (χ�ήση της πλή�ους εκδοχής του α�χείου)
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' (χ�ήση μίας εκδοχής 200 pixel σε πλάτος σε ένα κουτάκι στο α�ιστε�ό πε�ιθώ�ιο με πε�ιγ�αφή 'alt text')
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' (άμεση σ�νδεση με το α�χείο χω�ίς εμφάνιση του ίδιου του α�χείου)",
+'upload-permitted'            => 'Επιτ�επτοί τ�ποι α�χείων: $1.',
 'upload-preferred'            => 'Τ�ποι α�χείων που π�οτιμο�νται: $1.',
 'upload-prohibited'           => 'Απαγο�ευμένοι τ�ποι α�χείου: $1.',
 'uploadlog'                   => 'Μητ�ώο επιφο�τώσεων',
 'uploadlogpage'               => 'Καταγ�αφές φό�τωσης',
-'uploadlogpagetext'           => 'Πα�ακάτω είναι ο κατάλογος με τις πιο π�όσφατες αποθηκε�σεις α�χείων. Επισκεφθείτε τον [[Special:NewImages|πίνακα νέων α�χείων]] για μία πιο οπτική επισκόπηση.',
+'uploadlogpagetext'           => 'Πα�ακάτω είναι ο κατάλογος με τις πιο π�όσφατες αποθηκε�σεις α�χείων. Επισκεφθείτε τον [[Special:NewFiles|πίνακα νέων α�χείων]] για μία πιο οπτική επισκόπηση.',
 'filename'                    => 'Όνομα α�χείου',
 'filedesc'                    => 'Σ�νοψη',
 'fileuploadsummary'           => 'Πε�ιγ�αφή:',
@@ -1215,6 +1490,7 @@ $2',
 'illegalfilename'             => 'Το όνομα του α�χείου "$1" πε�ιέχει χα�ακτή�ες που δεν επιτ�έπονται στους τίτλους των σελίδων. Πα�ακαλο�με δώστε άλλο όνομα στο α�χείο και π�οσπαθήστε ξανά να το ανεβάσετε.',
 'badfilename'                 => 'Το όνομα της εικόνας άλλαξε σε "$1".',
 'filetype-badmime'            => 'Α�χεία του τ�που MIME "$1" δεν επιτ�έπεται να επιφο�τωθο�ν.',
+'filetype-bad-ie-mime'        => 'Δεν μπο�εί να επιφο�τωθεί αυτό το α�χείο επειδή ο Internet Explorer θα το αναγνώ�ιζε ως "$1", που είναι μη επιτ�επτός και πιθανά επικίνδυνος τ�πος α�χείου.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' είναι ανεπιθ�μητος τ�πος α�χείου.
 {{PLURAL:\$3|Π�οτιμώμενος τ�πος α�χείου είναι|Π�οτιμώμενοι τ�ποι α�χείων είναι}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' δεν είναι επιτ�επόμενος τ�πος α�χείου. {{PLURAL:\$3|Επιτ�επόμενος τ�πος α�χείων|Επιτ�επόμενοι τ�ποι α�χείων}} είναι \$2.",
@@ -1222,21 +1498,23 @@ $2',
 'large-file'                  => 'Π�οτείνεται τα α�χεία να μην είναι μεγαλ�τε�α από $1; αυτό το α�χείο είναι $2.',
 'largefileserver'             => 'Το μέγεθος αυτο� του α�χείο είναι μεγαλ�τε�ο από το μέγιστο μέγεθος που ο εξυπη�ετητής είναι �υθμισμένος να επιτ�έπει.',
 'emptyfile'                   => 'Το α�χείο που φο�τώσατε φαίνεται να είναι κενό. Αυτό μπο�εί να οφείλεται σε λάθος πληκτ�ολόγησης του ονόματος του α�χείου. Πα�ακαλο�με ελέγξτε εαν αυτό είναι π�αγματικά το α�χείο που θέλετε να φο�τώσετε.',
-'fileexists'                  => 'Υπά�χει ήδη α�χείο με αυτό το όνομα -πα�ακαλο�με ελέγξτε στο <strong><tt>$1</tt></strong>. Είστε βέβαιος (-η) πως θέλετε να αλλάξετε το όνομα του α�χείου;',
-'filepageexists'              => 'Η σελίδα πε�ιγ�αφής για αυτό το α�χείο δημιου�γήθηκε ήδη στο <strong><tt>$1</tt></strong>, αλλά κανένα α�χείο με αυτό το όνομα δεν υπά�χει αυτή τη στιγμή.  Η πε�ιγ�αφή που θα γ�άψετε δεν θα εμφανιστεί στη σελίδα πε�ιγ�αφής.  Για να εμφανιστεί η πε�ίγ�αφή σας εκεί, θα π�έπει να την επεξε�γαστείτε χει�οκίνητα.',
-'fileexists-extension'        => 'Ένα α�χείο με πα�όμοιο όνομα υπά�χει:<br />
-Όνομα του π�ος επιφό�τωση α�χείου: <strong><tt>$1</tt></strong><br />
-Όνομα υπά�χοντος α�χείου: <strong><tt>$2</tt></strong><br />
-Πα�ακαλώ διαλέξτε ένα διαφο�ετικό όνομα.',
+'fileexists'                  => "Υπά�χει ήδη α�χείο με αυτό το όνομα -πα�ακαλο�με ελέγξτε στο '''<tt>$1</tt>'''. Είστε βέβαιος (-η) πως θέλετε να αλλάξετε το όνομα του α�χείου;",
+'filepageexists'              => "Η σελίδα πε�ιγ�αφής για αυτό το α�χείο δημιου�γήθηκε ήδη στο '''<tt>$1</tt>''', αλλά κανένα α�χείο με αυτό το όνομα δεν υπά�χει αυτή τη στιγμή.  Η πε�ιγ�αφή που θα γ�άψετε δεν θα εμφανιστεί στη σελίδα πε�ιγ�αφής.  Για να εμφανιστεί η πε�ίγ�αφή σας εκεί, θα π�έπει να την επεξε�γαστείτε χει�οκίνητα.",
+'fileexists-extension'        => "Ένα α�χείο με πα�όμοιο όνομα υπά�χει:<br />
+Όνομα του π�ος επιφό�τωση α�χείου: '''<tt>$1</tt>'''<br />
+Όνομα υπά�χοντος α�χείου: '''<tt>$2</tt>'''<br />
+Πα�ακαλώ διαλέξτε ένα διαφο�ετικό όνομα.",
 'fileexists-thumb'            => "<center>'''Υπά�χουσα εικόνα'''</center>",
-'fileexists-thumbnail-yes'    => 'Το α�χείο φαίνεται ότι είναι μια εικόνα μειωμένου μεγέθους <i>(μικ�ογ�αφία)</i>. Πα�ακαλώ ελέγξτε το α�χείο <strong><tt>$1</tt></strong>.<br />
-Αν το ελεγμένο α�χείο είναι η ίδια εικόνα στο α�χικό μέγεθος δεν είναι απα�αίτητο να επιφο�τώσετε μια επιπλέον μικ�ογ�αφία.',
-'file-thumbnail-no'           => 'Το όνομα α�χείου α�χίζει με <strong><tt>$1</tt></strong>.
-Φαίνεται πως είναι μια εικόνα μειωμένου μεγέθους <i>(μικ�ογ�αφία)</i>.
-Αν έχετε αυτή την εικόνα σε πλή�η ανάλυση, επιφο�τώστε τη, αλλιώς αλλάξτε πα�ακαλώ το όνομα του α�χείου.',
-'fileexists-forbidden'        => 'Ένα α�χείο με αυτό το όνομα υπά�χει ήδη˙ πα�ακαλώ πηγαίνετε πίσω και επιφο�τώστε αυτό το α�χείο υπό ένα νέο όνομα. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Το α�χείο φαίνεται ότι είναι μια εικόνα μειωμένου μεγέθους ''(μικ�ογ�αφία)''. Πα�ακαλώ ελέγξτε το α�χείο '''<tt>$1</tt>'''.<br />
+Αν το ελεγμένο α�χείο είναι η ίδια εικόνα στο α�χικό μέγεθος δεν είναι απα�αίτητο να επιφο�τώσετε μια επιπλέον μικ�ογ�αφία.",
+'file-thumbnail-no'           => "Το όνομα α�χείου α�χίζει με '''<tt>$1</tt>'''.
+Φαίνεται πως είναι μια εικόνα μειωμένου μεγέθους ''(μικ�ογ�αφία)''.
+Αν έχετε αυτή την εικόνα σε πλή�η ανάλυση, επιφο�τώστε τη, αλλιώς αλλάξτε πα�ακαλώ το όνομα του α�χείου.",
+'fileexists-forbidden'        => 'Ένα α�χείο με αυτό το όνομα υπά�χει ήδη˙ εάν ακόμη θέλετε να επιφο�τώσωτε αυτό το α�χείο πα�ακαλώ πηγαίνετε πίσω και επιφο�τώστε το υπό ένα νέο όνομα. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => "Ένα α�χείο με αυτό το όνομα υπά�χει ήδη στο χώ�ο φ�λαξης κοινών α�χείων.
-Εάν θέλετε πα�' όλ' αυτά να επιφο�τώσετε το δικό σας α�χείο, πα�ακαλο�με πηγαίνετε πίσω και χ�ησιμοποιήστε ένα νέο όνομα. [[Image:$1|thumb|center|$1]]",
+Εάν θέλετε πα�' όλ' αυτά να επιφο�τώσετε το δικό σας α�χείο, πα�ακαλο�με πηγαίνετε πίσω και χ�ησιμοποιήστε ένα νέο όνομα. [[File:$1|thumb|center|$1]]",
+'file-exists-duplicate'       => 'Αυτό το α�χείο είναι διπλότυπο {{PLURAL:$1|αυτο� του α�χείου|αυτών των α�χείων}}:',
+'file-deleted-duplicate'      => 'Α�χείο πα�όμοιο με αυτό εδώ ([[$1]]) έχει π�οηγουμένως διαγ�αφεί. Θα π�έπει να ελέγξετε το ιστο�ικό διαγ�αφής του π�ιν να π�οχω�ήσετε στην επαναφό�τωσή του.',
 'successfulupload'            => 'Επιτυχής φό�τωση',
 'uploadwarning'               => 'Π�οειδοποίηση φό�τωσης',
 'savefile'                    => 'Αποθήκευση α�χείου',
@@ -1256,7 +1534,22 @@ $2',
 
 Θα π�έπει να σκεφτείτε αν είναι σωστό να συνεχίσετε την επιφό�τωση του α�χείου.
 Η καταγ�αφή διαγ�αφής αυτο� του α�χείου δίνεται εδώ για διευκόλυνση:",
-'filename-bad-prefix'         => 'Το όνομα του α�χείου που ανεβάζετε ξεκινά με <strong>"$1"</strong>, που είναι ένα μη πε�ιγ�αφικό όνομα που συνήθως εκχω�είται αυτόματα από ψηφιακές φωτογ�αφικές μηχανές. Πα�ακαλώ διαλέξτε ένα πιο πε�ιγ�αφικό όνομα για το α�χείο σας.',
+'filename-bad-prefix'         => "Το όνομα του α�χείου που ανεβάζετε ξεκινά με '''\"\$1\"''', που είναι ένα μη πε�ιγ�αφικό όνομα που συνήθως εκχω�είται αυτόματα από ψηφιακές φωτογ�αφικές μηχανές. Πα�ακαλώ διαλέξτε ένα πιο πε�ιγ�αφικό όνομα για το α�χείο σας.",
+'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
+# Η σ�νταξη είναι ως ακολο�θως:
+#   * Οτιδήποτε από ένα χα�ακτή�α «#» μέχ�ι το τέλος της γ�αμμής είναι ένα σχόλιο
+#   * Οποιαδήποτε μη κενή γ�αμμή είναι ένα π�όθεμα για τυπικά ονόματα α�χείων ο�ισμένα
+#     αυτόματα από ψηφιακές φωτογ�αφικές μηχανές
+CIMG # Casio
+DSC_ # Nikon
+DSCF # Fuji
+DSCN # Nikon
+DUW # με�ικά κινητά τηλέφωνα
+IMG # γενικά
+JD # Jenoptik
+MGP # Pentax
+PICT # διάφο�α
+ #</pre> <!-- leave this line exactly as it is -->',
 
 'upload-proto-error'      => 'Λανθασμένο π�ωτόκολλο',
 'upload-proto-error-text' => 'Η απομακ�υσμένη επιφό�τωση απαιτεί URL με π�όθεμα <code>http://</code> ή <code>ftp://</code>.',
@@ -1280,20 +1573,21 @@ $2',
 'upload_source_url'  => ' (ένα έγκυ�ο, δημόσια π�οσβάσιμο URL)',
 'upload_source_file' => ' (ένα α�χείο στον υπολογιστή σας)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Αυτή η ειδική σελίδα δείχνει όλα τα ανεβασμένα α�χεία.
+# Special:ListFiles
+'listfiles-summary'     => 'Αυτή η ειδική σελίδα δείχνει όλα τα ανεβασμένα α�χεία.
 Τα πιο π�όσφατα είναι στην κο�υφή της λίστας.
 Πατήστε στην επικεφαλίδα μιας σει�άς για αλλάξει η ιε�ά�χηση.',
-'imagelist_search_for'  => 'Αναζήτηση για όνομα πολυμέσου:',
+'listfiles_search_for'  => 'Αναζήτηση για όνομα πολυμέσου:',
 'imgfile'               => 'α�χείο',
-'imagelist'             => 'Κατάλογος εικόνων',
-'imagelist_date'        => 'Ημε�ομηνία',
-'imagelist_name'        => 'Όνομα',
-'imagelist_user'        => 'Χ�ήστης',
-'imagelist_size'        => 'Μέγεθος',
-'imagelist_description' => 'Πε�ιγ�αφή',
-
-# Image description page
+'listfiles'             => 'Κατάλογος εικόνων',
+'listfiles_date'        => 'Ημε�ομηνία',
+'listfiles_name'        => 'Όνομα',
+'listfiles_user'        => 'Χ�ήστης',
+'listfiles_size'        => 'Μέγεθος',
+'listfiles_description' => 'Πε�ιγ�αφή',
+'listfiles_count'       => 'Εκδόσεις',
+
+# File description page
 'filehist'                       => 'Ιστο�ικό α�χείου',
 'filehist-help'                  => 'Πατήστε σε μια ημε�ομηνία/ώ�α για να δείτε το α�χείο όπως εμφανιζόταν εκείνη την ώ�α.',
 'filehist-deleteall'             => 'διαγ�αφή όλων',
@@ -1301,18 +1595,29 @@ $2',
 'filehist-revert'                => 'αναστ�οφή',
 'filehist-current'               => 'τελευταία',
 'filehist-datetime'              => '��α/Ημε�ομ.',
+'filehist-thumb'                 => 'Εικονίδιο',
+'filehist-thumbtext'             => 'Γ�αφική σ�νοψη για την έκδοση της $1',
+'filehist-nothumb'               => 'Καμία γ�αφική σ�νοψη (thumbnail)',
 'filehist-user'                  => 'Χ�ήστης',
 'filehist-dimensions'            => 'Διαστάσεις',
 'filehist-filesize'              => 'Μέγεθος',
 'filehist-comment'               => 'Σχόλια',
-'imagelinks'                     => 'Σ�νδεσμοι εικόνων',
-'linkstoimage'                   => '{{PLURAL:$1|Οι ακόλουθες σελίδες συνδέονται|$1 Η ακόλουθη σελίδα συνδέεται}} με αυτή την εικόνα:',
+'imagelinks'                     => 'Συνδέσεις α�χείου',
+'linkstoimage'                   => '{{PLURAL:$1|Η ακόλουθη σελίδα συνδέεται|$1 Οι ακόλουθες σελίδες συνδέονται}} με αυτό το α�χείο:',
+'linkstoimage-more'              => 'Πε�ισσότε�οι από $1 {{PLURAL:$1|σ�νδεσμο|σ�νδεσμοι}} συνδέονται με αυτό το α�χείο.
+Η ακόλουθη λίστα δείχνει {{PLURAL:$1|την π�ώτη σελίδα που συνδέεται|τις π�ώτες $1 σελίδες που συνδέονται}} με αυτό το α�χείο μονοσήμαντα.
+Η [[Special:WhatLinksHere/$2|πλή�ης λίστα]] είναι διαθέσιμη.',
 'nolinkstoimage'                 => 'Δεν υπά�χουν σελίδες που συνδέονται με αυτήν την εικόνα.',
+'morelinkstoimage'               => 'Δείτε [[Special:WhatLinksHere/$1|πε�ισσότε�ους συνδέσμους]] π�ος αυτό το α�χείο.',
+'redirectstofile'                => '{{PLURAL:$1|Το ακόλουθο α�χείο ανακατευθ�νει|$1 Τα ακόλουθα α�χεία ανακατευθ�νουν}} π�ος αυτό το α�χείο:',
+'duplicatesoffile'               => '{{PLURAL:$1|Το ακόλουθο α�χείο είναι διπλότυπο|Τα $1 ακόλουθα α�χεία είναι διπλότυπα}} αυτο� του α�χείου ([[Special:FileDuplicateSearch/$2|πε�ισσότε�ες λεπτομέ�ειες]]):',
 'sharedupload'                   => 'Το α�χείο αυτό φο�τώθηκε για κοινή χ�ήση και είναι δυνατόν να χ�ησιμοποιείται ταυτοχ�όνως σε πε�ισσότε�α από ένα έ�γα.',
 'shareduploadwiki'               => 'Πα�ακαλο�με συμβουλευθείτε την [$1 σελίδα πε�ιγ�αφής α�χείου] για πε�ισσότε�ες πλη�οφο�ίες.',
-'shareduploadwiki-desc'          => 'Η πε�ιγ�αφή στη $1 του στο κοινό ταμιευτή�ιο, β�ίσκεται πα�ακάτω.',
+'shareduploadwiki-desc'          => 'Η πε�ιγ�αφή στη $1 του εκεί, β�ίσκεται πα�ακάτω.',
 'shareduploadwiki-linktext'      => 'σελίδα πε�ιγ�αφής α�χείου',
+'shareduploadduplicate'          => 'Αυτό το α�χείο είναι διπλότυπο του $1 από το κοινό αποθηκευτή�ιο.',
 'shareduploadduplicate-linktext' => 'άλλο α�χείο',
+'shareduploadconflict'           => 'Αυτό το α�χείο έχει το ίδιο όνομα με το $1 από το κοινόχ�ηστο αποθετή�ιο.',
 'shareduploadconflict-linktext'  => 'άλλο α�χείο',
 'noimage'                        => 'Δεν υπά�χει α�χείο με αυτό το όνομα, αλλά μπο�είτε να $1.',
 'noimage-linktext'               => 'επιφο�τώστε ένα',
@@ -1332,7 +1637,7 @@ $2',
 # File deletion
 'filedelete'                  => 'Διαγ�αφή του $1',
 'filedelete-legend'           => 'Διαγ�αφή α�χείου',
-'filedelete-intro'            => "Διαγ�άφετε το '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Π�όκειται να διαγ�άψετε το α�χείο '''[[Media:$1|$1]]''' μαζί με όλο το ιστο�ικό του.",
 'filedelete-intro-old'        => "Διαγ�άφετε την έκδοση του '''[[Media:$1|$1]]''' από τις [$4 $3, $2].",
 'filedelete-comment'          => 'Λόγος διαγ�αφής:',
 'filedelete-submit'           => 'Διαγ�αφή',
@@ -1340,7 +1645,6 @@ $2',
 'filedelete-success-old'      => "Η έκδοση του '''[[Media:$1|$1]]''' από την $3, $2 έχει διαγ�αφεί.",
 'filedelete-nofile'           => "Το '''$1''' δεν υπά�χει.",
 'filedelete-nofile-old'       => "Δεν υπά�χει καταγεγ�αμμένη έκδοση του '''$1''' με τα συγκεκ�ιμένα χα�ακτη�ιστικά.",
-'filedelete-iscurrent'        => 'Π�οσπαθείτε να διαγ�άψετε την πιο π�όσφατη έκδοση αυτο� του α�χείου. Πα�ακαλο�με επαναφέ�ετε το α�χείο σε μια παλαιότε�η έκδοση π�ώτα.',
 'filedelete-otherreason'      => 'Άλλος/π�όσθετος λόγος:',
 'filedelete-reason-otherlist' => 'Άλλος λόγος',
 'filedelete-reason-dropdown'  => '*Συχνοί λόγοι διαγ�αφής
@@ -1350,7 +1654,7 @@ $2',
 
 # MIME search
 'mimesearch'         => 'Αναζήτηση MIME',
-'mimesearch-summary' => 'Αυτή η σελίδα ενε�γοποιεί το φιλτ�ά�ισμα α�χείων σ�μφωνα με τον τ�πο MIME τους. Είσοδοςt: contenttype/subtype, π.χ. <tt>image/jpeg</tt>.',
+'mimesearch-summary' => 'Αυτή η σελίδα ενε�γοποιεί το φιλτ�ά�ισμα α�χείων σ�μφωνα με τον τ�πο MIME τους. Είσοδος: contenttype/subtype, π.χ. <tt>image/jpeg</tt>.',
 'mimetype'           => 'Τ�πος MIME:',
 'download'           => 'μεταφό�τωση',
 
@@ -1362,34 +1666,36 @@ $2',
 
 # Unused templates
 'unusedtemplates'     => 'Αχ�ησιμοποίητα π�ότυπα',
-'unusedtemplatestext' => 'Αυτή η σελίδα πε�ιέχει όλες τις σελίδες στην πε�ιοχή ονομάτος των π�οτ�πων, οι οποίες δεν πε�ιλαμβάνονται σε άλλη σελίδα. Θυμηθείτε να ελέγξετε για άλλους συνδέσμους π�ος τα π�ότυπα π�ιν τα διαγ�άψετε.',
+'unusedtemplatestext' => 'Αυτή η σελίδα πε�ιέχει όλες τις σελίδες στην πε�ιοχή ονομάτος των {{ns:template}}, οι οποίες δεν πε�ιλαμβάνονται σε άλλη σελίδα. Θυμηθείτε να ελέγξετε για άλλους συνδέσμους π�ος τα π�ότυπα π�ιν τα διαγ�άψετε.',
 'unusedtemplateswlh'  => 'άλλοι σ�νδεσμοι',
 
 # Random page
 'randompage'         => 'Τυχαία σελίδα',
-'randompage-nopages' => 'Δεν υπά�χουν σελίδες σε αυτή την πε�ιοχή ονομάτων.',
+'randompage-nopages' => 'Δεν υπά�χουν σελίδες σε αυτή την πε�ιοχή ονομάτων "$1".',
 
 # Random redirect
 'randomredirect'         => 'Τυχαία ανακατε�θυνση',
-'randomredirect-nopages' => 'Δεν υπά�χουν ανακατευθ�νσεις σε αυτή την πε�ιοχή ονόματος.',
+'randomredirect-nopages' => 'Δεν υπά�χουν ανακατευθ�νσεις σε αυτή την πε�ιοχή ονόματος "$1".',
 
 # Statistics
-'statistics'             => 'Στατιστικές',
-'sitestats'              => 'Στατιστικές ιστοχώ�ου',
-'userstats'              => 'Στατιστικές χ�ηστών',
-'sitestatstext'          => "Συνολικά {{PLURAL:\$1|υπά�χει '''1''' σελίδα|υπά�χουν '''\$1''' σελίδες}} στη βάση δεδομένων.
-Συμπε�ιλαμβάνονται σελίδες \"συζήτησης\", σελίδες για τον ιστότοπο {{SITENAME}}, πολ� μικ�ές σελίδες, ανακατευθ�νσεις, και άλλες που πιθανώς να μην πλη�ο�ν τις π�οϋποθέσεις για να χα�ακτη�ίζονται σελίδες με \"ουσιώδες πε�ιεχόμενο\".
-Αποκλείοντας αυτές, {{PLURAL:\$2|υπά�χει '''1''' σελίδα η οποία|υπά�χουν  '''\$2''' σελίδες οι οποίες}} είναι πιθανώς θεμιτές {{PLURAL:\$2|σελίδα|σελίδες}} πε�ιεχομένου.
-
-'''\$8''' {{PLURAL:\$8|α�χείο|α�χεία}} έχουν φο�τωθεί.
-
-Έχουν καταγ�αφεί συνολικά '''\$3''' {{PLURAL:\$3|επίσκεψη σε σελίδα|επισκέψεις σε σελίδες}}, και '''\$4''' {{PLURAL:\$4|επεξε�γασία σελίδας|επεξε�γασίες σελίδων}}
-από τότε που ο ιστότοπος {{SITENAME}} δημιου�γήθηκε.
-Αυτό αναλογεί σε '''\$5''' κατά μέσο ό�ο επεξε�γασίες ανά σελίδα, και σε '''\$6''' επισκέψεις ανά επεξε�γασία.
-
-Το μέγεθος της [http://www.mediawiki.org/wiki/Manual:Job_queue ου�άς ε�γασιών] είναι '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Υπά�χει '''1''' εγγεγ�αμένος χ�ήστης|Υπά�χουν '''$1''' εγγεγ�αμένοι χ�ήστες}}, από τους οποίους '''$2''' (ή το '''$4%''') {{PLURAL:$2|έχει|έχουν}} δικαιώματα της ομάδας $5.",
-'statistics-mostpopular' => 'Οι πιο δημοφιλείς σελίδες',
+'statistics'                   => 'Στατιστικά',
+'statistics-header-pages'      => 'Στατιστικά σελίδων',
+'statistics-header-edits'      => 'Στατιστικά επεξε�γασιών',
+'statistics-header-views'      => 'Εμφάνιση στατιστικών',
+'statistics-header-users'      => 'Στατιστικά χ�ηστών',
+'statistics-articles'          => 'Σελίδες πε�ιεχομένου',
+'statistics-pages'             => 'Σελίδες',
+'statistics-pages-desc'        => 'Όλες οι σελίδες του wiki, συμπε�ιλαμβανομένων των σελίδων συζήτησης, ανακατευθ�νσεων, κλπ.',
+'statistics-files'             => 'Α�χεία που έχουν επιφο�τωθεί',
+'statistics-edits'             => 'Επεξε�γασίες σελίδων από τη δημιου�γία του εγχει�ήματος {{SITENAME}}',
+'statistics-edits-average'     => 'Μέσος ό�ος επεξε�γασιών ανά σελίδα',
+'statistics-views-total'       => 'Συνολικές εμφανίσεις',
+'statistics-views-peredit'     => 'Εμφανίσεις ανά επεξε�γασία',
+'statistics-jobqueue'          => 'Μήκος [http://www.mediawiki.org/wiki/Manual:Job_queue ου�άς ε�γασιών]',
+'statistics-users'             => 'Εγγεγ�αμμένοι [[Special:ListUsers|χ�ήστες]]',
+'statistics-users-active'      => 'Ενε�γοί χ�ήστες',
+'statistics-users-active-desc' => 'Χ�ήστες που έχουν κάνει κάποια επεξε�γασία μέσα σε {{PLURAL:$1|μέ�α|$1 μέ�ες}}',
+'statistics-mostpopular'       => 'Οι πιο δημοφιλείς σελίδες',
 
 'disambiguations'      => 'Σελίδες αποσαφήνισης',
 'disambiguationspage'  => 'Project:Σ�νδεσμοι_π�ος_τις_σελίδες_αποσαφήνισης',
@@ -1400,9 +1706,10 @@ $2',
 'doubleredirects'            => 'Διπλές ανακατευθ�νσεις',
 'doubleredirectstext'        => 'Κάθε σει�ά πε�ιέχει συνδέσμους π�ος την π�ώτη και τη δε�τε�η σελίδα ανακατε�θυνσης, όπως επίσης και την π�ώτη α�άδα του κειμένου στη δε�τε�η σελίδα ανακατε�θυνσης η οποία και είναι, κανονικά, ο π�αγματικός π�οο�ισμός της ανακατε�θυνσης -εκεί δηλαδή όπου θα έπ�επε να είχατε οδηγηθεί από την α�χή.',
 'double-redirect-fixed-move' => 'Η [[$1]] έχει μετακινηθεί, τώ�α είναι ανακατε�θυνση στην [[$2]]',
+'double-redirect-fixer'      => 'Διο�θωτής ανακατευθ�νσεων',
 
 'brokenredirects'        => 'Λανθασμένες ανακατευθ�νσεις',
-'brokenredirectstext'    => 'Οι πα�ακάτω ανακατευθ�νσεις οδηγο�ν σε σελίδες που δεν υπά�χουν.',
+'brokenredirectstext'    => 'Οι πα�ακάτω ανακατευθ�νσεις οδηγο�ν σε σελίδες που δεν υπά�χουν:',
 'brokenredirects-edit'   => '(επεξε�γασία)',
 'brokenredirects-delete' => '(διαγ�αφή)',
 
@@ -1422,7 +1729,7 @@ $2',
 'nviews'                  => '$1 {{PLURAL:$1|επίσκεψη|επισκέψεις}}',
 'specialpage-empty'       => 'Αυτή η σελίδα είναι κενή.',
 'lonelypages'             => 'Ο�φανές σελίδες',
-'lonelypagestext'         => 'Οι ακόλουθες σελίδες, δεν συνδέονται με άλλες σελίδες στο {{SITENAME}}.',
+'lonelypagestext'         => 'Οι ακόλουθες σελίδες δεν συνδέονται με ή δεν υπε�κλείονται σε άλλες σελίδες στο {{SITENAME}}.',
 'uncategorizedpages'      => 'Αταξινόμητες σελίδες',
 'uncategorizedcategories' => 'Αταξινόμητες κατηγο�ίες',
 'uncategorizedimages'     => 'Ακατηγο�ιοποίητα α�χεία',
@@ -1432,25 +1739,30 @@ $2',
 'popularpages'            => 'Δημοφιλείς σελίδες',
 'wantedcategories'        => 'Ζητο�μενες κατηγο�ίες',
 'wantedpages'             => 'Σελίδες σε ζήτηση',
-'missingfiles'            => 'Α�χεία που λείπουν',
+'wantedfiles'             => 'Ζητο�μενα α�χεία',
+'wantedtemplates'         => 'Επιθυμητά π�ότυπα',
 'mostlinked'              => 'Οι σελίδες με τις πε�ισσότε�ες αναφο�ές',
 'mostlinkedcategories'    => 'Πε�ισσότε�ο χ�ησιμοποιο�μενες κατηγο�ίες',
 'mostlinkedtemplates'     => 'Πε�ισσότε�ο χ�ησιμοποιο�μενα π�ότυπα',
 'mostcategories'          => 'Ά�θ�α με τις πε�ισσότε�ες κατηγο�ίες',
 'mostimages'              => 'Πε�ισσότε�ο χ�ησιμοποιο�μενα α�χεία',
 'mostrevisions'           => 'Ά�θ�α με τις πε�ισσότε�ες αναθεω�ήσεις',
-'prefixindex'             => 'Κατάλογος κατά π�όθεμα',
+'prefixindex'             => 'Όλες οι σελίδες με π�όθεμα',
 'shortpages'              => 'Σ�ντομες σελίδες',
 'longpages'               => 'Εκτενείς σελίδες',
 'deadendpages'            => 'Αδιέξοδες σελίδες',
 'deadendpagestext'        => 'Οι σελίδες που ακολουθο�ν δεν συνδέονται με άλλες σελίδες στο {{SITENAME}}.',
 'protectedpages'          => 'Π�οστατευμένες σελίδες',
+'protectedpages-indef'    => 'Π�οστασίες επαό�ιστον μόνο',
+'protectedpages-cascade'  => 'Μόνο διαδοχικές π�οστασίες',
 'protectedpagestext'      => 'Οι ακόλουθες σελίδες είναι π�οστατευμένες από μετακίνηση ή επεξε�γασία',
 'protectedpagesempty'     => 'Καμία σελίδα με αυτές τις πα�αμέτ�ους δεν είναι π�ος το πα�όν π�οστατευμένη.',
 'protectedtitles'         => 'Π�οστατευμένοι τίτλοι',
 'protectedtitlestext'     => 'Οι επόμενοι τίτλοι είναι π�οστατευμένοι και δεν μπο�ο�ν να δημιου�γηθο�ν',
 'protectedtitlesempty'    => 'Δεν υπά�χουν π�οστατευμένοι τίτλοι με αυτές τις πα�αμέτ�ους.',
 'listusers'               => 'Κατάλογος χ�ηστών',
+'listusers-editsonly'     => 'Εμφάνιση μόνο των χ�ηστών με επεξε�γασίες',
+'usereditcount'           => '$1 {{PLURAL:$1|επεξε�γασία|επεξε�γασίες}}',
 'newpages'                => '�έες σελίδες',
 'newpages-username'       => 'Όνομα χ�ήστη:',
 'ancientpages'            => 'Οι παλιότε�ες σελίδες',
@@ -1460,22 +1772,24 @@ $2',
 'unusedcategoriestext'    => 'Οι ακόλουθες κατηγο�ίες δεν συνδέονται με άλλο ά�θ�ο ή κατηγο�ία.',
 'notargettitle'           => 'Δεν έχει καθο�ιστεί π�οο�ισμός.',
 'notargettext'            => 'Δεν έχετε καθο�ίσει ένα χ�ήστη ή μια σελίδα π�οο�ισμο� για να εκτελεσθεί αυτή η λειτου�γία.',
+'nopagetitle'             => 'Δεν υπά�χει τέτοια σελίδα στόχος',
+'nopagetext'              => 'Η σελίδα στόχος που καταχω�ίσατε δεν υπά�χει.',
 'pager-newer-n'           => '{{PLURAL:$1|νεότε�ο 1|νεότε�α $1}}',
 'pager-older-n'           => '{{PLURAL:$1|παλαιότε�ο 1|παλαιότε�α $1}}',
+'suppress'                => 'Πα�ό�αμα',
 
 # Book sources
 'booksources'               => 'Πηγές βιβλίων',
 'booksources-search-legend' => 'Αναζήτηση για πηγές βιβλίων',
 'booksources-go'            => 'Πήγαινε',
 'booksources-text'          => 'Πα�ακάτω είναι μια λίστα συνδέσμων σε άλλους ιστοτόπους οι οποίοι πωλο�ν νέα και μεταχει�ισμένα βιβλία, και μπο�εί επίσης να έχουν πε�ισσότε�ες πλη�οφο�ίες για βιβλία για τα οποία ψάχνετε:',
+'booksources-invalid-isbn'  => 'Το δοσμένο ISBN δεν φαίνεται να είναι έγκυ�ο· ελέγξτε για λάθη κατά την αντιγ�αφή από την α�χική πηγή.',
 
 # Special:Log
 'specialloguserlabel'  => 'Χ�ήστης:',
 'speciallogtitlelabel' => 'Τίτλος:',
 'log'                  => 'Καταγ�αφές γεγονότων',
 'all-logs-page'        => 'Όλες οι καταγ�αφές γεγονότων',
-'log-search-legend'    => 'Αναζήτηση για α�χεία καταγ�αφών',
-'log-search-submit'    => 'Πήγαινε',
 'alllogstext'          => 'Εποπτική εμφάνιση όλων των ενε�γειών φό�τωσης α�χείων, διαγ�αφής, π�οστασίας, φ�αγής και όλων των καταγ�αφών των διαχει�ιστών στο α�χείο γεγονότων του {{SITENAME}}. Μπο�είτε να πε�ιο�ίσετε τα αποτελέσματα που εμφανίζονται επιλέγοντας συγκεκ�ιμένο είδος γεγονότων, όνομα χ�ήστη ή τη σελίδα που επη�εάστηκε.',
 'logempty'             => 'Δεν υπά�χουν στοιχεία που να ται�ιάζουν στο α�χείο καταγ�αφών.',
 'log-title-wildcard'   => 'Αναζήτησε τίτλους που α�χίζουν με αυτό το κείμενο',
@@ -1486,6 +1800,7 @@ $2',
 'nextpage'          => 'Επόμενη σελίδα ($1)',
 'prevpage'          => 'Π�οηγο�μενη σελίδα ($1)',
 'allpagesfrom'      => 'Εμφάνιση σελίδων που α�χίζουν από:',
+'allpagesto'        => 'Εμφάνιση σελίδων που λήγουν σε:',
 'allarticles'       => 'Όλα τα ά�θ�α',
 'allinnamespace'    => 'Όλες οι σελίδες (στην πε�ιοχή $1)',
 'allnotinnamespace' => 'Όλες οι σελίδες (που δεν β�ίσκονται στην πε�ιοχή $1)',
@@ -1504,39 +1819,70 @@ $2',
 'special-categories-sort-count' => 'ταξινόμηση κατά απα�ίθμηση',
 'special-categories-sort-abc'   => 'αλφαβητική ταξινόμηση',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Διαγ�αμμένες συνεισφο�ές χ�ήστη',
+
+# Special:LinkSearch
+'linksearch'       => 'Εξωτε�ικοί σ�νδεσμοι',
+'linksearch-pat'   => 'Μοτίβο αναζήτησης:',
+'linksearch-ns'    => 'Πε�ιοχή:',
+'linksearch-ok'    => 'Αναζήτηση',
+'linksearch-text'  => 'Ονόματα-μπαλαντέ� όπως το "*.wikipedia.org" μπο�ο�ν να χ�ησιμοποιηθο�ν.<br />
+Υποστη�ιζόμενα π�ωτόκολλα: <tt>$1</tt>',
+'linksearch-line'  => 'Η $1 συνδεδεμένη από την $2',
+'linksearch-error' => 'Λέξεις-μπαλαντέ� μπο�εί να εμφανιστο�ν μόνο στην α�χή το� ονόματος ιστοτόπου (hostname).',
+
 # Special:ListUsers
 'listusersfrom'      => 'Π�οβολή χ�ηστών ξεκινώντας από:',
 'listusers-submit'   => 'Δείξε',
 'listusers-noresult' => 'Δεν β�έθηκε χ�ήστης.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Α�χείο δημιου�γίας χ�ηστών',
+'newuserlogpagetext'          => 'Αυτό είναι το α�χείο δημιου�γίας χ�ηστών.',
+'newuserlog-byemail'          => 'ο κωδικός έχει σταλεί μέσω ηλεκτ�ονικο� μην�ματος',
+'newuserlog-create-entry'     => '�έος χ�ήστης',
+'newuserlog-create2-entry'    => 'δημιου�γία νέου λογα�ιασμο�: $1',
+'newuserlog-autocreate-entry' => 'Ο λογα�ιασμός έχει δημιου�γηθεί αυτόματα',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Δικαιώματα ομάδων χ�ηστών',
-'listgrouprights-group'    => 'Ομάδα',
-'listgrouprights-rights'   => 'Δικαιώματα',
-'listgrouprights-helppage' => 'Help:Δικαιώματα ομάδων',
-'listgrouprights-members'  => '(κατάλογος μελών)',
+'listgrouprights'                 => 'Δικαιώματα ομάδων χ�ηστών',
+'listgrouprights-summary'         => 'Ακόλουθεί μία λίστα με τις ομάδες χ�ηστών σε αυτό το wiki καθώς και με τα δικαιώματα π�όσβασης αυτών. 
+Ενδέχεται να πε�ιέχει [[{{MediaWiki:Listgrouprights-helppage}}|π�όσθετες πλη�οφο�ίες]] σχετικά με ατομικά δικαιώματα.',
+'listgrouprights-group'           => 'Ομάδα',
+'listgrouprights-rights'          => 'Δικαιώματα',
+'listgrouprights-helppage'        => 'Help:Δικαιώματα ομάδων',
+'listgrouprights-members'         => '(κατάλογος μελών)',
+'listgrouprights-addgroup'        => 'Μπο�εί να π�οσθέσει {{PLURAL:$2|ομάδα|ομάδες}}: $1',
+'listgrouprights-removegroup'     => 'Μπο�εί να αφαι�έσει {{PLURAL:$2|ομάδα|ομάδες}}: $1',
+'listgrouprights-addgroup-all'    => 'Μπο�εί να π�οσθέσει όλες τις ομάδες',
+'listgrouprights-removegroup-all' => 'Μπο�εί να αφαι�έσει όλες τις ομάδες',
 
 # E-mail user
-'mailnologin'     => 'Δεν υπά�χει διε�θυνση πα�αλήπτη.',
-'mailnologintext' => 'Π�έπει να έχετε [[Special:UserLogin|συνδεθεί]] και να έχετε δηλώσει
+'mailnologin'      => 'Δεν υπά�χει διε�θυνση πα�αλήπτη.',
+'mailnologintext'  => 'Π�έπει να έχετε [[Special:UserLogin|συνδεθεί]] και να έχετε δηλώσει
 μια έγκυ�η ηλεκτ�ονική διε�θυνση στις [[Special:Preferences|Π�οτιμήσεις]]
 για να στείλετε e-mail σε άλλους χ�ήστες.',
-'emailuser'       => 'Στείλτε μήνυμα σε αυτό τον χ�ήστη',
-'emailpage'       => 'Αποστολή μην�ματος ηλεκτ�ονικο� ταχυδ�ομείο στο χ�ήστη',
-'emailpagetext'   => 'Συπλη�ώνοντας την πα�ακάτω φό�μα θα στείλετε ένα μήνυμα εφόσον ο πα�αλήπτης έχει δηλώσει μια έγκυ�η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου στις [[Special:Preferences|π�οτιμήσεις χ�ήστη]] η οποία θα εμφανιστεί ως διε�θυνση αποστολέα του μην�ματος, ο�τως ώστε ο πα�αλήπτης να μπο�έσει να σας απαντήσει.',
-'usermailererror' => 'Σφάλμα ηλεκτ�ονικο� ταχυδ�ομείου:',
-'defemailsubject' => 'Ηλεκτ�ονικό ταχυδ�ομείο {{SITENAME}}',
-'noemailtitle'    => 'Δεν υπά�χει ηλεκτ�ονική διε�θυνση.',
-'noemailtext'     => 'Ο χ�ήστης αυτός δεν έχει δηλώσει την ηλεκτ�ονική του διέθυνση ή έχει επιλέξει να μην δέχεται μην�ματα από άλλους χ�ήστες.',
-'emailfrom'       => 'Από:',
-'emailto'         => 'Π�ος:',
-'emailsubject'    => 'Θέμα:',
-'emailmessage'    => 'Μήνυμα:',
-'emailsend'       => 'Αποστολή',
-'emailccme'       => 'Στείλε μου ένα αντίγ�αφο του μην�ματός μου με ηλεκτ�ονικό ταχυδ�ομείο.',
-'emailccsubject'  => 'Αντίγ�αφο του μηνυματός σας στο $1: $2',
-'emailsent'       => 'Το μήνυμα έχει σταλεί',
-'emailsenttext'   => 'Το μήνυμά σας έχει σταλεί.',
+'emailuser'        => 'Στείλτε μήνυμα σε αυτό τον χ�ήστη',
+'emailpage'        => 'Αποστολή μην�ματος ηλεκτ�ονικο� ταχυδ�ομείο στο χ�ήστη',
+'emailpagetext'    => 'Συπλη�ώνοντας την πα�ακάτω φό�μα θα στείλετε ένα μήνυμα εφόσον έχετε δηλώσει μια έγκυ�η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου στις [[Special:Preferences|π�οτιμήσεις χ�ήστη]]. Αυτή θα εμφανιστεί ως διε�θυνση αποστολέα του μην�ματος, ο�τως ώστε ο πα�αλήπτης να μπο�έσει να σας απαντήσει.',
+'usermailererror'  => 'Σφάλμα ηλεκτ�ονικο� ταχυδ�ομείου:',
+'defemailsubject'  => 'Ηλεκτ�ονικό ταχυδ�ομείο {{SITENAME}}',
+'noemailtitle'     => 'Δεν υπά�χει ηλεκτ�ονική διε�θυνση.',
+'noemailtext'      => 'Ο χ�ήστης αυτός δεν έχει δηλώσει μια έγκυ�η ηλεκτ�ονική διε�θυνση',
+'nowikiemailtitle' => 'Δεν επιτ�έπεται e-mail',
+'nowikiemailtext'  => 'Αυτός ο χ�ήστης έχει επιλέξει να μη δέχεται μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου από άλλους χ�ήστες.',
+'email-legend'     => 'Αποστολή μην�ματος ηλ. ταχυδ�ομείου σε έναν άλλο χ�ήστη του βίκι {{SITENAME}}',
+'emailfrom'        => 'Από:',
+'emailto'          => 'Π�ος:',
+'emailsubject'     => 'Θέμα:',
+'emailmessage'     => 'Μήνυμα:',
+'emailsend'        => 'Αποστολή',
+'emailccme'        => 'Στείλε μου ένα αντίγ�αφο του μην�ματός μου με ηλεκτ�ονικό ταχυδ�ομείο.',
+'emailccsubject'   => 'Αντίγ�αφο του μηνυματός σας στο $1: $2',
+'emailsent'        => 'Το μήνυμα έχει σταλεί',
+'emailsenttext'    => 'Το μήνυμά σας έχει σταλεί.',
+'emailuserfooter'  => 'Αυτό το ηλεκτ�ονικό μήνυμα στάλθηκε από τον/την "$1" στον τον/την "$2" μέσω της λειτου�γίας "αποστολής μηνυμάτων" στο {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Λίστα πα�ακολο�θησης',
@@ -1570,12 +1916,7 @@ $2',
 'iteminvalidname'      => 'Π�όβλημα με το στοιχείο "$1", άκυ�ο όνομα...',
 'wlnote'               => "Ακολουθο�ν {{PLURAL:$1|η πιο π�όσφατη αλλαγή|οι '''$1''' πιο π�όσφατες αλλαγές}} κατά τη διά�κεια {{PLURAL:$2|της τελευταίας ώ�ας|των '''$2''' τελευταίων ω�ών}}.",
 'wlshowlast'           => 'Εμφάνιση των τελευταίων $1 ω�ών $2 ημε�ών $3',
-'watchlist-show-bots'  => 'Δείξε τις επεξε�γασίες από bots',
-'watchlist-hide-bots'  => 'Κ��ψε τις επεξε�γασίες από bots',
-'watchlist-show-own'   => 'Δείξε τις επεξε�γασίες μου',
-'watchlist-hide-own'   => 'Κ��ψε τις επεξε�γασίες μου',
-'watchlist-show-minor' => 'Δείξε τις μικ�ής σημασίας επεξε�γασίες',
-'watchlist-hide-minor' => 'Κ��ψε τις μικ�ής σημασίας επεξε�γασίες',
+'watchlist-options'    => 'Επιλογές λίστας πα�ακολο�θησης',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Πα�ακολο�θηση...',
@@ -1615,78 +1956,98 @@ Tο σ�στημα ειδοποίησης του {{SITENAME}}
 Ε�ωτήσεις και πε�ισσότε�ες πλη�οφο�ίες:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Διαγ�αφή σελίδας',
-'confirm'                     => 'Επιβεβαίωση',
-'excontent'                   => "το πε�ιεχόμενο ήταν: '$1'",
-'excontentauthor'             => "το πε�ιεχόμενο ήταν: '$1' (και οι μοναδικές συνεισφο�ές ήταν του '$2')",
-'exbeforeblank'               => "το πε�ιεχόμενο π�ιν απο την εκκαθά�ιση ήταν: '$1'",
-'exblank'                     => 'η σελίδα ήταν κενή',
-'delete-confirm'              => 'Διαγ�αφή του "$1"',
-'delete-legend'               => 'Διαγ�αφή',
-'historywarning'              => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ! Η σελίδα που π�όκειται να διαγ�άψετε έχει ιστο�ικό.<br />',
-'confirmdeletetext'           => 'Π�όκειται να διαγ�άψετε ο�ιστικά από τη βάση δεδομένων μια σελίδα (ή μια εικόνα) μαζί με το ιστο�ικό της. Πα�ακαλο�με επιβεβαιώστε ότι θέλετε π�αγματικά να το κάνετε, ότι αντιλαμβάνεσθε τις συνέπειες και ότι το κάνετε σ�μφωνα με τους [[{{ns:project}}:Κανόνες|Κανόνες]].',
-'actioncomplete'              => 'Η ενέ�γεια ολοκλη�ώθηκε.',
-'deletedtext'                 => 'Η "<nowiki>$1</nowiki>" έχει διαγ�αφεί.
+# Delete
+'deletepage'             => 'Διαγ�αφή σελίδας',
+'confirm'                => 'Επιβεβαίωση',
+'excontent'              => "το πε�ιεχόμενο ήταν: '$1'",
+'excontentauthor'        => "το πε�ιεχόμενο ήταν: '$1' (και οι μοναδικές συνεισφο�ές ήταν του '$2')",
+'exbeforeblank'          => "το πε�ιεχόμενο π�ιν απο την εκκαθά�ιση ήταν: '$1'",
+'exblank'                => 'η σελίδα ήταν κενή',
+'delete-confirm'         => 'Διαγ�αφή του "$1"',
+'delete-legend'          => 'Διαγ�αφή',
+'historywarning'         => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ! Η σελίδα που π�όκειται να διαγ�άψετε έχει ιστο�ικό.<br />',
+'confirmdeletetext'      => 'Π�όκειται να διαγ�άψετε ο�ιστικά από τη βάση δεδομένων μια σελίδα (ή μια εικόνα) μαζί με το ιστο�ικό της. Πα�ακαλο�με επιβεβαιώστε ότι θέλετε π�αγματικά να το κάνετε, ότι αντιλαμβάνεσθε τις συνέπειες και ότι το κάνετε σ�μφωνα με τους [[{{ns:project}}:Κανόνες|Κανόνες]].',
+'actioncomplete'         => 'Η ενέ�γεια ολοκλη�ώθηκε.',
+'deletedtext'            => 'Η "<nowiki>$1</nowiki>" έχει διαγ�αφεί.
 Για το ιστο�ικό των π�όσφατων διαγ�αφών ανατ�έξτε στο σ�νδεσμο $2',
-'deletedarticle'              => 'Η $1 διαγ�άφτηκε.',
-'dellogpage'                  => 'Καταγ�αφές διαγ�αφών',
-'dellogpagetext'              => 'Λίστα των πιο π�όσφατων διαγ�αφών',
-'deletionlog'                 => 'Καταγ�αφές διαγ�αφών',
-'reverted'                    => 'Επαναφο�ά σε π�οηγο�μενη αναθεώ�ηση',
-'deletecomment'               => 'Αιτιολογία διαγ�αφής',
-'deleteotherreason'           => 'Άλλος/π�όσθετος λόγος:',
-'deletereasonotherlist'       => 'Άλλος λόγος',
-'deletereason-dropdown'       => '*Συνηθισμένοι λόγοι διαγ�αφής
+'deletedarticle'         => 'Η $1 διαγ�άφτηκε.',
+'suppressedarticle'      => 'απόκ�υψη του "[[$1]]"',
+'dellogpage'             => 'Καταγ�αφές διαγ�αφών',
+'dellogpagetext'         => 'Λίστα των πιο π�όσφατων διαγ�αφών',
+'deletionlog'            => 'Καταγ�αφές διαγ�αφών',
+'reverted'               => 'Επαναφο�ά σε π�οηγο�μενη αναθεώ�ηση',
+'deletecomment'          => 'Αιτιολογία διαγ�αφής',
+'deleteotherreason'      => 'Άλλος/π�όσθετος λόγος:',
+'deletereasonotherlist'  => 'Άλλος λόγος',
+'deletereason-dropdown'  => '*Συνηθισμένοι λόγοι διαγ�αφής
 ** Αίτηση του δημιου�γο� της
 ** Πα�αβίαση των πνευματικών δικαιωμάτων
 ** Βανδαλισμός',
-'delete-edit-reasonlist'      => 'Επεξε�γασία λόγων διαγ�αφής',
-'delete-toobig'               => 'Αυτή η σελίδα έχει μεγάλο ιστο�ικό τ�οποποιήσεων, πάνω από $1 {{PLURAL:$1|τ�οποποίηση|τ�οποποιήσεις}}.
+'delete-edit-reasonlist' => 'Επεξε�γασία λόγων διαγ�αφής',
+'delete-toobig'          => 'Αυτή η σελίδα έχει μεγάλο ιστο�ικό τ�οποποιήσεων, πάνω από $1 {{PLURAL:$1|τ�οποποίηση|τ�οποποιήσεις}}.
 Η διαγ�αφή τέτοιων σελίδων έχει πε�ιο�ιστεί για την αποφυγή τυχαίας αναστάτωσης του {{SITENAME}}.',
-'delete-warning-toobig'       => 'Αυτή η σελίδα έχει μεγάλο ιστο�ικό τ�οποποιήσεων, πάνω από $1 {{PLURAL:$1|τ�οποποίηση|τ�οποποιήσεις}}.
+'delete-warning-toobig'  => 'Αυτή η σελίδα έχει μεγάλο ιστο�ικό τ�οποποιήσεων, πάνω από $1 {{PLURAL:$1|τ�οποποίηση|τ�οποποιήσεις}}.
 Η διαγ�αφή της μπο�εί να αναστατώσει τη λειτου�γία της βάσης δεδομένων του {{SITENAME}}. Συνιστο�με μεγάλη π�οσοχή.',
-'rollback'                    => 'Επαναφο�ά επεξε�γασιών',
-'rollback_short'              => 'Επαναφο�ά',
-'rollbacklink'                => 'Επαναφο�ά στην π�οηγο�μενη',
-'rollbackfailed'              => 'Η επαναφο�ά απέτυχε.',
-'cantrollback'                => 'Δεν είναι δυνατή η αναί�εση αυτής της αλλαγής, π�όκειται για την α�χική ενέ�γεια δημιου�γίας της σελίδας.',
-'alreadyrolled'               => 'Αδ�νατον να αναι�εθεί η τελευταία αλλαγή της σελίδας [[:$1]] από το χ�ήστη ([[User:$2|$2]] ([[User talk:$2|Συζήτηση]]) | [[Special:Contributions/$2|{{int:contribslink}}]]), διότι κάποιος έχει ήδη αναι�έσει την αλλαγή ή έχει αλλάξει εκ νέου τη σελίδα.
-
-Τελευταία αλλαγή από το χ�ήστη ([[User:$3|$3]] ([[User talk:$3|Συζήτηση]]) | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Το σχόλιο της επεξε�γασίας ήταν: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Ανάκληση των αλλαγών $2 (επιστ�οφή στην π�οηγο�μενη αναθεώ�ηση $1)', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Ανεστ�αμμένες εκδόσεις από $1, αλλάχθηκαν στην π�οηγο�μενη έκδοση από $2.',
-'sessionfailure'              => 'Υπά�χει π�όβλημα με τη σ�νδεσή σας -η ενέ�γεια αυτή ακυ�ώθηκε π�οληπτικά για την αντιμετώπιση τυχόν πει�ατείας συνόδου (session hijacking). Πα�ακαλo�με πατήστε "Επιστ�οφή", ξαναφο�τώστε τη σελίδα από την οποία φθάσατε εδώ και π�οσπαθήστε ξανά.',
+
+# Rollback
+'rollback'         => 'Επαναφο�ά επεξε�γασιών',
+'rollback_short'   => 'Επαναφο�ά',
+'rollbacklink'     => 'Επαναφο�ά στην π�οηγο�μενη',
+'rollbackfailed'   => 'Η επαναφο�ά απέτυχε.',
+'cantrollback'     => 'Δεν είναι δυνατή η αναί�εση αυτής της αλλαγής, π�όκειται για την α�χική ενέ�γεια δημιου�γίας της σελίδας.',
+'alreadyrolled'    => 'Αδ�νατον να αναι�εθεί η τελευταία αλλαγή της σελίδας [[:$1]] από το χ�ήστη ([[User:$2|$2]] ([[User talk:$2|Συζήτηση]]){{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]), διότι κάποιος έχει ήδη αναι�έσει την αλλαγή ή έχει αλλάξει εκ νέου τη σελίδα.
+
+Τελευταία αλλαγή από το χ�ήστη ([[User:$3|$3]] ([[User talk:$3|Συζήτηση]]){{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Το σχόλιο της επεξε�γασίας ήταν: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Ανάκληση των αλλαγών $2 (επιστ�οφή στην π�οηγο�μενη αναθεώ�ηση $1)', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Ανεστ�αμμένες εκδόσεις από $1, αλλάχθηκαν στην π�οηγο�μενη έκδοση από $2.',
+'sessionfailure'   => 'Υπά�χει π�όβλημα με τη σ�νδεσή σας -η ενέ�γεια αυτή ακυ�ώθηκε π�οληπτικά για την αντιμετώπιση τυχόν πει�ατείας συνόδου (session hijacking). Πα�ακαλo�με πατήστε "Επιστ�οφή", ξαναφο�τώστε τη σελίδα από την οποία φθάσατε εδώ και π�οσπαθήστε ξανά.',
+
+# Protect
 'protectlogpage'              => 'Καταγ�αφές π�οστασίας (κλειδώματος)',
 'protectlogtext'              => 'Ακολουθεί κατάλογος ενε�γειών κλειδώματος και ξεκλειδώματος σελίδων.
 (Βλ. [[{{ns:project}}:Σελίδες_υπό_π�οστασία]] για πε�ισσότε�ες πλη�οφο�ίες).',
 'protectedarticle'            => 'κλείδωσε το $1',
 'modifiedarticleprotection'   => 'αλλαγή επιπέδου π�οστασίας για "[[$1]]"',
 'unprotectedarticle'          => 'έχει α�θεί η π�οστασία του $1',
+'movedarticleprotection'      => 'μετακινήθηκαν οι �υθμίσεις π�οστασίας από "[[$2]]" σε "[[$1]]"',
 'protect-title'               => 'Κλειδώνεται η "$1"',
+'prot_1movedto2'              => 'Η [[$1]] μετακινήθηκε στη θέση [[$2]]',
 'protect-legend'              => 'Επιβεβαίωση κλειδώματος',
 'protectcomment'              => 'Αιτιολογία π�οστασίας',
 'protectexpiry'               => 'Λήξη',
 'protect_expiry_invalid'      => 'Ο χ�όνος λήξης είναι άκυ�ος.',
 'protect_expiry_old'          => 'Ο χ�όνος λήξης αναφέ�εται στο πα�ελθόν.',
 'protect-unchain'             => 'Ξεκλείδωσε τα δικαιώματα μετακίνησης',
-'protect-text'                => 'Μπο�είτε να δείτε και να αλλάξετε το επίπεδο π�οστασίας εδώ για τη σελίδα <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Δεν μπο�είτε να αλλάξετε επίπεδα π�οστασίας ενώ είστε σε φ�αγή.
-Εδώ είναι οι τ�έχουσες �υθμίσεις για τη σελίδα <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Τα επίπεδα π�οστασίας δεν μπο�ο�ν να αλλαχθο�ν λόγω ενός ενε�γο� κλεδώματος της βάσης δεδομένων.
-Εδώ είναι οι τ�έχουσες �υθμίσεις για τη σελίδα <strong>$1</strong>:',
-'protect-locked-access'       => 'Ο λογα�ιασμός σας δεν έχει δικαίωμα να αλλάξει τα επίπεδα π�οστασίας σελίδας.
-Εδώ είναι οι τ�έχουσες �υθμίσεις για τη σελίδα <strong>$1</strong>:',
+'protect-text'                => "Μπο�είτε να δείτε και να αλλάξετε το επίπεδο π�οστασίας εδώ για τη σελίδα '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Δεν μπο�είτε να αλλάξετε επίπεδα π�οστασίας ενώ είστε σε φ�αγή.
+Εδώ είναι οι τ�έχουσες �υθμίσεις για τη σελίδα '''$1''':",
+'protect-locked-dblock'       => "Τα επίπεδα π�οστασίας δεν μπο�ο�ν να αλλαχθο�ν λόγω ενός ενε�γο� κλεδώματος της βάσης δεδομένων.
+Εδώ είναι οι τ�έχουσες �υθμίσεις για τη σελίδα '''$1''':",
+'protect-locked-access'       => "Ο λογα�ιασμός σας δεν έχει δικαίωμα να αλλάξει τα επίπεδα π�οστασίας σελίδας.
+Εδώ είναι οι τ�έχουσες �υθμίσεις για τη σελίδα '''$1''':",
 'protect-cascadeon'           => 'Αυτή η σελίδα είναι π�ος το πα�όν π�οστατευμένη επειδή πε�ιλαμβάνεται {{PLURAL:$1|στην ακόλουθη σελίδα, η οποία έχει|στις ακόλουθες σελίδες, οι οποίες έχουν}} τη διαδοχική π�οστασία ενε�γοποιημένη. Μπο�είτε να αλλάξετε το επίπεδο π�οστασίας αυτής της σελίδας, αλλά δεν θα επη�εάσει τη διαδοχική π�οστασία.',
-'protect-default'             => '(π�οεπιλεγμένο)',
+'protect-default'             => '�α επιτ�έπονται όλοι οι χ�ήστες',
 'protect-fallback'            => 'Αίτηση δικαιωμάτων "$1"',
-'protect-level-autoconfirmed' => 'Φ�άξε μη εγγεγ�αμμένους χ�ήστες',
+'protect-level-autoconfirmed' => 'Φ�αγή νέων καθώς και μη εγγεγ�αμμένων χ�ηστών',
 'protect-level-sysop'         => 'Μόνο διαχει�ιστές',
 'protect-summary-cascade'     => 'διαδοχική',
 'protect-expiring'            => 'λήγει στις $1 (UTC)',
+'protect-expiry-indefinite'   => "επ' αό�ιστο",
 'protect-cascade'             => 'Διαδοχική π�οστασία - π�οστάτευσε όποιες σελίδες πε�ιλαμβάνονται σε αυτή τη σελίδα.',
 'protect-cantedit'            => 'Δεν μπο�είτε να αλλάξετε τα επίπεδα π�οστασίας αυτής της σελίδας, διότι δεν έχετε την άδεια να την επεξε�γαστείτε.',
+'protect-othertime'           => 'Άλλο χ�ονικό διάστημα:',
+'protect-othertime-op'        => 'άλλος χ�όνος',
+'protect-existing-expiry'     => 'Υπά�χουσα λήξη π�οθεσμίας: $3, $2',
+'protect-otherreason'         => 'Άλλος/π�όσθετος λόγος:',
+'protect-otherreason-op'      => 'άλλος/π�όσθετος λόγος',
+'protect-dropdown'            => '*Συνήθεις λόγοι π�οστασίας
+** Υπε�βολικός βανδαλισμός
+** Υπε�βολικό spamming
+** Αντιπα�αγωγική μάχη επεξε�γασιών
+** Σελίδα μεγάλης κίνησης',
+'protect-edit-reasonlist'     => 'Επεξε�γασία λόγων π�οστασίας',
+'protect-expiry-options'      => '1 ώ�α:1 hour,1 ημέ�α:1 day,1 εβδομάδα:1 week,2 εβδομάδες:2 weeks,1 μήνα:1 month,3 μήνες:3 months,6 μήνες:6 months,1 χ�όνο:1 year,αό�ιστα:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Δικαίωμα:',
 'restriction-level'           => 'Επίπεδο πε�ιο�ισμο�:',
 'minimum-size'                => 'Ελάχιστο μέγεθος',
@@ -1709,7 +2070,7 @@ Tο σ�στημα ειδοποίησης του {{SITENAME}}
 'undeletepage'                 => 'Εμφάνιση και αποκατάσταση σελίδων που έχουν διαγ�αφεί',
 'undeletepagetitle'            => "'''Οι ακόλουθες είναι διαγ�αμμένες επεξε�γασίες του [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Εμφάνιση διεγ�αμμένων σελίδων',
-'undeletepagetext'             => 'Οι σελίδες που ακολουθο�ν έχουν διαγ�αφεί αλλά β�ίσκονται ακόμα αποθηκευμένες στο α�χείο και μπο�ο�ν να αποκατασταθο�ν. (Κατά και�ο�ς γίνεται εκκαθά�ιση του α�χείου.)',
+'undeletepagetext'             => '{{PLURAL:$1|Η σελίδα που ακολουθεί έχει|$1 Οι σελίδες που ακολουθο�ν έχουν}} διαγ�αφεί αλλά {{PLURAL:β�ίσκεται|β�ίσκονται}} ακόμα {{PLURAL:αποθηκευμένη|αποθηκευμένες}} στο α�χείο και {{PLURAL:μπο�εί να αποκατασταθεί|μπο�ο�ν να αποκατασταθο�ν}}. Κατά και�ο�ς γίνεται εκκαθά�ιση του α�χείου.',
 'undelete-fieldset-title'      => 'Αποκατάσταση αναθεω�ήσεων',
 'undeleteextrahelp'            => "Για να επαναφέ�ετε ολόκλη�ο το ιστο�ικό της σελίδας, αφήστε όλα τα κουτιά επιλογής ατσεκά�ιστα και κάντε κλικ στο κουμπί '''''Επαναφο�ά'''''. 
 Για να εκτελέσετε μια επιλεκτική επαναφο�ά, τσεκά�ετε τα κουτιά που αντιστοιχο�ν στις
@@ -1723,13 +2084,14 @@ Tο σ�στημα ειδοποίησης του {{SITENAME}}
 'undeletehistorynoadmin'       => 'Αυτό το ά�θ�ο έχει διαγ�αφεί. Ο λόγος για τη διαγ�αφή φαίνεται
 στη σ�νοψη πα�ακάτω, μαζί με λεπτομέ�ειες των χ�ηστών που επεξε�γάστηκαν τη σελίδα
 π�ιν τη διαγ�αφή. Το α�χικό κείμενο αυτών των διεγ�αμμένων αναθεω�ήσεων είναι διαθέσιμο μόνο στους διαχει�ιστές.',
-'undelete-revision'            => 'Διαγ�αμμένη αναθεώ�ηση του $1 (από $2) από $3:',
+'undelete-revision'            => 'Διαγ�αμμένη αναθεώ�ηση του $1 (από $4, στις $5) από $3:',
 'undeleterevision-missing'     => 'Άκυ�η ή αν�πα�κτη αναθεώ�ηση. Μπο�εί να έχετε έναν κακό σ�νδεσμο, ή η
 αναθεώ�ηση μπο�εί να έχει επαναφε�θεί ή αφαι�εθεί από το α�χείο.',
 'undelete-nodiff'              => 'Δεν β�έθηκε π�οηγο�μενη αναθεώ�ηση.',
 'undeletebtn'                  => 'Επαναφο�ά',
 'undeletelink'                 => 'επαναφο�ά',
 'undeletereset'                => 'Ανανέωση',
+'undeleteinvert'               => 'Ανατ�οπή επιλογής',
 'undeletecomment'              => 'Σχόλιο:',
 'undeletedarticle'             => 'αποκατάσταση "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|τ�οποποίηση|τ�οποποιήσεις}} αποκαταστάθηκαν',
@@ -1761,26 +2123,27 @@ $1',
 'blanknamespace' => '(Α�χική πε�ιοχή)',
 
 # Contributions
-'contributions' => 'Συνεισφο�ές χ�ήστη',
-'mycontris'     => 'Οι π�οσθήκες μου',
-'contribsub2'   => 'Για τον/την $1 ($2)',
-'nocontribs'    => 'Δεν β�έθηκαν αλλαγές με αυτά τα κ�ιτή�ια.',
-'uctop'         => '(τελευταία)',
-'month'         => 'Από τον μήνα (και νω�ίτε�α):',
-'year'          => 'Από τη χ�ονιά (και νω�ίτε�α):',
-
-'sp-contributions-newbies'     => 'Εμφάνισε τις συνεισφο�ές μόνο των νέων λογα�ιασμών',
-'sp-contributions-newbies-sub' => 'Για νέους λογα�ιασμο�ς',
-'sp-contributions-blocklog'    => 'Α�χείο καταγ�αφής φ�αγών',
-'sp-contributions-search'      => 'Αναζήτηση για συνεισφο�ές',
-'sp-contributions-username'    => 'Διε�θυνση IP ή όνομα χ�ήστη:',
-'sp-contributions-submit'      => 'Αναζήτηση',
+'contributions'       => 'Συνεισφο�ές χ�ήστη',
+'contributions-title' => 'Συνεισφο�ές του χ�ήστη $1',
+'mycontris'           => 'Οι συνεισφο�ές μου',
+'contribsub2'         => 'Για τον/την $1 ($2)',
+'nocontribs'          => 'Δεν β�έθηκαν αλλαγές με αυτά τα κ�ιτή�ια.',
+'uctop'               => '(τελευταία)',
+'month'               => 'Από τον μήνα (και νω�ίτε�α):',
+'year'                => 'Από τη χ�ονιά (και νω�ίτε�α):',
+
+'sp-contributions-newbies'       => 'Εμφάνισε τις συνεισφο�ές μόνο των νέων λογα�ιασμών',
+'sp-contributions-newbies-sub'   => 'Για νέους λογα�ιασμο�ς',
+'sp-contributions-newbies-title' => 'Συνεισφο�ές χ�ηστών για νέους λογα�ιασμο�ς',
+'sp-contributions-blocklog'      => 'Α�χείο καταγ�αφής φ�αγών',
+'sp-contributions-search'        => 'Αναζήτηση για συνεισφο�ές',
+'sp-contributions-username'      => 'Διε�θυνση IP ή όνομα χ�ήστη:',
+'sp-contributions-submit'        => 'Αναζήτηση',
 
 # What links here
 'whatlinkshere'            => 'Αναφο�ές στη σελίδα',
 'whatlinkshere-title'      => 'Σελίδες που συνδέουν στη σελίδα "$1"',
 'whatlinkshere-page'       => 'Σελίδα:',
-'linklistsub'              => '(Κατάλογος συνδέσμων)',
 'linkshere'                => "Οι ακόλουθες σελίδες συνδέουν στη σελίδα '''[[:$1]]''':",
 'nolinkshere'              => "Δεν υπά�χουν σελίδες που να συνδέουν στη σελίδα '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Καμία σελίδα δεν συνδέει στο '''[[:$1]]''' στη επιλεγμένη πε�ιοχή ονομάτων.",
@@ -1791,6 +2154,7 @@ $1',
 'whatlinkshere-next'       => '{{PLURAL:$1|επόμενη|επόμενες $1}}',
 'whatlinkshere-links'      => '� συνδέσεις',
 'whatlinkshere-hideredirs' => '$1 ανακατευθ�νσεις',
+'whatlinkshere-hidetrans'  => '$1 υπε�κλεισμοί',
 'whatlinkshere-hidelinks'  => '$1 συνδέσμων',
 'whatlinkshere-hideimages' => '$1 σ�νδεσμοι εικόνων',
 'whatlinkshere-filters'    => 'Φίλτ�α',
@@ -1825,6 +2189,8 @@ $1',
 'ipbotherreason'                  => 'Άλλος/επιπλέον λόγος:',
 'ipbhidename'                     => 'Απόκ�υψη ονόματος χ�ήστη από το α�χείο καταγ�αφής φ�αγών, την ενε�γή λίστα φ�αγών και τη λίστα χ�ηστών.',
 'ipbwatchuser'                    => "Πα�ακολο�θηση των σελίδων 'χ�ήστη' και 'συζήτησης χ�ήστη' αυτο� του χ�ήστη",
+'ipballowusertalk'                => "Επιτ�έψτε σ' αυτόν τον χ�ήστη να επεξε�γαστεί την π�οσωπική του σελίδα συζήτησης ενώ είναι φ�αγμένος",
+'ipb-change-block'                => 'Επαναφ�αγή του χ�ήστη με αυτές τις �υθμίσεις',
 'badipaddress'                    => 'Άκυ�η διε�θυνση IP.',
 'blockipsuccesssub'               => 'Η φ�αγή ολοκλη�ώθηκε επιτυχώς.',
 'blockipsuccesstext'              => 'Η διε�θυνση "$1" έχει υποστεί φ�αγή. <br />Δείτε τη [[Special:IPBlockList|λίστα διευθ�νσεων IP που έχουν υποστεί φ�αγή]] για να το επιβεβαιώσετε.',
@@ -1833,30 +2199,38 @@ $1',
 'ipb-unblock'                     => 'Τε�μάτισε τη φ�αγή για ένα όνομα χ�ήστη ή μια διε�θυνση IP',
 'ipb-blocklist-addr'              => 'Δες τις υπά�χουσες φ�αγές για $1',
 'ipb-blocklist'                   => 'Δες τις υπά�χουσες φ�αγές',
+'ipb-blocklist-contribs'          => 'Συνεισφο�ές για τον/την $1',
 'unblockip'                       => 'Ά�ση φ�αγής χ�ήστη',
 'unblockiptext'                   => 'Χ�ησιμοποιήστε την πα�ακάτω φό�μα για να αποκαταστήσετε την π�όσβαση σε επεξε�γασία, σε μια διε�θυνση IP ή σε ένα χ�ήστη που είχε αποκλειστεί με φ�αγή.',
-'ipusubmit'                       => 'Ά�ση φ�αγής αυτής της διε�θυνσης',
+'ipusubmit'                       => 'Ά�ση φ�αγής',
 'unblocked'                       => 'Η φ�αγή για τον/την [[User:$1|$1]] έχει τε�ματιστεί',
 'unblocked-id'                    => 'Η φ�αγή του $1 έχει τε�ματιστεί',
-'ipblocklist'                     => 'Φ�αγμένες διευθ�νσεις IP και ονόματα χ�ηστών.',
+'ipblocklist'                     => 'Φ�αγμένες διευθ�νσεις IP και ονόματα χ�ηστών',
 'ipblocklist-legend'              => 'Ε��εση ενός χ�ήστη που έχει υποστεί φ�αγή',
 'ipblocklist-username'            => 'Όνομα χ�ήστη ή διε�θυνση IP:',
+'ipblocklist-sh-userblocks'       => 'Φ�αγές του λογα�ιασμο� $1',
+'ipblocklist-sh-tempblocks'       => 'Π�οσω�ινές φ�αγές του λογα�ιασμο� $1',
+'ipblocklist-sh-addressblocks'    => '$1 μονός αποκλεισμός IP',
 'ipblocklist-submit'              => 'Αναζήτηση',
-'blocklistline'                   => 'Φ�αγή του/της $3 από τους $1, $2 (λήγει $4)',
+'blocklistline'                   => '$1, ο/η $2 έφ�αξε τον/την $3 ($4)',
 'infiniteblock'                   => 'αό�ιστη',
 'expiringblock'                   => 'λήγει στις $1',
 'anononlyblock'                   => 'μόνο τους ανώνυμους',
 'noautoblockblock'                => 'αυτόματη φ�αγή απενε�γοποιημένη',
 'createaccountblock'              => 'δημιου�γία λογα�ιασμο� μπλοκα�ισμένη',
 'emailblock'                      => 'Το ηλεκτ�ονικό ταχυδ�ομείο έχει φ�αγεί',
+'blocklist-nousertalk'            => 'δεν μπο�ο�ν να επεξε�γαστο�ν τη σελίδα συζήτησής τους',
 'ipblocklist-empty'               => 'Η λίστα φ�αγών είναι άδεια.',
 'ipblocklist-no-results'          => 'Η ζητο�μενη διε�θυνση IP ή το όνομα χ�ήστη δεν είναι φ�αγμένα.',
 'blocklink'                       => 'φ�αγή',
 'unblocklink'                     => 'Ά�ση φ�αγής',
+'change-blocklink'                => 'αλλαγή φ�αγής',
 'contribslink'                    => 'Συνεισφο�ές/Π�οσθήκες',
 'autoblocker'                     => 'Έχετε υποστεί αυτόματα φ�αγή από το σ�στημα επειδή χ�ησιμοποιείτε την ίδια διε�θυνση IP με το χ�ήστη "$1". Αιτιολογία "$2".',
 'blocklogpage'                    => 'Α�χείο καταγ�αφής φ�αγών',
-'blocklogentry'                   => 'O/H "[[$1]]" φ�άχθηκε με χ�όνο λήξης $2 $3',
+'blocklog-fulllog'                => 'Πλή�ης κατάλογος φ�αγών',
+'blocklogentry'                   => 'O/H [[$1]] φ�άχθηκε με χ�όνο λήξης $2 $3',
+'reblock-logentry'                => 'άλλαξε τις �υθμίσεις φ�αγής για τον/την [[$1]] με χ�όνο λήξης $2 $3',
 'blocklogtext'                    => 'Σε αυτή τη σελίδα υπά�χουν οι καταγ�αφές φ�αγής και κατά�γησης φ�αγής των χ�ηστών (α�χείο γεγονότων).
 
 <br />Δεν συμπε�ιλαμβάνονται οι διευθ�νσεις IP που υπέστησαν αυτόματα φ�αγή. <br />Στο σ�νδεσμο [[Special:IPBlockList|διευθ�νσεις IP που έχουν υποστεί φ�αγή]] θα β�είτε τον πλή�η κατάλογο με τις τ�έχουσες φ�αγές.',
@@ -1865,10 +2239,14 @@ $1',
 'block-log-flags-nocreate'        => 'δημιου�γία λογα�ιασμο� απενε�γοποιημένη',
 'block-log-flags-noautoblock'     => 'αυτόματη φ�αγή απενε�γοποιημένη',
 'block-log-flags-noemail'         => 'Το ηλεκτ�ονικό ταχυδ�ομείο έχει φ�αγεί',
+'block-log-flags-nousertalk'      => 'δεν μπο�εί να επεξε�γαστεί τη σελίδα συζήτησής του',
 'block-log-flags-angry-autoblock' => 'ενισχυμένος αυτόματος αποκλεισμός ενε�γοποιημένος',
 'range_block_disabled'            => 'Η δυνατότητα του διαχει�ιστή να δημιου�γεί πε�ιοχές φ�αγής είναι απενε�γοποιημένη.',
 'ipb_expiry_invalid'              => 'Άκυ�ος χ�όνος λήξης',
+'ipb_expiry_temp'                 => 'Οι κ�υμμένες φ�αγές ονομάτων χ�ηστών π�έπει να είναι μόνιμες.',
 'ipb_already_blocked'             => 'Η διε�θυνση IP "$1" είναι ήδη φ�αγμένη',
+'ipb-needreblock'                 => '== Ἠδη αποκλεισμένη ==
+$1 είναι ήδη αποκλεισμένη. Θέλετε να αλλάξετε τις �υθμίσεις?',
 'ipb_cant_unblock'                => 'Σφάλμα: Ο α�ιθμός αναγνώ�ισης φ�αγής $1 δεν β�έθηκε. Μπο�εί να έχει ξεμπλοκα�ιστεί ήδη.',
 'ipb_blocked_as_range'            => 'Σφάλμα! Η φ�αγή της διε�θυνσης IP $1 δεν είναι άμεση και δεν μπο�εί να α�θεί. Όμως αποτελεί μέ�ος της πε�ιοχής $2, της οποίας η φ�αγή μπο�εί να α�θεί.',
 'ip_range_invalid'                => 'Το ε��ος των διευθ�νσεων IP δεν είναι έγκυ�ο.',
@@ -1879,6 +2257,7 @@ $1',
 'proxyblocksuccess'               => 'Ολοκλη�ώθηκε!',
 'sorbsreason'                     => 'Η διε�θνυση IP σας έχει χα�ακτη�ισθεί ως open proxy στο DNSBL.',
 'sorbs_create_account_reason'     => 'Η διε�θυνση IP σας έχει χα�ακτη�ισθεί open proxy στο DNSBL. Δεν μπο�είτε να δημιου�γήσετε λογα�ιασμό χ�ήστη.',
+'cant-block-while-blocked'        => 'Δεν μπο�είτε να φ�άξετε άλλους χ�ήστες ενώ είστε φ�αγμένος/η.',
 
 # Developer tools
 'lockdb'              => 'Κλείδωμα βάσης δεδομένων',
@@ -1899,9 +2278,9 @@ $1',
 'databasenotlocked'   => 'Η βάση δεδομένων δεν είναι κλειδωμένη.',
 
 # Move page
-'move-page'               => 'Μετακίνηση $1',
-'move-page-legend'        => 'Μετακίνηση σελίδας',
-'movepagetext'            => "Χ�ησιμοποιώντας τη φό�μα που ακολουθεί μπο�είτε να μετονομάσετε σελίδες και να μεταφέ�ετε όλο το ιστο�ικό τους στο νέο όνομα.
+'move-page'                    => 'Μετακίνηση $1',
+'move-page-legend'             => 'Μετακίνηση σελίδας',
+'movepagetext'                 => "Χ�ησιμοποιώντας τη φό�μα που ακολουθεί μπο�είτε να μετονομάσετε σελίδες και να μεταφέ�ετε όλο το ιστο�ικό τους στο νέο όνομα.
 Ο παλιός τίτλος της σελίδας θα γίνει μια σελίδα ανακατε�θυνσης στο νέο τίτλο.
 Μπο�είτε να ενημε�ώσετε τις ανακατευθ�νσεις που οδηγο�ν στον α�χικό τίτλο αυτόματα.
 Αν επιλέξετε να μην γίνει, θα π�έπει να ελέγξετε τις [[Special:DoubleRedirects|διπλές]] και τις [[Special:BrokenRedirects|κατεστ�αμμένες ανακατευθ�νσεις]].
@@ -1913,43 +2292,61 @@ $1',
 '''ΠΡΟΣΟΧΗ!'''
 Η μετονομασία σελίδας είναι μια αιφνίδια και δ�αστική αλλαγή όταν π�όκειται για δημοφιλείς σελίδες.
 Πα�ακαλο�με, π�ιν το αποφασίσετε, να εξετάσετε π�οσεκτικά τις πιθανές επιπτώσεις αυτής της ενέ�γειας.",
-'movepagetalktext'        => "Η σελίδα συζήτησης που αντιστοιχεί, εάν υπά�χει, θα μετακινηθεί αυτόματα μαζί με αυτήν '''έκτός αν:'''
+'movepagetalktext'             => "Η σελίδα συζήτησης που αντιστοιχεί, εάν υπά�χει, θα μετακινηθεί αυτόματα μαζί με αυτήν '''έκτός αν:'''
 *Μετακινείτε τη σελίδα σε διαφο�ετική πε�ιοχή (namespace),
 *Υπά�χει κάτω από το νέο όνομα μια σελίδα συζήτησης που δεν είναι κενή, ή
 *Έχετε αφαι�έσει τη σημείωση (check) από το κουτάκι που υπά�χει πα�ακάτω.
 
 Σε αυτές τις πε�ιπτώσεις, θα π�έπει να μετακινήσετε (ή να ενσωματώσετε αν το θέλετε) τη σελίδα με αντιγ�αφή-και-επικόλληση.",
-'movearticle'             => 'Μετακίνηση σελίδας',
-'movenotallowed'          => 'Δεν έχετε άδεια να μετακινείτε σελίδες.',
-'newtitle'                => 'νέος τίτλος',
-'move-watch'              => 'Πα�ακολο�θησε αυτή τη σελίδα',
-'movepagebtn'             => 'Μετακίνηση σελίδας',
-'pagemovedsub'            => 'Η μετακίνηση ήταν επιτυχής',
-'movepage-moved'          => '<big>\'\'\'"$1" μεταφέ�θηκε στο "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Υπά�χει ήδη σελίδα με αυτό το όνομα. Πα�ακαλο�με δώστε άλλο όνομα στη σελίδα.',
-'cantmove-titleprotected' => "Δεν μπο�είτε να μετακινήσετε μια σελίδα σ' αυτή τη θέση διότι έχει απαγο�ευθεί η δημιου�γία αυτο� του τίτλου",
-'talkexists'              => "Η ίδια η σελίδα μετακινήθηκε επιτυχώς αλλά όχι και η σελίδα συζήτησης, λόγω του ότι υπά�χει ήδη άλλη σελίδα συζήτησης κάτω από το νέο τίτλο. Πα�ακαλο�με ενοποιήστε τις δ�ο σελίδες με 'αντιγ�αφή-και-επικόλληση'.",
-'movedto'                 => 'Μετακινήθηκε στο',
-'movetalk'                => 'Μετακίνηση της σελίδας "συζήτηση" (εάν υπά�χει)',
-'move-subpages'           => 'Μετακινήστε όλες τις υποσελίδες, εάν υπά�χουν',
-'move-talk-subpages'      => 'Μετακινήστε όλες τις υποσελίδες μιας σελίδας συζήτησης, εάν υπά�χουν',
-'movepage-page-moved'     => 'Η σελίδα $1 μετακινήθηκε στο $2.',
-'movepage-page-unmoved'   => 'Η σελίδα $1 δεν μπό�εσε να μετακινηθεί στο $2.',
-'1movedto2'               => 'Η [[$1]] μετακινήθηκε στη θέση [[$2]]',
-'1movedto2_redir'         => 'Η $1 μετακινήθηκε στη θέση $2 (με ανακατε�θυνση)',
-'movelogpage'             => 'Α�χείο καταγ�αφής μετακινήσεων',
-'movelogpagetext'         => 'Ακολουθεί η λίστα με τις σελίδες που έχουν μετακινηθεί.',
-'movereason'              => 'Αιτιολογία',
-'revertmove'              => 'επαναφο�ά',
-'delete_and_move'         => 'Διαγ�αφή και μετακίνηση',
-'delete_and_move_text'    => '==Χ�ειάζεται διαγ�αφή.==
+'movearticle'                  => 'Μετακίνηση σελίδας',
+'movenologin'                  => 'Δεν έχετε συνδεθεί.',
+'movenologintext'              => 'Για να μετακινήσετε μια σελίδα π�έπει να είστε εγγεγ�αμένος χ�ήστης και [[Special:UserLogin|να έχετε συνδεθεί]] στο Wiκi.',
+'movenotallowed'               => 'Δεν έχετε άδεια να μετακινείτε σελίδες.',
+'movenotallowedfile'           => 'Δεν έχετε άδεια να μετακινείτε α�χεία.',
+'cant-move-user-page'          => 'Δεν έχετε άδεια για να μετακινήσετε σελίδες χ�ηστών (πα�ά μόνο υποσελίδες).',
+'cant-move-to-user-page'       => 'Δεν έχετε άδεια για να μετακινήσετε μια σελίδα σε σελίδα χ�ήστη (πα�ά μόνο σε υποσελίδα χ�ήστη).',
+'newtitle'                     => 'νέος τίτλος',
+'move-watch'                   => 'Πα�ακολο�θησε αυτή τη σελίδα',
+'movepagebtn'                  => 'Μετακίνηση σελίδας',
+'pagemovedsub'                 => 'Η μετακίνηση ήταν επιτυχής',
+'movepage-moved'               => '<big>\'\'\'"$1" μεταφέ�θηκε στο "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Δημιου�γήθηκε μια ανακατε�θυνση.',
+'movepage-moved-noredirect'    => 'Η δημιου�γία ανακατε�θυνσης πα�εμποδίστηκε.',
+'articleexists'                => 'Υπά�χει ήδη σελίδα με αυτό το όνομα. Πα�ακαλο�με δώστε άλλο όνομα στη σελίδα.',
+'cantmove-titleprotected'      => "Δεν μπο�είτε να μετακινήσετε μια σελίδα σ' αυτή τη θέση διότι έχει απαγο�ευθεί η δημιου�γία αυτο� του τίτλου",
+'talkexists'                   => "Η ίδια η σελίδα μετακινήθηκε επιτυχώς αλλά όχι και η σελίδα συζήτησης, λόγω του ότι υπά�χει ήδη άλλη σελίδα συζήτησης κάτω από το νέο τίτλο. Πα�ακαλο�με ενοποιήστε τις δ�ο σελίδες με 'αντιγ�αφή-και-επικόλληση'.",
+'movedto'                      => 'Μετακινήθηκε στο',
+'movetalk'                     => 'Μετακίνηση της σελίδας "συζήτηση" (εάν υπά�χει)',
+'move-subpages'                => 'Μετακινήστε όλες τις υποσελίδες, εάν υπά�χουν',
+'move-talk-subpages'           => 'Μετακινήστε όλες τις υποσελίδες μιας σελίδας συζήτησης, εάν υπά�χουν',
+'movepage-page-exists'         => 'Η σελίδα $1 υπά�χει ήδη και και δεν μπο�εί να αντικατασταθεί αυτόματα.',
+'movepage-page-moved'          => 'Η σελίδα $1 μετακινήθηκε στο $2.',
+'movepage-page-unmoved'        => 'Η σελίδα $1 δεν μπό�εσε να μετακινηθεί στο $2.',
+'movepage-max-pages'           => 'Ο μέγιστος δυνατός α�ιθμός ($1 {{PLURAL:$1|σελίδα|σελίδες}}) μετακινήθηκε και καμία άλλη δεν θα μετακινηθεί αυτόματα.',
+'1movedto2'                    => 'Η [[$1]] μετακινήθηκε στη θέση [[$2]]',
+'1movedto2_redir'              => 'Η $1 μετακινήθηκε στη θέση $2 (με ανακατε�θυνση)',
+'move-redirect-suppressed'     => 'απόκ�υψη της αναδιε�θυνσης',
+'movelogpage'                  => 'Α�χείο καταγ�αφής μετακινήσεων',
+'movelogpagetext'              => 'Ακολουθεί η λίστα με τις σελίδες που έχουν μετακινηθεί.',
+'movereason'                   => 'Αιτιολογία',
+'revertmove'                   => 'επαναφο�ά',
+'delete_and_move'              => 'Διαγ�αφή και μετακίνηση',
+'delete_and_move_text'         => '==Χ�ειάζεται διαγ�αφή.==
 
 Το ά�θ�ο [[:$1]] υπά�χει ήδη. Θέλετε να το διαγ�άψετε για να εκτελεσθεί η μετακίνηση;',
-'delete_and_move_confirm' => '�αι, διέγ�αψε τη σελίδα',
-'delete_and_move_reason'  => 'Διαγ�άφηκε για να εκτελεσθεί μετακίνηση.',
-'selfmove'                => 'Ο τίτλος π�οέλευσης είναι ο ίδιος με τον τίτλο π�οο�ισμο� -δεν είναι δυνατόν να μετακινηθεί μια σελίδα π�ος τον εαυτό της.',
-'immobile_namespace'      => 'Ο τίτλος του π�οο�ισμο� είναι ειδικο� τ�που -δεν είναι δυνατή η μετακίνηση σελίδων σε εκείνη την πε�ιοχή.',
-'fix-double-redirects'    => 'Ενημε�ώστε όποια ανακατε�θυνση σκοπε�ει π�ος τον α�χικό τίτλο',
+'delete_and_move_confirm'      => '�αι, διέγ�αψε τη σελίδα',
+'delete_and_move_reason'       => 'Διαγ�άφηκε για να εκτελεσθεί μετακίνηση.',
+'selfmove'                     => 'Ο τίτλος π�οέλευσης είναι ο ίδιος με τον τίτλο π�οο�ισμο� -δεν είναι δυνατόν να μετακινηθεί μια σελίδα π�ος τον εαυτό της.',
+'immobile-source-namespace'    => 'Δεν μπο�ο�ν να μετακινηθο�ν σελίδες στο namespace "$1"',
+'immobile-target-namespace'    => 'Δεν μπο�ο�ν να μετακινηθο�ν σελίδες στην πε�ιοχή "$1"',
+'immobile-target-namespace-iw' => 'Ο σ�νδεσμος-interwiki δεν είναι έγκυ�ος στόχος για την μετακίνηση σελίδας.',
+'immobile-source-page'         => 'Αυτή η σελίδα δεν είναι δυνατό να μετακινηθεί.',
+'immobile-target-page'         => 'Δεν μπο�εί να μετακινηθεί σε αυτόν τον τίτλο.',
+'imagenocrossnamespace'        => 'Δεν είναι δυνατή η μετακίνηση του α�χείου σε πε�ιοχή ονομάτων που δεν αφο�ά α�χεία',
+'imagetypemismatch'            => 'Η νέα επέκταση του α�χείου δεν ται�ιάζει με τον τ�πο του',
+'imageinvalidfilename'         => 'Το όνομα α�χείου π�οο�ισμο� είναι άκυ�ο',
+'fix-double-redirects'         => 'Ενημε�ώστε όποια ανακατε�θυνση σκοπε�ει π�ος τον α�χικό τίτλο',
+'move-leave-redirect'          => 'Αφήστε πίσω μια ανακατε�θυνση',
 
 # Export
 'export'            => 'Εξαγωγή σελίδων',
@@ -1957,7 +2354,7 @@ $1',
 
 Για την εξαγωγή ολόκλη�ων ά�θ�ων, συμπλη�ώστε τους τίτλους στο πα�ακάτω πλαίσιο (ένα τίτλο σε κάθε σει�ά) και επιλέξτε ανάμεσα από το να εξαγάγετε μόνο την τ�έχουσα έκδοση (με τις πλη�οφο�ίες της πιο π�όσφατης επεξε�γασίας) ή εναλλακτικά και τις παλιότε�ες εκδόσεις (με τις αντίστοιχες καταγ�αφές στη σελιδα του ιστο�ικο�).
 
-Στην τελευταία πε�ίπτωση μπο�είτε να κάνετε και χ�ήση συνδέσμου, π.χ. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] για το ά�θ�ο {{MediaWiki:Mainpage}}.',
+Στην τελευταία πε�ίπτωση μπο�είτε να κάνετε και χ�ήση συνδέσμου, π.χ. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] για το ά�θ�ο {{MediaWiki:Mainpage}}.',
 'exportcuronly'     => '�α συμπε�ιληφθεί μόνον η τ�έχουσα αναθεώ�ηση, όχι το πλή�ες ιστο�ικό.',
 'exportnohistory'   => "----
 '''Σημείωση:''' Η εξαγωγή του πλή�ους ιστο�ικο� σελίδων μέσω αυτής της φό�μας έχει απενε�γοποιηθεί λόγω θεμάτων απόδοσης.",
@@ -1972,7 +2369,8 @@ $1',
 'allmessagesname'           => 'Όνομα',
 'allmessagesdefault'        => 'Π�οκαθο�ισμένο κείμενο',
 'allmessagescurrent'        => 'Πα�όν κείμενο',
-'allmessagestext'           => 'Η λίστα με όλα τα μην�ματα συστήματος που β�ίσκονται στην πε�ιοχή MediaWiki:',
+'allmessagestext'           => 'Αυτή είναι μια λίστα με όλα τα μην�ματα συστήματος που β�ίσκονται στην πε�ιοχή MediaWiki.
+Πα�ακαλο�με επισκεφθείτε τα [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] και [http://translatewiki.net translatewiki.net] αν επιθυμείτε να συνεισφέ�ετε σε μια γενική μετάφ�αση του MediaWiki.',
 'allmessagesnotsupportedDB' => '{{ns:special}}:Το AllMessages δεν υποστη�ίζεται επειδή το wgUseDatabaseMessages είναι απενε�γοποιημένο.',
 'allmessagesfilter'         => 'Φίλτ�ο ονόματος μην�ματος:',
 'allmessagesmodified'       => 'Δείξε μόνο τα τ�οποποιημένα',
@@ -1992,9 +2390,12 @@ $1',
 'import-interwiki-text'      => 'Επιλέξτε ένα wiki και τίτλο σελίδας για την εισαγωγή.
 Οι ημε�ομηνίες των αναθεω�ήσεων και τα ονόματα των συντακτών θα διατη�ηθο�ν.
 Όλες οι ενέ�γειες εισαγωγής μεταξ� wiki καταγ�άφονται στο [[Special:Log/import|α�χείο καταγ�αφής εισαγωγών]].',
+'import-interwiki-source'    => 'Wiki και σελίδα πηγή:',
 'import-interwiki-history'   => 'Αντέγ�αψε όλες τις εκδόσεις του ιστο�ικο� για αυτή τη σελίδα',
 'import-interwiki-submit'    => 'Εισαγωγή',
-'import-interwiki-namespace' => 'Μετέφε�ε τις σελίδες στην πε�ιοχή ονομάτων:',
+'import-interwiki-namespace' => 'Π�οο�ισμός στην πε�ιοχή ονομάτων:',
+'import-upload-filename'     => 'Όνομα α�χείου:',
+'import-comment'             => 'Σχόλιο:',
 'importtext'                 => 'Πα�ακαλο�με εξάγετε το α�χείο από το πηγαίο Wiki (χ�ησιμοποιώντας Special:Export), αποθηκε�στε το στο δίσκο του υπολογιστή σας και φο�τώστε το από εκεί.',
 'importstart'                => 'Η εισαγωγή των σελίδων είναι σε εξέλιξη...',
 'import-revision-count'      => '$1 {{PLURAL:$1|αναθεώ�ηση|αναθεω�ήσεις}}',
@@ -2016,6 +2417,8 @@ $1',
 'import-nonewrevisions'      => 'Όλες οι αναθεω�ήσεις εισάχθηκαν π�οηγουμένως.',
 'xml-error-string'           => '$1 στη γ�αμμή $2, στήλη $3 (byte $4): $5',
 'import-upload'              => 'Επιφό�τωση δεδομένων XML',
+'import-token-mismatch'      => 'Απώλεια των στοιχείων της συνόδου. Πα�ακαλο�με π�οσπαθήστε ξανά.',
+'import-invalid-interwiki'   => 'Δεν είναι δυνατή η εισαγωγή από το καθο�ισμένο wiki.',
 
 # Import log
 'importlogpage'                    => 'Α�χείο καταγ�αφής εισαγωγών',
@@ -2026,19 +2429,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|αναθεώ�ηση|αναθεω�ήσεις}} από $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Η π�οσωπική μου σελίδα στο Wiκi',
+'tooltip-pt-userpage'             => 'Η σελίδα χ�ήστη σου',
 'tooltip-pt-anonuserpage'         => 'Η σελίδα χ�ήστη στον οποίο αντιστοιχεί η διε�θυνση IP που έχετε',
-'tooltip-pt-mytalk'               => 'Η σελίδα συζητήσεών μου',
+'tooltip-pt-mytalk'               => 'Η σελίδα συζητήσεών σου',
 'tooltip-pt-anontalk'             => 'Συζήτηση σχετικά με τις αλλαγές που έγιναν από αυτή τη διε�θυνση IP',
 'tooltip-pt-preferences'          => 'Οι π�οτιμήσεις μου',
 'tooltip-pt-watchlist'            => 'Η λίστα με τις σελίδες που πα�ακολουθείτε για αλλαγές',
-'tooltip-pt-mycontris'            => 'Κατάλογος των συνεισφο�ών μου',
+'tooltip-pt-mycontris'            => 'Κατάλογος των συνεισφο�ών σου',
 'tooltip-pt-login'                => 'Σας π�οτείνουμε να συνδεθείτε πα�όλο που δεν είναι αναγκαίο.',
 'tooltip-pt-anonlogin'            => 'Σας π�οτείνουμε να συνδεθείτε πα�όλο που δεν είναι αναγκαίο.',
 'tooltip-pt-logout'               => 'Αποσ�νδεση',
 'tooltip-ca-talk'                 => 'Συζήτηση για το πα�όν ά�θ�ο',
 'tooltip-ca-edit'                 => 'Μπο�είτε να επεξε�γαστείτε αυτό το ά�θ�ο. Πα�ακαλο�με χ�ησιμοποιήστε την "Π�οεπισκόπηση" π�ιν το αποθηκε�σετε.',
-'tooltip-ca-addsection'           => 'Π�οσθέστε σχόλιο στη συζήτηση.',
+'tooltip-ca-addsection'           => 'Π�οσθέστε ένα νέο τμήμα',
 'tooltip-ca-viewsource'           => 'Αυτό το ά�θ�ο είναι κλειδωμένο. Μπο�είτε να δείτε τον πηγαίο κώδικά του.',
 'tooltip-ca-history'              => 'Παλιές αναθεω�ήσεις του ά�θ�ου.',
 'tooltip-ca-protect'              => 'Κλείδωμα αυτο� του ά�θ�ου',
@@ -2084,15 +2487,34 @@ $1',
 'tooltip-compareselectedversions' => 'Εμφάνιση των διαφο�ών ανάμεσα στις δ�ο αναθεω�ήσεις της σελίδας που έχετε επιλέξει.',
 'tooltip-watch'                   => 'Π�οσθήκη της σελίδας στη λίστα πα�ακολο�θησης',
 'tooltip-recreate'                => 'Ξαναδημιο��γησε τη σελίδα πα�όλο που έχει διαγ�αφεί',
-'tooltip-upload'                  => 'Ά�χισε τη φό�τωση',
+'tooltip-upload'                  => 'Ένα�ξη φό�τωσης',
+'tooltip-rollback'                => 'Η "αναστ�οφή" ακυ�ώνει τις τελευταίες επεξε�γασίες σε αυτή τη σελίδα με ένα κλικ',
+'tooltip-undo'                    => 'Η "ακ��ωση" ακυ�ώνει αυτήν την επεξε�γασία και ανοίγει την φό�μα επεξε�γασίας σε κατάσταση π�οεπισκόπησης.
+Επιτ�έπει την π�οσθήκη αιτιολόγησης στην πε�ίληψη',
 
 # Stylesheets
-'common.css'   => '/** CSS τα οποία τοποθετο�νται εδώ θα εφα�μοστο�ν σε όλα τα skins */',
-'monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
+'common.css'      => '/* Το τοποθετημένο εδώ CSS θα εφα�μοστεί σε όλα τα skins */',
+'standard.css'    => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Standard skin */',
+'nostalgia.css'   => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Nostalgia skin */',
+'cologneblue.css' => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Cologne Blue skin */',
+'monobook.css'    => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Monobook skin */',
+'myskin.css'      => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Myskin skin */',
+'chick.css'       => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Chick skin */',
+'simple.css'      => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Simple skin */',
+'modern.css'      => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει χ�ήστες του Modern skin */',
+'print.css'       => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει το αποτέλεσμα της εκτ�πωσης */',
+'handheld.css'    => '/* Το τοποθετημένο εδώ CSS θα επη�εάσει συσκευές χει�ός βάση του skin �υθμισμένου στο $wgHandheldStyle */',
 
 # Scripts
-'common.js'   => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για όλους τους χ�ήστες σε κάθε φό�τωση σελίδας. */',
-'monobook.js' => '/* Πα�ωχημένο, χ�ησιμοποιήστε το MonoBook skin */',
+'common.js'      => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για όλους τους χ�ήστες σε κάθε φό�τωση σελίδας. */',
+'standard.js'    => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Standard skin */',
+'nostalgia.js'   => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Nostalgia skin */',
+'cologneblue.js' => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Cologne Blue skin */',
+'monobook.js'    => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το MonoBook skin */',
+'myskin.js'      => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Myskin skin */',
+'chick.js'       => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Chick skin */',
+'simple.js'      => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Simple skin */',
+'modern.js'      => '/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φο�τωθεί για χ�ήστες που χ�ησιμοποιο�ν το Modern skin */',
 
 # Metadata
 'nodublincore'      => 'Τα μεταδεδομένα RDF που αφο�ο�ν στο Dublin Core έχουν απενε�γοποιηθεί σε αυτό τον server.',
@@ -2100,12 +2522,12 @@ $1',
 'notacceptable'     => 'Ο server του Wiki δεν μπο�εί να αποδώσει δεδομένα σε μο�φή που να μπο�εί να διαβάσει ο client σας.',
 
 # Attribution
-'anonymous'        => 'Ανώνυμος(-οι) χ�ήστης(-ες) του {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Ανώνυμος χ�ήστης|Ανώνυμοι χ�ήστες}} του {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} χ�ήστης $1',
 'lastmodifiedatby' => 'Η σελίδα αυτή τ�οποποιήθηκε τελευταία φο�ά στις  $2, $1 από το χ�ήστη $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Βασισμένο στη δουλειά του/των $1',
 'others'           => 'άλλοι',
-'siteusers'        => 'χ�ηστών του ιστοχώ�ου $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|χ�ηστή|χ�ηστών}} του ιστοχώ�ου $1',
 'creditspage'      => 'Αναγνώ�ιση συνεισφο�άς στη σελίδα',
 'nocredits'        => 'Δεν υπά�χουν πλη�οφο�ίες σχετικά με την αναγνώ�ιση συνεισφο�άς σε αυτή τη σελίδα.',
 
@@ -2125,6 +2547,13 @@ $1',
 'numauthors'     => 'Α�ιθμός διακ�ιτών συγγ�αφέων (στο ά�θ�ο): $1',
 'numtalkauthors' => 'Α�ιθμός διακ�ιτών συγγ�αφέων (στη σελίδα συζήτησης): $1',
 
+# Skin names
+'skinname-standard'  => 'Κλασσικό',
+'skinname-nostalgia' => '�οσταλγία',
+'skinname-myskin'    => 'ΤοSkinΜου',
+'skinname-simple'    => 'Απλό',
+'skinname-modern'    => 'Μοντέ�νο',
+
 # Math options
 'mw_math_png'    => 'Απόδοση πάντα σε PNG',
 'mw_math_simple' => 'HTML αν είναι α�κετά απλό, διαφο�ετικά PNG',
@@ -2145,9 +2574,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'Δεν επιτ�έπεται να σημάνετε τις δικές σας αλλάγες ως υπό πε�ιπολία.',
 
 # Patrol log
-'patrol-log-page' => 'Α�χείο καταγ�αφής πε�ιπολιών',
-'patrol-log-line' => 'σημάνθηκε το $1 του $2 υπό πε�ιπολία $3',
-'patrol-log-auto' => '(αυτόματα)',
+'patrol-log-page'      => 'Α�χείο καταγ�αφής πε�ιπολιών',
+'patrol-log-header'    => 'Αυτός είναι ένας κατάλογος πε�ιπολο�μενων αναθεω�ήσεων.',
+'patrol-log-line'      => 'σημάνθηκε το $1 του $2 υπό πε�ιπολία $3',
+'patrol-log-auto'      => '(αυτόματα)',
+'patrol-log-diff'      => 'αναθεώ�ηση $1',
+'log-show-hide-patrol' => '$1 καταγ�αφή επιτή�ησης',
 
 # Image deletion
 'deletedrevision'                 => 'Η παλιά έκδοση της $1 διαγ�άφτηκε',
@@ -2161,8 +2593,11 @@ $1',
 'filedelete-archive-read-only'    => 'Το α�χείο καταλόγου "$1" είναι μη εγγ�άψιμο από τον διακομιστή.',
 
 # Browsing diffs
-'previousdiff' => '&larr; Π�οηγο�μενη επεξε�γασία',
-'nextdiff'     => 'Επόμενη επεξε�γασία &rarr;',
+'previousdiff' => '� Π�οηγο�μενη επεξε�γασία',
+'nextdiff'     => 'Επόμενη επεξε�γασία →',
+
+# Visual comparison
+'visual-comparison' => 'Οπτική σ�γκ�ιση',
 
 # Media information
 'mediawarning'         => "'''Π�οειδοποίηση''': Το α�χείο αυτό μπο�εί να πε�ιέχει κακοπ�οαί�ετο κώδικα που μπο�εί να βλάψει το σ�στημα του υπολογιστή σας.
@@ -2178,10 +2613,12 @@ $1',
 'show-big-image'       => 'Πλή�ης ανάλυση',
 'show-big-image-thumb' => '<small>Μέγεθος αυτής της π�οεπισκόπησης: $1 × $2 εικονοστοιχεία</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Πινακοθήκη νέων εικόνων',
 'imagelisttext'         => "Ακολουθεί κατάλογος '''$1''' {{PLURAL:$1|α�χείου|α�χείων}} ταξινομημένων κατά σει�ά $2.",
 'newimages-summary'     => 'Αυτή η ειδική σελίδα δείχνει τα πιο π�όσφατα φο�τωμένα α�χεία.',
+'newimages-legend'      => 'Φίλτ�ο',
+'newimages-label'       => 'Όνομα α�χείου (ή μέ�ος αυτο�):',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Δεν υπά�χουν εικόνες.',
 'ilsubmit'              => 'Αναζήτηση',
@@ -2315,7 +2752,7 @@ $1',
 'exif-gpstrack'                    => 'Κατε�θυνση κίνησης',
 'exif-gpsimgdirectionref'          => 'Αναφο�ές για την κατε�θυνση της εικόνας',
 'exif-gpsimgdirection'             => 'Κατε�θυνση της εικόνας',
-'exif-gpsmapdatum'                 => 'Στοιχεία γεωδετικών μετ�ήσεων ΄που έχουν χ�ησιμοποιηθεί',
+'exif-gpsmapdatum'                 => 'Στοιχεία γεωδαιτικών μετ�ήσεων που έχουν χ�ησιμοποιηθεί',
 'exif-gpsdestlatituderef'          => 'Αναφο�ές για το γεωγ�αφικό πλάτος του π�οο�ισμο�',
 'exif-gpsdestlatitude'             => 'Αναφο�ές γεωγ�αφικο� πλάτους',
 'exif-gpsdestlongituderef'         => 'Αναφο�ές για το γεωγ�αφικό μήκος του π�οο�ισμο�',
@@ -2384,9 +2821,21 @@ $1',
 'exif-lightsource-17'  => 'Τυποποιημένος φωτισμός A',
 'exif-lightsource-18'  => 'Τυποποιημένος φωτισμός B',
 'exif-lightsource-19'  => 'Τυποποιημένος φωτισμός C',
-'exif-lightsource-24'  => 'Βολφ�αίμιο του ε�γαστη�ίου ISO',
+'exif-lightsource-24'  => 'Βολφ�άμιο ISO του ε�γαστη�ίου',
 'exif-lightsource-255' => 'Άλλη πηγή φωτός',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Το φλας δεν πυ�οδοτήθηκε',
+'exif-flash-fired-1'    => 'Το φλας πυ�οδοτήθηκε',
+'exif-flash-return-0'   => 'λειτου�γία μη επιστ�οφής φωτός από το στ�οβοσκόπιο',
+'exif-flash-return-2'   => 'δεν εντοπίστηκε επιστ�οφή φωτός από το στ�οβοσκόπιο',
+'exif-flash-return-3'   => 'εντοπίστηκε επιστ�οφή φωτός από το στ�οβοσκόπιο',
+'exif-flash-mode-1'     => 'υποχ�εωτική πυ�οδότηση του φλας',
+'exif-flash-mode-2'     => 'υποχ�εωτική καταστολή του φλας',
+'exif-flash-mode-3'     => 'αυτόματη λειτου�γία',
+'exif-flash-function-1' => 'Δεν υπά�χει λειτου�γία φλας',
+'exif-flash-redeye-1'   => 'επιλογή για μείωση του φαινομένου των κόκκινων ματιών',
+
 'exif-focalplaneresolutionunit-2' => 'ίντσες',
 
 'exif-sensingmethod-1' => 'Δεν έχει καθο�ιστεί',
@@ -2415,10 +2864,10 @@ $1',
 'exif-scenecapturetype-3' => '�υκτε�ινή σκηνή',
 
 'exif-gaincontrol-0' => 'Κανένα',
-'exif-gaincontrol-1' => 'Χαμηλό κέ�δος επάνω',
-'exif-gaincontrol-2' => 'Υψηλό κέ�δος επάνω',
-'exif-gaincontrol-3' => 'Χαμηλό κέ�δος κάτω',
-'exif-gaincontrol-4' => 'Υψηλό κέ�δος κατω',
+'exif-gaincontrol-1' => 'Χαμηλή θετική α�ξηση',
+'exif-gaincontrol-2' => 'Υψηλή θετική α�ξηση',
+'exif-gaincontrol-3' => 'Χαμηλή α�νητική α�ξηση',
+'exif-gaincontrol-4' => 'Υψηλή α�νητική α�ξηση',
 
 'exif-contrast-0' => 'Φυσικό',
 'exif-contrast-1' => 'Απαλό',
@@ -2481,7 +2930,7 @@ $1',
 για να φτάσει αυτό π�ιν π�οσπαθήσετε να ζητήσετε ένα νέο κωδικό.
 </div>',
 'confirmemail_send'        => 'Αποστολή κωδικο� επαλήθευσης με e-mail .',
-'confirmemail_sent'        => 'Το μήνυμα επαλήθευσης έχει σταλεί, ελέγξτε την αλληλογ�αφία σας.',
+'confirmemail_sent'        => 'Στάλθηκε το μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου για επιβεβαίωση.',
 'confirmemail_oncreate'    => 'Ένας κωδικός επιβεβαίωσης σας έχει σταλεί στην διε�θυνση e-mail σας.
 Αυτός ο κωδικός δεν είναι απα�αίτητος για να συνδεθείτε, αλλά θα χ�ειαστεί
 να τον πα�έχετε π�ιν ενε�γοποιήσετε οποιαδήποτε χα�ακτη�ιστικά βασισμένα σε e-mail, σε αυτό το wiki.',
@@ -2514,8 +2963,7 @@ $5
 'scarytranscludetoolong'  => '[Η διε�θυνση URL είναι πολ� μεγάλη.]',
 
 # Trackbacks
-'trackbackbox'      => '<div id="mw_trackbacks">
-Trackbacks για αυτό το ά�θ�ο:<br />
+'trackbackbox'      => '<div id="mw_trackbacks">Ανασ�νδεσμοι για αυτό το ά�θ�ο:<br />
 $1
 </div>',
 'trackbackremove'   => ' ([$1 Διαγ�αφή])',
@@ -2529,21 +2977,10 @@ $1
 Πα�ακαλώ επιβεβαιώστε ότι θέλετε π�αγματικά να ξαναδημιου�γήσετε αυτή τη σελίδα.",
 'recreate'            => 'Επαναδημιου�γία',
 
-# HTML dump
-'redirectingto' => 'Ανακατε�θυνση στη σελίδα [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Καθα�ισμός της λανθάνουσας μνήμης αυτής της σελίδας;
-
-$1',
 'confirm_purge_button' => 'Εντάξει',
-
-# AJAX search
-'searchcontaining' => "Αναζήτηση για ά�θ�α που πε�ιέχουν ''$1''.",
-'searchnamed'      => "Αναζήτηση για ά�θ�α με την ονομασία ''$1''.",
-'articletitles'    => "Ά�θ�α που α�χίζουν από ''$1''",
-'hideresults'      => 'Απόκ�υψη αποτελεσμάτων',
-'useajaxsearch'    => 'Χ�ησιμοποίηση της αναζήτησης AJAX',
+'confirm-purge-top'    => 'Καθα�ισμός της λανθάνουσας μνήμης αυτής της σελίδας.',
+'confirm-purge-bottom' => 'Η εκκαθά�ιση μιας σελίδας εκκαθα�ίζει την μνήμη cache και εξαναγκάζει την πλέον π�όσφατη έκδοση να εμφανιστεί.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� π�οηγο�μενη σελίδα',
@@ -2563,10 +3000,10 @@ $1',
 'table_pager_empty'        => 'Κανένα αποτέλεσμα',
 
 # Auto-summaries
-'autosumm-blank'   => 'Διαγ�αφή όλου του πε�ιεχομένου της σελίδας',
+'autosumm-blank'   => 'Διαγ�αφή του πε�ιεχομένου της σελίδας',
 'autosumm-replace' => "Αντικατάσταση σελίδας με '$1'",
 'autoredircomment' => 'Ανακατε�θυνση στη σελίδα [[$1]]',
-'autosumm-new'     => '�έα σελίδα: $1',
+'autosumm-new'     => "�έα σελίδα με '$1'",
 
 # Live preview
 'livepreview-loading' => 'Φό�τωση…',
@@ -2606,41 +3043,55 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'Άγνωστη ετικέτα επέκτασης "$1"',
+'duplicate-defaultsort' => 'Π�οσοχή: Το π�οκαθο�ισμένο κλειδί ταξινόμησης "$2" υπε�καλ�πτει το π�οηγο�μενο "$1".',
 
 # Special:Version
-'version'                     => 'Έκδοση', # Not used as normal message but as header for the special page itself
-'version-extensions'          => 'Εγκαταστημένες επεκτάσεις',
-'version-specialpages'        => 'Ειδικές σελίδες',
-'version-variables'           => 'Πα�άμετ�οι',
-'version-other'               => 'Άλλα',
-'version-mediahandlers'       => 'Χει�ιστές των μέσων',
-'version-hooks'               => 'Άγκιστ�α',
-'version-extension-functions' => 'Συνα�τήσεις από επεκτάσεις',
-'version-hook-name'           => 'Όνομα άγκιστ�ου',
-'version-version'             => 'Έκδοση',
-'version-license'             => 'Άδεια χ�ήσης',
-'version-software'            => 'Εγκατεστημένο λογισμικό',
-'version-software-product'    => 'Π�οϊόν',
-'version-software-version'    => 'Έκδοση',
+'version'                          => 'Έκδοση', # Not used as normal message but as header for the special page itself
+'version-extensions'               => 'Εγκαταστημένες επεκτάσεις',
+'version-specialpages'             => 'Ειδικές σελίδες',
+'version-parserhooks'              => 'Άγκιστ�α του συντακτικο� αναλυτή',
+'version-variables'                => 'Πα�άμετ�οι',
+'version-other'                    => 'Άλλα',
+'version-mediahandlers'            => 'Χει�ιστές των μέσων',
+'version-hooks'                    => 'Άγκιστ�α',
+'version-extension-functions'      => 'Συνα�τήσεις επεκτάσεων',
+'version-parser-extensiontags'     => 'Ετικέτες επεκτάσεων του συντακτικο� αναλυτή',
+'version-parser-function-hooks'    => 'Άγκιστ�α συνα�τήσεων του συντακτικο� αναλυτή',
+'version-skin-extension-functions' => 'Λειτου�γίες επέκτασης της διεπαφής',
+'version-hook-name'                => 'Όνομα άγκιστ�ου',
+'version-hook-subscribedby'        => 'Υπογεγ�αμμένο από',
+'version-version'                  => 'Έκδοση',
+'version-license'                  => 'Άδεια χ�ήσης',
+'version-software'                 => 'Εγκατεστημένο λογισμικό',
+'version-software-product'         => 'Π�οϊόν',
+'version-software-version'         => 'Έκδοση',
 
 # Special:FilePath
 'filepath'         => 'Διαδ�ομή α�χείου',
 'filepath-page'    => 'Α�χείο:',
 'filepath-submit'  => 'Διαδ�ομή',
-'filepath-summary' => 'Αυτή η ειδική σελίδα επιστ�έφει το πλή�ες path ενός α�χείου.
-Οι εικόνες εμφανίζονται σε πλή�η ανάλυση, άλλοι τ�ποι α�χείων ανοίγονται αμέσως με το αντίστοιχο π�όγ�αμμα.
+'filepath-summary' => 'Αυτή η ειδική σελίδα επιστ�έφει την πλή�η διαδ�ομή ενός α�χείου.
+Οι εικόνες εμφανίζονται σε πλή�η ανάλυση, ενώ άλλοι τ�ποι α�χείων ανοίγονται αμέσως με το αντίστοιχο π�όγ�αμμα.
 
-Εισάγετε το όνομα του α�χείου χω�ίς το π�όθημα "{{ns:image}}\'".',
+Εισάγετε το όνομα του α�χείου χω�ίς το π�όθημα "{{ns:file}}\'".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Αναζήτηση για διπλά α�χεία',
+'fileduplicatesearch-summary'  => 'Αναζήτηση για διπλά α�χεία με βάση την τιμή hash του α�χείου.
+
+Εισάγετε το όνομα του α�χείου χω�ίς το π�όθεμα "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Αναζήτηση για διπλό α�χείο',
 'fileduplicatesearch-filename' => 'Όνομα α�χείου:',
 'fileduplicatesearch-submit'   => 'Αναζήτηση',
+'fileduplicatesearch-info'     => '$1 × $2 πίξελ<br />Μέγεθος α�χείου: $3<br />Τ�πος MIME: $4',
 'fileduplicatesearch-result-1' => 'Το α�χείο "$1" δεν έχει κανένα ταυτόσημο διπλό.',
+'fileduplicatesearch-result-n' => 'Το α�χείο "$1" έχει {{PLURAL:$2|1 ταυτόσημο διπλό|$2 ταυτόσημα διπλά}}.',
 
 # Special:SpecialPages
 'specialpages'                   => 'Σελίδες λειτου�γιών',
+'specialpages-note'              => '----
+* Κανονικές ειδικές σελίδες.
+* <span class="mw-specialpagerestricted">Πε�ιο�ισμένες ειδικές σελίδες.</span>',
 'specialpages-group-maintenance' => 'Αναφο�ές συντή�ησης',
 'specialpages-group-other'       => 'Άλλες ειδικές σελίδες',
 'specialpages-group-login'       => 'Σ�νδεση / δημιου�γία λογα�ιασμο�',
@@ -2658,4 +3109,13 @@ $1',
 'blankpage'              => 'Κενή σελίδα',
 'intentionallyblankpage' => 'Αυτή η σελίδα έχει αφεθεί σκοπίμως κενή',
 
+# External image whitelist
+'external_image_whitelist' => ' #Αφήστε αυτή τη γ�αμμή ακ�ιβώς όπως είναι<pre>
+#Βάλτε αποσπάσματα συνήθων εκφ�άσεων (μόνο το μέ�ος που είναι μεταξ� των //) κάτωθι
+#Αυτές θα αντιστοιχηθο�ν με τα URL των εξωτε�ικών (hotlinked) εικόνων
+#Αυτές που αντιστοιχο�ν θα εμφανιστο�ν ως εικόνες, αλλιώς μόνο ένας σ�νδεσμος π�ος την εικόνα θα εμφανιστεί
+#Οι γ�αμμές που α�χίζουν με # αντιμετωπίζονται ως σχόλια
+
+#Βάλτε όλα τα αποσπάσματα συνήθων εκφ�άσεων πάνω από αυτή τη γ�αμμή. Αφήστε αυτή τη γ�άμμη ως έχει</pre>',
+
 );
diff --git a/languages/messages/MessagesEml.php b/languages/messages/MessagesEml.php
index 8642df0a..d135c7c5 100644
--- a/languages/messages/MessagesEml.php
+++ b/languages/messages/MessagesEml.php
@@ -60,7 +60,7 @@ $messages = array(
 'nstab-template' => 'Modèl',
 
 # Login and logout pages
-'logouttext'           => "<strong>Adèsa s'et discunnês.</strong><br />
+'logouttext'           => "'''Adèsa s'et discunnês.'''<br />
 Putiv cuntinuèr ad usèr {{SITENAME}} anonimamèint, o putiv cunnètterv dòp cun al stèss nàmm o cun un èter. Nutêv ca alcuni pàgini i putrèbber cuntinuèr a cràdder ca vueter a-sîv discunnès, finchè non purghê la cache dal vòster browser.",
 'userlogin'            => 'Entrèr / Argistrères',
 'logout'               => 'va fôra',
@@ -74,7 +74,7 @@ Putiv cuntinuèr ad usèr {{SITENAME}} anonimamèint, o putiv cunnètterv dòp c
 'accountcreated'       => 'Et criê un nôv account',
 
 # Edit pages
-'summary'          => "Mutîv d'al cambiamèint",
+'summary'          => "Mutîv d'al cambiamèint:",
 'minoredit'        => "Còst cambiamèint ché l'é un gnînt in tót",
 'watchthis'        => "Tîn a drê a c'la pàgina chè",
 'savearticle'      => 'Salva',
@@ -86,6 +86,9 @@ Putiv cuntinuèr ad usèr {{SITENAME}} anonimamèint, o putiv cunnètterv dòp c
 'yourdiff'         => 'Differèinzi',
 'templatesused'    => 'Modêl usèdi in sta pàgina:',
 
+# Search results
+'searchhelp-url' => 'Help:Introduzione',
+
 # Preferences page
 'mypreferences' => 'AL mê preferèinzi',
 
@@ -102,8 +105,8 @@ Putiv cuntinuèr ad usèr {{SITENAME}} anonimamèint, o putiv cunnètterv dòp c
 'filedesc'          => "Ugêt d'al cambiamèint",
 'fileuploadsummary' => "Ugêt d'al cambiamèint:",
 
-# Special:ImageList
-'imagelist_size' => 'Dimensiòun (bytes)',
+# Special:ListFiles
+'listfiles_size' => 'Dimensiòun (bytes)',
 
 # Random page
 'randompage' => 'Una pàgina a chès',
@@ -117,12 +120,16 @@ Putiv cuntinuèr ad usèr {{SITENAME}} anonimamèint, o putiv cunnètterv dòp c
 # Special:AllPages
 'allpages' => 'Tôt al pàgin',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Regestér di n�v utèint',
+'newuserlog-create-entry' => 'Un utèint n�v',
+
 # Watchlist
 'watchlist'     => 'Al còsi ca guèrd',
 'watch'         => 'Tîn a drê',
 'watchthispage' => "Tîn a drê a c'la pàgina chè",
 
-# Delete/protect/revert
+# Delete
 'excontent'         => "al cointgnû l'éra: '$1'",
 'excontentauthor'   => "al cointgnû l'éra: '$1' (e l'ónic cuntribudôr l'éra '[[Special:Contributions/$2|$2]]')",
 'confirmdeletetext' => "Stèt per scanzlèr 'na pàgina o n'imàgin, insìmma a tòt la sô crunolugî dal database.
@@ -147,7 +154,7 @@ Guèrda $2 par vèdder la lésta d\'al pàgin ch\'i sun stèdi scanzlèdi di rec
 '1movedto2'   => "[[$1]] l'è stê mòs a [[$2]]",
 'movelogpage' => 'Regestér di muvimèint',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Zerca',
 
 # Special:SpecialPages
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c11729a8..d4c0801d 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -6,11 +6,10 @@
  *
  * Changes in this file will be lost during software upgrades.
  * You can make your customizations on the wiki.
- * While logged in as a sysop user, go to [[Special:Allmessages]]
+ * While logged in as administrator, go to [[Special:Allmessages]]
  * and edit the MediaWiki:* pages listed there.
  */
 
-
 /**
  * Fallback language, used for all unspecified messages and behaviour. This
  * is English by default, for all files other than this one.
@@ -87,8 +86,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talk',
-	NS_IMAGE            => 'Image',
-	NS_IMAGE_TALK       => 'Image_talk',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'File_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -105,20 +104,6 @@ $namespaceNames = array(
 $namespaceAliases = array();
 
 /**
- * Skin names. If any key is not specified, the English one will be used.
- */
-$skinNames = array(
-	'standard'    => 'Classic',
-	'nostalgia'   => 'Nostalgia',
-	'cologneblue' => 'Cologne Blue',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Chick',
-	'simple'      => 'Simple',
-	'modern'      => 'Modern',
-);
-
-/**
  * Deprecated, use the message array
  */
 $mathNames = array(
@@ -222,6 +207,7 @@ $magicWords = array(
 	'forcetoc'               => array( 0,    '__FORCETOC__'           ),
 	'toc'                    => array( 0,    '__TOC__'                ),
 	'noeditsection'          => array( 0,    '__NOEDITSECTION__'      ),
+	'noheader'               => array( 0,    '__NOHEADER__'           ),
 	'currentmonth'           => array( 1,    'CURRENTMONTH'           ),
 	'currentmonthname'       => array( 1,    'CURRENTMONTHNAME'       ),
 	'currentmonthnamegen'    => array( 1,    'CURRENTMONTHNAMEGEN'    ),
@@ -247,6 +233,7 @@ $magicWords = array(
 	'numberoffiles'          => array( 1,    'NUMBEROFFILES'          ),
 	'numberofusers'          => array( 1,    'NUMBEROFUSERS'          ),
 	'numberofedits'          => array( 1,    'NUMBEROFEDITS'          ),
+	'numberofviews'          => array( 1,    'NUMBEROFVIEWS'          ),
 	'pagename'               => array( 1,    'PAGENAME'               ),
 	'pagenamee'              => array( 1,    'PAGENAMEE'              ),
 	'namespace'              => array( 1,    'NAMESPACE'              ),
@@ -288,6 +275,8 @@ $magicWords = array(
 	'img_middle'             => array( 1,    'middle'                 ),
 	'img_bottom'             => array( 1,    'bottom'                 ),
 	'img_text_bottom'        => array( 1,    'text-bottom'            ),
+	'img_link'               => array( 1,    'link=$1'                ),
+	'img_alt'                => array( 1,    'alt=$1'                 ),
 	'int'                    => array( 0,    'INT:'                   ),
 	'sitename'               => array( 1,    'SITENAME'               ),
 	'ns'                     => array( 0,    'NS:'                    ),
@@ -340,6 +329,9 @@ $magicWords = array(
 	'hiddencat'              => array( 1,    '__HIDDENCAT__'          ),
 	'pagesincategory'        => array( 1,    'PAGESINCATEGORY', 'PAGESINCAT' ),
 	'pagesize'               => array( 1,    'PAGESIZE'               ),
+	'index'                  => array( 1,    '__INDEX__'              ),
+	'noindex'                => array( 1,    '__NOINDEX__'            ),
+	'numberingroup'          => array( 1,    'NUMBERINGROUP', 'NUMINGROUP' ),
 	'staticredirect'         => array( 1,    '__STATICREDIRECT__'     ),
 );
 
@@ -362,8 +354,8 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Watchlist' ),
 	'Recentchanges'             => array( 'RecentChanges' ),
 	'Upload'                    => array( 'Upload' ),
-	'Imagelist'                 => array( 'ImageList' ),
-	'Newimages'                 => array( 'NewImages' ),
+	'Listfiles'                 => array( 'ListFiles', 'FileList', 'ImageList' ),
+	'Newimages'                 => array( 'NewFiles', 'NewImages' ),
 	'Listusers'                 => array( 'ListUsers', 'UserList' ),
 	'Listgrouprights'           => array( 'ListGroupRights' ),
 	'Statistics'                => array( 'Statistics' ),
@@ -371,18 +363,19 @@ $specialPageAliases = array(
 	'Lonelypages'               => array( 'LonelyPages', 'OrphanedPages' ),
 	'Uncategorizedpages'        => array( 'UncategorizedPages' ),
 	'Uncategorizedcategories'   => array( 'UncategorizedCategories' ),
-	'Uncategorizedimages'       => array( 'UncategorizedImages' ),
+	'Uncategorizedimages'       => array( 'UncategorizedFiles', 'UncategorizedImages' ),
 	'Uncategorizedtemplates'    => array( 'UncategorizedTemplates' ),
 	'Unusedcategories'          => array( 'UnusedCategories' ),
-	'Unusedimages'              => array( 'UnusedImages' ),
+	'Unusedimages'              => array( 'UnusedFiles', 'UnusedImages' ),
 	'Wantedpages'               => array( 'WantedPages', 'BrokenLinks' ),
 	'Wantedcategories'          => array( 'WantedCategories' ),
-	'Missingfiles'              => array( 'MissingFiles', 'MissingImages' ),
-	'Mostlinked'                => array( 'MostLinked' ),
+	'Wantedfiles'               => array( 'WantedFiles' ),
+	'Wantedtemplates'           => array( 'WantedTemplates' ),
+	'Mostlinked'                => array( 'MostLinkedPages', 'MostLinked' ),
 	'Mostlinkedcategories'      => array( 'MostLinkedCategories', 'MostUsedCategories' ),
 	'Mostlinkedtemplates'       => array( 'MostLinkedTemplates', 'MostUsedTemplates' ),
+	'Mostimages'                => array( 'MostLinkedFiles', 'MostFiles', 'MostImages' ),
 	'Mostcategories'            => array( 'MostCategories' ),
-	'Mostimages'                => array( 'MostImages' ),
 	'Mostrevisions'             => array( 'MostRevisions' ),
 	'Fewestrevisions'           => array( 'FewestRevisions' ),
 	'Shortpages'                => array( 'ShortPages' ),
@@ -394,7 +387,7 @@ $specialPageAliases = array(
 	'Protectedtitles'           => array( 'ProtectedTitles' ),
 	'Allpages'                  => array( 'AllPages' ),
 	'Prefixindex'               => array( 'PrefixIndex' ) ,
-	'Ipblocklist'               => array( 'IPBlockList' ),
+	'Ipblocklist'               => array( 'BlockList', 'ListBlocks', 'IPBlockList' ),
 	'Specialpages'              => array( 'SpecialPages' ),
 	'Contributions'             => array( 'Contributions' ),
 	'Emailuser'                 => array( 'EmailUser' ),
@@ -409,7 +402,7 @@ $specialPageAliases = array(
 	'Version'                   => array( 'Version' ),
 	'Allmessages'               => array( 'AllMessages' ),
 	'Log'                       => array( 'Log', 'Logs' ),
-	'Blockip'                   => array( 'BlockIP' ),
+	'Blockip'                   => array( 'Block', 'BlockIP', 'BlockUser' ),
 	'Undelete'                  => array( 'Undelete' ),
 	'Import'                    => array( 'Import' ),
 	'Lockdb'                    => array( 'LockDB' ),
@@ -429,12 +422,14 @@ $specialPageAliases = array(
 	'Listbots'                  => array( 'ListBots' ),
 	'Popularpages'              => array( 'PopularPages' ),
 	'Search'                    => array( 'Search' ),
-	'Resetpass'                 => array( 'ResetPass', 'ResetPassword' ),
+	'Resetpass'                 => array( 'ChangePassword', 'ResetPass', 'ResetPassword' ),
 	'Withoutinterwiki'          => array( 'WithoutInterwiki' ),
 	'MergeHistory'              => array( 'MergeHistory' ),
 	'Filepath'                  => array( 'FilePath' ),
 	'Invalidateemail'           => array( 'InvalidateEmail' ),
 	'Blankpage'                 => array( 'BlankPage' ),
+	'LinkSearch'                => array( 'LinkSearch' ),
+	'DeletedContributions'      => array( 'DeletedContributions' ),
 );
 
 /**
@@ -491,16 +486,16 @@ XHTML id names.
 
 # User preference toggles
 'tog-underline'               => 'Underline links:',
-'tog-highlightbroken'         => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).',
+'tog-highlightbroken'         => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>)',
 'tog-justify'                 => 'Justify paragraphs',
 'tog-hideminor'               => 'Hide minor edits in recent changes',
 'tog-extendwatchlist'         => 'Expand watchlist to show all applicable changes',
-'tog-usenewrc'                => 'Enhanced recent changes (JavaScript)',
+'tog-usenewrc'                => 'Enhanced recent changes (requires JavaScript)',
 'tog-numberheadings'          => 'Auto-number headings',
-'tog-showtoolbar'             => 'Show edit toolbar (JavaScript)',
-'tog-editondblclick'          => 'Edit pages on double click (JavaScript)',
+'tog-showtoolbar'             => 'Show edit toolbar (requires JavaScript)',
+'tog-editondblclick'          => 'Edit pages on double click (requires JavaScript)',
 'tog-editsection'             => 'Enable section editing via [edit] links',
-'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles (JavaScript)',
+'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles (requires JavaScript)',
 'tog-showtoc'                 => 'Show table of contents (for pages with more than 3 headings)',
 'tog-rememberpassword'        => 'Remember my login on this computer',
 'tog-editwidth'               => 'Edit box has full width',
@@ -521,22 +516,24 @@ XHTML id names.
 'tog-externaleditor'          => 'Use external editor by default (for experts only, needs special settings on your computer)',
 'tog-externaldiff'            => 'Use external diff by default (for experts only, needs special settings on your computer)',
 'tog-showjumplinks'           => 'Enable "jump to" accessibility links',
-'tog-uselivepreview'          => 'Use live preview (JavaScript) (Experimental)',
+'tog-uselivepreview'          => 'Use live preview (requires JavaScript) (Experimental)',
 'tog-forceeditsummary'        => 'Prompt me when entering a blank edit summary',
 'tog-watchlisthideown'        => 'Hide my edits from the watchlist',
 'tog-watchlisthidebots'       => 'Hide bot edits from the watchlist',
 'tog-watchlisthideminor'      => 'Hide minor edits from the watchlist',
+'tog-watchlisthideliu'        => 'Hide edits by logged in users from the watchlist',
+'tog-watchlisthideanons'      => 'Hide edits by anonymous users from the watchlist',
 'tog-nolangconversion'        => 'Disable variants conversion', # only translate this message to other languages if you have to change it
 'tog-ccmeonemails'            => 'Send me copies of e-mails I send to other users',
 'tog-diffonly'                => 'Do not show page content below diffs',
 'tog-showhiddencats'          => 'Show hidden categories',
+'tog-noconvertlink'           => 'Disable link title conversion', # only translate this message to other languages if you have to change it
+'tog-norollbackdiff'          => 'Omit diff after performing a rollback',
 
 'underline-always'  => 'Always',
 'underline-never'   => 'Never',
 'underline-default' => 'Browser default',
 
-'skinpreview' => '(Preview)',
-
 # Dates
 'sunday'        => 'Sunday',
 'monday'        => 'Monday',
@@ -631,7 +628,7 @@ XHTML id names.
 'mytalk'         => 'My talk',
 'anontalk'       => 'Talk for this IP',
 'navigation'     => 'Navigation',
-'and'            => 'and',
+'and'            => '&#32;and',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -668,7 +665,7 @@ XHTML id names.
 'talkpagelinktext'  => 'Talk',
 'specialpage'       => 'Special Page',
 'personaltools'     => 'Personal tools',
-'postcomment'       => 'Post a comment',
+'postcomment'       => 'New section',
 'addsection'        => '+', # do not translate or duplicate this message to other languages
 'articlepage'       => 'View content page',
 'talk'              => 'Discussion',
@@ -676,7 +673,7 @@ XHTML id names.
 'toolbox'           => 'Toolbox',
 'userpage'          => 'View user page',
 'projectpage'       => 'View project page',
-'imagepage'         => 'View media page',
+'imagepage'         => 'View file page',
 'mediawikipage'     => 'View message page',
 'templatepage'      => 'View template page',
 'viewhelppage'      => 'View help page',
@@ -695,8 +692,6 @@ XHTML id names.
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'About {{SITENAME}}',
 'aboutpage'            => 'Project:About',
-'bugreports'           => 'Bug reports',
-'bugreportspage'       => 'Project:Bug reports',
 'copyright'            => 'Content is available under $1.',
 'copyrightpagename'    => '{{SITENAME}} copyright',
 'copyrightpage'        => '{{ns:project}}:Copyrights',
@@ -719,9 +714,7 @@ XHTML id names.
 
 'badaccess'        => 'Permission error',
 'badaccess-group0' => 'You are not allowed to execute the action you have requested.',
-'badaccess-group1' => 'The action you have requested is limited to users in the group $1.',
-'badaccess-group2' => 'The action you have requested is limited to users in one of the groups $1.',
-'badaccess-groups' => 'The action you have requested is limited to users in one of the groups $1.',
+'badaccess-groups' => 'The action you have requested is limited to users in {{PLURAL:$2|the group|one of the groups}}: $1.',
 
 'versionrequired'     => 'Version $1 of MediaWiki required',
 'versionrequiredtext' => 'Version $1 of MediaWiki is required to use this page.
@@ -730,17 +723,20 @@ See [[Special:Version|version page]].',
 'ok'                           => 'OK',
 'sitetitle'                    => '{{SITENAME}}', # do not translate or duplicate this message to other languages
 'pagetitle'                    => '$1 - {{SITENAME}}', # only translate this message to other languages if you have to change it
+'pagetitle-view-mainpage'      => '{{SITENAME}}', # only translate this message to other languages if you have to change it
 'sitesubtitle'                 => '', # do not translate or duplicate this message to other languages
 'retrievedfrom'                => 'Retrieved from "$1"',
 'youhavenewmessages'           => 'You have $1 ($2).',
 'newmessageslink'              => 'new messages',
 'newmessagesdifflink'          => 'last change',
 'youhavenewmessagesmulti'      => 'You have new messages on $1',
-'newtalkseperator'             => ',_', # do not translate or duplicate this message to other languages
+'newtalkseparator'             => ',_', # do not translate or duplicate this message to other languages
 'editsection'                  => 'edit',
 'editsection-brackets'         => '[$1]', # only translate this message to other languages if you have to change it
 'editold'                      => 'edit',
 'viewsourceold'                => 'view source',
+'editlink'                     => 'edit',
+'viewsourcelink'               => 'view source',
 'editsectionhint'              => 'Edit section: $1',
 'toc'                          => 'Contents',
 'showtoc'                      => 'show',
@@ -760,13 +756,13 @@ See [[Special:Version|version page]].',
 'sitenotice'                   => '-', # the equivalent to wgSiteNotice; do not translate or duplicate this message to other languages
 'anonnotice'                   => '-', # do not translate or duplicate this message to other languages
 'newsectionheaderdefaultlevel' => '== $1 ==', # do not translate or duplicate this message to other languages
-'red-link-title'               => '$1 (not yet written)',
+'red-link-title'               => '$1 (page does not exist)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Page',
 'nstab-user'      => 'User page',
 'nstab-media'     => 'Media page',
-'nstab-special'   => 'Special',
+'nstab-special'   => 'Special page',
 'nstab-project'   => 'Project page',
 'nstab-image'     => 'File',
 'nstab-mediawiki' => 'Message',
@@ -776,7 +772,9 @@ See [[Special:Version|version page]].',
 
 # Main script and global functions
 'nosuchaction'      => 'No such action',
-'nosuchactiontext'  => 'The action specified by the URL is not recognized by the wiki',
+'nosuchactiontext'  => 'The action specified by the URL is invalid.
+You might have mistyped the URL, or followed an incorrect link.
+This might also indicate a bug in the software used by {{SITENAME}}.',
 'nosuchspecialpage' => 'No such special page',
 'nospecialpagetext' => "<big>'''You have requested an invalid special page.'''</big>
 
@@ -831,7 +829,6 @@ It may have already been deleted by someone else.',
 'badtitle'             => 'Bad title',
 'badtitletext'         => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title.
 It may contain one or more characters which cannot be used in titles.',
-'perfdisabled'         => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.',
 'perfcached'           => 'The following data is cached and may not be up to date.',
 'perfcachedts'         => 'The following data is cached, and was last updated $1.',
 'querypage-no-updates' => 'Updates for this page are currently disabled.
@@ -849,27 +846,27 @@ Please try again in a few minutes.',
 'protectedinterface'   => 'This page provides interface text for the software, and is locked to prevent abuse.',
 'editinginterface'     => "'''Warning:''' You are editing a page which is used to provide interface text for the software.
 Changes to this page will affect the appearance of the user interface for other users.
-For translations, please consider using [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], the MediaWiki localisation project.",
+For translations, please consider using [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], the MediaWiki localisation project.",
 'sqlhidden'            => '(SQL query hidden)',
 'cascadeprotected'     => 'This page has been protected from editing, because it is included in the following {{PLURAL:$1|page, which is|pages, which are}} protected with the "cascading" option turned on:
 $2',
 'namespaceprotected'   => "You do not have permission to edit pages in the '''$1''' namespace.",
 'customcssjsprotected' => "You do not have permission to edit this page, because it contains another user's personal settings.",
 'ns-specialprotected'  => 'Special pages cannot be edited.',
-'titleprotected'       => "This title has been protected from creation by [[User:$1|$1]].
-The reason given is ''$2''.",
+'titleprotected'       => 'This title has been protected from creation by [[User:$1|$1]].
+The reason given is "\'\'$2\'\'".',
 
 # Virus scanner
-'virus-badscanner'     => 'Bad configuration: unknown virus scanner: <i>$1</i>',
+'virus-badscanner'     => "Bad configuration: unknown virus scanner: ''$1''",
 'virus-scanfailed'     => 'scan failed (code $1)',
 'virus-unknownscanner' => 'unknown antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'User logout',
-'logouttext'                 => '<strong>You are now logged out.</strong>
+'logouttext'                 => "'''You are now logged out.'''
 
 You can continue to use {{SITENAME}} anonymously, or you can [[Special:UserLogin|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.',
+Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache.",
 'welcomecreation'            => '== Welcome, $1! ==
 Your account has been created.
 Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
@@ -880,7 +877,6 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'remembermypassword'         => 'Remember my login on this computer',
 'yourdomainname'             => 'Your domain:',
 'externaldberror'            => 'There was either an authentication database error or you are not allowed to update your external account.',
-'loginproblem'               => '<b>There has been a problem with your login.</b><br />Try again!',
 'login'                      => 'Log in',
 'nav-login-createaccount'    => 'Log in / create account',
 'loginprompt'                => 'You must have cookies enabled to log in to {{SITENAME}}.',
@@ -907,14 +903,14 @@ Please choose a different name.',
 'yournick'                   => 'Signature:',
 'badsig'                     => 'Invalid raw signature.
 Check HTML tags.',
-'badsiglength'               => 'The signature is too long.
-It must be under $1 {{PLURAL:$1|character|characters}}.',
+'badsiglength'               => 'Your signature is too long.
+It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Real name is optional.
 If you choose to provide it, this will be used for giving you attribution for your work.',
 'loginerror'                 => 'Login error',
 'prefs-help-email'           => 'E-mail address is optional, but allows a new password to be e-mailed to you if you forget your password.
-You can also choose to let others to contact you through your user or user_talk page without needing to reveal your identity.',
+You can also choose to let others contact you through your user or talk page without needing to reveal your identity.',
 'prefs-help-email-required'  => 'E-mail address is required.',
 'nocookiesnew'               => 'The user account was created, but you are not logged in.
 {{SITENAME}} uses cookies to log in users.
@@ -959,12 +955,12 @@ To prevent abuse, only one password reminder will be sent per {{PLURAL:$1|hour|$
 'loginend'                   => '', # do not translate or duplicate this message to other languages
 'signupend'                  => '{{int:loginend}}', # do not translate or duplicate this message to other languages
 'mailerror'                  => 'Error sending mail: $1',
-'acct_creation_throttle_hit' => 'Sorry, you have already created $1 accounts.
-You cannot make any more.',
-'emailauthenticated'         => 'Your e-mail address was authenticated on $1.',
+'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the maximum allowed in this time period.
+As a result, visitors using this IP address cannot create any more accounts at the moment.',
+'emailauthenticated'         => 'Your e-mail address was authenticated on $2 at $3.',
 'emailnotauthenticated'      => 'Your e-mail address is not yet authenticated.
 No e-mail will be sent for any of the following features.',
-'noemailprefs'               => 'Specify an e-mail address for these features to work.',
+'noemailprefs'               => 'Specify an e-mail address in your preferences for these features to work.',
 'emailconfirmlink'           => 'Confirm your e-mail address',
 'invalidemailaddress'        => 'The e-mail address cannot be accepted as it appears to have an invalid format.
 Please enter a well-formatted address or empty that field.',
@@ -975,6 +971,8 @@ Please enter a well-formatted address or empty that field.',
 You should log in and change your password now.
 
 You may ignore this message, if this account was created in error.',
+'login-throttled'            => "You have made too many recent attempts on this account's password.
+Please wait before trying again.",
 'loginlanguagelabel'         => 'Language: $1',
 'loginlanguagelinks'         => '* Deutsch|de
 * English|en
@@ -985,17 +983,24 @@ You may ignore this message, if this account was created in error.',
 * Nederlands|nl', # do not translate or duplicate this message to other languages
 
 # Password reset dialog
-'resetpass'               => 'Reset account password',
-'resetpass_announce'      => 'You logged in with a temporary e-mailed code.
+'resetpass'                 => 'Change password',
+'resetpass_announce'        => 'You logged in with a temporary e-mailed code.
 To finish logging in, you must set a new password here:',
-'resetpass_text'          => '<!-- Add text here -->', # only translate this message to other languages if you have to change it
-'resetpass_header'        => 'Reset password',
-'resetpass_submit'        => 'Set password and log in',
-'resetpass_success'       => 'Your password has been changed successfully! Now logging you in...',
-'resetpass_bad_temporary' => 'Invalid temporary password.
+'resetpass_text'            => '<!-- Add text here -->', # only translate this message to other languages if you have to change it
+'resetpass_header'          => 'Change account password',
+'oldpassword'               => 'Old password:',
+'newpassword'               => 'New password:',
+'retypenew'                 => 'Retype new password:',
+'resetpass_submit'          => 'Set password and log in',
+'resetpass_success'         => 'Your password has been changed successfully! Now logging you in...',
+'resetpass_bad_temporary'   => 'Invalid temporary password.
+You may have already successfully changed your password or requested a new temporary password.',
+'resetpass_forbidden'       => 'Passwords cannot be changed',
+'resetpass-no-info'         => 'You must be logged in to access this page directly.',
+'resetpass-submit-loggedin' => 'Change password',
+'resetpass-wrong-oldpass'   => 'Invalid temporary or current password.
 You may have already successfully changed your password or requested a new temporary password.',
-'resetpass_forbidden'     => 'Passwords cannot be changed',
-'resetpass_missing'       => 'No form data.',
+'resetpass-temp-password'   => 'Temporary password:',
 
 # Edit page toolbar
 'bold_sample'     => 'Bold text',
@@ -1020,8 +1025,8 @@ You may have already successfully changed your password or requested a new tempo
 'hr_tip'          => 'Horizontal line (use sparingly)',
 
 # Edit pages
-'summary'                          => 'Summary',
-'subject'                          => 'Subject/headline',
+'summary'                          => 'Summary:',
+'subject'                          => 'Subject/headline:',
 'minoredit'                        => 'This is a minor edit',
 'watchthis'                        => 'Watch this page',
 'savearticle'                      => 'Save page',
@@ -1036,8 +1041,8 @@ If you click Save again, your edit will be saved without one.",
 'missingcommenttext'               => 'Please enter a comment below.',
 'missingcommentheader'             => "'''Reminder:''' You have not provided a subject/headline for this comment.
 If you click Save again, your edit will be saved without one.",
-'summary-preview'                  => 'Summary preview',
-'subject-preview'                  => 'Subject/headline preview',
+'summary-preview'                  => 'Summary preview:',
+'subject-preview'                  => 'Subject/headline preview:',
 'blockedtitle'                     => 'User is blocked',
 'blockedtext'                      => "<big>'''Your user name or IP address has been blocked.'''</big>
 
@@ -1082,7 +1087,9 @@ Since there is no section $1, there is no place to save your edit.',
 'loginreqlink'                     => 'log in',
 'loginreqpagetext'                 => 'You must $1 to view other pages.',
 'accmailtitle'                     => 'Password sent.',
-'accmailtext'                      => 'The password for "$1" has been sent to $2.',
+'accmailtext'                      => "A randomly generated password for [[User talk:$1|$1]] has been sent to $2.
+
+The password for this new account can be changed on the ''[[Special:ChangePassword|change password]]'' page upon logging in.",
 'newarticle'                       => '(New)',
 'newarticletext'                   => "You have followed a link to a page that does not exist yet.
 To create the page, start typing in the box below (see the [[{{MediaWiki:Helppage}}|help page]] for more info).
@@ -1093,7 +1100,10 @@ If you are here by mistake, click your browser's '''back''' button.",
 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/signup|create an account]] or [[Special:UserLogin|log in]] to avoid future confusion with other anonymous users.''",
-'noarticletext'                    => 'There is currently no text in this page, you can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].',
+'noarticletext'                    => 'There is currently no text in this page.
+You can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} search the related logs],
+or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page]</span>.',
 'noarticletextanon'                => '{{int:noarticletext}}', # do not translate or duplicate this message to other languages
 'userpage-userdoesnotexist'        => 'User account "$1" is not registered.
 Please check if you want to create/edit this page.',
@@ -1102,7 +1112,7 @@ Please check if you want to create/edit this page.',
 '''Konqueror: '''click ''Reload'' or press ''F5'';
 '''Opera:''' clear the cache in ''Tools → Preferences'';
 '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh,'' or press ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.",
+'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.'''
@@ -1110,25 +1120,25 @@ Please check if you want to create/edit this page.',
 'userinvalidcssjstitle'            => "'''Warning:''' There is no skin \"\$1\".
 Remember that custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/monobook.css as opposed to {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Updated)',
-'note'                             => '<strong>Note:</strong>',
-'previewnote'                      => '<strong>This is only a preview;
-changes have not yet been saved!</strong>',
+'note'                             => "'''Note:'''",
+'previewnote'                      => "'''Remember that this is only a preview.
+Your changes have not yet been saved!'''",
 'previewconflict'                  => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.',
-'session_fail_preview'             => '<strong>Sorry! We could not process your edit due to a loss of session data.
+'session_fail_preview'             => "'''Sorry! We could not process your edit due to a loss of session data.
 Please try again.
-If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.</strong>',
-'session_fail_preview_html'        => "<strong>Sorry! We could not process your edit due to a loss of session data.</strong>
+If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.'''",
+'session_fail_preview_html'        => "'''Sorry! We could not process your edit due to a loss of session data.'''
 
 ''Because {{SITENAME}} has raw HTML enabled, the preview is hidden as a precaution against JavaScript attacks.''
 
-<strong>If this is a legitimate edit attempt, please try again.
-If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.</strong>",
-'token_suffix_mismatch'            => '<strong>Your edit has been rejected because your client mangled the punctuation characters in the edit token.
+'''If this is a legitimate edit attempt, please try again.
+If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.'''",
+'token_suffix_mismatch'            => "'''Your edit has been rejected because your client mangled the punctuation characters in the edit token.
 The edit has been rejected to prevent corruption of the page text.
-This sometimes happens when you are using a buggy web-based anonymous proxy service.</strong>',
+This sometimes happens when you are using a buggy web-based anonymous proxy service.'''",
 'editing'                          => 'Editing $1',
 'editingsection'                   => 'Editing $1 (section)',
-'editingcomment'                   => 'Editing $1 (comment)',
+'editingcomment'                   => 'Editing $1 (new section)',
 '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.
@@ -1137,30 +1147,32 @@ 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\".",
 'yourtext'                         => 'Your text',
 'storedversion'                    => 'Stored version',
-'nonunicodebrowser'                => '<strong>WARNING: Your browser is not unicode compliant.
-A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>',
-'editingold'                       => '<strong>WARNING: You are editing an out-of-date revision of this page.
-If you save it, any changes made since this revision will be lost.</strong>',
+'nonunicodebrowser'                => "'''WARNING: Your browser is not unicode compliant.
+A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.'''",
+'editingold'                       => "'''WARNING: You are editing an out-of-date 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).
+'copyrightwarning'                 => "Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details).
 If you do not want your writing to be edited mercilessly and redistributed at will, then do not submit it here.<br />
 You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource.
-<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>',
-'copyrightwarning2'                => 'Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors.
+'''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 do not want your writing to be edited mercilessly, then do not submit it here.<br />
 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).
-<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>',
-'longpagewarning'                  => '<strong>WARNING: This page is $1 kilobytes long;
+'''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.</strong>',
-'longpageerror'                    => '<strong>ERROR: The text you have submitted is $1 kilobytes long, which is longer than the maximum of $2 kilobytes.
-It cannot be saved.</strong>',
-'readonlywarning'                  => '<strong>WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now.
-You may wish to cut-n-paste the text into a text file and save it for later.</strong>',
-'protectedpagewarning'             => '<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>',
+Please consider breaking the page into smaller sections.'''",
+'longpageerror'                    => "'''ERROR: The text you have submitted is $1 kilobytes long, which is longer than the maximum of $2 kilobytes.
+It cannot be saved.'''",
+'readonlywarning'                  => "'''WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now.
+You may wish to cut-n-paste the text into a text file and save it for later.'''
+
+The administrator who locked it offered this explanation: $1",
+'protectedpagewarning'             => "'''WARNING: This page has been locked so that only users with administrator privileges can edit it.'''",
 'semiprotectedpagewarning'         => "'''Note:''' This page has been locked so that only registered users can edit it.",
-'cascadeprotectedwarning'          => "'''Warning:''' This page has been locked so that only users with sysop privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
-'titleprotectedwarning'            => '<strong>WARNING:  This page has been locked so that only some users can create it.</strong>',
+'cascadeprotectedwarning'          => "'''Warning:''' This page has been locked so that only users with administrator privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
+'titleprotectedwarning'            => "'''WARNING:  This page has been locked so that [[Special:ListGroupRights|specific rights]] are needed to create it.'''",
 'templatesused'                    => 'Templates used on this page:',
 'templatesusedpreview'             => 'Templates used in this preview:',
 'templatesusedsection'             => 'Templates used in this section:',
@@ -1179,11 +1191,22 @@ You can go back and edit an existing page, or [[Special:UserLogin|log in or crea
 
 You should consider whether it is appropriate to continue editing this page.
 The deletion log for this page is provided here for convenience:",
+'deleted-notice'                   => 'This page has been deleted.
+The deletion log for the page is provided below for reference.',
+'deletelog-fulllog'                => 'View full log',
+'edit-hook-aborted'                => 'Edit aborted by hook.
+It gave no explanation.',
+'edit-gone-missing'                => 'Could not update the page.
+It appears to have been deleted.',
+'edit-conflict'                    => 'Edit conflict.',
+'edit-no-change'                   => 'Your edit was ignored, because no change was made to the text.',
+'edit-already-exists'              => 'Could not create a new page.
+It already exists.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Warning: This page contains too many expensive parser function calls.
 
-It should have less than $2, there are now $1.',
+It should have less than $2 {{PLURAL:$2|call|calls}}, there {{PLURAL:$1|is now $1 call|are now $1 calls}}.',
 'expensive-parserfunction-category'       => 'Pages with too many expensive parser function calls',
 'post-expand-template-inclusion-warning'  => 'Warning: Template include size is too large.
 Some templates will not be included.',
@@ -1191,6 +1214,8 @@ Some templates will not be included.',
 'post-expand-template-argument-warning'   => 'Warning: This page contains at least one template argument which has a too large expansion size.
 These arguments have been omitted.',
 'post-expand-template-argument-category'  => 'Pages containing omitted template arguments',
+'parser-template-loop-warning'            => 'Template loop detected: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Template recursion depth limit exceeded ($1)',
 
 # "Undo" feature
 'undo-success' => 'The edit can be undone.
@@ -1207,33 +1232,32 @@ The reason given by $3 is ''$2''",
 'cantcreateaccount-nonblock-text' => '', # do not translate or duplicate this message to other languages
 
 # History pages
-'viewpagelogs'          => 'View logs for this page',
-'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.',
-'currentrev'            => 'Current revision',
-'revisionasof'          => 'Revision as of $1',
-'revision-info'         => 'Revision as of $1 by $2',
-'revision-info-current' => '-', # do not translate or duplicate this message to other languages
-'revision-nav'          => '($1) $2 | $3 ($4) | $5 ($6)', # do not translate or duplicate this message to other languages
-'previousrevision'      => '�Older revision',
-'nextrevision'          => 'Newer revision→',
-'currentrevisionlink'   => 'Current revision',
-'cur'                   => 'cur',
-'next'                  => 'next',
-'last'                  => 'last',
-'page_first'            => 'first',
-'page_last'             => 'last',
-'histlegend'            => 'Diff selection: mark the radio boxes of the versions to compare and hit enter or the button at the bottom.<br />
-Legend: (cur) = difference with current version,
-(last) = difference with preceding version, M = minor edit.',
-'history_copyright'     => '-', # do not translate or duplicate this message to other languages
-'deletedrev'            => '[deleted]',
-'histfirst'             => 'Earliest',
-'histlast'              => 'Latest',
-'historysize'           => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'          => '(empty)',
+'viewpagelogs'           => 'View logs for this page',
+'nohistory'              => 'There is no edit history for this page.',
+'currentrev'             => 'Current revision',
+'currentrev-asof'        => 'Current revision as of $1',
+'revisionasof'           => 'Revision as of $1',
+'revision-info'          => 'Revision as of $1 by $2', # Additionally available: $3: revision id
+'revision-info-current'  => '-', # Available parameters: $1: timestamp; $2: userlinks; $3: revision id; do not translate or duplicate this message to other languages
+'revision-nav'           => '($1) $2{{int:pipe-separator}}$3 ($4){{int:pipe-separator}}$5 ($6)', # do not translate or duplicate this message to other languages
+'previousrevision'       => '� Older revision',
+'nextrevision'           => 'Newer revision →',
+'currentrevisionlink'    => 'Current revision',
+'cur'                    => 'cur',
+'next'                   => 'next',
+'last'                   => 'prev',
+'page_first'             => 'first',
+'page_last'              => 'last',
+'histlegend'             => "Diff selection: mark the radio boxes of the versions to compare and hit enter or the button at the bottom.<br />
+Legend: '''({{int:cur}})''' = difference with current version,
+'''({{int:last}})''' = difference with preceding version, '''{{int:minoreditletter}}''' = minor edit.",
+'history-fieldset-title' => 'Browse history',
+'history_copyright'      => '-', # do not translate or duplicate this message to other languages
+'deletedrev'             => '[deleted]',
+'histfirst'              => 'Earliest',
+'histlast'               => 'Latest',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(empty)',
 
 # Revision feed
 'history-feed-title'          => 'Revision history',
@@ -1269,8 +1293,8 @@ Other admins on {{SITENAME}} will still be able to access the hidden content and
 'revdelete-hide-name'         => 'Hide action and target',
 'revdelete-hide-comment'      => 'Hide edit comment',
 'revdelete-hide-user'         => "Hide editor's username/IP",
-'revdelete-hide-restricted'   => 'Apply these restrictions to Sysops and lock this interface',
-'revdelete-suppress'          => 'Suppress data from Sysops as well as others',
+'revdelete-hide-restricted'   => 'Apply these restrictions to administrators and lock this interface',
+'revdelete-suppress'          => 'Suppress data from administrators as well as others',
 'revdelete-hide-image'        => 'Hide file content',
 'revdelete-unsuppress'        => 'Remove restrictions on restored revisions',
 'revdelete-log'               => 'Log comment:',
@@ -1285,8 +1309,8 @@ Other admins on {{SITENAME}} will still be able to access the hidden content and
 'revdelete-content'           => 'content',
 'revdelete-summary'           => 'edit summary',
 'revdelete-uname'             => 'username',
-'revdelete-restricted'        => 'applied restrictions to sysops',
-'revdelete-unrestricted'      => 'removed restrictions for sysops',
+'revdelete-restricted'        => 'applied restrictions to administrators',
+'revdelete-unrestricted'      => 'removed restrictions for administrators',
 'revdelete-hid'               => 'hid $1',
 'revdelete-unhid'             => 'unhid $1',
 'revdelete-log-message'       => '$1 for $2 {{PLURAL:$2|revision|revisions}}',
@@ -1294,7 +1318,7 @@ Other admins on {{SITENAME}} will still be able to access the hidden content and
 
 # Suppression log
 'suppressionlog'     => 'Suppression log',
-'suppressionlogtext' => 'Below is a list of deletions and blocks involving content hidden from sysops.
+'suppressionlogtext' => 'Below is a list of deletions and blocks involving content hidden from administrators.
 See the [[Special:IPBlockList|IP block list]] for the list of currently operational bans and blocks.',
 
 # History merging
@@ -1319,6 +1343,7 @@ Note that using the navigation links will reset this column.',
 'mergehistory-invalid-destination' => 'Destination page must be a valid title.',
 'mergehistory-autocomment'         => 'Merged [[:$1]] into [[:$2]]',
 'mergehistory-comment'             => 'Merged [[:$1]] into [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Source and destination pages cannot be the same',
 
 # Merge log
 'mergelog'           => 'Merge log',
@@ -1331,55 +1356,132 @@ Note that using the navigation links will reset this column.',
 'difference'              => '(Difference between revisions)',
 'lineno'                  => 'Line $1:',
 'compareselectedversions' => 'Compare selected versions',
+'visualcomparison'        => 'Visual comparison',
+'wikicodecomparison'      => 'Wikitext comparison',
 'editundo'                => 'undo',
-'diff-multi'              => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown.)',
+'diff-multi'              => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown)',
+'diff-movedto'            => 'moved to $1',
+'diff-styleadded'         => '$1 style added',
+'diff-added'              => '$1 added',
+'diff-changedto'          => 'changed to $1',
+'diff-movedoutof'         => 'moved out of $1',
+'diff-styleremoved'       => '$1 style removed',
+'diff-removed'            => '$1 removed',
+'diff-changedfrom'        => 'changed from $1',
+'diff-src'                => 'source',
+'diff-withdestination'    => 'with destination $1',
+'diff-with'               => '&#32;with $1 $2',
+'diff-with-additional'    => '$1 $2', # only translate this message to other languages if you have to change it
+'diff-with-final'         => '&#32;and $1 $2',
+'diff-width'              => 'width',
+'diff-height'             => 'height',
+'diff-p'                  => "a '''paragraph'''",
+'diff-blockquote'         => "a '''quote'''",
+'diff-h1'                 => "a '''heading (level 1)'''",
+'diff-h2'                 => "a '''heading (level 2)'''",
+'diff-h3'                 => "a '''heading (level 3)'''",
+'diff-h4'                 => "a '''heading (level 4)'''",
+'diff-h5'                 => "a '''heading (level 5)'''",
+'diff-pre'                => "a '''preformatted block'''",
+'diff-div'                => "a '''division'''",
+'diff-ul'                 => "an '''unordered list'''",
+'diff-ol'                 => "an '''ordered list'''",
+'diff-li'                 => "a '''list item'''",
+'diff-table'              => "a '''table'''",
+'diff-tbody'              => "a '''table's content'''",
+'diff-tr'                 => "a '''row'''",
+'diff-td'                 => "a '''cell'''",
+'diff-th'                 => "a '''header'''",
+'diff-br'                 => "a '''break'''",
+'diff-hr'                 => "a '''horizontal rule'''",
+'diff-code'               => "a '''computer code block'''",
+'diff-dl'                 => "a '''definition list'''",
+'diff-dt'                 => "a '''definition term'''",
+'diff-dd'                 => "a '''definition'''",
+'diff-input'              => "an '''input'''",
+'diff-form'               => "a '''form'''",
+'diff-img'                => "an '''image'''",
+'diff-span'               => "a '''span'''",
+'diff-a'                  => "a '''link'''",
+'diff-i'                  => "'''italics'''",
+'diff-b'                  => "'''bold'''",
+'diff-strong'             => "'''strong'''",
+'diff-em'                 => "'''emphasis'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''big'''",
+'diff-del'                => "'''deleted'''",
+'diff-tt'                 => "'''fixed width'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''strikethrough'''",
 
 # Search results
-'searchresults'             => 'Search results',
-'searchresulttext'          => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|all pages starting with "$1"]] | [[Special:WhatLinksHere/$1|all pages that link to "$1"]])',
-'searchsubtitleinvalid'     => "You searched for '''$1'''",
-'noexactmatch'              => "'''There is no page titled \"\$1\".'''
+'searchresults'                    => 'Search results',
+'searchresults-title'              => 'Search results for "$1"',
+'searchresulttext'                 => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|all pages starting with "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|all pages that link to "$1"]])',
+'searchsubtitleinvalid'            => "You searched for '''$1'''",
+'noexactmatch'                     => "'''There is no page titled \"\$1\".'''
 You can [[:\$1|create this page]].",
-'noexactmatch-nocreate'     => "'''There is no page titled \"\$1\".'''",
-'toomanymatches'            => 'Too many matches were returned, please try a different query',
-'titlematches'              => 'Page title matches',
-'notitlematches'            => 'No page title matches',
-'textmatches'               => 'Page text matches',
-'notextmatches'             => 'No page text matches',
-'prevn'                     => 'previous $1',
-'nextn'                     => 'next $1',
-'viewprevnext'              => 'View ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 word|$2 words}})',
-'search-result-score'       => 'Relevance: $1%',
-'search-redirect'           => '(redirect $1)',
-'search-section'            => '(section $1)',
-'search-suggest'            => 'Did you mean: $1',
-'search-interwiki-caption'  => 'Sister projects',
-'search-interwiki-default'  => '$1 results:',
-'search-interwiki-custom'   => '', # do not translate or duplicate this message to other languages
-'search-interwiki-more'     => '(more)',
-'search-mwsuggest-enabled'  => 'with suggestions',
-'search-mwsuggest-disabled' => 'no suggestions',
-'search-relatedarticle'     => 'Related',
-'mwsuggest-disable'         => 'Disable AJAX suggestions',
-'searchrelated'             => 'related',
-'searchall'                 => 'all',
-'showingresults'            => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.",
-'showingresultsnum'         => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.",
-'showingresultstotal'       => "Showing below {{PLURAL:$3|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}",
-'nonefound'                 => "'''Note''': Only some namespaces are searched by default.
+'noexactmatch-nocreate'            => "'''There is no page titled \"\$1\".'''",
+'toomanymatches'                   => 'Too many matches were returned, please try a different query',
+'titlematches'                     => 'Page title matches',
+'notitlematches'                   => 'No page title matches',
+'textmatches'                      => 'Page text matches',
+'notextmatches'                    => 'No page text matches',
+'prevn'                            => 'previous $1',
+'nextn'                            => 'next $1',
+'viewprevnext'                     => 'View ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Search options',
+'searchmenu-exists'                => "'''There is a page named \"[[:\$1]]\" on this wiki'''",
+'searchmenu-new'                   => "'''Create the page \"[[:\$1]]\" on this wiki!'''",
+'searchhelp-url'                   => 'Help:Contents',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Browse pages with this prefix]]',
+'searchmenu-help'                  => '[[{{MediaWiki:Searchhelp-url}}|{{int:help}}]]?', # do not translate or duplicate this message to other languages
+'searchprofile-articles'           => 'Content pages',
+'searchprofile-articles-and-proj'  => 'Content & project pages',
+'searchprofile-project'            => 'Project pages',
+'searchprofile-images'             => 'Files',
+'searchprofile-everything'         => 'Everything',
+'searchprofile-advanced'           => 'Advanced',
+'searchprofile-articles-tooltip'   => 'Search in $1',
+'searchprofile-project-tooltip'    => 'Search in $1',
+'searchprofile-images-tooltip'     => 'Search for files',
+'searchprofile-everything-tooltip' => 'Search all of content (including talk pages)',
+'searchprofile-advanced-tooltip'   => 'Search in custom namespaces',
+'prefs-search-nsdefault'           => 'Search using defaults:',
+'prefs-search-nscustom'            => 'Search custom namespaces:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 word|$2 words}})',
+'search-result-score'              => 'Relevance: $1%',
+'search-redirect'                  => '(redirect $1)',
+'search-section'                   => '(section $1)',
+'search-suggest'                   => 'Did you mean: $1',
+'search-interwiki-caption'         => 'Sister projects',
+'search-interwiki-default'         => '$1 results:',
+'search-interwiki-custom'          => '', # do not translate or duplicate this message to other languages
+'search-interwiki-more'            => '(more)',
+'search-mwsuggest-enabled'         => 'with suggestions',
+'search-mwsuggest-disabled'        => 'no suggestions',
+'search-relatedarticle'            => 'Related',
+'mwsuggest-disable'                => 'Disable AJAX suggestions',
+'searchrelated'                    => 'related',
+'searchall'                        => 'all',
+'showingresults'                   => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.",
+'showingresultsnum'                => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.",
+'showingresultstotal'              => "Showing below {{PLURAL:$4|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}",
+'nonefound'                        => "'''Note''': Only some namespaces are searched by default.
 Try prefixing your query with ''all:'' to search all content (including talk pages, templates, etc), or use the desired namespace as prefix.",
-'powersearch'               => 'Advanced search',
-'powersearch-legend'        => 'Advanced search',
-'powersearch-ns'            => 'Search in namespaces:',
-'powersearch-redir'         => 'List redirects',
-'powersearch-field'         => 'Search for',
-'search-external'           => 'External search',
-'searchdisabled'            => '{{SITENAME}} search is disabled.
+'search-nonefound'                 => 'There were no results matching the query.',
+'powersearch'                      => 'Advanced search',
+'powersearch-legend'               => 'Advanced search',
+'powersearch-ns'                   => 'Search in namespaces:',
+'powersearch-redir'                => 'List redirects',
+'powersearch-field'                => 'Search for',
+'search-external'                  => 'External search',
+'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'              => '<form method="get" action="http://www.google.com/search" id="googlesearch">
+'googlesearch'                     => '<form method="get" action="http://www.google.com/search" id="googlesearch">
     <input type="hidden" name="domains" value="{{SERVER}}" />
     <input type="hidden" name="num" value="50" />
     <input type="hidden" name="ie" value="$2" />
@@ -1397,70 +1499,76 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'opensearch-desc' => '{{SITENAME}} ({{CONTENTLANGUAGE}})', # do not translate or duplicate this message to other languages
 
 # Preferences page
-'preferences'              => 'Preferences',
-'preferences-summary'      => '', # do not translate or duplicate this message to other languages
-'mypreferences'            => 'My preferences',
-'prefs-edits'              => 'Number of edits:',
-'prefsnologin'             => 'Not logged in',
-'prefsnologintext'         => 'You must be <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logged in]</span> to set user preferences.',
-'prefsreset'               => 'Preferences have been reset from storage.',
-'qbsettings'               => 'Quickbar',
-'qbsettings-none'          => 'None',
-'qbsettings-fixedleft'     => 'Fixed left',
-'qbsettings-fixedright'    => 'Fixed right',
-'qbsettings-floatingleft'  => 'Floating left',
-'qbsettings-floatingright' => 'Floating right',
-'changepassword'           => 'Change password',
-'skin'                     => 'Skin',
-'math'                     => 'Math',
-'dateformat'               => 'Date format',
-'datedefault'              => 'No preference',
-'datetime'                 => 'Date and time',
-'math_failure'             => 'Failed to parse',
-'math_unknown_error'       => 'unknown error',
-'math_unknown_function'    => 'unknown function',
-'math_lexing_error'        => 'lexing error',
-'math_syntax_error'        => 'syntax error',
-'math_image_error'         => 'PNG conversion failed;
+'preferences'               => 'Preferences',
+'preferences-summary'       => '', # do not translate or duplicate this message to other languages
+'mypreferences'             => 'My preferences',
+'prefs-edits'               => 'Number of edits:',
+'prefsnologin'              => 'Not logged in',
+'prefsnologintext'          => 'You must be <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logged in]</span> to set user preferences.',
+'prefsreset'                => 'Preferences have been reset from storage.',
+'qbsettings'                => 'Quickbar',
+'qbsettings-none'           => 'None',
+'qbsettings-fixedleft'      => 'Fixed left',
+'qbsettings-fixedright'     => 'Fixed right',
+'qbsettings-floatingleft'   => 'Floating left',
+'qbsettings-floatingright'  => 'Floating right',
+'changepassword'            => 'Change password',
+'skin'                      => 'Skin',
+'skin-preview'              => 'Preview',
+'math'                      => 'Math',
+'dateformat'                => 'Date format',
+'datedefault'               => 'No preference',
+'datetime'                  => 'Date and time',
+'math_failure'              => 'Failed to parse',
+'math_unknown_error'        => 'unknown error',
+'math_unknown_function'     => 'unknown function',
+'math_lexing_error'         => 'lexing error',
+'math_syntax_error'         => 'syntax error',
+'math_image_error'          => 'PNG conversion failed;
 check for correct installation of latex, dvips, gs, and convert',
-'math_bad_tmpdir'          => 'Cannot write to or create math temp directory',
-'math_bad_output'          => 'Cannot write to or create math output directory',
-'math_notexvc'             => 'Missing texvc executable;
+'math_bad_tmpdir'           => 'Cannot write to or create math temp directory',
+'math_bad_output'           => 'Cannot write to or create math output directory',
+'math_notexvc'              => 'Missing texvc executable;
 please see math/README to configure.',
-'prefs-personal'           => 'User profile',
-'prefs-rc'                 => 'Recent changes',
-'prefs-watchlist'          => 'Watchlist',
-'prefs-watchlist-days'     => 'Days to show in watchlist:',
-'prefs-watchlist-edits'    => 'Maximum number of changes to show in expanded watchlist:',
-'prefs-misc'               => 'Misc',
-'saveprefs'                => 'Save',
-'resetprefs'               => 'Clear unsaved changes',
-'oldpassword'              => 'Old password:',
-'newpassword'              => 'New password:',
-'retypenew'                => 'Retype new password:',
-'textboxsize'              => 'Editing',
-'rows'                     => 'Rows:',
-'columns'                  => 'Columns:',
-'searchresultshead'        => 'Search',
-'resultsperpage'           => 'Hits per page:',
-'contextlines'             => 'Lines per hit:',
-'contextchars'             => 'Context per line:',
-'stub-threshold'           => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):',
-'recentchangesdays'        => 'Days to show in recent changes:',
-'recentchangescount'       => 'Number of edits to show in recent changes, history and log pages:',
-'savedprefs'               => 'Your preferences have been saved.',
-'timezonelegend'           => 'Time zone',
-'timezonetext'             => '¹The number of hours your local time differs from server time (UTC).',
-'localtime'                => 'Local time',
-'timezoneoffset'           => 'Offset¹',
-'servertime'               => 'Server time',
-'guesstimezone'            => 'Fill in from browser',
-'allowemail'               => 'Enable e-mail from other users',
-'prefs-searchoptions'      => 'Search options',
-'prefs-namespaces'         => 'Namespaces',
-'defaultns'                => 'Search in these namespaces by default:',
-'default'                  => 'default',
-'files'                    => 'Files',
+'prefs-personal'            => 'User profile',
+'prefs-rc'                  => 'Recent changes',
+'prefs-watchlist'           => 'Watchlist',
+'prefs-watchlist-days'      => 'Days to show in watchlist:',
+'prefs-watchlist-days-max'  => '(maximum 7 days)',
+'prefs-watchlist-edits'     => 'Maximum number of changes to show in expanded watchlist:',
+'prefs-watchlist-edits-max' => '(maximum number: 1000)',
+'prefs-misc'                => 'Misc',
+'prefs-resetpass'           => 'Change password',
+'saveprefs'                 => 'Save',
+'resetprefs'                => 'Clear unsaved changes',
+'textboxsize'               => 'Editing',
+'prefs-edit-boxsize'        => 'Size of the edit window.',
+'rows'                      => 'Rows:',
+'columns'                   => 'Columns:',
+'searchresultshead'         => 'Search',
+'resultsperpage'            => 'Hits per page:',
+'contextlines'              => 'Lines per hit:',
+'contextchars'              => 'Context per line:',
+'stub-threshold'            => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):',
+'recentchangesdays'         => 'Days to show in recent changes:',
+'recentchangesdays-max'     => '(maximum $1 {{PLURAL:$1|day|days}})',
+'recentchangescount'        => 'Number of edits to show in recent changes, page histories, and in logs, by default:',
+'savedprefs'                => 'Your preferences have been saved.',
+'timezonelegend'            => 'Time zone',
+'timezonetext'              => '¹The number of hours your local time differs from server time (UTC).',
+'localtime'                 => 'Local time:',
+'timezoneselect'            => 'Time zone:',
+'timezoneuseserverdefault'  => 'Use server default',
+'timezoneuseoffset'         => 'Other (specify offset)',
+'timezoneoffset'            => 'Offset¹:',
+'servertime'                => 'Server time:',
+'guesstimezone'             => 'Fill in from browser',
+'allowemail'                => 'Enable e-mail from other users',
+'prefs-searchoptions'       => 'Search options',
+'prefs-namespaces'          => 'Namespaces',
+'defaultns'                 => 'Search in these namespaces by default:',
+'default'                   => 'default',
+'files'                     => 'Files',
 
 # User rights
 'userrights'                     => 'User rights management', # Not used as normal message but as header for the special page itself
@@ -1468,7 +1576,7 @@ please see math/README to configure.',
 'userrights-lookup-user'         => 'Manage user groups',
 'userrights-user-editname'       => 'Enter a username:',
 'editusergroup'                  => 'Edit user groups',
-'editinguser'                    => "Changing user rights of user '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                    => "Changing user rights of user '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'       => 'Edit user groups',
 'saveusergroups'                 => 'Save user groups',
 'userrights-groupsmember'        => 'Member of:',
@@ -1490,7 +1598,7 @@ please see math/README to configure.',
 'group-user'          => 'Users',
 'group-autoconfirmed' => 'Autoconfirmed users',
 'group-bot'           => 'Bots',
-'group-sysop'         => 'Sysops',
+'group-sysop'         => 'Administrators',
 'group-bureaucrat'    => 'Bureaucrats',
 'group-suppress'      => 'Oversights',
 'group-all'           => '(all)',
@@ -1498,7 +1606,7 @@ please see math/README to configure.',
 'group-user-member'          => 'User',
 'group-autoconfirmed-member' => 'Autoconfirmed user',
 'group-bot-member'           => 'Bot',
-'group-sysop-member'         => 'Sysop',
+'group-sysop-member'         => 'Administrator',
 'group-bureaucrat-member'    => 'Bureaucrat',
 'group-suppress-member'      => 'Oversight',
 
@@ -1518,6 +1626,8 @@ please see math/README to configure.',
 'right-minoredit'            => 'Mark edits as minor',
 'right-move'                 => 'Move pages',
 'right-move-subpages'        => 'Move pages with their subpages',
+'right-move-rootuserpages'   => 'Move root user pages',
+'right-movefile'             => 'Move files',
 'right-suppressredirect'     => 'Not create a redirect from the old name when moving a page',
 'right-upload'               => 'Upload files',
 'right-reupload'             => 'Overwrite an existing file',
@@ -1536,10 +1646,10 @@ please see math/README to configure.',
 'right-deletedhistory'       => 'View deleted history entries, without their associated text',
 'right-browsearchive'        => 'Search deleted pages',
 'right-undelete'             => 'Undelete a page',
-'right-suppressrevision'     => 'Review and restore revisions hidden from Sysops',
+'right-suppressrevision'     => 'Review and restore revisions hidden from administrators',
 'right-suppressionlog'       => 'View private logs',
 'right-block'                => 'Block other users from editing',
-'right-blockemail'           => 'Block a user from sending email',
+'right-blockemail'           => 'Block a user from sending e-mail',
 'right-hideuser'             => 'Block a username, hiding it from the public',
 'right-ipblock-exempt'       => 'Bypass IP blocks, auto-blocks and range blocks',
 'right-proxyunbannable'      => 'Bypass automatic blocks of proxies',
@@ -1568,10 +1678,47 @@ please see math/README to configure.',
 'rightslogentry' => 'changed group membership for $1 from $2 to $3',
 'rightsnone'     => '(none)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'read this page',
+'action-edit'                 => 'edit this page',
+'action-createpage'           => 'create pages',
+'action-createtalk'           => 'create discussion pages',
+'action-createaccount'        => 'create this user account',
+'action-minoredit'            => 'mark this edit as minor',
+'action-move'                 => 'move this page',
+'action-move-subpages'        => 'move this page, and its subpages',
+'action-move-rootuserpages'   => 'move root user pages',
+'action-movefile'             => 'move this file',
+'action-upload'               => 'upload this file',
+'action-reupload'             => 'overwrite this existing file',
+'action-reupload-shared'      => 'override this file on a shared repository',
+'action-upload_by_url'        => 'upload this file from a URL address',
+'action-writeapi'             => 'use the write API',
+'action-delete'               => 'delete this page',
+'action-deleterevision'       => 'delete this revision',
+'action-deletedhistory'       => "view this page's deleted history",
+'action-browsearchive'        => 'search deleted pages',
+'action-undelete'             => 'undelete this page',
+'action-suppressrevision'     => 'review and restore this hidden revision',
+'action-suppressionlog'       => 'view this private log',
+'action-block'                => 'block this user from editing',
+'action-protect'              => 'change protection levels for this page',
+'action-import'               => 'import this page from another wiki',
+'action-importupload'         => 'import this page from a file upload',
+'action-patrol'               => "mark others' edit as patrolled",
+'action-autopatrol'           => 'have your edit marked as patrolled',
+'action-unwatchedpages'       => 'view the list of unwatched pages',
+'action-trackback'            => 'submit a trackback',
+'action-mergehistory'         => 'merge the history of this page',
+'action-userrights'           => 'edit all user rights',
+'action-userrights-interwiki' => 'edit user rights of users on other wikis',
+'action-siteadmin'            => 'lock or unlock the database',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|change|changes}}',
 'recentchanges'                     => 'Recent changes',
 'recentchanges-url'                 => 'Special:RecentChanges', # do not translate or duplicate this message to other languages
+'recentchanges-legend'              => 'Recent changes options',
 'recentchangestext'                 => 'Track the most recent changes to the wiki on this page.',
 'recentchanges-feed-description'    => 'Track the most recent changes to the wiki in this feed.',
 'rcnote'                            => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $5, $4.",
@@ -1598,10 +1745,13 @@ please see math/README to configure.',
 'rc_categories_any'                 => 'Any',
 'rc-change-size'                    => '$1', # only translate this message to other languages if you have to change it
 'newsectionsummary'                 => '/* $1 */ new section',
+'rc-enhanced-expand'                => 'Show details (requires JavaScript)',
+'rc-enhanced-hide'                  => 'Hide details',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Related changes',
 'recentchangeslinked-title'    => 'Changes related to "$1"',
+'recentchangeslinked-backlink' => '� $1', # only translate this message to other languages if you have to change it
 'recentchangeslinked-noresult' => 'No changes on linked pages during the given period.',
 'recentchangeslinked-summary'  => "This is a list of changes made recently to pages linked from a specified page (or to members of a specified category).
 Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.",
@@ -1620,11 +1770,11 @@ Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.",
 'uploaderror'                 => 'Upload error',
 'upload-summary'              => '', # do not translate or duplicate this message to other languages
 'uploadtext'                  => "Use the form below to upload files.
-To view or search previously uploaded files go to the [[Special:ImageList|list of uploaded files]], (re)uploads are also logged in the [[Special:Log/upload|upload log]], deletions in the [[Special:Log/delete|deletion log]].
+To view or search previously uploaded files go to the [[Special:FileList|list of uploaded files]], (re)uploads are also logged in the [[Special:Log/upload|upload log]], deletions in the [[Special:Log/delete|deletion log]].
 
 To include a file in a page, use a link in one of the following forms:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' to use the full version of the file
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' to use a 200 pixel wide rendition in a box in the left margin with 'alt text' as description
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' to use the full version of the file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' to use a 200 pixel wide rendition in a box in the left margin with 'alt text' as description
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' for directly linking to the file without displaying the file",
 'upload-permitted'            => 'Permitted file types: $1.',
 'upload-preferred'            => 'Preferred file types: $1.',
@@ -1633,7 +1783,7 @@ To include a file in a page, use a link in one of the following forms:
 'uploadlog'                   => 'upload log',
 'uploadlogpage'               => 'Upload log',
 'uploadlogpagetext'           => 'Below is a list of the most recent file uploads.
-See the [[Special:NewImages|gallery of new files]] for a more visual overview.',
+See the [[Special:NewFiles|gallery of new files]] for a more visual overview.',
 'filename'                    => 'Filename',
 'filedesc'                    => 'Summary',
 'fileuploadsummary'           => 'Summary:',
@@ -1659,26 +1809,27 @@ this file is $2.',
 'emptyfile'                   => 'The file you uploaded seems to be empty.
 This might be due to a typo in the file name.
 Please check whether you really want to upload this file.',
-'fileexists'                  => 'A file with this name exists already, please check <strong><tt>$1</tt></strong> if you are not sure if you want to change it.',
-'filepageexists'              => 'The description page for this file has already been created at <strong><tt>$1</tt></strong>, but no file with this name currently exists.
+'fileexists'                  => "A file with this name exists already, please check '''<tt>$1</tt>''' if you are not sure if you want to change it.",
+'filepageexists'              => "The description page for this file has already been created at '''<tt>$1</tt>''', but no file with this name currently exists.
 The summary you enter will not appear on the description page.
-To make your summary appear there, you will need to manually edit it',
-'fileexists-extension'        => 'A file with a similar name exists:<br />
-Name of the uploading file: <strong><tt>$1</tt></strong><br />
-Name of the existing file: <strong><tt>$2</tt></strong><br />
-Please choose a different name.',
+To make your summary appear there, you will need to manually edit it",
+'fileexists-extension'        => "A file with a similar name exists:<br />
+Name of the uploading file: '''<tt>$1</tt>'''<br />
+Name of the existing file: '''<tt>$2</tt>'''<br />
+Please choose a different name.",
 'fileexists-thumb'            => "<center>'''Existing file'''</center>",
-'fileexists-thumbnail-yes'    => 'The file seems to be an image of reduced size <i>(thumbnail)</i>.
-Please check the file <strong><tt>$1</tt></strong>.<br />
-If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.',
-'file-thumbnail-no'           => 'The filename begins with <strong><tt>$1</tt></strong>.
-It seems to be an image of reduced size <i>(thumbnail)</i>.
-If you have this image in full resolution upload this one, otherwise change the file name please.',
-'fileexists-forbidden'        => 'A file with this name exists already.
-If you still want to upload your file, please go back and use a new name. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "The file seems to be an image of reduced size ''(thumbnail)''.
+Please check the file '''<tt>$1</tt>'''.<br />
+If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
+'file-thumbnail-no'           => "The filename begins with '''<tt>$1</tt>'''.
+It seems to be an image of reduced size ''(thumbnail)''.
+If you have this image in full resolution upload this one, otherwise change the file name please.",
+'fileexists-forbidden'        => 'A file with this name already exists, and cannot be overwritten.
+If you still want to upload your file, please go back and use a new name. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository.
-If you still want to upload your file, please go back and use a new name. [[Image:$1|thumb|center|$1]]',
+If you still want to upload your file, please go back and use a new name. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'This file is a duplicate of the following {{PLURAL:$1|file|files}}:',
+'file-deleted-duplicate'      => "A file identical to this file ([[$1]]) has previously been deleted. You should check that file's deletion history before proceeding to re-upload it.",
 'successfulupload'            => 'Successful upload',
 'uploadwarning'               => 'Upload warning',
 'savefile'                    => 'Save file',
@@ -1700,8 +1851,8 @@ You should check the $1 before proceeding to upload it again.',
 
 You should consider whether it is appropriate to continue uploading this file.
 The deletion log for this file is provided here for convenience:",
-'filename-bad-prefix'         => 'The name of the file you are uploading begins with <strong>"$1"</strong>, which is a non-descriptive name typically assigned automatically by digital cameras.
-Please choose a more descriptive name for your file.',
+'filename-bad-prefix'         => "The name of the file you are uploading begins with '''\"\$1\"''', which is a non-descriptive name typically assigned automatically by digital cameras.
+Please choose a more descriptive name for your file.",
 'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
 # Syntax is as follows:
 #   * Everything from a "#" character to the end of the line is a comment
@@ -1743,20 +1894,21 @@ You may want to try at a less busy time.',
 'upload_source_url'  => ' (a valid, publicly accessible URL)',
 'upload_source_file' => ' (a file on your computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'This special page shows all uploaded files.
+# Special:ListFiles
+'listfiles-summary'     => 'This special page shows all uploaded files.
 By default the last uploaded files are shown at top of the list.
 A click on a column header changes the sorting.',
-'imagelist_search_for'  => 'Search for media name:',
+'listfiles_search_for'  => 'Search for media name:',
 'imgfile'               => 'file',
-'imagelist'             => 'File list',
-'imagelist_date'        => 'Date',
-'imagelist_name'        => 'Name',
-'imagelist_user'        => 'User',
-'imagelist_size'        => 'Size',
-'imagelist_description' => 'Description',
-
-# Image description page
+'listfiles'             => 'File list',
+'listfiles_date'        => 'Date',
+'listfiles_name'        => 'Name',
+'listfiles_user'        => 'User',
+'listfiles_size'        => 'Size',
+'listfiles_description' => 'Description',
+'listfiles_count'       => 'Versions',
+
+# File description page
 'filehist'                       => 'File history',
 'filehist-help'                  => 'Click on a date/time to view the file as it appeared at that time.',
 'filehist-deleteall'             => 'delete all',
@@ -1764,12 +1916,18 @@ A click on a column header changes the sorting.',
 'filehist-revert'                => 'revert',
 'filehist-current'               => 'current',
 'filehist-datetime'              => 'Date/Time',
+'filehist-thumb'                 => 'Thumbnail',
+'filehist-thumbtext'             => 'Thumbnail for version as of $1',
+'filehist-nothumb'               => 'No thumbnail',
 'filehist-user'                  => 'User',
 'filehist-dimensions'            => 'Dimensions',
 'filehist-filesize'              => 'File size',
 'filehist-comment'               => 'Comment',
-'imagelinks'                     => 'Links',
+'imagelinks'                     => 'File links',
 'linkstoimage'                   => 'The following {{PLURAL:$1|page links|$1 pages link}} to this file:',
+'linkstoimage-more'              => 'More than $1 {{PLURAL:$1|page links|pages link}} to this file.
+The following list shows the {{PLURAL:$1|first page link|first $1 page links}} to this file only.
+A [[Special:WhatLinksHere/$2|full list]] is available.',
 'nolinkstoimage'                 => 'There are no pages that link to this file.',
 'morelinkstoimage'               => 'View [[Special:WhatLinksHere/$1|more links]] to this file.',
 'redirectstofile'                => 'The following {{PLURAL:$1|file redirects|$1 files redirect}} to this file:',
@@ -1792,7 +1950,7 @@ A click on a column header changes the sorting.',
 'filerevert'                => 'Revert $1',
 'filerevert-backlink'       => '� $1', # only translate this message to other languages if you have to change it
 'filerevert-legend'         => 'Revert file',
-'filerevert-intro'          => "You are reverting '''[[Media:$1|$1]]''' to the [$4 version as of $3, $2].",
+'filerevert-intro'          => "You are about to revert the file '''[[Media:$1|$1]]''' to the [$4 version as of $3, $2].",
 'filerevert-comment'        => 'Comment:',
 'filerevert-defaultcomment' => 'Reverted to version as of $2, $1',
 'filerevert-submit'         => 'Revert',
@@ -1803,7 +1961,7 @@ A click on a column header changes the sorting.',
 'filedelete'                  => 'Delete $1',
 'filedelete-backlink'         => '� $1', # only translate this message to other languages if you have to change it
 'filedelete-legend'           => 'Delete file',
-'filedelete-intro'            => "You are deleting '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "You are about to delete the file '''[[Media:$1|$1]]''' along with all of its history.",
 'filedelete-intro-old'        => "You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $3, $2].",
 'filedelete-comment'          => 'Reason for deletion:',
 'filedelete-submit'           => 'Delete',
@@ -1811,8 +1969,6 @@ A click on a column header changes the sorting.',
 'filedelete-success-old'      => "The version of '''[[Media:$1|$1]]''' as of $3, $2 has been deleted.",
 'filedelete-nofile'           => "'''$1''' does not exist.",
 'filedelete-nofile-old'       => "There is no archived version of '''$1''' with the specified attributes.",
-'filedelete-iscurrent'        => 'You are attempting to delete the most recent version of this file.
-Please revert to an older version first.',
 'filedelete-otherreason'      => 'Other/additional reason:',
 'filedelete-reason-otherlist' => 'Other reason',
 'filedelete-reason-dropdown'  => '*Common delete reasons
@@ -1832,7 +1988,7 @@ Input: contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
 'unwatchedpages-summary' => '', # do not translate or duplicate this message to other languages
 
 # List redirects
-'listredirects'         => 'List redirects',
+'listredirects'         => 'List of redirects',
 'listredirects-summary' => '', # do not translate or duplicate this message to other languages
 
 # Unused templates
@@ -1844,30 +2000,34 @@ Remember to check for other links to the templates before deleting them.',
 
 # Random page
 'randompage'         => 'Random page',
-'randompage-nopages' => 'There are no pages in this namespace.',
+'randompage-nopages' => 'There are no pages in the namespace "$1".',
 'randompage-url'     => 'Special:Random', # do not translate or duplicate this message to other languages
 
 # Random redirect
 'randomredirect'         => 'Random redirect',
-'randomredirect-nopages' => 'There are no redirects in this namespace.',
+'randomredirect-nopages' => 'There are no redirects in the namespace "$1".',
 
 # Statistics
-'statistics'             => 'Statistics',
-'sitestats'              => '{{SITENAME}} statistics',
-'userstats'              => 'User statistics',
-'sitestatstext'          => "There {{PLURAL:\$1|is '''1''' page|are '''\$1''' total pages}} in the database.
-This includes \"talk\" pages, pages about {{SITENAME}}, minimal \"stub\" pages, redirects, and others that probably do not qualify as content pages.
-Excluding those, there {{PLURAL:\$2|is '''1''' page that is a|are '''\$2''' pages that are}} probably legitimate content {{PLURAL:\$2|page|pages}}.
-
-'''\$8''' {{PLURAL:\$8|file has|files have}} been uploaded.
-
-There have been a total of '''\$3''' {{PLURAL:\$3|page view|page views}}, and '''\$4''' {{PLURAL:\$4|page edit|page edits}} since {{SITENAME}} was setup.
-That comes to '''\$5''' average edits per page, and '''\$6''' views per edit.
-
-The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'''.",
-'userstatstext'          => "There {{PLURAL:$1|is '''1''' registered [[Special:ListUsers|user]]|are '''$1''' registered [[Special:ListUsers|users]]}}, of which '''$2''' (or '''$4%''') {{PLURAL:$2|has|have}} $5 rights.",
-'statistics-mostpopular' => 'Most viewed pages',
-'statistics-footer'      => '', # do not translate or duplicate this message to other languages
+'statistics'                   => 'Statistics',
+'statistics-summary'           => '', # do not translate or duplicate this message to other languages
+'statistics-header-pages'      => 'Page statistics',
+'statistics-header-edits'      => 'Edit statistics',
+'statistics-header-views'      => 'View statistics',
+'statistics-header-users'      => 'User statistics',
+'statistics-articles'          => 'Content pages',
+'statistics-pages'             => 'Pages',
+'statistics-pages-desc'        => 'All pages in the wiki, including talk pages, redirects, etc.',
+'statistics-files'             => 'Uploaded files',
+'statistics-edits'             => 'Page edits since {{SITENAME}} was set up',
+'statistics-edits-average'     => 'Average edits per page',
+'statistics-views-total'       => 'Views total',
+'statistics-views-peredit'     => 'Views per edit',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] length',
+'statistics-users'             => 'Registered [[Special:ListUsers|users]]',
+'statistics-users-active'      => 'Active users',
+'statistics-users-active-desc' => 'Users who have performed an action in the last {{PLURAL:$1|day|$1 days}}',
+'statistics-mostpopular'       => 'Most viewed pages',
+'statistics-footer'            => '', # do not translate or duplicate this message to other languages
 
 'disambiguations'         => 'Disambiguation pages',
 'disambiguations-summary' => '', # do not translate or duplicate this message to other languages
@@ -1880,12 +2040,12 @@ A page is treated as disambiguation page if it uses a template which is linked f
 'doubleredirects-summary'    => '', # do not translate or duplicate this message to other languages
 'doubleredirectstext'        => 'This page lists pages which redirect to other redirect pages.
 Each row contains links to the first and second redirect, as well as the target of the second redirect, which is usually "real" target page, which the first redirect should point to.',
-'double-redirect-fixed-move' => '[[$1]] has been moved, it is now a redirect to [[$2]]',
+'double-redirect-fixed-move' => '[[$1]] has been moved. It now redirects to [[$2]].',
 'double-redirect-fixer'      => 'Redirect fixer',
 
 'brokenredirects'         => 'Broken redirects',
 'brokenredirects-summary' => '', # do not translate or duplicate this message to other languages
-'brokenredirectstext'     => 'The following redirects link to non-existent pages.',
+'brokenredirectstext'     => 'The following redirects link to non-existent pages:',
 'brokenredirects-edit'    => '(edit)',
 'brokenredirects-delete'  => '(delete)',
 
@@ -1924,8 +2084,10 @@ Each row contains links to the first and second redirect, as well as the target
 'wantedcategories-summary'        => '', # do not translate or duplicate this message to other languages
 'wantedpages'                     => 'Wanted pages',
 'wantedpages-summary'             => '', # do not translate or duplicate this message to other languages
-'missingfiles'                    => 'Missing files',
-'missingfiles-summary'            => '', # do not translate or duplicate this message to other languages
+'wantedfiles'                     => 'Wanted files',
+'wantedfiles-summary'             => '', # do not translate or duplicate this message to other languages
+'wantedtemplates'                 => 'Wanted templates',
+'wantedtemplates-summary'         => '', # do not translate or duplicate this message to other languages
 'mostlinked'                      => 'Most linked-to pages',
 'mostlinked-summary'              => '', # do not translate or duplicate this message to other languages
 'mostlinkedcategories'            => 'Most linked-to categories',
@@ -1938,7 +2100,7 @@ Each row contains links to the first and second redirect, as well as the target
 'mostimages-summary'              => '', # do not translate or duplicate this message to other languages
 'mostrevisions'                   => 'Pages with the most revisions',
 'mostrevisions-summary'           => '', # do not translate or duplicate this message to other languages
-'prefixindex'                     => 'Prefix index',
+'prefixindex'                     => 'All pages with prefix',
 'prefixindex-summary'             => '', # do not translate or duplicate this message to other languages
 'shortpages'                      => 'Short pages',
 'shortpages-summary'              => '', # do not translate or duplicate this message to other languages
@@ -1950,6 +2112,7 @@ Each row contains links to the first and second redirect, as well as the target
 'protectedpages'                  => 'Protected pages',
 'protectedpages-indef'            => 'Indefinite protections only',
 'protectedpages-summary'          => '', # do not translate or duplicate this message to other languages
+'protectedpages-cascade'          => 'Cascading protections only',
 'protectedpagestext'              => 'The following pages are protected from moving or editing',
 'protectedpagesempty'             => 'No pages are currently protected with these parameters.',
 'protectedtitles'                 => 'Protected titles',
@@ -1958,6 +2121,8 @@ Each row contains links to the first and second redirect, as well as the target
 'protectedtitlesempty'            => 'No titles are currently protected with these parameters.',
 'listusers'                       => 'User list',
 'listusers-summary'               => '', # do not translate or duplicate this message to other languages
+'listusers-editsonly'             => 'Show only users with edits',
+'usereditcount'                   => '$1 {{PLURAL:$1|edit|edits}}',
 'newpages'                        => 'New pages',
 'newpages-summary'                => '', # do not translate or duplicate this message to other languages
 'newpages-username'               => 'Username:',
@@ -1982,6 +2147,7 @@ Each row contains links to the first and second redirect, as well as the target
 'booksources-isbn'          => 'ISBN:', # only translate this message to other languages if you have to change it
 'booksources-go'            => 'Go',
 'booksources-text'          => 'Below is a list of links to other sites that sell new and used books, and may also have further information about books you are looking for:',
+'booksources-invalid-isbn'  => 'The given ISBN does not appear to be valid; check for errors copying from the original source.',
 
 # Magic words
 'rfcurl'    => 'http://tools.ietf.org/html/rfc$1', # do not translate or duplicate this message to other languages
@@ -1992,8 +2158,6 @@ Each row contains links to the first and second redirect, as well as the target
 'speciallogtitlelabel' => 'Title:',
 'log'                  => 'Logs',
 'all-logs-page'        => 'All logs',
-'log-search-legend'    => 'Search for logs',
-'log-search-submit'    => 'Go',
 'alllogstext'          => 'Combined display of all available logs of {{SITENAME}}.
 You can narrow down the view by selecting a log type, the user name (case-sensitive), or the affected page (also case-sensitive).',
 'logempty'             => 'No matching items in log.',
@@ -2006,6 +2170,7 @@ You can narrow down the view by selecting a log type, the user name (case-sensit
 'nextpage'          => 'Next page ($1)',
 'prevpage'          => 'Previous page ($1)',
 'allpagesfrom'      => 'Display pages starting at:',
+'allpagesto'        => 'Display pages ending at:',
 'allarticles'       => 'All pages',
 'allinnamespace'    => 'All pages ($1 namespace)',
 'allnotinnamespace' => 'All pages (not in $1 namespace)',
@@ -2027,42 +2192,71 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'special-categories-sort-count' => 'sort by count',
 'special-categories-sort-abc'   => 'sort alphabetically',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Deleted user contributions',
+
+# Special:LinkSearch
+'linksearch'       => 'External links',
+'linksearch-pat'   => 'Search pattern:',
+'linksearch-ns'    => 'Namespace:',
+'linksearch-ok'    => 'Search',
+'linksearch-text'  => 'Wildcards such as "*.wikipedia.org" may be used.<br />
+Supported protocols: <tt>$1</tt>',
+'linksearch-line'  => '$1 is linked from $2',
+'linksearch-error' => 'Wildcards may appear only at the start of the hostname.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Display users starting at:',
 'listusers-submit'   => 'Show',
 'listusers-noresult' => 'No user found.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'User creation log',
+'newuserlogpagetext'          => 'This is a log of user creations.',
+'newuserlogentry'             => '', # do not translate or duplicate this message to other languages
+'newuserlog-byemail'          => 'password sent by e-mail',
+'newuserlog-create-entry'     => 'New user account',
+'newuserlog-create2-entry'    => 'created new account $1',
+'newuserlog-autocreate-entry' => 'Account created automatically',
+
 # Special:ListGroupRights
-'listgrouprights'               => 'User group rights',
-'listgrouprights-summary'       => 'The following is a list of user groups defined on this wiki, with their associated access rights.
+'listgrouprights'                 => 'User group rights',
+'listgrouprights-summary'         => 'The following is a list of user groups defined on this wiki, with their associated access rights.
 There may be [[{{MediaWiki:Listgrouprights-helppage}}|additional information]] about individual rights.',
-'listgrouprights-group'         => 'Group',
-'listgrouprights-rights'        => 'Rights',
-'listgrouprights-helppage'      => 'Help:Group rights',
-'listgrouprights-members'       => '(list of members)',
-'listgrouprights-right-display' => '$1 ($2)', # only translate this message to other languages if you have to change it
+'listgrouprights-group'           => 'Group',
+'listgrouprights-rights'          => 'Rights',
+'listgrouprights-helppage'        => 'Help:Group rights',
+'listgrouprights-members'         => '(list of members)',
+'listgrouprights-right-display'   => '$1 ($2)', # only translate this message to other languages if you have to change it
+'listgrouprights-addgroup'        => 'Can add {{PLURAL:$2|group|groups}}: $1',
+'listgrouprights-removegroup'     => 'Can remove {{PLURAL:$2|group|groups}}: $1',
+'listgrouprights-addgroup-all'    => 'Can add all groups',
+'listgrouprights-removegroup-all' => 'Can remove all groups',
 
 # E-mail user
-'mailnologin'     => 'No send address',
-'mailnologintext' => 'You must be [[Special:UserLogin|logged in]] and have a valid e-mail address in your [[Special:Preferences|preferences]] to send e-mail to other users.',
-'emailuser'       => 'E-mail this user',
-'emailpage'       => 'E-mail user',
-'emailpagetext'   => 'You can use the form below to send an e-mail message to this user.
+'mailnologin'      => 'No send address',
+'mailnologintext'  => 'You must be [[Special:UserLogin|logged in]] and have a valid e-mail address in your [[Special:Preferences|preferences]] to send e-mail to other users.',
+'emailuser'        => 'E-mail this user',
+'emailpage'        => 'E-mail user',
+'emailpagetext'    => 'You can use the form below to send an e-mail message to this user.
 The e-mail address you entered in [[Special:Preferences|your user preferences]] will appear as the "From" address of the e-mail, so the recipient will be able to reply directly to you.',
-'usermailererror' => 'Mail object returned error:',
-'defemailsubject' => '{{SITENAME}} e-mail',
-'noemailtitle'    => 'No e-mail address',
-'noemailtext'     => 'This user has not specified a valid e-mail address, or has chosen not to receive e-mail from other users.',
-'emailfrom'       => 'From:',
-'emailto'         => 'To:',
-'emailsubject'    => 'Subject:',
-'emailmessage'    => 'Message:',
-'emailsend'       => 'Send',
-'emailccme'       => 'E-mail me a copy of my message.',
-'emailccsubject'  => 'Copy of your message to $1: $2',
-'emailsent'       => 'E-mail sent',
-'emailsenttext'   => 'Your e-mail message has been sent.',
-'emailuserfooter' => 'This e-mail was sent by $1 to $2 by the "Email user" function at {{SITENAME}}.',
+'usermailererror'  => 'Mail object returned error:',
+'defemailsubject'  => '{{SITENAME}} e-mail',
+'noemailtitle'     => 'No e-mail address',
+'noemailtext'      => 'This user has not specified a valid e-mail address.',
+'nowikiemailtitle' => 'No e-mail allowed',
+'nowikiemailtext'  => 'This user has chosen not to receive e-mail from other users.',
+'email-legend'     => 'Send an e-mail to another {{SITENAME}} user',
+'emailfrom'        => 'From:',
+'emailto'          => 'To:',
+'emailsubject'     => 'Subject:',
+'emailmessage'     => 'Message:',
+'emailsend'        => 'Send',
+'emailccme'        => 'E-mail me a copy of my message.',
+'emailccsubject'   => 'Copy of your message to $1: $2',
+'emailsent'        => 'E-mail sent',
+'emailsenttext'    => 'Your e-mail message has been sent.',
+'emailuserfooter'  => 'This e-mail was sent by $1 to $2 by the "E-mail user" function at {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'My watchlist',
@@ -2084,7 +2278,7 @@ Future changes to this page and its associated talk page will be listed there, a
 'notanarticle'         => 'Not a content page',
 'notvisiblerev'        => 'Revision has been deleted',
 'watchnochange'        => 'None of your watched items were edited in the time period displayed.',
-'watchlist-details'    => '{{PLURAL:$1|$1 page|$1 pages}} watched not counting talk pages.',
+'watchlist-details'    => '{{PLURAL:$1|$1 page|$1 pages}} on your watchlist, not counting talk pages.',
 'wlheader-enotif'      => '* E-mail 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',
@@ -2093,12 +2287,7 @@ Future changes to this page and its associated talk page will be listed there, a
 'iteminvalidname'      => "Problem with item '$1', invalid name...",
 'wlnote'               => "Below {{PLURAL:$1|is the last change|are the last '''$1''' changes}} in the last {{PLURAL:$2|hour|'''$2''' hours}}.",
 'wlshowlast'           => 'Show last $1 hours $2 days $3',
-'watchlist-show-bots'  => 'Show bot edits',
-'watchlist-hide-bots'  => 'Hide bot edits',
-'watchlist-show-own'   => 'Show my edits',
-'watchlist-hide-own'   => 'Hide my edits',
-'watchlist-show-minor' => 'Show minor edits',
-'watchlist-hide-minor' => 'Hide minor edits',
+'watchlist-options'    => 'Watchlist options',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Watching...',
@@ -2139,65 +2328,71 @@ To change your watchlist settings, visit
 Feedback and further assistance:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Delete page',
-'confirm'                     => 'Confirm',
-'excontent'                   => "content was: '$1'",
-'excontentauthor'             => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "content before blanking was: '$1'",
-'exblank'                     => 'page was empty',
-'delete-confirm'              => 'Delete "$1"',
-'delete-backlink'             => '� $1', # only translate this message to other languages if you have to change it
-'delete-legend'               => 'Delete',
-'historywarning'              => 'Warning: The page you are about to delete has a history:',
-'confirmdeletetext'           => 'You are about to delete a page along with all of its history.
+# Delete
+'deletepage'             => 'Delete page',
+'confirm'                => 'Confirm',
+'excontent'              => "content was: '$1'",
+'excontentauthor'        => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "content before blanking was: '$1'",
+'exblank'                => 'page was empty',
+'delete-confirm'         => 'Delete "$1"',
+'delete-backlink'        => '� $1', # only translate this message to other languages if you have to change it
+'delete-legend'          => 'Delete',
+'historywarning'         => 'Warning: The page you are about to delete has a history:',
+'confirmdeletetext'      => 'You are about to delete a page along with all of its history.
 Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[{{MediaWiki:Policy-url}}|the policy]].',
-'actioncomplete'              => 'Action complete',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" has been deleted.
+'actioncomplete'         => 'Action complete',
+'deletedtext'            => '"<nowiki>$1</nowiki>" has been deleted.
 See $2 for a record of recent deletions.',
-'deletedarticle'              => 'deleted "[[$1]]"',
-'suppressedarticle'           => 'suppressed "[[$1]]"',
-'dellogpage'                  => 'Deletion log',
-'dellogpagetext'              => 'Below is a list of the most recent deletions.',
-'deletionlog'                 => 'deletion log',
-'reverted'                    => 'Reverted to earlier revision',
-'deletecomment'               => 'Reason for deletion:',
-'deleteotherreason'           => 'Other/additional reason:',
-'deletereasonotherlist'       => 'Other reason',
-'deletereason-dropdown'       => '*Common delete reasons
+'deletedarticle'         => 'deleted "[[$1]]"',
+'suppressedarticle'      => 'suppressed "[[$1]]"',
+'dellogpage'             => 'Deletion log',
+'dellogpagetext'         => 'Below is a list of the most recent deletions.',
+'deletionlog'            => 'deletion log',
+'reverted'               => 'Reverted to earlier revision',
+'deletecomment'          => 'Reason for deletion:',
+'deleteotherreason'      => 'Other/additional reason:',
+'deletereasonotherlist'  => 'Other reason',
+'deletereason-dropdown'  => '*Common delete reasons
 ** Author request
 ** Copyright violation
 ** Vandalism',
-'delete-edit-reasonlist'      => 'Edit delete reasons',
-'delete-toobig'               => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
+'delete-edit-reasonlist' => 'Edit deletion reasons',
+'delete-toobig'          => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
 Deletion of such pages has been restricted to prevent accidental disruption of {{SITENAME}}.',
-'delete-warning-toobig'       => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
+'delete-warning-toobig'  => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
 Deleting it may disrupt database operations of {{SITENAME}};
 proceed with caution.',
-'rollback'                    => 'Roll back edits',
-'rollback_short'              => 'Rollback',
-'rollbacklink'                => 'rollback',
-'rollbackfailed'              => 'Rollback failed',
-'cantrollback'                => 'Cannot revert edit;
+
+# Rollback
+'rollback'         => 'Roll back edits',
+'rollback_short'   => 'Rollback',
+'rollbacklink'     => 'rollback',
+'rollbackfailed'   => 'Rollback failed',
+'cantrollback'     => 'Cannot revert edit;
 last contributor is only author of this page.',
-'alreadyrolled'               => 'Cannot rollback last edit of [[:$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+'alreadyrolled'    => 'Cannot rollback last edit of [[:$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 someone else has edited or rolled back the page already.
 
-The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|Talk]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'The edit comment was: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Reverted edits by $1;
+The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|Talk]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "The edit summary was: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Reverted edits by $1;
 changed back to last version by $2.',
-'sessionfailure'              => 'There seems to be a problem with your login session;
+'sessionfailure'   => 'There seems to be a problem with your login session;
 this action has been canceled as a precaution against session hijacking.
 Please hit "back" and reload the page you came from, then try again.',
+
+# Protect
 'protectlogpage'              => 'Protection log',
 'protectlogtext'              => 'Below is a list of page locks and unlocks.
 See the [[Special:ProtectedPages|protected pages list]] for the list of currently operational page protections.',
 'protectedarticle'            => 'protected "[[$1]]"',
 'modifiedarticleprotection'   => 'changed protection level for "[[$1]]"',
 'unprotectedarticle'          => 'unprotected "[[$1]]"',
+'movedarticleprotection'      => 'moved protection settings from "[[$2]]" to "[[$1]]"',
 'protect-title'               => 'Change protection level for "$1"',
+'prot_1movedto2'              => '[[$1]] moved to [[$2]]',
 'protect-backlink'            => '� $1', # only translate this message to other languages if you have to change it
 'protect-legend'              => 'Confirm protection',
 'protectcomment'              => 'Comment:',
@@ -2205,23 +2400,36 @@ See the [[Special:ProtectedPages|protected pages list]] for the list of currentl
 'protect_expiry_invalid'      => 'Expiry time is invalid.',
 'protect_expiry_old'          => 'Expiry time is in the past.',
 'protect-unchain'             => 'Unlock move permissions',
-'protect-text'                => 'You may view and change the protection level here for the page <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'You cannot change protection levels while blocked.
-Here are the current settings for the page <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Protection levels cannot be changed due to an active database lock.
-Here are the current settings for the page <strong>$1</strong>:',
-'protect-locked-access'       => 'Your account does not have permission to change page protection levels.
-Here are the current settings for the page <strong>$1</strong>:',
+'protect-text'                => "You may view and change the protection level here for the page '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "You cannot change protection levels while blocked.
+Here are the current settings for the page '''$1''':",
+'protect-locked-dblock'       => "Protection levels cannot be changed due to an active database lock.
+Here are the current settings for the page '''$1''':",
+'protect-locked-access'       => "Your account does not have permission to change page protection levels.
+Here are the current settings for the page '''$1''':",
 'protect-cascadeon'           => "This page is currently protected because it is included in the following {{PLURAL:$1|page, which has|pages, which have}} cascading protection turned on.
 You can change this page's protection level, but it will not affect the cascading protection.",
-'protect-default'             => '(default)',
+'protect-default'             => 'Allow all users',
 'protect-fallback'            => 'Require "$1" permission',
-'protect-level-autoconfirmed' => 'Block unregistered users',
-'protect-level-sysop'         => 'Sysops only',
+'protect-level-autoconfirmed' => 'Block new and unregistered users',
+'protect-level-sysop'         => 'Administrators only',
 'protect-summary-cascade'     => 'cascading',
 'protect-expiring'            => 'expires $1 (UTC)',
+'protect-expiry-indefinite'   => 'indefinite',
 'protect-cascade'             => 'Protect pages included in this page (cascading protection)',
 'protect-cantedit'            => 'You cannot change the protection levels of this page, because you do not have permission to edit it.',
+'protect-othertime'           => 'Other time:',
+'protect-othertime-op'        => 'other time',
+'protect-existing-expiry'     => 'Existing expiry time: $3, $2',
+'protect-otherreason'         => 'Other/additional reason:',
+'protect-otherreason-op'      => 'other/additional reason',
+'protect-dropdown'            => '*Common protection reasons
+** Excessive vandalism
+** Excessive spamming
+** Counter-productive edit warring
+** High traffic page',
+'protect-edit-reasonlist'     => 'Edit protection reasons',
+'protect-expiry-options'      => '1 hour:1 hour,1 day:1 day,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permission:',
 'restriction-level'           => 'Restriction level:',
 'minimum-size'                => 'Min size',
@@ -2235,7 +2443,7 @@ You can change this page's protection level, but it will not affect the cascadin
 'restriction-upload' => 'Upload',
 
 # Restriction levels
-'restriction-level-sysop'         => 'full protected',
+'restriction-level-sysop'         => 'fully protected',
 'restriction-level-autoconfirmed' => 'semi protected',
 'restriction-level-all'           => 'any level',
 
@@ -2244,7 +2452,7 @@ You can change this page's protection level, but it will not affect the cascadin
 'undeletepage'                 => 'View and restore deleted pages',
 'undeletepagetitle'            => "'''The following consists of deleted revisions of [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'View deleted pages',
-'undeletepagetext'             => 'The following pages have been deleted but are still in the archive and can be restored.
+'undeletepagetext'             => 'The following {{PLURAL:$1|page has been deleted but is|$1 pages have been deleted but are}} still in the archive and can be restored.
 The archive may be periodically cleaned out.',
 'undelete-fieldset-title'      => 'Restore revisions',
 'undeleteextrahelp'            => "To restore the page's entire history, leave all checkboxes deselected and click '''''Restore'''''.
@@ -2258,13 +2466,14 @@ In such cases, you must uncheck or unhide the newest deleted revision.',
 'undeletehistorynoadmin'       => 'This page has been deleted.
 The reason for deletion is shown in the summary below, along with details of the users who had edited this page before deletion.
 The actual text of these deleted revisions is only available to administrators.',
-'undelete-revision'            => 'Deleted revision of $1 (as of $2) by $3:',
+'undelete-revision'            => 'Deleted revision of $1 (as of $4, at $5) by $3:',
 'undeleterevision-missing'     => 'Invalid or missing revision.
 You may have a bad link, or the revision may have been restored or removed from the archive.',
 'undelete-nodiff'              => 'No previous revision found.',
 'undeletebtn'                  => 'Restore',
 'undeletelink'                 => 'restore',
 'undeletereset'                => 'Reset',
+'undeleteinvert'               => 'Invert selection',
 'undeletecomment'              => 'Comment:',
 'undeletedarticle'             => 'restored "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|1 revision|$1 revisions}} restored',
@@ -2289,7 +2498,7 @@ It may have already been undeleted.',
 'undelete-error-long'          => 'Errors were encountered while undeleting the file:
 
 $1',
-'undelete-show-file-confirm'   => 'Are you sure you want to view a deleted revision of the file "<nowiki>$1</nowiki>" from $2?',
+'undelete-show-file-confirm'   => 'Are you sure you want to view a deleted revision of the file "<nowiki>$1</nowiki>" from $2 at $3?',
 'undelete-show-file-submit'    => 'Yes',
 
 # Namespace form on various pages
@@ -2298,36 +2507,37 @@ $1',
 'blanknamespace' => '(Main)',
 
 # Contributions
-'contributions' => 'User contributions',
-'mycontris'     => 'My contributions',
-'contribsub2'   => 'For $1 ($2)',
-'nocontribs'    => 'No changes were found matching these criteria.',
-'uctop'         => '(top)',
-'month'         => 'From month (and earlier):',
-'year'          => 'From year (and earlier):',
-
-'sp-contributions-newbies'     => 'Show contributions of new accounts only',
-'sp-contributions-newbies-sub' => 'For new accounts',
-'sp-contributions-blocklog'    => 'Block log',
-'sp-contributions-search'      => 'Search for contributions',
-'sp-contributions-username'    => 'IP Address or username:',
-'sp-contributions-submit'      => 'Search',
-'sp-contributions-explain'     => '', # only translate this message to other languages if you have to change it
-'sp-contributions-footer'      => '-', # do not translate or duplicate this message to other languages
-'sp-contributions-footer-anon' => '-', # do not translate or duplicate this message to other languages
+'contributions'       => 'User contributions',
+'contributions-title' => 'User contributions for $1',
+'mycontris'           => 'My contributions',
+'contribsub2'         => 'For $1 ($2)',
+'nocontribs'          => 'No changes were found matching these criteria.',
+'uctop'               => '(top)',
+'month'               => 'From month (and earlier):',
+'year'                => 'From year (and earlier):',
+
+'sp-contributions-newbies'       => 'Show contributions of new accounts only',
+'sp-contributions-newbies-sub'   => 'For new accounts',
+'sp-contributions-newbies-title' => 'User contributions for new accounts',
+'sp-contributions-blocklog'      => 'Block log',
+'sp-contributions-search'        => 'Search for contributions',
+'sp-contributions-username'      => 'IP Address or username:',
+'sp-contributions-submit'        => 'Search',
+'sp-contributions-explain'       => '', # only translate this message to other languages if you have to change it
+'sp-contributions-footer'        => '-', # do not translate or duplicate this message to other languages
+'sp-contributions-footer-anon'   => '-', # do not translate or duplicate this message to other languages
 
 # What links here
 'whatlinkshere'            => 'What links here',
 'whatlinkshere-title'      => 'Pages that link to "$1"',
 'whatlinkshere-summary'    => '', # do not translate or duplicate this message to other languages
 'whatlinkshere-page'       => 'Page:',
-'whatlinkshere-barrow'     => '>', # only translate this message to other languages if you have to change it
-'linklistsub'              => '(List of links)',
+'whatlinkshere-backlink'   => '� $1', # only translate this message to other languages if you have to change it
 'linkshere'                => "The following pages link to '''[[:$1]]''':",
 'nolinkshere'              => "No pages link to '''[[:$1]]'''.",
 'nolinkshere-ns'           => "No pages link to '''[[:$1]]''' in the chosen namespace.",
 'isredirect'               => 'redirect page',
-'istemplate'               => 'inclusion',
+'istemplate'               => 'transclusion',
 'isimage'                  => 'image link',
 'whatlinkshere-prev'       => '{{PLURAL:$1|previous|previous $1}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|next|next $1}}',
@@ -2368,6 +2578,8 @@ Fill in a specific reason below (for example, citing particular pages that were
 'ipbotherreason'                  => 'Other/additional reason:',
 'ipbhidename'                     => 'Hide username from the block log, active block list and user list',
 'ipbwatchuser'                    => "Watch this user's user and talk pages",
+'ipballowusertalk'                => 'Allow this user to edit own talk page while blocked',
+'ipb-change-block'                => 'Re-block the user with these settings',
 'badipaddress'                    => 'Invalid IP address',
 'blockipsuccesssub'               => 'Block succeeded',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] has been blocked.<br />
@@ -2377,14 +2589,18 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'ipb-unblock'                     => 'Unblock a username or IP address',
 'ipb-blocklist-addr'              => 'Existing blocks for $1',
 'ipb-blocklist'                   => 'View existing blocks',
+'ipb-blocklist-contribs'          => 'Contributions for $1',
 'unblockip'                       => 'Unblock user',
 'unblockiptext'                   => 'Use the form below to restore write access to a previously blocked IP address or username.',
-'ipusubmit'                       => 'Unblock this address',
+'ipusubmit'                       => 'Remove this block',
 'unblocked'                       => '[[User:$1|$1]] has been unblocked',
 'unblocked-id'                    => 'Block $1 has been removed',
 'ipblocklist'                     => 'Blocked IP addresses and usernames',
 'ipblocklist-legend'              => 'Find a blocked user',
 'ipblocklist-username'            => 'Username or IP address:',
+'ipblocklist-sh-userblocks'       => '$1 account blocks',
+'ipblocklist-sh-tempblocks'       => '$1 temporary blocks',
+'ipblocklist-sh-addressblocks'    => '$1 single IP blocks',
 'ipblocklist-summary'             => '', # do not translate or duplicate this message to other languages
 'ipblocklist-submit'              => 'Search',
 'blocklistline'                   => '$1, $2 blocked $3 ($4)',
@@ -2394,15 +2610,19 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'noautoblockblock'                => 'autoblock disabled',
 'createaccountblock'              => 'account creation blocked',
 'emailblock'                      => 'e-mail blocked',
+'blocklist-nousertalk'            => 'cannot edit own talk page',
 'ipblocklist-empty'               => 'The blocklist is empty.',
 'ipblocklist-no-results'          => 'The requested IP address or username is not blocked.',
 'blocklink'                       => 'block',
 'unblocklink'                     => 'unblock',
+'change-blocklink'                => 'change block',
 'contribslink'                    => 'contribs',
 'autoblocker'                     => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]".
 The reason given for $1\'s block is: "$2"',
 'blocklogpage'                    => 'Block log',
+'blocklog-fulllog'                => 'Full block log',
 'blocklogentry'                   => 'blocked [[$1]] with an expiry time of $2 $3',
+'reblock-logentry'                => 'changed block settings for [[$1]] with an expiry time of $2 $3',
 'blocklogtext'                    => 'This is a log of user blocking and unblocking actions.
 Automatically blocked IP addresses are not listed.
 See the [[Special:IPBlockList|IP block list]] for the list of currently operational bans and blocks.',
@@ -2411,11 +2631,14 @@ See the [[Special:IPBlockList|IP block list]] for the list of currently operatio
 'block-log-flags-nocreate'        => 'account creation disabled',
 'block-log-flags-noautoblock'     => 'autoblock disabled',
 'block-log-flags-noemail'         => 'e-mail blocked',
+'block-log-flags-nousertalk'      => 'cannot edit own talk page',
 'block-log-flags-angry-autoblock' => 'enhanced autoblock enabled',
-'range_block_disabled'            => 'The sysop ability to create range blocks is disabled.',
+'range_block_disabled'            => 'The administrator ability to create range blocks is disabled.',
 'ipb_expiry_invalid'              => 'Expiry time invalid.',
 'ipb_expiry_temp'                 => 'Hidden username blocks must be permanent.',
 'ipb_already_blocked'             => '"$1" is already blocked',
+'ipb-needreblock'                 => '== Already blocked ==
+$1 is already blocked. Do you want to change the settings?',
 'ipb_cant_unblock'                => 'Error: Block ID $1 not found.
 It may have been unblocked already.',
 'ipb_blocked_as_range'            => 'Error: The IP $1 is not blocked directly and cannot be unblocked.
@@ -2431,6 +2654,7 @@ Please contact your Internet service provider or tech support and inform them of
 'sorbsreason'                     => 'Your IP address is listed as an open proxy in the DNSBL used by {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Your IP address is listed as an open proxy in the DNSBL used by {{SITENAME}}.
 You cannot create an account',
+'cant-block-while-blocked'        => 'You cannot block other users while you are blocked.',
 
 # Developer tools
 'lockdb'              => 'Lock database',
@@ -2454,10 +2678,10 @@ To lock or unlock the database, this needs to be writable by the web server.',
 'databasenotlocked'   => 'The database is not locked.',
 
 # Move page
-'move-page'               => 'Move $1',
-'move-page-backlink'      => '� $1', # only translate this message to other languages if you have to change it
-'move-page-legend'        => 'Move page',
-'movepagetext'            => "Using the form below will rename a page, moving all of its history to the new name.
+'move-page'                    => 'Move $1',
+'move-page-backlink'           => '� $1', # only translate this message to other languages if you have to change it
+'move-page-legend'             => 'Move page',
+'movepagetext'                 => "Using the form below will rename a page, moving all of its history to the new name.
 The old title will become a redirect page to the new title.
 You can update redirects that point to the original title automatically.
 If you choose not to, be sure to check for [[Special:DoubleRedirects|double]] or [[Special:BrokenRedirects|broken redirects]].
@@ -2469,51 +2693,63 @@ This means that you can rename a page back to where it was renamed from if you m
 '''WARNING!'''
 This can be a drastic and unexpected change for a popular page;
 please be sure you understand the consequences of this before proceeding.",
-'movepagetalktext'        => "The associated talk page will be automatically moved along with it '''unless:'''
+'movepagetalktext'             => "The associated talk page will be automatically moved along with it '''unless:'''
 *A non-empty talk page already exists under the new name, or
 *You uncheck the box below.
 
 In those cases, you will have to move or merge the page manually if desired.",
-'movearticle'             => 'Move page:',
-'movenotallowed'          => 'You do not have permission to move pages.',
-'newtitle'                => 'To new title:',
-'move-watch'              => 'Watch this page',
-'movepagebtn'             => 'Move page',
-'pagemovedsub'            => 'Move succeeded',
-'movepage-moved'          => '<big>\'\'\'"$1" has been moved to "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'A page of that name already exists, or the name you have chosen is not valid.
+'movearticle'                  => 'Move page:',
+'movenologin'                  => 'Not logged in',
+'movenologintext'              => 'You must be a registered user and [[Special:UserLogin|logged in]] to move a page.',
+'movenotallowed'               => 'You do not have permission to move pages.',
+'movenotallowedfile'           => 'You do not have permission to move files.',
+'cant-move-user-page'          => 'You do not have permission to move user pages (apart from subpages).',
+'cant-move-to-user-page'       => 'You do not have permission to move a page to a user page (except to a user subpage).',
+'newtitle'                     => 'To new title:',
+'move-watch'                   => 'Watch this page',
+'movepagebtn'                  => 'Move page',
+'pagemovedsub'                 => 'Move succeeded',
+'movepage-moved'               => '<big>\'\'\'"$1" has been moved to "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'A redirect has been created.',
+'movepage-moved-noredirect'    => 'The creation of a redirect has been suppressed.',
+'articleexists'                => 'A page of that name already exists, or the name you have chosen is not valid.
 Please choose another name.',
-'cantmove-titleprotected' => 'You cannot move a page to this location, because the new title has been protected from creation',
-'talkexists'              => "'''The page itself was moved successfully, but the talk page could not be moved because one already exists at the new title.
+'cantmove-titleprotected'      => 'You cannot move a page to this location, because the new title has been protected from creation',
+'talkexists'                   => "'''The page itself was moved successfully, but the talk page could not be moved because one already exists at the new title.
 Please merge them manually.'''",
-'movedto'                 => 'moved to',
-'movetalk'                => 'Move associated talk page',
-'move-subpages'           => 'Move all subpages, if applicable',
-'move-talk-subpages'      => 'Move all subpages of talk page, if applicable',
-'movepage-page-exists'    => 'The page $1 already exists and cannot be automatically overwritten.',
-'movepage-page-moved'     => 'The page $1 has been moved to $2.',
-'movepage-page-unmoved'   => 'The page $1 could not be moved to $2.',
-'movepage-max-pages'      => 'The maximum of $1 {{PLURAL:$1|page|pages}} has been moved and no more will be moved automatically.',
-'1movedto2'               => '[[$1]] moved to [[$2]]',
-'1movedto2_redir'         => '[[$1]] moved to [[$2]] over redirect',
-'movelogpage'             => 'Move log',
-'movelogpagetext'         => 'Below is a list of pages moved.',
-'movereason'              => 'Reason:',
-'revertmove'              => 'revert',
-'delete_and_move'         => 'Delete and move',
-'delete_and_move_text'    => '==Deletion required==
+'movedto'                      => 'moved to',
+'movetalk'                     => 'Move associated talk page',
+'move-subpages'                => 'Move all subpages, if applicable',
+'move-talk-subpages'           => 'Move all subpages of talk page, if applicable',
+'movepage-page-exists'         => 'The page $1 already exists and cannot be automatically overwritten.',
+'movepage-page-moved'          => 'The page $1 has been moved to $2.',
+'movepage-page-unmoved'        => 'The page $1 could not be moved to $2.',
+'movepage-max-pages'           => 'The maximum of $1 {{PLURAL:$1|page|pages}} has been moved and no more will be moved automatically.',
+'1movedto2'                    => 'moved [[$1]] to [[$2]]',
+'1movedto2_redir'              => 'moved [[$1]] to [[$2]] over redirect',
+'move-redirect-suppressed'     => 'redirect suppressed',
+'movelogpage'                  => 'Move log',
+'movelogpagetext'              => 'Below is a list of all page moves.',
+'movereason'                   => 'Reason:',
+'revertmove'                   => 'revert',
+'delete_and_move'              => 'Delete and move',
+'delete_and_move_text'         => '== Deletion required ==
 The destination page "[[:$1]]" already exists.
 Do you want to delete it to make way for the move?',
-'delete_and_move_confirm' => 'Yes, delete the page',
-'delete_and_move_reason'  => 'Deleted to make way for move',
-'selfmove'                => 'Source and destination titles are the same;
+'delete_and_move_confirm'      => 'Yes, delete the page',
+'delete_and_move_reason'       => 'Deleted to make way for move',
+'selfmove'                     => 'Source and destination titles are the same;
 cannot move a page over itself.',
-'immobile_namespace'      => 'Source or destination title is of a special type;
-cannot move pages from and into that namespace.',
-'imagenocrossnamespace'   => 'Cannot move file to non-file namespace',
-'imagetypemismatch'       => 'The new file extension does not match its type',
-'imageinvalidfilename'    => 'The target file name is invalid',
-'fix-double-redirects'    => 'Update any redirects that point to the original title',
+'immobile-source-namespace'    => 'Cannot move pages in namespace "$1"',
+'immobile-target-namespace'    => 'Cannot move pages into namespace "$1"',
+'immobile-target-namespace-iw' => 'Interwiki link is not a valid target for page move.',
+'immobile-source-page'         => 'This page is not movable.',
+'immobile-target-page'         => 'Cannot move to that destination title.',
+'imagenocrossnamespace'        => 'Cannot move file to non-file namespace',
+'imagetypemismatch'            => 'The new file extension does not match its type',
+'imageinvalidfilename'         => 'The target file name is invalid',
+'fix-double-redirects'         => 'Update any redirects that point to the original title',
+'move-leave-redirect'          => 'Leave a redirect behind',
 
 # Export
 'export'            => 'Export pages',
@@ -2522,7 +2758,7 @@ This can be imported into another wiki using MediaWiki via the [[Special:Import|
 
 To export pages, enter the titles in the text box below, one title per line, and select whether you want the current version as well as all old versions, with the page history lines, or the current version with the info about the last edit.
 
-In the latter case you can also use a link, e.g. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] for the page "[[{{MediaWiki:Mainpage}}]]".',
+In the latter case you can also use a link, for example [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] for the page "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Include only the current revision, not the full history',
 'exportnohistory'   => "----
 '''Note:''' Exporting the full history of pages through this form has been disabled due to performance reasons.",
@@ -2538,7 +2774,7 @@ In the latter case you can also use a link, e.g. [[{{ns:special}}:Export/{{Media
 'allmessagesdefault'        => 'Default text',
 'allmessagescurrent'        => 'Current text',
 'allmessagestext'           => 'This is a list of system messages available in the MediaWiki namespace.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "This page cannot be used because '''\$wgUseDatabaseMessages''' has been disabled.",
 'allmessagesfilter'         => 'Message name filter:',
 'allmessagesmodified'       => 'Show only modified',
@@ -2558,9 +2794,12 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-interwiki-text'      => "Select a wiki and page title to import.
 Revision dates and editors' names will be preserved.
 All transwiki import actions are logged at the [[Special:Log/import|import log]].",
+'import-interwiki-source'    => 'Source wiki/page:',
 'import-interwiki-history'   => 'Copy all history versions for this page',
 'import-interwiki-submit'    => 'Import',
-'import-interwiki-namespace' => 'Transfer pages into namespace:',
+'import-interwiki-namespace' => 'Destination namespace:',
+'import-upload-filename'     => 'Filename:',
+'import-comment'             => 'Comment:',
 'importtext'                 => 'Please export the file from the source wiki using the [[Special:Export|export utility]].
 Save it to your computer and upload it here.',
 'importstart'                => 'Importing pages...',
@@ -2654,27 +2893,28 @@ A temporary folder is missing.',
 'accesskey-preview'                 => 'p', # do not translate or duplicate this message to other languages
 'accesskey-diff'                    => 'v', # do not translate or duplicate this message to other languages
 'accesskey-compareselectedversions' => 'v', # do not translate or duplicate this message to other languages
+'accesskey-visualcomparison'        => 'b', # do not translate or duplicate this message to other languages
 'accesskey-watch'                   => 'w', # do not translate or duplicate this message to other languages
 'accesskey-upload'                  => 's', # do not translate or duplicate this message to other languages
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'My user page',
+'tooltip-pt-userpage'             => 'Your user page',
 'tooltip-pt-anonuserpage'         => "The user page for the ip you're editing as",
-'tooltip-pt-mytalk'               => 'My talk page',
-'tooltip-pt-anontalk'             => 'Discussion about edits from this ip address',
-'tooltip-pt-preferences'          => 'My preferences',
-'tooltip-pt-watchlist'            => "The list of pages you're monitoring for changes",
-'tooltip-pt-mycontris'            => 'List of my contributions',
-'tooltip-pt-login'                => 'You are encouraged to log in, it is not mandatory however.',
-'tooltip-pt-anonlogin'            => 'You are encouraged to log in, it is not mandatory however.',
+'tooltip-pt-mytalk'               => 'Your talk page',
+'tooltip-pt-anontalk'             => 'Discussion about edits from this IP address',
+'tooltip-pt-preferences'          => 'Your preferences',
+'tooltip-pt-watchlist'            => 'The list of pages you are monitoring for changes',
+'tooltip-pt-mycontris'            => 'List of your contributions',
+'tooltip-pt-login'                => 'You are encouraged to log in; however, it is not mandatory',
+'tooltip-pt-anonlogin'            => 'You are encouraged to log in; however, it is not mandatory',
 'tooltip-pt-logout'               => 'Log out',
 'tooltip-ca-talk'                 => 'Discussion about the content page',
 'tooltip-ca-edit'                 => 'You can edit this page.
-Please use the preview button before saving.',
-'tooltip-ca-addsection'           => 'Add a comment to this discussion.',
+Please use the preview button before saving',
+'tooltip-ca-addsection'           => 'Start a new section',
 'tooltip-ca-viewsource'           => 'This page is protected.
-You can view its source.',
-'tooltip-ca-history'              => 'Past versions of this page.',
+You can view its source',
+'tooltip-ca-history'              => 'Past versions of this page',
 'tooltip-ca-protect'              => 'Protect this page',
 'tooltip-ca-delete'               => 'Delete this page',
 'tooltip-ca-undelete'             => 'Restore the edits done to this page before it was deleted',
@@ -2684,13 +2924,13 @@ You can view its source.',
 'tooltip-search'                  => 'Search {{SITENAME}}',
 'tooltip-search-go'               => 'Go to a page with this exact name if exists',
 'tooltip-search-fulltext'         => 'Search the pages for this text',
-'tooltip-p-logo'                  => 'Main Page',
-'tooltip-n-mainpage'              => 'Visit the Main Page',
+'tooltip-p-logo'                  => 'Visit the main page',
+'tooltip-n-mainpage'              => 'Visit the main page',
 'tooltip-n-portal'                => 'About the project, what you can do, where to find things',
 'tooltip-n-currentevents'         => 'Find background information on current events',
-'tooltip-n-recentchanges'         => 'The list of recent changes in the wiki.',
+'tooltip-n-recentchanges'         => 'The list of recent changes in the wiki',
 'tooltip-n-randompage'            => 'Load a random page',
-'tooltip-n-help'                  => 'The place to find out.',
+'tooltip-n-help'                  => 'The place to find out',
 'tooltip-t-whatlinkshere'         => 'List of all wiki pages that link here',
 'tooltip-t-recentchangeslinked'   => 'Recent changes in pages linked from this page',
 'tooltip-feed-rss'                => 'RSS feed for this page',
@@ -2714,11 +2954,14 @@ You can view its source.',
 'tooltip-minoredit'               => 'Mark this as a minor edit',
 'tooltip-save'                    => 'Save your changes',
 'tooltip-preview'                 => 'Preview your changes, please use this before saving!',
-'tooltip-diff'                    => 'Show which changes you made to the text.',
-'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page.',
+'tooltip-diff'                    => 'Show which changes you made to the text',
+'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page',
 'tooltip-watch'                   => 'Add this page to your watchlist',
 'tooltip-recreate'                => 'Recreate the page even though it has been deleted',
 'tooltip-upload'                  => 'Start upload',
+'tooltip-rollback'                => '"Rollback" reverts edit(s) to this page of the last contributor in one click',
+'tooltip-undo'                    => '"Undo" reverts this edit and opens the edit form in preview mode.
+Allows adding a reason in the summary',
 
 # Stylesheets
 'common.css'      => '/* CSS placed here will be applied to all skins */', # only translate this message to other languages if you have to change it
@@ -2730,6 +2973,8 @@ You can view its source.',
 'chick.css'       => '/* CSS placed here will affect users of the Chick skin */', # only translate this message to other languages if you have to change it
 'simple.css'      => '/* CSS placed here will affect users of the Simple skin */', # only translate this message to other languages if you have to change it
 'modern.css'      => '/* CSS placed here will affect users of the Modern skin */', # only translate this message to other languages if you have to change it
+'print.css'       => '/* CSS placed here will affect the print output */', # only translate this message to other languages if you have to change it
+'handheld.css'    => '/* CSS placed here will affect handheld devices based on the skin configured in $wgHandheldStyle */', # only translate this message to other languages if you have to change it
 
 # Scripts
 'common.js'      => '/* Any JavaScript here will be loaded for all users on every page load. */', # only translate this message to other languages if you have to change it
@@ -2748,19 +2993,19 @@ You can view its source.',
 'notacceptable'     => 'The wiki server cannot provide data in a format your client can read.',
 
 # Attribution
-'anonymous'        => 'Anonymous user(s) of {{SITENAME}}',
+'anonymous'        => 'Anonymous {{PLURAL:$1|user|users}} of {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} user $1',
 'lastmodifiedatby' => 'This page was last modified $2, $1 by $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Based on work by $1.',
 'others'           => 'others',
-'siteusers'        => '{{SITENAME}} user(s) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|user|users}} $1',
 'creditspage'      => 'Page credits',
 'nocredits'        => 'There is no credits info available for this page.',
 
 # Spam protection
 'spamprotectiontitle' => 'Spam protection filter',
 'spamprotectiontext'  => 'The page you wanted to save was blocked by the spam filter.
-This is probably caused by a link to an external site.',
+This is probably caused by a link to a blacklisted external site.',
 'spamprotectionmatch' => 'The following text is what triggered our spam filter: $1',
 'spambot_username'    => 'MediaWiki spam cleanup',
 'spam_reverting'      => 'Reverting to last version not containing links to $1',
@@ -2774,6 +3019,16 @@ This is probably caused by a link to an external site.',
 'numauthors'     => 'Number of distinct authors (page): $1',
 'numtalkauthors' => 'Number of distinct authors (discussion page): $1',
 
+# Skin names
+'skinname-standard'    => 'Classic', # only translate this message to other languages if you have to change it
+'skinname-nostalgia'   => 'Nostalgia', # only translate this message to other languages if you have to change it
+'skinname-cologneblue' => 'Cologne Blue', # only translate this message to other languages if you have to change it
+'skinname-monobook'    => 'MonoBook', # only translate this message to other languages if you have to change it
+'skinname-myskin'      => 'MySkin', # only translate this message to other languages if you have to change it
+'skinname-chick'       => 'Chick', # only translate this message to other languages if you have to change it
+'skinname-simple'      => 'Simple', # only translate this message to other languages if you have to change it
+'skinname-modern'      => 'Modern', # only translate this message to other languages if you have to change it
+
 # Math options
 'mw_math_png'    => 'Always render PNG',
 'mw_math_simple' => 'HTML if very simple or else PNG',
@@ -2795,11 +3050,12 @@ This is probably caused by a link to an external site.',
 'markedaspatrollederror-noautopatrol' => 'You are not allowed to mark your own changes as patrolled.',
 
 # Patrol log
-'patrol-log-page'   => 'Patrol log',
-'patrol-log-header' => 'This is a log of patrolled revisions.',
-'patrol-log-line'   => 'marked $1 of $2 patrolled $3',
-'patrol-log-auto'   => '(automatic)',
-'patrol-log-diff'   => 'r$1', # only translate this message to other languages if you have to change it
+'patrol-log-page'      => 'Patrol log',
+'patrol-log-header'    => 'This is a log of patrolled revisions.',
+'patrol-log-line'      => 'marked $1 of $2 patrolled $3',
+'patrol-log-auto'      => '(automatic)',
+'patrol-log-diff'      => 'revision $1', # only translate this message to other languages if you have to change it
+'log-show-hide-patrol' => '$1 patrol log',
 
 # Image deletion
 'deletedrevision'                 => 'Deleted old revision $1',
@@ -2816,6 +3072,9 @@ $1',
 'previousdiff' => '� Older edit',
 'nextdiff'     => 'Newer edit →',
 
+# Visual comparison
+'visual-comparison' => 'Visual comparison',
+
 # Media information
 'mediawarning'         => "'''Warning''': This file may contain malicious code, by executing it your system may be compromised.<hr />",
 'imagemaxsize'         => 'Limit images on file description pages to:',
@@ -2823,16 +3082,18 @@ $1',
 'widthheight'          => '$1×$2', # only translate this message to other languages if you have to change it
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|page|pages}}',
 'file-info'            => '(file size: $1, MIME type: $2)',
-'file-info-size'       => '($1 × $2 pixel, file size: $3, MIME type: $4)',
+'file-info-size'       => '($1 × $2 pixels, file size: $3, MIME type: $4)',
 'file-nohires'         => '<small>No higher resolution available.</small>',
 'svg-long-desc'        => '(SVG file, nominally $1 × $2 pixels, file size: $3)',
 'show-big-image'       => 'Full resolution',
 'show-big-image-thumb' => '<small>Size of this preview: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Gallery of new files',
 'imagelisttext'         => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.",
 'newimages-summary'     => 'This special page shows the last uploaded files.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Filename (or a part of it):',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Nothing to see.',
 'ilsubmit'              => 'Search',
@@ -3112,6 +3373,18 @@ Others will be hidden by default.
 'exif-lightsource-24'  => 'ISO studio tungsten',
 'exif-lightsource-255' => 'Other light source',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flash did not fire',
+'exif-flash-fired-1'    => 'Flash fired',
+'exif-flash-return-0'   => 'no strobe return detection function',
+'exif-flash-return-2'   => 'strobe return light not detected',
+'exif-flash-return-3'   => 'strobe return light detected',
+'exif-flash-mode-1'     => 'compulsory flash firing',
+'exif-flash-mode-2'     => 'compulsory flash suppression',
+'exif-flash-mode-3'     => 'auto mode',
+'exif-flash-function-1' => 'No flash function',
+'exif-flash-redeye-1'   => 'red-eye reduction mode',
+
 'exif-focalplaneresolutionunit-2' => 'inches',
 
 'exif-sensingmethod-1' => 'Undefined',
@@ -3189,7 +3462,7 @@ Others will be hidden by default.
 
 # External editor support
 'edit-externally'      => 'Edit this file using an external application',
-'edit-externally-help' => 'See the [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] for more information.',
+'edit-externally-help' => '(See the [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] for more information)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'all',
@@ -3212,7 +3485,7 @@ if you recently created your account, you may wish to wait a few minutes for it
 'confirmemail_oncreate'    => 'A confirmation code was sent to your e-mail address.
 This code is not required to log in, but you will need to provide it before enabling any e-mail-based features in the wiki.',
 'confirmemail_sendfailed'  => '{{SITENAME}} could not send your confirmation mail.
-Please check your email address for invalid characters.
+Please check your e-mail address for invalid characters.
 
 Mailer returned: $1',
 'confirmemail_invalid'     => 'Invalid confirmation code.
@@ -3264,28 +3537,20 @@ Please confirm that you really want to recreate this page.",
 
 'unit-pixel' => 'px', # only translate this message to other languages if you have to change it
 
-# HTML dump
-'redirectingto' => 'Redirecting to [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Clear the cache of this page?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Search for pages containing ''$1''.",
-'searchnamed'      => "Search for pages named ''$1''.",
-'articletitles'    => "Pages starting with ''$1''",
-'hideresults'      => 'Hide results',
-'useajaxsearch'    => 'Use AJAX search',
+'confirm-purge-top'    => 'Clear the cache of this page?',
+'confirm-purge-bottom' => 'Purging a page clears the cache and forces the most current version to appear.',
 
 # Separators for various lists, etc.
 'catseparator'        => '|', # only translate this message to other languages if you have to change it
-'semicolon-separator' => ';', # only translate this message to other languages if you have to change it
+'semicolon-separator' => ';&#32;', # only translate this message to other languages if you have to change it
 'comma-separator'     => ',&#32;', # only translate this message to other languages if you have to change it
 'colon-separator'     => ':&#32;', # only translate this message to other languages if you have to change it
-'autocomment-prefix'  => '- ', # only translate this message to other languages if you have to change it
+'autocomment-prefix'  => '-&#32;', # only translate this message to other languages if you have to change it
+'pipe-separator'      => '&#32;|&#32;', # only translate this message to other languages if you have to change it
+'word-separator'      => '&#32;', # only translate this message to other languages if you have to change it
+'ellipsis'            => '…', # only translate this message to other languages if you have to change it
 
 # Multipage image navigation
 'imgmultipageprev' => '� previous page',
@@ -3305,10 +3570,10 @@ $1',
 'table_pager_empty'        => 'No results',
 
 # Auto-summaries
-'autosumm-blank'   => 'Removing all content from page',
-'autosumm-replace' => "Replacing page with '$1'",
-'autoredircomment' => 'Redirecting to [[$1]]',
-'autosumm-new'     => 'New page: $1',
+'autosumm-blank'   => 'Blanked the page',
+'autosumm-replace' => "Replaced content with '$1'",
+'autoredircomment' => 'Redirected page to [[$1]]',
+'autosumm-new'     => "Created page with '$1'",
 
 # Autoblock whitelist
 'autoblock_whitelist' => 'AOL http://webmaster.info.aol.com/proxyinfo.html
@@ -3359,7 +3624,7 @@ Try normal preview.',
 'watchlistedit-normal-explain' => 'Titles on your watchlist are shown below.
 To remove a title, check the box next to it, and click Remove Titles.
 You can also [[Special:Watchlist/raw|edit the raw list]].',
-'watchlistedit-normal-submit'  => 'Remove Titles',
+'watchlistedit-normal-submit'  => 'Remove titles',
 'watchlistedit-normal-done'    => '{{PLURAL:$1|1 title was|$1 titles were}} removed from your watchlist:',
 'watchlistedit-raw-title'      => 'Edit raw watchlist',
 'watchlistedit-raw-legend'     => 'Edit raw watchlist',
@@ -3443,6 +3708,7 @@ You can also [[Special:Watchlist/edit|use the standard editor]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Unknown extension tag "$1"',
+'duplicate-defaultsort' => 'Warning: Default sort key "$2" overrides earlier default sort key "$1".',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -3472,13 +3738,13 @@ You can also [[Special:Watchlist/edit|use the standard editor]].',
 'filepath-summary' => 'This special page returns the complete path for a file.
 Images are shown in full resolution, other file types are started with their associated program directly.
 
-Enter the file name without the "{{ns:image}}:" prefix.',
+Enter the file name without the "{{ns:file}}:" prefix.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Search for duplicate files',
 'fileduplicatesearch-summary'  => 'Search for duplicate files on base of its hash value.
 
-Enter the filename without the "{{ns:image}}:" prefix.',
+Enter the filename without the "{{ns:file}}:" prefix.',
 'fileduplicatesearch-legend'   => 'Search for a duplicate',
 'fileduplicatesearch-filename' => 'Filename:',
 'fileduplicatesearch-submit'   => 'Search',
@@ -3507,6 +3773,15 @@ Enter the filename without the "{{ns:image}}:" prefix.',
 
 # Special:BlankPage
 'blankpage'              => 'Blank page',
-'intentionallyblankpage' => 'This page is intentionally left blank',
+'intentionallyblankpage' => 'This page is intentionally left blank.',
+
+# External image whitelist
+'external_image_whitelist' => ' #Leave this line exactly as it is<pre>
+#Put regular expression fragments (just the part that goes between the //) below
+#These will be matched with the URLs of external (hotlinked) images
+#Those that match will be displayed as images, otherwise only a link to the image will be shown
+#Lines beginning with # are treated as comments
+
+#Put all regex fragments above this line. Leave this line exactly as it is</pre>',
 
 );
diff --git a/languages/messages/MessagesEn_gb.php b/languages/messages/MessagesEn_gb.php
index c297d26e..bf44ce44 100644
--- a/languages/messages/MessagesEn_gb.php
+++ b/languages/messages/MessagesEn_gb.php
@@ -24,7 +24,7 @@ $messages = array(
 'uncategorizedimages'     => 'Uncategorised files',
 'uncategorizedtemplates'  => 'Uncategorised templates',
 
-# Delete/protect/revert
+# Rollback
 'sessionfailure' => 'There seems to be a problem with your login session;
 this action has been cancelled as a precaution against session hijacking.
 Please hit "back" and reload the page you came from, then try again.',
diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index 9515f5cf..adc6b7fc 100644
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -7,8 +7,11 @@
  * @author Amikeco
  * @author ArnoLagrange
  * @author Malafaya
+ * @author Melancholie
  * @author Michawiki
  * @author MinuteElectron
+ * @author Omnipaedista
+ * @author Smeira
  * @author Tlustulimu
  * @author Urhixidur
  * @author Yekrats
@@ -24,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Vikipediista_diskuto',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_diskuto',
-	NS_IMAGE          => 'Dosiero', #FIXME: Check the magic for Image: and Media:
-	NS_IMAGE_TALK     => 'Dosiera_diskuto',
+	NS_FILE           => 'Dosiero', #FIXME: Check the magic for Image: and Media:
+	NS_FILE_TALK      => 'Dosiera_diskuto',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_diskuto',
 	NS_TEMPLATE       => 'Åœablono',
@@ -36,36 +39,117 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Kategoria_diskuto',
 );
 
-$skinNames = array(
-	'standard' => 'Klasika',
-	'nostalgia' => 'Nostalgio',
-	'cologneblue' => 'Kolonja Bluo',
-	'monobook' => 'Librejo',
-	'chick' => 'Kokido',
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Duoblaj alidirektiloj' ),
+	'BrokenRedirects'           => array( 'Rompitaj alidirektiloj' ),
+	'Disambiguations'           => array( 'Apartigiloj' ),
+	'Userlogin'                 => array( 'Ensaluti' ),
+	'Userlogout'                => array( 'Elsaluti' ),
+	'CreateAccount'             => array( 'Krei konton' ),
+	'Preferences'               => array( 'Preferoj' ),
+	'Watchlist'                 => array( 'Atentaro' ),
+	'Recentchanges'             => array( 'Lastaj �an�oj' ),
+	'Upload'                    => array( 'Al�uti' ),
+	'Listfiles'                 => array( 'Bildolisto' ),
+	'Newimages'                 => array( 'Novaj bildoj' ),
+	'Listusers'                 => array( 'Listo de uzantoj' ),
+	'Listgrouprights'           => array( 'Gruprajtoj de uzantoj' ),
+	'Statistics'                => array( 'Statistikoj' ),
+	'Randompage'                => array( 'Hazarda pa�o' ),
+	'Lonelypages'               => array( 'Neligitaj pa�oj' ),
+	'Uncategorizedpages'        => array( 'Pa�oj sen kategorio' ),
+	'Uncategorizedcategories'   => array( 'Kategorioj sen kategorio' ),
+	'Uncategorizedimages'       => array( 'Bildoj sen kategorio' ),
+	'Uncategorizedtemplates'    => array( 'Åœablonoj sen kategorio' ),
+	'Unusedcategories'          => array( 'Malplenaj kategorioj' ),
+	'Unusedimages'              => array( 'Neuzataj bildoj' ),
+	'Wantedpages'               => array( 'Dezirataj pa�oj', 'Rompitaj ligiloj' ),
+	'Wantedcategories'          => array( 'Dezirataj kategorioj' ),
+	'Wantedfiles'               => array( 'Dezirataj dosieroj' ),
+	'Wantedtemplates'           => array( 'Dezirataj �ablonoj' ),
+	'Mostlinked'                => array( 'Plej ligitaj pa�oj' ),
+	'Mostlinkedcategories'      => array( 'Plej ligitaj kategorioj', 'Plej uzataj kategorioj' ),
+	'Mostlinkedtemplates'       => array( 'Plej ligitaj �ablonoj', 'Plej uzataj �ablonoj' ),
+	'Mostcategories'            => array( 'Plej multaj kategorioj' ),
+	'Mostimages'                => array( 'Plej multaj bildoj' ),
+	'Mostrevisions'             => array( 'Plej multaj revizioj' ),
+	'Fewestrevisions'           => array( 'Plej malmultaj revizioj' ),
+	'Shortpages'                => array( 'Mallongaj pa�oj' ),
+	'Longpages'                 => array( 'Longaj pa�oj' ),
+	'Newpages'                  => array( 'Novaj pa�oj' ),
+	'Ancientpages'              => array( 'Malnovaj pa�oj' ),
+	'Deadendpages'              => array( 'Pa�oj sen interna ligilo' ),
+	'Protectedpages'            => array( 'Protektitaj pa�oj' ),
+	'Protectedtitles'           => array( 'Protektitaj titoloj' ),
+	'Allpages'                  => array( 'Ĉiuj pa�oj' ),
+	'Prefixindex'               => array( 'Indekso de prefiksoj' ),
+	'Ipblocklist'               => array( 'Forbarlisto de IP-adresoj' ),
+	'Specialpages'              => array( 'Specialaj pa�oj' ),
+	'Contributions'             => array( 'Kontribuoj' ),
+	'Emailuser'                 => array( 'Retpo�ti uzanton' ),
+	'Confirmemail'              => array( 'Konfirmi per retpo�to' ),
+	'Whatlinkshere'             => array( 'Kio ligas ĉi tien?' ),
+	'Recentchangeslinked'       => array( 'Rilataj �an�oj' ),
+	'Movepage'                  => array( 'Alinomigi pa�on' ),
+	'Blockme'                   => array( 'Forbari min' ),
+	'Booksources'               => array( 'Citoj el libroj' ),
+	'Categories'                => array( 'Kategorioj' ),
+	'Export'                    => array( 'Eksporti' ),
+	'Version'                   => array( 'Versio' ),
+	'Allmessages'               => array( 'Ĉiuj mesa�oj' ),
+	'Log'                       => array( 'Loglibro', 'Loglibroj' ),
+	'Blockip'                   => array( 'Forbari IP-adreson' ),
+	'Undelete'                  => array( 'Restarigi' ),
+	'Popularpages'              => array( 'Popularaj pa�oj' ),
+	'Search'                    => array( 'Serĉi' ),
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#REDIRECT', '#ALIDIREKTU' ),
-	'nogallery'           => array( '0', '__NOGALLERY__', '__SENGALERIO__' ),
-	'currentmonth'        => array( '1', 'CURRENTMONTH', 'NUNAMONATO' ),
-	'numberofarticles'    => array( '1', 'NUMBEROFARTICLES', 'NOMBRODEARTIKOLOJ' ),
-	'numberoffiles'       => array( '1', 'NUMBEROFFILES', 'NOMBRODEDOSIEROJ' ),
-	'numberofusers'       => array( '1', 'NUMBEROFUSERS', 'NOMBRODEUZANTOJ' ),
-	'numberofedits'       => array( '1', 'NUMBEROFEDITS', 'NOMBRODEREDAKTOJ' ),
-	'pagename'            => array( '1', 'PAGENAME', 'PAÄœNOMO' ),
-	'img_thumbnail'       => array( '1', 'thumbnail', 'thumb' ),
-	'img_right'           => array( '1', 'right', 'dekstra' ),
-	'img_left'            => array( '1', 'left', 'maldekstra' ),
-	'img_center'          => array( '1', 'center', 'centre', 'centra' ),
-	'server'              => array( '0', 'SERVER', 'SERVILO' ),
-	'servername'          => array( '0', 'SERVERNAME', 'NOMODESERVILO' ),
-	'currentversion'      => array( '1', 'CURRENTVERSION', 'NUNAVERSIO' ),
-	'language'            => array( '0', '#LANGUAGE:', '#LINGVO:' ),
-	'special'             => array( '0', 'special', 'speciala' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:', 'DEFAŬLTORDIGO:' ),
-	'tag'                 => array( '0', 'tag', 'etikedo' ),
-	'hiddencat'           => array( '1', '__HIDDENCAT__', '__KAÅœITAKATEGORIO__' ),
-	'pagesize'            => array( '1', 'PAGESIZE', 'PEZODEPAÄœO' ),
+	'redirect'              => array( '0', '#ALIDIREKTU', '#REDIRECT' ),
+	'nogallery'             => array( '0', '__SENGALERIO__', '__NOGALLERY__' ),
+	'currentmonth'          => array( '1', 'NUNAMONATO', 'CURRENTMONTH' ),
+	'currentdayname'        => array( '1', 'NUNATAGNOMO', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'NUNAJARO', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'NUNATEMPO', 'CURRENTTIME' ),
+	'localdayname'          => array( '1', 'LOKATAGNOMO', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'LOKAJARO', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'LOKATEMPO', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'LOKAHORO', 'LOCALHOUR' ),
+	'numberofarticles'      => array( '1', 'NOMBRODEARTIKOLOJ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'NOMBRODEDOSIEROJ', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'NOMBRODEUZANTOJ', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'NOMBRODEREDAKTOJ', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'PAÄœNOMO', 'PAGXNOMO', 'PAGENAME' ),
+	'img_thumbnail'         => array( '1', 'eta', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'eta=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'dekstra', 'right' ),
+	'img_left'              => array( '1', 'maldekstra', 'left' ),
+	'img_width'             => array( '1', '$1ra', '$1px' ),
+	'img_center'            => array( '1', 'centra', 'meza', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'kadro', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'senkadra', 'frameless' ),
+	'img_text_bottom'       => array( '1', 'suba-teksto', 'text-bottom' ),
+	'sitename'              => array( '1', 'TTT-NOMO', 'SITENAME' ),
+	'server'                => array( '0', 'SERVILO', 'SERVER' ),
+	'servername'            => array( '0', 'NOMODESERVILO', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'SKRIPTO-VOJO', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'GRAMATIKO:', 'GRAMMAR:' ),
+	'revisionyear'          => array( '1', 'JARODEREVIZIO', 'REVISIONYEAR' ),
+	'plural'                => array( '0', 'PLURALA:', 'PLURAL:' ),
+	'lc'                    => array( '0', 'MINUSKLA:', 'LC:' ),
+	'uc'                    => array( '0', 'MAJUSKLA:', 'UC:' ),
+	'newsectionlink'        => array( '1', '__LIGLIOALNOVASEKCIO__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'NUNAVERSIO', 'CURRENTVERSION' ),
+	'language'              => array( '0', '#LINGVO:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'ENHAVA-LINGVO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'numberofadmins'        => array( '1', 'NOMBRODEADMINOJ', 'NUMBEROFADMINS' ),
+	'special'               => array( '0', 'speciala', 'special' ),
+	'defaultsort'           => array( '1', 'DEFAŬLTORDIGO:', 'DEFAUXLTORDIGO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'tag'                   => array( '0', 'etikedo', 'tag' ),
+	'hiddencat'             => array( '1', '__KAÅœITAKATEGORIO__', '__HIDDENCAT__' ),
+	'pagesize'              => array( '1', 'PEZODEPAÄœO', 'PAGESIZE' ),
+	'noindex'               => array( '1', '__NENIUINDEKSO__', '__NOINDEX__' ),
 );
 
 $separatorTransformTable = array(',' => ' ', '.' => ',' );
@@ -91,7 +175,7 @@ $messages = array(
 'tog-editondblclick'          => 'Redakti per duobla alklako (JavaScript)',
 'tog-editsection'             => 'Montri [redakti]-ligilojn por sekcioj',
 'tog-editsectiononrightclick' => 'Åœalti sekcian redaktadon per dekstra musklako de sekciaj titoloj (kun JavaScript)',
-'tog-showtoc'                 => 'Montri liston de enhavoj',
+'tog-showtoc'                 => 'Montri liston de enhavoj (por pa�ojn kun pli ol 3 sekciojn)',
 'tog-rememberpassword'        => 'Rememori mian pasvorton',
 'tog-editwidth'               => 'Redaktilo estu plenlar�a',
 'tog-watchcreations'          => 'Aldoni de mi kreitajn pa�ojn al mia atentaro',
@@ -117,16 +201,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ka�i miajn redaktojn de la atentaro',
 'tog-watchlisthidebots'       => 'Ka�u bot-redaktojn de la atentaro',
 'tog-watchlisthideminor'      => 'Ka�u malgrandajn redaktojn de la atentaro',
+'tog-watchlisthideliu'        => 'Ka�i redaktojn de ensalutitaj uzantoj de la atentaro',
+'tog-watchlisthideanons'      => 'Ka�i redaktojn de anonimuloj de la atentaro',
+'tog-nolangconversion'        => 'Mal�alti konvertadon de variantoj',
 'tog-ccmeonemails'            => 'Sendi al mi kopiojn de retpo�taĵoj, kiujn mi sendis al aliaj uzuloj.',
 'tog-diffonly'                => 'Ne montri pa�an enhavon sub la �an�oj',
 'tog-showhiddencats'          => 'Montri ka�itajn kategoriojn',
+'tog-norollbackdiff'          => 'Mankigi �an�ojn post farante malfaron',
 
 'underline-always'  => 'Ĉiam',
 'underline-never'   => 'Neniam',
 'underline-default' => 'DefaÅ­lte laÅ­ foliumilo',
 
-'skinpreview' => '(AntaÅ­rigardo)',
-
 # Dates
 'sunday'        => 'dimanĉo',
 'monday'        => 'lundo',
@@ -220,7 +306,7 @@ $messages = array(
 'mytalk'         => 'Mia diskuto',
 'anontalk'       => 'Diskutpa�o por tiu ĉi IP',
 'navigation'     => 'Navigado',
-'and'            => 'kaj',
+'and'            => '&#32;kaj',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatenoj:',
@@ -257,14 +343,14 @@ $messages = array(
 'talkpagelinktext'  => 'Diskuto',
 'specialpage'       => 'Speciala Pa�o',
 'personaltools'     => 'Personaj iloj',
-'postcomment'       => 'Afi�i komenton',
+'postcomment'       => 'Nova sekcio',
 'articlepage'       => 'Rigardi artikolon',
 'talk'              => 'Diskuto',
 'views'             => 'Vidoj',
 'toolbox'           => 'Iloj',
 'userpage'          => 'Rigardi personan pa�on',
 'projectpage'       => 'Rigardi projektopa�on',
-'imagepage'         => 'Rigardi dosieropa�on',
+'imagepage'         => 'Vidi dosieropa�on',
 'mediawikipage'     => 'Vidi mesa�opa�on',
 'templatepage'      => 'Vidi �ablonopa�on',
 'viewhelppage'      => 'Vidi helpopa�on',
@@ -283,8 +369,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Pri {{SITENAME}}',
 'aboutpage'            => 'Project:Enkonduko',
-'bugreports'           => 'Raporti cimojn',
-'bugreportspage'       => 'Project:Raporti cimojn',
 'copyright'            => 'La enhavo estas havebla sub $1.',
 'copyrightpagename'    => '{{SITENAME}}-kopirajto',
 'copyrightpage'        => '{{ns:project}}:Kopirajto',
@@ -307,9 +391,7 @@ $messages = array(
 
 'badaccess'        => 'Vi ne havas sufiĉe da redaktorajtoj por tiu pa�o.',
 'badaccess-group0' => 'Vi ne rajtas plenumi la agon, kiun vi petis.',
-'badaccess-group1' => 'La ago, kiun vi petis, estas limigita al uzuloj en la grupo $1.',
-'badaccess-group2' => 'La ago, kiun vi petis, estas limigita al uzuloj en unu el la grupoj $1.',
-'badaccess-groups' => 'La ago, kiun vi petis, estas limigita al uzuloj en unu el la grupoj $1.',
+'badaccess-groups' => 'La ago, kiun vi petis, estas limigita al uzuloj en {{PLURAL:$2|la grupo|unu el la grupoj}}: $1.',
 
 'versionrequired'     => 'Versio $1 de MediaWiki nepras',
 'versionrequiredtext' => 'La versio $1 de MediaWiki estas necesa por uzi ĉi tiun pa�on. Vidu [[Special:Version|pa�on pri versio]].',
@@ -323,6 +405,8 @@ $messages = array(
 'editsection'             => 'redakti',
 'editold'                 => 'redakti',
 'viewsourceold'           => 'vidi fonttekston',
+'editlink'                => 'redakti',
+'viewsourcelink'          => 'vidi fontkodon',
 'editsectionhint'         => 'Redakti sekcion: $1',
 'toc'                     => 'Enhavo',
 'showtoc'                 => 'montri',
@@ -337,7 +421,7 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom-fonto',
 'page-rss-feed'           => '"$1" RSS-fonto',
 'page-atom-feed'          => '"$1" Atom-fonto',
-'red-link-title'          => '$1 (ankoraÅ­ ne verkita)',
+'red-link-title'          => '$1 (pa�o ne ekzistas)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pa�o',
@@ -353,8 +437,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Ne ekzistas tia ago',
-'nosuchactiontext'  => "La agon ('action') nomitan de la URL
-ne agnoskas la programaro de {{SITENAME}}",
+'nosuchactiontext'  => "La ago ('action') nomita de la URL estas nevalida.
+Eble vi mistajpis la URL-on, aÅ­ sekvis nevalidan ligilon.
+Eble ankaŭ ĉi tiel indikus problemon de la programaro de {{SITENAME}}.",
 'nosuchspecialpage' => 'Ne ekzistas tia speciala pa�o',
 'nospecialpagetext' => 'Vi petis [[Special:SpecialPages|specialan pa�on]] kiun ne agnoskas la programaro de {{SITENAME}}.',
 
@@ -409,8 +494,6 @@ Bonvolu raporti ĉi tiun al [[Special:ListUsers/sysop|administranto]], notante l
 'badtitle'             => 'Fu�a titolo',
 'badtitletext'         => 'La petita pa�otitolo estas nevalida, malplena, aŭ
 mal�uste ligita interlingva aŭ intervikia titolo.',
-'perfdisabled'         => 'Ni petas pardonon! La petita funkcio estas malebligita
-provizore por konservi la rapidecon de la servilo.',
 'perfcached'           => 'La sekvantaj informoj venas el ka�memoro kaj eble ne estas �isdataj :',
 'perfcachedts'         => 'La jenaj datenoj estas provizoraj, kaj estis laste �isdatigitaj $1.',
 'querypage-no-updates' => 'Ĝisdatigoj por ĉi pa�o estas nune neebligitaj. 
@@ -425,7 +508,7 @@ Peto: $2',
 'protectedpagetext'    => 'Tiu ĉi pa�o estas �losita por malebligi redaktadon.',
 'viewsourcetext'       => 'Vi povas rigardi kaj kopii la fonton de la pa�o:',
 'protectedinterface'   => 'Ĉi tiu pa�o provizas interfacan tekston por la softvaro, kaj estas �losita por malabeligi misuzon.',
-'editinginterface'     => "'''Atentu:''' Vi redaktas pa�on, kiu estas uzata kiel interfaca teksto por la softvaro. Ŝan�oj de tiu ĉi teksto povas �an�i aspekton de la interfaco por aliaj uzantoj. Por tradukojn, bonvolu uzi [http://translatewiki.net/wiki/Main_Page?setlang=eo Betawiki], la projekto por fari lokajn versiojn de MediaWiki.",
+'editinginterface'     => "'''Atentu:''' Vi redaktas pa�on, kiu estas uzata kiel interfaca teksto por la softvaro. Ŝan�oj de tiu ĉi teksto povas �an�i aspekton de la interfaco por aliaj uzantoj. Por tradukojn, bonvolu uzi [http://translatewiki.net/wiki/Main_Page?setlang=eo translatewiki.net], la projekto por fari lokajn versiojn de MediaWiki.",
 'sqlhidden'            => '(SQL serĉomendo ka�ita)',
 'cascadeprotected'     => 'Ĉi tiu pa�o estas protektita kontraŭ redaktado, ĉar �i estas inkludita en la {{PLURAL:$1|sekvan pa�on, kiu|sekvajn pa�ojn, kiuj}} estas {{PLURAL:$1|protektata|protektataj}} kun la "kaskada" opcio turnita sur:
 $2',
@@ -436,16 +519,16 @@ $2',
 La kialo donata estis ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Malbona konfiguro: nekonata virusa skanilo: <i>$1</i>',
+'virus-badscanner'     => "Malbona konfiguro: nekonata virusa skanilo: ''$1''",
 'virus-scanfailed'     => 'skano malsukcesis (kun kodo $1)',
 'virus-unknownscanner' => 'nekonata kontraÅ­viruso:',
 
 # Login and logout pages
 'logouttitle'                => 'Elsaluti',
-'logouttext'                 => '<strong>Vi nun estas elsalutita.</strong>
+'logouttext'                 => "'''Vi nun estas elsalutita.'''
 
 Vi rajtas daÅ­re vikiumi sennome, aÅ­ vi povas [[Special:UserLogin|reensaluti]] kiel la sama aÅ­ kiel alia uzanto.
-Notu ke iuj pa�oj daŭre �ajnos kvazaŭ vi ankoraŭ estas ensalutita, �is vi refre�igu vian retumilan ka�memoron.',
+Notu ke iuj pa�oj daŭre �ajnos kvazaŭ vi ankoraŭ estas ensalutita, �is vi refre�igu vian retumilan ka�memoron.",
 'welcomecreation'            => '== Bonvenon, $1! ==
 Via konto estas kreita.
 Ne forgesu fari viajn [[Special:Preferences|{{SITENAME}}-preferojn]].',
@@ -456,7 +539,6 @@ Ne forgesu fari viajn [[Special:Preferences|{{SITENAME}}-preferojn]].',
 'remembermypassword'         => 'Rememori mian pasvorton',
 'yourdomainname'             => 'Via domajno',
 'externaldberror'            => 'Aŭ estis datenbaza eraro rilate al ekstera aŭtentikigado, aŭ vi ne rajtas �isdatigi vian eksteran konton.',
-'loginproblem'               => '<b>Okazis problemo dum via ensalutado.</b><br />Bonvolu reprovi!',
 'login'                      => 'Ensaluti',
 'nav-login-createaccount'    => 'Ensaluti / Krei novan konton',
 'loginprompt'                => 'Via foliumilo nepre permesu kuketojn por ensaluti en la {{SITENAME}}.',
@@ -496,6 +578,7 @@ Vi povas ankaŭ elekti permesigi aliaj uzantoj kontakti vin per via uzanto-pa�o
 'loginsuccesstitle'          => 'Ensalutado sukcesis',
 'loginsuccess'               => 'Vi ensalutis ĉe {{SITENAME}} kiel uzanto "$1".',
 'nosuchuser'                 => 'Neniu uzanto havas nomon "$1".
+Nomoj por uzantoj estas usklecodistinga.
 Kontrolu vian literumadon, aÅ­ [[Special:UserLogin/signup|kreu novan konton]].',
 'nosuchusershort'            => 'Ne ekzistas uzanto kun la nomo "<nowiki>$1</nowiki>". Bonvolu kontroli vian ortografion.',
 'nouserspecified'            => 'Vi devas entajpi uzantonomon.',
@@ -522,8 +605,9 @@ ne rajtas uzi la pasvorto-rekovran funkcion por malebligi misuzon.',
 'eauthentsent'               => 'Konfirma retmesa�o estas sendita al la nomita retadreso. Antaŭ ol iu ajn alia mesa�o estos sendita al la konto, vi devos sekvi la instrukciojn en la mesa�o por konfirmi ke la konto ja estas la via.',
 'throttled-mailpassword'     => 'Pasvorta rememorigilo estis jam sendita, ene de la {{PLURAL:$1|lasta $1 horo|lastaj $1 horoj}}. Por preventi misuzo, nur unu pasvorto-rememorigilo estos sendita po {{PLURAL:$1|$1 horo|$1 horoj}}.',
 'mailerror'                  => 'Okazis eraro sendante retpo�taĵon: $1',
-'acct_creation_throttle_hit' => 'Ni pardonpetas! Vi jam kreis $1 kontojn kaj ne povas krei pluajn.',
-'emailauthenticated'         => 'Via retpo�ta adreso estis aŭtentikigita ĉe $1.',
+'acct_creation_throttle_hit' => 'Vizitintoj al ĉi tiu vikio uzintaj vian IP-adreson kreis {{PLURAL:$1|1 konton|$1 kontojn}} dum la lasta tago, kiu estas la maksimume permesita en ĉi tiu tempoperiodo.
+Tial, vizitantoj kun ĉi tiu IP-adreso ne povas krei pluajn kontojn ĉi-momente.',
+'emailauthenticated'         => 'Via retadreso estis aÅ­tentikigita ekde $2 $3.',
 'emailnotauthenticated'      => 'Via retadreso <strong>ne jam estas aÅ­tentigata.</strong> Tial ne eblas elekti ajnan funkcion sube listigatan.',
 'noemailprefs'               => 'Specifigu retpo�tan adreson por ĉi tiuj ecoj funkcii.',
 'emailconfirmlink'           => 'Konfirmu vian retpo�tan adreson',
@@ -535,18 +619,26 @@ Enigi bone formatita adreso aÅ­ malplenigi tiun kampon.',
 'createaccount-text'         => 'Iu kreis konton por via retadreso en {{SITENAME}} ($4) nomata "$2", kun pasvorto "$3". Vi ensalutu kaj �an�u vian pasvorton nun.
 
 Vi povas ignori ĉi mesa�on, se ĉi konto estis kreita erare.',
+'login-throttled'            => 'Vi tro ofte provis eniri la pasvorton de ĉi tiu konto. Bonvolu �isatendi kaj retrovi.',
 'loginlanguagelabel'         => 'Lingvo: $1',
 
 # Password reset dialog
-'resetpass'               => 'Refaru konto-pasvorton',
-'resetpass_announce'      => 'Vi ensalutis kun provizora retpo�tita pasvorto. Por kompleti ensalutadon, vi devas fari novan pasvorton ĉi tien:',
-'resetpass_text'          => '<!-- Aldonu tekston ĉi tien -->',
-'resetpass_header'        => 'Ŝan�i kontan pasvorton',
-'resetpass_submit'        => 'Fari pasvorton kaj ensaluti',
-'resetpass_success'       => 'Via pasvorto estis sukcese �an�ita! Nun ensalutanta vin...',
-'resetpass_bad_temporary' => 'Nevalida provizora pasvorto. Vi ver�ajne jam sukcese �an�is vian pasvorton aŭ petis novan provizoran pasvorton.',
-'resetpass_forbidden'     => 'Pasvortoj ne estas �an�eblaj',
-'resetpass_missing'       => 'Mankas pa�aj datenoj.',
+'resetpass'                 => 'Ŝan�i pasvorton',
+'resetpass_announce'        => 'Vi ensalutis kun provizora retpo�tita pasvorto. Por kompleti ensalutadon, vi devas fari novan pasvorton ĉi tien:',
+'resetpass_text'            => '<!-- Aldonu tekston ĉi tien -->',
+'resetpass_header'          => 'Ŝan�i kontan pasvorton',
+'oldpassword'               => 'Malnova pasvorto',
+'newpassword'               => 'Nova pasvorto',
+'retypenew'                 => 'Retajpi novan pasvorton',
+'resetpass_submit'          => 'Fari pasvorton kaj ensaluti',
+'resetpass_success'         => 'Via pasvorto estis sukcese �an�ita! Nun ensalutanta vin...',
+'resetpass_bad_temporary'   => 'Nevalida provizora pasvorto. Vi ver�ajne jam sukcese �an�is vian pasvorton aŭ petis novan provizoran pasvorton.',
+'resetpass_forbidden'       => 'Pasvortoj ne estas �an�eblaj',
+'resetpass-no-info'         => 'Vi devas ensaluti por atingi ĉi tiun pa�on rekte.',
+'resetpass-submit-loggedin' => 'Ŝan�i pasvorton',
+'resetpass-wrong-oldpass'   => 'Nevalida provizora aÅ­ nuna pasvorto.
+Vi eble jam �an�is vian pasvorton aŭ petis novan provizoran pasvorton.',
+'resetpass-temp-password'   => 'Provizora pasvorto:',
 
 # Edit page toolbar
 'bold_sample'     => 'Grasa teksto',
@@ -565,14 +657,14 @@ Vi povas ignori ĉi mesa�on, se ĉi konto estis kreita erare.',
 'nowiki_tip'      => 'Ignoru vikiformatadon',
 'image_sample'    => 'Ekzemplo.jpg',
 'image_tip'       => 'En�utita bildo',
-'media_sample'    => 'Ekzemplo.mp3',
+'media_sample'    => 'Ekzemplo.ogg',
 'media_tip'       => 'Ligo al dosiero sona ...',
 'sig_tip'         => 'Via subskribo kun tempstampo',
 'hr_tip'          => 'Horizontala linio (uzu �pareme)',
 
 # Edit pages
-'summary'                          => 'Resumo',
-'subject'                          => 'Temo/subtitolo',
+'summary'                          => 'Resumo:',
+'subject'                          => 'Temo/subtitolo:',
 'minoredit'                        => 'Ĉi tiu �an�o estas redakteto',
 'watchthis'                        => 'Atenti ĉi tiun pa�on',
 'savearticle'                      => 'Konservi �an�ojn',
@@ -585,8 +677,8 @@ Vi povas ignori ĉi mesa�on, se ĉi konto estis kreita erare.',
 'missingcommenttext'               => 'Bonvolu entajpi komenton malsupre.',
 'missingcommentheader'             => "'''Atento:''' Vi ne donis temo/subtitolo por ĉi tiu komento. 
 Se vi klakos Konservi denove, via redakto estos konservita sen �i.",
-'summary-preview'                  => 'Resuma antaÅ­rigardo',
-'subject-preview'                  => 'AntaÅ­rigardo de Temo/Subitolo',
+'summary-preview'                  => 'Resuma antaÅ­rigardo:',
+'subject-preview'                  => 'AntaÅ­rigardo de Temo/Subitolo:',
 'blockedtitle'                     => 'La uzanto estas forbarita.',
 'blockedtext'                      => "<big>'''Via konto aÅ­ IP-adreso estis forbarita'''</big> 
 
@@ -636,34 +728,37 @@ Bonvolu inkluzivi tiujn detalojn en iuj ajn demandoj kiun vi farus.',
 Ni tial devas uzi la cifran IP-adreso por identigi lin. 
 La sama IP-adreso povas estis samtempte uzata de pluraj uzantoj.
 Se vi estas anonimulo kaj preferus eviti tiajn mistrafajn komentojn kaj konfuzi�on kun aliaj anonimuloj de via retejo, bonvolu [[Special:UserLogin|krei konton]] aŭ [[Special:UserLogin|ensaluti]] por eviti estontan konfuzon kun alia anonimaj uzantoj.''",
-'noarticletext'                    => 'La pa�o nune estas malplena. Vi povas [[Special:Search/{{PAGENAME}}|serĉi ĉi tiun pa�titolon]] en aliaj pa�oj aŭ [{{fullurl:{{FULLPAGENAME}}|action=edit}} redakti ĉi tiun pa�on].',
+'noarticletext'                    => 'Mankas teksto en ĉi tiu pa�o.
+Vi povas [[Special:Search/{{PAGENAME}}|serĉi ĉi tiun pa�titolon]] en aliaj pa�oj,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} serĉi la rilatajn protokolojn],
+aŭ [{{fullurl:{{FULLPAGENAME}}|action=edit}} redakti ĉi tiun pa�on]</span>.',
 'userpage-userdoesnotexist'        => 'Uzula konto "$1" ne estas registrita. Bonvolu konfirmi se vi volas krei/redakti ĉi tiu pa�o.',
 'clearyourcache'                   => "'''Notu:''' Post konservado vi forvi�u la ka�memoron de via foliumilo por vidi la �an�ojn : '''Mozilo:''' alklaku ''Re�ar�i'' (aŭ ''Stir-Shift-R''), '''IE / Opera:''' ''Stir-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Stir-R''.",
-'usercssjsyoucanpreview'           => '<strong>Konsileto:</strong> Uzu la "AntaÅ­rigardan" butonon por provi vian novan css/js antaÅ­ konservi.',
+'usercssjsyoucanpreview'           => "'''Konsileto:''' Uzu la \"AntaÅ­rigardan\" butonon por provi vian novan css/js antaÅ­ konservi.",
 'usercsspreview'                   => "'''Notu ke vi nur antaÅ­vidas vian uzanto-CSS.
 Äœi ne jam estis konservita!'''",
 'userjspreview'                    => "'''Memoru ke vi nun nur provas kaj antaŭrigardas vian uzantan javaskripton, �i ne estas jam konservita'''",
 'userinvalidcssjstitle'            => "'''Averto:''' Ne ekzistas aspekto \"\$1\". Rememoru ke individuaj .css-aj kaj .js-aj pa�oj uzas minusklan titolon, ekz. {{ns:user}}:Foo/monobook.css kontraŭe  al {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Ŝan�o registrita)',
-'note'                             => '<strong>Noto:</strong>',
-'previewnote'                      => '<strong>Memoru, ke ĉi tio estas nur antaŭrigardo kaj ankoraŭ ne konservita!</strong>',
+'note'                             => "'''Noto:'''",
+'previewnote'                      => "'''Memoru, ke ĉi tio estas nur antaŭrigardo kaj ankoraŭ ne konservita!'''",
 'previewconflict'                  => 'La jena antaÅ­rigardo montras la tekston el la supra tekstujo,
 kiel �i aperos se vi elektos konservi la pa�on.',
-'session_fail_preview'             => '<strong>Ni ne povas procezi vian redakton pro perdo de seancaj datenoj.
+'session_fail_preview'             => "'''Ni ne povas procezi vian redakton pro perdo de seancaj datenoj.
 Bonvolu retrovi.
-Se ankoraÅ­ ne funkcios, trovu [[Special:UserLogout|elsaluti]] kaj reensaluti.</strong>',
-'session_fail_preview_html'        => "<strong>Ne eblas trakti vian redakton pro manko de seancaj datenoj.</strong>
+Se ankoraÅ­ ne funkcios, trovu [[Special:UserLogout|elsaluti]] kaj reensaluti.'''",
+'session_fail_preview_html'        => "'''Ne eblas trakti vian redakton pro manko de seancaj datenoj.'''
 
 ''Ĉar {{SITENAME}} ebligas krudan HTML, ĉi tiu antaŭrigardo estas ka�ita kiel prevento kontraŭ Javascript-atakoj.''
 
-<strong>Se ĉi tiu estas taŭga provo por redakti, bonvolu reprovi.
-Se ankoraÅ­ ne funkcias, provu [[Special:UserLogout|elsaluti]] kaj reensaluti.</strong>",
-'token_suffix_mismatch'            => '<strong>Via redakto estis malpermesita ĉar via klienta fu�is la interpunkcio en la redakto-signo.
+'''Se ĉi tiu estas taŭga provo por redakti, bonvolu reprovi.
+Se ankoraÅ­ ne funkcias, provu [[Special:UserLogout|elsaluti]] kaj reensaluti.'''",
+'token_suffix_mismatch'            => "'''Via redakto estis malpermesita ĉar via klienta fu�is la interpunkcio en la redakto-signo.
 La redakto estis malpermesita por preventi koruptado de la teksto de la pa�o.
-Ĉi tiel malofte okazas kiam vi uzas fu�an TTT-an anoniman prokurilon.</strong>',
+Ĉi tiel malofte okazas kiam vi uzas fu�an TTT-an anoniman prokurilon.'''",
 'editing'                          => 'Redaktante $1',
 'editingsection'                   => 'Redaktante $1 (sekcion)',
-'editingcomment'                   => 'Redaktante $1 (komenton)',
+'editingcomment'                   => 'Redaktante $1 (nova sekcio)',
 'editconflict'                     => 'Redakta konflikto: $1',
 'explainconflict'                  => 'Iu alia �an�is la pa�on post kiam vi ekredaktis.
 La supra tekstujo enhavas la aktualan tekston de la artikolo.
@@ -673,27 +768,28 @@ Vi devas mem kunfandi viajn �an�ojn kaj la jaman tekston.
 vi alklakos "Konservi".<br />',
 'yourtext'                         => 'Via teksto',
 'storedversion'                    => 'Registrita versio',
-'nonunicodebrowser'                => '<strong>ATENTU: Via foliumilo ne eltenas unikodon, bonvolu �an�i �in antaŭ ol redakti artikolon.</strong>',
-'editingold'                       => '<strong>AVERTO: Vi nun redaktas malnovan version de tiu ĉi artikolo.
-Se vi konservos vian redakton, ĉiuj �an�oj faritaj post tiu versio perdi�os.</strong>',
+'nonunicodebrowser'                => "'''ATENTU: Via foliumilo ne eltenas unikodon, bonvolu �an�i �in antaŭ ol redakti artikolon.'''",
+'editingold'                       => "'''AVERTO: Vi nun redaktas malnovan version de tiu ĉi artikolo.
+Se vi konservos vian redakton, ĉiuj �an�oj faritaj post tiu versio perdi�os.'''",
 'yourdiff'                         => 'Malsamoj',
-'copyrightwarning'                 => 'Bonvolu noti, ke ĉiu kontribuaĵo al la {{SITENAME}} estu rigardata kiel eldonita laŭ $2 (vidu je $1). Se vi volas, ke via verkaĵo ne estu redaktota senkompate kaj disvastigota laŭvole, ne alklaku "Konservi".<br />
+'copyrightwarning'                 => "Bonvolu noti, ke ĉiu kontribuaĵo al la {{SITENAME}} estu rigardata kiel eldonita laŭ \$2 (vidu je \$1). Se vi volas, ke via verkaĵo ne estu redaktota senkompate kaj disvastigota laŭvole, ne alklaku \"Konservi\".<br />
 Vi ankaŭ ĵuras, ke vi mem verkis la tekston, aŭ ke vi kopiis �in el fonto senkopirajta.
-<strong>NE UZU KOPIRAJTAJN VERKOJN SENPERMESE!</strong>',
-'copyrightwarning2'                => 'Bonvolu noti ke ĉiuj kontribuoj al {{SITENAME}} povas esti reredaktita, �an�ita aŭ forigita de aliaj kontribuantoj. Se vi ne deziras ke viaj verkoj estu senkompate reredaktitaj, ne publikigu ilin ĉi tie.<br />
+'''NE UZU KOPIRAJTAJN VERKOJN SENPERMESE!'''",
+'copyrightwarning2'                => "Bonvolu noti ke ĉiuj kontribuoj al {{SITENAME}} povas esti reredaktita, �an�ita aŭ forigita de aliaj kontribuantoj. Se vi ne deziras ke viaj verkoj estu senkompate reredaktitaj, ne publikigu ilin ĉi tie.<br />
 Vi ankaÅ­ promesu al ni ke vi verkis tion mem aÅ­ kopiis el publika domajno aÅ­ simila libera fonto (vidu $1 por detaloj).
-<strong>NE PROPONU KOPIRAJTITAJN VERKOJN SEN PERMESO!</strong>',
-'longpagewarning'                  => '<strong>AVERTO: Tiu ĉi pa�o longas $1 kilobitokojn; kelkaj retumiloj
+'''NE PROPONU KOPIRAJTITAJN VERKOJN SEN PERMESO!'''",
+'longpagewarning'                  => "'''AVERTO: Tiu ĉi pa�o longas $1 kilobitokojn; kelkaj retumiloj
 povas fu�i redaktante pa�ojn je longo proksime aŭ preter 32 kb.
-Se eble, bonvolu disigi la pa�on al malpli grandajn pa�erojn.</strong>',
-'longpageerror'                    => '<strong>Eraro: La teksto, kiun vi prezentis, longas $1 kilobajtojn, kio estas pli longa ol la maksimumo de $2 kilobajtoj. Äœi ne povas esti storata.</strong>',
-'readonlywarning'                  => '<strong>AVERTO: La datumbazo estas �losita por teknika laboro;
-pro tio neeblas nun konservi vian redaktadon. Vi povas elkopii kaj englui
-la tekston al tekstdosiero por poste reenmeti �in al la vikio.</strong>',
-'protectedpagewarning'             => '<strong>AVERTO: Tiu ĉi pa�o estas �losita kontraŭ redaktado krom de administrantoj (t.e., vi). Bv certi�i, ke vi sekvas la normojn de la komunumo per via redaktado.</strong>',
+Se eble, bonvolu disigi la pa�on al malpli grandajn pa�erojn.'''",
+'longpageerror'                    => "'''Eraro: La teksto, kiun vi prezentis, longas $1 kilobajtojn, kio estas pli longa ol la maksimumo de $2 kilobajtoj. Äœi ne povas esti storata.'''",
+'readonlywarning'                  => "'''AVERTO: La datumbazo estas �losita por teknika laboro, do vi ne eblas konservi viajn redaktojn nune.
+Vi eble volus elkopii kaj englui la tekston al tekstdosiero por konservi �in por posta uzo.'''
+
+La administranto kiu �losis �in donis ĉi tiun eksplikaĵon: $1",
+'protectedpagewarning'             => "'''AVERTO: Tiu ĉi pa�o estas �losita kontraŭ redaktado krom de administrantoj (t.e., vi). Bv certi�i, ke vi sekvas la normojn de la komunumo per via redaktado.'''",
 'semiprotectedpagewarning'         => "'''Notu:''' Ĉi pa�o estas protektita tiel ke nur ensalutintaj uzantoj povas redakti �in.",
 'cascadeprotectedwarning'          => "'''Averto:''' Ĉi tiu pa�o estas �losita tiel ke nur uzantoj kun administrantaj privilegioj povas redakti �in, ĉar �i estas inkludita en la {{PLURAL:$1|sekvan kaskade protektitan pa�on|sekvajn kaskade protektitajn pa�ojn}}:",
-'titleprotectedwarning'            => '<strong>AVERTO: Ĉi pa�o estis �losita tial nur iuj uzantoj povas krei �in.</strong>',
+'titleprotectedwarning'            => "'''AVERTO: Ĉi pa�o estis �losita tial nur [[Special:ListGroupRights|specifaj rajtoj]] estas bezonaj por krei �in.'''",
 'templatesused'                    => 'Ŝablonoj uzitaj sur ĉi pa�o:',
 'templatesusedpreview'             => 'Ŝablonoj uzataj dum ĉi tiu antaŭrigardo:',
 'templatesusedsection'             => 'Ŝablonoj uzataj en ĉi tiu sekcio:',
@@ -711,11 +807,21 @@ la tekston al tekstdosiero por poste reenmeti �in al la vikio.</strong>',
 
 Vi konsideru ĉu konvenas daŭre redakti ĉi pa�on.
 Jen la protokolo de forigoj por via oportuno:",
+'deleted-notice'                   => 'Ĉi tiu pa�o estis forigita. La linio el la protokolo pri forigado estas montrata sube por via referenco.',
+'deletelog-fulllog'                => 'Vidi plenan protokolon',
+'edit-hook-aborted'                => 'Redakto ĉesigis per hoko.
+Äœi ne donis eksplikon.',
+'edit-gone-missing'                => 'Ne eblis �isdatigi la pa�on.
+Ver�ajne �i estis forigita.',
+'edit-conflict'                    => 'Redakto-konflikto.',
+'edit-no-change'                   => 'Via redakto estis ignorita, ĉar neniu �an�o estis farita al la teksto.',
+'edit-already-exists'              => 'Ne eblis krei novan pa�on.
+Äœi jam ekzistas.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Averto: Ĉi tiu pa�o enhavas tro da multekostaj sintaksaj funkcio-vokoj.
 
-Äœi havu malpli ol $2, sed nun estas $1.',
+Äœi havu malpli ol $2 {{PLURAL:$2|vokon|vokojn}}, sed nun estas $1 {{PLURAL:$1|voko|vokoj}}.',
 'expensive-parserfunction-category'       => 'Pa�oj kun tro da multekostaj sintaksaj funkcio-vokoj',
 'post-expand-template-inclusion-warning'  => 'Averto: Inkluziva pezo de �ablonoj estas tro granda.
 Iuj �ablonoj ne estos inkluzivitaj.',
@@ -723,6 +829,8 @@ Iuj �ablonoj ne estos inkluzivitaj.',
 'post-expand-template-argument-warning'   => 'Averto: Ĉit tiu pa�o enhavas almenaŭ unu �ablonan argumenton kiu havas tro grandan etendan pezon.
 Ĉi tiuj argumentoj estis forlasitaj.',
 'post-expand-template-argument-category'  => 'Pa�oj enhavantaj forlasitajn argumentojn de �ablonoj',
+'parser-template-loop-warning'            => 'Rekursiva �ablono estis trovita: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limo de �ablona profundeco pligrandi�is ($1)',
 
 # "Undo" feature
 'undo-success' => 'La redakto estas malfarebla.
@@ -738,28 +846,27 @@ Bonvolu konfirmi la jenan komparaĵon por verigi ĉi tiel vi volas, kaj konservi
 La kialo donata de $3 estas ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Rigardi la protokolojn por tiu ĉi pa�o',
-'nohistory'           => 'Ne ekzistas historio de redaktoj por ĉi tiu pa�o.',
-'revnotfound'         => 'Ne ekzistas malnova versio de la artikolo',
-'revnotfoundtext'     => 'Ne eblis trovi malnovan version de la artikolo kiun vi petis.
-Bonvolu kontroli la retadreson (URL) kiun vi uzis por atingi la pa�on.\\b',
-'currentrev'          => 'Aktuala versio',
-'revisionasof'        => 'Kiel registrite je $1',
-'revision-info'       => 'Redakto de $1 de $2',
-'previousrevision'    => '� Antaŭa versio',
-'nextrevision'        => 'Sekva versio →',
-'currentrevisionlink' => 'Rigardi nunan version',
-'cur'                 => 'nuna',
-'next'                => 'sekv',
-'last'                => 'antaÅ­a',
-'page_first'          => 'unua',
-'page_last'           => 'lasta',
-'histlegend'          => 'Klarigo: (nuna) = vidu malsamojn kompare kun la nuna versio, (antaÅ­a) = malsamojn kompare kun la antaÅ­a versio, <strong>E</strong> = malgranda redakteto',
-'deletedrev'          => '[forigita]',
-'histfirst'           => 'plej frua',
-'histlast'            => 'plej lasta',
-'historysize'         => '({{PLURAL:$1|1 bajto|$1 bajtoj}})',
-'historyempty'        => '(malplena)',
+'viewpagelogs'           => 'Rigardi la protokolojn por tiu ĉi pa�o',
+'nohistory'              => 'Ne ekzistas historio de redaktoj por ĉi tiu pa�o.',
+'currentrev'             => 'Aktuala versio',
+'currentrev-asof'        => 'Nuna versio ekde $1',
+'revisionasof'           => 'Kiel registrite je $1',
+'revision-info'          => 'Redakto de $1 de $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Antaŭa versio',
+'nextrevision'           => 'Sekva versio →',
+'currentrevisionlink'    => 'Rigardi nunan version',
+'cur'                    => 'nuna',
+'next'                   => 'sekv',
+'last'                   => 'antaÅ­a',
+'page_first'             => 'unua',
+'page_last'              => 'lasta',
+'histlegend'             => 'Klarigo: (nuna) = vidu malsamojn kompare kun la nuna versio, (antaÅ­a) = malsamojn kompare kun la antaÅ­a versio, <strong>E</strong> = malgranda redakteto',
+'history-fieldset-title' => 'Traserĉi historion',
+'deletedrev'             => '[forigita]',
+'histfirst'              => 'plej frua',
+'histlast'               => 'plej lasta',
+'historysize'            => '({{PLURAL:$1|1 bajto|$1 bajtoj}})',
+'historyempty'           => '(malplena)',
 
 # Revision feed
 'history-feed-title'          => 'Historio de redaktoj',
@@ -845,6 +952,7 @@ Certigu ke ĉi tiu �an�o tenos kontinuecon de la historia pa�o.',
 'mergehistory-invalid-destination' => 'Celpa�o devas esti valida titolo.',
 'mergehistory-autocomment'         => 'Kunigita [[:$1]] en [[:$2]]',
 'mergehistory-comment'             => 'Kunigita [[:$1]] en [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Fontaj kaj destinaj pa�oj ne povas esti la samon',
 
 # Merge log
 'mergelog'           => 'Protokolo de kunigoj',
@@ -857,125 +965,204 @@ Certigu ke ĉi tiu �an�o tenos kontinuecon de la historia pa�o.',
 'difference'              => '(Malsamoj inter versioj)',
 'lineno'                  => 'Linio $1:',
 'compareselectedversions' => 'Kompari la selektitajn versiojn',
+'visualcomparison'        => 'Vida komparo',
+'wikicodecomparison'      => 'Vikiteksta komparo',
 'editundo'                => 'malfari',
 'diff-multi'              => '({{PLURAL:$1|Unu meza versio|$1 mezaj versioj}} ne montrata.)',
+'diff-movedto'            => 'alnomita al $1',
+'diff-styleadded'         => '$1 stilo aldoni�is',
+'diff-added'              => '$1 aldoni�is',
+'diff-changedto'          => '�an�i�is al $1',
+'diff-movedoutof'         => 'movita el $1',
+'diff-styleremoved'       => '$1 stilo fori�is',
+'diff-removed'            => '$1 fori�is',
+'diff-changedfrom'        => '�an�i�is de $1',
+'diff-src'                => 'fonto',
+'diff-withdestination'    => 'kun destino $1',
+'diff-with'               => '&#32;kun $1 $2',
+'diff-with-final'         => '&#32;kaj $1 $2',
+'diff-width'              => 'lar�eco',
+'diff-height'             => 'alteco',
+'diff-p'                  => "'''paragrafo'''",
+'diff-blockquote'         => "'''citaĵo'''",
+'diff-h1'                 => "'''titolo (nivelo 1)'''",
+'diff-h2'                 => "'''titolo (nivelo 2)'''",
+'diff-h3'                 => "'''titolo (nivelo 3)'''",
+'diff-h4'                 => "'''titolo (nivelo 4)'''",
+'diff-h5'                 => "'''titolo (nivelo 5)'''",
+'diff-pre'                => "'''antaÅ­formatita sekcio'''",
+'diff-div'                => "'''divizio'''",
+'diff-ul'                 => "'''senorda listo'''",
+'diff-ol'                 => "'''ordigita listo'''",
+'diff-li'                 => "'''listano'''",
+'diff-table'              => "'''tabelo'''",
+'diff-tbody'              => "'''enhavo de tabelo'''",
+'diff-tr'                 => "'''vico'''",
+'diff-td'                 => "'''ĉelo'''",
+'diff-th'                 => "'''tabela titolo'''",
+'diff-br'                 => "'''vertikala spaceto'''",
+'diff-hr'                 => "'''horizonta linio'''",
+'diff-code'               => "'''sekcio de komputika kodo'''",
+'diff-dl'                 => "'''difina listo'''",
+'diff-dt'                 => "'''defina termino'''",
+'diff-dd'                 => "'''difino'''",
+'diff-input'              => "'''enigo'''",
+'diff-form'               => "'''kamparo'''",
+'diff-img'                => "'''bildo'''",
+'diff-span'               => "'''grupigo (span)'''",
+'diff-a'                  => "'''ligilo'''",
+'diff-i'                  => "'''kursiva'''",
+'diff-b'                  => "'''grasigita'''",
+'diff-strong'             => "'''forta'''",
+'diff-em'                 => "'''emfazita'''",
+'diff-font'               => "'''tiparo'''",
+'diff-big'                => "'''granda'''",
+'diff-del'                => "'''forigita'''",
+'diff-tt'                 => "'''fiksite lar�a tiparo'''",
+'diff-sub'                => "'''subindico'''",
+'diff-sup'                => "'''supraindico'''",
+'diff-strike'             => "'''trostrekita'''",
 
 # Search results
-'searchresults'             => 'Serĉrezultoj',
-'searchresulttext'          => 'Por pliaj informoj kiel priserĉi la {{SITENAME}}n, vidu [[{{MediaWiki:Helppage}}|serĉi en {{SITENAME}}]].',
-'searchsubtitle'            => 'Vi serĉis "\'\'\'[[$1]]\'\'\'" ([[Special:Prefixindex/$1|ĉiuj pa�oj komence kun "$1"]] | [[Special:WhatLinksHere/$1|ĉiuj pa�oj ligantaj al "$1"]])',
-'searchsubtitleinvalid'     => 'Serĉmendo "$1"',
-'noexactmatch'              => '<b>Ne estas pa�o titolita "$1".</b> Vi povas [[:$1|krei la pa�on]].',
-'noexactmatch-nocreate'     => "'''Estas neniu pa�o titolita \"\$1\".'''",
-'toomanymatches'            => 'Tro da serĉo-trafoj estis trovitaj; bonvolu provi malsaman serĉomendon.',
-'titlematches'              => 'Trovitaj laÅ­ titolo',
-'notitlematches'            => 'Neniu trovita laÅ­ titolo',
-'textmatches'               => 'Trovitaj laÅ­ enhavo',
-'notextmatches'             => 'Neniu trovita laÅ­ enhavo',
-'prevn'                     => '$1 antaÅ­ajn',
-'nextn'                     => '$1 sekvajn',
-'viewprevnext'              => 'Montri ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 vorto|$2 vortoj}})',
-'search-result-score'       => 'Trafeco: $1%',
-'search-redirect'           => '(alidirektilo $1)',
-'search-section'            => '(sekcio $1)',
-'search-suggest'            => 'Ĉu vi intenciis: $1',
-'search-interwiki-caption'  => 'Kunprojektoj',
-'search-interwiki-default'  => '$1 rezultoj:',
-'search-interwiki-more'     => '(plu)',
-'search-mwsuggest-enabled'  => 'kun sugestoj',
-'search-mwsuggest-disabled' => 'sen sugestoj',
-'search-relatedarticle'     => 'Relataj',
-'mwsuggest-disable'         => 'Mal�alti AJAX-sugestojn',
-'searchrelated'             => 'rilataj',
-'searchall'                 => 'ĉiuj',
-'showingresults'            => "Montras {{PLURAL:$1|'''1''' trovitan|'''$1''' trovitajn}} ekde la #'''$2'''-a.",
-'showingresultsnum'         => "Montras {{PLURAL:$3|'''1''' trovitan|'''$3''' trovitajn}} ekde la #'''$2'''-a.",
-'showingresultstotal'       => "Montrante suben {{PLURAL:$3|rezulton '''$1''' of '''$3'''|rezultojn '''$1 - $2''' el '''$3'''}}",
-'nonefound'                 => '<strong>Noto</strong>: malsukcesaj serĉoj ofte
-okazas ĉar oni serĉas tro da ofte uzataj vortoj, kiujn ne enhavas la indekso,
-aŭ ĉar oni petas tro da serĉvortoj (nur pa�oj kiuj enhavas ĉiun serĉvorton
-montri�os en la rezulto).',
-'powersearch'               => 'Progresa trovilo',
-'powersearch-legend'        => 'Progresa serĉo',
-'powersearch-ns'            => 'Serĉi en nomspacoj:',
-'powersearch-redir'         => 'Listigi alidirektilojn',
-'powersearch-field'         => 'Serĉi',
-'search-external'           => 'Ekstera serĉo',
-'searchdisabled'            => '<p>Oni provizore mal�altis serĉadon per la plenteksta
+'searchresults'                    => 'Serĉrezultoj',
+'searchresults-title'              => 'Serĉrezultoj por "$1"',
+'searchresulttext'                 => 'Por pliaj informoj kiel priserĉi la {{SITENAME}}n, vidu [[{{MediaWiki:Helppage}}|serĉi en {{SITENAME}}]].',
+'searchsubtitle'                   => 'Vi serĉis "\'\'\'[[$1]]\'\'\'" ([[Special:Prefixindex/$1|ĉiuj pa�oj komence de "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|ĉiuj pa�oj ligantaj al "$1"]])',
+'searchsubtitleinvalid'            => 'Serĉmendo "$1"',
+'noexactmatch'                     => '<b>Ne estas pa�o titolita "$1".</b> Vi povas [[:$1|krei la pa�on]].',
+'noexactmatch-nocreate'            => "'''Estas neniu pa�o titolita \"\$1\".'''",
+'toomanymatches'                   => 'Tro da serĉo-trafoj estis trovitaj; bonvolu provi malsaman serĉomendon.',
+'titlematches'                     => 'Trovitaj laÅ­ titolo',
+'notitlematches'                   => 'Neniu trovita laÅ­ titolo',
+'textmatches'                      => 'Trovitaj laÅ­ enhavo',
+'notextmatches'                    => 'Neniu trovita laÅ­ enhavo',
+'prevn'                            => '$1 antaÅ­ajn',
+'nextn'                            => '$1 sekvajn',
+'viewprevnext'                     => 'Montri ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Serĉaj opcioj',
+'searchmenu-exists'                => "* Pa�o '''[[$1]]'''",
+'searchmenu-new'                   => "'''Krei la pa�on \"[[:\$1]]\" en ĉi tiu vikio!'''",
+'searchhelp-url'                   => 'Help:Enhavo',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Traserĉi pa�ojn kun ĉi tiu prefikso]]',
+'searchprofile-articles'           => 'Enhavaj pa�oj',
+'searchprofile-articles-and-proj'  => 'Enhavaj & projektaj pa�oj',
+'searchprofile-project'            => 'Projektaj pa�oj',
+'searchprofile-images'             => 'Dosieroj',
+'searchprofile-everything'         => 'Ĉio',
+'searchprofile-advanced'           => 'Progresa',
+'searchprofile-articles-tooltip'   => 'Serĉo en $1',
+'searchprofile-project-tooltip'    => 'Serĉo en $1',
+'searchprofile-images-tooltip'     => 'Serĉi dosierojn',
+'searchprofile-everything-tooltip' => 'Traserĉi ĉiun enhavon (inkluzivante diskuto-pa�ojn)',
+'searchprofile-advanced-tooltip'   => 'Serĉi en specialaj nomspacoj',
+'prefs-search-nsdefault'           => 'Serĉi defaŭlte:',
+'prefs-search-nscustom'            => 'Serĉi specialajn nomspacojn:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 vorto|$2 vortoj}})',
+'search-result-score'              => 'Trafeco: $1%',
+'search-redirect'                  => '(alidirektilo $1)',
+'search-section'                   => '(sekcio $1)',
+'search-suggest'                   => 'Ĉu vi intenciis: $1',
+'search-interwiki-caption'         => 'Kunprojektoj',
+'search-interwiki-default'         => '$1 rezultoj:',
+'search-interwiki-more'            => '(plu)',
+'search-mwsuggest-enabled'         => 'kun sugestoj',
+'search-mwsuggest-disabled'        => 'sen sugestoj',
+'search-relatedarticle'            => 'Relataj',
+'mwsuggest-disable'                => 'Mal�alti AJAX-sugestojn',
+'searchrelated'                    => 'rilataj',
+'searchall'                        => 'ĉiuj',
+'showingresults'                   => "Montras {{PLURAL:$1|'''1''' trovitan|'''$1''' trovitajn}} ekde la #'''$2'''-a.",
+'showingresultsnum'                => "Montras {{PLURAL:$3|'''1''' trovitan|'''$3''' trovitajn}} ekde la #'''$2'''-a.",
+'showingresultstotal'              => "Montras jene {{PLURAL:$4|rezulton '''$1''' el '''$3'''|rezultojn '''$1 - $2''' el '''$3'''}}",
+'nonefound'                        => "'''Notu''':  Nur kelkaj nomspacoj estas serĉitaj defaulte.
+Provu prefiksi vian mendon kun ''all:'' por serĉi ĉiun enhavon (inkluzivante diskuto-pa�ojn, �ablonojn, ktp), aŭ uzi la deziritan nomspacon kiel prefikson.",
+'search-nonefound'                 => 'La serĉomendo rezultis kun neniuj trafoj.',
+'powersearch'                      => 'Progresa trovilo',
+'powersearch-legend'               => 'Progresa serĉo',
+'powersearch-ns'                   => 'Serĉi en nomspacoj:',
+'powersearch-redir'                => 'Listigi alidirektilojn',
+'powersearch-field'                => 'Serĉi',
+'search-external'                  => 'Ekstera serĉo',
+'searchdisabled'                   => '<p>Oni provizore mal�altis serĉadon per la plenteksta
 indekso pro tro�ar�ita servilo. Intertempe, vi povas serĉi per <i>guglo</i> aŭ per <i>jahu!</i>:</p>',
 
 # Preferences page
-'preferences'              => 'Preferoj',
-'mypreferences'            => 'Miaj preferoj',
-'prefs-edits'              => 'Nombro de redaktoj:',
-'prefsnologin'             => 'Ne jam salutis!',
-'prefsnologintext'         => 'Vi devas esti <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ensalutita]</span> por fari viajn preferojn.',
-'prefsreset'               => 'Preferoj reprenitaj el la registro.',
-'qbsettings'               => 'Preferoj pri ilaro',
-'qbsettings-none'          => 'Neniu',
-'qbsettings-fixedleft'     => 'Fiksi�as maldekstre',
-'qbsettings-fixedright'    => 'Fiksi�as dekstre',
-'qbsettings-floatingleft'  => 'Åœvebas maldekstre',
-'qbsettings-floatingright' => 'Åœvebas dekstre',
-'changepassword'           => 'Ŝan�i pasvorton',
-'skin'                     => 'Etoso',
-'math'                     => 'Matematikaĵoj',
-'dateformat'               => 'Datformato',
-'datedefault'              => 'Nenia prefero',
-'datetime'                 => 'Dato kaj horo',
-'math_failure'             => 'malsukcesis analizi formulon',
-'math_unknown_error'       => 'nekonata eraro',
-'math_unknown_function'    => 'nekonata funkcio',
-'math_lexing_error'        => 'leksika analizo malsukcesis',
-'math_syntax_error'        => 'sintakseraro',
-'math_image_error'         => 'konverto al PNG malsukcesis',
-'math_bad_tmpdir'          => 'Ne povas skribi al aÅ­ krei matematikian labor-dosierujon.',
-'math_bad_output'          => 'Ne eblas enskribi aÅ­ krei matematikan eligan dosierujon',
-'math_notexvc'             => 'Programo texvc ne ekzistas; bonvolu vidi math/README por konfiguri.',
-'prefs-personal'           => 'Datenoj pri uzanto',
-'prefs-rc'                 => 'Lastaj �an�oj',
-'prefs-watchlist'          => 'Atentaro',
-'prefs-watchlist-days'     => 'Nombro de tagoj montri en la atentaro:',
-'prefs-watchlist-edits'    => 'Maksimuma nombro de �an�oj montrendaj en ekspandita atentaro:',
-'prefs-misc'               => 'Miksitaĵoj',
-'saveprefs'                => 'Konservi preferojn',
-'resetprefs'               => 'Forvi�i nekonservitajn �an�ojn',
-'oldpassword'              => 'Malnova pasvorto',
-'newpassword'              => 'Nova pasvorto',
-'retypenew'                => 'Retajpi novan pasvorton',
-'textboxsize'              => 'Grandeco de redakta tekstujo',
-'rows'                     => 'Linioj:',
-'columns'                  => 'Kolumnoj:',
-'searchresultshead'        => 'Serĉi',
-'resultsperpage'           => 'Montri trovitajn po',
-'contextlines'             => 'Montri liniojn el pa�oj po:',
-'contextchars'             => 'Montri literojn el linioj �is po:',
-'stub-threshold'           => 'Ago-sojlo por formatigo de <a href="#" class="stub">ligil-�ermo (anglalingve: "stub link")</a> (bitikoj):',
-'recentchangesdays'        => 'Tagoj montrendaj en lastaj �an�oj:',
-'recentchangescount'       => "Montru kiom da titoloj en 'Lastaj �an�oj'",
-'savedprefs'               => 'Viaj preferoj estas konservitaj.',
-'timezonelegend'           => 'Horzono',
-'timezonetext'             => 'Indiku je kiom da horoj via
+'preferences'               => 'Preferoj',
+'mypreferences'             => 'Miaj preferoj',
+'prefs-edits'               => 'Nombro de redaktoj:',
+'prefsnologin'              => 'Ne jam salutis!',
+'prefsnologintext'          => 'Vi devas esti <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ensalutita]</span> por fari viajn preferojn.',
+'prefsreset'                => 'Preferoj reprenitaj el la registro.',
+'qbsettings'                => 'Preferoj pri ilaro',
+'qbsettings-none'           => 'Neniu',
+'qbsettings-fixedleft'      => 'Fiksi�as maldekstre',
+'qbsettings-fixedright'     => 'Fiksi�as dekstre',
+'qbsettings-floatingleft'   => 'Åœvebas maldekstre',
+'qbsettings-floatingright'  => 'Åœvebas dekstre',
+'changepassword'            => 'Ŝan�i pasvorton',
+'skin'                      => 'Etoso',
+'skin-preview'              => 'AntaÅ­rigardo',
+'math'                      => 'Matematikaĵoj',
+'dateformat'                => 'Datformato',
+'datedefault'               => 'Nenia prefero',
+'datetime'                  => 'Dato kaj horo',
+'math_failure'              => 'malsukcesis analizi formulon',
+'math_unknown_error'        => 'nekonata eraro',
+'math_unknown_function'     => 'nekonata funkcio',
+'math_lexing_error'         => 'leksika analizo malsukcesis',
+'math_syntax_error'         => 'sintakseraro',
+'math_image_error'          => 'konverto al PNG malsukcesis',
+'math_bad_tmpdir'           => 'Ne povas skribi al aÅ­ krei matematikian labor-dosierujon.',
+'math_bad_output'           => 'Ne eblas enskribi aÅ­ krei matematikan eligan dosierujon',
+'math_notexvc'              => 'Programo texvc ne ekzistas; bonvolu vidi math/README por konfiguri.',
+'prefs-personal'            => 'Datenoj pri uzanto',
+'prefs-rc'                  => 'Lastaj �an�oj',
+'prefs-watchlist'           => 'Atentaro',
+'prefs-watchlist-days'      => 'Nombro de tagoj montri en la atentaro:',
+'prefs-watchlist-days-max'  => '(maksimume 7 tagoj)',
+'prefs-watchlist-edits'     => 'Maksimuma nombro de �an�oj montrendaj en ekspandita atentaro:',
+'prefs-watchlist-edits-max' => '(maksimuma nombro: 1000)',
+'prefs-misc'                => 'Miksitaĵoj',
+'prefs-resetpass'           => 'Ŝan�i pasvorton',
+'saveprefs'                 => 'Konservi preferojn',
+'resetprefs'                => 'Forvi�i nekonservitajn �an�ojn',
+'textboxsize'               => 'Grandeco de redakta tekstujo',
+'prefs-edit-boxsize'        => 'Grandeco de la redakto-kesko.',
+'rows'                      => 'Linioj:',
+'columns'                   => 'Kolumnoj:',
+'searchresultshead'         => 'Serĉi',
+'resultsperpage'            => 'Montri trovitajn po',
+'contextlines'              => 'Montri liniojn el pa�oj po:',
+'contextchars'              => 'Montri literojn el linioj �is po:',
+'stub-threshold'            => 'Ago-sojlo por formatigo de <a href="#" class="stub">ligil-�ermo (anglalingve: "stub link")</a> (bitikoj):',
+'recentchangesdays'         => 'Tagoj montrendaj en lastaj �an�oj:',
+'recentchangesdays-max'     => '(maksimume $1 {{PLURAL:$1|tago|tagoj}})',
+'recentchangescount'        => "Nombro de redaktoj por montri en 'Lastaj �an�oj', pa�aj historioj, kaj en protokoloj, laŭ defaŭlto:",
+'savedprefs'                => 'Viaj preferoj estas konservitaj.',
+'timezonelegend'            => 'Horzono',
+'timezonetext'              => 'Indiku je kiom da horoj via
 loka horzono malsamas disde tiu de la servilo (UTC).
 Ekzemple, por la Centra EÅ­ropa Horzono, indiku "1" vintre aÅ­ "2" dum somertempo.',
-'localtime'                => 'Loka horzono',
-'timezoneoffset'           => 'Malsamo',
-'servertime'               => 'Horo de la servilo',
-'guesstimezone'            => 'Plenigita el la foliumilo',
-'allowemail'               => 'Rajtigi retmesa�ojn de aliaj uzantoj',
-'prefs-searchoptions'      => 'Serĉi opciojn',
-'prefs-namespaces'         => 'Nomspacoj',
-'defaultns'                => 'Traserĉi la jenajn nomspacojn:',
-'default'                  => 'defaÅ­lte',
-'files'                    => 'Dosieroj',
+'localtime'                 => 'Loka tempo:',
+'timezoneselect'            => 'Horzono:',
+'timezoneuseserverdefault'  => 'Uzi defaÅ­lton de servilo',
+'timezoneuseoffset'         => 'Alia (Enigu diferencon)',
+'timezoneoffset'            => 'Diferenco¹:',
+'servertime'                => 'Servila tempo:',
+'guesstimezone'             => 'Plenigita el la foliumilo',
+'allowemail'                => 'Rajtigi retmesa�ojn de aliaj uzantoj',
+'prefs-searchoptions'       => 'Serĉi opciojn',
+'prefs-namespaces'          => 'Nomspacoj',
+'defaultns'                 => 'Traserĉi la jenajn nomspacojn:',
+'default'                   => 'defaÅ­lte',
+'files'                     => 'Dosieroj',
 
 # User rights
 'userrights'                  => 'Prizorgi rajtojn de uzantoj', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Administri grupojn de uzantoj',
 'userrights-user-editname'    => 'Entajpi uzantonomon:',
 'editusergroup'               => 'Redakti grupojn de uzantoj',
-'editinguser'                 => "Redaktante uzanto-rajtojn de uzanto '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Redaktante uzanto-rajtojn de uzanto '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Redakti grupojn de uzantoj',
 'saveusergroups'              => 'Konservi grupojn de uzantoj',
 'userrights-groupsmember'     => 'Membro de:',
@@ -1024,6 +1211,8 @@ Ekzemple, por la Centra EÅ­ropa Horzono, indiku "1" vintre aÅ­ "2" dum somertemp
 'right-minoredit'            => 'Marki redaktojn kiel etajn',
 'right-move'                 => 'Movi pa�ojn',
 'right-move-subpages'        => 'Alinomigi pa�ojn kun �iaj subpa�oj',
+'right-move-rootuserpages'   => 'Movi radikajn uzanto-pa�ojn',
+'right-movefile'             => 'Alinomigi dosierojn',
 'right-suppressredirect'     => 'Ne krei alidirektilon de la malnova nomo kiam movante pa�on',
 'right-upload'               => 'Al�uti dosierojn',
 'right-reupload'             => 'AnstataÅ­igi ekzistantan dosieron',
@@ -1074,9 +1263,46 @@ Ekzemple, por la Centra EÅ­ropa Horzono, indiku "1" vintre aÅ­ "2" dum somertemp
 'rightslogentry' => '�an�is grupan membrecon por $1 de $2 al $3',
 'rightsnone'     => '(nenia)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'legi ĉi tiun pa�on',
+'action-edit'                 => 'redakti ĉi tiun pa�on',
+'action-createpage'           => 'krei pa�ojn',
+'action-createtalk'           => 'krei diskuto-pa�ojn',
+'action-createaccount'        => 'krei ĉi tiun uzanto-konton',
+'action-minoredit'            => 'marki ĉi tiun redakton kiel malgravan',
+'action-move'                 => 'movi ĉi tiun pa�on',
+'action-move-subpages'        => 'movi ĉi tiun pa�on, kaj ties subpa�ojn',
+'action-move-rootuserpages'   => 'movi radikajn uzanto-pa�ojn',
+'action-movefile'             => 'alinomigi ĉi tiun dosieron',
+'action-upload'               => 'al�uti ĉi tiun dosieron',
+'action-reupload'             => 'anstataŭigi ĉi tiun ekzistantan dosieron',
+'action-reupload-shared'      => 'anstataŭigi ĉi tiun dosieron en kolektiva dosierujo',
+'action-upload_by_url'        => 'al�uti ĉi tiun dosieron de URL-adreso',
+'action-writeapi'             => 'uzi la skriban API-on',
+'action-delete'               => 'forigi ĉi tiun pa�on',
+'action-deleterevision'       => 'forigi ĉi tiun version',
+'action-deletedhistory'       => 'vidi la forigitan historion de ĉi tiu pa�o',
+'action-browsearchive'        => 'traserĉi forigitajn pa�ojn',
+'action-undelete'             => 'malforigi ĉi tiun pa�on',
+'action-suppressrevision'     => 'kontroli kaj restarigi ĉi tiun ka�itan version',
+'action-suppressionlog'       => 'vidi ĉi tiun privantan protokolon',
+'action-block'                => 'forari ĉi tiun uzanton de redaktado',
+'action-protect'              => '�an�i la protektan nivelon por ĉi tiu pa�o',
+'action-import'               => 'importi ĉi tiun pa�on de alia vikio',
+'action-importupload'         => 'importi ĉi tiun pa�on de dosiera al�uto',
+'action-patrol'               => 'marki redakton de alia persono kiel patrolitan',
+'action-autopatrol'           => 'fari vian redakton markitan kiel patrolitan',
+'action-unwatchedpages'       => 'vidi la liston de neatentitaj pa�oj',
+'action-trackback'            => 'aldoni retrovojon',
+'action-mergehistory'         => 'kunigi la historion de ĉi tiu pa�o',
+'action-userrights'           => 'redakti ĉiujn rajtojn de uzantoj',
+'action-userrights-interwiki' => 'redakti uzulrajtojn de uzantoj en aliaj vikioj',
+'action-siteadmin'            => '�losi aŭ mal�losi la datumbazon',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|�an�o|�an�oj}}',
 'recentchanges'                     => 'Lastaj �an�oj',
+'recentchanges-legend'              => 'Opcioj pri lastaj �an�oj',
 'recentchangestext'                 => 'Sekvi la plej lastajn �an�ojn en la {{SITENAME}} per ĉi tiu pa�o.',
 'recentchanges-feed-description'    => 'Sekvi la plej lastatempajn �an�ojn al la vikio en ĉi tiu fonto.',
 'rcnote'                            => "Jen la {{PLURAL:$1|lasta '''1''' �an�o|lastaj '''$1''' �an�oj}} dum la {{PLURAL:$2|lasta tago|lastaj '''$2''' tagoj}}, ekde $5, $4.",
@@ -1100,6 +1326,8 @@ Ekzemple, por la Centra EÅ­ropa Horzono, indiku "1" vintre aÅ­ "2" dum somertemp
 'rc_categories'                     => 'Nur por jenaj kategorioj (disigu per "|")',
 'rc_categories_any'                 => 'ĉiu',
 'newsectionsummary'                 => '/* $1 */ nova sekcio',
+'rc-enhanced-expand'                => 'Montri detalojn (necesas JavaScript-on)',
+'rc-enhanced-hide'                  => 'Ka�i detalojn',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Rilataj pa�oj',
@@ -1121,12 +1349,12 @@ Pa�oj en [[Special:Watchlist|via atentaro]] estas '''grasaj'''.",
 'upload_directory_read_only'  => 'La TTT-servilo ne povas alskribi la al�uto-dosierujon ($1).',
 'uploaderror'                 => 'Eraro okazis dum al�uto',
 'uploadtext'                  => "Uzu la jenan formon por al�uti dosierojn.
-Vidi aux serĉi antaŭe al�utitajn bildojn, iru la [[Special:ImageList|Listo de al�utitaj dosieroj]]; (re)al�utaĵoj ankaŭ estas registrita en la [[Special:Log/upload|Protokolo de al�utoj]], forigoj en la [[Special:Log/delete|protokolo de forigoj]].
+Vidi aŭ serĉi antaŭe al�utitajn bildojn, iru la [[Special:FileList|Listo de al�utitaj dosieroj]]; (re)al�utaĵoj ankaŭ estas registrita en la [[Special:Log/upload|Protokolo de al�utoj]], forigoj en la [[Special:Log/delete|protokolo de forigoj]].
 
-Por inkluzivi la dosieron en pagxon, skribu ligilon laÅ­ la formoj
+Por inkluzivi la dosieron en pa�on, skribu ligilon laŭ la formoj
 
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bildo.jpg]]</nowiki>''' por uzi la plena versio de la dosiero
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bildo.png|200px|thumb|left|alternativa teksto]]</nowiki>''' por uzi 200-rastrumera versio en kesto al la maldekstro (\"left\") kun \"alternativa teksto\" kiel la priskribo.
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bildo.jpg]]</nowiki>''' por uzi la plena versio de la dosiero
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bildo.png|200px|thumb|left|alternativa teksto]]</nowiki>''' por uzi 200-rastrumera versio en kesto al la maldekstro (\"left\") kun \"alternativa teksto\" kiel la priskribo.
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Dosiero.ogg]]</nowiki>''' por ligi rekte al la dosiero ne montranta la dosieron.",
 'upload-permitted'            => 'Permesitaj dosiertipoj: $1.',
 'upload-preferred'            => 'Preferitaj dosiertipoj: $1.',
@@ -1155,23 +1383,25 @@ Por inkluzivi la dosieron en pagxon, skribu ligilon laÅ­ la formoj
 tiu ĉi tiu dosiero pezas $2 bitokojn.',
 'largefileserver'             => 'Ĉi tiu dosiero estas pli granda ol permesas la servilaj preferoj.',
 'emptyfile'                   => 'La dosiero kiun vi al�utis �ajnas malplena. Tio povas esti kaŭzita sde tajperaro en la titolo. Bonvolu kontroli ĉu vi vere volas al�uti tiun dosieron.',
-'fileexists'                  => 'Dosiero kun tia ĉi nomo jam ekzistas. Bonvolu kontroli <strong><tt>$1</tt></strong> krom se vi certas ke vi konscie volas �an�i �uste tiun.',
-'filepageexists'              => 'La priskriba pa�o por ĉi tiu dosiero jam estis kreita ĉe <strong><tt>$1</tt></strong>, sed neniu dosiero kun ĉi tiu nomo nune ekzistas. La resumo kiun vi entajpos ne aperos en la priskribo-pa�o. Por aperigi vian resumon, vi devos permane redakti �in.',
-'fileexists-extension'        => 'Dosiero kun simila nomo ekzistas:<br />
-Nomo de la al�uta dosiero: <strong><tt>$1</tt></strong><br />
-Nomo de la ekzistanta dosiero: <strong><tt>$2</tt></strong><br />
-Bonvolu elekti malsaman nomon.',
+'fileexists'                  => "Dosiero kun tia ĉi nomo jam ekzistas. Bonvolu kontroli '''<tt>$1</tt>''' krom se vi certas ke vi konscie volas �an�i �uste tiun.",
+'filepageexists'              => "La priskriba pa�o por ĉi tiu dosiero jam estis kreita ĉe '''<tt>$1</tt>''', sed neniu dosiero kun ĉi tiu nomo nune ekzistas. La resumo kiun vi entajpos ne aperos en la priskribo-pa�o. Por aperigi vian resumon, vi devos permane redakti �in.",
+'fileexists-extension'        => "Dosiero kun simila nomo ekzistas:<br />
+Nomo de la al�uta dosiero: '''<tt>$1</tt>'''<br />
+Nomo de la ekzistanta dosiero: '''<tt>$2</tt>'''<br />
+Bonvolu elekti malsaman nomon.",
 'fileexists-thumb'            => "<center>'''Ekzistanta bildo'''</center>",
-'fileexists-thumbnail-yes'    => 'Ĉi tiu dosiero �ajnas kiel bildo de malkreskigita grandeco <i>(bildeto)</i>. 
-Bonvolu kontroli la dosieron <strong><tt>$1</tt></strong>.<br /> 
-Se la kontrolita dosiero estas la sama bildo kiel la originala grandeco, �i ne nepras al�uti plian bideton.',
-'file-thumbnail-no'           => 'La dosiernomo komencas kun <strong><tt>$1</tt></strong>. 
-Ĝi �ajnas kiel bildo de malgrandigita grandeco <i>(thumbnail)</i>.
-Se vi havas ĉi tiun bildon en plena distingivo, al�utu ĉi tiun, alikaze bonvolu �an�i la dosieran nomon.',
-'fileexists-forbidden'        => 'Dosiero kun tia ĉi nomo jam ekzistas; bonvole real�utu ĉi tiun dosieron per nova nomo. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Ĉi tiu dosiero �ajnas kiel bildo de malkreskigita grandeco ''(bildeto)''. 
+Bonvolu kontroli la dosieron '''<tt>$1</tt>'''.<br /> 
+Se la kontrolita dosiero estas la sama bildo kiel la originala grandeco, �i ne nepras al�uti plian bideton.",
+'file-thumbnail-no'           => "La dosiernomo komencas kun '''<tt>$1</tt>'''. 
+Ĝi �ajnas kiel bildo de malgrandigita grandeco ''(thumbnail)''.
+Se vi havas ĉi tiun bildon en plena distingivo, al�utu ĉi tiun, alikaze bonvolu �an�i la dosieran nomon.",
+'fileexists-forbidden'        => 'Dosiero kun tiu ĉi nomo jam ekzistas, kaj ne eblas anstataŭigi �in.
+Se vi ankoraŭ volas al�uti vian dosieron, bonvolu reprovi kun nova nomo. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Dosiero kun ĉi tia nomo jam ekzistas en la komuna dosierujo.
-Se vi ankoraŭ volas al�uti vian dosieron, bonvolu retroigi kaj uzi novan nomon.[[Image:$1|thumb|center|$1]]',
+Se vi ankoraŭ volas al�uti vian dosieron, bonvolu retroigi kaj uzi novan nomon.[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ĉi tiu dosiero estas duplikato de la {{PLURAL:$1|jena dosiero|jenaj dosieroj}}:',
+'file-deleted-duplicate'      => 'Duplikata dosiero de ĉi tiu dosiero ([[$1]]) estis antaŭe forigita. Vi legu la forigan historion de tiu dosiero antaŭ provi real�uti �in.',
 'successfulupload'            => 'Al�uto sukcesis!',
 'uploadwarning'               => 'Al�uta averto',
 'savefile'                    => 'Konservi dosieron',
@@ -1191,7 +1421,7 @@ Se vi ankoraŭ volas al�uti vian dosieron, bonvolu retroigi kaj uzi novan nomon
 
 Vi konsideru ĉu taŭgas al�uti ĉi tiu dosiero.
 jen la protokolo pri forigado por ĉi tiu dosiero por via oportuneco:",
-'filename-bad-prefix'         => 'La nomo de la dosiero kiun vi al�utas komencas kun <strong>"$1"</strong>, kiu estas nepriskriba nomo ofte aŭtomate donata de ciferecaj fotiloj. Bonvolu elekti pli priskriban nomon por via bildo.',
+'filename-bad-prefix'         => "La nomo de la dosiero kiun vi al�utas komencas kun '''\"\$1\"''', kiu estas nepriskriba nomo ofte aŭtomate donata de ciferecaj fotiloj. Bonvolu elekti pli priskriban nomon por via bildo.",
 
 'upload-proto-error'      => 'Nevalida protokolo',
 'upload-proto-error-text' => 'Fora al�uto devas URL-on komence de <code>http://</code> aŭ <code>ftp://</code>.',
@@ -1208,26 +1438,27 @@ Se la problemo kontinuas, kontaku [[Special:ListUsers/sysop|sisteman administran
 'upload-curl-error28'      => 'Tempolimo de al�uto atingita',
 'upload-curl-error28-text' => 'La retejo atendas tro sen respondo. Bonvolu verigi ke la retejo ankoraÅ­ funkcias kaj reprovi. Vi eble volus trovi dum malpli okupa tempo.',
 
-'license'            => 'Permesilo:',
+'license'            => 'Licencado:',
 'nolicense'          => 'Neniu selektita',
 'license-nopreview'  => '(AntaÅ­vido ne montrebla)',
 'upload_source_url'  => ' (valida, publike atingebla URL-o)',
 'upload_source_file' => ' (dosiero en via komputilo)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ĉi tiu speciala pa�o montras ĉiujn al�utitajn dosierojn.
+# Special:ListFiles
+'listfiles-summary'     => 'Ĉi tiu speciala pa�o montras ĉiujn al�utitajn dosierojn.
 Defaŭlte, la lasta al�utitaj dosieroj estas montrataj supren.
 Klaku la kolumnan titolon por �an�i la direkton de ordigo.',
-'imagelist_search_for'  => 'Serĉi dosieran nomon:',
+'listfiles_search_for'  => 'Serĉi dosieran nomon:',
 'imgfile'               => 'dosiero',
-'imagelist'             => 'Listo de al�utitaj dosieroj',
-'imagelist_date'        => 'Dato',
-'imagelist_name'        => 'Nomo',
-'imagelist_user'        => 'Uzanto',
-'imagelist_size'        => 'Grandeco',
-'imagelist_description' => 'Priskribo',
-
-# Image description page
+'listfiles'             => 'Listo de al�utitaj dosieroj',
+'listfiles_date'        => 'Dato',
+'listfiles_name'        => 'Nomo',
+'listfiles_user'        => 'Uzanto',
+'listfiles_size'        => 'Grandeco',
+'listfiles_description' => 'Priskribo',
+'listfiles_count'       => 'Versioj',
+
+# File description page
 'filehist'                       => 'Historio de dosiero',
 'filehist-help'                  => 'Klaku daton/tempon por rigardi la dosieron kiel �in �ajnitan tiame.',
 'filehist-deleteall'             => 'forigi ĉiujn',
@@ -1235,19 +1466,25 @@ Klaku la kolumnan titolon por �an�i la direkton de ordigo.',
 'filehist-revert'                => 'restarigi',
 'filehist-current'               => 'nuna',
 'filehist-datetime'              => 'Dato/Tempo',
+'filehist-thumb'                 => 'Bildeto',
+'filehist-thumbtext'             => 'Bildeto por versio ekde $1',
+'filehist-nothumb'               => 'Neniu bildeto',
 'filehist-user'                  => 'Uzanto',
 'filehist-dimensions'            => 'Dimensioj',
 'filehist-filesize'              => 'Pezo de dosiero',
 'filehist-comment'               => 'Komento',
-'imagelinks'                     => 'Ligiloj al la dosiero',
+'imagelinks'                     => 'Dosieraj ligiloj',
 'linkstoimage'                   => 'La {{PLURAL:$1|jena pa�o|jenaj pa�oj}} ligas al ĉi tiu dosiero:',
+'linkstoimage-more'              => 'Pli ol $1 {{PLURAL:$1|pa�o|pa�oj}} ligas ĉi tiun dosieron.
+La jena listo montras la {{PLURAL:$1|unua pa�ligilo|unuaj $1 pa�ligiloj}} al nur ĉi tiu dosiero.
+[[Special:WhatLinksHere/$2|Plena listo]] estas atingebla.',
 'nolinkstoimage'                 => 'Neniu pa�o ligas al ĉi tiu dosiero.',
 'morelinkstoimage'               => 'Rigardi [[Special:WhatLinksHere/$1|pliajn ligilojn]] al ĉi tiu dosiero.',
 'redirectstofile'                => 'Jen {{PLURAL:$1|dosiero liganta|dosieroj ligantaj}} al ĉi tiu dosiero:',
-'duplicatesoffile'               => 'La {{PLURAL:$1|jena dosiero estas duplikato|jenaj dosieroj estas duplikatoj}} de ĉi tiu dosiero:',
+'duplicatesoffile'               => 'La {{PLURAL:$1|jena dosiero estas duplikato|jenaj dosieroj estas duplikatoj}} de ĉi tiu dosiero ([[Special:FileDuplicateSearch/$2|pluaj detaloj]]):',
 'sharedupload'                   => 'Ĉi tiu dosiero estas komunuma al�uto kaj estas uzebla de aliaj projektoj.',
 'shareduploadwiki'               => 'Bonvolu vidi la $1 por plua informo.',
-'shareduploadwiki-desc'          => 'Jen la priskribo de ties $1 en la kolektiva dosierujo sube.',
+'shareduploadwiki-desc'          => 'Jen la priskribo de ties $1 sube.',
 'shareduploadwiki-linktext'      => 'pa�on pri dosiera priskribo',
 'shareduploadduplicate'          => 'Ĉi tiu dosiero estas duplikato de $1 de la kolektiva dosierujo.',
 'shareduploadduplicate-linktext' => 'alia dosiero',
@@ -1271,7 +1508,7 @@ Klaku la kolumnan titolon por �an�i la direkton de ordigo.',
 # File deletion
 'filedelete'                  => 'Forigi $1',
 'filedelete-legend'           => 'Forigi dosieron.',
-'filedelete-intro'            => "Vi forigas '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Vi preskaŭ forigos dosieron '''[[Media:$1|$1]]''' kune kun ĉiom da �ia historio.",
 'filedelete-intro-old'        => "Vi forigas version de '''[[Media:$1|$1]]''' ekde [$4 $3, $2].",
 'filedelete-comment'          => 'Kialo por forigo:',
 'filedelete-submit'           => 'Forigi',
@@ -1279,7 +1516,6 @@ Klaku la kolumnan titolon por �an�i la direkton de ordigo.',
 'filedelete-success-old'      => "La versio de '''[[Media:$1|$1]]''' ekde $3, $2 estas forigita.",
 'filedelete-nofile'           => "'''$1''' ne ekzistas.",
 'filedelete-nofile-old'       => "Estas neniuarkivita versio de '''$1''' kun la specifigitaj atribuoj.",
-'filedelete-iscurrent'        => 'Vi provas forigi la plej lastan version de la dosiero. Bonvolu restarigi pli malnovan version antaÅ­e.',
 'filedelete-otherreason'      => 'Alia/plua kialo:',
 'filedelete-reason-otherlist' => 'Alia kialo',
 'filedelete-reason-dropdown'  => '* Oftaj kialoj de forigo
@@ -1297,7 +1533,7 @@ Klaku la kolumnan titolon por �an�i la direkton de ordigo.',
 'unwatchedpages' => 'Neatentataj pa�oj',
 
 # List redirects
-'listredirects' => 'Listo de redirektiloj',
+'listredirects' => 'Listo de alidirektiloj',
 
 # Unused templates
 'unusedtemplates'     => 'Neuzitaj �ablonoj',
@@ -1307,27 +1543,31 @@ Bonvolu kontroli aliajn ligilojn al la �ablonoj antaŭ ol forigi ilin.',
 
 # Random page
 'randompage'         => 'Hazarda pa�o',
-'randompage-nopages' => 'Ne ekzistas pa�oj en ĉi tiu nomspaco.',
+'randompage-nopages' => 'Ne ekzistas pa�oj en la nomspaco "$1".',
 
 # Random redirect
 'randomredirect'         => 'Hazarda alidirekto',
-'randomredirect-nopages' => 'Estas neniuj alidirektiloj en ĉi nomspaco.',
+'randomredirect-nopages' => 'Estas neniuj alidirektiloj en la nomspaco "$1".',
 
 # Statistics
-'statistics'             => 'Statistiko',
-'sitestats'              => 'Pri la retejo',
-'userstats'              => 'Pri la uzantaro',
-'sitestatstext'          => "Trovi�as en nia datumaro sume '''\$1''' {{PLURAL:\$1|pa�o|pa�oj}}.
-Tiu nombro enhavas \"diskutpa�ojn\", pa�ojn pri {{SITENAME}}, \"artikoletetojn\", alidirektilojn, kaj aliajn, kiuj eble ne vere estas artikoloj. Malatentante ilin, oni povas nombri '''\$2''' {{PLURAL:\$2|probable �ustan artikolon|probable �ustajn artikolojn}}.
-
-'''\$8''' {{PLURAL:\$8|dosiero|dosieroj}} estis {{PLURAL:\$8|al�utita|al�utitaj}}.
-
-Oni vidis sume '''\$3''' {{PLURAL:\$3|pa�o|pa�ojn}}, kaj redaktis sume '''\$4''' {{PLURAL:\$4|pa�o|pa�ojn}} ekde la starigo de la vikio.
-Tio estas meznombre po unu pa�o por '''\$5''' pa�oj viditaj, kaj por '''\$6''' redaktoj.
-
-La nuna longeco de la [http://www.mediawiki.org/wiki/Manual:Job_queue laborenda vico] estas '''\$7'''.",
-'userstatstext'          => "Enskribi�is '''$1''' {{PLURAL:$1|[[Special:ListUsers|uzanto]]|[[Special:ListUsers|uzantoj]]}}. El tiuj, '''$2''' (aŭ '''$4%''') havas rajtojn de $5.",
-'statistics-mostpopular' => 'Plej ofte montrataj pa�oj',
+'statistics'                   => 'Statistiko',
+'statistics-header-pages'      => 'Pa�aj statistikoj',
+'statistics-header-edits'      => 'Redaktaj statistikoj',
+'statistics-header-views'      => 'Vidi statistikojn',
+'statistics-header-users'      => 'Pri la uzantaro',
+'statistics-articles'          => 'Enhavaj pa�oj',
+'statistics-pages'             => 'Pa�oj',
+'statistics-pages-desc'        => 'Ĉiuj pa�oj en la vikio, inkluzivante diskuto-pa�ojn, alidirektilojn, ktp.',
+'statistics-files'             => 'Al�utitaj dosieroj',
+'statistics-edits'             => 'Pa�aj redaktoj ekde {{SITENAME}} estis starigita',
+'statistics-edits-average'     => 'Avera�aj redaktoj po pa�o',
+'statistics-views-total'       => 'Vidoj entutaj',
+'statistics-views-peredit'     => 'Vidoj po redakto',
+'statistics-jobqueue'          => 'Longeco de [http://www.mediawiki.org/wiki/Manual:Job_queue vico de prokrastita reenkategoriado]',
+'statistics-users'             => 'Registritaj [[Special:ListUsers|uzantoj]]',
+'statistics-users-active'      => 'Aktivaj uzantoj',
+'statistics-users-active-desc' => 'Uzantoj kiuj faris agon en la {{PLURAL:$1|lasta tago|lastaj $1 tagoj}}',
+'statistics-mostpopular'       => 'Plej ofte montrataj pa�oj',
 
 'disambiguations'      => 'Misligitaj apartigiloj',
 'disambiguationspage'  => 'Template:Apartigilo',
@@ -1342,7 +1582,7 @@ Pa�o estas traktata kiel apartigilo se �i uzas �ablonon kiu estas ligita de [
 'double-redirect-fixer'      => 'Alidirektila riparilo',
 
 'brokenredirects'        => 'Rompitaj alidirektadoj',
-'brokenredirectstext'    => 'La jenaj alidirektadoj ligas al neekzistantaj artikoloj.',
+'brokenredirectstext'    => 'La jenaj alidirektadoj ligas al neekzistantaj pa�oj:',
 'brokenredirects-edit'   => '(redakti)',
 'brokenredirects-delete' => '(forigi)',
 
@@ -1372,26 +1612,30 @@ Pa�o estas traktata kiel apartigilo se �i uzas �ablonon kiu estas ligita de [
 'popularpages'            => 'Plej vizitataj pa�oj',
 'wantedcategories'        => 'Dezirataj kategorioj',
 'wantedpages'             => 'Dezirataj pa�oj',
-'missingfiles'            => 'Mankantaj dosieroj',
+'wantedfiles'             => 'Dezirataj dosieroj',
+'wantedtemplates'         => 'Dezirataj �ablonoj',
 'mostlinked'              => 'Plej ligitaj pa�oj',
 'mostlinkedcategories'    => 'Plej ligitaj kategorioj',
 'mostlinkedtemplates'     => 'Plej ligitaj �ablonoj',
 'mostcategories'          => 'Artikoloj kun la plej multaj kategorioj',
 'mostimages'              => 'Plej ligitaj bildoj',
 'mostrevisions'           => 'Artikoloj kun la plej multaj versioj',
-'prefixindex'             => 'Indeksa prefikso',
+'prefixindex'             => 'Ĉiuj pa�oj kun prefikso',
 'shortpages'              => 'Mallongaj pa�oj',
 'longpages'               => 'Longaj pa�oj',
 'deadendpages'            => 'Pa�oj sen interna ligilo',
 'deadendpagestext'        => 'La sekvaj pa�oj ne ligas al aliaj pa�oj en {{SITENAME}}.',
 'protectedpages'          => 'Protektitaj pa�oj',
 'protectedpages-indef'    => 'Nur ĉiamaj protektaĵoj',
+'protectedpages-cascade'  => 'Nur kaskadaj protektoj',
 'protectedpagestext'      => 'La sekvaj pa�oj estas protektitaj kontraŭ movigo aŭ redaktado',
 'protectedpagesempty'     => 'Neniuj pa�oj estas momente protektitaj kun ĉi tiuj parametroj.',
 'protectedtitles'         => 'Protektitaj titoloj',
 'protectedtitlestext'     => 'La jenaj titoloj estas protektitaj kontraÅ­ kreado',
 'protectedtitlesempty'    => 'Neniuj titoloj estas nune protektitaj kun ĉi parametroj.',
 'listusers'               => 'Uzantaro',
+'listusers-editsonly'     => 'Montri uzantojn kun redaktoj nur',
+'usereditcount'           => '$1 {{PLURAL:$1|redakto|redaktoj}}',
 'newpages'                => 'Novaj pa�oj',
 'newpages-username'       => 'Salutnomo:',
 'ancientpages'            => 'Plej malnovaj artikoloj',
@@ -1417,18 +1661,17 @@ Tio ne estus enkalkutita en la jena listo.',
 kaj/aÅ­ informumos pri la libro ligita.
 La {{SITENAME}} ne estas komerce ligita al tiuj vendejoj, kaj la listo ne estu
 komprenata kiel rekomendo aÅ­ reklamo.',
+'booksources-invalid-isbn'  => 'La donata ISBN ver�ajne esats nevalida; kontroli por eraroj kopiitaj el la originala fonto.',
 
 # Special:Log
 'specialloguserlabel'  => 'Uzanto:',
 'speciallogtitlelabel' => 'Titolo:',
 'log'                  => 'Protokoloj',
 'all-logs-page'        => 'Ĉiuj protokoloj',
-'log-search-legend'    => 'Serĉi protokolojn',
-'log-search-submit'    => 'Ek',
 'alllogstext'          => 'Suma kompilaĵo de ĉiuj protokoloj de {{SITENAME}}.
 Vi povas plistrikti la mendon per selektado de protokola speco, la salutnomo (inkluzivante uskladon) aŭ la efika pa�o (ankaŭ inkluzivas uskladon).',
 'logempty'             => 'Neniaj artikoloj en la protokolo.',
-'log-title-wildcard'   => 'Serĉi titolojn komencantajn kun ĉi teksto',
+'log-title-wildcard'   => 'Serĉi titolojn komencantajn kun ĉi tiu teksto',
 
 # Special:AllPages
 'allpages'          => 'Ĉiuj pa�oj',
@@ -1436,6 +1679,7 @@ Vi povas plistrikti la mendon per selektado de protokola speco, la salutnomo (in
 'nextpage'          => 'Sekvanta pa�o ($1)',
 'prevpage'          => 'Antaŭa pa�o ($1)',
 'allpagesfrom'      => 'Montri pa�ojn ekde:',
+'allpagesto'        => 'Montri pa�oj finante de:',
 'allarticles'       => 'Ĉiuj pa�oj',
 'allinnamespace'    => 'Ĉiuj pa�oj ($1 nomspaco)',
 'allnotinnamespace' => 'Ĉiuj pa�oj (ne en nomspaco $1)',
@@ -1455,41 +1699,68 @@ Vidu ankaÅ­ [[Special:WantedCategories|Dezirataj kategorioj]].',
 'special-categories-sort-count' => 'oridigi laÅ­ nombrado',
 'special-categories-sort-abc'   => 'ordigi laÅ­ alfabeto',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Forigitaj kontribuoj de uzantoj',
+
+# Special:LinkSearch
+'linksearch'       => 'Eksteraj ligiloj',
+'linksearch-pat'   => 'Serĉesprimo:',
+'linksearch-ns'    => 'Nomspaco:',
+'linksearch-ok'    => 'Serĉi',
+'linksearch-text'  => 'Regulesprimoj kiel "*.wikipedia.org" povas esti uzataj.<br />Subtenataj protokoloj: <tt>$1</tt>',
+'linksearch-line'  => '$1 ligita de $2',
+'linksearch-error' => 'Regulesprimoj povas aperi nur ĉe la komenco de la retnoda nomo.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Montri uzantojn ekde:',
 'listusers-submit'   => 'Montri',
 'listusers-noresult' => 'Neniu uzanto trovita.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Protokolo de uzanto-kreado',
+'newuserlogpagetext'          => 'Jen protokolo de lastaj kreadoj de uzantoj.',
+'newuserlog-byemail'          => 'pasvorto sendita retpo�te',
+'newuserlog-create-entry'     => 'Nova uzanto',
+'newuserlog-create2-entry'    => 'kreis nova konton por $1',
+'newuserlog-autocreate-entry' => 'Konto kreita aÅ­tomate',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Gruprajtoj de uzantoj',
-'listgrouprights-summary'  => 'Jen listo de uzanto-grupoj difinitaj en ĉi tiu vikio, kun ties asociaj atingrajtoj.
+'listgrouprights'                 => 'Gruprajtoj de uzantoj',
+'listgrouprights-summary'         => 'Jen listo de uzanto-grupoj difinitaj en ĉi tiu vikio, kun ties asociaj atingrajtoj.
 Estas [[{{MediaWiki:Listgrouprights-helppage}}|aldona informo]] pri individuaj rajtoj.',
-'listgrouprights-group'    => 'Grupo',
-'listgrouprights-rights'   => 'Rajtoj',
-'listgrouprights-helppage' => 'Help:Grupaj rajtoj',
-'listgrouprights-members'  => '(listo de anoj)',
+'listgrouprights-group'           => 'Grupo',
+'listgrouprights-rights'          => 'Rajtoj',
+'listgrouprights-helppage'        => 'Help:Grupaj rajtoj',
+'listgrouprights-members'         => '(listo de anoj)',
+'listgrouprights-addgroup'        => 'Povi aldoni {{PLURAL:$2|grupon|grupojn}}: $1',
+'listgrouprights-removegroup'     => 'Povi forigi {{PLURAL:$2|grupon|grupojn}}: $1',
+'listgrouprights-addgroup-all'    => 'Povi aldoni ĉiujn grupojn',
+'listgrouprights-removegroup-all' => 'Povi forigi ĉiujn grupojn',
 
 # E-mail user
-'mailnologin'     => 'Neniu alsendota adreso',
-'mailnologintext' => 'Vi nepre estu [[Special:UserLogin|salutanta]] kaj havanta validan retpo�tadreson en viaj [[Special:Preferences|preferoj]] por retpo�ti al aliaj uzantoj.',
-'emailuser'       => 'Retpo�ti ĉi tiun uzanton',
-'emailpage'       => 'Retpo�ti uzanton',
-'emailpagetext'   => 'Vi povas uzi la jenan pa�on por sendi retpo�tan mesa�on al ĉi tiu uzanto.
+'mailnologin'      => 'Neniu alsendota adreso',
+'mailnologintext'  => 'Vi nepre estu [[Special:UserLogin|salutanta]] kaj havanta validan retpo�tadreson en viaj [[Special:Preferences|preferoj]] por retpo�ti al aliaj uzantoj.',
+'emailuser'        => 'Retpo�ti ĉi tiun uzanton',
+'emailpage'        => 'Retpo�ti uzanton',
+'emailpagetext'    => 'Vi povas uzi la jenan pa�on por sendi retpo�tan mesa�on al ĉi tiu uzanto.
 La retadreso kiun vi enigis en [[Special:Preferences|viaj preferoj]] aperos kiel la "De" adreso de la retpo�to, do la ricevonto eblos respondi rekte al vi.',
-'usermailererror' => 'Resendita retmesa�a erarsubjekto:',
-'defemailsubject' => '{{SITENAME}} ****-retmesa�o',
-'noemailtitle'    => 'Neniu retpo�tadreso',
-'noemailtext'     => 'Ĉi tiu uzanto aŭ ne donis validan retpo�tadreson aŭ elektis ne ricevi retpo�ton de aliaj uzantoj.',
-'emailfrom'       => 'De:',
-'emailto'         => 'Al:',
-'emailsubject'    => 'Temo:',
-'emailmessage'    => 'Mesa�o:',
-'emailsend'       => 'Sendi',
-'emailccme'       => 'Retpo�ti al mi kopion de mia mesa�o.',
-'emailccsubject'  => 'Kopio de via mesa�o al $1: $2',
-'emailsent'       => 'Retmesa�o sendita',
-'emailsenttext'   => 'Via retmesa�o estas sendita.',
-'emailuserfooter' => 'Ĉi tiun retpo�ton sendis $1 al $2 per funkcio "Email user" ĉe {{SITENAME}}.',
+'usermailererror'  => 'Resendita retmesa�a erarsubjekto:',
+'defemailsubject'  => '{{SITENAME}} retmesa�o',
+'noemailtitle'     => 'Neniu retpo�tadreso',
+'noemailtext'      => 'Ĉi tiu uzanto ne donis validan retadreson.',
+'nowikiemailtitle' => 'Retpo�to ne permesita',
+'nowikiemailtext'  => 'Ĉi tiu uzanto elektis ne ricevi retpo�ton de aliaj uzantoj.',
+'email-legend'     => 'Sendi retpo�ton al alia {{SITENAME}}-uzanto',
+'emailfrom'        => 'De:',
+'emailto'          => 'Al:',
+'emailsubject'     => 'Temo:',
+'emailmessage'     => 'Mesa�o:',
+'emailsend'        => 'Sendi',
+'emailccme'        => 'Retpo�ti al mi kopion de mia mesa�o.',
+'emailccsubject'   => 'Kopio de via mesa�o al $1: $2',
+'emailsent'        => 'Retmesa�o sendita',
+'emailsenttext'    => 'Via retmesa�o estas sendita.',
+'emailuserfooter'  => 'Ĉi tiun retpo�ton sendis $1 al $2 per funkcio "Email user" ĉe {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Atentaro',
@@ -1519,12 +1790,7 @@ La retadreso kiun vi enigis en [[Special:Preferences|viaj preferoj]] aperos kiel
 'iteminvalidname'      => 'Ia eraro pri "$1", nevalida titolo...',
 'wlnote'               => "Jen la {{PLURAL:$1|lasta redakto|lastaj '''$1''' redaktoj}} dum la {{PLURAL:$2|lasta horo|lastaj '''$2''' horoj}}.",
 'wlshowlast'           => 'Montri el lastaj $1 horoj $2 tagoj $3',
-'watchlist-show-bots'  => 'Montri robotajn redaktojn',
-'watchlist-hide-bots'  => 'Ka�i robotajn redaktojn',
-'watchlist-show-own'   => 'Montri miajn redaktojn',
-'watchlist-hide-own'   => 'Ka�i miajn redaktojn',
-'watchlist-show-minor' => 'Montri redaktetojn',
-'watchlist-hide-minor' => 'Ka�i redaktetojn',
+'watchlist-options'    => 'Opcioj por atentaro',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Aldonante al la atentaro...',
@@ -1563,80 +1829,99 @@ Por �an�i la elektojn de via atentaro, bv viziti
 Reagoj kaj plia helpo:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Forigi pa�on',
-'confirm'                     => 'Konfirmi',
-'excontent'                   => "enhavis: '$1'",
-'excontentauthor'             => "la enteno estis : '$1' (kaj la sola kontribuinto estis '$2')",
-'exbeforeblank'               => "antaÅ­ malplenigo enhavis: '$1'",
-'exblank'                     => 'estis malplena',
-'delete-confirm'              => 'Forigi "$1"',
-'delete-legend'               => 'Forigi',
-'historywarning'              => 'Averto: la forigota pa�o havas historion:',
-'confirmdeletetext'           => 'Vi forigos la artikolon aŭ dosieron kaj forvi�os �ian tutan historion el la datumaro.<br /> Bonvolu konfirmi, ke vi vere intencas tion, kaj ke vi komprenas la sekvojn, kaj ke vi ja sekvas la [[{{MediaWiki:Policy-url}}|regulojn pri forigado]].',
-'actioncomplete'              => 'Ago farita',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" estas forigita.
+# Delete
+'deletepage'             => 'Forigi pa�on',
+'confirm'                => 'Konfirmi',
+'excontent'              => "enhavis: '$1'",
+'excontentauthor'        => "la enteno estis : '$1' (kaj la sola kontribuinto estis '$2')",
+'exbeforeblank'          => "antaÅ­ malplenigo enhavis: '$1'",
+'exblank'                => 'estis malplena',
+'delete-confirm'         => 'Forigi "$1"',
+'delete-legend'          => 'Forigi',
+'historywarning'         => 'Averto: la forigota pa�o havas historion:',
+'confirmdeletetext'      => 'Vi forigos la artikolon aŭ dosieron kaj forvi�os �ian tutan historion el la datumaro.<br /> Bonvolu konfirmi, ke vi vere intencas tion, kaj ke vi komprenas la sekvojn, kaj ke vi ja sekvas la [[{{MediaWiki:Policy-url}}|regulojn pri forigado]].',
+'actioncomplete'         => 'Ago farita',
+'deletedtext'            => '"<nowiki>$1</nowiki>" estas forigita.
 Vidu la pa�on $2 por registro de lastatempaj forigoj.',
-'deletedarticle'              => 'forigis "$1"',
-'suppressedarticle'           => '"[[$1]]" estas subigita',
-'dellogpage'                  => 'Protokolo pri forigoj',
-'dellogpagetext'              => 'Jen listo de la plej lastaj forigoj el la datumaro.
+'deletedarticle'         => 'forigis "$1"',
+'suppressedarticle'      => '"[[$1]]" estas subigita',
+'dellogpage'             => 'Protokolo pri forigoj',
+'dellogpagetext'         => 'Jen listo de la plej lastaj forigoj el la datumaro.
 Ĉiuj tempoj sekvas la horzonon UTC.',
-'deletionlog'                 => 'protokolo pri forigoj',
-'reverted'                    => 'Malfaris al antaÅ­a revisio',
-'deletecomment'               => 'Kialo por forigo:',
-'deleteotherreason'           => 'Alia/plua kialo:',
-'deletereasonotherlist'       => 'Alia kialo',
-'deletereason-dropdown'       => '*Oftaj kialoj por forigo
+'deletionlog'            => 'protokolo pri forigoj',
+'reverted'               => 'Malfaris al antaÅ­a revisio',
+'deletecomment'          => 'Kialo por forigo:',
+'deleteotherreason'      => 'Alia/plua kialo:',
+'deletereasonotherlist'  => 'Alia kialo',
+'deletereason-dropdown'  => '*Oftaj kialoj por forigo
 ** Peto de aÅ­toro
 ** Malobservo de kopirajto
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Redakti kialojn de forigo',
-'delete-toobig'               => 'Ĉi tiu pa�o havas grandan redakto-historion, pli ol $1 {{PLURAL:$1|version|versiojn}}. Forigo de ĉi tiaj pa�oj estis limigitaj por preventi akcidentan disrompigon de {{SITENAME}}.',
-'delete-warning-toobig'       => 'Ĉi tiu pa�o havas grandan redakto-historion, pli ol $1 {{PLURAL:$1|version|versiojn}}. Forigo de �i povas disrompigi operacion de {{SITENAME}}; forigu singarde.',
-'rollback'                    => 'Restarigi antaÅ­an redakton',
-'rollback_short'              => 'Malfari',
-'rollbacklink'                => 'malfari',
-'rollbackfailed'              => 'Malfaro malsukcesis',
-'cantrollback'                => 'Neeblas restarigi antaŭan redakton; la redaktinto lasta estas la sola de la pa�o.',
-'alreadyrolled'               => 'Ne eblas restarigi la lastan redakton de [[:$1]] de la [[User:$2|$2]] ([[User talk:$2|diskuto]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+'delete-edit-reasonlist' => 'Redakti kialojn de forigo',
+'delete-toobig'          => 'Ĉi tiu pa�o havas grandan redakto-historion, pli ol $1 {{PLURAL:$1|version|versiojn}}. Forigo de ĉi tiaj pa�oj estis limigitaj por preventi akcidentan disrompigon de {{SITENAME}}.',
+'delete-warning-toobig'  => 'Ĉi tiu pa�o havas grandan redakto-historion, pli ol $1 {{PLURAL:$1|version|versiojn}}. Forigo de �i povas disrompigi operacion de {{SITENAME}}; forigu singarde.',
+
+# Rollback
+'rollback'         => 'Restarigi antaÅ­an redakton',
+'rollback_short'   => 'Malfari',
+'rollbacklink'     => 'malfari',
+'rollbackfailed'   => 'Malfaro malsukcesis',
+'cantrollback'     => 'Neeblas restarigi antaŭan redakton; la redaktinto lasta estas la sola de la pa�o.',
+'alreadyrolled'    => 'Ne eblas restarigi la lastan redakton de [[:$1]] de la [[User:$2|$2]] ([[User talk:$2|diskuto]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 pro tio, ke oni intertempe redaktis aŭ restarigis la pa�on. 
-La lasta redaktinto estas [[User:$3|$3]] ([[User talk:$3|diskuto]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => "La komento estis: '<i>$1</i>'.", # only shown if there is an edit comment
-'revertpage'                  => 'Malfaris redaktojn de [[Special:Contributions/$2|$2]] ([[User talk:$2|diskuto]]) al la lasta versio de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Restaris redaktojn de $1; �an�is al lasta versio de $2.',
-'sessionfailure'              => 'Åœajnas ke estas problemo kun via ensalutado;
+La lasta redaktinto estas [[User:$3|$3]] ([[User talk:$3|diskuto]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "La resumo de la komento estis: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Malfaris redaktojn de [[Special:Contributions/$2|$2]] ([[User talk:$2|diskuto]]) al la lasta versio de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Restaris redaktojn de $1; �an�is al lasta versio de $2.',
+'sessionfailure'   => 'Åœajnas ke estas problemo kun via ensalutado;
 Ĉi ago estis nuligita por malhelpi fiensalutadon.
 Bonvolu alklalki la reirbutonon kaj re�ar�i la pa�on el kiu vi venas, kaj provu denove.',
+
+# Protect
 'protectlogpage'              => 'Protokolo pri protektoj',
 'protectlogtext'              => 'Sube estas listo de pa�-�losoj kaj mal�losoj.
 Vidu [[Special:ProtectedPages|liston de protektitaj pa�oj]] por pli da informoj.',
 'protectedarticle'            => 'protektis "[[$1]]"',
 'modifiedarticleprotection'   => '�an�is nivelon de protekto por "[[$1]]"',
 'unprotectedarticle'          => 'malprotektis "[[$1]]"',
+'movedarticleprotection'      => 'movis protektadajn preferojn de "[[$2]]" al "[[$1]]"',
 'protect-title'               => 'Protektante "$1"',
+'prot_1movedto2'              => '[[$1]] movita al [[$2]]',
 'protect-legend'              => 'Konfirmi protektadon',
 'protectcomment'              => 'Kialo por protekti:',
 'protectexpiry'               => 'Eksvalidi�as:',
 'protect_expiry_invalid'      => 'Nevalida findaÅ­ro.',
 'protect_expiry_old'          => 'Eksvalidi�a tempo jam pasis.',
 'protect-unchain'             => 'Mal�losi movrajtojn',
-'protect-text'                => 'Vi povas ĉi tie vidi kaj �an�i la protektnivelon de la pa�o <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Vi ne povas �an�i prokekto-nivelojn dum forbarita. Jen la nunaj ecoj de la pa�o <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Ne eblas �an�i nivelojn de protekto pro aktiva datumbaza �loso.
-Jen la nunaj ecoj de la pa�o <strong>$1</strong>:',
-'protect-locked-access'       => 'Via konto ne havas rajton �an�i protekto-nivelojn.
-Jen la aktualaj valoroj por la pa�o <strong>$1</strong>:',
+'protect-text'                => "Vi povas ĉi tie vidi kaj �an�i la protektnivelon de la pa�o '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Vi ne povas �an�i prokekto-nivelojn dum forbarita. Jen la nunaj ecoj de la pa�o '''$1''':",
+'protect-locked-dblock'       => "Ne eblas �an�i nivelojn de protekto pro aktiva datumbaza �loso.
+Jen la nunaj ecoj de la pa�o '''$1''':",
+'protect-locked-access'       => "Via konto ne havas rajton �an�i protekto-nivelojn.
+Jen la aktualaj valoroj por la pa�o '''$1''':",
 'protect-cascadeon'           => 'Ĉi pa�o estas nun protektita kontraŭ redaktado ĉar �i estas inkluzivita en {{PLURAL:$1|jena pa�o, kiu mem estas protektita|jenaj pa�oj, kiuj mem estas protektitaj}} per kaskada protekto. 
 Vi povas �an�i ties protektnivelon, sed tio ne �an�os la kaskadan protekton.',
-'protect-default'             => '(defaÅ­lte)',
+'protect-default'             => 'Permesigi ĉiujn uzantojn',
 'protect-fallback'            => 'Rajto "$1" nepras.',
-'protect-level-autoconfirmed' => 'Bloki neensalutintajn uzantojn',
+'protect-level-autoconfirmed' => 'Bloki novajn kaj neregistritajn uzantojn',
 'protect-level-sysop'         => 'Nur administrantoj',
 'protect-summary-cascade'     => 'kaskada',
 'protect-expiring'            => 'fini�as je $1 (UTC)',
+'protect-expiry-indefinite'   => 'sendifina',
 'protect-cascade'             => 'Protekti ĉiujn pa�ojn inkluzivitajn en ĉi pa�o (kaskada protekto)',
 'protect-cantedit'            => 'Vi ne povas �an�i la protekt-nivelojn de ĉi tiu pa�o, ĉar vi ne rajtas redakti �in.',
+'protect-othertime'           => 'Alia tempo:',
+'protect-othertime-op'        => 'alia tempo',
+'protect-existing-expiry'     => 'Ekzistanta protektdaÅ­ro: $3, $2',
+'protect-otherreason'         => 'Alia/plua kialo:',
+'protect-otherreason-op'      => 'alia/plua kialo',
+'protect-dropdown'            => '*Oftaj kialoj por protektado
+** Tro da vanadlismo
+** Tro da spamado
+** Malutila redakto-milito
+** Pa�o kun multo da trafiko',
+'protect-edit-reasonlist'     => 'Redakti kialojn de protektado',
+'protect-expiry-options'      => '2 horoj:2 hours,1 tago:1 day,3 tagoj:3 days,1 semajno:1 week,2 semajnoj:2 weeks,1 monato:1 month,3 monatoj:3 months,6 monatoj:6 months,1 jaro:1 year,porĉiam:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permeso:',
 'restriction-level'           => 'Nivelo de limigo:',
 'minimum-size'                => 'Minimuma pezo',
@@ -1659,8 +1944,8 @@ Vi povas �an�i ties protektnivelon, sed tio ne �an�os la kaskadan protekton.
 'undeletepage'                 => 'Montri kaj restarigi forigitajn pa�ojn',
 'undeletepagetitle'            => "'''Jen la forigitaj versioj de [[:$1]]'''.",
 'viewdeletedpage'              => 'Rigardi forigitajn pa�ojn',
-'undeletepagetext'             => 'La jenaj pa�oj estis forigitaj, sed ankoraŭ restas arkivitaj,
-kaj oni povas restarigi ilin. La arkivo povas esti malplenigita periode.',
+'undeletepagetext'             => 'La {{PLURAL:$1|jena pa�o estis forigita|jenaj pa�oj estis forigitaj}}, sed ankoraŭ restas {{PLURAL:$1|arkivita|arkivitaj}} kaj {{PLURAL:$1|restarigebla|restarigeblaj}}. 
+La arkivo povas esti malplenigita periode.',
 'undelete-fieldset-title'      => 'Malforigi versiojn',
 'undeleteextrahelp'            => "Por restarigi la tuton de la pa�o, lasu ĉiujn markobutonoj mal�altitaj kaj klaku la butonon '''''Restarigi'''''. 
 Por restarigi selektitajn versiojn de la pa�o, marku la butonojn konformajn al la dezirataj versioj, kaj klaku la butonon '''''Restarigi'''''. 
@@ -1670,13 +1955,14 @@ Klakante butonon '''''Restarigi''''' vi�igos la komentokampon kaj malmarkos ĉi
 Se nova pa�o kun la sama nomo estis kreita post la forigo, la restarigitaj versioj aperos antaŭe en la antaŭa historio.',
 'undeleterevdel'               => 'Restarigo ne estos farita se �i rezultos en la supera pa�a aŭ dosiera versio estonte parte forigita. Tiuzake, vi malmarku aŭ malka�u la plej novajn forigitajn versiojn.',
 'undeletehistorynoadmin'       => 'Ĉi tiu artikolo estis forigita. La kaŭzo por la forigo estas montrata en la malsupra resumo, kune kun detaloj pri la uzantoj, kiuj redaktis ĉi tiun pa�on antaŭ la forigo. La aktuala teksto de ĉi tiuj forigitaj versioj estas atingebla nur de administrantoj.',
-'undelete-revision'            => 'Forigita revizio de $1 (de $2) fare de $3:',
+'undelete-revision'            => 'Forigita versio de $1 (ekde $4, $5) fare de $3:',
 'undeleterevision-missing'     => 'Nevalida aÅ­ malaperita versio. 
 Vi ver�ajne havas malbonan ligilon, aŭ la versio eble estis restarigita aŭ forigita de la arkivo.',
 'undelete-nodiff'              => 'Neniu antaŭa versio trovi�is.',
 'undeletebtn'                  => 'Restarigi',
 'undeletelink'                 => 'restarigi',
 'undeletereset'                => 'Restarigi',
+'undeleteinvert'               => 'Inversigi selektaĵon',
 'undeletecomment'              => 'Komento:',
 'undeletedarticle'             => 'restarigis "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|1 versio restarigita|$1 versioj restarigitaj}}',
@@ -1708,26 +1994,27 @@ $1',
 'blanknamespace' => '(Artikoloj)',
 
 # Contributions
-'contributions' => 'Kontribuoj de uzanto',
-'mycontris'     => 'Miaj kontribuoj',
-'contribsub2'   => 'De $1 ($2)',
-'nocontribs'    => 'Trovis neniajn redaktojn laÅ­ tiu kriterio.',
-'uctop'         => ' (lasta)',
-'month'         => 'Ekde monato (kaj pli frue):',
-'year'          => 'Ekde jaro (kaj pli frue):',
-
-'sp-contributions-newbies'     => 'Montri nur kontribuojn de novaj kontoj',
-'sp-contributions-newbies-sub' => 'Kontribuoj de novaj uzantoj. Forigitaj pa�oj ne estas montritaj.',
-'sp-contributions-blocklog'    => 'Protokolo de forbaroj',
-'sp-contributions-search'      => 'Serĉado de kontribuoj',
-'sp-contributions-username'    => 'IP-adreso aÅ­ uzantonomo:',
-'sp-contributions-submit'      => 'Serĉi',
+'contributions'       => 'Kontribuoj de uzanto',
+'contributions-title' => 'Uzulaj kontribuoj de $1',
+'mycontris'           => 'Miaj kontribuoj',
+'contribsub2'         => 'De $1 ($2)',
+'nocontribs'          => 'Trovis neniajn redaktojn laÅ­ tiu kriterio.',
+'uctop'               => ' (lasta)',
+'month'               => 'Ekde monato (kaj pli frue):',
+'year'                => 'Ekde jaro (kaj pli frue):',
+
+'sp-contributions-newbies'       => 'Montri nur kontribuojn de novaj kontoj',
+'sp-contributions-newbies-sub'   => 'Kontribuoj de novaj uzantoj. Forigitaj pa�oj ne estas montritaj.',
+'sp-contributions-newbies-title' => 'Uzulaj kontribuoj de novaj kontoj',
+'sp-contributions-blocklog'      => 'Protokolo de forbaroj',
+'sp-contributions-search'        => 'Serĉado de kontribuoj',
+'sp-contributions-username'      => 'IP-adreso aÅ­ uzantonomo:',
+'sp-contributions-submit'        => 'Serĉi',
 
 # What links here
 'whatlinkshere'            => 'Ligiloj ĉi tien',
 'whatlinkshere-title'      => 'Pa�oj ligantaj al "$1"',
 'whatlinkshere-page'       => 'Pa�o:',
-'linklistsub'              => '(Listo de ligiloj)',
 'linkshere'                => "La jenaj pa�oj ligas al '''[[:$1]]''':",
 'nolinkshere'              => "Neniu pa�o ligas al '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Neniuj pa�oj ligas al '''[[:$1]]''' en la elektita nomspaco.",
@@ -1748,7 +2035,7 @@ $1',
 'blockip-legend'                  => 'Forbari uzanton',
 'blockiptext'                     => "Per jena formularo vi povas forpreni de ajna nomo aŭ IP-adreso la rajton skribi en la vikio. Oni faru tion ''nur'' por eviti vandalismon, kaj sekvante la [[{{MediaWiki:Policy-url}}|regulojn pri forbarado]]. Klarigu la precizan kialon malsupre (ekzemple, citu pa�ojn, kiuj estis vandaligitaj).",
 'ipaddress'                       => 'IP-adreso/nomo',
-'ipadressorusername'              => 'IP adreso aÅ­ uzantonomo',
+'ipadressorusername'              => 'IP-adreso aÅ­ salutnomo:',
 'ipbexpiry'                       => 'BlokdaÅ­ro',
 'ipbreason'                       => 'Kialo:',
 'ipbreasonotherlist'              => 'Alia kaÅ­zo',
@@ -1768,26 +2055,32 @@ $1',
 'ipbother'                        => 'Alia daÅ­ro:',
 'ipboptions'                      => '2 horoj:2 hours,1 tago:1 day,3 tagoj:3 days,1 semajno:1 week,2 semajnoj:2 weeks,1 monato:1 month,3 monatoj:3 months,6 monatoj:6 months,1 jaro:1 year,porĉiam:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'alia',
-'ipbotherreason'                  => 'Alia/aldona kaÅ­zo:',
-'ipbhidename'                     => 'Ka�i la uzantonomon de la forbara protokolo, de la aktuala forbarlisto kaj de la uzantolisto.',
+'ipbotherreason'                  => 'Alia/kroma kialo:',
+'ipbhidename'                     => 'Ka�i la salutnomon de la forbara protokolo, aktuala forbarlisto kaj uzula listo',
 'ipbwatchuser'                    => 'Kontroli la pa�ojn por uzanto kaj diskuto de ĉi tiu uzanto.',
+'ipballowusertalk'                => 'Permsi al ĉi tiu uzanto redakti propran diskuto-pa�on dum forbaro',
+'ipb-change-block'                => 'Reforbari la uzanton kun ĉi tiuj preferoj',
 'badipaddress'                    => 'Neniu uzanto, aÅ­ la IP-adreso estas misformita.',
 'blockipsuccesssub'               => 'Oni sukcese forbaris la adreson/nomon.',
 'blockipsuccesstext'              => '"$1" estas forbarita. <br />Vidu la [[Special:IPBlockList|liston de IP-forbaroj]].',
 'ipb-edit-dropdown'               => 'Redakti kialojn por forbaro.',
 'ipb-unblock-addr'                => 'Restarigi $1',
-'ipb-unblock'                     => 'Malforbari uzantnomon aÅ­ IP-adreson',
+'ipb-unblock'                     => 'Malforbari salutnomon aÅ­ IP-adreson',
 'ipb-blocklist-addr'              => 'Ekzistantaj forbaroj por $1',
-'ipb-blocklist'                   => 'Rigardi ekzistantajn blokojn',
+'ipb-blocklist'                   => 'Vidi ekzistantajn forbarojn',
+'ipb-blocklist-contribs'          => 'Kontribuoj de $1',
 'unblockip'                       => 'Malforbari IP-adreson/nomon',
 'unblockiptext'                   => 'Per la jena formulo vi povas repovigi al iu
 forbarita IP-adreso/nomo la povon enskribi en la vikio.',
-'ipusubmit'                       => 'Malforbari la adreson',
+'ipusubmit'                       => 'Forigi ĉi tiun forbaron',
 'unblocked'                       => '[[User:$1|$1]] estas restarigita.',
 'unblocked-id'                    => 'Forbaro $1 estas forigita.',
 'ipblocklist'                     => 'Forbaritaj IP-adresoj kaj salutnomoj',
 'ipblocklist-legend'              => 'Trovi forbaritan uzanton.',
 'ipblocklist-username'            => 'Salutnomo aÅ­ IP-adreso:',
+'ipblocklist-sh-userblocks'       => '$1 kontaj forbaroj',
+'ipblocklist-sh-tempblocks'       => '$1 provizoraj forbaroj',
+'ipblocklist-sh-addressblocks'    => '$1 unuopaj IP-adresaj foraroj',
 'ipblocklist-submit'              => 'Serĉi',
 'blocklistline'                   => 'Je $1, $2 forbaris $3 ($4)',
 'infiniteblock'                   => 'senfina',
@@ -1796,25 +2089,32 @@ forbarita IP-adreso/nomo la povon enskribi en la vikio.',
 'noautoblockblock'                => 'aÅ­tomata blokado estas malebligita',
 'createaccountblock'              => 'Kreado de kontoj forbarita',
 'emailblock'                      => 'retpo�to forbarita',
+'blocklist-nousertalk'            => 'ne povas redakti sian propran diskuto-pa�on',
 'ipblocklist-empty'               => 'La forbarlibro estas malplena.',
 'ipblocklist-no-results'          => 'Ĉi tiu IP-adreso aŭ salutnomo ne estas forbarita.',
 'blocklink'                       => 'forbari',
 'unblocklink'                     => 'restarigi',
+'change-blocklink'                => '�an�i forbaron',
 'contribslink'                    => 'kontribuoj',
 'autoblocker'                     => 'Provizore forbarita aÅ­tomate pro tio, ke vi uzas la saman IP-adreson kiel "$1", kiu estis forbarita pro : "$2".',
 'blocklogpage'                    => 'Protokolo pri forbaroj',
+'blocklog-fulllog'                => 'Protokolo de plenaj forbaroj',
 'blocklogentry'                   => 'forbaris [[$1]] por daÅ­ro de $2 $3',
+'reblock-logentry'                => '�an�is forbarajn opciojn [[$1]] kun findato de $2 $3',
 'blocklogtext'                    => 'Ĉi tio estas protokolo pri forbaraj kaj malforbaraj agoj. Aŭtomate forbaritaj IP adresoj ne estas listigitaj. Vidu la [[Special:IPBlockList|IP forbarliston]] por ĉi-momente fobaritaj uzantoj kaj IP-adresoj.',
 'unblocklogentry'                 => '$1 estis restarigita',
 'block-log-flags-anononly'        => 'nur anonimaj uzantoj',
 'block-log-flags-nocreate'        => 'kreado de kontoj malebligita',
 'block-log-flags-noautoblock'     => 'aŭtomata forbaro mal�altita',
 'block-log-flags-noemail'         => 'retpo�to blokita',
+'block-log-flags-nousertalk'      => 'ne povas redakti propran diskuto-pa�on',
 'block-log-flags-angry-autoblock' => 'progresa aŭtoforbaro ebli�is',
 'range_block_disabled'            => 'La ebleco de administranto krei forbaritajn intervalojn da IP-adresoj estas malebligita.',
 'ipb_expiry_invalid'              => 'Nevalida blokdaÅ­ro.',
 'ipb_expiry_temp'                 => 'Ka�itaj salutnomaj blokoj estu daŭraj.',
 'ipb_already_blocked'             => '"$1" estas jam forbarita',
+'ipb-needreblock'                 => '== Jam forbarita ==
+$1 estas jam forbarita. Ĉu vi volas �an�i la opciojn?',
 'ipb_cant_unblock'                => 'Eraro: Forbar-identigo $1 ne estas trovita. Äœi eble estis jam malforbarita.',
 'ipb_blocked_as_range'            => 'Eraro: La IP-adreso $1 ne estas forbarita rekte kaj ne povas esti malforbarita. Tamen �i estas forbarita kiel parto de la intervalo $2, kiu ne povas esti malforbarita.',
 'ip_range_invalid'                => 'Nevalida IP-adresa intervalo.',
@@ -1825,6 +2125,7 @@ forbarita IP-adreso/nomo la povon enskribi en la vikio.',
 'proxyblocksuccess'               => 'Farita.',
 'sorbsreason'                     => 'Via IP-adreso estas listigita kiel malferma prokurilo en la DNSBL uzata de {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Via IP-adreso estas listigita kiel malferma prokurilo en la DNSBL uzata de {{SITENAME}}. Vi ne rajtas krei konton.',
+'cant-block-while-blocked'        => 'Vi ne povas forbari aliajn uzantojn dum vi estas forbarita.',
 
 # Developer tools
 'lockdb'              => 'Åœlosi datumbazon',
@@ -1852,9 +2153,9 @@ Bonvolu certigu, ke vi efektive intencas tion fari.',
 'databasenotlocked'   => 'La datumbazo ne estas �losita.',
 
 # Move page
-'move-page'               => 'Alinomigi $1',
-'move-page-legend'        => 'Alinomigi pa�on',
-'movepagetext'            => "Per la jena formulo vi povas �an�i la nomon de iu pa�o, kunportante
+'move-page'                    => 'Alinomigi $1',
+'move-page-legend'             => 'Alinomigi pa�on',
+'movepagetext'                 => "Per la jena formulo vi povas �an�i la nomon de iu pa�o, kunportante
 �ian historion de redaktoj je la nova nomo.
 La antaŭa titolo fari�os alidirektilo al la nova titolo.
 Ligiloj al la antaŭa titolo <i>ne</i> estos �an�itaj; uzu
@@ -1872,51 +2173,64 @@ neeblas ke vi neintence forvi�us ekzistantan pa�on per movo.
 Tio povas esti drasta kaj neatendita �an�o por populara pa�o;
 bonvolu certigi vin, ke vi komprenas ties konsekvencojn antaÅ­
 ol vi antaÅ­eniru.",
-'movepagetalktext'        => "La movo aŭtomate kunportos la diskuto-pa�on, se tia ekzistas, '''krom se:'''
+'movepagetalktext'             => "La movo aŭtomate kunportos la diskuto-pa�on, se tia ekzistas, '''krom se:'''
 *Vi movas la pa�on tra nomspacoj (ekz de ''Nomo'' je ''User:Nomo''),
 *Ne malplena diskuto-pa�o jam ekzistas je la nova nomo, aŭ
 *Vi malelektas la suban �altilon.
 
 Tiujokaze, vi nepre permane kunigu la diskuto-pa�ojn se vi tion deziras.",
-'movearticle'             => 'Alinomigi pa�on',
-'movenotallowed'          => 'Vi ne rajtas movi pa�ojn.',
-'newtitle'                => 'Al nova titolo',
-'move-watch'              => 'Atenti ĉi tiun pa�on',
-'movepagebtn'             => 'Alinomigi pa�on',
-'pagemovedsub'            => 'Sukcesis alinomigo',
-'movepage-moved'          => '<big>\'\'\'"$1" estis alinomigita al "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Pa�o kun tiu nomo jam ekzistas, aŭ la nomo kiun vi elektis ne validas.
+'movearticle'                  => 'Alinomigi pa�on',
+'movenologin'                  => 'Ne ensalutinta',
+'movenologintext'              => 'Vi nepre estu registrita uzanto kaj [[Special:UserLogin|ensalutu]] por rajti movi pa�ojn.',
+'movenotallowed'               => 'Vi ne rajtas movi pa�ojn.',
+'movenotallowedfile'           => 'Vi ne havas rajton alinomigi dosierojn.',
+'cant-move-user-page'          => 'Vi ne rajtas movi radikajn uzanto-pa�ojn.',
+'cant-move-to-user-page'       => 'Vi ne rajtas movi pa�on al uzula pa�o (krom al uzula subpa�o).',
+'newtitle'                     => 'Al nova titolo',
+'move-watch'                   => 'Atenti ĉi tiun pa�on',
+'movepagebtn'                  => 'Alinomigi pa�on',
+'pagemovedsub'                 => 'Sukcesis alinomigo',
+'movepage-moved'               => '<big>\'\'\'"$1" estis alinomigita al "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Alidirektilo estis kreita.',
+'movepage-moved-noredirect'    => 'La kreado de alidirektilo estis nuligita.',
+'articleexists'                => 'Pa�o kun tiu nomo jam ekzistas, aŭ la nomo kiun vi elektis ne validas.
 Bonvolu elekti alian nomon.',
-'cantmove-titleprotected' => 'Vi ne povas movi pa�o al ĉi loko, ĉar la nova titolo estis protektita kontraŭ kreado',
-'talkexists'              => 'Oni ja sukcesis movi la pa�on mem, sed
+'cantmove-titleprotected'      => 'Vi ne povas movi pa�o al ĉi loko, ĉar la nova titolo estis protektita kontraŭ kreado',
+'talkexists'                   => 'Oni ja sukcesis movi la pa�on mem, sed
 ne movis la diskuto-pa�on ĉar jam ekzistas tia ĉe la nova titolo.
 Bonvolu permane kunigi ilin.',
-'movedto'                 => 'alinomita al',
-'movetalk'                => 'Transigi ankaŭ la "diskuto"-pa�on, se �i ekzistas.',
-'move-subpages'           => 'Alinomigi ĉiujn subpa�ojn, se fareble.',
-'move-talk-subpages'      => 'Alinomigi ĉiujn subpa�ojn de diskuto-pa�oj, se fareble.',
-'movepage-page-exists'    => 'La pa�o $1 jam ekzistas kaj ne povas esti aŭtomate anstataŭigita.',
-'movepage-page-moved'     => 'La pa�o $1 estis alinomita al $2.',
-'movepage-page-unmoved'   => 'La pa�o $1 ne povas esti alinomigita al $2.',
-'movepage-max-pages'      => 'La maksimumo de $1 {{PLURAL:$1|pa�o|pa�oj}} estis {{PLURAL:$1|alinomita|alinomitaj}} kaj neniuj pliaj estos alinomitaj aŭtomate.',
-'1movedto2'               => '[[$1]] movita al [[$2]]',
-'1movedto2_redir'         => '[[$1]] movita al [[$2]], redirekto lasita',
-'movelogpage'             => 'Protokolo pri pa�movoj',
-'movelogpagetext'         => 'Jen listo de movitaj pa�oj',
-'movereason'              => 'Kialo:',
-'revertmove'              => 'restarigi',
-'delete_and_move'         => 'Forigi kaj alinomigi',
-'delete_and_move_text'    => '==Forigo nepras==
+'movedto'                      => 'alinomita al',
+'movetalk'                     => 'Transigi ankaŭ la "diskuto"-pa�on, se �i ekzistas.',
+'move-subpages'                => 'Alinomigi ĉiujn subpa�ojn, se fareble.',
+'move-talk-subpages'           => 'Alinomigi ĉiujn subpa�ojn de diskuto-pa�oj, se fareble.',
+'movepage-page-exists'         => 'La pa�o $1 jam ekzistas kaj ne povas esti aŭtomate anstataŭigita.',
+'movepage-page-moved'          => 'La pa�o $1 estis alinomita al $2.',
+'movepage-page-unmoved'        => 'La pa�o $1 ne povas esti alinomigita al $2.',
+'movepage-max-pages'           => 'La maksimumo de $1 {{PLURAL:$1|pa�o|pa�oj}} estis {{PLURAL:$1|alinomita|alinomitaj}} kaj neniuj pliaj estos alinomitaj aŭtomate.',
+'1movedto2'                    => '[[$1]] movita al [[$2]]',
+'1movedto2_redir'              => '[[$1]] movita al [[$2]], redirekto lasita',
+'move-redirect-suppressed'     => 'alidirektilo subpremita',
+'movelogpage'                  => 'Protokolo pri pa�movoj',
+'movelogpagetext'              => 'Jen listo de movitaj pa�oj',
+'movereason'                   => 'Kialo:',
+'revertmove'                   => 'restarigi',
+'delete_and_move'              => 'Forigi kaj alinomigi',
+'delete_and_move_text'         => '==Forigo nepras==
 
 La celartikolo "[[:$1]]" jam ekzistas. Ĉu vi volas forigi �in por krei spacon por la movo?',
-'delete_and_move_confirm' => 'Jes, forigu la pa�on',
-'delete_and_move_reason'  => 'Forigita por ebligi movon',
-'selfmove'                => 'Font- kaj cel-titoloj samas; ne eblas movi pa�on sur �in mem.',
-'immobile_namespace'      => 'La celtitolo estas de speciala speco; ne eblas movi pa�ojn en tiun nomspacon.',
-'imagenocrossnamespace'   => 'Ne eblas movi dosieron al nedosiera nomspaco',
-'imagetypemismatch'       => 'La nova dosierfinaĵo ne kongruas �ian dosiertipon.',
-'imageinvalidfilename'    => 'La cela dosiernomo estas nevalida',
-'fix-double-redirects'    => 'Äœisdatigi iujn alidirektilojn kiuj direktas al la originala titolo',
+'delete_and_move_confirm'      => 'Jes, forigu la pa�on',
+'delete_and_move_reason'       => 'Forigita por ebligi movon',
+'selfmove'                     => 'Font- kaj cel-titoloj samas; ne eblas movi pa�on sur �in mem.',
+'immobile-source-namespace'    => 'Ne eblas movi pa�ojn en nomspaco "$1"',
+'immobile-target-namespace'    => 'Ne eblas movi pa�ojn en nomspacon "$1"',
+'immobile-target-namespace-iw' => 'Intervikia ligilo ne estas valida celo por pa�a movo.',
+'immobile-source-page'         => 'Ĉi tiu pa�o ne estas movebla.',
+'immobile-target-page'         => 'Ne eblas movi al tiu destina titolo.',
+'imagenocrossnamespace'        => 'Ne eblas movi dosieron al nedosiera nomspaco',
+'imagetypemismatch'            => 'La nova dosierfinaĵo ne kongruas �ian dosiertipon.',
+'imageinvalidfilename'         => 'La cela dosiernomo estas nevalida',
+'fix-double-redirects'         => 'Äœisdatigi iujn alidirektilojn kiuj direktas al la originala titolo',
+'move-leave-redirect'          => 'Forlasi kiel alidirektilon',
 
 # Export
 'export'            => 'Eksporti pa�ojn',
@@ -1955,9 +2269,12 @@ La celartikolo "[[:$1]]" jam ekzistas. Ĉu vi volas forigi �in por krei spacon
 'import-interwiki-text'      => 'Elektu vikion kaj pa�an titolon por importi.
 Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 Ĉiuj transvikaj importoj estas raportitaj ĉe la [[Special:Log/import|loglibro de importoj]].',
-'import-interwiki-history'   => 'Kopiu ĉiuj versioj el historio por ĉi pago.',
+'import-interwiki-source'    => 'Fonta vikio/pa�o:',
+'import-interwiki-history'   => 'Kopiu ĉiujn historiajn versiojn por ĉi tiu pago.',
 'import-interwiki-submit'    => 'Importi',
 'import-interwiki-namespace' => 'Cela nomspaco:',
+'import-upload-filename'     => 'Dosiernomo:',
+'import-comment'             => 'Komento:',
 'importtext'                 => 'Bonvole eksportu la dosieron el la fonta vikio per la ilo Speciala:Export, konservu �in sur via disko kaj poste al�utu �in tien ĉi.',
 'importstart'                => 'Importante pa�ojn...',
 'import-revision-count'      => '$1 {{PLURAL:$1|versio|versioj}}',
@@ -1983,7 +2300,7 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'import-invalid-interwiki'   => 'Ne povas importi de la specifigita vikio.',
 
 # Import log
-'importlogpage'                    => 'Protokolo de importoj',
+'importlogpage'                    => 'Protokolo de importaĵoj',
 'importlogpagetext'                => 'Administrantecaj importoj de pa�oj kun redakto-historio de aliaj vikioj.',
 'import-logentry-upload'           => 'importita [[$1]] de dosiera al�uto',
 'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|versio|versioj}}',
@@ -1991,19 +2308,19 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|versio|versioj}} de $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mia uzantopa�o',
+'tooltip-pt-userpage'             => 'Via uzantopa�o',
 'tooltip-pt-anonuserpage'         => 'La uzantopa�o por la IP adreso sub kiu vi estas redaktanta',
-'tooltip-pt-mytalk'               => 'Mia diskutpa�o',
+'tooltip-pt-mytalk'               => 'Via diskutpa�o',
 'tooltip-pt-anontalk'             => 'Diskuto pri redaktoj sub tiu ĉi IP adreso',
 'tooltip-pt-preferences'          => 'Miaj preferoj',
 'tooltip-pt-watchlist'            => 'Listo de pa�oj kies �an�ojn vi priatentas.',
-'tooltip-pt-mycontris'            => 'Listo de miaj kontribuoj',
+'tooltip-pt-mycontris'            => 'Listo de viaj kontribuoj',
 'tooltip-pt-login'                => 'Vi estas invitita ensaluti, tamen ne estas devige.',
 'tooltip-pt-anonlogin'            => 'Vi estas invitita ensaluti, tamen ne estas devige.',
 'tooltip-pt-logout'               => 'Elsaluti',
 'tooltip-ca-talk'                 => 'Diskuto pri la artikolo',
 'tooltip-ca-edit'                 => 'Vi povas redakti tiun ĉi pa�on. Bv uzi la antaŭvidbutonon antaŭ ol konservi.',
-'tooltip-ca-addsection'           => 'Aldoni komenton al ĉi tiu diskuto.',
+'tooltip-ca-addsection'           => 'Starti novan sekcion',
 'tooltip-ca-viewsource'           => 'Tiu pa�o estas protektita. Vi povas nur rigardi ties fonton.',
 'tooltip-ca-history'              => 'Antaŭaj versioj de tiu ĉi pa�o.',
 'tooltip-ca-protect'              => 'Protekti tiun ĉi pa�on',
@@ -2050,6 +2367,8 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'tooltip-watch'                   => 'Aldoni ĉi pa�on al via atentaro',
 'tooltip-recreate'                => 'Rekrei la pa�on malgraŭ �i estis forigita',
 'tooltip-upload'                  => 'Ekal�uti',
+'tooltip-rollback'                => '"Restarigi antaŭan" restarigas redakto(j)n al ĉi tiu pa�o de la lasta kontribuanto per unu klako.',
+'tooltip-undo'                    => '"Malfari" malfaris ĉi tiun redakton kaj malfermas la redakto-pa�on en antaŭvida re�imo. Permesas aldoni kialon en la resumo.',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF metadatumo estas malebligita por ĉi servilo.',
@@ -2057,12 +2376,12 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'notacceptable'     => 'La viki-servilo ne povas doni datumon en formato kiun via kliento povas legi.',
 
 # Attribution
-'anonymous'        => 'Anonima(j) uzanto(j) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonima uzanto|Anonimaj uzantoj}} de {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} uzanto $1',
 'lastmodifiedatby' => 'Ĉi pa�o estis laste �an�ita je $2, $1 de $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Bazita sur la laboro de $1.',
 'others'           => 'aliaj',
-'siteusers'        => '{{SITENAME}} uzanto(j) $1',
+'siteusers'        => '{{PLURAL:$2|uzanto|uzantoj}} de {{SITENAME}} $1',
 'creditspage'      => 'Atribuoj de pa�o',
 'nocredits'        => 'Ne estas informo pri atribuoj por ĉi pa�o.',
 
@@ -2073,7 +2392,7 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'spamprotectionmatch' => 'La jena teksto ekagigis la spam-filtrilon: $1',
 'spambot_username'    => 'Trudmesa�a forigo de MediaWiki',
 'spam_reverting'      => 'Restarigo de lasta versio ne entenante ligilojn al $1',
-'spam_blanking'       => 'Forvi�o de ĉiuj versioj entenate ligilojn al $1',
+'spam_blanking'       => 'Forvi�o de ĉiuj versioj entenantaj ligilojn al $1',
 
 # Info page
 'infosubtitle'   => 'Informoj por pa�o',
@@ -2083,6 +2402,13 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'numauthors'     => 'Nombro de apartaj aŭtoroj (pa�o): $1',
 'numtalkauthors' => 'Nombro de apartaj aŭtoroj (diskuto-pa�o): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasika',
+'skinname-nostalgia'   => 'Nostalgio',
+'skinname-cologneblue' => 'Kolonja Bluo',
+'skinname-monobook'    => 'Librejo',
+'skinname-chick'       => 'Kokido',
+
 # Math options
 'mw_math_png'    => 'Ĉiam krei PNG-bildon',
 'mw_math_simple' => 'HTMLigu se simple, aÅ­ PNG',
@@ -2103,10 +2429,12 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 'markedaspatrollederror-noautopatrol' => 'Vi ne rajtas marki viajn proprajn �an�ojn kiel patrolitajn.',
 
 # Patrol log
-'patrol-log-page'   => 'Protokolo pri patrolado',
-'patrol-log-header' => 'Jen protokolo de patrolitaj versioj.',
-'patrol-log-line'   => 'markis $1 el $2 patrolitajn $3',
-'patrol-log-auto'   => '(aÅ­tomata)',
+'patrol-log-page'      => 'Protokolo pri patrolado',
+'patrol-log-header'    => 'Jen protokolo de patrolitaj versioj.',
+'patrol-log-line'      => 'markis $1 el $2 patrolitajn $3',
+'patrol-log-auto'      => '(aÅ­tomata)',
+'patrol-log-diff'      => 'kontrolo $1',
+'log-show-hide-patrol' => '$1 protokolo pri patrolado',
 
 # Image deletion
 'deletedrevision'                 => 'Forigita malnova versio $1',
@@ -2123,6 +2451,9 @@ $1',
 'previousdiff' => '� Pli malnova redakto',
 'nextdiff'     => 'Pli nova redakto →',
 
+# Visual comparison
+'visual-comparison' => 'Vida komparo',
+
 # Media information
 'mediawarning'         => "'''Warning''': This file may contain malicious code, by executing it your system may be compromised.
 <hr />",
@@ -2136,10 +2467,12 @@ $1',
 'show-big-image'       => 'Plena distingivo',
 'show-big-image-thumb' => '<small>Grandeco de ĉi antaŭvido: $1 × $2 rastrumeroj</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Aro da novaj bildoj',
 'imagelisttext'         => "Jen listo de '''$1''' {{PLURAL:$1|dosiero|dosieroj}}, ordigitaj laÅ­ $2.",
 'newimages-summary'     => 'Ĉi tiu speciala pa�o montras la lastajn al�utitajn dosierojn.',
+'newimages-legend'      => 'Dosiernomo',
+'newimages-label'       => 'Dosiernomo (aŭ parto de �i):',
 'showhidebots'          => '($1 robotojn)',
 'noimages'              => 'Nenio videbla.',
 'ilsubmit'              => 'Serĉi',
@@ -2345,6 +2678,18 @@ Sekvaj ligilo en la sama linio estas konsiderata kiel esceptoj (pa�oj kiel la b
 'exif-lightsource-24'  => 'ISO artefarita lumo volframa',
 'exif-lightsource-255' => 'Alia luma fonto',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Fulmilo ne ekbruli�is',
+'exif-flash-fired-1'    => 'Fulmilo ekbrili�is',
+'exif-flash-return-0'   => 'neniu funkcio por detekti liveraĵon de stroboskopo',
+'exif-flash-return-2'   => 'revenanta lumo de stroboskopo ne detekti�is',
+'exif-flash-return-3'   => 'revenanta lumo de stroboskopo detekti�is',
+'exif-flash-mode-1'     => 'deviga fulmado',
+'exif-flash-mode-2'     => 'deviga dampado de fulmilo',
+'exif-flash-mode-3'     => 'aŭtomata re�imo',
+'exif-flash-function-1' => 'Neniu fulmila funkcio',
+'exif-flash-redeye-1'   => 're�imo por ru�okula redukcio',
+
 'exif-focalplaneresolutionunit-2' => 'coloj',
 
 'exif-sensingmethod-1' => 'Nedefinita',
@@ -2487,21 +2832,10 @@ $1
 Bonvolu konfirmi ke vi ja volas rekrei la pa�on.",
 'recreate'            => 'Rekrei',
 
-# HTML dump
-'redirectingto' => 'Redirektante al [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Ĉu forvi�igi la ka�memoron de tiu ĉi pa�o?
-
-$1',
 'confirm_purge_button' => 'Ek!',
-
-# AJAX search
-'searchcontaining' => "Serĉo de pa�oj enhavantaj ''$1''.",
-'searchnamed'      => "Serĉo de pa�oj nomataj ''$1''.",
-'articletitles'    => "Artikoloj komencante de ''$1''",
-'hideresults'      => 'Ka�i rezultojn',
-'useajaxsearch'    => 'Uzi AJAX serĉon',
+'confirm-purge-top'    => 'Ĉu forvi�igi la ka�memoron de tiu ĉi pa�o?',
+'confirm-purge-bottom' => 'Refre�igante pa�on forvi�as la memorka�ejon kaj devigas la plej lastan version aperi.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� antaŭa pa�o',
@@ -2521,10 +2855,10 @@ $1',
 'table_pager_empty'        => 'Neniaj rezultoj',
 
 # Auto-summaries
-'autosumm-blank'   => 'Forvi�antaj ĉion el pa�o',
+'autosumm-blank'   => 'Forvi�is la pa�on',
 'autosumm-replace' => "Anstataŭigante pa�ojn kun '$1'",
 'autoredircomment' => 'Redirektante al [[$1]]',
-'autosumm-new'     => 'Nova pa�o: $1',
+'autosumm-new'     => "Nova pa�o kun '$1'",
 
 # Live preview
 'livepreview-loading' => 'Ŝar�ante...',
@@ -2563,6 +2897,7 @@ Vi povas ankaÅ­ [[Special:Watchlist/edit|uzu la norman redaktilon]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Nekonata etend-etikedo "$1"',
+'duplicate-defaultsort' => 'Averto: Defauxlta ordiga �losilo "$2" anstataŭigas pli fruan defaŭlta ordiga �losilo "$1".',
 
 # Special:Version
 'version'                          => 'Versio', # Not used as normal message but as header for the special page itself
@@ -2595,7 +2930,7 @@ Vi povas ankaÅ­ [[Special:Watchlist/edit|uzu la norman redaktilon]].',
 'fileduplicatesearch'          => 'Serĉu duplikatajn dosierojn',
 'fileduplicatesearch-summary'  => 'Serĉu duplikatajn dosierojn bazite de haketvaluto.
 
-Enigu la dosiernomon sen la "{{ns:image}}:" prefikso.',
+Enigu la dosiernomon sen la "{{ns:file}}:" prefikso.',
 'fileduplicatesearch-legend'   => 'Serĉi duplikaton',
 'fileduplicatesearch-filename' => 'Dosiernomo:',
 'fileduplicatesearch-submit'   => 'Serĉi',
@@ -2625,4 +2960,13 @@ Enigu la dosiernomon sen la "{{ns:image}}:" prefikso.',
 'blankpage'              => 'Malplena pa�o',
 'intentionallyblankpage' => 'Ĉi tiu pa�o intencie estas malplena kaj estas uzata por testado, ktp.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Lasu ĉi tiun linion sen�an�e<pre>
+#Enmetu parto de regula esprimo (nur la parton enmetinda en //) suben
+#Äœi estos kongruita kun la URL-o de eksteraj (ligeblaj) bildoj
+#Kongruantaĵoj estos montritaj kiel bildoj; se ne eble montri, nur ligilo estos montrita
+#Linioj komencantaj kun # estas traktata kiel komentoj.
+
+#Enmetu ĉiujn koderojn pri regulaj esprimoj super ĉi tiu linio. Lasu la linion sen�an�e.</pre>',
+
 );
diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index 136591e6..fc83e30d 100644
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -7,14 +7,19 @@
  * @author Aleator
  * @author Alhen
  * @author Alpertron
+ * @author Alvaro qc
  * @author Ascánder
  * @author Baiji
  * @author Bengoa
  * @author Better
+ * @author BicScope
  * @author Boivie
  * @author Cerealito
+ * @author Clerc
+ * @author Crazymadlover
  * @author Cvmontuy
  * @author David0811
+ * @author Dferg
  * @author Dmcdevit
  * @author Drini
  * @author Dvortygirl
@@ -42,28 +47,117 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => 'Estándar',
-);
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discusión',
-	NS_USER           => 'Usuario',
-	NS_USER_TALK      => 'Usuario_Discusión',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_Discusión',
-	NS_IMAGE          => 'Imagen',
-	NS_IMAGE_TALK     => 'Imagen_Discusión',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_Discusión',
-	NS_TEMPLATE       => 'Plantilla',
-	NS_TEMPLATE_TALK  => 'Plantilla_Discusión',
-	NS_HELP           => 'Ayuda',
-	NS_HELP_TALK      => 'Ayuda_Discusión',
-	NS_CATEGORY       => 'Categoría',
-	NS_CATEGORY_TALK  => 'Categoría_Discusión',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_TALK             => 'Discusión',
+	NS_USER             => 'Usuario',
+	NS_USER_TALK        => 'Usuario_Discusión',
+	NS_PROJECT_TALK     => '$1_Discusión',
+	NS_FILE             => 'Archivo',
+	NS_FILE_TALK        => 'Archivo_Discusión',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discusión',
+	NS_TEMPLATE         => 'Plantilla',
+	NS_TEMPLATE_TALK    => 'Plantilla_Discusión',
+	NS_HELP             => 'Ayuda',
+	NS_HELP_TALK        => 'Ayuda_Discusión',
+	NS_CATEGORY         => 'Categoría',
+	NS_CATEGORY_TALK    => 'Categoría_Discusión',
+);
+
+$namespaceAliases = array(
+	'Imagen' => NS_FILE,
+	'Imagen_Discusión' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'RedireccionesDobles', 'Redirecciones dobles' ),
+	'BrokenRedirects'           => array( 'RedireccionesRotas', 'Redirecciones rotas' ),
+	'Disambiguations'           => array( 'Desambiguaciones', 'Desambiguación' ),
+	'Userlogin'                 => array( 'Entrar', 'Entrada usuario' ),
+	'Userlogout'                => array( 'Salida usuario', 'Salir' ),
+	'CreateAccount'             => array( 'Crear cuenta', 'CrearCuenta' ),
+	'Preferences'               => array( 'Preferencias' ),
+	'Watchlist'                 => array( 'Seguimiento', 'Lista de seguimiento' ),
+	'Recentchanges'             => array( 'CambiosRecientes', 'Cambios recientes' ),
+	'Upload'                    => array( 'SubirArchivo', 'Subir archivo' ),
+	'Listfiles'                 => array( 'ListaImágenes', 'Lista de imágenes' ),
+	'Newimages'                 => array( 'NuevasImágenes', 'Nuevas imágenes' ),
+	'Listusers'                 => array( 'ListaUsuarios', 'Lista de usuarios' ),
+	'Listgrouprights'           => array( 'ListaDerechosGrupos', 'Derechos de grupos de usuarios' ),
+	'Statistics'                => array( 'Estadísticas' ),
+	'Randompage'                => array( 'Aleatoria', 'Aleatorio', 'Página aleatoria', '' ),
+	'Lonelypages'               => array( 'PáginasHuérfanas', 'Páginas huérfanas' ),
+	'Uncategorizedpages'        => array( 'PáginasSinCategorizar', 'Páginas sin categorizar' ),
+	'Uncategorizedcategories'   => array( 'CategoríasSinCategorizar', 'Categorías sin categorizar' ),
+	'Uncategorizedimages'       => array( 'ImágenesSinCategorizar', 'Imágenes sin categorizar' ),
+	'Uncategorizedtemplates'    => array( 'PlantillasSinCategorizar', 'Plantillas sin categorizar' ),
+	'Unusedcategories'          => array( 'CategoríasSinUso', 'Categorías sin uso' ),
+	'Unusedimages'              => array( 'ImágenesSinUso', 'Imágenes sin uso' ),
+	'Wantedpages'               => array( 'PáginasRequeridas', 'Páginas requeridas' ),
+	'Wantedcategories'          => array( 'CategoríasRequeridas', 'Categorías requeridas' ),
+	'Wantedfiles'               => array( 'ArchivosRequeridos', 'Archivos requeridos' ),
+	'Wantedtemplates'           => array( 'PlantillasRequeridas', 'Plantillas requeridas' ),
+	'Mostlinked'                => array( 'MásEnlazados', 'Más enlazados' ),
+	'Mostlinkedcategories'      => array( 'CategoríasMásUsadas', 'Categorías más usadas' ),
+	'Mostlinkedtemplates'       => array( 'PlantillasMásUsadas', 'Plantillas más usadas' ),
+	'Mostcategories'            => array( 'MásCategorizadas', 'Más categorizadas' ),
+	'Mostimages'                => array( 'MásImágenes', 'Con más imágenes' ),
+	'Mostrevisions'             => array( 'MásEdiciones', 'Más ediciones' ),
+	'Fewestrevisions'           => array( 'MenosEdiciones', 'Menos ediciones' ),
+	'Shortpages'                => array( 'PáginasCortas', 'Páginas cortas' ),
+	'Longpages'                 => array( 'PáginasLargas', 'Páginas largas' ),
+	'Newpages'                  => array( 'PáginasNuevas', 'Páginas nuevas' ),
+	'Ancientpages'              => array( 'PáginasAntiguas', 'Páginas antiguas' ),
+	'Deadendpages'              => array( 'PáginasSinSalida', 'Páginas sin salida' ),
+	'Protectedpages'            => array( 'PáginasProtegidas', 'Páginas protegidas' ),
+	'Protectedtitles'           => array( 'TítulosProtegidos', 'Títulos protegidos' ),
+	'Allpages'                  => array( 'Todas', 'Todas las páginas' ),
+	'Prefixindex'               => array( 'PáginasPorPrefijo', 'Páginas por prefijo' ),
+	'Ipblocklist'               => array( 'UsuariosBloqueados', 'Lista de usuarios bloqueados' ),
+	'Specialpages'              => array( 'PáginasEspeciales', 'Páginas especiales' ),
+	'Contributions'             => array( 'Contribuciones' ),
+	'Emailuser'                 => array( 'MandarEmailUsuario' ),
+	'Confirmemail'              => array( 'ConfirmarEmail', 'Confirmar e-mail' ),
+	'Whatlinkshere'             => array( 'LoQueEnlazaAquí', 'Lo que enlaza aquí' ),
+	'Recentchangeslinked'       => array( 'CambiosEnEnlazadas', 'Cambios en enlazadas' ),
+	'Movepage'                  => array( 'MoverPágina', 'Mover página' ),
+	'Blockme'                   => array( 'Bloquearme' ),
+	'Booksources'               => array( 'FuentesDeLibros', 'Fuentes de libros' ),
+	'Categories'                => array( 'Categorías' ),
+	'Export'                    => array( 'Exportar' ),
+	'Version'                   => array( 'Versión' ),
+	'Allmessages'               => array( 'TodosLosMensajes' ),
+	'Log'                       => array( 'Registro' ),
+	'Blockip'                   => array( 'Bloquear' ),
+	'Undelete'                  => array( 'Restaurar' ),
+	'Import'                    => array( 'Importar' ),
+	'Lockdb'                    => array( 'BloquearBasedeDatos', 'Bloquear base de datos' ),
+	'Unlockdb'                  => array( 'DesbloquearBasedeDatos', 'Desbloquear base de datos' ),
+	'Userrights'                => array( 'PermisosUsuarios', 'Permisos de usuarios' ),
+	'MIMEsearch'                => array( 'BuscarPorMIME', 'Buscar por MIME' ),
+	'FileDuplicateSearch'       => array( 'BuscarArchivosDuplicados', 'Buscar archivos duplicados' ),
+	'Unwatchedpages'            => array( 'PáginasSinVigilar', 'Páginas sin vigilar' ),
+	'Listredirects'             => array( 'TodasLasRedirecciones', 'Todas las redirecciones' ),
+	'Revisiondelete'            => array( 'BorrarRevisión', 'Borrar revisión' ),
+	'Unusedtemplates'           => array( 'PlantillasSinUso', 'Plantillas sin uso' ),
+	'Randomredirect'            => array( 'RedirecciónAleatoria', 'Redirección aleatoria' ),
+	'Mypage'                    => array( 'MiPágina', '', 'Mi página' ),
+	'Mytalk'                    => array( 'MiDiscusión', 'Mi discusión' ),
+	'Mycontributions'           => array( 'MisContribuciones', 'Mis contribuciones' ),
+	'Listadmins'                => array( 'ListaDeAdministradores', 'Lista de administradores' ),
+	'Listbots'                  => array( 'ListaDeBots', 'Lista de bots' ),
+	'Popularpages'              => array( 'PáginasMásVisitadas', 'PáginasPopulares', 'Páginas más visitadas' ),
+	'Search'                    => array( 'Buscar' ),
+	'Resetpass'                 => array( 'ResetearContraseña', 'Resetear contraseña' ),
+	'Withoutinterwiki'          => array( 'SinInterwikis', 'Sin interwikis' ),
+	'MergeHistory'              => array( 'FusionarHistorial', 'Fusionar historial' ),
+	'Filepath'                  => array( 'RutaDeArchivo', 'Ruta de archivo' ),
+	'Invalidateemail'           => array( 'InvalidarEmail', 'Invalidar e-mail' ),
+	'Blankpage'                 => array( 'BlanquearPágina', 'Blanquear página' ),
+	'LinkSearch'                => array( 'BúsquedaDeEnlaces', 'Búsqueda de enlaces' ),
+	'DeletedContributions'      => array( 'ContribucionesBorradas', 'Contribuciones Borradas' ),
 );
 
 $datePreferences = false;
@@ -115,17 +209,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ocultar mis ediciones en la lista de seguimiento',
 'tog-watchlisthidebots'       => 'Ocultar ediciones de bots en la lista de seguimiento',
 'tog-watchlisthideminor'      => 'Ocultar ediciones menores en la lista de seguimiento',
+'tog-watchlisthideliu'        => 'Ocultar ediciones de usuarios registrados en la lista de seguimiento',
+'tog-watchlisthideanons'      => 'Ocultar ediciones de usuarios anónimos en la lista de seguimiento',
 'tog-nolangconversion'        => 'Deshabilitar conversión de lenguajes',
 'tog-ccmeonemails'            => 'Recibir copias de los correos que envío a otros usuarios',
 'tog-diffonly'                => 'No mostrar el contenido de la página bajo las diferencias',
 'tog-showhiddencats'          => 'Mostrar categorías escondidas',
+'tog-norollbackdiff'          => "Omitir el ''diff'' después de revertir",
 
 'underline-always'  => 'Siempre',
 'underline-never'   => 'Nunca',
 'underline-default' => 'Valor por defecto del navegador',
 
-'skinpreview' => '(Ver cómo queda)',
-
 # Dates
 'sunday'        => 'domingo',
 'monday'        => 'lunes',
@@ -216,10 +311,10 @@ $messages = array(
 'qbspecialpages' => 'Páginas especiales',
 'moredotdotdot'  => 'Más...',
 'mypage'         => 'Mi página',
-'mytalk'         => 'Mi discusión',
+'mytalk'         => 'Mi página de discusión',
 'anontalk'       => 'Discusión para esta IP',
 'navigation'     => 'Navegación',
-'and'            => 'y',
+'and'            => '&#32;y',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatos:',
@@ -256,14 +351,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discutir',
 'specialpage'       => 'Página Especial',
 'personaltools'     => 'Herramientas personales',
-'postcomment'       => 'Poner un comentario',
+'postcomment'       => 'Nueva sección',
 'articlepage'       => 'Ver artículo',
-'talk'              => 'Discusión',
+'talk'              => 'Página de discusión',
 'views'             => 'Vistas',
 'toolbox'           => 'Herramientas',
 'userpage'          => 'Ver página de usuario',
 'projectpage'       => 'Ver página meta',
-'imagepage'         => 'Ver página de imagen',
+'imagepage'         => 'Ver página del archivo',
 'mediawikipage'     => 'Ver página de mensaje',
 'templatepage'      => 'Ver página de plantilla',
 'viewhelppage'      => 'Ver página de ayuda',
@@ -277,13 +372,11 @@ $messages = array(
 'protectedpage'     => 'Página protegida',
 'jumpto'            => 'Saltar a',
 'jumptonavigation'  => 'navegación',
-'jumptosearch'      => 'búsqueda',
+'jumptosearch'      => 'buscar',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Acerca de {{SITENAME}}',
 'aboutpage'            => 'Project:Acerca de',
-'bugreports'           => 'Informes de error de software',
-'bugreportspage'       => 'Project:Informes de error',
 'copyright'            => 'El contenido está disponible bajo los términos de la <i>$1</i>',
 'copyrightpagename'    => 'Copyright de {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Derechos de autor',
@@ -293,11 +386,11 @@ $messages = array(
 'disclaimerpage'       => 'Project:Limitación general de responsabilidad',
 'edithelp'             => 'Ayuda de edición',
 'edithelppage'         => 'Help:Cómo se edita una página',
-'faq'                  => 'FAQ',
+'faq'                  => 'Preguntas Frecuentes (FAQ)',
 'faqpage'              => 'Project:FAQ',
 'helppage'             => 'Help:Ayuda',
-'mainpage'             => 'Portada',
-'mainpage-description' => 'Portada',
+'mainpage'             => 'Página Principal',
+'mainpage-description' => 'Página Principal',
 'policy-url'           => 'Project:Políticas',
 'portal'               => 'Portal de la comunidad',
 'portal-url'           => 'Project:Portal de la comunidad',
@@ -306,9 +399,7 @@ $messages = array(
 
 'badaccess'        => 'Error de permisos',
 'badaccess-group0' => 'No está autorizado a ejecutar la acción que ha solicitado.',
-'badaccess-group1' => 'La acción que ha solicitado está restringida a los usuarios de uno de estos grupos: $1.',
-'badaccess-group2' => 'La acción que ha solicitado está restringida a los usuarios de uno de estos grupos: $1.',
-'badaccess-groups' => 'La acción que ha solicitado está restringida a los usuarios de uno de estos grupos: $1.',
+'badaccess-groups' => 'La acción que ha solicitado está restringida a los usuarios {{PLURAL:$2|del grupo|de uno de estos $2 grupos:}} $1.',
 
 'versionrequired'     => 'La versión $1 de MediaWiki es necesaria para utilizar esta página',
 'versionrequiredtext' => 'Se necesita la versión $1 de MediaWiki para utilizar esta página. Para más información, consulte [[Special:Version|la página de versión]]',
@@ -316,12 +407,14 @@ $messages = array(
 'ok'                      => 'Aceptar',
 'retrievedfrom'           => 'Obtenido de "$1"',
 'youhavenewmessages'      => 'Tiene $1 ($2).',
-'newmessageslink'         => 'mensajes nuevos',
-'newmessagesdifflink'     => 'último cambio',
+'newmessageslink'         => 'un nuevo mensaje',
+'newmessagesdifflink'     => '(diferencia)',
 'youhavenewmessagesmulti' => 'Tienes nuevos mensajes en $1',
 'editsection'             => 'editar',
 'editold'                 => 'editar',
 'viewsourceold'           => 'ver código fuente',
+'editlink'                => 'modificar',
+'viewsourcelink'          => 'ver fuente',
 'editsectionhint'         => 'Editar sección: $1',
 'toc'                     => 'Contenido',
 'showtoc'                 => 'mostrar',
@@ -336,13 +429,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom feed',
 'page-rss-feed'           => '"$1" RSS feed',
 'page-atom-feed'          => '"$1" Subscripción Atom',
-'red-link-title'          => '$1 (aún no redactado)',
+'red-link-title'          => '$1 (página no existe)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Página',
 'nstab-user'      => 'Usuario',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Especial',
+'nstab-special'   => 'Página especial',
 'nstab-project'   => 'Página del proyecto',
 'nstab-image'     => 'Archivo',
 'nstab-mediawiki' => 'Mensaje',
@@ -352,7 +445,8 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'No existe tal acción',
-'nosuchactiontext'  => 'La acción especificada en la dirección no es válida en {{SITENAME}}',
+'nosuchactiontext'  => 'La acción especificada en la dirección es inválida. 	
+Es posible que hayas escrito mal la URL o que hayas seguido un enlace incorrecto. Esto también podría indicar un error en el software utilizado en {{SITENAME}}.',
 'nosuchspecialpage' => 'No existe esa página especial',
 'nospecialpagetext' => "<big>'''Ha solicitado una página especial inexistente.'''</big>
 
@@ -375,9 +469,9 @@ $1',
 'laggedslavemode'      => 'Aviso: puede que falten las actualizaciones más recientes en esta página.',
 'readonly'             => 'Base de datos bloqueada',
 'enterlockreason'      => 'Explique el motivo del bloqueo, incluyendo una estimación de cuándo se producirá el desbloqueo',
-'readonlytext'         => 'La base de datos de {{SITENAME}} no permite nuevas entradas u otras modificaciones de forma temporal, probablemente por mantenimiento rutinario, tras de lo cual volverá a la normalidad.
-La explicación dada por el administrador que la bloqueó fue:
-<p>$1',
+'readonlytext'         => 'La base de datos no permite nuevas entradas u otras modificaciones de forma temporal, probablemente por mantenimiento rutinario, tras de lo cual volverá a la normalidad.
+
+La explicación dada por el administrador que la bloqueó fue: $1',
 'missing-article'      => "La base de datos no encuentra el texto de una página que debería hallarse, llamada «$1» $2.
 
 La causa de esto suele deberse a un ''diff'' anacrónico o un enlace al historial de una página que ha sido borrada.
@@ -404,7 +498,6 @@ Alguien puede haberla borrado antes.',
 'badtitle'             => 'Título incorrecto',
 'badtitletext'         => 'El título de la página solicitada está vacío, no es válido, o es un enlace interidioma o interwiki incorrecto.
 Puede que contenga uno o más caracteres que no se pueden usar en los títulos.',
-'perfdisabled'         => 'Lo sentimos, esta función está temporalmente desactivada porque enlentece la base de datos a tal punto que nadie puede usar el wiki.',
 'perfcached'           => 'Los siguientes datos están en caché y por tanto pueden estar desactualizados:',
 'perfcachedts'         => 'Estos datos están almacenados. Su última actualización fue el $1.',
 'querypage-no-updates' => 'Actualmente las actualizaciones de esta página están desactivadas. Estos datos no serán actualizados a corto plazo.',
@@ -418,7 +511,7 @@ Consulta: $2',
 'protectedpagetext'    => 'Esta página ha sido bloqueada para evitar su edición.',
 'viewsourcetext'       => 'Puedes ver y copiar el código fuente de esta página:',
 'protectedinterface'   => 'Esta página provee texto del interfaz del software, y está protegida para evitar vandalismos.',
-'editinginterface'     => "'''Aviso:''' Estás editando una página usada para proporcionar texto a la interfaz de {{SITENAME}}. Los cambios en esta página afectarán a la apariencia de la interfaz para los demás usuarios.",
+'editinginterface'     => "'''Aviso:''' Estás editando una página usada para proporcionar texto de interface para el software. Los cambios en esta página afectarán a la apariencia de la interfaz para los demás usuarios. Para traducciones, por favor considere usar [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], el proyecto de localización MediaWiki.",
 'sqlhidden'            => '(Consulta SQL oculta)',
 'cascadeprotected'     => 'Esta página ha sido protegida para su edición, porque está incluida en {{PLURAL:$1|la siguiente página|las siguientes páginas}}, que están protegidas con las opción de "cascada":
 $2',
@@ -429,16 +522,16 @@ $2',
 El motivo dado fue: ''$2''",
 
 # Virus scanner
-'virus-badscanner'     => 'Error de configuración: Antivirus desconocido: <i>$1</i>',
+'virus-badscanner'     => "Error de configuración: Antivirus desconocido: ''$1''",
 'virus-scanfailed'     => 'Escaneo fallido (código $1)',
 'virus-unknownscanner' => 'antivirus desconocido:',
 
 # Login and logout pages
 'logouttitle'                => 'Fin de sesión',
-'logouttext'                 => '<strong>Ha terminado su sesión.</strong>
+'logouttext'                 => "'''Ha terminado su sesión.'''
 
 Puedes continuar usando {{SITENAME}} de forma anónima, o puedes [[Special:UserLogin|iniciar sesión otra vez]] con el mismo u otro usuario.
-Ten en cuenta que las páginas que tengas abiertas en otras ventanas o pestañas pueden verse como si siguieras identificado hasta que las refresques.',
+Ten en cuenta que las páginas que tengas abiertas en otras ventanas o pestañas pueden verse como si siguieras identificado hasta que las refresques.",
 'welcomecreation'            => '== ¡Bienvenido(a), $1! ==
 
 Tu cuenta ha sido creada. 
@@ -451,7 +544,6 @@ No olvides personalizar [[Special:Preferences|tus preferencias]].',
 'remembermypassword'         => 'Quiero que me recuerden entre sesiones.',
 'yourdomainname'             => 'Su dominio',
 'externaldberror'            => 'Hubo un error de autenticación externa de la base de datos o bien no está autorizado a actualizar su cuenta externa.',
-'loginproblem'               => '<b>Hubo un problema con su autenticación.</b><br />¡Inténtelo otra vez!',
 'login'                      => 'Registrarse/Entrar',
 'nav-login-createaccount'    => 'Registrarse/Entrar',
 'loginprompt'                => 'Necesita habilitar las <i>cookies</i> en su navegador para registrarse en {{SITENAME}}.',
@@ -477,7 +569,7 @@ Por favor, indique un nombre diferente.',
 'yourvariant'                => 'Variante lingüística',
 'yournick'                   => 'Su apodo (para firmas)',
 'badsig'                     => 'El código de tu firma no es válido; comprueba las etiquetas HTML.',
-'badsiglength'               => 'El apodo para firmas es demasiado largo.
+'badsiglength'               => 'Su firma es demasiado largo.
 Debe ser de menos de $1 {{PLURAL:$1|carácter|caracteres}}.',
 'email'                      => 'Correo electrónico',
 'prefs-help-realname'        => '* Nombre real (opcional): si opta por proporcionarlo, se usará para dar atribución a su trabajo.',
@@ -491,6 +583,7 @@ También puede permitir a otros usuarios que contacten con usted a través de su
 'loginsuccesstitle'          => 'Inicio de sesión exitoso',
 'loginsuccess'               => 'Ha iniciado su sesión en {{SITENAME}} como "$1".',
 'nosuchuser'                 => 'No existe ningún usuario llamado «$1».
+Los nombres de usuario son sensibles a las mayúsculas.
 Verifique su deletreo, o [[Special:UserLogin/signup|cree una nueva cuenta]].',
 'nosuchusershort'            => 'No hay un usuario con el nombre "<nowiki>$1</nowiki>". Compruebe que lo ha escrito correctamente.',
 'nouserspecified'            => 'Debes especificar un nombre de usuario.',
@@ -501,7 +594,6 @@ Verifique su deletreo, o [[Special:UserLogin/signup|cree una nueva cuenta]].',
 'passwordremindertitle'      => 'Recordatorio de contraseña de {{SITENAME}}',
 'passwordremindertext'       => 'Alguien (probablemente tú, desde la dirección IP $1) solicitó que te enviáramos una nueva contraseña para tu cuenta en {{SITENAME}} ($4).
 Se ha creado la siguiente contraseña temporal para el usuario «$2»: «$3»
-Ahora deberías iniciar sesión y cambiar tu contraseña.
 
 Si fue otro quien solicitó este mensaje o has recordado tu contraseña y ya no deseas cambiarla, puedes ignorar este mensaje y seguir usando tu contraseña original.',
 'noemail'                    => 'No hay una dirección de correo electrónico registrada para "$1".',
@@ -513,11 +605,12 @@ Antes de que se envíe cualquier otro correo a la cuenta tienes que seguir las i
 'throttled-mailpassword'     => 'Ya se ha enviado un recordatorio de password en {{PLURAL:$1|la última hora|las últimas $1 horas}}.
 Para evitar los abusos, solo se enviará un recordatorio de password cada {{PLURAL:$1|hora|$1 horas}}.',
 'mailerror'                  => 'Error al enviar correo: $1',
-'acct_creation_throttle_hit' => 'Lo sentimos, ya ha creado $1 cuentas. No puede crear otra.',
-'emailauthenticated'         => 'Su dirección electrónica fue verificada en $1.',
+'acct_creation_throttle_hit' => 'Los visitantes a esta wiki usando su dirección IP han creado {{PLURAL:$1|una cuenta|$1 cuentas}} en el último día. lo cual es lo máximo permitido en este periodo de tiempo.
+Como resultado, los visitantes usando esta dirección IP no pueden crear más cuentas en este momento.',
+'emailauthenticated'         => 'Su dirección electrónica fue autenticada en $2 a $3.',
 'emailnotauthenticated'      => 'Aún no has confirmado tu dirección de correo electrónico.
 Hasta que lo hagas, las siguientes funciones no estarán disponibles.',
-'noemailprefs'               => '<strong>Especifique una dirección electrónica para habilitar estas características.</strong>',
+'noemailprefs'               => 'Especifique una dirección electrónica para habilitar estas características.',
 'emailconfirmlink'           => 'Confirme su dirección de correo electrónico',
 'invalidemailaddress'        => 'La dirección electrónica no puede ser aceptada, pues parece que tiene un formato no válido.
 Por favor, entre una dirección bien formada, o vacíe ese campo.',
@@ -528,18 +621,26 @@ Por favor, entre una dirección bien formada, o vacíe ese campo.',
 Por favor entra y cambia tu contraseña ahora.
 
 Puedes ignorar este mensaje si esta cuenta fue creado erróneamente.',
+'login-throttled'            => 'Has intentado demasiadas veces dar la clave de esta cuenta. Por favor espera antes de intentarlo nuevamente.',
 'loginlanguagelabel'         => 'Idioma: $1',
 
 # Password reset dialog
-'resetpass'               => 'Restablecer la contraseña de usuario',
-'resetpass_announce'      => 'Has iniciado sesión con una contraseña temporal que fue enviada por correo electrónico. Por favor, ingresa una nueva contraseña aquí:',
-'resetpass_text'          => '<!-- Añada texto aquí -->',
-'resetpass_header'        => 'Cambiar la contraseña',
-'resetpass_submit'        => 'Cambiar la contraseña e identificarse',
-'resetpass_success'       => 'Se ha cambiado su contraseña. Autenticándole...',
-'resetpass_bad_temporary' => 'Contraseña temporal no válida. Puede que ya hayas cambiado tu contraseña o que hayas solicitado el envío de otra.',
-'resetpass_forbidden'     => 'No se puede cambiar contraseñas',
-'resetpass_missing'       => 'No hay datos en el formulario.',
+'resetpass'                 => 'Cambiar la contraseña',
+'resetpass_announce'        => 'Has iniciado sesión con una contraseña temporal que fue enviada por correo electrónico. Por favor, ingresa una nueva contraseña aquí:',
+'resetpass_text'            => '<!-- Añada texto aquí -->',
+'resetpass_header'          => 'Cambiar la contraseña',
+'oldpassword'               => 'Contraseña antigua:',
+'newpassword'               => 'Contraseña nueva:',
+'retypenew'                 => 'Confirme la nueva contraseña:',
+'resetpass_submit'          => 'Cambiar la contraseña e identificarse',
+'resetpass_success'         => 'Se ha cambiado su contraseña. Autenticándole...',
+'resetpass_bad_temporary'   => 'Contraseña temporal no válida. Puede que ya hayas cambiado tu contraseña o que hayas solicitado el envío de otra.',
+'resetpass_forbidden'       => 'No se puede cambiar contraseñas',
+'resetpass-no-info'         => 'Debes identificarte para acceder directamente a esta página.',
+'resetpass-submit-loggedin' => 'Cambiar contraseña',
+'resetpass-wrong-oldpass'   => 'La contraseña antigua no es correcta.
+Puede que ya hayas cambiado la contraseña o que hayas pedido una temporal.',
+'resetpass-temp-password'   => 'Contraseña temporal:',
 
 # Edit page toolbar
 'bold_sample'     => 'Texto en negrita',
@@ -564,10 +665,10 @@ Puedes ignorar este mensaje si esta cuenta fue creado erróneamente.',
 'hr_tip'          => 'Línea horizontal (utilícela con moderación)',
 
 # Edit pages
-'summary'                          => 'Resumen',
-'subject'                          => 'Tema/título',
+'summary'                          => 'Resumen:',
+'subject'                          => 'Tema/título:',
 'minoredit'                        => 'Esta es una edición menor',
-'watchthis'                        => 'Vigilar este artículo',
+'watchthis'                        => 'Vigilar esta página',
 'savearticle'                      => 'Grabar la página',
 'preview'                          => 'Previsualizar',
 'showpreview'                      => 'Mostrar previsualización',
@@ -577,8 +678,8 @@ Puedes ignorar este mensaje si esta cuenta fue creado erróneamente.',
 'missingsummary'                   => "'''Atención:''' No has escrito un resumen de edición. Si haces clic nuevamente en «{{MediaWiki:Savearticle}}» tu edición se grabará sin él.",
 'missingcommenttext'               => 'Por favor introduce texto debajo.',
 'missingcommentheader'             => "'''Atención:''' No has escrito un título para este comentario. Si haces clic nuevamente en Grabar tu edición se grabará sin él.",
-'summary-preview'                  => 'Previsualización del resumen',
-'subject-preview'                  => 'Previsualización del tema/título',
+'summary-preview'                  => 'Previsualización del resumen:',
+'subject-preview'                  => 'Previsualización del tema/título:',
 'blockedtitle'                     => 'El usuario está bloqueado',
 'blockedtext'                      => "<big>'''Tu nombre de usuario o dirección IP ha sido bloqueada.'''</big>
 
@@ -625,7 +726,7 @@ Tu dirección IP actual es $3, y el identificador del bloqueo es #$5. Por favor
 'newarticle'                       => '(Nuevo)',
 'newarticletext'                   => 'Ha seguido un enlace a una página que aún no existe. Si lo que quiere es crear esta página, escriba a continuación. Para más información consulte la [[{{MediaWiki:Helppage}}|página de ayuda]]. Si llegó aquí por error, vuelva a la página anterior.',
 'anontalkpagetext'                 => "---- ''Esta es la página de discusión de un usuario anónimo que aún no ha creado una cuenta, o no la usa. Por lo tanto, tenemos que usar su dirección IP para identificarlo. Una dirección IP puede ser compartida por varios usuarios. Si eres un usuario anónimo y crees que se han dirigido a ti con comentarios improcedentes, por favor [[Special:UserLogin/signup|crea una cuenta]] o si ya la tienes [[Special:UserLogin|identifícate]] para evitar confusiones futuras con otros usuarios anónimos.''",
-'noarticletext'                    => 'En este momento no hay texto en esta página, puedes [[Special:Search/{{PAGENAME}}|buscar por el título de esta página]] en otras páginas o [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página].',
+'noarticletext'                    => 'En este momento no hay texto en esta página. Puedes [[Special:Search/{{PAGENAME}}|buscar por el título de esta página]] en otras páginas, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} buscar en los registros] o [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página]</span>.',
 'userpage-userdoesnotexist'        => 'La cuenta de usuario "$1" no está registrada. Por favor comprueba si quieres crear o editar esta página.',
 'clearyourcache'                   => "'''Nota:''' Tras guardar el archivo, debe refrescar la caché de su navegador para ver los cambios:
 
@@ -633,27 +734,27 @@ Tu dirección IP actual es $3, y el identificador del bloqueo es #$5. Por favor
 *'''Konqueror: '''Haz click en el botón ''Reload'' o pulsa ''F5;''
 *'''Opera:''' Limpia la caché en ''Herramientas → Preferencias;''
 *'''Internet Explorer:''' pulsa ''Ctrl'' mientras haces click en ''Refresh,'' o pulsa ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => '<strong>Consejo:</strong> Use el botón «Mostrar previsualización» para probar su nuevo css/js antes de grabarlo.',
+'usercssjsyoucanpreview'           => "'''Consejo:''' Use el botón «Mostrar previsualización» para probar su nuevo css/js antes de grabarlo.",
 'usercsspreview'                   => "'''Recuerde que sólo está previsualizando su CSS de usuario.'''
 '''¡Aún no se ha grabado!'''",
 'userjspreview'                    => "'''¡Recuerde que sólo está previsualizando su javascript de usuario y aún no se ha grabado!'''",
 'userinvalidcssjstitle'            => "'''Aviso:''' No existe la piel \"\$1\". Recuerda que las páginas personalizadas .css y .js tienen un título en minúsculas, p.e. {{ns:user}}:Foo/monobook.css en vez de  {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Actualizado)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>¡Recuerde que esto es sólo una previsualización y aún no se ha grabado!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''¡Recuerde que esto es sólo una previsualización y aún no se ha grabado!'''",
 'previewconflict'                  => 'La previsualización le muestra cómo aparecerá el texto una vez guardados los cambios.',
-'session_fail_preview'             => '<strong>Lo sentimos, no pudimos efectuar su edición debido a una pérdida de los datos de sesión. Por favor, inténtelo de nuevo y si no funciona, salga de su sesión y vuelva a identificarse.</strong>',
-'session_fail_preview_html'        => "<strong>Lo sentimos, no hemos podido procesar tu cambio debido a una pérdida de datos de sesión.</strong>
+'session_fail_preview'             => "'''Lo sentimos, no pudimos efectuar su edición debido a una pérdida de los datos de sesión. Por favor, inténtelo de nuevo y si no funciona, salga de su sesión y vuelva a identificarse.'''",
+'session_fail_preview_html'        => "'''Lo sentimos, no hemos podido procesar tu cambio debido a una pérdida de datos de sesión.'''
 
 ''Puesto que este wiki tiene el HTML puro habilitado, la visión preliminar está oculta para prevenirse contra ataques en JavaScript.''
 
-<strong>Si éste es un intento legítimo de modificación, por favor, inténtelo de nuevo. Si aún entonces no funcionase, pruebe a cerrar la sesión y a ingresar de nuevo.</strong>",
-'token_suffix_mismatch'            => '<strong>Tu edición ha sido rechazada porque tu cliente ha mezclado los signos de puntuación en el token de edición. 
+'''Si éste es un intento legítimo de modificación, por favor, inténtelo de nuevo. Si aún entonces no funcionase, pruebe a cerrar la sesión y a ingresar de nuevo.'''",
+'token_suffix_mismatch'            => "'''Tu edición ha sido rechazada porque tu cliente ha mezclado los signos de puntuación en el token de edición. 
 Se rechazó la edición para evitar que el texto de la página se corrompa
-Esto sucede en ocasiones cuando se usa un servicio de proxy anónimo defectuoso.</strong>',
+Esto sucede en ocasiones cuando se usa un servicio de proxy anónimo defectuoso.'''",
 'editing'                          => 'Editando $1',
 'editingsection'                   => 'Editando $1 (sección)',
-'editingcomment'                   => 'Editando $1 (comentario)',
+'editingcomment'                   => 'Editando $1 (nueva sección)',
 'editconflict'                     => 'Conflicto de edición: $1',
 'explainconflict'                  => "Alguien más ha cambiado esta página desde que empezaste a editarla.
 El área de texto superior contiene el texto de la página como existe actualmente.
@@ -662,21 +763,23 @@ Si quieres grabar tus cambios, has de trasladarlos al área superior.
 '''Sólo''' el texto en el área de texto superior será grabado cuando pulses «Grabar página».",
 'yourtext'                         => 'Su texto',
 'storedversion'                    => 'Versión almacenada',
-'nonunicodebrowser'                => '<strong>Atención: Su navegador no cumple la norma Unicode. Se ha activado un sistema de edición alternativo que le permitirá editar artículos con seguridad: los caracteres no ASCII aparecerán en la caja de edición como códigos hexadecimales.</strong>',
-'editingold'                       => '<strong>ADVERTENCIA: Estás editando una versión antigua de esta página.
-Si la grabas, los cambios hechos desde esa revisión se perderán.</strong>',
+'nonunicodebrowser'                => "'''Atención: Su navegador no cumple la norma Unicode. Se ha activado un sistema de edición alternativo que le permitirá editar artículos con seguridad: los caracteres no ASCII aparecerán en la caja de edición como códigos hexadecimales.'''",
+'editingold'                       => "'''ADVERTENCIA: Estás editando una versión antigua de esta página.
+Si la grabas, los cambios hechos desde esa revisión se perderán.'''",
 'yourdiff'                         => 'Diferencias',
-'copyrightwarning'                 => 'Por favor observa que todas las contribuciones a {{SITENAME}} se consideran hechas públicas bajo la $2 (ver detalles en $1).Si no deseas que la gente corrija tus escritos sin piedad y los distribuya libremente, entonces no los pongas aquí. También tú nos aseguras que escribiste esto texto tú mismo y eres dueño de los derechos de autor, o lo copiaste desde el dominio público u otra fuente libre.<strong>¡NO USES ESCRITOS CON COPYRIGHT SIN PERMISO!</strong><br />',
-'copyrightwarning2'                => 'Por favor, ten en cuenta que todas las contribuciones a {{SITENAME}} pueden ser editadas, modificadas o eliminadas por otros colaboradores. Si no deseas que la gente corrija tus escritos sin piedad y los distribuya libremente, entonces no los pongas aquí. <br />También tú nos aseguras que escribiste esto tú mismo y eres dueño de los derechos de autor, o lo copiaste desde el dominio público u otra fuente libre. (véase $1 para detalles). <br /><strong>¡NO USES ESCRITOS CON COPYRIGHT SIN PERMISO!</strong>',
-'longpagewarning'                  => '<strong>Atención: Esta página tiene un tamaño de $1 kilobytes; algunos navegadores pueden tener problemas editando páginas de 32 kB o más.
-Por favor considere la posibilidad de dividir esta página en secciones más pequeñas.</strong>',
-'longpageerror'                    => '<strong>ERROR: El texto que has enviado ocupa $1 kilobytes, que excede el máximo de $2 kilobytes. No se puede guardar.</strong>',
-'readonlywarning'                  => '<strong>Atención: La base de datos ha sido bloqueada por cuestiones de mantenimiento, así que no podrá guardar sus modificaciones en este momento.
-Puede copiar y pegar el texto a un archivo en su ordenador y grabarlo para más tarde.</strong>',
-'protectedpagewarning'             => '<strong>ADVERTENCIA: Esta página ha sido protegida de manera que sólo usuarios con permisos de administrador pueden editarla.</strong>',
+'copyrightwarning'                 => "Por favor observa que todas las contribuciones a {{SITENAME}} se consideran hechas públicas bajo la $2 (ver detalles en $1).Si no deseas que la gente corrija tus escritos sin piedad y los distribuya libremente, entonces no los pongas aquí. También tú nos aseguras que escribiste esto texto tú mismo y eres dueño de los derechos de autor, o lo copiaste desde el dominio público u otra fuente libre.'''¡NO USES ESCRITOS CON COPYRIGHT SIN PERMISO!'''<br />",
+'copyrightwarning2'                => "Por favor, ten en cuenta que todas las contribuciones a {{SITENAME}} pueden ser editadas, modificadas o eliminadas por otros colaboradores. Si no deseas que la gente corrija tus escritos sin piedad y los distribuya libremente, entonces no los pongas aquí. <br />También tú nos aseguras que escribiste esto tú mismo y eres dueño de los derechos de autor, o lo copiaste desde el dominio público u otra fuente libre. (véase $1 para detalles). <br />'''¡NO USES ESCRITOS CON COPYRIGHT SIN PERMISO!'''",
+'longpagewarning'                  => "'''Atención: Esta página tiene un tamaño de $1 kilobytes; algunos navegadores pueden tener problemas editando páginas de 32 kB o más.
+Por favor considere la posibilidad de dividir esta página en secciones más pequeñas.'''",
+'longpageerror'                    => "'''ERROR: El texto que has enviado ocupa $1 kilobytes, que excede el máximo de $2 kilobytes. No se puede guardar.'''",
+'readonlywarning'                  => "'''Atención: La base de datos ha sido bloqueada por cuestiones de mantenimiento, así que no podrá guardar sus modificaciones en este momento.
+Puede copiar y pegar el texto a un archivo en su ordenador y grabarlo para más tarde.'''
+
+El administrador que la bloqueó dio esta explicación: $1",
+'protectedpagewarning'             => "'''ADVERTENCIA: Esta página ha sido protegida de manera que sólo usuarios con permisos de administrador pueden editarla.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Esta página ha sido protegida para que sólo usuarios registrados puedan editarla.",
 'cascadeprotectedwarning'          => "'''Aviso:''' Esta página está protegida, sólo los administradores pueden editarla porque está incluida en  {{PLURAL:$1|la siguiente página protegida|las siguientes páginas protegidas}} en cascada:",
-'titleprotectedwarning'            => '<strong>ATENCIÓN:  Esta página está protegida de modo que sólo algunos usuarios pueden crearla.</strong>',
+'titleprotectedwarning'            => "'''ATENCIÓN:  Esta página está protegida de modo que [[Special:ListGroupRights|derechos especificos]] son necesarios para crearlo.'''",
 'templatesused'                    => 'Plantillas usadas en esta página:',
 'templatesusedpreview'             => 'Plantillas usadas en esta previsualización:',
 'templatesusedsection'             => 'Plantillas usadas en esta sección:',
@@ -694,11 +797,22 @@ Puede copiar y pegar el texto a un archivo en su ordenador y grabarlo para más
 
 Debería considerar si es apropiado continuar editando esta página.
 Consulte a continuación el registro de borrados:",
+'deleted-notice'                   => 'Esta página ha sido borrada.
+A continuación se muestra el registro de su borrado como referencia.',
+'deletelog-fulllog'                => 'Ver el registro completo',
+'edit-hook-aborted'                => 'Edición abortada por la extensión.
+No dió explicaciones.',
+'edit-gone-missing'                => 'No se pudo actualizar la página.
+Aparece que ha sido borrada.',
+'edit-conflict'                    => 'Conflicto de edición.',
+'edit-no-change'                   => 'Se ignoró su revisión, porque no se hizo ningún cambio al texto.',
+'edit-already-exists'              => 'No se pudo crear una página nueva.
+Ya existe.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Aviso: Esta página contiene demasiadas llamadas a funciones de preproceso costosas
+'expensive-parserfunction-warning'        => 'Aviso: Esta página contiene demasiadas llamadas a funciones sintácticas costosas (#ifexist: y similares)
 
-Debería tener menos de $2, por ahora tiene $1.',
+Tiene {{PLURAL:$1|una llamada|$1 llamadas}}, pero debería tener menos de $2.',
 'expensive-parserfunction-category'       => 'Páginas con llamadas a funciones sintácticas demasiado costosas',
 'post-expand-template-inclusion-warning'  => 'Aviso: El tamaño de las plantillas incluidas es muy grande.
 Algunas plantillas no serán incluidas',
@@ -706,6 +820,8 @@ Algunas plantillas no serán incluidas',
 'post-expand-template-argument-warning'   => 'Aviso: Esta página contiene al menos un parámetro de plantilla que tiene un tamaño de expansión demasiado grande. 
 Ese o esos parámetros han sido omitidos.',
 'post-expand-template-argument-category'  => 'Páginas que contienen plantillas con parámetros descartados',
+'parser-template-loop-warning'            => 'Detectado bucle de plantilla: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Se ha excedido el límite de recursión de plantillas ($1)',
 
 # "Undo" feature
 'undo-success' => 'La edición puede deshacerse. Antes de deshacer la edición, comprueba la siguiente comparación para verificar que realmente es lo que quieres hacer, y entonces guarda los cambios para así deshacer la edición.',
@@ -720,30 +836,29 @@ Ese o esos parámetros han sido omitidos.',
 El motivo dado por $3 es ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Ver los registros de esta página',
-'nohistory'           => 'No hay un historial de ediciones para esta página.',
-'revnotfound'         => 'Revisión no encontrada',
-'revnotfoundtext'     => 'No se pudo encontrar la revisión antigua de la página que ha solicitado.
-Por favor, revise la dirección que usó para acceder a esta página.',
-'currentrev'          => 'Revisión actual',
-'revisionasof'        => 'Revisión de $1',
-'revision-info'       => 'Revisión a fecha de $1; $2',
-'previousrevision'    => '� Revisión anterior',
-'nextrevision'        => 'Revisión siguiente →',
-'currentrevisionlink' => 'Revisión actual',
-'cur'                 => 'act',
-'next'                => 'sig',
-'last'                => 'prev',
-'page_first'          => 'primeras',
-'page_last'           => 'últimas',
-'histlegend'          => "Selecciónde diferencias: marca los selectores de las versiones a comparar y pulta ''enter'' o el botón de abajo.<br />
+'viewpagelogs'           => 'Ver los registros de esta página',
+'nohistory'              => 'No hay un historial de ediciones para esta página.',
+'currentrev'             => 'Revisión actual',
+'currentrev-asof'        => 'última version al $1',
+'revisionasof'           => 'Revisión de $1',
+'revision-info'          => 'Revisión a fecha de $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Revisión anterior',
+'nextrevision'           => 'Revisión siguiente →',
+'currentrevisionlink'    => 'Revisión actual',
+'cur'                    => 'act',
+'next'                   => 'sig',
+'last'                   => 'prev',
+'page_first'             => 'primeras',
+'page_last'              => 'últimas',
+'histlegend'             => "Selecciónde diferencias: marca los selectores de las versiones a comparar y pulta ''enter'' o el botón de abajo.<br />
 Leyenda: (act) = diferencias con la versión actual,
 (prev) = diferencias con la versión previa, M = edición menor",
-'deletedrev'          => '[borrado]',
-'histfirst'           => 'Primeras',
-'histlast'            => 'Últimas',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vacío)',
+'history-fieldset-title' => 'Buscar en el historial',
+'deletedrev'             => '[borrado]',
+'histfirst'              => 'Primeras',
+'histlast'               => 'Últimas',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vacío)',
 
 # Revision feed
 'history-feed-title'          => 'Historial de revisiones',
@@ -830,6 +945,7 @@ Nota que usar los enlaces de navegación borrará las selecciones de esta column
 'mergehistory-invalid-destination' => 'La página de destino ha de tener un título válido.',
 'mergehistory-autocomment'         => 'Fusionando [[:$1]] en [[:$2]]',
 'mergehistory-comment'             => 'Fusionando [[:$1]] en [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Las páginas de origen y destino no pueden ser la misma',
 
 # Merge log
 'mergelog'           => 'Registro de fusiones',
@@ -842,122 +958,203 @@ Nota que usar los enlaces de navegación borrará las selecciones de esta column
 'difference'              => '(Diferencias entre revisiones)',
 'lineno'                  => 'Línea $1:',
 'compareselectedversions' => 'Comparar versiones seleccionadas',
+'visualcomparison'        => 'Comparación visual',
+'wikicodecomparison'      => 'Comparación de texto wiki',
 'editundo'                => 'deshacer',
 'diff-multi'              => '({{PLURAL:$1|Una edición intermedia no se muestra|$1 ediciones intermedias no se muestran}}.)',
+'diff-movedto'            => 'movido a $1',
+'diff-styleadded'         => 'estilo $1 añadido',
+'diff-added'              => 'añadido $1',
+'diff-changedto'          => 'modificado a $1',
+'diff-movedoutof'         => 'retirado de $1',
+'diff-styleremoved'       => 'estilo $1 suprimido',
+'diff-removed'            => 'suprimido $1',
+'diff-changedfrom'        => 'modificado a partir de $1',
+'diff-src'                => 'código fuente',
+'diff-withdestination'    => 'con destino $1',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;y $1 $2',
+'diff-width'              => 'ancho',
+'diff-height'             => 'alto',
+'diff-p'                  => "un '''párrafo'''",
+'diff-blockquote'         => "una '''cita'''",
+'diff-h1'                 => "una '''cabecera (nivel 1)'''",
+'diff-h2'                 => "una '''cabecera (nivel 2)'''",
+'diff-h3'                 => "una '''cabecera (nivel 3)'''",
+'diff-h4'                 => "una '''cabecera (nivel 4)'''",
+'diff-h5'                 => "una '''cabecera (nivel 5)'''",
+'diff-pre'                => "un '''bloque preformateado'''",
+'diff-div'                => "una '''división'''",
+'diff-ul'                 => "una '''lista desordenada'''",
+'diff-ol'                 => "una '''lista ordenada'''",
+'diff-li'                 => "un '''elemento de lista'''",
+'diff-table'              => "una '''tabla'''",
+'diff-tbody'              => "un '''contenido de tabla'''",
+'diff-tr'                 => "una '''fila'''",
+'diff-td'                 => "una '''celda'''",
+'diff-th'                 => "una '''cabecera'''",
+'diff-br'                 => "un '''salto de línea'''",
+'diff-hr'                 => "una '''línea horizontal'''",
+'diff-code'               => "un '''bloque de código de ordenador'''",
+'diff-dl'                 => "una '''lista de definiciones'''",
+'diff-dt'                 => "un '''término de definición'''",
+'diff-dd'                 => "una '''definición'''",
+'diff-input'              => "una '''entrada'''",
+'diff-form'               => "un '''formulario'''",
+'diff-img'                => "una '''imagen'''",
+'diff-span'               => "un '''''span'''''",
+'diff-a'                  => "un '''enlace'''",
+'diff-i'                  => "'''cursivas'''",
+'diff-b'                  => "'''negrita'''",
+'diff-strong'             => "'''fuerte'''",
+'diff-em'                 => "'''énfasis'''",
+'diff-font'               => "'''tipografía'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''borrado'''",
+'diff-tt'                 => "'''anchura fija'''",
+'diff-sub'                => "'''subíndice'''",
+'diff-sup'                => "'''superíndice'''",
+'diff-strike'             => "'''tachado'''",
 
 # Search results
-'searchresults'             => 'Resultados de la búsqueda',
-'searchresulttext'          => 'Para más información acerca de las búsquedas en {{SITENAME}}, consulte la [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Has consultado por '''[[:$1]]''' ([[Special:Prefixindex/$1|todas las páginas que empiezan por «$1»]] | [[Special:WhatLinksHere/$1|todas las páginas que enlazan con «$1»]])",
-'searchsubtitleinvalid'     => "Buscaste '''$1'''",
-'noexactmatch'              => "'''No existe una página llamada \"\$1\".''' Puedes [[:\$1|crearla]].",
-'noexactmatch-nocreate'     => "'''No existe la página «$1».'''",
-'toomanymatches'            => 'Los resultados fueron demasiado extensos, por favor intente una consulta diferente',
-'titlematches'              => 'Coincidencias de título de artículo',
-'notitlematches'            => 'No hay coincidencias de título de artículo',
-'textmatches'               => 'Coincidencias de texto de artículo',
-'notextmatches'             => 'No hay coincidencias de texto de artículo',
-'prevn'                     => '$1 previas',
-'nextn'                     => '$1 siguientes',
-'viewprevnext'              => 'Ver ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 palabra|$2 palabras}})',
-'search-result-score'       => 'Relevancia: $1%',
-'search-redirect'           => '(redirige a $1)',
-'search-section'            => '(sección $1)',
-'search-suggest'            => 'Quizás quieres buscar: $1',
-'search-interwiki-caption'  => 'Proyectos hermanos',
-'search-interwiki-default'  => '$1 resultados:',
-'search-interwiki-more'     => '(más)',
-'search-mwsuggest-enabled'  => 'con sugerencias',
-'search-mwsuggest-disabled' => 'sin sugerencias',
-'search-relatedarticle'     => 'Relacionado',
-'mwsuggest-disable'         => 'No usar AJAX al realizar búsquedas',
-'searchrelated'             => 'relacionado',
-'searchall'                 => 'todos',
-'showingresults'            => "Abajo se {{PLURAL:$1|muestra '''1''' resultado|muestran hasta '''$1''' resultados}} empezando por el nº '''$2'''.",
-'showingresultsnum'         => "Abajo se {{PLURAL:$3|muestra '''1''' resultado|muestran los '''$3''' resultados}} empezando por el nº '''$2'''.",
-'showingresultstotal'       => "Debajo se muestran {{PLURAL:$3|la resultado '''$1''' de un resultado total|los resultados entre el número '''$1''' y el '''$2''', de un total de $3 resultados totales}}.",
-'nonefound'                 => "'''Nota''': Por defecto sólo se busca en algunos espacios de nombre.
+'searchresults'                    => 'Resultados de la búsqueda',
+'searchresults-title'              => 'Resultados de la búsqueda de «$1»',
+'searchresulttext'                 => 'Para más información acerca de las búsquedas en {{SITENAME}}, consulte la [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Has consultado por \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|todas las páginas que empiezan por "$1"]] {{int:pipe-separator}} [[Special:WhatLinksHere/$1|todas las páginas que enlazan con «$1»]])',
+'searchsubtitleinvalid'            => "Buscaste '''$1'''",
+'noexactmatch'                     => "'''No existe una página llamada \"\$1\".''' Puedes [[:\$1|crearla]].",
+'noexactmatch-nocreate'            => "'''No existe la página «$1».'''",
+'toomanymatches'                   => 'Los resultados fueron demasiado extensos, por favor intente una consulta diferente',
+'titlematches'                     => 'Coincidencias de título de artículo',
+'notitlematches'                   => 'No hay coincidencias de título de artículo',
+'textmatches'                      => 'Coincidencias de texto de artículo',
+'notextmatches'                    => 'No hay coincidencias de texto de artículo',
+'prevn'                            => '$1 previas',
+'nextn'                            => '$1 siguientes',
+'viewprevnext'                     => 'Ver ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opciones de búsqueda',
+'searchmenu-exists'                => "'''Hay una página llamada «[[$1]]» en esta wiki'''",
+'searchmenu-new'                   => "'''¡Crear la página «[[:$1]]» en esta wiki!'''",
+'searchhelp-url'                   => 'Help:Ayuda',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Otras páginas con este prefijo]]',
+'searchprofile-articles'           => 'Páginas de contenido',
+'searchprofile-articles-and-proj'  => 'Páginas de contenido y del proyecto',
+'searchprofile-project'            => 'Páginas del proyecto',
+'searchprofile-images'             => 'Archivos',
+'searchprofile-everything'         => 'Todo',
+'searchprofile-advanced'           => 'Avanzado',
+'searchprofile-articles-tooltip'   => 'Buscar en $1',
+'searchprofile-project-tooltip'    => 'Buscar en $1',
+'searchprofile-images-tooltip'     => 'Buscar archivos',
+'searchprofile-everything-tooltip' => 'Buscar en todo el contenido (incluyendo páginas de discusión)',
+'searchprofile-advanced-tooltip'   => 'Buscar en espacios de nombre personalizados',
+'prefs-search-nsdefault'           => 'Buscar usando valores predefinidos:',
+'prefs-search-nscustom'            => 'Buscar utilizando los siguientes espacios de nombres:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 palabra|$2 palabras}})',
+'search-result-score'              => 'Relevancia: $1%',
+'search-redirect'                  => '(redirige a $1)',
+'search-section'                   => '(sección $1)',
+'search-suggest'                   => 'Quizás quieres buscar: $1',
+'search-interwiki-caption'         => 'Proyectos hermanos',
+'search-interwiki-default'         => 'Resultados de $1:',
+'search-interwiki-more'            => '(más)',
+'search-mwsuggest-enabled'         => 'con sugerencias',
+'search-mwsuggest-disabled'        => 'sin sugerencias',
+'search-relatedarticle'            => 'Relacionado',
+'mwsuggest-disable'                => 'No usar AJAX al realizar búsquedas',
+'searchrelated'                    => 'relacionado',
+'searchall'                        => 'todos',
+'showingresults'                   => "Abajo se {{PLURAL:$1|muestra '''1''' resultado|muestran hasta '''$1''' resultados}} empezando por el nº '''$2'''.",
+'showingresultsnum'                => "Abajo se {{PLURAL:$3|muestra '''1''' resultado|muestran los '''$3''' resultados}} empezando por el nº '''$2'''.",
+'showingresultstotal'              => "Debajo se {{PLURAL:$4|muestra el resultado '''$1''' de '''$3'''|muestran los resultados entre el '''$1''' y el '''$2''', de un total de '''$3'''}}.",
+'nonefound'                        => "'''Nota''': Por defecto sólo se busca en algunos espacios de nombre.
 Prueba a usar el prefijo ''all:'' para buscar en todo el contenido (incluyendo páginas de discusión, plantillas, etc.) o usa el espacio de nombre que quieras como prefijo. También puedes usar el formulario de búsqueda avanzada que aparece abajo.
 
 Las búsquedas fallidas suelen producirse al buscar palabras comunes como «la» o «de», que no están en el índice, o por especificar más de una palabra a buscar (sólo las páginas que contengan todos los términos de búsqueda aparecerán en el resultado).",
-'powersearch'               => 'Búsqueda',
-'powersearch-legend'        => 'Búsqueda avanzada',
-'powersearch-ns'            => 'Buscar en los espacios de nombres:',
-'powersearch-redir'         => 'Listar redirecciones',
-'powersearch-field'         => 'Buscar',
-'search-external'           => 'Búsqueda externa',
-'searchdisabled'            => 'Las búsquedas en {{SITENAME}} está temporalmente deshabilitadas. Mientras tanto puede buscar mediante buscadores externos, pero tenga en cuenta que sus índices relativos a {{SITENAME}} pueden estar desactualizados.',
+'search-nonefound'                 => 'No hay resultados que cumplan los criterios de búsqueda.',
+'powersearch'                      => 'Búsqueda',
+'powersearch-legend'               => 'Búsqueda avanzada',
+'powersearch-ns'                   => 'Buscar en los espacios de nombres:',
+'powersearch-redir'                => 'Listar redirecciones',
+'powersearch-field'                => 'Buscar',
+'search-external'                  => 'Búsqueda externa',
+'searchdisabled'                   => 'Las búsquedas en {{SITENAME}} está temporalmente deshabilitadas. Mientras tanto puede buscar mediante buscadores externos, pero tenga en cuenta que sus índices relativos a {{SITENAME}} pueden estar desactualizados.',
 
 # Preferences page
-'preferences'              => 'Preferencias',
-'mypreferences'            => 'Mis preferencias',
-'prefs-edits'              => 'Cantidad de ediciones:',
-'prefsnologin'             => 'No está identificado',
-'prefsnologintext'         => 'Debe estar <span class="plainlinks">[{{fullurl:Especial:UserLogin|returnto=$1}} autenticado]</span> para cambiar las preferencias de usuario.',
-'prefsreset'               => 'Las preferencias han sido restauradas a los valores por defecto.',
-'qbsettings'               => 'Preferencias de "Quickbar"',
-'qbsettings-none'          => 'Ninguna',
-'qbsettings-fixedleft'     => 'Fija a la izquierda',
-'qbsettings-fixedright'    => 'Fija a la derecha',
-'qbsettings-floatingleft'  => 'Flotante a la izquierda',
-'qbsettings-floatingright' => 'Flotante a la derecha',
-'changepassword'           => 'Cambiar la contraseña',
-'skin'                     => 'Apariencia',
-'math'                     => 'Fórmulas',
-'dateformat'               => 'Formato de fecha',
-'datedefault'              => 'Sin preferencia',
-'datetime'                 => 'Fecha y hora',
-'math_failure'             => 'No se pudo entender',
-'math_unknown_error'       => 'error desconocido',
-'math_unknown_function'    => 'función desconocida',
-'math_lexing_error'        => 'error léxico',
-'math_syntax_error'        => 'error de sintaxis',
-'math_image_error'         => 'La conversión a PNG ha fallado; comprueba que latex, dvips, gs, y convert estén instalados correctamente',
-'math_bad_tmpdir'          => 'No se puede escribir o crear el directorio temporal de <em>math</em>',
-'math_bad_output'          => 'No se puede escribir o crear el directorio de salida de <em>math</em>',
-'math_notexvc'             => 'Falta el ejecutalbe de <strong>texvc</strong>. Por favor, lea <em>math/README</em> para configurarlo.',
-'prefs-personal'           => 'Datos personales',
-'prefs-rc'                 => 'Cambios recientes',
-'prefs-watchlist'          => 'Seguimiento',
-'prefs-watchlist-days'     => 'Número de días a mostrar en la lista de seguimiento:',
-'prefs-watchlist-edits'    => 'Número de ediciones a mostrar en la lista extendida:',
-'prefs-misc'               => 'Miscelánea',
-'saveprefs'                => 'Guardar',
-'resetprefs'               => 'Restaurar preferencias por defecto',
-'oldpassword'              => 'Contraseña antigua:',
-'newpassword'              => 'Contraseña nueva:',
-'retypenew'                => 'Confirme la nueva contraseña:',
-'textboxsize'              => 'Edición',
-'rows'                     => 'Filas:',
-'columns'                  => 'Columnas:',
-'searchresultshead'        => 'Búsquedas',
-'resultsperpage'           => 'Resultados por página:',
-'contextlines'             => 'Número de líneas de contexto por resultado',
-'contextchars'             => 'Caracteres de contexto por línea',
-'stub-threshold'           => 'Límite para formato de <a href="#" class="stub">enlace a esbozo</a> (bytes):',
-'recentchangesdays'        => 'Días a mostrar en cambios recientes:',
-'recentchangescount'       => 'Número de títulos en cambios recientes',
-'savedprefs'               => 'Sus preferencias han sido grabadas.',
-'timezonelegend'           => 'Huso horario',
-'timezonetext'             => '¹Indique el número de horas de diferencia entre su hora local y la hora del servidor (UTC).',
-'localtime'                => 'Hora local',
-'timezoneoffset'           => 'Diferencia¹',
-'servertime'               => 'La hora en el servidor es',
-'guesstimezone'            => 'Rellenar a partir de la hora del navegador',
-'allowemail'               => 'Habilitar la recepción de correo de otros usuarios',
-'prefs-searchoptions'      => 'Opciones de búsqueda',
-'prefs-namespaces'         => 'Espacios de nombres',
-'defaultns'                => 'Buscar en estos espacios de nombres por defecto:',
-'default'                  => 'por defecto',
-'files'                    => 'Archivos',
+'preferences'               => 'Preferencias',
+'mypreferences'             => 'Mis preferencias',
+'prefs-edits'               => 'Cantidad de ediciones:',
+'prefsnologin'              => 'No está identificado',
+'prefsnologintext'          => 'Debe estar <span class="plainlinks">[{{fullurl:Especial:UserLogin|returnto=$1}} autenticado]</span> para cambiar las preferencias de usuario.',
+'prefsreset'                => 'Las preferencias han sido restauradas a los valores por defecto.',
+'qbsettings'                => 'Preferencias de "Quickbar"',
+'qbsettings-none'           => 'Ninguna',
+'qbsettings-fixedleft'      => 'Fija a la izquierda',
+'qbsettings-fixedright'     => 'Fija a la derecha',
+'qbsettings-floatingleft'   => 'Flotante a la izquierda',
+'qbsettings-floatingright'  => 'Flotante a la derecha',
+'changepassword'            => 'Cambiar la contraseña',
+'skin'                      => 'Apariencia',
+'skin-preview'              => 'Ver cómo queda',
+'math'                      => 'Fórmulas',
+'dateformat'                => 'Formato de fecha',
+'datedefault'               => 'Sin preferencia',
+'datetime'                  => 'Fecha y hora',
+'math_failure'              => 'No se pudo entender',
+'math_unknown_error'        => 'error desconocido',
+'math_unknown_function'     => 'función desconocida',
+'math_lexing_error'         => 'error léxico',
+'math_syntax_error'         => 'error de sintaxis',
+'math_image_error'          => 'La conversión a PNG ha fallado; comprueba que latex, dvips, gs, y convert estén instalados correctamente',
+'math_bad_tmpdir'           => 'No se puede escribir o crear el directorio temporal de <em>math</em>',
+'math_bad_output'           => 'No se puede escribir o crear el directorio de salida de <em>math</em>',
+'math_notexvc'              => 'Falta el ejecutalbe de <strong>texvc</strong>. Por favor, lea <em>math/README</em> para configurarlo.',
+'prefs-personal'            => 'Datos personales',
+'prefs-rc'                  => 'Cambios recientes',
+'prefs-watchlist'           => 'Seguimiento',
+'prefs-watchlist-days'      => 'Número de días a mostrar en la lista de seguimiento:',
+'prefs-watchlist-days-max'  => '(máximo 7 días)',
+'prefs-watchlist-edits'     => 'Número de ediciones a mostrar en la lista extendida:',
+'prefs-watchlist-edits-max' => '(máximo: 1000)',
+'prefs-misc'                => 'Miscelánea',
+'prefs-resetpass'           => 'Cambiar contraseña',
+'saveprefs'                 => 'Guardar',
+'resetprefs'                => 'Restaurar preferencias por defecto',
+'textboxsize'               => 'Edición',
+'prefs-edit-boxsize'        => 'Tamaño de la ventana de edición.',
+'rows'                      => 'Filas:',
+'columns'                   => 'Columnas:',
+'searchresultshead'         => 'Búsquedas',
+'resultsperpage'            => 'Resultados por página:',
+'contextlines'              => 'Número de líneas de contexto por resultado',
+'contextchars'              => 'Caracteres de contexto por línea',
+'stub-threshold'            => 'Límite para formato de <a href="#" class="stub">enlace a esbozo</a> (bytes):',
+'recentchangesdays'         => 'Días a mostrar en cambios recientes:',
+'recentchangesdays-max'     => '(máximo {{PLURAL:$1|un día|$1 días}})',
+'recentchangescount'        => 'Número de ediciones a mostrar en cambios recientes, historiales y registros, por defecto:',
+'savedprefs'                => 'Sus preferencias han sido grabadas.',
+'timezonelegend'            => 'Huso horario',
+'timezonetext'              => '¹Indique el número de horas de diferencia entre su hora local y la hora del servidor (UTC).',
+'localtime'                 => 'Hora local:',
+'timezoneselect'            => 'Zona horaria:',
+'timezoneuseserverdefault'  => 'Usar la hora del servidor',
+'timezoneuseoffset'         => 'Otra (especifica la diferencia horaria)',
+'timezoneoffset'            => 'Diferencia¹:',
+'servertime'                => 'Hora del servidor:',
+'guesstimezone'             => 'Rellenar a partir de la hora del navegador',
+'allowemail'                => 'Habilitar la recepción de correo de otros usuarios',
+'prefs-searchoptions'       => 'Opciones de búsqueda',
+'prefs-namespaces'          => 'Espacios de nombres',
+'defaultns'                 => 'Buscar en estos espacios de nombres por defecto:',
+'default'                   => 'por defecto',
+'files'                     => 'Archivos',
 
 # User rights
 'userrights'                  => 'Configuración de permisos de usuarios', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Configurar grupos de usuarios',
 'userrights-user-editname'    => 'Escriba un nombre de usuario:',
 'editusergroup'               => 'Modificar grupos de usuarios',
-'editinguser'                 => "Cambiando los derechos del usuario '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Cambiando los derechos del usuario '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] {{int:pipe-separator}} [[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modificar grupos de usuarios',
 'saveusergroups'              => 'Guardar grupos de usuarios',
 'userrights-groupsmember'     => 'Miembro de:',
@@ -1006,6 +1203,8 @@ Las búsquedas fallidas suelen producirse al buscar palabras comunes como «la»
 'right-minoredit'            => 'Marcar ediciones como «menores»',
 'right-move'                 => 'Trasladar páginas',
 'right-move-subpages'        => 'Trasladar páginas con sus subpáginas',
+'right-move-rootuserpages'   => 'Mover páginas del usuario raíz',
+'right-movefile'             => 'Mover archivos',
 'right-suppressredirect'     => 'No crear una redirección en el viejo nombre al trasladar una página',
 'right-upload'               => 'Subir archivos',
 'right-reupload'             => 'Subir una nueva versión de un archivo existente',
@@ -1056,9 +1255,46 @@ Las búsquedas fallidas suelen producirse al buscar palabras comunes como «la»
 'rightslogentry' => 'modificó los grupos a los que pertenece $1: de $2 a $3',
 'rightsnone'     => '(ninguno)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'leer esta página',
+'action-edit'                 => 'modificar esta página',
+'action-createpage'           => 'crear páginas',
+'action-createtalk'           => 'crear páginas de discusión',
+'action-createaccount'        => 'crear esta cuenta de usuario',
+'action-minoredit'            => 'marcar este cambio como menor',
+'action-move'                 => 'mover esta página',
+'action-move-subpages'        => 'mover esta página y sus subpáginas',
+'action-move-rootuserpages'   => 'mover páginas del usuario raíz',
+'action-movefile'             => 'mover este archivo',
+'action-upload'               => 'subir este archivo',
+'action-reupload'             => 'remplazar este archivo existente',
+'action-reupload-shared'      => 'remplazar este archivo existente en un depósito compartido',
+'action-upload_by_url'        => 'subir este archivo desde una dirección URL',
+'action-writeapi'             => 'utilizar el API de escritura',
+'action-delete'               => 'borrar esta página',
+'action-deleterevision'       => 'borrar esta revisión',
+'action-deletedhistory'       => 'ver el historial borrado de esta página',
+'action-browsearchive'        => 'buscar páginas borradas',
+'action-undelete'             => 'recuperar esta página',
+'action-suppressrevision'     => 'revisar y restaurar esta revisión escondida',
+'action-suppressionlog'       => 'ver este registro privado',
+'action-block'                => 'bloquear a este usuario para que no modifique',
+'action-protect'              => 'cambiar los niveles de protección para esta página',
+'action-import'               => 'importar esta página desde otro wiki',
+'action-importupload'         => 'importar esta página mediante la carga de un archivo',
+'action-patrol'               => 'marcar ediciones de otros como patrulladas',
+'action-autopatrol'           => 'marcar como patrulladas tus propias ediciones',
+'action-unwatchedpages'       => 'ver la lista de páginas no vigiladas',
+'action-trackback'            => 'enviar una notificación de enlace',
+'action-mergehistory'         => 'fusionar el historial de esta página',
+'action-userrights'           => 'modificar todos los derechos de usuario',
+'action-userrights-interwiki' => 'modificar los derechos de usuarios en otros wikis',
+'action-siteadmin'            => 'bloquear o desbloquear la base de datos',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|cambio|cambios}}',
 'recentchanges'                     => 'Cambios recientes',
+'recentchanges-legend'              => 'Opciones sobre cambios recientes',
 'recentchangestext'                 => 'Sigue los cambios más recientes de la wiki en esta página.',
 'recentchanges-feed-description'    => 'Seguir los cambios más recientes en el wiki en este feed.',
 'rcnote'                            => "Debajo {{PLURAL:$1|hay '''1''' cambio efectuado|están los últimos '''$1''' cambios efectuados}} en  {{PLURAL:$2|el último día|los últimos '''$2''' días}}, hasta el $4, $5.",
@@ -1082,6 +1318,8 @@ Las búsquedas fallidas suelen producirse al buscar palabras comunes como «la»
 'rc_categories'                     => 'Limitar a las categorías (separadas por «|»)',
 'rc_categories_any'                 => 'Cualquiera',
 'newsectionsummary'                 => 'Nueva sección: /* $1 */',
+'rc-enhanced-expand'                => 'Mostrar detalles (requiere JavaScript)',
+'rc-enhanced-hide'                  => 'Ocultar detalles',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cambios en enlazadas',
@@ -1102,13 +1340,13 @@ Las búsquedas fallidas suelen producirse al buscar palabras comunes como «la»
 'upload_directory_read_only'  => 'El servidor web no puede escribir en el directorio de subida de archivos ($1).',
 'uploaderror'                 => 'Error al intentar subir archivo',
 'uploadtext'                  => "Utilize el siguiente formulario para subir archivos.
-Para ver o buscar archivos subidos con anterioridad, ve a la [[Special:ImageList|lista de archivos subidos]].
+Para ver o buscar archivos subidos con anterioridad, ve a la [[Special:FileList|lista de archivos subidos]].
 Los archivos subidos quedarán registrado además en el [[Special:Log/upload|registro de archivos subidos]] y los borrados en el [[Special:Log/delete|registro de borrados]].
 
 Para incluir un archivo en una página, use un enlace como los que siguen
 
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' para usar el fichero en tamaño completo
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|texto descriptivo]]</nowiki></tt>''' para una versión de 200 pixeles de ancho en una caja en el margen izquierdo con 'texto descriptivo' como descripción
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' para usar el fichero en tamaño completo
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|texto descriptivo]]</nowiki></tt>''' para una versión de 200 pixeles de ancho en una caja en el margen izquierdo con 'texto descriptivo' como descripción
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' para enlazar directamente al fichero sin mostrarlo.",
 'upload-permitted'            => 'Tipos de archivo permitidos: $1.',
 'upload-preferred'            => 'Tipos de archivo aconsejados: $1.',
@@ -1116,7 +1354,7 @@ Para incluir un archivo en una página, use un enlace como los que siguen
 'uploadlog'                   => 'registro de subidas',
 'uploadlogpage'               => 'Subidas de archivos',
 'uploadlogpagetext'           => 'Abajo hay una lista de los últimos archivos subidos.
-Mira la [[Special:NewImages|galería de archivos nuevos]] para una descripción visual',
+Mira la [[Special:NewFiles|galería de archivos nuevos]] para una descripción visual',
 'filename'                    => 'Nombre del archivo',
 'filedesc'                    => 'Sumario',
 'fileuploadsummary'           => 'Descripción:',
@@ -1138,23 +1376,24 @@ Mira la [[Special:NewImages|galería de archivos nuevos]] para una descripción
 'large-file'                  => 'Se recomienda que los archivos no sean mayores de $1; este archivo ocupa $2.',
 'largefileserver'             => 'El tamaño de este archivo es mayor del que este servidor admite por configuración.',
 'emptyfile'                   => 'El archivo que has intentado subir parece estar vacío; por favor, verifica que realmente se trate del archivo que intentabas subir.',
-'fileexists'                  => 'Ya existe un archivo con este nombre. Por favor compruebe el existente <strong><tt>$1</tt></strong> si no está seguro de querer reemplazarlo.',
-'filepageexists'              => 'La página de descripción de este archivo ya ha sido creada en <strong><tt>$1</tt></strong>, pero no existe actualmente ningún fichero con este nombre.
-El resumen que ha ingresado no aparecerá en la página de descripción. Para que el sumario aparezca, deberá editarlo manualmente.',
-'fileexists-extension'        => 'Existe un archivo con un nombre similar:<br />
-Nombre del archivo que se está subiendo: <strong><tt>$1</tt></strong><br />
-Nombre del archivo ya existente: <strong><tt>$2</tt></strong><br />
-Por favor, elige un nombre diferente.',
+'fileexists'                  => "Ya existe un archivo con este nombre. Por favor compruebe el existente '''<tt>$1</tt>''' si no está seguro de querer reemplazarlo.",
+'filepageexists'              => "La página de descripción de este archivo ya ha sido creada en '''<tt>$1</tt>''', pero no existe actualmente ningún fichero con este nombre.
+El resumen que ha ingresado no aparecerá en la página de descripción. Para que el sumario aparezca, deberá editarlo manualmente.",
+'fileexists-extension'        => "Existe un archivo con un nombre similar:<br />
+Nombre del archivo que se está subiendo: '''<tt>$1</tt>'''<br />
+Nombre del archivo ya existente: '''<tt>$2</tt>'''<br />
+Por favor, elige un nombre diferente.",
 'fileexists-thumb'            => "<center>'''Imagen existente'''</center>",
-'fileexists-thumbnail-yes'    => 'El archivo parece ser una imagen de tamaño reducido <i>(thumbnail)</i>. Por favor comprueba el archivo <strong><tt>$1</tt></strong>.<br />
-Si el archivo comprobado es la misma imagen a tamaño original no es necesario subir un thumbnail más.',
-'file-thumbnail-no'           => 'El nombre del archivo comienza con <strong><tt>$1</tt></strong>.
-Parece ser una imagen de tamaño reducido <i>(thumbnail)</i>.
-Si tiene esta imagen a toda resolución súbala, si no, por favor cambie el nombre del archivo.',
-'fileexists-forbidden'        => 'Ya existe un archivo con este nombre. Por favor, cambie el nombre del archivo y vuelva a subirlo. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "El archivo parece ser una imagen de tamaño reducido ''(thumbnail)''. Por favor comprueba el archivo '''<tt>$1</tt>'''.<br />
+Si el archivo comprobado es la misma imagen a tamaño original no es necesario subir un thumbnail más.",
+'file-thumbnail-no'           => "El nombre del archivo comienza con '''<tt>$1</tt>'''.
+Parece ser una imagen de tamaño reducido ''(thumbnail)''.
+Si tiene esta imagen a toda resolución súbala, si no, por favor cambie el nombre del archivo.",
+'fileexists-forbidden'        => 'Ya existe un archivo con este nombre, y no puede ser grabado encima de otro. Si quiere subir su archivo de todos modos, por favor vuelva atrás y utilice otro nombre. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Ya existe un archivo con este nombre en el repositorio compartido.
-Si todavía quiere subir su archivo, por favor, regrese a la página anterior y use otro nombre. [[Image:$1|thumb|center|$1]]',
+Si todavía quiere subir su archivo, por favor, regrese a la página anterior y use otro nombre. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Este archivo es un duplicado {{PLURAL:$1|del siguiente|de los siguientes}}:',
+'file-deleted-duplicate'      => 'Un archivo idéntico a este ([[$1]]) ha sido borrado con anterioridad. Debes comprobar el historial de borrado del archivo ante de volver a subirlo.',
 'successfulupload'            => 'Subida con éxito',
 'uploadwarning'               => 'Advertencia de subida de archivo',
 'savefile'                    => 'Guardar archivo',
@@ -1174,9 +1413,9 @@ Si todavía quiere subir su archivo, por favor, regrese a la página anterior y
 
 Debería considerar si resulta apropiado continuar cargándolo.
 A continuación se muestra el registro de borrado de este archivo:",
-'filename-bad-prefix'         => 'El nombre del archivo que estás subiendo comienza por <strong>«$1»</strong>, un nombre nada descriptivo de su contenido. Es un típico nombre de los que asignan automáticamente las cámaras digitales.
+'filename-bad-prefix'         => "El nombre del archivo que estás subiendo comienza por '''«$1»''', un nombre nada descriptivo de su contenido. Es un típico nombre de los que asignan automáticamente las cámaras digitales.
 
-Por favor, elige un nombre más descriptivo.',
+Por favor, elige un nombre más descriptivo.",
 
 'upload-proto-error'      => 'Protocolo incorrecto',
 'upload-proto-error-text' => 'Para subir archivos desde otra página la URL debe comenzar por <code>http://</code> o <code>ftp://</code>.',
@@ -1197,20 +1436,21 @@ Por favor, elige un nombre más descriptivo.',
 'upload_source_url'  => ' (una URL válida y accesible públicamente)',
 'upload_source_file' => ' (un archivo en su ordenador)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Esta página muestra todos los archivos subidos.
+# Special:ListFiles
+'listfiles-summary'     => 'Esta página muestra todos los archivos subidos.
 Por defecto, el último subido se muestra al principio de la lista.
 Un click sobre el encabezamiento de la columna cambia el orden.',
-'imagelist_search_for'  => 'Buscar por nombre de imagen:',
+'listfiles_search_for'  => 'Buscar por nombre de imagen:',
 'imgfile'               => 'archivo',
-'imagelist'             => 'Lista de archivos',
-'imagelist_date'        => 'Fecha',
-'imagelist_name'        => 'Nombre',
-'imagelist_user'        => 'Usuario',
-'imagelist_size'        => 'Tamaño (bytes)',
-'imagelist_description' => 'Descripción',
-
-# Image description page
+'listfiles'             => 'Lista de archivos',
+'listfiles_date'        => 'Fecha',
+'listfiles_name'        => 'Nombre',
+'listfiles_user'        => 'Usuario',
+'listfiles_size'        => 'Tamaño (bytes)',
+'listfiles_description' => 'Descripción',
+'listfiles_count'       => 'Versiones',
+
+# File description page
 'filehist'                       => 'Historial del archivo',
 'filehist-help'                  => 'Haga clic sobre una fecha/hora para ver el
 archivo a esa fecha.',
@@ -1219,19 +1459,26 @@ archivo a esa fecha.',
 'filehist-revert'                => 'revertir',
 'filehist-current'               => 'act',
 'filehist-datetime'              => 'Fecha/Hora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura de la versión de $1',
+'filehist-nothumb'               => 'Sin miniatura',
 'filehist-user'                  => 'Usuario',
 'filehist-dimensions'            => 'Dimensiones',
 'filehist-filesize'              => 'Tamaño',
 'filehist-comment'               => 'Comentario',
-'imagelinks'                     => 'Enlaces a la imagen',
+'imagelinks'                     => 'Enlaces al archivo',
 'linkstoimage'                   => '{{PLURAL:$1|La siguiente página enlaza|Las siguientes páginas enlazan}} a este archivo:',
+'linkstoimage-more'              => 'Hay más de {{PLURAL:$1|una página que enlaza|$1 páginas que enlazan}} con este fichero.
+ 
+La lista siguiente sólo muestra {{PLURAL:$1|la primera página que enlaza|las primeras $1 páginas que enlazan}} con este fichero.
+También puedes consultar la [[Special:WhatLinksHere/$2|lista completa]].',
 'nolinkstoimage'                 => 'No hay páginas que enlacen a esta imagen.',
 'morelinkstoimage'               => 'Vea [[Special:WhatLinksHere/$1|más enlaces]] a este archivo.',
 'redirectstofile'                => '{{PLURAL:$1|El siguiente fichero redirige|Los siguientes $1 ficheros redirigen}} a este:',
-'duplicatesoffile'               => '{{PLURAL:$1|El siguiente archivo es un duplicado|Los siguientes $1 archivos son duplicados}} de este:',
+'duplicatesoffile'               => 'Los siguientes {{PLURAL:$1|es un archivo duplicado|$1 archivos son duplicados}} de éste archivo ([[Special:FileDuplicateSearch/$2|mas detalles]]):',
 'sharedupload'                   => 'Este archivo está compartido y puede usarse desde otros proyectos.',
 'shareduploadwiki'               => 'Puede consultar $1 para más información.',
-'shareduploadwiki-desc'          => 'A continuación se muestra la descripción sobre su $1 del depósito compartido.',
+'shareduploadwiki-desc'          => 'La descripcion en su $1 hay mostrada debajo.',
 'shareduploadwiki-linktext'      => 'página de descripción del archivo',
 'shareduploadduplicate'          => 'Este archivo es un duplicado de $1 del depósito compartido.',
 'shareduploadduplicate-linktext' => 'otro fichero',
@@ -1255,7 +1502,7 @@ archivo a esa fecha.',
 # File deletion
 'filedelete'                  => 'Borrar $1',
 'filedelete-legend'           => 'Borrar archivo',
-'filedelete-intro'            => "Estás borrando '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Estás borrando el archivo '''[[Media:$1|$1]]''' así como todo su historial.",
 'filedelete-intro-old'        => "Estás borrando la versión de '''[[Media:$1|$1]]''' del [$4 $2 a las $3].",
 'filedelete-comment'          => 'Motivo:',
 'filedelete-submit'           => 'Borrar',
@@ -1263,7 +1510,6 @@ archivo a esa fecha.',
 'filedelete-success-old'      => "La version de '''[[Media:$1|$1]]''' del $2 a las $3 ha sido borrada.",
 'filedelete-nofile'           => "'''$1''' no existe.",
 'filedelete-nofile-old'       => "No existe una versión guardada de '''$1''' con los atributos especificados.",
-'filedelete-iscurrent'        => 'Estás intentando borrar la última versión de este fichero. Por favor, revierte primero a una versión anterior.',
 'filedelete-otherreason'      => 'Otra razón:',
 'filedelete-reason-otherlist' => 'Otra razón',
 'filedelete-reason-dropdown'  => '*Razones de borrado habituales
@@ -1291,29 +1537,31 @@ Entrada: contenttype/subtype, p. ej. <tt>image/jpeg</tt>.',
 
 # Random page
 'randompage'         => 'Página aleatoria',
-'randompage-nopages' => 'No hay páginas en este espacio de nombres.',
+'randompage-nopages' => 'No hay páginas en el espacio de nombres «$1».',
 
 # Random redirect
 'randomredirect'         => 'Ir a una redirección cualquiera',
-'randomredirect-nopages' => 'No hay redirecciones en este espacio de nombres.',
+'randomredirect-nopages' => 'No hay redirecciones en el espacio de nombres «$1».',
 
 # Statistics
-'statistics'             => 'Estadísticas',
-'sitestats'              => 'Estadísticas de {{SITENAME}}',
-'userstats'              => 'Estadísticas de usuario',
-'sitestatstext'          => "Hay un total de {{PLURAL:$1|'''1''' página|'''$1''' páginas}} en la base de datos.
-Esto incluye páginas de discusión, páginas sobre {{SITENAME}}, esbozos mínimos, redirecciones y otras que probablemente no puedan ser consideradas páginas de contenidos.
-Excluyéndolas, hay {{PLURAL:$2|1 página que, probablemente sea una página|'''$2''' páginas que, probablemente, sean páginas}} de contenido legítimo.
-
-Hay '''$8''' {{PLURAL:$8|archivo almacenado|archivos almacenados}} en el servidor.
-
-Desde la instalación del wiki ha habido un total de '''$3''' {{PLURAL:$3|visita|visitas}} y '''$4''' {{PLURAL:$4|edición de página|ediciones de páginas}}.
-Esto resulta en un promedio de '''$5''' {{PLURAL:$5|edición|ediciones}} por página y '''$6''' {{PLURAL:$6|visita|visitas}} por edición.
-
-La longitud de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola de tareas] es de '''$7'''",
-'userstatstext'          => "Hay {{PLURAL:$1|'''1''' usuario registrado|'''$1''' usuarios registrados}},
-de los cuales '''$2''' (el '''$4%''') tienen privilegios de $5.",
-'statistics-mostpopular' => 'Páginas más vistas',
+'statistics'                   => 'Estadísticas',
+'statistics-header-pages'      => 'Estadísticas de páginas',
+'statistics-header-edits'      => 'Estadísticas de ediciones',
+'statistics-header-views'      => 'Estadísticas de visitas',
+'statistics-header-users'      => 'Estadísticas de usuario',
+'statistics-articles'          => 'Páginas de contenido',
+'statistics-pages'             => 'Páginas',
+'statistics-pages-desc'        => 'Todas las páginas de la wiki, incluyendo discusiones, redirecciones, etc.',
+'statistics-files'             => 'Ficheros subidos',
+'statistics-edits'             => 'Ediciones en páginas desde que {{SITENAME}} fue instalado',
+'statistics-edits-average'     => 'Media de ediciones por página',
+'statistics-views-total'       => 'Visitas totales',
+'statistics-views-peredit'     => 'Visitas por edición',
+'statistics-jobqueue'          => 'Longitud de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola de trabajo]',
+'statistics-users'             => '[[Special:ListUsers|Usuarios]] registrados',
+'statistics-users-active'      => 'Usuarios activos',
+'statistics-users-active-desc' => 'Usuarios que han ejecutado una acción en {{PLURAL:$1|el último día|los últimos $1 días}}',
+'statistics-mostpopular'       => 'Páginas más vistas',
 
 'disambiguations'      => 'Páginas de desambiguación',
 'disambiguationspage'  => 'Template:Desambiguación',
@@ -1328,7 +1576,7 @@ Cada fila contiene enlaces al segundo y tercer redirect, así como la primera lÃ
 'double-redirect-fixer'      => 'Corrector de redirecciones',
 
 'brokenredirects'        => 'Redirecciones incorrectas',
-'brokenredirectstext'    => 'Las redirecciones siguientes enlazan a un artículo que no existe.',
+'brokenredirectstext'    => 'Las siguientes redirecciones enlazan a páginas que no existen:',
 'brokenredirects-edit'   => '(editar)',
 'brokenredirects-delete' => '(borrar)',
 
@@ -1358,26 +1606,30 @@ Cada fila contiene enlaces al segundo y tercer redirect, así como la primera lÃ
 'popularpages'            => 'Páginas populares',
 'wantedcategories'        => 'Categorías requeridas',
 'wantedpages'             => 'Páginas requeridas',
-'missingfiles'            => 'Ficheros que faltan',
+'wantedfiles'             => 'Ficheros requeridos',
+'wantedtemplates'         => 'Plantillas requeridas',
 'mostlinked'              => 'Artículos más enlazados',
 'mostlinkedcategories'    => 'Categorías más enlazadas',
 'mostlinkedtemplates'     => 'Plantillas más enlazadas',
 'mostcategories'          => 'Páginas con más categorías',
 'mostimages'              => 'Imágenes más usadas',
 'mostrevisions'           => 'Artículos con más ediciones',
-'prefixindex'             => 'Páginas por prefijo',
+'prefixindex'             => 'Todas las páginas con prefijo',
 'shortpages'              => 'Páginas cortas',
 'longpages'               => 'Páginas largas',
 'deadendpages'            => 'Páginas sin salida',
 'deadendpagestext'        => 'Las siguientes páginas no enlazan a otras páginas de {{SITENAME}}.',
 'protectedpages'          => 'Páginas protegidas',
 'protectedpages-indef'    => 'Sólo protecciones infinitas',
+'protectedpages-cascade'  => 'Sólo protecciones en cascada',
 'protectedpagestext'      => 'Las siguientes páginas están protegidas para su edición o traslado',
 'protectedpagesempty'     => 'Actualmente no hay ninguna página protegida con esos parámetros.',
 'protectedtitles'         => 'Títulos protegidos',
 'protectedtitlestext'     => 'Los siguientes títulos están protegidos, por lo que no se pueden crear',
 'protectedtitlesempty'    => 'Actualmente no existen entradas protegidas con esos parámetros.',
 'listusers'               => 'Lista de usuarios',
+'listusers-editsonly'     => 'Muestra sólo usuarios con ediciones',
+'usereditcount'           => '$1 {{PLURAL:$1|edición|ediciones}}',
 'newpages'                => 'Páginas nuevas',
 'newpages-username'       => 'Nombre de usuario',
 'ancientpages'            => 'Artículos más antiguos',
@@ -1398,14 +1650,13 @@ Cada fila contiene enlaces al segundo y tercer redirect, así como la primera lÃ
 'booksources-search-legend' => 'Buscar fuentes de libros',
 'booksources-go'            => 'Ir',
 'booksources-text'          => 'Abajo hay una lista de enlaces a otros sitios que venden libros nuevos y usados, puede que contengan más información sobre los libros que estás buscando.',
+'booksources-invalid-isbn'  => 'El número de ISBN no parece ser válido; comprueba los errores copiándolo de la fuente original.',
 
 # Special:Log
 'specialloguserlabel'  => 'Usuario:',
 'speciallogtitlelabel' => 'Título:',
 'log'                  => 'Registros',
 'all-logs-page'        => 'Todos los registros',
-'log-search-legend'    => 'Buscar registros',
-'log-search-submit'    => 'Ir',
 'alllogstext'          => 'Vista combinada de todos los registros de {{SITENAME}}.
 Puedes filtrar la vista seleccionando un tipo de registro, el nombre del usuario o la página afectada. Se distinguen mayúsculas de minúsculas.',
 'logempty'             => 'No hay elementos en el registro con esas condiciones.',
@@ -1417,6 +1668,7 @@ Puedes filtrar la vista seleccionando un tipo de registro, el nombre del usuario
 'nextpage'          => 'Siguiente página ($1)',
 'prevpage'          => 'Página anterior ($1)',
 'allpagesfrom'      => 'Mostrar páginas que empiecen por:',
+'allpagesto'        => 'Mostrar páginas terminadas con:',
 'allarticles'       => 'Todos los artículos',
 'allinnamespace'    => 'Todas las páginas (espacio $1)',
 'allnotinnamespace' => 'Todas las páginas que no están en el espacio de nombres $1',
@@ -1436,41 +1688,69 @@ Véase también las [[Special:WantedCategories|categorías requeridas]].',
 'special-categories-sort-count' => 'ordenar por conteo',
 'special-categories-sort-abc'   => 'ordenar alfabéticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribuciones de usuario borradas',
+
+# Special:LinkSearch
+'linksearch'       => 'Enlaces externos',
+'linksearch-pat'   => 'Patrón de búsqueda:',
+'linksearch-ns'    => 'Nombre de espacio:',
+'linksearch-ok'    => 'Buscar',
+'linksearch-text'  => 'Se pueden usar comodines como  «*.wikipedia.org».<br />
+Protocolos soportados: <tt>$1</tt>',
+'linksearch-line'  => '$1 enlazado desde $2',
+'linksearch-error' => 'Los comodines sólo pueden aparecer al principio del nombre de sitio.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostrar usuarios que empiecen por:',
 'listusers-submit'   => 'Mostrar',
 'listusers-noresult' => 'No se encontró al usuario.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Registro de creación de usuarios',
+'newuserlogpagetext'          => 'Este es un registro de creación de usuarios.',
+'newuserlog-byemail'          => 'contraseña enviada por correo electrónico',
+'newuserlog-create-entry'     => 'Usuario nuevo',
+'newuserlog-create2-entry'    => 'Nueva cuenta creada $1',
+'newuserlog-autocreate-entry' => 'Cuenta creada automáticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Permisos del grupo de usuarios',
-'listgrouprights-summary'  => 'La siguiente es una lista de los grupos de usuario definidos en esta wiki y de sus privilegios de acceso asociados.
+'listgrouprights'                 => 'Permisos del grupo de usuarios',
+'listgrouprights-summary'         => 'La siguiente es una lista de los grupos de usuario definidos en esta wiki y de sus privilegios de acceso asociados.
 Puede haber información adicional sobre privilegios individuales en [[{{MediaWiki:Listgrouprights-helppage}}]]',
-'listgrouprights-group'    => 'Grupo',
-'listgrouprights-rights'   => 'Derechos',
-'listgrouprights-helppage' => 'Help:Derechos de grupos',
-'listgrouprights-members'  => '(ver los miembros de este grupo)',
+'listgrouprights-group'           => 'Grupo',
+'listgrouprights-rights'          => 'Derechos',
+'listgrouprights-helppage'        => 'Help:Derechos de grupos',
+'listgrouprights-members'         => '(ver los miembros de este grupo)',
+'listgrouprights-addgroup'        => 'Puede agregar {{PLURAL:$2|grupo|grupos}}: $1',
+'listgrouprights-removegroup'     => 'Puede eliminar {{PLURAL:$2|grupo|grupos}}: $1',
+'listgrouprights-addgroup-all'    => 'Puede agregar todos los grupos',
+'listgrouprights-removegroup-all' => 'Puede eliminar todos los grupos',
 
 # E-mail user
-'mailnologin'     => 'Ninguna dirección de envio',
-'mailnologintext' => 'Debes [[Special:UserLogin|iniciar sesión]] y tener una dirección electrónica válida en tus [[Special:Preferences|preferencias]] para enviar un correo electrónico a otros usuarios.',
-'emailuser'       => 'Enviar correo electrónico a este usuario',
-'emailpage'       => 'Correo electrónico a usuario',
-'emailpagetext'   => 'Puedes usar el formulario de abajo para enviar un correo electrónico a este usuario.
+'mailnologin'      => 'Ninguna dirección de envio',
+'mailnologintext'  => 'Debes [[Special:UserLogin|iniciar sesión]] y tener una dirección electrónica válida en tus [[Special:Preferences|preferencias]] para enviar un correo electrónico a otros usuarios.',
+'emailuser'        => 'Enviar correo electrónico a este usuario',
+'emailpage'        => 'Correo electrónico a usuario',
+'emailpagetext'    => 'Puedes usar el formulario de abajo para enviar un correo electrónico a este usuario.
 La dirección electrónica que indicaste en [[Special:Preferences|tus preferencias de usuario]] aparecerá en el remitente para que el destinatario pueda responderte.',
-'usermailererror' => 'El sistema de correo devolvió un error:',
-'defemailsubject' => 'Correo de {{SITENAME}}',
-'noemailtitle'    => 'No hay dirección de correo electrónico',
-'noemailtext'     => 'Este usuario no ha especificado una dirección de correo electrónico válida, o ha elegido no recibir correo electrónico de otros usuarios.',
-'emailfrom'       => 'De:',
-'emailto'         => 'Para:',
-'emailsubject'    => 'Asunto:',
-'emailmessage'    => 'Mensaje:',
-'emailsend'       => 'Enviar',
-'emailccme'       => 'Enviarme una copia de mi mensaje.',
-'emailccsubject'  => 'Copia de tu mensaje a $1: $2',
-'emailsent'       => 'Correo electrónico enviado',
-'emailsenttext'   => 'Su correo electrónico ha sido enviado.',
-'emailuserfooter' => 'Este correo electrónico fue enviado por $1 a $2 a través de la función «Enviar correo electrónico a este usuario» en {{SITENAME}}.',
+'usermailererror'  => 'El sistema de correo devolvió un error:',
+'defemailsubject'  => 'Correo de {{SITENAME}}',
+'noemailtitle'     => 'No hay dirección de correo electrónico',
+'noemailtext'      => 'Este usuario no ha especificado una dirección de correo electrónico válida.',
+'nowikiemailtitle' => 'correos electrónicos no permitidos',
+'nowikiemailtext'  => 'Este usuario ha elegido no recibir correos electrónicos de otros usuarios.',
+'email-legend'     => 'Enviar un correo electrónico a otro usuario de {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'Para:',
+'emailsubject'     => 'Asunto:',
+'emailmessage'     => 'Mensaje:',
+'emailsend'        => 'Enviar',
+'emailccme'        => 'Enviarme una copia de mi mensaje.',
+'emailccsubject'   => 'Copia de tu mensaje a $1: $2',
+'emailsent'        => 'Correo electrónico enviado',
+'emailsenttext'    => 'Su correo electrónico ha sido enviado.',
+'emailuserfooter'  => 'Este correo electrónico fue enviado por $1 a $2 a través de la función «Enviar correo electrónico a este usuario» en {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Lista de seguimiento',
@@ -1481,7 +1761,9 @@ La dirección electrónica que indicaste en [[Special:Preferences|tus preferenci
 'watchnologin'         => 'No ha iniciado sesión',
 'watchnologintext'     => 'Debes [[Special:UserLogin|iniciar sesión]] para modificar tu lista de seguimiento.',
 'addedwatch'           => 'Añadido a la lista de seguimiento',
-'addedwatchtext'       => "La página «[[:$1]]» ha sido añadida a tu [[Special:Watchlist|lista se seguimiento]]. Los cambios futuros en esta página y en su página de discusión asociada se indicarán ahí, y la página aparecerá '''en negritas''' en la [[Special:RecentChanges|lista de cambios recientes]] para hacerla más fácil de detectar. <p>Cuando quieras eliminar la página de tu lista de seguimiento, presiona «Dejar de vigilar» en el menú.",
+'addedwatchtext'       => "La página «[[:$1]]» ha sido añadida a tu [[Special:Watchlist|lista de seguimiento]]. Los cambios futuros en esta página y en su página de discusión asociada se indicarán ahí, y la página aparecerá '''en negritas''' en la [[Special:RecentChanges|lista de cambios recientes]] para hacerla más fácil de detectar.
+
+Cuando quieras eliminar la página de tu lista de seguimiento, presiona «Dejar de vigilar» en el menú.",
 'removedwatch'         => 'Eliminada de la lista de seguimiento',
 'removedwatchtext'     => 'La página «[[:$1]]» ha sido eliminada de tu [[Special:Watchlist|lista de seguimiento]].',
 'watch'                => 'Vigilar',
@@ -1500,12 +1782,7 @@ La dirección electrónica que indicaste en [[Special:Preferences|tus preferenci
 'iteminvalidname'      => "Problema con el artículo '$1', nombre inválido...",
 'wlnote'               => "A continuación {{PLURAL:$1|se muestra el último cambio|se muestran los últimos '''$1''' cambios}} en {{PLURAL:$2|la última hora|las últimas '''$2''' horas}}.",
 'wlshowlast'           => 'Ver los cambios de las últimas $1 horas, $2 días  $3',
-'watchlist-show-bots'  => 'Mostrar ediciones de bots',
-'watchlist-hide-bots'  => 'Ocultar ediciones de bots',
-'watchlist-show-own'   => 'Mostrar mis ediciones',
-'watchlist-hide-own'   => 'Ocultar mis ediciones',
-'watchlist-show-minor' => 'Mostrar ediciones menores',
-'watchlist-hide-minor' => 'Esconder ediciones menores',
+'watchlist-options'    => 'Opciones de la lista de seguimiento',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vigilando...',
@@ -1545,81 +1822,100 @@ páginas vigiladas.
 Cambie las opciones de su lista de seguimiento en:
 {{fullurl:Special:Watchlist|edit=yes}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Borrar esta página',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "El contenido era: '$1'",
-'excontentauthor'             => "El contenido era: '$1' (y el único autor fue '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "El contenido antes de blanquear era: '$1'",
-'exblank'                     => 'página estaba vacía',
-'delete-confirm'              => 'Borrar "$1"',
-'delete-legend'               => 'Borrar',
-'historywarning'              => 'Atención: La página que está a punto de borrar tiene un historial:',
-'confirmdeletetext'           => 'Estás a punto de borrar una página
+# Delete
+'deletepage'             => 'Borrar esta página',
+'confirm'                => 'Confirmar',
+'excontent'              => "El contenido era: '$1'",
+'excontentauthor'        => "El contenido era: '$1' (y el único autor fue '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "El contenido antes de blanquear era: '$1'",
+'exblank'                => 'página estaba vacía',
+'delete-confirm'         => 'Borrar "$1"',
+'delete-legend'          => 'Borrar',
+'historywarning'         => 'Atención: La página que está a punto de borrar tiene un historial:',
+'confirmdeletetext'      => 'Estás a punto de borrar una página
 en forma permanente,
 así como todo su historial, de la base de datos.
 Por favor, confirma que realmente quieres hacer eso, que entiendes las
 consecuencias, y que lo estás haciendo de acuerdo con [[{{MediaWiki:Policy-url}}|Políticas]].',
-'actioncomplete'              => 'Acción realizada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ha sido borrado.
+'actioncomplete'         => 'Acción realizada',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ha sido borrado.
 Véase $2 para un registro de los borrados recientes.',
-'deletedarticle'              => '«[[$1]]» borrado',
-'suppressedarticle'           => 'se ha suprimido «[[$1]]»',
-'dellogpage'                  => 'Registro de borrados',
-'dellogpagetext'              => 'A continuación se muestra una lista de los borrados más recientes.',
-'deletionlog'                 => 'registro de borrados',
-'reverted'                    => 'Recuperar una revisión anterior',
-'deletecomment'               => 'Motivo del borrado',
-'deleteotherreason'           => 'Otra razón:',
-'deletereasonotherlist'       => 'Otra razón',
-'deletereason-dropdown'       => '*Razones comunes de borrado
+'deletedarticle'         => '«[[$1]]» borrado',
+'suppressedarticle'      => 'se ha suprimido «[[$1]]»',
+'dellogpage'             => 'Registro de borrados',
+'dellogpagetext'         => 'A continuación se muestra una lista de los borrados más recientes.',
+'deletionlog'            => 'registro de borrados',
+'reverted'               => 'Recuperar una revisión anterior',
+'deletecomment'          => 'Motivo del borrado',
+'deleteotherreason'      => 'Otra razón:',
+'deletereasonotherlist'  => 'Otra razón',
+'deletereason-dropdown'  => '*Razones comunes de borrado
 ** A petición del mismo autor
 ** Violación de copyright
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Editar razones de borrado',
-'delete-toobig'               => 'Esta página tiene un historial muy grande, con más de $1 {{PLURAL:$1|revisión|revisiones}}. Borrar este tipo de páginas ha sido restringido para prevenir posibles problemas en {{SITENAME}}.',
-'delete-warning-toobig'       => 'Esta página tiene un historial de más de {{PLURAL:$1|revisión|revisiones}}. Eliminarla puede perturbar las operaciones de la base de datos de {{SITENAME}}. Ten cuidado al borrar.',
-'rollback'                    => 'Revertir ediciones',
-'rollback_short'              => 'Revertir',
-'rollbacklink'                => 'Revertir',
-'rollbackfailed'              => 'No se pudo revertir',
-'cantrollback'                => 'No se pueden revertir las ediciones; el último colaborador es el único autor de esta página.',
-'alreadyrolled'               => 'No se puede revertir la última edición de [[:$1]] hecha por [[User:$2|$2]] ([[User talk:$2|discusión]] | [[Special:Contributions/$2|{{int:contribslink}}]]); alguien más ya ha editado o revertido esa página.
-
-La última edición fue hecha por [[User:$3|$3]] ([[User talk:$3|discusión]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'El resumen de la edición es: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Revertidas las ediciones de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discusión]]) a la última edición de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Revertidas las ediciones de $1; recuperada la última versión de $2.',
-'sessionfailure'              => 'Parece que hay un problema con tu sesión;
+'delete-edit-reasonlist' => 'Editar razones de borrado',
+'delete-toobig'          => 'Esta página tiene un historial muy grande, con más de $1 {{PLURAL:$1|revisión|revisiones}}. Borrar este tipo de páginas ha sido restringido para prevenir posibles problemas en {{SITENAME}}.',
+'delete-warning-toobig'  => 'Esta página tiene un historial de más de {{PLURAL:$1|revisión|revisiones}}. Eliminarla puede perturbar las operaciones de la base de datos de {{SITENAME}}. Ten cuidado al borrar.',
+
+# Rollback
+'rollback'         => 'Revertir ediciones',
+'rollback_short'   => 'Revertir',
+'rollbacklink'     => 'Revertir',
+'rollbackfailed'   => 'No se pudo revertir',
+'cantrollback'     => 'No se pueden revertir las ediciones; el último colaborador es el único autor de esta página.',
+'alreadyrolled'    => 'No se puede revertir la última edición de [[:$1]] hecha por [[User:$2|$2]] ([[User talk:$2|discusión]] {{int:pipe-separator}} [[Special:Contributions/$2|{{int:contribslink}}]]); alguien más ya ha editado o revertido esa página.
+
+La última edición fue hecha por [[User:$3|$3]] ([[User talk:$3|discusión]] {{int:pipe-separator}} [[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "El resumen de la edición fue: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Revertidas las ediciones de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discusión]]) a la última edición de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Revertidas las ediciones de $1; recuperada la última versión de $2.',
+'sessionfailure'   => 'Parece que hay un problema con tu sesión;
 esta acción ha sido cancelada como medida de precaución contra secuestros de sesión.
 Por favor, pulsa "Atrás", recarga la página de la que viniste e inténtalo de nuevo.',
+
+# Protect
 'protectlogpage'              => 'Protecciones de páginas',
 'protectlogtext'              => 'Abajo se presenta una lista de protección y desprotección de página. Véase [[Special:ProtectedPages|Esta página está protegida]] para más información.',
 'protectedarticle'            => '«[[$1]]» protegido',
 'modifiedarticleprotection'   => 'cambiado el nivel de protección de «[[$1]]»',
 'unprotectedarticle'          => 'desprotegió [[$1]]',
+'movedarticleprotection'      => 'cambiadas protecciones de «[[$2]]» a «[[$1]]»',
 'protect-title'               => 'Cambiando el nivel de protección de «$1»',
+'prot_1movedto2'              => 'heredando la protección al trasladar [[$1]] a [[$2]]',
 'protect-legend'              => 'Confirmar protección',
 'protectcomment'              => 'Comentario:',
 'protectexpiry'               => 'Caducidad:',
 'protect_expiry_invalid'      => 'Tiempo de caducidad incorrecto.',
 'protect_expiry_old'          => 'El tiempo de expiración está en el pasado.',
 'protect-unchain'             => 'Configurar permisos para traslados',
-'protect-text'                => 'Puedes ver y modificar el nivel de protección de la página <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'No puede cambiar los niveles de protección estando bloqueado. A continuación se muestran las opciones actuales de la página <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Los niveles de protección no se pueden cambiar debido a un bloqueo activo de la base de datos.
-A continuación se muestran las opciones actuales de la página <strong>$1</strong>:',
-'protect-locked-access'       => 'Su cuenta no tiene permiso para cambiar los niveles de protección de una página.
-A continuación se muestran las opciones actuales de la página <strong>$1</strong>:',
+'protect-text'                => "Puedes ver y modificar el nivel de protección de la página '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "No puede cambiar los niveles de protección estando bloqueado. A continuación se muestran las opciones actuales de la página '''$1''':",
+'protect-locked-dblock'       => "Los niveles de protección no se pueden cambiar debido a un bloqueo activo de la base de datos.
+A continuación se muestran las opciones actuales de la página '''$1''':",
+'protect-locked-access'       => "Su cuenta no tiene permiso para cambiar los niveles de protección de una página.
+A continuación se muestran las opciones actuales de la página '''$1''':",
 'protect-cascadeon'           => 'Actualmente esta página está protegida porque está incluida en {{PLURAL:$1|la siguiente página|las siguientes páginas}}, que tienen activada la opción de protección en cascada. Puedes cambiar el nivel de protección de esta página, pero no afectará a la protección en cascada.',
-'protect-default'             => '(por defecto)',
+'protect-default'             => 'Permitir todos los usuarios',
 'protect-fallback'            => 'Necesita el permiso «$1»',
-'protect-level-autoconfirmed' => 'Bloquear usuarios no registrados',
+'protect-level-autoconfirmed' => 'Bloquear usuarios nuevos y no registrados',
 'protect-level-sysop'         => 'Sólo administradores',
 'protect-summary-cascade'     => 'en cascada',
 'protect-expiring'            => 'caduca el $1 (UTC)',
+'protect-expiry-indefinite'   => 'indefinido',
 'protect-cascade'             => 'Protección en cascada - proteger todas las páginas incluidas en ésta.',
 'protect-cantedit'            => 'No puedes cambiar el nivel de protección porque no tienes permiso para hacer ediciones.',
+'protect-othertime'           => 'Especificar caducidad:',
+'protect-othertime-op'        => 'otra (especificar)',
+'protect-existing-expiry'     => 'Fecha de caducidad actual: $2 a las $3',
+'protect-otherreason'         => 'Otra razón:',
+'protect-otherreason-op'      => 'otra razón',
+'protect-dropdown'            => '*Razones de protección habituales
+**Vandalismo excesivo
+**Spam excesivo
+**Guerra de ediciones
+**Página muy visitada',
+'protect-edit-reasonlist'     => 'Editar las razones de protección',
+'protect-expiry-options'      => '2 horas:2 hours,1 día:1 day,3 días:3 days,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 año:1 year,Para siempre:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permiso:',
 'restriction-level'           => 'Nivel de restricción:',
 'minimum-size'                => 'Tamaño mínimo',
@@ -1642,7 +1938,8 @@ A continuación se muestran las opciones actuales de la página <strong>$1</stro
 'undeletepage'                 => 'Ver y restaurar páginas borradas',
 'undeletepagetitle'            => "'''Las siguientes son las revisiones borradas de [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Ver páginas borradas',
-'undeletepagetext'             => 'Las siguientes páginas han sido borradas pero aún están en el archivo y pueden ser restauradas. El archivo se puede limpiar periódicamente.',
+'undeletepagetext'             => '{{PLURAL:$1|La siguiente página ha sido borrada pero aún está en el archivo y puede ser restaurada.|Las siguientes $1 páginas han sido borradas pero aún están en el archivo y pueden ser restauradas.}}
+Puede que el archivo se limpie periódicamente.',
 'undelete-fieldset-title'      => 'Restaurar revisiones',
 'undeleteextrahelp'            => "Para restaurar todas las revisiones, deja todas las casillas sin seleccionar y pulsa '''''Restaurar'''''. Para restaurar sólo algunas revisiones, marca las revisiones que quieres restaurar y pulsa '''''Restaurar'''''. Haciendo clic en al botón '''''Cancelar''''', se deseleccionarán todas las casillas y eliminará el comentario que hayas escrito.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|revisión|revisiones}} archivadas',
@@ -1650,13 +1947,14 @@ A continuación se muestran las opciones actuales de la página <strong>$1</stro
 Si una nueva página con el mismo nombre ha sido creada desde que se borró la original, las versiones restauradas aparecerán como historial anterior, y la revisión actual de la página actual no se reemplazará automáticamente.',
 'undeleterevdel'               => 'No se deshará el borrado si éste resulta en el borrado parcial de la última revisión de la página. En tal caso, desmarque o muestre las revisiones borradas más recientes. Las revisiones de archivos que no tiene permitido ver no se restaurarán.',
 'undeletehistorynoadmin'       => 'El artículo ha sido borrado. La razón de su eliminación se indica abajo en el resumen, así como los detalles de las ediciones realizadas antes del borrado. El texto completo del artículo está disponible sólo para usuarios con permisos de administrador.',
-'undelete-revision'            => 'Edición borrada de $1 (fechada $2)  por $3',
+'undelete-revision'            => 'Edición borrada de $1 (fechada $4, a $5) por $3:',
 'undeleterevision-missing'     => 'Revisión no válida o perdida. Puede deberse a un enlace incorrecto,
 o a que la revisión haya sido restaurada o eliminada del archivo.',
 'undelete-nodiff'              => 'No existe una revisión previa.',
 'undeletebtn'                  => 'Restaurar',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Cancelar',
+'undeleteinvert'               => 'Invertir selección',
 'undeletecomment'              => 'Razón para restaurar:',
 'undeletedarticle'             => 'restauró "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|Una edición restaurada|$1 ediciones restauradas}}',
@@ -1689,26 +1987,27 @@ $1',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contribuciones del usuario',
-'mycontris'     => 'Mis contribuciones',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'No se encontraron cambios que cumplieran estos criterios.',
-'uctop'         => ' (última modificación)',
-'month'         => 'Desde el mes (y anterior):',
-'year'          => 'Desde el año (y anterior):',
-
-'sp-contributions-newbies'     => 'Mostrar solo las contribuciones de usuarios nuevos',
-'sp-contributions-newbies-sub' => 'Para cuentas nuevas',
-'sp-contributions-blocklog'    => 'Registro de bloqueos',
-'sp-contributions-search'      => 'Buscar contribuciones',
-'sp-contributions-username'    => 'Dirección IP o nombre de usuario:',
-'sp-contributions-submit'      => 'Buscar',
+'contributions'       => 'Contribuciones del usuario',
+'contributions-title' => 'Contribuciones del usuario $1',
+'mycontris'           => 'Mis contribuciones',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'No se encontraron cambios que cumplieran estos criterios.',
+'uctop'               => ' (última modificación)',
+'month'               => 'Desde el mes (y anterior):',
+'year'                => 'Desde el año (y anterior):',
+
+'sp-contributions-newbies'       => 'Mostrar solo las contribuciones de usuarios nuevos',
+'sp-contributions-newbies-sub'   => 'Para cuentas nuevas',
+'sp-contributions-newbies-title' => 'Contribuciones de usuarios nuevos',
+'sp-contributions-blocklog'      => 'Registro de bloqueos',
+'sp-contributions-search'        => 'Buscar contribuciones',
+'sp-contributions-username'      => 'Dirección IP o nombre de usuario:',
+'sp-contributions-submit'        => 'Buscar',
 
 # What links here
 'whatlinkshere'            => 'Lo que enlaza aquí',
 'whatlinkshere-title'      => 'Páginas que enlazan con «$1»',
 'whatlinkshere-page'       => 'Página:',
-'linklistsub'              => '(Lista de enlaces)',
 'linkshere'                => "Las siguientes páginas enlazan a '''[[:$1]]''':",
 'nolinkshere'              => "Ninguna página enlaza con '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Ninguna página enlaza con '''[[:$1]]''' en el espacio de nombres elegido.",
@@ -1758,6 +2057,8 @@ las páginas en particular que han sido objeto de vandalismo).',
 'ipbotherreason'                  => 'Otra razón:',
 'ipbhidename'                     => 'Ocultar usuario/IP en el registro de bloqueos, la lista de bloqueos activos y la lista de usuarios',
 'ipbwatchuser'                    => 'Vigilar las páginas de usuario y de discusión de este usuario',
+'ipballowusertalk'                => 'Permitir a este usuario editar su propia página de discusión mientras está bloqueado',
+'ipb-change-block'                => 'Rebloquear al usuario con estos datos',
 'badipaddress'                    => 'La dirección IP no tiene el formato correcto.',
 'blockipsuccesssub'               => 'Bloqueo realizado con éxito',
 'blockipsuccesstext'              => '"[[Special:Contributions/$1|$1]]" ha sido bloqueado. <br />Puede revisar la [[Special:IPBlockList|lista de bloqueos]].',
@@ -1766,14 +2067,18 @@ las páginas en particular que han sido objeto de vandalismo).',
 'ipb-unblock'                     => 'Desbloquear un usuario o una IP',
 'ipb-blocklist-addr'              => 'Bloqueos vigentes de $1',
 'ipb-blocklist'                   => 'Ver bloqueos vigentes',
+'ipb-blocklist-contribs'          => 'Contribuciones de $1',
 'unblockip'                       => 'Desbloquear usuario',
 'unblockiptext'                   => 'Use el formulario a continuación para devolver los permisos de escritura a una dirección IP que ha sido bloqueada.',
-'ipusubmit'                       => 'Desbloquear esta dirección',
+'ipusubmit'                       => 'Remover este bloqueo',
 'unblocked'                       => '[[User:$1|$1]] ha sido desbloqueado',
 'unblocked-id'                    => 'Se ha eliminado el bloqueo $1',
 'ipblocklist'                     => 'Lista de direcciones IP y nombres de usuario bloqueadas',
 'ipblocklist-legend'              => 'Encontrar a un usuario bloqueado',
 'ipblocklist-username'            => 'Nombre de usuario o dirección IP:',
+'ipblocklist-sh-userblocks'       => '$1 bloqueos de cuentas',
+'ipblocklist-sh-tempblocks'       => '$1 bloqueos temporales',
+'ipblocklist-sh-addressblocks'    => '$1 bloqueos de una sola dirección IP',
 'ipblocklist-submit'              => 'Buscar',
 'blocklistline'                   => '$1, $2 bloquea a $3 ($4)',
 'infiniteblock'                   => 'infinito',
@@ -1782,25 +2087,32 @@ las páginas en particular que han sido objeto de vandalismo).',
 'noautoblockblock'                => 'Bloqueo automático deshabilitado',
 'createaccountblock'              => 'Creación de cuenta bloqueada.',
 'emailblock'                      => 'correo electrónico bloqueado',
+'blocklist-nousertalk'            => 'no puede editar su propia página de discusión',
 'ipblocklist-empty'               => 'La lista de bloqueos está vacía.',
 'ipblocklist-no-results'          => 'El nombre de usuario o IP indicado no está bloqueado.',
 'blocklink'                       => 'bloquear',
 'unblocklink'                     => 'desbloquear',
+'change-blocklink'                => 'cambiar bloqueo',
 'contribslink'                    => 'contribuciones',
 'autoblocker'                     => 'Has sido bloqueado automáticamente porque tu dirección IP ha sido usada recientemente por «[[User:$1|$1]]». La razón esgrimida para bloquear a «[[User:$1|$1]]» fue «$2».',
 'blocklogpage'                    => 'Bloqueos de usuarios',
+'blocklog-fulllog'                => 'Ver el registro de bloqueos completo',
 'blocklogentry'                   => 'bloqueó a "$1" $3 durante un plazo de "$2".',
+'reblock-logentry'                => 'cambiado el bloqueo para  [[$1]] con una caducidad de $2 $3',
 'blocklogtext'                    => 'Esto es un registro de bloqueos y desbloqueos de usuarios. Las direcciones bloqueadas automáticamente no aparecen aquí. Consulte la [[Special:IPBlockList|lista de direcciones IP bloqueadas]] para ver la lista de prohibiciones y bloqueos actualmente vigente.',
 'unblocklogentry'                 => 'desbloqueó a "$1"',
 'block-log-flags-anononly'        => 'sólo anónimos',
 'block-log-flags-nocreate'        => 'desactivada la creación de cuentas',
 'block-log-flags-noautoblock'     => 'bloqueo automático desactivado',
 'block-log-flags-noemail'         => 'correo electrónico deshabilitado',
+'block-log-flags-nousertalk'      => 'no puede editar su propia página de discusión',
 'block-log-flags-angry-autoblock' => 'activado el autobloqueo avanzado',
 'range_block_disabled'            => 'La facultad de administrador de crear bloqueos por rangos está deshabilitada.',
 'ipb_expiry_invalid'              => 'El tiempo de caducidad no es válido.',
 'ipb_expiry_temp'                 => 'Los bloqueos a nombres de usuario ocultos deben ser permanentes.',
 'ipb_already_blocked'             => '"$1" ya se encuentra bloqueado.',
+'ipb-needreblock'                 => '== Ya está bloqueado ==
+$1 ya está bloqueado. ¿Quieres cambiar el bloqueo?',
 'ipb_cant_unblock'                => "'''Error''': Número ID $1 de bloqueo no encontrado. Pudo haber sido desbloqueado ya.",
 'ipb_blocked_as_range'            => 'Error: la dirección IP $1 no está bloqueada directamente y no puede ser desbloqueada.
 Sin embargo, está bloqueada como parte del rango $2, que puede ser desbloqueado.',
@@ -1812,6 +2124,7 @@ Sin embargo, está bloqueada como parte del rango $2, que puede ser desbloqueado
 'proxyblocksuccess'               => 'Hecho.',
 'sorbsreason'                     => 'Su dirección IP está listada como proxy abierto en DNSBL.',
 'sorbs_create_account_reason'     => 'Su dirección IP está listada como proxy abierto en DNSBL. No puede crear una cuenta',
+'cant-block-while-blocked'        => 'No puedes bloquear a otros usuarios mientras estás bloqueado.',
 
 # Developer tools
 'lockdb'              => 'Bloquear la base de datos',
@@ -1832,9 +2145,9 @@ Sin embargo, está bloqueada como parte del rango $2, que puede ser desbloqueado
 'databasenotlocked'   => 'La base de datos no está bloqueada.',
 
 # Move page
-'move-page'               => 'Trasladar $1',
-'move-page-legend'        => 'Renombrar página',
-'movepagetext'            => "Usando el siguiente formulario se renombrará una página, moviendo todo su historial al nuevo nombre.
+'move-page'                    => 'Trasladar $1',
+'move-page-legend'             => 'Renombrar página',
+'movepagetext'                 => "Usando el siguiente formulario se renombrará una página, moviendo todo su historial al nuevo nombre.
 El título anterior se convertirá en una redirección al nuevo título.
 Los enlaces al antiguo título de la página no se cambiarán.
 Asegúrate de no dejar [[Special:DoubleRedirects|redirecciones dobles]] o [[Special:BrokenRedirects|rotas]].
@@ -1846,48 +2159,61 @@ Esto significa que podrás renombrar una página a su título original si has co
 '''¡ADVERTENCIA!'''
 Este puede ser un cambio drástico e inesperado para una página popular;
 por favor, asegúrate de entender las consecuencias del procedimiento antes de seguir adelante.",
-'movepagetalktext'        => "La página de discusión asociada, si existe, será renombrada automáticamente '''a menos que:'''
+'movepagetalktext'             => "La página de discusión asociada, si existe, será renombrada automáticamente '''a menos que:'''
 *Esté moviendo la página entre espacios de nombres diferentes,
 *Una página de discusión no vacía ya exista con el nombre nuevo, o
 *Desactivase la opción \"Renombrar la página de discusión también\".
 
 En estos casos, deberá trasladar manualmente el contenido de la página de discusión.",
-'movearticle'             => 'Renombrar página',
-'movenotallowed'          => 'No tienes permiso para trasladar páginas.',
-'newtitle'                => 'A título nuevo',
-'move-watch'              => 'Vigilar este artículo',
-'movepagebtn'             => 'Renombrar página',
-'pagemovedsub'            => 'Renombrado realizado con éxito',
-'movepage-moved'          => '<big>\'\'\'"$1" ha sido trasladado a "$2".\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Ya existe una página con ese nombre o el nombre que ha elegido no es válido. Por favor, elija otro nombre.',
-'cantmove-titleprotected' => 'No se pueden mover páginas a esta ubicacion, porque se ha protegido la creación de este nuevo título.',
-'talkexists'              => 'La página fue renombrada con éxito, pero la discusión no se pudo mover porque ya existe una en el título nuevo. Por favor incorpore su contenido manualmente.',
-'movedto'                 => 'renombrado a',
-'movetalk'                => 'Renombrar la página de discusión también, si es aplicable.',
-'move-subpages'           => 'Mover todas las subpáginas si es posible',
-'move-talk-subpages'      => 'Mover todas las subpáginas de discusión, si es posible',
-'movepage-page-exists'    => 'La página $1 ya existe, por lo que no puede ser renombrada automáticamente.',
-'movepage-page-moved'     => 'La página $1 ha sido trasladado a $2.',
-'movepage-page-unmoved'   => 'La página $1 no se ha podido trasladar a $2.',
-'movepage-max-pages'      => 'Se {{PLURAL:$1|ha trasladado un máximo de una página|han trasladado un máximo de $1 páginas}}, y no se van a mover más automáticamente.',
-'1movedto2'               => '[[$1]] trasladada a [[$2]]',
-'1movedto2_redir'         => '[[$1]] trasladada a [[$2]] sobre una redirección',
-'movelogpage'             => 'Registro de traslados',
-'movelogpagetext'         => 'Abajo se encuentra una lista de páginas trasladadas.',
-'movereason'              => 'Motivo:',
-'revertmove'              => 'revertir',
-'delete_and_move'         => 'Borrar y trasladar',
-'delete_and_move_text'    => '==Se necesita borrado==
+'movearticle'                  => 'Renombrar página',
+'movenologin'                  => 'No ha iniciado sesión',
+'movenologintext'              => 'Es necesario ser usuario registrado y [[Special:UserLogin|haber iniciado sesión]] para renombrar una página.',
+'movenotallowed'               => 'No tienes permiso para trasladar páginas.',
+'movenotallowedfile'           => 'No tienes permiso para mover archivos.',
+'cant-move-user-page'          => 'No tienes permiso para mover páginas de usuario (excepto subpáginas).',
+'cant-move-to-user-page'       => 'No tienes permiso para mover una página a una página de usuario (excepto a subpáginas de usuario).',
+'newtitle'                     => 'A título nuevo',
+'move-watch'                   => 'Vigilar este artículo',
+'movepagebtn'                  => 'Renombrar página',
+'pagemovedsub'                 => 'Renombrado realizado con éxito',
+'movepage-moved'               => '<big>\'\'\'"$1" ha sido trasladado a "$2".\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Un redireccionamiento ha sido creado.',
+'movepage-moved-noredirect'    => 'Se ha suprimido la creación de la redirección.',
+'articleexists'                => 'Ya existe una página con ese nombre o el nombre que ha elegido no es válido. Por favor, elija otro nombre.',
+'cantmove-titleprotected'      => 'No se pueden mover páginas a esta ubicacion, porque se ha protegido la creación de este nuevo título.',
+'talkexists'                   => 'La página fue renombrada con éxito, pero la discusión no se pudo mover porque ya existe una en el título nuevo. Por favor incorpore su contenido manualmente.',
+'movedto'                      => 'renombrado a',
+'movetalk'                     => 'Renombrar la página de discusión también, si es aplicable.',
+'move-subpages'                => 'Mover todas las subpáginas si es posible',
+'move-talk-subpages'           => 'Mover todas las subpáginas de discusión, si es posible',
+'movepage-page-exists'         => 'La página $1 ya existe, por lo que no puede ser renombrada automáticamente.',
+'movepage-page-moved'          => 'La página $1 ha sido trasladado a $2.',
+'movepage-page-unmoved'        => 'La página $1 no se ha podido trasladar a $2.',
+'movepage-max-pages'           => 'Se {{PLURAL:$1|ha trasladado un máximo de una página|han trasladado un máximo de $1 páginas}}, y no se van a mover más automáticamente.',
+'1movedto2'                    => '[[$1]] trasladada a [[$2]]',
+'1movedto2_redir'              => '[[$1]] trasladada a [[$2]] sobre una redirección',
+'move-redirect-suppressed'     => 'redireccionamiento suprimido',
+'movelogpage'                  => 'Registro de traslados',
+'movelogpagetext'              => 'Abajo se encuentra una lista de páginas trasladadas.',
+'movereason'                   => 'Motivo:',
+'revertmove'                   => 'revertir',
+'delete_and_move'              => 'Borrar y trasladar',
+'delete_and_move_text'         => '==Se necesita borrado==
 
 La página de destino ("[[:$1]]") ya existe. ¿Quiere borrarla para permitir al traslado?',
-'delete_and_move_confirm' => 'Sí, borrar la página',
-'delete_and_move_reason'  => 'Borrada para permitir el traslado',
-'selfmove'                => 'Los títulos de origen y destino son los mismos. No se puede trasladar un página sobre sí misma.',
-'immobile_namespace'      => 'El título de destino es de un tipo especial. No se pueden trasladar páginas a ese espacio de nombres.',
-'imagenocrossnamespace'   => 'No se puede trasladar el fichero a otro espacio de nombres',
-'imagetypemismatch'       => 'La nueva extensión de archivo no corresponde con su tipo',
-'imageinvalidfilename'    => 'El nombre del fichero de destino no es válido',
-'fix-double-redirects'    => 'Actualizar las redirecciones que apuntan al título original',
+'delete_and_move_confirm'      => 'Sí, borrar la página',
+'delete_and_move_reason'       => 'Borrada para permitir el traslado',
+'selfmove'                     => 'Los títulos de origen y destino son los mismos. No se puede trasladar un página sobre sí misma.',
+'immobile-source-namespace'    => 'No se pueden trasladar páginas en el espacio de nombres «$1»',
+'immobile-target-namespace'    => 'No se puede trasladar páginas al espacio de nombres «$1»',
+'immobile-target-namespace-iw' => 'Un enlace interwiki no es un destino válido para trasladar una página.',
+'immobile-source-page'         => 'Esta página no se puede renombrar.',
+'immobile-target-page'         => 'No se puede trasladar a tal título.',
+'imagenocrossnamespace'        => 'No se puede trasladar el fichero a otro espacio de nombres',
+'imagetypemismatch'            => 'La nueva extensión de archivo no corresponde con su tipo',
+'imageinvalidfilename'         => 'El nombre del fichero de destino no es válido',
+'fix-double-redirects'         => 'Actualizar las redirecciones que apuntan al título original',
+'move-leave-redirect'          => 'Dejar una redirección',
 
 # Export
 'export'            => 'Exportar páginas',
@@ -1895,7 +2221,7 @@ La página de destino ("[[:$1]]") ya existe. ¿Quiere borrarla para permitir al
 
 Para exportar páginas, escribe los títulos en la caja de texto de abajo, un título por línea, y selecciona si quieres la versión actual junto a las versiones anteriores, con las líneas del historial, o sólo la versión actual con la información sobre la última edición.
 
-En el último caso también puedes usar un enlace, por ejemplo [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] para la página "[[{{MediaWiki:Mainpage}}]]".',
+En el último caso también puedes usar un enlace, por ejemplo [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] para la página "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Incluye sólo la revisión actual, no el historial de revisiones al completo.',
 'exportnohistory'   => "----
 '''Nota:''' Exportar el historial completo de páginas a través de este formulario ha sido deshabilitado debido a problemas de rendimiento del servidor.",
@@ -1930,9 +2256,12 @@ En el último caso también puedes usar un enlace, por ejemplo [[{{ns:special}}:
 'import-interwiki-text'      => 'Selecciona un wiki y un título de página para importar.
 Las fechas de revisiones y los nombres de editores se preservarán.
 Todas las importaciones transwiki se registran en el [[Special:Log/import|registro de importaciones]].',
+'import-interwiki-source'    => 'Wiki o página origen:',
 'import-interwiki-history'   => 'Copiar todas las versiones históricas para esta página',
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Espacio de nombres de destino:',
+'import-upload-filename'     => 'Nombre de archivo:',
+'import-comment'             => 'Comentario:',
 'importtext'                 => 'Por favor, exporte el archivo desde el wiki de origen usando la [[Special:Export|herramienta de exportación]], guárdelo en su ordenador y súbalo aquí.',
 'importstart'                => 'Importando páginas...',
 'import-revision-count'      => '$1 {{PLURAL:$1|revisión|revisiones}}',
@@ -1969,19 +2298,19 @@ No hay un directorio temporal.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revisión|revisiones}} desde $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mi página de usuario',
+'tooltip-pt-userpage'             => 'Su página de usuario',
 'tooltip-pt-anonuserpage'         => 'La página de usuario de la IP desde la que edita',
-'tooltip-pt-mytalk'               => 'Mi página de discusión',
+'tooltip-pt-mytalk'               => 'Su página de discusión',
 'tooltip-pt-anontalk'             => 'Discusión sobre ediciones hechas desde esta dirección IP',
 'tooltip-pt-preferences'          => 'Mis preferencias',
 'tooltip-pt-watchlist'            => 'La lista de páginas para las que está vigilando los cambios',
-'tooltip-pt-mycontris'            => 'Lista de mis contribuciones',
+'tooltip-pt-mycontris'            => 'Lista de sus contribuciones',
 'tooltip-pt-login'                => 'Le animamos a registrarse, aunque no es obligatorio',
 'tooltip-pt-anonlogin'            => 'Le animamos a registrarse, aunque no es obligatorio',
 'tooltip-pt-logout'               => 'Salir de la sesión',
 'tooltip-ca-talk'                 => 'Discusión acerca del artículo',
 'tooltip-ca-edit'                 => 'Puede editar esta página. Por favor, use el botón de previsualización antes de grabar.',
-'tooltip-ca-addsection'           => 'Añada un comentario a esta discusión',
+'tooltip-ca-addsection'           => 'Inicie una nueva sección',
 'tooltip-ca-viewsource'           => 'Esta página está protegida, sólo puede ver su código fuente',
 'tooltip-ca-history'              => 'Versiones anteriores de esta página y sus autores',
 'tooltip-ca-protect'              => 'Proteger esta página',
@@ -2028,6 +2357,9 @@ No hay un directorio temporal.',
 'tooltip-watch'                   => 'Añadir esta página a su lista de seguimiento',
 'tooltip-recreate'                => 'Recupera una página que ha sido borrada',
 'tooltip-upload'                  => 'Empieza la subida',
+'tooltip-rollback'                => '«Revertir» revierte todas las ediciones del último usuario con un solo clic.',
+'tooltip-undo'                    => '«Deshacer» revierte la edición seleccionada y abre la página de edición en el modo de previsualización.
+Permite añadir una razón al resumen de edición.',
 
 # Stylesheets
 'common.css'   => '/* Los estilos CSS definidos aquí aplicarán a todas las pieles (skins) */',
@@ -2043,12 +2375,12 @@ No hay un directorio temporal.',
 'notacceptable'     => 'El servidor wiki no puede proveer los datos en un formato que su cliente (navegador) pueda entender.',
 
 # Attribution
-'anonymous'        => 'Usuario(s) anónimo(s) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Usuario anónimo|Usuarios anónimos}} de {{SITENAME}}',
 'siteuser'         => 'Usuario $1 de {{SITENAME}}',
 'lastmodifiedatby' => 'Esta página fue modificada por última vez en $2, $1 por $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basado en el trabajo de $1.',
 'others'           => 'otros',
-'siteusers'        => 'Usuario(s) $1 de {{SITENAME}}',
+'siteusers'        => '{{PLURAL:$2|Usuario|Usuarios}} $1 de {{SITENAME}}',
 'creditspage'      => 'Créditos de la página',
 'nocredits'        => 'Hay información de créditos para esta página.',
 
@@ -2069,6 +2401,16 @@ Esto podría estar causado por un enlace a un sitio externo incluido en la lista
 'numauthors'     => 'Número de autores distintos (artículo): $1',
 'numtalkauthors' => 'Número de autores distintos (página de discusión): $1',
 
+# Skin names
+'skinname-standard'    => 'Estándar',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Colonia azul',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Mi piel',
+'skinname-chick'       => 'Pollito',
+'skinname-simple'      => 'Simple',
+'skinname-modern'      => 'Moderna',
+
 # Math options
 'mw_math_png'    => 'Producir siempre PNG',
 'mw_math_simple' => 'HTML si es muy simple, si no, PNG',
@@ -2089,10 +2431,12 @@ Esto podría estar causado por un enlace a un sitio externo incluido en la lista
 'markedaspatrollederror-noautopatrol' => 'No tienes permisos para marcar tus propios cambios como revisados.',
 
 # Patrol log
-'patrol-log-page'   => 'Registro de revisiones',
-'patrol-log-header' => 'Este es un registro de revisiones patrulladas.',
-'patrol-log-line'   => 'revisado $1 de $2 $3',
-'patrol-log-auto'   => '(automático)',
+'patrol-log-page'      => 'Registro de revisiones',
+'patrol-log-header'    => 'Este es un registro de revisiones patrulladas.',
+'patrol-log-line'      => 'revisado $1 de $2 $3',
+'patrol-log-auto'      => '(automático)',
+'patrol-log-diff'      => 'revisión $1',
+'log-show-hide-patrol' => '$1 registro de patrullaje',
 
 # Image deletion
 'deletedrevision'                 => 'Borrada revisión antigua $1',
@@ -2109,6 +2453,9 @@ $1',
 'previousdiff' => '� Edición más antigua',
 'nextdiff'     => 'Edición más nueva →',
 
+# Visual comparison
+'visual-comparison' => 'Comparación visual',
+
 # Media information
 'mediawarning'         => "'''Atención''': Este fichero puede contener código malicioso, ejecutarlo podría comprometer la seguridad de tu equipo.<hr />",
 'imagemaxsize'         => 'Limitar imágenes en las páginas de descripción a:',
@@ -2121,10 +2468,12 @@ $1',
 'show-big-image'       => 'Resolución original',
 'show-big-image-thumb' => '<small>Tamaño de esta vista previa: $1 × $2 píxeles</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galería de imágenes nuevas',
 'imagelisttext'         => "Debajo hay una lista de '''$1''' {{PLURAL:$1|imagen|imágenes}} ordenadas $2.",
 'newimages-summary'     => 'Esta página especial muestra una galería de los últimos ficheros subidos.',
+'newimages-legend'      => 'Nombre del fichero',
+'newimages-label'       => 'Nombre del fichero (o una parte):',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'No hay nada que ver.',
 'ilsubmit'              => 'Búsqueda',
@@ -2330,6 +2679,18 @@ Existen otros campos que se mantendrán ocultos por defecto.
 'exif-lightsource-24'  => 'Tungsteno de estudio ISO',
 'exif-lightsource-255' => 'Otra fuente de luz',
 
+# Flash modes
+'exif-flash-fired-0'    => 'No se disparó el flash',
+'exif-flash-fired-1'    => 'Flash disparado',
+'exif-flash-return-0'   => 'no hay función de detección del retorno de la luz estroboscópica',
+'exif-flash-return-2'   => 'no se detectó retorno de luz estroboscópica',
+'exif-flash-return-3'   => 'detectado retorno de luz estroboscópica',
+'exif-flash-mode-1'     => 'disparo de flash forzado',
+'exif-flash-mode-2'     => 'disparo de flash anulado',
+'exif-flash-mode-3'     => 'modo automático',
+'exif-flash-function-1' => 'Modo sin flash',
+'exif-flash-redeye-1'   => 'modo de reducción de ojos rojos',
+
 'exif-focalplaneresolutionunit-2' => 'pulgadas',
 
 'exif-sensingmethod-1' => 'No definido',
@@ -2469,21 +2830,10 @@ $1
 'confirmrecreate'     => "El usuario [[User:$1|$1]] ([[User talk:$1|discusión]]) borró este artículo después de que tú empezaces a editarlo y dio esta razón: ''$2'' Por favor, confirma que realmente deseas crear de nuevo el artículo.",
 'recreate'            => 'Crear de nuevo',
 
-# HTML dump
-'redirectingto' => 'Redirigiendo a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => '¿Limpiar la caché de esta página?
-
-$1',
 'confirm_purge_button' => 'Aceptar',
-
-# AJAX search
-'searchcontaining' => "Buscar artículos que contengan ''$1''.",
-'searchnamed'      => "Buscar artículos con este nombre ''$1''.",
-'articletitles'    => "Artículos que comienzan por ''$1''",
-'hideresults'      => 'Ocultar resultados',
-'useajaxsearch'    => 'Buscar usando AJAX',
+'confirm-purge-top'    => '¿Limpiar la caché de esta página?',
+'confirm-purge-bottom' => 'Purgar una página limpia la caché y fuerza a que aparezca la versión más actual.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� página anterior',
@@ -2503,10 +2853,10 @@ $1',
 'table_pager_empty'        => 'No hay resultados',
 
 # Auto-summaries
-'autosumm-blank'   => 'Página blanqueada',
+'autosumm-blank'   => 'Blanqueada la página',
 'autosumm-replace' => "Página reemplazada por «'$1'»",
 'autoredircomment' => 'Redirigiendo a [[$1]]',
-'autosumm-new'     => 'Página nueva: $1',
+'autosumm-new'     => "Página creada con '$1'",
 
 # Live preview
 'livepreview-loading' => 'Cargando…',
@@ -2549,6 +2899,7 @@ También puedes utilizar el [[Special:Watchlist/edit|editor estándar]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Etiqueta desconocida «$1»',
+'duplicate-defaultsort' => 'Atención: La clave de ordenación por defecto «$2» anula la anterior clave ordenación por defecto «$1».',
 
 # Special:Version
 'version'                          => 'Versión', # Not used as normal message but as header for the special page itself
@@ -2578,13 +2929,13 @@ También puedes utilizar el [[Special:Watchlist/edit|editor estándar]].',
 'filepath-summary' => 'Esta página devuelve la ruta completa de un archivo.
 Las imágenes se muestran en resolución máxima, otros tipos de archivo arrancan directamente con su programa asociado.
 
-Ingrese el nombre del archivo sin su prefijo "{{ns:image}}:".',
+Ingrese el nombre del archivo sin su prefijo "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Búsqueda de archivos duplicados',
 'fileduplicatesearch-summary'  => 'Búsqueda de archivos duplicados en base a su valor hash. 
 
-Ingrese el nombre del archivo sin el prefijo "{{ns:image}}:".',
+Ingrese el nombre del archivo sin el prefijo "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Busca duplicados',
 'fileduplicatesearch-filename' => 'Nombre del fichero:',
 'fileduplicatesearch-submit'   => 'Buscar',
@@ -2614,4 +2965,13 @@ Ingrese el nombre del archivo sin el prefijo "{{ns:image}}:".',
 'blankpage'              => 'Página vacía',
 'intentionallyblankpage' => 'Esta pagina está en blanco intencionadamente',
 
+# External image whitelist
+'external_image_whitelist' => ' #Deja esta línea exactamente como está<pre>
+#Put regular expression fragments (just the part that goes between the //) below
+#These will be matched with the URLs of external (hotlinked) images
+#Those that match will be displayed as images, otherwise only a link to the image will be shown
+#Las líneas que empiezan por «#» se consideran comentarios
+
+#Put all regex fragments above this line. Deja esta línea exactamente como está</pre>',
+
 );
diff --git a/languages/messages/MessagesEt.php b/languages/messages/MessagesEt.php
index 3569b36a..8dbf0c1b 100644
--- a/languages/messages/MessagesEt.php
+++ b/languages/messages/MessagesEt.php
@@ -7,6 +7,7 @@
  * @author Avjoska
  * @author Hendrix
  * @author Jaan513
+ * @author Ker
  * @author Võrok
  * @author WikedKentaur
  * @author לערי ריינה�רט
@@ -21,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Kasutaja_arutelu',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_arutelu',
-	NS_IMAGE            => 'Pilt',
-	NS_IMAGE_TALK       => 'Pildi_arutelu',
+	NS_FILE             => 'Pilt',
+	NS_FILE_TALK        => 'Pildi_arutelu',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_arutelu',
 	NS_TEMPLATE         => 'Mall',
@@ -33,13 +34,6 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Kategooria_arutelu'
 );
 
-$skinNames = array(
-	'standard' => 'Standard',
-	'nostalgia' => 'Nostalgia',
-	'cologneblue' => 'Kölni sinine',
-	'monobook' => 'MonoBook',
-	'myskin' => 'Mu oma nahk'
-);
 
 #Lisasin eestimaised poed, aga võõramaiseid ei julenud kustutada.
 
@@ -124,11 +118,13 @@ $messages = array(
 'tog-shownumberswatching'     => 'Näita jälgivate kasutajate hulka',
 'tog-fancysig'                => 'Kasuta lihtsaid allkirju (ilma linkideta kasutajalehele)',
 'tog-externaleditor'          => 'Kasuta vaikimisi välist redaktorit',
-'tog-externaldiff'            => 'Kasuta vaikimisi välist võrdlusvahendit (diff)',
+'tog-externaldiff'            => 'Kasuta vaikimisi välist võrdlusvahendit (ainult ekspertidele, tarvilikud on kasutaja arvuti eriseadistused)',
 'tog-forceeditsummary'        => 'Nõua redigeerimisel resümee välja täitmist',
 'tog-watchlisthideown'        => 'Peida minu redaktsioonid jälgimisloendist',
 'tog-watchlisthidebots'       => 'Peida robotid jälgimisloendist',
 'tog-watchlisthideminor'      => 'Peida pisiparandused jälgimisloendist',
+'tog-watchlisthideliu'        => 'Peida sisselogitud kasutajate muudatused jälgimisloendist',
+'tog-watchlisthideanons'      => 'Peida anonüümsete kasutajate muudatused jälgimisloendist',
 'tog-ccmeonemails'            => 'Saada mulle koopiad e-mailidest, mida ma teistele kasutajatele saadan',
 'tog-showhiddencats'          => 'Näita peidetud kategooriaid',
 
@@ -136,8 +132,6 @@ $messages = array(
 'underline-never'   => 'Mitte kunagi',
 'underline-default' => 'Brauseri vaikeväärtus',
 
-'skinpreview' => '(Eelvaade)',
-
 # Dates
 'sunday'        => 'pühapäev',
 'monday'        => 'esmaspäev',
@@ -226,7 +220,7 @@ ning [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit].'
 'mytalk'         => 'Arutelu',
 'anontalk'       => 'Arutelu selle IP jaoks',
 'navigation'     => 'Navigeerimine',
-'and'            => 'ja',
+'and'            => '&#32;ja',
 
 # Metadata in edit box
 'metadata_help' => 'Metaandmed:',
@@ -263,14 +257,14 @@ ning [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit].'
 'talkpagelinktext'  => 'Arutelu',
 'specialpage'       => 'Erilehekülg',
 'personaltools'     => 'Personaalsed tööriistad',
-'postcomment'       => 'Postita kommentaar',
+'postcomment'       => 'Uus alalõik',
 'articlepage'       => 'Artiklilehekülg',
 'talk'              => 'Arutelu',
 'views'             => 'vaatamisi',
-'toolbox'           => 'Tööriistakast',
+'toolbox'           => 'Tööriistad',
 'userpage'          => 'Kasutajalehekülg',
 'projectpage'       => 'Metalehekülg',
-'imagepage'         => 'Pildilehekülg',
+'imagepage'         => 'Vaata faililehekülge',
 'mediawikipage'     => 'Vaata sõnumite lehekülge',
 'templatepage'      => 'Mallilehekülg',
 'viewhelppage'      => 'Vaata abilehekülge',
@@ -289,8 +283,6 @@ ning [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit].'
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} tiitelandmed',
 'aboutpage'            => 'Project:Tiitelandmed',
-'bugreports'           => 'Teated programmivigadest',
-'bugreportspage'       => 'Project:Teated_programmivigadest',
 'copyright'            => 'Kogu tekst on kasutatav litsentsi $1 tingimustel.',
 'copyrightpagename'    => '{{SITENAME}} ja autoriõigused',
 'copyrightpage'        => '{{ns:project}}:Autoriõigused',
@@ -313,6 +305,7 @@ ning [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit].'
 
 'badaccess'        => 'Õigus puudub',
 'badaccess-group0' => 'Sul ei ole õigust läbi viia toimingut, mida üritasid.',
+'badaccess-groups' => 'Tegevus, mida üritasid, on piiratud kasutajatele {{PLURAL:$2|grupis|ühes neist gruppidest}}: $1.',
 
 'versionrequired'     => 'MediaWiki versioon $1 nõutav',
 'versionrequiredtext' => 'MediaWiki versioon $1 on selle lehe kasutamiseks nõutav.
@@ -328,6 +321,8 @@ Vaata [[Special:Version|versiooni lehekülge]].',
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'redigeeri',
 'viewsourceold'           => 'vaata lähteteksti',
+'editlink'                => 'toimeta',
+'viewsourcelink'          => 'vaata lähteteksti',
 'editsectionhint'         => 'Redigeeri alaosa $1',
 'toc'                     => 'Sisukord',
 'showtoc'                 => 'näita',
@@ -356,7 +351,9 @@ Vaata [[Special:Version|versiooni lehekülge]].',
 
 # Main script and global functions
 'nosuchaction'      => 'Sellist toimingut pole.',
-'nosuchactiontext'  => 'Wiki ei tunne sellele aadressile vastavat toimingut.',
+'nosuchactiontext'  => 'Wiki ei tunne antud URLile vastavat tegevust.
+Sa nähtavasti trükkisid URLi valesti või kasutasid vigast linki.
+Võimalik aga, et see osutab veale portaali {{SITENAME}} poolt kasutatavas tarkvaras.',
 'nosuchspecialpage' => 'Sellist erilehekülge pole.',
 'nospecialpagetext' => 'Viki ei tunne sellist erilehekülge.',
 
@@ -383,6 +380,14 @@ MySQL tagastas veateate "$3: $4".',
 'readonlytext'         => 'Andmebaas on praegu kirjutuskaitse all, tõenäoliselt andmebaasi rutiinseks hoolduseks, mille lõppedes normaalne olukord taastub.
 Administraator, kes selle kaitse alla võttis, andis järgmise selgituse:
 <p>$1',
+'missing-article'      => 'Andmebaas ei leidnud küsitud lehekülje "$1" $2 teksti.
+
+Põhjuseks võib olla võrdlus- või ajaloolink kustutatud leheküljele.
+
+Kui tegemist ei ole nimetatud olukorraga on põhjust kahtlustada süsteemi viga.
+Sellisel juhul tuleks informeerida [[Special:ListUsers/sysop|mõnda administratooritest]], edastades talle ka käesoleva lehe URLi.',
+'missingarticle-rev'   => '(redaktsioon: $1)',
+'missingarticle-diff'  => '(redaktsioonid: $1, $2)',
 'internalerror'        => 'Sisemine viga',
 'internalerror_info'   => 'Sisemine viga: $1',
 'filecopyerror'        => 'Ei saanud faili "$1" kopeerida nimega "$2".',
@@ -390,6 +395,7 @@ Administraator, kes selle kaitse alla võttis, andis järgmise selgituse:
 'filedeleteerror'      => 'Faili nimega "$1" ei ole võimalik kustutada.',
 'directorycreateerror' => 'Ei suuda luua kausta "$1".',
 'filenotfound'         => 'Faili nimega "$1" ei leitud.',
+'fileexistserror'      => 'Kirjutamine faili "$1" ebaõnnestus: fail on juba olemas',
 'unexpected'           => 'Ootamatu väärtus: "$1"="$2".',
 'formerror'            => 'Viga: vormi ei saanud salvestada',
 'badarticleerror'      => 'Seda toimingut ei saa sellel leheküljel sooritada.',
@@ -397,7 +403,6 @@ Administraator, kes selle kaitse alla võttis, andis järgmise selgituse:
 'badtitle'             => 'Vigane pealkiri',
 'badtitletext'         => 'Küsitud artiklipealkiri oli kas vigane, tühi või siis
 valesti viidatud keelte- või wikidevaheline pealkiri.',
-'perfdisabled'         => 'Vabandage! See funktsioon ajutiselt ei tööta, sest ta aeglustab andmebaasi kasutamist võimatuseni. Sellepärast täiustatakse vastavat programmi lähitulevikus. Võib-olla teete seda Teie!',
 'perfcached'           => 'Järgnevad andmed on puhverdatud ja ei pruugi olla kõige värskemad:',
 'perfcachedts'         => 'Järgmised andmed on vahemälus. Viimase uuendamise daatum on $1.',
 'wrong_wfQuery_params' => 'Valed parameeterid funktsioonile wfQuery()<br />
@@ -407,13 +412,13 @@ Päring: $2',
 'viewsourcefor'        => '$1',
 'viewsourcetext'       => 'Võite vaadata ja kopeerida lehekülje algteksti:',
 'protectedinterface'   => 'Sellel leheküljel on tarkvara kasutajaliidese tekst. Kuritahtliku muutmise vältimiseks on lehekülg lukustatud.',
-'editinginterface'     => "'''Hoiatus:''' Te redigeerite tarkvara kasutajaliidese tekstiga lehekülge. Muudatused siin mõjutavad kõikide kasutajate kasutajaliidest. Tõlkijad, palun kaaluge MediaWiki tõlkimisprojekti – [http://translatewiki.net/wiki/Main_Page?setlang=et Betawiki] kasutamist.",
+'editinginterface'     => "'''Hoiatus:''' Te redigeerite tarkvara kasutajaliidese tekstiga lehekülge. Muudatused siin mõjutavad kõikide kasutajate kasutajaliidest. Tõlkijad, palun kaaluge MediaWiki tõlkimisprojekti – [http://translatewiki.net/wiki/Main_Page?setlang=et translatewiki.net] kasutamist.",
 'sqlhidden'            => '(SQL päring peidetud)',
 'namespaceprotected'   => "Teil ei ole õigusi redigeerida lehekülgi '''$1''' nimeruumis.",
 'ns-specialprotected'  => 'Erilehekülgi ei saa redigeerida.',
 
 # Virus scanner
-'virus-badscanner'     => 'Viga konfiguratsioonis: tundmatu viirusetõrje: <i>$1</i>',
+'virus-badscanner'     => "Viga konfiguratsioonis: tundmatu viirusetõrje: ''$1''",
 'virus-unknownscanner' => 'tundmatu viirusetõrje:',
 
 # Login and logout pages
@@ -427,7 +432,6 @@ Võite kasutada süsteemi anonüümselt, aga ka sama või mõne teise kasutajana
 'yourpasswordagain'          => 'Sisestage parool uuesti',
 'remembermypassword'         => 'Parooli meeldejätmine tulevasteks seanssideks.',
 'yourdomainname'             => 'Teie domeen:',
-'loginproblem'               => '<b>Sisselogimine ei õnnestunud.</b><br />Proovige uuesti!',
 'login'                      => 'Logi sisse',
 'nav-login-createaccount'    => 'Logi sisse / registreeru kasutajaks',
 'loginprompt'                => 'Teie brauser peab nõustuma küpsistega, et saaksite {{SITENAME}} lehele sisse logida.',
@@ -456,14 +460,16 @@ Palun kontrolli HTML koodi.',
 'email'                      => 'E-post',
 'prefs-help-realname'        => '* <strong>Tegelik nimi</strong> (pole kohustuslik): kui otsustate selle avaldada, kasutatakse seda Teie kaastöö seostamiseks Teiega.<br />',
 'loginerror'                 => 'Viga sisselogimisel',
-'prefs-help-email'           => '* <strong>E-post</strong> (pole kohustuslik): Võimaldab inimestel Teiega veebisaidi kaudu ühendust võtta, ilma et Te peaksite neile oma meiliaadressi avaldama, samuti on sellest kasu, kui unustate parooli.',
+'prefs-help-email'           => 'Elektronpostiaadressi sisestamine ei ole kohustuslik, kuid võimaldab sul tellida parooli meeldetuletuse, kui peaksid oma parooli unustama. Samuti saad aadressi märkides anda oma identiteeti avaldamata teistele kasutajatele võimaluse enesele sõnumeid saata.',
 'prefs-help-email-required'  => 'E-posti aadress on vajalik.',
 'nocookiesnew'               => 'Kasutajakonto loodi, aga sa ei ole sisse logitud, sest {{SITENAME}} kasutab kasutajate tuvastamisel küpsiseid. Sinu brauseris on küpsised keelatud. Palun sea küpsised lubatuks ja logi siis oma vastse kasutajanime ning parooliga sisse.',
 'nocookieslogin'             => '{{SITENAME}} kasutab kasutajate tuvastamisel küpsiseid. Sinu brauseris on küpsised keelatud. Palun sea küpsised lubatuks ja proovi siis uuesti.',
 'noname'                     => 'Sa ei sisestanud kasutajanime lubataval kujul.',
 'loginsuccesstitle'          => 'Sisselogimine õnnestus',
 'loginsuccess'               => 'Te olete sisse loginud. Teie kasutajanimi on "$1".',
-'nosuchuser'                 => 'Kasutajat "$1" ei ole olemas. Kontrollige kirjapilti või kasutage alljärgnevat vormi uue kasutajakonto loomiseks.',
+'nosuchuser'                 => 'Kasutajat "$1" ei ole olemas.
+Kasutajanimed on tõstutundlikud.
+Kontrollige kirjapilti või [[Special:UserLogin/signup|looge uus kasutajakonto]].',
 'nosuchusershort'            => 'Kasutajat nimega "<nowiki>$1</nowiki>" ei ole olemas. Kontrollige kirjapilti.',
 'nouserspecified'            => 'Kasutajanimi puudub.',
 'wrongpassword'              => 'Vale parool. Proovige uuesti.',
@@ -482,8 +488,9 @@ Te enam ei soovi parooli muuta, siis võite ignoreerida seda sõnumit ja jätkat
 'passwordsent'               => 'Uus parool on saadetud kasutaja "$1" registreeritud meiliaadressil.
 Pärast parooli saamist logige palun sisse.',
 'mailerror'                  => 'Viga kirja saatmisel: $1',
-'acct_creation_throttle_hit' => 'Vabandame, aga te olete loonud juba $1 kontot. Rohkem te ei saa.',
-'emailauthenticated'         => 'Sinu e-posti aadress kinnitati $1.',
+'acct_creation_throttle_hit' => 'Wiki külastajad, kes lähtuvad sinu IP-lt on viimase ööpäeva jooksul loonud {{PLURAL:$1|ühe konto|$1 kontot}} ja suuremat arvu kasutajakontosid ei ole sellise perioodi jooksul luua lubatud.
+Seega, hetkel ei saa antud IP kasutajad uusi kontosid avada.',
+'emailauthenticated'         => 'Sinu e-posti aadress kinnitati: $2 kell $3.',
 'emailnotauthenticated'      => 'Sinu e-posti aadress <strong>pole veel kinnitatud</strong>. E-posti kinnitamata aadressile ei saadeta.',
 'noemailprefs'               => 'Järgnevate võimaluste toimimiseks on vaja sisestada e-posti aadress.',
 'emailconfirmlink'           => 'Kinnita oma e-posti aadress',
@@ -491,16 +498,23 @@ Pärast parooli saamist logige palun sisse.',
 'loginlanguagelabel'         => 'Keel: $1',
 
 # Password reset dialog
-'resetpass_announce'      => 'Sa logisid sisse ajutise e-maili koodiga. 
+'resetpass'                 => 'Muuda parooli',
+'resetpass_announce'        => 'Sa logisid sisse ajutise e-maili koodiga. 
 Et sisselogimine lõpetada, pead uue parooli siia trükkima:',
-'resetpass_text'          => '<!-- Lisa tekst siia -->',
-'resetpass_header'        => 'Muuda konto parooli',
-'resetpass_submit'        => 'Sisesta parool ja logi sisse',
-'resetpass_success'       => 'Sinu parool on edukalt muudetud! Sisselogimine...',
-'resetpass_bad_temporary' => 'Vale ajutine parool.
+'resetpass_text'            => '<!-- Lisa tekst siia -->',
+'resetpass_header'          => 'Muuda konto parooli',
+'oldpassword'               => 'Vana parool',
+'newpassword'               => 'Uus parool',
+'retypenew'                 => 'Sisestage uus parool uuesti',
+'resetpass_submit'          => 'Sisesta parool ja logi sisse',
+'resetpass_success'         => 'Sinu parool on edukalt muudetud! Sisselogimine...',
+'resetpass_bad_temporary'   => 'Vale ajutine parool.
 
 Sa võid olla juba edukalt muutnud oma parooli või küsinud uue ajutise parooli.',
-'resetpass_forbidden'     => 'Paroole ei saa muuta',
+'resetpass_forbidden'       => 'Paroole ei saa muuta',
+'resetpass-no-info'         => 'Pead olema sisselogitud, et sellele lehele pääseda.',
+'resetpass-submit-loggedin' => 'Muuda parool',
+'resetpass-temp-password'   => 'Ajutine parool:',
 
 # Edit page toolbar
 'bold_sample'     => 'Rasvane kiri',
@@ -519,14 +533,14 @@ Sa võid olla juba edukalt muutnud oma parooli või küsinud uue ajutise parooli
 'nowiki_tip'      => 'Ignoreeri viki vormindust',
 'image_sample'    => 'Näidis.jpg',
 'image_tip'       => 'Pilt',
-'media_sample'    => 'Näidis.mp3',
+'media_sample'    => 'Näidis.ogg',
 'media_tip'       => 'Link failile',
 'sig_tip'         => 'Sinu signatuur kuupäeva ja kellaajaga',
 'hr_tip'          => 'Horisontaalkriips (kasuta säästlikult)',
 
 # Edit pages
-'summary'                  => 'Resümee',
-'subject'                  => 'Pealkiri',
+'summary'                  => 'Resümee:',
+'subject'                  => 'Pealkiri:',
 'minoredit'                => 'See on pisiparandus',
 'watchthis'                => 'Jälgi seda artiklit',
 'savearticle'              => 'Salvesta',
@@ -536,7 +550,7 @@ Sa võid olla juba edukalt muutnud oma parooli või küsinud uue ajutise parooli
 'showdiff'                 => 'Näita muudatusi',
 'anoneditwarning'          => 'Te ei ole sisse logitud. Selle lehe redigeerimislogisse salvestatakse Teie IP-aadress.',
 'missingcommenttext'       => 'Palun sisesta siit allapoole kommentaar.',
-'summary-preview'          => 'Resümee eelvaade',
+'summary-preview'          => 'Resümee eelvaade:',
 'blockedtitle'             => 'Kasutaja on blokeeritud',
 'blockedtext'              => "<big>'''Teie kasutajanime või IP-aadressi blokeeris $1.'''</big>
 
@@ -580,15 +594,19 @@ Teie praegune IP on $3 ning blokeeringu number on #$5. Lisage need andmed kõigi
 Lehekülje loomiseks hakake kirjutama all olevasse tekstikasti
 (lisainfo saamiseks vaadake [[{{MediaWiki:Helppage}}|juhendit]]).
 Kui sattusite siia kogemata, klõpsake lihtsalt brauseri ''back''-nupule või lingile ''tühista''.",
-'anontalkpagetext'         => "---- ''See on arutelulehekülg anonüümse kasutaja kohta, kes ei ole loonud kontot või ei kasuta seda. Sellepärast tuleb meil kasutaja identifitseerimiseks kasutada tema IP-aadressi. See IP-aadress võib olla mitmele kasutajale ühine. Kui olete anonüümne kasutaja ning leiate, et kommentaarid sellel leheküljel ei ole mõeldud Teile, siis palun [[Special:UserLogin|looge konto või logige sisse]], et edaspidi arusaamatusi vältida.''",
-'noarticletext'            => 'Antud leheküljel praegu tekst puudub. Te võite [[Special:Search/{{PAGENAME}}|otsida väljendit "{{PAGENAME}}" teistest artiklitest]] või [{{fullurl:{{FULLPAGENAME}}|action=edit}} luua sellise lehekülje].',
+'anontalkpagetext'         => "---- ''See on arutelulehekülg anonüümse kasutaja jaoks, kes ei ole loonud kontot või ei kasuta seda. Sellepärast tuleb meil kasutaja identifitseerimiseks kasutada tema IP-aadressi.
+Sellisel IP-aadressilt võib portaali kasutada mitu inimest.
+Kui oled osutatud IP kasutaja ning leiad, et siinsed kommentaarid ei puutu kuidagi sinusse, siis palun [[Special:UserLogin|loo konto või logi sisse]], et sind edaspidi teiste anonüümsete kasutajatega segi ei aetaks.''",
+'noarticletext'            => 'Käesoleval leheküljel hetkel teksti ei ole.
+Võid [[Special:Search/{{PAGENAME}}|otsida pealkirjaks olevat fraasi]] teistelt lehtedelt,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} uurida asjassepuutuvaid logisid] või [{{fullurl:{{FULLPAGENAME}}|action=edit}} puuduva lehekülje ise luua]</span>.',
 'clearyourcache'           => "'''Märkus:''' Pärast salvestamist pead sa muudatuste nägemiseks oma brauseri puhvri tühjendama: '''Mozilla:''' ''ctrl-shift-r'', '''IE:''' ''ctrl-f5'', '''Safari:''' ''cmd-shift-r'', '''Konqueror''' ''f5''.",
-'usercssjsyoucanpreview'   => "<strong>Vihje:</strong> Kasuta nuppu 'Näita eelvaadet' oma uue css/js testimiseks enne salvestamist.",
+'usercssjsyoucanpreview'   => "'''Vihje:''' Kasuta nuppu 'Näita eelvaadet' oma uue css/js testimiseks enne salvestamist.",
 'usercsspreview'           => "'''Ärge unustage, et seda versiooni teie isiklikust stiililehest pole veel salvestatud!'''",
 'userjspreview'            => "'''Ärge unustage, et see versioon teie isiklikust javascriptist on alles salvestamata!'''",
 'updated'                  => '(Värskendatud)',
-'note'                     => '<strong>Meeldetuletus:</strong>',
-'previewnote'              => '<strong>Ärge unustage, et see versioon ei ole veel salvestatud!</strong>',
+'note'                     => "'''Meeldetuletus:'''",
+'previewnote'              => "'''Ärge unustage, et see versioon ei ole veel salvestatud!'''",
 'previewconflict'          => 'See eelvaade näitab, kuidas ülemises toimetuskastis olev tekst hakkab välja nägema, kui otsustate salvestada.',
 'editing'                  => 'Redigeerimisel on $1',
 'editingsection'           => 'Redigeerimisel on osa leheküljest $1',
@@ -602,18 +620,20 @@ Kui Te klõpsate nupule
  "Salvesta", siis salvestub <b>ainult</b> ülemises toimetuskastis olev tekst.<br />',
 'yourtext'                 => 'Teie tekst',
 'storedversion'            => 'Salvestatud redaktsioon',
-'editingold'               => '<strong>ETTEVAATUST! Te redigeerite praegu selle lehekülje vana redaktsiooni.
-Kui Te selle salvestate, siis lähevad kõik vahepealsed muudatused kaduma.</strong>',
+'editingold'               => "'''ETTEVAATUST! Te redigeerite praegu selle lehekülje vana redaktsiooni.
+Kui Te selle salvestate, siis lähevad kõik vahepealsed muudatused kaduma.'''",
 'yourdiff'                 => 'Erinevused',
 'copyrightwarning'         => "Pidage silmas, et kõik {{SITENAME}}'le tehtud kaastööd loetakse avaldatuks vastavalt $2 (vaata ka $1). Kui Te ei soovi, et Teie poolt kirjutatut halastamatult redigeeritakse ja omal äranägemisel kasutatakse, siis ärge seda siia salvestage.<br />
 Te kinnitate ka, et kirjutasite selle ise või võtsite selle kopeerimiskitsenduseta allikast.<br />
-<strong>ÄRGE SAATKE AUTORIÕIGUSEGA KAITSTUD MATERJALI ILMA LOATA!</strong>",
+'''ÄRGE SAATKE AUTORIÕIGUSEGA KAITSTUD MATERJALI ILMA LOATA!'''",
 'copyrightwarning2'        => "Pidage silmas, et kõiki {{SITENAME}}'le tehtud kaastöid võidakse muuta või kustutada teiste kaastööliste poolt. Kui Te ei soovi, et Teie poolt kirjutatut halastamatult redigeeritakse, siis ärge seda siia salvestage.<br />
 Te kinnitate ka, et kirjutasite selle ise või võtsite selle kopeerimiskitsenduseta allikast (vaata ka $1).<br />
-<strong>ÄRGE SAATKE AUTORIÕIGUSEGA KAITSTUD MATERJALI ILMA LOATA!</strong>",
-'longpagewarning'          => '<strong>HOIATUS: Selle lehekülje pikkus ületab $1 kilobaiti. Mõne brauseri puhul valmistab raskusi juba 32-le kilobaidile läheneva pikkusega lehekülgede redigeerimine. Palun kaaluge selle lehekülje sisu jaotamist lühemate lehekülgede vahel.</strong>',
-'readonlywarning'          => '<strong>HOIATUS: Andmebaas on lukustatud hooldustöödeks, nii et praegu ei saa parandusi salvestada. Võite teksti alal hoida tekstifailina ning salvestada hiljem.</strong>',
-'protectedpagewarning'     => '<strong>HOIATUS: See lehekülg on lukustatud, nii et seda saavad redigeerida ainult administraatori õigustega kasutajad.</strong>',
+'''ÄRGE SAATKE AUTORIÕIGUSEGA KAITSTUD MATERJALI ILMA LOATA!'''",
+'longpagewarning'          => "'''HOIATUS: Selle lehekülje pikkus ületab $1 kilobaiti. Mõne brauseri puhul valmistab raskusi juba 32-le kilobaidile läheneva pikkusega lehekülgede redigeerimine. Palun kaaluge selle lehekülje sisu jaotamist lühemate lehekülgede vahel.'''",
+'readonlywarning'          => "'''HOIATUS: Andmebaas on lukustatud hooldustöödeks, nii et praegu ei saa parandusi salvestada. Võite teksti hilisemaks kasutamiseks alles hoida tekstifailina.'''
+
+Administraator, kes andmebaasi lukustas, andis järgmise selgituse: $1",
+'protectedpagewarning'     => "'''HOIATUS: See lehekülg on lukustatud, nii et seda saavad redigeerida ainult administraatori õigustega kasutajad.'''",
 'semiprotectedpagewarning' => "'''Märkus:''' See lehekülg on lukustatud nii, et üksnes registreeritud kasutajad saavad seda muuta.",
 'templatesused'            => 'Sellel lehel on kasutusel järgnevad mallid:',
 'templatesusedpreview'     => 'Selles eelvaates kasutatakse järgmisi malle:',
@@ -630,35 +650,41 @@ Te võite pöörduda tagasi ja toimetada olemasolevat lehekülge või [[Special:
 
 Kaaluge, kas lehe uuesti loomine on kohane.
 Lehe eelnevad kustutamised:",
+'deletelog-fulllog'        => 'Vaata täielikku logi',
+'edit-gone-missing'        => 'Polnud võimalik lehekülge uuendada.
+Tundub, et see on kustutatud.',
+'edit-conflict'            => 'Redigeerimiskonflikt.',
+'edit-no-change'           => 'Sinu redigeerimist ignoreeriti, sest tekstile ei olnud tehtud muudatusi.',
+'edit-already-exists'      => 'Ei saanud alustada uut lehekülge.
+See on juba olemas.',
 
 # "Undo" feature
 'undo-success' => 'Selle redaktsiooni käigus tehtud muudatusi saab eemaldada. Palun kontrolli allolevat võrdlust veendumaks, et tahad need muudatused tõepoolest eemaldada. Seejärel saad lehekülje salvestada.',
 'undo-summary' => 'Tühistati muudatus $1, mille tegi [[Special:Contributions/$2|$2]] ([[User talk:$2|arutelu]])',
 
 # History pages
-'viewpagelogs'        => 'Vaata selle lehe logisid',
-'nohistory'           => 'Sellel leheküljel ei ole eelmisi redaktsioone.',
-'revnotfound'         => 'Redaktsiooni ei leitud',
-'revnotfoundtext'     => 'Teie poolt päritud vana redaktsiooni ei leitud.
-Palun kontrollige aadressi, millel Te seda lehekülge leida püüdsite.',
-'currentrev'          => 'Viimane redaktsioon',
-'revisionasof'        => 'Redaktsioon: $1',
-'previousrevision'    => '�Vanem redaktsioon',
-'nextrevision'        => 'Uuem redaktsioon→',
-'currentrevisionlink' => 'vaata viimast redaktsiooni',
-'cur'                 => 'viim',
-'next'                => 'järg',
-'last'                => 'eel',
-'page_first'          => 'esimene',
-'page_last'           => 'viimane',
-'histlegend'          => 'Märgi versioonid, mida tahad võrrelda ja vajuta võrdlemisnupule.
+'viewpagelogs'           => 'Vaata selle lehe logisid',
+'nohistory'              => 'Sellel leheküljel ei ole eelmisi redaktsioone.',
+'currentrev'             => 'Viimane redaktsioon',
+'currentrev-asof'        => 'Viimane redaktsioon ($1)',
+'revisionasof'           => 'Redaktsioon: $1',
+'previousrevision'       => '�Vanem redaktsioon',
+'nextrevision'           => 'Uuem redaktsioon→',
+'currentrevisionlink'    => 'vaata viimast redaktsiooni',
+'cur'                    => 'viim',
+'next'                   => 'järg',
+'last'                   => 'eel',
+'page_first'             => 'esimene',
+'page_last'              => 'viimane',
+'histlegend'             => 'Märgi versioonid, mida tahad võrrelda ja vajuta võrdlemisnupule.
 Legend: (viim) = erinevused võrreldes viimase redaktsiooniga,
 (eel) = erinevused võrreldes eelmise redaktsiooniga, P = pisimuudatus',
-'deletedrev'          => '[kustutatud]',
-'histfirst'           => 'Esimesed',
-'histlast'            => 'Viimased',
-'historysize'         => '({{PLURAL:$1|1 bait|$1 baiti}})',
-'historyempty'        => '(tühi)',
+'history-fieldset-title' => 'Lehitse ajalugu.',
+'deletedrev'             => '[kustutatud]',
+'histfirst'              => 'Esimesed',
+'histlast'               => 'Viimased',
+'historysize'            => '({{PLURAL:$1|1 bait|$1 baiti}})',
+'historyempty'           => '(tühi)',
 
 # Revision feed
 'history-feed-title'          => 'Redigeerimiste ajalugu',
@@ -694,95 +720,144 @@ Legend: (viim) = erinevused võrreldes viimase redaktsiooniga,
 'difference'              => '(Erinevused redaktsioonide vahel)',
 'lineno'                  => 'Rida $1:',
 'compareselectedversions' => 'Võrdle valitud redaktsioone',
+'visualcomparison'        => 'Visuaalne võrdlus',
+'wikicodecomparison'      => 'Wikitekstide võrdlus',
 'editundo'                => 'eemalda',
 'diff-multi'              => '({{PLURAL:$1|Ühte vahepealset muudatust|$1 vahepealset muudatust}} ei näidata.)',
+'diff-removed'            => '$1 eemaldatud',
+'diff-src'                => 'allikas',
+'diff-width'              => 'laius',
+'diff-height'             => 'kõrgus',
+'diff-p'                  => "'''paragrahv'''",
+'diff-blockquote'         => "'''tsitaat'''",
+'diff-h1'                 => "'''pealkiri (tase 1)'''",
+'diff-h2'                 => "'''pealkiri (tase 2)'''",
+'diff-h3'                 => "'''pealkiri (tase 3)'''",
+'diff-h4'                 => "'''pealkiri (tase 4)'''",
+'diff-h5'                 => "'''pealkiri (tase 5)'''",
+'diff-table'              => "'''tabel'''",
+'diff-tbody'              => "'''tabeli sisu'''",
+'diff-tr'                 => "'''rida'''",
+'diff-th'                 => "'''päis'''",
+'diff-br'                 => "'''tühik'''",
+'diff-dd'                 => "'''definitsioon'''",
+'diff-img'                => "'''pilt'''",
+'diff-span'               => "'''ulatus'''",
+'diff-a'                  => "'''link'''",
+'diff-i'                  => "'''kaldkiri'''",
+'diff-b'                  => "'''paks kiri'''",
+'diff-strong'             => "'''tugev'''",
+'diff-em'                 => "'''rõhk'''",
+'diff-font'               => "'''kirjatüüp'''",
+'diff-big'                => "'''suur'''",
+'diff-del'                => "'''kustutatud'''",
+'diff-tt'                 => "'''fikseeritud laius'''",
+'diff-sub'                => "'''alaindeks'''",
+'diff-sup'                => "'''ülaindeks'''",
+'diff-strike'             => "'''läbi joonitud'''",
 
 # Search results
-'searchresults'             => 'Otsingu tulemused',
-'searchresulttext'          => 'Lisainfot otsimise kohta vaata [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Päring "[[:$1]]"',
-'searchsubtitleinvalid'     => 'Päring "$1"',
-'noexactmatch'              => "'''Artiklit pealkirjaga \"\$1\" ei leitud.''' Võite [[:\$1|selle artikli luua]].",
-'titlematches'              => 'Vasted artikli pealkirjades',
-'notitlematches'            => 'Artikli pealkirjades otsitavat ei leitud',
-'textmatches'               => 'Vasted artikli tekstides',
-'notextmatches'             => 'Artikli tekstides otsitavat ei leitud',
-'prevn'                     => 'eelmised $1',
-'nextn'                     => 'järgmised $1',
-'viewprevnext'              => 'Näita ($1) ($2) ($3).',
-'search-suggest'            => 'Kas Sa mõtlesid: $1',
-'search-interwiki-caption'  => 'Sõsarprojektid',
-'search-interwiki-default'  => '$1 tulemused:',
-'search-mwsuggest-enabled'  => 'ettepanekutega',
-'search-mwsuggest-disabled' => 'ettepanekuid ei ole',
-'search-relatedarticle'     => 'Seotud',
-'searchrelated'             => 'seotud',
-'searchall'                 => 'kõik',
-'showingresults'            => "Allpool näitame {{PLURAL:$1|'''ühte''' tulemit|'''$1''' tulemit}} alates tulemist #'''$2'''.",
-'nonefound'                 => '<strong>Märkus</strong>: otsingute ebaõnnestumise sagedaseks põhjuseks on asjaolu,
-et väga sageli esinevaid sõnu ei võta süsteem otsimisel arvesse. Teine põhjus võib olla
-mitme otsingusõna kasutamine (tulemusena ilmuvad ainult leheküljed, mis sisaldavad kõiki otsingusõnu).',
-'powersearch'               => 'Otsi',
-'powersearch-ns'            => 'Otsing nimeruumidest:',
-'searchdisabled'            => "<p>Vabandage! Otsing vikist on ajutiselt peatatud, et säilitada muude teenuste normaalne töökiirus. Otsimiseks võite kasutada allpool olevat Google'i otsinguvormi, kuid sellelt saadavad tulemused võivad olla vananenud.</p>",
+'searchresults'                   => 'Otsingu tulemused',
+'searchresults-title'             => 'Otsingu "$1" tulemused',
+'searchresulttext'                => 'Lisainfot otsimise kohta vaata [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                  => 'Otsisid fraasi "[[:$1]]" ([[Special:Prefixindex/$1|kõik sõnega "$1" algavad lehed]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|kõik lehed, mis sisaldavad linke artiklile "$1"]])',
+'searchsubtitleinvalid'           => 'Päring "$1"',
+'noexactmatch'                    => "'''Artiklit pealkirjaga \"\$1\" ei leitud.''' Võite [[:\$1|selle artikli luua]].",
+'titlematches'                    => 'Vasted artikli pealkirjades',
+'notitlematches'                  => 'Artikli pealkirjades otsitavat ei leitud',
+'textmatches'                     => 'Vasted artikli tekstides',
+'notextmatches'                   => 'Artikli tekstides otsitavat ei leitud',
+'prevn'                           => 'eelmised $1',
+'nextn'                           => 'järgmised $1',
+'viewprevnext'                    => 'Näita ($1) ($2) ($3).',
+'searchmenu-legend'               => 'Otsingu sätted',
+'searchhelp-url'                  => 'Help:Juhend',
+'searchprofile-articles'          => 'Sisuleheküljed',
+'searchprofile-articles-and-proj' => 'Sisu- & projektileheküljed',
+'searchprofile-project'           => 'Projektilehed',
+'searchprofile-images'            => 'Failid',
+'searchprofile-everything'        => 'Kõik',
+'searchprofile-images-tooltip'    => 'Failiotsing',
+'search-result-size'              => '$1 ({{PLURAL:$2|1 sõna|$2 sõna}})',
+'search-suggest'                  => 'Kas Sa mõtlesid: $1',
+'search-interwiki-caption'        => 'Sõsarprojektid',
+'search-interwiki-default'        => '$1 tulemused:',
+'search-mwsuggest-enabled'        => 'ettepanekutega',
+'search-mwsuggest-disabled'       => 'ettepanekuid ei ole',
+'search-relatedarticle'           => 'Seotud',
+'searchrelated'                   => 'seotud',
+'searchall'                       => 'kõik',
+'showingresults'                  => "Allpool näitame {{PLURAL:$1|'''ühte''' tulemit|'''$1''' tulemit}} alates tulemist #'''$2'''.",
+'showingresultstotal'             => "Allpool näidatakse {{PLURAL:$4|'''$1'''. tulemust (otsingutulemuste koguarv '''$3''')|'''$1. - $2.''' tulemust (otsingutulemuste koguarv '''$3''')}}",
+'nonefound'                       => "'''Märkus''': Otsing hõlmab vaikimisi vaid osasid nimeruume.
+Kui soovid otsida ühekorraga kõigist nimeruumidest (kaasa arvatud arutelulehed, mallid, jne) kasuta
+päringu ees prefiksit ''all:''. Konkreetsest nimeruumist otsimiseks kasuta prefiksina sele nimeruumi nime.",
+'powersearch'                     => 'Otsi',
+'powersearch-legend'              => 'Detailne otsing',
+'powersearch-ns'                  => 'Otsing nimeruumidest:',
+'powersearch-redir'               => 'Loetle ümbersuunamised',
+'powersearch-field'               => 'Otsi fraasi',
+'searchdisabled'                  => "<p>Vabandage! Otsing vikist on ajutiselt peatatud, et säilitada muude teenuste normaalne töökiirus. Otsimiseks võite kasutada allpool olevat Google'i otsinguvormi, kuid sellelt saadavad tulemused võivad olla vananenud.</p>",
 
 # Preferences page
-'preferences'              => 'Eelistused',
-'mypreferences'            => 'eelistused',
-'prefs-edits'              => 'Redigeerimiste arv:',
-'prefsnologin'             => 'Te ei ole sisse loginud',
-'prefsnologintext'         => 'Et oma eelistusi seada, [[Special:UserLogin|tuleb Teil]]
-sisse logida.',
-'prefsreset'               => 'Teie eelistused on arvutimälu järgi taastatud.',
-'qbsettings'               => 'Kiirriba sätted',
-'qbsettings-none'          => 'Ei_ole',
-'qbsettings-fixedleft'     => 'Püsivalt_vasakul',
-'qbsettings-fixedright'    => 'Püsivalt paremal',
-'qbsettings-floatingleft'  => 'Ujuvalt vasakul',
-'qbsettings-floatingright' => 'Ujuvalt paremal',
-'changepassword'           => 'Muuda parool',
-'skin'                     => 'Kujundus',
-'math'                     => 'Valemite näitamine',
-'dateformat'               => 'Kuupäeva formaat',
-'datedefault'              => 'Eelistus puudub',
-'datetime'                 => 'Kuupäev ja kellaaeg',
-'math_failure'             => 'Arusaamatu süntaks',
-'math_unknown_error'       => 'Tundmatu viga',
-'math_unknown_function'    => 'Tundmatu funktsioon',
-'math_lexing_error'        => 'Väljalugemisviga',
-'math_syntax_error'        => 'Süntaksiviga',
-'prefs-personal'           => 'Kasutaja andmed',
-'prefs-rc'                 => 'Viimaste muudatuste kuvamine',
-'prefs-watchlist'          => 'Jälgimisloend',
-'prefs-watchlist-days'     => 'Mitme päeva muudatusi näidata loendis:',
-'prefs-watchlist-edits'    => 'Mitu muudatust näidatakse laiendatud jälgimisloendis:',
-'prefs-misc'               => 'Muud seaded',
-'saveprefs'                => 'Salvesta eelistused',
-'resetprefs'               => 'Lähtesta eelistused',
-'oldpassword'              => 'Vana parool',
-'newpassword'              => 'Uus parool',
-'retypenew'                => 'Sisestage uus parool uuesti',
-'textboxsize'              => 'Redigeerimisseaded',
-'rows'                     => 'Redaktoriakna ridade arv:',
-'columns'                  => 'Veergude arv',
-'searchresultshead'        => 'Otsingutulemite sätted',
-'resultsperpage'           => 'Tulemeid leheküljel',
-'contextlines'             => 'Ridu tulemis',
-'contextchars'             => 'Konteksti pikkus real',
-'recentchangesdays'        => 'Mitu päeva näidata viimastes muudatustes:',
-'recentchangescount'       => 'Pealkirjade arv viimastes muudatustes',
-'savedprefs'               => 'Teie eelistused on salvestatud.',
-'timezonelegend'           => 'Ajavöönd',
-'timezonetext'             => 'Kohaliku aja ja serveri aja (maailmaaja) vahe tundides.',
-'localtime'                => 'Kohalik aeg',
-'timezoneoffset'           => 'Ajavahe',
-'servertime'               => 'Serveri aeg',
-'guesstimezone'            => 'Loe aeg brauserist',
-'allowemail'               => 'Luba teistel kasutajatel mulle e-posti saata',
-'prefs-namespaces'         => 'Nimeruumid',
-'defaultns'                => 'Vaikimisi otsi järgmistest nimeruumidest:',
-'default'                  => 'vaikeväärtus',
-'files'                    => 'Failid',
+'preferences'               => 'Eelistused',
+'mypreferences'             => 'eelistused',
+'prefs-edits'               => 'Redigeerimiste arv:',
+'prefsnologin'              => 'Te ei ole sisse loginud',
+'prefsnologintext'          => 'Et oma eelistusi seada, peate olema <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} sisse logitud]</span>.',
+'prefsreset'                => 'Teie eelistused on arvutimälu järgi taastatud.',
+'qbsettings'                => 'Kiirriba sätted',
+'qbsettings-none'           => 'Ei_ole',
+'qbsettings-fixedleft'      => 'Püsivalt_vasakul',
+'qbsettings-fixedright'     => 'Püsivalt paremal',
+'qbsettings-floatingleft'   => 'Ujuvalt vasakul',
+'qbsettings-floatingright'  => 'Ujuvalt paremal',
+'changepassword'            => 'Muuda parool',
+'skin'                      => 'Kujundus',
+'skin-preview'              => 'Eelvaade',
+'math'                      => 'Valemite näitamine',
+'dateformat'                => 'Kuupäeva formaat',
+'datedefault'               => 'Eelistus puudub',
+'datetime'                  => 'Kuupäev ja kellaaeg',
+'math_failure'              => 'Arusaamatu süntaks',
+'math_unknown_error'        => 'Tundmatu viga',
+'math_unknown_function'     => 'Tundmatu funktsioon',
+'math_lexing_error'         => 'Väljalugemisviga',
+'math_syntax_error'         => 'Süntaksiviga',
+'prefs-personal'            => 'Kasutaja andmed',
+'prefs-rc'                  => 'Viimaste muudatuste kuvamine',
+'prefs-watchlist'           => 'Jälgimisloend',
+'prefs-watchlist-days'      => 'Mitme päeva muudatusi näidata loendis:',
+'prefs-watchlist-days-max'  => '(maksimaalne päevade arv on 7)',
+'prefs-watchlist-edits'     => 'Mitu muudatust näidatakse laiendatud jälgimisloendis:',
+'prefs-watchlist-edits-max' => '(maksimaalne väärtus: 1000)',
+'prefs-misc'                => 'Muud seaded',
+'prefs-resetpass'           => 'Muuda parooli',
+'saveprefs'                 => 'Salvesta eelistused',
+'resetprefs'                => 'Lähtesta eelistused',
+'textboxsize'               => 'Redigeerimisseaded',
+'prefs-edit-boxsize'        => 'Toimetamise akna suurus.',
+'rows'                      => 'Redaktoriakna ridade arv:',
+'columns'                   => 'Veergude arv',
+'searchresultshead'         => 'Otsingutulemite sätted',
+'resultsperpage'            => 'Tulemeid leheküljel',
+'contextlines'              => 'Ridu tulemis',
+'contextchars'              => 'Konteksti pikkus real',
+'recentchangesdays'         => 'Mitu päeva näidata viimastes muudatustes:',
+'recentchangescount'        => 'Mitut pealkirja näidata vaikimisi viimaste muudatuste lehel, artiklite ajaloolehtedel ja logides:',
+'savedprefs'                => 'Teie eelistused on salvestatud.',
+'timezonelegend'            => 'Ajavöönd',
+'timezonetext'              => 'Kohaliku aja ja serveri aja (maailmaaja) vahe tundides.',
+'localtime'                 => 'Kohalik aeg:',
+'timezoneselect'            => 'Ajavöönd:',
+'timezoneoffset'            => 'Ajavahe¹:',
+'servertime'                => 'Serveri aeg:',
+'guesstimezone'             => 'Loe aeg brauserist',
+'allowemail'                => 'Luba teistel kasutajatel mulle e-posti saata',
+'prefs-namespaces'          => 'Nimeruumid',
+'defaultns'                 => 'Vaikimisi otsi järgmistest nimeruumidest:',
+'default'                   => 'vaikeväärtus',
+'files'                     => 'Failid',
 
 # User rights
 'userrights'               => 'Kasutaja õiguste muutmine', # Not used as normal message but as header for the special page itself
@@ -835,6 +910,26 @@ sisse logida.',
 'rightslogtext' => 'See on logi kasutajate õiguste muutuste kohta.',
 'rightsnone'    => '(puuduvad)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'             => 'loe seda lehekülge',
+'action-edit'             => 'muuda seda lehekülge',
+'action-createpage'       => 'alusta lehekülgi',
+'action-createtalk'       => 'alusta arutelulehti',
+'action-createaccount'    => 'loo see kasutajakonto',
+'action-minoredit'        => 'märgista see muudatus kui pisimuudatus',
+'action-move'             => 'teisalda see lehekülg',
+'action-delete'           => 'kustuta see lehekülg',
+'action-deleterevision'   => 'kustuta see redigeerimine',
+'action-deletedhistory'   => 'vaata selle lehekülje kustutatud ajalugu',
+'action-browsearchive'    => 'otsi kustutatud lehekülgi',
+'action-undelete'         => 'taasta see lehekülg',
+'action-suppressrevision' => 'vaata üle ja taasta see peidetud redigeerimine',
+'action-suppressionlog'   => 'vaata seda privaatlogi',
+'action-block'            => 'blokeeri see kasutaja toimetamisest',
+'action-protect'          => 'muuda selle lehekülje kaitsetasemeid',
+'action-import'           => 'impordi see lehekülg teisest wikist',
+'action-importupload'     => 'impordi see lehekülg faili üleslaadimisest',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|muudatus|muudatust}}',
 'recentchanges'                     => 'Viimased muudatused',
@@ -857,10 +952,12 @@ sisse logida.',
 'boteditletter'                     => 'b',
 'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|jälgiv kasutaja|jälgivat kasutajat}}]',
 'newsectionsummary'                 => '/* $1 */ uus alajaotus',
+'rc-enhanced-hide'                  => 'Peida detailid',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Seotud muudatused',
 'recentchangeslinked-title'    => 'Muudatused, mis on seotud "$1"-ga.',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => 'Antud ajavahemiku jooksul ei ole lingitud lehekülgedel muudatusi tehtud.',
 'recentchangeslinked-summary'  => "See on viimaste muudatuste nimekiri lehekülgedel, kuhu lähevad lingid antud leheküljelt (või antud kategooria liikmetele).
 Leheküljed, mis lähevad [[Special:Watchlist|Jälgimisloendi]] koosseisu, on esiletoodud '''rasvasena'''.",
@@ -878,7 +975,7 @@ Leheküljed, mis lähevad [[Special:Watchlist|Jälgimisloendi]] koosseisu, on es
 peaksid tagama, et see järgib siinset [[{{MediaWiki:Policy-url}}|piltide kasutamise korda]].
 
 Et näha või leida eelnevalt üleslaetud pilte,
-mine vaata [[Special:ImageList|piltide nimekirja]].
+mine vaata [[Special:FileList|piltide nimekirja]].
 Üleslaadimised ning kustutamised logitakse [[Special:Log/upload|üleslaadimise logis]].
 
 Järgneva vormi abil saad laadida üles uusi pilte
@@ -896,7 +993,7 @@ Eelistatud formaatideks on fotode puhul JPEG , joonistuste
 ja ikoonilaadsete piltide puhul PNG, helide jaoks aga OGG.
 Nimeta oma failid palun nõnda, et nad kirjeldaksid arusaadaval moel faili sisu, see aitab segadusi vältida.
 Pildi lisamiseks artiklile, kasuta linki kujul:
-<b><nowiki>[[</nowiki>{{ns:image}}<nowiki>:pilt.jpg]]</nowiki></b> või <b><nowiki>[[</nowiki>{{ns:image}}<nowiki>:pilt.png|alt. tekst]]</nowiki></b>.
+<b><nowiki>[[</nowiki>{{ns:file}}<nowiki>:pilt.jpg]]</nowiki></b> või <b><nowiki>[[</nowiki>{{ns:file}}<nowiki>:pilt.png|alt. tekst]]</nowiki></b>.
 Helifaili puhul: <b><nowiki>[[</nowiki>{{ns:media}}<nowiki>:fail.ogg]]</nowiki></b>.
 
 Pane tähele, et nagu ka ülejäänud siinsete lehekülgede puhul,
@@ -917,14 +1014,14 @@ võidakse sinu ligipääs sulgeda.',
 'ignorewarnings'       => 'Ignoreeri hoiatusi',
 'illegalfilename'      => 'Faili "$1" nimi sisaldab sümboleid, mis pole pealkirjades lubatud. Palun nimetage fail ümber ja proovige uuesti.',
 'badfilename'          => 'Pildi nimi on muudetud. Uus nimi on "$1".',
-'filetype-banned-type' => "'''\".\$1\"''' ei ole lubatud failitüüp.  Lubatud failitüübid on \$2.",
+'filetype-banned-type' => "'''\".\$1\"''' ei ole lubatud failitüüp.  Lubatud {{PLURAL:\$3|failitüüp|failitüübid}} on  \$2.",
 'large-file'           => 'On soovitatav, et üleslaetavad failid ei oleks suuremad kui $1; selle faili suurus on $2.',
 'largefileserver'      => 'Antud fail on suurem serverikonfiguratsiooni poolt lubatavast failisuurusest.',
 'emptyfile'            => 'Fail, mille Te üles laadisite, paistab olevat tühi.
 See võib olla tingitud vigasest failinimest.
 Palun kaalutlege, kas Te tõesti soovite seda faili üles laadida.',
-'fileexists'           => 'Sellise nimega fail on juba olemas. Palun kontrollige <strong><tt>$1</tt></strong>, kui te ei ole kindel, kas tahate seda muuta.',
-'fileexists-forbidden' => 'Sellise nimega fail on juba olemas, palun pöörduge tagasi ja laadige fail üles mõne teise nime all. [[Image:$1|thumb|center|$1]]',
+'fileexists'           => "Sellise nimega fail on juba olemas. Palun kontrollige '''<tt>$1</tt>''', kui te ei ole kindel, kas tahate seda muuta.",
+'fileexists-forbidden' => 'Sellise nimega fail on juba olemas, palun pöörduge tagasi ja laadige fail üles mõne teise nime all. [[File:$1|thumb|center|$1]]',
 'successfulupload'     => 'Üleslaadimine õnnestus',
 'uploadwarning'        => 'Ãœleslaadimise hoiatus',
 'savefile'             => 'Salvesta fail',
@@ -944,16 +1041,16 @@ Palun kaalutlege, kas Te tõesti soovite seda faili üles laadida.',
 'license'   => 'Litsents:',
 'nolicense' => 'pole valitud',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => 'fail',
-'imagelist'             => 'Piltide loend',
-'imagelist_date'        => 'Kuupäev',
-'imagelist_name'        => 'Nimi',
-'imagelist_user'        => 'Kasutaja',
-'imagelist_size'        => 'Suurus',
-'imagelist_description' => 'Kirjeldus',
-
-# Image description page
+'listfiles'             => 'Piltide loend',
+'listfiles_date'        => 'Kuupäev',
+'listfiles_name'        => 'Nimi',
+'listfiles_user'        => 'Kasutaja',
+'listfiles_size'        => 'Suurus',
+'listfiles_description' => 'Kirjeldus',
+
+# File description page
 'filehist'                  => 'Faili ajalugu',
 'filehist-help'             => 'Klõpsa Kuupäev/kellaaeg, et näha faili sel ajahetkel.',
 'filehist-deleteall'        => 'kustuta kõik',
@@ -961,11 +1058,12 @@ Palun kaalutlege, kas Te tõesti soovite seda faili üles laadida.',
 'filehist-revert'           => 'taasta',
 'filehist-current'          => 'viimane',
 'filehist-datetime'         => 'Kuupäev/kellaaeg',
+'filehist-thumb'            => 'Pöialpilt',
 'filehist-user'             => 'Kasutaja',
 'filehist-dimensions'       => 'Mõõtmed',
 'filehist-filesize'         => 'Faili suurus',
 'filehist-comment'          => 'Kommentaar',
-'imagelinks'                => 'Viited pildile',
+'imagelinks'                => 'Viited failidele',
 'linkstoimage'              => 'Sellele pildile {{PLURAL:$1|viitab järgmine lehekülg|viitavad järgmised leheküljed}}:',
 'nolinkstoimage'            => 'Sellele pildile ei viita ükski lehekülg.',
 'sharedupload'              => 'See fail on ühiskasutuses ja seda võib kasutada teistes projektides.',
@@ -1010,19 +1108,18 @@ Palun kaalutlege, kas Te tõesti soovite seda faili üles laadida.',
 'randomredirect' => 'Juhuslik ümbersuunamine',
 
 # Statistics
-'statistics'    => 'Statistika',
-'sitestats'     => 'Saidi statistika',
-'userstats'     => 'Kasutaja statistika',
-'sitestatstext' => "Andmebaas sisaldab kokku {{PLURAL:$1|'''1''' lehekülje|'''$1''' lehekülge}}.
-See arv hõlmab ka arutelulehekülgi, abilehekülgi, väga lühikesi lehekülgi (nuppe), ümbersuunamislehekülgi ning muid lehekülgi. Ilma neid arvestamata on vikis praegu {{PLURAL:$2|'''1''' lehekülg|'''$2''' lehekülge}}, mida võib pidada artikliteks.
-
-Ãœles on laetud '''$8''' {{PLURAL:$8|fail|faili}}.
-
-Alates {{SITENAME}} töösse seadmisest on lehekülgede vaatamisi kokku '''$3''' ja redigeerimisi '''$4'''.
-Seega keskmiselt '''$5''' redigeerimist lehekülje kohta ja '''$6''' lehekülje vaatamist ühe redigeerimise kohta.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Töö järjekorra] pikkus on '''$7'''.",
-'userstatstext' => "Registreeritud [[Special:ListUsers|kasutajate]] arv: '''$1''', kelledest '''$2''' (ehk '''$4%''') on $5 õigused.",
+'statistics'               => 'Statistika',
+'statistics-header-pages'  => 'Lehekülgede statistika',
+'statistics-header-edits'  => 'Redigeerimise statistika',
+'statistics-header-users'  => 'Kasutajate statistika',
+'statistics-articles'      => 'Sisulehekülgi',
+'statistics-pages'         => 'Lehekülgi',
+'statistics-files'         => 'Ãœleslaaditud faile',
+'statistics-edits'         => 'Redigeerimisi alates {{SITENAME}} loomisest',
+'statistics-edits-average' => 'Keskmiselt redigeerimisi lehekülje kohta',
+'statistics-jobqueue'      => '[http://www.mediawiki.org/wiki/Manual:Job_queue Tööjärje] pikkus',
+'statistics-users'         => 'Registreeritud [[Special:ListUsers|kasutajaid]]',
+'statistics-users-active'  => 'Aktiivseid kasutajaid',
 
 'disambiguations' => 'Täpsustusleheküljed',
 
@@ -1044,7 +1141,7 @@ Seega keskmiselt '''$5''' redigeerimist lehekülje kohta ja '''$6''' lehekülje
 'nlinks'                  => '$1 {{PLURAL:$1|link|linki}}',
 'nmembers'                => '$1 {{PLURAL:$1|liige|liiget}}',
 'nrevisions'              => '$1 {{PLURAL:$1|redaktsioon|redaktsiooni}}',
-'nviews'                  => 'Külastuste arv: $1',
+'nviews'                  => '$1 {{PLURAL:$1|külastus|külastust}}',
 'lonelypages'             => 'Viitamata artiklid',
 'lonelypagestext'         => 'Järgmistele lehekülgedele ei ole linki ühelgi Viki leheküljel.',
 'uncategorizedpages'      => 'Kategoriseerimata leheküljed',
@@ -1056,6 +1153,7 @@ Seega keskmiselt '''$5''' redigeerimist lehekülje kohta ja '''$6''' lehekülje
 'popularpages'            => 'Loetumad artiklid',
 'wantedcategories'        => 'Kõige oodatumad kategooriad',
 'wantedpages'             => 'Kõige oodatumad artiklid',
+'wantedfiles'             => 'Kõige oodatumad failid',
 'mostlinked'              => 'Kõige viidatumad leheküljed',
 'mostlinkedcategories'    => 'Kõige viidatumad kategooriad',
 'mostlinkedtemplates'     => 'Kõige viidatumad mallid',
@@ -1088,7 +1186,6 @@ Seega keskmiselt '''$5''' redigeerimist lehekülje kohta ja '''$6''' lehekülje
 'speciallogtitlelabel' => 'Pealkiri:',
 'log'                  => 'Logid',
 'all-logs-page'        => 'Kõik logid',
-'log-search-legend'    => 'Otsi logisid',
 'alllogstext'          => 'See on kombineeritud vaade üleslaadimise, kustutamise, kaitsmise, blokeerimise ja administraatorilogist. Valiku kitsendamiseks vali soovitav logitüüp, sisesta kasutajanimi või huvi pakkuva lehekülge pealkiri.',
 'logempty'             => 'Logides vastavad kirjed puuduvad.',
 
@@ -1097,7 +1194,8 @@ Seega keskmiselt '''$5''' redigeerimist lehekülje kohta ja '''$6''' lehekülje
 'alphaindexline'    => '$1 kuni $2',
 'nextpage'          => 'Järgmine lehekülg ($1)',
 'prevpage'          => 'Eelmine lehekülg ($1)',
-'allpagesfrom'      => 'Näita alates:',
+'allpagesfrom'      => 'Näita lehti alates pealkirjast:',
+'allpagesto'        => 'Näita lehti kuni pealkirjani:',
 'allarticles'       => 'Kõik artiklid',
 'allinnamespace'    => 'Kõik artiklid ($1 nimeruum)',
 'allnotinnamespace' => 'Kõik artiklid (mis ei kuulu $1 nimeruumi)',
@@ -1111,16 +1209,27 @@ Seega keskmiselt '''$5''' redigeerimist lehekülje kohta ja '''$6''' lehekülje
 'categoriespagetext' => 'Vikis on järgmised kategooriad.',
 'categoriesfrom'     => 'Näita kategooriaid alates:',
 
+# Special:LinkSearch
+'linksearch' => 'Välislingid',
+
 # Special:ListUsers
 'listusersfrom'      => 'Näita kasutajaid alustades:',
 'listusers-submit'   => 'Näita',
 'listusers-noresult' => 'Kasutajat ei leitud.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Kasutaja loomise logi',
+'newuserlogpagetext'          => 'See logi sisaldab infot äsja loodud uute kasutajate kohta.',
+'newuserlog-byemail'          => 'parool saadetud e-postiga',
+'newuserlog-create-entry'     => 'Uus kasutaja',
+'newuserlog-create2-entry'    => 'loodud konto $1',
+'newuserlog-autocreate-entry' => 'Konto loodud automaatselt',
+
 # Special:ListGroupRights
 'listgrouprights'               => 'Kasutajagrupi õigused',
 'listgrouprights-group'         => 'Grupp',
 'listgrouprights-rights'        => 'Õigused',
-'listgrouprights-helppage'      => 'Abi:Grupi õigused',
+'listgrouprights-helppage'      => 'Help:Grupi õigused',
 'listgrouprights-members'       => '(liikmete loend)',
 'listgrouprights-right-display' => '$1 ($2)',
 
@@ -1166,12 +1275,7 @@ Kui tahad seda lehte hiljem jälgimisloendist eemaldada, klõpsa päisenupule "L
 'watchlistcontains'    => 'Sinu jälgimisloendis on $1 {{PLURAL:$1|artikkel|artiklit}}.',
 'wlnote'               => "Allpool on {{PLURAL:$1|viimane muudatus|viimased '''$1''' muudatust}} viimase {{PLURAL:$2|tunni|'''$2''' tunni}} jooksul.",
 'wlshowlast'           => 'Näita viimast $1 tundi $2 päeva. $3',
-'watchlist-show-bots'  => 'Näita roboteid',
-'watchlist-hide-bots'  => 'Peida robotite parandused',
-'watchlist-show-own'   => 'Näita minu redaktsioone',
-'watchlist-hide-own'   => 'Peida minu parandused',
-'watchlist-show-minor' => 'Näita pisiparandusi',
-'watchlist-hide-minor' => 'Peida pisiparandused',
+'watchlist-options'    => 'Jälgimisloendi võimalused',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'jälgin...',
@@ -1181,63 +1285,76 @@ Kui tahad seda lehte hiljem jälgimisloendist eemaldada, klõpsa päisenupule "L
 'enotif_newpagetext' => 'See on uus lehekülg.',
 'changed'            => 'muudetud',
 
-# Delete/protect/revert
-'deletepage'                  => 'Kustuta lehekülg',
-'confirm'                     => 'Kinnita',
-'excontent'                   => "sisu oli: '$1'",
-'excontentauthor'             => "sisu oli: '$1' (ja ainuke kirjutaja oli '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "sisu enne lehekülje tühjendamist: '$1'",
-'exblank'                     => 'lehekülg oli tühi',
-'delete-confirm'              => 'Kustuta "$1"',
-'delete-legend'               => 'Kustuta',
-'historywarning'              => 'Hoiatus: leheküljel, mida tahate kustutada, on ajalugu:&nbsp;',
-'confirmdeletetext'           => 'Sa oled andmebaasist jäädavalt kustutamas lehte või pilti koos kogu tema ajalooga. Palun kinnita, et sa tahad seda tõepoolest teha, et sa mõistad tagajärgi ja et sinu tegevus on kooskõlas siinse [[{{MediaWiki:Policy-url}}|sisekorraga]].',
-'actioncomplete'              => 'Toiming sooritatud',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" on kustutatud. $2 lehel on nimekiri viimastest kustutatud lehekülgedest.',
-'deletedarticle'              => '"$1" kustutatud',
-'dellogpage'                  => 'Kustutatud_leheküljed',
-'dellogpagetext'              => 'Allpool on esitatud nimekiri viimastest kustutamistest.
+# Delete
+'deletepage'             => 'Kustuta lehekülg',
+'confirm'                => 'Kinnita',
+'excontent'              => "sisu oli: '$1'",
+'excontentauthor'        => "sisu oli: '$1' (ja ainuke kirjutaja oli '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "sisu enne lehekülje tühjendamist: '$1'",
+'exblank'                => 'lehekülg oli tühi',
+'delete-confirm'         => 'Kustuta "$1"',
+'delete-legend'          => 'Kustuta',
+'historywarning'         => 'Hoiatus: leheküljel, mida tahate kustutada, on ajalugu:&nbsp;',
+'confirmdeletetext'      => 'Sa oled andmebaasist jäädavalt kustutamas lehte või pilti koos kogu tema ajalooga. Palun kinnita, et sa tahad seda tõepoolest teha, et sa mõistad tagajärgi ja et sinu tegevus on kooskõlas siinse [[{{MediaWiki:Policy-url}}|sisekorraga]].',
+'actioncomplete'         => 'Toiming sooritatud',
+'deletedtext'            => '"<nowiki>$1</nowiki>" on kustutatud. $2 lehel on nimekiri viimastest kustutatud lehekülgedest.',
+'deletedarticle'         => '"$1" kustutatud',
+'dellogpage'             => 'Kustutatud_leheküljed',
+'dellogpagetext'         => 'Allpool on esitatud nimekiri viimastest kustutamistest.
 Kõik toodud kellaajad järgivad serveriaega.',
-'deletionlog'                 => 'Kustutatud leheküljed',
-'reverted'                    => 'Pöörduti tagasi varasemale versioonile',
-'deletecomment'               => 'Kustutamise põhjus',
-'deleteotherreason'           => 'Muu/täiendav põhjus:',
-'deletereasonotherlist'       => 'Muu põhjus',
-'deletereason-dropdown'       => '*Harilikud kustutamise põhjused
+'deletionlog'            => 'Kustutatud leheküljed',
+'reverted'               => 'Pöörduti tagasi varasemale versioonile',
+'deletecomment'          => 'Kustutamise põhjus',
+'deleteotherreason'      => 'Muu/täiendav põhjus:',
+'deletereasonotherlist'  => 'Muu põhjus',
+'deletereason-dropdown'  => '*Harilikud kustutamise põhjused
 ** Autori palve
 ** Autoriõiguste rikkumine
 ** Vandalism',
-'delete-edit-reasonlist'      => 'Redigeeri kustutamise põhjuseid',
-'rollback'                    => 'Tühista muudatused',
-'rollback_short'              => 'Tühista',
-'rollbacklink'                => 'tühista',
-'rollbackfailed'              => 'Muudatuste tühistamine ebaõnnestus',
-'cantrollback'                => 'Ei saa muudatusi tagasi pöörata; viimane kaastööline on artikli ainus autor.',
-'editcomment'                 => 'Artikli sisu oli: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Tühistati [[Eri:Contributions/$2|$2]] ([[Kasutaja arutelu:$2|arutelu]]) muudatus ning pöörduti tagasi viimasele muudatusele, mille tegi [[Kasutaja:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'delete-edit-reasonlist' => 'Redigeeri kustutamise põhjuseid',
+
+# Rollback
+'rollback'       => 'Tühista muudatused',
+'rollback_short' => 'Tühista',
+'rollbacklink'   => 'tühista',
+'rollbackfailed' => 'Muudatuste tühistamine ebaõnnestus',
+'cantrollback'   => 'Ei saa muudatusi tagasi pöörata; viimane kaastööline on artikli ainus autor.',
+'editcomment'    => "Artikli sisu oli: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => 'Tühistati [[Eri:Contributions/$2|$2]] ([[Kasutaja arutelu:$2|arutelu]]) muudatus ning pöörduti tagasi viimasele muudatusele, mille tegi [[Kasutaja:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'Kaitsmise logi',
 'protectlogtext'              => 'Allpool on loetletud lehekülgede kaitsmised ja kaitsete eemaldamised. Praegu kaitstud lehekülgi vaata [[Special:ProtectedPages|kaitstud lehtede loetelust]].',
 'protectedarticle'            => 'kaitses lehekülje "[[$1]]"',
 'unprotectedarticle'          => 'eemaldas lehekülje "[[$1]]" kaitse',
 'protect-title'               => '"$1" kaitsmine',
+'prot_1movedto2'              => 'Lehekülg "[[$1]]" teisaldatud pealkirja "[[$2]]" alla',
 'protect-legend'              => 'Kinnita kaitsmine',
 'protectcomment'              => 'Põhjus',
 'protectexpiry'               => 'Aegub:',
 'protect_expiry_invalid'      => 'Sobimatu aegumise tähtaeg.',
 'protect_expiry_old'          => 'Aegumise tähtaeg on minevikus.',
 'protect-unchain'             => 'Võimalda lehekülje teisaldamist.',
-'protect-text'                => 'Siin võite vaadata ja muuta lehekülje <strong><nowiki>$1</nowiki></strong> kaitsesätteid.',
-'protect-locked-access'       => 'Teie konto ei oma õiguseid muuta lehekülje kaitstuse taset.
-Allpool on toodud lehekülje <strong>$1</strong> hetkel kehtivad seaded:',
-'protect-default'             => '(tavaline)',
+'protect-text'                => "Siin võite vaadata ja muuta lehekülje '''<nowiki>$1</nowiki>''' kaitsesätteid.",
+'protect-locked-access'       => "Teie konto ei oma õiguseid muuta lehekülje kaitstuse taset.
+Allpool on toodud lehekülje '''$1''' hetkel kehtivad seaded:",
+'protect-default'             => 'Luba kõigile kasutajatele',
 'protect-fallback'            => 'Require "$1" permission
 Nõuab "$1" õiguseid',
-'protect-level-autoconfirmed' => 'Ainult registreeritud kasutajad',
+'protect-level-autoconfirmed' => 'Blokeeri uued ja registreerimata kasutajad',
 'protect-level-sysop'         => 'Ainult administraatorid',
 'protect-summary-cascade'     => 'kaskaad',
 'protect-expiring'            => 'aegub $1 (UTC)',
+'protect-expiry-indefinite'   => 'määramatu',
 'protect-cascade'             => 'Kaitse lehekülgi, mis on lülitatud käesoleva lehekülje koosseisu (kaskaadkaitse)',
 'protect-cantedit'            => 'Te ei saa muuta selle lehekülje kaitstuse taset, sest Teile pole selleks luba antud.',
+'protect-dropdown'            => '*Tavalised kaitsmise põhjused
+** Liigne vandalism
+** Liigne spämmimine
+** Counter-productive edit warring
+** Kõrge liiklusega lehekülg',
+'protect-edit-reasonlist'     => 'Muudatuste eest kaitsmise põhjused',
+'protect-expiry-options'      => '1 tund:1 hour,1 päev:1 day,1 nädal:1 week,2 nädalat: 2 weeks,1 kuu:1 month,3 kuud:3 months,6 kuud:6 months,1 aasta:1 year,igavene:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Lubatud:',
 'restriction-level'           => 'Kaitsmise tase:',
 'minimum-size'                => 'Min suurus',
@@ -1259,18 +1376,18 @@ Nõuab "$1" õiguseid',
 'undelete'                => 'Taasta kustutatud lehekülg',
 'undeletepage'            => 'Kuva ja taasta kustutatud lehekülgi',
 'viewdeletedpage'         => 'Vaata kustutatud lehekülgi',
-'undeletepagetext'        => 'Järgnevad leheküljed on kustutatud, kuis arhiivis
-veel olemas, neid saab taastada. Arhiivi sisu vistatakse aegajalt üle parda.',
+'undeletepagetext'        => '{{PLURAL:$1|Järgnev lehekülg on kustutatud|Järgnevad leheküljed on kustutatud}}, kuid arhiivis veel olemas ja taastatavad. Arhiivi sisu kustutatakse perioodiliselt.',
 'undelete-fieldset-title' => 'Taasta redigeerimised',
 'undeleteextrahelp'       => "Kogu lehe ja selle ajaloo taastamiseks jätke kõik linnukesed tühjaks ja vajutage '''''Taasta'''''.
 Et taastada valikuliselt, tehke linnukesed kastidesse, mida soovite taastada ja vajutage '''''Taasta'''''.
 Nupu '''''Tühjenda''''' vajutamine tühjendab põhjusevälja ja eemaldab kõik linnukesed.",
-'undeleterevisions'       => 'Arhiveeritud versioone on $1.',
+'undeleterevisions'       => '$1 arhiveeritud {{PLURAL:$1|redaktsioon|redaktsiooni}}.',
 'undeletehistory'         => 'Kui taastate lehekülje, taastuvad kõik versioonid artikli
 ajaloona. Kui vahepeal on loodud uus samanimeline lehekülg, ilmuvad taastatud
 versioonid varasema ajaloona. Kehtivat versiooni automaatselt välja ei vahetata.',
 'undeletehistorynoadmin'  => 'See artikkel on kustutatud. Kustutamise põhjus ning selle lehekülje redigeerimislugu enne kustutamist on näha allolevas kokkuvõttes. Artikli kustutamiseelsete redaktsioonide tekst on kättesaadav ainult administraatoritele.',
 'undeletebtn'             => 'Taasta',
+'undeletelink'            => 'taasta',
 'undeletereset'           => 'Tühjenda',
 'undeletecomment'         => 'Põhjus:',
 'undeletedarticle'        => '"$1" taastatud',
@@ -1286,13 +1403,14 @@ versioonid varasema ajaloona. Kehtivat versiooni automaatselt välja ei vahetata
 'blanknamespace' => '(Artiklid)',
 
 # Contributions
-'contributions' => 'Kasutaja kaastööd',
-'mycontris'     => 'Kaastöö',
-'contribsub2'   => 'Kasutaja "$1 ($2)" jaoks',
-'nocontribs'    => 'Antud kriteeriumile vastavaid muudatusi ei leidnud.',
-'uctop'         => ' (üles)',
-'month'         => 'Alates kuust (ja varasemad):',
-'year'          => 'Alates aastast (ja varasemad):',
+'contributions'       => 'Kasutaja kaastööd',
+'contributions-title' => 'Kasutaja $1 kaastööd',
+'mycontris'           => 'Kaastöö',
+'contribsub2'         => 'Kasutaja "$1 ($2)" jaoks',
+'nocontribs'          => 'Antud kriteeriumile vastavaid muudatusi ei leidnud.',
+'uctop'               => ' (üles)',
+'month'               => 'Alates kuust (ja varasemad):',
+'year'                => 'Alates aastast (ja varasemad):',
 
 'sp-contributions-newbies'     => 'Näita ainult uute kasutajate kaastööd.',
 'sp-contributions-newbies-sub' => 'Uued kasutajad',
@@ -1303,59 +1421,66 @@ versioonid varasema ajaloona. Kehtivat versiooni automaatselt välja ei vahetata
 # What links here
 'whatlinkshere'            => 'Lingid siia',
 'whatlinkshere-title'      => 'Leheküljed, mis viitavad lehele "$1"',
-'linklistsub'              => '(Linkide loend)',
+'whatlinkshere-page'       => 'Lehekülg:',
 'linkshere'                => "Lehele '''[[:$1]]''' viitavad järgmised leheküljed:",
 'nolinkshere'              => "Lehele '''[[:$1]]''' ei viita ükski lehekülg.",
 'isredirect'               => 'ümbersuunamislehekülg',
 'istemplate'               => 'kasutamine',
+'isimage'                  => 'link pildile',
 'whatlinkshere-prev'       => '{{PLURAL:$1|eelmised|eelmised $1}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|järgmised|järgmised $1}}',
 'whatlinkshere-links'      => '� lingid',
 'whatlinkshere-hideredirs' => '$1 ümbersuunamised',
+'whatlinkshere-hidetrans'  => '$1 mallina kasutamised',
+'whatlinkshere-hidelinks'  => '$1 lingid',
+'whatlinkshere-filters'    => 'Filtrid',
 
 # Block/unblock
-'blockip'                 => 'Blokeeri IP-aadress',
-'blockip-legend'          => 'Blokeeri kasutaja',
-'blockiptext'             => "See vorm on kirjutamisõiguste blokeerimiseks konkreetselt IP-aadressilt.
+'blockip'                    => 'Blokeeri IP-aadress',
+'blockip-legend'             => 'Blokeeri kasutaja',
+'blockiptext'                => "See vorm on kirjutamisõiguste blokeerimiseks konkreetselt IP-aadressilt.
 '''Seda tohib teha ainult vandalismi vältimiseks ning kooskõlas [[{{MediaWiki:Policy-url}}|{{SITENAME}} sisekorraga]]'''.
 Kindlasti tuleb täita ka väli \"põhjus\", paigutades sinna näiteks viited konkreetsetele lehekülgedele, mida rikuti.",
-'ipaddress'               => 'IP-aadress',
-'ipadressorusername'      => 'IP-aadress või kasutajanimi',
-'ipbexpiry'               => 'Kehtivus',
-'ipbreason'               => 'Põhjus',
-'ipbreasonotherlist'      => 'Muul põhjusel',
-'ipbanononly'             => 'Blokeeri ainult anonüümsed kasutajad',
-'ipbcreateaccount'        => 'Takista konto loomist',
-'ipbemailban'             => 'Takista kasutaja poolt e-maili saatmist',
-'ipbsubmit'               => 'Blokeeri see aadress',
-'ipbother'                => 'Muu tähtaeg',
-'ipboptions'              => '2 tundi:2 hours,1 päev:1 day,3 päeva:3 days,1 nädal:1 week,2 nädalat:2 weeks,1 kuu:1 month,3 kuud:3 months,6 kuud:6 months,1 aasta:1 year,igavene:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'          => 'muu tähtaeg',
-'ipbotherreason'          => 'Muu/täiendav põhjus:',
-'ipbwatchuser'            => 'Jälgi selle kasutaja lehekülge ja arutelu',
-'badipaddress'            => 'The IP address is badly formed.',
-'blockipsuccesssub'       => 'Blokeerimine õnnestus',
-'blockipsuccesstext'      => 'IP-aadress "$1" on blokeeritud.
+'ipaddress'                  => 'IP-aadress',
+'ipadressorusername'         => 'IP-aadress või kasutajanimi',
+'ipbexpiry'                  => 'Kehtivus',
+'ipbreason'                  => 'Põhjus',
+'ipbreasonotherlist'         => 'Muul põhjusel',
+'ipbanononly'                => 'Blokeeri ainult anonüümsed kasutajad',
+'ipbcreateaccount'           => 'Takista konto loomist',
+'ipbemailban'                => 'Takista kasutaja poolt e-maili saatmist',
+'ipbsubmit'                  => 'Blokeeri see aadress',
+'ipbother'                   => 'Muu tähtaeg',
+'ipboptions'                 => '2 tundi:2 hours,1 päev:1 day,3 päeva:3 days,1 nädal:1 week,2 nädalat:2 weeks,1 kuu:1 month,3 kuud:3 months,6 kuud:6 months,1 aasta:1 year,igavene:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'             => 'muu tähtaeg',
+'ipbotherreason'             => 'Muu/täiendav põhjus:',
+'ipbwatchuser'               => 'Jälgi selle kasutaja lehekülge ja arutelu',
+'badipaddress'               => 'The IP address is badly formed.',
+'blockipsuccesssub'          => 'Blokeerimine õnnestus',
+'blockipsuccesstext'         => 'IP-aadress "$1" on blokeeritud.
 <br />Kehtivaid blokeeringuid vaata [[Special:IPBlockList|blokeeringute nimekirjast]].',
-'unblockip'               => 'Lõpeta IP aadressi blokeerimine',
-'unblockiptext'           => 'Kasutage allpool olevat vormi redigeerimisõiguste taastamiseks varem blokeeritud IP aadressile.',
-'unblocked'               => '[[User:$1|$1]] blokeering võeti maha.',
-'unblocked-id'            => 'Blokeerimine $1 on lõpetatud',
-'ipblocklist'             => 'Blokeeritud IP-aadresside ja kasutajakontode loend',
-'blocklistline'           => '$1, $2 blokeeris $3 ($4)',
-'expiringblock'           => 'aegub $1',
-'ipblocklist-empty'       => 'Blokeerimiste loend on tühi.',
-'blocklink'               => 'blokeeri',
-'unblocklink'             => 'lõpeta blokeerimine',
-'contribslink'            => 'kaastöö',
-'autoblocker'             => 'Autoblokeeritud kuna teie IP aadress on hiljut kasutatud "[[User:$1|$1]]" poolt. $1-le antud bloki põhjus on "\'\'\'$2\'\'\'"',
-'blocklogpage'            => 'Blokeerimise logi',
-'blocklogentry'           => 'blokeeris "[[$1]]". Blokeeringu aegumistähtaeg on $2 $3',
-'blocklogtext'            => 'See on kasutajate blokeerimiste ja blokeeringute eemaldamiste nimekiri. Automaatselt blokeeritud IP aadresse siin ei näidata. Hetkel aktiivsete blokeeringute ja redigeerimiskeeldude nimekirja vaata [[Special:IPBlockList|IP blokeeringute nimekirja]] leheküljelt.',
-'unblocklogentry'         => '"$1" blokeerimine lõpetatud',
-'block-log-flags-noemail' => 'e-mail blokeeritud',
-'proxyblockreason'        => 'Teie IP aadress on blokeeritud, sest see on anonüümne proxy server. Palun kontakteeruga oma internetiteenuse pakkujaga või tehnilise toega ning informeerige neid sellest probleemist.',
-'proxyblocksuccess'       => 'Tehtud.',
+'unblockip'                  => 'Lõpeta IP aadressi blokeerimine',
+'unblockiptext'              => 'Kasutage allpool olevat vormi redigeerimisõiguste taastamiseks varem blokeeritud IP aadressile.',
+'unblocked'                  => '[[User:$1|$1]] blokeering võeti maha.',
+'unblocked-id'               => 'Blokeerimine $1 on lõpetatud',
+'ipblocklist'                => 'Blokeeritud IP-aadresside ja kasutajakontode loend',
+'blocklistline'              => '$1, $2 blokeeris $3 ($4)',
+'expiringblock'              => 'aegub $1',
+'ipblocklist-empty'          => 'Blokeerimiste loend on tühi.',
+'blocklink'                  => 'blokeeri',
+'unblocklink'                => 'lõpeta blokeerimine',
+'contribslink'               => 'kaastöö',
+'autoblocker'                => 'Autoblokeeritud kuna teie IP aadress on hiljut kasutatud "[[User:$1|$1]]" poolt. $1-le antud bloki põhjus on "\'\'\'$2\'\'\'"',
+'blocklogpage'               => 'Blokeerimise logi',
+'blocklogentry'              => 'blokeeris "[[$1]]". Blokeeringu aegumistähtaeg on $2 $3',
+'blocklogtext'               => 'See on kasutajate blokeerimiste ja blokeeringute eemaldamiste nimekiri. Automaatselt blokeeritud IP aadresse siin ei näidata. Hetkel aktiivsete blokeeringute ja redigeerimiskeeldude nimekirja vaata [[Special:IPBlockList|IP blokeeringute nimekirja]] leheküljelt.',
+'unblocklogentry'            => '"$1" blokeerimine lõpetatud',
+'block-log-flags-nocreate'   => 'kontode loomine on blokeeritud',
+'block-log-flags-noemail'    => 'e-mail blokeeritud',
+'block-log-flags-nousertalk' => 'ei saa muuta enda arutelulehte',
+'proxyblockreason'           => 'Teie IP aadress on blokeeritud, sest see on anonüümne proxy server. Palun kontakteeruga oma internetiteenuse pakkujaga või tehnilise toega ning informeerige neid sellest probleemist.',
+'proxyblocksuccess'          => 'Tehtud.',
+'cant-block-while-blocked'   => 'Teisi kasutajaid ei saa blokeerida, kui oled ise blokeeritud.',
 
 # Developer tools
 'lockdb'              => 'Lukusta andmebaas',
@@ -1391,6 +1516,9 @@ enne muudatuse tegemist mõelge palun järele, mis võib olla selle tagajärjeks
 
 Neil juhtudel teisaldage arutelulehekülg soovi korral eraldi või ühendage ta omal käel uue aruteluleheküljega.",
 'movearticle'             => 'Teisalda artiklilehekülg',
+'movenologin'             => 'Te ei ole sisse loginud',
+'movenologintext'         => 'Et lehekülge teisaldada, peate registreeruma
+kasutajaks ja [[Special:UserLogin|sisse logima]]',
 'newtitle'                => 'Uue pealkirja alla',
 'move-watch'              => 'Jälgi seda lehekülge',
 'movepagebtn'             => 'Teisalda artikkel',
@@ -1420,7 +1548,7 @@ Neil juhtudel teisaldage arutelulehekülg soovi korral eraldi või ühendage ta
 'allmessagesdefault' => 'Vaikimisi tekst',
 'allmessagescurrent' => 'Praegune tekst',
 'allmessagestext'    => 'See on loend kõikidest kättesaadavatest süsteemi sõnumitest MediaWiki: nimeruumis.
-Kui soovid MediaWiki tarkvara tõlkimises osaleda siis vaata lehti [http://www.mediawiki.org/wiki/Localisation MediaWiki Lokaliseerimine] ja [http://translatewiki.net Betawiki].',
+Kui soovid MediaWiki tarkvara tõlkimises osaleda siis vaata lehti [http://www.mediawiki.org/wiki/Localisation MediaWiki Lokaliseerimine] ja [http://translatewiki.net translatewiki.net].',
 
 # Thumbnails
 'thumbnail-more'  => 'Suurenda',
@@ -1436,19 +1564,19 @@ Kui soovid MediaWiki tarkvara tõlkimises osaleda siis vaata lehti [http://www.m
 'importlogpage' => 'Impordi logi',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Minu kasutaja leht',
+'tooltip-pt-userpage'             => 'Sinu kasutajaleht',
 'tooltip-pt-anonuserpage'         => 'Selle IP aadressi kasutajaleht',
-'tooltip-pt-mytalk'               => 'Minu arutelu leht',
+'tooltip-pt-mytalk'               => 'Minu aruteluleht',
 'tooltip-pt-anontalk'             => 'Arutelu sellelt IP aadressilt tehtud muudatuste kohta',
 'tooltip-pt-preferences'          => 'Minu eelistused',
 'tooltip-pt-watchlist'            => 'Lehekülgede loend, mida jälgid muudatuste osas',
-'tooltip-pt-mycontris'            => 'Loend minu kaastöö kohta',
+'tooltip-pt-mycontris'            => 'Sinu kaastööde loend',
 'tooltip-pt-login'                => 'Me julgustame teid sisse logima, kuid see pole kohustuslik.',
 'tooltip-pt-anonlogin'            => 'Me julgustame teid sisse logima, kuid see pole kohustuslik.',
 'tooltip-pt-logout'               => 'Logi välja',
 'tooltip-ca-talk'                 => 'Selle artikli arutelu',
 'tooltip-ca-edit'                 => 'Te võite seda lehekülge redigeerida. Palun kasutage enne salvestamist eelvaadet.',
-'tooltip-ca-addsection'           => 'Lisa kommentaar arutellu.',
+'tooltip-ca-addsection'           => 'Algata uus alajaotis',
 'tooltip-ca-viewsource'           => 'See lehekülg on kaitstud. Te võite kuvada selle koodi.',
 'tooltip-ca-history'              => 'Selle lehekülje varasemad versioonid.',
 'tooltip-ca-protect'              => 'Kaitse seda lehekülge',
@@ -1458,6 +1586,8 @@ Kui soovid MediaWiki tarkvara tõlkimises osaleda siis vaata lehti [http://www.m
 'tooltip-ca-watch'                => 'Lisa see lehekülg oma jälgimisloendile',
 'tooltip-ca-unwatch'              => 'Eemalda see lehekülg oma jälgimisloendist',
 'tooltip-search'                  => 'Otsi vikist',
+'tooltip-search-go'               => 'Siirdutakse täpselt sellist pealkirja kandvale lehele (kui selline on olemas)',
+'tooltip-search-fulltext'         => 'Otsitakse teksti sisaldavaid artikleid',
 'tooltip-p-logo'                  => 'Esileht',
 'tooltip-n-mainpage'              => 'Mine esilehele',
 'tooltip-n-portal'                => 'Projekti kohta, mida te saate teha, kuidas leida informatsiooni jne',
@@ -1494,10 +1624,17 @@ Kui soovid MediaWiki tarkvara tõlkimises osaleda siis vaata lehti [http://www.m
 'tooltip-recreate'                => 'Taasta kustutatud lehekülg',
 
 # Attribution
-'anonymous' => '{{SITENAME}} anonüümsed kasutajad',
+'anonymous' => '{{SITENAME}} {{PLURAL:$1|anonüümne kasutaja|anonüümsed kasutajad}}',
 'siteuser'  => 'Viki kasutaja $1',
 'others'    => 'teised',
-'siteusers' => 'Viki kasutaja(d) $1',
+'siteusers' => 'Portaali {{SITENAME}} {{PLURAL:$2|kasutaja|kasutajad}} $1',
+
+# Skin names
+'skinname-standard'    => 'Standard',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Kölni sinine',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Mu oma nahk',
 
 # Math options
 'mw_math_png'    => 'Alati PNG',
@@ -1526,9 +1663,10 @@ Kui soovid MediaWiki tarkvara tõlkimises osaleda siis vaata lehti [http://www.m
 'show-big-image'       => 'Originaalsuurus',
 'show-big-image-thumb' => '<small>Selle eelvaate suurus on: $1 × $2 pikselit</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Uute meediafailide galerii',
-'imagelisttext'         => 'Failide arv järgnevas loendis: $1. Sorteeritud $2.',
+'imagelisttext'         => "
+Järgnevas loendis, mis on sorteeritud $2, on '''$1''' {{PLURAL:$1|fail|faili}}.",
 'showhidebots'          => '($1 bottide kaastööd)',
 'ilsubmit'              => 'Otsi',
 'bydate'                => 'kuupäeva järgi',
@@ -1600,10 +1738,7 @@ Kui see *ei* ole sinu loodud konto, siis ava järgnev link $5 kinnituse tühista
 Kinnituskood aegub $4.',
 
 # Delete conflict
-'deletedwhileediting' => 'Hoiatus: Sel ajal, kui Te artiklit redigeerisite, on keegi selle kustutanud!',
-
-# HTML dump
-'redirectingto' => 'Ãœmbersuunamine lehele [[:$1]]...',
+'deletedwhileediting' => 'Hoiatus: Sel ajal, kui sina artiklit redigeerisid, kustutas keegi selle ära!',
 
 # Multipage image navigation
 'imgmultipageprev' => '� eelmine lehekülg',
diff --git a/languages/messages/MessagesEu.php b/languages/messages/MessagesEu.php
index 1c594ddc..58081b1c 100644
--- a/languages/messages/MessagesEu.php
+++ b/languages/messages/MessagesEu.php
@@ -4,9 +4,11 @@
  * @ingroup Language
  * @file
  *
+ * @author An13sa
  * @author Bengoa
  * @author Helix84
  * @author Kaustubh
+ * @author Kobazulo
  * @author Malafaya
  * @author Theklan
  * @author Unai Fdz. de Betoño
@@ -14,33 +16,46 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Lehenetsia',
-	'nostalgia'   => 'Nostalgia',
-	'cologneblue' => 'Cologne Blue',
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Berezi',
+	NS_TALK             => 'Eztabaida',
+	NS_USER             => 'Lankide',
+	NS_USER_TALK        => 'Lankide_eztabaida',
+	NS_PROJECT_TALK     => '$1_eztabaida',
+	NS_FILE             => 'Fitxategi',
+	NS_FILE_TALK        => 'Fitxategi_eztabaida',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_eztabaida',
+	NS_TEMPLATE         => 'Txantiloi',
+	NS_TEMPLATE_TALK    => 'Txantiloi_eztabaida',
+	NS_HELP             => 'Laguntza',
+	NS_HELP_TALK        => 'Laguntza_eztabaida',
+	NS_CATEGORY         => 'Kategoria',
+	NS_CATEGORY_TALK    => 'Kategoria_eztabaida',
 );
 
-$namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Aparteko',
-	NS_MAIN           => '',
-	NS_TALK           => 'Eztabaida',
-	NS_USER           => 'Lankide',
-	NS_USER_TALK      => 'Lankide_eztabaida',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_eztabaida',
-	NS_IMAGE          => 'Irudi',
-	NS_IMAGE_TALK     => 'Irudi_eztabaida',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_eztabaida',
-	NS_TEMPLATE       => 'Txantiloi',
-	NS_TEMPLATE_TALK  => 'Txantiloi_eztabaida',
-	NS_HELP           => 'Laguntza',
-	NS_HELP_TALK      => 'Laguntza_eztabaida',
-	NS_CATEGORY       => 'Kategoria',
-	NS_CATEGORY_TALK  => 'Kategoria_eztabaida',
+$namespaceAliases = array(
+	'Aparteko' => NS_SPECIAL,
+	'Irudi' => NS_FILE,
+	'Irudi_eztabaida' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'BirzuzenketaBikoitzak' ),
+	'BrokenRedirects'           => array( 'HautsitakoBirzuzenketak' ),
+	'Disambiguations'           => array( 'Argipenak' ),
+	'Preferences'               => array( 'Hobespenak' ),
+	'Watchlist'                 => array( 'JarraipenZerrenda' ),
+	'Recentchanges'             => array( 'AzkenAldaketak' ),
+	'Upload'                    => array( 'Igo' ),
+	'Statistics'                => array( 'Estatistikak' ),
+	'Allpages'                  => array( 'OrrialdeGuztiak' ),
+	'Movepage'                  => array( 'OrrialdeaMugitu' ),
 );
 
+$separatorTransformTable = array( ',' => '.', '.' => ',' ); /* Bug 15717 */
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Loturak azpimarratu:',
@@ -72,24 +87,25 @@ $messages = array(
 'tog-shownumberswatching'     => 'Jarraitzen duen erabiltzaile kopurua erakutsi',
 'tog-fancysig'                => 'Lotura automatikorik gabeko sinadura',
 'tog-externaleditor'          => 'Lehenetsi bezala kanpoko editore bat erabili',
-'tog-externaldiff'            => 'Lehenetsi bezala kanpoko diff erreminta erabili',
+'tog-externaldiff'            => 'Lehenetsi bezala kanpoko diff erreminta erabili (adituentzako bakarrik, zure ordenagailuak konfigurazio berezia izan behar du)',
 'tog-showjumplinks'           => '"Hona jo" irisgarritasun loturak gaitu',
 'tog-uselivepreview'          => 'Zuzeneko aurrebista erakutsi (JavaScript) (Proba fasean)',
 'tog-forceeditsummary'        => 'Aldaketaren laburpena zuri uzterakoan ohartarazi',
 'tog-watchlisthideown'        => 'Segimendu zerrendan nire aldaketak ezkutatu',
 'tog-watchlisthidebots'       => 'Segimendu zerrendan bot-en aldaketak ezkutatu',
 'tog-watchlisthideminor'      => 'Segimendu zerrendan, aldaketa txikiak ezkutatu',
+'tog-watchlisthideliu'        => 'Jarraitze-zerrendan izena emana duten lankideen aldaketak izkutatu',
+'tog-watchlisthideanons'      => 'Jarraitze-zerrendan lankideen anonimoen aldaketak izkutatu',
 'tog-nolangconversion'        => 'Aldaeren arteko konbertsioa ezgaitu',
 'tog-ccmeonemails'            => 'Beste erabiltzaileei bidaltzen dizkiedan mezuen kopiak niri ere bidali',
 'tog-diffonly'                => "''Diff''-ak agertzen direnean, orrialdearen edukiera ezkutatu",
 'tog-showhiddencats'          => 'Ikusi kategoria ezkutuak',
+'tog-norollbackdiff'          => 'Rollback bat egin ondoren ezberdintasunak ez hartu aintzat',
 
 'underline-always'  => 'Beti',
 'underline-never'   => 'Inoiz ez',
 'underline-default' => 'Nabigatzailearen lehenetsitako balioa',
 
-'skinpreview' => '(Aurrebista)',
-
 # Dates
 'sunday'        => 'Igandea',
 'monday'        => 'Astelehena',
@@ -183,7 +199,7 @@ $messages = array(
 'mytalk'         => 'Nire eztabaida',
 'anontalk'       => 'IP honen eztabaida',
 'navigation'     => 'Nabigazioa',
-'and'            => 'eta',
+'and'            => '&#32;eta',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatuak:',
@@ -220,14 +236,14 @@ $messages = array(
 'talkpagelinktext'  => 'Eztabaida',
 'specialpage'       => 'Aparteko orrialdea',
 'personaltools'     => 'Tresna pertsonalak',
-'postcomment'       => 'Azalpen bat bidali',
+'postcomment'       => 'Atal berria',
 'articlepage'       => 'Artikulua ikusi',
 'talk'              => 'Eztabaida',
 'views'             => 'Bistaratzeak',
 'toolbox'           => 'Tresnak',
 'userpage'          => 'Lankide orrialdea ikusi',
 'projectpage'       => 'Proiektuaren orrialdea ikusi',
-'imagepage'         => 'Irudiaren orrialdea ikusi',
+'imagepage'         => 'Ikusi fitxategiaren orria',
 'mediawikipage'     => 'Mezu orrialdea ikusi',
 'templatepage'      => 'Txantiloi orrialdea ikusi',
 'viewhelppage'      => 'Laguntza orrialdea ikusi',
@@ -246,8 +262,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}(e)ri buruz',
 'aboutpage'            => 'Project:Honi_buruz',
-'bugreports'           => 'Programazio-erroreen jakinarazpenak',
-'bugreportspage'       => 'Project:Programazio-erroreen jakinarazpenak',
 'copyright'            => 'Eduki guztia $1(r)en babespean dago.',
 'copyrightpagename'    => '{{SITENAME}}ren egile eskubideak',
 'copyrightpage'        => '{{ns:project}}:Eskubideak',
@@ -270,9 +284,7 @@ $messages = array(
 
 'badaccess'        => 'Baimen errorea',
 'badaccess-group0' => 'Ez daukazu ekintza hori burutzeko baimenik.',
-'badaccess-group1' => 'Ekintza hori $1 taldeko erabiltzaileei mugatuta dago.',
-'badaccess-group2' => 'Ekintza hori $1 taldeetako bateko erabiltzaileei mugatuta dago.',
-'badaccess-groups' => 'Ekintza hori $1 taldeetako batetako erabiltzaileei mugatuta dago.',
+'badaccess-groups' => 'Eskatu duzun ekintza honako {{PLURAL:$2|taldeko|taldeetako}} lankideei mugatuta dago: $1.',
 
 'versionrequired'     => 'MediaWikiren $1 bertsioa beharrezkoa da',
 'versionrequiredtext' => 'MediaWikiren $1 bertsioa beharrezkoa da orrialde hau erabiltzeko. Ikus [[Special:Version]]',
@@ -286,6 +298,8 @@ $messages = array(
 'editsection'             => 'aldatu',
 'editold'                 => 'aldatu',
 'viewsourceold'           => 'kodea ikusi',
+'editlink'                => 'aldatu',
+'viewsourcelink'          => 'jatorria ikusi',
 'editsectionhint'         => 'Atala aldatu: $1',
 'toc'                     => 'Edukiak',
 'showtoc'                 => 'erakutsi',
@@ -300,23 +314,25 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Jarioa',
 'page-rss-feed'           => '"$1" RSS Jarioa',
 'page-atom-feed'          => '"$1" Atom Jarioa',
-'red-link-title'          => '$1 (sortu gabe dago)',
+'red-link-title'          => '$1 (orria ez da existitzen)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikulua',
 'nstab-user'      => 'Erabiltzaile orrialdea',
 'nstab-media'     => 'Media orrialdea',
-'nstab-special'   => 'Apartekoa',
+'nstab-special'   => 'Orri berezia',
 'nstab-project'   => 'Proiektu orrialdea',
 'nstab-image'     => 'Fitxategia',
 'nstab-mediawiki' => 'Mezua',
-'nstab-template'  => 'Txantiloia',
+'nstab-template'  => 'Txantiloi',
 'nstab-help'      => 'Laguntza orrialdea',
 'nstab-category'  => 'Kategoria',
 
 # Main script and global functions
 'nosuchaction'      => 'Ekintza hori ez da existitizen',
-'nosuchactiontext'  => 'URL bidez zehaztutako ekintza ez du wikiak ezagutzen',
+'nosuchactiontext'  => 'URL bidez zehaztutako ekintza okerra da.
+URLa gaizki idatzi duzu, edo hautsitako lotura jarraitu duzu.
+Honek akatsa indikatzen du {{SITENAME}}-(e)n.',
 'nosuchspecialpage' => 'Ez da aparteko orrialde hori existitzen',
 'nospecialpagetext' => "<big>'''Baliogabeko aparteko orrialde bat eskatu duzu.'''</big>
 
@@ -366,7 +382,6 @@ Mesedez, bidali gertakar hau administradore bati, URLaren izena jarriz.',
 'cannotdelete'         => 'Ezin izan da zehaztutako orrialde edo fitxategia ezabatu. (Baliteke beste norbaitek ezabatu izana.)',
 'badtitle'             => 'Izenburu ezegokia',
 'badtitletext'         => 'Eskatutako orrialde izenburua ez da baliozkoa, hutsik dago, edo gaizki lotutako hizkuntzen arteko lotura da. Baliteke izenburuetan erabili ezin den karaktereren bat izatea.',
-'perfdisabled'         => 'Sentitzen dugu! Ezaugarri hau denbora batez ezgaituta dago, wikian arazoak sortzen baititu, datu-basea motelduz.',
 'perfcached'           => 'Hurrengo datuak katxean gordeta daude eta litekeena da guztiz eguneratuta ez egotea:',
 'perfcachedts'         => 'Hurrengo datuak katxean daude, $1 eguneratu zen azkenekoz.',
 'querypage-no-updates' => 'Orrialde honen berritzeak ez dira baimentzen. Hemen dagoen data ez da zuzenean berrituko.',
@@ -381,7 +396,9 @@ Saia zaitez berriro minutu batzuen buruan, mesedez.',
 'protectedpagetext'    => 'Orrialde hau aldaketak saihesteko blokeatu egin da.',
 'viewsourcetext'       => 'Orrialde honen testua ikusi eta kopiatu dezakezu:',
 'protectedinterface'   => 'Orrialde honek softwarearentzako interfaze testua gordetzen du eta blokeatuta dago bandalismoak saihesteko.',
-'editinginterface'     => "'''Oharra:''' Softwarearentzako interfaze testua duen orrialde bat aldatzen ari zara. Orrialde honetako aldaketek erabiltzaile guztiei eragingo die.",
+'editinginterface'     => "'''Oharra:''' Softwarearentzako interfaze testua duen orrialde bat aldatzen ari zara.
+Orrialde honetako aldaketek erabiltzaile guztiei eragingo die.
+Itzulpenetarako, [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net] erabili ezazu, MediaWiki proiektuan.",
 'sqlhidden'            => '(ezkutuko SQL kontsulta)',
 'cascadeprotected'     => "Orrialde hau aldaketen aurka babestua dago, ''kaskada'' aukerarekin babestu {{PLURAL:$1|duten orrialde honetan|dituzten orrialde hauetan}} txertaturik dagoelako:
 $2",
@@ -392,14 +409,14 @@ $2",
 Emandako arrazoia ''$2'' izan zen.",
 
 # Virus scanner
-'virus-badscanner'     => 'Ezarpen txarrak: antibirus ezezaguna: <i>$1</i>',
+'virus-badscanner'     => "Ezarpen txarrak: antibirus ezezaguna: ''$1''",
 'virus-scanfailed'     => 'eskaneatze txarra ($1 kodea)',
 'virus-unknownscanner' => 'antibirus ezezaguna:',
 
 # Login and logout pages
 'logouttitle'                => 'Saioa ixtea',
-'logouttext'                 => '<strong>Saioa itxi egin duzu.</strong><br />
-Erabiltzaile anonimo bezala jarraitu dezakezu {{SITENAME}} erabiltzen, edo saioa has dezakezu berriz erabiltzaile berdinarekin edo ezberdin batekin. Kontuan izan orrialde batzuk saioa hasita bazenu bezala ikus ditzakezula nabigatzailearen katxea garbitu arte.',
+'logouttext'                 => "'''Saioa itxi egin duzu.'''<br />
+Erabiltzaile anonimo bezala jarraitu dezakezu {{SITENAME}} erabiltzen, edo saioa has dezakezu berriz erabiltzaile berdinarekin edo ezberdin batekin. Kontuan izan orrialde batzuk saioa hasita bazenu bezala ikus ditzakezula nabigatzailearen katxea garbitu arte.",
 'welcomecreation'            => '== Ongi etorri, $1! ==
 
 Zure kontua sortu egin da. Ez ahaztu [[Special:Preferences|{{SITENAME}}(e)ko hobespenak]] aldatzea.',
@@ -410,7 +427,6 @@ Zure kontua sortu egin da. Ez ahaztu [[Special:Preferences|{{SITENAME}}(e)ko hob
 'remembermypassword'         => 'Nire saioa ordenagailu honetan gogoratu (gomendaturikoa)',
 'yourdomainname'             => 'Zure domeinua',
 'externaldberror'            => 'Kanpoko datu-base autentifikazio errorea gertatu da edo ez duzu zure kanpo kontua eguneratzeko baimenik.',
-'loginproblem'               => '<b>Arazoa gertatu da saioa hasterakoan.</b><br />Saiatu berriz!',
 'login'                      => 'Saioa hasi',
 'nav-login-createaccount'    => 'Saioa hasi / kontua sortu',
 'loginprompt'                => 'Cookieak gaituta izatea beharrezkoa da {{SITENAME}}(e)n saioa hasteko.',
@@ -429,15 +445,15 @@ Zure kontua sortu egin da. Ez ahaztu [[Special:Preferences|{{SITENAME}}(e)ko hob
 Mesedez, beste bat aukeratu.',
 'youremail'                  => 'E-posta:',
 'username'                   => 'Erabiltzaile izena:',
-'uid'                        => 'Lankide zenbakia:',
+'uid'                        => 'Erabiltzaile zenbakia:',
 'prefs-memberingroups'       => '{{PLURAL:$1|Taldeko|taldeetako}} kidea:',
 'yourrealname'               => 'Benetako izena:',
 'yourlanguage'               => 'Hizkuntza:',
 'yourvariant'                => 'Aldaera',
 'yournick'                   => 'Erabiltzaile izena:',
 'badsig'                     => 'Baliogabeko sinadura; egiaztatu HTML etiketak.',
-'badsiglength'               => 'Ezizen luzeegia hautatu duzu;
-$1 karakteretik behera izan behar du.',
+'badsiglength'               => 'Zure sinadura luzeegia da.
+$1 {{PLURAL:$1|karakteretik|karakteretik}} behera izan behar ditu.',
 'email'                      => 'E-posta',
 'prefs-help-realname'        => '* Benetako izena (aukerakoa): zehaztea erabakiz gero, zure lanarentzako atribuzio bezala balioko du.',
 'loginerror'                 => 'Errorea saioa hastean',
@@ -450,13 +466,14 @@ Gainera beste lankideek zurekin kontakta dezakete zure lankide edo lankide_eztab
 'loginsuccesstitle'          => 'Saio hasiera egina',
 'loginsuccess'               => "'''Saioa hasi duzu {{SITENAME}}(e)n \"\$1\" izenarekin.'''",
 'nosuchuser'                 => 'Ez dago "$1" izena duen lankiderik.
-Mesedez, egiaztatu ondo idatzi duzun edo [[Special:UserLogin/signup|kontu berria sor ezazu]].',
+Lankide izenak zehatza izan behar du.
+Egiaztatu ondo idatzi duzun, edo [[Special:UserLogin/signup|kontu berria sor ezazu]].',
 'nosuchusershort'            => 'Ez dago "<nowiki>$1</nowiki>" izena duen erabiltzailerik. Egiaztatu ongi idatzi duzula.',
 'nouserspecified'            => 'Erabiltzaile izena zehaztu beharra daukazu.',
 'wrongpassword'              => 'Pasahitza ez da zuzena. Saiatu berriz.',
 'wrongpasswordempty'         => 'Pasahitza hutsik dago. Saiatu berriz.',
 'passwordtooshort'           => 'Zure pasahitza laburregia da.
-$1 karaktere izan behar ditu gutxienez.',
+{{PLURAL:$1|karaktere 1|$1 karaktere}} izan behar ditu eta zure lankide izenetik ezberdina izan.',
 'mailmypassword'             => 'Pasahitza berria e-postaz bidali',
 'passwordremindertitle'      => 'Pasahitzaren gogorarazpena {{SITENAME}}(e)tik',
 'passwordremindertext'       => 'Norbaitek (zuk, ziurrenik, $1 IP helbidetik) pasahitz berri bat
@@ -473,11 +490,12 @@ Mesedez, saioa hasi jasotakoan.',
 'blocked-mailpassword'       => 'Zure IP helbidea aldaketak egiteko blokeatuta dago, eta beraz ezin da pasahitza berreskuratzeko aukera erabili.',
 'eauthentsent'               => 'Egiaztapen mezu bat bidali da zehaztutako e-posta helbidera.
 Helbide horretara beste edozein mezu bidali aurretik, bertan azaltzen diren argibideak jarraitu behar dituzu, e-posta hori zurea dela egiaztatzeko.',
-'throttled-mailpassword'     => 'Pasahitz gogorarazle bat bidali da jada azken $1 orduetan.
-Bandalismoa saihesteko pasahitz eskaera bat baino ezin da egin $1 orduz behin.',
+'throttled-mailpassword'     => 'Pasahitz gogorarazle bat bidali da jada azken {{PLURAL:$1|orduan|$1 orduetan}}.
+Bandalismoa saihesteko pasahitz eskaera bat baino ezin da egin {{PLURAL:$1|orduan|$1 orduan}} behin.',
 'mailerror'                  => 'Errorea mezua bidaltzerakoan: $1',
-'acct_creation_throttle_hit' => 'Sentitzen dugu, $1 erabiltzaile kontu sortu dituzu dagoeneko. Ezin duzu gehiago sortu.',
-'emailauthenticated'         => 'Zure e-posta helbidea egiaztatu zeneko data: $1.',
+'acct_creation_throttle_hit' => 'Sentitzen dugu, {{PLURAL:$1|erabiltzaile kontu bat sortu duzu|$1 erabiltzaile kontu sortu dituzu}} dagoeneko.
+Ondorioz, ezin duzu kontu gehiago sortu.',
+'emailauthenticated'         => 'Zure e-posta helbidea autentifikatu da $2an $3(e)tan.',
 'emailnotauthenticated'      => 'Zure posta helbidea egiaztatu gabe dago. Ez da mezurik bidaliko hurrengo ezaugarrientzako.',
 'noemailprefs'               => 'Zehaztu e-posta helbide bat ezaugarri hauek erabili ahal izateko.',
 'emailconfirmlink'           => 'Egiaztatu zure e-posta helbidea',
@@ -487,17 +505,31 @@ Mesedez, formatu egokia duen helbide bat zehaztu, edo hutsik utzi.',
 'accountcreated'             => 'Kontua sortuta',
 'accountcreatedtext'         => '$1 erabiltzaile kontua sortu egin da.',
 'createaccount-title'        => '{{SITENAME}}-rako kontua sortu',
+'createaccount-text'         => 'Norbaitek zure e-postarekin kontu bat sortu du {{SITENAME}}(e)n ($4) "$2" izenarekin eta "$3" pasahitzarekin.
+Orain bertan sar zaitezke eta zure pasahitza aldatu.
+
+Kontu honen sorrera akats bat dela uste baduzu mezu honi ez diozu zertan jaramonik egin.',
+'login-throttled'            => 'Kontu honetako pasahitzaren gainean saiakera gehiegi egin dituzu azken aldian.
+Berriro saiatu aurretik itxoin ezazu, mesedez.',
 'loginlanguagelabel'         => 'Hizkuntza: $1',
 
 # Password reset dialog
-'resetpass'               => 'Kontuaren pasahitza hasieratu',
-'resetpass_announce'      => 'E-postaz jasotako kode tenporal baten bidez saioa hasi duzu. Saioa hasierarekin jarraitzeko, pasahitz berri bat definitu beharra daukazu:',
-'resetpass_header'        => 'Pasahitza aldatu',
-'resetpass_submit'        => 'Pasahitza definitu eta saioa hasi',
-'resetpass_success'       => 'Zure pasahitza aldatu egin da! Saioa hasten...',
-'resetpass_bad_temporary' => 'Baliogabeko pasahitz tenporala. Baliteke pasahitza jada aldatu edo pasahitz tenporal berri bat eskatu izana.',
-'resetpass_forbidden'     => 'Ezin dira pasahitzak aldatu',
-'resetpass_missing'       => 'Formularioko daturik ez.',
+'resetpass'                 => 'Pasahitza aldatu',
+'resetpass_announce'        => 'E-postaz jasotako kode tenporal baten bidez saioa hasi duzu. Saioa hasierarekin jarraitzeko, pasahitz berri bat definitu beharra daukazu:',
+'resetpass_text'            => '<!-- Testua hemen idatzi -->',
+'resetpass_header'          => 'Pasahitza aldatu',
+'oldpassword'               => 'Pasahitz zaharra:',
+'newpassword'               => 'Pasahitz berria:',
+'retypenew'                 => 'Pasahitz berria berriz idatzi:',
+'resetpass_submit'          => 'Pasahitza definitu eta saioa hasi',
+'resetpass_success'         => 'Zure pasahitza aldatu egin da! Saioa hasten...',
+'resetpass_bad_temporary'   => 'Baliogabeko pasahitz tenporala. Baliteke pasahitza jada aldatu edo pasahitz tenporal berri bat eskatu izana.',
+'resetpass_forbidden'       => 'Ezin dira pasahitzak aldatu',
+'resetpass-no-info'         => 'Orrialde honetara zuzenean sartzeko izena eman behar duzu.',
+'resetpass-submit-loggedin' => 'Pasahitza aldatu',
+'resetpass-wrong-oldpass'   => 'Behin-behineko edo oraintxuko pasahitza ez da baliagarria. 
+Agian dagoeneko ondo aldatu duzu zure pasahitza edo behin-behineko pasahitza bat eskatu duzu.',
+'resetpass-temp-password'   => 'Behin-behineko pasahitza:',
 
 # Edit page toolbar
 'bold_sample'     => 'Testu beltza',
@@ -522,8 +554,8 @@ Mesedez, formatu egokia duen helbide bat zehaztu, edo hutsik utzi.',
 'hr_tip'          => 'Lerro horizontala (gutxitan erabili)',
 
 # Edit pages
-'summary'                          => 'Laburpena',
-'subject'                          => 'Izenburua',
+'summary'                          => 'Laburpena:',
+'subject'                          => 'Izenburua:',
 'minoredit'                        => 'Hau aldaketa txikia da',
 'watchthis'                        => 'Orrialde hau jarraitu',
 'savearticle'                      => 'Orrialdea gorde',
@@ -535,8 +567,8 @@ Mesedez, formatu egokia duen helbide bat zehaztu, edo hutsik utzi.',
 'missingsummary'                   => "'''Gogorarazpena:''' Ez duzu aldaketa laburpen bat zehaztu. Berriz ere gordetzeko aukeratzen baduzu, laburpen mezurik gordeko da.",
 'missingcommenttext'               => 'Mesedez, iruzkin bat idatzi jarraian.',
 'missingcommentheader'             => "'''Oharra:''' Ez duzu iruzkin honentzako gai/goiburuko bat ezarri. Berriz gordetzeko aukeratzen baduzu, hutsune horrekin gorde egingo da.",
-'summary-preview'                  => 'Laburpenaren aurreikuspena',
-'subject-preview'                  => 'Gaia/Izenburuaren aurreikuspena',
+'summary-preview'                  => 'Laburpenaren aurreikuspena:',
+'subject-preview'                  => 'Gaia/Izenburuaren aurreikuspena:',
 'blockedtitle'                     => 'Erabiltzailea blokeatuta dago',
 'blockedtext'                      => "<big>'''Zure lankide izena edo IP helbidea blokeaturik dago'''</big>
 Blokeoa $1(e)k egin zuen.
@@ -582,46 +614,55 @@ Mesedez, detaile hauek eman itzazu egin nahi duzun edozein kontsulta egiteko gar
 'newarticle'                       => '(Berria)',
 'newarticletext'                   => "Orrialde hau ez da existitzen oraindik. Orrialde sortu nahi baduzu, beheko koadroan idazten hasi zaitezke (ikus [[{{MediaWiki:Helppage}}|laguntza orrialdea]] informazio gehiagorako). Hona nahi gabe etorri bazara, nabigatzaileko '''atzera''' botoian klik egin.",
 'anontalkpagetext'                 => "----''Honako hau konturik sortu ez edo erabiltzen ez duen erabiltzaile anonimo baten eztabaida orria da. Bere IP helbidea erabili beharko da beraz identifikatzeko. Erabiltzaile batek baino gehiagok IP bera erabil dezakete ordea. Erabiltzaile anonimoa bazara eta zurekin zerikusirik ez duten mezuak jasotzen badituzu, mesedez [[Special:UserLogin|Izena eman edo saioa hasi]] etorkizunean horrelakoak gerta ez daitezen.''",
-'noarticletext'                    => 'Oraindik ez dago testurik orrialde honetan; beste orrialde batzuetan [[Special:Search/{{PAGENAME}}|bilatu dezakezu izenburu hau]] edo [{{fullurl:{{FULLPAGENAME}}|action=edit}} berau aldatu ere egin dezakezu].',
+'noarticletext'                    => 'Oraindik ez dago testurik orrialde honetan.
+Beste orrialde batzuetan [[Special:Search/{{PAGENAME}}|bilatu dezakezu izenburu hau]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} bilatu lotutako logak],
+edo [{{fullurl:{{FULLPAGENAME}}|action=edit}} berau aldatu ere egin dezakezu]</span>.',
 'userpage-userdoesnotexist'        => '"$1" lankidea ez dago erregistatuta. Mesedez, konprobatu orri hau editatu/sortu nahi duzun.',
 'clearyourcache'                   => "'''Oharra - Gorde ondoren zure nabigatzailearen katxea ekidin beharko duzu aldaketak ikusteko.''' '''Mozilla / Firefox / Safari:''' ''Shift'' tekla sakatu birkargatzeko momentuan, edo ''Ctrl-Shift-R'' sakatu (''Cmd-Shift-R'' Apple Mac baten); '''Internet Explorer:''' ''Ctrl'' tekla sakatu birkargatzeko momentuan, edo ''Ctrl-F5'' sakatu; '''Konqueror:''': Birkargatzeko klik egin, edo F5 sakatu, besterik ez; '''Opera''' erabiltzaileek ''Tresnak-Hobespenak'' atalera jo eta katxea garbitzeko aukera hautatu.",
-'usercssjsyoucanpreview'           => "<strong>Laguntza:</strong> Zure CSS/JS berria gorde aurretik probatzeko 'Aurrebista erakutsi' botoia erabili.",
+'usercssjsyoucanpreview'           => "'''Laguntza:''' Zure CSS/JS berria gorde aurretik probatzeko 'Aurrebista erakutsi' botoia erabili.",
 'usercsspreview'                   => "'''Ez ahaztu zure CSS kodea aurreikusten zabiltzala.'''
 '''Oraindik gorde gabe dago!'''",
 'userjspreview'                    => "'''Gogoratu zure JavaScript kodea probatu/aurreikusten zabiltzala, oraindik ez da gorde!'''",
 'userinvalidcssjstitle'            => "'''Oharra:''' Ez da \"\$1\" itxura existitzen. Kontuan izan .css eta .js fitxategi pertsonalizatuen izenak letra xehez idatzi behar direla; adibidez, {{ns:user}}:Adibide/monobook.css, eta ez {{ns:user}}:Adibide/Monobook.css.",
 'updated'                          => '(Eguneratua)',
-'note'                             => '<strong>Oharra:</strong>',
-'previewnote'                      => '<strong>Gogoratu hau aurreikusketa bat dela, beraz gorde egin beharko duzu!</strong>',
+'note'                             => "'''Oharra:'''",
+'previewnote'                      => "'''Gogoratu hau aurreikusketa bat dela, beraz gorde egin beharko duzu!'''",
 'previewconflict'                  => 'Aurreikuspenak aldaketen koadroan idatzitako testua erakusten du, gorde ondoren agertuko den bezala.',
-'session_fail_preview'             => '<strong>Sentitzen dugu! Ezin izan da zure aldaketa prozesatu, saioko datu batzuen galera dela-eta. Mesedez, saiatu berriz. Arazoak jarraitzen badu, saiatu saioa amaitu eta berriz hasten.</strong>',
-'session_fail_preview_html'        => "<strong>Sentitzen dugu! Ezin izan dugu zure aldaketa burutu, saio datu galera bat medio.</strong>
+'session_fail_preview'             => "'''Sentitzen dugu! Ezin izan da zure aldaketa prozesatu, saioko datu batzuen galera dela-eta. Mesedez, saiatu berriz. Arazoak jarraitzen badu, saiatu saioa amaitu eta berriz hasten.'''",
+'session_fail_preview_html'        => "'''Sentitzen dugu! Ezin izan dugu zure aldaketa burutu, saio datu galera bat medio.'''
 
 ''Wiki honek HTML kodea onartzen duenez, aurreikuspena ezgaituta dago JavaScript erasoak saihestu asmoz.''
 
-<strong>Aldaketa saiakera hau zuzena baldin bada, saiatu berriro mesedez. Arazoak jarraitzen badu, saiatu saioa itxi eta berriz hasten.</strong>",
+'''Aldaketa saiakera hau zuzena baldin bada, saiatu berriro mesedez. Arazoak jarraitzen badu, saiatu saioa itxi eta berriz hasten.'''",
+'token_suffix_mismatch'            => "'''Zure aldaketa ezeztatua izan da zure bezeroak puntuazio-karaktereak itxuragabetu dituelako.
+Aldaketa ezeztatua izan da testuaren galtzea galarazteko.
+Hau batzuetan gertatzen da buggyan oinarritutako web proxy zerbitzua erabiltzean.'''",
 'editing'                          => '$1 aldatzen',
 'editingsection'                   => '$1 aldatzen (atala)',
-'editingcomment'                   => '$1 aldatzen (iruzkina)',
+'editingcomment'                   => '$1 aldatzen (atal berria)',
 'editconflict'                     => 'Aldaketa gatazka: $1',
 'explainconflict'                  => 'Zu orrialdea aldatzen hasi ondoren beste norbaitek ere aldaketak egin ditu. Goiko testu koadroan ikus daiteke orrialdeak uneotan duen edukia. Zure aldaketak beheko testu koadroan ikus daitezke. Zure testua dagoenarekin elkartu beharko duzu. Orrialdea gordetzeko erabakitzen duzun unean goiko koadroko edukia <b>bakarrik</b> gordeko da.<br />',
 'yourtext'                         => 'Zure testua',
 'storedversion'                    => 'Gordetako bertsioa',
-'nonunicodebrowser'                => '<strong>OHARRA: Zure nabigatzailea ez dator Unicode arauarekin bat. Artikuluak modu seguruan aldatu ahal izateko beste sistema bat gaitu da: ASCII ez diren karaktereak kode hamaseitar bezala agertuko dira aldaketa koadroan.</strong>',
-'editingold'                       => '<strong>KONTUZ: Artikulu honen bertsio zahar bat aldatzen ari zara. Gorde egiten baduzu, azkenengo aldaketa baino lehenagoko aldakuntzak, ezabatuak izango dira.</strong>',
+'nonunicodebrowser'                => "'''OHARRA: Zure nabigatzailea ez dator Unicode arauarekin bat. Artikuluak modu seguruan aldatu ahal izateko beste sistema bat gaitu da: ASCII ez diren karaktereak kode hamaseitar bezala agertuko dira aldaketa koadroan.'''",
+'editingold'                       => "'''KONTUZ: Artikulu honen bertsio zahar bat aldatzen ari zara. Gorde egiten baduzu, azkenengo aldaketa baino lehenagoko aldakuntzak, ezabatuak izango dira.'''",
 'yourdiff'                         => 'Ezberdintasunak',
-'copyrightwarning'                 => 'Kontuan izan {{SITENAME}}(e)n egindako ekarpen guztiak $2 baldintzapean argitaratzen direla (ikus $1 informazio gehiagorako). Zure testua banatzeko baldintza hauekin ados ez bazaude, ez ezazu bidali.<br />
+'copyrightwarning'                 => "Kontuan izan {{SITENAME}}(e)n egindako ekarpen guztiak $2 baldintzapean argitaratzen direla (ikus $1 informazio gehiagorako). Zure testua banatzeko baldintza hauekin ados ez bazaude, ez ezazu bidali.<br />
 Era berean, bidaltzen ari zaren edukia zuk zeuk idatzitakoa dela edo jabetza publikoko edo baliabide aske batetik kopiatu duzula zin egin ari zara.
-<strong>EZ BIDALI BAIMENIK GABEKO COPYRIGHTDUN EDUKIRIK!</strong>',
-'copyrightwarning2'                => 'Mesedez, kontuan izan {{SITENAME}}(e)n egindako ekarpen guztiak besteek aldatu edo ezabatu ditzaketela. Ez baduzu besteek aldaketak egitea nahi, ez ezazu bidali.<br />
+'''EZ BIDALI BAIMENIK GABEKO COPYRIGHTDUN EDUKIRIK!'''",
+'copyrightwarning2'                => "Mesedez, kontuan izan {{SITENAME}}(e)n egindako ekarpen guztiak besteek aldatu edo ezabatu ditzaketela. Ez baduzu besteek aldaketak egitea nahi, ez ezazu bidali.<br />
 Era berean, bidaltzen ari zaren edukia zuk zeuk idatzitakoa dela edo jabetza publikoko edo baliabide aske batetik kopiatu duzula zin egin ari zara (ikus $1 informazio gehiagorako).
-<strong>EZ BIDALI BAIMENIK GABEKO COPYRIGHTDUN EDUKIRIK!</strong>',
-'longpagewarning'                  => '<strong>OHARRA: Orrialde honek $1 kilobyteko tamaina du; nabigatzaile batzuek arazoak izan litzakete 32 kb-tik gorako testuekin. Mesedez, saiatu orrialdea atal txikiagoetan banatzen.</strong>',
-'longpageerror'                    => '<strong>ERROREA: Bidali duzun testuak $1 kilobyteko luzera du, eta $2 kilobyteko maximoa baino luzeagoa da. Ezin da gorde.</strong>',
-'readonlywarning'                  => '<strong>OHARRA: Datu-basea blokeatu egin da mantenu lanak burutzeko, beraz ezingo dituzu orain zure aldaketak gorde. Testua fitxategi baten kopiatu dezakezu, eta beranduago erabiltzeko gorde.</strong>',
-'protectedpagewarning'             => '<strong>OHARRA:  Orri hau blokeaturik dago, administratzaileek soilik eraldatu dezakete.</strong>',
+'''EZ BIDALI BAIMENIK GABEKO COPYRIGHTDUN EDUKIRIK!'''",
+'longpagewarning'                  => "'''OHARRA: Orrialde honek $1 kilobyteko tamaina du; nabigatzaile batzuek arazoak izan litzakete 32 kb-tik gorako testuekin. Mesedez, saiatu orrialdea atal txikiagoetan banatzen.'''",
+'longpageerror'                    => "'''ERROREA: Bidali duzun testuak $1 kilobyteko luzera du, eta $2 kilobyteko maximoa baino luzeagoa da. Ezin da gorde.'''",
+'readonlywarning'                  => "'''OHARRA: Datu-basea blokeatu egin da mantenu lanak burutzeko, beraz ezingo dituzu orain zure aldaketak gorde. Testua fitxategi baten kopiatu dezakezu, eta beranduago erabiltzeko gorde.
+
+Blokeatu zuen administratzaileak honako azalpena eman zuen: $1'''",
+'protectedpagewarning'             => "'''OHARRA:  Orri hau blokeaturik dago, administratzaileek soilik eraldatu dezakete.'''",
 'semiprotectedpagewarning'         => '<big><strong>Oharra: Orrialde hau erregistratutako erabiltzaileek bakarrik aldatzeko babestuta dago.</strong></big>',
-'titleprotectedwarning'            => '<strong>OHARRA:  Orrialde hau blokeatuta dago eta bakkarrik lankide batzuk aldatu edo sortu dezakete.</strong>',
+'cascadeprotectedwarning'          => "'''Oharra:''' Orrialde hau blokeatua izan da eta administratzaileek baino ez dute berau aldatzeko ahalmena, honako {{PLURAL:$1|orrialdeko|orrialdeetako}} kaskada-babesean txertatuta dagoelako:",
+'titleprotectedwarning'            => "'''OHARRA:  Orrialde hau blokeatuta dago eta bakarrik [[Special:ListGroupRights|erabiltzaile batzuek]] sortu dezakete.'''",
 'templatesused'                    => 'Orrialde honetan erabiltzen diren txantiloiak:',
 'templatesusedpreview'             => 'Aurreikuspen honetan erabiltzen diren txantiloiak:',
 'templatesusedsection'             => 'Atal honetan erabiltzen diren txantiloiak:',
@@ -639,16 +680,30 @@ Era berean, bidaltzen ari zaren edukia zuk zeuk idatzitakoa dela edo jabetza pub
 
 Pentsatu ea orrialde hau editatzen jarraitzeak zentzurik baduen.
 Hemen duzu orrialde honen ezabaketa erregistroa badaezpada ere:",
+'deleted-notice'                   => 'Orrialde hau ezabatu da.
+Orrialdearen ezabatze loga behean agertzen da erreferentzia gisa.',
+'deletelog-fulllog'                => 'Log osoa ikusi',
+'edit-hook-aborted'                => 'Gehigarriak aldaketa ezeztatu du.
+Ez du azalpenik eman.',
+'edit-gone-missing'                => 'Ezin da orria eguneratu. Ezabatu omen dute.',
+'edit-conflict'                    => 'Aldaketa gatazka.',
+'edit-no-change'                   => 'Zure edizioa baztertu da testua aldatu ez duzulako.',
+'edit-already-exists'              => 'Ezin izan da orri berria sortu.
+Jada existitzen da.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Adi: Orrialde honek parser funtzio oso garesti gehegi ditu.
+'expensive-parserfunction-warning'        => 'Adi: Orrialde honek parser funtzio deialdi oso garesti gehiegi ditu.
 
-$2 baino gutxiago eduki beharko lituzke, eta orain $1 daude.',
+$2 {{PLURAL:$2|deialdi|deialdi}} baino gutxiago eduki beharko lituzke, eta orain $1 {{PLURAL:$1|dago|daude}}.',
 'expensive-parserfunction-category'       => 'Parser funtzio deialdi oso garesti gehiegi dituzten orrialdeak',
 'post-expand-template-inclusion-warning'  => 'Kontuz: Txantiloiak sartzen duena oso handia da.
 Txantiloi batzuk ez dira erabiliko.',
 'post-expand-template-inclusion-category' => 'Txantiloiaren inklusio tamaina gainditu den orrialdeak',
+'post-expand-template-argument-warning'   => 'Oharra: Orri honek gutxienez txantiloi eztabaida bat du, zein luzeegia den.
+Eztabaidak aipatu gabe utzi dira.',
 'post-expand-template-argument-category'  => 'Kontuan hartu ez diren txantiloiak dituzten orrialdeak',
+'parser-template-loop-warning'            => 'Txantiloiaren itzul-biraketa aurkitu da: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Txantiloaren rekurtsio sakoneraren muga gainditu da ($1)',
 
 # "Undo" feature
 'undo-success' => 'Aldaketa desegin daiteke.
@@ -664,29 +719,29 @@ Mesedez beheko alderaketa egiaztatu, egin nahi duzuna hori dela frogatzeko, eta
 $3(e)k emandako arrazoia: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Orrialde honen erregistroak ikusi',
-'nohistory'           => 'Orrialde honek ez dauka aldaketa historiarik.',
-'revnotfound'         => 'Ezin izan da berrikuspena aurkitu',
-'revnotfoundtext'     => 'Ezin izan da eskatzen ari zaren orrialdearen berrikuspen zaharra aurkitu. Mesedez, egiaztatu orrialde honetara iristeko erabili duzun URLa.',
-'currentrev'          => 'Oraingo berrikuspena',
-'revisionasof'        => '$1(e)ko berrikuspena',
-'revision-info'       => '$2(r)en berrikusketa, ordua: $1',
-'previousrevision'    => '�Berrikuspen zaharragoa',
-'nextrevision'        => 'Berrikuspen berriagoa→',
-'currentrevisionlink' => 'Oraingo berrikuspena ikusi',
-'cur'                 => 'orain',
-'next'                => 'hurrengoa',
-'last'                => 'azkena',
-'page_first'          => 'lehena',
-'page_last'           => 'azkena',
-'histlegend'          => 'Diff hautapena: hautatu alderatu nahi dituzun bi bertsioak eta beheko botoian klik egin.<br />
+'viewpagelogs'           => 'Orrialde honen erregistroak ikusi',
+'nohistory'              => 'Orrialde honek ez dauka aldaketa historiarik.',
+'currentrev'             => 'Oraingo berrikuspena',
+'currentrev-asof'        => '$1(e)an momentuko aldaketa',
+'revisionasof'           => '$1(e)ko berrikuspena',
+'revision-info'          => '$2(r)en berrikusketa, ordua: $1', # Additionally available: $3: revision id
+'previousrevision'       => '�Berrikuspen zaharragoa',
+'nextrevision'           => 'Berrikuspen berriagoa→',
+'currentrevisionlink'    => 'Oraingo berrikuspena ikusi',
+'cur'                    => 'orain',
+'next'                   => 'hurrengoa',
+'last'                   => 'azkena',
+'page_first'             => 'lehena',
+'page_last'              => 'azkena',
+'histlegend'             => 'Diff hautapena: hautatu alderatu nahi dituzun bi bertsioak eta beheko botoian klik egin.<br />
 Legenda: (orain) = oraingo bertsioarekiko ezberdintasuna,
 (azkena) = aurreko bertsioarekiko ezberdintasuna, t = aldaketa txikia.',
-'deletedrev'          => '[ezabatuta]',
-'histfirst'           => 'Lehena',
-'histlast'            => 'Azkena',
-'historysize'         => '({{PLURAL:$1|byte 1|$1 byte}})',
-'historyempty'        => '(hutsik)',
+'history-fieldset-title' => 'Historia erakutsi',
+'deletedrev'             => '[ezabatuta]',
+'histfirst'              => 'Lehena',
+'histlast'               => 'Azkena',
+'historysize'            => '({{PLURAL:$1|byte 1|$1 byte}})',
+'historyempty'           => '(hutsik)',
 
 # Revision feed
 'history-feed-title'          => 'Berrikuspenen historia',
@@ -726,6 +781,8 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'revdelete-submit'            => 'Hautatutako berrikuspenari aplikatu',
 'revdelete-logentry'          => '[[$1]](r)entzako berriskupen ikusgaitasuna aldatu da',
 'logdelete-logentry'          => '[[$1]]en gertakarien ikusgarritasuna aldatu da',
+'revdelete-success'           => "'''Berrikuspenen ikusgarritasuna ondo ezarri da.'''",
+'logdelete-success'           => "'''Log ikusgarritasuna ondo ezarri da.'''",
 'revdel-restore'              => 'Ikusgarritasuna aldatu',
 'pagehist'                    => 'Orriaren historia',
 'deletedhist'                 => 'Ezabatutako historia',
@@ -740,18 +797,25 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'logdelete-log-message'       => '$1(e)tik {{PLURAL:$2|gertakari $2|$2 gertakari}}',
 
 # Suppression log
-'suppressionlog' => 'Ezabatze loga',
+'suppressionlog'     => 'Ezabatze loga',
+'suppressionlogtext' => 'Azpian administratzaileek ezkutatutako edukia duten ezabaketa eta blokeoen zerrenda dago.
+Ikusi [[Special:IPBlockList|IP blokeoen zerrenda]] orain dauden blokeoak ikusi ahal izateko.',
 
 # History merging
 'mergehistory'                     => 'Orrialdeen historiak bateratu',
+'mergehistory-header'              => 'Orri honek iturri baten historiaren berrikuspenak bateratzea ahalbidetzen du, orri berri batean.
+Ziurtatu aldaketa honek ez duela orri historikoaren jarraipena etengo.',
 'mergehistory-box'                 => 'Bi orrialderen berrikuspenak bateratu:',
 'mergehistory-from'                => 'Jatorrizko orrialdea:',
 'mergehistory-into'                => 'Helburu orrialdea:',
 'mergehistory-list'                => 'Batu daitekeen aldaketen historia',
+'mergehistory-merge'               => '[[:$1]]-(e)n ondorengo berrikuspena [[:$2]]-(r)ekin bateratu daiteke.
+Zutabe botoia erabili zehaztutako orduan sortutako berrikuspenak bakarrik bateratzeko.
+Kontura zaitez nabigazio loturek, zutabea ezabatu dezakela.',
 'mergehistory-go'                  => 'Aldaketa bateragarriak erakutsi',
 'mergehistory-submit'              => 'Berrikuspenak bateratu',
 'mergehistory-empty'               => 'Ezin da berrikuspenik bateratu',
-'mergehistory-success'             => '[[:$1]](e)ko $3 berrikuspen bateratu egin dira [[:$2]](e)n.',
+'mergehistory-success'             => '[[:$1]](e)ko {{PLURAL:$3|berrikuspen|berrikuspen}} bateratu egin dira [[:$2]](e)n.',
 'mergehistory-fail'                => 'Ezin izan da historia bateratu; egiaztatu orrialde eta denbora parametroak.',
 'mergehistory-no-source'           => 'Ez da $1 jatorrizko orrialdea existitzen.',
 'mergehistory-no-destination'      => 'Ez da $1 helburu orrialdea existitzen.',
@@ -759,6 +823,7 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'mergehistory-invalid-destination' => 'Helburu orrialdea baliozko izenburua izan behar da.',
 'mergehistory-autocomment'         => '[[:$1]] [[:$2]]rekin batu da',
 'mergehistory-comment'             => '[[:$1]] [[:$2]]rekin batu da: $3',
+'mergehistory-same-destination'    => 'Jatorri eta helmugako orriak ezin dira berdinak izan',
 
 # Merge log
 'mergelog'           => 'Bateratze erregistroa',
@@ -771,123 +836,214 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'difference'              => '(Bertsioen arteko ezberdintasunak)',
 'lineno'                  => '$1. lerroa:',
 'compareselectedversions' => 'Hautatutako bertsioak alderatu',
+'visualcomparison'        => 'Alderaketa bisuala',
+'wikicodecomparison'      => 'Wikitext alderaketa',
 'editundo'                => 'desegin',
 'diff-multi'              => '({{PLURAL:$1|Ez da tarteko berrikuspen 1|Ez dira tarteko $1 berrikuspen}} erakusten.)',
+'diff-movedto'            => '$1(e)ra mugituta',
+'diff-styleadded'         => '$1 estiloa gehitu da',
+'diff-added'              => '$1 gehitu da',
+'diff-changedto'          => '$1(e)ra aldatuta',
+'diff-movedoutof'         => '$1(e)tik mugituta',
+'diff-styleremoved'       => '$1 estiloa ezabatuta',
+'diff-removed'            => '$1 ezabatua',
+'diff-changedfrom'        => '$1(e)tik aldatuta',
+'diff-src'                => 'jatorria',
+'diff-withdestination'    => '$1 helburuarekin',
+'diff-with'               => '&#32; $1 $2(r)ekin',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;eta $1 $2',
+'diff-width'              => 'zabalera',
+'diff-height'             => 'garaiera',
+'diff-p'                  => "'''paragrafo''' bat",
+'diff-blockquote'         => "'''esaera''' bat",
+'diff-h1'                 => "'''1. mailako izenburu''' bat",
+'diff-h2'                 => "'''2. mailako izenburu''' bat",
+'diff-h3'                 => "'''3. mailako izenburu''' bat",
+'diff-h4'                 => "'''4. mailako izenburu''' bat",
+'diff-h5'                 => "'''5. mailako izenburu''' bat",
+'diff-pre'                => "'''aureformatudun bloke''' bat",
+'diff-div'                => "'''zatiketa''' bat",
+'diff-ul'                 => "'''ordenarik gabeko zerrenda''' bat",
+'diff-ol'                 => "'''zerrenda ordenatu''' bat",
+'diff-li'                 => "'''zerrendako elementu''' bat",
+'diff-table'              => "'''taula''' bat",
+'diff-tbody'              => "'''taularen edukia'''",
+'diff-tr'                 => "'''zerrenda''' bat",
+'diff-td'                 => "'''zelda''' bat",
+'diff-th'                 => "'''izenburu''' bat",
+'diff-br'                 => "'''eten''' bat",
+'diff-hr'                 => "'''lerro horizontal''' bat",
+'diff-code'               => "'''ordenagailu kode bloke''' bat",
+'diff-dl'                 => "'''definizio zerrenda''' bat",
+'diff-dt'                 => "'''definizio termino''' bat",
+'diff-dd'                 => "'''definizio''' bat",
+'diff-input'              => "'''input''' bat",
+'diff-form'               => "'''formulario''' bat",
+'diff-img'                => "'''irudi''' bat",
+'diff-span'               => "'''span''' bat",
+'diff-a'                  => "'''lotura''' bat",
+'diff-i'                  => "'''letra etzana'''",
+'diff-b'                  => "'''letra beltza'''",
+'diff-strong'             => "'''indartsua'''",
+'diff-em'                 => "'''enfasia'''",
+'diff-font'               => "'''letra-tipoa'''",
+'diff-big'                => "'''handia'''",
+'diff-del'                => "'''ezabatua'''",
+'diff-tt'                 => "'''zabalera mugatua'''",
+'diff-sub'                => "'''azpimarratua'''",
+'diff-sup'                => "'''goi-marratua'''",
+'diff-strike'             => "'''tatxatua'''",
 
 # Search results
-'searchresults'             => 'Bilaketaren emaitzak',
-'searchresulttext'          => '{{SITENAME}}(e)n bilaketak egiteko informazio gehiagorako, ikus [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "'''[[:$1]]''' bilatu duzu",
-'searchsubtitleinvalid'     => "'''$1''' bilatu duzu",
-'noexactmatch'              => "'''Ez dago \"\$1\" izenburua duen orrialderik.''' [[:\$1|Orrialde hau]] sortu dezakezu.",
-'noexactmatch-nocreate'     => "'''Ez dago \"\$1\" izenburua duen orrialderik.'''",
-'titlematches'              => 'Emaitzak artikuluen izenburuetan',
-'notitlematches'            => 'Ez dago bat datorren orrialde izenbururik',
-'textmatches'               => 'Emaitza orrialde testuetan',
-'notextmatches'             => 'Ez dago bat datorren orrialde testurik',
-'prevn'                     => 'aurreko $1ak',
-'nextn'                     => 'hurrengo $1ak',
-'viewprevnext'              => 'Ikusi ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|hitz bat|$2 hitz}})',
-'search-result-score'       => 'Garrantzia: %$1',
-'search-redirect'           => '($1 birzuzenketa)',
-'search-section'            => '($1 atala)',
-'search-suggest'            => '$1 esan nahi zenuen',
-'search-interwiki-caption'  => 'Beste proiektuak',
-'search-interwiki-default'  => '$1(r)en emaitzak:',
-'search-interwiki-more'     => '(gehiago)',
-'search-mwsuggest-enabled'  => 'iradokizunekin',
-'search-mwsuggest-disabled' => 'ez dago gomendiorik',
-'search-relatedarticle'     => 'Harremanetan',
-'mwsuggest-disable'         => 'AJAX gomendioak ezgaitu',
-'searchrelated'             => 'harremana',
-'searchall'                 => 'guztia',
-'showingresults'            => "Jarraian {{PLURAL:$1|emaitza '''1''' ikus daiteke|'''$1''' emaitza ikus daitezke}}, #'''$2'''.etik hasita.",
-'showingresultsnum'         => "Hasieran #'''$2''' duten '''$3''' emaitza erakusten dira jarraian.",
-'nonefound'                 => "'''Oharra''': Arrakastarik gabeko bilaketen arrazoi nagusietako bat \"dute\" eta \"da\" bezalako hitz arruntak bilatzea izan ohi da, edo baita bilaketan hitz gehiegi zehazteagatik ere (emaitzetan hitz guztiak dituzten emaitzak baino ez dira azalduko).",
-'powersearch'               => 'Bilatu',
-'powersearch-legend'        => 'Bilaketa aurreratua',
-'powersearch-ns'            => 'Bilatu honako izen-tartetan:',
-'powersearch-redir'         => 'Birzuzenketen zerrenda',
-'powersearch-field'         => 'Bilatu',
-'search-external'           => 'Kanpo bilaketa',
-'searchdisabled'            => '{{SITENAME}}(e)n ezgaituta dago bilaketa. Dena dela, Google erabiliz ere egin dezakezu bilaketa. Kontuan izan bertan dituzten {{SITENAME}}(e)ko emaitzak zaharkituta egon daitezkeela.',
+'searchresults'                    => 'Bilaketaren emaitzak',
+'searchresults-title'              => '"$1(e)rako" emaitzak bilatu',
+'searchresulttext'                 => '{{SITENAME}}(e)n bilaketak egiteko informazio gehiagorako, ikus [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => '\'\'\'[[:$1]]\'\'\' bilatu duzu ([[Special:Prefixindex/$1|hasten diren "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1"-ra lotzen diren orriak]])',
+'searchsubtitleinvalid'            => "'''$1''' bilatu duzu",
+'noexactmatch'                     => "'''Ez dago \"\$1\" izenburua duen orrialderik.''' [[:\$1|Orrialde hau]] sortu dezakezu.",
+'noexactmatch-nocreate'            => "'''Ez dago \"\$1\" izenburua duen orrialderik.'''",
+'toomanymatches'                   => 'Aukera gehiegi aurkitu dira, saia zaitez beste eskaera ezberdin batekin',
+'titlematches'                     => 'Emaitzak artikuluen izenburuetan',
+'notitlematches'                   => 'Ez dago bat datorren orrialde izenbururik',
+'textmatches'                      => 'Emaitza orrialde testuetan',
+'notextmatches'                    => 'Ez dago bat datorren orrialde testurik',
+'prevn'                            => 'aurreko $1ak',
+'nextn'                            => 'hurrengo $1ak',
+'viewprevnext'                     => 'Ikusi ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Bilaketa aukerak',
+'searchmenu-exists'                => "'''\"[[:\$1]]\" izena duen orrialde bat badago wiki honetan'''",
+'searchmenu-new'                   => "'''\"[[:\$1]]\" orrialde sortu wiki honetan!'''",
+'searchhelp-url'                   => 'Help:Laguntza',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Aurrizki hau duten orrialdeetatik nabigatu]]',
+'searchprofile-articles'           => 'Eduki orrialdeak',
+'searchprofile-articles-and-proj'  => 'Edukia eta proiektu orrialdeak',
+'searchprofile-project'            => 'Proiektu orrialdeak',
+'searchprofile-images'             => 'Fitxategiak',
+'searchprofile-everything'         => 'Guztia',
+'searchprofile-advanced'           => 'Aurreratua',
+'searchprofile-articles-tooltip'   => '$1(e)n bilatu',
+'searchprofile-project-tooltip'    => '$1(e)n bilatu',
+'searchprofile-images-tooltip'     => 'Fitxategiak bilatu',
+'searchprofile-everything-tooltip' => 'Bilatu eduki guztian (lankide orrialdeak barne)',
+'searchprofile-advanced-tooltip'   => 'Lankideen izen zehatzetan bilatu',
+'prefs-search-nsdefault'           => 'Bilaketa berezko balioak erabiliz:',
+'prefs-search-nscustom'            => 'Bilatu lankide izen zehatzetan:',
+'search-result-size'               => '$1 ({{PLURAL:$2|hitz bat|$2 hitz}})',
+'search-result-score'              => 'Garrantzia: %$1',
+'search-redirect'                  => '($1 birzuzenketa)',
+'search-section'                   => '($1 atala)',
+'search-suggest'                   => '$1 esan nahi zenuen',
+'search-interwiki-caption'         => 'Beste proiektuak',
+'search-interwiki-default'         => '$1(r)en emaitzak:',
+'search-interwiki-more'            => '(gehiago)',
+'search-mwsuggest-enabled'         => 'iradokizunekin',
+'search-mwsuggest-disabled'        => 'ez dago gomendiorik',
+'search-relatedarticle'            => 'Harremanetan',
+'mwsuggest-disable'                => 'AJAX gomendioak ezgaitu',
+'searchrelated'                    => 'harremana',
+'searchall'                        => 'guztia',
+'showingresults'                   => "Jarraian {{PLURAL:$1|emaitza '''1''' ikus daiteke|'''$1''' emaitza ikus daitezke}}, #'''$2'''.etik hasita.",
+'showingresultsnum'                => "Hasieran #'''$2''' duten {{PLURAL:$3|emaitza '''1'''|'''$3''' emaitza}} erakusten dira jarraian.",
+'showingresultstotal'              => "{{PLURAL:$4|'''$1'''(e)tik '''$3''' emaitza|'''$1 - $2'''(e)tik '''$3''' emaitzak}} erakusten",
+'nonefound'                        => "'''Oharra''': Bakarrik izen-tarte batzuetan egiten da berez bilaketa.
+Saia zaitez zure eskeraren aurretik ''all:'' jartzen eduki guztien artean bilatzeko (eztabaida orrialdea, txantiloiak, etab. sartuz) edo bestela erabil ezazu nahi duzun izen-tartea aurrizki gisa.",
+'search-nonefound'                 => 'Ez dago eskaerarekin bat egiten duten emaitzarik.',
+'powersearch'                      => 'Bilatu',
+'powersearch-legend'               => 'Bilaketa aurreratua',
+'powersearch-ns'                   => 'Bilatu honako izen-tartetan:',
+'powersearch-redir'                => 'Birzuzenketen zerrenda',
+'powersearch-field'                => 'Bilatu',
+'search-external'                  => 'Kanpo bilaketa',
+'searchdisabled'                   => '{{SITENAME}}(e)n ezgaituta dago bilaketa. Dena dela, Google erabiliz ere egin dezakezu bilaketa. Kontuan izan bertan dituzten {{SITENAME}}(e)ko emaitzak zaharkituta egon daitezkeela.',
 
 # Preferences page
-'preferences'              => 'Hobespenak',
-'mypreferences'            => 'Nire hobespenak',
-'prefs-edits'              => 'Aldaketa kopurua:',
-'prefsnologin'             => 'Saioa hasi gabe',
-'prefsnologintext'         => '<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} Izena eman] behar duzu zure hobespenak ezartzeko.',
-'prefsreset'               => 'Hobespenak hasieratu egin dira.',
-'qbsettings'               => 'Laster-barra',
-'qbsettings-none'          => 'Ezein ere',
-'qbsettings-fixedleft'     => 'Eskuinean',
-'qbsettings-fixedright'    => 'Ezkerrean',
-'qbsettings-floatingleft'  => 'Ezkerrean mugikor',
-'qbsettings-floatingright' => 'Eskubian flotatzen',
-'changepassword'           => 'Pasahitza aldatu',
-'skin'                     => 'Itxura',
-'math'                     => 'Formulak',
-'dateformat'               => 'Data formatua',
-'datedefault'              => 'Hobespenik ez',
-'datetime'                 => 'Data eta ordua',
-'math_failure'             => 'Interpretazio errorea',
-'math_unknown_error'       => 'errore ezezaguna',
-'math_unknown_function'    => 'funtzio ezezaguna',
-'math_lexing_error'        => 'errore lexikoa',
-'math_syntax_error'        => 'sintaxi errorea',
-'math_image_error'         => 'PNG bilakatze errorea; egiaztatu latex, dvips, gs eta convert ongi instalatuta daudela',
-'math_bad_tmpdir'          => 'Ezin da math direktorio tenporala sortu edo bertan idatzi',
-'math_bad_output'          => 'Ezin da math direktorioa sortu edo bertan idatzi',
-'math_notexvc'             => 'texvc exekutagarria falta da; mesedez, ikus math/README konfiguratzeko.',
-'prefs-personal'           => 'Erabiltzaile profila',
-'prefs-rc'                 => 'Azken aldaketak',
-'prefs-watchlist'          => 'Jarraipen zerrenda',
-'prefs-watchlist-days'     => 'Jarraipen zerrendan erakutsi beharreko egun kopurua:',
-'prefs-watchlist-edits'    => 'Jarraipen zerrendan erakutsi beharreko aldaketa kopurua:',
-'prefs-misc'               => 'Denetarik',
-'saveprefs'                => 'Gorde',
-'resetprefs'               => 'Hasieratu',
-'oldpassword'              => 'Pasahitz zaharra:',
-'newpassword'              => 'Pasahitz berria:',
-'retypenew'                => 'Pasahitz berria berriz idatzi:',
-'textboxsize'              => 'Aldatzen',
-'rows'                     => 'Lerroak:',
-'columns'                  => 'Zutabeak:',
-'searchresultshead'        => 'Bilaketa',
-'resultsperpage'           => 'Emaitza orrialdeko:',
-'contextlines'             => 'Lerro emaitzako:',
-'contextchars'             => 'Lerro bakoitzeko karaktere kopurua:',
-'recentchangesdays'        => 'Aldaketa berrietan erakutsi beharreko egun kopurua:',
-'recentchangescount'       => 'Aldaketa berrietan izenburu kopurua:',
-'savedprefs'               => 'Zure hobespenak gorde egin dira.',
-'timezonelegend'           => 'Ordu zona',
-'timezonetext'             => 'Zure ordu lokala eta zerbitzariaren orduaren (UTC) arteko ezberdintasuna.',
-'localtime'                => 'Ordu lokala',
-'timezoneoffset'           => 'Ezberdintasuna¹',
-'servertime'               => 'Zerbitzariko ordua',
-'guesstimezone'            => 'Nabigatzailetik jaso',
-'allowemail'               => 'Beste erabiltzaileengandik e-posta mezuak jasotzea gaitu',
-'prefs-searchoptions'      => 'Bilaketa aukerak',
-'prefs-namespaces'         => 'Izen-tarteak',
-'defaultns'                => 'Izen-tarte hauetan bilatu lehenetsitzat:',
-'default'                  => 'lehenetsia',
-'files'                    => 'Fitxategiak',
+'preferences'               => 'Hobespenak',
+'mypreferences'             => 'Nire hobespenak',
+'prefs-edits'               => 'Aldaketa kopurua:',
+'prefsnologin'              => 'Saioa hasi gabe',
+'prefsnologintext'          => '<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} Izena eman] behar duzu zure hobespenak ezartzeko.',
+'prefsreset'                => 'Hobespenak hasieratu egin dira.',
+'qbsettings'                => 'Laster-barra',
+'qbsettings-none'           => 'Ezein ere',
+'qbsettings-fixedleft'      => 'Eskuinean',
+'qbsettings-fixedright'     => 'Ezkerrean',
+'qbsettings-floatingleft'   => 'Ezkerrean mugikor',
+'qbsettings-floatingright'  => 'Eskubian flotatzen',
+'changepassword'            => 'Pasahitza aldatu',
+'skin'                      => 'Itxura',
+'skin-preview'              => 'Aurrebista',
+'math'                      => 'Formulak',
+'dateformat'                => 'Data formatua',
+'datedefault'               => 'Hobespenik ez',
+'datetime'                  => 'Data eta ordua',
+'math_failure'              => 'Interpretazio errorea',
+'math_unknown_error'        => 'errore ezezaguna',
+'math_unknown_function'     => 'funtzio ezezaguna',
+'math_lexing_error'         => 'errore lexikoa',
+'math_syntax_error'         => 'sintaxi errorea',
+'math_image_error'          => 'PNG bilakatze errorea; egiaztatu latex, dvips, gs eta convert ongi instalatuta daudela',
+'math_bad_tmpdir'           => 'Ezin da math direktorio tenporala sortu edo bertan idatzi',
+'math_bad_output'           => 'Ezin da math direktorioa sortu edo bertan idatzi',
+'math_notexvc'              => 'texvc exekutagarria falta da; mesedez, ikus math/README konfiguratzeko.',
+'prefs-personal'            => 'Erabiltzaile profila',
+'prefs-rc'                  => 'Azken aldaketak',
+'prefs-watchlist'           => 'Jarraipen zerrenda',
+'prefs-watchlist-days'      => 'Jarraipen zerrendan erakutsi beharreko egun kopurua:',
+'prefs-watchlist-days-max'  => '(gehienez 7 egun)',
+'prefs-watchlist-edits'     => 'Jarraipen zerrendan erakutsi beharreko aldaketa kopurua:',
+'prefs-watchlist-edits-max' => '(Gehenezko zenbakia: 1000)',
+'prefs-misc'                => 'Denetarik',
+'prefs-resetpass'           => 'Pasahitza aldatu',
+'saveprefs'                 => 'Gorde',
+'resetprefs'                => 'Hasieratu',
+'textboxsize'               => 'Aldatzen',
+'prefs-edit-boxsize'        => 'Edizio lehioaren tamaina.',
+'rows'                      => 'Lerroak:',
+'columns'                   => 'Zutabeak:',
+'searchresultshead'         => 'Bilaketa',
+'resultsperpage'            => 'Emaitza orrialdeko:',
+'contextlines'              => 'Lerro emaitzako:',
+'contextchars'              => 'Lerro bakoitzeko karaktere kopurua:',
+'stub-threshold'            => '<a href="#" class="stub">stub link</a> formaturako atalasea (byteak):',
+'recentchangesdays'         => 'Aldaketa berrietan erakutsi beharreko egun kopurua:',
+'recentchangesdays-max'     => '(gehienez {{PLURAL:$1|egun $1|$1 egun}})',
+'recentchangescount'        => 'Aldaketa berrietan, historian eta erregistroetan erakusteko aldaketa kopurua, lehenetsita:',
+'savedprefs'                => 'Zure hobespenak gorde egin dira.',
+'timezonelegend'            => 'Ordu zona',
+'timezonetext'              => 'Zure ordu lokala eta zerbitzariaren orduaren (UTC) arteko ezberdintasuna.',
+'localtime'                 => 'Ordu lokala:',
+'timezoneselect'            => 'Ordutegi-eremua:',
+'timezoneuseserverdefault'  => 'Erabiltzailearen zerbitzariaren berezkoa',
+'timezoneuseoffset'         => 'Beste bat (diferentzia ezarri)',
+'timezoneoffset'            => 'Ezberdintasuna¹:',
+'servertime'                => 'Zerbitzariko ordua:',
+'guesstimezone'             => 'Nabigatzailetik jaso',
+'allowemail'                => 'Beste erabiltzaileengandik e-posta mezuak jasotzea gaitu',
+'prefs-searchoptions'       => 'Bilaketa aukerak',
+'prefs-namespaces'          => 'Izen-tarteak',
+'defaultns'                 => 'Izen-tarte hauetan bilatu lehenetsitzat:',
+'default'                   => 'lehenetsia',
+'files'                     => 'Fitxategiak',
 
 # User rights
 'userrights'                  => 'Erabiltzaile baimenen kudeaketa', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Erabiltzaile taldeak kudeatu',
 'userrights-user-editname'    => 'Erabiltzaile izena idatzi:',
 'editusergroup'               => 'Erabiltzaile taldeak editatu',
-'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) erabiltzailea aldatzen",
+'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) lankidearen erabiltzaile-eskubideak aldatzen",
 'userrights-editusergroup'    => 'Erabiltzaile taldeak editatu',
 'saveusergroups'              => 'Erabiltzaile taldeak gorde',
 'userrights-groupsmember'     => 'Partaide da hemen:',
+'userrights-groups-help'      => 'Lankide hau dagoen taldeak aldatu dituzu:
+* Aukeratutako taulak esan nahi du lankidea talde horretan dagoela.
+* Aukeratu gabeko taulak esan nahi du lankidea ez dagoela talde horretan.
+* *-k erakusten du ezin duzula taldea ezabatu, behin gehitu ondoren, edo alderantziz.',
 'userrights-reason'           => 'Aldatzeko arrazoia:',
-'userrights-no-interwiki'     => 'Ez duzu beste wikietan lankide eskumenak aldatzeko baimenik.',
+'userrights-no-interwiki'     => 'Ez duzu beste wikietan erabiltzaile eskumenak aldatzeko baimenik.',
 'userrights-nodatabase'       => '$1 datubasea ez da existitzen edo ez dago lokalki.',
-'userrights-notallowed'       => 'Zure kontuak ez du baimenik lankide eskumenak emateko.',
+'userrights-nologin'          => 'Administratzaile kontu batekin [[Special:UserLogin|hasi behar duzu saioa]] erabiltzaile eskubideak esleitzeko.',
+'userrights-notallowed'       => 'Zure kontuak ez du baimenik erabiltzaile eskumenak emateko.',
 'userrights-changeable-col'   => 'Alda ditzakezun taldeak',
 'userrights-unchangeable-col' => 'Aldatu ezin ditzakezun taldeak',
 
@@ -909,7 +1065,7 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'group-suppress-member'      => 'Gainikuspena',
 
 'grouppage-user'          => '{{ns:project}}:Lankideak',
-'grouppage-autoconfirmed' => '{{ns:project}}:Lankide autokonfirmatuak',
+'grouppage-autoconfirmed' => '{{ns:project}}:Erabiltzaile autokonfirmatuak',
 'grouppage-bot'           => '{{ns:project}}:Bot-ak',
 'grouppage-sysop'         => '{{ns:project}}:Administratzaileak',
 'grouppage-bureaucrat'    => '{{ns:project}}:Burokratak',
@@ -922,16 +1078,20 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'right-createtalk'           => 'Eztabaida orriak sortu',
 'right-createaccount'        => 'Erabiltzaile kontu berria sortu',
 'right-minoredit'            => 'Aldaketa txiki gisa markatu',
-'right-move'                 => 'Oriak mugitu',
+'right-move'                 => 'Orrialdeak mugitu',
 'right-move-subpages'        => 'Mugitu orrialdeak bere azpiorrialdeekin',
+'right-move-rootuserpages'   => 'Erro-lankidearen orriak mugitu',
+'right-movefile'             => 'Fitxategiak mugitu',
 'right-suppressredirect'     => 'Ez sortu birzuzenketa bat antzinako izenetik orrialdea mugitzerakoan',
 'right-upload'               => 'Fitxategia igo',
 'right-reupload'             => 'Jada existitzen den artxibo bat gainidatzi',
 'right-reupload-own'         => 'Norberak igotako fitxategi baten gainean idatzi',
 'right-reupload-shared'      => 'Media biltegi komun batean dauden fitxategiak lokalki gainpasa',
 'right-upload_by_url'        => 'URL helbide batetik fitxategi bat igo',
-'right-autoconfirmed'        => 'Semi-babestuak dauden orriak aldatu',
+'right-purge'                => 'Leku honen katxea garbitu konfirmaziorik gabeko orrialde batentzat',
+'right-autoconfirmed'        => 'Erdi-babestuak dauden orriak aldatu',
 'right-bot'                  => 'Prozesu automatikoki gisa jokatu',
+'right-nominornewtalk'       => 'Estabaida orrietan aldaketa txikirik ez edukitzea mezu berrietan',
 'right-apihighlimits'        => 'API eskaeretan goreneko mugak erabili',
 'right-writeapi'             => 'API idaztekoa erabili',
 'right-delete'               => 'Orrialdeak ezabatu',
@@ -940,13 +1100,19 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'right-deletedhistory'       => 'Ezabatutako sarreren historia ikusi, euren atxikitutako testurik gabe',
 'right-browsearchive'        => 'Ezabatutako orrialdeak bilatu',
 'right-undelete'             => 'Ezabatutako orrialde bat itzularazi',
+'right-suppressrevision'     => 'Administratzaileentzat izkutatutako berrikuspenak berrikusi edo berrezarri',
 'right-suppressionlog'       => 'Log pribatuak ikusi',
 'right-block'                => 'Beste lankideek edita ez dezaten blokeatu',
-'right-blockemail'           => 'Lankide batek emailak bidal ez ditzan blokeatu',
-'right-hideuser'             => 'Lankide izen bat blokeatu, publikotik izkutatuz',
+'right-blockemail'           => 'Erabiltzaile batek emailak bidal ez ditzan blokeatu',
+'right-hideuser'             => 'Erabiltzaile izen bat blokeatu, publikotik izkutatuz',
+'right-ipblock-exempt'       => 'IP blokeoen, auto-blokeoen eta maila blokeoen gainetik pasa.',
+'right-proxyunbannable'      => 'Proxyen blokeo automatikoen gainetik pasa',
+'right-protect'              => 'Orrialde babestuak aldatu eta babes maila aldatu',
 'right-editprotected'        => 'Babestutako orrialdeak aldatu (babes jauzirik gabe)',
 'right-editinterface'        => 'Erabiltzailearen interfazea aldatu',
 'right-editusercssjs'        => 'Beste lankideen CSS eta JS fitxategiak aldatu',
+'right-rollback'             => 'Orrialde zehatz bat aldatu zuen azken lankidearen aldaketak modu azkar batean leheneratu',
+'right-markbotedits'         => 'Atzera bueltan eginiko aldaketak bot baten aldaketak balira markatu',
 'right-noratelimit'          => 'Ez dio eragiten erlazio mugak',
 'right-import'               => 'Orrialdeak beste wiki batetik inportatu',
 'right-importupload'         => 'Igotako fitxategi batetik orrialdeak inportatu',
@@ -966,21 +1132,58 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'rightslogentry' => '$1(r)en partaidetza aldatu da $2(e)tik $3(e)ra',
 'rightsnone'     => '(bat ere ez)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'orrialde hau irakurri',
+'action-edit'                 => 'orrialde hau aldatu',
+'action-createpage'           => 'orrialdeak sortu',
+'action-createtalk'           => 'eztabaida orrialdeak sortu',
+'action-createaccount'        => 'lankide hau sortu',
+'action-minoredit'            => 'aldaketa hau txiki gisa markatu',
+'action-move'                 => 'orrialde hau mugitu',
+'action-move-subpages'        => 'orrialde hau eta bere azpiorrialdeak mugitu',
+'action-move-rootuserpages'   => 'mugitu lankidearen oinarri orrialdeak',
+'action-movefile'             => 'fitxategi hau mugitu',
+'action-upload'               => 'fitxategi hau igo',
+'action-reupload'             => 'dagoeneko baden fitxategi honen gainean idatzi',
+'action-reupload-shared'      => 'biltegi komun batean dagoen fitxategi hau gainpasa',
+'action-upload_by_url'        => 'URL helbide batetik fitxategi hau igo',
+'action-writeapi'             => 'idazteko APIa erabili',
+'action-delete'               => 'orrialde hau ezabatu',
+'action-deleterevision'       => 'berrikuspen hau ezabatu',
+'action-deletedhistory'       => 'orrialde honetako ezabatutako historia ikusi',
+'action-browsearchive'        => 'ezabatutako orrialdeak bilatu',
+'action-undelete'             => 'ezabatutako orrialde hau bergaitu',
+'action-suppressrevision'     => 'izkutuko berrikuspen hau berrikusi eta gaitu',
+'action-suppressionlog'       => 'log pribatu hau ikusi',
+'action-block'                => 'lankide honi aldaketak egitea ekidin',
+'action-protect'              => 'orrialde honetako babes mailak aldatu',
+'action-import'               => 'orrialde hau beste wiki batetik inportatu',
+'action-importupload'         => 'igotako fitxategi batetik orrialde hau inportatu',
+'action-patrol'               => 'besteen aldaketak patruilatu moduan markatu',
+'action-autopatrol'           => 'zure aldaketak patruilatu bezala markatu',
+'action-unwatchedpages'       => 'ikusi gabeko orrialdeen zerrenda ikusi',
+'action-trackback'            => 'aipu bat bidali',
+'action-mergehistory'         => 'orrialde honen historia batu',
+'action-userrights'           => 'lankide guztien eskumenak aldatu',
+'action-userrights-interwiki' => 'beste wikietako lankideen lankide-eskumenak aldatu',
+'action-siteadmin'            => 'datubasea babestu edo babesa kendu',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|aldaketa 1|$1 aldaketa}}',
 'recentchanges'                     => 'Aldaketa berriak',
+'recentchanges-legend'              => 'Azken aldaketen aukerak',
 'recentchangestext'                 => 'Orrialde honetan wiki honetan egindako azken aldaketak erakusten dira.',
 'recentchanges-feed-description'    => 'Sindikazio honetan wikian eginiko azkeneko aldaketak jarrai daitezke.',
-'rcnote'                            => 'Jarraian azken <strong>$2</strong> egunetako azken <strong>$1</strong> aldaketak erakusten dira, $3 eguneratuta.',
+'rcnote'                            => "Beheko azken {{PLURAL:$2|eguneko|'''$2''' egunetako}} azken {{PLURAL:$1|aldaketa|'''$1''' aldaketak}} hurrengo datan egin ziren: $5, $4.",
 'rcnotefrom'                        => 'Jarraian azaltzen diren aldaketak data honetatik aurrerakoak dira: <b>$2</b> (gehienez <b>$1</b> erakusten dira).',
 'rclistfrom'                        => 'Erakutsi $1 ondorengo aldaketa berriak',
 'rcshowhideminor'                   => '$1 aldaketa txikiak',
 'rcshowhidebots'                    => '$1 bot-ak',
 'rcshowhideliu'                     => '$1 erabiltzaile erregistratuak',
-'rcshowhideanons'                   => '$1 lankide anonimoak',
+'rcshowhideanons'                   => '$1 erabiltzaile anonimoak',
 'rcshowhidepatr'                    => '$1 patruilatutako aldaketak',
 'rcshowhidemine'                    => '$1 nire ekarpenak',
-'rclinks'                           => 'Erakutsi azken $1 aldaketak $2 egunetan.<br />$3',
+'rclinks'                           => 'Erakutsi azken $2 egunetako $1 aldaketak<br />$3',
 'diff'                              => 'ezb',
 'hist'                              => 'hist',
 'hide'                              => 'Ezkutatu',
@@ -988,10 +1191,12 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'minoreditletter'                   => 't',
 'newpageletter'                     => 'B',
 'boteditletter'                     => 'b',
-'number_of_watching_users_pageview' => '[$1 jarraitzaile]',
+'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|lankide|lankide}} jarraitzen]',
 'rc_categories'                     => 'Kategorietara mugatu ("|" karaktereaz banandu)',
 'rc_categories_any'                 => 'Edozein',
 'newsectionsummary'                 => '/* $1 */ atal berria',
+'rc-enhanced-expand'                => 'Erakutsi xehetasunak (JavaScript beharrezkoa da)',
+'rc-enhanced-hide'                  => 'Xehetasunak ezkutatu',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Lotutako orrialdeen aldaketak',
@@ -1000,6 +1205,7 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'recentchangeslinked-summary'  => "Zerrenda honetan zehazturiko orrialde bati (edo kategoria berezi bateko azkeneko kideei) lotura duten orrietan eginiko azken aldaketak agertzen dira.
 [[Special:Watchlist|Zurre jarraitze zerrenda]]n agertzen diren orrialdeak '''beltze'''z agertzen dira.",
 'recentchangeslinked-page'     => 'Orriaren izena:',
+'recentchangeslinked-to'       => 'Lotutako orrietarako aldaketak erakutsi emandako orriaren ordez',
 
 # Upload
 'upload'                      => 'Fitxategia igo',
@@ -1008,13 +1214,14 @@ Wiki honetako beste administratzaileek ezkutuko eduki hau ikusteko aukera izango
 'reuploaddesc'                => 'Igotzeko formulariora itzuli.',
 'uploadnologin'               => 'Saioa hasi gabe',
 'uploadnologintext'           => 'Fitxategiak igotzeko [[Special:UserLogin|saioa hasi]] behar duzu.',
+'upload_directory_missing'    => 'Igoeren direktorioa ($1) ezin da aurkitu eta web zerbitzariak ezin du sortu.',
 'upload_directory_read_only'  => 'Web zerbitzariak ez dauka igoera direktorioan ($1) idazteko baimenik.',
 'uploaderror'                 => 'Errorea igotzerakoan',
-'uploadtext'                  => "Fitxategiak igotzeko beheko formularioa erabil dezakezu. Aurretik igotako irudiak ikusi edo bilatzeko [[Special:ImageList|igotako fitxategien zerrendara]] jo. Igoerak eta ezabatutakoak [[Special:Log/upload|igoera erregistroan]] zerrendatzen dira.
+'uploadtext'                  => "Fitxategiak igotzeko beheko formularioa erabil dezakezu. Aurretik igotako irudiak ikusi edo bilatzeko [[Special:FileList|igotako fitxategien zerrendara]] jo. Igoerak eta ezabatutakoak [[Special:Log/upload|igoera erregistroan]] zerrendatzen dira.
 
 Orrialde baten irudi bat txertatzeko, erabili kode hauetako bat:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fitxategia.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fitxategia.png|testu alternatiboa]]</nowiki>''' edo
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fitxategia.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fitxategia.png|testu alternatiboa]]</nowiki>''' edo
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fitxategia.ogg]]</nowiki>''' irudia zuzenean erabiltzeko.",
 'upload-permitted'            => 'Baimendutako fitxategi motak: $1.',
 'upload-preferred'            => 'Fitxategi mota hobetsiak: $1.',
@@ -1034,23 +1241,33 @@ Orrialde baten irudi bat txertatzeko, erabili kode hauetako bat:
 'illegalfilename'             => '"$1" fitxategiaren izenak orrialdeen izenburuetan erabili ezin diren karaktereak ditu. Mesedez, fitxategiari izena aldatu eta saiatu berriz igotzen.',
 'badfilename'                 => 'Irudiaren izena aldatu da: "$1".',
 'filetype-badmime'            => 'Ezin dira "$1" MIME motako fitxategiak igo.',
-'filetype-unwanted-type'      => "'''\".\$1\"''' fitxategi mota ez da gustokoa.  Hobesten diren fitxategi motak \$2 dira.",
+'filetype-bad-ie-mime'        => 'Ezin da fitxategia igo, Internet Explorerek "$1" bezala detektatuko lukeelako, zein fitxategi mota ez onartua eta arriskutsua den.',
+'filetype-unwanted-type'      => '\'\'\'".$1"\'\'\' fitxategi mota ez da gustokoa. Hobesten {{PLURAL:$3|den fitxategi mota|diren fitxategi motak}} {{PLURAL:$2|$2 da|$2 dira}}.',
 'filetype-banned-type'        => '\'\'\'".$1"\'\'\' ez dago baimendutako fitxategi moten artean.
 Baimendutako fitxategi {{PLURAL:$3|mota $2 da|motak $2 dira}}.',
 'filetype-missing'            => 'Fitxategi honek ez du luzapenik (adibidez, ".jpg").',
 'large-file'                  => 'Ez da gomendagarria fitxategiak $1 baino handiagoak izatea; fitxategi honen tamaina: $2.',
 'largefileserver'             => 'Fitxategi hau zerbitzariak baimentzen duena baino handiagoa da.',
 'emptyfile'                   => 'Badirudi igotzen ari zaren fitxategia hutsik dagoela. Mesedez, egiaztatu fitxategi hori dela igo nahi duzuna.',
-'fileexists'                  => 'Badago izen hori daukan fitxategi bat; mesedez, ikusi existitzen den <strong><tt>$1</tt></strong> fitxategia aldatu nahi duzun egiaztatzeko.',
-'fileexists-extension'        => 'Badago antzeko izena duen fitxategi bat:<br />
-Igotako fitxategiaren izena: <strong><tt>$1</tt></strong><br />
-Aurretik dagoen fitxategiaren izena: <strong><tt>$2</tt></strong><br />
-Hautatu beste izen bat.',
+'fileexists'                  => "Badago izen hori daukan fitxategi bat; mesedez, ikusi existitzen den '''<tt>$1</tt>''' fitxategia aldatu nahi duzun egiaztatzeko.",
+'filepageexists'              => "Fitxategi honen deskribapen orria dagoeneko sortuta dago '''<tt>$1</tt>'''-en, baina, ez da existitzen izen hori duen fitxategirik.
+Idazten duzun laburpena ez da deskribapen orrian agertuko.
+Zure laburpena agertzeko, eskuz aldatu beharko duzu",
+'fileexists-extension'        => "Badago antzeko izena duen fitxategi bat:<br />
+Igotako fitxategiaren izena: '''<tt>$1</tt>'''<br />
+Aurretik dagoen fitxategiaren izena: '''<tt>$2</tt>'''<br />
+Hautatu beste izen bat.",
 'fileexists-thumb'            => "<center>'''Irudia badago'''</center>",
-'fileexists-thumbnail-yes'    => 'Badirudi neurri txikiko irudia dela <i>(irudi txikia)</i>. Egiaztatu <strong><tt>$1</tt></strong> fitxategia.<br /> Egiaztatutako fitxategia eta jatorrizkoa berdinak badira ez dago irudi txikia igo beharrik.',
-'fileexists-forbidden'        => 'Badago izen hori daukan fitxategi bat; mesedez, atzera itzuli eta igo fitxategia izen ezberdin batekin. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Badago izen hori daukan fitxategi bat elkarbanatutako fitxategi-biltegian; mesedez, atzera itzuli eta igo fitxategia izen ezberdin batekin. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Badirudi neurri txikiko irudia dela ''(irudi txikia)''. Egiaztatu '''<tt>$1</tt>''' fitxategia.<br /> Egiaztatutako fitxategia eta jatorrizkoa berdinak badira ez dago irudi txikia igo beharrik.",
+'file-thumbnail-no'           => "Fitxategiaren izena '''<tt>$1</tt>'''-(r)ekin hasten da.
+Badirudi tamaina txikiko irudia ''(thumbnail)'' dela.
+Irudi hau bereizmen handiagoan izango bazenu igo ezazu, bestela, fitxategiaren izena aldatu mesedez.",
+'fileexists-forbidden'        => 'Badago izen hori daukan fitxategia, eta ezin da gainidatzi.
+Oraindik fitxategia igo nahi baduzu, mesedez atzera itzuli eta igo fitxategia izen ezberdin batekin. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Badago izen hori daukan fitxategi bat elkarbanatutako fitxategi-biltegian.
+Oraindik ere fitxategia igo nahi baduzu atzera itzuli eta izen berri bat erabili, mesedez. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Fitxategi hau beste fitxategi {{PLURAL:$1|honen|hauen}} kopia bat da:',
+'file-deleted-duplicate'      => 'Fitxategi honen ([[$1]]) fitxategi berbera aldez aurretik ezabatua izan da. Fitxategi horren ezabaketa-erregistroa begiratu beharko zenuke berriz igo baino lehen.',
 'successfulupload'            => 'Igoera arrakastatsua',
 'uploadwarning'               => 'Igotzeko oharra',
 'savefile'                    => 'Fitxategia gorde',
@@ -1070,15 +1287,15 @@ Hautatu beste izen bat.',
 
 Kontuan izan fitxategia igotzea egokia ote den.
 Fitxategi honen ezabaketa erregistroa jarraian ikus dezakezu:",
-'filename-bad-prefix'         => 'Igotzen ari zaren fitxategiaren izena <strong>"$1"</strong>ekin hasten da, normalki kamera digitalek automatikoki ezartzen duten izen ez deskriptibo bat.
-Aukera ezazu, mesedez, fitxategi izen deskriptiboago bat.',
+'filename-bad-prefix'         => "Igotzen ari zaren fitxategiaren izena '''\"\$1\"'''ekin hasten da, normalki kamera digitalek automatikoki ezartzen duten izen ez deskriptibo bat.
+Aukera ezazu, mesedez, fitxategi izen deskriptiboago bat.",
 
 'upload-proto-error'      => 'Protokolo ezegokia',
 'upload-proto-error-text' => 'Kanpo igoerak <code>http://</code> edo <code>ftp://</code> hasiera duen URLa izan behar du.',
 'upload-file-error'       => 'Barne errorea',
 'upload-file-error-text'  => 'Barne errore bat gertatu da zerbitzarian fitxategi tenporal bat sortzen saiatzean. Mesedez, jar zaitez [[Special:ListUsers/sysop|administratzaile]] batekin harremanetan.',
 'upload-misc-error'       => 'Errore ezezaguna igotzerakoan',
-'upload-misc-error-text'  => 'Errore ezezagun bat gertatu da fitxategia igotzen ari zenean. Mesedez, egiaztatu URLa baliozkoa eta eskuragarria dela eta saiatu berriz. Arazoak jarraitzen badu, jar zaitez administratzailearekin harremanetan.',
+'upload-misc-error-text'  => 'Errore ezezagun bat gertatu da fitxategia igotzen ari zenean. Mesedez, egiaztatu URLa baliozkoa eta eskuragarria dela eta berriz saiatu. Arazoak jarraitzen badu, jar zaitez [[Special:ListUsers/sysop|administratzailearekin]] harremanetan.',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6'       => 'Ezin izan da URLa eskuratu',
@@ -1092,17 +1309,21 @@ Aukera ezazu, mesedez, fitxategi izen deskriptiboago bat.',
 'upload_source_url'  => ' (baliozko URL publikoa)',
 'upload_source_file' => ' (zure ordenagailuko fitxategi bat)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Irudiaren izenagatik bilatu:',
+# Special:ListFiles
+'listfiles-summary'     => 'Orri berezi honek igotako fitxategi guztiak erakusten ditu.
+Berez, azken igotako fitxategiak zerrendaren goiko aldean azaltzen dira.
+Zutabe baten goi-buruaren egin klik sailkatzeko era aldatzeko.',
+'listfiles_search_for'  => 'Irudiaren izenagatik bilatu:',
 'imgfile'               => 'fitxategia',
-'imagelist'             => 'Fitxategien zerrenda',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Izena',
-'imagelist_user'        => 'Erabiltzailea',
-'imagelist_size'        => 'Tamaina (byte)',
-'imagelist_description' => 'Deskribapena',
-
-# Image description page
+'listfiles'             => 'Fitxategien zerrenda',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Izena',
+'listfiles_user'        => 'Erabiltzailea',
+'listfiles_size'        => 'Tamaina (byte)',
+'listfiles_description' => 'Deskribapena',
+'listfiles_count'       => 'Bertsioak',
+
+# File description page
 'filehist'                       => 'Fitxategiaren historia',
 'filehist-help'                  => 'Data/orduan klik egin fitxategiak orduan zuen itxura ikusteko.',
 'filehist-deleteall'             => 'guztiak ezabatu',
@@ -1110,19 +1331,25 @@ Aukera ezazu, mesedez, fitxategi izen deskriptiboago bat.',
 'filehist-revert'                => 'desegin',
 'filehist-current'               => 'oraingoa',
 'filehist-datetime'              => 'Data/Ordua',
+'filehist-thumb'                 => 'Iruditxoa',
+'filehist-thumbtext'             => '$1 bertsioaren iruditxoa',
+'filehist-nothumb'               => 'Ez dago iruditxorik',
 'filehist-user'                  => 'Erabiltzailea',
 'filehist-dimensions'            => 'Neurriak',
 'filehist-filesize'              => 'Tamaina',
 'filehist-comment'               => 'Iruzkina',
-'imagelinks'                     => 'Loturak',
-'linkstoimage'                   => 'Hurrengo orrialdeek dute fitxategi honetarako lotura:',
+'imagelinks'                     => 'Fitxategi loturak',
+'linkstoimage'                   => 'Hurrengo {{PLURAL:$1|orrialdeak du|$1 orrialdeek dute}} fitxategi honetarako lotura:',
+'linkstoimage-more'              => '$1 {{PLURAL:$1|orri lotura|orri lotura}} baino gehiago daude fitxategira.
+Ondorengo zerrendak fitxategira dauden {{PLURAL:$1|lehen lotura|lehen $1 loturak}} erakusten ditu bakarrik.
+[[Special:WhatLinksHere/$2|Zerrenda osoa]] ere eskuragarri dago.',
 'nolinkstoimage'                 => 'Ez dago fitxategi honetara lotura egiten duen orrialderik.',
 'morelinkstoimage'               => 'Ikusi fitxategi honen [[Special:WhatLinksHere/$1|lotura gehiago]].',
 'redirectstofile'                => 'Honako {{PLURAL:$1|artxiboak fitxategi honetara birzuzentzen du:|$1 artxiboek fitxategi honetara birzuzentzen dute:}}',
-'duplicatesoffile'               => 'Hondoren fitxategi {{PLURAL:$1|hau beste honen berdina da|$1 hauek beste honen berdinak dira}}:',
+'duplicatesoffile'               => 'Ondorengo fitxategi {{PLURAL:$1|hau beste honen berdina da|$1 hauek beste honen berdinak dira}} ([[Special:FileDuplicateSearch/$2|zehaztasun gehiago]]):',
 'sharedupload'                   => 'Fitxategi hau elkarbanatutako igoera bat da eta beste proiektuek ere erabil dezakete.',
 'shareduploadwiki'               => 'Informazio gehiagorako $1 ikusi mesedez.',
-'shareduploadwiki-desc'          => 'Biltegi komun batean $1(e)n deskribapena erakusten da.',
+'shareduploadwiki-desc'          => 'Deskribapena $1-(e)an erakusten da azpian.',
 'shareduploadwiki-linktext'      => 'fitxategiaren deskribapen orrialdea',
 'shareduploadduplicate'          => 'Fitxategi hau biltegi komuneko $1 fitxategiaren duplikatua da.',
 'shareduploadduplicate-linktext' => 'beste fitxategi bat',
@@ -1146,11 +1373,12 @@ Aukera ezazu, mesedez, fitxategi izen deskriptiboago bat.',
 # File deletion
 'filedelete'                  => '$1 ezabatu',
 'filedelete-legend'           => 'Fitxategia ezabatu',
-'filedelete-intro'            => "'''[[Media:$1|$1]]''' ezabatzen ari zara.",
+'filedelete-intro'            => "'''[[Media:$1|$1]]''' fitxategiaezabatzen ari zara eta honen historiarekin batera.",
 'filedelete-intro-old'        => "'''[[Media:$1|$1]]'''ren bertsioa ezabatzen ari zara, [$4 $3, $2].",
 'filedelete-comment'          => 'Iruzkina:',
 'filedelete-submit'           => 'Ezabatu',
 'filedelete-success'          => "'''$1''' ezabatu da.",
+'filedelete-success-old'      => "'''[[Media:$1|$1]]'''en $3, $2 bertsioa ezabatu da.",
 'filedelete-nofile'           => "Ez dago '''$1''' izeneko fitxategirik.",
 'filedelete-nofile-old'       => "Ez dago '''$1'''en bertsio artxibaturik zuk jarritako izaera horrekin.",
 'filedelete-otherreason'      => 'Beste arrazoiak/gehigarriak:',
@@ -1179,29 +1407,31 @@ Aukera ezazu, mesedez, fitxategi izen deskriptiboago bat.',
 
 # Random page
 'randompage'         => 'Ausazko orria',
-'randompage-nopages' => 'Ez dago orrialderik izen-tarte honetan.',
+'randompage-nopages' => 'Ez dago orrialderik "$1" izen-tartean.',
 
 # Random redirect
 'randomredirect'         => 'Ausazko birzuzenketa',
-'randomredirect-nopages' => 'Ez dago birzuzenketarik izen-tarte honetan.',
+'randomredirect-nopages' => 'Ez dago birzuzenketarik "$1" izen-tartean.',
 
 # Statistics
-'statistics'             => 'Estatistikak',
-'sitestats'              => '{{SITENAME}}(e)ko estatistikak',
-'userstats'              => 'Erabiltzaile estatistikak',
-'sitestatstext'          => "Datu-basean guztira <b>$1</b> orri daude; eztabaidatzeko, wikipedari buruzko orriak, birzuzenketak eta artikulu laburrak barne hartzen.
-
-Horiek baztertzen, <b>$2</b> artikulu dauzakagu datu-basean.
-
-'''$8''' irudi igo dira.
-
-Guztira '''$3''' bisitaturiko orri, eta <b>$4</b> artikulu aldaketa egon dira software-a berritu zenetik (2002.eko uztailaren 20a).
-
-Emaitza hauekin hurrengo arrazoiak atera daitezke: '''$5''' aldaketa egon dira orrialde bakoitzeko, eta '''$6''' bisita aldaketa bakoitzeko.
-
-Gure [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] '''$7'''-koa da.",
-'userstatstext'          => "'''$1''' erabiltzaile daude izen emanda, horietatik '''$2''' (edo '''$4%''') $5ek eskumenak {{PLURAL:$2|dituelarik|dituztelarik}}.",
-'statistics-mostpopular' => 'Orrialde bisitatuenak',
+'statistics'                   => 'Estatistikak',
+'statistics-header-pages'      => 'Orrialdeen estatistikak',
+'statistics-header-edits'      => 'Aldaketen estatistikak',
+'statistics-header-views'      => 'Ikustaldien estatistikak',
+'statistics-header-users'      => 'Erabiltzaile estatistikak',
+'statistics-articles'          => 'Edukiak dituzten orrialdeak',
+'statistics-pages'             => 'Orrialdeak',
+'statistics-pages-desc'        => 'Wikian dauden orrialde guztiak, eztabaida orrialdeak, birzuzenketa, etab. barne.',
+'statistics-files'             => 'Igotako fitxategiak',
+'statistics-edits'             => '{{SITENAME}} sortu zenetik eginiko aldaketa kopurua',
+'statistics-edits-average'     => 'Bataz-besteko aldaketak orrialdeko',
+'statistics-views-total'       => 'Ikusitako orrialdeak guztira',
+'statistics-views-peredit'     => 'Ikusitako orrialdeak aldaketa bakoitzeko',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Lan zerrendaren] luzera',
+'statistics-users'             => 'Izen-emandako [[Special:ListUsers|lankideak]]',
+'statistics-users-active'      => 'Lankide aktiboak',
+'statistics-users-active-desc' => 'Aurreko {{PLURAL:$1|egunean|egunetan}} jardueraren bat gauzatu duten erabiltzaileak',
+'statistics-mostpopular'       => 'Orrialde bisitatuenak',
 
 'disambiguations'      => 'Argipen orrialdeak',
 'disambiguationspage'  => 'Template:argipen',
@@ -1213,7 +1443,7 @@ Gure [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] '''$7'''-koa da.
 'double-redirect-fixer'      => 'Birzuzenketa zuzentzailea',
 
 'brokenredirects'        => 'Hautsitako birzuzenketak',
-'brokenredirectstext'    => 'Jarraian zerrendatutako birzuzenketak existitzen ez diren orrialdeetara zuzenduta daude:',
+'brokenredirectstext'    => 'Jarraian zerrendatutako birzuzenketa loturak existitzen ez diren orrietara zuzenduta daude:',
 'brokenredirects-edit'   => '(aldatu)',
 'brokenredirects-delete' => '(ezabatu)',
 
@@ -1243,25 +1473,30 @@ Gure [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] '''$7'''-koa da.
 'popularpages'            => 'Orrialde bisitatuenak',
 'wantedcategories'        => 'Eskatutako kategoriak',
 'wantedpages'             => 'Eskatutako orrialdeak',
-'missingfiles'            => 'Falta diren fitxategiak',
+'wantedfiles'             => 'Eskatutako fitxategiak',
+'wantedtemplates'         => 'Eskatutako txantiloiak',
 'mostlinked'              => 'Gehien lotutako orrialdeak',
 'mostlinkedcategories'    => 'Gehien lotutako kategoriak',
 'mostlinkedtemplates'     => 'Txantiloi erabilienak',
 'mostcategories'          => 'Sailkapenean kategoria gehien dituzten orrialdeak',
 'mostimages'              => 'Gehien lotutako irudiak',
 'mostrevisions'           => 'Berrikuspen gehien dituzten orrialdeak',
-'prefixindex'             => 'Aurrizkien aurkibidea',
+'prefixindex'             => 'Orri guztiak aurrizkiekin',
 'shortpages'              => 'Orrialde laburrak',
 'longpages'               => 'Orrialde luzeak',
 'deadendpages'            => 'Orrialde itsuak',
 'deadendpagestext'        => 'Jarraian zerrendatutako orrialdeek ez daukate wikiko beste edozein orrialdetarako loturarik.',
 'protectedpages'          => 'Babestutako orrialdeak',
 'protectedpages-indef'    => 'Babes mugagabeak bakarrik',
+'protectedpages-cascade'  => 'Kaskada moduko babesak bakarrik',
 'protectedpagestext'      => 'Jarraian azaltzen diren orrialdeak mugitu edo aldatzeko babestuta daude',
 'protectedpagesempty'     => 'Ez dago parametro hauetarako babesturiko orrialderik momentu honetan.',
 'protectedtitles'         => 'Babestutako tituluak',
 'protectedtitlestext'     => 'Hurrengo tituluen sorrera babestua dago',
+'protectedtitlesempty'    => 'Ez dago parametro horiekin babesturiko izenbururik momentu honetan.',
 'listusers'               => 'Erabiltzaileen zerrenda',
+'listusers-editsonly'     => 'Aldaketak egin dituzten erabiltzaileak soilik erakutsi',
+'usereditcount'           => '{{PLURAL:$1|aldaketa $1|$1 aldaketa}}',
 'newpages'                => 'Orrialde berriak',
 'newpages-username'       => 'Erabiltzaile-izena:',
 'ancientpages'            => 'Orrialde zaharrenak',
@@ -1282,15 +1517,15 @@ Gure [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] '''$7'''-koa da.
 'booksources-search-legend' => 'Liburuen bilaketa',
 'booksources-go'            => 'Joan',
 'booksources-text'          => 'Jarraian liburu berri eta erabiliak saltzen dituzten guneetarako loturen zerrenda bat ikus dezakezu, bilatzen ari zaren liburu horientzako informazio gehigarria aurkitzeko lagungarria izan daitekeena:',
+'booksources-invalid-isbn'  => 'Emandako ISBNa ez dirudi baliagarria denik; ikusi ea akatsik egin duzun jatorrizko iturritik kopiatzerakoan.',
 
 # Special:Log
 'specialloguserlabel'  => 'Lankidea:',
 'speciallogtitlelabel' => 'Izenburua:',
 'log'                  => 'Erregistroak',
 'all-logs-page'        => 'Erregistro guztiak',
-'log-search-legend'    => 'Logak bilatu',
-'log-search-submit'    => 'Joan',
-'alllogstext'          => 'Igoera, ezabaketa, babes, blokeaketa eta administratzaile erregistroen erakusketa. Zerrenda mugatu dezakezu erregistro mota, erabiltzaile izena edo eragindako orrialdea aukeratuz.',
+'alllogstext'          => '{{SITENAME}} orrialdearen erregistro guztien erakusketa konbinatua.
+Erregistro mota, erabiltzailearen izena edota orrialdearen izena iragaziz bistaratu daiteke. Letra larriak eta xeheak bereizten dira.',
 'logempty'             => 'Ez dago emaitzarik erregistroan.',
 'log-title-wildcard'   => 'Testu honekin hasten diren izenburuak bilatu',
 
@@ -1300,6 +1535,7 @@ Gure [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] '''$7'''-koa da.
 'nextpage'          => 'Hurrengo orrialdea ($1)',
 'prevpage'          => 'Aurreko orrialdea ($1)',
 'allpagesfrom'      => 'Honela hasten diren orrialdeak erakutsi:',
+'allpagesto'        => 'Orrialde honetara zuzentzen diren guztiak erakutsi:',
 'allarticles'       => 'Artikulu guztiak',
 'allinnamespace'    => 'Orrialde guztiak ($1 izen-tartea)',
 'allnotinnamespace' => 'Orrialde guztiak ($1 izen-tartean ez daudenak)',
@@ -1319,37 +1555,69 @@ Ikus, gainera [[Special:WantedCategories|kategoriarik eskatuenak]].',
 'special-categories-sort-count' => 'kontatetzearen arabera ordenatu',
 'special-categories-sort-abc'   => 'alfabetikoki aldatu',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Ezabatutako ekarpenak',
+
+# Special:LinkSearch
+'linksearch'       => 'Kanpo loturak',
+'linksearch-pat'   => 'Bilaketa katea:',
+'linksearch-ns'    => 'Izen-tartea:',
+'linksearch-ok'    => 'Bilatu',
+'linksearch-text'  => '"*.wikipedia.org" bezalako izartxoak erabil daitezke.<br />
+Baimendutako protokoloak: <tt>$1</tt>',
+'linksearch-line'  => '$1, $2(e)tik lotuta',
+'linksearch-error' => 'Komodinak izenaren hasieran bakarrik agertu beharko lirateke.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Hemendik aurrerako erabiltzaileak bistaratu:',
 'listusers-submit'   => 'Erakutsi',
 'listusers-noresult' => 'Ez da erabiltzailerik aurkitu.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Erabiltzaile erregistroa',
+'newuserlogpagetext'          => 'Hau azken erabiltzaileen sorreren erregistroa da.',
+'newuserlog-byemail'          => 'pasahitza e-postaz bidali da',
+'newuserlog-create-entry'     => 'Erabiltzaile berria',
+'newuserlog-create2-entry'    => '$1 kontu berria sortu da',
+'newuserlog-autocreate-entry' => 'Automatikoki sorturiko kontua',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Erabiltzaile talde eskumenak',
-'listgrouprights-group'    => 'Taldea',
-'listgrouprights-rights'   => 'Eskumenak',
-'listgrouprights-helppage' => 'Help:Talde eskumenak',
-'listgrouprights-members'  => '(kideen zerrenda)',
+'listgrouprights'                 => 'Erabiltzaile talde eskumenak',
+'listgrouprights-summary'         => 'Ondorengo zerrendak wikian dauden lankide taldeak agertzen dira, beraien eskubideekin.
+Badago [[{{MediaWiki:Listgrouprights-helppage}}|informazio osagarria]] banakako eskubideei buruz.',
+'listgrouprights-group'           => 'Taldea',
+'listgrouprights-rights'          => 'Eskumenak',
+'listgrouprights-helppage'        => 'Help:Talde eskumenak',
+'listgrouprights-members'         => '(kideen zerrenda)',
+'listgrouprights-addgroup'        => '{{PLURAL:$2|Taldea gehitu ahal duzu|Taldeak gehitu ahal dituzu}}: $1',
+'listgrouprights-removegroup'     => '{{PLURAL:$2|Taldea kendu ahal duzu|Taldeak kendu ahal dituzu}}: $1',
+'listgrouprights-addgroup-all'    => 'Talde guztiak gehitu daitezke',
+'listgrouprights-removegroup-all' => 'Talde guztiak kendu daitezke',
 
 # E-mail user
-'mailnologin'     => 'Bidalketa helbiderik ez',
-'mailnologintext' => 'Beste erabiltzaileei e-posta mezuak bidaltzeko [[Special:UserLogin|saioa hasi]] eta baliozko e-posta helbidea behar duzu izan zure [[Special:Preferences|hobespenetan]].',
-'emailuser'       => 'Erabiltzaile honi e-posta bidali',
-'emailpage'       => 'Erabiltzaileari e-posta bidali',
-'emailpagetext'   => 'Erabiltzaile honek baliozko e-posta helbide bat ezarri badu bere hobespenetan, beheko formularioa erabiliz mezu bat bidal dakioke. Hobespenetan daukazun e-posta helbidea azalduko da mezuaren bidaltzaile bezala eta beraz erantzun ahal izango dizu.',
-'usermailererror' => 'Mail objektuak errore hau itzuli du:',
-'defemailsubject' => 'E-posta {{SITENAME}}(e)tik',
-'noemailtitle'    => 'Posta helbiderik ez',
-'noemailtext'     => 'Erabiltzaile honek ez du baliozko posta helbiderik zehaztu edo beste erabiltzaileengandik mezurik ez jasotzea aukeratu du.',
-'emailfrom'       => 'Nork:',
-'emailto'         => 'Nori:',
-'emailsubject'    => 'Gaia:',
-'emailmessage'    => 'Mezua:',
-'emailsend'       => 'Mezua',
-'emailccme'       => 'Mezu honen kopia bat niri bidali.',
-'emailccsubject'  => 'Zure mezuaren kopia $1(r)i: $2',
-'emailsent'       => 'Mezua bidali egin da',
-'emailsenttext'   => 'Zure e-posta mezua bidali egin da.',
+'mailnologin'      => 'Bidalketa helbiderik ez',
+'mailnologintext'  => 'Beste erabiltzaileei e-posta mezuak bidaltzeko [[Special:UserLogin|saioa hasi]] eta baliozko e-posta helbidea behar duzu izan zure [[Special:Preferences|hobespenetan]].',
+'emailuser'        => 'Erabiltzaile honi e-posta bidali',
+'emailpage'        => 'Erabiltzaileari e-posta bidali',
+'emailpagetext'    => 'Erabiltzaile honek baliozko e-posta helbide bat ezarri badu bere hobespenetan, beheko formularioa erabiliz mezu bat bidal dakioke. 
+[[Special:Preferences|Hobespenetan]] daukazun e-posta helbidea azalduko da mezuaren bidaltzaile bezala eta beraz erantzun ahal izango dizu.',
+'usermailererror'  => 'Mail objektuak errore hau itzuli du:',
+'defemailsubject'  => 'E-posta {{SITENAME}}(e)tik',
+'noemailtitle'     => 'Posta helbiderik ez',
+'noemailtext'      => 'Erabiltzaile honek ez du baliozko e-posta helbiderik zehaztu.',
+'nowikiemailtitle' => 'Ezin da e-postarik bidali',
+'nowikiemailtext'  => 'Erabiltzaile honek beste erabiltzaileengandik e-postak ez jasotzea hautatu du.',
+'email-legend'     => 'Bidali e-posta bat {{SITENAME}}(e)ko beste lankide bati',
+'emailfrom'        => 'Nork:',
+'emailto'          => 'Nori:',
+'emailsubject'     => 'Gaia:',
+'emailmessage'     => 'Mezua:',
+'emailsend'        => 'Mezua',
+'emailccme'        => 'Mezu honen kopia bat niri bidali.',
+'emailccsubject'   => 'Zure mezuaren kopia $1(r)i: $2',
+'emailsent'        => 'Mezua bidali egin da',
+'emailsenttext'    => 'Zure e-posta mezua bidali egin da.',
+'emailuserfooter'  => 'E-posta hau $1(e)k bidali dio $2(r)i {{SITENAME}}ko "E-posta bidali" funtzioa erabiliz.',
 
 # Watchlist
 'watchlist'            => 'Nire jarraipen zerrenda',
@@ -1377,16 +1645,11 @@ Jarraipen zerrendatik artikulua kentzeko, artikuluan ''ez jarraitu''ri eman.",
 'wlheader-showupdated' => "* Bisitatu zenituen azken alditik aldaketak izan dituzten orrialdeak '''beltzez''' nabarmenduta daude",
 'watchmethod-recent'   => 'Aldaketa berriak aztertzen jarraipen zerrendako orrialdeen bila',
 'watchmethod-list'     => 'jarraipen zerrendako orrialdeak aldaketa berrien bila aztertzen',
-'watchlistcontains'    => 'Zure jarraipen zerrendak $1 orrialde ditu.',
+'watchlistcontains'    => 'Zure jarraipen zerrendak {{PLURAL:$1|orrialde $1 du|$1 orrialde ditu}}.',
 'iteminvalidname'      => "Arazoa '$1' elementuarekin, baliogabeko izena...",
-'wlnote'               => "Jarraian ikus daitezke azken '''$2''' egunetako azken $1 aldaketak.",
+'wlnote'               => "Jarraian {{PLURAL:$2|ikus daiteke azken orduko|ikus daitezke azken '''$2''' orduetako}} azken {{PLURAL:$1|aldaketa|'''$1''' aldaketak}}.",
 'wlshowlast'           => 'Erakutsi azken $1 orduak $2 egunak $3',
-'watchlist-show-bots'  => 'Bot-en aldaketak erakutsi',
-'watchlist-hide-bots'  => 'Bot-en aldaketak ezkutatu',
-'watchlist-show-own'   => 'Nire aldaketak erakutsi',
-'watchlist-hide-own'   => 'Nire aldaketak ezkutatu',
-'watchlist-show-minor' => 'Aldaketa txikiak erakutsi',
-'watchlist-hide-minor' => 'Aldaketa txikiak ezkutatu',
+'watchlist-options'    => 'Jarraitze-zerrendaren aukerak',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Zerrendan gehitzen...',
@@ -1425,70 +1688,99 @@ Zure jarraipen zerrendako konfigurazioa aldatzeko, ikus
 Laguntza:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Orrialdea ezabatu',
-'confirm'                     => 'Baieztatu',
-'excontent'                   => "edukia honakoa zen: '$1'",
-'excontentauthor'             => "edukia honakoa zen: '$1' (parte hartu duen lankide bakarra: '$2')",
-'exbeforeblank'               => "hustu aurreko edukiera: '$1'",
-'exblank'                     => 'orrialdea hutsik zegoen',
-'delete-confirm'              => '"$1" ezabatu',
-'delete-legend'               => 'Ezabatu',
-'historywarning'              => 'Kontuz! Ezabatuko duzun orrialdeak honako historia du:',
-'confirmdeletetext'           => 'Orrialde edo irudi bat eta beste historia guztia datu-basetik ezabatzear zaude. Mesedez, egiaztatu hori egin nahi duzula, ondorioak zeintzuk diren badakizula, eta [[{{MediaWiki:Policy-url}}|politikak]] errespetatuz egingo duzula.',
-'actioncomplete'              => 'Ekintza burutu da',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ezabatu egin da. Ikus $2 azken ezabaketen erregistroa ikusteko.',
-'deletedarticle'              => '"[[$1]]" ezabatu da',
-'suppressedarticle'           => '"[[$1]]" kendua',
-'dellogpage'                  => 'Ezabaketa erregistroa',
-'dellogpagetext'              => 'Behean ikus daiteke azken ezabaketen zerrenda.',
-'deletionlog'                 => 'ezabaketa erregistroa',
-'reverted'                    => 'Lehenagoko berrikuspen batera itzuli da',
-'deletecomment'               => 'Ezabatzeko arrazoia',
-'deleteotherreason'           => 'Arrazoi gehigarria:',
-'deletereasonotherlist'       => 'Beste arrazoi bat',
-'deletereason-dropdown'       => '*Ezabatzeko ohiko arrazoiak
+# Delete
+'deletepage'             => 'Orrialdea ezabatu',
+'confirm'                => 'Baieztatu',
+'excontent'              => "edukia honakoa zen: '$1'",
+'excontentauthor'        => "edukia honakoa zen: '$1' (parte hartu duen lankide bakarra: '$2')",
+'exbeforeblank'          => "hustu aurreko edukiera: '$1'",
+'exblank'                => 'orrialdea hutsik zegoen',
+'delete-confirm'         => '"$1" ezabatu',
+'delete-legend'          => 'Ezabatu',
+'historywarning'         => 'Kontuz! Ezabatuko duzun orrialdeak honako historia du:',
+'confirmdeletetext'      => 'Orrialde edo irudi bat eta beste historia guztia datu-basetik ezabatzear zaude. Mesedez, egiaztatu hori egin nahi duzula, ondorioak zeintzuk diren badakizula, eta [[{{MediaWiki:Policy-url}}|politikak]] errespetatuz egingo duzula.',
+'actioncomplete'         => 'Ekintza burutu da',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ezabatu egin da. Ikus $2 azken ezabaketen erregistroa ikusteko.',
+'deletedarticle'         => '"[[$1]]" ezabatu da',
+'suppressedarticle'      => '"[[$1]]" kendua',
+'dellogpage'             => 'Ezabaketa erregistroa',
+'dellogpagetext'         => 'Behean ikus daiteke azken ezabaketen zerrenda.',
+'deletionlog'            => 'ezabaketa erregistroa',
+'reverted'               => 'Lehenagoko berrikuspen batera itzuli da',
+'deletecomment'          => 'Ezabatzeko arrazoia',
+'deleteotherreason'      => 'Arrazoi gehigarria:',
+'deletereasonotherlist'  => 'Beste arrazoi bat',
+'deletereason-dropdown'  => '*Ezabatzeko ohiko arrazoiak
 ** Egileak eskatuta
 ** Egile eskubideak urratzea
 ** Bandalismoa',
-'delete-edit-reasonlist'      => 'Ezabaketa arrazoiak aldatu',
-'delete-toobig'               => 'Orrialde honek aldaketa historia luzea du, $1 berrikuspenetik gorakoa. Orrialde horien ezabaketa mugatua dago {{SITENAME}}n ezbeharrak saihesteko.',
-'delete-warning-toobig'       => 'Orrialde honek aldaketa historia luzea du, $1 berrikuspenetik gorakoa. Ezabatzeak ezbeharrak eragin ditzake {{SITENAME}}ren datu-basean; kontu izan.',
-'rollback'                    => 'Aldaketak desegin',
-'rollback_short'              => 'Desegin',
-'rollbacklink'                => 'desegin',
-'rollbackfailed'              => 'Desegiteak huts egin dud',
-'cantrollback'                => 'Ezin da aldaketa desegin; erabiltzaile bakarrak hartu du parte.',
-'alreadyrolled'               => 'Ezin da [[User:$2|$2]](e)k ([[User talk:$2|Eztabaida]]) [[$1]](e)n egindako azken aldaketa desegin; beste norbaitek editatu du edo jada desegin du. Azken aldaketa [[User:$3|$3]](e)k ([[User talk:$3|Eztabaida]]) egin du.',
-'editcomment'                 => 'Aldaketaren iruzkina: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '$2ren aldaketak ezabatu dira, $1ren azken bertsiora itzuliz.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1(r)en aldaketak desegin dira, $2(r)en azken bertsiora itzuliz.',
-'sessionfailure'              => 'Badirudi saioarekin arazoren bat dagoela; bandalismoak saihesteko ekintza hau ezeztatu egin da. Mesedez, nabigatzaileko "atzera" botoian klik egin, hona ekarri zaituen orrialde hori berriz kargatu, eta saiatu berriz.',
+'delete-edit-reasonlist' => 'Ezabaketa arrazoiak aldatu',
+'delete-toobig'          => 'Orrialde honek aldaketa historia luzea du, {{PLURAL:$1|berrikuspen batetik|$1 berrikuspenetik}} gorakoa. 
+Orrialde horien ezabaketa mugatua dago {{SITENAME}}n ezbeharrak saihesteko.',
+'delete-warning-toobig'  => 'Orrialde honek aldaketa historia luzea du, {{PLURAL:$1|berrikuspen batetik|$1 berrikuspenetik}} gorakoa.
+Ezabatzeak ezbeharrak eragin ditzake {{SITENAME}}ren datu-basean;
+kontu izan.',
+
+# Rollback
+'rollback'         => 'Aldaketak desegin',
+'rollback_short'   => 'Desegin',
+'rollbacklink'     => 'desegin',
+'rollbackfailed'   => 'Desegiteak huts egin dud',
+'cantrollback'     => 'Ezin da aldaketa desegin; erabiltzaile bakarrak hartu du parte.',
+'alreadyrolled'    => 'Ezin da [[User:$2|$2]](e)k ([[User talk:$2|Eztabaida]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) [[$1]](e)n egindako azken aldaketa desegin;
+beste norbaitek editatu du edo jada desegin du.
+
+ Azken aldaketa [[User:$3|$3]](e)k ([[User talk:$3|Eztabaida]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) egin du.',
+'editcomment'      => "Aldaketaren laburpena: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '$2ren aldaketak ezabatu dira, $1ren azken bertsiora itzuliz.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1(r)en aldaketak desegin dira, $2(r)en azken bertsiora itzuliz.',
+'sessionfailure'   => 'Badirudi saioarekin arazoren bat dagoela; bandalismoak saihesteko ekintza hau ezeztatu egin da. Mesedez, nabigatzaileko "atzera" botoian klik egin, hona ekarri zaituen orrialde hori berriz kargatu, eta saiatu berriz.',
+
+# Protect
 'protectlogpage'              => 'Babes erregistroa',
 'protectlogtext'              => 'Orrialdeen blokeo eta desblokeo zerrenda azaltzen da jarraian.',
 'protectedarticle'            => '"[[$1]]" babestu da"',
 'modifiedarticleprotection'   => '"[[$1]]"(r)en babes maila aldatu da',
 'unprotectedarticle'          => '"[[$1]]"(r)i babesa kendu zaio',
+'movedarticleprotection'      => 'babes hobespenak "[[$2]]"tik "[[$1]]"(e)ra mugitu dira',
 'protect-title'               => '"$1" babesten',
+'prot_1movedto2'              => '$1 izenburua $2(r)engatik aldatu da',
 'protect-legend'              => 'Babesa baieztatu',
 'protectcomment'              => 'Babesteko arrazoia',
 'protectexpiry'               => 'Iraungipena:',
 'protect_expiry_invalid'      => 'Baliogabeko iraungipen-data.',
 'protect_expiry_old'          => 'Iraungipen-data iragan da.',
 'protect-unchain'             => 'Mugitzeko blokeoa kendu',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> orrialdearen babes maila ikusi eta aldatu egin beharko zenuke.',
-'protect-locked-access'       => 'Zure kontuak ez du baimenik babes mailak aldatzeko.
-Hemen daude <strong>$1</strong> orrialderako oraingo ezarpenak:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' orrialdearen babes maila ikusi eta aldatu egin beharko zenuke.",
+'protect-locked-blocked'      => "Babes-mailak ezin dira aldatu blokeatuta dagoen bitartean.
+Hemen daude '''$1''' orrialdearen egungo ezarpenak:",
+'protect-locked-dblock'       => "Babes-mailak ezin dira aldatu, datu-basea blokeatuta baitago.
+Hemen daude '''$1''' orriaren oraingo ezarpenak:",
+'protect-locked-access'       => "Zure kontuak ez du baimenik babes mailak aldatzeko.
+Hemen daude '''$1''' orrialderako oraingo ezarpenak:",
 'protect-cascadeon'           => 'Orrialde hau momentu honetan babespean dago honako orrialde {{PLURAL:$1|honek kaskada bidezko babesa duelako|hauek kaskada bidezko babesa dutelako}}.
 Orrialde honen babes maila alda dezakezu, baina ez du eraginik izango kaskada bidezko babesean.',
-'protect-default'             => '(lehenetsia)',
+'protect-default'             => 'Lankide guztiak baimendu',
 'protect-fallback'            => '"$1" baimena eskatu',
-'protect-level-autoconfirmed' => 'Erregistratu gabeko erabiltzaileak blokeatu',
+'protect-level-autoconfirmed' => 'Lankide berri eta erregistratu gabekoak blokeatu',
 'protect-level-sysop'         => 'Administratzaileak bakarrik',
 'protect-summary-cascade'     => 'jauzian',
 'protect-expiring'            => 'iraungipen-data: $1 (UTC)',
+'protect-expiry-indefinite'   => 'mugagabea',
 'protect-cascade'             => 'Babes masiboa - orrialde honen barneko orrialde guztiak blokeatu.',
 'protect-cantedit'            => 'Ezin duzu orrialde honetako babes-maila aldatu, ez duzulako berau aldatzeko eskumenik.',
+'protect-othertime'           => 'Beste denbora:',
+'protect-othertime-op'        => 'beste denbora',
+'protect-existing-expiry'     => 'Iraungitze ordua: $2, $3',
+'protect-otherreason'         => 'Bestelako arrazoiak (edo gehigarriak):',
+'protect-otherreason-op'      => 'bestelako arrazoiak (edo gehigarriak)',
+'protect-dropdown'            => '*Babesteko arrazoi ohikoenak
+** Gehiegizko bandalismoa
+** Gehiegizko spama
+** Produkzioaren aurkakoa den edizio gerra
+** Trafiko handiko orrialdea',
+'protect-edit-reasonlist'     => 'Babesteko arrazoiak aldatu',
+'protect-expiry-options'      => 'ordu 1:1 hour,egun 1:1 day,aste 1:1 week,2 aste:2 weeks,hilabete 1:1 month,3 hilabete:3 months,6 hilabete:6 months,urte 1:1 year,betirako:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Baimena:',
 'restriction-level'           => 'Murrizketa maila:',
 'minimum-size'                => 'Tamaina minimoa',
@@ -1507,49 +1799,57 @@ Orrialde honen babes maila alda dezakezu, baina ez du eraginik izango kaskada bi
 'restriction-level-all'           => 'edozein maila',
 
 # Undelete
-'undelete'                  => 'Ezabatutako orrialdeak ikusi',
-'undeletepage'              => 'Ezabatutako orrialdeak ikusi eta leheneratu',
-'undeletepagetitle'         => "'''Hurrengoa [[:$1|$1]](r)en ezabatutako aldaketak dira'''.",
-'viewdeletedpage'           => 'Ezabatutako orrialdeak ikusi',
-'undeletepagetext'          => 'Jarraian zerrendatzen diren orrialdeak ezabatu egin dira baina oraindik artxiboa gordeta daude eta leheneratu egin daitezke. Artxiboa noizean behin hustu egin liteke.',
-'undelete-fieldset-title'   => 'Berrikuspenak berrezarri',
-'undeleteextrahelp'         => "Orrialde osoa leheneratzeko, koadrotxo guztiak hautatu gabe utzi eta '''''Leheneratu'''''n klik egin. 
+'undelete'                     => 'Ezabatutako orrialdeak ikusi',
+'undeletepage'                 => 'Ezabatutako orrialdeak ikusi eta leheneratu',
+'undeletepagetitle'            => "'''Hurrengoa [[:$1|$1]](r)en ezabatutako aldaketak dira'''.",
+'viewdeletedpage'              => 'Ezabatutako orrialdeak ikusi',
+'undeletepagetext'             => 'Jarraian zerrendatzen {{PLURAL:$1|den orrialdea ezabatu da baina oraindik artxiboan gordeta dago eta leheneratu egin daiteke.|diren orrialdeak ezabatu dira baina oraindik artxiboan gordeta daude eta leheneratu egin daitezke.}}
+Artxiboa noizean behin hustu egin liteke.',
+'undelete-fieldset-title'      => 'Berrikuspenak berrezarri',
+'undeleteextrahelp'            => "Orrialde osoa leheneratzeko, koadrotxo guztiak hautatu gabe utzi eta '''''Leheneratu'''''n klik egin. 
 Aukeratutako leheneratze bat burutzeko, leheneratu nahi dituzun berrikuspenen koadrotxoak markatu eta '''''Leheneratu''''' klik egin. 
 '''''Hasiera'''''n klik eginez gero koadrotxo guztiak eta iruzkin koadroa hustu egingo dira.",
-'undeleterevisions'         => '$1 berrikuspen gordeta',
-'undeletehistory'           => 'Orrialdea leheneratzen baduzu, berrikuspena guztiak leheneratuko dira historian. 
+'undeleterevisions'            => '$1 {{PLURAL:$1|berrikuspen|berrikuspen}} artxibatuta',
+'undeletehistory'              => 'Orrialdea leheneratzen baduzu, berrikuspena guztiak leheneratuko dira historian. 
 Ezabatu ondoren izen berdina duen orrialde berri bat sortzen bada leheneratutako berrikuspenak azalduko dira historian.',
-'undeleterevdel'            => 'Berrezarpena ez da egingo goreneko orrialde edo fitxategia partzialki ezabatua suertatzen bada.
+'undeleterevdel'               => 'Berrezarpena ez da egingo goreneko orrialde edo fitxategia partzialki ezabatua suertatzen bada.
 Kasu horietan ezabatutako azken aldaketen aukeraketa kendu edo agertarazi beharko dituzu.
 
 Undeletion will not be performed if it will result in the top page or file revision being partially deleted.
 In such cases, you must uncheck or unhide the newest deleted revision.',
-'undeletehistorynoadmin'    => 'Artikulua ezabatu egin da. Ezabatzeko azalpena beheko laburpenean erakusten da, ezabatu aurretik parte hartu zuten erabiltzaileen xehetasunekin batera. Ezabatutako berrikuspenen oraingo testua administratzaileek bakarrik ikus dezakete.',
-'undeleterevision-missing'  => 'Baliogabeko berrikuspena. Baliteke lotura ezegokia izatea, edo berriskupena leheneratu edo kendu izana.',
-'undelete-nodiff'           => 'Ez da aurkitu aurreko berrikuspenik.',
-'undeletebtn'               => 'Leheneratu',
-'undeletelink'              => 'leheneratu',
-'undeletereset'             => 'Hasieratu',
-'undeletecomment'           => 'Iruzkina:',
-'undeletedarticle'          => '"[[$1]]" leheneratu da',
-'undeletedrevisions'        => '$1 berrikuspen leheneratu dira',
-'undeletedrevisions-files'  => '$1 berrikuspen eta $2 fitxategi leheneratu dira',
-'undeletedfiles'            => '$1 fitxategi leheneratu dira',
-'cannotundelete'            => 'Errorea birsortzerakoan; baliteke beste norbaitek lehenago birsortu izana.',
-'undeletedpage'             => "<big>'''$1 leheneratu egin da'''</big>
+'undeletehistorynoadmin'       => 'Artikulua ezabatu egin da. Ezabatzeko azalpena beheko laburpenean erakusten da, ezabatu aurretik parte hartu zuten erabiltzaileen xehetasunekin batera. Ezabatutako berrikuspenen oraingo testua administratzaileek bakarrik ikus dezakete.',
+'undelete-revision'            => '$1(e)n berrikuspen $3(e)k ezabatu du ($4(e)ko $5(e)tan):',
+'undeleterevision-missing'     => 'Baliogabeko berrikuspena. Baliteke lotura ezegokia izatea, edo berriskupena leheneratu edo kendu izana.',
+'undelete-nodiff'              => 'Ez da aurkitu aurreko berrikuspenik.',
+'undeletebtn'                  => 'Leheneratu',
+'undeletelink'                 => 'leheneratu',
+'undeletereset'                => 'Hasieratu',
+'undeleteinvert'               => 'Aukeraketa alderanztu',
+'undeletecomment'              => 'Iruzkina:',
+'undeletedarticle'             => '"[[$1]]" leheneratu da',
+'undeletedrevisions'           => '{{PLURAL:$1|Berrikuspen 1 leheneratu da|$1 berrikuspen leheneratu dira}}',
+'undeletedrevisions-files'     => '{{PLURAL:$1|berrikuspen|berrikuspen}} eta {{PLURAL:$2|fitxategi|fitxategi}} leheneratu dira',
+'undeletedfiles'               => '{{PLURAL:$1|fitxategi|fitxategi}} leheneratu dira',
+'cannotundelete'               => 'Errorea birsortzerakoan; baliteke beste norbaitek lehenago birsortu izana.',
+'undeletedpage'                => "<big>'''$1 leheneratu egin da'''</big>
 
 [[Special:Log/delete|Ezabaketa erregistrora]] jo azken ezabaketa eta leheneraketak ikusteko.",
-'undelete-header'           => 'Berriki ezabatutako orrialdeak ikusteko [[Special:Log/delete|ezabaketa erregistrora]] jo.',
-'undelete-search-box'       => 'Ezabatutako orrialdeak bilatu',
-'undelete-search-prefix'    => 'Honela hasten diren orrialdeak erakutsi:',
-'undelete-search-submit'    => 'Bilatu',
-'undelete-no-results'       => 'Ez da bat datorren orrialderik aurkitu ezabaketen artxiboan.',
-'undelete-cleanup-error'    => 'Erabiltzen ez den "$1" fitxategia ezabatzen arazoa egon da.',
-'undelete-error-short'      => 'Errorea fitxategia berreskuratzerakoan: $1',
-'undelete-error-long'       => 'Errorea gertatu da hurrengo orrialdea berreskuratzerakoan:
+'undelete-header'              => 'Berriki ezabatutako orrialdeak ikusteko [[Special:Log/delete|ezabaketa erregistrora]] jo.',
+'undelete-search-box'          => 'Ezabatutako orrialdeak bilatu',
+'undelete-search-prefix'       => 'Honela hasten diren orrialdeak erakutsi:',
+'undelete-search-submit'       => 'Bilatu',
+'undelete-no-results'          => 'Ez da bat datorren orrialderik aurkitu ezabaketen artxiboan.',
+'undelete-filename-mismatch'   => 'Ezin da $1 denbora-marka duten fitxategi aldaketa ezabatua berrezarri: fitxategi-izena ez dator bat',
+'undelete-bad-store-key'       => 'Ezin da $1 denbora-marka duten fitxategi aldaketa ezabatua berrezarri: fitxategi ezabatu aurretik ez zegoen.',
+'undelete-cleanup-error'       => 'Erabiltzen ez den "$1" fitxategia ezabatzen arazoa egon da.',
+'undelete-missing-filearchive' => 'Fitxategiaren $1 IDa ezin da leheneratu, ez baitago datu-basean.
+Aurretik ez luke ezabatua izan behar.',
+'undelete-error-short'         => 'Errorea fitxategia berreskuratzerakoan: $1',
+'undelete-error-long'          => 'Errorea gertatu da hurrengo orrialdea berreskuratzerakoan:
 
 $1',
-'undelete-show-file-submit' => 'Bai',
+'undelete-show-file-confirm'   => 'Ziur zaude $3, $2-ko "<nowiki>$1</nowiki>" fitxategiaren ezabatutako berrikuspena ikusi nahi duzula?',
+'undelete-show-file-submit'    => 'Bai',
 
 # Namespace form on various pages
 'namespace'      => 'Izen-tartea:',
@@ -1557,26 +1857,27 @@ $1',
 'blanknamespace' => '(Nagusia)',
 
 # Contributions
-'contributions' => 'Lankidearen ekarpenak',
-'mycontris'     => 'Nire ekarpenak',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Ez da ezaugarri horiekin bat datorren aldaketarik aurkitu.',
-'uctop'         => ' (Azken aldaketa)',
-'month'         => 'Hilabetea (eta lehenagokoak):',
-'year'          => 'Urtea (eta lehenagokoak):',
-
-'sp-contributions-newbies'     => 'Soilik kontu berrien ekarpenak erakutsi',
-'sp-contributions-newbies-sub' => 'Hasiberrientzako',
-'sp-contributions-blocklog'    => 'Blokeaketa erregistroa',
-'sp-contributions-search'      => 'Ekarpenentzako bilaketa',
-'sp-contributions-username'    => 'IP helbide edo lankide-izena:',
-'sp-contributions-submit'      => 'Bilatu',
+'contributions'       => 'Lankidearen ekarpenak',
+'contributions-title' => '$1(r)entzat lankidearen ekarpenak',
+'mycontris'           => 'Nire ekarpenak',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Ez da ezaugarri horiekin bat datorren aldaketarik aurkitu.',
+'uctop'               => ' (Azken aldaketa)',
+'month'               => 'Hilabetea (eta lehenagokoak):',
+'year'                => 'Urtea (eta lehenagokoak):',
+
+'sp-contributions-newbies'       => 'Soilik kontu berrien ekarpenak erakutsi',
+'sp-contributions-newbies-sub'   => 'Hasiberrientzako',
+'sp-contributions-newbies-title' => 'Lankideen ekarpenak lankide berrietn',
+'sp-contributions-blocklog'      => 'Blokeaketa erregistroa',
+'sp-contributions-search'        => 'Ekarpenentzako bilaketa',
+'sp-contributions-username'      => 'IP helbidea edo erabiltzaile izena:',
+'sp-contributions-submit'        => 'Bilatu',
 
 # What links here
 'whatlinkshere'            => 'Honekin lotzen diren orriak',
 'whatlinkshere-title'      => '$1(e)kin lotzen diren orrialdeak',
 'whatlinkshere-page'       => 'Orrialdea:',
-'linklistsub'              => '(Loturen zerrenda)',
 'linkshere'                => "Hurrengoek dute '''[[:$1]]''' orrialderako lotura:",
 'nolinkshere'              => "Ez dago '''[[:$1]]''' lotura duen orrialderik.",
 'nolinkshere-ns'           => "Hautatutako izen-tartean ez dago '''[[:$1]]''' orrialderako lotura duenik.",
@@ -1606,36 +1907,43 @@ $1',
 ** Orrialdetatik edukia ezabatzea
 ** Spam-a edota kanpoko loturak ezarri
 ** Bandalismoa egitea
-** Beste lankideei mehatxatzea
+** Beste erabiltzaileei mehatxatzea
 ** Kontu ugari erabiltzea
-** Lankide izen desegokia',
+** Erabiltzaile izen desegokia',
 'ipbanononly'                     => 'Erabiltzaile anonimoak bakarrik blokeatu',
 'ipbcreateaccount'                => 'Kontua sortzea debekatu',
 'ipbemailban'                     => 'Erabiltzaileak e-mailak bidal ditzan ekidin',
 'ipbenableautoblock'              => 'Erabiltzaile honek erabilitako azken IP helbidea automatikoki blokeatu, eta baita erabili dezakeen beste edozein IP ere',
 'ipbsubmit'                       => 'Erabiltzaile hau blokeatu',
 'ipbother'                        => 'Beste denbora-tarte bat',
-'ipboptions'                      => '15 minutu:15 minutes,30 minutu:30 minutes,ordu 1:1 hour,2 ordu:2 hours,egun bat:1 day,3 egun:3 days,aste 1:1 week,2 aste:2 weeks,hilabete 1:1 month,betirako:infinite', # display1:time1,display2:time2,...
+'ipboptions'                      => '2 ordu:2 hours,egun 1:1 day,3 egun:3 days,aste 1:1 week,2 aste:2 weeks,hilabete 1:1 month,3 hilabete:3 months,6 hilabete:6 months,urte 1:1 year,betirako:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'beste bat',
 'ipbotherreason'                  => 'Arrazoi gehigarria:',
+'ipbhidename'                     => 'Lankide izena blokeo logetik, oraingo blokeo zerrendatik eta lankide zerrendatik izkutatu.',
 'ipbwatchuser'                    => 'Erabiltzaile honen erabiltzaile eta eztabaida orrialdeak jarraitu',
+'ipballowusertalk'                => 'Blokeatuta izanagatik ere, lankide honek bere eztabaida-orria aldatzea baimendu',
+'ipb-change-block'                => 'Lankidea honako balioekin bir-blokeatu',
 'badipaddress'                    => 'Baliogabeko IP helbidea',
 'blockipsuccesssub'               => 'Blokeoa burutu da',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] erabiltzaileari blokeoa ezarri zaio.<br />
 Ikus [[Special:IPBlockList|IP blokeoen zerrenda]] blokeoak aztertzeko.',
-'ipb-edit-dropdown'               => 'Lankide bat blokeatzeko arrazoiak',
+'ipb-edit-dropdown'               => 'Blokeatzeko arrazoiak aldatu',
 'ipb-unblock-addr'                => '$1 lankide edo IP helbideari blokeoa baliogabetu',
 'ipb-unblock'                     => 'Erabiltzaile izen edo IP helbide bati blokeoa kendu',
 'ipb-blocklist-addr'              => '$1(r)en blokeoak ikusi',
 'ipb-blocklist'                   => 'Blokeaketak ikusi',
+'ipb-blocklist-contribs'          => '$1(r)en ekarpenak',
 'unblockip'                       => 'Erabiltzailea desblokeatu',
 'unblockiptext'                   => 'Erabili beheko formularioa lehenago blokeatutako IP helbide edo erabiltzaile baten idazketa baimenak leheneratzeko.',
-'ipusubmit'                       => 'Helbide hau desblokeatu',
+'ipusubmit'                       => 'Blokeoa ezabatu',
 'unblocked'                       => '[[User:$1|$1]] desblokeatu egin da',
 'unblocked-id'                    => '$1 blokeaketa ezabatu da',
 'ipblocklist'                     => 'Blokeatutako IP helbide eta erabiltzaileak',
 'ipblocklist-legend'              => 'Blokeatutako erabiltzaile bat bilatu',
-'ipblocklist-username'            => 'Lankide izena edo IP helbidea:',
+'ipblocklist-username'            => 'Erabiltzaile izena edo IP helbidea:',
+'ipblocklist-sh-userblocks'       => 'Kontuaren blokeoak $1',
+'ipblocklist-sh-tempblocks'       => 'Denbora baterako blokeoak $1',
+'ipblocklist-sh-addressblocks'    => 'IP bakarreko blokeoak $1',
 'ipblocklist-submit'              => 'Bilatu',
 'blocklistline'                   => '$1, $2(e)k $3 blokeatu du (iraungipena: $4)',
 'infiniteblock'                   => 'infinitu',
@@ -1644,26 +1952,35 @@ Ikus [[Special:IPBlockList|IP blokeoen zerrenda]] blokeoak aztertzeko.',
 'noautoblockblock'                => 'autoblokeoa ezgaituta',
 'createaccountblock'              => 'kontua sortzea blokeatuta',
 'emailblock'                      => 'e-posta blokeatuta',
+'blocklist-nousertalk'            => 'zure buruaren eztabaida orrialdea ezin duzu aldatu',
 'ipblocklist-empty'               => 'Blokeaketa zerrenda hutsik dago.',
 'ipblocklist-no-results'          => 'Zehaztutako IP helbide edo erabiltzaile izena ez dago blokeatuta.',
 'blocklink'                       => 'blokeatu',
 'unblocklink'                     => 'blokeoa kendu',
+'change-blocklink'                => 'blokeoa aldatu',
 'contribslink'                    => 'ekarpenak',
 'autoblocker'                     => '"[[User:$1|$1]]"(e)k berriki erabili duen IP helbidea duzulako autoblokeatu zaizu. $1(e)k emandako arrazoia zera da: "\'\'\'$2\'\'\'"',
 'blocklogpage'                    => 'Blokeo erregistroa',
+'blocklog-fulllog'                => 'Blokeoen log osoa',
 'blocklogentry'                   => '"[[$1]]" $2(e)ko iraungipenarekin blokeatu da. $3',
+'reblock-logentry'                => '[[$1]]-entzako blokeo zehaztapenak aldatu dira $2 $3-ko iraungipenarekin',
 'blocklogtext'                    => 'Erabiltzaileen blokeoen ezarpen eta ezabaketen erregistroa da hau. Ez dira automatikoki blokeatutako IP helbideak zerrendatzen. Ikus [[Special:IPBlockList|IP blokeoen zerrenda]] aktibo dauden blokeoak aztertzeko.',
 'unblocklogentry'                 => '$1 desblokeatu da',
 'block-log-flags-anononly'        => 'erabiltzaile anonimoak bakarrik',
 'block-log-flags-nocreate'        => 'kontuak sortzea ezgaituta',
 'block-log-flags-noautoblock'     => 'auto-blokeaketa ezgaitu da',
 'block-log-flags-noemail'         => 'e-posta blokeatuta',
+'block-log-flags-nousertalk'      => 'ezin da aldatu norbere eztabaida-orria',
 'block-log-flags-angry-autoblock' => 'hobetutako autoblokeoa gaituta',
 'range_block_disabled'            => 'Administratzaileak IP eremuak blokeatzeko gaitasuna ezgaituta dago.',
 'ipb_expiry_invalid'              => 'Baliogabeko iraungipen denbora',
 'ipb_expiry_temp'                 => 'Izkutuan dauden lankide izenen blokeoa betierekikoa izan behar du.',
 'ipb_already_blocked'             => '"$1" badago blokeatuta',
+'ipb-needreblock'                 => '== Dagoeneko blokeaturik ==
+$1 dagoeneko blokeaturik dago. Ezarpenak aldatu nahi al dituzu?',
 'ipb_cant_unblock'                => 'Errorea: Ez da $1 IDa duen blokeoa aurkitu. Baliteke blokeoa jada kenduta egotea.',
+'ipb_blocked_as_range'            => 'Akatsa: $1 IPa ez dago zuzenean blokeatuta eta ezin da blokeoa kendu.
+Hala ere, $2-(r)en parte denez, blokeoa kendu daiteke.',
 'ip_range_invalid'                => 'Baliogabeko IP eremua.',
 'blockme'                         => 'Blokea nazazu',
 'proxyblocker'                    => 'Proxy blokeatzailea',
@@ -1672,6 +1989,7 @@ Ikus [[Special:IPBlockList|IP blokeoen zerrenda]] blokeoak aztertzeko.',
 'proxyblocksuccess'               => 'Egina.',
 'sorbsreason'                     => 'Zure IP helbidea proxy ireki bezala zerrendatuta dago DNSBLan.',
 'sorbs_create_account_reason'     => 'Zure IP helbidea proxy ireki bezala zerrendatuta dago DNSBLan. Ezin duzu kontua sortu.',
+'cant-block-while-blocked'        => 'Blokeatuta zauden bitartean ezin dituzu beste lankideak blokeatu.',
 
 # Developer tools
 'lockdb'              => 'Datu-basea blokeatu',
@@ -1691,53 +2009,67 @@ Ikus [[Special:IPBlockList|IP blokeoen zerrenda]] blokeoak aztertzeko.',
 'databasenotlocked'   => 'Datu-basea ez dago blokeatuta.',
 
 # Move page
-'move-page'               => '$1 mugitu',
-'move-page-legend'        => 'Orrialdea mugitu',
-'movepagetext'            => 'Hurrengo pausoak jarraituz, artikulu edo orrialde baten izena aldatu daiteke. Izenburu zaharra, automatikoki izenburu berriari birzuzenduko zaio.
+'move-page'                    => '$1 mugitu',
+'move-page-legend'             => 'Orrialdea mugitu',
+'movepagetext'                 => 'Hurrengo pausoak jarraituz, artikulu edo orrialde baten izena aldatu daiteke. Izenburu zaharra, automatikoki izenburu berriari birzuzenduko zaio.
 Gogora ezazu, orrialdearen izena ez dela aldatuko, nahi duzun izena dagoeneko sortuta badago Wikipedian; birzuzenketa bat edo historiarik gabeko orrialde bat ez bada.
 
 <b>KONTUZ!</b>
 Artikulu oso erabilia edo asko aldatzen denaren izenburua aldatzera bazoaz, mesedez, lehenbizi artikuluaren eztabaidan adierazi ezazu beste lankideen iritziak jasotzeko.',
-'movepagetalktext'        => "Dagokion eztabaida orrialdea berarekin batera mugitu da, honako kasu hauetan '''ezik:'''
+'movepagetalktext'             => "Dagokion eztabaida orrialdea berarekin batera mugitu da, honako kasu hauetan '''ezik:'''
 * Hutsik ez dagoen eztabaida orrialde bat existitzen bada izen berrian.
 * Beheko koadroa hautatzen ez baduzu.
 
 Kasu horietan orrialdea eskuz mugitu edo bestearekin bateratu beharko duzu.",
-'movearticle'             => 'Orrialdea mugitu',
-'movenotallowed'          => 'Ez daukazu orrialdeak mugitzeko baimenik.',
-'newtitle'                => 'Izenburu berria',
-'move-watch'              => 'Orrialde hau jarraitu',
-'movepagebtn'             => 'Orrialde mugitu',
-'pagemovedsub'            => 'Mugimendua eginda',
-'movepage-moved'          => '<big>\'\'\'"$1" orrialdea "$2"n dago orain\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Izen hori duen artikulu bat badago edo hautatutako izena ez da baliozkoa. Mesedez, beste izen bat aukeratu.',
-'talkexists'              => "'''Orrialde hau arazorik gabe mugitu da, baina eztabaida orrialde ezin izan da mugitu izenburu berriarekin jada bat existitzen delako. Mesedez, eskuz batu itzazu biak.'''",
-'movedto'                 => 'hona mugitu da:',
-'movetalk'                => 'Eztabaida orrialdea ere mugitu, ahal bada.',
-'move-subpages'           => 'Ahal izanez gero azpiorrialde guztiak ere mugitu',
-'move-talk-subpages'      => 'Ahal izanez gero eztabaida orrialdearen azpiorrialde guztiak ere mugitu',
-'movepage-page-exists'    => '$1 orrialdea jada badago eta ezin da automatikoki gainetik idatzi.',
-'movepage-page-moved'     => '$1 orrialdea $2(e)ra mugitu da.',
-'movepage-page-unmoved'   => '$1 orrialdea ezin da $2(e)ra mugitu.',
-'movepage-max-pages'      => '$1 {{PLURAL:$1|orrialderen|orrialdeen}} maximoa mugitu da eta jada ez dira gehiago mugituko modu automatikoan.',
-'1movedto2'               => '$1 izenburua $2(r)engatik aldatu da',
-'1movedto2_redir'         => '$1 izenburua $2(r)engatik aldatu da birzuzenketaren gainetik',
-'movelogpage'             => 'Mugimendu erregistroa',
-'movelogpagetext'         => 'Mugitutako orrialdeen zerrenda bat azaltzen da jarraian.',
-'movereason'              => 'Arrazoia',
-'revertmove'              => 'desegin',
-'delete_and_move'         => 'Ezabatu eta mugitu',
-'delete_and_move_text'    => '== Ezabatzeko beharra ==
+'movearticle'                  => 'Orrialdea mugitu',
+'movenologin'                  => 'Saioa hasi gabe',
+'movenologintext'              => 'Orrialde bat mugitzeko erregistratutako erabiltzailea izan behar duzu eta [[Special:UserLogin|saioa hasi]].',
+'movenotallowed'               => 'Ez daukazu orrialdeak mugitzeko baimenik.',
+'movenotallowedfile'           => 'Ez duzu fitxategiak mugitzeko eskumenik.',
+'cant-move-user-page'          => 'Ez duzu lankide orrialdeak mugitzeko eskumenik (azpiorrialdeetatik at).',
+'cant-move-to-user-page'       => 'Ez duzu orrialde bat lankide orrialde batera mugitzeko eskumenik (lankide azpiorrialde batera izan ezik).',
+'newtitle'                     => 'Izenburu berria',
+'move-watch'                   => 'Orrialde hau jarraitu',
+'movepagebtn'                  => 'Orrialde mugitu',
+'pagemovedsub'                 => 'Mugimendua eginda',
+'movepage-moved'               => '<big>\'\'\'"$1" "$2"(e)ra mugitu da\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Birzuzenketa orrialde bat sortu da.',
+'movepage-moved-noredirect'    => 'Birzuzenketa baten sorrera kendu da.',
+'articleexists'                => 'Izen hori duen artikulu bat badago edo hautatutako izena ez da baliozkoa. Mesedez, beste izen bat aukeratu.',
+'cantmove-titleprotected'      => 'Ezin duzu orrialde bat leku honetara mugitu izenburu berri hori sor ez dadin babesa duelako',
+'talkexists'                   => "'''Orrialde hau arazorik gabe mugitu da, baina eztabaida orrialde ezin izan da mugitu izenburu berriarekin jada bat existitzen delako. Mesedez, eskuz batu itzazu biak.'''",
+'movedto'                      => 'hona mugitu da:',
+'movetalk'                     => 'Eztabaida orrialdea ere mugitu, ahal bada.',
+'move-subpages'                => 'Ahal izanez gero azpiorrialde guztiak ere mugitu',
+'move-talk-subpages'           => 'Ahal izanez gero eztabaida orrialdearen azpiorrialde guztiak ere mugitu',
+'movepage-page-exists'         => '$1 orrialdea jada badago eta ezin da automatikoki gainetik idatzi.',
+'movepage-page-moved'          => '$1 orrialdea $2(e)ra mugitu da.',
+'movepage-page-unmoved'        => '$1 orrialdea ezin da $2(e)ra mugitu.',
+'movepage-max-pages'           => '$1 {{PLURAL:$1|orrialderen|orrialdeen}} maximoa mugitu da eta jada ez dira gehiago mugituko modu automatikoan.',
+'1movedto2'                    => '$1 izenburua $2(r)engatik aldatu da',
+'1movedto2_redir'              => '$1 izenburua $2(r)engatik aldatu da birzuzenketaren gainetik',
+'move-redirect-suppressed'     => 'birzuzenketa ezabatua',
+'movelogpage'                  => 'Mugimendu erregistroa',
+'movelogpagetext'              => 'Mugitutako orrialdeen zerrenda bat azaltzen da jarraian.',
+'movereason'                   => 'Arrazoia',
+'revertmove'                   => 'desegin',
+'delete_and_move'              => 'Ezabatu eta mugitu',
+'delete_and_move_text'         => '== Ezabatzeko beharra ==
 
 "[[:$1]]" helburua existitzen da. Lekua egiteko ezabatu nahi al duzu?',
-'delete_and_move_confirm' => 'Bai, orrialdea ezabatu',
-'delete_and_move_reason'  => 'Lekua egiteko ezabatu da',
-'selfmove'                => 'Helburu izenburua berdina da; ezin da orrialde bat bere gainera mugitu.',
-'immobile_namespace'      => 'Hasierako edo amaierako izenburua Aparteko motakoa da; ezin da izen-tarte horretatik eta horretara ezer mugitu.',
-'imagenocrossnamespace'   => 'Ezin da mugitu fitxategia fitxategiena ez den izen batera',
-'imagetypemismatch'       => 'Fitxategiaren luzapen berriak ez du bere motako fitxategiekin bat egiten',
-'imageinvalidfilename'    => 'Xede-artxiboaren izenak ez du balio',
-'fix-double-redirects'    => 'Hasierako izenburura zuzentzen duten birzuzenketa guztiak aldatu',
+'delete_and_move_confirm'      => 'Bai, orrialdea ezabatu',
+'delete_and_move_reason'       => 'Lekua egiteko ezabatu da',
+'selfmove'                     => 'Helburu izenburua berdina da; ezin da orrialde bat bere gainera mugitu.',
+'immobile-source-namespace'    => '"$1" motako orrialdeak ezin dira mugitu',
+'immobile-target-namespace'    => 'Orrialdeak ezin dira "$1" motara mugitu',
+'immobile-target-namespace-iw' => 'Interwiki lotura ez da baliagarria orrialdea mugitu ahal izateko.',
+'immobile-source-page'         => 'Orrialde hau mugiezina da.',
+'immobile-target-page'         => 'Helburuko orrialdera ezin da mugitu.',
+'imagenocrossnamespace'        => 'Ezin da mugitu fitxategia fitxategiena ez den izen batera',
+'imagetypemismatch'            => 'Fitxategiaren luzapen berriak ez du bere motako fitxategiekin bat egiten',
+'imageinvalidfilename'         => 'Xede-artxiboaren izenak ez du balio',
+'fix-double-redirects'         => 'Hasierako izenburura zuzentzen duten birzuzenketa guztiak aldatu',
+'move-leave-redirect'          => 'Atzean birzuzenketa bat utzi',
 
 # Export
 'export'            => 'Orrialdeak esportatu',
@@ -1745,7 +2077,7 @@ Kasu horietan orrialdea eskuz mugitu edo bestearekin bateratu beharko duzu.",
 
 Orrialdeak esportatzeko zehaztu hauen izenburuak beheko koadroan, izenburu bat lerroko, eta aukeratu zein bertsio esportatu nahi dituzun.
 
-Horrez gain, lotura zuzena ere erabil dezakezu; adibidez, [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] "[[{{MediaWiki:Mainpage}}]]" orrialdearentzako.',
+Horrez gain, lotura zuzena ere erabil dezakezu; adibidez, [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] "[[{{MediaWiki:Mainpage}}]]" orrialdearentzako.',
 'exportcuronly'     => 'Oraingo berrikuspena bakarrik hartu, ez historia guztia',
 'exportnohistory'   => "----
 '''Oharra:''' Formulario honen bitartez orrialdeen historia osoak esportatzeko aukera ezgaitu egin da, errendimendua dela-eta.",
@@ -1760,7 +2092,8 @@ Horrez gain, lotura zuzena ere erabil dezakezu; adibidez, [[{{ns:special}}:Expor
 'allmessagesname'           => 'Izena',
 'allmessagesdefault'        => 'Testu lehenetsia',
 'allmessagescurrent'        => 'Oraingo testua',
-'allmessagestext'           => 'MediaWikin erabiltzen diren mezu guztien zerrenda:',
+'allmessagestext'           => 'MediaWikin erabiltzen diren mezu guztien zerrenda.
+Mesedez bisitatu [http://www.mediawiki.org/wiki/Localisation MediaWiki] eta [[http://translatewiki.net translatewiki.net] orrialdeak MediaWikira ekarpenak egin badituzu.',
 'allmessagesnotsupportedDB' => "Ezin da '''{{ns:special}}:Allmessages''' erabili '''\$wgUseDatabaseMessages''' ezgaituta dagoelako.",
 'allmessagesfilter'         => 'Mezu izenaren iragazkia:',
 'allmessagesmodified'       => 'Aldatutakoak bakarrik erakutsi',
@@ -1778,9 +2111,12 @@ Horrez gain, lotura zuzena ere erabil dezakezu; adibidez, [[{{ns:special}}:Expor
 'import'                     => 'Orrialdeak inportatu',
 'importinterwiki'            => 'Wikien arteko inportazioa',
 'import-interwiki-text'      => 'Aukeratu inportatzeko wiki eta orrialde izenburu bat. Berrikuspenen datak eta egileak gorde egingo dira. Inportazio ekintza guzti hauek [[Special:Log/import|inportazio erregistroan]] gordetzen dira.',
+'import-interwiki-source'    => 'Jatorrizko wiki/orrialdea:',
 'import-interwiki-history'   => 'Orrialde honen historiako bertsio guztiak kopiatu',
 'import-interwiki-submit'    => 'Inportatu',
 'import-interwiki-namespace' => 'Helburuko izen-tartea:',
+'import-upload-filename'     => 'Fitxategiaren izena:',
+'import-comment'             => 'Iruzkina:',
 'importtext'                 => 'Mesedez, jatorrizko wikitik orrialdea esportatzeko Special:Export tresna erabil ezazu, zure diskoan gorde eta jarraian hona igo.',
 'importstart'                => 'Orrialdeak inportatzen...',
 'import-revision-count'      => '{{PLURAL:$1|berrikuspen 1|$1 berrikuspen}}',
@@ -1811,24 +2147,24 @@ Fitxategiaren atal bat baino ez zen igo.',
 'importlogpage'                    => 'Inportazio erregistroa',
 'importlogpagetext'                => 'Beste wiki batzutatik historial eta guzti egindako orrialdeen inportazio administratiboak.',
 'import-logentry-upload'           => '[[$1]] igoera bitartez inportatu da',
-'import-logentry-upload-detail'    => '$1 berrikuspen',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|berrikuspen|berrikuspen}}',
 'import-logentry-interwiki'        => '$1 wiki artean mugitu da',
-'import-logentry-interwiki-detail' => '$1 berrikuspen $2(e)tik',
+'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|berrikuspen|berrikuspen}} $2-(e)tik',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Nire lankide orrialdea',
+'tooltip-pt-userpage'             => 'Nire lankide orria',
 'tooltip-pt-anonuserpage'         => 'Zure IParen lankide orrialdea',
-'tooltip-pt-mytalk'               => 'Nire eztabaida orrialdea',
+'tooltip-pt-mytalk'               => 'Nire eztabaida orria',
 'tooltip-pt-anontalk'             => 'Zure IParen eztabaida',
 'tooltip-pt-preferences'          => 'Nire hobespenak',
 'tooltip-pt-watchlist'            => 'Jarraitzen dituzun orrialdeen zerrenda.',
-'tooltip-pt-mycontris'            => 'Nire ekarpenak',
+'tooltip-pt-mycontris'            => 'Nire ekarpenen zerrenda',
 'tooltip-pt-login'                => 'Izen ematera gonbidatzen zaitugu.',
 'tooltip-pt-anonlogin'            => 'Izen ematera gonbidatzen zaitugu.',
 'tooltip-pt-logout'               => 'Saioa itxi',
 'tooltip-ca-talk'                 => 'Artikuluari buruzko eztabaida',
 'tooltip-ca-edit'                 => 'Artikulu hau aldatu dezakezu. Mesedez, aurrebista botoia erabil ezazu gorde baino lehen.',
-'tooltip-ca-addsection'           => 'Eztabaida honetan iruzkin bat erantsi ezazu.',
+'tooltip-ca-addsection'           => 'Iruzkin berria erantsi',
 'tooltip-ca-viewsource'           => 'Artikulu hau babesturik dago. Bere kodea soilik ikus dezakezu.',
 'tooltip-ca-history'              => 'Artikulu honen aurreko bertsioak.',
 'tooltip-ca-protect'              => 'Artikulu hau babestu',
@@ -1875,6 +2211,9 @@ Fitxategiaren atal bat baino ez zen igo.',
 'tooltip-watch'                   => 'Orrialde hau zure segimendu zerrendan gehitu',
 'tooltip-recreate'                => 'Orrialdea birsortu ezabatu egin den arren',
 'tooltip-upload'                  => 'Igoera hasi',
+'tooltip-rollback'                => '"Desegin" ekintzak orriaren azken egilearen ekarpena ezabatzen du klik batean',
+'tooltip-undo'                    => '"Desegin" botoiak egindako aldaketa ezeztatzen du eta aurreikuspen bista erakusten du.
+Laburpenean arrazoi bat gehitzea baimentzen du',
 
 # Stylesheets
 'common.css'   => '/** Hemen idatzitako CSS kodeak itxura guztietan izango du eragina */',
@@ -1889,12 +2228,12 @@ Fitxategiaren atal bat baino ez zen igo.',
 'notacceptable'     => 'Wiki zerbitzariak ezin ditu datuak zure bezeroak irakur ditzakeen formatu batean eskaini.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}(e)ko lankide anonimoak',
+'anonymous'        => '{{SITENAME}}(e)ko lankide {{PLURAL:$1|anonimoa|anonimoak}}',
 'siteuser'         => '{{SITENAME}}(e)ko $1 erabiltzailea',
 'lastmodifiedatby' => 'Orrialdearen azken aldaketa: $2, $1. Nork: $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1(r)en lanean oinarrituta.',
 'others'           => 'besteak',
-'siteusers'        => '{{SITENAME}}(e)ko $1 erabiltzailea(k)',
+'siteusers'        => '{{SITENAME}}(e)ko $1 {{PLURAL:$2|erabiltzailea|erabiltzaileak}}',
 'creditspage'      => 'Orrialdearen kredituak',
 'nocredits'        => 'Ez dago krediturik eskuragarri orrialde honentzako.',
 
@@ -1915,6 +2254,13 @@ Baliteke zerrenda beltzean dagoen kanpo lotura batek sortzea arazo hori.',
 'numauthors'     => 'Egile ezberdinen kopurua (artikulua): $1',
 'numtalkauthors' => 'Egile ezberdinen kopurua (eztabaida orrialdea): $1',
 
+# Skin names
+'skinname-standard'    => 'Lehenetsia',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Cologne Blue',
+'skinname-simple'      => 'Arrunta',
+'skinname-modern'      => 'Modernoa',
+
 # Math options
 'mw_math_png'    => 'Beti PNG irudiak sortu',
 'mw_math_simple' => 'Oso sinplea bada HTML, eta bestela PNG',
@@ -1935,10 +2281,12 @@ Baliteke zerrenda beltzean dagoen kanpo lotura batek sortzea arazo hori.',
 'markedaspatrollederror-noautopatrol' => 'Ez daukazu zure aldaketak patruilatu bezala markatzeko baimenik.',
 
 # Patrol log
-'patrol-log-page'   => 'Patrullatze loga',
-'patrol-log-header' => 'Hau patruliatutako aldaketen log bat da.',
-'patrol-log-line'   => '$1etik $2 markatu da patrullatu moduan $3',
-'patrol-log-auto'   => '(automatikoa)',
+'patrol-log-page'      => 'Patrullatze loga',
+'patrol-log-header'    => 'Hau patruliatutako aldaketen log bat da.',
+'patrol-log-line'      => '$1etik $2 markatu da patrullatu moduan $3',
+'patrol-log-auto'      => '(automatikoa)',
+'patrol-log-diff'      => '$1 berrikuspena',
+'log-show-hide-patrol' => '$1 patruilatze loga',
 
 # Image deletion
 'deletedrevision'                 => '$1 berrikuspen zaharra ezabatu da',
@@ -1955,6 +2303,9 @@ $1',
 'previousdiff' => '� Aldaketa zaharragoa',
 'nextdiff'     => 'Aldaketa berriagoa →',
 
+# Visual comparison
+'visual-comparison' => 'Alderaketa bisuala',
+
 # Media information
 'mediawarning'         => "'''Oharra''': Fitxategi honek kode mingarria izan lezake; zure sisteman exekutatzea arriskutsua izan liteke.<hr />",
 'imagemaxsize'         => 'Irudiak deskribapen-orrialdetan hurrengo tamainara txikitu:',
@@ -1967,10 +2318,12 @@ $1',
 'show-big-image'       => 'Bereizmen handikoa',
 'show-big-image-thumb' => '<small>Aurreikuspen honen neurria: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Fitxategi berrien galeria',
 'imagelisttext'         => "Jarraian duzu $2(e)z ordenatutako {{PLURAL:$1|fitxategi baten|'''$1''' fitxategiren}} zerrenda.",
 'newimages-summary'     => 'Orrialde berezi honek igotako azkeneko fitxategiak erakusten ditu.',
+'newimages-legend'      => 'Iragazkia',
+'newimages-label'       => 'Fitxategia (edo bere zati bat):',
 'showhidebots'          => '($1 bot-ak)',
 'noimages'              => 'Ez dago ezer ikusteko.',
 'ilsubmit'              => 'Bilatu',
@@ -2201,6 +2554,18 @@ Zerrenda elementuak (hasieran * duten lerroak) baino ez dira kontuan hartzen. Le
 'exif-lightsource-24'  => 'ISO estudio wolframioa',
 'exif-lightsource-255' => 'Beste argi iturburu bat',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flashik gabe',
+'exif-flash-fired-1'    => 'Flasharekin',
+'exif-flash-return-0'   => 'ez dauka estrobo itzulera detekzio funtziorik',
+'exif-flash-return-2'   => 'estrobo itzulera argirik ez da detektatu',
+'exif-flash-return-3'   => 'estrobo itzulera argia detektatu da',
+'exif-flash-mode-1'     => 'flashak derrigorrez bota du argia',
+'exif-flash-mode-2'     => 'flasha derrigorrez kendu da',
+'exif-flash-mode-3'     => 'auto modua',
+'exif-flash-function-1' => 'Ez dauka flash funtziorik',
+'exif-flash-redeye-1'   => 'begi-gorriak kentzeko modua',
+
 'exif-focalplaneresolutionunit-2' => 'hazbete',
 
 'exif-sensingmethod-1' => 'Definitu gabea',
@@ -2335,21 +2700,10 @@ Egiaztapen kode hau $4 iraungiko da.',
 'confirmrecreate'     => "[[User:$1|$1]] erabiltzaileak ([[User talk:$1|eztabaida]]) orrialde hau ezabatu zu aldatzen hasi eta gero. Hona arrazoia: : ''$2'' Mesedez, baieztatu orrialde hau berriz sortu nahi duzula.",
 'recreate'            => 'Birsortu',
 
-# HTML dump
-'redirectingto' => '[[:$1]] orrialdera berbideratzen...',
-
 # action=purge
-'confirm_purge'        => 'Orrialde honen katxea ezabatu?
-
-$1',
 'confirm_purge_button' => 'Ados',
-
-# AJAX search
-'searchcontaining' => "''$1'' barne duten orrialdeen bilaketa.",
-'searchnamed'      => "''$1'' izenburua duten artikuluen bilaketa.",
-'articletitles'    => "''$1''(r)ekin hasten diren artikuluak",
-'hideresults'      => 'Emaitzak ezkutatu',
-'useajaxsearch'    => 'AJAX bilaketa erabili',
+'confirm-purge-top'    => 'Orrialde honen katxea ezabatu?',
+'confirm-purge-bottom' => 'Orrialdea purgatzean katxea ezabatzen du eta orrialdearen bertsiorik eguneratuena erakustera behartzen du.',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; aurreko orrialdea',
@@ -2369,10 +2723,10 @@ $1',
 'table_pager_empty'        => 'Emaitzik ez',
 
 # Auto-summaries
-'autosumm-blank'   => 'Orrialdetik eduki guztia ezabatzen',
+'autosumm-blank'   => 'Orritik eduki guztia ezabatuta',
 'autosumm-replace' => "Orrialdea '$1'(r)engatik ordezten",
 'autoredircomment' => '[[$1]] orrialdera birzuzentzentzen',
-'autosumm-new'     => 'Orrialde berria: $1',
+'autosumm-new'     => 'Orrialde berria $1-(e)kin sortua',
 
 # Live preview
 'livepreview-loading' => 'Kargatzen…',
@@ -2380,18 +2734,26 @@ $1',
 'livepreview-failed'  => 'Huts egin du berehalako aurreikuspenak! Saiatu aurreikuspen normala erabiltzen.',
 'livepreview-error'   => 'Ezin izan da konektatu: $1 "$2". Saiatu aurreikuspen normala erabiltzen.',
 
+# Friendlier slave lag warnings
+'lag-warn-normal' => '{{PLURAL:$1|segundu $1|$1 segundu}} baino berriagoak diren aldaketak ez dira zerrenda honetan agertuko.',
+'lag-warn-high'   => 'Zerbitzariaren atzerapen handia dela eta, {{PLURAL:$1|segundu $1|$1 segundu}} baino berriagoak diren aldaketak baliteke zerrenda honetan ez azaltzea.',
+
 # Watchlist editor
 'watchlistedit-numitems'       => 'Zure jarraipen zerrendak {{PLURAL:$1|titulu bat du|$1 titulu ditu}}, eztabaida orrialdeak kenduta.',
 'watchlistedit-noitems'        => 'Zure jarraitze-zerrendak ez du izenbururik.',
 'watchlistedit-normal-title'   => 'Jarraitze zerrenda aldatu',
 'watchlistedit-normal-legend'  => 'Jarraipen-zerrendatik izenburuak kendu',
 'watchlistedit-normal-explain' => 'Zure jarraipen-zerrendako izenburuak azpian daude.
-Titulu bat kentzeko ondoan dagoen kutxa marka ezazu eta Kendu Izenburuaken gainean klik egin.
-Gainera [[special:Watchlist/raw|raw zerrenda editatu]] dezakezu.',
+Titulu bat kentzeko ondoan dagoen kutxa marka ezazu eta Kendu Izenburua gainean klik egin.
+Gainera [[Special:Watchlist/raw|raw zerrenda aldatu]] dezakezu.',
 'watchlistedit-normal-submit'  => 'Izenburuak kendu',
 'watchlistedit-normal-done'    => 'Zure jarraipen-zerrendatik {{PLURAL:$1|izenburu bat kendu da|$1 izenburu kendu dira}}.',
 'watchlistedit-raw-title'      => 'Jarraitze zerrenda gordina aldatu',
 'watchlistedit-raw-legend'     => 'Jarraitze zerrenda gordina aldatu',
+'watchlistedit-raw-explain'    => 'Azpian zure jarraipen zerrendako izenburuak daude, eta aldatuak izan daitezke zerrendatik gehitu edo ezabatzean;
+lerroko izenburu bat.
+Bukatzean, klikatu Jarraitze-zerrenda Eguneratu botoian.
+Halaber [[Special:Watchlist/edit|aldatzaile estandarra]] erabil dezakezu.',
 'watchlistedit-raw-titles'     => 'Izenburuak:',
 'watchlistedit-raw-submit'     => 'Jarraitze-zerrenda eguneratu',
 'watchlistedit-raw-done'       => 'Zure jarraipen zerrenda berritu da.',
@@ -2405,6 +2767,7 @@ Gainera [[special:Watchlist/raw|raw zerrenda editatu]] dezakezu.',
 
 # Core parser functions
 'unknown_extension_tag' => '"$1" luzapen etiketa ezezaguna',
+'duplicate-defaultsort' => 'Adi: Berezko "$2" antolatzeak aurreko berezko "$1" antolatzea gainditzen du.',
 
 # Special:Version
 'version'                          => 'Bertsioa', # Not used as normal message but as header for the special page itself
@@ -2428,12 +2791,19 @@ Gainera [[special:Watchlist/raw|raw zerrenda editatu]] dezakezu.',
 'version-software-version'         => 'Bertsioa',
 
 # Special:FilePath
-'filepath'        => 'Fitxategi bidea',
-'filepath-page'   => 'Fitxategia:',
-'filepath-submit' => 'Ibilbidea',
+'filepath'         => 'Fitxategi bidea',
+'filepath-page'    => 'Fitxategia:',
+'filepath-submit'  => 'Ibilbidea',
+'filepath-summary' => 'Orri berezi honek fitxategiaren ibilbidea itzultzen du.
+Irudiak bereizmen handienean daude, bestelako fitxategi motak beraiei esleitutako programarekin hasiko dira zuzenean.
+
+Sartu fitxategiaren izena "{{ns:file}}:" aurrizkia gabe.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Artxibo bikoiztuen bilaketa',
+'fileduplicatesearch-summary'  => 'Bikoiztutako fitxategiak bilatu bere hash balioaren arabera.
+
+Fitxategiaren izena sartu "{{ns:file}}:" aurrizkia gabe.',
 'fileduplicatesearch-legend'   => 'Duplikatu bat bilatu',
 'fileduplicatesearch-filename' => 'Fitxategi izena:',
 'fileduplicatesearch-submit'   => 'Bilaketa',
@@ -2463,4 +2833,13 @@ Gainera [[special:Watchlist/raw|raw zerrenda editatu]] dezakezu.',
 'blankpage'              => 'Orrialde txuria',
 'intentionallyblankpage' => 'Orri hau nahita utzi da hutsik',
 
+# External image whitelist
+'external_image_whitelist' => ' #Lerro hau utzi dagoen bezala<pre>
+#Jarri espresio zati erregularrak (bakarrik // artean doan zatia) azpian
+#Hauek kanpo irudien URLekin lotuko dira
+#Lotutako horiek irudi bezala agertuko dira, bestela lotura besterik ez da agertuko
+# #-arekin hasten diren lerroak iruzkin bezala hartuko dira
+
+#Jarri regex zatiak lerro honen gainetik. Lerro hau utzi dagoen bezala</pre>',
+
 );
diff --git a/languages/messages/MessagesExt.php b/languages/messages/MessagesExt.php
index 9ac3f644..0bb81455 100644
--- a/languages/messages/MessagesExt.php
+++ b/languages/messages/MessagesExt.php
@@ -38,8 +38,8 @@ $messages = array(
 'tog-enotifrevealaddr'        => "Muestral la mi direción d'email enus correus",
 'tog-shownumberswatching'     => "Muestral el númeru d'usuárius que la vehilan",
 'tog-fancysig'                => 'Firma sin atihu autumáticu',
-'tog-externaleditor'          => 'Gastal eitol esternu pol defeutu',
-'tog-externaldiff'            => 'Gastal def esternu pol defeutu',
+'tog-externaleditor'          => 'Gastal eitol esternu pol defeutu (solu pa sabihondus, es mestel una configuración especial nel ordinaol)',
+'tog-externaldiff'            => 'Gastal def esternu pol defeutu (solu pa sabihondus, es mestel una configuración especial nel ordinaol)',
 'tog-showjumplinks'           => 'Premitil los atihus d\'acesibiliá "sartal a"',
 'tog-uselivepreview'          => 'Gastal "live preview" (JavaScript) (en prebas)',
 'tog-forceeditsummary'        => 'Avisalmi cuandu nu escreba una síntesis dun chambu',
@@ -55,8 +55,6 @@ $messages = array(
 'underline-never'   => 'Nunca',
 'underline-default' => 'Sigún esté nel esproraol',
 
-'skinpreview' => '(Previsoreal)',
-
 # Dates
 'sunday'        => 'Domingu',
 'monday'        => 'Lunis',
@@ -150,7 +148,7 @@ $messages = array(
 'mytalk'         => 'La mi caraba',
 'anontalk'       => 'Caraba pa esta IP',
 'navigation'     => 'Güiquipeandu',
-'and'            => 'i',
+'and'            => '&#32;i',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatus:',
@@ -178,7 +176,7 @@ $messages = array(
 'deletethispage'    => 'Esborral esta páhina',
 'undelete_short'    => 'Arrecuperal {{PLURAL:$1|una eición|$1 eicionis}}',
 'protect'           => 'Protehel',
-'protect_change'    => 'chambal proteción',
+'protect_change'    => 'escambial',
 'protectthispage'   => 'Protehel esta páhina',
 'unprotect'         => 'esprotehel',
 'unprotectthispage' => 'Esprotehel esta páhina',
@@ -187,7 +185,7 @@ $messages = array(
 'talkpagelinktext'  => 'Caraba',
 'specialpage'       => 'Páhina Especial',
 'personaltools'     => 'Herramientas presonalis',
-'postcomment'       => 'Añiil un comentáriu',
+'postcomment'       => 'Nueva seción',
 'articlepage'       => 'Vel artículu',
 'talk'              => 'Caraba',
 'views'             => 'Vistas',
@@ -213,8 +211,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Al tentu {{SITENAME}}',
 'aboutpage'            => 'Project:Enholmación',
-'bugreports'           => 'Enholmis de marrus',
-'bugreportspage'       => 'Project:Enholmis de marrus',
 'copyright'            => 'Continiu disponibri bahu $1.',
 'copyrightpagename'    => 'Copyright de {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -236,9 +232,7 @@ $messages = array(
 
 'badaccess'        => 'Marru colos tus premisus',
 'badaccess-group0' => 'Nu se te premiti hazel esa ación.',
-'badaccess-group1' => 'Solu los usuárius del grupu $1 puein hazel esa ación.',
-'badaccess-group2' => 'Solu los usuárius los grupus $1 puein hazel esa ación.',
-'badaccess-groups' => 'Solu los usuárius los grupus $1 puein hazel esa ación.',
+'badaccess-groups' => 'Solu los usuárius {{PLURAL:$2|del grupu|de los grupus}} $1 puein hazel esa ación.',
 
 'versionrequired'     => 'Es mestel tenel la velsión $1 de MeyaGüiqui',
 'versionrequiredtext' => 'Es mestel tenel la velsión $1 de MeyaGüiqui pa usal esta páhina. Vai a la  [[Special:Version|páhina e velsión]].',
@@ -252,6 +246,8 @@ $messages = array(
 'editsection'             => 'eital',
 'editold'                 => 'eital',
 'viewsourceold'           => 'Visoreal coigu huenti',
+'editlink'                => 'eital',
+'viewsourcelink'          => 'vel coigu',
 'editsectionhint'         => 'Eital seción: $1',
 'toc'                     => 'Continius',
 'showtoc'                 => 'muestral',
@@ -266,13 +262,13 @@ $messages = array(
 'site-atom-feed'          => 'Canal Atom $1',
 'page-rss-feed'           => 'Canal RSS "$1"',
 'page-atom-feed'          => 'Canal Atom "$1"',
-'red-link-title'          => '$1 (nu escritu entovia)',
+'red-link-title'          => '$1 (la páhina nu dessisti)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artículu',
 'nstab-user'      => "Páhina d'usuáriu",
 'nstab-media'     => 'Páhina "Meya"',
-'nstab-special'   => 'Especial',
+'nstab-special'   => 'Artículu especial',
 'nstab-project'   => 'Páhina el proyeutu',
 'nstab-image'     => 'Archivu',
 'nstab-mediawiki' => 'Mensahi',
@@ -331,7 +327,6 @@ La razón dá pol el alministraol que pusu el tarugu es: $1',
 'cannotdelete'         => 'Nu se puei esborral esa páhina u archivu. (Puei que ya lo aiga esborrau otra presona.)',
 'badtitle'             => 'Mal entitulau',
 'badtitletext'         => 'El entítulu la páhina está vaciu, nu es váliu, u es un atihu entelluenga u entelgüiqui encorretu.',
-'perfdisabled'         => 'Lo sentimus, peru esta hunción está temporalmenti desativá.',
 'perfcached'           => "Los siguientis datus s'alcuentran nel caché i es posibri que nu estén atualizaus.",
 'perfcachedts'         => 'Estus datus están emburacaus. La su úrtima atualización hue el $1.',
 'querypage-no-updates' => "Las atualiçacionis desta páhina s'alcuentran atualmenti desativás. Los datus nu sedrán atualizaus a cortu praçu.",
@@ -355,8 +350,8 @@ La razón es la siguienti: ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Salil',
-'logouttext'                 => '<strong>Cuenta afechá corretamenti.</strong><br />
-Pueis acontinal en {{SITENAME}} de horma anónima, u entral ena tu cuenta otra vezi con el mesmu usuáriu, u con otru.',
+'logouttext'                 => "'''Cuenta afechá corretamenti.'''<br />
+Pueis acontinal en {{SITENAME}} de horma anónima, u entral ena tu cuenta otra vezi con el mesmu usuáriu, u con otru.",
 'welcomecreation'            => '== Bienviniu, $1! ==
 
 Ya está criá la tu cuenta. Alcuerdati de chambal las tus preferéncias al tentu la {{SITENAME}}.',
@@ -367,7 +362,6 @@ Ya está criá la tu cuenta. Alcuerdati de chambal las tus preferéncias al tent
 'remembermypassword'         => 'Recordal la mi cuenta nesti ordinaol',
 'yourdomainname'             => 'El tu domiñu:',
 'externaldberror'            => "Marru d'autentificación esterna e la basi e datus, u bien nu t'alcuentras autorizau p'atualizal la tu cuenta esterna.",
-'loginproblem'               => '<b>Marru al abril la tu cuenta.</b><br />Preba otra vezi!',
 'login'                      => 'Entral',
 'nav-login-createaccount'    => 'Entral/Crial cuenta',
 'loginprompt'                => 'Ebis atival las cookies pa entral en {{SITENAME}}.',
@@ -409,7 +403,7 @@ Ebi tenel menus de $1 {{PLURAL:$1|caratel|carateris}}.',
 'wrongpassword'              => 'La consínia escrebia nu es correta. Pol favol, preba otra vezi.',
 'wrongpasswordempty'         => 'As ehau en brancu la consínia. Pol favol, preba otra vezi.',
 'passwordtooshort'           => "La tu consínia nu es valia, u es mu chiquenina. Ebi tenel al menus $1 carateris i sel deferenti el tu nombri d'usuáriu.",
-'mailmypassword'             => 'Envialmi pol correu la consínia',
+'mailmypassword'             => 'Envialmi pol correu una nueva consínia',
 'passwordremindertitle'      => 'Alcuerda-consínias de {{SITENAME}}',
 'passwordremindertext'       => 'Alguien (siguramenti tú, dendi la direción IP $1)
 mos á solicitau que l\'enviemus una nueva consínia pa {{SITENAME}} ($4).
@@ -448,11 +442,13 @@ Si s\'á criau la cuenta ebiu a angún marru, inora esti mensahi.',
 'resetpass_announce'      => 'As entrau ena tu cuenta con una consínia temporal. Pol favol, escrebi una nueva consínia aquí:',
 'resetpass_text'          => '<!-- Aquí s´escrebi el testu -->',
 'resetpass_header'        => 'Reahustal consínia',
+'oldpassword'             => 'Consínia antigua:',
+'newpassword'             => 'Consínia nueva:',
+'retypenew'               => 'Güervi a escrebil la nueva consínia:',
 'resetpass_submit'        => 'Escrebi la consínia i entra',
 'resetpass_success'       => 'La tu consínia á siu chambá! Ya pueis entral otra vezi ena tu cuenta...',
 'resetpass_bad_temporary' => "Consínia temporal embilmá. Es posibri que ya aigas chambau la tu consínia u qu'aigas solicitau el enviu d'otra.",
 'resetpass_forbidden'     => 'Nu se puein chambal las consínias nesti güiqui',
-'resetpass_missing'       => 'Nu ai datus nel hormuláriu.',
 
 # Edit page toolbar
 'bold_sample'     => 'Testu en letra "Bold"',
@@ -477,8 +473,8 @@ Si s\'á criau la cuenta ebiu a angún marru, inora esti mensahi.',
 'hr_tip'          => 'Línia orizontal (deseparaol)',
 
 # Edit pages
-'summary'                          => 'Síntesis',
-'subject'                          => 'Tema/entítulu',
+'summary'                          => 'Síntesis:',
+'subject'                          => 'Tema/entítulu:',
 'minoredit'                        => 'Esta es una eición chiquenina',
 'watchthis'                        => 'Vehilal esta páhina',
 'savearticle'                      => 'Emburacal páhina',
@@ -490,8 +486,8 @@ Si s\'á criau la cuenta ebiu a angún marru, inora esti mensahi.',
 'missingsummary'                   => "'''Atención:''' Nu as escrebiu una síntesis al tentu la tu eición. Si pursas otra vezi sobri «{{MediaWiki:Savearticle}}» la tu eición s´emburacará sin él.",
 'missingcommenttext'               => 'Pol favol, escrebi un testu embahu.',
 'missingcommentheader'             => "'''Atención:''' Nu as escrebiu un entítulu pal tu comentáriu. Si güervis a pursal sobri \"Emburacal\", s'emburacará sin él.",
-'summary-preview'                  => 'Previsoreal síntesis',
-'subject-preview'                  => 'Previsoreal tema/entítulu',
+'summary-preview'                  => 'Previsoreal síntesis:',
+'subject-preview'                  => 'Previsoreal tema/entítulu:',
 'blockedtitle'                     => 'Esti usuáriu está atarugau',
 'blockedtext'                      => "<big>'''El tu nombri d'usuáriu/direción IP está atarugau/á.'''</big>
 
@@ -535,26 +531,29 @@ Si quieis crial esti artículu, escribi nel cuairu d'embahu
 (si t'es mestel, mira la [[{{MediaWiki:Helppage}}|páhina d'ayua]]).
 Si nu quieis crial esti artículu, solu tiinis que pursal nel botón \"'''atrás'''\" del tu escrucaol.",
 'anontalkpagetext'                 => "----''Esta es la caraba dun usuáriu anónimu qu'entovia nu á criau una cuenta, u nu la gasta, asínque tenemus que usal la su direción IP pa ientificalu. Una mesma direción IP puei sel gastá pol varius usuárius, polo que si creis que s'án derihiu a tí con cosas que nu vinin a cuentu, pol favol [[Special:UserLogin|cria una cuenta]] pa evital huturus pobremas con otrus usuárius anónimus.''",
-'noarticletext'                    => 'Entovia nu ai dengún testu escrebiu nesta páhina, pueis [[Special:Search/{{PAGENAME}}|landeal el entítulu el artículu]] n´otras páhinas u [{{fullurl:{{FULLPAGENAME}}|action=edit}} eital ésta].',
+'noarticletext'                    => 'Entovia nu ai dengún testu escrebiu nesta páhina.
+Pueis [[Special:Search/{{PAGENAME}}|landeal el entítulu del artículu]] en otras páhinas,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} search the related logs],
+u [{{fullurl:{{FULLPAGENAME}}|action=edit}} eital ésta]</span>.',
 'userpage-userdoesnotexist'        => 'La cuenta d\'usuáriu "$1" nu está rustria. Pol favol, compreba que rialmenti quieis crial/eital esta páhina.',
 'clearyourcache'                   => "'''Nota:''' Aluspués d'emburacal el archivu, ebi gorvel a cargal la páhina pa vel los chambus. *'''Mozilla:''' Pursa ''ctrl-shift-r'' *'''Internet Explorer:''' Pursa ''ctrl-f5'' *'''Safari:''' Pursa ''cmd-shift-r'' *'''Konqueror:''' Pursa ''f5'' *'''Opera:''' Los usuárius d'Opera nesezitarás esborral totalmenti el caché en ''Herramientas→Preferéncias''.",
-'usercssjsyoucanpreview'           => "<strong>Consehu:</strong> Gasta el botón 'Previsoreal' pa prebal el tu nuevu CSS/JS enantis d´emburacal.",
+'usercssjsyoucanpreview'           => "'''Consehu:''' Gasta el botón 'Previsoreal' pa prebal el tu nuevu CSS/JS enantis d´emburacal.",
 'usercsspreview'                   => "'''Recuerda que solu estás previsoreandu el tu CSS d´usuáriu, entovia nu está emburacau!'''",
 'userjspreview'                    => "'''Recuerda que solu estás prebandu/previsoreandu el tu JavaScript d´usuáriu, entovia nu está emburacau!'''",
 'userinvalidcssjstitle'            => "'''Avisu:''' Nu desisti el skin \"\$1\". Alcuerdati que las páhinas presonalizás .css i .js tienin el su entítulu en menúsculas, p.s. {{ns:user}}:Foo/monobook.css en lugal de {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Atualizau)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Agora solu estás previsoreandu; entovia nu están emburacaus los chambus!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Agora solu estás previsoreandu; entovia nu están emburacaus los chambus!'''",
 'previewconflict'                  => 'Al previsoreal se muestra cúmu queará el testu una vezi emburacaus los chambus.',
-'session_fail_preview'             => '<strong>Marru al empuntal la eición.
-Pol favol, ententa empuntala otra vezi, i si acontina marrandu, preba a afechal i abril de nuevu la tu cuenta.</strong>',
-'session_fail_preview_html'        => "<strong>Lo sentimus, nu á siu posibri procesal la tu eición ebiu a una perda e datus de sesión.</strong>
+'session_fail_preview'             => "'''Marru al empuntal la eición.
+Pol favol, ententa empuntala otra vezi, i si acontina marrandu, preba a afechal i abril de nuevu la tu cuenta.'''",
+'session_fail_preview_html'        => "'''Lo sentimus, nu á siu posibri procesal la tu eición ebiu a una perda e datus de sesión.'''
 
 ''Puestu que {{SITENAME}} tieni ativau el HTML puru, la previsorealización nu se muestrará cumu precaución anti los ataquis en JavaScript.''
 
-<strong>Si esti es un ententu lehítimu d'eición, pol favol, ententalu otra vezi. Si acontina sin furrulal, preba a desconetalti i gorvel a entral ena tu cuenta.</strong>",
-'token_suffix_mismatch'            => "<strong>La tu eición nu á siu acetá ebiu a qu'el tu escrucaol mutiló los caráteris de puntuación nel eitol. La eición nu á siu acetá pa prevenil pobremas nel artículu.
-Esti pobrema se dá angunas vezis si estás gastandu un proxy anónimu basau en web que seya pobremáticu.</strong>",
+'''Si esti es un ententu lehítimu d'eición, pol favol, ententalu otra vezi. Si acontina sin furrulal, preba a desconetalti i gorvel a entral ena tu cuenta.'''",
+'token_suffix_mismatch'            => "'''La tu eición nu á siu acetá ebiu a qu'el tu escrucaol mutiló los caráteris de puntuación nel eitol. La eición nu á siu acetá pa prevenil pobremas nel artículu.
+Esti pobrema se dá angunas vezis si estás gastandu un proxy anónimu basau en web que seya pobremáticu.'''",
 'editing'                          => 'Eitandu $1',
 'editingsection'                   => 'Eitandu $1 (seción)',
 'editingcomment'                   => 'Eitandu $1 (comentáriu)',
@@ -566,25 +565,25 @@ Pa emburacal los tus chambus, ebis tresladalus al cuairu superiol.
 '''Solu''' s'emburacará el testu el cuairu superiol cuandu pursis \"Emburacal páhina\".",
 'yourtext'                         => 'El tu testu',
 'storedversion'                    => 'Velsión emburacá',
-'nonunicodebrowser'                => "<strong>Atención: El tu escrucaol nu cumpri la norma Unicode. S'á ativau un sistema d'eición alternativu que te premitirá eital artículus con seguráncia, inque los carateris que nu seyan ASCII apaicirán nel cuairu d'eición cumu cóigus esadecimalis.</strong>",
-'editingold'                       => '<strong>Avisu: Estás eitandu una velsión antigua
+'nonunicodebrowser'                => "'''Atención: El tu escrucaol nu cumpri la norma Unicode. S'á ativau un sistema d'eición alternativu que te premitirá eital artículus con seguráncia, inque los carateris que nu seyan ASCII apaicirán nel cuairu d'eición cumu cóigus esadecimalis.'''",
+'editingold'                       => "'''Avisu: Estás eitandu una velsión antigua
 desta páhina.
-Si la emburacas, tolos chambus hechus dendi esa revisión se perderán.</strong>',
+Si la emburacas, tolos chambus hechus dendi esa revisión se perderán.'''",
 'yourdiff'                         => 'Deferéncias',
-'copyrightwarning'                 => 'Pol favol, dati cuenta e que tolos endirguis en {{SITENAME}} s\'arreparan hechus púbricus bahu $2 (vel detallis en $1). Si nu quieis qu\'otras presonas hagan chambus enos tus escritus i los destribuya librienti, altonci nu los escrebas aquina.<br />
-Pol otra parti, al pursal el botón "emburacal" mos estás asigurandu que lo escrebiu á siu hechu pol tí, u lo as copiau dun domiñu púbricu u recursu semilal.
-<strong>Nu emburaquis labutus con Copyright sin premisu!</strong>',
-'copyrightwarning2'                => 'Tolas contribucionis a {{SITENAME}} puein sel eitás, chambás, u esborrás pol otrus colabutaoris. Si nu estás dalcuerdu, altonci nu emburaquis ná.<br />
-Pol otra parti, al pursal el botón "emburacal" mos estás asigurandu que lo escrebiu á siu hechu pol tí, u copiau dun domiñu púbricu u recursu semilal (lei $1 pa mas detallis).
-<strong>Cudia: Nu emburaquis labutus con Copyright sin premisu!</strong>',
-'longpagewarning'                  => '<strong>Avisu: Esta páhina tieni un grandol de $1 kilobytes; angunus escrucaoris puein tenel pobremas al eital páhinas con mas de 32 kB. Pol favol, consieri la posibiliá e devidil esta páhina en secionis mas chiqueninas.</strong>',
-'longpageerror'                    => "<strong>Marru: El testu qu'as empuntau ocupa $1 kbs (siendu polo tantu mayol de $2 kbs). Nu es posibri emburacal.</strong>",
-'readonlywarning'                  => '<strong>Avisu: La basi e datus s´alcuentra afechá pol mantenimientu nesti momentu,
-razón pola que nu pueis emburacal los tus chambus agora. Pa nu perdel los chambus, pueis copialus i pegalus nel tu ordinaol, i endrentu un ratu, emburacalus ena güiqui.</strong>',
-'protectedpagewarning'             => "<strong>Avisu: Esta páhina s'alcuentra atarugá, asínque sólu los çahorilis puein eitala.</strong>",
+'copyrightwarning'                 => "Pol favol, dati cuenta e que tolos endirguis en {{SITENAME}} s'arreparan hechus púbricus bahu \$2 (vel detallis en \$1). Si nu quieis qu'otras presonas hagan chambus enos tus escritus i los destribuya librienti, altonci nu los escrebas aquina.<br />
+Pol otra parti, al pursal el botón \"emburacal\" mos estás asigurandu que lo escrebiu á siu hechu pol tí, u lo as copiau dun domiñu púbricu u recursu semilal.
+'''Nu emburaquis labutus con Copyright sin premisu!'''",
+'copyrightwarning2'                => "Tolas contribucionis a {{SITENAME}} puein sel eitás, chambás, u esborrás pol otrus colabutaoris. Si nu estás dalcuerdu, altonci nu emburaquis ná.<br />
+Pol otra parti, al pursal el botón \"emburacal\" mos estás asigurandu que lo escrebiu á siu hechu pol tí, u copiau dun domiñu púbricu u recursu semilal (lei \$1 pa mas detallis).
+'''Cudia: Nu emburaquis labutus con Copyright sin premisu!'''",
+'longpagewarning'                  => "'''Avisu: Esta páhina tieni un grandol de $1 kilobytes; angunus escrucaoris puein tenel pobremas al eital páhinas con mas de 32 kB. Pol favol, consieri la posibiliá e devidil esta páhina en secionis mas chiqueninas.'''",
+'longpageerror'                    => "'''Marru: El testu qu'as empuntau ocupa $1 kbs (siendu polo tantu mayol de $2 kbs). Nu es posibri emburacal.'''",
+'readonlywarning'                  => "'''Avisu: La basi e datus s´alcuentra afechá pol mantenimientu nesti momentu,
+razón pola que nu pueis emburacal los tus chambus agora. Pa nu perdel los chambus, pueis copialus i pegalus nel tu ordinaol, i endrentu un ratu, emburacalus ena güiqui.'''",
+'protectedpagewarning'             => "'''Avisu: Esta páhina s'alcuentra atarugá, asínque sólu los çahorilis puein eitala.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' S'á atarugau esta páhina, asínque solu los usuárius rustrius puein eitala.",
 'cascadeprotectedwarning'          => "'''Avisu:''' Esta páhina está protehia, asínque solu los çahorilis puein eitala. La razón de qu'esté protehia es que s'alcuentra encluia {{PLURAL:$1|ena siguienti páhina|enas siguientis páhinas}} cola oción ''cascá'' ativá:",
-'titleprotectedwarning'            => '<strong>Avisu: Esta páhina á siu atarugá, polo que solu angunus usuárius puein criala.</strong>',
+'titleprotectedwarning'            => "'''Avisu: Esta páhina á siu atarugá, polo que solu angunus usuárius puein criala.'''",
 'templatesused'                    => 'Prantillas gastás nesta páhina:',
 'templatesusedpreview'             => 'Prantillas gastás al previsoreal:',
 'templatesusedsection'             => 'Prantillas gastás nesta parti:',
@@ -618,11 +617,9 @@ La razón dá pol $3 es ''$2''",
 # History pages
 'viewpagelogs'        => 'Vel los rustrihus d´esta páhina',
 'nohistory'           => 'Nu ai dengún estorial d´eicionis pa esta páhina.',
-'revnotfound'         => 'Revisión nu alcuentrá',
-'revnotfoundtext'     => 'La revisión antigua qu´estás landeandu nu se puei alcuentral. Pol favol, compreba la URL que gastasti pa dil a esta páhina.',
 'currentrev'          => 'Revisión atual',
 'revisionasof'        => 'Revisión de $1',
-'revision-info'       => 'Revisión de $1 hecha pol $2',
+'revision-info'       => 'Revisión de $1 hecha pol $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Revisión mas antigua',
 'nextrevision'        => 'Revisión mas recienti→',
 'currentrevisionlink' => 'Revisión atual',
@@ -733,40 +730,44 @@ Asigurati e qu'esti chambu mantenga la continuiá el estorial la páhina.",
 'diff-multi'              => '(Nu se {{PLURAL:$1|muestra una revisión entelmeya|muestran $1 revisionis entelmeyas}}.)',
 
 # Search results
-'searchresults'            => 'Landeal resurtaus',
-'searchresulttext'         => 'Pa mas enhormación al tentu landeal en {{SITENAME}}, vaiti a [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'           => "Landeasti '''[[:$1]]'''",
-'searchsubtitleinvalid'    => "Landeasti '''$1'''",
-'noexactmatch'             => "'''Nu desisti denguna páhina e nombri \"\$1\".''' Pueis [[:\$1|criala tú]].",
-'noexactmatch-nocreate'    => "'''Nu desisti denguna páhina con el nombri \"\$1\".'''",
-'titlematches'             => 'Conciéncias con el entítulu el artículu',
-'notitlematches'           => 'Nu ai artículus llamaus asina',
-'textmatches'              => 'Conciéncias con el testu el artículu',
-'notextmatches'            => 'Nu desistin conciéncias con el testu el artículu',
-'prevn'                    => '$1 anterioris',
-'nextn'                    => '$1 siguientis',
-'viewprevnext'             => 'Vel ($1) ($2) ($3).',
-'search-result-size'       => '$1 ({{PLURAL:$2|1 letra|$2 letras}})',
-'search-result-score'      => 'Emportáncia: $1%',
-'search-redirect'          => '(rederihil $1)',
-'search-section'           => '(seción $1)',
-'search-suggest'           => 'Quieis izil: $1',
-'search-interwiki-caption' => 'Proyeutus helmanus',
-'search-interwiki-default' => '$1 resurtaus:',
-'search-interwiki-more'    => '(más)',
-'searchrelated'            => 'relacionau',
-'searchall'                => 'tó',
-'showingresults'           => "Embahu se {{PLURAL:$1|muestra '''1''' resurtau qu'esmiença|muestran hata '''$1''' resurtaus qu'esmiençan}} pol #'''$2'''.",
-'showingresultsnum'        => "Embahu se {{PLURAL:$3|muestra '''1''' resurtau qu'esmiença|muestran'''$3''' resurtaus qu'esmiençan}} pol #'''$2'''.",
-'showingresultstotal'      => "Muestrandu embahu los resurtaus '''$1 - $2''' de '''$3'''",
-'nonefound'                => "'''Nota''': Solu se busca en angunus espacius de nombris pol defetu. Preba a escrebil el prefihu ''all:'' nel tu landeu pa landeal tol conteniu (encruyendu carabas, prantillas...), u gasta el espaciu de nombri deseau cumu prefihu.",
-'powersearch'              => 'Landeal',
-'powersearch-legend'       => 'Landeu avançau',
-'powersearch-ns'           => 'Landeal en espaciu e nombris:',
-'powersearch-redir'        => 'Listal redirecionis',
-'powersearch-field'        => 'Landeal',
-'search-external'          => 'Landeu estelnu',
-'searchdisabled'           => 'Los landeus en {{SITENAME}} están temporalmenti desativaus. Mentris tantu, pueis landeal meyanti landerus esternus, inque ten en cuenta que los sus éndicis concernientis a {{SITENAME}} puein nu estal atualizaus.',
+'searchresults'             => 'Landeal resurtaus',
+'searchresults-title'       => 'Landeal resurtaus pa "$1"',
+'searchresulttext'          => 'Pa mas enhormación al tentu landeal en {{SITENAME}}, vaiti a [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'            => 'As landeau \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tolos artículus que prencipian pol "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|tolos artículus que atihan a "$1"]])',
+'searchsubtitleinvalid'     => "Landeasti '''$1'''",
+'noexactmatch'              => "'''Nu desisti denguna páhina e nombri \"\$1\".''' Pueis [[:\$1|criala tú]].",
+'noexactmatch-nocreate'     => "'''Nu desisti denguna páhina con el nombri \"\$1\".'''",
+'titlematches'              => 'Conciéncias con el entítulu el artículu',
+'notitlematches'            => 'Nu ai artículus llamaus asina',
+'textmatches'               => 'Conciéncias con el testu el artículu',
+'notextmatches'             => 'Nu desistin conciéncias con el testu el artículu',
+'prevn'                     => '$1 anterioris',
+'nextn'                     => '$1 siguientis',
+'viewprevnext'              => 'Vel ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Continius',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 letra|$2 letras}})',
+'search-result-score'       => 'Emportáncia: $1%',
+'search-redirect'           => '(rederihil $1)',
+'search-section'            => '(seción $1)',
+'search-suggest'            => 'Quieis izil: $1',
+'search-interwiki-caption'  => 'Proyeutus helmanus',
+'search-interwiki-default'  => '$1 resurtaus:',
+'search-interwiki-more'     => '(más)',
+'search-mwsuggest-enabled'  => 'muestral suheréncias',
+'search-mwsuggest-disabled' => 'nu muestral suheréncias',
+'searchrelated'             => 'relacionau',
+'searchall'                 => 'tó',
+'showingresults'            => "Embahu se {{PLURAL:$1|muestra '''1''' resurtau qu'esmiença|muestran hata '''$1''' resurtaus qu'esmiençan}} pol #'''$2'''.",
+'showingresultsnum'         => "Embahu se {{PLURAL:$3|muestra '''1''' resurtau qu'esmiença|muestran'''$3''' resurtaus qu'esmiençan}} pol #'''$2'''.",
+'showingresultstotal'       => "Muestrandu embahu {{PLURAL:$4|resurtau '''$1''' de '''$3'''|resurtaus '''$1 - $2''' de '''$3'''}}",
+'nonefound'                 => "'''Nota''': Solu se busca en angunus espacius de nombris pol defetu. Preba a escrebil el prefihu ''all:'' nel tu landeu pa landeal tol conteniu (encruyendu carabas, prantillas...), u gasta el espaciu de nombri deseau cumu prefihu.",
+'powersearch'               => 'Landeal',
+'powersearch-legend'        => 'Landeu avançau',
+'powersearch-ns'            => 'Landeal en espaciu e nombris:',
+'powersearch-redir'         => 'Listal redirecionis',
+'powersearch-field'         => 'Landeal',
+'search-external'           => 'Landeu estelnu',
+'searchdisabled'            => 'Los landeus en {{SITENAME}} están temporalmenti desativaus. Mentris tantu, pueis landeal meyanti landerus esternus, inque ten en cuenta que los sus éndicis concernientis a {{SITENAME}} puein nu estal atualizaus.',
 
 # Preferences page
 'preferences'              => 'Preferéncias',
@@ -783,6 +784,7 @@ Asigurati e qu'esti chambu mantenga la continuiá el estorial la páhina.",
 'qbsettings-floatingright' => 'Frotanti ena derecha',
 'changepassword'           => 'Chambal consínia',
 'skin'                     => 'Aparéncia',
+'skin-preview'             => 'Previsoreal',
 'math'                     => 'Hórmulas',
 'dateformat'               => 'Hormatu e fecha',
 'datedefault'              => 'Sin preferéncias',
@@ -804,9 +806,6 @@ Asigurati e qu'esti chambu mantenga la continuiá el estorial la páhina.",
 'prefs-misc'               => 'Bandallu (una mihina e tó)',
 'saveprefs'                => 'Emburacal',
 'resetprefs'               => 'Esborral los chambus nu emburacaus',
-'oldpassword'              => 'Consínia antigua:',
-'newpassword'              => 'Consínia nueva:',
-'retypenew'                => 'Güervi a escrebil la nueva consínia:',
 'textboxsize'              => 'Eitandu',
 'rows'                     => 'Filas:',
 'columns'                  => 'Colunas:',
@@ -834,7 +833,7 @@ Asigurati e qu'esti chambu mantenga la continuiá el estorial la páhina.",
 'userrights-lookup-user'      => "Alministral grupus d'usuárius",
 'userrights-user-editname'    => 'Escrebi un nombri d´usuáriu:',
 'editusergroup'               => "Eital grupus d'usuárius",
-'editinguser'                 => "Chambandu los derechus del usuáriu '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Chambandu los derechus del usuáriu '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Eital grupus d'usuárius",
 'saveusergroups'              => "Emburacal grupus d'usuárius",
 'userrights-groupsmember'     => 'Miembru e:',
@@ -895,12 +894,16 @@ Asigurati e qu'esti chambu mantenga la continuiá el estorial la páhina.",
 'rightslogentry' => 'chambó el grupu al que preteneci $1: de $2 a $3',
 'rightsnone'     => '(dengunu)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'eital esta páhina',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|chambu|chambus}}',
 'recentchanges'                     => 'Úrtimus chambus',
+'recentchanges-legend'              => 'Ocionis enos úrtimus chambus',
 'recentchangestext'                 => 'Sigui los úrtimus chambus d´esti güiqui nesta páhina.',
 'recentchanges-feed-description'    => 'Sigui los úrtimus chambus nel güiqui nesti feed.',
-'rcnote'                            => "Embahu se {{PLURAL:$1|muestra '''1''' chambu|muestran los úrtimus '''$1''' chambus}} {{PLURAL:$2|dendi ayel|enus úrtimus '''$2''' dias}}, atualizaus a las $3.",
+'rcnote'                            => "Embahu se {{PLURAL:$1|muestra '''1''' chambu|muestran los úrtimus '''$1''' chambus}} {{PLURAL:$2|dendi ayel|enus úrtimus '''$2''' dias}}, de $4 a las $5.",
 'rcnotefrom'                        => "Embahu se muestran los chambus hechus dendi el '''$2''' (hata el '''$1''').",
 'rclistfrom'                        => 'Muestral los chambus hechus dendi el $1',
 'rcshowhideminor'                   => '$1 eicionis chiqueninas',
@@ -921,6 +924,8 @@ Asigurati e qu'esti chambu mantenga la continuiá el estorial la páhina.",
 'rc_categories'                     => 'Arrayal a categorias (separás pol "|")',
 'rc_categories_any'                 => 'Cualisquiá',
 'newsectionsummary'                 => '/* $1 */ seción nueva',
+'rc-enhanced-expand'                => 'muestral detallis (es mestel JavaScript)',
+'rc-enhanced-hide'                  => 'Açonchal detallis',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Chambus relacionaus',
@@ -940,11 +945,11 @@ Las páhinas de la tu [[Special:Watchlist|lista e seguimientu]] están en '''neg
 pa empuntal archivus.',
 'upload_directory_read_only'  => "Nu puei escrebilsi nel diretoriu d'empuntu ($1) el sirviol.",
 'uploaderror'                 => 'Marru d´empuntu',
-'uploadtext'                  => "Gasta el hormuláriu d'embahu pa empuntal archivus, pa vel u landeal imahin ya empuntás vaiti pala [[Special:ImageList|lista d'archivus empuntaus]]. Tantu los archivus empuntaus cumu los esborraus se rustrin nel [[Special:Log/upload|rustrihu d'empuntu]].
+'uploadtext'                  => "Gasta el hormuláriu d'embahu pa empuntal archivus, pa vel u landeal imahin ya empuntás vaiti pala [[Special:FileList|lista d'archivus empuntaus]]. Tantu los archivus empuntaus cumu los esborraus se rustrin nel [[Special:Log/upload|rustrihu d'empuntu]].
 
 P'añiil la imahin nuna páhina, gasta el atihu el hormuláriu
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' u
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' u
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' p'atihal diretamenti al archivu.",
 'upload-permitted'            => "Crasis d'archivus premitias: $1.",
 'upload-preferred'            => "Crasis d'archivus preferias: $1.",
@@ -970,19 +975,19 @@ P'añiil la imahin nuna páhina, gasta el atihu el hormuláriu
 'large-file'                  => 'Es recomendabri que los archivus nu seyan mayoris de $1; esti archivu ocupa $2.',
 'largefileserver'             => 'Esti archivu es mas grandi que lo premitiu pol el sirviol.',
 'emptyfile'                   => "El archivu qu'as ententau empuntal paci estal vaciu; pol favol, compreba que realmenti se trata el archivu que querias empuntal.",
-'fileexists'                  => 'Ya desisti un archivu con esi nombri. Pol favol, compreba que realmenti quieis chambal el archivu <strong><tt>$1</tt></strong>.',
-'filepageexists'              => 'Ya desisti un artículu con esi nombri, pol favol, compreba <strong><tt>$1</tt></strong> si nu estás siguru e querel chambalu.',
-'fileexists-extension'        => 'Ya desisti un archivu con un nombri paiciu:<br />
-Nombri el archivu empuntau: <strong><tt>$1</tt></strong><br />
-Nombri el archivu ya desistenti: <strong><tt>$2</tt></strong><br />
-Pol favol, lihi un nombri deferenti.',
+'fileexists'                  => "Ya desisti un archivu con esi nombri. Pol favol, compreba que realmenti quieis chambal el archivu '''<tt>$1</tt>'''.",
+'filepageexists'              => "Ya desisti un artículu con esi nombri, pol favol, compreba '''<tt>$1</tt>''' si nu estás siguru e querel chambalu.",
+'fileexists-extension'        => "Ya desisti un archivu con un nombri paiciu:<br />
+Nombri el archivu empuntau: '''<tt>$1</tt>'''<br />
+Nombri el archivu ya desistenti: '''<tt>$2</tt>'''<br />
+Pol favol, lihi un nombri deferenti.",
 'fileexists-thumb'            => "<center>'''Esta imáhin ya desisti'''</center>",
-'fileexists-thumbnail-yes'    => "El archivu paci sel una imahin chiquenina <i>(cuairu)</i>. Pol favol, compreba qu'el archivu <strong><tt>$1</tt></strong> nu es la mesma imahin.<br />
+'fileexists-thumbnail-yes'    => "El archivu paci sel una imahin chiquenina ''(cuairu)''. Pol favol, compreba qu'el archivu '''<tt>$1</tt>''' nu es la mesma imahin.<br />
 Nel chascu en que huera la mesm imahin (inque seya en grandi) nu es mestel qu'empuntis el tu archivu.",
-'file-thumbnail-no'           => 'El nombri el archivu esmiença pol <strong><tt>$1</tt></strong>. Paci sel una imahin pequeña <i>(cuairu)</i>.
-Si tiinis la imahin cola resolución orihinal, empúntala, si nu, pol favol, chamba el nombri del archivu.',
-'fileexists-forbidden'        => 'Ya desisti un archivu con esti nombri; pol favol, güervi p´atrás i empunta el archivu con otru nombri. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => "Ya desisti un archivu con esti nombri; pol favol, vaiti p'atrás i empunta el archivu con otru nombri. [[Image:$1|thumb|center|$1]]",
+'file-thumbnail-no'           => "El nombri el archivu esmiença pol '''<tt>$1</tt>'''. Paci sel una imahin pequeña ''(cuairu)''.
+Si tiinis la imahin cola resolución orihinal, empúntala, si nu, pol favol, chamba el nombri del archivu.",
+'fileexists-forbidden'        => 'Ya desisti un archivu con esti nombri; pol favol, güervi p´atrás i empunta el archivu con otru nombri. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => "Ya desisti un archivu con esti nombri; pol favol, vaiti p'atrás i empunta el archivu con otru nombri. [[File:$1|thumb|center|$1]]",
 'successfulupload'            => 'Empuntu satisfatoriu',
 'uploadwarning'               => 'Avisu d´empuntu',
 'savefile'                    => 'Emburacal archivu',
@@ -1002,7 +1007,7 @@ Si tiinis la imahin cola resolución orihinal, empúntala, si nu, pol favol, cha
 
 Eberias arreparal en si es convenienti acontinal empuntandu el archivu u nu.
 Velaquí el antigu rustrihu d´esborrau pa esti archivu:",
-'filename-bad-prefix'         => 'El nombri del archivu qu\'estás empuntandu esmiença pol <strong>"$1"</strong>, es izil, es un nombri nu descritivu (típicu nombri dau autumaticamenti pol cámaras dehitalis). Pol favol, chamba el nombri del tu archivu.',
+'filename-bad-prefix'         => "El nombri del archivu qu'estás empuntandu esmiença pol '''\"\$1\"''', es izil, es un nombri nu descritivu (típicu nombri dau autumaticamenti pol cámaras dehitalis). Pol favol, chamba el nombri del tu archivu.",
 
 'upload-proto-error'      => 'Protocolu encorretu',
 'upload-proto-error-text' => 'El empuntu remotu prehisa e "URLs" qu´esmiencin pol <code>http://</code> u <code>ftp://</code>.',
@@ -1023,20 +1028,20 @@ Velaquí el antigu rustrihu d´esborrau pa esti archivu:",
 'upload_source_url'  => ' (una URL vália i acesibri)',
 'upload_source_file' => ' (un archivu nel tu ordinaol)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Esta páhina especial muestra tolos archivus empuntaus.
+# Special:ListFiles
+'listfiles-summary'     => 'Esta páhina especial muestra tolos archivus empuntaus.
 Pol defetu los úrtimus archivus empuntaus se muestran ena parti arta la lista.
 Pursa nel entítulu la coluna pa chambal el ordin.',
-'imagelist_search_for'  => 'Landeal pol nombri la imahin:',
+'listfiles_search_for'  => 'Landeal pol nombri la imahin:',
 'imgfile'               => 'archivu',
-'imagelist'             => 'Lista d´archivus',
-'imagelist_date'        => 'Fecha',
-'imagelist_name'        => 'Nombri',
-'imagelist_user'        => 'Usuáriu',
-'imagelist_size'        => 'Grandol',
-'imagelist_description' => 'Descrición',
-
-# Image description page
+'listfiles'             => 'Lista d´archivus',
+'listfiles_date'        => 'Fecha',
+'listfiles_name'        => 'Nombri',
+'listfiles_user'        => 'Usuáriu',
+'listfiles_size'        => 'Grandol',
+'listfiles_description' => 'Descrición',
+
+# File description page
 'filehist'                  => 'Estorial el archivu',
 'filehist-help'             => 'Pursa nuna fecha/ora pa vel cumu era el archivu nesi momentu.',
 'filehist-deleteall'        => 'esborral tós',
@@ -1044,12 +1049,14 @@ Pursa nel entítulu la coluna pa chambal el ordin.',
 'filehist-revert'           => 'revertil',
 'filehist-current'          => 'atual',
 'filehist-datetime'         => 'Fecha/Ora',
+'filehist-thumb'            => 'Cuairu',
+'filehist-thumbtext'        => 'cuairu pala velsión $1',
 'filehist-user'             => 'Usuáriu',
 'filehist-dimensions'       => 'Miias',
 'filehist-filesize'         => 'Grandol el archivu',
 'filehist-comment'          => 'Comentáriu',
 'imagelinks'                => 'Atihus',
-'linkstoimage'              => 'Las siguientis páhinas atihan a esti archivu:',
+'linkstoimage'              => '{{PLURAL:$1|El siguienti artículu atiha|Los siguientis $1 artículus atihan}} a esti archivu:',
 'nolinkstoimage'            => 'Nu ai denguna páhina qu´atihi a esti archivu.',
 'sharedupload'              => 'Esti archivu está compartiu i puei gastalsi dendi otrus proyeutus.',
 'shareduploadwiki'          => 'Pa mas enhormación, puei consurtal $1.',
@@ -1080,7 +1087,6 @@ Pursa nel entítulu la coluna pa chambal el ordin.',
 'filedelete-success-old'      => '<span class="plainlinks">� siu esborrá la velsión de \'\'\'[[Media:$1|$1]]\'\'\' del $3 a las $2.</span>',
 'filedelete-nofile'           => "Nu desisti '''$1''' nesti lugal.",
 'filedelete-nofile-old'       => "Nu desisti una velsión archivá e '''$1''' con esas caraterísticas.",
-'filedelete-iscurrent'        => "Vas a esborral la úrtima velsión d'esti archivu. Pol favol enantis revierti a una velsión anteriol.",
 'filedelete-otherreason'      => 'Razón adicional:',
 'filedelete-reason-otherlist' => 'Otra razón',
 'filedelete-reason-dropdown'  => "*Razonis frecuentis d'esborrau
@@ -1114,23 +1120,9 @@ Pursa nel entítulu la coluna pa chambal el ordin.',
 'randomredirect-nopages' => 'Nu ai redirecionis nesti "espaciu e nombris".',
 
 # Statistics
-'statistics'             => 'Estaísticas',
-'sitestats'              => 'Estaísticas de {{SITENAME}}',
-'userstats'              => 'Estaísticas d´usuáriu',
-'sitestatstext'          => "Atualmenti desistin {{PLURAL:\$1|'''1''' páhina|'''\$1''' páhinas}} ena basi e datus.
-Estu encrui \"carabas\", páhinas al tentu {{SITENAME}}, artículus nu acabihaus, redirecionis i algotras páhinas que nu chegan a sel artículus.
-Se crei que ai {{PLURAL:\$2|'''1''' páhina|unas '''\$2''' páhinas}} que realmenti {{PLURAL:\$2|es artículu|son artículus}}.
-
-Un total de '''\$8''' {{PLURAL:\$8|archivu á siu empuntau|archivus an siu empuntaus}}.
-
-La güiqui á tiniu '''\$3''' {{PLURAL:\$3|vesita|vesitas}} i '''\$4''' {{PLURAL:\$4|eición|eicionis}} enas sus páhinas
-endi que {{SITENAME}} prencipió a huncional.
-Estu resurta un promeyu e '''\$5''' eicionis pol páhina, i '''\$6''' vesitas pol eición.
-
-El longol de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola e tareas] es de '''\$7'''.",
-'userstatstext'          => "Ai {{PLURAL:$1|un [[Special:ListUsers|usuáriu]] rustriu|'''$1''' [[Special:ListUsers|usuárius]] rustrius}}, de los cualis,
-'''$2''' (un '''$4%''') {{PLURAL:$2|es|son}} $5.",
-'statistics-mostpopular' => 'Páhinas mas visoreás',
+'statistics'              => 'Estaísticas',
+'statistics-header-users' => 'Estaísticas d´usuáriu',
+'statistics-mostpopular'  => 'Páhinas mas visoreás',
 
 'disambiguations'      => 'Páhinas de desambiguáncia',
 'disambiguationspage'  => 'Prantilla:desambiguáncia',
@@ -1210,8 +1202,6 @@ El longol de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola e tareas] e
 'speciallogtitlelabel' => 'Entítulu:',
 'log'                  => 'Rustrihus',
 'all-logs-page'        => 'Tolos rustrihus',
-'log-search-legend'    => 'Landeal rustrihus',
-'log-search-submit'    => 'Dil',
 'logempty'             => 'Nu desistin elementus con esas condicionis nel rustrihu.',
 'log-title-wildcard'   => 'Landeal entítulus qu´esmiencin con esti testu',
 
@@ -1221,6 +1211,7 @@ El longol de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola e tareas] e
 'nextpage'          => 'Siguienti páhina ($1)',
 'prevpage'          => 'Páhina anteriol ($1)',
 'allpagesfrom'      => "Muestral páhinas qu'esmiencin pol:",
+'allpagesto'        => 'Muestral artículus que acabihin en:',
 'allarticles'       => 'Tolos artículus',
 'allinnamespace'    => 'Tolas páhinas (qu´estén en $1)',
 'allnotinnamespace' => 'Tolas páhinas (que nu estén en $1)',
@@ -1236,11 +1227,22 @@ El longol de la [http://www.mediawiki.org/wiki/Manual:Job_queue cola e tareas] e
 'special-categories-sort-count' => 'ordenal pol cuenta',
 'special-categories-sort-abc'   => 'ordenal alfabeticamenti',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribucionis el usuáriu esborrás',
+
+# Special:LinkSearch
+'linksearch'    => 'Atihus estelnus',
+'linksearch-ok' => 'Landeal',
+
 # Special:ListUsers
 'listusersfrom'      => "Muestral usuárius qu'esmiencin pol:",
 'listusers-submit'   => 'Muestral',
 'listusers-noresult' => 'Nu s´alcuentró dengún usuáriu.',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Rustrihu de nuevus usuárius',
+'newuserlog-create-entry' => "Nueva cuenta d'usuáriu",
+
 # Special:ListGroupRights
 'listgrouprights'          => "Derechus del grupu d'usuárius",
 'listgrouprights-group'    => 'Grupu',
@@ -1294,7 +1296,7 @@ Si quieis ehal de vehilal la páhina, pursa sobri \"Ehal de vehilal\".",
 'notanarticle'         => 'Nu es un artículu',
 'notvisiblerev'        => 'La revisión á siu esborrá',
 'watchnochange'        => 'Nu s´eitó denguna e las tus páhinas vehilás nel períu lihiu.',
-'watchlist-details'    => '{{PLURAL:$1|$1 páhina|$1 páhinas}} vehilás (sin cuental las carabas).',
+'watchlist-details'    => '{{PLURAL:$1|$1 artículu|$1 artículus}} vehilaus (sin contal las carabas).',
 'wlheader-enotif'      => '* Se premitin notificacionis pol email.',
 'wlheader-showupdated' => "* Las páhinas que s'án emburacau dendi la úrtima vezi que las visoreasti son muestrás en '''negrina'''",
 'watchmethod-recent'   => 'comprebandu las úrtimas eicionis en páhinas vehilás',
@@ -1303,12 +1305,7 @@ Si quieis ehal de vehilal la páhina, pursa sobri \"Ehal de vehilal\".",
 'iteminvalidname'      => "Pobrema con el artículu '$1', nombri nu premitiu...",
 'wlnote'               => "Embahu {{PLURAL:$1|es el úrtimu chambu|son los úrtimus '''$1''' chambus}} enas úrtimas {{PLURAL:$2|oras|'''$2''' oras}}.",
 'wlshowlast'           => 'Muestral úrtimus $1 oras $2 dias $3',
-'watchlist-show-bots'  => 'Muestral eicionis de bots',
-'watchlist-hide-bots'  => 'Açonchal eicionis de bots',
-'watchlist-show-own'   => 'Muestral las mis eicionis',
-'watchlist-hide-own'   => 'Açonchal las mis eicionis',
-'watchlist-show-minor' => 'Muestral eicionis chiqueninas',
-'watchlist-hide-minor' => 'Açonchal eicionis chiqueninas',
+'watchlist-options'    => 'Ocionis de la mi lista e seguimientu',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vehilandu...',
@@ -1348,77 +1345,83 @@ Pa hazel chambus ena tu lista e seguimientu, vesita
 Ayua la Güiquipeya:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Esborral páhina',
-'confirm'                     => 'Confirmal',
-'excontent'                   => "el continiu era: '$1'",
-'excontentauthor'             => "el continiu era: '$1' (i el únicu contribuyenti hue '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "el continiu enantis de branquealu era: '$1'",
-'exblank'                     => 'la páhina estaba vacia',
-'delete-confirm'              => 'Esborral "$1"',
-'delete-legend'               => 'Esborral',
-'historywarning'              => 'Avisu: La páhina que vas a esborral tieni un estorial:',
-'confirmdeletetext'           => "Vas a esborral una páhina/imahin i el su estorial de horma permanenti.
+# Delete
+'deletepage'             => 'Esborral páhina',
+'confirm'                => 'Confirmal',
+'excontent'              => "el continiu era: '$1'",
+'excontentauthor'        => "el continiu era: '$1' (i el únicu contribuyenti hue '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "el continiu enantis de branquealu era: '$1'",
+'exblank'                => 'la páhina estaba vacia',
+'delete-confirm'         => 'Esborral "$1"',
+'delete-legend'          => 'Esborral',
+'historywarning'         => 'Avisu: La páhina que vas a esborral tieni un estorial:',
+'confirmdeletetext'      => "Vas a esborral una páhina/imahin i el su estorial de horma permanenti.
 Pol favol, confirma que realmenti quieis hazel esu, qu'entiendis las consecuencias, i que lo hazis dalcuerdu cola
 [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Ación acabihá',
-'deletedtext'                 => 'S\'á esborrau "<nowiki>$1</nowiki>" corretamenti.
+'actioncomplete'         => 'Ación acabihá',
+'deletedtext'            => 'S\'á esborrau "<nowiki>$1</nowiki>" corretamenti.
 Consurta $2 pa vel los úrtimus esborraus.',
-'deletedarticle'              => 'esborrau "[[$1]]"',
-'dellogpage'                  => 'Rustrihu d´esborrau',
-'dellogpagetext'              => 'Embahu se muestra una lista colos úrtimus esborraus.',
-'deletionlog'                 => 'rustrihu d´esborrau',
-'reverted'                    => 'Revertiu a la úrtima revisión',
-'deletecomment'               => 'Razón del esborrau',
-'deleteotherreason'           => 'Otras razonis:',
-'deletereasonotherlist'       => 'Otra razón',
-'deletereason-dropdown'       => "*Motivus mas frecuentis d'esborrau
+'deletedarticle'         => 'esborrau "[[$1]]"',
+'dellogpage'             => 'Rustrihu d´esborrau',
+'dellogpagetext'         => 'Embahu se muestra una lista colos úrtimus esborraus.',
+'deletionlog'            => 'rustrihu d´esborrau',
+'reverted'               => 'Revertiu a la úrtima revisión',
+'deletecomment'          => 'Razón del esborrau',
+'deleteotherreason'      => 'Otras razonis:',
+'deletereasonotherlist'  => 'Otra razón',
+'deletereason-dropdown'  => "*Motivus mas frecuentis d'esborrau
 ** Pol solicitú el autol
 ** Violación el Copyright
 ** Vandalismu",
-'delete-edit-reasonlist'      => 'Eital razonis del esborrau',
-'delete-warning-toobig'       => "Esta páhina tieni un estorial d'eicionis grandi, mas de $1 revisionis. Esborralu puei causal pobremas enas operacionis la basi e datus de {{SITENAME}}; atua con cudiau.",
-'rollback'                    => 'Revertil eicionis',
-'rollback_short'              => 'Revertil',
-'rollbacklink'                => 'revertil',
-'rollbackfailed'              => 'Marru revirtiendu',
-'cantrollback'                => 'Nu se puei eshazel la eición; el úrtimu colabutaol es el únicu autol d´esta páhina.',
-'alreadyrolled'               => 'Nu es posibri revertil la úrtima eición de [[:$1]], hecha pol [[User:$2|$2]] ([[User talk:$2|Caraba]]); alguien ya á eitau u revertiu la páhina.
+'delete-edit-reasonlist' => 'Eital razonis del esborrau',
+'delete-warning-toobig'  => "Esta páhina tieni un estorial d'eicionis grandi, mas de $1 revisionis. Esborralu puei causal pobremas enas operacionis la basi e datus de {{SITENAME}}; atua con cudiau.",
+
+# Rollback
+'rollback'         => 'Revertil eicionis',
+'rollback_short'   => 'Revertil',
+'rollbacklink'     => 'revertil',
+'rollbackfailed'   => 'Marru revirtiendu',
+'cantrollback'     => 'Nu se puei eshazel la eición; el úrtimu colabutaol es el únicu autol d´esta páhina.',
+'alreadyrolled'    => 'Nu es posibri revertil la úrtima eición de [[:$1]], hecha pol [[User:$2|$2]] ([[User talk:$2|Caraba]]); alguien ya á eitau u revertiu la páhina.
 
 La úrtima eición á siu hecha pol [[User:$3|$3]] ([[User talk:$3|Caraba]]).',
-'editcomment'                 => 'La síntesis la eición hue: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '�n siu revertias las eicionis de [[Special:Contributions/$2|$2]] ([[User talk:$2|Caraba]]); chambau a la úrtima velsión de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Revertias las eicionis de $1; chambau a la úrtima velsión de $2.',
-'sessionfailure'              => "Paci qu'ai un pobrema cola tu sesión; pol precaución
+'editcomment'      => "La síntesis la eición hue: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '�n siu revertias las eicionis de [[Special:Contributions/$2|$2]] ([[User talk:$2|Caraba]]); chambau a la úrtima velsión de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Revertias las eicionis de $1; chambau a la úrtima velsión de $2.',
+'sessionfailure'   => "Paci qu'ai un pobrema cola tu sesión; pol precaución
 s'á cancelau l'ación solicitá. Pursa nel botón \"Atrás\" del
 tu escrucaol pa cargal otra vezi la páhina i güervi a ententalu.",
+
+# Protect
 'protectlogpage'              => 'Rustrihu e proteción',
 'protectlogtext'              => 'Embahu se muestra una lista cola proteción i desproteción la páhina. Pa mas enhormación, lei "[[Special:ProtectedPages|Esta páhina está protehia]]".',
 'protectedarticle'            => '"[[$1]]" protehiu',
 'modifiedarticleprotection'   => 'chambau el nivel de proteción a "[[$1]]"',
 'unprotectedarticle'          => '"[[$1]]" esprotehiu',
 'protect-title'               => 'Estableciendu nivel de proteción pa "$1"',
+'prot_1movedto2'              => '[[$1]] s´á moviu a [[$2]]',
 'protect-legend'              => 'Confirmal proteción',
 'protectcomment'              => 'Comentáriu:',
 'protectexpiry'               => 'Acabiha:',
 'protect_expiry_invalid'      => 'La fecha e cauciá nu es correta.',
 'protect_expiry_old'          => 'La fecha e cauciá está nel pasau.',
 'protect-unchain'             => 'Desatarugal los premisus pa movel páhinas',
-'protect-text'                => 'Aquí pueis vel i chambal el nivel de proteción la páhina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nu pueis chambal los nivelis de proteción mentris estés atarugau. Velaquí las ocionis atulais la páhina <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Nu se puein chambal los nivelis de proteción ebiu a un tarugu ativu ena basi e datus.
-Velaquí las ocionis atualis la páhina <strong>$1</strong>:',
-'protect-locked-access'       => 'Nu tiinis los premisus nesezarius pa chambal los nivelis de proteción duna páhina.
-Velaquí las ocionis atualis la páhina <strong>$1</strong>:',
+'protect-text'                => "Aquí pueis vel i chambal el nivel de proteción la páhina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nu pueis chambal los nivelis de proteción mentris estés atarugau. Velaquí las ocionis atulais la páhina '''$1''':",
+'protect-locked-dblock'       => "Nu se puein chambal los nivelis de proteción ebiu a un tarugu ativu ena basi e datus.
+Velaquí las ocionis atualis la páhina '''$1''':",
+'protect-locked-access'       => "Nu tiinis los premisus nesezarius pa chambal los nivelis de proteción duna páhina.
+Velaquí las ocionis atualis la páhina '''$1''':",
 'protect-cascadeon'           => "Esta páhina s'alcuetra atualmenti protehia polque está incluia {{PLURAL:$1|ena siguienti páhina, que tieni|enas siguientis páhinas, que tienin}} la proteción en cascá ativá. Pueis chambal el nivel de proteción desta páhina, peru ellu tendrá consecuencias en tola proteción en cascá.",
-'protect-default'             => '(defeutu)',
+'protect-default'             => 'Premitil a tolos usuárius',
 'protect-fallback'            => 'Es mestel el premisu "$1"',
-'protect-level-autoconfirmed' => 'Atarugal a los usuárius anónimus',
+'protect-level-autoconfirmed' => 'Atarugal a los nuevus usuárius anónimus',
 'protect-level-sysop'         => 'Solu çahorilis',
 'protect-summary-cascade'     => 'proteción en "cascá"',
 'protect-expiring'            => 'acabiha el $1 (UTC)',
 'protect-cascade'             => 'Protehel las páhinas encluias nesta páhina (proteción en "cascá")',
 'protect-cantedit'            => "Nu t'es posibri chambal el nivel de proteción desta páhina ebiu a que nu tienis los premisus nesezárius pa eitala.",
+'protect-expiry-options'      => '2 oras:2 hours,1 dia:1 day,3 dias:3 days,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 mesis:3 months,6 mesis:6 months,1 añu:1 year,enfinitu:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Premisus:',
 'restriction-level'           => 'Nivel de restrición:',
 'minimum-size'                => 'Grandol mén',
@@ -1480,13 +1483,14 @@ $1',
 'blanknamespace' => '(Prencipal)',
 
 # Contributions
-'contributions' => 'Endirguis el usuáriu',
-'mycontris'     => 'Los mis endirguis',
-'contribsub2'   => 'Pa $1 ($2)',
-'nocontribs'    => "Nu s'alcuentrun chambus con esus criterius.",
-'uctop'         => '(úrtimu chambu)',
-'month'         => 'Mes:',
-'year'          => 'Añu:',
+'contributions'       => 'Endirguis el usuáriu',
+'contributions-title' => 'Contribucionis del usuáriu a $1',
+'mycontris'           => 'Los mis endirguis',
+'contribsub2'         => 'Pa $1 ($2)',
+'nocontribs'          => "Nu s'alcuentrun chambus con esus criterius.",
+'uctop'               => '(úrtimu chambu)',
+'month'               => 'Mes:',
+'year'                => 'Añu:',
 
 'sp-contributions-newbies'     => 'Solu muestral los endirguis de cuentas nuevas',
 'sp-contributions-newbies-sub' => 'Pa nuevas cuentas',
@@ -1497,9 +1501,8 @@ $1',
 
 # What links here
 'whatlinkshere'            => "Lo qu'atiha aquí",
-'whatlinkshere-title'      => 'Páhinas qu´atihan a $1',
+'whatlinkshere-title'      => 'Páhinas que atihan a $1',
 'whatlinkshere-page'       => 'Páhina:',
-'linklistsub'              => '(Lista d´atihus)',
 'linkshere'                => "Las siguientis páhinas atihan a '''[[:$1]]''':",
 'nolinkshere'              => "Denguna páhina atiha a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nu ai denguna páhina qu´atihi a '''[[:$1]]''' nel espaciu e nombris lihiu.",
@@ -1558,7 +1561,7 @@ Escrebi una razón concreta embahu (pol sabulugal, almientandu páhinas qu'aigan
 'ipusubmit'                   => 'Desatarugal esta direción',
 'unblocked'                   => 'El usuáriu [[User:$1|$1]] á siu desatarugau',
 'unblocked-id'                => 'S´á esborrau el tarugu $1',
-'ipblocklist'                 => 'Lista d´IP i nombris d´usuárius atarugaus',
+'ipblocklist'                 => "Lista de IP i nombris d'usuárius atarugaus",
 'ipblocklist-legend'          => 'Landeal a un usuáriu atarugau',
 'ipblocklist-username'        => 'Nombri d´usuáriu u IP:',
 'ipblocklist-submit'          => 'Landeal',
@@ -1573,6 +1576,7 @@ Escrebi una razón concreta embahu (pol sabulugal, almientandu páhinas qu'aigan
 'ipblocklist-no-results'      => 'Esta direción IP/nombri d´usuáriu nu está atarugau.',
 'blocklink'                   => 'atarugal',
 'unblocklink'                 => 'desatarugal',
+'change-blocklink'            => 'chambal tarugu',
 'contribslink'                => 'endirguis',
 'autoblocker'                 => 'Autu-atarugau ebiu a que la tu IP á siu gastá hazi pocu pol "[[User:$1|$1]]". La razón el tarugu de $1 es: "$2"',
 'blocklogpage'                => 'Rustrihu e tarugus',
@@ -1639,11 +1643,14 @@ pol favol, asigurati e qu'entiendis las consecuéncias enantis d'acontinal.",
 
 En dambus los dos chascus, si lo deseas, tendrás que movel u mestural la páhina manualmenti.",
 'movearticle'             => 'Movel páhina:',
+'movenologin'             => "Nu t'alcuentras rustriu",
+'movenologintext'         => 'Ebis estal rustriu i [[Special:UserLogin|entral ena tu cuenta]] pa movel una páhina.',
 'movenotallowed'          => 'Nu tiinis premisu pa mual páhinas nesti güiqui.',
 'newtitle'                => 'Nuevu entítulu:',
 'move-watch'              => 'Vehilal esta páhina',
 'movepagebtn'             => 'Movel páhina',
 'pagemovedsub'            => 'S´á moviu la páhina',
+'movepage-moved'          => "<big>S'á muau '''\"\$1\" a \"\$2\"'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
 'articleexists'           => 'Ya desisti una páhina con esi nombri u nu se premiti el nombri qu´as lihiu.
 Pol favol, escrebi otru entítulu.',
 'cantmove-titleprotected' => "Nu t'es posibri movel la páhina ebiu a qu'el nuevu entítulu s'alcuentra atarugau",
@@ -1663,7 +1670,6 @@ Ya desisti la páhina "[[:$1]]". Te petaria esborrala pa premitil el treslau?',
 'delete_and_move_confirm' => 'Sí, esborral la páhina',
 'delete_and_move_reason'  => 'Esborrá pa premitil el treslau',
 'selfmove'                => "Los entítulus d'orihin i destinu son los mesmus. Nu es posibri movel una páhina sobri sí mesma..",
-'immobile_namespace'      => 'El entítulu e destinu es dun tipu especial. Nu es posibri movel páhinas a esi espaciu e nombris.',
 
 # Export
 'export'            => 'Esporteal páhinas',
@@ -1682,7 +1688,7 @@ Ya desisti la páhina "[[:$1]]". Te petaria esborrala pa premitil el treslau?',
 'allmessagesdefault'        => 'Testu pol defeutu',
 'allmessagescurrent'        => 'Testu atual',
 'allmessagestext'           => 'Esta es una lista e mensahis del sistema disponibris nel espaciu e nombris MediaWiki:
-Pol favol, vesita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] i [http://translatewiki.net Betawiki] si quieis colabutal.',
+Pol favol, vesita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] i [http://translatewiki.net translatewiki.net] si quieis colabutal.',
 'allmessagesnotsupportedDB' => "Nu se puei gastal esta páhina polque '''\$wgUseDatabaseMessages''' está desativau.",
 'allmessagesfilter'         => 'Filtru e mensahis:',
 'allmessagesmodified'       => 'Solu muestral chambaus',
@@ -1705,6 +1711,7 @@ Tolas acionis d'emporteau transwiki se rustrin nel [[Special:Log/import|rustrihu
 'import-interwiki-history'   => "Copial tolas velsionis estóricas d'esta páhina",
 'import-interwiki-submit'    => 'Emporteal',
 'import-interwiki-namespace' => 'Movel páhinas al espaciu e nombris:',
+'import-comment'             => 'Comentáriu:',
 'importstart'                => 'Emporteandu páhinas...',
 'import-revision-count'      => '$1 {{PLURAL:$1|revisión|revisionis}}',
 'importnopages'              => 'Nu ai páhinas pa emporteal.',
@@ -1728,19 +1735,19 @@ Tolas acionis d'emporteau transwiki se rustrin nel [[Special:Log/import|rustrihu
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revisión|revisionis}} dendi $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'La mi páhina d´usuáriu',
+'tooltip-pt-userpage'             => "La mi páhina d'usuáriu",
 'tooltip-pt-anonuserpage'         => "La páhina d'usuáriu la IP dendi la qu'eita",
 'tooltip-pt-mytalk'               => 'La mi caraba',
 'tooltip-pt-anontalk'             => 'Caraba sobri las eicionis hechas con esta IP',
 'tooltip-pt-preferences'          => 'Las mis preferéncias',
 'tooltip-pt-watchlist'            => 'Lista e páhinas enas que vehilas los chambus',
-'tooltip-pt-mycontris'            => 'Lista e los mis endirguis',
+'tooltip-pt-mycontris'            => 'Los mis endirguis',
 'tooltip-pt-login'                => 'Te recomendamus que te rustris, inque nu es mestel.',
 'tooltip-pt-anonlogin'            => 'Te recomendamus que te rustris, inque nu es mestel.',
 'tooltip-pt-logout'               => 'Salil',
 'tooltip-ca-talk'                 => 'Caraba al tentu el artículu',
 'tooltip-ca-edit'                 => 'Pueis eital esta páhina, peru pol favol, gasta el botón "previsoreal" enantis d´emburacal.',
-'tooltip-ca-addsection'           => 'Hazel un comentáriu ena caraba.',
+'tooltip-ca-addsection'           => 'Prencipial una nueva seción',
 'tooltip-ca-viewsource'           => 'Esta páhina está protehia (nu pueis hazel chambus).',
 'tooltip-ca-history'              => 'Velsionis anterioris d´esta páhina.',
 'tooltip-ca-protect'              => 'Protehel esta páhina',
@@ -1871,7 +1878,7 @@ $1',
 'show-big-image'       => 'Resolución máisima',
 'show-big-image-thumb' => '<small>Grandol al previsoreal: $1 × $2 pixelis</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Correol d´archivus nuevus',
 'imagelisttext'         => "Embahu ai una lista con '''$1''' {{PLURAL:$1|archivu|archivus}} ordenaus $2.",
 'noimages'              => 'Nu ai ná pa vel.',
@@ -2106,7 +2113,7 @@ Cualisquiel otru atihu ena mesma línia se consierará ececión, p.s. páhinas o
 
 # External editor support
 'edit-externally'      => 'Eital esti archivu gastandu una apricación esterna',
-'edit-externally-help' => 'Pa mas enhormación, lei las [http://www.mediawiki.org/wiki/Manual:External_editors istrucionis de configuración] (en ingrés).',
+'edit-externally-help' => 'Pa mas enholmación, lei las [http://www.mediawiki.org/wiki/Manual:External_editors istrucionis de configuración] (en ingrés).',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'tó',
@@ -2176,21 +2183,9 @@ $1
 Pol favol, confirma si rialmenti quieis gorvel a crial la páhina.",
 'recreate'            => 'Gorvel a crial',
 
-# HTML dump
-'redirectingto' => 'Rederihiendu a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Esborral el caché desta páhina?
-
-$1',
 'confirm_purge_button' => 'Dalcuerdu',
-
-# AJAX search
-'searchcontaining' => "Landeal páhinas que contengan ''$1''.",
-'searchnamed'      => "Landeal artículus llamaus ''$1''.",
-'articletitles'    => "Artículus qu'esmiencin pol ''$1''",
-'hideresults'      => 'Açonchal resurtaus',
-'useajaxsearch'    => 'Usa el landeru AJAX',
+'confirm-purge-top'    => 'Esborral el caché desta páhina?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� páhina anteriol',
@@ -2284,7 +2279,7 @@ $1',
 'filepath-submit'  => 'Ruta',
 'filepath-summary' => "Esta páhina especial degüervi la ruta compreta dun archivu. Las imahin se muestran a resolución compreta; las demas crasis d'archivu s'ehecutan diretamenti con el su pograma asociau.
 
-Escribi el nombri d'archivu sin el prefihu \"{{ns:image}}:\".",
+Escribi el nombri d'archivu sin el prefihu \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Landeal archivus dupricaus',
diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index 72497d0d..79d33da4 100644
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -4,44 +4,128 @@
  * @ingroup Language
  * @file
  *
- * @author G - ×’
+ * @author Behdarvandyani
  * @author Huji
- * @author Huji <huji.huji at gmail.com>
+ * @author Ladsgroup
  * @author Mardetanha
+ * @author Meisam
  * @author Meno25
  * @author Roozbeh Pournader <roozbeh at gmail.com>
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'کلاسیک',
-	'nostalgia'   => 'نوستالژی',
-	'cologneblue' => 'آبی کلون',
-	'monobook'    => 'مونوبوک',
-	'myskin'      => 'پوستهٔ من',
-	'chick'       => 'شیک',
-	'simple'      => 'ساده',
-	'modern'      => 'مدرن',
-);
 $namespaceNames = array(
-	NS_MEDIA          => 'مدیا',
-	NS_SPECIAL        => 'ویژه',
-	NS_MAIN	          => '',
-	NS_TALK	          => 'بحث',
-	NS_USER           => 'کاربر',
-	NS_USER_TALK      => 'بحث_کاربر',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'بحث_$1',
-	NS_IMAGE          => 'تصویر',
-	NS_IMAGE_TALK     => 'بحث_تصویر',
-	NS_MEDIAWIKI      => 'مدیاویکی',
-	NS_MEDIAWIKI_TALK	=> 'بحث_مدیاویکی',
-	NS_TEMPLATE       => 'الگو',
-	NS_TEMPLATE_TALK  => 'بحث_الگو',
-	NS_HELP           => 'راهنما',
-	NS_HELP_TALK      => 'بحث_راهنما',
-	NS_CATEGORY       => 'رده',
-	NS_CATEGORY_TALK  => 'بحث_رده'
+	NS_MEDIA            => 'مدیا',
+	NS_SPECIAL          => 'ویژه',
+	NS_MAIN	            => '',
+	NS_TALK             => 'بحث',
+	NS_USER             => 'کاربر',
+	NS_USER_TALK        => 'بحث_کاربر',
+	NS_PROJECT_TALK     => 'بحث_$1',
+	NS_FILE             => 'پرونده',
+	NS_FILE_TALK        => 'بحث_پرونده',
+	NS_MEDIAWIKI        => 'مدیاویکی',
+	NS_MEDIAWIKI_TALK   => 'بحث_مدیاویکی',
+	NS_TEMPLATE         => 'الگو',
+	NS_TEMPLATE_TALK    => 'بحث_الگو',
+	NS_HELP             => 'راهنما',
+	NS_HELP_TALK        => 'بحث_راهنما',
+	NS_CATEGORY         => 'رده',
+	NS_CATEGORY_TALK    => 'بحث_رده',
+);
+
+$namespaceAliases = array(
+	'تصویر' => NS_FILE,
+	'بحث_تصویر' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'تغییرمسیرهای_دوتایی' ),
+	'BrokenRedirects'           => array( 'تغییرمسیرهای_خراب' ),
+	'Disambiguations'           => array( 'ابهام‌زدایی' ),
+	'Userlogin'                 => array( 'ورود_به_سیستم' ),
+	'Userlogout'                => array( 'خروج_از_سیستم' ),
+	'CreateAccount'             => array( 'ایجاد_حساب_کاربری' ),
+	'Preferences'               => array( 'ترجیحات' ),
+	'Watchlist'                 => array( '�هرست_پی‌گیری' ),
+	'Recentchanges'             => array( 'تغییرات_اخیر' ),
+	'Upload'                    => array( 'بارگذاری_پرونده' ),
+	'Listfiles'                 => array( '�هرست_پرونده‌ها', '�هرست_تصاویر' ),
+	'Newimages'                 => array( 'تصاویر_جدید' ),
+	'Listusers'                 => array( '�هرست_کاربران' ),
+	'Listgrouprights'           => array( 'اختیارات_گروه‌های_کاربری' ),
+	'Statistics'                => array( 'آمار' ),
+	'Randompage'                => array( 'ص�حه_تصاد�ی' ),
+	'Lonelypages'               => array( 'ص�حه‌های_یتیم' ),
+	'Uncategorizedpages'        => array( 'ص�حه‌های_رده‌بندی_نشده' ),
+	'Uncategorizedcategories'   => array( 'رده‌های_رده‌بندی_نشده' ),
+	'Uncategorizedimages'       => array( 'تصویرهای_رده‌بندی_‌نشده' ),
+	'Uncategorizedtemplates'    => array( 'الگوهای_رده‌بندی_نشده' ),
+	'Unusedcategories'          => array( 'رده‌های_است�اده_نشده' ),
+	'Unusedimages'              => array( 'تصاویر_است�اده_نشده' ),
+	'Wantedpages'               => array( 'ص�حه‌های_مورد_نیاز' ),
+	'Wantedcategories'          => array( 'رده‌های_مورد_نیاز' ),
+	'Wantedfiles'               => array( 'پرونده‌های_مورد_نیاز' ),
+	'Wantedtemplates'           => array( 'الگوهای_مورد_نیاز' ),
+	'Mostlinked'                => array( 'بیشترین_پیوند' ),
+	'Mostlinkedcategories'      => array( 'رده_با_بیشترین_پیوند' ),
+	'Mostlinkedtemplates'       => array( 'الگو_با_بیشترین_پیوند' ),
+	'Mostcategories'            => array( 'بیشترین_رده' ),
+	'Mostimages'                => array( 'بیشترین_تصویر' ),
+	'Mostrevisions'             => array( 'بیشترین_نسخه' ),
+	'Fewestrevisions'           => array( 'کمترین_نسخه' ),
+	'Shortpages'                => array( 'ص�حه‌های_کوتاه' ),
+	'Longpages'                 => array( 'ص�حه‌های_بلند' ),
+	'Newpages'                  => array( 'ص�حه‌های_تازه' ),
+	'Ancientpages'              => array( 'ص�حه‌های_قدیمی' ),
+	'Deadendpages'              => array( 'ص�حه‌های_بن‌بست' ),
+	'Protectedpages'            => array( 'ص�حه‌های_ح�اظت_شده' ),
+	'Protectedtitles'           => array( 'عنوان‌های_ح�اظت_شده' ),
+	'Allpages'                  => array( 'تمام_ص�حه‌ها' ),
+	'Prefixindex'               => array( 'نمایه_پیشوندی' ),
+	'Ipblocklist'               => array( '�هرست_بستن_نشانی_اینترنتی' ),
+	'Specialpages'              => array( 'ص�حه‌های_ویژه' ),
+	'Contributions'             => array( 'مشارکت‌ها' ),
+	'Emailuser'                 => array( 'نامه_به_کاربر' ),
+	'Confirmemail'              => array( 'تایید_پست_الکترونیکی' ),
+	'Whatlinkshere'             => array( 'پیوند_به_این_ص�حه' ),
+	'Recentchangeslinked'       => array( 'تغییرات_مرتبط' ),
+	'Movepage'                  => array( 'انتقال_ص�حه' ),
+	'Blockme'                   => array( 'بستن_من' ),
+	'Booksources'               => array( 'منابع_کتاب' ),
+	'Categories'                => array( 'رده‌ها' ),
+	'Export'                    => array( 'برون‌_بری_ص�حه' ),
+	'Version'                   => array( 'نسخه' ),
+	'Allmessages'               => array( 'تمام_پیغام‌ها' ),
+	'Log'                       => array( 'سیاهه‌ها' ),
+	'Blockip'                   => array( 'بستن_نشانی_اینترنتی' ),
+	'Undelete'                  => array( 'احیای_ص�حهٔ_حذ�‌شده' ),
+	'Import'                    => array( 'درون_ریزی_ص�حه' ),
+	'Lockdb'                    => array( 'ق�ل_کردن_پایگاه_داده' ),
+	'Unlockdb'                  => array( 'باز_کردن_پایگاه_داده' ),
+	'Userrights'                => array( 'اختیارات_کاربر' ),
+	'MIMEsearch'                => array( 'جستجوی_MIME' ),
+	'FileDuplicateSearch'       => array( 'جستجوی_پرونده_تکراری' ),
+	'Unwatchedpages'            => array( 'ص�حه‌های_پی‌گیری_نشده' ),
+	'Listredirects'             => array( '�هرست_تغییرمسیرها' ),
+	'Revisiondelete'            => array( 'حذ�_نسخه' ),
+	'Unusedtemplates'           => array( 'الگوهای_است�اده_نشده' ),
+	'Randomredirect'            => array( 'تغییرمسیر_تصاد�ی' ),
+	'Mypage'                    => array( 'ص�حه_من' ),
+	'Mytalk'                    => array( 'بحث_من' ),
+	'Mycontributions'           => array( 'مشارکت‌های_من' ),
+	'Listadmins'                => array( '�هرست_مدیران' ),
+	'Listbots'                  => array( '�هرست_ربات‌ها' ),
+	'Popularpages'              => array( 'ص�حه‌های_محبوب' ),
+	'Search'                    => array( 'جستجو' ),
+	'Resetpass'                 => array( 'از_نو_کردن_گذرواژه' ),
+	'Withoutinterwiki'          => array( 'بدون_میان‌ویکی' ),
+	'MergeHistory'              => array( 'ادغام_تاریخچه' ),
+	'Filepath'                  => array( 'مسیر_پرونده' ),
+	'Invalidateemail'           => array( 'باطل_کردن_پست_الکترونیکی' ),
+	'Blankpage'                 => array( 'ص�حه_خالی' ),
+	'LinkSearch'                => array( 'جستجوی_پیوند' ),
+	'DeletedContributions'      => array( 'مشارکت‌های_حذ�_شده' ),
 );
 
 $digitTransformTable = array(
@@ -60,6 +144,8 @@ $digitTransformTable = array(
 	',' => 'Ù¬', # &#x066c;
 );
 
+$fallback8bitEncoding = 'windows-1256';
+
 $rtl = true;
 $defaultUserOptionOverrides = array(
 	# Swap sidebar to right side by default
@@ -144,133 +230,153 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-#   ID                                 CASE  SYNONYMS
-	'redirect'               => array( 0,    '#تغییرمسیر', '#REDIRECT' ),
-	'notoc'                  => array( 0,    '__بی‌�هرست__', '__NOTOC__' ),
-	'nogallery'              => array( 0,    '__بی‌نگارخانه__', '__NOGALLERY__' ),
-	'forcetoc'               => array( 0,    '__با�هرست__', '__FORCETOC__' ),
-	'toc'                    => array( 0,    '__�هرست__', '__TOC__' ),
-	'noeditsection'          => array( 0,    '__بی‌بخش__', '__NOEDITSECTION__' ),
-	'currentmonth'           => array( 1,    'ماه', 'ماه‌کنونی', 'ماه_کنونی', 'CURRENTMONTH' ),
-	'currentmonthname'       => array( 1, 	 'نام‌ماه', 'نام_ماه', 'نام‌ماه‌کنونی', 'نام_ماه_کنونی', 'CURRENTMONTHNAME' ),
-	'currentmonthabbrev'     => array( 1,    'مخ��‌نام‌ماه', 'مخ��_نام_ماه', 'CURRENTMONTHABBREV' ),
-	'currentday'             => array( 1,    'روز', 'CURRENTDAY' ),
-	'currentday2'            => array( 1,    'روز۲', 'روز_۲', 'CURRENTDAY2' ),
-	'currentdayname'         => array( 1,    'نام‌روز', 'نام_روز', 'CURRENTDAYNAME' ),
-	'currentyear'            => array( 1,    'سال', 'سال‌کنونی', 'سال_کنونی', 'CURRENTYEAR' ),
-	'currenttime'            => array( 1,    'زمان', 'CURRENTTIME' ),
-	'currenthour'            => array( 1,    'ساعت', 'CURRENTHOUR' ),
-	'localmonth'             => array( 1,    'ماه‌محلی', 'ماه_محلی', 'LOCALMONTH' ),
-	'localmonthname'         => array( 1,    'نام‌ماه‌محلی', 'نام_ماه_محلی', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'       => array( 1,    'مخ��‌ماه‌محلی', 'مخ��_ماه_محلی', 'LOCALMONTHABBREV' ),
-	'localday'               => array( 1,    'روزمحلی', 'روز_محلی', 'LOCALDAY' ),
-	'localday2'              => array( 1,    'روزمحلی۲', 'روز_محلی_۲', 'LOCALDAY2' ),
-	'localdayname'           => array( 1,    'نام‌روزمحلی', 'نام_روز_محلی', 'LOCALDAYNAME' ),
-	'localyear'              => array( 1,    'سال‌محلی', 'سال_محلی', 'LOCALYEAR' ),
-	'localtime'              => array( 1,    'زمان‌محلی', 'زمان_محلی', 'LOCALTIME' ),
-	'localhour'              => array( 1,    'ساعت‌محلی', 'ساعت_محلی', 'LOCALHOUR' ),
-	'numberofpages'          => array( 1,    'تعدادص�حه‌ها', 'تعداد_ص�حه‌ها', 'NUMBEROFPAGES' ),
-	'numberofarticles'       => array( 1,    'تعدادمقاله‌ها', 'تعداد_مقاله‌ها', 'NUMBEROFARTICLES' ),
-	'numberoffiles'          => array( 1,    'تعدادپرونده‌ها', 'تعداد_پرونده‌ها', 'NUMBEROFFILES' ),
-	'numberofusers'          => array( 1,    'تعدادکاربران', 'تعداد_کاربران', 'NUMBEROFUSERS' ),
-	'numberofedits'          => array( 1,    'تعدادویرایش‌ها', 'تعداد_ویرایش‌ها', 'NUMBEROFEDITS' ),
-	'pagename'               => array( 1,    'نام‌ص�حه', 'نام_ص�حه', 'PAGENAME' ),
-	'pagenamee'              => array( 1,    'نشانی‌ص�حه', 'نشانی_ص�حه', 'PAGENAMEE' ),
-	'namespace'              => array( 1,    '�ضای‌نام', '�ضای_نام', 'NAMESPACE' ),
-	'namespacee'             => array( 1,    'نشانی‌�ضای‌نام', 'نشانی_�ضای_نام', 'NAMESPACEE' ),
-	'talkspace'              => array( 1,    '�ضای‌بحث', '�ضای_بحث', 'TALKSPACE' ),
-	'talkspacee'             => array( 1,    'نشانی‌بحث', 'نشانی_بحث', 'TALKSPACEE' ),
-	'subjectspace'           => array( 1,    '�ضای‌موضوع', '�ضای‌مقاله', '�ضای_موضوع', '�ضای_مقاله', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'          => array( 1,    'نشانی‌�ضای‌موضوع', 'نشانی‌�ضای‌مقاله', 'نشانی_�ضای_موضوع', 'نشانی_�ضای_مقاله', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'           => array( 1,    'نام‌کامل‌ص�حه', 'نام_کامل_ص�حه', 'FULLPAGENAME' ),
-	'fullpagenamee'          => array( 1,    'نشانی‌کامل‌ص�حه', 'نشانی_کامل_ص�حه', 'FULLPAGENAMEE' ),
-	'subpagename'            => array( 1,    'نام‌زیرص�حه', 'نام_زیرص�حه', 'SUBPAGENAME' ),
-	'subpagenamee'           => array( 1,    'نشانی‌زیرص�حه', 'نشانی_زیرص�حه', 'SUBPAGENAMEE' ),
-	'basepagename'           => array( 1,    'نام‌ص�حه‌مبنا', 'نام_ص�حه_مبنا', 'BASEPAGENAME' ),
-	'basepagenamee'          => array( 1,    'نشانی‌ص�حه‌مبنا', 'نشانی_ص�حه‌مبنا', 'BASEPAGENAMEE' ),
-	'talkpagename'           => array( 1,    'نام‌ص�حه‌بحث', 'نام_ص�حه_بحث', 'TALKPAGENAME' ),
-	'talkpagenamee'          => array( 1,    'نشانی‌ص�حه‌بحث', 'نشانی_ص�حه_بحث', 'TALKPAGENAMEE' ),
-	'subjectpagename'        => array( 1,    'نام‌ص�حه‌موضوع', 'نام‌ص�حه‌مقاله', 'نام_ص�حه_موضوع', 'نام_ص�حه_مقاله', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'       => array( 1,    'نشانی‌ص�حه‌موضوع', 'نشانی‌ص�حه‌مقاله', 'نشانی_ص�حه_موضوع', 'نشانی_ص�حه_مقاله', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                    => array( 0,    'پیغام:', 'پ:', 'MSG:' ),
-	'subst'                  => array( 0,    'جایگزین:', 'جا:', 'SUBST:' ),
-	'msgnw'                  => array( 0,    'پیغام‌بی‌بسط:', 'MSGNW:' ),
-	'img_thumbnail'          => array( 1,    'بندانگشتی', 'انگشتدان', 'انگشتی', 'thumbnail', 'thumb' ),
-	'img_manualthumb'        => array( 1,    'بندانگشتی=$1', 'انگشتدانهای=$1', 'انگشتی=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'              => array( 1,    'راست', 'right' ),
-	'img_left'               => array( 1,    'Ú†Ù¾', 'left' ),
-	'img_none'               => array( 1,    'هیچ', 'none' ),
-	'img_width'              => array( 1,    '$1px' ),
-	'img_center'             => array( 1,    'وسط', 'center', 'centre' ),
-	'img_framed'             => array( 1,    'قاب', 'framed', 'enframed', 'frame' ),
-	'img_frameless'          => array( 1,    'بی‌قاب', 'بیقاب', 'frameless' ),
-	'img_page'               => array( 1,    'ص�حه=$1', 'ص�حه $1', 'page=$1', 'page $1' ),
-	'img_upright'            => array( 1,    'upright', 'upright=$1', 'upright $1' ),
-	'img_border'             => array( 1,    'حاشیه', 'border' ),
-	'img_baseline'           => array( 1,    'همک�', 'baseline' ),
-	'img_sub'                => array( 1,    'زیر', 'sub' ),
-	'img_super'              => array( 1,    'زبر', 'super', 'sup' ),
-	'img_top'                => array( 1,    'بالا', 'top' ),
-	'img_text_top'           => array( 1,    'متن-بالا', 'text-top' ),
-	'img_middle'             => array( 1,    'میانه', 'middle' ),
-	'img_bottom'             => array( 1,    'پایین', 'bottom' ),
-	'img_text_bottom'        => array( 1,    'متن-پایین', 'text-bottom' ),
-	'int'                    => array( 0,    'محتوى:', 'INT:' ),
-	'sitename'               => array( 1,    'نام‌وبگاه', 'نام_وبگاه', 'SITENAME' ),
-	'ns'                     => array( 0,    '�ن:', 'NS:' ),
-	'localurl'               => array( 0,    'نشانی:', 'LOCALURL:' ),
-	'localurle'              => array( 0,    'نشانی‌نشانی:', 'LOCALURLE:' ),
-	'server'                 => array( 0,    'کارگذار', 'SERVER' ),
-	'servername'             => array( 0,    'نام‌کارگذار', 'نام_کارگذار', 'SERVERNAME' ),
-	'scriptpath'             => array( 0,    'مسیر', 'SCRIPTPATH' ),
-	'grammar'                => array( 0,    'GRAMMAR:' ),
-	'notitleconvert'         => array( 0,    '__NOTITLECONVERT__', '__NOTC__'),
-	'nocontentconvert'       => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__'),
-	'currentweek'            => array( 1,    'ه�ته', 'CURRENTWEEK' ),
-	'currentdow'             => array( 1,    'روزه�ته', 'روز_ه�ته', 'CURRENTDOW' ),
-	'localweek'              => array( 1,    'ه�ته‌محلی', 'ه�ته_محلی', 'LOCALWEEK' ),
-	'localdow'               => array( 1,    'روزه�ته‌محلی', 'روز_ه�ته_محلی', 'LOCALDOW' ),
-	'revisionid'             => array( 1,    'نسخه', 'شماره‌نسخه', 'شماره_نسخه', 'REVISIONID' ),
-	'revisionday'            => array( 1,    'روزنسخه', 'روز_نسخه', 'REVISIONDAY' ),
-	'revisionday2'           => array( 1,    'روزنسخه۲', 'روز_نسخه۲', 'روز_نسخه_۲', 'REVISIONDAY2' ),
-	'revisionmonth'          => array( 1,    'ماه‌نسخه', 'ماه_نسخه', 'REVISIONMONTH' ),
-	'revisionyear'           => array( 1,    'سال‌نسخه', 'سال_نسخه', 'REVISIONYEAR' ),
-	'revisiontimestamp'      => array( 1,    'نشان‌زمان‌نسخه', 'نشان_زمان_نسخه', 'REVISIONTIMESTAMP' ),
-	'plural'                 => array( 0,    'جمع:', 'PLURAL:' ),
-	'fullurl'                => array( 0,    'نشانی‌کامل:', 'FULLURL:' ),
-	'fullurle'               => array( 0,    'نشانی‌نشانی‌کامل:', 'FULLURLE:' ),
-	'lcfirst'                => array( 0,    'ابتداکوچک:', 'LCFIRST:' ),
-	'ucfirst'                => array( 0,    'ابتدابزرگ:', 'UCFIRST:' ),
-	'lc'                     => array( 0,    'Ú©:', 'LC:' ),
-	'uc'                     => array( 0,    'ب:', 'UC:' ),
-	'raw'                    => array( 0,    'خام:', 'RAW:' ),
-	'displaytitle'           => array( 1,    'عنوان‌ظاهری', 'عنوان_ظاهری', 'DISPLAYTITLE' ),
-	'rawsuffix'              => array( 1,    'R' ),
-	'newsectionlink'         => array( 1,    '__بخش‌جدید__', '__NEWSECTIONLINK__' ),
-	'currentversion'         => array( 1,    'نسخه‌کنونی', 'نسخه_کنونی', 'CURRENTVERSION' ),
-	'urlencode'              => array( 0,    'URLENCODE:' ),
-	'anchorencode'           => array( 0,    'ANCHORENCODE' ),
-	'currenttimestamp'       => array( 1,    'نشان‌زمان‌کنونی', 'نشان_زمان_کنونی', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'         => array( 1,    'نشان‌زمان‌محلی', 'نشان_زمان_محلی', 'LOCALTIMESTAMP' ),
-	'directionmark'          => array( 1,    'علامت‌جهت', 'علامت_جهت', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'               => array( 0,    '#زبان:', '#LANGUAGE:' ),
-	'contentlanguage'        => array( 1,    'زبان‌محتوا', 'زبان_محتوا', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'       => array( 1,    'ص�حه‌در�ضای‌نام', 'ص�حه_در_�ضای_نام', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'         => array( 1,    'تعدادمدیران', 'تعداد_مدیران', 'NUMBEROFADMINS' ),
-	'formatnum'              => array( 0,    'با�ت‌عدد', 'با�ت_عدد', 'formatnum' ),
-	'padleft'                => array( 0,    'PADLEFT' ),
-	'padright'               => array( 0,    'PADRIGHT' ),
-	'special'                => array( 0,    'ویژه', 'special' ),
-	'defaultsort'            => array( 1,    'ترتیب', 'ترتیب‌پیش‌�رض', 'ترتیب_پیش_�رض', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'               => array( 0,    'مسیرپرونده:', 'مسیر_پرونده', 'FILEPATH:' ),
-	'tag'                    => array( 0,    'برچسب', 'tag' ),
-	'hiddencat'              => array( 1,    '__رده‌پنهان__', '__HIDDENCAT__' ),
+	'redirect'              => array( '0', '#تغییرمسیر', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__بی‌�هرست__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__بی‌نگارخانه__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__با�هرست__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__�هرست__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__بی‌بخش__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__بی‌عنوان__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', 'ماه', 'ماه‌کنونی', 'ماه_کنونی', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'نام‌ماه', 'نام_ماه', 'نام‌ماه‌کنونی', 'نام_ماه_کنونی', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'نام‌ماه‌اضا�ه', 'نام_ماه_اضا�ه', 'نام‌ماه‌کنونی‌اضا�ه', 'نام_ماه_کنونی_اضا�ه', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'مخ��‌نام‌ماه', 'مخ��_نام_ماه', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'روز', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'روز۲', 'روز_۲', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'نام‌روز', 'نام_روز', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'سال', 'سال‌کنونی', 'سال_کنونی', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'زمان', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'ساعت', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'ماه‌محلی', 'ماه_محلی', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'نام‌ماه‌محلی', 'نام_ماه_محلی', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'نام‌ماه‌محلی‌اضا�ه', 'نام_ماه_محلی_اضا�ه', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'مخ��‌ماه‌محلی', 'مخ��_ماه_محلی', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'روزمحلی', 'روز_محلی', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'روزمحلی۲', 'روز_محلی_۲', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'نام‌روزمحلی', 'نام_روز_محلی', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'سال‌محلی', 'سال_محلی', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'زمان‌محلی', 'زمان_محلی', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'ساعت‌محلی', 'ساعت_محلی', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'تعدادص�حه‌ها', 'تعداد_ص�حه‌ها', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'تعدادمقاله‌ها', 'تعداد_مقاله‌ها', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'تعدادپرونده‌ها', 'تعداد_پرونده‌ها', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'تعدادکاربران', 'تعداد_کاربران', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'تعدادویرایش‌ها', 'تعداد_ویرایش‌ها', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'تعدادبازدید', 'تعداد_بازدید', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', 'نام‌ص�حه', 'نام_ص�حه', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'نشانی‌ص�حه', 'نشانی_ص�حه', 'PAGENAMEE' ),
+	'namespace'             => array( '1', '�ضای‌نام', '�ضای_نام', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'نشانی‌�ضای‌نام', 'نشانی_�ضای_نام', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', '�ضای‌بحث', '�ضای_بحث', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'نشانی‌بحث', 'نشانی_بحث', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', '�ضای‌موضوع', '�ضای‌مقاله', '�ضای_موضوع', '�ضای_مقاله', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'نشانی‌�ضای‌موضوع', 'نشانی‌�ضای‌مقاله', 'نشانی_�ضای_موضوع', 'نشانی_�ضای_مقاله', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'نام‌کامل‌ص�حه', 'نام_کامل_ص�حه', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'نشانی‌کامل‌ص�حه', 'نشانی_کامل_ص�حه', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'نام‌زیرص�حه', 'نام_زیرص�حه', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'نشانی‌زیرص�حه', 'نشانی_زیرص�حه', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'نام‌ص�حه‌مبنا', 'نام_ص�حه_مبنا', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'نشانی‌ص�حه‌مبنا', 'نشانی_ص�حه‌مبنا', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'نام‌ص�حه‌بحث', 'نام_ص�حه_بحث', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'نشانی‌ص�حه‌بحث', 'نشانی_ص�حه_بحث', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'نام‌ص�حه‌موضوع', 'نام‌ص�حه‌مقاله', 'نام_ص�حه_موضوع', 'نام_ص�حه_مقاله', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'نشانی‌ص�حه‌موضوع', 'نشانی‌ص�حه‌مقاله', 'نشانی_ص�حه_موضوع', 'نشانی_ص�حه_مقاله', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'پیغام:', 'پ:', 'MSG:' ),
+	'subst'                 => array( '0', 'جایگزین:', 'جا:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'پیغام‌بی‌بسط:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'بندانگشتی', 'انگشتدان', 'انگشتی', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'بندانگشتی=$1', 'انگشتدانهای=$1', 'انگشتی=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'راست', 'right' ),
+	'img_left'              => array( '1', 'Ú†Ù¾', 'left' ),
+	'img_none'              => array( '1', 'هیچ', 'none' ),
+	'img_width'             => array( '1', '$1پیکسل', '$1px' ),
+	'img_center'            => array( '1', 'وسط', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'قاب', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'بی‌قاب', 'بیقاب', 'frameless' ),
+	'img_page'              => array( '1', 'ص�حه=$1', 'ص�حه $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'ایستاده', 'ایستاده=$1', 'ایستاده $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'حاشیه', 'border' ),
+	'img_baseline'          => array( '1', 'همک�', 'baseline' ),
+	'img_sub'               => array( '1', 'زیر', 'sub' ),
+	'img_super'             => array( '1', 'زبر', 'super', 'sup' ),
+	'img_top'               => array( '1', 'بالا', 'top' ),
+	'img_text_top'          => array( '1', 'متن-بالا', 'text-top' ),
+	'img_middle'            => array( '1', 'میانه', 'middle' ),
+	'img_bottom'            => array( '1', 'پایین', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'متن-پایین', 'text-bottom' ),
+	'img_link'              => array( '1', 'پیوند=$1', 'link=$1' ),
+	'img_alt'               => array( '1', 'جایگزین=$1', 'alt=$1' ),
+	'int'                   => array( '0', 'محتوى:', 'INT:' ),
+	'sitename'              => array( '1', 'نام‌وبگاه', 'نام_وبگاه', 'SITENAME' ),
+	'ns'                    => array( '0', '�ن:', 'NS:' ),
+	'localurl'              => array( '0', 'نشانی:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'نشانی‌نشانی:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'کارگذار', 'SERVER' ),
+	'servername'            => array( '0', 'نام‌کارگذار', 'نام_کارگذار', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'مسیر', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'دستورزبان:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__عنوان‌تبدیل‌نشده__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__محتواتبدیل‌نشده__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'ه�ته', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'روزه�ته', 'روز_ه�ته', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'ه�ته‌محلی', 'ه�ته_محلی', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'روزه�ته‌محلی', 'روز_ه�ته_محلی', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'نسخه', 'شماره‌نسخه', 'شماره_نسخه', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'روزنسخه', 'روز_نسخه', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'روزنسخه۲', 'روز_نسخه۲', 'روز_نسخه_۲', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'ماه‌نسخه', 'ماه_نسخه', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'سال‌نسخه', 'سال_نسخه', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'نشان‌زمان‌نسخه', 'نشان_زمان_نسخه', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'جمع:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'نشانی‌کامل:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'نشانی‌نشانی‌کامل:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'ابتداکوچک:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'ابتدابزرگ:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'Ú©:', 'LC:' ),
+	'uc'                    => array( '0', 'ب:', 'UC:' ),
+	'raw'                   => array( '0', 'خام:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'عنوان‌ظاهری', 'عنوان_ظاهری', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', 'ع', 'R' ),
+	'newsectionlink'        => array( '1', '__بخش‌جدید__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'نسخه‌کنونی', 'نسخه_کنونی', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'کدنشانی:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'کدلنگر:', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'نشان‌زمان‌کنونی', 'نشان_زمان_کنونی', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'نشان‌زمان‌محلی', 'نشان_زمان_محلی', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'علامت‌جهت', 'علامت_جهت', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#زبان:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'زبان‌محتوا', 'زبان_محتوا', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'ص�حه‌در�ضای‌نام', 'ص�حه_در_�ضای_نام', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'تعدادمدیران', 'تعداد_مدیران', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'آرایش‌عدد', 'آرایش_عدد', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'لبه‌چپ', 'لبه_چپ', 'PADLEFT' ),
+	'padright'              => array( '0', 'لبه‌راست', 'لبه_راست', 'PADRIGHT' ),
+	'special'               => array( '0', 'ویژه', 'special' ),
+	'defaultsort'           => array( '1', 'ترتیب', 'ترتیب‌پیش‌�رض', 'ترتیب_پیش_�رض', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'مسیرپرونده:', 'مسیر_پرونده', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'برچسب', 'tag' ),
+	'hiddencat'             => array( '1', '__رده‌پنهان__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'ص�حه‌دررده', 'ص�حه_در_رده', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'اندازه‌ص�حه', 'اندازه_ص�حه', 'PAGESIZE' ),
+	'index'                 => array( '1', '__نمایه__', '__INDEX__' ),
+	'noindex'               => array( '1', '__بی‌نمایه__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'تعداددرگروه', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__تغییرمسیرثابت__', '__STATICREDIRECT__' ),
 );
 
+
 # Harakat are intentionally not included in the linkTrail. Their addition should
 # take place after enough tests.
 $linkTrail = "/^([ابپتثجچحخدذرزژسشصضطظعغ�قکگلمنوهیآأئؤة‌]+)(.*)$/sDu";
 
+$imageFiles = array(
+	'button-bold'     => 'fa/button_bold.png',
+	'button-italic'   => 'fa/button_italic.png',
+	'button-link'     => 'fa/button_link.png',
+	'button-headline' => 'fa/button_headline.png',
+	'button-nowiki'   => 'fa/button_nowiki.png',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'زیر پیوندها خط کشیده شود',
@@ -309,17 +415,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'مخ�ی‌کردن ویرایش‌های من در �هرست پی‌گیری‌ها',
 'tog-watchlisthidebots'       => 'مخ�ی‌کردن ویرایش‌های ربات‌ها در �هرست پی‌گیری‌ها',
 'tog-watchlisthideminor'      => 'نه�تن ویرایش‌های جزئی از �هرست پی‌گیری‌های من',
+'tog-watchlisthideliu'        => 'ویرایش‌های کاربران وارد شده به سیستم را از �هرست پی‌گیری‌های من پنهان کن',
+'tog-watchlisthideanons'      => 'ویرایش‌های کاربران ناشناس را از �هرست پی‌گیری‌های من پنهان کن',
 'tog-nolangconversion'        => 'غیر�عال کردن تبدیل زبان‌ها',
 'tog-ccmeonemails'            => '�رستادن رونوشت نامه‌های الکترونیکی که به دیگران ارسال می‌کنم به خودم.',
 'tog-diffonly'                => 'محتوای ص�حه، زیر ت�اوت نمایش داده نشود',
 'tog-showhiddencats'          => 'رده‌های پنهان را نمایش بده',
+'tog-norollbackdiff'          => 'بعد از واگردانی ت�اوت را نشان نده',
 
 'underline-always'  => 'همیشه',
 'underline-never'   => 'هرگز',
 'underline-default' => 'پیش‌�رض مرورگر',
 
-'skinpreview' => '(پیش‌نمایش)',
-
 # Dates
 'sunday'        => 'یک‌شنبه',
 'monday'        => 'دوشنبه',
@@ -412,9 +519,9 @@ $messages = array(
 'moredotdotdot'  => 'بیشتر...',
 'mypage'         => 'ص�حهٔ من',
 'mytalk'         => 'بحث من',
-'anontalk'       => 'بحث برای این IP',
+'anontalk'       => 'بحث برای این آی‌پی',
 'navigation'     => 'گشتن',
-'and'            => 'Ùˆ',
+'and'            => '&#32;Ùˆ',
 
 # Metadata in edit box
 'metadata_help' => 'متاداده:',
@@ -451,14 +558,14 @@ $messages = array(
 'talkpagelinktext'  => 'بحث',
 'specialpage'       => 'ص�حهٔ ویژه',
 'personaltools'     => 'ابزارهای شخصی',
-'postcomment'       => 'نوشتن نظر',
+'postcomment'       => 'بخش جدید',
 'articlepage'       => 'نمایش مقاله',
 'talk'              => 'بحث',
 'views'             => 'بازدیدها',
 'toolbox'           => 'جعبه‌ابزار',
 'userpage'          => 'نمایش ص�حهٔ کاربر',
 'projectpage'       => 'دیدن ص�حهٔ پروژه',
-'imagepage'         => 'نمایش ص�حهٔ تصویر',
+'imagepage'         => 'نمایش ص�حهٔ پرونده',
 'mediawikipage'     => 'نمایش ص�حهٔ پیغام',
 'templatepage'      => 'نمایش ص�حهٔ الگو',
 'viewhelppage'      => 'نمایش ص�حهٔ راهنما',
@@ -477,8 +584,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'دربارهٔ {{SITENAME}}',
 'aboutpage'            => 'Project:درباره',
-'bugreports'           => 'گزارش ایرادها',
-'bugreportspage'       => 'Project:گزارش ایرادها',
 'copyright'            => 'محتوا تحت اجازه‌نامهٔ $1 در دسترس است.',
 'copyrightpagename'    => 'حق تکثیر {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:حق_تکثیر',
@@ -501,9 +606,7 @@ $messages = array(
 
 'badaccess'        => 'خطای دسترسی',
 'badaccess-group0' => 'شما اجازهٔ اجرای عمل درخواسته را ندارید.',
-'badaccess-group1' => 'عملی که درخواسته‌اید منحصر به کاربران گروه $1 است.',
-'badaccess-group2' => 'عملی که درخواسته‌اید منحصر به کاربران یکی از گروههای $1 است.',
-'badaccess-groups' => 'عملی که درخواسته‌اید منحصر به کاربران یکی از گروههای $1 است.',
+'badaccess-groups' => 'عملی که درخواست کرده‌اید منحصر به کاربران {{PLURAL:$2|این گروه|این گروه‌ها}} است: $1.',
 
 'versionrequired'     => 'نسخهٔ $1 از نرم‌ا�زار مدیاویکی لازم است',
 'versionrequiredtext' => 'برای دیدن این ص�حه به نسخهٔ $1 از نرم‌ا�زار مدیاویکی نیاز دارید. برای اطلاع از نسخهٔ نرم‌ا�زار نصب شده در این ویکی به [[Special:Version|این ص�حه]] مراجعه کنید.',
@@ -517,6 +620,8 @@ $messages = array(
 'editsection'             => 'ویرایش',
 'editold'                 => 'ویرایش',
 'viewsourceold'           => 'مشاهدهٔ منبع',
+'editlink'                => 'ویرایش',
+'viewsourcelink'          => 'نمایش مبدأ',
 'editsectionhint'         => 'ویرایش بخش: $1',
 'toc'                     => '�هرست مندرجات',
 'showtoc'                 => 'نمایش داده شود',
@@ -531,13 +636,13 @@ $messages = array(
 'site-atom-feed'          => 'خبرخوان Atom برای $1',
 'page-rss-feed'           => 'خبرخوان RSS برای «$1»',
 'page-atom-feed'          => 'خبرخوان Atom برای «$1»',
-'red-link-title'          => '$1 (هنوز ایجاد نشده)',
+'red-link-title'          => '$1 (ص�حه وجود ندارد)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'مقاله',
 'nstab-user'      => 'ص�حهٔ کاربر',
 'nstab-media'     => 'رسانه',
-'nstab-special'   => 'ویژه',
+'nstab-special'   => 'ص�حهٔ ویژه',
 'nstab-project'   => 'ص�حهٔ پروژه',
 'nstab-image'     => 'تصویر',
 'nstab-mediawiki' => 'پیغام',
@@ -547,7 +652,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'چنین عملی وجود ندارد',
-'nosuchactiontext'  => 'ویکی عمل مشخص شده در URL را نمی‌شناسد',
+'nosuchactiontext'  => 'عمل مشخص شده در نشانی اینترنتی غیر مجاز است.
+شما ممکن است نشانی اینترنتی را اشتباه وارد کرده باشید یا یک پیوند نادرست را دنبال کرده باشید.
+هم‌چنین ممکن است ایرادی در {{SITENAME}} وجود داشته باشد.',
 'nosuchspecialpage' => 'چنین ص�حهٔ ویژه‌ای وجود ندارد',
 'nospecialpagetext' => 'شما ص�حهٔ ویژه‌ای را درخواست کرده‌اید که ویکی نمی‌شناسد.',
 
@@ -600,8 +707,6 @@ $1',
 'cannotdelete'         => 'نشد ص�حه یا تصویر مشخص‌شده را حذ� کرد. (ممکن است قبلاً کس دیگری آن را حذ� کرده باشد.)',
 'badtitle'             => 'عنوان بد',
 'badtitletext'         => 'عنوان درخواستی نامعتبر، خالی، یا عنوانی بین زبانی یا بین‌ویکی‌ای با پیوند نادرست بود.',
-'perfdisabled'         => 'شرمنده! این امکان مو�قتاً برداشته شده چون پایگاه داده را چنان کند می‌کند
-که هیچ کس نمی‌تواند از ویکی است�اده کند.',
 'perfcached'           => 'داده‌های زیر از حا�ظهٔ موقت �راخوانی شده‌اند و ممکن است کاملاً به‌روز نباشند:',
 'perfcachedts'         => 'داده‌های زیر از حا�ظهٔ موقت �راخوانی شده‌اند و آخرین به‌روزرسانی $1 است',
 'querypage-no-updates' => 'امکان به روز رسانی این ص�حه �علاً غیر�عال شده‌است.',
@@ -623,10 +728,10 @@ $2',
 'namespaceprotected'   => "شما اجازهٔ ویرایش ص�حه‌های �ضای نام '''$1''' را ندارید.",
 'customcssjsprotected' => 'شما اجازهٔ ویرایش این ص�حه را ندارید، چرا که حاوی تنظیم‌های شخصی یک کاربر دیگر است.',
 'ns-specialprotected'  => 'ص�حه‌های �ضای نام {{ns:special}} غیر قابل ویرایش هستند.',
-'titleprotected'       => 'از ایجاد ص�حه‌ای با این عنوان توسط [[User:$1|$1]] جلوگیری شده‌است. دلیل ذکر شده از این قرار است: <i>$2</i>.',
+'titleprotected'       => "از ایجاد ص�حه‌ای با این عنوان توسط [[User:$1|$1]] جلوگیری شده‌است. دلیل ذکر شده از این قرار است: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'تنظیمات بد: پویشگر ویروس ناشناخته: <i>$1</i>',
+'virus-badscanner'     => "تنظیمات بد: پویشگر ویروس ناشناخته: ''$1''",
 'virus-scanfailed'     => 'پویش نامو�ق (کد $1)',
 'virus-unknownscanner' => 'ضدویروس ناشناخته:',
 
@@ -645,7 +750,6 @@ $2',
 'remembermypassword'         => 'گذرواژه را به یاد بسپار.',
 'yourdomainname'             => 'دامنهٔ شما',
 'externaldberror'            => 'خطایی در ارتباط با پایگاه داده رخ داده‌است یا این که شما اجازه به روز رسانی حساب بیرونی خود را ندارید.',
-'loginproblem'               => '<b>ورود شما به سیستم با مشکلی مواجه شد.</b><br />دوباره تلاش کنید!',
 'login'                      => 'ورود به سیستم',
 'nav-login-createaccount'    => 'ورود به سیستم / ایجاد حساب کاربری',
 'loginprompt'                => 'برای ورود به {{SITENAME}} باید کوکی‌ها را �عال کنید.',
@@ -672,7 +776,7 @@ $2',
 'yournick'                   => 'امضا:',
 'badsig'                     => 'امضای خام غیرمجاز؛ لط�اً برچسب‌های HTML را بررسی کنید.',
 'badsiglength'               => 'امضای شما بیش از اندازه طولانی است.
-امضاها باید کمتر از $1 {{PLURAL:$1|نویسه|نویسه}} طول داشته باشند.',
+امضا باید کمتر از $1 {{PLURAL:$1|نویسه|نویسه}} طول داشته باشد.',
 'email'                      => 'پست الکترونیکی',
 'prefs-help-realname'        => '*نام واقعی (اختیاری): اگر تصمیم به ذکر آن بگیرید هنگام ارجاع به آثارتان و انتساب آنها به شما از نام واقعی‌تان است�اده خواهد شد.',
 'loginerror'                 => 'خطا در ورود به سیستم',
@@ -686,6 +790,7 @@ $2',
 'loginsuccesstitle'          => 'ورود مو�قیت‌آمیز به سیستم',
 'loginsuccess'               => 'شما اکنون با نام «$1» به {{SITENAME}} وارد شده‌اید.',
 'nosuchuser'                 => 'کاربری با نام «$1» وجود ندارد.
+نام‌های کاربری به بزرگی و کوچکی حرو� حساس هستند.
 املای نام را بررسی کنید، یا [[Special:UserLogin/signup|یک حساب کاربری جدید بسازید]].',
 'nosuchusershort'            => "هیچ کاربری با نام ''<nowiki>$1</nowiki>'' وجود ندارد. املایتان را وارسی کنید.",
 'nouserspecified'            => 'باید یک نام کاربری مشخص کنید.',
@@ -695,8 +800,7 @@ $2',
 گذرواژه باید دست‌کم {{PLURAL:$1|$1 حر�|$1 حر�}} داشته باشد.',
 'mailmypassword'             => 'گذرواژهٔ جدید �رستاده شود',
 'passwordremindertitle'      => 'یادآور گذرواژهٔ {{SITENAME}}',
-'passwordremindertext'       => 'یک ن�ر (احتمالاً خود شما) با نشانی آی‌پی $1 درخواست کرده‌است که ما گذرواژهٔ جدیدی برای  حساب کاربری‌ شما در {{SITENAME}} ب�رستیم ($4).
-یک گذرواژهٔ موقت برای کاربر «$2» ساخته شده و برابر با «$3» قرار داده شده‌است. اگر هد� شما همین بوده‌است، شما باید به سیستم وارد شوید و گذرواژهٔ جدیدی برگزینید.
+'passwordremindertext'       => 'یک ن�ر (احتمالاً خود شما، با نشانی اینترنتی $1) گذرواژهٔ جدیدی برای  حساب کاربری‌ شما در {{SITENAME}} درخواست کرده‌است ($4). یک گذرواژهٔ موقت برای کاربر «$2» ساخته شده و برابر با «$3» قرار داده شده‌است. اگر هد� شما همین بوده‌است، شما باید به سیستم وارد شوید و گذرواژهٔ جدیدی برگزینید.
 
 اگر کس دیگری این درخواست را کرده‌است یا اینکه شما گذرواژهٔ پیشین خود را به یاد آورده‌اید و دیگر تمایل به تغییر آن ندارید، می‌توانید این پیغام را نادیده بگیرید و همان گذرواژهٔ پیشین را به کار برید.',
 'noemail'                    => 'هیچ نشانی پست الکترونیکی‌ای برای کاربر «$1» ثبت نشده است.',
@@ -707,10 +811,11 @@ $2',
 'throttled-mailpassword'     => 'یک یادآور گذرواژه در $1 {{PLURAL:$1|ساعت|ساعت}} گذشته برای شما �رستاده شده‌است.
 برای جلوگیری از سوءاست�اده هر  $1 ساعت تنها یک یادآوری �رستاده می‌شود.',
 'mailerror'                  => 'خطا در �رستادن نامهٔ الکترونیکی : $1',
-'acct_creation_throttle_hit' => 'شرمنده! شما در حال حاضر، $1 حساب کاربری ساخته‌اید. نمی‌توانید یکی دیگر بسازید.',
-'emailauthenticated'         => 'نشانی پست الکترونیکی شما در $1 تصدیق شد.',
+'acct_creation_throttle_hit' => 'بازدیدکنندگان این ویکی که از نشانی آی‌پی شما است�اده می‌کنند در روز گذشته {{PLURAL:$1|یک حساب کاربری|$1 حساب کاربری}} ساخته‌اند، که بیشترین تعداد مجاز در آن بازهٔ زمانی است.
+به همین خاطر، بازدیدکنندگانی که از این نشانی آی‌پی است�اده می‌کنند نمی‌توانند در حال حاضر حساب جدیدی بسازند.',
+'emailauthenticated'         => 'نشانی پست الکترونیکی شما در $2 ساعت $3 تصدیق شد.',
 'emailnotauthenticated'      => 'نشانی پست الکترونیکی شما <strong>هنوز تصدیق نشده است.</strong> هیچ نامهٔ الکترونیکی‌ای برای هر یک از ویژگی‌های زیر ارسال نخواهد شد.',
-'noemailprefs'               => '<strong>برای راه‌اندازی این قابلیت‌ها یک نشانی پست الکترونیکی مشخص کنید.</strong>',
+'noemailprefs'               => 'برای راه‌اندازی این قابلیت‌ها یک نشانی پست الکترونیکی مشخص کنید.',
 'emailconfirmlink'           => 'نشانی پست الکترونیکی خود را تأیید کنید',
 'invalidemailaddress'        => 'نشانی پست الکترونیکی وارد شده قابل قبول نیست، چرا که دارای ساختار نامعتبری است.
 لط�اً نشانی‌ای با ساختار صحیح وارد کنید و یا بخش مربوط را خالی بگذارید.',
@@ -723,18 +828,26 @@ $2',
 شما باید وارد سیستم شوید تا گذرواژهٔ خود را تغییر بدهید.
 
 اگر این حساب اشتباهی ساخته شده است، این پیغام را نادیده بگیرید.',
+'login-throttled'            => 'شما به تازگی چندین بار تلاش کرده‌اید که گذرواژهٔ این حساب کاربری را وارد کنید. لط�اً پیش از آن که دوباره تلاش کنید، صبر کنید.',
 'loginlanguagelabel'         => 'زبان: $1',
 
 # Password reset dialog
-'resetpass'               => 'ص�رکردن گذرواژهٔ حساب کاربری',
-'resetpass_announce'      => 'شما با کد موقتی پست‌شده وارد شده‌اید. برای انجام �رایند ورود به سیستم باید گذروازهٔ جدیدی وارد کنید:',
-'resetpass_text'          => '<!-- اینجا متن اضا�ه کنید -->',
-'resetpass_header'        => 'تغییر گذرواژهٔ حساب کاربری',
-'resetpass_submit'        => 'تنظیم گذرواژه و ورود به سیستم',
-'resetpass_success'       => 'گذرواژهٔ شما با مو�قیت تغییر داده شد. در حال وارد کردن شما به سیستم....',
-'resetpass_bad_temporary' => 'گذرواژهٔ موقت نامعتبر است. احتمالاً پیشتر گذرواژهٔ خود را با مو�قیت تغییر داده‌اید یا گذرواژهٔ موقت جدیدی درخواسته‌اید.',
-'resetpass_forbidden'     => 'نمی‌توان گذرواژه‌ها را تغییر داد',
-'resetpass_missing'       => 'اطلاعاتی برای کارگزار �رستاده نشده‌است',
+'resetpass'                 => 'تغییر گذرواژه',
+'resetpass_announce'        => 'شما با کد موقتی پست‌شده وارد شده‌اید. برای انجام �رایند ورود به سیستم باید گذروازهٔ جدیدی وارد کنید:',
+'resetpass_text'            => '<!-- اینجا متن اضا�ه کنید -->',
+'resetpass_header'          => 'تغییر گذرواژهٔ حساب کاربری',
+'oldpassword'               => 'گذرواژهٔ پیشین',
+'newpassword'               => 'گذرواژهٔ جدید',
+'retypenew'                 => 'گذرواژهٔ جدید را دوباره وارد کنید',
+'resetpass_submit'          => 'تنظیم گذرواژه و ورود به سیستم',
+'resetpass_success'         => 'گذرواژهٔ شما با مو�قیت تغییر داده شد. در حال وارد کردن شما به سیستم....',
+'resetpass_bad_temporary'   => 'گذرواژهٔ موقت نامعتبر است. احتمالاً پیشتر گذرواژهٔ خود را با مو�قیت تغییر داده‌اید یا گذرواژهٔ موقت جدیدی درخواسته‌اید.',
+'resetpass_forbidden'       => 'نمی‌توان گذرواژه‌ها را تغییر داد',
+'resetpass-no-info'         => 'برای دسترسی مستقیم به این ص�حه شما باید به سیستم وارد شده باشید.',
+'resetpass-submit-loggedin' => 'تغییر گذرواژه',
+'resetpass-wrong-oldpass'   => 'گذرواژهٔ موقت یا اخیر نامعتبر. 
+ممکن است که شما همینک گذرواژه‌تان را با مو�قیت تغییر داده باشید یا درخواست یک گذرواژهٔ موقت جدید کرده باشید.',
+'resetpass-temp-password'   => 'گذرواژهٔ موقت:',
 
 # Edit page toolbar
 'bold_sample'     => 'متن پررنگ',
@@ -759,8 +872,8 @@ $2',
 'hr_tip'          => 'خط ا�قی (در کاربرد آن امساک کنید)',
 
 # Edit pages
-'summary'                          => 'خلاصه',
-'subject'                          => 'موضوع/عنوان',
+'summary'                          => 'خلاصه:',
+'subject'                          => 'موضوع/عنوان:',
 'minoredit'                        => 'این ویرایش جزئی است',
 'watchthis'                        => 'پی‌گیری این ص�حه',
 'savearticle'                      => 'ص�حه ذخیره شود',
@@ -768,14 +881,14 @@ $2',
 'showpreview'                      => 'پیش‌نمایش',
 'showlivepreview'                  => 'پیش‌نمایش زنده',
 'showdiff'                         => 'نمایش تغییرات',
-'anoneditwarning'                  => 'شما با نام کاربری وارد نشده‌اید. نشانی IP شما در تاریخچهٔ ویرایش‌های این ص�حه ثبت خواهد شد.',
+'anoneditwarning'                  => 'شما با نام کاربری وارد نشده‌اید. نشانی آی شما در تاریخچهٔ ویرایش‌های این ص�حه ثبت خواهد شد.',
 'missingsummary'                   => "'''یادآوری:''' شما خلاصهٔ ویرایش ننوشته‌اید. اگر دوباره ''ذخیره'' را کلیک کنید ویرایشتان بدون خلاصه ذخیره خواهد شد.",
 'missingcommenttext'               => 'لط�اً توضیحی در زیر بی�زایید.',
 'missingcommentheader'             => "یادآوری: '''شما موضوع/عنوان این یادداشت را مشخص نکرده‌اید.''' اگر دوباره دکمهٔ ذخیره را �شار دهید ویرایش شما بدون آن ذخیره خواهد شد.",
-'summary-preview'                  => 'پیش‌نمایش خلاصه',
-'subject-preview'                  => 'پیش‌نمایش موضوع/عنوان',
+'summary-preview'                  => 'پیش‌نمایش خلاصه:',
+'subject-preview'                  => 'پیش‌نمایش موضوع/عنوان:',
 'blockedtitle'                     => 'کاربر بسته شد.',
-'blockedtext'                      => "<big>'''دسترسی نام کاربری یا نشانی اینترنتی شما بسته شده است.'''</big>
+'blockedtext'                      => "<big>'''دسترسی نام کاربری یا نشانی آی‌پی شما بسته شده است.'''</big>
 
 این کار توسط $1 انجام شده‌است.
 دلیل داده‌شده این است: $2''
@@ -788,13 +901,13 @@ $2',
 
 توجه کنید که شما نمی‌توانید از امکان «�رستادن پست الکترونیکی به این کاربر» است�اده کنید مگر اینکه نشانی پست الکترونیکی معتبری در [[Special:Preferences|ترجیحات کاربری]]‌تان ثبت کرده باشید.
 
-نشانی IP شما $3 و شماره قطع دسترسی شما $5 است. لط�اً این شماره‌ها را در کلیهٔ پرس‌وجوهایتان ذکر کنید.
+نشانی آی‌پی شما $3 و شماره قطع دسترسی شما $5 است. لط�اً این شماره‌ها را در کلیهٔ پرس‌وجوهایتان ذکر کنید.
 
 شما می‌توانید با $1 یا یکی دیگر از [[{{MediaWiki:Grouppage-sysop}}|مدیران]] تماس بگیرید، تا در مورد این قطع دسترسی صحبت کنید.
 توجه کنید که برای ارسال پست الکترونیکی در ویکی، باید پست الکترونیکی خود را از طریق ص�حهٔ [[Special:Preferences|تنظیمات]] �عال کرده باشید، و نیز، باید امکان است�اده از این ویژگی برای شما قطع نباشد.
-نشانی اینترنتی �علی شما $3 است و شماره قطع دسترسی $5 است.
+نشانی آی‌پی �علی شما $3 است و شماره قطع دسترسی $5 است.
 لط�اً این شماره را در هر درخواستی که در این باره مطرح می‌کنید قید کنید.",
-'autoblockedtext'                  => "دسترسی نشانی اینترنتی (IP) شما قطع شده‌است، چرا که این نشانی اینترنتی توسط یک کاربر است�اده می‌شده که دسترسی او توسط $1 قطع گردیده‌است.
+'autoblockedtext'                  => "دسترسی نشانی اینترنتی (آی‌پی) شما قطع شده‌است، چرا که این نشانی اینترنتی توسط یک کاربر است�اده می‌شده که دسترسی او توسط $1 قطع گردیده‌است.
 علت ذکر شده چنین است:
 
 :''$2''
@@ -807,7 +920,7 @@ $2',
 
 توجه کنید که برای ارسال پست الکترونیکی در ویکی، باید پست الکترونیکی خود را از طریق ص�حهٔ [[Special:Preferences|تنظیمات]] �عال کرده باشید، و نیز، باید امکان است�اده از این ویژگی برای شما قطع نباشد.
 
-نشانی اینترنتی �علی شما $3 است و شماره قطع دسترسی $5 است.
+نشانی آی‌پی �علی شما $3 است و شماره قطع دسترسی $5 است.
 لط�اً این شماره را در هر درخواستی که در این باره مطرح می‌کنید قید کنید.",
 'blockednoreason'                  => 'دلیلی مشخص نشده‌است',
 'blockedoriginalsource'            => "متن مبدأ '''$1''' در زیر نمایش داده شده است:",
@@ -828,38 +941,41 @@ $2',
 برای ایجاد ص�حه، در مستطیل زیر شروع به تایپ کنید (برای اطلاعات بیشتر به [[{{ns:project}}:راهنما|ص�حهٔ راهنما]] مراجعه کنید).
 اگر به اشتباه اینجا آمده‌اید، دکمهٔ «بازگشت» مرورگرتان را بزنید.',
 'anontalkpagetext'                 => "---- ''این ص�حه‌ی بحث برای کاربر گمنامی است که هنوز حسابی درست نکرده است یا از آن است�اده نمی‌کند.
-بنابراین برای شناسایی‌اش مجبوریم از نشانی IP عددی است�اده کنیم.
-چنین نشانی‌های IPای ممکن است توسط چندین کاربر به شکل مشترک است�اده شود.
+بنابراین برای شناسایی‌اش مجبوریم از نشانی آی‌پی عددی است�اده کنیم.
+چنین نشانی‌های آی‌پی ممکن است توسط چندین کاربر به شکل مشترک است�اده شود.
 اگر شما کاربر گمنامی هستید و تصور می‌کنید اظهار نظرات نامربوط به شما صورت گر�ته است،
 لط�اً برای پیشگیری از اشتباه گر�ته شدن با کاربران گمنام دیگر در آیند [[Special:UserLogin|حسابی ایجاد کنید یا به سیستم وارد شوید]].''",
-'noarticletext'                    => 'در حال حاضر این ص�حه متنی ندارد، شما می‌توانید [[Special:Search/{{PAGENAME}}|عنوان این ص�حه را در ص�حه‌های دیگر جستجو کنید]] یا [{{fullurl:{{FULLPAGENAME}}|action=edit}} این ص�حه را ویرایش کنید].',
+'noarticletext'                    => 'در حال حاضر این ص�حه متنی ندارد.
+شما می‌توانید [[Special:Search/{{PAGENAME}}|عنوان این ص�حه را در ص�حه‌های دیگر جستجو کنید]]،
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} سیاهه‌های مرتبط را جستجو کنید]،
+یا [{{fullurl:{{FULLPAGENAME}}|action=edit}} این ص�حه را ویرایش کنید]</span>.',
 'userpage-userdoesnotexist'        => 'حساب کاربر «$1» ثبت نشده است. اطمینان حاصلی کنید که می‌خواهید این ص�حه را ایجاد یا ویرایش کنید.',
 'clearyourcache'                   => "'''نکته:''' پس از ذخیره‌سازی ممکن است برای دیدن تغییرات نیاز باشد که حا�ظهٔ نهانی مرورگر خود را خالی کنید. '''موزیلا / �ایر�اکس / Safari:'''  کلید '''Shift''' را نگه‌دارید و روی دکمهٔ '''Reload''' کلیک کنید، یا کلید‌های '''Ctrl-Shift-R''' را با هم �شار دهید (در رایانه‌های اپل مکینتاش کلید‌های '''Cmd-Shift-R''')؛ '''اینترنت اکسپلورر:''' کلید '''Ctrl''' نگه‌دارید و روی دکمهٔ '''Refresh''' کلیک‌ کنید، یا کلید‌های '''Ctrl-F5''' را با هم �شار دهید؛ '''Konqueror:''' روی دکمهٔ '''Reload''' کلیک کنید و یا کلید '''F5''' را �شار دهید؛ '''ا�پرا:''' کاربران ا�پرا ممکن است لازم باشد که بطور کامل حا�ظهٔ نهانی مرورگر را در منوی ''Tools&rarr;Preferences'' خالی کنند.",
-'usercssjsyoucanpreview'           => "<strong>نکته:</strong> قبل از این که �ایل CSS یا JS خود را ذخیره کنید، با است�اده از دکمه '''پیش‌نمایش''' می‌توان آن را آزمایش کنید.",
+'usercssjsyoucanpreview'           => "'''نکته:''' قبل از این که �ایل CSS یا JS خود را ذخیره کنید، با است�اده از دکمه '''پیش‌نمایش''' می‌توان آن را آزمایش کنید.",
 'usercsspreview'                   => "'''�راموش نکنید که سی‌اس‌اس کاربریتان �قط پیش‌نمایش یا�ته‌است و هنوز ذخیره نشده‌است!'''",
 'userjspreview'                    => "'''�راموش مکنید که شما �قط دارید جاوااسکریپت کاربریتان را امتحان می‌کنید/پیش‌نمایشش را می‌بینید. هنوز ذخیره نشده‌است!'''",
 'userinvalidcssjstitle'            => "'''هشدار:''' پوسته‌ای به نام «$1» وجود ندارد.
 به یاد داشته باشید که ص�حه‌های شخصی &#8206;.css و &#8206;.js باید عنوانی با حرو� کوچک داشته باشند؛ نمونه: {{ns:user}}:�و/monobook.css در مقابل {{ns:user}}:�و/Monobook.css.",
 'updated'                          => '(به‌روز شد)',
-'note'                             => '<strong>نکته:</strong>',
-'previewnote'                      => '<strong>توجه کنید که این �قط پیش‌نمایش است، و ذخیره نشده است!</strong>',
+'note'                             => "'''نکته:'''",
+'previewnote'                      => "'''توجه کنید که این �قط پیش‌نمایش است، و ذخیره نشده است!'''",
 'previewconflict'                  => 'این پیش‌نمایش منعکس‌کنندهٔ متن ناحیهٔ ویرایش متن بالایی است،
 به شکلی که اگر بخواهید متن را ذخیره کنید نشان داده خواهد شد.',
-'session_fail_preview'             => '<strong>شرمنده! به دلیل از دست ر�تن اطلاعات نشست کاربری، نمی‌توانیم ویرایش شما را پردازش کنیم.
+'session_fail_preview'             => "'''شرمنده! به دلیل از دست ر�تن اطلاعات نشست کاربری، نمی‌توانیم ویرایش شما را پردازش کنیم.
 لط�اً دوباره سعی کنید.
-در صورتی که باز هم با همین پیام مواجه شدید، از سیستم [[Special:UserLogout|خارج شوید]] و مجدداً وارد شوید.</strong>',
-'session_fail_preview_html'        => "<strong>متاس�انه امکان ثبت ویرایش شما به خاطر از دست ر�تن اطلاعات نشست کاربری وجود ندارد.</strong>
+در صورتی که باز هم با همین پیام مواجه شدید، از سیستم [[Special:UserLogout|خارج شوید]] و مجدداً وارد شوید.'''",
+'session_fail_preview_html'        => "'''متاس�انه امکان ثبت ویرایش شما به خاطر از دست ر�تن اطلاعات نشست کاربری وجود ندارد.'''
 
 ''با توجه به این که در {{SITENAME}} امکان درج اچ‌تی‌ام‌ال خام �عال است، پیش‌نمایش ص�حه پنهان شده تا امکان حملات مبتنی بر جاوااسکریپت وجود نداشته باشد.''
 
-<strong>اگر مطمئن هستید که این پیش‌نمایش یک ویرایش مجاز است، آن را تکرار کنید.
-اگر تکرار پیش‌نمایش نتیجه نداد، از سیستم [[Special:UserLogout|خارج شوید]] و دوباره وارد شوید.</strong>",
+'''اگر مطمئن هستید که این پیش‌نمایش یک ویرایش مجاز است، آن را تکرار کنید.
+اگر تکرار پیش‌نمایش نتیجه نداد، از سیستم [[Special:UserLogout|خارج شوید]] و دوباره وارد شوید.'''",
 'token_suffix_mismatch'            => "'''ویرایش شما ذخیره نشد، زیرا مرورگر شما نویسه‌های نقطه‌گذاری را از هم پاشیده‌است. 
 ویرایش شما ذخیره نشد تا از خراب شدن متن ص�حه جلوگیری شود. 
 گاهی این اشکال زمانی پیش می‌آید که شما از یک برنامه تحت وب حدواسط (web-based proxy) است�اده کنید.'''",
 'editing'                          => 'در حال ویرایش $1',
 'editingsection'                   => 'در حال ویرایش $1 (بخش)',
-'editingcomment'                   => 'در حال ویرایش $1 (یادداشت)',
+'editingcomment'                   => 'در حال ویرایش $1 (بخش جدید)',
 'editconflict'                     => 'تعارض ویرایشی: $1',
 'explainconflict'                  => 'از وقتی شما ویرایش این ص�حه را آغاز کرده‌اید شخص دیگری آن را تغییر داده است.
 ناحیهٔ متنی بالایی شامل متن ص�حه به شکل �علی آن است.
@@ -869,25 +985,26 @@ $2',
 'yourtext'                         => 'متن شما',
 'storedversion'                    => 'نسخهٔ ضبط‌شده',
 'nonunicodebrowser'                => "'''هشدار: مرورگر شما با استانداردهای یونیکد سازگار نیست.''' کاراکترهای غیر ASCII به صورت اعداد در مبنای شانزده به شما نشان داده می‌شوند.",
-'editingold'                       => '<strong>هشدار:
+'editingold'                       => "'''هشدار:
 شما دارید نسخهٔ قدیمی‌ای از این ص�حه را ویرایش می‌کنید.
-اگر ذخیره‌اش کنید، هر تغییری که پس از این نسخه انجام شده از بین خواهد ر�ت.</strong>',
+اگر ذخیره‌اش کنید، هر تغییری که پس از این نسخه انجام شده از بین خواهد ر�ت.'''",
 'yourdiff'                         => 'ت�اوت‌ها',
-'copyrightwarning'                 => 'لط�اً توجه داشته باشید که �رض می‌شود کلیهٔ مشارکت‌های شما با {{SITENAME}} تحت «$2» منتشر می‌شوند (برای جزئیات بیشتر به $1 مراجعه کنید). اگر نمی‌خواهید نوشته‌هایتان بی‌رحمانه ویرایش شده و به دلخواه توزیع شود، اینجا ن�رستیدشان.<br />
-همینطور شما دارید به ما قول می‌دهید که خودتان این را نوشته‌اید، یا آن را از یک منبع آزاد با مالکیت عمومی یا مشابه آن برداشته‌اید. <strong>کارهای دارای حق انحصاری تکثیر (copyright) را بی‌اجازه ن�رستید!</strong>',
-'copyrightwarning2'                => 'لط�اً توجه داشته باشید که �رض می‌شود کلیهٔ مشارکت‌های شما با {{SITENAME}} تحت «اجازه‌نامهٔ مستندات آزاد گنو» منتشر می‌شوند (برای جزئیات بیشتر به $1 مراجعه کنید). اگر نمی‌خواهید نوشته‌هایتان بی‌رحمانه ویرایش شده و به دلخواه توزیع شود، اینجا ن�رستیدشان.<br />
-همینطور شما دارید به ما قول می‌دهید که خودتان این را نوشته‌اید، یا آن را از یک منبع آزاد با مالکیت عمومی یا مشابه آن برداشته‌اید. <strong>کارهای دارای حق انحصاری تکثیر (copyright) را بی‌اجازه ن�رستید!</strong>',
-'longpagewarning'                  => '<strong>هشدار: این ص�حه $1 کیلوبایت طول دارد؛
+'copyrightwarning'                 => "لط�اً توجه داشته باشید که �رض می‌شود کلیهٔ مشارکت‌های شما با {{SITENAME}} تحت «$2» منتشر می‌شوند (برای جزئیات بیشتر به $1 مراجعه کنید). اگر نمی‌خواهید نوشته‌هایتان بی‌رحمانه ویرایش شده و به دلخواه توزیع شود، اینجا ن�رستیدشان.<br />
+همینطور شما دارید به ما قول می‌دهید که خودتان این را نوشته‌اید، یا آن را از یک منبع آزاد با مالکیت عمومی یا مشابه آن برداشته‌اید. '''کارهای دارای حق انحصاری تکثیر (copyright) را بی‌اجازه ن�رستید!'''",
+'copyrightwarning2'                => "لط�اً توجه داشته باشید که �رض می‌شود کلیهٔ مشارکت‌های شما با {{SITENAME}} تحت «اجازه‌نامهٔ مستندات آزاد گنو» منتشر می‌شوند (برای جزئیات بیشتر به $1 مراجعه کنید). اگر نمی‌خواهید نوشته‌هایتان بی‌رحمانه ویرایش شده و به دلخواه توزیع شود، اینجا ن�رستیدشان.<br />
+همینطور شما دارید به ما قول می‌دهید که خودتان این را نوشته‌اید، یا آن را از یک منبع آزاد با مالکیت عمومی یا مشابه آن برداشته‌اید. '''کارهای دارای حق انحصاری تکثیر (copyright) را بی‌اجازه ن�رستید!'''",
+'longpagewarning'                  => "'''هشدار: این ص�حه $1 کیلوبایت طول دارد؛
 بعضی مرورگرها ممکن با ویرایش ص�حه‌های نزدیک به ۳۲ کیلوبایت یا طولانی‌تر از آن مشکلاتی داشته باشند.
-لط�اً دربارهٔ شکستن این ص�حه به قسمت‌های کوچکتر �کر کنید.</strong>',
-'longpageerror'                    => '<strong>خطا: متنی که ارسال کرده‌اید $1 کیلوبایت طول دارد. این مقدار از مقدار بیشینهٔ $2 کیلوبایت بیشتر است. نمی‌توان ذخیره‌اش کرد.</strong>',
-'readonlywarning'                  => '<strong>هشدار: پایگاه داده برای نگهداری ق�ل شده است،
-بنابراین نمی‌توانید ویرایش‌هایتان را همین الآن ذخیره کنید.
-اگر می‌خواهید متن را در یک پروندهٔ متنی ببرید و بچسبانید و برای آینده ذخیره‌اش کنید.</strong>',
+لط�اً دربارهٔ شکستن این ص�حه به قسمت‌های کوچکتر �کر کنید.'''",
+'longpageerror'                    => "'''خطا: متنی که ارسال کرده‌اید $1 کیلوبایت طول دارد. این مقدار از مقدار بیشینهٔ $2 کیلوبایت بیشتر است. نمی‌توان ذخیره‌اش کرد.'''",
+'readonlywarning'                  => "'''هشدار: پایگاه داده برای نگهداری ق�ل شده است، به همین خاطر نمی‌توانید ویرایش‌هایتان را همین الآن ذخیره کنید.
+اگر می‌خواهید متن را در یک پروندهٔ متنی ببرید و بچسبانید و برای آینده ذخیره‌اش کنید.
+
+مدیری که پایگاه داده را ق�ل کرد این توضیح را ارائه کرد: $1'''",
 'protectedpagewarning'             => 'هشدار: این ص�حه ق�ل شده است تا �قط کاربران با امتیاز مدیر (یا بالاتر) بتوانند ویرایشش کنند.',
 'semiprotectedpagewarning'         => "'''توجه:''' این ص�حه ق�ل شده‌است تا تنها کاربران ثبت‌نام‌کرده قادر به ویرایش آن‌ باشند.",
 'cascadeprotectedwarning'          => "'''هشدار:''' این ص�حه به علت قرارگر�تن در {{PLURAL:$1|ص�حهٔ|ص�حه‌های}} آبشاری-محا�ظت‌شدهٔ زیر ق�ل شده‌است تا �قط مدیران بتوانند ویرایشش کنند.",
-'titleprotectedwarning'            => '<strong>هشدار: این ص�حه ق�ل شده‌است به شکلی که �قط برخی کاربران می‌توانند آن را ایجاد کنند.</strong>',
+'titleprotectedwarning'            => "هشدار: این ص�حه ق�ل شده‌است به شکلی که برای ایجاد آن [[Special:ListGroupRights|اختیارات خاصی]] لازم است.'''",
 'templatesused'                    => 'الگوهای است�اده شده در این ص�حه:',
 'templatesusedpreview'             => 'الگوهای است�اده شده در این پیش‌نمایش:',
 'templatesusedsection'             => 'الگوهای است�اده‌شده در این بخش:',
@@ -902,11 +1019,21 @@ $2',
 'permissionserrorstext'            => 'شما اجازهٔ انجام این کار را به {{PLURAL:$1|دلیل|دلایل}} زیر ندارید:',
 'permissionserrorstext-withaction' => 'شما اجازهٔ $2 را به {{PLURAL:$1|دلیل|دلایل}} رو به رو ندارید:',
 'recreate-deleted-warn'            => "'''هشدار: شما در حال ایجاد کردن دوبارهٔ ص�حه‌ای هستید که قبلاً حذ� شده‌است.''' در نظر داشته باشید که آیا ادامهٔ ویرایش این ص�حه کار مناسبی هست یا نه. سیاههٔ حذ� مربوط به این ص�حه برای راحتی در ادامه آمده‌است:",
+'deleted-notice'                   => 'این ص�حه حذ� شده‌است. سیاههٔ حذ� این ص�حه در زیر آمده‌است.',
+'deletelog-fulllog'                => 'مشاهدهٔ سیاههٔ کامل',
+'edit-hook-aborted'                => 'ویرایش توسط قلاب لغو شد.
+توضیحی در این مورد داده نشد.',
+'edit-gone-missing'                => 'امکان به روز کردن ص�حه وجود ندارد.
+به نظرمیرسد که ص�حه حذ� شده باشد.',
+'edit-conflict'                    => 'تعارض ویرایشی.',
+'edit-no-change'                   => 'ویرایش شما نادیده گر�ته شد، زیرا تغییری در متن داده نشده بود.',
+'edit-already-exists'              => 'امکان ساختن ص�حه جدید وجود ندارد.
+این ص�حه از قبل وجود دارد.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'هشدار: این ص�حه حاوی تعدادی زیادی �راخوانی دستورهای تجزیه‌گر است.
 
-تعداد آن باید از $2 کمتر باشد، و اینک $1 است.',
+تعداد آن‌ها باید کمتر از $2 {{PLURAL:$2|�راخوانی|�راخوانی}} باشد، و اینک {{PLURAL:$1|$1 �راخوانی|$1 �راخوانی}} است.',
 'expensive-parserfunction-category'       => 'ص�حه‌هایی که حاوی تعداد زیادی �راخوانی دستورهای تجزیه‌گر هستند',
 'post-expand-template-inclusion-warning'  => 'هشدار: الگو بیش از اندازه بزرگ است.
 برخی الگوها ممکن است شامل نشوند.',
@@ -914,6 +1041,8 @@ $2',
 'post-expand-template-argument-warning'   => 'هشدار: این ص�حه شامل دست کم یک پارامتر الگو است که بیش از اندازه بزرگ است.
 این پارامترها نادیده گر�ته شدند.',
 'post-expand-template-argument-category'  => 'ص�حه‌های دارای الگوهایی با پارامترهای نادیده گر�ته شده',
+'parser-template-loop-warning'            => 'حلقه در الگو پیدا شد: [[$1]]',
+'parser-template-recursion-depth-warning' => 'محدودیت عمق بازگشت الگو رد شد ($1)',
 
 # "Undo" feature
 'undo-success' => 'این ویرایش خنثی شده‌است. لط�اً پس از کسب اطمینان تغییرات نشان‌دا‌ده‌شده را ذخیره کنید.',
@@ -928,29 +1057,28 @@ $2',
 دلیل ارائه شده چنین بوده است: $2",
 
 # History pages
-'viewpagelogs'        => 'نمایش سیاهه‌های مربوط به این ص�حه',
-'nohistory'           => 'این ص�حه تاریخچهٔ ویرایش ندارد.',
-'revnotfound'         => 'نسخه یا�ت نشد',
-'revnotfoundtext'     => 'نسخهٔ قدیمی‌ای از ص�حه که درخواسته بودید یا�ت نشد.
-لط�اً URLی را که برای دسترسی به این ص�حه است�اده کرده‌اید، بررسی کنید.',
-'currentrev'          => 'نسخهٔ �علی',
-'revisionasof'        => 'نسخهٔ $1',
-'revision-info'       => '�ویرایش در تاریخ $1 توسط $2',
-'previousrevision'    => '→ نسخهٔ قدیمی‌تر',
-'nextrevision'        => 'نسخهٔ جدیدتر�',
-'currentrevisionlink' => 'نمایش نسخهٔ �علی',
-'cur'                 => '�علی',
-'next'                => 'بعدی',
-'last'                => 'قبلی',
-'page_first'          => 'نخست',
-'page_last'           => 'واپسین',
-'histlegend'          => 'شرح: (�علی) = ت�اوت با نسخهٔ �علی،
+'viewpagelogs'           => 'نمایش سیاهه‌های مربوط به این ص�حه',
+'nohistory'              => 'این ص�حه تاریخچهٔ ویرایش ندارد.',
+'currentrev'             => 'نسخهٔ �علی',
+'currentrev-asof'        => 'نسخهٔ کنونی تا $1',
+'revisionasof'           => 'نسخهٔ $1',
+'revision-info'          => '�ویرایش در تاریخ $1 توسط $2', # Additionally available: $3: revision id
+'previousrevision'       => '→ نسخهٔ قدیمی‌تر',
+'nextrevision'           => 'نسخهٔ جدیدتر�',
+'currentrevisionlink'    => 'نمایش نسخهٔ �علی',
+'cur'                    => '�علی',
+'next'                   => 'بعدی',
+'last'                   => 'قبلی',
+'page_first'             => 'نخست',
+'page_last'              => 'واپسین',
+'histlegend'             => 'شرح: (�علی) = ت�اوت با نسخهٔ �علی،
 (قبلی) = ت�اوت با نسخهٔ قبلی، جز = ویرایش جزئی',
-'deletedrev'          => '[حذ�‌شده]',
-'histfirst'           => 'قدیمی‌ترین',
-'histlast'            => 'جدیدترین',
-'historysize'         => '({{PLURAL:$1|۱ بایت|$1 بایت}})',
-'historyempty'        => '(خالی)',
+'history-fieldset-title' => 'مرور تاریخچه',
+'deletedrev'             => '[حذ�‌شده]',
+'histfirst'              => 'قدیمی‌ترین',
+'histlast'               => 'جدیدترین',
+'historysize'            => '({{PLURAL:$1|۱ بایت|$1 بایت}})',
+'historyempty'           => '(خالی)',
 
 # Revision feed
 'history-feed-title'          => 'تاریخچهٔ ویرایش‌ها',
@@ -976,7 +1104,7 @@ $2',
 'revdelete-hide-text'         => 'نه�تن متن نسخه',
 'revdelete-hide-name'         => 'نه�تن عمل و هد�',
 'revdelete-hide-comment'      => 'نه�تن توضیح ویرایش',
-'revdelete-hide-user'         => 'نام کاربری/نشانی IP ویراستار مخ�ی شود',
+'revdelete-hide-user'         => 'نام کاربری/نشانی آی‌پی ویراستار مخ�ی شود',
 'revdelete-hide-restricted'   => 'اعمال این تغییرات بر مدیران به همراه دیگران',
 'revdelete-suppress'          => 'از دسترسی مدیران به داده نیز مانند سایر کاربران جلوگیری به عمل آید.',
 'revdelete-hide-image'        => 'نه�تن محتویات پرونده',
@@ -1029,6 +1157,7 @@ $2',
 'mergehistory-invalid-destination' => 'ص�حهٔ مقصد باید عنوان قابل قبولی داشته باشد.',
 'mergehistory-autocomment'         => '[[:$1]] را در [[:$2]] ادغام کرد',
 'mergehistory-comment'             => '[[:$1]] را در [[:$2]] ادغام کرد: $3',
+'mergehistory-same-destination'    => 'ص�حهٔ مبدا و مقصد نمی‌تواند یکی باشد',
 
 # Merge log
 'mergelog'           => 'سیاهه ادغام',
@@ -1041,120 +1170,202 @@ $2',
 'difference'              => '(ت�اوت بین نسخه‌ها)',
 'lineno'                  => 'سطر $1:',
 'compareselectedversions' => 'مقایسهٔ نسخه‌های انتخاب‌شده',
+'visualcomparison'        => 'مقایسهٔ دیداری',
+'wikicodecomparison'      => 'مقایسهٔ کد ویکی',
 'editundo'                => 'خنثی‌سازی',
 'diff-multi'              => '({{PLURAL:$1||$1&nbsp;}}ویرایش میانی نشان داده نشده‌است.)',
+'diff-movedto'            => 'به $1 منتقل شد',
+'diff-styleadded'         => 'سبک $1 ا�زوده شد',
+'diff-added'              => '$1 ا�زوده شد',
+'diff-changedto'          => 'به $1 تغییر یا�ت',
+'diff-movedoutof'         => 'از $1 خارج شد',
+'diff-styleremoved'       => 'سبک $1 برداشته شد',
+'diff-removed'            => '$1 برداشته شد',
+'diff-changedfrom'        => 'از $1 تغییر یا�ت',
+'diff-src'                => 'منبع',
+'diff-withdestination'    => 'با مقصد $1',
+'diff-with'               => '&#32;با $1 $2',
+'diff-with-final'         => '&#32;Ùˆ $1 $2',
+'diff-width'              => 'پهنا',
+'diff-height'             => 'بلندی',
+'diff-p'                  => "یک '''بند'''",
+'diff-blockquote'         => "یک '''نقل قول'''",
+'diff-h1'                 => "یک '''عنوان (سطح ۱)'''",
+'diff-h2'                 => "یک '''عنوان (سطح ۲)'''",
+'diff-h3'                 => "یک '''عنوان (سطح ۳)'''",
+'diff-h4'                 => "یک '''عنوان (سطح ۴)'''",
+'diff-h5'                 => "یک '''عنوان (سطح ۵)'''",
+'diff-pre'                => "یک '''قطعهٔ از پیش قالب‌بندی شده",
+'diff-div'                => "یک '''بخش'''",
+'diff-ul'                 => "یک '''�هرست غیر ترتیبی'''",
+'diff-ol'                 => "یک '''�هرست ترتیبی'''",
+'diff-li'                 => "یک '''مورد �هرست'''",
+'diff-table'              => "یک '''جدول'''",
+'diff-tbody'              => "یک '''محتوای جدول'''",
+'diff-tr'                 => "یک '''ردی�'''",
+'diff-td'                 => "یک '''خانه'''",
+'diff-th'                 => "یک '''عنوان'''",
+'diff-br'                 => "یک '''شکستگی'''",
+'diff-hr'                 => "یک '''خط ا�قی'''",
+'diff-code'               => "یک '''قطعه کد رایانه'''",
+'diff-dl'                 => "یک '''�هرست تعاری�'''",
+'diff-dt'                 => "یک '''عبارت تعری�'''",
+'diff-dd'                 => "یک '''تعری�'''",
+'diff-input'              => "یک '''ورودی'''",
+'diff-form'               => "یک '''�رم'''",
+'diff-img'                => "یک '''تصویر'''",
+'diff-span'               => "یک '''گستره'''",
+'diff-a'                  => "یک '''پیوند'''",
+'diff-i'                  => "'''کج'''",
+'diff-b'                  => "'''پررنگ'''",
+'diff-strong'             => "'''قوی'''",
+'diff-em'                 => "'''موکد'''",
+'diff-font'               => "'''قلم'''",
+'diff-big'                => "'''بزرگ'''",
+'diff-del'                => "'''حذ� شده'''",
+'diff-tt'                 => "'''با پهنای ثابت'''",
+'diff-sub'                => "'''بالانویس'''",
+'diff-sup'                => "'''پایین‌نویس'''",
+'diff-strike'             => "'''خط‌خورده'''",
 
 # Search results
-'searchresults'             => 'نتایج جستجو',
-'searchresulttext'          => 'برای اطلاعات بیشتر دربارهٔ جستجوی {{SITENAME}}، به [[{{ns:project}}:جستجو کردن|جستجوی {{SITENAME}}]] مراجعه کنید.',
-'searchsubtitle'            => '«[[:$1]]» را ج�ستید',
-'searchsubtitleinvalid'     => 'برای پرس‌وجوی «$1»',
-'noexactmatch'              => "'''ص�حه‌ای با عنوان دقیق \"\$1\" وجود ندارد.''' شما می‌توانید این ص�حه را [[:\$1|ایجاد کنید]].",
-'noexactmatch-nocreate'     => "'''ص�حه‌ای با عنوان «$1» وجود ندارد.'''",
-'toomanymatches'            => 'تعداد موارد مطابق خیلی زیاد بود، لط�اً درخواست دیگری را امتحان کنید',
-'titlematches'              => 'عنوان مقاله تطبیق می‌کند',
-'notitlematches'            => 'عنوان هیچ مقاله‌ای نمی‌خورد',
-'textmatches'               => 'متن مقاله تطبیق می‌کند',
-'notextmatches'             => 'متن هیچ مقاله‌ای نمی‌خورد',
-'prevn'                     => '$1تای قبلی',
-'nextn'                     => '$1تای بعدی',
-'viewprevnext'              => 'نمایش ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|یک کلمه|$2 کلمه}})',
-'search-result-score'       => 'ارتباط: $1%',
-'search-redirect'           => '(تغییر مسیر $1)',
-'search-section'            => '(بخض $1)',
-'search-suggest'            => 'آیا منظورتان این بود: $1',
-'search-interwiki-caption'  => 'پروژه‌های خواهر',
-'search-interwiki-default'  => '$1 :نتیجه',
-'search-interwiki-more'     => '(بیشتر)',
-'search-mwsuggest-enabled'  => 'با پیشنهاد',
-'search-mwsuggest-disabled' => 'هیچ پیشنهادی نیست',
-'search-relatedarticle'     => 'مرتبط',
-'mwsuggest-disable'         => 'پیشنهادهای مبتنی بر AJAX را غیر �عال کن',
-'searchrelated'             => 'مرتبط',
-'searchall'                 => 'همه',
-'showingresults'            => "نمایش {{PLURAL:$1|'''1''' نتیجه|'''$1''' نتیجه}} در پایین، آغاز از #'''$2'''.",
-'showingresultsnum'         => "نمایش '''$3''' {{PLURAL:$3|نتیجه|نتیجه}} در پایین، آغاز از #'''$2'''.",
-'showingresultstotal'       => "نمایش {{PLURAL:$3|نتیجهٔ '''$1''' از '''$3'''|نتیجه‌های '''$1 - $2''' از '''$3'''}}",
-'nonefound'                 => "<strong>نکته</strong>
-جستجوهای نامو�ق معمولاً به علت جستن واژگان متداولی چون ''از'' و ''را'' که �هرست نشده‌اند، رخ می‌دهد یا اینکه چندین گزارهٔ جستجو وارد می‌شود (�قط ص�حه‌هایی که حاوی همهٔ این گزاره‌ها باشند در نتیجه نمایش داده می‌شوند.).",
-'powersearch'               => 'جستجوی پیشر�ته',
-'powersearch-legend'        => 'جستجوی پیشر�ته',
-'powersearch-ns'            => 'جستجو در �ضاهای نام:',
-'powersearch-redir'         => 'تغییرمسیرها �هرست شوند',
-'powersearch-field'         => 'جستجو برای',
-'search-external'           => 'جستجوی خارجی',
-'searchdisabled'            => 'با عرض شرمندگی، جستجوی کل متن موقتاً از کار انداخته شده است. می‌توانید از جستجوی Google در پایین است�اده کنید. نتایج حاصل از جستجو با این روش ممکن است به‌روز نباشند.',
+'searchresults'                    => 'نتایج جستجو',
+'searchresults-title'              => 'نتایج جستجو برای «$1»',
+'searchresulttext'                 => 'برای اطلاعات بیشتر دربارهٔ جستجوی {{SITENAME}}، به [[{{ns:project}}:جستجو کردن|جستجوی {{SITENAME}}]] مراجعه کنید.',
+'searchsubtitle'                   => "شما '''[[:$1]]''' را جستید ([[Special:Prefixindex/$1|ص�حه‌هایی که با «$1» شروع می‌شوند]]{{int:pipe-separator}}
+[[Special:WhatLinksHere/$1|ص�حه‌هایی که به «$1» پیوند دارند]])",
+'searchsubtitleinvalid'            => 'برای پرس‌وجوی «$1»',
+'noexactmatch'                     => "'''ص�حه‌ای با عنوان دقیق \"\$1\" وجود ندارد.''' شما می‌توانید این ص�حه را [[:\$1|ایجاد کنید]].",
+'noexactmatch-nocreate'            => "'''ص�حه‌ای با عنوان «$1» وجود ندارد.'''",
+'toomanymatches'                   => 'تعداد موارد مطابق خیلی زیاد بود، لط�اً درخواست دیگری را امتحان کنید',
+'titlematches'                     => 'عنوان مقاله تطبیق می‌کند',
+'notitlematches'                   => 'عنوان هیچ مقاله‌ای نمی‌خورد',
+'textmatches'                      => 'متن مقاله تطبیق می‌کند',
+'notextmatches'                    => 'متن هیچ مقاله‌ای نمی‌خورد',
+'prevn'                            => '$1تای قبلی',
+'nextn'                            => '$1تای بعدی',
+'viewprevnext'                     => 'نمایش ($1) ($2) ($3).',
+'searchmenu-legend'                => 'گزینه‌های جستجو',
+'searchmenu-exists'                => "* ص�حهٔ '''[[$1]]'''",
+'searchmenu-new'                   => "'''ص�حهٔ «[[:$1]]» را روی این ویکی بسازید!'''",
+'searchhelp-url'                   => 'Help:راهنما',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|مرور ص�حه‌های با این پیشوند]]',
+'searchprofile-articles'           => 'ص�حه‌های محتوایی',
+'searchprofile-articles-and-proj'  => 'ص�حه‌های محتوایی و پروژه',
+'searchprofile-project'            => 'ص�حه‌های پروژه',
+'searchprofile-images'             => 'پرونده‌ها',
+'searchprofile-everything'         => 'همه‌چیز',
+'searchprofile-advanced'           => 'پیشر�ته',
+'searchprofile-articles-tooltip'   => 'جستجو در $1',
+'searchprofile-project-tooltip'    => 'جستجو در $1',
+'searchprofile-images-tooltip'     => 'جستجو برای پرونده‌ها',
+'searchprofile-everything-tooltip' => 'جستجوی تمام محتوا (شامل ص�حه‌های بحث)',
+'searchprofile-advanced-tooltip'   => 'جستجو در �ضاهای نام دلخواه',
+'prefs-search-nsdefault'           => 'جستجو با است�اده از پیش‌�رض‌ها:',
+'prefs-search-nscustom'            => 'جستجو در �ضاهای نام دلخواه:',
+'search-result-size'               => '$1 ({{PLURAL:$2|یک کلمه|$2 کلمه}})',
+'search-result-score'              => 'ارتباط: $1%',
+'search-redirect'                  => '(تغییر مسیر $1)',
+'search-section'                   => '(بخش $1)',
+'search-suggest'                   => 'آیا منظورتان این بود: $1',
+'search-interwiki-caption'         => 'پروژه‌های خواهر',
+'search-interwiki-default'         => '$1 :نتیجه',
+'search-interwiki-more'            => '(بیشتر)',
+'search-mwsuggest-enabled'         => 'با پیشنهاد',
+'search-mwsuggest-disabled'        => 'هیچ پیشنهادی نیست',
+'search-relatedarticle'            => 'مرتبط',
+'mwsuggest-disable'                => 'پیشنهادهای مبتنی بر AJAX را غیر �عال کن',
+'searchrelated'                    => 'مرتبط',
+'searchall'                        => 'همه',
+'showingresults'                   => "نمایش {{PLURAL:$1|'''1''' نتیجه|'''$1''' نتیجه}} در پایین، آغاز از #'''$2'''.",
+'showingresultsnum'                => "نمایش '''$3''' {{PLURAL:$3|نتیجه|نتیجه}} در پایین، آغاز از #'''$2'''.",
+'showingresultstotal'              => "نمایش {{PLURAL:$4|نتیجهٔ '''$1''' از '''$3'''|نتیجه‌های '''$1 - $2''' از '''$3'''}}",
+'nonefound'                        => "'''نکته''': �قط برخی از �ضاهای نام به طور پیش‌�رض جستجو می‌شوند.
+از پیشوندی نظیر ''همه:'' برای جستجوی خود است�اده کنید تا تمام محتوا (شامل ص�حه‌های بحث، الگوها و غیره) را جستجو کنید، یا نام �ضای نام دلخواه را به عنوان پیشوند به کار ببرید.",
+'search-nonefound'                 => 'نتیجه‌ای منطبق با درخواست پیدا نشد.',
+'powersearch'                      => 'جستجوی پیشر�ته',
+'powersearch-legend'               => 'جستجوی پیشر�ته',
+'powersearch-ns'                   => 'جستجو در �ضاهای نام:',
+'powersearch-redir'                => 'تغییرمسیرها �هرست شوند',
+'powersearch-field'                => 'جستجو برای',
+'search-external'                  => 'جستجوی خارجی',
+'searchdisabled'                   => 'با عرض شرمندگی، جستجوی کل متن موقتاً از کار انداخته شده است. می‌توانید از جستجوی Google در پایین است�اده کنید. نتایج حاصل از جستجو با این روش ممکن است به‌روز نباشند.',
 
 # Preferences page
-'preferences'              => 'ترجیحات',
-'mypreferences'            => 'ترجیحات من',
-'prefs-edits'              => 'تعداد ویرایش‌ها',
-'prefsnologin'             => 'به سیستم وارد نشده‌اید',
-'prefsnologintext'         => 'برای تنظیم ترجیحات کاربر باید <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} به سیستم وارد شوید]</span>.',
-'prefsreset'               => 'ترجیحات از حا�ظه میزان شد.',
-'qbsettings'               => 'تنظیمات نوار سریع',
-'qbsettings-none'          => 'نباشد',
-'qbsettings-fixedleft'     => 'ثابت چپ',
-'qbsettings-fixedright'    => 'ثابت راست',
-'qbsettings-floatingleft'  => 'شناور چپ',
-'qbsettings-floatingright' => 'شناور راست',
-'changepassword'           => 'تغییر گذرواژه',
-'skin'                     => 'پوسته',
-'math'                     => 'نمایش ریاضیات',
-'dateformat'               => 'قالب تاریخ',
-'datedefault'              => 'بدون ترجیح',
-'datetime'                 => 'تاریخ و زمان',
-'math_failure'             => 'شکست در تجزیه',
-'math_unknown_error'       => 'خطای ناشناخته',
-'math_unknown_function'    => 'تابع ناشناختهٔ',
-'math_lexing_error'        => 'خطای lexing',
-'math_syntax_error'        => 'خطای نحوی',
-'math_image_error'         => 'تبدیل به PNG شکست خورد',
-'math_bad_tmpdir'          => 'امکان ایجاد یا نوشتن اطلاعات در پوشه موقت (temp) ریاضی وجود ندارد.',
-'math_bad_output'          => 'امکان ایجاد یا نوشتن اطلاعات در پوشه خروجی (output) ریاضی وجود ندارد.',
-'math_notexvc'             => 'برنامهٔ اجرایی texvc موجود نیست. برای اطلاعات بیشتر به <span dir=ltr>math/README</span> مراجعه کنید.',
-'prefs-personal'           => 'داده‌های کاربر',
-'prefs-rc'                 => 'تغییرات اخیر',
-'prefs-watchlist'          => '�هرست پی‌گیری‌ها',
-'prefs-watchlist-days'     => 'تعداد روزهایی که باید در �هرست پی‌گیری‌ها نمایش داده شود:',
-'prefs-watchlist-edits'    => 'تعداد ویرایشهای نشان‌داده در �هرست پی‌گیری‌های گسترش‌یا�ته:',
-'prefs-misc'               => 'تنظیمات مت�رقه',
-'saveprefs'                => 'ذخیرهٔ ترجیحات',
-'resetprefs'               => 'ص�ر کردن ترجیحات',
-'oldpassword'              => 'گذرواژهٔ پیشین',
-'newpassword'              => 'گذرواژهٔ جدید',
-'retypenew'                => 'گذرواژهٔ جدید را دوباره وارد کنید',
-'textboxsize'              => 'ابعاد جعبهٔ متن',
-'rows'                     => 'تعداد سطرها',
-'columns'                  => 'تعداد ستون‌ها',
-'searchresultshead'        => 'تنظیمات نتیجهٔ جستجو',
-'resultsperpage'           => 'تعداد نتایج در هر ص�حه',
-'contextlines'             => 'تعداد سطرها در هر نتیجه',
-'contextchars'             => 'تعداد نویسه‌های اطرا� در سطر',
-'stub-threshold'           => 'آستانهٔ ویرایش پیوندهای <a href="#" class="stub">ناقص</a>:',
-'recentchangesdays'        => 'تعداد روزهای نمایش داده‌شده در تغییرات اخیر:',
-'recentchangescount'       => 'تعداد عناوین در تغییرات اخیر',
-'savedprefs'               => 'ترجیحات شما ذخیره شد.',
-'timezonelegend'           => 'منطقهٔ زمانی',
-'timezonetext'             => 'ت�اوت تعداد ساعت زمان محلی‌تان با زمان خادم (وقت گرینیچ) را وارد کنید.',
-'localtime'                => 'نمایش زمان محلی',
-'timezoneoffset'           => 'ت�اوت',
-'servertime'               => 'زمان �علی کارگزار',
-'guesstimezone'            => 'از مرورگر گر�ته شود',
-'allowemail'               => 'امکان دریا�ت پست الکترونیکی از دیگر کاربران',
-'prefs-searchoptions'      => 'گزینه‌های جستجو',
-'prefs-namespaces'         => '�ضاهای نام',
-'defaultns'                => 'به طور پیش‌�رض در این �ضاهای نام جستجو شود:',
-'default'                  => 'پیش‌�رض',
-'files'                    => 'پرونده‌ها',
+'preferences'               => 'ترجیحات',
+'mypreferences'             => 'ترجیحات من',
+'prefs-edits'               => 'تعداد ویرایش‌ها',
+'prefsnologin'              => 'به سیستم وارد نشده‌اید',
+'prefsnologintext'          => 'برای تنظیم ترجیحات کاربر باید <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} به سیستم وارد شوید]</span>.',
+'prefsreset'                => 'ترجیحات از حا�ظه میزان شد.',
+'qbsettings'                => 'تنظیمات نوار سریع',
+'qbsettings-none'           => 'نباشد',
+'qbsettings-fixedleft'      => 'ثابت چپ',
+'qbsettings-fixedright'     => 'ثابت راست',
+'qbsettings-floatingleft'   => 'شناور چپ',
+'qbsettings-floatingright'  => 'شناور راست',
+'changepassword'            => 'تغییر گذرواژه',
+'skin'                      => 'پوسته',
+'skin-preview'              => 'پیش‌نمایش',
+'math'                      => 'نمایش ریاضیات',
+'dateformat'                => 'قالب تاریخ',
+'datedefault'               => 'بدون ترجیح',
+'datetime'                  => 'تاریخ و زمان',
+'math_failure'              => 'شکست در تجزیه',
+'math_unknown_error'        => 'خطای ناشناخته',
+'math_unknown_function'     => 'تابع ناشناختهٔ',
+'math_lexing_error'         => 'خطای lexing',
+'math_syntax_error'         => 'خطای نحوی',
+'math_image_error'          => 'تبدیل به PNG شکست خورد',
+'math_bad_tmpdir'           => 'امکان ایجاد یا نوشتن اطلاعات در پوشه موقت (temp) ریاضی وجود ندارد.',
+'math_bad_output'           => 'امکان ایجاد یا نوشتن اطلاعات در پوشه خروجی (output) ریاضی وجود ندارد.',
+'math_notexvc'              => 'برنامهٔ اجرایی texvc موجود نیست. برای اطلاعات بیشتر به <span dir=ltr>math/README</span> مراجعه کنید.',
+'prefs-personal'            => 'داده‌های کاربر',
+'prefs-rc'                  => 'تغییرات اخیر',
+'prefs-watchlist'           => '�هرست پی‌گیری‌ها',
+'prefs-watchlist-days'      => 'تعداد روزهایی که باید در �هرست پی‌گیری‌ها نمایش داده شود:',
+'prefs-watchlist-days-max'  => '(حداکثر ۷ روز)',
+'prefs-watchlist-edits'     => 'تعداد ویرایشهای نشان‌داده در �هرست پی‌گیری‌های گسترش‌یا�ته:',
+'prefs-watchlist-edits-max' => '(حداکثر تعداد: ۱۰۰۰)',
+'prefs-misc'                => 'تنظیمات مت�رقه',
+'prefs-resetpass'           => 'تغییر گذرواژه',
+'saveprefs'                 => 'ذخیرهٔ ترجیحات',
+'resetprefs'                => 'ص�ر کردن ترجیحات',
+'textboxsize'               => 'ابعاد جعبهٔ متن',
+'prefs-edit-boxsize'        => 'اندازهٔ پنجرهٔ ویرایش.',
+'rows'                      => 'تعداد سطرها',
+'columns'                   => 'تعداد ستون‌ها',
+'searchresultshead'         => 'تنظیمات نتیجهٔ جستجو',
+'resultsperpage'            => 'تعداد نتایج در هر ص�حه',
+'contextlines'              => 'تعداد سطرها در هر نتیجه',
+'contextchars'              => 'تعداد نویسه‌های اطرا� در سطر',
+'stub-threshold'            => 'آستانهٔ ویرایش پیوندهای <a href="#" class="stub">ناقص</a>:',
+'recentchangesdays'         => 'تعداد روزهای نمایش داده‌شده در تغییرات اخیر:',
+'recentchangesdays-max'     => '(حداکثر $1 {{PLURAL:$1|روز|روز}})',
+'recentchangescount'        => 'تعداد عناوین در تغییرات اخیر، تاریخچهٔ ص�حه‌ها، و سیاهه‌ها، به طور پیش‌�رض:',
+'savedprefs'                => 'ترجیحات شما ذخیره شد.',
+'timezonelegend'            => 'منطقهٔ زمانی',
+'timezonetext'              => 'ت�اوت تعداد ساعت زمان محلی‌تان با زمان خادم (وقت گرینیچ) را وارد کنید.',
+'localtime'                 => 'زمان محلی:',
+'timezoneselect'            => 'منطقه زمانی:',
+'timezoneuseserverdefault'  => 'است�اده از پیش‌�رض کارگزار',
+'timezoneuseoffset'         => 'دیگر (اختلا� را مشخص کنید)',
+'timezoneoffset'            => 'اختلا�¹:',
+'servertime'                => 'زمان کارگزار:',
+'guesstimezone'             => 'از مرورگر گر�ته شود',
+'allowemail'                => 'امکان دریا�ت پست الکترونیکی از دیگر کاربران',
+'prefs-searchoptions'       => 'گزینه‌های جستجو',
+'prefs-namespaces'          => '�ضاهای نام',
+'defaultns'                 => 'به طور پیش‌�رض در این �ضاهای نام جستجو شود:',
+'default'                   => 'پیش‌�رض',
+'files'                     => 'پرونده‌ها',
 
 # User rights
 'userrights'                  => 'مدیریت اختیارات کاربر', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'مدیریت گروه‌های کاربری',
 'userrights-user-editname'    => 'یک نام کاربری وارد کنید:',
 'editusergroup'               => 'ویرایش گروه‌های کاربری',
-'editinguser'                 => "تغییر اختیارات کاربری برای '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "تغییر اختیارات کاربری برای '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'ویرایش گروه‌های کاربری',
 'saveusergroups'              => 'ثبت گروه‌های کاربری',
 'userrights-groupsmember'     => 'عضو:',
@@ -1202,6 +1413,8 @@ $2',
 'right-minoredit'            => 'علامت زدن ویرایش‌ها به صورت جزئی',
 'right-move'                 => 'انتقال ص�حه',
 'right-move-subpages'        => 'انتقال ص�حه‌ها به همراه زیر‌ص�حه‌هایشان',
+'right-move-rootuserpages'   => 'انتقال ص�حه‌های کاربری سرشاخه',
+'right-movefile'             => 'انتقال پرونده‌ها',
 'right-suppressredirect'     => 'انتقال ص�حه بدون ایجاد تغییر مسیر از نام قبلی',
 'right-upload'               => 'بارگذاری پرونده',
 'right-reupload'             => 'بارگذاری مجدد پرونده‌ای که از قبل وجود دارد',
@@ -1225,7 +1438,7 @@ $2',
 'right-block'                => 'قطع دسترسی ویرایشی دیگر کاربران',
 'right-blockemail'           => 'قطع دسترسی دیگر کاربران برای ارسال پست الکترونیکی',
 'right-hideuser'             => 'قطع دسترسی کاربر و مخ�ی کردن آن از دید عموم',
-'right-ipblock-exempt'       => 'تاثیر نپذیر�تن از قطع دسترسی‌های IP، خودکار یا �اصله‌ای',
+'right-ipblock-exempt'       => 'تاثیر نپذیر�تن از قطع دسترسی‌های آی‌پی، خودکار یا �اصله‌ای',
 'right-proxyunbannable'      => 'تاثیر نپذیر�تن از قطع دسترسی خودکار پروکسی‌ها',
 'right-protect'              => 'تغییر میزان ح�اظت ص�حه‌ها و ویرایش ص�حه‌های ح�اظت شده',
 'right-editprotected'        => 'ویرایش ص�حه‌های ح�اظت شده (به شرط نبود ح�اظت آبشاری)',
@@ -1252,9 +1465,46 @@ $2',
 'rightslogentry' => 'عضویت $1 از گروه $2 به $3 تغییر داده شد.',
 'rightsnone'     => '(هیچ)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'خواندن این ص�حه',
+'action-edit'                 => 'ویرایش این ص�حه',
+'action-createpage'           => 'ایجاد ص�حه',
+'action-createtalk'           => 'ایجاد ص�حه‌های بحث',
+'action-createaccount'        => 'ایجاد این حساب کاربری',
+'action-minoredit'            => 'علامت زدن این ویرایش به عنوان جزئی',
+'action-move'                 => 'انتقال این ص�حه',
+'action-move-subpages'        => 'انتقال این ص�حه و زیرص�حه‌های آن',
+'action-move-rootuserpages'   => 'انتقال ص�حه‌های کاربری سرشاخه',
+'action-movefile'             => 'این پرونده را انتقال بده',
+'action-upload'               => 'بارگذاری این پرونده',
+'action-reupload'             => 'نوشتن روی این پرونده موجود',
+'action-reupload-shared'      => 'باطل کردن این پرونده روی یک مخزن مشترک',
+'action-upload_by_url'        => 'بارگذاری این پرونده از یک نشانی اینترنتی',
+'action-writeapi'             => 'است�اده از API نوشتن',
+'action-delete'               => 'حذ� این ص�حه',
+'action-deleterevision'       => 'حذ� این نسخه',
+'action-deletedhistory'       => 'مشاهدهٔ تاریخچهٔ حذ� شدهٔ این ص�حه',
+'action-browsearchive'        => 'جستجوی ص�حه‌های حذ� شده',
+'action-undelete'             => 'احیای این ص�حه',
+'action-suppressrevision'     => 'مشاهده و احیای ویرایش‌های حذ� شده',
+'action-suppressionlog'       => 'مشاهدهٔ این سیاههٔ خصوصی',
+'action-block'                => 'قطع دسترسی این کاربر برای ویرایش',
+'action-protect'              => 'تغییر سطح محا�ظت از این ص�حه',
+'action-import'               => 'وارد کردن این ص�حه از یک ویکی دیگر',
+'action-importupload'         => 'وارد کردن این ص�حه از طریق بارگذاری پرونده',
+'action-patrol'               => 'علامت زدن ویرایش دیگران به عنوان گشت خورده',
+'action-autopatrol'           => 'علامت زدن ویرایش خودتان به عنوان گشت خورده',
+'action-unwatchedpages'       => 'مشاهدهٔ ص�حه‌های پی‌گیری نشده',
+'action-trackback'            => 'ثبت یک بازتاب',
+'action-mergehistory'         => 'ادغام تاریخچهٔ این ص�حه',
+'action-userrights'           => 'ویرایش همهٔ اختیارات کاربری',
+'action-userrights-interwiki' => 'ویرایش اختیارات کاربری کاربران یک ویکی دیگر',
+'action-siteadmin'            => 'ق�ل کردن و باز کردن پایگاه داده',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|تغییر|تغییر}}',
 'recentchanges'                     => 'تغییرات اخیر',
+'recentchanges-legend'              => 'گزینه‌های تغییرات اخیر',
 'recentchangestext'                 => 'آخرین تغییرات ویکی را در این ص�حه پی‌گیری کنید.',
 'recentchanges-feed-description'    => 'ردیابی آخرین تغییرات این ویکی در این خورد.',
 'rcnote'                            => "در زیر {{PLURAL:$1|'''۱''' تغییر|آخرین '''$1''' تغییر}} در آخرین {{PLURAL:$2|روز|'''$2''' روز}} را، تا $5، $4 می‌بینید.",
@@ -1279,10 +1529,13 @@ $2',
 'rc_categories'                     => 'محدود به رده‌ها بشود (بین رده‌ها نویسهٔ | را قرار دهید)',
 'rc_categories_any'                 => 'هر کدام',
 'newsectionsummary'                 => '/* $1 */ بخش تازه',
+'rc-enhanced-expand'                => 'نمایش جزئیات (نیازمند جاوااسکریپت)',
+'rc-enhanced-hide'                  => 'ن�تن جزئیات',
 
 # Recent changes linked
 'recentchangeslinked'          => 'تغییرات مرتبط',
 'recentchangeslinked-title'    => 'تغییرهای مرتبط با $1',
+'recentchangeslinked-backlink' => '→ $1',
 'recentchangeslinked-noresult' => 'در بازهٔ ‌زمانی داده‌شده تغییری در ص�حه‌های پیوندداده رخ نداده‌است.',
 'recentchangeslinked-summary'  => "این ص�حهٔ ویژه تغییرات اخیر در ص�حه‌های پیوند داده شده به این ص�حه را نشان می‌دهد.
 ص�حه‌های که در �هرست پی‌گیریهای شما باشند به صورت '''سیاه''' نشان داده می‌شوند.",
@@ -1300,12 +1553,12 @@ $2',
 'upload_directory_read_only'  => 'شاخهٔ بارگذاری ($1) از طر� کارگزار وب قابل نوشتن نیست.',
 'uploaderror'                 => 'خطا در بار کردن',
 'uploadtext'                  => "از �رم زیر برای بارگذاری کردن پرونده‌های جدید است�اده کنید. برای دیدن پرونده‌هایی که قبلاً بارگذاری شده‌اند به 
-[[Special:ImageList|�هرست پرونده‌ها]] بروید. بارگذاری و حذ� پرونده‌ها هم‌چنین در [[Special:Log/upload|سیاههٔ بارگذاری‌ها]] ثبت می‌شود.
+[[Special:FileList|�هرست پرونده‌ها]] بروید. بارگذاری و حذ� پرونده‌ها هم‌چنین در [[Special:Log/upload|سیاههٔ بارگذاری‌ها]] ثبت می‌شود.
 
 بعد از این که پرونده‌ای را بارگذاری کردید، به این سه شکل می‌توانید آن را در ص�حه‌ها است�اده کنید:
 
-*'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-*'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>'''
+*'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+*'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>'''
 *'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>'''",
 'upload-permitted'            => 'انواع مجاز پرونده‌ها: $1.',
 'upload-preferred'            => 'انواع ترجیح‌داده شده پرونده‌ها: $1.',
@@ -1335,22 +1588,24 @@ $2',
 'large-file'                  => 'توصیه می‌شود که پرونده‌ها بزرگتر از $1 نباشند: این پرونده $2 است.',
 'largefileserver'             => 'این پرونده از اندازه‌ای که در پیکربندی خادم بعنوان سق� اندازهٔ پرونده درنظر گر�ته‌ شده‌است، بزرگ‌تر است.',
 'emptyfile'                   => 'پروندهٔ بارشده خالی بنظر می‌رسد. این مساله ممکن است به دلیل خطای تایپی در نام پرونده رخ داده باشد. لط�اً تأیید کنید که می‌خواهید این پرونده را با همین شرایط بار کنید.',
-'fileexists'                  => 'در حال حاضر، پرونده‌ای با همین نام موجود است. اگر مطمئن نیستید که می‌خواهید آن پرونده را تغییر دهید، لط�اً <strong><tt>$1</tt></strong> را بررسی کنید.',
-'filepageexists'              => 'یک ص�حه (و نه تصویر) با این نام وجود دارد، اگر مطمئن نیستید که می‌خواهید آن را تغییر دهید لط�اً <strong><tt>$1</tt></strong> را بررسی کنید.',
+'fileexists'                  => "در حال حاضر، پرونده‌ای با همین نام موجود است. اگر مطمئن نیستید که می‌خواهید آن پرونده را تغییر دهید، لط�اً '''<tt>$1</tt>''' را بررسی کنید.",
+'filepageexists'              => "یک ص�حه (و نه تصویر) با این نام وجود دارد، اگر مطمئن نیستید که می‌خواهید آن را تغییر دهید لط�اً '''<tt>$1</tt>''' را بررسی کنید.",
 'fileexists-extension'        => "پرونده‌ای با نام مشابه وجود دارد.<br />
 نام پرونده‌ای که بارگزاری کردید این بود:'''<tt>$1</tt>'''<br />
 نام پرونده‌ای که از قبل موجود است این است:'''<tt>$2</tt>'''<br />
 لط�اً یک نام دیگر انتخاب کنید.",
 'fileexists-thumb'            => "<center>'''تصویر از قبل موجود است'''</center>",
 'fileexists-thumbnail-yes'    => 'به نظر می‌رسد که این پرونده، یک تصویر بندانگشتی (thumbnail) از تصویر بزرگتر اصلی باشد. لط�اً پروندهٔ با نام $1 را نگاه کنید. اگر پروندهٔ �علی، تصویر کوچک‌شدهٔ آن پرونده است، نیازی به بارگذاری تصویر کوچکتر نیست.',
-'file-thumbnail-no'           => 'نام پرونده با <strong><tt>$1</tt></strong> آغاز می‌شود.
-به نظر می‌رسد که این پرونده، یک تصویر بندانگشتی <i>(thumbnail)</i> از تصویر بزرگتر اصلی باشد.
-اگر تصویر با اندازهٔ اصلی را دارید، آن را بارگذاری کنید؛ در غیر این صورت، نام پرونده را تغییر دهید.',
-'fileexists-forbidden'        => 'در حال حاضر، پرونده‌ای به همین نام وجود دارد؛ لط�اً برگردید و پروندهٔ موردنظر خود را با نام دیگری بار کنید.
-[[Image:$1|thumb|center|$1]]',
+'file-thumbnail-no'           => "نام پرونده با '''<tt>$1</tt>''' آغاز می‌شود.
+به نظر می‌رسد که این پرونده، یک تصویر بندانگشتی ''(thumbnail)'' از تصویر بزرگتر اصلی باشد.
+اگر تصویر با اندازهٔ اصلی را دارید، آن را بارگذاری کنید؛ در غیر این صورت، نام پرونده را تغییر دهید.",
+'fileexists-forbidden'        => 'در حال حاضر، پرونده‌ای به همین نام وجود دارد، و قابل رونویسی نیست.
+اگر هم‌چنان می‌خواهید که پروندهٔ خود را بارگذاری کنید، لط�اً برگردید و نام دیگری برگزینید.
+[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'در حال‌ حاضر، پرونده‌ای با همین نام در انبارهٔ مشترک پرونده‌ها وجود دارد.
-اگر هنوز می‌خواهید پرونده خود را بار کنید، لط�اً برگردید و پروندهٔ موردنظر خود را با نام دیگری بار کنید. [[Image:$1|thumb|center|$1]]',
+اگر هنوز می‌خواهید پرونده خود را بار کنید، لط�اً برگردید و پروندهٔ موردنظر خود را با نام دیگری بار کنید. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'به نظر می‌رسد این پرونده نسخه‌ای تکراری از {{PLURAL:$1|پروندهٔ|پرونده‌های}} زیر باشد:',
+'file-deleted-duplicate'      => 'یک پرونده نظیر این پرونده ([[$1]]) قبلاً حذ� شده‌است. شما باید تاریخچهٔ حذ� آن پرونده را قبل از بارگذاری مجدد آن ببینید.',
 'successfulupload'            => 'بار کردن با مو�قیت انجام شد',
 'uploadwarning'               => 'هشدار بار کردن',
 'savefile'                    => 'ذخیره‌ی پرونده',
@@ -1392,20 +1647,21 @@ $2',
 'upload_source_url'  => '(یک نشانی اینترنتی معتبر و قابل دسترسی برای عموم)',
 'upload_source_file' => '(پرونده‌ای در رایانهٔ شما)',
 
-# Special:ImageList
-'imagelist-summary'     => 'این ص�حهٔ ویژه تمام پرونده‌های بارگذاری شده را نشان می‌دهد.
-به طور پیش‌�رض آخرین پرونده‌های بازگذاری شده بالاتر نمایش داده می‌شوند.
-کلیک کردن روی عنوان ستون‌ها باعث تغییر ترتیب نمایش پرونده‌ها می‌شود.',
-'imagelist_search_for'  => 'جستجوی نام تصویر:',
+# Special:ListFiles
+'listfiles-summary'     => 'این ص�حهٔ ویژه تمام پرونده‌های بارگذاری شده را نمایش می‌دهد.
+به طور پیش‌�رض آخرین پرونده‌های بارگذاری شده در بالای �هرست نمایش می‌یابند.
+یک کلیک روی عنوان ستون ترتیب را تغییر می‌دهد.',
+'listfiles_search_for'  => 'جستجو به دنبال نام پرونده چندرسانه‌ای:',
 'imgfile'               => 'پرونده',
-'imagelist'             => '�هرست تصاویر',
-'imagelist_date'        => 'تاریخ',
-'imagelist_name'        => 'نام',
-'imagelist_user'        => 'کاربر',
-'imagelist_size'        => 'اندازه (بایت)',
-'imagelist_description' => 'توصی�',
-
-# Image description page
+'listfiles'             => '�هرست پرونده‌ها',
+'listfiles_date'        => 'تاریخ',
+'listfiles_name'        => 'نام',
+'listfiles_user'        => 'کاربر',
+'listfiles_size'        => 'اندازه',
+'listfiles_description' => 'توضیح',
+'listfiles_count'       => 'نسخه‌ها',
+
+# File description page
 'filehist'                       => 'تاریخچه پرونده',
 'filehist-help'                  => 'روی تاریخ‌ها کلیک کنید تا نسخهٔ مربوط را ببینید.',
 'filehist-deleteall'             => 'حذ� همه',
@@ -1413,19 +1669,25 @@ $2',
 'filehist-revert'                => 'واگردانی',
 'filehist-current'               => 'نسخهٔ �علی',
 'filehist-datetime'              => 'تاریخ',
+'filehist-thumb'                 => 'بند انگشتی',
+'filehist-thumbtext'             => 'تصویر بند انگشتی از نسخه تا $1',
+'filehist-nothumb'               => '�اقد بند انگشتی',
 'filehist-user'                  => 'کاربر',
 'filehist-dimensions'            => 'ابعاد',
 'filehist-filesize'              => 'اندازه پرونده',
 'filehist-comment'               => 'توضیح',
-'imagelinks'                     => 'پیوند‌های تصویر',
+'imagelinks'                     => 'پیوندهای پرونده',
 'linkstoimage'                   => '{{PLURAL:$1|ص�حهٔ|ص�حه‌های}} زیر به این تصویر پیوند {{PLURAL:$1|دارد|دارند}}:',
+'linkstoimage-more'              => 'بیش از ص�حه به این پرونده پیوند {{PLURAL:$1|می‌دهد|می‌دهند}}.
+�هرست زیر تنها {{PLURAL:$1|اولین پیوند|اولین $1 پیوند}} به این ص�حه را نشان می‌دهد.
+[[Special:WhatLinksHere/$2|قهرست کامل]] نیز موجود است.',
 'nolinkstoimage'                 => 'هیچ ص�حه‌ای به این تصویر پیوند ندارد.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|پیوندهای دیگر]] به این پرونده را ببینید.',
 'redirectstofile'                => '{{PLURAL:$1|پروندهٔ|پرونده‌های}} زیر به این ص�حه تغییر مسیر {{PLURAL:$1|می‌دهد|می‌دهند}}:',
-'duplicatesoffile'               => '{{PLURAL:$1|پروندهٔ|پرونده‌های}} زیر نسخهٔ تکراری این پرونده {{PLURAL:$1|است|هستند}}:',
+'duplicatesoffile'               => '{{PLURAL:$1|پروندهٔ|پرونده‌های}} زیر نسخهٔ تکراری این پرونده {{PLURAL:$1|است|هستند}} ([[Special:FileDuplicateSearch/$2|اطلاعات بیشتر]]):',
 'sharedupload'                   => 'این پرونده یک بارگذاری اشتراکی است و ممکن است از طریق دیگر پروژه‌ها هم قابل دسترسی باشد.',
 'shareduploadwiki'               => 'لط�اً برای اطلاعات بیشتر $1 را ببینید.',
-'shareduploadwiki-desc'          => 'توضیحات در مورد $1 آن در زیر نشان داده شده‌است.',
+'shareduploadwiki-desc'          => 'توضیحات در مورد $1 آن در آن‌جا، در ادامه نشان داده شده‌است.',
 'shareduploadwiki-linktext'      => 'ص�حهٔ توصی� پرونده',
 'shareduploadduplicate'          => 'این پرونده نسخه‌ای تکراری از $1 است که در انبار مشترک وجود دارد.',
 'shareduploadduplicate-linktext' => 'پرونده‌ای دیگر',
@@ -1451,7 +1713,7 @@ $2',
 'filedelete'                  => 'حذ� $1',
 'filedelete-backlink'         => '→ $1',
 'filedelete-legend'           => 'حذ� پرونده',
-'filedelete-intro'            => "شما در حال حذ� کردن '''[[Media:$1|$1]]''' هستید.",
+'filedelete-intro'            => "شما در حال حذ� کردن پروندهٔ '''[[Media:$1|$1]]''' به همراه تمام تاریخچه‌اش هستید.",
 'filedelete-intro-old'        => '<span class="plainlinks">شما در حال حذ� نسخه \'\'\'[[Media:$1|$1]]\'\'\' به تاریخ [$4 $3، $2] هستید.</span>',
 'filedelete-comment'          => 'توضیح:',
 'filedelete-submit'           => 'حذ�',
@@ -1459,7 +1721,6 @@ $2',
 'filedelete-success-old'      => "نسخهٔ '''[[Media:$1|$1]]''' به تاریخ $3، $2 حذ� شد.",
 'filedelete-nofile'           => "'''$1''' وجود ندارد.",
 'filedelete-nofile-old'       => "نسخه بایگانی شده‌ای از '''$1''' با مشخصات داده شده، وجود ندارد..",
-'filedelete-iscurrent'        => 'شما می‌خواهید که آخرین نسخه از این پرونده را حذ� کنید. لط�اً ابتدا پرونده را به یک نسخه قدیمی‌تر واگردانی کنید.',
 'filedelete-otherreason'      => 'دلیل دیگر/اضا�ی:',
 'filedelete-reason-otherlist' => 'دیگر',
 'filedelete-reason-dropdown'  => '
@@ -1488,27 +1749,31 @@ $2',
 
 # Random page
 'randompage'         => 'ص�حهٔ تصاد�ی',
-'randompage-nopages' => 'هیچ ص�حه‌ای در این �ضای نام موجود نیست',
+'randompage-nopages' => 'هیچ ص�حه‌ای در �ضای نام «$1» موجود نیست.',
 
 # Random redirect
 'randomredirect'         => 'تغییرمسیر تصاد�ی',
-'randomredirect-nopages' => 'هیج ص�حهٔ تغییر مسیری در این �ضای نام موجود نیست.',
+'randomredirect-nopages' => 'هیج ص�حهٔ تغییر مسیری در �ضای نام «$1» موجود نیست.',
 
 # Statistics
-'statistics'             => 'آمار',
-'sitestats'              => 'آمار وبگاه',
-'userstats'              => 'آمار کاربران',
-'sitestatstext'          => "کلاً {{PLURAL:$1|'''$1'''|'''$1'''}} ص�حه در پایگاه وجود دارد.
-این شامل ص�حه‌های «بحث»، ص�حه‌های دربارهٔ {{SITENAME}}،ص�حه‌های  «ناقص» کوچک، تغییرمسیرها، و ص�حه‌های دیگری می‌شود که احتمالاً مقاله به حساب نمی‌آیند.
- صر� نظر از این‌ها، <b>$2</b> ص�حه هست که احتمالاً مقالهٔ معقول هستند.
-
-'''$8''' پرونده بارگذاری شده‌اند.
-
-در مجموع ص�حه‌های {{SITENAME}} '''$3''' بار بازدید شده‌اند که شامل  '''$4''' ویرایش می‌شود. به این ترتیب هر ص�حه به طور متوسط '''$5''' بار ویرایش شده و به ازای هر ویرایش '''$6''' بازدید صورت گر�ته‌است.
-
-طول [http://www.mediawiki.org/wiki/Manual:Job_queue ص� کارها] $7 است.",
-'userstatstext'          => "تعداد '''$1''' کاربر ثبت شده وجود دارد که از بین آن‌ها '''$2''' ن�ر ('''$4٪''') دارای دسترسی $5 {{PLURAL:$2|است|هستند}}.",
-'statistics-mostpopular' => 'ص�حه‌هایی که بیشترین تعداد بازدیدکننده را داشته‌اند',
+'statistics'                   => 'آمار',
+'statistics-header-pages'      => 'آمار ص�حه‌ها',
+'statistics-header-edits'      => 'آمار ویرایشات',
+'statistics-header-views'      => 'آمار بازدیدها',
+'statistics-header-users'      => 'آمار کاربران',
+'statistics-articles'          => 'ص�حه محتویات',
+'statistics-pages'             => 'ص�حه‌ها',
+'statistics-pages-desc'        => 'تمام ص�حه‌های این ویکی، از جمله ص�حه‌های بحث، تغییر مسیر و غیره',
+'statistics-files'             => 'پرونده‌های بارگذاری شده',
+'statistics-edits'             => 'از زمانی که نرم‌ا�زار ارتقا یا�ته‌است تعداد ویرایشات بر روی {{SITENAME}} این تعداد بوده است:',
+'statistics-edits-average'     => 'متوسط ویرایش‌ها بر روی ص�حات',
+'statistics-views-total'       => 'مجموع بازدیدها',
+'statistics-views-peredit'     => 'تعداد بازدید به ازای هر ویرایش',
+'statistics-jobqueue'          => 'طول [http://www.mediawiki.org/wiki/Manual:Job_queue ص� کار]',
+'statistics-users'             => '[[ویژه:ListUsers|کاربران]] ثبت‌نام کرده',
+'statistics-users-active'      => 'کاربران �عال',
+'statistics-users-active-desc' => 'کاربرانی که در {{PLURAL:$1|روز|$1 روز}} قبل �عالیتی انجام داده‌اند',
+'statistics-mostpopular'       => 'ص�حه‌هایی که بیشترین تعداد بازدیدکننده را داشته‌اند',
 
 'disambiguations'      => 'ص�حه‌های ابهام‌زدایی',
 'disambiguationspage'  => 'Template:ابهام‌زدایی',
@@ -1523,7 +1788,7 @@ $2',
 'double-redirect-fixer'      => 'تعمیرکار تغییر مسیرها',
 
 'brokenredirects'        => 'تغییرمسیرهای خراب',
-'brokenredirectstext'    => 'تغییرمسیرهای زیر به یک ص�حهٔ ناموجود پیوند دارند.',
+'brokenredirectstext'    => 'تغییرمسیرهای زیر به یک ص�حهٔ ناموجود پیوند دارند:',
 'brokenredirects-edit'   => '(ویرایش)',
 'brokenredirects-delete' => '(حذ�)',
 
@@ -1553,26 +1818,30 @@ $2',
 'popularpages'            => 'ص�حه‌های محبوب',
 'wantedcategories'        => 'رده‌های مورد نیاز',
 'wantedpages'             => 'ص�حه‌های مورد نیاز',
-'missingfiles'            => 'پرونده‌های گم‌شده',
+'wantedfiles'             => 'پرونده‌های مورد نیاز',
+'wantedtemplates'         => 'الگوهای مورد نیاز',
 'mostlinked'              => 'ص�حه‌هایی که بیشتر از همه به آنها پیوند شده است',
 'mostlinkedcategories'    => 'رده‌هایی که بیشتر از همه به آنها پیوند شده است',
 'mostlinkedtemplates'     => 'الگوهایی که بیشتر از همه به آنها پیوند شده است',
 'mostcategories'          => 'مقاله‌هایی که بیشترین تعداد رده را دارند',
 'mostimages'              => 'تصاویری که بیشتر از همه به آنها پیوند شده است',
 'mostrevisions'           => 'مقاله‌هایی که بیشتر از بقیه ویرایش شده‌اند',
-'prefixindex'             => 'نمایهٔ پیشوندی',
+'prefixindex'             => 'تمام ص�حه‌ها با پیشوند',
 'shortpages'              => 'ص�حه‌های کوتاه',
 'longpages'               => 'ص�حه‌های بلند',
 'deadendpages'            => 'ص�حه‌های بن‌بست',
 'deadendpagestext'        => 'ص�حه‌های زیر به هیچ ص�حهٔ دیگر در این ویکی پیوند ندارند.',
 'protectedpages'          => 'ص�حه‌های ح�اظت‌شده',
 'protectedpages-indef'    => '�قط ح�اظت‌های بی‌پایان',
+'protectedpages-cascade'  => '�قط محا�ظت‌های آبشاری',
 'protectedpagestext'      => 'ص�حه‌های زیر در برابر ویرایش یا انتقال ح�اظت شده‌اند:',
 'protectedpagesempty'     => 'در حال حاضر هیچ‌ص�حه‌ای محا�ظت نشده‌است.',
 'protectedtitles'         => 'عنوان‌های محا�ظت شده',
 'protectedtitlestext'     => 'عنوان‌های زیر از ایجاد محا�ظت شده‌اند',
 'protectedtitlesempty'    => 'در حال حاضر هیچ عنوانی با این پارامترها محا�ظت نشده‌است.',
 'listusers'               => '�هرست کاربران',
+'listusers-editsonly'     => '�قط کاربرانی که ویرایش دارند را نشان بده',
+'usereditcount'           => '$1 {{PLURAL:$1|ویرایش|ویرایش}}',
 'newpages'                => 'ص�حه‌های جدید',
 'newpages-username'       => 'نام کاربری:',
 'ancientpages'            => 'قدیمی‌ترین ص�حه‌ها',
@@ -1595,14 +1864,13 @@ $2',
 'booksources-isbn'          => 'شابک:',
 'booksources-go'            => 'برو',
 'booksources-text'          => 'در زیر �هرستی از پیوندها به وبگاههای دیگر که کتاب‌های نو و دست‌دوم می‌�روشند آمده‌است. همچنین ممکن است اطلاعات بیشتری راجع به کتاب مورد نظر شما بدارند.',
+'booksources-invalid-isbn'  => 'شابک داده شده مجاز به نظر نمی‌رسد؛ از جهت اشکالات هنگام کپی کردن از منبع اصلی بررسی کنید.',
 
 # Special:Log
 'specialloguserlabel'  => 'کاربر:',
 'speciallogtitlelabel' => 'عنوان:',
 'log'                  => 'سیاهه‌ها',
 'all-logs-page'        => 'تمام سياهه‌ها',
-'log-search-legend'    => 'به دنبال سیاهه‌ها جستجو کن',
-'log-search-submit'    => 'برو',
 'alllogstext'          => 'نمایش یک‌جای تمام سیاهه‌های موجود در {{SITENAME}}.
 می‌توانید با انتخاب نوع سیاهه، نام کاربری (حساس به کوچکی و بزرگی حرو�) و ص�حه‌های تغییریا�ته (حساس به بزرگی و کوچکی حرو�)، نمایش را محدودتر سازید.',
 'logempty'             => 'مورد منطبق با منظور شما در سیاهه یا�ت نشد.',
@@ -1614,6 +1882,7 @@ $2',
 'nextpage'          => 'ص�حهٔ بعد ($1)',
 'prevpage'          => 'ص�حهٔ قبلی ($1)',
 'allpagesfrom'      => 'نمایش ص�حه‌ها با شروع از:',
+'allpagesto'        => 'نمایش ص�حه‌ها با پایان در:',
 'allarticles'       => 'همهٔ مقاله‌ها',
 'allinnamespace'    => 'همهٔ ص�حه‌ها (�ضای نام $1)',
 'allnotinnamespace' => 'همهٔ ص�حه‌ها (که در �ضای نام $1 است)',
@@ -1633,44 +1902,71 @@ $2',
 'special-categories-sort-count' => 'مرتب کردن بر اساس تعداد',
 'special-categories-sort-abc'   => 'مرتب کردن ال�بایی',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'مشارکت‌های حذ� شده',
+
+# Special:LinkSearch
+'linksearch'       => 'پیوندهای بیرونی',
+'linksearch-pat'   => 'جستجوی الگو:',
+'linksearch-ns'    => '�ضای نام:',
+'linksearch-ok'    => 'جستجو',
+'linksearch-text'  => 'نشانه‌هایی مانند "*.wikipedia.org" را می‌توان است�اده کرد.<br />پروتکل‌های پشتیبانی‌شده: <tt>$1</tt>',
+'linksearch-line'  => '$1 از $2 پیوند دارد',
+'linksearch-error' => 'نشانه‌ها �قط در ابتدای نام میزبان اینترنتی می‌توانند است�اده شوند.',
+
 # Special:ListUsers
 'listusersfrom'      => 'نمایش کاربران با شروع از:',
 'listusers-submit'   => 'نمایش',
 'listusers-noresult' => 'هیچ کاربری یا�ت نشد.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'سیاههٔ ایجاد کاربر',
+'newuserlogpagetext'          => 'این سیاهه‌ای از نامهای کاربری� تازه‌ساخته‌شده است',
+'newuserlog-byemail'          => 'گذرواژه با پست الکترونیکی ارسال شد',
+'newuserlog-create-entry'     => 'کاربر جدید',
+'newuserlog-create2-entry'    => 'حساب کاربری $1 را ایجاد کرد',
+'newuserlog-autocreate-entry' => 'حساب به طور خودکار ساخته شد',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'اختیارات گروه‌های کاربری',
-'listgrouprights-summary'  => '�هرست زیر شامل گروه‌های کاربری تعری� شده در این ویکی و اختیارات داده شده به آن‌ها است.
+'listgrouprights'                 => 'اختیارات گروه‌های کاربری',
+'listgrouprights-summary'         => '�هرست زیر شامل گروه‌های کاربری تعری� شده در این ویکی و اختیارات داده شده به آن‌ها است.
 اطلاعات بیشتر در مورد هر یک از اختیارات را در [[{{MediaWiki:Listgrouprights-helppage}}]] بیابید.',
-'listgrouprights-group'    => 'گروه',
-'listgrouprights-rights'   => 'دسترسی‌ها',
-'listgrouprights-helppage' => 'Help:دسترسی‌های گروهی',
-'listgrouprights-members'  => '(�هرست اعضا)',
+'listgrouprights-group'           => 'گروه',
+'listgrouprights-rights'          => 'دسترسی‌ها',
+'listgrouprights-helppage'        => 'Help:دسترسی‌های گروهی',
+'listgrouprights-members'         => '(�هرست اعضا)',
+'listgrouprights-addgroup'        => 'می‌تواند این {{PLURAL:$2|گروه|گروه‌ها}} را اضا�ه کند: $1',
+'listgrouprights-removegroup'     => 'می‌تواند این {{PLURAL:$2|گروه|گروه‌ها}} را حذ� کند: $1',
+'listgrouprights-addgroup-all'    => 'می‌تواند تمام گروه‌ها را اضا�ه کند',
+'listgrouprights-removegroup-all' => 'می‌تواند تمام گروه‌ها را حذ� کند',
 
 # E-mail user
-'mailnologin'     => 'نشانی‌ای از �رستنده وجود ندارد.',
-'mailnologintext' => 'برای �رستادن پست الکترونیکی به کاربران دیگر باید [[Special:UserLogin|به سیستم وارد شوید]]
+'mailnologin'      => 'نشانی‌ای از �رستنده وجود ندارد.',
+'mailnologintext'  => 'برای �رستادن پست الکترونیکی به کاربران دیگر باید [[Special:UserLogin|به سیستم وارد شوید]]
 و نشانی پست الکترونیکی معتبری در [[Special:Preferences|ترجیحات]]
 خود داشته باشید.',
-'emailuser'       => 'پست الکترونیکی به این کاربر',
-'emailpage'       => 'پست الکترونیکی به کاربر',
-'emailpagetext'   => 'شما می‌توانید از �رم زیر برای ارسال یک نامه الکترونیکی به این کاربر است�اده کنید.
+'emailuser'        => 'پست الکترونیکی به این کاربر',
+'emailpage'        => 'پست الکترونیکی به کاربر',
+'emailpagetext'    => 'شما می‌توانید از �رم زیر برای ارسال یک نامه الکترونیکی به این کاربر است�اده کنید.
 نشانی پست الکترونیکی‌ای که در [[Special:Preferences|ترجیحات کاربریتان]] وارد کرده‌اید در نشانی �رستنده (From) نامه خواهد آمد، تا گیرنده بتواند پاسخ دهد.',
-'usermailererror' => 'پست الکترونیکی دچار خطا شد:',
-'defemailsubject' => 'پست الکترونیکی {{SITENAME}}',
-'noemailtitle'    => 'نشانی پست الکترونیکی موجود نیست',
-'noemailtext'     => 'این کاربر نشانی پست الکترونیکی معتبری مشخص نکرده است،
+'usermailererror'  => 'پست الکترونیکی دچار خطا شد:',
+'defemailsubject'  => 'پست الکترونیکی {{SITENAME}}',
+'noemailtitle'     => 'نشانی پست الکترونیکی موجود نیست',
+'noemailtext'      => 'این کاربر نشانی پست الکترونیکی معتبری مشخص نکرده است،
 یا تصمیم گر�ته از کاربران دیگر پست الکترونیکی دریا�ت نکند.',
-'emailfrom'       => 'از:',
-'emailto'         => 'به:',
-'emailsubject'    => 'عنوان:',
-'emailmessage'    => 'پیغام:',
-'emailsend'       => '�رستاده شود',
-'emailccme'       => 'رونوشت پیغام را برایم ب�رست.',
-'emailccsubject'  => 'رونوشت پیغام شما به $1: $2',
-'emailsent'       => 'پست الکترونیکی �رستاده شد',
-'emailsenttext'   => 'پیغام پست الکترونیکی شما �رستاده شد.',
-'emailuserfooter' => 'این نامه الکترونیکی با است�اده از ویژگی «پست الکترونیکی به کاربر» {{SITENAME}} توسط $1 به $2 �رستاده شد.',
+'nowikiemailtitle' => 'اجازهٔ ارسال نامهٔ الکترونیکی داده نشده‌است',
+'nowikiemailtext'  => 'این کاربر انتخاب کرده که از دیگر کاربران نامهٔ الکترونیکی دریا�ت نکند.',
+'email-legend'     => 'ارسال نامه الکترونیکی به یک کاربر دیگر {{SITENAME}}',
+'emailfrom'        => 'از:',
+'emailto'          => 'به:',
+'emailsubject'     => 'عنوان:',
+'emailmessage'     => 'پیغام:',
+'emailsend'        => '�رستاده شود',
+'emailccme'        => 'رونوشت پیغام را برایم ب�رست.',
+'emailccsubject'   => 'رونوشت پیغام شما به $1: $2',
+'emailsent'        => 'پست الکترونیکی �رستاده شد',
+'emailsenttext'    => 'پیغام پست الکترونیکی شما �رستاده شد.',
+'emailuserfooter'  => 'این نامهٔ الکترونیکی با است�اده از ویژگی «پست الکترونیکی به کاربر» {{SITENAME}} توسط $1 به $2 �رستاده شد.',
 
 # Watchlist
 'watchlist'            => '�هرست پی‌گیری‌های من',
@@ -1680,7 +1976,7 @@ $2',
 'watchlistanontext'    => 'برای مشاهده و ویرایش �هرست پی‌گیری‌های خود از $1 است�اده کنید.',
 'watchnologin'         => 'به سیستم وارد نشده‌اید',
 'watchnologintext'     => 'برای تغییر �هرست پی‌گیری‌هایتان باید [[Special:UserLogin|به سیستم وارد شوید]].',
-'addedwatch'           => 'به �هرست پی‌گیری‌ها اضا�ه شد',
+'addedwatch'           => 'به �هرست پی‌گیری اضا�ه شد',
 'addedwatchtext'       => "ص�حهٔ «<nowiki>$1</nowiki>» به [[Special:Watchlist|�هرست پی‌گیری‌های]] شما اضا�ه شد.
 تغییرات این ص�حه و ص�حهٔ بحث متناظرش در آینده در اینجا �هرست خواهد شد. به‌علاوه، این ص�حه، برای واضح‌تر دیده شدن در [[Special:RecentChanges|�هرست تغییرات اخیر]] به شکل <b>سیاه</b> خواهد آمد.
 
@@ -1703,12 +1999,7 @@ $2',
 'iteminvalidname'      => 'مشکل با مورد «$1»، نام نامعتبر است...',
 'wlnote'               => 'در زیر آخرین $1 تغییر در $2 ساعت آخر {{PLURAL:$1|آمده‌است|آمده‌اند}}.',
 'wlshowlast'           => 'نمایش آخرین $1 ساعت $2 روز $3',
-'watchlist-show-bots'  => 'نمایش ویرایش ربات‌ها',
-'watchlist-hide-bots'  => 'پنهان کردن ویرایش ربات‌ها',
-'watchlist-show-own'   => 'نمایش ویرایش‌های من',
-'watchlist-hide-own'   => 'پنهان کردن ویرایش‌های من',
-'watchlist-show-minor' => 'نمایش ویرایش‌های جزئی',
-'watchlist-hide-minor' => 'پنهان کردن ویرایش‌های جزئی',
+'watchlist-options'    => 'گزینه‌های پیگیری',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'پی‌گیری...',
@@ -1749,61 +2040,68 @@ $NEWPAGE
 بازخورد و کمک بیشتر:
 {{fullurl:{{ns:help}}:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'حذ� ص�حه',
-'confirm'                     => 'تأیید',
-'excontent'                   => "محتوای ص�حه این بود: '$1'",
-'excontentauthor'             => "محتویات ص�حه این بود: '$1' (و تنها مشارکت‌کننده '$2' بود)",
-'exbeforeblank'               => "محتوای ص�حه قبل از خالی‌کردن '$1' بود.",
-'exblank'                     => 'ص�حه خالی بود',
-'delete-confirm'              => 'حذ� «$1»',
-'delete-backlink'             => '→ $1',
-'delete-legend'               => 'حذ�',
-'historywarning'              => 'هشدار! ص�حه‌ای که دارید حذ� می‌کنید، تاریخچه‌ای دارد:',
-'confirmdeletetext'           => 'شما در حال حذ� کردن یک ص�حه یا تصویر از پایگاه‌ داده همراه با تمام تاریخچهٔ آن هستید. لط�اً این عمل را تأیید کنید و اطمینان حاصل کنید که عواقب این کار را می‌دانید و این عمل را مطابق با [[{{MediaWiki:Policy-url}}|سیاست‌ها]] انجام می‌دهید.',
-'actioncomplete'              => 'عمل انجام شد.',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» حذ� شده است.
+# Delete
+'deletepage'             => 'حذ� ص�حه',
+'confirm'                => 'تأیید',
+'excontent'              => "محتوای ص�حه این بود: '$1'",
+'excontentauthor'        => "محتویات ص�حه این بود: '$1' (و تنها مشارکت‌کننده '$2' بود)",
+'exbeforeblank'          => "محتوای ص�حه قبل از خالی‌کردن '$1' بود.",
+'exblank'                => 'ص�حه خالی بود',
+'delete-confirm'         => 'حذ� «$1»',
+'delete-backlink'        => '→ $1',
+'delete-legend'          => 'حذ�',
+'historywarning'         => 'هشدار! ص�حه‌ای که دارید حذ� می‌کنید، تاریخچه‌ای دارد:',
+'confirmdeletetext'      => 'شما در حال حذ� کردن یک ص�حه یا تصویر از پایگاه‌ داده همراه با تمام تاریخچهٔ آن هستید. لط�اً این عمل را تأیید کنید و اطمینان حاصل کنید که عواقب این کار را می‌دانید و این عمل را مطابق با [[{{MediaWiki:Policy-url}}|سیاست‌ها]] انجام می‌دهید.',
+'actioncomplete'         => 'عمل انجام شد.',
+'deletedtext'            => '«<nowiki>$1</nowiki>» حذ� شده است.
 برای سابقهٔ حذ�‌های اخیر به $2 مراجعه کنید.',
-'deletedarticle'              => '«$1» حذ� شد',
-'suppressedarticle'           => '«[[$1]]» را �رونشاند',
-'dellogpage'                  => 'سیاههٔ_حذ�',
-'dellogpagetext'              => '�هرست زیر �هرستی از آخرین حذ�‌هاست.
+'deletedarticle'         => '«$1» حذ� شد',
+'suppressedarticle'      => '«[[$1]]» را �رونشاند',
+'dellogpage'             => 'سیاههٔ_حذ�',
+'dellogpagetext'         => '�هرست زیر �هرستی از آخرین حذ�‌هاست.
 همهٔ زمان‌های نشان‌داده‌شده زمان خادم (وقت گرینویچ) است.',
-'deletionlog'                 => 'سیاههٔ حذ�',
-'reverted'                    => 'به نسخهٔ قدیمی‌تر واگردانده شد.',
-'deletecomment'               => 'توضیح حذ�:',
-'deleteotherreason'           => 'دلیل دیگر/اضا�ی:',
-'deletereasonotherlist'       => 'دیگر',
-'deletereason-dropdown'       => '
+'deletionlog'            => 'سیاههٔ حذ�',
+'reverted'               => 'به نسخهٔ قدیمی‌تر واگردانده شد.',
+'deletecomment'          => 'توضیح حذ�:',
+'deleteotherreason'      => 'دلیل دیگر/اضا�ی:',
+'deletereasonotherlist'  => 'دیگر',
+'deletereason-dropdown'  => '
 *دلایل متداول حذ�
 ** درخواست کاربر
 ** نقض حق تکثیر
 ** خرابکاری',
-'delete-edit-reasonlist'      => 'ویرایش �هرست دلایل',
-'delete-toobig'               => 'این ص�حه تاریخچهٔ ویرایشی بزرگی دارد، که شامل بیش از $1 {{PLURAL:$1|نسخه|نسخه}} است.
+'delete-edit-reasonlist' => 'ویرایش �هرست دلایل',
+'delete-toobig'          => 'این ص�حه تاریخچهٔ ویرایشی بزرگی دارد، که شامل بیش از $1 {{PLURAL:$1|نسخه|نسخه}} است.
 به منظور جلوگیری از خرابکاری احتمالی حذ� این گونه ص�حه‌ها در {{SITENAME}} محدود شده‌است.',
-'delete-warning-toobig'       => 'این ص�حه تاریخچهٔ ویرایشی بزرگی دارد، که شامل بیش از $1 {{PLURAL:$1|نسخه|نسخه}} است.
+'delete-warning-toobig'  => 'این ص�حه تاریخچهٔ ویرایشی بزرگی دارد، که شامل بیش از $1 {{PLURAL:$1|نسخه|نسخه}} است.
 حذ� آن ممکن است که عملکرد پایگاه دادهٔ {{SITENAME}} را مختل کند;
 با احتیاط ادامه دهید.',
-'rollback'                    => 'واگردانی ویرایش‌ها',
-'rollback_short'              => 'واگرد',
-'rollbacklink'                => 'واگردانی',
-'rollbackfailed'              => 'واگردانی نشد',
-'cantrollback'                => 'نمی‌توان ویرایش را واگرداند. آخرین مشارکت‌کننده تنها مؤل� این مقاله است.',
-'alreadyrolled'               => 'واگردانی آخرین ویرایش [[$1]] بوسیلهٔ [[User:$2|$2]] ([[User talk:$2|بحث]]) ممکن نیست؛ پیش از این شخص دیگری مقاله را ویرایش یا واگردانی کرده است.
-
-آخرین ویرایش توسط [[User:$3|$3]] ([[User talk:$3|بحث]]).',
-'editcomment'                 => 'توضیح ویرایش این بود: «<i>$1</i>».', # only shown if there is an edit comment
-'revertpage'                  => 'ویرایش $2 واگردانده شد به آخرین تغییری که  $1 انجام داده بود', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'ویرایش‌های $1 واگردانی شد؛ ص�حه به ویرایش $2 برگردانده شد.',
-'sessionfailure'              => 'بنظر می‌رسد مشکلی در مورد نشست کاربری شما وجود دارد؛ عمل درخواست شده بعنوان اقدام پیشگیرانه در برابر ربوده‌شدن اطلاعات نشست کاربری، لغو شد. لط�اً دکمهٔ «بازگشت» را در مرورگر خود ب�شارید و ص�حه‌ای که از آن به اینجا رسیده‌اید را مجدداً �راخوانی کنید، سپس مجدداً سعی کنید.',
+
+# Rollback
+'rollback'         => 'واگردانی ویرایش‌ها',
+'rollback_short'   => 'واگرد',
+'rollbacklink'     => 'واگردانی',
+'rollbackfailed'   => 'واگردانی نشد',
+'cantrollback'     => 'نمی‌توان ویرایش را واگرداند. آخرین مشارکت‌کننده تنها مؤل� این مقاله است.',
+'alreadyrolled'    => 'واگردانی آخرین ویرایش [[:$1]] به وسیلهٔ [[User:$2|$2]]{{int:pipe-separator}}([[User talk:$2|بحث]]) ممکن نیست؛
+پیش از این شخص دیگری مقاله را ویرایش یا واگردانی کرده‌است.
+
+آخرین ویرایش توسط [[User:$3|$3]] ([[User talk:$3|بحث]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) انجام شده‌است.',
+'editcomment'      => "خلاصهٔ ویرایش این بود: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => 'ویرایش $2 واگردانده شد به آخرین تغییری که  $1 انجام داده بود', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'ویرایش‌های $1 واگردانی شد؛ ص�حه به ویرایش $2 برگردانده شد.',
+'sessionfailure'   => 'بنظر می‌رسد مشکلی در مورد نشست کاربری شما وجود دارد؛ عمل درخواست شده بعنوان اقدام پیشگیرانه در برابر ربوده‌شدن اطلاعات نشست کاربری، لغو شد. لط�اً دکمهٔ «بازگشت» را در مرورگر خود ب�شارید و ص�حه‌ای که از آن به اینجا رسیده‌اید را مجدداً �راخوانی کنید، سپس مجدداً سعی کنید.',
+
+# Protect
 'protectlogpage'              => 'سیاههٔ_محا�ظت',
 'protectlogtext'              => 'در زیر �هرست ق�ل کردن‌ها/ازق�ل‌درآوردن‌های ص�حه‌ها آمده است.
 برای اطلاعات بیشتر به [[{{ns:project}}:سیاست ح�اظت از ص�حه‌ها]] مراجعه کنید.',
 'protectedarticle'            => '«[[$1]]» را محا�ظت کرد',
 'modifiedarticleprotection'   => 'وضعیت محا�ظت «[[$1]]» را تغییر داد',
 'unprotectedarticle'          => '[[$1]] را از محا�ظت به در آورد',
+'movedarticleprotection'      => 'تنظیمات محا�ظت را از «[[$2]]» به «[[$1]]» منتقل کرد',
 'protect-title'               => 'تغییر وضعیت محا�ظت «$1»',
+'prot_1movedto2'              => '$1 به $2 منتقل شد',
 'protect-legend'              => 'تأیید ح�اظت',
 'protectcomment'              => 'دلیل محا�ظت',
 'protectexpiry'               => 'زمان سرآمدن:',
@@ -1817,14 +2115,27 @@ $NEWPAGE
 'protect-locked-access'       => 'حساب کاربری شما اجازهٔ تغییر سطح ح�اظت ص�حه را ندارد. تنظیمات �علی ص�حهٔ $1 به این قرار است:',
 'protect-cascadeon'           => 'این ص�حه  در حال حاضر محا�ظت شده‌است زیرا در {{PLURAL:$1|ص�حهٔ|ص�حه‌های}} زیر که گزینهٔ محا�ظت آبشاری {{PLURAL:$1|آن|آن‌ها}} �عال است، 
 شما می‌توانید سطح محا�ظت این ص�حه را تغییر بدهید اما این کار تاثیری بر محا�ظت آبشاری ص�حه نخواهد گذاشت.',
-'protect-default'             => '(پیش‌�رض)',
+'protect-default'             => 'همهٔ کاربرها',
 'protect-fallback'            => 'سطح دسترسی $1 لازم است.',
-'protect-level-autoconfirmed' => 'بستن کاربران ثبت‌نام‌نکرده.',
+'protect-level-autoconfirmed' => 'بستن کاربران جدید و ثبت‌نام نکرده',
 'protect-level-sysop'         => '�قط مدیران',
 'protect-summary-cascade'     => 'آبشاری',
 'protect-expiring'            => 'زمان سرآمدن $1 (UTC)',
+'protect-expiry-indefinite'   => 'بی‌پایان',
 'protect-cascade'             => 'محا�ظت آبشاری - از همهٔ ص�حه‌هایی که در این ص�حه آمده‌اند نیز محا�ظت می‌شود.',
 'protect-cantedit'            => 'شما نمی‌تواند وضعیت ح�اظت این ص�حه را تغییر دهید، چون اجازه ویرایش آن را ندارید.',
+'protect-othertime'           => 'زمانی دیگر:',
+'protect-othertime-op'        => 'زمانی دیگر',
+'protect-existing-expiry'     => 'زمان انقضای موجود: $2، $3',
+'protect-otherreason'         => 'دلیل دیگر/اضا�ی:',
+'protect-otherreason-op'      => 'دلیل دیگر/اضا�ی',
+'protect-dropdown'            => '*دلایل متداول محا�ظت
+** خرابکاری گسترده
+** هرزنگاری گسترده
+** جنگ ویرایشی غیر سازنده
+** ص�حهٔ پر بازدید',
+'protect-edit-reasonlist'     => 'ویرایش دلایل محا�ظت',
+'protect-expiry-options'      => '۲ ساعت:2 hours,۱ روز:1 day,۳ روز:3 days,۱ ه�ته:1 week,۲ ه�ته:2 weeks,۱ ماه:1 month,۳ ماه:3 months,۶ ماه:6 months,۱ سال:1 year,بی‌پایان:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'دسترسی',
 'restriction-level'           => 'سطح محدودیت',
 'minimum-size'                => 'حداقل اندازه',
@@ -1847,7 +2158,7 @@ $NEWPAGE
 'undeletepage'                 => 'نمایش و احیای ص�حه‌های حذ�‌شده',
 'undeletepagetitle'            => "'''آن چه در ادامه می‌آید شامل نسخه‌های حذ� شدهٔ [[:$1]] است'''.",
 'viewdeletedpage'              => 'نمایش ص�حه‌های حذ�‌شده',
-'undeletepagetext'             => 'ص�حه‌های زیر حذ� شده‌اند ولی هنوز در بایگانی هستند و می‌توانند احیا شوند.
+'undeletepagetext'             => '{{PLURAL:$1|ص�حهٔ زیر حد� شده|ص�حه‌های زیر حذ� شده‌اند}} ولی هنوز در بایگانی {{PLURAL:$1|هست|هستند}} و {{PLURAL:$1|می‌تواند احیا شود|می‌توانند احیا شوند}}.
 این بایگانی ممکن است هر چند وقت تمیز شود.',
 'undelete-fieldset-title'      => 'احیای نسخه‌ها',
 'undeleteextrahelp'            => "برای احیای تمام ص�حه، همهٔ جعبه‌ها را خالی رها کرده و دکمهٔ '''''احیا''''' را کلیک کنید.
@@ -1860,12 +2171,13 @@ $NEWPAGE
 در این حالت شما باید چند نسخهٔ اخیر ص�حه را نیز احیا کنید.
 نسخه‌هایی از پرونده‌ها که شما اجازه دیدنش را نداشته باشید قابل احیا نخواهند بود.',
 'undeletehistorynoadmin'       => 'این مقاله حذ� شده‌است. دلیل حذ� این مقاله به همراه مشخصات کاربرانی که قبل از حذ� این ص�حه را ویرایش کرده‌اند، در خلاصهٔ زیر آمده‌است. متن واقعی این ویرایش‌های حذ� شده �قط در دسترس مدیران است.',
-'undelete-revision'            => 'حذ� نسخهٔ $1 از $2 توسط $3:',
+'undelete-revision'            => 'حذ� نسخهٔ $1 (به تاریخ $4 ساعت $5) توسط $3:',
 'undeleterevision-missing'     => 'نسخه نامعتبر یا م�قود است. ممکن است پیوندتان نادرست باشد یا اینکه نسخه از بایگانی حذ� یا بازیابی شده باشد .',
 'undelete-nodiff'              => 'نسخهٔ قدیمی‌تری یا�ت نشد.',
 'undeletebtn'                  => 'احیا شود!',
 'undeletelink'                 => 'احیا',
 'undeletereset'                => 'از نو',
+'undeleteinvert'               => 'وارونه کردن انتخاب',
 'undeletecomment'              => 'توضیح:',
 'undeletedarticle'             => '«$1» احیا {{PLURAL:$1|شد|شدند}}',
 'undeletedrevisions'           => '$1 نسخه احیا {{PLURAL:$1|شد|شدند}}',
@@ -1896,27 +2208,27 @@ $1',
 'blanknamespace' => '(اصلی)',
 
 # Contributions
-'contributions' => 'مشارکت‌ها',
-'mycontris'     => 'مشارکت‌های من',
-'contribsub2'   => 'برای $1 ($2)',
-'nocontribs'    => 'هیچ تغییری با این مشخصات یا�ت نشد.',
-'uctop'         => ' (بالا)',
-'month'         => 'در این ماه (و قبل از آن)',
-'year'          => 'در این سال (و قبل از آن)',
-
-'sp-contributions-newbies'     => '�قط مشارکت‌های تازه‌واردان نمایش داده شود',
-'sp-contributions-newbies-sub' => 'برای تازه‌کاران',
-'sp-contributions-blocklog'    => 'سیاههٔ بسته‌شدن‌ها',
-'sp-contributions-search'      => 'جستجوی مشارکت‌ها',
-'sp-contributions-username'    => 'نشانی آی‌پی یا نام کاربری:',
-'sp-contributions-submit'      => 'جستجو',
+'contributions'       => 'مشارکت‌ها',
+'contributions-title' => 'مشارکت‌های کاربری $1',
+'mycontris'           => 'مشارکت‌های من',
+'contribsub2'         => 'برای $1 ($2)',
+'nocontribs'          => 'هیچ تغییری با این مشخصات یا�ت نشد.',
+'uctop'               => ' (بالا)',
+'month'               => 'در این ماه (و قبل از آن)',
+'year'                => 'در این سال (و قبل از آن)',
+
+'sp-contributions-newbies'       => '�قط مشارکت‌های تازه‌واردان نمایش داده شود',
+'sp-contributions-newbies-sub'   => 'برای تازه‌کاران',
+'sp-contributions-newbies-title' => 'مشارکت‌های کاربری برای حساب‌های تازه‌کار',
+'sp-contributions-blocklog'      => 'سیاههٔ بسته‌شدن‌ها',
+'sp-contributions-search'        => 'جستجوی مشارکت‌ها',
+'sp-contributions-username'      => 'نشانی آی‌پی یا نام کاربری:',
+'sp-contributions-submit'        => 'جستجو',
 
 # What links here
 'whatlinkshere'            => 'پیوندهای به این ص�حه',
 'whatlinkshere-title'      => 'ص�حه‌هایی که به «$1» پیوند دارند',
 'whatlinkshere-page'       => 'ص�حه:',
-'whatlinkshere-barrow'     => '&gt;',
-'linklistsub'              => '(�هرست پیوندها)',
 'linkshere'                => "ص�حه‌های زیر به '''[[:$1]]''' پیوند دارند:",
 'nolinkshere'              => "هیچ ص�حه‌ای به '''[[:$1]]''' پیوند ندارد.",
 'nolinkshere-ns'           => "هیچ ص�حه‌ای از �ضای نام انتخاب شده به '''[[:$1]]''' پیوند ندارد.",
@@ -1935,9 +2247,9 @@ $1',
 # Block/unblock
 'blockip'                         => 'بستن کاربر',
 'blockip-legend'                  => 'بستن کاربر',
-'blockiptext'                     => 'از �رم زیر برای بستن دسترسی ویرایش یک نشانی IP یا نام کاربری مشخص است�اده کنید. این کار �قط �قط باید برای جلوگیری از خرابکاری انجام شود، و بر اساس [[{{ns:project}}:قطع دسترسی|سیاست قطع دسترسی]]. دلیل مشخص این کار را در زیر ذکر کنید (مثلاً با ذکر ص�حه‌های به‌خصوصی که تخریب شده‌اند).',
-'ipaddress'                       => 'نشانی IP/نام کاربر',
-'ipadressorusername'              => 'نشانی IP یا نام کاربری',
+'blockiptext'                     => 'از �رم زیر برای بستن دسترسی ویرایش یک نشانی آی‌پی یا نام کاربری مشخص است�اده کنید. این کار �قط �قط باید برای جلوگیری از خرابکاری انجام شود، و بر اساس [[{{ns:project}}:قطع دسترسی|سیاست قطع دسترسی]]. دلیل مشخص این کار را در زیر ذکر کنید (مثلاً با ذکر ص�حه‌های به‌خصوصی که تخریب شده‌اند).',
+'ipaddress'                       => 'نشانی آی‌پی/نام کاربر',
+'ipadressorusername'              => 'نشانی آی‌پی یا نام کاربری',
 'ipbexpiry'                       => 'خاتمه',
 'ipbreason'                       => 'دلیل',
 'ipbreasonotherlist'              => 'دیگر دلایل',
@@ -1952,32 +2264,38 @@ $1',
 'ipbanononly'                     => '�قط بستن کاربران گمنام',
 'ipbcreateaccount'                => 'جلوگیری از ایجاد حساب',
 'ipbemailban'                     => 'جلوگیری از ارسال پست الکترونیکی',
-'ipbenableautoblock'              => 'بستن  خودکار آخرین نشانی اینترنتی است�اده شده توسط کاربر و نشانی‌های دیگری که از آن‌ها برای ویرایش تلاش می‌کند',
+'ipbenableautoblock'              => 'بستن  خودکار آخرین نشانی آی‌پی است�اده شده توسط کاربر و نشانی‌های دیگری که از آن‌ها برای ویرایش تلاش می‌کند',
 'ipbsubmit'                       => 'این کاربر بسته شود',
 'ipbother'                        => 'زمانی دیگر',
 'ipboptions'                      => '۲ ساعت:2 hours,۱ روز:1 day,۳ روز:3 days,۱ ه�ته:1 week,۲ ه�ته:2 weeks,۱ ماه:1 month,۳ ماه:3 months,۶ ماه:6 months,۱ سال:1 year,بی‌پایان:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'دیگر',
 'ipbotherreason'                  => 'دلیل دیگر/اضا�ی:',
-'ipbhidename'                     => 'نه�تن نام کاربری/آی‌پی از سیاههٔ بسته‌شدن‌ها، �هرست بسته‌شدگان کنونی و �هرست کاربران.',
+'ipbhidename'                     => 'نه�تن نام کاربری/نشانی آی‌پی از سیاههٔ بسته‌شدن‌ها، �هرست بسته‌شدگان کنونی و �هرست کاربران.',
 'ipbwatchuser'                    => 'پیگیری ص�حهٔ کاربری و بحث این کاربر',
+'ipballowusertalk'                => 'به این کاربر اجازه بده در مدت قطع دسترسی ص�حهٔ بحث خودش را ویرایش کند.',
+'ipb-change-block'                => 'بستن دوبارهٔ کاربر با این تنظیم‌ها',
 'badipaddress'                    => 'کاربری با این نام وجود ندارد.',
 'blockipsuccesssub'               => 'بستن با مو�قیت انجام شد',
 'blockipsuccesstext'              => '«$1» بسته شده است.
-<br />برای بررسی بسته‌شدن‌ها، به [[Special:IPBlockList|�هرست نشانی‌های IP و نام‌های کاربری بسته‌شده]] مراجعه کنید.',
+<br />برای بررسی بسته‌شدن‌ها، به [[Special:IPBlockList|�هرست نشانی‌های آی‌پی و نام‌های کاربری بسته‌شده]] مراجعه کنید.',
 'ipb-edit-dropdown'               => 'دلایل قطع دسترسی',
 'ipb-unblock-addr'                => 'بازکردن $1',
-'ipb-unblock'                     => 'بازکردن نام کاربری یا نشانی آی‌پی',
+'ipb-unblock'                     => 'باز کردن نام کاربری یا نشانی آی‌پی',
 'ipb-blocklist-addr'              => 'بستن‌های موجود برای $1',
 'ipb-blocklist'                   => 'دیدن� بَست‌های موجود',
+'ipb-blocklist-contribs'          => 'مشارکت‌های $1',
 'unblockip'                       => 'باز کردن کاربر',
-'unblockiptext'                   => 'برای باز گرداندن دسترسی نوشتن به یک نشانی IP یا نام کاربری بسته‌شده
+'unblockiptext'                   => 'برای باز گرداندن دسترسی نوشتن به یک نشانی آی‌پی یا نام کاربری بسته‌شده
 از �رم زیر است�اده کنید.',
-'ipusubmit'                       => 'باز کردن این نشانی',
+'ipusubmit'                       => 'باز کردن دسترسی',
 'unblocked'                       => 'دسترسی [[User:$1|$1]] دوباره برقرار شد.',
 'unblocked-id'                    => 'قطع دسترسی شماره $1 خاتمه یا�ت',
-'ipblocklist'                     => 'نشانی‌های اینترنتی و نام‌های کاربری بسته‌شده',
+'ipblocklist'                     => 'نشانی‌های آی‌پی و نام‌های کاربری بسته‌شده',
 'ipblocklist-legend'              => 'جستجوی کاربر بسته شده',
-'ipblocklist-username'            => 'نام کاربری یا نشانی IP',
+'ipblocklist-username'            => 'نام کاربری یا نشانی آی‌پی',
+'ipblocklist-sh-userblocks'       => '$1 قطع دسترسی کاربر',
+'ipblocklist-sh-tempblocks'       => '$1 قطع دسترسی موقت',
+'ipblocklist-sh-addressblocks'    => '$1 قطع دسترسی نشانی آی‌پی',
 'ipblocklist-submit'              => 'جستجو',
 'blocklistline'                   => '$1، $2 $3 را بست ($4)',
 'infiniteblock'                   => 'بی‌پایان',
@@ -1986,37 +2304,45 @@ $1',
 'noautoblockblock'                => 'بستن خودکار غیر�عال است.',
 'createaccountblock'              => 'امکان ایجاد حساب مسدود است.',
 'emailblock'                      => 'پست الکتروینکی مسدود شد',
+'blocklist-nousertalk'            => 'نمی تواند ص�حهٔ بحث خود را ویرایش کند',
 'ipblocklist-empty'               => '�هرست بسته‌شدن‌ها خالی‌است.',
-'ipblocklist-no-results'          => 'دسترسی حساب کاربری یا نشانی اینترنتی مورد نظر قطع نیست.',
+'ipblocklist-no-results'          => 'دسترسی حساب کاربری یا نشانی آی‌پی مورد نظر قطع نیست.',
 'blocklink'                       => 'بسته شود',
 'unblocklink'                     => 'باز شود',
+'change-blocklink'                => 'تغییر قطع دسترسی',
 'contribslink'                    => 'مشارکت‌ها',
-'autoblocker'                     => 'به طور خودکار بسته شد چون IP شما و «$1» یکی است. دلیل «$2».',
+'autoblocker'                     => 'به طور خودکار بسته شد چون آی‌پی شما و «$1» یکی است. دلیل «$2».',
 'blocklogpage'                    => 'سیاههٔ_بسته‌شدن‌ها',
-'blocklogentry'                   => '«$1»  $2 بسته شد. $3',
-'blocklogtext'                    => 'این سیاهه‌ای از اعمال بستن و باز کردن کاربرها است. نشانی‌های IPی که به طور
-خودکار بسته شده‌اند �هرست نشده‌اند. برای �هرست محرومیت‌ها و بسته‌شدن‌های عملیاتی در لحظهٔ حاضر،
-به [[Special:IPBlockList|�هرست IPهای بسته]] مراجعه کنید.',
+'blocklog-fulllog'                => 'سیاه بستن کامل',
+'blocklogentry'                   => '$1 را برای $2 بست $3',
+'reblock-logentry'                => 'تنظیم‌های قطع دسترسی [[$1]] را تغییر داد به پایان قطع دسترسی در $2 ساعت $3',
+'blocklogtext'                    => 'این سیاهه‌ای از اعمال بستن و باز کردن کاربرها است.
+نشانی‌های IPی که به طور خودکار بسته شده‌اند �هرست نشده‌اند.
+برای �هرست محرومیت‌ها و بسته‌شدن‌های عملیاتی در لحظهٔ حاضر، به [[Special:IPBlockList|�هرست آی‌پی‌های بسته]] مراجعه کنید.',
 'unblocklogentry'                 => '«$1» باز شد',
 'block-log-flags-anononly'        => '�قط کاربران گمنام',
 'block-log-flags-nocreate'        => 'قابلیت ایجاد حساب غیر�عال شد.',
 'block-log-flags-noautoblock'     => 'قطع دسترسی خودکار غیر�عال شد',
 'block-log-flags-noemail'         => 'پست الکترونیکی مسدود شد',
+'block-log-flags-nousertalk'      => 'ص�حهٔ بحث خود را نمی‌تواند ویرایش کند',
 'block-log-flags-angry-autoblock' => 'قطع دسترسی خودکار پیشر�ته �عال شد',
 'range_block_disabled'            => 'قابلیت بستن گستره‌ای مدیران سلب  شده‌است.',
 'ipb_expiry_invalid'              => 'زمان خاتمه نامعتبر.',
 'ipb_expiry_temp'                 => 'قطع دسترسی کاربرهای پهنان باید همیشگی باشد.',
 'ipb_already_blocked'             => '«$1» همین الان هم بسته‌است.',
+'ipb-needreblock'                 => '== قطع دسترسی از قبل ==
+دسترسی $1 از قبل بسته است. آیا می‌خواهید تنظیم‌های آن را تغییر دهید؟',
 'ipb_cant_unblock'                => 'خطا: آی‌دی بسته‌شدن $1 یا�ت نشد. ممکن است پیشتر باز شده باشد.',
-'ipb_blocked_as_range'            => 'Error: نشانی اینترنتی $1 به شکل مستقیم بسته نشده‌است و نمی‌تواند باز شود. این نشانی به همراه بازه  $2, بسته شده که قابل باز شدن است.',
-'ip_range_invalid'                => 'گسترهٔ آی‌پی (IP) نامعتبر است.',
+'ipb_blocked_as_range'            => 'Error: نشانی آی‌پی $1 به شکل مستقیم بسته نشده‌است و نمی‌تواند باز شود. این نشانی به همراه بازه  $2, بسته شده که قابل باز شدن است.',
+'ip_range_invalid'                => 'گسترهٔ نشانی اینترنتی (آی‌پی) نامعتبر است.',
 'blockme'                         => 'دسترسی مرا قطع کن',
 'proxyblocker'                    => 'پروکسی‌بَند',
 'proxyblocker-disabled'           => 'این عملکرد غیر�عال شده‌است.',
-'proxyblockreason'                => 'نشانیIP شما بسته شده است چون یک پیشکار (proxy) باز است. لط�اً با تأمین‌کنندهٔ اینترنت خود تماس بگیرید و آنها را از این مشکل امنیتی جدی آگاه کنید.',
+'proxyblockreason'                => 'نشانیآی‌پی شما بسته شده است چون یک پیشکار (proxy) باز است. لط�اً با تأمین‌کنندهٔ اینترنت خود تماس بگیرید و آنها را از این مشکل امنیتی جدی آگاه کنید.',
 'proxyblocksuccess'               => 'انجام شد.',
-'sorbsreason'                     => 'نشانی اینترنتی (IP) شما توسط DNSBL به عنوان یک پروکسی باز گزارش شده‌است.',
-'sorbs_create_account_reason'     => 'نشانی اینترنتی (IP) شما توسط DNSBL به عنوان یک پروکسی باز گزارش شده‌است. شما اجازهٔ ساختن حساب کاربری ندارید.',
+'sorbsreason'                     => 'نشانی اینترنتی (آی‌پی) شما توسط DNSBL به عنوان یک پروکسی باز گزارش شده‌است.',
+'sorbs_create_account_reason'     => 'نشانی اینترنتی (آی‌پی) شما توسط DNSBL به عنوان یک پروکسی باز گزارش شده‌است. شما اجازهٔ ساختن حساب کاربری ندارید.',
+'cant-block-while-blocked'        => 'در مدتی که دسترسی شما بسته است نمی‌توانید دسترسی کاربران دیگر را قطع کنید.',
 
 # Developer tools
 'lockdb'              => 'ق�ل کردن پایگاه داده',
@@ -2039,9 +2365,9 @@ $1',
 'databasenotlocked'   => 'پایگاه داده ق�ل نیست.',
 
 # Move page
-'move-page'               => 'انتقال $1',
-'move-page-legend'        => 'انتقال ص�حه',
-'movepagetext'            => "با است�اده از �رم زیر نام ص�حه تغییر خواهد کرد، و تمام تاریخچه‌اش به نام جدید منتقل خواهد شد.
+'move-page'                    => 'انتقال $1',
+'move-page-legend'             => 'انتقال ص�حه',
+'movepagetext'                 => "با است�اده از �رم زیر نام ص�حه تغییر خواهد کرد، و تمام تاریخچه‌اش به نام جدید منتقل خواهد شد.
 عنوان قدیمی تبدیل به یک ص�حهٔ تغییر مسیر به عنوان جدید خواهد شد.
 پیوندهای که به عنوان ص�حهٔ قدیمی وجود دارند، تغییر نخواهند کرد؛ حتماً تغییر مسیرهای دوتایی یا خراب را بررسی کنید.
 '''شما''' مسئول اطمینان از این هستید که پیوندها هنوز به همان‌جایی که قرار است بروند.
@@ -2053,50 +2379,64 @@ $1',
 '''هشدار!'''
 انتقال ص�حه‌ها به نام جدید ممکن است تغییر اساسی و غیرمنتظره‌ای برای ص�حه‌های محبوب باشد؛
 لط�اً مطمئن شوید که قبل از انتقال دادن ص�حه، عواقب این کار را درک می‌کنید.",
-'movepagetalktext'        => "ص�حهٔ بحث مربوط، اگر وجود داشته باشد، بطور خودکار همراه با مقالهٔ اصلی منتقل خواهد شد '''مگر اینکه''' :
+'movepagetalktext'             => "ص�حهٔ بحث مربوط، اگر وجود داشته باشد، بطور خودکار همراه با مقالهٔ اصلی منتقل خواهد شد '''مگر اینکه''' :
 * در حال انتقال ص�حه از این �ضای نام به �ضای نام دیگری باشید،
 * یک ص�حهٔ بحث غیرخالی تحت این نام جدید وجود داشته باشد، یا
 * جعبهٔ زیر را تیک نزده باشید.
 
 در این حالات، باید ص�حه را بطور دستی انتقال داده و یا محتویات دو ص�حه را با ویرایش ادغام کنید.",
-'movearticle'             => 'انتقال ص�حه',
-'movenotallowed'          => 'شما اجازهٔ انتقال دادن ص�حه‌ها را ندارید.',
-'newtitle'                => 'به عنوان جدید',
-'move-watch'              => 'پی‌گیری این ص�حه',
-'movepagebtn'             => 'ص�حه منتقل شود',
-'pagemovedsub'            => 'انتقال با مو�قیت انجام شد',
-'movepage-moved'          => "<big>'''«$1» به «$2» منتقل شد'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'ص�حه‌ای با این نام از قبل وجود دارد، یا نامی که انتخاب کرده‌اید معتبر نیست.
+'movearticle'                  => 'انتقال ص�حه',
+'movenologin'                  => 'به سیستم وارد نشده‌اید',
+'movenologintext'              => 'برای انتقال ص�حه‌ها باید کاربر ثبت‌شده بوده و
+[[Special:UserLogin|به سیستم وارد شوید]].',
+'movenotallowed'               => 'شما اجازهٔ انتقال دادن ص�حه‌ها را ندارید.',
+'movenotallowedfile'           => 'شما اجازهٔ انتقال پرونده‌ها را ندارید.',
+'cant-move-user-page'          => 'شما اجازه ندارید ص�حه‌های کاربری سرشاخه را انتقال دهید.',
+'cant-move-to-user-page'       => 'شما اجازه ندارید که یک صح�ه را به یک ص�حهٔ کاربر انتقال دهید (به استثنای زیر ص�حه‌های کاربری).',
+'newtitle'                     => 'به عنوان جدید',
+'move-watch'                   => 'پی‌گیری این ص�حه',
+'movepagebtn'                  => 'ص�حه منتقل شود',
+'pagemovedsub'                 => 'انتقال با مو�قیت انجام شد',
+'movepage-moved'               => "<big>'''«$1» به «$2» منتقل شد'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'یک تغییر مسیر ایجاد شد.',
+'movepage-moved-noredirect'    => 'از ایجاد تغییر مسیر ممانعت شد.',
+'articleexists'                => 'ص�حه‌ای با این نام از قبل وجود دارد، یا نامی که انتخاب کرده‌اید معتبر نیست.
 لط�اً نام دیگری انتخاب کنید.',
-'cantmove-titleprotected' => 'شما نمی‌توانید ص�حه را به این نشانی انتقال دهید، چرا که عنوان جدید در برابر ایجاد محا�ظت شده‌است',
-'talkexists'              => 'ص�حه با مو�قیت منتقل شد، ولی ص�حهٔ بحث را، به این دلیل که ص�حهٔ بحثی در عنوان جدید
+'cantmove-titleprotected'      => 'شما نمی‌توانید ص�حه را به این نشانی انتقال دهید، چرا که عنوان جدید در برابر ایجاد محا�ظت شده‌است',
+'talkexists'                   => 'ص�حه با مو�قیت منتقل شد، ولی ص�حهٔ بحث را، به این دلیل که ص�حهٔ بحثی در عنوان جدید
 وجود دارد، نمی‌توان منتقل کرد. لط�اً آنها را دستی ترکیب کنید.',
-'movedto'                 => 'منتقل شد به',
-'movetalk'                => 'ص�حهٔ بحث هم منتقل شود',
-'move-subpages'           => 'تمام زیرص�حه‌ها، در صورت وجود، منتقل شود',
-'move-talk-subpages'      => 'تمام زیرص�حه‌های ص�حهٔ بحث، در صورت وجود، منتقل شود',
-'movepage-page-exists'    => 'ص�حهٔ $1 از قبل وجود دارد و نمی‌تواند به طور خودکار جایگزین شود.',
-'movepage-page-moved'     => 'ص�حهٔ $1 به $2 انتقال یا�ت.',
-'movepage-page-unmoved'   => 'ص�حهٔ $1 را نمی‌توان به $2 انتقال داد.',
-'movepage-max-pages'      => 'حداکثر تعداد ص�حه‌های ممکن ($1 {{PLURAL:$1|ص�حه|ص�حه}}) که می‌توان انتقال داد منتقل شدند و ص�حه‌های دیگر را نمی‌توان به طور خودکار منتقل کرد.',
-'1movedto2'               => '$1 به $2 منتقل شد',
-'1movedto2_redir'         => '$1 به $2 که قبلاً ص�حهٔ تغییر مسیر بود، منتقل شد',
-'movelogpage'             => 'سیاههٔ انتقال',
-'movelogpagetext'         => 'در زیر �هرستی از ص�حه‌های منتقل شده آمده است.',
-'movereason'              => 'دلیل انتقال',
-'revertmove'              => 'واگردانی',
-'delete_and_move'         => 'حذ� و انتقال',
-'delete_and_move_text'    => '== نیاز به حذ� ==
+'movedto'                      => 'منتقل شد به',
+'movetalk'                     => 'ص�حهٔ بحث هم منتقل شود',
+'move-subpages'                => 'تمام زیرص�حه‌ها، در صورت وجود، منتقل شود',
+'move-talk-subpages'           => 'تمام زیرص�حه‌های ص�حهٔ بحث، در صورت وجود، منتقل شود',
+'movepage-page-exists'         => 'ص�حهٔ $1 از قبل وجود دارد و نمی‌تواند به طور خودکار جایگزین شود.',
+'movepage-page-moved'          => 'ص�حهٔ $1 به $2 انتقال یا�ت.',
+'movepage-page-unmoved'        => 'ص�حهٔ $1 را نمی‌توان به $2 انتقال داد.',
+'movepage-max-pages'           => 'حداکثر تعداد ص�حه‌های ممکن ($1 {{PLURAL:$1|ص�حه|ص�حه}}) که می‌توان انتقال داد منتقل شدند و ص�حه‌های دیگر را نمی‌توان به طور خودکار منتقل کرد.',
+'1movedto2'                    => '$1 به $2 منتقل شد',
+'1movedto2_redir'              => '$1 به $2 که قبلاً ص�حهٔ تغییر مسیر بود، منتقل شد',
+'move-redirect-suppressed'     => 'تغییر مسیر �رونشانده شد',
+'movelogpage'                  => 'سیاههٔ انتقال',
+'movelogpagetext'              => 'در زیر �هرستی از ص�حه‌های منتقل شده آمده است.',
+'movereason'                   => 'دلیل انتقال',
+'revertmove'                   => 'واگردانی',
+'delete_and_move'              => 'حذ� و انتقال',
+'delete_and_move_text'         => '== نیاز به حذ� ==
 
 مقاله‌ٔ مقصد «[[:$1]]» وجود دارد. آیا می‌خواهید آن را حذ� کنید تا انتقال ممکن شود؟',
-'delete_and_move_confirm' => 'بله، ص�حه حذ� شود',
-'delete_and_move_reason'  => 'حذ� برای ممکن‌شدن انتقال',
-'selfmove'                => 'عناوین ص�حهٔ مبداء و مقصد یکی است؛ انتقال ص�حه به خودش ممکن نیست.',
-'immobile_namespace'      => 'عنوان مقصد از نوع خاصی است؛ امکان انتقال ص�حه‌ها به آن �ضای نام وجود ندارد.',
-'imagenocrossnamespace'   => 'امکان انتقال تصویر به �ضای نام غیر تصویر وجود ندارد',
-'imagetypemismatch'       => 'پسوند پرونده جدید با نوع آن سازگار نیست',
-'imageinvalidfilename'    => 'نام پروندهٔ هد� غیر مجاز است',
-'fix-double-redirects'    => 'به روز کردن تمامی تغییر مسیرهایی که به مقالهٔ اصلی اشاره می‌کنند',
+'delete_and_move_confirm'      => 'بله، ص�حه حذ� شود',
+'delete_and_move_reason'       => 'حذ� برای ممکن‌شدن انتقال',
+'selfmove'                     => 'عناوین ص�حهٔ مبداء و مقصد یکی است؛ انتقال ص�حه به خودش ممکن نیست.',
+'immobile-source-namespace'    => 'امکان انتقال ص�حه‌ها در �ضای نام «$1» را ندارد',
+'immobile-target-namespace'    => 'امکان انتقال ص�حه‌ها به �ضای نام «$1» را ندارد',
+'immobile-target-namespace-iw' => 'پیوند میان‌ویکی هد�ی مجاز برای انتقال ص�حه نیست.',
+'immobile-source-page'         => 'این ص�حه قابل انتقال نیست.',
+'immobile-target-page'         => 'امکان انتقال به این عنوان مقصد وجود ندارد.',
+'imagenocrossnamespace'        => 'امکان انتقال تصویر به �ضای نام غیر تصویر وجود ندارد',
+'imagetypemismatch'            => 'پسوند پرونده جدید با نوع آن سازگار نیست',
+'imageinvalidfilename'         => 'نام پروندهٔ هد� غیر مجاز است',
+'fix-double-redirects'         => 'به روز کردن تمامی تغییر مسیرهایی که به مقالهٔ اصلی اشاره می‌کنند',
+'move-leave-redirect'          => 'بر جا گذاشتن یک تغییر مسیر',
 
 # Export
 'export'            => 'برون‌بری ص�حه‌ها',
@@ -2134,9 +2474,12 @@ $1',
 'import'                     => 'درون‌ریزی ص�حه‌ها',
 'importinterwiki'            => 'درون‌ریزی تراویکیانه',
 'import-interwiki-text'      => 'یک ویکی و یک نام ص�حه را انتخاب کنید تا اطلاعات از آن درون‌ریزی شود. تاریخ نسخه‌ها و نام ویرایش‌کنندگان ثابت خواهد ماند. اطلاعات مربوط به درون‌ریزی ص�حه‌ها در [[Special:Log/import|سیاههٔ درون‌ریزی‌ها]] درج خواهد شد.',
+'import-interwiki-source'    => 'ویکی/ص�حهٔ منبع:',
 'import-interwiki-history'   => 'تمام نسخه‌های تاریخچهٔ این ص�حه انتقال داده شود',
 'import-interwiki-submit'    => 'درون‌ریزی شود',
 'import-interwiki-namespace' => '�ضای نام مقصد:',
+'import-upload-filename'     => 'نام پرونده:',
+'import-comment'             => 'توضیح',
 'importtext'                 => 'لط�اً پرونده را از منبع ویکی با کمک ابزار Special:Export برون‌بری کنید، روی دستگاه‌تان ذخیره کنید و این‌جا بارگذاری نمایید.',
 'importstart'                => 'در حال درون‌ریزی ص�حه‌ها...',
 'import-revision-count'      => '$1 {{PLURAL:$1|ویرایش|ویرایش}}',
@@ -2170,19 +2513,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|نسخه|نسخه}} از $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'ص�حهٔ کاربری من',
-'tooltip-pt-anonuserpage'         => 'ص�حهٔ کاربری آی‌پی‌ای که با آن ویرایش می‌کنید.',
-'tooltip-pt-mytalk'               => 'ص�حهٔ بحث من',
-'tooltip-pt-anontalk'             => 'بحث پیرامون ویرایش‌های این آی‌پی',
+'tooltip-pt-userpage'             => 'ص�حهٔ کاربری شما',
+'tooltip-pt-anonuserpage'         => 'ص�حهٔ کاربری نشانی آی‌پی‌ای که با آن ویرایش می‌کنید.',
+'tooltip-pt-mytalk'               => 'ص�حهٔ بحث شما',
+'tooltip-pt-anontalk'             => 'بحث پیرامون ویرایش‌های این نشانی آی‌پی',
 'tooltip-pt-preferences'          => 'ترجیحات من',
 'tooltip-pt-watchlist'            => '�هرست ص�حه‌هایی که شما تغییرات آن‌ها را پی‌گیری می‌کنید',
-'tooltip-pt-mycontris'            => '�هرست مشارکت‌های من',
+'tooltip-pt-mycontris'            => '�هرست مشارکت‌های شما',
 'tooltip-pt-login'                => 'توصیه می‌شود که به سیستم وارد شوید لیکن اجباری نیست.',
 'tooltip-pt-anonlogin'            => 'هرآینه توصیه می‌شود که به سیستم وارد شوید لیکن اجباری نیست.',
 'tooltip-pt-logout'               => 'خروج از سیستم',
 'tooltip-ca-talk'                 => 'گ�تگو پیرامون ص�حهٔ محتوا',
 'tooltip-ca-edit'                 => 'شما می‌توانید این ص�حه را ویرایش کنید. لط�اً پیش از ذخیره از دکمهٔ پیش‌نمایش است�اده کنید.',
-'tooltip-ca-addsection'           => 'توضیحی به این بحث اضا�ه کنید.',
+'tooltip-ca-addsection'           => 'یک بخش جدید ایجاد کنید',
 'tooltip-ca-viewsource'           => 'این ص�حه محا�ظت‌شده است. می‌توانید متن مبدأ آن را مشاهده کنید.',
 'tooltip-ca-history'              => 'نسخه‌های پیشین این ص�حه',
 'tooltip-ca-protect'              => 'محا�ظت از این ص�حه',
@@ -2229,6 +2572,8 @@ $1',
 'tooltip-watch'                   => 'این ص�حه را به �هرست پی‌گیری‌های خود بیا�زایید.',
 'tooltip-recreate'                => 'ایجاد دوبارهٔ ص�حه صر� نظر از حذ� شدن قبلی آن',
 'tooltip-upload'                  => 'شروع بارگذاری',
+'tooltip-rollback'                => '«واگردانی» ویرایش(های) آخرین ویرایش‌کننده در این صح�ه را با یک کلیک باز می‌گرداند.',
+'tooltip-undo'                    => '«خنثی‌سازی» این ویرایش را خنثی می‌کند و �رم ویرایش را در حالت پیش‌نمایش باز می‌کند تا امکان ا�زودن دلیلی در خلاصه ویرایش را بدهد.',
 
 # Stylesheets
 'common.css'   => '/* دستورات این بخش همهٔ کاربران را تحت تاثیر قرار می‌دهند. */',
@@ -2240,12 +2585,12 @@ $1',
 'notacceptable'     => 'کارگذار این ویکی از ارسال داده به شکلی که برنامهٔ شما بتواند نمایش بدهد، عاجز است.',
 
 # Attribution
-'anonymous'        => 'کاربر(ان) گمنام {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|کاربر|کاربران}} گمنام {{SITENAME}}',
 'siteuser'         => '$1، کاربر {{SITENAME}}',
 'lastmodifiedatby' => 'این ص�حه آخرین بار در $2، $1 به دست $3 تغییر یا�ته‌است.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'بر اساس اثری از $1',
 'others'           => 'دیگران',
-'siteusers'        => '$1، کاربر(ان) {{SITENAME}}',
+'siteusers'        => '$1، {{PLURAL:$2|کاربر|کاربران}} {{SITENAME}}',
 'creditspage'      => 'اعتبارات این ص�حه',
 'nocredits'        => 'اطلاعات سازندگان این ص�حه موجود نیست.',
 
@@ -2266,6 +2611,16 @@ $1',
 'numauthors'     => 'شمار نویسندگان متمایز (مقاله): $1',
 'numtalkauthors' => 'تعداد مؤل�ان مختل� (ص�حهٔ بحث): $1',
 
+# Skin names
+'skinname-standard'    => 'کلاسیک',
+'skinname-nostalgia'   => 'نوستالژی',
+'skinname-cologneblue' => 'آبی کلون',
+'skinname-monobook'    => 'مونوبوک',
+'skinname-myskin'      => 'پوستهٔ من',
+'skinname-chick'       => 'شیک',
+'skinname-simple'      => 'ساده',
+'skinname-modern'      => 'مدرن',
+
 # Math options
 'mw_math_png'    => 'همیشه PNG کشیده شود',
 'mw_math_simple' => 'اگر خیلی ساده بود HTML وگرنه PNG',
@@ -2286,11 +2641,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'شما نمی‌توانید به تغییرات انجام شده توسط خودتان برچسب گشت بزنید.',
 
 # Patrol log
-'patrol-log-page'   => 'سیاههٔ گشت',
-'patrol-log-header' => 'این سیاهه‌ای از ویرایش‌های گشت‌خورده است.',
-'patrol-log-line'   => 'به $1 از $2 برچسب گشت زد $3',
-'patrol-log-auto'   => '(خودکار)',
-'patrol-log-diff'   => 'نسخه $1',
+'patrol-log-page'      => 'سیاههٔ گشت',
+'patrol-log-header'    => 'این سیاهه‌ای از ویرایش‌های گشت‌خورده است.',
+'patrol-log-line'      => 'به $1 از $2 برچسب گشت زد $3',
+'patrol-log-auto'      => '(خودکار)',
+'patrol-log-diff'      => 'نسخه $1',
+'log-show-hide-patrol' => 'سیاههٔ گشت $1',
 
 # Image deletion
 'deletedrevision'                 => '$1 نسخهٔ حذ� شدهٔ قدیمی',
@@ -2307,6 +2663,9 @@ $1',
 'previousdiff' => '→ ت�اوت قدیمی‌تر',
 'nextdiff'     => 'ت�اوت جدیدتر �',
 
+# Visual comparison
+'visual-comparison' => 'مقایسهٔ دیداری',
+
 # Media information
 'mediawarning'         => "'''هشدار''': این پرونده ممکن است حاوی کدهای مخربی باشد که با اجرای آن رایانهٔ شما آسیب ببیند.",
 'imagemaxsize'         => 'محدودکردن ابعاد تصویر نمایش‌داده‌شده در ص�حهٔ توصی� تصویر، به ابعاد:',
@@ -2320,10 +2679,12 @@ $1',
 'show-big-image'       => 'تصویر با ت�کیک‌پذیری بالاتر',
 'show-big-image-thumb' => '<small>اندازهٔ این پیش‌نمایش: &#8206;$1 × $2 پیکسل</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'گالری پرونده‌های جدید',
 'imagelisttext'         => 'در زیر �هرست $1 {{PLURAL:$1|تصویری|تصویری}} که $2 مرتب شده است آمده است.',
 'newimages-summary'     => 'این ص�حهٔ ویژه آخرین پرونده‌های بارگذاری شده را نمایش می‌دهد',
+'newimages-legend'      => 'پالودن',
+'newimages-label'       => 'نام پرونده (یا قسمتی از آن):',
 'showhidebots'          => '(ویرایش ر�بات‌ها $1)',
 'noimages'              => 'چیزی برای دیدن نیست.',
 'ilsubmit'              => 'جستجو',
@@ -2341,8 +2702,7 @@ $1',
 'metadata-help'     => 'این پرونده حاوی اطلاعات اضا�ه‌ای است که احتمالاً توسط دوربین دیجیتالی‌ یا پویشگری که در ایجاد یا دیجیتالی‌کردن آن به کار ر�ته‌است، ا�زوده شده‌است. اگر پرونده از وضعیت ابتدایی‌اش تغییر داده شده باشد آنگاه ممکن است شرح و ت�صیلات موجود اطلاعات عکس را تماماً بازتاب ندهد.',
 'metadata-expand'   => 'نمایش جزئیات ت�صیلی',
 'metadata-collapse' => 'نه�تن جزئیات ت�صیلی',
-'metadata-fields'   => '�رداده EXIF نشان داده شده در این پیغام وقتی جدول �راداده‌های تصویر جمع شده باشد هم نمایش داده می‌شوند.
-بقیهٔ موارد تنها زمانی نشان داده می‌شوند که جدول یادشده باز شود.
+'metadata-fields'   => '�رادادهٔ EXIF نشان داده شده در این پیغام وقتی جدول �راداده‌های تصویر جمع شده باشد هم نمایش داده می‌شوند. بقیهٔ موارد تنها زمانی نشان داده می‌شوند که جدول یاد شده باز شود.
 * make
 * model
 * datetimeoriginal
@@ -2532,6 +2892,18 @@ $1',
 'exif-lightsource-24'  => 'لامپ تنگستن کارخانه ISO',
 'exif-lightsource-255' => 'سایر',
 
+# Flash modes
+'exif-flash-fired-0'    => '�لاش زده نشد',
+'exif-flash-fired-1'    => 'با زدن �لاش',
+'exif-flash-return-0'   => '�اقد عملکرد کش� نور انعکاسی',
+'exif-flash-return-2'   => 'نور انعکاسی کش� نشد',
+'exif-flash-return-3'   => 'نور انعکاسی کش� شد',
+'exif-flash-mode-1'     => '�لاش زدن اجباری',
+'exif-flash-mode-2'     => 'جلوگیری اجباری از �لاش زدن',
+'exif-flash-mode-3'     => 'حالت خودکار',
+'exif-flash-function-1' => '�اقد عملکرد �لاش',
+'exif-flash-redeye-1'   => 'حالت اصلاح سرخی چشم‌ها',
+
 'exif-focalplaneresolutionunit-2' => 'اینچ',
 
 'exif-sensingmethod-1' => 'تعری� نشده',
@@ -2691,24 +3063,13 @@ $1
 لط�اً تأیید کنید که مجدداً می‌خواهید این مقاله را بسازید.",
 'recreate'            => 'بازایجاد',
 
-# HTML dump
-'redirectingto' => 'در حال تغییر مسیر به [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'پاک کردن نسخهٔ حا�ظهٔ نهانی (Cache) این ص�حه را تأیید می‌کنید؟
-
-$1',
 'confirm_purge_button' => 'تأیید',
-
-# AJAX search
-'searchcontaining' => "جستجوی مقاله‌هایی که ''$1'' می‌دارند.",
-'searchnamed'      => "جستجوی مقاله‌هایی با نام ''$1''.",
-'articletitles'    => "مقاله‌هایی که با ''$1'' آغاز می‌شوند.",
-'hideresults'      => 'نه�تن نتایج',
-'useajaxsearch'    => 'از جستجوی مبتنی بر AJAX است�اده کن',
+'confirm-purge-top'    => 'پاک کردن نسخهٔ حا�ظهٔ نهانی (Cache) این ص�حه را تأیید می‌کنید؟',
+'confirm-purge-bottom' => 'خالی کردن میانگیر یک ص�حه باعث می‌شود که آخرین نسخهٔ آن نمایش یابد.',
 
 # Separators for various lists, etc.
-'semicolon-separator' => 'Ø›',
+'semicolon-separator' => 'Ø›&#32;',
 'comma-separator'     => '،&#32;',
 
 # Multipage image navigation
@@ -2729,10 +3090,10 @@ $1',
 'table_pager_empty'        => 'هیچ نتیجه',
 
 # Auto-summaries
-'autosumm-blank'   => 'خالی‌کردن ص�حه',
+'autosumm-blank'   => 'ص�حه را خالی کرد',
 'autosumm-replace' => "جایگزینی ص�حه با '$1'",
 'autoredircomment' => 'تغییر مسیر به [[$1]]',
-'autosumm-new'     => 'ص�حهٔ جدید: $1',
+'autosumm-new'     => "ص�حه‌ای جدید با '$1' ایجاد کرد",
 
 # Size units
 'size-bytes'     => '$1 بایت',
@@ -2822,6 +3183,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'برچسب ناشناختهٔ ا�زونه «$1»',
+'duplicate-defaultsort' => 'هشدار: ترتیب پیش �رض «$2» ترتیب پیش �رض قبلی «$1» را باطل می‌سازد.',
 
 # Special:Version
 'version'                          => 'نسخه', # Not used as normal message but as header for the special page itself
@@ -2833,8 +3195,8 @@ $1',
 'version-mediahandlers'            => 'به‌دست‌گیرنده‌های رسانه‌ها',
 'version-hooks'                    => 'قلاب‌ها',
 'version-extension-functions'      => 'عملگرهای ا�زونه',
-'version-parser-extensiontags'     => 'برچسب‌های ا�زونه‌های تجزیه‌گر',
-'version-parser-function-hooks'    => 'قلاب‌های عملگرهای تجزیه‌گر',
+'version-parser-extensiontags'     => 'برچسب‌های ا�زونه تجزیه‌گر',
+'version-parser-function-hooks'    => 'قلاب‌های عملگر تجزیه‌گر',
 'version-skin-extension-functions' => 'عملگرهای ا�زونه‌های پوسته',
 'version-hook-name'                => 'نام قلاب',
 'version-hook-subscribedby'        => 'وارد شده توسط',
@@ -2850,13 +3212,13 @@ $1',
 'filepath-submit'  => 'مسیر',
 'filepath-summary' => 'این ص�حهٔ ویژه نشانی کامل برای یک پرونده را نشان می‌دهد. تصاویر با کی�یت وضوح کامل نشان داده می‌شوند، سایر انواع پرونده با برنامه مخصوص به خودشان باز می‌شوند.
 
-نشانی پرونده را بدون پیشوند «{{ns:image}}:» وارد کنید.',
+نشانی پرونده را بدون پیشوند «{{ns:file}}:» وارد کنید.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'جستجو برای پرونده‌های تکراری',
 'fileduplicatesearch-summary'  => 'جستجو برای پرونده‌های تکراری بر اساس مقدار درهم‌شدهٔ آن‌ها صورت می‌گیرد.
 
-نام پرونده را بدون پیشوند «{{ns:image}}:» وارد کنید.',
+نام پرونده را بدون پیشوند «{{ns:file}}:» وارد کنید.',
 'fileduplicatesearch-legend'   => 'جستجوی موارد تکراری',
 'fileduplicatesearch-filename' => 'نام پرونده:',
 'fileduplicatesearch-submit'   => 'جستجو',
@@ -2885,4 +3247,13 @@ $1',
 'blankpage'              => 'ص�حهٔ خالی',
 'intentionallyblankpage' => 'این ص�حه به طور عمدی خالی گذاشته شده و برای محک زدن سیستم و غیره به کار می‌رود.',
 
+# External image whitelist
+'external_image_whitelist' => ' #این سطر را همان‌گونه که هست رها کنید<pre>
+#قطعات regular expression را در زیر قرار دهید (تنها قسمتی که بین // قرار می‌گیرد)
+#آن‌ها با نشانی اینترنتی تصاویر خارجی پیوند داده شده تطبیق داده می‌شوند
+#مواردی که مطابقت نشان دهند به صورت تصویر نمایش می‌یابند، و در غیر این صورت تنها یک پیوند به تصویر نمایش می‌یابد
+#سطرهایی که با # آغاز شوند به عنوان توضیحات در نظر گر�ته می‌شوند
+
+#قطعات regex را زیر این سطر قرار دهید. این سطر را همان‌گونه که هست رها کنید</pre>',
+
 );
diff --git a/languages/messages/MessagesFf.php b/languages/messages/MessagesFf.php
index 5b332180..272d311b 100644
--- a/languages/messages/MessagesFf.php
+++ b/languages/messages/MessagesFf.php
@@ -52,7 +52,7 @@ $messages = array(
 # Watchlist
 'watch' => 'Rewindaande',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Yiilaade',
 
 );
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index b43302d7..cf4036e4 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -9,9 +9,11 @@
  * @author Crt
  * @author Jaakonam
  * @author Jack Phoenix
+ * @author Mobe
  * @author Nike
  * @author Silvonen
  * @author Str4nd
+ * @author Tarmo
  * @author לערי ריינה�רט
  */
 
@@ -20,14 +22,12 @@ $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Toiminnot',
-	NS_MAIN             => '',
 	NS_TALK             => 'Keskustelu',
 	NS_USER             => 'Käyttäjä',
 	NS_USER_TALK        => 'Keskustelu_käyttäjästä',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK     => 'Keskustelu_{{grammar:elative|$1}}',
-	NS_IMAGE            => 'Kuva',
-	NS_IMAGE_TALK       => 'Keskustelu_kuvasta',
+	NS_PROJECT_TALK     => 'Keskustelu_{{GRAMMAR:elative|$1}}',
+	NS_FILE             => 'Tiedosto',
+	NS_FILE_TALK        => 'Keskustelu_tiedostosta',
 	NS_MEDIAWIKI        => 'Järjestelmäviesti',
 	NS_MEDIAWIKI_TALK   => 'Keskustelu_järjestelmäviestistä',
 	NS_TEMPLATE         => 'Malline',
@@ -35,15 +35,15 @@ $namespaceNames = array(
 	NS_HELP             => 'Ohje',
 	NS_HELP_TALK        => 'Keskustelu_ohjeesta',
 	NS_CATEGORY         => 'Luokka',
-	NS_CATEGORY_TALK    => 'Keskustelu_luokasta'
+	NS_CATEGORY_TALK    => 'Keskustelu_luokasta',
 );
 
-$skinNames = array(
-	'standard'          => 'Perus',
-	'cologneblue'       => 'Kölnin sininen',
-	'myskin'            => 'Oma tyylisivu'
+$namespaceAliases = array(
+	'Kuva' => NS_FILE,
+	'Keskustelu_kuvasta' => NS_FILE_TALK,
 );
 
+
 $datePreferences = array(
 	'default',
 	'fi normal',
@@ -94,89 +94,92 @@ $magicWords = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Kaksinkertaiset_ohjaukset', 'Kaksinkertaiset_uudelleenohjaukset' ),
-	'BrokenRedirects'         => array( 'Virheelliset_ohjaukset', 'Virheelliset_uudelleenohjaukset' ),
-	'Disambiguations'         => array( 'Täsmennyssivut' ),
-	'Userlogin'               => array( 'Kirjaudu_sisään' ),
-	'Userlogout'              => array( 'Kirjaudu_ulos' ),
-	'CreateAccount'           => array( 'Luo_tunnus' ),
-	'Preferences'             => array( 'Asetukset' ),
-	'Watchlist'               => array( 'Tarkkailulista' ),
-	'Recentchanges'           => array( 'Tuoreet_muutokset' ),
-	'Upload'                  => array( 'Tallenna', 'Lisää_tiedosto' ),
-	'Imagelist'               => array( 'Tiedostoluettelo' ),
-	'Newimages'               => array( 'Uudet_tiedostot', 'Uudet_kuvat' ),
-	'Listusers'               => array( 'Käyttäjät' ),
-	'Listgrouprights'         => array( 'Käyttäjäryhmien oikeudet' ),
-	'Statistics'              => array( 'Tilastot' ),
-	'Randompage'              => array( 'Satunnainen_sivu' ),
-	'Lonelypages'             => array( 'Yksinäiset_sivut' ),
-	'Uncategorizedpages'      => array( 'Luokittelemattomat_sivut' ),
-	'Uncategorizedcategories' => array( 'Luokittelemattomat_luokat' ),
-	'Uncategorizedimages'     => array( 'Luokittelemattomat_tiedostot' ),
-	'Uncategorizedtemplates'  => array( 'Luokittelemattomat_mallineet' ),
-	'Unusedcategories'        => array( 'Käyttämättömät_luokat' ),
-	'Unusedimages'            => array( 'Käyttämättömät_tiedostot' ),
-	'Wantedpages'             => array( 'Halutuimmat_sivut' ),
-	'Wantedcategories'        => array( 'Halutuimmat_luokat' ),
-	'Missingfiles'            => array( 'Puuttuvat tiedostot' ),
-	'Mostlinked'              => array( 'Viitatuimmat_sivut' ),
-	'Mostlinkedcategories'    => array( 'Viitatuimmat_luokat' ),
-	'Mostlinkedtemplates'     => array( 'Viitatuimmat_mallineet' ),
-	'Mostcategories'          => array( 'Luokitelluimmat_sivut' ),
-	'Mostimages'              => array( 'Viitatuimmat_tiedostot' ),
-	'Mostrevisions'           => array( 'Muokatuimmat_sivut' ),
-	'Fewestrevisions'         => array( 'Vähiten_muokatut_sivut' ),
-	'Shortpages'              => array( 'Lyhyet_sivut' ),
-	'Longpages'               => array( 'Pitkät_sivut' ),
-	'Newpages'                => array( 'Uudet_sivut' ),
-	'Ancientpages'            => array( 'Kuolleet_sivut' ),
-	'Deadendpages'            => array( 'Linkittömät_sivut' ),
-	'Protectedpages'          => array( 'Suojatut_sivut' ),
-	'Protectedtitles'         => array( 'Suojatut_sivunimet' ),
-	'Allpages'                => array( 'Kaikki_sivut' ),
-	'Prefixindex'             => array( 'Etuliiteluettelo' ),
-	'Ipblocklist'             => array( 'Muokkausestot' ),
-	'Specialpages'            => array( 'Toimintosivut' ),
-	'Contributions'           => array( 'Muokkaukset' ),
-	'Emailuser'               => array( 'Lähetä_sähköpostia' ),
-	'Confirmemail'            => array( 'Varmista_sähköpostiosoite' ),
-	'Whatlinkshere'           => array( 'Tänne_viittaavat_sivut' ),
-	'Recentchangeslinked'     => array( 'Linkitetyt_muutokset' ),
-	'Movepage'                => array( 'Siirrä_sivu' ),
-	'Blockme'                 => array( 'Estä_minut' ),
-	'Booksources'             => array( 'Kirjalähteet' ),
-	'Categories'              => array( 'Luokat' ),
-	'Export'                  => array( 'Vie_sivuja' ),
-	'Version'                 => array( 'Versio' ),
-	'Allmessages'             => array( 'Järjestelmäviestit' ),
-	'Log'                     => array( 'Loki', 'Lokit' ),
-	'Blockip'                 => array( 'Estä' ),
-	'Undelete'                => array( 'Palauta' ),
-	'Import'                  => array( 'Tuo_sivuja' ),
-	'Lockdb'                  => array( 'Lukitse_tietokanta' ),
-	'Unlockdb'                => array( 'Avaa_tietokanta' ),
-	'Userrights'              => array( 'Käyttöoikeudet' ),
-	'MIMEsearch'              => array( 'MIME-haku' ),
-	'FileDuplicateSearch'     => array( 'Kaksoiskappaleiden_haku' ),
-	'Unwatchedpages'          => array( 'Tarkkailemattomat_sivut' ),
-	'Listredirects'           => array( 'Ohjaussivut', 'Uudelleenohjaukset' ),
-	'Revisiondelete'          => array( 'Poista_muokkaus' ),
-	'Unusedtemplates'         => array( 'Käyttämättömät_mallineet' ),
-	'Randomredirect'          => array( 'Satunnainen_ohjaus', 'Satunnainen_uudelleenohjaus' ),
-	'Mypage'                  => array( 'Oma_sivu' ),
-	'Mytalk'                  => array( 'Oma_keskustelu' ),
-	'Mycontributions'         => array( 'Omat_muokkaukset' ),
-	'Listadmins'              => array( 'Ylläpitäjät' ),
-	'Listbots'                => array( 'Botit' ),
-	'Popularpages'            => array( 'Suositut_sivut' ),
-	'Search'                  => array( 'Haku' ),
-	'Resetpass'               => array( 'Alusta_salasana' ),
-	'Withoutinterwiki'        => array( 'Kielilinkittömät_sivut' ),
-	'MergeHistory'            => array( 'Liitä_muutoshistoria' ),
-	'Filepath'                => array( 'Tiedostopolku' ),
-	'Invalidateemail'         => array( 'Hylkää sähköpostiosoite' ),
-	'Blankpage'               => array( 'Tyhjä sivu' ),
+	'DoubleRedirects'           => array( 'Kaksinkertaiset_ohjaukset', 'Kaksinkertaiset_uudelleenohjaukset' ),
+	'BrokenRedirects'           => array( 'Virheelliset_ohjaukset', 'Virheelliset_uudelleenohjaukset' ),
+	'Disambiguations'           => array( 'Täsmennyssivut' ),
+	'Userlogin'                 => array( 'Kirjaudu_sisään' ),
+	'Userlogout'                => array( 'Kirjaudu_ulos' ),
+	'CreateAccount'             => array( 'Luo_tunnus' ),
+	'Preferences'               => array( 'Asetukset' ),
+	'Watchlist'                 => array( 'Tarkkailulista' ),
+	'Recentchanges'             => array( 'Tuoreet_muutokset' ),
+	'Upload'                    => array( 'Tallenna', 'Lisää_tiedosto' ),
+	'Listfiles'                 => array( 'Tiedostoluettelo' ),
+	'Newimages'                 => array( 'Uudet_tiedostot', 'Uudet_kuvat' ),
+	'Listusers'                 => array( 'Käyttäjät' ),
+	'Listgrouprights'           => array( 'Käyttäjäryhmien_oikeudet' ),
+	'Statistics'                => array( 'Tilastot' ),
+	'Randompage'                => array( 'Satunnainen_sivu' ),
+	'Lonelypages'               => array( 'Yksinäiset_sivut' ),
+	'Uncategorizedpages'        => array( 'Luokittelemattomat_sivut' ),
+	'Uncategorizedcategories'   => array( 'Luokittelemattomat_luokat' ),
+	'Uncategorizedimages'       => array( 'Luokittelemattomat_tiedostot' ),
+	'Uncategorizedtemplates'    => array( 'Luokittelemattomat_mallineet' ),
+	'Unusedcategories'          => array( 'Käyttämättömät_luokat' ),
+	'Unusedimages'              => array( 'Käyttämättömät_tiedostot' ),
+	'Wantedpages'               => array( 'Halutuimmat_sivut' ),
+	'Wantedcategories'          => array( 'Halutuimmat_luokat' ),
+	'Wantedfiles'               => array( 'Halutuimmat_tiedostot' ),
+	'Wantedtemplates'           => array( 'Halutuimmat_mallineet' ),
+	'Mostlinked'                => array( 'Viitatuimmat_sivut' ),
+	'Mostlinkedcategories'      => array( 'Viitatuimmat_luokat' ),
+	'Mostlinkedtemplates'       => array( 'Viitatuimmat_mallineet' ),
+	'Mostimages'                => array( 'Viitatuimmat_tiedostot' ),
+	'Mostcategories'            => array( 'Luokitelluimmat_sivut' ),
+	'Mostrevisions'             => array( 'Muokatuimmat_sivut' ),
+	'Fewestrevisions'           => array( 'Vähiten_muokatut_sivut' ),
+	'Shortpages'                => array( 'Lyhyet_sivut' ),
+	'Longpages'                 => array( 'Pitkät_sivut' ),
+	'Newpages'                  => array( 'Uudet_sivut' ),
+	'Ancientpages'              => array( 'Kuolleet_sivut' ),
+	'Deadendpages'              => array( 'Linkittömät_sivut' ),
+	'Protectedpages'            => array( 'Suojatut_sivut' ),
+	'Protectedtitles'           => array( 'Suojatut_sivunimet' ),
+	'Allpages'                  => array( 'Kaikki_sivut' ),
+	'Prefixindex'               => array( 'Etuliiteluettelo' ),
+	'Ipblocklist'               => array( 'Muokkausestot' ),
+	'Specialpages'              => array( 'Toimintosivut' ),
+	'Contributions'             => array( 'Muokkaukset' ),
+	'Emailuser'                 => array( 'Lähetä_sähköpostia' ),
+	'Confirmemail'              => array( 'Varmista_sähköpostiosoite' ),
+	'Whatlinkshere'             => array( 'Tänne_viittaavat_sivut' ),
+	'Recentchangeslinked'       => array( 'Linkitetyt_muutokset' ),
+	'Movepage'                  => array( 'Siirrä_sivu' ),
+	'Blockme'                   => array( 'Estä_minut' ),
+	'Booksources'               => array( 'Kirjalähteet' ),
+	'Categories'                => array( 'Luokat' ),
+	'Export'                    => array( 'Vie_sivuja' ),
+	'Version'                   => array( 'Versio' ),
+	'Allmessages'               => array( 'Järjestelmäviestit' ),
+	'Log'                       => array( 'Loki', 'Lokit' ),
+	'Blockip'                   => array( 'Estä' ),
+	'Undelete'                  => array( 'Palauta' ),
+	'Import'                    => array( 'Tuo_sivuja' ),
+	'Lockdb'                    => array( 'Lukitse_tietokanta' ),
+	'Unlockdb'                  => array( 'Avaa_tietokanta' ),
+	'Userrights'                => array( 'Käyttöoikeudet' ),
+	'MIMEsearch'                => array( 'MIME-haku' ),
+	'FileDuplicateSearch'       => array( 'Kaksoiskappaleiden_haku' ),
+	'Unwatchedpages'            => array( 'Tarkkailemattomat_sivut' ),
+	'Listredirects'             => array( 'Ohjaukset', 'Ohjaussivut', 'Uudelleenohjaukset' ),
+	'Revisiondelete'            => array( 'Poista_muokkaus' ),
+	'Unusedtemplates'           => array( 'Käyttämättömät_mallineet' ),
+	'Randomredirect'            => array( 'Satunnainen_ohjaus', 'Satunnainen_uudelleenohjaus' ),
+	'Mypage'                    => array( 'Oma_sivu' ),
+	'Mytalk'                    => array( 'Oma_keskustelu' ),
+	'Mycontributions'           => array( 'Omat_muokkaukset' ),
+	'Listadmins'                => array( 'Ylläpitäjät' ),
+	'Listbots'                  => array( 'Botit' ),
+	'Popularpages'              => array( 'Suositut_sivut' ),
+	'Search'                    => array( 'Haku' ),
+	'Resetpass'                 => array( 'Muuta_salasana', 'Alusta_salasana' ),
+	'Withoutinterwiki'          => array( 'Kielilinkittömät_sivut' ),
+	'MergeHistory'              => array( 'Liitä_muutoshistoria' ),
+	'Filepath'                  => array( 'Tiedostopolku' ),
+	'Invalidateemail'           => array( 'Hylkää_sähköpostiosoite' ),
+	'Blankpage'                 => array( 'Tyhjä_sivu' ),
+	'LinkSearch'                => array( 'Linkkihaku' ),
+	'DeletedContributions'      => array( 'Poistetut_muokkaukset' ),
 );
 
 $linkTrail = '/^([a-zäö]+)(.*)$/sDu';
@@ -219,17 +222,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Piilota omat muokkaukset',
 'tog-watchlisthidebots'       => 'Piilota bottien muokkaukset',
 'tog-watchlisthideminor'      => 'Piilota pienet muokkaukset',
+'tog-watchlisthideliu'        => 'Piilota kirjautuneiden käyttäjien muokkaukset tarkkailulistalta',
+'tog-watchlisthideanons'      => 'Piilota anonyymien käyttäjien muokkaukset tarkkailulistalta',
 'tog-nolangconversion'        => 'Älä tee muunnoksia kielivarianttien välillä',
 'tog-ccmeonemails'            => 'Lähetä minulle kopio MediaWikin kautta lähetetyistä sähköposteista',
 'tog-diffonly'                => 'Älä näytä sivun sisältöä versioita vertailtaessa',
 'tog-showhiddencats'          => 'Näytä piilotetut luokat',
+'tog-norollbackdiff'          => 'Älä näytä eroavaisuuksia palauttamisen jälkeen',
 
 'underline-always'  => 'Aina',
 'underline-never'   => 'Ei koskaan',
 'underline-default' => 'Selaimen oletustapa',
 
-'skinpreview' => '(esikatselu…)',
-
 # Dates
 'sunday'        => 'sunnuntai',
 'monday'        => 'maanantai',
@@ -333,7 +337,7 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 'mytalk'         => 'Keskustelusivu',
 'anontalk'       => 'Keskustele tämän IP:n kanssa',
 'navigation'     => 'Valikko',
-'and'            => 'ja',
+'and'            => '&#32;ja',
 
 # Metadata in edit box
 'metadata_help' => 'Sisältökuvaukset:',
@@ -370,14 +374,14 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 'talkpagelinktext'  => 'keskustelu',
 'specialpage'       => 'Toimintosivu',
 'personaltools'     => 'Henkilökohtaiset työkalut',
-'postcomment'       => 'Kommentti sivun loppuun',
+'postcomment'       => 'Uusi osio',
 'articlepage'       => 'Näytä varsinainen sivu',
 'talk'              => 'Keskustelu',
 'views'             => 'Näkymät',
 'toolbox'           => 'Työkalut',
 'userpage'          => 'Näytä käyttäjäsivu',
 'projectpage'       => 'Näytä projektisivu',
-'imagepage'         => 'Näytä kuvasivu',
+'imagepage'         => 'Näytä tiedostosivu',
 'mediawikipage'     => 'Näytä viestisivu',
 'templatepage'      => 'Näytä mallinesivu',
 'viewhelppage'      => 'Näytä ohjesivu',
@@ -396,8 +400,6 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Tietoja {{GRAMMAR:elative|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Tietoja',
-'bugreports'           => 'Ongelmat ja parannusehdotukset',
-'bugreportspage'       => 'Project:Ongelmat ja parannusehdotukset',
 'copyright'            => 'Sisältö on käytettävissä lisenssillä $1.',
 'copyrightpagename'    => '{{SITENAME}} ja tekijänoikeudet',
 'copyrightpage'        => '{{ns:project}}:Tekijänoikeudet',
@@ -420,9 +422,7 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 
 'badaccess'        => 'Lupa evätty',
 'badaccess-group0' => 'Sinulla ei ole lupaa suorittaa pyydettyä toimintoa.',
-'badaccess-group1' => 'Pyytämäsi toiminto on rajoitettu henkilöille ryhmässä $1.',
-'badaccess-group2' => 'Pyytämäsi toiminto on rajoitettu henkilöille ryhmissä $1.',
-'badaccess-groups' => 'Pyytämäsi toiminto on rajoitettu ryhmien $1 henkilöille.',
+'badaccess-groups' => 'Pyytämäsi toiminto on rajoitettu {{PLURAL:$2|ryhmän|ryhmien}} $1 henkilöille.',
 
 'versionrequired'     => 'MediaWikistä tarvitaan vähintään versio $1',
 'versionrequiredtext' => 'MediaWikistä tarvitaan vähintään versio $1 tämän sivun käyttämiseen. Katso [[Special:Version|versio]].',
@@ -437,6 +437,8 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 'editsection'             => 'muokkaa',
 'editold'                 => 'muokkaa',
 'viewsourceold'           => 'näytä lähdekoodi',
+'editlink'                => 'muokkaa',
+'viewsourcelink'          => 'näytä lähdekoodi',
 'editsectionhint'         => 'Muokkaa osiota $1',
 'toc'                     => 'Sisällysluettelo',
 'showtoc'                 => 'näytä',
@@ -451,13 +453,13 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 'site-atom-feed'          => '$1-Atom-syöte',
 'page-rss-feed'           => '$1 (RSS-syöte)',
 'page-atom-feed'          => '$1 (Atom-syöte)',
-'red-link-title'          => '$1 (ei vielä kirjoitettu)',
+'red-link-title'          => '$1 (sivua ei ole)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Sivu',
 'nstab-user'      => 'Käyttäjäsivu',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Toiminto',
+'nstab-special'   => 'Toimintosivu',
 'nstab-project'   => 'Projektisivu',
 'nstab-image'     => 'Tiedosto',
 'nstab-mediawiki' => 'Järjestelmäviesti',
@@ -467,7 +469,9 @@ Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) — {{GRAMMAR:partitive
 
 # Main script and global functions
 'nosuchaction'      => 'Määrittelemätön pyyntö',
-'nosuchactiontext'  => 'Wikiohjelmisto ei tunnista URL:ssä määriteltyä pyyntöä',
+'nosuchactiontext'  => 'Ohjelmisto ei tunnista URL:ssä määriteltyä pyyntöä.
+Olet saattanut kirjoittaa väärin, tai seurannut virheellistä linkkiä.
+Tämä voi myös mahdollisesti olla ohjelmistovirhe.',
 'nosuchspecialpage' => 'Kyseistä toimintosivua ei ole',
 'nospecialpagetext' => 'Wikiohjelmisto ei tunnista pyytämääsi toimintosivua.',
 
@@ -483,7 +487,9 @@ $1',
 'laggedslavemode'      => 'Varoitus: Sivu ei välttämättä sisällä viimeisimpiä muutoksia.',
 'readonly'             => 'Tietokanta on lukittu',
 'enterlockreason'      => 'Anna lukituksen syy sekä sen arvioitu poistamisaika',
-'readonlytext'         => '{{GRAMMAR:genitive|{{SITENAME}}}} tietokanta on tällä hetkellä lukittu. Uusia sivuja ei voi luoda eikä muitakaan muutoksia tehdä. Syynä ovat todennäköisimmin rutiininomaiset tietokannan ylläpitotoimet. Tietokannan lukinneen ylläpitäjän selitys: $1',
+'readonlytext'         => 'Tietokanta on tällä hetkellä lukittu. Uusia sivuja ei voi luoda eikä muitakaan muutoksia tehdä. Syynä ovat todennäköisimmin rutiininomaiset tietokannan ylläpitotoimet.
+
+Tietokannan lukinneen ylläpitäjän selitys: $1',
 'missing-article'      => 'Sivun sisältöä ei löytynyt tietokannasta: $1 $2.
 
 Useimmiten tämä johtuu vanhentuneesta vertailu- tai historiasivulinkistä poistettuun sivuun.
@@ -507,7 +513,6 @@ Ilmoita tämän sivun osoite wikin [[Special:ListUsers/sysop|ylläpitäjälle]].
 'cannotdelete'         => 'Sivun tai tiedoston poisto epäonnistui. Joku muu on saattanut poistaa sen.',
 'badtitle'             => 'Virheellinen otsikko',
 'badtitletext'         => 'Pyytämäsi sivuotsikko oli virheellinen, tyhjä tai väärin linkitetty kieltenvälinen tai wikienvälinen linkki.',
-'perfdisabled'         => 'Pahoittelut! Tämä ominaisuus ei toistaiseksi ole käytettävissä, sillä se hidastaa tietokantaa niin paljon, että kukaan ei voi käyttää wikiä. Toiminto ohjelmoidaan tehokkaammaksi lähiaikoina. (Sinäkin voit tehdä sen! Tämä on vapaa ohjelmisto.)',
 'perfcached'           => 'Tiedot ovat välimuistista eivätkä välttämättä ole ajan tasalla.',
 'perfcachedts'         => 'Seuraava data on tuotu välimuistista ja se päivitettiin viimeksi $1.',
 'querypage-no-updates' => 'Tämän sivun tietoja ei toistaiseksi päivitetä.',
@@ -519,7 +524,9 @@ Ilmoita tämän sivun osoite wikin [[Special:ListUsers/sysop|ylläpitäjälle]].
 'protectedpagetext'    => 'Tämä sivu on suojattu muutoksilta.',
 'viewsourcetext'       => 'Voit tarkastella ja kopioida tämän sivun lähdekoodia:',
 'protectedinterface'   => 'Tämä sivu sisältää ohjelmiston käyttöliittymätekstiä ja on suojattu häiriköinnin estämiseksi.',
-'editinginterface'     => '<center>Muokkaat sivua, joka sisältää ohjelmiston käyttöliittymätekstiä.</center>',
+'editinginterface'     => "'''Varoitus.''' Muokkaat sivua, joka sisältää ohjelmiston käyttöliittymätekstiä.
+Muutokset tähän sivuun vaikuttavat muiden käyttäjien käyttöliittymän ulkoasuun.
+Viestien kääntäminen tulisi tehdä [http://translatewiki.net/wiki/Main_Page?setlang=fi translatewiki.netissä] – MediaWikin kotoistusprojektissa.",
 'sqlhidden'            => '(SQL-kysely piilotettu)',
 'cascadeprotected'     => 'Tämä sivu on suojattu muokkauksilta, koska se on sisällytetty alla {{PLURAL:$1|olevaan laajennetusti suojattuun sivuun|oleviin laajennetusti suojattuihin sivuihin}}:
 $2',
@@ -529,13 +536,15 @@ $2',
 'titleprotected'       => "Käyttäjä [[User:$1|$1]] on asettanut tämän sivun luontikieltoon: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Virheellinen asetus: tuntematon virustutka: <i>$1</i>',
+'virus-badscanner'     => "Virheellinen asetus: tuntematon virustutka: ''$1''",
 'virus-scanfailed'     => 'virustarkistus epäonnistui virhekoodilla $1',
 'virus-unknownscanner' => 'tuntematon virustutka:',
 
 # Login and logout pages
 'logouttitle'                => 'Uloskirjautuminen',
-'logouttext'                 => 'Olet nyt kirjautunut ulos {{GRAMMAR:elative|{{SITENAME}}}}. Voit jatkaa {{GRAMMAR:genitive|{{SITENAME}}}} käyttöä nimettömänä, tai kirjautua uudelleen sisään.',
+'logouttext'                 => "'''Olet nyt kirjautunut ulos.'''
+
+Voit jatkaa {{GRAMMAR:genitive|{{SITENAME}}}} käyttöä nimettömänä, tai [[Special:UserLogin|kirjautua uudelleen sisään]].",
 'welcomecreation'            => '== Tervetuloa $1! ==
 Käyttäjätunnuksesi on luotu.
 Älä unohda virittää {{GRAMMAR:genitive|{{SITENAME}}}} [[Special:Preferences|asetuksiasi]].',
@@ -546,7 +555,6 @@ Käyttäjätunnuksesi on luotu.
 'remembermypassword'         => 'Muista minut',
 'yourdomainname'             => 'Verkkonimi',
 'externaldberror'            => 'Tapahtui virhe ulkoisen autentikointitietokannan käytössä tai sinulla ei ole lupaa päivittää tunnustasi.',
-'loginproblem'               => '<b>Sisäänkirjautuminen ei onnistunut.</b><br />Yritä uudelleen!',
 'login'                      => 'Kirjaudu sisään',
 'nav-login-createaccount'    => 'Kirjaudu sisään tai luo tunnus',
 'loginprompt'                => 'Kirjautumiseen tarvitaan evästeitä.',
@@ -581,8 +589,8 @@ Käyttäjätunnuksesi on luotu.
 'nocookieslogin'             => '{{SITENAME}} käyttää evästeitä sisäänkirjautumisen yhteydessä. Selaimesi ei salli evästeitä. Ota ne käyttöön, ja yritä uudelleen.',
 'noname'                     => 'Et ole määritellyt kelvollista käyttäjänimeä.',
 'loginsuccesstitle'          => 'Sisäänkirjautuminen onnistui',
-'loginsuccess'               => 'Olet kirjautunut käyttäjänä $1.',
-'nosuchuser'                 => 'Käyttäjää �$1� ei ole olemassa. Tarkista kirjoititko nimen oikein, tai [[Special:UserLogin/signup|luo uusi käyttäjätunnus]].',
+'loginsuccess'               => "'''Olet kirjautunut käyttäjänä $1.'''",
+'nosuchuser'                 => 'Käyttäjää �$1� ei ole olemassa. Nimet ovat kirjainkoosta riippuvaisia. Tarkista kirjoititko nimen oikein, tai [[Special:UserLogin/signup|luo uusi käyttäjätunnus]].',
 'nosuchusershort'            => 'Käyttäjää nimeltä �<nowiki>$1</nowiki>� ei ole. Kirjoititko nimen oikein?',
 'nouserspecified'            => 'Käyttäjätunnusta ei ole määritelty.',
 'wrongpassword'              => 'Syöttämäsi salasana ei ole oikein. Ole hyvä ja yritä uudelleen.',
@@ -599,8 +607,9 @@ Jos joku muu on tehnyt tämän pyynnön, tai jos olet muistanut salasanasi ja et
 'eauthentsent'               => 'Varmennussähköposti on lähetetty annettuun sähköpostiosoitteeseen. Muita viestejä ei lähetetä, ennen kuin olet toiminut viestin ohjeiden mukaan ja varmistanut, että sähköpostiosoite kuuluu sinulle.',
 'throttled-mailpassword'     => 'Salasanamuistutus on lähetetty {{PLURAL:$1|kuluvan|kuluvien $1}} tunnin aikana. Salasanamuistutuksia lähetään enintään {{PLURAL:$1|tunnin|$1 tunnin}} välein.',
 'mailerror'                  => 'Virhe lähetettäessä sähköpostia: $1',
-'acct_creation_throttle_hit' => 'Olet jo luonut $1 tunnusta. Et voi luoda uutta.',
-'emailauthenticated'         => 'Sähköpostiosoitteesi varmennettiin $1.',
+'acct_creation_throttle_hit' => 'IP-osoitteestasi on luotu tähän wikiin jo {{PLURAL:$1|yksi tunnus|$1 tunnusta}} päivän aikana, joka suurin sallittu määrä tälle ajalle.
+Tästä johtuen tästä IP-osoitteesta ei voi tällä hetkellä luoda uusia tunnuksia.',
+'emailauthenticated'         => 'Sähköpostiosoitteesi varmennettiin $2 kello $3.',
 'emailnotauthenticated'      => 'Sähköpostiosoitettasi ei ole vielä varmennettu. Sähköpostia ei lähetetä liittyen alla oleviin toimintoihin.',
 'noemailprefs'               => 'Sähköpostiosoitetta ei ole määritelty.',
 'emailconfirmlink'           => 'Varmenna sähköpostiosoite',
@@ -612,18 +621,26 @@ Jos joku muu on tehnyt tämän pyynnön, tai jos olet muistanut salasanasi ja et
 Tunnuksen $2 salasana on » $3 ». Kirjaudu sisään ja vaihda salasanasi.
 
 Sinun ei tarvitse huomioida tätä viestiä, jos tunnus on luotu virheellisesti.',
+'login-throttled'            => 'Olet tehnyt liian monta salasanayritystä käyttäjätunnukselle. Odota ennen kuin yrität uudelleen.',
 'loginlanguagelabel'         => 'Kieli: $1',
 
 # Password reset dialog
-'resetpass'               => 'Salasanan alustus',
-'resetpass_announce'      => 'Kirjauduit sisään sähköpostitse lähetetyllä väliaikaissalasanalla. Päätä sisäänkirjautuminen asettamalla uusi salasana.',
-'resetpass_text'          => '<!-- Lisää tekstiä tähän -->',
-'resetpass_header'        => 'Muuta tunnuksen salasana',
-'resetpass_submit'        => 'Aseta salasana ja kirjaudu sisään',
-'resetpass_success'       => 'Salasanan vaihto onnistui.',
-'resetpass_bad_temporary' => 'Kelvoton väliaikaissalasana. Olet saattanut jo asettaa uuden salasanan tai pyytänyt uutta väliaikaissalasanaa.',
-'resetpass_forbidden'     => 'Salasanoja ei voi vaihtaa.',
-'resetpass_missing'       => 'Ei syötettä.',
+'resetpass'                 => 'Muuta salasana',
+'resetpass_announce'        => 'Kirjauduit sisään sähköpostitse lähetetyllä väliaikaissalasanalla. Päätä sisäänkirjautuminen asettamalla uusi salasana.',
+'resetpass_text'            => '<!-- Lisää tekstiä tähän -->',
+'resetpass_header'          => 'Muuta tunnuksen salasana',
+'oldpassword'               => 'Vanha salasana',
+'newpassword'               => 'Uusi salasana',
+'retypenew'                 => 'Uusi salasana uudelleen',
+'resetpass_submit'          => 'Aseta salasana ja kirjaudu sisään',
+'resetpass_success'         => 'Salasanan vaihto onnistui.',
+'resetpass_bad_temporary'   => 'Kelvoton väliaikaissalasana. Olet saattanut jo asettaa uuden salasanan tai pyytänyt uutta väliaikaissalasanaa.',
+'resetpass_forbidden'       => 'Salasanoja ei voi vaihtaa.',
+'resetpass-no-info'         => 'Et voi nähdä tätä sivua kirjautumatta sisään.',
+'resetpass-submit-loggedin' => 'Muuta salasana',
+'resetpass-wrong-oldpass'   => 'Virheellinen väliaikainen tai nykyinen salasana.
+Olet saattanut jo onnistuneesti vaihtaa salasanasi tai pyytää uutta väliaikaista salasanaa.',
+'resetpass-temp-password'   => 'Väliaikainen salasana:',
 
 # Edit page toolbar
 'bold_sample'     => 'Lihavoitu teksti',
@@ -661,8 +678,8 @@ Sinun ei tarvitse huomioida tätä viestiä, jos tunnus on luotu virheellisesti.
 'missingsummary'                   => 'Et ole antanut yhteenvetoa. Jos valitset Tallenna uudelleen, niin muokkauksesi tallennetaan ilman yhteenvetoa.',
 'missingcommenttext'               => 'Anna yhteenveto alle.',
 'missingcommentheader'             => 'Et ole antanut otsikkoa kommentillesi. Valitse <em>Tallenna</em>, jos et halua antaa otsikkoa.',
-'summary-preview'                  => 'Yhteenvedon esikatselu',
-'subject-preview'                  => 'Otsikon esikatselu',
+'summary-preview'                  => 'Yhteenvedon esikatselu:',
+'subject-preview'                  => 'Otsikon esikatselu:',
 'blockedtitle'                     => 'Pääsy estetty',
 'blockedtext'                      => "<big>'''Käyttäjätunnuksesi tai IP-osoitteesi on estetty.'''</big>
 
@@ -708,10 +725,10 @@ Liitä kaikki ylläolevat tiedot mahdollisiin kyselyihisi.",
 'accmailtext'                      => "käyttäjän '''$1''' salasana on lähetetty osoitteeseen '''$2'''.",
 'newarticle'                       => '(uusi)',
 'newarticletext'                   => 'Linkki toi sivulle, jota ei vielä ole. Voit luoda sivun kirjoittamalla alla olevaan tilaan. Jos et halua luoda sivua, käytä selaimen paluutoimintoa.',
-'anontalkpagetext'                 => "----''Tämä on nimettömän käyttäjän keskustelusivu. Hän ei ole joko luonut itselleen käyttäjätunnusta tai ei käytä sitä. Siksi hänet tunnistetaan nyt numeerisella IP-osoitteella. Kyseinen IP-osoite voi olla useamman henkilön käytössä. Jos olet nimetön käyttäjä, ja sinusta tuntuu, että aiheettomia kommentteja on ohjattu sinulle, [[Special:UserLogin|luo itsellesi käyttäjätunnus tai kirjaudu sisään]] välttääksesi jatkossa sekaannukset muiden nimettömien käyttäjien kanssa.''",
-'noarticletext'                    => "{{GRAMMAR:inessive|{{SITENAME}}}} ei ole tämän nimistä sivua.
+'anontalkpagetext'                 => "----''Tämä on nimettömän käyttäjän keskustelusivu. Hän ei ole joko luonut itselleen käyttäjätunnusta tai ei käytä sitä. Siksi hänet tunnistetaan nyt numeerisella IP-osoitteella. Kyseinen IP-osoite voi olla useamman henkilön käytössä. Jos olet nimetön käyttäjä, ja sinusta tuntuu, että aiheettomia kommentteja on ohjattu sinulle, [[Special:UserLogin/signup|luo itsellesi käyttäjätunnus]] tai [[Special:UserLogin|kirjaudu sisään]] välttääksesi jatkossa sekaannukset muiden nimettömien käyttäjien kanssa.''",
+'noarticletext'                    => '{{GRAMMAR:inessive|{{SITENAME}}}} ei ole tämän nimistä sivua.
 * Voit [[Special:Search/{{PAGENAME}}|etsiä sivun nimellä]] muilta sivuilta.
-* Voit kirjoittaa uuden sivun '''<span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}} {{PAGENAME}}]</span>.'''",
+* Voit kirjoittaa uuden sivun <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} {{PAGENAME}}]</span>.',
 'userpage-userdoesnotexist'        => 'Käyttäjätunnusta $1 ei ole rekisteröity. Varmista haluatko muokata tätä sivua.',
 'clearyourcache'                   => "'''Huomautus:''' Selaimen välimuisti pitää tyhjentää asetusten tallentamisen jälkeen, jotta muutokset tulisivat voimaan:
 *'''Mozilla, Konqueror ja Safari:''' napsauta ''Shift''-näppäin pohjassa päivitä tai paina ''Ctrl-Shift-R'' (''Cmd-Shift-R'' Applella)
@@ -719,39 +736,41 @@ Liitä kaikki ylläolevat tiedot mahdollisiin kyselyihisi.",
 *'''Konqueror''': napsauta päivitä tai paina ''F5''
 *'''Opera:''' saatat joutua tyhjentämään välimuistin kokonaan (''Tools→Preferences'').",
 'usercssjsyoucanpreview'           => 'Voit testata uutta CSS:ää tai JavaScriptiä ennen tallennusta esikatselulla.',
-'usercsspreview'                   => "'''Tämä on CSS:n esikatselu. Mitään muutoksia ei ole vielä tallennettu.'''",
+'usercsspreview'                   => "'''Tämä on CSS:n esikatselu. Muutoksia ei ole vielä tallennettu.'''",
 'userjspreview'                    => "'''Tämä on JavaScriptin esikatselu.'''",
 'userinvalidcssjstitle'            => "'''Varoitus:''' Tyyliä nimeltä �$1� ei ole olemassa. Muista, että käyttäjän määrittelemät .css- ja .js-sivut alkavat pienellä alkukirjaimella, esim. {{ns:user}}:Matti Meikäläinen/monobook.css eikä {{ns:user}}:Matti Meikäläinen/Monobook.css.",
 'updated'                          => '(Päivitetty)',
-'note'                             => '<strong>Huomautus:</strong>',
-'previewnote'                      => '<strong>Tämä on vasta sivun esikatselu. Sivua ei ole vielä tallennettu!</strong>',
+'note'                             => "'''Huomautus:'''",
+'previewnote'                      => "'''Tämä on vasta sivun esikatselu. Sivua ei ole vielä tallennettu!'''",
 'previewconflict'                  => 'Tämä esikatselu näyttää miltä muokkausalueella oleva teksti näyttää tallennettuna.',
-'session_fail_preview'             => '<strong>Muokkaustasi ei voitu tallentaa, koska istuntosi tiedot ovat kadonneet. Yritä uudelleen. Jos ongelma ei katoa, yritä [[Special:UserLogout|kirjautua ulos]] ja takaisin sisään.</strong>',
-'session_fail_preview_html'        => '<strong>Muokkaustasi ei voitu tallentaa, koska istuntosi tiedot ovat kadonneet.</strong>
+'session_fail_preview'             => "'''Muokkaustasi ei voitu tallentaa, koska istuntosi tiedot ovat kadonneet. Yritä uudelleen. Jos ongelma ei katoa, yritä [[Special:UserLogout|kirjautua ulos]] ja takaisin sisään.'''",
+'session_fail_preview_html'        => "'''Muokkaustasi ei voitu tallentaa, koska istuntosi tiedot ovat kadonneet.'''
 
 Esikatselu on piilotettu varokeinona JavaScript-hyökkäyksiä vastaan – tässä wikissä on HTML-tila päällä.
 
-Yritä uudelleen. Jos ongelma ei katoa, yritä [[Special:UserLogout|kirjautua ulos]] ja takaisin sisään.',
-'token_suffix_mismatch'            => '<strong>Muokkauksesi on hylätty, koska asiakasohjelmasi ei osaa käsitellä välimerkkejä muokkaustarkisteessa. Syynä voi olla viallinen välityspalvelin.</strong>',
+Yritä uudelleen. Jos ongelma ei katoa, yritä [[Special:UserLogout|kirjautua ulos]] ja takaisin sisään.",
+'token_suffix_mismatch'            => "'''Muokkauksesi on hylätty, koska asiakasohjelmasi ei osaa käsitellä välimerkkejä muokkaustarkisteessa. Syynä voi olla viallinen välityspalvelin.'''",
 'editing'                          => 'Muokataan sivua $1',
 'editingsection'                   => 'Muokataan osiota sivusta $1',
-'editingcomment'                   => 'Muokataan kommenttia sivulla $1',
+'editingcomment'                   => 'Muokataan uutta osiota sivulla $1',
 'editconflict'                     => 'Päällekkäinen muokkaus: $1',
 'explainconflict'                  => "Joku muu on muuttanut tätä sivua sen jälkeen, kun aloit muokata sitä. Ylempi tekstialue sisältää tämänhetkisen tekstin. Tekemäsi muutokset näkyvät alemmassa ikkunassa. Sinun täytyy yhdistää muutoksesi olemassa olevaan tekstiin. '''Vain''' ylemmässä alueessa oleva teksti tallentuu, kun tallennat sivun.",
 'yourtext'                         => 'Oma tekstisi',
 'storedversion'                    => 'Tallennettu versio',
-'nonunicodebrowser'                => '<strong>Selaimesi ei ole Unicode-yhteensopiva. Ole hyvä ja vaihda selainta, ennen kuin muokkaat sivua.</strong>',
-'editingold'                       => '<strong>Varoitus: Olet muokkaamassa vanhaa versiota tämän sivun tekstistä. Jos tallennat sen, kaikki tämän version jälkeen tehdyt muutokset katoavat.</strong>',
+'nonunicodebrowser'                => "'''Selaimesi ei ole Unicode-yhteensopiva. Ole hyvä ja vaihda selainta, ennen kuin muokkaat sivua.'''",
+'editingold'                       => "'''Varoitus: Olet muokkaamassa vanhaa versiota tämän sivun tekstistä. Jos tallennat sen, kaikki tämän version jälkeen tehdyt muutokset katoavat.'''",
 'yourdiff'                         => 'Eroavaisuudet',
-'copyrightwarning'                 => '<strong>Muutoksesi astuvat voimaan välittömästi.</strong> Kaikki {{GRAMMAR:illative|{{SITENAME}}}} tehtävät tuotokset katsotaan julkaistuksi $2 -lisenssin mukaisesti ($1). Jos et halua, että kirjoitustasi muokataan armottomasti ja uudelleenkäytetään vapaasti, älä tallenna kirjoitustasi. Tallentamalla muutoksesi lupaat, että kirjoitit tekstisi itse, tai kopioit sen jostain vapaasta lähteestä. <strong>ÄLÄ KÄYTÄ TEKIJÄNOIKEUDEN ALAISTA MATERIAALIA ILMAN LUPAA!</strong>',
-'copyrightwarning2'                => 'Huomaa, että kuka tahansa voi muokata, muuttaa ja poistaa kaikkia sivustolle tekemiäsi lisäyksiä ja muutoksia. Muokkaamalla sivustoa luovutat sivuston käyttäjille tämän oikeuden ja takaat, että lisäämäsi aineisto on joko itse kirjoittamaasi tai peräisin jostain vapaasta lähteestä. Lisätietoja sivulla $1. <strong>TEKIJÄNOIKEUDEN ALAISEN MATERIAALIN KÄYTTÄMINEN ILMAN LUPAA ON EHDOTTOMASTI KIELLETTYÄ!</strong>',
+'copyrightwarning'                 => "'''Muutoksesi astuvat voimaan välittömästi.''' Kaikki {{GRAMMAR:illative|{{SITENAME}}}} tehtävät tuotokset katsotaan julkaistuksi $2 -lisenssin mukaisesti ($1). Jos et halua, että kirjoitustasi muokataan armottomasti ja uudelleenkäytetään vapaasti, älä tallenna kirjoitustasi. Tallentamalla muutoksesi lupaat, että kirjoitit tekstisi itse, tai kopioit sen jostain vapaasta lähteestä. '''ÄLÄ KÄYTÄ TEKIJÄNOIKEUDEN ALAISTA MATERIAALIA ILMAN LUPAA!'''",
+'copyrightwarning2'                => "Huomaa, että kuka tahansa voi muokata, muuttaa ja poistaa kaikkia sivustolle tekemiäsi lisäyksiä ja muutoksia. Muokkaamalla sivustoa luovutat sivuston käyttäjille tämän oikeuden ja takaat, että lisäämäsi aineisto on joko itse kirjoittamaasi tai peräisin jostain vapaasta lähteestä. Lisätietoja sivulla $1. '''TEKIJÄNOIKEUDEN ALAISEN MATERIAALIN KÄYTTÄMINEN ILMAN LUPAA ON EHDOTTOMASTI KIELLETTYÄ!'''",
 'longpagewarning'                  => '<center>Tämän sivun tekstiosuus on $1 binäärikilotavua pitkä. Harkitse, voisiko sivun jakaa pienempiin osiin.</center>',
-'longpageerror'                    => '<strong>Sivun koko on $1 binäärikilotavua. Sivua ei voida tallentaa, koska enimmäiskoko on $2 binäärikilotavua.</strong>',
-'readonlywarning'                  => '<strong>Varoitus</strong>: Tietokanta on lukittu huoltoa varten, joten voi olla ettet pysty tallentamaan muokkauksiasi juuri nyt. Saattaa olla paras leikata ja liimata tekstisi omaan tekstitiedostoosi ja tallentaa se tänne myöhemmin.',
-'protectedpagewarning'             => '<strong>Tämä sivu on lukittu. Vain ylläpitäjät voivat muokata sitä.</strong>',
+'longpageerror'                    => "'''Sivun koko on $1 binäärikilotavua. Sivua ei voida tallentaa, koska enimmäiskoko on $2 binäärikilotavua.'''",
+'readonlywarning'                  => "'''Varoitus: Tietokanta on lukittu huoltoa varten, joten voi olla ettet pysty tallentamaan muokkauksiasi juuri nyt. Saattaa olla paras leikata ja liimata tekstisi omaan tekstitiedostoosi ja tallentaa se tänne myöhemmin.'''
+
+Lukitsemisen syy: $1",
+'protectedpagewarning'             => "'''Tämä sivu on lukittu. Vain ylläpitäjät voivat muokata sitä.'''",
 'semiprotectedpagewarning'         => 'Vain rekisteröityneet käyttäjät voivat muokata tätä sivua.',
 'cascadeprotectedwarning'          => '<strong>Vain ylläpitäjät voivat muokata tätä sivua, koska se on sisällytetty alla {{PLURAL:$1|olevaan laajennetusti suojattuun sivuun|oleviin laajennetusti suojattuihin sivuihin}}</strong>:',
-'titleprotectedwarning'            => '<strong>Tämä sivun luominen on rajoitettu vain osalle käyttäjistä.</strong>',
+'titleprotectedwarning'            => "'''Tämä sivun luominen on rajoitettu vain osalle käyttäjistä [[Special:ListGroupRights|tietyillä oikeuksilla]].'''",
 'templatesused'                    => 'Tällä sivulla käytetyt mallineet:',
 'templatesusedpreview'             => 'Esikatselussa mukana olevat mallineet:',
 'templatesusedsection'             => 'Tässä osiossa mukana olevat mallineet:',
@@ -768,10 +787,19 @@ Yritä uudelleen. Jos ongelma ei katoa, yritä [[Special:UserLogout|kirjautua ul
 'recreate-deleted-warn'            => "'''Olet luomassa sivua, joka on aikaisemmin poistettu.'''
 
 Harkitse, kannattaako sivua luoda uudelleen. Alla on tämän sivun poistohistoria:",
+'deleted-notice'                   => 'Tämä sivu on poistettu. Alla on tämän sivun poistohistoria.',
+'deletelog-fulllog'                => 'Näytä loki kokonaan',
+'edit-hook-aborted'                => 'Laajennuskoodi esti muokkauksen antamatta syytä.',
+'edit-gone-missing'                => 'Sivun päivitys ei onnistunut.
+Se on ilmeisesti poistettu.',
+'edit-conflict'                    => 'Päällekkäinen muokkaus.',
+'edit-no-change'                   => 'Muokkauksesi sivuutettiin, koska tekstiin ei tehty mitään muutoksia.',
+'edit-already-exists'              => 'Uuden sivun luominen ei onnistunut.
+Se on jo olemassa.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Tällä sivulla on liian monta hitaiden laajennusfunktioiden kutsua.
-Kutsuja pitäisi olla vähemmän kuin $2, mutta nyt niitä on $1.',
+Kutsuja pitäisi olla alle $2 {{PLURAL:$2|kappale|kappaletta}}, mutta nyt niitä on $1 {{PLURAL:$1|kappale|kappaletta}}.',
 'expensive-parserfunction-category'       => 'Liiaksi hitaita jäsentimen laajennusfunktioita käyttävät sivut',
 'post-expand-template-inclusion-warning'  => 'Varoitus: Sisällytettyjen mallineiden koko on liian suuri.
 Joitakin mallineita ei ole sisällytetty.',
@@ -779,6 +807,8 @@ Joitakin mallineita ei ole sisällytetty.',
 'post-expand-template-argument-warning'   => 'Varoitus: Tällä sivulla on ainakin yksi mallineen muuttuja, jonka sisällytetty koko on liian suuri.
 Nämä muuttujat on jätetty käsittelemättä.',
 'post-expand-template-argument-category'  => 'Käsittelemättömiä mallinemuuttujia sisältävät sivut',
+'parser-template-loop-warning'            => 'Mallinesilmukka havaittu: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Mallineen rekursioraja ylitetty ($1)',
 
 # "Undo" feature
 'undo-success' => 'Kumoaminen onnistui. Valitse <em>tallenna</em> toteuttaaksesi muutokset.',
@@ -793,27 +823,27 @@ Nämä muuttujat on jätetty käsittelemättä.',
 Käyttäjän $3 antama syy on ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Näytä tämän sivun lokit',
-'nohistory'           => 'Tällä sivulla ei ole muutoshistoriaa.',
-'revnotfound'         => 'Versiota ei löydy',
-'revnotfoundtext'     => 'Pyytämääsi versiota ei löydy. Tarkista URL-osoite, jolla hait tätä sivua.',
-'currentrev'          => 'Nykyinen versio',
-'revisionasof'        => 'Versio $1',
-'revision-info'       => 'Versio hetkellä $1 – tehnyt $2',
-'previousrevision'    => '� Vanhempi versio',
-'nextrevision'        => 'Uudempi versio →',
-'currentrevisionlink' => 'Nykyinen versio',
-'cur'                 => 'nyk.',
-'next'                => 'seur.',
-'last'                => 'edell.',
-'page_first'          => 'ensimmäinen sivu',
-'page_last'           => 'viimeinen sivu',
-'histlegend'          => 'Merkinnät: (nyk.) = eroavaisuudet nykyiseen versioon, (edell.) = eroavaisuudet edelliseen versioon, <span class="minor">p</span> = pieni muutos',
-'deletedrev'          => '[poistettu]',
-'histfirst'           => 'Ensimmäiset',
-'histlast'            => 'Viimeisimmät',
-'historysize'         => '({{PLURAL:$1|1 tavu|$1 tavua}})',
-'historyempty'        => '(tyhjä)',
+'viewpagelogs'           => 'Näytä tämän sivun lokit',
+'nohistory'              => 'Tällä sivulla ei ole muutoshistoriaa.',
+'currentrev'             => 'Nykyinen versio',
+'currentrev-asof'        => 'Nykyinen versio $1',
+'revisionasof'           => 'Versio $1',
+'revision-info'          => 'Versio hetkellä $1 – tehnyt $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Vanhempi versio',
+'nextrevision'           => 'Uudempi versio →',
+'currentrevisionlink'    => 'Nykyinen versio',
+'cur'                    => 'nyk.',
+'next'                   => 'seur.',
+'last'                   => 'edell.',
+'page_first'             => 'ensimmäinen sivu',
+'page_last'              => 'viimeinen sivu',
+'histlegend'             => 'Merkinnät: (nyk.) = eroavaisuudet nykyiseen versioon, (edell.) = eroavaisuudet edelliseen versioon, <span class="minor">p</span> = pieni muutos',
+'history-fieldset-title' => 'Selaa muutoshistoriaa',
+'deletedrev'             => '[poistettu]',
+'histfirst'              => 'Ensimmäiset',
+'histlast'               => 'Viimeisimmät',
+'historysize'            => '({{PLURAL:$1|1 tavu|$1 tavua}})',
+'historyempty'           => '(tyhjä)',
 
 # Revision feed
 'history-feed-title'          => 'Muutoshistoria',
@@ -856,9 +886,9 @@ Muut ylläpitäjät voivat lukea piilotetun sisällön ja palauttaa sen.",
 'revdel-restore'              => 'Muuta näkyvyyttä',
 'pagehist'                    => 'Muutoshistoria',
 'deletedhist'                 => 'Poistettu muutoshistoria',
-'revdelete-content'           => 'sisältö',
-'revdelete-summary'           => 'yhteenveto',
-'revdelete-uname'             => 'käyttäjänimi',
+'revdelete-content'           => 'sisällön',
+'revdelete-summary'           => 'yhteenvedon',
+'revdelete-uname'             => 'käyttäjänimen',
 'revdelete-restricted'        => 'asetti rajoitukset ylläpitäjille',
 'revdelete-unrestricted'      => 'poisti rajoitukset ylläpitäjiltä',
 'revdelete-hid'               => 'piilotti $1',
@@ -891,6 +921,7 @@ Uuden ja vanhan sivun muutoksien pitää muodostaa jatkumo – ne eivät saa men
 'mergehistory-invalid-destination' => 'Kohdesivulla pitää olla kelvollinen nimi.',
 'mergehistory-autocomment'         => 'Yhdisti sivun [[:$1]] sivuun [[:$2]]',
 'mergehistory-comment'             => 'Yhdisti sivun [[:$1]] sivuun [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Lähde- ja kohdesivut eivät voi olla samat',
 
 # Merge log
 'mergelog'           => 'Yhdistämisloki',
@@ -903,121 +934,203 @@ Uuden ja vanhan sivun muutoksien pitää muodostaa jatkumo – ne eivät saa men
 'difference'              => 'Versioiden väliset erot',
 'lineno'                  => 'Rivi $1:',
 'compareselectedversions' => 'Vertaile valittuja versioita',
+'visualcomparison'        => 'Visuaalinen vertailu',
+'wikicodecomparison'      => 'Wikitekstin vertailu',
 'editundo'                => 'kumoa',
 'diff-multi'              => '(Versioiden välissä {{PLURAL:$1|yksi muu muokkaus|$1 muuta muokkausta}}.)',
+'diff-movedto'            => 'siirretty tänne: $1',
+'diff-styleadded'         => 'tyyli $1 lisätty',
+'diff-added'              => 'lisätty $1',
+'diff-changedto'          => 'muutettu täksi: $1',
+'diff-movedoutof'         => 'siirretty täältä: $1',
+'diff-styleremoved'       => 'tyyli $1 poistettu',
+'diff-removed'            => 'poistettu $1',
+'diff-changedfrom'        => 'muutettu tästä: $1',
+'diff-src'                => 'lähde',
+'diff-withdestination'    => 'kohteena: $1',
+'diff-with'               => '&#32;jossa $1 $2',
+'diff-with-final'         => '&#32;ja $1 $2',
+'diff-width'              => 'leveys',
+'diff-height'             => 'korkeus',
+'diff-p'                  => "'''kappale'''",
+'diff-blockquote'         => "'''sitaatti'''",
+'diff-h1'                 => "'''tason 1 otsikko'''",
+'diff-h2'                 => "'''tason 2 otsikko'''",
+'diff-h3'                 => "'''tason 3 otsikko'''",
+'diff-h4'                 => "'''tason 4 otsikko'''",
+'diff-h5'                 => "'''tason 5 otsikko'''",
+'diff-pre'                => "'''esimuotoiltu kappale'''",
+'diff-div'                => "'''jakoelementti'''",
+'diff-ul'                 => "'''järjestämätön luettelo'''",
+'diff-ol'                 => "'''järjestetty luettelo'''",
+'diff-li'                 => "'''listan kohta'''",
+'diff-table'              => "'''taulukko'''",
+'diff-tbody'              => "'''taulukon sisältö'''",
+'diff-tr'                 => "'''rivi'''",
+'diff-td'                 => "'''solu'''",
+'diff-th'                 => "'''otsikko'''",
+'diff-br'                 => "'''rivinvaihto'''",
+'diff-hr'                 => "'''vaakaviiva'''",
+'diff-code'               => "'''lähdekoodikappale'''",
+'diff-dl'                 => "'''määrittelyluettelo'''",
+'diff-dt'                 => "'''määrittelytermi'''",
+'diff-dd'                 => "'''määritelmä'''",
+'diff-input'              => "'''kenttä'''",
+'diff-form'               => "'''lomake'''",
+'diff-img'                => "'''kuva'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''linkki'''",
+'diff-i'                  => "'''kursiivi'''",
+'diff-b'                  => "'''lihavointi'''",
+'diff-strong'             => "'''vahvennus'''",
+'diff-em'                 => "'''korostus'''",
+'diff-font'               => "'''kirjasin'''",
+'diff-big'                => "'''iso'''",
+'diff-del'                => "'''poistettu'''",
+'diff-tt'                 => "'''kiinteä leveys'''",
+'diff-sub'                => "'''alaindeksi'''",
+'diff-sup'                => "'''yläindeksi'''",
+'diff-strike'             => "'''yliviivaus'''",
 
 # Search results
-'searchresults'             => 'Hakutulokset',
-'searchresulttext'          => 'Lisätietoa {{GRAMMAR:genitive|{{SITENAME}}}} hakutoiminnoista on [[{{MediaWiki:Helppage}}|ohjesivulla]].',
-'searchsubtitle'            => 'Haku termeillä [[:$1]]',
-'searchsubtitleinvalid'     => 'Haku termeillä $1',
-'noexactmatch'              => 'Sivua �$1� ei ole olemassa. Voit [[$1|luoda aiheesta uuden sivun]].',
-'noexactmatch-nocreate'     => "'''Sivua nimeltä �$1� ei ole.'''",
-'toomanymatches'            => 'Liian monta osumaa. Kokeile erilaista kyselyä.',
-'titlematches'              => 'Osumat sivujen otsikoissa',
-'notitlematches'            => 'Hakusanaa ei löytynyt minkään sivun otsikosta',
-'textmatches'               => 'Osumat sivujen teksteissä',
-'notextmatches'             => 'Hakusanaa ei löytynyt sivujen teksteistä',
-'prevn'                     => '� $1 edellistä',
-'nextn'                     => '$1 seuraavaa →',
-'viewprevnext'              => 'Näytä [$3] kerralla.
+'searchresults'                    => 'Hakutulokset',
+'searchresults-title'              => 'Haun tulokset hakusanalle �$1�',
+'searchresulttext'                 => 'Lisätietoa {{GRAMMAR:genitive|{{SITENAME}}}} hakutoiminnoista on [[{{MediaWiki:Helppage}}|ohjesivulla]].',
+'searchsubtitle'                   => "Etsit termillä '''[[:$1]]''' ([[Special:Prefixindex/$1|kaikki sivut alkaen termillä �$1�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|viittaukset sivuun �$1�]])",
+'searchsubtitleinvalid'            => 'Haku termeillä $1',
+'noexactmatch'                     => 'Sivua �$1� ei ole olemassa. Voit [[$1|luoda aiheesta uuden sivun]].',
+'noexactmatch-nocreate'            => "'''Sivua nimeltä �$1� ei ole.'''",
+'toomanymatches'                   => 'Liian monta osumaa. Kokeile erilaista kyselyä.',
+'titlematches'                     => 'Osumat sivujen otsikoissa',
+'notitlematches'                   => 'Hakusanaa ei löytynyt minkään sivun otsikosta',
+'textmatches'                      => 'Osumat sivujen teksteissä',
+'notextmatches'                    => 'Hakusanaa ei löytynyt sivujen teksteistä',
+'prevn'                            => '� $1 edellistä',
+'nextn'                            => '$1 seuraavaa →',
+'viewprevnext'                     => 'Näytä [$3] kerralla.
 
 $1 | $2',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 sana|$2 sanaa}})',
-'search-result-score'       => 'Asiaankuuluvuus: $1%',
-'search-redirect'           => '(ohjaus $1)',
-'search-section'            => '(osio $1)',
-'search-suggest'            => 'Tarkoititko: $1',
-'search-interwiki-caption'  => 'Sisarprojektit',
-'search-interwiki-default'  => 'Tulokset osoitteesta $1:',
-'search-interwiki-more'     => '(lisää)',
-'search-mwsuggest-enabled'  => 'näytä ehdotukset',
-'search-mwsuggest-disabled' => 'ilman ehdotuksia',
-'search-relatedarticle'     => 'Hae samankaltaisia sivuja',
-'mwsuggest-disable'         => 'Älä näytä ehdotuksia AJAXilla',
-'searchrelated'             => 'samankaltainen',
-'searchall'                 => 'kaikki',
-'showingresults'            => "{{PLURAL:$1|'''Yksi''' tulos|'''$1''' tulosta}} tuloksesta '''$2''' alkaen.",
-'showingresultsnum'         => "Alla on {{PLURAL:$3|'''Yksi''' hakutulos|'''$3''' hakutulosta}} alkaen '''$2.''' tuloksesta.",
-'showingresultstotal'       => 'Alla on {{PLURAL:$3|tulos $1|tulokset $1–$2}}; yhteensä $3.',
-'nonefound'                 => "'''Huomautus''': Epäonnistuneet haut johtuvat usein hyvin yleisten sanojen, kuten ''on'' ja ''ei'', etsimisestä tai useamman kuin yhden hakutermin määrittelemisestä. Vain sivut, joilla on kaikki hakutermin sanat, näkyvät tuloksissa.",
-'powersearch'               => 'Etsi',
-'powersearch-legend'        => 'Laajennettu haku',
-'powersearch-ns'            => 'Hae nimiavaruuksista:',
-'powersearch-redir'         => 'Luettele ohjaukset',
-'powersearch-field'         => 'Etsi',
-'search-external'           => 'Ulkoinen haku',
-'searchdisabled'            => 'Tekstihaku on poistettu toistaiseksi käytöstä suuren kuorman vuoksi. Voit käyttää alla olevaa Googlen hakukenttää sivujen etsimiseen, kunnes haku tulee taas käyttöön. <small>Huomaa, että ulkopuoliset kopiot {{GRAMMAR:genitive|{{SITENAME}}}} sisällöstä eivät välttämättä ole ajan tasalla.</small>',
+'searchmenu-legend'                => 'Hakuasetukset',
+'searchmenu-exists'                => "'''Sivu [[:$1]] löytyy tästä wikistä.'''",
+'searchmenu-new'                   => "'''Luo sivu ''[[:$1]]'' tähän wikiin.'''",
+'searchhelp-url'                   => 'Help:Sisällys',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Selaa sivuja tällä etuliitteellä]]',
+'searchprofile-articles'           => 'Sisältösivut',
+'searchprofile-articles-and-proj'  => 'Sisältö- ja projektisivut',
+'searchprofile-project'            => 'Projektisivut',
+'searchprofile-images'             => 'Tiedostot',
+'searchprofile-everything'         => 'Kaikki',
+'searchprofile-advanced'           => 'Laajennettu',
+'searchprofile-articles-tooltip'   => 'Etsi seuraavia $1',
+'searchprofile-project-tooltip'    => 'Etsi seuraavia $1',
+'searchprofile-images-tooltip'     => 'Etsi tiedostoja',
+'searchprofile-everything-tooltip' => 'Etsi kaikkialta (myös keskustelusivut)',
+'searchprofile-advanced-tooltip'   => 'Etsi määritellyistä nimiavaruuksista',
+'prefs-search-nsdefault'           => 'Etsi käyttäen oletuksia:',
+'prefs-search-nscustom'            => 'Etsi käyttäen määrittämiäsi nimiavaruuksia:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 sana|$2 sanaa}})',
+'search-result-score'              => 'Asiaankuuluvuus: $1%',
+'search-redirect'                  => '(ohjaus $1)',
+'search-section'                   => '(osio $1)',
+'search-suggest'                   => 'Tarkoititko: $1',
+'search-interwiki-caption'         => 'Sisarprojektit',
+'search-interwiki-default'         => 'Tulokset osoitteesta $1:',
+'search-interwiki-more'            => '(lisää)',
+'search-mwsuggest-enabled'         => 'näytä ehdotukset',
+'search-mwsuggest-disabled'        => 'ilman ehdotuksia',
+'search-relatedarticle'            => 'Hae samankaltaisia sivuja',
+'mwsuggest-disable'                => 'Älä näytä ehdotuksia AJAXilla',
+'searchrelated'                    => 'samankaltainen',
+'searchall'                        => 'kaikki',
+'showingresults'                   => "{{PLURAL:$1|'''Yksi''' tulos|'''$1''' tulosta}} tuloksesta '''$2''' alkaen.",
+'showingresultsnum'                => "Alla on {{PLURAL:$3|'''Yksi''' hakutulos|'''$3''' hakutulosta}} alkaen '''$2.''' tuloksesta.",
+'showingresultstotal'              => "Alla on {{PLURAL:$4|tulos '''$1'''|tulokset '''$1–$2'''}}; yhteensä '''$3'''.",
+'nonefound'                        => "'''Huomautus''': Haku kohdistuu oletuksena vain tiettyihin nimiavaruuksiin.
+Kokeile lisätä haun alkuun ''all:'', niin haku kohdistuu kaikkeen sisältöön (mukaanlukien keskustelut, mallineet jne.) tai kohdista haku haluttuun nimiavaruuteen.",
+'search-nonefound'                 => 'Hakusi ei tuottanut tulosta.',
+'powersearch'                      => 'Etsi',
+'powersearch-legend'               => 'Laajennettu haku',
+'powersearch-ns'                   => 'Hae nimiavaruuksista:',
+'powersearch-redir'                => 'Luettele ohjaukset',
+'powersearch-field'                => 'Etsi',
+'search-external'                  => 'Ulkoinen haku',
+'searchdisabled'                   => 'Tekstihaku on poistettu toistaiseksi käytöstä suuren kuorman vuoksi. Voit käyttää alla olevaa Googlen hakukenttää sivujen etsimiseen, kunnes haku tulee taas käyttöön. <small>Huomaa, että ulkopuoliset kopiot {{GRAMMAR:genitive|{{SITENAME}}}} sisällöstä eivät välttämättä ole ajan tasalla.</small>',
 
 # Preferences page
-'preferences'              => 'Asetukset',
-'mypreferences'            => 'Asetukset',
-'prefs-edits'              => 'Muokkauksia',
-'prefsnologin'             => 'Et ole kirjautunut sisään.',
-'prefsnologintext'         => 'Sinun täytyy <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} kirjautua sisään]</span>, jotta voisit muuttaa asetuksiasi.',
-'prefsreset'               => 'Asetukset on palautettu tallennetuista asetuksistasi.',
-'qbsettings'               => 'Pikavalikko',
-'qbsettings-none'          => 'Ei mitään',
-'qbsettings-fixedleft'     => 'Tekstin mukana, vasen',
-'qbsettings-fixedright'    => 'Tekstin mukana, oikea',
-'qbsettings-floatingleft'  => 'Pysyen vasemmalla',
-'qbsettings-floatingright' => 'Pysyen oikealla',
-'changepassword'           => 'Salasanan vaihto',
-'skin'                     => 'Ulkonäkö',
-'math'                     => 'Matematiikka',
-'dateformat'               => 'Päiväyksen muoto',
-'datedefault'              => 'Ei valintaa',
-'datetime'                 => 'Aika ja päiväys',
-'math_failure'             => 'Jäsentäminen epäonnistui',
-'math_unknown_error'       => 'Tuntematon virhe',
-'math_unknown_function'    => 'Tuntematon funktio',
-'math_lexing_error'        => 'Tulkintavirhe',
-'math_syntax_error'        => 'Jäsennysvirhe',
-'math_image_error'         => 'PNG-muunnos epäonnistui; tarkista, että latex, dvips, gs ja convert on asennettu oikein.',
-'math_bad_tmpdir'          => 'Matematiikan kirjoittaminen väliaikaishakemistoon tai tiedostonluonti ei onnistu',
-'math_bad_output'          => 'Matematiikan tulostehakemistoon kirjoittaminen tai tiedostonluonti ei onnistu',
-'math_notexvc'             => 'Texvc-sovellus puuttuu, lue math/READMEstä asennustietoja',
-'prefs-personal'           => 'Käyttäjätiedot',
-'prefs-rc'                 => 'Tuoreet muutokset',
-'prefs-watchlist'          => 'Tarkkailulista',
-'prefs-watchlist-days'     => 'Tarkkailulistan ajanjakso',
-'prefs-watchlist-edits'    => 'Tarkkailulistalla näytettävien muokkausten määrä',
-'prefs-misc'               => 'Muut',
-'saveprefs'                => 'Tallenna asetukset',
-'resetprefs'               => 'Palauta tallennetut asetukset',
-'oldpassword'              => 'Vanha salasana',
-'newpassword'              => 'Uusi salasana',
-'retypenew'                => 'Uusi salasana uudelleen',
-'textboxsize'              => 'Muokkaus',
-'rows'                     => 'Rivit',
-'columns'                  => 'Sarakkeet',
-'searchresultshead'        => 'Haku',
-'resultsperpage'           => 'Tuloksia sivua kohti',
-'contextlines'             => 'Rivien määrä tulosta kohti',
-'contextchars'             => 'Sisällön merkkien määrä riviä kohden',
-'stub-threshold'           => '<a href="#" class="stub">Tynkäsivun</a> osoituskynnys',
-'recentchangesdays'        => 'Näytettävien päivien määrä tuoreissa muutoksissa',
-'recentchangescount'       => 'Sivujen määrä tuoreissa muutoksissa',
-'savedprefs'               => 'Asetuksesi tallennettiin onnistuneesti.',
-'timezonelegend'           => 'Aikavyöhyke',
-'timezonetext'             => 'Paikallisen ajan ja palvelimen ajan (UTC) välinen aikaero tunteina.',
-'localtime'                => 'Paikallinen aika',
-'timezoneoffset'           => 'Aikaero',
-'servertime'               => 'Palvelimen aika',
-'guesstimezone'            => 'Utele selaimelta',
-'allowemail'               => 'Salli sähköpostin lähetys osoitteeseen',
-'prefs-searchoptions'      => 'Hakuasetukset',
-'prefs-namespaces'         => 'Nimiavaruudet',
-'defaultns'                => 'Etsi oletusarvoisesti näistä nimiavaruuksista',
-'default'                  => 'oletus',
-'files'                    => 'Tiedostot',
+'preferences'               => 'Asetukset',
+'mypreferences'             => 'Asetukset',
+'prefs-edits'               => 'Muokkauksia',
+'prefsnologin'              => 'Et ole kirjautunut sisään.',
+'prefsnologintext'          => 'Sinun täytyy <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} kirjautua sisään]</span>, jotta voisit muuttaa asetuksiasi.',
+'prefsreset'                => 'Asetukset on palautettu tallennetuista asetuksistasi.',
+'qbsettings'                => 'Pikavalikko',
+'qbsettings-none'           => 'Ei mitään',
+'qbsettings-fixedleft'      => 'Tekstin mukana, vasen',
+'qbsettings-fixedright'     => 'Tekstin mukana, oikea',
+'qbsettings-floatingleft'   => 'Pysyen vasemmalla',
+'qbsettings-floatingright'  => 'Pysyen oikealla',
+'changepassword'            => 'Salasanan vaihto',
+'skin'                      => 'Ulkonäkö',
+'skin-preview'              => 'esikatselu',
+'math'                      => 'Matematiikka',
+'dateformat'                => 'Päiväyksen muoto',
+'datedefault'               => 'Ei valintaa',
+'datetime'                  => 'Aika ja päiväys',
+'math_failure'              => 'Jäsentäminen epäonnistui',
+'math_unknown_error'        => 'Tuntematon virhe',
+'math_unknown_function'     => 'Tuntematon funktio',
+'math_lexing_error'         => 'Tulkintavirhe',
+'math_syntax_error'         => 'Jäsennysvirhe',
+'math_image_error'          => 'PNG-muunnos epäonnistui; tarkista, että latex, dvips, gs ja convert on asennettu oikein.',
+'math_bad_tmpdir'           => 'Matematiikan kirjoittaminen väliaikaishakemistoon tai tiedostonluonti ei onnistu',
+'math_bad_output'           => 'Matematiikan tulostehakemistoon kirjoittaminen tai tiedostonluonti ei onnistu',
+'math_notexvc'              => 'Texvc-sovellus puuttuu, lue math/READMEstä asennustietoja',
+'prefs-personal'            => 'Käyttäjätiedot',
+'prefs-rc'                  => 'Tuoreet muutokset',
+'prefs-watchlist'           => 'Tarkkailulista',
+'prefs-watchlist-days'      => 'Tarkkailulistan ajanjakso',
+'prefs-watchlist-days-max'  => '(enintään 7 päivää)',
+'prefs-watchlist-edits'     => 'Tarkkailulistalla näytettävien muokkausten määrä',
+'prefs-watchlist-edits-max' => '(maksimilukumäärä: 1000)',
+'prefs-misc'                => 'Muut',
+'prefs-resetpass'           => 'Muuta salasana',
+'saveprefs'                 => 'Tallenna asetukset',
+'resetprefs'                => 'Palauta tallennetut asetukset',
+'textboxsize'               => 'Muokkaus',
+'prefs-edit-boxsize'        => 'Muokkauskentän koko.',
+'rows'                      => 'Rivit',
+'columns'                   => 'Sarakkeet',
+'searchresultshead'         => 'Haku',
+'resultsperpage'            => 'Tuloksia sivua kohti',
+'contextlines'              => 'Rivien määrä tulosta kohti',
+'contextchars'              => 'Sisällön merkkien määrä riviä kohden',
+'stub-threshold'            => '<a href="#" class="stub">Tynkäsivun</a> osoituskynnys',
+'recentchangesdays'         => 'Näytettävien päivien määrä tuoreissa muutoksissa',
+'recentchangesdays-max'     => '(enintään $1 {{PLURAL:$1|päivä|päivää}})',
+'recentchangescount'        => 'Muutoksien määrä tuoreissa muutoksissa, muutoshistorioissa ja lokeissa oletuksena',
+'savedprefs'                => 'Asetuksesi tallennettiin onnistuneesti.',
+'timezonelegend'            => 'Aikavyöhyke',
+'timezonetext'              => 'Paikallisen ajan ja palvelimen ajan (UTC) välinen aikaero tunteina.',
+'localtime'                 => 'Paikallinen aika',
+'timezoneselect'            => 'Aikavyöhyke',
+'timezoneuseserverdefault'  => 'Käytä palvelimen oletusta',
+'timezoneuseoffset'         => 'Muu (määritä aikaero)',
+'timezoneoffset'            => 'Aikaero',
+'servertime'                => 'Palvelimen aika',
+'guesstimezone'             => 'Utele selaimelta',
+'allowemail'                => 'Salli sähköpostin lähetys osoitteeseen',
+'prefs-searchoptions'       => 'Hakuasetukset',
+'prefs-namespaces'          => 'Nimiavaruudet',
+'defaultns'                 => 'Etsi oletusarvoisesti näistä nimiavaruuksista',
+'default'                   => 'oletus',
+'files'                     => 'Tiedostot',
 
 # User rights
 'userrights'                  => 'Käyttöoikeuksien hallinta', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Käyttöoikeuksien hallinta',
 'userrights-user-editname'    => 'Käyttäjätunnus',
 'editusergroup'               => 'Muokkaa käyttäjän ryhmiä',
-'editinguser'                 => "Käyttäjän '''[[User:$1|$1]]''' oikeudet ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Käyttäjän '''[[User:$1|$1]]''' oikeudet ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Käyttäjän ryhmät',
 'saveusergroups'              => 'Tallenna',
 'userrights-groupsmember'     => 'Käyttäjä on jäsenenä ryhmissä',
@@ -1066,6 +1179,8 @@ $1 | $2',
 'right-minoredit'            => 'Merkitä muokkauksensa pieniksi',
 'right-move'                 => 'Siirtää sivuja',
 'right-move-subpages'        => 'Siirtää sivuja alasivuineen',
+'right-move-rootuserpages'   => 'Siirtää käyttäjäsivuja',
+'right-movefile'             => 'Siirtää tiedostoja',
 'right-suppressredirect'     => 'Siirtää sivuja luomatta automaattisia ohjauksia',
 'right-upload'               => 'Tallentaa tiedostoja',
 'right-reupload'             => 'Tallennetun tiedoston korvaaminen uudella',
@@ -1116,9 +1231,46 @@ $1 | $2',
 'rightslogentry' => 'Käyttäjän [[$1]] oikeudet muutettiin ryhmistä $2 ryhmiin $3',
 'rightsnone'     => '(ei oikeuksia)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lukea tätä sivua',
+'action-edit'                 => 'muokata tätä sivua',
+'action-createpage'           => 'luoda sivuja',
+'action-createtalk'           => 'luoda keskustelusivuja',
+'action-createaccount'        => 'luoda tätä käyttäjätunnusta',
+'action-minoredit'            => 'merkitä tätä muokkausta pieneksi',
+'action-move'                 => 'siirtää tätä sivua',
+'action-move-subpages'        => 'siirtää tätä sivua, ja sen alasivuja',
+'action-move-rootuserpages'   => 'siirtää käyttäjäsivuja',
+'action-movefile'             => 'siirtää tätä tiedostoa',
+'action-upload'               => 'tallentaa tätä tiedostoa',
+'action-reupload'             => 'korvata tätä olemassa olevaa tiedostoa',
+'action-reupload-shared'      => 'korvata tätä jaetun mediavaraston tiedostoa',
+'action-upload_by_url'        => 'tallentaa tätä tiedostoa URL-osoitteesta',
+'action-writeapi'             => 'käyttää kirjoitus-APIa',
+'action-delete'               => 'poistaa tätä sivua',
+'action-deleterevision'       => 'poistaa tätä versiota',
+'action-deletedhistory'       => 'tarkastella tämän sivun poistettua historiaa',
+'action-browsearchive'        => 'etsiä poistettuja sivuja',
+'action-undelete'             => 'palauttaa tätä sivua',
+'action-suppressrevision'     => 'tarkastella ja palauttaa tätä piilotettua versiota',
+'action-suppressionlog'       => 'tarkastella tätä yksityislokia',
+'action-block'                => 'estää tätä käyttäjää muokkaamasta',
+'action-protect'              => 'muuttaa tämän sivun suojaustasoa',
+'action-import'               => 'tuoda tätä sivua toisesta wikistä',
+'action-importupload'         => 'tuoda tätä sivua tiedostosta',
+'action-patrol'               => 'merkitä muiden muokkauksia tarkastetuiksi',
+'action-autopatrol'           => 'saada muokkaukset automaattisesti tarkastetuiksi',
+'action-unwatchedpages'       => 'tarkastella tarkkailemattomien sivujen listaa',
+'action-trackback'            => 'lähettää trackbackia',
+'action-mergehistory'         => 'yhdistää tämän sivun historiaa',
+'action-userrights'           => 'muokata kaikkia käyttöoikeuksia',
+'action-userrights-interwiki' => 'muokata muiden wikien käyttäjien käyttöoikeuksia',
+'action-siteadmin'            => 'lukita tai avata tietokantaa',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|muutos|muutosta}}',
 'recentchanges'                     => 'Tuoreet muutokset',
+'recentchanges-legend'              => 'Tuoreiden muutosten asetukset',
 'recentchangestext'                 => 'Tällä sivulla voi seurata tuoreita {{GRAMMAR:illative|{{SITENAME}}}} tehtyjä muutoksia.',
 'recentchanges-feed-description'    => 'Tällä sivulla voi seurata tuoreita {{GRAMMAR:illative|{{SITENAME}}}} tehtyjä muutoksia.',
 'rcnote'                            => 'Alla on {{PLURAL:$1|yksi muutos|$1 tuoreinta muutosta}} {{PLURAL:$2|yhden päivän|$2 viime päivän}} ajalta $4 kello $5 asti.',
@@ -1142,6 +1294,8 @@ $1 | $2',
 'rc_categories'                     => 'Vain luokista (erotin on �|�)',
 'rc_categories_any'                 => 'Mikä tahansa',
 'newsectionsummary'                 => '/* $1 */ uusi osio',
+'rc-enhanced-expand'                => 'Näytä yksityiskohdat (JavaScript)',
+'rc-enhanced-hide'                  => 'Piilota yksityiskohdat',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Linkitettyjen sivujen muutokset',
@@ -1161,11 +1315,11 @@ $1 | $2',
 'upload_directory_missing'    => 'Tallennushakemisto $1 puuttuu, eikä palvelin pysty luomaan sitä.',
 'upload_directory_read_only'  => 'Palvelimella ei ole kirjoitusoikeuksia tallennushakemistoon �<tt>$1</tt>�.',
 'uploaderror'                 => 'Tallennusvirhe',
-'uploadtext'                  => "Voit tallentaa tiedostoja alla olevalla lomakkeella. [[Special:ImageList|Tiedostoluettelo]] sisältää listan tallennetuista tiedostoista. Tallennukset kirjataan myös [[Special:Log/upload|tallennuslokiin]], ja poistot [[Special:Log/delete|poistolokiin]].
+'uploadtext'                  => "Voit tallentaa tiedostoja alla olevalla lomakkeella. [[Special:FileList|Tiedostoluettelo]] sisältää listan tallennetuista tiedostoista. Tallennukset kirjataan myös [[Special:Log/upload|tallennuslokiin]], ja poistot [[Special:Log/delete|poistolokiin]].
 
 Voit käyttää tiedostoja wikisivuilla seuraavilla tavoilla:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Tiedosto.jpg]]</nowiki></tt>''', käyttääksesi tiedoston täyttä versiota.
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Tiedosto.png|200px|thumb|left|Kuvausteksti]]</nowiki></tt>''', käyttääksesi tiedostoa sovitettuna 200 kuvapistettä leveään laatikkoon kuvaustekstillä.
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Tiedosto.jpg]]</nowiki></tt>''', käyttääksesi tiedoston täyttä versiota.
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Tiedosto.png|200px|thumb|left|Kuvausteksti]]</nowiki></tt>''', käyttääksesi tiedostoa sovitettuna 200 kuvapistettä leveään laatikkoon kuvaustekstillä.
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Tiedosto.ogg]]</nowiki></tt>''', jos haluat suoran linkin tiedostoon.",
 'upload-permitted'            => 'Sallitut tiedostomuodot: $1.',
 'upload-preferred'            => 'Suositellut tiedostomuodot: $1.',
@@ -1192,20 +1346,21 @@ Voit käyttää tiedostoja wikisivuilla seuraavilla tavoilla:
 'large-file'                  => 'Tiedostojen enimmäiskoko on $1. Lähettämäsi tiedoston koko on $2.',
 'largefileserver'             => 'Tämä tiedosto on suurempi kuin mitä palvelin sallii.',
 'emptyfile'                   => 'Tiedosto, jota yritit lähettää, näyttää olevan tyhjä. Tarkista, että kirjoitit polun ja nimen oikein ja että se ei ole liian suuri kohdepalvelimelle.',
-'fileexists'                  => 'Samanniminen tiedosto on jo olemassa. Katso tiedoston sivu <strong><tt>$1</tt></strong>, jos et ole varma, haluatko muuttaa sitä.',
-'filepageexists'              => 'Kuvaussivu on jo olemassa tällä nimellä <strong><tt>$1</tt></strong>, mutta ei tiedostoa tällä nimellä. Kirjoittamasi yhteenveto ei ilmesty kuvaussivulle. Muuttaaksesi uuden yhteenvedon kuvaussivulle, sinun täytyy manuaalisesti muokata sitä.',
-'fileexists-extension'        => 'Tiedosto, jolla on samankaltainen nimi, on jo olemassa:<br />
-Tallennetun tiedoston nimi: <strong><tt>$1</tt></strong><br />
-Olemassa olevan tiedoston nimi: <strong><tt>$2</tt></strong><br />
-Ainoa ero on tiedostopäätteen kirjainkoko. Tarkista ovatko tiedostot identtisiä.',
+'fileexists'                  => "Samanniminen tiedosto on jo olemassa. Katso tiedoston sivu '''<tt>$1</tt>''', jos et ole varma, haluatko muuttaa sitä.",
+'filepageexists'              => "Kuvaussivu on jo olemassa tällä nimellä '''<tt>$1</tt>''', mutta ei tiedostoa tällä nimellä. Kirjoittamasi yhteenveto ei ilmesty kuvaussivulle. Muuttaaksesi uuden yhteenvedon kuvaussivulle, sinun täytyy manuaalisesti muokata sitä.",
+'fileexists-extension'        => "Tiedosto, jolla on samankaltainen nimi, on jo olemassa:<br />
+Tallennetun tiedoston nimi: '''<tt>$1</tt>'''<br />
+Olemassa olevan tiedoston nimi: '''<tt>$2</tt>'''<br />
+Ainoa ero on tiedostopäätteen kirjainkoko. Tarkista ovatko tiedostot identtisiä.",
 'fileexists-thumb'            => "<center>'''Olemassa oleva tiedosto'''</center>",
-'fileexists-thumbnail-yes'    => 'Tiedosto näyttäisi olevan pienennetty kuva <i>(pienoiskuva)</i>. Tarkista tiedosto <strong><tt>$1</tt></strong>.<br />
-Jos yllä oleva tiedosto on alkuperäisversio samasta kuvasta, ei sille tarvi tallentaa pienoiskuvaa.',
-'file-thumbnail-no'           => 'Tiedostonimi alkaa merkkijonolla <strong><tt>$1</tt></strong>. Tiedosto näyttäisi olevan pienennetty kuva <i>(pienoiskuva)</i>.
-Jos sinulla on tämän kuvan alkuperäinen versio, tallenna se. Muussa tapauksessa nimeä tiedosto uudelleen.',
-'fileexists-forbidden'        => 'Samanniminen tiedosto on jo olemassa. Tallenna tiedosto jollakin toisella nimellä. Nykyinen tiedosto: [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Samanniminen tiedosto on jo olemassa jaetussa mediavarastossa. Tallenna tiedosto jollakin toisella nimellä. Nykyinen tiedosto: [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Tiedosto näyttäisi olevan pienennetty kuva ''(pienoiskuva)''. Tarkista tiedosto '''<tt>$1</tt>'''.<br />
+Jos yllä oleva tiedosto on alkuperäisversio samasta kuvasta, ei sille tarvi tallentaa pienoiskuvaa.",
+'file-thumbnail-no'           => "Tiedostonimi alkaa merkkijonolla '''<tt>$1</tt>'''. Tiedosto näyttäisi olevan pienennetty kuva ''(pienoiskuva)''.
+Jos sinulla on tämän kuvan alkuperäinen versio, tallenna se. Muussa tapauksessa nimeä tiedosto uudelleen.",
+'fileexists-forbidden'        => 'Samanniminen tiedosto on jo olemassa, eikä sitä voi korvata. Tallenna tiedosto jollakin toisella nimellä. Nykyinen tiedosto: [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Samanniminen tiedosto on jo olemassa jaetussa mediavarastossa. Tallenna tiedosto jollakin toisella nimellä. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Tämä tiedosto on kaksoiskappale {{PLURAL:$1|seuraavasta tiedostosta|seuraavista tiedostoista}}:',
+'file-deleted-duplicate'      => 'Tiedosto, joka on identtinen tämän tiedoston kanssa ([[$1]]) on aiemmin poistettu. Katso kyseisen tiedoston poistoloki ennen kuin jatkat uudelleentallentamista.',
 'successfulupload'            => 'Tallennus onnistui',
 'uploadwarning'               => 'Tallennusvaroitus',
 'savefile'                    => 'Tallenna',
@@ -1224,7 +1379,7 @@ Jos sinulla on tämän kuvan alkuperäinen versio, tallenna se. Muussa tapaukses
 'upload-wasdeleted'           => "'''Varoitus: Olet tallentamassa tiedostoa, joka on jo aikaisemmin poistettu.'''
 
 Harkitse, haluatko jatkaa tämän tiedoston tallentamista. Tiedoston poistoloki näkyy tässä:",
-'filename-bad-prefix'         => 'Tallentamasi tiedoston nimi alkaa merkkijonolla <strong>$1</strong>, joka on yleensä digitaalikameroiden automaattisesti antama nimi, joka ei kuvaa tiedoston sisältöä. Anna tiedostolle kuvaavampi nimi.',
+'filename-bad-prefix'         => "Tallentamasi tiedoston nimi alkaa merkkijonolla '''$1''', joka on yleensä digitaalikameroiden automaattisesti antama nimi, joka ei kuvaa tiedoston sisältöä. Anna tiedostolle kuvaavampi nimi.",
 
 'upload-proto-error'      => 'Virheellinen protokolla',
 'upload-proto-error-text' => 'Etälähetys on mahdollista vain osoitteista, jotka alkavat merkkijonolla <code>http://</code> tai <code>ftp://</code>.',
@@ -1245,18 +1400,19 @@ Harkitse, haluatko jatkaa tämän tiedoston tallentamista. Tiedoston poistoloki
 'upload_source_url'  => ' (julkinen verkko-osoite)',
 'upload_source_file' => ' (tiedosto tietokoneella)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Tämä toimintosivu näyttää kaikki tallennetut tiedostot. Viimeisin tallennettu tiedosto on listalla ensimmäisenä. Ryhmittelyperustetta voi vaihtaa napsauttamalla sarakenimeä.',
-'imagelist_search_for'  => 'Nimihaku',
+# Special:ListFiles
+'listfiles-summary'     => 'Tämä toimintosivu näyttää kaikki tallennetut tiedostot. Viimeisin tallennettu tiedosto on listalla ensimmäisenä. Ryhmittelyperustetta voi vaihtaa napsauttamalla sarakenimeä.',
+'listfiles_search_for'  => 'Nimihaku',
 'imgfile'               => 'tiedosto',
-'imagelist'             => 'Tiedostoluettelo',
-'imagelist_date'        => 'Päiväys',
-'imagelist_name'        => 'Nimi',
-'imagelist_user'        => 'Tallentaja',
-'imagelist_size'        => 'Koko',
-'imagelist_description' => 'Kuvaus',
-
-# Image description page
+'listfiles'             => 'Tiedostoluettelo',
+'listfiles_date'        => 'Päiväys',
+'listfiles_name'        => 'Nimi',
+'listfiles_user'        => 'Tallentaja',
+'listfiles_size'        => 'Koko',
+'listfiles_description' => 'Kuvaus',
+'listfiles_count'       => 'Versioita',
+
+# File description page
 'filehist'                       => 'Tiedoston historia',
 'filehist-help'                  => 'Päiväystä napsauttamalla näet millainen tiedosto oli sillä ajan hetkellä.',
 'filehist-deleteall'             => 'poista kaikki',
@@ -1264,19 +1420,25 @@ Harkitse, haluatko jatkaa tämän tiedoston tallentamista. Tiedoston poistoloki
 'filehist-revert'                => 'palauta',
 'filehist-current'               => 'nykyinen',
 'filehist-datetime'              => 'Päiväys',
+'filehist-thumb'                 => 'Pienoiskuva',
+'filehist-thumbtext'             => 'Pienoiskuva $1 tallennetusta versiosta',
+'filehist-nothumb'               => 'Ei pienoiskuvaa',
 'filehist-user'                  => 'Käyttäjä',
 'filehist-dimensions'            => 'Koko',
 'filehist-filesize'              => 'Tiedostokoko',
 'filehist-comment'               => 'Kommentti',
-'imagelinks'                     => 'Viittaukset sivuilta',
+'imagelinks'                     => 'Tiedostolinkit',
 'linkstoimage'                   => '{{PLURAL:$1|Seuraavalta sivulta|$1 sivulla}} on linkki tähän tiedostoon:',
+'linkstoimage-more'              => 'Enemmän kuin $1 {{PLURAL:$1|sivu|sivua}} linkittää tähän tiedostoon.
+Seuraava lista näyttää {{PLURAL:$1|ensimmäisen linkittävän sivun|$1 ensimmäistä linkittävää sivua}} tähän tiedostoon.
+[[Special:WhatLinksHere/$2|Koko lista]] on saatavilla.',
 'nolinkstoimage'                 => 'Tähän tiedostoon ei ole linkkejä miltään sivulta.',
 'morelinkstoimage'               => 'Näytä [[Special:WhatLinksHere/$1|lisää linkkejä]] tähän tiedostoon.',
 'redirectstofile'                => '{{PLURAL:$1|Seuraava tiedosto ohjaa|Seuraavat $1 tiedostoa ohjaavat}} tähän tiedostoon:',
-'duplicatesoffile'               => '{{PLURAL:$1|Seuraava tiedosto on tämän tiedoston kaksoiskappale|Seuraavat $1 tiedostoa ovat tämän tiedoston kaksoiskappaleita}}:',
+'duplicatesoffile'               => '{{PLURAL:$1|Seuraava tiedosto on tämän tiedoston kaksoiskappale|Seuraavat $1 tiedostoa ovat tämän tiedoston kaksoiskappaleita}} ([[Special:FileDuplicateSearch/$2|lisätietoja]]):',
 'sharedupload'                   => 'Tämä tiedosto on jaettu ja muut projektit saattavat käyttää sitä.',
 'shareduploadwiki'               => 'Katso $1 lisätietoja.',
-'shareduploadwiki-desc'          => 'Tiedot tiedoston $1 jaetussa mediavarastossa näkyvät alla.',
+'shareduploadwiki-desc'          => 'Tiedot tiedoston $1 näkyvät alla.',
 'shareduploadwiki-linktext'      => 'kuvaussivulta',
 'shareduploadduplicate'          => 'Tämä tiedosto on sama kuin $1 jaetussa mediavarastossa.',
 'shareduploadduplicate-linktext' => 'toinen tiedosto',
@@ -1300,7 +1462,7 @@ Harkitse, haluatko jatkaa tämän tiedoston tallentamista. Tiedoston poistoloki
 # File deletion
 'filedelete'                  => 'Tiedoston $1 poisto',
 'filedelete-legend'           => 'Tiedoston poisto',
-'filedelete-intro'            => "Olet poistamassa tiedostoa '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Olet poistamassa tiedostoa '''[[Media:$1|$1]]''' ja kaiken sen historian.",
 'filedelete-intro-old'        => '<span class="plainlinks">Olet poistamassa tiedoston \'\'\'[[Media:$1|$1]]\'\'\' [$4 $3 kello $2 luotua versiota].</span>',
 'filedelete-comment'          => 'Poiston syy',
 'filedelete-submit'           => 'Poista',
@@ -1308,7 +1470,6 @@ Harkitse, haluatko jatkaa tämän tiedoston tallentamista. Tiedoston poistoloki
 'filedelete-success-old'      => "Tiedoston '''[[Media:$1|$1]]''' $3 kello $2 luotu versio on poistettu.",
 'filedelete-nofile'           => "Tiedostoa '''$1''' ei ole.",
 'filedelete-nofile-old'       => "Tiedostosta '''$1''' ei ole olemassa pyydettyä versiota.",
-'filedelete-iscurrent'        => 'Et voi poistaa tiedoston uusinta versiota. Palauta jokin muu version uusimmaksi.',
 'filedelete-otherreason'      => 'Muu syy tai tarkennus',
 'filedelete-reason-otherlist' => 'Muu syy',
 'filedelete-reason-dropdown'  => '*Yleiset poistosyyt
@@ -1335,25 +1496,31 @@ Harkitse, haluatko jatkaa tämän tiedoston tallentamista. Tiedoston poistoloki
 
 # Random page
 'randompage'         => 'Satunnainen sivu',
-'randompage-nopages' => 'Tässä nimiavaruudessa ei ole sivuja.',
+'randompage-nopages' => 'Nimiavaruudessa �$1� ei ole sivuja.',
 
 # Random redirect
 'randomredirect'         => 'Satunnainen ohjaus',
-'randomredirect-nopages' => 'Tässä nimiavaruudessa ei ole ohjaussivuja.',
+'randomredirect-nopages' => 'Nimiavaruudessa �$1� ei ole ohjaussivuja.',
 
 # Statistics
-'statistics'             => 'Tilastot',
-'sitestats'              => 'Sivuston tilastot',
-'userstats'              => 'Käyttäjätilastot',
-'sitestatstext'          => "Tietokannassa on {{PLURAL:$1|yksi sivu|yhteensä $1 sivua}}. Tähän on laskettu mukaan keskustelusivut, {{GRAMMAR:genitive|{{SITENAME}}}} projektisivut, hyvin lyhyet sivut, ohjaussivut sekä muita sivuja, joita ei voi pitää kunnollisina sivuina. Nämä pois lukien tietokannassa on '''$2''' {{PLURAL:$2|sivu|sivua}}.
-
-{{GRAMMAR:illative|{{SITENAME}}}} on tallennettu '''$8''' {{PLURAL:$8|tiedosto|tiedostoa}}.
-
-Sivuja on katsottu yhteensä '''$3''' {{PLURAL:$3|kerran|kertaa}} ja muokattu '''$4''' {{PLURAL:$4|kerran|kertaa}}. Keskimäärin yhtä sivua on muokattu '''$5''' kertaa, ja muokkausta kohden sivua on katsottu keskimäärin '''$6''' kertaa.
-
-Ohjelmiston suorittamia ylläpitotöitä on jonossa '''$7''' {{PLURAL:$7|kappale|kappaletta}}.",
-'userstatstext'          => "Rekisteröityneitä käyttäjiä on '''$1'''. Näistä '''$2''' ($4%) on {{PLURAL:$2|ylläpitäjä|ylläpitäjiä}} ($5).",
-'statistics-mostpopular' => 'Katsotuimmat sivut',
+'statistics'                   => 'Tilastot',
+'statistics-header-pages'      => 'Sivutilastot',
+'statistics-header-edits'      => 'Muokkaustilastot',
+'statistics-header-views'      => 'Katselutilastot',
+'statistics-header-users'      => 'Käyttäjätilastot',
+'statistics-articles'          => 'Sisältösivuja',
+'statistics-pages'             => 'Sivuja',
+'statistics-pages-desc'        => 'Kaikki sivut, sisältäen keskustelusivut, ohjaukset ja muut.',
+'statistics-files'             => 'Tallennettuja tiedostoja',
+'statistics-edits'             => 'Muokkauksia {{GRAMMAR:genitive|{{SITENAME}}}} perustamisen jälkeen',
+'statistics-edits-average'     => 'Keskimäärin yhtä sivua muokattu',
+'statistics-views-total'       => 'Sivuja katsottu yhteensä',
+'statistics-views-peredit'     => 'Sivuja katsottu muokkausta kohden',
+'statistics-jobqueue'          => 'Ohjelmiston suorittamia [http://www.mediawiki.org/wiki/Manual:Job_queue ylläpitotöitä jonossa]',
+'statistics-users'             => 'Rekisteröityneitä [[Special:ListUsers|käyttäjiä]]',
+'statistics-users-active'      => 'Aktiivisia käyttäjiä',
+'statistics-users-active-desc' => 'Käyttäjät, jotka ovat suorittaneet jonkin toiminnon {{PLURAL:$1|edellisen päivän|edellisten $1 päivän}} aikana.',
+'statistics-mostpopular'       => 'Katsotuimmat sivut',
 
 'disambiguations'      => 'Linkit täsmennyssivuihin',
 'disambiguationspage'  => 'Template:Täsmennyssivu',
@@ -1395,26 +1562,30 @@ Ohjelmiston suorittamia ylläpitotöitä on jonossa '''$7''' {{PLURAL:$7|kappale
 'popularpages'            => 'Suositut sivut',
 'wantedcategories'        => 'Halutut luokat',
 'wantedpages'             => 'Halutut sivut',
-'missingfiles'            => 'Puuttuvat tiedostot',
+'wantedfiles'             => 'Halutut tiedostot',
+'wantedtemplates'         => 'Halutut mallineet',
 'mostlinked'              => 'Viitatuimmat sivut',
 'mostlinkedcategories'    => 'Viitatuimmat luokat',
 'mostlinkedtemplates'     => 'Viitatuimmat mallineet',
 'mostcategories'          => 'Luokitelluimmat sivut',
 'mostimages'              => 'Viitatuimmat tiedostot',
 'mostrevisions'           => 'Muokatuimmat sivut',
-'prefixindex'             => 'Sivujen katkaisuhaku',
+'prefixindex'             => 'Kaikki sivut katkaisuhaulla',
 'shortpages'              => 'Lyhyet sivut',
 'longpages'               => 'Pitkät sivut',
 'deadendpages'            => 'Sivut, joilla ei ole linkkejä',
 'deadendpagestext'        => 'Seuraavat sivut eivät linkitä muihin sivuihin wikissä.',
 'protectedpages'          => 'Suojatut sivut',
 'protectedpages-indef'    => 'Vain ikuisesti suojatut',
+'protectedpages-cascade'  => 'Vain laajennetusti suojatut',
 'protectedpagestext'      => 'Seuraavat sivut ovat suojattuja siirtämiseltä tai muutoksilta',
 'protectedpagesempty'     => 'Ei suojattu sivuja.',
 'protectedtitles'         => 'Suojatut sivunimet',
 'protectedtitlestext'     => 'Seuraavien sivujen luonti on estetty.',
 'protectedtitlesempty'    => 'Ei suojattuja sivunimiä näillä hakuehdoilla.',
 'listusers'               => 'Käyttäjälista',
+'listusers-editsonly'     => 'Näytä vain käyttäjät, joilla on muokkauksia',
+'usereditcount'           => '$1 {{PLURAL:$1|muokkaus|muokkausta}}',
 'newpages'                => 'Uudet sivut',
 'newpages-username'       => 'Käyttäjätunnus',
 'ancientpages'            => 'Kauan muokkaamattomat sivut',
@@ -1436,14 +1607,13 @@ Ohjelmiston suorittamia ylläpitotöitä on jonossa '''$7''' {{PLURAL:$7|kappale
 'booksources-isbn'          => 'ISBN',
 'booksources-go'            => 'Etsi',
 'booksources-text'          => 'Alla linkkejä ulkopuolisiin sivustoihin, joilla myydään uusia ja käytettyjä kirjoja. Sivuilla voi myös olla lisätietoa kirjoista.',
+'booksources-invalid-isbn'  => 'Annettu ISBN-numero ei ole kelvollinen. Tarkista alkuperäisestä lähteestä kirjoitusvirheiden varalta.',
 
 # Special:Log
 'specialloguserlabel'  => 'Käyttäjä',
 'speciallogtitlelabel' => 'Kohde',
 'log'                  => 'Lokit',
 'all-logs-page'        => 'Kaikki lokit',
-'log-search-legend'    => 'Etsi lokeista',
-'log-search-submit'    => 'Hae',
 'alllogstext'          => 'Tämä on yhdistetty lokien näyttö.
 Voit rajoittaa listaa valitsemalla lokityypin, käyttäjän tai sivun johon muutos on kohdistunut. Jälkimmäiset ovat kirjainkokoherkkiä.',
 'logempty'             => 'Ei tapahtumia lokissa.',
@@ -1455,6 +1625,7 @@ Voit rajoittaa listaa valitsemalla lokityypin, käyttäjän tai sivun johon muut
 'nextpage'          => 'Seuraava sivu ($1)',
 'prevpage'          => 'Edellinen sivu ($1)',
 'allpagesfrom'      => 'Alkaen sivusta',
+'allpagesto'        => 'Loppuen sivuun',
 'allarticles'       => 'Kaikki sivut',
 'allinnamespace'    => 'Kaikki sivut nimiavaruudessa $1',
 'allnotinnamespace' => 'Kaikki sivut, jotka eivät ole nimiavaruudessa $1',
@@ -1474,40 +1645,69 @@ Katso myös [[Special:WantedCategories|halutut luokat]].',
 'special-categories-sort-count' => 'järjestä koon mukaan',
 'special-categories-sort-abc'   => 'järjestä nimen mukaan',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Poistetut muokkaukset',
+
+# Special:LinkSearch
+'linksearch'       => 'Ulkoiset linkit',
+'linksearch-pat'   => 'Osoite',
+'linksearch-ns'    => 'Nimiavaruus',
+'linksearch-ok'    => 'Etsi',
+'linksearch-text'  => 'Asteriskia (*) voi käyttää jokerimerkkinä, esimerkiksi �*.wikipedia.org�.
+
+Tuetut protokollat: <tt>$1</tt>.',
+'linksearch-line'  => '$1 on linkitetty sivulta $2',
+'linksearch-error' => 'Jokerimerkkiä voi käyttää ainoastaan osoitteen alussa.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Katkaisuhaku',
 'listusers-submit'   => 'Hae',
 'listusers-noresult' => 'Käyttäjiä ei löytynyt.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Uudet käyttäjät',
+'newuserlogpagetext'          => 'Tämä on loki luoduista käyttäjätunnuksista.',
+'newuserlog-byemail'          => 'salasana lähetetty sähköpostitse',
+'newuserlog-create-entry'     => 'Uusi käyttäjä',
+'newuserlog-create2-entry'    => 'loi uuden käyttäjätunnuksen $1',
+'newuserlog-autocreate-entry' => 'Automaattisesti luotu käyttäjätunnus',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Käyttäjäryhmien oikeudet',
-'listgrouprights-summary'  => 'Tämä lista sisältää tämän wikin käyttäjäryhmät sekä ryhmiin liitetyt käyttöoikeudet.
+'listgrouprights'                 => 'Käyttäjäryhmien oikeudet',
+'listgrouprights-summary'         => 'Tämä lista sisältää tämän wikin käyttäjäryhmät sekä ryhmiin liitetyt käyttöoikeudet.
 Lisätietoa yksittäisistä käyttäjäoikeuksista saattaa löytyä [[{{MediaWiki:Listgrouprights-helppage}}|erilliseltä ohjesivulta]].',
-'listgrouprights-group'    => 'Ryhmä',
-'listgrouprights-rights'   => 'Oikeudet',
-'listgrouprights-helppage' => 'Help:Käyttöoikeudet',
-'listgrouprights-members'  => '(jäsenlista)',
+'listgrouprights-group'           => 'Ryhmä',
+'listgrouprights-rights'          => 'Oikeudet',
+'listgrouprights-helppage'        => 'Help:Käyttöoikeudet',
+'listgrouprights-members'         => '(jäsenlista)',
+'listgrouprights-addgroup'        => 'Voi lisätä jäseniä {{PLURAL:$2|ryhmään|ryhmiin}} $1',
+'listgrouprights-removegroup'     => 'Voi poistaa jäseniä {{PLURAL:$2|ryhmästä|ryhmistä}} $1',
+'listgrouprights-addgroup-all'    => 'Voi lisätä jäseniä kaikkiin ryhmiin',
+'listgrouprights-removegroup-all' => 'Voi poistaa jäseniä kaikista ryhmistä',
 
 # E-mail user
-'mailnologin'     => 'Lähettäjän osoite puuttuu',
-'mailnologintext' => 'Sinun pitää olla [[Special:UserLogin|kirjautuneena sisään]] ja [[Special:Preferences|asetuksissasi]] pitää olla toimiva ja <strong>varmennettu</strong> sähköpostiosoite, jotta voit lähettää sähköpostia muille käyttäjille.',
-'emailuser'       => 'Lähetä sähköpostia tälle käyttäjälle',
-'emailpage'       => 'Lähetä sähköpostia käyttäjälle',
-'emailpagetext'   => 'Jos tämä käyttäjä on antanut asetuksissaan kelvollisen sähköpostiosoitteen, alla olevalla lomakkeella voit lähettää hänelle viestin. [[Special:Preferences|Omissa asetuksissasi]] annettu sähköpostiosoite näkyy sähköpostin lähettäjän osoitteena, jotta vastaanottaja voi suoraan vastata viestiin.',
-'usermailererror' => 'Postitus palautti virheen:',
-'defemailsubject' => '{{SITENAME}}-sähköposti',
-'noemailtitle'    => 'Ei sähköpostiosoitetta',
-'noemailtext'     => 'Tämä käyttäjä ei ole määritellyt kelpoa sähköpostiosoitetta tai ei halua postia muilta käyttäjiltä.',
-'emailfrom'       => 'Lähettäjä',
-'emailto'         => 'Vastaanottaja',
-'emailsubject'    => 'Aihe',
-'emailmessage'    => 'Viesti',
-'emailsend'       => 'Lähetä',
-'emailccme'       => 'Lähetä kopio viestistä minulle.',
-'emailccsubject'  => 'Kopio lähettämästäsi viestistä osoitteeseen $1: $2',
-'emailsent'       => 'Sähköposti lähetetty',
-'emailsenttext'   => 'Sähköpostiviestisi on lähetetty.',
-'emailuserfooter' => 'Tämän sähköpostin lähetti $1 käyttäjälle $2 käyttämällä �Lähetä sähköpostia� -toimintoa {{GRAMMAR:inessive|{{SITENAME}}}}.',
+'mailnologin'      => 'Lähettäjän osoite puuttuu',
+'mailnologintext'  => 'Sinun pitää olla [[Special:UserLogin|kirjautuneena sisään]] ja [[Special:Preferences|asetuksissasi]] pitää olla toimiva ja <strong>varmennettu</strong> sähköpostiosoite, jotta voit lähettää sähköpostia muille käyttäjille.',
+'emailuser'        => 'Lähetä sähköpostia tälle käyttäjälle',
+'emailpage'        => 'Lähetä sähköpostia käyttäjälle',
+'emailpagetext'    => 'Jos tämä käyttäjä on antanut asetuksissaan kelvollisen sähköpostiosoitteen, alla olevalla lomakkeella voit lähettää hänelle viestin. [[Special:Preferences|Omissa asetuksissasi]] annettu sähköpostiosoite näkyy sähköpostin lähettäjän osoitteena, jotta vastaanottaja voi suoraan vastata viestiin.',
+'usermailererror'  => 'Postitus palautti virheen:',
+'defemailsubject'  => '{{SITENAME}}-sähköposti',
+'noemailtitle'     => 'Ei sähköpostiosoitetta',
+'noemailtext'      => 'Tämä käyttäjä ei ole määritellyt kelvollista sähköpostiosoitetta.',
+'nowikiemailtitle' => 'Sähköpostin lähettäminen ei sallittu',
+'nowikiemailtext'  => 'Tämä käyttäjä ei halua sähköpostia muilta käyttäjiltä.',
+'email-legend'     => 'Sähköpostin lähetys {{GRAMMAR:genitive|{{SITENAME}}}} käyttäjälle',
+'emailfrom'        => 'Lähettäjä',
+'emailto'          => 'Vastaanottaja',
+'emailsubject'     => 'Aihe',
+'emailmessage'     => 'Viesti',
+'emailsend'        => 'Lähetä',
+'emailccme'        => 'Lähetä kopio viestistä minulle.',
+'emailccsubject'   => 'Kopio lähettämästäsi viestistä osoitteeseen $1: $2',
+'emailsent'        => 'Sähköposti lähetetty',
+'emailsenttext'    => 'Sähköpostiviestisi on lähetetty.',
+'emailuserfooter'  => 'Tämän sähköpostin lähetti $1 käyttäjälle $2 käyttämällä �Lähetä sähköpostia� -toimintoa {{GRAMMAR:inessive|{{SITENAME}}}}.',
 
 # Watchlist
 'watchlist'            => 'Tarkkailulista',
@@ -1537,12 +1737,7 @@ Lisätietoa yksittäisistä käyttäjäoikeuksista saattaa löytyä [[{{MediaWik
 'iteminvalidname'      => 'Sivun $1 kanssa oli ongelmia! Sivun nimessä on vikaa.',
 'wlnote'               => "Alla on '''$1''' {{PLURAL:$1|muutos|muutosta}} viimeisen {{PLURAL:$2||'''$2'''}} tunnin ajalta.",
 'wlshowlast'           => 'Näytä viimeiset $1 tuntia tai $2 päivää$3',
-'watchlist-show-bots'  => 'Näytä bottien muokkaukset',
-'watchlist-hide-bots'  => 'Piilota bottien muokkaukset',
-'watchlist-show-own'   => 'Näytä omat muokkaukset',
-'watchlist-hide-own'   => 'Piilota omat muokkaukset',
-'watchlist-show-minor' => 'Näytä pienet muokkaukset',
-'watchlist-hide-minor' => 'Piilota pienet muokkaukset',
+'watchlist-options'    => 'Tarkkailulistan asetukset',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Lisätään tarkkailulistalle...',
@@ -1581,73 +1776,92 @@ Tarkkailulistan asetuksia voit muuttaa osoitteessa:
 Palaute ja lisäapu osoitteessa:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Poista sivu',
-'confirm'                     => 'Toteuta',
-'excontent'                   => 'sisälsi: �$1�',
-'excontentauthor'             => 'sisälsi: �$1� (ainoa muokkaaja oli $2)',
-'exbeforeblank'               => 'ennen tyhjentämistä sisälsi: �$1�',
-'exblank'                     => 'oli tyhjä',
-'delete-confirm'              => 'Sivun �$1� poistaminen',
-'delete-legend'               => 'Sivun poisto',
-'historywarning'              => 'Sivua, jonka aiot poistaa on muokattu useammin kuin kerran:',
-'confirmdeletetext'           => 'Olet poistamassa sivun tai tiedoston ja kaiken sen historian. Ymmärrä teon seuraukset ja tee poisto {{GRAMMAR:genitive|{{SITENAME}}}} [[{{MediaWiki:Policy-url}}|käytäntöjen]] mukaisesti.',
-'actioncomplete'              => 'Toiminto suoritettu',
-'deletedtext'                 => '�<nowiki>$1</nowiki>� on poistettu.
+# Delete
+'deletepage'             => 'Poista sivu',
+'confirm'                => 'Toteuta',
+'excontent'              => 'sisälsi: �$1�',
+'excontentauthor'        => 'sisälsi: �$1� (ainoa muokkaaja oli $2)',
+'exbeforeblank'          => 'ennen tyhjentämistä sisälsi: �$1�',
+'exblank'                => 'oli tyhjä',
+'delete-confirm'         => 'Sivun �$1� poistaminen',
+'delete-legend'          => 'Sivun poisto',
+'historywarning'         => 'Sivua, jonka aiot poistaa on muokattu useammin kuin kerran:',
+'confirmdeletetext'      => 'Olet poistamassa sivun tai tiedoston ja kaiken sen historian. Ymmärrä teon seuraukset ja tee poisto {{GRAMMAR:genitive|{{SITENAME}}}} [[{{MediaWiki:Policy-url}}|käytäntöjen]] mukaisesti.',
+'actioncomplete'         => 'Toiminto suoritettu',
+'deletedtext'            => '�<nowiki>$1</nowiki>� on poistettu.
 Sivulla $2 on lista viimeaikaisista poistoista.',
-'deletedarticle'              => 'poisti sivun $1',
-'suppressedarticle'           => 'häivytti sivun [[$1]]',
-'dellogpage'                  => 'Poistoloki',
-'dellogpagetext'              => 'Alla on loki viimeisimmistä poistoista.',
-'deletionlog'                 => 'poistoloki',
-'reverted'                    => 'Palautettu aikaisempaan versioon',
-'deletecomment'               => 'Poistamisen syy',
-'deleteotherreason'           => 'Muu syy tai tarkennus',
-'deletereasonotherlist'       => 'Muu syy',
-'deletereason-dropdown'       => '*Yleiset poistosyyt
+'deletedarticle'         => 'poisti sivun $1',
+'suppressedarticle'      => 'häivytti sivun [[$1]]',
+'dellogpage'             => 'Poistoloki',
+'dellogpagetext'         => 'Alla on loki viimeisimmistä poistoista.',
+'deletionlog'            => 'poistoloki',
+'reverted'               => 'Palautettu aikaisempaan versioon',
+'deletecomment'          => 'Poistamisen syy',
+'deleteotherreason'      => 'Muu syy tai tarkennus',
+'deletereasonotherlist'  => 'Muu syy',
+'deletereason-dropdown'  => '*Yleiset poistosyyt
 ** Lisääjän poistopyyntö
 ** Tekijänoikeusrikkomus
 ** Roskaa',
-'delete-edit-reasonlist'      => 'Muokkaa poistosyitä',
-'delete-toobig'               => 'Tällä sivulla on pitkä muutoshistoria – yli $1 {{PLURAL:$1|versio|versiota}}. Näin suurien muutoshistorioiden poistamista on rajoitettu suorituskykysyistä.',
-'delete-warning-toobig'       => 'Tällä sivulla on pitkä muutoshistoria – yli $1 {{PLURAL:$1|versio|versiota}}. Näin suurien muutoshistorioiden poistaminen voi haitata sivuston suorituskykyä.',
-'rollback'                    => 'palauta aiempaan versioon',
-'rollback_short'              => 'Palautus',
-'rollbacklink'                => 'palauta',
-'rollbackfailed'              => 'Palautus epäonnistui',
-'cantrollback'                => 'Aiempaan versioon ei voi palauttaa, koska viimeisin kirjoittaja on sivun ainoa tekijä.',
-'alreadyrolled'               => 'Käyttäjän [[User:$2|$2]] ([[User talk:$2|keskustelu]] | [[Special:Contributions/$2|{{int:contribslink}}]]) tekemiä muutoksia sivuun [[:$1]] ei voi kumota, koska joku muu on muuttanut sivua.
-
-Viimeisimmän muokkauksen on tehnyt käyttäjä [[User:$3|$3]] ([[User talk:$3|keskustelu]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Muokkauksen yhteenveto oli: <i>$1</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Käyttäjän [[Special:Contributions/$2|$2]] ([[User talk:$2|keskustelu]]) muokkaukset kumottiin ja sivu palautettiin viimeisimpään käyttäjän [[User:$1|$1]] tekemään versioon.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Käyttäjän �$1� tekemät muokkaukset kumottiin ja artikkeli palautettiin käyttäjän $2 versioon.',
-'sessionfailure'              => 'Istuntosi kanssa on ongelma. Muutosta ei toteutettu varotoimena sessionkaappauksien takia. Käytä selaimen paluutoimintoa ja päivitä sivu, jolta tulit, ja yritä uudelleen.',
+'delete-edit-reasonlist' => 'Muokkaa poistosyitä',
+'delete-toobig'          => 'Tällä sivulla on pitkä muutoshistoria – yli $1 {{PLURAL:$1|versio|versiota}}. Näin suurien muutoshistorioiden poistamista on rajoitettu suorituskykysyistä.',
+'delete-warning-toobig'  => 'Tällä sivulla on pitkä muutoshistoria – yli $1 {{PLURAL:$1|versio|versiota}}. Näin suurien muutoshistorioiden poistaminen voi haitata sivuston suorituskykyä.',
+
+# Rollback
+'rollback'         => 'palauta aiempaan versioon',
+'rollback_short'   => 'Palautus',
+'rollbacklink'     => 'palauta',
+'rollbackfailed'   => 'Palautus epäonnistui',
+'cantrollback'     => 'Aiempaan versioon ei voi palauttaa, koska viimeisin kirjoittaja on sivun ainoa tekijä.',
+'alreadyrolled'    => 'Käyttäjän [[User:$2|$2]] ([[User talk:$2|keskustelu]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) tekemiä muutoksia sivuun [[:$1]] ei voi kumota, koska joku muu on muuttanut sivua.
+
+Viimeisimmän muokkauksen on tehnyt käyttäjä [[User:$3|$3]] ([[User talk:$3|keskustelu]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Muokkauksen yhteenveto oli: ''$1''.", # only shown if there is an edit comment
+'revertpage'       => 'Käyttäjän [[Special:Contributions/$2|$2]] ([[User talk:$2|keskustelu]]) muokkaukset kumottiin ja sivu palautettiin viimeisimpään käyttäjän [[User:$1|$1]] tekemään versioon.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Käyttäjän �$1� tekemät muokkaukset kumottiin ja artikkeli palautettiin käyttäjän $2 versioon.',
+'sessionfailure'   => 'Istuntosi kanssa on ongelma. Muutosta ei toteutettu varotoimena sessionkaappauksien takia. Käytä selaimen paluutoimintoa ja päivitä sivu, jolta tulit, ja yritä uudelleen.',
+
+# Protect
 'protectlogpage'              => 'Suojausloki',
 'protectlogtext'              => 'Alla on loki sivujen suojauksista ja suojauksien poistoista. Luettelo tällä hetkellä suojatuista sivuista löytyy [[Special:ProtectedPages|suojattuen sivujen luettelosta]].',
 'protectedarticle'            => 'suojasi sivun $1',
 'modifiedarticleprotection'   => 'muutti sivun [[$1]] suojaustasoa',
 'unprotectedarticle'          => 'poisti suojauksen sivulta $1',
+'movedarticleprotection'      => 'siirsi suojausasetukset sivulta [[$2]] sivulle [[$1]]',
 'protect-title'               => 'Sivun $1 suojaus',
+'prot_1movedto2'              => 'siirsi sivun �$1� uudelle nimelle �$2�',
 'protect-legend'              => 'Suojaukset',
 'protectcomment'              => 'Perustelu',
 'protectexpiry'               => 'Vanhenee',
 'protect_expiry_invalid'      => 'Vanhenemisaika ei kelpaa.',
 'protect_expiry_old'          => 'Vanhenemisaika on menneisyydessä.',
 'protect-unchain'             => 'Käytä siirtosuojausta',
-'protect-text'                => 'Voit katsoa ja muuttaa sivun <strong><nowiki>$1</nowiki></strong> suojauksia.',
-'protect-locked-blocked'      => 'Et voi muuttaa sivun suojauksia, koska sinut on estetty. Alla on sivun �<strong>$1</strong>� nykyiset suojaukset:',
-'protect-locked-dblock'       => 'Sivun suojauksia ei voi muuttaa, koska tietokanta on lukittu. Alla on sivun �<strong>$1</strong>� nykyiset suojaukset:',
-'protect-locked-access'       => 'Sinulla ei ole tarvittavia oikeuksia sivujen suojauksen muuttamiseen. Alla on sivun �<strong>$1</strong>� nykyiset suojaukset:',
+'protect-text'                => "Voit katsoa ja muuttaa sivun '''<nowiki>$1</nowiki>''' suojauksia.",
+'protect-locked-blocked'      => "Et voi muuttaa sivun suojauksia, koska sinut on estetty. Alla on sivun �'''$1'''� nykyiset suojaukset:",
+'protect-locked-dblock'       => "Sivun suojauksia ei voi muuttaa, koska tietokanta on lukittu. Alla on sivun �'''$1'''� nykyiset suojaukset:",
+'protect-locked-access'       => "Sinulla ei ole tarvittavia oikeuksia sivujen suojauksen muuttamiseen. Alla on sivun �'''$1'''� nykyiset suojaukset:",
 'protect-cascadeon'           => 'Tämä sivu on suojauksen kohteena, koska se on sisällytetty alla {{PLURAL:$1|olevaan laajennetusti suojattuun sivuun|oleviin laajennetusti suojattuihin sivuihin}}. Voit muuttaa tämän sivun suojaustasoa, mutta se ei vaikuta laajennettuun suojaukseen.',
-'protect-default'             => '(ei rajoituksia)',
+'protect-default'             => 'Salli kaikki käyttäjät',
 'protect-fallback'            => 'Vaadi $1-oikeus',
 'protect-level-autoconfirmed' => 'Estä uudet ja anonyymit käyttäjät',
 'protect-level-sysop'         => 'Vain ylläpitäjät',
 'protect-summary-cascade'     => 'laajennettu',
 'protect-expiring'            => 'vanhenee $1',
+'protect-expiry-indefinite'   => 'ikuinen',
 'protect-cascade'             => 'Laajenna suojaus koskemaan kaikkia tähän sivuun sisällytettyjä sivuja.',
 'protect-cantedit'            => 'Et voi muuttaa sivun suojaustasoa, koska sinulla ei ole oikeutta muokata sivua.',
+'protect-othertime'           => 'Muu kesto',
+'protect-othertime-op'        => 'muu kesto',
+'protect-existing-expiry'     => 'Nykyinen vanhenemisaika: $3 kello $2',
+'protect-otherreason'         => 'Muu tai lisäsyy',
+'protect-otherreason-op'      => 'Muu syy',
+'protect-dropdown'            => '*Yleiset suojaussyyt
+** Jatkuva vandalismi
+** Jatkuva mainoslinkkien lisääminen
+** Muokkaussota
+** Suuri näkyvyys',
+'protect-edit-reasonlist'     => 'Muokkaa suojaussyitä',
+'protect-expiry-options'      => '1 tunti:1 hour,1 päivä:1 day,1 viikko:1 week,2 viikkoa:2 weeks,1 kuukausi:1 month,3 kuukautta:3 months,6 kuukautta:6 months,1 vuosi:1 year,ikuinen:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Rajoitus',
 'restriction-level'           => 'Suojaus',
 'minimum-size'                => 'Vähimmäiskoko',
@@ -1670,19 +1884,20 @@ Viimeisimmän muokkauksen on tehnyt käyttäjä [[User:$3|$3]] ([[User talk:$3|k
 'undeletepage'                 => 'Poistettujen sivujen selaus',
 'undeletepagetitle'            => "'''Poistetut versiot sivusta [[:$1]]'''.",
 'viewdeletedpage'              => 'Poistettujen sivujen selaus',
-'undeletepagetext'             => 'Seuraavat sivut on poistettu, mutta ne löytyvät vielä arkistosta, joten ne ovat palautettavissa. Arkisto saatetaan tyhjentää aika ajoin.',
+'undeletepagetext'             => '{{PLURAL:$1|Seuraava sivu|Seuraavat sivut}} on poistettu, mutta {{PLURAL:$1|se löytyy|ne löytyvät}} vielä arkistosta, joten {{PLURAL:$1|se on|ne ovat}} palautettavissa. Arkisto saatetaan tyhjentää aika ajoin.',
 'undelete-fieldset-title'      => 'Palauta versiot',
 'undeleteextrahelp'            => "Palauttaaksesi sivun koko muutoshistorian, jätä kaikki valintalaatikot tyhjiksi ja napsauta '''''Palauta'''''. Voit palauttaa versiota valikoivasti valitsemalla vain niiden versioiden valintalaatikot, jotka haluat palauttaa. Voit tyhjentää kommenttikentän ja kaikki valintalaatikot napsauttamalla '''''Tyhjennä'''''.",
 'undeleterevisions'            => '{{PLURAL:$1|Versio|$1 versiota}} arkistoitu.',
 'undeletehistory'              => 'Jos palautat sivun, kaikki versiot lisätään sivun historiaan. Jos uusi sivu samalla nimellä on luotu poistamisen jälkeen, palautetut versiot lisätään sen historiaan.',
 'undeleterevdel'               => 'Palautusta ei tehdä, jos sen seurauksena sivun uusin versio olisi osittain poistettu. Tässä tilanteessa poista uusimman poistettavan version piilotus. Tiedostoversioita, joihin sinulla ei ole katseluoikeutta ei palauteta.',
 'undeletehistorynoadmin'       => 'Tämä sivu on poistettu. Syy sivun poistamiseen näkyy yhteenvedossa, jossa on myös tiedot, ketkä ovat muokanneet tätä sivua ennen poistamista. Sivujen varsinainen sisältö on vain ylläpitäjien luettavissa.',
-'undelete-revision'            => 'Poistettu sivu $1 hetkellä $2. Tekijä: $3.',
+'undelete-revision'            => 'Poistettu sivu $1 hetkellä $4 kello $5. Tekijä: $3.',
 'undeleterevision-missing'     => 'Virheellinen tai puuttuva versio. Se on saatettu palauttaa tai poistaa arkistosta.',
 'undelete-nodiff'              => 'Aikaisempaa versiota ei löytynyt.',
 'undeletebtn'                  => 'Palauta',
 'undeletelink'                 => 'palauta',
 'undeletereset'                => 'Tyhjennä',
+'undeleteinvert'               => 'Käänteinen valinta',
 'undeletecomment'              => 'Kommentti',
 'undeletedarticle'             => 'palautti sivun [[$1]]',
 'undeletedrevisions'           => '{{PLURAL:$1|Yksi versio|$1 versiota}} palautettiin',
@@ -1714,26 +1929,27 @@ $1',
 'blanknamespace' => '(sivut)',
 
 # Contributions
-'contributions' => 'Käyttäjän muokkaukset',
-'mycontris'     => 'Omat muokkaukset',
-'contribsub2'   => 'Käyttäjän $1 ($2) muokkaukset',
-'nocontribs'    => 'Näihin ehtoihin sopivia muokkauksia ei löytynyt.',
-'uctop'         => ' (uusin)',
-'month'         => 'Kuukausi',
-'year'          => 'Vuosi',
-
-'sp-contributions-newbies'     => 'Näytä uusien tulokkaiden muutokset',
-'sp-contributions-newbies-sub' => 'Uusien tulokkaiden muokkaukset',
-'sp-contributions-blocklog'    => 'estot',
-'sp-contributions-search'      => 'Etsi muokkauksia',
-'sp-contributions-username'    => 'IP-osoite tai käyttäjätunnus',
-'sp-contributions-submit'      => 'Hae',
+'contributions'       => 'Käyttäjän muokkaukset',
+'contributions-title' => 'Käyttäjän $1 muokkaukset',
+'mycontris'           => 'Omat muokkaukset',
+'contribsub2'         => 'Käyttäjän $1 ($2) muokkaukset',
+'nocontribs'          => 'Näihin ehtoihin sopivia muokkauksia ei löytynyt.',
+'uctop'               => ' (uusin)',
+'month'               => 'Kuukausi',
+'year'                => 'Vuosi',
+
+'sp-contributions-newbies'       => 'Näytä uusien tulokkaiden muutokset',
+'sp-contributions-newbies-sub'   => 'Uusien tulokkaiden muokkaukset',
+'sp-contributions-newbies-title' => 'Uusien tulokkaiden muokkaukset',
+'sp-contributions-blocklog'      => 'estot',
+'sp-contributions-search'        => 'Etsi muokkauksia',
+'sp-contributions-username'      => 'IP-osoite tai käyttäjätunnus',
+'sp-contributions-submit'        => 'Hae',
 
 # What links here
 'whatlinkshere'            => 'Tänne viittaavat sivut',
 'whatlinkshere-title'      => 'Sivut, jotka viittaavat sivulle $1',
 'whatlinkshere-page'       => 'Sivu',
-'linklistsub'              => 'Lista linkeistä',
 'linkshere'                => 'Seuraavilta sivuilta on linkki sivulle <strong>[[:$1]]</strong>:',
 'nolinkshere'              => 'Sivulle <strong>[[:$1]]</strong> ei ole linkkejä.',
 'nolinkshere-ns'           => 'Sivulle <strong>[[:$1]]</strong> ei ole linkkejä valitussa nimiavaruudessa.',
@@ -1778,6 +1994,8 @@ $1',
 'ipbotherreason'                  => 'Muu syy tai tarkennus',
 'ipbhidename'                     => 'Piilota IP-osoite tai tunnus estolokista, muokkausestolistasta ja käyttäjälistasta',
 'ipbwatchuser'                    => 'Tarkkaile tämän käyttäjän käyttäjä- ja keskustelusivua',
+'ipballowusertalk'                => 'Salli tämän käyttäjän muokata omaa keskustelusivuaan ollessaan estetty',
+'ipb-change-block'                => 'Estä uudelleen näillä asetuksilla',
 'badipaddress'                    => 'IP-osoite on väärin muotoiltu.',
 'blockipsuccesssub'               => 'Esto onnistui',
 'blockipsuccesstext'              => "Käyttäjä tai IP-osoite '''$1''' on estetty.<br />Nykyiset estot löytyvät [[Special:IPBlockList|estolistalta]].",
@@ -1786,6 +2004,7 @@ $1',
 'ipb-unblock'                     => 'Poista käyttäjän tai IP-osoitteen muokkausesto',
 'ipb-blocklist-addr'              => 'Käyttäjän $1 estot',
 'ipb-blocklist'                   => 'Näytä estot',
+'ipb-blocklist-contribs'          => 'Käyttäjän $1 muokkaukset',
 'unblockip'                       => 'Muokkauseston poisto',
 'unblockiptext'                   => 'Tällä lomakkeella voit poistaa käyttäjän tai IP-osoitteen muokkauseston.',
 'ipusubmit'                       => 'Poista esto',
@@ -1794,6 +2013,9 @@ $1',
 'ipblocklist'                     => 'Estetyt IP-osoitteet ja käyttäjätunnukset',
 'ipblocklist-legend'              => 'Haku',
 'ipblocklist-username'            => 'Käyttäjätunnus tai IP-osoite',
+'ipblocklist-sh-userblocks'       => '$1 käyttäjätunnusten estot',
+'ipblocklist-sh-tempblocks'       => '$1 väliaikaiset estot',
+'ipblocklist-sh-addressblocks'    => '$1 yksittäiset IP-estot',
 'ipblocklist-submit'              => 'Hae',
 'blocklistline'                   => '$1 – $2 on estänyt käyttäjän $3 ($4)',
 'infiniteblock'                   => 'ikuisesti',
@@ -1802,25 +2024,32 @@ $1',
 'noautoblockblock'                => 'ei automaattista IP-osoitteiden estoa',
 'createaccountblock'              => 'tunnusten luonti estetty',
 'emailblock'                      => 'sähköpostin lähettäminen estetty',
+'blocklist-nousertalk'            => 'oman keskustelusivun muokkaaminen estetty',
 'ipblocklist-empty'               => 'Estolista on tyhjä.',
 'ipblocklist-no-results'          => 'Pyydettyä IP-osoitetta tai käyttäjätunnusta ei ole estetty.',
 'blocklink'                       => 'estä',
 'unblocklink'                     => 'poista esto',
+'change-blocklink'                => 'muuta estoa',
 'contribslink'                    => 'muokkaukset',
 'autoblocker'                     => 'Olet automaattisesti estetty, koska jaat IP-osoitteen käyttäjän $1 kanssa. Eston syy: $2.',
 'blocklogpage'                    => 'Estoloki',
+'blocklog-fulllog'                => 'Koko estoloki',
 'blocklogentry'                   => 'esti käyttäjän tai IP-osoitteen $1. Eston kesto $2 $3',
+'reblock-logentry'                => 'muutti käyttäjän tai IP-osoitteen [[$1]] eston asetuksia. Eston kesto $2 $3',
 'blocklogtext'                    => 'Tämä on loki muokkausestoista ja niiden purkamisista. Automaattisesti estettyjä IP-osoitteita ei kirjata. Tutustu [[Special:IPBlockList|estolistaan]] nähdäksesi listan tällä hetkellä voimassa olevista estoista.',
 'unblocklogentry'                 => 'poisti käyttäjältä $1 muokkauseston',
 'block-log-flags-anononly'        => 'vain kirjautumattomat käyttäjät',
 'block-log-flags-nocreate'        => 'tunnusten luonti estetty',
 'block-log-flags-noautoblock'     => 'ei automaattista IP-osoitteiden estoa',
 'block-log-flags-noemail'         => 'sähköpostin lähettäminen estetty',
+'block-log-flags-nousertalk'      => 'oman keskustelusivun muokkaaminen estetty',
 'block-log-flags-angry-autoblock' => 'kehittynyt automaattiesto käytössä',
 'range_block_disabled'            => 'Ylläpitäjän oikeus luoda alue-estoja ei ole käytössä.',
 'ipb_expiry_invalid'              => 'Virheellinen umpeutumisaika.',
 'ipb_expiry_temp'                 => 'Piilotettujen käyttäjätunnusten estojen tulee olla pysyviä.',
 'ipb_already_blocked'             => '�$1� on jo estetty.',
+'ipb-needreblock'                 => '== Estetty jo ==
+$1 on jo estetty. Haluatko muuttaa eston asetuksia?',
 'ipb_cant_unblock'                => 'Estoa �$1� ei löytynyt. Se on saatettu poistaa.',
 'ipb_blocked_as_range'            => 'IP-osoite $1 on estetty välillisesti ja sen estoa ei voi poistaa. Se on estetty osana verkkoaluetta $2, jonka eston voi poistaa',
 'ip_range_invalid'                => 'Virheellinen IP-alue.',
@@ -1831,6 +2060,7 @@ $1',
 'proxyblocksuccess'               => 'Valmis.',
 'sorbsreason'                     => 'IP-osoitteesi on listattu avoimena välityspalvelimena DNSBLin mustalla listalla.',
 'sorbs_create_account_reason'     => 'IP-osoitteesi on listattu avoimena välityspalvelimena DNSBLin mustalla listalla. Et voi luoda käyttäjätunnusta.',
+'cant-block-while-blocked'        => 'Et voi estää muita käyttäjiä ollessasi estetty.',
 
 # Developer tools
 'lockdb'              => 'Lukitse tietokanta',
@@ -1850,9 +2080,9 @@ $1',
 'databasenotlocked'   => 'Tietokanta ei ole lukittu.',
 
 # Move page
-'move-page'               => 'Siirrä $1',
-'move-page-legend'        => 'Siirrä sivu',
-'movepagetext'            => "Alla olevalla lomakkeella voit nimetä uudelleen sivuja, jolloin niiden koko historia siirtyy uuden nimen alle.
+'move-page'                    => 'Siirrä $1',
+'move-page-legend'             => 'Siirrä sivu',
+'movepagetext'                 => "Alla olevalla lomakkeella voit nimetä uudelleen sivuja, jolloin niiden koko historia siirtyy uuden nimen alle.
 Vanhasta sivusta tulee ohjaussivu, joka osoittaa uuteen sivuun.
 Voit päivittää sivuun viittaavat ohjaukset automaattisesti ohjaamaan uudelle nimelle.
 Jos et halua tätä tehtävän automaattisesti, muista tehdä tarkistukset [[Special:DoubleRedirects|kaksinkertaisten]] tai [[Special:BrokenRedirects|rikkinäisten]] ohjausten varalta.
@@ -1862,57 +2092,70 @@ Huomaa, että sivua '''ei''' siirretä mikäli uusi otsikko on olemassa olevan s
 Tämä tarkoittaa sitä, että voit siirtää sivun takaisin vanhalle nimelleen mikäli teit virheen, mutta et voi kirjoittaa olemassa olevan sivun päälle.
 
 Tämä saattaa olla suuri ja odottamaton muutos suositulle sivulle. Varmista, että tiedät seuraukset ennen kuin siirrät sivun.",
-'movepagetalktext'        => "Sivuun mahdollisesti kytketty keskustelusivu siirretään automaattisesti, '''paitsi jos''':
+'movepagetalktext'             => "Sivuun mahdollisesti kytketty keskustelusivu siirretään automaattisesti, '''paitsi jos''':
 *Siirrät sivua nimiavaruudesta toiseen
 *Kohdesivulla on olemassa keskustelusivu, joka ei ole tyhjä, tai
 *Kumoat alla olevan ruudun asetuksen.
 
 Näissä tapauksissa sivut täytyy siirtää tai yhdistää käsin.",
-'movearticle'             => 'Siirrä sivu',
-'movenotallowed'          => 'Sinulla ei ole oikeuksia siirtää sivuja.',
-'newtitle'                => 'Uusi nimi sivulle',
-'move-watch'              => 'Tarkkaile tätä sivua',
-'movepagebtn'             => 'Siirrä sivu',
-'pagemovedsub'            => 'Siirto onnistui',
-'movepage-moved'          => "<big>'''$1 on siirretty nimelle $2'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Kohdesivu on jo olemassa, tai valittu nimi ei ole sopiva. Ole hyvä ja valitse uusi nimi.',
-'cantmove-titleprotected' => 'Sivua ei voi siirtää tälle nimelle, koska tämän nimisen sivun luonti on estetty.',
-'talkexists'              => 'Sivun siirto onnistui, mutta keskustelusivua ei voitu siirtää, koska uuden otsikon alla on jo keskustelusivu. Keskustelusivujen sisältö täytyy yhdistää käsin.',
-'movedto'                 => 'Siirretty uudelle otsikolle',
-'movetalk'                => 'Siirrä myös keskustelusivu.',
-'move-subpages'           => 'Siirrä kaikki alasivut, jos mahdollista',
-'move-talk-subpages'      => 'Siirrä kaikki keskustelusivun alasivut, jos mahdollista',
-'movepage-page-exists'    => 'Sivu $1 on jo olemassa ja sitä ei voi automaattisesti korvata.',
-'movepage-page-moved'     => 'Sivu $1 on siirretty nimelle $2.',
-'movepage-page-unmoved'   => 'Sivua $1 ei voitu siirtää nimelle $2.',
-'movepage-max-pages'      => 'Enimmäismäärä sivuja on siirretty, eikä enempää siirretä enää automaattisesti.
+'movearticle'                  => 'Siirrä sivu',
+'movenologin'                  => 'Et ole kirjautunut sisään',
+'movenologintext'              => 'Sinun pitää olla rekisteröitynyt käyttäjä ja [[Special:UserLogin|kirjautua sisään]], jotta voisit siirtää sivun.',
+'movenotallowed'               => 'Sinulla ei ole oikeuksia siirtää sivuja.',
+'movenotallowedfile'           => 'Sinulla ei ole oikeuksia siirtää tiedostoja.',
+'cant-move-user-page'          => 'Sinulla ei ole lupaa siirtää käyttäjäsivuja (lukuun ottamatta alasivuja).',
+'cant-move-to-user-page'       => 'Sinulla ei ole lupaa siirtää sivuja käyttäjäsivuiksi (paitsi alasivuiksi).',
+'newtitle'                     => 'Uusi nimi sivulle',
+'move-watch'                   => 'Tarkkaile tätä sivua',
+'movepagebtn'                  => 'Siirrä sivu',
+'pagemovedsub'                 => 'Siirto onnistui',
+'movepage-moved'               => "<big>'''$1 on siirretty nimelle $2'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Ohjaus luotiin.',
+'movepage-moved-noredirect'    => 'Ohjausta ei luotu.',
+'articleexists'                => 'Kohdesivu on jo olemassa, tai valittu nimi ei ole sopiva. Ole hyvä ja valitse uusi nimi.',
+'cantmove-titleprotected'      => 'Sivua ei voi siirtää tälle nimelle, koska tämän nimisen sivun luonti on estetty.',
+'talkexists'                   => 'Sivun siirto onnistui, mutta keskustelusivua ei voitu siirtää, koska uuden otsikon alla on jo keskustelusivu. Keskustelusivujen sisältö täytyy yhdistää käsin.',
+'movedto'                      => 'Siirretty uudelle otsikolle',
+'movetalk'                     => 'Siirrä myös keskustelusivu.',
+'move-subpages'                => 'Siirrä kaikki alasivut, jos mahdollista',
+'move-talk-subpages'           => 'Siirrä kaikki keskustelusivun alasivut, jos mahdollista',
+'movepage-page-exists'         => 'Sivu $1 on jo olemassa ja sitä ei voi automaattisesti korvata.',
+'movepage-page-moved'          => 'Sivu $1 on siirretty nimelle $2.',
+'movepage-page-unmoved'        => 'Sivua $1 ei voitu siirtää nimelle $2.',
+'movepage-max-pages'           => 'Enimmäismäärä sivuja on siirretty, eikä enempää siirretä enää automaattisesti.
 $1 {{PLURAL:$1|sivu|sivua}} siirettiin.',
-'1movedto2'               => 'siirsi sivun �$1� uudelle nimelle �$2�',
-'1movedto2_redir'         => 'siirsi sivun �$1� ohjauksen �$2� päälle',
-'movelogpage'             => 'Siirtoloki',
-'movelogpagetext'         => 'Tämä on loki siirretyistä sivuista.',
-'movereason'              => 'Syy',
-'revertmove'              => 'kumoa',
-'delete_and_move'         => 'Poista kohdesivu ja siirrä',
-'delete_and_move_text'    => 'Kohdesivu [[:$1]] on jo olemassa. Haluatko poistaa sen, jotta nykyinen sivu voitaisiin siirtää?',
-'delete_and_move_confirm' => 'Poista sivu',
-'delete_and_move_reason'  => 'Sivu on siirron tiellä.',
-'selfmove'                => 'Lähde- ja kohdenimi ovat samat.',
-'immobile_namespace'      => 'Sivuja ei voi siirtää tähän nimiavaruuteen.',
-'imagenocrossnamespace'   => 'Tiedostoja ei voi siirtää pois tiedostonimiavaruudesta.',
-'imagetypemismatch'       => 'Uusi tiedostopääte ei vastaa tiedoston tyyppiä',
-'imageinvalidfilename'    => 'Kohdenimi on virheellinen',
-'fix-double-redirects'    => 'Päivitä kaikki tänne viittaavat ohjaukset ohjaamaan uudelle nimelle',
+'1movedto2'                    => 'siirsi sivun [[$1]] uudelle nimelle [[$2]]',
+'1movedto2_redir'              => 'siirsi sivun [[$1]] ohjauksen [[$2]] päälle',
+'move-redirect-suppressed'     => 'ei ohjausta',
+'movelogpage'                  => 'Siirtoloki',
+'movelogpagetext'              => 'Tämä on loki siirretyistä sivuista.',
+'movereason'                   => 'Syy',
+'revertmove'                   => 'kumoa',
+'delete_and_move'              => 'Poista kohdesivu ja siirrä',
+'delete_and_move_text'         => 'Kohdesivu [[:$1]] on jo olemassa. Haluatko poistaa sen, jotta nykyinen sivu voitaisiin siirtää?',
+'delete_and_move_confirm'      => 'Poista sivu',
+'delete_and_move_reason'       => 'Sivu on siirron tiellä.',
+'selfmove'                     => 'Lähde- ja kohdenimi ovat samat.',
+'immobile-source-namespace'    => 'Sivuja ei voi siirtää nimiavaruudessa �$1�',
+'immobile-target-namespace'    => 'Sivuja ei voi siirtää nimiavaruuteen �$1�',
+'immobile-target-namespace-iw' => 'Kielilinkki ei ole kelvollinen kohde sivun siirrolle.',
+'immobile-source-page'         => 'Tämä sivu ei ole siirrettävissä.',
+'immobile-target-page'         => 'Kyseiselle kohdenimelle ei voi siirtää.',
+'imagenocrossnamespace'        => 'Tiedostoja ei voi siirtää pois tiedostonimiavaruudesta.',
+'imagetypemismatch'            => 'Uusi tiedostopääte ei vastaa tiedoston tyyppiä',
+'imageinvalidfilename'         => 'Kohdenimi on virheellinen',
+'fix-double-redirects'         => 'Päivitä kaikki tänne viittaavat ohjaukset ohjaamaan uudelle nimelle',
+'move-leave-redirect'          => 'Jätä paikalle ohjaus',
 
 # Export
 'export'            => 'Sivujen vienti',
 'exporttext'        => 'Voit viedä sivun tai sivujen tekstiä ja muokkaushistoriaa XML-muodossa.
-Tämä tieto voidaan tuoda toiseen MediaWikiin käyttämällä [[Special:Import|tuontisivua]].
+Tämä tieto voidaan tuoda toiseen käyttämällä MediaWikiä [[Special:Import|tuontisivun]] kautta.
 
 Syötä sivujen otsikoita jokainen omalle rivilleen alla olevaan laatikkoon.
 Valitse myös, haluatko kaikki versiot sivuista, vai ainoastaan nykyisen version.
 
-Jälkimmäisessä tapauksessa voit myös käyttää linkkiä. Esimerkiksi sivun [[{{MediaWiki:Mainpage}}]] saa vietyä linkistä [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]].',
+Jälkimmäisessä tapauksessa voit myös käyttää linkkiä. Esimerkiksi sivun [[{{MediaWiki:Mainpage}}]] saa vietyä linkistä [[{{#special:Export}}/{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Liitä mukaan ainoastaan uusin versio – ei koko historiaa.',
 'exportnohistory'   => '----
 Sivujen koko historian vienti on estetty suorituskykysyistä.',
@@ -1927,7 +2170,8 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'allmessagesname'           => 'Nimi',
 'allmessagesdefault'        => 'Oletusarvo',
 'allmessagescurrent'        => 'Nykyinen arvo',
-'allmessagestext'           => 'Tämä on luettelo kaikista MediaWiki-nimiavaruudessa olevista viesteistä.',
+'allmessagestext'           => 'Tämä on luettelo järjestelmäviesteistä, jotka ovat saatavilla MediaWiki-nimiavaruudessa.
+Jos haluat muokata MediaWikin yleistä kotoistusta, käy [http://www.mediawiki.org/wiki/Localisation MediaWikin kotoistussivuilla] ja sivustolla [http://translatewiki.net translatewiki.net].',
 'allmessagesnotsupportedDB' => 'Tämä sivu ei ole käytössä, koska <tt>$wgUseDatabaseMessages</tt>-asetus on pois päältä.',
 'allmessagesfilter'         => 'Viestiavainsuodatin:',
 'allmessagesmodified'       => 'Näytä vain muutetut',
@@ -1945,9 +2189,12 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'import'                     => 'Tuo sivuja',
 'importinterwiki'            => 'Tuo sivuja lähiwikeistä',
 'import-interwiki-text'      => 'Valitse wiki ja sivun nimi. Versioiden päivämäärät ja muokkaajat säilytetään. Kaikki wikienväliset tuonnit kirjataan [[Special:Log/import|tuontilokiin]].',
+'import-interwiki-source'    => 'Lähdewiki/sivu:',
 'import-interwiki-history'   => 'Kopioi sivun koko historia',
 'import-interwiki-submit'    => 'Tuo',
 'import-interwiki-namespace' => 'Kohdenimiavaruus:',
+'import-upload-filename'     => 'Tiedostonimi:',
+'import-comment'             => 'Syy',
 'importtext'                 => 'Vie sivuja lähdewikistä käyttäen [[Special:Export|vienti]]-työkalua. Tallenna tiedot koneellesi ja tallenna ne täällä.',
 'importstart'                => 'Tuodaan sivuja...',
 'import-revision-count'      => '$1 {{PLURAL:$1|versio|versiota}}',
@@ -1993,7 +2240,7 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'tooltip-pt-logout'               => 'Kirjaudu ulos',
 'tooltip-ca-talk'                 => 'Keskustele sisällöstä',
 'tooltip-ca-edit'                 => 'Muokkaa tätä sivua',
-'tooltip-ca-addsection'           => 'Lisää kommentti tälle sivulle',
+'tooltip-ca-addsection'           => 'Lisää uusi osio',
 'tooltip-ca-viewsource'           => 'Näytä sivun lähdekoodi',
 'tooltip-ca-history'              => 'Sivun aikaisemmat versiot',
 'tooltip-ca-protect'              => 'Suojaa tämä sivu',
@@ -2040,14 +2287,20 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'tooltip-watch'                   => 'Lisää tämä sivu tarkkailulistaan',
 'tooltip-recreate'                => 'Luo sivu uudelleen',
 'tooltip-upload'                  => 'Aloita tallennus',
+'tooltip-rollback'                => 'Palauttaminen kumoaa viimeisimmän muokkaajan yhden tai useamman muutoksen yhdellä kertaa.',
+'tooltip-undo'                    => 'Kumoaminen palauttaa tämän muutoksen ja avaa artikkelin esikatselussa. Yhteenvetokenttään voi kirjoittaa palautuksen syyn.',
 
 # Stylesheets
 'common.css'   => '/* Tämä sivu sisältää koko sivustoa muuttavia tyylejä. */',
 'monobook.css' => '/* Tämä sivu sisältää Monobook-ulkoasua muuttavia tyylejä. */',
 
 # Scripts
-'common.js'   => '/* Tämän sivun koodi liitetään jokaiseen sivulataukseen */',
-'monobook.js' => '/* Tämän sivun JavaScript-koodi liitetään MonoBook-tyyliin */',
+'common.js'      => '/* Tämän sivun koodi liitetään jokaiseen sivulataukseen */',
+'nostalgia.js'   => '/* Tämän sivun JavaScript-koodi liitetään Nostalgia-tyyliin */',
+'cologneblue.js' => '/* Tämän sivun JavaScript-koodi liitetään Kölnin sininen -tyyliin */',
+'monobook.js'    => '/* Tämän sivun JavaScript-koodi liitetään Monobook-tyyliin */',
+'simple.js'      => '/* Tämän sivun JavaScript-koodi liitetään Yksinkertaistettuun tyyliin */',
+'modern.js'      => '/* Tämän sivun JavaScript-koodi liitetään Moderni-tyyliin */',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF-metatieto on poissa käytöstä tällä palvelimella.',
@@ -2055,12 +2308,12 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'notacceptable'     => 'Wikipalvelin ei voi näyttää tietoja muodossa, jota ohjelmasi voisi lukea.',
 
 # Attribution
-'anonymous'        => '{{GRAMMAR:genitive|{{SITENAME}}}} anonyymit käyttäjät',
+'anonymous'        => '{{GRAMMAR:genitive|{{SITENAME}}}} {{PLURAL:$1|anonyymi käyttäjä|anonyymit käyttäjät}}',
 'siteuser'         => '{{GRAMMAR:genitive|{{SITENAME}}}} käyttäjä $1',
 'lastmodifiedatby' => 'Tätä sivua muokkasi viimeksi �$3� $2 kello $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Perustuu työlle, jonka teki $1.',
 'others'           => 'muut',
-'siteusers'        => '{{GRAMMAR:genitive|{{SITENAME}}}} käyttäjä(t) $1',
+'siteusers'        => '{{GRAMMAR:genitive|{{SITENAME}}}} {{PLURAL:$2|käyttäjä|käyttäjät}} $1',
 'creditspage'      => 'Sivun tekijäluettelo',
 'nocredits'        => 'Tämän sivun tekijäluettelotietoja ei löydy.',
 
@@ -2080,6 +2333,16 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'numauthors'     => 'Sivun erillisten kirjoittajien määrä: $1',
 'numtalkauthors' => 'Keskustelusivun erillisten kirjoittajien määrä: $1',
 
+# Skin names
+'skinname-standard'    => 'Perus',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Kölnin sininen',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'Oma tyylisivu',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Yksinkertainen',
+'skinname-modern'      => 'Moderni',
+
 # Math options
 'mw_math_png'    => 'Näytä aina PNG:nä',
 'mw_math_simple' => 'Näytä HTML:nä, jos yksinkertainen, muuten PNG:nä',
@@ -2100,10 +2363,12 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'markedaspatrollederror-noautopatrol' => 'Et voi merkitä omia muutoksiasi tarkastetuiksi.',
 
 # Patrol log
-'patrol-log-page'   => 'Muutostentarkastusloki',
-'patrol-log-header' => 'Tämä on loki tarkistetuista muutoksista.',
-'patrol-log-line'   => 'merkitsi sivun $2 muutoksen $1 tarkastetuksi $3',
-'patrol-log-auto'   => '(automaattinen)',
+'patrol-log-page'      => 'Muutostentarkastusloki',
+'patrol-log-header'    => 'Tämä on loki tarkistetuista muutoksista.',
+'patrol-log-line'      => 'merkitsi sivun $2 muutoksen $1 tarkastetuksi $3',
+'patrol-log-auto'      => '(automaattinen)',
+'patrol-log-diff'      => 'versio $1',
+'log-show-hide-patrol' => '$1 muutostentarkastusloki',
 
 # Image deletion
 'deletedrevision'                 => 'Poistettiin vanha versio $1',
@@ -2120,6 +2385,9 @@ $1',
 'previousdiff' => '� Vanhempi muutos',
 'nextdiff'     => 'Uudempi muutos →',
 
+# Visual comparison
+'visual-comparison' => 'Visuaalinen vertailu',
+
 # Media information
 'mediawarning'         => "'''Varoitus''': Tämä tiedosto saattaa sisältää vahingollista koodia, ja suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.<hr />",
 'imagemaxsize'         => 'Kuvien enimmäiskoko kuvaussivuilla',
@@ -2132,10 +2400,12 @@ $1',
 'show-big-image'       => 'Korkeatarkkuuksinen versio',
 'show-big-image-thumb' => '<small>Esikatselun koko: $1×$2 px</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Uudet tiedostot',
 'imagelisttext'         => 'Alla on {{PLURAL:$1|1 tiedosto|$1 tiedostoa}} lajiteltuna <strong>$2</strong>.',
 'newimages-summary'     => 'Tällä toimintosivulla on viimeisimmät tallennetut tiedostot.',
+'newimages-legend'      => 'Suodin',
+'newimages-label'       => 'Tiedostonimi (tai osa siitä)',
 'showhidebots'          => '($1 botit)',
 'noimages'              => 'Ei uusia tiedostoja.',
 'ilsubmit'              => 'Hae',
@@ -2338,6 +2608,18 @@ Vain *-merkillä alkavat rivit otetaan huomioon. Ensimmäisen linkin on osoitett
 'exif-lightsource-24'  => 'ISO-studiohehkulamppu',
 'exif-lightsource-255' => 'Muu valonlähde',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Salama ei lauennut',
+'exif-flash-fired-1'    => 'Salama lauennut',
+'exif-flash-return-0'   => 'ei pulssivalon tunnistustoimintoa',
+'exif-flash-return-2'   => 'pulssivalon paluuta ei havaittu',
+'exif-flash-return-3'   => 'pulssivalon paluu havaittu',
+'exif-flash-mode-1'     => 'salamavalo käytössä',
+'exif-flash-mode-2'     => 'salamavalo estetty',
+'exif-flash-mode-3'     => 'automaattitila',
+'exif-flash-function-1' => 'Ei salamatoimintoa',
+'exif-flash-redeye-1'   => 'punasilmäisyyden vähennystila',
+
 'exif-focalplaneresolutionunit-2' => 'tuumaa',
 
 'exif-sensingmethod-1' => 'Määrittelemätön',
@@ -2473,26 +2755,15 @@ Varmista, että haluat luoda sivun uudelleen.",
 
 'unit-pixel' => ' px',
 
-# HTML dump
-'redirectingto' => 'Ohjataan sivulle [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Poistetaanko tämän sivun välimuistikopiot?
-
-$1',
 'confirm_purge_button' => 'Poista',
-
-# AJAX search
-'searchcontaining' => 'Etsi artikkeleita, jotka sisältävät �$1�.',
-'searchnamed'      => 'Etsi artikkeleita, joiden nimi on �$1�.',
-'articletitles'    => 'Artikkelit, jotka alkavat merkkijonolla �$1�',
-'hideresults'      => 'Piilota tulokset',
-'useajaxsearch'    => 'Käytä AJAX-hakua',
+'confirm-purge-top'    => 'Poistetaanko tämän sivun välimuistikopiot?',
+'confirm-purge-bottom' => 'Välimuistikopioiden poistaminen tyhjentää välimuistin ja pakottaa sivun uusimman version näkyviin.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� edellinen sivu',
 'imgmultipagenext' => 'seuraava sivu →',
-'imgmultigo'       => 'Mene!',
+'imgmultigo'       => 'Siirry',
 'imgmultigoto'     => 'Sivu $1',
 
 # Table pager
@@ -2553,6 +2824,7 @@ Yritä normaalia esikatselua.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Tuntematon laajennuskoodi �$1�.',
+'duplicate-defaultsort' => 'Varoitus: Oletuslajitteluavain �$2� korvaa aiemman oletuslajitteluavaimen �$1�.',
 
 # Special:Version
 'version'                          => 'Versio', # Not used as normal message but as header for the special page itself
@@ -2579,13 +2851,13 @@ Yritä normaalia esikatselua.',
 'filepath'         => 'Tiedoston osoite',
 'filepath-page'    => 'Tiedosto',
 'filepath-submit'  => 'Selvitä osoite',
-'filepath-summary' => 'Tämä toimintosivu palauttaa tiedoston URL-osoitteen. Anna tiedoston nimi ilman {{ns:image}}-nimiavaruusliitettä.',
+'filepath-summary' => 'Tämä toimintosivu palauttaa tiedoston URL-osoitteen. Anna tiedoston nimi ilman {{ns:file}}-nimiavaruusliitettä.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Kaksoiskappaleiden haku',
 'fileduplicatesearch-summary'  => 'Etsii tiedoston kaksoiskappaleita hajautusarvon perusteella.
 
-Kirjoita tiedostonimi ilman �{{ns:image}}:�-etuliitettä.',
+Kirjoita tiedostonimi ilman �{{ns:file}}:�-etuliitettä.',
 'fileduplicatesearch-legend'   => 'Etsi kaksoiskappaleita',
 'fileduplicatesearch-filename' => 'Tiedostonimi',
 'fileduplicatesearch-submit'   => 'Etsi',
@@ -2615,4 +2887,13 @@ Kirjoita tiedostonimi ilman �{{ns:image}}:�-etuliitettä.',
 'blankpage'              => 'Tyhjä sivu',
 'intentionallyblankpage' => 'Tämä sivu on tarkoituksellisesti tyhjä.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Älä muuta tätä riviä lainkaan.<pre>
+#Laita säännöllisten lausekkeiden palaset (vain osa, joka menee //-merkkien väliin) alle
+#Niitä verrataan ulkoisten (suoralinkitettyjen) kuvien URLeihin
+#Ne jotka sopivat, näytetään kuvina, muutoin kuviin näytetään vain linkit
+#Rivit, jotka alkavat #-merkillä ovat kommentteja
+
+#Laita kaikki säännöllisten lausekkeiden palaset tämän rivit yläpuolelle. Älä muuta tätä riviä lainkaan</pre>',
+
 );
diff --git a/languages/messages/MessagesFiu_vro.php b/languages/messages/MessagesFiu_vro.php
index 4bd3e537..f9b07502 100644
--- a/languages/messages/MessagesFiu_vro.php
+++ b/languages/messages/MessagesFiu_vro.php
@@ -14,14 +14,12 @@ $fallback = 'et';
 $namespaceNames = array(
 	NS_MEDIA            => 'Meediä',
 	NS_SPECIAL          => 'Tallituslehekülg',
-	NS_MAIN             => '',
 	NS_TALK             => 'Arotus',
 	NS_USER             => 'Pruukja',
 	NS_USER_TALK        => 'Pruukja_arotus',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_arotus',
-	NS_IMAGE            => 'Pilt',
-	NS_IMAGE_TALK       => 'Pildi_arotus',
+	NS_FILE             => 'Pilt',
+	NS_FILE_TALK        => 'Pildi_arotus',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_arotus',
 	NS_TEMPLATE         => 'Näüdüs',
@@ -32,11 +30,6 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Katõgooria_arotus'
 );
 
-$skinNames = array(
-	'standard'    => array( "Harilik" ),
-	'cologneblue' => array( "Kölni sinine" ),
-	'myskin'      => array( "Mu uma kujondus" ),
-);
 
 $magicWords = array(
 	'redirect'            => array( "0", "#redirect", "#saadaq" ),
@@ -80,17 +73,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Näüdäku-i perräkaemisnimekirän mu hindä toimõnduisi',
 'tog-watchlisthidebots'       => 'Näüdäku-i perräkaemisnimekirän robotidõ toimõnduisi',
 'tog-watchlisthideminor'      => 'Näüdäku-i perräkaemisnimekirän väikeisi muutmiisi',
+'tog-watchlisthideliu'        => 'Käkiq perräkaemisnimekirän ärq nimega sisselännüisi pruukjidõ toimõndusõq',
+'tog-watchlisthideanons'      => 'Käkiq perräkaemisnimekirän ärq nimeldä pruukjidõ toimõndusõq',
 'tog-nolangconversion'        => 'Jätäq ärq variantõ võrrõlus',
 'tog-ccmeonemails'            => "Saadaq mullõ kopiq e-kir'ost, miä ma saada tõisilõ pruukjilõ",
 'tog-diffonly'                => 'Näüdäku-i lahkominekide lehe all lehe täüt sissu',
 'tog-showhiddencats'          => 'Näütäq käkitüid katõgoorijit',
+'tog-norollbackdiff'          => 'Päält tagasivõtmist näüdäku-i lahkominekiid',
 
 'underline-always'  => 'Kõgõ',
 'underline-never'   => 'Ei kunagi',
 'underline-default' => 'Võrgokaeja perrä',
 
-'skinpreview' => '(Kaeminõ)',
-
 # Dates
 'sunday'        => 'pühäpäiv',
 'monday'        => 'iispäiv',
@@ -182,7 +176,7 @@ $messages = array(
 'mytalk'         => 'Mu arotus',
 'anontalk'       => 'Seo puutri võrgoaadrõsi arotus',
 'navigation'     => 'Juhtminõ',
-'and'            => 'ja',
+'and'            => '&#32;ja',
 
 # Metadata in edit box
 'metadata_help' => 'Metateedüs:',
@@ -245,8 +239,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} tutvustus',
 'aboutpage'            => 'Project:Pääteedüs',
-'bugreports'           => 'Viateedüseq',
-'bugreportspage'       => 'Project:Viateedüseq',
 'copyright'            => "Teksti või vabalt pruukiq $1'i perrä.",
 'copyrightpagename'    => '{{SITENAME}} ja tegijäõigusõq',
 'copyrightpage'        => '{{ns:project}}:Tegijäõigusõq',
@@ -269,9 +261,7 @@ $messages = array(
 
 'badaccess'        => 'Lubamalda tallitus',
 'badaccess-group0' => 'Sul olõ-i õigust seod tallitust tetäq.',
-'badaccess-group1' => 'Seod tallitust võivaq tetäq õnnõ rühmä $1 pruukjaq.',
-'badaccess-group2' => 'Seod tallitust saavaq tetäq õnnõ rühmi $1 liikmõq.',
-'badaccess-groups' => 'Seod tallitust saavaq tetäq õnnõ rühmä $1 liikmõq.',
+'badaccess-groups' => 'Seod tallitust saavaq tetäq õnnõ {{PLURAL:$2|rühmä|rühmi}} $1 liikmõq.',
 
 'versionrequired'     => 'Om vaia MediaWiki kujjo $1',
 'versionrequiredtext' => 'Seo lehe kaemisõs om vaia MediaWiki kujjo $1. Kaeq [[Special:Version|kujoteedüst]].',
@@ -285,6 +275,8 @@ $messages = array(
 'editsection'             => 'toimõndaq',
 'editold'                 => 'toimõndaq',
 'viewsourceold'           => 'näütäq lättekuudi',
+'editlink'                => 'toimõndaq',
+'viewsourcelink'          => 'kaeq lätteteksti',
 'editsectionhint'         => 'Toimõndaq lõiku: $1',
 'toc'                     => 'Sisukõrd',
 'showtoc'                 => 'näütäq',
@@ -294,10 +286,12 @@ $messages = array(
 'restorelink'             => '{{PLURAL:$1|üts kistutõt muutminõ|$1 kustutõdut muutmist}}',
 'feedlinks'               => 'Sisseandminõ:',
 'feed-invalid'            => 'Viganõ sisseandminõ.',
+'feed-unavailable'        => 'Võrgosüütit olõ-i saiaq',
 'site-rss-feed'           => '$1-RSS-söödüs',
 'site-atom-feed'          => '$1-Atom-söödüs',
 'page-rss-feed'           => '$1 (RSS-söödüs)',
 'page-atom-feed'          => '$1 (Atom-söödüs)',
+'red-link-title'          => '$1 (olõ-i viil kirotõt)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikli',
@@ -341,6 +335,14 @@ $1",
 'readonlytext'         => "Teedüskogo om kirotuskaitsõ all, arvadaq niikavvas ku tedä parandõdas.
 Kõrraldaja, kiä taa kirotuskaitsõ alaq võtt', and' sääntse selgütüse:
 <p>$1",
+'missing-article'      => 'Lehe sissu lövvetä-s teedüskogost: $1 $2.
+
+Hariligult tulõ taa vanaslännüst võrrõlus- vai aoluulehelingist, miä näütäs ärqkistutõdu lehe pääle.
+
+Ku olõ-i tegemist ärqkistutõdu lehega, olõt või-ollaq löüdnüq programmivia.
+Annaq taa lehe aadrõs viki [[Special:ListUsers/sysop|ülevänpidäjäle]].',
+'missingarticle-rev'   => '(kujo#: $1)',
+'missingarticle-diff'  => '(lahkominek: $1, $2)',
 'readonly_lag'         => 'Teedüskogo panti automaatsõhe kinniq, et kõik teedüskogoserveriq saasiq kätte kõik värskiq muutmisõq',
 'internalerror'        => 'Sisemäne viga',
 'internalerror_info'   => 'Viga: $1',
@@ -357,7 +359,6 @@ Kõrraldaja, kiä taa kirotuskaitsõ alaq võtt', and' sääntse selgütüse:
 'badtitle'             => 'Viganõ päälkiri',
 'badtitletext'         => "Küsüt artiklipäälkiri oll' kas viganõ, tühi vai sis
 võlssi näüdät kiili- vai wikidevaihõlinõ päälkiri.",
-'perfdisabled'         => "Annaq andis! Seo tallitus parhillaq ei tüütäq, selle et tä tege teedüskogo pruukmisõ pall'o aigladsõs. Programmi tävvendedäs ligembädsel aol. Või-ollaq tiit tuud esiq!",
 'perfcached'           => 'Järgmäne teedüs om puhvõrdõt ja pruugi ei ollaq kõgõ värskimb:',
 'perfcachedts'         => 'Järgmäne teedüs om puhvõrdõt ja om viimäte muudõt $1.',
 'querypage-no-updates' => 'Taad lehe teedüst parhilla värskis ei tetäq.',
@@ -379,6 +380,11 @@ Perräküsümine: $2',
 'ns-specialprotected'  => 'Tallituslehekülgi ei saaq toimõndaq.',
 'titleprotected'       => "Pruukja [[User:$1|$1]] om sääntse nimega lehe luumisõ ärq kiildnüq põhjusõga: ''$2''.",
 
+# Virus scanner
+'virus-badscanner'     => 'Viga säädmiisin: tundmalda viirusõkaidsõq: <i>$1</i>',
+'virus-scanfailed'     => 'viirusõotsminõ lää-s kõrda (viakuud $1)',
+'virus-unknownscanner' => 'tundmalda viirusõkaidsõq:',
+
 # Login and logout pages
 'logouttitle'                => 'Nime alt välläminek',
 'logouttext'                 => '<strong>Olõt nime alt vällä lännüq.</strong>
@@ -393,7 +399,6 @@ Tähelepandmisõs: niikavva, ku sa olõ-i tühäs tennüq uma võrgokaeja vaihõ
 'remembermypassword'         => 'Salasõna miildejätmine järgmäidsis kõrros',
 'yourdomainname'             => 'Võrgonimi',
 'externaldberror'            => 'Välitsen kimmästegemisteedüskogon om viga vai olõ-i sul lubat umma pruukjanimme muutaq.',
-'loginproblem'               => '<b>Es saaq sisse.</b><br />Prooviq vahtsõst!',
 'login'                      => 'Nimega sisseminek',
 'nav-login-createaccount'    => 'Mineq nimega sisse',
 'loginprompt'                => '{{SITENAME}} lask nimega sisse õnnõ sis, ku lubatas valmistuisi.',
@@ -413,6 +418,7 @@ Valiq tõõnõ nimi.',
 'youremail'                  => 'Suq e-posti aadrõs *',
 'username'                   => 'Pruukjanimi:',
 'uid'                        => 'Pruukjanummõr:',
+'prefs-memberingroups'       => 'Kuulus {{PLURAL:$1|rühmä|rühmihe}}:',
 'yourrealname'               => 'Peris nimi *',
 'yourlanguage'               => 'Pruukjapalgõ kiil:',
 'yourvariant'                => 'Keelevariant:',
@@ -422,7 +428,7 @@ Valiq tõõnõ nimi.',
 'email'                      => 'e-posti aadrõs',
 'prefs-help-realname'        => "* <strong>Peris nimi</strong> (piä-i kirotama): ku taa teedäq annat, sis pruugitas taad pruukjanime asõmõl lehekülgi tegijide nimekir'on.",
 'loginerror'                 => 'Sisseminemise viga',
-'prefs-help-email'           => '* <strong>E-post</strong> (piä-i kirotama): tõõsõq pruukjaq saavaq sullõ kirotaq ilma su aadrõssit nägemäldäq. Taast om sis kah kassu, ku uma salasõna ärq johtut unõhtama.',
+'prefs-help-email'           => 'E-postiaadrõssit piä-i kirotama, a taa lupa tõisil pruukjil sullõ kirotaq ilma su aadrõssit nägemäldäq. Taast om sis kah kassu, ku uma salasõna ärq johtut unõhtama.',
 'prefs-help-email-required'  => 'E-postiaadrõs piät olõma.',
 'nocookiesnew'               => 'Pruukjakonto om valmis, a sa päse-s sisse, selle et {{SITENAME}} tarvitas pruukjidõ kimmästegemises valmistuisi. Suq võrgokaejan ommaq valmistusõq ärq keeledüq. Säeq valmistusõq lubatus ja mineq sis uma vahtsõ pruukjanime ja salasõnaga sisse.',
 'nocookieslogin'             => '{{SITENAME}} tarvitas pruukjidõ kimmästegemises valmistuisi. Suq võrgokaejan ommaq valmistusõq keeledüq. Säeq valmistusõq lubatus ja prooviq vahtsõst.',
@@ -447,14 +453,15 @@ Ku taa pallõmisõ om tennüq kiä tõõnõ vai ku olõt uma salasõna miilde tu
 'passwordsent'               => 'Vahtsõnõ salasõna om saadõt pruukja "$1" kirotõdu e-postiaadrõsi pääle. Ku olõt salasõna kätte saanuq, mineq nimega sisse.',
 'blocked-mailpassword'       => 'Su võrgonumbrilõ om pant pääle toimõndamiskiild, miä lasõ-i salasõnna miilde tulõtaq.',
 'eauthentsent'               => 'Sullõ om saadõt kinnütüskiri. Muid kirjo saadõta-i inne, ku olõt tennüq nii, kuis kirän opat ja kinnütänüq, et taa om suq e-postiaadrõs.',
-'throttled-mailpassword'     => '$1 tunni seen om saadõt salasõna miildetulõtus. Sääntsit miildetulõtuisi saadõtas õnnõ $1 tunni takast.',
+'throttled-mailpassword'     => '{{PLURAL:$1|tunni|$1 tunni}} seen om saadõt salasõna miildetulõtus. Sääntsit miildetulõtuisi saadõtas õnnõ {{PLURAL:$1|tunni|$1 tunni}} takast.',
 'mailerror'                  => 'Kirä saatmisõ viga: $1',
-'acct_creation_throttle_hit' => 'Sa olõt tennüq jo $1 kontot. Rohkõmb ei saaq.',
-'emailauthenticated'         => 'Su e-postiaadrõs kinnütedi ärq $1.',
+'acct_creation_throttle_hit' => 'Sa olõt tennüq jo {{PLURAL:$1|1 pruukjanime|$1 pruukjanimme}}. Rohkõmb ei saaq.',
+'emailauthenticated'         => 'Su e-postiaadrõs kinnütedi ärq $2 kell $3.',
 'emailnotauthenticated'      => "Su e-postiaadrõssit olõ-i viil kinnütet. Alanolõvi as'on e-kirjo ei saadõtaq.",
 'noemailprefs'               => 'Olõ-i ant e-postiaadrõssit.',
 'emailconfirmlink'           => 'Kinnüdäq uma e-postiaadrõs.',
-'invalidemailaddress'        => 'Olõ-i kõrralik e-postiaadrõs. Kirodaq õigõ e-postiaadrõs vai jätäq rivi rühäs.',
+'invalidemailaddress'        => 'Olõ-i kõrralik e-postiaadrõs, taa om võlss moodun. 
+Kirodaq õigõ e-postiaadrõs vai jätäq rivi rühäs.',
 'accountcreated'             => 'Pruukjanimi luudi',
 'accountcreatedtext'         => 'Luudi pruukjanimi pruukjalõ $1.',
 'createaccount-title'        => 'Vahtsõ {{SITENAME}} pruukjanime luuminõ',
@@ -462,18 +469,27 @@ Ku taa pallõmisõ om tennüq kiä tõõnõ vai ku olõt uma salasõna miilde tu
 Mineq nimega sisse ja vaihtaq salasõna ärq.
 
 Ku taa pruukjanimi om luud kogõmaldaq, olõ-i sul vaia taast sõnomist vällä tetäq.',
+'login-throttled'            => "Olõt uma nime ala minekis pruuvnuq pall'o hulga esiqsugutsit salasõnno.
+Oodaq vähä inne ku proovit vahtsõst.",
 'loginlanguagelabel'         => 'Kiil: $1',
 
 # Password reset dialog
-'resetpass'               => 'Salasõna vahtsõndus',
-'resetpass_announce'      => 'Sa lätsit sisse e-postiga saadõdu aotlidsõ koodiga. Kõrdapiten sisseminekis tulõ sul siin tetäq hindäle  vahtsõnõ salasõna:',
-'resetpass_text'          => '<!-- Kirodaq siiäq -->',
-'resetpass_header'        => 'Salasõna vahtsõndus',
-'resetpass_submit'        => 'Kirodaq salasõna ja mineq nimega sisse',
-'resetpass_success'       => 'Salasõna vaihtaminõ läts kõrda.',
-'resetpass_bad_temporary' => 'Taa aotlinõ salasõna kõlba-i. Sa olõt jo saanuq vahtsõ salasõna vai küsünüq vahtsõ aotlidsõ salasõna.',
-'resetpass_forbidden'     => '{{SITENAME}} salasõnno saa-i vaihtaq.',
-'resetpass_missing'       => 'Olõ-i teksti ant.',
+'resetpass'                 => 'Muudaq salasõnna',
+'resetpass_announce'        => 'Sa lätsit sisse e-postiga saadõdu aotlidsõ koodiga. Kõrdapiten sisseminekis tulõ sul siin tetäq hindäle  vahtsõnõ salasõna:',
+'resetpass_text'            => '<!-- Kirodaq siiäq -->',
+'resetpass_header'          => 'Muudaq pruukjanime salasõnna',
+'oldpassword'               => 'Vana salasõna',
+'newpassword'               => 'Vahtsõnõ salasõna',
+'retypenew'                 => 'Kirodaq viilkõrd vahtsõnõ salasõna',
+'resetpass_submit'          => 'Kirodaq salasõna ja mineq nimega sisse',
+'resetpass_success'         => 'Salasõna vaihtaminõ läts kõrda.',
+'resetpass_bad_temporary'   => 'Taa aotlinõ salasõna kõlba-i. Sa olõt jo saanuq vahtsõ salasõna vai küsünüq vahtsõ aotlidsõ salasõna.',
+'resetpass_forbidden'       => 'Salasõnno saa-i muutaq.',
+'resetpass-no-info'         => 'Taa lehe pääle päsemises piät olõma nimega sisse lännüq.',
+'resetpass-submit-loggedin' => 'Muudaq salasõnna',
+'resetpass-wrong-oldpass'   => 'Viganõ aotlinõ vai parhillanõ salasõna. 
+Või-ollaq olõt jo uma salasõna ärq muutnuq vai küsünüq vahtsõ aotlidsõ salasõna.',
+'resetpass-temp-password'   => 'Aotlinõ salasõna:',
 
 # Edit page toolbar
 'bold_sample'     => 'Paks kiri',
@@ -498,8 +514,8 @@ Ku taa pruukjanimi om luud kogõmaldaq, olõ-i sul vaia taast sõnomist vällä
 'hr_tip'          => 'Horisontaaljuun',
 
 # Edit pages
-'summary'                   => 'Kokkovõtõq',
-'subject'                   => 'Päälkiri',
+'summary'                   => 'Kokkovõtõq:',
+'subject'                   => 'Päälkiri:',
 'minoredit'                 => 'Taa om väiku parandus',
 'watchthis'                 => 'Kaeq taa lehe perrä',
 'savearticle'               => 'Pästäq',
@@ -511,8 +527,8 @@ Ku taa pruukjanimi om luud kogõmaldaq, olõ-i sul vaia taast sõnomist vällä
 'missingsummary'            => "'''Miildetulõtus:'''sa olõ-i kirotanuq uma toimõndamisõ kokkovõtõt. Ku klõpsahtat viil kõrra nuppi Pästäq, sis pästetäs su toimõndus ilma kokkovõttõldaq.",
 'missingcommenttext'        => 'Olõq hää, kirodaq kokkovõtõq.',
 'missingcommentheader'      => 'Sa olõ-i andnuq umalõ kokkovõttõlõ päälkirjä. Ku klõpsahtat nuppi <em>Pästäq</em>, pästetäs toimõndus ilma päälkiräldä.',
-'summary-preview'           => 'Kokkovõttõ kaeminõ',
-'subject-preview'           => 'Päälkirä kaeminõ',
+'summary-preview'           => 'Kokkovõttõ kaeminõ:',
+'subject-preview'           => 'Päälkirä kaeminõ:',
 'blockedtitle'              => 'Pruukja om kinniq peet',
 'blockedtext'               => "<big>'''Su pruukjanimi vai puutri võrgoaadrõs om kinniq pant.'''</big>
 
@@ -560,12 +576,12 @@ Suq puutri võrgoaadrõs om parhilla $3 ja kinniqpidämise tunnusnummõr om #$5.
 'newarticletext'            => "Taad lehekülge olõ-i viil.
 Leheküle luumisõs nakkaq kirotama alanolõvahe kasti.
 Ku sa johtuq siiäq kogõmaldaq, sis klõpsaq võrgokaeja '''Tagasi'''-nuppi.",
-'anontalkpagetext'          => "---- ''Taa om arotusleht nimeldä pruukja kotsilõ, kiä olõ-i loonuq kontot vai pruugi-i tuud. Tuuperäst tulõ meil pruukja kimmästegemises pruukiq timä puutri võrgoaadrõssit. Taa aadrõs või ollaq mitmõ pruukja pääle ütine. Ku olõt nimeldä pruukja ja lövvät, et taa leheküle pääle kirotõt jutt käü suq kotsilõ, sis olõq hää, [[Special:UserLogin|luuq konto vai mineq nimega sisse]], et edespiten segähüisi ärq hoitaq.''",
+'anontalkpagetext'          => "---- ''Taa om arotusleht nimeldä pruukja kotsilõ, kiä olõ-i loonuq pruukjanimme vai pruugi-i tuud. Tuuperäst tulõ meil pruukja kimmästegemises pruukiq timä puutri võrgoaadrõssit. Taa aadrõs või ollaq mitmõ pruukja pääle ütine. Ku olõt nimeldä pruukja ja lövvät, et taa leheküle pääle kirotõt jutt käü suq kotsilõ, sis olõq hää, [[Special:UserLogin/signup|luuq konto]] vai [[Special:UserLogin|mineq nimega sisse]], et edespiten segähüisi ärq hoitaq.''",
 'noarticletext'             => 'Seo leht om parlaq tühi. Võit [[Special:Search/{{PAGENAME}}|otsiq seo lehe nimme]] tõisi lehti päält vai [{{fullurl:{{FULLPAGENAME}}|action=edit}} naataq seod lehte esiq kirotama].',
 'userpage-userdoesnotexist' => 'Pruukjanimme "$1" olõ-i kirjä pant. Kaeq perrä, kas olõt iks kimmäs, et tahat taad lehte toimõndaq.',
-'clearyourcache'            => "'''Panõq tähele:''' perän pästmist piät muutmiisi nägemises uma võrgokaeja vaihõmälo tühäs tegemä: '''Mozilla:''' vaodaq ''reload''  vai ''ctrl-r'', '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
+'clearyourcache'            => "'''Panõq tähele:''' perän pästmist piät muutmiisi nägemises uma võrgokaeja vaihõmälo tühäs tegemä. '''Mozillal / Firofoxil / Safaril''' hoiaq all nõstmisnuppi ''Shift'' ja vaodaq ''Reload'' vai ''Ctrl-R'' (Macintoshil ''Command-R''); Konqueroril vaodaq ''Reload'' vai ''F5''. Operal puhastaq vaihõmälo ja võtaq valikust ''Tools → Preferences''. Internet Exploreril hoiaq ''Ctrl'' ja vaodaq ''Refresh'' vai vaodaq  ''ctrl-f5''.",
 'usercssjsyoucanpreview'    => "<strong>Nõvvoannõq:</strong> Pruugiq nuppi 'Näütäq proovikaehust' uma vahtsõ CCS-i vai JavaScripti ülekaemisõs, inne ku taa ärq pästät.",
-'usercsspreview'            => "'''Unõhtagu-i, et seod kujjo su umast stiililehest olõ-i viil pästet!'''",
+'usercsspreview'            => "'''Seo um CSS-i proovikaehus. Määntsitki muutuisi olõ-i viil pästet.'''",
 'userjspreview'             => "'''Unõhtagu-i, et seo kujo su umast javascriptist om viil pästmäldäq!'''",
 'userinvalidcssjstitle'     => "'''Miildetulõtus:''' Olõ-i stiili nimega \"\$1\". Piäq meelen, et pruukja säedüq .css- and .js-leheq piät nakkama väiku algustähega.",
 'updated'                   => '(Värskis tett)',
@@ -628,30 +644,28 @@ Kas tahat taad lehte tõtõstõ toimõndaq? Kaeq ka sissekirotust seo lehe ärqk
 $3 kirjäpant põhjus: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Kaeq seo lehe muutmisnimekirjä.',
-'nohistory'           => 'Seo leheküle pääl ei olõq vanõmbit kujjõ.',
-'revnotfound'         => 'Es lövväq kujjo',
-'revnotfoundtext'     => 'Es lövväq su otsitut vanna kujjo.
-Kaeq üle aadrõs, kost sa taad löüdäq proovõq.',
-'currentrev'          => 'Viimäne kujo',
-'revisionasof'        => 'Kujo $1',
-'revision-info'       => 'Kujo aost $1 - tennüq $2',
-'previousrevision'    => '�Vanõmb kujo',
-'nextrevision'        => 'Vahtsõmb kujo→',
-'currentrevisionlink' => 'Viimäne kujo',
-'cur'                 => 'viim',
-'next'                => 'järgm',
-'last'                => 'minev',
-'page_first'          => 'edimäne leht',
-'page_last'           => 'viimäne leht',
-'histlegend'          => "Märgiq ärq kujoq, midä tahat kõrvo säädiq ja vaodaq võrdõlõmisnuppi.
+'viewpagelogs'           => 'Kaeq seo lehe muutmisnimekirjä.',
+'nohistory'              => 'Seo leheküle pääl ei olõq vanõmbit kujjõ.',
+'currentrev'             => 'Viimäne kujo',
+'revisionasof'           => 'Kujo $1',
+'revision-info'          => 'Kujo aost $1 - tennüq $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Vanõmb kujo',
+'nextrevision'           => 'Vahtsõmb kujo→',
+'currentrevisionlink'    => 'Viimäne kujo',
+'cur'                    => 'viim',
+'next'                   => 'järgm',
+'last'                   => 'minev',
+'page_first'             => 'edimäne leht',
+'page_last'              => 'viimäne leht',
+'histlegend'             => "Märgiq ärq kujoq, midä tahat kõrvo säädiq ja vaodaq võrdõlõmisnuppi.
 Seletüs: (viim) = lahkominegiq viimätsest kujost,
 (minev) = lahkominegiq minevädsest kujost, ts = väiku (tsill'okõnõ) muutminõ",
-'deletedrev'          => '[kistutõt]',
-'histfirst'           => 'Edimädseq',
-'histlast'            => 'Viimädseq',
-'historysize'         => '({{PLURAL:$1|1 bait|$1 baiti}})',
-'historyempty'        => '(tühi)',
+'history-fieldset-title' => 'Kaeq muutmiisi aoluku',
+'deletedrev'             => '[kistutõt]',
+'histfirst'              => 'Edimädseq',
+'histlast'               => 'Viimädseq',
+'historysize'            => '({{PLURAL:$1|1 bait|$1 baiti}})',
+'historyempty'           => '(tühi)',
 
 # Revision feed
 'history-feed-title'          => 'Muutmislugu',
@@ -670,7 +684,7 @@ Lisateedüst või ollaq [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} k
 'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">Taa kujo om avaligust pruugist ärq kistutõt, a kõrraldajaq saavaq taad nätäq. As\'a kotsilõ või teedüst olla [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} kistutusnimekirän] </div>',
 'rev-delundel'                => 'näütäq/käkiq',
 'revisiondelete'              => 'Kistudaq/võtaq tagasi lehe kujjõ',
-'revdelete-nooldid-title'     => 'Olõ-i säänest kujjo',
+'revdelete-nooldid-title'     => 'Säänest otsitavat kujjo olõ-i',
 'revdelete-nooldid-text'      => 'Sa olõ-i valinuq kujjo vai kujjõ.',
 'revdelete-selected'          => "'''{{PLURAL:$2|Valit kujo|Validuq kujoq}} lehele '''$1:''''''",
 'logdelete-selected'          => "'''{{PLURAL:$1|Valit muutminõ|Validuq muutmisõq}}:'''",
@@ -708,6 +722,7 @@ Lisateedüst või ollaq [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} k
 'compareselectedversions' => 'Võrdõlõq valituid kujjõ',
 'editundo'                => 'võtaq tagasi',
 'diff-multi'              => '(Kujjõ vaihõl {{PLURAL:$1|üts näütämäldä muutminõ|$1 näütämäldä muutmist}}.)',
+'diff-src'                => 'läteq',
 
 # Search results
 'searchresults'             => 'Otsmisõ tulõmusõq',
@@ -722,6 +737,7 @@ Lisateedüst või ollaq [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} k
 'prevn'                     => 'minevädseq $1',
 'nextn'                     => 'järgmädseq $1',
 'viewprevnext'              => 'Näütäq ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Oppus',
 'search-interwiki-more'     => '(viil)',
 'search-mwsuggest-enabled'  => 'näütäq soovituisi',
 'search-mwsuggest-disabled' => 'ilma soovituisilda',
@@ -754,6 +770,7 @@ mitmõ otsmissõna pruukminõ (sis ilmusõq õnnõ leheküleq, kon ommaq kõik o
 'qbsettings-floatingright' => 'Ujovahe hüäl puul',
 'changepassword'           => 'Muudaq salasõnna',
 'skin'                     => 'Vällänägemine',
+'skin-preview'             => 'Kaeminõ',
 'math'                     => 'Valõmidõ näütämine',
 'dateformat'               => 'Kuupäävä muud',
 'datedefault'              => 'Ütskõik',
@@ -775,9 +792,6 @@ mitmõ otsmissõna pruukminõ (sis ilmusõq õnnõ leheküleq, kon ommaq kõik o
 'prefs-misc'               => 'Muuq säädmiseq',
 'saveprefs'                => 'Pästäq säädmiseq ärq',
 'resetprefs'               => 'Võtaq säädmiseq tagasi',
-'oldpassword'              => 'Vana salasõna',
-'newpassword'              => 'Vahtsõnõ salasõna',
-'retypenew'                => 'Kirodaq viilkõrd vahtsõnõ salasõna',
 'textboxsize'              => 'Toimõnduskasti suurus',
 'rows'                     => 'Rito',
 'columns'                  => 'Tulpõ',
@@ -874,7 +888,7 @@ mitmõ otsmissõna pruukminõ (sis ilmusõq õnnõ leheküleq, kon ommaq kõik o
 'upload_directory_read_only'  => 'Serveril olõ-i üleslaatmiskausta ($1) kirotamisõ õigust.',
 'uploaderror'                 => 'Ãœleslaatmisviga',
 'uploadtext'                  => '<strong>PIÄQ KINNIQ!</strong> Inne ülelaatmist kaeq, et taa käünüq {{SITENAME}} [[{{MediaWiki:Policy-url}}|pilte pruukmisõ kõrra]] perrä.
-<p>Innembält üleslaadiduq pildiq lövvät [[Special:ImageList|pilte nimekiräst]].
+<p>Innembält üleslaadiduq pildiq lövvät [[Special:FileList|pilte nimekiräst]].
 <p>Järgmädse vormi abiga saat laatiq üles vahtsit pilte ummi artiklide ilostamisõs. Inämbüsel võrgokaejil näet nuppi "Browse..." vai "Valiq...", miä vii sinno
 su opõratsioonisüsteemi standardsõhe teedüstüide vallalõtegemise aknõhe. Teedüstü valimisõs pandas timä nimi tekstivälä pääle, miä om nupi kõrval.
 Piät ka kastikõistõ märgi tegemä, et kinnütät,
@@ -911,8 +925,8 @@ Ainugõnõ vaih om laendusõ suurõ/väiku algustähe man. Kaeq perrä, kas naaq
 'fileexists-thumbnail-yes'    => 'Taa paistus ollõv vähändet pilt <i>(thumbnail)</i>. Kaeq teedüstü <strong><tt>$1</tt></strong>üle.<br />
 Ku ülekaet teedüstü om sama pilt alguperälidsen suurusõn, sis olõ-i vaia eräle vähändedüt pilti üles laatiq.',
 'file-thumbnail-no'           => 'Teedüstü nimi nakkas pääle <strong><tt>$1</tt></strong>. Taa paistus ollõv vähändet pilt <i>(thumbnail)</i>. Ku sul om olõman taa pilt tävven suurusõn, sis laadiq üles tuu, ku olõ-i, sis muudaq teedüstü nimi ärq.',
-'fileexists-forbidden'        => 'Sääntse nimega teedüstü om jo olõman. Pästäq teedüstü tõõsõ nimega. Parhillanõ teedüstü: [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Sama nimega teedüstü om jo olõman jaetuidõ teedüstüide hulgan. Pästäq teedüstü mõnõ tõõsõ nime ala. Parhillanõ teedüstü: [[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => 'Sääntse nimega teedüstü om jo olõman. Pästäq teedüstü tõõsõ nimega. Parhillanõ teedüstü: [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Sama nimega teedüstü om jo olõman jaetuidõ teedüstüide hulgan. Pästäq teedüstü mõnõ tõõsõ nime ala. Parhillanõ teedüstü: [[File:$1|thumb|center|$1]]',
 'successfulupload'            => "Üleslaatminõ läts' kõrda",
 'uploadwarning'               => 'Ãœleslaatmishoiatus',
 'savefile'                    => 'Pästäq teedüstü ärq',
@@ -950,17 +964,17 @@ Kas olõt kimmäs, et tahat taad üles laatiq? Kaeq ka sissekirotust taa teedüs
 'upload_source_url'  => ' (avalik tüütäv võrgoaadrõs)',
 'upload_source_file' => ' (teedüstü su puutrin)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Pildi nime otsminõ:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Pildi nime otsminõ:',
 'imgfile'               => 'teedüstü',
-'imagelist'             => 'Pilte nimekiri',
-'imagelist_date'        => 'Kuupäiv',
-'imagelist_name'        => 'Nimi',
-'imagelist_user'        => 'Pruukja',
-'imagelist_size'        => 'Suurus (baidõn)',
-'imagelist_description' => 'Seletüs',
-
-# Image description page
+'listfiles'             => 'Pilte nimekiri',
+'listfiles_date'        => 'Kuupäiv',
+'listfiles_name'        => 'Nimi',
+'listfiles_user'        => 'Pruukja',
+'listfiles_size'        => 'Suurus (baidõn)',
+'listfiles_description' => 'Seletüs',
+
+# File description page
 'filehist'                  => 'Teedüstü aolugu',
 'filehist-help'             => "Klõpsaq kuupäävä/kelläao pääl, et nätäq määne taa teedüstü sis oll'.",
 'filehist-deleteall'        => 'kistudaq kõik ärq',
@@ -1024,14 +1038,19 @@ Kas olõt kimmäs, et tahat taad üles laatiq? Kaeq ka sissekirotust taa teedüs
 'randomredirect-nopages' => 'Seon nimeruumin olõ-i üttegi ümbresaatmist.',
 
 # Statistics
-'statistics'             => 'Statistiga',
-'sitestats'              => 'Lehekülgi statistiga',
-'userstats'              => 'Pruukjidõ statistiga',
-'sitestatstext'          => "Teedüskogon om kokko <b>$1</b> lehekülge.
-
-Taa numbri seen ommaq ka arotusküleq, abiartikliq, väega lühkeseq leheküleq, ümbresaatmisleheküleq ja muuq leheq, mink pääl arvadaq olõ-i entsüklopeediäartiklit. Ilma naid rehkendämäldä om parhilla '''$2''' {{SITENAME}} lehekülge, midä või pitäq artiklis. Üles om laadit '''$8''' teedüstüt. Lehti om kaet kokko '''$3''' kõrda ja toimõndõt '''$4''' kõrda. Tuu om keskmädselt '''$5''' kaemist lehe kotsilõ ja '''$6''' kaemist toimõndusõ kotsilõ. Hoolõkandõtallituisi om järekõrran '''$7'''.",
-'userstatstext'          => "Kirjäpantuid pruukjit om '''$1'''. Naist '''$2''' ($4%) ommaq kõrraldaja õiguisiga pruukjaq ($5).",
-'statistics-mostpopular' => 'Kõgõ kaetumbaq leheq',
+'statistics'               => 'Statistiga',
+'statistics-header-pages'  => 'Lehekülgi statistiga',
+'statistics-header-edits'  => 'Toimõndamisõ statistiga',
+'statistics-header-views'  => 'Kaemisõ statistiga',
+'statistics-header-users'  => 'Pruukjidõ statistiga',
+'statistics-articles'      => 'Sisulehekülgi',
+'statistics-pages'         => 'Lehekülgi',
+'statistics-pages-desc'    => 'Kõik leheq, säälhulgan arotusleheq, ümbresaatmisleheq ja muuq.',
+'statistics-files'         => 'Üleslaadituid teedüstüid',
+'statistics-edits'         => 'Toimõnduisi {{SITENAME}} luumisõst pääle',
+'statistics-edits-average' => 'Keskmädselt toimõnduisi leheküle kotsilõ',
+'statistics-views-total'   => 'Lehti kaemiisi kokko',
+'statistics-mostpopular'   => 'Kõgõ kaetumbaq leheq',
 
 'disambiguations'      => 'Lingiq, miä näütäseq täpsüstüslehekülgi pääle',
 'disambiguationspage'  => 'Template:Linke täpsüstüslehekülile',
@@ -1110,8 +1129,6 @@ Lehte peetäs täpsüstüslehes, ku timän om pruugit näüdüst, kohe näütäs
 'speciallogtitlelabel' => 'Päälkiri:',
 'log'                  => 'Muutmisnimekiri',
 'all-logs-page'        => 'Kõik muutmisõq',
-'log-search-legend'    => 'Muutmiisi otsminõ',
-'log-search-submit'    => 'Otsiq',
 'alllogstext'          => '{{SITENAME}} kõiki muutmiisi - kistutamiisi, kaitsmiisi, kinniqpidämiisi ja kõrraldamiisi ütine nimekiri. Võit valliq ka eräle muutmistüübi, pruukjanime vai lehe päälkirä perrä.',
 'logempty'             => 'Muutmisnimekirän olõ-i sääntsit kiräkotussit.',
 'log-title-wildcard'   => 'Otsiq päälkirjo, miä alostasõq taa tekstiga',
@@ -1192,12 +1209,6 @@ ja sul piät umin [[Special:Preferences|säädmiisin]] olõma e-postiaadrõs, et
 'iteminvalidname'      => "Hädä lehega '$1'! Lehe nimen om viga.",
 'wlnote'               => "Tan om '''$1''' {{PLURAL:$1|muutminõ|muutmist}} viimädse '''$2''' tunni ao seen.",
 'wlshowlast'           => 'Näütäq viimädseq $1 tunni $2 päivä $3',
-'watchlist-show-bots'  => 'Näütäq robotidõ toimõnduisi',
-'watchlist-hide-bots'  => 'Näüdäku-i robotidõ toimõnduisi',
-'watchlist-show-own'   => 'Näütäq muq toimõnduisi',
-'watchlist-hide-own'   => 'Näüdäku-i muq toimõnduisi',
-'watchlist-show-minor' => "Näütäq tsill'okõisi muutmiisi",
-'watchlist-hide-minor' => "Näüdäku-i tsill'okõisi muutmiisi",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Pandas perräkaemisnimekirjä...',
@@ -1233,41 +1244,45 @@ Perräkaemisnimekirä säädmiisi saat muutaq lehe pääl: {{fullurl:Special:Wat
 
 As\'a kotsilõ mano kaiaq ja küssü saat lehe päält: {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Kistudaq lehekülg ärq',
-'confirm'                     => 'Kinnüdäq',
-'excontent'                   => "sisu oll': '$1'",
-'excontentauthor'             => "sisu oll': '$1' (ja ainugõnõ toimõndaja oll' '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "inne tühästegemist oll': '$1'",
-'exblank'                     => "leht oll' tühi",
-'historywarning'              => 'Hoiatus: Lehel, midä tahat ärq kistutaq, om olõman aolugu:',
-'confirmdeletetext'           => 'Sa kistutat teedüskogost periselt ärq lehe vai pildi üten kõgõ timä aoluuga.
+# Delete
+'deletepage'            => 'Kistudaq lehekülg ärq',
+'confirm'               => 'Kinnüdäq',
+'excontent'             => "sisu oll': '$1'",
+'excontentauthor'       => "sisu oll': '$1' (ja ainugõnõ toimõndaja oll' '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'         => "inne tühästegemist oll': '$1'",
+'exblank'               => "leht oll' tühi",
+'historywarning'        => 'Hoiatus: Lehel, midä tahat ärq kistutaq, om olõman aolugu:',
+'confirmdeletetext'     => 'Sa kistutat teedüskogost periselt ärq lehe vai pildi üten kõgõ timä aoluuga.
 Kinnüdäq, et sa tahat tuud tõtõstõ tetäq, et sa saat arvo, miä tuust tullaq või ja et tuu, miä sa tiit, klapis [[{{MediaWiki:Policy-url}}|sisekõrraga]].',
-'actioncomplete'              => 'Tallitus valmis',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" om ärq kistutõt.
+'actioncomplete'        => 'Tallitus valmis',
+'deletedtext'           => '"<nowiki>$1</nowiki>" om ärq kistutõt.
 Perämäidsi kistutuisi nimekirjä näet siist: $2.',
-'deletedarticle'              => '"$1" kistutõt',
-'dellogpage'                  => 'Kistutõduq leheküleq',
-'dellogpagetext'              => 'Naaq ommaq perämädseq kistutamisõq.
+'deletedarticle'        => '"$1" kistutõt',
+'dellogpage'            => 'Kistutõduq leheküleq',
+'dellogpagetext'        => 'Naaq ommaq perämädseq kistutamisõq.
 Kelläaoq ummaq serveriao perrä.',
-'deletionlog'                 => 'Kistutõduq leheküleq',
-'reverted'                    => 'Minti tagasi vana kujo pääle',
-'deletecomment'               => 'Kistutamisõ põhjus',
-'deleteotherreason'           => 'Muu põhjus vai täpsüstüs:',
-'deletereasonotherlist'       => 'Muu põhjus',
-'deletereason-dropdown'       => "*Hariliguq kistutamisõ põhjusõq
+'deletionlog'           => 'Kistutõduq leheküleq',
+'reverted'              => 'Minti tagasi vana kujo pääle',
+'deletecomment'         => 'Kistutamisõ põhjus',
+'deleteotherreason'     => 'Muu põhjus vai täpsüstüs:',
+'deletereasonotherlist' => 'Muu põhjus',
+'deletereason-dropdown' => "*Hariliguq kistutamisõ põhjusõq
 ** Kirotaja hindä palvõl
 ** Tegijäõigusõ rikminõ
 ** Lehe ts'urkminõ",
-'rollback'                    => 'Mineq tagasi vana kujo pääle',
-'rollback_short'              => 'Võtaq tagasi',
-'rollbacklink'                => 'võtaq tagasi vana kujo',
-'rollbackfailed'              => 'Muutmiisi tagasivõtminõ lää-s kõrda',
-'cantrollback'                => 'Saa-i muutmiisi tagasi pöördäq; viimäne muutja om lehe ainugõnõ toimõndaja.',
-'alreadyrolled'               => 'Pruukja [[User:$2|$2]] ([[User talk:$2|arotus]]) tettüid lehe [[:$1]] muutmiisi saa-i tagasi võttaq, selle et pruukja [[User:$3|$3]] ([[User talk:$3|arotus]]) om tennüq vahtsõmbit muutmiisi.',
-'editcomment'                 => 'Toimõndamiskokkovõtõq oll\': "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Pruukja [[Special:Contributions/$2|$2]] ([[User_talk:$2|arotus]]) toimõndusõq pöörediq tagasi ja leht panti tagasi pruukja [[User:$1|$1]] tettü kujo pääle.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'sessionfailure'              => 'Paistus ollõv määnegi hädä su toimõndamiskõrraga, tuuperäst om viimäne muutminõ egäs johtumisõs jätet tegemäldä. Vaodaq võrgokaeja "tagasi"-nuppi, laadiq üle lehekülg, kost sa tullit ja prooviq vahtsõst.',
+
+# Rollback
+'rollback'       => 'Mineq tagasi vana kujo pääle',
+'rollback_short' => 'Võtaq tagasi',
+'rollbacklink'   => 'võtaq tagasi vana kujo',
+'rollbackfailed' => 'Muutmiisi tagasivõtminõ lää-s kõrda',
+'cantrollback'   => 'Saa-i muutmiisi tagasi pöördäq; viimäne muutja om lehe ainugõnõ toimõndaja.',
+'alreadyrolled'  => 'Pruukja [[User:$2|$2]] ([[User talk:$2|arotus]]) tettüid lehe [[:$1]] muutmiisi saa-i tagasi võttaq, selle et pruukja [[User:$3|$3]] ([[User talk:$3|arotus]]) om tennüq vahtsõmbit muutmiisi.',
+'editcomment'    => 'Toimõndamiskokkovõtõq oll\': "<i>$1</i>".', # only shown if there is an edit comment
+'revertpage'     => 'Pruukja [[Special:Contributions/$2|$2]] ([[User_talk:$2|arotus]]) toimõndusõq pöörediq tagasi ja leht panti tagasi pruukja [[User:$1|$1]] tettü kujo pääle.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'sessionfailure' => 'Paistus ollõv määnegi hädä su toimõndamiskõrraga, tuuperäst om viimäne muutminõ egäs johtumisõs jätet tegemäldä. Vaodaq võrgokaeja "tagasi"-nuppi, laadiq üle lehekülg, kost sa tullit ja prooviq vahtsõst.',
+
+# Protect
 'protectlogpage'              => 'Lehti kaitsmiisi nimekiri',
 'protectlogtext'              => 'Tan om nimekiri lehti kaitsmiisist ja kaitsmisõ maahavõtmiisist. Parhilla kaitsõ all olõvidõ lehti nimekirä lövvät [[Special:ProtectedPages|tast]].',
 'protectedarticle'            => 'pand\' lehe "[[$1]]" kaitsõ ala',
@@ -1293,6 +1308,7 @@ Tan ommaq lehe <strong>$1</strong> parhilladsõq säädmiseq:',
 'protect-expiring'            => 'tähtaig $1',
 'protect-cascade'             => 'Laendaq kaitsmist - võtaq kaitsõ ala kõik seo lehe pääl olõvaq leheq.',
 'protect-cantedit'            => 'Sa tohe-i muutaq seo lehe kaitsmistasõt, selle et sul olõ-i õigust seod lehte muutaq.',
+'protect-expiry-options'      => '15 minotit:15 minutes,1 päiv:1 day,3 päivä:3 days,1 nätäl:1 week,2 nädälit:2 weeks,1 kuu:1 month,3 kuud:3 months,6 kuud:6 months,1 aastak:1 year,igävene:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Luba',
 'restriction-level'           => 'Piirdmisastõq',
 'minimum-size'                => 'Kõgõ vähämb maht',
@@ -1363,7 +1379,6 @@ Perämäidsi kistutuisi ja tagasitegemiisi saat kaiaq [[Special:Log/delete|kistu
 'whatlinkshere'       => 'Siiäq näütäjäq lingiq',
 'whatlinkshere-title' => 'Leheq, miä näütäseq lehe "$1" pääle',
 'whatlinkshere-page'  => 'Leht:',
-'linklistsub'         => '(Linke nimekiri)',
 'linkshere'           => 'Lehe <b>[[:$1]]</b> pääle näütäseq lingiq lehti päält:',
 'nolinkshere'         => 'Lehe <b>[[:$1]]</b> pääle näütä-i linke ütegi lehe päält.',
 'nolinkshere-ns'      => "Valitun nimeruumin näütä-i ütegi lehe päält linke lehe '''[[:$1]]''' pääle.",
@@ -1489,6 +1504,8 @@ inne, ku midä muudat, märgiq perrä, miä tuust tullaq või.",
 
 Kui om nii, sis panõq vana arotuskülg eräle vai panõq taa kokko vahtsõ arotuskülega.",
 'movearticle'             => 'Panõq artiklilehekülg tõistõ paika',
+'movenologin'             => 'Sa olõ-i nimega sisse lännüq',
+'movenologintext'         => 'Et lehekülge tõistõ paika pandaq, piät hindä pruukjas kirjä pandma ja [[Special:UserLogin|nimega sisse minemä]]',
 'movenotallowed'          => 'Sul olõ-i lupa {{SITENAME}} lehti tõistõ paika nõstaq.',
 'newtitle'                => 'Vahtsõ päälkirä ala',
 'move-watch'              => 'Kaeq taa lehe perrä',
@@ -1510,7 +1527,6 @@ Kui om nii, sis panõq vana arotuskülg eräle vai panõq taa kokko vahtsõ arot
 'delete_and_move_confirm' => 'Jah, kistudaq tuu leht ärq',
 'delete_and_move_reason'  => 'Ärq kistutõt, et tõõnõ timä asõmalõ pandaq',
 'selfmove'                => 'Lätte- ja tsihtnimi ommaq samaq; saa-i lehte timä hindä pääle pandaq.',
-'immobile_namespace'      => 'Taaha nimeruumi saa-i lehti pandaq.',
 
 # Export
 'export'            => 'Lehti viimine',
@@ -1555,6 +1571,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-interwiki-history'   => 'Kopiq lehe terveq aolugu',
 'import-interwiki-submit'    => 'Tuuq',
 'import-interwiki-namespace' => 'Panõq leheq nimeruumi:',
+'import-comment'             => 'Põhjus:',
 'importtext'                 => 'Viiq lättevikist lehti [[Special:Export|viimis]]-tüüriistaga. Pästäq teedüs nii uman puutrin ku siin.',
 'importstart'                => 'Tuvvas lehti...',
 'import-revision-count'      => '$1 {{PLURAL:$1|kujo|kujjo}}',
@@ -1655,12 +1672,12 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'notacceptable'     => 'Wikiserver saa-i näüdädäq teedüst sääntsen moodun, midä su programm saasiq lukõq.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}} nimeldäq pruukjaq',
+'anonymous'        => '{{SITENAME}} {{PLURAL:$1|nimeldä pruukja|nimeldä pruukjaq}}',
 'siteuser'         => '{{SITENAME}} pruukja $1',
 'lastmodifiedatby' => "Taad lehte toimõnd' viimäte �$3� $2 kell $1.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Tennüq pruukja $1.',
 'others'           => 'tõõsõq',
-'siteusers'        => '{{SITENAME}} pruukja(q) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|pruukja|pruukjaq}}  $1',
 'creditspage'      => 'Lehe tegijide nimekiri',
 'nocredits'        => 'Taa lehe tegijide nimekirjä olõ-i.',
 
@@ -1680,6 +1697,11 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'numauthors'     => 'Lehele eräle kirotajit: $1',
 'numtalkauthors' => 'Arotuskülele eräle kirotajit: $1',
 
+# Skin names
+'skinname-standard'    => 'Array',
+'skinname-cologneblue' => 'Array',
+'skinname-myskin'      => 'Array',
+
 # Math options
 'mw_math_png'    => 'Kõgõ PNG',
 'mw_math_simple' => 'Ku väega lihtsä, sis HTML, muido PNG',
@@ -1722,7 +1744,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'show-big-image'       => 'Täüsterräv kujo',
 'show-big-image-thumb' => '<small>Proovikaemisõ suurus: $1×$2 pikslit</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Vahtsõq pildiq',
 'imagelisttext'         => 'Pilte nimekirän $1 (sordiduq $2).',
 'showhidebots'          => '($1 robodiq)',
@@ -2046,20 +2068,9 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 Olõq hää, kinnüdäq, et tahat taad lehte vahtsõst luvvaq.",
 'recreate'            => 'Luuq vahtsõst',
 
-# HTML dump
-'redirectingto' => 'Saadõtas ümbre lehe pääle [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Kas taa lehe vaihõmälokujoq tulõvaq ärq kistutaq?
-
-$1',
 'confirm_purge_button' => 'Hää külh',
-
-# AJAX search
-'searchcontaining' => "Otsiq artikliid, kon om seen ''$1''.",
-'searchnamed'      => "Otsiq artikliid nimega ''$1''.",
-'articletitles'    => "Artikliq, miä nakkasõq pääle ''$1''",
-'hideresults'      => 'Käkiq tulõmusõq ärq',
+'confirm-purge-top'    => 'Kas taa lehe vaihõmälokujoq tulõvaq ärq kistutaq?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� mineväne leht',
diff --git a/languages/messages/MessagesFj.php b/languages/messages/MessagesFj.php
index 19ac0490..ed6190c3 100644
--- a/languages/messages/MessagesFj.php
+++ b/languages/messages/MessagesFj.php
@@ -110,7 +110,7 @@ $messages = array(
 'email'              => 'I vola livaliva',
 
 # Edit pages
-'summary'      => 'Kena i Soqoni',
+'summary'      => 'Kena i Soqoni:',
 'watchthis'    => 'Vakaraica toka na tabana oqo',
 'savearticle'  => 'Vakabula na tabana oqo',
 'showpreview'  => 'Vakaraitaka na kenai yaloyalo',
@@ -189,7 +189,7 @@ $messages = array(
 'tooltip-search'         => 'Vaqaqara {{SITENAME}}',
 'tooltip-p-logo'         => 'Tabana levu',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Vaqaqara',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesFo.php b/languages/messages/MessagesFo.php
index 16910e77..87741bb5 100644
--- a/languages/messages/MessagesFo.php
+++ b/languages/messages/MessagesFo.php
@@ -12,44 +12,43 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Standardur',
-	'nostalgia'   => 'Nostalgiskur',
-	'cologneblue' => 'Cologne-bláur'
-);
-
 $bookstoreList = array(
 	'Bokasolan.fo' => 'http://www.bokasolan.fo/vleitari.asp?haattur=bok.alfa&Heiti=&Hovindur=&Forlag=&innbinding=Oell&bolkur=Allir&prisur=Allir&Aarstal=Oell&mal=Oell&status=Oell&ISBN=$1',
 	'inherit' => true,
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Miðil',
-	NS_SPECIAL        => 'Serstakur',
-	NS_MAIN           => '',
-	NS_TALK           => 'Kjak',
-	NS_USER           => 'Brúkari',
-	NS_USER_TALK      => 'Brúkari_kjak',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_kjak',
-	NS_IMAGE          => 'Mynd',
-	NS_IMAGE_TALK     => 'Mynd_kjak',
-	NS_MEDIAWIKI      => 'MidiaWiki',
-	NS_MEDIAWIKI_TALK => 'MidiaWiki_kjak',
-	NS_TEMPLATE       => 'Fyrimynd',
-	NS_TEMPLATE_TALK  => 'Fyrimynd_kjak',
-	NS_HELP           => 'Hjálp',
-	NS_HELP_TALK      => 'Hjálp kjak',
-	NS_CATEGORY       => 'Bólkur',
-	NS_CATEGORY_TALK  => 'Bólkur_kjak',
+	NS_MEDIA            => 'Miðil',
+	NS_SPECIAL          => 'Serstakt',
+	NS_TALK             => 'Kjak',
+	NS_USER             => 'Brúkari',
+	NS_USER_TALK        => 'Brúkarakjak',
+	NS_PROJECT_TALK     => '$1-kjak',
+	NS_FILE             => 'Mynd',
+	NS_FILE_TALK        => 'Myndakjak',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki-kjak',
+	NS_TEMPLATE         => 'Fyrimynd',
+	NS_TEMPLATE_TALK    => 'Fyrimyndakjak',
+	NS_HELP             => 'Hjálp',
+	NS_HELP_TALK        => 'Hjálparkjak',
+	NS_CATEGORY         => 'Bólkur',
+	NS_CATEGORY_TALK    => 'Bólkakjak',
 );
 
-$skinNames = array(
-	'standard' => 'Standardur',
-	'nostalgia' => 'Nostalgiskur',
-	'cologneblue' => 'Cologne-bláur',
+$namespaceAliases = array(
+	'Serstakur' => NS_SPECIAL,
+	'Brúkari_kjak' => NS_USER_TALK,
+	'$1_kjak' => NS_PROJECT_TALK,
+	'Mynd_kjak' => NS_FILE_TALK,
+	'MidiaWiki' => NS_MEDIAWIKI,
+	'MidiaWiki_kjak' => NS_MEDIAWIKI_TALK,
+	'Fyrimynd_kjak' => NS_TEMPLATE_TALK,
+	'Hjálp_kjak' => NS_HELP_TALK,
+	'Bólkur_kjak' => NS_CATEGORY_TALK,
 );
 
+
 $datePreferences = false;
 $defaultDateFormat = 'dmy';
 $dateFormats = array(
@@ -59,49 +58,49 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Tvífaldað_ávísing' ),
-	'BrokenRedirects'           => array( 'Brotnar_ávísingar' ),
-	'Disambiguations'           => array( 'Síður_við_fleirfaldum_týdningi' ),
-	'Userlogin'                 => array( 'Stovna_kontu_ella_rita_inn' ),
-	'Userlogout'                => array( 'Rita_út' ),
+	'DoubleRedirects'           => array( 'Tvífaldað ávísing' ),
+	'BrokenRedirects'           => array( 'Brotnar ávísingar' ),
+	'Disambiguations'           => array( 'Síður við fleirfaldum týdningi' ),
+	'Userlogin'                 => array( 'Stovna kontu ella rita inn' ),
+	'Userlogout'                => array( 'Rita út' ),
 	'Preferences'               => array( 'Innstillingar' ),
-	'Watchlist'                 => array( 'Mítt_eftirlit' ),
-	'Recentchanges'             => array( 'Seinastu_broytingar' ),
-	'Upload'                    => array( 'Legg_fílu_upp' ),
-	'Imagelist'                 => array( 'Myndalisti' ),
-	'Newimages'                 => array( 'Nýggjar_myndir' ),
+	'Watchlist'                 => array( 'Mítt eftirlit' ),
+	'Recentchanges'             => array( 'Seinastu broytingar' ),
+	'Upload'                    => array( 'Legg fílu upp' ),
+	'Listfiles'                 => array( 'Myndalisti' ),
+	'Newimages'                 => array( 'Nýggjar myndir' ),
 	'Listusers'                 => array( 'Brúkaralisti' ),
 	'Statistics'                => array( 'Hagtøl' ),
-	'Randompage'                => array( 'Tilvildarlig_síða' ),
-	'Lonelypages'               => array( 'Foreldraleysar_síður' ),
-	'Uncategorizedpages'        => array( 'Óbólkaðar_síður' ),
-	'Uncategorizedcategories'   => array( 'Óbólkaðir_bólkar' ),
-	'Uncategorizedimages'       => array( 'Óbólkaðar_myndir' ),
-	'Uncategorizedtemplates'    => array( 'Óbólkaðar_fyrimyndir' ),
-	'Unusedcategories'          => array( 'Óbrúktir_bólkar' ),
-	'Unusedimages'              => array( 'Óbrúktar_myndir' ),
-	'Wantedpages'               => array( 'Ynsktar_síður' ),
-	'Mostcategories'            => array( 'Greinir_við_flest_bólkum' ),
-	'Mostrevisions'             => array( 'Greinir_við_flest_útgávum' ),
-	'Fewestrevisions'           => array( 'Greinir_við_minst_útgávum' ),
-	'Shortpages'                => array( 'Stuttar_síður' ),
-	'Longpages'                 => array( 'Langar_síður' ),
-	'Newpages'                  => array( 'Nýggjar_síður' ),
-	'Ancientpages'              => array( 'Elstu_síður' ),
-	'Deadendpages'              => array( 'Gøtubotns_síður' ),
-	'Allpages'                  => array( 'Allar_síður' ),
-	'Ipblocklist'               => array( 'Bannað_brúkaranøvn_og_IP-adressur' ),
-	'Specialpages'              => array( 'Serligar_síður' ),
+	'Randompage'                => array( 'Tilvildarlig síða' ),
+	'Lonelypages'               => array( 'Foreldraleysar síður' ),
+	'Uncategorizedpages'        => array( 'Óbólkaðar síður' ),
+	'Uncategorizedcategories'   => array( 'Óbólkaðir bólkar' ),
+	'Uncategorizedimages'       => array( 'Óbólkaðar myndir' ),
+	'Uncategorizedtemplates'    => array( 'Óbólkaðar fyrimyndir' ),
+	'Unusedcategories'          => array( 'Óbrúktir bólkar' ),
+	'Unusedimages'              => array( 'Óbrúktar myndir' ),
+	'Wantedpages'               => array( 'Ynsktar síður' ),
+	'Mostcategories'            => array( 'Greinir við flest bólkum' ),
+	'Mostrevisions'             => array( 'Greinir við flest útgávum' ),
+	'Fewestrevisions'           => array( 'Greinir við minst útgávum' ),
+	'Shortpages'                => array( 'Stuttar síður' ),
+	'Longpages'                 => array( 'Langar síður' ),
+	'Newpages'                  => array( 'Nýggjar síður' ),
+	'Ancientpages'              => array( 'Elstu síður' ),
+	'Deadendpages'              => array( 'Gøtubotns síður' ),
+	'Allpages'                  => array( 'Allar síður' ),
+	'Ipblocklist'               => array( 'Bannað brúkaranøvn og IP-adressur' ),
+	'Specialpages'              => array( 'Serligar síður' ),
 	'Contributions'             => array( 'Brúkaraíkast' ),
-	'Emailuser'                 => array( 'Send_t-post_til_brúkara' ),
-	'Movepage'                  => array( 'Flyt_síðu' ),
-	'Booksources'               => array( 'Bóka_keldur' ),
+	'Emailuser'                 => array( 'Send t-post til brúkara' ),
+	'Movepage'                  => array( 'Flyt síðu' ),
+	'Booksources'               => array( 'Bóka keldur' ),
 	'Categories'                => array( 'Bólkar' ),
 	'Export'                    => array( 'Útflutningssíður' ),
 	'Version'                   => array( 'Útgáva' ),
-	'Allmessages'               => array( 'Øll_kervisboð' ),
-	'Blockip'                   => array( 'Banna_brúkara' ),
-	'Undelete'                  => array( 'Endurstovna_strikaðar_síður' ),
+	'Allmessages'               => array( 'Øll kervisboð' ),
+	'Blockip'                   => array( 'Banna brúkara' ),
+	'Undelete'                  => array( 'Endurstovna strikaðar síður' ),
 	'Search'                    => array( 'Leita' ),
 );
 
@@ -142,8 +141,6 @@ $messages = array(
 'underline-never'   => 'Ongantíð',
 'underline-default' => 'Kagarastandard',
 
-'skinpreview' => '(Forskoðan)',
-
 # Dates
 'sunday'        => 'sunnudagur',
 'monday'        => 'mánadagur',
@@ -222,7 +219,7 @@ $messages = array(
 'mytalk'         => 'Mítt kjak',
 'anontalk'       => 'Kjak til hesa ip-adressuna',
 'navigation'     => 'Navigatión',
-'and'            => 'og',
+'and'            => '&#32;og',
 
 'errorpagetitle'    => 'Villa',
 'returnto'          => 'Vend aftur til $1.',
@@ -278,8 +275,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Um {{SITENAME}}',
 'aboutpage'            => 'Project:Um',
-'bugreports'           => 'Lúsafrágreiðingar',
-'bugreportspage'       => 'Project:Lúsafrágreiðingar',
 'copyright'            => 'Innihald er tøkt undir $1.',
 'copyrightpagename'    => '{{SITENAME}} útgávurættur',
 'copyrightpage'        => '{{ns:project}}:Útgávurættur',
@@ -356,7 +351,6 @@ afturkend av wiki',
 'cannotdelete'      => 'Síðan ella myndin kundi ikki strikast. (Møguliga hevur onkur annar longu strikað hana.)',
 'badtitle'          => 'Ógyldugt heiti',
 'badtitletext'      => 'Umbidna síðan er ógyldugt, tómt ella skeivt tilslóðað heiti millum mál ella wikur.',
-'perfdisabled'      => 'Tíverri er hesin hentleikin fyribils óvirkin! Hetta tí at hann seinkar dátugrunnin so nígv, at wiki ikki virkar sum hon skal.',
 'perfcachedts'      => 'Fylgjandi dáta er goymt, og var seinast goymt $1.',
 'viewsource'        => 'Vís keldu',
 'viewsourcefor'     => 'fyri $1',
@@ -365,11 +359,11 @@ afturkend av wiki',
 
 # Login and logout pages
 'logouttitle'                => 'Brúkaraútritan',
-'logouttext'                 => '<strong>Tú hevur nú ritað út.</strong><br />
+'logouttext'                 => "'''Tú hevur nú ritað út.'''<br />
 Tú kanst halda áfram at nýta {{SITENAME}} dulnevnt.
 Ella kanst tú rita inn aftur sum sami ella annar brúkari.
 Legg til merkis at summar síður kunnu framhaldandi síggja út
-sum tú hevur ritað inn til goymslan í sneytara tínum er ruddað.',
+sum tú hevur ritað inn til goymslan í sneytara tínum er ruddað.",
 'welcomecreation'            => '== Vælkomin, $1! ==
 
 Tín konto er nú stovnað. Gloym ikki at broyta tínar {{SITENAME}} innstillingar.',
@@ -378,7 +372,6 @@ Tín konto er nú stovnað. Gloym ikki at broyta tínar {{SITENAME}} innstilling
 'yourpassword'               => 'Títt loyniorð:',
 'yourpasswordagain'          => 'Skriva loyniorð umaftur:',
 'remembermypassword'         => 'Minst til loyniorðið hjá mær.',
-'loginproblem'               => '<b>Trupulleikar vóru við tíni innritan.</b><br />Royn aftur!',
 'login'                      => 'Rita inn',
 'nav-login-createaccount'    => 'Stovna kontu ella rita inn',
 'loginprompt'                => 'Cookies má verða sett til fyri at innrita á {{SITENAME}}.',
@@ -422,6 +415,11 @@ verður sendur fyri nakað av fylgjandi hentleikum.',
 'accountcreated'             => 'Konto upprættað',
 'loginlanguagelabel'         => 'Mál: $1',
 
+# Password reset dialog
+'oldpassword' => 'Gamalt loyniorð:',
+'newpassword' => 'Nýtt loyniorð:',
+'retypenew'   => 'Skriva nýtt loyniorð umaftur:',
+
 # Edit page toolbar
 'bold_sample'     => 'Feitir stavir',
 'bold_tip'        => 'Feitir stavir',
@@ -444,8 +442,8 @@ verður sendur fyri nakað av fylgjandi hentleikum.',
 'hr_tip'          => 'Vatnrøtt linja (vera sparin við)',
 
 # Edit pages
-'summary'                  => 'Samandráttur',
-'subject'                  => 'Evni/heiti',
+'summary'                  => 'Samandráttur:',
+'subject'                  => 'Evni/heiti:',
 'minoredit'                => 'Hetta er smábroyting',
 'watchthis'                => 'Hav eftirlit við hesi síðuni',
 'savearticle'              => 'Goym síðu',
@@ -455,7 +453,7 @@ verður sendur fyri nakað av fylgjandi hentleikum.',
 'showdiff'                 => 'Sýn broytingar',
 'anoneditwarning'          => "'''�varing:''' Tú hevur ikki ritað inn.
 Tín IP-adressa verður goymd í rættisøguni fyri hesa síðuna.",
-'summary-preview'          => 'Samandráttaforskoðan',
+'summary-preview'          => 'Samandráttaforskoðan:',
 'blockedtitle'             => 'Brúkarin er bannaður',
 'loginreqtitle'            => 'Innritan kravd',
 'loginreqlink'             => 'rita inn',
@@ -469,8 +467,8 @@ Ert tú komin higar av einum mistaki, kanst tú trýsta á '''aftur'''-knøttin
 Ein slík IP-adressa kann verða brúkt av fleiri brúkarum.
 Ert tú ein dulnevndur brúkari, og kennir, at óvikomandi viðmerkingar eru vendar til tín, so vinarliga [[Special:UserLogin|stovna eina kontu]] fyri at sleppa undan samanblanding við aðrar dulnevndar brúkarar í framtíðini.''",
 'clearyourcache'           => "'''Viðmerking:''' Eftir at hava goymt mást tú fara uttanum minnið á sneytara tínum fyri at síggja broytingarnar. '''Mozilla/Safari/Konqueror:''' halt knøttinum ''Shift'' niðri meðan tú trýstir á ''Reload'' (ella trýst ''Ctrl-Shift-R''), '''IE:''' trýst ''Ctrl-F5'', '''Opera:''' trýst F5.",
-'note'                     => '<strong>Viðmerking:</strong>',
-'previewnote'              => '<strong>Minst til at hetta bara er ein forskoðan, sum enn ikki er goymd!</strong>',
+'note'                     => "'''Viðmerking:'''",
+'previewnote'              => "'''Minst til at hetta bara er ein forskoðan, sum enn ikki er goymd!'''",
 'previewconflict'          => 'Henda forskoðanin vísir tekstin í erva soleiðis sum hann sær út, um tú velur at goyma.',
 'editing'                  => 'Tú rættar $1',
 'editingsection'           => 'Tú rættar $1 (partur)',
@@ -480,11 +478,11 @@ Ert tú ein dulnevndur brúkari, og kennir, at óvikomandi viðmerkingar eru ven
 'yourdiff'                 => 'Munir',
 'copyrightwarning'         => "Alt íkast til {{SITENAME}} er útgivið undir $2 (sí $1 fyri smálutir). Vilt tú ikki hava skriving tína broytta miskunnarleyst og endurspjadda frítt, so send hana ikki inn.<br />
 Við at senda arbeiði títt inn, lovar tú, at tú hevur skrivað tað, ella at tú hevur avritað tað frá tilfeingi ið er almenn ogn &mdash; hetta umfatar '''ikki''' flestu vevsíður.
-<strong>SEND IKKI UPPHAVSRÆTTARVART TILFAR UTTAN LOYVI!</strong>",
-'longpagewarning'          => '<strong>�VARING: Henda síðan er $1 kilobýt long.
+'''SEND IKKI UPPHAVSRÆTTARVART TILFAR UTTAN LOYVI!'''",
+'longpagewarning'          => "'''�VARING: Henda síðan er $1 kilobýt long.
 Summir sneytarar kunnu hava trupulleikar við at viðgerða síður upp ímóti ella longri enn 32 kb.
-Vinarliga umhugsa at býta síðuna sundur í styttri pettir.</strong>',
-'protectedpagewarning'     => '<strong>�VARING: Henda síðan er friðað, so at einans brúkarar við umboðsstjóraheimildum kunnu broyta hana.</strong>',
+Vinarliga umhugsa at býta síðuna sundur í styttri pettir.'''",
+'protectedpagewarning'     => "'''�VARING: Henda síðan er friðað, so at einans brúkarar við umboðsstjóraheimildum kunnu broyta hana.'''",
 'semiprotectedpagewarning' => "'''Viðmerking:''' Hendan grein er læst soleiðis at bert skrásetir brúkaris kunnu rætta hana.",
 'templatesused'            => 'Fyrimyndir brúktar á hesu síðu:',
 'templatesusedpreview'     => 'Fyrimyndir brúktar í hesari forskoðan:',
@@ -535,6 +533,7 @@ Vinarliga umhugsa at býta síðuna sundur í styttri pettir.</strong>',
 'prevn'                 => 'undanfarnu $1',
 'nextn'                 => 'næstu $1',
 'viewprevnext'          => 'Vís ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Innihald',
 'search-result-size'    => '$1 ({{PLURAL:$2|1 orð|$2 orð}})',
 'showingresults'        => "Niðanfyri standa upp til {{PLURAL:$1|'''$1''' úrslit, sum byrjar|'''$1''' úrslit, sum byrja}} við #<b>$2</b>.",
 'showingresultsnum'     => "Niðanfyri standa {{PLURAL:$3|'''1''' úrslit, sum byrjar|'''$3''' úrslit, sum byrja}} við #<b>$2</b>.",
@@ -551,6 +550,7 @@ Vinarliga umhugsa at býta síðuna sundur í styttri pettir.</strong>',
 'qbsettings-floatingleft' => 'Flótandi vinstru',
 'changepassword'          => 'Broyt loyniorð',
 'skin'                    => 'Hamur',
+'skin-preview'            => 'Forskoðan',
 'math'                    => 'Støddfrøðiligir formlar',
 'dateformat'              => 'Dato forsnið',
 'datetime'                => 'Dato og tíð',
@@ -562,9 +562,6 @@ Vinarliga umhugsa at býta síðuna sundur í styttri pettir.</strong>',
 'prefs-misc'              => 'Ymiskar innstillingar',
 'saveprefs'               => 'Goym innstillingar',
 'resetprefs'              => 'Endurset innstillingar',
-'oldpassword'             => 'Gamalt loyniorð:',
-'newpassword'             => 'Nýtt loyniorð:',
-'retypenew'               => 'Skriva nýtt loyniorð umaftur:',
 'textboxsize'             => 'Broyting av greinum',
 'rows'                    => 'Røð:',
 'columns'                 => 'Teigar:',
@@ -654,12 +651,12 @@ fyri at leggja fílur upp.',
 'license'   => 'Loyvi:',
 'nolicense' => 'Onki valt',
 
-# Special:ImageList
-'imagelist'      => 'Myndalisti',
-'imagelist_name' => 'Navn',
-'imagelist_user' => 'Brúkari',
+# Special:ListFiles
+'listfiles'      => 'Myndalisti',
+'listfiles_name' => 'Navn',
+'listfiles_user' => 'Brúkari',
 
-# Image description page
+# File description page
 'filehist'          => 'Søga fílu',
 'filehist-current'  => 'streymur',
 'filehist-datetime' => 'Dagur/Tíð',
@@ -692,23 +689,8 @@ fyri at leggja fílur upp.',
 'randomredirect' => 'Tilvildarlig ávísingarsíða',
 
 # Statistics
-'statistics'    => 'Hagtøl',
-'sitestats'     => '{{SITENAME}} síðuhagtøl',
-'userstats'     => 'Brúkarahagtøl',
-'sitestatstext' => "Tilsamans {{PLURAL:$1|'''1''' síða er|'''$1''' síður eru}} í dátugrunninum.
-Hetta umfatar kjaksíður, síður um {{SITENAME}}, heilt stuttar stubbasíður,
-ávísingar og aðrar, sum helst ikki kunnu metast sum innihaldssíður.
-Verða tær tiknar burtur úr, {{PLURAL:$2|er '''1''' síða|eru '''$2''' síður}}, sum kunnu metast sum
-{{PLURAL:$2|innihaldssíða|innihaldssíður}}.
-
-<!--'''$8''' {{PLURAL:$8|file has|files have}} been uploaded.-->
-
-Tilsamans '''$3''' {{PLURAL:$3|síðuskoðan hevur|síðuskoðanir hava}} verið og '''$4''' {{PLURAL:$4|síðubroyting|síðubroytingar}}
-síðani henda wikan varð sett up.
-Tað gevur í miðal '''$5''' broytingar fyri hvørja síðu og '''$6''' skoðanir fyri hvørja broyting.
-
-<!--The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''$7'''.-->",
-'userstatstext' => "Tilsamans  {{PLURAL:$1|er '''1''' skrásettur [[Special:ListUsers|brúkari]]|eru '''$1''' skrásettir [[Special:ListUsers|brúkarar]]}}. '''$2''' (ella '''$4%''') av hesum {{PLURAL:$2|er umboðsstjóri|eru umboðsstjórar}} (sí $5).",
+'statistics'              => 'Hagtøl',
+'statistics-header-users' => 'Brúkarahagtøl',
 
 'disambiguations'     => 'Síður við fleirfaldum týdningi',
 'disambiguationspage' => 'Template:fleiri týdningar',
@@ -765,7 +747,6 @@ Hvørt rað inniheldur slóðir til fyrstu og aðru ávísing, umframt tekstin Ã
 'speciallogtitlelabel' => 'Heitið:',
 'log'                  => 'Gerðabøkur',
 'all-logs-page'        => 'Allar gerðabøkur',
-'log-search-submit'    => 'Far',
 'alllogstext'          => 'Samansett sýning av upplegging, striking, friðing, forðing og sysop-gerðabókum.
 Tú kanst avmarka sýningina við at velja gerðabókaslag, brúkaranavn ella ávirkaðu síðuna.',
 
@@ -784,11 +765,18 @@ Tú kanst avmarka sýningina við at velja gerðabókaslag, brúkaranavn ella á
 'categories'         => 'Bólkar',
 'categoriespagetext' => 'Eftirfylgjandi bólkar eru í hesu wiki.',
 
+# Special:LinkSearch
+'linksearch-ns' => 'Navnarúm:',
+
 # Special:ListUsers
 'listusersfrom'      => 'Vís brúkarar ið byrja við:',
 'listusers-submit'   => 'Sýna',
 'listusers-noresult' => 'Ongin brúkari var funnin.',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Brúkara logg',
+'newuserlog-create-entry' => 'Nýggjur brúkari',
+
 # E-mail user
 'mailnologintext' => 'Tú mást hava [[Special:UserLogin|ritað inn]]
 og hava virkandi teldupostadressu í [[Special:Preferences|innstillingum]] tínum
@@ -807,34 +795,28 @@ ella hevur hann valt ikki at taka ímóti t-posti frá øðrum brúkarum.',
 'emailsenttext'   => 'Títt t-post boð er sent.',
 
 # Watchlist
-'watchlist'            => 'Mítt eftirlit',
-'mywatchlist'          => 'Mítt eftirlit',
-'watchlistfor'         => "(fyri '''$1''')",
-'nowatchlist'          => 'Tú hevur ongar lutir í eftirlitinum.',
-'watchnologin'         => 'Tú hevur ikki ritað inn',
-'addedwatch'           => 'Lagt undir eftirlit',
-'addedwatchtext'       => "Síðan \"<nowiki>\$1</nowiki>\" er løgd undir [[Special:Watchlist|eftirlit]] hjá tær.
+'watchlist'         => 'Mítt eftirlit',
+'mywatchlist'       => 'Mítt eftirlit',
+'watchlistfor'      => "(fyri '''$1''')",
+'nowatchlist'       => 'Tú hevur ongar lutir í eftirlitinum.',
+'watchnologin'      => 'Tú hevur ikki ritað inn',
+'addedwatch'        => 'Lagt undir eftirlit',
+'addedwatchtext'    => "Síðan \"<nowiki>\$1</nowiki>\" er løgd undir [[Special:Watchlist|eftirlit]] hjá tær.
 Framtíðar broytingar á hesi síðu og tilknýttu kjaksíðuni verða at síggja her.
 Tá sæst síðan sum '''feit skrift''' í [[Special:RecentChanges|broytingaryvirlitinum]] fyri at gera hana lættari at síggja.
 
 Vilt tú flyta síðuna undan tínum eftirliti, kanst tú trýsta á \"Strika eftirlit\" á síðuni.",
-'removedwatch'         => 'Strikað úr eftirliti',
-'removedwatchtext'     => 'Síðan "[[:$1]]" er strikað úr tínum eftirliti.',
-'watch'                => 'Eftirlit',
-'watchthispage'        => 'Hav eftirlit við hesi síðuni',
-'unwatch'              => 'strika eftirlit',
-'notanarticle'         => 'Ongin innihaldssíða',
-'watchnochange'        => 'Ongin grein í tínum eftirliti er rætta innanfyri hetta tíðarskeiði.',
-'watchmethod-list'     => 'kannar síður undir eftirliti fyri feskar broytingar',
-'watchlistcontains'    => 'Títt eftirlit inniheldur {{PLURAL:$1|eina síðu|$1 síður}}.',
-'wlnote'               => "Niðanfyri {{PLURAL:$1|stendur seinastu broytingina|standa seinastu '''$1''' broytingarnar}} {{PLURAL:$2|seinasta tíman|seinastu '''$2''' tímarnar}}.",
-'wlshowlast'           => 'Vís seinastu $1 tímar $2 dagar $3',
-'watchlist-show-bots'  => 'Vís bot rættingar',
-'watchlist-hide-bots'  => 'Fjal bottarættingar',
-'watchlist-show-own'   => 'Vís mínar rættingar',
-'watchlist-hide-own'   => 'Fjal mínar rættingar',
-'watchlist-show-minor' => 'Vís minni rættingar',
-'watchlist-hide-minor' => 'Fjal minni rættingar',
+'removedwatch'      => 'Strikað úr eftirliti',
+'removedwatchtext'  => 'Síðan "[[:$1]]" er strikað úr tínum eftirliti.',
+'watch'             => 'Eftirlit',
+'watchthispage'     => 'Hav eftirlit við hesi síðuni',
+'unwatch'           => 'strika eftirlit',
+'notanarticle'      => 'Ongin innihaldssíða',
+'watchnochange'     => 'Ongin grein í tínum eftirliti er rætta innanfyri hetta tíðarskeiði.',
+'watchmethod-list'  => 'kannar síður undir eftirliti fyri feskar broytingar',
+'watchlistcontains' => 'Títt eftirlit inniheldur {{PLURAL:$1|eina síðu|$1 síður}}.',
+'wlnote'            => "Niðanfyri {{PLURAL:$1|stendur seinastu broytingina|standa seinastu '''$1''' broytingarnar}} {{PLURAL:$2|seinasta tíman|seinastu '''$2''' tímarnar}}.",
+'wlshowlast'        => 'Vís seinastu $1 tímar $2 dagar $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Eftirlitir...',
@@ -844,33 +826,38 @@ Vilt tú flyta síðuna undan tínum eftirliti, kanst tú trýsta á \"Strika ef
 'enotif_impersonal_salutation' => '{{SITENAME}}brúkari',
 'created'                      => 'stovnað',
 
-# Delete/protect/revert
-'deletepage'          => 'Strika síðu',
-'confirm'             => 'Vátta',
-'excontent'           => "innihald var: '$1'",
-'excontentauthor'     => "innihaldið var: '$1' (og einasti rithøvundur var '[[Special:Contributions/$2|$2]]')",
-'exblank'             => 'síðan var tóm',
-'historywarning'      => '�varing: Síðan, ið tú ert í gongd við at strika, hevur eina søgu:',
-'confirmdeletetext'   => 'Tú ert í gongd við endaliga at strika ein a síðu
+# Delete
+'deletepage'        => 'Strika síðu',
+'confirm'           => 'Vátta',
+'excontent'         => "innihald var: '$1'",
+'excontentauthor'   => "innihaldið var: '$1' (og einasti rithøvundur var '[[Special:Contributions/$2|$2]]')",
+'exblank'           => 'síðan var tóm',
+'historywarning'    => '�varing: Síðan, ið tú ert í gongd við at strika, hevur eina søgu:',
+'confirmdeletetext' => 'Tú ert í gongd við endaliga at strika ein a síðu
 ella mynd saman við allari søgu úr dátugrunninum.
 Vinarliga vátta at tú ætlar at gera hetta, at tú skilur
 avleiðingarnar og at tú gert tað í tráð við
 [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'      => 'Verkið er fullgjørt',
-'deletedtext'         => '"<nowiki>$1</nowiki>" er nú strikað.
+'actioncomplete'    => 'Verkið er fullgjørt',
+'deletedtext'       => '"<nowiki>$1</nowiki>" er nú strikað.
 Sí $2 fyri fulla skráseting av strikingum.',
-'deletedarticle'      => 'strikaði "[[$1]]"',
-'dellogpage'          => 'Striku logg',
-'deletionlog'         => 'striku logg',
-'deletecomment'       => 'Orsøk til striking:',
-'rollback'            => 'Rulla broytingar aftur',
-'rollback_short'      => 'Rulla aftur',
-'rollbacklink'        => 'afturrulling',
-'rollbackfailed'      => 'Afturrulling miseydnað',
+'deletedarticle'    => 'strikaði "[[$1]]"',
+'dellogpage'        => 'Striku logg',
+'deletionlog'       => 'striku logg',
+'deletecomment'     => 'Orsøk til striking:',
+
+# Rollback
+'rollback'       => 'Rulla broytingar aftur',
+'rollback_short' => 'Rulla aftur',
+'rollbacklink'   => 'afturrulling',
+'rollbackfailed' => 'Afturrulling miseydnað',
+
+# Protect
 'protectlogpage'      => 'Friðingarbók',
 'protectedarticle'    => 'friðaði "[[$1]]"',
 'unprotectedarticle'  => 'ófriðaði "[[$1]]"',
 'protect-title'       => 'Friðar "$1"',
+'prot_1movedto2'      => '$1 flutt til $2',
 'protect-legend'      => 'Vátta friðing',
 'protectcomment'      => 'Orsøk til friðing:',
 'protectexpiry'       => 'Gongur út:',
@@ -909,7 +896,6 @@ Sí $2 fyri fulla skráseting av strikingum.',
 
 # What links here
 'whatlinkshere'       => 'Hvat slóðar higar',
-'linklistsub'         => '(Listi av slóðum)',
 'linkshere'           => "Hesar síður slóða til '''[[:$1]]''':",
 'nolinkshere'         => "Ongar síður slóða til '''[[:$1]]'''.",
 'isredirect'          => 'ávísingarsíða',
@@ -964,6 +950,7 @@ Tú kanst ikki skriva yvir eina verandi síðu.
 Hetta kann vera ein ógvuslig og óvæntað flyting av einari vældámdari síðu.
 Vinarliga tryggja tær, at tú skilur avleiðingarnar av hesum áðrenn tú heldur áfam.",
 'movearticle'             => 'Flyt síðu:',
+'movenologin'             => 'Hevur ikki ritað inn',
 'newtitle'                => 'Til nýtt heiti:',
 'move-watch'              => 'Hav eftirlit við hesi síðuni',
 'movepagebtn'             => 'Flyt síðu',
@@ -993,7 +980,7 @@ Grein við navninum "[[:$1]]" finst longu. Ynskir tú at strika hana til tess at
 'allmessagesdefault'        => 'Enskur tekstur',
 'allmessagescurrent'        => 'Verandi tekstur',
 'allmessagestext'           => 'Hetta er eitt yvirlit av tøkum kervisboðum í MediaWiki-navnarúmi.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:AllMessages''' er ikki stuðlað orsakað av at '''\$wgUseDatabaseMessages''' er sløkt.",
 'allmessagesfilter'         => 'Boð navn filtur:',
 'allmessagesmodified'       => 'Vís bert broytt',
@@ -1063,6 +1050,11 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 # Info page
 'infosubtitle' => 'Upplýsingar um síðu',
 
+# Skin names
+'skinname-standard'    => 'Standardur',
+'skinname-nostalgia'   => 'Nostalgiskur',
+'skinname-cologneblue' => 'Cologne-bláur',
+
 # Math options
 'mw_math_png'    => 'Vís altíð sum PNG',
 'mw_math_simple' => 'HTML um sera einfalt annars PNG',
@@ -1085,7 +1077,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'file-info-size' => '($1 × $2 pixel, stødd fílu: $3, MIME-slag: $4)',
 'svg-long-desc'  => '(SVG fíle, nominelt $1 × $2 pixel, fíle stødd: $3)',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Nýggjar myndir',
 'noimages'  => 'Einki at síggja.',
 'ilsubmit'  => 'Leita',
@@ -1127,9 +1119,6 @@ fer úr gildi tann $4.',
 # action=purge
 'confirm_purge_button' => '� lagi',
 
-# AJAX search
-'hideresults' => 'Fjal úrslit',
-
 # Multipage image navigation
 'imgmultipageprev' => '� fyrrverandi síða',
 'imgmultipagenext' => 'næsta síða →',
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index 6b55e575..2b94a2c9 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -12,6 +12,7 @@
  * @author Dereckson
  * @author Elfix
  * @author Esbardu
+ * @author Fryed-peach
  * @author Grondin
  * @author Guillom
  * @author Hégésippe Cormier
@@ -22,7 +23,9 @@
  * @author Louperivois
  * @author McDutchie
  * @author Meithal
+ * @author Moyg
  * @author Omnipaedista
+ * @author PieRRoMaN
  * @author Remember the dot
  * @author Seb35
  * @author Sherbrooke
@@ -33,17 +36,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Standard',
-	'nostalgia'   => 'Nostalgie',
-	'cologneblue' => 'Bleu de Cologne',
-	'monobook'    => 'Monobook',
-	'myskin'      => 'Mon Interface',
-	'chick'       => 'Poussin',
-	'simple'      => 'Simple',
-	'modern'      => 'Moderne',
-);
-
 $bookstoreList = array(
 	'Amazon.fr'    => 'http://www.amazon.fr/exec/obidos/ISBN=$1',
 	'alapage.fr'   => 'http://www.alapage.com/mx/?tp=F&type=101&l_isbn=$1&donnee_appel=ALASQ&devise=&',
@@ -52,25 +44,28 @@ $bookstoreList = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Special',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discuter',
-	NS_USER           => 'Utilisateur',
-	NS_USER_TALK      => 'Discussion_Utilisateur',
-	NS_PROJECT        => '$1',
-	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Image',
-	NS_IMAGE_TALK     => 'Discussion_Image',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
-	NS_TEMPLATE       => 'Modèle',
-	NS_TEMPLATE_TALK  => 'Discussion_Modèle',
-	NS_HELP           => 'Aide',
-	NS_HELP_TALK      => 'Discussion_Aide',
-	NS_CATEGORY       => 'Catégorie',
-	NS_CATEGORY_TALK  => 'Discussion_Catégorie'
+	NS_MEDIA            => 'Média',
+	NS_SPECIAL          => 'Spécial',
+	NS_TALK             => 'Discuter',
+	NS_USER             => 'Utilisateur',
+	NS_USER_TALK        => 'Discussion_Utilisateur',
+	NS_PROJECT_TALK     => 'Discussion_$1',
+	NS_FILE             => 'Fichier',
+	NS_FILE_TALK        => 'Discussion_Fichier',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
+	NS_TEMPLATE         => 'Modèle',
+	NS_TEMPLATE_TALK    => 'Discussion_Modèle',
+	NS_HELP             => 'Aide',
+	NS_HELP_TALK        => 'Discussion_Aide',
+	NS_CATEGORY         => 'Catégorie',
+	NS_CATEGORY_TALK    => 'Discussion_Catégorie',
+);
+
+$namespaceAliases = array(
+	'Discussion_Image' => NS_FILE_TALK,
 );
+
 $linkTrail = '/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄË�ÖÜÀÈÙ]+)(.*)$/sDu';
 
 $dateFormats = array(
@@ -88,144 +83,207 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#REDIRECT', '#REDIRECTION' ),
-	'notoc'               => array( '0', '__NOTOC__', '__AUCUNETABLE__' ),
-	'nogallery'           => array( '0', '__NOGALLERY__', '__AUCUNEGALERIE__' ),
-	'forcetoc'            => array( '0', '__FORCETOC__', '__FORCERTABLE__' ),
-	'toc'                 => array( '0', '__TOC__', '__TABLE__' ),
-	'noeditsection'       => array( '0', '__NOEDITSECTION__', '__SECTIONNONEDITABLE__' ),
-	'currentmonth'        => array( '1', 'CURRENTMONTH', 'MOISCOURANT' ),
-	'currentmonthname'    => array( '1', 'CURRENTMONTHNAME', 'NOMMOISCOURANT' ),
-	'currentday'          => array( '1', 'CURRENTDAY', 'JOURCOURANT' ),
-	'currentday2'         => array( '1', 'CURRENTDAY2', 'JOURCOURANT2' ),
-	'currentdayname'      => array( '1', 'CURRENTDAYNAME', 'NOMJOURCOURANT' ),
-	'currentyear'         => array( '1', 'CURRENTYEAR', 'ANNEECOURANTE' ),
-	'currenttime'         => array( '1', 'CURRENTTIME', 'DATECOURANTE' ),
-	'currenthour'         => array( '1', 'CURRENTHOUR', 'HEURECOURANTE' ),
-	'numberofpages'       => array( '1', 'NUMBEROFPAGES', 'NOMBREPAGES' ),
-	'numberofarticles'    => array( '1', 'NUMBEROFARTICLES', 'NOMBREARTICLES' ),
-	'numberoffiles'       => array( '1', 'NUMBEROFFILES', 'NOMBREFICHIERS' ),
-	'numberofusers'       => array( '1', 'NUMBEROFUSERS', 'NOMBREUTILISATEURS' ),
-	'numberofedits'       => array( '1', 'NUMBEROFEDITS', 'NOMBREEDITIONS' ),
-	'pagename'            => array( '1', 'PAGENAME', 'NOMPAGE' ),
-	'namespace'           => array( '1', 'NAMESPACE', 'ESPACENOMMAGE' ),
-	'talkspace'           => array( '1', 'TALKSPACE', 'ESPACEDISCUSSION' ),
-	'img_right'           => array( '1', 'right', 'droite' ),
-	'img_left'            => array( '1', 'left', 'gauche' ),
-	'img_none'            => array( '1', 'none', 'neant' ),
-	'img_framed'          => array( '1', 'framed', 'enframed', 'frame', 'cadre' ),
-	'img_frameless'       => array( '1', 'frameless', 'sans_cadre' ),
-	'img_border'          => array( '1', 'border', 'bordure' ),
-	'server'              => array( '0', 'SERVER', 'SERVEUR' ),
-	'servername'          => array( '0', 'SERVERNAME', 'NOMSERVEUR' ),
-	'scriptpath'          => array( '0', 'SCRIPTPATH', 'CHEMINSCRIPT' ),
-	'grammar'             => array( '0', 'GRAMMAR:', 'GRAMMAIRE:' ),
-	'currentweek'         => array( '1', 'CURRENTWEEK', 'SEMAINECOURANTE' ),
-	'revisionid'          => array( '1', 'REVISIONID', 'NUMEROVERSION' ),
-	'revisionday'         => array( '1', 'REVISIONDAY', 'DATEVERSION' ),
-	'revisionday2'        => array( '1', 'REVISIONDAY2', 'DATEVERSION2' ),
-	'revisionmonth'       => array( '1', 'REVISIONMONTH', 'MOISREVISION' ),
-	'revisionyear'        => array( '1', 'REVISIONYEAR', 'ANNEEREVISION' ),
-	'revisiontimestamp'   => array( '1', 'REVISIONTIMESTAMP', 'HEUREREVISION' ),
-	'plural'              => array( '0', 'PLURAL:', 'PLURIEL:' ),
-	'raw'                 => array( '0', 'RAW:', 'LIGNE:' ),
-	'displaytitle'        => array( '1', 'DISPLAYTITLE', 'AFFICHERTITRE' ),
-	'newsectionlink'      => array( '1', '__NEWSECTIONLINK__', '__LIENNOUVELLESECTION__' ),
-	'currentversion'      => array( '1', 'CURRENTVERSION', 'VERSIONACTUELLE' ),
-	'currenttimestamp'    => array( '1', 'CURRENTTIMESTAMP', 'HEUREACTUELLE' ),
-	'localtimestamp'      => array( '1', 'LOCALTIMESTAMP', 'HEURELOCALE' ),
-	'language'            => array( '0', '#LANGUAGE:', '#LANGUE:' ),
-	'numberofadmins'      => array( '1', 'NUMBEROFADMINS', 'NOMBREADMINS' ),
-	'formatnum'           => array( '0', 'FORMATNUM', 'FORMATNOMBRE' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:', 'CLEFDETRI:', 'CLEDETRI:' ),
-	'filepath'            => array( '0', 'FILEPATH:', 'CHEMIN:' ),
-	'tag'                 => array( '0', 'tag', 'balise' ),
-	'hiddencat'           => array( '1', '__HIDDENCAT__', '__CACHECAT__' ),
-	'pagesincategory'     => array( '1', 'PAGESINCATEGORY', 'PAGESINCAT', 'PAGESDANSCAT' ),
+	'redirect'              => array( '0', '#REDIRECTION', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__AUCUNETABLE__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__FORCERTABLE__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__TABLE__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__SECTIONNONEDITABLE__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'MOISCOURANT', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'NOMMOISCOURANT', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'NOMGENMOISCOURANT', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'ABREVMOISCOURANT', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'JOURCOURANT', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'JOURCOURANT2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'NOMJOURCOURANT', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'ANNEECOURANTE', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'DATECOURANTE', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'HEURECOURANTE', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'MOISLOCAL', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'JOURLOCAL', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'JOURLOCAL2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'ANNEELOCALE', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'HORAIRELOCAL', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'HEURELOCALE', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'NOMBREEDITIONS', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'NOMPAGE', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'NOMPAGEX', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'ESPACENOMMAGE', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'ESPACEDISCUSSION', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'NOMPAGEDISCUSSIONX', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'NOMPAGESUJET', 'NOMPAGEARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'NOMPAGESUJETX', 'NOMPAGEARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'img_thumbnail'         => array( '1', 'vignette', 'thumbnail', 'thumb' ),
+	'img_right'             => array( '1', 'droite', 'right' ),
+	'img_left'              => array( '1', 'gauche', 'left' ),
+	'img_none'              => array( '1', 'néant', 'neant', 'none' ),
+	'img_center'            => array( '1', 'centré', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'cadre', 'encadré', 'encadre', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'sans_cadre', 'sans cadre', 'non encadré', 'non encadre', 'frameless' ),
+	'img_border'            => array( '1', 'bordure', 'border' ),
+	'img_baseline'          => array( '1', 'ligne de base', 'baseline' ),
+	'img_sub'               => array( '1', 'indice', 'ind', 'sub' ),
+	'img_super'             => array( '1', 'exp', 'super', 'sup' ),
+	'img_top'               => array( '1', 'haut', 'top' ),
+	'img_text_top'          => array( '1', 'haut-texte', 'haut-txt', 'text-top' ),
+	'img_middle'            => array( '1', 'milieu', 'middle' ),
+	'img_bottom'            => array( '1', 'bas', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'bas-texte', 'bas-txt', 'text-bottom' ),
+	'sitename'              => array( '1', 'NOMSITE', 'SITENAME' ),
+	'localurl'              => array( '0', 'URLLOCALE:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'URLLOCALEX:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'SERVEUR', 'SERVER' ),
+	'servername'            => array( '0', 'NOMSERVEUR', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'CHEMINSCRIPT', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'GRAMMAIRE:', 'GRAMMAR:' ),
+	'currentweek'           => array( '1', 'SEMAINECOURANTE', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'JDSCOURANT', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'SEMAINELOCALE', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'JDSLOCAL', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'NUMEROVERSION', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'DATEVERSION', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'DATEVERSION2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'MOISREVISION', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'ANNEEREVISION', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'HEUREREVISION', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'PLURIEL:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'URLCOMPLETE:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'URLCOMPLETEX:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'INITMINUS:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'INITMAJUS:', 'INITCAPIT:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'MINUS:', 'LC:' ),
+	'uc'                    => array( '0', 'MAJUS:', 'CAPIT:', 'UC:' ),
+	'raw'                   => array( '0', 'LIGNE:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', 'BRUT', 'R' ),
+	'newsectionlink'        => array( '1', '__LIENNOUVELLESECTION__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'VERSIONACTUELLE', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'ENCODEURL:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'ENCODEANCRE', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'HEUREACTUELLE', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'MARQUEDIR', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#LANGUE:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'LANGUECONTENU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'PAGESDANSESPACE:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'FORMATNOMBRE', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'BOURRAGEGAUCHE', 'PADLEFT' ),
+	'padright'              => array( '0', 'BOURRAGEDROITE', 'PADRIGHT' ),
+	'special'               => array( '0', 'spécial', 'special' ),
+	'defaultsort'           => array( '1', 'CLEFDETRI:', 'CLEDETRI:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'CHEMIN:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'balise', 'tag' ),
+	'hiddencat'             => array( '1', '__CACHECAT__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'PAGESDANSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'TAILLEPAGE', 'PAGESIZE' ),
+	'noindex'               => array( '1', '__AUCUNINDEX__', '__NOINDEX__' ),
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Doubles_redirections', 'Doublesredirections', 'Doubles_redirects', 'Doublesredirects', 'Redirections_doubles', 'Redirectionsdoubles' ),
-	'BrokenRedirects'           => array( 'Redirections_cassées', 'Redirections_cassees' ),
-	'Disambiguations'           => array( 'Homonymie', 'Homonymies', 'Pages_d\'homonymie' ),
+	'DoubleRedirects'           => array( 'Doubles redirections', 'Doublesredirections', 'Doubles redirects', 'Doublesredirects', 'Redirections doubles', 'Redirectionsdoubles' ),
+	'BrokenRedirects'           => array( 'Redirections cassées', 'Redirections cassees' ),
+	'Disambiguations'           => array( 'Homonymie', 'Homonymies', 'Pages d\'homonymie' ),
 	'Userlogin'                 => array( 'Connexion', 'Identification', 'Login' ),
 	'Userlogout'                => array( 'Déconnexion', 'Deconnexion' ),
-	'CreateAccount'             => array( 'Créer_un_compte', 'CréerUnCompte', 'CréerCompte' ),
+	'CreateAccount'             => array( 'Créer un compte', 'CréerUnCompte', 'CréerCompte' ),
 	'Preferences'               => array( 'Préférences' ),
-	'Watchlist'                 => array( 'Liste_de_suivi', 'Listedesuivi', 'Suivi' ),
-	'Recentchanges'             => array( 'Modifications_récentes', 'Modifications_recentes' ),
+	'Watchlist'                 => array( 'Liste de suivi', 'Listedesuivi', 'Suivi' ),
+	'Recentchanges'             => array( 'Modifications récentes', 'Modifications recentes' ),
 	'Upload'                    => array( 'Téléchargement', 'Telechargement' ),
-	'Imagelist'                 => array( 'Liste_des_images', 'Listedesimages', 'Liste_images', 'Listeimages' ),
-	'Newimages'                 => array( 'Nouvelles_images', 'Nouveaux_fichiers' ),
-	'Listusers'                 => array( 'Liste_des_utilisateurs', 'Liste_des_participants', 'Utilisateurs', 'Participants' ),
-	'Listgrouprights'           => array( 'Liste_des_groupes_utilisateur', 'ListedesGroupesUtilisateur', 'ListeGroupesUtilisateur' ),
+	'Listfiles'                 => array( 'Liste des images', 'Listedesimages', 'Liste images', 'Listeimages' ),
+	'Newimages'                 => array( 'Nouvelles images', 'Nouveaux fichiers' ),
+	'Listusers'                 => array( 'Liste des utilisateurs', 'Liste des participants', 'Utilisateurs', 'Participants' ),
+	'Listgrouprights'           => array( 'Liste des groupes utilisateur', 'ListedesGroupesUtilisateur', 'ListeGroupesUtilisateur' ),
 	'Statistics'                => array( 'Statistiques', 'Stats' ),
-	'Randompage'                => array( 'Page_au_hasard', 'Au_hasard', 'Aléatoire', 'Aleatoire' ),
-	'Lonelypages'               => array( 'Pages_orphelines', 'Pagesorphelines' ),
-	'Uncategorizedpages'        => array( 'Pages_sans_catégorie', 'Pages_sans_categorie' ),
-	'Uncategorizedcategories'   => array( 'Catégories_sans_catégorie', 'Categories_sans_categorie' ),
-	'Uncategorizedimages'       => array( 'Images_sans_catégorie', 'Images_sans_categorie' ),
-	'Uncategorizedtemplates'    => array( 'Modèles_sans_catégorie', 'Modeles_sans_catégorie' ),
-	'Unusedcategories'          => array( 'Catégories_inutilisées', 'Categories_inutilisees', 'Catégories_non_utilisées', 'Categories_non_utilisees' ),
-	'Unusedimages'              => array( 'Images_inutilisées', 'Images_inutilisees', 'Images_non_utilisées', 'Images_non_utilisees', 'Images_orphelines' ),
-	'Wantedpages'               => array( 'Pages_demandées', 'Pages_demandees' ),
-	'Wantedcategories'          => array( 'Catégories_demandées', 'Categories_demandees' ),
-	'Mostlinked'                => array( 'Pages_les_plus_liées', 'Pages_les_plus_liees', 'Pages_plus_liées', 'Pages_plus_liees', 'Plus_liées', 'Plus_liees' ),
-	'Mostlinkedcategories'      => array( 'Catégories_les_plus_utilisées', 'Categories_les_plus_utilisees' ),
-	'Mostlinkedtemplates'       => array( 'Modèles_les_plus_utilisés', 'Modeles_les_plus_utilises' ),
-	'Mostcategories'            => array( 'Plus_categorisées', 'Plus_categorisees' ),
-	'Mostimages'                => array( 'Images_les_plus_utilisées', 'Images_les_plus_utilisees' ),
-	'Mostrevisions'             => array( 'Articles_les_plus_modifiés', 'Articles_les_plus_modifies', 'Plus_modifiés', 'Plus_modifies', 'Plus_modifiées', 'Plus_modifiees' ),
-	'Fewestrevisions'           => array( 'Articles_les_moins_modifiés', 'Articles_les_moins_modifies', 'Moins_modifiés', 'Moins_modifies', 'Moins_modifiées', 'Moins_modifiees' ),
-	'Shortpages'                => array( 'Pages_courtes', 'Pagescourtes' ),
-	'Longpages'                 => array( 'Pages_longues', 'Pageslongues' ),
-	'Newpages'                  => array( 'Nouvelles_pages', 'Nouvellespages' ),
-	'Ancientpages'              => array( 'Anciennes_pages', 'Anciennespages' ),
-	'Deadendpages'              => array( 'Pages_en_impasse', 'Pagesenimpasse' ),
-	'Protectedpages'            => array( 'Pages_protégées', 'Pages_protegees', 'Pagesprotégées', 'Pagesprotegees' ),
-	'Protectedtitles'           => array( 'Titres_protégés', 'Titres_proteges', 'Titresprotégés', 'Titresproteges' ),
-	'Allpages'                  => array( 'Toutes_les_pages', 'Touteslespages' ),
+	'Randompage'                => array( 'Page au hasard', 'Au hasard', 'Aléatoire', 'Aleatoire' ),
+	'Lonelypages'               => array( 'Pages orphelines', 'Pagesorphelines' ),
+	'Uncategorizedpages'        => array( 'Pages sans catégorie', 'Pages sans categorie' ),
+	'Uncategorizedcategories'   => array( 'Catégories sans catégorie', 'Categories sans categorie' ),
+	'Uncategorizedimages'       => array( 'Images sans catégorie', 'Images sans categorie' ),
+	'Uncategorizedtemplates'    => array( 'Modèles sans catégorie', 'Modeles sans catégorie' ),
+	'Unusedcategories'          => array( 'Catégories inutilisées', 'Categories inutilisees', 'Catégories non utilisées', 'Categories non utilisees' ),
+	'Unusedimages'              => array( 'Images inutilisées', 'Images inutilisees', 'Images non utilisées', 'Images non utilisees', 'Images orphelines' ),
+	'Wantedpages'               => array( 'Pages demandées', 'Pages demandees' ),
+	'Wantedcategories'          => array( 'Catégories demandées', 'Categories demandees' ),
+	'Wantedfiles'               => array( 'Fichiers demandés', 'Fichiers demandes' ),
+	'Wantedtemplates'           => array( 'Modèles demandés', 'Modeles demandes' ),
+	'Mostlinked'                => array( 'Pages les plus liées', 'Pages les plus liees', 'Pages plus liées', 'Pages plus liees', 'Plus liées', 'Plus liees' ),
+	'Mostlinkedcategories'      => array( 'Catégories les plus utilisées', 'Categories les plus utilisees' ),
+	'Mostlinkedtemplates'       => array( 'Modèles les plus utilisés', 'Modeles les plus utilises' ),
+	'Mostimages'                => array( 'Images les plus utilisées', 'Images les plus utilisees' ),
+	'Mostcategories'            => array( 'Plus categorisées', 'Plus categorisees' ),
+	'Mostrevisions'             => array( 'Articles les plus modifiés', 'Articles les plus modifies', 'Plus modifiés', 'Plus modifies', 'Plus modifiées', 'Plus modifiees' ),
+	'Fewestrevisions'           => array( 'Articles les moins modifiés', 'Articles les moins modifies', 'Moins modifiés', 'Moins modifies', 'Moins modifiées', 'Moins modifiees' ),
+	'Shortpages'                => array( 'Pages courtes', 'Pagescourtes' ),
+	'Longpages'                 => array( 'Pages longues', 'Pageslongues' ),
+	'Newpages'                  => array( 'Nouvelles pages', 'Nouvellespages' ),
+	'Ancientpages'              => array( 'Anciennes pages', 'Anciennespages' ),
+	'Deadendpages'              => array( 'Pages en impasse', 'Pagesenimpasse' ),
+	'Protectedpages'            => array( 'Pages protégées', 'Pages protegees', 'Pagesprotégées', 'Pagesprotegees' ),
+	'Protectedtitles'           => array( 'Titres protégés', 'Titres proteges', 'Titresprotégés', 'Titresproteges' ),
+	'Allpages'                  => array( 'Toutes les pages', 'Touteslespages' ),
 	'Prefixindex'               => array( 'Index' ),
-	'Ipblocklist'               => array( 'Utilisateurs_bloqués', 'Utilisateurs_bloques', 'Utilisateursbloqués', 'Utilisateursbloques', 'IP_bloquées', 'IP_bloquees', 'IPbloquées', 'IPbloquees', 'Ip_bloquées', 'Ip_bloquees', 'Ipbloquées', 'Ipbloquees' ),
-	'Specialpages'              => array( 'Pages_spéciales', 'Pages_speciales', 'Pagesspéciales', 'Pagesspeciales' ),
-	'Contributions'             => array( 'Contributions' ),
+	'Ipblocklist'               => array( 'Utilisateurs bloqués', 'Utilisateurs bloques', 'Utilisateursbloqués', 'Utilisateursbloques', 'IP bloquées', 'IP bloquees', 'IPbloquées', 'IPbloquees', 'Ip bloquées', 'Ip bloquees', 'Ipbloquées', 'Ipbloquees' ),
+	'Specialpages'              => array( 'Pages spéciales', 'Pages speciales', 'Pagesspéciales', 'Pagesspeciales' ),
 	'Emailuser'                 => array( 'Courriel', 'Email', 'E-mail' ),
-	'Confirmemail'              => array( 'Confirmer_le_courriel', 'Confirmerlecourriel', 'ConfirmerCourriel' ),
-	'Whatlinkshere'             => array( 'Pages_liées', 'Pages_liees', 'Pagesliées', 'Pagesliees' ),
-	'Recentchangeslinked'       => array( 'Suivi_des_liens', 'Suividesliens' ),
+	'Confirmemail'              => array( 'Confirmer le courriel', 'Confirmerlecourriel', 'ConfirmerCourriel' ),
+	'Whatlinkshere'             => array( 'Pages liées', 'Pages liees', 'Pagesliées', 'Pagesliees' ),
+	'Recentchangeslinked'       => array( 'Suivi des liens', 'Suividesliens' ),
 	'Movepage'                  => array( 'Renommer', 'Renommage' ),
-	'Blockme'                   => array( 'Bloquez_moi', 'Bloquezmoi' ),
-	'Booksources'               => array( 'Ouvrages_de_référence', 'Ouvrages_de_reference', 'Ouvragesderéférence', 'Ouvragesdereference', 'Recherche_ISBN', 'Recherche_isbn', 'RechercheISBN', 'Rechercheisbn' ),
+	'Blockme'                   => array( 'Bloquez-moi', 'Bloquezmoi' ),
+	'Booksources'               => array( 'Ouvrages de référence', 'Ouvrages de reference', 'Ouvragesderéférence', 'Ouvragesdereference', 'Recherche ISBN', 'Recherche isbn', 'RechercheISBN', 'Rechercheisbn' ),
 	'Categories'                => array( 'Catégories' ),
 	'Export'                    => array( 'Exporter', 'Exportation' ),
-	'Version'                   => array( 'Version' ),
-	'Allmessages'               => array( 'Messages_système', 'Messages_systeme', 'Messagessystème', 'Messagessysteme' ),
+	'Allmessages'               => array( 'Messages système', 'Messages systeme', 'Messagessystème', 'Messagessysteme' ),
 	'Log'                       => array( 'Journal', 'Journaux' ),
 	'Blockip'                   => array( 'Bloquer', 'Blocage' ),
 	'Undelete'                  => array( 'Restaurer', 'Restauration' ),
-	'Import'                    => array( 'Import', 'Importation' ),
-	'Lockdb'                    => array( 'Verrouiller_la_base', 'Verrouillerlabase', 'Verrouiller_base', 'Verrouillerbase', 'Verrouiller_BD', 'VerrouillerBD', 'Verrouiller_bd', 'Verrouillerbd' ),
-	'Unlockdb'                  => array( 'Déverrouiller_la_base', 'Déverrouillerlabase', 'Deverrouiller_la_base', 'Deverrouillerlabase', 'Déverrouiller_base', 'Déverrouillerbase', 'Deverrouiller_base', 'Deverrouillerbase', 'Déverrouiller_BD', 'DéverrouillerBD', 'Deverrouiller_BD', 'DeverrouillerBD', 'Déverrouiller_bd', 'Déverrouillerbd', 'Deverrouiller_bd', 'Deverrouillerbd' ),
+	'Import'                    => array( 'Importer', 'Importation' ),
+	'Lockdb'                    => array( 'Verrouiller la base', 'Verrouillerlabase', 'Verrouiller base', 'Verrouillerbase', 'Verrouiller BD', 'VerrouillerBD', 'Verrouiller bd', 'Verrouillerbd' ),
+	'Unlockdb'                  => array( 'Déverrouiller la base', 'Déverrouillerlabase', 'Deverrouiller la base', 'Deverrouillerlabase', 'Déverrouiller base', 'Déverrouillerbase', 'Deverrouiller base', 'Deverrouillerbase', 'Déverrouiller BD', 'DéverrouillerBD', 'Deverrouiller BD', 'DeverrouillerBD', 'Déverrouiller bd', 'Déverrouillerbd', 'Deverrouiller bd', 'Deverrouillerbd' ),
 	'Userrights'                => array( 'Permissions', 'Droits' ),
-	'MIMEsearch'                => array( 'Recherche_MIME', 'RechercheMIME', 'Recherche_mime', 'Recherchemime' ),
-	'FileDuplicateSearch'       => array( 'Recherche_fichier_en_double', 'RechercheFichierEnDouble' ),
-	'Unwatchedpages'            => array( 'Pages_non_suivies', 'Pagesnonsuivies' ),
-	'Listredirects'             => array( 'Liste_des_redirections', 'Listedesredirections', 'Liste_des_redirects', 'Listedesredirects', 'Liste_redirections', 'Listeredirections', 'Liste_redirects', 'Listeredirects' ),
-	'Revisiondelete'            => array( 'Versions_supprimées', 'Versions_supprimees', 'Versionsupprimées', 'Versionsupprimees' ),
-	'Unusedtemplates'           => array( 'Modèles_inutilisés', 'Modèlesinutilisés', 'Modeles_inutilises', 'Modelesinutilises', 'Modèles_non_utilisés', 'Modèlesnonutilisés', 'Modeles_non_utilises', 'Modelesnonutilises' ),
-	'Randomredirect'            => array( 'Redirection_au_hasard', 'Redirect_au_hasard', 'Redirectionauhasard', 'Redirectauhasard', 'Redirection_aléatoire', 'Redirect_aléatoire', 'Redirectionaléatoire', 'Redirectaléatoire', 'Redirection_aleatoire', 'Redirect_aleatoire', 'Redirectionaleatoire', 'Redirectaleatoire' ),
-	'Mypage'                    => array( 'Ma_page', 'Mapage' ),
-	'Mytalk'                    => array( 'Mes_discussions', 'Mesdiscussions' ),
-	'Mycontributions'           => array( 'Mes_contributions', 'Mescontributions' ),
-	'Listadmins'                => array( 'Liste_des_administrateurs', 'Listedesadministrateurs', 'Liste_des_admins', 'Listedesadmins', 'Liste_admins', 'Listeadmins' ),
-	'Listbots'                  => array( 'Liste_des_Bots', 'ListedesBots' ),
-	'Popularpages'              => array( 'Pages_les_plus_visitées', 'Pages_les_plus_visitees', 'Pageslesplusvisitées', 'Pageslesplusvisitees' ),
+	'MIMEsearch'                => array( 'Recherche MIME', 'RechercheMIME', 'Recherche mime', 'Recherchemime' ),
+	'FileDuplicateSearch'       => array( 'Recherche fichier en double', 'RechercheFichierEnDouble' ),
+	'Unwatchedpages'            => array( 'Pages non suivies', 'Pagesnonsuivies' ),
+	'Listredirects'             => array( 'Liste des redirections', 'Listedesredirections', 'Liste des redirects', 'Listedesredirects', 'Liste redirections', 'Listeredirections', 'Liste redirects', 'Listeredirects' ),
+	'Revisiondelete'            => array( 'Versions supprimées', 'Versions supprimees', 'Versionsupprimées', 'Versionsupprimees' ),
+	'Unusedtemplates'           => array( 'Modèles inutilisés', 'Modèlesinutilisés', 'Modeles inutilises', 'Modelesinutilises', 'Modèles non utilisés', 'Modèlesnonutilisés', 'Modeles non utilises', 'Modelesnonutilises' ),
+	'Randomredirect'            => array( 'Redirection au hasard', 'Redirect au hasard', 'Redirectionauhasard', 'Redirectauhasard', 'Redirection aléatoire', 'Redirect aléatoire', 'Redirectionaléatoire', 'Redirectaléatoire', 'Redirection aleatoire', 'Redirect aleatoire', 'Redirectionaleatoire', 'Redirectaleatoire' ),
+	'Mypage'                    => array( 'Ma page', 'Mapage' ),
+	'Mytalk'                    => array( 'Mes discussions', 'Mesdiscussions' ),
+	'Mycontributions'           => array( 'Mes contributions', 'Mescontributions' ),
+	'Listadmins'                => array( 'Liste des administrateurs', 'Listedesadministrateurs', 'Liste des admins', 'Listedesadmins', 'Liste admins', 'Listeadmins' ),
+	'Listbots'                  => array( 'Liste des bots', 'ListedesBots' ),
+	'Popularpages'              => array( 'Pages les plus visitées', 'Pages les plus visitees', 'Pageslesplusvisitées', 'Pageslesplusvisitees' ),
 	'Search'                    => array( 'Recherche', 'Rechercher', 'Chercher' ),
-	'Resetpass'                 => array( 'Réinitialisation_du_mot_de_passe', 'Reinitialisation_du_mot_de_passe', 'Réinitialisationdumotdepasse', 'Reinitialisationdumotdepasse' ),
-	'Withoutinterwiki'          => array( 'Sans_interwiki', 'Sansinterwiki', 'Sans_interwikis', 'Sansinterwikis' ),
-	'MergeHistory'              => array( 'Fusionner_l\'historique', 'Fusionnerlhistorique' ),
-	'Filepath'                  => array( 'Chemin_du_Fichier', 'CheminduFichier', 'CheminFichier' ),
-	'Invalidateemail'           => array( 'Invalider_Courriel', 'InvaliderCourriel' ),
+	'Resetpass'                 => array( 'Réinitialisation du mot de passe', 'Reinitialisation du mot de passe', 'Réinitialisationdumotdepasse', 'Reinitialisationdumotdepasse' ),
+	'Withoutinterwiki'          => array( 'Sans interwiki', 'Sansinterwiki', 'Sans interwikis', 'Sansinterwikis' ),
+	'MergeHistory'              => array( 'Fusionner l\'historique', 'Fusionnerlhistorique' ),
+	'Filepath'                  => array( 'Chemin du fichier', 'CheminduFichier', 'CheminFichier' ),
+	'Invalidateemail'           => array( 'Invalider courriel', 'InvaliderCourriel', 'Invalider courriel', 'Invalidercourriel' ),
+	'Blankpage'                 => array( 'PageBlanche' ),
+	'LinkSearch'                => array( 'Recherche de liens' ),
+	'DeletedContributions'      => array( 'ContributionsSupprimées', 'ContributionSupprimees' ),
 );
 
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
@@ -268,17 +326,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Masquer mes propres modifications dans la liste de suivi',
 'tog-watchlisthidebots'       => 'Masquer les modifications faites par les bots dans la liste de suivi',
 'tog-watchlisthideminor'      => 'Masquer les modifications mineures dans la liste de suivi',
+'tog-watchlisthideliu'        => 'Masquer les modifications par les utilisateurs connectés dans la liste de suivi',
+'tog-watchlisthideanons'      => 'Masquer les modifications anonymes dans la liste de suivi',
 'tog-nolangconversion'        => 'Désactiver la conversion des variantes de langue',
 'tog-ccmeonemails'            => 'M’envoyer une copie des courriels que j’envoie aux autres utilisateurs',
 'tog-diffonly'                => 'Ne pas montrer le contenu des pages sous les diffs',
 'tog-showhiddencats'          => 'Afficher les catégories cachées',
+'tog-noconvertlink'           => 'Désactiver la conversion des titres',
+'tog-norollbackdiff'          => 'Omettre le diff après l’utilisation d’un revert',
 
 'underline-always'  => 'Toujours',
 'underline-never'   => 'Jamais',
 'underline-default' => 'Selon le navigateur',
 
-'skinpreview' => '(Prévisualiser)',
-
 # Dates
 'sunday'        => 'dimanche',
 'monday'        => 'lundi',
@@ -372,19 +432,19 @@ $messages = array(
 'mytalk'         => 'Page de discussion',
 'anontalk'       => 'Discussion avec cette adresse IP',
 'navigation'     => 'Navigation',
-'and'            => 'et',
+'and'            => '&#32;et',
 
 # Metadata in edit box
 'metadata_help' => 'Métadonnées :',
 
-'errorpagetitle'    => 'Erreur de titre',
+'errorpagetitle'    => 'Erreur',
 'returnto'          => 'Revenir à la page $1.',
 'tagline'           => 'De {{SITENAME}}.',
 'help'              => 'Aide',
 'search'            => 'Rechercher',
 'searchbutton'      => 'Rechercher',
 'go'                => 'Consulter',
-'searcharticle'     => 'Consulter',
+'searcharticle'     => 'Lire',
 'history'           => 'Historique de la page',
 'history_short'     => 'Historique',
 'updatedmarker'     => 'modifié depuis ma dernière visite',
@@ -409,14 +469,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discuter',
 'specialpage'       => 'Page spéciale',
 'personaltools'     => 'Outils personnels',
-'postcomment'       => 'Ajouter un commentaire',
+'postcomment'       => 'Nouvelle section',
 'articlepage'       => 'Voir la page de contenu',
 'talk'              => 'Discussion',
 'views'             => 'Affichages',
 'toolbox'           => 'Boîte à outils',
 'userpage'          => 'Page utilisateur',
 'projectpage'       => 'Page méta',
-'imagepage'         => 'Page image',
+'imagepage'         => 'Voir la page du fichier',
 'mediawikipage'     => 'Voir la page des messages',
 'templatepage'      => 'Voir la page du modèle',
 'viewhelppage'      => 'Voir la page d’aide',
@@ -430,13 +490,11 @@ $messages = array(
 'protectedpage'     => 'Page protégée',
 'jumpto'            => 'Aller à :',
 'jumptonavigation'  => 'Navigation',
-'jumptosearch'      => 'Rechercher',
+'jumptosearch'      => 'rechercher',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'À propos de {{SITENAME}}',
 'aboutpage'            => 'Project:À propos',
-'bugreports'           => 'Rapport d’erreurs',
-'bugreportspage'       => 'Project:Rapport d’erreurs',
 'copyright'            => 'Contenu disponible sous $1.',
 'copyrightpagename'    => 'licence {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyrights',
@@ -459,9 +517,7 @@ $messages = array(
 
 'badaccess'        => 'Erreur de permission',
 'badaccess-group0' => 'Vous n’avez pas les droits suffisants pour réaliser l’action que vous demandez.',
-'badaccess-group1' => 'L’action que vous essayez de réaliser n’est accessible qu’aux utilisateurs du groupe $1.',
-'badaccess-group2' => 'L’action que vous essayez de réaliser n’est accessible qu’aux utilisateurs des groupes $1.',
-'badaccess-groups' => 'L’action que vous essayez de réaliser n’est accessible qu’aux utilisateurs des groupes $1.',
+'badaccess-groups' => 'L’action que vous essayez de réaliser n’est accessible qu’aux utilisateurs {{PLURAL:$2|du groupe|des groupes}} : $1.',
 
 'versionrequired'     => 'Version $1 de MediaWiki nécessaire',
 'versionrequiredtext' => 'La version $1 de MediaWiki est nécessaire pour utiliser cette page. Consultez [[Special:Version|la page des versions]]',
@@ -475,6 +531,8 @@ $messages = array(
 'editsection'             => 'modifier',
 'editold'                 => 'modifier',
 'viewsourceold'           => 'voir la source',
+'editlink'                => 'modifier',
+'viewsourcelink'          => 'voir la source',
 'editsectionhint'         => 'Modifier la section : $1',
 'toc'                     => 'Sommaire',
 'showtoc'                 => 'afficher',
@@ -489,13 +547,13 @@ $messages = array(
 'site-atom-feed'          => 'Flux Atom de $1',
 'page-rss-feed'           => 'Flux RSS de « $1 »',
 'page-atom-feed'          => 'Flux Atom de « $1 »',
-'red-link-title'          => '$1 (page inexistante)',
+'red-link-title'          => '$1 (la page n’existe pas)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Page',
 'nstab-user'      => 'Page utilisateur',
 'nstab-media'     => 'Média',
-'nstab-special'   => 'Spécial',
+'nstab-special'   => 'Page spéciale',
 'nstab-project'   => 'À propos',
 'nstab-image'     => 'Fichier',
 'nstab-mediawiki' => 'Message',
@@ -505,7 +563,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Action inconnue',
-'nosuchactiontext'  => 'L’action spécifiée dans l’URL n’est pas reconnue par le wiki.',
+'nosuchactiontext'  => 'L’action spécifiée dans l’URL est invalide.
+Vous avez peut-être mal entré l’URL ou suivi un lien incorrect.
+Ceci peut également indiquer dans le logiciel utilisé par {{SITENAME}}.',
 'nosuchspecialpage' => 'Page spéciale inexistante',
 'nospecialpagetext' => "<big>'''Vous avez demandé une page spéciale non reconnue par ce wiki.'''</big>
 
@@ -555,7 +615,6 @@ Veuillez en faire part à un [[Special:ListUsers/sysop|administrateur]] et lui n
 'cannotdelete'         => 'Impossible de supprimer la page ou le fichier indiqué. (La suppression a peut-être déjà été effectuée par quelqu’un d’autre.)',
 'badtitle'             => 'Mauvais titre',
 'badtitletext'         => 'Le titre de la page demandée est invalide, vide, ou il s’agit d’un titre inter-langue ou inter-projet mal lié. Il contient peut-être un ou plusieurs caractères qui ne peuvent pas être utilisés dans les titres.',
-'perfdisabled'         => 'Désolé ! Cette fonctionnalité est temporairement désactivée car elle ralentit la base de données à tel point que plus personne ne peut utiliser le wiki.',
 'perfcached'           => 'Ceci est une version en cache et n’est peut-être pas à jour.',
 'perfcachedts'         => 'Les données suivantes sont en cache, elles ne sont donc pas obligatoirement à jour. La dernière actualisation date du $1.',
 'querypage-no-updates' => 'Les mises à jour pour cette page sont actuellement désactivées. Les données ci-dessous ne sont pas mises à jour.',
@@ -569,7 +628,7 @@ Requête : $2',
 'protectedpagetext'    => 'Cette page a été protégée pour empêcher sa modification.',
 'viewsourcetext'       => 'Vous pouvez voir et copier le contenu de la page pour pouvoir travailler dessus :',
 'protectedinterface'   => 'Cette page fournit du texte d’interface pour le logiciel et est protégée pour éviter les abus.',
-'editinginterface'     => "'''Attention :''' vous êtes en train d’éditer une page utilisée pour créer le texte de l’interface du logiciel. Les changements se répercuteront, selon le contexte, sur toutes ou certaines pages visibles par les autres utilisateurs. Pour les traductions, nous vous invitons à utiliser le projet MediaWiki d’internationalisation des messages [http://translatewiki.net/wiki/Main_Page?setlang=fr Betawiki].",
+'editinginterface'     => "'''Attention :''' vous êtes en train d’éditer une page utilisée pour créer le texte de l’interface du logiciel. Les changements se répercuteront, selon le contexte, sur toutes ou certaines pages visibles par les autres utilisateurs. Pour les traductions, nous vous invitons à utiliser le projet MediaWiki d’internationalisation des messages [http://translatewiki.net/wiki/Main_Page?setlang=fr translatewiki.net].",
 'sqlhidden'            => '(Requête SQL cachée)',
 'cascadeprotected'     => 'Cette page est actuellement protégée car incluse dans {{PLURAL:$1|la page suivante|les pages suivantes}}, ayant été protégée{{PLURAL:$1||s}} avec l’option « protection en cascade » activée :
 $2',
@@ -580,7 +639,7 @@ $2',
 Le motif avancé est « ''$2'' ».",
 
 # Virus scanner
-'virus-badscanner'     => 'Mauvaise configuration : scanneur de virus inconnu : <i>$1</i>',
+'virus-badscanner'     => "Mauvaise configuration : scanneur de virus inconnu : ''$1''",
 'virus-scanfailed'     => 'Échec de la recherche (code $1)',
 'virus-unknownscanner' => 'antivirus inconnu :',
 
@@ -596,10 +655,9 @@ N’oubliez pas de personnaliser vos [[Special:Preferences|préférences sur {{S
 'yourname'                   => 'Votre nom d’utilisateur :',
 'yourpassword'               => 'Votre mot de passe :',
 'yourpasswordagain'          => 'Entrez à nouveau votre mot de passe :',
-'remembermypassword'         => 'Se souvenir de mon mot de passe (témoin (cookie))',
+'remembermypassword'         => 'Me reconnecter automatiquement à la prochaine visite (cookie)',
 'yourdomainname'             => 'Votre domaine',
 'externaldberror'            => 'Soit une erreur s’est produite avec la base de données d’authentification externe, soit vous n’êtes pas autorisé à mettre à jour votre compte externe.',
-'loginproblem'               => '<b>Problème d’identification.</b><br />Essayez à nouveau !',
 'login'                      => 'Identification',
 'nav-login-createaccount'    => 'Créer un compte ou se connecter',
 'loginprompt'                => "Vous devez activer les témoins (''cookies'') pour vous connecter à {{SITENAME}}.",
@@ -626,7 +684,8 @@ Veuillez en choisir un autre.',
 'yournick'                   => 'Signature pour les discussions :',
 'badsig'                     => 'Signature brute incorrecte.
 Vérifiez vos balises HTML.',
-'badsiglength'               => 'Votre signature est trop longue : la taille maximale est de $1 caractère{{PLURAL:$1||s}}.',
+'badsiglength'               => 'Votre signature est trop longue.
+Elle doit avoir moins de $1 caractère{{PLURAL:$1||s}}.',
 'email'                      => 'Courriel',
 'prefs-help-realname'        => '(facultatif) : si vous le spécifiez, il sera utilisé pour vous attribuer vos contributions.',
 'loginerror'                 => 'Erreur d’identification',
@@ -637,8 +696,9 @@ Vérifiez vos balises HTML.',
 'noname'                     => 'Vous n’avez pas saisi un nom d’utilisateur valide.',
 'loginsuccesstitle'          => 'Identification réussie',
 'loginsuccess'               => 'Vous êtes maintenant connecté(e) à {{SITENAME}} en tant que « $1 ».',
-'nosuchuser'                 => 'L’utilisateur « $1 » n’existe pas.
-Vérifiez que vous avez bien orthographié le nom, ou [[Special:UserLogin/signup|créez-vous un nouveau compte]].',
+'nosuchuser'                 => "L’utilisateur « $1 » n’existe pas.
+Le nom d'utilisateur est sensible à la casse.
+Vérifiez que vous avez bien orthographié le nom, ou [[Special:UserLogin/signup|créez-vous un nouveau compte]].",
 'nosuchusershort'            => 'Il n’y a pas de contributeur avec le nom « <nowiki>$1</nowiki> ». Veuillez vérifier l’orthographe.',
 'nouserspecified'            => 'Vous devez saisir un nom d’utilisateur.',
 'wrongpassword'              => 'Le mot de passe est incorrect. Veuillez essayer à nouveau.',
@@ -661,10 +721,11 @@ pouvez ignorer ce message et continuer à utiliser votre ancien mot de passe.',
 Avant qu’un autre courriel ne soit envoyé à ce compte, vous devrez suivre les instructions du courriel et confirmer que le compte est bien le vôtre.',
 'throttled-mailpassword'     => 'Un courriel de rappel de votre mot de passe a déjà été envoyé durant {{PLURAL:$1|la dernière heure|les $1 dernières heures}}. Afin d’éviter les abus, un seul courriel de rappel sera envoyé par {{PLURAL:$1|heure|intervalle de $1 heures}}.',
 'mailerror'                  => 'Erreur en envoyant le courriel : $1',
-'acct_creation_throttle_hit' => 'Désolé, vous avez déjà créé {{PLURAL:$1|$1 compte|$1 comptes}}. Vous ne pouvez pas en créer de nouveaux.',
-'emailauthenticated'         => 'Votre adresse de courriel a été authentifiée le $1.',
+'acct_creation_throttle_hit' => 'Des visiteurs de ce wiki utilisant votre adresse IP ont crée $1 {{PLURAL:$1|compte|comptes}} le jour dernier, qui est la limite maximum autorisée durant cette période.
+De ce fait les visiteurs utilisant cette adresse IP ne peuvent plus en créer de nouveaux compte pour le moment.',
+'emailauthenticated'         => 'Votre adresse de courriel a été authentifiée le $2 à $3.',
 'emailnotauthenticated'      => 'Votre adresse de courriel n’est <strong>pas encore authentifiée</strong>. Aucun courriel ne sera envoyé pour chacune des fonctions suivantes.',
-'noemailprefs'               => '<strong>Aucune adresse électronique n’a été indiquée,</strong> les fonctions suivantes ne seront pas disponibles.',
+'noemailprefs'               => 'Indiquez une adresse de courriel dans vos préférences pour utiliser ces fonctions.',
 'emailconfirmlink'           => 'Confirmez votre adresse de courriel',
 'invalidemailaddress'        => 'Cette adresse courriel ne peut pas être acceptée car elle semble avoir un format incorrect.
 Entrez une adresse bien formatée ou laisser ce champ vide.',
@@ -674,18 +735,26 @@ Entrez une adresse bien formatée ou laisser ce champ vide.',
 'createaccount-text'         => "Quelqu'un a créé un compte pour votre adresse courriel sur {{SITENAME}} ($4) intitulé « $2 », avec pour mot de passe « $3 ».Vous devriez ouvrir une session et changer, dès à présent, ce mot de passe.
 
 Ignorez ce message si ce compte a été créé par erreur.",
+'login-throttled'            => 'Vous avez fait trop de tentavives de mots de passe sur ce compte. Veuillez attendre avant d’essayer à nouveau.',
 'loginlanguagelabel'         => 'Langue : $1',
 
 # Password reset dialog
-'resetpass'               => 'Remise à zéro du mot de passe',
-'resetpass_announce'      => 'Vous vous êtes enregistré avec un mot de passe temporaire envoyé par courriel. Pour terminer l’enregistrement, vous devez entrer un nouveau mot de passe ici :',
-'resetpass_text'          => '<!-- Ajoutez le texte ici -->',
-'resetpass_header'        => 'Modifier le mot de passe du compte',
-'resetpass_submit'        => 'Changer le mot de passe et s’enregistrer',
-'resetpass_success'       => 'Votre mot de passe a été changé avec succès ! Enregistrement en cours...',
-'resetpass_bad_temporary' => 'Mot de passe temporaire invalide. Vous avez peut-être déjà changé votre mot de passe avec succès, ou demandé un nouveau mot de passe temporaire.',
-'resetpass_forbidden'     => 'Les mots de passe ne peuvent pas être changés',
-'resetpass_missing'       => 'Aucune donnée entrée',
+'resetpass'                 => 'Changer le mot de passe',
+'resetpass_announce'        => 'Vous vous êtes enregistré avec un mot de passe temporaire envoyé par courriel. Pour terminer l’enregistrement, vous devez entrer un nouveau mot de passe ici :',
+'resetpass_text'            => '<!-- Ajoutez le texte ici -->',
+'resetpass_header'          => 'Modifier le mot de passe du compte',
+'oldpassword'               => 'Ancien mot de passe :',
+'newpassword'               => 'Nouveau mot de passe :',
+'retypenew'                 => 'Confirmer le nouveau mot de passe :',
+'resetpass_submit'          => 'Changer le mot de passe et s’enregistrer',
+'resetpass_success'         => 'Votre mot de passe a été changé avec succès ! Enregistrement en cours...',
+'resetpass_bad_temporary'   => 'Mot de passe temporaire invalide. Vous avez peut-être déjà changé votre mot de passe avec succès, ou demandé un nouveau mot de passe temporaire.',
+'resetpass_forbidden'       => 'Les mots de passe ne peuvent pas être changés',
+'resetpass-no-info'         => 'Vous devez être connecté pour avoir accès à cette page.',
+'resetpass-submit-loggedin' => 'Modifier le mot de passe',
+'resetpass-wrong-oldpass'   => 'Mot de passe actuel ou temporaire invalide.
+Vous avez peut-être déjà modifié votre mot de passe ou demandé un nouveau mot de passe temporaire.',
+'resetpass-temp-password'   => 'Mot de passe temporaire :',
 
 # Edit page toolbar
 'bold_sample'     => 'Texte gras',
@@ -710,8 +779,8 @@ Ignorez ce message si ce compte a été créé par erreur.",
 'hr_tip'          => 'Ligne horizontale (ne pas en abuser)',
 
 # Edit pages
-'summary'                          => 'Résumé',
-'subject'                          => 'Sujet/titre',
+'summary'                          => 'Résumé :',
+'subject'                          => 'Sujet / titre :',
 'minoredit'                        => 'Modification mineure',
 'watchthis'                        => 'Suivre cette page',
 'savearticle'                      => 'Publier',
@@ -725,8 +794,8 @@ Si vous cliquez de nouveau sur le bouton « Publier », la publication sera fait
 'missingcommenttext'               => 'Veuillez faire votre commentaire ci-dessous.',
 'missingcommentheader'             => "'''Rappel :''' vous n’avez pas fourni de sujet/titre à ce commentaire.
 Si vous cliquez à nouveau sur « Publier », votre édition sera enregistrée sans titre.",
-'summary-preview'                  => 'Prévisualiser le résumé',
-'subject-preview'                  => 'Prévisualisation du sujet/titre',
+'summary-preview'                  => 'Prévisualiser le résumé :',
+'subject-preview'                  => 'Prévisualisation du sujet/titre :',
 'blockedtitle'                     => 'L’utilisateur est bloqué.',
 'blockedtext'                      => "<big>'''Votre compte utilisateur ou votre adresse IP a été bloqué.'''</big>
 
@@ -776,7 +845,7 @@ Puisqu’il n’y a pas de section $1, il n’y a pas d’endroit où publier vo
 Pour créer cette page, entrez votre texte dans la boîte ci-dessous (vous pouvez consulter [[{{MediaWiki:Helppage}}|la page d’aide]] pour plus d’informations).
 Si vous êtes arrivé ici par erreur, cliquez sur le bouton '''retour''' de votre navigateur.",
 'anontalkpagetext'                 => "---- ''Vous êtes sur la page de discussion d’un utilisateur anonyme qui n’a pas encore créé de compte ou qui n’en utilise pas. Pour cette raison, nous devons utiliser son adresse IP pour l’identifier. Une adresse IP peut être partagée par plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:UserLogin/signup|créer un compte]] ou [[Special:UserLogin|vous connecter]] afin d’éviter toute confusion future avec d’autres contributeurs anonymes.''",
-'noarticletext'                    => 'Il n’y a pour l’instant aucun texte sur cette page ; vous pouvez [[Special:Search/{{PAGENAME}}|lancer une recherche sur ce titre de page]], vérifier qu’elle n’a pas été [{{fullurl:Special:Log|type=delete&page={{FULLPAGENAMEE}}}} supprimée] ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} créer cette page].',
+'noarticletext'                    => 'Il n’y a pour l’instant aucun texte sur cette page ; vous pouvez [[Special:Search/{{PAGENAME}}|lancer une recherche de ce titre de page]] dans les autres pages, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} rechercher dans les opérations liées] ou [{{fullurl:{{urlencode:{{FULLPAGENAME}}}}|action=edit}} créer cette page]</span>.',
 'userpage-userdoesnotexist'        => 'Le compte utilisateur « $1 » n’est pas enregistré. Veuillez vérifier que vous voulez créer cette page.',
 'clearyourcache'                   => "'''Note :''' après avoir enregistré vos préférences, vous devrez forcer son rechargement complet en ignorant le contenu actuel du cache de votre explorateur pour voir les changements : '''Mozilla / Firefox / Konqueror / Safari :''' maintenez la touche ''Majuscule'' (''Shift'') en cliquant le bouton ''Actualiser'' (''Reload,'') ou pressez ''Maj-Ctrl-R'' (''Maj-Cmd-R'' sur Apple Mac) ; '''Internet Explorer / Opera :''' maintenez la touche ''Ctrl'' en cliquant le bouton ''Actualiser'' ou pressez ''Ctrl-F5''.",
 'usercssjsyoucanpreview'           => "'''Astuce :''' utilisez le bouton « Prévisualisation » pour tester votre nouvelle feuille CSS/JS avant de l’enregistrer.",
@@ -785,45 +854,47 @@ Si vous êtes arrivé ici par erreur, cliquez sur le bouton '''retour''' de votr
 'userjspreview'                    => "'''Rappelez-vous que vous êtes en train de visualiser ou de tester votre code JavaScript et qu’il n’a pas encore été enregistré !'''",
 'userinvalidcssjstitle'            => "'''Attention :''' il n’existe pas de style « $1 ». Rappelez-vous que les pages personnelles avec extensions .css et .js utilisent des titres en minuscules, par exemple {{ns:user}}:Foo/monobook.css et non {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Mis à jour)',
-'note'                             => '<strong>Note :</strong>',
-'previewnote'                      => '<strong>Attention, ce texte n’est qu’une prévisualisation et n’a pas encore été publié !</strong>',
+'note'                             => "'''Note :'''",
+'previewnote'                      => "'''Attention, ce texte n’est qu’une prévisualisation et n’a pas encore été publié !'''",
 'previewconflict'                  => 'Cette prévisualisation montre le texte de la boîte supérieure de modification tel qu’il apparaîtra si vous choisissez de le publier.',
-'session_fail_preview'             => '<strong>Nous ne pouvons enregistrer votre modification à cause d’une perte d’informations concernant votre session.
+'session_fail_preview'             => "'''Nous ne pouvons enregistrer votre modification à cause d’une perte d’informations concernant votre session.
 Veuillez réessayer.
-Si cela échoue à nouveau, essayez de vous déconnecter, puis connectez-vous à nouveau.</strong>',
-'session_fail_preview_html'        => "<strong>Nous ne pouvons enregistrer votre modification à cause d’une perte d’informations concernant votre session.</strong>
+Si cela échoue à nouveau, essayez de vous déconnecter, puis connectez-vous à nouveau.'''",
+'session_fail_preview_html'        => "'''Nous ne pouvons enregistrer votre modification à cause d’une perte d’informations concernant votre session.'''
 
 ''Parce que {{SITENAME}} a activé l’HTML brut, la prévisualisation a été masquée afin de prévenir une attaque par JavaScript.''
 
-<strong>Si la tentative de modification était légitime, veuillez réessayer.
-Si cela échoue à nouveau, déconnectez-vous, puis reconnectez-vous.</strong>",
-'token_suffix_mismatch'            => '<strong>Votre modification n’a pas été acceptée car votre navigateur Web a mélangé les caractères de ponctuation dans l’identifiant d’édition. La modification a été rejetée afin d’empêcher la corruption du texte de la page. Ce problème se produit lorsque vous utilisez un mandataire anonyme problématique.</strong>',
+'''Si la tentative de modification était légitime, veuillez réessayer.
+Si cela échoue à nouveau, déconnectez-vous, puis reconnectez-vous.'''",
+'token_suffix_mismatch'            => "'''Votre modification n’a pas été acceptée car votre navigateur Web a mélangé les caractères de ponctuation dans l’identifiant d’édition. La modification a été rejetée afin d’empêcher la corruption du texte de la page. Ce problème se produit lorsque vous utilisez un mandataire anonyme problématique.'''",
 'editing'                          => 'Modification de $1',
 'editingsection'                   => 'Modification de $1 (section)',
-'editingcomment'                   => 'Modification de $1 (commentaire)',
+'editingcomment'                   => 'Modification de $1 (nouvelle section)',
 'editconflict'                     => 'Conflit de modification : $1',
 'explainconflict'                  => '<b>Cette page a été sauvegardée après que vous avez commencé à la modifier. La zone de modification supérieure contient le texte tel qu’il est enregistré actuellement dans la base de données. Vos modifications apparaissent dans la zone de modification inférieure. Vous allez devoir apporter vos modifications au texte existant. Seul le texte de la zone supérieure sera sauvegardé.</b><br />',
 'yourtext'                         => 'Votre texte',
 'storedversion'                    => 'Version enregistrée',
-'nonunicodebrowser'                => '<strong>Attention : Votre navigateur ne supporte pas l’Unicode. Une solution temporaire a été trouvée pour vous permettre de modifier en toute sûreté une page : les caractères non-ASCII apparaîtront dans votre boîte de modification en tant que codes hexadécimaux. Vous devriez utiliser un navigateur plus récent.</strong>',
-'editingold'                       => '<strong>Attention : vous êtes en train de modifier une ancienne version de cette page.
-Si vous la publiez, toutes les modifications effectuées depuis cette version seront perdues.</strong>',
+'nonunicodebrowser'                => "'''Attention : Votre navigateur ne supporte pas l’Unicode. Une solution temporaire a été trouvée pour vous permettre de modifier en toute sûreté une page : les caractères non-ASCII apparaîtront dans votre boîte de modification en tant que codes hexadécimaux. Vous devriez utiliser un navigateur plus récent.'''",
+'editingold'                       => "'''Attention : vous êtes en train de modifier une ancienne version de cette page.
+Si vous la publiez, toutes les modifications effectuées depuis cette version seront perdues.'''",
 'yourdiff'                         => 'Différences',
-'copyrightwarning'                 => 'Toutes les contributions à {{SITENAME}} sont considérées comme publiées sous les termes de la $2 (voir $1 pour plus de détails). Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
-Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l’avez copié d’une source provenant du domaine public, ou d’une ressource libre. <strong>N’UTILISEZ PAS DE TRAVAUX SOUS DROIT D’AUTEUR SANS AUTORISATION EXPRESSE !</strong>',
-'copyrightwarning2'                => 'Toutes les contributions à {{SITENAME}} peuvent être modifiées ou supprimées par d’autres utilisateurs. Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
+'copyrightwarning'                 => "Toutes les contributions à {{SITENAME}} sont considérées comme publiées sous les termes de la $2 (voir $1 pour plus de détails). Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
+Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l’avez copié d’une source provenant du domaine public, ou d’une ressource libre. '''N’UTILISEZ PAS DE TRAVAUX SOUS DROIT D’AUTEUR SANS AUTORISATION EXPRESSE !'''",
+'copyrightwarning2'                => "Toutes les contributions à {{SITENAME}} peuvent être modifiées ou supprimées par d’autres utilisateurs. Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
 Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l’avez copié d’une source provenant du domaine public, ou d’une ressource libre. (voir $1 pour plus de détails).
-<strong>N’UTILISEZ PAS DE TRAVAUX SOUS DROIT D’AUTEUR SANS AUTORISATION EXPRESSE !</strong>',
+'''N’UTILISEZ PAS DE TRAVAUX SOUS DROIT D’AUTEUR SANS AUTORISATION EXPRESSE !'''",
 'longpagewarning'                  => "'''AVERTISSEMENT : cette page a une longueur de $1 Kio ;
 certains navigateurs Web gèrent mal la modification des pages approchant ou dépassant 32 Kio. Peut-être devriez-vous diviser la page en sections plus petites.'''",
-'longpageerror'                    => '<strong>ERREUR : Le texte que vous avez soumis fait $1 Kio, ce qui dépasse la limite fixée à $2 Kio. Le texte ne peut pas être sauvegardé.</strong>',
-'readonlywarning'                  => "'''AVERTISSEMENT : La base de données a été verrouillée pour maintenance,
-vous ne pourrez donc pas publier vos modifications maintenant. Vous pouvez copier le texte dans un fichier texte et le publier pour plus tard.'''",
+'longpageerror'                    => "'''ERREUR : Le texte que vous avez soumis fait $1 Kio, ce qui dépasse la limite fixée à $2 Kio. Le texte ne peut pas être sauvegardé.'''",
+'readonlywarning'                  => "'''AVERTISSEMENT : La base de données a été verrouillée pour maintenance, vous ne pourrez donc pas publier vos modifications maintenant.
+Vous pouvez copier le texte dans un fichier texte et le publier pour plus tard.'''
+
+L’administrateur ayant verrouillé la base de données a donné l’explication suivante : $1",
 'protectedpagewarning'             => "'''AVERTISSEMENT : cette page est protégée.
 Seuls les utilisateurs ayant le statut d’administrateur peuvent la modifier.'''",
 'semiprotectedpagewarning'         => "'''Note :''' Cette page a été protégée de telle façon que seuls les contributeurs enregistrés puissent la modifier.",
 'cascadeprotectedwarning'          => "'''ATTENTION :''' Cette page a été protégée de manière à ce que seuls les administrateurs puissent l’éditer. Cette protection a été faite car cette page est incluse dans {{PLURAL:$1|une page protégée|des pages protégées}} avec la « protection en cascade » activée.",
-'titleprotectedwarning'            => '<strong>ATTENTION : Cette page a été protégée de telle manière que seuls certains utilisateurs puissent la créer.</strong>',
+'titleprotectedwarning'            => "'''ATTENTION : Cette page a été protégée de telle manière que des [[Special:ListGroupRights|droits spécifiques]] sont requis pour pouvoir la créer.'''",
 'templatesused'                    => 'Modèles utilisés sur cette page :',
 'templatesusedpreview'             => 'Modèles utilisés dans cette prévisualisation :',
 'templatesusedsection'             => 'Modèles utilisés dans cette section :',
@@ -840,16 +911,29 @@ Seuls les utilisateurs ayant le statut d’administrateur peuvent la modifier.''
 'recreate-deleted-warn'            => "'''Attention : vous êtes en train de recréer une page qui a été précédemment supprimée.'''
 
 Demandez-vous s’il est réellement approprié de la recréer en vous référant à l’historique des suppressions affiché ci-dessous :",
+'deleted-notice'                   => "Cette page a été supprimée.
+L'historique des suppressions est affiché ci-dessous pour référence.",
+'deletelog-fulllog'                => "Voir l'historique complet",
+'edit-hook-aborted'                => 'Échec de la modification par une extension.
+Cause inconnue',
+'edit-gone-missing'                => 'N’a pas pu mettre à jour la page.
+Il semble qu’elle ait été supprimée.',
+'edit-conflict'                    => 'Modifier le conflit.',
+'edit-no-change'                   => 'Votre modification a été ignorée car aucun changement n’a été fait au texte.',
+'edit-already-exists'              => 'N’a pas pu créer une nouvelle page.
+Elle existe déjà.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Attention : Cette page contient trop d’appels dispendieux de fonctions parseurs.
+'expensive-parserfunction-warning'        => 'Attention : cette page contient de trop nombreux appels à des fonctions coûteuses du parseur.
 
-Il devrait en avoir moins de $2 sur le nombre actuel $1.',
+Il devrait y avoir moins de $2 appel{{PLURAL:$2||s}}, alors qu’il y en a maintenant $1.',
 'expensive-parserfunction-category'       => 'Pages avec trop d’appels dispendieux de fonctions parseurs',
 'post-expand-template-inclusion-warning'  => "Attention : Cette page contient trop d'inclusions de modèles. Certaines inclusions ne seront pas effectuées.",
 'post-expand-template-inclusion-category' => "Pages contenant trop d'inclusions de modèles",
 'post-expand-template-argument-warning'   => "Attention : Cette page contient au moins un paramètre de modèle dont l'inclusion est rendue impossible. Après extension, celui-ci aurait produit un résultat trop long, il n'a donc pas été inclut",
 'post-expand-template-argument-category'  => 'Pages contenant au moins un paramètre de modèle non évalué',
+'parser-template-loop-warning'            => 'Modèle en boucle détecté : [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limite de longueur de la récursion du modèle dépassée ($1)',
 
 # "Undo" feature
 'undo-success' => 'Cette modification va être défaite. Veuillez confirmer les changements (visibles en bas de cette page), puis publier si vous êtes d’accord. Merci de motiver l’annulation dans la boîte de résumé.',
@@ -864,27 +948,27 @@ Il devrait en avoir moins de $2 sur le nombre actuel $1.',
 La raison donnée par $3 était ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Voir les opérations sur cette page',
-'nohistory'           => 'Il n’existe pas d’historique pour cette page.',
-'revnotfound'         => 'Version introuvable',
-'revnotfoundtext'     => 'La version précédente de cette page n’a pas pu être retrouvée. Veuillez vérifier l’URL que vous avez utilisée pour accéder à cette page.',
-'currentrev'          => 'Version actuelle',
-'revisionasof'        => 'Version du $1',
-'revision-info'       => 'Version du $1 par $2',
-'previousrevision'    => '� Version précédente',
-'nextrevision'        => 'Version suivante →',
-'currentrevisionlink' => 'Voir la version courante',
-'cur'                 => 'actu',
-'next'                => 'suiv',
-'last'                => 'diff',
-'page_first'          => 'première',
-'page_last'           => 'dernier',
-'histlegend'          => 'Légende : ({{MediaWiki:Cur}}) = différence avec la version actuelle, ({{MediaWiki:Last}}) = différence avec la version précédente, <b>m</b> = modification mineure',
-'deletedrev'          => '[supprimé]',
-'histfirst'           => 'toute première',
-'histlast'            => 'toute dernière',
-'historysize'         => '({{PLURAL:$1|$1 octet|$1 octets}})',
-'historyempty'        => '(vide)',
+'viewpagelogs'           => 'Voir les opérations sur cette page',
+'nohistory'              => 'Il n’existe pas d’historique pour cette page.',
+'currentrev'             => 'Version actuelle',
+'currentrev-asof'        => 'Version actuelle en date du $1',
+'revisionasof'           => 'Version du $1',
+'revision-info'          => 'Version du $1 par $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Version précédente',
+'nextrevision'           => 'Version suivante →',
+'currentrevisionlink'    => 'Voir la version courante',
+'cur'                    => 'actu',
+'next'                   => 'suivant',
+'last'                   => 'diff',
+'page_first'             => 'première',
+'page_last'              => 'dernier',
+'histlegend'             => 'Légende : ({{MediaWiki:Cur}}) = différence avec la version actuelle, ({{MediaWiki:Last}}) = différence avec la version précédente, <b>m</b> = modification mineure',
+'history-fieldset-title' => "Naviguer dans l'historique",
+'deletedrev'             => '[supprimé]',
+'histfirst'              => 'toute première',
+'histlast'               => 'toute dernière',
+'historysize'            => '({{PLURAL:$1|$1 octet|$1 octets}})',
+'historyempty'           => '(vide)',
 
 # Revision feed
 'history-feed-title'          => 'Historique des versions',
@@ -961,6 +1045,7 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'mergehistory-invalid-destination' => 'La page de destination doit avoir un titre valide.',
 'mergehistory-autocomment'         => '[[:$1]] fusionné avec [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fusionné avec [[:$2]] : $3',
+'mergehistory-same-destination'    => "Les pages d'origine et de destination ne peuvent pas être la même",
 
 # Merge log
 'mergelog'           => 'Historique des fusions',
@@ -973,120 +1058,201 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'difference'              => '(Différences entre les versions)',
 'lineno'                  => 'Ligne $1 :',
 'compareselectedversions' => 'Comparer les versions sélectionnées',
+'visualcomparison'        => 'Comparaison visuelle',
+'wikicodecomparison'      => 'Comparaison du wikitexte',
 'editundo'                => 'défaire',
 'diff-multi'              => '({{PLURAL:$1|Une révision intermédiaire masquée|$1 révisions intermédiaires masquées}})',
+'diff-movedto'            => 'déplacé vers $1',
+'diff-styleadded'         => 'style $1 ajouté',
+'diff-added'              => '$1 ajouté',
+'diff-changedto'          => 'changé vers $1',
+'diff-movedoutof'         => 'déplacé hors de $1',
+'diff-styleremoved'       => 'style $1 retiré',
+'diff-removed'            => '$1 retiré',
+'diff-changedfrom'        => 'changé depuis $1',
+'diff-src'                => 'source',
+'diff-withdestination'    => 'avec la destination $1',
+'diff-with'               => '&#32;avec $1 $2',
+'diff-with-final'         => '&#32;et $1 $2',
+'diff-width'              => 'largeur',
+'diff-height'             => 'hauteur',
+'diff-p'                  => "un '''paragraphe'''",
+'diff-blockquote'         => "une '''citation'''",
+'diff-h1'                 => "une '''en-tête (niveau 1)'''",
+'diff-h2'                 => "une '''en-tête (niveau 2)'''",
+'diff-h3'                 => "une '''en-tête (niveau 3)'''",
+'diff-h4'                 => "une '''en-tête (niveau 5)'''",
+'diff-h5'                 => "une '''en-tête (niveau 5)'''",
+'diff-pre'                => "un '''bloc préformaté'''",
+'diff-div'                => "une '''division'''",
+'diff-ul'                 => "une '''liste non ordonnée'''",
+'diff-ol'                 => "une '''liste ordonnée'''",
+'diff-li'                 => "une '''liste d’articles'''",
+'diff-table'              => "un '''tableau'''",
+'diff-tbody'              => "un '''contenu d’un tableau'''",
+'diff-tr'                 => "une '''ligne'''",
+'diff-td'                 => "une '''cellule'''",
+'diff-th'                 => "une '''en-tête'''",
+'diff-br'                 => "une '''cassure'''",
+'diff-hr'                 => "une '''règle horizontale'''",
+'diff-code'               => "un '''bloc de code d’ordinateur'''",
+'diff-dl'                 => "une '''liste de définition'''",
+'diff-dt'                 => "un '''terme de définition'''",
+'diff-dd'                 => "une '''définition'''",
+'diff-input'              => "une '''entrée'''",
+'diff-form'               => "un '''formulaire'''",
+'diff-img'                => "une '''image'''",
+'diff-span'               => "une '''portée'''",
+'diff-a'                  => "un '''lien'''",
+'diff-i'                  => "'''italique'''",
+'diff-b'                  => "'''gras'''",
+'diff-strong'             => "'''fort'''",
+'diff-em'                 => "'''emphase'''",
+'diff-font'               => "'''police'''",
+'diff-big'                => "'''grand'''",
+'diff-del'                => "'''supprimé'''",
+'diff-tt'                 => "'''largeur fixée'''",
+'diff-sub'                => "'''sous-script'''",
+'diff-sup'                => "'''sur-script'''",
+'diff-strike'             => "'''barré au travers'''",
 
 # Search results
-'searchresults'             => 'Résultats de la recherche',
-'searchresulttext'          => 'Pour plus d’informations sur la recherche dans {{SITENAME}}, voir [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Vous avez recherché « '''[[:$1]]''' » ([[Special:Prefixindex/$1|toutes les pages commençant par « $1 »]] | [[Special:WhatLinksHere/$1|toutes les pages qui ont un lien vers « $1 »]])",
-'searchsubtitleinvalid'     => 'Vous avez recherché « $1 »',
-'noexactmatch'              => "'''Aucune page intitulée « $1 » n’existe.''' Vous pouvez [[:$1|créer cette page]].",
-'noexactmatch-nocreate'     => "'''Il n’existe aucune page intitulée « $1 ».'''",
-'toomanymatches'            => 'Trop d’occurences ont été trouvées, vous êtes prié de soumettre une requête différente.',
-'titlematches'              => 'Correspondances dans les titres des pages',
-'notitlematches'            => 'Aucun titre de page ne correspond à la recherche.',
-'textmatches'               => 'Correspondances dans le texte des pages',
-'notextmatches'             => 'Aucun texte de page ne correspond à la recherche.',
-'prevn'                     => '$1 précédentes',
-'nextn'                     => '$1 suivantes',
-'viewprevnext'              => 'Voir ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 mot|$2 mots}})',
-'search-result-score'       => 'Pertinence : $1%',
-'search-redirect'           => '(redirection depuis $1)',
-'search-section'            => '(section $1)',
-'search-suggest'            => 'Essayez avec cette orthographe : $1',
-'search-interwiki-caption'  => 'Projets frères',
-'search-interwiki-default'  => 'Résultats sur $1 :',
-'search-interwiki-more'     => '(plus)',
-'search-mwsuggest-enabled'  => 'avec suggestions',
-'search-mwsuggest-disabled' => 'sans suggestions',
-'search-relatedarticle'     => 'Relaté',
-'mwsuggest-disable'         => 'Désactiver les suggestions AJAX',
-'searchrelated'             => 'relaté',
-'searchall'                 => 'Tous',
-'showingresults'            => 'Affichage de <b>$1</b> {{PLURAL:$1|résultat|résultats}} à partir du #<b>$2</b>.',
-'showingresultsnum'         => 'Affichage de <b>$3</b> {{PLURAL:$3|résultat|résultats}} à partir du #<b>$2</b>.',
-'showingresultstotal'       => "Ci-dessous l’affichage {{PLURAL:$3|du résultat '''$1'''|des résultats '''$1 – $2'''}} sur '''$3'''",
-'nonefound'                 => '<strong>Note</strong> : l’absence de résultat est souvent due à l’emploi de termes de recherche trop courants, comme « à » ou « de », qui ne sont pas indexés, ou à l’emploi de plusieurs termes de recherche (seules les pages contenant tous les termes apparaissent dans les résultats).',
-'powersearch'               => 'Rechercher',
-'powersearch-legend'        => 'Recherche avancée',
-'powersearch-ns'            => 'Rechercher dans les espaces de nom :',
-'powersearch-redir'         => 'Afficher les redirections',
-'powersearch-field'         => 'Rechercher',
-'search-external'           => 'Recherche externe',
-'searchdisabled'            => 'La recherche sur {{SITENAME}} est désactivée. En attendant la réactivation, vous pouvez effectuer une recherche via Google. Attention, leur indexation du contenu de {{SITENAME}} peut ne pas être à jour.',
+'searchresults'                    => 'Résultats de la recherche',
+'searchresults-title'              => 'Résultats de recherche pour « $1 »',
+'searchresulttext'                 => 'Pour plus d’informations sur la recherche dans {{SITENAME}}, voir [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Vous avez recherché « '''[[:$1]]''' » ([[Special:Prefixindex/$1|toutes les pages commençant par « $1 »]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|toutes les pages qui ont un lien vers « $1 »]])",
+'searchsubtitleinvalid'            => 'Vous avez recherché « $1 »',
+'noexactmatch'                     => "'''Aucune page intitulée « $1 » n’existe.''' Vous pouvez [[:$1|créer cette page]].",
+'noexactmatch-nocreate'            => "'''Il n’existe aucune page intitulée « $1 ».'''",
+'toomanymatches'                   => 'Trop d’occurences ont été trouvées, vous êtes prié de soumettre une requête différente.',
+'titlematches'                     => 'Correspondances dans les titres des pages',
+'notitlematches'                   => 'Aucun titre de page ne correspond à la recherche.',
+'textmatches'                      => 'Correspondances dans le texte des pages',
+'notextmatches'                    => 'Aucun texte de page ne correspond à la recherche.',
+'prevn'                            => '$1 précédentes',
+'nextn'                            => '$1 suivantes',
+'viewprevnext'                     => 'Voir ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Options de recherche',
+'searchmenu-exists'                => "'''Il y a une page prénommée « [[:$1]] » sur ce wiki'''",
+'searchmenu-new'                   => "'''Créer la page « [[:$1|$1]] » sur ce wiki !'''",
+'searchhelp-url'                   => 'Help:Accueil',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Rechercher les pages commençant par ce mot]]',
+'searchprofile-articles'           => 'Pages de contenu',
+'searchprofile-articles-and-proj'  => 'Pages de contenu et projet',
+'searchprofile-project'            => 'Pages du projet',
+'searchprofile-images'             => 'Fichiers',
+'searchprofile-everything'         => 'Tout',
+'searchprofile-advanced'           => 'Recherche avancée',
+'searchprofile-articles-tooltip'   => 'Rechercher dans $1',
+'searchprofile-project-tooltip'    => 'Rechercher dans $1',
+'searchprofile-images-tooltip'     => 'Rechercher des fichiers (images, sons, vidéos...)',
+'searchprofile-everything-tooltip' => 'Rechercher dans tout le site (dont les pages de discussion)',
+'searchprofile-advanced-tooltip'   => 'Choisir les espaces de noms pour la recherche',
+'prefs-search-nsdefault'           => 'Recherche en utilisant les espaces de noms par défaut :',
+'prefs-search-nscustom'            => 'Rechercher en utilisant les espaces de noms personnalisés :',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 mot|$2 mots}})',
+'search-result-score'              => 'Pertinence : $1%',
+'search-redirect'                  => '(redirection depuis $1)',
+'search-section'                   => '(section $1)',
+'search-suggest'                   => 'Essayez avec cette orthographe : $1',
+'search-interwiki-caption'         => 'Projets frères',
+'search-interwiki-default'         => 'Résultats sur $1 :',
+'search-interwiki-more'            => '(plus)',
+'search-mwsuggest-enabled'         => 'avec suggestions',
+'search-mwsuggest-disabled'        => 'sans suggestions',
+'search-relatedarticle'            => 'Relaté',
+'mwsuggest-disable'                => 'Désactiver les suggestions AJAX',
+'searchrelated'                    => 'relaté',
+'searchall'                        => 'Tous',
+'showingresults'                   => 'Affichage de <b>$1</b> {{PLURAL:$1|résultat|résultats}} à partir du #<b>$2</b>.',
+'showingresultsnum'                => 'Affichage de <b>$3</b> {{PLURAL:$3|résultat|résultats}} à partir du #<b>$2</b>.',
+'showingresultstotal'              => "Ci-dessous l’affichage {{PLURAL:$4|du résultat '''$1'''|des résultats '''$1 – $2'''}} sur '''$3'''",
+'nonefound'                        => "<strong>Note</strong> : Seulement quelques espaces de noms sont recherchés par défaut
+Essayer en utilisant le préfixe ''all:'' pour rechercher tout le contenu (en y incluant les pages de discussion, les modèles, etc), ou utiliser l'espace de nom comme préfixe.",
+'search-nonefound'                 => "Il n'y a aucun résultat correspondant à la requête.",
+'powersearch'                      => 'Rechercher',
+'powersearch-legend'               => 'Recherche avancée',
+'powersearch-ns'                   => 'Rechercher dans les espaces de nom :',
+'powersearch-redir'                => 'Afficher les redirections',
+'powersearch-field'                => 'Rechercher',
+'search-external'                  => 'Recherche externe',
+'searchdisabled'                   => 'La recherche sur {{SITENAME}} est désactivée. En attendant la réactivation, vous pouvez effectuer une recherche via Google. Attention, leur indexation du contenu de {{SITENAME}} peut ne pas être à jour.',
 
 # Preferences page
-'preferences'              => 'Préférences',
-'mypreferences'            => 'Préférences',
-'prefs-edits'              => 'Nombre d’éditions :',
-'prefsnologin'             => 'Non connecté',
-'prefsnologintext'         => 'Vous devez être <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} connecté]</span> pour modifier vos préférences d’utilisateur.',
-'prefsreset'               => 'Les préférences ont été rétablies à partir de la version enregistrée.',
-'qbsettings'               => 'Barre d’outils',
-'qbsettings-none'          => 'Aucune',
-'qbsettings-fixedleft'     => 'Gauche',
-'qbsettings-fixedright'    => 'Droite',
-'qbsettings-floatingleft'  => 'Flottante à gauche',
-'qbsettings-floatingright' => 'Flottante à droite',
-'changepassword'           => 'Modification du mot de passe',
-'skin'                     => 'Habillage',
-'math'                     => 'Rendu des maths',
-'dateformat'               => 'Format de date',
-'datedefault'              => 'Aucune préférence',
-'datetime'                 => 'Date et heure',
-'math_failure'             => 'Erreur math',
-'math_unknown_error'       => 'erreur indéterminée',
-'math_unknown_function'    => 'fonction inconnue',
-'math_lexing_error'        => 'erreur lexicale',
-'math_syntax_error'        => 'erreur de syntaxe',
-'math_image_error'         => 'La conversion en PNG a échoué ; vérifiez l’installation de LaTeX, dvips, gs et convert',
-'math_bad_tmpdir'          => 'Impossible de créer ou d’écrire dans le répertoire math temporaire',
-'math_bad_output'          => 'Impossible de créer ou d’écrire dans le répertoire math de sortie',
-'math_notexvc'             => 'L’exécutable « texvc » est introuvable. Lisez math/README pour le configurer.',
-'prefs-personal'           => 'Informations personnelles',
-'prefs-rc'                 => 'Modifications récentes',
-'prefs-watchlist'          => 'Liste de suivi',
-'prefs-watchlist-days'     => 'Nombre de jours à afficher dans la liste de suivi :',
-'prefs-watchlist-edits'    => 'Nombre de modifications à afficher dans la liste de suivi étendue :',
-'prefs-misc'               => 'Préférences diverses',
-'saveprefs'                => 'Enregistrer les préférences',
-'resetprefs'               => 'Rétablir les préférences',
-'oldpassword'              => 'Ancien mot de passe :',
-'newpassword'              => 'Nouveau mot de passe :',
-'retypenew'                => 'Confirmer le nouveau mot de passe :',
-'textboxsize'              => 'Fenêtre de modification',
-'rows'                     => 'Rangées :',
-'columns'                  => 'Colonnes :',
-'searchresultshead'        => 'Recherche',
-'resultsperpage'           => 'Nombre de réponses par page :',
-'contextlines'             => 'Nombre de lignes par réponse :',
-'contextchars'             => 'Nombre de caractères de contexte par ligne :',
-'stub-threshold'           => 'Limite supérieure pour les <a href="#" class="stub">liens vers les ébauches</a> (octets) :',
-'recentchangesdays'        => 'Nombre de jours à afficher dans les modifications récentes :',
-'recentchangescount'       => 'Nombre de modifications à afficher dans les modifications récentes :',
-'savedprefs'               => 'Les préférences ont été sauvegardées.',
-'timezonelegend'           => 'Fuseau horaire',
-'timezonetext'             => 'Nombre d’heures de décalage entre votre heure locale et l’heure du serveur (UTC).',
-'localtime'                => 'Heure locale :',
-'timezoneoffset'           => 'Décalage horaire¹ :',
-'servertime'               => 'Heure du serveur :',
-'guesstimezone'            => 'Utiliser la valeur du navigateur',
-'allowemail'               => 'Autoriser l’envoi de courriel venant d’autres utilisateurs',
-'prefs-searchoptions'      => 'Options de recherche',
-'prefs-namespaces'         => 'Espaces de noms',
-'defaultns'                => 'Rechercher par défaut dans ces espaces de noms',
-'default'                  => 'défaut',
-'files'                    => 'Fichiers',
+'preferences'               => 'Préférences',
+'mypreferences'             => 'Préférences',
+'prefs-edits'               => 'Nombre d’éditions :',
+'prefsnologin'              => 'Non connecté',
+'prefsnologintext'          => 'Vous devez être <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} connecté]</span> pour modifier vos préférences d’utilisateur.',
+'prefsreset'                => 'Les préférences ont été rétablies à partir de la version enregistrée.',
+'qbsettings'                => 'Barre d’outils',
+'qbsettings-none'           => 'Aucune',
+'qbsettings-fixedleft'      => 'Gauche',
+'qbsettings-fixedright'     => 'Droite',
+'qbsettings-floatingleft'   => 'Flottante à gauche',
+'qbsettings-floatingright'  => 'Flottante à droite',
+'changepassword'            => 'Modification du mot de passe',
+'skin'                      => 'Habillage',
+'skin-preview'              => 'Prévisualiser',
+'math'                      => 'Rendu des maths',
+'dateformat'                => 'Format de date',
+'datedefault'               => 'Aucune préférence',
+'datetime'                  => 'Date et heure',
+'math_failure'              => 'Erreur math',
+'math_unknown_error'        => 'erreur indéterminée',
+'math_unknown_function'     => 'fonction inconnue',
+'math_lexing_error'         => 'erreur lexicale',
+'math_syntax_error'         => 'erreur de syntaxe',
+'math_image_error'          => 'La conversion en PNG a échoué ; vérifiez l’installation de LaTeX, dvips, gs et convert',
+'math_bad_tmpdir'           => 'Impossible de créer ou d’écrire dans le répertoire math temporaire',
+'math_bad_output'           => 'Impossible de créer ou d’écrire dans le répertoire math de sortie',
+'math_notexvc'              => 'L’exécutable « texvc » est introuvable. Lisez math/README pour le configurer.',
+'prefs-personal'            => 'Informations personnelles',
+'prefs-rc'                  => 'Modifications récentes',
+'prefs-watchlist'           => 'Liste de suivi',
+'prefs-watchlist-days'      => 'Nombre de jours à afficher dans la liste de suivi :',
+'prefs-watchlist-days-max'  => '(maximum 7 jours)',
+'prefs-watchlist-edits'     => 'Nombre de modifications à afficher dans la liste de suivi étendue :',
+'prefs-watchlist-edits-max' => '(nombre maximum : 1000)',
+'prefs-misc'                => 'Préférences diverses',
+'prefs-resetpass'           => 'Modifier le mot de passe',
+'saveprefs'                 => 'Enregistrer les préférences',
+'resetprefs'                => 'Rétablir les préférences',
+'textboxsize'               => 'Fenêtre de modification',
+'prefs-edit-boxsize'        => 'Taille de la fenêtre de modification.',
+'rows'                      => 'Rangées :',
+'columns'                   => 'Colonnes :',
+'searchresultshead'         => 'Recherches',
+'resultsperpage'            => 'Nombre de réponses par page :',
+'contextlines'              => 'Nombre de lignes par réponse :',
+'contextchars'              => 'Nombre de caractères de contexte par ligne :',
+'stub-threshold'            => 'Limite supérieure pour les <a href="#" class="stub">liens vers les ébauches</a> (octets) :',
+'recentchangesdays'         => 'Nombre de jours à afficher dans les modifications récentes :',
+'recentchangesdays-max'     => '(maximum $1 {{PLURAL:$1|jour|jours}})',
+'recentchangescount'        => "Nombre de modifications à afficher dans les modifications récentes, pages d'historiques et d'opérations, par défaut :",
+'savedprefs'                => 'Les préférences ont été sauvegardées.',
+'timezonelegend'            => 'Fuseau horaire',
+'timezonetext'              => 'Nombre d’heures de décalage entre votre heure locale et l’heure du serveur (UTC).',
+'localtime'                 => 'Heure locale :',
+'timezoneselect'            => 'Zone horaire',
+'timezoneuseserverdefault'  => 'Utiliser la valeur du serveur',
+'timezoneuseoffset'         => 'Autre (spécifier le décalage)',
+'timezoneoffset'            => 'Décalage horaire¹ :',
+'servertime'                => 'Heure du serveur :',
+'guesstimezone'             => 'Utiliser la valeur du navigateur',
+'allowemail'                => 'Autoriser l’envoi de courriel venant d’autres utilisateurs',
+'prefs-searchoptions'       => 'Options de recherche',
+'prefs-namespaces'          => 'Espaces de noms',
+'defaultns'                 => 'Rechercher par défaut dans ces espaces de noms',
+'default'                   => 'défaut',
+'files'                     => 'Fichiers',
 
 # User rights
 'userrights'                  => 'Gestion des droits utilisateur', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Gestion des droits utilisateur',
 'userrights-user-editname'    => 'Entrez un nom d’utilisateur :',
 'editusergroup'               => 'Modification des groupes utilisateurs',
-'editinguser'                 => "Modification des droits de l’utilisateur '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] |
-[[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Modification des droits de l’utilisateur '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modifier les groupes de l’utilisateur',
 'saveusergroups'              => 'Sauvegarder les groupes utilisateur',
 'userrights-groupsmember'     => 'Membre de :',
@@ -1135,6 +1301,8 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'right-minoredit'            => 'Marquer des modifications comme mineures',
 'right-move'                 => 'Renommer des pages',
 'right-move-subpages'        => 'Déplacer des pages avec leurs sous-pages',
+'right-move-rootuserpages'   => "Renommer les pages base de l'espace de noms « Utilisateur »",
+'right-movefile'             => 'Déplacer les fichiers',
 'right-suppressredirect'     => "Ne pas créer de redirection depuis l'ancienne page en renommant la page",
 'right-upload'               => 'Importer des fichiers',
 'right-reupload'             => 'Écraser un fichier existant',
@@ -1185,9 +1353,46 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'rightslogentry' => 'a modifié les droits de l’utilisateur « $1 » de $2 à $3',
 'rightsnone'     => '(aucun)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lire cette page',
+'action-edit'                 => 'modifier cette page',
+'action-createpage'           => 'créer des pages',
+'action-createtalk'           => 'créer des pages de discussion',
+'action-createaccount'        => 'créer ce compte utilisateur',
+'action-minoredit'            => 'marquer cette modification comme mineure',
+'action-move'                 => 'renommer cette page',
+'action-move-subpages'        => 'renommer cette page et ses sous-pages',
+'action-move-rootuserpages'   => 'déplacer les pages de l’utilisateur de base.',
+'action-movefile'             => 'renommer ce fichier',
+'action-upload'               => 'importer ce fichier',
+'action-reupload'             => 'écraser ce fichier existant',
+'action-reupload-shared'      => 'passer outre ce fichier sur un dépôt partagé',
+'action-upload_by_url'        => 'importer ce fichier à partir d’une adresse internet',
+'action-writeapi'             => 'utiliser l‘API d’écriture',
+'action-delete'               => 'supprimer cette page',
+'action-deleterevision'       => 'supprimer cette version',
+'action-deletedhistory'       => 'voir l’historique supprimé de cette page',
+'action-browsearchive'        => 'rechercher des pages supprimées',
+'action-undelete'             => 'restaurer cette page',
+'action-suppressrevision'     => 'revoir et rétablir cette version supprimée',
+'action-suppressionlog'       => 'voir ce journal privé',
+'action-block'                => 'bloquer cet utilisateur à l’édition',
+'action-protect'              => 'modifier les niveaux de protection pour cette page',
+'action-import'               => 'importer cette page à partir d’un autre wiki',
+'action-importupload'         => 'importer cette page à partir de l’import d’un fichier',
+'action-patrol'               => 'marquer la modification des autres comme patrouillée',
+'action-autopatrol'           => 'avoir votre modification marquée comme patrouillée',
+'action-unwatchedpages'       => 'visionner la liste des pages non surveillées',
+'action-trackback'            => 'soumettre un rétrolien',
+'action-mergehistory'         => 'fusionner l’historique de cette page',
+'action-userrights'           => 'modifier tous les droits d’utilisateur',
+'action-userrights-interwiki' => 'modifier les droits des utilisateurs sur d’autres wikis',
+'action-siteadmin'            => 'verrouiller ou déverrouiller la base de données',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|modification|modifications}}',
 'recentchanges'                     => 'Modifications récentes',
+'recentchanges-legend'              => 'Options des modifications récentes',
 'recentchangestext'                 => 'Piste les changements les plus récents du wiki sur cette page.',
 'recentchanges-feed-description'    => 'Suivre les dernières modifications de ce wiki dans un flux.',
 'rcnote'                            => 'Voici {{PLURAL:$1|la dernière modification effectuée|les $1 dernières modifications effectuées}} durant {{PLURAL:$2|la dernière journée|les <b>$2</b> derniers jours}} jusqu’à $5 le $4.',
@@ -1211,6 +1416,8 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'rc_categories'                     => 'Limite des catégories (séparation avec « | »)',
 'rc_categories_any'                 => 'Toutes',
 'newsectionsummary'                 => '/* $1 */ nouvelle section',
+'rc-enhanced-expand'                => 'Voir les détails (nécessite JavaScript)',
+'rc-enhanced-hide'                  => 'Masquer les détails',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Suivi des liens',
@@ -1231,11 +1438,11 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'upload_directory_read_only'  => 'Le serveur Web ne peut écrire dans le dossier cible ($1).',
 'uploaderror'                 => 'Erreur',
 'uploadtext'                  => "Utilisez ce formulaire pour importer des fichiers sur le serveur.
-Pour voir ou rechercher des images précédemment envoyées, consultez la [[Special:ImageList|liste des images]]. Les imports sont aussi enregistrés dans l’[[Special:Log/upload|historique des imports]], les suppressions dans l’[[Special:Log/delete|historique des suppressions]].
+Pour voir ou rechercher des images précédemment envoyées, consultez la [[Special:FileList|liste des images]]. Les imports sont aussi enregistrés dans l’[[Special:Log/upload|historique des imports]], les suppressions dans l’[[Special:Log/delete|historique des suppressions]].
 
 Pour inclure une image dans une page, utilisez un lien de la forme :
-* '''<code><nowiki>[[</nowiki>{{ns:image}}<nowiki>:fichier.jpg]]</nowiki></code>''' pour afficher le fichier en pleine résolution ;
-* '''<code><nowiki>[[</nowiki>{{ns:image}}<nowiki>:fichier.png|200px|thumb|left|texte descriptif]]</nowiki></code>''' pour utiliser une miniature de 200 pixels de large dans une boîte à gauche avec « texte descriptif » comme description ;
+* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:fichier.jpg]]</nowiki></code>''' pour afficher le fichier en pleine résolution ;
+* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:fichier.png|200px|thumb|left|texte descriptif]]</nowiki></code>''' pour utiliser une miniature de 200 pixels de large dans une boîte à gauche avec « texte descriptif » comme description ;
 * '''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:fichier.ogg]]</nowiki></code>''' pour lier directement vers le fichier sans l'afficher.",
 'upload-permitted'            => 'Formats de fichiers autorisés : $1.',
 'upload-preferred'            => 'Formats de fichiers préférés : $1.',
@@ -1243,7 +1450,7 @@ Pour inclure une image dans une page, utilisez un lien de la forme :
 'uploadlog'                   => 'Historique des imports',
 'uploadlogpage'               => 'Historique des imports de fichiers multimédia',
 'uploadlogpagetext'           => 'Voici la liste des derniers fichiers importés sur le serveur.
-Voyez la [[Special:NewImages|gallerie des nouvelles images]] pour une présentation plus visuelle.',
+Voyez la [[Special:NewFiles|gallerie des nouvelles images]] pour une présentation plus visuelle.',
 'filename'                    => 'Nom du fichier',
 'filedesc'                    => 'Description',
 'fileuploadsummary'           => 'Description :',
@@ -1265,22 +1472,24 @@ Voyez la [[Special:NewImages|gallerie des nouvelles images]] pour une présentat
 'large-file'                  => 'Les fichiers importés ne devraient pas être plus gros que $1 ; ce fichier fait $2.',
 'largefileserver'             => 'La taille de ce fichier est supérieure au maximum autorisé.',
 'emptyfile'                   => 'Le fichier que vous voulez importer semble vide. Ceci peut être dû à une erreur dans le nom du fichier. Veuillez vérifier que vous désirez vraiment copier ce fichier.',
-'fileexists'                  => 'Un fichier avec ce nom existe déjà. Merci de vérifier <strong><tt>$1</tt></strong>. Êtes-vous certain de vouloir modifier ce fichier ?',
-'filepageexists'              => 'La page de description pour ce fichier a déjà été créée ici <strong><tt>$1</tt></strong>, mais aucun fichier de ce nom n’existe actuellement. Le résumé que vous allez écrire ne remplacera pas le texte précédent ; pour ce faire vous devrez éditer manuellement la page.',
-'fileexists-extension'        => 'Un fichier avec un nom similaire existe déjà :<br />
-Nom du fichier à importer : <strong><tt>$1</tt></strong><br />
-Nom du fichier existant : <strong><tt>$2</tt></strong><br />
-la seule différence est la casse (majuscules / minuscules) de l’extension. Veuillez vérifier que le fichier est différent et changer son nom.',
+'fileexists'                  => "Un fichier avec ce nom existe déjà. Merci de vérifier '''<tt>$1</tt>'''. Êtes-vous certain de vouloir modifier ce fichier ?",
+'filepageexists'              => "La page de description pour ce fichier a déjà été créée ici '''<tt>$1</tt>''', mais aucun fichier de ce nom n’existe actuellement. Le résumé que vous allez écrire ne remplacera pas le texte précédent ; pour ce faire vous devrez éditer manuellement la page.",
+'fileexists-extension'        => "Un fichier avec un nom similaire existe déjà :<br />
+Nom du fichier à importer : '''<tt>$1</tt>'''<br />
+Nom du fichier existant : '''<tt>$2</tt>'''<br />
+la seule différence est la casse (majuscules / minuscules) de l’extension. Veuillez vérifier que le fichier est différent et changer son nom.",
 'fileexists-thumb'            => "<center>'''Image existante'''</center>",
-'fileexists-thumbnail-yes'    => 'Le fichier semble être une image en taille réduite <i>(vignette)</i>. Veuillez vérifier le fichier <strong><tt>$1</tt></strong>.<br />
-Si le fichier vérifié est la même image (dans une meilleure résolution), il n’y a pas besoin d’importer une version réduite.',
-'file-thumbnail-no'           => 'Le nom du fichier commence par <strong><tt>$1</tt></strong>.
-Il est possible qu’il s’agisse d’une version réduite <i>(vignette)</i>.
-Si vous disposez du fichier en haute résolution, importez-le, sinon changez-lui son nom.',
-'fileexists-forbidden'        => 'Un fichier avec ce nom existe déjà ; merci de retourner en arrière et de copier le fichier sous un nouveau nom. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Le fichier semble être une image en taille réduite ''(vignette)''. Veuillez vérifier le fichier '''<tt>$1</tt>'''.<br />
+Si le fichier vérifié est la même image (dans une meilleure résolution), il n’y a pas besoin d’importer une version réduite.",
+'file-thumbnail-no'           => "Le nom du fichier commence par '''<tt>$1</tt>'''.
+Il est possible qu’il s’agisse d’une version réduite ''(vignette)''.
+Si vous disposez du fichier en haute résolution, importez-le, sinon changez-lui son nom.",
+'fileexists-forbidden'        => "Un fichier avec ce nom existe déjà et ne peut pas être écrasé.
+Si vous voulez toujours importer ce fichier, merci de retourner en arrière et d'utiliser un nouveau nom. [[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => 'Un fichier portant le même nom existe déjà dans la base de données commune.
-Si vous voulez encore l’importer, veuillez revenir en arrière et l’importer sous un autre nom. [[Image:$1|thumb|center|$1]]',
+Si vous voulez encore l’importer, veuillez revenir en arrière et l’importer sous un autre nom. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ce fichier est un doublon {{PLURAL:$1|du fichier suivant|des fichiers suivants}} :',
+'file-deleted-duplicate'      => 'Un fichier identique à celui-ci ([[$1]]) a déjà été supprimé. Vous devriez vérifier le journal des suppressions de ce fichier avant de le re-télécharger.',
 'successfulupload'            => 'Import réussi',
 'uploadwarning'               => 'Attention !',
 'savefile'                    => 'Sauvegarder le fichier',
@@ -1296,12 +1505,13 @@ Veuillez vérifer le fichier.',
 'destfilename'                => 'Nom sous lequel le fichier sera enregistré :',
 'upload-maxfilesize'          => 'Taille maximale du fichier : $1',
 'watchthisupload'             => 'Suivre ce fichier',
-'filewasdeleted'              => 'Un fichier avec ce nom a déjà été copié, puis supprimé. Vous devriez vérifier le $1 avant de procéder à une nouvelle copie.',
+'filewasdeleted'              => 'Un fichier avec ce nom a déjà été téléversé, puis supprimé.
+Vous devriez vérifier le $1 avant de procéder à un nouveau téléversement.',
 'upload-wasdeleted'           => "'''Attention : Vous êtes en train d’importer un fichier qui a déjà été supprimé auparavant.'''
 
 Le journal des suppressions de ce fichier vous aidera à déterminer s’il est opportun de continuer son import :",
-'filename-bad-prefix'         => 'Le nom du fichier que vous importez commence par <strong>« $1 »</strong> qui est un nom généralement donné par les appareils photo numériques.
-Veuillez choisir un nom de fichier descriptif.',
+'filename-bad-prefix'         => "Le nom du fichier que vous importez commence par '''« $1 »''' qui est un nom généralement donné par les appareils photo numériques.
+Veuillez choisir un nom de fichier descriptif.",
 'filename-prefix-blacklist'   => ' #<!-- laisser cette ligne telle quelle --><pre>
 # La syntaxe est la suivante :
 #  * Tout ce qui figure entre un caractère "#" jusqu’à la fin de la ligne est un commentaire ;
@@ -1338,84 +1548,91 @@ Si le problème persiste, contactez un [[Special:ListUsers/sysop|administrateur]
 'upload_source_url'  => ' (une URL valide et accessible publiquement)',
 'upload_source_file' => ' (un fichier sur votre ordinateur)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Cette page spéciale montre tous les fichiers importés.
-Par défaut, les derniers fichiers importés sont affichés en haut de la liste.
-Un clic en tête de colonne change l’ordre d’affichage.',
-'imagelist_search_for'  => 'Recherche pour l’image nommée :',
+# Special:ListFiles
+'listfiles-summary'     => 'Cette page spéciale permet de lister tous les fichiers téléversés.
+Par défaut, les derniers fichiers téléversés sont affichés en tête de liste.
+Un clic sur un entête de colonne change l’ordre d’affichage.',
+'listfiles_search_for'  => 'Rechercher un nom de média :',
 'imgfile'               => 'fichier',
-'imagelist'             => 'Liste des images',
-'imagelist_date'        => 'Date',
-'imagelist_name'        => 'Nom',
-'imagelist_user'        => 'Utilisateur',
-'imagelist_size'        => 'Octets',
-'imagelist_description' => 'Description',
-
-# Image description page
+'listfiles'             => 'Liste de fichiers',
+'listfiles_date'        => 'Date',
+'listfiles_name'        => 'Nom',
+'listfiles_user'        => 'Utilisateur',
+'listfiles_size'        => 'Taille',
+'listfiles_description' => 'Description',
+'listfiles_count'       => 'Versions',
+
+# File description page
 'filehist'                       => 'Historique du fichier',
-'filehist-help'                  => 'Cliquer sur une date et une heure pour voir le fichier tel qu’il était à ce moment-là',
-'filehist-deleteall'             => 'tout supprimer',
-'filehist-deleteone'             => 'supprimer ceci',
-'filehist-revert'                => 'révoquer',
+'filehist-help'                  => 'Cliquer sur une date et heure pour voir le fichier tel qu’il était à ce moment-là.',
+'filehist-deleteall'             => 'supprimer tout',
+'filehist-deleteone'             => 'supprimer',
+'filehist-revert'                => 'rétablir',
 'filehist-current'               => 'actuel',
 'filehist-datetime'              => 'Date et heure',
+'filehist-thumb'                 => 'Miniature',
+'filehist-thumbtext'             => 'Miniature pour la version du $1',
+'filehist-nothumb'               => 'Pas de miniature',
 'filehist-user'                  => 'Utilisateur',
 'filehist-dimensions'            => 'Dimensions',
 'filehist-filesize'              => 'Taille du fichier',
 'filehist-comment'               => 'Commentaire',
-'imagelinks'                     => 'Pages contenant l’image',
-'linkstoimage'                   => '{{PLURAL:$1|La page ci-dessous contient|Les pages ci-dessous contiennent}} cette image :',
-'nolinkstoimage'                 => 'Aucune page ne contient cette image.',
-'morelinkstoimage'               => 'Voir [[Special:WhatLinksHere/$1|plus de liens]] vers cette image.',
+'imagelinks'                     => 'Utilisations du fichier',
+'linkstoimage'                   => '{{PLURAL:$1|La page suivante utilise|Les $1 pages suivantes utilisent}} ce fichier :',
+'linkstoimage-more'              => 'Plus {{PLURAL:$1|d’une page utilise|de $1 pages utilisent}} ce fichier.
+La liste suivante affiche seulement {{PLURAL:$1|la première page qui utilise|les $1 premières pages qui utilisent}} ce fichier.
+Une [[Special:WhatLinksHere/$2|liste complète]] est disponible.',
+'nolinkstoimage'                 => 'Aucune page n’utilise ce fichier.',
+'morelinkstoimage'               => 'Voir [[Special:WhatLinksHere/$1|plus de liens]] vers ce fichier.',
 'redirectstofile'                => '{{PLURAL:$1|Le fichier suivant redirige|Les fichiers suivants redirigent}} vers celui-ci :',
-'duplicatesoffile'               => '{{PLURAL:$1|Le fichier suivant est un duplicata|Les fichiers suivants sont des duplicatas}} de celui-ci :',
+'duplicatesoffile'               => '{{PLURAL:$1|Le fichier suivant est un duplicata|Les fichiers suivants sont des duplicatas}} de celui-ci ([[Special:FileDuplicateSearch/$2|plus de détails]]) :',
 'sharedupload'                   => 'Ce fichier est partagé et peut-être utilisé par d’autres projets.',
-'shareduploadwiki'               => 'Reportez-vous à la [$1 page de description] pour plus d’informations.',
-'shareduploadwiki-desc'          => 'La description de sa $1 dans le répertoire partagé est affichée ci-dessous.',
+'shareduploadwiki'               => 'Reportez-vous à la $1 pour plus d’informations.',
+'shareduploadwiki-desc'          => 'La description affichée ci-dessous est issue de sa $1 dans le dépôt partagé.',
 'shareduploadwiki-linktext'      => 'page de description du fichier',
-'shareduploadduplicate'          => "Ce fichier est un doublon de $1 d'un dépôt partagé.",
+'shareduploadduplicate'          => 'Ce fichier est un doublon d’$1 dans le dépôt partagé.',
 'shareduploadduplicate-linktext' => 'un autre fichier',
-'shareduploadconflict'           => 'Ce fichier a le même nom que $1 qui est dans un dépôt partagé.',
+'shareduploadconflict'           => 'Ce fichier a le même nom qu’$1 dans le dépôt partagé.',
 'shareduploadconflict-linktext'  => 'un autre fichier',
-'noimage'                        => 'Aucun fichier possèdant ce nom n’existe, vous pouvez $1.',
-'noimage-linktext'               => 'en importer un',
-'uploadnewversion-linktext'      => 'Importer une nouvelle version de ce fichier',
+'noimage'                        => 'Aucun fichier n’existe sous ce nom, mais vous pouvez $1.',
+'noimage-linktext'               => 'en téléverser un',
+'uploadnewversion-linktext'      => 'Téléverser une nouvelle version de ce fichier',
 'imagepage-searchdupe'           => 'Recherche des fichiers en double',
 
 # File reversion
-'filerevert'                => 'Révoquer $1',
-'filerevert-legend'         => 'Révoquer le fichier',
-'filerevert-intro'          => '<span class="plainlinks">Vous allez révoquer \'\'\'[[Media:$1|$1]]\'\'\' jusqu\'à [$4 la version du $2 à $3].</span>',
+'filerevert'                => 'Rétablir $1',
+'filerevert-legend'         => 'Rétablir le fichier',
+'filerevert-intro'          => "Vous êtes sur le point de rétablir le fichier '''[[Media:$1|$1]]''' à la [$4 version du $2 à $3].",
 'filerevert-comment'        => 'Commentaire :',
-'filerevert-defaultcomment' => 'Révoqué jusqu’à la version du $1 à $2',
-'filerevert-submit'         => 'Révoquer',
-'filerevert-success'        => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' a été révoqué jusqu\'à [$4 la version du $2 à $3].</span>',
-'filerevert-badversion'     => 'Il n’y a pas de version plus ancienne du fichier qui porte la date donnée.',
+'filerevert-defaultcomment' => 'Version du $1 à $2 rétablie',
+'filerevert-submit'         => 'Rétablir',
+'filerevert-success'        => "'''[[Media:$1|$1]]''' a été rétabli à [$4 la version du $2 à $3].",
+'filerevert-badversion'     => 'Il n’y a pas localement de version antérieure du fichier qui porte la date indiquée.',
 
 # File deletion
 'filedelete'                  => 'Supprimer $1',
 'filedelete-legend'           => 'Supprimer le fichier',
-'filedelete-intro'            => "Vous êtes en train de supprimer '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Vous êtes sur le point de supprimer '''[[Media:$1|$1]]''' avec tout son historique.",
 'filedelete-intro-old'        => "Vous êtes en train d’effacer la version de '''[[Media:$1|$1]]''' du [$4 $2 à $3].",
-'filedelete-comment'          => 'Commentaire :',
+'filedelete-comment'          => 'Motif de suppression :',
 'filedelete-submit'           => 'Supprimer',
 'filedelete-success'          => "'''$1''' a été supprimé.",
 'filedelete-success-old'      => "La version de '''[[Media:$1|$1]]''' du $2 à $3 a été supprimée.",
 'filedelete-nofile'           => "'''$1''' n’existe pas.",
 'filedelete-nofile-old'       => "Il n’existe aucune version archivée de '''$1''' avec les attributs indiqués.",
-'filedelete-iscurrent'        => 'Vous êtes en train d’essayer de supprimer la version la plus récente de ce fichier. Vous devez, au préalable, rétablir une ancienne version de celui-ci.',
-'filedelete-otherreason'      => 'Raison différente/supplémentaire :',
-'filedelete-reason-otherlist' => 'Raison différente',
-'filedelete-reason-dropdown'  => '*Motifs de suppression habituels
-** Violation de droit d’auteur
+'filedelete-otherreason'      => 'Motif autre / supplémentaire :',
+'filedelete-reason-otherlist' => 'Autre motif',
+'filedelete-reason-dropdown'  => '* Motifs fréquents de suppression de fichiers
+** Violation du droit d’auteur
 ** Fichier dupliqué',
-'filedelete-edit-reasonlist'  => 'Modifier les motifs de la suppression',
+'filedelete-edit-reasonlist'  => 'Modifier les motifs fréquents de suppression',
 
 # MIME search
-'mimesearch'         => 'Recherche par type MIME',
-'mimesearch-summary' => 'Cette page spéciale permet de chercher des fichiers en fonction de leur type MIME. Entrée : type/sous-type, par exemple <tt>image/jpeg</tt>.',
+'mimesearch'         => 'Recherche par type de contenu MIME',
+'mimesearch-summary' => "Cette page vous permet de lister les fichiers accessibles par ce wiki en fonction de leur type de contenu MIME.
+Entrée : ''typedecontenu''/''sous-type'', par exemple <tt>image/jpeg</tt>.",
 'mimetype'           => 'Type MIME :',
-'download'           => 'Téléchargement',
+'download'           => 'Télécharger',
 
 # Unwatched pages
 'unwatchedpages' => 'Pages non suivies',
@@ -1425,52 +1642,55 @@ Un clic en tête de colonne change l’ordre d’affichage.',
 
 # Unused templates
 'unusedtemplates'     => 'Modèles inutilisés',
-'unusedtemplatestext' => 'Cette page liste toutes les pages de l’espace de noms « {{ns:template}} » qui ne sont incluses dans aucune autre page. N’oubliez pas de vérifier s’il n’y a pas d’autre lien vers les modèles avant de les supprimer.',
+'unusedtemplatestext' => 'Cette page liste toutes les pages de l’espace de nommage « {{ns:template}} » qui ne sont incluses dans aucune autre page.
+N’oubliez pas de vérifier s’il n’y a pas d’autres liens vers les modèles avant de les supprimer.',
 'unusedtemplateswlh'  => 'autres liens',
 
 # Random page
 'randompage'         => 'Une page au hasard',
-'randompage-nopages' => 'Il n’y a aucune page dans cet espace de nom.',
+'randompage-nopages' => 'Il n’y a aucune page dans l’espace de nommage « $1 ».',
 
 # Random redirect
 'randomredirect'         => 'Une page de redirection au hasard',
-'randomredirect-nopages' => 'Il n’y a aucune page de redirection dans cet espace de nom.',
+'randomredirect-nopages' => 'Il n’y a aucune page de redirection dans l’espace de nommage « $1 ».',
 
 # Statistics
-'statistics'             => 'Statistiques',
-'sitestats'              => 'Statistiques de {{SITENAME}}',
-'userstats'              => 'Statistiques utilisateur',
-'sitestatstext'          => "La base de données contient actuellement '''$1''' page{{PLURAL:$1||s}}.
-
-Ce chiffre inclut les pages « discussion », les pages relatives à {{SITENAME}}, les pages minimales (« ébauches »), les pages de redirection, ainsi que d’autres pages qui ne sont pas considérées comme des articles. Si l’on exclut ces pages, il reste '''$2''' {{PLURAL:$2|page qui est probablement un véritable article|pages qui sont probablement de véritables articles}}.
-
-'''$8''' {{PLURAL:$8|fichier a été importé|fichiers ont été importés}}.
-
-'''$3''' {{PLURAL:$3|page a été consultée|pages ont été consultées}} et '''$4''' {{PLURAL:$4|page modifiée|pages modifiées}}.
-
-Cela représente une moyenne de '''$5''' modification{{PLURAL:$5||s}} par page et de '''$6''' consultation{{PLURAL:$6||s}} pour une modification.
-
-Il y a '''$7''' article{{PLURAL:$7||s}} dans [http://www.mediawiki.org/wiki/Manual:Job_queue/fr la file des tâches].",
-'userstatstext'          => "Il y a {{PLURAL:$1|'''$1''' [[Special:ListUsers|utilisateur enregistré]]|'''$1''' [[Special:ListUsers|utilisateurs enregistrés]]}} dont '''$2''' (ou '''$4%''') {{PLURAL:$2|dispose|disposent}} des droits $5.",
-'statistics-mostpopular' => 'Pages les plus consultées',
+'statistics'                   => 'Statistiques',
+'statistics-header-pages'      => 'Statistiques des pages',
+'statistics-header-edits'      => 'Statistiques des modifications',
+'statistics-header-views'      => 'Statistiques des visites',
+'statistics-header-users'      => 'Statistiques des utilisateurs',
+'statistics-articles'          => 'Pages de contenu',
+'statistics-pages'             => 'Pages',
+'statistics-pages-desc'        => 'Toutes les pages du wiki, y compris les pages de discussion, les redirections, etc.',
+'statistics-files'             => 'Fichiers téléversés',
+'statistics-edits'             => 'Modifications de pages depuis l’installation de {{SITENAME}}',
+'statistics-edits-average'     => 'Moyenne des modifications par page',
+'statistics-views-total'       => 'Visites',
+'statistics-views-peredit'     => 'Moyenne des visites par modification',
+'statistics-jobqueue'          => 'Longueur de la [http://www.mediawiki.org/wiki/Manual:Job_queue liste d’attente de traitement]',
+'statistics-users'             => '[[Special:ListUsers|Utilisateurs]] enregistrés',
+'statistics-users-active'      => 'Utilisateurs actifs',
+'statistics-users-active-desc' => 'Utilisateurs ayant fait au moins une action durant {{PLURAL:$1|le dernier jours|les $1 derniers jours}}',
+'statistics-mostpopular'       => 'Pages les plus consultées',
 
 'disambiguations'      => 'Pages d’homonymie',
 'disambiguationspage'  => 'Template:Homonymie',
 'disambiguations-text' => "Les pages suivantes comprennent des liens vers une '''page d’homonymie'''.
-Elles devraient plutôt lier vers le bon article.<br />
-Une page est considérée comme page d’homonymie si elle contient un des modèles présents sur [[MediaWiki:Disambiguationspage]].",
+Ces liens ambigus devraient plutôt pointer vers le bon article.<br />
+Une page est considérée comme page d’homonymie si elle inclut (directement ou récursivement) un des modèles listés sur [[MediaWiki:Disambiguationspage]].",
 
 'doubleredirects'            => 'Doubles redirections',
 'doubleredirectstext'        => 'Chaque case contient des liens vers la première et la seconde redirection, ainsi que la première ligne de texte de la seconde page, ce qui fournit habituellement la « vraie » page cible, vers laquelle la première redirection devrait rediriger.',
-'double-redirect-fixed-move' => '[[$1]] a été renommé, ceci est maintenant une redirection vers [[$2]]',
+'double-redirect-fixed-move' => 'Cette redirection, dont la cible [[$1]] a été renommée, mène maintenant vers [[$2]].',
 'double-redirect-fixer'      => 'Correcteur de redirection',
 
 'brokenredirects'        => 'Redirections cassées',
-'brokenredirectstext'    => 'Ces redirections mènent vers des pages qui n’existent pas :',
+'brokenredirectstext'    => 'Ces redirections mènent vers des pages inexistantes :',
 'brokenredirects-edit'   => '(modifier)',
 'brokenredirects-delete' => '(supprimer)',
 
-'withoutinterwiki'         => 'Pages sans liens interlangues',
+'withoutinterwiki'         => 'Pages sans liens inter-langues',
 'withoutinterwiki-summary' => 'Les pages suivantes ne possèdent pas de liens vers d’autres langues :',
 'withoutinterwiki-legend'  => 'Préfixe',
 'withoutinterwiki-submit'  => 'Afficher',
@@ -1478,206 +1698,233 @@ Une page est considérée comme page d’homonymie si elle contient un des modè
 'fewestrevisions' => 'Pages les moins modifiés',
 
 # Miscellaneous special pages
-'nbytes'                  => '$1 {{PLURAL:$1|octet|octets}}',
-'ncategories'             => '$1 {{PLURAL:$1|catégorie|catégories}}',
-'nlinks'                  => '$1 {{PLURAL:$1|lien|liens}}',
-'nmembers'                => '$1 {{PLURAL:$1|page|pages}} à l’intérieur',
-'nrevisions'              => '$1 {{PLURAL:$1|révision|révisions}}',
-'nviews'                  => '$1 {{PLURAL:$1|consultation|consultations}}',
+'nbytes'                  => '$1 octet{{PLURAL:$1||s}}',
+'ncategories'             => '$1 catégorie{{PLURAL:$1||s}}',
+'nlinks'                  => '$1 lien{{PLURAL:$1||s}}',
+'nmembers'                => '$1 membre{{PLURAL:$1||s}}',
+'nrevisions'              => '$1 version{{PLURAL:$1||s}}',
+'nviews'                  => '$1 consultation{{PLURAL:$1||s}}',
 'specialpage-empty'       => 'Cette page est vide.',
 'lonelypages'             => 'Pages orphelines',
 'lonelypagestext'         => 'Les pages suivantes ne sont pas liées ou incluses à partir d’autres pages du wiki.',
-'uncategorizedpages'      => 'Pages sans catégorie',
-'uncategorizedcategories' => 'Catégories sans catégorie',
-'uncategorizedimages'     => 'Images sans catégorie',
+'uncategorizedpages'      => 'Pages non catégorisées',
+'uncategorizedcategories' => 'Catégories non catégorisées',
+'uncategorizedimages'     => 'Fichiers non catégorisés',
 'uncategorizedtemplates'  => 'Modèles sans catégorie',
 'unusedcategories'        => 'Catégories inutilisées',
-'unusedimages'            => 'Images orphelines',
+'unusedimages'            => 'Fichiers orphelins',
 'popularpages'            => 'Pages les plus consultées',
 'wantedcategories'        => 'Catégories les plus demandées',
 'wantedpages'             => 'Pages les plus demandées',
-'missingfiles'            => 'Fichiers manquants',
+'wantedfiles'             => 'Fichiers les plus désirés',
+'wantedtemplates'         => 'Modèles demandés',
 'mostlinked'              => 'Pages les plus liées',
 'mostlinkedcategories'    => 'Catégories les plus utilisées',
 'mostlinkedtemplates'     => 'Modèles les plus utilisés',
 'mostcategories'          => 'Pages utilisant le plus de catégories',
-'mostimages'              => 'Images les plus utilisées',
-'mostrevisions'           => 'Pages les plus modifiés',
-'prefixindex'             => 'Toutes les pages débutant par…',
+'mostimages'              => 'Fichiers les plus utilisés',
+'mostrevisions'           => 'Pages les plus modifiées',
+'prefixindex'             => 'Toutes les pages débutant par...',
 'shortpages'              => 'Pages courtes',
 'longpages'               => 'Pages longues',
 'deadendpages'            => 'Pages en impasse',
 'deadendpagestext'        => 'Les pages suivantes ne contiennent aucun lien vers d’autres pages du wiki.',
 'protectedpages'          => 'Pages protégées',
 'protectedpages-indef'    => 'Uniquement les protections permanentes',
-'protectedpagestext'      => 'Les pages suivantes sont protégées contre les modifications et/ou le renommage :',
+'protectedpages-cascade'  => 'Uniquement les protections en cascade',
+'protectedpagestext'      => 'Les pages suivantes sont protégées contre les modifications et/ou le renommage.',
 'protectedpagesempty'     => 'Aucune page n’est protégée actuellement.',
 'protectedtitles'         => 'Titres protégés',
 'protectedtitlestext'     => 'Les titres suivants sont protégés à la création',
 'protectedtitlesempty'    => 'Aucun titre n’est actuellement protégé avec ces paramètres.',
-'listusers'               => 'Liste des inscrits',
+'listusers'               => 'Liste des utilisateurs',
+'listusers-editsonly'     => 'Ne montrer que les utilisateurs ayant au moins une contribution',
+'usereditcount'           => '$1 modification{{PLURAL:$1||s}}',
 'newpages'                => 'Nouvelles pages',
 'newpages-username'       => 'Utilisateur :',
-'ancientpages'            => 'Pages les moins récemment modifiés',
+'ancientpages'            => 'Pages les plus anciennement modifiées',
 'move'                    => 'Renommer',
-'movethispage'            => 'Renommer la page',
-'unusedimagestext'        => '<p>N’oubliez pas que d’autres sites peuvent contenir un lien direct vers cette image, et que celle-ci peut être placée dans cette liste alors qu’elle est en réalité utilisée.</p>',
-'unusedcategoriestext'    => 'Les catégories suivantes existent mais aucune page ou catégorie ne les utilisent.',
+'movethispage'            => 'Renommer cette page',
+'unusedimagestext'        => '<p>N’oubliez pas que d’autres sites peuvent avoir un lien direct vers un fichier, notamment s’ils autorisent les accès directs à cet espace de nommage partagé, et donc qu’un fichier peut être listé comme inutilisé ici alors qu’il est en réalité utilisé sur ces sites.</p>',
+'unusedcategoriestext'    => 'Les catégories suivantes existent mais aucune page ou catégorie ne les utilise.',
 'notargettitle'           => 'Pas de cible',
-'notargettext'            => 'Indiquez une page cible ou un utilisateur cible.',
+'notargettext'            => 'Vous n’avez pas indiqué une page ou un utilisateur sur lequel vous souhaitez effectuer cette action.',
 'nopagetitle'             => 'Aucune telle page cible',
 'nopagetext'              => 'La page cible que vous avez indiquée n’existe pas.',
 'pager-newer-n'           => '{{PLURAL:$1|plus récente|$1 plus récentes}}',
 'pager-older-n'           => '{{PLURAL:$1|plus ancienne|$1 plus anciennes}}',
-'suppress'                => 'Superviseur',
+'suppress'                => 'Superviser',
 
 # Book sources
 'booksources'               => 'Ouvrages de référence',
 'booksources-search-legend' => 'Rechercher parmi des ouvrages de référence',
 'booksources-isbn'          => 'ISBN :',
-'booksources-go'            => 'Valider',
-'booksources-text'          => 'Voici une liste de liens vers des sites vendant des livres neufs et d’occasion et sur lesquels vous trouverez peut-être des informations sur les ouvrages que vous cherchez. Ces liens ne sont fournis que dans le but de faciliter les recherches aux utilisateurs, {{SITENAME}} n’étant liée à aucune de ces sociétés.',
+'booksources-go'            => 'Lister',
+'booksources-text'          => 'Voici une liste indicative et non exclusive de liens vers d’autres sites vendant des livres neufs et d’occasion et sur lesquels vous trouverez peut-être des informations sur les ouvrages que vous cherchez :',
+'booksources-invalid-isbn'  => 'L’ISBN donné ne semble pas être correct ; vérifiez si vous avez fait une erreur en copiant la source originale.',
 
 # Special:Log
 'specialloguserlabel'  => 'Utilisateur :',
 'speciallogtitlelabel' => 'Titre :',
-'log'                  => 'Opérations',
-'all-logs-page'        => 'Toutes les opérations',
-'log-search-legend'    => 'Chercher dans les historiques',
-'log-search-submit'    => 'OK',
-'alllogstext'          => 'Affichage combiné de tous les journaux disponibles de {{SITENAME}}.
-Vous pouvez restreindre la vue en sélectionnant un type de journal, un nom d’utilisateur (casse sensible) ou une page ciblée (idem).',
-'logempty'             => 'Il n’y a rien dans l’historique pour cette page.',
-'log-title-wildcard'   => 'Chercher les titres commençant par le texte suivant',
+'log'                  => 'Journaux d’opérations',
+'all-logs-page'        => 'Tous les journaux d’opérations',
+'alllogstext'          => 'Affichage combiné de tous les journaux disponibles des opérations sur {{SITENAME}}.
+Vous pouvez restreindre la vue en sélectionnant un type de journal, un nom d’utilisateur (sensible à la casse) ou une page affectée (même remarque).',
+'logempty'             => 'Aucune opération correspondante dans les journaux.',
+'log-title-wildcard'   => 'Chercher parmi les titres commençant par ce texte',
 
 # Special:AllPages
 'allpages'          => 'Toutes les pages',
-'alphaindexline'    => '$1 à $2',
+'alphaindexline'    => 'de $1 à $2',
 'nextpage'          => 'Page suivante ($1)',
 'prevpage'          => 'Page précédente ($1)',
 'allpagesfrom'      => 'Afficher les pages à partir de :',
+'allpagesto'        => 'Afficher les pages jusqu’à :',
 'allarticles'       => 'Toutes les pages',
-'allinnamespace'    => 'Toutes les pages (espace de noms $1)',
-'allnotinnamespace' => 'Toutes les pages (n’étant pas dans l’espace de noms $1)',
+'allinnamespace'    => 'Toutes les pages (dans l’espace de nommage $1)',
+'allnotinnamespace' => 'Toutes les pages (hors de l’espace de nommage $1)',
 'allpagesprev'      => 'Précédent',
 'allpagesnext'      => 'Suivant',
-'allpagessubmit'    => 'Valider',
+'allpagessubmit'    => 'Lister',
 'allpagesprefix'    => 'Afficher les pages commençant par le préfixe :',
-'allpagesbadtitle'  => 'Le titre renseigné pour la page est incorrect ou possède un préfixe réservé. Il contient certainement un ou plusieurs caractères spéciaux ne pouvant être utilisés dans les titres.',
-'allpages-bad-ns'   => '{{SITENAME}} n’a pas d’espace de noms « $1 ».',
+'allpagesbadtitle'  => 'Le titre de page indiqué est incorrect ou contient un préfixe inter-langue ou inter-wiki réservé.
+Il peut aussi contenir un ou plusieurs caractères inutilisables dans les titres.',
+'allpages-bad-ns'   => '{{SITENAME}} n’a pas d’espace de nommage « $1 ».',
 
 # Special:Categories
 'categories'                    => 'Catégories',
-'categoriespagetext'            => 'Les catégories suivantes contiennent des pages ou fichiers.
+'categoriespagetext'            => 'Les catégories suivantes sont utilisées par des pages ou fichiers.
 [[Special:UnusedCategories|Les catégories inutilisées]] ne sont pas affichées ici.
 Voyez aussi [[Special:WantedCategories|les catégories demandées]].',
 'categoriesfrom'                => 'Afficher les catégories commençant à :',
-'special-categories-sort-count' => 'tri par compte',
+'special-categories-sort-count' => 'tri par nombre d’éléments',
 'special-categories-sort-abc'   => 'tri alphabétique',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contributions de l’utilisateur supprimées',
+
+# Special:LinkSearch
+'linksearch'       => 'Liens externes',
+'linksearch-pat'   => 'Expression recherchée :',
+'linksearch-ns'    => 'Espace de nommage :',
+'linksearch-ok'    => 'Rechercher',
+'linksearch-text'  => 'Des caractères « jokers » peuvent être utilisés, par exemple <code>*.wikipedia.org</code>.<br />
+Protocoles reconnus : <tt>$1</tt>.',
+'linksearch-line'  => '$1 est lié depuis $2',
+'linksearch-error' => 'Les caractères jokers ne peuvent être utilisés qu’au début du nom de domaine de l’hôte.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Afficher les utilisateurs à partir de :',
-'listusers-submit'   => 'Montrer',
+'listusers-submit'   => 'Lister',
 'listusers-noresult' => 'Aucun utilisateur trouvé. Vérifiez aussi les variantes de casse.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Journal des créations de comptes utilisateurs',
+'newuserlogpagetext'          => 'Cette page affiche l’historique des créations de comptes utilisateurs.',
+'newuserlog-byemail'          => 'mot de passe envoyé par courriel',
+'newuserlog-create-entry'     => 'Nouveau compte utilisateur',
+'newuserlog-create2-entry'    => 'a créé le nouveau compte $1',
+'newuserlog-autocreate-entry' => 'Compte créé automatiquement',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Droits des groupes utilisateur',
-'listgrouprights-summary'  => "Cette page contient une liste des groupes définis sur ce wiki ainsi que les droits d'accès qui y sont associés.
-Il peut y avoir des [[{{MediaWiki:Listgrouprights-helppage}}|informations additionnelles]] à propos des droits.",
-'listgrouprights-group'    => 'Groupe',
-'listgrouprights-rights'   => 'Droits associés',
-'listgrouprights-helppage' => 'Help:Droits des groupes',
-'listgrouprights-members'  => '(liste des membres)',
+'listgrouprights'                 => 'Droits des groupes d’utilisateurs',
+'listgrouprights-summary'         => 'Cette page contient une liste des groupes définis sur ce wiki ainsi que les droits d’accès qui leur sont associés.
+Des [[{{MediaWiki:Listgrouprights-helppage}}|informations additionnelles]] peuvent exister au sujet des droits individuels.',
+'listgrouprights-group'           => 'Groupe',
+'listgrouprights-rights'          => 'Droits associés',
+'listgrouprights-helppage'        => 'Help:Droits des groupes',
+'listgrouprights-members'         => '(liste des membres)',
+'listgrouprights-addgroup'        => 'Ajouter des membres {{PLURAL:$2|au groupe|aux groupes}} : $1',
+'listgrouprights-removegroup'     => 'Retirer des membres {{PLURAL:$2|du groupe|des groupes}} : $1',
+'listgrouprights-addgroup-all'    => 'Ajouter des membres à tous les groupes',
+'listgrouprights-removegroup-all' => 'Retirer des membres de tous les groupes',
 
 # E-mail user
-'mailnologin'     => 'Pas d’adresse',
-'mailnologintext' => 'Vous devez être [[Special:UserLogin|connecté]] et avoir indiqué une adresse électronique valide dans vos [[Special:Preferences|préférences]] pour avoir la permission d’envoyer un message à un autre utilisateur.',
-'emailuser'       => 'Envoyer un message à cet utilisateur',
-'emailpage'       => 'Envoyer un courriel à l’utilisateur',
-'emailpagetext'   => 'Vous pouvez utiliser le formulaire ci-dessous pour envoyer un courriel à cet utilisateur.
-L’adresse électronique que vous avez indiquée dans [[Special:Preferences|vos préférences]] apparaîtra dans le champ « Expéditeur » de votre message. Ainsi, le destinataire pourra vous répondre directement.',
-'usermailererror' => 'Erreur dans le sujet du courriel :',
-'defemailsubject' => 'Courriel envoyé depuis {{SITENAME}}',
-'noemailtitle'    => 'Pas d’adresse électronique',
-'noemailtext'     => 'Vous ne pouvez joindre cet utilisateur par courrier électronique :
-* soit parce qu’il n’a pas spécifié d’adresse électronique valide (et authentifiée),
-* soit parce qu’il a choisi, dans ses préférences utilisateur, de ne pas recevoir de courrier électronique des autres utilisateurs.',
-'emailfrom'       => 'Expéditeur :',
-'emailto'         => 'Destinataire :',
-'emailsubject'    => 'Objet :',
-'emailmessage'    => 'Message :',
-'emailsend'       => 'Envoyer',
-'emailccme'       => 'M’envoyer par courriel une copie de mon message.',
-'emailccsubject'  => 'Copie de votre message à $1 : $2',
-'emailsent'       => 'Message envoyé',
-'emailsenttext'   => 'Votre message a été envoyé.',
-'emailuserfooter' => 'Ce courriel a été envoyé par « $1 » à « $2 » par la fonction « Envoyer un courriel à l’utilisateur » sur {{SITENAME}}.',
+'mailnologin'      => 'Pas d’adresse d’expéditeur',
+'mailnologintext'  => 'Vous devez être [[Special:UserLogin|identifié]] et avoir indiqué une adresse électronique valide dans vos [[Special:Preferences|préférences]] pour pouvoir envoyer des courriels à d’autres utilisateurs.',
+'emailuser'        => 'Lui envoyer un courriel',
+'emailpage'        => 'Envoyer un courriel à l’utilisateur',
+'emailpagetext'    => 'Vous pouvez utiliser le formulaire ci-dessous pour envoyer un courriel à cet utilisateur.
+L’adresse électronique que vous avez indiquée dans [[Special:Preferences|vos préférences]] apparaîtra dans le champ « Expéditeur » de votre message ; ainsi, le destinataire pourra vous répondre directement.',
+'usermailererror'  => 'Erreur dans l’objet du courriel :',
+'defemailsubject'  => 'Courriel de {{SITENAME}}',
+'noemailtitle'     => 'Destinataire sans adresse de courriel',
+'noemailtext'      => 'Cet utilisateur n’a pas spécifié une adresse de courriel valide.',
+'nowikiemailtitle' => 'Pas de courriel autorisé',
+'nowikiemailtext'  => 'Cet utilisateur a choisi de ne pas recevoir de courriel de la part d’autre utilisateurs.',
+'email-legend'     => 'Envoyer un courriel à un autre utilisateur de {{SITENAME}}',
+'emailfrom'        => 'Expéditeur :',
+'emailto'          => 'Destinataire :',
+'emailsubject'     => 'Objet :',
+'emailmessage'     => 'Message :',
+'emailsend'        => 'Envoyer',
+'emailccme'        => 'M’envoyer par courriel une copie de mon message.',
+'emailccsubject'   => 'Copie de votre message à $1 : $2',
+'emailsent'        => 'Courriel envoyé',
+'emailsenttext'    => 'Votre message a été envoyé par courriel.',
+'emailuserfooter'  => 'Ce courriel a été envoyé par « $1 » à « $2 » par la fonction « Envoyer un courriel à l’utilisateur » de {{SITENAME}}.',
 
 # Watchlist
-'watchlist'            => 'Liste de suivi',
-'mywatchlist'          => 'Liste de suivi',
-'watchlistfor'         => "(pour l’utilisateur '''$1''')",
-'nowatchlist'          => 'Votre liste de suivi ne contient aucune page.',
-'watchlistanontext'    => 'Pour pouvoir afficher ou éditer les éléments de votre liste de suivi, vous devez vous $1.',
+'watchlist'            => 'Ma liste de suivi',
+'mywatchlist'          => 'ma liste de suivi',
+'watchlistfor'         => "(pour '''$1''')",
+'nowatchlist'          => 'Votre liste de suivi ne référence aucune page.',
+'watchlistanontext'    => 'Veuillez vous $1 pour visualiser ou modifier les éléments de votre liste de suivi.',
 'watchnologin'         => 'Non connecté',
-'watchnologintext'     => 'Vous devez être [[Special:UserLogin|connecté]] pour modifier votre liste.',
+'watchnologintext'     => 'Vous devez être [[Special:UserLogin|identifié]] pour modifier votre liste de suivi.',
 'addedwatch'           => 'Ajouté à la liste de suivi',
 'addedwatchtext'       => "La page « [[:$1]] » a été ajoutée à votre [[Special:Watchlist|liste de suivi]].
-Les futures modifications de cette page et de sa page de discussion y seront listées et la page apparaîtra '''en gras''' dans la [[Special:RecentChanges|liste des modifications récentes]] pour faciliter sa visualisation.",
+Les futures modifications de cette page et de sa page de discussion y seront listées et la page apparaîtra '''en gras''' dans la [[Special:RecentChanges|liste des modifications récentes]] pour en faciliter le repérage.",
 'removedwatch'         => 'Retirée de la liste de suivi',
 'removedwatchtext'     => 'La page « [[:$1]] » a été retirée de votre [[Special:Watchlist|liste de suivi]].',
 'watch'                => 'Suivre',
 'watchthispage'        => 'Suivre cette page',
 'unwatch'              => 'Ne plus suivre',
 'unwatchthispage'      => 'Ne plus suivre',
-'notanarticle'         => 'Pas une page de contenu',
-'notvisiblerev'        => 'Version supprimée',
-'watchnochange'        => 'Aucune des pages que vous suivez n’a été modifiée pendant la période affichée',
-'watchlist-details'    => 'Il y a $1 {{PLURAL:$1|page|pages}} dans votre liste de suivi, sans compter les pages de discussion.',
+'notanarticle'         => 'Ce n’est pas une page de contenu',
+'notvisiblerev'        => 'La version a été supprimée',
+'watchnochange'        => 'Aucun des éléments que vous suivez n’a été modifié durant la période affichée.',
+'watchlist-details'    => 'Votre liste de suivi référence $1 page{{PLURAL:$1||s}}, sans compter les pages de discussion.',
 'wlheader-enotif'      => '* La notification par courriel est activée.',
-'wlheader-showupdated' => '* Les pages qui ont été modifiées depuis votre dernière visite sont montrées en <b>gras</b>',
-'watchmethod-recent'   => 'vérification des modifications récentes des pages suivies',
-'watchmethod-list'     => 'vérification des pages suivies pour des modifications récentes',
-'watchlistcontains'    => "Votre liste de suivi contient '''$1''' {{PLURAL:$1|page|pages}}.",
-'iteminvalidname'      => 'Problème avec l’article « $1 » : le nom est invalide.',
-'wlnote'               => 'Ci-dessous se {{PLURAL:$1|trouve la dernière modification|trouvent les $1 dernières modifications}} depuis {{PLURAL:$2|la dernière heure|les <b>$2</b> dernières heures}}.',
-'wlshowlast'           => 'Montrer les dernières $1 heures, les derniers $2 jours, ou $3.',
-'watchlist-show-bots'  => 'Afficher les contributions de bots',
-'watchlist-hide-bots'  => 'Masquer les contributions de bots',
-'watchlist-show-own'   => 'Afficher mes modifications',
-'watchlist-hide-own'   => 'Masquer mes modifications',
-'watchlist-show-minor' => 'Afficher les modifications mineures',
-'watchlist-hide-minor' => 'Masquer les modifications mineures',
+'wlheader-showupdated' => "* Les pages qui ont été modifiées depuis votre dernière visite sont affichées en '''gras'''.",
+'watchmethod-recent'   => 'vérification des modifications récentes pour y trouver des pages suivies',
+'watchmethod-list'     => 'vérification des pages suivies pour y trouver des modifications récentes',
+'watchlistcontains'    => 'Votre liste de suivi référence $1 page{{PLURAL:$1||s}}.',
+'iteminvalidname'      => 'Problème avec l’élément « $1 » : le nom est invalide.',
+'wlnote'               => "Ci-dessous {{PLURAL:$1|figure la dernière modification effectuée|figurent les '''$1''' dernières modifications effectuées}} durant {{PLURAL:$2|la dernière heure|les '''$2''' dernières heures}}.",
+'wlshowlast'           => 'Montrer les dernières $1 heures, les derniers $2 jours ou bien $3',
+'watchlist-options'    => 'Options de la liste de suivi',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Suivi...',
 'unwatching' => 'Fin du suivi...',
 
-'enotif_mailer'                => 'Système d’expédition de notification de {{SITENAME}}',
+'enotif_mailer'                => 'Système de notification par courriel de {{SITENAME}}',
 'enotif_reset'                 => 'Marquer toutes les pages comme visitées',
 'enotif_newpagetext'           => 'Ceci est une nouvelle page.',
 'enotif_impersonal_salutation' => 'Utilisateur de {{SITENAME}}',
 'changed'                      => 'modifiée',
 'created'                      => 'créée',
 'enotif_subject'               => 'La page $PAGETITLE de {{SITENAME}} a été $CHANGEDORCREATED par $PAGEEDITOR',
-'enotif_lastvisited'           => 'Consultez $1 pour tous les changements depuis votre dernière visite.',
-'enotif_lastdiff'              => 'Consultez $1 pour voir cette modification.',
+'enotif_lastvisited'           => 'Voyez $1 pour tous les changements depuis votre dernière visite.',
+'enotif_lastdiff'              => 'Voyez $1 pour visualiser ces changements.',
 'enotif_anon_editor'           => 'utilisateur non-enregistré $1',
 'enotif_body'                  => 'Cher $WATCHINGUSERNAME,
 
-la page $PAGETITLE de {{SITENAME}} a été $CHANGEDORCREATED le $PAGEEDITDATE par $PAGEEDITOR, voyez $PAGETITLE_URL pour la version actuelle.
+La page « $PAGETITLE » de {{SITENAME}} a été $CHANGEDORCREATED le $PAGEEDITDATE par « $PAGEEDITOR », visitez $PAGETITLE_URL pour visualiser la version actuelle.
 
 $NEWPAGE
 
-Résumé de l’éditeur : $PAGESUMMARY $PAGEMINOREDIT
+Résumé du contributeur : $PAGESUMMARY $PAGEMINOREDIT
 
-Contactez l’éditeur :
+Contactez ce contributeur :
 courriel : $PAGEEDITOR_EMAIL
 wiki : $PAGEEDITOR_WIKI
 
-Il n’y aura pas de nouvelles notifications en cas d’autres modifications à moins que vous ne visitiez cette page. Vous pouvez aussi remettre à zéro le notificateur pour toutes les pages de votre liste de suivi.
+Il n’y aura pas d’autres notifications en cas de changements ultérieurs, à moins que vous ne visitiez cette page.
+Vous pouvez aussi réinitialiser les drapeaux de notification pour toutes les pages de votre liste de suivi.
 
-             Votre système de notification {{SITENAME}}
+             Votre système de notification de {{SITENAME}}
 
 --
 Pour modifier les paramètres de votre liste de suivi, visitez
@@ -1686,76 +1933,107 @@ Pour modifier les paramètres de votre liste de suivi, visitez
 Retour et assistance :
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Supprimer la page',
-'confirm'                     => 'Confirmer',
-'excontent'                   => 'contenant « $1 »',
-'excontentauthor'             => 'Le contenu était : « $1 » et l’unique contributeur en était « [[Special:Contributions/$2|$2]] »',
-'exbeforeblank'               => 'Contenait avant blanchiment : $1',
-'exblank'                     => 'page vide',
-'delete-confirm'              => 'Supprimer « $1 »',
-'delete-legend'               => 'Suppression',
-'historywarning'              => 'Attention, la page que vous êtes sur le point de supprimer a un historique :',
-'confirmdeletetext'           => 'Vous êtes sur le point de supprimer définitivement de la base de données une page ou une image, ainsi que toutes ses versions antérieures. Veuillez confirmer que c’est bien là ce que vous voulez faire, que vous en comprenez les conséquences et que vous faites cela en accord avec les [[{{MediaWiki:Policy-url}}|règles internes]].',
-'actioncomplete'              => 'Action effectuée',
-'deletedtext'                 => '« <nowiki>$1</nowiki> » a été supprimé.
+# Delete
+'deletepage'             => 'Supprimer la page',
+'confirm'                => 'Confirmer',
+'excontent'              => 'contenait « $1 »',
+'excontentauthor'        => 'contenait « $1 » (et son seul contributeur était [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'contenait avant blanchiment « $1 »',
+'exblank'                => 'la page était vide',
+'delete-confirm'         => 'Supprimer « $1 »',
+'delete-legend'          => 'Supprimer',
+'historywarning'         => 'Attention, la page que vous êtes sur le point de supprimer a un historique :',
+'confirmdeletetext'      => 'Vous êtes sur le point de supprimer une page ou un fichier, ainsi que toutes ses versions antérieures historisées.
+Veuillez confirmer que c’est bien là ce que vous voulez faire, que vous en comprenez les conséquences et que vous faîtes ceci en accord avec les [[{{MediaWiki:Policy-url}}|règles internes]].',
+'actioncomplete'         => 'Action effectuée',
+'deletedtext'            => '« <nowiki>$1</nowiki> » a été supprimé.
 Voir $2 pour une liste des suppressions récentes.',
-'deletedarticle'              => 'a effacé « [[$1]] »',
-'suppressedarticle'           => 'caché  « [[$1]] »',
-'dellogpage'                  => 'Historique des suppressions',
-'dellogpagetext'              => 'Voici la liste des suppressions récentes.
-L’heure indiquée est celle du serveur.',
-'deletionlog'                 => 'historique des suppressions',
-'reverted'                    => 'Rétablissement de la version précédente',
-'deletecomment'               => 'Motif de la suppression',
-'deleteotherreason'           => 'Motifs supplémentaires ou autres :',
-'deletereasonotherlist'       => 'Autre motif',
-'deletereason-dropdown'       => '*Motifs de suppression les plus courants
+'deletedarticle'         => 'a effacé « [[$1]] »',
+'suppressedarticle'      => 'a supprimé « [[$1]] »',
+'dellogpage'             => 'Journal des suppressions',
+'dellogpagetext'         => 'Voici la liste des suppressions les plus récentes.',
+'deletionlog'            => 'Journal des suppressions',
+'reverted'               => 'Version précédente rétablie',
+'deletecomment'          => 'Motif de suppression :',
+'deleteotherreason'      => 'Motif autre ou supplémentaire :',
+'deletereasonotherlist'  => 'Autre motif',
+'deletereason-dropdown'  => '* Motifs de suppression les plus courants
 ** Demande de l’auteur
 ** Violation des droits d’auteur
-** Vandalisme',
-'delete-edit-reasonlist'      => 'Modifier les motifs de la suppression',
-'delete-toobig'               => 'Cette page possède un historique important dépassant $1 {{PLURAL:$1|version|versions}}. La suppression de telles pages a été limitée afin d’éviter des perturbations accidentelles de {{SITENAME}}.',
-'delete-warning-toobig'       => 'Cette page possède un historique important dépassant $1 {{PLURAL:$1|version|versions}}. La supprimer peut perturber le fonctionnement de la base de données de {{SITENAME}} ; à effectuer avec prudence.',
-'rollback'                    => 'révoquer modifications',
-'rollback_short'              => 'Révoquer',
-'rollbacklink'                => 'révoquer',
-'rollbackfailed'              => 'La révocation a échoué',
-'cantrollback'                => 'Impossible de révoquer : l’auteur est la seule personne à avoir effectué des modifications sur cette page.',
-'alreadyrolled'               => 'Impossible de révoquer la dernière modification de la page « [[$1]] » effectuée par [[User:$2|$2]] ([[User talk:$2|Discussion]]) ; quelqu’un d’autre a déjà modifié ou révoqué la page. La dernière modification a été effectuée par [[User:$3|$3]] ([[User talk:$3|Discussion]]).',
-'editcomment'                 => 'Le résumé de la modification était: <i>« $1 »</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Révocation des modifications par [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) vers la dernière version de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Révocation des modifications de $1 ; retour à la version de $2.',
-'sessionfailure'              => 'Votre session de connexion semble avoir des problèmes ; cette action a été annulée en prévention d’un piratage de session. Cliquez sur « Précédent » et rechargez la page d’où vous venez, puis réessayez.',
-'protectlogpage'              => 'Historique des protections',
-'protectlogtext'              => 'Voici une liste des protections et des déprotections.
-Consultez la [[Special:ProtectedPages|liste des pages protégées]] pour la liste des protections actuelles.',
+** Vandalisme
+** Langue erronée
+** Message mis à jour de façon externe',
+'delete-edit-reasonlist' => 'Modifier les motifs de suppression de page',
+'delete-toobig'          => 'Cette page possède un historique important de modifications, dépassant $1 version{{PLURAL:$1||s}}.
+La suppression de telles pages a été restreinte pour prévenir des perturbations accidentelles de {{SITENAME}}.',
+'delete-warning-toobig'  => 'Cette page possède un historique important de modifications, dépassant $1 version{{PLURAL:$1||s}}.
+La supprimer peut perturber le fonctionnement de la base de données de {{SITENAME}} ;
+veuiller ne procéder qu’avec prudence.',
+
+# Rollback
+'rollback'         => 'Révoquer les modifications',
+'rollback_short'   => 'Révoquer',
+'rollbacklink'     => 'révoquer',
+'rollbackfailed'   => 'La révocation a échoué',
+'cantrollback'     => 'Impossible de révoquer la modification ;
+le dernier contributeur est le seul auteur de cette page.',
+'alreadyrolled'    => 'Impossible de révoquer la dernière modification de la page « [[:$1]] » effectuée par [[User:$2|$2]] ([[User talk:$2|Discuter]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) ;
+quelqu’un d’autre a déjà modifié ou révoqué la page.
+
+La dernière modification de la page a été effectuée par [[User:$3|$3]] ([[User talk:$3|Discuter]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Le résumé de la modification était : « ''$1'' ».", # only shown if there is an edit comment
+'revertpage'       => 'Révocation des modifications de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) vers la dernière version de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Révocation des modifications effectuées par $1 ;
+rétablissement de la dernière version par $2.',
+'sessionfailure'   => 'Votre session de connexion semble avoir des problèmes ;
+cette action a été annulée en prévention d’un piratage de session.
+Veuillez cliquer sur « Précédent », rechargez la page d’où vous venez, puis réessayez.',
+
+# Protect
+'protectlogpage'              => 'Journal des protections',
+'protectlogtext'              => 'Voici une liste historique des protections et déprotections de pages.
+Consultez la [[Special:ProtectedPages|liste des pages protégées]] pour la liste des protections actuellement opérationnelles.',
 'protectedarticle'            => 'a protégé « [[$1]] »',
 'modifiedarticleprotection'   => 'a modifié le niveau de protection de « [[$1]] »',
 'unprotectedarticle'          => 'a déprotégé « [[$1]] »',
-'protect-title'               => 'Protéger « $1 »',
+'movedarticleprotection'      => 'a déplacé les paramètres de protection depuis « [[$2]] » vers « [[$1]] »',
+'protect-title'               => 'Changer le niveau de protection pour « [[$1]] »',
+'prot_1movedto2'              => '[[$1]] renommé en [[$2]]',
 'protect-legend'              => 'Confirmer la protection',
-'protectcomment'              => 'Raison de la protection',
-'protectexpiry'               => 'Expiration :',
-'protect_expiry_invalid'      => 'Le temps d’expiration est invalide.',
-'protect_expiry_old'          => 'Le temps d’expiration est déjà passé.',
+'protectcomment'              => 'Motif de la protection :',
+'protectexpiry'               => 'Date d’expiration :',
+'protect_expiry_invalid'      => 'La date d’expiration est invalide.',
+'protect_expiry_old'          => 'La date d’expiration est déjà passée.',
 'protect-unchain'             => 'Débloquer les permissions de renommage',
-'protect-text'                => 'Vous pouvez consulter et modifier le niveau de protection de la page <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Vous ne pouvez pas modifier le niveau de protection tant que vous êtes bloqué.
-Voici les réglages actuels de la page <strong>$1</strong> :',
-'protect-locked-dblock'       => 'Le niveau de protection ne peut pas être modifié car la base de données est bloquée.
-Voici les réglages actuels de la page <strong>$1</strong> :',
-'protect-locked-access'       => 'Vous n’avez pas les droits nécessaires pour modifier la protection de la page.
-Voici les réglages actuels de la page <strong>$1</strong> :',
+'protect-text'                => "Vous pouvez consulter et modifier le niveau de protection de la page '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Vous ne pouvez pas modifier le niveau de protection tant que vous êtes bloqué.
+Voici les réglages actuels de la page '''$1''' :",
+'protect-locked-dblock'       => "Le niveau de protection ne peut pas être modifié car la base de données est verrouillée.
+Voici les réglages actuels de la page '''$1''' :",
+'protect-locked-access'       => "Vous n’avez pas les droits nécessaires pour modifier les niveaux de protection de pages.
+Voici les réglages actuels de la page '''$1''' :",
 'protect-cascadeon'           => 'Cette page est actuellement protégée car incluse dans {{PLURAL:$1|la page suivante|les pages suivantes}}, {{PLURAL:$1|laquelle a été protégée|lesquelles ont été protégées}} avec l’option « protection en cascade » activée. Vous pouvez changer le niveau de protection de cette page sans que cela n’affecte la protection en cascade.',
-'protect-default'             => 'Pas de protection',
-'protect-fallback'            => 'Nécessite l’habilitation « $1 »',
-'protect-level-autoconfirmed' => 'Semi-protection',
+'protect-default'             => 'Autoriser tous les utilisateurs',
+'protect-fallback'            => 'Nécessite la permission « $1 »',
+'protect-level-autoconfirmed' => 'Bloquer les nouveaux utilisateurs et les utilisateurs anonymes',
 'protect-level-sysop'         => 'Administrateurs uniquement',
 'protect-summary-cascade'     => 'protection en cascade',
-'protect-expiring'            => 'expire le $1',
-'protect-cascade'             => 'Protection en cascade - Protège toutes les pages incluses dans celle-ci.',
+'protect-expiring'            => 'expire le $1 (UTC)',
+'protect-expiry-indefinite'   => 'infini',
+'protect-cascade'             => 'Protège aussi les pages incluses dans celle-ci (protection en cascade)',
 'protect-cantedit'            => 'Vous ne pouvez pas changer les niveaux de protection de cette page car vous n’avez pas la permission de la modifier.',
+'protect-othertime'           => 'Autre date d’expiration :',
+'protect-othertime-op'        => 'autre date d’expiration',
+'protect-existing-expiry'     => 'Date d’expiration existante : $2 à $3',
+'protect-otherreason'         => 'Motif autre ou supplémentaire :',
+'protect-otherreason-op'      => 'motif autre ou supplémentaire',
+'protect-dropdown'            => '* Motifs de protection les plus courants
+** Vandalisme excessif
+** Messages ou liens publicitaires excessifs (spam)
+** Conflits d’édition contre-productifs
+** Page à fort trafic',
+'protect-edit-reasonlist'     => 'Modifier les motifs de protection',
+'protect-expiry-options'      => '1 heure:1 hour,1 jour:1 day,1 semaine:1 week,2 semaines:2 weeks,1 mois:1 month,3 mois:3 months,6 mois:6 months,1 an:1 year,indéfiniment:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permission :',
 'restriction-level'           => 'Niveau de restriction :',
 'minimum-size'                => 'Taille minimum',
@@ -1763,57 +2041,63 @@ Voici les réglages actuels de la page <strong>$1</strong> :',
 'pagesize'                    => '(octets)',
 
 # Restrictions (nouns)
-'restriction-edit'   => 'Modification',
-'restriction-move'   => 'Renommage',
+'restriction-edit'   => 'Modifier',
+'restriction-move'   => 'Renommer',
 'restriction-create' => 'Créer',
-'restriction-upload' => 'Importer',
+'restriction-upload' => 'Téléverser',
 
 # Restriction levels
-'restriction-level-sysop'         => 'Protection complète',
-'restriction-level-autoconfirmed' => 'Semi-protection',
-'restriction-level-all'           => 'Tous',
+'restriction-level-sysop'         => 'protection complète',
+'restriction-level-autoconfirmed' => 'semi-protection',
+'restriction-level-all'           => 'tout niveau',
 
 # Undelete
 'undelete'                     => 'Voir les pages supprimées',
-'undeletepage'                 => 'Voir et restaurer une page supprimée',
-'undeletepagetitle'            => "'''La liste suivante contient des versions supprimées de [[:$1]]'''.",
-'viewdeletedpage'              => 'Historique de la page supprimée',
-'undeletepagetext'             => 'Ces pages ont été supprimées et se trouvent dans l’archive. Elles figurent toujours dans la base de données et peuvent être restaurées.
-L’archive peut être effacée périodiquement.',
+'undeletepage'                 => 'Voir et restaurer des pages supprimées',
+'undeletepagetitle'            => "'''La liste suivante contient des versions supprimées de [[:$1|$1]]'''.",
+'viewdeletedpage'              => 'Visualiser les pages supprimées',
+'undeletepagetext'             => '{{PLURAL:$1|La page suivante a été supprimée et se trouve|Les pages suivantes ont été supprimées et se trouvent}} dans la base de données archive, d’où {{PLURAL:$1|elle peut|elles peuvent}} encore être restaurée{{PLURAL:$1||s}}.
+L’archive peut être nettoyée périodiquement.',
 'undelete-fieldset-title'      => 'Restaurer les versions',
 'undeleteextrahelp'            => "Pour restaurer l’historique complet de cette page, laissez vierges toutes les cases à cocher et cliquez '''''Restaurer'''''.
-Pour ne restaurer que certaines versions, cochez les cases correspondant aux versions qui sont à rétablir, puis cliquez sur '''''Restaurer'''''.
+Pour ne restaurer que certaines versions, cochez les cases correspondant aux versions à rétablir, puis cliquez sur '''''Restaurer'''''.
 En cliquant sur le bouton '''''Réinitialiser''''', la boîte de résumé et les cases cochées seront remises à zéro.",
-'undeleterevisions'            => '$1 {{PLURAL:$1|révision archivée|révisions archivées}}',
-'undeletehistory'              => 'Si vous restaurez la page, toutes les révisions seront replacées dans l’historique.
-
-Si une nouvelle page avec le même nom a été créée depuis la suppression, les révisions restaurées apparaîtront dans l’historique antérieur et la version courante ne sera pas automatiquement remplacée.',
-'undeleterevdel'               => 'La restauration ne sera pas effectuée si, au final, la version la plus récente de la page sera partiellement supprimée. Dans ce cas, vous devez déselectionner les versions les plus récentes (en haut). Les versions des fichiers auxquelles vous n’avez pas accès ne seront pas restaurées.',
-'undeletehistorynoadmin'       => 'Cette page a été supprimée. Le motif de la suppression est indiqué dans le résumé ci-dessous, avec les détails des utilisateurs qui l’ont modifié avant sa suppression. Le contenu de ces versions n’est accessible qu’aux administrateurs.',
-'undelete-revision'            => 'Version supprimée de $1, (révision du $2) par $3 :',
-'undeleterevision-missing'     => 'Version invalide ou manquante. Vous avez peut-être un mauvais lien, ou la version a été restaurée ou supprimée de l’archive.',
+'undeleterevisions'            => '$1 {{PLURAL:$1|version archivée|versions archivées}}',
+'undeletehistory'              => 'Si vous restaurez la page, toutes les versions seront replacées dans l’historique.
+Si une nouvelle page avec le même nom a été créée depuis la suppression, les versions restaurées apparaîtront dans l’historique antérieur et la version courante ne sera pas automatiquement remplacée.',
+'undeleterevdel'               => 'La restauration ne sera pas effectuée si, au final, la version la plus récente de la page ou du fichier reste partiellement supprimée.
+Dans de tels cas, vous devez décocher ou démasquer les versions effacées les plus récentes (en tête de liste).',
+'undeletehistorynoadmin'       => 'Cette page a été supprimée.
+Le motif de la suppression est indiqué dans le résumé ci-dessous, avec les détails des utilisateurs qui l’ont modifié avant sa suppression.
+Le contenu effectif de ces versions supprimées n’est accessible qu’aux administrateurs.',
+'undelete-revision'            => 'Version supprimée de $1 (version du $4 à $5) par $3 :',
+'undeleterevision-missing'     => 'Version incorrecte ou manquante.
+Vous avez peut-être un mauvais lien, ou la version a pu être restaurée ou supprimée de l’archive.',
 'undelete-nodiff'              => 'Aucune version précédente trouvée.',
 'undeletebtn'                  => 'Restaurer',
 'undeletelink'                 => 'restaurer',
 'undeletereset'                => 'Réinitialiser',
+'undeleteinvert'               => 'Inverser la sélection',
 'undeletecomment'              => 'Résumé :',
 'undeletedarticle'             => 'a restauré « [[$1]] »',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|version restaurée|versions restaurées}}',
-'undeletedrevisions-files'     => '$1 {{PLURAL:$1|version|versions}} et $2 {{PLURAL:$2|fichier|fichiers}} restaurés',
+'undeletedrevisions-files'     => '$1 version{{PLURAL:$1||s}} et $2 fichier{{PLURAL:$2||s}} restaurés',
 'undeletedfiles'               => '$1 {{PLURAL:$1|fichier restauré|fichiers restaurés}}',
-'cannotundelete'               => 'La restauration a échoué. Un autre utilisateur a probablement déjà restauré la page.',
+'cannotundelete'               => 'La restauration a échoué ;
+un autre utilisateur a probablement déjà restauré la page.',
 'undeletedpage'                => "<big>'''La page $1 a été restaurée.'''</big>
 
-Consultez l’[[Special:Log/delete|historique des suppressions]] pour voir la liste des récentes suppressions et restaurations de pages.",
-'undelete-header'              => 'Consultez l’[[Special:Log/delete|historique des suppressions]] pour voir les pages récemment supprimées.',
-'undelete-search-box'          => 'Chercher une page supprimée',
+Consultez le [[Special:Log/delete|journal des suppressions]] pour obtenir la liste des récentes suppressions et restaurations.",
+'undelete-header'              => 'Consultez le [[Special:Log/delete|journal des suppressions]] pour lister les pages récemment supprimées.',
+'undelete-search-box'          => 'Rechercher des pages supprimées',
 'undelete-search-prefix'       => 'Montrer les pages commençant par :',
-'undelete-search-submit'       => 'Chercher',
-'undelete-no-results'          => 'Aucune page correspondant à la recherche n’a été trouvée dans les archives.',
-'undelete-filename-mismatch'   => 'Impossible de restaurer le fichier daté du $1 : fichier introuvable',
-'undelete-bad-store-key'       => 'Impossible de restaurer le fichier daté du $1 : le fichier était absent avant la suppression.',
-'undelete-cleanup-error'       => 'Erreur lors de la suppression de l’archive inutilisée « $1 ».',
-'undelete-missing-filearchive' => 'Impossible de restaurer le fichier avec l’ID $1 parce qu’il n’est pas dans la base de données. Il a peut-être déjà été restauré.',
+'undelete-search-submit'       => 'Rechercher',
+'undelete-no-results'          => 'Aucune page correspondante n’a été trouvée dans les archives de suppression.',
+'undelete-filename-mismatch'   => 'Impossible de restaurer la version du fichier datée du $1 : le nom de fichier ne correspond pas.',
+'undelete-bad-store-key'       => 'Impossible de restaurer la version du fichier datée du $1 : le fichier était absent avant la suppression.',
+'undelete-cleanup-error'       => 'Erreur lors de la suppression du fichier d’archive inutilisé « $1 ».',
+'undelete-missing-filearchive' => 'Impossible de restaurer le fichier d’archive avec l’identifiant $1 parce qu’il n’est pas dans la base de données.
+Il a peut-être déjà été restauré.',
 'undelete-error-short'         => 'Erreur lors de la restauration du fichier : $1',
 'undelete-error-long'          => 'Des erreurs ont été rencontrées lors de la restauration du fichier :
 
@@ -1822,321 +2106,362 @@ $1',
 'undelete-show-file-submit'    => 'Oui',
 
 # Namespace form on various pages
-'namespace'      => 'Espace de noms :',
+'namespace'      => 'Espace de nommage :',
 'invert'         => 'Inverser la sélection',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contributions de l’utilisateur',
-'mycontris'     => 'Contributions',
-'contribsub2'   => 'Liste des contributions de $1 ($2). Les pages qui ont été effacées ne sont pas affichées.',
-'nocontribs'    => 'Aucune modification correspondant à ces critères n’a été trouvée.',
-'uctop'         => '(dernière)',
-'month'         => 'À partir du mois (et précédents) :',
-'year'          => 'À partir de l’année (et précédentes) :',
-
-'sp-contributions-newbies'     => 'Ne montrer que les contributions des nouveaux utilisateurs',
-'sp-contributions-newbies-sub' => 'Liste des contributions des nouveaux utilisateurs. Les pages qui ont été supprimées ne sont pas affichées.',
-'sp-contributions-blocklog'    => 'Historique des blocages',
-'sp-contributions-search'      => 'Chercher les contributions',
-'sp-contributions-username'    => 'Adresse IP ou nom d’utilisateur:',
-'sp-contributions-submit'      => 'Chercher',
+'contributions'       => 'Contributions de l’utilisateur',
+'contributions-title' => 'Liste des contributions de l’utilisateur $1',
+'mycontris'           => 'Mes contributions',
+'contribsub2'         => 'Pour $1 ($2)',
+'nocontribs'          => 'Aucune modification correspondant à ces critères n’a été trouvée.',
+'uctop'               => '(dernière)',
+'month'               => 'À partir du mois (et précédents) :',
+'year'                => 'À partir de l’année (et précédentes) :',
+
+'sp-contributions-newbies'       => 'Ne montrer que les contributions des nouveaux utilisateurs',
+'sp-contributions-newbies-sub'   => 'Parmi les nouveaux comptes',
+'sp-contributions-newbies-title' => 'Contributions d’utilisateurs parmi les nouveaux comptes',
+'sp-contributions-blocklog'      => 'Journal des blocages',
+'sp-contributions-search'        => 'Rechercher les contributions',
+'sp-contributions-username'      => 'Adresse IP ou nom d’utilisateur :',
+'sp-contributions-submit'        => 'Rechercher',
 
 # What links here
 'whatlinkshere'            => 'Pages liées',
 'whatlinkshere-title'      => 'Pages qui pointent vers « $1 »',
 'whatlinkshere-page'       => 'Page :',
-'linklistsub'              => '(Liste de liens)',
-'linkshere'                => 'Les pages ci-dessous contiennent un lien vers <b>[[:$1]]</b> :',
-'nolinkshere'              => 'Aucune page ne contient de lien vers <b>[[:$1]]</b>.',
-'nolinkshere-ns'           => "Aucune page ne contient de lien vers '''[[:$1]]''' dans l’espace de nom choisi.",
+'linkshere'                => "Les pages ci-dessous contiennent un lien vers '''[[:$1]]''' :",
+'nolinkshere'              => "Aucune page ne contient de lien vers '''[[:$1]]'''.",
+'nolinkshere-ns'           => "Aucune page ne contient de lien vers '''[[:$1]]''' dans l’espace de nommage choisi.",
 'isredirect'               => 'page de redirection',
 'istemplate'               => 'inclusion',
-'isimage'                  => 'lien du fichier',
+'isimage'                  => 'fichier lié',
 'whatlinkshere-prev'       => '{{PLURAL:$1|précédente|$1 précédentes}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|suivante|$1 suivantes}}',
 'whatlinkshere-links'      => '� liens',
-'whatlinkshere-hideredirs' => '$1 redirections',
-'whatlinkshere-hidetrans'  => '$1 transclusions',
-'whatlinkshere-hidelinks'  => '$1 liens',
-'whatlinkshere-hideimages' => '$1 liens de fichiers',
+'whatlinkshere-hideredirs' => '$1 les redirections',
+'whatlinkshere-hidetrans'  => '$1 les inclusions',
+'whatlinkshere-hidelinks'  => '$1 les liens',
+'whatlinkshere-hideimages' => '$1 les fichiers liés',
 'whatlinkshere-filters'    => 'Filtres',
 
 # Block/unblock
-'blockip'                         => 'Bloquer en écriture',
-'blockip-legend'                  => 'Bloquer en écriture',
-'blockiptext'                     => 'Utilisez le formulaire ci-dessous pour bloquer l’accès en écriture à partir d’une adresse IP donnée ou d’un nom d’utilisateur.
-
-Une telle mesure ne doit être prise que pour empêcher le vandalisme et en accord avec les [[{{MediaWiki:Policy-url}}|règles internes]].
-Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui ont été vandalisées).',
-'ipaddress'                       => 'Adresse IP',
-'ipadressorusername'              => 'Adresse IP ou nom d’utilisateur',
-'ipbexpiry'                       => 'Durée du blocage',
-'ipbreason'                       => 'Motif',
+'blockip'                         => 'Bloquer l’utilisateur',
+'blockip-legend'                  => 'Bloquer l’utilisateur',
+'blockiptext'                     => 'Utilisez le formulaire ci-dessous pour bloquer l’accès aux modifications faites à partir d’une adresse IP spécifique ou d’un nom d’utilisateur.
+Une telle mesure ne devrait être prise que pour prévenir le vandalisme et en accord avec les [[{{MediaWiki:Policy-url}}|règles internes]].
+Donnez ci-dessous un motif précis (par exemple en citant les pages qui ont été vandalisées).',
+'ipaddress'                       => 'Adresse IP :',
+'ipadressorusername'              => 'Adresse IP ou nom d’utilisateur :',
+'ipbexpiry'                       => 'Durée avant expiration :',
+'ipbreason'                       => 'Motif :',
 'ipbreasonotherlist'              => 'Autre motif',
-'ipbreason-dropdown'              => '
-* Motifs de blocage les plus fréquents
-** Vandalisme
-** Insertion d’informations fausses
-** Suppression de contenu sans justification
+'ipbreason-dropdown'              => '* Motifs de blocage les plus fréquents
+** Insertion de fausses informations
+** Suppression injustifiée de contenu des pages
 ** Insertion répétée de liens externes publicitaires (spam)
-** Insertion de contenu sans aucun sens
+** Insertion de contenu sans aucun sens et de déchets dans les pages
 ** Tentative d’intimidation ou harcèlement
 ** Abus d’utilisation de comptes multiples
 ** Nom d’utilisateur inacceptable, injurieux ou diffamant',
 'ipbanononly'                     => 'Bloquer uniquement les utilisateurs anonymes',
 'ipbcreateaccount'                => 'Empêcher la création de compte',
 'ipbemailban'                     => 'Empêcher l’utilisateur d’envoyer des courriels',
-'ipbenableautoblock'              => 'Bloquer automatiquement les adresses IP utilisées par cet utilisateur',
+'ipbenableautoblock'              => 'Bloquer automatiquement la dernière adresse IP utilisée par l’utilisateur et toutes ses IPs ultérieures qu’il pourrait essayer',
 'ipbsubmit'                       => 'Bloquer cet utilisateur',
-'ipbother'                        => 'Autre durée',
+'ipbother'                        => 'Autre durée :',
 'ipboptions'                      => '2 heures:2 hours,1 jour:1 day,3 jours:3 days,1 semaine:1 week,2 semaines:2 weeks,1 mois:1 month,3 mois:3 months,6 mois:6 months,1 an:1 year,indéfiniment:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'autre',
-'ipbotherreason'                  => 'Motif différent ou supplémentaire',
-'ipbhidename'                     => 'Masquer le nom d’utilisateur de l’historique des blocages, de la liste des blocages actifs et de la liste des utilisateurs',
+'ipbotherreason'                  => 'Motif différent ou supplémentaire :',
+'ipbhidename'                     => 'Masquer le nom d’utilisateur du journal des blocages, de la liste des blocages actifs et de la liste des utilisateurs',
 'ipbwatchuser'                    => 'Suivre les pages utilisateur et de discussion de cet utilisateur',
-'badipaddress'                    => 'L’adresse IP n’est pas correcte.',
+'ipballowusertalk'                => 'Permet à cet utilisateur de modifier sa propre page de discussion durant sa période de blocage',
+'ipb-change-block'                => 'Bloquer à nouveau cet utilisateur avec ces paramètres',
+'badipaddress'                    => 'Adresse IP incorrecte',
 'blockipsuccesssub'               => 'Blocage réussi',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] a été bloqué.<br />
-Vous pouvez consulter la [[Special:IPBlockList|liste des comptes et des adresses IP bloqués]].',
+Consultez la [[Special:IPBlockList|liste des adresses IP et comptes bloqués]] pour réviser les blocages.',
 'ipb-edit-dropdown'               => 'Modifier les motifs de blocage par défaut',
 'ipb-unblock-addr'                => 'Débloquer $1',
 'ipb-unblock'                     => 'Débloquer un compte utilisateur ou une adresse IP',
 'ipb-blocklist-addr'              => 'Blocages existants pour $1',
 'ipb-blocklist'                   => 'Voir les blocages existants',
+'ipb-blocklist-contribs'          => 'Contributions pour $1',
 'unblockip'                       => 'Débloquer un utilisateur ou une adresse IP',
-'unblockiptext'                   => 'Utilisez le formulaire ci-dessous pour rétablir l’accès en écriture d’une adresse IP précédemment bloquée.',
-'ipusubmit'                       => 'Débloquer cette adresse',
+'unblockiptext'                   => 'Utilisez le formulaire ci-dessous pour rétablir l’accès aux modifications depuis une adresse IP ou un nom d’utilisateur.',
+'ipusubmit'                       => 'Supprimer ce blocage',
 'unblocked'                       => '[[User:$1|$1]] a été débloqué',
 'unblocked-id'                    => 'Le blocage $1 a été enlevé',
 'ipblocklist'                     => 'Adresses IP et utilisateurs bloqués',
 'ipblocklist-legend'              => 'Chercher un utilisateur bloqué',
 'ipblocklist-username'            => 'Nom de l’utilisateur ou adresse IP :',
-'ipblocklist-submit'              => 'Chercher',
-'blocklistline'                   => '$1 ($4) : $2 a bloqué $3',
+'ipblocklist-sh-userblocks'       => '$1 les bloquages de comptes',
+'ipblocklist-sh-tempblocks'       => '$1 les blocages temporaires',
+'ipblocklist-sh-addressblocks'    => '$1 les blocages d’adresses IP uniques',
+'ipblocklist-submit'              => 'Rechercher',
+'blocklistline'                   => '$1 : $2 a bloqué $3 ; $4',
 'infiniteblock'                   => 'permanent',
 'expiringblock'                   => 'expire le $1',
 'anononlyblock'                   => 'utilisateur non enregistré uniquement',
 'noautoblockblock'                => 'blocage automatique désactivé',
 'createaccountblock'              => 'création de compte bloquée',
 'emailblock'                      => 'courriel bloqué',
+'blocklist-nousertalk'            => 'ne peut modifier sa propre page de discussion',
 'ipblocklist-empty'               => 'La liste des adresses IP bloquées est actuellement vide.',
-'ipblocklist-no-results'          => 'L’adresse IP ou l’utilisateur n’a pas été bloqué.',
-'blocklink'                       => 'Bloquer',
+'ipblocklist-no-results'          => 'L’adresse IP ou l’utilisateur demandé n’est pas bloqué.',
+'blocklink'                       => 'bloquer',
 'unblocklink'                     => 'débloquer',
-'contribslink'                    => 'Contributions',
+'change-blocklink'                => 'modifier le blocage',
+'contribslink'                    => 'contributions',
 'autoblocker'                     => 'Vous avez été bloqué automatiquement parce que votre adresse IP a été récemment utilisée par « [[User:$1|$1]] ».
-La raison fournie pour le blocage de $1 est : « $2 ».',
-'blocklogpage'                    => 'Historique des blocages',
-'blocklogentry'                   => 'a bloqué « [[$1]] » - durée : $2 $3',
-'blocklogtext'                    => 'Ceci est la trace des blocages et déblocages des utilisateurs. Les adresses IP automatiquement bloquées ne sont pas listées. Consultez la [[Special:IPBlockList|liste des utilisateurs bloqués]] pour voir qui est actuellement effectivement bloqué.',
-'unblocklogentry'                 => 'a débloqué « $1 »',
+Le motif fourni pour le blocage de $1 est : « $2 ».',
+'blocklogpage'                    => 'Journal des blocages',
+'blocklog-fulllog'                => 'Journal complet des blocages',
+'blocklogentry'                   => 'a bloqué [[$1]] ; expiration : $2 $3',
+'reblock-logentry'                => 'a modifié les paramètres du blocage de [[$1]] avec une expiration au $2 $3',
+'blocklogtext'                    => 'Ceci est le journal des actions de blocages et déblocages d’utilisateurs.
+Les adresses IP automatiquement bloquées ne sont pas listées.
+Consultez la [[Special:IPBlockList|liste des IP bloquées]] pour voir les bannissements et blocages effectivement en cours.',
+'unblocklogentry'                 => 'a débloqué $1',
 'block-log-flags-anononly'        => 'utilisateurs anonymes seulement',
 'block-log-flags-nocreate'        => 'création de compte interdite',
 'block-log-flags-noautoblock'     => 'autoblocage des IP désactivé',
 'block-log-flags-noemail'         => 'envoi de courriel interdit',
-'block-log-flags-angry-autoblock' => 'autoblocage amélioré en service',
-'range_block_disabled'            => 'Le blocage de plages d’IP a été désactivé',
-'ipb_expiry_invalid'              => 'temps d’expiration invalide.',
-'ipb_expiry_temp'                 => 'Les plages des utilisateurs cachés devraient être permanentes.',
+'block-log-flags-nousertalk'      => 'ne peut modifier sa propre page de discussion',
+'block-log-flags-angry-autoblock' => 'autoblocage amélioré activé',
+'range_block_disabled'            => 'Le droit administrateur de créer des blocages de plages IP est désactivé.',
+'ipb_expiry_invalid'              => 'Durée d’expiration incorrecte.',
+'ipb_expiry_temp'                 => 'Les blocages de noms d’utilisateurs cachés doivent être permanents.',
 'ipb_already_blocked'             => '« $1 » est déjà bloqué',
-'ipb_cant_unblock'                => 'Erreur : Le blocage d’ID $1 n’existe pas. Il est possible qu’un déblocage ait déjà été effectué.',
-'ipb_blocked_as_range'            => 'Erreur : L’adresse IP $1 n’a pas été bloquée directement et ne peut donc pas être débloquée. Elle fait partie de la plage $2 qui, elle, peut être débloquée.',
+'ipb-needreblock'                 => '== Déjà bloqué ==
+$1 est déjà bloqué. Voulez-vous modifier les paramètres ?',
+'ipb_cant_unblock'                => 'Erreur : identifiant de blocage $1 non trouvé.
+Il est possible qu’un déblocage ait déjà été effectué.',
+'ipb_blocked_as_range'            => 'Erreur : l’adresse IP $1 n’est pas bloquée directement et ne peut donc pas être débloquée.
+Elle fait cependant partie de la plage $2 qui, elle, peut être débloquée.',
 'ip_range_invalid'                => 'Plage IP incorrecte.',
 'blockme'                         => 'Bloquez-moi',
 'proxyblocker'                    => 'Bloqueur de mandataires',
 'proxyblocker-disabled'           => 'Cette fonction est désactivée.',
-'proxyblockreason'                => 'Votre adresse IP a été bloquée car il s’agit d’un mandataire ouvert. Merci de contacter votre fournisseur d’accès Internet ou votre support technique et de l’informer de ce problème de sécurité.',
-'proxyblocksuccess'               => 'Terminé.',
-'sorbsreason'                     => 'Votre adresse IP est listée en tant que mandataire ouvert DNSBL.',
-'sorbs_create_account_reason'     => 'Votre adresse IP est listée en tant que mandataire ouvert DNSBL. Vous ne pouvez créer un compte',
+'proxyblockreason'                => 'Votre adresse IP a été bloquée car il s’agit d’un mandataire ouvert.
+Veuillez contacter votre fournisseur d’accès Internet ou votre support technique et l’informer de ce sérieux problème de sécurité.',
+'proxyblocksuccess'               => 'Fait.',
+'sorbsreason'                     => 'Votre adresse IP est listée comme mandataire ouvert dans le DNSBL utilisé par {{SITENAME}}.',
+'sorbs_create_account_reason'     => 'Votre adresse IP est listée comme mandataire ouvert dans le DNSBL utilisé par {{SITENAME}}.
+Vous ne pouvez pas créer un compte.',
+'cant-block-while-blocked'        => "Vous ne pouvez pas bloquer d'autres utilisateurs pendant que vous êtes bloqué.",
 
 # Developer tools
-'lockdb'              => 'Verrouiller la base',
-'unlockdb'            => 'Déverrouiller la base',
-'lockdbtext'          => 'Le verrouillage de la base de données empêchera tous les utilisateurs de modifier des pages, de sauvegarder leurs préférences, de modifier leur liste de suivi et d’effectuer toutes les autres opérations nécessitant des modifications dans la base de données.
-Veuillez confirmer que c’est bien là ce que vous voulez faire et que vous débloquerez la base dès que votre opération de maintenance sera terminée.',
-'unlockdbtext'        => 'Le déverrouillage de la base de données permettra à nouveau à tous les utilisateurs de modifier des pages, de mettre à jour leurs préférences et leur liste de suivi, ainsi que d’effectuer les autres opérations nécessitant des modifications dans la base de données.
-
+'lockdb'              => 'Verrouiller la base de données',
+'unlockdb'            => 'Déverrouiller la base de données',
+'lockdbtext'          => 'Le verrouillage de la base de données empêchera tous les utilisateurs de modifier des pages, d’enregistrer leurs préférences, de modifier leur liste de suivi et d’effectuer toutes les autres opérations nécessitant des changements dans la base de données.
+Veuillez confirmer que c’est bien là ce que vous voulez faire et que vous déverrouillerez la base dès que votre opération de maintenance sera terminée.',
+'unlockdbtext'        => 'Le déverrouillage de la base de données permettra à nouveau à tous les utilisateurs de modifier des pages, de changer leurs préférences, de modifier leur liste de suivi et d’effectuer les autres opérations nécessitant des changements dans la base de données.
 Veuillez confirmer que c’est bien là ce que vous voulez faire.',
 'lockconfirm'         => 'Oui, je confirme que je souhaite verrouiller la base de données.',
 'unlockconfirm'       => 'Oui, je confirme que je souhaite déverrouiller la base de données.',
-'lockbtn'             => 'Verrouiller la base',
-'unlockbtn'           => 'Déverrouiller la base',
+'lockbtn'             => 'Verrouiller la base de données',
+'unlockbtn'           => 'Déverrouiller la base de données',
 'locknoconfirm'       => 'Vous n’avez pas coché la case de confirmation.',
-'lockdbsuccesssub'    => 'Verrouillage de la base réussi.',
-'unlockdbsuccesssub'  => 'Base déverrouillée.',
-'lockdbsuccesstext'   => 'La base de données de {{SITENAME}} est verrouillée.
-
-N’oubliez pas de la déverrouiller lorsque vous aurez terminé votre opération de maintenance.',
-'unlockdbsuccesstext' => 'La base de données de {{SITENAME}} est déverrouillée.',
-'lockfilenotwritable' => 'Le fichier de blocage de la base de données n’est pas inscriptible. Pour bloquer ou débloquer la base de données, vous devez pouvoir écrire sur le serveur web.',
+'lockdbsuccesssub'    => 'Verrouillage de la base de données réussi',
+'unlockdbsuccesssub'  => 'Verrouillage de la base de données supprimé',
+'lockdbsuccesstext'   => 'La base de données a été verrouillée.<br />
+N’oubliez pas de la [[Special:UnlockDB|déverrouiller]] lorsque vous aurez terminé votre opération de maintenance.',
+'unlockdbsuccesstext' => 'La base de données a été déverrouillée.',
+'lockfilenotwritable' => 'Le fichier de verrouillage de la base de données n’est pas inscriptible.
+Pour bloquer ou débloquer la base de données, il doit être accessible par le serveur web.',
 'databasenotlocked'   => 'La base de données n’est pas verrouillée.',
 
 # Move page
-'move-page'               => 'Renommer $1',
-'move-page-legend'        => 'Renommer une page',
-'movepagetext'            => "Utilisez le formulaire ci-dessous pour renommer une page, en déplaçant tout son historique vers le nouveau nom.
+'move-page'                    => 'Renommer $1',
+'move-page-legend'             => 'Renommer une page',
+'movepagetext'                 => "Utilisez le formulaire ci-dessous pour renommer une page, en déplaçant tout son historique vers le nouveau nom.
 L’ancien titre deviendra une page de redirection vers le nouveau titre.
-Les liens vers le titre de l’ancienne page ne seront pas changés ;
-veuillez vérifier que ce déplacement n’a pas créé de [[Special:DoubleRedirects|double redirection]] ou de [[Special:BrokenRedirects|redirection cassée]].
+Vous pouvez mettre à jour automatiquement les redirections actuelles qui pointent vers le titre original.
+Si vous choisissez de ne pas le faire, asssurez-vous de vérifier toute [[Special:DoubleRedirects|double redirection]] ou [[Special:BrokenRedirects|redirection cassée]].
 Vous avez la responsabilité de vous assurer que les liens continuent de pointer vers leur destination supposée.
 
-Une page ne sera pas déplacée si la page du nouveau titre existe déjà, à moins que cette dernière soit vide ou en redirection, et qu’elle n’ait pas d’historique.
-Ce qui veut dire que vous pouvez renommer une page vers sa position d’origine si vous avez commis une erreur, mais que vous ne pouvez écraser une page déjà existante par ce procédé.
+Notez que la page ne sera '''pas''' déplacée s’il existe déjà une page avec le nouveau titre, sauf si cette dernière est vide ou n’est qu’une redirection et si son historique de modifications est vierge.
+Cela veut dire que vous pouvez renommer une page vers sa position d’origine si vous avez commis une erreur, mais que vous ne pouvez écraser une page déjà existante.
 
 '''ATTENTION !'''
-Ceci peut provoquer un changement radical et imprévu pour une page souvent consultée.
-Assurez-vous d’en avoir compris les conséquences avant de continuer.",
-'movepagetalktext'        => 'La page de discussion associée, si présente, sera automatiquement renommée <b>sauf si :</b>
-*Vous renommez une page vers un autre espace,
-*Une page de discussion existe déjà avec le nouveau nom, ou
-*Vous avez désélectionné le bouton ci-dessous.
-
-Dans ce cas, vous devrez renommer ou fusionner la page manuellement si vous le désirez.',
-'movearticle'             => 'Renommer la page :',
-'movenotallowed'          => 'Vous n’avez pas la permission de renommer les pages.',
-'newtitle'                => 'Nouveau titre',
-'move-watch'              => 'Suivre cette page',
-'movepagebtn'             => 'Renommer la page',
-'pagemovedsub'            => 'Renommage réussi',
-'movepage-moved'          => "<big>'''« $1 »''' a été déplacé vers '''« $2 »'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Il existe déjà une page portant ce titre, ou le titre que vous avez choisi n’est pas valide. Veuillez en choisir un autre.',
-'cantmove-titleprotected' => 'Vous ne pouvez pas déplacer une page vers cet emplacement car le nouveau titre a été protégé à la création.',
-'talkexists'              => 'La page elle-même a été déplacée avec succès, mais la page de discussion n’a pas pu être déplacée car il en existait déjà une sous le nouveau nom. Veuillez les fusionner manuellement.',
-'movedto'                 => 'renommé en',
-'movetalk'                => 'Renommer aussi la page de discussion associée',
-'move-subpages'           => 'Renommer, le cas échéant, toutes les sous-pages',
-'move-talk-subpages'      => 'Renommer, le cas échéant, toutes les sous-pages des pages de discussion',
-'movepage-page-exists'    => 'La page $1 existe déjà et ne peut pas être écrasée automatiquement;',
-'movepage-page-moved'     => 'La page $1 a été renommée en $2.',
-'movepage-page-unmoved'   => 'La page $1 ne peut être renommée en $2.',
-'movepage-max-pages'      => 'Le maximum de $1 {{PLURAL:$1|page renommée|pages renommées}} a été atteint et aucune autre page ne pourra être renommée automatiquement.',
-'1movedto2'               => 'a renommé [[$1]] en [[$2]]',
-'1movedto2_redir'         => 'a redirigé [[$1]] vers [[$2]]',
-'movelogpage'             => 'Historique des renommages',
-'movelogpagetext'         => 'Voici la liste des dernières pages renommées.',
-'movereason'              => 'Raison du renommage',
-'revertmove'              => 'annuler',
-'delete_and_move'         => 'Supprimer et renommer',
-'delete_and_move_text'    => '==Suppression requise==
-
-La page de destination « [[:$1]] » existe déjà. Voulez-vous la supprimer pour permettre le renommage ?',
-'delete_and_move_confirm' => 'Oui, j’accepte de supprimer la page de destination pour permettre le renommage.',
-'delete_and_move_reason'  => 'Page supprimée automatiquement pour permettre un renommage',
-'selfmove'                => 'Les titres d’origine et de destination sont les mêmes : impossible de renommer une page sur elle-même.',
-'immobile_namespace'      => 'Le titre de destination est d’un type spécial ; il est impossible de renommer des pages vers cet espace de noms.',
-'imagenocrossnamespace'   => 'Ne peut déplacer une image vers un espace de nommage qui ne soit pas une image.',
-'imagetypemismatch'       => 'La nouvelle extension de ce fichier ne reconnaît pas ce format.',
-'imageinvalidfilename'    => 'Le nom du fichier cible est incorrect',
-'fix-double-redirects'    => 'Mettre à jour les redirections pointant vers l’ancien titre',
+Ceci peut provoquer un changement drastique et imprévu pour une page souvent consultée ;
+assurez-vous d’en avoir compris les conséquences avant de continuer.",
+'movepagetalktext'             => "La page de discussion associée, si présente, sera automatiquement renommée '''sauf si :'''
+* une page de discussion non vide existe déjà avec le nouveau nom, ou
+* vous décochez la case ci-dessous.
+
+Dans ces cas-là, vous devrez renommer ou fusionner cette page manuellement si vous le désirez.",
+'movearticle'                  => 'Renommer la page :',
+'movenologin'                  => 'Non connecté',
+'movenologintext'              => 'Pour pouvoir renommer une page, vous devez être [[Special:UserLogin|connecté]] en tant qu’utilisateur enregistré et votre compte doit avoir une ancienneté suffisante.',
+'movenotallowed'               => 'Vous n’avez pas la permission de renommer les pages.',
+'movenotallowedfile'           => 'Vous n’avez pas la permission de renommer les fichiers.',
+'cant-move-user-page'          => 'Vous n’avez pas la permission de renommer les pages principales d’utilisateurs (en dehors de leurs sous-pages).',
+'cant-move-to-user-page'       => "Vous n'avez pas la permission de renommer une page vers une page utilisateur (à l'exception d'une sous-page).",
+'newtitle'                     => 'Vers le nouveau titre :',
+'move-watch'                   => 'Suivre cette page',
+'movepagebtn'                  => 'Renommer la page',
+'pagemovedsub'                 => 'Renommage réussi',
+'movepage-moved'               => "<big>'''« $1 »''' a été renommé '''« $2 »'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Une redirection depuis l’ancien nom a été créée.',
+'movepage-moved-noredirect'    => 'La création d’une redirection depuis l’ancien nom a été annulée.',
+'articleexists'                => 'Il existe déjà une page portant ce titre, ou le titre que vous avez choisi n’est pas correct.
+Veuillez en choisir un autre.',
+'cantmove-titleprotected'      => 'Vous ne pouvez pas déplacer une page vers cet emplacement car la création de page avec ce nouveau titre a été protégée.',
+'talkexists'                   => "'''La page elle-même a été déplacée avec succès, mais la page de discussion n’a pas pu être déplacée car il en existait déjà une sous le nouveau nom. Veuillez les fusionner manuellement.'''",
+'movedto'                      => 'renommé en',
+'movetalk'                     => 'Renommer aussi la page de discussion associée',
+'move-subpages'                => 'Renommer, le cas échéant, toutes les sous-pages',
+'move-talk-subpages'           => 'Renommer, le cas échéant, toutes les sous-pages de la page de discussion associée',
+'movepage-page-exists'         => 'La page $1 existe déjà et ne peut pas être écrasée automatiquement.',
+'movepage-page-moved'          => 'La page $1 a été renommée en $2.',
+'movepage-page-unmoved'        => 'La page $1 n’a pas pu être renommée en $2.',
+'movepage-max-pages'           => 'Le maximum de $1 {{PLURAL:$1|page renommée|pages renommées}} a été atteint et aucune autre page ne sera renommée automatiquement.',
+'1movedto2'                    => 'a renommé [[$1]] en [[$2]]',
+'1movedto2_redir'              => 'a déplacé [[$1]] vers [[$2]] en écrasant sa redirection',
+'move-redirect-suppressed'     => 'redirection supprimée',
+'movelogpage'                  => 'Journal des renommages et déplacements',
+'movelogpagetext'              => 'Voici la liste de toutes les pages renommées ou déplacées.',
+'movereason'                   => 'Motif du renommage :',
+'revertmove'                   => 'rétablir',
+'delete_and_move'              => 'Supprimer et renommer',
+'delete_and_move_text'         => '== Suppression requise ==
+La page de destination « [[:$1]] » existe déjà.
+Voulez-vous vraiment la supprimer pour permettre ce renommage ?',
+'delete_and_move_confirm'      => 'Oui, j’accepte de supprimer la page de destination pour permettre le renommage.',
+'delete_and_move_reason'       => 'Page supprimée automatiquement pour permettre un renommage',
+'selfmove'                     => 'Les titres d’origine et de destination sont les mêmes ;
+impossible de renommer une page sur elle-même.',
+'immobile-source-namespace'    => 'Vous ne pouvez pas renommer les pages dans l’espace de nommage « $1 »',
+'immobile-target-namespace'    => 'Vous ne pouvez pas déplacer des pages vers l’espace de nommage « $1 »',
+'immobile-target-namespace-iw' => 'Les liens interwikis ne sont pas une cible valide pour les renommages.',
+'immobile-source-page'         => 'Cette page n’est pas renommable.',
+'immobile-target-page'         => 'Il n’est pas possible de renommer la page vers ce titre.',
+'imagenocrossnamespace'        => 'Vous ne pouvez pas déplacer un fichier vers un espace de nommage qui ne soit pas un fichier.',
+'imagetypemismatch'            => 'La nouvelle extension de ce fichier ne correspond pas à son type.',
+'imageinvalidfilename'         => 'Le nom du fichier cible est incorrect',
+'fix-double-redirects'         => 'Mettre à jour les redirections pointant vers le titre original',
+'move-leave-redirect'          => 'Laisser une redirection vers le nouveau titre',
 
 # Export
 'export'            => 'Exporter des pages',
-'exporttext'        => 'Vous pouvez exporter en XML le texte et l’historique d’une page ou d’un ensemble de pages; le résultat peut alors être importé dans un autre wiki fonctionnant avec le logiciel MediaWiki.
+'exporttext'        => 'Vous pouvez exporter en XML le texte et l’historique d’une page ou d’un ensemble de pages ;
+le résultat peut alors être importé dans un autre wiki utilisant le logiciel MediaWiki via la [[Special:Import|page d’importation]].
 
-Pour exporter des pages, entrez leurs titres dans la boîte de texte ci-dessous, à raison d’un titre par ligne. Sélectionnez, si vous désirez ou non, la version actuelle avec toutes les anciennes versions, avec la page d’historique, ou simplement la page actuelle avec des informations sur la dernière modification.
+Pour exporter des pages, entrez leurs titres dans la boîte de texte ci-dessous, à raison d’un titre par ligne. Sélectionnez si vous désirez ou non la version actuelle avec toutes les anciennes versions, avec les lignes de l’historique de la page, ou simplement la page actuelle avec des informations sur la dernière modification.
 
-Dans ce dernier cas, vous pouvez aussi utiliser un lien, comme [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pour la page [[{{MediaWiki:Mainpage}}]].',
-'exportcuronly'     => 'Exporter uniquement la version courante sans l’historique complet',
+Dans ce dernier cas vous pouvez aussi utiliser un lien, tel que [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pour la page [[{{MediaWiki:Mainpage}}]].',
+'exportcuronly'     => 'Exporter uniquement la version courante, sans l’historique complet',
 'exportnohistory'   => "----
-'''Note :''' l’exportation complète de l’historique des pages à l’aide de ce formulaire a été désactivée pour des raisons de performance.",
+'''Note :''' l’exportation de l’historique complet des pages à l’aide de ce formulaire a été désactivée pour des raisons de performance.",
 'export-submit'     => 'Exporter',
 'export-addcattext' => 'Ajouter les pages de la catégorie :',
 'export-addcat'     => 'Ajouter',
-'export-download'   => 'Sauvegarder en tant que fichier',
+'export-download'   => 'Enregistrer dans un fichier',
 'export-templates'  => 'Inclure les modèles',
 
 # Namespace 8 related
-'allmessages'               => 'Liste des messages système',
-'allmessagesname'           => 'Nom du champ',
-'allmessagesdefault'        => 'Message par défaut',
-'allmessagescurrent'        => 'Message actuel',
-'allmessagestext'           => 'Ceci est la liste de tous les messages disponibles dans l’espace MediaWiki.
-Veuillez visiter la [http://www.mediawiki.org/wiki/Localisation Localisation MediaWiki] et [http://translatewiki.net Betawiki] si vous désirez contribuer à la localisation MediaWiki générique.',
-'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' n’est pas disponible car '''\$wgUseDatabaseMessages''' est désactivé.",
-'allmessagesfilter'         => 'Filtre d’expression rationnelle :',
+'allmessages'               => 'Messages système',
+'allmessagesname'           => 'Nom du message',
+'allmessagesdefault'        => 'Texte par défaut',
+'allmessagescurrent'        => 'Texte actuel',
+'allmessagestext'           => 'Ceci est la liste des messages disponibles dans l’espace MediaWiki.
+Veuillez visiter la [http://www.mediawiki.org/wiki/Localisation Localisation de MediaWiki] et [http://translatewiki.net/ translatewiki.net] si vous désirez contribuer à la localisation générique de MediaWiki.',
+'allmessagesnotsupportedDB' => "Cette page '''{{ns:special}}:Allmessages''' n’est pas utilisable car '''\$wgUseDatabaseMessages''' a été désactivé.",
+'allmessagesfilter'         => 'Filtre de noms de message (expression rationnelle) :',
 'allmessagesmodified'       => 'N’afficher que les modifications',
 
 # Thumbnails
 'thumbnail-more'           => 'Agrandir',
-'filemissing'              => 'Fichier absent',
+'filemissing'              => 'Fichier manquant',
 'thumbnail_error'          => 'Erreur lors de la création de la miniature : $1',
 'djvu_page_error'          => 'Page DjVu hors limites',
-'djvu_no_xml'              => 'Impossible d’obtenir le XML pour le fichier DjVu',
-'thumbnail_invalid_params' => 'Paramètres de la miniature invalides',
+'djvu_no_xml'              => 'Impossible de récupérer le XML pour le fichier DjVu',
+'thumbnail_invalid_params' => 'Paramètres de la miniature incorrects',
 'thumbnail_dest_directory' => 'Impossible de créer le répertoire de destination',
 
 # Special:Import
 'import'                     => 'Importer des pages',
-'importinterwiki'            => 'Import inter-wiki',
+'importinterwiki'            => 'Importation inter-wiki',
 'import-interwiki-text'      => 'Sélectionnez un wiki et un titre de page à importer.
-Les dates des versions et les noms des éditeurs seront préservés.
-Toutes les actions d’importation interwiki sont consignées dans l’[[Special:Log/import|historique des importations]].',
+Les dates des versions et les noms des contributeurs seront préservés.
+Toutes les actions d’importation inter-wiki sont consignées dans l’[[Special:Log/import|historique des importations]].',
+'import-interwiki-source'    => 'Wiki et page sources :',
 'import-interwiki-history'   => 'Copier toutes les versions de l’historique de cette page',
 'import-interwiki-submit'    => 'Importer',
-'import-interwiki-namespace' => 'Espace de noms de destination :',
-'importtext'                 => 'Veuillez exporter le fichier depuis le wiki d’origine en utilisant l’outil Special:Export, le sauvegarder sur votre disque dur et le copier ici.',
-'importstart'                => 'Import des pages...',
-'import-revision-count'      => '$1 {{PLURAL:$1|version|versions}}',
+'import-interwiki-namespace' => 'Espace de nommage de la destination :',
+'import-upload-filename'     => 'Nom du fichier :',
+'import-comment'             => 'Commentaire :',
+'importtext'                 => 'Veuillez exporter le fichier depuis le wiki d’origine en utilisant son [[Special:Export|outil d’exportation]].
+Sauvegardez-le sur votre disque dur puis téléversez-le ici.',
+'importstart'                => 'Importation des pages...',
+'import-revision-count'      => '$1 version{{PLURAL:$1||s}}',
 'importnopages'              => 'Aucune page à importer.',
-'importfailed'               => 'Échec de l’import : $1',
-'importunknownsource'        => 'Type de la source d’import inconnue',
+'importfailed'               => 'Échec de l’importation : <nowiki>$1</nowiki>',
+'importunknownsource'        => 'Type inconnu de la source à importer',
 'importcantopen'             => 'Impossible d’ouvrir le fichier à importer',
-'importbadinterwiki'         => 'Mauvais lien interwiki',
+'importbadinterwiki'         => 'Mauvais lien inter-wiki',
 'importnotext'               => 'Vide ou sans texte',
-'importsuccess'              => 'L’import a réussi !',
+'importsuccess'              => 'L’importation a réussi !',
 'importhistoryconflict'      => 'Un conflit a été détecté dans l’historique des versions (cette page a pu être importée auparavant).',
-'importnosources'            => 'Aucune source inter-wiki n’a été définie et la copie directe d’historique est désactivée.',
-'importnofile'               => 'Aucun fichier n’a été importé.',
-'importuploaderrorsize'      => 'L’envoi du fichier a échoué. Sa taille est supérieure au maximum autorisé.',
-'importuploaderrorpartial'   => 'L’envoi du fichier a échoué. Il n’a été envoyé que partiellement.',
-'importuploaderrortemp'      => 'L’envoi du fichier à importer a échoué. Un dossier temporaire est manquant.',
-'import-parse-failure'       => 'Erreur lors de l’analyse de l’import XML',
+'importnosources'            => 'Aucune source d’importation inter-wiki n’a été définie et les téléversements directs d’historiques sont désactivés.',
+'importnofile'               => 'Aucun fichier d’importation n’a été téléversé.',
+'importuploaderrorsize'      => 'Le téléversement du fichier à importer a échoué.
+Sa taille est supérieure au maximum autorisé pour les téléversements.',
+'importuploaderrorpartial'   => 'Le téléversement du fichier à importer a échoué.
+Son contenu n’a été transféré que partiellement.',
+'importuploaderrortemp'      => 'Le téléversement du fichier à importer a échoué.
+Un dossier temporaire est manquant.',
+'import-parse-failure'       => 'Échec lors de l’analyse du XML à importer',
 'import-noarticle'           => 'Aucune page à importer !',
-'import-nonewrevisions'      => 'Toute les révisions ont été importées auparavant.',
-'xml-error-string'           => '$1 à la ligne $2, col $3 (octet $4) : $5',
-'import-upload'              => 'Import de données XML',
-'import-token-mismatch'      => 'Perte des données de session. Ressayez.',
-'import-invalid-interwiki'   => "Impossible d'importer depuis le wiki spécifié.",
+'import-nonewrevisions'      => 'Toutes les versions ont été importées auparavant.',
+'xml-error-string'           => '$1 à la ligne $2, colonne $3 (octet $4) : $5',
+'import-upload'              => 'Téléversement de données XML',
+'import-token-mismatch'      => 'Perte des données de session. Veuillez réessayez.',
+'import-invalid-interwiki'   => 'Impossible d’importer depuis le wiki spécifié.',
 
 # Import log
-'importlogpage'                    => 'Historique des importations de pages',
-'importlogpagetext'                => 'Imports administratifs de pages avec l’historique à partir des autres wikis.',
-'import-logentry-upload'           => 'a importé [[$1]]',
-'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|version|versions}}',
-'import-logentry-interwiki'        => 'a importé (transwiki) [[$1]]',
-'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|version|versions}} depuis $2',
+'importlogpage'                    => 'Journal des importations',
+'importlogpagetext'                => 'Importations administratives de pages avec leur historique de modifications depuis d’autres wikis.',
+'import-logentry-upload'           => 'a importé [[$1]] par téléversement de fichier',
+'import-logentry-upload-detail'    => '$1 version{{PLURAL:$1||s}}',
+'import-logentry-interwiki'        => 'a importé [[$1]] par transwiki',
+'import-logentry-interwiki-detail' => '$1 version{{PLURAL:$1||s}} depuis $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Ma page utilisateur',
+'tooltip-pt-userpage'             => 'Votre page utilisateur',
 'tooltip-pt-anonuserpage'         => 'La page utilisateur de l’IP avec laquelle vous contribuez',
-'tooltip-pt-mytalk'               => 'Ma page de discussion',
-'tooltip-pt-anontalk'             => 'La page de discussion pour cette adresse IP',
-'tooltip-pt-preferences'          => 'Mes préférences',
-'tooltip-pt-watchlist'            => 'La liste des pages que vous suivez',
-'tooltip-pt-mycontris'            => 'Liste de mes contributions',
+'tooltip-pt-mytalk'               => 'Votre page de discussion',
+'tooltip-pt-anontalk'             => 'La page de discussion pour les contributions depuis cette adresse IP',
+'tooltip-pt-preferences'          => 'Vos préférences',
+'tooltip-pt-watchlist'            => 'La liste des pages dont vous suivez les modifications',
+'tooltip-pt-mycontris'            => 'La liste de vos contributions',
 'tooltip-pt-login'                => 'Vous êtes invité à vous identifier, mais ce n’est pas obligatoire.',
 'tooltip-pt-anonlogin'            => 'Vous êtes invité à vous identifier, mais ce n’est pas obligatoire.',
 'tooltip-pt-logout'               => 'Se déconnecter',
-'tooltip-ca-talk'                 => 'Discussion à propos de cette page',
-'tooltip-ca-edit'                 => 'Vous pouvez modifier cette page. Merci de prévisualiser avant d’enregistrer.',
-'tooltip-ca-addsection'           => 'Ajouter un commentaire à cette discussion.',
-'tooltip-ca-viewsource'           => 'Cette page est protégée. Vous pouvez toutefois en voir le contenu.',
-'tooltip-ca-history'              => 'Les auteurs et versions précédentes de cette page.',
+'tooltip-ca-talk'                 => 'Discussion au sujet du contenu de cette page',
+'tooltip-ca-edit'                 => 'Vous pouvez modifier cette page.
+Veuillez utiliser le bouton de prévisualisation avant d’enregistrer.',
+'tooltip-ca-addsection'           => 'Commencer une nouvelle section',
+'tooltip-ca-viewsource'           => 'Cette page est protégée.
+Vous pouvez toutefois en visualiser la source.',
+'tooltip-ca-history'              => 'Les versions passées de cette page (avec leurs contributeurs)',
 'tooltip-ca-protect'              => 'Protéger cette page',
 'tooltip-ca-delete'               => 'Supprimer cette page',
-'tooltip-ca-undelete'             => 'Restaurer cette page',
+'tooltip-ca-undelete'             => 'Rétablir les modifications faites sur cette page avant son effacement',
 'tooltip-ca-move'                 => 'Renommer cette page',
-'tooltip-ca-watch'                => 'Ajoutez cette page à votre liste de suivi',
+'tooltip-ca-watch'                => 'Ajouter cette page à votre liste de suivi',
 'tooltip-ca-unwatch'              => 'Retirer cette page de votre liste de suivi',
-'tooltip-search'                  => 'Chercher dans ce wiki',
+'tooltip-search'                  => 'Rechercher dans {{SITENAME}}',
 'tooltip-search-go'               => 'Aller vers une page portant exactement ce nom si elle existe.',
 'tooltip-search-fulltext'         => 'Rechercher les pages comportant ce texte.',
 'tooltip-p-logo'                  => 'Page principale',
 'tooltip-n-mainpage'              => 'Visiter la page principale',
 'tooltip-n-portal'                => 'À propos du projet',
-'tooltip-n-currentevents'         => 'Trouver des informations sur les événements actuels',
+'tooltip-n-currentevents'         => 'Trouver les informations de fond sur l’actualité du moment',
 'tooltip-n-recentchanges'         => 'Liste des modifications récentes sur le wiki',
 'tooltip-n-randompage'            => 'Afficher une page au hasard',
 'tooltip-n-help'                  => 'Aide',
@@ -2155,7 +2480,7 @@ Toutes les actions d’importation interwiki sont consignées dans l’[[Special
 'tooltip-ca-nstab-media'          => 'Voir la page du média',
 'tooltip-ca-nstab-special'        => 'Ceci est une page spéciale, vous ne pouvez pas la modifier.',
 'tooltip-ca-nstab-project'        => 'Voir la page du projet',
-'tooltip-ca-nstab-image'          => 'Voir la page de l’image',
+'tooltip-ca-nstab-image'          => 'Voir la page du fichier',
 'tooltip-ca-nstab-mediawiki'      => 'Voir le message système',
 'tooltip-ca-nstab-template'       => 'Voir le modèle',
 'tooltip-ca-nstab-help'           => 'Voir la page d’aide',
@@ -2167,7 +2492,10 @@ Toutes les actions d’importation interwiki sont consignées dans l’[[Special
 'tooltip-compareselectedversions' => 'Afficher les différences entre deux versions de cette page',
 'tooltip-watch'                   => 'Ajouter cette page à votre liste de suivi',
 'tooltip-recreate'                => 'Recréer la page même si celle-ci a été effacée',
-'tooltip-upload'                  => 'Commencer l’envoi',
+'tooltip-upload'                  => 'Démarrer le téléversement',
+'tooltip-rollback'                => '« Révoquer » annule en un clic la ou les modification(s) de cette page par son dernier contributeur.',
+'tooltip-undo'                    => '« Défaire » révoque cette modification et ouvre la fenêtre de modification en mode prévisualisation.
+Permet de rétablir la version précédente et d’ajouter un motif dans la boîte de résumé.',
 
 # Stylesheets
 'common.css'      => '/* Le CSS placé ici sera appliqué à tous les habillages. */',
@@ -2179,6 +2507,8 @@ Toutes les actions d’importation interwiki sont consignées dans l’[[Special
 'chick.css'       => '/* Le CSS placé ici affectera les utilisateurs de l’habillage Chick. */',
 'simple.css'      => '/* Le CSS placé ici affectera les utilisateurs de l’habillage Simple. */',
 'modern.css'      => '/* Le CSS placé ici affectera les utilisateurs de l’habillage Modern. */',
+'print.css'       => '/* Le CSS placé ici affectera les impressions */',
+'handheld.css'    => '/* Le CSS placé ici affectera les appareils mobiles en fonction de l\'habillage configuré $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => '/* Tout JavaScript ici sera chargé avec chaque page accédée par n’importe quel utilisateur. */',
@@ -2197,12 +2527,12 @@ Toutes les actions d’importation interwiki sont consignées dans l’[[Special
 'notacceptable'     => 'Ce serveur wiki ne peut pas fournir les données dans un format que votre client est capable de lire.',
 
 # Attribution
-'anonymous'        => 'Utilisateur(s) non enregistré(s) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utilisateur non enregistré|Utilisateurs non enregistrés}} sur {{SITENAME}}',
 'siteuser'         => 'Utilisateur $1 de {{SITENAME}}',
 'lastmodifiedatby' => 'Cette page a été modifiée pour la dernière fois le $1 à $2 par $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basé sur le travail de $1.',
 'others'           => 'autres',
-'siteusers'        => 'Utilisateur(s) $1',
+'siteusers'        => 'Utilisateur{{PLURAL:$2||s}} $1 sur {{SITENAME}}',
 'creditspage'      => 'Crédits de la page',
 'nocredits'        => 'Il n’y a pas d’informations d’attribution disponibles pour cette page.',
 
@@ -2212,7 +2542,7 @@ Toutes les actions d’importation interwiki sont consignées dans l’[[Special
 Ceci est probablement causé par un lien sur liste noire pointant vers un site externe.',
 'spamprotectionmatch' => "La chaîne de caractères « '''$1''' » a déclenché le détecteur de pourriel.",
 'spambot_username'    => 'Nettoyage de pourriels par MediaWiki',
-'spam_reverting'      => 'Restauration de la dernière version ne contenant pas de lien vers $1',
+'spam_reverting'      => 'Rétablissement de la dernière version ne contenant pas de lien vers $1',
 'spam_blanking'       => 'Toutes les versions contenant des liens vers $1 sont blanchies',
 
 # Info page
@@ -2223,6 +2553,16 @@ Ceci est probablement causé par un lien sur liste noire pointant vers un site e
 'numauthors'     => 'Nombre d’auteurs distincts : $1',
 'numtalkauthors' => 'Nombre d’auteurs distincts (page de discussion) : $1',
 
+# Skin names
+'skinname-standard'    => 'Standard',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Bleu de Cologne',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'Mon Interface',
+'skinname-chick'       => 'Poussin',
+'skinname-simple'      => 'Simple',
+'skinname-modern'      => 'Moderne',
+
 # Math options
 'mw_math_png'    => 'Toujours produire une image PNG',
 'mw_math_simple' => 'HTML si très simple, autrement PNG',
@@ -2243,11 +2583,12 @@ Ceci est probablement causé par un lien sur liste noire pointant vers un site e
 'markedaspatrollederror-noautopatrol' => 'Vous n’avez pas le droit de marquer vos propres modifications comme surveillées.',
 
 # Patrol log
-'patrol-log-page'   => 'Historique des versions patrouillées',
-'patrol-log-header' => 'Voici un journal des versions patrouillées.',
-'patrol-log-line'   => 'a marqué la version $1 de $2 comme vérifiée $3',
-'patrol-log-auto'   => '(automatique)',
-'patrol-log-diff'   => 'v$1',
+'patrol-log-page'      => 'Historique des versions patrouillées',
+'patrol-log-header'    => 'Voici un journal des versions patrouillées.',
+'patrol-log-line'      => 'a marqué la version $1 de $2 comme vérifiée $3',
+'patrol-log-auto'      => '(automatique)',
+'patrol-log-diff'      => 'v$1',
+'log-show-hide-patrol' => "$1 l'historique des versions patrouillées",
 
 # Image deletion
 'deletedrevision'                 => 'L’ancienne version $1 a été supprimée',
@@ -2264,12 +2605,14 @@ $1',
 'previousdiff' => '� Modification précédente',
 'nextdiff'     => 'Modification suivante →',
 
+# Visual comparison
+'visual-comparison' => 'Comparaison visuelle',
+
 # Media information
-'mediawarning'         => '<b>Attention</b>: Ce fichier peut contenir du code malveillant, votre système pouvant être mis en danger par son exécution.
-<hr />',
+'mediawarning'         => "'''Attention :''' ce fichier pourrait contenir du code malveillant, votre système pouvant être compromis lors de son exécution.<hr />",
 'imagemaxsize'         => 'Format maximal pour les images dans les pages de description d’images :',
 'thumbsize'            => 'Taille de la miniature :',
-'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|page|pages}}',
+'widthheightpage'      => '$1 × $2, $3 page{{PLURAL:$3||s}}',
 'file-info'            => 'Taille du fichier : $1, type MIME : $2',
 'file-info-size'       => '($1 × $2 pixels, taille du fichier : $3, type MIME : $4)',
 'file-nohires'         => '<small>Pas de plus haute résolution disponible.</small>',
@@ -2277,13 +2620,15 @@ $1',
 'show-big-image'       => 'Image en plus haute résolution',
 'show-big-image-thumb' => '<small>Taille de cet aperçu : $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerie des nouveaux fichiers',
 'imagelisttext'         => "Voici une liste de '''$1''' {{PLURAL:$1|fichier|fichiers}} classée $2.",
 'newimages-summary'     => 'Cette page spéciale affiche les derniers fichiers importés.',
+'newimages-legend'      => 'Nom du fichier',
+'newimages-label'       => 'Nom du fichier (ou une partie de celui-ci) :',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Aucune image à afficher.',
-'ilsubmit'              => 'Chercher',
+'ilsubmit'              => 'Rechercher',
 'bydate'                => 'par date',
 'sp-newimages-showfrom' => 'Afficher les nouveaux fichiers à partir du $1 à $2',
 
@@ -2487,6 +2832,18 @@ Les autres liens sur la même ligne sont considérés comme des exceptions, par
 'exif-lightsource-24'  => 'Tungstène ISO de studio',
 'exif-lightsource-255' => 'Autre source de lumière',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flash non déclenché',
+'exif-flash-fired-1'    => 'Flash déclenché',
+'exif-flash-return-0'   => 'aucun stroboscope ne retourne une fonction de détection',
+'exif-flash-return-2'   => 'le stroboscope retourne une lumière non détectée',
+'exif-flash-return-3'   => 'le stroboscope retourne une lumière détectée',
+'exif-flash-mode-1'     => 'lumière du flash obligatoire',
+'exif-flash-mode-2'     => 'suppression du flash obligatoire',
+'exif-flash-mode-3'     => 'Mode automatique',
+'exif-flash-function-1' => 'Pas de fonction de flash',
+'exif-flash-redeye-1'   => 'Mode anti-yeux rouges',
+
 'exif-focalplaneresolutionunit-2' => 'Pouce',
 
 'exif-sensingmethod-1' => 'Non défini',
@@ -2574,36 +2931,49 @@ Les autres liens sur la même ligne sont considérés comme des exceptions, par
 'monthsall'        => 'tous',
 
 # E-mail address confirmation
-'confirmemail'             => 'Confirmer adresse de courriel',
-'confirmemail_noemail'     => 'L’adresse de courriel configurée dans vos [[Special:Preferences|préférences]] n’est pas valide.',
-'confirmemail_text'        => 'Ce wiki nécessite la vérification de votre adresse de courriel avant de pouvoir utiliser toute fonction de messagerie. Utilisez le bouton ci-dessous pour envoyer un courriel de confirmation à votre adresse. Le courriel contiendra un lien contenant un code, chargez ce lien dans votre navigateur pour valider votre adresse.',
-'confirmemail_pending'     => '<div class="error"> Un code de confirmation vous a déjà été envoyé par courriel ; si vous venez de créer votre compte, veuillez attendre quelques minutes que le courriel arrive avant de demander un nouveau code. </div>',
+'confirmemail'             => 'Confirmer l’adresse de courriel',
+'confirmemail_noemail'     => 'Vous n’avez pas défini une adresse de courriel valide dans vos [[Special:Preferences|préférences]].',
+'confirmemail_text'        => 'Ce wiki nécessite la vérification de votre adresse de courriel avant de pouvoir utiliser toute fonction de messagerie.
+Utilisez le bouton ci-dessous pour envoyer un courriel de confirmation à votre adresse.
+Le courriel inclura un lien comportant un code à usage unique et limité dans le temps ;
+chargez ce lien dans votre navigateur pour confirmer que votre adresse de courriel est valide.',
+'confirmemail_pending'     => '<div class="error"> Un code de confirmation vous a déjà été envoyé par courriel ;
+si vous venez de créer votre compte, veuillez attendre quelques minutes que le courriel arrive avant de demander un nouveau code. </div>',
 'confirmemail_send'        => 'Envoyer un code de confirmation',
 'confirmemail_sent'        => 'Courriel de confirmation envoyé',
-'confirmemail_oncreate'    => 'Un code de confirmation a été envoyé à votre adresse de courriel. Ce code n’est pas requis pour se connecter, mais vous en aurez besoin pour activer les fonctionnalités liées aux courriels sur ce wiki.',
-'confirmemail_sendfailed'  => '{{SITENAME}} ne peut envoyer le courriel de confirmation.
-Veuillez vérifiez si votre adresse ne comprend pas de caractères interdits.
-
-Retour du programme de courriel : $1',
-'confirmemail_invalid'     => 'Code de confirmation incorrect. Celui-ci a peut-être expiré',
-'confirmemail_needlogin'   => 'Vous devez vous $1 pour confirmer votre adresse de courriel.',
-'confirmemail_success'     => 'Votre adresse de courriel est confirmée. Vous pouvez maintenant vous connecter et profiter du wiki.',
+'confirmemail_oncreate'    => 'Un code de confirmation a été envoyé à votre adresse de courriel.
+Ce code n’est pas requis pour vous identifier sur ce wiki, mais vous devrez le fournir pour activer toute fonctionnalité basée sur les courriels.',
+'confirmemail_sendfailed'  => '{{SITENAME}} n’a pas pu vous envoyer le courriel de confirmation.
+Veuillez vérifiez que votre adresse courriel ne comprend aucun caractère incorrect.
+
+Le programme d’envoi de courriel a retourné l’indication suivante : $1',
+'confirmemail_invalid'     => 'Code de confirmation incorrect.
+Celui-ci a peut-être expiré.',
+'confirmemail_needlogin'   => 'Vous devez $1 pour confirmer votre adresse de courriel.',
+'confirmemail_success'     => 'Votre adresse de courriel a été confirmée.
+Vous pouvez maintenant vous [[Special:UserLogin|identifier]] et profiter du wiki.',
 'confirmemail_loggedin'    => 'Votre adresse de courriel est maintenant confirmée.',
-'confirmemail_error'       => "Un problème est survenu lors de l'enregistrement de la confirmation de votre adresse de courriel.",
+'confirmemail_error'       => 'Un problème est survenu lors de l’enregistrement de votre confirmation.',
 'confirmemail_subject'     => 'Confirmation d’adresse de courriel pour {{SITENAME}}',
-'confirmemail_body'        => 'Quelqu’un, probablement vous, à partir de l’adresse IP $1, a enregistré un compte « $2 » avec cette adresse de courriel sur le site {{SITENAME}}.
+'confirmemail_body'        => 'Quelqu’un, probablement vous, à partir de l’adresse IP $1,
+a enregistré un compte « $2 » avec cette adresse de courriel
+sur le site {{SITENAME}}.
 
-Pour confirmer que ce compte vous appartienne vraiment et afin d’activer les fonctions de messagerie sur {{SITENAME}}, veuillez suivre le lien ci-dessous dans votre navigateur :
+Pour confirmer que ce compte vous appartient vraiment et afin
+d’activer les fonctions de messagerie sur {{SITENAME}},
+veuillez suivre ce lien dans votre navigateur :
 
 $3
 
-S’il ne s’agit pas de vous, n’ouvrez pas le lien, veuillez suivre l’autre lien ci-dessous dans votre navigateur :
+Si vous n’avez *pas* enregistré ce compte, n’ouvrez pas ce lien ;
+vous pouvez suivre l’autre lien ci-dessous pour annuler la
+confirmation de votre adresse courriel :
 
 $5
 
 Ce code de confirmation expirera le $4.',
 'confirmemail_invalidated' => 'Confirmation de l’adresse courriel annulée',
-'invalidateemail'          => "Annuler la confirmation de l'adresse de courriel",
+'invalidateemail'          => 'Annuler la confirmation de l’adresse de courriel',
 
 # Scary transclusion
 'scarytranscludedisabled' => '[La transclusion interwiki est désactivée]',
@@ -2619,30 +2989,21 @@ $1
 'trackbackdeleteok' => 'Le rétrolien a été supprimé avec succès.',
 
 # Delete conflict
-'deletedwhileediting' => "'''Attention''' : cette page a été supprimée après que vous ayez commencé à la modifier !",
+'deletedwhileediting' => "'''Attention''' : cette page a été supprimée après que vous avez commencé à la modifier !",
 'confirmrecreate'     => "L’utilisateur [[User:$1|$1]] ([[User talk:$1|Discussion]]) a supprimé cette page, alors que vous aviez commencé à l’éditer, pour le motif suivant :
 : ''$2''
-Veuillez confirmer que vous désirez recréer cette page.",
+Veuillez confirmer que vous désirez réellement recréer cette page.",
 'recreate'            => 'Recréer',
 
-# HTML dump
-'redirectingto' => 'Redirection vers [[:$1]]',
-
 # action=purge
-'confirm_purge'        => 'Voulez-vous rafraîchir cette page (purger le cache) ? $1',
 'confirm_purge_button' => 'Confirmer',
-
-# AJAX search
-'searchcontaining' => 'Chercher les articles contenant « $1 ».',
-'searchnamed'      => 'Chercher les articles nommés « $1 ».',
-'articletitles'    => 'Articles commençant par « $1 »',
-'hideresults'      => 'Cacher les résultats',
-'useajaxsearch'    => 'Utiliser la recherche AJAX',
+'confirm-purge-top'    => 'Voulez-vous rafraîchir cette page (purger le cache) ?',
+'confirm-purge-bottom' => 'Purger une page l’efface du cache de rendu et force sa dernière version à être régénérée et affichée.',
 
 # Separators for various lists, etc.
 'semicolon-separator' => '&nbsp;;&#32;',
 'colon-separator'     => '&nbsp;:&#32;',
-'autocomment-prefix'  => '&#32;—&#32;',
+'autocomment-prefix'  => '&#32;–&#32;',
 
 # Multipage image navigation
 'imgmultipageprev' => '� page précédente',
@@ -2651,21 +3012,21 @@ Veuillez confirmer que vous désirez recréer cette page.",
 'imgmultigoto'     => 'Aller à la page $1',
 
 # Table pager
-'ascending_abbrev'         => 'crois',
-'descending_abbrev'        => 'décr',
+'ascending_abbrev'         => 'crois.',
+'descending_abbrev'        => 'décr.',
 'table_pager_next'         => 'Page suivante',
 'table_pager_prev'         => 'Page précédente',
 'table_pager_first'        => 'Première page',
 'table_pager_last'         => 'Dernière page',
-'table_pager_limit'        => 'Montrer $1 élément(s) par page',
+'table_pager_limit'        => 'Montrer $1 élément{{PLURAL:$1||s}} par page',
 'table_pager_limit_submit' => 'Accéder',
 'table_pager_empty'        => 'Aucun résultat',
 
 # Auto-summaries
-'autosumm-blank'   => 'Résumé automatique : blanchiment',
-'autosumm-replace' => 'Résumé automatique : contenu remplacé par « $1 ».',
-'autoredircomment' => 'Redirection vers [[$1]]',
-'autosumm-new'     => 'Nouvelle page : $1',
+'autosumm-blank'   => 'Page blanchie',
+'autosumm-replace' => 'Contenu remplacé par « $1 »',
+'autoredircomment' => 'Page redirigée vers [[$1]]',
+'autosumm-new'     => 'Page créée avec « $1 »',
 
 # Size units
 'size-bytes'     => '$1 o',
@@ -2674,40 +3035,42 @@ Veuillez confirmer que vous désirez recréer cette page.",
 'size-gigabytes' => '$1 Gio',
 
 # Live preview
-'livepreview-loading' => 'Chargement …',
-'livepreview-ready'   => 'Chargement … terminé !',
+'livepreview-loading' => 'Chargement...',
+'livepreview-ready'   => 'Chargement... terminé !',
 'livepreview-failed'  => 'L’aperçu rapide a échoué !
 Essayez la prévisualisation normale.',
 'livepreview-error'   => 'Impossible de se connecter : $1 « $2 ».
 Essayez la prévisualisation normale.',
 
 # Friendlier slave lag warnings
-'lag-warn-normal' => 'Les modifications datant de moins de $1 {{PLURAL:$1|seconde|secondes}} peuvent ne pas apparaître dans cette liste.',
-'lag-warn-high'   => 'En raison d’une forte charge des bases de données, les modifications datant de moins de $1 {{PLURAL:$1|seconde|secondes}} peuvent ne pas apparaître dans cette liste.',
+'lag-warn-normal' => 'Les modifications datant de moins de $1 seconde{{PLURAL:$1||s}} peuvent ne pas apparaître dans cette liste.',
+'lag-warn-high'   => 'En raison d’une forte charge des bases de données, les modifications datant de moins de $1 seconde{{PLURAL:$1||s}} peuvent ne pas apparaître dans cette liste.',
 
 # Watchlist editor
-'watchlistedit-numitems'       => 'Votre liste de suivi contient {{PLURAL:$1|une page|$1 pages}}, sans compter les pages de discussion',
-'watchlistedit-noitems'        => 'Votre liste de suivi ne contient aucune page.',
+'watchlistedit-numitems'       => 'Votre liste de suivi contient {{PLURAL:$1|un titre|$1 titres}}, sans compter les pages de discussion.',
+'watchlistedit-noitems'        => 'Votre liste de suivi ne contient aucun titre.',
 'watchlistedit-normal-title'   => 'Modification de la liste de suivi',
-'watchlistedit-normal-legend'  => 'Enlever des pages de la liste de suivi',
-'watchlistedit-normal-explain' => 'Les pages de votre liste de suivi sont visibles ci-dessous, classées par espace de noms.
-Pour enlever une page (et sa page de discussion) de la liste, sélectionnez la case à côté puis cliquez sur le bouton en bas.
+'watchlistedit-normal-legend'  => 'Retirer des titres de la liste de suivi',
+'watchlistedit-normal-explain' => 'Les titres de votre liste de suivi sont visibles ci-dessous, classés par espace de nommage.
+Pour retirer un titre de la liste (et sa page de discussion), cochez la case à côté puis cliquez sur le bouton « Retirer les titres sélectionnés ».
 Vous pouvez aussi [[Special:Watchlist/raw|la modifier en mode brut]].',
-'watchlistedit-normal-submit'  => 'Enlever les pages sélectionnées',
-'watchlistedit-normal-done'    => '{{PLURAL:$1|Une page a été enlevée|$1 pages ont été enlevées}} de votre liste de suivi :',
-'watchlistedit-raw-title'      => 'Modification de la liste de suivi (mode brut)',
+'watchlistedit-normal-submit'  => 'Retirer les titres sélectionnés',
+'watchlistedit-normal-done'    => '{{PLURAL:$1|Un titre a été enlevé|$1 titres ont été enlevés}} de votre liste de suivi :',
+'watchlistedit-raw-title'      => 'Modifier la liste de suivi en mode brut',
 'watchlistedit-raw-legend'     => 'Modification de la liste de suivi en mode brut',
-'watchlistedit-raw-explain'    => 'La liste des pages de votre liste de suivi est montrée ci-dessous, sans les pages de discussion (automatiquement incluses) et triées par espace de noms. Vous pouvez modifier la liste : ajoutez les pages que vous voulez suivre (peu importe où), une page par ligne, et enlevez les pages que vous ne voulez plus suivre. Quand vous avez fini, cliquez sur le bouton en bas pour mettre la liste à jour. Vous pouvez aussi utiliser [[Special:Watchlist/edit|l’éditeur normal]].',
-'watchlistedit-raw-titles'     => 'Pages :',
-'watchlistedit-raw-submit'     => 'Mettre à jour la liste',
+'watchlistedit-raw-explain'    => 'La liste des titres de votre liste de suivi est montrée ci-dessous et triée par espace de nommage, sans les pages de discussion (automatiquement incluses). Vous pouvez modifier cette liste : ajoutez n’importe où et dans un ordre quelconque les titres (un par ligne) de chacune des pages que vous voulez suivre et supprimez les titres des pages que vous ne voulez plus suivre.
+Quand vous avez fini, cliquez sur le bouton « Mettre à jour la liste de suivi » en bas.
+Vous pouvez aussi utiliser [[Special:Watchlist/edit|l’éditeur normal]].',
+'watchlistedit-raw-titles'     => 'Titres :',
+'watchlistedit-raw-submit'     => 'Mettre à jour la liste de suivi',
 'watchlistedit-raw-done'       => 'Votre liste de suivi a été mise à jour.',
-'watchlistedit-raw-added'      => '{{PLURAL:$1|Une page a été ajoutée|$1 pages ont été ajoutées}} :',
-'watchlistedit-raw-removed'    => '{{PLURAL:$1|Une page a été enlevée|$1 pages ont été enlevées}} :',
+'watchlistedit-raw-added'      => '{{PLURAL:$1|Un titre a été ajouté|$1 titres ont été ajoutés}} :',
+'watchlistedit-raw-removed'    => '{{PLURAL:$1|Un titre a été retiré|$1 titres ont été retirés}} :',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Liste de suivi',
 'watchlisttools-edit' => 'Voir et modifier la liste de suivi',
-'watchlisttools-raw'  => 'Modifier la liste (mode brut)',
+'watchlisttools-raw'  => 'Modifier la liste de suivi (mode brut)',
 
 # Hijri month names
 'hijri-calendar-m3'  => 'Rabi’ al-awwal',
@@ -2717,68 +3080,79 @@ Vous pouvez aussi [[Special:Watchlist/raw|la modifier en mode brut]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Balise d’extension « $1 » inconnue',
+'duplicate-defaultsort' => 'Attention : la clé de tri par défaut « $2 » écrase la précédente « $1 ».',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
 'version-extensions'               => 'Extensions installées',
 'version-specialpages'             => 'Pages spéciales',
-'version-parserhooks'              => 'Extensions du parseur',
+'version-parserhooks'              => 'Greffons du parseur',
 'version-variables'                => 'Variables',
 'version-other'                    => 'Divers',
-'version-mediahandlers'            => 'Support média',
-'version-hooks'                    => 'Extensions',
-'version-extension-functions'      => 'Fonctions des extensions',
-'version-parser-extensiontags'     => 'Balises supplémentaires du parseur',
-'version-parser-function-hooks'    => 'Crochets des fonctions du parseur',
+'version-mediahandlers'            => 'Manipulateurs de médias',
+'version-hooks'                    => 'Greffons',
+'version-extension-functions'      => 'Fonctions d’extension internes',
+'version-parser-extensiontags'     => 'Balises étendues du parseur',
+'version-parser-function-hooks'    => 'Fonctions étendues du parseur',
 'version-skin-extension-functions' => 'Fonctions d’extension de l’interface',
-'version-hook-name'                => "Nom de l'extension",
-'version-hook-subscribedby'        => 'Défini par',
+'version-hook-name'                => 'Nom du greffon',
+'version-hook-subscribedby'        => 'Souscrit par',
 'version-version'                  => 'Version',
 'version-license'                  => 'Licence',
-'version-software'                 => 'Logiciel installé',
+'version-software'                 => 'Logiciels installés',
 'version-software-product'         => 'Produit',
 'version-software-version'         => 'Version',
 
 # Special:FilePath
-'filepath'         => 'Chemin d’accès d’un fichier',
+'filepath'         => 'Chemin d’accès du fichier',
 'filepath-page'    => 'Fichier :',
 'filepath-submit'  => 'Chemin d’accès',
-'filepath-summary' => 'Cette page affiche le chemin d’accès complet d’un fichier ; les images sont montrées en haute résolution, les fichiers audio et vidéo s’exécutent avec leur programme associé.
+'filepath-summary' => 'Cette page spéciale retourne le chemin d’accès complet d’un fichier.
+Les images sont montrées dans leur pleine résolution, les autres fichiers sont chargés et démarrés directement avec leur programme associé.
 
-Entrez le nom du fichier sans le préfixe « {{ns:image}}: »',
+Entrez le nom du fichier sans le préfixe « {{ns:file}}: »',
 
 # Special:FileDuplicateSearch
-'fileduplicatesearch'          => 'Recherche des fichiers en double',
-'fileduplicatesearch-summary'  => 'Recherche pour des fichiers en double sur la base de valeurs fragmentaires.
+'fileduplicatesearch'          => 'Recherche des copies de fichiers identiques',
+'fileduplicatesearch-summary'  => 'Recherche des copies de fichiers identiques d’après leur empreinte de hachage.
 
-Entrez le nom du fichier sans le préfixe « {{ns:image}}: ».',
-'fileduplicatesearch-legend'   => 'Recherche d’un double',
+Entrez le nom du fichier sans le préfixe « {{ns:file}}: ».',
+'fileduplicatesearch-legend'   => 'Recherche d’une copie identique',
 'fileduplicatesearch-filename' => 'Nom du fichier :',
 'fileduplicatesearch-submit'   => 'Rechercher',
-'fileduplicatesearch-info'     => '$1 × $2 pixels<br />Taille du fichier : $3<br />MIME type : $4',
-'fileduplicatesearch-result-1' => 'Le fichier « $1 » n’a pas de double identique.',
-'fileduplicatesearch-result-n' => 'Le fichier « $1 » a {{PLURAL:$2|1 double identique|$2 doubles identiques}}.',
+'fileduplicatesearch-info'     => '$1 × $2 pixels<br />Taille du fichier : $3<br />Type MIME : $4',
+'fileduplicatesearch-result-1' => 'Le fichier « $1 » n’a aucune copie identique.',
+'fileduplicatesearch-result-n' => 'Le fichier « $1 » a $2 {{PLURAL:$2|copie identique|copies identiques}}.',
 
 # Special:SpecialPages
 'specialpages'                   => 'Pages spéciales',
 'specialpages-note'              => '----
 * Pages spéciales normales.
 * <span class="mw-specialpagerestricted">Pages spéciales restreintes.</span>',
-'specialpages-group-maintenance' => 'Rapport de maintenance',
+'specialpages-group-maintenance' => 'Rapports de maintenance',
 'specialpages-group-other'       => 'Autres pages spéciales',
-'specialpages-group-login'       => 'Se connecter / s’enregistrer',
+'specialpages-group-login'       => 'S’identifier / s’inscrire',
 'specialpages-group-changes'     => 'Modifications récentes et journaux',
-'specialpages-group-media'       => 'Rapports des fichiers médias et des imports',
+'specialpages-group-media'       => 'Rapports et téléversements de fichiers médias',
 'specialpages-group-users'       => 'Utilisateurs et droits rattachés',
-'specialpages-group-highuse'     => 'Utilisation intense des pages',
+'specialpages-group-highuse'     => 'Pages d’utilisation intensive',
 'specialpages-group-pages'       => 'Liste de pages',
 'specialpages-group-pagetools'   => 'Outils pour les pages',
 'specialpages-group-wiki'        => 'Données du wiki et outils',
-'specialpages-group-redirects'   => 'Redirection de pages spéciales',
+'specialpages-group-redirects'   => 'Pages spéciales redirigées',
 'specialpages-group-spam'        => 'Outils anti-pourriel',
 
 # Special:BlankPage
 'blankpage'              => 'Page vide',
-'intentionallyblankpage' => 'Cette page est intentionellement vide et elle est usée comme un test de performance, etc.',
+'intentionallyblankpage' => 'Cette page est laissée intentionellement vide.',
+
+# External image whitelist
+'external_image_whitelist' => '  #Laisser cette ligne exactement telle quelle<pre>
+#Indiquer les fragments d’expression régulières (juste la partie indiquée entre les //) ci-dessous
+#Ils correspondront avec les URLs des images (très liées) externes
+#Celles qui correspondent s’afficheront comme des images, sinon seul un lien vers l’image sera affiché
+#Les lignes commençant par un # seront considérées comme des commentaires
+
+#Mettez tous les fragments d’expressions régulières au dessus de cette ligne. Laissez cette dernière ligne telle quelle.</pre>',
 
 );
diff --git a/languages/messages/MessagesFrc.php b/languages/messages/MessagesFrc.php
index 1dedabb6..b1f932b4 100644
--- a/languages/messages/MessagesFrc.php
+++ b/languages/messages/MessagesFrc.php
@@ -56,8 +56,6 @@ $messages = array(
 'underline-never'   => 'Jamais',
 'underline-default' => "D'après le réglage du navigateur",
 
-'skinpreview' => "(Vue d'avance)",
-
 # Dates
 'sunday'        => 'dimanche',
 'monday'        => 'lundi',
@@ -198,8 +196,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => "Qui c'est {{SITENAME}}?",
 'aboutpage'            => 'Project:Info',
-'bugreports'           => "Rapport d'erreurs",
-'bugreportspage'       => "Project:Rapport d'erreurs",
 'copyright'            => 'Les matières sont avalable en accord avec $1',
 'copyrightpagename'    => '{{SITENAME}} Protection de Droits',
 'copyrightpage'        => '{{ns:project}}:Protection de Droits',
@@ -222,8 +218,6 @@ $messages = array(
 
 'badaccess'        => 'Erreur de permission',
 'badaccess-group0' => 'Vous avez pas assez de permission de faire ça que vous demandez.',
-'badaccess-group1' => "L'action que vous avez demandé est juste pour les useurs dans groupe $1.",
-'badaccess-group2' => "L'action que vous avez demandé est juste pour les useurs dans une des groupes $1.",
 'badaccess-groups' => "L'action que vous avez demandé est juste pour les useurs dans une des groupes $1.",
 
 'versionrequired'     => 'Vous avez besoin de la version $1 de MediaWiki.',
@@ -304,7 +298,6 @@ L'administrateur qui l'a barrée a donné cette explication: $1",
 'cannotdelete'         => "Impossible d'ôter la page ou le dossier choisi.  (Il est possible que quèqu'une d'autre l'a déjà ôté.)",
 'badtitle'             => 'Mauvais titre',
 'badtitletext'         => 'Le titre que vous avez demandé était pas bon, vide, ou y avait un mauvais titre entre-langue ou entre-wiki.  Ça pourrait avoir des caractères qui pouvont pas être usés dans les titres.',
-'perfdisabled'         => "Oups!  Cette fonction est barrée pour le moment parce que ça fait la base d'information aller doucement jusqu'à personne peut p'us user le wiki.",
 'perfcached'           => 'Cette information est en cache et pourrait pas être courante.',
 'perfcachedts'         => 'Cette information est en cache et le dernier changement a été fait $1.',
 'querypage-no-updates' => "À présent, les renouvelages pour cette page sont barrés.  L'information ici va pas être renouvelée t'à l'heure.",
@@ -325,7 +318,7 @@ Demande: $2',
 
 # Login and logout pages
 'logouttitle'                => 'Déconnecter',
-'logouttext'                 => "<strong>Vous êtes déconnecté asteur.</strong><br /> Vous pouvez continuer à user {{SITENAME}} sans nom ou vous pouvez connecter encore une fois avec le même nom ou un autre nom.<br />Notez: certaines pages pourriont être vues comme si vous êtes connecté, jusqu'à vous videz l'information de votre navigateur.",
+'logouttext'                 => "'''Vous êtes déconnecté asteur.'''<br /> Vous pouvez continuer à user {{SITENAME}} sans nom ou vous pouvez connecter encore une fois avec le même nom ou un autre nom.<br />Notez: certaines pages pourriont être vues comme si vous êtes connecté, jusqu'à vous videz l'information de votre navigateur.",
 'welcomecreation'            => '== Bonjour, $1! ==
 
 Votre compte a été créé.  Oubliez pas de changer votre réglage sus {{SITENAME}}.',
@@ -336,7 +329,6 @@ Votre compte a été créé.  Oubliez pas de changer votre réglage sus {{SITENA
 'remembermypassword'         => 'Se rappeler de mon mot de passe:',
 'yourdomainname'             => 'Votre domaine:',
 'externaldberror'            => "Soit y avait une erreur avec la base d'information de certification extérieur, soit vous avez pas la permission de renouveler votre compte extérieur.",
-'loginproblem'               => "<b>Problème d'identification.</b><br />Assayez encore!",
 'login'                      => 'Connecter',
 'nav-login-createaccount'    => 'Connecter / créer un compte',
 'loginprompt'                => 'Il faut partir les cookies pour connecter à {{SITENAME}}.',
@@ -404,7 +396,6 @@ Si quèqu\'une d\'autre a demandé ce mot de passe ou si vous vous rappelez de v
 'resetpass_success'       => 'Vous avez bien changé votre mot de passe!  On est après vous connecter...',
 'resetpass_bad_temporary' => 'Mauvais mot de passe de peu de durée.  Il est possible que vous avez déjà changé votre mot de passe ou demandé un nouveau mot de passe de peu de durée.',
 'resetpass_forbidden'     => 'Vous pouvez pas changer votre mot de passe sus ce wiki ici.',
-'resetpass_missing'       => 'Vide.',
 
 # Edit page toolbar
 'bold_sample'     => 'Gras',
@@ -429,8 +420,8 @@ Si quèqu\'une d\'autre a demandé ce mot de passe ou si vous vous rappelez de v
 'hr_tip'          => 'Ligne horizontale (Abusez-lé pas.)',
 
 # Edit pages
-'summary'                   => 'Description',
-'subject'                   => 'Sujet',
+'summary'                   => 'Description:',
+'subject'                   => 'Sujet:',
 'minoredit'                 => "Ça ici, c'est un petit changement.",
 'watchthis'                 => 'Guetter cette page',
 'savearticle'               => 'Sauver la page',
@@ -442,8 +433,8 @@ Si quèqu\'une d\'autre a demandé ce mot de passe ou si vous vous rappelez de v
 'missingsummary'            => "'''Attention:'''  Vous avez pas mis de description.  Si vous cliquez le bouton \"Sauver\" encore, votre changement va être sauvé sans description.",
 'missingcommenttext'        => 'Mettez donc un commentaire en bas.',
 'missingcommentheader'      => "'''Attention:'''  Vous avez pas pas mis de sujet pour ce commentaire.  Si vous cliquez le bouton \"Sauver\" encore, votre changement va être sauvé sans sujet.",
-'summary-preview'           => "Vue d'avance de la description",
-'subject-preview'           => "Vue d'avance du sujet",
+'summary-preview'           => "Vue d'avance de la description:",
+'subject-preview'           => "Vue d'avance du sujet:",
 'blockedtitle'              => "L'useur est bloqué",
 'blockedtext'               => "<big>'''Votre compte d'useur (ou votre adresse IP) est bloqué.'''</big>
 
@@ -486,22 +477,22 @@ Si vous êtes ici par erreur, cliquez le bouton \"back\" sus votre navigateur.",
 'anontalkpagetext'          => "----''Ça ici, c'est la page de discussion pour un useur sans nom qu'a pas encore créé un compte ou qui l'use pas.  Ça fait, il faut user l'adresse IP numérique pour l'identifier.  Une adresse comme ça pourrait être usée par plusieurs useurs.  Si vous êtes un useur sans nom et vous croyez que des messages sans rapport ont été envoyés à vous, [[Special:UserLogin|créer un compte ou connecter]] pour empêcher la confusion avec des autres useurs sans nom dans l'avenir.''",
 'noarticletext'             => 'À présent, y a pas de texte sus cette page. Vous pouvez [[Special:Search/{{PAGENAME}}|charcher pour le titre de cette page]] dans des autres pages ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} changer cette page].',
 'clearyourcache'            => "'''Notez:''' Après que vous avez sauvé votres changements, il foudra peut-être dépasser le cache de votre navigateur pour voir les changements.  '''Mozilla / Firefox / Safari:''' Tenez le bouton ''Shift'' en pèsant ''Reload'', ou pèsez ''Ctrl-Shift-R'' (''Cmd-Shift-R'' sus Apple Mac); '''IE:''' Tenez ''Ctrl'' en pèsant ''Refresh'', ou pèsez ''Ctrl-F5''; '''Konqueror:''' Simplement pèsez le bouton ''Reload'', ou pèsez ''F5''; Pour les useurs de '''Opera''', il foudra peut-être vider complètement le cache dans ''Tools→Preferences''.",
-'usercssjsyoucanpreview'    => '<strong>Conseil:</strong> Usez le bouton "Vue d\'avance" pour tester votre nouvelle feuille CSS/JS avant de la sauver.',
+'usercssjsyoucanpreview'    => "'''Conseil:''' Usez le bouton \"Vue d'avance\" pour tester votre nouvelle feuille CSS/JS avant de la sauver.",
 'usercsspreview'            => "'''Rappelez-vous que vous êtes après regarder votre feuille CSS qu'a pas encore été sauvée!'''",
 'userjspreview'             => "'''Rappelez-vous que vous êtes juste après regarder ou tester votre code JavaScript qu'a pas encore été sauvé!'''",
 'userinvalidcssjstitle'     => "'''Attention:''' Y a pas de style \"\$1\".  Rappelez-vous qu'il faut user les petites lettres dans le sujet des pages personnelles avec les extensions .css et .js.
 Exemple:  {{ns:user}}:Foo/monobook.css (bon)  {{ns:user}}:Foo/Monobook.css (mauvais)",
 'updated'                   => '(Renouvelé)',
-'note'                      => '<strong>Notez:</strong>',
-'previewnote'               => "<strong>Ça ici, c'est juste une vue d'avance; les changements ont pas encore été sauvés!</strong>",
+'note'                      => "'''Notez:'''",
+'previewnote'               => "'''Ça ici, c'est juste une vue d'avance; les changements ont pas encore été sauvés!'''",
 'previewconflict'           => "Cette vue d'avance montre le texte qu'est dans la boëte de changements en haut comme ça serait si vous choisirait de le sauver.",
-'session_fail_preview'      => "<strong>Ça fait de la peine!  Votre changement pouvait pas être sauvé à cause d'une perte d'information de la session.  Assayez donc encore.  Si ça travaille pas toujours, assayez de déconnecter et reconnecter.</strong>",
-'session_fail_preview_html' => "<strong>Ça fait de la peine!  Votre changement pouvait pas être sauvé à cause d'une perte d'information de votre session.</strong> 
+'session_fail_preview'      => "'''Ça fait de la peine!  Votre changement pouvait pas être sauvé à cause d'une perte d'information de la session.  Assayez donc encore.  Si ça travaille pas toujours, assayez de déconnecter et reconnecter.'''",
+'session_fail_preview_html' => "'''Ça fait de la peine!  Votre changement pouvait pas être sauvé à cause d'une perte d'information de votre session.''' 
 
 ''La vue d'avance est cachée pour empêcher les attaques JavaScript parce que ce wiki use le HTML brute.''
 
-<strong>Si ça ici est un changement juste, assayez donc encore.  Si ça travaille pas toujours, assayez de déconnecter et reconnecter.</strong>",
-'token_suffix_mismatch'     => "<strong>Votre changement pouvait pas être accepté parce que votre navigateur a mélangé les caractères de ponctuation dans l'indication des changements.  Le changement a été rejeté pour empêcher la corruption du texte de l'article.  Ça arrive des fois quand vous êtes après user un proxy sans nom.</strong>",
+'''Si ça ici est un changement juste, assayez donc encore.  Si ça travaille pas toujours, assayez de déconnecter et reconnecter.'''",
+'token_suffix_mismatch'     => "'''Votre changement pouvait pas être accepté parce que votre navigateur a mélangé les caractères de ponctuation dans l'indication des changements.  Le changement a été rejeté pour empêcher la corruption du texte de l'article.  Ça arrive des fois quand vous êtes après user un proxy sans nom.'''",
 'editing'                   => 'Changement de $1',
 'editingsection'            => 'Changement de $1 (section)',
 'editingcomment'            => 'Changement de $1 (remarque)',
@@ -513,15 +504,15 @@ Il foudra que vous mettez vos changements dans le texte qu'est là asteur.
 '''Juste''' le texte dans la boëtte de changements en haut va être sauvé quand vous pèsez \"Sauvez\".",
 'yourtext'                  => 'Votre texte',
 'storedversion'             => 'Version sauvée',
-'nonunicodebrowser'         => '<strong>ATTENTION: Votre navigateur supporte pas les caractères unicode.  Une solution de peu de durée a été trouvée pour que vous peuvez changer des articles sans problèmes.  Les caractères qui sont pas ASCII va apparaître dans la boëte de changements comme des codes hexadécimaux.</strong>',
-'editingold'                => "<strong>ATTENTION: Vous êtes après changer une vieille version de cette page.  Si vous le sauverait, vous perdrait n'importe quels changements faits depuis cette version.</strong>",
+'nonunicodebrowser'         => "'''ATTENTION: Votre navigateur supporte pas les caractères unicode.  Une solution de peu de durée a été trouvée pour que vous peuvez changer des articles sans problèmes.  Les caractères qui sont pas ASCII va apparaître dans la boëte de changements comme des codes hexadécimaux.'''",
+'editingold'                => "'''ATTENTION: Vous êtes après changer une vieille version de cette page.  Si vous le sauverait, vous perdrait n'importe quels changements faits depuis cette version.'''",
 'yourdiff'                  => 'Différences',
-'copyrightwarning'          => "Notez donc que toutes les contributions à {{SITENAME}} sont considérées d'être libérées sous le $2 (voyez $1 pour les détails).  Si vous voulez pas que votre écriture soye changée sans pitié et redistribuée à volonté, mettez donc pas votre écriture ici.<br />  Vous êtes après nous promettre aussi que vous l'avez écrit vous-même ou que vous l'avez copié du domain public ou un autre ressource libre. <strong> METTEZ PAS DE L'OUVRAGE SOUS COPYRIGHT ICI SANS PERMISSION!</strong>",
-'copyrightwarning2'         => "Notez donc que toutes les contributions à {{SITENAME}} pourriont être changées ou ôtées par des autres useurs.  Si vous voulez pas que votre écriture soye changée sans pitié, mettez donc pas votre écriture ici.<br />  Vous êtes après nous promettre aussi que vous l'avez écrit vous-même ou que vous l'avez copié du domain public ou un autre ressource libre (voyez $1 pour les détails). <strong> METTEZ PAS DE L'OUVRAGE SOUS COPYRIGHT ICI SANS PERMISSION!</strong>",
-'longpagewarning'           => "<strong>ATTENTION: Cette page a une taille de $1 kilobytes; ça pourrait créer des problèmes quand un useur assaye de changer une page qu'a une taille qu'est plus grande que 32 kb.  Considérez donc de couper la page en morceaux plus courts.</strong>",
-'longpageerror'             => "<strong>ERREUR: Le texte que vous avec mis a une taille de $1 kilobytes qu'est plus grande que le maximum de $2 kilobytes.  Ça peut pas être sauvé.</strong>",
-'readonlywarning'           => "<strong>ATTENTION: La base d'information a été barrée, ça fait, vous serez pas capable de sauver votres changements asteur.  Vous ferait mieux de copier et coller le texte dans un dossier texte et le sauver pour plus tard.</strong>",
-'protectedpagewarning'      => '<strong>ATTENTION: Cette page a été barrée pour que ça peuve être changée juste par les administrateurs.</strong>',
+'copyrightwarning'          => "Notez donc que toutes les contributions à {{SITENAME}} sont considérées d'être libérées sous le $2 (voyez $1 pour les détails).  Si vous voulez pas que votre écriture soye changée sans pitié et redistribuée à volonté, mettez donc pas votre écriture ici.<br />  Vous êtes après nous promettre aussi que vous l'avez écrit vous-même ou que vous l'avez copié du domain public ou un autre ressource libre. ''' METTEZ PAS DE L'OUVRAGE SOUS COPYRIGHT ICI SANS PERMISSION!'''",
+'copyrightwarning2'         => "Notez donc que toutes les contributions à {{SITENAME}} pourriont être changées ou ôtées par des autres useurs.  Si vous voulez pas que votre écriture soye changée sans pitié, mettez donc pas votre écriture ici.<br />  Vous êtes après nous promettre aussi que vous l'avez écrit vous-même ou que vous l'avez copié du domain public ou un autre ressource libre (voyez $1 pour les détails). ''' METTEZ PAS DE L'OUVRAGE SOUS COPYRIGHT ICI SANS PERMISSION!'''",
+'longpagewarning'           => "'''ATTENTION: Cette page a une taille de $1 kilobytes; ça pourrait créer des problèmes quand un useur assaye de changer une page qu'a une taille qu'est plus grande que 32 kb.  Considérez donc de couper la page en morceaux plus courts.'''",
+'longpageerror'             => "'''ERREUR: Le texte que vous avec mis a une taille de $1 kilobytes qu'est plus grande que le maximum de $2 kilobytes.  Ça peut pas être sauvé.'''",
+'readonlywarning'           => "'''ATTENTION: La base d'information a été barrée, ça fait, vous serez pas capable de sauver votres changements asteur.  Vous ferait mieux de copier et coller le texte dans un dossier texte et le sauver pour plus tard.'''",
+'protectedpagewarning'      => "'''ATTENTION: Cette page a été barrée pour que ça peuve être changée juste par les administrateurs.'''",
 'semiprotectedpagewarning'  => "'''Notez:'''  Cette page a été barrée pour que ça peuve être changé juste par les useurs connectés.",
 'cascadeprotectedwarning'   => "'''Attention:'''  Cette page est barrée pour que ça peuve être changé juste par les administrateurs parce que cette page est comprise dans {{PLURAL:$1|une page protégée|des pages protégées}} avec la protection en cascade.",
 'templatesused'             => 'Patrons usés sus cette page:',
@@ -551,11 +542,9 @@ Les notes d'ôtage pour cette page sont données ici pour vous aider:",
 # History pages
 'viewpagelogs'        => 'Voir les notes pour cette page',
 'nohistory'           => 'Y a pas de changements pour cette page.',
-'revnotfound'         => 'Changement pas trouvé',
-'revnotfoundtext'     => "Le vieux changement de la page que vous avez demandé pouvait pas être trouvé.  Regardez donc l'adresse URL que vous avez usée.",
 'currentrev'          => 'Version courante',
 'revisionasof'        => 'Version depuis le $1',
-'revision-info'       => 'Version depuis le $1 par $2',
+'revision-info'       => 'Version depuis le $1 par $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Version avant',
 'nextrevision'        => 'Version après→',
 'currentrevisionlink' => 'Version courante',
@@ -620,10 +609,12 @@ Des autres administrateurs sus ce wiki ont la permission de voir et de rétablir
 # Search results
 'searchresults'    => 'Résultats de la charche',
 'searchresulttext' => "Pour plus d'information pour vous aider à charcher dans {{SITENAME}}, voyez [[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchhelp-url'   => 'Help:Aide',
 
 # Preferences page
 'preferences'   => 'Réglage',
 'mypreferences' => 'Mon réglage',
+'skin-preview'  => "Vue d'avance",
 
 # User rights
 'editinguser' => "Changement de '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
diff --git a/languages/messages/MessagesFrp.php b/languages/messages/MessagesFrp.php
index 116c52ed..37e0a0fa 100644
--- a/languages/messages/MessagesFrp.php
+++ b/languages/messages/MessagesFrp.php
@@ -10,13 +10,6 @@
 
 $fallback = 'fr';
 
-$skinNames = array(
-    'standard'    => 'Estandârd',
-    'nostalgia'   => 'Encrêt',
-    'cologneblue' => 'Cologne Blu',
-    'chick'       => 'Pugin',
-    'simple'      => 'Simplo'
-);
 
 $bookstoreList = array(
     'Amazon.fr'    => 'http://www.amazon.fr/exec/obidos/ISBN=$1',
@@ -26,24 +19,22 @@ $bookstoreList = array(
 );
 
 $namespaceNames = array(
-    NS_MEDIA          => 'Mèdia',
-    NS_SPECIAL        => 'Spèciâl',
-    NS_MAIN           => '',
-    NS_TALK           => 'Discutar',
-    NS_USER           => 'Utilisator',
-    NS_USER_TALK      => 'Discussion_Utilisator',
-    # NS_PROJECT set by $wgMetaNamespace
-    NS_PROJECT_TALK   => 'Discussion_$1',
-    NS_IMAGE          => 'Émâge',
-    NS_IMAGE_TALK     => 'Discussion_Émâge',
-    NS_MEDIAWIKI      => 'MediaWiki',
-    NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
-    NS_TEMPLATE       => 'Modèlo',
-    NS_TEMPLATE_TALK  => 'Discussion_Modèlo',
-    NS_HELP           => 'Éde',
-    NS_HELP_TALK      => 'Discussion_Éde',
-    NS_CATEGORY       => 'Catègorie',
-    NS_CATEGORY_TALK  => 'Discussion_Catègorie'
+	NS_MEDIA            => 'Mèdia',
+	NS_SPECIAL          => 'Spèciâl',
+	NS_TALK             => 'Discutar',
+	NS_USER             => 'Utilisator',
+	NS_USER_TALK        => 'Discussion_Utilisator',
+	NS_PROJECT_TALK     => 'Discussion_$1',
+	NS_FILE             => 'Émâge',
+	NS_FILE_TALK        => 'Discussion_Émâge',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
+	NS_TEMPLATE         => 'Modèlo',
+	NS_TEMPLATE_TALK    => 'Discussion_Modèlo',
+	NS_HELP             => 'Éde',
+	NS_HELP_TALK        => 'Discussion_Éde',
+	NS_CATEGORY         => 'Catègorie',
+	NS_CATEGORY_TALK    => 'Discussion_Catègorie',
 );
 
 $linkTrail = '/^([a-zàâçéèêîœôû·’æäå�ăëēïīòö�ùü‘]+)(.*)$/sDu';
@@ -111,8 +102,6 @@ $messages = array(
 'underline-never'   => 'jamés',
 'underline-default' => 'd’aprés lo navigator',
 
-'skinpreview' => '(Prèvisualisar)',
-
 # Dates
 'sunday'        => 'demenge',
 'monday'        => 'delon',
@@ -206,7 +195,7 @@ $messages = array(
 'mytalk'         => 'Pâge de discussion',
 'anontalk'       => 'Discussion avouéc ceta adrèce IP',
 'navigation'     => 'Navigacion',
-'and'            => 'et',
+'and'            => '&#32;et',
 
 # Metadata in edit box
 'metadata_help' => 'Mètabalyês :',
@@ -269,8 +258,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'A propôs de {{SITENAME}}',
 'aboutpage'            => 'Project:A propôs',
-'bugreports'           => 'Rapôrt d’èrrors',
-'bugreportspage'       => 'Project:Rapôrt d’èrrors',
 'copyright'            => 'Lo contegnu est disponiblo d’aprés los tèrmos de la licence $1.',
 'copyrightpagename'    => 'licence {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Drêt d’ôtor',
@@ -293,8 +280,6 @@ $messages = array(
 
 'badaccess'        => 'Èrror de pèrmission',
 'badaccess-group0' => 'Vos avéd pas los drêts sufisents por rèalisar l’accion que vos demandâd.',
-'badaccess-group1' => 'L’accion que vos tâchiéd de rèalisar est accèssibla ren qu’ux utilisators de la tropa $1.',
-'badaccess-group2' => 'L’accion que vos tâchiéd de rèalisar est accèssibla ren qu’ux utilisators de les tropes $1.',
 'badaccess-groups' => 'L’accion que vos tâchiéd de rèalisar est accèssibla ren qu’ux utilisators de les tropes $1.',
 
 'versionrequired'     => 'Vèrsion $1 de MediaWiki nècèssèra',
@@ -386,7 +371,6 @@ L’administrator èyent vèrrolyê la bâsa de balyês at balyê l’èxpllicac
 'cannotdelete'         => 'Empossiblo de suprimar la pâge ou lo fichiér endicâ. (La suprèssion at pôt-étre ja étâ fêta per quârqu’un d’ôtro.)',
 'badtitle'             => 'Môvés titro',
 'badtitletext'         => 'Lo titro de la pâge demandâ est envalido, vouedo ou ben s’ag·ét d’un titro entèrlengoua ou entèrprojèt mâl-liyê. Contint pôt-étre yon ou plusiors caractèros que pôvont pas étre utilisâs dens los titros.',
-'perfdisabled'         => 'Dèsolâ ! Cela fonccionalitât est temporèrament dèsactivâ perce que frène la bâsa de balyês que pas més nion pôt utilisar lo vouiqui.',
 'perfcached'           => 'Cen est una vèrsion en cache et el est pôt-étre pas a jorn.',
 'perfcachedts'         => 'Les balyês siuventes sont en cache, sont vêr pas per fôrce a jorn. La dèrriére actualisacion dâte du $1.',
 'querypage-no-updates' => 'Ora les mises a jorn por ceta pâge sont dèsactivâs. Les balyês ce-desot sont pas betâs a jorn.',
@@ -400,7 +384,7 @@ Requéta : $2',
 'protectedpagetext'    => 'Ceta pâge at étâ protègiê por empachiér sa modificacion.',
 'viewsourcetext'       => 'Vos pouede vêre et copiyér lo contegnu de la pâge por povêr travalyér dessus :',
 'protectedinterface'   => 'Ceta pâge fornét du tèxte d’entèrface por la programeria et est protègiê por èvitar los abus.',
-'editinginterface'     => "'''Atencion :''' vos éte aprés èditar una pâge utilisâ por crèar lo tèxte de l’entèrface de la programeria. Los changements sè cognetront, d’aprés lo contèxte, sur totes ou cèrtênes pâges visibles per los ôtros utilisators. Por les traduccions, nos vos envitens a utilisar lo seto [http://translatewiki.net/wiki/Main_Page?setlang=frp Betawiki], lo projèt d’entèrnacionalisacion des mèssâjos de MediaWiki.",
+'editinginterface'     => "'''Atencion :''' vos éte aprés èditar una pâge utilisâ por crèar lo tèxte de l’entèrface de la programeria. Los changements sè cognetront, d’aprés lo contèxte, sur totes ou cèrtênes pâges visibles per los ôtros utilisators. Por les traduccions, nos vos envitens a utilisar lo seto [http://translatewiki.net/wiki/Main_Page?setlang=frp translatewiki.net], lo projèt d’entèrnacionalisacion des mèssâjos de MediaWiki.",
 'sqlhidden'            => '(Requéta SQL cachiê)',
 'cascadeprotected'     => 'Ora, ceta pâge est protègiê perce qu’el est encllua dens {{PLURAL:$1|la pâge siuventa|les pâges siuventes}}, èyent étâ protègiê{{PLURAL:$1||s}} avouéc lo chouèx « protèccion en cascâda » activâ :
 $2',
@@ -424,7 +408,6 @@ Voutron compto utilisator at étâ crèâ. Oubliâd pas de pèrsonalisar voutres
 'remembermypassword'         => "Sè rapelar de mon mot de pâssa (tèmouen (''cookie''))",
 'yourdomainname'             => 'Voutron domêno :',
 'externaldberror'            => 'Ou ben una èrror est arrevâ avouéc la bâsa de balyês d’ôtentificacion de defôr, ou ben vos éte pas ôtorisâ a betar a jorn voutron compto de defôr.',
-'loginproblem'               => '<b>Problèmo d’identificacion.</b><br />Tornâd èprovar !',
 'login'                      => 'Identificacion',
 'nav-login-createaccount'    => 'Sè conèctar ou crèar un compto',
 'loginprompt'                => "Vos dête activar los tèmouens (''cookies'') por étre conèctâ ôtomaticament a {{SITENAME}}.",
@@ -483,7 +466,7 @@ Devant qu’un ôtro mèl seye emmandâ a cél compto, vos devréd siuvre les en
 'acct_creation_throttle_hit' => 'Dèsolâ, vos éd ja crèâ {{PLURAL:$1|yon compto|$1 comptos}}. Vos pouede pas nen crèar d’ôtros.',
 'emailauthenticated'         => 'Voutra adrèce de mèl at étâ ôtentifiâ lo $1.',
 'emailnotauthenticated'      => 'Voutra adrèce de mèl est <strong>p’oncor ôtentifiâ</strong>. Nion mèl serat emmandâ por châcuna de les fonccions siuventes.',
-'noemailprefs'               => '<strong>Niona adrèce èlèctronica at étâ endicâ,</strong> les fonccions siuventes seront pas disponibles.',
+'noemailprefs'               => 'Niona adrèce èlèctronica at étâ endicâ, les fonccions siuventes seront pas disponibles.',
 'emailconfirmlink'           => 'Confirmâd voutra adrèce de mèl',
 'invalidemailaddress'        => 'Ceta adrèce de mèl pôt pas étre accèptâ perce que semble avêr un format envalido. Volyéd entrar una adrèce valida ou lèssiér cél champ vouedo.',
 'accountcreated'             => 'Compto crèâ.',
@@ -500,11 +483,13 @@ Ignorâd ceti mèssâjo se ceti compto at étâ crèâ per èrror.',
 'resetpass_announce'      => 'Vos vos éte enregistrâ avouéc un mot de pâssa temporèro emmandâ per mèl. Por chavonar l’enregistrament, vos dête entrar un novél mot de pâssa ique :',
 'resetpass_text'          => '<!-- Apond de tèxte ique -->',
 'resetpass_header'        => 'Remisa a zérô du mot de pâssa',
+'oldpassword'             => 'Viely mot de pâssa :',
+'newpassword'             => 'Novél mot de pâssa :',
+'retypenew'               => 'Confirmar lo novél mot de pâssa :',
 'resetpass_submit'        => 'Changiér lo mot de pâssa et s’enregistrar',
 'resetpass_success'       => 'Voutron mot de pâssa at étâ changiê avouéc reusséta ! Enregistrament en cors...',
 'resetpass_bad_temporary' => 'Mot de pâssa temporèro envalido. Vos éd pôt-étre ja changiê voutron mot de pâssa avouéc reusséta, ou ben demandâ un novél mot de pâssa temporèro.',
 'resetpass_forbidden'     => 'Los mots de pâssa pôvont pas étre changiês dessus {{SITENAME}}.',
-'resetpass_missing'       => 'Niona balyê entrâ.',
 
 # Edit page toolbar
 'bold_sample'     => 'Tèxte grâs',
@@ -529,8 +514,8 @@ Ignorâd ceti mèssâjo se ceti compto at étâ crèâ per èrror.',
 'hr_tip'          => 'Legne plana (pas nen abusar)',
 
 # Edit pages
-'summary'                   => 'Rèsumâ&nbsp;',
-'subject'                   => 'Sujèt/titro',
+'summary'                   => 'Rèsumâ&nbsp;:',
+'subject'                   => 'Sujèt/titro:',
 'minoredit'                 => 'Modificacion minora',
 'watchthis'                 => 'Siuvre ceta pâge',
 'savearticle'               => 'Sôvar ceta pâge',
@@ -542,8 +527,8 @@ Ignorâd ceti mèssâjo se ceti compto at étâ crèâ per èrror.',
 'missingsummary'            => "'''Atencion :''' vos éd pas modifiâ lo rèsumâ de voutra modificacion. Se vos tornâd clicar sur lo boton « Sôvar ceta pâge », la pâge serat sôvâ sen novél avèrtissement.",
 'missingcommenttext'        => 'Volyéd fâre voutron comentèro ce-desot.',
 'missingcommentheader'      => "'''Rapèl :''' vos éd pas forni de sujèt/titro a ceti comentèro. Se vos tornâd clicar dessus « Sôvar ceta pâge », voutra èdicion serat enregistrâ sen titro.",
-'summary-preview'           => 'Prèvisualisacion du rèsumâ ',
-'subject-preview'           => 'Prèvisualisacion du sujèt/titro ',
+'summary-preview'           => 'Prèvisualisacion du rèsumâ :',
+'subject-preview'           => 'Prèvisualisacion du sujèt/titro :',
 'blockedtitle'              => 'L’utilisator est blocâ.',
 'blockedtext'               => "<big>'''Voutron compto utilisator ou voutra adrèce IP at étâ blocâ.'''</big>
 
@@ -593,16 +578,16 @@ Volyéd los spècefiar dens tota requéta.",
 'userjspreview'             => "'''Rapelâd-vos que vos éte aprés visualisar ou èprovar voutron code JavaScript et qu’il at p’oncor étâ enregistrâ !'''",
 'userinvalidcssjstitle'     => "'''Atencion :''' ègziste pas d’entèrface « $1 ». Rapelâd-vos que les pâges a sè avouéc èxtensions .css et .js utilisont des titros en petiôtes lètres aprés lo nom d’utilisator et la bârra de fraccion /.<br />D’ense, {{ns:user}}:Foo/monobook.css est valido, pendent que {{ns:user}}:Foo/Monobook.css serat una fôlye de stilo envalida.",
 'updated'                   => '(Betâ a jorn)',
-'note'                      => '<strong>Nota :</strong>',
-'previewnote'               => '<strong>Atencion, ceti tèxte est ren qu’una prèvisualisacion et at p’oncor étâ sôvâ !</strong>',
+'note'                      => "'''Nota :'''",
+'previewnote'               => "'''Atencion, ceti tèxte est ren qu’una prèvisualisacion et at p’oncor étâ sôvâ !'''",
 'previewconflict'           => 'Ceta prèvisualisacion montre lo tèxte de la bouèta d’èdicion de d’amont tâl qu’aparètrat se vos chouèsésséd/cièrde de lo sôvar.',
-'session_fail_preview'      => '<strong>Dèsolâ ! Nos povens pas enregistrar voutra modificacion a côsa d’una pèrta d’enformacions regardent voutra sèssion. Volyéd tornar èprovar. Se cen tôrne pas reussir, volyéd vos dèconèctar, et pués vos tornar conèctar.</strong>',
-'session_fail_preview_html' => "<strong>Dèsolâ ! Nos povens pas enregistrar voutra modificacion a côsa d’una pèrta d’enformacions regardent voutra sèssion.</strong>
+'session_fail_preview'      => "'''Dèsolâ ! Nos povens pas enregistrar voutra modificacion a côsa d’una pèrta d’enformacions regardent voutra sèssion. Volyéd tornar èprovar. Se cen tôrne pas reussir, volyéd vos dèconèctar, et pués vos tornar conèctar.'''",
+'session_fail_preview_html' => "'''Dèsolâ ! Nos povens pas enregistrar voutra modificacion a côsa d’una pèrta d’enformacions regardent voutra sèssion.'''
 
 ''L’HTML bruto étent activâ dessus {{SITENAME}}, la prèvisualisacion at étâ mâscâ por prèvegnir una ataca per JavaScript.''
 
-<strong>Se la tentativa de modificacion ére lèg·itima, volyéd tornar èprovar. Se cen tôrne pas reussir, volyéd vos dèconèctar, et pués vos tornar conèctar.</strong>",
-'token_suffix_mismatch'     => '<strong>Voutra èdicion at pas étâ accèptâ perce que voutron navigator at mècllâ los caractèros de ponctuacion dens l’identifiant d’èdicion. L’èdicion at étâ refusâ por empachiér la corrupcion du tèxte de l’articllo. Ceti problèmo arreve quand vos utilisâd un proxy anonimo avouéc problèmo.</strong>',
+'''Se la tentativa de modificacion ére lèg·itima, volyéd tornar èprovar. Se cen tôrne pas reussir, volyéd vos dèconèctar, et pués vos tornar conèctar.'''",
+'token_suffix_mismatch'     => "'''Voutra èdicion at pas étâ accèptâ perce que voutron navigator at mècllâ los caractèros de ponctuacion dens l’identifiant d’èdicion. L’èdicion at étâ refusâ por empachiér la corrupcion du tèxte de l’articllo. Ceti problèmo arreve quand vos utilisâd un proxy anonimo avouéc problèmo.'''",
 'editing'                   => 'Modificacion de $1',
 'editingsection'            => 'Modificacion de $1 (sèccion)',
 'editingcomment'            => 'Modificacion de $1 (comentèro)',
@@ -614,26 +599,26 @@ Vos voléd devêr aduire voutres modificacions u tèxte ègzistent.
 '''Solèt''' lo tèxte de la zona de d’amont serat sôvâ.",
 'yourtext'                  => 'Voutron tèxte',
 'storedversion'             => 'Vèrsion enregistrâ',
-'nonunicodebrowser'         => '<strong>ATENCION : voutron navigator supôrte pas l’unicode. Una solucion temporèra at étâ trovâ por vos pèrmetre de modifiar en tota suretât un articllo : los caractèros nan-ASCII aparètront dens voutra bouèta d’èdicion a titro de codes hèxadècimâls. Vos devriâd utilisar un navigator ples novél.</strong>',
-'editingold'                => '<strong>ATENCION : vos éte aprés modifiar una vielye vèrsion de ceta pâge. Se vos sôvâd, totes les modificacions fêtes dês ceta vèrsion seront pèrdues.</strong>',
+'nonunicodebrowser'         => "'''ATENCION : voutron navigator supôrte pas l’unicode. Una solucion temporèra at étâ trovâ por vos pèrmetre de modifiar en tota suretât un articllo : los caractèros nan-ASCII aparètront dens voutra bouèta d’èdicion a titro de codes hèxadècimâls. Vos devriâd utilisar un navigator ples novél.'''",
+'editingold'                => "'''ATENCION : vos éte aprés modifiar una vielye vèrsion de ceta pâge. Se vos sôvâd, totes les modificacions fêtes dês ceta vèrsion seront pèrdues.'''",
 'yourdiff'                  => 'Difèrences',
-'copyrightwarning'          => 'Totes les contribucions a {{SITENAME}} sont considèrâs coment publeyês desot los tèrmos de la $2 (vêde $1 por més de dètalys). Se vos dèsirâd pas que voutros ècrits seyont modifiâs et distribuâs a volontât, marci de pas los sometre ique.<br />
+'copyrightwarning'          => "Totes les contribucions a {{SITENAME}} sont considèrâs coment publeyês desot los tèrmos de la $2 (vêde $1 por més de dètalys). Se vos dèsirâd pas que voutros ècrits seyont modifiâs et distribuâs a volontât, marci de pas los sometre ique.<br />
 Vos nos assurâd asse-ben que vos éd cen ècrit vos-mémo, ou ben que vos l’éd copiyê d’una sôrsa que vint du domêno publico, ou d’una ressôrsa abada.<br />
-<strong>UTILISÂD PAS D’ÔVRES DESOT DRÊT D’ÔTOR SEN ÔTORISACION ÈXPRÈSSA !</strong>',
-'copyrightwarning2'         => 'Totes les contribucions a {{SITENAME}} pôvont étre modifiâs ou suprimâs per d’ôtros utilisators. Se vos dèsirâd pas que voutros ècrits seyont modifiâs et distribuâs a volontât, marci de pas los sometre ique.<br />
+'''UTILISÂD PAS D’ÔVRES DESOT DRÊT D’ÔTOR SEN ÔTORISACION ÈXPRÈSSA !'''",
+'copyrightwarning2'         => "Totes les contribucions a {{SITENAME}} pôvont étre modifiâs ou suprimâs per d’ôtros utilisators. Se vos dèsirâd pas que voutros ècrits seyont modifiâs et distribuâs a volontât, marci de pas los sometre ique.<br />
 Vos nos assurâd asse-ben que vos éd cen ècrit vos-mémo, ou ben que vos l’éd copiyê d’una sôrsa que vint du domêno publico, ou d’una ressôrsa abada (vêde $1 por més de dètalys).<br />
-<strong>UTILISÂD PAS D’ÔVRES DESOT DRÊT D’ÔTOR SEN ÔTORISACION ÈXPRÈSSA !</strong>',
-'longpagewarning'           => '<strong>ATENCION : ceta pâge at una longior de $1 ko ;
+'''UTILISÂD PAS D’ÔVRES DESOT DRÊT D’ÔTOR SEN ÔTORISACION ÈXPRÈSSA !'''",
+'longpagewarning'           => "'''ATENCION : ceta pâge at una longior de $1 ko ;
 cèrtins navigators g·èront mâl la modificacion de les pâges aprochient ou dèpassent 32 ko.
-Pôt-étre devriâd-vos divisar la pâge en sèccions ples petiôtes.</strong>',
-'longpageerror'             => '<strong>ÈRROR : lo tèxte que vos éd somês fât $1 ko, cen que dèpâsse la limita fixâ a $2 ko. Lo tèxte pôt pas étre sôvâ.</strong>',
-'readonlywarning'           => '<strong>ATENCION : la bâsa de balyês at étâ vèrrolyê por mantegnence,
-vos porréd vêr pas sôvar voutres modificacions d’abôrd. Vos pouede copiyér lo contegnu de la pâge dens un fichiér tèxte et pués lo sôvar por ples târd.</strong>',
-'protectedpagewarning'      => '<strong>ATENCION : ceta pâge est protègiê.
-Solèts los utilisators èyent lo statut d’administrator pôvont la modifiar.</strong>',
+Pôt-étre devriâd-vos divisar la pâge en sèccions ples petiôtes.'''",
+'longpageerror'             => "'''ÈRROR : lo tèxte que vos éd somês fât $1 ko, cen que dèpâsse la limita fixâ a $2 ko. Lo tèxte pôt pas étre sôvâ.'''",
+'readonlywarning'           => "'''ATENCION : la bâsa de balyês at étâ vèrrolyê por mantegnence,
+vos porréd vêr pas sôvar voutres modificacions d’abôrd. Vos pouede copiyér lo contegnu de la pâge dens un fichiér tèxte et pués lo sôvar por ples târd.'''",
+'protectedpagewarning'      => "'''ATENCION : ceta pâge est protègiê.
+Solèts los utilisators èyent lo statut d’administrator pôvont la modifiar.'''",
 'semiprotectedpagewarning'  => "'''Nota :''' ceta pâge at étâ protègiê de façon que solèts los contributors enregistrâs pouessont la modifiar.",
 'cascadeprotectedwarning'   => "'''ATENCION :''' ceta pâge at étâ protègiê por cen que solèts los administrators pouessont l’èditar. Cela protèccion at étâ fêta perce que ceta pâge est encllua dens {{PLURAL:$1|una pâge protègiê|des pâges protègiês}} avouéc la « protèccion en cascâda » activâ.",
-'titleprotectedwarning'     => '<strong>ATENCION : ceta pâge at étâ protègiê de façon que solèts cèrtins utilisators pouessont la crèar.</strong>',
+'titleprotectedwarning'     => "'''ATENCION : ceta pâge at étâ protègiê de façon que solèts cèrtins utilisators pouessont la crèar.'''",
 'templatesused'             => 'Modèlos utilisâs sur ceta pâge :',
 'templatesusedpreview'      => 'Modèlos utilisâs dens ceta prèvisualisacion :',
 'templatesusedsection'      => 'Modèlos utilisâs dens ceta sèccion :',
@@ -665,12 +650,9 @@ La rêson balyê per $3 ére ''$2''.",
 # History pages
 'viewpagelogs'        => 'Vêde lo jornal de ceta pâge',
 'nohistory'           => 'Ègziste pas d’historico por ceta pâge.',
-'revnotfound'         => 'Vèrsion entrovâbla',
-'revnotfoundtext'     => 'La vèrsion prècèdenta de cela pâge at pas possu étre retrovâ.
-Volyéd controlar l’URL que vos éd utilisâ por arrevar a ceta pâge.',
 'currentrev'          => 'Vèrsion d’ora',
 'revisionasof'        => 'Vèrsion du $1',
-'revision-info'       => 'Vèrsion du $1 per $2',
+'revision-info'       => 'Vèrsion du $1 per $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Vèrsion prècèdenta',
 'nextrevision'        => 'Vèrsion siuventa →',
 'currentrevisionlink' => 'vêde la vèrsion corenta',
@@ -783,6 +765,7 @@ Assurâd-vos que cél changement pouesse consèrvar la continuitât de l’histo
 'prevn'                 => '$1 prècèdents',
 'nextn'                 => '$1 siuvents',
 'viewprevnext'          => 'Vêre ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Somèro',
 'search-result-size'    => '$1 ({{PLURAL:$2|1 mot|$2 mots}})',
 'search-result-score'   => 'Rapôrt : $1%',
 'searchall'             => 'Tôs',
@@ -810,6 +793,7 @@ Atencion, lor endèxacion du contegnu de {{SITENAME}} pôt pas étre a jorn.',
 'qbsettings-floatingright' => 'Fllotenta a drêta',
 'changepassword'           => 'Modificacion du mot de pâssa',
 'skin'                     => 'Entèrface',
+'skin-preview'             => 'Prèvisualisar',
 'math'                     => 'Rendu de les formules matèmatiques',
 'dateformat'               => 'Format de dâta',
 'datedefault'              => 'Niona prèference',
@@ -831,9 +815,6 @@ Atencion, lor endèxacion du contegnu de {{SITENAME}} pôt pas étre a jorn.',
 'prefs-misc'               => 'Prèferences de totes sôrtes',
 'saveprefs'                => 'Enregistrar les prèferences',
 'resetprefs'               => 'Rètablir les prèferences',
-'oldpassword'              => 'Viely mot de pâssa :',
-'newpassword'              => 'Novél mot de pâssa :',
-'retypenew'                => 'Confirmar lo novél mot de pâssa :',
 'textboxsize'              => 'Fenétra d’èdicion',
 'rows'                     => 'Renchiês :',
 'columns'                  => 'Colones :',
@@ -861,7 +842,7 @@ Atencion, lor endèxacion du contegnu de {{SITENAME}} pôt pas étre a jorn.',
 'userrights-lookup-user'   => 'Maneyance des drêts d’utilisator',
 'userrights-user-editname' => 'Entrâd un nom d’utilisator :',
 'editusergroup'            => 'Modificacion de les tropes d’utilisators',
-'editinguser'              => "Modificacion des drêts d’utilisator de '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "Modificacion des drêts d’utilisator de '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'Modifiar les tropes de l’utilisator',
 'saveusergroups'           => 'Sôvar les tropes de l’utilisator',
 'userrights-groupsmember'  => 'Membro de :',
@@ -937,11 +918,11 @@ Atencion, lor endèxacion du contegnu de {{SITENAME}} pôt pas étre a jorn.',
 'uploadnologintext'           => 'Vos dête étre [[Special:UserLogin|conèctâ]] por copiyér des fichiérs sur lo sèrvior.',
 'upload_directory_read_only'  => 'Lo sèrvior Vouèbe pôt pas ècrire dens lo dossiér ciba ($1).',
 'uploaderror'                 => 'Èrror',
-'uploadtext'                  => "Utilisâd ceti formulèro por copiyér des fichiérs, por vêre ou rechèrchiér des émâges prècèdament copiyês consultâd la [[Special:ImageList|lista de fichiérs copiyês]], les copies et suprèssions sont asse-ben enregistrâs dens lo [[Special:Log/upload|jornal de les copies]].
+'uploadtext'                  => "Utilisâd ceti formulèro por copiyér des fichiérs, por vêre ou rechèrchiér des émâges prècèdament copiyês consultâd la [[Special:FileList|lista de fichiérs copiyês]], les copies et suprèssions sont asse-ben enregistrâs dens lo [[Special:Log/upload|jornal de les copies]].
 
 Por encllure una émâge dens una pâge, utilisâd un lim de la fôrma :
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fichiér.jpg]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fichiér.png|tèxte altèrnatif]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fichiér.jpg]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fichiér.png|tèxte altèrnatif]]</nowiki>'''
 ou ben por liyér tot drêt vers lo fichiér :
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fichiér.ogg]]</nowiki>'''",
 'upload-permitted'            => 'Formats de fichiérs ôtorisâs : $1.',
@@ -968,19 +949,19 @@ ou ben por liyér tot drêt vers lo fichiér :
 'large-file'                  => 'Los fichiérs importâs devriant pas étre ples grôs que $1 ; ceti fichiér fât $2.',
 'largefileserver'             => 'La talye de ceti fichiér est d’amont lo nivô lo ples hôt ôtorisâ.',
 'emptyfile'                   => 'Lo fichiér que vos voléd importar semble vouedo. Cen pôt étre diu a una èrror dens lo nom du fichiér. Volyéd controlar que vos dèsirâd franc copiyér ceti fichiér.',
-'fileexists'                  => 'Un fichiér avouéc ceti nom ègziste ja. Marci de controlar <strong><tt>$1</tt></strong>. Éte-vos de sûr de volêr lo modifiar ?',
-'filepageexists'              => 'La pâge de dèscripcion por ceti fichiér at ja étâ crèâ ique <strong><tt>$1</tt></strong>, mas nion fichiér de ceti nom ègziste ora. Lo rèsumâ que vos voléd ècrire remplacierat pas lo tèxte prècèdent ; por cen fâre vos devréd èditar manuèlament la pâge.',
-'fileexists-extension'        => 'Un fichiér avouéc un nom semblâblo ègziste ja :<br />
-Nom du fichiér a importar : <strong><tt>$1</tt></strong><br />
-Nom du fichiér ègzistent : <strong><tt>$2</tt></strong><br />
-la solèta difèrence est la câssa (grantes lètres / petiôtes lètres) de l’èxtension. Volyéd controlar que lo fichiér est difèrent et changiér son nom.',
+'fileexists'                  => "Un fichiér avouéc ceti nom ègziste ja. Marci de controlar '''<tt>$1</tt>'''. Éte-vos de sûr de volêr lo modifiar ?",
+'filepageexists'              => "La pâge de dèscripcion por ceti fichiér at ja étâ crèâ ique '''<tt>$1</tt>''', mas nion fichiér de ceti nom ègziste ora. Lo rèsumâ que vos voléd ècrire remplacierat pas lo tèxte prècèdent ; por cen fâre vos devréd èditar manuèlament la pâge.",
+'fileexists-extension'        => "Un fichiér avouéc un nom semblâblo ègziste ja :<br />
+Nom du fichiér a importar : '''<tt>$1</tt>'''<br />
+Nom du fichiér ègzistent : '''<tt>$2</tt>'''<br />
+la solèta difèrence est la câssa (grantes lètres / petiôtes lètres) de l’èxtension. Volyéd controlar que lo fichiér est difèrent et changiér son nom.",
 'fileexists-thumb'            => "<center>'''Émâge ègzistenta'''</center>",
-'fileexists-thumbnail-yes'    => 'Lo fichiér semble étre una émâge en talye rèduita <i>(figura)</i>. Volyéd controlar lo fichiér <strong><tt>$1</tt></strong>.<br />
-Se lo fichiér controlâ est la méma émâge (dens una rèsolucion mèlyora), y at pas fôta d’importar una vèrsion rèduita.',
-'file-thumbnail-no'           => 'Lo nom du fichiér comence per <strong><tt>$1</tt></strong>. O est possiblo que s’ag·ésse d’una vèrsion rèduita <i>(figura)</i>.
-Se vos disposâd du fichiér en rèsolucion hôta, importâd-lo, ôtrament volyéd changiér lo nom du fichiér.',
-'fileexists-forbidden'        => 'Un fichiér avouéc ceti nom ègziste ja ; marci de tornar arriér et de copiyér lo fichiér desot un novél nom. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Un fichiér portent lo mémo nom ègziste ja dens la bâsa de balyês comena ; volyéd tornar arriér et pués l’emmandar desot un novél nom. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Lo fichiér semble étre una émâge en talye rèduita ''(figura)''. Volyéd controlar lo fichiér '''<tt>$1</tt>'''.<br />
+Se lo fichiér controlâ est la méma émâge (dens una rèsolucion mèlyora), y at pas fôta d’importar una vèrsion rèduita.",
+'file-thumbnail-no'           => "Lo nom du fichiér comence per '''<tt>$1</tt>'''. O est possiblo que s’ag·ésse d’una vèrsion rèduita ''(figura)''.
+Se vos disposâd du fichiér en rèsolucion hôta, importâd-lo, ôtrament volyéd changiér lo nom du fichiér.",
+'fileexists-forbidden'        => 'Un fichiér avouéc ceti nom ègziste ja ; marci de tornar arriér et de copiyér lo fichiér desot un novél nom. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Un fichiér portent lo mémo nom ègziste ja dens la bâsa de balyês comena ; volyéd tornar arriér et pués l’emmandar desot un novél nom. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Copia reussia',
 'uploadwarning'               => 'Atencion !',
 'savefile'                    => 'Sôvar lo fichiér',
@@ -999,7 +980,7 @@ Volyéd controlar lo fichiér.',
 'upload-wasdeleted'           => "'''Atencion : vos éte aprés importar un fichiér qu’at ja étâ suprimâ dês devant.'''
 
 Vos devriâd considèrar s’o est convegnâblo de continuar l’impôrt de cél fichiér. Lo jornal de les suprèssions vos barat los èlèments d’enformacion.",
-'filename-bad-prefix'         => 'Lo nom du fichiér que vos importâd comence per <strong>« $1 »</strong> qu’est un nom g·ènèralament balyê per los aparèlys-fotô numericos et que dècrit pas lo fichiér. Volyéd chouèsir/cièrdre un nom de fichiér dècrisent voutron fichiér.',
+'filename-bad-prefix'         => "Lo nom du fichiér que vos importâd comence per '''« $1 »''' qu’est un nom g·ènèralament balyê per los aparèlys-fotô numericos et que dècrit pas lo fichiér. Volyéd chouèsir/cièrdre un nom de fichiér dècrisent voutron fichiér.",
 'filename-prefix-blacklist'   => '  #<!-- lèssiéd ceta legne justo d’ense --> <pre>
 # La sintaxa est la siuventa :
 #  * Tot caractèro siuvent « # » tant qu’a la fin de la legne serat entèrprètâ coment un comentèro.
@@ -1034,17 +1015,17 @@ PICT # de totes sôrtes
 'upload_source_url'  => ' (una URL valida et accèssibla publicament)',
 'upload_source_file' => ' (un fichiér sur voutron ordenator)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Rechèrche por l’émâge apelâ :',
+# Special:ListFiles
+'listfiles_search_for'  => 'Rechèrche por l’émâge apelâ :',
 'imgfile'               => 'fichiér',
-'imagelist'             => 'Lista de les émâges',
-'imagelist_date'        => 'Dâta',
-'imagelist_name'        => 'Nom',
-'imagelist_user'        => 'Utilisator',
-'imagelist_size'        => 'Octèts',
-'imagelist_description' => 'Dèscripcion',
-
-# Image description page
+'listfiles'             => 'Lista de les émâges',
+'listfiles_date'        => 'Dâta',
+'listfiles_name'        => 'Nom',
+'listfiles_user'        => 'Utilisator',
+'listfiles_size'        => 'Octèts',
+'listfiles_description' => 'Dèscripcion',
+
+# File description page
 'filehist'                  => 'Historico du fichiér',
 'filehist-help'             => 'Clicar sur una dâta et una hora por vêre lo fichiér tâl qu’il ére a cél moment.',
 'filehist-deleteall'        => 'tot suprimar',
@@ -1088,7 +1069,6 @@ PICT # de totes sôrtes
 'filedelete-success-old'      => '<span class="plainlinks">La vèrsion de \'\'\'[[Media:$1|$1]]\'\'\' du $2 a $3 at étâ suprimâ.</span>',
 'filedelete-nofile'           => "'''$1''' ègziste pas dessus {{SITENAME}}.",
 'filedelete-nofile-old'       => "Ègziste gins de vèrsion arch·ivâ de '''$1''' avouéc los atributs endicâs.",
-'filedelete-iscurrent'        => 'Vos éte aprés tâchiér de suprimar la vèrsion la ples novèla de ceti fichiér. Vos dête, prècèdament, rètablir una vielye vèrsion de ceti.',
 'filedelete-otherreason'      => 'Rêson difèrenta ou suplèmentèra :',
 'filedelete-reason-otherlist' => 'Rêson difèrenta',
 'filedelete-reason-dropdown'  => '*Rêsons de suprèssion les ples corentes
@@ -1122,23 +1102,9 @@ PICT # de totes sôrtes
 'randomredirect-nopages' => 'Y at gins de pâge de redirèccion dens ceti èspâço de nom.',
 
 # Statistics
-'statistics'             => 'Statistiques',
-'sitestats'              => 'Statistiques de {{SITENAME}}',
-'userstats'              => 'Statistiques utilisator',
-'sitestatstext'          => "Orendrêt, la bâsa de balyês contint {{PLURAL:$1|'''1''' pâge|'''$1''' pâges}}.
-
-Ceti chifro encllut les pâges de discussion, les pâges sur {{SITENAME}}, les pâges côrtes (« començons »), les pâges de redirèccion, et pués d’ôtres pâges que sont pas considèrâs coment des articllos.
-S’on èxcllut celes pâges, réste {{PLURAL:$2|'''1''' pâge qu’est probâblament un veretâblo articllo|'''$2''' pâges que sont probâblament de veretâblos articllos}}.<p>
-
-{{PLURAL:$8|'''1''' fichiér at étâ tèlèchargiê|'''$8''' fichiérs ont étâ tèlèchargiês}}.
-
-{{PLURAL:$3|'''1''' pâge at étâ consultâ|'''$3''' pâges ont étâ consultâs}} et {{PLURAL:$4|'''1''' pâge modifiâ|'''$4''' pâges modifiâs}} dês la crèacion de {{SITENAME}}.
-
-Cen reprèsente una moyena de {{PLURAL:$5|'''1''' modificacion|'''$5''' modificacions}} per pâge et de {{PLURAL:$6|'''1''' consulta|'''$6''' consultes}} por una modificacion.</p>
-
-<p>Y at ora {{PLURAL:$7|'''1''' ovrâjo|'''$7''' ovrâjos}} dens la [http://www.mediawiki.org/wiki/Manual:Job_queue fela d’atenta des travâlys].</p>",
-'userstatstext'          => "Y at {{PLURAL:$1|'''1''' [[Special:ListUsers|utilisator enregistrâ]]|'''$1''' [[Special:ListUsers|utilisators enregistrâs]]}}. Permié cetos, '''$2''' (ou ben '''$4%''') {{PLURAL:$2|est|sont}} $5.",
-'statistics-mostpopular' => 'Pâges les ples consultâs',
+'statistics'              => 'Statistiques',
+'statistics-header-users' => 'Statistiques utilisator',
+'statistics-mostpopular'  => 'Pâges les ples consultâs',
 
 'disambiguations'      => 'Pâges d’homonimia',
 'disambiguationspage'  => 'Template:Homonimia',
@@ -1219,8 +1185,6 @@ Cen reprèsente una moyena de {{PLURAL:$5|'''1''' modificacion|'''$5''' modifica
 'speciallogtitlelabel' => 'Titro :',
 'log'                  => 'Jornals',
 'all-logs-page'        => 'Tôs los jornals',
-'log-search-legend'    => 'Chèrchiér dens los jornals',
-'log-search-submit'    => 'D’acôrd',
 'alllogstext'          => 'Afichâjo combinâ des jornals de copia, de suprèssion, de protèccion, de blocâjo et d’administrator. Vos pouede rètrendre la vua en sèlèccionent un tipo de jornal, un nom d’utilisator ou la pâge regardâ.',
 'logempty'             => 'Y at ren dens l’historico por ceta pâge.',
 'log-title-wildcard'   => 'Chèrchiér los titros comencient per lo tèxte siuvent',
@@ -1247,11 +1211,30 @@ Cen reprèsente una moyena de {{PLURAL:$5|'''1''' modificacion|'''$5''' modifica
 'special-categories-sort-count' => 'tri per compto',
 'special-categories-sort-abc'   => 'tri alfabètico',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribucions suprimâs d’un utilisator',
+
+# Special:LinkSearch
+'linksearch'       => 'Rechèrchiér des lims Malyâjo',
+'linksearch-pat'   => 'Rechèrchiér l’èxprèssion :',
+'linksearch-ns'    => 'Èspâço de nom :',
+'linksearch-ok'    => 'Rechèrchiér',
+'linksearch-text'  => 'Ceta pâge spèciâla pèrmèt de rechèrchiér les pâges dens lesquintes un lim de defôr aparêt.<br />Des caractèros « j·oquèr » pôvont étre utilisâs, per ègzemplo <code>*.wikipedia.org</code>.<br />Protocolos sotegnus : <tt>$1</tt>',
+'linksearch-line'  => '$1 avouéc un lim dês $2',
+'linksearch-error' => 'Los caractèros « j·oquèr » pôvont étre utilisâs ren qu’u comencement du nom de domêno.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Afichiér los utilisators dês :',
 'listusers-submit'   => 'Montrar',
 'listusers-noresult' => 'Nion utilisator trovâ. Controlâd asse-ben les variantes en grantes lètres / petiôtes lètres.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Historico de les crèacions de comptos',
+'newuserlogpagetext'       => 'Cen est un jornal de les crèacions de comptos utilisators.',
+'newuserlog-byemail'       => 'mot de pâssa emmandâ per mèl',
+'newuserlog-create-entry'  => 'Novél utilisator',
+'newuserlog-create2-entry' => 'compto crèâ por $1',
+
 # E-mail user
 'mailnologin'     => 'Pas d’adrèce',
 'mailnologintext' => 'Vos dête étre [[Special:UserLogin|conèctâ]]
@@ -1309,12 +1292,6 @@ Por suprimar cela pâge de voutra lista de siuvu, clicâd dessus « pas més siu
 'iteminvalidname'      => 'Problèmo avouéc l’articllo « $1 » : lo nom est envalido...',
 'wlnote'               => 'Ce-desot sè {{PLURAL:$1|trove la dèrriére modificacion|trovont les $1 dèrriéres modificacions}} dês {{PLURAL:$2|l’hora passâ|les <b>$2</b> hores passâs}}.',
 'wlshowlast'           => 'Montrar les $1 hores passâs, los $2 jorns passâs, ou ben $3 ;',
-'watchlist-show-bots'  => 'afichiér les contribucions de bots',
-'watchlist-hide-bots'  => 'mâscar les contribucions de bots',
-'watchlist-show-own'   => 'afichiér mes contribucions',
-'watchlist-hide-own'   => 'mâscar mes contribucions',
-'watchlist-show-minor' => 'afichiér les modificacions minores.',
-'watchlist-hide-minor' => 'mâscar les modificacions minores.',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Siuvu...',
@@ -1353,69 +1330,74 @@ Por modifiar los paramètres de voutra lista de siuvu, visitâd
 Retôrn et assistance :
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Suprimar una pâge',
-'confirm'                     => 'Confirmar',
-'excontent'                   => 'contegnent « $1 »',
-'excontentauthor'             => 'lo contegnu ére : « $1 » et lo solèt contributor nen ére « [[Special:Contributions/$2|$2]] ».',
-'exbeforeblank'               => 'contegnéve devant blanchiment : « $1 »',
-'exblank'                     => 'pâge voueda',
-'delete-confirm'              => 'Suprimar « $1 »',
-'delete-legend'               => 'Suprèssion',
-'historywarning'              => 'Atencion : la pâge que vos éte prèst a suprimar at un historico :',
-'confirmdeletetext'           => 'Vos éte prèst a suprimar por de bon de la bâsa de balyês una pâge ou una émâge, et pués totes ses vèrsions prècèdentes. Volyéd confirmar qu’o est franc cen que vos voléd fâre, que vos en compregnéd les consèquences et que vos féte cen en acôrd avouéc les [[{{MediaWiki:Policy-url}}|règlles de dedens]].',
-'actioncomplete'              => 'Accion fêta',
-'deletedtext'                 => '« <nowiki>$1</nowiki> » at étâ suprimâ.
+# Delete
+'deletepage'             => 'Suprimar una pâge',
+'confirm'                => 'Confirmar',
+'excontent'              => 'contegnent « $1 »',
+'excontentauthor'        => 'lo contegnu ére : « $1 » et lo solèt contributor nen ére « [[Special:Contributions/$2|$2]] ».',
+'exbeforeblank'          => 'contegnéve devant blanchiment : « $1 »',
+'exblank'                => 'pâge voueda',
+'delete-confirm'         => 'Suprimar « $1 »',
+'delete-legend'          => 'Suprèssion',
+'historywarning'         => 'Atencion : la pâge que vos éte prèst a suprimar at un historico :',
+'confirmdeletetext'      => 'Vos éte prèst a suprimar por de bon de la bâsa de balyês una pâge ou una émâge, et pués totes ses vèrsions prècèdentes. Volyéd confirmar qu’o est franc cen que vos voléd fâre, que vos en compregnéd les consèquences et que vos féte cen en acôrd avouéc les [[{{MediaWiki:Policy-url}}|règlles de dedens]].',
+'actioncomplete'         => 'Accion fêta',
+'deletedtext'            => '« <nowiki>$1</nowiki> » at étâ suprimâ.
 Vêde l’$2 por una lista de les novèles suprèssions.',
-'deletedarticle'              => 'at èfaciê « [[$1]] »',
-'dellogpage'                  => 'Historico de les suprèssions',
-'dellogpagetext'              => 'Vê-que la lista de les novèles suprèssions.
+'deletedarticle'         => 'at èfaciê « [[$1]] »',
+'dellogpage'             => 'Historico de les suprèssions',
+'dellogpagetext'         => 'Vê-que la lista de les novèles suprèssions.
 L’hora endicâ est cela du sèrvior.',
-'deletionlog'                 => 'historico des èfacements',
-'reverted'                    => 'Rètablissement de la vèrsion prècèdenta',
-'deletecomment'               => 'Rêson de la suprèssion :',
-'deleteotherreason'           => 'Rêson difèrenta ou suplèmentèra :',
-'deletereasonotherlist'       => 'Ôtra rêson',
-'deletereason-dropdown'       => '*Rêsons de suprèssion les ples corentes
+'deletionlog'            => 'historico des èfacements',
+'reverted'               => 'Rètablissement de la vèrsion prècèdenta',
+'deletecomment'          => 'Rêson de la suprèssion :',
+'deleteotherreason'      => 'Rêson difèrenta ou suplèmentèra :',
+'deletereasonotherlist'  => 'Ôtra rêson',
+'deletereason-dropdown'  => '*Rêsons de suprèssion les ples corentes
 ** Demanda de l’ôtor
 ** Violacion des drêts d’ôtor
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Modifie les rêsons de la suprèssion',
-'delete-toobig'               => 'Ceta pâge dispôse d’un historico important, dèpassent $1 vèrsions. La suprèssion de tâles pâges at étâ limitâ por èvitar des pèrturbacions emprèvues de {{SITENAME}}.',
-'delete-warning-toobig'       => 'Ceta pâge dispôse d’un historico important, dèpassent $1 vèrsions. La suprimar pôt troblar lo fonccionement de la bâsa de balyês de {{SITENAME}}. A fâre avouéc prudence.',
-'rollback'                    => 'rèvocar modificacions',
-'rollback_short'              => 'Rèvocar',
-'rollbacklink'                => 'rèvocar',
-'rollbackfailed'              => 'La rèvocacion at pas reussia',
-'cantrollback'                => 'Empossiblo de rèvocar : l’ôtor est la solèta pèrsona a avêr fêt des modificacions sur ceta pâge.',
-'alreadyrolled'               => 'Empossiblo de rèvocar la dèrriére modificacion de l’articllo « [[$1]] » fêta per [[User:$2|$2]] ([[User talk:$2|Discussion]]) ; quârqu’un d’ôtro at ja modifiâ ou rèvocâ l’articllo.
+'delete-edit-reasonlist' => 'Modifie les rêsons de la suprèssion',
+'delete-toobig'          => 'Ceta pâge dispôse d’un historico important, dèpassent $1 vèrsions. La suprèssion de tâles pâges at étâ limitâ por èvitar des pèrturbacions emprèvues de {{SITENAME}}.',
+'delete-warning-toobig'  => 'Ceta pâge dispôse d’un historico important, dèpassent $1 vèrsions. La suprimar pôt troblar lo fonccionement de la bâsa de balyês de {{SITENAME}}. A fâre avouéc prudence.',
+
+# Rollback
+'rollback'         => 'rèvocar modificacions',
+'rollback_short'   => 'Rèvocar',
+'rollbacklink'     => 'rèvocar',
+'rollbackfailed'   => 'La rèvocacion at pas reussia',
+'cantrollback'     => 'Empossiblo de rèvocar : l’ôtor est la solèta pèrsona a avêr fêt des modificacions sur ceta pâge.',
+'alreadyrolled'    => 'Empossiblo de rèvocar la dèrriére modificacion de l’articllo « [[$1]] » fêta per [[User:$2|$2]] ([[User talk:$2|Discussion]]) ; quârqu’un d’ôtro at ja modifiâ ou rèvocâ l’articllo.
 
 La dèrriére modificacion at étâ fêta per [[User:$3|$3]] ([[User talk:$3|Discussion]]).',
-'editcomment'                 => 'Lo rèsumâ de la modificacion ére : <i>« $1 »</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Rèvocacion de les modificacions de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) (retôrn a la vèrsion prècèdenta de [[User:$1|$1]])', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Rèvocacion de les modificacions de $1 ; retôrn a la vèrsion de $2.',
-'sessionfailure'              => 'Voutra sèssion de conèccion semble avêr des problèmos ;
+'editcomment'      => "Lo rèsumâ de la modificacion ére : ''« $1 »''.", # only shown if there is an edit comment
+'revertpage'       => 'Rèvocacion de les modificacions de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) (retôrn a la vèrsion prècèdenta de [[User:$1|$1]])', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Rèvocacion de les modificacions de $1 ; retôrn a la vèrsion de $2.',
+'sessionfailure'   => 'Voutra sèssion de conèccion semble avêr des problèmos ;
 cela accion at étâ anulâ en prèvencion d’un piratâjo de sèssion.
 Clicâd dessus « Prècèdent » et rechargiéd la pâge de yô que vos vegnéd, et pués tornâd èprovar.',
+
+# Protect
 'protectlogpage'              => 'Historico de les protèccions',
 'protectlogtext'              => 'Vêde les [[Special:ProtectedPages|dirèctives]] por més d’enformacion.',
 'protectedarticle'            => 'at protègiê « [[$1]] »',
 'modifiedarticleprotection'   => 'at modifiâ lo nivô de protèccion de « [[$1]] »',
 'unprotectedarticle'          => 'at dèprotègiê « [[$1]] »',
 'protect-title'               => 'Protègiér « $1 »',
+'prot_1movedto2'              => 'at renomâ [[$1]] en [[$2]]',
 'protect-legend'              => 'Confirmar la protèccion',
 'protectcomment'              => 'Rêson de la protèccion :',
 'protectexpiry'               => 'Èxpiracion (èxpire pas per dèfôt) :',
 'protect_expiry_invalid'      => 'Lo temps d’èxpiracion est envalido.',
 'protect_expiry_old'          => 'Lo temps d’èxpiracion est ja passâ.',
 'protect-unchain'             => 'Dèblocar les pèrmissions de renomâjo',
-'protect-text'                => 'Vos pouede consultar et modifiar lo nivô de protèccion de la pâge <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Vos pouede pas modifiar lo nivô de protèccion tant que vos éte blocâ.
-Vê-que los règllâjos d’ora de la pâge <strong>$1</strong> :',
-'protect-locked-dblock'       => 'Lo nivô de protèccion pôt pas étre modifiâ perce que la bâsa de balyês est blocâ.
-Vê-que los règllâjos d’ora de la pâge <strong>$1</strong> :',
-'protect-locked-access'       => 'Vos avéd pas los drêts nècèssèros por modifiar la protèccion de la pâge.
-Vê-que los règllâjos d’ora de la pâge <strong>$1</strong> :',
+'protect-text'                => "Vos pouede consultar et modifiar lo nivô de protèccion de la pâge '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Vos pouede pas modifiar lo nivô de protèccion tant que vos éte blocâ.
+Vê-que los règllâjos d’ora de la pâge '''$1''' :",
+'protect-locked-dblock'       => "Lo nivô de protèccion pôt pas étre modifiâ perce que la bâsa de balyês est blocâ.
+Vê-que los règllâjos d’ora de la pâge '''$1''' :",
+'protect-locked-access'       => "Vos avéd pas los drêts nècèssèros por modifiar la protèccion de la pâge.
+Vê-que los règllâjos d’ora de la pâge '''$1''' :",
 'protect-cascadeon'           => 'Ora, ceta pâge est protègiê perce qu’el est encllua dens {{PLURAL:$1|la pâge siuventa|les pâges siuventes}}, èyent étâ protègiê avouéc lo chouèx « Protèccion en cascâda » activâ. Vos pouede changiér lo nivô de protèccion de ceta pâge sen que cen afècte la protèccion en cascâda.',
 'protect-default'             => 'Pas de protèccion',
 'protect-fallback'            => 'At fôta de la pèrmission « $1 »',
@@ -1425,6 +1407,7 @@ Vê-que los règllâjos d’ora de la pâge <strong>$1</strong> :',
 'protect-expiring'            => 'èxpire lo $1 (UTC)',
 'protect-cascade'             => 'Protèccion en cascâda - Protège totes les pâges encllues dens ceta.',
 'protect-cantedit'            => 'Vos pouede pas modifiar los nivôs de protèccion de cela pâge perce que vos avéd pas la pèrmission de l’èditar.',
+'protect-expiry-options'      => '2 hores:2 hours,1 jorn:1 day,3 jorns:3 days,1 semana:1 week,2 semanes:2 weeks,1 mês:1 month,3 mês:3 months,6 mês:6 months,1 an:1 year,sen fin:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pèrmission :',
 'restriction-level'           => 'Nivô de rèstriccion :',
 'minimum-size'                => 'Talye la ples petiôta',
@@ -1510,7 +1493,6 @@ $1',
 'whatlinkshere'       => 'Pâges liyês',
 'whatlinkshere-title' => 'Pâges liyês a $1',
 'whatlinkshere-page'  => 'Pâge :',
-'linklistsub'         => '(Lista de lims)',
 'linkshere'           => 'Les pâges ce-desot contegnont un lim vers <b>[[:$1]]</b> :',
 'nolinkshere'         => 'Niona pâge contint de lim vers <b>[[:$1]]</b>.',
 'nolinkshere-ns'      => "Niona pâge contint de lim vers '''[[:$1]]''' dens l’èspâço de nom chouèsi/cièrdu.",
@@ -1649,6 +1631,8 @@ volyéd vos assurar que vos en compregnéd bien les consèquences devant que pro
 
 Dens cél câs, vos devréd renomar ou fusionar la pâge manuèlament se vos lo dèsirâd.',
 'movearticle'             => 'Renomar l’articllo :',
+'movenologin'             => 'Pas conèctâ',
+'movenologintext'         => 'Por povêr renomar una pâge, vos dête étre [[Special:UserLogin|conèctâ]] a titro d’utilisator enregistrâ et voutron compto dêt avêr una ancianatât sufisenta.',
 'movenotallowed'          => 'Vos avéd pas la pèrmission de renomar des pâges.',
 'newtitle'                => 'Novél titro :',
 'move-watch'              => 'Siuvre ceta pâge',
@@ -1674,7 +1658,6 @@ L’articllo de dèstinacion « [[:$1]] » ègziste ja. Voléd-vos lo suprimar p
 'delete_and_move_confirm' => 'Ouè, j/y’accèpto de suprimar la pâge de dèstinacion por pèrmetre lo renomâjo.',
 'delete_and_move_reason'  => 'Pâge suprimâ por pèrmetre un renomâjo',
 'selfmove'                => 'Los titros d’origina et de dèstinacion sont los mémos : empossiblo de renomar una pâge sur lyé-méma.',
-'immobile_namespace'      => 'Lo titro de dèstinacion est d’un tipo spèciâl ; o est empossiblo de renomar des pâges vers cél èspâço de nom.',
 
 # Export
 'export'            => 'Èxportar des pâges',
@@ -1682,7 +1665,7 @@ L’articllo de dèstinacion « [[:$1]] » ègziste ja. Voléd-vos lo suprimar p
 
 Por èxportar des pâges, entrâd lors titros dens la bouèta de tèxte ce-desot, yon titro per legne, et pués sèlèccionâd, se vos dèsirâd ou pas, la vèrsion d’ora avouéc totes les vielyes vèrsions, avouéc la pâge d’historico, ou simplament la pâge d’ora avouéc des enformacions sur la dèrriére modificacion.
 
-Dens cél dèrriér câs, vos pouede asse-ben utilisar un lim, coment [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] por la pâge "[[{{MediaWiki:Mainpage}}]]".',
+Dens cél dèrriér câs, vos pouede asse-ben utilisar un lim, coment [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] por la pâge "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Èxportar ren que la vèrsion corenta sen l’historico complèt',
 'exportnohistory'   => "----
 '''Nota :''' l’èxportacion complèta de l’historico de les pâges avouéc ceti formulèro at étâ dèsactivâ por des rêsons de pèrformences.",
@@ -1698,7 +1681,7 @@ Dens cél dèrriér câs, vos pouede asse-ben utilisar un lim, coment [[{{ns:spe
 'allmessagesdefault'        => 'Mèssâjo per dèfôt',
 'allmessagescurrent'        => 'Mèssâjo d’ora',
 'allmessagestext'           => 'Cen est la lista de tôs los mèssâjos sistèmo disponiblos dens l’èspâço MediaWiki.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' est pas disponiblo perce que '''\$wgUseDatabaseMessages''' est dèsactivâ.",
 'allmessagesfilter'         => 'Filtro d’èxprèssion racionèla :',
 'allmessagesmodified'       => 'Afichiér ren que les modificacions',
@@ -1721,6 +1704,7 @@ Totes les accions d’importacion entèrvouiqui sont consèrvâs dens lo [[Speci
 'import-interwiki-history'   => 'Copiyér totes les vèrsions de l’historico de ceta pâge',
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Transferar les pâges dens l’èspâço de nom :',
+'import-comment'             => 'Comentèro :',
 'importtext'                 => 'Volyéd èxportar lo fichiér dês lo vouiqui d’origina en utilisent l’outil [[Special:Export]], lo sôvar sur voutron disco dur et pués lo copiyér ique.',
 'importstart'                => 'Impôrt de les pâges...',
 'import-revision-count'      => '$1 {{PLURAL:$1|vèrsion|vèrsions}}',
@@ -1850,6 +1834,13 @@ Totes les accions d’importacion entèrvouiqui sont consèrvâs dens lo [[Speci
 'numauthors'     => 'Nombro d’ôtors difèrents : $1',
 'numtalkauthors' => 'Nombro d’ôtors difèrents (pâge de discussion) : $1',
 
+# Skin names
+'skinname-standard'    => 'Estandârd',
+'skinname-nostalgia'   => 'Encrêt',
+'skinname-cologneblue' => 'Cologne Blu',
+'skinname-chick'       => 'Pugin',
+'skinname-simple'      => 'Simplo',
+
 # Math options
 'mw_math_png'    => 'Tojorn fâre una émâge PNG',
 'mw_math_simple' => 'HTML se prod simplo, ôtrament PNG',
@@ -1901,7 +1892,7 @@ Totes les accions d’importacion entèrvouiqui sont consèrvâs dens lo [[Speci
 'show-big-image'       => 'Émâge en rèsolucion ples hôta',
 'show-big-image-thumb' => '<small>Talye de ceta vua : $1 × $2 pixèles</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerie des novéls fichiérs',
 'imagelisttext'         => "Vê-que una lista de '''$1''' {{PLURAL:$1|fichiér cllassiê|fichiérs cllassiês}} $2.",
 'showhidebots'          => '($1 bots)',
@@ -2245,21 +2236,9 @@ $1
 Volyéd confirmar que vos dèsirâd recrèar ceti articllo.",
 'recreate'            => 'Recrèar',
 
-# HTML dump
-'redirectingto' => 'Redirèccion vers [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Voléd-vos rafrèchir ceta pâge (purgiér lo cache) ?
-
-$1',
 'confirm_purge_button' => 'Confirmar',
-
-# AJAX search
-'searchcontaining' => 'Chèrchiér los articllos contegnent « $1 ».',
-'searchnamed'      => 'Chèrchiér los articllos apelâs « $1 ».',
-'articletitles'    => 'Articllos comencient per « $1 »',
-'hideresults'      => 'Cachiér los rèsultats',
-'useajaxsearch'    => 'Utilisar la rechèrche AJAX',
+'confirm-purge-top'    => 'Voléd-vos rafrèchir ceta pâge (purgiér lo cache) ?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pâge prècèdenta',
@@ -2397,7 +2376,7 @@ $1',
 'filepath-submit'  => 'Chemin d’accès',
 'filepath-summary' => 'Ceta pâge afiche lo chemin d’accès complèt d’un fichiér ; les émâges sont montrâs en rèsolucion hôta, los fichiérs ôdiô et vidèô s’ègzécutont avouéc lor programe associyê.
 
-Entrâd lo nom du fichiér sen lo prèfixe « {{ns:image}}: ».',
+Entrâd lo nom du fichiér sen lo prèfixe « {{ns:file}}: ».',
 
 # Special:SpecialPages
 'specialpages' => 'Pâges spèciâles',
diff --git a/languages/messages/MessagesFur.php b/languages/messages/MessagesFur.php
index 9f8ccf5b..d90c9470 100644
--- a/languages/messages/MessagesFur.php
+++ b/languages/messages/MessagesFur.php
@@ -6,17 +6,13 @@
  *
  * @author Helix84
  * @author Klenje
+ * @author MF-Warburg
  * @author Urhixidur
  * @author לערי ריינה�רט
  */
 
 $fallback = 'it';
 
-$skinNames = array(
-	'standard'    => 'Classiche',
-	'nostalgia'   => 'Nostalgjie',
-	'modern'      => 'Moderne',
-);
 
 $namespaceNames = array(
 	NS_MEDIA          => 'Media',
@@ -27,8 +23,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Discussion_utent',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Figure',
-	NS_IMAGE_TALK     => 'Discussion_figure',
+	NS_FILE           => 'Figure',
+	NS_FILE_TALK      => 'Discussion_figure',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
 	NS_TEMPLATE       => 'Model',
@@ -50,7 +46,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'TignudisDiVoli' ),
 	'Recentchanges'             => array( 'UltinsCambiaments' ),
 	'Upload'                    => array( 'Cjame' ),
-	'Imagelist'                 => array( 'Figuris' ),
+	'Listfiles'                 => array( 'Figuris' ),
 	'Newimages'                 => array( 'GnovisFiguris' ),
 	'Listusers'                 => array( 'Utents', 'ListeUtents' ),
 	'Statistics'                => array( 'Statistichis' ),
@@ -83,7 +79,6 @@ $specialPageAliases = array(
 	'Booksources'               => array( 'RicercjeISBN' ),
 	'Categories'                => array( 'Categoriis' ),
 	'Export'                    => array( 'Espuarte' ),
-	'Version'                   => array( 'Version' ),
 	'Allmessages'               => array( 'Messaçs' ),
 	'Log'                       => array( 'Regjistri', 'Regjistris' ),
 	'Blockip'                   => array( 'BlocheIP' ),
@@ -155,8 +150,6 @@ $messages = array(
 'underline-never'   => 'Mai',
 'underline-default' => 'Predeterminât dal sgarfadôr',
 
-'skinpreview' => '(Anteprime)',
-
 # Dates
 'sunday'        => 'Domenie',
 'monday'        => 'Lunis',
@@ -243,7 +236,7 @@ $messages = array(
 'mytalk'         => 'Mês discussions',
 'anontalk'       => 'Discussion par chest IP',
 'navigation'     => 'somari',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 'errorpagetitle'    => 'Erôr',
 'returnto'          => 'Torne a $1.',
@@ -268,6 +261,7 @@ $messages = array(
 'deletethispage'    => 'Elimine cheste pagjine',
 'undelete_short'    => 'Recupere {{PLURAL:$1|modifiche eliminade|$1 modifichis eliminadis}}',
 'protect'           => 'Protêç',
+'protect_change'    => 'cambie',
 'protectthispage'   => 'Protêç cheste pagjine',
 'unprotect'         => 'No stâ protezi',
 'unprotectthispage' => 'No stâ plui protezi cheste pagjine',
@@ -285,6 +279,8 @@ $messages = array(
 'projectpage'       => 'Cjale pagjine dal progjet',
 'imagepage'         => 'Cjale pagjine de figure',
 'mediawikipage'     => 'Cjale la pagjine dal messaç',
+'templatepage'      => 'Cjale il model',
+'viewhelppage'      => 'Cjale la pagjine di jutori',
 'categorypage'      => 'Cjale la categorie',
 'viewtalkpage'      => 'Cjale la pagjine di discussion',
 'otherlanguages'    => 'Altris lenghis',
@@ -300,8 +296,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Informazions su {{SITENAME}}',
 'aboutpage'            => 'Project:Informazions',
-'bugreports'           => 'Segnalazions di malfunzionaments',
-'bugreportspage'       => 'Project:Malfunzionaments',
 'copyright'            => 'Il contignût al è disponibil sot de $1',
 'copyrightpage'        => '{{ns:project}}:Copyrights',
 'currentevents'        => 'Lis gnovis',
@@ -318,6 +312,8 @@ $messages = array(
 'privacy'              => 'Politiche pe privacy',
 'privacypage'          => 'Project:Politiche_pe_privacy',
 
+'badaccess' => 'Permès no suficients',
+
 'versionrequired' => 'E covente la version $1 di MediaWiki',
 
 'ok'                      => 'Va ben',
@@ -328,6 +324,9 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Tu âs gnûfs messaçs su $1',
 'editsection'             => 'cambie',
 'editold'                 => 'cambie',
+'viewsourceold'           => 'cjale risultive',
+'editlink'                => 'cambie',
+'viewsourcelink'          => 'cjale risultive',
 'editsectionhint'         => 'cambie la sezion $1',
 'toc'                     => 'Tabele dai contignûts',
 'showtoc'                 => 'mostre',
@@ -340,13 +339,13 @@ $messages = array(
 'site-atom-feed'          => 'Canâl Atom di $1',
 'page-rss-feed'           => 'Canâl RSS par "$1"',
 'page-atom-feed'          => 'Canâl Atom par "$1"',
-'red-link-title'          => '$1 (ancjemò di scrivi)',
+'red-link-title'          => '$1 (la pagjine no esist)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Vôs',
 'nstab-user'      => 'Pagjine dal utent',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Speciâl',
+'nstab-special'   => 'Pagjine speciâl',
 'nstab-project'   => 'Informazions',
 'nstab-image'     => 'Figure',
 'nstab-mediawiki' => 'Messaç',
@@ -360,25 +359,26 @@ $messages = array(
 Une liste des pagjinis speciâls validis a si pues cjatâ su [[Special:SpecialPages|{{int:specialpages}}]].",
 
 # General errors
-'error'           => 'Erôr',
-'databaseerror'   => 'Erôr de base di dâts',
-'noconnect'       => 'Nus displâs, ma il sît al à al moment cualchi dificoltât tecniche e nol pues conetisi al servidôr de base di dâts. <br />$1',
-'nodb'            => 'No si pues selezionâ la base di dâts $1',
-'laggedslavemode' => 'Atenzion: La pagjine podarès no segnalâ inzornaments recents.',
-'readonlytext'    => "La base di dâts pal moment e je blocade e no si puedin zontâ vôs e fâ modifichis, probabilmentri pe normâl manutenzion de base di dâts, daspò de cuâl dut al tornarà normâl.
+'error'              => 'Erôr',
+'databaseerror'      => 'Erôr de base di dâts',
+'noconnect'          => 'Nus displâs, ma il sît al à al moment cualchi dificoltât tecniche e nol pues conetisi al servidôr de base di dâts. <br />$1',
+'nodb'               => 'No si pues selezionâ la base di dâts $1',
+'laggedslavemode'    => 'Atenzion: La pagjine podarès no segnalâ inzornaments recents.',
+'readonlytext'       => "La base di dâts pal moment e je blocade e no si puedin zontâ vôs e fâ modifichis, probabilmentri pe normâl manutenzion de base di dâts, daspò de cuâl dut al tornarà normâl.
 
 L'aministradôr ch'al à metût il bloc al à scrit cheste motivazion: $1",
-'filenotfound'    => 'No si pues cjatâ il file "$1".',
-'badtitle'        => 'Titul sbaliât',
-'badtitletext'    => 'Il titul de pagjine che tu âs inserît nol è valit, al è vuelit, o al veve un erôr tal colegament tra wiki diviersis o tra versions in altris lenghis.
+'missingarticle-rev' => '(numar de revision: $1)',
+'filenotfound'       => 'No si pues cjatâ il file "$1".',
+'badtitle'           => 'Titul sbaliât',
+'badtitletext'       => 'Il titul de pagjine che tu âs inserît nol è valit, al è vuelit, o al veve un erôr tal colegament tra wiki diviersis o tra versions in altris lenghis.
 Al podarès vê dentri caratars che no podin jessi doprâts tai titui.',
-'viewsource'      => 'Cjale risultive',
-'viewsourcefor'   => 'di $1',
-'viewsourcetext'  => 'Tu puedis viodi e copiâ la risultive di cheste pagjine:',
+'viewsource'         => 'Cjale risultive',
+'viewsourcefor'      => 'di $1',
+'viewsourcetext'     => 'Tu puedis viodi e copiâ la risultive di cheste pagjine:',
 
 # Login and logout pages
 'logouttitle'               => 'Jessude dal utent',
-'logouttext'                => '<strong>Tu sâs cumò lât fûr.</strong><br />Tu puedis continuâ a doprâ {{SITENAME}} come anonim, o tu puedis jentrâ cul stes o cuntun altri non utent. Note che cualchi pagjine e pues mostrâti ancjemò come jentrât tal sît fin cuant che no tu netis la cache dal sgarfadôr.',
+'logouttext'                => "'''Tu sâs cumò lât fûr.'''<br />Tu puedis continuâ a doprâ {{SITENAME}} come anonim, o tu puedis jentrâ cul stes o cuntun altri non utent. Note che cualchi pagjine e pues mostrâti ancjemò come jentrât tal sît fin cuant che no tu netis la cache dal sgarfadôr.",
 'welcomecreation'           => '== Mandi e benvignût $1! ==
 
 La tô identitât e je stade creade. No stâ dismenteâti di gambiâ lis preferencis di {{SITENAME}}.',
@@ -388,7 +388,6 @@ La tô identitât e je stade creade. No stâ dismenteâti di gambiâ lis prefere
 'yourpasswordagain'         => 'Torne a scrivile',
 'remembermypassword'        => 'Visiti di me',
 'yourdomainname'            => 'Il to domini',
-'loginproblem'              => '<b>Al è stât un erôr te jentrade.</b><br />Torne a provâ!',
 'login'                     => 'Jentre',
 'nav-login-createaccount'   => 'Regjistriti o jentre',
 'loginprompt'               => 'Tu âs di vê abilitâts i cookies par jentrâ in {{SITENAME}}.',
@@ -442,9 +441,9 @@ Se no tu âs domandât tu chest o se tu âs cjatât la peraule clâf e no tu vue
 Par plasê torne a fâ la jentrade pene che tu la âs ricevude.',
 'eauthentsent'              => 'Un messaç di pueste eletroniche di conferme al è stât mandât ae direzion specificade.
 Prime di ricevi cualsisei altri messaç di pueste, tu scugnis seguî lis istruzions scritis dal messaç, par confermâ che la identitât e je propi la tô.',
-'emailauthenticated'        => 'La tô direzion email e je stade autenticade su $1.',
+'emailauthenticated'        => 'La tô direzion email e je stade autenticade ai $2 aes $3.',
 'emailnotauthenticated'     => 'La tô direzion email no je ancjemò autenticade. No vignaran mandâts messaçs pes funzions ca sot.',
-'noemailprefs'              => '<strong>Specifiche une direzion email par fâ lâ cheste funzion.</strong>',
+'noemailprefs'              => 'Specifiche une direzion email par fâ lâ cheste funzion.',
 'emailconfirmlink'          => 'Conferme la tô direzion email',
 'invalidemailaddress'       => 'La direzion email no pues jessi acetade parcè che no samee intun formât valit. Inserìs par plasê une direzion ben formatade o disvuede chest cjamp.',
 'accountcreated'            => 'Identitât creade',
@@ -452,6 +451,11 @@ Prime di ricevi cualsisei altri messaç di pueste, tu scugnis seguî lis istruzi
 'createaccount-title'       => 'Creazion di une identitât par {{SITENAME}}',
 'loginlanguagelabel'        => 'Lenghe: $1',
 
+# Password reset dialog
+'oldpassword' => 'Vecje peraule clâf',
+'newpassword' => 'Gnove peraule clâf',
+'retypenew'   => 'Torne a scrivi chê gnove',
+
 # Edit page toolbar
 'bold_sample'     => 'Test in gruessut',
 'bold_tip'        => 'Test in gruessut',
@@ -469,27 +473,27 @@ Prime di ricevi cualsisei altri messaç di pueste, tu scugnis seguî lis istruzi
 'nowiki_tip'      => 'Ignore la formatazion wiki',
 'image_sample'    => 'Esempli.jpg',
 'image_tip'       => 'Figure includude',
-'media_sample'    => 'Esempli.mp3',
+'media_sample'    => 'Esempli.ogg',
 'media_tip'       => 'Leam a un file multimediâl',
 'sig_tip'         => 'La tô firme cun ore e date',
 'hr_tip'          => 'Rie orizontâl (no stâ doprâle masse spes)',
 
 # Edit pages
-'summary'                   => 'Somari',
-'subject'                   => 'Argoment (intestazion)',
-'minoredit'                 => 'Cheste al è un piçul cambiament',
-'watchthis'                 => 'Ten di voli cheste pagjine',
-'savearticle'               => 'Salve la pagjine',
-'preview'                   => 'Anteprime',
-'showpreview'               => 'Mostre anteprime',
-'showlivepreview'           => "Anteprime ''live''",
-'showdiff'                  => 'Mostre cambiaments',
-'anoneditwarning'           => 'No tu sês jentrât cuntun non utent. La to direzion IP e vignarà regjistrade tal storic di cheste pagjine.',
-'missingcommenttext'        => 'Inserìs un coment ca sot.',
-'summary-preview'           => 'Anteprime dal somari',
-'subject-preview'           => 'Anteprime ogjet/intestazion',
-'blockedtitle'              => 'Utent blocât',
-'blockedtext'               => "<big>'''Chest non utent o direzion IP a son stâts blocâts.'''</big>
+'summary'                          => 'Somari:',
+'subject'                          => 'Argoment (intestazion):',
+'minoredit'                        => 'Cheste al è un piçul cambiament',
+'watchthis'                        => 'Ten di voli cheste pagjine',
+'savearticle'                      => 'Salve la pagjine',
+'preview'                          => 'Anteprime',
+'showpreview'                      => 'Mostre anteprime',
+'showlivepreview'                  => "Anteprime ''live''",
+'showdiff'                         => 'Mostre cambiaments',
+'anoneditwarning'                  => 'No tu sês jentrât cuntun non utent. La to direzion IP e vignarà regjistrade tal storic di cheste pagjine.',
+'missingcommenttext'               => 'Inserìs un coment ca sot.',
+'summary-preview'                  => 'Anteprime dal somari:',
+'subject-preview'                  => 'Anteprime ogjet/intestazion:',
+'blockedtitle'                     => 'Utent blocât',
+'blockedtext'                      => "<big>'''Chest non utent o direzion IP a son stâts blocâts.'''</big>
 
 Il bloc al è stât metût di $1. La reson furnide e je: ''$2''
 
@@ -502,70 +506,89 @@ Se tu vuelis tu puedis contatâ $1 o un altri [[{{MediaWiki:Grouppage-sysop}}|am
 Visiti che no tu puedis doprâ la funzion 'Messaç di pueste a chest utent' se no tu âs specificât une direzion di pueste eletroniche valide tes [[Special:Preferences|preferencis]] e se no tu sês stât blocât al ûs di cheste funzion.
 
 Par plasê inclût la to direzion IP atuâl ($3) o il numar dal bloc (ID #$5) in ogni richieste di sclariments.",
-'blockedoriginalsource'     => "Ca sot tu puedis viodi la risultive de pagjine '''$1''':",
-'whitelistedittext'         => 'Tu scugnis $1 par cambiâ lis pagjinis.',
-'confirmedittitle'          => 'E covente la conferme de direzion di pueste eletroniche pe modifiche de pagjine',
-'loginreqtitle'             => 'Si scugne jentrâ',
-'loginreqlink'              => 'jentrâ',
-'loginreqpagetext'          => 'Tu scugnis $1 par viodi lis altris pagjinis.',
-'accmailtitle'              => 'Password mandade.',
-'accmailtext'               => 'La password par "$1" e je stade mandade a $2.',
-'newarticle'                => '(Gnûf)',
-'newarticletext'            => "Tu âs seguît un leam a une pagjine che no esist ancjemò. Par creâ une pagjine, scomence a scrivi tal spazi ca sot (cjale il [[{{MediaWiki:Helppage}}|jutori]] par altris informazions). Se tu sês ca par erôr, frache semplicementri il boton '''Indaûr''' dal to sgarfadôr.",
-'noarticletext'             => 'Par cumò nol è nuie in cheste pagjine, tu puedis [[Special:Search/{{PAGENAME}}|cirî chest titul]] in altris pagjinis o [{{fullurl:{{FULLPAGENAME}}|action=edit}} cambiâ cheste pagjine].',
-'userpage-userdoesnotexist' => 'La identitât "$1" no je di un utent regjistrât. Controle che tu vuelis pardabon creâ o modificâ cheste pagjine.',
-'updated'                   => '(Inzornât)',
-'previewnote'               => '<strong>Visiti che cheste e je dome une anteprime, e no je stade ancjemò salvade!</strong>',
-'editing'                   => 'Cambiament di $1',
-'editingsection'            => 'Cambiament di $1 (sezion)',
-'editingcomment'            => 'Cambiament di $1 (coment)',
-'editconflict'              => 'Conflit inte modifiche: $1',
-'explainconflict'           => 'Cualchidun altri al à cambiât cheste pagjine di cuant che tu âs començât a modificâle.
+'blockedoriginalsource'            => "Ca sot tu puedis viodi la risultive de pagjine '''$1''':",
+'whitelistedittext'                => 'Tu scugnis $1 par cambiâ lis pagjinis.',
+'confirmedittitle'                 => 'E covente la conferme de direzion di pueste eletroniche pe modifiche de pagjine',
+'confirmedittext'                  => 'Prime di cambiâ lis pagjinis tu scugnis confermâ la to direzion di pueste eletroniche. Par impuestâ e confermâ la direzion, dopre lis [[Special:Preferences|preferencis]].',
+'loginreqtitle'                    => 'Si scugne jentrâ',
+'loginreqlink'                     => 'jentrâ',
+'loginreqpagetext'                 => 'Tu scugnis $1 par viodi lis altris pagjinis.',
+'accmailtitle'                     => 'Password mandade.',
+'accmailtext'                      => 'La password par "$1" e je stade mandade a $2.',
+'newarticle'                       => '(Gnûf)',
+'newarticletext'                   => "Tu âs seguît un leam a une pagjine che no esist ancjemò. Par creâ une pagjine, scomence a scrivi tal spazi ca sot (cjale il [[{{MediaWiki:Helppage}}|jutori]] par altris informazions). Se tu sês ca par erôr, frache semplicementri il boton '''Indaûr''' dal to sgarfadôr.",
+'anontalkpagetext'                 => "----''Cheste e je la pagjine di discussion di un utent anonim, che nol à ancjemò creât une identitât, o che no la vûl doprâ. Par identificâlu/e a doprin alore la so direzion IP. Lis direzions IP a podin però jessi condividudis di plui utents. Se tu sês un utent anonim e tu crodis che ti vedin fat coments che no si riferissin a ti, par plasê [[Special:UserLogin|cree une gnove identitâ o jentre]] cun chê che tu âs za cussì tu evitarâs in futûr di jessi confondût un altris utents anonims.''",
+'noarticletext'                    => 'Par cumò nol è nuie in cheste pagjine.
+Tu puedis [[Special:Search/{{PAGENAME}}|cirî chest titul]] in altris pagjinis o <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} cirî i regjistris leâts],
+o ben [{{fullurl:{{FULLPAGENAME}}|action=edit}} cambiâ cheste pagjine]</span>.',
+'userpage-userdoesnotexist'        => 'La identitât "$1" no je di un utent regjistrât. Controle che tu vuelis pardabon creâ o modificâ cheste pagjine.',
+'clearyourcache'                   => "'''Ocjo: dopo vê salvât, tu podaressis scugnî netâ la cache dal to sgarfadôr par viodi i cambiaments.''' Par '''Mozilla / Firefox / Safari''': frache ''Torne a cjamâ'' tignint jù ancje il tast des maiusculis, o se no frache ''Ctrl-F5'' o ''Ctrl-R'' (''Command-R'' su Mac); par '''Konqueror''': frache ''Reload'' o il tast ''F5''; par '''Opera''' al pues jessi necessari disvuedâ dal dut la cache doprant il menù ''Tools → Preferencis''; par '''Internet Explorer:''' ten fracât il tast ''Ctrl'' cuant che tu cjalcjis su ''Aggiorna'' o frache ''Ctrl-F5''.",
+'updated'                          => '(Inzornât)',
+'previewnote'                      => "'''Visiti che cheste e je dome une anteprime, e no je stade ancjemò salvade!'''",
+'editing'                          => 'Cambiament di $1',
+'editingsection'                   => 'Cambiament di $1 (sezion)',
+'editingcomment'                   => 'Cambiament di $1 (coment)',
+'editconflict'                     => 'Conflit inte modifiche: $1',
+'explainconflict'                  => 'Cualchidun altri al à cambiât cheste pagjine di cuant che tu âs començât a modificâle.
 La aree di test disore e conten il test de pagjine che esist cumò, i tiei cambiaments a son mostrâts inte aree disot.
 Tu varâs di inserî di gnûf i tiei cambiaments tal test esistint.
 <b>Dome</b> il test in alt al vignarà salvât cuant che tu frachis su "Salve pagjine".<br />',
-'editingold'                => '<strong>ATENZION: tu stâs cambiant une version vecje e no inzornade di cheste pagjine. Se tu la salvis, ducj i cambiaments fats di chê volte in ca a laran pierdûts.</strong>',
-'yourdiff'                  => 'Difarencis',
-'copyrightwarning'          => 'Note: ducj i contribûts a {{SITENAME}} a si considerin come dâts fûr sot de licence $2 (cjale $1 pai detais). Se no tu vuelis che i tiei tescj a podedin jessi modificâts e tornâts a dâ fûr di ognidun cence limits, no stâ mandâju a {{SITENAME}}.<br />
+'editingold'                       => "'''ATENZION: tu stâs cambiant une version vecje e no inzornade di cheste pagjine. Se tu la salvis, ducj i cambiaments fats di chê volte in ca a laran pierdûts.'''",
+'yourdiff'                         => 'Difarencis',
+'copyrightwarning'                 => "Note: ducj i contribûts a {{SITENAME}} a si considerin come dâts fûr sot de licence $2 (cjale $1 pai detais). Se no tu vuelis che i tiei tescj a podedin jessi modificâts e tornâts a dâ fûr di ognidun cence limits, no stâ mandâju a {{SITENAME}}.<br />
 Cun di plui, inviant il test tu declaris che tu âs scrit tu chest o tu lu âs copiât di une sorzint tal domini public o di une sorzint libare.
-<strong>NO STÂ MANDÂ MATERIÂL CUVIERT DAL DIRIT DI AUTÔR CENCE AUTORIZAZION!</strong>',
-'longpagewarning'           => '<strong>ATENZION: cheste pagjine e je grande $1 kilobytes; cualchi sgarfadôr al podarès vê problemis a modificâ pagjinis di 32 kb o plui grandis. Considere par plasê la pussibilitât di dividi la pagjine in sezions plui piçulis.</strong>',
-'templatesused'             => 'Modei doprâts par cheste pagjine:',
-'templatesusedpreview'      => 'Modei doprâts in cheste anteprime:',
-'templatesusedsection'      => 'Modei doprâts in cheste sezion:',
-'template-protected'        => '(protezût)',
-'template-semiprotected'    => '(semi-protezût)',
-'nocreatetext'              => '{{SITENAME}} al à limitât la pussibilitât di creâ gnovis pagjinis ai utents regjistrâts. Tu puedis tornâ indaûr e cambiâ une pagjine che e esist o se no [[Special:UserLogin|jentrâ o creâ une gnove identitât]].',
-'nocreate-loggedin'         => 'No tu âs i permès che a coventin par creâ gnovis pagjinis su {{SITENAME}}.',
-'recreate-deleted-warn'     => "'''Atenzion: tu stâs par tornâ a creâ une pagjine che e je stade eliminade timp fa.'''
+'''NO STÂ MANDÂ MATERIÂL CUVIERT DAL DIRIT DI AUTÔR CENCE AUTORIZAZION!'''",
+'longpagewarning'                  => "'''ATENZION: cheste pagjine e je grande $1 kilobytes; cualchi sgarfadôr al podarès vê problemis a modificâ pagjinis di 32 kb o plui grandis. Considere par plasê la pussibilitât di dividi la pagjine in sezions plui piçulis.'''",
+'readonlywarning'                  => "'''ATENZION: La base di dâts e je blocade par vie de manutenzion, par cui no si podin salvâ lis modifichis par cumò. Par no pierdilis, tu puedis copiâ e tacâ il test inserît fin cumò e salvâlu intun file di test.'''
+
+L'aministradôr che al à blocât la base di dâts al à ufiert chest spiegazion: $1",
+'templatesused'                    => 'Modei doprâts par cheste pagjine:',
+'templatesusedpreview'             => 'Modei doprâts in cheste anteprime:',
+'templatesusedsection'             => 'Modei doprâts in cheste sezion:',
+'template-protected'               => '(protezût)',
+'template-semiprotected'           => '(semi-protezût)',
+'hiddencategories'                 => 'Cheste pagjine e je {{PLURAL:$1|intune categorie platade|in $1 categoriis platadis}}:',
+'nocreatetitle'                    => 'Creazion des pagjinis limitade',
+'nocreatetext'                     => '{{SITENAME}} al à limitât la pussibilitât di creâ gnovis pagjinis ai utents regjistrâts. Tu puedis tornâ indaûr e cambiâ une pagjine che e esist o se no [[Special:UserLogin|jentrâ o creâ une gnove identitât]].',
+'nocreate-loggedin'                => 'No tu âs i permès che a coventin par creâ gnovis pagjinis.',
+'permissionserrors'                => 'Erôr tai permès',
+'permissionserrorstext-withaction' => 'No tu âs i permès che a coventin par $2, {{PLURAL:$1|par il motîf|pai motîfs}} ca sot:',
+'recreate-deleted-warn'            => "'''Atenzion: tu stâs par tornâ a creâ une pagjine che e je stade eliminade timp fa.'''
 
 Siguriti che sedi pardabon oportun lâ indevant cun la modifiche di cheste pagjine.
 Ve ca par comoditât l'elenc des eliminazions precedentis par cheste pagjine:",
+'deleted-notice'                   => 'Cheste pagjine e je stade eliminade.
+Il regjistri di eliminazion pe pagjine al ven mostrât ca sot par informazion.',
+'edit-no-change'                   => 'Il cambiament al è stât ignorât parcè che no tu âs cambiât nuie tal test.',
 
 # History pages
-'viewpagelogs'        => 'Cjale i regjistris relatîfs a cheste pagjine.',
-'nohistory'           => 'Nol è presint un storic dai cambiaments par cheste pagjine.',
-'currentrev'          => 'Version atuâl',
-'revisionasof'        => 'Version dai $1',
-'revision-info'       => 'Version dal $1, autôr: $2',
-'previousrevision'    => '� Version plui vecje',
-'nextrevision'        => 'Version plui gnove →',
-'currentrevisionlink' => 'Version atuâl',
-'cur'                 => 'cor',
-'next'                => 'prossim',
-'last'                => 'ultime',
-'page_first'          => 'prime',
-'page_last'           => 'ultime',
-'histlegend'          => "Confront tra lis versions: sielç lis caselis des versions che ti interessin e frache Invio o il boton in bas.
+'viewpagelogs'           => 'Cjale i regjistris relatîfs a cheste pagjine.',
+'nohistory'              => 'Nol è presint un storic dai cambiaments par cheste pagjine.',
+'currentrev'             => 'Version atuâl',
+'currentrev-asof'        => 'Revision atuâl dai $1',
+'revisionasof'           => 'Version dai $1',
+'revision-info'          => 'Version dal $1, autôr: $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Version plui vecje',
+'nextrevision'           => 'Version plui gnove →',
+'currentrevisionlink'    => 'Version atuâl',
+'cur'                    => 'cor',
+'next'                   => 'prossim',
+'last'                   => 'ultime',
+'page_first'             => 'prime',
+'page_last'              => 'ultime',
+'histlegend'             => "Confront tra lis versions: sielç lis caselis des versions che ti interessin e frache Invio o il boton in bas.
 
 Leiende: (cur) = difarencis cun la version atuâl, (prec) = difarencis cun la version precedente, '''p''' = piçul cambiament",
-'deletedrev'          => '[eliminade]',
-'histfirst'           => 'Prime',
-'histlast'            => 'Ultime',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vueide)',
+'history-fieldset-title' => 'Sgarfe tal storic',
+'deletedrev'             => '[eliminade]',
+'histfirst'              => 'Prime',
+'histlast'               => 'Ultime',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vueide)',
 
 # Revision feed
+'history-feed-title'          => 'Storic des revisions',
+'history-feed-description'    => 'Storic des revisions de pagjine su cheste wiki',
 'history-feed-item-nocomment' => '$1 ai $2', # user at time
 
 # Revision deletion
@@ -578,90 +601,130 @@ Leiende: (cur) = difarencis cun la version atuâl, (prec) = difarencis cun la ve
 'compareselectedversions' => 'Confronte versions selezionadis',
 'editundo'                => 'anule',
 'diff-multi'              => '({{PLURAL:$1|Une version intermedie no mostrade|$1 versions intermediis no mostradis}}.)',
+'diff-width'              => 'largjece',
+'diff-height'             => 'altece',
 
 # Search results
-'searchresults'         => 'Risultâts de ricercje',
-'searchresulttext'      => 'Par plui informazions su lis ricercjis in {{SITENAME}}, cjale [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'        => 'Pal test "[[:$1]]"',
-'searchsubtitleinvalid' => 'Pal test "$1"',
-'noexactmatch'          => "'''No esist une pagjine cul titul \"\$1\".''' Tu podaressis [[:\$1|creâle tu]].",
-'noexactmatch-nocreate' => "'''La pagjine cun titul \"\$1\" no esist.'''",
-'titlematches'          => 'Corispondencis tai titui des pagjinis',
-'notitlematches'        => 'Nissune corispondence tai titui des pagjinis',
-'textmatches'           => 'Corispondencis tal test des pagjinis',
-'notextmatches'         => 'Nissune corispondence tal test des pagjinis',
-'prevn'                 => 'precedents $1',
-'nextn'                 => 'prossims $1',
-'viewprevnext'          => 'Cjale ($1) ($2) ($3).',
-'search-result-size'    => '$1 ({{PLURAL:$2|une peraule|$2 peraulis}})',
-'search-suggest'        => 'Forsit tu cirivis: $1',
-'search-interwiki-more' => '(altri)',
-'mwsuggest-disable'     => 'Disative i sugjeriments AJAX',
-'showingresults'        => "Ca sot {{PLURAL:$1|al è fin a '''1''' risultât|a son fin a '''$1''' risultâts}} scomençant dal numar '''$2'''.",
-'showingresultsnum'     => "Ca sot {{PLURAL:$3|al è '''1''' risultât|a son '''$3''' risultâts}} scomençant dal numar '''$2'''.",
-'powersearch'           => 'Cîr',
-'powersearch-legend'    => 'Ricercje avanzade',
-'powersearch-ns'        => 'Cîr tai spazis dai nons:',
-'powersearch-redir'     => 'Elenc re-indreçaments',
-'search-external'       => 'Ricercje esterne',
-'searchdisabled'        => 'La ricercje in {{SITENAME}} no je ative. Tu puedis doprâ Google intant. Sta atent che lis lôr tabelis sul contignût di {{SITENAME}} a puedin jessi pôc inzornadis.',
+'searchresults'                   => 'Risultâts de ricercje',
+'searchresults-title'             => 'Risultâts de ricercje di "$1"',
+'searchresulttext'                => 'Par plui informazions su lis ricercjis in {{SITENAME}}, cjale [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                  => 'Ricercje di \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|dutis lis pagjinis che a scomencin par "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|dutis lis pagjinis che a pontin a "$1"]])',
+'searchsubtitleinvalid'           => 'Pal test "$1"',
+'noexactmatch'                    => "'''No esist une pagjine cul titul \"\$1\".''' Tu podaressis [[:\$1|creâle tu]].",
+'noexactmatch-nocreate'           => "'''La pagjine cun titul \"\$1\" no esist.'''",
+'toomanymatches'                  => 'Masse risultâts, prove par plasê une ricercje divierse.',
+'titlematches'                    => 'Corispondencis tai titui des pagjinis',
+'notitlematches'                  => 'Nissune corispondence tai titui des pagjinis',
+'textmatches'                     => 'Corispondencis tal test des pagjinis',
+'notextmatches'                   => 'Nissune corispondence tal test des pagjinis',
+'prevn'                           => 'precedents $1',
+'nextn'                           => 'prossims $1',
+'viewprevnext'                    => 'Cjale ($1) ($2) ($3).',
+'searchmenu-legend'               => 'Opzions de ricercje',
+'searchmenu-exists'               => "'''E je une pagjine di non \"[[:\$1]]\" su cheste wiki'''",
+'searchmenu-new'                  => "'''Cree la pagjine \"[[:\$1]]\" su cheste wiki!'''",
+'searchhelp-url'                  => 'Help:Contignûts',
+'searchprofile-articles'          => 'Pagjinis di contignûts',
+'searchprofile-articles-and-proj' => 'Contignûts & progjet',
+'searchprofile-project'           => 'Pagjinis sul progjet',
+'searchprofile-images'            => 'Files',
+'searchprofile-everything'        => 'Dut',
+'searchprofile-advanced'          => 'Avançade',
+'searchprofile-articles-tooltip'  => 'Cîr in $1',
+'searchprofile-project-tooltip'   => 'Cîr in $1',
+'searchprofile-images-tooltip'    => 'Cîr files',
+'search-result-size'              => '$1 ({{PLURAL:$2|une peraule|$2 peraulis}})',
+'search-result-score'             => 'Rilevance: $1%',
+'search-redirect'                 => '(re-indreçament $1)',
+'search-section'                  => '(sezion $1)',
+'search-suggest'                  => 'Forsit tu cirivis: $1',
+'search-interwiki-caption'        => 'Progjets fradis',
+'search-interwiki-default'        => 'Risultâts di $1:',
+'search-interwiki-more'           => '(altri)',
+'search-mwsuggest-enabled'        => 'cui sugjeriments',
+'search-mwsuggest-disabled'       => 'cence i sugjeriments',
+'mwsuggest-disable'               => 'Disative i sugjeriments AJAX',
+'searchall'                       => 'ducj',
+'showingresults'                  => "Ca sot {{PLURAL:$1|al è fin a '''1''' risultât|a son fin a '''$1''' risultâts}} scomençant dal numar '''$2'''.",
+'showingresultsnum'               => "Ca sot {{PLURAL:$3|al è '''1''' risultât|a son '''$3''' risultâts}} scomençant dal numar '''$2'''.",
+'showingresultstotal'             => "Ca sot {{PLURAL:$4|al ven mostrât il risultât '''$1''' su '''$3'''|a vegnin mostrâts i risultâts '''$1 - $2''' su '''$3'''}}",
+'nonefound'                       => "'''Note''': la ricercje e ven fate normalmentri dome in cualchi spazi dai nons. Prove a scrivi ''all:'' prime dal test di cjatâ par cirî in ducj i nons dai spazis (includint lis pagjinis di discussion, i modei e v.i.) o se no dopre il non dal spazi desiderât come prefìs.",
+'search-nonefound'                => 'Nissun risultât par cheste ricercje.',
+'powersearch'                     => 'Cîr',
+'powersearch-legend'              => 'Ricercje avanzade',
+'powersearch-ns'                  => 'Cîr tai spazis dai nons:',
+'powersearch-redir'               => 'Elenc re-indreçaments',
+'powersearch-field'               => 'Cîr',
+'search-external'                 => 'Ricercje esterne',
+'searchdisabled'                  => 'La ricercje in {{SITENAME}} no je ative. Tu puedis doprâ Google intant. Sta atent che lis lôr tabelis sul contignût di {{SITENAME}} a puedin jessi pôc inzornadis.',
 
 # Preferences page
-'preferences'              => 'Preferencis',
-'mypreferences'            => 'mês preferencis',
-'prefs-edits'              => 'Numar di cambiaments fats:',
-'prefsnologin'             => 'No tu sês jentrât',
-'qbsettings'               => 'Sbare svelte',
-'qbsettings-none'          => 'Nissune',
-'qbsettings-fixedleft'     => 'Fis a Çampe',
-'qbsettings-fixedright'    => 'Fis a Drete',
-'qbsettings-floatingleft'  => 'Flutuant a çampe',
-'qbsettings-floatingright' => 'Flutuant a diestre',
-'changepassword'           => 'Gambie peraule clâf',
-'skin'                     => 'Mascare',
-'math'                     => 'Matematiche',
-'dateformat'               => 'Formât de date',
-'datedefault'              => 'Nissune preference',
-'datetime'                 => 'Date e ore',
-'prefs-personal'           => 'Dâts utents',
-'prefs-rc'                 => 'Ultins cambiaments & stubs',
-'prefs-watchlist'          => 'Tignudis di voli',
-'prefs-watchlist-days'     => 'Numar di zornadis di mostrâ inte liste des pagjinis tignudis di voli:',
-'prefs-watchlist-edits'    => 'Numar di modifichis di mostrâ inte liste slargjade:',
-'prefs-misc'               => 'Variis',
-'saveprefs'                => 'Salve lis preferencis',
-'resetprefs'               => 'Predeterminât',
-'oldpassword'              => 'Vecje peraule clâf',
-'newpassword'              => 'Gnove peraule clâf',
-'retypenew'                => 'Torne a scrivi chê gnove',
-'textboxsize'              => 'Cambiament',
-'rows'                     => 'Riis',
-'columns'                  => 'Colonis:',
-'searchresultshead'        => 'Ricercje',
-'resultsperpage'           => 'Risultâts par pagjine',
-'contextlines'             => 'Riis par risultât',
-'recentchangesdays'        => 'Numar di zornadis di mostrâ tai ultins cambiaments:',
-'recentchangescount'       => 'Numar di titui tai ultins cambiaments',
-'savedprefs'               => 'Lis preferencis a son stadis salvadis',
-'timezonelegend'           => 'Fûs orari',
-'timezonetext'             => 'Il numar di oris di diference rispiet ae ore dal servidôr (UTC).',
-'localtime'                => 'Ore locâl',
-'servertime'               => 'Ore servidôr',
-'guesstimezone'            => 'Cjape impostazions dal sgarfadôr',
-'allowemail'               => 'Ative la ricezion di messaçs email di bande di altris utents¹',
-'prefs-searchoptions'      => 'Opzions de ricercje',
-'prefs-namespaces'         => 'Spazis dai nons',
-'default'                  => 'predeterminât',
-'files'                    => 'Files',
+'preferences'               => 'Preferencis',
+'mypreferences'             => 'mês preferencis',
+'prefs-edits'               => 'Numar di cambiaments fats:',
+'prefsnologin'              => 'No tu sês jentrât',
+'qbsettings'                => 'Sbare svelte',
+'qbsettings-none'           => 'Nissune',
+'qbsettings-fixedleft'      => 'Fis a Çampe',
+'qbsettings-fixedright'     => 'Fis a Drete',
+'qbsettings-floatingleft'   => 'Flutuant a çampe',
+'qbsettings-floatingright'  => 'Flutuant a diestre',
+'changepassword'            => 'Gambie peraule clâf',
+'skin'                      => 'Mascare',
+'skin-preview'              => 'Anteprime',
+'math'                      => 'Matematiche',
+'dateformat'                => 'Formât de date',
+'datedefault'               => 'Nissune preference',
+'datetime'                  => 'Date e ore',
+'prefs-personal'            => 'Dâts utents',
+'prefs-rc'                  => 'Ultins cambiaments & stubs',
+'prefs-watchlist'           => 'Tignudis di voli',
+'prefs-watchlist-days'      => 'Numar di zornadis di mostrâ inte liste des pagjinis tignudis di voli:',
+'prefs-watchlist-days-max'  => '(massim 7 zornadis)',
+'prefs-watchlist-edits'     => 'Numar di modifichis di mostrâ inte liste slargjade:',
+'prefs-watchlist-edits-max' => '(numar massim: 1000)',
+'prefs-misc'                => 'Variis',
+'prefs-resetpass'           => 'Cambie la peraule clâf',
+'saveprefs'                 => 'Salve lis preferencis',
+'resetprefs'                => 'Predeterminât',
+'textboxsize'               => 'Cambiament',
+'prefs-edit-boxsize'        => 'Dimensions dal barcon pai cambiaments.',
+'rows'                      => 'Riis',
+'columns'                   => 'Colonis:',
+'searchresultshead'         => 'Ricercje',
+'resultsperpage'            => 'Risultâts par pagjine',
+'contextlines'              => 'Riis par risultât',
+'contextchars'              => 'Numar di caratars par capî il contest:',
+'stub-threshold'            => 'Valôr minim pe formatazion dai <a href="#" class="stub">leams aboç</a> (bytes):',
+'recentchangesdays'         => 'Numar di zornadis di mostrâ tai ultins cambiaments:',
+'recentchangesdays-max'     => '(massim $1 {{PLURAL:$1|zornade|zornadis}})',
+'recentchangescount'        => 'Numar di titui tai ultins cambiaments',
+'savedprefs'                => 'Lis preferencis a son stadis salvadis',
+'timezonelegend'            => 'Fûs orari',
+'timezonetext'              => 'Il numar di oris di diference rispiet ae ore dal servidôr (UTC).',
+'localtime'                 => 'Ore locâl:',
+'timezoneselect'            => 'Fûs orari:',
+'timezoneuseserverdefault'  => 'Dopre la ore dal servidôr',
+'timezoneuseoffset'         => 'Altri (inserìs la difarence)',
+'timezoneoffset'            => 'Difarence¹:',
+'servertime'                => 'Ore dal servidôr:',
+'guesstimezone'             => 'Cjape impostazions dal sgarfadôr',
+'allowemail'                => 'Ative la ricezion di messaçs email di bande di altris utents¹',
+'prefs-searchoptions'       => 'Opzions de ricercje',
+'prefs-namespaces'          => 'Spazis dai nons',
+'defaultns'                 => 'Cîr in chescj spazis dai nons se no specifichi nuialtri:',
+'default'                   => 'predeterminât',
+'files'                     => 'Files',
 
 # User rights
-'editinguser'             => "Cambiament dai dirits par l'utent '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'             => "Cambiament dai dirits par l'utent '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-groupsmember' => 'Al fâs part di:',
 
 # Groups
 'group'               => 'Grup:',
 'group-user'          => 'Utents regjistrâts',
 'group-autoconfirmed' => 'Utents auto confermâts',
+'group-sysop'         => 'Aministradôrs',
 'group-all'           => 'Utents',
 
 'group-user-member' => 'Utent',
@@ -671,9 +734,13 @@ Leiende: (cur) = difarencis cun la version atuâl, (prec) = difarencis cun la ve
 # User rights log
 'rightslog' => 'Regjistri dai dirits dai utents',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'cambiâ cheste pagjine',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|cambiament|cambiaments}}',
 'recentchanges'                     => 'Ultins cambiaments',
+'recentchanges-legend'              => 'Opzions dai ultins cambiaments',
 'recentchangestext'                 => 'Cheste pagjine e mostre i plui recents cambiaments inte {{SITENAME}}.',
 'recentchanges-feed-description'    => 'Chest canâl al ripuarte i cambiaments plui recents ai contignûts di cheste wiki.',
 'rcnote'                            => "Ca sot tu cjatis {{PLURAL:$1|l'ultin cambiament|i ultins '''$1''' cambiaments}} al sît {{PLURAL:$2|intes ultimis 24 oris|tes ultimis '''$2''' zornadis}}; i dâts a son inzornâts ai $4 a lis $5.",
@@ -697,6 +764,8 @@ Leiende: (cur) = difarencis cun la version atuâl, (prec) = difarencis cun la ve
 'rc_categories'                     => 'Limite aes categoriis (dividilis cun "|")',
 'rc_categories_any'                 => 'Cualsisei',
 'newsectionsummary'                 => '/* $1 */ gnove sezion',
+'rc-enhanced-expand'                => 'Mostre detais (al covente JavaScript)',
+'rc-enhanced-hide'                  => 'Plate detais',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cambiaments leâts',
@@ -713,11 +782,11 @@ Leiende: (cur) = difarencis cun la version atuâl, (prec) = difarencis cun la ve
 'uploadnologin'      => 'No jentrât',
 'uploadnologintext'  => 'Tu scugnis [[Special:UserLogin|jentrâ]] cul to non utent par cjamâ sù files.',
 'uploaderror'        => 'Erôr cjamant sù',
-'uploadtext'         => "Dopre la form ca sot par cjamâ sù un file, par cjalâ o cirî i files cjamâts sù in precedence va te [[Special:ImageList|liste dai files cjamâts sù]], lis cjamadis e lis eliminazions a son ancje regjistrâts tal [[Special:Log/upload|regjistri des cjamadis]].
+'uploadtext'         => "Dopre la form ca sot par cjamâ sù un file, par cjalâ o cirî i files cjamâts sù in precedence va te [[Special:FileList|liste dai files cjamâts sù]], lis cjamadis e lis eliminazions a son ancje regjistrâts tal [[Special:Log/upload|regjistri des cjamadis]].
 
 Par includi une figure intune pagjine, dopre un leam inte form
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.png|alt text]]</nowiki>''' or
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png|alt text]]</nowiki>''' or
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki>''' par un leam diret al file.",
 'uploadlog'          => 'regjistri cjamâts sù',
 'uploadlogpage'      => 'Regjistri dai files cjamâts sù',
@@ -738,20 +807,27 @@ Par includi une figure intune pagjine, dopre un leam inte form
 'uploaddisabledtext' => 'Lis cjamadis a son disativâts su cheste wiki.',
 'sourcefilename'     => 'Non dal file origjinâl:',
 'destfilename'       => 'Non dal file di destinazion:',
+'watchthisupload'    => 'Ten di voli',
+
+'license'   => 'Licence pal ûs:',
+'nolicense' => 'Nissune licence sielte',
 
-# Special:ImageList
-'imagelist'             => 'Liste des figuris',
-'imagelist_date'        => 'Date',
-'imagelist_name'        => 'Non',
-'imagelist_user'        => 'Utent',
-'imagelist_size'        => 'Dimension in bytes',
-'imagelist_description' => 'Descrizion',
+# Special:ListFiles
+'listfiles'             => 'Liste des figuris',
+'listfiles_date'        => 'Date',
+'listfiles_name'        => 'Non',
+'listfiles_user'        => 'Utent',
+'listfiles_size'        => 'Dimension in bytes',
+'listfiles_description' => 'Descrizion',
+'listfiles_count'       => 'Versions',
 
-# Image description page
+# File description page
 'filehist'                  => 'Storic dal file',
 'filehist-help'             => 'Frache suntune date/ore par viodi il file cemût che al jere in chel moment.',
 'filehist-current'          => 'corint',
 'filehist-datetime'         => 'Date/Ore',
+'filehist-thumb'            => 'Miniature',
+'filehist-thumbtext'        => 'Miniature de version dai $1',
 'filehist-user'             => 'Utent',
 'filehist-dimensions'       => 'Dimensions',
 'filehist-filesize'         => 'Dimension dal file',
@@ -790,19 +866,24 @@ Par includi une figure intune pagjine, dopre un leam inte form
 'randomredirect' => 'Un re-indreçament casuâl',
 
 # Statistics
-'statistics'             => 'Statistichis',
-'sitestats'              => 'Statistichis dal sît',
-'userstats'              => 'Statistichis dai utents',
-'sitestatstext'          => "Tu puedis cjatâ in dut '''\$1''' {{PLURAL:\$1|pagjine|pagjinis}} inte base di dâts. Chest numar al inclût pagjinis di \"discussion\", pagjinis su la {{SITENAME}}, pagjinis cun pocjis peraulis, re-indreçaments, e altris che probabilmentri no si puedin considerâ pardabon come pagjinis di contignût.
-Gjavant chestis, o vin '''\$2''' {{PLURAL:\$2|pagjine che e je|pagjinis che a son}} probabilmentri di contignût legjitim.
-
-'''\$8''' {{PLURAL:\$8|file al è stât cjamât|files a son stâts cjamâts}} sù.
-
-O vin vût in dut '''\$3''' {{PLURAL:\$3|viodude|viodudis}} des pagjinis e '''\$4''' {{PLURAL:\$4|cambiament|cambiaments}} aes pagjinis di cuant che la wiki e je stade implantade. Chest al vûl dî une medie di '''\$5''' cambiaments par pagjine, e '''\$6''' viodudis par ogni cambiament.
-
-La code dai [http://www.mediawiki.org/wiki/Manual:Job_queue procès di fâ] e conten {{PLURAL:\$7|'''1''' element|'''\$7''' elements}}.",
-'userstatstext'          => "{{PLURAL:$1|Al è '''1''' [[Special:ListUsers|utent]] regjistrât|A son '''$1''' [[Special:ListUsers|utents]] regjistrâts}}, di chescj  '''$2''' (o il '''$4%''') {{PLURAL:$2|al è|a son}} $5 .",
-'statistics-mostpopular' => 'Pagjinis plui visitadis',
+'statistics'                   => 'Statistichis',
+'statistics-header-pages'      => 'Statistichis su lis pagjinis',
+'statistics-header-edits'      => 'Statistichis sui cambiaments',
+'statistics-header-views'      => 'Statistichis su lis viodudis',
+'statistics-header-users'      => 'Statistichis dai utents',
+'statistics-articles'          => 'Pagjinis di contignûts',
+'statistics-pages'             => 'Pagjinis',
+'statistics-pages-desc'        => 'Dutis lis pagjinis de wiki, includint lis pagjinis di discussion, i re-indreçaments e v.i.',
+'statistics-files'             => 'Files cjamâts sù',
+'statistics-edits'             => 'Cambiaments scomençant de instalazion di {{SITENAME}}',
+'statistics-edits-average'     => 'Medie dai cambiaments par ogni pagjine',
+'statistics-views-total'       => 'Viodudis totâls',
+'statistics-views-peredit'     => 'Viodudis par cambiament',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Code dai procès] di eseguî in background',
+'statistics-users'             => '[[Special:ListUsers|Utents]] regjistrâts',
+'statistics-users-active'      => 'Utents atîfs',
+'statistics-users-active-desc' => 'Utents che a àn fat une azion {{PLURAL:$1|intal ultin dì|intai ultins $1 dîs}}',
+'statistics-mostpopular'       => 'Pagjinis plui visitadis',
 
 'disambiguations' => 'Pagjinis di disambiguazion',
 
@@ -823,9 +904,10 @@ La code dai [http://www.mediawiki.org/wiki/Manual:Job_queue procès di fâ] e co
 'ncategories'             => '$1 {{PLURAL:$1|categorie|categoriis}}',
 'nlinks'                  => '$1 {{PLURAL:$1|leam|leams}}',
 'nmembers'                => '$1 {{PLURAL:$1|element|elements}}',
+'nrevisions'              => '$1 {{PLURAL:$1|revision|revisions}}',
 'nviews'                  => '$1 {{PLURAL:$1|viodude|viodudis}}',
 'lonelypages'             => 'Pagjinis solitaris',
-'lonelypagestext'         => 'Nissune pagjine in {{SITENAME}} e à leams aes pagjinis ca sot.',
+'lonelypagestext'         => 'Lis pagjinis ca sot no àn leams di altris pagjinis di {{SITENAME}} e no son includudis in altris pagjinis.',
 'uncategorizedpages'      => 'Pagjinis cence categorie',
 'uncategorizedcategories' => 'Categoriis cence categorie',
 'uncategorizedimages'     => 'Files cence une categorie',
@@ -835,6 +917,8 @@ La code dai [http://www.mediawiki.org/wiki/Manual:Job_queue procès di fâ] e co
 'popularpages'            => 'Pagjinis popolârs',
 'wantedcategories'        => 'Categoriis desideradis',
 'wantedpages'             => 'Pagjinis desideradis',
+'wantedfiles'             => 'Files desiderâts',
+'wantedtemplates'         => 'Modei desiderâts',
 'mostlinked'              => 'Pagjinis a cui pontin il maiôr numar di leams',
 'mostlinkedcategories'    => 'Categoriis a cui pontin il maiôr numar di leams',
 'mostlinkedtemplates'     => 'Modei plui doprâts',
@@ -847,11 +931,14 @@ La code dai [http://www.mediawiki.org/wiki/Manual:Job_queue procès di fâ] e co
 'deadendpages'            => 'Pagjinis cence usite',
 'protectedpages'          => 'Pagjinis protezudis',
 'listusers'               => 'Liste dai utents',
+'usereditcount'           => '$1 {{PLURAL:$1|contribût|contribûts}}',
 'newpages'                => 'Gnovis pagjinis',
 'newpages-username'       => 'Non utent:',
 'ancientpages'            => 'Pagjinis plui vecjis',
 'move'                    => 'Môf',
 'movethispage'            => 'Môf cheste pagjine',
+'pager-newer-n'           => '{{PLURAL:$1|1 plui gnûf|$1 plui gnûfs}}',
+'pager-older-n'           => '{{PLURAL:$1|1 plui vieri|$1 plui vieris}}',
 
 # Book sources
 'booksources'    => 'Fonts librariis',
@@ -862,7 +949,6 @@ La code dai [http://www.mediawiki.org/wiki/Manual:Job_queue procès di fâ] e co
 'speciallogtitlelabel' => 'Titul:',
 'log'                  => 'Regjistris',
 'all-logs-page'        => 'Ducj i regjistris',
-'log-search-submit'    => 'Va',
 'alllogstext'          => 'Viodude combinade di ducj i regjistris disponibii di {{SITENAME}}.
 Tu puedis strenzi la viodude sielzint un gjenar di regjistri, un non utent e/o la vôs che ti interesse (ducj e doi i cjamps a son sensibii al maiuscul/minuscul).',
 'logempty'             => 'Nissun element corispondint tal regjistri.',
@@ -873,6 +959,7 @@ Tu puedis strenzi la viodude sielzint un gjenar di regjistri, un non utent e/o l
 'nextpage'          => 'Prossime pagjine ($1)',
 'prevpage'          => 'Pagjinis precedentis ($1)',
 'allpagesfrom'      => 'Mostre pagjinis scomençant di:',
+'allpagesto'        => 'Mostre lis pagjinis fin a:',
 'allarticles'       => 'Dutis lis vôs',
 'allinnamespace'    => 'Dutis lis pagjinis (non dal spazi $1)',
 'allnotinnamespace' => 'Dutis lis pagjinis (no tal non dal spazi $1)',
@@ -888,26 +975,46 @@ Lis [[Special:UnusedCategories|categoriis no dopradis]] no son mostradis culì.
 Cjale ancje lis [[Special:WantedCategories|categoriis desideradis]].',
 'categoriesfrom'     => 'Mostre lis categoriis scomençant di:',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribûts dal utent eliminâts',
+
+# Special:LinkSearch
+'linksearch'    => 'Leams esternis',
+'linksearch-ns' => 'Spazi dai nons:',
+'linksearch-ok' => 'Cîr',
+
 # Special:ListUsers
 'listusersfrom'    => 'Mostre i utents scomençant di:',
 'listusers-submit' => 'Mostre',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Regjistri dai gnûfs utents',
+'newuserlogpagetext'          => 'Ca sot tu cjatis un regjistri dai gnûfs utents creâts.',
+'newuserlog-byemail'          => 'peraule clâf mandade par pueste eletroniche',
+'newuserlog-create-entry'     => 'al è rivât il gnûf utent',
+'newuserlog-create2-entry'    => 'creade une identitât par $1',
+'newuserlog-autocreate-entry' => 'Identitât creade in automatic',
+
 # Special:ListGroupRights
-'listgrouprights-group'  => 'Grup',
-'listgrouprights-rights' => 'Dirits',
+'listgrouprights-group'   => 'Grup',
+'listgrouprights-rights'  => 'Dirits',
+'listgrouprights-members' => '(liste dai membris)',
 
 # E-mail user
 'emailuser'       => 'Messaç di pueste a chest utent',
 'emailpage'       => 'Mande un messaç di pueste eletroniche al utent',
 'defemailsubject' => 'Messaç di {{SITENAME}}',
 'noemailtitle'    => 'Nissune direzion email',
-'noemailtext'     => 'Chest utent nol à specificât une direzion di pueste valide o al à sielzût di no ricevi pueste di altris utents.',
+'noemailtext'     => 'Chest utent nol à specificât une direzion di pueste valide.',
+'email-legend'    => 'Mande un messaç di pueste eletroniche a un altri utent di {{SITENAME}}',
 'emailfrom'       => 'Di:',
 'emailto'         => 'A:',
 'emailsubject'    => 'Ogjet:',
 'emailmessage'    => 'Messaç:',
 'emailsend'       => 'Mande',
 'emailccme'       => 'Mandimi une copie.',
+'emailsent'       => 'Messaç mandât',
+'emailsenttext'   => 'Il messaç di pueste eletroniche al è stât mandât.',
 
 # Watchlist
 'watchlist'            => 'Tignûts di voli',
@@ -936,12 +1043,7 @@ e la pagjine e sarà '''gruessute''' te [[Special:RecentChanges|liste dai ultins
 'watchlistcontains'    => 'Tu stâs tignint di voli $1 {{PLURAL:$1|pagjine|pagjinis}}.',
 'wlnote'               => "Ca sot {{PLURAL:$1|al è il cambiament plui recent|a son i '''$1''' cambiaments plui recents}} {{PLURAL:$2|inte ultime ore|intes '''$2''' oris passadis}}.",
 'wlshowlast'           => 'Mostre ultimis $1 oris $2 zornadis $3',
-'watchlist-show-bots'  => 'Mostre i cambiaments dai bots',
-'watchlist-hide-bots'  => 'Plate i cambiaments dai bots',
-'watchlist-show-own'   => 'Mostre i miei cambiaments',
-'watchlist-hide-own'   => 'Plate i miei cammbiaments',
-'watchlist-show-minor' => 'Mostre i miei piçui cambiaments',
-'watchlist-hide-minor' => 'Plate i piçui cambiaments',
+'watchlist-options'    => 'Opzions pe liste dai tignûts di voli',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Daûr a zontâ aes pagjinis tignudis di voli...',
@@ -952,51 +1054,57 @@ e la pagjine e sarà '''gruessute''' te [[Special:RecentChanges|liste dai ultins
 'created'                      => 'creade',
 'enotif_anon_editor'           => 'utent anonim $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'Elimine pagjine',
-'confirm'                     => 'Conferme',
-'excontent'                   => "il contignût al jere: '$1'",
-'excontentauthor'             => "il contignût al jere: '$1' (e al veve contribuît dome '$2')",
-'exbeforeblank'               => "il contignût prime di disvuedâ al jere: '$1'",
-'exblank'                     => 'pagjine vueide',
-'delete-confirm'              => 'Elimine "$1"',
-'delete-legend'               => 'Elimine',
-'historywarning'              => 'Atenzion: la pagjine che tu stâs eliminant e à un storic.',
-'confirmdeletetext'           => 'Tu stâs par eliminâ par simpri une pagjine insieme cun dut il so storic.
+# Delete
+'deletepage'            => 'Elimine pagjine',
+'confirm'               => 'Conferme',
+'excontent'             => "il contignût al jere: '$1'",
+'excontentauthor'       => "il contignût al jere: '$1' (e al veve contribuît dome '$2')",
+'exbeforeblank'         => "il contignût prime di disvuedâ al jere: '$1'",
+'exblank'               => 'pagjine vueide',
+'delete-confirm'        => 'Elimine "$1"',
+'delete-legend'         => 'Elimine',
+'historywarning'        => 'Atenzion: la pagjine che tu stâs eliminant e à un storic.',
+'confirmdeletetext'     => 'Tu stâs par eliminâ par simpri une pagjine insieme cun dut il so storic.
 Par plasê, da la conferme che tu vuelis fâlu, che tu capissis lis conseguencis e che tu lu stâs fasint tal rispiet de [[{{MediaWiki:Policy-url}}|politiche dal progjet]].',
-'actioncomplete'              => 'Azion completade',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" al è stât eliminât.
+'actioncomplete'        => 'Azion completade',
+'deletedtext'           => '"<nowiki>$1</nowiki>" al è stât eliminât.
 Cjale $2 par une liste des ultimis eliminazions.',
-'deletedarticle'              => 'eliminât "$1"',
-'dellogpage'                  => 'Regjistri des eliminazions',
-'deletionlog'                 => 'regjistri eliminazions',
-'reverted'                    => 'Tornât ae version precedente',
-'deletecomment'               => 'Reson pe eliminazion',
-'deleteotherreason'           => 'Altri motîf o motîf in plui:',
-'deletereasonotherlist'       => 'Altri motîf',
-'rollbacklink'                => 'revoche',
+'deletedarticle'        => 'eliminât "$1"',
+'dellogpage'            => 'Regjistri des eliminazions',
+'deletionlog'           => 'regjistri eliminazions',
+'reverted'              => 'Tornât ae version precedente',
+'deletecomment'         => 'Reson pe eliminazion',
+'deleteotherreason'     => 'Altri motîf o motîf in plui:',
+'deletereasonotherlist' => 'Altri motîf',
+
+# Rollback
+'rollbacklink' => 'revoche',
+
+# Protect
 'protectlogpage'              => 'Regjistri des protezions',
 'protectedarticle'            => '$1 protezût',
 'protect-title'               => 'Protezint "$1"',
+'prot_1movedto2'              => '$1 movût in $2',
 'protect-legend'              => 'Conferme protezion',
 'protectcomment'              => 'Reson pe protezion',
 'protectexpiry'               => 'Scjadence:',
 'protect_expiry_invalid'      => 'Scjadence no valide.',
 'protect_expiry_old'          => 'La scjadence e je za passade.',
 'protect-unchain'             => 'Sbloche i permès di spostament',
-'protect-text'                => 'Ca tu puedis viodi e cambiâ il nivel di protezion pe pagjine <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'No tu âs i permès che a coventis par cambiâ i nivei di protezion de pagjine.
-Lis impuestazions atuâls pe pagjine a son <strong>$1</strong>:',
+'protect-text'                => "Ca tu puedis viodi e cambiâ il nivel di protezion pe pagjine '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "No tu âs i permès che a coventis par cambiâ i nivei di protezion de pagjine.
+Lis impuestazions atuâls pe pagjine a son '''$1''':",
 'protect-cascadeon'           => 'Cheste pagjine e je blocade par cumò parcè che e je includude {{PLURAL:$1|inte pagjine|intes pagjinis}} culì sot, dulà che e je ative la protezion ricorsive.
 Tu puedis cambiâ il nivel di protezion di cheste pagjine, ma chest nol varà efiets su la protezion ricorsive.',
-'protect-default'             => '(predeterminât)',
+'protect-default'             => '(Autorize ducj i utents)',
 'protect-fallback'            => 'Al covente il permès "$1"',
-'protect-level-autoconfirmed' => 'Dome utents regjistrâts',
+'protect-level-autoconfirmed' => 'Bloche i utents gnûfs e no regjistrâts',
 'protect-level-sysop'         => 'Dome aministradôrs',
 'protect-summary-cascade'     => 'a discjadude',
 'protect-expiring'            => 'e scjât: $1 (UTC)',
 'protect-cascade'             => 'Protezion ricorsive (estendude a dutis lis pagjinis includudis in cheste).',
 'protect-cantedit'            => 'No tu puedis cambiâ i nivei di protezion par cheste pagjine, parcè che no tu âs i permès par modificâle.',
+'protect-expiry-options'      => '2 oris:2 hours,1 zornade:1 day,3 zornadis:3 days,1 setemane:1 week,2 setemanis:2 weeks,1 mês:1 month,3 mês:3 months,6 mês:6 months,1 an:1 year,infinît:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permès:',
 'restriction-level'           => 'Nivel di restrizion:',
 'pagesize'                    => '(bytes)',
@@ -1007,6 +1115,7 @@ Tu puedis cambiâ il nivel di protezion di cheste pagjine, ma chest nol varà ef
 'restriction-create' => 'Creazion',
 
 # Undelete
+'viewdeletedpage'        => 'Viôt lis pagjinis eliminadis',
 'undeletebtn'            => 'Ripristine',
 'undeletecomment'        => 'Coment:',
 'undeletedarticle'       => 'al à recuperât "[[$1]]"',
@@ -1018,49 +1127,56 @@ Tu puedis cambiâ il nivel di protezion di cheste pagjine, ma chest nol varà ef
 'blanknamespace' => '(Principâl)',
 
 # Contributions
-'contributions' => 'Contribûts dal utent',
-'mycontris'     => 'Miei contribûts',
-'contribsub2'   => 'Par $1 ($2)',
-'nocontribs'    => 'Nissun cambiament che al rispiete chescj criteris cjatât.',
-'uctop'         => ' (su)',
-'month'         => 'Scomençant dal mês (e prime):',
-'year'          => 'Scomençant dal an (e prime):',
-
+'contributions'       => 'Contribûts dal utent',
+'contributions-title' => 'Contribûts di $1',
+'mycontris'           => 'Miei contribûts',
+'contribsub2'         => 'Par $1 ($2)',
+'nocontribs'          => 'Nissun cambiament che al rispiete chescj criteris cjatât.',
+'uctop'               => ' (su)',
+'month'               => 'Scomençant dal mês (e prime):',
+'year'                => 'Scomençant dal an (e prime):',
+
+'sp-contributions-newbies'     => 'Mostre dome i contribûts dai gnûfs utents',
 'sp-contributions-newbies-sub' => 'Pai gnûfs utents',
 'sp-contributions-blocklog'    => 'Regjistri dai blocs',
+'sp-contributions-search'      => 'Cîr contribûts',
+'sp-contributions-username'    => 'Direzion IP o non utent:',
 'sp-contributions-submit'      => 'Cîr',
 
 # What links here
-'whatlinkshere'           => 'Leams a cheste vôs',
-'whatlinkshere-title'     => 'Pagjinis che a son leadis a "$1"',
-'whatlinkshere-page'      => 'Pagjine:',
-'linklistsub'             => '(Liste di leams)',
-'linkshere'               => "Lis pagjinis ca sot a son leadis a '''[[:$1]]''':",
-'nolinkshere'             => "Nissune pagjine e à leams a '''[[:$1]]'''.",
-'nolinkshere-ns'          => "No son pagjine leadis a '''[[:$1]]''' intal spazi dai nons sielt.",
-'isredirect'              => 'pagjine di reindirizament',
-'istemplate'              => 'includude',
-'whatlinkshere-prev'      => '{{PLURAL:$1|precedent|precedents $1}}',
-'whatlinkshere-next'      => '{{PLURAL:$1|sucessîf|sucessîfs $1}}',
-'whatlinkshere-links'     => '� leams',
-'whatlinkshere-hidelinks' => '$1 leams',
-'whatlinkshere-filters'   => 'Filtris',
+'whatlinkshere'            => 'Leams a cheste vôs',
+'whatlinkshere-title'      => 'Pagjinis che a son leadis a "$1"',
+'whatlinkshere-page'       => 'Pagjine:',
+'linkshere'                => "Lis pagjinis ca sot a son leadis a '''[[:$1]]''':",
+'nolinkshere'              => "Nissune pagjine e à leams a '''[[:$1]]'''.",
+'nolinkshere-ns'           => "No son pagjine leadis a '''[[:$1]]''' intal spazi dai nons sielt.",
+'isredirect'               => 'pagjine di reindirizament',
+'istemplate'               => 'includude',
+'isimage'                  => 'leam figure',
+'whatlinkshere-prev'       => '{{PLURAL:$1|precedent|precedents $1}}',
+'whatlinkshere-next'       => '{{PLURAL:$1|sucessîf|sucessîfs $1}}',
+'whatlinkshere-links'      => '� leams',
+'whatlinkshere-hideredirs' => '$1 re-indreçaments',
+'whatlinkshere-hidelinks'  => '$1 leams',
+'whatlinkshere-filters'    => 'Filtris',
 
 # Block/unblock
-'blockip'            => 'Bloche utent',
-'blockip-legend'     => "Bloche l'utent",
-'ipaddress'          => 'Direzion IP:',
-'ipadressorusername' => 'Direzion IP o non utent:',
-'ipbexpiry'          => 'Scjadence dal bloc:',
-'ipbreason'          => 'Reson dal bloc:',
-'ipbsubmit'          => 'Bloche chest utent',
-'ipboptions'         => '2 oris:2 hours,1 zornade:1 day,3 zornadis:3 days,1 setemane:1 week,2 setemanis:2 weeks,1 mês:1 month,3 mês:3 months,6 mês:6 months,1 an:1 year,infinît:infinite', # display1:time1,display2:time2,...
-'ipblocklist'        => 'Utents e direzions IP blocadis',
-'blocklink'          => 'bloche',
-'unblocklink'        => 'sbloche',
-'contribslink'       => 'contribûts',
-'blocklogpage'       => 'Regjistri dai blocs',
-'blocklogentry'      => 'al à blocât "[[$1]]"; scjadence $2 $3',
+'blockip'                  => 'Bloche utent',
+'blockip-legend'           => "Bloche l'utent",
+'ipaddress'                => 'Direzion IP:',
+'ipadressorusername'       => 'Direzion IP o non utent:',
+'ipbexpiry'                => 'Scjadence dal bloc:',
+'ipbreason'                => 'Reson dal bloc:',
+'ipbsubmit'                => 'Bloche chest utent',
+'ipboptions'               => '2 oris:2 hours,1 zornade:1 day,3 zornadis:3 days,1 setemane:1 week,2 setemanis:2 weeks,1 mês:1 month,3 mês:3 months,6 mês:6 months,1 an:1 year,infinît:infinite', # display1:time1,display2:time2,...
+'ipblocklist'              => 'Utents e direzions IP blocadis',
+'blocklink'                => 'bloche',
+'unblocklink'              => 'sbloche',
+'change-blocklink'         => 'cambie bloc',
+'contribslink'             => 'contribûts',
+'blocklogpage'             => 'Regjistri dai blocs',
+'blocklogentry'            => 'al à blocât "[[$1]]"; scjadence $2 $3',
+'block-log-flags-nocreate' => 'creazion identitât blocade',
 
 # Developer tools
 'lockdb'  => 'Bloche base di dâts',
@@ -1088,6 +1204,8 @@ tu âs di cognossi lis conseguencis prime di lâ indevant.",
 
 In chescj câs, tu varâs di movi o unî a man lis informazions contignudis te pagjine di discussion, se tu lu desideris.",
 'movearticle'      => 'Môf la vôs',
+'movenologin'      => 'No tu sês jentrât',
+'movenologintext'  => 'Tu âs di jessi un utent regjistrât e <a href="{{localurl:Special:UserLogin}}">jentrât</a> par movi une pagjine.',
 'newtitle'         => 'Al gnûf titul',
 'move-watch'       => 'Ten di voli cheste pagjine',
 'movepagebtn'      => 'Môf pagjine',
@@ -1099,6 +1217,7 @@ Sielç par plasê un altri non.',
 'movedto'          => 'Movude in',
 'movetalk'         => 'Môf ancje la pagjine di discussion, se pussibil.',
 '1movedto2'        => '$1 movût in $2',
+'1movedto2_redir'  => 'al à movût [[$1]] a [[$2]] par mieç di un re-indreçament',
 'movelogpage'      => 'Regjistri des pagjinis movudis',
 'movelogpagetext'  => 'Ca sot e je une liste des pagjinis movudis.',
 'movereason'       => 'Reson',
@@ -1134,17 +1253,17 @@ Sielç par plasê un altri non.',
 # Tooltip help for the actions
 'tooltip-pt-userpage'             => 'La tô pagjine utent',
 'tooltip-pt-anonuserpage'         => 'La pagjine utent di cheste direzion IP',
-'tooltip-pt-mytalk'               => 'La mê pagjine di discussion',
+'tooltip-pt-mytalk'               => 'La tô pagjine di discussion',
 'tooltip-pt-anontalk'             => 'Discussions dai cambiaments fats di cheste direzion IP',
 'tooltip-pt-preferences'          => 'Lis mês preferencis',
 'tooltip-pt-watchlist'            => 'La liste des pagjinis che tu stâs tignint di voli',
-'tooltip-pt-mycontris'            => 'Liste dai miei contribûts',
+'tooltip-pt-mycontris'            => 'Liste dai tiei contribûts',
 'tooltip-pt-login'                => 'La regjistrazion e je conseade, ancje se no obligatorie.',
 'tooltip-pt-anonlogin'            => 'La regjistrazion e je conseade, ma no si scugne fâle',
 'tooltip-pt-logout'               => 'Jes (logout)',
 'tooltip-ca-talk'                 => 'Discussions su cheste pagjine',
 'tooltip-ca-edit'                 => 'Tu puedis cambiâ cheste pagjine. Par plasê dopre il boton de anteprime prime di salvâ.',
-'tooltip-ca-addsection'           => 'Zonte un coment a cheste discussion',
+'tooltip-ca-addsection'           => 'Scomence une gnove sezion',
 'tooltip-ca-viewsource'           => 'Cheste pagjine e je protezude, ma tu puedis viodi la sô risultive.',
 'tooltip-ca-history'              => 'Versions precedentis di cheste pagjine.',
 'tooltip-ca-protect'              => 'Protêç cheste pagjine',
@@ -1174,6 +1293,7 @@ Sielç par plasê un altri non.',
 'tooltip-t-permalink'             => 'Leam permanent a cheste version de pagjine',
 'tooltip-ca-nstab-main'           => 'Cjale la vôs',
 'tooltip-ca-nstab-user'           => 'Cjale la pagjine dal utent',
+'tooltip-ca-nstab-media'          => 'Cjale la pagjine dal file multimediâl',
 'tooltip-ca-nstab-special'        => 'Cheste e je une pagjine speciâl e no pues jessi cambiade',
 'tooltip-ca-nstab-project'        => 'Cjale la pagjine dal progjet',
 'tooltip-ca-nstab-image'          => 'Cjale la pagjine dal file',
@@ -1192,12 +1312,12 @@ Sielç par plasê un altri non.',
 'monobook.css' => '/* modifiche chest file par personalizâ la skin monobook par dut il sît */',
 
 # Attribution
-'anonymous'        => 'Utent(s) anonim(s) di {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utent anonim|Utents anonims}} di {{SITENAME}}',
 'siteuser'         => 'Utent $1 di {{SITENAME}}',
 'lastmodifiedatby' => 'Cheste pagjine e je stade cambiade pe ultime volte a lis $2, $1 di $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basât sul lavôr di $1.',
 'others'           => 'altris',
-'siteusers'        => 'Utents  $1 di {{SITENAME}}',
+'siteusers'        => '$1, {{PLURAL:$2|utent|utents}} di {{SITENAME}}',
 'creditspage'      => 'Pagjine dai ricognossiments',
 'nocredits'        => 'Nissune informazion sui ricognossiments disponibil par cheste pagjine.',
 
@@ -1209,6 +1329,11 @@ Sielç par plasê un altri non.',
 'numauthors'     => 'Numar di autôrs diviers (vôs): $1',
 'numtalkauthors' => 'Numar di autôrs diviers (pagjine di discussion): $1',
 
+# Skin names
+'skinname-standard'  => 'Classiche',
+'skinname-nostalgia' => 'Nostalgjie',
+'skinname-modern'    => 'Moderne',
+
 # Math options
 'mw_math_png'    => 'Torne simpri PNG',
 'mw_math_simple' => 'HTML se une vore sempliç, se no PNG',
@@ -1231,7 +1356,7 @@ Sielç par plasê un altri non.',
 'show-big-image'       => 'Version a risoluzion plene',
 'show-big-image-thumb' => '<small>Dimensions di cheste anteprime: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'     => 'Galarie dai gnûfs files',
 'imagelisttext' => 'Ca sot e je une liste di $1 {{PLURAL:$1|file|files}} ordenâts $2.',
 'showhidebots'  => '($1 i bots)',
@@ -1286,7 +1411,7 @@ Se il file al è stât cambiât rispiet al so stât origjinâl, cualchi informaz
 
 # External editor support
 'edit-externally'      => 'Modifiche chest file cuntune aplicazion esterne',
-'edit-externally-help' => 'Cjale [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] par altris informazions.',
+'edit-externally-help' => '(Cjale lis [http://www.mediawiki.org/wiki/Manual:External_editors istruzions] par vê altris informazions)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'ducj',
@@ -1314,19 +1439,9 @@ Se il file al è stât cambiât rispiet al so stât origjinâl, cualchi informaz
 # Delete conflict
 'recreate' => 'Torne a creâ',
 
-# HTML dump
-'redirectingto' => 'Daûr a tornâ a indreçâ a [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'Va indevant',
 
-# AJAX search
-'searchcontaining' => "Ricercje des pagjinis che a àn dentri ''$1''.",
-'searchnamed'      => "Ricercje des pagjinis cun titul ''$1''.",
-'articletitles'    => "Ricercje des pagjinis che a scomencin cun ''$1''",
-'hideresults'      => 'Plate risultâts',
-'useajaxsearch'    => 'Dopre la ricercje AJAX',
-
 # Multipage image navigation
 'imgmultipageprev' => '� pagjine precedente',
 'imgmultipagenext' => 'pagjine sucessive →',
@@ -1373,15 +1488,22 @@ Se il file al è stât cambiât rispiet al so stât origjinâl, cualchi informaz
 'filepath-page' => 'Non dal file:',
 
 # Special:SpecialPages
-'specialpages'                 => 'Pagjinis speciâls',
-'specialpages-note'            => '----
+'specialpages'                   => 'Pagjinis speciâls',
+'specialpages-note'              => '----
 * Pagjinis speciâls no riservadis.
 * <span class="mw-specialpagerestricted">Pagjinis speciâls a ciertis categoriis di utents.</span>',
-'specialpages-group-other'     => 'Altris pagjinis speciâls',
-'specialpages-group-changes'   => 'Ultins cambiaments e regjistris',
-'specialpages-group-users'     => 'Utents e dirits',
-'specialpages-group-pages'     => 'Listis di pagjinis',
-'specialpages-group-pagetools' => 'Imprescj utii pes pagjinis',
+'specialpages-group-maintenance' => 'Rapuarts di manutenzion',
+'specialpages-group-other'       => 'Altris pagjinis speciâls',
+'specialpages-group-login'       => 'Jentrade / regjistrazion',
+'specialpages-group-changes'     => 'Ultins cambiaments e regjistris',
+'specialpages-group-media'       => 'Files multimediâi - cjamadis e rapuarts',
+'specialpages-group-users'       => 'Utents e dirits',
+'specialpages-group-highuse'     => 'Pagjinis dopradis une vore',
+'specialpages-group-pages'       => 'Listis di pagjinis',
+'specialpages-group-pagetools'   => 'Imprescj utii pes pagjinis',
+'specialpages-group-wiki'        => 'Imprescj e informazions sul progjet',
+'specialpages-group-redirects'   => 'Pagjinis speciâls di re-indreçament',
+'specialpages-group-spam'        => 'Imprescj pal spam',
 
 # Special:BlankPage
 'blankpage' => 'Pagjine vueide',
diff --git a/languages/messages/MessagesFy.php b/languages/messages/MessagesFy.php
index 73adbb67..12e469ab 100644
--- a/languages/messages/MessagesFy.php
+++ b/languages/messages/MessagesFy.php
@@ -11,11 +11,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => 'Standert',
-	'nostalgia' => 'Nostalgy',
-);
-
 $datePreferences = array(
 	'default',
 	'fy normal',
@@ -46,8 +41,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Meidogger_oerlis',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_oerlis',
-	NS_IMAGE          => 'Ofbyld',
-	NS_IMAGE_TALK     => 'Ofbyld_oerlis',
+	NS_FILE           => 'Ofbyld',
+	NS_FILE_TALK      => 'Ofbyld_oerlis',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_oerlis',
 	NS_TEMPLATE       => 'Berjocht',
@@ -63,6 +58,82 @@ $namespaceAliases = array(
 	'Brûker_oerlis' => NS_USER_TALK,
 );
 
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Dûbele trochferwizings', 'Dûbeletrochferwizings' ),
+	'BrokenRedirects'           => array( 'Misse trochferwizings', 'Missetrochferwizings' ),
+	'Disambiguations'           => array( 'Betsjuttingssiden', 'Trochferwizings' ),
+	'Userlogin'                 => array( 'Oanmelde', 'Oanmeld' ),
+	'Userlogout'                => array( 'Ofmelde', 'Ofmeld', 'ôfmelde', 'ôfmeld' ),
+	'CreateAccount'             => array( 'Nije ynstellings oanmeitsje', 'Nijeynstellingsoanmeitsje' ),
+	'Preferences'               => array( 'Ynstellings', 'Ynsteld' ),
+	'Watchlist'                 => array( 'Folchlist', 'Jo Folchlist' ),
+	'Recentchanges'             => array( 'Koartlyn feroare', 'Koarts feroare' ),
+	'Upload'                    => array( 'Bied triem oan', 'Oanbied', 'Bied bestân oan' ),
+	'Listfiles'                 => array( 'Ofbyld list', 'Ofbyldlist' ),
+	'Newimages'                 => array( 'Nije ôfbylden', 'Nije ôfbyldings', 'Nije ôfbyldingen', 'List mei nije ôfbylden', 'Nije Ofbylden' ),
+	'Listusers'                 => array( 'Meidoggerlist', 'Brûkerlist' ),
+	'Statistics'                => array( 'Statistyk' ),
+	'Randompage'                => array( 'Samar in side' ),
+	'Lonelypages'               => array( 'Lossteande siden' ),
+	'Uncategorizedpages'        => array( 'Siden sûnder rubryk', 'Siden sûnder kategory', 'Net-kategorisearre siden' ),
+	'Uncategorizedcategories'   => array( 'Kategoryen sûnder kategory', 'Rubriken sûnder rubryk', 'Net-kategorisearre kategoryen' ),
+	'Uncategorizedimages'       => array( 'Net-kategorisearre ôfbyldings', 'Ofbylden sûnder kategory', 'Ofbylden sûnder rubryk' ),
+	'Uncategorizedtemplates'    => array( 'Net-kategorisearre sjabloanen', 'Net-kategorisearre berjochten', 'Berjochten sûnder rubryk', 'Berjochten sûnder kategory' ),
+	'Unusedcategories'          => array( 'Net-brûkte kategoryen', 'Lege kategoryen' ),
+	'Unusedimages'              => array( 'Lossteande ôfbylden' ),
+	'Wantedpages'               => array( 'Nedige siden' ),
+	'Wantedcategories'          => array( 'Nedige kategoryen', 'Net-besteande kategoryen dêr\'t it meast nei ferwiisd wurdt' ),
+	'Mostlinked'                => array( 'Siden wêr it meast mei keppele is', 'Siden dêr\'t it meast nei ferwiisd wurdt' ),
+	'Mostlinkedcategories'      => array( 'Kategoryen dy\'t it meast brûkt wurde', 'Kategoryen dêr\'t it meast nei ferwiisd wurdt' ),
+	'Mostlinkedtemplates'       => array( 'Meast brûkte sjabloanen', 'Meast brûkte berjochten' ),
+	'Mostcategories'            => array( 'Siden mei de measte rubriken', 'Siden mei de measte kategoryen' ),
+	'Mostimages'                => array( 'Ofbylden dy\'t it meast brûkt wurde', 'Meast brûkte ôfbyldings' ),
+	'Mostrevisions'             => array( 'Siden mei de measte wizigings', 'Siden mei de measte bewurkings' ),
+	'Fewestrevisions'           => array( 'Siden mei de minste bewurkings', 'Siden mei de minste ferzjes', 'Siden mei de minste wizigings' ),
+	'Shortpages'                => array( 'Koarte siden' ),
+	'Longpages'                 => array( 'Lange siden' ),
+	'Newpages'                  => array( 'Nije siden' ),
+	'Ancientpages'              => array( 'Alde siden', 'âlde siden', 'Siden dy\'t lang net feroare binne' ),
+	'Deadendpages'              => array( 'Siden sûnder keppelings', 'Siden sûnder ferwizings', 'Siden sûnder links' ),
+	'Protectedpages'            => array( 'Befeilige siden', 'Skoattele siden' ),
+	'Allpages'                  => array( 'Alle titels', 'Alle siden' ),
+	'Prefixindex'               => array( 'Alle siden neffens foarheaksel' ),
+	'Ipblocklist'               => array( 'List fan útsletten Ynternet-adressen en brûkersnammen', 'List fan útsletten ynternet-adressen en meidochnammen', 'útslette brûkers', 'Utslette brûkers', 'útsletten meidoggers', 'Utsletten meidoggers' ),
+	'Specialpages'              => array( 'Bysûndere siden' ),
+	'Contributions'             => array( 'Meidogger-bydragen', 'Meidogger bydragen', 'Bydragen', 'Brûker bydragen' ),
+	'Emailuser'                 => array( 'Skriuw meidogger', 'Skriuw dizze brûker', 'Skriuw dizze meidogger' ),
+	'Confirmemail'              => array( 'Befêstigjen netpostadres' ),
+	'Whatlinkshere'             => array( 'Wat is hjirmei keppele', 'Wat is hjirmei keppele?', 'List fan alle siden dy\'t nei dizze side ferwize' ),
+	'Recentchangeslinked'       => array( 'Folgje keppelings' ),
+	'Movepage'                  => array( 'Werneam side' ),
+	'Booksources'               => array( 'Boekynformaasje' ),
+	'Categories'                => array( 'Kategoryen', 'Rubriken' ),
+	'Export'                    => array( 'Eksportearje' ),
+	'Version'                   => array( 'Ferzje', 'Programmatuerferzje' ),
+	'Allmessages'               => array( 'Alle wikiberjochten' ),
+	'Log'                       => array( 'Loch', 'Logboek', 'Logboeken', 'Lochs' ),
+	'Blockip'                   => array( 'Slút brûker út', 'Slút meidogger út' ),
+	'Undelete'                  => array( 'Side werom set' ),
+	'Import'                    => array( 'Ymport' ),
+	'Lockdb'                    => array( 'Meitsje de database \'Net-skriuwe\'', 'Meitsje de databank \'Net-skriuwe\'' ),
+	'Unlockdb'                  => array( 'Meitsje de databank skriuwber' ),
+	'Userrights'                => array( 'Meidoggerrjochten', 'Behear fan meidoggerrjochten' ),
+	'MIMEsearch'                => array( 'Sykje op MIME-type' ),
+	'Unwatchedpages'            => array( 'Siden dy\'t net op in folchlist steane' ),
+	'Listredirects'             => array( 'List fan trochferwizings' ),
+	'Unusedtemplates'           => array( 'Net brûkte sjabloanen', 'Net brûkte berjochten' ),
+	'Randomredirect'            => array( 'Samar in trochferwizing' ),
+	'Mypage'                    => array( 'Myn side' ),
+	'Mytalk'                    => array( 'Myn oerlis' ),
+	'Mycontributions'           => array( 'Myn bydragen' ),
+	'Listadmins'                => array( 'Meidoggerlist Behearders' ),
+	'Listbots'                  => array( 'Meidoggerlist Bots' ),
+	'Popularpages'              => array( 'Populêre siden', 'Grage siden' ),
+	'Search'                    => array( 'Sykje' ),
+	'Withoutinterwiki'          => array( 'Siden sûnder links nei oare talen', 'Siden sûnder ferwizings nei oare talen', 'Siden sûnder keppelings nei oare talen' ),
+	'Filepath'                  => array( 'Triempad' ),
+);
+
 $separatorTransformTable = array(',' => '.', '.' => ',' );
 $linkTrail = '/^([a-zàáèéìíòóùúâêîôûäëïöü]+)(.*)$/sDu';
 
@@ -104,17 +175,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Eigen bewurkings op myn folchlist ferbergje',
 'tog-watchlisthidebots'       => 'Lit gjin bot wizigings sjen yn de folchlist',
 'tog-watchlisthideminor'      => 'Lit gjin tekstwizigings sjen yn de folchlist',
+'tog-watchlisthideliu'        => 'Bewurkings fan oanmelde brûkers op myn folchlist ferbergje',
+'tog-watchlisthideanons'      => 'Bewurkings fa anonyme brûkers op myn folchlist ferbergje',
 'tog-nolangconversion'        => 'Fariantomsetting útskeakelje',
 'tog-ccmeonemails'            => "Stjoer my in kopy fan e-mails dy't ik nei oare brûkers stjoer",
 'tog-diffonly'                => "Side-ynhâld dy't feroare wurdt net sjen litte",
 'tog-showhiddencats'          => 'Ferburgen kategoryen werjaan',
+'tog-norollbackdiff'          => 'Feroarings weilitte nei tebekdraaien',
 
 'underline-always'  => 'Altyd',
 'underline-never'   => 'Nea',
 'underline-default' => 'Webblêder-standert',
 
-'skinpreview' => '(Proefbyld)',
-
 # Dates
 'sunday'        => 'snein',
 'monday'        => 'moandei',
@@ -208,7 +280,7 @@ $messages = array(
 'mytalk'         => 'Myn oerlis',
 'anontalk'       => 'Oerlisside foar dit IP-adres',
 'navigation'     => 'Navigaasje',
-'and'            => 'en',
+'and'            => '&#32;en',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -271,8 +343,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Oer de {{SITENAME}}',
 'aboutpage'            => 'Project:Ynfo',
-'bugreports'           => 'Brekmelding',
-'bugreportspage'       => 'Project:Brekmelding',
 'copyright'            => 'Ynhâld is beskikber ûnder de $1.',
 'copyrightpagename'    => '{{SITENAME}} auteursrjocht',
 'copyrightpage'        => '{{ns:project}}:Auteursrjocht',
@@ -295,9 +365,7 @@ $messages = array(
 
 'badaccess'        => 'Gjin tastimming',
 'badaccess-group0' => 'Jo hawwe gjin rjochten om de frege hanneling út te fieren.',
-'badaccess-group1' => "De frege hanneling is foarbehâlden oan brûkers yn'e groep $1.",
-'badaccess-group2' => "De frege hanneling is foarbehâlden oan brûkers yn ien fan'e groepen $1.",
-'badaccess-groups' => "De frege hanneling is foarbehâlden oan brûkers yn ien fan 'e groepen $1.",
+'badaccess-groups' => "De frege hanneling is foarbehâlden oan brûkers yn {{PLURAL:$2|'e groep|ien fan de groepen}}: $1.",
 
 'versionrequired'     => 'Ferzje $1 fan MediaWiki is eask',
 'versionrequiredtext' => "Ferzje $1 fan MediaWiki is eask om dizze side te brûken. Mear ynfo is beskikber op 'e side [[Special:Version|softwareferzje]].",
@@ -311,6 +379,8 @@ $messages = array(
 'editsection'             => 'bewurkje',
 'editold'                 => 'bewurkje',
 'viewsourceold'           => 'boarnetekst besjen',
+'editlink'                => 'bewurkje',
+'viewsourcelink'          => 'boarnetekst besjen',
 'editsectionhint'         => 'Dielside bewurkje: $1',
 'toc'                     => 'Ynhâld',
 'showtoc'                 => 'sjen litte',
@@ -392,8 +462,6 @@ Meitsje dêr melding fan by in [[Special:ListUsers/sysop|systeembehearder]] fan
 'cannotdelete'         => 'Koe de oantsjutte side of it oantsjutte ôfbyld net wiskje. (Faaks hat in oar dat al dien.)',
 'badtitle'             => 'Misse titel',
 'badtitletext'         => 'De opfrege sidetitel wie ûnjildich, leech, of in miskeppele yntertaal of ynterwiki titel.',
-'perfdisabled'         => "Sorry! Dit ûnderdiel is tydlik út set om't it de databank sa starich makket
-dat gjinien de wiki brûke kin.",
 'perfcached'           => "Dit is bewarre ynformaasje dy't mooglik ferâldere is.",
 'perfcachedts'         => 'De neikommende gegevens komme út de bewarre ynformaasje, dizze is it lêst fernijd op $1.',
 'querypage-no-updates' => 'Dizze side kin net bywurke wurde. Dizze gegevens wurde net ferfarske.',
@@ -407,7 +475,7 @@ Query: $2',
 'protectedpagetext'    => 'Dizze side is befeilige. Bewurkjen is net mûglik.',
 'viewsourcetext'       => 'Jo kinne de boarnetekst fan dizze side besjen en kopiearje:',
 'protectedinterface'   => "Dizze side befettet tekst foar berjochten fan 'e software en is befeilige om misbrûk tefoaren te kommen.",
-'editinginterface'     => "'''Warskôging;''' Jo bewurkje in side dy't brûkt wurdt troch software. Bewurkings op dizze side beynfloedzje de gebrûksynterface fan elkenien. Oerweagje foar oersettings [http://translatewiki.net/wiki/Main_Page?setlang=fy Betawiki] te brûken, it oersetprojekt foar MediaWiki.",
+'editinginterface'     => "'''Warskôging;''' Jo bewurkje in side dy't brûkt wurdt troch software. Bewurkings op dizze side beynfloedzje de gebrûksynterface fan elkenien. Oerweagje foar oersettings [http://translatewiki.net/wiki/Main_Page?setlang=fy translatewiki.net] te brûken, it oersetprojekt foar MediaWiki.",
 'sqlhidden'            => '(SQL query ferburgen)',
 'cascadeprotected'     => 'Dizze side is skoattele tsjin wizigjen, om\'t der in ûnderdiel útmakket fan de neikommende {{PLURAL:$1|side|siden}}, dy\'t skoattele {{PLURAL:$1|is|binne}} mei de "ûnderlizzende siden" opsje ynskeakele: $2',
 'namespaceprotected'   => "Jo hawwe gjin rjochten om siden yn'e nammerûmte '''$1''' te bewurkjen.",
@@ -417,13 +485,13 @@ Query: $2',
 De oanfierde reden is ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Minne konfiguraasje: ûnbekende virusscanner: <i>$1</i>',
+'virus-badscanner'     => "Minne konfiguraasje: ûnbekende virusscanner: ''$1''",
 'virus-scanfailed'     => 'scannen is mislearre (koade $1)',
 'virus-unknownscanner' => 'ûnbekend antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Ofmelde',
-'logouttext'                 => "<strong>Jo binne no ôfmeld.</strong>
+'logouttext'                 => "'''Jo binne no ôfmeld.'''
 
 Jo kinne de {{SITENAME}} fierders anonym brûke,
 of jo op 'e [[Special:UserLogin|nij oanmelde]] ûnder deselde of in oare namme.
@@ -437,7 +505,6 @@ Ferjit net se oan jo foarkar oan te passen.',
 'remembermypassword'         => 'Oare kear fansels oanmelde.',
 'yourdomainname'             => 'Jo domein:',
 'externaldberror'            => 'Der is in fout by it oanmelden by de database of jo hawwe gjin tastimming om jo ekstern account by te wurkjen.',
-'loginproblem'               => '<b>Der wie wat mis mei jo oanmelden.</b><br />Besykje it nochris, a.j.w.',
 'login'                      => 'Oanmelde',
 'nav-login-createaccount'    => 'Oanmelde',
 'loginprompt'                => "Jo moatte 'cookies' oanstean hawwe om yn jo oan te melden by {{SITENAME}}.",
@@ -495,8 +562,8 @@ As immen oars as Jo dit fersyk dien hat of as it wachtwurd Jo yntuskentiid wer y
 'throttled-mailpassword'     => "Yn {{PLURAL:$1|de lêste oere|de lêste $1 oeren}} is der al in wachtwurdwink ferstjoerd.
 Om misbrûk tefoaren te kommen wurdt der mar ien wachtwurdwink yn 'e {{PLURAL:$1|oere|$1 oeren}} ferstjoerd.",
 'mailerror'                  => 'Fout by it ferstjoeren fan e-mail: $1',
-'acct_creation_throttle_hit' => 'Sorry, jo hawwe al $1 meidochnammen oanmakke; jo kinne net mear oanmeitsje.',
-'emailauthenticated'         => 'Jo netpostadres waard befêstige op $1.',
+'acct_creation_throttle_hit' => 'Jo hawwe al {{PLURAL:$1|1 meidochnamme|$1 meidochnammen}} oanmakke. Jo kinne net mear oanmeitsje.',
+'emailauthenticated'         => 'Jo netpostadres waard befêstige op $2 om $3.',
 'emailnotauthenticated'      => 'Jo netpostadres is <strong>noch net befêstige</strong>. Jo kinne oare brûkers gjin post stjoere, en foar de neikommende opsjes wurdt jo gjin post stjoerd.',
 'noemailprefs'               => 'Jou in e-mailadres op om dizze funksjes te brûken.',
 'emailconfirmlink'           => 'Befêstigje jo netpostadres.',
@@ -508,17 +575,26 @@ Jou beleaven in jildich e-mailadres op of lit it fjild leech.",
 'createaccount-text'         => 'Immen hat in brûker op {{SITENAME}} ($4) oanmakke mei de namme "$2" en jo e-mailadres. It wachtwurd foar "$2" is "$3". Meld jo oan en feroarje jo wachtwurd.
 
 Negearje it berjocht as dizze brûker sûnder jo meiwitten oanmakke is.',
+'login-throttled'            => "Jo hawwe koartlyn te faak besocht oan te melden mei in ûnkrekt wachtwurd.
+Jo moatte efkes wachtsje foar't jo it op'e nij besykje kinne.",
 'loginlanguagelabel'         => 'Taal: $1',
 
 # Password reset dialog
-'resetpass'               => 'Wachtwurd opnij ynstelle',
-'resetpass_announce'      => "Jo binne oanmeld mei in tydlike koade dy't jo per e-mail tastjoerd is. Fier in nij wachtwurd yn om it oanmelden ôf te meitsjen.",
-'resetpass_header'        => "Wachtwurd op 'e nij ynstelle",
-'resetpass_submit'        => 'Wachtwurd ynstelle en oanmelde',
-'resetpass_success'       => 'Jo wachtwurd is feroare. Dwaande mei oanmelden ...',
-'resetpass_bad_temporary' => 'Unjildich tydlik wachtwurd. Jo hawwe jo wachtwurd al feroare of in nij tydlik wachtwurd oanfrege.',
-'resetpass_forbidden'     => 'Wachtwurden kinne net feroare wurde',
-'resetpass_missing'       => 'Jo hawwe gjin wachtwurd ynjûn.',
+'resetpass'                 => 'Wachtwurd feroarje',
+'resetpass_announce'        => "Jo binne oanmeld mei in tydlike koade dy't jo per e-mail tastjoerd is. Fier in nij wachtwurd yn om it oanmelden ôf te meitsjen.",
+'resetpass_header'          => 'Wachtwurd feroarje',
+'oldpassword'               => 'Ald wachtwurd',
+'newpassword'               => 'Nij wachtwurd',
+'retypenew'                 => 'Nij wachtwurd (nochris)',
+'resetpass_submit'          => 'Wachtwurd ynstelle en oanmelde',
+'resetpass_success'         => 'Jo wachtwurd is feroare. Dwaande mei oanmelden ...',
+'resetpass_bad_temporary'   => 'Unjildich tydlik wachtwurd. Jo hawwe jo wachtwurd al feroare of in nij tydlik wachtwurd oanfrege.',
+'resetpass_forbidden'       => 'Wachtwurden kinne net feroare wurde',
+'resetpass-no-info'         => "Jo moatte oanmeld wêze foar't Jo dizze side brûke kinne.",
+'resetpass-submit-loggedin' => 'Wachtwurd feroarje',
+'resetpass-wrong-oldpass'   => 'It momintele of tydlike wachtwurd is ûnjildich.
+Mûglik hawwe Jo Jo wachtwurd al feroare of in nij tydlik wachtwurd oanfrege.',
+'resetpass-temp-password'   => 'Tydlik wachtwurd:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fette tekst',
@@ -541,8 +617,8 @@ Negearje it berjocht as dizze brûker sûnder jo meiwitten oanmakke is.',
 'hr_tip'          => 'Horizontale line (mei ferdrach brûke)',
 
 # Edit pages
-'summary'                          => 'Gearfetting',
-'subject'                          => 'Mêd',
+'summary'                          => 'Gearfetting:',
+'subject'                          => 'Mêd:',
 'minoredit'                        => 'Dit is in tekstwiziging',
 'watchthis'                        => 'Folgje dizze side',
 'savearticle'                      => 'Fêstlizze',
@@ -554,8 +630,8 @@ Negearje it berjocht as dizze brûker sûnder jo meiwitten oanmakke is.',
 'missingsummary'                   => "'''Wink:''' jo hawwe gjin gearfetting jûn foar jo bewurking. As jo nochris op ''Side opslaan'' klikke wurdt de bewurking sûnder gearfetting opslein.",
 'missingcommenttext'               => 'Set jo opmerking beleaven hjir ûnder.',
 'missingcommentheader'             => "'''Tink derom:''' Jo hawwe gjin ûnderwerp/kop foar dizze opmerking opjûn. As jo op 'e nij op \"opslaan\" klikke, wurdt jo feroaring sûnder in ûnderwerp/kop opslein.",
-'summary-preview'                  => 'Gearfetting sa at dy brûkt wurdt',
-'subject-preview'                  => 'Neisjen ûnderwerp/kop',
+'summary-preview'                  => 'Gearfetting sa at dy brûkt wurdt:',
+'subject-preview'                  => 'Neisjen ûnderwerp/kop:',
 'blockedtitle'                     => 'Meidogger is útsletten troch',
 'blockedtext'                      => "<big>'''Jo meidoggernamme of Ynternet-adres is útsletten.'''</big>
 
@@ -608,25 +684,25 @@ Kontrolearje oft jo dizze side wol oanmeitsje/bewurkje wolle.',
 'clearyourcache'                   => "'''Opmerking:''' Nei it fêstlizzen kin it nedich wêze de oerslach fan dyn blêder te leegjen foardat de wizigings te sjen binne.
 
 '''Mozilla / Firefox / Safari:''' hâld ''Shift'' yntreaun wylst jo op ''Dizze side fernije'' klikke, of typ ''Ctrl-F5'' of ''Ctrl-R'' (''Command-R'' op in Macintosh); '''Konqueror: '''klik ''Reload'' of typ ''F5;'' '''Opera:''' leegje jo cache yn ''Extra → Voorkeuren;'' '''Internet Explorer:''' hâld ''Ctrl'' yntreaun wylst jo ''Vernieuwen'' klikke of typ ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Brûk de knop 'Earst oerlêze' om jo nije CSS/JS te testen foar it fêstlizzen.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Brûk de knop 'Earst oerlêze' om jo nije CSS/JS te testen foar it fêstlizzen.",
 'usercsspreview'                   => "'''Dit is allinne mar it oerlêzen fan jo persoanlike CSS. Hy is noch net fêstlein!'''",
 'userjspreview'                    => "'''Tink derom: jo besjogge no jo persoanlike JavaScript. De side is net fêstlein!'''",
 'userinvalidcssjstitle'            => "'''Warskôging:''' der is gjin skin \"\$1\". Tink derom: jo eigen .css- en .js-siden begjinne mei in lytse letter, bygelyks {{ns:user}}:Namme/monobook.css ynsté fan {{ns:user}}:Namme/Monobook.css.",
 'updated'                          => '(Bewurke)',
-'note'                             => '<strong>Opmerking:</strong>',
-'previewnote'                      => '<strong>Tink der om dat dizze side noch net fêstlein is!</strong>',
+'note'                             => "'''Opmerking:'''",
+'previewnote'                      => "'''Tink der om dat dizze side noch net fêstlein is!'''",
 'previewconflict'                  => 'Dizze side belanget allinich it earste bewurkingsfjild oan.',
-'session_fail_preview'             => "<strong>Jo bewurking is net ferwurke, om't de sessygegevens ferlern gien binne.
-Besykje it nochris. As it dan noch net slagget, [[Special:UserLogout|meld jo dan ôf]] en wer oan.</strong>",
-'session_fail_preview_html'        => "<strong>Jo bewurking is net ferwurke, om't sesjegegevens ferlern gien binne.</strong>
+'session_fail_preview'             => "'''Jo bewurking is net ferwurke, om't de sessygegevens ferlern gien binne.
+Besykje it nochris. As it dan noch net slagget, [[Special:UserLogout|meld jo dan ôf]] en wer oan.'''",
+'session_fail_preview_html'        => "'''Jo bewurking is net ferwurke, om't sesjegegevens ferlern gien binne.'''
 
 ''Om't yn {{SITENAME}} rûge HTML ynskeakele is, is in foarfertoaning net mûglik as beskerming tsjin oanfallen mei JavaScript.''
 
-<strong>As dit in legitime bewurking is, besykje it dan fannijs.
-As it dan  noch net slagget, [[Special:UserLogout|meld jo dan ôf]] en wer oan.</strong>",
-'token_suffix_mismatch'            => "<strong>Jo bewurking is wegere om't jo blêder de lêstekens yn it bewurkingstoken ûnkrekt behannele hat.
+'''As dit in legitime bewurking is, besykje it dan fannijs.
+As it dan  noch net slagget, [[Special:UserLogout|meld jo dan ôf]] en wer oan.'''",
+'token_suffix_mismatch'            => "'''Jo bewurking is wegere om't jo blêder de lêstekens yn it bewurkingstoken ûnkrekt behannele hat.
 De bewurking is wegere om skeinen fan 'e sidetekst tefoaren te kommen.
-Dat bart soms as der in webbasearre proxytsjinst brûkt wurdt dy't flaters befettet.</strong>",
+Dat bart soms as der in webbasearre proxytsjinst brûkt wurdt dy't flaters befettet.'''",
 'editing'                          => 'Bewurkje "$1"',
 'editingsection'                   => 'Bewurkje $1 (seksje)',
 'editingcomment'                   => 'Dwaande mei bewurkjen fan $1 (opmerking)',
@@ -634,30 +710,30 @@ Dat bart soms as der in webbasearre proxytsjinst brûkt wurdt dy't flaters befet
 'explainconflict'                  => "In oar hat de side feroare sûnt jo begûn binne mei it bewurkjen. It earste bewurkingsfjild is hoe't de tekst wilens wurden is. Jo feroarings stean yn it twadde fjild. Dy wurde allinnich tapast safier as jo se yn it earste fjild ynpasse. <b>Allinnich</b> de tekst út it earste fjild kin fêstlein wurde. <p>",
 'yourtext'                         => 'Jo tekst',
 'storedversion'                    => 'Fêstleine ferzje',
-'nonunicodebrowser'                => '<strong>WARSKOGING: Jo browser kin net goed oer de wei mei unicode.
-Dêr wurdt troch de MediaWiki software rekken mei holden, dat Jo kinne dan dochs sûnder problemen siden bewurkje: net-ASCII tekens wurden yn it bewurkingsfjild werjûn as heksadesimale koades.</strong>',
-'editingold'                       => '<strong>Warskôging: Jo binne dwaande mei in âldere ferzje fan dizze side.
-Soene jo dy fêstlizze, dan is alles wei wat sûnt dy tiid feroare is.</strong>',
+'nonunicodebrowser'                => "'''WARSKOGING: Jo browser kin net goed oer de wei mei unicode.
+Dêr wurdt troch de MediaWiki software rekken mei holden, dat Jo kinne dan dochs sûnder problemen siden bewurkje: net-ASCII tekens wurden yn it bewurkingsfjild werjûn as heksadesimale koades.'''",
+'editingold'                       => "'''Warskôging: Jo binne dwaande mei in âldere ferzje fan dizze side.
+Soene jo dy fêstlizze, dan is alles wei wat sûnt dy tiid feroare is.'''",
 'yourdiff'                         => 'Feroarings',
 'copyrightwarning'                 => "Tink derom dat alle bydragen oan {{SITENAME}} beskôge wurde frijjûn te wêzen ûnder de $2 (sjoch $1 foar bysûnderheden). As jo net wolle dat jo tekst troch oaren neffens eigen goedfinen bewurke en ferspraat wurde kin, kies dan net foar 'Side Bewarje'.</br>
 Hjirby sizze jo tagelyk ta, dat jo dizze tekst sels skreaun hawwe, of oernommen hawwe út in frije, iepenbiere boarne.</br/>
-<strong>BRûK GJIN MATERIAAL DAT BESKERME WURDT TROCH AUTERURSRJOCHT, OF JO MOATTE DêR TASTIMMING TA HAWWE!</STRONG>",
-'copyrightwarning2'                => 'Al jo bydragen oan {{SITENAME}} kinne bewurke, feroare of fuorthelle wurde troch oare brûkers.
+'''BRûK GJIN MATERIAAL DAT BESKERME WURDT TROCH AUTERURSRJOCHT, OF JO MOATTE DêR TASTIMMING TA HAWWE!</STRONG>",
+'copyrightwarning2'                => "Al jo bydragen oan {{SITENAME}} kinne bewurke, feroare of fuorthelle wurde troch oare brûkers.
 As jo net wolle dat jo teksten yngeand oanpast wurde troch oaren, set se hjir dan net.<br />
 Jo sizze ek ta dat jo de oarspronklike auteur binne fan dit materiaal, of dat jo it kopiearre hawwe út in boarne yn it publike domein, of in soartgelikense frije boarne (sjuch $1 foar details).
-<strong>BRUK GJIN MATERIAAL DAT BESKERME WURDT TROCH AUTEURSRJOCHT, OF JO MOATTE DER TASTIMMING FOAR HAWWE!</strong>',
-'longpagewarning'                  => "<strong>Warskôging: Dizze side is $1 kilobyte lang;
+'''BRUK GJIN MATERIAAL DAT BESKERME WURDT TROCH AUTEURSRJOCHT, OF JO MOATTE DER TASTIMMING FOAR HAWWE!'''",
+'longpagewarning'                  => "'''Warskôging: Dizze side is $1 kilobyte lang;
 der binne blêders dy't problemen hawwe mei siden fan tsjin de 32 kb of langer.
-Besykje de side yn lytsere stikken te brekken.</strong>",
-'longpageerror'                    => "<strong>FOUT: de tekst dy't jo tafoege hawwe is $1 kilobyte grut, wat grutter is as it maksimum fan $2 kilobytes.
-Bewarjen is net mûglik.</strong>",
-'readonlywarning'                  => '<strong>Waarskôging: De databank is ôfsletten foar
-ûnderhâld, dus jo kinne jo bewurkings no net fêstlizze.
-It wie baas en nim de tekst foar letter oer yn in tekstbestân.</strong>',
-'protectedpagewarning'             => '<strong>Waarskôging: Dizze side is beskerme, dat gewoane brûkers dy net bewurkje kinne.</strong>',
+Besykje de side yn lytsere stikken te brekken.'''",
+'longpageerror'                    => "'''FOUT: de tekst dy't jo tafoege hawwe is $1 kilobyte grut, wat grutter is as it maksimum fan $2 kilobytes.
+Bewarjen is net mûglik.'''",
+'readonlywarning'                  => "'''Warskôging: De databank is ôfsletten foar ûnderhâld, dus jo kinne jo bewurkings no net fêstlizze. Bewarje de tekst foar lettere pleatsing yn in teksttriem.'''
+
+In  behearder hat de database blokkearre om de folgjende reden: $1",
+'protectedpagewarning'             => "'''Waarskôging: Dizze side is beskerme, dat gewoane brûkers dy net bewurkje kinne.'''",
 'semiprotectedpagewarning'         => "'''Tink derom:''' dizze side is befeilige en kin allinne troch registrearre brûkers bewurke wurde.",
 'cascadeprotectedwarning'          => "'''Warskôging:''' Dizze side is skoattele sadat allinnich behearders de side wizigje kinne, om't der in ûnderdiel útmakket fan de neikommende {{PLURAL:\$1|side|siden}}, dy't skoattele binne mei de \"ûnderlizzende siden\" opsje ynskeakele:",
-'titleprotectedwarning'            => '<strong>WARSKÔGING: Dizze side is befeilige, dat allinne inkelde brûkers kinne him oanmeitsje.</strong>',
+'titleprotectedwarning'            => "'''WARSKÔGING: Dizze side is befeilige, dat allinne inkelde brûkers kinne him oanmeitsje.'''",
 'templatesused'                    => 'Berjochten brûkt op dizze side:',
 'templatesusedpreview'             => 'Yn dit proefbyld sjabloanen:',
 'templatesusedsection'             => "Sjabloanen dy't brûkt wurde yn dizze subkop:",
@@ -676,11 +752,21 @@ Jo kinne al besteande siden feroarje of jo kinne [[Special:UserLogin|jo oanmelde
 'recreate-deleted-warn'            => "'''Warskôging: Jo binne dwaande in side oan te meitsjen dy't earder weidien is.'''
 
 Betink oft it gaadlik is dat jo dizze side fierder bewurkje. Foar jo geriif stiet hjirûnder it lochboek oer it weidwaan fan dizze side:",
+'deleted-notice'                   => 'Dizze side is fuorthelle. It fuorthel-logboek fan dizze side wurdt hjirûnder werjûn foar jo ynformaasje.',
+'deletelog-fulllog'                => 'Folslein logboek besjen',
+'edit-hook-aborted'                => 'De bewurking is ôfbrutsen troch in hook.
+Der is gjin taljochting beskikber.',
+'edit-gone-missing'                => 'De side kin net bywurke wurde.
+Hy liket fuorthelle te wezen.',
+'edit-conflict'                    => 'Bewurkingskonflikt.',
+'edit-no-change'                   => "Dyn bewurking is is net trochfierd, om 't der gjin feroaring yn 'e tekst oanbrocht is.",
+'edit-already-exists'              => 'De side is net oanmakke.
+Hy bestie al.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Warskôging: Dizze side brûkt tefolle kostbere parserfunksjes.
 
-No binne it $1, wylst it minder as $2 wêze moatte.',
+Wylst it minder as $2 {{PLURAL:$2|parserfunksje|parserfunksjes}} wêze moatte, no {{PLURAL:$1|is it $1 |binne it $1}}',
 'expensive-parserfunction-category'       => "Siden dy't tefolle kostbere parserfuksjes brûke",
 'post-expand-template-inclusion-warning'  => 'Warskôging: jo geane oer de maksimale opnamegrutte foar sjabloanen.
 Guon sjabloanen wurden net opnommen.',
@@ -688,6 +774,8 @@ Guon sjabloanen wurden net opnommen.',
 'post-expand-template-argument-warning'   => 'Warskôging: Dizze side befettet minstens ien sjabloanparameter mei in te grutte opnamegrutte.
 Dy parameters binne weilitten.',
 'post-expand-template-argument-category'  => "Siden dy't missende sjabloaneleminten befetsje",
+'parser-template-loop-warning'            => 'Der is in lus yn sjabloanen fûn: [[$1]]',
+'parser-template-recursion-depth-warning' => 'De werhellingsdjipte foar sjabloanen is oer de grins ($1)',
 
 # "Undo" feature
 'undo-success' => 'De feroaring kin werom set wurde. Kontrolearje de ferliking hjirûnder om wis te wêzen dat jo dit feroarje wolle en druk dan op fêstlizze om it werom setten troch te fieren.',
@@ -702,29 +790,28 @@ Dy parameters binne weilitten.',
 De fan $3 opjûne reden is ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Lochboek foar dizze side sjen litte',
-'nohistory'           => 'Dit is de earste ferzje fan de side.',
-'revnotfound'         => 'Ferzje net fûn',
-'revnotfoundtext'     => "De âlde ferzje fan dizze side dêr't jo om frege hawwe, is der net.
-Gean nei of de keppeling dy jo brûkt hawwe wol goed is.",
-'currentrev'          => 'Aktuele ferzje',
-'revisionasof'        => 'Ferzje op $1',
-'revision-info'       => 'Ferzje op $1 fan $2',
-'previousrevision'    => '�Eardere ferskillen',
-'nextrevision'        => 'Nijere ferzje→',
-'currentrevisionlink' => 'Rinnende ferzje',
-'cur'                 => 'no',
-'next'                => 'dan',
-'last'                => 'doe',
-'page_first'          => 'earste',
-'page_last'           => 'lêste',
-'histlegend'          => "Utlis: (no) = ferskil mei de side sa't dy no is,
+'viewpagelogs'           => 'Lochboek foar dizze side sjen litte',
+'nohistory'              => 'Dit is de earste ferzje fan de side.',
+'currentrev'             => 'Aktuele ferzje',
+'currentrev-asof'        => 'Hjoeddeiske ferzje sûnt $1',
+'revisionasof'           => 'Ferzje op $1',
+'revision-info'          => 'Ferzje op $1 fan $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Eardere ferskillen',
+'nextrevision'           => 'Nijere ferzje→',
+'currentrevisionlink'    => 'Rinnende ferzje',
+'cur'                    => 'no',
+'next'                   => 'dan',
+'last'                   => 'doe',
+'page_first'             => 'earste',
+'page_last'              => 'lêste',
+'histlegend'             => "Utlis: (no) = ferskil mei de side sa't dy no is,
 (doe) = ferskill mei de side sa't er doe wie, foar de feroaring, T = Tekstwiziging",
-'deletedrev'          => '[fuorthelle]',
-'histfirst'           => 'Ierst',
-'histlast'            => 'Lêst',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(leech)',
+'history-fieldset-title' => 'Troch skiednis blêdzje',
+'deletedrev'             => '[fuorthelle]',
+'histfirst'              => 'Ierst',
+'histlast'               => 'Lêst',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(leech)',
 
 # Revision feed
 'history-feed-title'          => 'Sideskiednis',
@@ -807,6 +894,7 @@ Tink derom it brûken fan de navigaasjeferwizings dy kolom op'e nij ynstelt.",
 'mergehistory-invalid-destination' => 'De titel fan de doelside moet jildich wêze.',
 'mergehistory-autocomment'         => '[[:$1]] kombinearre mei [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] kombinearre mei [[:$2]]: $3',
+'mergehistory-same-destination'    => 'De boarneside en de doelside kinne net deselde wêze',
 
 # Merge log
 'mergelog'           => 'Gearfoegingslogboek',
@@ -819,124 +907,206 @@ Tink derom it brûken fan de navigaasjeferwizings dy kolom op'e nij ynstelt.",
 'difference'              => '(Ferskil tusken ferzjes)',
 'lineno'                  => 'Rigel $1:',
 'compareselectedversions' => 'Ferlykje selektearre ferzjes',
+'visualcomparison'        => 'Fisuele ferliking',
+'wikicodecomparison'      => 'Wikitekstferliking',
 'editundo'                => 'werom sette',
 'diff-multi'              => '({{PLURAL:$1|Ien tuskenlizzende ferzje wurdt|$1 tuskenlizzende ferzjes wurde}} net sjen litten.)',
+'diff-movedto'            => 'Oerbrocht nei $1',
+'diff-styleadded'         => 'styl $1 tafoege',
+'diff-added'              => '$1 tafoege',
+'diff-changedto'          => 'feroare ta $1',
+'diff-movedoutof'         => 'oerbrocht bûten $1',
+'diff-styleremoved'       => 'styl $1 fuorthelle',
+'diff-removed'            => '$1 fuorthelle',
+'diff-changedfrom'        => 'feroare fan $1',
+'diff-src'                => 'boarne',
+'diff-withdestination'    => 'mei bestimming $1',
+'diff-with'               => '&#32;mei $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;en $1 $2',
+'diff-width'              => 'breedte',
+'diff-height'             => 'hichte',
+'diff-p'                  => "in '''paragraaf'''",
+'diff-blockquote'         => "in '''heakje'''",
+'diff-h1'                 => "in '''kopke (nivo 1)'''",
+'diff-h2'                 => "in '''kopke (nivo 2)'''",
+'diff-h3'                 => "in '''kopke (nivo 3)'''",
+'diff-h4'                 => "in '''kopke (nivo 4)'''",
+'diff-h5'                 => "in '''kopke (nivo 5)'''",
+'diff-pre'                => "in '''foarformattearre tekstblok'''",
+'diff-div'                => "in '''dieling'''",
+'diff-ul'                 => "in '''net nûmere list'''",
+'diff-ol'                 => "in '''nûmere list'''",
+'diff-li'                 => "in '''list-item'''",
+'diff-table'              => "in '''tabel'''",
+'diff-tbody'              => "in '''tabel-ynhâld'''",
+'diff-tr'                 => "in '''rij'''",
+'diff-td'                 => "in '''sel'''",
+'diff-th'                 => "in '''kolomkop'''",
+'diff-br'                 => "in '''nije rigel'''",
+'diff-hr'                 => "in '''horizontale line'''",
+'diff-code'               => "in '''tekstblok mei programmakoade'''",
+'diff-dl'                 => "in '''list fan definysjes'''",
+'diff-dt'                 => "in '''te definiearjen term'''",
+'diff-dd'                 => "in '''definysje'''",
+'diff-input'              => "in '''input'''",
+'diff-form'               => "in '''formulier'''",
+'diff-img'                => "in '''ôfbylding'''",
+'diff-span'               => "in '''span'''",
+'diff-a'                  => "in '''keppeling'''",
+'diff-i'                  => "'''skeanprinte'''",
+'diff-b'                  => "'''fet'''",
+'diff-strong'             => "'''tsjûk'''",
+'diff-em'                 => "'''klam'''",
+'diff-font'               => "'''lettertype'''",
+'diff-big'                => "'''grut'''",
+'diff-del'                => "'''wiske'''",
+'diff-tt'                 => "'''fêste breedte'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''skrast'''",
 
 # Search results
-'searchresults'             => 'Sykresultaat',
-'searchresulttext'          => 'Lês foar mear ynformaasje oer it sykjen yn de {{SITENAME}} de [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Foar fraach "[[:$1]]"',
-'searchsubtitleinvalid'     => 'Foar fraach "$1"',
-'noexactmatch'              => "'''Der is gjin side mei krekt de titel \"\$1\".'''
+'searchresults'                    => 'Sykresultaat',
+'searchresults-title'              => 'Sykresultaten foar "$1"',
+'searchresulttext'                 => 'Lês foar mear ynformaasje oer it sykjen yn de {{SITENAME}} de [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Foar fraach "[[:$1]]"',
+'searchsubtitleinvalid'            => 'Foar fraach "$1"',
+'noexactmatch'                     => "'''Der is gjin side mei krekt de titel \"\$1\".'''
 Jo kinne de [[:\$1|side oanmeitsje]].",
-'noexactmatch-nocreate'     => "'''Der is gjin side mei krekt de titel \"\$1\".'''",
-'toomanymatches'            => 'Der wiene tefolle resultaten.
+'noexactmatch-nocreate'            => "'''Der is gjin side mei krekt de titel \"\$1\".'''",
+'toomanymatches'                   => 'Der wiene tefolle resultaten.
 Prebearje in oare sykopdracht.',
-'titlematches'              => 'Titels',
-'notitlematches'            => 'Gjin titels',
-'textmatches'               => 'Siden',
-'notextmatches'             => 'Gjin siden',
-'prevn'                     => 'foarige $1',
-'nextn'                     => 'folgende $1',
-'viewprevnext'              => '($1) ($2) ($3) besjen.',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 wurd|$2 wurden}})',
-'search-result-score'       => 'Relevante: $1%',
-'search-redirect'           => '(trochferwizing $1)',
-'search-section'            => '(seksje $1)',
-'search-suggest'            => 'Bedoele jo: $1',
-'search-interwiki-caption'  => 'Susterprojekten',
-'search-interwiki-default'  => '$1 resultaten:',
-'search-interwiki-more'     => '(mear)',
-'search-mwsuggest-enabled'  => 'mei suggestjes',
-'search-mwsuggest-disabled' => 'gjin suggestjes',
-'search-relatedarticle'     => 'Besibbe',
-'mwsuggest-disable'         => 'Suggestjes fia AJAX útskeakelje',
-'searchrelated'             => 'besibbe',
-'searchall'                 => 'alle',
-'showingresults'            => "{{PLURAL:$1|'''1''' resultaat|'''$1''' resultaten}} fan #'''$2''' ôf.",
-'showingresultsnum'         => "{{PLURAL:$3|'''1''' resultaat|'''$3''' resultaten}} fan #'''$2''' ôf.",
-'showingresultstotal'       => "It binne hjirûnder  {{PLURAL:$3|resultaat '''$1''' fan '''$3'''|resultaten '''$1 - $2''' fan '''$3'''}}",
-'nonefound'                 => 'As der gjin resultaten binne, tink der dan om dat der <b>net</b> socht
-wurde kin om wurden as "it" en "in", om\'t dy net byhâlden wurde, en dat as der mear
-wurden syke wurde, allinnich siden fûn wurde wêr\'t <b>alle</b> worden op fûn wurde.',
-'powersearch'               => 'Sykje',
-'powersearch-legend'        => 'Sykje',
-'powersearch-ns'            => 'Sykje op nammeromten:',
-'powersearch-redir'         => 'Trochferwizings werjaan',
-'powersearch-field'         => 'Sykje op',
-'search-external'           => 'Ekstern sykjen',
-'searchdisabled'            => '<p>Op it stuit stiet it trochsykjen fan tekst út omdat dizze funksje tefolle kompjûterkapasiteit ferget. As we nije apparatuer krije, en dy is ûnderweis, dan wurdt dizze funksje wer aktyf. Oant salang kinne jo sykje fia Google:</p>',
+'titlematches'                     => 'Titels',
+'notitlematches'                   => 'Gjin titels',
+'textmatches'                      => 'Siden',
+'notextmatches'                    => 'Gjin siden',
+'prevn'                            => 'foarige $1',
+'nextn'                            => 'folgende $1',
+'viewprevnext'                     => '($1) ($2) ($3) besjen.',
+'searchmenu-legend'                => 'Sykopsjes',
+'searchmenu-exists'                => "'''Der is in side mei namme \"[[:\$1]]\" yn dizze wiki'''",
+'searchmenu-new'                   => "'''Meitsje de side \"[[:\$1]]\" yn dizze wiki!'''",
+'searchhelp-url'                   => 'Help:Help',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Sidenammen mei dit foarheaksel werjaan]]',
+'searchprofile-articles'           => 'Ynhâldlike siden',
+'searchprofile-articles-and-proj'  => 'Ynhâldlike en projektsiden',
+'searchprofile-project'            => 'Projektsiden',
+'searchprofile-images'             => 'Triemmen',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Utwreide',
+'searchprofile-articles-tooltip'   => 'Sykje yn $1',
+'searchprofile-project-tooltip'    => 'Sykje yn $1',
+'searchprofile-images-tooltip'     => 'Sykje om triemmen',
+'searchprofile-everything-tooltip' => 'Alle ynhâld trochsykje (ynklusyf oerlissiden)',
+'searchprofile-advanced-tooltip'   => 'Sykje yn oanjûne nammerûmten',
+'prefs-search-nsdefault'           => 'Sykje mei standertynstellings:',
+'prefs-search-nscustom'            => 'Sykje yn oanjûne nammerûmten:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 wurd|$2 wurden}})',
+'search-result-score'              => 'Relevante: $1%',
+'search-redirect'                  => '(trochferwizing $1)',
+'search-section'                   => '(seksje $1)',
+'search-suggest'                   => 'Bedoele jo: $1',
+'search-interwiki-caption'         => 'Susterprojekten',
+'search-interwiki-default'         => '$1 resultaten:',
+'search-interwiki-more'            => '(mear)',
+'search-mwsuggest-enabled'         => 'mei suggestjes',
+'search-mwsuggest-disabled'        => 'gjin suggestjes',
+'search-relatedarticle'            => 'Besibbe',
+'mwsuggest-disable'                => 'Suggestjes fia AJAX útskeakelje',
+'searchrelated'                    => 'besibbe',
+'searchall'                        => 'alle',
+'showingresults'                   => "{{PLURAL:$1|'''1''' resultaat|'''$1''' resultaten}} fan #'''$2''' ôf.",
+'showingresultsnum'                => "{{PLURAL:$3|'''1''' resultaat|'''$3''' resultaten}} fan #'''$2''' ôf.",
+'showingresultstotal'              => "It binne hjirûnder  {{PLURAL:$4|resultaat '''$1''' fan '''$3'''|resultaten '''$1 - $2''' fan '''$3'''}}",
+'nonefound'                        => "'''Opmerking''': standert wurde net alle nammerûmten trochsocht.
+As Jo yn Jo sykopdracht as foarheaksel \"''all:''\" brûke, wurde alle siden trochsocht (ynklusyf oerlissiden, sjabloanen ens.).
+Jo kinne ek in nammerûmte as foarheaksel brûke.",
+'search-nonefound'                 => 'Der binne gjin resultaten foar Jo sykopdracht.',
+'powersearch'                      => 'Sykje',
+'powersearch-legend'               => 'Sykje',
+'powersearch-ns'                   => 'Sykje op nammeromten:',
+'powersearch-redir'                => 'Trochferwizings werjaan',
+'powersearch-field'                => 'Sykje op',
+'search-external'                  => 'Ekstern sykjen',
+'searchdisabled'                   => '<p>Op it stuit stiet it trochsykjen fan tekst út omdat dizze funksje tefolle kompjûterkapasiteit ferget. As we nije apparatuer krije, en dy is ûnderweis, dan wurdt dizze funksje wer aktyf. Oant salang kinne jo sykje fia Google:</p>',
 
 # Preferences page
-'preferences'              => 'Ynstellings',
-'mypreferences'            => 'Myn foarkarynstellings',
-'prefs-edits'              => 'Tal bewurkings:',
-'prefsnologin'             => 'Net oanmeld',
-'prefsnologintext'         => 'Jo moatte <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} oanmeld]</span> wêze om jo foarkar-ynstellings te feroarje te kinnen.',
-'prefsreset'               => "De ynstellings binne werom set sa't se fêstlein wienen.",
-'qbsettings'               => 'Menu',
-'qbsettings-none'          => 'Ut',
-'qbsettings-fixedleft'     => 'Lofts fêst',
-'qbsettings-fixedright'    => 'Rjochts fêst',
-'qbsettings-floatingleft'  => 'Lofts sweevjend',
-'qbsettings-floatingright' => 'Rjochts sweevjend',
-'changepassword'           => 'Wachtwurd feroarje',
-'skin'                     => 'Side-oansjen',
-'math'                     => 'Formules',
-'dateformat'               => 'Datum',
-'datedefault'              => 'Gjin foarkar',
-'datetime'                 => 'Datum en tiid',
-'math_failure'             => 'Untsjutbere formule',
-'math_unknown_error'       => 'Unbekinde fout',
-'math_unknown_function'    => 'Unbekinde funksje',
-'math_lexing_error'        => 'Unbekind wurd',
-'math_syntax_error'        => 'Sinboufout',
-'math_image_error'         => 'PNG-omsetting is mislearre. 
+'preferences'               => 'Ynstellings',
+'mypreferences'             => 'Myn foarkarynstellings',
+'prefs-edits'               => 'Tal bewurkings:',
+'prefsnologin'              => 'Net oanmeld',
+'prefsnologintext'          => 'Jo moatte <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} oanmeld]</span> wêze om jo foarkar-ynstellings te feroarje te kinnen.',
+'prefsreset'                => "De ynstellings binne werom set sa't se fêstlein wienen.",
+'qbsettings'                => 'Menu',
+'qbsettings-none'           => 'Ut',
+'qbsettings-fixedleft'      => 'Lofts fêst',
+'qbsettings-fixedright'     => 'Rjochts fêst',
+'qbsettings-floatingleft'   => 'Lofts sweevjend',
+'qbsettings-floatingright'  => 'Rjochts sweevjend',
+'changepassword'            => 'Wachtwurd feroarje',
+'skin'                      => 'Side-oansjen',
+'skin-preview'              => 'Proefbyld',
+'math'                      => 'Formules',
+'dateformat'                => 'Datum',
+'datedefault'               => 'Gjin foarkar',
+'datetime'                  => 'Datum en tiid',
+'math_failure'              => 'Untsjutbere formule',
+'math_unknown_error'        => 'Unbekinde fout',
+'math_unknown_function'     => 'Unbekinde funksje',
+'math_lexing_error'         => 'Unbekind wurd',
+'math_syntax_error'         => 'Sinboufout',
+'math_image_error'          => 'PNG-omsetting is mislearre. 
 Gean nei oft latex, dvips, en gs goed ynstallearre binne en set om',
-'math_bad_tmpdir'          => 'De tydlike formulepad kin net skreaun of makke wêze.',
-'math_bad_output'          => 'De formulepad kin net skreaun of makke wêze.',
-'math_notexvc'             => 'It programma texvc net fûn; sjoch math/README te ynstallearjen.',
-'prefs-personal'           => 'Persoanlike gegevens',
-'prefs-rc'                 => 'Koartlyn feroare',
-'prefs-watchlist'          => 'Folchlist',
-'prefs-watchlist-days'     => 'Oantal dagen yn folchlist sjen litte:',
-'prefs-watchlist-edits'    => 'Tal wizigings om sjen te litten yn de útwreide folchlist:',
-'prefs-misc'               => 'Ferskaat',
-'saveprefs'                => 'Ynstellings fêstlizze',
-'resetprefs'               => 'Ynstellings werom sette',
-'oldpassword'              => 'Ald wachtwurd',
-'newpassword'              => 'Nij wachtwurd',
-'retypenew'                => 'Nij wachtwurd (nochris)',
-'textboxsize'              => 'Siden bewurkje',
-'rows'                     => 'Rigen',
-'columns'                  => 'Kolommen',
-'searchresultshead'        => 'Sykje',
-'resultsperpage'           => 'Treffers de side',
-'contextlines'             => 'Rigels ynhâld de treffer:',
-'contextchars'             => 'Tekens fan de ynhâld de rigel:',
-'stub-threshold'           => 'Drompel foar markearring <a href="#" class="stub">stobbe</a> (bytes):',
-'recentchangesdays'        => 'Dagen om sjen te litten yn Koartlyn feroare:',
-'recentchangescount'       => "Tal titels op 'Koartlyn feroare'",
-'savedprefs'               => 'Jo ynstellings binne fêstlein.',
-'timezonelegend'           => 'Tiidsône',
-'timezonetext'             => 'Jou it tal oeren dat jo tiidsône ferskilt fan UTC (Greenwich).',
-'localtime'                => 'Jo tiidsône',
-'timezoneoffset'           => 'Ferskil',
-'servertime'               => 'UTC',
-'guesstimezone'            => 'Freegje de blêder',
-'allowemail'               => 'Lêt my ek e-mail fan oare meidoggers ûntfange',
-'prefs-searchoptions'      => 'Sykje-ynstellings',
-'prefs-namespaces'         => 'Nammeromten',
-'defaultns'                => "Nammeromten dy't normaal trochsocht wurde:",
-'default'                  => 'standert',
-'files'                    => 'Triemen',
+'math_bad_tmpdir'           => 'De tydlike formulepad kin net skreaun of makke wêze.',
+'math_bad_output'           => 'De formulepad kin net skreaun of makke wêze.',
+'math_notexvc'              => 'It programma texvc net fûn; sjoch math/README te ynstallearjen.',
+'prefs-personal'            => 'Persoanlike gegevens',
+'prefs-rc'                  => 'Koartlyn feroare',
+'prefs-watchlist'           => 'Folchlist',
+'prefs-watchlist-days'      => 'Oantal dagen yn folchlist sjen litte:',
+'prefs-watchlist-days-max'  => '(maksimaal 7 dagen)',
+'prefs-watchlist-edits'     => 'Tal wizigings om sjen te litten yn de útwreide folchlist:',
+'prefs-watchlist-edits-max' => '(maksimum oantal: 1000)',
+'prefs-misc'                => 'Ferskaat',
+'prefs-resetpass'           => 'Wachtwurd feroarje',
+'saveprefs'                 => 'Ynstellings fêstlizze',
+'resetprefs'                => 'Ynstellings werom sette',
+'textboxsize'               => 'Siden bewurkje',
+'prefs-edit-boxsize'        => 'Ofmjittings fan it bewurkingsfinster',
+'rows'                      => 'Rigen',
+'columns'                   => 'Kolommen',
+'searchresultshead'         => 'Sykje',
+'resultsperpage'            => 'Treffers de side',
+'contextlines'              => 'Rigels ynhâld de treffer:',
+'contextchars'              => 'Tekens fan de ynhâld de rigel:',
+'stub-threshold'            => 'Drompel foar markearring <a href="#" class="stub">stobbe</a> (bytes):',
+'recentchangesdays'         => 'Dagen om sjen te litten yn Koartlyn feroare:',
+'recentchangesdays-max'     => '(maksimaal $1 {{PLURAL:$1|dei|dagen}})',
+'recentchangescount'        => "Tal titels op 'Koartlyn feroare'",
+'savedprefs'                => 'Jo ynstellings binne fêstlein.',
+'timezonelegend'            => 'Tiidsône',
+'timezonetext'              => 'Jou it tal oeren dat jo tiidsône ferskilt fan UTC (Greenwich).',
+'localtime'                 => 'Pleatslike tiid:',
+'timezoneselect'            => 'Tiidsône:',
+'timezoneuseserverdefault'  => 'Servertiid brûke',
+'timezoneuseoffset'         => 'Oars (tiidferskil oanjaan)',
+'timezoneoffset'            => 'Tiidsferskil¹:',
+'servertime'                => 'Servertiid:',
+'guesstimezone'             => 'Freegje de blêder',
+'allowemail'                => 'Lêt my ek e-mail fan oare meidoggers ûntfange',
+'prefs-searchoptions'       => 'Sykje-ynstellings',
+'prefs-namespaces'          => 'Nammeromten',
+'defaultns'                 => "Nammeromten dy't normaal trochsocht wurde:",
+'default'                   => 'standert',
+'files'                     => 'Triemen',
 
 # User rights
 'userrights'                  => 'Behear fan meidoggerrjochten', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Behear fan meidoggerrjochten',
 'userrights-user-editname'    => 'Meidoggernamme:',
 'editusergroup'               => 'Wizigje meidoggerrjochten',
-'editinguser'                 => "Bewurkje meidoggerrjochten fan '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Bewurkje meidoggerrjochten fan '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Wizigje meidoggerrjochten',
 'saveusergroups'              => 'Meidoggerrjochten fêstlizze',
 'userrights-groupsmember'     => 'Sit yn group:',
@@ -985,6 +1155,8 @@ Gean nei oft latex, dvips, en gs goed ynstallearre binne en set om',
 'right-minoredit'            => 'Bydragen markearje as tekstwiziging',
 'right-move'                 => 'Siden werneamen',
 'right-move-subpages'        => 'Siden ynklusyf har subsiden ferpleatse.',
+'right-move-rootuserpages'   => 'Brûkerssiden fan it heechste nivo in oare namme jaan',
+'right-movefile'             => 'Triemmen in oare namme jaan',
 'right-suppressredirect'     => "In trochferwizing op 'e doelside fuorthelje by werneamen fan in side",
 'right-upload'               => 'Triemmen oanbieden',
 'right-reupload'             => 'In besteande triem oerskriuwen',
@@ -1035,9 +1207,46 @@ Gean nei oft latex, dvips, en gs goed ynstallearre binne en set om',
 'rightslogentry' => 'groep foar $1 feroare fan $2 yn $3',
 'rightsnone'     => '(gjin)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'dizze side besjen',
+'action-edit'                 => 'dizze side te bewurkjen',
+'action-createpage'           => 'siden oan te meitsjen',
+'action-createtalk'           => 'oerlissiden oan te meitsjen',
+'action-createaccount'        => 'dizze brûker oan te meitsjen',
+'action-minoredit'            => 'dizze bewurking as lyts te markearjen',
+'action-move'                 => 'dizze side in oare namme te jaan',
+'action-move-subpages'        => 'dizze side en de derby hearrende subsiden in oare namme te jaan',
+'action-move-rootuserpages'   => 'brûkerssiden fan it heechste nivo in oare namme te jaan',
+'action-movefile'             => 'dizze triem in oare namme te jaan',
+'action-upload'               => 'dizze triem te opladen',
+'action-reupload'             => 'dizze besteande triem te oerskriuwen',
+'action-reupload-shared'      => "dizze triem te opladen, wylst der al in triem mei deselde namme yn 'e dielde repository stiet",
+'action-upload_by_url'        => 'dizze triem fan in URL ôf op te laden',
+'action-writeapi'             => 'fia de API te bewurkjen',
+'action-delete'               => 'dizze side fuort te heljen',
+'action-deleterevision'       => 'dizze ferzje fuort te heljen',
+'action-deletedhistory'       => 'de fuorthelle ferzjes fan dizze side te besjen',
+'action-browsearchive'        => 'fuorthelle siden te sykjen',
+'action-undelete'             => 'dizze side wer te plak sette',
+'action-suppressrevision'     => 'dizze ferburgen ferzje besjen en wer te plak sette',
+'action-suppressionlog'       => 'dit beskerme logboek besjen',
+'action-block'                => 'dizze brûker in bewurkingsblokkade oplizze',
+'action-protect'              => 'it befeiligingsnivo fan dizze side oanpasse',
+'action-import'               => 'dizze side fan in oare wiki ymportearje',
+'action-importupload'         => 'dizze side ymportearje fan in triem-oplading',
+'action-patrol'               => 'bewurkings fan oaren as kontrolearre beskôgje',
+'action-autopatrol'           => 'eigen bewurkings as kontrolearre markearje litte',
+'action-unwatchedpages'       => "de list mei siden dy't net op in folchlist steane besjen",
+'action-trackback'            => 'in trackback opjaan',
+'action-mergehistory'         => 'de skiednis fan dizze side gearfoegje',
+'action-userrights'           => 'alle brûkersrjochten bewurkje',
+'action-userrights-interwiki' => "brûkersrjochten fan brûkers fan oare wiki's bewurkje",
+'action-siteadmin'            => 'de database ôfslute of iepenstelle',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|bewurking|bewurkings}}',
 'recentchanges'                     => 'Koartlyn feroare',
+'recentchanges-legend'              => 'Opsjes foar resinte feroarings',
 'recentchangestext'                 => 'De lêste feroarings fan de {{SITENAME}}.',
 'recentchanges-feed-description'    => 'Mei dizze feed kinne jo de nijste feroarings yn dizze wiki besjen.',
 'rcnote'                            => "Dit {{PLURAL:$1|is de lêste feroaring|binne de lêste '''$1''' feroarings}} yn de lêste {{PLURAL:$2|dei|'''$2''' dagen}}, fan $4 $5.",
@@ -1061,6 +1270,8 @@ Gean nei oft latex, dvips, en gs goed ynstallearre binne en set om',
 'rc_categories'                     => 'Alline kategoryen (skiede mei in "|")',
 'rc_categories_any'                 => 'Elk',
 'newsectionsummary'                 => '/* $1 */ nije seksje',
+'rc-enhanced-expand'                => 'Details werjaan (JavaScript nedich)',
+'rc-enhanced-hide'                  => 'Details ferskûlje',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Folgje keppelings',
@@ -1080,12 +1291,12 @@ Gean nei oft latex, dvips, en gs goed ynstallearre binne en set om',
 'upload_directory_missing'    => 'De heechlaadmap ($1) is der net en koe net oanmakke wurde troch de webserver.',
 'upload_directory_read_only'  => 'De webserver kin net skriuwe yn de oanbiedpad ($1).',
 'uploaderror'                 => 'Oanbiedfout',
-'uploadtext'                  => "Om in nije triemmen oan te bieden, brûke jo de ûndersteande formulier. Earder oanbeane triemmen, kinne jo fine op de [[Special:ImageList|list fan oanbeane ôfbylden]].
+'uploadtext'                  => "Om in nije triemmen oan te bieden, brûke jo de ûndersteande formulier. Earder oanbeane triemmen, kinne jo fine op de [[Special:FileList|list fan oanbeane ôfbylden]].
 Wat oanbean en wat wiske wurdt, wurdt delskreaun yn it [[Special:Log/upload|lochboek]].
 
 Om de triem yn in side op te nimmen, meitsje jo dêr sa'n keppeling:
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:jo_foto.jpg]]</nowiki></tt>''', foar grutte ferzje,
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:jo_logo.png|omskriuwing]]</nowiki></tt>''' foar 200 in piksel ferzje, mei 'alternative tekst' as beskriuwing, of
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:jo_foto.jpg]]</nowiki></tt>''', foar grutte ferzje,
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:jo_logo.png|omskriuwing]]</nowiki></tt>''' foar 200 in piksel ferzje, mei 'alternative tekst' as beskriuwing, of
 *'''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:jo_lûd.ogg]]</nowiki></tt>''', foar direkt keppeling nei de triem (sûnder byld).",
 'upload-permitted'            => 'Talitten triemtypen: $1.',
 'upload-preferred'            => 'Oanwiisde triemtypen: $1.',
@@ -1106,6 +1317,7 @@ Om de triem yn in side op te nimmen, meitsje jo dêr sa'n keppeling:
 Jou de triem in oare namme en besykje him dan op\'e nij heech te laden.',
 'badfilename'                 => 'De ôfbyldnamme is feroare nei "$1".',
 'filetype-badmime'            => 'Triemmen fan it MIME type "$1" meie net heechladen wurde.',
+'filetype-bad-ie-mime'        => 'Dizze triem kin net tafoege wurde, om\'t Internet Explorer dy idintifisearje soe as "$1", in net talitten triemtype dat potinsjeel skealik is.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' is in net winske triem-type.
 {{PLURAL:\$3|Oanwiisd triem-type is|Oanwiisde triem-typen binne}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' is gjin talitten triem-type.
@@ -1116,30 +1328,32 @@ Jou de triem in oare namme en besykje him dan op\'e nij heech te laden.',
 'emptyfile'                   => "De triem dy jo heechladen hawwe liket leech te wêzen.
 Dat soe komme kinne fan in typflater yn 'e triemnamme.
 Gean nei oft jo dizze triem wier bedoelden heech te laden.",
-'fileexists'                  => 'Der bestiet al in triem mei dizze namme.
-Kontrolearje <strong><tt>$1</tt></strong> as jo net wis binne oft jo de besteande triem oerskriuwe wolle.',
-'filepageexists'              => "De beskriuwingsside foar dizze triem bestiet al op <strong><tt>$1</tt></strong>, mar der bestiet gjin triem mei dizze namme.
+'fileexists'                  => "Der bestiet al in triem mei dizze namme.
+Kontrolearje '''<tt>$1</tt>''' as jo net wis binne oft jo de besteande triem oerskriuwe wolle.",
+'filepageexists'              => "De beskriuwingsside foar dizze triem bestiet al op '''<tt>$1</tt>''', mar der bestiet gjin triem mei dizze namme.
 De gearfetting dy't jo opjûn hawwe sil net op 'e beskriuwingsside ferskine.
 Bewurkje de side mei de hân om de beskriuwing dêr wer te jaan.",
 'fileexists-extension'        => "In triem mei deselde namme bestiet al:<br />
-Namme fan 'e heechladene triem: <strong><tt>$1</tt></strong><br />
-Namme fan 'e besteande triem: <strong><tt>$2</tt></strong><br />
+Namme fan 'e heechladene triem: '''<tt>$1</tt>'''<br />
+Namme fan 'e besteande triem: '''<tt>$2</tt>'''<br />
 Kies in oare namme.",
 'fileexists-thumb'            => "<center>'''Besteande ôfbylding'''</center>",
-'fileexists-thumbnail-yes'    => 'De triem liket in ferlytse ferzje te wêzen <i>(miniatuerôfbylding)</i>.
-Kontrolearje de triem <strong><tt>$1</tt></strong>.<br />
-As de kontrolearre triem deselde ôfbylding fan deselde grutte is, dan hoecht net in ekstra miniatuerôfbylding oanbean te wurden.',
-'file-thumbnail-no'           => 'De triemnamme begjint mei <strong><tt>$1</tt></strong>.
-It liket in ferlytse ôfbylding te wêzen <i>(miniatuerôfbylding)</i>.
+'fileexists-thumbnail-yes'    => "De triem liket in ferlytse ferzje te wêzen ''(miniatuerôfbylding)''.
+Kontrolearje de triem '''<tt>$1</tt>'''.<br />
+As de kontrolearre triem deselde ôfbylding fan deselde grutte is, dan hoecht net in ekstra miniatuerôfbylding oanbean te wurden.",
+'file-thumbnail-no'           => "De triemnamme begjint mei '''<tt>$1</tt>'''.
+It liket in ferlytse ôfbylding te wêzen ''(miniatuerôfbylding)''.
 As jo dy ôfbylding yn folsleine resolúsje hawwe, bied him dan oan.
-Feroarje oars de triemnamme.',
+Feroarje oars de triemnamme.",
 'fileexists-forbidden'        => 'Der bestiet al in triem mei dizze namme.
 Bied jo triem ûnder in oare namme oan.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Der bestiet al in triem mei dizze namme by de dielde triemmen.
 As jo de triem dochs noch oanbiede wolle, gean dan werom en kies in oare namme.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Dizze triem is idintyk oan {{PLURAL:$1|de folgjende triem|de folgjende triemmen}}:',
+'file-deleted-duplicate'      => "In bestân idintyk oan dit bestân ([[$1]]) is foarhinne fuorthelle.
+Rieplachtsje it fuorthel-logboek foar't jo fierder geane.",
 'successfulupload'            => 'Oanbieden slagge.',
 'uploadwarning'               => 'Oanbied-warskôging',
 'savefile'                    => 'Lis triem fêst',
@@ -1161,7 +1375,7 @@ Rieplachtsje it $1 foar't jo him op'e nij tafoegje.",
 
 Kontrolearje oft it wier jo bedoeling is de triem oan te bieden.
 It fuorthellogboek fan dizze triem kinne jo hjir sjen:",
-'filename-bad-prefix'         => 'De namme fan de triem dy\'t jo oanbiede begjint mei <strong>"$1"</strong>, dit wiist op in namme dy\'t automatysk troch in digitale kamera oanmakke wurdt. Feroarje de namme as jo wolle yn ien dy\'t in omskriuwing jout fan de triem.',
+'filename-bad-prefix'         => "De namme fan de triem dy't jo oanbiede begjint mei '''\"\$1\"''', dit wiist op in namme dy't automatysk troch in digitale kamera oanmakke wurdt. Feroarje de namme as jo wolle yn ien dy't in omskriuwing jout fan de triem.",
 'filename-prefix-blacklist'   => " #<!-- lit dizze line exakt sa't er is --> <pre>
 # Syntax is as folget:
 #   * Alles fan in \"#\"-teken oan't de ein fan de line is in kommintaar
@@ -1203,20 +1417,21 @@ Jo kinne it faaks besykje as it wat minder drok is.",
 'upload_source_url'  => ' (in jildige, publyk tagonklike URL)',
 'upload_source_file' => ' (in triem op jo kompjûter)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Op dizze spesjale side binne alle tafoege triemmen te besjen.
+# Special:ListFiles
+'listfiles-summary'     => 'Op dizze spesjale side binne alle tafoege triemmen te besjen.
 Standert wurde de lêst tafoege triemmen boppe oan de list werjûn.
 Klikken op in kolomkop feroaret de sortearring.',
-'imagelist_search_for'  => 'Sykje nei triem:',
+'listfiles_search_for'  => 'Sykje nei triem:',
 'imgfile'               => 'triem',
-'imagelist'             => 'Ofbyld list',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Namme',
-'imagelist_user'        => 'Meidogger',
-'imagelist_size'        => 'Grutte',
-'imagelist_description' => 'Beskriuwing',
-
-# Image description page
+'listfiles'             => 'Ofbyld list',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Namme',
+'listfiles_user'        => 'Meidogger',
+'listfiles_size'        => 'Grutte',
+'listfiles_description' => 'Beskriuwing',
+'listfiles_count'       => 'Ferzjes',
+
+# File description page
 'filehist'                       => 'Triem skiednis',
 'filehist-help'                  => 'Klik op in tiid om de ferzje fan de triem op dat stuit te sjen.',
 'filehist-deleteall'             => 'wiskje alles',
@@ -1224,12 +1439,18 @@ Klikken op in kolomkop feroaret de sortearring.',
 'filehist-revert'                => 'werom sette',
 'filehist-current'               => 'lêste',
 'filehist-datetime'              => 'Tiid',
+'filehist-thumb'                 => 'Miniatuerôfbylding',
+'filehist-thumbtext'             => 'Miniatuerôfbylding foar ferzje fan $1 ôf',
+'filehist-nothumb'               => 'Gjin miniatuerôfbylding',
 'filehist-user'                  => 'Meidogger',
 'filehist-dimensions'            => 'Ofmjittings',
 'filehist-filesize'              => 'Triem grutte',
 'filehist-comment'               => 'Opmerkings',
 'imagelinks'                     => 'Ofbyldkeppelings',
 'linkstoimage'                   => 'Dizze {{PLURAL:$1|side is|$1 siden binne}} keppele oan it ôfbyld:',
+'linkstoimage-more'              => 'Der {{PLURAL:$2|is|binne}} mear as $1 {{PLURAL:$1|ferwizing|ferwizings}} nei dizze triem.
+De folgjende list jout allinne de earste {{PLURAL:$1|ferwizing|$1 ferwizings}} nei dizze triem wer.
+Der is ek in [[Special:WhatLinksHere/$2|folsleine list]].',
 'nolinkstoimage'                 => 'Der binne gjin siden oan dit ôfbyld keppele.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Mear ferwizings]] nei dizze triem besjen.',
 'redirectstofile'                => '{{PLURAL:$1|De folgjende triem ferwiist|De folgjende $1 triemmen ferwize}} troch nei dizze triem:',
@@ -1290,48 +1511,57 @@ Ynfier: contenttype/subtype, bygelyks <tt>image/jpeg</tt>.',
 
 # Unused templates
 'unusedtemplates'     => 'Net brûkte sjabloanen',
-'unusedtemplatestext' => 'Dizze side jout alle siden wer yn\'e Berjocht-nammeromte dy\'t op net ien side brûkt wurde.
-Ferjit net de "Wat is hjirmei keppele" nei te gean foar it fuortheljen fan dit berjocht.',
+'unusedtemplatestext' => 'Dizze side jout alle siden wer yn\'e nammeromte {{ns:template}} dy\'t op net ien side brûkt wurde.
+Ferjit net de "Wat is hjirmei keppele" nei te gean foar it fuortheljen fan dit sjabloan.',
 'unusedtemplateswlh'  => 'oare keppelings',
 
 # Random page
 'randompage'         => 'Samar in side',
-'randompage-nopages' => 'Der binne gjin siden yn dizze nammeromte.',
+'randompage-nopages' => 'Der binne gjin siden yn\'e nammeromte "$1".',
 
 # Random redirect
-'randomredirect' => 'Samar in trochferwizing',
+'randomredirect'         => 'Samar in trochferwizing',
+'randomredirect-nopages' => 'Der binne gjin trochferwizings yn\'e nammerûmte "$1".',
 
 # Statistics
-'statistics'             => 'Statistyk',
-'sitestats'              => 'Side statistyk',
-'userstats'              => 'Meidogger-statistyk',
-'sitestatstext'          => "It {{PLURAL:$1|is '''1''' side|binne '''$1''' siden}} yn de databank.
-Oerlissiden, siden oer de {{SITENAME}}, stobben, trochferwizings, en oare bysûndere siden, binne dêrby meiteld. Sûnder dizze siden, it {{PLURAL:$2|is '''1''' side|binne '''$2''' siden}} mei materiaal en ynhâld. 
-
-'''$8''' {{PLURAL:$8|triem wurdt|triemmen wurde}} al oanbied.
-
-Der {{PLURAL:$3|is '''1''' sidelêzing|binne '''$3''' sidelêzings}}, en '''$4''' {{PLURAL:$4|bewurking|bewurkings}} sûnt {{SITENAME}} begûnen. Dat komt yn trochslach del op '''$5''' bewurkings per side, en '''$6''' lêzings per bewurking.  
-
-De lingte fan de [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] is '''$7'''.",
-'userstatstext'          => "It tal fan registrearre meidoggers is '''{{PLURAL:$1|1|$1}}'''.
-It tal fan meidoggers dêrfan mei $5rjochten is '''{{PLURAL:$2|1|$2}}''' (of '''{{PLURAL:$4|1|$4}}''').",
-'statistics-mostpopular' => 'Meast besjoene siden',
+'statistics'                   => 'Statistyk',
+'statistics-header-pages'      => 'Sidestatistiken',
+'statistics-header-edits'      => 'Bewurkingsstatistiken',
+'statistics-header-views'      => 'Sidewerjefte-statistiken',
+'statistics-header-users'      => 'Meidogger-statistyk',
+'statistics-articles'          => 'Ynhâldlike siden',
+'statistics-pages'             => 'Siden',
+'statistics-pages-desc'        => "Alle siden yn 'e wiki, ynbegrepen oerlissiden, trochferwizings ens.",
+'statistics-files'             => 'Triemmen',
+'statistics-edits'             => 'Sidebewurkings sûnt it begjin fan {{SITENAME}}',
+'statistics-edits-average'     => 'Trochstrings tal bewurkings per side',
+'statistics-views-total'       => 'Totaal oantal werjûne siden',
+'statistics-views-peredit'     => 'Werjûne siden per bewurking',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job-queue-langte]',
+'statistics-users'             => 'Registrearre [[Special:ListUsers|brûkers]]',
+'statistics-users-active'      => 'Aktive brûkers',
+'statistics-users-active-desc' => "Brûkers dy't yn 'e ôfrûne {{PLURAL:$1|dei|$1 dagen}} in hanneling útfierd hawwe",
+'statistics-mostpopular'       => 'Meast besjoene siden',
 
 'disambiguations'      => 'Betsjuttingssiden',
 'disambiguationspage'  => 'Template:Neibetsjuttings',
 'disambiguations-text' => "De ûndersteande siden keppelje mei in '''Betsjuttingssiden'''.
 Se soenen mei de side sels keppele wurde moatte.<br /> In side wurdt sjoen as betsjuttingssiden, as de side ien berjocht fan [[MediaWiki:Disambiguationspage]] brûkt.",
 
-'doubleredirects'     => 'Dûbelde synonimen',
-'doubleredirectstext' => '<b>Let op!</b> Der kinne missen yn dizze list stean! Dat komt dan ornaris troch oare keppelings ûnder de "#REDIRECT". Eltse rigel jout keppelings nei it earste synonym, it twadde synonym en dan it werklike doel.',
+'doubleredirects'            => 'Dûbelde synonimen',
+'doubleredirectstext'        => '<b>Let op!</b> Der kinne missen yn dizze list stean! Dat komt dan ornaris troch oare keppelings ûnder de "#REDIRECT". Eltse rigel jout keppelings nei it earste synonym, it twadde synonym en dan it werklike doel.',
+'double-redirect-fixed-move' => '[[$1]] is ferplakt en is no in trochferwizing nei [[$2]]',
+'double-redirect-fixer'      => 'Trochferwizings himmelje',
 
 'brokenredirects'        => 'Misse synonimen',
 'brokenredirectstext'    => "De siden dêr't dizze titels synonym oan wêze moatte, bestean net.",
 'brokenredirects-edit'   => '(bewurkje)',
 'brokenredirects-delete' => '(wiskje)',
 
-'withoutinterwiki'        => 'Siden sûnder ferwizings nei oare talen',
-'withoutinterwiki-submit' => 'Sjen litte',
+'withoutinterwiki'         => 'Siden sûnder ferwizings nei oare talen',
+'withoutinterwiki-summary' => 'De folgjende siden ferwize net nei ferzjes yn in oare taal.',
+'withoutinterwiki-legend'  => 'Foarheaksel',
+'withoutinterwiki-submit'  => 'Sjen litte',
 
 'fewestrevisions' => 'Siden mei de minste ferzjes',
 
@@ -1344,6 +1574,8 @@ Se soenen mei de side sels keppele wurde moatte.<br /> In side wurdt sjoen as be
 'nviews'                  => '{{PLURAL:$1|1 kear|$1 kear}} sjoen',
 'specialpage-empty'       => 'Gjin resultaten foar dit rapport.',
 'lonelypages'             => 'Lossteande siden',
+'lonelypagestext'         => 'Nei de ûndersteande siden wurdt út {{SITENAME}} wei net ferwiisd.
+De siden binne ek net as sjabloan opnommen.',
 'uncategorizedpages'      => 'Siden sûnder kategory',
 'uncategorizedcategories' => 'Kategoryen sûnder kategory',
 'uncategorizedimages'     => 'Ofbylden sûnder kategory',
@@ -1353,6 +1585,8 @@ Se soenen mei de side sels keppele wurde moatte.<br /> In side wurdt sjoen as be
 'popularpages'            => 'Populêre siden',
 'wantedcategories'        => 'Nedige kategoryen',
 'wantedpages'             => 'Nedige siden',
+'wantedfiles'             => 'Net-besteande triemmen mei ferwizings',
+'wantedtemplates'         => 'Net besteande sjabloanen mei ferwizings',
 'mostlinked'              => 'Siden wêr it meast mei keppele is',
 'mostlinkedcategories'    => "Kategoryen dy't it meast brûkt wurde",
 'mostlinkedtemplates'     => 'Meast brûkte sjabloanen',
@@ -1363,36 +1597,50 @@ Se soenen mei de side sels keppele wurde moatte.<br /> In side wurdt sjoen as be
 'shortpages'              => 'Koarte siden',
 'longpages'               => 'Lange siden',
 'deadendpages'            => 'Siden sûnder ferwizings',
+'deadendpagestext'        => 'De ûndersteande siden ferwize net nei oare siden yn {{SITENAME}}.',
 'protectedpages'          => 'Skoattele siden',
+'protectedpages-indef'    => 'Allinne blokkades sûnder ferrindatum',
+'protectedpages-cascade'  => 'Allinne befeiligje mei de kaskade-opsje',
 'protectedpagestext'      => 'De neikommende siden binne skoattele foar werneamen of wizigjen',
 'protectedpagesempty'     => "Op it stuit binne der gjin siden befeilige, dy't oan dizze betingsten foldogge.",
 'protectedtitles'         => 'Skoattele titels',
+'protectedtitlestext'     => 'De folgjende sidenammen binne befeilige en kinne net oanmakke wurde',
 'protectedtitlesempty'    => "Der binne op it stuit gjin sidenammen befeilige, dy't oan dizze betingsten foldogge.",
 'listusers'               => 'Meidoggerlist',
+'listusers-editsonly'     => 'Allinne brûkers mei bewurkings werjaan',
+'usereditcount'           => '$1 {{PLURAL:$1|bewurking|bewurkings}}',
 'newpages'                => 'Nije siden',
 'newpages-username'       => 'Meidoggernamme:',
 'ancientpages'            => 'Alde siden',
 'move'                    => 'Werneam',
 'movethispage'            => 'Werneam dizze side',
 'unusedimagestext'        => '<p>Tink derom dat oare websiden fan oare parten fan it meartalige projekt mooglik in keppeling nei it URL fan it ôfbyld makke hawwe. Sokke ôfbylden wurde wol brûkt, mar steane dochs op dizze list.',
+'unusedcategoriestext'    => "Hjirûnder steane kategoryen dy't oanmakke binne, mar troch gjin inkelde side of oare kategory brûkt wurde.",
 'notargettitle'           => 'Gjin side',
 'notargettext'            => 'Jo hawwe net sein oer hokfoar side jo dit witte wolle.',
 'nopagetitle'             => 'Side bestiet net',
+'nopagetext'              => "De side dy't jo in oare namme jaan wolle bestiet net.",
+'pager-newer-n'           => '{{PLURAL:$1|nijere 1|nijere $1}}',
 'pager-older-n'           => '{{PLURAL:$1|1 âlder|$1 âlder}}',
+'suppress'                => 'Tafersjoch',
 
 # Book sources
-'booksources'    => 'Boekynformaasje',
-'booksources-go' => 'Sykje',
+'booksources'               => 'Boekynformaasje',
+'booksources-search-legend' => 'Boarnen en ynformaasje oer in boek sykje',
+'booksources-go'            => 'Sykje',
+'booksources-text'          => "Hjirûnder is in list mei keppelings nei oare websites dy't nije of brûkte boeken ferkeapje en dy't faaks mear ynformaasje hawwe oer it boek dat jo sykje:",
+'booksources-invalid-isbn'  => 'It ynjûne ISBN liket net jildich te wêzen.
+Kontrolearje oft jo faaks in flater makke hawwe by de ynfier.',
 
 # Special:Log
 'specialloguserlabel'  => 'Meidogger:',
 'speciallogtitlelabel' => 'Sidenamme:',
 'log'                  => 'Lochs',
 'all-logs-page'        => 'Alle lochboeken',
-'log-search-submit'    => 'Sykje',
-'alllogstext'          => 'Kombinearre loch de {{SITENAME}}.
-Jo kinne it oersjoch beheine troch in loch, in meidoggernamme of in side oan te jaan.',
+'alllogstext'          => 'Dit is it kombinearre logboek fan {{SITENAME}}.
+Jo kinne ek kieze foar spesifike logboeken en filterje op brûker (haadstêfgefoelich) en sidenamme  (haadstêfgefoelich).',
 'logempty'             => 'Gjin treffers yn it loch.',
+'log-title-wildcard'   => "Siden sykje dy't mei dizze namme begjinne",
 
 # Special:AllPages
 'allpages'          => 'Alle siden',
@@ -1400,6 +1648,7 @@ Jo kinne it oersjoch beheine troch in loch, in meidoggernamme of in side oan te
 'nextpage'          => 'Folgjende side ($1)',
 'prevpage'          => 'Foargeande side ($1)',
 'allpagesfrom'      => 'Begjin list by',
+'allpagesto'        => 'Siden besjen oant:',
 'allarticles'       => 'Alle siden',
 'allinnamespace'    => 'Alle siden, yn de ($1-nammeromte)',
 'allnotinnamespace' => 'Alle siden, útsein de $1-nammeromte',
@@ -1407,65 +1656,108 @@ Jo kinne it oersjoch beheine troch in loch, in meidoggernamme of in side oan te
 'allpagesnext'      => 'Fierder',
 'allpagessubmit'    => 'Los!',
 'allpagesprefix'    => "Siden sjen litte dy't begjinne mei:",
+'allpagesbadtitle'  => "De opjûne sidenamme is ûnjildich of hat in yntertaal- of ynterwikifoarheaksel.
+Mûglik befettet de namme karakters dy't net brûkt wurde meie yn sidenammen.",
+'allpages-bad-ns'   => '{{SITENAME}} hat gjin nammerûmte "$1".',
 
 # Special:Categories
-'categories'         => 'Kategoryen',
-'categoriespagetext' => 'Dizze wiki hat de neikommende kategoryen:',
+'categories'                    => 'Kategoryen',
+'categoriespagetext'            => 'De folgjende kategoriyen befetsje siden of mediatriemmen.
+[[Special:UnusedCategories|Net brûkte kategoryen]] wurde hjir net werjûn.
+Sjuch ek [[Special:WantedCategories|net-besteande kategoryen mei ferwizings]].',
+'categoriesfrom'                => 'Kategoryen werjaan fan .. ôf:',
+'special-categories-sort-count' => 'op tal sortearje',
+'special-categories-sort-abc'   => 'alfabetysk sortearje',
+
+# Special:DeletedContributions
+'deletedcontributions' => 'Wiske meidogger bydragen',
+
+# Special:LinkSearch
+'linksearch'       => 'Eksterne ferwizings sykje',
+'linksearch-pat'   => 'Sykpatroan:',
+'linksearch-ns'    => 'Nammerûmte:',
+'linksearch-ok'    => 'Sykje',
+'linksearch-text'  => 'Wildcards lykas "*.wikipedia.org" of "*.org" binne tastien.<br />
+Stipe protokollen: <tt>$1</tt>',
+'linksearch-line'  => '$1 hat in ferwizing yn $2',
+'linksearch-error' => 'Wildcards binne allinne tastien oan it begjin fan in hostnamme.',
 
 # Special:ListUsers
-'listusersfrom'    => 'Lit meidoggers sjen fanôf:',
-'listusers-submit' => 'Sjen litte',
+'listusersfrom'      => 'Lit meidoggers sjen fanôf:',
+'listusers-submit'   => 'Sjen litte',
+'listusers-noresult' => 'Gjin brûker fûn.',
+
+# Special:Log/newusers
+'newuserlogpage'              => 'Ynskriuwingsloch',
+'newuserlogpagetext'          => "Dit is in loch fan meidoggers dy't de lêste tiid ynskreaun binne.",
+'newuserlog-byemail'          => 'wachtwurd is ferstjoerd oer e-mail',
+'newuserlog-create-entry'     => 'Nije meidogger',
+'newuserlog-create2-entry'    => 'hat brûker $1 ynskreaun',
+'newuserlog-autocreate-entry' => 'Brûker automatysk oanmakke',
 
 # Special:ListGroupRights
-'listgrouprights-group'  => 'Groep',
-'listgrouprights-rights' => 'Rjochten',
+'listgrouprights'                 => 'Rjochten fan brûkersgroepen',
+'listgrouprights-summary'         => 'Op dizze side steane de brûkersgroepen yn dizze wiki beskreaun, mei har derby hearrende rjochten.
+Der kin [[{{MediaWiki:Listgrouprights-helppage}}|ekstra ynformaasje]] oer yndividuele rjochten oanwêzich wêze.',
+'listgrouprights-group'           => 'Groep',
+'listgrouprights-rights'          => 'Rjochten',
+'listgrouprights-helppage'        => 'Help:Brûkersrjochten',
+'listgrouprights-members'         => '(ledelist)',
+'listgrouprights-right-display'   => '$1 ($2)',
+'listgrouprights-addgroup'        => 'Kin brûkers oan dizze {{PLURAL:$2|groep|groepen}} tafoegje: $1',
+'listgrouprights-removegroup'     => 'Kin brûkers út dizze {{PLURAL:$2|groep|groepen}} fuorthelje: $1',
+'listgrouprights-addgroup-all'    => 'Kin brûkers oan alle groepen tafoegje',
+'listgrouprights-removegroup-all' => 'Kin brûkers út alle groepen fuorthelje',
 
 # E-mail user
-'mailnologin'     => 'Gjin adres beskikber',
-'mailnologintext' => 'Jo moatte [[Special:UserLogin|oanmelden]] wêze, en in jildich e-postadres [[Special:Preferences|ynsteld]] hawwe, om oan oare meidoggers e-post stjoere te kinnen.',
-'emailuser'       => 'Skriuw meidogger',
-'emailpage'       => 'E-post nei meidogger',
-'emailpagetext'   => "As dizze meidogger in jildich e-postadres ynsteld hat, dan kinne jo in berjocht ferstjoere. It e-postadres dat jo ynsteld hawwe wurdt brûkt as de ôfstjoerder, sa't de ûntfanger antwurdzje kin.",
-'defemailsubject' => 'E-post fan {{SITENAME}}',
-'noemailtitle'    => 'Gjin e-postadres',
-'noemailtext'     => 'Dizze meidogger hat gjin jildich e-postadres ynsteld, of hat oanjûn gjin post fan oare meidoggers krije te wollen.',
-'emailfrom'       => 'Fan:',
-'emailto'         => 'Oan:',
-'emailsubject'    => 'Oer',
-'emailmessage'    => 'Tekst',
-'emailsend'       => 'Stjoer',
-'emailsent'       => 'Berjocht stjoerd',
-'emailsenttext'   => 'Jo berjocht is stjoerd.',
+'mailnologin'      => 'Gjin adres beskikber',
+'mailnologintext'  => 'Jo moatte [[Special:UserLogin|oanmelden]] wêze, en in jildich e-postadres [[Special:Preferences|ynsteld]] hawwe, om oan oare meidoggers e-post stjoere te kinnen.',
+'emailuser'        => 'Skriuw meidogger',
+'emailpage'        => 'E-post nei meidogger',
+'emailpagetext'    => 'Fia dit berjocht kinne jo in e-mail oan dizze brûker ferstjoere.
+It e-mailadres dat jo opjûn hawwe by [[Special:Preferences|jo foarkarren]] wurdt as ôfstjoerder  brûkt.
+De ûntfanger kin dus daliks nei jo reagearje.',
+'usermailererror'  => 'Flatermelding by ferstjoeren:',
+'defemailsubject'  => 'E-post fan {{SITENAME}}',
+'noemailtitle'     => 'Gjin e-postadres',
+'noemailtext'      => 'Dizze meidogger hat gjin jildich e-postadres ynsteld, of hat oanjûn gjin post fan oare meidoggers krije te wollen.',
+'nowikiemailtitle' => 'E-mail is net tastien',
+'nowikiemailtext'  => 'Dizze brûker wol gjin e-mail ûntfange fan oare brûkers.',
+'email-legend'     => 'In e-mail ferstjoere nei in oare brûker fan {{SITENAME}}',
+'emailfrom'        => 'Fan:',
+'emailto'          => 'Oan:',
+'emailsubject'     => 'Oer',
+'emailmessage'     => 'Berjocht:',
+'emailsend'        => 'Stjoer',
+'emailsent'        => 'Berjocht stjoerd',
+'emailsenttext'    => 'Jo berjocht is stjoerd.',
 
 # Watchlist
-'watchlist'            => 'Folchlist',
-'mywatchlist'          => 'Folchlist',
-'watchlistfor'         => "(foar '''$1''')",
-'nowatchlist'          => 'Jo hawwe gjin siden op jo folchlist.',
-'watchnologin'         => 'Net oanmeld yn',
-'watchnologintext'     => 'Jo moatte [[Special:UserLogin|oanmeld]] wêze om jo folchlist te feroarjen.',
-'addedwatch'           => 'Oan folchlist tafoege',
-'addedwatchtext'       => "De side \"'''[[:\$1]]'''\" is tafoege oan jo [[Special:Watchlist|folchlist]]. Bewurkings fan dizze side en oerlisside wurde yn de takomst op jo folchlist oanjûn. Hja wurde foar jo ek '''fet''' printe op [[Special:RecentChanges|Koartlyn feroare]].
+'watchlist'          => 'Folchlist',
+'mywatchlist'        => 'Folchlist',
+'watchlistfor'       => "(foar '''$1''')",
+'nowatchlist'        => 'Jo hawwe gjin siden op jo folchlist.',
+'watchnologin'       => 'Net oanmeld yn',
+'watchnologintext'   => 'Jo moatte [[Special:UserLogin|oanmeld]] wêze om jo folchlist te feroarjen.',
+'addedwatch'         => 'Oan folchlist tafoege',
+'addedwatchtext'     => "De side \"'''[[:\$1]]'''\" is tafoege oan jo [[Special:Watchlist|folchlist]]. Bewurkings fan dizze side en oerlisside wurde yn de takomst op jo folchlist oanjûn. Hja wurde foar jo ek '''fet''' printe op [[Special:RecentChanges|Koartlyn feroare]].
 
 At jo letter in side net mear folgje wolle, dan brûke jo op dy side de keppeling \"Ferjit dizze side.\" Jo [[Special:Watchlist|folchlist]] hat ek in keppeling \"Jo folchlist bewurkje,\" foar at jo mear as ien side \"ferjitte\" wolle.",
-'removedwatch'         => 'Net mear folgje',
-'removedwatchtext'     => 'De side "<nowiki>$1</nowiki>" stiet net mear op jo folchlist.',
-'watch'                => 'Folgje',
-'watchthispage'        => 'Folgje dizze side',
-'unwatch'              => 'Ferjit',
-'unwatchthispage'      => 'Ferjit dizze side',
-'notanarticle'         => 'Dit kin net folge wurde.',
-'watchnochange'        => "Fan de siden dy't jo folgje is der yn dizze perioade net ien feroare.",
-'watchlist-details'    => 'Jo folchlist hat {{PLURAL:$1|$1 side|$1 siden}}, oerlissiden net meiteld.',
-'watchmethod-recent'   => 'Koartlyn feroare ...',
-'watchmethod-list'     => 'Folge ...',
-'watchlistcontains'    => 'Jo folgje op it stuit $1 {{PLURAL:$1|side|siden}}.',
-'iteminvalidname'      => 'Misse namme: "$1" ...',
-'wlnote'               => "Dit {{PLURAL:$1|is de lêste feroaring|binne de lêste '''$1''' feroarings}} yn de lêste {{PLURAL:$2|oer|'''$2''' oeren}}.",
-'wlshowlast'           => 'Lit feroarings sjen fan de lêste $1 oeren $2 dagen $3',
-'watchlist-hide-bots'  => 'Botbewurkings ferskûlje',
-'watchlist-hide-own'   => 'Myn bewurkings ferskûlje',
-'watchlist-hide-minor' => 'Lytse bewurkings ferskûlje',
+'removedwatch'       => 'Net mear folgje',
+'removedwatchtext'   => 'De side "<nowiki>$1</nowiki>" stiet net mear op jo folchlist.',
+'watch'              => 'Folgje',
+'watchthispage'      => 'Folgje dizze side',
+'unwatch'            => 'Ferjit',
+'unwatchthispage'    => 'Ferjit dizze side',
+'notanarticle'       => 'Dit kin net folge wurde.',
+'watchnochange'      => "Fan de siden dy't jo folgje is der yn dizze perioade net ien feroare.",
+'watchlist-details'  => 'Jo folchlist hat {{PLURAL:$1|$1 side|$1 siden}}, oerlissiden net meiteld.',
+'watchmethod-recent' => 'Koartlyn feroare ...',
+'watchmethod-list'   => 'Folge ...',
+'watchlistcontains'  => 'Jo folgje op it stuit $1 {{PLURAL:$1|side|siden}}.',
+'iteminvalidname'    => 'Misse namme: "$1" ...',
+'wlnote'             => "Dit {{PLURAL:$1|is de lêste feroaring|binne de lêste '''$1''' feroarings}} yn de lêste {{PLURAL:$2|oer|'''$2''' oeren}}.",
+'wlshowlast'         => 'Lit feroarings sjen fan de lêste $1 oeren $2 dagen $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => "Dwaande mei op'e folchlist te setten ...",
@@ -1499,63 +1791,73 @@ om jo folchlistynstellings te feroarjen.
 Reaksjes en fierdere help:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Wisk side',
-'confirm'                     => 'Befêstigje',
-'excontent'                   => "ynhâld wie: '$1'",
-'excontentauthor'             => "ynhâld wie: '$1' (en de ienige bewurker wie: '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "foar de tekst wiske wie, wie dat: '$1'",
-'exblank'                     => 'side wie leech',
-'delete-confirm'              => '"$1" wiskje',
-'delete-legend'               => 'Wiskje',
-'historywarning'              => "Warskôging: De side dy't jo wiskje wolle hat skiednis:",
-'confirmdeletetext'           => 'Jo binne dwaande mei it foar altyd wiskjen fan in side
+# Delete
+'deletepage'            => 'Wisk side',
+'confirm'               => 'Befêstigje',
+'excontent'             => "ynhâld wie: '$1'",
+'excontentauthor'       => "ynhâld wie: '$1' (en de ienige bewurker wie: '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'         => "foar de tekst wiske wie, wie dat: '$1'",
+'exblank'               => 'side wie leech',
+'delete-confirm'        => '"$1" wiskje',
+'delete-legend'         => 'Wiskje',
+'historywarning'        => "Warskôging: De side dy't jo wiskje wolle hat skiednis:",
+'confirmdeletetext'     => 'Jo binne dwaande mei it foar altyd wiskjen fan in side
 of ôfbyld, tegearre mei alle skiednis, út de databank.
 Befêstigje dat jo dat wier dwaan wolle. Befêstigje dat dat is wat jo witte wat it gefolch
 is en dat jo dit dogge neffens de [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Dien',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" is wiske.
+'actioncomplete'        => 'Dien',
+'deletedtext'           => '"<nowiki>$1</nowiki>" is wiske.
 Sjoch "$2" foar in list fan wat resint wiske is.',
-'deletedarticle'              => '"[[$1]]" is wiske',
-'dellogpage'                  => 'Wiskloch',
-'dellogpagetext'              => 'Dit is wat der resint wiske is.
+'deletedarticle'        => '"[[$1]]" is wiske',
+'dellogpage'            => 'Wiskloch',
+'dellogpagetext'        => 'Dit is wat der resint wiske is.
 (Tiden oanjûn as UTC).',
-'deletionlog'                 => 'wiskloch',
-'reverted'                    => 'Weromset nei eardere ferzje',
-'deletecomment'               => 'Reden foar it wiskjen',
-'deleteotherreason'           => 'Oare/eventuele reden:',
-'deletereasonotherlist'       => 'Oare reden',
-'deletereason-dropdown'       => '*Faak-brûkte redenen
+'deletionlog'           => 'wiskloch',
+'reverted'              => 'Weromset nei eardere ferzje',
+'deletecomment'         => 'Reden foar it wiskjen',
+'deleteotherreason'     => 'Oare/eventuele reden:',
+'deletereasonotherlist' => 'Oare reden',
+'deletereason-dropdown' => '*Faak-brûkte redenen
 ** Frege troch de skriuwer
 ** Skeining fan auteursrjocht
 ** Fandalisme',
-'rollback'                    => 'Feroarings werom sette',
-'rollback_short'              => 'Werom sette',
-'rollbacklink'                => 'feroaring werom sette',
-'rollbackfailed'              => 'Feroaring werom sette net slagge',
-'cantrollback'                => "Dizze feroaring kin net werom setten wurde, om't der mar ien skriuwer is.",
-'alreadyrolled'               => 'Kin de feroaring fan [[:$1]]
+
+# Rollback
+'rollback'         => 'Feroarings werom sette',
+'rollback_short'   => 'Werom sette',
+'rollbacklink'     => 'feroaring werom sette',
+'rollbackfailed'   => 'Feroaring werom sette net slagge',
+'cantrollback'     => "Dizze feroaring kin net werom setten wurde, om't der mar ien skriuwer is.",
+'alreadyrolled'    => 'Kin de feroaring fan [[:$1]]
 troch [[User:$2|$2]] ([[User talk:$2|Oerlis]]) net werom sette;
 in oar hat de feroaring werom set, of oars wat oan de side feroare.
 
 De lêste feroaring wie fan [[User:$3|$3]] ([[User talk:$3|Oerlis]]).',
-'editcomment'                 => 'De gearfetting wie: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Bewurkings fan [[Special:Contributions/$2|$2]] ([[User talk:$2|Oerlis]]) werom set ta de ferzje fan [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Feroarings werom set fan $1; werom set nei de lêste ferzje fan $2.',
+'editcomment'      => "De gearfetting wie: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Bewurkings fan [[Special:Contributions/$2|$2]] ([[User talk:$2|Oerlis]]) werom set ta de ferzje fan [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Feroarings werom set fan $1; werom set nei de lêste ferzje fan $2.',
+
+# Protect
 'protectlogpage'              => 'Skoattelloch',
 'protectlogtext'              => 'Hjirûnder wurdt it skoateljen en frijjaan fan siden oanjûn. 
 Sjoch [[Special:ProtectedPages|Skoattele side]] foar mear ynformaasje.',
 'protectedarticle'            => '"[[$1]]" skoattele',
 'unprotectedarticle'          => 'joech "[[$1]]" frij',
+'protect-title'               => 'Ynstellen fan befeiligingsnivo foar "$1"',
+'prot_1movedto2'              => '[[$1]] feroare ta [[$2]]',
 'protect-legend'              => 'Befeiliging befêstigje',
 'protectcomment'              => 'Reden foar it skoatteljen',
 'protectexpiry'               => 'Ferrint nei',
 'protect_expiry_invalid'      => 'Tiid fan ferrinnen is net jildich.',
 'protect_expiry_old'          => 'Tiid fan ferrinnen leit yn it ferline.',
 'protect-unchain'             => 'Keppeling foar werneamen frijjaan.',
-'protect-text'                => 'Hjir kin jo it nivo fan skoatteljen sjen en oanpasse foar de side <strong><nowiki>$1</nowiki></strong>.',
+'protect-text'                => "Hjir kin jo it nivo fan skoatteljen sjen en oanpasse foar de side '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Jo kinne it befeiligingsnivo net feroarje wylst jo blokkearre binne.
+Hjir binne de hjoeddeiske ynstellings foar de side '''$1''':",
+'protect-locked-dblock'       => "It befeiligingsnivo kin net feroare wurde om't de database sletten is.
+Hjir binne de hjoeddeiske ynstellings foar de side '''$1''':",
 'protect-locked-access'       => "'''Jo brûker hat gjin rjochten om it befeiligingsnivo te feroarjen.'''
-Dit binne de rinnende ynstellings foar de side <strong>$1</strong>:",
+Dit binne de rinnende ynstellings foar de side '''$1''':",
 'protect-cascadeon'           => "Dizze side is op 't stuit befeilige, om't er yn 'e folgjende {{PLURAL:$1|side|siden}} opnommen is, dy't befeilige {{PLURAL:$1|is|binne}} mei de kaskade-opsje. It befeiligingsnivo feroarje hat alhiel gjin effekt.",
 'protect-default'             => '(standert)',
 'protect-fallback'            => 'Hjir is it rjocht "$1" foar nedich',
@@ -1565,6 +1867,7 @@ Dit binne de rinnende ynstellings foar de side <strong>$1</strong>:",
 'protect-expiring'            => 'ferrint $1 (UTC)',
 'protect-cascade'             => "Underlizzende siden - skoattelje ek alle siden dy't in ûnderdiel útmeitsje fan dizze side",
 'protect-cantedit'            => "Jo kinne it befeiligingsnivo fan dizze side net feroarje, om't jo gjin rjochten hawwe om it te bewurkjen.",
+'protect-expiry-options'      => '15 minuten:15 min,1 oere:1 hour,2 oeren:2 hours,6 oeren:6 hours,12 oeren:12 hours,1 dei:1 day,3 dagen:3 days,1 wike:1 week,2 wiken:2 weeks,1 moanne:1 month,3 moanne:3 months,6 moanne:6 months,1 jier:1 year,ûnbeheind:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permisje:',
 'restriction-level'           => 'Skoattel nivo:',
 'minimum-size'                => 'Min. grutte',
@@ -1585,6 +1888,7 @@ Dit binne de rinnende ynstellings foar de side <strong>$1</strong>:",
 # Undelete
 'undelete'                => 'Side werom set',
 'undeletepage'            => 'Side besjen en werom sette',
+'undeletepagetitle'       => "'''Hjirûnder steane de fuorthelle bewurkings fan [[:$1|$1]]'''.",
 'viewdeletedpage'         => 'Wiske siden besjen',
 'undeletepagetext'        => 'Dizze siden binne wiske, mar sitte noch yn it argyf en kinne weromset wurde. (It argyf kin út en troch leechmakke wurde.)',
 'undelete-fieldset-title' => 'Ferzjes werom sette',
@@ -1596,6 +1900,7 @@ Dit binne de rinnende ynstellings foar de side <strong>$1</strong>:",
 'undeletebtn'             => 'Weromsette',
 'undeletelink'            => 'werom sette',
 'undeletereset'           => 'Leechmeitsje',
+'undeleteinvert'          => 'Omkearde seleksje',
 'undeletecomment'         => 'Utlis foar weromsetten:',
 'undeletedarticle'        => '"$1" weromset',
 'undelete-header'         => 'Sjoch [[Special:Log/delete|de wiskloch]] foar resint wiske siden.',
@@ -1610,25 +1915,27 @@ Dit binne de rinnende ynstellings foar de side <strong>$1</strong>:",
 'blanknamespace' => '(Haadnammerûmte)',
 
 # Contributions
-'contributions' => 'Meidogger-bydragen',
-'mycontris'     => 'Myn bydragen',
-'contribsub2'   => 'Foar "$1 ($2)"',
-'nocontribs'    => "Der binne gjin feroarings fûn dyt't hjirmei oerienkomme.",
-'uctop'         => ' (boppen)',
-'month'         => 'Fan moanne (en earder):',
-'year'          => 'Fan jier (en earder):',
-
-'sp-contributions-newbies-sub' => 'Foar nijlingen',
-'sp-contributions-blocklog'    => 'Blokkearlochboek',
-'sp-contributions-search'      => 'Sykje nei bydragen',
-'sp-contributions-username'    => 'IP Adres of meidoggernamme:',
-'sp-contributions-submit'      => 'Sykje',
+'contributions'       => 'Meidogger-bydragen',
+'contributions-title' => 'Bydragen fan $1',
+'mycontris'           => 'Myn bydragen',
+'contribsub2'         => 'Foar "$1 ($2)"',
+'nocontribs'          => "Der binne gjin feroarings fûn dyt't hjirmei oerienkomme.",
+'uctop'               => ' (boppen)',
+'month'               => 'Fan moanne (en earder):',
+'year'                => 'Fan jier (en earder):',
+
+'sp-contributions-newbies'       => 'Allinne bydragen fan nije brûkers besjen',
+'sp-contributions-newbies-sub'   => 'Foar nijlingen',
+'sp-contributions-newbies-title' => 'Bydragen fan nije meidoggers',
+'sp-contributions-blocklog'      => 'Blokkearlochboek',
+'sp-contributions-search'        => 'Sykje nei bydragen',
+'sp-contributions-username'      => 'IP Adres of meidoggernamme:',
+'sp-contributions-submit'        => 'Sykje',
 
 # What links here
 'whatlinkshere'            => 'Wat is hjirmei keppele?',
 'whatlinkshere-title'      => 'Siden dy\'t keppele binne mei "$1"',
 'whatlinkshere-page'       => 'Side:',
-'linklistsub'              => '(List fan keppelings)',
 'linkshere'                => "Dizze siden binne keppele oan '''[[:$1]]''':",
 'nolinkshere'              => "Der binne gjin siden oan '''[[:$1]]''' keppele.",
 'nolinkshere-ns'           => "Gjin siden yn de keazen nammeromte keppelje nei '''[[:$1]]'''.",
@@ -1654,6 +1961,14 @@ Meld de krekte reden! Neam bygelyks de siden dy't oantaaste waarden.",
 'ipbexpiry'            => 'Ferrint nei:',
 'ipbreason'            => 'Reden',
 'ipbreasonotherlist'   => 'Oare reden',
+'ipbreason-dropdown'   => '*Faak foarkommende redenen foar blokkades
+** Ferkearde ynformaasje ynfiere
+** Fuortheljen fan ynformaasje út siden
+** Spamferwizing nei eksterne websites
+** Ynfoegjen fan ûnsin yn siden
+** Yntimidearjend gedrach
+** Misbrûk troch meardere brûkers
+** Unakseptabele brûkersnamme',
 'ipbanononly'          => 'Slút allinich anonyme meidoggers út',
 'ipbcreateaccount'     => 'Blokkearje it oanmeitsjen fan in nij profyl',
 'ipbenableautoblock'   => "Automatysk de lêste IP adressen útslute dy't troch dizze meidogger brûkt binne.",
@@ -1727,6 +2042,8 @@ daalks weromneame as jo in flater meitsje, mar jo kinne in oare side net oerskri
 
 In dizze gefallen is it oan jo hoe't jo de oerlisside werneame of ynfoegje wolle.",
 'movearticle'             => 'Werneam side',
+'movenologin'             => 'Net oameld',
+'movenologintext'         => 'Jo moatte [[Special:UserLogin|oanmeld]] wêze om in side wer te neamen.',
 'newtitle'                => 'As nij titel',
 'move-watch'              => 'Folch dizze side',
 'movepagebtn'             => 'Werneam side',
@@ -1748,7 +2065,6 @@ In dizze gefallen is it oan jo hoe't jo de oerlisside werneame of ynfoegje wolle
 De doelside "[[:$1]]" is der al. Moat dy wiske wurde om plak te meitsjen foar it werneamen?',
 'delete_and_move_confirm' => 'Ja, wiskje de side',
 'delete_and_move_reason'  => 'Wiske om plak te meitsjen foar in werneamde side',
-'immobile_namespace'      => "De nije titel is yn in nammeromte dêr't gjin siden oan tafoege wurde kinne.",
 
 # Export
 'export'            => 'Eksportearje',
@@ -1764,7 +2080,7 @@ De doelside "[[:$1]]" is der al. Moat dy wiske wurde om plak te meitsjen foar it
 'allmessagesdefault'  => 'Standerttekst',
 'allmessagescurrent'  => 'Tekst yn de nijste ferzje',
 'allmessagestext'     => 'Dit is in list fan alle systeemberjochten beskikber yn de MediaWiki-nammeromte.
-Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [http://translatewiki.net Betawiki].',
+Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [http://translatewiki.net translatewiki.net].',
 'allmessagesfilter'   => 'Berjocht namme filter:',
 'allmessagesmodified' => 'Allinne wizige berjochten',
 
@@ -1777,6 +2093,7 @@ Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [htt
 # Special:Import
 'import'                  => 'Importearje siden',
 'import-interwiki-submit' => 'Ymportearje',
+'import-comment'          => 'Oanmerking:',
 'importstart'             => 'Siden oan it ymportearjen ...',
 'import-revision-count'   => '$1 {{PLURAL:$1|ferzje|ferzjes}}',
 'importnopages'           => 'Gjin siden te ymportearjen.',
@@ -1812,10 +2129,13 @@ Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [htt
 'tooltip-ca-history'              => 'Eardere ferzjes fan dizze side.',
 'tooltip-ca-protect'              => 'Dizze side befeiligje',
 'tooltip-ca-delete'               => 'Dizze side weidwaan',
+'tooltip-ca-undelete'             => 'Fuorthelle bewurkings fan dizze side weromsette',
 'tooltip-ca-move'                 => 'Dizze side ferskowe',
 'tooltip-ca-watch'                => 'Dizze side oan myn folchside tafoegje',
 'tooltip-ca-unwatch'              => 'Dizze side fan myn folchlist ôfhelje',
 'tooltip-search'                  => '{{SITENAME}} trochsykje',
+'tooltip-search-go'               => 'Gean nei in side mei dizze namme as dy bestiet',
+'tooltip-search-fulltext'         => 'De siden foar dizze tekst sykje',
 'tooltip-p-logo'                  => 'Haadside',
 'tooltip-n-mainpage'              => 'Gean nei de haadside',
 'tooltip-n-portal'                => "Oer it projekt: wat'st dwaan kinst, wêr'st dingen fine kinst.",
@@ -1848,11 +2168,11 @@ Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [htt
 'common.js' => '/* Alles wat hjir oan JavaScript delset wurdt, wurdt foar alle brûkers laden foar eltse side! */',
 
 # Attribution
-'anonymous'     => 'Anonime meidogger(s) fan {{SITENAME}}',
+'anonymous'     => 'Anonime {{PLURAL:$1|meidogger|meidoggers}} fan {{SITENAME}}',
 'siteuser'      => '{{SITENAME}} meidogger $1',
 'othercontribs' => 'Basearre op wurk fan $1.',
 'others'        => 'Oaren',
-'siteusers'     => '{{SITENAME}} meidogger(s) $1',
+'siteusers'     => '{{SITENAME}} {{PLURAL:$2|meidogger|meidoggers}} $1',
 
 # Spam protection
 'spamprotectiontext'  => "De side dy't jo fêstlizze woene is blokkearre troch in spam filter. Dit wurdt wierskynlik feroarsake troch in ferwizing nei in ekstern webstee.",
@@ -1861,6 +2181,10 @@ Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [htt
 # Info page
 'infosubtitle' => 'Ynformaasje foar side',
 
+# Skin names
+'skinname-standard'  => 'Standert',
+'skinname-nostalgia' => 'Nostalgy',
+
 # Math options
 'mw_math_png'    => 'Altiten as PNG ôfbyldzje',
 'mw_math_simple' => 'HTML foar ienfâldiche formules, oars PNG',
@@ -1892,13 +2216,14 @@ Sjoch: [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation], [htt
 'show-big-image'       => 'Hegere resolúsje',
 'show-big-image-thumb' => '<small>Grutte fan dizze ôfbylding: $1 × $2 pixels</small>',
 
-# Special:NewImages
-'newimages'     => 'Nije ôfbylden',
-'imagelisttext' => "Dit is in list fan '''$1''' {{PLURAL:$1|triem|triemen}}, op $2.",
-'showhidebots'  => '(Bots $1)',
-'noimages'      => 'Neat te sjen.',
-'ilsubmit'      => 'Sykje',
-'bydate'        => 'datum',
+# Special:NewFiles
+'newimages'        => 'Nije ôfbylden',
+'imagelisttext'    => "Dit is in list fan '''$1''' {{PLURAL:$1|triem|triemen}}, op $2.",
+'newimages-legend' => 'Filter',
+'showhidebots'     => '(Bots $1)',
+'noimages'         => 'Neat te sjen.',
+'ilsubmit'         => 'Sykje',
+'bydate'           => 'datum',
 
 # Bad image list
 'bad_image_list' => "De opmaak is as folget:
@@ -2018,9 +2343,6 @@ Dizze befêstigingskoade ferrint dan op $4.',
 : ''$2''
 Wolle jo de side wier op 'e nij skriuwe?",
 
-# HTML dump
-'redirectingto' => 'Synonym foar [[:$1]]...',
-
 # Multipage image navigation
 'imgmultipagenext' => 'folgjende side →',
 'imgmultigo'       => 'Los!',
@@ -2056,6 +2378,7 @@ Wolle jo de side wier op 'e nij skriuwe?",
 
 # Special:Version
 'version'                  => 'Ferzje', # Not used as normal message but as header for the special page itself
+'version-extensions'       => 'Ynstallearre útwreidings',
 'version-specialpages'     => 'Bysûndere siden',
 'version-variables'        => 'Fariabels',
 'version-other'            => 'Oare',
diff --git a/languages/messages/MessagesGa.php b/languages/messages/MessagesGa.php
index 36917474..9ef9b170 100644
--- a/languages/messages/MessagesGa.php
+++ b/languages/messages/MessagesGa.php
@@ -13,15 +13,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => 'Gnáth',
-	'nostalgia' => 'Sean-nós',
-	'cologneblue' => 'Gorm na Colóna',
-	'monobook' => 'MonoBook',
-	'myskin' => 'MySkin',
-	'chick' => 'Chick'
-);
-
 $magicWords = array(
 	#   ID	                         CASE  SYNONYMS
 	'redirect'               => array( 0,    '#redirect', '#athsheoladh' ),
@@ -76,8 +67,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Plé_úsáideora',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Plé_{{grammar:genitive|$1}}',
-	NS_IMAGE            => '�omhá',
-	NS_IMAGE_TALK       => 'Plé_íomhá',
+	NS_FILE             => '�omhá',
+	NS_FILE_TALK        => 'Plé_íomhá',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Plé_MediaWiki',
 	NS_TEMPLATE         => 'Teimpléad',
@@ -89,7 +80,7 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Plé_í­omhá' => NS_IMAGE_TALK,
+	'Plé_í­omhá' => NS_FILE_TALK,
 	'Múnla' => NS_TEMPLATE,
 	'Plé_múnla' => NS_TEMPLATE_TALK,
 	'Rang' => NS_CATEGORY
@@ -114,8 +105,8 @@ $messages = array(
 'tog-editwidth'               => 'Cuir uasmhéid ar an mbosca eagair',
 'tog-watchcreations'          => 'Cuir ar mo liosta faire leathanaigh a chruthaím',
 'tog-watchdefault'            => 'Déan faire ar leathanaigh a athraím',
-'tog-watchmoves'              => 'Déan faire ar leathanaigh a athainmnaím',
-'tog-watchdeletion'           => 'Déan faire ar leathanaigh a scriosaim',
+'tog-watchmoves'              => 'Cuir ar mo liosta faire leathanaigh a athainmnaím',
+'tog-watchdeletion'           => 'Cuir ar mo liosta faire leathanaigh a scriosaím',
 'tog-minordefault'            => 'Déan mionathruithe de gach aon athrú, mar réamhshocrú',
 'tog-previewontop'            => 'Cuir an réamhamharc os cionn an bhosca eagair, <br />agus ná cuir é taobh thíos de',
 'tog-previewonfirst'          => 'Taispeáin réamhamharc don chéad athrú',
@@ -134,14 +125,15 @@ $messages = array(
 'tog-watchlisthideown'        => 'Folaigh mo chuid athruithe ón liosta faire',
 'tog-watchlisthidebots'       => 'Folaigh athruithe de chuid róbait ón liosta faire',
 'tog-watchlisthideminor'      => 'Folaigh mionathruithe ón liosta faire',
+'tog-ccmeonemails'            => 'Cuir cóip chugam de gach teactaireacht r-phoist a chuirim chuig úsáideoirí eile',
+'tog-diffonly'                => 'Ná taispeáin inneachar an leathanaigh faoi difríochteanna',
 'tog-showhiddencats'          => 'Taispeáin chatagóirí folaithe',
+'tog-norollbackdiff'          => 'Fág an difr ar lár tar éis athruithe a rolladh siar',
 
 'underline-always'  => 'Ar siúl i gcónaí',
 'underline-never'   => 'Múchta',
 'underline-default' => 'Mar atá réamhshocraithe sa bhrabhsálaí',
 
-'skinpreview' => '(Réamhamharc)',
-
 # Dates
 'sunday'        => 'an Domhnach',
 'monday'        => 'an Luan',
@@ -230,7 +222,7 @@ agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar ú
 'mytalk'         => 'Mo chuid phlé',
 'anontalk'       => 'Plé don seoladh IP seo',
 'navigation'     => 'Nascleanúint',
-'and'            => 'agus',
+'and'            => '&#32;agus',
 
 # Metadata in edit box
 'metadata_help' => 'Meiteasonraí:',
@@ -293,8 +285,6 @@ agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar ú
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Maidir leis an {{SITENAME}}',
 'aboutpage'            => 'Project:Maidir leis',
-'bugreports'           => 'Fabht-thuairiscí',
-'bugreportspage'       => 'Project:Fabht-thuairiscí',
 'copyright'            => 'Tá an t-ábhar le fáil faoin $1.',
 'copyrightpagename'    => 'Cóipcheart {{GRAMMAR:genitive|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:Cóipchearta',
@@ -317,6 +307,7 @@ agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar ú
 
 'badaccess'        => 'Earráid ceada',
 'badaccess-group0' => 'Níl cead agat an gníomh a roghnaigh tú a dhéanamh.',
+'badaccess-groups' => 'Níl cead ag daoine é sin a dhéanamh ach amháin {{PLURAL:$2|duine sa ghrúpa|daoine sna grúpaí}}: $1.',
 
 'versionrequired'     => 'Tá leagan $1 de MediaWiki de dhíth',
 'versionrequiredtext' => 'Tá an leagan $1 de MediaWiki riachtanach chun an leathanach seo a úsáid. Féach ar [[Special:Version]]',
@@ -330,6 +321,8 @@ agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar ú
 'editsection'             => 'athraigh',
 'editold'                 => 'athraigh',
 'viewsourceold'           => 'féach ar foinse',
+'editlink'                => 'cur in eagar',
+'viewsourcelink'          => 'féach ar an foinse',
 'editsectionhint'         => 'Athraigh mír: $1',
 'toc'                     => 'Clár ábhair',
 'showtoc'                 => 'taispeáin',
@@ -392,6 +385,11 @@ den uair a díghlasálfar an bunachar sonraí.',
 Tar éis seo, díghlasálfar an bunachar sonraí arís.
 Tugadh an míniú seo ag an riarthóir a ghlasáil é:
 $1',
+'missing-article'      => 'Ní bhfuarthas téacs an leathanaigh ceart, darbh ainm "$1" $2.
+
+De ghnáth, tarlaíonn sé seo nuair a leantar nasc stáire nó difr chuig leathanach a scriosadh.
+
+Murab fhíor é seo, is féidir go bhfuair tú fabht sa bhogearraí. Beimid buíoch duit é a chur in iúl do [[Special:ListUsers/sysop|riarthóir]], chomh maith le URL an suíoimh.',
 'missingarticle-rev'   => '(leagan#: $1)',
 'missingarticle-diff'  => '(Diof: $1, $2)',
 'readonly_lag'         => 'Glasáladh an bunachar sonraí go huathoibríoch, go dtiocfaidh na sclábhfhreastalaithe suas leis an máistirfhreastalaí.',
@@ -410,9 +408,8 @@ B'fhéidir gur scrios duine eile é cheana féin.",
 'badtitle'             => 'Teideal neamhbhailí',
 'badtitletext'         => "Bhí teideal an leathanaigh a d'iarr tú ar neamhbhailí, folamh, nó
 teideal idirtheangach nó idirvicí nasctha go mícheart.",
-'perfdisabled'         => 'Tá brón orainn! Díchumasaíodh an gné seo ar feadh tamaill chun luas an bhunachair sonraí a chosaint.',
 'perfcached'           => 'Fuarthas na sonraí a leanas as taisce, agus is dócha go bhfuil siad as dáta.',
-'wrong_wfQuery_params' => 'Paraiméadair míchearta don wfQuery()<br />
+'wrong_wfQuery_params' => 'Paraiméadair mhíchearta don wfQuery()<br />
 Feidhm: $1<br />
 Iarratas: $2',
 'viewsource'           => 'Féach ar fhoinse',
@@ -420,9 +417,10 @@ Iarratas: $2',
 'protectedpagetext'    => 'Tá an leathanach seo glasáilte chun coisc ar eagarthóireacht.',
 'viewsourcetext'       => 'Is féidir foinse an leathanach seo a fheiceáil ná a cóipeáil:',
 'editinginterface'     => "'''Rabhadh:''' Tá tú ag athrú leathanaigh a bhfuil téacs comhéadain do na bogearraí air. Cuirfear athruithe ar an leathanach seo i bhfeidhm ar an gcomhéadan úsáideora.
-Más maith leat MediaWiki a aistriú, cuimhnigh ar [http://translatewiki.net/wiki/Main_Page?setlang=ga Betawiki] (tionscadal logánaithe MediaWiki) a úsáid.",
+Más maith leat MediaWiki a aistriú, cuimhnigh ar [http://translatewiki.net/wiki/Main_Page?setlang=ga translatewiki.net] (tionscadal logánaithe MediaWiki) a úsáid.",
 'sqlhidden'            => '(Iarratas SQL folaithe)',
 'namespaceprotected'   => "Ní chead agat leathanaigh a chur in eagar san ainmspás '''$1'''.",
+'customcssjsprotected' => 'Níl cead agat an leathanach seo a athrú, mar is sainroghanna úsáideora eile atá ann.',
 'ns-specialprotected'  => 'Ní féidir leathanaigh speisialta a chur in eagar.',
 'titleprotected'       => "Tá an teideal seo cosanta ar chruthú le [[User:$1|$1]].
 An fáth ná ''$2''.",
@@ -433,10 +431,10 @@ An fáth ná ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Logáil amach',
-'logouttext'                 => '<strong>Tá tú logáilte amach anois.</strong>
+'logouttext'                 => "'''Tá tú logáilte amach anois.'''
 
 Is féidir leat an {{SITENAME}} a úsáid fós gan ainm, nó is féidir leat [[Special:UserLogin|logáil isteach arís]] mar an úsáideoir céanna, nó mar úsáideoir eile.
-Tabhair faoi deara go taispeáinfear roinnt leathanaigh mar atá tú logáilte isteach fós, go dtí go ghlanfá amach do taisce líonleitheora.',
+Tabhair faoi deara go taispeáinfear roinnt leathanaigh mar atá tú logáilte isteach fós, go dtí go ghlanfá amach do taisce líonleitheora.",
 'welcomecreation'            => '== Tá fáilte romhat, $1! ==
 
 Cruthaíodh do chuntas. Ná déan dearmad athrú a dhéanamh ar do chuid [[Special:Preferences|sainroghanna {{GRAMMAR:genitive|{{SITENAME}}}}]].',
@@ -447,7 +445,6 @@ Cruthaíodh do chuntas. Ná déan dearmad athrú a dhéanamh ar do chuid [[Speci
 'remembermypassword'         => 'Cuimhnigh orm',
 'yourdomainname'             => "D'fhearann",
 'externaldberror'            => 'Bhí earráid bhunachair sonraí ann maidir le fíordheimhniú seachtrach, nóThere was either an external authentication database error or you are not allowed to update your external account.',
-'loginproblem'               => '<b>Tharla earráid agus tú ag logáil isteach.</b><br />Bain triail eile as!',
 'login'                      => 'Logáil isteach',
 'nav-login-createaccount'    => 'Logáil isteach',
 'loginprompt'                => 'Tá sé riachtanach fianáin a chur i ngníomh chun logáil isteach a dhéanamh ag {{SITENAME}}.',
@@ -515,11 +512,12 @@ chun fíordheimhniú a dhéanamh. Chun fíordheimhniú a dhéanamh gur leatsa an
 'throttled-mailpassword'     => 'Seoladh meabhrúchán fhocal faire cheana, níos lú ná {{PLURAL:$1|uair amháin|$1 uair}} ó shin.
 Chun droch-úsáid a choscadh, ní sheolfar ach meabhrúchán fhocal faire amháin gach {{PLURAL:$1|uair|$1 uair}}.',
 'mailerror'                  => 'Tharlaigh earráid leis an seoladh: $1',
-'acct_creation_throttle_hit' => 'Gabh ár leithscéal, chruthaigh tú $1 cuntais cheana féin.
-Ní féidir leat níos mó díobh a chruthú.',
-'emailauthenticated'         => "D'fhíordheimhníodh do sheoladh ríomhphoist ar $1.",
+'acct_creation_throttle_hit' => 'Gabh ár leithscéal, ach tá {{PLURAL:$1|cuntas amháin|$1 cuntais}} a chruthaigh tú cheana féin.
+Ní féidir leat níos mó ná an méid sin a chruthú.',
+'emailauthenticated'         => "D'fhíordheimhníodh do sheoladh ríomhphoist ar $2 ar $3.",
 'emailnotauthenticated'      => 'Ní dhearna fíordheimhniú ar do sheoladh ríomhphoist fós, agu díchumasaítear na hardtréithe ríomhphoist go dtí go fíordheimhneofaí é (d.c.f.).
 Chun fíordheimhniú a dhéanamh, logáil isteach leis an focal faire neamhbhuan atá seolta chugat, nó iarr ar ceann nua ar an leathanach logála istigh.',
+'noemailprefs'               => 'Is gá do sheoladh r-phoist a chur isteach chun na gnéithe seo a úsáid.',
 'emailconfirmlink'           => 'Deimhnigh do ríomhsheoladh',
 'invalidemailaddress'        => 'Ní féidir an seoladh ríomhphoist a ghlacadh leis mar is dócha go bhfuil formáid neamhbhailí aige.
 Iontráil seoladh dea-fhormáidte le do thoil, nó glan an réimse sin.',
@@ -530,8 +528,21 @@ Iontráil seoladh dea-fhormáidte le do thoil, nó glan an réimse sin.',
 'loginlanguagelabel'         => 'Teanga: $1',
 
 # Password reset dialog
-'resetpass_text'   => '<!-- Cur téacs anseo -->',
-'resetpass_header' => 'Athshocraigh pasfhocail chuntais',
+'resetpass'                 => "Athshocraigh d'fhocail faire",
+'resetpass_announce'        => "Tá tú logáilte isteach le cód sealadach a seoladh chugat i r-phost.
+Chun d'iarratas logáil isteach a chríochnú, caithfidh tú focal faire nua a roghnú anseo:",
+'resetpass_text'            => '<!-- Cur téacs anseo -->',
+'resetpass_header'          => 'Athshocraigh pasfhocail chuntais',
+'oldpassword'               => 'Focal faire reatha:',
+'newpassword'               => 'Focal faire nua:',
+'retypenew'                 => 'Athiontráil an focal nua faire:',
+'resetpass_submit'          => 'Roghnaigh focal faire agus logáil isteach',
+'resetpass_bad_temporary'   => "Níl an focal faire sealadach bailí.
+B'fhéidir gur athraigh tú d'fhocal faire roimhe seo, nó gur iarr tú ar ceann nua.",
+'resetpass_forbidden'       => 'Ní féidir focail faire a athrú',
+'resetpass-no-info'         => 'Caithfidh tú bheith logáilte istigh chun teacht ar an leathanach seo go díreach.',
+'resetpass-submit-loggedin' => "Athraigh d'fhocal faire",
+'resetpass-temp-password'   => 'Focal faire sealadach:',
 
 # Edit page toolbar
 'bold_sample'     => 'Cló trom',
@@ -550,14 +561,14 @@ Iontráil seoladh dea-fhormáidte le do thoil, nó glan an réimse sin.',
 'nowiki_tip'      => 'Cuir vicífhormáidiú ar ceal',
 'image_sample'    => 'Sámpla.jpg',
 'image_tip'       => '�omhá leabaithe',
-'media_sample'    => 'Sámpla.mp3',
+'media_sample'    => 'Sámpla.ogg',
 'media_tip'       => 'Nasc do chomhad meáin',
 'sig_tip'         => 'Do shíniú le stampa ama',
 'hr_tip'          => 'Líne cothrománach (inúsáidte go coigilteach)',
 
 # Edit pages
-'summary'                => 'Achoimriú',
-'subject'                => '�bhar/ceannlíne',
+'summary'                => 'Achoimriú:',
+'subject'                => '�bhar/ceannlíne:',
 'minoredit'              => 'Mionathrú é seo',
 'watchthis'              => 'Déan faire ar an lch seo',
 'savearticle'            => 'Sábháil an lch',
@@ -567,7 +578,8 @@ Iontráil seoladh dea-fhormáidte le do thoil, nó glan an réimse sin.',
 'showdiff'               => 'Taispeáin athruithe',
 'anoneditwarning'        => "'''Rabhadh:''' Níl tú logáilte isteach. Cuirfear do sheoladh IP i stair eagarthóireachta an leathanaigh seo.",
 'missingsummary'         => "'''Cuimhneachán:''' Níor thug tú achoimriú don athrú. Má chliceáileann tú Sábháil arís, sábhálfar an t-athrú gan é a hachoimriú.",
-'summary-preview'        => 'Réamhamharc an achoimriú',
+'missingcommenttext'     => 'Cuir nóta tráchta isteach faoi seo, le do thoil.',
+'summary-preview'        => 'Réamhamharc an achoimriú:',
 'blockedtitle'           => 'Tá an úsáideoir seo faoi chosc',
 'blockedtext'            => "<big>'''Chuir \$1 cosc ar d’ainm úsáideora nó ar do sheoladh IP.'''</big>
 
@@ -604,15 +616,17 @@ Má tháinig tú anseo as dearmad, brúigh ar cnaipe '''ar ais''' ar do bhrabhsÃ
 'noarticletext'          => 'Níl aon téacs ar an leathanach seo faoi láthair.  Is féidir [[Special:Search/{{PAGENAME}}|cuardach a dhéanamh le haghaidh an teidil seo]] i leathanaigh eile nó [{{fullurl:{{FULLPAGENAME}}|action=edit}} an leathanach seo a athrú].',
 'clearyourcache'         => "'''Tugtar faoi deara:''' Tar éis duit an t-inneachar a shábháil, caithfear gabháil thar thaisce an bhrabhsálaí chun na hathruithe a fheiceáil.
 '''Mozilla/Safari/Konqueror:''' cliceáil ar ''Athlódáil'', agus ''Iomlaoid'' á bhrú agat (nó brúigh ''Ctrl-Iomlaoid-R''), '''IE:''' brúigh ''Ctrl-F5'', '''Opera:''' brúigh ''F5''.",
-'usercssjsyoucanpreview' => "<strong>Leid:</strong> Sula sábhálaím tú, úsáid an cnaipe
+'usercssjsyoucanpreview' => "'''Leid:''' Sula sábhálaím tú, úsáid an cnaipe
 'Réamhamharc' chun do CSS/JS nua a tástáil.",
 'usercsspreview'         => "'''Cuimhnigh nach bhfuil seo ach réamhamharc do CSS úsáideora -
 níor sábháladh é go fóill!'''",
 'userjspreview'          => "'''Cuimhnigh nach bhfuil seo ach réamhamharc do JavaScript úsáideora
 - níor sábháladh é go fóill!'''",
+'userinvalidcssjstitle'  => "'''AIRE:''' Níl craiceann ar bith darbh ainm \"\$1\".
+Cuimhnigh go úsáideann leathanaigh saincheaptha .css agus .js teideal i gcás íochtar, m.sh. úsaidtear {{ns:user}}:Foo/monobook.css in ann {{ns:user}}:Foo/Monobook.css.",
 'updated'                => '(Leasaithe)',
-'note'                   => '<strong>Tabhair faoi deara:</strong>',
-'previewnote'            => '<strong>Cuimhnigh nach bhfuil ach réamhamharc sa leathanach seo, agus nach sábháladh fós é!</strong>',
+'note'                   => "'''Tabhair faoi deara:'''",
+'previewnote'            => "'''Cuimhnigh nach bhfuil ach réamhamharc sa leathanach seo, agus nach sábháladh fós é!'''",
 'previewconflict'        => 'San réamhamharc seo, feachann tú an téacs dé réir an eagarbhosca
 thuas mar a taispeáinfear é má sábháilfear é.',
 'editing'                => 'Ag athrú $1',
@@ -627,26 +641,27 @@ Nuair a brúann tú ar an cnaipe "Sábháil an leathanach", ní shábhálfar aon
 amháin</b> an téacs sa bhosca thuas.',
 'yourtext'               => 'Do chuid téacs',
 'storedversion'          => 'Eagrán sábháilte',
-'editingold'             => '<strong>AIRE: Tá tú ag athrú eagrán an leathanaigh atá as dáta.
-Dá shábhálfá é, caillfear aon athrú a rinneadh ó shin an eagrán seo.</strong>',
+'editingold'             => "'''AIRE: Tá tú ag athrú eagrán an leathanaigh atá as dáta.
+Dá shábhálfá é, caillfear aon athrú a rinneadh ó shin an eagrán seo.'''",
 'yourdiff'               => 'Difríochtaí',
-'copyrightwarning'       => 'Tabhair faoi deara go dtuigtear go bhfuil gach dréacht do {{SITENAME}} eisithe faoi $2 (féach ar $1 le haghaidh tuilleadh eolais). 
+'copyrightwarning'       => "Tabhair faoi deara go dtuigtear go bhfuil gach dréacht do {{SITENAME}} eisithe faoi $2 (féach ar $1 le haghaidh tuilleadh eolais). 
 Murar mian leat go gcuirfí do chuid scríbhinne in eagar go héadrócaireach agus go n-athdálfaí gan teorainn í, ná cuir isteach anseo í.<br /> 
 Ina theannta sin, geallann tú gur scríobh tú féin an dréacht seo, nó gur chóipeáil tú é ó fhoinse san fhearann poiblí nó acmhainn eile saor ó chóipcheart (féach ar $1 le haghaidh tuilleadh eolais). 
-<strong>N� CUIR ISTEACH OBAIR LE CÓIPCHEART GAN CHEAD!</strong>',
-'copyrightwarning2'      => 'Tabhair faoi deara gur féidir le heagarthóirí eile gach dréacht do {{SITENAME}} a chur in eagar, a athrú agus a scriosadh. 
+'''N� CUIR ISTEACH OBAIR LE CÓIPCHEART GAN CHEAD!'''",
+'copyrightwarning2'      => "Tabhair faoi deara gur féidir le heagarthóirí eile gach dréacht do {{SITENAME}} a chur in eagar, a athrú agus a scriosadh. 
 Murar mian leat go gcuirfí do chuid scríbhinne in eagar go héadrócaireach, ná cuir isteach anseo í.<br /> 
 Ina theannta sin, geallann tú gur scríobh tú féin an dréacht seo, nó gur chóipeáil tú é ó fhoinse san fhearann poiblí nó acmhainn eile saor ó chóipcheart (féach ar $1 le haghaidh tuilleadh eolais). 
-<strong>N� CUIR ISTEACH OBAIR LE CÓIPCHEART GAN CHEAD!</strong>',
-'longpagewarning'        => '<strong>AIRE: Tá an leathanach seo $1 cilibheart i bhfad;
+'''N� CUIR ISTEACH OBAIR LE CÓIPCHEART GAN CHEAD!'''",
+'longpagewarning'        => "'''AIRE: Tá an leathanach seo $1 cilibheart i bhfad;
 ní féidir le roinnt brabhsálaithe leathanaigh a athrú má tá siad breis agus 32 KiB, nó níos fada ná sin.
-Más féidir, giotaigh an leathanach i gcodanna níos bige.</strong>',
-'longpageerror'          => '<strong>EARR�ID: Tá an téacs a chuir isteach $1 cilibheart ar fad, sin níos faide ná $2 cilibheart, an uasmhéid.
-Ní féidir é a shábháil.</strong>',
-'readonlywarning'        => "AIRE: Glasáladh an bunachar sonraí, agus mar sin
-ní féidir leat do chuid athruithe a shábháil díreach anois. B'fhéidir gur mhaith leat an téacs a ghearr is
-ghreamú i gcomhad téacs agus é a úsáid níos déanaí.",
-'protectedpagewarning'   => '<strong>AIRE: Glasáladh an leathanach seo, agus ní féidir le duine ar bith é a athrú ach amhaín na húsáideoirí le pribhléidí oibreora córais. Bí cinnte go leanann tú na treoirlínte do leathanaigh glasáilte.</strong>',
+Más féidir, giotaigh an leathanach i gcodanna níos bige.'''",
+'longpageerror'          => "'''EARR�ID: Tá an téacs a chuir isteach $1 cilibheart ar fad, sin níos faide ná $2 cilibheart, an uasmhéid.
+Ní féidir é a shábháil.'''",
+'readonlywarning'        => "'''AIRE: Glasáladh an bunachar sonraí, agus mar sin ní féidir leat do chuid athruithe a shábháil díreach anois.
+B'fhéidir gur mhaith leat an téacs a ghearr is ghreamú i gcomhad téacs agus é a úsáid níos déanaí.'''
+
+An fáth a thabhairt an riarthóir a ghlasadh nach: $1",
+'protectedpagewarning'   => "'''AIRE: Glasáladh an leathanach seo, agus ní féidir le duine ar bith é a athrú ach amhaín na húsáideoirí le pribhléidí oibreora córais. Bí cinnte go leanann tú na treoirlínte do leathanaigh glasáilte.'''",
 'templatesused'          => 'Teimpléid atá á úsáid ar an lch seo:',
 'templatesusedpreview'   => 'Teimpléid in úsáid sa réamhamharc alt seo:',
 'templatesusedsection'   => 'Teimpléid in úsáid san alt seo:',
@@ -655,39 +670,40 @@ ghreamú i gcomhad téacs agus é a úsáid níos déanaí.",
 'edittools'              => '<!-- Taispeánfar an téacs seo faoi foirmeacha eagarthóireachta agus uaslódála. -->',
 'nocreatetext'           => 'Tá srianadh ar {{SITENAME}} faoin leathanaigh nua a cruthaidh.
 Is féidir leat dul ar ais chun leathanach láithreach a athrú, nó [[Special:UserLogin|log isteach nó cruthaigh cuntas nua]].',
+'nocreate-loggedin'      => 'Níl cead agat leathanaigh nua a chruthú.',
 'permissionserrors'      => 'Cead rochtana earráidí',
 'recreate-deleted-warn'  => "'''Rabhadh: Tá tú ag athchruthú leathanach ina bhfuil scriostha roimhe.'''
 
 Bhreithneoidh tú cibé go bhfuil sé oiriúnach chun lean an leathanach seo a cur in eagar.<br />
 Tá an log scriosta ar fáil anseo mar áis:",
+'deletelog-fulllog'      => 'Feach ar log lán',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Ní féidir cuntas a chruthú',
 
 # History pages
-'viewpagelogs'        => 'Féach ar logaí faoin leathanach seo',
-'nohistory'           => 'Níl aon stáir athraithe ag an leathanach seo.',
-'revnotfound'         => 'Ní bhfuarthas an athrú',
-'revnotfoundtext'     => "Ní bhfuarthas seaneagrán an leathanaigh a d'iarr tú ar.
-Cinntigh an URL a d'úsáid tú chun an leathanach seo a rochtain.",
-'currentrev'          => 'Leagan reatha',
-'revisionasof'        => 'Leagan ó $1',
-'revision-info'       => 'Leagan ó $1 le $2',
-'previousrevision'    => '� An leasú roimhe seo',
-'nextrevision'        => 'An chéad leasú eile →',
-'currentrevisionlink' => 'Leagan reatha',
-'cur'                 => 'rth',
-'next'                => 'i ndiadh',
-'last'                => 'rmh',
-'page_first'          => 'céad',
-'page_last'           => 'deireanach',
-'histlegend'          => 'Chun difríochtaí a roghnú, marcáil na cnaipíní de na heagráin atá tú ag iarraidh comparáid a dhéanamh astu, agus brúigh Iontráil nó an cnaipe ag bun an leathanaigh.<br />
+'viewpagelogs'           => 'Féach ar logaí faoin leathanach seo',
+'nohistory'              => 'Níl aon stáir athraithe ag an leathanach seo.',
+'currentrev'             => 'Leagan reatha',
+'currentrev-asof'        => 'Leagan reatha ó $1',
+'revisionasof'           => 'Leagan ó $1',
+'revision-info'          => 'Leagan ó $1 le $2', # Additionally available: $3: revision id
+'previousrevision'       => '� An leasú roimhe seo',
+'nextrevision'           => 'An chéad leasú eile →',
+'currentrevisionlink'    => 'Leagan reatha',
+'cur'                    => 'rth',
+'next'                   => 'i ndiadh',
+'last'                   => 'rmh',
+'page_first'             => 'céad',
+'page_last'              => 'deireanach',
+'histlegend'             => 'Chun difríochtaí a roghnú, marcáil na cnaipíní de na heagráin atá tú ag iarraidh comparáid a dhéanamh astu, agus brúigh Iontráil nó an cnaipe ag bun an leathanaigh.<br />
 Treoir: (rth) = difríocht ón leagan reatha, (rmh) = difríocht ón leagan roimhe, <b>m</b> = mionathrú.',
-'deletedrev'          => '[scriosta]',
-'histfirst'           => 'An ceann is luaithe',
-'histlast'            => 'An ceann is déanaí',
-'historysize'         => '({{PLURAL:$1|Beart amháin|$1 bearta}})',
-'historyempty'        => '(folamh)',
+'history-fieldset-title' => 'Brabhsáil an stáir',
+'deletedrev'             => '[scriosta]',
+'histfirst'              => 'An ceann is luaithe',
+'histlast'               => 'An ceann is déanaí',
+'historysize'            => '({{PLURAL:$1|Beart amháin|$1 bearta}})',
+'historyempty'           => '(folamh)',
 
 # Revision feed
 'history-feed-title'          => 'Stáir leasú',
@@ -714,105 +730,127 @@ Treoir: (rth) = difríocht ón leagan reatha, (rmh) = difríocht ón leagan roim
 'difference'              => '(Difríochtaí idir leaganacha)',
 'lineno'                  => 'Líne $1:',
 'compareselectedversions' => 'Cuir na leagain roghnaithe i gcomparáid',
+'wikicodecomparison'      => 'Comparáid Vicítéacs',
 'editundo'                => 'cealaigh',
 'diff-multi'              => '({{PLURAL:$1|Leasú idirmheánach amháin|$1 leasú idirmheánach}} nach thaispeántar.)',
+'diff-movedto'            => 'a athrú go $1',
+'diff-changedfrom'        => 'a athrú as $1',
+'diff-src'                => 'foinse',
+'diff-width'              => 'leithead',
+'diff-height'             => 'airde',
+'diff-p'                  => "'''alt'''",
+'diff-a'                  => "'''nasc'''",
+'diff-big'                => "'''mór'''",
+'diff-del'                => "'''scriosta'''",
 
 # Search results
-'searchresults'            => 'Torthaí an chuardaigh',
-'searchresulttext'         => 'Féach ar [[{{MediaWiki:Helppage}}|{{int:help}}]] chun a thuilleadh eolais a fháil maidir le cuardaigh {{GRAMMAR:genitive|{{SITENAME}}}}.',
-'searchsubtitle'           => 'Don iarratas "[[:$1]]"',
-'searchsubtitleinvalid'    => 'Don iarratas "$1"',
-'noexactmatch'             => "'''Níl aon leathanach ann leis an teideal \"\$1\".''' Is féidir leat é a [[:\$1|cruthú]].",
-'titlematches'             => 'Tá macasamhla teidil alt ann',
-'notitlematches'           => 'Níl macasamhla teidil alt ann',
-'textmatches'              => 'Tá macasamhla téacs alt ann',
-'notextmatches'            => 'Níl macasamhla téacs alt ann',
-'prevn'                    => 'na $1 cinn roimhe seo',
-'nextn'                    => 'an $1 i ndiadh',
-'viewprevnext'             => 'Taispeáin ($1) ($2) ($3).',
-'search-result-size'       => '$1 ({{PLURAL:$2|focal amháin|$2 focail}})',
-'search-section'           => '(gearradh $1)',
-'search-interwiki-default' => '$1 torthaí:',
-'search-relatedarticle'    => 'Gaolmhar',
-'searchrelated'            => 'gaolmhara',
-'searchall'                => 'an t-iomlán',
-'showingresults'           => "Ag taispeáint thíos {{PLURAL:$1|'''toradh amháin'''|'''$1''' torthaí}}, ag tosú le #'''$2'''.",
-'showingresultsnum'        => "Ag taispeáint thíos {{PLURAL:$3|'''toradh amháin'''|'''$3''' torthaí}}, ag tosú le #'''$2'''.",
-'nonefound'                => '<strong>Tabhair faoi deara</strong>: go minic, ní éiríonn cuardaigh nuair a cuardaítear focail an-coiteanta, m.sh., "ag" is "an",
+'searchresults'                  => 'Torthaí an chuardaigh',
+'searchresulttext'               => 'Féach ar [[{{MediaWiki:Helppage}}|{{int:help}}]] chun a thuilleadh eolais a fháil maidir le cuardaigh {{GRAMMAR:genitive|{{SITENAME}}}}.',
+'searchsubtitle'                 => 'Don iarratas "[[:$1]]"',
+'searchsubtitleinvalid'          => 'Don iarratas "$1"',
+'noexactmatch'                   => "'''Níl aon leathanach ann leis an teideal \"\$1\".''' Is féidir leat é a [[:\$1|cruthú]].",
+'titlematches'                   => 'Tá macasamhla teidil alt ann',
+'notitlematches'                 => 'Níl macasamhla teidil alt ann',
+'textmatches'                    => 'Tá macasamhla téacs alt ann',
+'notextmatches'                  => 'Níl macasamhla téacs alt ann',
+'prevn'                          => 'na $1 cinn roimhe seo',
+'nextn'                          => 'an $1 i ndiadh',
+'viewprevnext'                   => 'Taispeáin ($1) ($2) ($3).',
+'searchmenu-legend'              => 'Sainroghanna cuardaithe',
+'searchmenu-new'                 => "'''Cruthaigh an leathanach \"[[:\$1]]\" ar an vicí seo!'''",
+'searchhelp-url'                 => 'Help:Clár_ábhair',
+'searchprofile-project'          => 'Leathanaigh thionscadail',
+'searchprofile-images'           => 'Comhaid',
+'searchprofile-everything'       => 'Gach rud',
+'searchprofile-articles-tooltip' => 'Cuardaigh i $1',
+'searchprofile-project-tooltip'  => 'Cuardaigh i $1',
+'searchprofile-images-tooltip'   => 'Cuardaigh le comhaid',
+'search-result-size'             => '$1 ({{PLURAL:$2|focal amháin|$2 focail}})',
+'search-section'                 => '(gearradh $1)',
+'search-interwiki-default'       => '$1 torthaí:',
+'search-interwiki-more'          => '(níos mó)',
+'search-relatedarticle'          => 'Gaolmhar',
+'searchrelated'                  => 'gaolmhara',
+'searchall'                      => 'an t-iomlán',
+'showingresults'                 => "Ag taispeáint thíos {{PLURAL:$1|'''toradh amháin'''|'''$1''' torthaí}}, ag tosú le #'''$2'''.",
+'showingresultsnum'              => "Ag taispeáint thíos {{PLURAL:$3|'''toradh amháin'''|'''$3''' torthaí}}, ag tosú le #'''$2'''.",
+'nonefound'                      => '<strong>Tabhair faoi deara</strong>: go minic, ní éiríonn cuardaigh nuair a cuardaítear focail an-coiteanta, m.sh., "ag" is "an",
 a nach bhfuil innéacsaítear, nó nuair a ceisteann tú níos mó ná téarma amháin (ní
 taispeáintear sna toraidh ach na leathanaigh ina bhfuil go leoir na téarmaí cuardaigh).',
-'powersearch'              => 'Cuardaigh',
-'powersearch-field'        => 'Cuardaigh le',
-'searchdisabled'           => "Tá brón orainn! Mhíchumasaíodh an cuardach téacs iomlán go sealadach chun luas an tsuímh a chosaint. Idir an dá linn, is féidir leat an cuardach Google anseo thíos a úsáid - b'fhéidir go bhfuil sé as dáta.",
+'search-nonefound'               => 'Ní bhfuarthas tortha ar bith.',
+'powersearch'                    => 'Cuardaigh',
+'powersearch-field'              => 'Cuardaigh le',
+'searchdisabled'                 => "Tá brón orainn! Mhíchumasaíodh an cuardach téacs iomlán go sealadach chun luas an tsuímh a chosaint. Idir an dá linn, is féidir leat an cuardach Google anseo thíos a úsáid - b'fhéidir go bhfuil sé as dáta.",
 
 # Preferences page
-'preferences'              => 'Sainroghanna',
-'mypreferences'            => 'Mo shainroghanna',
-'prefsnologin'             => 'Níl tú logáilte isteach',
-'prefsnologintext'         => 'Ní mór duit <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logáil isteach]</span> chun do chuid sainroghanna phearsanta a shocrú.',
-'prefsreset'               => "D'athraíodh do chuid sainroghanna ar ais chuig an leagan bunúsach ón stóras.",
-'qbsettings'               => 'Sainroghanna an bosca uirlisí',
-'qbsettings-none'          => 'Faic',
-'qbsettings-fixedleft'     => 'Greamaithe ar chlé',
-'qbsettings-fixedright'    => 'Greamaithe ar dheis',
-'qbsettings-floatingleft'  => 'Ag faoileáil ar chlé',
-'qbsettings-floatingright' => 'Ag faoileáil ar dheis',
-'changepassword'           => "Athraigh d'fhocal faire",
-'skin'                     => 'Craiceann',
-'math'                     => 'Matamaitice',
-'dateformat'               => 'Formáid dáta',
-'datedefault'              => 'Is cuma liom',
-'datetime'                 => 'Dáta agus am',
-'math_failure'             => 'Theip ó anailís na foirmle',
-'math_unknown_error'       => 'earráid anaithnid',
-'math_unknown_function'    => 'foirmle anaithnid',
-'math_lexing_error'        => 'Theip ó anailís an fhoclóra',
-'math_syntax_error'        => 'earráid comhréire',
-'math_image_error'         => 'Theip ó aistriú an PNG; tástáil má tá na ríomh-oidis latex, dvips, gs, agus convert i suite go maith.',
-'math_bad_tmpdir'          => 'Ní féidir scríobh chuig an fillteán mata sealadach, nó é a chruthú',
-'math_bad_output'          => 'Ní féidir scríobh chuig an fillteán mata aschomhaid, nó é a chruthú',
-'math_notexvc'             => 'Níl an ríomhchlár texvc ann; féach ar mata/EOLAIS chun é a sainathrú.',
-'prefs-personal'           => 'Sonraí úsáideora',
-'prefs-rc'                 => 'Athruithe is déanaí',
-'prefs-watchlist'          => 'Liosta faire',
-'prefs-watchlist-days'     => 'Líon na laethanta le taispeáint sa liosta faire:',
-'prefs-watchlist-edits'    => 'Líon na n-athruithe le taispeáint sa liosta leathnaithe faire:',
-'prefs-misc'               => 'Éagsúla',
-'saveprefs'                => 'Sábháil',
-'resetprefs'               => 'Athshocraigh sainroghanna',
-'oldpassword'              => 'Focal faire reatha:',
-'newpassword'              => 'Focal faire nua:',
-'retypenew'                => 'Athiontráil an focal nua faire:',
-'textboxsize'              => 'Eagarthóireacht',
-'rows'                     => 'Sraitheanna',
-'columns'                  => 'Colúin',
-'searchresultshead'        => 'Cuardaigh',
-'resultsperpage'           => 'Cuairt le taispeáint ar gach leathanach',
-'contextlines'             => 'Línte le taispeáint do gach cuairt',
-'contextchars'             => 'Litreacha chomhthéacs ar gach líne',
-'recentchangescount'       => 'Méid teideal sna hathruithe is déanaí',
-'savedprefs'               => 'Sábháladh do chuid sainroghanna.',
-'timezonelegend'           => 'Crios ama',
-'timezonetext'             => 'Iontráil an méid uaireanta a difríonn do am áitiúil
+'preferences'               => 'Sainroghanna',
+'mypreferences'             => 'Mo shainroghanna',
+'prefsnologin'              => 'Níl tú logáilte isteach',
+'prefsnologintext'          => 'Ní mór duit <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logáil isteach]</span> chun do chuid sainroghanna phearsanta a shocrú.',
+'prefsreset'                => "D'athraíodh do chuid sainroghanna ar ais chuig an leagan bunúsach ón stóras.",
+'qbsettings'                => 'Sainroghanna an bosca uirlisí',
+'qbsettings-none'           => 'Faic',
+'qbsettings-fixedleft'      => 'Greamaithe ar chlé',
+'qbsettings-fixedright'     => 'Greamaithe ar dheis',
+'qbsettings-floatingleft'   => 'Ag faoileáil ar chlé',
+'qbsettings-floatingright'  => 'Ag faoileáil ar dheis',
+'changepassword'            => "Athraigh d'fhocal faire",
+'skin'                      => 'Craiceann',
+'skin-preview'              => 'Réamhamharc',
+'math'                      => 'Matamaitice',
+'dateformat'                => 'Formáid dáta',
+'datedefault'               => 'Is cuma liom',
+'datetime'                  => 'Dáta agus am',
+'math_failure'              => 'Theip ó anailís na foirmle',
+'math_unknown_error'        => 'earráid anaithnid',
+'math_unknown_function'     => 'foirmle anaithnid',
+'math_lexing_error'         => 'Theip ó anailís an fhoclóra',
+'math_syntax_error'         => 'earráid comhréire',
+'math_image_error'          => 'Theip ó aistriú an PNG; tástáil má tá na ríomh-oidis latex, dvips, gs, agus convert i suite go maith.',
+'math_bad_tmpdir'           => 'Ní féidir scríobh chuig an fillteán mata sealadach, nó é a chruthú',
+'math_bad_output'           => 'Ní féidir scríobh chuig an fillteán mata aschomhaid, nó é a chruthú',
+'math_notexvc'              => 'Níl an ríomhchlár texvc ann; féach ar mata/EOLAIS chun é a sainathrú.',
+'prefs-personal'            => 'Sonraí úsáideora',
+'prefs-rc'                  => 'Athruithe is déanaí',
+'prefs-watchlist'           => 'Liosta faire',
+'prefs-watchlist-days'      => 'Líon na laethanta le taispeáint sa liosta faire:',
+'prefs-watchlist-edits'     => 'Líon na n-athruithe le taispeáint sa liosta leathnaithe faire:',
+'prefs-watchlist-edits-max' => '(uasmhéid: 1000)',
+'prefs-misc'                => 'Éagsúla',
+'prefs-resetpass'           => 'Athraigh focal faire',
+'saveprefs'                 => 'Sábháil',
+'resetprefs'                => 'Athshocraigh sainroghanna',
+'textboxsize'               => 'Eagarthóireacht',
+'rows'                      => 'Sraitheanna',
+'columns'                   => 'Colúin',
+'searchresultshead'         => 'Cuardaigh',
+'resultsperpage'            => 'Cuairt le taispeáint ar gach leathanach',
+'contextlines'              => 'Línte le taispeáint do gach cuairt',
+'contextchars'              => 'Litreacha chomhthéacs ar gach líne',
+'recentchangescount'        => 'Méid teideal sna hathruithe is déanaí',
+'savedprefs'                => 'Sábháladh do chuid sainroghanna.',
+'timezonelegend'            => 'Crios ama',
+'timezonetext'              => 'Iontráil an méid uaireanta a difríonn do am áitiúil
 den am an freastalaí (UTC).',
-'localtime'                => 'An t-am áitiúil',
-'timezoneoffset'           => 'Difear',
-'servertime'               => 'Am an freastalaí anois',
-'guesstimezone'            => 'Líon ón líonléitheoir',
-'allowemail'               => "Tabhair cead d'úsáideoirí eile ríomhphost a sheoladh chugat.",
-'prefs-namespaces'         => 'Ainmspáis',
-'defaultns'                => 'Cuardaigh sna ranna seo a los éagmaise:',
-'default'                  => 'réamhshocrú',
-'files'                    => 'Comhaid',
+'localtime'                 => 'An t-am áitiúil',
+'timezoneoffset'            => 'Difear',
+'servertime'                => 'Am an freastalaí anois',
+'guesstimezone'             => 'Líon ón líonléitheoir',
+'allowemail'                => "Tabhair cead d'úsáideoirí eile ríomhphost a sheoladh chugat.",
+'prefs-namespaces'          => 'Ainmspáis',
+'defaultns'                 => 'Cuardaigh sna ranna seo a los éagmaise:',
+'default'                   => 'réamhshocrú',
+'files'                     => 'Comhaid',
 
 # User rights
 'userrights'               => 'Bainistíocht cearta úsáideora', # Not used as normal message but as header for the special page itself
 'userrights-user-editname' => 'Iontráil ainm úsáideora:',
 'editusergroup'            => 'Cuir Grúpái Úsáideoirí In Eagar',
-'editinguser'              => "Ag athrú ceart don úsáideoir '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "Ag athrú ceart don úsáideoir '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'Cuir grúpaí na n-úsáideoirí in eagar',
 'saveusergroups'           => 'Sabháil cnuasach úsáideora',
 'userrights-groupsmember'  => 'Ball de:',
+'userrights-notallowed'    => 'Níl cead ag do chuntas ceartanna úsáideora a athrú.',
 
 # Groups
 'group'            => 'Grúpa:',
@@ -820,7 +858,7 @@ den am an freastalaí (UTC).',
 'group-bot'        => 'Róbónna',
 'group-sysop'      => 'Riarthóirí',
 'group-bureaucrat' => 'Maorlathaigh',
-'group-all'        => '(an t-iomlán)',
+'group-all'        => '(iad uile)',
 
 'group-user-member'       => 'Úsáideoir',
 'group-bot-member'        => 'Róbó',
@@ -840,9 +878,16 @@ den am an freastalaí (UTC).',
 # User rights log
 'rightslog' => 'Log cearta úsáideoira',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-createpage'    => 'cruthaigh leathanaigh',
+'action-createaccount' => 'an cuntas seo a chruthú',
+'action-minoredit'     => 'an athrú seo a mharcáil mar mionathrú',
+'action-upload'        => 'uaslódáil an comhad',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|Athrú amháin|$1 athruithe}}',
 'recentchanges'                     => 'Athruithe is déanaí',
+'recentchanges-legend'              => 'Roghanna do na hathruithe is déanaí',
 'recentchangestext'                 => 'Déan faire ar na hathruithe is déanaí sa vicí ar an leathanach seo.',
 'recentchanges-feed-description'    => 'Rianaigh na n-athruite vicí is déanaí sa fotha seo.',
 'rcnote'                            => "Is {{PLURAL:$1|é seo a leanas <strong>an t-athrú amháin</strong>|iad seo a leanas na <strong>$1</strong> athruithe is déanaí}} {{PLURAL:$2|ar feadh an lae dheireanaigh|ar feadh na '''$2''' lá deireanacha}}, as $5, $4.",
@@ -854,7 +899,7 @@ den am an freastalaí (UTC).',
 'rcshowhideanons'                   => '$1 úsáideoirí gan ainm',
 'rcshowhidepatr'                    => '$1 athruithe faoi phatról',
 'rcshowhidemine'                    => '$1 mo chuid athruithe',
-'rclinks'                           => 'Taispeáin na $1 athruithe is déanaí sna $2 laethanta seo caite<br />$3 mionathruithe',
+'rclinks'                           => 'Taispeáin an $1 athrú is déanaí sa $2 lá seo caite<br />$3',
 'diff'                              => 'difr',
 'hist'                              => 'stair',
 'hide'                              => 'Folaigh',
@@ -874,50 +919,55 @@ den am an freastalaí (UTC).',
 Tá na leathanaigh ar do [[Special:Watchlist|liosta faire]] i '''gcló trom'''.",
 
 # Upload
-'upload'             => 'Uaslódaigh comhad',
-'uploadbtn'          => 'Uaslódaigh comhad',
-'reupload'           => 'Athuaslódáil',
-'reuploaddesc'       => 'Dul ar ais chuig an fhoirm uaslódála.',
-'uploadnologin'      => 'Nil tú logáilte isteach',
-'uploadnologintext'  => 'Ní mór duit [[Special:UserLogin|logáil isteach]] chun comhaid a huaslódáil.',
-'uploaderror'        => 'Earráid uaslódála',
-'uploadtext'         => "Bain úsáid as an bhfoirm thíos chun comhaid a uaslódáil.
-Chun comhaid atá ann cheana a fheiceáil nó a chuardach téigh chuig an [[Special:ImageList|liosta comhad uaslódáilte]]. Gheobhaidh tú liosta de chomhaid uaslódáilte sa [[Special:Log/upload|loga uaslódála]] agus liosta de chomhaid scriosta sa [[Special:Log/delete|loga scriosta]] freisin.
+'upload'               => 'Uaslódaigh comhad',
+'uploadbtn'            => 'Uaslódaigh comhad',
+'reupload'             => 'Athuaslódáil',
+'reuploaddesc'         => 'Dul ar ais chuig an fhoirm uaslódála.',
+'uploadnologin'        => 'Nil tú logáilte isteach',
+'uploadnologintext'    => 'Ní mór duit [[Special:UserLogin|logáil isteach]] chun comhaid a huaslódáil.',
+'uploaderror'          => 'Earráid uaslódála',
+'uploadtext'           => "Bain úsáid as an bhfoirm thíos chun comhaid a uaslódáil.
+Chun comhaid atá ann cheana a fheiceáil nó a chuardach téigh chuig an [[Special:FileList|liosta comhad uaslódáilte]]. Gheobhaidh tú liosta de chomhaid uaslódáilte sa [[Special:Log/upload|loga uaslódála]] agus liosta de chomhaid scriosta sa [[Special:Log/delete|loga scriosta]] freisin.
 
 Chun comhad a úsáid ar leathanach, cuir isteach nasc mar seo:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:comhad.jpg]]</nowiki></tt>''' chun leagan iomlán an chomhad a úsáid
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:comhad.png|200px|thumb|left|téacs eile]]</nowiki></tt>''' chun comhad le 200 picteillín ar leithead i mbosca san imeall clé le 'téacs eile' mar tuairisc
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:comhad.jpg]]</nowiki></tt>''' chun leagan iomlán an chomhad a úsáid
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:comhad.png|200px|thumb|left|téacs eile]]</nowiki></tt>''' chun comhad le 200 picteillín ar leithead i mbosca san imeall clé le 'téacs eile' mar tuairisc
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:comhad.ogg]]</nowiki></tt>''' más comhad fuaime atá i gceist",
-'upload-permitted'   => 'Cineálacha comhaid ceadaithe: $1.',
-'uploadlog'          => 'Stair uaslódála',
-'uploadlogpage'      => 'Stair_uaslódála',
-'uploadlogpagetext'  => 'Is liosta é seo a leanas de na uaslódáil comhad is deanaí.
+'upload-permitted'     => 'Cineálacha comhaid ceadaithe: $1.',
+'uploadlog'            => 'Stair uaslódála',
+'uploadlogpage'        => 'Stair_uaslódála',
+'uploadlogpagetext'    => 'Is liosta é seo a leanas de na uaslódáil comhad is deanaí.
 Is am an freastalaí iad na hamanna atá anseo thíos.',
-'filename'           => 'Comhadainm',
-'filedesc'           => 'Achoimriú',
-'fileuploadsummary'  => 'Achoimre:',
-'filestatus'         => 'Stádas cóipchirt:',
-'filesource'         => 'Foinse:',
-'uploadedfiles'      => 'Comhaid uaslódáilte',
-'ignorewarning'      => 'Déan neamhaird den rabhadh agus sábháil an comhad ar an chor',
-'ignorewarnings'     => 'Déan neamhaird aon rabhaidh',
-'illegalfilename'    => 'Tá litreacha san comhadainm  "$1" nach ceadaítear in ainm leathanaigh. Athainmnigh
+'filename'             => 'Comhadainm',
+'filedesc'             => 'Achoimriú',
+'fileuploadsummary'    => 'Achoimre:',
+'filestatus'           => 'Stádas cóipchirt:',
+'filesource'           => 'Foinse:',
+'uploadedfiles'        => 'Comhaid uaslódáilte',
+'ignorewarning'        => 'Déan neamhaird den rabhadh agus sábháil an comhad ar an chor',
+'ignorewarnings'       => 'Déan neamhaird aon rabhaidh',
+'illegalfilename'      => 'Tá litreacha san comhadainm  "$1" nach ceadaítear in ainm leathanaigh. Athainmnigh
 an comhad agus déan athiarracht, más é do thoil é.',
-'badfilename'        => 'D\'athraíodh an ainm íomhá bheith "$1".',
-'emptyfile'          => "De réir a chuma, ní aon rud san chomhad a d'uaslódáil tú ach comhad folamh. Is dócha gur
+'badfilename'          => 'D\'athraíodh an ainm íomhá bheith "$1".',
+'filetype-badmime'     => 'Ní ceadaítear comhaid den saghas MIME "$1" a uaslódáil.',
+'emptyfile'            => "De réir a chuma, ní aon rud san chomhad a d'uaslódáil tú ach comhad folamh. Is dócha gur
 míchruinneas é seo san ainm chomhaid. Seiceáil más é an comhad seo atá le huaslódáil agat.",
-'successfulupload'   => "D'éirigh leis an uaslódáil",
-'uploadwarning'      => 'Rabhadh suaslódála',
-'savefile'           => 'Sábháil comhad',
-'uploadedimage'      => 'uaslódáladh "[[$1]]"',
-'uploaddisabled'     => 'Tá brón orainn, ní féidir aon rud a uaslódáil faoi láthair.',
-'uploadcorrupt'      => 'Tá an comhad truaillithe nó tá iarmhír comhadainm neamhbhailí aige. Scrúdaigh an comhad agus
+'fileexists-forbidden' => 'Tá comhad eile leis an ainm seo ann.
+Má theastáilann uait do chomhad a uaslódáil fós, téigh ar ais agus úsáid ainm nua, le do thoil.
+[[File:$1|thumb|center|$1]]',
+'successfulupload'     => "D'éirigh leis an uaslódáil",
+'uploadwarning'        => 'Rabhadh suaslódála',
+'savefile'             => 'Sábháil comhad',
+'uploadedimage'        => 'uaslódáladh "[[$1]]"',
+'uploaddisabled'       => 'Tá brón orainn, ní féidir aon rud a uaslódáil faoi láthair.',
+'uploaddisabledtext'   => 'Tá cosc ar uaslódáileanna chomhad.',
+'uploadcorrupt'        => 'Tá an comhad truaillithe nó tá iarmhír comhadainm neamhbhailí aige. Scrúdaigh an comhad agus
 uaslódáil é arís, le do thoil.',
-'uploadvirus'        => 'Tá víreas ann sa comhad seo! Eolas: $1',
-'sourcefilename'     => 'Comhadainm foinse:',
-'destfilename'       => 'Comhadainm sprice:',
-'upload-maxfilesize' => 'Méad comhad is mó: $1',
-'watchthisupload'    => 'Déan faire ar an leathanach seo',
+'uploadvirus'          => 'Tá víreas ann sa comhad seo! Eolas: $1',
+'sourcefilename'       => 'Comhadainm foinse:',
+'destfilename'         => 'Comhadainm sprice:',
+'upload-maxfilesize'   => 'Méad comhad is mó: $1',
+'watchthisupload'      => 'Déan faire ar an leathanach seo',
 
 'upload-proto-error' => 'Prótacal mícheart',
 'upload-file-error'  => 'Earráid inmheánach',
@@ -927,22 +977,23 @@ uaslódáil é arís, le do thoil.',
 'upload_source_url'  => ' (URL bailí is féidir a rochtain go poiblí)',
 'upload_source_file' => ' (comhad ar do riomhaire)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Cuardaigh le íomhá ab ainm:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Cuardaigh le íomhá ab ainm:',
 'imgfile'               => 'comhad',
-'imagelist'             => 'Liosta íomhánna',
-'imagelist_date'        => 'Dáta',
-'imagelist_name'        => 'Ainm',
-'imagelist_user'        => 'Úsáideoir',
-'imagelist_size'        => 'Méid',
-'imagelist_description' => 'Tuairisc',
-
-# Image description page
+'listfiles'             => 'Liosta íomhánna',
+'listfiles_date'        => 'Dáta',
+'listfiles_name'        => 'Ainm',
+'listfiles_user'        => 'Úsáideoir',
+'listfiles_size'        => 'Méid',
+'listfiles_description' => 'Tuairisc',
+
+# File description page
 'filehist'                       => 'Stair comhad',
 'filehist-help'                  => 'Clic ar dáta/am chun an comhad a radharc mar a bhí sé ar an am.',
 'filehist-deleteone'             => 'scrios',
 'filehist-current'               => 'reatha',
 'filehist-datetime'              => 'Dáta/Am',
+'filehist-thumbtext'             => 'Mionsamhail do leagan ó $1',
 'filehist-user'                  => 'Úsáideoir',
 'filehist-dimensions'            => 'Toisí',
 'filehist-filesize'              => 'Méid an comhad',
@@ -993,26 +1044,15 @@ uaslódáil é arís, le do thoil.',
 
 # Random page
 'randompage'         => 'Leathanach fánach',
-'randompage-nopages' => 'Níl aon leathanaigh san ainmspás seo.',
+'randompage-nopages' => 'Níl aon leathanaigh san ainmspás "$1".',
 
 # Random redirect
 'randomredirect' => 'Atreorú randamach',
 
 # Statistics
-'statistics'    => 'Staidrimh',
-'sitestats'     => 'Staidreamh do {{SITENAME}}',
-'userstats'     => 'Staidreamh úsáideora',
-'sitestatstext' => "Tá {{PLURAL:$1|'''leathanach amháin''|'''$1''' leathanaigh san iomlán}} sa bhunachar sonraí.
-Cuirtear na leathanaigh seo san áireamh: leathanaigh phlé, leathanaigh {{GRAMMAR:genitive|{{SITENAME}}}}, leathanaigh ghearra (síolta), athsheoltaí agus leathaigh eile nach meastar mar leathanaigh inneachair iad i ndáiríre.
-Ag fágáil na leathanach sin ar lár, tá {{PLURAL:$2|'''leathanach amháin''' ann atá ina inneachar|'''$2''' leathanaigh ann atá ina n-inneachar}} ceart de réir cosúlachta.
-
-D'uaslódáladh {{PLURAL:$8|'''comhad amháin'''|'''$8''' comhaid}}.
-
-Ina iomlán, tharla {{PLURAL:$3|'''radhairc leathanaigh amháin'''|'''$3''' radhairc leathanaigh}} agus {{PLURAL:$4|'''athrú leathanaigh amháin'''|'''$4''' athruithe leathanaigh}} ó bunaíodh {{SITENAME}}.
-Is é sin '''$5''' athruithe ar meán do gach leathanach, agus '''$6''' radhairc do gach athrú.
-
-Fad an [http://www.mediawiki.org/wiki/Manual:Job_queue scuaine jabanna]: '''$7'''.",
-'userstatstext' => "Tá {{PLURAL:$1|'''[[Special:ListUsers|úsáideoir]] cláraithe amháin'''|'''$1''' [[Special:ListUsers|úsáideoirí]] cláraithe}} anseo agus tá {{PLURAL:$2|'''duine amháin'''|'''$2'''}} (nó '''$4%''') díobh leis na cearta $5.",
+'statistics'              => 'Staidrimh',
+'statistics-header-users' => 'Staidreamh úsáideora',
+'statistics-pages'        => 'Leathanaigh',
 
 'disambiguations'     => 'Leathanaigh idirdhealaithe',
 'disambiguationspage' => '{{ns:project}}:Naisc_go_leathanaigh_idirdhealaithe',
@@ -1030,6 +1070,7 @@ ghnáth tugann sé sin an sprioc-alt "fíor".',
 'brokenredirects-delete' => '(scrios)',
 
 'withoutinterwiki'        => 'Leathanaigh gan naisc idirvicí',
+'withoutinterwiki-legend' => 'Réimír',
 'withoutinterwiki-submit' => 'Taispeáin',
 
 'fewestrevisions' => 'Leathanaigh leis na leasaithe is lú',
@@ -1115,9 +1156,21 @@ leathanach atá i gceist agat.',
 Níl na [[Special:UnusedCategories|catagóiri gan úsáid]] ar fáil anseo.
 Féach freisin ar [[Special:WantedCategories|catagóirí agus iarraidh ag gabháil leis]].',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Dréachtaí úsáideora scriosta',
+
+# Special:LinkSearch
+'linksearch-ns'   => 'Ainmspás:',
+'linksearch-ok'   => 'Cuardaigh',
+'linksearch-line' => '$1 naiscthe as $2',
+
 # Special:ListUsers
 'listusers-submit' => 'Taispeáin',
 
+# Special:Log/newusers
+'newuserlog-create-entry'  => 'Úsáideoir nua',
+'newuserlog-create2-entry' => 'cuntas cruthú le $1',
+
 # Special:ListGroupRights
 'listgrouprights-group'  => 'Ghrúpa',
 'listgrouprights-rights' => 'Cearta',
@@ -1175,9 +1228,7 @@ taobh istigh den tréimhse atá roghnaithe agat.',
 'iteminvalidname'      => "Fadhb leis an mír '$1', ainm neamhbhailí...",
 'wlnote'               => "Is {{PLURAL:$1|é seo thíos an t-athrú deireanach|iad seo thíos na '''$1''' athruithe deireanacha}} {{PLURAL:$2|san uair deireanach|sna '''$2''' uaire deireanacha}}.",
 'wlshowlast'           => 'Líon na n-uair is déanaí le taispeáint: $1. Líon na laethanta is déanaí le taispeáint: $2. Taispeáin $3.',
-'watchlist-hide-bots'  => 'Folaigh athruithe róbó',
-'watchlist-hide-own'   => 'Folaigh mo chuid athruithe',
-'watchlist-hide-minor' => 'Folaigh mionathruithe',
+'watchlist-options'    => 'Roghanna don liosta faire',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ag faire...',
@@ -1216,60 +1267,65 @@ Chun socruithe do liosta faire a athrú, tabhair cuairt ar
 Aiseolas agus a thuilleadh cabhrach:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Scrios an leathanach',
-'confirm'                     => 'Cinntigh',
-'excontent'                   => "téacs an lch: '$1'",
-'excontentauthor'             => "seo a bhí an t-inneachar: '$1' (agus ba é '[[Special:Contributions/$2|$2]]' an t-aon dhréachtóir)",
-'exbeforeblank'               => "is é seo a raibh an ábhar roimh an folmhadh: '$1'",
-'exblank'                     => 'bhí an leathanach folamh',
-'delete-confirm'              => 'Scrios "$1"',
-'delete-legend'               => 'Scrios',
-'historywarning'              => 'Aire: Ta stair ag an leathanach a bhfuil tú ar tí é a scriosadh:',
-'confirmdeletetext'           => 'Tá tú ar tí leathanach, agus a chuid staire, a scriosadh.
+# Delete
+'deletepage'            => 'Scrios an leathanach',
+'confirm'               => 'Cinntigh',
+'excontent'             => "téacs an lch: '$1'",
+'excontentauthor'       => "seo a bhí an t-inneachar: '$1' (agus ba é '[[Special:Contributions/$2|$2]]' an t-aon dhréachtóir)",
+'exbeforeblank'         => "is é seo a raibh an ábhar roimh an folmhadh: '$1'",
+'exblank'               => 'bhí an leathanach folamh',
+'delete-confirm'        => 'Scrios "$1"',
+'delete-legend'         => 'Scrios',
+'historywarning'        => 'Aire: Ta stair ag an leathanach a bhfuil tú ar tí é a scriosadh:',
+'confirmdeletetext'     => 'Tá tú ar tí leathanach, agus a chuid staire, a scriosadh.
 Deimhnigh, le do thoil, gur mhian leat é seo a dhéanamh, go dtuigeann tú torthaí an ghnímh seo agus go bhfuil tú dá dhéanamh de réir [[{{MediaWiki:Policy-url}}|an pholasaí]].',
-'actioncomplete'              => 'Gníomh críochnaithe',
-'deletedtext'                 => 'scriosadh "<nowiki>$1</nowiki>".
+'actioncomplete'        => 'Gníomh críochnaithe',
+'deletedtext'           => 'scriosadh "<nowiki>$1</nowiki>".
 Féach ar $2 chun cuntas na scriosiadh deireanacha a fháil.',
-'deletedarticle'              => 'scriosadh "[[$1]]"',
-'dellogpage'                  => 'Loga scriosta',
-'dellogpagetext'              => 'Seo é liosta de na scriosaidh is déanaí.',
-'deletionlog'                 => 'cuntas scriosaidh',
-'reverted'                    => 'Tá eagrán níos luaithe in úsáid anois',
-'deletecomment'               => 'Cúis don scriosadh',
-'deleteotherreason'           => 'Fáth eile/breise:',
-'deletereasonotherlist'       => 'Fáth eile',
-'deletereason-dropdown'       => '*Fáthanna coitianta scriosta
+'deletedarticle'        => 'scriosadh "[[$1]]"',
+'dellogpage'            => 'Loga scriosta',
+'dellogpagetext'        => 'Seo é liosta de na scriosaidh is déanaí.',
+'deletionlog'           => 'cuntas scriosaidh',
+'reverted'              => 'Tá eagrán níos luaithe in úsáid anois',
+'deletecomment'         => 'Cúis don scriosadh',
+'deleteotherreason'     => 'Fáth eile/breise:',
+'deletereasonotherlist' => 'Fáth eile',
+'deletereason-dropdown' => '*Fáthanna coitianta scriosta
 ** Iarratas ón údar
 ** Sárú cóipchirt
 ** Loitiméireacht',
-'rollback'                    => 'Athruithe a rolladh siar',
-'rollback_short'              => 'Roll siar',
-'rollbacklink'                => 'roll siar',
-'rollbackfailed'              => 'Theip an rolladh siar',
-'cantrollback'                => 'Ní féidir an athrú a athúsáid; ba é údar an ailt an t-aon duine a rinne athrú dó.',
-'alreadyrolled'               => "Ní féidir eagrán níos luaí an leathanaigh [[:$1]]
+
+# Rollback
+'rollback'       => 'Athruithe a rolladh siar',
+'rollback_short' => 'Roll siar',
+'rollbacklink'   => 'roll siar',
+'rollbackfailed' => 'Theip an rolladh siar',
+'cantrollback'   => 'Ní féidir an athrú a athúsáid; ba é údar an ailt an t-aon duine a rinne athrú dó.',
+'alreadyrolled'  => "Ní féidir eagrán níos luaí an leathanaigh [[:$1]]
 le [[User:$2|$2]] ([[User talk:$2|Plé]]) a athúsáid; d'athraigh duine eile é cheana fein, nó
 d'athúsáid duine eile eagrán níos luaí cheana féin.
 
 [[User:$3|$3]] ([[User talk:$3|Plé]]) an té a rinne an athrú is déanaí.",
-'editcomment'                 => 'Seo a raibh an mínithe athraithe: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "Filleadh eagarthóireachtaí le [[Special:Contributions/$2|$2]] ([[User talk:$2|Plé]]); d'athúsáideadh an athrú seo caite le [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'editcomment'    => "Seo a raibh an mínithe athraithe: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => "Filleadh eagarthóireachtaí le [[Special:Contributions/$2|$2]] ([[User talk:$2|Plé]]); d'athúsáideadh an athrú seo caite le [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'Log cosanta',
 'protectlogtext'              => 'Seo é liosta de glais a cuireadh ar / baineadh de leathanaigh.
 Féach ar [[Special:ProtectedPages|Leathanach glasáilte]] chun a thuilleadh eolais a fháil.',
 'protectedarticle'            => 'glasáladh "[[$1]]"',
 'unprotectedarticle'          => 'díghlasáladh "[[$1]]"',
 'protect-title'               => 'Ag glasáil "$1"',
+'prot_1movedto2'              => 'Athainmníodh $1 mar $2',
 'protect-legend'              => 'Cinntigh an glasáil',
 'protectcomment'              => 'Cúis don glasáil:',
 'protectexpiry'               => 'As feidhm:',
 'protect_expiry_invalid'      => 'Am éaga neamhbhailí.',
 'protect_expiry_old'          => 'Am éaga san am atá thart.',
 'protect-unchain'             => 'Díghlasáil an cead athainmithe',
-'protect-text'                => 'Is féidir leat an leibhéal glasála a athrú anseo don leathanach <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Ní chead ag do chuntas chun athraigh leibhéal cosaint an leathanach.
-Seo iad na socruithe reatha faoin leathanach <strong>$1</strong>:',
+'protect-text'                => "Is féidir leat an leibhéal glasála a athrú anseo don leathanach '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Ní chead ag do chuntas chun athraigh leibhéal cosaint an leathanach.
+Seo iad na socruithe reatha faoin leathanach '''$1''':",
 'protect-cascadeon'           => 'Tá an leathanach seo ghlasáil le athrú mar tá se iniata ar {{PLURAL:$1|an leathanach seo|na leathanaigh seo}} a leanas, agus iad ghlasáil le glasáil cascáideach.
 Is féidir an leibhéal glasála a athrú, ach ní féidir cur isteach ar an ghlasáil cascáideach.',
 'protect-default'             => '(réamhshocrú)',
@@ -1278,8 +1334,12 @@ Is féidir an leibhéal glasála a athrú, ach ní féidir cur isteach ar an ghl
 'protect-level-sysop'         => 'Oibreoirí chórais amháin',
 'protect-summary-cascade'     => 'cascáidithe',
 'protect-expiring'            => 'as feidhm $1 (UTC)',
+'protect-expiry-indefinite'   => 'gan teora',
 'protect-cascade'             => 'Coisc leathanaigh san áireamh an leathanach seo (cosanta cascáideach)',
 'protect-cantedit'            => 'Ní féidir leat na leibhéil cosanta a athrú faoin leathanach seo, mar níl cead agat é a cur in eagar.',
+'protect-othertime'           => 'Am eile:',
+'protect-othertime-op'        => 'am eile',
+'protect-expiry-options'      => 'uair amháin:1 hour,1 lá amháin:1 day,seachtain amháin:1 week,2 sheachtain:2 weeks,mí amháin:1 month,3 mhí:3 months,6 mhí:6 months,bliain amháin:1 year,gan teora:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ceadúnas:',
 'restriction-level'           => 'Leibhéal srianadh:',
 'pagesize'                    => '(bearta)',
@@ -1295,8 +1355,7 @@ Is féidir an leibhéal glasála a athrú, ach ní féidir cur isteach ar an ghl
 'undelete'                 => 'Díscrios leathanach scriosta',
 'undeletepage'             => 'Féach ar leathanaigh scriosta agus díscrios iad',
 'viewdeletedpage'          => 'Féach ar leathanaigh scriosta',
-'undeletepagetext'         => 'Scriosaíodh na leathanaigh seo a leanas cheana féin, ach
-tá síad sa cartlann fós agus is féidir iad a dhíscrios.
+'undeletepagetext'         => 'Scriosaíodh {{PLURAL:$1|an leathanach|na $1 leathanaigh}} seo a leanas cheana féin, ach tá síad sa cartlann fós agus is féidir iad a dhíscrios.
 Ó am go ham, is féidir an cartlann a fholmhú.',
 'undelete-fieldset-title'  => 'Díscrios leagain',
 'undeleterevisions'        => 'Cuireadh {{PLURAL:$1|leagan amháin|$1 leagain}} sa chartlann',
@@ -1305,9 +1364,11 @@ Dá gcruthaíodh leathanach nua leis an teideal céanna ó shin an scriosadh, ta
 'undeletehistorynoadmin'   => 'Tá an leathanach seo scriosta.
 An fáth scriosadh ná a leanas san achoimre faoi bhun, agus le sonraí na úsáideoirí é a chur in eagar roimh scriosadh.
 Is an téacs as na leagan scriosta seo ar fáil do riarthóirí amháin.',
+'undelete-revision'        => 'Leagan scriosta $1 (ó $4, ar $5) le $3:',
 'undeletebtn'              => 'Díscrios!',
 'undeletelink'             => 'díscrios',
 'undeletereset'            => 'Athshocraigh',
+'undeleteinvert'           => 'Cuir an roghnú bun os cionn',
 'undeletecomment'          => 'Tuairisc:',
 'undeletedarticle'         => 'Díscriosadh "$1" ar ais',
 'undeletedrevisions'       => '{{PLURAL:$1|Leagan amháin|$1 leagain}} díscriosta',
@@ -1318,30 +1379,31 @@ Is an téacs as na leagan scriosta seo ar fáil do riarthóirí amháin.',
 
 # Namespace form on various pages
 'namespace'      => 'Ainmspás:',
-'invert'         => 'Cuir an roghnú bun os cionn',
+'invert'         => 'Iompaigh rogha bunoscionn',
 'blanknamespace' => '(Gnáth)',
 
 # Contributions
-'contributions' => 'Dréachtaí úsáideora',
-'mycontris'     => 'Mo chuid dréachtaí',
-'contribsub2'   => 'Do $1 ($2)',
-'nocontribs'    => 'Níor bhfuarthas aon athrú a raibh cosúil le na crítéir seo.',
-'uctop'         => ' (barr)',
-'month'         => 'As mí (agus is luaithe):',
-'year'          => 'As bliain (agus is luaithe):',
-
-'sp-contributions-newbies'     => 'Taispeáin dréachtaí as cuntas nua amháin',
-'sp-contributions-newbies-sub' => 'Le cuntais nua',
-'sp-contributions-blocklog'    => 'Log coisc',
-'sp-contributions-search'      => 'Cuardaigh le dréachtaí',
-'sp-contributions-username'    => 'Seoladh IP ná ainm úsáideora:',
-'sp-contributions-submit'      => 'Cuardaigh',
+'contributions'       => 'Dréachtaí úsáideora',
+'contributions-title' => 'Dréachtaí úsáideora do $1',
+'mycontris'           => 'Mo chuid dréachtaí',
+'contribsub2'         => 'Do $1 ($2)',
+'nocontribs'          => 'Níor bhfuarthas aon athrú a raibh cosúil le na crítéir seo.',
+'uctop'               => ' (barr)',
+'month'               => 'Ón mhí seo (agus níos luaithe):',
+'year'                => 'Ón bhliain seo (agus níos luaithe):',
+
+'sp-contributions-newbies'       => 'Taispeáin dréachtaí ó chuntais nua amháin',
+'sp-contributions-newbies-sub'   => 'Le cuntais nua',
+'sp-contributions-newbies-title' => 'Dréachtaí úsáideora do chuntasaí nua',
+'sp-contributions-blocklog'      => 'Log coisc',
+'sp-contributions-search'        => 'Cuardaigh dréachtaí',
+'sp-contributions-username'      => 'Seoladh IP nó ainm úsáideora:',
+'sp-contributions-submit'        => 'Cuardaigh',
 
 # What links here
 'whatlinkshere'            => 'Naisc don lch seo',
 'whatlinkshere-title'      => 'Naisc chuig $1',
 'whatlinkshere-page'       => 'Leathanach:',
-'linklistsub'              => '(Liosta nasc)',
 'linkshere'                => "Tá nasc chuig '''[[:$1]]''' ar na leathanaigh seo a leanas:",
 'nolinkshere'              => "Níl leathanach ar bith ann a bhfuil nasc chuig '''[[:$1]]''' air.",
 'nolinkshere-ns'           => "Níl leathanach ar bith ann san ainmspás roghnaithe a bhfuil nasc chuig '''[[:$1]]''' air.",
@@ -1351,8 +1413,9 @@ Is an téacs as na leagan scriosta seo ar fáil do riarthóirí amháin.',
 'whatlinkshere-prev'       => '{{PLURAL:$1|roimhe|$1 roimhe}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|ar aghaidh|$1 ar aghaidh}}',
 'whatlinkshere-links'      => '� naisc',
-'whatlinkshere-hidelinks'  => '$1 naisc',
-'whatlinkshere-hideimages' => '$1 naisc íomhanna',
+'whatlinkshere-hidetrans'  => '$1 trasiamh',
+'whatlinkshere-hidelinks'  => '$1 nasc',
+'whatlinkshere-hideimages' => '$1 nasc íomhá',
 
 # Block/unblock
 'blockip'                 => 'Coisc úsáideoir',
@@ -1469,6 +1532,8 @@ cinntigh go dtuigeann tú na hiarmhairtí go léir roimh dul ar aghaigh.",
 
 Sna scéil sin, caithfidh tú an leathanach a aistrigh nó a báigh leis na lámha má tá sin an rud atá uait.",
 'movearticle'             => 'Athainmnigh an leathanach',
+'movenologin'             => 'Ní  logáilte isteach tú',
+'movenologintext'         => "Ní mór duit bheith i d'úsáideoir cláraithe agus [[Special:UserLogin|logáilte isteach]] chun leathanach a hathainmniú.",
 'movenotallowed'          => 'Níl cead agat leathanaigh a athainmniú.',
 'newtitle'                => 'Go teideal nua',
 'move-watch'              => 'Déan faire an leathanach seo',
@@ -1493,7 +1558,6 @@ Ar mhaith leat é a scriosadh chun áit a dhéanamh don athainmniú?',
 'delete_and_move_confirm' => 'Tá, scrios an leathanach',
 'delete_and_move_reason'  => "Scriosta chun áit a dhéanamh d'athainmniú",
 'selfmove'                => 'Tá an ainm céanna ag an bhfoinse mar atá ar an ainm sprice; ní féidir leathanach a athainmniú bheith é féin.',
-'immobile_namespace'      => 'Saghas speisialta leathanach atá ann san ainm sprice; ní féidir leathanaigh a athainmniú san ainmspás sin.',
 
 # Export
 'export'          => 'Easportáil leathanaigh',
@@ -1604,12 +1668,12 @@ ní féidir uaslódála staire díreacha a dhéanamh faoi láthair.",
 'notacceptable'     => 'Ní féidir leis an freastalaí vicí na sonraí a chur ar fáil i bhformáid atá inléite ag do chliant.',
 
 # Attribution
-'anonymous'        => 'Úsáideoir(í) gan ainm ar {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Úsáideoir|Úsáideoirí}} gan ainm ar {{SITENAME}}',
 'siteuser'         => 'Úsáideoir $1 ag {{SITENAME}}',
 'lastmodifiedatby' => 'Leasaigh $3 an leathanach seo go déanaí ag $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Bunaithe ar saothair le $1.',
 'others'           => 'daoine eile',
-'siteusers'        => 'Úsáideoir(í) ag {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Úsáideoirí|Úsáideoir}} ag {{SITENAME}} $1',
 'creditspage'      => 'Creidiúintí leathanaigh',
 'nocredits'        => 'Níl aon eolas creidiúna le fáil don leathanach seo.',
 
@@ -1628,6 +1692,14 @@ iarradh sábháil. Is dócha gur nasc chuig suíomh seachtrach ba chúis leis.',
 'numauthors'     => 'Méid údair ar leith (alt): $1',
 'numtalkauthors' => 'Méid údair ar leith (leathanach phlé): $1',
 
+# Skin names
+'skinname-standard'    => 'Gnáth',
+'skinname-nostalgia'   => 'Sean-nós',
+'skinname-cologneblue' => 'Gorm na Colóna',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chick',
+
 # Math options
 'mw_math_png'    => 'Déan PNG-íomhá gach uair',
 'mw_math_simple' => 'Déan HTML má tá sin an-easca, nó PNG ar mhodh eile',
@@ -1645,8 +1717,9 @@ iarradh sábháil. Is dócha gur nasc chuig suíomh seachtrach ba chúis leis.',
 'rcpatroldisabledtext'  => 'Tá an tréith Patról na n-Athruithe is Déanaí míchumasaithe faoi láthair.',
 
 # Patrol log
-'patrol-log-page' => 'Log phatról',
-'patrol-log-auto' => '(uathoibríoch)',
+'patrol-log-page'      => 'Log phatról',
+'patrol-log-auto'      => '(uathoibríoch)',
+'log-show-hide-patrol' => '$1 log phatról',
 
 # Image deletion
 'deletedrevision'       => 'Scriosadh an sean-leagan $1',
@@ -1668,9 +1741,10 @@ iarradh sábháil. Is dócha gur nasc chuig suíomh seachtrach ba chúis leis.',
 'show-big-image'       => 'Taispeáin leagan ardtaifigh den íomhá',
 'show-big-image-thumb' => '<small>Méid an réamhamhairc seo: $1 × $2 picteilín</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Gailearaí na n-íomhánna nua',
 'imagelisttext'         => 'Tá liosta thíos de {{PLURAL:$1|comhad amháin|$1 comhaid $2}}.',
+'newimages-label'       => 'Comhadainm (nó cuid de):',
 'showhidebots'          => '($1 róbónna)',
 'noimages'              => 'Tada le feiceáil.',
 'ilsubmit'              => 'Cuardaigh',
@@ -1957,10 +2031,10 @@ cúlra i bhfócas)',
 'edit-externally-help' => '(Féach ar na [http://www.mediawiki.org/wiki/Manual:External_editors treoracha cumraíochta] as Béarla le tuilleadh eolais)',
 
 # 'all' in various places, this might be different for inflected languages
-'recentchangesall' => 'an t-iomlán',
-'imagelistall'     => 'gach',
+'recentchangesall' => 'iad uile',
+'imagelistall'     => 'iad uile',
 'watchlistall2'    => 'an t-iomlán',
-'namespacesall'    => 'an t-iomlán',
+'namespacesall'    => 'iad uile',
 'monthsall'        => 'gach mí',
 
 # E-mail address confirmation
@@ -2004,19 +2078,9 @@ Rachaidh an cód deimhnithe seo as feidhm ag $4.',
 'deletedwhileediting' => "'''Aire''': scriosadh an leathanach seo nuair a bhí tu ag athrú é!",
 'recreate'            => 'Athchruthaigh',
 
-# HTML dump
-'redirectingto' => 'Ag athdhíriú go [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'An bhfuil tú cinnte go dteastaíonn uait taisce an leathanaigh seo a bhánú?
-
-$1',
 'confirm_purge_button' => 'Tá',
-
-# AJAX search
-'searchnamed'   => "Cuardaigh le leathanaigh ab ainm ''$1''.",
-'articletitles' => "Ailt a tosaíonn le ''$1''",
-'hideresults'   => 'Folaigh torthaí',
+'confirm-purge-top'    => 'An bhfuil tú cinnte go dteastaíonn uait taisce an leathanaigh seo a bhánú?',
 
 # Multipage image navigation
 'imgmultipageprev' => "'� leathanach roimhe sin",
diff --git a/languages/messages/MessagesGag.php b/languages/messages/MessagesGag.php
index 0ea44ca0..b70692e4 100644
--- a/languages/messages/MessagesGag.php
+++ b/languages/messages/MessagesGag.php
@@ -54,8 +54,6 @@ $messages = array(
 'underline-never'   => 'Hiç bir zaman',
 'underline-default' => 'Brauzer karar kabletsin',
 
-'skinpreview' => '(Ön siir)',
-
 # Dates
 'sunday'        => 'Pazar',
 'monday'        => 'Pazertesi',
@@ -141,7 +139,7 @@ $messages = array(
 'mytalk'         => 'Sözleşmäk sayfam',
 'anontalk'       => 'Bu IP-nin konuşmaları',
 'navigation'     => 'Saytda yol bulmaa',
-'and'            => 'hem',
+'and'            => '&#32;hem',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -202,8 +200,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} için',
 'aboutpage'            => 'Project:Uurunda',
-'bugreports'           => 'Yannışnık raportları',
-'bugreportspage'       => 'Project:Yannışnık raportları',
 'copyright'            => 'İçersindeki $1 altında.',
 'copyrightpagename'    => '{{SITENAME}} korunmak hakları',
 'copyrightpage'        => '{{ns:project}}:Avtorluk hakları',
@@ -226,8 +222,6 @@ $messages = array(
 
 'badaccess'        => 'Ä°zin kusurluu',
 'badaccess-group0' => 'Bu iÅŸlemi yapmaa kuvediniz yok.',
-'badaccess-group1' => 'O işlem ani yapmaa neetlendiniz sadä var nicä yapılsın $1 gruppasındaki kullanıcılar tarafınnan.',
-'badaccess-group2' => 'O işlem ani yapmaa neetlendiniz, var nicä yapılsın sadä $1 gruppasındaki kullanıcılardan biri tarafınnan.',
 'badaccess-groups' => 'O işlem ani yapmaa neetlendiniz var nicä yapılsın sadä $1 gruppalarınnan birinin kullanıcıları tarafınnan.',
 
 'versionrequired'     => 'MediaWiki-nin $1 versiyası läazım',
@@ -303,7 +297,6 @@ Esapınız açıldı. Unutmayın {{SITENAME}} seçimnerin diiştirmää.',
 'yourpasswordagain'          => 'Parolu enidän yaz',
 'remembermypassword'         => 'Parolu hatırla.',
 'yourdomainname'             => 'Domen adınız',
-'loginproblem'               => '<b>Registrat olur känä bir problema oldu.</b><br />Bir taa deneyin!',
 'login'                      => 'Gir',
 'nav-login-createaccount'    => 'Gir / esap yarat',
 'loginprompt'                => "Bak: {{SITENAME}} saytında sessiya açmaa için tarayıcınızda läazım cookies aktivat olsun. <br />
@@ -363,6 +356,7 @@ O zamana kadar ani e-maildaki instrukțiyalar yapılmaycêk hem doorulanmaycêk
 'loginlanguagelabel'         => 'Dil: $1',
 
 # Password reset dialog
+'retypenew'           => 'Eni parolu tekrar girin',
 'resetpass_forbidden' => '{{SITENAME}} saytında parol yok nicä diiştirilsin',
 
 # Edit page toolbar
@@ -386,8 +380,8 @@ O zamana kadar ani e-maildaki instrukțiyalar yapılmaycêk hem doorulanmaycêk
 'hr_tip'          => 'Gorizontal liniya (çok sık kullanmayın)',
 
 # Edit pages
-'summary'                => 'Kısaca',
-'subject'                => 'Konu/başlık',
+'summary'                => 'Kısaca:',
+'subject'                => 'Konu/başlık:',
 'minoredit'              => 'Küçük diişilmäkler',
 'watchthis'              => 'Bak bu sayfaa',
 'savearticle'            => 'Sayfayı registrat et',
@@ -396,8 +390,8 @@ O zamana kadar ani e-maildaki instrukțiyalar yapılmaycêk hem doorulanmaycêk
 'showlivepreview'        => 'Cannı ön siir',
 'showdiff'               => 'Diişilmäkleri göster',
 'anoneditwarning'        => 'Sessiya açmadınız deyni yazının diişmäk istoriyasına diil nik, IP adresiniz registrat olunacêk.',
-'summary-preview'        => 'Ön siir özeti',
-'subject-preview'        => 'Konu/başlık ön siiri',
+'summary-preview'        => 'Ön siir özeti:',
+'subject-preview'        => 'Konu/başlık ön siiri:',
 'blockedtitle'           => 'Kullanıcı kösteklendi.',
 'blockedtext'            => '<big>Kullanıcı adınız yaki parolunuz $1 tarafından kösteklendi.</big>
 
@@ -422,7 +416,7 @@ Herliim girmediniz [[Special:Preferences|seçimner]] bölümünde geçerli bir e
 'newarticletext'         => "Henez var olmayan bir sayfaya konulmuş baalantıya tuşladınız. Bu sayfayı yaratmaa deyni aşaadaki tekst kutusunu kullanınız. Bilgi için [[{{MediaWiki:Helppage}}|yardım sayfasına]] bakınız. Herliim buraya yannış geldiniz, läazım tuşlamaa programınızın '''Geeri''' tuşuna.",
 'noarticletext'          => 'Bu sayfa boş. Bu başlıı [[Special:Search/{{PAGENAME}}|var nicä aramaa]] übür sayfalarda yaki bu sayfayı siz  [{{fullurl:{{FULLPAGENAME}}|action=edit}} var nicä yazmaa].',
 'updated'                => '(Enilendi)',
-'previewnote'            => '<strong>Bu saadä bir ön siir, hem diişmäkler henez korunmadı!</strong>',
+'previewnote'            => "'''Bu saadä bir ön siir, hem diişmäkler henez korunmadı!'''",
 'editing'                => '"$1" sayfasın diiştirersiniz',
 'editingsection'         => '"$1" sayfasında bölüm diiştirersiniz',
 'editingcomment'         => '$1 sayfasına yorum ekleersiniz.',
@@ -430,12 +424,12 @@ Herliim girmediniz [[Special:Preferences|seçimner]] bölümünde geçerli bir e
 'yourtext'               => 'Sizin tekstiniz',
 'storedversion'          => 'Saklanmış tekst',
 'yourdiff'               => 'Farklar',
-'copyrightwarning'       => "<strong>Bakınız:</strong> {{SITENAME}} saytına yapılan hepsi eklemäkler hem diişmäkler läazım olsun  <i>$2</i>
+'copyrightwarning'       => "'''Bakınız:''' {{SITENAME}} saytına yapılan hepsi eklemäkler hem diişmäkler läazım olsun  <i>$2</i>
 lițenziyası şartları içindä (detallar için $1'a bakınız).
 Herliim istemeersiniz ani sizin tekstlär serbest yayılsın hem diiştirilsin übür kullanıcılar tarafınnan, onnarı erleştirmeyniz buraya.<br />
 Hem siz garantiyada bulunêrsiniz ani eklemäklerin avtorusunuz, yaki onnarı kopiya ettiniz kaynaktan angısı izin verer teksti serbest yaymaa hem diiştirmää.<br />
-<strong><center>AVTORLUK KORUNMAK HAKKILAN KORUNMAYAN MATERÄ°ALLAR EKLEMEYNÄ°Z!</center></strong>",
-'longpagewarning'        => '<strong>BAK: Bu sayfanın ölçüsü $1 kilobayt; ölçüsü 32 kb-a yakın yaki onnan çok sayfalar bir takım brauzerlärdä var nicä yannış görünsün. Savaşênız onu bölümnerä ayırmaa.</strong>',
+'''<center>AVTORLUK KORUNMAK HAKKILAN KORUNMAYAN MATERÄ°ALLAR EKLEMEYNÄ°Z!</center>'''",
+'longpagewarning'        => "'''BAK: Bu sayfanın ölçüsü $1 kilobayt; ölçüsü 32 kb-a yakın yaki onnan çok sayfalar bir takım brauzerlärdä var nicä yannış görünsün. Savaşênız onu bölümnerä ayırmaa.'''",
 'templatesused'          => 'Bu sayfada kullanılan şablonlar:',
 'templatesusedpreview'   => 'Şablonnar ani bu ön siirdä kullanıldı:',
 'templatesusedsection'   => 'Bu bölümde kullanılan şablonlar:',
@@ -456,7 +450,7 @@ Sayfanın silmää jurnalı raatlık için yazılêr burada:",
 'viewpagelogs'        => 'Bu yaprak için jurnalları göster',
 'currentrev'          => 'Åžindiki versiya',
 'revisionasof'        => 'Sayfanın $1 datasındaki hali',
-'revision-info'       => '$1; $2 datalı versiya',
+'revision-info'       => '$1; $2 datalı versiya', # Additionally available: $3: revision id
 'previousrevision'    => '� İlerki hali',
 'nextrevision'        => 'Geerki hali →',
 'currentrevisionlink' => 'en bitki halini göster',
@@ -497,16 +491,17 @@ Nışannar: (bitki) = şindiki versiyalan aradaki fark,
 'diff-multi'              => '({{PLURAL:$1|Ara versiya|$1 ara versiyalar}} gösterilmedi.)',
 
 # Search results
-'noexactmatch' => " Başlaa bu olan bir yazı bulunamadı. Bu yazını var nicä [[:$1|'''siz çeketmää''']].",
-'prevn'        => 'ilerki $1',
-'nextn'        => 'geeriki $1',
-'viewprevnext' => '($1) ($2) ($3).',
-'powersearch'  => 'Ara',
+'noexactmatch'   => " Başlaa bu olan bir yazı bulunamadı. Bu yazını var nicä [[:$1|'''siz çeketmää''']].",
+'prevn'          => 'ilerki $1',
+'nextn'          => 'geeriki $1',
+'viewprevnext'   => '($1) ($2) ($3).',
+'searchhelp-url' => 'Help:İçindekilär',
+'powersearch'    => 'Ara',
 
 # Preferences page
 'preferences'   => 'Seçimner',
 'mypreferences' => 'Seçimnerim',
-'retypenew'     => 'Eni parolu tekrar girin',
+'skin-preview'  => 'Ön siir',
 
 # User rights
 'editinguser' => '"$1" sayfasını diiştirersiniz ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])',
@@ -550,10 +545,10 @@ Nışannar: (bitki) = şindiki versiyalan aradaki fark,
 'uploadlogpage' => 'Fayl üklemäk jurnalları',
 'uploadedimage' => 'Ãœklenen: "[[$1]]"',
 
-# Special:ImageList
-'imagelist' => 'Pätret listası',
+# Special:ListFiles
+'listfiles' => 'Pätret listası',
 
-# Image description page
+# File description page
 'filehist'                  => 'Fayl istoriyası',
 'filehist-help'             => 'Fayl istoriyasın görmää deyni Gün/Zaman bölümündeki dataları tıklayınız.',
 'filehist-current'          => 'Åžindiki',
@@ -654,47 +649,49 @@ Nışannar: (bitki) = şindiki versiyalan aradaki fark,
 'emailuser' => 'Gönder bu kullanıcıya bir e-mail',
 
 # Watchlist
-'watchlist'            => 'Bakmaa listam',
-'mywatchlist'          => 'Bakmaa listam',
-'watchlistfor'         => "('''$1''' için)",
-'addedwatch'           => 'Bakmaa listasına registrat edildi.',
-'addedwatchtext'       => '"<nowiki>$1</nowiki>" adlı sayfa [[Special:Watchlist|bakmaa listanıza]] registrat olundu.
+'watchlist'         => 'Bakmaa listam',
+'mywatchlist'       => 'Bakmaa listam',
+'watchlistfor'      => "('''$1''' için)",
+'addedwatch'        => 'Bakmaa listasına registrat edildi.',
+'addedwatchtext'    => '"<nowiki>$1</nowiki>" adlı sayfa [[Special:Watchlist|bakmaa listanıza]] registrat olundu.
 
 Gelecektä, bu sayfaya hem ilgili konuşmaa sayfasına yapılacêk diişmäkler burada yazılacêk.
 
 [[Special:RecentChanges|Bitki diişmäkler listası]] başlıı altında yazılacêk kalın bukvalarnan neçin ki kolayca seçilsin.
 
 Ne zaman neetlendiniz sayfayı bakmaa listasınnan çıkarmaa tuşlayın "sayfaya bakmaa durgun" baalantısına.',
-'removedwatch'         => 'Bakmaa listanızdan silindi',
-'removedwatchtext'     => '"<nowiki>$1</nowiki>" yapraı siir listanızdan silindi.',
-'watch'                => 'Bak',
-'watchthispage'        => 'Bak bu sayfaya',
-'unwatch'              => 'Durgun sayfa izlemää',
-'watchlist-details'    => 'Diil konuşmaa sayfaları $1 sayfa bakmaa listanızda.',
-'wlshowlast'           => 'Bitki $1 saati $2 günü göster $3',
-'watchlist-hide-bots'  => 'Bot diişmäklerini sakla',
-'watchlist-hide-own'   => 'Benim diişmäklerimi sakla',
-'watchlist-hide-minor' => 'Küçük diişmäkleri sakla',
+'removedwatch'      => 'Bakmaa listanızdan silindi',
+'removedwatchtext'  => '"<nowiki>$1</nowiki>" yapraı siir listanızdan silindi.',
+'watch'             => 'Bak',
+'watchthispage'     => 'Bak bu sayfaya',
+'unwatch'           => 'Durgun sayfa izlemää',
+'watchlist-details' => 'Diil konuşmaa sayfaları $1 sayfa bakmaa listanızda.',
+'wlshowlast'        => 'Bitki $1 saati $2 günü göster $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Bakılêr...',
 'unwatching' => 'Durgundurulêr...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Sayfayı sil',
-'historywarning'              => 'Bak: O sayfa angısını isteersiniz silmää istoriyası var:',
-'confirmdeletetext'           => 'Bu sayfayı yaki faylı silersiniz hepsi istoriyasılan bilä.
+# Delete
+'deletepage'            => 'Sayfayı sil',
+'historywarning'        => 'Bak: O sayfa angısını isteersiniz silmää istoriyası var:',
+'confirmdeletetext'     => 'Bu sayfayı yaki faylı silersiniz hepsi istoriyasılan bilä.
 Lütfen doorulayın ani siz neetlenersiniz bunu yapmaa, annêêrsiniz onun rezultatlarını hem inanêrsiniz ani bu [[{{MediaWiki:Policy-url}}|Silmää kanonnarına]] uyêr.',
-'actioncomplete'              => 'İşlik tamannandı.',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" silindi.
+'actioncomplete'        => 'İşlik tamannandı.',
+'deletedtext'           => '"<nowiki>$1</nowiki>" silindi.
 Yakın zamanda silinenleri görmää deyni: $2.',
-'deletedarticle'              => '"$1" silindi',
-'dellogpage'                  => 'Silmää jurnalı',
-'deletecomment'               => 'Silmää sebep',
-'deleteotherreason'           => 'BaÅŸka/ek sebep:',
-'deletereasonotherlist'       => 'BaÅŸka sebep',
-'rollbacklink'                => 'eski halinä dön',
+'deletedarticle'        => '"$1" silindi',
+'dellogpage'            => 'Silmää jurnalı',
+'deletecomment'         => 'Silmää sebep',
+'deleteotherreason'     => 'BaÅŸka/ek sebep:',
+'deletereasonotherlist' => 'BaÅŸka sebep',
+
+# Rollback
+'rollbacklink' => 'eski halinä dön',
+
+# Protect
 'protectlogpage'              => 'Korunmak jurnalı',
+'prot_1movedto2'              => '[[$1]] sayfasın eni adı: [[$2]]',
 'protect-legend'              => 'Korunmaa doorula',
 'protectcomment'              => 'Korunma altına almaa sebep:',
 'protectexpiry'               => 'Bitmää datası:',
@@ -702,8 +699,8 @@ Yakın zamanda silinenleri görmää deyni: $2.',
 'protect_expiry_old'          => 'Bitmää datası geçti.',
 'protect-unchain'             => 'Taşıma kilidini kaldır',
 'protect-text'                => 'Var nicä görmää hem diiştirmää buradan [[$1]] sayfasın korunmaa düzeyini.',
-'protect-locked-access'       => 'Sizin esapın yok izni yazının korunmak düzeyini diiştirmää.
-Burada bitki seçimner <strong>$1</strong> yazı diiştirmää deyni:',
+'protect-locked-access'       => "Sizin esapın yok izni yazının korunmak düzeyini diiştirmää.
+Burada bitki seçimner '''$1''' yazı diiştirmää deyni:",
 'protect-cascadeon'           => 'Bu sayfa şindi korunêr onuştan ani girer {{PLURAL:$1|aşaadaki sayfaa, angısına|||aşaadaki sayfalara, angılarına}} konuldu kaskad korunmak. Sizä yakışêr diiştirin bu sayfanın korunmak düzeyin, ama bu etkilemez kaskad korunmaa.',
 'protect-default'             => '(standart)',
 'protect-fallback'            => ' "$1" izin iste',
@@ -713,6 +710,7 @@ Burada bitki seçimner <strong>$1</strong> yazı diiştirmää deyni:',
 'protect-expiring'            => 'bitmää datası $1 (UTC)',
 'protect-cascade'             => 'Bu sayfaya girän sayfaları koru (kaskad korunmaa)',
 'protect-cantedit'            => 'Siz bu yazının korunmak düzeyin bilmärsiniz diiştirmää, neçin ki sizin onu düzmää izniniz yok.',
+'protect-expiry-options'      => '15 minut:15 minutes,1 saat:1 hour,3 saat:3 hours,24 saat:24 hours,48 saat:48 hours,1 afta:1 week,1 ay:1 month,zamansız:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ä°zin:',
 'restriction-level'           => 'Yasaklama düzeyi:',
 
@@ -738,7 +736,6 @@ Burada bitki seçimner <strong>$1</strong> yazı diiştirmää deyni:',
 # What links here
 'whatlinkshere'       => 'Baalantılar sayfaa',
 'whatlinkshere-title' => '$1 baalantısı olan sayfalar',
-'linklistsub'         => '(Baalantı listası)',
 'linkshere'           => 'Buraya baalantısı var olan sayfalar:',
 'nolinkshere'         => 'Yok buraya baalanan sayfa.',
 'isredirect'          => 'yönnendirmäk sayfası',
@@ -859,7 +856,7 @@ Yalvarêrêz başka bir ad seçmää.',
 'show-big-image'       => 'Taman aydınnık',
 'show-big-image-thumb' => '<small>Ön siir ölçüsü: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Eni pätretler',
 
 # Bad image list
diff --git a/languages/messages/MessagesGan.php b/languages/messages/MessagesGan.php
index 56f93dfa..08927e34 100644
--- a/languages/messages/MessagesGan.php
+++ b/languages/messages/MessagesGan.php
@@ -41,8 +41,8 @@ $messages = array(
 'tog-enotifrevealaddr'        => '通知郵件�話到人��嗰email地�',
 'tog-shownumberswatching'     => '顯示有幾多人監視',
 'tog-fancysig'                => '原始簽�（冇有自動連接）',
-'tog-externaleditor'          => '默�用外部編輯器（專家用嗰功能，�在您嗰電腦上特別設置一下）',
-'tog-externaldiff'            => '默�用外部差異比較器（專家用嗰功能，�在您嗰電腦上特別設置一下）',
+'tog-externaleditor'          => '默�用外部編輯器（專家用嗰功能，�到倷嗰電腦上頭特別嗰設置一下）',
+'tog-externaldiff'            => '默�用外部差異比較器（專家用嗰功能，�到倷嗰電腦上頭特別嗰設置一下）',
 'tog-showjumplinks'           => '啟用“跳到�訪�連�',
 'tog-uselivepreview'          => '使用�時�覽(JavaScript)（實驗中）',
 'tog-forceeditsummary'        => '冇改動注解時���話',
@@ -51,15 +51,13 @@ $messages = array(
 'tog-watchlisthideminor'      => '監視列表弆到細修改',
 'tog-nolangconversion'        => '嫑字轉�',
 'tog-ccmeonemails'            => '�發email到人家時也發�副本到�',
-'tog-diffonly'                => '比較兩隻版本差異時伓顯示文章內容',
+'tog-diffonly'                => '比較兩隻版本差異嗰時間伓顯示文章嗰內容',
 'tog-showhiddencats'          => '顯示弆到嗰分類',
 
 'underline-always'  => '總歸�用',
 'underline-never'   => '絕伓使用',
 'underline-default' => '�覽器�設',
 
-'skinpreview' => '（�覽）',
-
 # Dates
 'sunday'        => '禮拜天',
 'monday'        => '禮拜一',
@@ -114,9 +112,9 @@ $messages = array(
 
 # Categories related messages
 'pagecategories'           => '$1隻分類',
-'category_header'          => '“$1�分類中嗰文章',
+'category_header'          => '“$1�分類裡頭嗰文章',
 'subcategories'            => '亞分類',
-'category-media-header'    => '“$1�分類中嗰媒體',
+'category-media-header'    => '“$1�分類裡頭嗰媒體',
 'category-empty'           => '“箇隻分類有包到任何文章或媒體�',
 'hidden-categories'        => '{{PLURAL:$1|隻隱�分類|隻隱�分類}}',
 'hidden-category-category' => '弆到嗰分類', # Name of the category where hidden categories will be listed
@@ -147,7 +145,7 @@ $messages = array(
 'mytalk'         => '�嗰�話框',
 'anontalk'       => '箇隻IP嗰�話框',
 'navigation'     => '導航',
-'and'            => '�到',
+'and'            => '&#32;�到',
 
 # Metadata in edit box
 'metadata_help' => '元數據:',
@@ -173,7 +171,7 @@ $messages = array(
 'deletethispage'    => '刪�箇�',
 'undelete_short'    => '�刪�$1嗰修改',
 'protect'           => '�護',
-'protect_change'    => '更改�護',
+'protect_change'    => '修改',
 'protectthispage'   => '�護箇�',
 'unprotect'         => '解除�護',
 'unprotectthispage' => '解除�護箇�',
@@ -208,8 +206,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '關於 {{SITENAME}}',
 'aboutpage'            => 'Project:關於',
-'bugreports'           => '報告錯誤',
-'bugreportspage'       => 'Project:錯報報告',
 'copyright'            => '箇版嗰內容係根據$1嗰�款發佈。',
 'copyrightpagename'    => '{{SITENAME}} 版權',
 'copyrightpage'        => '{{ns:project}}:版權資訊',
@@ -232,8 +228,6 @@ $messages = array(
 
 'badaccess'        => '許�權錯誤',
 'badaccess-group0' => '倷嗰�求冇拕批准。',
-'badaccess-group1' => '倷嗰�求單$1嗰用戶�扤得正。',
-'badaccess-group2' => '倷嗰�求單$1嗰用戶�扤得正。',
 'badaccess-groups' => '倷嗰�求單$1嗰用戶�扤得正。',
 
 'versionrequired'     => '需�$1版嗰mediawiki',
@@ -248,6 +242,7 @@ $messages = array(
 'editsection'             => '編寫',
 'editold'                 => '編寫',
 'viewsourceold'           => '眵�原始碼',
+'viewsourcelink'          => '望�原碼',
 'editsectionhint'         => '編寫段�: $1',
 'toc'                     => '目錄',
 'showtoc'                 => '敨開',
@@ -321,7 +316,6 @@ $1',
 'cannotdelete'         => '�正嗰��或圖�刪伓正。（佢�能拕人家刪�嘞。）',
 'badtitle'             => '錯誤嗰標題',
 'badtitletext'         => '所�求嗰��標題伓正確，伓存在，跨語言或跨wiki連�。標題錯誤，佢�能有隻或好幾隻伓�嗰標題字符。',
-'perfdisabled'         => '�伓��箇隻�作�能會癱瘓資料庫，所以�暫�使用。',
 'perfcached'           => '底下係緩存資料，�能伓係最新嗰。',
 'perfcachedts'         => '底下係緩存資料，佢最�更新嗰時間係 $1。',
 'querypage-no-updates' => '箇�目�改伓正，佢嗰資料伓能仰上更新。',
@@ -341,11 +335,14 @@ $2',
 'customcssjsprotected' => '倷冇權編寫箇�，佢�到別嗰用戶嗰個人設定。',
 'ns-specialprotected'  => '編寫伓正{{ns:special}}空間嗰��。',
 
+# Virus scanner
+'virus-unknownscanner' => '�曉得嗰防病毒:',
+
 # Login and logout pages
 'logouttitle'                => '用戶退出',
-'logouttext'                 => '<strong>倷退出正嘞。</strong>
+'logouttext'                 => "'''倷退出正嘞。'''
 
-倷�以接到匿�使用{{SITENAME}}，或�登入�，隻把����能會接到話倷係登入狀態，除�係倷刪��覽器緩存。',
+倷�以接到匿�使用{{SITENAME}}，或�登入�，隻把����能會接到話倷係登入狀態，除�係倷刪��覽器緩存。",
 'welcomecreation'            => '== æ­¡è¿Ž, $1! ==
 
 建正嘞倷嗰帳戶，莫忘�設置{{SITENAME}}嗰個人�數。',
@@ -356,7 +353,6 @@ $2',
 'remembermypassword'         => '讓電腦記到密碼',
 'yourdomainname'             => '倷嗰域�：',
 'externaldberror'            => '外部驗證資料庫出錯，或倷更新伓正倷嗰外部帳戶。',
-'loginproblem'               => '<b>登入出錯。</b><br />�試�看�',
 'login'                      => '登入',
 'nav-login-createaccount'    => '登入/新開隻帳戶',
 'loginprompt'                => '�開到cookies�登入得正{{SITENAME}}。',
@@ -364,7 +360,7 @@ $2',
 'logout'                     => '退出',
 'userlogout'                 => '退出',
 'notloggedin'                => '冇登入',
-'nologin'                    => '倷冇有帳戶？ $1.',
+'nologin'                    => '倷冇得帳戶啊？ $1。',
 'nologinlink'                => '開隻新帳戶',
 'createaccount'              => '開隻新帳戶',
 'gotaccount'                 => '有�帳戶？ $1.',
@@ -380,7 +376,7 @@ $2',
 'yourvariant'                => '轉�字體',
 'yournick'                   => '簽�：',
 'badsig'                     => '原始簽�錯誤，請檢查HTML。',
-'badsiglength'               => '花��長？佢嗰長度�在$1隻字符以內。',
+'badsiglength'               => '花��長？佢嗰長度�少�$1隻字符。',
 'email'                      => '電�郵件',
 'prefs-help-realname'        => '真�係�填嗰，�係倷填嘞，倷嗰作�就會標到倷嗰�字。',
 'loginerror'                 => '登入錯誤',
@@ -407,25 +403,30 @@ $2',
 'throttled-mailpassword'     => '$1嗰�頭�發出嘞密碼�醒。怕別嗰人亂扤，$1嗰�頭之內就�會發一隻密碼�醒。',
 'mailerror'                  => '發�email錯誤: $1',
 'acct_creation_throttle_hit' => '�伓�，倷建嘞$1隻帳號。倷�建伓正囉。',
-'emailauthenticated'         => '倷嗰email已經拕$1確�有效�。',
+'emailauthenticated'         => '倷嗰電�郵件地�到$2 $3拕確�為係有效嗰。',
 'emailnotauthenticated'      => '倷嗰email<strong>哈冇拕�證</strong>。底下嗰功能都伓會發任何郵件。',
-'noemailprefs'               => '<strong>話正隻email來用箇隻功能</strong>',
+'noemailprefs'               => '話正隻email來用箇隻功能',
 'emailconfirmlink'           => '確�倷嗰email',
-'invalidemailaddress'        => 'email嗰格�伓�，請輸隻正確嗰email��或清�箇隻空格。',
+'invalidemailaddress'        => '電�郵件地�嗰格�伓�，請輸隻�嗰電�郵件地�或者清�箇隻輸入框。',
 'accountcreated'             => '帳戶扤正�',
 'accountcreatedtext'         => '扤正�$1嗰帳戶。',
 'createaccount-title'        => '到{{SITENAME}}創建嗰帳戶',
+'createaccount-text'         => '有人到{{SITENAME}}用倷嗰電�郵件地�開設�隻�字係 "$2" 嗰新帳戶($4)，密碼係 "$3" 。請倷仰上登錄�到修改密碼。
+
+�係帳戶創建��嗰話，倷就莫�箇隻消�。',
 'loginlanguagelabel'         => '語言: $1',
 
 # Password reset dialog
 'resetpass'               => '設�帳戶密碼',
 'resetpass_announce'      => '倷係用到臨時email嗰代碼登入嗰。�登正入，倷�到箇首設定隻新密碼:',
 'resetpass_header'        => '設�密碼',
+'oldpassword'             => '�密碼：',
+'newpassword'             => '新密碼：',
+'retypenew'               => '確�密碼:',
 'resetpass_submit'        => '設定密碼�到登入',
 'resetpass_success'       => '倷嗰密碼改正��正幫倷登入...',
 'resetpass_bad_temporary' => '冇用嗰臨時密碼。�能倷改正嘞倷嗰密碼，或者�新��隻新嗰臨時密碼。',
 'resetpass_forbidden'     => '到{{SITENAME}}上改伓正密碼',
-'resetpass_missing'       => '尋伓到資料。',
 
 # Edit page toolbar
 'bold_sample'     => '粗體字',
@@ -448,8 +449,8 @@ $2',
 'hr_tip'          => '橫線 (��使用)',
 
 # Edit pages
-'summary'                   => '摘�',
-'subject'                   => '主題/頭�',
+'summary'                   => '摘�:',
+'subject'                   => '主題/頭�:',
 'minoredit'                 => '箇係隻細修改',
 'watchthis'                 => '�到箇�',
 'savearticle'               => '存到著',
@@ -461,8 +462,8 @@ $2',
 'missingsummary'            => "'''�示:''' 倷冇�供編寫摘�。�係倷�按係�存嗰話，倷�存嗰編輯就會冇編輯摘�。",
 'missingcommenttext'        => '請到底下評論。',
 'missingcommentheader'      => "'''�示:''' 倷嗰評論冇�供標題。�係倷�按係�存嗰話，倷�存嗰編輯就會冇標題。",
-'summary-preview'           => '摘��覽',
-'subject-preview'           => '主題/頭��覽',
+'summary-preview'           => '摘��覽:',
+'subject-preview'           => '主題/頭��覽:',
 'blockedtitle'              => '用戶�到嘞',
 'blockedtext'               => "<big>倷嗰用戶�或IP地�拕$1�到嘞。</big>
 
@@ -505,25 +506,25 @@ $2',
 'anontalkpagetext'          => "---- ''箇係匿�用戶嗰討論�，話伓定佢哈冇開隻帳戶。別人單用得正IP地��佢�繫。箇隻IP地��能有好幾隻用戶共用。如果倷係匿�用戶，覺得箇�嗰內容�倷冇關，歡迎去[[Special:UserLogin|開隻新帳戶或登入]]，�得�別嗰匿�用戶扤混來。''",
 'noarticletext'             => '眼下箇�哈冇內容，倷�以到別嗰��[[Special:Search/{{PAGENAME}}|尋�箇�嗰標題]]或[{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} 編寫箇�]。',
 'clearyourcache'            => "'''注�:''' �存之後, 倷�清��覽器嗰緩存�眵得正改嗰內容。 '''Mozilla / Firefox / Safari:''' 按到 ''Shift'' 接到按''刷新''(或按�''Ctrl-Shift-R''，到蘋果Mac上按''Cmd-Shift-R'')；'''IE:''' 按到 ''Ctrl''接到按''刷新''，或按�''Ctrl-F5''；'''Konqueror:''' 單��按 ''刷新''；'''Opera:''' 用戶�到 ''工具-設置'' 完全嗰清除緩存。",
-'usercssjsyoucanpreview'    => "<strong>�示:</strong> 存到�請用'望�起'來測�倷嗰新CSS/JS 。",
+'usercssjsyoucanpreview'    => "'''�示:''' 存到�請用'望�起'來測�倷嗰新CSS/JS 。",
 'usercsspreview'            => "'''注�倷單係到�覽倷個人嗰 CSS，內容哈冇�存�'''",
 'userjspreview'             => "'''注�倷單係到測試��覽倷個人嗰 JavaScript，內容哈冇�存�'''",
 'userinvalidcssjstitle'     => "'''警告:''' 冇\"\$1\"嗰皮膚。請記到自定義嗰 .css � .js ��用�寫。就話，{{ns:user}}:Foo/monobook.css 伓等� {{ns:user}}:Foo/Monobook.css。",
 'updated'                   => '(更新正�)',
-'note'                      => '<strong>注�:</strong>',
-'previewnote'               => '<strong>請記到箇光係�覽，內容哈冇�存�</strong>',
+'note'                      => "'''注�:'''",
+'previewnote'               => "'''請記到箇光係�覽，內容哈冇�存�'''",
 'previewconflict'           => '箇隻�覽係上首文字編輯�嗰內容。倷�擇�存嗰話佢�會�存到。',
-'session_fail_preview'      => '<strong>�伓��箇隻段�嗰資料跌�嘞，�個俚處�伓正倷嗰編輯。請試��。哈係扤伓正嗰話，試�退出後登入�。</strong>',
-'session_fail_preview_html' => "<strong>�伓��相關嗰程�資料跌�嘞，�個俚處�伓正倷嗰編輯。</strong> 
+'session_fail_preview'      => "'''�伓��箇隻段�嗰資料跌�嘞，�個俚處�伓正倷嗰編輯。請試��。哈係扤伓正嗰話，試�退出後登入�。'''",
+'session_fail_preview_html' => "'''�伓��相關嗰程�資料跌�嘞，�個俚處�伓正倷嗰編輯。''' 
 
 ''箇隻wiki開放正嘞原HTML碼，�覽弆到嘞以防止JavaScript嗰攻擊。'' 
 
-<strong>�係佢係�法編輯嗰，請試��。哈係扤伓正嗰話，試�退出後登入�。</strong>",
-'token_suffix_mismatch'     => '<strong>倷嗰用戶端嗰編輯信毀�嘞嚸標點符號字符，噉嗰話倷嗰編輯就拕拒絕嘞。
-箇種情�通常係�到好多臭蟲�以網絡為主嗰匿�代��務扤得。</strong>',
-'editing'                   => '眼下在編輯$1',
-'editingsection'            => '眼下在編輯$1 (段�)',
-'editingcomment'            => '眼下在編輯$1 (評論)',
+'''�係佢係�法編輯嗰，請試��。哈係扤伓正嗰話，試�退出後登入�。'''",
+'token_suffix_mismatch'     => "'''倷嗰用戶端嗰編輯信毀�嘞嚸標點符號字符，噉嗰話倷嗰編輯就拕拒絕嘞。
+箇種情�通常係�到好多臭蟲�以網絡為主嗰匿�代��務扤得。'''",
+'editing'                   => '倷編輯嘚嗰係$1',
+'editingsection'            => '倷編輯嘚嗰係$1 (段�)',
+'editingcomment'            => '倷編輯嘚嗰係$1 (新段�)',
 'editconflict'              => '編輯仗: $1',
 'explainconflict'           => "倷起手編輯之後有人動�箇�。
 上首嗰方框顯示嗰係眼下本�嗰內容。
@@ -532,24 +533,24 @@ $2',
 '''單�係'''上首方框嗰內容會等倷按\"存到著\"之後拕�存。",
 'yourtext'                  => '倷編嗰內容',
 'storedversion'             => '存到嗰版本',
-'nonunicodebrowser'         => '<strong>警告：倷嗰�覽器伓兼容Unicode。箇度有隻辦法方便倷安全嗰編寫得正文章：伓係ASCII嗰字符會到編輯框裡度用�六進�編碼顯到。</strong>',
-'editingold'                => '<strong>警告：倷於今正編寫箇�嗰舊版本。
-�係倷存到佢嗰話，箇隻版本嗰全部改動會都跌�去。</strong>',
+'nonunicodebrowser'         => "'''警告：倷嗰�覽器伓兼容Unicode。箇度有隻辦法方便倷安全嗰編寫得正文章：伓係ASCII嗰字符會到編輯框裡度用�六進�編碼顯到。'''",
+'editingold'                => "'''警告：倷於今正編寫箇�嗰舊版本。
+�係倷存到佢嗰話，箇隻版本嗰全部改動會都跌�去。'''",
 'yourdiff'                  => '差異',
-'copyrightwarning'          => '請記得到{{SITENAME}}嗰全部貢�會拕�為係$2之下發出嗰（望�$1有別嗰資料）。�係倷伓想自家嗰編輯好嚟嚟拕亂扤�，唉就莫�交。<br />
+'copyrightwarning'          => "請記得到{{SITENAME}}嗰全部貢�會拕�為係$2之下發出嗰（望�$1有別嗰資料）。�係倷伓想自家嗰編輯好嚟嚟拕亂扤�，唉就莫�交。<br />
 倷都�話正倷嗰文字係倷自家寫嗰，或者係公有領域或別嗰自由資�複製到嗰。<br />
-<strong>冇任何許�嗰情�下請莫�交有版權嗰作��</strong>',
-'copyrightwarning2'         => '請記得別嗰人編得正�改得正或者刪得正倷到{{SITENAME}}嗰全部貢�。�係倷伓想自家嗰編輯好嚟嚟拕改�，唉就莫�交。<br />
+'''冇任何許�嗰情�下請莫�交有版權嗰作��'''",
+'copyrightwarning2'         => "請記得別嗰人編得正�改得正或者刪得正倷到{{SITENAME}}嗰全部貢�。�係倷伓想自家嗰編輯好嚟嚟拕改�，唉就莫�交。<br />
 倷都�話正倷嗰文字係倷自家寫嗰，或者係公有領域或別嗰自由資�複製到嗰（望�$1有別嗰資料）。
-<strong>冇任何許�嗰情�下請莫�交有版權嗰作��</strong>',
-'longpagewarning'           => '<strong>警告：箇�有$1 kilobytes�長；有嗰�覽器會編伓正超�32 kb嗰��。
-請考慮�拿佢分到細嚸嗰�段�。</strong>',
-'longpageerror'             => '<strong>錯誤：倷�交嗰文字有$1 kilobytes�長，佢長�最大嗰$2 kilobytes。存伓正倷�交嗰文字。</strong>',
-'readonlywarning'           => '<strong>警告: 資料庫鎖到嘞進行定期修護，眼下倷存伓正倷嗰改動。倷�以拿佢存到文檔�著。</strong>',
-'protectedpagewarning'      => '<strong>警告: 箇�已經��護，單�管�員許�權嗰用戶�改得正。</strong>',
+'''冇任何許�嗰情�下請莫�交有版權嗰作��'''",
+'longpagewarning'           => "'''警告：箇�有$1 kilobytes�長；有嗰�覽器會編伓正超�32 kb嗰��。
+請考慮�拿佢分到細嚸嗰�段�。'''",
+'longpageerror'             => "'''錯誤：倷�交嗰文字有$1 kilobytes�長，佢長�最大嗰$2 kilobytes。存伓正倷�交嗰文字。'''",
+'readonlywarning'           => "'''警告: 資料庫鎖到嘞進行定期修護，眼下倷存伓正倷嗰改動。倷�以拿佢存到文檔�著。'''",
+'protectedpagewarning'      => "'''警告: 箇�已經��護，單�管�員許�權嗰用戶�改得正。'''",
 'semiprotectedpagewarning'  => "'''注�：'''箇�拕鎖到嘞，單�註冊用戶編得正。",
 'cascadeprotectedwarning'   => '警告: 箇�已經��護，單�管�員許�權嗰用戶�改得正，因為箇��底下嗰連鎖�護嗰{{PLURAL:$1|一隻|多隻}}��包到嘞:',
-'titleprotectedwarning'     => '<strong>警告：箇隻�鎖到�，�有一滴�人�建得正。</strong>',
+'titleprotectedwarning'     => "'''警告：箇隻�鎖到�，�有一滴�人�建得正。'''",
 'templatesused'             => '箇隻��使用嗰模�有:',
 'templatesusedpreview'      => '箇隻�覽使用嗰模�有:',
 'templatesusedsection'      => '箇隻段�使用嗰模�有:',
@@ -578,11 +579,9 @@ $2',
 # History pages
 'viewpagelogs'        => '眵�箇�嗰日誌',
 'nohistory'           => '箇�冇修改歷�。',
-'revnotfound'         => '冇尋到修改歷�',
-'revnotfoundtext'     => '倷請求嗰更早版本嗰修改歷�冇尋到。請檢查倷嗰URL係�正確。',
 'currentrev'          => '眼�嗰修改版本',
 'revisionasof'        => '$1嗰修改版本',
-'revision-info'       => '$2到$1扤嗰修訂版本',
+'revision-info'       => '$2到$1扤嗰修訂版本', # Additionally available: $3: revision id
 'previousrevision'    => '�之�嗰修改',
 'nextrevision'        => '接到嗰修改→',
 'currentrevisionlink' => '眼�嗰修改',
@@ -620,12 +619,12 @@ $2',
 'revdelete-text'              => "'''刪�嗰改動哈會到��歷�裡頭顯示, 但公眾�覽伓正佢嗰內容。'''
 
 箇站別嗰管�員哈係能眵�弆到嗰內容，�到通��佢一樣嗰界��復刪除，除�設正嘞附加嗰�制。",
-'revdelete-legend'            => '設置修改�制',
+'revdelete-legend'            => '設置�見性嗰�制',
 'revdelete-hide-text'         => '弆到修改內容',
 'revdelete-hide-name'         => '弆到動作�目標',
 'revdelete-hide-comment'      => '弆到編輯說明',
 'revdelete-hide-user'         => '弆到編者嗰用戶�/IP',
-'revdelete-hide-restricted'   => '�樣嗰�制應用到管�員',
+'revdelete-hide-restricted'   => '�樣嗰�制應用到管�員，接到鎖定箇隻界�',
 'revdelete-suppress'          => '�時壓到由�作員�別嗰用戶嗰資料',
 'revdelete-hide-image'        => '弆到檔內容',
 'revdelete-unsuppress'        => '移��復正嗰改動嗰�制',
@@ -635,6 +634,8 @@ $2',
 'logdelete-logentry'          => '已更改[[$1]]嗰事件�見性',
 'revdelete-success'           => "'''修訂嗰�見性設置正�。'''",
 'logdelete-success'           => "'''事件嗰�見性設置正�。'''",
+'deletedhist'                 => '刪�嗰歷�',
+'revdelete-hid'               => '弆到 $1',
 
 # History merging
 'mergehistory'                     => '�併��嗰歷�',
@@ -677,6 +678,7 @@ $2',
 'prevn'                 => '�$1隻',
 'nextn'                 => '後$1隻',
 'viewprevnext'          => '眵�($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:説明',
 'showingresults'        => '底下從第<b>$2</b>�顯示起先嗰<b>$1</b>��果:',
 'showingresultsnum'     => '底下從第<b>$2</b>�顯示起先嗰<b>$3</b>��果:',
 'nonefound'             => '<strong>注�：</strong>尋伓到往往係因為�索夾到�“嗰�或“��之類嗰常用字扤得。',
@@ -698,6 +700,7 @@ $2',
 'qbsettings-floatingright' => '左首漂移',
 'changepassword'           => '改�密碼',
 'skin'                     => 'çš®',
+'skin-preview'             => '（�覽）',
 'math'                     => '數學公�',
 'dateformat'               => '日期格�',
 'datedefault'              => '默�項目',
@@ -719,9 +722,6 @@ $2',
 'prefs-misc'               => '雜項',
 'saveprefs'                => '存到�數',
 'resetprefs'               => '設��數',
-'oldpassword'              => '�密碼：',
-'newpassword'              => '新密碼：',
-'retypenew'                => '確�密碼:',
 'textboxsize'              => '編寫',
 'rows'                     => 'æ©«:',
 'columns'                  => '豎:',
@@ -749,7 +749,7 @@ $2',
 'userrights-lookup-user'   => '管�用戶群',
 'userrights-user-editname' => '輸入用戶�:',
 'editusergroup'            => '編輯用戶群',
-'editinguser'              => "眼下在編輯用戶嗰權� '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "眼下編輯嘚用戶嗰權� '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => '編輯用戶群',
 'saveusergroups'           => '存儲用戶群',
 'userrights-groupsmember'  => '歸到:',
@@ -786,7 +786,7 @@ $2',
 'recentchanges'                     => '最�嗰改動',
 'recentchangestext'                 => '跟到箇隻wiki上嗰最新改動。',
 'recentchanges-feed-description'    => '跟到箇隻 wiki 上集�嗰最後改動。',
-'rcnote'                            => "下底係到$4 $5，最近'''$2'''工嗰'''$1'''回改動:",
+'rcnote'                            => "下底係到$4 $5，箇'''$2'''日嗰'''$1'''回改動:",
 'rcnotefrom'                        => "底下係自'''$2'''嗰更改(頂多顯示'''$1'''):",
 'rclistfrom'                        => '顯示自$1後嗰新改動',
 'rcshowhideminor'                   => '$1細編輯',
@@ -812,7 +812,7 @@ $2',
 'recentchangeslinked'          => '連��嗰更改',
 'recentchangeslinked-title'    => '連��嗰改動到 "$1"',
 'recentchangeslinked-noresult' => '箇段時間嗰連��冇更改。',
-'recentchangeslinked-summary'  => "箇隻特殊�列出箇�連出去��嗰最�改動（或是�隻分類嗰��）。
+'recentchangeslinked-summary'  => "箇隻特殊�列出箇�連出去��嗰最�改動（或係�隻分類嗰��）。
 [[Special:Watchlist|倷嗰監視列表]]��會用'''粗體'''顯到。",
 
 # Upload
@@ -825,11 +825,11 @@ $2',
 'upload_directory_read_only'  => '上傳目錄($1)伓存在或冇寫入許�權。',
 'uploaderror'                 => '上傳出錯',
 'uploadtext'                  => "用下底嗰表格上傳檔案。
-�眵或�尋先�上傳嗰圖�請去[[Special:ImageList|圖�列表]]，上傳�刪除會記到[[Special:Log/upload|上傳日誌]]裡度。
+�眵或�尋先�上傳嗰圖�請去[[Special:FileList|圖�列表]]，上傳�刪除會記到[[Special:Log/upload|上傳日誌]]裡度。
 
 �係想扻文件到��，用得正下底嗰方�連�:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' 或
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' 或
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' 直接連接到箇隻文件。",
 'upload-permitted'            => '容許嗰文件類型：$1。',
 'upload-preferred'            => '優先嗰文件類型：$1。',
@@ -853,13 +853,13 @@ $2',
 'large-file'                  => '建議檔案嗰大�伓�超�$1；本檔案大�係$2。',
 'largefileserver'             => '箇隻檔案�大��務器�置容�嗰大�。',
 'emptyfile'                   => '倷上傳嗰檔案伓存在。箇�能係因為檔案�按錯嘞。請檢查倷係�真嗰�上傳箇隻檔案。',
-'fileexists'                  => '箇隻檔案�已存在。如果倷確定伓正倷係��改佢，請檢查<strong><tt>$1</tt></strong>。',
-'fileexists-extension'        => '有嘞隻飛�嗰檔�:<br /> 上載文檔嗰檔�: <strong><tt>$1</tt></strong><br /> 目�檔嗰檔�: <strong><tt>$2</tt></strong><br /> 請�隻伓�嗰�字。',
+'fileexists'                  => "箇隻檔案�已存在。如果倷確定伓正倷係��改佢，請檢查'''<tt>$1</tt>'''。",
+'fileexists-extension'        => "有嘞隻飛�嗰檔�:<br /> 上載文檔嗰檔�: '''<tt>$1</tt>'''<br /> 目�檔嗰檔�: '''<tt>$2</tt>'''<br /> 請�隻伓�嗰�字。",
 'fileexists-thumb'            => "<center>'''早就有�嗰文件'''</center>",
-'fileexists-thumbnail-yes'    => '箇隻檔案好�係一隻圖�嗰縮�版<i>(縮圖)</i>。請檢查清楚箇隻檔案<strong><tt>$1</tt></strong>。<br /> 如果檢查後嗰檔�原先圖�嗰大�係一樣嗰話，就嫑�上傳多一隻縮圖。',
-'file-thumbnail-no'           => '箇隻檔案�係以<strong><tt>$1</tt></strong>開頭。佢好�一隻圖�嗰縮�版<i>(縮圖)</i>。如果倷有箇隻圖�嗰完整版，伓然請�改�隻檔�。',
-'fileexists-forbidden'        => '箇隻檔案�已存在；請回頭並��隻新嗰�稱來上傳箇隻檔案。[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => '到共用檔案庫裡度有嘞��嗰檔案；請回頭並��隻新嗰�稱來上傳箇隻檔案。[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "箇隻檔案好�係一隻圖�嗰縮�版''(縮圖)''。請檢查清楚箇隻檔案'''<tt>$1</tt>'''。<br /> 如果檢查後嗰檔�原先圖�嗰大�係一樣嗰話，就嫑�上傳多一隻縮圖。",
+'file-thumbnail-no'           => "箇隻檔案�係以'''<tt>$1</tt>'''開頭。佢好�一隻圖�嗰縮�版''(縮圖)''。如果倷有箇隻圖�嗰完整版，伓然請�改�隻檔�。",
+'fileexists-forbidden'        => '箇隻檔案�已存在；請回頭並��隻新嗰�稱來上傳箇隻檔案。[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => '到共用檔案庫裡度有嘞��嗰檔案；請回頭並��隻新嗰�稱來上傳箇隻檔案。[[File:$1|thumb|center|$1]]',
 'successfulupload'            => '上傳正嘞',
 'uploadwarning'               => '上傳警告',
 'savefile'                    => '�存檔案',
@@ -878,7 +878,7 @@ $2',
 
 倷�想正係真嗰上傳箇隻檔案。
 為到方便起見，箇隻檔案嗰刪除記錄到下底�供嘞:",
-'filename-bad-prefix'         => '倷上傳嗰檔案�係以<strong>"$1"</strong>�開頭嗰，通常箇種冇�義嗰�字係數碼相機度嗰自動編排。請到倷嗰檔案��隻更加有�義嗰�字。',
+'filename-bad-prefix'         => "倷上傳嗰檔案�係以'''\"\$1\"'''�開頭嗰，通常箇種冇�義嗰�字係數碼相機度嗰自動編排。請到倷嗰檔案��隻更加有�義嗰�字。",
 
 'upload-proto-error'      => '�定錯誤',
 'upload-proto-error-text' => '�程上傳�求 URL 用 <code>http://</code> 或 <code>ftp://</code> 開頭。',
@@ -899,17 +899,17 @@ $2',
 'upload_source_url'  => '(一隻有效嗰，公開嗰 URL)',
 'upload_source_file' => '(倷電腦嗰一隻檔案)',
 
-# Special:ImageList
-'imagelist_search_for'  => '按媒體�字尋:',
+# Special:ListFiles
+'listfiles_search_for'  => '按媒體�字尋:',
 'imgfile'               => '檔案',
-'imagelist'             => '檔案列表',
-'imagelist_date'        => '日期',
-'imagelist_name'        => '�稱',
-'imagelist_user'        => '用戶',
-'imagelist_size'        => '大細',
-'imagelist_description' => '簡話',
-
-# Image description page
+'listfiles'             => '檔案列表',
+'listfiles_date'        => '日期',
+'listfiles_name'        => '�稱',
+'listfiles_user'        => '用戶',
+'listfiles_size'        => '大細',
+'listfiles_description' => '簡話',
+
+# File description page
 'filehist'                  => '檔案歷�',
 'filehist-help'             => '按到日期�時間去眵�許時間有�嗰檔案。',
 'filehist-deleteall'        => '全部刪掉',
@@ -934,7 +934,7 @@ $2',
 # File reversion
 'filerevert'                => '�復$1',
 'filerevert-legend'         => '�復檔案',
-'filerevert-intro'          => "眼下倷在�復'''[[Media:$1|$1]]'''到[$4 於$2 $3嗰版本]。",
+'filerevert-intro'          => "眼下倷�復嘚'''[[Media:$1|$1]]'''到[$4 於$2 $3嗰版本]。",
 'filerevert-comment'        => '說明:',
 'filerevert-defaultcomment' => '�復到嘞$1, $2嗰版本',
 'filerevert-submit'         => '�復',
@@ -952,7 +952,6 @@ $2',
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\'於 $2 $3 嗰版本刪�嘞。</span>',
 'filedelete-nofile'           => "{{SITENAME}}箇隻網站伓存在'''$1'''。",
 'filedelete-nofile-old'       => "按到指定屬性嗰情�，箇首冇'''$1'''到$2 $3嗰版本。",
-'filedelete-iscurrent'        => '眼下倷正試得刪掉箇隻檔案嗰最近版本。請拿箇隻檔案退到�舊嗰版本�著。',
 'filedelete-otherreason'      => '別嗰/附加緣故:',
 'filedelete-reason-otherlist' => '別嗰緣故',
 'filedelete-reason-dropdown'  => '*常用刪除�由
@@ -985,21 +984,9 @@ $2',
 'randomredirect-nopages' => '箇隻�字空間冇�定���。',
 
 # Statistics
-'statistics'             => '數據',
-'sitestats'              => '{{SITENAME}} 數據',
-'userstats'              => '用戶數據',
-'sitestatstext'          => "資料庫�共有'''$1'''�。
-佢就�到「討論���關於{{SITENAME}}��滴��大嗰「stub����定��，�到別嗰算伓正內容嗰�。
-冇算�內容�嗰話，許'''$2'''�就算得正係正噠正經嗰內容。
-
-'''$8'''隻檔案上傳嘞。
-
-到箇隻{{SITENAME}}建正以來，�共有'''$3'''��覽，�到'''$4'''回編輯。
-平���有'''$5'''��覽，�到'''$6'''回編輯。
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue] 嗰長度係'''$7'''。",
-'userstatstext'          => "網站有'''$1'''隻註冊[[Special:ListUsers|用戶]]，其中 '''$2''' (或 '''$4%''') 有$5許�權。",
-'statistics-mostpopular' => '眵嗰人最多嗰��',
+'statistics'              => '數據',
+'statistics-header-users' => '用戶數據',
+'statistics-mostpopular'  => '眵嗰人最多嗰��',
 
 'disambiguations'      => '扤清楚�',
 'disambiguations-text' => "底下嗰��都有到'''扤清楚�'''嗰連�, 但係佢俚應當係連到正當嗰標題。<br />
@@ -1077,10 +1064,8 @@ $2',
 'speciallogtitlelabel' => '標題:',
 'log'                  => '日誌',
 'all-logs-page'        => '所有日誌',
-'log-search-legend'    => '尋日誌',
-'log-search-submit'    => '去',
 'alllogstext'          => '�共顯到全部嗰日誌。倷能�隻日誌類型�用戶�或關���縮�顯示嗰範�。',
-'logempty'             => '日誌中冇符�嗰項目。',
+'logempty'             => '日誌裡頭冇符�嗰項目。',
 'log-title-wildcard'   => '尋�箇隻字開頭嗰標題',
 
 # Special:AllPages
@@ -1151,17 +1136,11 @@ $2',
 'wlheader-enotif'      => '* 啟動嘞email通知功能。',
 'wlheader-showupdated' => "* 上回倷眵嗰��改動嗰部分用'''粗體'''顯到",
 'watchmethod-recent'   => '眵�拕�到嗰��嗰最近編輯',
-'watchmethod-list'     => '望�監視�中嗰最�改動',
+'watchmethod-list'     => '望�監視�裡頭最�嗰改動',
 'watchlistcontains'    => '倷嗰監視列表包�$1隻��。',
 'iteminvalidname'      => "��'$1'出錯，無效命�...",
 'wlnote'               => "下底係最近'''$2'''�頭內嗰最�'''$1'''�修改:",
 'wlshowlast'           => '顯示近來$1�頭$2日$3嗰改動',
-'watchlist-show-bots'  => '顯示機器人嗰編輯',
-'watchlist-hide-bots'  => '弆到機器人嗰編輯',
-'watchlist-show-own'   => '顯示�嗰編輯',
-'watchlist-hide-own'   => '弆到�嗰編輯',
-'watchlist-show-minor' => '顯到細編輯',
-'watchlist-hide-minor' => '弆到細編輯',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '�到...',
@@ -1191,64 +1170,69 @@ $NEWPAGE
 
 回饋�到別嗰説明: {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '刪���',
-'confirm'                     => '確�',
-'excontent'                   => "內容係: '$1'",
-'excontentauthor'             => '內容係: \'$1\' (唯一嗰貢�者係"$2")',
-'exbeforeblank'               => "拕清空之�嗰內容係: '$1'",
-'exblank'                     => '��冇內容',
-'delete-confirm'              => '刪�"$1"去',
-'delete-legend'               => '刪�去',
-'historywarning'              => '警告: 倷�刪�嗰���到歷�版',
-'confirmdeletetext'           => '仰上倷就�永久刪�資料庫嗰一隻��或圖��佢嗰歷�。請確定倷�噉�，哈�曉得佢嗰後果，更加伓能��[[{{MediaWiki:Policy-url}}]]。',
-'actioncomplete'              => '扤正嘞',
-'deletedtext'                 => '"<nowiki>$1</nowiki>"刪�嘞。最�嗰刪除記錄請望$2。',
-'deletedarticle'              => '"[[$1]]"刪�嘞',
-'dellogpage'                  => '刪除日誌',
-'dellogpagetext'              => '下底係最�刪除嗰記錄列表:',
-'deletionlog'                 => '刪除日誌',
-'reverted'                    => '�復到早先嗰版本',
-'deletecomment'               => '刪除嗰緣故:',
-'deleteotherreason'           => '別嗰/附加�由:',
-'deletereasonotherlist'       => '別嗰�由',
-'deletereason-dropdown'       => '*常用刪除嗰�由
+# Delete
+'deletepage'            => '刪���',
+'confirm'               => '確�',
+'excontent'             => "內容係: '$1'",
+'excontentauthor'       => '內容係: \'$1\' (唯一嗰貢�者係"$2")',
+'exbeforeblank'         => "拕清空之�嗰內容係: '$1'",
+'exblank'               => '��冇內容',
+'delete-confirm'        => '刪�"$1"去',
+'delete-legend'         => '刪�去',
+'historywarning'        => '警告: 倷�刪�嗰���到歷�版',
+'confirmdeletetext'     => '仰上倷就�永久刪�資料庫嗰一隻��或圖��佢嗰歷�。請確定倷�噉�，哈�曉得佢嗰後果，更加伓能��[[{{MediaWiki:Policy-url}}]]。',
+'actioncomplete'        => '扤正嘞',
+'deletedtext'           => '"<nowiki>$1</nowiki>"刪�嘞。最�嗰刪除記錄請望$2。',
+'deletedarticle'        => '"[[$1]]"刪�嘞',
+'dellogpage'            => '刪除日誌',
+'dellogpagetext'        => '下底係最�刪除嗰記錄列表:',
+'deletionlog'           => '刪除日誌',
+'reverted'              => '�復到早先嗰版本',
+'deletecomment'         => '刪除嗰緣故:',
+'deleteotherreason'     => '別嗰/附加�由:',
+'deletereasonotherlist' => '別嗰�由',
+'deletereason-dropdown' => '*常用刪除嗰�由
 ** 寫嗰人自家嗰�求
 ** 侵犯版權
 ** 特試破壞',
-'rollback'                    => '還原修改',
-'rollback_short'              => '還原',
-'rollbacklink'                => '還原',
-'rollbackfailed'              => '還原失敗',
-'cantrollback'                => '還原伓正；最末嗰貢�人係文章嗰唯一作者。',
-'alreadyrolled'               => '還原伓正由[[User:$2|$2]] ([[User talk:$2|討論]])�嗰[[$1]]嗰最�編寫；
+
+# Rollback
+'rollback'         => '還原修改',
+'rollback_short'   => '還原',
+'rollbacklink'     => '還原',
+'rollbackfailed'   => '還原失敗',
+'cantrollback'     => '還原伓正；最末嗰貢�人係文章嗰唯一作者。',
+'alreadyrolled'    => '還原伓正由[[User:$2|$2]] ([[User talk:$2|討論]])�嗰[[$1]]嗰最�編寫；
 別嗰人編輯�或係�復嘞箇�。
 
 最�編輯人: [[User:$3|$3]] ([[User talk:$3|討論]])。',
-'editcomment'                 => '編輯介紹: "<i>$1</i>"。', # only shown if there is an edit comment
-'revertpage'                  => '返回由[[Special:Contributions/$2|$2]] ([[User talk:$2|�話]])嗰編輯；�復到[[User:$1|$1]]嗰最末一隻版本', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '返回由$1嗰編輯；�復到$2嗰最末一隻版本。',
-'sessionfailure'              => '倷嗰登入好�有嚸�題，為到防範未然，箇隻動作拕�消嘞。
+'editcomment'      => "編輯介紹: \"''\$1''\"。", # only shown if there is an edit comment
+'revertpage'       => '返回由[[Special:Contributions/$2|$2]] ([[User talk:$2|�話]])嗰編輯；�復到[[User:$1|$1]]嗰最末一隻版本', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '返回由$1嗰編輯；�復到$2嗰最末一隻版本。',
+'sessionfailure'   => '倷嗰登入好�有嚸�題，為到防範未然，箇隻動作拕�消嘞。
 
 請按�“後退��試�囉�',
+
+# Protect
 'protectlogpage'              => '�護日誌',
 'protectlogtext'              => '下底係��鎖定�到解除鎖定嗰列表。請望下[[Special:ProtectedPages|�護��列表]]來監察目�嗰���護情�。',
 'protectedarticle'            => '�護正嘞“[[$1]] �',
 'modifiedarticleprotection'   => '改變嘞“[[$1]] � 嗰�護等級',
 'unprotectedarticle'          => '撤銷�護“[[$1]] �',
 'protect-title'               => '�護“$1�中',
+'prot_1movedto2'              => '[[$1]]移到[[$2]]',
 'protect-legend'              => '確��護',
 'protectcomment'              => '注解:',
 'protectexpiry'               => '期�:',
 'protect_expiry_invalid'      => '到期時間無效。',
 'protect_expiry_old'          => '到期時間已�。',
 'protect-unchain'             => '莫鎖到移動許�權',
-'protect-text'                => '倷到箇首能�覽或修改��<strong><nowiki>$1</nowiki></strong>嗰�護級別。',
-'protect-locked-blocked'      => '倷改伓正拕�鎖時嗰�護級別。下底係<strong>$1</strong>�今嗰�護級別:',
-'protect-locked-dblock'       => '資料庫鎖到嘞就改伓正�護級別。下底係<strong>$1</strong>�今嗰�護級別:',
-'protect-locked-access'       => '倷嗰許�權改伓正�護級別。
+'protect-text'                => "倷到箇首能�覽或修改��'''<nowiki>$1</nowiki>'''嗰�護級別。",
+'protect-locked-blocked'      => "倷改伓正拕�鎖時嗰�護級別。下底係'''$1'''�今嗰�護級別:",
+'protect-locked-dblock'       => "資料庫鎖到嘞就改伓正�護級別。下底係'''$1'''�今嗰�護級別:",
+'protect-locked-access'       => "倷嗰許�權改伓正�護級別。
 
-下底係<strong>$1</strong>�今嗰�護級別:',
+下底係'''$1'''�今嗰�護級別:",
 'protect-cascadeon'           => '下底嗰{{PLURAL:$1|一隻|多隻}}���到箇�，佢哈啟動嘞連鎖�護，故係箇�也就拕�護到嘞，編伓正。倷能設�箇�嗰�護級別，但係箇伓會影響到連鎖�護。',
 'protect-default'             => '(默�)',
 'protect-fallback'            => '��“$1�嗰許�',
@@ -1258,6 +1242,7 @@ $NEWPAGE
 'protect-expiring'            => '$1 (UTC)到期',
 'protect-cascade'             => '�護箇��到嗰�� (連鎖�護)',
 'protect-cantedit'            => '倷改伓正箇�嗰�護程度，因為倷冇�到編輯授權。',
+'protect-expiry-options'      => '兩個�頭:2 hours,一日:1 day,三日:3 days,一個禮拜:1 week,兩個禮拜:2 weeks,一個月:1 month,三個月:3 months,六個月:6 months,一年:1 year,一世:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '許�權:',
 'restriction-level'           => '�制級別:',
 'minimum-size'                => '最細碼�',
@@ -1336,7 +1321,6 @@ $NEWPAGE
 'whatlinkshere'       => '有什哩連到箇首',
 'whatlinkshere-title' => '連到 $1 嗰��',
 'whatlinkshere-page'  => '��:',
-'linklistsub'         => '(連�列表)',
 'linkshere'           => '下底嗰��連�到[[:$1]]：',
 'nolinkshere'         => '冇��連�到[[:$1]]。',
 'nolinkshere-ns'      => '�正嗰空間�內冇��連�到[[:$1]]。',
@@ -1459,12 +1443,14 @@ $NEWPAGE
 *倷伓�下底嗰�擇方塊。
 噉倷就��手工移動或�併��。",
 'movearticle'             => '�動��:',
+'movenologin'             => '冇登入',
+'movenologintext'         => '倷�係登記用戶接到[[Special:UserLogin|登入]]後�移動得正��。',
 'movenotallowed'          => '倷到{{SITENAME}}冇權移動��。',
 'newtitle'                => '新標題:',
 'move-watch'              => '�到箇�',
 'movepagebtn'             => '��箇�',
 'pagemovedsub'            => '移正嘞',
-'movepage-moved'          => "<big>'''「$1�已經移動到「$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved'          => "<big>'''「$1�拕移到「$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
 'articleexists'           => '已經有���箇隻�字，�伓倷�嗰�字冇用。請��隻�字。',
 'cantmove-titleprotected' => '倷移伓正一隻��到箇隻�置，箇隻新題目已經拕�護起來嘞，新建伓正。',
 'talkexists'              => '��本身移動正嘞，但係新標題下底有嘞�話�，所以�話�移伓正。請手工�併兩�。',
@@ -1483,13 +1469,12 @@ $NEWPAGE
 'delete_and_move_confirm' => '係嗰，刪�箇�',
 'delete_and_move_reason'  => '為到移動刪�佢',
 'selfmove'                => '原始標題�目標標題一樣，一隻��移伓正到佢自家。',
-'immobile_namespace'      => '目標標題係特別類型；�移伓進去箇隻空間�。',
 
 # Export
 'export'            => '導出��',
 'exporttext'        => '通�XML格�倷能�特定嗰��或一組��嗰文本�到佢編輯嗰歷�一齊導出；噉通�"[[Special:Import|導入��]]"就導入得到別嗰MediaWiki網站。�導出��嗰話，請到下底嗰文字框寫正標題，一行一隻標題，�話正倷係��導出�歷�嗰舊版本，或單就�導出最�一回編輯嗰相關內容。
 
-�就係通�連�倷哈導出得正檔案，比如倷用得正[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]導出"[[{{MediaWiki:Mainpage}}]]"��',
+�就係通�連�倷哈導出得正檔案，比如倷用得正[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]導出"[[{{MediaWiki:Mainpage}}]]"��',
 'exportcuronly'     => '�今�嗰改動，伓係全部嗰歷�。',
 'exportnohistory'   => "----
 '''注�:''' 由於性能嗰原因，箇隻表格導出嗰��嗰全部歷�都拕�用。",
@@ -1505,7 +1490,7 @@ $NEWPAGE
 'allmessagesdefault'        => '默�文字',
 'allmessagescurrent'        => '眼�嗰文字',
 'allmessagestext'           => '箇首列到全部制定得正嗰系統界�。
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:系統界�功能'''關�嘞('''\$wgUseDatabaseMessages''')。",
 'allmessagesfilter'         => '按消��篩:',
 'allmessagesmodified'       => '單顯到改正嗰',
@@ -1526,6 +1511,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-interwiki-history'   => '複製箇�嗰全部歷�',
 'import-interwiki-submit'    => 'å°Žå…¥',
 'import-interwiki-namespace' => '拿��移到空間�:',
+'import-comment'             => '說明:',
 'importtext'                 => '請用 Special:Export 從� wiki 導出檔案，�存到倷嗰�盤然後上傳到箇首。',
 'importstart'                => '導入��中...',
 'import-revision-count'      => '$1隻修改',
@@ -1545,7 +1531,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-parse-failure'       => 'XML 導進分�失敗',
 'import-noarticle'           => '冇��導入�',
 'import-nonewrevisions'      => '早先嗰改動全部扤進去�。',
-'xml-error-string'           => '$1 在 $2 行，$3 列 （$4字節）：$5',
+'xml-error-string'           => '$1 �到 $2 行，$3 列 （$4字節）：$5',
 
 # Import log
 'importlogpage'                    => '導入日誌',
@@ -1706,7 +1692,7 @@ $1',
 'show-big-image'       => '完整解�度',
 'show-big-image-thumb' => '<small>箇幅縮略圖嗰解�度: $1 × $2 �素</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '新建圖�畫廊',
 'imagelisttext'         => '底下係按$2排列嗰$1隻檔案列表。',
 'showhidebots'          => '($1機器人)',
@@ -2042,21 +2028,9 @@ $3
 請想正後��建��。",
 'recreate'            => '�建',
 
-# HTML dump
-'redirectingto' => '�定�到[[:$1]]...',
-
 # action=purge
-'confirm_purge'        => '想清�箇�嗰緩存?
-
-$1',
 'confirm_purge_button' => '�得',
-
-# AJAX search
-'searchcontaining' => "尋�到''$1''嗰文章。",
-'searchnamed'      => "尋�''$1''嗰文章。",
-'articletitles'    => '以"$1"開頭嗰文章',
-'hideresults'      => '弆到嗰�果',
-'useajaxsearch'    => '用 AJAX 尋',
+'confirm-purge-top'    => '想清�箇�嗰緩存?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� 上�',
@@ -2076,13 +2050,13 @@ $1',
 
 # Auto-summaries
 'autosumm-blank'   => '移���嗰全部內容',
-'autosumm-replace' => "正拿���� '$1'",
-'autoredircomment' => '正�定�到[[$1]]',
+'autosumm-replace' => "����到 '$1'",
+'autoredircomment' => '�定�到[[$1]]',
 'autosumm-new'     => 'æ–°é �: $1',
 
 # Live preview
-'livepreview-loading' => '正在載入…',
-'livepreview-ready'   => '正在載入… 完�哩!',
+'livepreview-loading' => '載入中…',
+'livepreview-ready'   => '載入中… 舞正哩!',
 'livepreview-failed'  => '�時�覽失敗! 試�標準�覽。',
 'livepreview-error'   => '連接失敗: $1 "$2" 試�標準�覽。',
 
diff --git a/languages/messages/MessagesGd.php b/languages/messages/MessagesGd.php
index f6c8d7d0..39ebd213 100644
--- a/languages/messages/MessagesGd.php
+++ b/languages/messages/MessagesGd.php
@@ -5,22 +5,59 @@
  * @file
  *
  * @author Alison
+ * @author Caoimhin
  * @author Sionnach
+ * @author Steafan31
  * @author לערי ריינה�רט
  */
 
 $messages = array(
 # Dates
-'thursday' => 'Diardaoin',
-'friday'   => 'Di-Haoine',
-'august'   => 'An Lùnastal',
+'sunday'        => 'Didòmhnaich',
+'monday'        => 'Diluain',
+'tuesday'       => 'Dimàirt',
+'wednesday'     => 'Diciadain',
+'thursday'      => 'Diardaoin',
+'friday'        => 'Dihaoine',
+'saturday'      => 'Disathairne',
+'sun'           => 'DiD',
+'mon'           => 'DiL',
+'tue'           => 'DiM',
+'wed'           => 'DiC',
+'thu'           => 'DiA',
+'fri'           => 'DiH',
+'sat'           => 'DiS',
+'january'       => 'Faoilleach',
+'february'      => 'Gearran',
+'march'         => 'Màirt',
+'april'         => 'Giblean',
+'may_long'      => 'Cèitean',
+'june'          => 'Ã’g-mhios',
+'july'          => 'Iuchar',
+'august'        => 'An Lùnastal',
+'september'     => 'Sultain',
+'october'       => 'Dàmhair',
+'november'      => 'Samhain',
+'december'      => 'Dùbhlachd',
+'january-gen'   => 'an Fhaoillich',
+'february-gen'  => "a' Ghearrain",
+'march-gen'     => "a' Mhàirt",
+'april-gen'     => "a' Ghiblein",
+'may-gen'       => "a' Chèitein",
+'june-gen'      => 'an Ã’g-mhiosa',
+'july-gen'      => 'an Iuchair',
+'august-gen'    => 'an Lùnastail',
+'september-gen' => 'na Sultaine',
+'october-gen'   => 'na Dàmhair',
+'november-gen'  => 'na Samhna',
+'december-gen'  => 'na Dùbhlachd',
 
 # Categories related messages
 'category_header' => 'Altan sa ghnè "$1"',
 'subcategories'   => 'Fo-ghnethan',
 
 'about'          => 'Mu',
-'newwindow'      => "(a'fosgladh ann an uinneag ùr)",
+'newwindow'      => '(a’ fosgladh ann an uinneig ùir)',
 'qbfind'         => 'Lorg',
 'qbedit'         => 'Deasaich',
 'qbpageoptions'  => 'An duilleag seo',
@@ -29,7 +66,7 @@ $messages = array(
 'moredotdotdot'  => 'Barrachd...',
 'mypage'         => 'Mo dhuilleag',
 'anontalk'       => 'Labhairt air an IP seo',
-'and'            => 'agus',
+'and'            => '&#32;agus',
 
 'errorpagetitle'    => 'Mearachd',
 'returnto'          => 'Till gu $1.',
@@ -42,6 +79,7 @@ $messages = array(
 'info_short'        => 'Fiosrachadh',
 'printableversion'  => 'Lethbhreac so-chlòbhualadh',
 'edit'              => 'Deasaich',
+'create'            => 'Cruthaich',
 'editthispage'      => 'Deasaich an duilleag seo',
 'deletethispage'    => 'Dubh às an duilleag seo',
 'protect'           => 'Dìon',
@@ -56,7 +94,7 @@ $messages = array(
 'talk'              => 'Deasbaireachd',
 'userpage'          => 'Seall duilleag cleachdair',
 'imagepage'         => 'Seall duilleag ìomhaigh',
-'otherlanguages'    => 'Cainntean eile',
+'otherlanguages'    => 'Cànanan eile',
 'redirectedfrom'    => '(Ath-stiùirte o $1)',
 'protectedpage'     => 'Duilleag dìonta',
 
@@ -104,13 +142,13 @@ $1",
 'readonly'        => 'Stor-dàta glaiste',
 'badarticleerror' => 'Cha ghabh an gnìomh seo a dhèanamh air an duilleig seo.',
 'badtitle'        => 'Droch thiotal',
-'perfdisabled'    => "Tha sinn duilich! Tha an goireas seo air a chur bho fheum gu sealadach o chionns gum bi e a'slaodadh an stòr-dàta gus nach urrain do neach sam bith an wiki a chleachdadh.",
 
 # Login and logout pages
 'yourname'                   => 'An t-ainm-cleachdair agaibh',
 'yourpassword'               => 'Am facal-faire agaibh',
 'yourpasswordagain'          => 'Ath-sgrìobh facal-faire',
 'login'                      => 'Cuir a-steach',
+'nav-login-createaccount'    => 'Log a-steach/Cruthaich cunntas',
 'userlogin'                  => 'Cuir a-steach',
 'logout'                     => 'Cuir a-mach',
 'userlogout'                 => 'Clàraich a-mach',
@@ -120,7 +158,12 @@ $1",
 'noname'                     => 'Chan eil sibh air ainm-cleachdair iomchaidh a chomharrachadh.',
 'nosuchusershort'            => 'Chan eil cleachdair leis an ainm "<nowiki>$1</nowiki>" ann; sgrùdaibh an litreachadh agaibh no cleachaibh am billeag gu h-ìseal gus cùnntas ùr a chrùthachadh.',
 'wrongpassword'              => "Chan eil am facal-faire a sgrìobh sibh a-steach ceart. Feuchaibh a-rithis, ma's e ur toil e.",
-'acct_creation_throttle_hit' => 'Tha sinn duilich; tha sibh air $1 cùnntasan a chruthachadh cheana agus chan fhaod sibh barrachd a dhèanamh.',
+'acct_creation_throttle_hit' => 'Tha sinn duilich; tha sibh air {{PLURAL:$1|1 cùnntas|$1 cùnntasan}} a chruthachadh cheana agus chan fhaod sibh barrachd a dhèanamh.',
+
+# Password reset dialog
+'oldpassword' => 'Seann fhacal-faire',
+'newpassword' => 'Facal-faire ùr',
+'retypenew'   => 'Ath-sgrìobh facal-faire ùr',
 
 # Edit page toolbar
 'italic_sample'   => 'Teacsa eadailteach',
@@ -129,8 +172,8 @@ $1",
 'headline_tip'    => 'Ceann-loidhne ìre 2',
 
 # Edit pages
-'summary'         => 'Geàrr-chùnntas',
-'subject'         => 'Cuspair/ceann-loidhne',
+'summary'         => 'Geàrr-chùnntas:',
+'subject'         => 'Cuspair/ceann-loidhne:',
 'minoredit'       => 'Seo mùthadh beag',
 'watchthis'       => 'Cùm sùil air an aithris seo',
 'savearticle'     => 'Sàbhail duilleag',
@@ -143,13 +186,13 @@ $1",
 'newarticle'      => '(Ùr)',
 'noarticletext'   => '(Chan eil teacsa anns an duilleig seo a-nis)',
 'updated'         => '(Nua-dheasaichte)',
-'previewnote'     => '<strong>Cuimhnichibh nach e ach roi-shealladh a tha seo, agus chan eil e air a shàbhaladh fhathast!</strong>',
+'previewnote'     => "'''Cuimhnichibh nach e ach roi-shealladh a tha seo, agus chan eil e air a shàbhaladh fhathast!'''",
 'editing'         => "A'deasaicheadh $1",
 'editconflict'    => 'Mì-chòrdadh deasachaidh: $1',
 'explainconflict' => "Tha cuideigin eile air an duilleig seo a mhùthadh o'n thòisich sibh fhèin a dheasaicheadh. Tha am bocsa teacsa shuas a'nochdadh na duilleig mar a tha e an dràsda. Tha na mùthaidhean agaibhse anns a'bhocsa shios. Feumaidh sibh na mùthaidhean agaibh a choimeasgachadh leis an teacsa làithreach. Cha tèid <b>ach an teacsa shuas</b> a shàbhaladh an uair a bhriogas sibh \"Sàbhail duilleag\".<p>",
 'yourtext'        => 'An teacsa agaibh',
 'storedversion'   => 'Lethbhreac taisgte',
-'editingold'      => "<strong>RABHADH: Tha sibh a'deasaicheadh lethbhreac sean-aimsireil na duilleig seo. Ma shàbhalas sibh e, bithidh uile na mùthaidhean dèanta as dèidh an lethbhreac seo air chall.</strong>",
+'editingold'      => "'''RABHADH: Tha sibh a'deasaicheadh lethbhreac sean-aimsireil na duilleig seo. Ma shàbhalas sibh e, bithidh uile na mùthaidhean dèanta as dèidh an lethbhreac seo air chall.'''",
 'yourdiff'        => 'Caochlaidhean',
 
 # History pages
@@ -164,15 +207,17 @@ $1",
 'compareselectedversions' => 'Coimeas lethbhreacan taghta',
 
 # Search results
-'searchresults'     => 'Toraidhean rannsachaidh',
-'notitlematches'    => "Chan eil tiotal duilleig a'samhlachadh",
-'notextmatches'     => "Chan eil teacsa duilleig a'samhlachadh",
-'prevn'             => '$1 mu dheireadh',
-'nextn'             => 'an ath $1',
-'viewprevnext'      => 'Seall ($1) ($2) ($3).',
-'showingresults'    => "A'nochdadh {{PLURAL:$1|'''1''' toradh|'''$1''' toraidhean}} gu h-ìosal a'tòiseachadh le #'''$2'''.",
-'showingresultsnum' => "A'nochdadh {{PLURAL:$3|'''1''' toradh|'''$3''' toraidhean}} gu h-ìosal a'tòiseachadh le #'''$2'''.",
-'powersearch'       => 'Rannsaich',
+'searchresults'         => 'Toraidhean rannsachaidh',
+'noexactmatch-nocreate' => "'''Chan eil duilleag ann leis an ainm “$1�.'''",
+'notitlematches'        => "Chan eil tiotal duilleig a'samhlachadh",
+'notextmatches'         => "Chan eil teacsa duilleig a'samhlachadh",
+'prevn'                 => '$1 mu dheireadh',
+'nextn'                 => 'an ath $1',
+'viewprevnext'          => 'Seall ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Cuideachadh',
+'showingresults'        => "A'nochdadh {{PLURAL:$1|'''1''' toradh|'''$1''' toraidhean}} gu h-ìosal a'tòiseachadh le #'''$2'''.",
+'showingresultsnum'     => "A'nochdadh {{PLURAL:$3|'''1''' toradh|'''$3''' toraidhean}} gu h-ìosal a'tòiseachadh le #'''$2'''.",
+'powersearch'           => 'Rannsaich',
 
 # Preferences page
 'preferences'        => 'Taghaidhean',
@@ -183,9 +228,6 @@ $1",
 'prefs-personal'     => "Dàta a'chleachdair",
 'saveprefs'          => 'Sàbhail roghainnean',
 'resetprefs'         => 'Ath-shuidhich taghaidhean',
-'oldpassword'        => 'Seann fhacal-faire',
-'newpassword'        => 'Facal-faire ùr',
-'retypenew'          => 'Ath-sgrìobh facal-faire ùr',
 'rows'               => 'Sreathan',
 'columns'            => 'Colbhan',
 'savedprefs'         => 'Tha na roghainnean agaibh air an sàbhaladh.',
@@ -216,25 +258,15 @@ $1",
 'filestatus'    => 'Cor dlighe-sgrìobhaidh:',
 'ignorewarning' => 'Leig an rabhadh seachad agus sàbhail am faidhle codhiù.',
 'badfilename'   => 'Ainm ìomhaigh air atharrachadh ri "$1".',
-'fileexists'    => 'Tha faidhle leis an ainm seo ann cheana; nach faigh sibh cinnt air <strong><tt>$1</tt></strong> gu bheil sibh ag iarraidh atharrachadh.',
+'fileexists'    => "Tha faidhle leis an ainm seo ann cheana; nach faigh sibh cinnt air '''<tt>$1</tt>''' gu bheil sibh ag iarraidh atharrachadh.",
 'savefile'      => 'Sàbhail faidhle',
 
-# Special:ImageList
-'imagelist' => 'Liosta nan ìomhaigh',
+# Special:ListFiles
+'listfiles' => 'Liosta nan ìomhaigh',
 
 # Random page
 'randompage' => 'Duilleag thuairmeach',
 
-# Statistics
-'sitestatstext' => "Tha {{PLURAL:\$1|'''1''' duilleag|'''\$1''' duilleagan gu lèir}} anns an stor-dàta, a'cur san àireamh duilleagan-làbhairt, duilleagan mu dheidhinn a'{{SITENAME}} fhèin, duilleagan \"bun\", ath-stiùireidhean, agus feadhainn eile nach eil nan duilleag brìgheil. As aonais sin, tha '''\$2''' duilleagan ann le brìgh.
-
-'''\$8''' {{PLURAL:\$8|fhaidhl|fhaidhle}} a cuir ri.
-
-Tha na duilleagan air an sealladh '''\$3''' {{PLURAL:\$3|uair|uairean}}, agus air an deasaicheadh '''\$4''' {{PLURAL:\$4|uair|uairean}} o'n deach an wiki a shuidheachadh.
-Thig sin ri '''\$5''' deasaicheidhean anns a'mheadhan gach duilleag, agus '''\$6''' seallaidhean gach duilleag.
-
-Tha feadh an [http://www.mediawiki.org/wiki/Manual:Job_queue queue tùrn] na '''\$7'''.",
-
 'doubleredirects' => 'Ath-stiùreidhean dùbailte',
 
 'brokenredirects' => 'Ath-stiùireidhean briste',
@@ -281,18 +313,23 @@ Ma bu toil leibh a dhubh a'dhuilleag as ur faire agaibh nas fadalache, cnap air
 'watchlistcontains'  => 'Tha $1 {{PLURAL:$1|duilleag|duilleagan}} air an liosta-faire agaibh.',
 'wlshowlast'         => 'Nochd $1 uairean $2 laithean mu dheireadh $3',
 
-# Delete/protect/revert
-'deletepage'         => 'Dubh às duilleag',
-'confirm'            => 'Daingnich',
-'excontent'          => "stuth a bh'ann: '$1'",
-'exblank'            => 'bha duilleag falamh',
-'actioncomplete'     => 'Gnìomh coileanta',
-'reverted'           => 'Tillte ri lethbhreac as ùire',
-'editcomment'        => 'Bha mìneachadh an deasaicheidh: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'         => 'Tillte deasachadh aig [[Special:Contributions/$2|$2]] ([[User talk:$2|Deasbaireachd]]) ais ri lethbhreac mu dheireadh le [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+# Delete
+'deletepage'     => 'Dubh às duilleag',
+'confirm'        => 'Daingnich',
+'excontent'      => "stuth a bh'ann: '$1'",
+'exblank'        => 'bha duilleag falamh',
+'actioncomplete' => 'Gnìomh coileanta',
+'reverted'       => 'Tillte ri lethbhreac as ùire',
+
+# Rollback
+'editcomment' => "Bha mìneachadh an deasaicheidh: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'  => 'Tillte deasachadh aig [[Special:Contributions/$2|$2]] ([[User talk:$2|Deasbaireachd]]) ais ri lethbhreac mu dheireadh le [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectedarticle'   => 'dìonta "[[$1]]"',
 'unprotectedarticle' => '"[[$1]]" neo-dhìonta',
 'protect-title'      => 'A\'dìonadh "$1"',
+'prot_1movedto2'     => '[[$1]] gluaiste ri [[$2]]',
 'protect-legend'     => 'Daingnich dìonadh',
 'protectcomment'     => 'Aobhar airson dìonaidh',
 
@@ -357,9 +394,11 @@ Ma bu toil leibh a dhubh a'dhuilleag as ur faire agaibh nas fadalache, cnap air
 'importnotext' => 'Falamh no gun teacsa',
 
 # Tooltip help for the actions
-'tooltip-minoredit' => 'Comharraich seo mar meanbh-dheasachadh',
-'tooltip-save'      => 'Sàbhail na mùthaidhean agaibh',
-'tooltip-preview'   => 'Roi-sheallaibh na mùthaidhean agaibh; cleachdaibh seo mas sàbhail sibh iad!',
+'tooltip-n-mainpage' => "Tadhail air a' phrìomh dhuilleag",
+'tooltip-n-portal'   => "Mun phròiseact, na 's urrainn dhuit dhèanamh, far an lorgar nithean",
+'tooltip-minoredit'  => 'Comharraich seo mar meanbh-dheasachadh',
+'tooltip-save'       => 'Sàbhail na mùthaidhean agaibh',
+'tooltip-preview'    => 'Roi-sheallaibh na mùthaidhean agaibh; cleachdaibh seo mas sàbhail sibh iad!',
 
 # Attribution
 'othercontribs' => 'Stèidhichte air obair le $1.',
@@ -369,7 +408,7 @@ Ma bu toil leibh a dhubh a'dhuilleag as ur faire agaibh nas fadalache, cnap air
 'infosubtitle' => 'Fiosrachadh air duilleig',
 'numwatchers'  => 'Aireamh luchd-faire: $1',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Rannsaich',
 'bydate'   => 'air ceann-latha',
 
diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index 825332c7..9c44ac94 100644
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -13,33 +13,126 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Conversa',
-	NS_USER           => 'Usuario',
-	NS_USER_TALK      => 'Conversa_Usuario',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'Conversa_$1',
-	NS_IMAGE          => 'Imaxe',
-	NS_IMAGE_TALK     => 'Conversa_Imaxe',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Conversa_MediaWiki',
-	NS_TEMPLATE       => 'Modelo',
-	NS_TEMPLATE_TALK  => 'Conversa_Modelo',
-	NS_HELP           => 'Axuda',
-	NS_HELP_TALK      => 'Conversa_Axuda',
-	NS_CATEGORY       => 'Categoría',
-	NS_CATEGORY_TALK  => 'Conversa_Categoría',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_TALK             => 'Conversa',
+	NS_USER             => 'Usuario',
+	NS_USER_TALK        => 'Conversa_usuario',
+	NS_PROJECT_TALK     => 'Conversa_$1',
+	NS_FILE             => 'Ficheiro',
+	NS_FILE_TALK        => 'Conversa_ficheiro',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Conversa_MediaWiki',
+	NS_TEMPLATE         => 'Modelo',
+	NS_TEMPLATE_TALK    => 'Conversa_modelo',
+	NS_HELP             => 'Axuda',
+	NS_HELP_TALK        => 'Conversa_axuda',
+	NS_CATEGORY         => 'Categoría',
+	NS_CATEGORY_TALK    => 'Conversa_categoría',
+);
+
+$namespaceAliases = array(
+	'Conversa_Usuario' => NS_USER_TALK,
+	'Imaxe' => NS_FILE,
+	'Conversa_Imaxe' => NS_FILE_TALK,
+	'Conversa_Modelo' => NS_TEMPLATE_TALK,
+	'Conversa_Axuda' => NS_HELP_TALK,
+	'Conversa_Categoría' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Redireccións dobres' ),
+	'BrokenRedirects'           => array( 'Redireccións rotas' ),
+	'Disambiguations'           => array( 'Homónimos' ),
+	'Userlogin'                 => array( 'Rexistro' ),
+	'Userlogout'                => array( 'Saír ao anonimato' ),
+	'CreateAccount'             => array( 'Crear unha conta' ),
+	'Preferences'               => array( 'Preferencias' ),
+	'Watchlist'                 => array( 'Listaxe de vixilancia' ),
+	'Recentchanges'             => array( 'Cambios recentes' ),
+	'Upload'                    => array( 'Cargar' ),
+	'Listfiles'                 => array( 'Listaxe de imaxes' ),
+	'Newimages'                 => array( 'Imaxes novas' ),
+	'Listusers'                 => array( 'Listaxe de usuarios' ),
+	'Listgrouprights'           => array( 'Listaxe de dereitos segundo o grupo' ),
+	'Statistics'                => array( 'Estatísticas' ),
+	'Randompage'                => array( 'Ao chou', 'Páxina aleatoria' ),
+	'Lonelypages'               => array( 'Páxinas orfas' ),
+	'Uncategorizedpages'        => array( 'Páxinas sen categoría' ),
+	'Uncategorizedcategories'   => array( 'Categorías sen categoría' ),
+	'Uncategorizedimages'       => array( 'Imaxes sen categoría' ),
+	'Uncategorizedtemplates'    => array( 'Modelos sen categoría' ),
+	'Unusedcategories'          => array( 'Categorías sen uso' ),
+	'Unusedimages'              => array( 'Imaxes sen uso' ),
+	'Wantedpages'               => array( 'Páxinas máis buscadas', 'Ligazóns rotas' ),
+	'Wantedcategories'          => array( 'Categorías máis usadas' ),
+	'Mostlinked'                => array( 'O máis enlazado' ),
+	'Mostlinkedcategories'      => array( 'Categorías máis enlazadas' ),
+	'Mostlinkedtemplates'       => array( 'Modelos máis enlazados' ),
+	'Mostcategories'            => array( 'Máis categorías' ),
+	'Mostimages'                => array( 'Máis imaxes' ),
+	'Mostrevisions'             => array( 'Máis revisións' ),
+	'Fewestrevisions'           => array( 'Menos revisións' ),
+	'Shortpages'                => array( 'Páxinas curtas' ),
+	'Longpages'                 => array( 'Páxinas longas' ),
+	'Newpages'                  => array( 'Páxinas novas' ),
+	'Ancientpages'              => array( 'Páxinas máis antigas' ),
+	'Deadendpages'              => array( 'Páxinas mortas' ),
+	'Protectedpages'            => array( 'Páxinas protexidas' ),
+	'Protectedtitles'           => array( 'Títulos protexidos' ),
+	'Allpages'                  => array( 'Todas as páxinas' ),
+	'Prefixindex'               => array( '�ndice de prefixos' ),
+	'Ipblocklist'               => array( 'Listaxe dos bloqueos a enderezos IP' ),
+	'Specialpages'              => array( 'Páxinas especiais' ),
+	'Contributions'             => array( 'Contribucións' ),
+	'Emailuser'                 => array( 'Correo electrónico de usuario' ),
+	'Confirmemail'              => array( 'Confirmar correo electrónico' ),
+	'Whatlinkshere'             => array( 'Páxinas que ligan con esta' ),
+	'Recentchangeslinked'       => array( 'Cambios relacionados' ),
+	'Movepage'                  => array( 'Mover páxina' ),
+	'Blockme'                   => array( 'Bloquearme' ),
+	'Booksources'               => array( 'Fontes bibliográficas' ),
+	'Categories'                => array( 'Categorías' ),
+	'Export'                    => array( 'Exportar' ),
+	'Version'                   => array( 'Versión' ),
+	'Allmessages'               => array( 'Todas as mensaxes' ),
+	'Log'                       => array( 'Rexistro (logs)' ),
+	'Blockip'                   => array( 'Bloquear enderezo IP' ),
+	'Undelete'                  => array( 'Restaurar' ),
+	'Import'                    => array( 'Importar' ),
+	'Lockdb'                    => array( 'Fechar a base de datos' ),
+	'Unlockdb'                  => array( 'Abrir a base de datos' ),
+	'Userrights'                => array( 'Dereitos de usuario' ),
+	'MIMEsearch'                => array( 'Procura MIME' ),
+	'FileDuplicateSearch'       => array( 'Procura de ficheiros duplicados' ),
+	'Unwatchedpages'            => array( 'Páxinas sen vixiar' ),
+	'Listredirects'             => array( 'Listaxe de redireccións' ),
+	'Revisiondelete'            => array( 'Revisións borradas' ),
+	'Unusedtemplates'           => array( 'Modelos non usados' ),
+	'Randomredirect'            => array( 'Redirección aleatoria' ),
+	'Mypage'                    => array( 'A miña páxina de usuario' ),
+	'Mytalk'                    => array( 'A miña conversa' ),
+	'Mycontributions'           => array( 'As miñas contribucións' ),
+	'Listadmins'                => array( 'Listaxe de administradores' ),
+	'Listbots'                  => array( 'Listaxe de bots' ),
+	'Popularpages'              => array( 'Páxinas populares' ),
+	'Search'                    => array( 'Procurar' ),
+	'Resetpass'                 => array( 'Cambiar contrasinal' ),
+	'Withoutinterwiki'          => array( 'Sen interwiki' ),
+	'MergeHistory'              => array( 'Fusionar Historiais' ),
+	'Filepath'                  => array( 'Enderezo de ficheiro' ),
+	'Invalidateemail'           => array( 'Invalidar o enderezo de correo electrónico' ),
+	'Blankpage'                 => array( 'Baleirar a páxina' ),
+	'DeletedContributions'      => array( 'Contribucións borradas' ),
 );
 
 $messages = array(
 # User preference toggles
-'tog-underline'               => 'Subliñar ligazóns:',
+'tog-underline'               => 'Subliñar as ligazóns:',
 'tog-highlightbroken'         => 'Darlles formato ás ligazóns crebadas <a href="" class="new">deste xeito</a> (alternativa: así<a href="" class="internal">?</a>).',
-'tog-justify'                 => 'Xustificar parágrafos',
+'tog-justify'                 => 'Xustificar os parágrafos',
 'tog-hideminor'               => 'Agochar as edicións pequenas na páxina de cambios recentes',
-'tog-extendwatchlist'         => 'Listaxe de vixilancia estendida',
+'tog-extendwatchlist'         => 'Lista de vixilancia estendida',
 'tog-usenewrc'                => 'Cambios recentes avanzados (JavaScript)',
 'tog-numberheadings'          => 'Numerar automaticamente as cabeceiras',
 'tog-showtoolbar'             => 'Mostrar a caixa de ferramentas de edición (JavaScript)',
@@ -49,15 +142,15 @@ $messages = array(
 'tog-showtoc'                 => 'Mostrar o índice (para páxinas con máis de tres cabeceiras)',
 'tog-rememberpassword'        => 'Lembrar o meu contrasinal neste ordenador',
 'tog-editwidth'               => 'A caixa de edición ten largo total',
-'tog-watchcreations'          => 'Engadir as páxinas creadas por min á miña listaxe de artigos vixiados',
-'tog-watchdefault'            => 'Engadir as páxinas que edite á miña listaxe de vixilancia',
-'tog-watchmoves'              => 'Engadir as páxinas que mova á miña listaxe de vixilancia',
-'tog-watchdeletion'           => 'Engadir as páxinas que borre á miña listaxe de vixilancia',
+'tog-watchcreations'          => 'Engadir as páxinas creadas por min á miña lista de artigos vixiados',
+'tog-watchdefault'            => 'Engadir as páxinas que edite á miña lista de vixilancia',
+'tog-watchmoves'              => 'Engadir as páxinas que mova á miña lista de vixilancia',
+'tog-watchdeletion'           => 'Engadir as páxinas que borre á miña lista de vixilancia',
 'tog-minordefault'            => 'Marcar por omisión todas as edicións como pequenas',
 'tog-previewontop'            => 'Mostrar o botón de vista previa antes da caixa de edición e non despois dela',
 'tog-previewonfirst'          => 'Mostrar a vista previa na primeira edición',
 'tog-nocache'                 => 'Deshabilitar a memoria caché das páxinas',
-'tog-enotifwatchlistpages'    => 'Envíenme unha mensaxe de correo electrónico cando unha páxina da miña listaxe de vixilancia cambie',
+'tog-enotifwatchlistpages'    => 'Envíenme unha mensaxe de correo electrónico cando unha páxina da miña lista de vixilancia cambie',
 'tog-enotifusertalkpages'     => 'Envíenme unha mensaxe de correo electrónico cando a miña páxina de conversa cambie',
 'tog-enotifminoredits'        => 'Envíenme tamén unha mensaxe de correo electrónico cando se produzan pequenos cambios nas páxinas',
 'tog-enotifrevealaddr'        => 'Revelar o meu enderezo de correo electrónico nos correos de notificación',
@@ -68,20 +161,21 @@ $messages = array(
 'tog-showjumplinks'           => 'Permitir as ligazóns de accesibilidade "ir a"',
 'tog-uselivepreview'          => 'Usar <i>live preview</i> (JavaScript) (Experimental)',
 'tog-forceeditsummary'        => 'Avisarme cando o campo resumo estea baleiro',
-'tog-watchlisthideown'        => 'Agochar as edicións propias na listaxe de vixilancia',
-'tog-watchlisthidebots'       => 'Agochar as edicións dos bots na listaxe de vixilancia',
-'tog-watchlisthideminor'      => 'Agochar as edicións pequenas na listaxe de vixilancia',
+'tog-watchlisthideown'        => 'Agochar as edicións propias na lista de vixilancia',
+'tog-watchlisthidebots'       => 'Agochar as edicións dos bots na lista de vixilancia',
+'tog-watchlisthideminor'      => 'Agochar as edicións pequenas na lista de vixilancia',
+'tog-watchlisthideliu'        => 'Agochar as edicións dos usuarios rexistrados na lista de vixilancia',
+'tog-watchlisthideanons'      => 'Agochar as edicións dos usuarios anónimos na lista de vixilancia',
 'tog-nolangconversion'        => 'Desactivar a conversión de variantes',
 'tog-ccmeonemails'            => 'Enviar ao meu enderezo copia das mensaxes que envíe a outros usuarios',
 'tog-diffonly'                => 'Non mostrar o contido da páxina debaixo das diferenzas entre edicións (dif)',
 'tog-showhiddencats'          => 'Mostrar as categorías ocultas',
+'tog-norollbackdiff'          => 'Omitir as diferenzas despois de levar a cabo unha reversión de edicións',
 
 'underline-always'  => 'Sempre',
 'underline-never'   => 'Nunca',
 'underline-default' => 'Opción do propio navegador',
 
-'skinpreview' => '(Probar)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Luns',
@@ -154,9 +248,9 @@ $messages = array(
 'mainpagedocfooter' => 'Consulte a [http://meta.wikimedia.org/wiki/Help:Contents Guía do usuario] para máis información sobre como usar o software wiki.
 
 == Comezando ==
-* [http://www.mediawiki.org/wiki/Manual:Configuration_settings Listaxe de opcións de configuración]
+* [http://www.mediawiki.org/wiki/Manual:Configuration_settings Lista de opcións de configuración]
 * [http://www.mediawiki.org/wiki/Manual:FAQ Preguntas frecuentes sobre MediaWiki]
-* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Listaxe de correo das edicións de MediaWiki]',
+* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista de correo das edicións de MediaWiki]',
 
 'about'          => 'Acerca de',
 'article'        => 'Artigo',
@@ -174,7 +268,7 @@ $messages = array(
 'mytalk'         => 'A miña conversa',
 'anontalk'       => 'Conversa con este enderezo IP',
 'navigation'     => 'Navegación',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatos:',
@@ -211,18 +305,18 @@ $messages = array(
 'talkpagelinktext'  => 'Conversa',
 'specialpage'       => 'Páxina especial',
 'personaltools'     => 'Ferramentas persoais',
-'postcomment'       => 'Engadir un comentario',
+'postcomment'       => 'Nova sección',
 'articlepage'       => 'Ver artigo',
 'talk'              => 'Conversa',
 'views'             => 'Vistas',
 'toolbox'           => 'Caixa de ferramentas',
-'userpage'          => 'Ver páxina de usuario',
-'projectpage'       => 'Ver páxina do proxecto',
-'imagepage'         => 'Ver a páxina de multimedia',
+'userpage'          => 'Ver a páxina de usuario',
+'projectpage'       => 'Ver a páxina do proxecto',
+'imagepage'         => 'Ver a páxina do ficheiro',
 'mediawikipage'     => 'Ver a páxina da mensaxe',
 'templatepage'      => 'Ver a páxina do modelo',
 'viewhelppage'      => 'Ver a páxina de axuda',
-'categorypage'      => 'Ver páxina de categoría',
+'categorypage'      => 'Ver a páxina da categoría',
 'viewtalkpage'      => 'Ver a conversa',
 'otherlanguages'    => 'Outras linguas',
 'redirectedfrom'    => '(Redirixido desde "$1")',
@@ -237,8 +331,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Acerca de {{SITENAME}}',
 'aboutpage'            => 'Project:Acerca de',
-'bugreports'           => 'Informes de erro',
-'bugreportspage'       => 'Project:Informe de erros',
 'copyright'            => 'Todo o texto está dispoñíbel baixo $1.',
 'copyrightpagename'    => 'Dereitos de autor (copyright) de {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}: Dereitos de autor (Copyrights)',
@@ -260,10 +352,8 @@ $messages = array(
 'privacypage'          => 'Project:Política de privacidade',
 
 'badaccess'        => 'Erro de permisos',
-'badaccess-group0' => 'Non ten autorización para executar a acción que solicitou.',
-'badaccess-group1' => 'A acción solicitada está limitada aos usuarios do grupo $1.',
-'badaccess-group2' => 'A acción solicitada está limitada aos usuarios nalgún dos grupos $1.',
-'badaccess-groups' => 'A acción solicitada está limitada aos usuarios nalgún dos grupos $1.',
+'badaccess-group0' => 'Non ten os permisos necesarios para executar a acción que solicitou.',
+'badaccess-groups' => 'A acción que solicitou está limitada aos usuarios que están {{PLURAL:$2|neste grupo|nalgún destes grupos}}: $1.',
 
 'versionrequired'     => 'Necesítase a versión $1 de MediaWiki',
 'versionrequiredtext' => 'Necesítase a versión $1 de MediaWiki para utilizar esta páxina. Vexa [[Special:Version|a páxina da versión]].',
@@ -276,13 +366,15 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Ten mensaxes novas en $1',
 'editsection'             => 'editar',
 'editold'                 => 'editar',
-'viewsourceold'           => 'ver código fonte',
+'viewsourceold'           => 'ver o código fonte',
+'editlink'                => 'editar',
+'viewsourcelink'          => 'ver o código fonte',
 'editsectionhint'         => 'Editar a sección: "$1"',
 'toc'                     => '�ndice',
 'showtoc'                 => 'amosar',
 'hidetoc'                 => 'agochar',
-'thisisdeleted'           => 'Ver ou restaurar $1?',
-'viewdeleted'             => 'Ver $1?',
+'thisisdeleted'           => 'Quere ver ou restaurar $1?',
+'viewdeleted'             => 'Quere ver $1?',
 'restorelink'             => '{{PLURAL:$1|unha edición borrada|$1 edicións borradas}}',
 'feedlinks'               => 'Sindicalización:',
 'feed-invalid'            => 'Tipo de fonte de noticias non válido.',
@@ -291,7 +383,7 @@ $messages = array(
 'site-atom-feed'          => 'Fonte de noticias Atom de $1',
 'page-rss-feed'           => 'Fonte de noticias RSS para "$1"',
 'page-atom-feed'          => 'Fonte de noticias Atom para "$1"',
-'red-link-title'          => '$1 (aínda non escrito)',
+'red-link-title'          => '$1 (a páxina aínda non existe)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artigo',
@@ -307,7 +399,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Non existe esa acción',
-'nosuchactiontext'  => 'A acción especificada polo URL non é recoñecida polo wiki',
+'nosuchactiontext'  => 'A acción especificada polo enderezo URL é inválida.
+Pode que non o escribise ben ou que seguise unha ligazón incorrecta.
+Isto tamén podería indicar un erro en {{SITENAME}}.',
 'nosuchspecialpage' => 'Non existe esa páxina especial',
 'nospecialpagetext' => "<big>'''Solicitou unha páxina especial que non está recoñecida polo wiki.'''</big>
 
@@ -316,16 +410,17 @@ Pode atopar unha lista coas páxinas especiais válidas en [[Special:SpecialPage
 # General errors
 'error'                => 'Erro',
 'databaseerror'        => 'Erro na base de datos',
-'dberrortext'          => 'Ocorreu un erro de sintaxe na consulta á base de datos. Isto pódese deber a un erro no programa.
+'dberrortext'          => 'Ocorreu un erro de sintaxe na consulta á base de datos.
+Isto pódese deber a un erro no programa.
 A última consulta á base de datos foi:
 <blockquote><tt>$1</tt></blockquote>
 desde a función "<tt>$2</tt>".
-MySQL retornou o erro "<tt>$3: $4</tt>".',
+MySQL devolveu o erro "<tt>$3: $4</tt>".',
 'dberrortextcl'        => 'Ocorreu un erro de sintaxe na consulta.
 A última consulta á base de datos foi:
 "$1"
 desde a función "$2".
-MySQL retornou o erro "$3: $4".',
+MySQL devolveu o erro "$3: $4"',
 'noconnect'            => 'O wiki está experimentando algunhas dificultades técnicas e non se pode contactar co servidor da base de datos.<br />
 $1',
 'nodb'                 => 'Non se pode seleccionar a base de datos $1',
@@ -333,7 +428,7 @@ $1',
 'laggedslavemode'      => 'Aviso: a páxina pode non conter actualizacións recentes.',
 'readonly'             => 'Base de datos fechada',
 'enterlockreason'      => 'Dea unha razón para o fechamento, incluíndo unha estimación de até cando se manterá.',
-'readonlytext'         => 'Nestes momentos a base de datos está pechada a novas entradas e outras modificacións, probabelmente debido a rutinas de mantemento da base de datos, tras as que voltará á normalidade.
+'readonlytext'         => 'Nestes intres a base de datos está pechada a novas entradas e outras modificacións, probabelmente debido a rutinas de mantemento, tras as que voltará á normalidade.
 
 O administrador que a pechou deu esta explicación: $1',
 'missing-article'      => 'A base de datos non atopa o texto da páxina chamada "$1" $2, que debera ter atopado.
@@ -360,7 +455,6 @@ Por favor, comuníquello a un [[Special:ListUsers/sysop|administrador]] tomando
 Se cadra, xa foi borrada por alguén.',
 'badtitle'             => 'Título incorrecto',
 'badtitletext'         => 'O título da páxina pedida non era válido, estaba baleiro ou proviña dunha ligazón interlingua ou interwiki incorrecta. Pode conter un ou máis caracteres dos que non se poden empregar nos títulos.',
-'perfdisabled'         => 'Sentímolo! Esta funcionalidade foi deshabilitada temporalmente porque fai moi lenta a base de datos até o punto no que non se pode usar o wiki.',
 'perfcached'           => 'A información seguinte é da memoria caché e pode ser que non estea completamente actualizada.',
 'perfcachedts'         => 'Esta información é da memoria caché. Última actualización: $1.',
 'querypage-no-updates' => 'Neste momento están desactivadas as actualizacións nesta páxina. O seu contido non se modificará.',
@@ -376,7 +470,7 @@ Dúbida: $2',
 'protectedinterface'   => 'Esta páxina fornece o texto da interface do software e está protexida para evitar o seu abuso.',
 'editinginterface'     => "'''Aviso:''' está editando unha páxina usada para fornecer o texto da interface do software.
 Os cambios nesta páxina afectarán á aparencia da interface para os outros usuarios.
-Para traducións, considere usar [http://translatewiki.net/wiki/Main_Page?setlang=gl Betawiki], o proxecto de localización de MediaWiki.",
+Para traducións, considere usar [http://translatewiki.net/wiki/Main_Page?setlang=gl translatewiki.net], o proxecto de localización de MediaWiki.",
 'sqlhidden'            => '(Procura SQL agochada)',
 'cascadeprotected'     => 'Esta páxina foi protexida fronte á edición debido a que está incluída {{PLURAL:$1|na seguinte páxina protexida, que ten|nas seguintes páxinas protexidas, que teñen}} a "protección en serie" activada:
 $2',
@@ -387,16 +481,16 @@ $2',
 A razón dada foi ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Configuración errónea: escáner de virus descoñecido: <i>$1</i>',
+'virus-badscanner'     => "Configuración errónea: escáner de virus descoñecido: ''$1''",
 'virus-scanfailed'     => 'fallou o escaneado (código $1)',
 'virus-unknownscanner' => 'antivirus descoñecido:',
 
 # Login and logout pages
 'logouttitle'                => 'Saída de usuario ao anonimato',
-'logouttext'                 => '<strong>Agora está fóra do sistema.</strong>
+'logouttext'                 => "'''Agora está fóra do sistema.'''
 
 Pode continuar usando {{SITENAME}} de xeito anónimo, ou pode [[Special:UserLogin|acceder de novo]] co mesmo nome de usuario ou con outro.
-Teña en conta que mentres non se limpa a memoria caché do seu navegador algunhas páxinas poden continuar a ser amosadas como se aínda estivesen dentro do sistema.',
+Teña en conta que mentres non se limpa a memoria caché do seu navegador algunhas páxinas poden continuar a ser amosadas como se aínda estivesen dentro do sistema.",
 'welcomecreation'            => '== Reciba a nosa benvida, $1! ==
 A súa conta foi creada correctamente.
 Non esqueza personalizar as súas [[Special:Preferences|preferencias de {{SITENAME}}]].',
@@ -407,7 +501,6 @@ Non esqueza personalizar as súas [[Special:Preferences|preferencias de {{SITENA
 'remembermypassword'         => 'Lembrar o meu contrasinal neste ordenador',
 'yourdomainname'             => 'O seu dominio',
 'externaldberror'            => 'Ou ben se produciu un erro da base de datos na autenticación externa ou ben non se lle permite actualizar a súa conta externa.',
-'loginproblem'               => '<b>Houbo algún problema co seu acceso.</b><br />Ténteo de novo!',
 'login'                      => 'Acceder ao sistema',
 'nav-login-createaccount'    => 'Rexistro',
 'loginprompt'                => "Debe habilitar as ''cookies'' para acceder a {{SITENAME}}.",
@@ -440,29 +533,30 @@ Ha de ter menos {{PLURAL:$1|dun carácter|de $1 caracteres}}.',
 'loginerror'                 => 'Erro ao acceder ao sistema',
 'prefs-help-email'           => 'O enderezo de correo electrónico é opcional, pero permite que se lle envíe un contrasinal novo se se esquece del.
 Tamén pode deixar que outras persoas se poñan en contacto con vostede desde a súa páxina de usuario ou de conversa sen necesidade de revelar a súa identidade.',
-'prefs-help-email-required'  => 'O enderezo de correo electrónico é requirido.',
+'prefs-help-email-required'  => 'Requírese o enderezo de correo electrónico.',
 'nocookiesnew'               => "A conta de usuario foi creada, pero non está rexistrado. {{SITENAME}} usa ''cookies'' para o rexistro. Vostede ten deshabilitadas as ''cookies''. Por favor, habilíteas, e logo rexístrese co seu novo nome de usuario e contrasinal.",
 'nocookieslogin'             => '{{SITENAME}} usa cookies para rexistrar os usuarios. Vostede ten as cookies deshabilitadas. Por favor, habilíteas e ténteo de novo.',
 'noname'                     => 'Non especificou un nome de usuario válido.',
 'loginsuccesstitle'          => 'Acceso exitoso',
 'loginsuccess'               => "'''Accedeu ao sistema {{SITENAME}} como \"\$1\".'''",
-'nosuchuser'                 => 'non hai ningún usuario chamado "$1".
+'nosuchuser'                 => 'Non hai ningún usuario chamado "$1".
+Os nomes de usuario diferencian entre maiúsculas e minúsculas.
 Verifique o nome que inseriu ou [[Special:UserLogin/signup|cree unha nova conta]].',
-'nosuchusershort'            => 'non hai ningún usuario chamado "<nowiki>$1</nowiki>".
+'nosuchusershort'            => 'Non hai ningún usuario chamado "<nowiki>$1</nowiki>".
 Verifique o nome que inseriu.',
 'nouserspecified'            => 'Debe especificar un nome de usuario.',
-'wrongpassword'              => 'o contrasinal escrito é incorrecto.
+'wrongpassword'              => 'O contrasinal escrito é incorrecto.
 Por favor, insira outro.',
-'wrongpasswordempty'         => 'o campo do contrasinal estaba en branco.
-Por favor, ténteo de novo.',
+'wrongpasswordempty'         => 'O campo do contrasinal estaba en branco.
+Por favor, inténteo de novo.',
 'passwordtooshort'           => 'O seu contrasinal é inválido ou demasiado curto.
 Debe conter como mínimo {{PLURAL:$1|1 carácter|$1 caracteres}} e ten que ser diferente do seu nome de usuario.',
 'mailmypassword'             => 'Enviádeme un contrasinal novo por correo',
 'passwordremindertitle'      => 'Novo contrasinal temporal para {{SITENAME}}',
-'passwordremindertext'       => 'Alguén (probablemente vostede, desde o enderezo IP $1) pediu un novo
-contrasinal para entrar en {{SITENAME}} ($4). Un contrasinal temporal do usuario
+'passwordremindertext'       => 'Alguén (probablemente vostede, desde o enderezo IP $1) solicitou un novo
+contrasinal para acceder a {{SITENAME}} ($4). Un contrasinal temporal para o usuario
 "$2" foi creado e fixado como "$3". Se esa foi a súa
-intención, necesitará entrar no sistema e escoller un novo contrasinal agora.
+intención, necesitará acceder ao sistema e escoller un novo contrasinal agora.
 
 Se foi alguén diferente o que fixo esta solicitude ou se xa se lembra do seu contrasinal
 e non o quere modificar, pode ignorar esta mensaxe e
@@ -476,8 +570,9 @@ Antes de enviar outro a esta conta terá que seguir as instrucións que aparecen
 'throttled-mailpassword'     => 'Enviouse un aviso co contrasinal {{PLURAL:$1|na última hora|nas últimas $1 horas}}.
 Para evitar o abuso do sistema só se envía unha mensaxe cada {{PLURAL:$1|hora|$1 horas}}.',
 'mailerror'                  => 'Produciuse un erro ao enviar o correo electrónico: $1',
-'acct_creation_throttle_hit' => 'Sentímolo, pero xa ten creadas $1 contas. Non pode crear máis.',
-'emailauthenticated'         => 'O seu enderezo de correo electrónico foi autenticado ($1).',
+'acct_creation_throttle_hit' => 'Alguén que visitou este wiki co seu enderezo IP creou, no último día, {{PLURAL:$1|unha conta|$1 contas}}, que é o máximo permitido neste período de tempo.
+Como resultado, os visitantes que usen este enderezo IP non poden crear máis contas nestes intres.',
+'emailauthenticated'         => 'O seu enderezo de correo electrónico foi autenticado o $2 ás $3.',
 'emailnotauthenticated'      => 'O seu enderezo de correo electrónico aínda <strong>non foi autenticado</strong>. Non se enviou ningunha mensaxe por algunha das seguintes razóns.',
 'noemailprefs'               => 'Especifique un enderezo de correo electrónico se quere que funcione esta opción.',
 'emailconfirmlink'           => 'Confirmar o enderezo de correo electrónico',
@@ -490,18 +585,26 @@ Introduza un enderezo cun formato válido ou limpe ese campo.',
 Debe acceder ao sistema e mudar o contrasinal agora.
 
 Pode facer caso omiso desta mensaxe se se creou esta conta por erro.',
+'login-throttled'            => 'Recentemente fixo demasiados intentos de inserir o contrasinal correspondente a esta conta. Por favor, agarde antes de probar outra vez.',
 'loginlanguagelabel'         => 'Linguas: $1',
 
 # Password reset dialog
-'resetpass'               => 'Borrar o contrasinal da conta',
-'resetpass_announce'      => 'Debe rexistrarse co código temporal que recibiu por correo electrónico. Para finalizar o rexistro debe indicar un novo contrasinal aquí:',
-'resetpass_text'          => '<!-- Engadir texto aquí -->',
-'resetpass_header'        => 'Cambiar o contrasinal da conta',
-'resetpass_submit'        => 'Poñer o contrasinal e entrar',
-'resetpass_success'       => 'O cambio do contrasinal realizouse con éxito! Agora pode entrar...',
-'resetpass_bad_temporary' => 'O contrasinal provisorio non é válido. Isto pode deberse a que xa mudou o contrasinal con éxito ou a que solicitou un novo contrasinal provisorio.',
-'resetpass_forbidden'     => 'Os contrasinais non poden ser mudados',
-'resetpass_missing'       => 'O formulario está baleiro.',
+'resetpass'                 => 'Cambiar o contrasinal',
+'resetpass_announce'        => 'Debe rexistrarse co código temporal que recibiu por correo electrónico. Para finalizar o rexistro debe indicar un novo contrasinal aquí:',
+'resetpass_text'            => '<!-- Engadir texto aquí -->',
+'resetpass_header'          => 'Cambiar o contrasinal da conta',
+'oldpassword'               => 'Contrasinal antigo:',
+'newpassword'               => 'Contrasinal novo:',
+'retypenew'                 => 'Insira outra vez o novo contrasinal:',
+'resetpass_submit'          => 'Poñer o contrasinal e entrar',
+'resetpass_success'         => 'O cambio do contrasinal realizouse con éxito! Agora pode entrar...',
+'resetpass_bad_temporary'   => 'O contrasinal provisorio non é válido. Isto pode deberse a que xa mudou o contrasinal con éxito ou a que solicitou un novo contrasinal provisorio.',
+'resetpass_forbidden'       => 'Os contrasinais non poden ser mudados',
+'resetpass-no-info'         => 'Debe acceder ao sistema para acceder directamente a esta páxina.',
+'resetpass-submit-loggedin' => 'Cambiar o contrasinal',
+'resetpass-wrong-oldpass'   => 'Contrasinal temporal ou actual inválido. 
+Pode ser que xa cambiase o seu contrasinal ou que solicitase un novo contrasinal temporal.',
+'resetpass-temp-password'   => 'Contrasinal temporal:',
 
 # Edit page toolbar
 'bold_sample'     => 'Texto en negra',
@@ -520,14 +623,14 @@ Pode facer caso omiso desta mensaxe se se creou esta conta por erro.',
 'nowiki_tip'      => 'Ignorar o formato wiki',
 'image_sample'    => 'Exemplo.jpg',
 'image_tip'       => 'Ficheiro embebido',
-'media_sample'    => 'Exemplo.mp3',
+'media_sample'    => 'Exemplo.ogg',
 'media_tip'       => 'Ligazón a un ficheiro',
 'sig_tip'         => 'A súa sinatura con selo temporal',
 'hr_tip'          => 'Liña horizontal (úsea con moderación)',
 
 # Edit pages
-'summary'                          => 'Resumo',
-'subject'                          => 'Asunto/cabeceira',
+'summary'                          => 'Resumo:',
+'subject'                          => 'Asunto/cabeceira:',
 'minoredit'                        => 'Esta é unha edición pequena',
 'watchthis'                        => 'Vixiar esta páxina',
 'savearticle'                      => 'Gardar a páxina',
@@ -542,8 +645,8 @@ Se preme en \"Gardar a páxina\" a súa edición gardarase sen ningunha descrici
 'missingcommenttext'               => 'Por favor escriba un comentario a continuación.',
 'missingcommentheader'             => "'''Aviso:''' non escribiu ningún texto no asunto/cabeceira deste comentario.
 Se preme en \"Gardar a páxina\", a súa edición gardarase sen el.",
-'summary-preview'                  => 'Vista previa do resumo',
-'subject-preview'                  => 'Vista previa do asunto/cabeceira',
+'summary-preview'                  => 'Vista previa do resumo:',
+'subject-preview'                  => 'Vista previa do asunto/cabeceira:',
 'blockedtitle'                     => 'O usuario está bloqueado',
 'blockedtext'                      => '<big>\'\'\'O seu nome de usuario ou enderezo IP foi bloqueado.\'\'\'</big>
 
@@ -592,34 +695,38 @@ Por favor, inclúa eses datos nas consultas que faga.',
 Para crear a páxina, comece a escribir na caixa de embaixo (vexa a [[{{MediaWiki:Helppage}}|páxina de axuda]] para máis información).
 Se chegou aquí por erro, simplemente prema no botón '''atrás''' do seu navegador.",
 'anontalkpagetext'                 => "----''Esta é a páxina de conversa dun usuario anónimo que aínda non creou unha conta ou que non a usa. Polo tanto, empregamos o enderezo IP para a súa identificación. Este enderezo IP pódenno compartir varios usuarios distintos. Se pensa que foron dirixidos contra a súa persoa comentarios inadecuados, por favor, [[Special:UserLogin/signup|cree unha conta]] ou [[Special:UserLogin|acceda ao sistema]] para evitar futuras confusións con outros usuarios anónimos.''",
-'noarticletext'                    => 'Actualmente non existe texto nesta páxina. Pode [[Special:Search/{{PAGENAME}}|procurar polo título desta páxina]] noutras páxinas ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} editala].',
+'noarticletext'                    => 'Actualmente non hai ningún texto nesta páxina.
+Pode [[Special:Search/{{PAGENAME}}|procurar polo título desta páxina]] noutras páxinas,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ollar os rexistros relacionados]
+ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar a páxina].',
 'userpage-userdoesnotexist'        => 'A conta do usuario "$1" non está rexistrada. Comprobe se desexa crear/editar esta páxina.',
 'clearyourcache'                   => "'''Nota: despois de gravar cómpre limpar a memoria caché do seu navegador para ver os cambios.''' '''Mozilla / Firefox / Safari:''' prema ''Maiúsculas'' á vez que en ''Recargar'', ou prema en ''Ctrl-F5'' ou ''Ctrl-R'' (''Command-R'' nos Macintosh); '''Konqueror:''' faga clic en ''Recargar'' ou prema en ''F5''; '''Opera:''' limpe a súa memoria caché en ''Ferramentas → Preferencias''; '''Internet Explorer:''' prema ''Ctrl'' ao tempo que fai clic en ''Refrescar'', ou prema ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => '<strong>Nota:</strong> use o botón "Mostrar a vista previa" para verificar o novo CSS/JS antes de gardalo.',
+'usercssjsyoucanpreview'           => "'''Nota:''' use o botón \"Mostrar a vista previa\" para verificar o novo CSS/JS antes de gardalo.",
 'usercsspreview'                   => "'''Lembre que só está vendo a vista previa do seu CSS de usuario.'''
 '''Este aínda non foi gardado!'''",
-'userjspreview'                    => "'''Lembre que só está testando/previsualizando o seu JavaScript de usuario.'''
+'userjspreview'                    => "'''Lembre que só está probando/previsualizando o seu JavaScript de usuario.'''
 '''Este aínda non foi gardado!'''",
-'userinvalidcssjstitle'            => "'''Aviso:''' Non hai ningún tema \"\$1\". Lembre que as páxinas .css e .js utilizan un título en minúsculas, como por exemplo {{ns:user}}:Foo/monobook.css no canto de {{ns:user}}:Foo/Monobook.css.",
+'userinvalidcssjstitle'            => "'''Aviso:''' non hai ningún tema chamado \"\$1\".
+Lembre que as páxinas .css e .js personalizadas utilizan un título en minúsculas, como por exemplo {{ns:user}}:Foo/monobook.css no canto de {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Actualizado)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Lembre que esta é só unha vista previa e que os seus cambios aínda non foron gardados!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Lembre que esta é só unha vista previa e que os seus cambios aínda non foron gardados!'''",
 'previewconflict'                  => 'Esta vista previa amosa o texto na área superior tal e como aparecerá se escolle gardar.',
-'session_fail_preview'             => '<strong>O sistema non pode procesar a súa edición porque se perderon os datos de inicio da sesión.
+'session_fail_preview'             => "'''O sistema non pode procesar a súa edición porque se perderon os datos de inicio da sesión.
 Por favor, ténteo de novo.
-Se segue sen funcionar, probe a [[Special:UserLogout|saír do sistema]] e volver entrar.</strong>',
-'session_fail_preview_html'        => "<strong>O sistema non pode procesar a súa edición porque se perderon os datos de inicio da sesión.</strong>
+Se segue sen funcionar, probe a [[Special:UserLogout|saír do sistema]] e volver entrar.'''",
+'session_fail_preview_html'        => "'''O sistema non pode procesar a súa edición porque se perderon os datos de inicio da sesión.'''
 
 ''Dado que {{SITENAME}} ten activado o HTML simple, agóchase a vista previa como precaución contra ataques mediante JavaScript.''
 
-<strong>Se este é un intento de facer unha edición lexítima, por favor, ténteo de novo.
-Se segue sen funcionar, probe a [[Special:UserLogout|saír do sistema]] e volver entrar.</strong>",
-'token_suffix_mismatch'            => "<strong>Rexeitouse a súa edición porque o seu cliente confundiu os signos de puntuación na edición.
+'''Se este é un intento de facer unha edición lexítima, por favor, ténteo de novo.
+Se segue sen funcionar, probe a [[Special:UserLogout|saír do sistema]] e volver entrar.'''",
+'token_suffix_mismatch'            => "'''Rexeitouse a súa edición porque o seu cliente confundiu os signos de puntuación na edición.
 Rexeitouse a edición para evitar que se corrompa o texto do artigo. Isto pode acontecer porque estea a
-empregar un servizo de ''proxy'' anónimo defectuoso baseado na web.</strong>",
+empregar un servizo de ''proxy'' anónimo defectuoso baseado na web.'''",
 'editing'                          => 'Editando "$1"',
 'editingsection'                   => 'Editando unha sección de "$1"',
-'editingcomment'                   => 'Deixando un comentario en "$1"',
+'editingcomment'                   => 'Editando unha nova sección de "$1"',
 'editconflict'                     => 'Conflito de edición: "$1"',
 'explainconflict'                  => "Alguén cambiou esta páxina desde que comezou a editala.
 A área de texto superior contén o texto da páxina tal e como existe na actualidade.
@@ -628,29 +735,31 @@ Pode mesturar os seus cambios co texto existente.
 '''Só''' se gardará o texto na área superior cando prema \"Gardar a páxina\".",
 'yourtext'                         => 'O seu texto',
 'storedversion'                    => 'Versión gardada',
-'nonunicodebrowser'                => '<strong>ATENCIÓN: o seu navegador non soporta Unicode.
-Existe unha solución que lle permite editar páxinas con seguridade: os caracteres non incluídos no ASCII aparecerán na caixa de edición como códigos hexadecimais.</strong>',
-'editingold'                       => '<strong>ATENCIÓN: está editando unha revisión non actualizada desta páxina.
-Se a garda, perderanse os cambios realizados tras esta revisión.</strong>',
+'nonunicodebrowser'                => "'''ATENCIÓN: o seu navegador non soporta Unicode.
+Existe unha solución que lle permite editar páxinas con seguridade: os caracteres non incluídos no ASCII aparecerán na caixa de edición como códigos hexadecimais.'''",
+'editingold'                       => "'''ATENCIÓN: está editando unha revisión non actualizada desta páxina.
+Se a garda, perderanse os cambios realizados tras esta revisión.'''",
 'yourdiff'                         => 'Diferenzas',
-'copyrightwarning'                 => 'Por favor, teña en conta que todas as contribucións a {{SITENAME}} considéranse publicadas baixo a $2 (vexa $1 para máis detalles). Se non quere que o que escriba se edite sen piedade e se redistribúa sen límites, entón non o envíe aquí.<br />
+'copyrightwarning'                 => "Por favor, teña en conta que todas as contribucións a {{SITENAME}} considéranse publicadas baixo a $2 (vexa $1 para máis detalles). Se non quere que o que escriba se edite sen piedade e se redistribúa sen límites, entón non o envíe aquí.<br />
 Ao mesmo tempo, prométanos que o que escribiu é da súa autoría ou que está copiado dun recurso do dominio público ou que permite unha liberdade semellante.
-<strong>NON ENV�E MATERIAL CON DEREITOS DE AUTOR SEN PERMISO!</strong>',
-'copyrightwarning2'                => 'Por favor, decátese de que todas as súas contribucións a {{SITENAME}} poden ser editadas, alteradas ou eliminadas por outras persoas. Se non quere que os seus escritos sexan editados sen piedade, non os publique aquí.<br />
+'''NON ENV�E MATERIAL CON DEREITOS DE AUTOR SEN PERMISO!'''",
+'copyrightwarning2'                => "Por favor, decátese de que todas as súas contribucións a {{SITENAME}} poden ser editadas, alteradas ou eliminadas por outras persoas. Se non quere que os seus escritos sexan editados sen piedade, non os publique aquí.<br />
 Do mesmo xeito, comprométese a que o que vostede escriba sexa da súa autoría ou copiado dunha fonte de dominio público ou recurso público semellante (vexa $1 para detalles).
-<strong>NON ENV�E SEN PERMISO TRABALLOS CON DEREITOS DE COPIA!</strong>',
-'longpagewarning'                  => '<strong>ATENCIÓN: esta páxina ten $1 kilobytes;
+'''NON ENV�E SEN PERMISO TRABALLOS CON DEREITOS DE COPIA!'''",
+'longpagewarning'                  => "'''ATENCIÓN: esta páxina ten $1 kilobytes;
 algúns navegadores poden ter problemas editando páxinas de 32kb ou máis.
-Por favor, considere partir a páxina en seccións máis pequenas.</strong>',
-'longpageerror'                    => '<strong>ERRO: o texto que pretende gardar supera en $1 kilobytes o permitido.
+Por favor, considere partir a páxina en seccións máis pequenas.'''",
+'longpageerror'                    => "'''ERRO: o texto que pretende gardar supera en $1 kilobytes o permitido.
 Hai un límite máximo de $2 kilobytes;
-polo tanto, non se pode gardar.</strong>',
-'readonlywarning'                  => '<strong>ATENCIÓN: a base de datos foi fechada para facer mantemento, polo que non vai poder gardar as súas edicións polo de agora.
-Se cadra, pode cortar e pegar o texto nun ficheiro de texto e gardalo para despois.</strong>',
-'protectedpagewarning'             => '<strong>ATENCIÓN: esta páxina foi fechada de xeito que só os usuarios con privilexios de administrador do sistema poden editala.</strong>',
+polo tanto, non se pode gardar.'''",
+'readonlywarning'                  => "'''ATENCIÓN: a base de datos foi fechada para facer mantemento, polo que non vai poder gardar as súas edicións polo de agora.
+Se cadra, pode cortar e pegar o texto nun ficheiro de texto e gardalo para despois.'''
+
+O administrador que a fechou deu esta explicación: $1",
+'protectedpagewarning'             => "'''ATENCIÓN: esta páxina foi fechada de xeito que só os usuarios con privilexios de administrador do sistema poden editala.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' esta páxina foi bloqueada e só os usuarios rexistrados poden editala.",
 'cascadeprotectedwarning'          => "'''Aviso:''' esta páxina foi protexida de xeito que só a poden editar os usuarios con privilexios de administrador debido a que está incluída {{PLURAL:\$1|na seguinte páxina protexida|nas seguintes páxinas protexidas}} coa opción \"protección en serie\" activada:",
-'titleprotectedwarning'            => '<strong>AVISO: bloqueouse esta páxina para que só algúns usuarios a poidan crear.</strong>',
+'titleprotectedwarning'            => "'''AVISO: bloqueouse esta páxina para que [[Special:ListGroupRights|só algúns usuarios]] a poidan crear.'''",
 'templatesused'                    => 'Modelos usados nesta páxina:',
 'templatesusedpreview'             => 'Modelos usados nesta vista previa:',
 'templatesusedsection'             => 'Modelos usados nesta sección:',
@@ -669,11 +778,21 @@ Pode voltar e editar unha páxina que xa existe ou, se non, [[Special:UserLogin|
 
 Debería considerar se é apropiado continuar a editar esta páxina.
 Velaquí está o rexistro de borrado desta páxina, por se quere consultalo:",
+'deleted-notice'                   => 'Esta páxina foi borrada. Embaixo pódese ver o rexistro de borrados desta páxina, por se o quere consultar.',
+'deletelog-fulllog'                => 'Ver o rexistro completo',
+'edit-hook-aborted'                => "A edición foi abortada polo ''hook''.
+Este non deu ningunha explicación.",
+'edit-gone-missing'                => 'Non se pode actualizar a páxina.
+Semella que foi borrada.',
+'edit-conflict'                    => 'Conflito de edición.',
+'edit-no-change'                   => 'A súa edición foi ignorada dado que non fixo ningún cambio no texto.',
+'edit-already-exists'              => 'Non se pode crear a nova páxina.
+Esta xa existe.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Aviso: esta páxina contén moitos analizadores de funcións de chamadas moi caros.
 
-Debe ter menos de $2, e agora hai $1.',
+Debe ter menos {{PLURAL:$2|dunha chamada|de $2 chamadas}}, e agora hai $1.',
 'expensive-parserfunction-category'       => 'Páxinas con moitos analizadores de funcións de chamadas moi caros',
 'post-expand-template-inclusion-warning'  => 'Aviso: o tamaño do modelo incluído é moi grande.
 Algúns modelos non serán incluídos.',
@@ -681,6 +800,8 @@ Algúns modelos non serán incluídos.',
 'post-expand-template-argument-warning'   => 'Aviso: esta páxina contén, polo menos, un argumento dun modelo que ten un tamaño e expansión moi grande.
 Estes argumentos serán omitidos.',
 'post-expand-template-argument-category'  => 'Páxinas que conteñen argumentos de modelo omitidos',
+'parser-template-loop-warning'            => 'Detectouse un modelo en bucle: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Excedeuse o límite da profundidade do recurso do modelo ($1)',
 
 # "Undo" feature
 'undo-success' => 'A edición pode ser desfeita.
@@ -696,30 +817,29 @@ Por favor, comprobe a comparación que aparece a continuación para confirmar qu
 A razón dada por $3 foi ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Ver os rexistros desta páxina',
-'nohistory'           => 'Esta páxina non posúe ningún historial de edicións.',
-'revnotfound'         => 'A revisión non foi atopada',
-'revnotfoundtext'     => 'A revisión vella que pediu non se deu atopado.
-Por favor verifique o URL que utilizou para acceder a esta páxina.',
-'currentrev'          => 'Revisión actual',
-'revisionasof'        => 'Revisión como estaba ás $1',
-'revision-info'       => 'Revisión feita por $2 ás $1',
-'previousrevision'    => '� Revisión máis antiga',
-'nextrevision'        => 'Revisión máis nova →',
-'currentrevisionlink' => 'Ver revisión actual',
-'cur'                 => 'actual',
-'next'                => 'seguinte',
-'last'                => 'última',
-'page_first'          => 'primeira',
-'page_last'           => 'derradeira',
-'histlegend'          => 'Selección de diferenzas: marque as versións que queira comparar e prema no botón ao final.<br />
+'viewpagelogs'           => 'Ver os rexistros desta páxina',
+'nohistory'              => 'Esta páxina non posúe ningún historial de edicións.',
+'currentrev'             => 'Revisión actual',
+'currentrev-asof'        => 'Revisión actual ás $1',
+'revisionasof'           => 'Revisión como estaba ás $1',
+'revision-info'          => 'Revisión feita por $2 ás $1', # Additionally available: $3: revision id
+'previousrevision'       => '� Revisión máis antiga',
+'nextrevision'           => 'Revisión máis nova →',
+'currentrevisionlink'    => 'Revisión actual',
+'cur'                    => 'actual',
+'next'                   => 'seguinte',
+'last'                   => 'última',
+'page_first'             => 'primeira',
+'page_last'              => 'derradeira',
+'histlegend'             => 'Selección de diferenzas: marque as versións que queira comparar e prema no botón ao final.<br />
 Lenda: (actual) = diferenza coa versión actual,
 (última) = diferenza coa versión precedente, m = edición pequena.',
-'deletedrev'          => '[borrado]',
-'histfirst'           => 'Primeiras',
-'histlast'            => 'Últimas',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(baleiro)',
+'history-fieldset-title' => 'Navegar polo historial',
+'deletedrev'             => '[borrado]',
+'histfirst'              => 'Primeiras',
+'histlast'               => 'Últimas',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(baleiro)',
 
 # Revision feed
 'history-feed-title'          => 'Historial de revisións',
@@ -782,8 +902,8 @@ Outros administradores de {{SITENAME}} poderán acceder ao contido oculto e pode
 
 # Suppression log
 'suppressionlog'     => 'Rexistro de supresión',
-'suppressionlogtext' => 'Embaixo amósase unha listaxe coas eliminacións e cos bloqueos recentes, que inclúen contido oculto dos administradores.
-Vexa a [[Special:IPBlockList|listaxe de enderezos IP bloqueados]] para comprobar as prohibicións e os bloqueos vixentes.',
+'suppressionlogtext' => 'Embaixo amósase unha lista coas eliminacións e cos bloqueos recentes, que inclúen contido oculto dos administradores.
+Vexa a [[Special:IPBlockList|lista de enderezos IP bloqueados]] para comprobar as prohibicións e os bloqueos vixentes.',
 
 # History merging
 'mergehistory'                     => 'Fusionar historiais das páxinas',
@@ -805,6 +925,7 @@ Asegúrese de que esta modificación da páxina mantén a continuidade históric
 'mergehistory-invalid-destination' => 'A páxina de destino ten que ter un título válido.',
 'mergehistory-autocomment'         => '[[:$1]] fusionouse en [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fusionouse en [[:$2]]: $3',
+'mergehistory-same-destination'    => 'A orixe das páxinas e o seu destino non poden ser os mesmos',
 
 # Merge log
 'mergelog'           => 'Rexistro de fusións',
@@ -817,122 +938,204 @@ Asegúrese de que esta modificación da páxina mantén a continuidade históric
 'difference'              => '(Diferenzas entre revisións)',
 'lineno'                  => 'Liña $1:',
 'compareselectedversions' => 'Comparar as versións seleccionadas',
+'visualcomparison'        => 'Comparación visual',
+'wikicodecomparison'      => 'Comparación do texto wiki',
 'editundo'                => 'desfacer',
 'diff-multi'              => '(Non se {{PLURAL:$1|mostra unha revisión|mostran $1 revisións}} do historial.)',
+'diff-movedto'            => 'moveuse a "$1"',
+'diff-styleadded'         => '$1 estilo engadido',
+'diff-added'              => 'engadiu $1',
+'diff-changedto'          => 'cambiou a $1',
+'diff-movedoutof'         => 'retirou "$1"',
+'diff-styleremoved'       => '$1 estilo eliminado',
+'diff-removed'            => 'eliminou $1',
+'diff-changedfrom'        => 'cambiou de $1',
+'diff-src'                => 'orixe',
+'diff-withdestination'    => 'con destino a $1',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'ancho',
+'diff-height'             => 'alto',
+'diff-p'                  => "un '''parágrafo'''",
+'diff-blockquote'         => "unha '''cita'''",
+'diff-h1'                 => "unha '''cabeceira de nivel 1'''",
+'diff-h2'                 => "unha '''cabeceira de nivel 2'''",
+'diff-h3'                 => "unha '''cabeceira de nivel 3'''",
+'diff-h4'                 => "unha '''cabeceira de nivel 4'''",
+'diff-h5'                 => "unha '''cabeceira de nivel 5'''",
+'diff-pre'                => "un '''bloque con formato previo'''",
+'diff-div'                => "unha '''división'''",
+'diff-ul'                 => "unha '''lista sen orde'''",
+'diff-ol'                 => "unha '''lista ordenada'''",
+'diff-li'                 => "unha '''lista de elementos'''",
+'diff-table'              => "unha '''táboa'''",
+'diff-tbody'              => "unha '''táboa de contido'''",
+'diff-tr'                 => "unha '''liña'''",
+'diff-td'                 => "unha '''cela'''",
+'diff-th'                 => "unha '''cabeceira'''",
+'diff-br'                 => "un '''salto de liña'''",
+'diff-hr'                 => "unha '''liña horizontal'''",
+'diff-code'               => "un '''bloque de código de ordenador'''",
+'diff-dl'                 => "unha '''lista de definicións'''",
+'diff-dt'                 => "un '''termo de definición'''",
+'diff-dd'                 => "unha '''definición'''",
+'diff-input'              => "unha '''entrada'''",
+'diff-form'               => "un '''formulario'''",
+'diff-img'                => "unha '''imaxe'''",
+'diff-span'               => "unha '''extensión'''",
+'diff-a'                  => "unha '''ligazón'''",
+'diff-i'                  => "'''cursiva'''",
+'diff-b'                  => "'''negra'''",
+'diff-strong'             => "'''negra'''",
+'diff-em'                 => "'''énfase'''",
+'diff-font'               => "'''fonte'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''eliminou'''",
+'diff-tt'                 => "'''arranxou o ancho'''",
+'diff-sub'                => "'''subíndice'''",
+'diff-sup'                => "'''superíndice'''",
+'diff-strike'             => "'''riscado'''",
 
 # Search results
-'searchresults'             => 'Resultados da procura',
-'searchresulttext'          => 'Para máis información sobre como realizar procuras en {{SITENAME}}, vexa [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'A súa busca de "\'\'\'[[:$1]]\'\'\'" ([[Special:Prefixindex/$1|todas as páxinas que comezan por "$1"]] | [[Special:WhatLinksHere/$1|todas as páxinas que ligan con "$1"]])',
-'searchsubtitleinvalid'     => "A súa busca de \"'''\$1'''\"",
-'noexactmatch'              => "'''Non hai ningunha páxina titulada \"\$1\".'''
+'searchresults'                    => 'Resultados da procura',
+'searchresults-title'              => 'Resultados da procura de "$1"',
+'searchresulttext'                 => 'Para máis información sobre como realizar procuras en {{SITENAME}}, vexa [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'A súa busca de "\'\'\'[[:$1]]\'\'\'" ([[Special:Prefixindex/$1|todas as páxinas que comezan por "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|todas as páxinas que ligan con "$1"]])',
+'searchsubtitleinvalid'            => "A súa busca de \"'''\$1'''\"",
+'noexactmatch'                     => "'''Non hai ningunha páxina titulada \"\$1\".'''
 Se quere, pode [[:\$1|creala]].",
-'noexactmatch-nocreate'     => "'''Non hai ningunha páxina titulada \"\$1\".'''",
-'toomanymatches'            => 'Demasiadas coincidencias foron devoltas, por favor tente unha consulta diferente',
-'titlematches'              => 'O título do artigo coincide',
-'notitlematches'            => 'Non coincide ningún título de páxina',
-'textmatches'               => 'O texto da páxina coincide',
-'notextmatches'             => 'Non se atopou o texto en ningunha páxina',
-'prevn'                     => '$1 anteriores',
-'nextn'                     => '$1 seguintes',
-'viewprevnext'              => 'Ver as ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 palabra|$2 palabras}})',
-'search-result-score'       => 'Relevancia: $1%',
-'search-redirect'           => '(redirixir $1)',
-'search-section'            => '(sección $1)',
-'search-suggest'            => 'Quizais quixo dicir: $1',
-'search-interwiki-caption'  => 'Proxectos irmáns',
-'search-interwiki-default'  => '$1 resultados:',
-'search-interwiki-more'     => '(máis)',
-'search-mwsuggest-enabled'  => 'con suxestións',
-'search-mwsuggest-disabled' => 'sen suxestións',
-'search-relatedarticle'     => 'Relacionado',
-'mwsuggest-disable'         => 'Deshabilitar as suxestións AJAX',
-'searchrelated'             => 'relacionado',
-'searchall'                 => 'todo',
-'showingresults'            => "Amósanse {{PLURAL:$1|'''1''' resultado|'''$1''' resultados}} comezando polo número '''$2'''.",
-'showingresultsnum'         => "Embaixo {{PLURAL:$3|amósase '''1''' resultado|amósanse '''$3''' resultados}}, comezando polo número '''$2'''.",
-'showingresultstotal'       => "Embaixo {{PLURAL:$3|amósase o resultado '''$1''', dun total de '''$3'''|amósanse os resultados do '''$1''' ao '''$2''', dun total de '''$3'''}}",
-'nonefound'                 => "'''Nota:''' só algúns espazos de nomes son procurados por omisión. Probe a fixar a súa petición con ''(Principal)'' para procurar en todo o contido (incluíndo páxinas de conversa, modelos, etc.) ou use como prefixo o espazo de nomes desexado.",
-'powersearch'               => 'Procurar',
-'powersearch-legend'        => 'Busca avanzada',
-'powersearch-ns'            => 'Procurar nos espazos de nomes:',
-'powersearch-redir'         => 'Listar as redireccións',
-'powersearch-field'         => 'Procurar por',
-'search-external'           => 'Procura externa',
-'searchdisabled'            => 'As procuras en {{SITENAME}} están deshabilitadas por cuestións de rendemento.
+'noexactmatch-nocreate'            => "'''Non hai ningunha páxina titulada \"\$1\".'''",
+'toomanymatches'                   => 'Demasiadas coincidencias foron devoltas, por favor tente unha consulta diferente',
+'titlematches'                     => 'O título do artigo coincide',
+'notitlematches'                   => 'Non coincide ningún título de páxina',
+'textmatches'                      => 'O texto da páxina coincide',
+'notextmatches'                    => 'Non se atopou o texto en ningunha páxina',
+'prevn'                            => '$1 anteriores',
+'nextn'                            => '$1 seguintes',
+'viewprevnext'                     => 'Ver as ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Opcións de busca',
+'searchmenu-exists'                => "* Páxina \"'''[[\$1]]'''\"",
+'searchmenu-new'                   => "'''Crear a páxina \"''[[:\$1|\$1]]''\" neste wiki!'''",
+'searchhelp-url'                   => 'Help:Contidos',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Navegue polas páxinas que comezan coas mesmas iniciais]]',
+'searchprofile-articles'           => 'Páxinas de contido',
+'searchprofile-articles-and-proj'  => 'Páxinas de contido e do proxecto',
+'searchprofile-project'            => 'Páxinas do proxecto',
+'searchprofile-images'             => 'Ficheiros',
+'searchprofile-everything'         => 'Todo',
+'searchprofile-advanced'           => 'Avanzado',
+'searchprofile-articles-tooltip'   => 'Procurar en "$1"',
+'searchprofile-project-tooltip'    => 'Procurar en "$1"',
+'searchprofile-images-tooltip'     => 'Procurar ficheiros',
+'searchprofile-everything-tooltip' => 'Procurar en todo o contido (incluíndo páxinas de conversa)',
+'searchprofile-advanced-tooltip'   => 'Procurar nos espazos de nomes elixidos',
+'prefs-search-nsdefault'           => 'Procurar nos espazos de nomes por defecto:',
+'prefs-search-nscustom'            => 'Procurar nos espazos de nomes elixidos:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 palabra|$2 palabras}})',
+'search-result-score'              => 'Relevancia: $1%',
+'search-redirect'                  => '(redirixir $1)',
+'search-section'                   => '(sección $1)',
+'search-suggest'                   => 'Quizais quixo dicir: $1',
+'search-interwiki-caption'         => 'Proxectos irmáns',
+'search-interwiki-default'         => '$1 resultados:',
+'search-interwiki-more'            => '(máis)',
+'search-mwsuggest-enabled'         => 'con suxestións',
+'search-mwsuggest-disabled'        => 'sen suxestións',
+'search-relatedarticle'            => 'Relacionado',
+'mwsuggest-disable'                => 'Deshabilitar as suxestións AJAX',
+'searchrelated'                    => 'relacionado',
+'searchall'                        => 'todo',
+'showingresults'                   => "Amósanse {{PLURAL:$1|'''1''' resultado|'''$1''' resultados}} comezando polo número '''$2'''.",
+'showingresultsnum'                => "Embaixo {{PLURAL:$3|amósase '''1''' resultado|amósanse '''$3''' resultados}}, comezando polo número '''$2'''.",
+'showingresultstotal'              => "Embaixo {{PLURAL:$4|amósase o resultado '''$1''', dun total de '''$3'''|amósanse os resultados do '''$1''' ao '''$2''', dun total de '''$3'''}}",
+'nonefound'                        => "'''Nota:''' só algúns espazos de nomes son procurados por omisión.
+Probe a fixar a súa petición con ''all:'' para procurar en todo o contido (incluíndo páxinas de conversa, modelos, etc.) ou use como prefixo o espazo de nomes desexado.",
+'search-nonefound'                 => 'Non se atopou ningún resultado que coincidise coa procura.',
+'powersearch'                      => 'Procurar',
+'powersearch-legend'               => 'Busca avanzada',
+'powersearch-ns'                   => 'Procurar nos espazos de nomes:',
+'powersearch-redir'                => 'Listar as redireccións',
+'powersearch-field'                => 'Procurar por',
+'search-external'                  => 'Procura externa',
+'searchdisabled'                   => 'As procuras en {{SITENAME}} están deshabilitadas por cuestións de rendemento.
 Mentres tanto pode procurar usando o Google.
 Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados.',
 
 # Preferences page
-'preferences'              => 'Preferencias',
-'mypreferences'            => 'As miñas preferencias',
-'prefs-edits'              => 'Número de edicións:',
-'prefsnologin'             => 'Non está dentro do sistema',
-'prefsnologintext'         => 'Debe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} acceder ao sistema]</span> para modificar as preferencias de usuario.',
-'prefsreset'               => 'As preferencias foron postas cos valores orixinais.',
-'qbsettings'               => 'Opcións da barra rápida',
-'qbsettings-none'          => 'Ningunha',
-'qbsettings-fixedleft'     => 'Fixa á esquerda',
-'qbsettings-fixedright'    => 'Fixa á dereita',
-'qbsettings-floatingleft'  => 'Flotante á esquerda',
-'qbsettings-floatingright' => 'Flotante á dereita',
-'changepassword'           => 'Cambiar o meu contrasinal',
-'skin'                     => 'Aparencia',
-'math'                     => 'Fórmulas matemáticas',
-'dateformat'               => 'Formato da data',
-'datedefault'              => 'Ningunha preferencia',
-'datetime'                 => 'Data e hora',
-'math_failure'             => 'Fallou a conversión do código',
-'math_unknown_error'       => 'erro descoñecido',
-'math_unknown_function'    => 'función descoñecida',
-'math_lexing_error'        => 'erro de léxico',
-'math_syntax_error'        => 'erro de sintaxe',
-'math_image_error'         => 'Fallou a conversión a PNG; comprobe que latex, dvips, gs e convert están ben instalados',
-'math_bad_tmpdir'          => 'Non se puido crear ou escribir no directorio temporal de fórmulas',
-'math_bad_output'          => 'Non se puido crear ou escribir no directorio de saída de fórmulas',
-'math_notexvc'             => 'Falta o executable texvc. Por favor consulte math/README para configurar.',
-'prefs-personal'           => 'Información do usuario',
-'prefs-rc'                 => 'Cambios recentes',
-'prefs-watchlist'          => 'Listaxe de vixilancia',
-'prefs-watchlist-days'     => 'Días para amosar na listaxe de vixilancia:',
-'prefs-watchlist-edits'    => 'Número de edicións para mostrar na listaxe de vixilancia completa:',
-'prefs-misc'               => 'Preferencias varias',
-'saveprefs'                => 'Gardar as preferencias',
-'resetprefs'               => 'Eliminar os cambios non gardados',
-'oldpassword'              => 'Contrasinal antigo:',
-'newpassword'              => 'Contrasinal novo:',
-'retypenew'                => 'Insira outra vez o novo contrasinal:',
-'textboxsize'              => 'Edición',
-'rows'                     => 'Filas:',
-'columns'                  => 'Columnas:',
-'searchresultshead'        => 'Procurar',
-'resultsperpage'           => 'Cantidade de peticións a amosar por páxina:',
-'contextlines'             => 'Cantidade de liñas a amosar por resultado:',
-'contextchars'             => 'Caracteres de contexto por liña:',
-'stub-threshold'           => 'Umbral para o formatado de <a href="#" class="stub">ligazón de bosquexo</a> (bytes):',
-'recentchangesdays'        => 'Número de días para mostrar nos cambios recentes:',
-'recentchangescount'       => 'Número de edicións para mostrar nos cambios recentes, nos historiais e nas páxinas de rexistros:',
-'savedprefs'               => 'As súas preferencias foron gardadas.',
-'timezonelegend'           => 'Zona horaria',
-'timezonetext'             => '¹Insira o número de horas de diferenza entre a súa hora local e a do servidor (UTC).',
-'localtime'                => 'Visualización da hora local',
-'timezoneoffset'           => 'Desprazamento¹',
-'servertime'               => 'A hora do servidor agora é',
-'guesstimezone'            => 'Encher desde o navegador',
-'allowemail'               => 'Admitir mensaxes de correo electrónico doutros usuarios',
-'prefs-searchoptions'      => 'Opcións na procura',
-'prefs-namespaces'         => 'Espazos de nomes',
-'defaultns'                => 'Procurar por omisión nestes espazos de nomes:',
-'default'                  => 'predeterminado',
-'files'                    => 'Ficheiros',
+'preferences'               => 'Preferencias',
+'mypreferences'             => 'As miñas preferencias',
+'prefs-edits'               => 'Número de edicións:',
+'prefsnologin'              => 'Non está dentro do sistema',
+'prefsnologintext'          => 'Debe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} acceder ao sistema]</span> para modificar as preferencias de usuario.',
+'prefsreset'                => 'As preferencias foron postas cos valores orixinais.',
+'qbsettings'                => 'Opcións da barra rápida',
+'qbsettings-none'           => 'Ningunha',
+'qbsettings-fixedleft'      => 'Fixa á esquerda',
+'qbsettings-fixedright'     => 'Fixa á dereita',
+'qbsettings-floatingleft'   => 'Flotante á esquerda',
+'qbsettings-floatingright'  => 'Flotante á dereita',
+'changepassword'            => 'Cambiar o meu contrasinal',
+'skin'                      => 'Aparencia',
+'skin-preview'              => 'Vista previa',
+'math'                      => 'Fórmulas matemáticas',
+'dateformat'                => 'Formato da data',
+'datedefault'               => 'Ningunha preferencia',
+'datetime'                  => 'Data e hora',
+'math_failure'              => 'Fallou a conversión do código',
+'math_unknown_error'        => 'erro descoñecido',
+'math_unknown_function'     => 'función descoñecida',
+'math_lexing_error'         => 'erro de léxico',
+'math_syntax_error'         => 'erro de sintaxe',
+'math_image_error'          => 'Fallou a conversión a PNG; comprobe que latex, dvips, gs e convert están ben instalados',
+'math_bad_tmpdir'           => 'Non se puido crear ou escribir no directorio temporal de fórmulas',
+'math_bad_output'           => 'Non se puido crear ou escribir no directorio de saída de fórmulas',
+'math_notexvc'              => 'Falta o executable texvc. Por favor consulte math/README para configurar.',
+'prefs-personal'            => 'Información do usuario',
+'prefs-rc'                  => 'Cambios recentes',
+'prefs-watchlist'           => 'Lista de vixilancia',
+'prefs-watchlist-days'      => 'Días para amosar na lista de vixilancia:',
+'prefs-watchlist-days-max'  => '(máximo 7 días)',
+'prefs-watchlist-edits'     => 'Número de edicións para mostrar na lista de vixilancia completa:',
+'prefs-watchlist-edits-max' => '(número máximo: 1000)',
+'prefs-misc'                => 'Preferencias varias',
+'prefs-resetpass'           => 'Cambiar o contrasinal',
+'saveprefs'                 => 'Gardar as preferencias',
+'resetprefs'                => 'Eliminar os cambios non gardados',
+'textboxsize'               => 'Edición',
+'prefs-edit-boxsize'        => 'Tamaño da caixa de edición.',
+'rows'                      => 'Filas:',
+'columns'                   => 'Columnas:',
+'searchresultshead'         => 'Procurar',
+'resultsperpage'            => 'Cantidade de peticións a amosar por páxina:',
+'contextlines'              => 'Cantidade de liñas a amosar por resultado:',
+'contextchars'              => 'Caracteres de contexto por liña:',
+'stub-threshold'            => 'Umbral para o formatado de <a href="#" class="stub">ligazón de bosquexo</a> (bytes):',
+'recentchangesdays'         => 'Número de días para mostrar nos cambios recentes:',
+'recentchangesdays-max'     => '(máximo {{PLURAL:$1|un día|$1 días}})',
+'recentchangescount'        => 'Número de edicións a mostrar, por defecto, nas páxinas dos cambios recentes, historiais e rexistros:',
+'savedprefs'                => 'As súas preferencias foron gardadas.',
+'timezonelegend'            => 'Zona horaria',
+'timezonetext'              => '¹Insira o número de horas de diferenza entre a súa hora local e a do servidor (UTC).',
+'localtime'                 => 'Hora local:',
+'timezoneselect'            => 'Zona horaria:',
+'timezoneuseserverdefault'  => 'Usar a hora do servidor por defecto',
+'timezoneuseoffset'         => 'Outra (especifique o desprazamento)',
+'timezoneoffset'            => 'Desprazamento¹:',
+'servertime'                => 'Hora do servidor:',
+'guesstimezone'             => 'Encher desde o navegador',
+'allowemail'                => 'Admitir mensaxes de correo electrónico doutros usuarios',
+'prefs-searchoptions'       => 'Opcións na procura',
+'prefs-namespaces'          => 'Espazos de nomes',
+'defaultns'                 => 'Procurar por omisión nestes espazos de nomes:',
+'default'                   => 'predeterminado',
+'files'                     => 'Ficheiros',
 
 # User rights
 'userrights'                  => 'Xestión dos dereitos de usuario', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Administrar os grupos do usuario',
 'userrights-user-editname'    => 'Escriba o nome do usuario:',
 'editusergroup'               => 'Editar os grupos do usuario',
-'editinguser'                 => "Mudando os dereitos do usuario '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Mudando os dereitos do usuario '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Editar os grupos do usuario',
 'saveusergroups'              => 'Gardar os grupos do usuario',
 'userrights-groupsmember'     => 'Membro de:',
@@ -981,6 +1184,8 @@ Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados
 'right-minoredit'            => 'Marcar as edicións como pequenas',
 'right-move'                 => 'Mover páxinas',
 'right-move-subpages'        => 'Mover páxinas coas súas subpáxinas',
+'right-move-rootuserpages'   => 'Mover páxinas de usuario raíz',
+'right-movefile'             => 'Mover ficheiros',
 'right-suppressredirect'     => 'Non crear unha redirección dende o nome vello ao mover unha páxina',
 'right-upload'               => 'Cargar ficheiros',
 'right-reupload'             => 'Sobreescribir un ficheiro existente',
@@ -1012,13 +1217,13 @@ Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados
 'right-editusercssjs'        => 'Editar os ficheiros CSS e JS doutros usuarios',
 'right-rollback'             => 'Reversión rápida da edición dun usuario dunha páxina particular',
 'right-markbotedits'         => 'Marcar as edicións desfeitas como edicións dun bot',
-'right-noratelimit'          => 'Non lle afectan os límites superiores',
+'right-noratelimit'          => 'Non lle afectan os límites de frecuencia',
 'right-import'               => 'Importar páxinas doutros wikis',
 'right-importupload'         => 'Importar páxinas desde un ficheiro cargado',
 'right-patrol'               => 'Marcar edicións como patrulladas',
 'right-autopatrol'           => 'Ter as edicións marcadas automaticamente como patrulladas',
 'right-patrolmarks'          => 'Ver os cambios que están marcados coma patrullados',
-'right-unwatchedpages'       => 'Ver unha listaxe de páxinas que non están vixiadas',
+'right-unwatchedpages'       => 'Ver unha lista de páxinas que non están vixiadas',
 'right-trackback'            => 'Enviar un trackback',
 'right-mergehistory'         => 'Fusionar o historial das páxinas',
 'right-userrights'           => 'Editar todos os dereitos de usuario',
@@ -1031,9 +1236,46 @@ Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados
 'rightslogentry' => 'cambiou o grupo ao que pertence "$1" de $2 a $3',
 'rightsnone'     => '(ningún)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'ler esta páxina',
+'action-edit'                 => 'editar esta páxina',
+'action-createpage'           => 'crear páxinas',
+'action-createtalk'           => 'crear páxinas de conversa',
+'action-createaccount'        => 'crear esta conta de usuario',
+'action-minoredit'            => 'marcar esta edición como pequena',
+'action-move'                 => 'mover esta páxina',
+'action-move-subpages'        => 'mover esta páxina e as súas subpáxinas',
+'action-move-rootuserpages'   => 'mover páxinas de usuario raíz',
+'action-movefile'             => 'mover este ficheiro',
+'action-upload'               => 'cargar este ficheiro',
+'action-reupload'             => 'sobreescribir este ficheiro existente',
+'action-reupload-shared'      => 'sobreescribir este ficheiro nun repositorio compartido',
+'action-upload_by_url'        => 'cargar este ficheiro desde un enderezo URL',
+'action-writeapi'             => 'usar a escritura API',
+'action-delete'               => 'borrar esta páxina',
+'action-deleterevision'       => 'borrar esta revisión',
+'action-deletedhistory'       => 'ver o historial borrado desta páxina',
+'action-browsearchive'        => 'procurar páxinas borradas',
+'action-undelete'             => 'restaurar esta páxina',
+'action-suppressrevision'     => 'revisar e restaurar esta revisión agochada',
+'action-suppressionlog'       => 'ver este rexistro privado',
+'action-block'                => 'bloquear o usuario fronte á edición',
+'action-protect'              => 'cambiar o nivel de protección desta páxina',
+'action-import'               => 'importar esta páxina doutro wiki',
+'action-importupload'         => 'importar esta páxina da carga dun ficheiro',
+'action-patrol'               => 'marcar a edición doutro como patrullada',
+'action-autopatrol'           => 'marcar a súa edición como patrullada',
+'action-unwatchedpages'       => 'ver a lista das páxinas non vixiadas',
+'action-trackback'            => 'enviar un trackback',
+'action-mergehistory'         => 'fusionar o historial desta páxina',
+'action-userrights'           => 'editar todos os permisos de usuario',
+'action-userrights-interwiki' => 'editar os permisos de usuario dos usuarios doutros wikis',
+'action-siteadmin'            => 'bloquear ou desbloquear a base de datos',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|cambio|cambios}}',
 'recentchanges'                     => 'Cambios recentes',
+'recentchanges-legend'              => 'Opcións dos cambios',
 'recentchangestext'                 => 'Sigue, nesta páxina, as modificacións máis recentes no wiki.',
 'recentchanges-feed-description'    => 'Siga os cambios máis recentes deste wiki con esta fonte de noticias.',
 'rcnote'                            => "Embaixo {{PLURAL:$1|amósase '''1''' cambio|amósanse os últimos '''$1''' cambios}} {{PLURAL:$2|no último día|nos últimos '''$2''' días}} ata as $5 do $4.",
@@ -1057,13 +1299,15 @@ Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados
 'rc_categories'                     => 'Límite para categorías (separado con "|")',
 'rc_categories_any'                 => 'Calquera',
 'newsectionsummary'                 => 'Nova sección: /* $1 */',
+'rc-enhanced-expand'                => 'Amosar os detalles (require JavaScript)',
+'rc-enhanced-hide'                  => 'Agochar os detalles',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cambios relacionados',
 'recentchangeslinked-title'    => 'Cambios relacionados con "$1"',
 'recentchangeslinked-noresult' => 'Non se produciron cambios nas páxinas vinculadas a esta durante o período de tempo seleccionado.',
-'recentchangeslinked-summary'  => "Esta é unha listaxe dos cambios que se realizaron recentemente nas páxinas vinculadas a esta (ou dos membros da categoría especificada).
-As páxinas da súa [[Special:Watchlist|listaxe de vixilancia]] aparecen en '''negra'''.",
+'recentchangeslinked-summary'  => "Esta é unha lista dos cambios que se realizaron recentemente nas páxinas vinculadas a esta (ou dos membros da categoría especificada).
+As páxinas da súa [[Special:Watchlist|lista de vixilancia]] aparecen en '''negra'''.",
 'recentchangeslinked-page'     => 'Nome da páxina:',
 'recentchangeslinked-to'       => 'Amosar os cambios relacionados das páxinas que ligan coa dada',
 
@@ -1078,11 +1322,11 @@ As páxinas da súa [[Special:Watchlist|listaxe de vixilancia]] aparecen en '''n
 'upload_directory_read_only'  => 'Non se pode escribir no directorio de subida ($1) do servidor web.',
 'uploaderror'                 => 'Erro ao cargar',
 'uploadtext'                  => "Use o formulario de embaixo para cargar ficheiros.
-Para ver ou procurar imaxes subidas con anterioridade vaia á [[Special:ImageList|listaxe de imaxes]]; os envíos tamén se rexistran no [[Special:Log/upload|rexistro de carga]], e as eliminacións no [[Special:Log/delete|rexistro de borrado]].
+Para ver ou procurar imaxes subidas con anterioridade vaia á [[Special:FileList|lista de imaxes]]; os envíos tamén se rexistran no [[Special:Log/upload|rexistro de carga]], e as eliminacións no [[Special:Log/delete|rexistro de borrado]].
 
 Para incluír un ficheiro nunha páxina, use unha ligazón do seguinte xeito:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' para usar a versión completa do ficheiro
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|texto alternativo]]</nowiki></tt>''' para usar unha resolución de 200 píxeles de ancho nunha caixa na marxe esquerda cunha descrición (\"texto alternativo\")
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' para usar a versión completa do ficheiro
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|texto alternativo]]</nowiki></tt>''' para usar unha resolución de 200 píxeles de ancho nunha caixa na marxe esquerda cunha descrición (\"texto alternativo\")
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' para ligar directamente co ficheiro sen que este saia na páxina",
 'upload-permitted'            => 'Tipos de ficheiro permitidos: $1.',
 'upload-preferred'            => 'Tipos de arquivos preferidos: $1.',
@@ -1090,11 +1334,11 @@ Para incluír un ficheiro nunha páxina, use unha ligazón do seguinte xeito:
 'uploadlog'                   => 'rexistro de cargas',
 'uploadlogpage'               => 'Rexistro de cargas',
 'uploadlogpagetext'           => 'Embaixo hai unha lista cos ficheiros subidos máis recentemente.
-Vexa a [[Special:NewImages|galería de imaxes novas]] para unha visión máis xeral.',
+Vexa a [[Special:NewFiles|galería de imaxes novas]] para unha visión máis xeral.',
 'filename'                    => 'Nome do ficheiro',
 'filedesc'                    => 'Resumo',
 'fileuploadsummary'           => 'Descrición:',
-'filestatus'                  => 'Status dos dereitos de autor:',
+'filestatus'                  => 'Estado dos dereitos de autor:',
 'filesource'                  => 'Fonte:',
 'uploadedfiles'               => 'Ficheiros cargados en {{SITENAME}}',
 'ignorewarning'               => 'Ignorar a advertencia e gardar o ficheiro de calquera xeito',
@@ -1111,25 +1355,27 @@ Vexa a [[Special:NewImages|galería de imaxes novas]] para unha visión máis xe
 'filetype-missing'            => 'O ficheiro non conta cunha extensión (como ".jpg").',
 'large-file'                  => 'Recoméndase que o tamaño dos ficheiros non supere $1; este ficheiro ocupa $2.',
 'largefileserver'             => 'Este ficheiro é de maior tamaño có permitido pola configuración do servidor.',
-'emptyfile'                   => 'O ficheiro que cargou semella estar baleiro. Isto pode deberse a un erro ortográfico no seu nome.
-Por favor verifique se realmente quere cargar este ficheiro.',
-'fileexists'                  => 'Xa existe un ficheiro con ese nome. Por favor, verifique <strong><tt>$1</tt></strong> se non está seguro de que quere cambialo.',
-'filepageexists'              => 'A páxina de descrición deste ficheiro xa foi creada en <strong><tt>$1</tt></strong>, pero polo de agora non existe ningún ficheiro con este nome. O resumo que escribiu non aparecerá na páxina de descrición. Para facer que o resumo apareza alí, necesitará editar a páxina manualmente',
-'fileexists-extension'        => 'Xa existe un ficheiro cun nome semellante:<br />
-Nome do ficheiro que tenta cargar: <strong><tt>$1</tt></strong><br />
-Nome de ficheiro existente: <strong><tt>$2</tt></strong><br />
-Por favor, escolla un nome diferente.',
+'emptyfile'                   => 'O ficheiro que cargou semella estar baleiro.
+Isto pode deberse a un erro ortográfico no seu nome.
+Por favor, verifique se realmente quere cargar este ficheiro.',
+'fileexists'                  => "Xa existe un ficheiro con ese nome. Por favor, verifique '''<tt>$1</tt>''' se non está seguro de que quere cambialo.",
+'filepageexists'              => "A páxina de descrición deste ficheiro xa foi creada en '''<tt>$1</tt>''', pero polo de agora non existe ningún ficheiro con este nome. O resumo que escribiu non aparecerá na páxina de descrición. Para facer que o resumo apareza alí, necesitará editar a páxina manualmente",
+'fileexists-extension'        => "Xa existe un ficheiro cun nome semellante:<br />
+Nome do ficheiro que tenta cargar: '''<tt>$1</tt>'''<br />
+Nome de ficheiro existente: '''<tt>$2</tt>'''<br />
+Por favor, escolla un nome diferente.",
 'fileexists-thumb'            => "<center>'''Imaxe existente'''</center>",
-'fileexists-thumbnail-yes'    => 'Parece que o ficheiro é unha imaxe de tamaño reducido <i>(miniatura)</i>. Comprobe o ficheiro <strong><tt>$1</tt></strong>.<br />
-Se o ficheiro seleccionado é a mesma imaxe de tamaño orixinal non é preciso enviar unha miniatura adicional.',
-'file-thumbnail-no'           => 'O nome do ficheiro comeza por <strong><tt>$1</tt></strong>.
-Parece tratarse dunha imaxe de tamaño reducido <i>(miniatura)</i>.
-Se dispón dunha versión desta imaxe de maior resolución, se non, múdelle o nome ao ficheiro.',
-'fileexists-forbidden'        => 'Xa hai un ficheiro co mesmo nome; por favor retroceda e cargue o ficheiro cun novo nome. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Xa existe un ficheiro con este nome no depósito de ficheiros compartidos.
-Se aínda quere cargar o seu ficheiro, por favor, volte atrás e use outro nome.
-[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Parece que o ficheiro é unha imaxe de tamaño reducido ''(miniatura)''. Comprobe o ficheiro '''<tt>$1</tt>'''.<br />
+Se o ficheiro seleccionado é a mesma imaxe de tamaño orixinal non é preciso enviar unha miniatura adicional.",
+'file-thumbnail-no'           => "O nome do ficheiro comeza por '''<tt>$1</tt>'''.
+Parece tratarse dunha imaxe de tamaño reducido ''(miniatura)''.
+Se dispón dunha versión desta imaxe de maior resolución, se non, múdelle o nome ao ficheiro.",
+'fileexists-forbidden'        => 'Xa existe un ficheiro co mesmo nome e este non pode ser sobreescrito.
+Se aínda quere cargar o seu ficheiro, por favor, retroceda e use un novo nome. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Xa existe un ficheiro con este nome no repositorio de ficheiros compartidos.
+Se aínda quere cargar o seu ficheiro, por favor, volte atrás e use outro nome. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Este ficheiro é un duplicado {{PLURAL:$1|do seguinte|dos seguintes}}:',
+'file-deleted-duplicate'      => 'Un ficheiro idéntico a este ("[[$1]]") foi borrado previamente. Debería comprobar o historial de borrados do ficheiro antes de proceder a cargalo de novo.',
 'successfulupload'            => 'Carga con éxito',
 'uploadwarning'               => 'Advertencia ao cargar o ficheiro',
 'savefile'                    => 'Gardar o ficheiro',
@@ -1150,7 +1396,7 @@ Debe comprobar o $1 antes de proceder a cargalo outra vez.',
 
 Debe considerar se é apropiado continuar enviando este ficheiro.
 O rexistro de borrado proporciónase aquí por se quere consultalo:",
-'filename-bad-prefix'         => 'O nome do ficheiro que está cargando comeza con <strong>"$1"</strong>, que é un típico nome non descritivo asignado automaticamente polas cámaras dixitais. Por favor, escolla un nome máis descritivo para o seu ficheiro.',
+'filename-bad-prefix'         => "O nome do ficheiro que está cargando comeza con '''\"\$1\"''', que é un típico nome non descritivo asignado automaticamente polas cámaras dixitais. Por favor, escolla un nome máis descritivo para o seu ficheiro.",
 'filename-prefix-blacklist'   => ' #<!-- deixe esta liña exactamente como está --> <pre>
 # A sintaxe é a seguinte:
 #   * Todo o que estea desde o carácter "#" até o final da liña é un comentario
@@ -1190,20 +1436,21 @@ Tamén pode reintentalo cando haxa menos actividade.',
 'upload_source_url'  => ' (un URL válido, accesíbel publicamente)',
 'upload_source_file' => ' (un ficheiro no seu ordenador)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Esta páxina especial amosa todos os ficheiros cargados.
-Por omisión, os ficheiros enviados máis recentemente aparecen no alto da listaxe.
+# Special:ListFiles
+'listfiles-summary'     => 'Esta páxina especial amosa todos os ficheiros cargados.
+Por omisión, os ficheiros enviados máis recentemente aparecen no alto da lista.
 Premendo nunha cabeceira da columna cambia a ordenación.',
-'imagelist_search_for'  => 'Buscar polo nome do ficheiro multimedia:',
+'listfiles_search_for'  => 'Buscar polo nome do ficheiro multimedia:',
 'imgfile'               => 'ficheiro',
-'imagelist'             => 'Listaxe de imaxes',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Usuario',
-'imagelist_size'        => 'Tamaño (bytes)',
-'imagelist_description' => 'Descrición',
-
-# Image description page
+'listfiles'             => 'Lista de imaxes',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Usuario',
+'listfiles_size'        => 'Tamaño (bytes)',
+'listfiles_description' => 'Descrición',
+'listfiles_count'       => 'Versións',
+
+# File description page
 'filehist'                       => 'Historial do ficheiro',
 'filehist-help'                  => 'Faga clic nunha data/hora para ver o ficheiro tal e como estaba nese momento.',
 'filehist-deleteall'             => 'borrar todo',
@@ -1211,19 +1458,25 @@ Premendo nunha cabeceira da columna cambia a ordenación.',
 'filehist-revert'                => 'reverter',
 'filehist-current'               => 'actual',
 'filehist-datetime'              => 'Data/Hora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura da versión ás $1',
+'filehist-nothumb'               => 'Sen miniatura',
 'filehist-user'                  => 'Usuario',
 'filehist-dimensions'            => 'Dimensións',
 'filehist-filesize'              => 'Tamaño do ficheiro',
 'filehist-comment'               => 'Comentario',
-'imagelinks'                     => 'Ligazóns da imaxe',
+'imagelinks'                     => 'Ligazóns do ficheiro',
 'linkstoimage'                   => '{{PLURAL:$1|A seguinte páxina liga|As seguintes $1 páxinas ligan}} con esta imaxe:',
+'linkstoimage-more'              => 'Máis {{PLURAL:$1|dunha páxina liga|de $1 páxinas ligan}} con este ficheiro.
+A seguinte lista só amosa {{PLURAL:$1|a primeira páxina que liga|as primeiras $1 páxina que ligan}} con el.
+Hai dispoñible [[Special:WhatLinksHere/$2|unha lista completa]].',
 'nolinkstoimage'                 => 'Ningunha páxina liga con este ficheiro.',
 'morelinkstoimage'               => 'Ver [[Special:WhatLinksHere/$1|máis ligazóns]] cara a este ficheiro.',
 'redirectstofile'                => '{{PLURAL:$1|O seguinte ficheiro redirixe|Os seguintes $1 ficheiros redirixen}} cara a este:',
-'duplicatesoffile'               => '{{PLURAL:$1|O seguinte ficheiro é un duplicado|Os seguintes $1 ficheiros son duplicados}} destoutro:',
+'duplicatesoffile'               => '{{PLURAL:$1|O seguinte ficheiro é un duplicado|Os seguintes $1 ficheiros son duplicados}} destoutro ([[Special:FileDuplicateSearch/$2|máis detalles]]):',
 'sharedupload'                   => 'Este ficheiro é un envío compartido e pode ser usado por outros proxectos.',
 'shareduploadwiki'               => 'Por favor, vexa a $1 para máis información.',
-'shareduploadwiki-desc'          => 'Embaixo móstrase a descrición da $1 no repositorio de imaxes.',
+'shareduploadwiki-desc'          => 'A continuación móstrase a descrición que alí hai na $1.',
 'shareduploadwiki-linktext'      => 'páxina de descrición do ficheiro',
 'shareduploadduplicate'          => 'Este ficheiro é un duplicado $1 que está no repositorio.',
 'shareduploadduplicate-linktext' => 'doutro ficheiro',
@@ -1247,7 +1500,7 @@ Premendo nunha cabeceira da columna cambia a ordenación.',
 # File deletion
 'filedelete'                  => 'Eliminar "$1"',
 'filedelete-legend'           => 'Eliminar un ficheiro',
-'filedelete-intro'            => "Vai eliminar \"'''[[Media:\$1|\$1]]'''\".",
+'filedelete-intro'            => "Está a piques de eliminar o ficheiro \"'''[[Media:\$1|\$1]]'''\" xunto con todo o seu historial.",
 'filedelete-intro-old'        => 'Vai eliminar a versión de "\'\'\'[[Media:$1|$1]]\'\'\'" do [$4 $2, ás $3].',
 'filedelete-comment'          => 'Comentario:',
 'filedelete-submit'           => 'Eliminar',
@@ -1255,7 +1508,6 @@ Premendo nunha cabeceira da columna cambia a ordenación.',
 'filedelete-success-old'      => 'Eliminouse a versión de "\'\'\'[[Media:$1|$1]]\'\'\'" do $2 ás $3.',
 'filedelete-nofile'           => "\"'''\$1'''\" non existe.",
 'filedelete-nofile-old'       => "Non existe unha versión arquivada de \"'''\$1'''\" cos atributos especificados.",
-'filedelete-iscurrent'        => 'Tentou eliminar a versión máis recente deste ficheiro. Volva antes a unha versión máis antiga.',
 'filedelete-otherreason'      => 'Outro motivo:',
 'filedelete-reason-otherlist' => 'Outra razón',
 'filedelete-reason-dropdown'  => '*Motivos frecuentes para borrar
@@ -1274,7 +1526,7 @@ Entrada: tipodecontido/subtipo, p.ex. <tt>image/jpeg</tt>.',
 'unwatchedpages' => 'Páxinas non vixiadas',
 
 # List redirects
-'listredirects' => 'Listaxe de redireccións',
+'listredirects' => 'Lista de redireccións',
 
 # Unused templates
 'unusedtemplates'     => 'Modelos sen uso',
@@ -1284,28 +1536,31 @@ Lembre verificar outras ligazóns cara aos modelos antes de borralos.',
 
 # Random page
 'randompage'         => 'Páxina aleatoria',
-'randompage-nopages' => 'Non hai páxinas neste espazo de nomes.',
+'randompage-nopages' => 'Non hai páxinas no espazo de nomes "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redirección aleatoria',
-'randomredirect-nopages' => 'Non hai redireccións neste espazo de nomes.',
+'randomredirect-nopages' => 'Non hai redireccións no espazo de nomes "$1".',
 
 # Statistics
-'statistics'             => 'Estatísticas',
-'sitestats'              => 'Estatísticas de {{SITENAME}}',
-'userstats'              => 'Estatísticas dos usuarios',
-'sitestatstext'          => "Actualmente hai {{PLURAL:\$1|'''1''' páxina|'''\$1''' páxinas en total}} na base de datos.
-Isto inclúe as páxinas de \"conversa\", as páxinas acerca de {{SITENAME}}, as páxinas de \"contido mínimo\", as redireccións e outras que probabelmente non deberían considerarse como páxinas con contido.
-Excluíndo todo isto, hai {{PLURAL:\$2|'''1''' páxina que é|'''\$2''' páxinas que son}}, probabelmente, {{PLURAL:\$2|páxina|páxinas}} con contido lexítimo.
-
-{{PLURAL:\$8|Foi cargado|Foron cargados}} '''\$8''' {{PLURAL:\$8|ficheiro|ficheiros}}.
-
-Houbo un total de '''\$3''' {{PLURAL:\$3|páxina vista|páxinas vistas}} e '''\$4''' {{PLURAL:\$4|edición|edicións}} desde que se creou {{SITENAME}}.
-Isto resulta nunha media de '''\$5''' edicións por páxina e '''\$6''' visionados por edición.
-
-A lonxitude da [http://www.mediawiki.org/wiki/Manual:Job_queue cola de traballos] é de '''\$7'''.",
-'userstatstext'          => "Hai {{PLURAL:$1|'''1''' [[Special:ListUsers|usuario]] rexistrado|'''$1''' [[Special:ListUsers|usuarios]] rexistrados}}, dos cales '''$2''' (ou o '''$4%''') {{PLURAL:$2|ten|teñen}} dereitos de $5.",
-'statistics-mostpopular' => 'Páxinas máis vistas',
+'statistics'                   => 'Estatísticas',
+'statistics-header-pages'      => 'Estatísticas das páxinas',
+'statistics-header-edits'      => 'Estatísticas das edicións',
+'statistics-header-views'      => 'Estatísticas das vistas',
+'statistics-header-users'      => 'Estatísticas dos usuarios',
+'statistics-articles'          => 'Páxinas de contido',
+'statistics-pages'             => 'Páxinas',
+'statistics-pages-desc'        => 'Todas as páxinas do wiki; isto inclúe as páxinas de conversa, redireccións, etc.',
+'statistics-files'             => 'Ficheiros cargados',
+'statistics-edits'             => 'Edicións nas páxinas desde que se creou {{SITENAME}}',
+'statistics-edits-average'     => 'Media de edicións por páxina',
+'statistics-views-total'       => 'Vistas totais',
+'statistics-views-peredit'     => 'Vistas por edición',
+'statistics-jobqueue'          => 'Lonxitude da [http://www.mediawiki.org/wiki/Manual:Job_queue cola de traballos]',
+'statistics-users'             => '[[Special:ListUsers|Usuarios]] rexistrados',
+'statistics-users-active'      => 'Usuarios activos',
+'statistics-users-active-desc' => 'Usuarios que teñen levado a cabo unha acción {{PLURAL:$1|no último día|nos últimos $1 días}}',
+'statistics-mostpopular'       => 'Páxinas máis vistas',
 
 'disambiguations'      => 'Páxinas de homónimos',
 'disambiguationspage'  => 'Template:Homónimos',
@@ -1319,7 +1574,7 @@ Unha páxina trátase como páxina de homónimos cando nela se usa un modelo que
 'double-redirect-fixer'      => 'Amañador de redireccións',
 
 'brokenredirects'        => 'Redireccións rotas',
-'brokenredirectstext'    => 'Estas redireccións ligan cara a unha páxina que non existe:',
+'brokenredirectstext'    => 'As seguintes redireccións ligan cara a páxinas que non existen:',
 'brokenredirects-edit'   => '(editar)',
 'brokenredirects-delete' => '(borrar)',
 
@@ -1349,26 +1604,30 @@ Unha páxina trátase como páxina de homónimos cando nela se usa un modelo que
 'popularpages'            => 'Páxinas populares',
 'wantedcategories'        => 'Categorías requiridas',
 'wantedpages'             => 'Páxinas requiridas',
-'missingfiles'            => 'Ficheiros que faltan',
+'wantedfiles'             => 'Ficheiros requiridos',
+'wantedtemplates'         => 'Modelos requiridos',
 'mostlinked'              => 'Páxinas máis enlazadas',
 'mostlinkedcategories'    => 'Categorías máis enlazadas',
 'mostlinkedtemplates'     => 'Modelos máis enlazados',
 'mostcategories'          => 'Artigos con máis categorías',
 'mostimages'              => 'Ficheiros máis enlazados',
 'mostrevisions'           => 'Artigos con máis revisións',
-'prefixindex'             => 'Mostrar páxinas clasificadas polas letras iniciais',
+'prefixindex'             => 'Todas as páxinas coas iniciais',
 'shortpages'              => 'Páxinas curtas',
 'longpages'               => 'Páxinas longas',
 'deadendpages'            => 'Páxinas sen ligazóns cara a outras',
 'deadendpagestext'        => 'Estas páxinas non ligan con ningunha outra páxina de {{SITENAME}}.',
 'protectedpages'          => 'Páxinas protexidas',
 'protectedpages-indef'    => 'Só as proteccións indefinidas',
+'protectedpages-cascade'  => 'Só as proteccións en serie',
 'protectedpagestext'      => 'As seguintes páxinas están protexidas fronte á edición ou traslado',
 'protectedpagesempty'     => 'Non hai páxinas protexidas neste momento',
 'protectedtitles'         => 'Títulos protexidos',
 'protectedtitlestext'     => 'Os seguintes títulos están protexidos da creación',
 'protectedtitlesempty'    => 'Actualmente non están protexidos títulos con eses parámetros.',
-'listusers'               => 'Listaxe de usuarios',
+'listusers'               => 'Lista de usuarios',
+'listusers-editsonly'     => 'Amosar só os usuarios con edicións',
+'usereditcount'           => '$1 {{PLURAL:$1|edición|edicións}}',
 'newpages'                => 'Páxinas novas',
 'newpages-username'       => 'Nome de usuario:',
 'ancientpages'            => 'Artigos máis antigos',
@@ -1388,15 +1647,14 @@ Unha páxina trátase como páxina de homónimos cando nela se usa un modelo que
 'booksources'               => 'Fontes bibliográficas',
 'booksources-search-legend' => 'Procurar fontes bibliográficas',
 'booksources-go'            => 'Ir',
-'booksources-text'          => 'A continuación aparece unha listaxe de ligazóns cara a outros sitios web que venden libros novos e usados, neles tamén pode obter máis información sobre as obras que está a buscar:',
+'booksources-text'          => 'A continuación aparece unha lista de ligazóns cara a outros sitios web que venden libros novos e usados, neles tamén pode obter máis información sobre as obras que está a buscar:',
+'booksources-invalid-isbn'  => 'O ISBN inserido parece non ser válido; comprobe que non haxa erros ao copialo da fonte orixinal.',
 
 # Special:Log
 'specialloguserlabel'  => 'Usuario:',
 'speciallogtitlelabel' => 'Título:',
 'log'                  => 'Rexistros',
 'all-logs-page'        => 'Todos os rexistros',
-'log-search-legend'    => 'Procurar rexistros',
-'log-search-submit'    => 'Executar',
 'alllogstext'          => 'Vista combinada de todos os rexistros dipoñibles en {{SITENAME}}.
 Pode precisar máis a vista seleccionando o tipo de rexistro, o nome do usuario ou o título da páxina afectada.',
 'logempty'             => 'Non se atopou ningún elemento relacionado no rexistro.',
@@ -1408,6 +1666,7 @@ Pode precisar máis a vista seleccionando o tipo de rexistro, o nome do usuario
 'nextpage'          => 'Páxina seguinte ($1)',
 'prevpage'          => 'Páxina anterior ($1)',
 'allpagesfrom'      => 'Mostrar as páxinas que comecen por:',
+'allpagesto'        => 'Mostrar as páxinas que rematen en:',
 'allarticles'       => 'Todos os artigos',
 'allinnamespace'    => 'Todas as páxinas (espazo de nomes $1)',
 'allnotinnamespace' => 'Todas as páxinas (que non están no espazo de nomes $1)',
@@ -1427,55 +1686,82 @@ Véxanse tamén as [[Special:WantedCategories|categorías requiridas]].',
 'special-categories-sort-count' => 'ordenar por número',
 'special-categories-sort-abc'   => 'ordenar alfabeticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribucións borradas do usuario',
+
+# Special:LinkSearch
+'linksearch'       => 'Ligazóns externas',
+'linksearch-pat'   => 'Patrón de procura:',
+'linksearch-ns'    => 'Espazo de nomes:',
+'linksearch-ok'    => 'Procurar',
+'linksearch-text'  => 'Extensións como "*.wikipedia.org" poden ser usadas.<br />Protocolos soportados: <tt>$1</tt>',
+'linksearch-line'  => '$1 ligado dende $2',
+'linksearch-error' => 'Os comodíns só poden aparecer ao principio do nome do servidor.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostrar os usuarios comezando por:',
 'listusers-submit'   => 'Amosar',
 'listusers-noresult' => 'Non se atopou ningún usuario. Comprobe tamén as variantes con maiúsculas e minúsculas.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Rexistro de creación de usuarios',
+'newuserlogpagetext'          => 'Este é un rexistro de creación de contas de usuario.',
+'newuserlog-byemail'          => 'contrasinal enviado por correo electrónico',
+'newuserlog-create-entry'     => 'Novo usuario',
+'newuserlog-create2-entry'    => 'creou unha nova conta para "$1"',
+'newuserlog-autocreate-entry' => 'Conta de usuario creada automaticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Dereitos dun usuario segundo o seu grupo',
-'listgrouprights-summary'  => 'A seguinte lista mostra os grupos de usuario definidos neste wiki, cos seus dereitos de acceso asociados.
+'listgrouprights'                 => 'Dereitos dun usuario segundo o seu grupo',
+'listgrouprights-summary'         => 'A seguinte lista mostra os grupos de usuario definidos neste wiki, cos seus dereitos de acceso asociados.
 Se quere máis información acerca dos dereitos individuais, pode atopala [[{{MediaWiki:Listgrouprights-helppage}}|aquí]].',
-'listgrouprights-group'    => 'Grupo',
-'listgrouprights-rights'   => 'Dereitos',
-'listgrouprights-helppage' => 'Help:Dereitos do grupo',
-'listgrouprights-members'  => '(lista de membros)',
+'listgrouprights-group'           => 'Grupo',
+'listgrouprights-rights'          => 'Dereitos',
+'listgrouprights-helppage'        => 'Help:Dereitos do grupo',
+'listgrouprights-members'         => '(lista de membros)',
+'listgrouprights-addgroup'        => 'Pode engadir {{PLURAL:$2|o grupo|os grupos}}: $1',
+'listgrouprights-removegroup'     => 'Pode eliminar {{PLURAL:$2|o grupo|os grupos}}: $1',
+'listgrouprights-addgroup-all'    => 'Pode engadir todos os grupos',
+'listgrouprights-removegroup-all' => 'Pode eliminar todos os grupos',
 
 # E-mail user
-'mailnologin'     => 'Non existe enderezo para o envío',
-'mailnologintext' => 'Debe [[Special:UserLogin|acceder ao sistema]] e ter rexistrado un enderezo de correo electrónico válido nas súas [[Special:Preferences|preferencias]] para enviar correos electrónicos a outros usuarios.',
-'emailuser'       => 'Enviar un correo electrónico a este usuario',
-'emailpage'       => 'Enviar un correo electrónico a un usuario',
-'emailpagetext'   => 'Pode usar o formulario de embaixo para enviar unha mensaxe de correo electrónico a este usuario.
+'mailnologin'      => 'Non existe enderezo para o envío',
+'mailnologintext'  => 'Debe [[Special:UserLogin|acceder ao sistema]] e ter rexistrado un enderezo de correo electrónico válido nas súas [[Special:Preferences|preferencias]] para enviar correos electrónicos a outros usuarios.',
+'emailuser'        => 'Enviar un correo electrónico a este usuario',
+'emailpage'        => 'Enviar un correo electrónico a un usuario',
+'emailpagetext'    => 'Pode usar o formulario de embaixo para enviar unha mensaxe de correo electrónico a este usuario.
 O correo electrónico que inseriu [[Special:Preferences|nas súas preferencias]] aparecerá no campo "De:" do correo, polo que o receptor da mensaxe poderalle responder.',
-'usermailererror' => 'O obxecto enviado deu unha mensaxe de erro:',
-'defemailsubject' => 'Correo electrónico de {{SITENAME}}',
-'noemailtitle'    => 'Sen enderezo de correo electrónico',
-'noemailtext'     => 'Este usuario non rexistrou un enderezo de correo electrónico válido ou elixiu non recibir correos electrónicos doutros usuarios.',
-'emailfrom'       => 'De:',
-'emailto'         => 'Para:',
-'emailsubject'    => 'Asunto:',
-'emailmessage'    => 'Mensaxe:',
-'emailsend'       => 'Enviar',
-'emailccme'       => 'Enviar unha copia da mensaxe para min.',
-'emailccsubject'  => 'Copia da mensaxe para $1: $2',
-'emailsent'       => 'Mensaxe enviada',
-'emailsenttext'   => 'A súa mensaxe de correo electrónico foi enviada.',
-'emailuserfooter' => 'Este correo electrónico foi enviado por $1 a $2 mediante a función "Enviar un correo electrónico a este usuario" de {{SITENAME}}.',
+'usermailererror'  => 'O obxecto enviado deu unha mensaxe de erro:',
+'defemailsubject'  => 'Correo electrónico de {{SITENAME}}',
+'noemailtitle'     => 'Sen enderezo de correo electrónico',
+'noemailtext'      => 'Este usuario non especificou un enderezo de correo electrónico válido.',
+'nowikiemailtitle' => 'Sen correo electrónico habilitado',
+'nowikiemailtext'  => 'Este usuario elixiu non recibir correos electrónicos doutros usuarios.',
+'email-legend'     => 'Enviar un correo electrónico a outro usuario de {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'Para:',
+'emailsubject'     => 'Asunto:',
+'emailmessage'     => 'Mensaxe:',
+'emailsend'        => 'Enviar',
+'emailccme'        => 'Enviar unha copia da mensaxe para min.',
+'emailccsubject'   => 'Copia da mensaxe para $1: $2',
+'emailsent'        => 'Mensaxe enviada',
+'emailsenttext'    => 'A súa mensaxe de correo electrónico foi enviada.',
+'emailuserfooter'  => 'Este correo electrónico foi enviado por $1 a $2 mediante a función "Enviar un correo electrónico a este usuario" de {{SITENAME}}.',
 
 # Watchlist
-'watchlist'            => 'A miña listaxe de vixilancia',
-'mywatchlist'          => 'A miña listaxe de vixilancia',
+'watchlist'            => 'A miña lista de vixilancia',
+'mywatchlist'          => 'A miña lista de vixilancia',
 'watchlistfor'         => "(de '''$1''')",
 'nowatchlist'          => 'Non ten elementos na súa lista de vixilancia.',
 'watchlistanontext'    => 'Faga o favor de $1 no sistema para ver ou editar os elementos da súa lista de vixilancia.',
 'watchnologin'         => 'Non accedeu ao sistema',
-'watchnologintext'     => 'Debe [[Special:UserLogin|acceder ao sistema]] para modificar a súa listaxe de vixilancia.',
-'addedwatch'           => 'Engadido á listaxe de vixilancia',
-'addedwatchtext'       => "A páxina \"[[:\$1]]\" foi engadida á súa [[Special:Watchlist|listaxe de vixilancia]].
-Os cambios futuros nesta páxina e na súa páxina de conversa asociada serán listados alí, e a páxina aparecerá en '''negra''' na [[Special:RecentChanges|listaxe de cambios recentes]] para facer máis sinxela a súa sinalización.",
-'removedwatch'         => 'Eliminado da listaxe de vixilancia',
-'removedwatchtext'     => 'A páxina "[[:$1]]" foi eliminada [[Special:Watchlist|da súa listaxe de vixilancia]].',
+'watchnologintext'     => 'Debe [[Special:UserLogin|acceder ao sistema]] para modificar a súa lista de vixilancia.',
+'addedwatch'           => 'Engadido á lista de vixilancia',
+'addedwatchtext'       => "A páxina \"[[:\$1]]\" foi engadida á súa [[Special:Watchlist|lista de vixilancia]].
+Os cambios futuros nesta páxina e na súa páxina de conversa asociada serán listados alí, e a páxina aparecerá en '''negra''' na [[Special:RecentChanges|lista de cambios recentes]] para facer máis sinxela a súa sinalización.",
+'removedwatch'         => 'Eliminado da lista de vixilancia',
+'removedwatchtext'     => 'A páxina "[[:$1]]" foi eliminada [[Special:Watchlist|da súa lista de vixilancia]].',
 'watch'                => 'Vixiar',
 'watchthispage'        => 'Vixiar esta páxina',
 'unwatch'              => 'Deixar de vixiar',
@@ -1488,16 +1774,11 @@ Os cambios futuros nesta páxina e na súa páxina de conversa asociada serán l
 'wlheader-showupdated' => "* As páxinas que cambiaron desde a súa última visita amósanse en '''negra'''",
 'watchmethod-recent'   => 'comprobando as edicións recentes na procura de páxinas vixiadas',
 'watchmethod-list'     => 'comprobando as páxinas vixiadas na procura de edicións recentes',
-'watchlistcontains'    => 'A súa listaxe de vixilancia ten $1 {{PLURAL:$1|páxina|páxinas}}.',
+'watchlistcontains'    => 'A súa lista de vixilancia ten $1 {{PLURAL:$1|páxina|páxinas}}.',
 'iteminvalidname'      => 'Hai un problema co elemento "$1", nome non válido...',
 'wlnote'               => "Embaixo {{PLURAL:$1|está a última modificación|están as últimas '''$1''' modificacións}} {{PLURAL:$2|na última hora|nas últimas '''$2''' horas}}.",
 'wlshowlast'           => 'Amosar as últimas $1 horas, os últimos $2 días ou $3',
-'watchlist-show-bots'  => 'Mostrar os bots',
-'watchlist-hide-bots'  => 'Agochar os bots',
-'watchlist-show-own'   => 'Mostrar as edicións propias',
-'watchlist-hide-own'   => 'Agochar as edicións propias',
-'watchlist-show-minor' => 'Mostrar as edicións pequenas',
-'watchlist-hide-minor' => 'Agochar as edicións pequenas',
+'watchlist-options'    => 'Opcións de vixilancia',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vixiando...',
@@ -1525,7 +1806,7 @@ Contactar co editor:
 correo electrónico: $PAGEEDITOR_EMAIL
 wiki: $PAGEEDITOR_WIKI
 
-Non se producirán novas notificacións cando haxa novos cambios ata que vostede visite a páxina. Pode borrar os indicadores de aviso de notificación para o conxunto das páxinas marcadas na súa listaxe de vixilancia.
+Non se producirán novas notificacións cando haxa novos cambios ata que vostede visite a páxina. Pode borrar os indicadores de aviso de notificación para o conxunto das páxinas marcadas na súa lista de vixilancia.
 
              O sistema de aviso de {{SITENAME}}
 
@@ -1536,82 +1817,101 @@ Para cambiar a súa lista de vixilancia, visite
 Axuda:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Borrar a páxina',
-'confirm'                     => 'Confirmar',
-'excontent'                   => 'o contido era: "$1"',
-'excontentauthor'             => 'o contido era: "$1" (e o único editor foi "[[Special:Contributions/$2|$2]]")',
-'exbeforeblank'               => 'o contido antes do baleiramento era: "$1"',
-'exblank'                     => 'a páxina estaba baleira',
-'delete-confirm'              => 'Borrar "$1"',
-'delete-legend'               => 'Borrar',
-'historywarning'              => 'Atención: a páxina que vai borrar ten un historial:',
-'confirmdeletetext'           => 'Está a piques de borrar de xeito permanente unha páxina ou imaxe con todo o seu historial na base de datos.
+# Delete
+'deletepage'             => 'Borrar a páxina',
+'confirm'                => 'Confirmar',
+'excontent'              => 'o contido era: "$1"',
+'excontentauthor'        => 'o contido era: "$1" (e o único editor foi "[[Special:Contributions/$2|$2]]")',
+'exbeforeblank'          => 'o contido antes do baleiramento era: "$1"',
+'exblank'                => 'a páxina estaba baleira',
+'delete-confirm'         => 'Borrar "$1"',
+'delete-legend'          => 'Borrar',
+'historywarning'         => 'Atención: a páxina que vai borrar ten un historial:',
+'confirmdeletetext'      => 'Está a piques de borrar de xeito permanente unha páxina ou imaxe con todo o seu historial na base de datos.
 Por favor, confirme que é realmente a súa intención, que comprende as consecuencias e que está obrando de acordo coas regras [[{{MediaWiki:Policy-url}}|da política e normas]].',
-'actioncomplete'              => 'A acción foi completada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" foi borrado.
-No $2 pode ver unha listaxe dos borrados máis recentes.',
-'deletedarticle'              => 'borrou "[[$1]]"',
-'suppressedarticle'           => 'suprimiu "[[$1]]"',
-'dellogpage'                  => 'Rexistro de borrados',
-'dellogpagetext'              => 'Abaixo está a listaxe dos borrados máis recentes.',
-'deletionlog'                 => 'rexistro de borrados',
-'reverted'                    => 'Devolto a unha versión anterior',
-'deletecomment'               => 'Razón para o borrado:',
-'deleteotherreason'           => 'Outro motivo:',
-'deletereasonotherlist'       => 'Outro motivo',
-'deletereason-dropdown'       => '
+'actioncomplete'         => 'A acción foi completada',
+'deletedtext'            => 'A páxina "<nowiki>$1</nowiki>" foi borrada.
+No $2 pode ver unha lista dos borrados máis recentes.',
+'deletedarticle'         => 'borrou "[[$1]]"',
+'suppressedarticle'      => 'suprimiu "[[$1]]"',
+'dellogpage'             => 'Rexistro de borrados',
+'dellogpagetext'         => 'Abaixo está a lista dos borrados máis recentes.',
+'deletionlog'            => 'rexistro de borrados',
+'reverted'               => 'Devolto a unha versión anterior',
+'deletecomment'          => 'Razón para o borrado:',
+'deleteotherreason'      => 'Outro motivo:',
+'deletereasonotherlist'  => 'Outro motivo',
+'deletereason-dropdown'  => '
 *Motivos frecuentes para borrar
 ** Petición do autor
 ** Violación de copyright
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Editar os motivos de borrado',
-'delete-toobig'               => 'Esta páxina conta cun historial longo, de máis {{PLURAL:$1|dunha revisión|de $1 revisións}}.
+'delete-edit-reasonlist' => 'Editar os motivos de borrado',
+'delete-toobig'          => 'Esta páxina conta cun historial longo, de máis {{PLURAL:$1|dunha revisión|de $1 revisións}}.
 Limitouse a eliminación destas páxinas para previr problemas de funcionamento accidentais en {{SITENAME}}.',
-'delete-warning-toobig'       => 'Esta páxina conta cun historial de edicións longo, de máis {{PLURAL:$1|dunha revisión|de $1 revisións}}.
+'delete-warning-toobig'  => 'Esta páxina conta cun historial de edicións longo, de máis {{PLURAL:$1|dunha revisión|de $1 revisións}}.
 Ao eliminala pódense provocar problemas de funcionamento nas operacións da base de datos de {{SITENAME}};
 proceda con coidado.',
-'rollback'                    => 'Reverter as edicións',
-'rollback_short'              => 'Reverter',
-'rollbacklink'                => 'reverter',
-'rollbackfailed'              => 'Houbo un fallo ao reverter as edicións',
-'cantrollback'                => 'Non se pode desfacer a edición; o último contribuínte é o único autor desta páxina.',
-'alreadyrolled'               => 'Non se pode desfacer a edición en "[[:$1]]" feita por [[User:$2|$2]] ([[User talk:$2|conversa]] | [[Special:Contributions/$2|{{int:contribslink}}]]); alguén máis editou ou desfixo os cambios desta páxina.
-
-A última edición fíxoa [[User:$3|$3]] ([[User talk:$3|conversa]] | [[Special:Contributions/$2|{{int:contribslink}}]]).',
-'editcomment'                 => 'O comentario da edición era: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Desfixéronse as edicións de [[Special:Contributions/$2|$2]] ([[User talk:$2|conversa]]); cambiado á última versión feita por [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Desfixéronse as edicións de $1;
+
+# Rollback
+'rollback'         => 'Reverter as edicións',
+'rollback_short'   => 'Reverter',
+'rollbacklink'     => 'reverter',
+'rollbackfailed'   => 'Houbo un fallo ao reverter as edicións',
+'cantrollback'     => 'Non se pode desfacer a edición; o último contribuínte é o único autor desta páxina.',
+'alreadyrolled'    => 'Non se pode desfacer a edición en "[[:$1]]" feita por [[User:$2|$2]] ([[User talk:$2|conversa]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); alguén máis editou ou desfixo os cambios desta páxina.
+
+A última edición fíxoa [[User:$3|$3]] ([[User talk:$3|conversa]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]).',
+'editcomment'      => "O resumo de edición era: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Desfixéronse as edicións de [[Special:Contributions/$2|$2]] ([[User talk:$2|conversa]]); cambiado á última versión feita por [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Desfixéronse as edicións de $1;
 volveuse á última edición, feita por $2.',
-'sessionfailure'              => 'Parece que hai un problema co rexistro da súa sesión; esta acción cancelouse como precaución fronte ao secuestro de sesións. Prema no botón "atrás", volva cargar a páxina da que proviña e ténteo de novo.',
+'sessionfailure'   => 'Parece que hai un problema co rexistro da súa sesión; esta acción cancelouse como precaución fronte ao secuestro de sesións. Prema no botón "atrás", volva cargar a páxina da que proviña e ténteo de novo.',
+
+# Protect
 'protectlogpage'              => 'Rexistro de proteccións',
 'protectlogtext'              => 'Embaixo móstrase unha lista dos bloqueos e desbloqueos de páxinas.
 Vexa a [[Special:ProtectedPages|lista de páxinas protexidas]] se quere obter a lista coas proteccións de páxinas vixentes.',
 'protectedarticle'            => 'protexeu "[[$1]]"',
 'modifiedarticleprotection'   => 'modificou o nivel de protección de "[[$1]]"',
 'unprotectedarticle'          => 'desprotexeu "[[$1]]"',
+'movedarticleprotection'      => 'cambiou as características da protección de "[[$2]]" a "[[$1]]"',
 'protect-title'               => 'Cambiar o nivel de protección de "$1"',
+'prot_1movedto2'              => 'moveu "[[$1]]" a "[[$2]]"',
 'protect-legend'              => 'Confirmar protección',
 'protectcomment'              => 'Motivo:',
 'protectexpiry'               => 'Caducidade:',
 'protect_expiry_invalid'      => 'O tempo de duración da protección non e válido.',
 'protect_expiry_old'          => 'O momento de remate da protección corresponde ao pasado.',
 'protect-unchain'             => 'Desbloquear os permisos de traslado',
-'protect-text'                => 'Aquí é onde pode ver e cambiar os niveis de protección da páxina chamada "<strong><nowiki>$1</nowiki></strong>".',
-'protect-locked-blocked'      => 'Non pode modificar os niveis de protección mentres exista un bloqueo. Velaquí a configuración actual da páxina  <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Os niveis de protección non se poden modificar debido a un bloqueo da base de datos activa.
-Velaquí a configuración actual da páxina <strong>$1</strong>:',
-'protect-locked-access'       => 'A súa conta non dispón de permisos para mudar os niveis de protección.
-Velaquí a configuración actual da páxina <strong>$1</strong>:',
+'protect-text'                => "Aquí é onde pode ver e cambiar os niveis de protección da páxina chamada \"'''<nowiki>\$1</nowiki>'''\".",
+'protect-locked-blocked'      => "Non pode modificar os niveis de protección mentres exista un bloqueo. Velaquí a configuración actual da páxina  '''$1''':",
+'protect-locked-dblock'       => "Os niveis de protección non se poden modificar debido a un bloqueo da base de datos activa.
+Velaquí a configuración actual da páxina '''$1''':",
+'protect-locked-access'       => "A súa conta non dispón de permisos para mudar os niveis de protección.
+Velaquí a configuración actual da páxina '''$1''':",
 'protect-cascadeon'           => 'Esta páxina está protexida neste momento porque está incluída {{PLURAL:$1|na seguinte páxina, que foi protexida|páxinas, que foron protexidas}} coa opción protección en serie activada. Pode mudar o nivel de protección da páxina pero iso non afectará á protección en serie.',
-'protect-default'             => '(predeterminado)',
+'protect-default'             => 'Permitir a todos os usuarios',
 'protect-fallback'            => 'Require permisos de "$1"',
-'protect-level-autoconfirmed' => 'Bloquear usuarios non rexistrados',
+'protect-level-autoconfirmed' => 'Bloquear os usuarios novos e anónimos',
 'protect-level-sysop'         => 'Só os administradores',
 'protect-summary-cascade'     => 'protección en serie',
 'protect-expiring'            => 'remata $1 (UTC)',
+'protect-expiry-indefinite'   => 'indefinido',
 'protect-cascade'             => 'Protexer as páxinas incluídas nesta (protección en serie)',
 'protect-cantedit'            => 'Non pode modificar os niveis de protección desta páxina porque non ten permiso para editala.',
+'protect-othertime'           => 'Outro período:',
+'protect-othertime-op'        => 'outro período',
+'protect-existing-expiry'     => 'Período de caducidade existente: $2, $3',
+'protect-otherreason'         => 'Outro motivo:',
+'protect-otherreason-op'      => 'outro motivo',
+'protect-dropdown'            => '*Motivos frecuentes para a protección
+** Vandalismo excesivo
+** Publicidade excesiva
+** Guerra de edicións
+** Páxina moi visitada',
+'protect-edit-reasonlist'     => 'Editar os motivos de protección',
+'protect-expiry-options'      => '1 hora:1 hour,1 día:1 day,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 ano:1 year,para sempre:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permiso',
 'restriction-level'           => 'Nivel de protección:',
 'minimum-size'                => 'Tamaño mínimo',
@@ -1634,7 +1934,7 @@ Velaquí a configuración actual da páxina <strong>$1</strong>:',
 'undeletepage'                 => 'Ver e restaurar páxinas borradas',
 'undeletepagetitle'            => "'''A continuación amósanse as revisións eliminadas de''' \"'''[[:\$1|\$1]]'''\".",
 'viewdeletedpage'              => 'Ver as páxinas borradas',
-'undeletepagetext'             => 'As seguintes páxinas foron borradas, pero aínda están no arquivo e poden ser restauradas.
+'undeletepagetext'             => '{{PLURAL:$1|A seguinte páxina foi borrada|As seguintes páxinas foron borradas}}, pero aínda {{PLURAL:$1|está|están}} no arquivo e {{PLURAL:$1|pode|poden}} ser {{PLURAL:$1|restaurada|restauradas}}.
 O arquivo será limpado periodicamente.',
 'undelete-fieldset-title'      => 'Restaurar as revisións',
 'undeleteextrahelp'            => "Para restaurar o historial dunha páxina ao completo, deixe todas as caixas sen marcar e prema en '''''Restaurar'''''.
@@ -1645,21 +1945,23 @@ Ao premer en '''''Limpar''''', bórranse o campo do comentario e todas as caixas
 Se se creou unha páxina nova co mesmo nome desde o seu borrado, as revisións restauradas van aparecer no historial anterior.',
 'undeleterevdel'               => 'Non se levará a cabo a reversión do borrado se ocasiona que a última revisión da páxina ou ficheiro se elimine parcialmente.
 Nestes casos, debe retirar a selección ou quitar a ocultación das revisións borradas máis recentes.',
-'undeletehistorynoadmin'       => 'Esta páxina foi borrada. O motivo do borrado consta no resumo de embaixo, xunto cos detalles dos usuarios que editaron esta páxina antes da súa eliminación.
-O texto das revisións eliminadas só está á disposición dos administradores.',
-'undelete-revision'            => 'Revisión eliminada de "$1" (ás $2) feita por $3:',
+'undeletehistorynoadmin'       => 'Esta páxina foi borrada.
+O motivo do borrado consta no resumo de embaixo, xunto cos detalles dos usuarios que editaron esta páxina antes da súa eliminación.
+O texto destas revisións eliminadas só está á disposición dos administradores.',
+'undelete-revision'            => 'Revisión eliminada de "$1" (o $4 ás $5) feita por $3:',
 'undeleterevision-missing'     => 'Revisión non válida ou inexistente. Pode que a ligazón conteña un erro ou que a revisión se restaurase ou eliminase do arquivo.',
 'undelete-nodiff'              => 'Non se atopou ningunha revisión anterior.',
 'undeletebtn'                  => 'Restaurar',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Limpar',
+'undeleteinvert'               => 'Inverter a selección',
 'undeletecomment'              => 'Razón para desprotexer:',
 'undeletedarticle'             => 'restaurou "[[$1]]"',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|revisión restaurada|revisións restauradas}}',
 'undeletedrevisions-files'     => '$1 {{PLURAL:$1|revisión|revisións}} e $2 {{PLURAL:$2|ficheiro restaurado|ficheiros restaurados}}',
 'undeletedfiles'               => '$1 {{PLURAL:$1|ficheiro restaurado|ficheiros restaurados}}',
 'cannotundelete'               => 'Non se restaurou a páxina porque alguén xa o fixo antes.',
-'undeletedpage'                => "<big>'''$1 foi restaurado'''</big>
+'undeletedpage'                => "<big>'''A páxina \"\$1\" foi restaurada'''</big>
 
 Comprobe o [[Special:Log/delete|rexistro de borrados]] para ver as entradas recentes no rexistro de páxinas eliminadas e restauradas.",
 'undelete-header'              => 'Vexa [[Special:Log/delete|no rexistro de borrados]] as páxinas eliminadas recentemente.',
@@ -1680,30 +1982,31 @@ $1',
 
 # Namespace form on various pages
 'namespace'      => 'Espazo de nomes:',
-'invert'         => 'Invertir a selección',
+'invert'         => 'Inverter a selección',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contribucións do usuario',
-'mycontris'     => 'As miñas contribucións',
-'contribsub2'   => 'De $1 ($2)',
-'nocontribs'    => 'Non se deron atopado cambios con eses criterios.',
-'uctop'         => '(última revisión)',
-'month'         => 'Desde o mes de (e anteriores):',
-'year'          => 'Desde o ano (e anteriores):',
-
-'sp-contributions-newbies'     => 'Mostrar só as contribucións das contas de usuario novas',
-'sp-contributions-newbies-sub' => 'Contribucións dos usuarios novos',
-'sp-contributions-blocklog'    => 'Rexistro de bloqueos',
-'sp-contributions-search'      => 'Busca de contribucións',
-'sp-contributions-username'    => 'Enderezo IP ou nome de usuario:',
-'sp-contributions-submit'      => 'Procurar',
+'contributions'       => 'Contribucións do usuario',
+'contributions-title' => 'Contribucións de $1',
+'mycontris'           => 'As miñas contribucións',
+'contribsub2'         => 'De $1 ($2)',
+'nocontribs'          => 'Non se deron atopado cambios con eses criterios.',
+'uctop'               => '(última revisión)',
+'month'               => 'Desde o mes de (e anteriores):',
+'year'                => 'Desde o ano (e anteriores):',
+
+'sp-contributions-newbies'       => 'Mostrar só as contribucións das contas de usuario novas',
+'sp-contributions-newbies-sub'   => 'Contribucións dos usuarios novos',
+'sp-contributions-newbies-title' => 'Contribucións dos usuarios novos',
+'sp-contributions-blocklog'      => 'Rexistro de bloqueos',
+'sp-contributions-search'        => 'Busca de contribucións',
+'sp-contributions-username'      => 'Enderezo IP ou nome de usuario:',
+'sp-contributions-submit'        => 'Procurar',
 
 # What links here
 'whatlinkshere'            => 'Páxinas que ligan con esta',
 'whatlinkshere-title'      => 'Páxinas que ligan con "$1"',
 'whatlinkshere-page'       => 'Páxina:',
-'linklistsub'              => '(Listaxe de ligazóns)',
 'linkshere'                => "As seguintes páxinas ligan con \"'''[[:\$1]]'''\":",
 'nolinkshere'              => "Ningunha páxina liga con \"'''[[:\$1]]'''\".",
 'nolinkshere-ns'           => "Ningunha páxina liga con \"'''[[:\$1]]'''\" no espazo de nomes elixido.",
@@ -1748,8 +2051,10 @@ Explique a razón específica do bloqueo (por exemplo, citando as páxinas concr
 'ipboptions'                      => '2 horas:2 hours,1 día:1 day,3 días:3 days,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 ano:1 year,para sempre:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'outra',
 'ipbotherreason'                  => 'Outro motivo:',
-'ipbhidename'                     => 'Agochar nome de usuario no rexistro de bloqueos, na listaxe de bloqueos activos e na listaxe de usuarios',
+'ipbhidename'                     => 'Agochar nome de usuario no rexistro de bloqueos, na lista de bloqueos activos e na lista de usuarios',
 'ipbwatchuser'                    => 'Vixiar a páxina de usuario e a de conversa deste usuario',
+'ipballowusertalk'                => 'Permitir que este usuario poida editar a súa páxina de conversa mentres estea bloqueado',
+'ipb-change-block'                => 'Volver bloquear o usuario con estas configuracións',
 'badipaddress'                    => 'O enderezo IP non é válido',
 'blockipsuccesssub'               => 'Bloqueo con éxito',
 'blockipsuccesstext'              => 'O enderezo IP [[Special:Contributions/$1|$1]] foi bloqueado.<br />
@@ -1759,14 +2064,18 @@ Olle a [[Special:IPBlockList|lista de enderezos IP e usuarios bloqueados]] para
 'ipb-unblock'                     => 'Desbloquear un usuario ou enderezo IP',
 'ipb-blocklist-addr'              => 'Bloqueos vixentes de "$1"',
 'ipb-blocklist'                   => 'Ver bloqueos vixentes',
+'ipb-blocklist-contribs'          => 'Contribucións de "$1"',
 'unblockip'                       => 'Desbloquear o usuario',
 'unblockiptext'                   => 'Use o seguinte formulario para dar de novo acceso de escritura a un enderezo IP ou usuario que estea bloqueado.',
-'ipusubmit'                       => 'Desbloquear este enderezo',
+'ipusubmit'                       => 'Retirar este bloqueo',
 'unblocked'                       => '[[User:$1|$1]] foi desbloqueado',
 'unblocked-id'                    => 'Eliminouse o bloqueo de $1',
 'ipblocklist'                     => 'Enderezos IP e usuarios bloqueados',
 'ipblocklist-legend'              => 'Buscar un usuario bloqueado',
 'ipblocklist-username'            => 'Nome de usuario ou enderezo IP:',
+'ipblocklist-sh-userblocks'       => '$1 as contas bloqueadas',
+'ipblocklist-sh-tempblocks'       => '$1 os bloqueos temporais',
+'ipblocklist-sh-addressblocks'    => '$1 os bloqueos únicos a enderezos IP',
 'ipblocklist-submit'              => 'Procurar',
 'blocklistline'                   => '$1, $2 bloqueou a "$3" ($4)',
 'infiniteblock'                   => 'para sempre',
@@ -1775,14 +2084,19 @@ Olle a [[Special:IPBlockList|lista de enderezos IP e usuarios bloqueados]] para
 'noautoblockblock'                => 'autobloqueo desactivado',
 'createaccountblock'              => 'bloqueada a creación de contas',
 'emailblock'                      => 'correo electrónico bloqueado',
-'ipblocklist-empty'               => 'A listaxe de bloqueos está baleira.',
+'blocklist-nousertalk'            => 'non pode editar a súa conversa',
+'ipblocklist-empty'               => 'A lista de bloqueos está baleira.',
 'ipblocklist-no-results'          => 'Nin o enderezo IP nin o nome de usuario solicitados están bloqueados.',
 'blocklink'                       => 'bloquear',
 'unblocklink'                     => 'desbloquear',
+'change-blocklink'                => 'cambiar o bloqueo',
 'contribslink'                    => 'contribucións',
-'autoblocker'                     => 'Autobloqueado porque "[[User:$1|$1]]" usou recentemente este enderezo IP. O motivo do bloqueo de $1 é: "$2".',
+'autoblocker'                     => 'Foi autobloqueado porque "[[User:$1|$1]]" usou recentemente o seu  mesmo enderezo IP.
+O motivo do bloqueo de $1 é: "$2"',
 'blocklogpage'                    => 'Rexistro de bloqueos',
+'blocklog-fulllog'                => 'Rexistro de bloqueos totais',
 'blocklogentry'                   => 'bloqueou a "[[$1]]" cun tempo de duración de $2 $3',
+'reblock-logentry'                => 'cambiou as configuracións do bloqueo de "[[$1]]" cunha caducidade de $2 $3',
 'blocklogtext'                    => 'Este é o rexistro das accións de bloqueo e desbloqueo de usuarios.
 Non se listan os enderezos IP bloqueados automaticamente.
 Olle a [[Special:IPBlockList|lista de enderezos IP e usuarios bloqueados]] se quere comprobar a lista cos bloqueos vixentes.',
@@ -1791,11 +2105,14 @@ Olle a [[Special:IPBlockList|lista de enderezos IP e usuarios bloqueados]] se qu
 'block-log-flags-nocreate'        => 'desactivada a creación de contas de usuario',
 'block-log-flags-noautoblock'     => 'bloqueo automático deshabilitado',
 'block-log-flags-noemail'         => 'correo electrónico bloqueado',
+'block-log-flags-nousertalk'      => 'desactivada a edición da súa conversa',
 'block-log-flags-angry-autoblock' => 'realzou o autobloqueo permitido',
 'range_block_disabled'            => 'A funcionalidade de administrador de crear rangos de bloqueos está deshabilitada.',
 'ipb_expiry_invalid'              => 'Tempo de duración non válido.',
 'ipb_expiry_temp'                 => 'Os bloqueos a nomes de usuario agochados deberían ser permanentes.',
 'ipb_already_blocked'             => '"$1" xa está bloqueado',
+'ipb-needreblock'                 => '== Xa está bloqueado ==
+"$1" xa está bloqueado. Quere cambiar as configuracións?',
 'ipb_cant_unblock'                => 'Erro: Non se atopa o Block ID $1. Posiblemente xa foi desbloqueado.',
 'ipb_blocked_as_range'            => 'Erro: O enderezo IP $1 non está bloqueado directamente e non se pode desbloquear. Porén, está bloqueado por estar no rango $2, que si se pode desbloquear.',
 'ip_range_invalid'                => 'Rango IP non válido.',
@@ -1805,15 +2122,16 @@ Olle a [[Special:IPBlockList|lista de enderezos IP e usuarios bloqueados]] se qu
 'proxyblockreason'                => 'O seu enderezo IP foi bloqueado porque é un proxy aberto.
 Por favor, contacte co seu fornecedor de acceso á Internet ou co seu soporte técnico e informe deste grave problema de seguridade.',
 'proxyblocksuccess'               => 'Feito.',
-'sorbsreason'                     => 'O seu enderezo IP está rexistrado na listaxe DNSBL usada por {{SITENAME}}.',
-'sorbs_create_account_reason'     => "O seu enderezo IP está rexistrado como un ''proxy'' aberto na listaxe DNSBL usada por {{SITENAME}}. Polo tanto non pode crear unha conta de acceso",
+'sorbsreason'                     => 'O seu enderezo IP está rexistrado na lista DNSBL usada por {{SITENAME}}.',
+'sorbs_create_account_reason'     => "O seu enderezo IP está rexistrado como un ''proxy'' aberto na lista DNSBL usada por {{SITENAME}}. Polo tanto non pode crear unha conta de acceso",
+'cant-block-while-blocked'        => 'Non pode bloquear outros usuarios mentres vostede estea bloqueado.',
 
 # Developer tools
 'lockdb'              => 'Fechar base de datos',
 'unlockdb'            => 'Desbloquear a base de datos',
-'lockdbtext'          => 'Fechar a base de datos vai quitarlles aos usuarios a posibilidade de editar páxinas,cambiar as súas preferencias, editar as súas listaxes de vixilancia e outras cousas que requiren cambios na base de datos.
+'lockdbtext'          => 'Fechar a base de datos vai quitarlles aos usuarios a posibilidade de editar páxinas,cambiar as súas preferencias, editar as súas listas de vixilancia e outras cousas que requiren cambios na base de datos.
 Por favor confirme que é o que realmente quere facer, e que vai quitar o fechamento da base de datos cando o mantemento estea rematado.',
-'unlockdbtext'        => 'O desbloqueo da base de datos vai permitir que os usuarios poidan editar páxinas, cambiar as súas preferencias, editar as súas listaxes de vixilancia e outras accións que requiran cambios na base de datos.
+'unlockdbtext'        => 'O desbloqueo da base de datos vai permitir que os usuarios poidan editar páxinas, cambiar as súas preferencias, editar as súas listas de vixilancia e outras accións que requiran cambios na base de datos.
 Por favor confirme que isto é o que quere facer.',
 'lockconfirm'         => 'Si, realmente quero fechar a base de datos.',
 'unlockconfirm'       => 'Si, realmente quero desbloquear a base de datos',
@@ -1829,9 +2147,9 @@ Lembre [[Special:UnlockDB|eliminar o bloqueo]] unha vez completado o seu manteme
 'databasenotlocked'   => 'A base de datos non está bloqueada.',
 
 # Move page
-'move-page'               => 'Mover "$1"',
-'move-page-legend'        => 'Mover páxina',
-'movepagetext'            => "Ao usar o formulario de embaixo vai cambiar o nome da páxina, movendo todo o seu historial ao novo nome.
+'move-page'                    => 'Mover "$1"',
+'move-page-legend'             => 'Mover páxina',
+'movepagetext'                 => "Ao usar o formulario de embaixo vai cambiar o nome da páxina, movendo todo o seu historial ao novo nome.
 O título vello vaise converter nunha páxina de redirección ao novo título.
 Pode actualizar automaticamente as redireccións que van dar ao título orixinal.
 Se escolle non facelo, asegúrese de verificar que non hai redireccións [[Special:DoubleRedirects|dobres]] ou [[Special:BrokenRedirects|crebadas]].
@@ -1843,49 +2161,62 @@ Isto significa que pode volver renomear unha páxina ao seu nome antigo se comet
 '''ATENCIÓN!'''
 Este cambio nunha páxina popular pode ser drástico e inesperado;
 por favor, asegúrese de que entende as consecuencias disto antes de proseguir.",
-'movepagetalktext'        => "A páxina de conversa asociada, se existe, será automaticamente movida con esta '''agás que''':
+'movepagetalktext'             => "A páxina de conversa asociada, se existe, será automaticamente movida con esta '''agás que''':
 *Estea a mover a páxina empregando espazos de nomes,
 *Xa exista unha páxina de conversa con ese nome, ou
 *Desactive a opción de abaixo.
 
 Nestes casos, terá que mover ou mesturar a páxina manualmente se o desexa.",
-'movearticle'             => 'Mover esta páxina:',
-'movenotallowed'          => 'Non ten os permisos necesarios para mover páxinas.',
-'newtitle'                => 'Ao novo título:',
-'move-watch'              => 'Vixiar esta páxina',
-'movepagebtn'             => 'Mover a páxina',
-'pagemovedsub'            => 'O movemento foi un éxito',
-'movepage-moved'          => '<big>\'\'\'"$1" foi movida a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Xa existe unha páxina con ese nome, ou o nome que escolleu non é válido.
+'movearticle'                  => 'Mover esta páxina:',
+'movenologin'                  => 'Non está dentro do sistema',
+'movenologintext'              => 'Debe ser un usuario rexistrado e [[Special:UserLogin|acceder ao sistema]] para mover unha páxina.',
+'movenotallowed'               => 'Non ten os permisos necesarios para mover páxinas.',
+'movenotallowedfile'           => 'Non ten os permisos necesarios para mover ficheiros.',
+'cant-move-user-page'          => 'Non ten os permisos necesarios para mover páxinas de usuario (agás subpáxinas).',
+'cant-move-to-user-page'       => 'Non ten os permisos necesarios para mover unha páxina a unha páxina de usuario (agás a unha subpáxina).',
+'newtitle'                     => 'Ao novo título:',
+'move-watch'                   => 'Vixiar esta páxina',
+'movepagebtn'                  => 'Mover a páxina',
+'pagemovedsub'                 => 'O movemento foi un éxito',
+'movepage-moved'               => '<big>\'\'\'A páxina "$1" foi movida a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Creouse unha redirección da primeira cara á segunda.',
+'movepage-moved-noredirect'    => 'A creación da redirección da primeira cara á segunda foi cancelada.',
+'articleexists'                => 'Xa existe unha páxina con ese nome, ou o nome que escolleu non é válido.
 Por favor escolla outro nome.',
-'cantmove-titleprotected' => 'Vostede non pode mover a páxina a esta ubicación, porque o novo título foi protexido da creación',
-'talkexists'              => "'''Só foi movida con éxito a páxina, pero a páxina de conserva non puido ser movida porque xa existe unha co novo título. Por favor, mestúreas de xeito manual.'''",
-'movedto'                 => 'movido a',
-'movetalk'                => 'Mover a páxina de conversa, se cómpre',
-'move-subpages'           => 'Mover todas as subpáxinas, se cómpre',
-'move-talk-subpages'      => 'Mover todas as subpáxinas da páxina de conversa, se cómpre',
-'movepage-page-exists'    => 'A páxina "$1" xa existe e non pode ser sobreescrita automaticamente.',
-'movepage-page-moved'     => 'A páxina "$1" foi movida a "$2".',
-'movepage-page-unmoved'   => 'A páxina "$1" non pode ser movida a "$2".',
-'movepage-max-pages'      => 'Foi movido o número máximo {{PLURAL:$1|dunha páxina|de $1 páxinas}} e non poderán ser movidas automaticamente máis.',
-'1movedto2'               => 'moveu "[[$1]]" a "[[$2]]"',
-'1movedto2_redir'         => 'moveu "[[$1]]" a "[[$2]]" sobre unha redirección',
-'movelogpage'             => 'Rexistro de traslados',
-'movelogpagetext'         => 'Abaixo móstrase unha listaxe de páxinas trasladadas.',
-'movereason'              => 'Motivo:',
-'revertmove'              => 'reverter',
-'delete_and_move'         => 'Borrar e mover',
-'delete_and_move_text'    => '==Precísase borrar==
+'cantmove-titleprotected'      => 'Non pode mover a páxina a este destino, xa que o novo título foi protexido fronte á creación',
+'talkexists'                   => "'''Só foi movida con éxito a páxina, pero a páxina de conserva non puido ser movida porque xa existe unha co novo título. Por favor, mestúreas de xeito manual.'''",
+'movedto'                      => 'movido a',
+'movetalk'                     => 'Mover a páxina de conversa, se cómpre',
+'move-subpages'                => 'Mover todas as subpáxinas, se cómpre',
+'move-talk-subpages'           => 'Mover todas as subpáxinas da páxina de conversa, se cómpre',
+'movepage-page-exists'         => 'A páxina "$1" xa existe e non pode ser sobreescrita automaticamente.',
+'movepage-page-moved'          => 'A páxina "$1" foi movida a "$2".',
+'movepage-page-unmoved'        => 'A páxina "$1" non pode ser movida a "$2".',
+'movepage-max-pages'           => 'Foi movido o número máximo {{PLURAL:$1|dunha páxina|de $1 páxinas}} e non poderán ser movidas automaticamente máis.',
+'1movedto2'                    => 'moveu "[[$1]]" a "[[$2]]"',
+'1movedto2_redir'              => 'moveu "[[$1]]" a "[[$2]]" sobre unha redirección',
+'move-redirect-suppressed'     => 'redirección suprimida',
+'movelogpage'                  => 'Rexistro de traslados',
+'movelogpagetext'              => 'Abaixo móstrase unha lista de páxinas trasladadas.',
+'movereason'                   => 'Motivo:',
+'revertmove'                   => 'reverter',
+'delete_and_move'              => 'Borrar e mover',
+'delete_and_move_text'         => '==Precísase borrar==
 A páxina de destino, chamada "[[:$1]]", xa existe.
 Quérea eliminar para facer sitio para mover?',
-'delete_and_move_confirm' => 'Si, borrar a páxina',
-'delete_and_move_reason'  => 'Eliminado para facer sitio para mover',
-'selfmove'                => 'O título de orixe e o de destino é o mesmo; non se pode mover unha páxina sobre si mesma.',
-'immobile_namespace'      => 'O título de orixe ou o de destino son dunha clase especial; non poden moverse as páxinas desde ou a ese espazo de nomes.',
-'imagenocrossnamespace'   => 'Non se pode mover o ficheiro a un espazo de nomes que non o admite',
-'imagetypemismatch'       => 'A nova extensión do fiheiro non coincide co seu tipo',
-'imageinvalidfilename'    => 'O nome da imaxe é inválido',
-'fix-double-redirects'    => 'Actualizar calquera redirección que apunte cara ao título orixinal',
+'delete_and_move_confirm'      => 'Si, borrar a páxina',
+'delete_and_move_reason'       => 'Eliminado para facer sitio para mover',
+'selfmove'                     => 'O título de orixe e o de destino é o mesmo; non se pode mover unha páxina sobre si mesma.',
+'immobile-source-namespace'    => 'Non se poden mover as páxinas que están no espazo de nomes "$1"',
+'immobile-target-namespace'    => 'Non se poden mover as páxinas ao espazo de nomes "$1"',
+'immobile-target-namespace-iw' => 'A ligazón interwiki non é válida para o movemento da páxina.',
+'immobile-source-page'         => 'Esta páxina non se pode mover.',
+'immobile-target-page'         => 'Non se pode mover a ese título.',
+'imagenocrossnamespace'        => 'Non se pode mover o ficheiro a un espazo de nomes que non o admite',
+'imagetypemismatch'            => 'A nova extensión do fiheiro non coincide co seu tipo',
+'imageinvalidfilename'         => 'O nome da imaxe é inválido',
+'fix-double-redirects'         => 'Actualizar calquera redirección que apunte cara ao título orixinal',
+'move-leave-redirect'          => 'Deixar unha redirección detrás',
 
 # Export
 'export'            => 'Exportar páxinas',
@@ -1893,12 +2224,12 @@ Quérea eliminar para facer sitio para mover?',
 
 Para exportar páxinas, insira os títulos na caixa de texto que está máis abaixo, poñendo un título por liña, e se quere seleccione a versión actual e todas as versións vellas, coas liñas do historial da páxina, ou só a versión actual con información sobre a última edición.
 
-No último caso, pode usar tamén unha ligazón, por exemplo [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]], para a páxina "[[{{MediaWiki:Mainpage}}]]".',
+No último caso, pode usar tamén unha ligazón, por exemplo [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]], para a páxina "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Incluír só a revisión actual, non o historial completo',
 'exportnohistory'   => "----
 '''Aviso:''' foi desactivada a exportación do historial completo das páxinas con este formulario debido a razóns relacionadas co rendemento do servidor.",
 'export-submit'     => 'Exportar',
-'export-addcattext' => 'Engadir páxinas da categoría:',
+'export-addcattext' => 'Engadir as páxinas da categoría:',
 'export-addcat'     => 'Engadir',
 'export-download'   => 'Ofrecer gardar como un ficheiro',
 'export-templates'  => 'Incluír os modelos',
@@ -1908,8 +2239,8 @@ No último caso, pode usar tamén unha ligazón, por exemplo [[{{ns:special}}:Ex
 'allmessagesname'           => 'Nome',
 'allmessagesdefault'        => 'Texto predeterminado',
 'allmessagescurrent'        => 'Texto actual',
-'allmessagestext'           => 'Esta é unha listaxe de todas as mensaxes dispoñíbeis no espazo de nomes MediaWiki.
-Por favor, visite a [http://www.mediawiki.org/wiki/Localisation localización MediaWiki] e [http://translatewiki.net Betawiki] se quere contribuír á localización xenérica de MediaWiki.',
+'allmessagestext'           => 'Esta é unha lista de todas as mensaxes dispoñíbeis no espazo de nomes MediaWiki.
+Por favor, visite a [http://www.mediawiki.org/wiki/Localisation localización MediaWiki] e [http://translatewiki.net translatewiki.net] se quere contribuír á localización xenérica de MediaWiki.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' non está dispoñíbel porque '''\$wgUseDatabaseMessages''' está desactivado.",
 'allmessagesfilter'         => 'Filtrar polo nome da mensaxe:',
 'allmessagesmodified'       => 'Amosar só as modificadas',
@@ -1929,9 +2260,12 @@ Por favor, visite a [http://www.mediawiki.org/wiki/Localisation localización Me
 'import-interwiki-text'      => 'Seleccione o wiki e o título da páxina que queira importar.
 As datas das revisións e os nomes dos editores mantéranse.
 Todas as accións relacionadas coa importación entre wikis poden verse no [[Special:Log/import|rexistro de importacións]].',
+'import-interwiki-source'    => 'Wiki/Páxina de orixe:',
 'import-interwiki-history'   => 'Copiar todas as versións que hai no historial desta páxina',
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Espazo de nomes de destino:',
+'import-upload-filename'     => 'Nome do ficheiro:',
+'import-comment'             => 'Comentario:',
 'importtext'                 => 'Por favor, exporte o ficheiro do wiki de orixe usando a [[Special:Export|ferramenta para exportar]].
 Gráveo no seu disco duro e cárgueo aquí.',
 'importstart'                => 'Importando páxinas...',
@@ -1966,27 +2300,27 @@ Gráveo no seu disco duro e cárgueo aquí.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revisión|revisións}} de $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'A miña páxina de usuario',
+'tooltip-pt-userpage'             => 'A súa páxina de usuario',
 'tooltip-pt-anonuserpage'         => 'A páxina de usuario da IP desde a que está a editar',
-'tooltip-pt-mytalk'               => 'A miña páxina de conversa',
+'tooltip-pt-mytalk'               => 'A súa páxina de conversa',
 'tooltip-pt-anontalk'             => 'Conversa acerca de edicións feitas desde este enderezo IP',
 'tooltip-pt-preferences'          => 'As miñas preferencias',
-'tooltip-pt-watchlist'            => 'Listaxe de páxinas cuxas modificacións estou a seguir',
-'tooltip-pt-mycontris'            => 'Listaxe das miñas contribucións',
+'tooltip-pt-watchlist'            => 'Lista de páxinas cuxas modificacións estou a seguir',
+'tooltip-pt-mycontris'            => 'Lista das súas contribucións',
 'tooltip-pt-login'                => 'Recoméndaselle que acceda ao sistema, porén, non é obrigatorio.',
 'tooltip-pt-anonlogin'            => 'Recoméndaselle rexistrarse, se ben non é obrigatorio.',
 'tooltip-pt-logout'               => 'Saír do sistema',
 'tooltip-ca-talk'                 => 'Conversa acerca do contido desta páxina',
 'tooltip-ca-edit'                 => 'Pode modificar esta páxina; antes de gardala, por favor, utilice o botón de vista previa',
-'tooltip-ca-addsection'           => 'Contribúa cun comentario a esta conversa.',
+'tooltip-ca-addsection'           => 'Comezar unha nova sección',
 'tooltip-ca-viewsource'           => 'Esta páxina está protexida. Pode ver o código fonte.',
 'tooltip-ca-history'              => 'Versións anteriores desta páxina',
 'tooltip-ca-protect'              => 'Protexer esta páxina',
 'tooltip-ca-delete'               => 'Eliminar esta páxina',
 'tooltip-ca-undelete'             => 'Restaurar as edicións feitas nesta páxina antes de que fose eliminada',
 'tooltip-ca-move'                 => 'Mover esta páxina',
-'tooltip-ca-watch'                => 'Engadir esta páxina á listaxe de vixilancia',
-'tooltip-ca-unwatch'              => 'Eliminar esta páxina da súa listaxe de vixilancia',
+'tooltip-ca-watch'                => 'Engadir esta páxina á lista de vixilancia',
+'tooltip-ca-unwatch'              => 'Eliminar esta páxina da súa lista de vixilancia',
 'tooltip-search'                  => 'Procurar en {{SITENAME}}',
 'tooltip-search-go'               => 'Ir a unha páxina con este texto exacto, se existe',
 'tooltip-search-fulltext'         => 'Procurar este texto nas páxinas',
@@ -1994,17 +2328,17 @@ Gráveo no seu disco duro e cárgueo aquí.',
 'tooltip-n-mainpage'              => 'Visitar a Portada',
 'tooltip-n-portal'                => 'Acerca do proxecto, o que vostede pode facer, onde atopar cousas',
 'tooltip-n-currentevents'         => 'Atopar documentación acerca de acontecementos de actualidade',
-'tooltip-n-recentchanges'         => 'A listaxe de modificacións recentes no wiki.',
+'tooltip-n-recentchanges'         => 'A lista de modificacións recentes no wiki.',
 'tooltip-n-randompage'            => 'Carregar unha páxina ao chou',
 'tooltip-n-help'                  => 'O lugar para informarse.',
-'tooltip-t-whatlinkshere'         => 'Listaxe de todas as páxinas do wiki que ligan cara a aquí',
+'tooltip-t-whatlinkshere'         => 'Lista de todas as páxinas do wiki que ligan cara a aquí',
 'tooltip-t-recentchangeslinked'   => 'Cambios recentes nas páxinas ligadas desde esta',
 'tooltip-feed-rss'                => 'Fonte de noticias RSS para esta páxina',
 'tooltip-feed-atom'               => 'Fonte de noticias Atom para esta páxina',
-'tooltip-t-contributions'         => 'Ver a listaxe de contribucións deste usuario',
+'tooltip-t-contributions'         => 'Ver a lista de contribucións deste usuario',
 'tooltip-t-emailuser'             => 'Enviarlle unha mensaxe a este usuario por correo electrónico',
 'tooltip-t-upload'                => 'Enviar ficheiros',
-'tooltip-t-specialpages'          => 'Listaxe de todas as páxinas especiais',
+'tooltip-t-specialpages'          => 'Lista de todas as páxinas especiais',
 'tooltip-t-print'                 => 'Versión imprimíbel desta páxina',
 'tooltip-t-permalink'             => 'Ligazón permanente a esta versión da páxina',
 'tooltip-ca-nstab-main'           => 'Ver o contido da páxina',
@@ -2022,9 +2356,11 @@ Gráveo no seu disco duro e cárgueo aquí.',
 'tooltip-preview'                 => 'Vista previa dos seus cambios; por favor, úsea antes de gravalos!',
 'tooltip-diff'                    => 'Mostrar os cambios que fixo no texto',
 'tooltip-compareselectedversions' => 'Ver as diferenzas entre as dúas versións seleccionadas desta páxina',
-'tooltip-watch'                   => 'Engadir esta páxina á súa listaxe de vixilancia [alt-w]',
+'tooltip-watch'                   => 'Engadir esta páxina á súa lista de vixilancia [alt-w]',
 'tooltip-recreate'                => 'Recrear a páxina a pesar de que foi borrada',
 'tooltip-upload'                  => 'Comezar a enviar',
+'tooltip-rollback'                => '"Reverter" desfai, cun só clic, a(s) edición(s) feita(s) nesta páxina polo último contribuínte.',
+'tooltip-undo'                    => '"Desfacer" reverte esta edición e abre o formulario de edición nun modo previo. Permite engadir un motivo no resumo de edición.',
 
 # Stylesheets
 'common.css'   => '/** O CSS que se coloque aquí será aplicado a todas as aparencias */',
@@ -2040,12 +2376,12 @@ Gráveo no seu disco duro e cárgueo aquí.',
 'notacceptable'     => 'O servidor wiki non pode fornecer datos nun formato que o seu cliente poida ler.',
 
 # Attribution
-'anonymous'        => 'Usuario(s) anónimo(s) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Usuario anónimo|Usuarios anónimos}} de {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} usuario $1',
 'lastmodifiedatby' => 'A última modificación desta páxina foi o $1 as $2 por $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Baseado no traballo $1.',
 'others'           => 'outros',
-'siteusers'        => '{{SITENAME}} usuario(s) $1',
+'siteusers'        => '{{PLURAL:$2|do usuario|dos usuarios}} $1 de {{SITENAME}}',
 'creditspage'      => 'Páxina de créditos',
 'nocredits'        => 'Non hai información de créditos dispoñíbel para esta páxina.',
 
@@ -2076,20 +2412,22 @@ Isto, probabelmente, se debe a unha ligazón cara a un sitio externo que está n
 
 # Patrolling
 'markaspatrolleddiff'                 => 'Marcar como revisada',
-'markaspatrolledtext'                 => 'Marcar este artigo coma revisado',
+'markaspatrolledtext'                 => 'Marcar esta páxina como revisada',
 'markedaspatrolled'                   => 'Marcar coma revisado',
 'markedaspatrolledtext'               => 'A revisión seleccionada foi marcada como revisada.',
-'rcpatroldisabled'                    => 'Patrulla dos cambios recentes deshabilitada',
-'rcpatroldisabledtext'                => 'A funcionalidade da Patrulla de Cambios Recentes está deshabilitada actualmente.',
+'rcpatroldisabled'                    => 'A patrulla dos cambios recentes está desactivada',
+'rcpatroldisabledtext'                => 'A funcionalidade da patrulla dos cambios recentes está actualmente desactivada.',
 'markedaspatrollederror'              => 'Non se pode marcar coma revisada',
 'markedaspatrollederrortext'          => 'É preciso especificar unha revisión para marcala como revisada.',
 'markedaspatrollederror-noautopatrol' => 'Non está permitido que un mesmo marque as propias edicións como revisadas.',
 
 # Patrol log
-'patrol-log-page'   => 'Rexistro de revisións',
-'patrol-log-header' => 'Este é un rexistro das revisións patrulladas.',
-'patrol-log-line'   => 'marcou a $1 de "$2" como revisada $3',
-'patrol-log-auto'   => '(automático)',
+'patrol-log-page'      => 'Rexistro de revisións',
+'patrol-log-header'    => 'Este é un rexistro das revisións patrulladas.',
+'patrol-log-line'      => 'marcou a $1 de "$2" como revisada $3',
+'patrol-log-auto'      => '(automático)',
+'patrol-log-diff'      => 'revisión $1',
+'log-show-hide-patrol' => '$1 o rexistro de patrullas',
 
 # Image deletion
 'deletedrevision'                 => 'A revisión vella $1 foi borrada.',
@@ -2106,6 +2444,9 @@ $1',
 'previousdiff' => '� Edición máis vella',
 'nextdiff'     => 'Edición máis nova →',
 
+# Visual comparison
+'visual-comparison' => 'Comparación visual',
+
 # Media information
 'mediawarning'         => "'''Aviso''': este ficheiro pode conter código malicioso; o seu sistema pode quedar comprometido se chega a executalo.<hr />",
 'imagemaxsize'         => 'Limitar as imaxes nas páxinas de descrición de ficheiros a:',
@@ -2118,10 +2459,12 @@ $1',
 'show-big-image'       => 'Imaxe na máxima resolución',
 'show-big-image-thumb' => '<small>Tamaño desta presentación da imaxe: $1 × $2 píxeles</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galería de imaxes novas',
-'imagelisttext'         => "Abaixo amósase unha listaxe de '''$1''' {{PLURAL:$1|ficheiro|ficheiros}} ordenados $2.",
+'imagelisttext'         => "Abaixo amósase unha lista de '''$1''' {{PLURAL:$1|ficheiro|ficheiros}} ordenados $2.",
 'newimages-summary'     => 'Esta páxina especial amosa os ficheiros cargados máis recentemente.',
+'newimages-legend'      => 'Filtro',
+'newimages-label'       => 'Nome do ficheiro (ou parte del):',
 'showhidebots'          => '($1 os bots)',
 'noimages'              => 'Non hai imaxes para ver.',
 'ilsubmit'              => 'Procurar',
@@ -2134,7 +2477,7 @@ $1',
 # Bad image list
 'bad_image_list' => 'O formato é o seguinte:
 
-Só se consideran os elementos dunha listaxe (liñas que comezan por *). A primeira ligazón dunha liña ten que apuntar para unha imaxe mala.
+Só se consideran os elementos dunha lista (liñas que comezan por *). A primeira ligazón dunha liña ten que apuntar para unha imaxe mala.
 As ligazóns posteriores da mesma liña considéranse excepcións, isto é, páxinas nas que o ficheiro pode aparecer inserido na liña.',
 
 # Metadata
@@ -2329,6 +2672,18 @@ Outros agocharanse por omisión.
 'exif-lightsource-24'  => 'Tungsteno de estudio ISO',
 'exif-lightsource-255' => 'Outra fonte de luz',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Non se disparou o flash',
+'exif-flash-fired-1'    => 'Flash disparado',
+'exif-flash-return-0'   => 'sen a función de detección do retorno da luz',
+'exif-flash-return-2'   => 'non se detectou a función do retorno da luz',
+'exif-flash-return-3'   => 'detectouse a función do retorno da luz',
+'exif-flash-mode-1'     => 'disparo obrigatorio do flash',
+'exif-flash-mode-2'     => 'disparo do flash desactivado',
+'exif-flash-mode-3'     => 'modo automático',
+'exif-flash-function-1' => 'Sen función flash',
+'exif-flash-redeye-1'   => 'modo de redución de ollos vermellos',
+
 'exif-focalplaneresolutionunit-2' => 'polgadas',
 
 'exif-sensingmethod-1' => 'Sen definir',
@@ -2464,26 +2819,15 @@ $1
 
 # Delete conflict
 'deletedwhileediting' => "'''Aviso:''' esta páxina foi borrada despois de que comezase a editala!",
-'confirmrecreate'     => "O usuario [[User:$1|$1]] ([[User talk:$1|disc.]]) borrou este artigo despois de que vostede comezara a editalo, polo seguinte motivo:
+'confirmrecreate'     => "O usuario [[User:$1|$1]] ([[User talk:$1|conversa]]) borrou este artigo despois de que vostede comezara a editalo, dando o seguinte motivo:
 : ''$2'' 
-Por favor confirme que realmente quere crear o artigo de novo.",
+Por favor, confirme que realmente quere recrear esta páxina.",
 'recreate'            => 'Recrear',
 
-# HTML dump
-'redirectingto' => 'Redirixindo cara a "[[$1]]"...',
-
 # action=purge
-'confirm_purge'        => 'Está seguro de que desexa limpar a memoria caché desta páxina?
-
-$1',
 'confirm_purge_button' => 'Si',
-
-# AJAX search
-'searchcontaining' => "Procurar artigos que conteñan ''$1''.",
-'searchnamed'      => "Buscar artigos chamados ''$1''.",
-'articletitles'    => "Artigos que comezan por ''$1''",
-'hideresults'      => 'Agochar resultados',
-'useajaxsearch'    => 'Usar a procura AJAX',
+'confirm-purge-top'    => 'Está seguro de que desexa limpar a memoria caché desta páxina?',
+'confirm-purge-bottom' => 'Ao purgar unha páxina, límpase a memoria caché e isto obriga tamén a que apareza a versión máis recente da páxina.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� páxina anterior',
@@ -2506,7 +2850,7 @@ $1',
 'autosumm-blank'   => 'O contido da páxina foi eliminado',
 'autosumm-replace' => 'O contido da páxina foi substituído por "$1"',
 'autoredircomment' => 'Redirixida cara a "[[$1]]"',
-'autosumm-new'     => 'Nova páxina: $1',
+'autosumm-new'     => 'Nova páxina: "$1"',
 
 # Live preview
 'livepreview-loading' => 'Cargando…',
@@ -2521,33 +2865,34 @@ Tente a vista previa normal.',
 'lag-warn-high'   => 'Debido a unha gran demora do servidor da base de datos, pode que nesta lista non aparezan os cambios feitos {{PLURAL:$1|no último segundo|nos últimos $1 segundos}}.',
 
 # Watchlist editor
-'watchlistedit-numitems'       => 'A súa listaxe de vixilancia inclúe {{PLURAL:$1|un título|$1 títulos}}, excluíndo as páxinas de conversa.',
-'watchlistedit-noitems'        => 'A súa listaxe de vixilancia non contén ningún título.',
-'watchlistedit-normal-title'   => 'Editar a listaxe de vixilancia',
-'watchlistedit-normal-legend'  => 'Eliminar títulos da listaxe de vixilancia',
-'watchlistedit-normal-explain' => 'Os títulos da súa listaxe de vixilancia aparecen embaixo.
+'watchlistedit-numitems'       => 'A súa lista de vixilancia inclúe {{PLURAL:$1|un título|$1 títulos}}, excluíndo as páxinas de conversa.',
+'watchlistedit-noitems'        => 'A súa lista de vixilancia non contén ningún título.',
+'watchlistedit-normal-title'   => 'Editar a lista de vixilancia',
+'watchlistedit-normal-legend'  => 'Eliminar títulos da lista de vixilancia',
+'watchlistedit-normal-explain' => 'Os títulos da súa lista de vixilancia aparecen embaixo.
 Para eliminar un título, escóllao na súa caixa de selección e prema en "Eliminar os títulos".
-Tamén pode [[Special:Watchlist/raw|editar a listaxe simple]].',
+Tamén pode [[Special:Watchlist/raw|editar a lista simple]].',
 'watchlistedit-normal-submit'  => 'Eliminar os títulos',
-'watchlistedit-normal-done'    => '{{PLURAL:$1|Eliminouse un título|Elimináronse $1 títulos}} da súa listaxe de vixilancia:',
-'watchlistedit-raw-title'      => 'Editar a listaxe de vixilancia simple',
-'watchlistedit-raw-legend'     => 'Editar a listaxe de vixilancia simple',
-'watchlistedit-raw-explain'    => 'Os títulos da súa listaxe de vixilancia aparecen embaixo e pódense editar engadíndoos ou retirándoos da listaxe; un título por liña.
-Ao rematar, prema en "Actualizar a listaxe de vixilancia".
+'watchlistedit-normal-done'    => '{{PLURAL:$1|Eliminouse un título|Elimináronse $1 títulos}} da súa lista de vixilancia:',
+'watchlistedit-raw-title'      => 'Editar a lista de vixilancia simple',
+'watchlistedit-raw-legend'     => 'Editar a lista de vixilancia simple',
+'watchlistedit-raw-explain'    => 'Os títulos da súa lista de vixilancia aparecen embaixo e pódense editar engadíndoos ou retirándoos da lista; un título por liña.
+Ao rematar, prema en "Actualizar a lista de vixilancia".
 Tamén pode [[Special:Watchlist/edit|empregar o editor normal]].',
 'watchlistedit-raw-titles'     => 'Títulos:',
-'watchlistedit-raw-submit'     => 'Actualizar a listaxe de vixilancia',
-'watchlistedit-raw-done'       => 'Actualizouse a súa listaxe de vixilancia.',
+'watchlistedit-raw-submit'     => 'Actualizar a lista de vixilancia',
+'watchlistedit-raw-done'       => 'Actualizouse a súa lista de vixilancia.',
 'watchlistedit-raw-added'      => '{{PLURAL:$1|Engadiuse un título|Engadíronse $1 títulos}}:',
 'watchlistedit-raw-removed'    => '{{PLURAL:$1|Eliminouse un título|Elimináronse $1 títulos}}:',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Ver as modificacións relevantes',
-'watchlisttools-edit' => 'Ver e editar a listaxe de vixilancia',
-'watchlisttools-raw'  => 'Editar a listaxe de vixilancia simple',
+'watchlisttools-edit' => 'Ver e editar a lista de vixilancia',
+'watchlisttools-raw'  => 'Editar a lista de vixilancia simple',
 
 # Core parser functions
 'unknown_extension_tag' => 'Etiqueta de extensión descoñecida "$1"',
+'duplicate-defaultsort' => 'Aviso: a clave de ordenación por defecto "$2" anula a clave de ordenación anterior por defecto "$1".',
 
 # Special:Version
 'version'                          => 'Versión', # Not used as normal message but as header for the special page itself
@@ -2577,13 +2922,13 @@ Tamén pode [[Special:Watchlist/edit|empregar o editor normal]].',
 'filepath-summary' => 'Esta páxina especial devolve a ruta completa a un ficheiro.
 As imaxes móstranse na súa resolución completa; outros tipos de ficheiros inícianse directamente co seu programa asociado.
 
-Introduza o nome do ficheiro sen o prefixo "{{ns:image}}:"',
+Introduza o nome do ficheiro sen o prefixo "{{ns:file}}:"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Procurar ficheiros duplicados',
 'fileduplicatesearch-summary'  => 'Procurar ficheiros duplicados a partir do valor de <i>hash</i> (un mecanismo de comprobación).
 
-Introduza o nome do ficheiro sen o prefixo "{{ns:image}}:".',
+Introduza o nome do ficheiro sen o prefixo "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Procurar un duplicado',
 'fileduplicatesearch-filename' => 'Nome do ficheiro:',
 'fileduplicatesearch-submit'   => 'Procurar',
@@ -2613,4 +2958,13 @@ Introduza o nome do ficheiro sen o prefixo "{{ns:image}}:".',
 'blankpage'              => 'Baleirar a páxina',
 'intentionallyblankpage' => 'Esta páxina foi baleirada intencionadamente',
 
+# External image whitelist
+'external_image_whitelist' => ' #Deixe esta liña tal e como está<pre>
+#Poña embaixo fragmentos de expresións regulares (tan só a parte que vai entre //)
+#Isto coincidirá cos enderezos URL das imaxes externas (hotlinked)
+#Aquelas que coincidan serán amosadas como imaxes, senón, só será amosada unha ligazón cara a esta
+#As liñas que comecen por "#" trátanse de comentarios
+
+#Poña todos os fragmentos por riba desta liña. Deixe esta liña tal e como está</pre>',
+
 );
diff --git a/languages/messages/MessagesGlk.php b/languages/messages/MessagesGlk.php
index 68a69249..11555f38 100644
--- a/languages/messages/MessagesGlk.php
+++ b/languages/messages/MessagesGlk.php
@@ -11,8 +11,14 @@
 $fallback = 'fa';
 
 $messages = array(
-'qbedit' => 'دچین واچین',
+'qbfind'        => 'یاتن',
+'qbedit'        => 'دچین واچین',
+'moredotdotdot' => 'ویشتر...',
+'mypage'        => 'می هنه‌شر',
+'mytalk'        => 'می گب',
+'anontalk'      => 'اَ آی.پیˇ گب',
 
+'returnto'         => 'واگرد به $1.',
 'search'           => 'واموج',
 'searchbutton'     => 'واموج',
 'go'               => 'بوشو',
@@ -21,8 +27,14 @@ $messages = array(
 'printableversion' => 'پرینتی نوسخه',
 'permalink'        => 'مؤنسنی پیوند',
 'edit'             => 'دچین واچین',
+'editthispage'     => 'اَ هنه‌شره (ص�حه‌یه) دچین‌واچین بکون.',
+'create-this-page' => 'اَ هنه‌شره (ص�حه‌یه) چاکون.',
+'deletethispage'   => 'اَ هنه‌شره پاکأ کون.',
+'newpage'          => 'تازه هنه‌شر (تازه ص�حه)',
 'talkpagelinktext' => 'گب',
+'talk'             => 'گب',
 'toolbox'          => 'ابزار جیگا',
+'jumpto'           => 'واز بکون به:',
 'jumptonavigation' => 'گردسن',
 'jumptosearch'     => 'واموج',
 
@@ -33,7 +45,31 @@ $messages = array(
 'portal'               => 'امه جیگا',
 'privacy'              => 'رازبداری',
 
+'editsection' => 'دچین‌واچین',
+'editold'     => 'دچین‌واچین',
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-main'     => 'وانیویس (مقاله)',
+'nstab-user'     => 'کاربری هنه‌شر',
+'nstab-category' => 'رج',
+
+# Search results
+'searchresults'       => 'واموج‌دموجˇ نتایج',
+'searchresults-title' => 'واموج‌دموجˇ نتایج، «$1»ˇ واسی',
+'searchsubtitle'      => "شمه '''[[:$1]]''' ره واموتید ([[Special:Prefixindex/$1|هنه‌شرانی (ص�حه‌هایی) کی «$1» همره سرأ گی�ته بیدی (شوروع بیدی).]]{{int:pipe-separator}}
+[[Special:WhatLinksHere/$1|او هنه‌شرانی (ص�حه‌هایی) کی به «$1» خال (لینک) بدأیید]])",
+
+# Special:AllPages
+'allpagessubmit' => 'بشو',
+
 # Special:Categories
 'categories' => 'رجؤن',
 
+# Block/unblock
+'blocklink' => 'دَوَسته ببه',
+
+# Tooltip help for the actions
+'tooltip-ca-edit'    => 'شمه تانید اَ هنه‌شره (ص�حه) دچین‌واچین بکونید. بی‌زحمت قبل از ان‌کی ذخیره بکونید، پیش‌نمایشˇ دوکمه جا است�اده بکونید.',
+'tooltip-ca-history' => 'اَ هنه‌شر (ص�حه)ˇ قدیمی نسخه‌یان',
+
 );
diff --git a/languages/messages/MessagesGn.php b/languages/messages/MessagesGn.php
index 1669674c..c65f4920 100644
--- a/languages/messages/MessagesGn.php
+++ b/languages/messages/MessagesGn.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Puruhára_myangekõi',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_myangekõi',
-	NS_IMAGE            => 'Ta\'ãnga',
-	NS_IMAGE_TALK       => 'Ta\'ãnga_myangekõi',
+	NS_FILE             => 'Ta\'ãnga',
+	NS_FILE_TALK        => 'Ta\'ãnga_myangekõi',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_myangekõi',
 	NS_TEMPLATE         => 'Tembiecharã',
@@ -163,16 +163,23 @@ $messages = array(
 'showtoc'                 => 'hechauka',
 'hidetoc'                 => 'toñemi',
 'restorelink'             => '$1 ediciones borradas',
+'red-link-title'          => '$1 (ndaipóri ko togue)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Kuatiahai',
 'nstab-user'      => 'Puruhára',
+'nstab-media'     => 'Media rogue',
 'nstab-special'   => "Mba'echĩchĩ",
-'nstab-image'     => "Ta'ãnga",
+'nstab-project'   => "Mba'e apopyrã rogue",
+'nstab-image'     => 'Ñongatupy',
 'nstab-mediawiki' => 'Marandu',
 'nstab-template'  => 'Tembiecharã',
+'nstab-help'      => 'Pytyvõ',
 'nstab-category'  => 'Ñemohenda',
 
+# Main script and global functions
+'nosuchaction' => 'Upe tembiapo ndaipóri',
+
 # General errors
 'ns-specialprotected' => 'Las páginas en el espacio de nombres Especial no se pueden editar.',
 
@@ -213,15 +220,15 @@ $messages = array(
 'hr_tip'        => 'Haipuku oñenóva (eipurúke tekotevẽ javénte)',
 
 # Edit pages
-'summary'               => 'Jehaimombyky',
-'subject'               => "Mba'ekuaarã/teraete",
+'summary'               => 'Jehaimombyky:',
+'subject'               => "Mba'ekuaarã/teraete:",
 'minoredit'             => "Kóva ha'e peteĩ jehai mbyky",
 'watchthis'             => 'Toñeñangareko ko tembiapóre',
 'savearticle'           => 'Hai',
 'showpreview'           => 'Tojechauka jehai ñemboguapy mboyve',
 'showdiff'              => 'Tojechauka ñemoambue',
 'missingsummary'        => "'''Atención:''' No has escrito un resumen de edición. Si haces clic nuevamente en «Hai» tu edición se grabará sin él.",
-'subject-preview'       => "Previsualización del mba'ekuaarã/teraete",
+'subject-preview'       => "Previsualización del mba'ekuaarã/teraete:",
 'newarticletext'        => "Rehapykuehókuri peteĩ joaju peteĩ kuatiarogue ndaipórivape.
 Nde remoheñoisérõ ko kuatiarogue, eñepyrũkatu ehai.
 Reikotevẽvérõ marandu, emoñe'ẽ kuatiarogue ñepytyvõ rehegua. Oiméramo reikereínte térã rejavyhaguére, upéicharõ terehojey [[{{MediaWiki:Helppage}}|kuatiarogue mboyveguápe]].",
@@ -230,8 +237,8 @@ Reikotevẽvérõ marandu, emoñe'ẽ kuatiarogue ñepytyvõ rehegua. Oiméramo
 'editingsection'        => 'Ojehaihína $1 (vore)',
 'editingcomment'        => 'Ojehaihína $1 (comentario)',
 'yourtext'              => "Mba'ehaipyre",
-'longpagewarning'       => "<strong>Ejesarekóke: ko kuatiarogue, tuichakuépe, oguereko $1 kb; heta kundahára ikatu iñapañuãi jehaijeýpe kuatiarogue ohaságui 32 kb.
-Aipórõ, eñeha'ãna emboja'o ne rembiapo, vore michĩvévape.</strong>",
+'longpagewarning'       => "'''Ejesarekóke: ko kuatiarogue, tuichakuépe, oguereko $1 kb; heta kundahára ikatu iñapañuãi jehaijeýpe kuatiarogue ohaságui 32 kb.
+Aipórõ, eñeha'ãna emboja'o ne rembiapo, vore michĩvévape.'''",
 
 # History pages
 'cur'         => "ko'ag̃agua",
@@ -304,11 +311,11 @@ Reomĩsérõ ta'ãnga peteĩ kuatiaroguépe, eipuru peteĩ joaju:
 '''<nowiki>[[</nowiki>Media<nowiki>:Archivo.ogg]]</nowiki>''' ojoaju hag̃ua hekopete pe jehai'atýre.",
 'filename'   => "Téra jehai'aty",
 
-# Special:ImageList
-'imagelist'      => "Ta'ãnga rysýi",
-'imagelist_user' => 'Puruhára',
+# Special:ListFiles
+'listfiles'      => "Ta'ãnga rysýi",
+'listfiles_user' => 'Puruhára',
 
-# Image description page
+# File description page
 'filehist-revert'   => 'embojevy',
 'filehist-current'  => "ko'ag̃agua",
 'filehist-datetime' => '�ra/Aravo',
@@ -396,7 +403,15 @@ Reomĩsérõ ta'ãnga peteĩ kuatiaroguépe, eipuru peteĩ joaju:
 
 # Special:AllPages
 'allpages'          => 'Opaite kuatiarogue',
+'alphaindexline'    => '$1 $2 peve',
+'nextpage'          => 'Kuatia rogue upeigua($1)',
+'prevpage'          => 'Kuatia rogue mboyvegua ($1)',
+'allpagesfrom'      => 'Ehechauka kuatia rogue oñepyrũva:   -pe',
+'allpagesto'        => 'Ehechauka kuatia rogue opáva:  -pe',
+'allarticles'       => 'Opa kuatia rogue',
+'allinnamespace'    => "Opa kuatia rogue (pa'Å© $1)",
 'allnotinnamespace' => 'Opaite kuatiarogue (fuera del espacio $1)',
+'allpagesprev'      => 'Mboyvegua',
 'allpagesnext'      => 'Upeigua',
 'allpagessubmit'    => 'Hechauka',
 
@@ -416,13 +431,18 @@ Reomĩsérõ ta'ãnga peteĩ kuatiaroguépe, eipuru peteĩ joaju:
 'mywatchlist' => 'Tapykueho rysýi',
 'watch'       => 'Ñangareko',
 
-# Delete/protect/revert
+# Delete
 'deletedarticle' => 'oñembogue "[[$1]]"',
 'dellogpage'     => 'Ñemboguepyre ñonagatupy',
 'deletionlog'    => 'ñemboguepyre ñonagatupy',
+
+# Rollback
 'rollback_short' => 'Embojevy',
 'rollbacklink'   => 'Embojevy',
-'protect-text'   => 'Puedes ver y modificar el nivel de protección de la página <strong>$1</strong>.',
+
+# Protect
+'prot_1movedto2' => '[[$1]] oñembohasa [[$2]]-pe',
+'protect-text'   => "Puedes ver y modificar el nivel de protección de la página '''$1'''.",
 
 # Undelete
 'undeletedrevisions'       => '$1 ediciones restauradas',
@@ -446,7 +466,6 @@ Reomĩsérõ ta'ãnga peteĩ kuatiaroguépe, eipuru peteĩ joaju:
 'whatlinkshere'       => "Oñembojoajukuaáva ko'ápe",
 'whatlinkshere-title' => 'Kuatiarogue ojoajúva "$1" rehe',
 'whatlinkshere-page'  => 'Kuatiarogue:',
-'linklistsub'         => '(Joajukuéra rysýi)',
 'linkshere'           => "Ko'ã kuatiarogue ojoaju '''[[:$1]]''' rehe:",
 'whatlinkshere-prev'  => 'mboyvegua $1',
 'whatlinkshere-next'  => 'upeigua $1',
@@ -488,6 +507,7 @@ Reomĩsérõ ta'ãnga peteĩ kuatiaroguépe, eipuru peteĩ joaju:
 'tooltip-pt-mycontris'   => "Tysỹi che mba'emoĩmbyre",
 'tooltip-ca-move'        => 'Guerova kuatiarogue',
 'tooltip-p-logo'         => 'Ape',
+'tooltip-n-mainpage'     => 'Eho ijapépe',
 
 # Spam protection
 'spamprotectiontitle' => 'Filtro de protección contra spam',
@@ -500,7 +520,7 @@ Reomĩsérõ ta'ãnga peteĩ kuatiaroguépe, eipuru peteĩ joaju:
 # Media information
 'file-info' => "(tamaño de jehai'aty: $1; tipo MIME: $2)",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => "Ta'ãnga pyahu renda",
 'ilsubmit'  => 'Jeheka',
 
diff --git a/languages/messages/MessagesGot.php b/languages/messages/MessagesGot.php
index 30d0e07c..c68050b7 100644
--- a/languages/messages/MessagesGot.php
+++ b/languages/messages/MessagesGot.php
@@ -1,5 +1,5 @@
 <?php
-/** Gothic (������)
+/** Gothic (Gothic)
  *
  * @ingroup Language
  * @file
@@ -80,7 +80,7 @@ $messages = array(
 'moredotdotdot'  => 'Máis...',
 'mypage'         => '���� �����',
 'mytalk'         => '����� ������',
-'and'            => 'jah',
+'and'            => '&#32;jah',
 
 # Metadata in edit box
 'metadata_help' => 'Ufardata:',
@@ -123,7 +123,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ufar {{SITENAME}}',
 'aboutpage'            => 'Project:Ufar',
-'bugreports'           => '�����������������',
 'copyrightpage'        => '{{ns:project}}:Manleikawitoþa',
 'currentevents'        => 'Niuja waíhts',
 'currentevents-url'    => 'Project:Nu her',
@@ -197,8 +196,8 @@ $messages = array(
 'hr_tip'          => 'Ráihtsbáurd (brukjan miþ niufarussus)',
 
 # Edit pages
-'summary'                => 'Máidjanspillon',
-'subject'                => 'Háubidaboka',
+'summary'                => 'Máidjanspillon:',
+'subject'                => 'Háubidaboka:',
 'minoredit'              => 'Sa ist lietila máideins',
 'watchthis'              => '����� �����',
 'savearticle'            => 'Melja seido',
@@ -207,7 +206,7 @@ $messages = array(
 'showdiff'               => 'Witan máideins',
 'newarticle'             => '(Niu)',
 'updated'                => '(Nuwisan)',
-'previewnote'            => '<strong>Sah ist faúrsaiƕa. Máideins gameljiþ ni af þizos seidos!</strong>',
+'previewnote'            => "'''Sah ist faúrsaiƕa. Máideins gameljiþ ni af þizos seidos!'''",
 'editing'                => 'Máidjan af $1',
 'editingsection'         => 'Máidjan af $1 (fera)',
 'editingcomment'         => 'Máidjan af $1 (rodjafera)',
@@ -218,7 +217,7 @@ $messages = array(
 # History pages
 'currentrev'          => 'Nu máideins',
 'revisionasof'        => 'Gamelido us $1',
-'revision-info'       => 'Máideins fram $1 bi $2',
+'revision-info'       => 'Máideins fram $1 bi $2', # Additionally available: $3: revision id
 'previousrevision'    => '��iris Máideins',
 'nextrevision'        => 'Iftuma máideins→',
 'currentrevisionlink' => 'Numáideins',
@@ -239,15 +238,17 @@ $messages = array(
 'editundo'      => 'niuskapjan',
 
 # Search results
-'prevn'        => 'aftuma $1',
-'nextn'        => 'iftuma $1',
-'viewprevnext' => 'Siuneis ($1) ($2) ($3)',
-'powersearch'  => 'Sokeiþ',
+'prevn'          => 'aftuma $1',
+'nextn'          => 'iftuma $1',
+'viewprevnext'   => 'Siuneis ($1) ($2) ($3)',
+'searchhelp-url' => 'Hilpa:Háubidaseido',
+'powersearch'    => 'Sokeiþ',
 
 # Preferences page
 'preferences'       => 'Meinos brukjamaideineis',
 'mypreferences'     => '������ ������',
 'skin'              => 'Seidofill',
+'skin-preview'      => 'Faúrsaiƕa',
 'saveprefs'         => 'Melja',
 'searchresultshead' => 'Sokeiþ',
 
@@ -283,11 +284,11 @@ $messages = array(
 'uploadedimage'   => 'ushlaþiþ "[[$1]]"',
 'watchthisupload' => 'Witan so seido',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'   => 'Feilans',
-'imagelist' => 'Feilans tala',
+'listfiles' => 'Feilans tala',
 
-# Image description page
+# File description page
 'filehist'            => 'Feilans áiris',
 'filehist-current'    => 'nu',
 'filehist-datetime'   => 'Ƕeila',
@@ -311,7 +312,6 @@ $messages = array(
 
 # Statistics
 'statistics' => 'Seidostatistik',
-'sitestats'  => '{{SITENAME}} seidostatistik',
 
 'brokenredirects-edit'   => '(máidjan)',
 'brokenredirects-delete' => '(taíran)',
@@ -334,7 +334,6 @@ $messages = array(
 'speciallogtitlelabel' => 'Namo:',
 'log'                  => 'Logbokos',
 'all-logs-page'        => 'Alla logos',
-'log-search-submit'    => 'Afgaggan',
 
 # Special:AllPages
 'allpages'       => 'Allis seidos',
@@ -347,18 +346,20 @@ $messages = array(
 # Special:Categories
 'categories' => '������',
 
+# Special:LinkSearch
+'linksearch-ns' => 'Seidofera:',
+
 # E-mail user
 'emailuser' => 'Sandjan þo niutand bokom',
 
 # Watchlist
-'watchlist'            => '������ �������������',
-'mywatchlist'          => '������ �������������',
-'watchlistfor'         => "(fáur '''$1''')",
-'watch'                => '�����',
-'watchthispage'        => '����� �����',
-'unwatch'              => '�������',
-'watchlist-details'    => '{{PLURAL:$1|$1 seido|$1 seidona}} witáiþs inu maþleiseidam.',
-'watchlist-hide-minor' => 'Filhan leitila máideins',
+'watchlist'         => '������ �������������',
+'mywatchlist'       => '������ �������������',
+'watchlistfor'      => "(fáur '''$1''')",
+'watch'             => '�����',
+'watchthispage'     => '����� �����',
+'unwatch'           => '�������',
+'watchlist-details' => '{{PLURAL:$1|$1 seido|$1 seidona}} witáiþs inu maþleiseidam.',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Wita...',
@@ -366,7 +367,7 @@ $messages = array(
 
 'created' => 'gaskapjan',
 
-# Delete/protect/revert
+# Delete
 'deletepage'            => 'Taíra seido',
 'delete-legend'         => 'Taíran',
 'actioncomplete'        => 'Wasuh Ita Gaustiuhan',
@@ -374,12 +375,17 @@ $messages = array(
 'dellogpage'            => 'Taíra áirwboka',
 'deleteotherreason'     => 'Anþar/máis mitons:',
 'deletereasonotherlist' => 'Anþar mitons',
-'rollbacklink'          => 'afwalwjan',
-'protectlogpage'        => 'Log af Baírgjan',
-'protect-unchain'       => 'Ungalukan sa skiubanfreihals',
-'protect-level-sysop'   => 'Seidofaþs áinaha',
-'protect-expiring'      => 'bláuþiþ $1 (UTC)',
-'restriction-type'      => 'Freihals:',
+
+# Rollback
+'rollbacklink' => 'afwalwjan',
+
+# Protect
+'protectlogpage'      => 'Log af Baírgjan',
+'prot_1movedto2'      => '[[$1]] skiubiþ du [[$2]]',
+'protect-unchain'     => 'Ungalukan sa skiubanfreihals',
+'protect-level-sysop' => 'Seidofaþs áinaha',
+'protect-expiring'    => 'bláuþiþ $1 (UTC)',
+'restriction-type'    => 'Freihals:',
 
 # Restrictions (nouns)
 'restriction-edit' => 'Máidjan',
@@ -408,7 +414,6 @@ $messages = array(
 # What links here
 'whatlinkshere'       => '������ ������� ��������� �����',
 'whatlinkshere-title' => 'Seidos hwarjis du $1 táiknjan',
-'linklistsub'         => '(Tala af táikjanbanjam)',
 'isredirect'          => 'táikjaseido',
 'istemplate'          => 'ináukan',
 'whatlinkshere-prev'  => '{{PLURAL:$1|aftuma|aftumans $1}}',
@@ -465,7 +470,7 @@ $messages = array(
 # Media information
 'show-big-image' => 'Fullis wahstus',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Sokeiþ',
 
 # Metadata
diff --git a/languages/messages/MessagesGrc.php b/languages/messages/MessagesGrc.php
index a54d3ba2..5188ff2f 100644
--- a/languages/messages/MessagesGrc.php
+++ b/languages/messages/MessagesGrc.php
@@ -35,13 +35,13 @@ $messages = array(
 'tog-underline'               => 'Ὑπογ�αμμίζειν συνδέσμους:',
 'tog-highlightbroken'         => 'Μο�φοῦν ἀπωλομένους συνδέσμους <a href="" class="new">ο�τωσὶ</a> (ἄλλως: ο�τωσὶ <a href="" class="internal">;</a>).',
 'tog-justify'                 => 'Στοιχίζειν πα�αγ�άφους',
-'tog-hideminor'               => 'Κ��πτειν μικ�ὰς μεταγ�αφὰς �ν π�οσφάτοις ἀλλαγαῖς',
+'tog-hideminor'               => 'Κ��πτειν ἥττονας μεταγ�αφὰς �ν π�οσφάτοις ἀλλαγαῖς',
 'tog-extendwatchlist'         => 'Ἐφο�οδιαλογὴν �κτείνειν ἵνα ἅπασαι φανῶσιν αἱ ��μόδιαι ἀλλαγαὶ',
 'tog-usenewrc'                => 'Π�οσκεκοσμημέναι π�όσφατοι ἀλλαγαὶ (JavaScript)',
 'tog-numberheadings'          => 'Ἐξα�ιθμεῖν �πικεφαλίδας α�τομάτως',
 'tog-showtoolbar'             => 'Δεικν�ναι τὴν τῶν ��γαλείων μεταγ�αφῆς μετώπην (JavaScript)',
 'tog-editondblclick'          => 'Ἐπὶ δέλτων δὶς θλίψας, μετάγ�αψον α�τὰς (JavaScript)',
-'tog-editsection'             => 'Τμῆμα διὰ συνδέσμου [μεταγ�άφειν] μεταγ�άφειν πα�έχειν',
+'tog-editsection'             => 'Τμήματος μεταγ�αφὴν διὰ συνδέσμου [μεταγ�αφὴ] πα�έχειν',
 'tog-editsectiononrightclick' => 'Τμῆμα μεταγ�άφειν πα�έχειν <br /> διὰ τίτλον δεξιῷ ὀμφαλῷ θλίβειν (JavaScript)',
 'tog-showtoc'                 => 'Δεικν�ναι πίνακα πε�ιεχομένων (�ν δέλτοις πε�ιεχο�σαις πλείους τῶν 3 �πικεφαλίδων)',
 'tog-rememberpassword'        => 'Ἐνθυμεῖσθαι τὴν �μὴν σ�νδεσιν �ν τῇδε τῇ ὑπολογιστικῇ μηχανῇ',
@@ -65,18 +65,19 @@ $messages = array(
 'tog-showjumplinks'           => 'Ἐνε�γοποιεῖν τοὺς "ἅλμα π�ὸς" συνδέσμους π�οσβασιμότητος',
 'tog-uselivepreview'          => 'Χ�ῆσθαι ἄμεσον π�οθεώ�ησιν (JavaScript) (Πει�αστικόν)',
 'tog-forceeditsummary'        => 'Π�ομήνυσόν με εἰ εἰσάγω κενὴν σ�νοψιν μεταγ�αφῆς',
-'tog-watchlisthideown'        => 'Ο� δηλοῦν τὰς �μὰς μεταβολὴς �ν τὰ �φο�ώμενά μου',
+'tog-watchlisthideown'        => 'Ο� δηλοῦν τὰς �μὰς μεταβολὰς �ν τοῖς �φο�ωμένοις μου',
 'tog-watchlisthidebots'       => 'Ἀποκ��πτειν τὰς α�τόματους μεταγ�αφὰς �κ τῆς �φο�οδιαλογῆς',
 'tog-watchlisthideminor'      => 'Ο� δηλοῦν τὰς μικ�ὰς μεταβολὰς �ν τὰ �φο�ώμενά μου',
+'tog-watchlisthideliu'        => 'Κ��πτειν τὰς μεταγ�αφὰς τῶν συνδεδεμένων χ�ωμένων ὑπὸ τὴν �φο�οδιαλογήν μου',
+'tog-watchlisthideanons'      => 'Κ��πτειν τὰς μεταγ�αφὰς τῶν ἀνων�μων χ�ωμένων ὑπὸ τὴν �φο�οδιαλογήν μου',
 'tog-ccmeonemails'            => "Στεῖλόν μοι ἀντίγ�αφα τῶν ἠ-�πιστολῶν τῶν ἀπεσταλμένων ὑπ' �μοῦ π�ὸς ἑτέ�ους χ�ωμένους",
 'tog-diffonly'                => 'Ο�κ �μφανίζειν τὸ τῆς δέλτου πε�ιεχόμενον ὑπὸ τῶν διαφο�ῶν',
 'tog-showhiddencats'          => 'Κεκ�υμμένας κατηγο�ίας δηλοῦν',
+'tog-norollbackdiff'          => 'Πα�αλείπειν τὴν ἔνδειξιν διαφ ὕστε�ον τῆς τελέσεως ἀναστ�οφῆς τινὸς',
 
 'underline-always'  => 'Ἀεὶ',
 'underline-never'   => 'Οὔποτε',
-'underline-default' => 'Πλοηγὸς ὡς π�οκαθω�ισμένως',
-
-'skinpreview' => '(Π�οεπισκοπεῖν)',
+'underline-default' => 'Τὸ πλοηγητή�ιον ὡς π�οκαθω�ισμένως',
 
 # Dates
 'sunday'        => 'Κυ�ιακή',
@@ -170,7 +171,7 @@ $messages = array(
 'mytalk'         => 'Ἡ διάλεξίς μου',
 'anontalk'       => 'Διάλεκτος π�ὸ τοῦδε τοῦ IP',
 'navigation'     => 'Πλοήγησις',
-'and'            => 'καί',
+'and'            => ',&#32;καὶ',
 
 # Metadata in edit box
 'metadata_help' => 'Μεταδεδομένα:',
@@ -181,8 +182,8 @@ $messages = array(
 'help'              => 'Βοήθεια',
 'search'            => 'Ζητεῖν',
 'searchbutton'      => 'Ζητεῖν',
-'go'                => 'Ἱέναι',
-'searcharticle'     => 'Ἱέναι',
+'go'                => 'Ἰέναι',
+'searcharticle'     => 'Ἰέναι',
 'history'           => 'Αἱ τῆς δέλτου π�οτέ�αι',
 'history_short'     => 'Αἱ π�οτέ�αι',
 'updatedmarker'     => 'αἱ δέλτου �νημε�ώσεις ἀφ’ ὅτε �πεσκέφθην α�τὴν ὑστάτως',
@@ -207,14 +208,14 @@ $messages = array(
 'talkpagelinktext'  => 'Διαλέγεσθαι',
 'specialpage'       => 'Εἰδικὴ δέλτος',
 'personaltools'     => 'Ἴδια ��γαλεῖα',
-'postcomment'       => 'Ἀποστελεῖν σχόλιόν τι',
+'postcomment'       => '�έον τμῆμα',
 'articlepage'       => 'Χ�ήματος δέλτον ��ᾶν',
 'talk'              => 'Διάλεξις',
 'views'             => 'Ποσάκις ἔσκεπται',
 'toolbox'           => 'Ἐ�γαλειοκάδος',
 'userpage'          => 'Ὁ�ᾶν δέλτον χ�ωμένου',
 'projectpage'       => 'Ἰδὲ δέλτον σχεδίου',
-'imagepage'         => 'Ὁ�ᾶν μέσων δέλτον',
+'imagepage'         => 'Ὁ�ᾶν τῆν δέλτον τοῦ ἀ�χείου',
 'mediawikipage'     => 'Ὁ�ᾶν δέλτον μηνυμάτων',
 'templatepage'      => 'Ὁ�ᾶν δέλτον �πιγ�αμμάτων',
 'viewhelppage'      => 'Ὁ�ᾶν βοηθείας δέλτον',
@@ -233,8 +234,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Πε�ὶ {{SITENAME}}',
 'aboutpage'            => 'Project:Πε�ὶ',
-'bugreports'           => 'Ἀναφο�ὰ πλανῶν',
-'bugreportspage'       => 'Project:Ἀναφο�ὰ πλανῶν',
 'copyright'            => 'Ἡ διάθεσις τοῦδε πε�ιεχομένου �στιν ὑπὸ $1.',
 'copyrightpagename'    => '{{SITENAME}} πνευματικὰ δικαιώματα',
 'copyrightpage'        => '{{ns:project}}:Πνευματικὰ Δικαιώματα',
@@ -257,6 +256,7 @@ $messages = array(
 
 'badaccess'        => 'Σφάλμα ἀδείας',
 'badaccess-group0' => 'Ο�κ ἔξεστί σοι ταῦτα διαπ�άττειν.',
+'badaccess-groups' => 'Ἡ ὑπ�σοῦ �τημένη π�ᾶξις π�οω�ισμένη �στὶν διὰ τοὺς χ�ωμένους {{PLURAL:$2|τῆς �μάδος|τῶν �μάδων}}: $1.',
 
 'versionrequired'     => 'Ἔκδοσις $1 τῆς MediaWiki ἀπαιτεῖται',
 'versionrequiredtext' => 'Ἡ ἔκδοσις $1 τῆς MediaWiki ἀναγκαία �στὶ πα�ὰ τοῦ χ�ῆσθαι τήνδε τὴν δέλτον.
@@ -271,6 +271,8 @@ $messages = array(
 'editsection'             => 'μεταγ�άφειν',
 'editold'                 => 'μεταγ�άφειν',
 'viewsourceold'           => '��ᾶν πηγήν',
+'editlink'                => 'μεταγ�άφειν',
+'viewsourcelink'          => '��ᾶν τὴν πηγήν',
 'editsectionhint'         => 'Μεταγ�άφειν τὸ μέ�ος: $1',
 'toc'                     => 'Πε�ιεχόμενα',
 'showtoc'                 => 'δεικν�ναι',
@@ -285,13 +287,13 @@ $messages = array(
 'site-atom-feed'          => 'Ἡ τοῦ $1 Atom-πα�ασκευὴ',
 'page-rss-feed'           => 'Βοτὴ� RSS "$1"',
 'page-atom-feed'          => '"$1" Atom Ῥοὴ',
-'red-link-title'          => '$1 (οὔπω γέγ�απται)',
+'red-link-title'          => '$1 (δέλτος οὔπω γέγ�απται)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Χ�ῆμα',
 'nstab-user'      => 'Δέλτος χ�ωμένου',
 'nstab-media'     => 'Δέλτος μέσων',
-'nstab-special'   => 'Εἰδικὸν',
+'nstab-special'   => 'Εἰδικὴ δέλτος',
 'nstab-project'   => 'Δέλτος σχεδίου',
 'nstab-image'     => 'Ἀ�χεῖον',
 'nstab-mediawiki' => 'Ἀγγελία',
@@ -301,7 +303,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Ο�δεμία τοια�τη �νέ�γεια',
-'nosuchactiontext'  => 'Ἡ καθω�ισμένη ὑπὸ τοῦ URL δ�ᾶσις μὴ ἀναγνω�ίσιμος ὑπὸ τοῦ �ίκι �στὶν',
+'nosuchactiontext'  => 'Ἡ καθω�ισμένη ὑπὸ τοῦ URL δ�ᾶσις μὴ ἀναγνω�ίσιμος ὑπὸ τοῦ �ίκι �στί. 
+Ἐνδεχομένως εἰσῆξας �σφαλμένως τὴν διε�θυνσιν URL ἢ ἠκολο�θησας ἀκ��ῳ συνδέσμῳ τινί. 
+Ἐνδεχομένως πταίει σφάλμα τι τοῦ λογισμικοῦ μέ�ους τοῦ ἱστοτόπου {{SITENAME}}.',
 'nosuchspecialpage' => 'Ο�δεμία τοιο�τη δέλτος',
 'nospecialpagetext' => "<big>'''Ἡ αἰτηθεῖσα εἰδικὴ δέλτος ἄκυ�ός �στιν.'''</big>
 
@@ -328,6 +332,12 @@ $1',
 'laggedslavemode'      => 'Π�οσοχή: Ἡ δέλτος �νδέχεται ο� πε�ιέχειν π�οσφάτους μεταβολάς.',
 'readonly'             => 'Βάσις δεδομένων ἀποκεκλεισμένη',
 'enterlockreason'      => 'Λέγε διὰ τὶ τὸ ἀποκλῄειν τε καὶ ὅτε τοῦτο ἀ�θήσεται',
+'missing-article'      => 'Ἡ βάσις δεδομένων ο�χ ηὗ�ε τὸ κείμενον δέλτου τινὸς, οὕπε� ἡ εὕ�εσις δέουσα �στί, ὀνόματι "$1" $2.
+
+Τοῦτο τὸ γεγονὸς συνήθως ὡς αἰτίαν ἔχει τὴν ἀκολουθίαν μὴ �νημε�ωμένου τινὸς συνδέσμου διὰφ. ἢ συνδέσμου ἱστο�ικοῦ π�ὸς δέλτον τινὰ διεγ�αμμένην.
+
+Εἰ τὰ ἄνωθι ο�κ εἰσὶ τὰ γεγονότα, �νδεχομένως ηὕ�ηκας σφάλμα τι �ν τῷ λογισμικῷ.
+Κατάγγειλον τόδε [[Special:ListUsers/sysop|έπιτ�όπῳ]] τινί, δοὺς τῷδε σημείωμα τι πε�ιέχον τὴν URL.',
 'missingarticle-rev'   => '(ἀναθεώ�ησις#: $1)',
 'missingarticle-diff'  => '(Διαφ: $1, $2)',
 'internalerror'        => 'Ἐσώτε�ον σφάλμα',
@@ -341,6 +351,8 @@ $1',
 'unexpected'           => 'Ἀπ�οσδόκητος τιμή: "$1"="$2".',
 'formerror'            => 'Σφάλμα: μὴ δυναμένη ἡ ὑποβολὴ τοῦ τ�που �στίν',
 'badarticleerror'      => 'Ἡ π�ᾶξις ο�κ �κτελέσιμος ἦν �ν τῇδε δέλτῳ.',
+'cannotdelete'         => "Ο�κ ἔξεστι σβενν�ναι τήνδε τὴν δέλτον/τόδε τὸ ἀ�χεῖον.
+Ἴσως τάχ'ἂν τόδε ἤδη διαγεγ�άμμενον εἴη.",
 'badtitle'             => 'Κακὸν τὸ �πώνυμον',
 'badtitletext'         => 'Ἡ �πιγ�αφὴ τῆς �τουμένης δέλτου �στὶν ἄκυ�ος, κενή, ἢ π�όκειται πε�ὶ �σφαλμένως συνδεδεμένης �πιγ�αφῆς μεταξὺ διαφό�ων �ίκι· εἰκότως πε�ιέχει χα�ακτῆ�ας μὴ χ�ηστέους �ν �πιγ�αφαῖς.',
 'perfcached'           => 'Τὸ ἀκόλουθα δεδομένα εἰσὶ λανθάνοντα καὶ �νδεχομένως ο�κ εἰσὶ �νήμε�α.',
@@ -358,16 +370,16 @@ $1',
 'ns-specialprotected'  => 'Αἱ εἰδικαὶ δέλτοι μὴ μεταγ�απτέαι εἰσίν.',
 
 # Virus scanner
-'virus-badscanner'     => 'Κακὸς σχηματισμός: ἄγνωτος σα�ωτὴς ἰῶν: <i>$1</i>',
+'virus-badscanner'     => "Κακὸς σχηματισμός: ἄγνωτος σα�ωτὴς ἰῶν: ''$1''",
 'virus-scanfailed'     => 'Σά�ωσις πταιστή (κῶδιξ $1)',
 'virus-unknownscanner' => 'ἄγνωτος ἀντιιός:',
 
 # Login and logout pages
 'logouttitle'                => 'Ἀποσυνδεῖσθαι χ�ωμένου',
-'logouttext'                 => '<strong>Τὸ νῦν �κσυνδεδεμένος ο�κ εἰ.</strong>
+'logouttext'                 => "'''�ῦν γὰ� ἀποσυνδεδεμένος εἰ.'''
 
 Ἔξεστί σοι χ�ῆσθαι τὸ {{SITENAME}} ἀνων�μως, ἢ ἔξεστί σοι [[Special:UserLogin|συνδεῖσθαι πάλιν]] ὡς � α�τὸς ἢ ὡς ἄλλος χ�ώμενος.
-Δ�λτοι τινὲς �νδεχομένως δὲ δειχθήσονται ὡς ἂν ἀκμὴν συνδεδεμένος ᾖς, μέχ�ι ὅτε καθαί�ῃς τὴν λανθάνουσαν μνήμην τοῦ πλοηγοῦ σου.',
+Δέλτοι τινὲς δέ, �νδεχομένως, δειχθήσονται ὡς ἂν ἀκμὴν συνδεδεμένος ᾖς, μέχ�ι ὅτε καθαί�ῃς τὴν λανθάνουσαν μνήμην τοῦ π�ογ�άμματος πλοηγήσεώς σου.",
 'welcomecreation'            => '== Ὡς εὖ πα�έστης, $1! ==
 
 Λογισμός σὸς πεποίηται. Ἔχε μνήμην μεταβάλλειν τὰς τοῦ [[Special:Preferences|{{SITENAME}} αἱ�έσεις σου]].',
@@ -377,7 +389,6 @@ $1',
 'yourpasswordagain'          => 'Ἀνατυπῶσαι σ�νθημα:',
 'remembermypassword'         => 'Μίμνῃσκε �νθάδε τὸ συνδεῖσθαι',
 'yourdomainname'             => 'Ὁ τομε�ς σου:',
-'loginproblem'               => '<b>Π�όβλημά τι �κώλυσε τὴν σ�νδεσίν σου.</b><br />Πεί�ασον πάλιν!',
 'login'                      => 'Συνδεῖσθαι',
 'nav-login-createaccount'    => 'Συνδεῖσθαι/λογισμὸν ποιεῖν',
 'loginprompt'                => 'Δεῖ �νε�γὰ τὰ HTTP-π�σματα εἶναι π�ὸ τοῦ συνδεῖσθαι τῷ {{SITENAME}}.',
@@ -392,6 +403,8 @@ $1',
 'gotaccountlink'             => 'Συνδεῖσθαι',
 'createaccountmail'          => 'ἠλεκτ�ονικῇ �πιστολῇ',
 'badretype'                  => 'Τὰ εἰσηγμένα ὑπ�σοῦ συνθήματα ο�χ ��μόττουσιν.',
+'userexists'                 => 'Τὸ εἰσηγμένον ὄνομα ἤδη κεχ�ησμένον �στίν.
+Ἐπίλεξον ὄνομα διάφο�όν τι.',
 'youremail'                  => 'Ἠλεκτ�ονικαὶ �πιστολαί:',
 'username'                   => 'Ὄνομα χ�ωμένου:',
 'uid'                        => 'Ταυτότης χ�ωμένου:',
@@ -412,6 +425,7 @@ $1',
 'loginsuccesstitle'          => 'Ἐπιτυχῶς συνεδέθης',
 'loginsuccess'               => "'''συνδέδεσαι ἤδη τῷ {{SITENAME}} ὡς \"\$1\".'''",
 'nosuchuser'                 => 'Ο�κ �στὶ χ�ώμενος ὀνόματι "$1".
+Τὰ γ�άμματα τῶν ὀνομάτων χ�ωμένων διακ�ίνονται εἰς κεφαλαῖα καὶ μικ�ά.
 Σκόπει τὴν τῶν γ�αμμάτων ἀκ�ιβείαν ἢ [[Special:UserLogin/signup|λογισμὸν νέον ποίει]].',
 'nosuchusershort'            => 'Ο�κ �στὶ χ�ώμενος ἔχων τὸ ὄνομα "<nowiki>$1</nowiki>".
 Ἔλεγξον τὴν ὀ�θογ�αφίαν σου.',
@@ -429,10 +443,11 @@ $1',
 'noemail'                    => 'Ο�δεμία ἠλεκτ�ονικὴ διε�θυνσις �γγεγ�αμμένη διὰ τὸν χ�ώμενον "$1".',
 'passwordsent'               => '�έον τι σ�νθημα π�ὸς τὴν ἠλεκτ�ονικὴν διε�θυνσίν σου, τὴν �γγεγ�αμμένη διὰ "$1", π�οσπέπεπται.
 Τοῦτο δεχόμενος αὖθις συνδεῖσαι.',
-'eauthentsent'               => 'Μήνυμα τι �πιβεβαιώσεως �στάλη τῇ δεδηλωμένῃ ἠλεκτ�ονικῇ διευθ�νσει σου. Π�ὸ τῆς πε�αιτέ�ω ἀποστολῆς μηνυμάτων τῷ συγκεκ�ιμένῳ λογισμῷ, δεῖ σοι ἀκολουθῆσαι τὰς ὀδηγίας �ν τῷ ἀπεσταλμένῳ μην�ματι π�ὸς �παλήθευσιν τῆς κυ�ιότητός σου τοῦ συγκεκ�ιμένου λογισμοῦ.',
+'eauthentsent'               => 'Μήνυμα τι �πιβεβαιώσεως �στάλη τῇ δεδηλωμένῃ ἠλεκτ�ονικῇ διευθ�νσει σου. Π�ὸ τῆς πε�αιτέ�ω ἀποστολῆς μηνυμάτων τῷ συγκεκ�ιμένῳ λογισμῷ, δεῖ σε ἀκολουθῆσαι τὰς ὀδηγίας �ν τῷ ἀπεσταλμένῳ μην�ματι π�ὸς �παλήθευσιν τῆς κυ�ιότητός σου τοῦ συγκεκ�ιμένου λογισμοῦ.',
 'mailerror'                  => 'Σφάλμα κατὰ τὴν ἀποστολὴν τῆσδε �πιστολῆς: $1',
-'acct_creation_throttle_hit' => 'Λυπο�μεθα· πεποίηκας ἤδη $1 λογισμοῦς.
-Ο� δ�νασαι ἔχειν πλείω τοῦ ἑνός.',
+'acct_creation_throttle_hit' => 'Πεποίηκας ἤδη {{PLURAL:$1|1 λογισμόν|$1 λογισμοῦς}} τῇ ὑστέ�ᾳ ἡμέ�ᾳ, ὅπε� �στὶ τὸ μέγιστον �πιτ�επόμενον �ν τῇδε τῇ χ�ονικῇ πε�ιόδῳ.
+Ὡς ἀποτέλεσμα, ο�κ ἔξεστι τοῖς χ�ωμένοις τήνδε τὴν IP-διε�θυνσιν ποιεῖν πλείονας νῦν.',
+'noemailprefs'               => 'Καθό�ισον ἠ-διε�θυνσιν τινὰ ἵνα τάδε τὰ λειτου�γικὰ χα�ακτη�ιστικὰ ὦσιν �νε�γά.',
 'emailconfirmlink'           => 'Ἐπιβεβαίωσον τὴν διε�θυνσιν ἠλ-ταχυδ�ομείου σου',
 'accountcreated'             => 'Λογισμὸς ποιηθείς',
 'accountcreatedtext'         => 'Ὁ λογισμὸς χ�ωμένου διὰ τὸν/τὴν $1 πεποιημένος �στίν.',
@@ -440,11 +455,17 @@ $1',
 'loginlanguagelabel'         => 'Γλῶσσα: $1',
 
 # Password reset dialog
-'resetpass'           => 'Ἀναδιο�ισμὸς συνθήματος λογισμοῦ',
-'resetpass_header'    => 'Ἀναδιο�ισμὸς συνθήματος λογισμοῦ',
-'resetpass_submit'    => 'Ἀναδιο�ισμὸς συνθήματος καὶ σ�νδεσις',
-'resetpass_forbidden' => 'Ο�κ ἔξεστι τοῖς συνθήμασιν ἀλλαγῆναι',
-'resetpass_missing'   => 'Ο�δὲν δεδομένον τ�που.',
+'resetpass'                 => 'Ἀλλαγὴ συνθήματος',
+'resetpass_header'          => 'Ἀναδιο�ισμὸς συνθήματος λογισμοῦ',
+'oldpassword'               => 'Π�ότε�ον σ�νθημα:',
+'newpassword'               => '�έον σ�νθημα:',
+'retypenew'                 => 'Ἀνατ�πωσις νέου συνθήματος:',
+'resetpass_submit'          => 'Ἀναδιο�ισμὸς συνθήματος καὶ σ�νδεσις',
+'resetpass_success'         => 'Τὸ σὸν σ�νθημα εὖ μεταβεβλημένον �στίν! �ῦν συνδέῃ...',
+'resetpass_forbidden'       => 'Ο�κ ἔξεστι τοῖς συνθήμασιν ἀλλαγῆναι',
+'resetpass-no-info'         => 'Ἐὰν μὴ συνδέῃς ο�κ ἔξεστί σοι ε�θέως δεῦ�ο βαίνειν.',
+'resetpass-submit-loggedin' => 'Ἀλλάττειν σ�νθημα',
+'resetpass-temp-password'   => 'Π�οσω�ινὸν σ�νθημα:',
 
 # Edit page toolbar
 'bold_sample'     => 'Γ�άμματα παχέα',
@@ -467,22 +488,22 @@ $1',
 'hr_tip'          => 'Ὁ�ιζόντιος γ�αμμή (χ�ηστέα φειδωλώς)',
 
 # Edit pages
-'summary'                => 'Σ�νοψις',
-'subject'                => 'Χ�ῆμα/�πικεφαλίς',
-'minoredit'              => 'Μικ�ὰ ἥδε ἡ μεταβολή',
-'watchthis'              => 'Ἐφο�ᾶν τήνδε τὴν δέλτον',
-'savearticle'            => 'Γ�άφειν τὴν δέλτον',
-'preview'                => 'Τὸ π�οεπισκοπεῖν',
-'showpreview'            => 'Π�οεπισκοπεῖν',
-'showlivepreview'        => 'Ἄμεσος π�οθεώ�ησις',
-'showdiff'               => 'Δεικν�ναι τὰς μεταβολάς',
-'anoneditwarning'        => "'''Π�οσοχή:''' Ο� συνδεδεμένος εἶ.
+'summary'                          => 'Σ�νοψις:',
+'subject'                          => 'Χ�ῆμα/�πικεφαλίς:',
+'minoredit'                        => 'Μικ�ὰ ἥδε ἡ μεταβολή',
+'watchthis'                        => 'Ἐφο�ᾶν τήνδε τὴν δέλτον',
+'savearticle'                      => 'Γ�άφειν τὴν δέλτον',
+'preview'                          => 'Τὸ π�οεπισκοπεῖν',
+'showpreview'                      => 'Π�οεπισκοπεῖν',
+'showlivepreview'                  => 'Ἄμεσος π�οθεώ�ησις',
+'showdiff'                         => 'Δεικν�ναι τὰς μεταβολάς',
+'anoneditwarning'                  => "'''Π�οσοχή:''' Ο� συνδεδεμένος εἶ.
 Ἡ IP-διε�θυνσίς σου καταγεγ�αμμένη ἔσται �ν τῇδε δέλτου ἱστο�ίᾳ.",
-'missingcommenttext'     => 'Εἰσάγαγε σχόλιον τι κατωτέ�ω.',
-'summary-preview'        => 'Π�οθεώ�ησις συνόψεως',
-'subject-preview'        => 'Ἀντικειμένου/�πικεφαλίδος π�οθεώ�ησις',
-'blockedtitle'           => 'Ἀποκεκλεισμένος � χ�ώμενος',
-'blockedtext'            => "<big>'''Τὸ ὄνομα χ�ωμένου σου ἢ ἡ IP-διε�θυνσις σου πεφ�αγμένα εἰσίν.'''</big>
+'missingcommenttext'               => 'Εἰσάγαγε σχόλιον τι κατωτέ�ω.',
+'summary-preview'                  => 'Π�οθεώ�ησις συνόψεως:',
+'subject-preview'                  => 'Ἀντικειμένου/�πικεφαλίδος π�οθεώ�ησις:',
+'blockedtitle'                     => 'Ἀποκεκλεισμένος � χ�ώμενος',
+'blockedtext'                      => "<big>'''Τὸ ὄνομα χ�ωμένου σου ἢ ἡ IP-διε�θυνσις σου πεφ�αγμένα εἰσίν.'''</big>
 
 Ἡ φ�αγὴ γέγονε ὑπὸ τὸν/τὴν $1.
 Ἡ δεδομένη αἰτιολογία �στίν: ''$2''.
@@ -495,7 +516,7 @@ $1',
 Ο� δ�νασαι χ�ῆσθαι τὴν δυνατότητα «αποστολῆς ἠλεκτ�ονικῆς �πιστολῆς τῷδε τῷ χ�ωμένῳ» εἰ ο�χ ��ίσεις ἔγκυ�όν τινα ἠλεκτ�ονικὴν διε�θυνσιν �ν ταῖς [[Special:Preferences|π�οκ�ίσεσί]] σου. 
 Ἡ τ�έχουσα IP-διε�θυνσις σου $3 �στίν, καὶ ἡ ἀναγνώ�ισις τῆς φ�αγῆς #$5 �στίν. 
 Πα�ακαλοῦμεν σε πε�ιλαμβάνειν οἱανδήποτε �ξ α�τῶν ἢ καὶ ἀμφοτέ�ας �ν ταῖς ��ωτήσεσί σου.",
-'autoblockedtext'        => "Ἡ IP-διε�θυνσις σου �φ�άγη α�τομάτως �πεὶ κεχ�ησμένη ἦν ὑπὸ ἑτέ�ου τινὸς χ�ωμένου, ὅπε� ἀποκεκλεισμένος �στὶν �κ τοῦ/τῆς $1.
+'autoblockedtext'                  => "Ἡ IP-διε�θυνσις σου �φ�άγη α�τομάτως �πεὶ κεχ�ησμένη ἦν ὑπὸ ἑτέ�ου τινὸς χ�ωμένου, ὅπε� ἀποκεκλεισμένος �στὶν �κ τοῦ/τῆς $1.
 Ἡ δεδομένη αἰτία �στὶν ὡς ἑξῆς:
 
 :''$2''
@@ -511,96 +532,108 @@ $1',
 
 Ἡ τ�έχουσα IP-διε�θυνσις σου $3 �στίν, καὶ ἡ ἀναγνώ�ισις τῆς φ�αγῆς #$5 �στίν. 
 Πα�ακαλοῦμεν σε πε�ιλαμβάνειν οἱανδήποτε �ξ α�τῶν ἢ καὶ ἀμφοτέ�ας �ν ταῖς ��ωτήσεσί σου.",
-'blockednoreason'        => 'ο�δεμία αἰτία �δόθη',
-'blockedoriginalsource'  => "Ἡ πηγὴ τοῦ '''$1''' δείκνυται κατωτέ�ω:",
-'whitelistedittitle'     => 'Ἀπαιτο�μενον τὸ συνδεῖσθαι π�ὸ τοῦ μεταγ�άψειν',
-'whitelistedittext'      => 'Ἀπαιτο�μενον τὸ $1 π�ὸ τοῦ μεταγ�άψειν δέλτους.',
-'confirmedittitle'       => 'Ἐπιβεβαίωσις ἠλ-διευθ�νσεως ἀπα�αίτητος π�ὸ τοῦ μεταγ�άψειν',
-'nosuchsectiontitle'     => 'Ο�δὲν τοιοῦτον τμῆμα',
-'loginreqtitle'          => 'Δεῖ σοι συνδεῖσθαι',
-'loginreqlink'           => 'συνδεῖσθαι',
-'loginreqpagetext'       => 'Δεῖ σοι $1 π�ὸ τοῦ ��ᾶν ἑτέ�ας δέλτους.',
-'accmailtitle'           => 'Σ�νθημα ἀπεστάλη.',
-'accmailtext'            => 'Τὸ σ�νθημα διὰ τὸν/τὴν "$1" �στάλη τῷ $2.',
-'newarticle'             => '(�έα)',
-'newarticletext'         => "Ἠκολο�θησας σ�νδεμόν τινα π�ὸς δέλτον εἰσέτι μὴ ὑπα�κτήν.
+'blockednoreason'                  => 'ο�δεμία αἰτία �δόθη',
+'blockedoriginalsource'            => "Ἡ πηγὴ τοῦ '''$1''' δείκνυται κατωτέ�ω:",
+'whitelistedittitle'               => 'Ἀπαιτο�μενον τὸ συνδεῖσθαι π�ὸ τοῦ μεταγ�άψειν',
+'whitelistedittext'                => 'Ἀπαιτο�μενον τὸ $1 π�ὸ τοῦ μεταγ�άψειν δέλτους.',
+'confirmedittitle'                 => 'Ἐπιβεβαίωσις ἠλ-διευθ�νσεως ἀπα�αίτητος π�ὸ τοῦ μεταγ�άψειν',
+'nosuchsectiontitle'               => 'Ο�δὲν τοιοῦτον τμῆμα',
+'loginreqtitle'                    => 'Δεῖ σοι συνδεῖσθαι',
+'loginreqlink'                     => 'συνδεῖσθαι',
+'loginreqpagetext'                 => 'Δεῖ σοι $1 π�ὸ τοῦ ��ᾶν ἑτέ�ας δέλτους.',
+'accmailtitle'                     => 'Σ�νθημα ἀπεστάλη.',
+'accmailtext'                      => 'Τὸ σ�νθημα διὰ τὸν/τὴν "$1" �στάλη τῷ $2.',
+'newarticle'                       => '(�έα)',
+'newarticletext'                   => "Ἠκολο�θησας σ�νδεμόν τινα π�ὸς δέλτον εἰσέτι μὴ ὑπα�κτήν.
 Δ�νασαι ποιῆσαι τὴν δέλτον, τυπῶν �ν τῷ κυτίῳ κατωτέ�ω (ἰδὲ [[{{MediaWiki:Helppage}}|δέλτον βοηθείας]] διά πλείονας πλη�οφο�ίας).
-Εἰ ὧδε εἶ �σφαλμένως, πίεσον τὸ κομβίον τοῦ πλοηγοῦ σου ὀνόματι '''ὀπίσω (back)'''.",
-'noarticletext'          => 'Ο�δὲν �ν τῇδε τῇ δέλτῳ γεγ�αμμένον, ἔξεστί σοι [[Special:Search/{{PAGENAME}}|δέλτον τινὰ ὧδε ὀνόματι ζητήσειν]] ἢ [{{fullurl:{{FULLPAGENAME}}|action=edit}} τήνδε τὴν δέλτον μεταγ�άψειν].',
-'clearyourcache'         => "'''Ἐπισημείωσις - Μετὰ τὸ καταγ�άφειν, �νδεχομένως δεῖ σοι πα�ακάμψεις τὴν λανθάνουσαν μνήμην τοῦ πλοηγοῦ σου π�ὸ τοῦ ��ᾶν τὰς μεταβολάς.'''
+Εἰ ὧδε εἶ �σφαλμένως, πίεσον τὸ κομβίον τοῦ πλοηγητη�ίου σου ὀνόματι '''ὀπίσω (back)'''.",
+'noarticletext'                    => 'Ο�δὲν �ν τῇδε τῇ δέλτῳ γεγ�αμμένον, ἀλλὰ ἔξεστί σοι [[Special:Search/{{PAGENAME}}|δέλτον τινὰ οὕτως ὀνόματι ζητήσειν]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ζητήσειν τοὺς σχετικοὺς καταλόγους], 
+ἢ [{{fullurl:{{FULLPAGENAME}}|action=edit}} τήνδε τὴν δέλτον μεταγ�άψειν].',
+'clearyourcache'                   => "'''Ἐπισημείωσις - Μετὰ τὸ καταγ�άφειν, �νδεχομένως δεῖ σοι πα�ακάμψεις τὴν λανθάνουσαν μνήμην τοῦ πλοηγητη�ίου σου π�ὸ τοῦ ��ᾶν τὰς μεταβολάς.'''
 '''Mozilla / Firefox / Safari:''' ��ητυειν τὸ''Shift'' �νῶ θλίβεις τὸ ''Reload'', ἢ πίεσον εἴ τε ''Ctrl-F5'' ἢ ''Ctrl-R'' (''Command-R'' �ν Macintosh);
 '''Konqueror: '''θλίψον τὸ ''Reload'' ἢ πίεσον ''F5'';
 '''Opera:''' καθαί�ειν τὴν λανθάνουσαν μνήμην �ν ''Tools → Preferences'';
 '''Internet Explorer:''' ��ητυειν τὸ ''Ctrl'' �νῶ θλίβεις τὸ ''Refresh,'' ἢ πίεσον ''Ctrl-F5''.",
-'usercssjsyoucanpreview' => "<strong>Βουλή:</strong> Χ�ῆσον τὸ κομβίον 'Δεικν�ναι π�οθεώ�ησιν' ἵνα δοκιμάσῃς τὴν νέαν σου CSS/JS π�ό τοῦ καταγ�άφειν.",
-'userinvalidcssjstitle'  => "'''Π�οσοχή:''' Ο�κ ὑφίσταται ''skin'' \"\$1\". Μέμνησο: αἱ π�οση�μοσμέναι δέλτοι .css καὶ .js χ�ῶνται �πώνυμον τι ἔχον πεζὰ γ�άμματα, π.χ. {{ns:user}}:Foo/monobook.css �ν ἀντίθεσει π�ὸς τὸν {{ns:user}}:Foo/Monobook.css.",
-'updated'                => '(Ἐνημε�ωθέν)',
-'note'                   => '<strong>Ἐπισήμανσις:</strong>',
-'previewnote'            => '<strong>Ἥδε �στὶ π�οθεώ�ησις, ο�χὶ καταγ�αφὴ τῶν μεταβολῶν!</strong>',
-'session_fail_preview'   => '<strong>Ἀδ�νατος ἦν ἡ διαδικασία τῆς μεταγ�αφῆς σου �ξ αἰτίας τῆς ἀπωλείας συνοδῶν δεδομένων.
+'usercssjsyoucanpreview'           => "'''Βουλή:''' Χ�ῆσον τὸ κομβίον 'Δεικν�ναι π�οθεώ�ησιν' ἵνα δοκιμάσῃς τὴν νέαν σου CSS/JS π�ό τοῦ καταγ�άφειν.",
+'userinvalidcssjstitle'            => "'''Π�οσοχή:''' Ο�κ ὑφίσταται ''skin'' \"\$1\". Μέμνησο: αἱ π�οση�μοσμέναι δέλτοι .css καὶ .js χ�ῶνται �πώνυμον τι ἔχον πεζὰ γ�άμματα, π.χ. {{ns:user}}:Foo/monobook.css �ν ἀντίθεσει π�ὸς τὸν {{ns:user}}:Foo/Monobook.css.",
+'updated'                          => '(Ἐνημε�ωθέν)',
+'note'                             => "'''Ἐπισήμανσις:'''",
+'previewnote'                      => "'''Ἥδε �στὶ π�οθεώ�ησις, ο�χὶ καταγ�αφὴ τῶν μεταβολῶν!'''",
+'session_fail_preview'             => "'''Ἀδ�νατος ἦν ἡ διαδικασία τῆς μεταγ�αφῆς σου �ξ αἰτίας τῆς ἀπωλείας συνοδῶν δεδομένων.
 Πεί�ασον πάλιν.
-Εἰ μὴ δ�νατος �στὶ πά�αυτα, πεί�ασον [[Special:UserLogout|ἀποσυνδεῖσθαι]] καὶ �ν συνεχείᾳ �πανασυνδεῖσθαι.</strong>',
-'editing'                => 'Μεταγ�άφειν $1',
-'editingsection'         => 'Μεταγ�άφειν $1 (τμῆμα)',
-'editingcomment'         => 'Μεταγ�άφειν $1 (σχόλιον)',
-'editconflict'           => 'Ἀντιμαχία μεταγ�αφῶν: $1',
-'yourtext'               => 'Τὰ ὑπὸ �σοῦ γ�αφόμενα',
-'storedversion'          => 'Τεταμιευμένη ἔκδοσις',
-'yourdiff'               => 'Τὰ διαφέ�οντα',
-'copyrightwarning'       => "�πασαι αἱ συμβολαὶ εἰς τὸν {{SITENAME}} θεω�οῦνται ὡς σ�μφωναι π�ὸς τὴν $2 (βλ. $1 διὰ τὰς ἀκ�ιβεῖας).
+Εἰ μὴ δ�νατος �στὶ πά�αυτα, πεί�ασον [[Special:UserLogout|ἀποσυνδεῖσθαι]] καὶ �ν συνεχείᾳ �πανασυνδεῖσθαι.'''",
+'editing'                          => 'Μεταγ�άφειν $1',
+'editingsection'                   => 'Μεταγ�άφειν $1 (τμῆμα)',
+'editingcomment'                   => 'Μεταγ�άφειν $1 (νέον τμῆμα)',
+'editconflict'                     => 'Ἀντιμαχία μεταγ�αφῶν: $1',
+'yourtext'                         => 'Τὰ ὑπὸ �σοῦ γ�αφόμενα',
+'storedversion'                    => 'Τεταμιευμένη ἔκδοσις',
+'yourdiff'                         => 'Τὰ διαφέ�οντα',
+'copyrightwarning'                 => "�πασαι αἱ συμβολαὶ εἰς τὸν {{SITENAME}} θεω�οῦνται ὡς σ�μφωναι π�ὸς τὴν $2 (βλ. $1 διὰ τὰς ἀκ�ιβεῖας).
 Εἰ ο�κ �πιθυμεῖτε τὰ ὑμέτε�α κείμενα μεταγ�άψιμα καὶ διαδόσιμα εἰσὶν ὑπὸ ἄλλων χ�ωμένων κατὰ τὴν βο�λησίν των, πα�ακαλοῦμεν ὑμᾶς ἵνα μὴ α�τὰ ἀνα�τῆτε �ν το�τῳ χώ�ῳ. �,τι συνεισφέ�ετε �νθάδε (κείμενα, διαγ�άμματα, στοιχεῖα ἢ εἰκόνας) δεῖ εἶναι ὑμέτε�ον ἔ�γον, ἢ ἀνῆκον τῷ δημοσίῳ τομεῖ, ἢ π�οε�χόμενον �ξ �λευθέ�ων ἢ ἀνοικτῶν πηγῶν μετὰ ῥητῆς ἀδείας ἀναδημοσιε�σεως. <br />
 
 Βεβαιοῦτε ἡμᾶς πε�ὶ τῆς καινοπ�επείας ὅτου ἔ�γου γ�αφομένου ὑφ'ὑμῶν �νθάδε. Βεβαιοῦτε ἡμᾶς, �πἴσης, πε�ὶ τῆς μὴ �κχω�ήσεως εἰς ἀλλοτ�ίους π�ὸς ὑμᾶς τοῦ δικαιώματος δημοσιε�σεως καὶ ὀνήσεως οὗ, ἥντινα ἔκτασιν α�τὸ ἔχει.
 <br />
-<strong>ΠΑΡΑΚΑΛΟΥΜΕ� ΥΜΑΣ Ι�Α ΜΗ Α�ΑΡΤΗΤΕ ΚΕΙΜΕ�Α ΑΛΛΟΤΡΙΩ� ΕΙ ΜΗ ΕΧΗΤΕ ΤΗ� ΑΔΕΙΑ� ΤΟΥ ΚΑΤΟΧΟΥ ΤΩ� Π�ΕΥΜΑΤΙΚΩ� ΔΙΚΑΙΩΜΑΤΩ�!</strong>",
-'longpagewarning'        => "<strong>ΠΡΟΣΟΧΗ: Ἡδε ἡ δέλτος μῆκος $1 kb / χδ (χιλιοδυφιολέξεων ἢ χιλιάδων λέξεων ''δυ''αδικῶν ψη''φί''ων) ἔχει.
-Ἐνδέχεται πλοηγοί τινες π�οβληματικῶς μεταγ�άφειν δέλτους π�οσεγγίζοντας τὰ ἢ μακ�υτέ�ας τῶν 32 kb.
-Θεω�ήσατε τὸ διασπάσειν τὴν δέλτον εἰς μικ�ώτε�α τεμάχια.</strong>",
-'protectedpagewarning'   => '<strong>ΠΡΟΣΟΧΗ: Ἥδε ἡ δέλτος κεκλῃσμένη �στὶν οὕτως ὥστε μόνον χ�ώμενοι ἔχοντες π�ονόμια γε�όντων δ�νανται μεταγ�άψειν α�τή.</strong>',
-'templatesused'          => 'Π�ότυπα κεχ�ησμένα �ν τοια�τῃ δελτῳ:',
-'templatesusedpreview'   => 'Π�ότυπα κεχ�ησμένα �ν τα�τῃ π�οθεω�ήσει:',
-'templatesusedsection'   => 'Π�ότυπα χ�ηστὰ �ν τῷδε τῷ τμήματι:',
-'template-protected'     => '(φυλλάττεται)',
-'template-semiprotected' => '(ἡμιπεφυλαγμένη)',
-'nocreatetitle'          => 'Ποίησις δέλτων πε�ιω�ισμένη',
-'nocreatetext'           => "{{SITENAME}} ο� σ'�ᾷ νέας δέλτους ποιεῖν.
+'''ΠΑΡΑΚΑΛΟΥΜΕ� ΥΜΑΣ Ι�Α ΜΗ Α�ΑΡΤΗΤΕ ΚΕΙΜΕ�Α ΑΛΛΟΤΡΙΩ� ΕΙ ΜΗ ΕΧΗΤΕ ΤΗ� ΑΔΕΙΑ� ΤΟΥ ΚΑΤΟΧΟΥ ΤΩ� Π�ΕΥΜΑΤΙΚΩ� ΔΙΚΑΙΩΜΑΤΩ�!'''",
+'longpagewarning'                  => "'''ΠΡΟΣΟΧΗ: Ἡδε ἡ δέλτος μῆκος $1 kb / χδ (χιλιοδυφιολέξεων ἢ χιλιάδων λέξεων ''δυ''αδικῶν ψη''φί''ων) ἔχει.
+Ἐνδέχεται πλοηγητή�ια τινὰ π�οβληματικῶς μεταγ�άφειν δέλτους π�οσεγγίζοντας τὰ ἢ μακ�υτέ�ας τῶν 32 kb.
+Θεω�ήσατε τὸ διασπάσειν τὴν δέλτον εἰς μικ�ώτε�α τεμάχια.'''",
+'protectedpagewarning'             => "'''ΠΡΟΣΟΧΗ: Ἥδε ἡ δέλτος κεκλῃσμένη �στὶν οὕτως ὥστε μόνον χ�ώμενοι ἔχοντες π�ονόμια γε�όντων δ�νανται μεταγ�άψειν α�τή.'''",
+'templatesused'                    => 'Π�ότυπα κεχ�ησμένα �ν τοια�τῃ δελτῳ:',
+'templatesusedpreview'             => 'Π�ότυπα κεχ�ησμένα �ν τα�τῃ π�οθεω�ήσει:',
+'templatesusedsection'             => 'Π�ότυπα χ�ηστὰ �ν τῷδε τῷ τμήματι:',
+'template-protected'               => '(φυλλάττεται)',
+'template-semiprotected'           => '(ἡμιπεφυλαγμένη)',
+'hiddencategories'                 => 'Ἥδε ἡ δέλτος μέλος �στὶ {{PLURAL:$1|1 τῆς κεκ�υμμένης κατηγο�ίας|$1 τῶν κεκ�υμμένων κατηγο�ιῶν}}:',
+'nocreatetitle'                    => 'Ποίησις δέλτων πε�ιω�ισμένη',
+'nocreatetext'                     => "{{SITENAME}} ο� σ'�ᾷ νέας δέλτους ποιεῖν.
 Ἐᾷ σε δέλτον ἢδη οὖσαν μεταβάλλειν ἢ [[Special:UserLogin|συνδεῖσθαι ἢ λογισμὸν ποιεῖν]].",
-'nocreate-loggedin'      => 'Ο�κ ἔξεστι σοι νέας δέλτους ποιεῖν.',
-'permissionserrors'      => 'Σφάλματα ἀδειῶν',
-'recreate-deleted-warn'  => "'''Π�οσοχή: Ἀναποιεῖς δέλτον πάλαι ποτὲ διαγ�αφεῖσα.'''
+'nocreate-loggedin'                => 'Ο�κ ἔξεστι σοι νέας δέλτους ποιεῖν.',
+'permissionserrors'                => 'Σφάλματα ἀδειῶν',
+'permissionserrorstext-withaction' => 'Ο�κ ἔχεις ἄδειαν τοῦ $2, �κ {{PLURAL:$1|τῆς �ξῆς αἰτίας|τῶν �ξῆς αἰτιῶν}}:',
+'recreate-deleted-warn'            => "'''Π�οσοχή: Ἀναποιεῖς δέλτον πάλαι ποτὲ διαγ�αφεῖσα.'''
 
 Δεῖ σοι θεω�ήσειν εἰ ��μοστόν �στι τὸ συνεχίζειν μεταγ�άφειν τήνδε τὴν δέλτον.
 Ὁ κατάλογος διαγ�αφῆς τῆσδε τῆς δέλτου διατίθεται �νθάδε π�ὸς �πικου�ίαν σου:",
+'deleted-notice'                   => 'Ἥδε ἡ δέλτος διεγ�άφη.
+Ὁ κατάλογος διαγ�αφῶν διὰ τήνδε τὴν δέλτον πα�έχεται κάτωθι ὡς ἀναφο�ά.',
+'deletelog-fulllog'                => 'Ὁ�ᾶν τὸν πλή�ην κατάλογον',
+'edit-conflict'                    => 'Ἀντίκ�ουσις μεταγ�αφῶν.',
+'edit-no-change'                   => 'Ἡ �γγ�αφὴ ο�δαμῶς μεταβεβλημένη �στί, ἄ�α ἡ σοῦ μεταγ�αφὴ ἠμέληται.',
+'edit-already-exists'              => 'Ἥδε ἡ δέλτος ἤδη οὖσα· ο�κ ἔξεστί σοι δέλτον νέαν ποιεῖν.',
 
 # Parser/template warnings
-'post-expand-template-argument-category' => 'Δέλτοι πε�ιέχουσαι πα�αλελειμμένα ��ίσματα π�οτ�πων',
+'post-expand-template-argument-category'  => 'Δέλτοι πε�ιέχουσαι πα�αλελειμμένα ��ίσματα π�οτ�πων',
+'parser-template-loop-warning'            => 'Ἐνετοπίσθη π�ότυπόν τι �ν β�όχῳ: [[$1]]',
+'parser-template-recursion-depth-warning' => '��ιον μάκ�ους τῆς ἀναδ�ομῆς τοῦ π�οτ�που ὑπε�κεκε�ασμένον �στίν ($1)',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Μὴ δυνατὴ ἡ ποίησις λογισμοῦ',
 
 # History pages
-'viewpagelogs'        => 'Ὁ�ᾶν καταλόγους διὰ τα�την τὴν δέλτον',
-'nohistory'           => 'Ο�κ ἔστι ἱστο�ικὸν μεταγ�αφῶν διὰ τήνδε τὴν δέλτον.',
-'revnotfound'         => 'Ἀναθεώ�ησις μὴ εὑ�εθεῖσα',
-'currentrev'          => 'Τὸ νῦν',
-'revisionasof'        => 'Τὰ �πὶ $1',
-'revision-info'       => 'Τὸ �πὶ $1 ὑπὸ $2',
-'previousrevision'    => '�Παλαιοτέ�α ἀναθεώ�ησις',
-'nextrevision'        => '�εωτέ�α ἀναθεώ�ησις→',
-'currentrevisionlink' => 'Τὰ νῦν',
-'cur'                 => 'ἡ νῦν',
-'next'                => 'ἡ �πομένη',
-'last'                => 'ἡ ὑστάτη',
-'page_first'          => 'π�ώτη',
-'page_last'           => '�σχάτη',
-'histlegend'          => 'Σ�γκ�ισις διαφο�ῶν: Ἐπιλέξατε τὰς συγκ�ιτέας �κδόσεις καὶ πατήσατε enter ἢ τὸ κομβίον  "Συγκ�ίνειν...". <br />
+'viewpagelogs'           => 'Ὁ�ᾶν καταλόγους διὰ τα�την τὴν δέλτον',
+'nohistory'              => 'Ο�κ ἔστι ἱστο�ικὸν μεταγ�αφῶν διὰ τήνδε τὴν δέλτον.',
+'currentrev'             => 'Τὸ νῦν',
+'currentrev-asof'        => 'Τ�έχουσα ἀναθεώ�ησις μέχ�ι $1',
+'revisionasof'           => 'Τὰ �πὶ $1',
+'revision-info'          => 'Τὸ �πὶ $1 ὑπὸ $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Παλαιοτέ�α ἀναθεώ�ησις',
+'nextrevision'           => '�εωτέ�α ἀναθεώ�ησις→',
+'currentrevisionlink'    => 'Τὰ νῦν',
+'cur'                    => 'ἡ νῦν',
+'next'                   => 'ἡ �πομένη',
+'last'                   => 'ἡ ὑστάτη',
+'page_first'             => 'π�ώτη',
+'page_last'              => '�σχάτη',
+'histlegend'             => 'Σ�γκ�ισις διαφο�ῶν: Ἐπιλέξατε τὰς συγκ�ιτέας �κδόσεις καὶ πατήσατε enter ἢ τὸ κομβίον  "Συγκ�ίνειν...". <br />
 Ὑπόμνημα: (τ�έχον) = διαφο�αὶ ὡς π�ὸς τὴν τ�έχουσαν �κδοχήν,
 (ὕστατον) = διαφο�αὶ ὡς π�ὸς τὴν π�οηγουμένην ἔκδοσιν, μ = ἀλλαγαὶ μικ�ῆς κλίμακος.',
-'deletedrev'          => '[διεγ�άφη]',
-'histfirst'           => 'π�ώτη',
-'histlast'            => '�σχάτη',
-'historysize'         => '({{PLURAL:$1|1 δυφίον|$1 δυφία}})',
-'historyempty'        => '(κενόν)',
+'history-fieldset-title' => 'Ζήτησις �ν ταῖς π�οτέ�αις',
+'deletedrev'             => '[διεγ�άφη]',
+'histfirst'              => 'π�ώτη',
+'histlast'               => '�σχάτη',
+'historysize'            => '({{PLURAL:$1|1 δυφίον|$1 δυφία}})',
+'historyempty'           => '(κενόν)',
 
 # Revision feed
 'history-feed-title'          => 'Ἱστο�ία ἀναθεω�ήσεων',
@@ -624,7 +657,7 @@ $1',
 'revdelete-hide-restricted' => 'Ἐφα�μόττειν τάσδε τὰς πε�ιο�ίσεις τοῖς Γέ�ουσι καὶ κλῄειν τήνδε τὴν διεπιφάνειαν',
 'revdelete-suppress'        => 'Κ��πτειν τὴν �μφάνισιν δεδομένων πα�ὰ τοὺς Γέ�οντας �πἴσης',
 'revdelete-hide-image'      => 'Κ��πτειν πε�ιεχόμενον ἀ�χείου',
-'revdelete-unsuppress'      => 'Αἵ�ειν πε�ιο�ίσεις �πὶ τῶν ἀποκατεστημένων �κδόσεων',
+'revdelete-unsuppress'      => 'Αἴ�ειν πε�ιο�ίσεις �πὶ τῶν ἀποκατεστημένων �κδόσεων',
 'revdelete-log'             => 'Σχόλιον καταλόγου:',
 'revdelete-submit'          => 'Ἐφα�μογὴ τῇ �πειλεγμένῇ ἀναθεω�ήσει',
 'revdelete-logentry'        => 'ἠλλαγμένη ἡ ��ατότης τῆς ἀναθεω�ήσεως τοῦ [[$1]]',
@@ -664,6 +697,7 @@ $1',
 'mergehistory-invalid-destination' => 'Ἡ δέλτος π�οο�ισμὸς δεῖ εἶναι ἔγκυ�ος �πιγ�αφή τις.',
 'mergehistory-autocomment'         => 'Συγκεχωνευμένον �στὶν τὸ [[:$1]] μετὰ τοῦ [[:$2]]',
 'mergehistory-comment'             => 'Συγκεχωνευμένον �στὶν τὸ [[:$1]] μετὰ τοῦ [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Δέλτοι-πηγαὶ καὶ δέλτοι-π�οο�ισμοὶ ο�κ ἔξεστι εἶναι ὅμοιαι',
 
 # Merge log
 'mergelog'           => 'Τῶν συγχωνε�σεων καταλόγος',
@@ -676,121 +710,204 @@ $1',
 'difference'              => '(Τὰ μεταβεβλημένα)',
 'lineno'                  => 'Γ�αμμή $1:',
 'compareselectedversions' => 'Συγκ�ίνειν τὰς �πειλεγμένας δέλτους',
+'visualcomparison'        => 'Ὀπτικὴ σ�γκ�ισις',
+'wikicodecomparison'      => 'Ϝικι-κειμενικὴ σ�γκ�ισις',
 'editundo'                => 'ἀναί�εσις',
 'diff-multi'              => '({{PLURAL:$1|Μία �νδιάμεσος ἀναθεώ�ησις|$1 �νδιάμεσοι ἀναθεω�ήσεις}} ο� φαίνονται.)',
+'diff-movedto'            => 'μετακινηθεῖσα εἰς $1',
+'diff-styleadded'         => '$1 ὑφὴ π�οστεθεῖσα',
+'diff-added'              => '$1 π�οστεθεῖσα',
+'diff-changedto'          => 'μεταβληθεῖσα εἰς $1',
+'diff-movedoutof'         => 'κινηθεῖσα �κτὸς τοῦ $1',
+'diff-styleremoved'       => '$1 ὑφὴ ἀφαι�εθεῖσα',
+'diff-removed'            => '$1 ἀφαι�εθεῖσα',
+'diff-changedfrom'        => 'μεταβληθεῖσα κατὰ $1',
+'diff-src'                => 'πηγή',
+'diff-withdestination'    => 'μετὰ τοῦ π�οο�ισμοῦ $1',
+'diff-with'               => '&#32;μετὰ $1 $2',
+'diff-with-final'         => '&#32;καὶ $1 $2',
+'diff-width'              => 'πλάτος',
+'diff-height'             => 'ὕψος',
+'diff-p'                  => "'''πα�άγ�αφός''' τις",
+'diff-blockquote'         => "'''ἀπόφθεγμά''' τι",
+'diff-h1'                 => "'''�πικεφαλίς (κλίμακος 1)''' τις",
+'diff-h2'                 => "'''�πικεφαλίς (κλίμακος 2)''' τις",
+'diff-h3'                 => "'''�πικεφαλίς (κλίμακος 3)''' τις",
+'diff-h4'                 => "'''�πικεφαλίς (κλίμακος 4)''' τις",
+'diff-h5'                 => "'''�πικεφαλίς (κλίμακος 5)''' τις",
+'diff-pre'                => "'''π�οδιαμεμο�φωμένον στῖφος''' τι",
+'diff-div'                => "'''ὑποδιαί�εσίς''' τις",
+'diff-ul'                 => "'''ἄτακτος διαλογή''' τις",
+'diff-ol'                 => "'''τεταγμένη διαλογή''' τις",
+'diff-li'                 => "'''διαλογῆς τεμάχιόν''' τι",
+'diff-table'              => "'''πίναξ''' τις",
+'diff-tbody'              => "'''πίνακος πε�ιεχόμενά''' τινα",
+'diff-tr'                 => "'''σει�ά''' τις",
+'diff-td'                 => "'''κ�τος''' τι",
+'diff-th'                 => "'''�πικεφαλίς''' τις",
+'diff-br'                 => "'''θλάσις''' τις",
+'diff-hr'                 => "'''��ιζόντιος κανών''' τις",
+'diff-code'               => "'''ὑπολογιστικοῦ κώδικος στῖφος''' τι",
+'diff-dl'                 => "'''��ισμοῦ διαλογή''' τις",
+'diff-dt'                 => "'''��ισμοῦ ὅ�ος''' τις",
+'diff-dd'                 => "'''��ισμός''' τις",
+'diff-input'              => "'''εἰσαγόμενόν''' τι",
+'diff-form'               => "'''μο�φή''' τις",
+'diff-img'                => "'''εἰκών''' τις",
+'diff-span'               => "'''βεληνεκές''' τι",
+'diff-a'                  => "'''σ�νδεσμός''' τις",
+'diff-i'                  => "'''πλάγιον'''",
+'diff-b'                  => "'''ἔντονον'''",
+'diff-strong'             => "'''ἰσχυ�όν'''",
+'diff-em'                 => "'''ἔμφασις'''",
+'diff-font'               => "'''γ�αμματοδιαλογή'''",
+'diff-big'                => "'''μέγα'''",
+'diff-del'                => "'''διαγ�αφέν'''",
+'diff-tt'                 => "'''μετε��υθμισμένον πλάτος'''",
+'diff-sub'                => "'''ὑπογεγ�αμμένον'''",
+'diff-sup'                => "'''ὑπε�γεγ�αμμένον'''",
+'diff-strike'             => "'''διαγεγ�αμμένον �γκα�σίως'''",
 
 # Search results
-'searchresults'             => 'Ἀποτελέσματα ἀναζητήσεως',
-'searchresulttext'          => 'Διὰ πλείονας π�στεις �πὶ τοῦ ζητεῖν �ν τῷ {{SITENAME}}, ἴδε [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitleinvalid'     => "Τὸ '''$1''' �ζήτησας",
-'noexactmatch'              => "'''Ο�κ �στὶ δέλτος ὀνόματι \"\$1\".'''
+'searchresults'                    => 'Ἀποτελέσματα ἀναζητήσεως',
+'searchresults-title'              => 'Ἀποτελέσματα ζητήσεως διὰ "$1"',
+'searchresulttext'                 => 'Διὰ πλείονας π�στεις �πὶ τοῦ ζητεῖν �ν τῷ {{SITENAME}}, ἴδε [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Ἐζήτησας \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�πάσας τὰς δέλτους τὰς ἀ�χομένας �κ "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|�πάσας τὰς δέλτους τὰς συζευγν�σας μετὰ τοῦ "$1"]])',
+'searchsubtitleinvalid'            => "Τὸ '''$1''' �ζήτησας",
+'noexactmatch'                     => "'''Ο�κ �στὶ δέλτος ὀνόματι \"\$1\".'''
 Ἔξεστί σοι [[:\$1|τα�την ποιεῖν]].",
-'noexactmatch-nocreate'     => "'''Ο�δεμία δέλτος ὀνόματι \"\$1\".'''",
-'toomanymatches'            => 'Αἱ ἀπαντήσασαι ἀντιστοιχίαι εἰσὶν ὑπὲ� τὸ δέον πλείονες· πεί�ασον ἑτέ�αν πεῦσιν τινά',
-'titlematches'              => 'Ἡ �πιγ�αφὴ τῆς δέλτου ἀντιστοιχεῖ',
-'notitlematches'            => 'Ο�δεμία �πιγ�αφὴ τῆς δέλτου ἀντιστοιχεῖ',
-'textmatches'               => 'Τὸ κείμενον τῆς δέλτου ἀντιστοιχεῖ',
-'notextmatches'             => 'Ο�δὲν κείμενον τῆς δέλτου ἀντιστοιχεῖ',
-'prevn'                     => 'π�οτέ�αι $1',
-'nextn'                     => '�πομέναι $1',
-'viewprevnext'              => 'Ἐπισκοπεῖν ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 λέξις|$2 λέξεις}})',
-'search-result-score'       => 'Σχετικότης: $1%',
-'search-redirect'           => '(ἀναδιευθ�νειν $1)',
-'search-section'            => '(τμῆμα $1)',
-'search-suggest'            => 'Συνίης: $1',
-'search-interwiki-caption'  => 'Ἀδελφὰ σχέδια',
-'search-interwiki-default'  => '$1 ἀποτελέσματα:',
-'search-interwiki-more'     => '(πλείω)',
-'search-mwsuggest-enabled'  => "μεθ'ὑποδείξεων",
-'search-mwsuggest-disabled' => 'ο�κ αἵτινες ὑποδείξεις',
-'search-relatedarticle'     => 'Σχετικά',
-'mwsuggest-disable'         => 'Μὴ �νε�γαὶ αἱ ὑποδείξεις AJAX',
-'searchrelated'             => 'σχετικά',
-'searchall'                 => 'ἅπασαι',
-'showingresults'            => "Δεικν�ναι κατωτέ�ω μέχ�ι {{PLURAL:$1|'''1''' ἀποτέλεσμα|'''$1''' ἀποτελέσματα}}· �κκίνησις �κ τοῦ #'''$2'''.",
-'showingresultsnum'         => "Δεικν�ναι {{PLURAL:$3|'''1''' ἀποτέλεσμα|'''$3''' ἀποτελέσματα}}· �κκίνησις �κ τοῦ #'''$2'''.",
-'nonefound'                 => "'''Ἐπισημείωμα''': Μόνον οἵτινες ὀνοματικοὶ χῶ�οι ἀναζητοῦνται κατὰ π�οεπιλογήν.
-Πεί�ασον τὸ π�οθεματίζειν τὴν πεῦσιν σου μετὰ τοῦ ''ἅπασαι:'' διὰ τὸ ἀναζητεῖν �ν παντὶ τῷ πε�ιεχομένῳ (δέλτων διαλόγου, π�οτ�πων, κ.λ., πε�ιλαμβανομένων), ἢ χ�ῆσον τὸν �πιθυμητὸν ὀνοματικὸν χῶ�ον ὡς π�όθεμα.",
-'powersearch'               => 'Ζητεῖν ἀναλυτικῶς',
-'powersearch-legend'        => 'Ἀνωτέ�α ἀναζήτησις',
-'powersearch-ns'            => 'Ζήτησις �ν τοῖς ὀνοματεἰοις:',
-'powersearch-redir'         => 'Ἀναδιευθ�νσεων καταλόγος',
-'powersearch-field'         => 'Ἀναζήτησις διά',
-'search-external'           => 'Ἐξωτέ�α ἀναζήτησις',
+'noexactmatch-nocreate'            => "'''Ο�δεμία δέλτος ὀνόματι \"\$1\".'''",
+'toomanymatches'                   => 'Αἱ ἀπαντήσασαι ἀντιστοιχίαι εἰσὶν ὑπὲ� τὸ δέον πλείονες· πεί�ασον ἑτέ�αν πεῦσιν τινά',
+'titlematches'                     => 'Ἡ �πιγ�αφὴ τῆς δέλτου ἀντιστοιχεῖ',
+'notitlematches'                   => 'Ο�δεμία �πιγ�αφὴ τῆς δέλτου ἀντιστοιχεῖ',
+'textmatches'                      => 'Τὸ κείμενον τῆς δέλτου ἀντιστοιχεῖ',
+'notextmatches'                    => 'Ο�δὲν κείμενον τῆς δέλτου ἀντιστοιχεῖ',
+'prevn'                            => 'π�οτέ�αι $1',
+'nextn'                            => '�πομέναι $1',
+'viewprevnext'                     => 'Ἐπισκοπεῖν ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Ζητεῖν τὰς �πιλογάς',
+'searchmenu-exists'                => "'''Ὑπά�χει δέλτος τις ὀνόματι \"[[:\$1]]\" �ν τῷδε τῷ �ίκι'''",
+'searchmenu-new'                   => "'''Ποεῖν τὴν δέλτον \"[[:\$1]]\" �ν τῷδε τῷ �ίκι'''",
+'searchhelp-url'                   => 'Help:Πε�ιεχόμενα',
+'searchprofile-articles'           => 'Δέλτοι πε�ιεχομένων',
+'searchprofile-articles-and-proj'  => 'Δέλτοι �γχει�ήματος & πε�ιεχόμενα',
+'searchprofile-project'            => 'Δέλτοι �γχει�ήματος',
+'searchprofile-images'             => 'Ἀ�χεῖα',
+'searchprofile-everything'         => '�παντα',
+'searchprofile-advanced'           => 'Π�οωθημένον',
+'searchprofile-articles-tooltip'   => 'Ζητεῖν �ν $1',
+'searchprofile-project-tooltip'    => 'Ζητεῖν �ν $1',
+'searchprofile-images-tooltip'     => 'Ζητεῖν ἀ�χεῖα',
+'searchprofile-everything-tooltip' => 'Πανταχοῖ (καὶ τὰς δέλτους διαλέξεως) ζητεῖν.',
+'searchprofile-advanced-tooltip'   => 'Ζητεῖν εἰς συνήθη ὀνοματεῖα',
+'prefs-search-nsdefault'           => 'Ζητεῖν χ�ώμεν-ος,-η π�οκαθω�ισμένας πα�αμέτ�ους:',
+'prefs-search-nscustom'            => 'Ζητεῖν συνήθη ὀνοματεῖα:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 λέξις|$2 λέξεις}})',
+'search-result-score'              => 'Σχετικότης: $1%',
+'search-redirect'                  => '(ἀναδιευθ�νειν $1)',
+'search-section'                   => '(τμῆμα $1)',
+'search-suggest'                   => 'Συνίης: $1',
+'search-interwiki-caption'         => 'Ἀδελφὰ σχέδια',
+'search-interwiki-default'         => '$1 ἀποτελέσματα:',
+'search-interwiki-more'            => '(πλείω)',
+'search-mwsuggest-enabled'         => "μεθ'ὑποδείξεων",
+'search-mwsuggest-disabled'        => 'ο�κ αἵτινες ὑποδείξεις',
+'search-relatedarticle'            => 'Σχετικά',
+'mwsuggest-disable'                => 'Μὴ �νε�γαὶ αἱ ὑποδείξεις AJAX',
+'searchrelated'                    => 'σχετικά',
+'searchall'                        => 'ἅπασαι',
+'showingresults'                   => "Δεικν�ναι κατωτέ�ω μέχ�ι {{PLURAL:$1|'''1''' ἀποτέλεσμα|'''$1''' ἀποτελέσματα}}· �κκίνησις �κ τοῦ #'''$2'''.",
+'showingresultsnum'                => "Δεικν�ναι {{PLURAL:$3|'''1''' ἀποτέλεσμα|'''$3''' ἀποτελέσματα}}· �κκίνησις �κ τοῦ #'''$2'''.",
+'showingresultstotal'              => "Δεικν�ναι κατωτέ�ω {{PLURAL:$4|ἀποτ�λεσμα '''$1''' ἀπὸ '''$3'''|ἀποτελέσματα '''$1 - $2''' ἀπὸ '''$3'''}}",
+'nonefound'                        => "'''Ἐπισημείωμα''': Μόνον οἵτινες ὀνοματικοὶ χῶ�οι ἀναζητοῦνται κατὰ π�οεπιλογήν.
+Πεί�ασον τὸ π�οθεματίζειν τὴν πεῦσιν σου μετὰ τοῦ ''all:'' - ''ἅπασαι:'' διὰ τὸ ἀναζητεῖν �ν παντὶ τῷ πε�ιεχομένῳ (δέλτων διαλόγου, π�οτ�πων, κ.λ., πε�ιλαμβανομένων), ἢ χ�ῆσον τὸν �πιθυμητὸν ὀνοματικὸν χῶ�ον ὡς π�όθεμα.",
+'search-nonefound'                 => 'Ο�δὲν ἀποτέλεσμα ἀντίστοιχον τῆς πε�σεως.',
+'powersearch'                      => 'Ζητεῖν ἀναλυτικῶς',
+'powersearch-legend'               => 'Ἀνωτέ�α ἀναζήτησις',
+'powersearch-ns'                   => 'Ζήτησις �ν τοῖς ὀνοματεἰοις:',
+'powersearch-redir'                => 'Ἀναδιευθ�νσεων καταλόγος',
+'powersearch-field'                => 'Ἀναζήτησις διά',
+'search-external'                  => 'Ἐξωτέ�α ἀναζήτησις',
 
 # Preferences page
-'preferences'              => 'Αἱ�έσεις',
-'mypreferences'            => 'Αἱ αἱ�έσεις μου',
-'prefs-edits'              => 'Τοσοῦται αἱ μεταβολαί:',
-'prefsnologin'             => 'Μὴ συνδεδεμένος',
-'prefsreset'               => 'Αἱ αἱ�έσεις σου ἀποκατέστηκαν κατὰ τὴν τεταμιευμένην ἔκδοσιν σφῶν.',
-'qbsettings'               => 'Ταχεῖα π�όσβασις',
-'qbsettings-none'          => 'Ο�δέν',
-'qbsettings-fixedleft'     => 'Σταθε�ὰ ἀ�ιστε�ώς',
-'qbsettings-fixedright'    => 'Σταθε�ὰ δεξιώς',
-'qbsettings-floatingleft'  => 'Πλανώμενα α�ιστε�ώς',
-'qbsettings-floatingright' => 'Πλανώμενα δεξιώς',
-'changepassword'           => 'Ἀλλάττειν σ�νθημα',
-'skin'                     => 'Ἐμφάνισις',
-'math'                     => 'Τὰ μαθηματικά',
-'dateformat'               => 'Μο�φοποιία χ�ονολογίας',
-'datedefault'              => 'Ο�δεμία π�οτίμησις',
-'datetime'                 => 'Χ�ονολογία καὶ ὥ�α',
-'math_failure'             => 'Λεξιανάλυσις ἀποτετυχηκυῖα',
-'math_unknown_error'       => 'ἄγνωστον σφάλμα',
-'math_unknown_function'    => 'ἄγνωστος �νέ�γεια',
-'math_lexing_error'        => 'σφάλμα λεξικῆς ἀναλ�σεως',
-'math_syntax_error'        => 'σφάλμα συντάξεως',
-'math_image_error'         => 'Ἡ PNG-μετατ�οπὴ ἀπετε�χθη·
+'preferences'               => 'Αἱ�έσεις',
+'mypreferences'             => 'Αἱ αἱ�έσεις μου',
+'prefs-edits'               => 'Τοσοῦται αἱ μεταβολαί:',
+'prefsnologin'              => 'Μὴ συνδεδεμένος',
+'prefsreset'                => 'Αἱ αἱ�έσεις σου ἀποκατέστηκαν κατὰ τὴν τεταμιευμένην ἔκδοσιν σφῶν.',
+'qbsettings'                => 'Ταχεῖα π�όσβασις',
+'qbsettings-none'           => 'Ο�δέν',
+'qbsettings-fixedleft'      => 'Σταθε�ὰ ἀ�ιστε�ώς',
+'qbsettings-fixedright'     => 'Σταθε�ὰ δεξιώς',
+'qbsettings-floatingleft'   => 'Πλανώμενα α�ιστε�ώς',
+'qbsettings-floatingright'  => 'Πλανώμενα δεξιώς',
+'changepassword'            => 'Ἀλλάττειν σ�νθημα',
+'skin'                      => 'Ἐμφάνισις',
+'skin-preview'              => 'Π�οεπισκοπεῖν',
+'math'                      => 'Τὰ μαθηματικά',
+'dateformat'                => 'Μο�φοποιία χ�ονολογίας',
+'datedefault'               => 'Ο�δεμία π�οτίμησις',
+'datetime'                  => 'Χ�ονολογία καὶ ὥ�α',
+'math_failure'              => 'Λεξιανάλυσις ἀποτετυχηκυῖα',
+'math_unknown_error'        => 'ἄγνωστον σφάλμα',
+'math_unknown_function'     => 'ἄγνωστος �νέ�γεια',
+'math_lexing_error'         => 'σφάλμα λεξικῆς ἀναλ�σεως',
+'math_syntax_error'         => 'σφάλμα συντάξεως',
+'math_image_error'          => 'Ἡ PNG-μετατ�οπὴ ἀπετε�χθη·
 ἔλεγξον τὴν ὀ�θὴν �γκατάστασιν τῶν latex, dvips, gs, καὶ μετάτ�εψον',
-'math_notexvc'             => 'Ἐλλεῖπον �κτελέσιμον texvc;
+'math_notexvc'              => 'Ἐλλεῖπον �κτελέσιμον texvc;
 ἴδε math/README διὰ τὸ διαμο�φοῦν.',
-'prefs-personal'           => 'Στοιχεῖα χ�ωμένου',
-'prefs-rc'                 => 'Αἱ νέαι μεταβολαί',
-'prefs-watchlist'          => 'Τὰ �φο�ώμενα',
-'prefs-watchlist-days'     => 'Ἡμέ�αι �μφανιστέαι �ν τῇ �φο�οδιαλογῇ:',
-'prefs-watchlist-edits'    => 'Μέγιστος ἀ�ιθμὸς �μφανιστέων μεταβολῶν �ν τῇ �πεκτεταμένῃ καταλογῇ:',
-'prefs-misc'               => 'Διάφο�α',
-'saveprefs'                => 'Γ�άφειν',
-'resetprefs'               => 'Ἐκκαθαί�ειν ἀσώτους ἀλλαγάς',
-'oldpassword'              => 'Π�ότε�ον σ�νθημα:',
-'newpassword'              => '�έον σ�νθημα:',
-'retypenew'                => 'Ἀνατ�πωσις νέου συνθήματος:',
-'textboxsize'              => 'Τὸ μεταγ�άφειν',
-'rows'                     => 'Σει�αί:',
-'columns'                  => 'Στῆλαι:',
-'searchresultshead'        => 'Ζητεῖν',
-'resultsperpage'           => 'Ἀποτελέσματα ἀνά δέλτον:',
-'contextlines'             => 'Σει�αὶ ἀνά ἀποτέλεσμα:',
-'contextchars'             => 'Συναφὲς κείμενον ἀνά σει�άν:',
-'stub-threshold'           => 'Ἄνω φ�άγμα διὰ τοῦς <a href="#" class="stub">συνδέσμους π�ὸς λείμματα</a> (δυφία):',
-'recentchangesdays'        => 'Αἱ ἡμέ�αι αἱ δεικτέαι �ν ταῖς π�οσφάτοις ἀλλαγαῖς:',
-'recentchangescount'       => 'Δεικτέος, �ν ταῖς π�οσφάτοις ἀλλαγαῖς, τῷ ἱστο�ικῷ, καὶ ταῖς δέλτοις καταλόγου, ἀ�ιθμὸς μεταγ�αφῶν:',
-'savedprefs'               => 'Αἱ αἱ�έσεις σου καταγεγ�αμμέναι εἰσίν.',
-'timezonelegend'           => 'Χ�ονικὴ ζώνη',
-'timezonetext'             => '¹Ὁ ἀ�ιθμὸς τῶν ὡ�ῶν, κατἀ τὰς �ποῖας, � τοπικός σου χ�όνος διαφέ�ει ὑπὸ α�τοῦ τῆς �ξυπη�ετητικῆς μηχανῆς (UTC).',
-'localtime'                => 'Τοπικὴ ὥ�α',
-'timezoneoffset'           => 'Ἐκτόπισμα¹',
-'servertime'               => 'Ὥ�α �ξυπη�ετικῆς ὑπολογιστικῆς μηχανῆς',
-'guesstimezone'            => 'Συμπλή�ωσις μέσῳ τοῦ πλοηγοῦ',
-'allowemail'               => "Ἐπιτ�έπειν τὴν χ�ῆσιν ἠλ-ταχυδ�ομείου ὑφ'ἑτέ�ων χ�ωμένων",
-'prefs-searchoptions'      => 'Ἐπιλογαὶ ζητήσεως',
-'prefs-namespaces'         => 'Ὄνοματικὸς χῶ�ος',
-'defaultns'                => 'Ἀναζήτησις �ν τοῖσδε ὀνοματικοῖς χώ�οις κατὰ π�οεπιλογήν:',
-'default'                  => 'π�οκαθω�ισμένον',
-'files'                    => 'Ἀ�χεῖα',
+'prefs-personal'            => 'Στοιχεῖα χ�ωμένου',
+'prefs-rc'                  => 'Αἱ νέαι μεταβολαί',
+'prefs-watchlist'           => 'Τὰ �φο�ώμενα',
+'prefs-watchlist-days'      => 'Ἡμέ�αι �μφανιστέαι �ν τῇ �φο�οδιαλογῇ:',
+'prefs-watchlist-days-max'  => '(τὸ μέγιστον 7 ἡμέ�αι)',
+'prefs-watchlist-edits'     => 'Μέγιστος ἀ�ιθμὸς �μφανιστέων μεταβολῶν �ν τῇ �πεκτεταμένῃ καταλογῇ:',
+'prefs-watchlist-edits-max' => '(μέγιστος ἀ�ιθμός: 1000)',
+'prefs-misc'                => 'Διάφο�α',
+'prefs-resetpass'           => 'Ἀλλάττειν σ�νθημα',
+'saveprefs'                 => 'Γ�άφειν',
+'resetprefs'                => 'Ἐκκαθαί�ειν ἀσώτους ἀλλαγάς',
+'textboxsize'               => 'Τὸ μεταγ�άφειν',
+'prefs-edit-boxsize'        => 'Μέγεθος τῆς θυ�ίδος μεταγ�αφῆς.',
+'rows'                      => 'Σει�αί:',
+'columns'                   => 'Στῆλαι:',
+'searchresultshead'         => 'Ζητεῖν',
+'resultsperpage'            => 'Ἀποτελέσματα ἀνά δέλτον:',
+'contextlines'              => 'Σει�αὶ ἀνά ἀποτέλεσμα:',
+'contextchars'              => 'Συναφὲς κείμενον ἀνά σει�άν:',
+'stub-threshold'            => 'Ἄνω φ�άγμα διὰ τοῦς <a href="#" class="stub">συνδέσμους π�ὸς λείμματα</a> (δυφία):',
+'recentchangesdays'         => 'Αἱ ἡμέ�αι αἱ δεικτέαι �ν ταῖς π�οσφάτοις ἀλλαγαῖς:',
+'recentchangesdays-max'     => '(τὸ μέγιστον $1 {{PLURAL:$1|ἡμέ�α|ἡμέ�αι}})',
+'recentchangescount'        => 'Δεικτέος π�οκαθω�ισμένως, �ν ταῖς π�οσφάτοις ἀλλαγαῖς, τῷ ἱστο�ικῷ, καὶ ταῖς δέλτοις καταλόγου, ἀ�ιθμὸς μεταγ�αφῶν:',
+'savedprefs'                => 'Αἱ αἱ�έσεις σου καταγεγ�αμμέναι εἰσίν.',
+'timezonelegend'            => 'Χ�ονικὴ ζώνη',
+'timezonetext'              => '¹Ὁ ἀ�ιθμὸς τῶν ὡ�ῶν, κατἀ τὰς �ποῖας, � τοπικός σου χ�όνος διαφέ�ει ὑπὸ α�τοῦ τῆς �ξυπη�ετητικῆς μηχανῆς (UTC).',
+'localtime'                 => 'Τοπικὴ ὥ�α:',
+'timezoneselect'            => 'Ζώνη ὥ�ας:',
+'timezoneuseserverdefault'  => 'Χ�ῆσαι �ξυπη�ετικὴν μηχανὴν π�οκαθω�ισμένως',
+'timezoneuseoffset'         => 'Ἄλλον (καθο�ίζειν τὸ �κτόπισμα)',
+'timezoneoffset'            => 'Ἐκτόπισμα¹:',
+'servertime'                => 'Ὥ�α ὑπολογιστικῆς �ξυπη�ετικῆς μηχανῆς:',
+'guesstimezone'             => 'Συμπλή�ωσις μέσῳ τοῦ πλοηγητη�ίου',
+'allowemail'                => "Ἐπιτ�έπειν τὴν χ�ῆσιν ἠλ-ταχυδ�ομείου ὑφ'ἑτέ�ων χ�ωμένων",
+'prefs-searchoptions'       => 'Ἐπιλογαὶ ζητήσεως',
+'prefs-namespaces'          => 'Ὄνοματικὸς χῶ�ος',
+'defaultns'                 => 'Ἀναζήτησις �ν τοῖσδε ὀνοματικοῖς χώ�οις κατὰ π�οεπιλογήν:',
+'default'                   => 'π�οκαθω�ισμένον',
+'files'                     => 'Ἀ�χεῖα',
 
 # User rights
 'userrights'                  => 'Διαχεί�ισις δικαιωμάτων χ�ωμένου', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Χει�ίζεσθαι �μάδας χ�ωμένου',
 'userrights-user-editname'    => 'Εἰσάγειν ὄνομἀ τι χ�ωμένου:',
 'editusergroup'               => 'Μεταγ�άφειν �μάδας χ�ωμένου',
-'editinguser'                 => "Ἀλλἀττειν τὰ δικαιώματα τοῦ χ�ωμένου '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ἀλλἀττειν τὰ δικαιώματα τοῦ χ�ωμένου '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Μεταγ�άφειν �μάδας χ�ωμένου',
 'saveusergroups'              => 'Σῴζειν �μάδας χ�ωμένου',
 'userrights-groupsmember'     => 'Μέλος τοῦ:',
 'userrights-reason'           => 'Αἰτία διὰ τὴν ἀλλαγήν:',
+'userrights-no-interwiki'     => 'Ο� κατέχεις τὴν ἄδειαν μεταγ�αφῆς τῶν δικαιωμάτων χ�ωμένου �ν ἄλλοις �ίκι.',
 'userrights-nodatabase'       => 'Ἡ βάσις δεδομένων $1 ο�κ ὑπά�χει ἢ ο�κ ἔστι τοπική.',
 'userrights-nologin'          => 'Δεῖ σοι [[Special:UserLogin|συνδεῖσθαι]] μετὰ �πιτ�όπου λογισμοῦ τινὸς π�ὸ τοῦ μεταγ�άφειν τὰ δικαιώματα χ�ωμένου.',
 'userrights-changeable-col'   => 'Μεταβλητέαι �μάδες',
@@ -803,7 +920,7 @@ $1',
 'group-bot'           => 'Α�τόματα',
 'group-sysop'         => 'Γέ�oντες',
 'group-bureaucrat'    => 'Ἔφο�οι',
-'group-suppress'      => 'Πα�ο�άματα',
+'group-suppress'      => 'Ἐπόπται',
 'group-all'           => '(ὅλοι)',
 
 'group-user-member'          => 'Χ�ώμενος',
@@ -811,63 +928,100 @@ $1',
 'group-bot-member'           => 'Μεταβάλλων μηχανικός',
 'group-sysop-member'         => 'Γέ�ων',
 'group-bureaucrat-member'    => 'Ἔφο�ος',
-'group-suppress-member'      => 'Πα�ό�αμα',
+'group-suppress-member'      => 'Ἐπόπτης',
 
 'grouppage-user'          => '{{ns:project}}:Χ�ώμενοι',
-'grouppage-autoconfirmed' => '{{ns:project}}:Α�τοκυ�ο�μενοι χ�ώμενοι',
+'grouppage-autoconfirmed' => '{{ns:project}}:Α�τομάτως �πικυ�ωμένοι χ�ώμενοι',
 'grouppage-bot'           => '{{ns:project}}:Α�τόματα',
 'grouppage-sysop'         => '{{ns:project}}:Γέ�οντες',
 'grouppage-bureaucrat'    => '{{ns:project}}:Ἔφο�οι',
-'grouppage-suppress'      => '{{ns:project}}:Πα�ό�αμα',
+'grouppage-suppress'      => '{{ns:project}}:Ἐποπτεία',
 
 # Rights
-'right-read'             => 'Ἀναγιγνώσκειν δέλτους',
-'right-edit'             => 'Μεταγ�άφειν δέλτους',
-'right-createpage'       => 'Ποιεῖν δέλτους (ἅσπε� ο�κ ἔσονται δέλτοι διαλέξεως)',
-'right-createtalk'       => 'Ποεῖν δέλτους διαλέξεως',
-'right-createaccount'    => 'Ποιεῖν νέους λογισμοῦς χ�ωμένων',
-'right-minoredit'        => 'Σημαίνειν μεταγ�αφὰς ὡς μικ�άς',
-'right-move'             => 'Μετακινεῖν δέλτους',
-'right-move-subpages'    => 'Κινεῖν δέλτους μετὰ τῶν ἑῶν ὑποδέλτων',
-'right-upload'           => 'Ἐπιφο�τίζειν ἀ�χεῖα',
-'right-reupload'         => 'Ὑπε�γ�άφειν �πὶ ὑπά�χοντος τινὸς ἀ�χείου',
-'right-reupload-own'     => 'Ὑπε�γ�άφειν �πὶ ὑπά�χοντος τινὸς ἀ�χείου �πιπεφο�τισμένου �ξ ἰδίου τοῦ χ�ωμένου',
-'right-upload_by_url'    => 'Ἐπιφο�τίζειν ἀ�χεῖον τι �κ URL-διευθ�νσεως τινός',
-'right-purge'            => 'Καθαί�ειν τὴν λανθάνουσαν μνήμην τοῦ ἱστοτόπου ἄνευ �πιβεβαιώσεως',
-'right-autoconfirmed'    => 'Μεταγ�άφειν ἡμιφυλαττομένας δέλτους',
-'right-apihighlimits'    => 'Χ�ῆσθαι ἀνώτατα ὅ�ια �ν ταῖς API-πε�σεσιν',
-'right-writeapi'         => 'Χ�ῆσις τοῦ γ�άφειν τὸ API',
-'right-delete'           => 'Δέλτους σβενν�ναι',
-'right-bigdelete'        => 'Διαγ�άφειν δέλτους ἔχουσας ε�μεγέθη ἱστο�ικά',
-'right-deleterevision'   => 'Διαγ�άφειν καὶ �κδιαγ�άφειν συγκεκ�ιμένας ἀναθεω�ήσεις δέλτων',
-'right-browsearchive'    => 'Ζητεῖν διεγ�αμμένας δέλτους',
-'right-undelete'         => 'Δέλτον �παναφέ�ειν',
-'right-suppressrevision' => 'Ἐπιθεω�εῖν καὶ ἀποκαθιστάναι ἀναθεω�ήσεις κεκ�υμμένας ὑπὸ τοὺς Γέ�οντας',
-'right-suppressionlog'   => 'Ὁ�ᾶν ἰδιωτικοὺς καταλόγους',
-'right-block'            => 'Φ�άττειν τὸ μεταγ�άφειν ὑφ�τέ�ων χ�ωμένων',
-'right-protect'          => 'Ἀλλάττειν κλίμακα π�οστασίας καὶ μεταγ�άφειν τὰς φυλαττομένας δέλτους',
-'right-editprotected'    => 'Μεταγ�άφειν φυλαττομένας δέλτους (ἄνευ διαδοχικῆς π�οστασίας)',
-'right-editinterface'    => 'Μεταγ�άφειν τὸ τοῦ χ�ωμένου πε�ιβάλλον ἀλληλεπιδ�άσεως',
-'right-editusercssjs'    => 'Μεταγ�άφειν ἑτέ�ων χ�ωμένων CSS- καὶ JS-ἀ�χεῖα',
-'right-noratelimit'      => 'Μὴ �πη�εασμένη πα�ὰ ��ίων ῥυθμοῦ',
-'right-import'           => 'Εἰσαγωγὴ δέλτων �ξ ἑτέ�ων �ίκι',
-'right-importupload'     => 'Εἰσάγειν δέλτους �ξ �πιφο�τίσεως τινός',
-'right-patrol'           => 'Σημαίνειν τὰς μεταγ�αφὰς ἑτέ�ων ὡς φ�ου�ουμένας',
-'right-autopatrol'       => 'Σημαίνειν τὰς ἰδιωτικὰς μεταγ�αφὰς τινὸς α�τομάτως ὡς φ�ου�ουμένας',
-'right-patrolmarks'      => 'Ὁ�ᾶν τὰς σημάνσεις φ�ου�ήσεως τῶν π�οσφάτων μεταβολῶν',
-'right-unwatchedpages'   => 'Ὁ�ᾶν κατάλογόν τινα ἀνεφο�ωμένων δέλτων',
-'right-trackback'        => 'Ὀνασ�νδεσμον ὑποβάλλειν',
-'right-mergehistory'     => 'Συγχωνε�ειν τὸ ἱστο�ικὸν τῶν δέλτων',
-'right-userrights'       => 'Μεταγ�άφειν ἅπαντα τοῦ χ�ωμένου δικαιώματα',
-'right-siteadmin'        => 'Φ�άττειν καὶ �κφ�άττειν τὴν βάσιν δεδομένων',
+'right-read'                 => 'Ἀναγιγνώσκειν δέλτους',
+'right-edit'                 => 'Μεταγ�άφειν δέλτους',
+'right-createpage'           => 'Ποιεῖν δέλτους (ἅσπε� ο�κ ἔσονται δέλτοι διαλέξεως)',
+'right-createtalk'           => 'Ποεῖν δέλτους διαλέξεως',
+'right-createaccount'        => 'Ποιεῖν νέους λογισμοῦς χ�ωμένων',
+'right-minoredit'            => 'Σημαίνειν μεταγ�αφὰς ὡς μικ�άς',
+'right-move'                 => 'Μετακινεῖν δέλτους',
+'right-move-subpages'        => 'Κινεῖν δέλτους μετὰ τῶν ἑῶν ὑποδέλτων',
+'right-move-rootuserpages'   => 'Κινεῖν τὰς δέλτους βάσεως τοῦ χ�ωμένου',
+'right-movefile'             => 'Ἀ�χεία μεταβιβάζειν',
+'right-upload'               => 'Ἐπιφο�τίζειν ἀ�χεῖα',
+'right-reupload'             => 'Ὑπε�γ�άφειν �πὶ ὑπά�χοντος τινὸς ἀ�χείου',
+'right-reupload-own'         => 'Ὑπε�γ�άφειν �πὶ ὑπά�χοντος τινὸς ἀ�χείου �πιπεφο�τισμένου �ξ ἰδίου τοῦ χ�ωμένου',
+'right-upload_by_url'        => 'Ἐπιφο�τίζειν ἀ�χεῖον τι �κ URL-διευθ�νσεως τινός',
+'right-purge'                => 'Καθαί�ειν τὴν λανθάνουσαν μνήμην τοῦ ἱστοτόπου ἄνευ �πιβεβαιώσεως',
+'right-autoconfirmed'        => 'Μεταγ�άφειν ἡμιφυλαττομένας δέλτους',
+'right-apihighlimits'        => 'Χ�ῆσθαι ἀνώτατα ὅ�ια �ν ταῖς API-πε�σεσιν',
+'right-writeapi'             => 'Χ�ῆσις τοῦ γ�άφειν τὸ API',
+'right-delete'               => 'Δέλτους σβενν�ναι',
+'right-bigdelete'            => 'Διαγ�άφειν δέλτους ἔχουσας ε�μεγέθη ἱστο�ικά',
+'right-deleterevision'       => 'Διαγ�άφειν καὶ �κδιαγ�άφειν συγκεκ�ιμένας ἀναθεω�ήσεις δέλτων',
+'right-browsearchive'        => 'Ζητεῖν διεγ�αμμένας δέλτους',
+'right-undelete'             => 'Δέλτον �παναφέ�ειν',
+'right-suppressrevision'     => 'Ἐπιθεω�εῖν καὶ ἀποκαθιστάναι ἀναθεω�ήσεις κεκ�υμμένας ὑπὸ τοὺς Γέ�οντας',
+'right-suppressionlog'       => 'Ὁ�ᾶν ἰδιωτικοὺς καταλόγους',
+'right-block'                => 'Φ�άττειν τὸ μεταγ�άφειν ὑφ�τέ�ων χ�ωμένων',
+'right-protect'              => 'Ἀλλάττειν κλίμακα π�οστασίας καὶ μεταγ�άφειν τὰς φυλαττομένας δέλτους',
+'right-editprotected'        => 'Μεταγ�άφειν φυλαττομένας δέλτους (ἄνευ διαδοχικῆς π�οστασίας)',
+'right-editinterface'        => 'Μεταγ�άφειν τὸ τοῦ χ�ωμένου πε�ιβάλλον ἀλληλεπιδ�άσεως',
+'right-editusercssjs'        => 'Μεταγ�άφειν ἑτέ�ων χ�ωμένων CSS- καὶ JS-ἀ�χεῖα',
+'right-noratelimit'          => 'Μὴ �πη�εασμένη πα�ὰ ��ίων ῥυθμοῦ',
+'right-import'               => 'Εἰσαγωγὴ δέλτων �ξ ἑτέ�ων �ίκι',
+'right-importupload'         => 'Εἰσάγειν δέλτους �ξ �πιφο�τίσεως τινός',
+'right-patrol'               => 'Σημαίνειν τὰς μεταγ�αφὰς ἑτέ�ων ὡς φ�ου�ουμένας',
+'right-autopatrol'           => 'Σημαίνειν τὰς ἰδιωτικὰς μεταγ�αφὰς τινὸς α�τομάτως ὡς φ�ου�ουμένας',
+'right-patrolmarks'          => 'Ὁ�ᾶν τὰς σημάνσεις φ�ου�ήσεως τῶν π�οσφάτων μεταβολῶν',
+'right-unwatchedpages'       => 'Ὁ�ᾶν κατάλογόν τινα ἀνεφο�ωμένων δέλτων',
+'right-trackback'            => 'Ὀνασ�νδεσμον ὑποβάλλειν',
+'right-mergehistory'         => 'Συγχωνε�ειν τὸ ἱστο�ικὸν τῶν δέλτων',
+'right-userrights'           => 'Μεταγ�άφειν ἅπαντα τοῦ χ�ωμένου δικαιώματα',
+'right-userrights-interwiki' => 'Μεταγ�άφειν τὰ δικαιώματα χ�ωμένων �ν ἄλλοις �ίκι',
+'right-siteadmin'            => 'Φ�άττειν καὶ �κφ�άττειν τὴν βάσιν δεδομένων',
 
 # User rights log
-'rightslog'  => 'Κατάλογος δικαιωμάτων χ�ωμένων',
-'rightsnone' => '(Ο�δέν)',
+'rightslog'      => 'Κατάλογος δικαιωμάτων χ�ωμένων',
+'rightslogentry' => 'Μετεβλήθη ἡ μελότης (δικαιώματα μέλους) διὰ τὸν $1 �κ τῆς $2 εἰς τὴν $3',
+'rightsnone'     => '(Ο�δέν)',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'ἀναγιγνώσκειν τήνδε τὴν δέλτον',
+'action-edit'                 => 'μεταγ�άφειν τήνδε τὴν δέλτον',
+'action-createpage'           => 'ποιεῖν δέλτους',
+'action-createtalk'           => 'ποιεῖν δέλτους διαλέξεως',
+'action-createaccount'        => 'ποιεῖν τόνδε τὸν λογισμὸν χ�ωμένου',
+'action-minoredit'            => 'σημαίνειν τήνδε τὴν μεταγ�αφὴν ὡς μικ�ά',
+'action-move'                 => 'κινεῖν τήνδε τὴν δέλτον',
+'action-move-subpages'        => 'κινεῖν τήνδε τὴν δέλτον, μετὰ τῶν ἑῶν ὑποδέλτων',
+'action-move-rootuserpages'   => 'κινεῖν τὰς ῥιζικὰς δέλτους χ�ωμένου',
+'action-movefile'             => 'κινεῖν τόδε τὸ ἀ�χεῖον',
+'action-upload'               => '�πιφο�τίζειν τόδε τὸ ἀ�χεῖον',
+'action-writeapi'             => 'χ�ήσθαι τὴν API τοῦ γ�άφειν',
+'action-delete'               => 'διαγ�άφειν τήνδε τὴν δέλτον',
+'action-deleterevision'       => 'διαγ�άφειν τήνδε τὴν ἀναθεώ�ησιν',
+'action-browsearchive'        => 'ζητεῖν �ν ταῖς διεγ�αμμένας δέλτους',
+'action-undelete'             => '�κδιαγ�άφειν τήνδε τὴν δέλτον',
+'action-suppressrevision'     => '�πιθω�εῖν καὶ ἀποκαθιστᾶν τήνδε τὴν κεκ�υμμένην ἀναθεώ�ησιν',
+'action-suppressionlog'       => '��ᾶν τόνδε τὸν ἰδιωτικὸν κατάλογον',
+'action-block'                => 'φ�άττειν τὸ μεταγ�άφειν τοῦδε τοῦ χ�ωμένου',
+'action-protect'              => 'ἀλλάττειν τὴν κλίμακα π�οστασίας τῆσδε τῆς δελτου',
+'action-import'               => 'εἰσάγειν τήνδε τὴν δέλτον �ξ ἑτέ�ου �ίκι',
+'action-importupload'         => 'εἰσάγειν τήνδε τὴν δέλτον �ξ �πιφο�τίσεώς τινος ἀ�χείου',
+'action-autopatrol'           => 'σήμανσις τῆς μεταγ�αφῆς σου ὡς πε�ιπολουμένης',
+'action-unwatchedpages'       => '��ᾶν τὴν καταλογὴν τῶν μὴ �φο�ωμένων δέλτων',
+'action-trackback'            => 'ὑποβάλλειν ἀνασ�νδεσμον τινά',
+'action-mergehistory'         => 'συγχωνε�ειν τὸ ἱστο�ικὸν τῆσδε τῆς δέλτου',
+'action-userrights'           => 'μεταγ�άφειν ἅπαντα τα δικαιώματα χ�ωμένου',
+'action-userrights-interwiki' => 'μεταγ�άφειν τα δικαιώματα χ�ωμένου ἑτέ�ων �ίκι-χ�ωμένων',
+'action-siteadmin'            => 'Κλῄειν ἢ �κκλῄειν τὴν βάσιν δεδομένων',
 
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|μεταβολή|μεταβολαί}}',
 'recentchanges'                     => 'Αἱ νέαι μεταβολαί',
+'recentchanges-legend'              => 'Ἐπιλογαὶ π�οσφάτων μεταβολῶν',
+'recentchangestext'                 => 'Ἀνιχνε�σειν τὰς πλείω π�όσφατους ἀλλαγὰς οῦ �ίκι �ν τῇδε τῇ δέλτῳ.',
 'recentchanges-feed-description'    => 'Πα�ακολουθεῖν τὰς πλείω π�οσφάτους ἀλλαγὰς τοῦ �ίκι �ν τα�τῃ πε�ιλήψει.',
 'rcnote'                            => "Κατωτέ�ω {{PLURAL:$1|�στὶ '''1''' ἀλλαγὴ|εἰσὶν αἱ τελευταῖαι '''$1''' ἀλλαγαὶ}} �ν {{PLURAL:$2|τῇ τελευταίᾳ ἡμέ�ᾳ|ταῖς τελευταῖαις '''$2''' ἡμέ�αις}}, ἕως καὶ $5, $4.",
 'rcnotefrom'                        => "Ἰδοῦ αἱ ἀλλαγαὶ �κ τοῦ '''$2''' (ἕως τὸ '''$1''').",
@@ -890,6 +1044,8 @@ $1',
 'rc_categories'                     => '��ιον κατηγο�ιῶν (σήμανσις διαχω�ίσεως: "|")',
 'rc_categories_any'                 => 'Οἵα δήποτε',
 'newsectionsummary'                 => '/* $1 */ νέον τμῆμα',
+'rc-enhanced-expand'                => 'Δεικν�ναι λεπτομέ�ειας (ἀπαιτεῖ JavaScript)',
+'rc-enhanced-hide'                  => 'Κ��πτειν λεπτότητας',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Οἰκεῖαι μεταβολαί',
@@ -898,6 +1054,7 @@ $1',
 'recentchangeslinked-summary'  => "�δε �στὶ κατάλογος τῶν νέων μεταβόλων κατὰ δέλτους συνδεδεμένας σὺν δέλτῳ τινί (ἢ κατὰ μέλη κατηγο�ίας τινός).
 Δέλτοι �ν τῷ [[Special:Watchlist|καταλόγῳ �φο�ωμένων]] σου '''ἔντονοι''' εἰσίν.",
 'recentchangeslinked-page'     => 'Ὄνομα δέλτου:',
+'recentchangeslinked-to'       => 'Δεικνῦναι μεταβολὰς εὶς τὰς δέλτους τὰς συζευγμένους τῇδε τῇ δέλτῳ',
 
 # Upload
 'upload'                 => 'Ἐπιφο�τίζειν ἀ�χεῖον',
@@ -906,6 +1063,12 @@ $1',
 'uploadnologin'          => 'Μὴ συνδεδεμένος',
 'uploadnologintext'      => 'Δεῖ σοι εἶναι [[Special:UserLogin|συνδεδεμένος]] π�ὸ τοῦ �πιφο�τίζειν ἀ�χεῖα τινά.',
 'uploaderror'            => 'Σφάλμα �πιφο�τίσεως',
+'uploadtext'             => "Ἔξεστί σοι χ�ῆσθαι τόνδε τὸν τ�πον διὰ τὴν �πιφό�τισιν ἀ�χείων. Τὰ ἤδη �πιπεφο�τισμένα ἀ�χεῖα �ν τῷ [[Special:FileList|καταλόγῳ �πιπεφο�τισμένων α�χείων]] ή τῷ [[Special:Log/upload|καταλόγῳ �πιφο�τίσεων]] εἰσί. Αἱ διαγ�αφαὶ καταγεγ�αμμέναι �ν τῷ [[Special:Log/delete|καταλόγῳ διαγ�αφῶν]] εἰσί.
+
+Διὰ τὴν συμπε�ίληψιν εἰκόνος τινὸς �ν δέλτῳ τινί ἔξεστί σοι χ�ῆσθαι τοὺς συνδέσμους:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' (χ�ῆσις τῆς πλή�ους �κδόσεως τοῦ ἀ�χείου)
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' (χ�ῆσις �κδόσεως τινὸς πλάτους 200 είκονοστοιχείων �ν τῷ κυτίῳ �ξ ἀ�ιστε�ῶν τοῦ ��ίου, ἔχουσα πε�ιγ�αφὴν 'alt text')
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' (ἄμεσος σ�ζευξις μετὰ τοῦ α�χείου μέν, ἄνευ �μφανίσεως τοῦ ἀ�χείου δέ)",
 'upload-permitted'       => 'Ἐπιτ�επόμενοι τ�ποι ἀ�χείων: $1.',
 'upload-preferred'       => 'Π�οκ�ινόμενοι τ�ποι ἀ�χείων: $1.',
 'upload-prohibited'      => 'Ἀπηγο�ευμένοι τ�ποι ἀ�χείων: $1.',
@@ -928,7 +1091,7 @@ $1',
 {{PLURAL:\$3|Ἐπιτ�επτὸς τ�πος ἀ�χείων �στὶ|Ἐπιτ�επτοὶ τ�ποι ἀ�χείων εἰσὶ}} \$2.",
 'filetype-missing'       => 'Τόδε τὸ ἀ�χεῖον ο�κ ἔχει �πέκτασιν (ὅπως ".jpg").',
 'largefileserver'        => 'Τόδε τὸ ἀ�χεῖον �στὶ μεῖζον τοῦ �πιτ�επτοῦ ��ίου βάσει τῆς διαμο�φώσεως τῆς �ξυπη�ετητικῆς μηχανῆς.',
-'fileexists'             => 'Ἀ�χεῖον τι ἔχον τόδε τὸ ὄνομα ἤδη ὑπα�κτὸν �στίν· ἔλεγξον τὸ <strong><tt>$1</tt></strong> ἂν μὴ ᾖ βέβαιος πε�ὶ το ἀλλάττειν α�τό.',
+'fileexists'             => "Ἀ�χεῖον τι ἔχον τόδε τὸ ὄνομα ἤδη ὑπα�κτὸν �στίν· ἔλεγξον τὸ '''<tt>$1</tt>''' ἂν μὴ ᾖ βέβαιος πε�ὶ το ἀλλάττειν α�τό.",
 'fileexists-thumb'       => "<center>'''Ὑπά�χον ἀ�χεῖον'''</center>",
 'file-exists-duplicate'  => 'Τὸ ἀ�χεῖον �στὶ διπλότυπον τοῦ/τῶν ἑξῆς {{PLURAL:$1|ἀ�χείου|ἀ�χείων}}:',
 'successfulupload'       => 'Ἐπιφό�τισις �πιτυχής',
@@ -958,39 +1121,44 @@ $1',
 'upload_source_url'  => ' (ἔγκυ�ος τίς, δημοσίως π�οσπελάσιμος URL)',
 'upload_source_file' => ' (ἀ�χεῖον τι �ν τῇ ὑπολογιστικῇ μηχανῇ σου)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ἡδε εἰδικὴ δέλτος δεικν�ει ἅπαντα τὰ �πιπεφο�τισμένα ἀ�χεῖα.
+# Special:ListFiles
+'listfiles-summary'     => 'Ἡδε εἰδικὴ δέλτος δεικν�ει ἅπαντα τὰ �πιπεφο�τισμένα ἀ�χεῖα.
 Κατὰ π�οεπιλογὴν τὰ ὑστάτως �πιπεφο�τισμένα ἀ�χεῖα δειν�ονται �ν τῇ κο�υφῇ τοῦ καταλόγου.
 Πίεσον �πικεφαλίδα τινὰ στήλης ἵνα ἡ καταλογὴ ἀλλάξηται.',
-'imagelist_search_for'  => 'Ἀναζήτησις τοῦ τῶν μέσων ὀνόματος:',
+'listfiles_search_for'  => 'Ἀναζήτησις τοῦ τῶν μέσων ὀνόματος:',
 'imgfile'               => 'ἀ�χεῖον',
-'imagelist'             => 'Κατάλογος πάντων τῶν φο�τίων',
-'imagelist_date'        => 'Χ�ονολογία',
-'imagelist_name'        => 'Ὄνομα',
-'imagelist_user'        => 'Χ�ώμενος',
-'imagelist_size'        => 'Ὁπόσος',
-'imagelist_description' => 'Διέξοδος',
-
-# Image description page
+'listfiles'             => 'Κατάλογος πάντων τῶν φο�τίων',
+'listfiles_date'        => 'Χ�ονολογία',
+'listfiles_name'        => 'Ὄνομα',
+'listfiles_user'        => 'Χ�ώμενος',
+'listfiles_size'        => 'Μέγεθος',
+'listfiles_description' => 'Πε�ιγ�αφή',
+'listfiles_count'       => 'Ἐκδόσεις',
+
+# File description page
 'filehist'                       => 'Τοῦ ἀ�χείου συγγ�αφή',
 'filehist-help'                  => 'Πατήσατε �πὶ χ�ονολογίας/ὥ�ας τινὸς ἵνα ἴδητε τὸ ἀ�χεῖον ὡς �μφανισθὲν �ν ᾗπε� ὥ�ᾳ ᾗ.',
 'filehist-deleteall'             => 'διαγ�άφειν ἅπαντα',
 'filehist-deleteone'             => 'διαγ�άφειν',
 'filehist-revert'                => 'ἀναστ�έφειν',
-'filehist-current'               => 'Τὸ νῦν',
+'filehist-current'               => 'Τ�έχουσα',
 'filehist-datetime'              => 'Ἡμέ�α/Ὥ�α',
+'filehist-thumb'                 => 'Εἰκόνιον',
+'filehist-thumbtext'             => 'Εἰκόνιον διὰ τὴν ἔκδoσιν $1',
+'filehist-nothumb'               => 'Ο�δὲν εἰκόνιον',
 'filehist-user'                  => 'Χ�ώμενος',
 'filehist-dimensions'            => 'Διαστάσεις',
 'filehist-filesize'              => 'Μέγεθος ἀ�χείου',
 'filehist-comment'               => 'Σχόλιον',
-'imagelinks'                     => 'Σ�νδεσμοι',
+'imagelinks'                     => 'Σ�νδεσμοι ἀ�χείων',
 'linkstoimage'                   => '{{PLURAL:$1|Ἡ ἀκόλουθος|Αἱ ἀκόλουθοι $1}} {{PLURAL:$1|δέλτος σ�νδεσμος|δέλτοι σ�νδεσμοι $1}} π�ὸς τήνδε τὴν εἰκόνα {{PLURAL:$1|�στίν|εἰσίν $1}}.',
 'nolinkstoimage'                 => 'Ο�δένα �στὶ π�οσάγον τόδε τὸ φο�τίον.',
 'morelinkstoimage'               => 'Ὁ�ᾶν [[Special:WhatLinksHere/$1|πλείονας συνδέσμους]] π�ὸς τήνδε τὴν δέλτον.',
 'redirectstofile'                => '{{PLURAL:$1|Τὸ ἀκόλουθον ἀ�χεῖον ἀναδιευθ�νεται|$1 Τὰ ἀκόλουθα ἀ�χεῖα ἀναδιευθ�νονται}} π�ὸς τόδε τὸ ἀ�χεῖον:',
-'duplicatesoffile'               => '{{PLURAL:$1|Τὸ ἀκόλουθον ἀ�χεῖον διπλότυπον �στὶ|$1 Τὰ ἀκόλουθα ἀ�χεῖα διπλότυπα εἰσὶ}} τοῦδε τοῦ ἀ�χείου:',
+'duplicatesoffile'               => '{{PLURAL:$1|Τὸ ἀκόλουθον ἀ�χεῖον διπλότυπον �στὶ|$1 Τὰ ἀκόλουθα ἀ�χεῖα διπλότυπα εἰσὶ}} τοῦδε τοῦ ἀ�χείου ([[Special:FileDuplicateSearch/$2|πλείω]]):',
 'sharedupload'                   => 'Τόδε τὸ ἀ�χεῖον �πεφο�τίσθη π�ὸς κοινὴν χ�ῆσιν καὶ δ�νασαι χ�ῆσθαι α�τὸ εἰς ἕτε�α σχέδια καὶ δέλτους �ξἴσου.',
 'shareduploadwiki'               => 'Ἴδε τὴν δ�λτον $1 διὰ πλείονας π�στεις.',
+'shareduploadwiki-desc'          => 'Ἡ πε�ιγ�αφὴ τῆς ἑῆς $1 κάτωθι δείκνυται.',
 'shareduploadwiki-linktext'      => 'δέλτος πε�ιγ�αφῆς ἀ�χείου',
 'shareduploadduplicate'          => 'Τόδε τὸ ἀ�χεῖον διπλότυπον �στὶ τοῦ $1 �κ κοινῆς ἀποθήκης.',
 'shareduploadduplicate-linktext' => 'ἕτε�ον ἀ�χεῖον',
@@ -1012,7 +1180,7 @@ $1',
 # File deletion
 'filedelete'                  => 'Διαγ�άφειν $1',
 'filedelete-legend'           => 'Διαγ�άφειν ἀ�χεῖον',
-'filedelete-intro'            => "Διαγ�άφεις '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Διαγ�άφεις τὸ ἀ�χεῖον '''[[Media:$1|$1]]''' μετὰ τῆς ἑῆς χ�ονογ�αφίας.",
 'filedelete-intro-old'        => "Διαγ�άφεις τὴν ἔκδοσιν τῆς '''[[Media:$1|$1]]''' μέχ�ι [$4 $3, $2].",
 'filedelete-comment'          => 'Αἰτία διαγ�αφῆς:',
 'filedelete-submit'           => 'Διαγ�άφειν',
@@ -1043,23 +1211,38 @@ $1',
 
 # Random page
 'randompage'         => 'Δέλτος τυχοῦσα',
-'randompage-nopages' => 'Ο�δεμία δέλτος �ν τῷδε τῷ ὀνοματείῳ.',
+'randompage-nopages' => 'Ο�δεμία δέλτος �ν τῷ ὀνοματείῳ "$1".',
 
 # Random redirect
 'randomredirect'         => 'Τυχαία ἀναδιε�θυνσις',
-'randomredirect-nopages' => 'Ο�δεμία ἀναδιε�θυνσις �ν τῷδε τῷ ὀνοματείῳ.',
+'randomredirect-nopages' => 'Ο�δεμία ἀναδιε�θυνσις �ν τῷ ὀνοματείῳ "$1".',
 
 # Statistics
-'statistics'             => 'Τὰ πε�ὶ τῶν δεδομένων',
-'sitestats'              => 'Στατιστικὰ τοῦ {{SITENAME}}',
-'userstats'              => 'Χ�ωμένου στατιστικά',
-'statistics-mostpopular' => 'Αἱ πλέον θεω�ουμέναι δέλτοι',
+'statistics'                   => 'Τὰ πε�ὶ τῶν δεδομένων',
+'statistics-header-pages'      => 'Στατιστικὰ δέλτου',
+'statistics-header-edits'      => 'Μεταγ�άφειν τὰ στατιστικά',
+'statistics-header-views'      => 'Ὁ�ᾶν τὰ στατιστικά',
+'statistics-header-users'      => 'Χ�ωμένου στατιστικά',
+'statistics-articles'          => 'Δέλτοι πε�ιεχομένων',
+'statistics-pages'             => 'Δέλτοι',
+'statistics-pages-desc'        => '�πασαι αἱ δέλτοι �ν τῷ �ίκι, πε�ιλαμβανομένων τῶν δέλτων διαλέξεων, τῶν ἀναδιευθ�νσεων, κτλ.',
+'statistics-files'             => 'Ἀ�χεῖα �πιπεφο�τισμένα',
+'statistics-edits'             => 'Αἱ μεταγ�αφαὶ τῆς δέλτου ἀφὄτου {{SITENAME}} �γκατεστάθησαν',
+'statistics-edits-average'     => 'Μέσος ἀ�ιθμὸς μεταγ�αφῶν ἀνὰ δέλτον',
+'statistics-views-total'       => 'Συνολικαὶ �πιθεω�ήσεις',
+'statistics-views-peredit'     => 'Ἐπιθεω�ήσεις ἀνὰ μεταγ�αφή',
+'statistics-jobqueue'          => 'Μάκ�ος [http://www.mediawiki.org/wiki/Manual:Job_queue καταλόγου ἀναμένοντων]',
+'statistics-users'             => 'Ἐγγεγ�αμμένοι [[Special:ListUsers|χ�ώμενοι]]',
+'statistics-users-active'      => 'Ἐνε�γοὶ χ�ώμενοι <small>(χ�ώμενοι οἳ have edited or performed an action διάφο�ον τῆς ποιήσεως λογισμοῦ �ν τῷ πα�ελθόντι μηνί)</small>',
+'statistics-users-active-desc' => 'Χ�ώμενοι δ�αστή�ιοι �ν τῷ πα�ελθόντι μηνί {{PLURAL:$1|ἡμέ�α|$1 ἡμέ�αι}}',
+'statistics-mostpopular'       => 'Αἱ πλέον θεω�ουμέναι δέλτοι',
 
 'disambiguations'     => 'Σαφηνίσεως δέλτοι',
 'disambiguationspage' => 'Template:σαφήνισις',
 
-'doubleredirects'       => 'Ἀναδιευθ�νσεις διπλότυπαι',
-'double-redirect-fixer' => 'Διο�θωτὴς ἀναδιευθ�νσεων',
+'doubleredirects'            => 'Ἀναδιευθ�νσεις διπλότυπαι',
+'double-redirect-fixed-move' => 'Ἡ [[$1]] κεκίνηται, τὸ νῦν ἀναδιευθ�νεται π�ὸς τὴν [[$2]]',
+'double-redirect-fixer'      => 'Διο�θωτὴς ἀναδιευθ�νσεων',
 
 'brokenredirects'        => 'Ἀναδιευθ�νσεις ο�κέτι π�οὔ�γου οὖσαι',
 'brokenredirects-edit'   => '(μεταγ�άφειν)',
@@ -1080,7 +1263,8 @@ $1',
 'nviews'                  => '$1 {{PLURAL:$1|βλέψις|βλέψεις}}',
 'specialpage-empty'       => 'Ο�δὲν ἀποτέλεσμα �ν τῇδε τῇ ἀναφο�ᾷ.',
 'lonelypages'             => 'Δέλτοι ὀ�φαναί',
-'uncategorizedpages'      => 'Αἱ δέλτοι αἱ ο�κ �νοῦσαι κατηγο�έσι τιναῖς',
+'lonelypagestext'         => 'Aἱ ἀκόλουθοι δέλτοι μὴ συνδεδεμέναι μετὰ τινῶν ἢ μὴ ὑπε�κλῃσμεναι εἰς τίνας ἑτέ�ας δέλτους �ν τῷ {{SITENAME}}.',
+'uncategorizedpages'      => 'Αἱ δέλτοι αἱ ο�κ �νοῦσαι κατηγο�ίαις τισίν',
 'uncategorizedcategories' => 'Αἱ κατηγο�ίαι αἱ μὴ π�οσήκουσαι κατηγο�έσι',
 'uncategorizedimages'     => 'Ἀκατηγο�ιοποίητα ἀ�χεῖα',
 'uncategorizedtemplates'  => 'Ἀκατηγο�ιοποίητα π�ότυπα',
@@ -1089,21 +1273,25 @@ $1',
 'popularpages'            => 'Δημοφιλεῖς δέλτοι',
 'wantedcategories'        => 'Αἰτο�μεναι κατηγο�ίαι',
 'wantedpages'             => 'Αἱ δέλτοι οἷας ἱμεί�ομεν',
-'missingfiles'            => 'Ἀπωλολότα ἀ�χεῖα',
+'wantedfiles'             => 'Αἰτο�μενα ἀ�χεῖα',
+'wantedtemplates'         => 'Ζητο�μενα π�ότυπα',
 'mostlinked'              => 'Αἱ πλέον π�οσσυνδεδεμέναι δέλτοι',
 'mostlinkedcategories'    => 'Αἱ πλέον π�οσσυνδεδεμέναι κατηγο�ίαι',
 'mostlinkedtemplates'     => 'Τὰ πλέον π�οσσυνδεδεμένα π�ότυπα',
 'mostcategories'          => 'Δέλτοι ἔχουσαι τὰς πλείονας κατηγο�ίας',
 'mostimages'              => 'Τὰ πλέον π�οσσυνδεδεμένα ἀ�χεῖα',
 'mostrevisions'           => 'Αἱ δέλτοι αἱ πλειστάκις μεταβεβλήμεναι',
-'prefixindex'             => 'Π�οθέματος δείκτης',
+'prefixindex'             => '�πασαι αἱ δέλτοι αἱ ἔχουσαι π�οθέμα',
 'shortpages'              => 'Δέλτοι μικ�αί',
 'longpages'               => 'Δέλτοι μακ�αί',
 'deadendpages'            => 'Ἀδιέξοδαι δέλτοι',
 'protectedpages'          => 'Αἱ δέλτοι αἱ φυλαττομέναι',
 'protectedpages-indef'    => 'Ἀό�ισται φυλάξεις μόνον',
+'protectedpages-cascade'  => 'Διαδοχικαὶ φυλάξεις μόνον',
 'protectedtitles'         => 'Πεφυλαγμέναι �πιγ�αφαί',
 'listusers'               => 'Κατάλογος πάντων τῶν χ�ωμένων',
+'listusers-editsonly'     => 'Δεικν�ναι μόνον μεταγ�άψαντας χ�ωμένους',
+'usereditcount'           => '$1 {{PLURAL:$1|μεταγ�αφή|μεταγ�αφαί}}',
 'newpages'                => 'Δέλτοι νέαι',
 'newpages-username'       => 'Ὄνομα χ�ωμένου:',
 'ancientpages'            => 'Αἱ παλαιόταται δέλτοι',
@@ -1113,20 +1301,18 @@ $1',
 'nopagetitle'             => 'Ο�δεμία τοιο�τη δέλτος-στόχος',
 'pager-newer-n'           => '{{PLURAL:$1|νεωτέ�α 1|νεωτέ�αι $1}}',
 'pager-older-n'           => '{{PLURAL:$1|παλαιοτέ�α 1|παλαιοτέ�αι $1}}',
-'suppress'                => 'Πα�ό�αμα',
+'suppress'                => 'Ἐπόπτης',
 
 # Book sources
 'booksources'               => 'Αἱ �ν βίβλοις πηγαί',
 'booksources-search-legend' => 'Ζητεῖν πηγὰς βίβλων',
-'booksources-go'            => 'Ἱέναι',
+'booksources-go'            => 'Ἰέναι',
 
 # Special:Log
 'specialloguserlabel'  => 'Χ�ώμενος:',
-'speciallogtitlelabel' => 'Ὄνομα:',
+'speciallogtitlelabel' => 'Ἐπιγ�αφή:',
 'log'                  => 'Κατάλογοι',
 'all-logs-page'        => 'Κατάλογοι ἅπαντες',
-'log-search-legend'    => 'Ἀναζητεῖν καταλόγους',
-'log-search-submit'    => 'Ἰέναι',
 'logempty'             => 'Μὴ ἀντιστοιχοῦντα τὰ τεμάχια �ν τῷδε τῷ καταλόγῳ.',
 'log-title-wildcard'   => 'Ζητεῖν �πιγ�αφὰς �κκινουμένας �κ τοῦδε τοῦ κειμένου',
 
@@ -1136,12 +1322,13 @@ $1',
 'nextpage'          => 'Ἡ δέλτος ἡ ἑπομένη ($1)',
 'prevpage'          => 'Ἡ δέλτος ἡ π�οτέ�α ($1)',
 'allpagesfrom'      => 'Ἐπιδεικν�ναι τὰς δέλτους �κ:',
+'allpagesto'        => 'Δεικν�ναι δέλτους τε�ματίζουσας εἰς:',
 'allarticles'       => '�πασαι αἱ �γγ�αφαί',
 'allinnamespace'    => '�πασαι αἱ δέλτοι (�ν τῷ ὀνοματείῳ $1)',
 'allnotinnamespace' => '�πασαι αἱ δέλτοι (ο�κ �ν τῷ ὀνοματείῳ $1)',
 'allpagesprev'      => 'Π�οηγουμέναι',
 'allpagesnext'      => 'Ἑπομέναι',
-'allpagessubmit'    => 'Ἱέναι',
+'allpagessubmit'    => 'Ἰέναι',
 'allpagesprefix'    => 'Ἐπιδεικν�ναι δέλτους ἔχουσας π�όθεμα:',
 'allpages-bad-ns'   => 'Τὸ {{SITENAME}} ο�κ ἔχει ὀνοματεῖον "$1".',
 
@@ -1151,70 +1338,91 @@ $1',
 'special-categories-sort-count' => 'ἀπα�ιθμητικὴ ταξινόμησις',
 'special-categories-sort-abc'   => 'ἀλφαβητικὴ ταξινόμησις',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Διαγ�άψαι τοὺς ��άνους τοῦ χ�ωμένου',
+
+# Special:LinkSearch
+'linksearch'      => 'Ἐξώτε�οι ἱστοσ�νδεσμοι',
+'linksearch-pat'  => 'Θέμα ζητήσεως:',
+'linksearch-ns'   => 'Ὀνοματεῖον:',
+'linksearch-ok'   => 'Ζητεῖν',
+'linksearch-text' => 'Ἔξεστί σοι χ�ῆσαι ὑποκαταστάσιμας φ�άσεις ὅπως "*.wikipedia.org".<br />
+Ὑποστη�ιζόμενα π�ωτόκολλα: <tt>$1</tt>',
+'linksearch-line' => '$1 συνδεόμενον τῷ $2',
+
 # Special:ListUsers
 'listusersfrom'      => 'Δεικν�ναι χ�ωμένους (γ�αμμαὶ �κκινουμέναι �κ/�ξ):',
 'listusers-submit'   => 'Ἐμφανίζειν',
 'listusers-noresult' => 'Ο�δεὶς χ�ώμενος εὑ�εθείς.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Κατάλογος ποιήσεων λογισμῶν.',
+'newuserlogpagetext'          => '�δε �στὶν κατάλογος τις τῶν ποιήσεων λογισμῶν.',
+'newuserlog-byemail'          => 'σ�νθημα ἀπεσταλμένον μέσῳ ἠλ-ταχυδ�ομείου',
+'newuserlog-create-entry'     => '�έος χ�ώμενος',
+'newuserlog-create2-entry'    => 'νέος λογισμὸς ποιηθεὶς διὰ $1',
+'newuserlog-autocreate-entry' => 'Λογισμὸς ποιηθεὶς α�τομάτως',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Δικαιώματα �μάδος χ�ωμένου',
-'listgrouprights-group'    => 'Ὁμάς',
-'listgrouprights-rights'   => 'Δικαιώματα',
-'listgrouprights-helppage' => 'Help:Δικαιώματα �μάδων',
-'listgrouprights-members'  => '(διαλογὴ μελῶν)',
+'listgrouprights'                 => 'Δικαιώματα �μάδος χ�ωμένου',
+'listgrouprights-group'           => 'Ὁμάς',
+'listgrouprights-rights'          => 'Δικαιώματα',
+'listgrouprights-helppage'        => 'Help:Δικαιώματα �μάδων',
+'listgrouprights-members'         => '(διαλογὴ μελῶν)',
+'listgrouprights-addgroup'        => 'Δυναμένη ἡ π�όσθεσις {{PLURAL:$2|τῆς �μάδος|τῶν �μάδων}}: $1',
+'listgrouprights-removegroup'     => 'Δυναμένη ἡ ἀφαί�εσις {{PLURAL:$2|τῆς �μάδος|τῶν �μάδων}}: $1',
+'listgrouprights-addgroup-all'    => 'Δυναμένη ἡ π�όσθεσις �πασῶν τῶν �μάδων',
+'listgrouprights-removegroup-all' => 'Δυναμένη ἡ ἀφαί�εσις �πασῶν τῶν �μάδων',
 
 # E-mail user
-'mailnologin'     => 'Ο�δεμία διε�θυνσις πα�αλήπτου',
-'emailuser'       => 'Ἠλεκτ�ονικὴν �πιστολὴν τῷδε τῷ χ�ωμένῳ πέμπειν',
-'emailpage'       => 'Χ�ώμενος ἠλ.-ταχυδ�ομείου',
-'usermailererror' => 'Τὸ ἠλ-ταχυδ�ομεῖον �πέστ�εψεν σφάλμα:',
-'defemailsubject' => '{{SITENAME}} ἠλ.-ταχυδ�ομεῖον',
-'noemailtitle'    => 'Ο�δεμία ἠλ-διε�θυνσις',
-'emailfrom'       => 'Ἐκ:',
-'emailto'         => 'Π�ός:',
-'emailsubject'    => 'Χ�ῆμα:',
-'emailmessage'    => 'Ἀγγελία:',
-'emailsend'       => 'Πέμπειν',
-'emailccme'       => 'Ἀπόστειλόν μοι ἀντίγ�αφόν τι τοῦ μην�ματός μου.',
-'emailccsubject'  => 'Ἀντιγ�αφὴ τοῦ μην�ματος σου εἰς $1: $2',
-'emailsent'       => 'Ἠλ.-�πιστολὴ ἀπεστάλη',
-'emailsenttext'   => 'Τὸ μήνυμα ἠλ-ταχυδ�ομείου σου �στάλη.',
-'emailuserfooter' => 'Ἥδε ἡ �πιστολὴ �στάλη ὑπὸ τοῦ/τῆς $1 εἰς τὸν/τὴν $2 κατὰ τὴν τέλεσιν "Ἁποστολὴ ἠλ-μην�ματος" �ς τὸ {{SITENAME}}.',
+'mailnologin'      => 'Ο�δεμία διε�θυνσις πα�αλήπτου',
+'emailuser'        => 'Ἠλεκτ�ονικὴν �πιστολὴν τῷδε τῷ χ�ωμένῳ πέμπειν',
+'emailpage'        => 'Χ�ώμενος ἠλ.-ταχυδ�ομείου',
+'usermailererror'  => 'Τὸ ἠλ-ταχυδ�ομεῖον �πέστ�εψεν σφάλμα:',
+'defemailsubject'  => '{{SITENAME}} ἠλ.-ταχυδ�ομεῖον',
+'noemailtitle'     => 'Ο�δεμία ἠλ-διε�θυνσις',
+'nowikiemailtitle' => 'Ἠ-διε�θυνσις μὴ �πιτ�επτός',
+'email-legend'     => 'Ἀποστολὴ ἠλ-μην�ματος π�ὸς ἕτε�ον τινὰ χ�ώμενον τοῦ {{SITENAME}}',
+'emailfrom'        => 'Ἐκ:',
+'emailto'          => 'Π�ός:',
+'emailsubject'     => 'Χ�ῆμα:',
+'emailmessage'     => 'Ἀγγελία:',
+'emailsend'        => 'Πέμπειν',
+'emailccme'        => 'Ἀπόστειλόν μοι ἀντίγ�αφόν τι τοῦ μην�ματός μου.',
+'emailccsubject'   => 'Ἀντιγ�αφὴ τοῦ μην�ματος σου εἰς $1: $2',
+'emailsent'        => 'Ἠλ.-�πιστολὴ ἀπεστάλη',
+'emailsenttext'    => 'Τὸ μήνυμα ἠλ-ταχυδ�ομείου σου �στάλη.',
+'emailuserfooter'  => 'Ἥδε ἡ �πιστολὴ �στάλη ὑπὸ τοῦ/τῆς $1 εἰς τὸν/τὴν $2 κατὰ τὴν τέλεσιν "Ἁποστολὴ ἠλ-μην�ματος" �ς τὸ {{SITENAME}}.',
 
 # Watchlist
-'watchlist'            => 'Τὰ �φο�ώμενά μου',
-'mywatchlist'          => 'Τὰ �φο�ώμενά μου',
-'watchlistfor'         => "(διὰ '''$1''')",
-'nowatchlist'          => 'Ο�δὲν τεμάχιον �ν τῇ �φο�οδιαλογῇ σου.',
-'watchlistanontext'    => '$1 π�ὸ τοῦ ��ᾶν ἢ τοῦ μεταγ�άφειν τεμάχια τινὰ �ν τῇ �φο�οδιαλογῇ σου.',
-'watchnologin'         => 'Μὴ συνδεδεμένος',
-'watchnologintext'     => 'Δεῖ σοι [[Special:UserLogin|συνδεῖσθαι]] π�ὸ τοῦ μεταβάλλειν τὴν �φο�οδιαλογήν σου.',
-'addedwatch'           => 'Δέλτος π�οστεθειμένη εἰς τὸν �ποπτευομένων κατάλογον �στίν',
-'addedwatchtext'       => "Ἡ δέλτος \"[[:\$1]]\" π�οσετέθη �ν τῷ [[Special:Watchlist|καταλόγῳ �φο�ωμένων]] σου.
+'watchlist'          => 'Τὰ �φο�ώμενά μου',
+'mywatchlist'        => 'Τὰ �φο�ώμενά μου',
+'watchlistfor'       => "(διὰ '''$1''')",
+'nowatchlist'        => 'Ο�δὲν τεμάχιον �ν τῇ �φο�οδιαλογῇ σου.',
+'watchlistanontext'  => '$1 π�ὸ τοῦ ��ᾶν ἢ τοῦ μεταγ�άφειν τεμάχια τινὰ �ν τῇ �φο�οδιαλογῇ σου.',
+'watchnologin'       => 'Μὴ συνδεδεμένος',
+'watchnologintext'   => 'Δεῖ σε [[Special:UserLogin|συνδεῖσθαι]] π�ὸ τοῦ μεταβάλλειν τὴν �φο�οδιαλογήν σου.',
+'addedwatch'         => 'Δέλτος π�οστεθειμένη εἰς τὸν �ποπτευομένων κατάλογον �στίν',
+'addedwatchtext'     => "Ἡ δέλτος \"[[:\$1]]\" π�οσετέθη �ν τῷ [[Special:Watchlist|καταλόγῳ �φο�ωμένων]] σου.
 Μελλοντικαὶ ἀλλαγαὶ τῆσδε τῆς δέλτου καὶ τῆς σχετικῆς δέλτου διαλέξεως καταλεχθήσονται �κεῖσε καὶ ἡ δέλτος �μφανίσεται '''ἔντονος''' �ν τῷ [[Special:RecentChanges|καταλόγῳ π�οσφάτων ἀλλαγῶν]] οὕτως ὥστε ε�χε�έστε�ος ᾖ ἡ διάκ�ισις α�τῆς.",
-'removedwatch'         => 'Ἀνεώ�αται ἥδε ἡ δέλτος',
-'removedwatchtext'     => 'Ἡ δέλτος "[[:$1]]" ἀφῃ�έθη �κ τοῦ [[Special:Watchlist|καταλόγου �φο�ωμένων σου]].',
-'watch'                => 'Ἐφο�ᾶν',
-'watchthispage'        => 'Ἐφο�ᾶν τήνδε τὴν δέλτον',
-'unwatch'              => 'Ἀνεφο�ᾶν',
-'unwatchthispage'      => 'Παῦσαι τὸ �φο�ᾶν',
-'notanarticle'         => 'Μὴ δέλτος χ�ήματος',
-'notvisiblerev'        => 'Ἀναθεώ�ησις διεγ�αμμένη',
-'watchnochange'        => 'Ο�δὲν �κ τῶν �φο�ωμένων τεμαχίων σου μετεγ�άφη τῷ δεικν�ντι χ�όνῳ.',
-'watchlist-details'    => '{{PLURAL:$1|$1 δέλτος|$1 δέλτοι}} �φο�ωμέναι, ἄνευ τῶν δέλτων διαλέξεως πε�ιλαμβανομένων.',
-'wlheader-enotif'      => '* Σ�στημα εἰδήσεως μέσῳ ἠλ-�πιστολῶν �νε�γόν.',
-'watchmethod-recent'   => '�λέγχειν π�οσφάτους μεταγ�αφὰς πε�ὶ �φο�ωμένων δέλτων',
-'watchmethod-list'     => '�λέγχειν �φο�ωμένας δέλτους πε�ὶ μεταγ�αφὰς π�οσφάτους',
-'watchlistcontains'    => 'Ἡ �φο�οδιαλογὴ σου πε�ιέχει $1 {{PLURAL:$1|δέλτον|δέλτους}}.',
-'iteminvalidname'      => "Π�όβλημα τεμαχἰου '$1', ἄκυ�ον ὄνομα...",
-'wlnote'               => "Κατωτέ�ω {{PLURAL:$1|�στὶν ἡ ὑστάτη μεταβολὴ|εἰσὶν αἱ ὑστάται  '''$1'''  μεταβολαὶ}} �ν {{PLURAL:$2|τῇ ὑστάτῃ μίᾳ ὥ�ᾳ|ταῖς ὑστάταις '''$2''' ὥ�αις}}.",
-'wlshowlast'           => 'Ἐμφάνισις τῶν τελευταίων $1 ὡ�ῶν $2 ἡμε�ῶν $3',
-'watchlist-show-bots'  => 'Δεικν�ναι τὰς μεταγ�αφὰς τῶν α�τομάτων',
-'watchlist-hide-bots'  => 'Κ��πτειν τὰς ὑπ᾿ α�τομάτων μεταβολάς',
-'watchlist-show-own'   => 'Δεικν�ναι τοὺς ��άνους μου',
-'watchlist-hide-own'   => 'Κ��πτειν τὰς ὑπ᾿ �μοῦ μεταβολάς',
-'watchlist-show-minor' => 'Δεικν�ναι τὰς μικ�ὰς μεταβολάς',
-'watchlist-hide-minor' => 'Κ��πτειν τὰς μικ�ὰς μεταβολάς',
+'removedwatch'       => 'Ἀνεώ�αται ἥδε ἡ δέλτος',
+'removedwatchtext'   => 'Ἡ δέλτος "[[:$1]]" ἀφῃ�έθη �κ τοῦ [[Special:Watchlist|καταλόγου �φο�ωμένων σου]].',
+'watch'              => 'Ἐφο�ᾶν',
+'watchthispage'      => 'Ἐφο�ᾶν τήνδε τὴν δέλτον',
+'unwatch'            => 'Ἀνεφο�ᾶν',
+'unwatchthispage'    => 'Παῦσαι τὸ �φο�ᾶν',
+'notanarticle'       => 'Μὴ δέλτος χ�ήματος',
+'notvisiblerev'      => 'Ἀναθεώ�ησις διεγ�αμμένη',
+'watchnochange'      => 'Ο�δὲν �κ τῶν �φο�ωμένων τεμαχίων σου μετεγ�άφη τῷ δεικν�ντι χ�όνῳ.',
+'watchlist-details'  => '{{PLURAL:$1|$1 δέλτος|$1 δέλτοι}} �φο�ωμέναι, ἄνευ τῶν δέλτων διαλέξεως πε�ιλαμβανομένων.',
+'wlheader-enotif'    => '* Σ�στημα εἰδήσεως μέσῳ ἠλ-�πιστολῶν �νε�γόν.',
+'watchmethod-recent' => '�λέγχειν π�οσφάτους μεταγ�αφὰς πε�ὶ �φο�ωμένων δέλτων',
+'watchmethod-list'   => '�λέγχειν �φο�ωμένας δέλτους πε�ὶ μεταγ�αφὰς π�οσφάτους',
+'watchlistcontains'  => 'Ἡ �φο�οδιαλογὴ σου πε�ιέχει $1 {{PLURAL:$1|δέλτον|δέλτους}}.',
+'iteminvalidname'    => "Π�όβλημα τεμαχἰου '$1', ἄκυ�ον ὄνομα...",
+'wlnote'             => "Κατωτέ�ω {{PLURAL:$1|�στὶν ἡ ὑστάτη μεταβολὴ|εἰσὶν αἱ ὑστάται  '''$1'''  μεταβολαὶ}} �ν {{PLURAL:$2|τῇ ὑστάτῃ μίᾳ ὥ�ᾳ|ταῖς ὑστάταις '''$2''' ὥ�αις}}.",
+'wlshowlast'         => 'Ἐμφάνισις τῶν τελευταίων $1 ὡ�ῶν $2 ἡμε�ῶν $3',
+'watchlist-options'  => 'Ἐπιλογαὶ �φο�οδιαλογῆς',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ἐφο�ῶν...',
@@ -1230,68 +1438,110 @@ $1',
 'enotif_lastvisited'           => 'Ἴδε $1 διὰ �πάσας τὰς ἀλλαγὰς �κ τῆς ὑστάτης �πισκέψεώς σου.',
 'enotif_lastdiff'              => 'Ἴδε $1 διὰ τὸ ��ᾶν τήνδε τὴν ἀλλαγήν.',
 'enotif_anon_editor'           => 'ἀνώνυμος χ�ώμενος $1',
+'enotif_body'                  => 'Φίλτατε  $WATCHINGUSERNAME,
+
+
+Ἡ τοῦ {{SITENAME}} δέλτος $PAGETITLE $CHANGEDORCREATED �στὶ τῇ $PAGEEDITDATE ὑπὸ τοῦ $PAGEEDITOR, ἴδε $PAGETITLE_URL διὰ τὴν πα�οῦσαν ἔκδοσιν.
+
+$NEWPAGE
+
+Σ�νοψις μεταγ�αφέως: $PAGESUMMARY $PAGEMINOREDIT
+
+Κοινωνῆσαι τὸν μεταγ�αφέα:
+ἠ-ταχυδ�ομεῖον: $PAGEEDITOR_EMAIL
+�ίκι: $PAGEEDITOR_WIKI
+
+Ο�χ ὑπά�ξουσιν ἑτέ�αι εἰδήσεις �ν πε�ιπτώσει πε�αιτέ�ω ἀλλαγαὶ π�οκ�ψουσι εἰ μὴ σὺ �πισκεφθεὶς τὴν δέλτον ᾖς. Δ�νασαι �πἴσης ἀνα��υθμίσειν τὰ σήματα εἰδήσεως διὰ ἅπασας τὰς �φο�ωμένας ὑπ�σοῦ δέλτους
 
-# Delete/protect/revert
-'deletepage'                  => 'Διαγ�άφειν τὴν δέλτον',
-'confirm'                     => 'Κυ�οῦν',
-'excontent'                   => "ἡ ὕλη ἦτο: '$1'",
-'excontentauthor'             => "ἡ ὕλη ἦτο: '$1' (καὶ � μόνος ��ανίζων ἦτο � '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "τὸ πε�ιεχόμενον π�ὸ τῆς �κκαθα�ίσεως ἦτο: '$1'",
-'exblank'                     => 'δέλτος κενὴ ἦν',
-'delete-confirm'              => 'Διαγ�άφειν "$1"',
-'delete-legend'               => 'Διαγ�άφειν',
-'historywarning'              => 'Π�οσοχή: Ἡ δέλτος ἥντινα βο�λεσαι διαγ�άψειν ἔχει ἱστο�ίαν:',
-'confirmdeletetext'           => 'Π�όκεισαι διαγ�άψειν ��ιστικῶς �κ τῆς βάσεως δεδομένων δέλτον τίνα (ἢ εἰκόνα τινα) μετὰ τῆς �ῆς ἱστο�ίας. Πα�ακαλοῦμεν ὑμᾶς ἵνα �πιβεβαιώσητε τὴν θέλησιν ὑμῶν πε�ὶ τοῦ α�τὸ π�άττειν καὶ πε�ὶ τῆς ἀντιλήψεως τῶν συνεπειῶν, και πε�ὶ τοῦ π�άττειν ὑμῶν συμφώνως τῶν [[{{MediaWiki:Policy-url}}|κανόνων]].',
-'actioncomplete'              => 'Τέλειον τὸ ποιο�μενον',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" διεγ�άφηκεν.
+             Τοῦ φιλικοῦ σου {{SITENAME}} τὸ σ�στημα εἰδήσεως
+
+--
+Διὰ τὸ ἀλλάξειν τὰς ῥυθμίσεις τὴς �φο�οδιαλογῆς σου, �πίσκεψον
+{{fullurl:{{ns:special}}:Watchlist/edit}}
+
+Ἀνάδ�ασις καὶ πε�αιτέ�ω βοήθεια:
+{{fullurl:{{MediaWiki:Helppage}}}}',
+
+# Delete
+'deletepage'             => 'Διαγ�άφειν τὴν δέλτον',
+'confirm'                => 'Κυ�οῦν',
+'excontent'              => "ἡ ὕλη ἦτο: '$1'",
+'excontentauthor'        => "ἡ ὕλη ἦτο: '$1' (καὶ � μόνος ��ανίζων ἦτο � '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "τὸ πε�ιεχόμενον π�ὸ τῆς �κκαθα�ίσεως ἦτο: '$1'",
+'exblank'                => 'δέλτος κενὴ ἦν',
+'delete-confirm'         => 'Διαγ�άφειν "$1"',
+'delete-legend'          => 'Διαγ�άφειν',
+'historywarning'         => 'Π�οσοχή: Ἡ δέλτος ἥντινα βο�λεσαι διαγ�άψειν ἔχει ἱστο�ίαν:',
+'confirmdeletetext'      => 'Π�όκεισαι διαγ�άψειν ��ιστικῶς �κ τῆς βάσεως δεδομένων δέλτον τίνα (ἢ εἰκόνα τινα) μετὰ τῆς �ῆς ἱστο�ίας. Πα�ακαλοῦμεν ὑμᾶς ἵνα �πιβεβαιώσητε τὴν θέλησιν ὑμῶν πε�ὶ τοῦ α�τὸ π�άττειν καὶ πε�ὶ τῆς ἀντιλήψεως τῶν συνεπειῶν, και πε�ὶ τοῦ π�άττειν ὑμῶν συμφώνως τῶν [[{{MediaWiki:Policy-url}}|κανόνων]].',
+'actioncomplete'         => 'Τέλειον τὸ ποιο�μενον',
+'deletedtext'            => '"<nowiki>$1</nowiki>" διεγ�άφηκεν.
 Ἰδὲ $2 διὰ τὸ μητ�ῷον τῶν π�οσφάτων διαγ�αφῶν.',
-'deletedarticle'              => 'Ἐσβέσθη ἡ δέλτος "[[$1]]"',
-'suppressedarticle'           => '"[[$1]]" κατεσταλμένον',
-'dellogpage'                  => 'Τὰ �σβεσμένα',
-'dellogpagetext'              => 'Κατωτέ�ω �στὶ καταλογή τις τῶν ὑστάτων διαγ�αφῶν.',
-'deletionlog'                 => 'κατάλογος διαγ�αφῶν',
-'reverted'                    => 'Ἐπαναφο�ὰ εἰς π�οτέ�αν ἔκδοσιν',
-'deletecomment'               => 'Αἰτία τοῦ σβενν�ναι:',
-'deleteotherreason'           => 'Αἰτία ἄλλη/π�ὀσθετος:',
-'deletereasonotherlist'       => 'Αἰτία ἄλλη',
-'deletereason-dropdown'       => '*Κοιναὶ αἰτίαι διαγ�αφῆς
+'deletedarticle'         => 'Ἐσβέσθη ἡ δέλτος "[[$1]]"',
+'suppressedarticle'      => '"[[$1]]" κατεσταλμένον',
+'dellogpage'             => 'Τὰ �σβεσμένα',
+'dellogpagetext'         => 'Κατωτέ�ω �στὶ καταλογή τις τῶν ὑστάτων διαγ�αφῶν.',
+'deletionlog'            => 'κατάλογος διαγ�αφῶν',
+'reverted'               => 'Ἐπαναφο�ὰ εἰς π�οτέ�αν ἔκδοσιν',
+'deletecomment'          => 'Αἰτία τοῦ σβενν�ναι:',
+'deleteotherreason'      => 'Αἰτία ἄλλη/π�ὀσθετος:',
+'deletereasonotherlist'  => 'Αἰτία ἄλλη',
+'deletereason-dropdown'  => '*Κοιναὶ αἰτίαι διαγ�αφῆς
 ** Αἴτησις τοῦ δημιου�γοῦ
 ** Πα�αβίασις δικαιωμάτων
 ** Βα�βα�ότης',
-'delete-edit-reasonlist'      => 'Μεταγ�άφειν τὰς αἰτίας διαγ�αφῆς',
-'rollback'                    => 'Ἀναστ�έφειν μεταγ�αφάς',
-'rollback_short'              => 'Ἀναστ�οφή',
-'rollbacklink'                => 'ἀναστ�οφή',
-'rollbackfailed'              => 'Ἀναστ�οφὴ μὴ �πιτυχής',
-'cantrollback'                => 'Μὴ δυνατὴ ἡ ἀναστ�οφὴ·
+'delete-edit-reasonlist' => 'Μεταγ�άφειν τὰς αἰτίας διαγ�αφῆς',
+
+# Rollback
+'rollback'         => 'Ἀναστ�έφειν μεταγ�αφάς',
+'rollback_short'   => 'Ἀναστ�οφή',
+'rollbacklink'     => 'ἀναστ�οφή',
+'rollbackfailed'   => 'Ἀναστ�οφὴ μὴ �πιτυχής',
+'cantrollback'     => 'Μὴ δυνατὴ ἡ ἀναστ�οφὴ·
 � ὕστατος ��ανιστὴς �στὶ μόνον δημιου�γὸς τῆσδε τῆς δέλτου.',
-'editcomment'                 => 'Τὸ σχόλιον ἑπὶ τῆς μεταγ�αφῆς ἦν: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Ἐπαναφέ�ειν μεταγ�αφὰς ὑπὸ [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) εἰς τὴν �σχάτην ἔκδοσιν ὑπὸ [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Ἀναστ�έφειν μεταγ�αφὰς ὑπὸ $1;
+'editcomment'      => "Ἡ σ�νοψις τῆς μεταγ�αφῆς ἦν: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Ἐπαναφέ�ειν μεταγ�αφὰς ὑπὸ [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) εἰς τὴν �σχάτην ἔκδοσιν ὑπὸ [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Ἀναστ�έφειν μεταγ�αφὰς ὑπὸ $1;
 �παναφο�ὰ εἰς τὴν π�οτέ�αν ἔκδοσιν ὑπὸ $2.',
+
+# Protect
 'protectlogpage'              => 'Κατάλογος π�οφυλάξεων',
 'protectedarticle'            => '"[[$1]]" πεφυλαγμένον',
 'modifiedarticleprotection'   => 'κλῖμαξ π�οστασίας ἠλλαγμένη διὰ "[[$1]]"',
 'unprotectedarticle'          => 'ἀπ�οφ�λακτη "[[$1]]"',
+'movedarticleprotection'      => 'Κεκίνηνται αἱ ῥυθμίσεις π�οστασίας ἀπὸ τὴν "[[$2]]" εἰς τὴν "[[$1]]"',
 'protect-title'               => 'Ἀλλάττειν κλίμακα π�οστασίας διὰ "$1"',
+'prot_1movedto2'              => '[[$1]] �κινήθη π�ὸς [[$2]]',
 'protect-legend'              => 'Ἐπιβεβαιοῦν φ�λαξιν',
 'protectcomment'              => 'Σχόλιον:',
 'protectexpiry'               => 'Ἐξήξει:',
 'protect_expiry_invalid'      => 'Ἄκυ�ος χ�όνος λήξεως.',
 'protect_expiry_old'          => 'Χ�όνος λήξεως �ν τῷ πα�ελθόντι �στίν.',
 'protect-unchain'             => 'Δικαιώματα μετακινήσεως �κκλειδοῦν',
-'protect-text'                => 'Ὁ�ᾶν τε καὶ ἀλλάττειν δ�νασθε τὴν κλίμακα φυλάξεως �νθάδε διὰ τὴν δέλτον <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Ὁ λογισμός σου ο�κ ἔχει ἄδειαν ἀλλαγῆς τῆς κλίμακος φυλάξεως δέλτων.
-Ἐνθάδε εἰσὶν αἱ τ�έχουσαι ῥυθμίσεις διὰ τὴν δέλτον <strong>$1</strong>:',
+'protect-text'                => "Ὁ�ᾶν τε καὶ ἀλλάττειν δ�νασθε τὴν κλίμακα φυλάξεως �νθάδε διὰ τὴν δέλτον '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Ὁ λογισμός σου ο�κ ἔχει ἄδειαν ἀλλαγῆς τῆς κλίμακος φυλάξεως δέλτων.
+Ἐνθάδε εἰσὶν αἱ τ�έχουσαι ῥυθμίσεις διὰ τὴν δέλτον '''$1''':",
 'protect-cascadeon'           => 'Ἡδε δέλτος τῷ πα�όντι πεφυλαγμένη �στὶν �πεὶ πε�ιλαμβάνεται {{PLURAL:$1|τῇ ἀκολο�θῳ δέλτῳ, ἥπε� ἔχει|ταῖς ἀκολο�θοις δέλτοις, αἵπε� ἔχουσι}} τὴν διαδοχικὴν φ�λαξιν �νε�γόν. Δ�νασαι ἀλλάττειν τὴν κλίμακα φ�λαξις τῆσδε δέλτου, ἄνευ �πη�εασμοῦ τῆς διαδοχικῆς φυλάξεως.',
-'protect-default'             => '(κ�ιτή�ιον)',
-'protect-fallback'            => 'Δεῖ σοι �χεῖν τὴν "$1" ἄδειαν',
-'protect-level-autoconfirmed' => 'Ἀποκλῄειν τοὺς ἀγ�άφους',
+'protect-default'             => 'Ἐπιτ�έπειν ἅπαντας τοὺς χ�ωμένους',
+'protect-fallback'            => 'Δεῖ σε �χεῖν τὴν "$1" ἄδειαν',
+'protect-level-autoconfirmed' => 'Ἀποκλῄειν τοὺς νέους τε καὶ τοὺς ἀγ�άφους',
 'protect-level-sysop'         => 'Μόνοι οἱ γέ�οντες',
 'protect-summary-cascade'     => 'Διαδεχόμενον',
 'protect-expiring'            => 'Ἐξήξει $1 (UTC)',
+'protect-expiry-indefinite'   => 'ἀό�ιστος',
 'protect-cascade'             => 'Π�οφυλάττειν δέλτους πε�ικεκλεισμένας �ν τοια�τῃ δελτῳ (διαδοχικὴ π�οφ�λαξις)',
 'protect-cantedit'            => 'Ο� δ�νασθε ἀλλάττειν τὴν κλίμακα φυλάξεως τα�της τῆς δέλτου, διότι ο�κ ἔχετε τὴν ἀδείαν τοῦ μεταγ�άφειν α�τήν.',
+'protect-othertime'           => '�τε�ος χ�όνος',
+'protect-othertime-op'        => 'ἕτε�ος χ�όνος',
+'protect-existing-expiry'     => 'Ὑπά�χων χ�όνος λήξεως: $3, $2',
+'protect-otherreason'         => 'Ἑτέ�α/π�ὀσθετος αἰτια:',
+'protect-otherreason-op'      => 'ἑτέ�α/π�ὀσθετος αἰτια',
+'protect-dropdown'            => '*Κοιναὶ αἰτίαι π�οστασίας
+** Ὑπε�ά�ιθμαι βα�βα�ότητες
+** Ὑπε�ά�ιθμαι ἀνεπιθ�μηται ἀγγελίαι
+** Ἀντιπα�αγωγικοὶ πόλεμοι μεταγ�αφῶν
+** Δ�λτος ὑψηλῆς κυκλοφο�ίας',
+'protect-edit-reasonlist'     => 'Μεταγ�άφειν τὰς αἰτίας π�οστασίας',
+'protect-expiry-options'      => '1 ὥ�α:1 hour,1 ἡμέ�α:1 day,1 ἑβδομάς:1 week,2 ἑβδομάδες:2 weeks,1 μήν:1 month,3 μῆνες:3 months,6 μῆνες:6 months,1 ἔτος:1 year,�πἄπει�ον:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ἐξουσία:',
 'restriction-level'           => 'Κλῖμαξ πε�ιο�ισμοῦ:',
 'minimum-size'                => 'Ἐλάχιστον μέγεθος',
@@ -1316,10 +1566,12 @@ $1',
 'viewdeletedpage'           => 'Δεικν�ναι διαγ�αφείσας δέλτους',
 'undelete-fieldset-title'   => 'Ἐπαναφέ�ειν τὰς ἀναθεω�ήσεις',
 'undeleterevisions'         => '$1 {{PLURAL:$1|ἀναθεώ�ησις|ἀναθεω�ήσεις}} ἀ�χειοθετημέν-η/-αι',
+'undelete-revision'         => 'Διαγ�άφειν τὴν ἀναθεώ�ησιν τοῦ $1 (μέχ�ι $4, �ς $5) ὑπὸ $3:',
 'undelete-nodiff'           => 'Ο�δεμία π�οηγηθεῖσα ἀναθεώ�ησις εὑ�έθη.',
 'undeletebtn'               => 'Ἀνο�θοῦν',
 'undeletelink'              => '�πανίσταναι',
 'undeletereset'             => 'Ἐπαναθέτειν',
+'undeleteinvert'            => 'Ἀναστ�έφειν τὴν �πιλογήν',
 'undeletecomment'           => 'Σχόλιον:',
 'undeletedarticle'          => '�πανιστάν "[[$1]]"',
 'undeletedrevisions'        => '{{PLURAL:$1|1 ἀναθεω�ήσις|$1 ἀναθεω�ήσεις}} ἀποκατεστάθησαν',
@@ -1342,26 +1594,27 @@ $1',
 'blanknamespace' => '(Κ��ιον ὀνοματεῖον)',
 
 # Contributions
-'contributions' => 'Ἔ�ανοι χ�ωμένου',
-'mycontris'     => 'Οἱ ἔ�ανοί μου',
-'contribsub2'   => 'Π�ὸς $1 ($2)',
-'nocontribs'    => 'Ο�δεμία ἀλλαγὴ ηὑ�έθη π�οσήκουσα εἰς τάδε τὰ κ�ιτή�ια.',
-'uctop'         => '(ἄκ�ον)',
-'month'         => 'Μήν:',
-'year'          => 'Ἔτος:',
-
-'sp-contributions-newbies'     => 'Δεικν�ναι ��άνους νέων λογισμῶν μόνον',
-'sp-contributions-newbies-sub' => 'Ἔ�ανοι νέων χ�ωμένων',
-'sp-contributions-blocklog'    => 'Τὰ ἀποκλῄειν',
-'sp-contributions-search'      => 'Ζητεῖν ��άνους',
-'sp-contributions-username'    => 'IP-διε�θυνσις ἢ ὄνομα χ�ωμένου:',
-'sp-contributions-submit'      => 'Ζητεῖν',
+'contributions'       => 'Ἔ�ανοι χ�ωμένου',
+'contributions-title' => 'Ἔ�ανοι χ�ωμένου διὰ τὸ $1',
+'mycontris'           => 'Οἱ ἔ�ανοί μου',
+'contribsub2'         => 'Π�ὸς $1 ($2)',
+'nocontribs'          => 'Ο�δεμία ἀλλαγὴ ηὑ�έθη π�οσήκουσα εἰς τάδε τὰ κ�ιτή�ια.',
+'uctop'               => '(ἄκ�ον)',
+'month'               => 'Μήν:',
+'year'                => 'Ἔτος:',
+
+'sp-contributions-newbies'       => 'Δεικν�ναι ��άνους νέων λογισμῶν μόνον',
+'sp-contributions-newbies-sub'   => 'Ἔ�ανοι νέων χ�ωμένων',
+'sp-contributions-newbies-title' => 'Ἔ�ανοι χ�ωμένου διὰ νέους λογισμο�ς',
+'sp-contributions-blocklog'      => 'Τὰ ἀποκλῄειν',
+'sp-contributions-search'        => 'Ζητεῖν ��άνους',
+'sp-contributions-username'      => 'IP-διε�θυνσις ἢ ὄνομα χ�ωμένου:',
+'sp-contributions-submit'        => 'Ζητεῖν',
 
 # What links here
 'whatlinkshere'            => 'Τὰ �νθάδε ἄγοντα',
 'whatlinkshere-title'      => 'Δέλτοι συνεζευγμέναι μετὰ τοῦ "$1"',
 'whatlinkshere-page'       => 'Δέλτος:',
-'linklistsub'              => '(Κατάλογος τῶν συνδέσμων)',
 'linkshere'                => "Τάδε ἄγουσι π�ὸς '''[[:$1]]''':",
 'nolinkshere'              => "Ο�δένα ἄγουσι π�ὸς '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Ο�δεμία δέλτος συνδέεται τῇ '''[[:$1]]''' �ν τῷ �πιλεγμένῳ ὀνοματείῳ.",
@@ -1380,8 +1633,8 @@ $1',
 # Block/unblock
 'blockip'                         => 'Ἀποκλῄειν τόνδε τὸν χ�ώμενον',
 'blockip-legend'                  => 'Φ�άττειν χ�ώμενον',
-'ipaddress'                       => 'IP-Διε�θυνσις:',
-'ipadressorusername'              => 'IP-Διε�θυνσις ἢ ὄνομα χ�ωμένου :',
+'ipaddress'                       => 'Διε�θυνσις IP:',
+'ipadressorusername'              => 'Διε�θυνσις IP ἢ ὄνομα χ�ωμένου:',
 'ipbexpiry'                       => 'Λῆξις:',
 'ipbreason'                       => 'Αἰτία:',
 'ipbreasonotherlist'              => 'Ἑτέ�α αἰτία',
@@ -1409,13 +1662,17 @@ $1',
 'ipb-unblock'                     => 'Ἐκφ�άττειν ὄνομα χ�ωμένου τι ἢ IP-διε�θυνσιν τινά',
 'ipb-blocklist-addr'              => 'Ὁ�ᾶν τὰς ὑπά�χουσας φ�αγὰς διὰ $1',
 'ipb-blocklist'                   => 'Ὁ�ᾶν τὰς ὑπά�χουσας φ�αγὰς',
+'ipb-blocklist-contribs'          => 'Ἔ�ανοι τοῦ $1',
 'unblockip'                       => 'Ἐκφ�άττειν χ�ώμενον',
-'ipusubmit'                       => 'Ἐκφ�άττειν τήνδε τὴν διε�θυνσιν',
+'ipusubmit'                       => 'Αἴ�ειν τήνδε τὴν φ�αγήν',
 'unblocked'                       => '[[User:$1|$1]] �κπεφ�αγμέν-ος/-η',
 'unblocked-id'                    => 'Ἡ φ�αγὴ τοῦ/τῆς $1 ἀφῃ�έθη',
 'ipblocklist'                     => 'Πεφ�αγμέναι IP-διευθ�νσεις καὶ ὀνόματα τῶν χ�ωμένων',
 'ipblocklist-legend'              => 'Εὑ�ίσκειν πεφ�αγμένον χ�ώμενον τινά',
 'ipblocklist-username'            => 'Ὄνομα χ�ωμένου ἢ IP-διε�θυνσις:',
+'ipblocklist-sh-userblocks'       => '$1 φ�αγαὶ λογισμῶν',
+'ipblocklist-sh-tempblocks'       => '$1 π�οσω�ιναὶ φ�αγαί',
+'ipblocklist-sh-addressblocks'    => '$1 μεμονωμέναι φ�αγαὶ IP',
 'ipblocklist-submit'              => 'Ζητεῖν',
 'blocklistline'                   => '$3 �φ�άχθη ὑπὸ $1, $2 ($4)',
 'infiniteblock'                   => 'ἄπει�ον',
@@ -1424,22 +1681,28 @@ $1',
 'noautoblockblock'                => 'α�τόματος φ�αγὴ κατεσταλμένη',
 'createaccountblock'              => 'ποίησις λογισμοῦ πεφ�αγμένη',
 'emailblock'                      => 'ἠλεκτ�ονικὸν ταχυδ�ομεῖον πεφ�αγμένον',
+'blocklist-nousertalk'            => 'ἀδ�νατον τὸ μεταγ�άφειν τὴν ἑαυτὴν δέλτον διαλέξεως',
 'ipblocklist-empty'               => 'Κενὸς � κατάλογος φ�αγῶν.',
 'ipblocklist-no-results'          => 'Τὸ αἰτηθὲν ὄνομα χ�ωμένου ἢ IP-διε�θυνσις μὴ πεφ�αγμένα εἰσίν.',
 'blocklink'                       => 'ἀπόκλῃσις',
 'unblocklink'                     => 'χαλᾶν φ�αγήν',
+'change-blocklink'                => 'ἀλλαγὴ φ�αγῆς',
 'contribslink'                    => 'Ἔ�ανοι',
 'blocklogpage'                    => 'Αἱ ἀποκλῄσεις',
+'blocklog-fulllog'                => 'Κατάλογος πλή�ης τῶν φ�αγῶν',
 'blocklogentry'                   => 'Κεκλῃμένος [[$1]] μέχ�ι οὗ $2 $3',
 'unblocklogentry'                 => '$1 �κπεφ�αγμένος',
 'block-log-flags-anononly'        => 'μόνον ἀνώνυμοι χ�ώμενοι',
 'block-log-flags-nocreate'        => 'ποίησις λογισμοῦ κατεσταλμένη',
 'block-log-flags-noautoblock'     => 'α�τόματος φ�αγὴ κατεσταλμένη',
 'block-log-flags-noemail'         => 'ἠλ-ταχυδ�ομεῖον πεφ�αγμένον',
+'block-log-flags-nousertalk'      => 'μὴ δυναμένη ἡ μεταγ�αφή τῆς δέλτου σου �στίν',
 'block-log-flags-angry-autoblock' => '�νισχυμένη α�τόματος φ�αγὴ δυνατὴ κατέστη',
 'ipb_expiry_invalid'              => 'Χ�όνος λήξεως ἄκυ�ος.',
 'ipb_expiry_temp'                 => 'Αἱ φ�αγαὶ τῶν κ�υφῶν ὀνομάτων χ�ωμένων δεῖ εἶναι μόνιμοι.',
 'ipb_already_blocked'             => '"$1" ἤδη πεφ�αγμέν-ος/-η �στίν',
+'ipb-needreblock'                 => '== Ἤδη ἀποκεκλῃσμένος==
+Ἤδη ἀποκεκλῃσμένος � $1 �στίν. Βο�λεσαι ἀλλάξειν τὰς ῥυθμίσεις;',
 'ipb_cant_unblock'                => 'Σφάλμα: Ἡ φ�αγὴ τῆς ID $1 ο�κ εὑ�έθη.
 Εἰκότως �κπεφ�αγμένη ἤδη �στίν.',
 'ip_range_invalid'                => 'Ἄκυ�ον IP-εὖ�ος.',
@@ -1462,9 +1725,9 @@ $1',
 'databasenotlocked'   => 'Ἡ βάσις δεδομένων ο�κ �στὶ κεκλῃσμένη.',
 
 # Move page
-'move-page'               => 'Κινεῖν $1',
-'move-page-legend'        => 'Κινεῖν τὴν δέλτον',
-'movepagetext'            => "Χ�ῆτε τὸν ἀκόλουθον τ�πον διὰ τὴν μετωνόμασιν τῆς δέλτου καὶ διὰ τὴν μεταφο�ὰν ὅλου τοῦ ἑοῦ ἱστο�ικοῦ ὑπὸ τὸ νέον ὄνομα. 
+'move-page'                    => 'Κινεῖν $1',
+'move-page-legend'             => 'Κινεῖν τὴν δέλτον',
+'movepagetext'                 => "Χ�ῆτε τὸν ἀκόλουθον τ�πον διὰ τὴν μετωνόμασιν τῆς δέλτου καὶ διὰ τὴν μεταφο�ὰν ὅλου τοῦ ἑοῦ ἱστο�ικοῦ ὑπὸ τὸ νέον ὄνομα. 
 Ἡ π�οηγουμένη �πιγ�αφὴ τῆς δέλτου ἔσται δέλτος τις ἀνακατευθ�νσεως. Οἱ τυχόντες σ�νδεσμοι π�ὸς τὴν π�οηγουμένην δέλτον ἀναλλοίωτοι ἔσονται. 
 Βεβαιοῦσθε πε�ὶ τῆς μὴ ὑπά�ξεως [[Special:DoubleRedirects|διπλῶν]] ἢ [[Special:BrokenRedirects|διεφθα�μένων συνδέσμων]]. 
 Ἀναλαμβάνετε τὴν ε�θ�νην τοῦ �πιβεβαιῶσαι τὴν ὀ�θὴν καὶ ὑποτιθεμένην κατε�θυνσιν τῶν συνδέσμων.
@@ -1473,41 +1736,47 @@ $1',
 
 '''ΠΡΟΣΟΧΗ!'''
 Ἡ μετωνόμασις δέλτου τινὸς αἰφνιδία καὶ δ�αστικὴ ἀλλαγή �στιν �πηνίκα π�όκειται πε�ὶ δημοφιλοῦς δέλτου· πα�ακαλοῦμεν ὑμᾶς ἵνα �ξετάζητε τὰς πιθανὰς �πιπτώσεις τα�της τῆς �νε�γείας, π�ὸ τῆς ἀποφάσεως ὑμῶν.",
-'movepagetalktext'        => "Ἡ σχετικὴ δέλτος διαλέξεως μετακινήσεται α�τομάτως μετὰ τῆς δέλτου �γγ�αφῆς '''�κτός εἰ ο�(χ):'''
+'movepagetalktext'             => "Ἡ σχετικὴ δέλτος διαλέξεως μετακινήσεται α�τομάτως μετὰ τῆς δέλτου �γγ�αφῆς '''�κτός εἰ ο�(χ):'''
 *Μετακινήσεις τὴν δέλτον εἰς διάφο�ον ὀνοματικὸν χῶ�ον (namespace), ἢ
 *Ὑπά�χει ὑπὸ τὸ νέον ὄνομα μὴ κενὴ δέλτος τις διαλέξεως, ἢ
 *Ἀφῄ�ηκας τὴν κατασήμανσιν (check) �κ τοῦ κυτίου κατωτέ�ω.
 
-Ἐν τα�ταις ταῖς πε�ιπτώσεσι, δεῖ σοι μετακινῆσαι ἢ συγχωνεῦσαι τὴν δέλτον μέσῳ ἀντιγ�αφῆς-καὶ-�πικολήσεως.",
-'movearticle'             => 'Κινεῖν τὴν δέλτον:',
-'newtitle'                => 'Π�ὸς τὸ νέον ὄνομα:',
-'move-watch'              => 'Ἑφο�ᾶν τήνδε τὴν δέλτον',
-'movepagebtn'             => 'Κινεῖν τὴν δέλτον',
-'pagemovedsub'            => 'Κεκίνηται ἡ δέλτος',
-'movepage-moved'          => '<big>\'\'\'"$1" κεκίνηται π�ὸς "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Εἶτε ἢ �στὶ δέλτος τις οὕτως ὀνομαστὴ ἢ ἄκυ�ον �στι τὸ �πειλεγμένον ὄνομα.
+Ἐν τα�ταις ταῖς πε�ιπτώσεσι, δεῖ σε μετακινῆσαι ἢ συγχωνεῦσαι τὴν δέλτον μέσῳ ἀντιγ�αφῆς-καὶ-�πικολλήσεως.",
+'movearticle'                  => 'Κινεῖν τὴν δέλτον:',
+'movenologin'                  => 'Ο� συνδεδεμένος',
+'newtitle'                     => 'Π�ὸς τὸ νέον ὄνομα:',
+'move-watch'                   => 'Ἑφο�ᾶν τήνδε τὴν δέλτον',
+'movepagebtn'                  => 'Κινεῖν τὴν δέλτον',
+'pagemovedsub'                 => 'Κεκίνηται ἡ δέλτος',
+'movepage-moved'               => '<big>\'\'\'"$1" κεκίνηται π�ὸς "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Ἁναδιε�θυνσίς τις �ποιήθη.',
+'articleexists'                => 'Εἶτε ἢ �στὶ δέλτος τις οὕτως ὀνομαστὴ ἢ ἄκυ�ον �στι τὸ �πειλεγμένον ὄνομα.
 Ἄλλως τὴν δέλτον ὀνόμασον.',
-'talkexists'              => "'''Κεκίνηται μὲν ἡ δέλτος α�τὴ, ἡ δὲ διαλόγου δέλτος ο� κεκίνηται ὅτι ἤδη �στὶ �νθάδε διαλόγου δέλτος.
-Δεῖ σοι καθ'ἕκαστον συγκε�ανν�ναι.'''",
-'movedto'                 => 'Κεκίνηται π�ὸς',
-'movetalk'                => 'Κινεῖν τὴν διαλόγου δέλτον',
-'move-subpages'           => 'Κινοῦν �πάσας τὰς ὑποδέλτους, εἰ �φα�μοστόν',
-'move-talk-subpages'      => 'Κινοῦν �πάσας τὰς ὑποδέλτους τῆς δέλτου διαλέξεως, εἰ �φα�μοστόν',
-'movepage-page-moved'     => 'Ἡ δέλτος $1 μετακεκίνηται εἰς $2.',
-'movepage-page-unmoved'   => 'Ἡ δέλτος $1 μὴ μετακεκινημένη �στὶν εἰς $2.',
-'movepage-max-pages'      => 'Τὸ μέγιστον τῶν $1 {{PLURAL:$1|δέλτου|δέλτων}} μετεκινήθη ἤδη καὶ ο� πλέον μετακινηθήσεται α�τομάτως.',
-'1movedto2'               => '[[$1]] �κινήθη π�ὸς [[$2]]',
-'1movedto2_redir'         => '[[$1]] μετακινηθεῖσα εἰς [[$2]] μέσῳ ἀναδιευθ�νσεως',
-'movelogpage'             => 'Τὰ κινηθέντα',
-'movelogpagetext'         => 'Κατωτέ�ω �στὶ καταλογή τις τῶν κεκινημένων δέλτων.',
-'movereason'              => 'Ἀπολογία:',
-'revertmove'              => 'Ἐπανέ�χεσθαι',
-'delete_and_move'         => 'Διαγ�άφειν καὶ κινεῖν',
-'delete_and_move_text'    => '==Διαγ�αφὴ ἀπα�αίτητος==
+'talkexists'                   => "'''Κεκίνηται μὲν ἡ δέλτος α�τὴ, ἡ δὲ διαλόγου δέλτος ο� κεκίνηται ὅτι ἤδη �στὶ �νθάδε διαλόγου δέλτος.
+Δεῖ σε καθ'ἕκαστον συγκε�ανν�ναι.'''",
+'movedto'                      => 'Κεκίνηται π�ὸς',
+'movetalk'                     => 'Κινεῖν τὴν διαλόγου δέλτον',
+'move-subpages'                => 'Κινοῦν �πάσας τὰς ὑποδέλτους, εἰ �φα�μοστόν',
+'move-talk-subpages'           => 'Κινοῦν �πάσας τὰς ὑποδέλτους τῆς δέλτου διαλέξεως, εἰ �φα�μοστόν',
+'movepage-page-moved'          => 'Ἡ δέλτος $1 μετακεκίνηται εἰς $2.',
+'movepage-page-unmoved'        => 'Ἡ δέλτος $1 μὴ μετακεκινημένη �στὶν εἰς $2.',
+'movepage-max-pages'           => 'Τὸ μέγιστον τῶν $1 {{PLURAL:$1|δέλτου|δέλτων}} μετεκινήθη ἤδη καὶ ο� πλέον μετακινηθήσεται α�τομάτως.',
+'1movedto2'                    => '[[$1]] �κινήθη π�ὸς [[$2]]',
+'1movedto2_redir'              => '[[$1]] μετακινηθεῖσα εἰς [[$2]] μέσῳ ἀναδιευθ�νσεως',
+'move-redirect-suppressed'     => 'κατεσταλμένη ἡ ἀναδιε�θυνσις',
+'movelogpage'                  => 'Τὰ κινηθέντα',
+'movelogpagetext'              => 'Κατωτέ�ω �στὶ καταλογή τις τῶν κεκινημένων δέλτων.',
+'movereason'                   => 'Ἀπολογία:',
+'revertmove'                   => 'Ἐπανέ�χεσθαι',
+'delete_and_move'              => 'Διαγ�άφειν καὶ κινεῖν',
+'delete_and_move_text'         => '==Διαγ�αφὴ ἀπα�αίτητος==
 Ἡ �γγ�αφὴ [[:$1]] ὑπά�χει ἤδη. Βο�λῃ διαγ�άψειν τήνδε ἵνα �κτελέσηται ἡ μετακίνησις;',
-'delete_and_move_confirm' => '�αί, διάγ�αψον τὴν δέλτον',
-'delete_and_move_reason'  => 'Διαγ�αφεῖσα οὕτως ὥστε ποιηθῇ χῶ�ος διὰ τὴν μετακίνησιν',
-'imageinvalidfilename'    => 'Τὸ ὄνομα ἀ�χείου - στόχος ἄκυ�ον �στίν',
+'delete_and_move_confirm'      => '�αί, διάγ�αψον τὴν δέλτον',
+'delete_and_move_reason'       => 'Διαγ�αφεῖσα οὕτως ὥστε ποιηθῇ χῶ�ος διὰ τὴν μετακίνησιν',
+'immobile-target-namespace-iw' => 'Ὁ δια�ίκι-σ�νδεσμος μὴ ἔγκυ�ος στόχος �στὶ διὰ τὴν μετακίνησιν τῆς δέλτου.',
+'immobile-source-page'         => 'Δέλτος μὴ μετακινήσιμος αὕτη.',
+'imageinvalidfilename'         => 'Τὸ ὄνομα ἀ�χείου - στόχος ἄκυ�ον �στίν',
+'move-leave-redirect'          => 'Πα�έχειν �μπ�όσθιον ἀναδιε�θυνσίν τινα',
 
 # Export
 'export'            => 'Δέλτους �ξάγειν',
@@ -1538,9 +1807,12 @@ $1',
 # Special:Import
 'import'                     => 'Εἰσάγειν δέλτους',
 'importinterwiki'            => 'Ὑπε�δια�ίκι-εἰσαγωγή',
+'import-interwiki-source'    => 'Ϝίκι/δέλτος πηγή:',
 'import-interwiki-history'   => 'Ἀντιγ�άφειν �πάσας τὰς �κδόσεις τοῦ ἱστο�ικοῦ τῆσδε τῆς δέλτου',
 'import-interwiki-submit'    => 'Εἰσάγειν',
 'import-interwiki-namespace' => 'Ὀνοματεῖον π�οο�ισμός:',
+'import-upload-filename'     => 'Ὄνομα ἀ�χείου:',
+'import-comment'             => 'Σχόλιον:',
 'importstart'                => 'Εἰσάγειν δέλτους...',
 'import-revision-count'      => '$1 {{PLURAL:$1|ἀναθεώ�ησις|ἀναθεω�ήσεις}}',
 'importnopages'              => 'Ο�δεμία εἰσακτέα δέλτος.',
@@ -1550,6 +1822,7 @@ $1',
 'importbadinterwiki'         => 'Κακὸς δια�ικισ�νδεσμος',
 'importnotext'               => 'Κενὸν ἢ ο�δὲν κείμενον',
 'importsuccess'              => 'Εἰσαγωγὴ τετελεσμένη!',
+'importnosources'            => 'Ο�δεμία πηγὴ εἰσαγωγῆς ὑπε�δια�ίκι καθω�ισμένη �στὶ καὶ τὸ ἄμεσον ἀντίγ�αφον τοῦ ἱστο�ικοῦ ἀνενε�γὸν κατεστάθη.',
 'importnofile'               => 'Ο�δὲν �πιφο�τισθὲν ἀ�χεῖον εἰσαγωγῆς.',
 'import-parse-failure'       => 'ἀπότευξις τῆς λεξιαναλ�σεως τῆς εἰσαγωγῆς τῆς XML',
 'import-noarticle'           => 'Ο�δεμία εἰσακτέα δέλτος!',
@@ -1557,6 +1830,7 @@ $1',
 'xml-error-string'           => '$1 �ις τὴν $2, στηλ. $3 (δυφίον $4): $5',
 'import-upload'              => 'Ἐπιφό�τωσις δεδομένων XML',
 'import-token-mismatch'      => 'Ἀπὠλεια συνοδῶν δεδομένων. Πεί�ασον πάλιν.',
+'import-invalid-interwiki'   => 'Μὴ δυνατὴ ἡ εἰσαγωγὴ �κ τοῦ καθω�ισμένου �ίκι.',
 
 # Import log
 'importlogpage'                    => 'Εἰσάγειν κατάλογον',
@@ -1567,18 +1841,18 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|ἀναθεώ�ησις|ἀναθεω�ήσεις}} �κ τοῦ $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Τὴν δέλτον χ�ωμένου �μήν',
-'tooltip-pt-mytalk'               => 'Ἡ διάλεξίς μου',
+'tooltip-pt-userpage'             => 'Ἡ δέλτος χ�ωμένου σου',
+'tooltip-pt-mytalk'               => 'Ἡ διάλεξίς σου',
 'tooltip-pt-anontalk'             => 'Δίαλεξις πε�ὶ τῶν μεταγ�αφῶν μέσῳ τῆσδε τῆς IP-διευθ�νσεως',
 'tooltip-pt-preferences'          => 'Αἱ αἱ�έσεις μου',
 'tooltip-pt-watchlist'            => 'Κατάλογος τῶν �φο�ωμένων μου',
-'tooltip-pt-mycontris'            => 'Κατάλογος τῶν ��άνων μου',
+'tooltip-pt-mycontris'            => 'Κατάλογος τῶν ��άνων σου',
 'tooltip-pt-login'                => 'Ἐνθα��υντέον τὸ συνδεῖσθαι, ο�κ ὑποχ�εωτικόν.',
 'tooltip-pt-anonlogin'            => 'Ἐνθα��υντέον τὸ συνδεῖσθαι, ο�κ ὑποχ�εωτικόν.',
 'tooltip-pt-logout'               => 'Ἐξέ�χεσθαι',
 'tooltip-ca-talk'                 => 'Διάλεκτος πε�ὶ τῆς δέλτου',
 'tooltip-ca-edit'                 => 'Ἔξεστί σοι μεταγ�άφειν τήνδε τὴν δέλτον. Π�οθεω�εῖν π�ὶν ἂν γ�άφῃς τὴν δέλτον.',
-'tooltip-ca-addsection'           => 'Π�οστιθέναι σχόλιόν τι τῇδε τῇ διαλέξει.',
+'tooltip-ca-addsection'           => 'Ἄ�χειν νέον τμῆμα',
 'tooltip-ca-viewsource'           => 'Σῴζεται ἥδε ἡ δέλτος.
 Ἔξεστί σοι τὴν πηγήν �πισκοπεῖν.',
 'tooltip-ca-history'              => 'Π�οηγουμέναι �κδόσεις τῆσδε τῆς δέλτου.',
@@ -1588,15 +1862,17 @@ $1',
 'tooltip-ca-watch'                => 'Ἐφο�ᾶν τήνδε τὴν δέλτον',
 'tooltip-ca-unwatch'              => 'Ἀνεφο�ᾶν τήνδε τὴν δέλτον',
 'tooltip-search'                  => 'Ζητεῖν {{SITENAME}}',
+'tooltip-search-go'               => 'Ἴθι π�ὸς δέλτον τινὰ �μοίως ὀνομαζομένην εἰ ᾖ',
 'tooltip-search-fulltext'         => 'Ζητεῖν �πάσας τᾶς δέλτους τὰς πε�ιέχουσας τόδε τὸ κείμενον',
 'tooltip-p-logo'                  => 'Δέλτος Μεγίστη',
 'tooltip-n-mainpage'              => 'Πο�ε�εσθαι τὴν κυ�ίαν Δέλτον',
-'tooltip-n-portal'                => 'Τὰ πε�ὶ τα�της τῆς �γκυκλοπαιδείας, τῶν οἵων ἔξεστί σοι π�άττεις, ποῦ πά�εστί τινα',
+'tooltip-n-portal'                => 'Πε�ὶ το�του τοῦ �γχει�ήματος καὶ τῶν οἵων ἔξεστί σoι π�άττεις, πο� πά�εστί τινα εἶναι',
 'tooltip-n-currentevents'         => 'Πλη�οφο�ίαι �πὶ �πικαί�ων γεγονότων',
 'tooltip-n-recentchanges'         => 'Κατάλογος κατὰ πᾶσας τὰς νέας μεταβολάς.',
 'tooltip-n-randompage'            => 'Τινὰ δέλτον χ�δην �πιφο�τίζειν',
 'tooltip-n-help'                  => 'Μάθησις πε�ὶ τοῦδε τοῦ �ίκι.',
 'tooltip-t-whatlinkshere'         => 'Κατάλογος τῶν �νθάδε ἀγόντων',
+'tooltip-t-recentchangeslinked'   => 'Π�όσφατοι μεταβολαὶ �ν δέλτοις συνεζευγμένοις μετὰ τῆσδε τῆς δέλτου',
 'tooltip-feed-rss'                => 'RSS Ῥοὴ διὰ τήνδε δέλτον',
 'tooltip-feed-atom'               => 'Atom Ῥοὴ διὰ τήνδε δέλτον',
 'tooltip-t-contributions'         => 'Ὁ�ᾶν τοὺς τοῦδε τοῦ χ�ωμένου ��άνους',
@@ -1604,6 +1880,7 @@ $1',
 'tooltip-t-upload'                => 'Φο�τία �ντιθέναι',
 'tooltip-t-specialpages'          => 'Κατάλογος κατὰ πᾶσας τὰς εἰδικὰς δέλτους',
 'tooltip-t-print'                 => 'Ἐκτυπώσιμος ἔκδοσις τῆσδε τῆς δέλτου',
+'tooltip-t-permalink'             => 'Μόνιμος σ�νδεσμος π�ὸς τήνδε τὴν ἔκδοσιν τῆς δέλτου',
 'tooltip-ca-nstab-main'           => 'χ�ῆμα δέλτον ��ᾶν',
 'tooltip-ca-nstab-user'           => 'Δέλτος χ�ωμένου ��ᾶν',
 'tooltip-ca-nstab-media'          => 'Ὁ�ᾶν τὴν δέλτον μέσων',
@@ -1621,18 +1898,22 @@ $1',
 'tooltip-compareselectedversions' => 'Ὁ�ᾶν τὰς διαφο�ὰς μεταξὺ τῶν δ�ω �πειλεγμένων �κδοχῶν τα�της τῆς δέλτου.',
 'tooltip-watch'                   => 'Ἐφο�ᾶν τήνδε τὴν δέλτον',
 'tooltip-upload'                  => 'Ἐκκινεῖν �πιφό�τωσιν',
+'tooltip-rollback'                => 'Ἡ "Ἀναστ�οφὴ" ἀναστ�έφει τὰς μεταγ�αφὰς τῆσδε τῆς δέλτου ὑπὸ τοῦ ὑστάτου συμβάλλοντος μέσῳ ἑνὸς κλίκ',
+'tooltip-undo'                    => 'Ἡ "Ἀναί�εσις" ἀναι�εῖ τήνδε τὴν μεταγ�αφἢν καὶ ἀνοίγει τὸν τ�πον μεταγ�αφῆς �ν καταστάσει π�οθεω�ήσεως.
+Ἐπιτ�έπει τὴν π�οσθήκην αἰτιολογίας �ν τῇ συνόψει',
 
 # Metadata
 'nodublincore'      => 'Τὰ RDF-μεταδεδομένα τὰ ἀφο�ῶντα τὸ π�ότυπον κανόνων Dublin Core ἀπενε�γηθέντα εἰσὶ �ν τῇδε τῇ �ξυπη�ετικῇ μηχανῇ.',
 'nocreativecommons' => 'Τὰ RDF-μεταδεδομένα τὰ ἀφο�ῶντα τὰ Creative Commons (Δημιου�γικὰ Κοινά) ἀπενε�γηθέντα εἰσὶ �ν τῇδε τῇ �ξυπη�ετικῇ μηχανῇ.',
+'notacceptable'     => 'Ἡ �ξυπη�ετικὴ μηχανὴ τοῦ �ίκι ο� δ�ναται πα�άσχειν δεδομένα �ν διαμο�φώσει τινὰ ἀναγνωσίμῳ ὑπ�σοῦ.',
 
 # Attribution
-'anonymous'        => 'Ἀνώνυμ-ος,-οι χ�ώμεν-οσ,-οι τοῦ {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Ἀνώνυμος χ�ώμενος|Ἀνώνυμοι χ�ώμενοι}} τῷ {{SITENAME}}',
 'siteuser'         => 'Χ�ώμενος τῷ {{SITENAME}} $1',
 'lastmodifiedatby' => 'Ἥδε ἡ δ�λτος ἠλλάχθη ὑστάτως $2, $1 �κ τοῦ $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Βεβασισμένον τῷ ἔ�γῳ τοῦ/τῶν $1.',
 'others'           => 'ἄλλοι',
-'siteusers'        => '{{SITENAME}} χ�ώμεν-ος,-οι $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|χ�ωμένου|χ�ωμένων}} τῷ $1',
 'creditspage'      => 'Διαπιστε�σεις δέλτου',
 
 # Spam protection
@@ -1651,8 +1932,8 @@ $1',
 'mw_math_png'    => 'Ἀπόδοσις PNG πάντοτε',
 'mw_math_simple' => 'HTML εἰ λίαν �πλοῦν, εἰδἄλλως PNG',
 'mw_math_html'   => 'HTML εἰ δυνατὸν, εἰδἄλλως PNG',
-'mw_math_source' => 'Ἄφες το ὡς TeX (διὰ πλοηγοὺς κειμένων)',
-'mw_math_modern' => 'Π�οτεινομένη διὰ συγχ�όνους πλοηγο�ς',
+'mw_math_source' => 'Ἄφες το ὡς TeX (διὰ πλοηγητή�ια κειμένων)',
+'mw_math_modern' => 'Π�οτεινομένη διὰ σ�γχ�ονα πλοηγητή�ια',
 'mw_math_mathml' => 'MathML εἰ δυνατόν (πει�αστικόν)',
 
 # Patrolling
@@ -1663,10 +1944,12 @@ $1',
 'markedaspatrollederror' => 'Μὴ δυνατὴ ἡ σήμανσις πε�ιπολήσεως',
 
 # Patrol log
-'patrol-log-page'   => 'Κατάλογος πε�ιπόλων',
-'patrol-log-header' => '�δε �στὶ κατάλογος πε�ιπολουμένων ἀναθεω�ήσεων.',
-'patrol-log-line'   => 'σήμανσις τῆς �κδόσεως $1 τοῦ $2 ὡς πε�ιπολουμένη $3',
-'patrol-log-auto'   => '(α�τόματον)',
+'patrol-log-page'      => 'Κατάλογος πε�ιπόλων',
+'patrol-log-header'    => '�δε �στὶ κατάλογος πε�ιπολουμένων ἀναθεω�ήσεων.',
+'patrol-log-line'      => 'σήμανσις τῆς �κδόσεως $1 τοῦ $2 ὡς πε�ιπολουμένη $3',
+'patrol-log-auto'      => '(α�τόματον)',
+'patrol-log-diff'      => 'ἀναθεώ�ησις $1',
+'log-show-hide-patrol' => '$1 κατάλογος πε�ιπόλου',
 
 # Image deletion
 'deletedrevision'       => 'Π�οτέ�α ἔκδοσις διαγ�αφεῖσα $1',
@@ -1679,6 +1962,9 @@ $1',
 'previousdiff' => '� Ἡ μεταβολὴ ἡ π�οτέ�α',
 'nextdiff'     => 'Ἡ μεταβολὴ ἡ νεωτέ�α →',
 
+# Visual comparison
+'visual-comparison' => 'Ὀπτικὴ σ�γκ�ισις',
+
 # Media information
 'thumbsize'            => 'Μέγεθος μικ�ογ�αφίας:',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|δέλτος|δέλτοι}}',
@@ -1689,13 +1975,16 @@ $1',
 'show-big-image'       => 'Πλή�ης ἀνάλυσις',
 'show-big-image-thumb' => '<small>Τῆσδε τῆς π�οθεω�ήσεως μέγεθος: $1 × $2 εἰκονοστοιχεῖα</small>',
 
-# Special:NewImages
-'newimages'     => 'Τὰ νέα φο�τία δεῦ�ο ἀθ�οίζειν',
-'imagelisttext' => "Κάτωθι κατάλογός �στιν '''$1''' {{PLURAL:$1|ἀ�χείου|ἀ�χείων}} ταξινομημέν-ου/-ων κατὰ σει�ὰν $2.",
-'showhidebots'  => '($1 α�τόματα)',
-'noimages'      => 'Ο�δεμία εἰκών.',
-'ilsubmit'      => 'Ζητεῖν',
-'bydate'        => 'κατὰ χ�ονολογίαν',
+# Special:NewFiles
+'newimages'             => 'Τὰ νέα φο�τία δεῦ�ο ἀθ�οίζειν',
+'imagelisttext'         => "Κάτωθι κατάλογός �στιν '''$1''' {{PLURAL:$1|ἀ�χείου|ἀ�χείων}} ταξινομημέν-ου/-ων κατὰ σει�ὰν $2.",
+'newimages-legend'      => 'Διηθητή�ιον',
+'newimages-label'       => 'Ἀ�χειώνυμον (ἢ μέ�ος οὗ):',
+'showhidebots'          => '($1 α�τόματα)',
+'noimages'              => 'Ο�δεμία εἰκών.',
+'ilsubmit'              => 'Ζητεῖν',
+'bydate'                => 'κατὰ χ�ονολογίαν',
+'sp-newimages-showfrom' => 'Δεῖξις νέων ἀ�χείων ἀ�χομένη �κ $2, $1',
 
 # Bad image list
 'bad_image_list' => 'Ἡ μο�φοποιία ὡς ἑξῆς �στίν:
@@ -1739,6 +2028,7 @@ $1',
 'exif-transferfunction'            => 'Συνά�τησις μεταφο�ᾶς',
 'exif-whitepoint'                  => 'Χ�ωματικότης λευκοῦ σημείου',
 'exif-primarychromaticities'       => 'Π�ωτε�ουσαι χ�ωματικότητες',
+'exif-referenceblackwhite'         => 'Ζεῦγος μελανῶν καὶ λευκῶν τιμῶν ἀναφο�ᾶς',
 'exif-datetime'                    => 'Χ�ονολογία μεταβολῆς τοῦ ἀ�χείου',
 'exif-imagedescription'            => 'Ἐπιγ�αφὴ εἰκόνος',
 'exif-make'                        => 'Ἐξε�γαστὴς τῆς εἰκονοληπτικῆς μηχανῆς',
@@ -1890,9 +2180,21 @@ $1',
 'exif-lightsource-17'  => 'Τυπικὸν φῶς A',
 'exif-lightsource-18'  => 'Τυπικὸν φῶς B',
 'exif-lightsource-19'  => 'Τυπικὸν φῶς C',
-'exif-lightsource-24'  => 'Βα�υλίθιον τοῦ ��γαστη�ίου ISO',
+'exif-lightsource-24'  => 'Βα�υλίθιον τοῦ ��γαστη�ίου κανονικοποιημένον κατὰ ISO',
 'exif-lightsource-255' => 'Ἑτέ�αι φωτοπηγαί',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Τὸ ἀστ�αποβόλον ο�κ ἧψεν',
+'exif-flash-fired-1'    => 'Τὸ ἀστ�αποβόλον ἧψεν',
+'exif-flash-return-0'   => 'ο�δὲν στ�οβοσκόπιον �πιστ�έφει φῶς τι διακ�ιτόν',
+'exif-flash-return-2'   => 'τὸ στ�οβοσκόπιον ο�κ �πιστ�έφει φῶς τι διακ�ιτόν',
+'exif-flash-return-3'   => 'τὸ στ�οβοσκόπιον �πιστ�έφει φῶς τι διακ�ιτόν',
+'exif-flash-mode-1'     => 'δέουσα ἡ ἅψις τοῦ ἀστ�αποβόλου',
+'exif-flash-mode-2'     => 'δέουσα ἡ καταστολὴ τοῦ ἀστ�αποβόλου',
+'exif-flash-mode-3'     => 'α�τόματος τ�όπος',
+'exif-flash-function-1' => 'Ο�δεμία ἀστ�αποβόλησις',
+'exif-flash-redeye-1'   => 'τ�όπος μειώσεως τοῦ φαινομένου τῶν ��υθ�ῶν ὀφθαλμῶν',
+
 'exif-focalplaneresolutionunit-2' => 'ο�γκιαί',
 
 'exif-sensingmethod-1' => 'Ἀό�ιστος',
@@ -1921,10 +2223,10 @@ $1',
 'exif-scenecapturetype-3' => '�υκτε�ινὴ σκηνή',
 
 'exif-gaincontrol-0' => 'Ο�δεμία',
-'exif-gaincontrol-1' => 'Χθαμηλὸν κέ�δος ἄνω',
-'exif-gaincontrol-2' => 'Ὑψηλὸν κέ�δος ἄνω',
-'exif-gaincontrol-3' => 'Χθαμηλὸν κέ�δος κάτω',
-'exif-gaincontrol-4' => 'Ὑψηλὸν κέ�δος κάτω',
+'exif-gaincontrol-1' => 'Χθαμηλὸν κέ�δος θετικόν',
+'exif-gaincontrol-2' => 'Ὑψηλὸν κέ�δος θετικόν',
+'exif-gaincontrol-3' => 'Χθαμηλὸν κέ�δος ἀ�νητικόν',
+'exif-gaincontrol-4' => 'Ὑψηλὸν κέ�δος ἀ�νητικόν',
 
 'exif-contrast-0' => 'Κανονική',
 'exif-contrast-1' => 'Ἁπαλή',
@@ -1981,7 +2283,9 @@ $1',
 'confirmemail'             => 'Ἐπιβεβαίωσον διε�θυνσιν ἠλ-ταχυδ�ομείου',
 'confirmemail_send'        => 'Ταχυδ�ομήσειν κώδικα �πιβεβαιώσεως',
 'confirmemail_sent'        => 'Ἐπιβεβαίωσις διευθ�νσεως ἠλ.-ταχυδ�ομείου �στάλη.',
-'confirmemail_needlogin'   => 'Δεῖ σοι $1 διὰ τὴν �πιβεβαίωσιν τῆς ἠλ-διευθ�νσεώς σου.',
+'confirmemail_needlogin'   => 'Δεῖ σε $1 διὰ τὴν �πιβεβαίωσιν τῆς ἠλ-διευθ�νσεώς σου.',
+'confirmemail_success'     => 'Ἡ ἠ-διευθυνσίς σου �πιβεβαιωμένη �στίν.
+Ἔξεστί σοι [[Special:UserLogin|συνδεῖσθαι]] καὶ χ�ῆσαι τὸ �ίκι.',
 'confirmemail_subject'     => '�πιβεβαίωσις διευθ�νσεως ἠλ.-ταχυδ�ομείου τοῦ {{SITENAME}}',
 'confirmemail_body'        => 'Τίς (πιθανῶς σ�, �κ τῆς IP-διευθ�νσέως $1) ἔχων τήνδε τὴν ἠλ-διε�θυνσιν κατέγ�αψεν λογισμόν τινα "$2" �ν τῷ ἱστοτόπῳ {{SITENAME}}. Διὰ τὸ �πιβεβαιώσειν τὴν �τεὴ κατοχὴ τοῦ λογισμοῦ χ�ωμένου ὑπ\' �σοῦ καὶ διὰ τὸ �νε�γοποιἠσειν τὰς δυνατότητας ἠλ-ταχυδ�ομείου τοῦ {{SITENAME}}, ἀκολο�θησον τόνδε τὸν σ�νδεσμον:
 
@@ -2009,26 +2313,17 @@ $1
 'trackbackdeleteok' => 'Ὀνασ�νδεσμος �πιτυχῶς διαγ�αφείς.',
 
 # Delete conflict
-'recreate' => 'Ἀναποιεῖν',
-
-# HTML dump
-'redirectingto' => 'Ἀναδιευθ�νειν εἰς τὴν [[$1]]...',
+'deletedwhileediting' => "'''Εἴδησις''': Ἥδε ἡ δέλτος διεγ�άφη π�ὸ τοῦ ἄ�χειν ὑπ�σοῦ τὸ μεταγ�άφειν!",
+'recreate'            => 'Ἀναποιεῖν',
 
 # action=purge
-'confirm_purge'        => 'Καθαί�ειν τὴν λανθάνουσαν μνήμην τῆσδε τῆς δέλτου;
-
-$1',
 'confirm_purge_button' => 'εἶεν',
-
-# AJAX search
-'articletitles' => "Δέλτοι ἀ�χόμεναι �κ/�ξ ''$1''",
-'hideresults'   => 'Ἀποκ��πτειν ἀποτελέσματα',
-'useajaxsearch' => 'Χ�ῆσθαι ἀναζήτησιν AJAX',
+'confirm-purge-top'    => 'Καθαί�ειν τὴν λανθάνουσαν μνήμην τῆσδε τῆς δέλτου.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� ἡ δέλτος ἡ π�οτέ�α',
 'imgmultipagenext' => 'ἡ δέλτος ἡ �πομένη →',
-'imgmultigo'       => 'Ἱέναι!',
+'imgmultigo'       => 'Ἰέναι!',
 'imgmultigoto'     => 'Μεταβαίνειν εἰς δέλτον $1',
 
 # Table pager
@@ -2039,14 +2334,14 @@ $1',
 'table_pager_first'        => 'Ἡ δέλτος ἡ π�ώτη',
 'table_pager_last'         => 'Δέλτος �σχάτη',
 'table_pager_limit'        => 'Δεικν�ναι $1 στοιχεῖα ἀνἀ δέλτον',
-'table_pager_limit_submit' => 'Ἱέναι',
+'table_pager_limit_submit' => 'Ἰέναι',
 'table_pager_empty'        => 'Ο�δὲν ἀποτέλεσμα',
 
 # Auto-summaries
 'autosumm-blank'   => 'Ἀφαί�εσις ἅπαντος τοῦ πε�ιεχομένου',
 'autosumm-replace' => "Ἀντιδοῦναι τῇ δέλτῷ τὸ(ν) '$1'",
 'autoredircomment' => 'Ἀναδιευθ�νειν π�ὸς τὸ [[$1]]',
-'autosumm-new'     => 'Δέλτος νέα: $1',
+'autosumm-new'     => "Δέλτος νέα πε�ιέχουσα '$1'",
 
 # Size units
 'size-bytes'     => '$1 Δ',
@@ -2086,6 +2381,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'Ἄγνωτον σήμαντ�ον �πεκτάσεων "$1"',
+'duplicate-defaultsort' => 'Eἴδησις: Ἡ π�οκαθω�ισμένη κλεὶς ταξινομήσεως "$2" ὑπε�καλ�πτει π�οηγουμένην π�οκαθω�ισμένην κλεῖδα ταξινομήσεως "$1".',
 
 # Special:Version
 'version'                          => 'Ἐπανό�θωμα', # Not used as normal message but as header for the special page itself
@@ -2117,7 +2413,7 @@ $1',
 'fileduplicatesearch'          => 'Ζήτησις διπλότυπων ἀ�χείων',
 'fileduplicatesearch-summary'  => 'Ζητεῖν διπλότυπα ἀ�χεῖα βάσει κε�ματιζομένων τιμῶν.
 
-Εἰσάγαγε τὸ ὄνομα ἀ�χείου ἄνευ τοῦ π�οθέματος "{{ns:image}}:".',
+Εἰσάγαγε τὸ ὄνομα ἀ�χείου ἄνευ τοῦ π�οθέματος "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Ζήτησις διπλότυπου',
 'fileduplicatesearch-filename' => 'Ὄνομα ἀ�χείου:',
 'fileduplicatesearch-submit'   => 'Ἀναζήτησις',
@@ -2147,4 +2443,13 @@ $1',
 'blankpage'              => 'Κενὴ δέλτος',
 'intentionallyblankpage' => 'Ἥδε ἡ δέλτος ἀφίεται �σκεμμένως κενὴ οὖσα χ�ήσιμος ὡς σημεῖον ἀναφο�ᾶς, κτλ.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Ἄφες τήνδε τὴν γ�αμμὴν ὡς ἔστι τῷ πα�όντι<pre>
+#Ὰπόθεσον ἅπαντα τὰ τεμάχια συνήθων �κφ�άσεων (μόνον το μέ�ος τὸ μεταξὺ τῶν //) κάτωθεν
+#Αὗται ἀντιστοιχοῦσαι μετὰ τῶν URL τῶν �ξώτε�ων (hotlinked) εἰκόνων ἔσονται
+#Αἱ ἀντιστοιχήσασαι, δεικνυμέναι ἔσονται ὡς εικόνες· εἰ δὲ, εἷς μόνον σ�νδεσμος π�ὸς τὴν εἰκόνα δείξεται
+#Αἱ γ�αμμαὶ αἱ ἀ�χόμεναι �κ τοῦ # θεω�οῦνται σχόλια
+
+#Ὰπόθεσον ἅπαντα τὰ τεμάχια συνήθων �κφ�άσεων ἄνωθεν τῆσδε τῆς γ�αμμῆς. Ἄφες τήνδε τὴν γ�αμμὴν ὡς ἔστι τῷ πα�όντι</pre>',
+
 );
diff --git a/languages/messages/MessagesGsw.php b/languages/messages/MessagesGsw.php
index cc75f60a..b6e997ac 100644
--- a/languages/messages/MessagesGsw.php
+++ b/languages/messages/MessagesGsw.php
@@ -4,11 +4,13 @@
  * @ingroup Language
  * @file
  *
+ * @author Als-Chlämens
  * @author Als-Holder
  * @author Hendergassler
  * @author J. 'mach' wust
  * @author Melancholie
  * @author MichaelFrey
+ * @author Remember the dot
  * @author Spacebirdy
  * @author Strommops
  * @author Urhixidur
@@ -17,6 +19,95 @@
  */
 
 $fallback = 'de';
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Doppleti Wyterlaitige' ),
+	'BrokenRedirects'           => array( 'Kaputti Wyterlaitige' ),
+	'Disambiguations'           => array( 'Begriffschlärigsverwyys' ),
+	'Userlogin'                 => array( 'Amälde' ),
+	'Userlogout'                => array( 'Abmälde' ),
+	'CreateAccount'             => array( 'Benutzerchonto aaleege' ),
+	'Preferences'               => array( 'Ystellige' ),
+	'Watchlist'                 => array( 'Beobachtigslischte' ),
+	'Recentchanges'             => array( 'Letschti Änderige' ),
+	'Upload'                    => array( 'Uffelade' ),
+	'Listfiles'                 => array( 'Dateie' ),
+	'Newimages'                 => array( 'Neji Dateie' ),
+	'Listusers'                 => array( 'Benutzerlischte' ),
+	'Listgrouprights'           => array( 'Grupperächt' ),
+	'Statistics'                => array( 'Statischtik' ),
+	'Randompage'                => array( 'Zuefelligi Syte' ),
+	'Lonelypages'               => array( 'Verwaisti Syte' ),
+	'Uncategorizedpages'        => array( 'Syte wo nit kategorisiert sin' ),
+	'Uncategorizedcategories'   => array( 'Kategorie wo nit kategorisiert sin' ),
+	'Uncategorizedimages'       => array( 'Dateie wo nit kategorisiert sin' ),
+	'Uncategorizedtemplates'    => array( 'Vorlage wo nit kategorisiert sin' ),
+	'Unusedcategories'          => array( 'Kategorie wo nit brucht wäre' ),
+	'Unusedimages'              => array( 'Dateie wo nit brucht wäre' ),
+	'Wantedpages'               => array( 'Syte wo gwinscht sin' ),
+	'Wantedcategories'          => array( 'Kategorie wo gwinscht sin' ),
+	'Wantedfiles'               => array( 'Dateie wo fähle' ),
+	'Wantedtemplates'           => array( 'Vorlage wo fähle' ),
+	'Mostlinked'                => array( 'Syte wo am meischte vergleicht sin' ),
+	'Mostlinkedcategories'      => array( 'Kategorie wo am meischte brucht wäre' ),
+	'Mostlinkedtemplates'       => array( 'Vorlage wo am meischte brucht wäre' ),
+	'Mostimages'                => array( 'Dateie wo am meischte brucht wäre' ),
+	'Mostcategories'            => array( 'Syte wo am meischte kategorisiert sin' ),
+	'Mostrevisions'             => array( 'Syte wo am meischte bearbeitet sin' ),
+	'Fewestrevisions'           => array( 'Syte wo am wenigschte bearbeitet sin' ),
+	'Shortpages'                => array( 'Churzi Syte' ),
+	'Longpages'                 => array( 'Langi Syte' ),
+	'Newpages'                  => array( 'Neji Syte' ),
+	'Ancientpages'              => array( 'Veralteti Syte' ),
+	'Deadendpages'              => array( 'Sackgassesyte' ),
+	'Protectedpages'            => array( 'Gschitzti Syte' ),
+	'Protectedtitles'           => array( 'Gsperrti Titel' ),
+	'Allpages'                  => array( 'Alli Syte' ),
+	'Prefixindex'               => array( 'Vorsilbeverzeichnis' ),
+	'Ipblocklist'               => array( 'Gsperrti IP' ),
+	'Specialpages'              => array( 'Spezialsyte' ),
+	'Contributions'             => array( 'Byytreeg' ),
+	'Emailuser'                 => array( 'E-Mail' ),
+	'Confirmemail'              => array( 'E-Mail bstetige' ),
+	'Whatlinkshere'             => array( 'Was gleicht do ane?' ),
+	'Recentchangeslinked'       => array( 'Änderige an vergleichte Syte' ),
+	'Movepage'                  => array( 'Verschiebe' ),
+	'Blockme'                   => array( 'Proxy-Sperre' ),
+	'Booksources'               => array( 'ISBN-Suech' ),
+	'Categories'                => array( 'Kategorie' ),
+	'Export'                    => array( 'Exportiere' ),
+	'Allmessages'               => array( 'Alli Nochrichte' ),
+	'Log'                       => array( 'Logbuech' ),
+	'Blockip'                   => array( 'Sperre' ),
+	'Undelete'                  => array( 'Widerhärstelle' ),
+	'Import'                    => array( 'Importiere' ),
+	'Lockdb'                    => array( 'Datebank sperre' ),
+	'Unlockdb'                  => array( 'Sperrig vu dr Datebank ufhebe' ),
+	'Userrights'                => array( 'Benutzerrächt' ),
+	'MIMEsearch'                => array( 'MIME-Suech' ),
+	'FileDuplicateSearch'       => array( 'Datei-Duplikat-Suech' ),
+	'Unwatchedpages'            => array( 'Syte wu nit beobachtet wäre' ),
+	'Listredirects'             => array( 'Wyterleitige' ),
+	'Revisiondelete'            => array( 'Versionsleschig' ),
+	'Unusedtemplates'           => array( 'Vorlage wo nit brucht wäre' ),
+	'Randomredirect'            => array( 'Zuefelligi Wyterleitig' ),
+	'Mypage'                    => array( 'Myyni Benutzersyte' ),
+	'Mytalk'                    => array( 'Myyni Diskussionssyte' ),
+	'Mycontributions'           => array( 'Myyni Byytreeg' ),
+	'Listadmins'                => array( 'Ammanne' ),
+	'Listbots'                  => array( 'Bötli' ),
+	'Popularpages'              => array( 'Beliebteschti Syte' ),
+	'Search'                    => array( 'Suech' ),
+	'Resetpass'                 => array( 'Passwort ändre' ),
+	'Withoutinterwiki'          => array( 'Ohni Interwiki' ),
+	'MergeHistory'              => array( 'Versionsgschichte zämefiere' ),
+	'Filepath'                  => array( 'Dateipfad' ),
+	'Invalidateemail'           => array( 'E-Mail nit bstetige' ),
+	'Blankpage'                 => array( 'Läärsyte' ),
+	'LinkSearch'                => array( 'Suech no Gleicher' ),
+	'DeletedContributions'      => array( 'Gleschti Byytreeg' ),
+);
+
 $linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
 
 $messages = array(
@@ -57,17 +148,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Eigeni Änderige uf d Beobachtigslischt usblände',
 'tog-watchlisthidebots'       => 'Bot-Änderige in d Beobachtigslischt usblende',
 'tog-watchlisthideminor'      => 'Chlyni Änderige nit in de Beobachtigslischte aazeige',
+'tog-watchlisthideliu'        => 'Bearbeitige vu aagmäldete Benutzer usblände',
+'tog-watchlisthideanons'      => 'Bearbeitige vu anonyme Benutzer (IP-Adresse) usblände',
 'tog-nolangconversion'        => 'Konvertierig vu Sprachvariante abschalte',
 'tog-ccmeonemails'            => 'Schick mr Kopie vo de E-Mails, won i andere schick.',
-'tog-diffonly'                => "Numme Versionsunterschied aazeige, ohni d'Syte",
+'tog-diffonly'                => 'Numme Versionsunterschiid aazeige, ohni d Syte',
 'tog-showhiddencats'          => 'Zeig di versteckte Kategorie',
+'tog-noconvertlink'           => 'Konvertierig vum Titel deaktiviere',
+'tog-norollbackdiff'          => 'Unterschid noch em Zrucksetze unterdrucke',
 
 'underline-always'  => 'immer',
 'underline-never'   => 'nie',
 'underline-default' => 'Browser-Vorystellig',
 
-'skinpreview' => '(Vorschou)',
-
 # Dates
 'sunday'        => 'Sunntig',
 'monday'        => 'Mäntig',
@@ -155,7 +248,7 @@ $messages = array(
 'mytalk'         => 'Myyni Diskussionsyte',
 'anontalk'       => 'Diskussionssyste vo sellere IP',
 'navigation'     => 'Navigation',
-'and'            => 'un',
+'and'            => '&#32;un',
 
 # Metadata in edit box
 'metadata_help' => 'Metadate:',
@@ -175,14 +268,14 @@ $messages = array(
 'printableversion'  => 'Druck-Aasicht',
 'permalink'         => 'Bschtändigi URL',
 'print'             => 'Drucke',
-'edit'              => 'ändere',
+'edit'              => 'Ändere',
 'create'            => 'Erstelle',
 'editthispage'      => 'Syte bearbeite',
 'create-this-page'  => 'Die Syte afange',
-'delete'            => 'lösche',
+'delete'            => 'Lösche',
 'deletethispage'    => 'Syte lösche',
 'undelete_short'    => '{{PLURAL:$1|1 Version|$1 Versione}} widerherstelle',
-'protect'           => 'schütze',
+'protect'           => 'Schütze',
 'protect_change'    => 'ändere',
 'protectthispage'   => 'Artikel schütze',
 'unprotect'         => 'nümm schütze',
@@ -192,14 +285,14 @@ $messages = array(
 'talkpagelinktext'  => 'Diskussion',
 'specialpage'       => 'Spezialsyte',
 'personaltools'     => 'Persönlichi Wärkzüg',
-'postcomment'       => 'Kommentar abgeh',
+'postcomment'       => 'Neje Abschnitt',
 'articlepage'       => 'Syte',
 'talk'              => 'Diskussion',
 'views'             => 'Wievylmol agluegt',
 'toolbox'           => 'Wärkzügkäschtli',
 'userpage'          => 'Benutzersyte',
 'projectpage'       => 'Projektsyte azeige',
-'imagepage'         => 'Bildsyte',
+'imagepage'         => 'Dateisyte',
 'mediawikipage'     => 'Inhaltssyte aazeige',
 'templatepage'      => 'Vorlagesyte aazeige',
 'viewhelppage'      => 'D Hilf aazeige',
@@ -209,7 +302,7 @@ $messages = array(
 'redirectedfrom'    => '(Witergleitet vun $1)',
 'redirectpagesub'   => 'Umgleiteti Syte',
 'lastmodifiedat'    => 'Letschti Änderig vo dere Syte: $2, $1<br />', # $1 date, $2 time
-'viewcount'         => 'Selli Syte isch {{PLURAL:$1|eimol|$1 Mol}} bsuecht worde.',
+'viewcount'         => 'Die Syte isch {{PLURAL:$1|eimol|$1 Mol}} bsuecht wore.',
 'protectedpage'     => 'Gschützti Syte',
 'jumpto'            => 'Gump zue:',
 'jumptonavigation'  => 'Navigation',
@@ -218,8 +311,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ãœber {{GRAMMAR:akkusativ|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Ãœber {{UCFIRST:{{GRAMMAR:akkusativ|{{SITENAME}}}}}}',
-'bugreports'           => 'Fählermäldig',
-'bugreportspage'       => 'Project:Kontakt',
 'copyright'            => 'Der Inhalt vo dere Syte stoht unter der $1.',
 'copyrightpagename'    => '{{SITENAME}} Urheberrächt',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -242,8 +333,7 @@ $messages = array(
 
 'badaccess'        => 'Dyyni Rächt länge nid.',
 'badaccess-group0' => 'Du hesch d Berächtigung nid, wo s brucht fir die Aktion.',
-'badaccess-group1' => 'Die Aktion isch bschränkt uf Benutzer, wu zue dr Grupp „$1“ ghere.',
-'badaccess-group2' => 'Die Aktion isch bschränkt uf Benutzer, wu zue einere vu dr Gruppe „$1“ ghere.',
+'badaccess-groups' => 'Die Aktion isch bschränkt uf Benutzer, wu {{PLURAL:$2|zue dr Gruppe|zue einer vu dr Gruppe}} „$1“ ghere.',
 
 'versionrequired'     => 'Version $1 vun MediaWiki wird brucht',
 'versionrequiredtext' => 'Version $1 vu MediaWiki wird brucht zum die Syte nutze. Lueg [[Special:Version]]',
@@ -257,6 +347,8 @@ $messages = array(
 'editsection'             => 'ändere',
 'editold'                 => 'Ändre',
 'viewsourceold'           => 'Quelltext azeige',
+'editlink'                => 'bearbeite',
+'viewsourcelink'          => 'Quälltäxt aaluege',
 'editsectionhint'         => 'Abschnitt ändere: $1',
 'toc'                     => 'Inhaltsverzeichnis',
 'showtoc'                 => 'ufklappe',
@@ -271,7 +363,7 @@ $messages = array(
 'site-atom-feed'          => 'Atom-Feed für $1',
 'page-rss-feed'           => 'RSS-Feed für „$1“',
 'page-atom-feed'          => 'Atom-Feed fir „$1“',
-'red-link-title'          => '$1 (Syte isch nid vorhande)',
+'red-link-title'          => '$1 (Syte git s nit)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Syte',
@@ -287,7 +379,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Die Aktion git s nit',
-'nosuchactiontext'  => 'Die Aktion wird vun de MediaWiki-Software nit unterstitzt',
+'nosuchactiontext'  => 'Di Aktion, wu in dr URL aagee isch, isch nit giltig.
+Villicht hesch d URL falsch yygee oder bisch eme falsche Gleich noogange.
+Des chennt au ne Fähler aazeige in {{SITENAME}}.',
 'nosuchspecialpage' => 'Die Spezialsyte git s nit',
 'nospecialpagetext' => "<big>'''Die Spezialsyte git s nid.'''</big>
 
@@ -336,7 +430,6 @@ Wänn s des nid isch, hesch villicht e Fähler in dr Software gfunde. Bitte mäl
 'cannotdelete'         => 'Konn d Syte oder dr Artikel nit lesche. (Isch meglicherwis schu vun eber ondrem glescht worre.)',
 'badtitle'             => 'Ugültiger Titel',
 'badtitletext'         => 'Dr Titel vu dr agforderte Syte isch nit giltig gsi, leer, oder e nit giltig Sprochgleich vun eme andre Wiki.',
-'perfdisabled'         => "Leider isch die Funktion momentan usgschalte, wil's d Datebank eso starch würd belaschte, dass mer s Wiki nümm chönnti benütze.",
 'perfcached'           => 'Die Informatione chömme us em Zwüschespeicher un sin derwiil villicht nid aktuell.
 ----',
 'perfcachedts'         => 'Die Date stamme us em Cache un sin am $1 s letscht Mol aktualisiert wore.',
@@ -351,7 +444,7 @@ Abfrog: $2',
 'protectedpagetext'    => 'Die Syte isch fir s Bearbeite gsperrt.',
 'viewsourcetext'       => 'Quelltext vo dere Syte:',
 'protectedinterface'   => 'In däre Syte het s Text fir s Sproch-Interface vu dr Software un isch gsperrt, zum Missbruch z verhindre.',
-'editinginterface'     => "'''Obacht:''' Du bisch e Syten am Verändere, wo zum user interface ghört. We du die Syte veränderisch, de änderet sech ds user interface o für di andere Benutzer.",
+'editinginterface'     => "'''Obacht:''' Du bisch e Syten am Verändere, wu zum User.Interface ghert. Wänn Du die Syte veränderesch, no änderet sich s User-Interface au fir di andere Benutzer. Fir Ibersetzige lueg bitte, eb Du doodefir s [http://translatewiki.net/wiki/Main_Page?setlang=gsw Translatewiki] witt bruuche, s MediaWiki-Lokalisierigsprojäkt.",
 'sqlhidden'            => '(SQL-Abfrog verschteckt)',
 'cascadeprotected'     => 'Die Syte isch fir s Bearbeite gsperrt. Si isch yybunde in {{PLURAL:$1|die Syte, wu do chunnt|die Syte, wu do chemme}} , wu mit ere Kaskadesperroption gschitzt {{PLURAL:$1|isch|sin}}:
 $2',
@@ -362,7 +455,7 @@ $2',
 Die Sperri isch dur [[User:$1|$1]] yygrichtet wore mit dr Begrindig ''„$2“''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Fählerhafti Konfiguration: Virescanner, wu nid bekannt isch: <i>$1</i>',
+'virus-badscanner'     => "Fählerhafti Konfiguration: Virescanner, wu nid bekannt isch: ''$1''",
 'virus-scanfailed'     => 'Scan het nid funktioniert (code $1)',
 'virus-unknownscanner' => 'Virescanner, wu nid bekannt isch:',
 
@@ -373,27 +466,26 @@ Die Sperri isch dur [[User:$1|$1]] yygrichtet wore mit dr Begrindig ''„$2“''
 </div><br />
 We du jitz öppis uf der {{SITENAME}} änderisch, de wird dyni IP-Adrässen als Urhäber regischtriert u nid dy Benutzername. Du chasch di mit em glychen oder emnen andere Benutzername nöi aamälde.',
 'welcomecreation'            => '==Willcho, $1!==
-Dyy Benutzerchonto isch aaglait wore.
+Dyy Benutzerkonto isch aaglait wore.
 Vergiss nid, dyni Yystellige aazpasse.',
 'loginpagetitle'             => 'Benutzer-Aamelde',
 'yourname'                   => 'Dyy Benutzername',
-'yourpassword'               => 'Passwort',
-'yourpasswordagain'          => 'Passwort no mol yygee',
+'yourpassword'               => 'Passwort:',
+'yourpasswordagain'          => 'Passwort no mol yygee:',
 'remembermypassword'         => 'Passwort spychere',
 'yourdomainname'             => 'Dyyni Domäne',
-'externaldberror'            => 'Entwäder s lit e Fähler bi dr externe Authentifizierung vor, oder Du derfsch Dyy extern Benutzerchonto nid aktualisiere.',
-'loginproblem'               => "'''S het ä Problem mit dinre Onmeldung gäbe.'''<br />Bitte vosuechs grad nomal!",
+'externaldberror'            => 'Entwäder s lit e Fähler bi dr externe Authentifizierung vor, oder Du derfsch Dyy extern Benutzerkonto nid aktualisiere.',
 'login'                      => 'Aamälde',
-'nav-login-createaccount'    => 'Aamälde / Chonto aaleege',
+'nav-login-createaccount'    => 'Aamälde / Konto aaleege',
 'loginprompt'                => '<small>Für di bir {{SITENAME}} aazmälde, muesch Cookies erloube!</small>',
 'userlogin'                  => 'Aamälde',
 'logout'                     => 'Abmälde',
 'userlogout'                 => 'Abmälde',
 'notloggedin'                => 'Nit aagmäldet',
-'nologin'                    => 'No kei Benutzerchonto? $1.',
-'nologinlink'                => '»Chonto aaleege«',
+'nologin'                    => 'No kei Benutzerkonto? $1.',
+'nologinlink'                => '»Konto aaleege«',
 'createaccount'              => 'Nöis Benutzerkonto aalege',
-'gotaccount'                 => 'Du häsch scho a Chonto? $1',
+'gotaccount'                 => 'Du häsch scho a Konto? $1',
 'gotaccountlink'             => '»Login fir Benutzer, wu scho aagmäldet sin«',
 'createaccountmail'          => 'iber E-Mail',
 'badretype'                  => 'Di beidi Passwörter stimme nid zämme.',
@@ -403,12 +495,12 @@ Bitte nimm e andere.',
 'username'                   => 'Benutzername:',
 'uid'                        => 'Benutzer-ID:',
 'prefs-memberingroups'       => 'Mitglid vu dr {{PLURAL:$1|Benutzergruppe|Benutzergruppe}}:',
-'yourrealname'               => 'Ihre Name*',
+'yourrealname'               => 'Echte Name:',
 'yourlanguage'               => 'Sproch:',
 'yourvariant'                => 'Variante:',
 'yournick'                   => 'Unterschrift:',
 'badsig'                     => 'Dr Syntax vu dr Signatur isch nid giltig; bitte d HTML iberpriefe.',
-'badsiglength'               => 'D Unterschrift derf hegschtens $1 {{PLURAL:$1|Zeiche|Zeiche}} lang syy.',
+'badsiglength'               => 'Dyyni Unterschrift isch z lang. Si derf hegschtens $1 {{PLURAL:$1|Zeiche|Zeiche}} lang syy.',
 'email'                      => 'E-Mail',
 'prefs-help-realname'        => '* <strong>Dyy ächte Name</strong> (optional): Wänn du wetsch, ass Dyyni Änderige uf Dii chenne zruckgfierd wäre.',
 'loginerror'                 => 'Fähler bir Aamäldig',
@@ -435,7 +527,7 @@ Es mues mindischtens {{PLURAL:$1|1 Zeiche|$1 Zeiche}} ha u sech vom Benutzername
 
 S automatisch generiert Passwort fir dr Benutzer $2 heisst jetz: $3
 
-Du sottsch dich jetzt aamälde un s Passwort ändere: {{fullurl:Special:UserLogin}}
+Du sottsch dich jetzt aamälde un s Passwort ändere: {{fullurl:Special:UserLogin}}.
 
 Bitte ignorier die E-Mail, wänn Du s nid sälber aagforderet hesch. S alt Passwort blybt wyter giltig.',
 'noemail'                    => 'Dr Benutzer "$1" het kei E-Mail-Adräss aagee.',
@@ -448,30 +540,42 @@ Zum Missbruuch z verhindere, isch au d Megligkeit gsperrt wore, e nej Passwort a
 Voreb ass no mee Mails iber d {{SITENAME}}-Mailfunktion an die Adräss gschickt wäre, muesch d Inschtruktione in däm Mail befolge, zum bstätige, ass es wirkli Dyys isch.',
 'throttled-mailpassword'     => 'In dr letschte {{PLURAL:$1|Stund|$1 Stunde}} isch scho ne nej Passwort aagforderet wore. Zum Missbruch vu däre Funktion z verhindere, cha nume {{PLURAL:$1|eimol in dr Stund|alli $1 Stunde}} e nej Passwort aageforderet wäre.',
 'mailerror'                  => 'Fähler bim Sende vun de Mail: $1',
-'acct_creation_throttle_hit' => 'Duet mr leid, so hän scho $1 Benutzer. Si chönne cheini meh aalege.',
-'emailauthenticated'         => 'Di E-Bost-Adräss isch am $1 bschtätigt worde.',
+'acct_creation_throttle_hit' => 'Bsuecher vu däm Wiki, wu Dyyni IP-Adräss bruuche, hän innerhalb vum letschte Tag {{PLURAL:$1|1 Benutzerkonto|$1 Benutzerkonte}} aagleit. Des isch di maximal Aazahl, wu in däm Zytruum erlaubt isch.
+
+Bsuecher, wu die IP-Adräss bruuche, chenne im Momänt kei Benutzerkonte meh aalege.',
+'emailauthenticated'         => 'Di E-Mail-Adräss isch am $2 um $3 Uhr bschtätigt worde.',
 'emailnotauthenticated'      => 'Dyni E-Mail-Adräss isch nonig bstätigt. Wäg däm gehn di erwyterete E-Mail-Funktione nonig.
 Fir d Bstätigung muesch em Gleich nogoh, wu Dir gschickt woren isch. Du chasch au e neie sonig Gleich aafordere:',
-'noemailprefs'               => '<strong>Du hesch kei E-Mail-Adrässen aaggä</strong>, drum sy di folgende Funktione nid müglech.',
+'noemailprefs'               => 'Du hesch kei E-Mail-Adrässen aaggä, drum sy di folgende Funktione nid müglech.',
 'emailconfirmlink'           => 'E-Poscht-Adräss bstätige',
 'invalidemailaddress'        => 'Diä E-Mail-Adress isch nit akzeptiert worre, wil s ä ugültigs Format ghet het.
 Bitte gib ä neiji Adress in nem gültige Format ii, odr tue s Feld leere.',
-'accountcreated'             => 'De Benutzer isch agleit worre.',
-'accountcreatedtext'         => 'De Benutzer $1 isch aagleit worre.',
-'createaccount-title'        => 'Aalege vum e Benutzerchonto fir {{SITENAME}}',
-'createaccount-text'         => 'Fir Dii isch e Benutzerchonto "$2" uf {{SITENAME}} ($4) aaglait wore. S Passwort fir "$2" , wu automatisch generiert woren isch, isch "$3". Du sottsch Di jetz aamälde un s Passwort ändere.
+'accountcreated'             => 'S Benutzerkonto isch aagleit wore.',
+'accountcreatedtext'         => 'S Benutzerkonto $1 isch aagleit wore.',
+'createaccount-title'        => 'Aalege vum e Benutzerkonto fir {{SITENAME}}',
+'createaccount-text'         => 'Fir Dii isch e Benutzerkonto "$2" uf {{SITENAME}} ($4) aaglait wore. S Passwort fir "$2" , wu automatisch generiert woren isch, isch "$3". Du sottsch Di jetz aamälde un s Passwort ändere.
 
-Wänn s Benutzerchonto us Versäh aaglait woren isch, chasch die Nochricht ignoriere.',
+Wänn s Benutzerkonto us Versäh aaglait woren isch, chasch die Nochricht ignoriere.',
+'login-throttled'            => 'Du hesch z vilmol vergebli versuecht, Di unter däm Benutzername aazmälde. Bitte wart, voreb Du s non emol versuechsch.',
 'loginlanguagelabel'         => 'Sproch: $1',
 
 # Password reset dialog
-'resetpass_announce'      => 'Aamäldig mit em Code, wu per Mail zuegschickt woren isch. Zum d Aamäldig abzschliesse, muesch jetz e nej Passwort wehle.',
-'resetpass_header'        => 'Passwort zrucksetze',
-'resetpass_submit'        => 'Passwort ibermittle un aamälde',
-'resetpass_success'       => 'Dyy Passwort isch erfolgryych gänderet wore. Jetz chunnt d Aamäldig …',
-'resetpass_bad_temporary' => 'Vorlaifig Passwort, wu nimi giltig isch. Du hesch Dyy Passwort scho gänderet oder e nej vorlaifig Passwort aagforderet.',
-'resetpass_forbidden'     => 'S Passwort cha nid gänderet wäre.',
-'resetpass_missing'       => 'Läär Formular',
+'resetpass'                 => 'Passwort fir s Benutzerkonto ändere oder zrucksetze',
+'resetpass_announce'        => 'Aamäldig mit em Code, wu per Mail zuegschickt woren isch. Zum d Aamäldig abzschliesse, muesch jetz e nej Passwort wehle.',
+'resetpass_text'            => '<!-- Tue do dr Text ergänze -->',
+'resetpass_header'          => 'Passwort zrucksetze',
+'oldpassword'               => 'Alts Passwort',
+'newpassword'               => 'Nöis Passwort',
+'retypenew'                 => 'Nöis Passwort (es zwöits Mal)',
+'resetpass_submit'          => 'Passwort ibermittle un aamälde',
+'resetpass_success'         => 'Dyy Passwort isch erfolgryych gänderet wore. Jetz chunnt d Aamäldig …',
+'resetpass_bad_temporary'   => 'Vorlaifig Passwort, wu nimi giltig isch. Du hesch Dyy Passwort scho gänderet oder e nej vorlaifig Passwort aagforderet.',
+'resetpass_forbidden'       => 'S Passwort cha nid gänderet wäre.',
+'resetpass-no-info'         => 'Du muesch Di aamälde zum uf die Syte diräkt zuegryfe z chenne.',
+'resetpass-submit-loggedin' => 'Passwort ändere',
+'resetpass-wrong-oldpass'   => 'S temporär oder aktuäll Passwort isch nimi giltig.
+Villicht hesch Dyy Passwort scho gänderet oder e nej temporär Passwort aagforderet.',
+'resetpass-temp-password'   => 'Temporär Passwort:',
 
 # Edit page toolbar
 'bold_sample'     => 'fetti Schrift',
@@ -490,14 +594,14 @@ Wänn s Benutzerchonto us Versäh aaglait woren isch, chasch die Nochricht ignor
 'nowiki_tip'      => 'Wiki-Formatierige ignoriere',
 'image_sample'    => 'Byschpil.jpg',
 'image_tip'       => 'Bildverwys',
-'media_sample'    => 'Byschpil.mp3',
+'media_sample'    => 'Byschpil.ogg',
 'media_tip'       => 'Dateie-Link',
 'sig_tip'         => 'Dyni Signatur mit Zytagab',
 'hr_tip'          => 'Horizontali Linie (sparsam verwende)',
 
 # Edit pages
-'summary'                          => 'Zämefassig',
-'subject'                          => 'Beträff',
+'summary'                          => 'Zämefassig:',
+'subject'                          => 'Beträff:',
 'minoredit'                        => 'Numen es birebitzeli gänderet',
 'watchthis'                        => 'Dä Artikel beobachte',
 'savearticle'                      => 'Syte spychere',
@@ -509,8 +613,8 @@ Wänn s Benutzerchonto us Versäh aaglait woren isch, chasch die Nochricht ignor
 'missingsummary'                   => "'''Obacht:''' Du hesch kei Zämefassig aagee. Wenn du nomol uf Spychere drucksch, wird d Änderung ohni gspychert.",
 'missingcommenttext'               => 'Bitte gib Dyy Kommentar unte yy.',
 'missingcommentheader'             => "'''ACHTIG:''' Du hesch kei Iberschrift im Fäld „Betreff:“ yygee. Wänn nomol uf „Syte spichere“ drucksch, wird Dyyni Bearbeitig ohni Iberschrift gspicheret.",
-'summary-preview'                  => 'Vorschou vor Zämefassig',
-'subject-preview'                  => 'Vorschau vum Betreff',
+'summary-preview'                  => 'Vorschou vor Zämefassig:',
+'subject-preview'                  => 'Vorschau vum Betreff:',
 'blockedtitle'                     => 'Benutzer isch gsperrt.',
 'blockedtext'                      => "<big>'''Dy Benutzernamen oder dyni IP-Adrässen isch gsperrt worde.'''</big>
 
@@ -563,10 +667,11 @@ Du chasch $1 oder ein vu dr andre [[{{MediaWiki:Grouppage-sysop}}|Ammanne]] kont
 Zum die Syte aalege, chasch do in däm Chaschte unte aafange schrybe (lueg [[{{MediaWiki:Helppage}}|Hilfe]] fir meh Informationeo).
 Wänn do nid hesch welle aane goh, no druck in Dyynem Browser uf '''Zruck'''.",
 'anontalkpagetext'                 => "''Des isch e Diskussionssyte vo me anonyme Benutzer, wo kei Zuegang aaglait het oder wo ne nit bruucht. Sälleweg muen mir di numerischi IP-Adräss bruuche zum ihn oder si z identifiziere. Sone IP-Adräss cha au vo mehrere Benutzer deilt werde. Wenn Si en anonyme Benutzer sin un s Gfiehl hen, dass do irrelevanti Kommentar an Si grichtet wärde, derno [[Special:UserLogin|lege Si sich bitte en Zuegang aa odr mälde sich aa]] zum in Zuekunft Verwirrige mit andere anonyme Benutzer z vermide.''",
-'noarticletext'                    => "Uf dere Syte het's no kei Tekscht. Du chasch uf anderne Syte [[Special:Search/{{PAGENAME}}|dä Ytrag sueche]] oder [{{fullurl:{{FULLPAGENAME}}|action=edit}} die Syte bearbeite].",
-'userpage-userdoesnotexist'        => 'S Benutzerchonto „$1“ git s nid. Bitte prief, eb Du die Syte wirkli wit aalege/bearbeite.',
+'noarticletext'                    => 'Uf däre Syte het s no kei Täxt. Du chasch uf andere Syte [[Special:Search/{{PAGENAME}}|dä Yytrag sueche]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} dr Logbuechyytrag sueche, wo dezue ghert],
+oder [{{fullurl:{{FULLPAGENAME}}|action=edit}} die Syte bearbeite]</span>.',
+'userpage-userdoesnotexist'        => 'S Benutzerkonto „$1“ git s nit. Bitte prief, eb Du die Syte wirkli wit aalege/bearbeite.',
 'clearyourcache'                   => "'''Hywys:''' Noch dynere Änderig muess no der Browser-Cache gläärt wäre!<br />'''Mozilla/Safari/Konqueror:''' ''Strg-Umschalttaschte-R'' (oder ''Umschalttasche'' druckt halte und uf s ''Nei-Lade''-Symbol klicke), '''IE:''' ''Strg-F5'', '''Opera/Firefox:''' ''F5''",
-'usercssjsyoucanpreview'           => '<strong>Tipp:</strong> Nimm dr Vorschau-Chnopf, zum Dyy nej CSS/JS vor em Spichere z teschte.',
+'usercssjsyoucanpreview'           => "'''Tipp:''' Nimm dr Vorschau-Chnopf, zum Dyy nej CSS/JS vor em Spichere z teschte.",
 'usercsspreview'                   => "== Vorschau vu Dyynem Benutzer-CSS. ==
 '''Wichtig:''' Noch em Spichere muesch Dyynem Browser sage, ass er die nej Version ladet:
 
@@ -575,55 +680,59 @@ Wänn do nid hesch welle aane goh, no druck in Dyynem Browser uf '''Zruck'''.",
 '''Gib acht:''' Noch em Spychere muesch Dyy Browser aawyse di nej Version z lade: '''Mozilla:''' ''Strg-Shift-R'', '''IE:''' ''Strg-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userinvalidcssjstitle'            => "'''Achtig:''' D Skin „$1“ git s nid. Dänk dra, ass benutzerspezifischi .css- und .js-Syte mit eme Chleibuechstabe mien aafange, also z B. ''{{ns:user}}:Mustermann/monobook.css'' statt ''{{ns:user}}:Mustermann/Monobook.css''.",
 'updated'                          => '(Gänderet)',
-'note'                             => '<strong>Obacht: </strong>',
-'previewnote'                      => '<strong>Das isch numen e Vorschau und nonig gspycheret!</strong>',
+'note'                             => "'''Obacht: '''",
+'previewnote'                      => "'''Das isch numen e Vorschau und nonig gspycheret!'''",
 'previewconflict'                  => 'Die Vorschau zeigt dr Inhalt vum obere Täxtfäld. Eso siht dr Artikel us, wän Du jetz uf Spychere drucksch.',
-'session_fail_preview'             => '<strong>Dyyni Bearbeitig het nid chenne gspycheret wäre, wel Sitzigsdate verlore gange sin.
+'session_fail_preview'             => "'''Dyyni Bearbeitig het nid chenne gspycheret wäre, wel Sitzigsdate verlore gange sin.
 Bitte versuech s nomol. Derzue drucksch unter däre Täxtvorschau nomol uf „Syte spychere“.
-Wänn s Problem blybt, [[Special:UserLogout|mäld Di ab]] un derno wider aa.</strong>',
-'session_fail_preview_html'        => "<strong>Dyyni Bearbeitig het nid chenne gspycheret wäre, wel Sitzigsdate verlore gange sin.</strong>
+Wänn s Problem blybt, [[Special:UserLogout|mäld Di ab]] un derno wider aa.'''",
+'session_fail_preview_html'        => "'''Dyyni Bearbeitig het nid chenne gspycheret wäre, wel Sitzigsdate verlore gange sin.'''
 
 ''Wel in {{SITENAME}} s Spychere vun ere reine HTML aktiviert isch, isch d Vorschau usbländet wore, zum JavaScript-Attacke z verhindere.''
 
-<strong>
+'''
 Bitte versuech s nomol. Derzue drucksch unter däre Täxtvorschau nomol uf „Syte spicherne“.
-Wänn s Problem blybt, [[Special:UserLogout|mäld Di ab]] un derno wider aa.</strong>",
-'token_suffix_mismatch'            => '<strong>Dyyni Bearbeitig isch zruckgwise wore, wel Dyy Browser Zeiche im Bearbeite-Token verstimmlet het.
-S Spichere cha dr Inhalt vu dr Syte hii mache. Des git s e mänkmol, wänn eber e anonyme Proxy-Dienscht brucht, wu Fähler macht.</strong>',
+Wänn s Problem blybt, [[Special:UserLogout|mäld Di ab]] un derno wider aa.'''",
+'token_suffix_mismatch'            => "'''Dyyni Bearbeitig isch zruckgwise wore, wel Dyy Browser Zeiche im Bearbeite-Token verstimmlet het.
+S Spichere cha dr Inhalt vu dr Syte hii mache. Des git s e mänkmol, wänn eber e anonyme Proxy-Dienscht brucht, wu Fähler macht.'''",
 'editing'                          => 'Bearbeite vo «$1»',
 'editingsection'                   => 'Bearbeite vo «$1» (Absatz)',
-'editingcomment'                   => 'Bearbeite vu $1 (Kommentar)',
+'editingcomment'                   => 'Bearbeite vu $1 (Neje Abschnitt)',
 'editconflict'                     => 'Bearbeitigs-Konflikt: «$1»',
 'explainconflict'                  => "Öpper anders het dä Artikel gänderet, wo du ne sälber am Ändere bisch gsy.
 Im obere Tekschtfäld steit der jitzig Artikel.
 Im untere Tekschtfält stöh dyni Änderige.
 Bitte überträg dyni Änderigen i ds obere Tekschtfäld.
 We du «Syte spychere» drücksch, de wird '''nume''' der Inhalt vom obere Tekschtfäld gspycheret.",
-'yourtext'                         => 'Ihre Tekscht',
+'yourtext'                         => 'Dyy Täxt',
 'storedversion'                    => 'Gspychereti Version',
-'nonunicodebrowser'                => '<strong>Obacht:</strong> Dyy Browser cha Unicode-Zeiche nid richtig verschaffe. Bitte verwänd e andere Browser zum Syte bearbeite.',
-'editingold'                       => '<strong>Obacht: Du bisch en alti Version vo däm Artikel am Bearbeite.
-Alli nöiere Versione wärden überschribe, we du uf «Syte spychere» drücksch.</strong>',
+'nonunicodebrowser'                => "'''Obacht:''' Dyy Browser cha Unicode-Zeiche nid richtig verschaffe. Bitte verwänd e andere Browser zum Syte bearbeite.",
+'editingold'                       => "'''Obacht: Du bisch en alti Version vo däm Artikel am Bearbeite.
+Alli nöiere Versione wärden überschribe, we du uf «Syte spychere» drücksch.'''",
 'yourdiff'                         => 'Unterschid',
-'copyrightwarning'                 => "<strong>Bitte <big>kopier kener Internetsyte</big>, wo nid dyner eigete sy, bruuch <big>kener urhäberrächtlech gschützte Wärch</big> ohni Erloubnis vor Copyright-Inhaberschaft!</strong><br />
-Hiemit gisch du zue, das du dä Tekscht <strong>sälber gschribe</strong> hesch, das der Tekscht Allgmeinguet (<strong>public domain</strong>) isch, oder das der <strong>Copyright-Inhaberschaft</strong> iri <strong>Zuestimmig</strong> het 'gä. Falls dä Tekscht scho nöumen anders isch veröffentlecht worde, de schryb das bitte uf d Diskussionssyte.
+'copyrightwarning'                 => "'''Bitte <big>kopier kener Internetsyte</big>, wo nid dyner eigete sy, bruuch <big>kener urhäberrächtlech gschützte Wärch</big> ohni Erloubnis vor Copyright-Inhaberschaft!'''<br />
+Hiemit gisch du zue, das du dä Tekscht '''sälber gschribe''' hesch, das der Tekscht Allgmeinguet ('''public domain''') isch, oder das der '''Copyright-Inhaberschaft''' iri '''Zuestimmig''' het 'gä. Falls dä Tekscht scho nöumen anders isch veröffentlecht worde, de schryb das bitte uf d Diskussionssyte.
 <i>Bis dir bewusst, dass alli {{SITENAME}}-Byträg outomatisch under der „$2“ stöh (für Details vgl. $1). We du nid wosch, das anderi dy Bytrag chöu veränderen u wyterverbreite, de drück nid uf „Syte spychere“.</i>",
-'copyrightwarning2'                => 'Dängge Si dra, dass alli Änderige {{GRAMMAR:dativ {{SITENAME}}}} vo andere Benutzer wider gänderet oder glöscht chönne wärde. Wenn Si nit wänn, dass ander Lüt an Ihrem Tekscht ummedoktere denn schicke Si ihn jetz nit ab.<br />
+'copyrightwarning2'                => "Dängge Si dra, dass alli Änderige {{GRAMMAR:dativ {{SITENAME}}}} vo andere Benutzer wider gänderet oder glöscht chönne wärde. Wenn Si nit wänn, dass ander Lüt an Ihrem Tekscht ummedoktere denn schicke Si ihn jetz nit ab.<br />
 Si verspräche uns usserdäm, dass Si des alles selber gschribe oder vo nere Quälle kopiert hen, wo Public Domain odr sunscht frei isch (lueg $1 für Details).
-<strong>SETZE SI DO OHNI ERLAUBNIS KEINI URHEBERRÄCHTLICH GSCHÜTZTI WÄRK INE!</strong>',
+'''SETZE SI DO OHNI ERLAUBNIS KEINI URHEBERRÄCHTLICH GSCHÜTZTI WÄRK INE!'''",
 'longpagewarning'                  => '<span style="color:#ff0000">WARNIG:</span> Die Syten isch $1 kB gross; elteri Browser chönnte Problem ha, Sytene z bearbeite wo grösser sy als 32 kB. Überleg bitte, öb du Abschnitt vo dere Syte zu eigete Sytene chönntsch usboue.',
-'longpageerror'                    => '<strong>FÄHLER: Dä Täxt, wu Du spichere wit, isch $1 KB gross. Des isch gresser wie s erlaubt Maximum vu $2 KB – s Spichere isch nid megli.</strong>',
-'protectedpagewarning'             => '<strong>WARNIG: Die Syten isch gsperrt worde, so das se nume Benutzer mit Sysop-Rechten chöi verändere.</strong>',
+'longpageerror'                    => "'''FÄHLER: Dä Täxt, wu Du spichere wit, isch $1 KB gross. Des isch gresser wie s erlaubt Maximum vu $2 KB – s Spichere isch nid megli.'''",
+'readonlywarning'                  => "'''ACHTUNG: Die Datebank isch fir Wartigsarbete gesperrt. Wäge däm chenne Dyyni Änderige im Momänt nid gspicheret wäre.
+Sichere de Täxt bitte lokal uf Dyynem Computer un versuech speter nomol, d Änderige z ibertrage.'''
+
+Grund fir d Sperri: $1",
+'protectedpagewarning'             => "'''WARNIG: Die Syten isch gsperrt worde, so das se nume Benutzer mit Sysop-Rechten chöi verändere.'''",
 'semiprotectedpagewarning'         => "'''''Halbsperrig''': Die Syte cha vu aagmäldete Benutzern bearbeitet wäre. Fir Benutzer, wu nid oder grad erscht aagmäldet sin, isch dr Schrybzuegang gsperrt.''",
 'cascadeprotectedwarning'          => "'''ACHTIG: Die Syte isch gsperrt. Wäg däm cha si nume vu Benutzer mit Ammannerächt bearbeitet wäre. Si isch in die {{PLURAL:$1|Syte|Syte}} yybunde, wu mit ere Kaskadesperroption gschitzt {{PLURAL:$1|isch|sin}}:'''",
-'titleprotectedwarning'            => '<strong>ACHTIG: S Aalege vu däre Syte isch gsperrt. Wäg däm cha si nume vu bstimmte Benutzer aaglait wäre.</strong>',
+'titleprotectedwarning'            => "'''ACHTIG: S Aalege vu däre Syte isch gsperrt. Wäg däm bruucht mer [[Special:ListGroupRights|bstimmti Rächt]] go si aalege.'''",
 'templatesused'                    => 'Selli Vorlage wärde in sellem Artikel bruucht:',
 'templatesusedpreview'             => 'Vorlage wo i dere Vorschou vorchöme:',
 'templatesusedsection'             => 'Vorlage, wu in däm Abschnitt brucht wäre:',
 'template-protected'               => '(schrybgschützt)',
 'template-semiprotected'           => '(schrybgschitzt fir Benutzer, wo nit aagmäldet oder nei sin)',
 'hiddencategories'                 => 'Die Syte ghert zue {{PLURAL:$1|einere versteckte Kategori|$1 versteckte Kategorie}}:',
-'edittools'                        => '<!-- Selle Text wird untr em "ändere"-Formular un bim "Uffelade"-Formular aagzeigt. -->',
+'edittools'                        => '<!-- Dää Text wird unter em "Ändere"-Formular un bim "Uffelade"-Formular aagzeigt. -->',
 'nocreatetitle'                    => 'S Aalege vu neje Syte isch yygschränkt.',
 'nocreatetext'                     => "Uf {{SITENAME}} isch d Erstellig vo nöue Syten ygschränkt.
 Du chasch nur Syten ändere, wo's scho git, oder muesch di [[Special:UserLogin|amälde]].",
@@ -636,48 +745,63 @@ Du chasch nur Syten ändere, wo's scho git, oder muesch di [[Special:UserLogin|a
 
 Bitte überprüeff, öb s sinnvoll isch, mit em Bearbeite wyter z mache.
 Hie gsehsch ds Lösch-Logbuech vo dere Syte:",
+'deleted-notice'                   => 'Die Syte isch glescht wore. Do chunnt e Uuszuug us em Lesch-Logbuech fir die Syte.',
+'deletelog-fulllog'                => 'Vollständigs Lesch-Logbuech',
+'edit-hook-aborted'                => 'D Bearbeitig isch ohni Erchlärung dur e Schnittstell abbroche wore.',
+'edit-gone-missing'                => 'D Syte het nid chenne aktalisiert wäre.
+Si isch schyns glescht wore.',
+'edit-conflict'                    => 'Bearbeitigskonflikt.',
+'edit-no-change'                   => 'Dyyni Bearbeitig isch ignoriert wore, wel kei Änderig am Täxt gmacht woren isch.',
+'edit-already-exists'              => 'Di nej Syte het nid chenne aaglait wäre, wel s si scho git.',
 
 # Parser/template warnings
+'expensive-parserfunction-warning'        => 'Achtig: In däre Syte het s z vyyl Ufruef vu ufwändige Parserfunktione.
+
+S {{PLURAL:$2|derf nid meh wie ein Ufruef|derfe nid meh wie $1 Ufruef}} gee.',
 'expensive-parserfunction-category'       => 'Syte, wu ufwändigi Parserfunktione z vyylmol ufruefe',
 'post-expand-template-inclusion-warning'  => 'Warnig: D Gressi vu yybundene Vorlage isch z gross, e Teil Vorlage chenne nid yybunde wäre.',
 'post-expand-template-inclusion-category' => 'Syte, wu d maximal Gressi vu dr yybundene Vorlage iberschritte isch',
 'post-expand-template-argument-warning'   => 'Warnig: In däre Syte het s zmindescht ei Argumänt in ere Vorlag, wu z gross isch, wänn s expandiert isch. Die Argumänt wäre ignoriert.',
 'post-expand-template-argument-category'  => 'Syte, wu s ignorierti Vorlageargumänt din het',
+'parser-template-loop-warning'            => 'Vorlagelätsch entdeckt: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Vorlagerekursionstiefegränz iberschritte ($1)',
 
 # "Undo" feature
 'undo-success' => 'Zum die Änderig ruckgängig z mache, kontrollier bitte d Bearbeitig in dr Verglichsaasicht un druck derno uf „Syte spichere“.',
-'undo-failure' => '<span class="error">D Änderig het nid chenne ruckgängig gmacht wäre, wel dää Abschnitt mittlerwyli gänderet woren isch.</span>',
+'undo-failure' => 'D Änderig het nid chenne ruckgängig gmacht wäre, wel dää Abschnitt mittlerwyli gänderet woren isch.',
 'undo-norev'   => 'D Bearbeitig het nid chenne ruckgängig gmacht wäre, wel si nid vorhande oder glescht isch.',
 'undo-summary' => 'D Änderig $1 vu [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) isch ruckgängig gmacht wore.',
 
 # Account creation failure
-'cantcreateaccounttitle' => 'Benutzerchonto cha nid aaglait wäre.',
-'cantcreateaccount-text' => "S Aalege vu me Benutzerchonto vu dr IP-Adräss '''($1)''' isch dur [[User:$3|$3]] gsperrt wore.
+'cantcreateaccounttitle' => 'Benutzerkonto cha nid aagleit wäre.',
+'cantcreateaccount-text' => "S Aalege vu me Benutzerkonto vu dr IP-Adräss '''($1)''' isch dur [[User:$3|$3]] gsperrt wore.
 
 Grund vu dr Sperri: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Logbüecher für die Syten azeige',
-'nohistory'           => 'S git kei Versionsgschicht fir die Syte.',
-'currentrev'          => 'Itzigi Version',
-'revisionasof'        => 'Version vo $1',
-'revision-info'       => 'Alti Bearbeitig vom $1 dür $2',
-'previousrevision'    => '� Vorderi Version',
-'nextrevision'        => 'Nächschti Version →',
-'currentrevisionlink' => 'Itzigi Version',
-'cur'                 => 'Jetz',
-'next'                => 'Nächschti',
-'last'                => 'vorane',
-'page_first'          => 'Afang',
-'page_last'           => 'Ändi',
-'histlegend'          => 'Du chasch zwei Versionen uswähle und verglyche.<br />
+'viewpagelogs'           => 'Logbüecher für die Syten azeige',
+'nohistory'              => 'S git kei Versionsgschicht fir die Syte.',
+'currentrev'             => 'Itzigi Version',
+'currentrev-asof'        => 'Aktuälli Version vu $1',
+'revisionasof'           => 'Version vo $1',
+'revision-info'          => 'Alti Bearbeitig vom $1 dür $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Vorderi Version',
+'nextrevision'           => 'Nächschti Version →',
+'currentrevisionlink'    => 'Itzigi Version',
+'cur'                    => 'Jetz',
+'next'                   => 'Nächschti',
+'last'                   => 'vorane',
+'page_first'             => 'Afang',
+'page_last'              => 'Ändi',
+'histlegend'             => 'Du chasch zwei Versionen uswähle und verglyche.<br />
 Erklärig: (aktuell) = Underschid zu jetz,
 (vorane) = Underschid zur alte Version, <strong>K</strong> = chlyni Änderig',
-'deletedrev'          => '[glescht]',
-'histfirst'           => 'Eltischti',
-'histlast'            => 'Nöischti',
-'historysize'         => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
-'historyempty'        => '(läär)',
+'history-fieldset-title' => 'Suech in dr Versionsgschicht',
+'deletedrev'             => '[glescht]',
+'histfirst'              => 'Eltischti',
+'histlast'               => 'Nöischti',
+'historysize'            => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
+'historyempty'           => '(läär)',
 
 # Revision feed
 'history-feed-title'          => 'Versionsgschicht',
@@ -754,6 +878,7 @@ Stell sicher, ass d Versionsgschicht vun eme Artikel historisch korrekt isch.',
 'mergehistory-invalid-destination' => 'Ziilsyte muess e giltige Sytename syy.',
 'mergehistory-autocomment'         => '„[[:$1]]“ zämegfierd no „[[:$2]]“',
 'mergehistory-comment'             => '„[[:$1]]“ zämegfierd no „[[:$2]]“: $3',
+'mergehistory-same-destination'    => 'Uusgangs- un Ziilsyte derfe nit di nämlige syy',
 
 # Merge log
 'mergelog'           => 'Zämefierigs-Logbuech',
@@ -766,120 +891,202 @@ Stell sicher, ass d Versionsgschicht vun eme Artikel historisch korrekt isch.',
 'difference'              => '(Unterschide zwüsche Versione)',
 'lineno'                  => 'Zyle $1:',
 'compareselectedversions' => 'Usgwählti Versione verglyche',
+'visualcomparison'        => 'Visuelle Verglych',
+'wikicodecomparison'      => 'Wikitext-Verglych',
 'editundo'                => 'rückgängig',
 'diff-multi'              => '(Der Versioneverglych zeigt ou d Änderige vo {{PLURAL:$1|1 Version|$1 Versione}} derzwüsche.)',
+'diff-movedto'            => 'verschobe no $1',
+'diff-styleadded'         => '$1-Style zuegfiegt',
+'diff-added'              => '$1 zuegfügt',
+'diff-changedto'          => 'gänderet no $1',
+'diff-movedoutof'         => 'verschobe us $1',
+'diff-styleremoved'       => '$1-Style ewäg gmacht',
+'diff-removed'            => '$1 ewäg gmacht',
+'diff-changedfrom'        => 'veränderet vu $1',
+'diff-src'                => 'Quälle',
+'diff-withdestination'    => 'mit Ziil $1',
+'diff-with'               => '&#32;mit $1 $2',
+'diff-with-final'         => '&#32;un $1 $2',
+'diff-width'              => 'Breiti',
+'diff-height'             => 'Hechi',
+'diff-p'                  => "e '''Absatz'''",
+'diff-blockquote'         => "e '''Block'''",
+'diff-h1'                 => "e '''Iberschrift (1. Ornig)'''",
+'diff-h2'                 => "e '''Iberschrift (2. Ornig)'''",
+'diff-h3'                 => "e '''Iberschrift (3. Ornig)'''",
+'diff-h4'                 => "e '''Iberschrift (4. Ornig)'''",
+'diff-h5'                 => "e '''Iberschrift (5. Ornig)'''",
+'diff-pre'                => "e '''formatierte Block'''",
+'diff-div'                => "e '''Blockelement'''",
+'diff-ul'                 => "e '''Lischt'''",
+'diff-ol'                 => "e '''numerierti Lischt'''",
+'diff-li'                 => "e '''Lischteyytrag'''",
+'diff-table'              => "e '''Tabälle'''",
+'diff-tbody'              => "e '''Tabälleinhalt'''",
+'diff-tr'                 => "e '''Zylete'''",
+'diff-td'                 => "e '''Zälle'''",
+'diff-th'                 => "e '''Spalteiberschrift'''",
+'diff-br'                 => "e '''Zyleteumbruch'''",
+'diff-hr'                 => "e '''horizontali Linie'''",
+'diff-code'               => "e '''Beryych Computercode'''",
+'diff-dl'                 => "e '''Definitionslischt'''",
+'diff-dt'                 => "e '''Definitionsterm'''",
+'diff-dd'                 => "e '''Definition'''",
+'diff-input'              => "e '''Yygab'''",
+'diff-form'               => "e '''Formular'''",
+'diff-img'                => "e '''Bild'''",
+'diff-span'               => "e '''Span'''",
+'diff-a'                  => "e '''Gleich'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''feist'''",
+'diff-strong'             => "'''firighobe'''",
+'diff-em'                 => "'''betont'''",
+'diff-font'               => "'''Schriftart'''",
+'diff-big'                => "'''gross'''",
+'diff-del'                => "'''glescht'''",
+'diff-tt'                 => "'''feschti Wyti'''",
+'diff-sub'                => "'''tiefgstellt'''",
+'diff-sup'                => "'''hochgstellt'''",
+'diff-strike'             => "'''durgstriche'''",
 
 # Search results
-'searchresults'             => 'Suech-Ergäbnis',
-'searchresulttext'          => 'Für wiiteri Informatione zuem Sueche uff {{SITENAME}} chönne Si mol uff [[{{MediaWiki:Helppage}}|{{int:help}}]] luege.',
-'searchsubtitle'            => 'Für d Suechaafrag «[[:$1]]»',
-'searchsubtitleinvalid'     => 'Für d Suechaafrag «$1»',
-'noexactmatch'              => "'''Es git kei Syte mit em Tiel „$1“.'''
+'searchresults'                    => 'Suech-Ergäbnis',
+'searchresults-title'              => 'Suechergebniss fir „$1“',
+'searchresulttext'                 => 'Für wiiteri Informatione zuem Sueche uff {{SITENAME}} chönne Si mol uff [[{{MediaWiki:Helppage}}|{{int:help}}]] luege.',
+'searchsubtitle'                   => 'Dyyni Suechaafrog: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|alli Syte, wu mit „$1“ aafange]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alli Syte, wu uf „$1“ vergleiche]])',
+'searchsubtitleinvalid'            => 'Für d Suechaafrag «$1»',
+'noexactmatch'                     => "'''Es git kei Syte mit em Tiel „$1“.'''
 Du chasch die [[:$1|Syte nöu schrybe]].",
-'noexactmatch-nocreate'     => "'''S git kei Syte mit em Titel „$1“.'''",
-'toomanymatches'            => 'D Aazahl vu dr Suechergebniss isch z gross, bitte versuech e anderi Abfrog.',
-'titlematches'              => 'Iberyystimmige mit Sytentitel',
-'notitlematches'            => 'Kei Iberyystimmige mit Sytetitel',
-'textmatches'               => 'Iberyystimmige mit Inhalte',
-'notextmatches'             => 'Kei Iberyystimmige mit Inhalte',
-'prevn'                     => 'vorderi $1',
-'nextn'                     => 'nächschti $1',
-'viewprevnext'              => '($1) ($2) aazeige; ($3) uf ds Mal',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 Wort|$2 Werter}})',
-'search-result-score'       => 'Relevanz: $1 %',
-'search-redirect'           => '(Wyterleitig $1)',
-'search-section'            => '(Abschnitt $1)',
-'search-suggest'            => 'Hesch „$1“ gmeint?',
-'search-interwiki-caption'  => 'Schweschterprojäkt',
-'search-interwiki-default'  => '$1 Ergebniss:',
-'search-interwiki-more'     => '(meh)',
-'search-mwsuggest-enabled'  => 'mit Vorschleg',
-'search-mwsuggest-disabled' => 'kei Vorschleg',
-'search-relatedarticle'     => 'Verwandti',
-'mwsuggest-disable'         => 'Vorschleg per Ajax deaktiviere',
-'searchrelated'             => 'verwandt',
-'searchall'                 => 'alli',
-'showingresults'            => "Do {{PLURAL:$1|isch '''1''' Ergebnis|sin '''$1''' Ergebniss}}, s fangt aa mit dr Nummerer '''$2.'''",
-'showingresultsnum'         => "Do {{PLURAL:$3|isch '''1''' Ergebnis|sin '''$3''' Ergebniss}}, s fangt aa mit dr Nummere '''$2.'''",
-'nonefound'                 => "'''Hiiwyys:''' S wäre standardmässig nume e Teil Namensryym dursuecht. Setz ''all:'' vor Dyy Suechbegriff go alli Syte (mit Diskussionssyte, Vorlage usw.) dursueche oder diräkt dr Name vum Namensruum, wu sett dursuecht wäre.",
-'powersearch'               => 'Erwytereti Suechi',
-'powersearch-legend'        => 'Erwytereti Suech',
-'powersearch-ns'            => 'Suech in Namensryym:',
-'powersearch-redir'         => 'Wyterleitige aazeige',
-'powersearch-field'         => 'Suech no:',
-'search-external'           => 'Externi Suech',
-'searchdisabled'            => 'D {{SITENAME}}-Suech isch deaktiviert. Du chasch mit Google sueche, s cha aber syy ass dr Suechindex vu Google fir {{SITENAME}} veraltet isch.',
+'noexactmatch-nocreate'            => "'''S git kei Syte mit em Titel „$1“.'''",
+'toomanymatches'                   => 'D Aazahl vu dr Suechergebniss isch z gross, bitte versuech e anderi Abfrog.',
+'titlematches'                     => 'Iberyystimmige mit Sytentitel',
+'notitlematches'                   => 'Kei Iberyystimmige mit Sytetitel',
+'textmatches'                      => 'Iberyystimmige mit Inhalte',
+'notextmatches'                    => 'Kei Iberyystimmige mit Inhalte',
+'prevn'                            => 'vorderi $1',
+'nextn'                            => 'nächschti $1',
+'viewprevnext'                     => '($1) ($2) aazeige; ($3) uf ds Mal',
+'searchmenu-legend'                => 'Suechoptione',
+'searchmenu-exists'                => "* Syte '''[[$1]]'''",
+'searchmenu-new'                   => "'''[[:$1|Leg]] d Syte ''$1'' in dem Wiki aa!'''",
+'searchhelp-url'                   => 'Help:Hilf',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Zeige alli Syte, wu mit dem Suechbegriff aafange]]',
+'searchprofile-articles'           => 'Inhaltssyte',
+'searchprofile-articles-and-proj'  => 'Inhaltssyte & Projäkt',
+'searchprofile-project'            => 'Projäkt',
+'searchprofile-images'             => 'Dateie',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Erwyteret',
+'searchprofile-articles-tooltip'   => 'Sueche in $1',
+'searchprofile-project-tooltip'    => 'Sueche in $1',
+'searchprofile-images-tooltip'     => 'Noch Bilder sueche',
+'searchprofile-everything-tooltip' => 'Gsamte Inhalt dursueche (au d Diskussionssyte)',
+'searchprofile-advanced-tooltip'   => 'Suech in wytere Namensryym',
+'prefs-search-nsdefault'           => 'Standard-Namensryym:',
+'prefs-search-nscustom'            => 'Suech in wytere Namensryym:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 Wort|$2 Werter}})',
+'search-result-score'              => 'Relevanz: $1 %',
+'search-redirect'                  => '(Wyterleitig $1)',
+'search-section'                   => '(Abschnitt $1)',
+'search-suggest'                   => 'Hesch „$1“ gmeint?',
+'search-interwiki-caption'         => 'Schweschterprojäkt',
+'search-interwiki-default'         => '$1 Ergebniss:',
+'search-interwiki-more'            => '(meh)',
+'search-mwsuggest-enabled'         => 'mit Vorschleg',
+'search-mwsuggest-disabled'        => 'kei Vorschleg',
+'search-relatedarticle'            => 'Verwandti',
+'mwsuggest-disable'                => 'Vorschleg per Ajax deaktiviere',
+'searchrelated'                    => 'verwandt',
+'searchall'                        => 'alli',
+'showingresults'                   => "Do {{PLURAL:$1|isch '''1''' Ergebnis|sin '''$1''' Ergebniss}}, s fangt aa mit dr Nummerer '''$2.'''",
+'showingresultsnum'                => "Do {{PLURAL:$3|isch '''1''' Ergebnis|sin '''$3''' Ergebniss}}, s fangt aa mit dr Nummere '''$2.'''",
+'showingresultstotal'              => "S {{PLURAL:$4|folgt s Suechergebnis '''$1''' vu '''$3:'''|folge d Suechergebniss '''$1–$2''' vu '''$3:'''}}",
+'nonefound'                        => "'''Hiiwyys:''' S wäre standardmässig nume e Teil Namensryym dursuecht. Setz ''all:'' vor Dyy Suechbegriff go alli Syte (mit Diskussionssyte, Vorlage usw.) dursueche oder diräkt dr Name vum Namensruum, wu sett dursuecht wäre.",
+'search-nonefound'                 => 'Fir Dyyni Suechaafrog sin keini Ergebniss gfunde wore.',
+'powersearch'                      => 'Erwytereti Suechi',
+'powersearch-legend'               => 'Erwytereti Suech',
+'powersearch-ns'                   => 'Suech in Namensryym:',
+'powersearch-redir'                => 'Wyterleitige aazeige',
+'powersearch-field'                => 'Suech no:',
+'search-external'                  => 'Externi Suech',
+'searchdisabled'                   => 'D {{SITENAME}}-Suech isch deaktiviert. Du chasch mit Google sueche, s cha aber syy ass dr Suechindex vu Google fir {{SITENAME}} veraltet isch.',
 
 # Preferences page
-'preferences'              => 'Iistellige',
-'mypreferences'            => 'Ystellige',
-'prefs-edits'              => 'Aazahl vu dr Bearbeitige:',
-'prefsnologin'             => 'Nid aagmäldet',
-'prefsnologintext'         => 'Du muesch <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} aagmäldet]</span> sy, für Benutzerystellige chönne z ändere',
-'prefsreset'               => 'Du hesch itz wider Standardystellige',
-'qbsettings'               => 'Syteleischte',
-'qbsettings-none'          => 'Keini',
-'qbsettings-fixedleft'     => 'Links, fescht',
-'qbsettings-fixedright'    => 'Rächts, fescht',
-'qbsettings-floatingleft'  => 'Links, in dr Schwebi',
-'qbsettings-floatingright' => 'Rächts, in dr Schwebi',
-'changepassword'           => 'Passwort ändere',
-'skin'                     => 'Skin',
-'math'                     => 'TeX',
-'dateformat'               => 'Datumsformat',
-'datedefault'              => 'kei Aagab',
-'datetime'                 => 'Datum un Zit',
-'math_failure'             => 'Parser-Fähler',
-'math_unknown_error'       => 'Nit bekannte Fähler',
-'math_unknown_function'    => 'Nit bekannti Funktion',
-'math_lexing_error'        => "'Lexing'-Fähler",
-'math_syntax_error'        => 'Syntaxfähler',
-'math_image_error'         => 'd PNG-Konvertierig het nit funktioniert;
+'preferences'               => 'Yystellige',
+'mypreferences'             => 'Ystellige',
+'prefs-edits'               => 'Aazahl vu dr Bearbeitige:',
+'prefsnologin'              => 'Nid aagmäldet',
+'prefsnologintext'          => 'Du muesch <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} aagmäldet]</span> sy, für Benutzerystellige chönne z ändere',
+'prefsreset'                => 'Du hesch itz wider Standardystellige',
+'qbsettings'                => 'Syteleischte',
+'qbsettings-none'           => 'Keini',
+'qbsettings-fixedleft'      => 'Links, fescht',
+'qbsettings-fixedright'     => 'Rächts, fescht',
+'qbsettings-floatingleft'   => 'Links, in dr Schwebi',
+'qbsettings-floatingright'  => 'Rächts, in dr Schwebi',
+'changepassword'            => 'Passwort ändere',
+'skin'                      => 'Skin',
+'skin-preview'              => 'Vorschou',
+'math'                      => 'TeX',
+'dateformat'                => 'Datumsformat',
+'datedefault'               => 'kei Aagab',
+'datetime'                  => 'Datum un Zyt',
+'math_failure'              => 'Parser-Fähler',
+'math_unknown_error'        => 'Nit bekannte Fähler',
+'math_unknown_function'     => 'Nit bekannti Funktion',
+'math_lexing_error'         => "'Lexing'-Fähler",
+'math_syntax_error'         => 'Syntaxfähler',
+'math_image_error'          => 'd PNG-Konvertierig het nit funktioniert;
 prief di korrekt Installation vu latex, dvips, gs un convert',
-'math_bad_tmpdir'          => 'S temporär Verzeichnis fir mathematischi Formle cha nit aagleit oder bschribe wäre.',
-'math_bad_output'          => 'S Ziilverzeichnis fir mathematischi Formle cha nit aagleit oder bschribe wäre.',
-'math_notexvc'             => 'S texvc-Programm isch nit gfunde wore. Bitte acht gee uf math/README.',
-'prefs-personal'           => 'Benutzerdate',
-'prefs-rc'                 => 'Letschti Änderige',
-'prefs-watchlist'          => 'Beobachtigslischte',
-'prefs-watchlist-days'     => 'Aazahl vu dr Täg, wu d Beobchtigslischt standardmässig soll umfasse:',
-'prefs-watchlist-edits'    => 'Maximali Zahl vu dr Yyträg:',
-'prefs-misc'               => 'Verschidnigs',
-'saveprefs'                => 'Änderige spychere',
-'resetprefs'               => 'Änderige doch nid spychere',
-'oldpassword'              => 'Alts Passwort',
-'newpassword'              => 'Nöis Passwort',
-'retypenew'                => 'Nöis Passwort (es zwöits Mal)',
-'textboxsize'              => 'Tekscht-Ygab',
-'rows'                     => 'Zylene',
-'columns'                  => 'Spaltene',
-'searchresultshead'        => 'Suech-Ergäbnis',
-'resultsperpage'           => 'Träffer pro Syte',
-'contextlines'             => 'Zyle pro Träffer',
-'contextchars'             => 'Zeiche pro Zyle',
-'stub-threshold'           => 'Gleichformatierig <a href="#" class="stub">vu chleine Syte</a> (in Byte):',
-'recentchangesdays'        => 'Aazahl vu dr Täg, wu d Lischt vu dr  „Letschte Änderige“ standardmässig soll umfasse:',
-'recentchangescount'       => 'Aazahl «letschti Änderige»',
-'savedprefs'               => 'Dyni Ystellige sy gspycheret worde.',
-'timezonelegend'           => 'Zytzone',
-'timezonetext'             => 'Zytdifferänz i Stunden aagä zwüsche der Serverzyt u dyre Lokalzyt',
-'localtime'                => 'Ortszyt',
-'timezoneoffset'           => 'Unterschid¹',
-'servertime'               => 'Aktuelli Serverzyt',
-'guesstimezone'            => 'Vom Browser la ysetze',
-'allowemail'               => 'andere Benutzer erlaube, dass si Ihne E-Mails chenne schicke',
-'prefs-searchoptions'      => 'Suechoptione',
-'prefs-namespaces'         => 'Namensryym',
-'defaultns'                => 'Namensrüüm wo standardmäässig söll gsuecht wärde:',
-'default'                  => 'Voryystellig',
-'files'                    => 'Bilder',
+'math_bad_tmpdir'           => 'S temporär Verzeichnis fir mathematischi Formle cha nit aagleit oder bschribe wäre.',
+'math_bad_output'           => 'S Ziilverzeichnis fir mathematischi Formle cha nit aagleit oder bschribe wäre.',
+'math_notexvc'              => 'S texvc-Programm isch nit gfunde wore. Bitte acht gee uf math/README.',
+'prefs-personal'            => 'Benutzerdate',
+'prefs-rc'                  => 'Letschti Änderige',
+'prefs-watchlist'           => 'Beobachtigslischte',
+'prefs-watchlist-days'      => 'Aazahl vu dr Täg, wu d Beobchtigslischt standardmässig soll umfasse:',
+'prefs-watchlist-days-max'  => '(Maximal 7 Täg)',
+'prefs-watchlist-edits'     => 'Maximali Zahl vu dr Yyträg:',
+'prefs-watchlist-edits-max' => '(Maximali Aazahl: 1000)',
+'prefs-misc'                => 'Verschidnigs',
+'prefs-resetpass'           => 'Passwort ändere',
+'saveprefs'                 => 'Änderige spychere',
+'resetprefs'                => 'Änderige doch nid spychere',
+'textboxsize'               => 'Tekscht-Ygab',
+'prefs-edit-boxsize'        => 'Gressi vum Bearbeitigsfänschter.',
+'rows'                      => 'Zylene',
+'columns'                   => 'Spaltene',
+'searchresultshead'         => 'Suech-Ergäbnis',
+'resultsperpage'            => 'Träffer pro Syte',
+'contextlines'              => 'Zyle pro Träffer',
+'contextchars'              => 'Zeiche pro Zyle',
+'stub-threshold'            => 'Gleichformatierig <a href="#" class="stub">vu chleine Syte</a> (in Byte):',
+'recentchangesdays'         => 'Aazahl vu dr Täg, wu d Lischt vu dr  „Letschte Änderige“ standardmässig soll umfasse:',
+'recentchangesdays-max'     => '(Maximal $1 {{PLURAL:$1|Tag|Täg}})',
+'recentchangescount'        => 'Aazahl vu dr Yyträg in dr «letschte Änderige», in dr Versionsgschicht un in dr Logbiecher:',
+'savedprefs'                => 'Dyni Ystellige sy gspycheret worde.',
+'timezonelegend'            => 'Zytzone',
+'timezonetext'              => 'Zytdifferänz i Stunden aagä zwüsche der Serverzyt u dyre Lokalzyt',
+'localtime'                 => 'Ortszyt:',
+'timezoneselect'            => 'Zytzone:',
+'timezoneuseserverdefault'  => 'Standardzyt vum Server',
+'timezoneuseoffset'         => 'Anderi (Unterschiid aagee)',
+'timezoneoffset'            => 'Unterschiid¹',
+'servertime'                => 'Aktuälli Serverzyt:',
+'guesstimezone'             => 'Vom Browser la ysetze',
+'allowemail'                => 'andere Benutzer erlaube, dass si Ihne E-Mails chenne schicke',
+'prefs-searchoptions'       => 'Suechoptione',
+'prefs-namespaces'          => 'Namensryym',
+'defaultns'                 => 'Namensrüüm wo standardmäässig söll gsuecht wärde:',
+'default'                   => 'Voryystellig',
+'files'                     => 'Bilder',
 
 # User rights
 'userrights'                  => 'Benutzerrächtsverwaltig', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Verwalt d Gruppezuegherigkeit',
 'userrights-user-editname'    => 'Benutzername:',
 'editusergroup'               => 'Ändere vo Benutzerrächt',
-'editinguser'                 => "Benutzerrächt ändere vu '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Benutzerrächt ändere vu '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Bearbeit d Gruppezuegherigkeit vum Benutzers',
 'saveusergroups'              => 'Spychere d Gruppezuegherigkeit',
 'userrights-groupsmember'     => 'Mitgliid vu:',
@@ -889,7 +1096,7 @@ prief di korrekt Installation vu latex, dvips, gs un convert',
 'userrights-reason'           => 'Grund:',
 'userrights-no-interwiki'     => 'Du hesch nit d Berächtigung, Benutzerrächt in andere Wiki z ändere.',
 'userrights-nodatabase'       => 'D Datebank $1 git s nit oder si isch nit lokal.',
-'userrights-nologin'          => 'Du muesch Di mit eme Ammanne-Benutzerchonto [[Special:UserLogin|aamälde]], zum Benutzerrächt z ändere.',
+'userrights-nologin'          => 'Du muesch Di mit eme Ammanne-Benutzerkonto [[Special:UserLogin|aamälde]], zum Benutzerrächt z ändere.',
 'userrights-notallowed'       => 'Du hesch nit d Berächtigung zum Benutzerrächt vergee.',
 'userrights-changeable-col'   => 'Gruppezuegherigkeit, wu Du chasch ändere',
 'userrights-unchangeable-col' => 'Gruppezuegherigkeit, wu Du nit chasch ändere',
@@ -923,10 +1130,12 @@ prief di korrekt Installation vu latex, dvips, gs un convert',
 'right-edit'                 => 'Syte bearbeite',
 'right-createpage'           => 'Syten aalege (usser Diskussionssyte)',
 'right-createtalk'           => 'Diskussionssyte aalege',
-'right-createaccount'        => 'Benutzerchonto aalege',
+'right-createaccount'        => 'Benutzerkonto aalege',
 'right-minoredit'            => 'Bearbeitige as chly markiere',
 'right-move'                 => 'Syte verschiebe',
 'right-move-subpages'        => 'Syte verschiebe mitsamt dr Untersyte',
+'right-move-rootuserpages'   => 'Haupt-Benutzersyte verschiebe',
+'right-movefile'             => 'Dateie verschiebe',
 'right-suppressredirect'     => 'Bim Verschiebe s Aalege vun ere Wyterleitig unterdrucke',
 'right-upload'               => 'Dateie uffelade',
 'right-reupload'             => 'E Datei, wu s git, iberschryybe',
@@ -977,9 +1186,46 @@ prief di korrekt Installation vu latex, dvips, gs un convert',
 'rightslogentry' => 'het d Benutzerrächt fir „[[$1]]“ vu „$2“ uf „$3“ gänderet',
 'rightsnone'     => '(keini)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'die Syte z läse',
+'action-edit'                 => 'die Syte z bearbeite',
+'action-createpage'           => 'Syten aazlege',
+'action-createtalk'           => 'Diskussionssyten aazlege',
+'action-createaccount'        => 'e Benutzerkonto aazlege',
+'action-minoredit'            => 'die Bearbeitig as chlei z markiere',
+'action-move'                 => 'die Syte z verschiebe',
+'action-move-subpages'        => 'die Syte un di zuegherige Untersyte z verschiebe',
+'action-move-rootuserpages'   => 'Haupt-Benutzersyte z verschiebe',
+'action-movefile'             => 'Die Datei verschiebe',
+'action-upload'               => 'Dateie uffezlade',
+'action-reupload'             => 'die vorhandene Datei z iberschryybe',
+'action-reupload-shared'      => 'die Datei us em gmeinsam gnutzte Repositorium z iberschryybe',
+'action-upload_by_url'        => 'Dateie vun ere Netzadräss (URL) uffezlade',
+'action-writeapi'             => 'd writeAPI z verwände',
+'action-delete'               => 'Syte z lesche',
+'action-deleterevision'       => 'Versione z lesche',
+'action-deletedhistory'       => 'd Lischt vu dr gleschte Versione vu däre Syte aazluege',
+'action-browsearchive'        => 'noch gleschte Syte z sueche',
+'action-undelete'             => 'die Syte wider herzstelle',
+'action-suppressrevision'     => 'di versteckt Version aazluege un wider herzstelle',
+'action-suppressionlog'       => 's privat Logbuech aazluege',
+'action-block'                => 'dä Benutzer z sperre',
+'action-protect'              => 'dr Schutzstatus vu Syte z ändere',
+'action-import'               => 'Syte us eme andere Wiki z importiere',
+'action-importupload'         => 'Syte z importiere iber s Uffelade vun ere Datei',
+'action-patrol'               => 'd Bearbeitige vu andere Benutzer as kontrolliert z markiere',
+'action-autopatrol'           => 'di eigene Bearbeitige as kontrolliert z markiere',
+'action-unwatchedpages'       => 'd Lischt vu dr nit beobachtete Syten aazluege',
+'action-trackback'            => 'e Trackback z ibertrage',
+'action-mergehistory'         => 'd Versionegschichte vu Syte zämezfiere',
+'action-userrights'           => 'Benutzerrächt z ändere',
+'action-userrights-interwiki' => 'd Rächt vu Benutzer in andere Wiki z ändere',
+'action-siteadmin'            => 'd Datebank z sperre oder frejzgee',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|Änderig|Änderige}}',
 'recentchanges'                     => 'Letschti Änderige',
+'recentchanges-legend'              => 'Optione vu dr Aazeig',
 'recentchangestext'                 => 'Uff däre Syte chönne Si die letschte Änderige in däm Wiki aaluege.',
 'recentchanges-feed-description'    => 'Di letschten Änderige vo {{SITENAME}} i däm Feed abonniere.',
 'rcnote'                            => "Azeigt {{PLURAL:$1|wird '''1''' Änderig|wärde di letschte '''$1''' Änderige}} {{PLURAL:$2|vom letschte Tag|i de letschte '''$2''' Täg}} (Stand: $4, $5)",
@@ -1003,6 +1249,8 @@ prief di korrekt Installation vu latex, dvips, gs un convert',
 'rc_categories'                     => 'Nume Syten us dr Kategorie (trennt mit „|“):',
 'rc_categories_any'                 => 'Alli',
 'newsectionsummary'                 => 'Neje Abschnitt /* $1 */',
+'rc-enhanced-expand'                => 'Detail aazeige (brucht JavaScript)',
+'rc-enhanced-hide'                  => 'Detail verstecke',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Verlinktes prüefe',
@@ -1014,71 +1262,192 @@ Sytene, wo zu dyre [[Special:Watchlist|Beobachtigslischte]] ghöre, erschyne '''
 'recentchangeslinked-to'       => 'Zeig Änderige uf Syte, wu do ane vergleicht sin',
 
 # Upload
-'upload'                     => 'Datei uffelade',
-'uploadbtn'                  => 'Bild lokal ufelade',
-'reupload'                   => 'Abbräche',
-'reuploaddesc'               => 'Abbrächen un zrugg zue dr Syte "Uffelade"',
-'uploadnologin'              => 'Nit aagmäldet',
-'uploadnologintext'          => 'Si mien [[Special:UserLogin|aagmäldet syy]], zum Dateie uffelade z chenne.',
-'upload_directory_missing'   => 'S Upload-Verzeichnis ($1) fählt un het au dur dr Netzserver nit chenne aagleit wäre.',
-'upload_directory_read_only' => 'Dr Netzserver het kei Schryybrächt fir s Upload-Verzeichnis ($1).',
-'uploaderror'                => 'Fähler bim Uffelade',
-'uploadtext'                 => "Bruuche Si sell Formular unte go Dateie uffelade. Zuem aaluege odr fruener uffegladeni Bilder go sueche lueg uff de [[Special:ImageList|Lischte vo uffegladene Dateie]], Uffeladige un Löschige sin au protokolliert uff [[Special:Log/upload|Uffeladige Protokoll]].
-
-Go e Datei odr en Bild innere Syte iizbaue schriibe Si eifach ane:
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.jpg]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.png|alt text]]</nowiki>'''
-or
-* '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki>'''
-go direkt e Gleich uff d Datei z'mache.",
-'upload-permitted'           => 'Dateitype, wu erlaubt sin: $1.',
-'upload-preferred'           => 'Dateitype, wu bevorzugt sin: $1.',
-'upload-prohibited'          => 'Dateitype, wu nit erlaubt sin: $1.',
-'uploadlog'                  => 'Datei-Logbuech',
-'uploadlogpage'              => 'Dateie-Logbuech',
-'filename'                   => 'Dateiname',
-'filedesc'                   => 'Bschryybig',
-'fileuploadsummary'          => 'Bschryybig/Quälle:',
-'filestatus'                 => 'Urheberrächts-Status:',
-'filesource'                 => 'Quälle:',
-'uploadedfiles'              => 'Uffegladeni Dateie',
-'ignorewarning'              => 'Warnig ignoriere un d Datei spychere',
-'ignorewarnings'             => 'Warnige ignoriere',
-'minlength1'                 => 'Dateinäme mien zmindescht e Buechstab lang syy.',
-'illegalfilename'            => 'Im Dateiname „$1“ het s zmindescht ei Zeiche, wu nit erlaubt isch. Bitte gib dr Datei e andere Name un versuech nomol si uffezlade.',
-'badfilename'                => 'Dr Dateiname isch in „$1“ gänderet wore.',
-'filetype-badmime'           => 'Dateie mit em MIME-Typ „$1“ derfe nit uffeglade wäre.',
-'filetype-bad-ie-mime'       => 'Die Datei cha nit uffeglade wäre, wel dr Internet Explorer si as „$1“ kennt, wu e nit erlaubte, villicht gferlige Dateityp isch.',
-'filetype-unwanted-type'     => "'''„.$1“''' isch e Dateiformat, wu nit gwinscht isch. Erlaubt {{PLURAL:$3|isch s Dateiformat|sin d Dateiformat}}: $2.",
-'filetype-banned-type'       => "'''„.$1“''' isch e Dateiformat, wu nit erlaubt isch. Erlaubt {{PLURAL:$3|isch s Dateiformat|sin d Dateiformat}}: $2.",
-'filetype-missing'           => 'D Datei, wu soll uffeglade wäre, het kei Erwyterig (z. B. „.jpg“).',
-'large-file'                 => 'D Dateigressi sott, wänn s goht, nit gresser syy wie $1. Die Datei isch $2 gross.',
-'largefileserver'            => 'Die Datei isch gresser wie die vum Server yygstellti Maximalgressi.',
-'emptyfile'                  => 'Di uffeglade Datei isch schyyns läär. Dr Grund cha ne Tippfähler im Dateiname syy. Bitte iberprief, eb du die Datei wirkli wit uffelade.',
-'uploadedimage'              => 'het „[[$1]]“ ufeglade',
-
-# Special:ImageList
-'imagelist' => 'Lischte vo Bilder',
-
-# Image description page
-'filehist'                  => 'Dateiversione',
-'filehist-help'             => 'Klick uf e Zytpunkt zu aazeige, wie s dert usgsäh het.',
-'filehist-current'          => 'aktuell',
-'filehist-datetime'         => 'Version vom',
-'filehist-user'             => 'Benutzer',
-'filehist-dimensions'       => 'Mäß',
-'filehist-filesize'         => 'Dateigrößi',
-'filehist-comment'          => 'Kommentar',
-'imagelinks'                => 'Bildverwyys',
-'linkstoimage'              => 'Di {{PLURAL:$1|Syte|$1 Sytene}} händ en Link zu dem Bild:',
-'nolinkstoimage'            => 'Kei Artikel verwändet des Bild.',
-'sharedupload'              => 'Die Datei wird vu verschidene Projekt brucht.',
-'noimage'                   => 'Es git kei Datei mit däm Name, aber du chasch se $1.',
-'noimage-linktext'          => 'ufelade',
-'uploadnewversion-linktext' => 'E nöui Version vo dere Datei ufelade',
+'upload'                      => 'Datei uffelade',
+'uploadbtn'                   => 'Bild lokal ufelade',
+'reupload'                    => 'Abbräche',
+'reuploaddesc'                => 'Abbrächen un zrugg zue dr Syte "Uffelade"',
+'uploadnologin'               => 'Nit aagmäldet',
+'uploadnologintext'           => 'Si mien [[Special:UserLogin|aagmäldet syy]], zum Dateie uffelade z chenne.',
+'upload_directory_missing'    => 'S Upload-Verzeichnis ($1) fählt un het au dur dr Netzserver nit chenne aagleit wäre.',
+'upload_directory_read_only'  => 'Dr Netzserver het kei Schryybrächt fir s Upload-Verzeichnis ($1).',
+'uploaderror'                 => 'Fähler bim Uffelade',
+'uploadtext'                  => "Verwänd des Formular unte zum Dateie uffelade.
+Zum friejer uffegladeni Dateie aazluege oder z sueche lueg uf dr [[Special:FileList|Lischt vu uffegladene Dateie]], 
+Weli Dateie uffeglade sin, sihsch im [[Special:Log/upload|Logbuech vu dr uffegladene Dateie]], weli glescht sin im [[Special:Log/delete|Lesch-Logbuech]]
+
+Zum e Datei oder e Bild in ere Syte yyzböue, schryybsch eifach:
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki>''' fir di voll Version vu dr Datei
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png|al text]]</nowiki>''' fir e 200 Pixel grossi Version im e Chaschte mit 'alt text' as Bschrybig
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' fir e diräkt Gleich zuer dr Datei ohni ass si aazeigt wird",
+'upload-permitted'            => 'Dateitype, wu erlaubt sin: $1.',
+'upload-preferred'            => 'Dateitype, wu bevorzugt sin: $1.',
+'upload-prohibited'           => 'Dateitype, wu nit erlaubt sin: $1.',
+'uploadlog'                   => 'Datei-Logbuech',
+'uploadlogpage'               => 'Dateie-Logbuech',
+'uploadlogpagetext'           => 'Des isch s Logbuech vu dr uffegladene Dateie.
+Lueg au d [[Special:NewFiles|Galerii vu neije Dateie]] fir e visuälle Iberblick.',
+'filename'                    => 'Dateiname',
+'filedesc'                    => 'Bschryybig',
+'fileuploadsummary'           => 'Bschryybig/Quälle:',
+'filestatus'                  => 'Urheberrächts-Status:',
+'filesource'                  => 'Quälle:',
+'uploadedfiles'               => 'Uffegladeni Dateie',
+'ignorewarning'               => 'Warnig ignoriere un d Datei spychere',
+'ignorewarnings'              => 'Warnige ignoriere',
+'minlength1'                  => 'Dateinäme mien zmindescht e Buechstab lang syy.',
+'illegalfilename'             => 'Im Dateiname „$1“ het s zmindescht ei Zeiche, wu nit erlaubt isch. Bitte gib dr Datei e andere Name un versuech nomol si uffezlade.',
+'badfilename'                 => 'Dr Dateiname isch in „$1“ gänderet wore.',
+'filetype-badmime'            => 'Dateie mit em MIME-Typ „$1“ derfe nit uffeglade wäre.',
+'filetype-bad-ie-mime'        => 'Die Datei cha nit uffeglade wäre, wel dr Internet Explorer si as „$1“ kennt, wu e nit erlaubte, villicht gferlige Dateityp isch.',
+'filetype-unwanted-type'      => "'''„.$1“''' isch e Dateiformat, wu nit gwinscht isch. Erlaubt {{PLURAL:$3|isch s Dateiformat|sin d Dateiformat}}: $2.",
+'filetype-banned-type'        => "'''„.$1“''' isch e Dateiformat, wu nit erlaubt isch. Erlaubt {{PLURAL:$3|isch s Dateiformat|sin d Dateiformat}}: $2.",
+'filetype-missing'            => 'D Datei, wu soll uffeglade wäre, het kei Erwyterig (z. B. „.jpg“).',
+'large-file'                  => 'D Dateigressi sott, wänn s goht, nit gresser syy wie $1. Die Datei isch $2 gross.',
+'largefileserver'             => 'Die Datei isch gresser wie die vum Server yygstellti Maximalgressi.',
+'emptyfile'                   => 'Di uffeglade Datei isch schyyns läär. Dr Grund cha ne Tippfähler im Dateiname syy. Bitte iberprief, eb du die Datei wirkli wit uffelade.',
+'fileexists'                  => "S git scho ne Datei mit däm Name. Wänn Du uf \"Datei spichere\" drucksch, no wird die Datei iberschribe. Bitte prief '''<tt>\$1</tt>''', wänn Der nit sicher bisch.",
+'filepageexists'              => "E Bschryybigssyte isch scho as '''<tt>$1</tt>''' aagleit wore, s git aber kei Datei mit däm Name. Die Bschryybig, wu Du yygee hesch, wird nit uf d Bschryybigssyte ibernuh. Du muesch d Bschryybigssyte noch em Uffelade vu dr Datei no manuäll bearbeite.",
+'fileexists-extension'        => "S git scho ne Datei mit eme ähnlige Name:<br />
+Name vu Datei, wu soll uffeglade were: '''<tt>$1</tt>'''<br />
+Name vu dr Datei, wu s scho git: '''<tt>$2</tt>'''<br />
+Nume d Dateiändig unterscheidet si in dr Gross-/Chleinschryybig. Bitte prief, eb die Datei vum Inhalt her identisch sin.",
+'fileexists-thumb'            => "<center>'''Vorhandeni Datei'''</center>",
+'fileexists-thumbnail-yes'    => "Die Datei isch schyyns e Bild mit ere verringerte Gressi ''(thumbnail)''. Bitte prief d Datei '''<tt>$1</tt>'''.<br />
+Wänn s Bild in dr Originalgressi isch, no isch s nit netig, ass e extra Vorschaubild uffeglade wird.",
+'file-thumbnail-no'           => "Dr Dateiname fangt mit '''<tt>$1</tt>''' aa. Des wyyst uf e Bild mit ere verringerte Gressi ''(thumbnail)'' hi.
+Bitte prief, eb D s Bild in voller Uflesig vorlige hesch un lad derno des unter em Originalname uffe.",
+'fileexists-forbidden'        => 'S git scho ne Datei mit däm Name. Si cha nit iberschribe wäre. Bitte gang zruck un lad die Datei unter eme andere Name uffe. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'S git scho ne Datei mit däm Name im Zentrale Mediearchiv.
+Wänn Du die Datei einewäg wit uffelade, gang bitte zruck un ändere dr Name.
+[[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'Die Datei isch e Duplikat vu {{PLURAL:$1|däre Datei|däne $1 Dateie}}:',
+'file-deleted-duplicate'      => 'E identischi Version vu däre Datei ([[$1]]) isch friejer scho mol glescht wore. Iberprief s Leschlogbuech, voreb Du si uffeladesch.',
+'successfulupload'            => 'Erfolgryych uffegelade',
+'uploadwarning'               => 'Warnig',
+'savefile'                    => 'Datei spychere',
+'uploadedimage'               => 'het „[[$1]]“ ufeglade',
+'overwroteimage'              => 'het e neiji Version vu „[[$1]]“ uffeglade',
+'uploaddisabled'              => 'Uffelade deaktiviert',
+'uploaddisabledtext'          => 'S Uffelade vu Dateie isch deaktiviert.',
+'uploadscripted'              => 'In däre Datei git s HTML- oder Scriptcode, wu fälschligerwyys vun eme Webbrowser usgfiert chennt were.',
+'uploadcorrupt'               => 'Die Datei isch bschädigt oder het e falschi Datei-Erwyterig. Bitte iberprief d Datei un lad si no mol uffe.',
+'uploadvirus'                 => 'In däre Datei het s e Virus! Detail: $1',
+'sourcefilename'              => 'Quälldatei:',
+'destfilename'                => 'Ziilname:',
+'upload-maxfilesize'          => 'Maximali Dateigressi: $1',
+'watchthisupload'             => 'Die Syte beobachte',
+'filewasdeleted'              => 'E Datei mit däm Name isch scho mol uffeglade wore un isch in dr Zwischezyt wider glescht wore. Bitte prief zerscht dr Yytrag im $1, voreb Du die Datei wirkli spycheresch.',
+'upload-wasdeleted'           => "'''Obacht: Du ladsch e Datei uffe, wu scho mol glescht woren isch.'''
+
+Bitte prief, eb s dr Richtlinie entspricht, wänn Du die Datei no mol uffeladesch..
+Zue Dyynere Information chunnt do s Lesch-Logbuech mit dr Begrindig fir di friejer Leschig:",
+'filename-bad-prefix'         => "Dr Dateiname fangt mit '''„$1“''' aa. Des isch isch normalerwyys dr Dateiname, wu vun ere Digitalkamera vorgee wird un d Datei nit bschryybt.
+Bitte gib dr Datei e Name, wu dr Inhalt besser bschryybt.",
+
+'upload-proto-error'      => 'Falschs Protokoll',
+'upload-proto-error-text' => 'D URL muess mit <code>http://</code> oder <code>ftp://</code> aafange.',
+'upload-file-error'       => 'Interne Fähler',
+'upload-file-error-text'  => 'Bim Aalege vun ere temporäre Datei uf em Server isch e interne Fähler uftrette.
+Bitte informier e [[Special:ListUsers/sysop|Ammann]].',
+'upload-misc-error'       => 'Nit bekannte Fähler bim Uffelade',
+'upload-misc-error-text'  => 'Bim Uffelade isch e nit bekannte Fähler uftrette.
+Prief d URL uf Fähler un dr Online-Status vu dr Syte un versuech s no mol.
+Wänn s Problem alno uftritt, informier e [[Special:ListUsers/sysop|Ammann]].',
+
+# Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
+'upload-curl-error6'       => 'URL isch nit z verwitsche',
+'upload-curl-error6-text'  => 'D URL, wu aagee woren isch, isch nit z verwitsche. Prief d URL uf Fähler un dr Online-Status vu dr Syte.',
+'upload-curl-error28'      => 'Zyt iberschritte bim Uffelade',
+'upload-curl-error28-text' => 'D Syte brucht z lang fir e Antwort. Prief, eb d Syte online isch, wart e Rung un versuech s derno nomol. S cha au sinnvoll syy, s speter nomol z versueche.',
+
+'license'            => 'Lizänz:',
+'nolicense'          => 'kei Voruswahl',
+'license-nopreview'  => '(s isch kei Vorschau verfiegbar)',
+'upload_source_url'  => ' (giltige, effentli zuegänglig URL)',
+'upload_source_file' => ' (e Datei uf Dyynem Computer)',
+
+# Special:ListFiles
+'listfiles-summary'     => 'Die Spezialsyte lischtet alli uffegladene Dateie uf. Standardmässig were di zletscht uffegladene Dateie zerscht aazeigt. Dur e Klick uf d Spalte-Iberschrifte cha d Sortierig umdrillt were oder s cha noch ere andere Spalte sortiert were.',
+'listfiles_search_for'  => 'Suech noch Datei:',
+'imgfile'               => 'Datei',
+'listfiles'             => 'Lischte vo Bilder',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Name',
+'listfiles_user'        => 'Benutzer',
+'listfiles_size'        => 'Gressi',
+'listfiles_description' => 'Bschryybig',
+'listfiles_count'       => 'Versione',
+
+# File description page
+'filehist'                       => 'Dateiversione',
+'filehist-help'                  => 'Klick uf e Zytpunkt zu aazeige, wie s dert usgsäh het.',
+'filehist-deleteall'             => 'Alli Versione lesche',
+'filehist-deleteone'             => 'Die Version lesche',
+'filehist-revert'                => 'zrucksetze',
+'filehist-current'               => 'aktuell',
+'filehist-datetime'              => 'Version vom',
+'filehist-thumb'                 => 'Vorschaubild',
+'filehist-thumbtext'             => 'Vorschaubild fir Version vum $1',
+'filehist-nothumb'               => 'Kei Vorschaubild vorhande',
+'filehist-user'                  => 'Benutzer',
+'filehist-dimensions'            => 'Mäß',
+'filehist-filesize'              => 'Dateigrößi',
+'filehist-comment'               => 'Kommentar',
+'imagelinks'                     => 'Dateigleicher',
+'linkstoimage'                   => 'Di {{PLURAL:$1|Syte|$1 Sytene}} händ en Link zu dem Bild:',
+'linkstoimage-more'              => 'Meh as {{PLURAL:$1|ei Syte vergleicht|$1 Syte vergleiche}} uf die Datei.
+Die Lischt zeigt nume {{PLURAL:$1|dr erscht Gleich|di erschte $1 Gleicher}} uf die Datei.
+E [[Special:WhatLinksHere/$2|vollständigi Lischt]] isch verfiegbar.',
+'nolinkstoimage'                 => 'Kei Artikel verwändet des Bild.',
+'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Meh Gleicher]] fir die Datei.',
+'redirectstofile'                => 'Die {{PLURAL:$1|Datei leitet|$1 Dateie leite}} uf die Datei wyter:',
+'duplicatesoffile'               => 'Die {{PLURAL:$1|Datei isch e Duplikat|$1 Dateie sin Duplikat}} vu däre Datei ([[Special:FileDuplicateSearch/$2|meh Detail]]):',
+'sharedupload'                   => 'Die Datei wird vu verschidene Projekt brucht.',
+'shareduploadwiki'               => 'Fir wyteri Informatione lueg d $1.',
+'shareduploadwiki-desc'          => 'Do chunnt dr Bschryybig vum $1.',
+'shareduploadwiki-linktext'      => 'Datei-Bschryybigssyte',
+'shareduploadduplicate'          => 'Die Datei isch e Duplikat $1 us em gmeinsam bruchte Repositorium.',
+'shareduploadduplicate-linktext' => 'däre andere Datei',
+'shareduploadconflict'           => 'Die Datei het dr nämlig Name wie $1 us em gmeinsam bruchte Repositorium.',
+'shareduploadconflict-linktext'  => 'däre andere Datei',
+'noimage'                        => 'Es git kei Datei mit däm Name, aber du chasch se $1.',
+'noimage-linktext'               => 'ufelade',
+'uploadnewversion-linktext'      => 'E nöui Version vo dere Datei ufelade',
+'imagepage-searchdupe'           => 'No Datei-Duplikat sueche',
+
+# File reversion
+'filerevert'                => 'Zrucksetze vu „$1“',
+'filerevert-legend'         => 'Datei zrucksetze',
+'filerevert-intro'          => "Du setzesch d Datei '''[[Media:$1|$1]]''' uf d [$4 Version vum $2, $3 Uhr] zruck.",
+'filerevert-comment'        => 'Grund:',
+'filerevert-defaultcomment' => 'Zruckgsetzt uf d Version vum $1, $2 Uhr',
+'filerevert-submit'         => 'Zrucksetze',
+'filerevert-success'        => "'''[[Media:$1|$1]]''' isch uf d [$4 Version vum $2, $3 Uhr] zruckgsetzt wore.",
+'filerevert-badversion'     => 'S git kei Version vu dr Datei zum Zytpunkt, wu aagee woren isch.',
+
+# File deletion
+'filedelete'                  => 'Lesch „$1“',
+'filedelete-legend'           => 'Lesch d Datei',
+'filedelete-intro'            => "Du leschesch d Datei '''„[[Media:$1|$1]]“''' mit dr Versionsgschicht.",
+'filedelete-intro-old'        => "Du leschesch vu dr Datei '''„[[Media:$1|$1]]“''' d [$4 Version vum $2, $3 Uhr].",
+'filedelete-comment'          => 'Grund:',
+'filedelete-submit'           => 'Lesche',
+'filedelete-success'          => "'''„$1“''' isch glescht wore.",
+'filedelete-success-old'      => "Vu dr Datei '''„[[Media:$1|$1]]“''' isch d Version vum $2, $3 Uhr glescht wore.",
+'filedelete-nofile'           => "'''„$1“''' isch nit vorhande.",
+'filedelete-nofile-old'       => "S git vu '''„$1“''' kei archivierti Version mit Attribut, wu aagee sin.",
+'filedelete-otherreason'      => 'Andere/zuesätzlige Grund:',
+'filedelete-reason-otherlist' => 'Andere Grund',
+'filedelete-reason-dropdown'  => '* Allgmeini Leschgrind
+** Urheberrächtsverletzig
+** Duplikat',
+'filedelete-edit-reasonlist'  => 'Leschgrind bearbeite',
 
 # MIME search
-'mimesearch' => 'MIME-Suechi',
+'mimesearch'         => 'MIME-Suechi',
+'mimesearch-summary' => 'Uf däre Spezialsyte chenne d Dateie noch em MIME-Typ gfilteret wäre. In dr Yygob muess es alliwyl dr Medie- un Subtyp din haa: <tt>image/jpeg</tt> (lueg Bildbschryybigssyte).',
+'mimetype'           => 'MIME-Typ:',
+'download'           => 'Abelade',
 
 # Unwatched pages
 'unwatchedpages' => 'Unbeobachteti Sytene',
@@ -1087,41 +1456,58 @@ go direkt e Gleich uff d Datei z'mache.",
 'listredirects' => 'Lischte vo Wyterleitige (Redirects)',
 
 # Unused templates
-'unusedtemplates' => 'Nid bruuchti Vorlage',
+'unusedtemplates'     => 'Nid bruuchti Vorlage',
+'unusedtemplatestext' => 'Die Syte lischtet alli Syten im {{ns:template}}-Namensruum uf, wu nit in andere Syte yybunden sin.
+Iberprief anderi Gleicher zue dr Vorlage, voreb Du die leschesch.',
+'unusedtemplateswlh'  => 'Anderi Gleicher',
 
 # Random page
-'randompage' => 'Zuefalls-Artikel',
+'randompage'         => 'Zuefalls-Artikel',
+'randompage-nopages' => 'Im Namensruum „$1“ sin kei Syte vorhande.',
 
 # Random redirect
-'randomredirect' => 'Zuefälligi Wyterleitig',
+'randomredirect'         => 'Zuefälligi Wyterleitig',
+'randomredirect-nopages' => 'Im Namensruum „$1“ sin kei Wyterleitige vorhande.',
 
 # Statistics
-'statistics'    => 'Statistik',
-'sitestats'     => 'Statistik',
-'userstats'     => 'Benützer-Statistik',
-'sitestatstext' => "Zuer Ziit git's '''$2''' Artikel in {{SITENAME}}.
-
-Insgsamt sin '''$1''' Syte in de Datebank. Des sin au alli Sytene, wo usserhalb vom Hauptnamensruum exischtiere, (z.B. Diskussionssyte) oder wo keini interne Gleicher hen oder wo au numme Witerleitige sin.
-
-Insgesamt sin '''$8''' Dateieuffeglade wore.
-
-Insgsamt het s '''$3''' {{PLURAL:$3|Syteabruef|Syteabruef}} gää, '''$4''' mol isch öbbis gänderet worde un drmit jedi Syte im Durchschnitt '''$5''' mol und '''$6''' Syteabruef pro Bearbeitig.
-
-Es het '''$8''' Dateie, wo uffeglade wore sin.
-
-Längi vo de [http://www.mediawiki.org/wiki/Manual:Job_queue „Job queue“]: '''$7'''",
-'userstatstext' => "S git '''$1''' regischtriirte Benutzer. Dodrvo sin '''$2''' (also '''$4 %''') Administratore (lueg au uff $3).",
-
-'disambiguations'     => 'Begriffsklärigssytene',
-'disambiguationspage' => 'Template:Begriffsklärig',
-
-'doubleredirects'       => 'Doppleti Wyterleitige (Redirects)',
-'double-redirect-fixer' => 'DoubleRedirectBot',
-
-'brokenredirects'     => 'Kaputti Wyterleitige',
-'brokenredirectstext' => 'Die Wyterleitige fiere zue Artikel, wu s gar nid git.',
-
-'withoutinterwiki' => 'Sytenen ohni Links zu andere Sprache',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Sytestatischtik',
+'statistics-header-edits'      => 'Bearbeitigsstatischtik',
+'statistics-header-views'      => 'Sytenufruefstatischtik',
+'statistics-header-users'      => 'Benutzer-Statischtik',
+'statistics-articles'          => 'Inhaltssyte',
+'statistics-pages'             => 'Syte',
+'statistics-pages-desc'        => 'Alli Syten in däm Wiki, mit Diskussionssyte, Wyterleitige usw.',
+'statistics-files'             => 'Uffegladeni Dateie',
+'statistics-edits'             => 'Sytebearbeitige',
+'statistics-edits-average'     => 'Bearbeitige pro Syte im Durchschnitt',
+'statistics-views-total'       => 'Sytenufruef insgsamt',
+'statistics-views-peredit'     => 'Sytenufruef pro Bearbeitig',
+'statistics-jobqueue'          => 'Längi vu dr [http://www.mediawiki.org/wiki/Manual:Job_queue Uftragswarteschlang]',
+'statistics-users'             => 'Regischtrierti [[Special:ListUsers|Benutzer]]',
+'statistics-users-active'      => 'Aktivi Benutzer',
+'statistics-users-active-desc' => 'Benutzer mit Bearbeitige {{PLURAL:$1|in dr letchte 24 Stund|in dr letschte $1 Täg}}',
+'statistics-mostpopular'       => 'Am meischte aagluegti Syte',
+
+'disambiguations'      => 'Begriffsklärigssytene',
+'disambiguationspage'  => 'Template:Begriffsklärig',
+'disambiguations-text' => 'Die Syte vergleiche uf e Begriffsklärigs-Syte. Sie sotte aber besser uf d Syte vergleiche, wu eigetli gmeint sin.<br />E Syte wird as Begriffsklärigs-Syte behandlet, wänn [[MediaWiki:Disambiguationspage]] uf si vergleicht.<br />Gleicher us Namensryym wäre do nit ufglischtet.',
+
+'doubleredirects'            => 'Doppleti Wyterleitige (Redirects)',
+'doubleredirectstext'        => 'Die Lischt zeigt Wyterleitige, wu uf anderi Wyterleitige vergleiche.
+In jedere Zyylete het s Gleicher zue dr erschte un dr zwote Wyterleitig un s Ziil vu dr zwote Wyterleitig, wu normalerwys di gwinscht Ziilsyten isch. Do sott eigetli scho di erscht Wyterleitig druf zeige.',
+'double-redirect-fixed-move' => 'doppleti Wyterleitig ufglest: [[$1]] → [[$2]]',
+'double-redirect-fixer'      => 'DoubleRedirectBot',
+
+'brokenredirects'        => 'Kaputti Wyterleitige',
+'brokenredirectstext'    => 'Die Spezialsyte lischtet Wyterleitige uf, wu zue Artikel fiere, wu s gar nid git:',
+'brokenredirects-edit'   => '(bearbeite)',
+'brokenredirects-delete' => '(lesche)',
+
+'withoutinterwiki'         => 'Sytenen ohni Links zu andere Sprache',
+'withoutinterwiki-summary' => 'Die Syte vergleiche nit uf anderi Sprochversione.',
+'withoutinterwiki-legend'  => 'Vorsilb',
+'withoutinterwiki-submit'  => 'Zeig',
 
 'fewestrevisions' => 'Syte mit de wenigschte Bearbeitige',
 
@@ -1132,37 +1518,63 @@ Längi vo de [http://www.mediawiki.org/wiki/Manual:Job_queue „Job queue“]: '
 'nmembers'                => '$1 {{PLURAL:$1|Syte|Sytene}}',
 'nrevisions'              => '$1 {{PLURAL:$1|Revision|Revisione}}',
 'nviews'                  => '$1 {{PLURAL:$1|Betrachtig|Betrachtige}}',
+'specialpage-empty'       => 'In dr Syte het s no kei aktuälli Yytreg.',
 'lonelypages'             => 'Verwaisti Sytene',
+'lonelypagestext'         => 'Die Syte wäre nit yybunde oder s wird nit uf si verwiise in {{SITENAME}}.',
 'uncategorizedpages'      => 'Nit kategorisierte Sytene',
 'uncategorizedcategories' => 'Nit kategorisierte Kategorie',
 'uncategorizedimages'     => 'Nid kategorisierti Dateie',
 'uncategorizedtemplates'  => 'Nid kategorisierti Vorlage',
-'unusedcategories'        => 'Nid ’bruuchti Kategorië',
+'unusedcategories'        => 'Nid bruuchti Kategorië',
 'unusedimages'            => 'Verwaiste Bilder',
 'popularpages'            => 'Beliebti Artikel',
 'wantedcategories'        => 'Bruuchti Kategorie, wo s no nid git',
 'wantedpages'             => 'Artikel, wo fähle',
+'wantedfiles'             => 'Dateie, wu fähle',
+'wantedtemplates'         => 'Vorlage, wu fähle',
 'mostlinked'              => 'Syte, wo am meischte vergleicht sin',
 'mostlinkedcategories'    => 'Am meischte verlinkti Kategorië',
 'mostlinkedtemplates'     => 'Am meischten yybouti Vorlage',
 'mostcategories'          => 'Sytene mit de meischte Kategorië',
 'mostimages'              => 'Am meischte verlinkti Dateie',
 'mostrevisions'           => 'Syte mit de meischte Bearbeitige',
-'prefixindex'             => 'Alli Artikle (mit Präfix)',
+'prefixindex'             => 'Alli Syte (mit Präfix)',
 'shortpages'              => 'Churzi Artikel',
 'longpages'               => 'Langi Artikel',
 'deadendpages'            => 'Artikel ohni Links («Sackgasse»)',
+'deadendpagestext'        => 'Die Syte sin nit zue anderi Syte in {{SITENAME}} vergleicht.',
 'protectedpages'          => 'Gschützti Sytene',
+'protectedpages-indef'    => 'Nume uubschränkt gschitzti Syte zeige',
+'protectedpages-cascade'  => 'Nume Syte mit Kaskadeschutz',
+'protectedpagestext'      => 'Die Spezialsyte zeigt alli vor em Verschiebe oder Bearbeite gschitzti Syte.',
+'protectedpagesempty'     => 'Aktuäll sin kei Syte mit däne Parameter gschitzt.',
+'protectedtitles'         => 'Gsperrti Titel',
+'protectedtitlestext'     => 'Die Titel sin gsperrt fir s Neijaalege',
+'protectedtitlesempty'    => 'Im Momänt sin kei Syte fir s Nejaalege gsperrt mit däne Parameter.',
 'listusers'               => 'Lischte vo Benutzer',
+'listusers-editsonly'     => 'Zeig nume Benutzer mit Byytreg',
+'usereditcount'           => '$1 {{PLURAL:$1|Bearbeitig|Bearbeitige}}',
 'newpages'                => 'Nöji Artikel',
+'newpages-username'       => 'Benutzername:',
 'ancientpages'            => 'alti Sytene',
-'move'                    => 'verschiebe',
+'move'                    => 'Verschiebe',
 'movethispage'            => 'Artikel verschiebe',
+'unusedimagestext'        => 'Bitte gib Acht, ass anderi Netzsyte die Datei mit ere diräkte URL chenne vergleiche. Des wird nit as Verwändig erkannt. Wäge däm wird d Datei do ufgfiert.',
+'unusedcategoriestext'    => 'Die Spezialsyte zeigt alli lääre Kategorie, d. h. si wäre nit brucht vu andre Syte oder Kategorie.',
+'notargettitle'           => 'Kei Syte aagee',
+'notargettext'            => 'Du hesch nit aagee, uf weli Syte die Funktion soll druf aagwändet wäre.',
+'nopagetitle'             => 'Ziilsyte isch nit vorhande',
+'nopagetext'              => 'D Ziilsyte, wu aagee isch, isch nit vorhande.',
 'pager-newer-n'           => '{{PLURAL:$1|nächschte|nächschte $1}}',
 'pager-older-n'           => '{{PLURAL:$1|vorige|vorige $1}}',
+'suppress'                => 'Oversight',
 
 # Book sources
-'booksources' => 'ISBN-Suech',
+'booksources'               => 'ISBN-Suech',
+'booksources-search-legend' => 'Suech no Bezugsquälle fir Biecher',
+'booksources-go'            => 'Sueche',
+'booksources-text'          => 'Des isch e Lischt mit Gleicher zue Netzsyte, wu neiji un bruchti Biecher verchaufe. S cha syy, ass es dert au meh Informatione zue dr Biecher git. {{SITENAME}} isch mit keinem vu däne Aabieter gschäftli verbunde.',
+'booksources-invalid-isbn'  => 'D ISBN isch schyyns falsch. Lueg no Fähler in dr Kopii.',
 
 # Special:Log
 'specialloguserlabel'  => 'Benutzer:',
@@ -1172,6 +1584,7 @@ Längi vo de [http://www.mediawiki.org/wiki/Manual:Job_queue „Job queue“]: '
 'alllogstext'          => 'Kombinierti Aasicht vu alle in {{SITENAME}} gfierte Protokoll.
 D Aazeig cha dur d Uuswahl vun eme Protokoll, eme Benutzername oder eme Sytename yygschränkt wäre (Acht gee uf d Gross- un Chleischrybig).',
 'logempty'             => 'Kei Yyträg gfunde, wu passe.',
+'log-title-wildcard'   => 'Titel fangt aa mit',
 
 # Special:AllPages
 'allpages'          => 'alli Sytene',
@@ -1179,6 +1592,7 @@ D Aazeig cha dur d Uuswahl vun eme Protokoll, eme Benutzername oder eme Sytename
 'nextpage'          => 'Nächscht Syte ($1)',
 'prevpage'          => 'Vorderi Syte ($1)',
 'allpagesfrom'      => 'Syte aazeige vo:',
+'allpagesto'        => 'Syten aazeige bis:',
 'allarticles'       => 'alli Artikel',
 'allinnamespace'    => 'alli Sytene im Namensruum $1',
 'allnotinnamespace' => 'alli Sytene, wo nit im $1 Namensruum sin',
@@ -1186,34 +1600,88 @@ D Aazeig cha dur d Uuswahl vun eme Protokoll, eme Benutzername oder eme Sytename
 'allpagesnext'      => 'nächschts',
 'allpagessubmit'    => 'gang',
 'allpagesprefix'    => 'Alli Sytene mit em Präfix:',
+'allpagesbadtitle'  => 'Dr Sytename, wu yygee hesch, isch nit giltig: Er het entwäder e vorgstellt Sproch-, e Interwiki-Chirzel oder s het ei oder meh Zeiche din, wu in eme Sytename nit derfe brucht wäre.',
+'allpages-bad-ns'   => 'Dr Namensruum „$1“ isch in {{SITENAME}} nit vorhande.',
 
 # Special:Categories
-'categories'         => 'Kategorie',
-'categoriespagetext' => 'Selli Kategorie gits in dem Wiki:',
+'categories'                    => 'Kategorie',
+'categoriespagetext'            => 'In däne Kategorie het s Syte oder Dateie.
+[[Special:UnusedCategories|Nit benutzte Kategorie]] wäre do nit ufgfiert.
+Lueg au d Lischt vu dr [[Special:WantedCategories|gwinschte Kategorie]].',
+'categoriesfrom'                => 'Zeig Kategorie ab:',
+'special-categories-sort-count' => 'Sortierig no Aazahl',
+'special-categories-sort-abc'   => 'Sortierig no Alfabet',
+
+# Special:DeletedContributions
+'deletedcontributions' => 'Gleschti Bytreg',
+
+# Special:LinkSearch
+'linksearch'       => 'Netzgleicher',
+'linksearch-pat'   => 'Suechmuschter:',
+'linksearch-ns'    => 'Namensruum:',
+'linksearch-ok'    => 'Sueche',
+'linksearch-text'  => 'S chönne Platzhalter wie "*.wikipedia.org" benutzt werre.<br />Unterschtützti Protokoll: <tt>$1</tt>',
+'linksearch-line'  => '$1 isch vo $2 verknüpft',
+'linksearch-error' => 'Platzhalter chönne numme am Aafang verwändet werre.',
+
+# Special:ListUsers
+'listusersfrom'      => 'Zeig Benutzer ab:',
+'listusers-submit'   => 'Zeig',
+'listusers-noresult' => 'Kei Benutzer gfunde.',
+
+# Special:Log/newusers
+'newuserlogpage'              => 'Nejaamäldigs-Logbuech',
+'newuserlogpagetext'          => 'Des isch e Logbuech fir nej aagleiti Benutzerchonte.',
+'newuserlog-byemail'          => 's Passwort isch per E-Mail gschickt wore',
+'newuserlog-create-entry'     => 'Benutzer isch nej regischtriert wore',
+'newuserlog-create2-entry'    => 'het e Benutzerkonto aagleit fir $1',
+'newuserlog-autocreate-entry' => 'Benutzerkonto isch automatisch aagleit wore',
+
+# Special:ListGroupRights
+'listgrouprights'                 => 'Benutzergruppe-Rächt',
+'listgrouprights-summary'         => 'Des isch e Liste vu dr Benutzergruppe, wu in däm Wiki definiert sin, un dr Rächt, wu dermit verbunde sin.
+Zuesätzligi Informatione iber einzelni Rächt git s [[{{MediaWiki:Listgrouprights-helppage}}|doo]].',
+'listgrouprights-group'           => 'Grupp',
+'listgrouprights-rights'          => 'Rächt',
+'listgrouprights-helppage'        => 'Help:Grupperächt',
+'listgrouprights-members'         => '(Mitgliiderlischt)',
+'listgrouprights-addgroup'        => 'Cha Benutzer zue {{PLURAL:$2|däre Grupp|däne Gruppe}} zuefiege: $1',
+'listgrouprights-removegroup'     => 'Cha Benutzer us {{PLURAL:$2|däre Grupp|däne Gruppe}} useneh: $1',
+'listgrouprights-addgroup-all'    => 'Cha Benutzer zue allene Gruppe zuefiege',
+'listgrouprights-removegroup-all' => 'Cha Benutzer us allene Gruppe useneh',
 
 # E-mail user
-'mailnologin'     => 'Du bisch nid aagmäldet oder hesch keis Mail aaggä',
-'mailnologintext' => 'Du muesch [[Special:UserLogin|aagmäldet syy]] un e bstätigti E-Mail-Adräss in Dyyne [[Special:Preferences|Yystellige]] aagee ha, fir dass epper anderem es E-Mail chasch schicke.',
-'emailuser'       => 'Es Mail schrybe',
-'emailpage'       => 'E-Mail an Benutzer',
-'emailpagetext'   => 'Öpperem, wo sälber e bestätigeti e-Mail-Adrässe het aaggä, chasch du mit däm Formular es Mail schicke.
-Im Absänder steit dyni eigeti e-Mail-Adrässe us dine [[Special:Preferences|Istellige]], so das me dir cha antworte.',
-'usermailererror' => 'S Mail-Objekt het e Fähler zruckgee:',
-'noemailtitle'    => 'Kei e-Mail-Adrässe',
-'noemailtext'     => 'Dä Benutzer het kei bstätigti E-Mail-Adräss aagee oder wet kei E-Mails vo andere Benutzer.',
-'emailfrom'       => 'Vo',
-'emailto'         => 'Empfänger',
-'emailsubject'    => 'Titel',
-'emailmessage'    => 'E-Bost',
-'emailsend'       => 'Abschicke',
-'emailsent'       => 'E-Mail furtgschickt',
-'emailsenttext'   => 'Dys E-Mail isch verschickt worde.',
+'mailnologin'      => 'Du bisch nid aagmäldet oder hesch keis Mail aaggä',
+'mailnologintext'  => 'Du muesch [[Special:UserLogin|aagmäldet syy]] un e bstätigti E-Mail-Adräss in Dyyne [[Special:Preferences|Yystellige]] aagee ha, fir dass epper anderem es E-Mail chasch schicke.',
+'emailuser'        => 'Es Mail schrybe',
+'emailpage'        => 'E-Mail an Benutzer',
+'emailpagetext'    => 'Du chasch im Benutzer mit däm Formular e E-Mail schicke.
+As Absender wird d E-Mail-Adräss us Dyyne [[Special:Preferences|Yystellige]] yytrait, ass dr Benutzer Dir cha Antwort gee.',
+'usermailererror'  => 'S Mail-Objekt het e Fähler zruckgee:',
+'defemailsubject'  => '{{SITENAME}}-E-Mail',
+'noemailtitle'     => 'Kei e-Mail-Adrässe',
+'noemailtext'      => 'Dää Benutzer het kei bstätigti E-Mail-Adräss aagee oder wet kei E-Mail vo andere Benutzer.',
+'nowikiemailtitle' => 'Kei E-Mail Versand mögli',
+'nowikiemailtext'  => 'De Benutzer möcht kei E-Mails vo andri Benutzer erhalte',
+'email-legend'     => 'E-Mail an e andere {{SITENAME}}-Benutzer schicke',
+'emailfrom'        => 'Vu:',
+'emailto'          => 'An:',
+'emailsubject'     => 'Betreff:',
+'emailmessage'     => 'Nochricht:',
+'emailsend'        => 'Abschicke',
+'emailccme'        => 'Schick e Kopii vu dr E-Mail a mii',
+'emailccsubject'   => 'Kopii vu Dyynere Nochricht an $1: $2',
+'emailsent'        => 'E-Mail furtgschickt',
+'emailsenttext'    => 'Dys E-Mail isch verschickt worde.',
+'emailuserfooter'  => 'Die E-Mail isch vum {{SITENAME}}-Benutzer „$1“ an „$2“ gschickt wore.',
 
 # Watchlist
 'watchlist'            => 'Beobachtigslischte',
 'mywatchlist'          => 'Beobachtigslischte',
 'watchlistfor'         => "(für '''$1''')",
 'nowatchlist'          => 'Du hesch ke Yträg uf dyre Beobachtigslischte.',
+'watchlistanontext'    => 'Du muesch Di $1 go Dyyni Beobachtungslischt z säh oder go Yytreg uf ere bearbeite.',
+'watchnologin'         => 'Du bisch nit aagmäldet',
 'watchnologintext'     => 'Du muesch [[Special:UserLogin|aagmäldet]] syy, zum Dyyni Beobachtigssyte z bearbeite.',
 'addedwatch'           => 'zue de Beobachtigslischte drzue do',
 'addedwatchtext'       => 'D Syte "[[:$1]]" stoht jetz uf Ihre [[Special:Watchlist|Beobachtigslischte]].
@@ -1222,23 +1690,39 @@ Neui Änderige an de Syte odr de Diskussionssyte drvo chasch jetz dört seh. Uss
 Wenn Si d Syte spöter wiedr vo de Lischte striiche wenn, denn drucke Si eifach uf "nümm beobachte".',
 'removedwatch'         => 'Us der Beobachtigsliste glösche',
 'removedwatchtext'     => 'D Syte «[[:$1]]» isch us dyre [[Special:Watchlist|Beobachtigsliste]] glösche worde.',
-'watch'                => 'beobachte',
+'watch'                => 'Beobachte',
 'watchthispage'        => 'Die Syte beobachte',
 'unwatch'              => 'nümm beobachte',
+'unwatchthispage'      => 'Nimmi beobachte',
+'notanarticle'         => 'Kei Syte',
+'notvisiblerev'        => 'Version isch glescht wore',
 'watchnochange'        => 'Vo den Artikle, wo du beobachtisch, isch im aazeigte Zytruum kene veränderet worde.',
 'watchlist-details'    => '{{PLURAL:$1|1 Syte wird|$1 Sytene wärde}} beobachtet (Diskussionssyte nid zelt, aber ou beobachtet).',
+'wlheader-enotif'      => '* Dr E-Mail-Benochrichtigungsdienscht isch aktiviert.',
+'wlheader-showupdated' => "* Syte mit Anderige, wu no nit aagluegt sin, sin '''fett''' dargstellt.",
+'watchmethod-recent'   => 'Iberpriefe vu dr letschte Bearbeitige fir d Beobachtigslischt',
+'watchmethod-list'     => 'Iberpriefe vu dr Beobachtigslischt no letschte Bearbeitige',
+'watchlistcontains'    => 'In Dyynere Beobachtigslischt het s $1 {{PLURAL:$1|Syte|Syte}}.',
+'iteminvalidname'      => 'Probläm mit em Yytrag „$1“, uugiltige Name.',
+'wlnote'               => "Do {{PLURAL:$1|chunnt di letscht Änderig|chemme di letschte '''$1''' Änderige}} vu dr letschte {{PLURAL:$2|Stund|'''$2''' Stunde}}.",
 'wlshowlast'           => 'Zeig di letschte $1 Stunde $2 Tage $3',
-'watchlist-hide-bots'  => 'Bot-Änderige verstecke',
-'watchlist-hide-own'   => 'Eigeti Änderige verstecke',
-'watchlist-hide-minor' => 'Chlyni Änderige verstecke',
+'watchlist-options'    => 'Aazeigoptione',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Am beobachte …',
 'unwatching' => 'Nümm am beobachten …',
 
-'enotif_subject'     => 'D {{SITENAME}} Syte $PAGETITLE isch vum $PAGEEDITOR $CHANGEDORCREATED wore.',
-'enotif_lastvisited' => '$1 zeigt alli Änderige uf s Mol.',
-'enotif_body'        => 'Liebe/r $WATCHINGUSERNAME,
+'enotif_mailer'                => '{{SITENAME}} E-Mail-Benochrichtigungsdienscht',
+'enotif_reset'                 => 'Alli Syte as aagluegt markiere',
+'enotif_newpagetext'           => 'Des isch e neiji Syte.',
+'enotif_impersonal_salutation' => '{{SITENAME}}-Benutzer',
+'changed'                      => 'gänderet',
+'created'                      => 'aagleit',
+'enotif_subject'               => 'D {{SITENAME}} Syte $PAGETITLE isch vum $PAGEEDITOR $CHANGEDORCREATED wore.',
+'enotif_lastvisited'           => '$1 zeigt alli Änderige uf s Mol.',
+'enotif_lastdiff'              => 'Lueg $1 no däre Änderig.',
+'enotif_anon_editor'           => 'Anonyme Benutzer $1',
+'enotif_body'                  => 'Liebe/r $WATCHINGUSERNAME,
 
 d {{SITENAME}} Syte $PAGETITLE isch vom $PAGEEDITOR am $PAGEEDITDATE $CHANGEDORCREATED,
 di aktuelli Version isch: $PAGETITLE_URL
@@ -1258,56 +1742,161 @@ Es wird kei wiiteri Benochrichtigungsposcht gschickt bis Si selli Syte wider bsu
 Ihri Beobachtigslischte {{fullurl:Special:Watchlist/edit}}
 Hilf zue de Benutzig gits uff {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Syte lösche',
-'confirm'                     => 'Bstätige',
-'excontentauthor'             => "einzige Inhalt: '$1' (bearbeitet worde nume dür '$2')",
-'historywarning'              => '<span style="color:#ff0000">OBACHT:</span> Die Syte, wu Du wit lesche, het e Versionsgschicht:',
-'confirmdeletetext'           => 'Du bisch dra, e Artikel oder e Bild mitsamt dr Versionsgschicht fir immer us der Datebank z lesche.
+# Delete
+'deletepage'             => 'Syte lösche',
+'confirm'                => 'Bstätige',
+'excontent'              => "Alter Inhalt: '$1'",
+'excontentauthor'        => "einzige Inhalt: '$1' (bearbeitet worde nume dür '$2')",
+'exbeforeblank'          => "Inhalt voreb d Syte gläärt woren isch: '$1'",
+'exblank'                => 'Syte isch läär gsi',
+'delete-confirm'         => '„$1“ lesche',
+'delete-legend'          => 'Lesche',
+'historywarning'         => '<span style="color:#ff0000">OBACHT:</span> Die Syte, wu Du wit lesche, het e Versionsgschicht:',
+'confirmdeletetext'      => 'Du bisch dra, e Artikel oder e Bild mitsamt dr Versionsgschicht fir immer us der Datebank z lesche.
 Bitte bi Dir iber d Konsequänze bewusst, un bi sicher, dass Du Di an unsri [[{{MediaWiki:Policy-url}}|Leitlinie]] haltsch.',
-'actioncomplete'              => 'Uftrag usgfiert.',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» isch glescht wore.
+'actioncomplete'         => 'Uftrag usgfiert.',
+'deletedtext'            => '«<nowiki>$1</nowiki>» isch glescht wore.
 Im $2 het s e Lischt vu dr letschte Leschige.',
-'deletedarticle'              => '„[[$1]]“ glescht',
-'dellogpage'                  => 'Lösch-Logbuech',
-'deletionlog'                 => 'Lösch-Logbuech',
-'deletecomment'               => 'Löschigsgrund',
-'deleteotherreason'           => 'Andere/zuesätzleche Grund:',
-'deletereasonotherlist'       => 'Andere Grund',
-'rollback_short'              => 'Zrucksetze',
-'rollbacklink'                => 'Zrüggsetze',
-'alreadyrolled'               => 'Cha d Änderig uf [[:$1]] wo [[User:$2|$2]] ([[User talk:$2|Talk]]) gmacht het nit zruckneh will des öbber anderscht scho gmacht het.
-
-Di letschti Änderig het [[User:$3|$3]] ([[User talk:$3|Talk]]) gmacht.',
-'revertpage'                  => 'Ruckgängig gmacht zue dr letschte Änderig vo [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) mit de letzte Version vo [[User:$1|$1]] widerhergstellt', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'deletedarticle'         => 'het „[[$1]]“ glescht',
+'suppressedarticle'      => 'het d Sichtbarkeit vu „[[$1]]“ gänderet',
+'dellogpage'             => 'Lösch-Logbuech',
+'dellogpagetext'         => 'Des isch s Logbuech vu dr gleschte Syte un Dateie.',
+'deletionlog'            => 'Lösch-Logbuech',
+'reverted'               => 'Uf e alti Version zruckgsetzt',
+'deletecomment'          => 'Löschigsgrund',
+'deleteotherreason'      => 'Andere/zuesätzleche Grund:',
+'deletereasonotherlist'  => 'Andere Grund',
+'deletereason-dropdown'  => '* Allgmeini Leschgrind
+** Wunsch vum Autor
+** Urheberrächtsverletzig
+** Vandalismus',
+'delete-edit-reasonlist' => 'Leschgrind bearbeite',
+'delete-toobig'          => 'Die Syte het e arg langi Versionsgschicht mit meh as $1 {{PLURAL:$1|Version|Versione}}. S Lesche vu sonige Syte isch yygschränkt wore go verhindere, ass dr Server vu {{SITENAME}} us Versäh zytwys iberlaschtet wird.',
+'delete-warning-toobig'  => 'Die Syte het e arg langi Versionsgschicht mit meh as $1 {{PLURAL:$1|Version|Versione}}. S Lesche cha dr Datebankbetriib vu {{SITENAME}} stere.',
+
+# Rollback
+'rollback'         => 'Zrucksetze vu dr Änderige',
+'rollback_short'   => 'Zrucksetze',
+'rollbacklink'     => 'Zrüggsetze',
+'rollbackfailed'   => 'S Zrucksetze het nit funktioniert',
+'cantrollback'     => 'D Änderig cha nit zruckgsetzt wäre, wel s keini friejere Autore git.',
+'alreadyrolled'    => 'Cha d Änderig uf [[:$1]] wu vu [[User:$2|$2]] ([[User talk:$2|Diskussion]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) gmacht wore sin, zruckneh, wel e andere Benutzer in dr Zwischenzyt s scho zruckgsetzt het oder suscht ebis an däre Syte gänderet het.
+
+Di letscht Änderig het [[User:$3|$3]] ([[User talk:$3|Diskussion]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) gmacht.',
+'editcomment'      => "D Änderigszämmefassig isch: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Ruckgängig gmacht zue dr letschte Änderig vo [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) mit de letzte Version vo [[User:$1|$1]] widerhergstellt', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'D Änderige vu $1 sin ruckgängig gmacht wore un di letscht Version vu $2 isch widerhärgstellt wore.',
+'sessionfailure'   => 'S het e Probläm mit em Ibertrage vu Dyyne Benutzerdate gee.
+Die Aktion isch wäge däm us Sicherheitsgrind abbroche wore go ne falschi Zueornig vu Dyyne Änderige zuen eme andere Benutzer verhindere.
+Bitte gang zruck, tue d Syte nej lade un versuech s nomol.',
+
+# Protect
 'protectlogpage'              => 'Syteschutz-Logbuech',
 'protectlogtext'              => 'Des isch e Lischt vu dr blockierte Syte. Lueg [[Special:ProtectedPages|Gschitzti Syte]] fir meh Informatione.',
+'protectedarticle'            => 'het „[[$1]]“ gschitzt',
+'modifiedarticleprotection'   => 'het dr Schutz vu „[[$1]]“ gänderet',
+'unprotectedarticle'          => 'het dr Schutz vu „[[$1]]“ ufghebt',
+'movedarticleprotection'      => 'het dr Syteschutz vu „[[$2]]“ uf „[[$1]]“ ibertrait',
+'protect-title'               => 'Schutz vu „$1“ ändere',
+'prot_1movedto2'              => '[[$1]] isch uf [[$2]] verschobe worde.',
+'protect-legend'              => 'Syteschutzstatus ändere',
 'protectcomment'              => 'Grund vu dr Sperrig',
 'protectexpiry'               => 'Gsperrt bis:',
 'protect_expiry_invalid'      => 'Di gwählti Duur isch nid gültig.',
 'protect_expiry_old'          => 'Di gwählti Duur isch scho vergange.',
 'protect-unchain'             => 'Verschiebschutz ändere',
-'protect-text'                => 'Hie chasch der Schutzstatus vor Syte <strong><nowiki>$1</nowiki></strong> azeigen und ändere.',
-'protect-locked-access'       => 'Dys Konto het nid di nötige Rächt, für der Schutzstatus z ändere.
-Hie sy di aktuelle Schutzystellige vor Syte <strong>$1</strong>:',
+'protect-text'                => "Hie chasch der Schutzstatus vor Syte '''<nowiki>$1</nowiki>''' azeigen und ändere.",
+'protect-locked-blocked'      => "Du chasch dr Syteschutz nit ändere, wel Dyy Benutzerkonto gsperrt isch. Do sin di aktuälle Syteschutz-Yystellige fir d Syte '''„$1“:'''",
+'protect-locked-dblock'       => "D Datebank isch gsperrt, dr Syteschutz cha wäge däm nit gänderet wäre. Doo sin di aktuälle Syteschutz-Yystellige fir d Syte '''„$1“:'''",
+'protect-locked-access'       => "Dys Konto het nid di nötige Rächt, für der Schutzstatus z ändere.
+Hie sy di aktuelle Schutzystellige vor Syte '''$1''':",
 'protect-cascadeon'           => 'Die Syten isch gschützt, wil si {{PLURAL:$1|zur folgende Syte|zu de folgende Syte}} ghört, wo derfür e Kaskadesperrig gilt.
 Der Schutzstatus vo dere Syte lat sech la ändere, aber das het kei Yfluss uf d Kaskadesperrig.',
-'protect-default'             => 'Alli (Standard)',
+'protect-default'             => 'Alle Benutzer',
 'protect-fallback'            => '«$1»-Berächtigung nötig',
-'protect-level-autoconfirmed' => 'Nid regischtrierti Benutzer sperre',
+'protect-level-autoconfirmed' => 'Neji un nit regischtrierti Benutzer sperre',
 'protect-level-sysop'         => 'Nur Adminischtratore',
 'protect-summary-cascade'     => 'Kaskade',
 'protect-expiring'            => 'bis $1 (UTC)',
+'protect-expiry-indefinite'   => 'uubschränkt',
 'protect-cascade'             => 'Kaskadesperrig – alli yybundnige Vorlage sy mitgsperrt.',
 'protect-cantedit'            => 'Du chasch der Schutzstatus vo dere Syte nid ändere, wil du kener Berächtigunge hesch, für se z bearbeite.',
+'protect-othertime'           => 'Anderi Sperrduur:',
+'protect-othertime-op'        => 'anderi Sperrduur',
+'protect-existing-expiry'     => 'Aktuälls Syteschutzänd: $2, $3 Uhr',
+'protect-otherreason'         => 'Andere/zuesätzlige Grund:',
+'protect-otherreason-op'      => 'andere/zuesätzlige Grund',
+'protect-dropdown'            => '*Allgmeini Schutzgrind
+** Netzgleich-Spam
+** Editwar
+** Vylmol yybundeni Vorlag
+** Syte mit ere hoche Bsuecherzahl',
+'protect-edit-reasonlist'     => 'Schutzgrind bearbeite',
+'protect-expiry-options'      => '1 Stund:1 hour,2 Stunde:2 hours,6 Stunde:6 hours,1 Tag:1 day,3 Täg:3 days,1 Wuche:1 week,2 Wuche:2 weeks,1 Monet:1 month,3 Monet:3 months,1 Johr:1 year,Fir immer:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Schutzstatus',
 'restriction-level'           => 'Schutzhöchi:',
+'minimum-size'                => 'Mindeschtgressi',
+'maximum-size'                => 'Maximalgressi:',
+'pagesize'                    => '(Bytes)',
+
+# Restrictions (nouns)
+'restriction-edit'   => 'Bearbeite',
+'restriction-move'   => 'Verschiebe',
+'restriction-create' => 'Aalege',
+'restriction-upload' => 'Uffelade',
+
+# Restriction levels
+'restriction-level-sysop'         => 'gschitzt (nume Ammanne)',
+'restriction-level-autoconfirmed' => 'gschitzt (nume aagmäldeti Benutzer, wu nit nej sin)',
+'restriction-level-all'           => 'alli',
 
 # Undelete
-'undeletehistorynoadmin' => 'Dä Artikel isch glescht wore. Dr Grund fir d Leschig isch in dr Zämmefassig aagee, derzue au Aagaabe zum letschte Benutzer, wu dä Artikel bearbeitet het vor dr Leschig. Dr aktuäll Täxt vum gleschte Artikel isch nume zuegängli fir Ammanne.',
-'undeletebtn'            => 'Widerhärstelle',
-'undeletedarticle'       => 'hät d Site „[[$1]]“ widderhergstellt',
-'undeletedrevisions'     => '{{PLURAL:$1|ei Revision|$1 Revisione}} wider zruckgholt.',
+'undelete'                     => 'Gleschti Syte widerhärstelle',
+'undeletepage'                 => 'Gleschti Syte widerhärstelle',
+'undeletepagetitle'            => "'''Doo wäre di gleschte Versione vu [[:$1|$1]] aazeigt'''.",
+'viewdeletedpage'              => 'Gleschti Syte aazeige',
+'undeletepagetext'             => 'Die {{PLURAL:$1|Syte isch glescht wore un cha|$1 Syte sin glescht wore un chenne}} vu Ammanne widerhärgstellt wäre:',
+'undelete-fieldset-title'      => 'Widerhärstelle',
+'undeleteextrahelp'            => '* Go d Syte ganz mit allene Versione widerhärzstelle, wehl kei Version us, gib e Begrindig aa un druck uf „Widerhärstelle“.
+* Mechtsch nume bstimmti Versione widerhärstelle, no wehl die bitte einzeln no dr Markierige us, gib e Begrindig aa un druck derno uf „Widerhärstelle“..
+* „Abbräche“ läärt s Kommentarfäld un nimmt alli Markierige bi dr Versione use.',
+'undeleterevisions'            => '{{PLURAL:$1|1 Version|$1 Versione}} archiviert',
+'undeletehistory'              => 'Wänn Du die Syte widerhärstellsch, wäre au alli alte Versione widerhärgstellt.
+Wänn syt dr Leschig e neiji Syte mit em glyche Name aagleit woren isch, no wäre di widerhärgstellte Versione chronologisch in d Versionsgschicht yygordnet.',
+'undeleterevdel'               => 'D Widerhärstellig wird nit durgfiert, wänn di neijscht Version versteckt isch oder s versteckti Teil dinne het.
+In däm Fall darf di neijscht Version nit markiert wäre oder ihre Status muess uf normali Version gänderet wäre.',
+'undeletehistorynoadmin'       => 'Dä Artikel isch glescht wore. Dr Grund fir d Leschig isch in dr Zämmefassig aagee, derzue au Aagaabe zum letschte Benutzer, wu dä Artikel bearbeitet het vor dr Leschig. Dr aktuäll Täxt vum gleschte Artikel isch nume zuegängli fir Ammanne.',
+'undelete-revision'            => 'Gleschti Version vu $1 (vum $4 am $5 Uhr), $3:',
+'undeleterevision-missing'     => 'Version isch nit giltig oder fählt. Entwäder isch s Gleich falsch oder d Version isch us em Archiv widerhärgstellt oder usegnuh wore.',
+'undelete-nodiff'              => 'Kei vorigi Version vorhande.',
+'undeletebtn'                  => 'Widerhärstelle',
+'undeletelink'                 => 'widerhärstelle',
+'undeletereset'                => 'Abbräche',
+'undeleteinvert'               => 'Uswahl umchehre',
+'undeletecomment'              => 'Begrindig:',
+'undeletedarticle'             => 'hät d Site „[[$1]]“ widderhergstellt',
+'undeletedrevisions'           => '{{PLURAL:$1|ei Revision|$1 Revisione}} wider zruckgholt.',
+'undeletedrevisions-files'     => '{{PLURAL:$1|1 Version|$1 Versione}} un {{PLURAL:$2|1 Datei|$2 Dateie}} sin widerhärgstellt wore',
+'undeletedfiles'               => '{{PLURAL:$1|1 Datei isch|$1 Dateie sin}} widerhärgstellt wore',
+'cannotundelete'               => 'Widerhärstellig isch nit gange; eber ander het villicht d Syte scho widerhärgstellt.',
+'undeletedpage'                => "'''„$1“''' isch widerhärgstellt wore.
+
+Im [[Special:Log/delete|Lesch-Logbuech]] findsch e Ibersicht vu dr gleschte un widerhärgstellte Syte.",
+'undelete-header'              => 'Lueg im [[Special:Log/delete|Lesch-Logbuech]] no Syte, wu in dr letschte Zyt glescht wore sin.',
+'undelete-search-box'          => 'Suech no gleschte Syte',
+'undelete-search-prefix'       => 'Zeig d Syte aa, wu aafange mit:',
+'undelete-search-submit'       => 'Sueche',
+'undelete-no-results'          => 'Im Archiv isch kei Syte gfunde wore, wu zum Suechbegriff passt.',
+'undelete-filename-mismatch'   => 'D Dateiversion mit em Zytstämpfel $1 het nit chenne widerhärgstellt wäre: D Dateinäme passe nit zuenand.',
+'undelete-bad-store-key'       => 'D Dateiversion mit em Zytstämpfel $1 het nit chenne widerhärgstellt wäre: D Datei isch scho vor em Lesche nimmi vorhande gsi.',
+'undelete-cleanup-error'       => 'Fähler bim Lesche vu dr nit benutzte Archiv-Version $1.',
+'undelete-missing-filearchive' => 'D Datei mit dr Archiv-ID $1 cha nit widerhärgstellt wäre, wel si nit in dr Datebank vorhanden isch. Villicht isch si scho widerhärgstellt wore.',
+'undelete-error-short'         => 'Fähler bim Widerhärstelle vu dr Datei $1',
+'undelete-error-long'          => 'S sin Fähler bim Widerhärstelle vun ere Datei feschtgstellt wore:
+
+$1',
+'undelete-show-file-confirm'   => 'Bisch sicher, ass Du e gleschti Version vu dr Datei „<nowiki>$1</nowiki>“ vum $2, $3 Uhr wit aaluege?',
+'undelete-show-file-submit'    => 'Jo',
 
 # Namespace form on various pages
 'namespace'      => 'Namensruum:',
@@ -1315,113 +1904,312 @@ Der Schutzstatus vo dere Syte lat sech la ändere, aber das het kei Yfluss uf d
 'blanknamespace' => '(Haupt-)',
 
 # Contributions
-'contributions' => 'Benutzer-Byträg',
-'mycontris'     => 'myyni Byyträg',
-'contribsub2'   => 'Für $1 ($2)',
-'uctop'         => '(aktuell)',
-'month'         => 'u Monet:',
-'year'          => 'bis Jahr:',
-
-'sp-contributions-newbies'     => 'Zeig nume Biträg vo neie Benutzer',
-'sp-contributions-newbies-sub' => 'vo nöji Benützer',
-'sp-contributions-blocklog'    => 'Sperrlogbuech',
-'sp-contributions-search'      => 'Suech no Benutzerbiträg',
-'sp-contributions-username'    => 'IP-Adress oder Benutzername:',
+'contributions'       => 'Benutzer-Byträg',
+'contributions-title' => 'Benutzerbyytreg vu „$1“',
+'mycontris'           => 'Myyni Byyträg',
+'contribsub2'         => 'Für $1 ($2)',
+'nocontribs'          => 'S sin keini Benutzerbyytreg mit däne Kriterie gfunde wore.',
+'uctop'               => '(aktuell)',
+'month'               => 'u Monet:',
+'year'                => 'bis Jahr:',
+
+'sp-contributions-newbies'       => 'Zeig nume Biträg vo neie Benutzer',
+'sp-contributions-newbies-sub'   => 'vo nöji Benützer',
+'sp-contributions-newbies-title' => 'Benutzerbyytreg vu neije Benutzer',
+'sp-contributions-blocklog'      => 'Sperrlogbuech',
+'sp-contributions-search'        => 'Suech no Benutzerbiträg',
+'sp-contributions-username'      => 'IP-Adress oder Benutzername:',
+'sp-contributions-submit'        => 'Sueche',
 
 # What links here
-'whatlinkshere'       => 'Was linkt da ane?',
-'whatlinkshere-title' => 'Sytene, wo uf „$1“ verlinke',
-'linkshere'           => "Die Sytene hän e Gleich, wu zu '''„[[:$1]]“''' fiere:",
-'nolinkshere'         => "Kei Artikel vergleicht uf '''„[[:$1]]“'''.",
-'isredirect'          => 'Wyterleitigssyte',
-'istemplate'          => 'Vorlageybindig',
-'whatlinkshere-prev'  => '{{PLURAL:$1|vorder|vorderi $1}}',
-'whatlinkshere-next'  => '{{PLURAL:$1|nächscht|nächschti $1}}',
-'whatlinkshere-links' => '� Links',
+'whatlinkshere'            => 'Was linkt da ane?',
+'whatlinkshere-title'      => 'Sytene, wo uf „$1“ verlinke',
+'whatlinkshere-page'       => 'Syte:',
+'linkshere'                => "Die Sytene hän e Gleich, wu zu '''„[[:$1]]“''' fiere:",
+'nolinkshere'              => "Kei Artikel vergleicht uf '''„[[:$1]]“'''.",
+'nolinkshere-ns'           => "Kei Syte vergleicht uf '''„[[:$1]]“''' im gwehlte Namensruum.",
+'isredirect'               => 'Wyterleitigssyte',
+'istemplate'               => 'Vorlageybindig',
+'isimage'                  => 'Dateigleich',
+'whatlinkshere-prev'       => '{{PLURAL:$1|vorder|vorderi $1}}',
+'whatlinkshere-next'       => '{{PLURAL:$1|nächscht|nächschti $1}}',
+'whatlinkshere-links'      => '� Links',
+'whatlinkshere-hideredirs' => 'Wyterleitige $1',
+'whatlinkshere-hidetrans'  => 'Vorlageyybindige $1',
+'whatlinkshere-hidelinks'  => 'Gleicher $1',
+'whatlinkshere-hideimages' => 'Dateigleicher $1',
+'whatlinkshere-filters'    => 'Filter',
 
 # Block/unblock
-'blockip'         => 'Benutzer bzw. IP blockyre',
-'blockiptext'     => 'Bnutz des Formular, zum e Bnutzer oder e IP-Adress z\'blockiere.<sup class="plainlinks">[http://jodies.de/ipcalc?host=&mask1=&mask2= <span title="IP-Berych ermittle; bloss kurz sperre!">(B)</span>]</sup>
+'blockip'                         => 'Benutzer bzw. IP blockyre',
+'blockip-legend'                  => 'IP-Adräss/Benutzer sperre',
+'blockiptext'                     => 'Bnutz des Formular, zum e Bnutzer oder e IP-Adress z\'blockiere.<sup class="plainlinks">[http://jodies.de/ipcalc?host=&mask1=&mask2= <span title="IP-Berych ermittle; bloss kurz sperre!">(B)</span>]</sup>
 
 Des söt nummer erfolge um [[Wikipedia:Vandalismus|Vandalismus]] z\'verhindre in i Übereinstimmig mit üsre [[Wikipedia:Leitlinien|Leitlinie]] gschehe.
 Bitte gib au de Grund für d\'Blockad aa.',
-'ipbsubmit'       => 'Adräss blockiere',
-'ipboptions'      => '1 Stund:1 hour,2 Stunde:2 hours,6 Stunde:6 hours,1 Tag:1 day,3 Täg:3 days,1 Wuche:1 week,2 Wuche:2 weeks,1 Monet:1 month,3 Monet:3 months,1 Johr:1 year,Fir immer:infinite', # display1:time1,display2:time2,...
-'ipblocklist'     => 'Liste vo blockierten IP-Adrässen u Benutzernäme',
-'blocklistline'   => '$1, $2 het $3 ($4) gsperrt',
-'blocklink'       => 'sperre',
-'unblocklink'     => 'freigä',
-'contribslink'    => 'Byträg',
-'blocklogpage'    => 'Sperrigs-Protokoll',
-'blocklogentry'   => 'sperrt [[$1]] für d Ziit vo: $2 $3',
-'blocklogtext'    => 'Des isch s Logbuech iber Sperrige un Entsperrige vu Benutzer. Automatisch blockierti IP-Adrässe wäre nit erfasst. Lueg au [[Special:IPBlockList|IP-Block Lischt]] fir e Lischt vu gsperrte Benutzer.',
-'unblocklogentry' => 'Blockad vu $1 ufghobe',
+'ipaddress'                       => 'IP-Adräss oder Benutzername:',
+'ipadressorusername'              => 'IP-Adräss oder Benutzername:',
+'ipbexpiry'                       => 'Sperrduur:',
+'ipbreason'                       => 'Begrindig:',
+'ipbreasonotherlist'              => 'Anderi Begrindig',
+'ipbreason-dropdown'              => '* Allgmeini Sperrgrind
+** Lesche vu Syte
+** Aalege vu bledsinnige Syte
+** Vylfachi Verstess gege d Richtlinie fir Netzgleicher
+** Verstoss gege dr Grundsatz „Kei persenligi Aagriff“
+* Benutzerspezifischi Sperrgrind
+** Uugeignete Benutzername
+** Neijaamäldig vun eme uubschränkt gsperrte Benutzer
+* IP-spezifischi Sperrgrind
+** Proxy, wäge Vandalismus vu einzelne Benutzer lengerfrischtig gsperrt',
+'ipbanononly'                     => 'Nume anonymi Benutzer sperre',
+'ipbcreateaccount'                => 'Aalege vu Benutzerchonte verhindere',
+'ipbemailban'                     => 'E-Mail-Versand sperre',
+'ipbenableautoblock'              => 'Sperr di aktuäll vu däm Benutzer brucht IP-Adräss un automatisch alli wytere, wun er nimmt go Syte bearbeite oder Benutzerchonte aalege',
+'ipbsubmit'                       => 'Adräss blockiere',
+'ipbother'                        => 'Anderi Duur (englisch):',
+'ipboptions'                      => '1 Stund:1 hour,2 Stunde:2 hours,6 Stunde:6 hours,1 Tag:1 day,3 Täg:3 days,1 Wuche:1 week,2 Wuche:2 weeks,1 Monet:1 month,3 Monet:3 months,1 Johr:1 year,Fir immer:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'                  => 'Anderi Duur',
+'ipbotherreason'                  => 'Anderi/zuesätzligi Begrindig:',
+'ipbhidename'                     => 'Benutzername im Sperr-Logbuech, in dr Lischt vu aktive Sperrine un im Benutzerverzeichnis verstecke.',
+'ipbwatchuser'                    => 'Benutzer(diskussions)syte beobachte',
+'ipballowusertalk'                => 'Benutzer derf di eige Diskussionssyte bearbeite derwylscht er gsperrt isch',
+'ipb-change-block'                => 'Nomol sperre mit däne Sperrparameter',
+'badipaddress'                    => 'D IP-Adräss het e falsch Format.',
+'blockipsuccesssub'               => 'Mit Erfolg gsperrt',
+'blockipsuccesstext'              => 'Dr Benutzer/d IP-Adräss [[Special:Contributions/$1|$1]] isch gsperrt wore.<br />
+Go d Sperri ufhebe lueg d [[Special:IPBlockList|Lisch vu allene aktive Sperrine]].',
+'ipb-edit-dropdown'               => 'Sperrgrind bearbeite',
+'ipb-unblock-addr'                => '„$1“ frejgee',
+'ipb-unblock'                     => 'IP-Adräss/Benutzer frejgee',
+'ipb-blocklist-addr'              => 'Aktuälli Sperri fir „$1“ aazeige',
+'ipb-blocklist'                   => 'Alli aktuälle Sperrine aazeige',
+'ipb-blocklist-contribs'          => 'Benutzerbyytreg fir „$1“',
+'unblockip'                       => 'IP-Adräss frejgee',
+'unblockiptext'                   => 'Mit däm Formular chasch e IP-Adräss oder e Benutzer frejgee.',
+'ipusubmit'                       => 'Die Sperri useneh',
+'unblocked'                       => '[[User:$1|$1]] isch frejgee wore',
+'unblocked-id'                    => 'Sperr-ID $1 isch freijgee wore',
+'ipblocklist'                     => 'Liste vo blockierten IP-Adrässen u Benutzernäme',
+'ipblocklist-legend'              => 'Suech no eme gsperrte Benutzer',
+'ipblocklist-username'            => 'Benutzername oder IP-Adräss:',
+'ipblocklist-sh-userblocks'       => 'Benutzersperrine $1',
+'ipblocklist-sh-tempblocks'       => 'Befrischteti Sperrine $1',
+'ipblocklist-sh-addressblocks'    => 'IP-Sperrine $1',
+'ipblocklist-submit'              => 'Sueche',
+'blocklistline'                   => '$1, $2 het $3 ($4) gsperrt',
+'infiniteblock'                   => 'uubegränzt',
+'expiringblock'                   => '$1',
+'anononlyblock'                   => 'nume Anonymi',
+'noautoblockblock'                => 'Autoblock deaktiviert',
+'createaccountblock'              => 'Aalege vu Benutzerchonte gsperrt',
+'emailblock'                      => 'E-Mail-Versand gsperrt',
+'blocklist-nousertalk'            => 'derf eigeni Diskussionssyte nit bearbeite',
+'ipblocklist-empty'               => 'In dr Lischt het s kei Yytreg.',
+'ipblocklist-no-results'          => 'Di gsuecht IP-Adräss/dr Benutzername isch nit gsperrt.',
+'blocklink'                       => 'sperre',
+'unblocklink'                     => 'freigä',
+'change-blocklink'                => 'Sperri ändere',
+'contribslink'                    => 'Byträg',
+'autoblocker'                     => 'Automatischi Sperri, wel Du e gmeinsami IP-Adräss mit [[User:$1|Benutzer:$1]] bruchsch. Grund: „$2“.',
+'blocklogpage'                    => 'Sperrigs-Protokoll',
+'blocklog-fulllog'                => 'Vollständigs Benutzersperr-Logbuech',
+'blocklogentry'                   => 'sperrt [[$1]] für d Ziit vo: $2 $3',
+'reblock-logentry'                => 'het d Sperri fir „[[$1]]“ gänderet fir dr Zytruum: $2 $3',
+'blocklogtext'                    => 'Des isch s Logbuech iber Sperrige un Entsperrige vu Benutzer. Automatisch blockierti IP-Adrässe wäre nit erfasst. Lueg au [[Special:IPBlockList|IP-Block Lischt]] fir e Lischt vu gsperrte Benutzer.',
+'unblocklogentry'                 => 'Blockad vu $1 ufghobe',
+'block-log-flags-anononly'        => 'nume Anonymi',
+'block-log-flags-nocreate'        => 'Aalege vu Benutzerchonte gsperrt',
+'block-log-flags-noautoblock'     => 'Autoblock deaktiviert',
+'block-log-flags-noemail'         => 'E-Mail-Versand gsperrt',
+'block-log-flags-nousertalk'      => 'derf di eigene Diskussionssyte nit bearbeite',
+'block-log-flags-angry-autoblock' => 'erwyterete Autoblock aktiviert',
+'range_block_disabled'            => 'D Megligkeit, ganzi Adrässryym z sperre, isch nit aktiviert.',
+'ipb_expiry_invalid'              => 'D Duur, wu yygee woren isch, isch nit giltig.',
+'ipb_expiry_temp'                 => 'Versteckti Benutzername-Sperrine solle permanent syy.',
+'ipb_already_blocked'             => '„$1“ isch scho gsperrt wore.',
+'ipb-needreblock'                 => '== Sperri vorhande ==
+„$1“ isch scho gsperrt. Mechtsch d Sperrparameter ändere?',
+'ipb_cant_unblock'                => 'Fähler: Sperr-ID $1 nit gfunde. S cha syy, ass d Sperri scho ufghoben isch .',
+'ipb_blocked_as_range'            => 'Fähler: D IP-Adräss $1 isch as Teil vu dr Beryychssperri $2 indirekt gsperrt. S isch nit megli, nume $1 z entsperre.',
+'ip_range_invalid'                => 'Uugiltige IP-Adrässberyych.',
+'blockme'                         => 'Sperr mi',
+'proxyblocker'                    => 'Proxy blocker',
+'proxyblocker-disabled'           => 'Die Funktion isch deaktiviert.',
+'proxyblockreason'                => 'Dyni IP-Adrässe isch gsperrt wore, wel si ne ufige Proxy isch. Bitte kontaktier Dyyn Internet-Provider oder Dyni Systemadministratore un informier si iber des Sicherheitsproblem.',
+'proxyblocksuccess'               => 'Fertig.',
+'sorbsreason'                     => 'D IP-Adräss isch in dr DNSBL vu {{SITENAME}} as uffige PROXY glischtet.',
+'sorbs_create_account_reason'     => 'D IP-Adräss isch in dr DNSBL vu {{SITENAME}} as uffige PROXY glischtet. S Aalege vu neije Benutzer isch nit megli.',
+'cant-block-while-blocked'        => 'Du derfsch kei anderi Benutzer sperre, derwylscht Du sälber gsperrt bisch.',
+
+# Developer tools
+'lockdb'              => 'D Datebank sperre',
+'unlockdb'            => 'D Datebank freigää',
+'lockdbtext'          => 'Durch s Sperre vo dere Datebank werde alli Benutzer devo abghalte Syte z bearbeite, ihri Ystellige z ändre usw. Bitte bstätig dass du des würkli wottsch mache, un dass du d Datebank nooch dynrer Wartig wider freigisch.',
+'unlockdbtext'        => 'Durch s Entsperre vo dr Datebank chönne alli Benutzer wider Syte bearbeite, ihri Ystellige ändre usw. Bitte bstätig dass du des würkli wottsch mache.',
+'lockconfirm'         => 'Joo, ich wott d Datebank ächt sperre.',
+'unlockconfirm'       => 'Joo, ich wott d Datebank freigää.',
+'lockbtn'             => 'D Datebank sperre',
+'unlockbtn'           => 'D Datebank freigää',
+'locknoconfirm'       => 'Du hesch s Bstätigungsfäld nüt markiert.',
+'lockdbsuccesssub'    => 'D Datebank isch erfolgrych gsperrt worde',
+'unlockdbsuccesssub'  => 'D Datebank isch erfolgrych freigää worde',
+'lockdbsuccesstext'   => 'D {{SITENAME}}-Datebank isch gsperrt worde.<br />Bitte vergiss nüt d Datebank [[Special:UnlockDB|wider freizgää]], sobald d Wartung abgschlosse isch.',
+'unlockdbsuccesstext' => 'D {{SITENAME}}-Datebank isch freigää worde.',
+'lockfilenotwritable' => 'Die Datebank-Sperrdatei cha nüt beschrybe werde. Zume die Datebank chönne Sperre oder Freigää, muess si vum Webserver chönne bschrybe werde.',
+'databasenotlocked'   => 'D Datebank isch nüt gsperrt.',
 
 # Move page
-'move-page-legend' => 'Artikel verschiebe',
-'movepagetext'     => 'Mit däm Formular chasch du en Artikel verschiebe, u zwar mit syre komplette Versionsgschicht. Der alt Titel leitet zum nöie wyter, aber Links ufen alt Titel blyben unveränderet.',
-'movepagetalktext' => "D Diskussionssyte wird mitverschobe, '''ussert:'''
+'move-page'                    => '„$1“ verschiebe',
+'move-page-legend'             => 'Artikel verschiebe',
+'movepagetext'                 => 'Mit däm Formular chasch du en Artikel verschiebe, u zwar mit syre komplette Versionsgschicht. Der alt Titel leitet zum nöie wyter, aber Links ufen alt Titel blyben unveränderet.',
+'movepagetalktext'             => "D Diskussionssyte wird mitverschobe, '''ussert:'''
 *Du verschiebsch d Syten i nen andere Namensruum, oder
 *es git scho ne Diskussionssyte mit däm Namen oder
 *du wählsch unte d Option, se nid z verschiebe.
 
 I söttigne Fäll müessti d Diskussionssyten allefalls vo Hand kopiert wärde.",
-'movearticle'      => 'Artikel verschiebe',
-'newtitle'         => 'Zum nöie Titel',
-'move-watch'       => 'Die Syte beobachte',
-'movepagebtn'      => 'Artikel verschiebe',
-'pagemovedsub'     => 'Verschiebig erfolgrych',
-'movepage-moved'   => "<big>'''«$1» isch verschobe worde nach «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'    => 'E Syte mit däm Name git s scho oder de Name isch nid giltig. Bitte nimm en andere.',
-'talkexists'       => 'D Syte sälber isch erfolgrych verschobe worde, nid aber d Diskussionssyte, wil s under em nöue Titel scho eini het gä. Bitte setz se vo Hand zäme.',
-'movedto'          => 'verschoben uf',
-'movetalk'         => 'Diskussionssyte nach Müglechkeit mitverschiebe',
-'1movedto2'        => '[[$1]] isch uf [[$2]] verschobe worde.',
-'1movedto2_redir'  => '[[$1]] isch uf [[$2]] verschobe worre un het drbii e Wiiterleitig übrschriebe.',
-'movelogpage'      => 'Verschiebigs-Logbuech',
-'movereason'       => 'Grund',
-'revertmove'       => 'Zrugg verschiebe',
-'selfmove'         => 'Der nöi Artikelname mues en andere sy als der alt!',
+'movearticle'                  => 'Artikel verschiebe',
+'movenologin'                  => 'Du bisch nid aagmäldet',
+'movenologintext'              => 'Du muesch dich zersch [[Special:UserLogin|aamälde]] damit du die Syte chasch verschiebe.',
+'movenotallowed'               => 'Du derfsch kei Syte verschiebe.',
+'movenotallowedfile'           => 'Du derfsch kei Dateie verschiebe.',
+'cant-move-user-page'          => 'Du derfsch kei Benutzersyte verschiebe (mit Usnaam vo Untersyte).',
+'cant-move-to-user-page'       => 'Du derfsch kei Syte uf e Benutzersyte verschiebe (mit Usnaam vo Untersyte).',
+'newtitle'                     => 'Zum nöie Titel',
+'move-watch'                   => 'Die Syte beobachte',
+'movepagebtn'                  => 'Artikel verschiebe',
+'pagemovedsub'                 => 'Verschiebig erfolgrych',
+'movepage-moved'               => '<big>\'\'\'"$1" isch verschobe wore uf "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'E Wyterleitig isch aagleit wore.',
+'movepage-moved-noredirect'    => 'D Erstellig vonere Wyterleitig isch unterdruggt worde.',
+'articleexists'                => 'E Syte mit däm Name git s scho oder de Name isch nid giltig. Bitte nimm en andere.',
+'cantmove-titleprotected'      => 'Die Syte het nüt chönne verschobe werde, wyl de nöie Titel gsperrt isch.',
+'talkexists'                   => 'D Syte sälber isch erfolgrych verschobe worde, nid aber d Diskussionssyte, wil s under em nöue Titel scho eini het gä. Bitte setz se vo Hand zäme.',
+'movedto'                      => 'verschoben uf',
+'movetalk'                     => 'Diskussionssyte nach Müglechkeit mitverschiebe',
+'move-subpages'                => 'Alli Untersyte wo vorhande sin mitschiebe',
+'move-talk-subpages'           => 'Alli Untersyte vo Diskussionssyte wo vorhande sin mitverschiebe',
+'movepage-page-exists'         => 'D Syte „$1“ gits scho un cha nüt automatisch überschribe werde.',
+'movepage-page-moved'          => 'D Syte „$1“ isch uf „$2“ verschobe worde.',
+'movepage-page-unmoved'        => 'D Syte „$1“ het nüt chönne uf „$2“ verschobe werde.',
+'movepage-max-pages'           => 'D Maximalaazaal vo $1 {{PLURAL:$1|Syte|Syte}} isch verschobe worde. Mee chönne automatisch nüt verschobe werde.',
+'1movedto2'                    => '[[$1]] isch uf [[$2]] verschobe worde.',
+'1movedto2_redir'              => '[[$1]] isch uf [[$2]] verschobe wore un het drbyy e Wyterleitig iberschribe.',
+'move-redirect-suppressed'     => 'E Wyterleitig isch unterdruggt worde',
+'movelogpage'                  => 'Verschiebigs-Logbuech',
+'movelogpagetext'              => 'Des isch e Lischte mit allene Syte wo verschobe worde sin.',
+'movereason'                   => 'Grund',
+'revertmove'                   => 'Zrugg verschiebe',
+'delete_and_move'              => 'Lösche un Verschiebe',
+'delete_and_move_text'         => '== D Ziilsyte isch scho vorhande, lösche?==
+
+D Syte „[[:$1]]“ gits scho. Wottsch du si lösche, zume Platz zum verschiebe mache?',
+'delete_and_move_confirm'      => 'D Ziilsyte für d Verschiebig lösche',
+'delete_and_move_reason'       => 'glöscht, zume Platz für zum verschiebe mache',
+'selfmove'                     => 'Der nöi Artikelname mues en andere sy als der alt!',
+'immobile-source-namespace'    => 'Syte ussem „$1“-Namensruum chönne nüt verschobe werde',
+'immobile-target-namespace'    => 'Syte chönne nüt in de „$1“-Namensruum verschobe werde',
+'immobile-target-namespace-iw' => 'E Interwiki-Gleich (Link) isch kei gültigs Ziil für e Syteverschiebig.',
+'immobile-source-page'         => 'Die Syte cha nüt verschobe werde.',
+'immobile-target-page'         => 'Uf die Ziilsyte cha nüt verschobe werde.',
+'imagenocrossnamespace'        => 'Dateie chönne nüt ussem {{ns:file}}-Namensruum use verschobe werde',
+'imagetypemismatch'            => 'D nöii Dateierwiiterig passt nüt zu sym Typ',
+'imageinvalidfilename'         => 'De Name vo dr Ziildatei isch ungültig',
+'fix-double-redirects'         => 'Alli Wyterleitige, wo uf de alte Titel zeige, aktualisiere',
+'move-leave-redirect'          => 'E Wyterleitig hinterloo',
 
 # Export
-'export'     => 'Sytenen exportiere',
-'exporttext' => 'Du chasch dr Text un d Versionsgschicht vu einzelne Syte in ere XML-Datei exportiere. Die Datei cha derno in e ander MediaWiki-Wiki importiert wäre iber [[Special:Import|Importiere]].
-Zum Exportiere trag dr Sytetitel in dr Täxtchaschte unter yy, ei Titel pro Zyyle, un wehl us, eb Du di aktuäll Version mitsamt dr eltere Versione (mit dr Versionsgschicht-Zyyle) oder nume di aktuäll Version mit dr Information iber di letscht Bearbeitig. In däm Fall chasch au e Gleich fir dr Export verwände, z. B. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] fir d Syte "[[{{MediaWiki:Mainpage}}]]".',
+'export'            => 'Sytenen exportiere',
+'exporttext'        => 'Du chasch dr Text un d Versionsgschicht vu einzelne Syte in ere XML-Datei exportiere. Die Datei cha derno in e ander MediaWiki-Wiki importiert wäre iber [[Special:Import|Importiere]].
+Zum Exportiere trag dr Sytetitel in dr Täxtchaschte unter yy, ei Titel pro Zyyle, un wehl us, eb Du di aktuäll Version mitsamt dr eltere Versione (mit dr Versionsgschicht-Zyyle) oder nume di aktuäll Version mit dr Information iber di letscht Bearbeitig. In däm Fall chasch au e Gleich fir dr Export verwände, z. B. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] fir d Syte "[[{{MediaWiki:Mainpage}}]]".',
+'exportcuronly'     => 'Numme d aktuelli Version vo dr Syte exportiere, statt dr ganze Versionsgschicht',
+'exportnohistory'   => "----
+'''Hywys:''' S Exportiere vo ganzi Versionsgschichte durch des Formular isch us Gründ vo dr Leischtig vum Syschtem abgschaltet worde",
+'export-submit'     => 'Sytene exportiere',
+'export-addcattext' => 'Syte us dere Kategori dezuefüege',
+'export-addcat'     => 'Dezuefüege',
+'export-download'   => 'Als XML-Datei spychere',
+'export-templates'  => 'Vorlage mit ybinde',
 
 # Namespace 8 related
 'allmessages'               => 'Systemnochrichte',
 'allmessagesname'           => 'Name',
 'allmessagesdefault'        => 'Standard-Tekscht',
 'allmessagescurrent'        => 'jetzige Tekscht',
-'allmessagestext'           => 'Sell isch e Lischte vo alle mögliche Systemnochrichte ussem MediaWiki Namensruum.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+'allmessagestext'           => 'Des isch e Lischt vu allene meglige Syschtemnochrichte us em MediaWiki Namensruum.
+Lueg au uf [http://www.mediawiki.org/wiki/Localisation MediaWiki Lokalisierig] un [http://translatewiki.net translatewiki.net], wänn Du zue dr MediaWiki-Lokalisierig wit byytrage.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' cha nit bruucht wärde will '''\$wgUseDatabaseMessages''' abgschalte isch.",
 'allmessagesfilter'         => 'Nochrichte nochem Name filtere:',
 'allmessagesmodified'       => 'numme gänderti aazeige',
 
 # Thumbnails
-'thumbnail-more'  => 'vergrösere',
-'thumbnail_error' => 'Fähler bir Härstellig vo re Vorschou: $1',
+'thumbnail-more'           => 'vergrösere',
+'filemissing'              => 'D Datei fäält',
+'thumbnail_error'          => 'Fähler bir Härstellig vo re Vorschou: $1',
+'djvu_page_error'          => 'DjVu-Syte isch uusserhalb vum Sytebereich',
+'djvu_no_xml'              => 'XML-Date chönne für d DjVu-Datei nüt abgruefe werde',
+'thumbnail_invalid_params' => 'Ungültigs Thumbnail-Parameter',
+'thumbnail_dest_directory' => 'S Ziilverzeichnis cha nüt erstellt werde',
 
 # Special:Import
-'importtext'            => 'Bitte speicher d’Syte vum Quellwiki met em Spezial:Export-Wärkzüg ab, un lad denn di XML-Datei do uffe. („Bild lokal“ sot im Folgénde eigentle „XML-Datei“ hoiße ;-)',
-'import-revision-count' => '– {{PLURAL:$1|1 Vérsion|$1 Vérsiona}}',
+'import'                     => 'Sytene importiere',
+'importinterwiki'            => 'Transwiki-Import',
+'import-interwiki-text'      => 'Wääl e Wiki un e Syte zum Importiere us.
+S Datum vo dr Bearbeitig un dr Benutzername blybe erhalte.
+Alli Transwiki-Import-Aktione werde im [[Special:Log/import|Import-Logbuech]] protokolliert.',
+'import-interwiki-source'    => 'Quell-Wiki/-Syte:',
+'import-interwiki-history'   => 'Alli früeneri Versione vo dere Syte importiere',
+'import-interwiki-submit'    => 'Import',
+'import-interwiki-namespace' => 'Ziilnamensruum:',
+'import-upload-filename'     => 'Dateiname:',
+'import-comment'             => 'Grund:',
+'importtext'                 => 'Bitte speicher d’Syte vum Quellwiki met em Spezial:Export-Wärkzüg ab, un lad denn di XML-Datei do uffe. („Bild lokal“ sot im Folgénde eigentle „XML-Datei“ hoiße ;-)',
+'importstart'                => 'Importiere Syte …',
+'import-revision-count'      => '– {{PLURAL:$1|1 Vérsion|$1 Vérsiona}}',
+'importnopages'              => 'Es isch kei Syte doo wo mer importiere chönnt.',
+'importfailed'               => 'Dr Import isch misslunge: $1',
+'importunknownsource'        => 'Importquell isch unbekannt',
+'importcantopen'             => 'D Importdatei het nüt chönne geöffnet werde',
+'importbadinterwiki'         => 'Falscher Interwiki-Link',
+'importnotext'               => 'Leer oder kei Teggscht',
+'importsuccess'              => 'Dr Import isch abgschlosse.',
+'importhistoryconflict'      => 'Es het scho ältri Versione wo mit dere kollidiere. Es isch mögli dass die Syte scho emool importiert worde isch.',
+'importnosources'            => 'Für de Transwiki-Import sin kei Quelle definiert worde. Wege dem isch s direkte Ufelade vo Gschichtsversione gsperrt.',
+'importnofile'               => 'Es isch kei Importdatei ufeglade worde.',
+'importuploaderrorsize'      => 'S Ufelade vo dr Importdatei isch misslunge. D Datei isch grösser als erlaubt isch.',
+'importuploaderrorpartial'   => 'S Ufelade vo dr Importdatei isch misslunge. D Datei het numme zum Deil chönne ufeglade werde.',
+'importuploaderrortemp'      => 'S Ufelade vo dr Importdatei isch misslunge. E temporärs Verzeichnis fäält.',
+'import-parse-failure'       => 'Fääler bim XML-Import:',
+'import-noarticle'           => 'Du hesch kei Syte zum importiere aagää!',
+'import-nonewrevisions'      => 'Es sin scho alli früeneri Versione importiert worde.',
+'xml-error-string'           => '$1 Zeile $2, Spalte $3, (Byte $4): $5',
+'import-upload'              => 'XML-Date ufelade',
+'import-token-mismatch'      => 'D Sitzigsdate sin verlore gange. Bitte versuech es noo emool.',
+'import-invalid-interwiki'   => 'Us däm Wiki wo du aagää hesch isch kei Import mögli.',
 
 # Import log
-'importlogpage'                 => 'Import-Logbuech',
-'import-logentry-upload-detail' => '$1 {{PLURAL:$1|Vérsion|Vérsiona}} [[Spezial:Importieren|importiert]]',
+'importlogpage'                    => 'Import-Logbuech',
+'importlogpagetext'                => 'Adminischtrativer Import vo Sytene mit Versionsgschichte us anderi Wikis.',
+'import-logentry-upload'           => '„[[$1]]“ isch vunere Datei importiert worde',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|Vérsion|Vérsiona}} [[Spezial:Importieren|importiert]]',
+'import-logentry-interwiki'        => '„[[$1]]“ isch importiert worde (Transwiki)',
+'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|Version|Versione}} vo $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Myni Benutzersyte',
-'tooltip-pt-mytalk'               => 'Myni Diskussionssyte',
+'tooltip-pt-userpage'             => 'Dyyni Benutzersyte',
+'tooltip-pt-anonuserpage'         => 'D Benutzersyte vo der IP-Adress wo du mit schaffsch',
+'tooltip-pt-mytalk'               => 'Dyyni Diskussionssyte',
+'tooltip-pt-anontalk'             => 'Diskussione über Änderige vo dere IP-Adress',
 'tooltip-pt-preferences'          => 'Myni Ystellige',
 'tooltip-pt-watchlist'            => 'Lischte vo de beobachtete Syte.',
-'tooltip-pt-mycontris'            => 'Lischte vo myne Byträg',
+'tooltip-pt-mycontris'            => 'Lischt vu Dyyne Byyträg',
 'tooltip-pt-login'                => 'Aamälde',
+'tooltip-pt-anonlogin'            => 'Mir ermuntre dich zwar dass du dich miteme Benutzerkonto aamääldsch, es isch aber kei Pflicht!',
 'tooltip-pt-logout'               => 'Abmälde',
 'tooltip-ca-talk'                 => 'Diskussion zum Artikelinhalt',
 'tooltip-ca-edit'                 => 'Syte bearbeite. Bitte vor em Spychere d Vorschou aaluege.',
-'tooltip-ca-addsection'           => 'E Kommentar zu dere Syte derzuetue.',
+'tooltip-ca-addsection'           => 'Neje Abschnitt aafange',
 'tooltip-ca-viewsource'           => 'Die Syte isch geschützt. Du chasch der Quelltext aaluege.',
 'tooltip-ca-history'              => 'Früecheri Versione vo dere Syte.',
 'tooltip-ca-protect'              => 'Seite beschütze',
@@ -1431,6 +2219,8 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-ca-watch'                => 'Tue die Syten uf dyni Beobachtigslischte.',
 'tooltip-ca-unwatch'              => 'Nim die Syte us dyre Beobachtungslischte furt.',
 'tooltip-search'                  => 'Dürchsuech {{SITENAME}}',
+'tooltip-search-go'               => 'Gang zunere Syte mit gnau däm Name, falls es eini git.',
+'tooltip-search-fulltext'         => 'Suech nooch Syte wo de Teggscht dinne hen',
 'tooltip-p-logo'                  => 'Houptsyte',
 'tooltip-n-mainpage'              => 'Gang uf d Houptsyte',
 'tooltip-n-portal'                => 'Ãœber ds Projekt, was du chasch mache, wo du was findsch',
@@ -1446,6 +2236,8 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-t-emailuser'             => 'Schick däm Benutzer e E-Bost',
 'tooltip-t-upload'                => 'Dateien ufelade',
 'tooltip-t-specialpages'          => 'Lischte vo allne Spezialsyte',
+'tooltip-t-print'                 => 'E Version vo dere Syte zum Usdrugge.',
+'tooltip-t-permalink'             => 'E bständigs Gleich (Link) uf die Version vo dr Syte',
 'tooltip-ca-nstab-main'           => 'Artikelinhalt aaluege',
 'tooltip-ca-nstab-user'           => 'Benutzersyte aaluege',
 'tooltip-ca-nstab-media'          => 'Mediasyte aaluege',
@@ -1462,14 +2254,41 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-diff'                    => 'Zeigt a, was du am Tekscht hesch veränderet.',
 'tooltip-compareselectedversions' => 'Underschide zwüsche zwo usgwählte Versione vo dere Syten azeige.',
 'tooltip-watch'                   => 'Tue die Syten uf dyni Beobachtigslischte.',
+'tooltip-recreate'                => 'Die Syte nöi erstelle, trotz dass si emool glöscht worren isch.',
+'tooltip-upload'                  => 'Aafange mit ufelade',
+'tooltip-rollback'                => 'Mach alli letschti Ändrige uf dere Syte, wo vo däm Benutzer gmacht worre sin, ruggängig.',
+'tooltip-undo'                    => 'Mach numme die eint Ändrig rugggängig, un zeig e Vorschau aa. Doodurch chasch in dr Zammefassig e Begründig aagää.',
+
+# Metadata
+'nodublincore'      => 'Dublin-Core-RDF-Metadate sin fir dää Server deaktiviert.',
+'nocreativecommons' => 'Creative-Commons-RDF-Metadate sin fir dää Server deaktiviert.',
+'notacceptable'     => 'Dr Wiki-Server cha d Date nit im e Format z Verfiegig stelle, wu Dyy Grät cha läse.',
 
 # Attribution
-'anonymous'        => 'Anonyme Benutzer uff {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonyme Benutzer|Anonymi Benutzer}} uff {{SITENAME}}',
+'siteuser'         => '{{SITENAME}}-Benutzer $1',
 'lastmodifiedatby' => 'Diese Seite wurde zuletzt geändert um $2, $1 von $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basiert auf der Arbeit von $1.',
+'others'           => 'anderi',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|Benutzer|Benutzer}} $1',
+'creditspage'      => 'Syteinformatione',
+'nocredits'        => 'Fir die Syte sin kein Informatione vorhande.',
 
 # Spam protection
 'spamprotectiontitle' => 'Spamschutz-Filter',
+'spamprotectiontext'  => 'D Syte, wu du wit spychere, isch vum Spamschutzfilter blockiert wore. Des lyt wahrschyyns am e Gleich uf e externi Syte.',
+'spamprotectionmatch' => "'''Dää Text isch vum Spamfilter gfunde wore: ''$1'''''",
+'spambot_username'    => 'MediaWiki Spam-Syyferig',
+'spam_reverting'      => 'Letschti Version ohni Gleicher zue $1 widerhärgstellt.',
+'spam_blanking'       => 'In allene Versione het s Gleicher zue $1 gha, sufer gmacht.',
+
+# Info page
+'infosubtitle'   => 'Syteinformation',
+'numedits'       => 'Aazaal vo Ändrige aa dr Syte: $1',
+'numtalkedits'   => 'Aazaal vo Ändrige aa de Diskussionssyte: $1',
+'numwatchers'    => 'Die Syte wird vo $1 Lüt beobachtet',
+'numauthors'     => 'Aazaal vo Autore: $1',
+'numtalkauthors' => 'Aazaal vo Diskussionsteilnäämer: $1',
 
 # Math options
 'mw_math_png'    => 'Immer als PNG aazeige',
@@ -1477,33 +2296,68 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'mw_math_html'   => 'Falls müglech als HTML aazeige, süsch als PNG',
 'mw_math_source' => 'Als TeX la sy (für Tekschtbrowser)',
 'mw_math_modern' => 'Empfolnigi Ystellig für modärni Browser',
+'mw_math_mathml' => 'MathML (experimentäll)',
 
 # Patrolling
-'markaspatrolleddiff'   => 'Als patrulyrt markyre',
-'markaspatrolledtext'   => 'Erschtversion patrulyre',
-'markedaspatrolledtext' => 'D’Änderig isch als patrulyrt markyrt.',
+'markaspatrolleddiff'                 => 'Als patrulyrt markyre',
+'markaspatrolledtext'                 => 'Erschtversion patrulyre',
+'markedaspatrolled'                   => 'As kontrolliert markiert',
+'markedaspatrolledtext'               => 'D’Änderig isch als patrulyrt markyrt.',
+'rcpatroldisabled'                    => 'Kontroll vu dr letschte Änderige gsperrt',
+'rcpatroldisabledtext'                => 'D Kontroll vu dr letschte Änderige isch im Momänt gsperrt.',
+'markedaspatrollederror'              => 'Markierig as „kontrolliert“ nit megli.',
+'markedaspatrollederrortext'          => 'Du muesch e Syteänderig uswehle.',
+'markedaspatrollederror-noautopatrol' => 'S isch nit erlaubt, eigeni Bearbeitige as kontrolliert z markiere.',
 
 # Patrol log
-'patrol-log-line' => 'het d’$1 vo $2 als patrulyrt markyrt $3',
+'patrol-log-page'      => 'Kontroll-Logbuech',
+'patrol-log-header'    => 'Des isch s Kontroll-Logbuech.',
+'patrol-log-line'      => 'het d’$1 vo $2 als patrulyrt markyrt $3',
+'patrol-log-auto'      => '(automatisch)',
+'patrol-log-diff'      => 'Version $1',
+'log-show-hide-patrol' => 'Kontroll-Logbuech $1',
+
+# Image deletion
+'deletedrevision'                 => 'alti Version: $1',
+'filedeleteerror-short'           => 'Fähler bi dr Datei-Leschig: $1',
+'filedeleteerror-long'            => 'Bi dr Datei-Leschig sin Fähler feschtgstellt wore:
+
+$1',
+'filedelete-missing'              => 'D Datei „$1“ cha nit glescht wäre, wel si nit vorhande isch.',
+'filedelete-old-unregistered'     => 'D Datei-Version „$1“, wu aagee woren isch, isch nit in dr Datebank vorhande.',
+'filedelete-current-unregistered' => 'D Datei „$1“, wu aagee woren isch, isch nit in dr Datebank vorhande.',
+'filedelete-archive-read-only'    => 'S Archiv-Verzeichnis „$1“ cha nit dur dr Webserver bschribe wäre.',
 
 # Browsing diffs
 'previousdiff' => '� Vorderi Änderig',
 'nextdiff'     => 'Nächschti Änderig →',
 
+# Visual comparison
+'visual-comparison' => 'Visuälle Verglyych',
+
 # Media information
 'mediawarning'         => "'''Obacht:''' In däre Art Datei chend s e beswillige Programmcode din ha. Wänn du die Datei abeladsch oder effnesch, cha dr Computer bschädigt wäre.<hr />",
 'imagemaxsize'         => 'Maximali Gröössi vo de Bilder uf de Bildbeschrybigs-Sytene:',
 'thumbsize'            => 'Bildvorschou-Gröössi:',
+'widthheightpage'      => '$1×$2, {{PLURAL:$3|1 Syte|$3 Syte}}',
+'file-info'            => '(Dateigressi: $1, MIME-Typ: $2)',
 'file-info-size'       => '($1 × $2 Pixel, Dateigrößi: $3, MIME-Typ: $4)',
 'file-nohires'         => '<small>Kei höcheri Uflösig verfüegbar.</small>',
 'svg-long-desc'        => '(SVG-Datei, Basisgrößi: $1 × $2 Pixel, Dateigrößi: $3)',
 'show-big-image'       => 'Originalgrößi',
 'show-big-image-thumb' => '<small>Größi vo dere Vorschou: $1 × $2 Pixel</small>',
 
-# Special:NewImages
-'newimages'     => 'Gallery vo noie Bilder',
-'imagelisttext' => "Hie isch e Lischte vo '''$1''' {{PLURAL:$1|Datei|Dateie}}, sortiert $2.",
-'ilsubmit'      => 'Suech',
+# Special:NewFiles
+'newimages'             => 'Gallery vo noie Bilder',
+'imagelisttext'         => "Hie isch e Lischte vo '''$1''' {{PLURAL:$1|Datei|Dateie}}, sortiert $2.",
+'newimages-summary'     => 'Die Spezialsyte zeigt di zletscht uffegladene Dateie aa.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Dateiname (oder e Teil devu):',
+'showhidebots'          => '(Bötli $1)',
+'noimages'              => 'Kei Dateie gfunde.',
+'ilsubmit'              => 'Suech',
+'bydate'                => 'noch Datum',
+'sp-newimages-showfrom' => 'Zeig neiji Dateie ab $1, $2 Uhr',
 
 # Bad image list
 'bad_image_list' => 'Format:
@@ -1528,75 +2382,472 @@ Anderi Metadate sy standardmäßig versteckt.
 * focallength', # Do not translate list items
 
 # EXIF tags
-'exif-orientation'     => 'Orientierung',
-'exif-pixelxdimension' => 'Valind image height',
-'exif-fnumber'         => 'F-Wert',
-'exif-isospeedratings' => 'Filmempfindlichkeit (ISO)',
+'exif-imagewidth'                  => 'Breiti',
+'exif-imagelength'                 => 'Längi',
+'exif-bitspersample'               => 'Bit pro Farbkomponente',
+'exif-compression'                 => 'Art vu dr Kompression',
+'exif-photometricinterpretation'   => 'Pixelzämmesetzig',
+'exif-orientation'                 => 'Orientierung',
+'exif-samplesperpixel'             => 'Aazahl vu dr Komponente',
+'exif-planarconfiguration'         => 'Dateusrichtig',
+'exif-ycbcrsubsampling'            => 'Subsampling Rate vu Y bis C',
+'exif-ycbcrpositioning'            => 'Y un C Positionierig',
+'exif-xresolution'                 => 'Horizontali Uflesig',
+'exif-yresolution'                 => 'Vertikali Uflesig',
+'exif-resolutionunit'              => 'Masseinheit vu dr Uflesig',
+'exif-stripoffsets'                => 'Bilddate-Versatz',
+'exif-rowsperstrip'                => 'Aazahl vu dr Zyylete pro Streife',
+'exif-stripbytecounts'             => 'Bytes pro komprimiertem Streife',
+'exif-jpeginterchangeformat'       => 'Offset zue JPEG SOI',
+'exif-jpeginterchangeformatlength' => 'JPEG-Date in Bytes',
+'exif-transferfunction'            => 'Ibertragigsfunktion',
+'exif-whitepoint'                  => 'Manuäll mit Mässig',
+'exif-primarychromaticities'       => 'Primäri Farbart',
+'exif-ycbcrcoefficients'           => 'YCbCr-Koeffiziente',
+'exif-referenceblackwhite'         => 'Schwarz/Wyss-Referenzpinkt',
+'exif-datetime'                    => 'Spycherzytpunkt',
+'exif-imagedescription'            => 'Bildtitel',
+'exif-make'                        => 'Hersteller',
+'exif-model'                       => 'Modell',
+'exif-software'                    => 'Software',
+'exif-artist'                      => 'Fotograf',
+'exif-copyright'                   => 'Urheberrächt',
+'exif-exifversion'                 => 'Exif-Version',
+'exif-flashpixversion'             => 'unterstitzti Flashpix-Version',
+'exif-colorspace'                  => 'Farbruum',
+'exif-componentsconfiguration'     => 'Bedytig vu einzelne Komponente',
+'exif-compressedbitsperpixel'      => 'Komprimierti Bit pro Pixel',
+'exif-pixelydimension'             => 'Giltigi Bildbreiti',
+'exif-pixelxdimension'             => 'Valind image height',
+'exif-makernote'                   => 'Herstellernotiz',
+'exif-usercomment'                 => 'Benutzerkommentar',
+'exif-relatedsoundfile'            => 'Zuegherigi Tondatei',
+'exif-datetimeoriginal'            => 'Erfassigszytpunkt',
+'exif-datetimedigitized'           => 'Digitalisierigszytpunkt',
+'exif-subsectime'                  => 'Spycherzytpunkt (1/100 s)',
+'exif-subsectimeoriginal'          => 'Erfassigszytpunkt (1/100 s)',
+'exif-subsectimedigitized'         => 'Digitalisierigszytpunkt (1/100 s)',
+'exif-exposuretime'                => 'Beliechtigsduur',
+'exif-exposuretime-format'         => '$1 Sekunde ($2)',
+'exif-fnumber'                     => 'F-Wert',
+'exif-exposureprogram'             => 'Beliechtigsprogramm',
+'exif-spectralsensitivity'         => 'Spektrali Empfindligkeit',
+'exif-isospeedratings'             => 'Filmempfindlichkeit (ISO)',
+'exif-oecf'                        => 'Optoelektronische Umrächnigsfaktor',
+'exif-shutterspeedvalue'           => 'Beliechtigszytwärt',
+'exif-aperturevalue'               => 'Bländewärt',
+'exif-brightnessvalue'             => 'Hälligkeitswärt',
+'exif-exposurebiasvalue'           => 'Beliechtigsvorgab',
+'exif-maxaperturevalue'            => 'Greschti Bländi',
+'exif-subjectdistance'             => 'Entfärnig',
+'exif-meteringmode'                => 'Mässverfahre',
+'exif-lightsource'                 => 'Liechtquäll',
+'exif-flash'                       => 'Blitz',
+'exif-focallength'                 => 'Brännwyti',
+'exif-subjectarea'                 => 'Beryych',
+'exif-flashenergy'                 => 'Blitzstärchi',
+'exif-spatialfrequencyresponse'    => 'Spatial-Frequenz',
+'exif-focalplanexresolution'       => 'Sensor-Uflesig horizontal',
+'exif-focalplaneyresolution'       => 'Sensor-Uflesig vertikal',
+'exif-focalplaneresolutionunit'    => 'Einheit vu dr Sensor-Uflesig',
+'exif-subjectlocation'             => 'Motivstandort',
+'exif-exposureindex'               => 'Beliechtigsindex',
+'exif-sensingmethod'               => 'Mässmethod',
+'exif-filesource'                  => 'Quäll vu dr Datei',
+'exif-scenetype'                   => 'Szenetyp',
+'exif-cfapattern'                  => 'CFA-Muschter',
+'exif-customrendered'              => 'Benutzerdefinierti Bildverarbeitig',
+'exif-exposuremode'                => 'Beliechtigsmodus',
+'exif-whitebalance'                => 'Wyssabglyych',
+'exif-digitalzoomratio'            => 'Digitalzoom',
+'exif-focallengthin35mmfilm'       => 'Brännwyti (Chleibildäquivalent)',
+'exif-scenecapturetype'            => 'Art vu dr Ufnahm',
+'exif-gaincontrol'                 => 'Verstärchig',
+'exif-contrast'                    => 'Kontrascht',
+'exif-saturation'                  => 'Sättigung',
+'exif-sharpness'                   => 'Schärfi',
+'exif-devicesettingdescription'    => 'Grät-Yystellig',
+'exif-subjectdistancerange'        => 'Motiventfärnig',
+'exif-imageuniqueid'               => 'Bild-ID',
+'exif-gpsversionid'                => 'GPS-Tag-Version',
+'exif-gpslatituderef'              => 'nerdl. oder sidl. Breiti',
+'exif-gpslatitude'                 => 'Geografischi Breiti',
+'exif-gpslongituderef'             => 'eschtl. oder weschtl. Längi',
+'exif-gpslongitude'                => 'Geografischi Längi',
+'exif-gpsaltituderef'              => 'Bezugshechi',
+'exif-gpsaltitude'                 => 'Hechi',
+'exif-gpstimestamp'                => 'GPS-Zyt',
+'exif-gpssatellites'               => 'Satellite, wu fir d Mässig brucht wore sin',
+'exif-gpsstatus'                   => 'Empfängerstatus',
+'exif-gpsmeasuremode'              => 'Mässverfahre',
+'exif-gpsdop'                      => 'Masspräzision',
+'exif-gpsspeedref'                 => 'Gschwindigkeitseinheit',
+'exif-gpsspeed'                    => 'Gschwindigkeit vum GPS-Empfänger',
+'exif-gpstrackref'                 => 'Referänz fir d Bewegigsrichtig',
+'exif-gpstrack'                    => 'Bewegigsrichtig',
+'exif-gpsimgdirectionref'          => 'Referänz fir d Usrichtig vum Bild',
+'exif-gpsimgdirection'             => 'Bildrichtig',
+'exif-gpsmapdatum'                 => 'Geodätisch Datum brucht',
+'exif-gpsdestlatituderef'          => 'Referänz fir d Breiti',
+'exif-gpsdestlatitude'             => 'Breiti',
+'exif-gpsdestlongituderef'         => 'Referänz fir d Längi',
+'exif-gpsdestlongitude'            => 'Längi',
+'exif-gpsdestbearingref'           => 'Referänz fir d Motivrichtig',
+'exif-gpsdestbearing'              => 'Motivrichtig',
+'exif-gpsdestdistanceref'          => 'Referänz fir d Motiventfärnig',
+'exif-gpsdestdistance'             => 'Motiventfärnig',
+'exif-gpsprocessingmethod'         => 'Name vum GPS-Verfahre',
+'exif-gpsareainformation'          => 'Name vum GPS-Biet',
+'exif-gpsdatestamp'                => 'GPS-Datum',
+'exif-gpsdifferential'             => 'GPS-Differentialkorrektur',
+
+# EXIF attributes
+'exif-compression-1' => 'Uukomprimiert',
+
+'exif-unknowndate' => 'Nit bekannt Datum',
+
+'exif-orientation-1' => 'Normal', # 0th row: top; 0th column: left
+'exif-orientation-2' => 'Horizontal gspieglet', # 0th row: top; 0th column: right
+'exif-orientation-3' => 'Um 180° drillt', # 0th row: bottom; 0th column: right
+'exif-orientation-4' => 'Vertikal gspieglet', # 0th row: bottom; 0th column: left
+'exif-orientation-5' => 'Gege dr Uhrzeigersinn um 90° drillt un derno vertikal gspieglet', # 0th row: left; 0th column: top
+'exif-orientation-6' => 'Um 90° im Uhrzeigersinn drillt', # 0th row: right; 0th column: top
+'exif-orientation-7' => 'Um 90° im Uhrzeigersinn drillt un derno vertikal gspieglet', # 0th row: right; 0th column: bottom
+'exif-orientation-8' => 'Um 90° gege dr Uhrzeigersinn drillt', # 0th row: left; 0th column: bottom
+
+'exif-planarconfiguration-1' => 'Grobformat',
+'exif-planarconfiguration-2' => 'Planarformat',
+
+'exif-componentsconfiguration-0' => 'Git s nit',
+
+'exif-exposureprogram-0' => 'Nit bekannt',
+'exif-exposureprogram-1' => 'Manuell',
+'exif-exposureprogram-2' => 'Standardprogramm',
+'exif-exposureprogram-3' => 'Zytautomatik',
+'exif-exposureprogram-4' => 'Bländeautomatik',
+'exif-exposureprogram-5' => 'Kreativprogramm (hochi Schärfetiefi bevorzugt)',
+'exif-exposureprogram-6' => 'Aktions-Programm (churzi Beliechtigszyt bevorzugt)',
+'exif-exposureprogram-7' => 'Porträ-Programm',
+'exif-exposureprogram-8' => 'Landschaftsufnahme',
+
+'exif-subjectdistance-value' => '$1 Meter',
+
+'exif-meteringmode-0'   => 'Nit bekannt',
+'exif-meteringmode-1'   => 'Durchschnittlig',
+'exif-meteringmode-2'   => 'Mittizentriert',
+'exif-meteringmode-3'   => 'Spot-Mässig',
+'exif-meteringmode-4'   => 'Mehfach-Spot-Mässig',
+'exif-meteringmode-5'   => 'Muschter',
+'exif-meteringmode-6'   => 'Bildteil',
+'exif-meteringmode-255' => 'Anderi',
+
+'exif-lightsource-0'   => 'Nit bekannt',
+'exif-lightsource-1'   => 'Tagliecht',
+'exif-lightsource-2'   => 'Fluoreszierig',
+'exif-lightsource-3'   => 'Glieilampe',
+'exif-lightsource-4'   => 'Blitz',
+'exif-lightsource-9'   => 'Schen Wätter',
+'exif-lightsource-10'  => 'Wulchig',
+'exif-lightsource-11'  => 'Schatte',
+'exif-lightsource-12'  => 'Tagliecht fluoreszierig (D 5700–7100 K)',
+'exif-lightsource-13'  => 'Tagwyss fluoreszierig (N 4600–5400 K)',
+'exif-lightsource-14'  => 'Chaltwyss fluoreszierig (W 3900–4500 K)',
+'exif-lightsource-15'  => 'Wyss fluoreszierig (WW 3200–3700 K)',
+'exif-lightsource-17'  => 'Standardliecht A',
+'exif-lightsource-18'  => 'Standardliecht B',
+'exif-lightsource-19'  => 'Standardliecht C',
+'exif-lightsource-24'  => 'ISO Studio Chunschtliecht',
+'exif-lightsource-255' => 'Anderi Liechtquäll',
+
+# Flash modes
+'exif-flash-fired-0'    => 'kei Blitz',
+'exif-flash-fired-1'    => 'Blitz usglest',
+'exif-flash-return-0'   => 'Blitz schickt kei Date',
+'exif-flash-return-2'   => 'kei Reflexion vum Blitz feschtgstellt',
+'exif-flash-return-3'   => 'Reflexion vum Blitz feschtgstellt',
+'exif-flash-mode-1'     => 'erzwunge Blitze',
+'exif-flash-mode-2'     => 'Blitz abgstellt',
+'exif-flash-mode-3'     => 'Automatik',
+'exif-flash-function-1' => 'Kei Blitzfunktion',
+'exif-flash-redeye-1'   => 'Roti-Auge-Reduktion',
+
+'exif-focalplaneresolutionunit-2' => 'Zoll',
+
+'exif-sensingmethod-1' => 'Nit definiert',
+'exif-sensingmethod-2' => 'Ei-Chip-Farbsensor',
+'exif-sensingmethod-3' => 'Zwee-Chip-Farbsensor',
+'exif-sensingmethod-4' => 'Drej-Chip-Farbsensor',
+'exif-sensingmethod-5' => 'Farbruum sequenziäll Sensor',
+'exif-sensingmethod-7' => 'Trilineare Sensor',
+'exif-sensingmethod-8' => 'Farbruum linear sequenziälle Sensor',
+
+'exif-scenetype-1' => 'E diräkt fotografiert Bild',
+
+'exif-customrendered-0' => 'Normal',
+'exif-customrendered-1' => 'Benutzerdefiniert',
+
+'exif-exposuremode-0' => 'Automatischi Beliechtig',
+'exif-exposuremode-1' => 'Manuälli Beliechtig',
+'exif-exposuremode-2' => 'Beliechtigzyylete',
+
+'exif-whitebalance-0' => 'Automatisch',
+'exif-whitebalance-1' => 'Manuäll',
+
+'exif-scenecapturetype-0' => 'Standard',
+'exif-scenecapturetype-1' => 'Landschaft',
+'exif-scenecapturetype-2' => 'Porträt',
+'exif-scenecapturetype-3' => 'Nachtszene',
+
+'exif-gaincontrol-0' => 'Keini',
+'exif-gaincontrol-1' => 'Low gain up',
+'exif-gaincontrol-2' => 'High gain up',
+'exif-gaincontrol-3' => 'Low gain down',
+'exif-gaincontrol-4' => 'High gain down',
+
+'exif-contrast-0' => 'Normal',
+'exif-contrast-1' => 'Schwach',
+'exif-contrast-2' => 'Starch',
+
+'exif-saturation-0' => 'Normal',
+'exif-saturation-1' => 'Niideri Sättigung',
+'exif-saturation-2' => 'Hochi Sättigung',
+
+'exif-sharpness-0' => 'Normal',
+'exif-sharpness-1' => 'Schwach',
+'exif-sharpness-2' => 'Starch',
+
+'exif-subjectdistancerange-0' => 'Nit bekannt',
+'exif-subjectdistancerange-1' => 'Makro',
+'exif-subjectdistancerange-2' => 'Noch',
+'exif-subjectdistancerange-3' => 'Wyt ewäg',
+
+# Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => 'nerdl. Breiti',
+'exif-gpslatitude-s' => 'sidl. Breiti',
+
+# Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => 'eschtl. Längi',
+'exif-gpslongitude-w' => 'weschtl. Längi',
+
+'exif-gpsstatus-a' => 'Mässig lauft',
+'exif-gpsstatus-v' => 'Interoperabilität vu Mässige',
+
+'exif-gpsmeasuremode-2' => '2-dimensionali Mässig',
+'exif-gpsmeasuremode-3' => '3-dimensionali Mässig',
+
+# Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-k' => 'km/h',
+'exif-gpsspeed-m' => 'mph',
+'exif-gpsspeed-n' => 'Chnote',
+
+# Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => 'Tatsächligi Richtig',
+'exif-gpsdirection-m' => 'Magnetischi Richtig',
 
 # External editor support
 'edit-externally'      => 'Die Datei mit emnen externe Programm bearbeite',
 'edit-externally-help' => '(Lueg d [http://www.mediawiki.org/wiki/Manual:External_editors Installationsaawisige] fir witeri Informatione)',
 
 # 'all' in various places, this might be different for inflected languages
-'watchlistall2' => 'alli',
-'namespacesall' => 'alli',
-'monthsall'     => 'alli',
+'recentchangesall' => 'alli',
+'imagelistall'     => 'alli',
+'watchlistall2'    => 'alli',
+'namespacesall'    => 'alli',
+'monthsall'        => 'alli',
 
 # E-mail address confirmation
-'confirmemail'          => 'Bstätigung vo Ihre E-Poscht-Adräss',
-'confirmemail_text'     => 'Dermit du di erwyterete Mailfunktione chasch bruuche, muesch du die e-Mail-Adrässe, wo du hesch aaggä, la bestätige. Klick ufe Chnopf unte; das schickt dir es Mail. I däm Mail isch e Link; we du däm Link folgsch, de tuesch dadermit bestätige, das die e-Mail-Adrässe dyni isch.',
-'confirmemail_send'     => 'Bestätigungs-Mail verschicke',
-'confirmemail_sent'     => 'Es isch dir es Mail zur Adrässbestätigung gschickt worde.',
-'confirmemail_success'  => 'Dyni E-Mail-Adräss isch bstätiget worde. Du chasch di jitz aamälde.',
-'confirmemail_loggedin' => 'Dyni E-Mail-Adräss isch jitz bstätigt.',
-'confirmemail_subject'  => '{{SITENAME}} E-Mail-Adrässbstätigung',
-'confirmemail_body'     => "Hallo
-
-{{SITENAME}}-BenutzerIn «$2» — das bisch allwäg du — het sech vor IP-Adrässen $1 uus mit deren e-Mail-Adrässe bi {{SITENAME}} aagmäldet.
-
-Für z bestätige, das die Adrässe würklech dir isch, u für dyni erwytereten e-Mail-Funktionen uf {{SITENAME}} yzschalte, tue bitte der folgend Link i dym Browser uuf:
+'confirmemail'             => 'Bstätigung vo Ihre E-Poscht-Adräss',
+'confirmemail_noemail'     => 'Du hesch in dyne [[Special:Preferences|persönliche Ystellige]] e kei E-Mail-Adress ygää.',
+'confirmemail_text'        => 'Dermit du di erwyterete Mailfunktione chasch bruuche, muesch du die e-Mail-Adrässe, wo du hesch aaggä, la bestätige. Klick ufe Chnopf unte; das schickt dir es Mail. I däm Mail isch e Link; we du däm Link folgsch, de tuesch dadermit bestätige, das die e-Mail-Adrässe dyni isch.',
+'confirmemail_pending'     => '<div class="error">Es isch Dir scho en Code zum Bestätige zuegschiggt worde. Falls du Dyn Konto grad erscht aagleit hesch, muesch villicht noo e weng warte bis d E-Mail ytrifft, bevor du en nöie Code aafordresch.</div>',
+'confirmemail_send'        => 'Bestätigungs-Mail verschicke',
+'confirmemail_sent'        => 'Es isch dir es Mail zur Adrässbestätigung gschickt worde.',
+'confirmemail_oncreate'    => 'En Code isch aa dyni E-Mail-Adress zum bestätige gschiggt worde. Du bruuch de Code zwar nüt zum dich aamälde, er wird aber zum aktiviere vo de E-Mail-Funktione in däm Wiki bruucht.',
+'confirmemail_sendfailed'  => '{{SITENAME}} het d E-Mail zum bestätige nüt chönne verschigge.
+Bitte überprüef d E-Mail-Adress uf ungültigi Zeiche.
+
+Ruggmäldig vum Mailserver: $1',
+'confirmemail_invalid'     => 'De Bestätigscode isch ungültig. Es isch mögli das er abgloffe isch. In däm Fall chasch probiere d Bestätigung z widerhole.',
+'confirmemail_needlogin'   => 'Du muesch dich $1, zume dyni E-Mail-Adress bstätige.',
+'confirmemail_success'     => 'Dyni E-Mail-Adräss isch bstätiget worde. Du chasch di jitz aamälde.',
+'confirmemail_loggedin'    => 'Dyni E-Mail-Adräss isch jitz bstätigt.',
+'confirmemail_error'       => 'Öbis isch bim Bestätige vo dynrer E-Mail-Adress schief gloffe.',
+'confirmemail_subject'     => '{{SITENAME}} E-Mail-Adrässbstätigung',
+'confirmemail_body'        => 'Salü
+
+{{SITENAME}}-BenutzerIn «$2» — das bisch allwäg Du — het sech vor IP-Adrässen $1 uus mit deren e-Mail-Adrässe bi {{SITENAME}} aagmäldet.
+
+Für z bestätige, das die Adrässe würklech Dir isch, u für Dyni erwytereten e-Mail-Funktionen uf {{SITENAME}} yzschalte, tue bitte dää Gleich i dym Browser uuf:
 
 $3
 
-Falls du *nid* $2 sötsch sy, de tue bitte de  Link unte dra uf um d'e-Mail-Bestätigung abzbreche:
+Falls du *nid* $2 sötsch sy, de tue bitte de Gleich unte dra uf, um d e-Mail-Bstätigung abzbreche:
 
 $5
 
-De Bestätigung Code isch gültug bis $4.
-
-Fründtlechi Grüess",
-
-# action=purge
-'confirm_purge' => "Die Zwischeschpoicherung vo der Syte „{{FULLPAGENAME}}“ lösche?
-
-\$1
+De Bstätigungs-Code isch gültig bis $4.
 
-<div style=\"font-size: 95%; margin-top: 2em;\">
-'''''Erklärig:'''''
+Fründlechi Grüess',
+'confirmemail_invalidated' => 'D E-Mail-Adressbestätig isch abbroche worde',
+'invalidateemail'          => 'S Bestätige vo dr E-Mail-Adress abbreche',
 
-''Zwüschespycherige (Cache) sy temporäri Kopye vore Websyten uf dym Computer. We ne Syte us em Zwüschespycher abgrüefft wird, de bruucht das weniger Rächeleischtig füre {{SITENAME}}-Server als en Abrueff vor Originalsyte.''
+# Scary transclusion
+'scarytranscludedisabled' => '[Interwiki-Yybindig isch deaktiviert]',
+'scarytranscludefailed'   => '[Vorlage-Yybindig fir $1 isch gescheitert]',
+'scarytranscludetoolong'  => '[URL isch z lang]',
 
-''Falls du e Syte scho nes Wyli am Aaluege bisch, de het dy Computer sone Zwüschespycherig gmacht. Derby chönnt die Syten unter Umständ scho i dere Zyt liecht veraltere.''
+# Trackbacks
+'trackbackbox'      => '<div id="mw_trackbacks">
+Trackback fir die Syte:<br />
+$1
+</div>',
+'trackbackremove'   => '([$1 lesche])',
+'trackbacklink'     => 'Trackback',
+'trackbackdeleteok' => 'Trackback isch mit Erfolg glescht wore.',
+
+# Delete conflict
+'deletedwhileediting' => "'''Obacht''': Die Syte isch glescht wore, nochdäm Du aagfange hesch si z bearbeite!",
+'confirmrecreate'     => "Benutzer [[User:$1|$1]] ([[User talk:$1|Diskussion]]) het die Syte glescht, nochdäm Du aagfange hesch si z bearbeite.
+D Begrindig isch gsi:
+:''$2''
+Bitte bstätig, ass Du die Syte wirkli wit nej aalege.",
+'recreate'            => 'Nomol aalege',
 
-''Ds Lösche vor Zwüschespycherig zwingt der Server, dir di aktuellschti Version vor Syte z gä!''
-</div>",
+# action=purge
+'confirm_purge_button' => 'In Ornig',
+'confirm-purge-top'    => 'D Zwischespycherig vu dr Syte lesche?',
+'confirm-purge-bottom' => 'Läärt dr Cache vun ere Syte un macht, ass di nejscht Version aazeigt wird.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� vorderi Syte',
+'imgmultipagenext' => 'nächschti Syte →',
+'imgmultigo'       => 'Gang!',
+'imgmultigoto'     => 'Gang uf Syte $1',
 
 # Table pager
-'table_pager_prev' => 'Vorderi Syte',
+'ascending_abbrev'         => 'uf',
+'descending_abbrev'        => 'ab',
+'table_pager_next'         => 'Näggschti Syte',
+'table_pager_prev'         => 'Vorderi Syte',
+'table_pager_first'        => 'Erschti Syte',
+'table_pager_last'         => 'Letschti Syte',
+'table_pager_limit'        => 'Zeig $1 Yträg pro Syte aa',
+'table_pager_limit_submit' => 'Gang',
+'table_pager_empty'        => 'Kei Ergebniss',
+
+# Auto-summaries
+'autosumm-blank'   => 'Die Syte isch gleert worde.',
+'autosumm-replace' => "Dr Inhalt vo dr Syte isch ersetzt worde: '$1'",
+'autoredircomment' => 'E Wyterleitig uf [[$1]] isch erstellt worde',
+'autosumm-new'     => "Het Syte aagleit mit '$1'",
+
+# Live preview
+'livepreview-loading' => 'Am Lade …',
+'livepreview-ready'   => 'Am Lade… Fertig!',
+'livepreview-failed'  => 'Live-Vorschau nit megli! Bitte di normal Vorschau verwände.',
+'livepreview-error'   => 'Verbindig nit megli: $1 „$2“. Bitte di normal Vorschau verwände.',
+
+# Friendlier slave lag warnings
+'lag-warn-normal' => 'Bearbeitige in dr letschte {{PLURAL:$1|Sekund|$1 Sekunde}} wäre in däre Lischt nonig aazeigt.',
+'lag-warn-high'   => 'Wäg ere hoche Datebank-Uslaschtig wäre d Bearbeitige in dr letschte {{PLURAL:$1|Sekund|$1 Sekunde}} in däre Lischt nonig aazeigt.',
+
+# Watchlist editor
+'watchlistedit-numitems'       => 'Uf dynrer Beobachtigslischt sin {{PLURAL:$1|ei Ytrag|$1 Yträg}}, Diskussionssyte werde nüt zäält.',
+'watchlistedit-noitems'        => 'Du hesch kei Syte uf dynrer Beobachtigslischt.',
+'watchlistedit-normal-title'   => 'D Beobachtigslischt bearbeite',
+'watchlistedit-normal-legend'  => 'Yträg vo dynrer Beobachtigslischt entferne',
+'watchlistedit-normal-explain' => 'Doo unte sihsch d Yträg uf dynrer Beobachtigslischt. Zume en Ytrag useznää muesch s Chäschtli dernäbe markiere un denoo ganz unte uf „Yträg usenää“ drugge. Du chasch syni Beobachtigslischt au als [[Special:Watchlist/raw|Lischte bearbeite]].',
+'watchlistedit-normal-submit'  => 'Yträg usenää',
+'watchlistedit-normal-done'    => '{{PLURAL:$1|ei Ytrag isch|$1 Yträg sin}} vo dynrer Beobachtigslischt entfernt worde:',
+'watchlistedit-raw-title'      => 'D Beobachtigslischt als Lischte bearbeite',
+'watchlistedit-raw-legend'     => 'D Beobachtigslischt als Lischte bearbeite',
+'watchlistedit-raw-explain'    => 'Doo unte sihsch d Yträg uf dynrer Beobachtigslischt. Du chasch die Yträg jetz usenää oder hinzuefüge.
+Pro Zyle isch ei Ytrag erlaubt. Wenn fertig bisch, drugg uf „Beobachtigslischt aktualisiere“.
+Du chasch au d [[Special:Watchlist/edit|Standard-Bearbeitigssyte]] bruuche.',
+'watchlistedit-raw-titles'     => 'Yträg:',
+'watchlistedit-raw-submit'     => 'D Beobachtigslischt aktualisiere',
+'watchlistedit-raw-done'       => 'Dyni Beobachtigslischt isch aktualisiert worde.',
+'watchlistedit-raw-added'      => '{{PLURAL:$1|ei Ytrag isch|$1 Yträg sin}} dezuedüü worde:',
+'watchlistedit-raw-removed'    => '{{PLURAL:$1|ei Ytrag isch|$1 Yträg sin}} usegnoo worde:',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Beobachtigsliste: Änderige',
 'watchlisttools-edit' => 'normal bearbeite',
 'watchlisttools-raw'  => 'imene große Textfäld bearbeite',
 
+# Core parser functions
+'unknown_extension_tag' => 'Nit bekannte Extension-Tag „$1“',
+'duplicate-defaultsort' => 'Obacht: Dr Sortierigsschlüssel „$2“ iberschrybt dr vorig brucht Schlüssel „$1“.',
+
 # Special:Version
-'version' => 'Version', # Not used as normal message but as header for the special page itself
+'version'                          => 'Version', # Not used as normal message but as header for the special page itself
+'version-extensions'               => 'Installierti Erwyterige',
+'version-specialpages'             => 'Spezialsyte',
+'version-parserhooks'              => 'Parser-Schnittstelle',
+'version-variables'                => 'Variable',
+'version-other'                    => 'Anders',
+'version-mediahandlers'            => 'Medie-Handler',
+'version-hooks'                    => "Schnittstelle ''(Hook)''",
+'version-extension-functions'      => 'Funktionsufruef',
+'version-parser-extensiontags'     => "Parser-Erwyterige ''(tags)''",
+'version-parser-function-hooks'    => 'Parser-Funktione',
+'version-skin-extension-functions' => 'Skin-Erwyterigs-Funktione',
+'version-hook-name'                => 'Schnittstellename',
+'version-hook-subscribedby'        => 'Ufruef vu',
+'version-version'                  => 'Version',
+'version-license'                  => 'Lizänz',
+'version-software'                 => 'Installierti Software',
+'version-software-product'         => 'Produkt',
+'version-software-version'         => 'Version',
+
+# Special:FilePath
+'filepath'         => 'Dateipfad',
+'filepath-page'    => 'Datei:',
+'filepath-submit'  => 'Pfad sueche',
+'filepath-summary' => 'Mit däre Spezialsyte losst sich dr komplett Pfad vu dr aktuälle Version vun ere Datei ohni Umwäg abfroge. Di aagfrogt Datei wird diräkt dargstellt bzw. mit dr verchnipfte Aawändig gstartet.
+
+D Yygab muess ohni dr Zuesatz „{{ns:file}}:“ erfolge.',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch'          => 'Datei-Duplikat sueche',
+'fileduplicatesearch-summary'  => 'Suech no Datei-Duplikat uf dr Grundlag vu ihrem Hash-Wärt.
+
+D Yygab muess ohni dr Zuesatz „{{ns:file}}:“ erfolge.',
+'fileduplicatesearch-legend'   => 'No Duplikat sueche',
+'fileduplicatesearch-filename' => 'Dateiname:',
+'fileduplicatesearch-submit'   => 'Sueche',
+'fileduplicatesearch-info'     => '$1 × $2 Pixel<br />Dateigressi: $3<br />MIME-Typ: $4',
+'fileduplicatesearch-result-1' => 'D Datei „$1“ het kei identischi Duplikat.',
+'fileduplicatesearch-result-n' => 'D Datei „$1“ het {{PLURAL:$2|1 identisch Duplikat|$2 identischi Duplikat}}.',
 
 # Special:SpecialPages
-'specialpages'             => 'Spezialsytene',
-'specialpages-group-login' => 'Aamälde',
+'specialpages'                   => 'Spezialsytene',
+'specialpages-note'              => '----
+* D Spezialsyte für alli
+* <span class="mw-specialpagerestricted">d Spezialsyte für d Benutzer mit bsundri Rächt</span>',
+'specialpages-group-maintenance' => 'Wartigslischte',
+'specialpages-group-other'       => 'Andri Spezialsyte',
+'specialpages-group-login'       => 'Aamälde',
+'specialpages-group-changes'     => 'D letschte Änderige un Logbüecher',
+'specialpages-group-media'       => 'Medie',
+'specialpages-group-users'       => 'Benutzer un Rächt',
+'specialpages-group-highuse'     => 'Syte wo oft bruucht werde',
+'specialpages-group-pages'       => 'Lischte vo Syte',
+'specialpages-group-pagetools'   => 'Sytewerchzüüg',
+'specialpages-group-wiki'        => 'Syschtemdate un Wärchzüüg',
+'specialpages-group-redirects'   => 'Spezialsyte wo wyterleite',
+'specialpages-group-spam'        => 'Spam-Wärchzüüg',
+
+# Special:BlankPage
+'blankpage'              => 'E leeri Syte',
+'intentionallyblankpage' => 'Die Syte isch absichtlich leer. Si wird für Benchmarks bruucht.',
+
+# External image whitelist
+'external_image_whitelist' => ' #Die Zyylete nit verändere<pre>
+#Unte chenne Fragmänt vu reguläre Usdrick (dr Teil zwische dr //) yygee wäre
+#Die wäre mit dr URL vu Bilder us externe Quälle vergliche
+#E positive Verglyych fiert zue dr Aazeig vum Bild, suscht wird s Bild nume as Gleich aazeigt
+#Zyylete, wu mit eme # aafange, wäre as Kommentar behandlet
+#Fragmänt vu reguläre Usdrick noch däre Zyylete yytrage. Die Zyylete nit verändere</pre>',
 
 );
diff --git a/languages/messages/MessagesGu.php b/languages/messages/MessagesGu.php
index 65a97ff6..3b6d4688 100644
--- a/languages/messages/MessagesGu.php
+++ b/languages/messages/MessagesGu.php
@@ -9,6 +9,25 @@
  * @author לערי ריינה�רט
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'દ�રશ�ય-શ�રાવ�ય_(મિડિયા)',
+	NS_SPECIAL          => 'વિશેષ',
+	NS_TALK             => 'ચર�ચા',
+	NS_USER             => 'સભ�ય',
+	NS_USER_TALK        => 'સભ�યની_ચર�ચા',
+	NS_PROJECT_TALK     => '$1_ચર�ચા',
+	NS_FILE             => 'ચિત�ર',
+	NS_FILE_TALK        => 'ચિત�રની_ચર�ચા',
+	NS_MEDIAWIKI        => 'મીડિયાવિકિ',
+	NS_MEDIAWIKI_TALK   => 'મીડિયાવિકિ_ચર�ચા',
+	NS_TEMPLATE         => 'ઢાંચો',
+	NS_TEMPLATE_TALK    => 'ઢાંચાની_ચર�ચા',
+	NS_HELP             => 'મદદ',
+	NS_HELP_TALK        => 'મદદની_ચર�ચા',
+	NS_CATEGORY         => 'શ�રેણી',
+	NS_CATEGORY_TALK    => 'શ�રેણીની_ચર�ચા',
+);
+
 $digitTransformTable = array(
 	'0' => '૦', # &#x0ae6;
 	'1' => '૧', # &#x0ae7;
@@ -49,8 +68,6 @@ $messages = array(
 'underline-always' => 'હંમેશાં',
 'underline-never'  => 'કદી નહિ',
 
-'skinpreview' => '(ફેરફાર બતાવો)',
-
 # Dates
 'sunday'        => 'રવિવાર',
 'monday'        => 'સોમવાર',
@@ -124,7 +141,7 @@ $messages = array(
 'mypage'        => 'માર�ં પાન�ં',
 'mytalk'        => 'મારી ચર�ચા',
 'navigation'    => 'ભ�રમણ',
-'and'           => 'અને',
+'and'           => '&#32;અને',
 
 'errorpagetitle'   => 'ત�ર�ટિ',
 'returnto'         => '$1 પર પાછા જાઓ.',
@@ -258,6 +275,9 @@ $messages = array(
 'noemail'                 => 'સભ�ય "$1"ન�ં કોઇ ઇ-મેલ સરનામ�ં નોંધાયેલ�ં નથી.',
 'accountcreated'          => 'ખાત�ં ખોલવામાં આવ�ય�ં છે',
 
+# Password reset dialog
+'retypenew' => 'નવી ગ�પ�ત સંજ�ઞા (પાસવર�ડ) ફરી લખો:',
+
 # Edit page toolbar
 'bold_sample'     => 'ઘાટા અક�ષર',
 'bold_tip'        => 'ઘાટા અક�ષર',
@@ -279,8 +299,8 @@ $messages = array(
 'hr_tip'          => 'આડી લીટી (શક�ય તેટલો ઓછો ઉપયોગ કરો)',
 
 # Edit pages
-'summary'                => 'સારાંશ',
-'subject'                => 'વિષય/શિર�ષક',
+'summary'                => 'સારાંશ:',
+'subject'                => 'વિષય/શિર�ષક:',
 'minoredit'              => 'આ �ક નાનો સ�ધારો છે.',
 'watchthis'              => 'આ પાનાને ધ�યાનમાં રાખો',
 'savearticle'            => 'સાચવો',
@@ -308,18 +328,18 @@ $messages = array(
 <br />નવ�ં પાન�ં બનાવવા માટે નીચે આપેલા ખાનામાં લખવાન�ં શરૂ કરો (વધ� માહિતિ માટે [[{{MediaWiki:Helppage}}|મદદ]] જ�ઓ).
 <br />જો આપ ભ�લમાં અહીં આવી ગયા હોવ તો, આપનાં બ�રાઉ�ર નાં '''બેક''' બટન પર ક�લિક કરીને પાછા વળો.",
 'noarticletext'          => 'આ પાનામાં હાલમાં કોઇ માહિતિ નથી, તમે  [[Special:Search/{{PAGENAME}}|આ શબ�દ]] ધરાવતાં અન�ય લેખો શોધી શકો છો, અથવા  [{{fullurl:{{FULLPAGENAME}}|action=edit}} આ પાનામાં ફેરફાર કરી] માહિતિ ઉમેરવાન�ં શરૂ કરો.',
-'previewnote'            => '<strong>આ ફક�ત પૂર�વાવલોકન છે;
-ફેરફ�ફરો હજ� સ�રક�ષિત કરવામાં નથી આવ�યાં!</strong>',
+'previewnote'            => "'''આ ફક�ત પૂર�વાવલોકન છે;
+ફેરફ�ફરો હજ� સ�રક�ષિત કરવામાં નથી આવ�યાં!'''",
 'editing'                => '$1નો ફેરફાર કરી રહ�યા છે',
 'editingsection'         => '$1 (પરિચ�છેદ)નો ફેરફાર કરી રહ�યા છો',
 'yourdiff'               => 'ભેદ',
-'copyrightwarning'       => 'મહેરબાની કરીને � વાતની નોંધ લેશો કે {{SITENAME}}માં કરેલ�ં બધ�ંજ યોગદાન $2 હેઠળ પ�રકાશિત કર�લ�ં માનવામાં આવે છે (વધ� માહિતિ માટે $1 જ�ઓ).
+'copyrightwarning'       => "મહેરબાની કરીને � વાતની નોંધ લેશો કે {{SITENAME}}માં કરેલ�ં બધ�ંજ યોગદાન $2 હેઠળ પ�રકાશિત કર�લ�ં માનવામાં આવે છે (વધ� માહિતિ માટે $1 જ�ઓ).
 <br />જો આપ ના ચાહતા હોવ કે તમારા યોગદાનમાં અન�ય કોઇ વ�યક�તિ બેધડક પણે ફેરફાર કરે અને તેને પ�નઃપ�રકાશિત કરે, તો અહીં યોગદાન કરશો નહી.
 <br />સાથે સાથે તમે અમને �મ પણ ખાતરી આપી રહ�યા છો કે આ લખાણ તમે મૌલિક રીતે લખ�ય�ં છે, અથવાતો પબ�લિક ડોમેઇન કે તેવા અન�ય મ�ક�ત સ�ત�રોતમાંથી લીધ�ં છે.
-<br /><strong>પરવાનગી વગર પ�રકાશનાધિકાર થી સ�રક�ષિત (COPYRIGHTED) કાર�ય અહીં પ�રકાશિત ના કરશો!</strong>',
-'longpagewarning'        => '<strong>ચેતવણી: આ પાન�ં $1 કિલોબાઇટ�સ લાંબ� છે;
+<br />'''પરવાનગી વગર પ�રકાશનાધિકાર થી સ�રક�ષિત (COPYRIGHTED) કાર�ય અહીં પ�રકાશિત ના કરશો!'''",
+'longpagewarning'        => "'''ચેતવણી: આ પાન�ં $1 કિલોબાઇટ�સ લાંબ� છે;
 કેટલાંક બ�રાઉ�રોમાં લગભગ ૩૨ કિલોબાઇટ�સ જેટલાં કે તેથી મોટાં પાનાઓમાં ફેરફાર કરવામાં મ�શ�કેલી પડી શકે છે.
-બને ત�યાં સ�ધી પાનાને નાનાં વિભાગોમાં વિભાજીત કરી નાંખો.</strong>',
+બને ત�યાં સ�ધી પાનાને નાનાં વિભાગોમાં વિભાજીત કરી નાંખો.'''",
 'templatesused'          => 'આ પાનામાં વપરાયેલા ઢાંચાઓ:',
 'templatesusedpreview'   => 'આ પૂર�વાવલોકનમાં વપરાયેલાં ઢાંચાઓ:',
 'template-protected'     => '(સ�રક�ષિત)',
@@ -331,12 +351,15 @@ $messages = array(
 આગળ વધતાં બે વખત વિચારજો અને જો તમને લાગે કે આ પાન�ં ફરી વાર બનાવવ�ં ઉચિત છે, તો જ અહીં ફેરફાર કરજો.
 પાન�ં હટવ�યાં પહેલાનાં બધા ફેરફારોની સૂચિ તમારી સહ�લીયત માટે અહીં આપી છે:",
 
+# Account creation failure
+'cantcreateaccounttitle' => 'ખાત�ં ખોલી શકાય તેમ નથી',
+
 # History pages
 'viewpagelogs'        => 'આ પાનાનાં લૉગ જ�ઓ',
 'nohistory'           => 'આ પાનાનાં ફેરફારનો ઇતિહાસ નથી.',
 'currentrev'          => 'હાલની આવૃત�તિ',
 'revisionasof'        => '$1 સ�ધીનાં પ�નરાવર�તન',
-'revision-info'       => '$2 દ�વારા $1 સ�ધીમાં કરવામાં આવેલાં ફેરફારો',
+'revision-info'       => '$2 દ�વારા $1 સ�ધીમાં કરવામાં આવેલાં ફેરફારો', # Additionally available: $3: revision id
 'previousrevision'    => '�જ�ના ફેરફારો',
 'nextrevision'        => 'આ પછીન�ં પ�નરાવર�તન→',
 'currentrevisionlink' => 'વર�તમાન આવૃત�તિ',
@@ -361,20 +384,21 @@ $messages = array(
 'diff-multi'              => '({{PLURAL:$1|વચગાળાન�ં �ક પ�નરાવર�તન|વચગાળાનાં $1 પ�નરાવર�તનો}} દર�શાવેલ નથી.)',
 
 # Search results
-'searchresults' => 'પરિણામોમાં શોધો',
-'noexactmatch'  => "'''\"\$1\" શિર�ષક વાળ�ં કોઇ પાન�ં નથી.'''
+'searchresults'  => 'પરિણામોમાં શોધો',
+'noexactmatch'   => "'''\"\$1\" શિર�ષક વાળ�ં કોઇ પાન�ં નથી.'''
 <br />તમે [[:\$1|આ પાન�ં બનાવી શકો છો]].",
-'prevn'         => 'પાછળનાં $1',
-'nextn'         => 'આગળનાં $1',
-'viewprevnext'  => 'જ�ઓ: ($1) ($2) ($3)',
-'powersearch'   => 'શોધો (વધ� પર�યાય સાથે)',
+'prevn'          => 'પાછળનાં $1',
+'nextn'          => 'આગળનાં $1',
+'viewprevnext'   => 'જ�ઓ: ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:સૂચિ',
+'powersearch'    => 'શોધો (વધ� પર�યાય સાથે)',
 
 # Preferences page
 'preferences'       => 'પસંદ',
 'mypreferences'     => 'મારી પસંદ',
+'skin-preview'      => 'ફેરફાર બતાવો',
 'datetime'          => 'તારીખ અને સમય',
-'prefs-watchlist'   => 'ધ�યાનસૂચી',
-'retypenew'         => 'નવી ગ�પ�ત સંજ�ઞા (પાસવર�ડ) ફરી લખો:',
+'prefs-watchlist'   => 'ધ�યાનસૂચિ',
 'searchresultshead' => 'શોધો',
 
 # Groups
@@ -428,10 +452,10 @@ $messages = array(
 'uploadlogpage' => 'ચઢાવેલી ફાઇલોન�ં માહિતિ પત�રક',
 'filesource'    => 'સ�ત�રોત:',
 
-# Special:ImageList
-'imagelist' => 'ફાઇલોની યાદી',
+# Special:ListFiles
+'listfiles' => 'ફાઇલોની યાદી',
 
-# Image description page
+# File description page
 'filehist'                  => 'ફાઇલનો ઇતિહાસ',
 'filehist-help'             => 'તારિખ/સમય ઉપર ક�લિક કરવાથી તે સમયે ફાઇલ કેવી હતી તે જોવા મળશે',
 'filehist-current'          => 'વર�તમાન',
@@ -505,7 +529,6 @@ $messages = array(
 'speciallogtitlelabel' => 'શિર�ષક:',
 'log'                  => 'લૉગ',
 'all-logs-page'        => 'બધાં માહિતિ પત�રકો',
-'log-search-submit'    => 'શોધો',
 
 # Special:AllPages
 'allpages'       => 'બધા પાના',
@@ -523,33 +546,33 @@ $messages = array(
 [[Special:UnusedCategories|વણ વપરાયેલી શ�રેણીઓ]] અત�રે દર�શાવવામાં આવી નથી.
 [[Special:WantedCategories|ઈચ�છિત શ�રેણીઓ]] પણ જોઈ જ�ઓ.',
 
+# Special:LinkSearch
+'linksearch-ok' => 'શોધ',
+
 # Special:ListUsers
 'listusers-submit' => 'બતાવો',
 
 # E-mail user
 'emailuser'    => 'સભ�યને ઇ-મેલ કરો',
-'emailfrom'    => 'મોકલનાર:',
+'emailfrom'    => 'પ�રેષક:',
 'emailto'      => 'પ�રતિ:',
 'emailsubject' => 'વિષય:',
 'emailmessage' => 'સંદેશો:',
 'emailsend'    => 'મોકલો',
 
 # Watchlist
-'watchlist'            => 'મારી ધ�યાનસૂચી',
-'mywatchlist'          => 'મારી ધ�યાનસૂચિ',
-'watchlistfor'         => "('''$1'''ને માટે)",
-'addedwatch'           => 'ધ�યાનસૂચિમાં ઉમેરવામાં આવ�ય�ં છે',
-'removedwatch'         => 'ધ�યાનસૂચિમાંથી કાઢી નાંખ�ય�ં છે',
-'removedwatchtext'     => '"[[:$1]]" શિર�ષક હેઠળન�ં પાન�ં [[Special:Watchlist|તમારી ધ�યાનસૂચિમાંથી]] કાઢી નાંખવામાં આવ�ય�ં છે.',
-'watch'                => 'ધ�યાન માં રાખો',
-'watchthispage'        => 'આ પાન�ં ધ�યાનમાં રાખો',
-'unwatch'              => 'ધ�યાનસૂચિમાંથી હટાવો',
-'watchlist-details'    => 'ચર�ચા વાળા પાના ન ગણતા {{PLURAL:$1|$1 પાન�ં|$1 પાનાં}} ધ�યાનસૂચીમાં છે.',
-'watchlistcontains'    => 'તમારી ધ�યાનસૂચીમાં $1 {{PLURAL:$1|પાન�ં|પાનાં}} છે.',
-'wlshowlast'           => 'છેલ�લા $1 કલાક $2 દિવસ $3 બતાવો',
-'watchlist-hide-bots'  => 'બૉટના ફેરફાર સંતાડો',
-'watchlist-hide-own'   => 'મારા ફેરફાર સંતાડો',
-'watchlist-hide-minor' => 'નાના ફેરફાર સંતાડો',
+'watchlist'         => 'મારી ધ�યાનસૂચી',
+'mywatchlist'       => 'મારી ધ�યાનસૂચિ',
+'watchlistfor'      => "('''$1'''ને માટે)",
+'addedwatch'        => 'ધ�યાનસૂચિમાં ઉમેરવામાં આવ�ય�ં છે',
+'removedwatch'      => 'ધ�યાનસૂચિમાંથી કાઢી નાંખ�ય�ં છે',
+'removedwatchtext'  => '"[[:$1]]" શિર�ષક હેઠળન�ં પાન�ં [[Special:Watchlist|તમારી ધ�યાનસૂચિમાંથી]] કાઢી નાંખવામાં આવ�ય�ં છે.',
+'watch'             => 'ધ�યાન માં રાખો',
+'watchthispage'     => 'આ પાન�ં ધ�યાનમાં રાખો',
+'unwatch'           => 'ધ�યાનસૂચિમાંથી હટાવો',
+'watchlist-details' => 'ચર�ચા વાળા પાના ન ગણતા {{PLURAL:$1|$1 પાન�ં|$1 પાનાં}} ધ�યાનસૂચીમાં છે.',
+'watchlistcontains' => 'તમારી ધ�યાનસૂચીમાં $1 {{PLURAL:$1|પાન�ં|પાનાં}} છે.',
+'wlshowlast'        => 'છેલ�લા $1 કલાક $2 દિવસ $3 બતાવો',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'નજર રાખી રહ�યાં છો...',
@@ -558,23 +581,28 @@ $messages = array(
 'enotif_newpagetext' => 'આ નવ�ં પાન�ં છે.',
 'changed'            => 'બદલાયેલ�ં',
 
-# Delete/protect/revert
-'deletepage'                  => 'પાન�ં હટાવો',
-'confirm'                     => 'ખાતરી કરો',
-'exblank'                     => 'પાન�ં ખાલી હત�ં',
-'historywarning'              => 'ચેતવણી: જે પાન�ં તમે હટાવવા જઇ રહ�યાં છો તેનો ઇતિહાસ છે:',
-'confirmdeletetext'           => 'આપ આ પાન�ં તેના ઇતિહાસ (બધાજ પૂર�વ  ફેરફારો) સાથે હટાવી રહ�યાં છો.
+# Delete
+'deletepage'            => 'પાન�ં હટાવો',
+'confirm'               => 'ખાતરી કરો',
+'exblank'               => 'પાન�ં ખાલી હત�ં',
+'historywarning'        => 'ચેતવણી: જે પાન�ં તમે હટાવવા જઇ રહ�યાં છો તેનો ઇતિહાસ છે:',
+'confirmdeletetext'     => 'આપ આ પાન�ં તેના ઇતિહાસ (બધાજ પૂર�વ  ફેરફારો) સાથે હટાવી રહ�યાં છો.
 કૃપા કરી મંજૂરી આપો કે, આપ આમ કરવા ચાહો છો, આપ આના સરા-નરસા પરિણામોથી વાકેફ છો, અને આપ આ કૃત�ય [[{{MediaWiki:Policy-url}}|નીતિ]]ને અન�રૂપ જ કરી રહ�યાં છો.',
-'actioncomplete'              => 'કામ પૂર�ં થઈ ગય�ં',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" દૂર કરવામાં આવ�ય�ં છે.
+'actioncomplete'        => 'કામ પૂર�ં થઈ ગય�ં',
+'deletedtext'           => '"<nowiki>$1</nowiki>" દૂર કરવામાં આવ�ય�ં છે.
 તાજેતરમાં દૂર કરેલા લેખોની વિગત માટે $2 જ�ઓ.',
-'deletedarticle'              => 'હટાવવામાં આવેલા "[[$1]]"',
-'dellogpage'                  => 'હટાવેલાઓન�ં માહિતિ પત�રક (ડિલિશન લૉગ)',
-'deletecomment'               => 'હટાવવા માટેન�ં કારણ:',
-'deleteotherreason'           => 'અન�ય/વધારાન�ં કારણ:',
-'deletereasonotherlist'       => 'અન�ય કારણ',
-'rollbacklink'                => 'પાછ�ં વાળો',
+'deletedarticle'        => 'હટાવવામાં આવેલા "[[$1]]"',
+'dellogpage'            => 'હટાવેલાઓન�ં માહિતિ પત�રક (ડિલિશન લૉગ)',
+'deletecomment'         => 'હટાવવા માટેન�ં કારણ:',
+'deleteotherreason'     => 'અન�ય/વધારાન�ં કારણ:',
+'deletereasonotherlist' => 'અન�ય કારણ',
+
+# Rollback
+'rollbacklink' => 'પાછ�ં વાળો',
+
+# Protect
 'protectlogpage'              => 'સ�રક�ષા માહિતિ પત�રક',
+'prot_1movedto2'              => '[[$1]] ન�ં નામ બદલી ને [[$2]] કરવામાં આવ�ય�ં છે.',
 'protectcomment'              => 'ટિપ�પણી:',
 'protectexpiry'               => 'સમાપ�તિ:',
 'protect_expiry_invalid'      => 'સમાપ�તિનો સમય માન�ય નથી.',
@@ -585,6 +613,7 @@ $messages = array(
 'protect-expiring'            => '$1 (UTC) � સમાપ�ત થાય છે',
 'protect-cascade'             => 'આ પાનાંમાં સમાવિષ�ટ પેટા પાનાં પણ સ�રક�ષિત કરો (કૅસ�કેડીંગ સ�રક�ષા)',
 'protect-cantedit'            => 'આપ આ પાનાનાં સ�રક�ષા સ�તરમાં ફેરફાર ના કરી શકો, કેમકે આપને અહિં ફેરફાર કરવાની પરવાનગી નથી.',
+'protect-expiry-options'      => '૨ કલાક:2 hours,૧ દિવસ:1 day,૩ દિવસ:3 days,૧ સપ�તાહ:1 week,૨ સપ�તાહ:2 weeks,૧ માસ:1 month,૩ માસ:3 months,૬ માસ:6 months,૧ વર�ષ:1 year,અમર�યાદ:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'પરવાનગી:',
 'restriction-level'           => 'નિયંત�રણ સ�તર:',
 
@@ -618,7 +647,6 @@ $messages = array(
 # What links here
 'whatlinkshere'       => 'અહિયાં શ�ં જોડાય છે',
 'whatlinkshere-title' => '"$1" સાથે જોડાયેલાં પાનાં',
-'linklistsub'         => '(કડીઓની સૂચી)',
 'linkshere'           => "નીચેના પાનાઓ '''[[:$1]]''' સાથે જોડાય છે:",
 'nolinkshere'         => "'''[[:$1]]'''ની સાથે કોઇ પાના જોડાતા નથી.",
 'isredirect'          => 'પાન�ં અહીં વાળો',
@@ -736,7 +764,7 @@ $messages = array(
 'show-big-image'       => 'મહત�તમ આવર�તન',
 'show-big-image-thumb' => '<small>આ પ�ર�વાવલોકનન�ં પરિમાણ: $1 × $2 પીક�સલ</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'નવી ફાઇલોની �ાંખી',
 'noimages'  => 'જોવા માટે કશ�ં નથી.',
 'ilsubmit'  => 'શોધો',
diff --git a/languages/messages/MessagesGv.php b/languages/messages/MessagesGv.php
index 2458080f..df916b56 100644
--- a/languages/messages/MessagesGv.php
+++ b/languages/messages/MessagesGv.php
@@ -9,6 +9,25 @@
  * @author Shimmin Beg
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Meanyn',
+	NS_SPECIAL          => 'Er_lheh',
+	NS_TALK             => 'Resooney',
+	NS_USER             => 'Ymmydeyr',
+	NS_USER_TALK        => 'Resooney_ymmydeyr',
+	NS_PROJECT_TALK     => 'Resooney_$1',
+	NS_FILE             => 'Coadan',
+	NS_FILE_TALK        => 'Resooney_coadan',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Resooney_MediaWiki',
+	NS_TEMPLATE         => 'Clowan',
+	NS_TEMPLATE_TALK    => 'Resooney_clowan',
+	NS_HELP             => 'Cooney',
+	NS_HELP_TALK        => 'Resooney_cooney',
+	NS_CATEGORY         => 'Ronney',
+	NS_CATEGORY_TALK    => 'Resooney_ronney',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'        => 'Cur linnaghyn fo chianglaghyn:',
@@ -26,8 +45,6 @@ $messages = array(
 'underline-always' => 'Rieau',
 'underline-never'  => 'Dy bragh',
 
-'skinpreview' => '(Roie-haishbynys)',
-
 # Dates
 'sunday'        => 'Jedoonee',
 'monday'        => 'Jelune',
@@ -108,58 +125,60 @@ $messages = array(
 'mytalk'         => 'My resoonaght',
 'anontalk'       => "Cur loayrtys da'n IP shoh",
 'navigation'     => 'Stiureydys',
-'and'            => 'as',
+'and'            => '&#32;as',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
 
-'errorpagetitle'   => 'Marranys',
-'returnto'         => 'Goll er ash gys $1.',
-'tagline'          => 'Ass {{SITENAME}}.',
-'help'             => 'Cooney',
-'search'           => 'Ronsaghey',
-'searchbutton'     => 'Ronsaghey',
-'go'               => 'Gow',
-'searcharticle'    => 'Gow',
-'history'          => 'Shennaghys y ghuillag',
-'history_short'    => 'Shennaghys',
-'info_short'       => 'Oayllys',
-'printableversion' => 'Lhieggan clou',
-'permalink'        => 'Kiangley yiarn',
-'print'            => 'Dy chlou',
-'edit'             => 'Reaghey',
-'create'           => 'Croo',
-'editthispage'     => 'Reaghey yn duillag shoh',
-'create-this-page' => 'Croo yn duillag shoh',
-'delete'           => 'Scryss',
-'deletethispage'   => 'Scryss y duillag shoh',
-'protect'          => 'Coadee',
-'protect_change'   => 'arraghey',
-'protectthispage'  => 'Coadee yn duillag shoh',
-'newpage'          => 'Duillag noa',
-'talkpage'         => 'Resooney magh y duillag shoh',
-'talkpagelinktext' => 'Resoonaght',
-'specialpage'      => 'Duillag er lheh',
-'personaltools'    => 'Greienyn persoonagh',
-'postcomment'      => 'Cohaggloo y chur seose',
-'articlepage'      => 'Jeeagh er duillag y chummal',
-'talk'             => 'Resoonaght',
-'views'            => 'Reayrtyn',
-'toolbox'          => 'Kishtey greie',
-'userpage'         => 'Jeeagh er duillag yn ymmydeyr',
-'projectpage'      => 'Jeeagh er duillag y halee',
-'mediawikipage'    => 'Jeeagh er duillag y haghteraght',
-'templatepage'     => 'Jeeagh er duillag y chlowan',
-'viewhelppage'     => 'Jeeagh er duillag y chooney',
-'categorypage'     => 'Jeeagh er duillag ny ronnaghyn',
-'viewtalkpage'     => 'Jeeagh er resoonaght',
-'otherlanguages'   => 'Ayns çhengaghyn elley',
-'redirectedfrom'   => '(Aa-enmyssit ass $1)',
-'redirectpagesub'  => 'Duillag aa-enmys',
-'protectedpage'    => 'Duillag coadit',
-'jumpto'           => 'Gow gys:',
-'jumptonavigation' => 'stiureydys',
-'jumptosearch'     => 'ronsaghey',
+'errorpagetitle'    => 'Marranys',
+'returnto'          => 'Goll er ash gys $1.',
+'tagline'           => 'Ass {{SITENAME}}.',
+'help'              => 'Cooney',
+'search'            => 'Ronsaghey',
+'searchbutton'      => 'Ronsaghey',
+'go'                => 'Gow',
+'searcharticle'     => 'Gow',
+'history'           => 'Shennaghys y ghuillag',
+'history_short'     => 'Shennaghys',
+'info_short'        => 'Oayllys',
+'printableversion'  => 'Lhieggan clou',
+'permalink'         => 'Kiangley yiarn',
+'print'             => 'Dy chlou',
+'edit'              => 'Reaghey',
+'create'            => 'Croo',
+'editthispage'      => 'Reaghey yn duillag shoh',
+'create-this-page'  => 'Croo yn duillag shoh',
+'delete'            => 'Scryss',
+'deletethispage'    => 'Scryss y duillag shoh',
+'protect'           => 'Coadee',
+'protect_change'    => 'arraghey',
+'protectthispage'   => 'Coadee yn duillag shoh',
+'unprotect'         => 'Jee-choadee',
+'unprotectthispage' => 'Jee-choadee y duillag shoh',
+'newpage'           => 'Duillag noa',
+'talkpage'          => 'Resooney magh y duillag shoh',
+'talkpagelinktext'  => 'Resoonaght',
+'specialpage'       => 'Duillag er lheh',
+'personaltools'     => 'Greienyn persoonagh',
+'postcomment'       => 'Cohaggloo y chur seose',
+'articlepage'       => 'Jeeagh er duillag y chummal',
+'talk'              => 'Resoonaght',
+'views'             => 'Reayrtyn',
+'toolbox'           => 'Kishtey greie',
+'userpage'          => 'Jeeagh er duillag yn ymmydeyr',
+'projectpage'       => 'Jeeagh er duillag y halee',
+'mediawikipage'     => 'Jeeagh er duillag y haghteraght',
+'templatepage'      => 'Jeeagh er duillag y chlowan',
+'viewhelppage'      => 'Jeeagh er duillag y chooney',
+'categorypage'      => 'Jeeagh er duillag ny ronnaghyn',
+'viewtalkpage'      => 'Jeeagh er resoonaght',
+'otherlanguages'    => 'Ayns çhengaghyn elley',
+'redirectedfrom'    => '(Aa-enmyssit ass $1)',
+'redirectpagesub'   => 'Duillag aa-enmys',
+'protectedpage'     => 'Duillag coadit',
+'jumpto'            => 'Gow gys:',
+'jumptonavigation'  => 'stiureydys',
+'jumptosearch'      => 'ronsaghey',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Mychione {{SITENAME}}',
@@ -194,6 +213,7 @@ $messages = array(
 'editsection'             => 'reaghey',
 'editold'                 => 'reaghey',
 'viewsourceold'           => 'jeeagh er bun',
+'editlink'                => 'reaghey',
 'editsectionhint'         => 'Reaghey rheynn: $1',
 'toc'                     => 'Cummal',
 'showtoc'                 => 'taishbyney',
@@ -271,7 +291,7 @@ Aascreeu, my sailliu.",
 'noemail'                    => 'Cha nel enmys post-L recortyssit da\'n ymmydeyr "$1".',
 'passwordsent'               => 'Va fockle arrey noa currit da enmys post-L ta recortyssit da "$1".<br />
 Tra t\'eh ayd, log stiagh my sailliu.',
-'acct_creation_throttle_hit' => 'Gow my leshtal, ta $1 coontysyn crooit ayd.
+'acct_creation_throttle_hit' => 'Gow my leshtal, ta {{PLURAL:$1|1 choontys|$1 coontysyn}} crooit ayd.
 Cha nod oo ny smoo y chroo.',
 'accountcreated'             => 'Coontys crooit',
 'accountcreatedtext'         => 'Ta coontys ymmydeyr da $1 crooit.',
@@ -279,6 +299,9 @@ Cha nod oo ny smoo y chroo.',
 'loginlanguagelabel'         => 'Çhengey: $1',
 
 # Password reset dialog
+'oldpassword'         => 'Shenn-ockle yn arrey:',
+'newpassword'         => 'Fockle noa yn arrey:',
+'retypenew'           => "Aascreeu d'ockle arrey noa:",
 'resetpass_forbidden' => 'Cha nod focklyn arrey y arraghey er {{SITENAME}}',
 
 # Edit page toolbar
@@ -302,8 +325,8 @@ Cha nod oo ny smoo y chroo.',
 'hr_tip'          => 'Linney cochruinnagh (ymmyd dy spaarailagh)',
 
 # Edit pages
-'summary'                => 'Giare-choontey',
-'subject'                => 'Cooish/kione-linney',
+'summary'                => 'Giare-choontey:',
+'subject'                => 'Cooish/kione-linney:',
 'minoredit'              => 'She myn-arraghey eh shoh',
 'watchthis'              => 'Freill arrey er y duillag shoh',
 'savearticle'            => 'Sauail y duillag',
@@ -314,8 +337,8 @@ Cha nod oo ny smoo y chroo.',
 'anoneditwarning'        => "'''Raaue:''' Cha nel ou loggit stiagh.
 Bee dt'enmys IP recortyssit ayns shennaghys reaghey yn duillag shoh.",
 'missingcommenttext'     => 'Taggloo er heese, my sailt.',
-'summary-preview'        => 'Roie-haishbynys y ghiare-choontey',
-'subject-preview'        => 'Roie-haishbynys cooish/kione-linney',
+'summary-preview'        => 'Roie-haishbynys y ghiare-choontey:',
+'subject-preview'        => 'Roie-haishbynys cooish/kione-linney:',
 'blockedtitle'           => "Ta'n ymmydeyr glast magh",
 'blockedtext'            => "<big>'''Ta dt'ennym ymmydeyr ny dt'enmys IP currit fo ghlass.'''</big>
 
@@ -338,19 +361,19 @@ She $3 dt'enmys IP roie, as she dt'enney ghlass na #$5. Cur ad lesh dagh ooilley
 Son dy chroo y duillag, gow toshiaght screeuyn ‘sy chishtey çheu heese jeh shoh (jeeagh er [[{{MediaWiki:Helppage}}|duillag y chooney]] son ny smoo fys).  
 My haink oo dys shoh trooid marranys, crig er cramman ‘erash’ yn jeeagheyder ayd.',
 'noarticletext'          => 'Cha nel teks ayns y ghuillag shoh, foddee-shiu [[Special:Search/{{PAGENAME}}|ronsaghey yn enmys duillag shoh]] ayns duillagyn elley ny [{{fullurl:{{FULLPAGENAME}}|action=edit}} reaghey yn duillag shoh].',
-'note'                   => '<strong>Note:</strong>',
-'previewnote'            => '<strong>Ta shoh roie-haishbynys;
-cha nel ny caghlaaghyn sauailt foast!</strong>',
+'note'                   => "'''Note:'''",
+'previewnote'            => "'''Ta shoh roie-haishbynys;
+cha nel ny caghlaaghyn sauailt foast!'''",
 'editing'                => 'Reaghey $1',
 'editingsection'         => 'Reaghey $1 (rheynn)',
 'editingcomment'         => 'Reaghey $1 (cohaggloo)',
 'yourtext'               => 'Dty heks',
 'storedversion'          => 'Lhieggan stoyrit',
 'yourdiff'               => 'Anchaslysyn',
-'copyrightwarning'       => 'Cur tastey my saillt: my t’ou cur red erbee da {{SITENAME}}, t’eh toiggit dy vel oo cur magh eh rere yn $2 (jeeagh er $1 son ny smoo fys).  Mannagh by vie lhiat dy beagh sleih elley reaghey dty obbyr gyn myghin as skeaylley eh dy seyr, ny chur roish eh ayns shoh.
+'copyrightwarning'       => "Cur tastey my saillt: my t’ou cur red erbee da {{SITENAME}}, t’eh toiggit dy vel oo cur magh eh rere yn $2 (jeeagh er $1 son ny smoo fys).  Mannagh by vie lhiat dy beagh sleih elley reaghey dty obbyr gyn myghin as skeaylley eh dy seyr, ny chur roish eh ayns shoh.
 <br />
 Chammah as shen, t’ou gialdyn dooin dy screeu oo hene eh, ny ren oo coip jeh ny ta fo çhiarnys y theay, ny ry-gheddyn dy seyr.
-<strong>NY CHUR ROISH GYN KIED OBBYR TA FO COIP-CHIART! </strong>',
+'''NY CHUR ROISH GYN KIED OBBYR TA FO COIP-CHIART! '''",
 'templatesused'          => 'Clowanyn ymmydit er y duillag shoh:',
 'templatesusedpreview'   => 'Clowanyn ymmydit ayns y roie-haishbynys shoh:',
 'template-protected'     => '(glast)',
@@ -371,7 +394,7 @@ Ta lioar ny scryssaghyn magh kiarit ayns shoh rere dty chaays hene:",
 'viewpagelogs'        => 'Jeeagh er lioaryn chooishyn y ghuillag shoh',
 'currentrev'          => 'Aavriwnys immeeaght',
 'revisionasof'        => 'Aavriwnys veih $1',
-'revision-info'       => 'Aavriwnys veih $1 ec $2',
+'revision-info'       => 'Aavriwnys veih $1 ec $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Aavriwnys ny shinney',
 'nextrevision'        => 'Aavriwnys ny saa→',
 'currentrevisionlink' => 'Jeeagh er yn aavriwnys immeeaght',
@@ -420,9 +443,10 @@ Ta lioar ny scryssaghyn magh kiarit ayns shoh rere dty chaays hene:",
 'searchresults'            => 'Eiyrtysyn y ronsaghey',
 'noexactmatch'             => "'''Cha nel duillag lesh yn ennym \"\$1\".'''
 Foddee oo [[:\$1|croo yn duillag shoh]].",
-'prevn'                    => 'ny $1 roish',
-'nextn'                    => 'yn chied $1 elley',
+'prevn'                    => '$1 roish shoh',
+'nextn'                    => 'nah $1',
 'viewprevnext'             => 'Jeeagh er ($1) ($2) ($3)',
+'searchhelp-url'           => 'Help:Cummal',
 'search-result-score'      => 'Bentynys: $1%',
 'search-section'           => '(rheynn $1)',
 'search-suggest'           => "T'ou çheet er: $1",
@@ -440,6 +464,7 @@ Foddee oo [[:\$1|croo yn duillag shoh]].",
 'qbsettings-none'      => 'Veg',
 'changepassword'       => 'Fockle yn arrey y cheaghley',
 'skin'                 => 'Crackan',
+'skin-preview'         => 'Roie-haishbynys',
 'dateformat'           => 'Kiaddey yn date',
 'datetime'             => 'Date as am',
 'math_syntax_error'    => 'Co-ordrail marranagh',
@@ -448,9 +473,6 @@ Foddee oo [[:\$1|croo yn duillag shoh]].",
 'prefs-watchlist'      => 'Rolley arrey',
 'prefs-watchlist-days' => 'Laaghyn y haishbyney ayns rolley arrey:',
 'saveprefs'            => 'Sauail',
-'oldpassword'          => 'Shenn-ockle yn arrey:',
-'newpassword'          => 'Fockle noa yn arrey:',
-'retypenew'            => "Aascreeu d'ockle arrey noa:",
 'textboxsize'          => 'Reaghey',
 'columns'              => 'Collooyn:',
 'searchresultshead'    => 'Ronsaghey',
@@ -496,19 +518,21 @@ Foddee oo [[:\$1|croo yn duillag shoh]].",
 'rightsnone' => '(veg)',
 
 # Recent changes
-'nchanges'                       => '$1 {{PLURAL:$1|caghlaa|caghlaaghyn}}',
+'nchanges'                       => '$1 {{PLURAL:$1|caghlaa|chaghlaa|chaghlaa|caghlaaghyn}}',
 'recentchanges'                  => "Caghlaaghyn s'noa",
+'recentchanges-legend'           => "Reihyssyn da ny caghlaaghyn s'noa",
+'recentchangestext'              => "Shirrey ny caghlaaghyn s'noa da'n wiki er y ghuillag shoh.",
 'recentchanges-feed-description' => 'Lorgey ny caghlaaghyn jeianagh er y wiki ayns y veaghey shoh.',
-'rcnote'                         => "Ny ta heese, she {{PLURAL:$1|yn '''1''' caghlaa|ny '''$1''' caghlaaghyn s'jerree}} ayns {{PLURAL:$2|yn laa|ny '''$2''' laaghyn s'jerree}}, kiart ec $4, $5.",
+'rcnote'                         => "Ny ta heese, she {{PLURAL:$1|ny '''$1''' caghlaa|yn '''$1''' chaghlaa|ny '''$1''' chaghlaa|ny '''$1''' caghlaaghyn}} s'jerree ayns {{PLURAL:$2|ny '''$2''' laa|yn '''$2''' laa|ny '''$2''' laa|ny '''$2''' laaghyn}} s'jerree, kiart ec $4, $5.",
 'rcnotefrom'                     => "Shoh heese ny caghlaaghyn veih '''$2''' (gys '''$1''' taishbynit).",
 'rclistfrom'                     => "Taishbyney caghlaaghyn s'noa veih $1",
-'rcshowhideminor'                => '$1 myn-arraghyn',
-'rcshowhidebots'                 => '$1 robotyn',
-'rcshowhideliu'                  => '$1 ymmydeyryn ta loggit stiagh',
-'rcshowhideanons'                => '$1 ymmydeyryn neuenmyssit',
+'rcshowhideminor'                => '{{PLURAL:$1|$1 myn-arraghey|$1 vyn-arraghey|$1 vyn-arraghey|$1 myn-arraghyn}}',
+'rcshowhidebots'                 => '{{PLURAL:$1|$1 robot|$1 robot|$1 robot|$1 robotyn}}',
+'rcshowhideliu'                  => '{{PLURAL:$1|$1 ymmydeyr|$1 ymmydeyr|$1 ymmydeyr|$1 ymmydeyryn}} ta loggit stiagh',
+'rcshowhideanons'                => '{{PLURAL:$1|$1 ymmydeyr|$1 ymmydeyr|$1 ymmydeyr|$1 ymmydeyryn}} neuenmyssit',
 'rcshowhidepatr'                 => '$1 arraghyn patrolaghit',
 'rcshowhidemine'                 => "$1 m'arraghyn",
-'rclinks'                        => "Soilshaghey caghlaa(ghyn) $1 s'jerree ayns yn/ny $2 laa(ghyn) s'jerree<br />$3",
+'rclinks'                        => "Soilshaghey {{PLURAL:$1|ny $1 caghlaa|yn $1 chaghlaa|ny $1 chaghlaa|ny $1 caghlaaghyn}} s'jerree ayns {{PLURAL:$2|ny $2 laa|yn $2 laa|ny $2 laa|ny $2 laaghyn}} s'jerree<br />$3",
 'diff'                           => 'anch',
 'hist'                           => 'shen',
 'hide'                           => 'Follaghey',
@@ -530,7 +554,7 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'uploadbtn'         => 'Laadey neese coadan',
 'reupload'          => 'Aalaadey neese',
 'uploadnologin'     => 'Cha nel oo loggit stiagh',
-'uploadlogpage'     => 'Laadey lioar chooishyn neese',
+'uploadlogpage'     => 'Lioar laadyn neese',
 'filename'          => 'Ennym y choadan',
 'filedesc'          => 'Giare-choontey',
 'fileuploadsummary' => 'Giare-choontey:',
@@ -550,16 +574,16 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'license-nopreview'  => '(Cha nel roie-haishbynys ry-gheddyn)',
 'upload_source_file' => ' (coadan er dty cho-earrooder)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => 'coadan',
-'imagelist'             => 'Rolley coadanyn',
-'imagelist_date'        => 'Date',
-'imagelist_name'        => 'Ennym',
-'imagelist_user'        => 'Ymmydeyr',
-'imagelist_size'        => 'Mooadys',
-'imagelist_description' => 'Coontey',
-
-# Image description page
+'listfiles'             => 'Rolley coadanyn',
+'listfiles_date'        => 'Date',
+'listfiles_name'        => 'Ennym',
+'listfiles_user'        => 'Ymmydeyr',
+'listfiles_size'        => 'Mooadys',
+'listfiles_description' => 'Coontey',
+
+# File description page
 'filehist'                       => 'Shennaghys y choadan',
 'filehist-help'                  => 'Crig er date/traa ennagh son dy ‘akin y coadan myr v’eh ec y traa shen.',
 'filehist-deleteall'             => 'scryss ooilley',
@@ -572,7 +596,7 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'filehist-filesize'              => 'Mooadys y choadan',
 'filehist-comment'               => 'Cohaggloo',
 'imagelinks'                     => 'Kianglaghyn',
-'linkstoimage'                   => 'Ta {{PLURAL:$1|an duillag|$1 ny duillagyn}} eiyrtyssagh kianglt lesh y coadan shoh:',
+'linkstoimage'                   => 'Ta {{PLURAL:$1|ny $1 duillag|yn $1 duillag|ny $1 ghuillag|ny $1 duillagyn}} eiyrtyssagh kianglt lesh y coadan shoh:',
 'nolinkstoimage'                 => 'Cha nel duillag erbee kianglt lesh y coadan shoh.',
 'sharedupload'                   => "Ta'n coadan shoh ny laadey neese rheynnit, as foddee er dy ve ymmydit ayns shalleeghyn elley.",
 'shareduploadwiki-linktext'      => 'duillag huarastyl y choadan',
@@ -616,9 +640,8 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'randomredirect' => 'Aa-enmys gyn tort',
 
 # Statistics
-'statistics' => 'Staydraa',
-'sitestats'  => 'Staydraa {{SITENAME}}',
-'userstats'  => 'Staydraa yn ymmydeyr',
+'statistics'              => 'Staydraa',
+'statistics-header-users' => 'Staydraa yn ymmydeyr',
 
 'disambiguations' => 'Duillagyn reddaghyn',
 
@@ -635,10 +658,10 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'fewestrevisions' => 'Duillagyn lesh y chooid by loo jeh dy chooilley arraghey',
 
 # Miscellaneous special pages
-'nbytes'                  => '$1 {{PLURAL:$1|byte|byteyn}}',
+'nbytes'                  => '$1 {{PLURAL:$1|byte|vyte|byte|byteyn}}',
 'ncategories'             => '$1 {{PLURAL:$1|ronney|ronnaghyn}}',
-'nlinks'                  => '$1 {{PLURAL:$1|kiangley|kianglaghyn}}',
-'nmembers'                => '$1 {{PLURAL:$1|oltey|olteynyn}}',
+'nlinks'                  => '$1 {{PLURAL:$1|kiangley|chiangley|chiangley|kianglaghyn}}',
+'nmembers'                => '$1 {{PLURAL:$1|oltey|oltey|oltey|olteynyn}}',
 'lonelypages'             => 'Duillagyn treoghe',
 'uncategorizedpages'      => 'Duillagyn gyn ronney',
 'uncategorizedcategories' => 'Ronnaghyn gyn ronney',
@@ -667,8 +690,8 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'ancientpages'            => 'Duillagyn by hinney',
 'move'                    => 'Scughey',
 'movethispage'            => 'Yn duillag shoh y scughey',
-'pager-newer-n'           => "{{PLURAL:$1|1 s'noa|$1 s'noa}}",
-'pager-older-n'           => '{{PLURAL:$1|1 shinney|$1 shinney}}',
+'pager-newer-n'           => "$1 ny s'noa",
+'pager-older-n'           => '$1 ny shinney',
 'suppress'                => 'Meehastid',
 
 # Book sources
@@ -680,7 +703,6 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'speciallogtitlelabel' => 'Ennym:',
 'log'                  => 'Lioaryn cooishyn',
 'all-logs-page'        => 'Dagh ooilley lioar chooishyn',
-'log-search-submit'    => 'Gow',
 
 # Special:AllPages
 'allpages'       => 'Dagh ooilley ghuillag',
@@ -696,9 +718,15 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'special-categories-sort-count' => 'sorçhaghey rere coontey',
 'special-categories-sort-abc'   => 'sorçhaghey rere lettyr',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Ronsaghey',
+
 # Special:ListUsers
 'listusers-submit' => 'Taishbyney',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Ymmydeyr noa',
+
 # Special:ListGroupRights
 'listgrouprights-group'    => 'Possan',
 'listgrouprights-rights'   => 'Kiartyn',
@@ -716,27 +744,24 @@ Ta duillagyn er [[Special:Watchlist|dty rolley arrey]] ayns '''clou trome'''.",
 'emailsenttext'  => 'Ta dty phost-L currit.',
 
 # Watchlist
-'watchlist'            => 'My rolley arrey',
-'mywatchlist'          => 'My rolley arrey',
-'watchlistfor'         => "(son '''$1''')",
-'watchnologin'         => 'Cha nel oo loggit stiagh',
-'addedwatch'           => 'Currit rish y rolley arrey',
-'addedwatchtext'       => "Va'n duillag \"[[:\$1]]\" currit lesh dty [[Special:Watchlist|rolley arrey]].<br />
+'watchlist'         => 'My rolley arrey',
+'mywatchlist'       => 'My rolley arrey',
+'watchlistfor'      => "(son '''$1''')",
+'watchnologin'      => 'Cha nel oo loggit stiagh',
+'addedwatch'        => 'Currit rish y rolley arrey',
+'addedwatchtext'    => "Va'n duillag \"[[:\$1]]\" currit lesh dty [[Special:Watchlist|rolley arrey]].<br />
 Bee caghlaaghyn jeant er y duillag shoh as e ghuillag resoonaght ry-akin ayns y rolley shoh, as bee '''clou trome''' er ayns rolley ny [[Special:RecentChanges|caghlaaghyn s'noa]].",
-'removedwatch'         => 'Gowit ass y rolley arrey',
-'removedwatchtext'     => 'Va\'n duillag "[[:$1]]" gowit ass dty [[Special:Watchlist|rolley arrey]].',
-'watch'                => 'Freill arrey',
-'watchthispage'        => 'Freill arrey er y duillag shoh',
-'unwatch'              => 'Cur stap er arrey',
-'unwatchthispage'      => 'Cur stap er arrey',
-'notanarticle'         => 'Cha nel eh shoh ny ghuillag cummal',
-'notvisiblerev'        => "Va'n aavriwnys scryssit",
-'watchlist-details'    => '{{PLURAL:$1|$1 duillag|$1 duillagyn}} er dty rolley arrey, faagail magh duillagyn resoonaght.',
-'watchlistcontains'    => 'Ta $1 {{PLURAL:$1|duillag|duillagyn}} ayns dty rolley arrey.',
-'wlshowlast'           => "Taishbyney ny $1 ooryn $2 laaghyn $3 s'jerree",
-'watchlist-hide-bots'  => 'Follaghey arraghyn robotyn',
-'watchlist-hide-own'   => "Follaghey m'arraghyn",
-'watchlist-hide-minor' => 'Follaghey ny myn-arraghyn',
+'removedwatch'      => 'Gowit ass y rolley arrey',
+'removedwatchtext'  => 'Va\'n duillag "[[:$1]]" gowit ass dty [[Special:Watchlist|rolley arrey]].',
+'watch'             => 'Freill arrey',
+'watchthispage'     => 'Freill arrey er y duillag shoh',
+'unwatch'           => 'Cur stap er arrey',
+'unwatchthispage'   => 'Cur stap er arrey',
+'notanarticle'      => 'Cha nel eh shoh ny ghuillag cummal',
+'notvisiblerev'     => "Va'n aavriwnys scryssit",
+'watchlist-details' => 'Ta {{PLURAL:$1|$1 duillag|$1 duillag|$1 ghuillag|$1 duillagyn}} er dty rolley arrey, faagail magh duillagyn resoonaght.',
+'watchlistcontains' => 'Ta $1 {{PLURAL:$1|duillag|duillagyn}} ayns dty rolley arrey.',
+'wlshowlast'        => "Taishbyney ny $1 ooryn $2 laaghyn $3 s'jerree",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Jannoo arrey...',
@@ -748,40 +773,45 @@ Bee caghlaaghyn jeant er y duillag shoh as e ghuillag resoonaght ry-akin ayns y
 'created'                      => 'crooit',
 'enotif_anon_editor'           => 'ymmydeyr $1 neuenmyssit',
 
-# Delete/protect/revert
-'deletepage'                  => 'Scryss y duillag',
-'confirm'                     => 'Feeraghey',
-'excontent'                   => "v'eh ny chummal na: '$1'",
-'exblank'                     => "va'n duillag follym",
-'delete-confirm'              => 'Scryss "$1"',
-'delete-legend'               => 'Scryss',
-'historywarning'              => 'Raaue: Ta shennaghys ec y duillag ta shiu er-chee scryssey magh:',
-'confirmdeletetext'           => 'Ta shiu er-chee scryssey magh duillag chammah as y shennaghys echey.<br />
+# Delete
+'deletepage'            => 'Scryss y duillag',
+'confirm'               => 'Feeraghey',
+'excontent'             => "v'eh ny chummal na: '$1'",
+'exblank'               => "va'n duillag follym",
+'delete-confirm'        => 'Scryss "$1"',
+'delete-legend'         => 'Scryss',
+'historywarning'        => 'Raaue: Ta shennaghys ec y duillag ta shiu er-chee scryssey magh:',
+'confirmdeletetext'     => 'Ta shiu er-chee scryssey magh duillag chammah as y shennaghys echey.<br />
 Feeraghey dy vel eh yn shalee ayd eh y yannoo, as dy vel ny scanshyn toiggit ayns, as dy vel shiu jannoo eh shen ayns coardailys rish [[{{MediaWiki:Policy-url}}|y polasee]].',
-'actioncomplete'              => 'Obbraghey creaghnit',
-'deletedtext'                 => 'Ta "<nowiki>$1</nowiki>" scrysst.<br />
+'actioncomplete'        => 'Obbraghey creaghnit',
+'deletedtext'           => 'Ta "<nowiki>$1</nowiki>" scrysst.<br />
 Jeeagh er $2 son recortys ny scryssaghyn magh jeianagh.',
-'deletedarticle'              => '"[[$1]]" scryssit',
-'dellogpage'                  => 'Lioar scryssaghyn magh',
-'deletecomment'               => 'Fa son scryssey magh:',
-'deleteotherreason'           => 'Fa elley/tooilley:',
-'deletereasonotherlist'       => 'Fa elley',
-'deletereason-dropdown'       => '*Fa scryssey cadjin
+'deletedarticle'        => '"[[$1]]" scryssit',
+'dellogpage'            => 'Lioar scryssaghyn magh',
+'deletecomment'         => 'Fa son scryssey magh:',
+'deleteotherreason'     => 'Fa elley/tooilley:',
+'deletereasonotherlist' => 'Fa elley',
+'deletereason-dropdown' => '*Fa scryssey cadjin
 ** Aghin yn ughtar
 ** Brishey choip-chiart
 ** Cragheydys',
-'rollback_short'              => 'Aaymmyd',
-'rollbacklink'                => 'aaymmyd',
-'editcomment'                 => 'Va "<i>$1</i>" ny chohaggloo yn reaghey.', # only shown if there is an edit comment
+
+# Rollback
+'rollback_short' => 'Aaymmyd',
+'rollbacklink'   => 'aaymmyd',
+'editcomment'    => "Va \"''\$1''\" ny chohaggloo yn reaghey.", # only shown if there is an edit comment
+
+# Protect
 'protectlogpage'              => 'Lioar coadee',
 'protectedarticle'            => '"[[$1]]" glast',
+'prot_1movedto2'              => '[[$1]] aa-enmyssit myr [[$2]]',
 'protectcomment'              => 'Cohaggloo:',
 'protectexpiry'               => 'Jerrey:',
-'protect-text'                => 'Foddee oo jeeagh er as arraghey yn rea choadee ayns shoh son y duillag <strong><nowiki>$1</nowiki></strong>.',
+'protect-text'                => "Foddee oo jeeagh er as arraghey yn rea choadee ayns shoh son y duillag '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "Cha nel kied ec dty choontys dys arraghey cormidyn coadee.<br />
-Shoh ny reaghaghyn roie da'n duillag <strong>$1</strong>:",
+Shoh ny reaghaghyn roie da'n duillag '''$1''':",
 'protect-default'             => '(cadjinit)',
-'protect-fallback'            => 'Ta feme kied "$1" ayd',
+'protect-fallback'            => 'Ta feme er kied "$1" ayd',
 'protect-level-autoconfirmed' => 'Cur fo ghlass ymmydeyryn neurecortit',
 'protect-level-sysop'         => 'Reireyderyn ynrican',
 'protect-summary-cascade'     => 'spooytey',
@@ -790,6 +820,7 @@ Shoh ny reaghaghyn roie da'n duillag <strong>$1</strong>:",
 'protect-cantedit'            => 'You cannot change the protection levels of this page, because you do not have permission to edit it.
 
 Cha nod oo caghlaa keim choadey y ghuillag shoh.  Cha nel kied ayd dy reaghey eh.',
+'protect-expiry-options'      => '2 oor:2 hours,1 laa:1 day,3 laaghyn:3 days,1 hiaghtin:1 week,2 hiaghtin:2 weeks,1 vee:1 month,3 meeghyn:3 months,6 meeghyn:6 months,1 vlein:1 year,neuyerrinagh:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Kied:',
 'restriction-level'           => 'Rea teorey:',
 
@@ -829,7 +860,7 @@ Cha nod oo caghlaa keim choadey y ghuillag shoh.  Cha nel kied ayd dy reaghey eh
 
 'sp-contributions-newbies'     => 'Gyn taishbyney agh cohortyssyn choontyssyn noa',
 'sp-contributions-newbies-sub' => 'Lesh coontysyn noa',
-'sp-contributions-blocklog'    => 'Cur lhiettrimys er lioar chooishyn',
+'sp-contributions-blocklog'    => 'Lioar chooishyn lhiettrimyssyn',
 'sp-contributions-search'      => 'Ronsaghey cohortyssyn',
 'sp-contributions-username'    => 'Enmys IP ny ennym yn ymmydeyr:',
 'sp-contributions-submit'      => 'Ronsaghey',
@@ -838,13 +869,12 @@ Cha nod oo caghlaa keim choadey y ghuillag shoh.  Cha nel kied ayd dy reaghey eh
 'whatlinkshere'            => 'Cre ta kianglt lesh shoh',
 'whatlinkshere-title'      => 'Duillagyn ta kianglt lesh $1',
 'whatlinkshere-page'       => 'Duillag:',
-'linklistsub'              => '(Rolley kianglaghyn)',
 'linkshere'                => "Ta ny kied duillagyn elley kianglt lesh '''[[:$1]]''':",
 'nolinkshere'              => "Cha nel duillag erbee kianglt lesh '''[[:$1]]'''.",
 'isredirect'               => 'duillag aa-enmyssit',
 'istemplate'               => 'goaill stiagh',
-'whatlinkshere-prev'       => '{{PLURAL:$1|roish|y chied $1 roish}}',
-'whatlinkshere-next'       => '{{PLURAL:$1|elley|y chied $1 elley}}',
+'whatlinkshere-prev'       => '$1 roish shoh',
+'whatlinkshere-next'       => 'nah $1',
 'whatlinkshere-links'      => '� kianglaghyn',
 'whatlinkshere-hideredirs' => 'duillagyn aa-enmyssit $1',
 'whatlinkshere-hidelinks'  => 'kianglaghyn $1',
@@ -891,6 +921,7 @@ Cha nod oo caghlaa keim choadey y ghuillag shoh.  Cha nel kied ayd dy reaghey eh
 'move-page'               => '$1 y scughey',
 'move-page-legend'        => 'Duillag y scughey',
 'movearticle'             => 'Duillag y scughey:',
+'movenologin'             => 'Cha nel oo loggit stiagh',
 'newtitle'                => 'Gys ard-ennym noa:',
 'move-watch'              => 'Freill arrey er y duillag shoh',
 'movepagebtn'             => 'Yn duillag y scughey',
@@ -926,6 +957,7 @@ Jean covestey eddyr oc er laueyn, my sailliu.'''",
 'thumbnail_error' => 'Marranys ingin-ordaag y chroo: $1',
 
 # Special:Import
+'import-comment'     => 'Cohaggloo:',
 'importbadinterwiki' => 'Droghchiangley eddyrwiki',
 'importnotext'       => 'Follym ny gyn teks',
 
@@ -978,10 +1010,10 @@ Jean covestey eddyr oc er laueyn, my sailliu.'''",
 'tooltip-watch'                   => 'Cur y duillag shoh lesh dty rolley arrey',
 
 # Attribution
-'anonymous' => 'Ymmeyder(yn) neuenmyssit dy {{SITENAME}}',
+'anonymous' => '{{PLURAL:$1|Ymmeyder|Ymmeyderny}} neuenmyssit dy {{SITENAME}}',
 'siteuser'  => 'ymmydeyr {{SITENAME}} $1',
 'others'    => 'sleih elley',
-'siteusers' => 'Ymmydeyr(yn) ec {{SITENAME}} $1',
+'siteusers' => '{{PLURAL:$2|Ymmydeyr|Ymmydeyryn}} ec {{SITENAME}} $1',
 
 # Info page
 'infosubtitle' => 'Oayllys da duillag',
@@ -998,13 +1030,13 @@ Jean covestey eddyr oc er laueyn, my sailliu.'''",
 
 # Media information
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|duillag|duillagyn}}',
-'file-info-size'       => '($1 × $2 pixel, mooadys y choadan: $3, sorçh MIME: $4)',
+'file-info-size'       => '($1 × {{PLURAL:$2|$2 pixel|$2 phixel|$2 phixel|$2 pixelyn}}, mooadys y choadan: $3, sorçh MIME: $4)',
 'file-nohires'         => '<small>Cha nel jeeskeaylley ny smoo ry-gheddyn.</small>',
-'svg-long-desc'        => '(coadan SVG, $1 × $2 pixelyn dy ennymagh, mooadys y choadan: $3)',
+'svg-long-desc'        => '(coadan SVG, $1 × {{PLURAL:$2|$2 pixel|$2 phixel|$2 phixel|$2 pixelyn}} dy ennymagh, mooadys y choadan: $3)',
 'show-big-image'       => 'Jeeskeaylley ymlane',
-'show-big-image-thumb' => '<small>Mooadys y roie-haishbynys shoh: $1 × $2 pixelyn</small>',
+'show-big-image-thumb' => '<small>Mooadys y roie-haishbynys shoh: $1 × {{PLURAL:$2|$2 pixel|$2 phixel|$2 phixel|$2 pixelyn}}</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'    => 'Laaragh coadanyn noa',
 'showhidebots' => '($1 botyn)',
 'ilsubmit'     => 'Ronsaghey',
diff --git a/languages/messages/MessagesHak.php b/languages/messages/MessagesHak.php
index ae9f34fc..bc0dfe8f 100644
--- a/languages/messages/MessagesHak.php
+++ b/languages/messages/MessagesHak.php
@@ -54,8 +54,6 @@ $messages = array(
 'underline-never'   => 'Chhiùng put sṳ�-yung',
 'underline-default' => 'Hi-khí yi-thin',
 
-'skinpreview' => '(Yi-ko)',
-
 # Dates
 'sunday'        => 'Lî-pai-ngit',
 'monday'        => 'Lî-pai-yit',
@@ -140,7 +138,7 @@ $messages = array(
 'mytalk'         => 'Ngô-ke tui-fa-hong',
 'anontalk'       => 'Ke-IP ke tui-fa hong',
 'navigation'     => 'Thô-hòng',
-'and'            => 'lâu',
+'and'            => '&#32;lâu',
 
 # Metadata in edit box
 'metadata_help' => 'Ngièn sṳ-kí:',
@@ -203,8 +201,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Yû-kôan {{SITENAME}}',
 'aboutpage'            => 'Project:Kôan-yî',
-'bugreports'           => 'Chho-ngu po-ko',
-'bugreportspage'       => 'Project:Chho-ngu po-ko',
 'copyright'            => 'Pún-chham ke chhiòn-phu vùn-pún nui-yùng chhai $1 chṳ̂ thiàu-khóan hâ thì-kiûng.',
 'copyrightpagename'    => '{{SITENAME}} pán-khièn',
 'copyrightpage'        => '{{ns:project}}:Pán-khièn sin-sit',
@@ -227,8 +223,6 @@ $messages = array(
 
 'badaccess'        => 'Khièn-han chho-ngu',
 'badaccess-group0' => 'Ngì kông-chhòi ke chhiáng-khiù mò yún-chún chṳp-hàng.',
-'badaccess-group1' => 'Ngì kông-chhòi ke chhiáng-khiù chṳ�-yû $1 yung-fu-chû ke yung-fu chhòi-nèn sṳ�-yung.',
-'badaccess-group2' => 'Ngì kông-chhòi ke chhiáng-khiù chṳ�-yû $1 yung-fu-chû ke yung-fu chhòi-nèn sṳ�-yung.',
 'badaccess-groups' => 'Ngì kông-chhòi ke chhiáng-khiù chṳ�-yû $1 yung-fu-chû ke yung-fu chhòi-nèn sṳ�-yung.',
 
 'versionrequired'     => 'Sî-yeu MediaWiki $1-pán',
@@ -243,6 +237,8 @@ $messages = array(
 'editsection'             => 'phiên-siá',
 'editold'                 => 'phiên-cho',
 'viewsourceold'           => 'Tshà-khon Kîn-ngièn',
+'editlink'                => 'piên-sip',
+'viewsourcelink'          => 'tshà-khon kîn-ngièn',
 'editsectionhint'         => 'Phiên-siá thon-lo�k: $1',
 'toc'                     => 'Muk-liu�k',
 'showtoc'                 => 'Hién-sṳ',
@@ -299,7 +295,6 @@ $messages = array(
 'cannotdelete'         => 'Mò-fap chhù-thet sién-thin ke vùn-chông fe�t-he thù-chhiong (Kí khó-nèn yí-kîn pûn khì-thâ-ngìn chhù-hi liáu).',
 'badtitle'             => 'Chho-ngu ke phêu-thì',
 'badtitletext'         => 'Só chhiáng-khiù hong-mien ke phêu-thì he mò-háu ke, mò-chhùn-chhai, khiam-ko ngî-ngièn fe�t-chá khiam-ko wiki lièn-kiet ke phêu-thì chho-ngu.',
-'perfdisabled'         => 'Tui-put-hí! Yîn-vi chhâu-chok yû khó-nèn chho-sṳ̀n chṳ̂-liau-lhu thân-fûng, muk-chhièn chhiam-sṳ̀ mò-fap sṳ�-yung.',
 'perfcached'           => 'Yî-ha chṳ̂-liau lòi-chhṳ khoai-chhí, khó-nèn yû chho-ngu.',
 'perfcachedts'         => 'Yî-ha he khoai-chhí chṳ̂-liau, chui-heu kiên-sîn sṳ̀-kiên he $1.',
 'querypage-no-updates' => 'Tông-chhièn  kim-chṳ� tui chhṳ�-chông chin-hàng kiên-sîn. Chhṳ�-chhu ke chṳ̂-liau chiông put-nèn pûn chhùng-sîn chṳ�n-lî.',
@@ -322,8 +317,8 @@ Chhà-khon: $2',
 
 # Login and logout pages
 'logouttitle'                => 'Yung-fu thui-chhut',
-'logouttext'                 => '<strong>Ngì hien-chhai yí-kîn thui-chhut.</strong><br />
-Ngì khó-yî ki-siu�k yî ngia�k-miàng fông-sṳt sṳ�-yung {{SITENAME}}, fe�t-chá chai-chhṳ yî siông-thùng fe�t-he mò-thùng yung-fu sṳ̂n-fun tên-ngi�p.',
+'logouttext'                 => "'''Ngì hien-chhai yí-kîn thui-chhut.'''<br />
+Ngì khó-yî ki-siu�k yî ngia�k-miàng fông-sṳt sṳ�-yung {{SITENAME}}, fe�t-chá chai-chhṳ yî siông-thùng fe�t-he mò-thùng yung-fu sṳ̂n-fun tên-ngi�p.",
 'welcomecreation'            => '<h2>Fôn-ngiàng, $1!</h2><p>Ngì-ke chong-ho yí-kîn kien-li�p, put-yeu mong-ki sat-chṳ {{SITENAME}} ke-ngìn chhâm-sṳ.</p>',
 'loginpagetitle'             => 'Yung-fu tên-ngi�p',
 'yourname'                   => 'Yung-fu-miàng',
@@ -332,7 +327,6 @@ Ngì khó-yî ki-siu�k yî ngia�k-miàng fông-sṳt sṳ�-yung {{SITENAME}},
 'remembermypassword'         => 'Hâ-chhṳ tên-ngi�p ki-he�t pi-me�t.',
 'yourdomainname'             => 'Ngì ke mióng',
 'externaldberror'            => 'Liá-ke khó-nèn he chhut-yì ngoi-phu ngiam-chṳn chṳ̂-liau-khu chho-ngu fe�t-chá ngì pûn-ngìn kim-chṳ� kiên-sîn ngì-ke ngoi-phu chong-ho.',
-'loginproblem'               => '<b>Tên-liu�k yû mun-thì.</b><br />Chai chhṳ yit-chhṳ�',
 'login'                      => 'Tên-ngi�p',
 'nav-login-createaccount'    => 'Tên-ngi�p / Kien-li�p sîn chong-ho',
 'loginprompt'                => 'Yeu tên-ngi�p to {{SITENAME}}, ngì pit-sî khí-yung cookie kûng-nèn',
@@ -385,7 +379,7 @@ Tshòng-tón pit-sî chhai $1-ke sṳ-ngièn yî-ha.',
 'acct_creation_throttle_hit' => 'Tui-put-hí, ngì yí-kîn chu-chhak liáu $1 chong-ho. Ngì put-nèn chai chu-chhak liáu.',
 'emailauthenticated'         => 'Ngì-ke email thi-tiám yí-kîn chhai-yî $1 khok-ngin yû-háu.',
 'emailnotauthenticated'      => 'Ngì-ke email thi-tiám <strong> hàn-mò pûn ngin-chṳn </strong>. Yî-ha kûng-nèn chiông put-voi fat-sung ngim-hò email.',
-'noemailprefs'               => '<strong>Chṳ�-thin yit-ke email thi-tiám yî-khi�p sṳ�-yung chhṳ� kûng-yung.</strong>',
+'noemailprefs'               => 'Chṳ�-thin yit-ke email thi-tiám yî-khi�p sṳ�-yung chhṳ� kûng-yung.',
 'emailconfirmlink'           => 'Khok-ngin ngì-ke email thi-tiám',
 'invalidemailaddress'        => 'Email thi-tiám kak-sṳt put chṳn-khok, chhiáng sû-ngi�p chṳn-khok ke email chhai-vi fe�t-chá chhîn-khûng ke-sû-ngi�p  khiông.',
 'accountcreated'             => 'Yí-kîn kien-li�p chong-fu.',
@@ -398,11 +392,13 @@ Tshòng-tón pit-sî chhai $1-ke sṳ-ngièn yî-ha.',
 'resetpass_announce'      => 'Ngì he theu-ko yit-ke lìm-sṳ̀ ke fat-sung to email chûng ke chhí-me�t tên-ngi�p ke. Yeu vàn-sṳ̀n tên-ngi�p,  ngì pit-sî chhai liá-piên sat-thin yit-ke sîn me�t-me�t:',
 'resetpass_text'          => '<!-- Chhai chhṳ�-chhu kâ-ngi�p vùn-sṳ -->',
 'resetpass_header'        => 'Chhùng-sat me�t-me�t',
+'oldpassword'             => 'Khiu pi-me�t:',
+'newpassword'             => 'Sîn pi-me�t:',
+'retypenew'               => 'Khok-ngin me�t-me�t:',
 'resetpass_submit'        => 'Sat-thin  me�t-me�t pin tên-ngi�p',
 'resetpass_success'       => 'Ngì-ke me�t-me�t yí-kîn pûn sṳ̀n-kûng kiên-kói! Hien-ha chang vi ngì tên-ngi�p...',
 'resetpass_bad_temporary' => 'Mò-háu ke lìm-sṳ̀ me�t-me�t. Ngì khó-nèn yí-kîn sṳ̀n-kûng-thi kiên-kói liáu ngì-ke me�t-me�t, fe�t-chá sî-yeu chhiáng-khiù yit-ke sîn-ke lìm-sṳ̀ me�t-me�t.',
 'resetpass_forbidden'     => 'Mò-fap chhai chhṳ� wiki sông kiên-kói me�t-me�',
-'resetpass_missing'       => 'Mò péu-tân chṳ̂-liau.',
 
 # Edit page toolbar
 'bold_sample'     => 'Chhû-thí vùn-sṳ',
@@ -425,8 +421,8 @@ Tshòng-tón pit-sî chhai $1-ke sṳ-ngièn yî-ha.',
 'hr_tip'          => 'Súi-phiàng sien  (séu-sîm sṳ�-yung)',
 
 # Edit pages
-'summary'                   => 'Chak-yeu',
-'subject'                   => 'Chú-thì/phêu-thì',
+'summary'                   => 'Chak-yeu:',
+'subject'                   => 'Chú-thì/phêu-thì:',
 'minoredit'                 => 'Liá-he yit-ke séu siû-kói',
 'watchthis'                 => 'Kam-sṳ pún-chông',
 'savearticle'               => 'Pó-chhùn pún-chông',
@@ -438,8 +434,8 @@ Tshòng-tón pit-sî chhai $1-ke sṳ-ngièn yî-ha.',
 'missingsummary'            => "'''Thì-sṳ:''' Kgì hàn-mò thì-kiûng yit-ke phiên-siá chak-yeu. Kó-yèn ngì chai-chhṳ tân-kit tú-chhùn, ngì-ke phiên-siá chiông put-tai phiên-siá chak-yeu tú-chhùn.",
 'missingcommenttext'        => 'Chhiáng chhai ha-mien sû-ngi�p phìn-lun.',
 'missingcommentheader'      => "'''Thì-sṳ:''' ngì hàn-mò vi-chhṳ� phìn-lun thì-kiûng yit-ke phêu-thì. Kó-yèn ngì chai-chhṳ tân-kit tú-chhùn, ngì-ke phiên-siá chiông put-tai phêu-thì tú-chhùn.",
-'summary-preview'           => 'Chak-yeu yi-ko',
-'subject-preview'           => 'Chú-thì/phêu-thì yi-ko',
+'summary-preview'           => 'Chak-yeu yi-ko:',
+'subject-preview'           => 'Chú-thì/phêu-thì yi-ko:',
 'blockedtitle'              => 'Yung-fu pûn chhà-fûng',
 'blockedtext'               => "<big>Ngì-ke yung-fu-miàng fe�t-chá IP thi-tiám yí-kîn pûn $1 chhà-fûng.</big>
 
@@ -467,18 +463,18 @@ Kó-yèn ngì-he put-séu-sîm to chhṳ� hong-mien, chhṳ�t-chiap tiám-kit
 'userpage-userdoesnotexist' => 'Sṳ�-yung-tsá tsong-ho "$1" hàn-mò kien-li�p. 
 Tshiáng chhai kien-li�p�piên-sip liá-ke vùn-tsông tshièn siên kiám-tshà yit-ha-é.',
 'clearyourcache'            => "'''Chu-yi:''' Chhai tú-chhùn yî-heu, ngì pit-sî khoai chhái-chhí chhîn-chhù hi-khí chhòi-nèn khon-tó chok-chhut ke kói-pien. '''Mozilla / Firefox / Safari:''' on-tén ''Shift'' chai tiám-kit '' Chhùng-sîn chṳ�n-lî ''(fe�t-chá on-hâ ''Ctrl-Shift-R'', chhai Phìn-kó Mac song on-hâ ''Cmd-Shift-R''); '''IE:''' on-tén ''Ctrl'' chai tiám-kit ''Chhùng-sîn chṳ�n-lî'', fe�t-he on-hâ ''Ctrl-F5''；'''Konqueror:''' chak  sî-yeu tiám-kit ''Chhùng-sîn chṳ�n-lî''; '''Opera:''' yung-fu sî-yeu chhai ''kûng-khí-sat-thin'' chûng vàn-cháng-thi chhîn-chhù ke khoai-chhí.",
-'usercssjsyoucanpreview'    => "<strong>Thì-sṳ:</strong> Chhai pó-chhùn chhièn chhiáng yung 'hién-sṳ yi-ko' on-néu lòi chhet-chhṳ ngì sîn-ke CSS/JS.",
+'usercssjsyoucanpreview'    => "'''Thì-sṳ:''' Chhai pó-chhùn chhièn chhiáng yung 'hién-sṳ yi-ko' on-néu lòi chhet-chhṳ ngì sîn-ke CSS/JS.",
 'usercsspreview'            => "'''Chu-yi ngì chak-he chhai yi-liau ngì ke-ngìn CSS, hàn-mò tú-chhùn!'''",
 'userjspreview'             => "'''Chu-yi ngì chak-he chhai chhet-chhṳ � yi-liau ngì ke-ngìn JavaScript, hàn-mò tú-chhùn!'''",
 'userinvalidcssjstitle'     => "'''Kín-ko:''' Put chhùn-chhai mien-pán \"\$1\". chu-yi chhṳ-thin ke .css lâu .js hong yeu sṳ�-yung séu-siá phêu-thì, yì-yi, {{ns:user}}:Foo/monobook.css put-thùng yî  {{ns:user}}:Foo/Monobook.css.",
 'updated'                   => '(Yí-kîn kiên-sîn)',
-'note'                      => '<strong>Chu-yi:</strong>',
-'previewnote'               => '<strong>Chhiáng ki-he�t liá-ke chak-he yi-liau, nui-yùng hàn-mò pó-chhùn!</strong>',
+'note'                      => "'''Chu-yi:'''",
+'previewnote'               => "'''Chhiáng ki-he�t liá-ke chak-he yi-liau, nui-yùng hàn-mò pó-chhùn!'''",
 'previewconflict'           => 'Liá-ke yi-liau hién-sṳ liáu song-mien vùn-sṳ phiên-siá khî-chûng ke nui-yùng. Chiông-voi chhai ngì sién-chet pó-chhùn heu chhut-hien.',
-'session_fail_preview'      => '<strong>Chṳ̂n-he tui-put-hí! Lî-yù he phu-fun chṳ̂-yì-sṳt, mò-fap chhú-lî ngì-ke phiên-siá. Chhiáng chai-chhṳ yit-chhṳ, kó-yèn yìn-yèn sṳt-phai, chhiáng tên-chhut heu chhùng-sîn tên-ngi�p.</strong>',
-'session_fail_preview_html' => '<strong>Chṳ̂n tui-put-hí! Phu-fun chṳ̂-liau yí-kîn yì-sṳt, mò-fap chhú-lî ngì-ke phiên-siá.</strong>
+'session_fail_preview'      => "'''Chṳ̂n-he tui-put-hí! Lî-yù he phu-fun chṳ̂-yì-sṳt, mò-fap chhú-lî ngì-ke phiên-siá. Chhiáng chai-chhṳ yit-chhṳ, kó-yèn yìn-yèn sṳt-phai, chhiáng tên-chhut heu chhùng-sîn tên-ngi�p.'''",
+'session_fail_preview_html' => "'''Chṳ̂n tui-put-hí! Phu-fun chṳ̂-liau yí-kîn yì-sṳt, mò-fap chhú-lî ngì-ke phiên-siá.'''
 
-<strong>Kó-yèn liá-ke phiên-siá ko-chhàng mò-yû mun-thì, chhiáng chai-chhṳ yit-chhṳ. Yìn-yèn yû mun-thì, chhiáng tên-chhut heu chhùng-sîn tên-ngi�p yit-chhṳ.</strong>',
+'''Kó-yèn liá-ke phiên-siá ko-chhàng mò-yû mun-thì, chhiáng chai-chhṳ yit-chhṳ. Yìn-yèn yû mun-thì, chhiáng tên-chhut heu chhùng-sîn tên-ngi�p yit-chhṳ.'''",
 'editing'                   => 'Chang-chhai phiên-siá $1',
 'editingsection'            => 'Chang-chhai phiên-siá $1 (thon-lo�k)',
 'editingcomment'            => 'Chang-chhai phiên-siá $1 (phìn-lun)',
@@ -490,18 +486,18 @@ Ngì yin-tông chiông ngì só-cho ke siù-chho kâ-ngi�p hien-yû ke nui-yùn
 '''Chṳ�-yû''' chhai song-mien vùn-sṳ khiông-chûng ke nui-yùng chiông-voi chhai ngì tiám-kit \"Pó-chhùn pún-chông\" heu pûn pó-chhùn.",
 'yourtext'                  => 'Ngì-ke vùn-sṳ',
 'storedversion'             => 'Yí-kîn pó-chhùn ke pán-pún',
-'nonunicodebrowser'         => '<strong>Kín-ko: Ngì-ke hi-khí put-nèn kiâm-yùng Unicode phiên-ho. Liá-piên yû yit-ke kûng-chok-khî chiông-voi hó-sṳ� ngì nèn ôn-chhiòn-thi phiên-siá vùn-chông: fi ASCII sṳ-kûng chiông-yung sṳ�p-liuk chin-chṳ phiên-ho mù-hìn chhut-hien chhai phiên-siá khiông-chûng.</strong>',
-'editingold'                => '<strong>Kín-ko: Ngì chang-chhai phiên-siá-ke he pún-chông ke khiu pán-pún. Ngì pó-chhùn kí sṳ̀, chhai pún pán-pún chṳ̂-hei ke ngim-hò chhùng-siû tû-voi tiû-sṳt.</strong>',
+'nonunicodebrowser'         => "'''Kín-ko: Ngì-ke hi-khí put-nèn kiâm-yùng Unicode phiên-ho. Liá-piên yû yit-ke kûng-chok-khî chiông-voi hó-sṳ� ngì nèn ôn-chhiòn-thi phiên-siá vùn-chông: fi ASCII sṳ-kûng chiông-yung sṳ�p-liuk chin-chṳ phiên-ho mù-hìn chhut-hien chhai phiên-siá khiông-chûng.'''",
+'editingold'                => "'''Kín-ko: Ngì chang-chhai phiên-siá-ke he pún-chông ke khiu pán-pún. Ngì pó-chhùn kí sṳ̀, chhai pún pán-pún chṳ̂-hei ke ngim-hò chhùng-siû tû-voi tiû-sṳt.'''",
 'yourdiff'                  => 'chhâ-yi',
-'copyrightwarning'          => 'Chhiáng chu-yi ngì tui {{SITENAME}} ke só-yû kung-hien tû pûn-ngìn ngin-vì he chhai $2-hâ fat-phu, chhiáng chhà-khon chhai $1-ke se-chiet. Kó-yèn ngì chhin-mò hî-mong ngì-ke vùn-sṳ pûn-ngìn ngim-yi siù-chho lâu chai san-pu, chhiáng mò-yeu thì-kâu.<br /> Ngì thùng-sṳ̀ ya-yeu hiong Wikimedia pó-chṳn ngì só thì-kâu ke nui-yùng he chhṳ-kí só chok, fe�t-chá lòi-chhṳ yit-ke mò-su pán-khièn pó-fu fe�t-he siông-thùng chhṳ-yù ke lòi-ngièn. <strong>Mò-yeu chhai hàn-mò su-khièn ke chhìn-khóng-hâ fat-péu�</strong><br />',
-'copyrightwarning2'         => 'Chhiáng chu-yi ngì tui {{SITENAME}} ke só-yû kung-hien tû khó-nèn pûn khì-thâ kung-hien-chá phiên-cho, siû-kói fe�t-he chhù-thet.
+'copyrightwarning'          => "Chhiáng chu-yi ngì tui {{SITENAME}} ke só-yû kung-hien tû pûn-ngìn ngin-vì he chhai $2-hâ fat-phu, chhiáng chhà-khon chhai $1-ke se-chiet. Kó-yèn ngì chhin-mò hî-mong ngì-ke vùn-sṳ pûn-ngìn ngim-yi siù-chho lâu chai san-pu, chhiáng mò-yeu thì-kâu.<br /> Ngì thùng-sṳ̀ ya-yeu hiong Wikimedia pó-chṳn ngì só thì-kâu ke nui-yùng he chhṳ-kí só chok, fe�t-chá lòi-chhṳ yit-ke mò-su pán-khièn pó-fu fe�t-he siông-thùng chhṳ-yù ke lòi-ngièn. '''Mò-yeu chhai hàn-mò su-khièn ke chhìn-khóng-hâ fat-péu�'''<br />",
+'copyrightwarning2'         => "Chhiáng chu-yi ngì tui {{SITENAME}} ke só-yû kung-hien tû khó-nèn pûn khì-thâ kung-hien-chá phiên-cho, siû-kói fe�t-he chhù-thet.
 Kó-yèn ngì chhin-mò hî-mong ngì-ke ngì-ke vùn-sṳ pûn-ngìn ngim-yi chhùng-siû lâu chai san-pu, chhiáng mò-yeu thì-kâu.<br /> 
 Ngì thùng-sṳ̀ ya-yeu hiong Wikimedia pó-chṳn ngì só thì-kâu ke nui-yùng he chhṳ-kí só chok，fe�t-chá lòi-chhṳ yit-ke mò-su pán-khièn pó-fu fe�t-he he siông-thùng chhṳ-yù ke lòi-ngièn (Chhâm-siòng $1 ke se-chiet).
-<strong> Mò-yeu chhai hàn-mò su-khièn ke chhìn-khóng-hâ fat-péu�</strong>',
-'longpagewarning'           => '<strong>Kín-ko: Pún-chông chhòng-thu tha�t-tó $1 kB；mêu-chúng hi-khí chiông-voi mò-fap phiên-chhut chhòng-ko 32 kB ke vùn-chông. Chhiáng kháu-li chiông pún-chông chhiet kot-sṳ̀n kí-ke séu thon-lo�k.</strong>',
-'longpageerror'             => '<strong>Chho-ngu: Ngì só thì-kâu ke vùn-sṳ chhòng-thu yû $1KB, liá thai-yî $2KB ke chui-thai chhṳ�t, ke-vùn-chông put-nèn pûn tú-chhùn.</strong>',
-'readonlywarning'           => '<strong>Kín-ko: chṳ̂-liau-khu pûn-ngìn fûng-só yîn-vi chin-hàng vì-fu, só-yî muk-chhièn mò-fap pó-chhùn ngì-ke siù-chho. Ngì fe�t-hí hî-mong chhai-siên chiông pún-thon vùn-sṳ fu�k-chṳ pin pó-chhùn to vùn-sṳ vùn-khien, yèn-heu tén-yit-ha chai siù-chho.</strong>',
-'protectedpagewarning'      => '<strong>Kín-ko: Pún-chông yí-kîn pûn pó-fu, chṳ�-yû yúng-yû Kón-lî-yèn hí-khó-khièn ke yung-fu chhòi-nèn siù-chho.</strong>',
+''' Mò-yeu chhai hàn-mò su-khièn ke chhìn-khóng-hâ fat-péu�'''",
+'longpagewarning'           => "'''Kín-ko: Pún-chông chhòng-thu tha�t-tó $1 kB；mêu-chúng hi-khí chiông-voi mò-fap phiên-chhut chhòng-ko 32 kB ke vùn-chông. Chhiáng kháu-li chiông pún-chông chhiet kot-sṳ̀n kí-ke séu thon-lo�k.'''",
+'longpageerror'             => "'''Chho-ngu: Ngì só thì-kâu ke vùn-sṳ chhòng-thu yû $1KB, liá thai-yî $2KB ke chui-thai chhṳ�t, ke-vùn-chông put-nèn pûn tú-chhùn.'''",
+'readonlywarning'           => "'''Kín-ko: chṳ̂-liau-khu pûn-ngìn fûng-só yîn-vi chin-hàng vì-fu, só-yî muk-chhièn mò-fap pó-chhùn ngì-ke siù-chho. Ngì fe�t-hí hî-mong chhai-siên chiông pún-thon vùn-sṳ fu�k-chṳ pin pó-chhùn to vùn-sṳ vùn-khien, yèn-heu tén-yit-ha chai siù-chho.'''",
+'protectedpagewarning'      => "'''Kín-ko: Pún-chông yí-kîn pûn pó-fu, chṳ�-yû yúng-yû Kón-lî-yèn hí-khó-khièn ke yung-fu chhòi-nèn siù-chho.'''",
 'semiprotectedpagewarning'  => "'''Chu-yi:''' Pún vùn-chông pûn só-thin, tên-ki ke yung-fu hí-khó phiên-siá.",
 'cascadeprotectedwarning'   => "'''Kín-ko''': Pún-chông yí-kîn pûn pó-fu, chṳ�-yû yúng-yû Kón-lî-yèn khièn-han ke yung-fu chhòi-nèn siù-chho, yîn-vi pún-chông yí-kîn pûn yî-ha lièn-só pó-fu ke {{PLURAL:$1|yit-ke|tô-ke}} vùn-chông só pâu-hàm:",
 'templatesused'             => 'Chhai liá-ke hong-mien song sṳ�-yung ke mù-pán yû:',
@@ -515,6 +511,10 @@ Ngì thùng-sṳ̀ ya-yeu hiong Wikimedia pó-chṳn ngì só thì-kâu ke nui-y
 'nocreate-loggedin'         => 'Ngì chhai liá-ke wiki-tsûng hàn-mò hí-khó-khièn kien-li�p sîn vùn-tsông.',
 'permissionserrors'         => 'Khièn-han Tsho-ngu',
 'permissionserrorstext'     => 'Kîn-kí yî-ha ke ngièn-yîn, ngì vù-yû khièn-han hi-tso yî-ha ke thung-tsok:',
+'edit-gone-missing'         => 'Vù-nèn kiên-sîn vùn-tsông. Khó-nèn kông pûn-ngìn tshù-thet.',
+'edit-conflict'             => 'Piên-sip tshûng-thu�t.',
+'edit-no-change'            => 'Piên-sip yí-kîn pûn fut-lio�k, yîn-vi vùn-sṳ mò ngim-hò kói-pien.',
+'edit-already-exists'       => 'Put-nèn kien-li�p yit-ke sîn vùn-tsông. Têu yí-kîn tshùn-tshai.',
 
 # "Undo" feature
 'undo-success' => 'Ke phiên-cho khó-yî pûn chhat-sêu. Chhiáng kiám-chhà yî-ha tui-pí fu�t-sṳ�t liá chang-he ngì sióng-cho ke, yèn-heu tú-chhùn yî-ha kiên-kói vàn-sṳ̀n chhat-sêu phiên-siá.',
@@ -531,11 +531,10 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 # History pages
 'viewpagelogs'        => 'Chhà-khon liá-ke vùn-chông ke ngit-ki.',
 'nohistory'           => 'Mò-yû pún-chông ke siû-thin ki-liu�k.',
-'revnotfound'         => 'Mò-yû chhìm-cháu to siû-thin ki-liu�k',
-'revnotfoundtext'     => 'Chhiáng-khiù ke kien-chó pán-pún ke siû-thin ki-liu�k mò-yû cháu-to. Chhiáng kiám-chhà chhiáng-khiù pún-chông yung ke URL he-féu chṳn-khok.',
 'currentrev'          => 'Tông-chhièn siû-thin pán-pún',
+'currentrev-asof'     => 'Chhai $1-ke tông-sṳ̀   siù-tsho pán-pún.',
 'revisionasof'        => 'Chhai $1 só-cho ke siû-thin pán-pún',
-'revision-info'       => 'Chhai $1 yù $2 só-cho ke siû-thin pán-pún',
+'revision-info'       => 'Chhai $1 yù $2 só-cho ke siû-thin pán-pún', # Additionally available: $3: revision id
 'previousrevision'    => '�Sông yit siû-thin',
 'nextrevision'        => 'Hâ-yit-ke siû-cháng →',
 'currentrevisionlink' => 'Tông-chhièn siû-thin pán-pún',
@@ -613,6 +612,14 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 'compareselectedversions' => 'Pí-káu sién-thin ke pán-pún',
 'editundo'                => 'Chhat-sêu',
 'diff-multi'              => '($1-ke chûng-thù ke siû-thin pán-pún mò-yû hién-sṳ.)',
+'diff-movedto'            => 'yì-thung to $1',
+'diff-styleadded'         => 'Yí-kîn kâ-ngi�p $1 yong-sṳt-péu',
+'diff-added'              => 'Yí-kîn kâ-ngi�p $1',
+'diff-changedto'          => 'kiên-kói to $1',
+'diff-movedoutof'         => 'yì-tshù tshṳ $1',
+'diff-styleremoved'       => 'Yí-kîn yì-tshù $1 yong-sṳt-péu',
+'diff-removed'            => 'Yí-kîn yì-tshù $1',
+'diff-src'                => 'lòi-ngièn',
 
 # Search results
 'searchresults'         => 'Chhìm-cháu kiet-kó',
@@ -627,6 +634,7 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 'prevn'                 => 'Chhièn $1-ke',
 'nextn'                 => 'hâ $1-ke',
 'viewprevnext'          => 'Kiám-sṳ ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Pông-chhu',
 'showingresults'        => "Ha-mien hién-sṳ chhiùng thi-'''$2'''-thiàu khôi-sṳ� ke '''$1'''-thiàu kiet-kó:",
 'showingresultsnum'     => "Ha-mien hién-sṳ chhiùng thi-'''$2'''-thiàu khôi-sṳ� ke '''$3'''-thiàu kiet-kó:",
 'nonefound'             => '<strong>Chu-yi：</strong> Sṳt-phai ke sêu-chhà vông-vông he chhut-yì chhṳ-thù sêu-chhà chû-yì "ke" fe�t-chá "lâu" chṳ̂-lui ke sòng-kien-sṳ só yîn-hí.',
@@ -647,6 +655,7 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 'qbsettings-floatingright' => 'Phêu-yì chhai yu',
 'changepassword'           => 'Kiên-kói me�t-me�t',
 'skin'                     => 'Mien-pán',
+'skin-preview'             => 'Yi-ko',
 'math'                     => 'Sṳ-ho�k kûng-sṳt',
 'dateformat'               => 'Ngit-khì kak-sṳt',
 'datedefault'              => 'Yi-sat-chhṳ�t',
@@ -668,9 +677,6 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 'prefs-misc'               => 'Khì-thâ sat-chṳ',
 'saveprefs'                => 'Pó-chhùn',
 'resetprefs'               => 'Sat-thin',
-'oldpassword'              => 'Khiu pi-me�t:',
-'newpassword'              => 'Sîn pi-me�t:',
-'retypenew'                => 'Khok-ngin me�t-me�t:',
 'textboxsize'              => 'Phiên-cho',
 'rows'                     => 'Phài-lie�t',
 'columns'                  => 'Lie�t-su:',
@@ -764,7 +770,7 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 'uploadnologintext'           => 'Ngì pit-sî chó-siên [[Special:UserLogin|tên-ngi�p]] chhòi-nèn sông-chai vùn-khien.',
 'upload_directory_read_only'  => 'Song-chhòn muk-liu�k ($1) put-chhùn-chhai fe�t-chá mò siá khièn-han.',
 'uploaderror'                 => 'Song-chhòn chho-ngu',
-'uploadtext'                  => "Sṳ�-yung ha-mien ke péu-tân lòi song-chhòn yung-chhai vùn-chông nui sîn-ke thù-hìn tóng-on. Yeu kiám-sṳ fe�t-chá sêu-chhà yî-chhièn song-chhòn ke thù-phién khó-yî chin-ngi�p [[Special:ImageList|Thù-hìn chhîn-tân]], song-chhòn lâu chhù-hi chiông-chhai [[Special:Log/upload|Song-chhòn ngit-ki]] chûng ki-liu�k. Yeu-chhai vùn-chông chûng kâ-ngi�p thù-hiong, sṳ�-yung yî-ha hìn-sṳt ke lièn-chiap: '''<nowiki>[[{{ns:image}}:file.jpg]]</nowiki>'''， '''<nowiki>[[{{ns:image}}:file.png|Thi-von vùn-sṳ]]</nowiki>''' fe�t-he '''<nowiki>[[{{ns:media}}:file.ogg]]</nowiki>'''.",
+'uploadtext'                  => "Sṳ�-yung ha-mien ke péu-tân lòi song-chhòn yung-chhai vùn-chông nui sîn-ke thù-hìn tóng-on. Yeu kiám-sṳ fe�t-chá sêu-chhà yî-chhièn song-chhòn ke thù-phién khó-yî chin-ngi�p [[Special:FileList|Thù-hìn chhîn-tân]], song-chhòn lâu chhù-hi chiông-chhai [[Special:Log/upload|Song-chhòn ngit-ki]] chûng ki-liu�k. Yeu-chhai vùn-chông chûng kâ-ngi�p thù-hiong, sṳ�-yung yî-ha hìn-sṳt ke lièn-chiap: '''<nowiki>[[{{ns:file}}:file.jpg]]</nowiki>'''， '''<nowiki>[[{{ns:file}}:file.png|Thi-von vùn-sṳ]]</nowiki>''' fe�t-he '''<nowiki>[[{{ns:media}}:file.ogg]]</nowiki>'''.",
 'uploadlog'                   => 'Song-chhòn ki-liu�k',
 'uploadlogpage'               => 'Song-chhòn ki-liu�k',
 'uploadlogpagetext'           => 'Yî-ha he chui-khiûn song-chhòn vùn-khien ke chúng-péu.',
@@ -783,20 +789,20 @@ Tông-tsûng pûn $3 fûng-só ke ngièn-yîn he ''$2''",
 'large-file'                  => 'Kien-ngi tóng-on thai-séu put-nèn chhêu-ko $1; pún tóng-on thai-séu he $2.',
 'largefileserver'             => 'Liá-ke tóng-on ke thai-séu fu�k-chhiùng-hi fûn-phi yún-chún ke thai-séu hàn-yeu thai.',
 'emptyfile'                   => 'Ngì só song-chhòn ke tóng-on put chhùn-chhai. Liá khó-nèn he chhut-yì tóng-on miàng chho-ngu. Chhiáng kiám-chhà ngì he-feu chṳ̂n yeu song-chhòn chhṳ� tóng-on.',
-'fileexists'                  => 'Yí-kîn chhùn-chhai siông-thùng miàng-chhṳ̂n ke tóng-on, kó-yèn ngì mò-fap khok-thin ngì he-feu yeu kói-pien kì, chhiáng kiám-chhà <strong><tt>$1</tt></strong>.',
-'fileexists-extension'        => 'Yit-ke siông-sṳ tóng-miàng ke tóng-on yí-kîn chhùn-chhai:<br />
-Song-chhòn tóng-on ke tóng-miàng: <strong><tt>$1</tt></strong><br />
-hien-chhai yû tóng-on ke tóng-miàng: <strong><tt>$2</tt></strong><br />
-Chhiáng sién-chet yit-ke put-thùng ke miàng-sṳ.',
+'fileexists'                  => "Yí-kîn chhùn-chhai siông-thùng miàng-chhṳ̂n ke tóng-on, kó-yèn ngì mò-fap khok-thin ngì he-feu yeu kói-pien kì, chhiáng kiám-chhà '''<tt>$1</tt>'''.",
+'fileexists-extension'        => "Yit-ke siông-sṳ tóng-miàng ke tóng-on yí-kîn chhùn-chhai:<br />
+Song-chhòn tóng-on ke tóng-miàng: '''<tt>$1</tt>'''<br />
+hien-chhai yû tóng-on ke tóng-miàng: '''<tt>$2</tt>'''<br />
+Chhiáng sién-chet yit-ke put-thùng ke miàng-sṳ.",
 'fileexists-thumb'            => "<center>'''Yí-kîn chhùn-chhai ke thù-hìn'''</center>",
-'fileexists-thumbnail-yes'    => 'Liá-ke tóng-on chhin-chhiong he yit-pu thù-hìn ke suk-thù pán-pún <i>(suk-thù)</i>.
-Chhiáng kiám-chhà chhîn-chhú ke tóng-on <strong><tt>$1</tt></strong>.<br />
-Kó-yèn kiám-chhà heu ke tóng-on he khiung-thùng ngièn-pún thù-hiong ke thai-séu he yit-yong, chhiu put-yung song-chhòn tô yit-puk suk-thù.',
-'file-thumbnail-no'           => 'Ke tóng-on he yî <strong><tt>$1</tt></strong> khôi-sṳ�. 
-Hó-chhiong yit-puk thù-hìn ke suk-thù pán-pún <i>(thù-hìn)</i>.
-Kó-yèn ngì yû liá-ke thù-hìn ke vàn-cháng thai-séu.',
-'fileexists-forbidden'        => 'Yí-kîn chhùn-chhai ke siông-thùng miàng-chhṳ̂n ke tóng-on; chhiáng fì-chón pin yung yit-ke sîn-ke  miàng-chhṳ̂n lòi song-chhòn chhṳ� tóng-on.[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Chhai khiung-hióng tóng-on-khu chûng yí-kîn chhùn-chhai chhṳ� miàng-chhṳ̂n ke tóng-on; Chhiáng fì-chón pin yung yit-ke sîn-ke miàng-chhṳ̂n lòi song-chhòn chhṳ� tóng-on. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Liá-ke tóng-on chhin-chhiong he yit-pu thù-hìn ke suk-thù pán-pún ''(suk-thù)''.
+Chhiáng kiám-chhà chhîn-chhú ke tóng-on '''<tt>$1</tt>'''.<br />
+Kó-yèn kiám-chhà heu ke tóng-on he khiung-thùng ngièn-pún thù-hiong ke thai-séu he yit-yong, chhiu put-yung song-chhòn tô yit-puk suk-thù.",
+'file-thumbnail-no'           => "Ke tóng-on he yî '''<tt>$1</tt>''' khôi-sṳ�. 
+Hó-chhiong yit-puk thù-hìn ke suk-thù pán-pún ''(thù-hìn)''.
+Kó-yèn ngì yû liá-ke thù-hìn ke vàn-cháng thai-séu.",
+'fileexists-forbidden'        => 'Yí-kîn chhùn-chhai ke siông-thùng miàng-chhṳ̂n ke tóng-on; chhiáng fì-chón pin yung yit-ke sîn-ke  miàng-chhṳ̂n lòi song-chhòn chhṳ� tóng-on.[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Chhai khiung-hióng tóng-on-khu chûng yí-kîn chhùn-chhai chhṳ� miàng-chhṳ̂n ke tóng-on; Chhiáng fì-chón pin yung yit-ke sîn-ke miàng-chhṳ̂n lòi song-chhòn chhṳ� tóng-on. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Sông-chhòn sṳ̀n-kûng',
 'uploadwarning'               => 'Sông-chai kín-ko',
 'savefile'                    => 'Pó-chhùn vùn-khien',
@@ -829,17 +835,17 @@ Kó-yèn ngì yû liá-ke thù-hìn ke vàn-cháng thai-séu.',
 'upload_source_url'  => '(Yit-ke yû-háu ke, hí-khó kûng-khôi fóng-mun ke URL)',
 'upload_source_file' => '(ngì thien-nó chûng ke tóng-on)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'On-cheu thù-chhiong miàng-chhṳ̂n sêu-chhà:',
+# Special:ListFiles
+'listfiles_search_for'  => 'On-cheu thù-chhiong miàng-chhṳ̂n sêu-chhà:',
 'imgfile'               => 'tóng-on',
-'imagelist'             => 'Tóng-on lie�t-péu',
-'imagelist_date'        => 'Ngit-khì',
-'imagelist_name'        => 'Miàng-chhṳ̂n',
-'imagelist_user'        => 'Yung-fu',
-'imagelist_size'        => 'Thai-séu',
-'imagelist_description' => 'Mèu-sut',
-
-# Image description page
+'listfiles'             => 'Tóng-on lie�t-péu',
+'listfiles_date'        => 'Ngit-khì',
+'listfiles_name'        => 'Miàng-chhṳ̂n',
+'listfiles_user'        => 'Yung-fu',
+'listfiles_size'        => 'Thai-séu',
+'listfiles_description' => 'Mèu-sut',
+
+# File description page
 'filehist-deleteone'        => 'chhù-thet',
 'imagelinks'                => 'Lièn-kiet',
 'linkstoimage'              => 'Yî-ha vùn-chông lièn-chiap to pún tóng-on:',
@@ -880,21 +886,9 @@ Kó-yèn ngì yû liá-ke thù-hìn ke vàn-cháng thai-séu.',
 'randomredirect-nopages' => 'Chhai liá-ke miàng-sṳ khûng-kiên mò-yû chhùng-thin hong-mien.',
 
 # Statistics
-'statistics'             => 'Thúng-kie',
-'sitestats'              => '{{SITENAME}} thúng-kie su-kí',
-'userstats'              => 'Yung-fu thúng-kie',
-'sitestatstext'          => "Chṳ̂-liau-khu chûng khiung-yû '''\$1''' vùn-chông.
-Khì-chûng pâu-hàm tui-fa-hong, su�k-yî {{SITENAME}} ke vùn-chông, chui-séu liòng ke \"stub\", chhùng-thiun hiong ke vùn-chông, yî-khi�p hàn-mò tha�t-tó vùn-chông chṳt-liòng ke vùn-chông.
-Chhù-chhṳ� chṳ̂-ngoi hàn-yû '''\$2''' khó-nèn he ha�p-fû phêu-chún ke vùn-chông.
-
-'''\$8'''-ke tóng-on yí-kîn pûn song-chhòn.
-
-Chhiùng {{SITENAME}} sat-thin yî-lòi, chhiòn mióng-chham khiung-yû hong-mien '''\$3'''-chhṳ, vùn-chông phiên-si�p '''\$4'''-chhṳ.
-Chit mî-chông phìn-kiûn phiên-cho '''\$5'''-chhṳ, kok-chhṳ phiên-siá heu vùn-chông ke mî-ke pán-pún phìn-kiûn '''\$6'''-chhṳ. 
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue kûng-chok chhui-lie�t] ke chhòng-thu he '''\$7'''.",
-'userstatstext'          => "Muk-chhièn yû '''$1'''-ke chu-chhak yung-fu. Khì-chûng '''$2'''-ngìn (chit '''$4%''') he kón-lî-yèn (chhâm-siòng $3).",
-'statistics-mostpopular' => 'Pûn-ngìn chhà-khon chhṳ-su chui-tô ke vùn-chông',
+'statistics'              => 'Thúng-kie',
+'statistics-header-users' => 'Yung-fu thúng-kie',
+'statistics-mostpopular'  => 'Pûn-ngìn chhà-khon chhṳ-su chui-tô ke vùn-chông',
 
 'disambiguations'      => 'Sêu-hàm fù-chông',
 'disambiguations-text' => 'Yî-ha ke hong-mien tû-yû to <b> sêu-hàm fù-chông </b> ke lièn-chiap, than yin-kôi he lièn-to sṳt-tông ke phêu-thì. <br /> Yit-ke hong-mien chiông-voi pûn-ngìn sṳ-vi Sêu-hàm fù-chông kó-yèn kí he lièn-chhṳ [[MediaWiki:disambiguationspage]].',
@@ -964,8 +958,6 @@ Chit mî-chông phìn-kiûn phiên-cho '''\$5'''-chhṳ, kok-chhṳ phiên-siá
 'specialloguserlabel'  => 'Yung-fu:',
 'speciallogtitlelabel' => 'Phêu-thì:',
 'log'                  => 'Ngit-ki',
-'log-search-legend'    => 'Chhìm-chhut ngit-ki',
-'log-search-submit'    => 'Chhìm-hi',
 'alllogstext'          => 'Lièn-ha�p hién-sṳ song-chhòn, chhù-chhiang, pó-fu, chhà-fûng yî-khi�p chham-vu',
 'logempty'             => 'Mò-yû siông-thùng ki-liu�k.',
 'log-title-wildcard'   => 'Chhà-chhìm liá-ke vùn-sṳ khôi-sṳ� ke phêu-thì',
@@ -989,11 +981,20 @@ Chit mî-chông phìn-kiûn phiên-cho '''\$5'''-chhṳ, kok-chhṳ phiên-siá
 'categories'         => 'Hong-mien fûn-lui',
 'categoriespagetext' => 'Yî-ha lie�t-chhut só-yû ke hong-mien fûn-lui.',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Chhìm-cháu',
+
 # Special:ListUsers
 'listusersfrom'      => 'Hién-sṳ yung-fu lie�t-péu chhiùng:',
 'listusers-submit'   => 'Hién-sṳ',
 'listusers-noresult' => 'Cháu put-to yung-fu.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Sîn-chin yung-fu miàng-chhak',
+'newuserlogpagetext'       => 'Liá-he yit-ke chui-khiun pûn chhóng-kien yung-fu ke ngit-ki.',
+'newuserlog-create-entry'  => 'Sîn yung-fu',
+'newuserlog-create2-entry' => 'Yí-kîn chhong-kien $1 ke chong-fu',
+
 # E-mail user
 'mailnologin'     => 'Mò email thi-tiám',
 'mailnologintext' => 'Ngì pit-sî siên [[Special:UserLogin|tên-ngi�p]] pin-chhai [[Special:Preferences|chhâm-su sat-chṳ]] chûng yû yit-ke yû-háu ke e-mail thi-tiám chhòi-nèn email khì-thâ yung-fu.',
@@ -1041,12 +1042,6 @@ Chit mî-chông phìn-kiûn phiên-cho '''\$5'''-chhṳ, kok-chhṳ phiên-siá
 'iteminvalidname'      => "Hong-mien '$1' chho-ngu, mò-háu min-miàng...",
 'wlnote'               => 'Yî-ha he chui-khiûn <b>$2</b> séu-sṳ̀ nui-ke chui-heu $1-chhṳ chin-siû.',
 'wlshowlast'           => 'Hién-sṳ chui-khiûn $1 séu-sṳ̀ $2-thiên $3 ke chin-siû.',
-'watchlist-show-bots'  => 'Hién-sṳ kî-hi-ngìn ke phiên-cho',
-'watchlist-hide-bots'  => 'Yún-chhòng kî-hi-ngìn ke phiên-cho',
-'watchlist-show-own'   => 'Hién-sṳ ngô-ke siù-kói',
-'watchlist-hide-own'   => 'Yún-chhòng ngô-ke siù-kói',
-'watchlist-show-minor' => 'Hién-sṳ séu siù-kói',
-'watchlist-hide-minor' => 'Yún-chhòng séu siù-chho',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Chang-chhai kam-sá¹³...',
@@ -1064,49 +1059,54 @@ Chit mî-chông phìn-kiûn phiên-cho '''\$5'''-chhṳ, kok-chhṳ phiên-siá
 'enotif_anon_editor'           => 'ngia�k-miàng yung-fu $1',
 'enotif_body'                  => 'Chhîn-oi ke $WATCHINGUSERNAME, $PAGEEDITOR yí-kîn chhai $PAGEEDITDATE $CHANGEDORCREATED{{SITENAME}} ke $PAGETITLE vùn-chông, chhiáng-to $PAGETITLE_URL kiám-sṳ siên-chhièn pán-pún.  $NEWPAGE phiên-si�p chak-yeu: $PAGESUMMARY $PAGEMINOREDIT lièn-kiê chhṳ� phiên-si�p-chá: email: $PAGEEDITOR_EMAIL pún-chham: $PAGEEDITOR_WIKI chhai ngì fóng-mun chhṳ�-chông chṳ̂-chhièn, chiông-lòi ke kiên-kói vù-nèn hiong ngì thûng-tî. Ngì khó-yî chhûng-sat ngì só-yû kam-sṳ vùn-chông ke thûng-tî phêu-ki. {{SITENAME}} thûng-tî ne-thúng -- yeu kói-pien ngì-ke kam-sṳ lie�t-péu sat-thin, chhiáng chhâm-siòng {{fullurl:{{ns:special}}:Watchlist/edit}} chin-yit-phu ke pông-chhu: {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Chhù-thet hong-mien',
-'confirm'                     => 'Khok-ngin',
-'excontent'                   => 'Nui-yùng pún-lòi he: "$1"',
-'excontentauthor'             => 'Nui-yùng he: "$1" (song-chhiá vì-thu�k kung-hien-chá he "$2")',
-'exbeforeblank'               => 'Pûn chhîn-khûng chhièn ke nui-yùng he: "$1"',
-'exblank'                     => 'Vùn-chông he hî-khûng',
-'delete-legend'               => 'Chhù-thet',
-'historywarning'              => 'Kín-ko: Ngì chiông-yeu chhù-hi ke chông-nui hàm-yû li�t-sṳ�:',
-'confirmdeletetext'           => 'Ngì chiông-voi chhiùng chṳ̂-liau-khu chûng yún-yén chhù-thet yit-ke vùn-chông fe�t-chá thù-chhiong yî-khi�p li�t-sṳ�. Chhiáng khok-thin ngì-yeu chin-hàng chhâu-chok, pin liáu-kié heu-kó, thùng-sṳ̀ ngì-ke hàng-vì fù-ha�p [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Chhâu-chok vàn-sṳ̀n',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" yí-kîn pûn chhù-thet. Chui-khiûn chhù-hi ke ki-liu�k chhiáng chhâm-siòng $2.',
-'deletedarticle'              => 'Yí-kîn chhù-thet "[[$1]]"',
-'dellogpage'                  => 'Chhù-chhiang ki-liu�k',
-'dellogpagetext'              => 'Yî-ha he chui-khiûn chhù-thet ke ki-liu�k lie�t-péu.',
-'deletionlog'                 => 'Chhù-chhiang ki-liu�k',
-'reverted'                    => 'Fî-fu�k to  chó-khì pán-pún',
-'deletecomment'               => 'Chhù-thet ke lî-yù',
-'rollback'                    => 'Fî-fu�k',
-'rollback_short'              => 'Fî-fu�k',
-'rollbacklink'                => 'fî-fu�k',
-'rollbackfailed'              => 'Mò-fap fî-fu�k',
-'cantrollback'                => 'Vù-fap fî-fu�k phiên-cho; chui-heu ke kung-hien-chá he pún vùn-chông ke vì-thu�k chok-chá.',
-'alreadyrolled'               => 'Mò-fap fî-fu�k yù [[User:$2|$2]] ([[User talk:$2|thó-lun]]) chin-hàng ke [[$1]] ke chui-heu phiên-si�p; khì-thâ ngìn yí-kîn phiên-siá fe�t-he fî-fu�k liáu ke-hong. Chui-heu phiên-si�p-chá: [[User:$3|$3]] ([[User talk:$3|Thó-lun]])。',
-'editcomment'                 => 'Phiên-siá sot-mìn he: "<i>$1</i>"。', # only shown if there is an edit comment
-'revertpage'                  => 'Fî-fu�k yù [[Special:Contributions/$2|$2]] ([[User talk:$2|tui-fa]]) ke phiên-cho; kiên-kói fì-fu�k [[User:$1|$1]] ke chui-heu yit-ke pán-pún', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'sessionfailure'              => 'Ngì-ke tên-ngi�p sṳ-fû yû mun-thì, vi-liáu fòng-chṳ� sêu-sit pûn làn-chiet, pún-chhṳ chhâu-chok yí-kîn chhí-sêu, chhiáng-on "song-yit-chông" chhùng-sîn chai-ngi�p.',
+# Delete
+'deletepage'        => 'Chhù-thet hong-mien',
+'confirm'           => 'Khok-ngin',
+'excontent'         => 'Nui-yùng pún-lòi he: "$1"',
+'excontentauthor'   => 'Nui-yùng he: "$1" (song-chhiá vì-thu�k kung-hien-chá he "$2")',
+'exbeforeblank'     => 'Pûn chhîn-khûng chhièn ke nui-yùng he: "$1"',
+'exblank'           => 'Vùn-chông he hî-khûng',
+'delete-legend'     => 'Chhù-thet',
+'historywarning'    => 'Kín-ko: Ngì chiông-yeu chhù-hi ke chông-nui hàm-yû li�t-sṳ�:',
+'confirmdeletetext' => 'Ngì chiông-voi chhiùng chṳ̂-liau-khu chûng yún-yén chhù-thet yit-ke vùn-chông fe�t-chá thù-chhiong yî-khi�p li�t-sṳ�. Chhiáng khok-thin ngì-yeu chin-hàng chhâu-chok, pin liáu-kié heu-kó, thùng-sṳ̀ ngì-ke hàng-vì fù-ha�p [[{{MediaWiki:Policy-url}}]].',
+'actioncomplete'    => 'Chhâu-chok vàn-sṳ̀n',
+'deletedtext'       => '"<nowiki>$1</nowiki>" yí-kîn pûn chhù-thet. Chui-khiûn chhù-hi ke ki-liu�k chhiáng chhâm-siòng $2.',
+'deletedarticle'    => 'Yí-kîn chhù-thet "[[$1]]"',
+'dellogpage'        => 'Chhù-chhiang ki-liu�k',
+'dellogpagetext'    => 'Yî-ha he chui-khiûn chhù-thet ke ki-liu�k lie�t-péu.',
+'deletionlog'       => 'Chhù-chhiang ki-liu�k',
+'reverted'          => 'Fî-fu�k to  chó-khì pán-pún',
+'deletecomment'     => 'Chhù-thet ke lî-yù',
+
+# Rollback
+'rollback'       => 'Fî-fu�k',
+'rollback_short' => 'Fî-fu�k',
+'rollbacklink'   => 'fî-fu�k',
+'rollbackfailed' => 'Mò-fap fî-fu�k',
+'cantrollback'   => 'Vù-fap fî-fu�k phiên-cho; chui-heu ke kung-hien-chá he pún vùn-chông ke vì-thu�k chok-chá.',
+'alreadyrolled'  => 'Mò-fap fî-fu�k yù [[User:$2|$2]] ([[User talk:$2|thó-lun]]) chin-hàng ke [[$1]] ke chui-heu phiên-si�p; khì-thâ ngìn yí-kîn phiên-siá fe�t-he fî-fu�k liáu ke-hong. Chui-heu phiên-si�p-chá: [[User:$3|$3]] ([[User talk:$3|Thó-lun]])。',
+'editcomment'    => "Phiên-siá sot-mìn he: \"''\$1''\"。", # only shown if there is an edit comment
+'revertpage'     => 'Fî-fu�k yù [[Special:Contributions/$2|$2]] ([[User talk:$2|tui-fa]]) ke phiên-cho; kiên-kói fì-fu�k [[User:$1|$1]] ke chui-heu yit-ke pán-pún', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'sessionfailure' => 'Ngì-ke tên-ngi�p sṳ-fû yû mun-thì, vi-liáu fòng-chṳ� sêu-sit pûn làn-chiet, pún-chhṳ chhâu-chok yí-kîn chhí-sêu, chhiáng-on "song-yit-chông" chhùng-sîn chai-ngi�p.',
+
+# Protect
 'protectlogpage'              => 'Pó-fu ngit-ki',
 'protectlogtext'              => 'Ha-mien he vùn-chông só-thin lâu chhí-sêu só-thin ke lie�t-péu. Chhiáng chhâm-kháu [[Special:ProtectedPages|Pó-fu vùn-chông chhîn-tân]] yî-khi�p kiám-sṳ tông-chhièn chin-hàng ke vùn-chông pó-fu.',
 'protectedarticle'            => 'Yí-kîn pó-fu "[[$1]]"',
 'unprotectedarticle'          => 'yí-kîn kié-chhù pó-fu "[[$1]]"',
 'protect-title'               => 'Chang-chhai pó-fu "$1"',
+'prot_1movedto2'              => '[[$1]] yì-thung to [[$2]]',
 'protect-legend'              => 'Khok-ngin pó-fu',
 'protectcomment'              => 'Pó-fu ke ngièn-yîn',
 'protectexpiry'               => 'Chûng-chṳ� sṳ̀-kiên',
 'protect_expiry_invalid'      => 'Sû-ngi�p ke chûng-chṳ� sṳ̀-kiên mò-háu.',
 'protect_expiry_old'          => 'Chûng-chṳ� sṳ̀-kiên yí-kîn ko-hi.',
 'protect-unchain'             => 'Yì-thung khièn-han kié-só',
-'protect-text'                => 'Ngì khó-yî chhai liá-piên chhùng-siû tui vùn-chông <strong><nowiki>$1</nowiki></strong> ke pó-fu kip-phe�t.',
-'protect-locked-blocked'      => 'Ngì put-nèn chhai pûn chhà-fûng sṳ̀ kiên-kói pó-fu khi�p-phe�t. Yî-ha he <strong>$1</strong> hien-sṳ̀ ke pó-fu khi�p-phe�t:',
-'protect-locked-dblock'       => 'Chhai chṳ̂-liau-khu só-thin sṳ̀ mò-fap kiên-kói pó-fu khi�p-phe�t.
-Yî-ha he <strong>$1</strong> hien-sṳ̀ ke pó-fu khi�p-phe�t:',
-'protect-locked-access'       => 'Ngì-ke chong-fu khièn-han put-nèn kói-chho pó-fu khi�p-phe�t, Yî-ha he <strong>$1</strong> hien-sṳ̀ ke pó-fu khi�p-phe�t:',
+'protect-text'                => "Ngì khó-yî chhai liá-piên chhùng-siû tui vùn-chông '''<nowiki>$1</nowiki>''' ke pó-fu kip-phe�t.",
+'protect-locked-blocked'      => "Ngì put-nèn chhai pûn chhà-fûng sṳ̀ kiên-kói pó-fu khi�p-phe�t. Yî-ha he '''$1''' hien-sṳ̀ ke pó-fu khi�p-phe�t:",
+'protect-locked-dblock'       => "Chhai chṳ̂-liau-khu só-thin sṳ̀ mò-fap kiên-kói pó-fu khi�p-phe�t.
+Yî-ha he '''$1''' hien-sṳ̀ ke pó-fu khi�p-phe�t:",
+'protect-locked-access'       => "Ngì-ke chong-fu khièn-han put-nèn kói-chho pó-fu khi�p-phe�t, Yî-ha he '''$1''' hien-sṳ̀ ke pó-fu khi�p-phe�t:",
 'protect-cascadeon'           => 'Yî-ha ke {{PLURAL:$1|yit-ke|tô-ke}} hong-mien pâu-hàm pún vùn-chông ke thùng-sṳ̀, khí-thung liáu lièn-só pó-fu, só-yî pún vùn-chông muk-chhièn ya-he pûn pó-fu, vù-nèn phiên-siá. Ngì hí-khó sat-thin pún hong-mien ke pó-fu khi�p-phe�t, than liá put tui lièn-só pó-fu yû yáng-hióng.',
 'protect-default'             => '(Yi-sat)',
 'protect-level-autoconfirmed' => 'Kim-chṳ� hàn-mò chu-chhak ke yung-fu',
@@ -1114,6 +1114,7 @@ Yî-ha he <strong>$1</strong> hien-sṳ̀ ke pó-fu khi�p-phe�t:',
 'protect-summary-cascade'     => 'Lièn-só',
 'protect-expiring'            => 'Chûng-chṳ� chhai-yî $1 (UTC)',
 'protect-cascade'             => 'Lièn-só pó-fu - pún-chông pâu-hàm ke só-yû hong-mien kiûn yit-phîn pó-fu.',
+'protect-expiry-options'      => '2 séu-sṳ̀:2 séu-sṳ̀, 1 thiên:1 thiên, 3 thiên:3 thiên, 1 chû:1 chû, 2 chû:2 chû, 1-ke ngie�t:1-ke ngie�t, 3-ke ngie�t:3-ke ngie�t, 6-ke ngie�t:6-ke ngie�t, 1-ngièn:1-ngièn, yún-kiú :yún-kiú', # display1:time1,display2:time2,...
 'restriction-type'            => 'Khièn-han:',
 'restriction-level'           => 'Han-chṳ khi�p-phe�t:',
 'minimum-size'                => 'Chui-séu thai-séu',
@@ -1181,7 +1182,6 @@ Chhiáng chhâm-kháu [[Special:Log/delete|chhù-hi ngit-ki]] lòi chhà-chhut c
 
 # What links here
 'whatlinkshere'      => 'Lièn-ngi�p to liá-chham',
-'linklistsub'        => '(lièn-kiet lie�t-péu)',
 'linkshere'          => 'Yî-ha vùn-chông lièn-kiet to [[:$1]]：',
 'nolinkshere'        => 'Mò-yû vùn-chông lièn-kiet to [[:$1]].',
 'nolinkshere-ns'     => 'Chhai só-sién ke miàng-sṳ khûng-kiên nui  mò-yû vùn-chông lièn-kiet to[[:$1]].',
@@ -1297,6 +1297,8 @@ chhiáng chhai hàng-thung chṳ̂-chhièn siên liáu-kié khì-thâ khó-nèn
 *Sîn vùn-chông yí-kîn yû yit-ke pâu-hàm nui-yùng ke tui-fa-hiong, fe�t-he
 *Ngì put kiêu-sién ha-mien ke fu�k-sién khiông. Chhai liá-chúng chhìn-khóng hâ, pit-sî sú-kûng yì-thung fe�t-he ha�p-phîn vùn-chông.",
 'movearticle'             => 'Yì-thung vùn-chông',
+'movenologin'             => 'Hàn-mò tên-ngi�p',
+'movenologintext'         => 'Ngì pit-sî he yit-miàng tên-ki yung-fu pin-chhiâ [[Special:UserLogin|tên-ngi�p]] heu chhòi-nèn Yì-thung yit-ke vùn-chông.',
 'newtitle'                => 'Sîn phêu-thì',
 'move-watch'              => 'Kam-sṳ chhṳ�-chông',
 'movepagebtn'             => 'Yì-thung vùn-chông',
@@ -1319,7 +1321,6 @@ Ngì khok-ngin sî-yeu chhù-thet ngièn hong-mien khi�p chin-hàng yì-thung m
 'delete_and_move_confirm' => 'Chhie�t-tui, chhù-thet chhṳ� hong-mien',
 'delete_and_move_reason'  => 'Chhù-thet yî-phien yì-thung',
 'selfmove'                => 'Ngièn-sṳ� phêu-thì khi�p muk-phêu phêu-thì siông-thùng, vù-nèn yì-thung yit-chông fu�k-koi pún-sṳ̂n.',
-'immobile_namespace'      => 'Muk-phêu phêu-thì su�k-yî thi�t-phe�t lui-hìn; put-nèn chiông vùn-chông yì-ngi�p liá-ke miàng-sṳ khûng-kiên.',
 
 # Export
 'export'            => 'Thô-chhut vùn-chông',
@@ -1328,7 +1329,7 @@ liá-yong khó-yî chiông yû-kôan vùn-chông theu-ko "[[Special:Import|Thô-
 
 Yeu thô-chhut vùn-chông, chhiáng chhai ha-mien ke vùn-sṳ-khiông chûng sû-ngi�p vùn-chông phêu-thì, mî-hàng yit-ke phêu-thì, pin sién-chet ngì he-feu sî-yeu thô-chhut tai-yû vùn-chông li�t-sṳ� yî-chhièn ke pán-pún, fe�t-he chak sién-chet thô-chhut tai-yû chui-heu yit-chhṳ phiên-cho sêu-sit ke tông-chhièn pán-pún.
 
-Nang-ngoi ngì hí-khó li-yung lièn-kiet thô-chhut tóng-on, yì-yi ngì hí-khó sṳ�-yung [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] thô-chhut [[{{MediaWiki:Mainpage}}]] vùn-chông.',
+Nang-ngoi ngì hí-khó li-yung lièn-kiet thô-chhut tóng-on, yì-yi ngì hí-khó sṳ�-yung [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] thô-chhut [[{{MediaWiki:Mainpage}}]] vùn-chông.',
 'exportcuronly'     => 'Chak thô-chhut tông-chhièn pán-pún, put pâu-hàm vàn-cháng ke li�t-sṳ� pán-pún.',
 'exportnohistory'   => "----
 '''Chu-yi:''' Chhut-yì sin-nèn ngièn-yîn, chhiùng-chhṳ péu-tân thô-chhut vùn-chông ke chhiòn-phu li�t-sṳ� yí-kîn pûn thìn yung.",
@@ -1342,7 +1343,7 @@ Nang-ngoi ngì hí-khó li-yung lièn-kiet thô-chhut tóng-on, yì-yi ngì hí-
 'allmessagesdefault'        => 'Yi-sat ke vùn-sṳ',
 'allmessagescurrent'        => 'Tông-chhièn ke vùn-sṳ',
 'allmessagestext'           => 'Liá-piên lie�t-chhut só-yû hí-khó thin-chṳ ke ne-thúng kie-mien.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => 'Ne-thúng kie-mien kûng-yung chhu-yî kôan-pit chong-thai (wgUseDatabaseMessages)。',
 'allmessagesfilter'         => 'Chang-chet péu-tha�t sṳt ko-li thiàu-khien:',
 'allmessagesmodified'       => 'Chṳ� hién-sṳ kiên-kói ko ke.',
@@ -1523,7 +1524,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'show-big-image'       => 'Vàn-cháng ke kié-chhiong-thu',
 'show-big-image-thumb' => '<small>Liá-ke puk-suk-thù ke kié-chhiong-thu he: $1 × $2 chhiong-su</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Sîn-kien thù-chhiong ke va�k-lòng',
 'imagelisttext'         => 'Yî-ha he on $2 phài-lie�t ke $1-ke tóng-on lie�t-péu.',
 'showhidebots'          => '($1 kî-hi-ngìn)',
@@ -1597,20 +1598,9 @@ Kó-yèn ngì *mò-yû* thì-chhut liá-ke chhiáng-khiù,  chhiáng put-yeu tiÃ
 Chhiáng chhai chhùng-sîn kien-chho vùn-chông chhièn sâm-sṳ̂.",
 'recreate'            => 'Chhùng-kien',
 
-# HTML dump
-'redirectingto' => 'Chhùng-thin-hiong to [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Chhîn-chhù pún-chông chhòng-chhùn？
-
-$1',
 'confirm_purge_button' => 'Khok-thin',
-
-# AJAX search
-'searchcontaining' => "Chhìm-cháu pâu-hàm ''$1'' ke vùn-chông.",
-'searchnamed'      => "Chhìm-cháu ''$1'' miàng-chhṳ̂n ke vùn-chông.",
-'articletitles'    => 'Vùn-chông kûi-yî "$1" khôi-thèu',
-'hideresults'      => 'Yún-chhòng kiet-kó',
+'confirm-purge-top'    => 'Chhîn-chhù pún-chông chhòng-chhùn？',
 
 # Multipage image navigation
 'imgmultipageprev' => '� sông yit-chông',
diff --git a/languages/messages/MessagesHaw.php b/languages/messages/MessagesHaw.php
index 42ca68c5..3c482c5c 100644
--- a/languages/messages/MessagesHaw.php
+++ b/languages/messages/MessagesHaw.php
@@ -9,6 +9,46 @@
  * @author Singularity
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'P�paho',
+	NS_SPECIAL          => 'Papa_nui',
+	NS_TALK             => 'Kūk�kūk�',
+	NS_USER             => 'Mea_hoʻohana',
+	NS_USER_TALK        => 'Kūk�kūk�_o_mea_hoʻohana',
+	NS_PROJECT_TALK     => 'Kūk�kūk�_o_Wikipikia',
+	NS_FILE             => 'Waihona',
+	NS_FILE_TALK        => 'Kūk�kūk�_o_waihona',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Kūk�kūk�_o_MediaWiki',
+	NS_TEMPLATE         => 'Anakuhi',
+	NS_TEMPLATE_TALK    => 'Kūk�kūk�_o_anakuhi',
+	NS_HELP             => 'K�kua',
+	NS_HELP_TALK        => 'Kūk�kūk�_o_k�kua',
+	NS_CATEGORY         => 'M�hele',
+	NS_CATEGORY_TALK    => 'Kūk�kūk�_o_m�hele',
+);
+
+$namespaceAliases = array(
+	'Kiʻi' => NS_FILE,
+	'Kūk�kūk�_o_kiʻi' => NS_FILE_TALK,
+);
+
+$magicWords = array(
+	'currentmonth'          => array( '1', 'KÄ’IAMAHINA', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'KÄ’IAINOAMAHINA', 'CURRENTMONTHNAME' ),
+	'currentday'            => array( '1', 'KÄ’IALÄ€', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'KÄ’IALÄ€2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'KÄ’IAINOALÄ€', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'KÄ’IAMAKAHIKI', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'KÄ’IAMANAWA', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'KÄ’IAHOLA', 'CURRENTHOUR' ),
+	'img_right'             => array( '1', 'ʻ�kau', 'right' ),
+	'img_left'              => array( '1', 'hema', 'left' ),
+	'img_none'              => array( '1', 'ʻaʻohe', 'none' ),
+	'currentweek'           => array( '1', 'KÄ’IAPULE', 'CURRENTWEEK' ),
+	'language'              => array( '0', '#ʻŌLELO', '#LANGUAGE:' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'            => 'Kahalalo i n� loulou:',
@@ -40,8 +80,6 @@ $messages = array(
 'underline-always' => 'Mau',
 'underline-never'  => '‘A‘ole loa',
 
-'skinpreview' => '(N�mua)',
-
 # Dates
 'sunday'        => 'L�pule',
 'monday'        => 'P�‘akahi',
@@ -119,7 +157,7 @@ $messages = array(
 'mytalk'         => 'Ka‘u ‘�lelo',
 'anontalk'       => 'Ke kūk�kūk� no kēia IP',
 'navigation'     => 'Ka papa huli mea',
-'and'            => 'a me',
+'and'            => '&#32;a me',
 
 'errorpagetitle'   => 'Hewa',
 'returnto'         => 'Ho‘i i� $1.',
@@ -239,51 +277,54 @@ $2',
 'ns-specialprotected' => '‘A‘ole hiki ke ho‘opololei i n� ‘ao‘ao kūikaw�',
 
 # Login and logout pages
-'logouttitle'             => 'E haʻalele ka mea hoʻohana',
-'welcomecreation'         => '== E komo mai, $1! ==
+'logouttitle'               => 'E haʻalele ka mea hoʻohana',
+'welcomecreation'           => '== E komo mai, $1! ==
 Hoʻokumu ʻia i kou waihona.
 Mai poina e loli k�u makemake ma {{SITENAME}}.',
-'yourname'                => "Inoa mea ho'ohana",
-'yourpassword'            => 'ʻŌlelo hūn�:',
-'yourpasswordagain'       => "Hua'�lelo huna hou",
-'remembermypassword'      => "Ho'omana'o ia'u",
-'login'                   => 'E komo',
-'nav-login-createaccount' => 'E komo mai / E hana',
-'loginprompt'             => 'Pono ʻoe e hoʻ� i n� makana (cookies) no ka ʻeʻe ʻana i {{SITENAME}}.',
-'userlogin'               => 'E komo / E hana',
-'logout'                  => "E ha'alele",
-'userlogout'              => "E ha'alele",
-'notloggedin'             => 'Mai ‘e‘e',
-'nologin'                 => 'ʻAʻohe �u waihona? $1.',
-'nologinlink'             => "Lilo i mea ho'ohana",
-'createaccount'           => 'E hana',
-'gotaccount'              => 'He waihona kou ʻē? $1.',
-'gotaccountlink'          => 'E komo',
-'createaccountmail'       => 'no ka leka uila',
-'userexists'              => 'Lilo ka inoa mea ho‘ohana.
+'loginpagetitle'            => 'ʻEʻe mea hoʻohana',
+'yourname'                  => "Inoa mea ho'ohana",
+'yourpassword'              => 'ʻŌlelo hūn�:',
+'yourpasswordagain'         => "Hua'�lelo huna hou",
+'remembermypassword'        => "Ho'omana'o ia'u",
+'login'                     => 'E komo',
+'nav-login-createaccount'   => 'E komo mai / E hana',
+'loginprompt'               => 'Pono ʻoe e hoʻ� i n� makana (cookies) no ka ʻeʻe ʻana i {{SITENAME}}.',
+'userlogin'                 => 'E komo / E hana',
+'logout'                    => "E ha'alele",
+'userlogout'                => "E ha'alele",
+'notloggedin'               => 'Mai ‘e‘e',
+'nologin'                   => 'ʻAʻohe �u waihona? $1.',
+'nologinlink'               => "Lilo i mea ho'ohana",
+'createaccount'             => 'E hana',
+'gotaccount'                => 'He waihona kou ʻē? $1.',
+'gotaccountlink'            => 'E komo',
+'createaccountmail'         => 'no ka leka uila',
+'userexists'                => 'Lilo ka inoa mea ho‘ohana.
 E koho i kekahi inoa, ke ‘olu‘olu.',
-'youremail'               => 'Leka uila:',
-'username'                => "Inoa mea ho'ohana:",
-'yourrealname'            => 'Inoa maoli:',
-'yourlanguage'            => 'Kou ʻ�lelo:',
-'yournick'                => 'Inoa kapakapa:',
-'email'                   => 'Leka uila',
-'loginsuccesstitle'       => 'ʻEʻe kūleʻa',
-'loginsuccess'            => "'''ʻEʻe ʻia ʻoe, ʻo \"\$1\", i� {{SITENAME}}.'''",
-'nouserspecified'         => 'Pono ʻoe e k�huakomo i ka ʻ�lelo ʻeʻe.',
-'wrongpassword'           => 'Hewa ka ʻ�lelo hūn�.
+'youremail'                 => 'Leka uila:',
+'username'                  => "Inoa mea ho'ohana:",
+'yourrealname'              => 'Inoa maoli:',
+'yourlanguage'              => 'Kou ʻ�lelo:',
+'yournick'                  => 'Inoa kapakapa:',
+'email'                     => 'Leka uila',
+'prefs-help-email-required' => 'Koina ka leka uila.',
+'loginsuccesstitle'         => 'ʻEʻe kūleʻa',
+'loginsuccess'              => "'''ʻEʻe ʻia ʻoe, ʻo \"\$1\", i� {{SITENAME}}.'''",
+'nouserspecified'           => 'Pono ʻoe e k�huakomo i ka ʻ�lelo ʻeʻe.',
+'wrongpassword'             => 'Hewa ka ʻ�lelo hūn�.
 E ʻoluʻolu, e kūlia hou.',
-'wrongpasswordempty'      => 'Hakahaka ka ʻ�lelo hūn�.
+'wrongpasswordempty'        => 'Hakahaka ka ʻ�lelo hūn�.
 E ʻoluʻolu, e kūlia hou.',
-'mailmypassword'          => 'Leka uila i ka huaʻ�lelo huna',
-'passwordremindertitle'   => "He '�lelo hūn� kūikaw� no {{SITENAME}}",
-'emailauthenticated'      => 'Ua h�‘oia ‘ia k�u leka uila ma $1.',
-'emailconfirmlink'        => 'E h�‘oia i k�u leka uila',
-'accountcreated'          => 'Ua lilo ‘ia ka mea ho‘ohana',
-'accountcreatedtext'      => 'Ua lilo ‘ia ka mea ho‘ohana no $1.',
-'loginlanguagelabel'      => "Kou '�lelo: $1",
+'mailmypassword'            => 'Leka uila i ka huaʻ�lelo huna',
+'passwordremindertitle'     => "He '�lelo hūn� kūikaw� no {{SITENAME}}",
+'emailauthenticated'        => 'Ua h�‘oia ‘ia k�u leka uila ma ka l� $2 i ka hola $3.',
+'emailconfirmlink'          => 'E h�‘oia i k�u leka uila',
+'accountcreated'            => 'Ua lilo ‘ia ka mea ho‘ohana',
+'accountcreatedtext'        => 'Ua lilo ‘ia ka mea ho‘ohana no $1.',
+'loginlanguagelabel'        => "Kou '�lelo: $1",
 
 # Password reset dialog
+'newpassword'       => 'ʻŌlelo hūn� hou:',
 'resetpass_success' => 'Ua loli ‘ia k�u hua‘�lelo huna! E ‘e‘e i�‘oe...',
 
 # Edit page toolbar
@@ -300,7 +341,7 @@ E ʻoluʻolu, e kūlia hou.',
 'hr_tip'          => 'Laina ‘ilikai (e ho‘ohana p�kiko)',
 
 # Edit pages
-'summary'                => "H�'ulu'ulu mana'o",
+'summary'                => "H�'ulu'ulu mana'o:",
 'minoredit'              => "He mea i ho'opololei iki 'ia",
 'watchthis'              => 'E n�n� pono i kēia mea',
 'savearticle'            => 'E m�lama i ka mea',
@@ -317,19 +358,20 @@ h�‘ike ‘ia i lalo:",
 'accmailtitle'           => 'Ua ho‘ouna ‘ia ka hua‘�lelo huna',
 'newarticle'             => '(Hou)',
 'anontalkpagetext'       => "---''‘O kēia ke kūk�kūk� no he mea ho‘ohana ‘a‘ohe i h�‘ike‘ia ka inoa i hana ʻia he mea ho‘ohana ai‘ole ‘a‘ole ho‘ohana ia. Pēl�, e pono m�kou ke ho‘ohana ka wahi noho IP e h�ʻoia ‘oia. In� he mea ho‘ohana ‘a‘ohe i h�‘ike‘ia ka inoa ‘oe, ke ho‘olale nei ‘ia ‘oe [[Special:UserLogin|e hana he mea ho‘ohana ai‘ole e komo]].''",
-'noarticletext'          => 'ʻAʻole ke kikokikona ma kēia ʻaoʻao, hiki i� ʻoe ke [[Special:Search/{{PAGENAME}}|huli no kēia poʻo ʻaoʻao]] i n� ʻaoʻao ʻē aʻe a i ʻole ke [{{fullurl:{{FULLPAGENAME}}|action=edit}} hoʻololi i kēia ʻaoʻao].',
-'previewnote'            => '<strong>‘O keia ka n�mua;
-‘a‘ole i m�lama ‘ia ka ho‘ololi!</strong>',
+'noarticletext'          => 'ʻAʻohe a kēia ʻaoʻao kikokikona.
+Hiki i� ʻoe ke [[Special:Search/{{PAGENAME}}|huli no kēia poʻo ʻaoʻao]] i n� ʻaoʻao ʻē aʻe, <span class="plainlinks">ke [{{fullurl:SpecialLog|page={{urlencode:{{FULLPAGENAME}}}}}} huli i n� moʻolelo pili], a i ʻole ke [{{fullurl:{{FULLPAGENAME}}|action=edit}} hoʻololi i kēia ʻaoʻao]</span>.',
+'previewnote'            => "'''‘O keia ka n�mua;
+‘a‘ole i m�lama ‘ia ka ho‘ololi!'''",
 'editing'                => 'Ke ho‘ololi nei i� $1',
 'editingsection'         => 'Ke ho‘opololei nei i� $1 (mahele)',
 'editingcomment'         => 'Ke ho‘ololi nei i� $1 (mana‘o)',
 'yourtext'               => 'Ko‘u ‘�lelo',
 'yourdiff'               => 'N� mea ‘oko‘a',
-'copyrightwarning'       => 'Hoʻokuʻu n� mea lūlū i� {{SITENAME}} i ka $2 (no n� mea kikoʻī, ʻike ʻoe i $1).
+'copyrightwarning'       => "Hoʻokuʻu n� mea lūlū i� {{SITENAME}} i ka $2 (no n� mea kikoʻī, ʻike ʻoe i $1).
 In� ʻaʻole ʻoe makemake i n� poʻe aʻe e loli i kou k�kau ʻana a ʻaʻole ʻoe makemake hoʻomalele hou i kou mau loli, in� mai waiho kou mau loli ma ʻaneʻi.<br />
 Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe ponoʻī a i ʻole ua kope i kēia kikokikona mai ke kūmole kūʻokoʻa.
-<strong>MAI WAIHO NĀ HANA PONOKOPE ME ʻOLE KA ʻAE!</strong>',
-'protectedpagewarning'   => '<strong>A‘o ‘ana:  Ua laka ‘ia kēia ‘ao‘ao, pēl�, hiki i n� "kahu" ke ho‘opololei wale n�.</strong>',
+'''MAI WAIHO NĀ HANA PONOKOPE ME ʻOLE KA ʻAE!'''",
+'protectedpagewarning'   => "'''A‘o ‘ana:  Ua laka ‘ia kēia ‘ao‘ao, pēl�, hiki i n� \"kahu\" ke ho‘opololei wale n�.'''",
 'template-protected'     => '(ho‘omalu ‘ia)',
 'template-semiprotected' => '(hapa-ho‘omalu ‘ia)',
 'edittools'              => '<!-- Eia ka ‘�lelo e h�‘ike ‘ia malalo o n� palapala ho‘ololi ame n� palapala ho‘ohui. -->',
@@ -361,17 +403,20 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 'editundo' => 'wehe',
 
 # Search results
-'noexactmatch' => "'''‘A‘ohe mo‘olelo me ka inoa \"\$1\".''' Hiki i�‘oe ke [[:\$1|hana i keia ‘ao‘ao]].",
-'prevn'        => 'mua $1',
-'nextn'        => 'hope $1',
-'viewprevnext' => 'N�n� i n� ($1) ($2) ($3)',
-'searchall'    => 'apau',
-'powersearch'  => 'Huli',
+'noexactmatch'       => "'''‘A‘ohe mo‘olelo me ka inoa \"\$1\".''' Hiki i�‘oe ke [[:\$1|hana i keia ‘ao‘ao]].",
+'prevn'              => 'mua $1',
+'nextn'              => 'hope $1',
+'viewprevnext'       => 'N�n� i n� ($1) ($2) ($3)',
+'searchhelp-url'     => 'Help:Papa kuhikuhi',
+'search-result-size' => '$1 ({{PLURAL:$2|1 huaʻ�lelo|$2 mau huaʻ�lelo}})',
+'searchall'          => 'apau',
+'powersearch'        => 'Huli',
 
 # Preferences page
 'preferences'       => "Ka'u makemake",
 'mypreferences'     => 'Ka‘u makemake',
 'changepassword'    => 'E loli i ka palapala hua‘�lelo',
+'skin-preview'      => 'N�mua',
 'prefs-rc'          => 'N� loli hou',
 'searchresultshead' => 'Huli',
 'savedprefs'        => 'Ua m�lama ‘ia k�u makemake',
@@ -415,10 +460,10 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 'filedesc'          => "H�'ulu'ulu mana'o",
 'fileuploadsummary' => "H�'ulu'ulu mana'o:",
 
-# Special:ImageList
-'imagelist_name' => 'Inoa',
+# Special:ListFiles
+'listfiles_name' => 'Inoa',
 
-# Image description page
+# File description page
 'filehist'            => 'Mo‘olelo o ka waihona',
 'filehist-current'    => 'o kēia manawa',
 'filehist-datetime'   => 'Manawa',
@@ -426,7 +471,7 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 'filehist-dimensions' => 'N� nui',
 'filehist-filesize'   => 'Nui o ka waihona',
 'filehist-comment'    => 'Manaʻo',
-'imagelinks'          => 'N� loulou',
+'imagelinks'          => 'N� loulou faila',
 'linkstoimage'        => 'Loulou {{PLURAL:$1|kekahi ‘ao‘ao|kēia mau ‘ao‘ao $1}} i kēia waihona:',
 
 # Random page
@@ -444,6 +489,7 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 'nbytes'            => '$1 {{PLURAL:$1|‘ai|‘ai}}',
 'nlinks'            => '$1 {{PLURAL:$1|loulou|loulou}}',
 'nmembers'          => '$1 {{PLURAL:$1|l�l�|l�l�}}',
+'wantedcategories'  => 'N� m�hele makemake',
 'shortpages'        => 'N� ʻaoʻao p�kole',
 'longpages'         => 'N� ʻaoʻao l�ʻihi',
 'newpages'          => 'N� ‘ao‘ao hou',
@@ -469,6 +515,9 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 # Special:Categories
 'categories' => 'N� mahele',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'N� ha‘awina o ka inoa mea ho‘ohana i k�pae ‘ia ai',
+
 # Special:ListUsers
 'listusers-submit' => 'H�‘ike',
 
@@ -477,16 +526,13 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 'emailmessage' => 'Memo:',
 
 # Watchlist
-'watchlist'            => "Ka'u papa n�n� pono",
-'mywatchlist'          => 'Ka‘u papa n�n� pono',
-'watchlistfor'         => "(no '''$1''')",
-'watch'                => 'E kia‘i',
-'watchthispage'        => 'E n�n� pono i kēia mea',
-'unwatch'              => 'E wehe kia‘i',
-'watchlist-details'    => '{{PLURAL:$1|$1|$1}} a k�u papa n�n� pono ʻaoʻao, me ke koe ʻana o n� ʻaoʻao kūk�kūk�.',
-'watchlist-hide-bots'  => 'Hūn� i n� hoʻololi e n� lopako',
-'watchlist-hide-own'   => 'Hūn� i kaʻu mau hoʻololi',
-'watchlist-hide-minor' => 'Hūn� i n� ho‘opololei iki',
+'watchlist'         => "Ka'u papa n�n� pono",
+'mywatchlist'       => 'Ka‘u papa n�n� pono',
+'watchlistfor'      => "(no '''$1''')",
+'watch'             => 'E kia‘i',
+'watchthispage'     => 'E n�n� pono i kēia mea',
+'unwatch'           => 'E wehe kia‘i',
+'watchlist-details' => '{{PLURAL:$1|$1|$1}} a k�u papa n�n� pono ʻaoʻao, me ke koe ʻana o n� ʻaoʻao kūk�kūk�.',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ke kia‘i nei...',
@@ -494,7 +540,8 @@ Ke hoʻohiki nei ʻoe i� k�kou: ua k�kau ʻoe i kēia kikokikona na ʻo ʻoe
 
 'changed' => 'ua loli ‘ia',
 
-# Delete/protect/revert
+# Delete
+'deletepage'             => 'K�pae ʻaoʻao',
 'actioncomplete'         => 'Ua pau',
 'deletedtext'            => 'Ua k�pae ʻo "<nowiki>$1</nowiki>".
 E ʻike i $2 no ka papa o n� k�pae ʻana hou.',
@@ -504,9 +551,15 @@ E ʻike i $2 no ka papa o n� k�pae ʻana hou.',
 'deletionlog'            => 'mo‘olelo k�pae',
 'deletecomment'          => 'Ke kumu e k�pae',
 'delete-edit-reasonlist' => 'Ho‘opololei i n� kumu no ke k�pae ‘ana',
-'rollbacklink'           => 'ho‘i',
+
+# Rollback
+'rollbacklink' => 'ho‘i',
+
+# Protect
+'prot_1movedto2'         => 'Ua hoʻoneʻe ʻo [[$1]] i� [[$2]]',
 'protect-default'        => '(paʻamau)',
 'protect-cantedit'       => 'ʻAʻole ʻoe hoʻololi i n� pae malu o kēia ʻaoʻao no ka mea ʻaʻohe ʻae �u o ka hoʻopololei ʻana o kēia ʻaoʻao.',
+'protect-expiry-options' => '2 hola:2 hours,1 l�:1 day,3 l�:3 days,1 pule:1 week,2 pule:2 weeks,1 mahina:1 month,3 mahina:3 months,6 mahina:6 months,1 makahiki:1 year,palena ʻole:infinite', # display1:time1,display2:time2,...
 
 # Restrictions (nouns)
 'restriction-edit' => 'E ho‘opololei',
@@ -553,6 +606,7 @@ E ʻike i $2 no ka papa o n� k�pae ʻana hou.',
 'newtitle'                => 'I ka inoa hou:',
 'move-watch'              => 'E n�n� pono i kēia mea',
 'movepagebtn'             => "E ho'ololi",
+'pagemovedsub'            => 'Kūleʻa ka neʻe ʻana',
 '1movedto2'               => 'Ua hoʻoneʻe ʻo [[$1]] i� [[$2]]',
 'movereason'              => 'Kumu:',
 'delete_and_move'         => 'E k�pae a e ho‘ololi i ka inoa',
@@ -571,11 +625,11 @@ E ʻike i $2 no ka papa o n� k�pae ʻana hou.',
 'thumbnail-more' => 'ho‘onui',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'      => 'Ka‘u inoa mea ho‘ohana',
-'tooltip-pt-mytalk'        => 'ka‘u ‘�lelo',
+'tooltip-pt-userpage'      => 'K�u inoa mea ho‘ohana',
+'tooltip-pt-mytalk'        => 'K�u ‘aoʻao ʻ�lelo',
 'tooltip-pt-preferences'   => 'ka‘u makemake',
 'tooltip-pt-watchlist'     => 'Ka papa o n� ʻaoʻao o kou n�n� ʻana no n� loli',
-'tooltip-pt-mycontris'     => 'Ka‘u mau ha‘awina',
+'tooltip-pt-mycontris'     => 'K�u mau ha‘awina',
 'tooltip-pt-login'         => 'Pai ‘ia ‘oe e ‘e‘e, ak�, ‘a‘ole he koina.',
 'tooltip-pt-logout'        => 'e ha‘alele',
 'tooltip-ca-talk'          => 'Kūk�kūk� e pili ana i kekahi ‘ao‘ao.',
@@ -596,13 +650,14 @@ Hiki i� ʻoe ke ʻikena i k�na molekumu.',
 'tooltip-t-upload'         => 'Ho‘ouka i n� waihona',
 'tooltip-t-specialpages'   => 'Helu o n� papa nui apau',
 'tooltip-ca-nstab-project' => 'N�n� i ka ‘ao‘ao papahana',
+'tooltip-ca-nstab-help'    => 'N�naina i ka ʻaoʻao k�kua',
 'tooltip-minoredit'        => 'Wae i kēia hoʻopololei me he hoʻopololei iki',
 'tooltip-save'             => 'M�lama i k�u ho‘opololei',
 
 # Media information
 'show-big-image' => 'Miomio piha',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Huli',
 
 # External editor support
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 3a3c72ad..bcfefeeb 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Agbad
  * @author Rotem Dan (July 2003)
  * @author Rotem Liss (March 2006 on)
  * @author YaronSh
@@ -18,16 +19,6 @@ $defaultUserOptionOverrides = array(
 $linkTrail = '/^([a-z�-ת]+)(.*)$/sDu';
 $fallback8bitEncoding = 'windows-1255';
 
-$skinNames = array(
-	'standard'    => 'רגיל',
-	'nostalgia'   => 'נוסטלגי',
-	'cologneblue' => 'מי� כחולי�',
-	'monobook'    => 'מונובוק',
-	'myskin'      => 'הרקע שלי',
-	'chick'       => "צ'יק",
-	'simple'      => 'פשוט',
-	'modern'      => 'מודרני',
-);
 
 $datePreferences = array(
 	'default',
@@ -74,6 +65,7 @@ $magicWords = array(
 	'forcetoc'              => array( 0,    '__חייב_תוכן_ענייני�__', '__חייב_תוכן__',   '__FORCETOC__'           ),
 	'toc'                   => array( 0,    '__תוכן_ענייני�__', '__תוכן__',             '__TOC__'                ),
 	'noeditsection'         => array( 0,    '__לל�_עריכה__',                           '__NOEDITSECTION__'      ),
+	'noheader'              => array( 0,    '__לל�_כותרת__',                           '__NOHEADER__'           ),
 	'currentmonth'          => array( 1,    'חודש נוכחי',                               'CURRENTMONTH'           ),
 	'currentmonthname'      => array( 1,    'ש� חודש נוכחי',                            'CURRENTMONTHNAME'       ),
 	'currentmonthnamegen'   => array( 1,    'ש� חודש נוכחי קניין',                      'CURRENTMONTHNAMEGEN'    ),
@@ -99,6 +91,7 @@ $magicWords = array(
 	'numberoffiles'         => array( 1,    'מספר קבצי�',                              'NUMBEROFFILES'          ),
 	'numberofusers'         => array( 1,    'מספר משתמשי�',                            'NUMBEROFUSERS'          ),
 	'numberofedits'         => array( 1,    'מספר עריכות',                             'NUMBEROFEDITS'          ),
+	'numberofviews'         => array( 1,    'מספר צפיות',                              'NUMBEROFVIEWS'          ),
 	'pagename'              => array( 1,    'ש� הדף',                                  'PAGENAME'               ),
 	'pagenamee'             => array( 1,    'ש� הדף מקודד',                            'PAGENAMEE'              ),
 	'namespace'             => array( 1,    'מרחב הש�',                                'NAMESPACE'              ),
@@ -140,6 +133,8 @@ $magicWords = array(
 	'img_middle'            => array( 1,    'ב�מצע',                                'middle'                 ),
 	'img_bottom'            => array( 1,    'למטה',                                 'bottom'                 ),
 	'img_text_bottom'       => array( 1,    'בתחתית הטקסט',                         'text-bottom'            ),
+	'img_link'              => array( 1,    'קישור=$1',                             'link=$1'               ),
+	'img_alt'               => array( 1,    'טקסט=$1',                              'alt=$1'                 ),
 	'int'                   => array( 0,    'הודעה:',                               'INT:'                   ),
 	'sitename'              => array( 1,    'ש� ה�תר',                              'SITENAME'               ),
 	'ns'                    => array( 0,    'מרחב ש�:',                             'NS:'                    ),
@@ -186,12 +181,15 @@ $magicWords = array(
 	'padleft'               => array( 0,    'ריפוד משמ�ל',                       'PADLEFT'                ),
 	'padright'              => array( 0,    'ריפוד מימין',                         'PADRIGHT'               ),
 	'special'               => array( 0,    'מיוחד',                             'special'                ),
-	'defaultsort'           => array( 1,    'מיון רגיל:',                          'DEFAULTSORT:'           ),
+	'defaultsort'           => array( 1,    'מיון רגיל:',                          'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 	'filepath'              => array( 0,    'נתיב לקובץ:',                        'FILEPATH:'              ),
 	'tag'                   => array( 0,    'תגית',                              'tag'                    ),
 	'hiddencat'             => array( 1,    '__קטגוריה_מוסתרת__',                  '__HIDDENCAT__'          ),
 	'pagesincategory'       => array( 1,    'דפי� בקטגוריה',                       'PAGESINCATEGORY', 'PAGESINCAT' ),
 	'pagesize'              => array( 1,    'גודל דף',                            'PAGESIZE'               ),
+	'index'                 => array( 1,    '__לחיפוש__',                         '__INDEX__'              ),
+	'noindex'               => array( 1,    '__ל�_לחיפוש__',                      '__NOINDEX__'            ),
+	'numberingroup'         => array( 1,    'מספר בקבוצה',                        'NUMBERINGROUP', 'NUMINGROUP' ),
 	'staticredirect'        => array( 1,    '__הפניה_קבועה__',                     '__STATICREDIRECT__'     ),
 );
 
@@ -206,8 +204,8 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'רשימת_המעקב', 'רשימת_מעקב', 'רשימת_המעקב_שלי' ),
 	'Recentchanges'             => array( 'שינויי�_�חרוני�' ),
 	'Upload'                    => array( 'העל�ה', 'העל�ת_קובץ_לשרת' ),
-	'Imagelist'                 => array( 'רשימת_תמונות', 'תמונות' ),
-	'Newimages'                 => array( 'תמונות_חדשות', 'גלריית_תמונות_חדשות' ),
+	'Listfiles'                 => array( 'רשימת_קבצי�', 'רשימת_תמונות', 'קבצי�', 'תמונות' ),
+	'Newimages'                 => array( 'קבצי�_חדשי�', 'תמונות_חדשות', 'גלריית_קבצי�_חדשי�', 'גלריית_תמונות_חדשות' ),
 	'Listusers'                 => array( 'רשימת_משתמשי�', 'משתמשי�' ),
 	'Listgrouprights'           => array( 'רשימת_הרש�ות_לקבוצה' ),
 	'Statistics'                => array( 'סטטיסטיקות' ),
@@ -215,18 +213,19 @@ $specialPageAliases = array(
 	'Lonelypages'               => array( 'דפי�_יתומי�' ),
 	'Uncategorizedpages'        => array( 'דפי�_חסרי_קטגוריה' ),
 	'Uncategorizedcategories'   => array( 'קטגוריות_חסרות_קטגוריה' ),
-	'Uncategorizedimages'       => array( 'תמונות_חסרות_קטגוריה' ),
+	'Uncategorizedimages'       => array( 'קבצי�_חסרי_קטגוריה', 'תמונות_חסרות_קטגוריה' ),
 	'Uncategorizedtemplates'    => array( 'תבניות_חסרות_קטגוריות' ),
 	'Unusedcategories'          => array( 'קטגוריות_ש�ינן_בשימוש' ),
-	'Unusedimages'              => array( 'תמונות_ש�ינן_בשימוש' ),
+	'Unusedimages'              => array( 'קבצי�_ש�ינ�_בשימוש', 'תמונות_ש�ינן_בשימוש' ),
 	'Wantedpages'               => array( 'דפי�_מבוקשי�' ),
 	'Wantedcategories'          => array( 'קטגוריות_מבוקשות' ),
-	'Missingfiles'              => array( 'קבצי�_חסרי�', 'תמונות_חסרות' ),
-	'Mostlinked'                => array( 'הדפי�_המקושרי�_ביותר' ),
+	'Wantedfiles'               => array( 'קבצי�_מבוקשי�' ),
+	'Wantedtemplates'           => array( 'תבניות_מבוקשות' ),
+	'Mostlinked'                => array( 'הדפי�_המקושרי�_ביותר', 'המקושרי�_ביותר' ),
 	'Mostlinkedcategories'      => array( 'הקטגוריות_המקושרות_ביותר' ),
 	'Mostlinkedtemplates'       => array( 'התבניות_המקושרות_ביותר' ),
+	'Mostimages'                => array( 'הקבצי�_המקושרי�_ביותר', 'התמונות_המקושרות_ביותר' ),
 	'Mostcategories'            => array( 'הקטגוריות_הרבות_ביותר', 'הדפי�_מרובי-הקטגוריות_ביותר' ),
-	'Mostimages'                => array( 'התמונות_המקושרות_ביותר' ),
 	'Mostrevisions'             => array( 'הגרס�ות_הרבות_ביותר', 'הדפי�_בעלי_מספר_העריכות_הגבוה_ביותר' ),
 	'Fewestrevisions'           => array( 'הגרס�ות_המעטות_ביותר', 'הדפי�_בעלי_מספר_העריכות_הנמוך_ביותר' ),
 	'Shortpages'                => array( 'דפי�_קצרי�' ),
@@ -237,7 +236,7 @@ $specialPageAliases = array(
 	'Protectedpages'            => array( 'דפי�_מוגני�' ),
 	'Protectedtitles'           => array( 'כותרות_מוגנות' ),
 	'Allpages'                  => array( 'כל_הדפי�' ),
-	'Prefixindex'               => array( 'דפי�_המתחילי�_ב' ) ,
+	'Prefixindex'               => array( 'דפי�_המתחילי�_ב' ),
 	'Ipblocklist'               => array( 'רשימת_חסומי�', 'רשימת_משתמשי�_חסומי�', 'משתמשי�_חסומי�' ),
 	'Specialpages'              => array( 'דפי�_מיוחדי�' ),
 	'Contributions'             => array( 'תרומות', 'תרומות_המשתמש' ),
@@ -253,7 +252,7 @@ $specialPageAliases = array(
 	'Version'                   => array( 'גרסה', 'גרסת_התוכנה' ),
 	'Allmessages'               => array( 'הודעות_המערכת' ),
 	'Log'                       => array( 'יומני�' ),
-	'Blockip'                   => array( 'חסימת_משתמש', 'חסימה' ),
+	'Blockip'                   => array( 'חסימה', 'חסימת_כתובת', 'חסימת_משתמש' ),
 	'Undelete'                  => array( 'צפייה_בדפי�_מחוקי�' ),
 	'Import'                    => array( 'ייבו�', 'ייבו�_דפי�' ),
 	'Lockdb'                    => array( 'נעילת_בסיס_הנתוני�' ),
@@ -271,14 +270,16 @@ $specialPageAliases = array(
 	'Mycontributions'           => array( 'התרומות_שלי' ),
 	'Listadmins'                => array( 'רשימת_מפעילי�' ),
 	'Listbots'                  => array( 'רשימת_בוטי�' ),
-	'Popularpages'              => array( 'דפי�_פופולריי�' ),
+	'Popularpages'              => array( 'הדפי�_הנצפי�_ביותר', 'דפי�_פופולריי�' ),
 	'Search'                    => array( 'חיפוש' ),
-	'Resetpass'                 => array( '�יפוס_סיסמה' ),
+	'Resetpass'                 => array( 'שינוי_סיסמה', '�יפוס_סיסמה' ),
 	'Withoutinterwiki'          => array( 'דפי�_לל�_קישורי_שפה' ),
 	'MergeHistory'              => array( 'מיזוג_גרס�ות' ),
 	'Filepath'                  => array( 'נתיב_לקובץ' ),
 	'Invalidateemail'           => array( 'ביטול_דו�ר' ),
 	'Blankpage'                 => array( 'דף_ריק' ),
+	'LinkSearch'                => array( 'חיפוש_קישורי�_חיצוניי�' ),
+	'DeletedContributions'      => array( 'תרומות_מחוקות' ),
 );
 
 $namespaceNames = array(
@@ -290,8 +291,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'שיחת_משתמש',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'שיחת_$1',
-	NS_IMAGE          => 'תמונה',
-	NS_IMAGE_TALK     => 'שיחת_תמונה',
+	NS_FILE           => 'קובץ',
+	NS_FILE_TALK      => 'שיחת_קובץ',
 	NS_MEDIAWIKI      => 'מדיה_ויקי',
 	NS_MEDIAWIKI_TALK => 'שיחת_מדיה_ויקי',
 	NS_TEMPLATE       => 'תבנית',
@@ -301,6 +302,10 @@ $namespaceNames = array(
 	NS_CATEGORY       => 'קטגוריה',
 	NS_CATEGORY_TALK  => 'שיחת_קטגוריה',
 );
+$namespaceAliases = array(
+	'תמונה'      => NS_FILE,
+	'שיחת_תמונה' => NS_FILE_TALK,
+);
 
 $messages = array(
 # User preference toggles
@@ -309,12 +314,12 @@ $messages = array(
 'tog-justify'                 => 'יישור פסק�ות',
 'tog-hideminor'               => 'הסתרת שינויי� משניי� ברשימת השינויי� ה�חרוני�',
 'tog-extendwatchlist'         => 'הרחבת רשימת המעקב כך שתציג �ת כל השינויי� המת�ימי� (�חרת: �ת השינוי ה�חרון בכל דף בלבד)',
-'tog-usenewrc'                => 'רשימת שינויי� �חרוני� משופרת (JavaScript)',
+'tog-usenewrc'                => 'רשימת שינויי� �חרוני� משופרת (דרוש JavaScript)',
 'tog-numberheadings'          => 'מספור כותרות �וטומטי',
-'tog-showtoolbar'             => 'הצגת סרגל העריכה',
-'tog-editondblclick'          => 'עריכת דפי� בלחיצה כפולה (JavaScript)',
+'tog-showtoolbar'             => 'הצגת סרגל העריכה (דרוש JavaScript)',
+'tog-editondblclick'          => 'עריכת דפי� בלחיצה כפולה (דרוש JavaScript)',
 'tog-editsection'             => 'עריכת פסק�ות ב�מצעות קישורי� מהצורה [עריכה]',
-'tog-editsectiononrightclick' => 'עריכת פסק�ות על ידי לחיצה ימנית על כותרות הפסק�ות (JavaScript)',
+'tog-editsectiononrightclick' => 'עריכת פסק�ות על ידי לחיצה ימנית על כותרות הפסק�ות (דרוש JavaScript)',
 'tog-showtoc'                 => 'הצגת תוכן ענייני� (עבור דפי� ע� יותר מ־3 כותרות)',
 'tog-rememberpassword'        => 'זכירת הכניסה שלי במחשב זה',
 'tog-editwidth'               => 'תיבת העריכה ברוחב מל�',
@@ -335,22 +340,24 @@ $messages = array(
 'tog-externaleditor'          => 'שימוש בעורך חיצוני כברירת מחדל (למשתמשי� מומחי� בלבד, דורש הגדרות מיוחדות במחשב)',
 'tog-externaldiff'            => 'שימוש בתוכנת השוו�ת הגרס�ות החיצונית כברירת מחדל (למשתמשי� מומחי� בלבד, דורש הגדרות מיוחדות במחשב)',
 'tog-showjumplinks'           => 'הצגת קישורי נגישות מסוג "קפוץ �ל"',
-'tog-uselivepreview'          => 'שימוש בתצוגה מקדימה מהירה (JavaScript) (ניסיוני)',
+'tog-uselivepreview'          => 'שימוש בתצוגה מקדימה מהירה (דרוש JavaScript) (ניסיוני)',
 'tog-forceeditsummary'        => 'הצגת �זהרה כש�ני מכניס תקציר עריכה ריק',
 'tog-watchlisthideown'        => 'הסתרת עריכות שלי ברשימת המעקב',
 'tog-watchlisthidebots'       => 'הסתרת בוטי� ברשימת המעקב',
 'tog-watchlisthideminor'      => 'הסתרת עריכות משניות ברשימת המעקב',
+'tog-watchlisthideliu'        => 'הסתרת עריכות של משתמשי� רשומי� ברשימת המעקב',
+'tog-watchlisthideanons'      => 'הסתרת עריכות של משתמשי� �נונימיי� ברשימת המעקב',
 'tog-nolangconversion'        => 'ביטול המרת גרס�ות שפה',
 'tog-ccmeonemails'            => 'קבלת העתקי� של הודעות דו�"ל הנשלחות ממני למשתמשי� �חרי�',
 'tog-diffonly'                => 'ביטול הצגת תוכן הדף מתחת להשוו�ות הגרס�ות',
 'tog-showhiddencats'          => 'הצגת קטגוריות מוסתרות',
+'tog-noconvertlink'           => 'ביטול המרת קישורי� לכותרות',
+'tog-norollbackdiff'          => 'השמטת ההבדלי� בין הגרס�ות ל�חר ביצוע שחזור',
 
 'underline-always'  => 'תמיד',
 'underline-never'   => '�ף פע�',
 'underline-default' => 'ברירת מחדל של הדפדפן',
 
-'skinpreview' => '(תצוגה מקדימה)',
-
 # Dates
 'sunday'        => 'ר�שון',
 'monday'        => 'שני',
@@ -443,7 +450,7 @@ $messages = array(
 'mytalk'         => 'דף השיחה שלי',
 'anontalk'       => 'השיחה עבור IP זה',
 'navigation'     => 'ניווט',
-'and'            => 'וג�',
+'and'            => '&#32;וג�',
 
 # Metadata in edit box
 'metadata_help' => 'מט�־דטה:',
@@ -480,14 +487,14 @@ $messages = array(
 'talkpagelinktext'  => 'שיחה',
 'specialpage'       => 'דף מיוחד',
 'personaltools'     => 'כלי� �ישיי�',
-'postcomment'       => 'הוספת פסקה לדף השיחה',
+'postcomment'       => 'פסקה חדשה',
 'articlepage'       => 'צפייה בדף התוכן',
 'talk'              => 'שיחה',
 'views'             => 'צפיות',
 'toolbox'           => 'תיבת כלי�',
 'userpage'          => 'צפייה בדף המשתמש',
 'projectpage'       => 'צפייה בדף המיז�',
-'imagepage'         => 'צפייה בדף המדיה',
+'imagepage'         => 'צפייה בדף הקובץ',
 'mediawikipage'     => 'צפייה בדף ההודעה',
 'templatepage'      => 'צפייה בדף התבנית',
 'viewhelppage'      => 'צפייה בדף העזרה',
@@ -506,8 +513,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '�ודות {{SITENAME}}',
 'aboutpage'            => 'Project:�ודות',
-'bugreports'           => 'דיווח על ב�גי�',
-'bugreportspage'       => 'Project:דיווח על ב�גי�',
 'copyright'            => 'התוכן מוגש בכפוף ל־$1.<br /> בעלי זכויות היוצרי� מפורטי� בהיסטוריית השינויי� של הדף.',
 'copyrightpagename'    => 'זכויות היוצרי� של {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:זכויות יוצרי�',
@@ -530,9 +535,7 @@ $messages = array(
 
 'badaccess'        => 'שגי�ה בהרש�ות',
 'badaccess-group0' => '�ינכ� מורשי� לבצע �ת הפעולה שביקשת�.',
-'badaccess-group1' => 'הפעולה שביקשת� לבצע מוגבלת למשתמשי� בקבוצה $1.',
-'badaccess-group2' => 'הפעולה שביקשת� לבצע מוגבלת למשתמשי� ב�חת הקבוצות $1.',
-'badaccess-groups' => 'הפעולה שביקשת� לבצע מוגבלת למשתמשי� ב�חת הקבוצות $1.',
+'badaccess-groups' => 'הפעולה שביקשת� לבצע מוגבלת למשתמשי� ב{{PLURAL:$2|קבוצה|�חת הקבוצות}} $1.',
 
 'versionrequired'     => 'נדרשת גרסה $1 של מדיה־ויקי',
 'versionrequiredtext' => 'גרסה $1 של מדיה־ויקי נדרשת לשימוש בדף זה. למידע נוסף, ר�ו �ת [[Special:Version|דף הגרסה]].',
@@ -547,6 +550,8 @@ $messages = array(
 'editsection'             => 'עריכה',
 'editold'                 => 'עריכה',
 'viewsourceold'           => 'הצגת מקור',
+'editlink'                => 'עריכה',
+'viewsourcelink'          => 'הצגת מקור',
 'editsectionhint'         => 'עריכת פסקה: $1',
 'toc'                     => 'תוכן ענייני�',
 'showtoc'                 => 'הצגה',
@@ -561,13 +566,13 @@ $messages = array(
 'site-atom-feed'          => 'Atom של $1',
 'page-rss-feed'           => 'RSS של $1',
 'page-atom-feed'          => 'Atom של $1',
-'red-link-title'          => '$1 (טר� נכתב)',
+'red-link-title'          => '$1 (הדף �ינו קיי�)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'דף תוכן',
 'nstab-user'      => 'דף משתמש',
 'nstab-media'     => 'מדיה',
-'nstab-special'   => 'מיוחד',
+'nstab-special'   => 'דף מיוחד',
 'nstab-project'   => 'דף מיז�',
 'nstab-image'     => 'קובץ',
 'nstab-mediawiki' => 'הודעה',
@@ -577,7 +582,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '�ין פעולה כזו',
-'nosuchactiontext'  => 'מערכת מדיה־ויקי �ינה מכירה �ת הפעולה המצויינת בכתובת ה־URL של הדף.',
+'nosuchactiontext'  => 'הפעולה שצוינה בכתובת ה־URL �ינה תקינה.
+ייתכן שטעית� בהקלדת ה־URL, �ו שהשתמשת� בקישור ל� נכון.
+ייתכן ג� שהבעיה נוצרה כתוצ�ה מב�ג בתוכנה המשמשת �ת {{SITENAME}}.',
 'nosuchspecialpage' => '�ין דף מיוחד בש� זה',
 'nospecialpagetext' => '<big>ביקשת� דף מיוחד ש�ינו קיי�.</big>
 
@@ -656,7 +663,6 @@ $1',
 'cannotdelete'         => 'מחיקת הדף �ו הקובץ ל� הצליחה. ייתכן שהו� נמחק כבר על ידי מישהו �חר.',
 'badtitle'             => 'כותרת שגויה',
 'badtitletext'         => 'כותרת הדף המבוקש הייתה ל�־חוקית, ריקה, קישור ויקי פנימי, �ו פני� שפה שגוי.',
-'perfdisabled'         => 'שירות זה הופסק זמנית בכדי ל� לפגוע בביצועי המערכת.',
 'perfcached'           => 'המידע הב� הו� עותק שמור של המידע, ועשוי של� להיות מעודכן.',
 'perfcachedts'         => 'המידע הב� הו� עותק שמור של המידע, שעודכן ל�חרונה ב־$1.',
 'querypage-no-updates' => 'העדכוני� לדף זה כרגע מופסקי�, והמידע ל� יעודכן ב�ופן שוטף.',
@@ -677,10 +683,11 @@ $2',
 'namespaceprotected'   => "�ינכ� מורשי� לערוך דפי� במרחב הש� '''$1'''.",
 'customcssjsprotected' => '�ינכ� מורשי� לערוך דף זה, כיוון שהו� כולל �ת ההגדרות ה�ישיות של משתמש �חר.',
 'ns-specialprotected'  => 'ל� ניתן לערוך דפי� מיוחדי�.',
-'titleprotected'       => 'ל� ניתן ליצור דף זה, כיוון שהמשתמש [[User:$1|$1]] הגן עליו מפני יצירה בנימוק "$2".',
+'titleprotected'       => 'ל� ניתן ליצור דף זה, כיוון שהמשתמש [[User:$1|$1]] הגן עליו מפני יצירה.
+הסיבה שניתנה לחסימה הי� "$2".',
 
 # Virus scanner
-'virus-badscanner'     => 'הגדרות שגויות: סורק הווירוסי� �ינו ידוע: <i>$1</i>',
+'virus-badscanner'     => "הגדרות שגויות: סורק הווירוסי� �ינו ידוע: ''$1''",
 'virus-scanfailed'     => 'הסריקה נכשלה (קוד: $1)',
 'virus-unknownscanner' => '�נטי־וירוס בלתי ידוע:',
 
@@ -696,7 +703,6 @@ $2',
 'remembermypassword'         => 'זכירת הכניסה במחשב זה',
 'yourdomainname'             => 'התחו� שלך:',
 'externaldberror'            => 'הייתה שגי�ה בבסיס הנתוני� של ההזדהות, �ו ש�ינכ� רש�י� לעדכן �ת חשבונכ� החיצוני.',
-'loginproblem'               => "'''�ירעה שגי�ה בכניסה ל�תר.'''<br />�נ� נסו שנית.",
 'login'                      => 'כניסה לחשבון',
 'nav-login-createaccount'    => 'כניסה לחשבון / הרשמה',
 'loginprompt'                => 'לפני הכניסה לחשבון ב{{grammar:תחילית|{{SITENAME}}}}, עליכ� לווד� כי ה"עוגיות" (Cookies) מופעלות.',
@@ -723,8 +729,8 @@ $2',
 'yournick'                   => 'חתימה:',
 'badsig'                     => 'חתימה מסוגננת שגויה.
 �נ� בדקו �ת תגיות ה־HTML.',
-'badsiglength'               => 'החתימה �רוכה מדי.
-הי� חייבת להיות קצרה מ־{{PLURAL:$1|תו �חד|$1 תווי�}}.',
+'badsiglength'               => 'חתימתכ� �רוכה מדי.
+הי� חייבת ל� להיות �רוכה מ{{PLURAL:$1|תו �חד|־$1 תווי�}}.',
 'email'                      => 'דו�"ל',
 'prefs-help-realname'        => 'הש� ה�מיתי הו� �ופציונ�לי.
 �� תבחרו לספקו, הו� ישמש לייחוס עבודתכ� �ליכ�.',
@@ -738,7 +744,7 @@ $2',
 'loginsuccesstitle'          => 'הכניסה הושלמה בהצלחה',
 'loginsuccess'               => "'''נכנסת ל{{grammar:תחילית|{{SITENAME}}}} בש� \"\$1\".'''",
 'nosuchuser'                 => '�ין משתמש בש� "$1".
-�נ� וד�ו שה�יות נכון, �ו [[Special:UserLogin/signup|צרו חשבון חדש]].',
+�נ� וד�ו שה�יות נכון (כולל �ותיות רישיות וקטנות), �ו [[Special:UserLogin/signup|צרו חשבון חדש]].',
 'nosuchusershort'            => '�ין משתמש בש� "<nowiki>$1</nowiki>". �נ� וד�ו שה�יות נכון.',
 'nouserspecified'            => 'עליכ� לציין ש� משתמש.',
 'wrongpassword'              => 'הסיסמה שהקלדת� שגויה, �נ� נסו שנית.',
@@ -759,10 +765,11 @@ $2',
 'eauthentsent'               => 'דו�"ל �ישור נשלח לכתובת הדו�"ל שקבעת. לפני שדברי דו�"ל �חרי� נשלחי� לחשבון הזה, תצטרך לפעול לפי ההור�ות בדו�"ל כדי לווד� שהדו�"ל הו� �כן שלך.',
 'throttled-mailpassword'     => 'כבר נעשה שימוש ב�פשרות שחזור הסיסמה ב{{PLURAL:$1|שעה ה�חרונה|־$1 השעות ה�חרונות}}. כדי למנוע ניצול לרעה, רק דו�ר �חד כזה יכול להישלח כל {{PLURAL:$1|שעה �חת|$1 שעות}}.',
 'mailerror'                  => 'שגי�ה בשליחת דו�ר: $1',
-'acct_creation_throttle_hit' => 'מצטערי�, יצרת� כבר $1 חשבונות. �ינכ� יכולי� ליצור חשבונות נוספי�.',
-'emailauthenticated'         => 'כתובת הדו�"ל שלך �ושרה ב־$1.',
+'acct_creation_throttle_hit' => 'מבקרי� ב�תר זה דרך כתובת ה־IP שלכ� כבר יצרו {{PLURAL:$1|חשבון �חד|$1 חשבונות}} ביו� ה�חרון. זהו המקסימו� המותר בתקופה זו.
+לפיכך, מבקרי� דרך כתובת ה־IP הזו ל� יכולי� ליצור חשבונות נוספי� ברגע זה.',
+'emailauthenticated'         => 'כתובת הדו�"ל שלך �ושרה ב־$3, $2.',
 'emailnotauthenticated'      => 'כתובת הדו�"ל שלכ� <strong>עדיין ל� �ושרה</strong> - שירותי הדו�"ל הב�י� �ינ� פעילי�.',
-'noemailprefs'               => '�נ� ציינו כתובת דו�"ל כדי שתכונות �לה יעבדו.',
+'noemailprefs'               => '�נ� ציינו כתובת דו�"ל בהעדפות שלכ� כדי שתכונות �לה יעבדו.',
 'emailconfirmlink'           => '�ישור כתובת הדו�"ל שלך',
 'invalidemailaddress'        => 'כתובת הדו�"ל �ינה מתקבלת כיוון שנר�ה שהי� בפורמט ל� נכון.
 �נ� הקלידו כתובת תקינה �ו הש�ירו �ת השדה ריק.',
@@ -772,19 +779,28 @@ $2',
 'createaccount-text'         => 'מישהו יצר חשבון בש� $2 ב{{grammar:תחילית|{{SITENAME}}}} ($4), והסיסמה הזמנית של החשבון הי� "$3". עליכ� להיכנס ולשנות עכשיו �ת הסיסמה.
 
 ב�פשרותכ� להתעל� מהודעה זו, �� החשבון נוצר בטעות.',
+'login-throttled'            => 'ביצעת� ל�חרונה ניסיונות רבי� מדי להיכנס לחשבון זה.
+�נ� המתינו לפני שתנסו שנית.',
 'loginlanguagelabel'         => 'שפה: $1',
 
 # Password reset dialog
-'resetpass'               => '�יפוס סיסמת החשבון',
-'resetpass_announce'      => 'נכנסת� ב�מצעות סיסמה זמנית שנשלחה �ליכ� בדו�"ל.
+'resetpass'                 => 'שינוי סיסמה',
+'resetpass_announce'        => 'נכנסת� ב�מצעות סיסמה זמנית שנשלחה �ליכ� בדו�"ל.
 כדי לסיי� �ת הכניסה, עליכ� לקבוע כ�ן סיסמה חדשה:',
-'resetpass_text'          => '<!-- הוסיפו טקסט כ�ן -->',
-'resetpass_header'        => 'שינוי סיסמת החשבון',
-'resetpass_submit'        => 'הגדרת הסיסמה וכניסה לחשבון',
-'resetpass_success'       => 'סיסמתכ� שונתה בהצלחה! מכניס �תכ� למערכת…',
-'resetpass_bad_temporary' => 'סיסמה זמנית שגויה. ייתכן שכבר שינית� בהצלחה �ת סיסמתכ�; �� ל�, �נ� בקשו סיסמה זמנית חדשה.',
-'resetpass_forbidden'     => 'ל� ניתן לשנות סיסמ�ות.',
-'resetpass_missing'       => 'חסר מידע בטופס.',
+'resetpass_text'            => '<!-- הוסיפו טקסט כ�ן -->',
+'resetpass_header'          => 'שינוי סיסמת החשבון',
+'oldpassword'               => 'סיסמה ישנה:',
+'newpassword'               => 'סיסמה חדשה:',
+'retypenew'                 => 'חזרה על הסיסמה חדשה:',
+'resetpass_submit'          => 'הגדרת הסיסמה וכניסה לחשבון',
+'resetpass_success'         => 'סיסמתכ� שונתה בהצלחה! מכניס �תכ� למערכת…',
+'resetpass_bad_temporary'   => 'סיסמה זמנית שגויה. ייתכן שכבר שינית� בהצלחה �ת סיסמתכ�; �� ל�, �נ� בקשו סיסמה זמנית חדשה.',
+'resetpass_forbidden'       => 'ל� ניתן לשנות סיסמ�ות.',
+'resetpass-no-info'         => 'עליכ� להיכנס לחשבון כדי לגשת לדף זה ב�ופן ישיר.',
+'resetpass-submit-loggedin' => 'שינוי סיסמה',
+'resetpass-wrong-oldpass'   => 'הסיסמה הזמנית �ו הנוכחית �ינה תקינה.
+ייתכן שכבר שינית� �ת סיסמתכ� �ו שכבר ביקשת� סיסמה זמנית חדשה.',
+'resetpass-temp-password'   => 'סיסמה זמנית:',
 
 # Edit page toolbar
 'bold_sample'     => 'טקסט מודגש',
@@ -807,8 +823,8 @@ $2',
 'hr_tip'          => 'קו �ופקי (השתדלו להמנע משימוש בקו)',
 
 # Edit pages
-'summary'                          => 'תקציר',
-'subject'                          => 'נוש�/כותרת',
+'summary'                          => 'תקציר:',
+'subject'                          => 'נוש�/כותרת:',
 'minoredit'                        => 'זהו שינוי משני',
 'watchthis'                        => 'מעקב �חרי דף זה',
 'savearticle'                      => 'שמירה',
@@ -820,8 +836,8 @@ $2',
 'missingsummary'                   => "'''תזכורת:''' ל� הזנת� תקציר עריכה. �� תלחצו שוב על כפתור השמירה, עריכתכ� תישמר בלעדיו.",
 'missingcommenttext'               => '�נ� הקלידו �ת ההודעה למטה.',
 'missingcommentheader'             => "'''תזכורת:''' ל� הזנת� נוש�/כותרת להודעה זו. �� תלחצו שוב על כפתור השמירה, עריכתכ� תישמר בלעדיו.",
-'summary-preview'                  => 'תצוגה מקדימה של התקציר',
-'subject-preview'                  => 'תצוגה מקדימה של הנוש�/הכותרת',
+'summary-preview'                  => 'תצוגה מקדימה של התקציר:',
+'subject-preview'                  => 'תצוגה מקדימה של הנוש�/הכותרת:',
 'blockedtitle'                     => 'המשתמש חסו�',
 'blockedtext'                      => '<big>\'\'\'ש� המשתמש �ו כתובת ה־IP שלכ� נחסמו.\'\'\'</big>
 
@@ -869,7 +885,10 @@ $2',
 'anontalkpagetext'                 => "----
 '''זהו דף שיחה של משתמש �נונימי שעדיין ל� יצר חשבון במערכת, �ו שהו� ל� משתמש בו. כיוון שכך, �נו צריכי� להשתמש בכתובת ה־IP כדי לזהותו. ייתכן שכתובת IP זו תייצג מספר משתמשי�. �� �ת� משתמשי� �נונימיי� ומרגישי� שקיבלת� הודעות בלתי רלוונטיות, �נ� [[Special:UserLogin|היכנסו לחשבון]] �ו [[Special:UserLogin/signup|הירשמו ל�תר]] כדי להימנע מבלבול עתידי ע� משתמשי� �נונימיי� נוספי�.'''
 ----",
-'noarticletext'                    => '�ין עדיין טקסט בדף זה. ב�פשרותכ� [[Special:Search/{{PAGENAME}}|לחפש �ת {{PAGENAME}} ב�תר]], �ו [{{fullurl:{{FULLPAGENAME}}|action=edit}} ליצור דף זה].',
+'noarticletext'                    => '�ין כרגע טקסט בדף זה.
+ב�פשרותכ� [[Special:Search/{{PAGENAME}}|לחפש �ת כותרת הדף]] בדפי� �חרי�,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} לחפש ביומני� הרלוונטיי�],
+�ו [{{fullurl:{{FULLPAGENAME}}|action=edit}} לערוך דף זה]</span>.',
 'userpage-userdoesnotexist'        => 'חשבון המשתמש "$1" �ינו רשו�. �נ� בדקו �� ברצונכ� ליצור/לערוך דף זה.',
 'clearyourcache'                   => "'''הערה:''' ל�חר השמירה, עליכ� לנקות �ת זכרון המטמון (Cache) של הדפדפן על־מנת להבחין בשינויי�.
 * ב'''מוזילה''', ב'''פיירפוקס''' �ו ב'''ספ�רי''', לחצו על מקש ה־Shift בעת לחיצתכ� על '''העלה מחדש''' (Reload), �ו הקישו Ctrl+Shift+R (�ו Cmd+Shift+R במקינטוש של �פל).
@@ -883,41 +902,45 @@ $2',
 '''הו� טר� נשמר!'''",
 'userinvalidcssjstitle'            => "'''�זהרה''': העיצוב \"\$1\" �ינו קיי�. זכרו שדפי CSS ו־JavaScript מות�מי� �ישית משתמשי� בכותרת ע� �ותיות קטנות – למשל, {{ns:user}}:דוגמה/monobook.css ול� {{ns:user}}:דוגמה/Monobook.css. כמו כן, יש להקפיד על שימוש ב־/ ול� ב־\\.",
 'updated'                          => '(מעודכן)',
-'note'                             => '<strong>הערה:</strong>',
-'previewnote'                      => '<strong>זכרו שזו רק תצוגה מקדימה, והדף עדיין ל� נשמר!</strong>',
+'note'                             => "'''הערה:'''",
+'previewnote'                      => "'''זכרו שזו רק תצוגה מקדימה.
+השינויי� שלכ� טר� נשמרו!'''",
 'previewconflict'                  => 'תצוגה מקדימה זו מציגה כיצד ייר�ה הטקסט בחלון העריכה העליון, �� תבחרו לשמור �ותו.',
-'session_fail_preview'             => '<strong>ל� ניתן לבצע �ת עריכתכ� עקב �ובדן מידע הכניסה. �נ� נסו שנית. �� זה ל� עוזר, �נ� [[Special:UserLogout|צ�ו מהחשבון]] ונסו שנית.</strong>',
-'session_fail_preview_html'        => '<strong>ל� ניתן לבצע �ת עריכת� עקב �ובדן מידע הכניסה.</strong>
+'session_fail_preview'             => "'''ל� ניתן לבצע �ת עריכתכ� עקב �ובדן מידע הכניסה. �נ� נסו שנית. �� זה ל� עוזר, �נ� [[Special:UserLogout|צ�ו מהחשבון]] ונסו שנית.'''",
+'session_fail_preview_html'        => "'''ל� ניתן לבצע �ת עריכת� עקב �ובדן מידע הכניסה.'''
 
 כיוון שב�תר זה �פשרות השימוש ב־HTML מ�ופשרת, התצוגה המקדימה מוסתרת כדי למנוע התקפות JavaScript.
 
-<strong>�� זהו ניסיון עריכה לגיטימי, �נ� נסו שנית. �� זה ל� עוזר, נסו [[Special:UserLogout|לצ�ת מהחשבון]] ולהיכנס �ליו שנית.</strong>',
-'token_suffix_mismatch'            => '<strong>עריכתכ� נדחתה כיוון שהדפדפן שלכ� מחק �ת תווי הניקוד ב�סימון העריכה. העריכה נדחתה כדי למנוע בעיות כ�לה בטקסט של הדף. ייתכן שזה קרה בגלל שירות פרוקסי �נונימי פגו�.</strong>',
+'''�� זהו ניסיון עריכה לגיטימי, �נ� נסו שנית. �� זה ל� עוזר, נסו [[Special:UserLogout|לצ�ת מהחשבון]] ולהיכנס �ליו שנית.'''",
+'token_suffix_mismatch'            => "'''עריכתכ� נדחתה כיוון שהדפדפן שלכ� מחק �ת תווי הניקוד ב�סימון העריכה. העריכה נדחתה כדי למנוע בעיות כ�לה בטקסט של הדף. ייתכן שזה קרה בגלל שירות פרוקסי �נונימי פגו�.'''",
 'editing'                          => 'עריכת $1',
 'editingsection'                   => 'עריכת $1 (פסקה)',
-'editingcomment'                   => 'עריכת $1 (הודעה)',
+'editingcomment'                   => 'עריכת $1 (פסקה חדשה)',
 'editconflict'                     => 'התנגשות עריכה: $1',
 'explainconflict'                  => "משתמש �חר שינה �ת הדף מ�ז שהתחלת� לערוך �ותו. חלון העריכה העליון מכיל �ת הטקסט בדף כפי שהו� עתה. השינויי� שלכ� מוצגי� בחלון העריכה התחתון. עליכ� למזג �ת השינויי� שלכ� לתוך הטקסט הקיי�. '''רק''' הטקסט בחלון העריכה העליון יישמר כשתשמרו �ת הדף.",
 'yourtext'                         => 'הטקסט שלך',
 'storedversion'                    => 'גרסה שמורה',
-'nonunicodebrowser'                => '<strong>�זהרה: הדפדפן שלכ� �ינו תו�� לתקן יוניקוד. כדי למנוע בעיות הנוצרות כתוצ�ה מכך ול�פשר לכ� לערוך דפי� בבטחה, תווי� ש�ינ� ב־ASCII יוצגו בתיבת העריכה כקודי� הקסדצימליי�.</strong>',
-'editingold'                       => '<strong>�זהרה: �ת� עורכי� גרסה ל� עדכנית של דף זה. �� תשמרו �ת הדף, כל השינויי� שנעשו מ�ז גרסה זו י�בדו.</strong>',
+'nonunicodebrowser'                => "'''�זהרה: הדפדפן שלכ� �ינו תו�� לתקן יוניקוד. כדי למנוע בעיות הנוצרות כתוצ�ה מכך ול�פשר לכ� לערוך דפי� בבטחה, תווי� ש�ינ� ב־ASCII יוצגו בתיבת העריכה כקודי� הקסדצימליי�.'''",
+'editingold'                       => "'''�זהרה: �ת� עורכי� גרסה ל� עדכנית של דף זה. �� תשמרו �ת הדף, כל השינויי� שנעשו מ�ז גרסה זו י�בדו.'''",
 'yourdiff'                         => 'הבדלי�',
 'copyrightwarning'                 => "'''שימו לב:''' תרומתכ� ל{{grammar:תחילית|{{SITENAME}}}} תפורס� תחת תנ�י הרישיון $2 (ר�ו $1 לפרטי� נוספי�). �� �ינכ� רוצי� שעבודתכ� תהיה זמינה לעריכה על ידי �חרי�, שתופץ לעיני כל, וש�חרי� יוכלו להעתיק ממנה בציון המקור – �ל תפרסמו �ותה פה. כמו־כן, �ת� מבטיחי� לנו כי כתבת� �ת הטקסט הזה בעצמכ�, �ו העתקת� �ותו ממקור ש�ינו מוגן על ידי זכויות יוצרי�. '''�ל תעשו שימוש בחומר המוגן בזכויות יוצרי� לל� רשות!'''",
 'copyrightwarning2'                => "'''שימו לב:''' תורמי� �חרי� עשויי� לערוך �ו �ף להסיר �ת תרומתכ� ל{{grammar:תחילית|{{SITENAME}}}}. �� �ינכ� רוצי� שעבודתכ� תהיה זמינה לעריכה על ידי �חרי� – �ל תפרסמו �ותה פה. כמו־כן, �ת� מבטיחי� לנו כי כתבת� �ת הטקסט הזה בעצמכ�, �ו העתקת� �ותו ממקור ש�ינו מוגן על ידי זכויות יוצרי� (ר�ו $1 לפרטי� נוספי�). '''�ל תעשו שימוש בחומר המוגן בזכויות יוצרי� לל� רשות!'''",
-'longpagewarning'                  => '<strong>�זהרה: גודל דף זה הו� $1 קילובייטי�. בדפדפני� מסוימי� יהיו בעיות בעריכת דף הגדול מ־32 קילובייטי�. �נ� שיקלו לחלק דף זה לדפי� קטני� יותר. �� זהו דף שיחה, שיקלו ל�רכב �ותו.</strong>',
-'longpageerror'                    => '<strong>שגי�ה: הטקסט ששלחת� הו� ב�ורך $1 קילובייטי�, �ך �סור לו להיות �רוך יותר מהמקסימו� של $2 קילובייטי�. ל� ניתן לשומרו.</strong>',
-'readonlywarning'                  => '<strong>�זהרה: בסיס הנתוני� ננעל לצורך תחזוקה. בזמן זה �י �פשר לשמור �ת הטקסט הערוך. בינתיי�, עד סיו� התחזוקה, �ת� יכולי� להשתמש בעורך חיצוני. �נו מתנצלי� על התקלה.</strong>',
-'protectedpagewarning'             => '<strong>�זהרה: דף זה ננעל כך שרק מפעילי מערכת יכולי� לערוך �ותו. �נ� וד�ו ש�ת� פועלי� על־פי העקרונות לעריכת דפי� �לו.</strong>',
+'longpagewarning'                  => "'''�זהרה: גודל דף זה הו� $1 קילובייטי�. בדפדפני� מסוימי� יהיו בעיות בעריכת דף הגדול מ־32 קילובייטי�. �נ� שיקלו לחלק דף זה לדפי� קטני� יותר. �� זהו דף שיחה, שיקלו ל�רכב �ותו.'''",
+'longpageerror'                    => "'''שגי�ה: הטקסט ששלחת� הו� ב�ורך $1 קילובייטי�, �ך �סור לו להיות �רוך יותר מהמקסימו� של $2 קילובייטי�. ל� ניתן לשומרו.'''",
+'readonlywarning'                  => "'''�זהרה: בסיס הנתוני� ננעל לצורך תחזוקה. בזמן זה �י �פשר לשמור �ת הטקסט הערוך.
+ב�פשרותכ� להעתיק ולהדביק �ת הטקסט לתוך קובץ טקסט ולשמור �ותו עד שתיגמר הנעילה.'''
+
+מנהל המערכת שנעל �ת בסיס הנתוני� סיפק �ת ההסבר הב�: $1",
+'protectedpagewarning'             => "'''�זהרה: דף זה ננעל כך שרק מפעילי מערכת יכולי� לערוך �ותו. �נ� וד�ו ש�ת� פועלי� על־פי העקרונות לעריכת דפי� �לו.'''",
 'semiprotectedpagewarning'         => "'''הערה:''' דף זה ננעל כך שרק משתמשי� רשומי� יכולי� לערוך �ותו.",
 'cascadeprotectedwarning'          => "'''�זהרה:''' דף זה ננעל כך שרק מפעילי מערכת יכולי� לערוך �ותו, כיוון שהו� מוכלל {{PLURAL:$1|בדף הב�, שמופעלת עליו|בדפי� הב�י�, שמופעלת עליה�}} הגנה מדורגת:",
-'titleprotectedwarning'            => '<strong>�זהרה: דף זה ננעל כך שרק משתמשי� מסוימי� יכולי� ליצור �ותו.</strong>',
+'titleprotectedwarning'            => "'''�זהרה: דף זה ננעל כך שדרושות [[Special:ListGroupRights|הרש�ות מסוימות]] כדי ליצור �ותו.'''",
 'templatesused'                    => 'תבניות המופיעות בדף זה:',
 'templatesusedpreview'             => 'תבניות המופיעות בתצוגה המקדימה הזו:',
 'templatesusedsection'             => 'תבניות המופיעות בפסקה זו:',
 'template-protected'               => '(מוגנת)',
 'template-semiprotected'           => '(מוגנת חלקית)',
-'hiddencategories'                 => 'דף זה חבר ב{{PLURAL:$1|קטגוריה מוסתרת �חת|־$1 קטגוריות מוסתרות}}:',
+'hiddencategories'                 => 'דף זה כלול ב{{PLURAL:$1|קטגוריה מוסתרת �חת|־$1 קטגוריות מוסתרות}}:',
 'edittools'                        => '<!-- הטקסט הנכתב כ�ן יוצג מתחת לטפסי עריכת דפי� והעל�ת קבצי�, ולפיכך ניתן לכתוב להציג בו תווי� קשי� לכתיבה, קטעי� מוכני� של טקסט ועוד. -->',
 'nocreatetitle'                    => 'יצירת הדפי� הוגבלה',
 'nocreatetext'                     => '�תר זה מגביל �ת ה�פשרות ליצור דפי� חדשי�. ב�פשרותכ� לחזור �חורה ולערוך דף קיי�, �ו [[Special:UserLogin|להיכנס לחשבון]].',
@@ -929,11 +952,22 @@ $2',
 
 �נ� שיקלו �� יהיה זה נכון להמשיך לערוך �ת הדף.
 יומן המחיקות של הדף מוצג להלן:",
+'deleted-notice'                   => 'דף זה נמחק.
+יומן המחיקות של הדף מוצג להלן.',
+'deletelog-fulllog'                => 'צפייה ביומן המל�',
+'edit-hook-aborted'                => 'העריכה בוטלה על־ידי Hook.
+ל� ניתן הסבר לביטול.',
+'edit-gone-missing'                => 'ל� ניתן לעדכן �ת הדף.
+נר�ה שהו� נמחק.',
+'edit-conflict'                    => 'התנגשות עריכה.',
+'edit-no-change'                   => 'המערכת התעלמה מעריכתכ�, כיוון של� נעשה שינוי בטקסט.',
+'edit-already-exists'              => 'ל� ניתן ליצור דף חדש.
+הו� כבר קיי�.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => '�זהרה: דף זה כולל יותר מדי קרי�ות למשתני� הגוזלי� מש�בי�.
 
-צריכות להיות פחות מ־$2 קרי�ות כ�לה, �ך כרגע יש $1.',
+{{PLURAL:$2|צריכה להיות פחות מקרי�ה �חת כז�ת|צריכות להיות פחות מ־$2 קרי�ות כ�לה}}, �ך כרגע יש {{PLURAL:$1|קרי�ה �חת|$1 קרי�ות}}.',
 'expensive-parserfunction-category'       => 'דפי� ע� יותר מדי קרי�ות למשתני� הגוזלי� מש�בי�',
 'post-expand-template-inclusion-warning'  => '�זהרה: התבניות המוכללות בדף זה גדולות מדי.
 חלק מהתבניות ל� יוכללו.',
@@ -941,6 +975,8 @@ $2',
 'post-expand-template-argument-warning'   => '�זהרה: דף זה כולל לפחות תבנית �חת שבה פרמטרי� גדולי� מדי.
 פרמטרי� �לה הושמטו.',
 'post-expand-template-argument-category'  => 'דפי� שבה� הושמטו פרמטרי� של תבניות',
+'parser-template-loop-warning'            => 'נמצ�ה תבנית הקור�ת לעצמה: [[$1]]',
+'parser-template-recursion-depth-warning' => 'עומק התבניות המוכללות זו בזו עבר �ת המקסימו� ה�פשרי ($1)',
 
 # "Undo" feature
 'undo-success' => 'ניתן לבטל �ת העריכה. �נ� בידקו �ת השוו�ת הגרס�ות למטה כדי לווד� שזה מה ש�ת� רוצי� לעשות, ו�ז שמרו �ת השינויי� למטה כדי לבצע �ת ביטול העריכה.',
@@ -953,28 +989,29 @@ $2',
 'cantcreateaccount-text' => '�פשרות יצירת החשבונות מכתובת ה־IP הזו (<b>$1</b>) נחסמה על ידי [[User:$3|$3]]. הסיבה שניתנה על ידי $3 הי� "$2".',
 
 # History pages
-'viewpagelogs'        => 'הצגת יומני� עבור דף זה',
-'nohistory'           => '�ין היסטוריית שינויי� עבור דף זה.',
-'revnotfound'         => 'גרסה זו ל� נמצ�ה',
-'revnotfoundtext'     => 'הגרסה הישנה של דף זה ל� נמצ�ה. �נ� בדקו �ת כתובת הקישור שהוביל �תכ� הנה.',
-'currentrev'          => 'גרסה נוכחית',
-'revisionasof'        => 'גרסה מת�ריך $1',
-'revision-info'       => 'גרסה מת�ריך $1 מ�ת $2',
-'previousrevision'    => '→ הגרסה הקודמת',
-'nextrevision'        => 'הגרסה הב�ה �',
-'currentrevisionlink' => 'הגרסה הנוכחית',
-'cur'                 => 'נוכ',
-'next'                => 'הב�',
-'last'                => '�חרון',
-'page_first'          => 'ר�שון',
-'page_last'           => '�חרון',
-'histlegend'          => 'השוו�ת גרס�ות: סמנו �ת תיבות ה�פשרויות של הגרס�ות המיועדות להשוו�ה, והקישו על Enter �ו על הכפתור שלמעלה �ו למטה.<br />
-מקר�: (נוכ) = הבדלי� ע� הגרסה הנוכחית, (�חרון) = הבדלי� ע� הגרסה הקודמת, מ = שינוי משני',
-'deletedrev'          => '[נמחק]',
-'histfirst'           => 'ר�שונות',
-'histlast'            => '�חרונות',
-'historysize'         => '({{PLURAL:$1|בית �חד|$1 בתי�}})',
-'historyempty'        => '(ריק)',
+'viewpagelogs'           => 'הצגת יומני� עבור דף זה',
+'nohistory'              => '�ין היסטוריית שינויי� עבור דף זה.',
+'currentrev'             => 'גרסה נוכחית',
+'currentrev-asof'        => 'גרסה נוכחית מת�ריך $1',
+'revisionasof'           => 'גרסה מת�ריך $1',
+'revision-info'          => 'גרסה מת�ריך $1 מ�ת $2', # Additionally available: $3: revision id
+'previousrevision'       => '→ הגרסה הקודמת',
+'nextrevision'           => 'הגרסה הב�ה �',
+'currentrevisionlink'    => 'הגרסה הנוכחית',
+'cur'                    => 'נוכ',
+'next'                   => 'הב�',
+'last'                   => '�חרון',
+'page_first'             => 'ר�שון',
+'page_last'              => '�חרון',
+'histlegend'             => "השוו�ת גרס�ות: סמנו �ת תיבות ה�פשרויות של הגרס�ות המיועדות להשוו�ה, והקישו על Enter �ו על הכפתור שלמעלה �ו למטה.<br />
+מקר�: '''({{int:cur}})''' = הבדלי� ע� הגרסה הנוכחית,
+'''({{int:last}})''' = הבדלי� ע� הגרסה הקודמת, '''{{int:minoreditletter}}''' = שינוי משני.",
+'history-fieldset-title' => 'חיפוש בהיסטוריית הדף',
+'deletedrev'             => '[נמחק]',
+'histfirst'              => 'ר�שונות',
+'histlast'               => '�חרונות',
+'historysize'            => '({{PLURAL:$1|בית �חד|$1 בתי�}})',
+'historyempty'           => '(ריק)',
 
 # Revision feed
 'history-feed-title'          => 'היסטוריית גרס�ות',
@@ -988,12 +1025,11 @@ $2',
 'rev-deleted-comment'         => '(תקציר העריכה הוסתר)',
 'rev-deleted-user'            => '(ש� המשתמש הוסתר)',
 'rev-deleted-event'           => '(פעולת היומן הוסתרה)',
-'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
-גרסת הדף הזו הוסרה מה�רכיוני� הציבוריי�. ייתכן שישנ� פרטי� נוספי� על כך ב[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} יומן המחיקות].
-</div>',
-'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">
-גרסת הדף הזו הוסרה מה�רכיוני� הציבוריי�. כמפעיל מערכת, ב�פשרותך לצפות בגרסה; ייתכן שישנ� פרטי� נוספי� על כך ב[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} יומן המחיקות].
-</div>',
+'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">גרסת הדף הזו הוסרה מה�רכיוני� הציבוריי�.
+ייתכן שישנ� פרטי� נוספי� על כך ב[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} יומן המחיקות].</div>',
+'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">גרסת הדף הזו הוסרה מה�רכיוני� הציבוריי�.
+כמפעיל מערכת, ב�פשרותך לצפות בגרסה;
+ייתכן שישנ� פרטי� נוספי� על כך ב[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} יומן המחיקות].</div>',
 'rev-delundel'                => 'הצגה/הסתרה',
 'revisiondelete'              => 'מחיקת ושחזור גרס�ות',
 'revdelete-nooldid-title'     => 'גרסת מטרה בלתי תקינה',
@@ -1057,6 +1093,7 @@ $2',
 'mergehistory-invalid-destination' => 'דף היעד חייב להיות בעל כותרת תקינה.',
 'mergehistory-autocomment'         => 'מיזג �ת [[:$1]] לתוך [[:$2]]',
 'mergehistory-comment'             => 'מיזג �ת [[:$1]] לתוך [[:$2]]: $3',
+'mergehistory-same-destination'    => 'דפי המקור והיעד זהי�',
 
 # Merge log
 'mergelog'           => 'יומן מיזוגי�',
@@ -1069,120 +1106,201 @@ $2',
 'difference'              => '(הבדלי� בין גרס�ות)',
 'lineno'                  => 'שורה $1:',
 'compareselectedversions' => 'השוו�ת הגרס�ות שנבחרו',
+'visualcomparison'        => 'השוו�ה חזותית',
+'wikicodecomparison'      => 'השוו�ת קוד ויקי',
 'editundo'                => 'ביטול',
-'diff-multi'              => '({{PLURAL:$1|גרסת ביניי� �חת �ינה מוצגת|$1 גרס�ות ביניי� �ינן מוצגות}}.)',
+'diff-multi'              => '({{PLURAL:$1|גרסת ביניי� �חת �ינה מוצגת|$1 גרס�ות ביניי� �ינן מוצגות}})',
+'diff-movedto'            => 'הועבר ל$1',
+'diff-styleadded'         => 'נוסף סגנון $1',
+'diff-added'              => 'נוסף $1',
+'diff-changedto'          => 'שונה ל$1',
+'diff-movedoutof'         => 'הועבר מ$1',
+'diff-styleremoved'       => 'הוסר סגנון $1',
+'diff-removed'            => 'הוסר $1',
+'diff-changedfrom'        => 'שונה מ$1',
+'diff-src'                => 'מקור',
+'diff-withdestination'    => 'ע� היעד $1',
+'diff-with'               => '&#32;ע� $1 $2',
+'diff-with-final'         => '&#32;וג� $1 $2',
+'diff-width'              => 'רוחב',
+'diff-height'             => 'גובה',
+'diff-p'                  => 'פיסקה',
+'diff-blockquote'         => 'ציטוט',
+'diff-h1'                 => "'''כותרת (רמה 1)'''",
+'diff-h2'                 => "'''כותרת (רמה 2)'''",
+'diff-h3'                 => "'''כותרת (רמה 3)'''",
+'diff-h4'                 => "'''כותרת (רמה 4)'''",
+'diff-h5'                 => "'''כותרת (רמה 5)'''",
+'diff-pre'                => "'''חלק ע� עיצוב קבוע'''",
+'diff-div'                => "'''מקטע'''",
+'diff-ul'                 => "'''רשימה ע� תבליטי�'''",
+'diff-ol'                 => "'''רשומה ממוספרת'''",
+'diff-li'                 => "'''פריט רשימה'''",
+'diff-table'              => "'''טבלה'''",
+'diff-tbody'              => "'''תוכן טבלה'''",
+'diff-tr'                 => "'''שורה'''",
+'diff-td'                 => "'''ת�'''",
+'diff-th'                 => "'''כותרת'''",
+'diff-br'                 => "'''מעבר שורה'''",
+'diff-hr'                 => "'''קו �ופקי'''",
+'diff-code'               => "'''קטע של קוד מחשב'''",
+'diff-dl'                 => "'''רשימת הגדרות'''",
+'diff-dt'                 => "'''מונח להגדרה'''",
+'diff-dd'                 => "'''הגדרה'''",
+'diff-input'              => "'''פריט קלט'''",
+'diff-form'               => "'''טופס'''",
+'diff-img'                => "'''תמונה'''",
+'diff-span'               => "'''קטע'''",
+'diff-a'                  => "'''קישור'''",
+'diff-i'                  => "'''הטיה'''",
+'diff-b'                  => "'''הדגשה'''",
+'diff-strong'             => "'''טקסט מובלט מ�וד'''",
+'diff-em'                 => "'''טקסט מובלט'''",
+'diff-font'               => "'''גופן'''",
+'diff-big'                => "'''גדול'''",
+'diff-del'                => "'''נמחק'''",
+'diff-tt'                 => "'''רוחב קבוע'''",
+'diff-sub'                => "'''כתב תחתי'''",
+'diff-sup'                => "'''כתב עילי'''",
+'diff-strike'             => "'''קו חוצה'''",
 
 # Search results
-'searchresults'             => 'תוצ�ות החיפוש',
-'searchresulttext'          => 'למידע נוסף על חיפוש ב{{grammar:תחילית|{{SITENAME}}}}, עיינו ב[[Project:עזרה|דפי העזרה]].',
-'searchsubtitle'            => 'לחיפוש המונח \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|לכל הדפי� המתחילי� ב"$1"]] | [[Special:WhatLinksHere/$1|לכל הדפי� המקשרי� ל"$1"]])',
-'searchsubtitleinvalid'     => "לחיפוש המונח '''$1'''",
-'noexactmatch'              => '�ין דף שכותרתו "$1". ב�פשרותכ� [[:$1|ליצור �ת הדף]].',
-'noexactmatch-nocreate'     => '�ין דף שכותרתו "$1".',
-'toomanymatches'            => 'יותר מדי תוצ�ות נמצ�ו, �נ� נסו מילות חיפוש �חרות',
-'titlematches'              => 'כותרות דפי� תו�מות',
-'notitlematches'            => '�ין כותרות דפי� תו�מות',
-'textmatches'               => 'דפי� ע� תוכן תו��',
-'notextmatches'             => '�ין דפי� ע� תוכן תו��',
-'prevn'                     => '$1 הקודמי�',
-'nextn'                     => '$1 הב�י�',
-'viewprevnext'              => 'צפו ב - ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|מילה �חת|$2 מילי�}})',
-'search-result-score'       => 'רלוונטיות: $1%',
-'search-redirect'           => '(הפניה $1)',
-'search-section'            => '(פסקה $1)',
-'search-suggest'            => 'ה�� התכוונת ל: $1',
-'search-interwiki-caption'  => 'מיזמי �חות',
-'search-interwiki-default'  => '$1 תוצ�ות:',
-'search-interwiki-more'     => '(עוד)',
-'search-mwsuggest-enabled'  => 'ע� הצעות',
-'search-mwsuggest-disabled' => 'לל� הצעות',
-'search-relatedarticle'     => 'קשור',
-'mwsuggest-disable'         => 'ביטול הצעות AJAX',
-'searchrelated'             => 'קשור',
-'searchall'                 => 'הכול',
-'showingresults'            => "הצגת עד {{PLURAL:$1|תוצ�ה '''�חת'''|'''$1''' תוצ�ות}} החל ממספר #'''$2''':",
-'showingresultsnum'         => "הצגת {{PLURAL:$3|תוצ�ה '''�חת'''|'''$3''' תוצ�ות}} החל ממספר #'''$2''':",
-'showingresultstotal'       => "הצגת {{PLURAL:$3|תוצ�ה '''$1''' מתוך '''$3'''|תוצ�ות '''$1 - $2''' מתוך '''$3'''}}",
-'nonefound'                 => "'''הערה''': כברירת מחדל, החיפוש מבוצע במספר מרחבי ש� בלבד. ב�פשרותכ� לכתוב '''all:''' לפני מונח החיפוש כדי לחפש בכל הדפי� (כולל דפי שיחה, תבניות, ועוד), �ו לכתוב לפני מונח החיפוש �ת מרחב הש� ש�ת� מעונייני� בו.",
-'powersearch'               => 'חיפוש מתקד�',
-'powersearch-legend'        => 'חיפוש מתקד�',
-'powersearch-ns'            => 'חיפוש במרחבי הש�:',
-'powersearch-redir'         => 'הצגת דפי הפניה',
-'powersearch-field'         => 'חיפוש',
-'search-external'           => 'חיפוש חיצוני',
-'searchdisabled'            => 'לצערנו, עקב עומס על המערכת, ל� ניתן לחפש כעת בטקסט המל� של הדפי�. ב�פשרותכ� להשתמש בינתיי� בגוגל, �ך שימו לב שייתכן שהו� �ינו מעודכן.',
+'searchresults'                    => 'תוצ�ות החיפוש',
+'searchresults-title'              => 'תוצ�ות החיפוש "$1"',
+'searchresulttext'                 => 'למידע נוסף על חיפוש ב{{grammar:תחילית|{{SITENAME}}}}, עיינו ב[[Project:עזרה|דפי העזרה]].',
+'searchsubtitle'                   => 'לחיפוש המונח \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|לכל הדפי� המתחילי� ב"$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|לכל הדפי� המקשרי� ל"$1"]])',
+'searchsubtitleinvalid'            => "לחיפוש המונח '''$1'''",
+'noexactmatch'                     => '�ין דף שכותרתו "$1". ב�פשרותכ� [[:$1|ליצור �ת הדף]].',
+'noexactmatch-nocreate'            => '�ין דף שכותרתו "$1".',
+'toomanymatches'                   => 'יותר מדי תוצ�ות נמצ�ו, �נ� נסו מילות חיפוש �חרות',
+'titlematches'                     => 'כותרות דפי� תו�מות',
+'notitlematches'                   => '�ין כותרות דפי� תו�מות',
+'textmatches'                      => 'דפי� ע� תוכן תו��',
+'notextmatches'                    => '�ין דפי� ע� תוכן תו��',
+'prevn'                            => '$1 הקודמי�',
+'nextn'                            => '$1 הב�י�',
+'viewprevnext'                     => 'צפו ב - ($1) ($2) ($3)',
+'searchmenu-legend'                => '�פשרויות חיפוש',
+'searchmenu-exists'                => "'''קיי� דף בש� \"[[:\$1]]\" ב�תר זה'''",
+'searchmenu-new'                   => "'''יצירת הדף \"[[:\$1]]\" ב�תר זה'''",
+'searchhelp-url'                   => 'Help:תפריט ר�שי',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|מצי�ת דפי� ע� קידומת זו]]',
+'searchprofile-articles'           => 'דפי תוכן',
+'searchprofile-articles-and-proj'  => 'דפי תוכן ודפי מיז�',
+'searchprofile-project'            => 'דפי מיז�',
+'searchprofile-images'             => 'קבצי�',
+'searchprofile-everything'         => 'הכול',
+'searchprofile-advanced'           => 'מתקד�',
+'searchprofile-articles-tooltip'   => 'חיפוש $1',
+'searchprofile-project-tooltip'    => 'חיפוש $1',
+'searchprofile-images-tooltip'     => 'חיפוש קבצי�',
+'searchprofile-everything-tooltip' => 'חיפוש בכל התוכן (למעט דפי השיחה)',
+'searchprofile-advanced-tooltip'   => 'חיפוש במרחבי ש� מות�מי� �ישית',
+'prefs-search-nsdefault'           => 'חיפוש ע� הגדרות ברירת המחדל:',
+'prefs-search-nscustom'            => 'חיפוש במרחבי ש� מות�מי� �ישית:',
+'search-result-size'               => '$1 ({{PLURAL:$2|מילה �חת|$2 מילי�}})',
+'search-result-score'              => 'רלוונטיות: $1%',
+'search-redirect'                  => '(הפניה $1)',
+'search-section'                   => '(פסקה $1)',
+'search-suggest'                   => 'ה�� התכוונת ל: $1',
+'search-interwiki-caption'         => 'מיזמי �חות',
+'search-interwiki-default'         => '$1 תוצ�ות:',
+'search-interwiki-more'            => '(עוד)',
+'search-mwsuggest-enabled'         => 'ע� הצעות',
+'search-mwsuggest-disabled'        => 'לל� הצעות',
+'search-relatedarticle'            => 'קשור',
+'mwsuggest-disable'                => 'ביטול הצעות AJAX',
+'searchrelated'                    => 'קשור',
+'searchall'                        => 'הכול',
+'showingresults'                   => "הצגת עד {{PLURAL:$1|תוצ�ה '''�חת'''|'''$1''' תוצ�ות}} החל ממספר #'''$2''':",
+'showingresultsnum'                => "הצגת {{PLURAL:$3|תוצ�ה '''�חת'''|'''$3''' תוצ�ות}} החל ממספר #'''$2''':",
+'showingresultstotal'              => "הצגת {{PLURAL:$4|תוצ�ה '''$1''' מתוך '''$3'''|תוצ�ות '''$1 - $2''' מתוך '''$3'''}}",
+'nonefound'                        => "'''הערה''': כברירת מחדל, החיפוש מבוצע במספר מרחבי ש� בלבד. ב�פשרותכ� לכתוב '''all:''' לפני מונח החיפוש כדי לחפש בכל הדפי� (כולל דפי שיחה, תבניות, ועוד), �ו לכתוב לפני מונח החיפוש �ת מרחב הש� ש�ת� מעונייני� בו.",
+'search-nonefound'                 => 'ל� נמצ�ו תוצ�ות המת�ימות לחיפוש.',
+'powersearch'                      => 'חיפוש מתקד�',
+'powersearch-legend'               => 'חיפוש מתקד�',
+'powersearch-ns'                   => 'חיפוש במרחבי הש�:',
+'powersearch-redir'                => 'הצגת דפי הפניה',
+'powersearch-field'                => 'חיפוש',
+'search-external'                  => 'חיפוש חיצוני',
+'searchdisabled'                   => 'לצערנו, עקב עומס על המערכת, ל� ניתן לחפש כעת בטקסט המל� של הדפי�. ב�פשרותכ� להשתמש בינתיי� בגוגל, �ך שימו לב שייתכן שהו� �ינו מעודכן.',
 
 # Preferences page
-'preferences'              => 'העדפות',
-'mypreferences'            => 'ההעדפות שלי',
-'prefs-edits'              => 'מספר עריכות:',
-'prefsnologin'             => 'ל� נרשמת ב�תר',
-'prefsnologintext'         => 'עליכ� <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} להיכנס לחשבון]</span> כדי לשנות העדפות משתמש.',
-'prefsreset'               => 'ההעדפות שוחזרו למצבן הקוד�.',
-'qbsettings'               => 'הגדרות סרגל כלי�',
-'qbsettings-none'          => 'לל�',
-'qbsettings-fixedleft'     => 'קבוע משמ�ל',
-'qbsettings-fixedright'    => 'קבוע מימין',
-'qbsettings-floatingleft'  => 'צף משמ�ל',
-'qbsettings-floatingright' => 'צף מימין',
-'changepassword'           => 'שינוי סיסמה',
-'skin'                     => 'עיצוב',
-'math'                     => 'נוסח�ות מתמטיות',
-'dateformat'               => 'מבנה ת�ריך',
-'datedefault'              => 'ברירת המחדל',
-'datetime'                 => 'ת�ריך ושעה',
-'math_failure'             => 'עיבוד הנוסחה נכשל',
-'math_unknown_error'       => 'שגי�ה ל� ידועה',
-'math_unknown_function'    => 'פונקציה ל� מוכרת',
-'math_lexing_error'        => 'שגי�ת לקסינג',
-'math_syntax_error'        => 'שגי�ת תחביר',
-'math_image_error'         => 'ההמרה ל־PNG נכשלה; �נ� בדקו �� התקנת� נכון �ת latex, �ת dvips, �ת gs ו�ת convert.',
-'math_bad_tmpdir'          => 'התוכנה ל� הצליחה לכתוב �ו ליצור �ת הספרייה הזמנית של המתמטיקה',
-'math_bad_output'          => 'התוכנה ל� הצליחה לכתוב �ו ליצור �ת ספריית הפלט של המתמטיקה',
-'math_notexvc'             => 'קובץ בר־ביצוע של texvc �ינו זמין;
+'preferences'               => 'העדפות',
+'mypreferences'             => 'ההעדפות שלי',
+'prefs-edits'               => 'מספר עריכות:',
+'prefsnologin'              => 'ל� נרשמת ב�תר',
+'prefsnologintext'          => 'עליכ� <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} להיכנס לחשבון]</span> כדי לשנות העדפות משתמש.',
+'prefsreset'                => 'ההעדפות שוחזרו למצבן הקוד�.',
+'qbsettings'                => 'הגדרות סרגל כלי�',
+'qbsettings-none'           => 'לל�',
+'qbsettings-fixedleft'      => 'קבוע משמ�ל',
+'qbsettings-fixedright'     => 'קבוע מימין',
+'qbsettings-floatingleft'   => 'צף משמ�ל',
+'qbsettings-floatingright'  => 'צף מימין',
+'changepassword'            => 'שינוי סיסמה',
+'skin'                      => 'עיצוב',
+'skin-preview'              => 'תצוגה מקדימה',
+'math'                      => 'נוסח�ות מתמטיות',
+'dateformat'                => 'מבנה ת�ריך',
+'datedefault'               => 'ברירת המחדל',
+'datetime'                  => 'ת�ריך ושעה',
+'math_failure'              => 'עיבוד הנוסחה נכשל',
+'math_unknown_error'        => 'שגי�ה ל� ידועה',
+'math_unknown_function'     => 'פונקציה ל� מוכרת',
+'math_lexing_error'         => 'שגי�ת לקסינג',
+'math_syntax_error'         => 'שגי�ת תחביר',
+'math_image_error'          => 'ההמרה ל־PNG נכשלה; �נ� בדקו �� התקנת� נכון �ת latex, �ת dvips, �ת gs ו�ת convert.',
+'math_bad_tmpdir'           => 'התוכנה ל� הצליחה לכתוב �ו ליצור �ת הספרייה הזמנית של המתמטיקה',
+'math_bad_output'           => 'התוכנה ל� הצליחה לכתוב �ו ליצור �ת ספריית הפלט של המתמטיקה',
+'math_notexvc'              => 'קובץ בר־ביצוע של texvc �ינו זמין;
 �נ� צפו בקובץ math/README למידע על ההגדרות.',
-'prefs-personal'           => 'פרטי המשתמש',
-'prefs-rc'                 => 'שינויי� �חרוני�',
-'prefs-watchlist'          => 'רשימת המעקב',
-'prefs-watchlist-days'     => 'מספר הימי� המירבי שיוצגו ברשימת המעקב:',
-'prefs-watchlist-edits'    => 'מספר העריכות המירבי שיוצגו ברשימת המעקב המורחבת:',
-'prefs-misc'               => 'שונות',
-'saveprefs'                => 'שמירת העדפות',
-'resetprefs'               => 'מחיקת שינויי� של� נשמרו',
-'oldpassword'              => 'סיסמה ישנה:',
-'newpassword'              => 'סיסמה חדשה:',
-'retypenew'                => 'חזרה על הסיסמה חדשה:',
-'textboxsize'              => 'עריכה',
-'rows'                     => 'שורות:',
-'columns'                  => 'עמודות:',
-'searchresultshead'        => 'חיפוש',
-'resultsperpage'           => 'מספר תוצ�ות בעמוד:',
-'contextlines'             => 'שורות לכל תוצ�ה:',
-'contextchars'             => 'מספר תווי קונטקסט בשורה:',
-'stub-threshold'           => 'סף לעיצוב <a href="#" class="stub">קישורי�</a> לקצרמרי� (בתי�):',
-'recentchangesdays'        => 'מספר הימי� שיוצגו בדף השינויי� ה�חרוני�:',
-'recentchangescount'       => 'מספר העריכות שיוצגו בדפי השינויי� ה�חרוני�, היסטוריית הדף והיומני�:',
-'savedprefs'               => 'העדפותיך נשמרו.',
-'timezonelegend'           => '�זור זמן',
-'timezonetext'             => '¹הפרש השעות בינך לבין השרת (UTC).',
-'localtime'                => 'זמן מקומי',
-'timezoneoffset'           => 'הפרש¹',
-'servertime'               => 'השעה הנוכחית בשרת הי�',
-'guesstimezone'            => 'קבלה מהדפדפן',
-'allowemail'               => 'קבלת דו�"ל ממשתמשי� �חרי�',
-'prefs-searchoptions'      => '�פשרויות חיפוש',
-'prefs-namespaces'         => 'מרחבי ש�',
-'defaultns'                => 'מרחבי ש� לחיפוש כברירת מחדל:',
-'default'                  => 'ברירת מחדל',
-'files'                    => 'קבצי�',
+'prefs-personal'            => 'פרטי המשתמש',
+'prefs-rc'                  => 'שינויי� �חרוני�',
+'prefs-watchlist'           => 'רשימת המעקב',
+'prefs-watchlist-days'      => 'מספר הימי� המירבי שיוצגו ברשימת המעקב:',
+'prefs-watchlist-days-max'  => '(לכל היותר 7 ימי�)',
+'prefs-watchlist-edits'     => 'מספר העריכות המירבי שיוצגו ברשימת המעקב המורחבת:',
+'prefs-watchlist-edits-max' => '(לכל היותר 1000)',
+'prefs-misc'                => 'שונות',
+'prefs-resetpass'           => 'שינוי סיסמה',
+'saveprefs'                 => 'שמירת העדפות',
+'resetprefs'                => 'מחיקת שינויי� של� נשמרו',
+'textboxsize'               => 'עריכה',
+'prefs-edit-boxsize'        => 'גודל חלון העריכה.',
+'rows'                      => 'שורות:',
+'columns'                   => 'עמודות:',
+'searchresultshead'         => 'חיפוש',
+'resultsperpage'            => 'מספר תוצ�ות בעמוד:',
+'contextlines'              => 'שורות לכל תוצ�ה:',
+'contextchars'              => 'מספר תווי קונטקסט בשורה:',
+'stub-threshold'            => 'סף לעיצוב <a href="#" class="stub">קישורי�</a> לקצרמרי� (בתי�):',
+'recentchangesdays'         => 'מספר הימי� שיוצגו בדף השינויי� ה�חרוני�:',
+'recentchangesdays-max'     => '(לכל היותר {{PLURAL:$1|יו� �חד|$1 ימי�}})',
+'recentchangescount'        => 'מספר העריכות שיוצגו כברירת מחדל בדפי השינויי� ה�חרוני�, היסטוריית הדף והיומני�:',
+'savedprefs'                => 'העדפותיך נשמרו.',
+'timezonelegend'            => '�זור זמן',
+'timezonetext'              => '¹הפרש השעות בינך לבין השרת (UTC).',
+'localtime'                 => 'זמן מקומי:',
+'timezoneselect'            => '�זור זמן:',
+'timezoneuseserverdefault'  => 'ברירת המחדל של השרת',
+'timezoneuseoffset'         => '�חר (נ� ציינו �ת ההפרש)',
+'timezoneoffset'            => 'הפרש¹:',
+'servertime'                => 'השעה הנוכחית בשרת:',
+'guesstimezone'             => 'קבלה מהדפדפן',
+'allowemail'                => 'קבלת דו�"ל ממשתמשי� �חרי�',
+'prefs-searchoptions'       => '�פשרויות חיפוש',
+'prefs-namespaces'          => 'מרחבי ש�',
+'defaultns'                 => 'מרחבי ש� לחיפוש כברירת מחדל:',
+'default'                   => 'ברירת מחדל',
+'files'                     => 'קבצי�',
 
 # User rights
 'userrights'                  => 'ניהול הרש�ות משתמש', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'ניהול קבוצות משתמש',
 'userrights-user-editname'    => 'ש� משתמש:',
 'editusergroup'               => 'עריכת קבוצות משתמשי�',
-'editinguser'                 => "שינוי הרש�ות המשתמש של '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "שינוי הרש�ות המשתמש של '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'עריכת קבוצות משתמש',
 'saveusergroups'              => 'שמירת קבוצות משתמש',
 'userrights-groupsmember'     => 'חבר בקבוצות:',
@@ -1231,6 +1349,8 @@ $2',
 'right-minoredit'            => 'סימון עריכות כמשניות',
 'right-move'                 => 'העברת דפי�',
 'right-move-subpages'        => 'העברת דפי� ע� דפי המשנה שלה�',
+'right-move-rootuserpages'   => 'העברת דפי משתמש ש�ינ� דפי משנה',
+'right-movefile'             => 'העברת קבצי�',
 'right-suppressredirect'     => 'הימנעות מיצירת הפניה מש� הישן בעת העברת דף',
 'right-upload'               => 'העל�ת קבצי�',
 'right-reupload'             => 'דריסת קובץ קיי�',
@@ -1281,9 +1401,46 @@ $2',
 'rightslogentry' => 'שינה �ת ההרש�ות של $1 מ־$2 ל־$3',
 'rightsnone'     => '(כלו�)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'לקרו� דף זה',
+'action-edit'                 => 'לערוך דף זה',
+'action-createpage'           => 'ליצור דפי�',
+'action-createtalk'           => 'ליצור דפי שיחה',
+'action-createaccount'        => 'ליצור �ת חשבון המשתמש הזה',
+'action-minoredit'            => 'לסמן עריכה זו כמשנית',
+'action-move'                 => 'להעביר דף זה',
+'action-move-subpages'        => 'להעביר דף זה יחד ע� דפי המשנה שלו',
+'action-move-rootuserpages'   => 'להעביר דפי משתמש ש�ינ� דפי משנה',
+'action-movefile'             => 'להעביר קובץ זה',
+'action-upload'               => 'להעלות קובץ זה',
+'action-reupload'             => 'לדרוס �ת הקובץ הקיי� הזה',
+'action-reupload-shared'      => 'לדרוס �ת הקובץ הזה, הקיי� כקובץ משותף',
+'action-upload_by_url'        => 'להעלות קובץ זה מכתובת URL',
+'action-writeapi'             => 'להשתמש ב־API לשינוי דפי�',
+'action-delete'               => 'למחוק דף זה',
+'action-deleterevision'       => 'למחוק גרסה זו',
+'action-deletedhistory'       => 'לצפות בהיסטוריה המחוקה של דף זה',
+'action-browsearchive'        => 'לחפש דפי� מחוקי�',
+'action-undelete'             => 'לשחזר דף זה',
+'action-suppressrevision'     => 'לבדוק ולשחזר גרסה מוסתרת זו',
+'action-suppressionlog'       => 'לצפות ביומן פרטי זה',
+'action-block'                => 'לחסו� משתמש זה מעריכה',
+'action-protect'              => 'לשנות �ת רמת ההגנה על דף זה',
+'action-import'               => 'לייב� דף זה מ�תר ויקי �חר',
+'action-importupload'         => 'לייב� דף זה ב�מצעות העל�ת קובץ',
+'action-patrol'               => 'לסמן עריכות של �חרי� כבדוקות',
+'action-autopatrol'           => 'לסמן �ת עריכותיך כבדוקות',
+'action-unwatchedpages'       => 'לצפות ברשימת הדפי� ש�ינ� במעקב',
+'action-trackback'            => 'לשלוח טרקבק',
+'action-mergehistory'         => 'למזג �ת ההיסטוריה של דף זה',
+'action-userrights'           => 'לערוך �ת כל הרש�ות המשתמש',
+'action-userrights-interwiki' => 'לערוך �ת ההרש�ות של משתמשי� ב�תרי ויקי �חרי�',
+'action-siteadmin'            => 'לנעול �ו לבטל �ת נעילת בסיס הנתוני�',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|שינוי �חד|$1 שינויי�}}',
 'recentchanges'                     => 'שינויי� �חרוני�',
+'recentchanges-legend'              => '�פשרויות בשינויי� ה�חרוני�',
 'recentchangestext'                 => 'ניתן לעקוב �חרי השינויי� ה�חרוני� ב�תר בדף זה.',
 'recentchanges-feed-description'    => 'ניתן לעקוב �חרי השינויי� ה�חרוני� ב�תר בדף זה.',
 'rcnote'                            => "להלן {{PLURAL:$1|השינוי ה�חרון|'''$1''' השינויי� ה�חרוני�}} {{PLURAL:$2|ביו� ה�חרון|ב־$2 הימי� ה�חרוני�}}, עד $5, $4:",
@@ -1308,12 +1465,15 @@ $2',
 'rc_categories'                     => 'הגבלה לקטגוריות (יש להפריד ע� "|")',
 'rc_categories_any'                 => 'הכול',
 'newsectionsummary'                 => '/* $1 */ פסקה חדשה',
+'rc-enhanced-expand'                => 'הצגת הפרטי� (נדרש JavaScript)',
+'rc-enhanced-hide'                  => 'הסתרת הפרטי�',
 
 # Recent changes linked
 'recentchangeslinked'          => 'שינויי� בדפי� המקושרי�',
 'recentchangeslinked-title'    => 'שינויי� בדפי� המקושרי� לדף $1',
+'recentchangeslinked-backlink' => '→ $1',
 'recentchangeslinked-noresult' => 'ל� היו שינויי� בדפי� המקושרי� בתקופה זו.',
-'recentchangeslinked-summary'  => "בדף מיוחד זה רשומי� השינויי� ה�חרוני� בדפי� המקושרי� מתוך הדף (�ו בדפי� החברי� בקטגוריה).
+'recentchangeslinked-summary'  => "בדף מיוחד זה רשומי� השינויי� ה�חרוני� בדפי� המקושרי� מתוך הדף (�ו בדפי� הכלולי� בקטגוריה).
 דפי� ב[[Special:Watchlist|רשימת המעקב שלכ�]] מוצגי� ב'''הדגשה'''.",
 'recentchangeslinked-page'     => 'ש� הדף:',
 'recentchangeslinked-to'       => 'הצגת השינויי� בדפי� המקשרי� לדף הנתון במקו� ז�ת',
@@ -1328,11 +1488,12 @@ $2',
 'upload_directory_missing'    => 'שרת ה�ינטרנט �ינו יכול ליצור �ת תיקיית ההעל�ות ($1) החסרה.',
 'upload_directory_read_only'  => 'שרת ה�ינטרנט �ינו יכול לכתוב בתיקיית ההעל�ות ($1).',
 'uploaderror'                 => 'שגי�ה בהעל�ת הקובץ',
-'uploadtext'                  => "השתמשו בטופס להלן כדי להעלות תמונות. כדי לר�ות �ו לחפש תמונות שהועלו בעבר �נ� פנו ל[[Special:ImageList|רשימת הקבצי� המועלי�]], וכמו כן, העל�ות (כולל העל�ות של גרסה חדשה) מוצגות ב[[Special:Log/upload|יומן ההעל�ות]], ומחיקות ב[[Special:Log/delete|יומן המחיקות]].
+'uploadtext'                  => "השתמשו בטופס להלן כדי להעלות קבצי�.
+כדי לר�ות �ו לחפש קבצי� שהועלו בעבר �נ� פנו ל[[Special:FileList|רשימת הקבצי� שהועלו]], וכמו כן, העל�ות (כולל העל�ות של גרסה חדשה) מוצגות ב[[Special:Log/upload|יומן ההעל�ות]], ומחיקות ב[[Special:Log/delete|יומן המחיקות]].
 
-כדי לכלול תמונה בדף, השתמשו בקישור ב�חת הצורות הב�ות:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' לשימוש בגרסה המל�ה של הקובץ
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|טקסט תי�ור]]</nowiki></tt>''' לשימוש בגרסה מוקטנת ברוחב 200 פיקסלי� בתיבה בצד שמ�ל של הדף, ע� 'טקסט תי�ור' כתי�ור התמונה
+כדי לכלול קובץ בדף, השתמשו בקישור ב�חת הצורות הב�ות:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' לשימוש בגרסה המל�ה של הקובץ
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|טקסט תי�ור]]</nowiki></tt>''' לשימוש בגרסה מוקטנת ברוחב 200 פיקסלי� בתיבה בצד שמ�ל של הדף, ע� 'טקסט תי�ור' כתי�ור
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' לקישור ישיר לקובץ בלי להציגו",
 'upload-permitted'            => 'סוגי קבצי� מותרי�: $1.',
 'upload-preferred'            => 'סוגי קבצי� מומלצי�: $1.',
@@ -1340,7 +1501,7 @@ $2',
 'uploadlog'                   => 'יומן העל�ות קבצי�',
 'uploadlogpage'               => 'יומן העל�ות',
 'uploadlogpagetext'           => 'להלן רשימה של העל�ות הקבצי� ה�חרונות שבוצעו.
-ר�ו �ת [[Special:NewImages|גלריית התמונות החדשות]] להצגה ויזו�לית שלה�.',
+ר�ו �ת [[Special:NewFiles|גלריית הקבצי� החדשי�]] להצגה ויזו�לית שלה�.',
 'filename'                    => 'ש� הקובץ',
 'filedesc'                    => 'תקציר',
 'fileuploadsummary'           => 'תי�ור:',
@@ -1360,27 +1521,28 @@ $2',
 'large-file'                  => 'מומלץ שהקבצי� ל� יהיו גדולי� יותר מ־$1 (גודל הקובץ שהעלית� הו� $2).',
 'largefileserver'             => 'גודל הקובץ שהעלית� חורג ממגבלת השרת.',
 'emptyfile'                   => 'הקובץ שהעלית� ריק. ייתכן שהסיבה לכך הי� שגי�ת הקלדה בש� הקובץ. �נ� וד�ו שזהו הקובץ שברצונך להעלות.',
-'fileexists'                  => 'קובץ בש� זה כבר קיי�, �נ� בדקו �ת <strong><tt>$1</tt></strong> �� �ינכ� בטוחי� שברצונכ� להחליף �ותו.',
-'filepageexists'              => 'דף תי�ור הקובץ עבור קובץ זה כבר נוצר ב<strong><tt>$1</tt></strong>, �ך ל� קיי� קובץ בש� זה.
+'fileexists'                  => "קובץ בש� זה כבר קיי�, �נ� בדקו �ת '''<tt>$1</tt>''' �� �ינכ� בטוחי� שברצונכ� להחליף �ותו.",
+'filepageexists'              => "דף תי�ור הקובץ עבור קובץ זה כבר נוצר ב'''<tt>$1</tt>''', �ך ל� קיי� קובץ בש� זה.
 תי�ור הקובץ שתכתבו ל� יופיע בדף תי�ור הקובץ.
-כדי לגרו� לו להופיע ש�, יהיה עליכ� לערוך �ותו ידנית.',
-'fileexists-extension'        => 'קובץ ע� ש� דומה כבר קיי�:<br />
-ש� הקובץ המועלה: <strong><tt>$1</tt></strong><br />
-ש� הקובץ הקיי�: <strong><tt>$2</tt></strong><br />
-ההבדל היחיד הו� בשימוש ב�ותיות רישיות וקטנות בסיומת הקובץ. �נ� בדקו �� הקבצי� זהי�.',
+כדי לגרו� לו להופיע ש�, יהיה עליכ� לערוך �ותו ידנית.",
+'fileexists-extension'        => "קובץ ע� ש� דומה כבר קיי�:<br />
+ש� הקובץ המועלה: '''<tt>$1</tt>'''<br />
+ש� הקובץ הקיי�: '''<tt>$2</tt>'''<br />
+ההבדל היחיד הו� בשימוש ב�ותיות רישיות וקטנות בסיומת הקובץ. �נ� בדקו �� הקבצי� זהי�.",
 'fileexists-thumb'            => "<center>'''קובץ קיי�'''</center>",
-'fileexists-thumbnail-yes'    => 'הקובץ הו� כנר�ה תמונה מוקטנת (ממוזערת).
-�נ� בדקו �ת הקובץ <strong><tt>$1</tt></strong>.<br />
-�� הקובץ שבדקת� הו� �ותה התמונה בגודל מקורי, �ין זה הכרחי להעלות ג� תמונה ממוזערת.',
-'file-thumbnail-no'           => 'ש� הקובץ מתחיל ע� <strong><tt>$1</tt></strong>. נר�ה שזוהי תמונה מוקטנת (ממוזערת).
-�� התמונה בגודל מל� מצויה ברשותכ�, �נ� העלו �ותה ול� �ת התמונה הממוזערת; �חרת, �נ� שנו �ת ש� הקובץ.',
-'fileexists-forbidden'        => 'קובץ בש� זה כבר קיי�.
+'fileexists-thumbnail-yes'    => "הקובץ הו� כנר�ה תמונה מוקטנת (ממוזערת).
+�נ� בדקו �ת הקובץ '''<tt>$1</tt>'''.<br />
+�� הקובץ שבדקת� הו� �ותה התמונה בגודל מקורי, �ין זה הכרחי להעלות ג� תמונה ממוזערת.",
+'file-thumbnail-no'           => "ש� הקובץ מתחיל ע� '''<tt>$1</tt>'''. נר�ה שזוהי תמונה מוקטנת (ממוזערת).
+�� התמונה בגודל מל� מצויה ברשותכ�, �נ� העלו �ותה ול� �ת התמונה הממוזערת; �חרת, �נ� שנו �ת ש� הקובץ.",
+'fileexists-forbidden'        => 'קובץ בש� זה כבר קיי�, ו�ינכ� יכולי� להחליף �ותו.
 �� �ת� עדיין מעונייני� להעלות קובץ זה, �נ� חזרו לדף הקוד� והעלו �ת הקובץ תחת ש� חדש.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'קובץ בש� זה כבר קיי� כקובץ משותף.
 �� �ת� עדיין מעונייני� להעלות קובץ זה, �נ� חזרו לדף הקוד� והעלו �ת הקובץ תחת ש� חדש.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'קובץ זה כפול ל{{PLURAL:$1|קובץ הב�|קבצי� הב�י�}}:',
+'file-deleted-duplicate'      => 'קובץ זהה לקובץ זה ([[$1]]) נמחק בעבר. �נ� בדקו �ת היסטוריית המחיקה של הקובץ לפני שתעלו �ותו מחדש.',
 'successfulupload'            => 'העל�ת הקובץ הושלמה בהצלחה',
 'uploadwarning'               => '�זהרת העל�ת קבצי�',
 'savefile'                    => 'שמירת קובץ',
@@ -1400,7 +1562,7 @@ $2',
 
 �נ� שיקלו ה�� יהיה זה נכון להמשיך בהעל�ת הקובץ.
 יומן המחיקות של הקובץ מוצג להלן:",
-'filename-bad-prefix'         => 'ש� הקובץ ש�ת� מעלי� מתחיל ע� <strong>"$1"</strong>, שהו� ש� ש�ינו מת�ר �ת הקובץ ובדרך כלל מוכנס �וטומטית על ידי מצלמות דיגיטליות. �נ� בחרו ש� מת�י� יותר לקובץ, שית�ר �ת תכניו.',
+'filename-bad-prefix'         => "ש� הקובץ ש�ת� מעלי� מתחיל ע� '''\"\$1\"''', שהו� ש� ש�ינו מת�ר �ת הקובץ ובדרך כלל מוכנס �וטומטית על ידי מצלמות דיגיטליות. �נ� בחרו ש� מת�י� יותר לקובץ, שית�ר �ת תכניו.",
 'filename-prefix-blacklist'   => ' #<!-- נ� להש�יר שורה זו בדיוק כפי שהי� --> <pre>
 # התחביר הו� כדלקמן:
 #   * כל דבר מתו "#" לסוף השורה הו� הערה
@@ -1438,18 +1600,19 @@ PICT # שונות
 'upload_source_url'  => ' (כתובת URL תקפה ונגישה)',
 'upload_source_file' => ' (קובץ במחשב שלך)',
 
-# Special:ImageList
-'imagelist-summary'     => 'דף זה מציג �ת כל הקבצי� שהועלו. כברירת מחדל מוצגי� הקבצי� ה�חרוני� שהועלו בר�ש הרשימה. לחיצה על כותרת של עמודה משנה �ת המיון.',
-'imagelist_search_for'  => 'חיפוש קובץ מדיה בש�:',
+# Special:ListFiles
+'listfiles-summary'     => 'דף זה מציג �ת כל הקבצי� שהועלו. כברירת מחדל מוצגי� הקבצי� ה�חרוני� שהועלו בר�ש הרשימה. לחיצה על כותרת של עמודה משנה �ת המיון.',
+'listfiles_search_for'  => 'חיפוש קובץ מדיה בש�:',
 'imgfile'               => 'קובץ',
-'imagelist'             => 'רשימת קבצי�',
-'imagelist_date'        => 'ת�ריך',
-'imagelist_name'        => 'ש�',
-'imagelist_user'        => 'משתמש',
-'imagelist_size'        => 'גודל',
-'imagelist_description' => 'תי�ור',
-
-# Image description page
+'listfiles'             => 'רשימת קבצי�',
+'listfiles_date'        => 'ת�ריך',
+'listfiles_name'        => 'ש�',
+'listfiles_user'        => 'משתמש',
+'listfiles_size'        => 'גודל',
+'listfiles_description' => 'תי�ור',
+'listfiles_count'       => 'גרס�ות',
+
+# File description page
 'filehist'                       => 'היסטוריית הקובץ',
 'filehist-help'                  => 'לחצו על ת�ריך/שעה כדי לר�ות �ת הקובץ כפי שנר�ה בעת זו.',
 'filehist-deleteall'             => 'מחיקת כל הגרס�ות',
@@ -1457,16 +1620,22 @@ PICT # שונות
 'filehist-revert'                => 'שחזור',
 'filehist-current'               => 'נוכחית',
 'filehist-datetime'              => 'ת�ריך/שעה',
+'filehist-thumb'                 => 'תמונה ממוזערת',
+'filehist-thumbtext'             => 'תמונה ממוזערת לגרסה מת�ריך $1',
+'filehist-nothumb'               => '�ין תמונה ממוזערת',
 'filehist-user'                  => 'משתמש',
 'filehist-dimensions'            => 'ממדי�',
 'filehist-filesize'              => 'גודל הקובץ',
 'filehist-comment'               => 'הערה',
-'imagelinks'                     => 'קישורי�',
+'imagelinks'                     => 'קישורי� לקובץ',
 'linkstoimage'                   => '{{PLURAL:$1|הדף הב� משתמש|הדפי� הב�י� משתמשי�}} בקובץ זה:',
+'linkstoimage-more'              => 'יותר מ{{PLURAL:$1|דף �חד מקשר|־$1 דפי� מקשרי�}} לקובץ זה.
+הרשימה הב�ה מר�ה רק �ת {{PLURAL:$1|הדף הר�שון שמקשר|$1 הדפי� הר�שוני� שמקשרי�}} לקובץ זה.
+ניתן לצפות ב[[Special:WhatLinksHere/$2|רשימה המל�ה]].',
 'nolinkstoimage'                 => '�ין דפי� המשתמשי� בקובץ זה.',
 'morelinkstoimage'               => 'ר�ו [[Special:WhatLinksHere/$1|דפי� נוספי�]] המשתמשי� בקובץ זה.',
 'redirectstofile'                => '{{PLURAL:$1|הדף הב� הו� דף הפניה|הדפי� הב�י� ה� דפי הפניה}} לקובץ זה:',
-'duplicatesoffile'               => '{{PLURAL:$1|הקובץ הב� זהה|הקבצי� הב�י� זהי�}} לקובץ זה:',
+'duplicatesoffile'               => '{{PLURAL:$1|הקובץ הב� זהה|הקבצי� הב�י� זהי�}} לקובץ זה ([[Special:FileDuplicateSearch/$2|לפרטי� נוספי�]]):',
 'sharedupload'                   => 'קובץ זה הו� קובץ משותף וניתן להשתמש בו ג� ב�תרי� �חרי�.',
 'shareduploadwiki'               => 'למידע נוסף, ר�ו �ת $1.',
 'shareduploadwiki-desc'          => 'תי�ורו ב$1 המקורי מוצג למטה.',
@@ -1477,14 +1646,14 @@ PICT # שונות
 'shareduploadconflict-linktext'  => 'קובץ משותף',
 'noimage'                        => 'ל� נמצ� קובץ בש� זה, �ך יש ב�פשרותכ� $1.',
 'noimage-linktext'               => 'להעלות �חד',
-'uploadnewversion-linktext'      => 'העלו גרסה חדשה של קובץ זה',
+'uploadnewversion-linktext'      => 'העל�ת גרסה חדשה של קובץ זה',
 'imagepage-searchdupe'           => 'חיפוש קבצי� כפולי�',
 
 # File reversion
 'filerevert'                => 'שחזור $1',
 'filerevert-backlink'       => '→ $1',
 'filerevert-legend'         => 'שחזור קובץ',
-'filerevert-intro'          => "משחזר �ת '''[[Media:$1|$1]]''' ל[$4 גרסה מ־$3, $2].",
+'filerevert-intro'          => "�ת� עומדי� לשחזר �ת הקובץ '''[[Media:$1|$1]]''' ל[$4 גרסה מ־$3, $2].",
 'filerevert-comment'        => 'הערה:',
 'filerevert-defaultcomment' => 'שוחזר לגרסה מ־$2, $1',
 'filerevert-submit'         => 'שחזור',
@@ -1495,7 +1664,7 @@ PICT # שונות
 'filedelete'                  => 'מחיקת $1',
 'filedelete-backlink'         => '→ $1',
 'filedelete-legend'           => 'מחיקת קובץ',
-'filedelete-intro'            => "מוחק �ת '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "�ת� עומדי� למחוק �ת הקובץ '''[[Media:$1|$1]]''' יחד ע� כל ההיסטוריה שלו.",
 'filedelete-intro-old'        => "�ת� מוחקי� �ת הגרסה של '''[[Media:$1|$1]]''' מ־[$4 $3, $2].",
 'filedelete-comment'          => 'סיבה למחיקה:',
 'filedelete-submit'           => 'מחיקה',
@@ -1503,7 +1672,6 @@ PICT # שונות
 'filedelete-success-old'      => "הגרסה של '''[[Media:$1|$1]]''' מ־$3, $2 נמחקה.",
 'filedelete-nofile'           => "'''$1''' �ינו קיי�.",
 'filedelete-nofile-old'       => "�ין גרסה ישנה של '''$1''' ע� התכונות המבוקשות.",
-'filedelete-iscurrent'        => '�ת� מנסי� למחוק �ת הגרסה החדשה ביותר של הקובץ. �נ� שחזרו קוד� לגרסה ישנה יותר.',
 'filedelete-otherreason'      => 'סיבה נוספת/�חרת:',
 'filedelete-reason-otherlist' => 'סיבה �חרת',
 'filedelete-reason-dropdown'  => '
@@ -1531,27 +1699,31 @@ PICT # שונות
 
 # Random page
 'randompage'         => 'דף �קר�י',
-'randompage-nopages' => '�ין דפי� במרחב הש� הזה.',
+'randompage-nopages' => '�ין דפי� במרחב הש� "$1".',
 
 # Random redirect
 'randomredirect'         => 'הפניה �קר�ית',
-'randomredirect-nopages' => '�ין הפניות במרחב הש� הזה.',
+'randomredirect-nopages' => '�ין הפניות במרחב הש� "$1".',
 
 # Statistics
-'statistics'             => 'סטטיסטיקות',
-'sitestats'              => 'סטטיסטיקות {{SITENAME}}',
-'userstats'              => 'סטטיסטיקות משתמשי�',
-'sitestatstext'          => "בבסיס הנתוני� יש בסך הכול {{PLURAL:$1|דף '''�חד'''|'''$1''' דפי�}}. מספר זה כולל דפי� ש�ינ� דפי תוכן, כגון דפי שיחה, דפי� �ודות {{SITENAME}}, קצרמרי�, דפי תוכן לל� קישורי� פנימיי�, הפניות, וכיוצ� בזה. �� ל� סופרי� �ת הדפי� ש�ינ� דפי תוכן, {{PLURAL:$2|נש�ר דף '''�חד''' שהו� ככל הנר�ה דף תוכן לכל דבר|נש�רי� '''$2''' דפי� שה� ככל הנר�ה דפי תוכן לכל דבר}}.
-
-מ�ז תחילת פעולתו של ה�תר, {{PLURAL:$3|הייתה ב�תר צפייה '''�חת''' בדפי�|היו ב�תר '''$3''' צפיות בדפי�}}, {{PLURAL:$4|ובוצעה פעולת עריכה '''�חת'''|ובוצעו '''$4''' פעולות עריכה}}.
-
-בסך הכול {{PLURAL:$5|בוצעה בממוצע עריכה '''�חת''' לדף|בוצעו בממוצע '''$5''' עריכות לדף}}, ו{{PLURAL:$6|הייתה צפייה '''�חת''' לכל עריכה|היו '''$6''' צפיות לכל עריכה}}.
-
-�ורך [http://www.mediawiki.org/wiki/Manual:Job_queue תור המשימות] הו� '''$7'''.
-
-{{PLURAL:$1|קובץ '''�חד'''|'''$8''' קבצי�}} הועלו ל�תר עד כה.",
-'userstatstext'          => "{{PLURAL:$1|ישנו [[Special:ListUsers|משתמש רשו�]] '''�חד'''|ישנ� '''$1''' [[Special:ListUsers|משתמשי� רשומי�]] ב�תר}}, {{PLURAL:$2|ול'''�חד'''|ול־'''$2'''}} (�ו $4%) מתוכ� יש הרש�ות $5.",
-'statistics-mostpopular' => 'הדפי� הנצפי� ביותר',
+'statistics'                   => 'סטטיסטיקות',
+'statistics-header-pages'      => 'סטטיסטיקות דפי�',
+'statistics-header-edits'      => 'סטטיסטיקות עריכה',
+'statistics-header-views'      => 'סטטיסטיקות צפייה',
+'statistics-header-users'      => 'סטטיסטיקות משתמשי�',
+'statistics-articles'          => 'דפי תוכן',
+'statistics-pages'             => 'דפי�',
+'statistics-pages-desc'        => 'כל הדפי� ב�תר הוויקי, כולל דפי שיחה, הפניות, וכדומה',
+'statistics-files'             => 'קבצי� שהועלו',
+'statistics-edits'             => 'העריכות מ�ז תחילת הפעולה של {{SITENAME}}',
+'statistics-edits-average'     => 'מספר העריכות הממוצע לדף',
+'statistics-views-total'       => 'מספר הצפיות הכולל',
+'statistics-views-peredit'     => 'מספר הצפיות לעריכה',
+'statistics-jobqueue'          => '�ורך [http://www.mediawiki.org/wiki/Manual:Job_queue תור המשימות]',
+'statistics-users'             => 'ה[[Special:ListUsers|משתמשי�]] הרשומי�',
+'statistics-users-active'      => 'המשתמשי� הפעילי�',
+'statistics-users-active-desc' => 'משתמשי� שביצעו פעולה כלשהי ב{{PLURAL:$1|יו� ה�חרון|־$1 הימי� ה�חרוני�}}',
+'statistics-mostpopular'       => 'הדפי� הנצפי� ביותר',
 
 'disambiguations'      => 'דפי פירושוני�',
 'disambiguationspage'  => 'Template:פירושוני�',
@@ -1561,7 +1733,7 @@ PICT # שונות
 
 'doubleredirects'            => 'הפניות כפולות',
 'doubleredirectstext'        => 'ההפניות הב�ות מפנות לדפי הפניה �חרי�. כל שורה מכילה קישור להפניות הר�שונה והשנייה, וכן �ת היעד של ההפניה השנייה, שהי� לרוב היעד ה�מיתי של ההפניה, �ליו �מורה ההפניה הר�שונה להצביע.',
-'double-redirect-fixed-move' => '[[$1]] הועבר, וכעת הו� הפניה לדף [[$2]]',
+'double-redirect-fixed-move' => '[[$1]] הועבר. כעת הו� הפניה לדף [[$2]].',
 'double-redirect-fixer'      => 'מתקן הפניות',
 
 'brokenredirects'        => 'הפניות ל� תקינות',
@@ -1595,7 +1767,8 @@ PICT # שונות
 'popularpages'            => 'הדפי� הנצפי� ביותר',
 'wantedcategories'        => 'קטגוריות מבוקשות',
 'wantedpages'             => 'דפי� מבוקשי�',
-'missingfiles'            => 'קבצי� חסרי�',
+'wantedfiles'             => 'קבצי� מבוקשי�',
+'wantedtemplates'         => 'תבניות מבוקשות',
 'mostlinked'              => 'הדפי� המקושרי� ביותר',
 'mostlinkedcategories'    => 'הקטגוריות המקושרות ביותר',
 'mostlinkedtemplates'     => 'התבניות המקושרות ביותר',
@@ -1609,12 +1782,15 @@ PICT # שונות
 'deadendpagestext'        => 'הדפי� הב�י� �ינ� מקשרי� לדפי� �חרי� ב�תר.',
 'protectedpages'          => 'דפי� מוגני�',
 'protectedpages-indef'    => 'הגנות לצמיתות בלבד',
+'protectedpages-cascade'  => 'הגנות מדורגות בלבד',
 'protectedpagestext'      => 'הדפי� הב�י� מוגני� מפני עריכה �ו העברה:',
 'protectedpagesempty'     => '�ין כרגע דפי� מוגני� ע� הפרמטרי� הללו.',
 'protectedtitles'         => 'כותרות מוגנות',
 'protectedtitlestext'     => 'הכותרות הב�ות מוגנות מפני יצירה:',
 'protectedtitlesempty'    => '�ין כרגע כותרות מוגנות ע� הפרמטרי� ה�לה.',
 'listusers'               => 'רשימת משתמשי�',
+'listusers-editsonly'     => 'הצגת משתמשי� ע� עריכות בלבד',
+'usereditcount'           => '{{PLURAL:$1|עריכה �חת|$1 עריכות}}',
 'newpages'                => 'דפי� חדשי�',
 'newpages-username'       => 'ש� משתמש:',
 'ancientpages'            => 'דפי� מוזנחי�',
@@ -1636,14 +1812,13 @@ PICT # שונות
 'booksources-isbn'          => 'מסת"ב:',
 'booksources-go'            => 'הצגה',
 'booksources-text'          => 'להלן רשימת קישורי� ל�תרי� �חרי� המוכרי� ספרי� חדשי� ויד־שנייה, ושבה� עשוי להיות מידע נוסף לגבי ספרי� ש�ת� מחפשי�:',
+'booksources-invalid-isbn'  => 'המסת"ב שניתן כנר�ה �ינו תקין; �נ� בדקו �� ביצעת� טעויות בהעתקה מהמידע המקורי.',
 
 # Special:Log
 'specialloguserlabel'  => 'משתמש:',
 'speciallogtitlelabel' => 'כותרת:',
 'log'                  => 'יומני�',
 'all-logs-page'        => 'כל היומני�',
-'log-search-legend'    => 'חיפוש יומני�',
-'log-search-submit'    => 'הצגה',
 'alllogstext'          => 'תצוגה משולבת של כל סוגי היומני� הזמיני� ב{{grammar:תחילית|{{SITENAME}}}}.
 ניתן לצמצ� �ת התצוגה על ידי בחירת סוג היומן, ש� המשתמש (תלוי רישיות) �ו הדף המושפע (ג� כן תלוי רישיות).',
 'logempty'             => '�ין פריטי� תו�מי� ביומן.',
@@ -1655,6 +1830,7 @@ PICT # שונות
 'nextpage'          => 'הדף הב� ($1)',
 'prevpage'          => 'הדף הקוד� ($1)',
 'allpagesfrom'      => 'הצגת דפי� החל מ:',
+'allpagesto'        => 'הצגת דפי� עד:',
 'allarticles'       => 'כל הדפי�',
 'allinnamespace'    => 'כל הדפי� (מרחב ש� $1)',
 'allnotinnamespace' => 'כל הדפי� (של� במרחב הש� $1)',
@@ -1671,44 +1847,71 @@ PICT # שונות
 [[Special:UnusedCategories|קטגוריות ש�ינן בשימוש]] �ינן מוצגות כ�ן.
 ר�ו ג� �ת [[Special:WantedCategories|רשימת הקטגוריות המבוקשות]].',
 'categoriesfrom'                => 'הצגת קטגוריות החל מ:',
-'special-categories-sort-count' => 'סידור לפי מספר חברי�',
+'special-categories-sort-count' => 'סידור לפי מספר הדפי�',
 'special-categories-sort-abc'   => 'סידור לפי סדר ה�לף בית',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'תרומות משתמש מחוקות',
+
+# Special:LinkSearch
+'linksearch'       => 'קישורי� חיצוניי�',
+'linksearch-pat'   => 'תבנית קישור לחיפוש:',
+'linksearch-ns'    => 'מרחב ש�:',
+'linksearch-ok'    => 'חיפוש',
+'linksearch-text'  => 'ניתן להשתמש בתווי� כללי�, לדוגמה "*.wikipedia.org".<br />פרוטוקולי� נתמכי�: <tt>$1</tt>',
+'linksearch-line'  => '$1 מקושר מהדף $2',
+'linksearch-error' => 'תווי� כלליי� יכולי� להופיע רק בתחילת ש� השרת.',
+
 # Special:ListUsers
 'listusersfrom'      => 'הצגת משתמשי� החל מ:',
 'listusers-submit'   => 'הצגה',
 'listusers-noresult' => 'ל� נמצ�ו משתמשי�.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'יומן רישו� משתמשי�',
+'newuserlogpagetext'          => 'זהו יומן המכיל הרשמות של משתמשי�.',
+'newuserlog-byemail'          => 'הסיסמה נשלחה בדו�"ל',
+'newuserlog-create-entry'     => 'חשבון משתמש חדש',
+'newuserlog-create2-entry'    => 'יצר חשבון חדש $1',
+'newuserlog-autocreate-entry' => 'חשבון שנוצר �וטומטית',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'רשימת הרש�ות לקבוצה',
-'listgrouprights-summary'  => 'זוהי רשימה של קבוצות המשתמש המוגדרות ב�תר זה, ע� ההרש�ות של כל �חת.
+'listgrouprights'                 => 'רשימת הרש�ות לקבוצה',
+'listgrouprights-summary'         => 'זוהי רשימה של קבוצות המשתמש המוגדרות ב�תר זה, ע� ההרש�ות של כל �חת.
 מידע נוסף על ההרש�ות ניתן למצו� [[{{MediaWiki:Listgrouprights-helppage}}|כ�ן]].',
-'listgrouprights-group'    => 'קבוצה',
-'listgrouprights-rights'   => 'הרש�ות',
-'listgrouprights-helppage' => 'Help:הרש�ות',
-'listgrouprights-members'  => '(רשימת חברי�)',
+'listgrouprights-group'           => 'קבוצה',
+'listgrouprights-rights'          => 'הרש�ות',
+'listgrouprights-helppage'        => 'Help:הרש�ות',
+'listgrouprights-members'         => '(רשימת חברי�)',
+'listgrouprights-addgroup'        => 'הרש�ה להוספת {{PLURAL:$2|הקבוצה|הקבוצות}}: $1',
+'listgrouprights-removegroup'     => 'הרש�ה להסרת {{PLURAL:$2|הקבוצה|הקבוצות}}: $1',
+'listgrouprights-addgroup-all'    => 'הרש�ה להוספת כל הקבוצות',
+'listgrouprights-removegroup-all' => 'הרש�ה להסרת כל הקבוצות',
 
 # E-mail user
-'mailnologin'     => '�ין כתובת לשליחה',
-'mailnologintext' => 'עליכ� [[Special:UserLogin|להיכנס לחשבון]] ולהגדיר לעצמכ� כתובת דו�ר �לקטרוני תקינה ב[[Special:Preferences|העדפות המשתמש]] שלכ� כדי לשלוח דו�ר למשתמש �חר.',
-'emailuser'       => 'שליחת דו�ר �לקטרוני למשתמש זה',
-'emailpage'       => 'שליחת דו�ר למשתמש',
-'emailpagetext'   => 'ניתן להשתמש בטופס כדי לשלוח הודעת דו�ר �לקטרוני למשתמש זה.
-// כתובת הדו�ר ה�לקטרוני שהזנת� ב[[Special:Preferences|העדפות המשתמש שלכ�]] תופיע ככתובת ממנה נשלחה ההודעה, כדי ל�פשר תגובה ישירה למכתב.',
-'usermailererror' => '�וביקט הדו�ר החזיר שגי�ה:',
-'defemailsubject' => 'דו�"ל {{SITENAME}}',
-'noemailtitle'    => '�ין כתובת דו�ר �לקטרוני',
-'noemailtext'     => 'משתמש זה ל� הזין כתובת דו�ר �לקטרוני חוקית �ו בחר של� לקבל דו�ר �לקטרוני ממשתמשי� �חרי�.',
-'emailfrom'       => 'מ�ת:',
-'emailto'         => '�ל:',
-'emailsubject'    => 'נוש�:',
-'emailmessage'    => 'הודעה:',
-'emailsend'       => 'שליחה',
-'emailccme'       => 'קבלת העתק של הודעה זו בדו�ר ה�לקטרוני.',
-'emailccsubject'  => 'העתק של הודעתך למשתמש $1: $2',
-'emailsent'       => 'הדו�ר נשלח',
-'emailsenttext'   => 'הודעת הדו�ר ה�לקטרוני שלך נשלחה.',
-'emailuserfooter' => 'דו�ר זה נשלח על ידי $1 למשתמש $2 ב�מצעות תכונת "שליחת דו�ר �לקטרוני למשתמש זה" ב{{grammar:תחילית|{{SITENAME}}}}.',
+'mailnologin'      => '�ין כתובת לשליחה',
+'mailnologintext'  => 'עליכ� [[Special:UserLogin|להיכנס לחשבון]] ולהגדיר לעצמכ� כתובת דו�ר �לקטרוני תקינה ב[[Special:Preferences|העדפות המשתמש]] שלכ� כדי לשלוח דו�ר למשתמש �חר.',
+'emailuser'        => 'שליחת דו�ר �לקטרוני למשתמש זה',
+'emailpage'        => 'שליחת דו�ר למשתמש',
+'emailpagetext'    => 'ניתן להשתמש בטופס כדי לשלוח הודעת דו�ר �לקטרוני למשתמש זה.
+כתובת הדו�ר ה�לקטרוני שכתבת� ב[[Special:Preferences|העדפות המשתמש שלכ�]] תופיע ככתובת ממנה נשלחה ההודעה, כדי ל�פשר תגובה ישירה למכתב.',
+'usermailererror'  => '�וביקט הדו�ר החזיר שגי�ה:',
+'defemailsubject'  => 'דו�"ל {{SITENAME}}',
+'noemailtitle'     => '�ין כתובת דו�ר �לקטרוני',
+'noemailtext'      => 'משתמש זה ל� הזין כתובת דו�ר �לקטרוני חוקית.',
+'nowikiemailtitle' => 'שליחת דו�"ל �ינה �פשרית',
+'nowikiemailtext'  => 'משתמש זה בחר של� לקבל דו�ר �לקטרוני ממשתמשי� �חרי�.',
+'email-legend'     => 'שליחת דו�ר �לקטרוני למשתמש �חר של {{SITENAME}}',
+'emailfrom'        => 'מ�ת:',
+'emailto'          => '�ל:',
+'emailsubject'     => 'נוש�:',
+'emailmessage'     => 'הודעה:',
+'emailsend'        => 'שליחה',
+'emailccme'        => 'קבלת העתק של הודעה זו בדו�ר ה�לקטרוני.',
+'emailccsubject'   => 'העתק של הודעתך למשתמש $1: $2',
+'emailsent'        => 'הדו�ר נשלח',
+'emailsenttext'    => 'הודעת הדו�ר ה�לקטרוני שלך נשלחה.',
+'emailuserfooter'  => 'דו�ר זה נשלח על ידי $1 למשתמש $2 ב�מצעות תכונת "שליחת דו�ר �לקטרוני למשתמש זה" ב{{grammar:תחילית|{{SITENAME}}}}.',
 
 # Watchlist
 'watchlist'            => 'רשימת המעקב שלי',
@@ -1740,12 +1943,7 @@ PICT # שונות
 'iteminvalidname'      => 'בעיה ע� $1, ש� שגוי…',
 'wlnote'               => "להלן {{PLURAL:$1|השינוי ה�חרון|'''$1''' השינויי� ה�חרוני�}} {{PLURAL:$2|בשעה ה�חרונה|ב־'''$2''' השעות ה�חרונות}}.",
 'wlshowlast'           => '(הצגת $1 שעות �חרונות | $2 ימי� �חרוני� | $3)',
-'watchlist-show-bots'  => 'הצגת בוטי�',
-'watchlist-hide-bots'  => 'הסתרת בוטי�',
-'watchlist-show-own'   => 'הצגת עריכות שלי',
-'watchlist-hide-own'   => 'הסתרת עריכות שלי',
-'watchlist-show-minor' => 'הצגת עריכות משניות',
-'watchlist-hide-minor' => 'הסתרת עריכות משניות',
+'watchlist-options'    => '�פשרויות ברשימת המעקב',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'בהוספה לרשימת המעקב…',
@@ -1784,57 +1982,63 @@ $NEWPAGE
 למשוב ולעזרה נוספת:
 {{fullurl:Project:עזרה}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'מחיקה',
-'confirm'                     => '�ישור',
-'excontent'                   => 'תוכן היה: "$1"',
-'excontentauthor'             => "תוכן היה: '$1' והתור� היחיד היה [[Special:Contributions/$2|$2]]",
-'exbeforeblank'               => 'תוכן לפני שרוקן היה: "$1"',
-'exblank'                     => 'הדף היה ריק',
-'delete-confirm'              => 'מחיקת $1',
-'delete-backlink'             => '→ $1',
-'delete-legend'               => 'מחיקה',
-'historywarning'              => '�זהרה – לדף ש�ת� עומדי� למחוק יש היסטוריית שינויי�:',
-'confirmdeletetext'           => '�ת� עומדי� למחוק דף יחד ע� כל ההיסטוריה שלו.
+# Delete
+'deletepage'             => 'מחיקה',
+'confirm'                => '�ישור',
+'excontent'              => 'תוכן היה: "$1"',
+'excontentauthor'        => "תוכן היה: '$1' והתור� היחיד היה [[Special:Contributions/$2|$2]]",
+'exbeforeblank'          => 'תוכן לפני שרוקן היה: "$1"',
+'exblank'                => 'הדף היה ריק',
+'delete-confirm'         => 'מחיקת $1',
+'delete-backlink'        => '→ $1',
+'delete-legend'          => 'מחיקה',
+'historywarning'         => '�זהרה – לדף ש�ת� עומדי� למחוק יש היסטוריית שינויי�:',
+'confirmdeletetext'      => '�ת� עומדי� למחוק דף יחד ע� כל ההיסטוריה שלו.
 
 �נ� �שרו שזה �כן מה ש�ת� מתכווני� לעשות, ש�ת� מביני� �ת התוצ�ות של מעשה כזה, ושהמעשה מבוצע בהת�� לנהלי ה�תר.',
-'actioncomplete'              => 'הפעולה בוצעה',
-'deletedtext'                 => '<strong><nowiki>$1</nowiki></strong> נמחק. ר�ו $2 לרשימת המחיקות ה�חרונות.',
-'deletedarticle'              => 'מחק �ת [[$1]]',
-'suppressedarticle'           => 'הסתיר �ת [[$1]]',
-'dellogpage'                  => 'יומן מחיקות',
-'dellogpagetext'              => 'להלן רשימה של המחיקות ה�חרונות שבוצעו.',
-'deletionlog'                 => 'יומן מחיקות',
-'reverted'                    => 'שוחזר לגרסה קודמת',
-'deletecomment'               => 'סיבת המחיקה:',
-'deleteotherreason'           => 'סיבה נוספת/�חרת:',
-'deletereasonotherlist'       => 'סיבה �חרת',
-'deletereason-dropdown'       => '
+'actioncomplete'         => 'הפעולה בוצעה',
+'deletedtext'            => '<strong><nowiki>$1</nowiki></strong> נמחק. ר�ו $2 לרשימת המחיקות ה�חרונות.',
+'deletedarticle'         => 'מחק �ת [[$1]]',
+'suppressedarticle'      => 'הסתיר �ת [[$1]]',
+'dellogpage'             => 'יומן מחיקות',
+'dellogpagetext'         => 'להלן רשימה של המחיקות ה�חרונות שבוצעו.',
+'deletionlog'            => 'יומן מחיקות',
+'reverted'               => 'שוחזר לגרסה קודמת',
+'deletecomment'          => 'סיבת המחיקה:',
+'deleteotherreason'      => 'סיבה נוספת/�חרת:',
+'deletereasonotherlist'  => 'סיבה �חרת',
+'deletereason-dropdown'  => '
 * סיבות מחיקה נפוצות
 ** לבקשת הכותב
 ** הפרת זכויות יוצרי�
 ** השחתה',
-'delete-edit-reasonlist'      => 'עריכת סיבות המחיקה',
-'delete-toobig'               => 'דף זה כולל מעל {{PLURAL:$1|גרסה �חת|$1 גרס�ות}} בהיסטוריית העריכות שלו. מחיקת דפי� כ�לה הוגבלה כדי למנוע פגיעה בביצועי ה�תר.',
-'delete-warning-toobig'       => 'דף זה כולל מעל {{PLURAL:$1|גרסה �חת|$1 גרס�ות}} בהיסטוריית העריכות שלו. מחיקה שלו עלולה להפריע לפעולות בבסיס הנתוני�; �נ� שיקלו שנית �ת המחיקה.',
-'rollback'                    => 'שחזור עריכות',
-'rollback_short'              => 'שחזור',
-'rollbacklink'                => 'שחזור',
-'rollbackfailed'              => 'השחזור נכשל',
-'cantrollback'                => 'ל� ניתן לשחזר �ת העריכה – התור� ה�חרון הו� היחיד שכתב דף זה; ע� ז�ת, ניתן למחוק �ת הדף.',
-'alreadyrolled'               => 'ל� ניתן לשחזר �ת עריכת הדף [[:$1]] על ידי [[User:$2|$2]] ([[User talk:$2|שיחה]] | [[Special:Contributions/$2|{{int:contribslink}}]]); מישהו �חר כבר ערך �ו שחזר דף זה.
-
-העריכה ה�חרונה הייתה של [[User:$3|$3]] ([[User talk:$3|שיחה]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment
-'revertpage'                  => 'שוחזר מעריכה של [[Special:Contributions/$2|$2]] ([[User talk:$2|שיחה]]) לעריכה ה�חרונה של [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'שוחזר מעריכה של $1 לעריכה ה�חרונה של $2',
-'sessionfailure'              => 'נר�ה שיש בעיה בחיבורכ� ל�תר. פעולתכ� בוטלה כ�מצעי זהירות כנגד התחזות לתקשורת ממחשבכ�. �נ� חיזרו לדף הקוד� ונסו שנית.',
+'delete-edit-reasonlist' => 'עריכת סיבות המחיקה',
+'delete-toobig'          => 'דף זה כולל מעל {{PLURAL:$1|גרסה �חת|$1 גרס�ות}} בהיסטוריית העריכות שלו. מחיקת דפי� כ�לה הוגבלה כדי למנוע פגיעה בביצועי ה�תר.',
+'delete-warning-toobig'  => 'דף זה כולל מעל {{PLURAL:$1|גרסה �חת|$1 גרס�ות}} בהיסטוריית העריכות שלו. מחיקה שלו עלולה להפריע לפעולות בבסיס הנתוני�; �נ� שיקלו שנית �ת המחיקה.',
+
+# Rollback
+'rollback'         => 'שחזור עריכות',
+'rollback_short'   => 'שחזור',
+'rollbacklink'     => 'שחזור',
+'rollbackfailed'   => 'השחזור נכשל',
+'cantrollback'     => 'ל� ניתן לשחזר �ת העריכה – התור� ה�חרון הו� היחיד שכתב דף זה; ע� ז�ת, ניתן למחוק �ת הדף.',
+'alreadyrolled'    => 'ל� ניתן לשחזר �ת עריכת הדף [[:$1]] על ידי [[User:$2|$2]] ([[User talk:$2|שיחה]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); מישהו �חר כבר ערך �ו שחזר דף זה.
+
+העריכה ה�חרונה הייתה של [[User:$3|$3]] ([[User talk:$3|שיחה]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment
+'revertpage'       => 'שוחזר מעריכה של [[Special:Contributions/$2|$2]] ([[User talk:$2|שיחה]]) לעריכה ה�חרונה של [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'שוחזר מעריכה של $1 לעריכה ה�חרונה של $2',
+'sessionfailure'   => 'נר�ה שיש בעיה בחיבורכ� ל�תר. פעולתכ� בוטלה כ�מצעי זהירות כנגד התחזות לתקשורת ממחשבכ�. �נ� חיזרו לדף הקוד� ונסו שנית.',
+
+# Protect
 'protectlogpage'              => 'יומן הגנות',
 'protectlogtext'              => 'להלן רשימה של הפעלות וביטולי הגנות על דפי�. ר�ו ג� �ת [[Special:ProtectedPages|רשימת הדפי� המוגני�]] הנוכחית.',
 'protectedarticle'            => 'הפעיל הגנה על [[$1]]',
 'modifiedarticleprotection'   => 'שינה �ת רמת ההגנה של [[$1]]',
 'unprotectedarticle'          => 'ביטל �ת ההגנה על [[$1]]',
+'movedarticleprotection'      => 'העביר �ת הגדרות ההגנה מ"[[$2]]" ל"[[$1]]"',
 'protect-title'               => 'שינוי רמת ההגנה של "$1"',
+'prot_1movedto2'              => '[[$1]] הועבר ל[[$2]]',
 'protect-backlink'            => '→ $1',
 'protect-legend'              => '�ישור הפעלת ההגנה',
 'protectcomment'              => 'הערה:',
@@ -1842,22 +2046,35 @@ $NEWPAGE
 'protect_expiry_invalid'      => 'זמן פקיעת ההגנה בלתי חוקי.',
 'protect_expiry_old'          => 'זמן פקיעת ההגנה כבר עבר.',
 'protect-unchain'             => 'שינוי הרש�ות העברה',
-'protect-text'                => 'בדף זה תוכלו לר�ות ולשנות �ת רמת ההגנה של הדף <strong><nowiki>$1</nowiki></strong>. �נ� וד�ו ש�ת� פועלי� בהת�� בהת�� לנהלי ה�תר.',
-'protect-locked-blocked'      => '�ינכ� יכולי� לשנות �ת רמת ההגנה של הדף בעודכ� חסומי�.
-להלן ההגדרות הנוכחיות עבור הדף <strong>$1</strong>:',
-'protect-locked-dblock'       => '�ינכ� יכולי� לשנות �ת רמת ההגנה על הדף שכן בסיס הנתוני� חסו� ברגע זה.
-להלן ההגדרות הנוכחיות עבור הדף <strong>$1</strong>:',
-'protect-locked-access'       => 'למשתמש שלכ� �ין הרש�ה לשנות �ת רמת ההגנה של הדף.
-להלן ההגדרות הנוכחיות עבור הדף <strong>$1</strong>:',
+'protect-text'                => "בדף זה תוכלו לר�ות ולשנות �ת רמת ההגנה של הדף '''<nowiki>$1</nowiki>'''. �נ� וד�ו ש�ת� פועלי� בהת�� בהת�� לנהלי ה�תר.",
+'protect-locked-blocked'      => "�ינכ� יכולי� לשנות �ת רמת ההגנה של הדף בעודכ� חסומי�.
+להלן ההגדרות הנוכחיות עבור הדף '''$1''':",
+'protect-locked-dblock'       => "�ינכ� יכולי� לשנות �ת רמת ההגנה על הדף שכן בסיס הנתוני� חסו� ברגע זה.
+להלן ההגדרות הנוכחיות עבור הדף '''$1''':",
+'protect-locked-access'       => "למשתמש שלכ� �ין הרש�ה לשנות �ת רמת ההגנה של הדף.
+להלן ההגדרות הנוכחיות עבור הדף '''$1''':",
 'protect-cascadeon'           => 'דף זה מוגן כרגע כיוון שהו� מוכלל {{PLURAL:$1|בדף הב�, שמופעלת עליו|בדפי� הב�י�, שמופעלת עליה�}} הגנה מדורגת. ב�פשרותכ� לשנות �ת רמת ההגנה על הדף, �ך זה ל� ישפיע על ההגנה המדורגת.',
-'protect-default'             => '(ברירת מחדל)',
+'protect-default'             => 'כל המשתמשי� מורשי�',
 'protect-fallback'            => 'משתמשי� בעלי הרש�ת "$1" בלבד',
-'protect-level-autoconfirmed' => 'משתמשי� רשומי� בלבד',
+'protect-level-autoconfirmed' => 'מניעת משתמשי� חדשי� ול� רשומי�',
 'protect-level-sysop'         => 'מפעילי מערכת בלבד',
 'protect-summary-cascade'     => 'מדורג',
 'protect-expiring'            => 'פוקעת $1 (UTC)',
+'protect-expiry-indefinite'   => 'לצמיתות',
 'protect-cascade'             => 'הגנה על כל הדפי� המוכללי� בדף זה (הגנה מדורגת)',
 'protect-cantedit'            => '�ינכ� יכולי� לשנות �ת רמת ההגנה על דף זה, כיוון ש�ין לכ� הרש�ה לערוך �ותו.',
+'protect-othertime'           => 'זמן �חר:',
+'protect-othertime-op'        => 'זמן �חר',
+'protect-existing-expiry'     => 'זמן פקיעה נוכחי: $3, $2',
+'protect-otherreason'         => 'סיבה �חרת/נוספת:',
+'protect-otherreason-op'      => 'סיבה �חרת/נוספת',
+'protect-dropdown'            => '* סיבות הגנה נפוצות
+** השחתה רבה
+** ספ�� רב
+** מלחמת עריכה בלתי מועילה
+** דף בשימוש רב',
+'protect-edit-reasonlist'     => 'עריכת סיבות ההגנה',
+'protect-expiry-options'      => 'שעה:1 hour,יו�:1 day,שבוע:1 week,שבועיי�:2 weeks,חודש:1 month,שלושה חודשי�:3 months,שישה חודשי�:6 months,שנה:1 year,לצמיתות:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'הרש�ה:',
 'restriction-level'           => 'רמת ההגבלה:',
 'minimum-size'                => 'גודל מינימלי',
@@ -1880,7 +2097,8 @@ $NEWPAGE
 'undeletepage'                 => 'צפייה ושחזור דפי� מחוקי�',
 'undeletepagetitle'            => "'''זוהי רשימת הגרס�ות המחוקות של [[:$1]]'''.",
 'viewdeletedpage'              => 'צפייה בדפי� מחוקי�',
-'undeletepagetext'             => 'הדפי� שלהלן נמחקו, �ך ה� עדיין ב�רכיון וניתן לשחזר �ות�. ה�רכיון מנוקה מעת לעת.',
+'undeletepagetext'             => '{{PLURAL:$1|הדף שלהלן נמחק, �ך הו� עדיין ב�רכיון וניתן לשחזר �ותו|הדפי� שלהלן נמחקו, �ך ה� עדיין ב�רכיון וניתן לשחזר �ות�}}.
+ניתן לנקות �ת ה�רכיון מעת לעת.',
 'undelete-fieldset-title'      => 'שחזור גרס�ות',
 'undeleteextrahelp'            => 'לשחזור היסטוריית הגרס�ות המל�ה של הדף, �ל תסמנו �ף תיבת סימון ולחצו על "שחזור".
 לשחזור של גרס�ות מסוימות בלבד, סמנו �ת תיבות הסימון של הגרס�ות הללו, ולחצו על "שחזור".
@@ -1890,12 +2108,13 @@ $NEWPAGE
 �� יש כבר דף חדש ב�ותו הש�, הגרס�ות והשינויי� יופיעו רק בדף ההיסטוריה שלו.',
 'undeleterevdel'               => 'השחזור ל� יבוצע �� הגרסה הנוכחית של הדף מחוקה בחלקה. במקרה כזה, עליכ� לבטל �ת ההסתרה של הגרס�ות המחוקות החדשות ביותר.',
 'undeletehistorynoadmin'       => 'דף זה נמחק. הסיבה למחיקה מוצגת בתקציר מטה, ביחד ע� פרטי� על המשתמשי� שערכו �ת הדף לפני מחיקתו. הטקסט של גרס�ות �לו זמין למפעילי מערכת בלבד.',
-'undelete-revision'            => 'גרסה שנמחקה מהדף $1 (מ־$2) מ�ת $3:',
+'undelete-revision'            => 'גרסה שנמחקה מהדף $1 (מ־$5, $4) מ�ת $3:',
 'undeleterevision-missing'     => 'הגרסה שגויה �ו חסרה. ייתכן שמדובר בקישור שבור, �ו שהגרסה שוחזרה �ו הוסרה מה�רכיון.',
 'undelete-nodiff'              => 'ל� נמצ�ה גרסה קודמת.',
 'undeletebtn'                  => 'שחזור',
 'undeletelink'                 => 'שחזור',
 'undeletereset'                => '�יפוס',
+'undeleteinvert'               => 'הפיכת הבחירה',
 'undeletecomment'              => 'תקציר:',
 'undeletedarticle'             => 'שחזר �ת [[$1]]',
 'undeletedrevisions'           => '{{PLURAL:$1|שוחזרה גרסה �חת|שוחזרו $1 גרס�ות}}',
@@ -1927,26 +2146,28 @@ $1',
 'blanknamespace' => '(ר�שי)',
 
 # Contributions
-'contributions' => 'תרומות המשתמש',
-'mycontris'     => 'התרומות שלי',
-'contribsub2'   => 'עבור $1 ($2)',
-'nocontribs'    => 'ל� נמצ�ו שינויי� המת�ימי� לקריטריוני� �לו.',
-'uctop'         => '(�חרון)',
-'month'         => 'עד החודש:',
-'year'          => 'עד השנה:',
-
-'sp-contributions-newbies'     => 'הצגת תרומות של משתמשי� חדשי� בלבד',
-'sp-contributions-newbies-sub' => 'עבור משתמשי� חדשי�',
-'sp-contributions-blocklog'    => 'יומן חסימות',
-'sp-contributions-search'      => 'חיפוש תרומות',
-'sp-contributions-username'    => 'ש� משתמש �ו כתובת IP:',
-'sp-contributions-submit'      => 'חיפוש',
+'contributions'       => 'תרומות המשתמש',
+'contributions-title' => 'תרומות של המשתמש $1',
+'mycontris'           => 'התרומות שלי',
+'contribsub2'         => 'עבור $1 ($2)',
+'nocontribs'          => 'ל� נמצ�ו שינויי� המת�ימי� לקריטריוני� �לו.',
+'uctop'               => '(�חרון)',
+'month'               => 'עד החודש:',
+'year'                => 'עד השנה:',
+
+'sp-contributions-newbies'       => 'הצגת תרומות של משתמשי� חדשי� בלבד',
+'sp-contributions-newbies-sub'   => 'עבור משתמשי� חדשי�',
+'sp-contributions-newbies-title' => 'תרומות של משתמשי� חדשי�',
+'sp-contributions-blocklog'      => 'יומן חסימות',
+'sp-contributions-search'        => 'חיפוש תרומות',
+'sp-contributions-username'      => 'ש� משתמש �ו כתובת IP:',
+'sp-contributions-submit'        => 'חיפוש',
 
 # What links here
 'whatlinkshere'            => 'דפי� המקושרי� לכ�ן',
 'whatlinkshere-title'      => 'דפי� המקשרי� לדף $1',
 'whatlinkshere-page'       => 'דף:',
-'linklistsub'              => '(רשימת קישורי�)',
+'whatlinkshere-backlink'   => '→ $1',
 'linkshere'                => "הדפי� שלהלן מקושרי� לדף '''[[:$1]]''':",
 'nolinkshere'              => "�ין דפי� המקושרי� לדף '''[[:$1]]'''.",
 'nolinkshere-ns'           => "�ין דפי� המקושרי� לדף '''[[:$1]]''' במרחב הש� שנבחר.",
@@ -1995,6 +2216,8 @@ $1',
 'ipbotherreason'                  => 'סיבה �חרת/נוספת:',
 'ipbhidename'                     => 'הסתרת ש� המשתמש מיומן החסימות, רשימת המשתמשי� החסומי� ורשימת המשתמשי�',
 'ipbwatchuser'                    => 'מעקב �חרי דפי המשתמש והשיחה של משתמש זה',
+'ipballowusertalk'                => 'מתן �פשרות למשתמש לערוך �ת דף השיחה של עצמו בעת החסימה',
+'ipb-change-block'                => 'חסימת המשתמש מחדש ע� הגדרות �לה',
 'badipaddress'                    => 'משתמש �ו כתובת IP שגויי�.',
 'blockipsuccesssub'               => 'החסימה הושלמה בהצלחה',
 'blockipsuccesstext'              => 'המשתמש [[Special:Contributions/$1|$1]] נחס�.
@@ -2005,6 +2228,7 @@ $1',
 'ipb-unblock'                     => 'הסרת חסימה של ש� משתמש �ו כתובת IP',
 'ipb-blocklist-addr'              => 'החסימות הנוכחיות של $1',
 'ipb-blocklist'                   => 'הצגת החסימות הנוכחיות',
+'ipb-blocklist-contribs'          => 'התרומות של $1',
 'unblockip'                       => 'שחרור חסימה',
 'unblockiptext'                   => 'השתמשו בטופס שלהלן כדי להחזיר �ת הרש�ות הכתיבה למשתמש �ו כתובת IP חסומי�.',
 'ipusubmit'                       => 'שחרור חסימה',
@@ -2013,6 +2237,9 @@ $1',
 'ipblocklist'                     => 'רשימת כתובות IP ומשתמשי� חסומי�',
 'ipblocklist-legend'              => 'מצי�ת משתמש חסו�',
 'ipblocklist-username'            => 'ש� משתמש �ו כתובת IP:',
+'ipblocklist-sh-userblocks'       => '$1 חסימות של חשבונות',
+'ipblocklist-sh-tempblocks'       => '$1 חסימות זמניות',
+'ipblocklist-sh-addressblocks'    => '$1 חסימות של כתובות IP יחידות',
 'ipblocklist-submit'              => 'חיפוש',
 'blocklistline'                   => '$1 $2 חס� �ת $3 ($4)',
 'infiniteblock'                   => 'לצמיתות',
@@ -2021,14 +2248,18 @@ $1',
 'noautoblockblock'                => 'חסימה �וטומטית מבוטלת',
 'createaccountblock'              => 'יצירת חשבונות נחסמה',
 'emailblock'                      => 'שליחת דו�"ל נחסמה',
+'blocklist-nousertalk'            => 'עריכת דף השיחה ה�ישי נחסמה',
 'ipblocklist-empty'               => 'רשימת המשתמשי� החסומי� ריקה.',
 'ipblocklist-no-results'          => 'ש� המשתמש �ו כתובת ה־IP המבוקשי� �ינ� חסומי�.',
 'blocklink'                       => 'חסימה',
 'unblocklink'                     => 'שחרור חסימה',
+'change-blocklink'                => 'שינוי חסימה',
 'contribslink'                    => 'תרומות',
 'autoblocker'                     => 'נחסמת� ב�ופן �וטומטי משו� ש�ת� חולקי� �ת כתובת ה־IP שלכ� ע� [[User:$1|$1]]. הנימוק לחסימה: "$2".',
 'blocklogpage'                    => 'יומן חסימות',
+'blocklog-fulllog'                => 'יומן חסימות מל�',
 'blocklogentry'                   => 'חס� �ת [[$1]] למשך $2 $3',
+'reblock-logentry'                => 'שינה �ת הגדרות החסימה של [[$1]] ע� זמן פקיעה של $2 $3',
 'blocklogtext'                    => 'זהו יומן פעולות החסימה והשחרור של משתמשי�. כתובות IP הנחסמות ב�ופן �וטומטי �ינן מופיעות.
 
 ר�ו ג� �ת [[Special:IPBlockList|רשימת המשתמשי� החסומי�]] הנוכחית.',
@@ -2037,11 +2268,14 @@ $1',
 'block-log-flags-nocreate'        => 'יצירת חשבונות נחסמה',
 'block-log-flags-noautoblock'     => 'חסימה �וטומטית מבוטלת',
 'block-log-flags-noemail'         => 'שליחת דו�"ל נחסמה',
+'block-log-flags-nousertalk'      => 'עריכת דף השיחה ה�ישי נחסמה',
 'block-log-flags-angry-autoblock' => 'חסימה �וטומטית משוכללת מופעלת',
 'range_block_disabled'            => 'היכולת לחסו� טווח כתובות �יננה פעילה.',
 'ipb_expiry_invalid'              => 'זמן פקיעת חסימה בלתי חוקי',
 'ipb_expiry_temp'                 => 'חסימות הכוללות הסתרת ש� משתמש חייבות להיות לצמיתות.',
 'ipb_already_blocked'             => 'המשתמש "$1" כבר נחס�',
+'ipb-needreblock'                 => '== כבר נחס� ==
+$1 כבר נחס�. ה�� ברצונכ� לשנות �ת הגדרות החסימה?',
 'ipb_cant_unblock'                => 'שגי�ה: חסימה מספר $1 ל� נמצ�ה. ייתכן שהי� כבר שוחררה.',
 'ipb_blocked_as_range'            => 'שגי�ה: כתובת ה־IP $1 �ינה חסומה ישירות ולכן ל� ניתן לשחרר �ת חסימתה. ע� ז�ת, הי� חסומה כחלק מהטווח $2, שניתן לשחרר �ת חסימתו.',
 'ip_range_invalid'                => 'טווח IP שגוי.',
@@ -2052,6 +2286,7 @@ $1',
 'proxyblocksuccess'               => 'בוצע.',
 'sorbsreason'                     => 'כתובת ה־IP שלכ� רשומה ככתובת פרוקסי פתוחה ב־DNSBL ש�תר זה משתמש בו.',
 'sorbs_create_account_reason'     => 'כתובת ה־IP שלכ� רשומה ככתובת פרוקסי פתוחה ב־DNSBL ש�תר זה משתמש בו. �ינכ� יכולי� ליצור חשבון.',
+'cant-block-while-blocked'        => '�ינכ� יכולי� לחסו� משתמשי� �חרי� כש�ת� חסומי�.',
 
 # Developer tools
 'lockdb'              => 'נעילת בסיס נתוני�',
@@ -2076,10 +2311,10 @@ $1',
 'databasenotlocked'   => 'בסיס הנתוני� �ינו נעול.',
 
 # Move page
-'move-page'               => 'העברת $1',
-'move-page-backlink'      => '→ $1',
-'move-page-legend'        => 'העברת דף',
-'movepagetext'            => "שימוש בטופס שלהלן ישנה �ת שמו של דף, ויעביר �ת כל ההיסטוריה שלו לש� חדש.
+'move-page'                    => 'העברת $1',
+'move-page-backlink'           => '→ $1',
+'move-page-legend'             => 'העברת דף',
+'movepagetext'                 => "שימוש בטופס שלהלן ישנה �ת שמו של דף, ויעביר �ת כל ההיסטוריה שלו לש� חדש.
 
 הש� הישן יהפוך לדף הפניה �ל הדף ע� הש� החדש.
 
@@ -2091,47 +2326,60 @@ $1',
 שימו לב: הדף '''ל�''' יועבר �� כבר יש דף תחת הש� החדש, �ל� �� הדף הזה ריק, �ו שהו� הפניה, ו�ין לו היסטוריה של שינויי�. משמעות הדבר, ש�פשר לשנות חזרה �ת שמו של דף לש� המקורי, �� נעשתה טעות, ול� יימחק דף קיי� במערכת.
 
 '''�זהרה:''' שינוי זה עשוי להיות שינוי דרסטי ובלתי צפוי לדף פופולרי; �נ� וד�ו ש�ת� מביני� �ת השלכות המעשה לפני ש�ת� ממשיכי�.",
-'movepagetalktext'        => 'דף השיחה של דף זה יועבר �וטומטית, �ל� ��:
+'movepagetalktext'             => 'דף השיחה של דף זה יועבר �וטומטית, �ל� ��:
 * קיי� דף שיחה ש�ינו ריק תחת הש� החדש �ליו מועבר הדף.
 * הורדת� �ת הסימון בתיבה שלהלן.
 
 במקרי� �לו, תצטרכו להעביר �ו לשלב �ת הדפי� ב�ופן ידני, �� תרצו.',
-'movearticle'             => 'העברת דף:',
-'movenotallowed'          => '�ינכ� מורשי� להעביר דפי�.',
-'newtitle'                => 'לש� החדש:',
-'move-watch'              => 'מעקב �חרי דף זה',
-'movepagebtn'             => 'העברה',
-'pagemovedsub'            => 'ההעברה הושלמה בהצלחה',
-'movepage-moved'          => '<big>הדף "$1" הועבר לש� "$2".</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'קיי� כבר דף ע� �ותו ש�, �ו שהש� שבחרת� �ינו חוקי.
+'movearticle'                  => 'העברת דף:',
+'movenologin'                  => 'ל� נכנסת� ל�תר',
+'movenologintext'              => 'עליכ� [[Special:UserLogin|להיכנס לחשבון]] כדי להעביר דפי�.',
+'movenotallowed'               => '�ינכ� מורשי� להעביר דפי�.',
+'movenotallowedfile'           => '�ינכ� מורשי� להעביר קבצי�.',
+'cant-move-user-page'          => '�ינכ� מורשי� להעביר דפי משתמש (למעט דפי משנה).',
+'cant-move-to-user-page'       => '�ינכ� מורשי� להעביר דף לדף משתמש (למעט לדף משנה של דף משתמש).',
+'newtitle'                     => 'לש� החדש:',
+'move-watch'                   => 'מעקב �חרי דף זה',
+'movepagebtn'                  => 'העברה',
+'pagemovedsub'                 => 'ההעברה הושלמה בהצלחה',
+'movepage-moved'               => '<big>הדף "$1" הועבר לש� "$2".</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'נוצרה הפניה.',
+'movepage-moved-noredirect'    => 'יצירת ההפניה בוטלה.',
+'articleexists'                => 'קיי� כבר דף ע� �ותו ש�, �ו שהש� שבחרת� �ינו חוקי.
 �נ� בחרו ש� �חר.',
-'cantmove-titleprotected' => '�ינכ� יכולי� להעביר �ת הדף לש� זה, כיוון שהש� החדש הוגן מוגן העברה',
-'talkexists'              => 'הדף עצמו הועבר בהצלחה, �בל דף השיחה ל� הועבר כיוון שקיי� כבר דף שיחה במיקו� החדש. �נ� מזגו �ות� ידנית.',
-'movedto'                 => 'הועבר ל',
-'movetalk'                => 'העברה ג� של דף השיחה',
-'move-subpages'           => 'העברת כל דפי המשנה, �� �פשר',
-'move-talk-subpages'      => 'העברת כל דפי המשנה של דף השיחה, �� �פשר',
-'movepage-page-exists'    => 'הדף $1 קיי� כבר ול� ניתן לדרוס �ותו �וטומטית.',
-'movepage-page-moved'     => 'הדף $1 הועבר לש� $2.',
-'movepage-page-unmoved'   => 'ל� ניתן להעביר �ת הדף $1 לש� $2.',
-'movepage-max-pages'      => 'המספר המקסימלי של {{PLURAL:$1|דף �חד|$1 דפי�}} כבר הועבר ול� ניתן להעביר דפי� נוספי� �וטומטית.',
-'1movedto2'               => '[[$1]] הועבר ל[[$2]]',
-'1movedto2_redir'         => '[[$1]] הועבר ל[[$2]] במקו� הפניה',
-'movelogpage'             => 'יומן העברות',
-'movelogpagetext'         => 'להלן רשימה של העברות דפי�.',
-'movereason'              => 'סיבה:',
-'revertmove'              => 'החזרה',
-'delete_and_move'         => 'מחיקה והעברה',
-'delete_and_move_text'    => '== בקשת מחיקה ==
+'cantmove-titleprotected'      => '�ינכ� יכולי� להעביר �ת הדף לש� זה, כיוון שהש� החדש הוגן מוגן העברה',
+'talkexists'                   => 'הדף עצמו הועבר בהצלחה, �בל דף השיחה ל� הועבר כיוון שקיי� כבר דף שיחה במיקו� החדש. �נ� מזגו �ות� ידנית.',
+'movedto'                      => 'הועבר ל',
+'movetalk'                     => 'העברה ג� של דף השיחה',
+'move-subpages'                => 'העברת כל דפי המשנה, �� �פשר',
+'move-talk-subpages'           => 'העברת כל דפי המשנה של דף השיחה, �� �פשר',
+'movepage-page-exists'         => 'הדף $1 קיי� כבר ול� ניתן לדרוס �ותו �וטומטית.',
+'movepage-page-moved'          => 'הדף $1 הועבר לש� $2.',
+'movepage-page-unmoved'        => 'ל� ניתן להעביר �ת הדף $1 לש� $2.',
+'movepage-max-pages'           => 'המספר המקסימלי של {{PLURAL:$1|דף �חד|$1 דפי�}} כבר הועבר ול� ניתן להעביר דפי� נוספי� �וטומטית.',
+'1movedto2'                    => '[[$1]] הועבר ל[[$2]]',
+'1movedto2_redir'              => '[[$1]] הועבר ל[[$2]] במקו� הפניה',
+'move-redirect-suppressed'     => 'ל� נוצרה הפניה',
+'movelogpage'                  => 'יומן העברות',
+'movelogpagetext'              => 'להלן רשימה של כל הדפי� שהועברו.',
+'movereason'                   => 'סיבה:',
+'revertmove'                   => 'החזרה',
+'delete_and_move'              => 'מחיקה והעברה',
+'delete_and_move_text'         => '== בקשת מחיקה ==
 דף היעד, [[:$1]], כבר קיי�. ה�� ברצונכ� למחוק �ותו כדי ל�פשר �ת ההעברה?',
-'delete_and_move_confirm' => '�ישור מחיקת הדף',
-'delete_and_move_reason'  => 'מחיקה על מנת ל�פשר העברה',
-'selfmove'                => 'כותרות המקור והיעד זהות; ל� ניתן להעביר דף לעצמו.',
-'immobile_namespace'      => 'כותרת המקור �ו היעד הי� סוג מיוחד של דף; ל� ניתן להעביר דפי� לתוך �ו מתוך מרחב ש� זה.',
-'imagenocrossnamespace'   => 'ל� ניתן להעביר קובץ למרחב ש� �חר',
-'imagetypemismatch'       => 'סיומת הקובץ החדשה �ינה מת�ימה לסוג הקובץ',
-'imageinvalidfilename'    => 'ש� קובץ היעד �ינו תקין',
-'fix-double-redirects'    => 'עדכון הפניות לכותרת הדף המקורית',
+'delete_and_move_confirm'      => '�ישור מחיקת הדף',
+'delete_and_move_reason'       => 'מחיקה על מנת ל�פשר העברה',
+'selfmove'                     => 'כותרות המקור והיעד זהות; ל� ניתן להעביר דף לעצמו.',
+'immobile-source-namespace'    => 'ל� ניתן להעביר דפי� במרחב הש� "$1"',
+'immobile-target-namespace'    => 'ל� ניתן להעביר דפי� למרחב הש� "$1"',
+'immobile-target-namespace-iw' => 'קישור �ינטרוויקי �ינו יעד תקין להעברת דף.',
+'immobile-source-page'         => 'דף זה �ינו ניתן להעברה.',
+'immobile-target-page'         => 'ל� ניתן להעביר �ל כותרת יעד זו.',
+'imagenocrossnamespace'        => 'ל� ניתן להעביר קובץ למרחב ש� �חר',
+'imagetypemismatch'            => 'סיומת הקובץ החדשה �ינה מת�ימה לסוג הקובץ',
+'imageinvalidfilename'         => 'ש� קובץ היעד �ינו תקין',
+'fix-double-redirects'         => 'עדכון הפניות לכותרת הדף המקורית',
+'move-leave-redirect'          => 'הש�רת הפניה בדף המקורי',
 
 # Export
 'export'            => 'ייצו� דפי�',
@@ -2140,7 +2388,7 @@ $1',
 
 כדי לייצ� דפי�, הקישו �ת שמותיה� בתיבת הטקסט שלהלן, כל ש� בשורה נפרדת, ובחרו ה�� לייצ� ג� �ת הגרסה הנוכחית וג� �ת היסטוריית השינויי� של הדפי�, �ו רק �ת הגרסה הנוכחית ע� מידע על העריכה ה�חרונה.
 
-בנוסף, ניתן להשתמש בקישור, כגון [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] לדף [[{{MediaWiki:Mainpage}}]] לל� היסטוריית השינויי� שלו.',
+בנוסף, ניתן להשתמש בקישור, כגון [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] לדף [[{{MediaWiki:Mainpage}}]] לל� היסטוריית השינויי� שלו.',
 'exportcuronly'     => 'כלול רק �ת הגרסה הנוכחית, לל� כל ההיסטוריה',
 'exportnohistory'   => "----
 '''הערה:''' ייצו� ההיסטוריה המל�ה של דפי� דרך טופס זה הופסקה עקב בעיות ביצוע.",
@@ -2148,7 +2396,7 @@ $1',
 'export-addcattext' => 'הוספת דפי� מהקטגוריה:',
 'export-addcat'     => 'הוספה',
 'export-download'   => 'שמירה כקובץ',
-'export-templates'  => 'כלול תבניות',
+'export-templates'  => 'כלילת תבניות',
 
 # Namespace 8 related
 'allmessages'               => 'הודעות המערכת',
@@ -2177,9 +2425,12 @@ $1',
 'import-interwiki-text'      => '�נ� בחרו �תר ויקי ו�ת כותרת הדף לייבו�.
 ת�ריכי ועורכי הגרס�ות יישמרו בעת הייבו�.
 כל פעולות הייבו� הבין־�תרי נשמרות ביומן הייבו�.',
+'import-interwiki-source'    => '�תר/דף המקור:',
 'import-interwiki-history'   => 'העתקת כל היסטוריית העריכות של דף זה',
 'import-interwiki-submit'    => 'ייבו�',
 'import-interwiki-namespace' => 'העתקה למרחב הש�:',
+'import-upload-filename'     => 'ש� הקובץ:',
+'import-comment'             => 'הערה:',
 'importtext'                 => '�נ� ייצ�ו �ת הקובץ מ�תר המקור תוך שימוש ב[[Special:Export|כלי הייצו�]], שמרו �ותו לדיסק הקשיח שלכ� והעלו �ותו לכ�ן.',
 'importstart'                => 'מייב� דפי�…',
 'import-revision-count'      => '{{PLURAL:$1|גרסה �חת|$1 גרס�ות}}',
@@ -2213,21 +2464,21 @@ $1',
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|גרסה �חת|$1 גרס�ות}} של הדף $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'דף המשתמש שלי',
+'tooltip-pt-userpage'             => 'דף המשתמש שלכ�',
 'tooltip-pt-anonuserpage'         => 'דף המשתמש של משתמש �נונימי זה',
-'tooltip-pt-mytalk'               => 'דף השיחה שלי',
+'tooltip-pt-mytalk'               => 'דף השיחה שלכ�',
 'tooltip-pt-anontalk'             => 'שיחה על תרומות המשתמש ה�נונימי',
-'tooltip-pt-preferences'          => 'ההעדפות שלי',
+'tooltip-pt-preferences'          => 'ההעדפות שלכ�',
 'tooltip-pt-watchlist'            => 'רשימת הדפי� ש�ת� עוקבי� �חרי השינויי� בה�',
-'tooltip-pt-mycontris'            => 'רשימת התרומות שלי',
+'tooltip-pt-mycontris'            => 'רשימת התרומות שלכ�',
 'tooltip-pt-login'                => 'מומלץ להירש�, �ך �ין חובה לעשות כן',
 'tooltip-pt-anonlogin'            => 'מומלץ להירש�, �ך �ין חובה לעשות כן',
 'tooltip-pt-logout'               => 'יצי�ה מהחשבון',
 'tooltip-ca-talk'                 => 'שיחה על דף זה',
 'tooltip-ca-edit'                 => 'ב�פשרותכ� לערוך דף זה. �נ� השתמשו בלחצן "תצוגה מקדימה" לפני השמירה',
-'tooltip-ca-addsection'           => 'הוספת פסקה לשיחה זו',
+'tooltip-ca-addsection'           => 'הוספת פסקה חדשה',
 'tooltip-ca-viewsource'           => 'זהו דף מוגן, �ך ב�פשרותכ� לצפות במקורו',
-'tooltip-ca-history'              => 'גרס�ות קודמות של דף זה.',
+'tooltip-ca-history'              => 'גרס�ות קודמות של דף זה',
 'tooltip-ca-protect'              => 'הגנה על דף זה',
 'tooltip-ca-delete'               => 'מחיקת דף זה',
 'tooltip-ca-undelete'             => 'שחזור עריכות שנעשו בדף זה לפני שנמחק',
@@ -2237,7 +2488,7 @@ $1',
 'tooltip-search'                  => 'חיפוש ב{{grammar:תחילית|{{SITENAME}}}}',
 'tooltip-search-go'               => 'מעבר לדף בש� הזה בדיוק, �� הו� קיי�',
 'tooltip-search-fulltext'         => 'חיפוש טקסט זה בדפי�',
-'tooltip-p-logo'                  => 'עמוד ר�שי',
+'tooltip-p-logo'                  => 'ביקור בעמוד הר�שי',
 'tooltip-n-mainpage'              => 'ביקור בעמוד הר�שי',
 'tooltip-n-portal'                => '�ודות המיז�, �יך תוכלו לעזור, �יפה למצו� דברי�',
 'tooltip-n-currentevents'         => 'מצי�ת מידע רקע על ה�ירועי� ה�חרוני�',
@@ -2272,6 +2523,8 @@ $1',
 'tooltip-watch'                   => 'הוספת דף זה לרשימת המעקב',
 'tooltip-recreate'                => 'יצירת הדף מחדש למרות שהו� נמחק',
 'tooltip-upload'                  => 'התחלת ההעל�ה',
+'tooltip-rollback'                => 'שחזור בלחיצה �חת של העריכה �ו העריכות של התור� ה�חרון לדף זה',
+'tooltip-undo'                    => 'פתיחת חלון העריכה במצב תצוגה מקדימה כדי לשחזר �ת העריכה, תוך �פשרות להוספת סיבה בתקציר העריכה',
 
 # Stylesheets
 'common.css'      => '/* הסגנונות הנכתבי� כ�ן ישפיעו על כל העיצובי� */',
@@ -2283,6 +2536,8 @@ $1',
 'chick.css'       => '/* הסגנונות הנכתבי� כ�ן ישפיעו על העיצוב Chick בלבד */',
 'simple.css'      => '/* הסגנונות הנכתבי� כ�ן ישפיעו על העיצוב Simple בלבד */',
 'modern.css'      => '/* הסגנונות הנכתבי� כ�ן ישפיעו על העיצוב Modern בלבד */',
+'print.css'       => '/* הסגנונות הנכתבי� כ�ן ישפיעו על הפלט בהדפסה בלבד */',
+'handheld.css'    => '/* הסגנונות הנכתבי� כ�ן ישפיעו על מכשירי� ניידי� המבוססי� על העיצוב שבהגדרה $wgHandheldStyle בלבד */',
 
 # Scripts
 'common.js'      => '/* כל סקריפט JavaScript שנכתב כ�ן ירוץ עבור כל המשתמשי� בכל טעינת עמוד */',
@@ -2301,12 +2556,12 @@ $1',
 'notacceptable'     => 'ה�תר ל� יכול לספק מידע בפורמט שתוכנת הלקוח יכולה לקרו�.',
 
 # Attribution
-'anonymous'        => 'משתמש(י�) �נונימי(י�) של {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|משתמש �נונימי|משתמשי� �נונימיי�}} של {{SITENAME}}',
 'siteuser'         => 'משתמש {{SITENAME}} $1',
 'lastmodifiedatby' => 'דף זה שונה ל�חרונה בת�ריך $2, $1 על ידי $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'מבוסס על העבודה של $1.',
 'others'           => '�חרי�',
-'siteusers'        => 'משתמש(י) {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|משתמש|משתמשי}} {{SITENAME}} $1',
 'creditspage'      => 'קרדיטי� בדף',
 'nocredits'        => '�ין קרדיטי� זמיני� בדף זה.',
 
@@ -2327,6 +2582,16 @@ $1',
 'numauthors'     => 'מספר כותבי� נפרדי� (דף תוכן): $1',
 'numtalkauthors' => 'מספר כותבי� נפרדי� (דף שיחה): $1',
 
+# Skin names
+'skinname-standard'    => 'קל�סי',
+'skinname-nostalgia'   => 'נוסטלגיה',
+'skinname-cologneblue' => 'מי� כחולי�',
+'skinname-monobook'    => 'מונובוק',
+'skinname-myskin'      => 'העיצוב שלי',
+'skinname-chick'       => "צ'יק",
+'skinname-simple'      => 'פשוט',
+'skinname-modern'      => 'מודרני',
+
 # Math options
 'mw_math_png'    => 'תמיד הצג כ־PNG',
 'mw_math_simple' => 'HTML �� פשוט מ�וד, �חרת PNG',
@@ -2347,11 +2612,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '�ינכ� מורשי� לסמן �ת השינויי� של עצמכ� כבדוקי�.',
 
 # Patrol log
-'patrol-log-page'   => 'יומן שינויי� בדוקי�',
-'patrol-log-header' => 'יומן זה מציג גרס�ות שנבדקו.',
-'patrol-log-line'   => 'סימן �ת  $1 בדף $2 כבדוקה $3',
-'patrol-log-auto'   => '(�וטומטית)',
-'patrol-log-diff'   => 'גרסה $1',
+'patrol-log-page'      => 'יומן שינויי� בדוקי�',
+'patrol-log-header'    => 'יומן זה מציג גרס�ות שנבדקו.',
+'patrol-log-line'      => 'סימן �ת $1 בדף $2 כבדוקה $3',
+'patrol-log-auto'      => '(�וטומטית)',
+'patrol-log-diff'      => 'גרסה $1',
+'log-show-hide-patrol' => '$1 יומן שינויי� בדוקי�',
 
 # Image deletion
 'deletedrevision'                 => 'מחק גרסה ישנה $1',
@@ -2368,6 +2634,9 @@ $1',
 'previousdiff' => '→ מעבר להשוו�ת הגרס�ות הקודמת',
 'nextdiff'     => 'מעבר להשוו�ת הגרס�ות הב�ה �',
 
+# Visual comparison
+'visual-comparison' => 'השוו�ה חזותית',
+
 # Media information
 'mediawarning'         => "'''�זהרה:''' קובץ זה עלול להכיל קוד זדוני, שהרצתו עלולה לסכן �ת המערכת שלכ�.<hr />",
 'imagemaxsize'         => 'הגבלת תמונות בדפי תי�ור הקובץ ל:',
@@ -2380,10 +2649,12 @@ $1',
 'show-big-image'       => 'תמונה ברזולוציה גבוהה יותר',
 'show-big-image-thumb' => '<small>גודל התצוגה הזו: $1 × $2 פיקסלי�</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'גלריית קבצי� חדשי�',
 'imagelisttext'         => 'להלן רשימה של {{PLURAL:$1|קובץ �חד|$1 קבצי�}}, ממויני� $2:',
 'newimages-summary'     => 'דף זה מציג �ת הקבצי� ה�חרוני� שהועלו',
+'newimages-legend'      => 'מסנן',
+'newimages-label'       => 'ש� הקובץ (�ו חלק ממנו):',
 'showhidebots'          => '($1 בוטי�)',
 'noimages'              => '�ין קבצי�.',
 'ilsubmit'              => 'חיפוש',
@@ -2589,6 +2860,18 @@ $1',
 'exif-lightsource-24'  => 'טונגסטן �ולפן ISO',
 'exif-lightsource-255' => 'מקור �ור �חר',
 
+# Flash modes
+'exif-flash-fired-0'    => 'הפל�ש ל� הופעל',
+'exif-flash-fired-1'    => 'הפל�ש הופעל',
+'exif-flash-return-0'   => 'לל� התכונה של גילוי חזרת סטרובוסקופ',
+'exif-flash-return-2'   => 'ל� התגלה �ור חזרת סטרובוסקופ',
+'exif-flash-return-3'   => 'התגלה �ור חזרת סטרובוסקופ',
+'exif-flash-mode-1'     => 'מצב פל�ש מופעל תמיד',
+'exif-flash-mode-2'     => 'מצב פל�ש כבוי תמיד',
+'exif-flash-mode-3'     => 'מצב פל�ש �וטומטי',
+'exif-flash-function-1' => 'לל� תכונת פל�ש',
+'exif-flash-redeye-1'   => 'מצב מניעת עיניי� �דומות',
+
 'exif-focalplaneresolutionunit-2' => "�ינצ'י�",
 
 'exif-sensingmethod-1' => 'ל� מוגדרת',
@@ -2727,21 +3010,10 @@ $1
 �נ� �שרו ש�ת� �כן רוצי� ליצור מחדש �ת הדף.",
 'recreate'            => 'יצירה מחדש',
 
-# HTML dump
-'redirectingto' => 'מפנה ל־[[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'לנקות �ת המטמון של דף זה?
-
-$1',
 'confirm_purge_button' => '�ישור',
-
-# AJAX search
-'searchcontaining' => "חיפוש דפי� המכילי� �ת הטקסט '''$1'''.",
-'searchnamed'      => "חיפוש דפי� בש� '''$1'''.",
-'articletitles'    => "חיפוש דפי� המתחילי� ע� '''$1'''",
-'hideresults'      => 'הסתרת התוצ�ות',
-'useajaxsearch'    => 'שימוש בחיפוש AJAX',
+'confirm-purge-top'    => 'לנקות �ת המטמון של דף זה?',
+'confirm-purge-bottom' => 'ניקוי המטמון של דף גור� לגרסה החדשה ביותר להופיע.',
 
 # Multipage image navigation
 'imgmultipageprev' => '→ לדף הקוד�',
@@ -2864,6 +3136,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'תגית בלתי ידועה: "$1"',
+'duplicate-defaultsort' => '�זהרה: המיון הרגיל "$2" דורס �ת המיון הרגיל המוקד� ממנו "$1".',
 
 # Special:Version
 'version'                          => 'גרסת התוכנה', # Not used as normal message but as header for the special page itself
@@ -2890,15 +3163,16 @@ $1',
 'filepath'         => 'נתיב לקובץ',
 'filepath-page'    => 'הקובץ:',
 'filepath-submit'  => 'מצי�ת הנתיב',
-'filepath-summary' => 'דף זה מציג �ת הנתיב המל� לקבצי� שהועלו. תמונות מוצגות ברזולוציה מל�ה, ו�ילו סוגי קבצי� �חרי� מוצגי� ישירות ב�מצעות התוכנה שהוגדרה להצגת�.
+'filepath-summary' => 'דף זה מציג �ת הנתיב המל� לקבצי� שהועלו.
+תמונות מוצגות ברזולוציה מל�ה, ו�ילו סוגי קבצי� �חרי� מוצגי� ישירות ב�מצעות התוכנה שהוגדרה להצגת�.
 
-יש להקליד �ת ש� הקובץ לל� הקידומת "{{ns:image}}:".',
+יש להקליד �ת ש� הקובץ לל� הקידומת "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'חיפוש קבצי� כפולי�',
 'fileduplicatesearch-summary'  => 'חיפוש קבצי� כפולי� על בסיס ערכי ה־Hash שלה�.
 
-הקלידו �ת ש� הקובץ לל� הקידומת "{{ns:image}}:".',
+הקלידו �ת ש� הקובץ לל� הקידומת "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'חיפוש קבצי� כפולי�',
 'fileduplicatesearch-filename' => 'קובץ:',
 'fileduplicatesearch-submit'   => 'חיפוש',
@@ -2926,6 +3200,15 @@ $1',
 
 # Special:BlankPage
 'blankpage'              => 'דף ריק',
-'intentionallyblankpage' => 'דף זה נש�ר ריק במכוון',
+'intentionallyblankpage' => 'דף זה נש�ר ריק במכוון.',
+
+# External image whitelist
+'external_image_whitelist' => '#נ� להש�יר שורה זו בדיוק כפי שהי�<pre>
+#כתבו קטעי� של ביטויי� רגולריי� (רק החלק שבין סימני //) למטה
+#ביטויי� �לה יושוו לכתובות ה־URL של תמונות חיצוניות (המוכללות ב�מצעות כתובת URL)
+#התמונות שתו�מות ל�חד הביטויי� הרגולריי� יוצגו כתמונות, וה�חרות יוצגו כקישורי� בלבד
+#שורות המתחילות בסימן # הן הערות
+
+#נ� לכתוב �ת כל הביטויי� הרגולריי� מעל שורה זו. נ� להש�יר שורה זו בדיוק כפי שהי�</pre>',
 
 );
diff --git a/languages/messages/MessagesHi.php b/languages/messages/MessagesHi.php
index 998478b9..78bc7574 100644
--- a/languages/messages/MessagesHi.php
+++ b/languages/messages/MessagesHi.php
@@ -13,22 +13,22 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'विशेष',
-	NS_MAIN           => '',
-	NS_TALK           => 'वार�ता',
-	NS_USER           => 'सदस�य',
-	NS_USER_TALK      => 'सदस�य_वार�ता',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_वार�ता',
-	NS_IMAGE          => 'चित�र',
-	NS_IMAGE_TALK     => 'चित�र_वार�ता',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
-	NS_TEMPLATE       => 'सा�चा',
-	NS_TEMPLATE_TALK  => 'सा�चा_वार�ता',
-	NS_CATEGORY       => 'श�रेणी',
-	NS_CATEGORY_TALK  => 'श�रेणी_वार�ता',
+	NS_MEDIA            => 'मीडिया',
+	NS_SPECIAL          => 'विशेष',
+	NS_TALK             => 'वार�ता',
+	NS_USER             => 'सदस�य',
+	NS_USER_TALK        => 'सदस�य_वार�ता',
+	NS_PROJECT_TALK     => '$1_वार�ता',
+	NS_FILE             => 'चित�र',
+	NS_FILE_TALK        => 'चित�र_वार�ता',
+	NS_MEDIAWIKI        => 'मीडियाविकि',
+	NS_MEDIAWIKI_TALK   => 'मीडियाविकि_वार�ता',
+	NS_TEMPLATE         => 'सा�चा',
+	NS_TEMPLATE_TALK    => 'सा�चा_वार�ता',
+	NS_HELP             => 'सहायता',
+	NS_HELP_TALK        => 'सहायता_वार�ता',
+	NS_CATEGORY         => 'श�रेणी',
+	NS_CATEGORY_TALK    => 'श�रेणी_वार�ता',
 );
 
 $digitTransformTable = array(
@@ -92,8 +92,6 @@ $messages = array(
 'underline-never'   => 'कभीभी नहीं',
 'underline-default' => 'ब�राउज़र डिफ़ॉल�ट',
 
-'skinpreview' => '(�लक)',
-
 # Dates
 'sunday'        => 'रविवार',
 'monday'        => 'सोमवार',
@@ -186,7 +184,7 @@ $messages = array(
 'mytalk'         => 'मेरी सदस�य वार�ता',
 'anontalk'       => 'इस आई पी के लिये वार�ता',
 'navigation'     => 'नैविगेशन',
-'and'            => 'और',
+'and'            => '&#32;और',
 
 # Metadata in edit box
 'metadata_help' => 'मेटाडाटा:',
@@ -249,8 +247,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} के बारे में',
 'aboutpage'            => 'Project:अबाउट',
-'bugreports'           => 'बग रिपोर�ट',
-'bugreportspage'       => 'Project:बग रिपोर�ट',
 'copyright'            => 'यहां का पाठ�य $1 के अंतर�गत उपलब�ध हैं ।',
 'copyrightpagename'    => '{{SITENAME}} कॉपीराइट',
 'copyrightpage'        => '{{ns:project}}:कोपिराइट',
@@ -273,8 +269,6 @@ $messages = array(
 
 'badaccess'        => 'अन�मति त�र�टि',
 'badaccess-group0' => 'जिस क�रिया का अन�रोध आपने किया है उसे संचालित करने की अन�मति आपको नही है।',
-'badaccess-group1' => '$1 ग�र�पमें शामिल ह�� सदस�यही इसप�रकारकी क�रिया�ं कर सकतें हैं ।',
-'badaccess-group2' => '$1 ग�र�पोंमेंसे �क ग�र�पमें शामिल सदस�य ही इस प�रकार की क�रिया�ं कर सकतें हैं ।',
 'badaccess-groups' => '$1 ग�र�पोंमेंसे �क ग�र�पमें शामिल सदस�य ही इस प�रकार की क�रिया�ं कर सकतें हैं ।',
 
 'versionrequired'     => 'मीडीयाविकिका $1 अवतरण ज़रूरी हैं ।',
@@ -372,7 +366,6 @@ $1',
 'cannotdelete'         => 'इस पन�ने या चित�र को हटाया नहीं जा सका । (शायद इसे किसी और ने पहले ही हटा दिया हो )',
 'badtitle'             => 'खराब शीर�षक',
 'badtitletext'         => 'आपके द�वारा पूछा गया लेख का शीर�षक अयोग�य, ख़ाली या गलतीसे ज�डा ह�वा आंतर-भाषिय या आंतर-विकि शीर�षक हैं । इसमें �क या �कसे ज�यादा �से कॅरेक�टर है जो शीर�षकमें इस�तेमाल नहीं किये जा सकते है ।',
-'perfdisabled'         => 'माफ़ किजीयें! यह स�विधा अस�थायी र�प से बंद की गई है क�योंकि इसके चलते डाटाबेस इतनी धीमी गतीसे चलता है कि कोई भी विकिका इस�तेमाल नहीं कर पायेगा ।',
 'perfcached'           => 'नीचे दिया ह�वा पाठ�य कैश मेमरीसे लिया ह�वा होने के कारण अद�यतन जानकारीय�क�त ना होने की संभावना है ।',
 'perfcachedts'         => 'नीचे दी गई ज़ानकारी कैश मेमरीमें रखी ह�ई है, और आखिरी बार $1 को बदली गई हैं ।',
 'querypage-no-updates' => 'इस पन�ने का नवीनीकरण करना मना है । अभी यहां के डाटा को ताज़ा नहीं कर सकतें ।',
@@ -399,10 +392,10 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'सदस�य लॉग आउट',
-'logouttext'                 => '<strong>अब आपने लॉग आउट किया ह�आ हैं ।</strong>
+'logouttext'                 => "'''अब आपने लॉग आउट किया ह�आ हैं ।'''
 
 आप अनामकता से {{SITENAME}} का इस�तेमाल कर सकते हैं, या फिर उसी अथवा किसी अन�य सदस�यनामसे लॉग इन कर सकतें हैं ।
-जबतक आप अपने ब�राउज़र की कैश मेमरी खाली नहीं करतें, तब तक क�छ पन�नोंपर आप लॉग इन हैं, �सा दिखाया जा सकता हैं ।',
+जबतक आप अपने ब�राउज़र की कैश मेमरी खाली नहीं करतें, तब तक क�छ पन�नोंपर आप लॉग इन हैं, �सा दिखाया जा सकता हैं ।",
 'welcomecreation'            => "<h2>स�वागतम�‌, $1!</h2><p>आपका अकाउन�ट बना दिया गया है.
 Don't forget to personalize your {{SITENAME}} preferences.",
 'loginpagetitle'             => 'सदस�य लॉग इन',
@@ -412,7 +405,6 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 'remembermypassword'         => 'इस कंप�यूटर पर मेरी लॉग-इन सूचना याद रखें।',
 'yourdomainname'             => 'आपका डोमेन:',
 'externaldberror'            => 'बाह�य प�रमाणिकरण डाटाबेसमें समस�या ह�ई हैं या फिर आपको अपना बाह�य खाता अपडेट करने की अन�मति नहीं हैं ।',
-'loginproblem'               => '<b>आपके लोगिन में समस�या ह�ई है ।</b><br />द�बारा प�रयत�न करें!',
 'login'                      => 'लॉग इन',
 'nav-login-createaccount'    => 'सदस�य लॉग इन',
 'loginprompt'                => 'विकिपीडिया पर लॉग इन करने लि� आपने ब�राउज़र पर क�की (cookies) को समर�थ करें।',
@@ -501,12 +493,14 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 लॉग इन को पूरा करने के लिये, आप �क नया कूटशब�द दें:',
 'resetpass_text'          => '<!-- पाठ यहां लिखें -->',
 'resetpass_header'        => 'कूटशब�द रिसेट करें',
+'oldpassword'             => 'प�राना पासवर�ड',
+'newpassword'             => 'नया कूटशब�द',
+'retypenew'               => 'नया कूटशब�द प�न: लिखें',
 'resetpass_submit'        => 'कूटशब�द बनाईयें और लॉग इन करें',
 'resetpass_success'       => 'आपका कूटशब�द बदल दिया गया हैं! अभी आपको लॉग इन करवा रहें हैं...',
 'resetpass_bad_temporary' => 'अस�थायी कूटशब�द गलत हैं ।
 आपने ही पहले ही अपना कूटशब�द बदल दिया हो या फिर आपने नया अस�थायी कूटशब�द मंगाया होगा ।',
 'resetpass_forbidden'     => '{{SITENAME}} पर कूटशब�द बदलें नहीं जा सकतें',
-'resetpass_missing'       => 'फ़ार�म डाटा मिला नहीं ।',
 
 # Edit page toolbar
 'bold_sample'     => 'मोटा पाठ',
@@ -531,8 +525,8 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 'hr_tip'          => 'हॉरि�ॉंटल लाईन (कम इस�तेमाल करें)',
 
 # Edit pages
-'summary'                          => 'सारांश',
-'subject'                          => 'विषय/शीर�षक',
+'summary'                          => 'सारांश:',
+'subject'                          => 'विषय/शीर�षक:',
 'minoredit'                        => 'यह �क छोटा बदलाव है',
 'watchthis'                        => 'इस पृष�ठ को ध�यानसूची में डालें',
 'savearticle'                      => 'बदलाव संजोयें',
@@ -546,8 +540,8 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 'missingcommenttext'               => 'कृपया नीचे टिप�पणी दें ।',
 'missingcommentheader'             => "'''स�मरण-पत�र:''' आपने इस टिप�पणीको शीर�षक नहीं दिया हैं ।
 अगर आप द�बारा संजोयें पर क�लीक करें तो आपके बदलाव संजोयें जायेंगे ।",
-'summary-preview'                  => 'सारांशकी �लक',
-'subject-preview'                  => 'विषय/शीर�षक की �लक',
+'summary-preview'                  => 'सारांशकी �लक:',
+'subject-preview'                  => 'विषय/शीर�षक की �लक:',
 'blockedtitle'                     => 'सदस�य अवर�द�ध है',
 'blockedtext'                      => "<big>'''आपका सदस�यनाम अथवा IP �ड�रेस ब�लॉक कर दिया गया हैं ।'''</big>
 
@@ -603,25 +597,25 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 '''कॉङ�करर:''' सिर�फ़ ''Reload'' बटन पर क�लिक करें, या ''F5'' दबा��; 
 
 '''ऑपरा''' सदस�य को ''Tools→Preferences'' में सम�पूर�ण कैश ख़ाली करने की ज़रूरत हो सकती है।",
-'usercssjsyoucanpreview'           => '<strong>टीप:</strong>आपका नया CSS/JS संजोने से पहले ’�लक’ देखें ।',
+'usercssjsyoucanpreview'           => "'''टीप:'''आपका नया CSS/JS संजोने से पहले ’�लक’ देखें ।",
 'usercsspreview'                   => "'''आप अपने सी.�स.�स.की सिर�फ �लक देख रहें हैं, वह अभीतक संजोई नहीं हैं इसका खयाल रखें ।'''",
 'userjspreview'                    => "'''आप अपने जावास�क�रीप�टकी सिर�फ �लक देख रहें हैं, वह अभीतक संजोई नहीं हैं इसका खयाल रखें ।'''",
 'userinvalidcssjstitle'            => "'''ताक़ीद:''' \"\$1\" नामसे कोई त�वचा नहीं हैं ।
 कृपया ध�यान में रहें की बदली ह�ई .css और .js फ़ाईलें नीचे स�तरकी लिपी का इस�तेमाल करती हैं, उदा.  {{ns:user}}:Foo/monobook.css के विर�ध {{ns:user}}:Foo/Monobook.css ।",
 'updated'                          => '(अद�यतनीत)',
-'note'                             => '<strong>सूचना:</strong>',
-'previewnote'                      => '<strong>याद रखें, यह केवल �क �लक है और अभी तक स�रक�षित  नहीं किया गया है!</strong>',
+'note'                             => "'''सूचना:'''",
+'previewnote'                      => "'''याद रखें, यह केवल �क �लक है और अभी तक स�रक�षित  नहीं किया गया है!'''",
 'previewconflict'                  => 'उपरी बदलाव संजोये जाने के बाद उपरी पाठ इस �लकके अन�सार दिखाया जायेगा।',
-'session_fail_preview'             => '<strong>माफ किजीयें! आपके बदलाव सेशन डाटा के नष�ट होने के कारण संजोयें नहीं गयें हैं।
-कृपया प�न: यत�न करें। अगर इसके बाद भी �सा ही होता हैं तो कॄपया लॉग आउट करके फिरसे लॉग इन करें।</strong>',
-'session_fail_preview_html'        => "<strong>माफ किजीयें! आपके बदलाव सत�र डाटा नष�ट होने के कारण संजोयें नहीं जा सकें।</strong>
+'session_fail_preview'             => "'''माफ किजीयें! आपके बदलाव सेशन डाटा के नष�ट होने के कारण संजोयें नहीं गयें हैं।
+कृपया प�न: यत�न करें। अगर इसके बाद भी �सा ही होता हैं तो कॄपया लॉग आउट करके फिरसे लॉग इन करें।'''",
+'session_fail_preview_html'        => "'''माफ किजीयें! आपके बदलाव सत�र डाटा नष�ट होने के कारण संजोयें नहीं जा सकें।'''
 
 ''चूंकी {{SITENAME}} HTML पर निर�भर हैं, जावास�क�रीप�ट पर होने वाले संभाव�य हमलोंसे बचाव के लिये �लक नहीं दिखाईं गईं हैं।''
 
-<strong>अगर यह आपका वैध संपादन यत�न था, तो कृपया प�न: यत�न करें। अगर इसके बाद भी �सा ही ह�आ तो कृपया लॉग आउट करके फिरसे लॉग इन करें।</strong>",
-'token_suffix_mismatch'            => '<strong>आपके द�वारा किये गये बदलाव रद�द कर दियें गयें हैं क�योंकी आपके क�लायंटने आपके संपादनमें दियें ह�� विरामचिन�होंमें बदलाव कियें हैं।
+'''अगर यह आपका वैध संपादन यत�न था, तो कृपया प�न: यत�न करें। अगर इसके बाद भी �सा ही ह�आ तो कृपया लॉग आउट करके फिरसे लॉग इन करें।'''",
+'token_suffix_mismatch'            => "'''आपके द�वारा किये गये बदलाव रद�द कर दियें गयें हैं क�योंकी आपके क�लायंटने आपके संपादनमें दियें ह�� विरामचिन�होंमें बदलाव कियें हैं।
 लेख के पाठमें खराबी ना आयें इसलियें यह बदलाव रद�द कर दियें गयें हैं।
-�सा शायद आप अनामक प�रोक�सी इस�तेमाल करने से हो सकता हैं।</strong>',
+�सा शायद आप अनामक प�रोक�सी इस�तेमाल करने से हो सकता हैं।'''",
 'editing'                          => '$1 सम�पादन',
 'editingsection'                   => '$1 सम�पादन (अन�भाग)',
 'editingcomment'                   => '$1 (टिप�पणी) सम�पादन',
@@ -632,28 +626,28 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 अगर आपने "बदलाव संजोयें" पर क�लिक किया तो <b>सिर�फ</b> उपरी हिस�से में दिखने वाला पाठ संजोया जायेगा।<br />',
 'yourtext'                         => 'आपका पाठ',
 'storedversion'                    => 'संजोया ह�आ अवतरण',
-'nonunicodebrowser'                => '<strong>सावधान: आपका ब�राउज़र यूनिकोड आधारित नहीं हैं। 
-आपके द�वारा स�योग�य संपादन होने के लिये: ASCII न होने वाले चिन�ह षट��पदी कोड (hexadecimal) में दर�शायें जायेंगे।</strong>',
-'editingold'                       => '<strong>सूचना: आप इस पृष�ठ का कालातीत अवतरण संपादित कर रहें हैं।
-अगर आप इसे संजोतें हैं, तो इस अवतरण के बाद ह�� सभी बदलाव नष�ट हो जायेंगे।</strong>',
+'nonunicodebrowser'                => "'''सावधान: आपका ब�राउज़र यूनिकोड आधारित नहीं हैं। 
+आपके द�वारा स�योग�य संपादन होने के लिये: ASCII न होने वाले चिन�ह षट��पदी कोड (hexadecimal) में दर�शायें जायेंगे।'''",
+'editingold'                       => "'''सूचना: आप इस पृष�ठ का कालातीत अवतरण संपादित कर रहें हैं।
+अगर आप इसे संजोतें हैं, तो इस अवतरण के बाद ह�� सभी बदलाव नष�ट हो जायेंगे।'''",
 'yourdiff'                         => 'अंतर',
-'copyrightwarning'                 => 'कृपया ध�यान रहे कि {{SITENAME}} को किये गये सभी योगदान $2
+'copyrightwarning'                 => "कृपया ध�यान रहे कि {{SITENAME}} को किये गये सभी योगदान $2
 की शर�तों के तहत� उपलब�ध किये ह�� माने जायेंगे (अधिक जानकारी के लिये $1 देखें) । अगर आप अपनी लिखाई को बदलते और प�नः वितरित होते नहीं देखना चाहते हैं तो यहां योगदान नहीं करें । <br />
-आप यह भी प�रमाणित कर रहे हैं कि यह आपने स�वयं लिखा है अथवा जनार�पीत या किसी अन�य म�क�त स�रोत से कॉपी किया है । <strong>कॉपीराइट वाले लेखों को, बिना अन�मति के, यहा� नहीं डालिये !</strong>',
-'copyrightwarning2'                => '{{SITENAME}} पर लिखा ह�आ कोईभी पाठ अन�य सदस�योंद�वारा बदला जा सकता है या फिर निकाला भी जा सकता हैं।
+आप यह भी प�रमाणित कर रहे हैं कि यह आपने स�वयं लिखा है अथवा जनार�पीत या किसी अन�य म�क�त स�रोत से कॉपी किया है । '''कॉपीराइट वाले लेखों को, बिना अन�मति के, यहा� नहीं डालिये !'''",
+'copyrightwarning2'                => "{{SITENAME}} पर लिखा ह�आ कोईभी पाठ अन�य सदस�योंद�वारा बदला जा सकता है या फिर निकाला भी जा सकता हैं।
 अगर आपको अपने लिखे ह�� पाठ में संपादन होना नामंजूर हैं तो कृपया यहां पर मत लिखें।<br />
 आप हमें यह भी वचन देतें हैं कि यह आपने ख�द लिखा हैं या फिर कोई पब�लिक डोमेन या �से ही किसी म�क�त स�रोतसे कापी किया हैं। (अधिक जानकारी के लिये $1 देखें)।
-<strong>कॉपीराइट वाले लेखों को, बिना अन�मति के, यहा� न डाले।</strong>',
-'longpagewarning'                  => '<strong>सूचना: यह पन�ना $1 किलोबाईट�सका है; क�छ ब�राउज़र�स 32kb से ज�यादा बडे पन�नोंको ठीक से नहीं दिखा सकते या संपादित करने में अस�विधा हो सकती है ।
-कृपया इस पन�नेके उससे कम आकारके विभाग बनाईये ।</strong>',
-'longpageerror'                    => '<strong>गलती: आपने दिया ह�आ पाठ $1 कीलोबाईट लंबा हैं, जो $2 केबी के मर�यादा से बाहर हैं।
-इसे संजोया नहीं जा सकता।</strong>',
-'readonlywarning'                  => '<strong>सावधान: डाटाबेस रख रखाव के लियें बंद कर दिया गया हैं, इसलिये अभी आपके बदलाव संजोयें नहीं जा सकतें।
-अगर आप चाहतें हैं तो इस पाठ को टैक�स�ट फ़ाईल में कट-पेस�ट करके रख सकतें हैं।</strong>',
-'protectedpagewarning'             => '<strong>स�चना:  यह लेख स�रक�षित कर दिया गया हैं और सिर�फ प�रबंधक इसमें बदलाव कर सकतें हैं।</strong>',
+'''कॉपीराइट वाले लेखों को, बिना अन�मति के, यहा� न डाले।'''",
+'longpagewarning'                  => "'''सूचना: यह पन�ना $1 किलोबाईट�सका है; क�छ ब�राउज़र�स 32kb से ज�यादा बडे पन�नोंको ठीक से नहीं दिखा सकते या संपादित करने में अस�विधा हो सकती है ।
+कृपया इस पन�नेके उससे कम आकारके विभाग बनाईये ।'''",
+'longpageerror'                    => "'''गलती: आपने दिया ह�आ पाठ $1 कीलोबाईट लंबा हैं, जो $2 केबी के मर�यादा से बाहर हैं।
+इसे संजोया नहीं जा सकता।'''",
+'readonlywarning'                  => "'''सावधान: डाटाबेस रख रखाव के लियें बंद कर दिया गया हैं, इसलिये अभी आपके बदलाव संजोयें नहीं जा सकतें।
+अगर आप चाहतें हैं तो इस पाठ को टैक�स�ट फ़ाईल में कट-पेस�ट करके रख सकतें हैं।'''",
+'protectedpagewarning'             => "'''स�चना:  यह लेख स�रक�षित कर दिया गया हैं और सिर�फ प�रबंधक इसमें बदलाव कर सकतें हैं।'''",
 'semiprotectedpagewarning'         => "'''सूचना:''' यह लेख स�रक�षित कर दिया गया हैं और सिर�फ पंजीकृत सदस�य ही इसमें बदलाव कर सकतें हैं।",
 'cascadeprotectedwarning'          => "'''सावधान:''' यह लेख निम�नलिखीत स�रक�षा-सीढी {{PLURAL:$1|पन�ने से|पन�नों से}} ज�डा ह�आ होने के कारण स�रक�षित ह�आ हैं, और सिर�फ प�रबंधक ही इसमें बदलाव कर सकतें हैं:",
-'titleprotectedwarning'            => '<strong>स�चना:  यह लेख स�रक�षित हैं और क�छ सदस�य ही इसका निर�माण कर सकतें हैं।</strong>',
+'titleprotectedwarning'            => "'''स�चना:  यह लेख स�रक�षित हैं और क�छ सदस�य ही इसका निर�माण कर सकतें हैं।'''",
 'templatesused'                    => 'इस पृष�ठ पर प�रय�क�त सा�चे:',
 'templatesusedpreview'             => 'इस �लकमें इस�तेमाल किये ह�� टेम�प�लेट�स:',
 'templatesusedsection'             => 'इस विभागमें इस�तेमाल किये गये सा�चे:',
@@ -700,11 +694,9 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 # History pages
 'viewpagelogs'        => 'इस पन�नेका लॉग देखियें',
 'nohistory'           => 'इस पन�ने का कोई इतिहास नहीं',
-'revnotfound'         => 'अवतरण मिला नहीं',
-'revnotfoundtext'     => 'आपसे पूछा गया इस लेख का प�राना अवतरण नहीं मिल पाया। कॄपया आपने इस�तेमाल किये URL की जा�च करें।',
 'currentrev'          => 'सद�य अवतरण',
 'revisionasof'        => '$1 का आवर�तन',
-'revision-info'       => '$2ने किया ह�वा $1का अवतरण',
+'revision-info'       => '$2ने किया ह�वा $1का अवतरण', # Additionally available: $3: revision id
 'previousrevision'    => '� प�राना संशोधन',
 'nextrevision'        => 'नया संशोधन →',
 'currentrevisionlink' => 'वर�तमान संशोधन',
@@ -833,6 +825,7 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 'prevn'                     => 'पिछले $1',
 'nextn'                     => 'अगले $1',
 'viewprevnext'              => 'देख़ें ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:सहायता',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 शब�द|$2 शब�द}})',
 'search-result-score'       => 'संबद�ध: $1%',
 'search-redirect'           => '($1 को अन�प�रेषित)',
@@ -876,6 +869,7 @@ Don't forget to personalize your {{SITENAME}} preferences.",
 'qbsettings-floatingright' => 'अस�थिर दाहिनी तरफ़',
 'changepassword'           => 'कूटशब�द बदलें',
 'skin'                     => 'त�वचा',
+'skin-preview'             => '�लक',
 'math'                     => 'गणित',
 'dateformat'               => 'दिनांक प�रारूप',
 'datedefault'              => 'खा़स पसंद नहीं',
@@ -899,9 +893,6 @@ latex, dvips, gs, और convert के इन�स�टॉलेशन की
 'prefs-misc'               => 'अन�य',
 'saveprefs'                => 'संजोयें',
 'resetprefs'               => 'ना संजोये गये बदलाव रद�द करें',
-'oldpassword'              => 'प�राना पासवर�ड',
-'newpassword'              => 'नया कूटशब�द',
-'retypenew'                => 'नया कूटशब�द प�न: लिखें',
 'textboxsize'              => 'संपादन',
 'rows'                     => 'कतारें:',
 'columns'                  => 'कॉलम:',
@@ -931,7 +922,7 @@ latex, dvips, gs, और convert के इन�स�टॉलेशन की
 'userrights-lookup-user'      => 'सदस�य ग�र�पोंका व�यवस�थापन करें',
 'userrights-user-editname'    => 'सदस�यनाम दें:',
 'editusergroup'               => 'सदस�य ग�र�पका संपादन करें',
-'editinguser'                 => "सदस�य '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])के सदस�य अधिकारोंमें बदलाव कियें जा रहें हैं।",
+'editinguser'                 => "सदस�य '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])के सदस�य अधिकारोंमें बदलाव कियें जा रहें हैं।",
 'userrights-editusergroup'    => 'सदस�य ग�र�पोंका संपादन करें',
 'saveusergroups'              => 'सदस�य ग�र�प संजोयें',
 'userrights-groupsmember'     => 'का सदस�य:',
@@ -1076,11 +1067,11 @@ latex, dvips, gs, और convert के इन�स�टॉलेशन की
 'upload_directory_read_only'  => 'अपलोड डाइरेक�टरी ($1) में सर�वर लिख नहीं पा रहा हैं।',
 'uploaderror'                 => 'अपलोड �रर',
 'uploadtext'                  => "नईं फ़ाईलें अपलोड करने के लिये इस पन�ने का इस�तेमाल करें।
-इसके पहले [[Special:ImageList|अपलोड की गईं फ़ाईलों की सूची]] देखें। अपलोड की ह�ईं और हटाईं ह�ई फ़ाइलों के लिये [[Special:Log/upload|सूची]] देखें।
+इसके पहले [[Special:FileList|अपलोड की गईं फ़ाईलों की सूची]] देखें। अपलोड की ह�ईं और हटाईं ह�ई फ़ाइलों के लिये [[Special:Log/upload|सूची]] देखें।
 
 अपने लेखोंमें यह फ़ाईल इस�तेमाल के लिये नीचे दिये गये उदाहरणोंके अन�सार कड़ियां बनाईयें।
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' या फिर
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' या फिर
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' डाइरेक�ट कड़ि बनाने के लिये।",
 'upload-permitted'            => 'अन�मतित फ़ाईल प�रकार: $1।',
 'upload-preferred'            => 'पसंदीदा फ़ाईल प�रकार: $1।',
@@ -1108,25 +1099,25 @@ latex, dvips, gs, और convert के इन�स�टॉलेशन की
 यह फ़ाईल $2 आकार की हैं।',
 'largefileserver'             => 'इस फ़ाईल का आकार निर�धारित आकार से ज�यादा हैं।',
 'emptyfile'                   => 'आपके द�वारा अपलोड की गई फ़ाईल रिक�त हैं। यह फ़ाईल का नाम लिखने में गलती के चलते हो सकता हैं। कॄपया आप यहीं फ़ाईल अपलोड करना चाहतें हैं इसकी जा�च करें।',
-'fileexists'                  => 'इस नामकी फ़ाईल पहले से अस�तित�वमें हैं, कृपया यह फ़ाईल बदलनेमें आप साशंक हैं तो <strong><tt>$1</tt></strong> देखें।',
-'filepageexists'              => '<strong><tt>$1</tt></strong> यह नामसे �क सहायतापृष�ठ पहलेसे अस�तित�व में हैं, पर इस नामसे कोई फ़ाईल नहीं हैं।
+'fileexists'                  => "इस नामकी फ़ाईल पहले से अस�तित�वमें हैं, कृपया यह फ़ाईल बदलनेमें आप साशंक हैं तो '''<tt>$1</tt>''' देखें।",
+'filepageexists'              => "'''<tt>$1</tt>''' यह नामसे �क सहायतापृष�ठ पहलेसे अस�तित�व में हैं, पर इस नामसे कोई फ़ाईल नहीं हैं।
 आपके द�वारा दी गई संक�षिप�त ज़ानकारी इस सहायतापृष�ठ पर नहीं दिखाई जायेगी।
-संक�षिप�त ज़ानकारी वहां दिखाने के लिये आपको इसे स�वयं संपादित करना पडेगा।',
-'fileexists-extension'        => 'इस नाम से मिलतेज�लते नाम की �क फ़ाईल पहलेंसे हैं:<br />
-अपलोड हो रहे फ़ाईल का नाम: <strong><tt>$1</tt></strong><br />
-अस�तित�वमें होने वालें फ़ाईल का नाम: <strong><tt>$2</tt></strong><br />
-कृपया अन�य नाम च�नें।',
+संक�षिप�त ज़ानकारी वहां दिखाने के लिये आपको इसे स�वयं संपादित करना पडेगा।",
+'fileexists-extension'        => "इस नाम से मिलतेज�लते नाम की �क फ़ाईल पहलेंसे हैं:<br />
+अपलोड हो रहे फ़ाईल का नाम: '''<tt>$1</tt>'''<br />
+अस�तित�वमें होने वालें फ़ाईल का नाम: '''<tt>$2</tt>'''<br />
+कृपया अन�य नाम च�नें।",
 'fileexists-thumb'            => "<center>'''उपलब�ध फ़ाईल'''</center>",
-'fileexists-thumbnail-yes'    => 'यह फ़ाईल बडे चित�रका छोटा आकार <i>(thumbnail)</i> प�रतीत होता हैं।
-<strong><tt>$1</tt></strong> यह फ़ाईल देखें।<br />
-अगर जा�ची गई फ़ाईल इसी आकारकी हैं तो नईं फ़ाईल अपलोड करना जरूरी नहीं हैं।',
-'file-thumbnail-no'           => 'इस फ़ाइल का नाम <strong><tt>$1</tt></strong> से श�रू हो रहा हैं।
-हो सकता हैं यह शायद <i>(thumbnail)</i> हों।
-अगर आपके पास पूरे रिज़ोल�यूशन की फ़ाईल हैं तो उसे अपलोड करें या फिर इस फ़ाईल का नाम बदलें।',
+'fileexists-thumbnail-yes'    => "यह फ़ाईल बडे चित�रका छोटा आकार ''(thumbnail)'' प�रतीत होता हैं।
+'''<tt>$1</tt>''' यह फ़ाईल देखें।<br />
+अगर जा�ची गई फ़ाईल इसी आकारकी हैं तो नईं फ़ाईल अपलोड करना जरूरी नहीं हैं।",
+'file-thumbnail-no'           => "इस फ़ाइल का नाम '''<tt>$1</tt>''' से श�रू हो रहा हैं।
+हो सकता हैं यह शायद ''(thumbnail)'' हों।
+अगर आपके पास पूरे रिज़ोल�यूशन की फ़ाईल हैं तो उसे अपलोड करें या फिर इस फ़ाईल का नाम बदलें।",
 'fileexists-forbidden'        => 'इस नाम से �क फ़ाईल पहलेसे अस�तित�वमें हैं;
-कॄपया पीछे जाकर इस फ़ाईल को नये नाम से अपलोड करें। [[Image:$1|thumb|center|$1]]',
+कॄपया पीछे जाकर इस फ़ाईल को नये नाम से अपलोड करें। [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'शेअर�ड फ़ाईल रिपोज़िटरीमें इस नाम से �क फ़ाईल हैं;
-कृपया पीछे जाकर इसे नये नाम से अपलोड करें। [[Image:$1|thumb|center|$1]]',
+कृपया पीछे जाकर इसे नये नाम से अपलोड करें। [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'यह फ़ाईल निम�नलिखित {{PLURAL:$1|फ़ाइल की|फ़ाइलोंकी}} कापी हैं:',
 'successfulupload'            => 'अपलोड हो गईं',
 'uploadwarning'               => 'अपलोड वार�निंग',
@@ -1149,8 +1140,8 @@ latex, dvips, gs, और convert के इन�स�टॉलेशन की
 
 आपको यह क�रिया वैध हैं इसके बारें में सोचना चाहियें।
 इस फ़ाईल की हटाने की सूची आपके सहायता के लिये यहां दी गई हैं:",
-'filename-bad-prefix'         => 'आप अपलोड कर रहे फ़ाईल का नाम <strong>"$1"</strong> से श�रू होता हैं, जो की डिजिटल कैमेरे द�वारा दिया गया नाम हैं।
-कृपया इस फ़ाईलके लिये कोई दूसरा ज�यादा ज़ानकारीय�क�त नाम च�नें।',
+'filename-bad-prefix'         => "आप अपलोड कर रहे फ़ाईल का नाम '''\"\$1\"''' से श�रू होता हैं, जो की डिजिटल कैमेरे द�वारा दिया गया नाम हैं।
+कृपया इस फ़ाईलके लिये कोई दूसरा ज�यादा ज़ानकारीय�क�त नाम च�नें।",
 'filename-prefix-blacklist'   => '#<!-- leave this line exactly as it is --> <pre>
 # रूपरेखा इस प�रकार हैं:
 #   *  "#" अक�षर से श�र� होने वाली लाइनें टिप�पणीया� हैं।
@@ -1191,20 +1182,20 @@ PICT # misc.
 'upload_source_url'  => ' (�क वैध, सभी जगहोंसे उपलब�ध URL)',
 'upload_source_file' => ' (आपके कम�प�यूटरपर होनेवाली फ़ाईल)',
 
-# Special:ImageList
-'imagelist-summary'     => 'यह विशेष पृष�ठ सभी अपलोड की ह�ई फ़ाईलें दर�शाता हैं।
+# Special:ListFiles
+'listfiles-summary'     => 'यह विशेष पृष�ठ सभी अपलोड की ह�ई फ़ाईलें दर�शाता हैं।
 सामान�यत: सबसे बादमें अपलोड ह�ई फ़ाईलें सबसे उपर दिखती हैं।
 कालम कें शीर�षकमें क�लिक करने से अन�क�रम बदला जा सकता हैं।',
-'imagelist_search_for'  => 'इस मीडिया नाम से खोजें:',
+'listfiles_search_for'  => 'इस मीडिया नाम से खोजें:',
 'imgfile'               => 'फ़ाईल',
-'imagelist'             => 'चित�र सूची',
-'imagelist_date'        => 'दिनांक',
-'imagelist_name'        => 'नाम',
-'imagelist_user'        => 'सदस�य',
-'imagelist_size'        => 'आकार',
-'imagelist_description' => 'ज़ानकारी',
-
-# Image description page
+'listfiles'             => 'चित�र सूची',
+'listfiles_date'        => 'दिनांक',
+'listfiles_name'        => 'नाम',
+'listfiles_user'        => 'सदस�य',
+'listfiles_size'        => 'आकार',
+'listfiles_description' => 'ज़ानकारी',
+
+# File description page
 'filehist'                       => 'फ़ाईलका इतिहास',
 'filehist-help'                  => 'फ़ाईलका प�राना अवतरण देखनेके लिये दिनांक/समय पर क�लीक करें।',
 'filehist-deleteall'             => 'सभी हटायें',
@@ -1256,8 +1247,6 @@ PICT # misc.
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' के [$3, $2 के अवतरण] हटा दिये गयें हैं।</span>',
 'filedelete-nofile'           => "'''$1''' {{SITENAME}} पर अस�तित�वमें नहीं हैं।",
 'filedelete-nofile-old'       => "दिये ह�� विशेशता से मेल खाने वालें '''$1''' के अवतरण नहीं हैं।",
-'filedelete-iscurrent'        => 'आप इस फ़ाईलका सबसे नया अवतरण हटा रहें हैं।
-कृपया इसके पहले इसके प�राने अवतरणको प�नर�स�थापित करें।',
 'filedelete-otherreason'      => 'अन�य/दूसरा कारण:',
 'filedelete-reason-otherlist' => 'अन�य कारण',
 'filedelete-reason-dropdown'  => '*हटाने के साधारण कारण
@@ -1293,21 +1282,9 @@ PICT # misc.
 'randomredirect-nopages' => 'इस नामस�थानमें अन�प�रेषितें नहीं हैं।',
 
 # Statistics
-'statistics'             => 'आंकड़े',
-'sitestats'              => 'विकिपीडिया आंकड़े',
-'userstats'              => 'सदस�य आंकड़े',
-'sitestatstext'          => "डेटाबेस में {{PLURAL:\$1|'''१''' पृष�ठ है|'''\$1''' क�ल पृष�ठ हैं}}।
-जिसमें \"संवाद\" पृष�ठ, {{SITENAME}} के बारे में पृष�ठ, अल�पतम \"ठूंठ\" पृष�ठ, अन�प�रेषित पृष�ठ, और अन�य पृष�ठ शामिल है, जो संभवत: विषय सूची पृष�ठों में शामिल होने योग�य नहीं है।
-इनको छोड़कर, {{PLURAL:\$2|'''१'''  पृष�ठ है|'''\$2''' पृष�ठ हैं}}, जो कि तर�कसंगत विषयसूची पृष�ठ {{PLURAL:\$2|है|हैं}}।
-
-'''\$8''' फाइल अपलोड की जा च�की {{PLURAL:\$8|है|हैं}}।
-
-जब से {{SITENAME}} का निर�माण ह�आ है, क�ल मिलाकर, {{PLURAL:\$3|पृष�ठ|पृष�ठों}} को '''\$3''' बार देखा जा च�का है, और '''\$4''' बार पृष�ठ संपादित {{PLURAL:\$4|किया जा च�का है|किये जा च�के हैं}}।
-इससे पता चलता है कि, औसतन प�रति पृष�ठ '''\$5''' संपादन होते हैं, �वं प�रति संपादन इन�हें '''\$6''' बार देखा जाता है।
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue कार�य पंक�ति] की लम�बाई '''\$7''' है।",
-'userstatstext'          => "इस विकिपीडिया में  {{PLURAL:$1|'''1''' रजिस�टर�ड [[Special:ListUsers|सदस�य]]|'''$1''' रजिस�टर�ड  [[Special:ListUsers|सदस�य]]}} हैं, जिसमें से  '''$2''' (या '''$4%''') {{PLURAL:$2|सदस�यको|सदस�योंको}} $5 अधिकार हैं।",
-'statistics-mostpopular' => 'सबसे ज�यादा देखें जाने वाले पन�ने',
+'statistics'              => 'आंकड़े',
+'statistics-header-users' => 'सदस�य आंकड़े',
+'statistics-mostpopular'  => 'सबसे ज�यादा देखें जाने वाले पन�ने',
 
 'disambiguations'      => 'डिस�म�बिग�वीशन पन�ने',
 'disambiguationspage'  => 'Template:disambig',
@@ -1349,7 +1326,6 @@ PICT # misc.
 'popularpages'            => 'लोकप�रिय पन�ने',
 'wantedcategories'        => 'श�रेणिया� जो चाहिये',
 'wantedpages'             => 'जो पन�ने चाहिये',
-'missingfiles'            => 'गायब ह�ई फ़ाइलें',
 'mostlinked'              => 'सबसे ज�यादा ज�डे ह�� पन�ने',
 'mostlinkedcategories'    => 'सबसे ज�यादा ज�डी ह�ई श�रेणिया�',
 'mostlinkedtemplates'     => 'सबसे ज�यादा ज�डी ह�ई टेम�प�लेट�स',
@@ -1396,8 +1372,6 @@ PICT # misc.
 'speciallogtitlelabel' => 'शीर�षक:',
 'log'                  => 'प�रचालेख सूची',
 'all-logs-page'        => 'सभी सूचिया�',
-'log-search-legend'    => 'सूची के लिये खोज',
-'log-search-submit'    => 'जायें',
 'alllogstext'          => 'विकिपीडिया के सभी प�राप�य सत�रों का संय�क�त प�रदर�शन।
 आप सत�र के प�रकार,उपयोगकर�ता नाम,या प�रभावित पृष�ठ का चयन कर के दृश�य को संकीर�णित कर सकते हैं।',
 'logempty'             => 'सूची में �सा आइटम नहीं हैं।',
@@ -1426,11 +1400,31 @@ PICT # misc.
 'special-categories-sort-count' => 'संख�यान�सार वर�ग दर�शायें',
 'special-categories-sort-abc'   => 'वर�णान�क�रम के अन�सार दर�शायें',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'हटाये गये सदस�य योगदान',
+
+# Special:LinkSearch
+'linksearch'       => 'वेब कड़ीया� खोजें',
+'linksearch-pat'   => 'खोजने के लिये पाठ:',
+'linksearch-ns'    => 'नामस�थान:',
+'linksearch-ok'    => 'खोजें',
+'linksearch-text'  => '"*.wikipedia.org" जैसे वाईल�डकार�ड�स इस�तेमाल करनेकी अन�मति हैं।<br />निम�नलिखित प�रोटोकॉल�समें: <tt>$1</tt>',
+'linksearch-line'  => '$2 में से $1 ज�डा ह�आ हैं',
+'linksearch-error' => 'वाईल�डकार�ड�स होस�टनामके सिर�फ श�र� में आ सकतें हैं।',
+
 # Special:ListUsers
 'listusersfrom'      => 'इस शब�द से श�र� होनेवाले सदस�य दर�शायें:',
 'listusers-submit'   => 'दर�शायें',
 'listusers-noresult' => 'सदस�य मिला नहीं।',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'नये सदस�योंकी सूची',
+'newuserlogpagetext'          => 'यह नये सदस�योंकी सूची हैं।',
+'newuserlog-byemail'          => 'कूटशब�द इ-मेल द�वारा भेजा गया हैं',
+'newuserlog-create-entry'     => 'नवीन सदस�य',
+'newuserlog-create2-entry'    => '$1 के लिये खाता खोला',
+'newuserlog-autocreate-entry' => 'खाता अपनेआप खोल दिया हैं',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'सदस�य ग�र�प अधिकार',
 'listgrouprights-summary'  => 'नीचे विकिपर बनायें गये ग�र�पोंकी सूची उन ग�र�पोंके सदस�योंको प�राप�त अधिकारोंके साथ दर�शायी गई हैं। हर �क के अधिकार के बारे में अधिक जानकारी [[{{MediaWiki:Listgrouprights-helppage}}|यहां]] दी गई हैं।',
@@ -1491,12 +1485,6 @@ PICT # misc.
 'iteminvalidname'      => "'$1' के साथ समस�या, अवैध नाम...",
 'wlnote'               => "नीचे पीछले {{PLURAL:$2|घंटेमें|'''$2''' घंटोंमें}} ह�� {{PLURAL:$1|आखिरी बदलाव|आखिरी '''$1''' बदलाव}} दिये ह�� हैं।",
 'wlshowlast'           => 'पिछले $1 घंटे $2 दिन $3 देखें',
-'watchlist-show-bots'  => 'बोटों के बदलाव दर�शायें',
-'watchlist-hide-bots'  => 'बोट �डिट छ�पायें',
-'watchlist-show-own'   => 'मेरे बदलाव दर�शायें',
-'watchlist-hide-own'   => 'मेरे बदलाव छ�पायें',
-'watchlist-show-minor' => 'छोटे बदलाव दर�शायें',
-'watchlist-hide-minor' => 'छोटे बदलाव छ�पायें',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ध�यान दे रहे हैं...',
@@ -1537,54 +1525,58 @@ $NEWPAGE
 प�रतिप�ष�टि �वं सहायता के लि�:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'पन�ना हटायें',
-'confirm'                     => 'स�निश�चित करें',
-'excontent'                   => "पाठ था: '$1'",
-'excontentauthor'             => "पाठ था: '$1' (और सिर�फ '[[Special:Contributions/$2|$2]]' का योगदान था।)",
-'exbeforeblank'               => "हटाने के पहलेका पाठ था: '$1'",
-'exblank'                     => 'पन�ना पाठ रहित था',
-'delete-confirm'              => '"$1" को हटायें',
-'delete-legend'               => 'हटायें',
-'historywarning'              => 'चेतावनी: आप जिस पन�ने को हटाने जा रहे हैं उसका इतिहास खाली नहीं है ।',
-'confirmdeletetext'           => 'आप �क लेख उसके सभी अवतरणोंके साथ हटाना चाहते हैं ।
+# Delete
+'deletepage'             => 'पन�ना हटायें',
+'confirm'                => 'स�निश�चित करें',
+'excontent'              => "पाठ था: '$1'",
+'excontentauthor'        => "पाठ था: '$1' (और सिर�फ '[[Special:Contributions/$2|$2]]' का योगदान था।)",
+'exbeforeblank'          => "हटाने के पहलेका पाठ था: '$1'",
+'exblank'                => 'पन�ना पाठ रहित था',
+'delete-confirm'         => '"$1" को हटायें',
+'delete-legend'          => 'हटायें',
+'historywarning'         => 'चेतावनी: आप जिस पन�ने को हटाने जा रहे हैं उसका इतिहास खाली नहीं है ।',
+'confirmdeletetext'      => 'आप �क लेख उसके सभी अवतरणोंके साथ हटाना चाहते हैं ।
 आपसे अन�रोध है कि आप जो कर रहे है वह मीडियाविकिके [[{{MediaWiki:Policy-url}}|नीतिन�सार]] है इस बात की प�ष�टि किजीये । तथा क�रिया करने से पहले आपकी क�रिया के परिणाम जान लें ।',
-'actioncomplete'              => 'कार�य पूर�ण',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" को हटाया गया है ।
+'actioncomplete'         => 'कार�य पूर�ण',
+'deletedtext'            => '"<nowiki>$1</nowiki>" को हटाया गया है ।
 हाल में हटाये गये लेखोंकी सूची के लिये $2 देखें ।',
-'deletedarticle'              => '"$1" को हटाया गया है।',
-'suppressedarticle'           => '"[[$1]]" को सप�रेस किया',
-'dellogpage'                  => 'हटाने की सूची',
-'dellogpagetext'              => 'नीचे हाल में हटायें गये पन�नोंकी सूची हैं।',
-'deletionlog'                 => 'हटाने की सूची',
-'reverted'                    => 'प�राने अवतरणको पूर�ववत किया',
-'deletecomment'               => 'हटाने का कारण',
-'deleteotherreason'           => 'द�सरा/अतिरिक�त कारण:',
-'deletereasonotherlist'       => 'द�सरा कारण',
-'deletereason-dropdown'       => '*हटाने के सामान�य कारण
+'deletedarticle'         => '"$1" को हटाया गया है।',
+'suppressedarticle'      => '"[[$1]]" को सप�रेस किया',
+'dellogpage'             => 'हटाने की सूची',
+'dellogpagetext'         => 'नीचे हाल में हटायें गये पन�नोंकी सूची हैं।',
+'deletionlog'            => 'हटाने की सूची',
+'reverted'               => 'प�राने अवतरणको पूर�ववत किया',
+'deletecomment'          => 'हटाने का कारण',
+'deleteotherreason'      => 'द�सरा/अतिरिक�त कारण:',
+'deletereasonotherlist'  => 'द�सरा कारण',
+'deletereason-dropdown'  => '*हटाने के सामान�य कारण
 ** लेखक कि बिनती
 ** कॉपीराईट
 ** वॅन�डॅलिजम',
-'delete-edit-reasonlist'      => 'हटाने के कारण संपादित करें',
-'delete-toobig'               => 'इस लेख को $1 से ज�यादा बार बदला गया हैं।
+'delete-edit-reasonlist' => 'हटाने के कारण संपादित करें',
+'delete-toobig'          => 'इस लेख को $1 से ज�यादा बार बदला गया हैं।
 {{SITENAME}} के अनपेक�षित बंद होने से रोकने के लिये �से पन�नोंको हटाने की अन�मति नहीं हैं।',
-'delete-warning-toobig'       => 'इस लेख को $1 से ज�यादाबार बदला गया हैं।
+'delete-warning-toobig'  => 'इस लेख को $1 से ज�यादाबार बदला गया हैं।
 इसे हटानेसे {{SITENAME}} पर खलबली मच सकती हैं;
 कृपया ध�यानपूर�वक आगे बढें।',
-'rollback'                    => 'संपादन पीछे ले जायें',
-'rollback_short'              => 'पूर�ववत करें',
-'rollbacklink'                => 'रोलबॅक',
-'rollbackfailed'              => 'पूर�ववत नहीं कर सकें',
-'cantrollback'                => 'प�राने अवतरणको पूर�ववत नहीं कर सकते हैं;
+
+# Rollback
+'rollback'         => 'संपादन पीछे ले जायें',
+'rollback_short'   => 'पूर�ववत करें',
+'rollbacklink'     => 'रोलबॅक',
+'rollbackfailed'   => 'पूर�ववत नहीं कर सकें',
+'cantrollback'     => 'प�राने अवतरणको पूर�ववत नहीं कर सकते हैं;
 इस पन�ने का आखिरी योगदानकर�ता इस लेख का �कमात�र लेखक हैं।',
-'alreadyrolled'               => '[[$1]] का [[User:$2|$2]] ([[User talk:$2|वार�ता]]) द�वारा किया गया पिछला बदलाव रोलबेक नहीं किया जा सकता; किसी और ने पहले ही इसे रोलबेक किया अथवा बदल दिया है । पिछला बदलाव [[User:$3|$3]] ([[User talk:$3|वार�ता]]) द�वारा किया गया है ।',
-'editcomment'                 => 'संपादन टिप�पणी: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) के संपादनोंको हटाकर [[User:$1|$1]] के आखिरी अवतरण को पूर�ववत किया', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 के संपादन हटायें;
+'alreadyrolled'    => '[[$1]] का [[User:$2|$2]] ([[User talk:$2|वार�ता]]) द�वारा किया गया पिछला बदलाव रोलबेक नहीं किया जा सकता; किसी और ने पहले ही इसे रोलबेक किया अथवा बदल दिया है । पिछला बदलाव [[User:$3|$3]] ([[User talk:$3|वार�ता]]) द�वारा किया गया है ।',
+'editcomment'      => "संपादन टिप�पणी: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) के संपादनोंको हटाकर [[User:$1|$1]] के आखिरी अवतरण को पूर�ववत किया', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 के संपादन हटायें;
 $2 द�वारा संपादित आखिरी अवतरण को प�नर�स�थापित किया।',
-'sessionfailure'              => '�सा प�रतीत होता है की आपके लोगिन सत�र के साथ कोई समस�या है।
+'sessionfailure'   => '�सा प�रतीत होता है की आपके लोगिन सत�र के साथ कोई समस�या है।
 सत�र अपहरण से बचाने के लि� सावधानी के तौर पर आपका यह क�रियाकलाप रद�द कर दिया गया है।
 कृपया "back" पर वार करें और पृष�ठ को द�बारा से लोड करें, तब द�बारा कोशिश करें।',
+
+# Protect
 'protectlogpage'              => 'स�रक�षा सूची',
 'protectlogtext'              => 'नीचे उन पृष�ठों की सारणी है, जिनमें ताला लगा ह�आ है और ताला खोल दिया गया है।
 वर�त�तमान में क�रियाशील स�रक�षित पृष�ठों की सूची के लि� [[Special:ProtectedPages|स�रक�षित पृष�ठों की सूची]] देखें।',
@@ -1592,19 +1584,20 @@ $2 दà¥�वारा संपादित आखिरी अवतरण कà
 'modifiedarticleprotection'   => '"[[$1]]" के स�रक�षा-स�तर को बदला',
 'unprotectedarticle'          => '"[[$1]]" अस�रक�षित कर दिया',
 'protect-title'               => '"$1" की स�रक�षा लेवल बदलें',
+'prot_1movedto2'              => '$1 का नाम बदलकर $2 कर दिया गया है',
 'protect-legend'              => 'स�रक�षितता निर�धारित करें',
 'protectcomment'              => 'टिप�पणी:',
 'protectexpiry'               => 'समाप�ती:',
 'protect_expiry_invalid'      => 'समाप�ती समय गलत है ।',
 'protect_expiry_old'          => 'समाप�ती समय बीत च�का है ।',
 'protect-unchain'             => 'नाम बदलने की अन�मति दिजीये',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> पन�ने का स�रक�षा-स�तर आप यहां देख सकते है और उसे बदल भी सकते है ।',
-'protect-locked-blocked'      => 'आप बाधित होने की स�थिति में स�रक�षा स�थर में परिवर�तन नहीं कर सकते।
-पृष�ठ <strong>$1</strong> की वर�त�तमान स�तिथि यहा� पर है:',
-'protect-locked-dblock'       => 'सक�रिय डेटाबेस बंद होने की वजह से स�रक�षा स�तर में कोई परिवर�तन नहीं किया जा सकता।
-पृष�ठ <strong>$1</strong> की वर�त�तमान स�तिथि यहा� पर है:',
-'protect-locked-access'       => 'आपको इस पन�ने का स�रक�षा-स�तर बदलने कि अन�मति नहीं है ।
-<strong>$1</strong> का अभीका स�रक�षा-स�तर:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' पन�ने का स�रक�षा-स�तर आप यहां देख सकते है और उसे बदल भी सकते है ।",
+'protect-locked-blocked'      => "आप बाधित होने की स�थिति में स�रक�षा स�थर में परिवर�तन नहीं कर सकते।
+पृष�ठ '''$1''' की वर�त�तमान स�तिथि यहा� पर है:",
+'protect-locked-dblock'       => "सक�रिय डेटाबेस बंद होने की वजह से स�रक�षा स�तर में कोई परिवर�तन नहीं किया जा सकता।
+पृष�ठ '''$1''' की वर�त�तमान स�तिथि यहा� पर है:",
+'protect-locked-access'       => "आपको इस पन�ने का स�रक�षा-स�तर बदलने कि अन�मति नहीं है ।
+'''$1''' का अभीका स�रक�षा-स�तर:",
 'protect-cascadeon'           => 'यह पन�ना अभी स�रक�षित है क�योंकि वह {{PLURAL:$1|इस पन�नेकी|इन पन�नोंकी}} स�रक�षा-सीढीपर है । आप इस पन�ने का स�रक�षा-स�तर बदल सकते हैं, पर उससे स�रक�षा-सीढीमें बदलाव नहीं होंगे ।',
 'protect-default'             => '(ड़िफॉल�ट)',
 'protect-fallback'            => '"$1" इजाज़त जरूरी है',
@@ -1614,6 +1607,7 @@ $2 दà¥�वारा संपादित आखिरी अवतरण कà
 'protect-expiring'            => 'समाप�ती $1 (UTC)',
 'protect-cascade'             => 'इस पन�ने से ज�डे ह�� पन�ने स�रक�षित करें (स�रक�षा-सीढी)',
 'protect-cantedit'            => 'आप इस पन�नेका स�रक�षा-स�तर बदल नहीं सकते क�योंकी आपको �सा करने की अन�मति नहीं है ।',
+'protect-expiry-options'      => '२ घंटे:2 hours,१ दिन:1 day,३ दिन:3 days,१ हफ�ता:1 week,२ हफ�ते:2 weeks,१ महिना:1 month,३ महिने:3 months,६ महिने:6 months,१ साल:1 year,हमेशा के लिये:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'इजाज़त:',
 'restriction-level'           => 'स�रक�षा-स�तर:',
 'minimum-size'                => 'कमसे कम आकार',
@@ -1707,8 +1701,6 @@ $1',
 'whatlinkshere'            => 'यहा� क�या ज�ड़ता है',
 'whatlinkshere-title'      => '$1 से ज�ड़े ह�� पन�ने',
 'whatlinkshere-page'       => 'पन�ना:',
-'whatlinkshere-barrow'     => '>',
-'linklistsub'              => '(कडियों की सूची)',
 'linkshere'                => "नीचे दिये ह�� पन�ने '''[[:$1]]''' से ज�डते हैं:",
 'nolinkshere'              => "'''[[:$1]]''' को क�छभी ज�डता नहीं हैं ।",
 'nolinkshere-ns'           => "च�ने ह�� नामस�थानसे '''[[:$1]]''' को ज�डने वाले पन�ने नहीं हैं।",
@@ -1855,6 +1847,8 @@ $1 को बाध�य करने का कारण है: "$2"',
 
 इन मामलोंमे आपको स�वयं यह पन�ने जोडने पड़ सकते है ।",
 'movearticle'             => 'पृष�ठ का नाम बदलें',
+'movenologin'             => 'लॉग इन नहीं किया',
+'movenologintext'         => 'लेख स�थानांतरित करने के लिये आपने [[Special:UserLogin|लॉग इन]] किया होना जरूरी हैं।',
 'movenotallowed'          => '{{SITENAME}} पर पृष�ठ स�थानांतरणकी अन�मति आपको नहीं हैं।',
 'newtitle'                => 'नये शीर�षक की ओर:',
 'move-watch'              => 'ध�यान रखें',
@@ -1886,8 +1880,6 @@ $1 को बाध�य करने का कारण है: "$2"',
 'delete_and_move_reason'  => 'स�थानांतरण करने के लिये जगह बनाई',
 'selfmove'                => 'स�रोत और लक�ष�य शीर�षक समान हैं;
 पन�ना अपने ही जगह पर स�थानांतरित नहीं हो सकता।',
-'immobile_namespace'      => 'स�रोत और लक�ष�य शीर�षक विशेष र�प में हैं;
-इस नामस�थानमें या फिर इस नामस�थानके बाहर स�थानांतरण नहीं हो सकता।',
 'imagenocrossnamespace'   => 'जिन नामस�थानोंमें फ़ाइल रख नहीं सकते, उसमें फ़ाइल का स�थानांतरण नहीं हो सकता',
 'imagetypemismatch'       => 'फ़ाइल का नया �क�स�टेंशन उसके प�रकारसे मेल नहीं खाता',
 
@@ -1898,7 +1890,7 @@ $1 को बाध�य करने का कारण है: "$2"',
 
 पृष�ठों को निर�यात करने के लि�, नीचे विषय वस�त� संदूक में शीर�षक प�रवेश करें, �क शीर�षक प�रति पंक�ति, और च�ने कि आप वर�त�तमान अवतरण के साथ प�राने अवतरण भी चाहते हैं कि नहीं, या पिछले संपादन के बारे में जानकारी के साथ केवल वर�त�तमान अवतरण चाहते हैं।
 
-बाद वाली स�थिति के लि� आप �क सम�पर�क भी प�रयोग कर सकते हैं, उदाहरण के लि�, "[[{{MediaWiki:Mainpage}}]]" पृष�ठ के लि� [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]।',
+बाद वाली स�थिति के लि� आप �क सम�पर�क भी प�रयोग कर सकते हैं, उदाहरण के लि�, "[[{{MediaWiki:Mainpage}}]]" पृष�ठ के लि� [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]।',
 'exportcuronly'     => 'पूरा इतिहास नहीं चाहियें, सिर�फ अभी का अवतरण अंतर�भूत करें',
 'exportnohistory'   => "----
 '''सूचना:''' इस फॉर�म का इस�तेमाल कर पन�नेका पूरा इतिहास निर�यात करना परफॉर�मेन�स के चलते रोक दिया गया हैं।",
@@ -1936,6 +1928,7 @@ $1 को बाध�य करने का कारण है: "$2"',
 'import-interwiki-history'   => 'इस पन�ने के सभी इतिहास अवतरण कापी करें',
 'import-interwiki-submit'    => 'आयात',
 'import-interwiki-namespace' => 'पन�ने नामस�थानमें स�थानांतरित करें:',
+'import-comment'             => 'टिप�पणी:',
 'importtext'                 => 'कृपया Special:Export स�विधा का इस�तेमाल कर स�रोत विकिसे फ़ाईल निर�यात करें, उसे अपने डिस�क पर डालें और यहां अपलोड करें।',
 'importstart'                => 'पन�ने आयात कर रहें हैं...',
 'import-revision-count'      => '$1 {{PLURAL:$1|अवतरण|अवतरण}}',
@@ -2118,7 +2111,7 @@ $1',
 'show-big-image'       => 'सम�पूर�ण रिज़ोल�यूशन',
 'show-big-image-thumb' => '<small>इस �लक का आकार: $1 × $2 पीक�सेल�स</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'नई फ़ाईल�सकी गैलरी',
 'imagelisttext'         => "नीचे $2 के न�सार '''$1''' {{PLURAL:$1|फ़ाईल दी है।|फ़ाईलें दी ह�ईं हैं।}}",
 'newimages-summary'     => 'यह विशेष पन�ना हाल में अपलोड ह�ई फ़ाईलोंकी सूची दर�शाता हैं',
@@ -2472,24 +2465,13 @@ $5
 क�या आप इसे फिरसे बनाना चाहतें हैं, इसकी निश�चिती करें।",
 'recreate'            => 'फिरसे बनायें',
 
-# HTML dump
-'redirectingto' => '[[:$1]] की तरफ़ भेज रहें हैं...',
-
 # action=purge
-'confirm_purge'        => 'क�या आप यह पृष�ठ का कैश ख़ाली करने चाहि�?
-
-$1',
 'confirm_purge_button' => 'ओके',
-
-# AJAX search
-'searchcontaining' => 'उन लेखों को खोजे जिनमे $1 हो।',
-'searchnamed'      => "''$1'' नाम से श�रू होने वाले पन�ने खोजें",
-'articletitles'    => "लेख जो ''$1'' से श�र� होते हैं",
-'hideresults'      => 'रिज़ल�ट छ�पायें',
-'useajaxsearch'    => 'AJAX खोज का इस�तेमाल करें',
+'confirm-purge-top'    => 'क�या आप यह पृष�ठ का कैश ख़ाली करने चाहि�?',
 
 # Separators for various lists, etc.
-'autocomment-prefix' => '-',
+'semicolon-separator' => ';',
+'autocomment-prefix'  => '-',
 
 # Multipage image navigation
 'imgmultipageprev' => '� पिछला पन�ना',
@@ -2629,16 +2611,16 @@ $1',
 'filepath'         => 'फ़ाइल पाथ',
 'filepath-page'    => 'फ़ाइल:',
 'filepath-submit'  => 'पाथ',
-'filepath-summary' => 'यह विशेष पृष�ठ फ़ाईल का पूरा पाथ देता हैं।
-चित�र पूरे रिज़ोल�यूशनके साथ दिखता हैं, अन�य फ़ाईल प�रकार उनके संबंधित प�रोग�रेम डाइरेक�टरी से श�रू होते हैं।
+'filepath-summary' => 'यह विशेष पृष�ठ फ़ाईल का पूरा पाथ देता हैं।
+चित�र पूरे रिज़ोल�यूशनके साथ दिखता हैं, अन�य फ़ाईल प�रकार उनके संबंधित प�रोग�रेम डाइरेक�टरी से श�रू होते हैं।
 
-फ़ाईलनाम "{{ns:image}}:" उपपद के बिना लिखें।',
+फ़ाईलनाम "{{ns:file}}:" उपपद के बिना लिखें।',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'फ़ाईल द�विरावृत�ति खोजें',
-'fileduplicatesearch-summary'  => 'हैश वैल�यू के अन�सार फ़ाईल की द�विरावृत�ति खोजें।
+'fileduplicatesearch-summary'  => 'हैश वैल�यू के अन�सार फ़ाईल की द�विरावृत�ति खोजें।
 
-फ़ाईलनाम "{{ns:image}}:" उपपद के बिना लिखें।',
+फ़ाईलनाम "{{ns:file}}:" उपपद के बिना लिखें।',
 'fileduplicatesearch-legend'   => 'द�विरावृत�ति के लिये खोजें',
 'fileduplicatesearch-filename' => 'फ़ाईलनाम:',
 'fileduplicatesearch-submit'   => 'खोज',
diff --git a/languages/messages/MessagesHif_deva.php b/languages/messages/MessagesHif_deva.php
new file mode 100644
index 00000000..1d868a9c
--- /dev/null
+++ b/languages/messages/MessagesHif_deva.php
@@ -0,0 +1,14 @@
+<?php
+/** फ़ीजी हिन�दी (फ़ीजी हिन�दी)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Girmitya
+ */
+
+$messages = array(
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'mainpage' => 'म�ख�य पृष�ठ',
+
+);
diff --git a/languages/messages/MessagesHif_latn.php b/languages/messages/MessagesHif_latn.php
index 26da7bd9..37b2b255 100644
--- a/languages/messages/MessagesHif_latn.php
+++ b/languages/messages/MessagesHif_latn.php
@@ -46,17 +46,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Hamaar badlao ke hamaar dhyaan suchi se lukao',
 'tog-watchlisthidebots'       => 'Bot waala badlao ke hamaar dhyaan suchi se lukao',
 'tog-watchlisthideminor'      => 'Mamuli badlao ke hamaar dhyaan suchi se lukao',
+'tog-watchlisthideliu'        => 'Logged in sadasya ke badlao ke dhyan suchi se lukao',
+'tog-watchlisthideanons'      => 'Bina naam ke sadasya ke badlao ke dhyan suchi se lukao',
 'tog-nolangconversion'        => 'Variants conversion ke disable karo',
 'tog-ccmeonemails'            => 'Jon e-mail ham duusra sadasya ke lage bhejtaa hai uske copy hamaar lage bhi bhejo',
 'tog-diffonly'                => 'Diff ke niche panna ke content ke nai dekhao',
 'tog-showhiddencats'          => 'Lukawal waala vibhag ke dekhao',
+'tog-norollbackdiff'          => 'Rollback kare ke baad diff ke mitae do',
 
 'underline-always'  => 'Sab time',
 'underline-never'   => 'Kabhi nai',
 'underline-default' => 'Browser ke default',
 
-'skinpreview' => '(Jhalak)',
-
 # Dates
 'sunday'        => 'Etwaar',
 'monday'        => 'Sombaar',
@@ -149,7 +150,7 @@ $messages = array(
 'mytalk'         => 'Hamaar bichar',
 'anontalk'       => 'Ii IP khatir bichar',
 'navigation'     => 'Navigation',
-'and'            => 'aur',
+'and'            => '&#32;aur',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -186,14 +187,14 @@ $messages = array(
 'talkpagelinktext'  => 'Baat',
 'specialpage'       => 'Khaas Panna',
 'personaltools'     => 'Aapan aujaar',
-'postcomment'       => 'Aapan bichar deo',
+'postcomment'       => 'Nawaa section',
 'articlepage'       => 'Content waala panna ke dekho',
 'talk'              => 'Salah',
 'views'             => 'Bichaar',
 'toolbox'           => 'Aujaar ke dabba',
 'userpage'          => 'Sadasya ke panna dekho',
 'projectpage'       => 'Project waala panna dekho',
-'imagepage'         => 'Media waala panna dekho',
+'imagepage'         => 'File panna ke dekho',
 'mediawikipage'     => 'Sandes waala panna dekho',
 'templatepage'      => 'Template waala panna dekho',
 'viewhelppage'      => 'Madat waala panna dekho',
@@ -212,8 +213,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} ke baare me',
 'aboutpage'            => 'Project:Ke baare me',
-'bugreports'           => 'Bug reports',
-'bugreportspage'       => 'Project:Bug reports',
 'copyright'            => 'Ii panna me likha gae chij ke aap $1 ke niche kaam me lae sakta hai.',
 'copyrightpagename'    => '{{SITENAME}} copyright',
 'copyrightpage'        => '{{ns:project}}:Chhaape ke adhikaar',
@@ -236,9 +235,7 @@ $messages = array(
 
 'badaccess'        => 'Anumati nai hai',
 'badaccess-group0' => 'Aap jon chij kare mangta uske ijajat aap ke nai hai.',
-'badaccess-group1' => 'Aap jon chij kare mangtaa hai, uske khaali group $1 ke sadasya kare sake hai.',
-'badaccess-group2' => 'Aap jon chij kare mangtaa hai uske khali ii group $1 me se ek ke sadasya kare sake hai.',
-'badaccess-groups' => 'Aap jon chij kare mangtaa hai uske khali ii group $1 ke ek sadasya kare sake hai.',
+'badaccess-groups' => 'Aap jon chij kare mangtaa hai uske khali ii group $1 {{PLURAL:$2|the group|one of the groups}} ke ek sadasya kare sake hai.',
 
 'versionrequired'     => 'MediaWiki ke $1 version ke jaruri hai',
 'versionrequiredtext' => 'Ii panna use kare ke khatir MediaWiki ke Version $1 ke jaruri hai. [[Special:Version|version page]] ke dekho.',
@@ -252,6 +249,8 @@ $messages = array(
 'editsection'             => 'badlo',
 'editold'                 => 'badlao',
 'viewsourceold'           => 'source dekho',
+'editlink'                => 'badlo',
+'viewsourcelink'          => 'source dekho',
 'editsectionhint'         => 'Vibhaag badlo: $1',
 'toc'                     => 'vishay suchi',
 'showtoc'                 => 'dekhao',
@@ -266,13 +265,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Feed',
 'page-rss-feed'           => '"$1" RSS Feed',
 'page-atom-feed'          => '"$1" Atom Feed',
-'red-link-title'          => '$1 (abhi likha nai gais hai)',
+'red-link-title'          => '$1 (panna abhi likha nai gais hai)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Panna',
 'nstab-user'      => 'Sadasya ke panna',
 'nstab-media'     => 'Media waala panna',
-'nstab-special'   => 'Special',
+'nstab-special'   => 'Khaas panna',
 'nstab-project'   => 'Project panna',
 'nstab-image'     => 'File',
 'nstab-mediawiki' => 'Sandes',
@@ -282,7 +281,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Koi aisan kaam nai hai',
-'nosuchactiontext'  => 'Jon kaam ke URL kare ke batais hai uske ii wiki nai pahachane hai',
+'nosuchactiontext'  => 'Jon kaam ke URL kare ke batais hai uske ii wiki nai pahachane hai
+Saait aap URL ke thiik se type nai karaa hai, nai to galat jorr ke follow karaa hai.
+Ii saait ii kaaran se bhi hoe ki  jon software {{SITENAME}} use kare hai, me bug hai',
 'nosuchspecialpage' => 'Aisan koi khaas panna nai hai',
 'nospecialpagetext' => "<big>'''Aap ek galat ghaas panna ke maanga hai.'''</big>
 
@@ -337,7 +338,6 @@ Iske, URL ke likh ke, koi administrator ke report karo.',
 Sait aur koi iske mitae de hoi.',
 'badtitle'             => 'Kharaab title',
 'badtitletext'         => 'Jon panna aap mangta hai uske page title invalid, galat, nai to an incorrectly linked inter-language or inter-wiki title. Isme sait ek yah jaada character hoi jon ki title me nai kaam me lawa jae sake hai.',
-'perfdisabled'         => 'Ii feature ke thora din khatir band kar dewa gais hai ii kaaran se ki ii database ke dhire kar dis  hai jiske kaaran koi bhi database nai use kare sake hai.',
 'perfcached'           => 'Niche likha data ke cache karaa gais hai aur sait purana hoi.',
 'perfcachedts'         => 'Niche likha data ke cache kar dewa gais rahaa, aur pichhle time $1 ke badlaa gais rahaa.',
 'querypage-no-updates' => 'Ii panna me badlao abhi band hai. Data ke abhi nawaa nai karaa jaai.',
@@ -353,7 +353,7 @@ Kuch deri be baad fir se kosis karna.',
 'protectedpagetext'    => 'Ii panna ke badlao ke roke ke khatir band kar dewa gais hai.',
 'viewsourcetext'       => 'Aap ii panna ke source ke dekhe aur nakal utare kare sakta hai:',
 'protectedinterface'   => 'Ii panna software ke interface text dewe hai, aur iske barbaadi se roke ke khatir band kar dewa gais hai.',
-'editinginterface'     => "'''Chetawani:''' Aap ek panna ke badaltaa hai jon ki software ke interface text dewe hai. Ii panna me badlao ke asar duusra sadasya ke interface ke bhi hoi. Translation khatir [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], the MediaWiki localisation project, ke kaam me lao.",
+'editinginterface'     => "'''Chetawani:''' Aap ek panna ke badaltaa hai jon ki software ke interface text dewe hai. Ii panna me badlao ke asar duusra sadasya ke interface ke bhi hoi. Translation khatir [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], the MediaWiki localisation project, ke kaam me lao.",
 'sqlhidden'            => '(SQL query lukawal hai)',
 'cascadeprotected'     => 'Ii panna ke badlao se bachaya gais hai, kahe ki iske {{PLURAL:$1|panna, jon ki|panna, jon ki}} surakchhit with the "cascading" option turned on:
 $2',
@@ -364,17 +364,17 @@ $2',
 Iske kaaran hai ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Kharaab configuration: unknown virus scanner: <i>$1</i>',
+'virus-badscanner'     => "Kharaab configuration: unknown virus scanner: ''$1''",
 'virus-scanfailed'     => 'scan fail hoe gais (code $1)',
 'virus-unknownscanner' => 'jaana waala antivirus nai hai:',
 
 # Login and logout pages
 'logouttitle'                => 'Sadasya logout',
-'logouttext'                 => '<strong>Aap abhi logged out hai.</strong>
+'logouttext'                 => "'''Aap abhi logged out hai.'''
 
 Aap bina naam ke {{SITENAME}} ke kaam me lae sakta hai, nai to aap wahi sadasya ke naam se nai to duusra sadasya ke naam se [[Special:UserLogin|log in kare sakta hai]].
 
-Yaad rakhna ki kuch panna wahi rakam se dekhai jaise ki aap log in bhaya hai, jab tak ki browser ke cache safaa nai hoe jaae.',
+Yaad rakhna ki kuch panna wahi rakam se dekhai jaise ki aap log in bhaya hai, jab tak ki browser ke cache safaa nai hoe jaae.",
 'welcomecreation'            => '== Swagat, $1! ==
 Aap ke account banae dewa gais hai.
 Aapan [[Special:Preferences|{{SITENAME}} pasand]]  ke badle nai bhulna.',
@@ -385,7 +385,6 @@ Aapan [[Special:Preferences|{{SITENAME}} pasand]]  ke badle nai bhulna.',
 'remembermypassword'         => 'Ii computer pe hamaar login yaad rakho',
 'yourdomainname'             => 'Aap ke domain:',
 'externaldberror'            => 'Koi bahaari database authentication error hai, nai to aap ke bahaari account badle ke adhikar nai hai.',
-'loginproblem'               => '<b>Aap ke login me karrbarr hai.</b><br />Fir se kosis karo!',
 'login'                      => 'Log in karo',
 'nav-login-createaccount'    => 'Log in karo/ nawaa account banao',
 'loginprompt'                => 'Login kare ke khatir  {{SITENAME}} cookies ke laabu kare ke chaahi.',
@@ -412,7 +411,7 @@ Duusra username choose karo.',
 'yournick'                   => 'Signature:',
 'badsig'                     => 'Invalid raw signature; HTML tags ke check karo.',
 'badsiglength'               => 'Signature bahut lambaa hai.
-It $1 {{PLURAL:$1|character|characters}} se kamti rahe ke chaahi.',
+Iske $1 {{PLURAL:$1|character|characters}} se kamti rahe ke chaahi.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Asli naam ke jaruri nai hai lekin agar jo aap aapan naam diya hai to iske aap ke kaam ke pahachane khatir kaam me lawa jai.',
 'loginerror'                 => 'Login me galti hai',
@@ -430,6 +429,7 @@ Cookies ke enable kar ke fir se kosis karo.',
 'loginsuccesstitle'          => 'Login safal bhais',
 'loginsuccess'               => "'''Aap \"\$1\" ke naam pe {{SITENAME}} me logged in hai.'''",
 'nosuchuser'                 => '"$1" naam ke koi sadasya nai hai. 
+Sadasya ke naam case sensitive hai.
 Aapan spelling check karo nai to [[Special:UserLogin/signup|nawaa account banao]].',
 'nosuchusershort'            => '"<nowiki>$1</nowiki>" naam ke koi sadasya nai hai. 
 Aapan spelling check karo.',
@@ -452,9 +452,9 @@ Agar jo aur koi ii request karis hai nai to aap aapan password yaad kar liya hai
 'throttled-mailpassword'     => 'Ek password reminder ke pichhle {{PLURAL:$1|hour|$1 hours}} me bhej dewa gais hai.
 Abuse ke roke ke khatir, khali ek password reminer har {{PLURAL:$1|hour|$1 hours}} me bheja jaai.',
 'mailerror'                  => 'Mail bheje me galti hoe gais hai: $1',
-'acct_creation_throttle_hit' => 'Maaf karna, aap $1 accounts banae liya hai.
-Aap aur account nai bane sakta hai.',
-'emailauthenticated'         => 'Aap ke e-mail address ke $1 pe authenticate karaa gais rahaa.',
+'acct_creation_throttle_hit' => 'Ii wiki me visitors log aap ke IP address ke use kar ke {{PLURAL:$1|1 account|$1 accounts}}, pichhle kuch din me, banae liin hai, jis se jaada ii time nai banawa jaae sake hai.
+Ii kaaran se visitors log jon ki ii IP address use kare hai, ke aur account banae ke ijajat nai hai.',
+'emailauthenticated'         => 'Aap ke e-mail address ke $2 ke roj aur $3 baje authenticate karaa gais rahaa.',
 'emailnotauthenticated'      => 'Aap ke e-mail address ke abi tak authenticate nai gais hai.
 Ii sab feature khatir koi e-mail nai bheja jaai.',
 'noemailprefs'               => 'Ii sab feature ke kaam kare khatir e-mail specify karo.',
@@ -467,20 +467,28 @@ Meharbaani kar ke achchha address ke enter karo nai to uu field ke khali kar do.
 'createaccount-text'         => 'Koi aap ke e-mail katir {{SITENAME}} ($4) named "$2" me account banais hai jiske password hai "$3".
 Aap ke chaahi ki aap login kar ke password ke badal do.
 Agar ii account galti se banaa hai tab ii sandes ke ignore kar do.',
+'login-throttled'            => 'Aap bahut jaada dafe ii account ke password ke enter kare ke kosis karaa hai. Thora deri baad fir se kosis karna.',
 'loginlanguagelabel'         => 'Bhasa: $1',
 
 # Password reset dialog
-'resetpass'               => 'Account password ke reset karo',
-'resetpass_announce'      => 'Aap ek temporary e-mailed code se login bhaya hai
+'resetpass'                 => 'Password ke badlo',
+'resetpass_announce'        => 'Aap ek temporary e-mailed code se login bhaya hai
 Login khatam kare khatir, aap ke nawaa password set kare ke parri hian:',
-'resetpass_text'          => '<!-- Hian pe likho -->',
-'resetpass_header'        => 'Account assword ke badlo',
-'resetpass_submit'        => 'Password ke set kar ke login karo',
-'resetpass_success'       => 'Aap ke password ke safalta se badal dewa gais hai! Aap ke ab login karaa jaae hai...',
-'resetpass_bad_temporary' => 'Temporary password achchha nai hai.
+'resetpass_text'            => '<!-- Hian pe likho -->',
+'resetpass_header'          => 'Account assword ke badlo',
+'oldpassword'               => 'Purana password:',
+'newpassword'               => 'Nawaa password:',
+'retypenew'                 => 'Password fir se type karo:',
+'resetpass_submit'          => 'Password ke set kar ke login karo',
+'resetpass_success'         => 'Aap ke password ke safalta se badal dewa gais hai! Aap ke ab login karaa jaae hai...',
+'resetpass_bad_temporary'   => 'Temporary password achchha nai hai.
 Aap sait pahile password ke badal diya hoi nai to nawaa temporary password ke maang karaa hoga.',
-'resetpass_forbidden'     => 'Password nai badlaa jaae sake hai',
-'resetpass_missing'       => 'Form data nai hai.',
+'resetpass_forbidden'       => 'Password nai badlaa jaae sake hai',
+'resetpass-no-info'         => 'Ii panna ke sidha access kare ke khatir aap ke logged in rahe ke parri.',
+'resetpass-submit-loggedin' => 'Password ke badlo',
+'resetpass-wrong-oldpass'   => 'Temporary nai to abhi ke password valid nai hai. 
+Sait aap password ke safalta se badal sia hoga nai to nawaa temporary password ke maang karaa hoga.',
+'resetpass-temp-password'   => 'Kachcha password:',
 
 # Edit page toolbar
 'bold_sample'     => 'Bold text',
@@ -503,8 +511,8 @@ Aap sait pahile password ke badal diya hoi nai to nawaa temporary password ke ma
 'hr_tip'          => 'Samthar line (bahut jaada nai kaam me laana)',
 
 # Edit pages
-'summary'                          => 'Sanchhipt',
-'subject'                          => 'Subject/headline',
+'summary'                          => 'Sanchhipt:',
+'subject'                          => 'Subject/headline:',
 'minoredit'                        => 'Ii chhota badlao hai',
 'watchthis'                        => 'Ii panna ke dhyaan rakho',
 'savearticle'                      => 'Save panna',
@@ -519,8 +527,8 @@ Agar aap Save ke fir se click karaa tab, aap ke badlao bina summary ke save kar
 'missingcommenttext'               => 'Meharbani kar ke niche aapan vichar deo.',
 'missingcommentheader'             => "'''Suchna:''' Aap ii vichar ke vishay nai likha hai.
 Agar aap Save pe click karaa tab bina vishay ke iske save kar lewa jaai.",
-'summary-preview'                  => 'Sanchhep jhalak',
-'subject-preview'                  => 'Suchi ke jhalak',
+'summary-preview'                  => 'Sanchhep jhalak:',
+'subject-preview'                  => 'Suchi ke jhalak:',
 'blockedtitle'                     => 'Sadasya ke rok dewa gais hai',
 'blockedtext'                      => "<big>'''Aapke user name nai to IP address ke rok dewa gae hai.'''</big>
 
@@ -576,35 +584,37 @@ Ii kaaran se ham log ke IP address kaam me lae ke ii sadasya ke jaana jae hai.
 Ii rakam ke IP address ke dher sadasya kaam me lae sake hai.
 Agar aap ek anonymous user hai aur ii sochta hai ki bekar baat aap ke baare me karaa gais hai, tab
 [[Special:UserLogin/signup|create an account]] or [[Special:UserLogin|log in]] aage ke garrbarri roke khatir aur duusra anonymous users se mistake nai kare ke khatir .''",
-'noarticletext'                    => 'Ii time pe ii panna me kuch likhaa nai hai, aap saktaa hai [[Special:Search/{{PAGENAME}}|ii panna ke title khoje]] duusra panna me nai to [{{fullurl:{{FULLPAGENAME}}|action=edit}} ii panna ke badlo].',
+'noarticletext'                    => 'Ii time pe ii panna me kuch likhaa nai hai.
+Aap saktaa hai [[Special:Search/{{PAGENAME}}|ii panna ke title khoje]] duusra panna me,
+<span> nai to [{{fullurl:{{FULLPAGENAME}}|action=edit}} ii panna ke badlo]</span>.',
 'userpage-userdoesnotexist'        => 'User account "$1" abi registered nai hai.
 Check karo ki Ii panna ke aap banae/badle mangta hai.',
 'clearyourcache'                   => "'''Note - Save kare ke baad, aap ke sait browser ke cache ke bypass kare ke parri badlao ke dekhe khatir.''' '''Mozilla / Firefox / Safari:''' hold ''Shift'' while clicking ''Reload,'' or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Macintosh); '''Konqueror: '''click ''Reload'' or press ''F5;'' '''Opera:''' clear the cache in ''Tools → Preferences;'' '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh,'' or press ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Save kare se pahile 'Show preview' button ke use kar ke aapan nawaa  CSS/JS ke test karo.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Save kare se pahile 'Show preview' button ke use kar ke aapan nawaa  CSS/JS ke test karo.",
 'usercsspreview'                   => "'''Yaad rakhna ki aap khali aapan CSS ke jhalak dekhta hai. 
 Iske abhi save nai karaa gais hai!'''",
 'userjspreview'                    => "'''Yaad rakhna ki aap khali aapan JavaScript ke testing/previewing  karta hai, iske abhi save nai karaa gais hai!'''",
 'userinvalidcssjstitle'            => "'''Warning:''' Koi skin \"\$1\" nai hai.
 Yaad rakhna ki custom .css aur .js panna owercase title use kare hai, jaise ki {{ns:user}}:Foo/monobook.css aur{{ns:user}}:Foo/Monobook.css nai.",
 'updated'                          => '(Update kar dewa gais hai)',
-'note'                             => '<strong>Note:</strong>',
-'previewnote'                      => '<strong>Ii khali ek jhalak dekhae hai; badlao abhi save nai bhae hai!</strong>',
+'note'                             => "'''Note:'''",
+'previewnote'                      => "'''Ii khali ek jhalak dekhae hai; badlao abhi save nai bhae hai!'''",
 'previewconflict'                  => 'Ii preview uu text dekhae hai jon ki uppar ke text editing area me dekhai agar aap iske save karaa.',
-'session_fail_preview'             => '<strong> Maaf karna! Ham log aap ke badlao ke process nai kare paya hai due to a loss of session data.
+'session_fail_preview'             => "''' Maaf karna! Ham log aap ke badlao ke process nai kare paya hai due to a loss of session data.
 Fir se kosis karna.
-Agar ii fir bhi nai chale tab kosis karna [[Special:UserLogout|logging out]]aur fir logging back in.</strong>',
-'session_fail_preview_html'        => "<strong>Maaf karna! Ham log aap ke badlao ke process ke process nai kare sakaa kahe ki session data abhi nai dekhae hai.</strong>
+Agar ii fir bhi nai chale tab kosis karna [[Special:UserLogout|logging out]]aur fir logging back in.'''",
+'session_fail_preview_html'        => "'''Maaf karna! Ham log aap ke badlao ke process ke process nai kare sakaa kahe ki session data abhi nai dekhae hai.'''
 
 ''Iske kaaran hai ki {{SITENAME}} me raw HTML enabled hai, preview ke lukae dewa gais hai as a precaution against JavaScript attacks.''
 
-<strong> Agar ii kanuni badlao hai, tab fir se kosis karna.
-Agar ii fir bhi kaam nai kare, tab [[Special:UserLogout|logging out]] aur logging back in ke kosis karna.</strong>",
-'token_suffix_mismatch'            => '<strong> Aap ke badlao ke reject kar dewa gais hai kahe ki aap ke client punctuation charcters ke token edit me mangle kar diis hai.
+''' Agar ii kanuni badlao hai, tab fir se kosis karna.
+Agar ii fir bhi kaam nai kare, tab [[Special:UserLogout|logging out]] aur logging back in ke kosis karna.'''",
+'token_suffix_mismatch'            => "''' Aap ke badlao ke reject kar dewa gais hai kahe ki aap ke client punctuation charcters ke token edit me mangle kar diis hai.
 Ii badlao ke reject kar dewa gais hai to prevent corruption of the page text.
-Ii kabhi kabhi hoe hai jab aap ek buggy web-based anonymous proxy service ke use karta hai.</strong>',
+Ii kabhi kabhi hoe hai jab aap ek buggy web-based anonymous proxy service ke use karta hai.'''",
 'editing'                          => '$1 badlawa jae hai',
 'editingsection'                   => 'Sampadan $1 (bhaag)',
-'editingcomment'                   => '$1 badla jae hai (comment)',
+'editingcomment'                   => '$1 ke badla jae hai (nawaa section)',
 'editconflict'                     => 'Badle me conflict: $1',
 'explainconflict'                  => "Aap ke ii panna ke badle ke suruu kare ke baad, aur koi ii panna ke badal diis hai.
 Uppar ke text area panna ke text jaise abhi hai ke dekhawa jae hai.
@@ -613,27 +623,30 @@ Aap ke aapan badlao ke existing text me merge kare ke parri.
 '''Khali''' text in the upper text area  ke save karaa jai jab aap \"Save page\" ke press karega.",
 'yourtext'                         => 'Aap ke text',
 'storedversion'                    => 'Bachawa gais version',
-'nonunicodebrowser'                => '<strong>WARNING: Aap ke browser unicode compliant nai hai.
-A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>',
-'editingold'                       => '<strong>WARNING: Aap ii panna ke purana version ke badalata hai
-Agar aap iske save kar lia tab last badlao se abi tak ke changes will be lost.</strong>',
+'nonunicodebrowser'                => "'''WARNING: Aap ke browser unicode compliant nai hai.
+A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.'''",
+'editingold'                       => "'''WARNING: Aap ii panna ke purana version ke badalata hai
+Agar aap iske save kar lia tab last badlao se abi tak ke changes will be lost.'''",
 'yourdiff'                         => 'Antar',
-'copyrightwarning'                 => 'Dhyann me rakho ki {{SITENAME}} ke sab yog daan $2 ($1 ke dekho aur kaankari khatir) ke niche dewa gae hai. Agar aap nai mangtaa ki aap ke likha gae koi chij ke duusra logan badle tab hain par nahii likho.<br />
+'copyrightwarning'                 => "Dhyann me rakho ki {{SITENAME}} ke sab yog daan $2 ($1 ke dekho aur kaankari khatir) ke niche dewa gae hai. Agar aap nai mangtaa ki aap ke likha gae koi chij ke duusra logan badle tab hain par nahii likho.<br />
 Aap ii bhi waada kartaa hai ki iske aap likha hai aur koi duusra jagah se copy nahi karaa hai.
-<strong>COPYRIGHT CHIJ KE BINA ANUMATI KE HIAN PAR NAHI SUBMIT KARNA!</strong>',
-'copyrightwarning2'                => 'Yaad rakhna ki {{SITENAME}} pe sab yogdaan ke duusra sadasya LOG badle, nai to delete, kare sake hai.
+'''COPYRIGHT CHIJ KE BINA ANUMATI KE HIAN PAR NAHI SUBMIT KARNA!'''",
+'copyrightwarning2'                => "Yaad rakhna ki {{SITENAME}} pe sab yogdaan ke duusra sadasya LOG badle, nai to delete, kare sake hai.
 Agar aap nai mangta ki koi aur aap ke yogdaan ke badle, tab aap hian par nai likho.<br />
 Aap ii bhi kasam khata hai ki aap iske apne se likha hai aur kahin se copy nai karaa hai (Aur jaankari khatir $1 ke dekho). 
-<strong> COPYRIGHT WORK KE BINA AUNUMATI KE SUBMIT NAI KARNA!</strong>',
-'longpagewarning'                  => '<strong>Sawadhan: Ii panna $1 kilobytes lamba hai; kuch browsers sait etna barra panna ke khole nai pai.
-Meherbani kar ke ii page ke chotachota tukrra me kar do.</strong>',
-'longpageerror'                    => '<strong>ERROR: Jon text aap submit karaa hai uu $1 kilobytes lamba hai, ii maximum $2 kilobytes se lamba hai.
-Iske save nai karaa jae sake hai.</strong>',
-'readonlywarning'                  => '<strong>CHETAUNI:Database ke marammat khatir band kar dewa gais hai, iske matlab hai ki aap aapan badlao ke bachae nai sakta hai. Aap cut-n-paste  kar ke likha gae text ke ek text file me save kare sakta hai.</strong>',
-'protectedpagewarning'             => '<strong>WARNING: Ii panna ke band kar dewa gais hai jisse ke khali uu sadasya jiske sysop privileges hai iske badle sake hai.</strong>',
+''' COPYRIGHT WORK KE BINA AUNUMATI KE SUBMIT NAI KARNA!'''",
+'longpagewarning'                  => "'''Sawadhan: Ii panna $1 kilobytes lamba hai; kuch browsers sait etna barra panna ke khole nai pai.
+Meherbani kar ke ii page ke chotachota tukrra me kar do.'''",
+'longpageerror'                    => "'''ERROR: Jon text aap submit karaa hai uu $1 kilobytes lamba hai, ii maximum $2 kilobytes se lamba hai.
+Iske save nai karaa jae sake hai.'''",
+'readonlywarning'                  => "'''WARNING: Database ke maintenance khatir band kar dewa gais hai, tab abhi aap aapan badlao ke save nai kare paega.
+Aap sait aapan badlao ke ek text file me cut-n-paste kar ke baad me use kare khatir save kae le sakta hai.'''
+
+Administrator jon ki iske lock karis hai ii kaaran diis hai: $1",
+'protectedpagewarning'             => "'''WARNING: Ii panna ke band kar dewa gais hai jisse ke khali uu sadasya jiske sysop privileges hai iske badle sake hai.'''",
 'semiprotectedpagewarning'         => "'''Suchna:''' Ii panna ke band kar dewa gais hai jisse ki khali registered sadasya iske badle sake hai.",
 'cascadeprotectedwarning'          => "'''Chetawani:''' Ii panna ke band kar dewa gais jiske kaaran khali uu sadasya jiske lage sysop privileges hai iske badle sake hai, kahe ki iske niche likha gais cascade-protected {{PLURAL:$1|panna|panna}} me rakkha gais hai:",
-'titleprotectedwarning'            => '<strong>CHETAUNI: Ii panna ke lock kar dewa gais hai jisse ki khali kuch sadasya iske badle sake hai.</strong>',
+'titleprotectedwarning'            => "'''CHETAUNI: Ii panna ke lock kar dewa gais hai jisse ki khali kuch sadasya iske badle sake hai.'''",
 'templatesused'                    => 'Ii panna me kaam me lawa gae templates:',
 'templatesusedpreview'             => 'Ii jhalak me jon template kaam me lawa gais hai',
 'templatesusedsection'             => 'Ii section me kaam me lawa gais templates:',
@@ -652,11 +665,21 @@ Aap pichhe jae ke ek panna jon hai ke sampadan kare sakta hai, nai to  [[Special
 
 Aap soco ki ii pann ake sampadan aap ke karte rahe ke chaahi ki nai.
 Aap ke aaram khatir hatae waala suchi hian pe dewa jae hai:",
+'deleted-notice'                   => 'Ii panna ke mitae dewa gais hai.
+Ii panna ke mitae waala log aap ke dekhe khatir niche dewa gais hai.',
+'deletelog-fulllog'                => 'Puura log ke dekho.',
+'edit-hook-aborted'                => 'Badalo ke hook rok diis hai.
+Ii koi kaaran nai diis hai.',
+'edit-gone-missing'                => 'Panna ke badle nai sakaa.
+Janae hai ki iske koi mitae dii hai.',
+'edit-conflict'                    => 'Badlao me conflict hai.',
+'edit-no-change'                   => 'Aap ke badle ke kosis ke ignore kar dewa gais hai, kahe ki text ke badla nai gais hai.',
+'edit-already-exists'              => 'Nawaa panna nai banae sakaa hai.
+Ii naam ke panna abhi hai.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Chetauni: Ii panna me me dher mahanga parser function calls hai.
-
-Is ke $2 ke kamti hoe ke chaahi, abhi $1 hai.',
+'expensive-parserfunction-warning'        => 'Warning: Ii panna me bahut jaada expensive parser function calls hai.
+Iske $2 {{PLURAL:$2|call|calls}} se kamti hoe ke chaahi, {{PLURAL:$1|abhi hai $1 call|abhi hai $1 calls}}.',
 'expensive-parserfunction-category'       => 'Panna jisme bahut jaada expensive parser function calls hai',
 'post-expand-template-inclusion-warning'  => 'Warning: Template include size bahut barraa hai.
 Some templates will not be included.',
@@ -664,6 +687,8 @@ Some templates will not be included.',
 'post-expand-template-argument-warning'   => 'Warning: Ii panna me kamti se kamti ek template argument hai jiske expansion size bahut barraa hai.
 Ii sab arguments ke omit kar dewa gais hai.',
 'post-expand-template-argument-category'  => 'Panna jisme omitted template arguments hai',
+'parser-template-loop-warning'            => 'Template loop ke pawa gais hai: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Template recursion depth limit exceeded ($1)',
 
 # "Undo" feature
 'undo-success' => 'Ii badlao ke pahile jaise karaa jaae sake hai.
@@ -679,31 +704,30 @@ Niche ke comparison ke check kar ke dekho ki aap yahi kare mangta rahaa, aur fir
 Iske kaaran, jon ki $3 diis hai, ''$2'' hai",
 
 # History pages
-'viewpagelogs'        => 'Ii panna ke suchi dekho',
-'nohistory'           => 'Ii panna ke khatir koi badlao ke itihaas nai hai.',
-'revnotfound'         => 'Badlao nai mila',
-'revnotfoundtext'     => 'Jon panna ke aap mangta rahaa, uske purana badlao nai mila.
-Aap jon URL ke use kar ke ii panna ke acess karaa hai, uske check karo.',
-'currentrev'          => 'Abhi ke sansodhan',
-'revisionasof'        => '$1 ke badlao',
-'revision-info'       => '$2 ke badlao $1 tak',
-'previousrevision'    => '� Purana badlao',
-'nextrevision'        => 'Nawaa badlao→',
-'currentrevisionlink' => 'Abhi ke badlao',
-'cur'                 => 'abhi waala',
-'next'                => 'duusra',
-'last'                => 'aakhri',
-'page_first'          => 'pahila',
-'page_last'           => 'aakhri',
-'histlegend'          => 'Farak pasand: Antar dekhe khatir radio box me chinh lagao aur enter ke nai to niche ke button dabao.<br />
+'viewpagelogs'           => 'Ii panna ke suchi dekho',
+'nohistory'              => 'Ii panna ke khatir koi badlao ke itihaas nai hai.',
+'currentrev'             => 'Abhi ke sansodhan',
+'currentrev-asof'        => 'Abhi ke badlao ii tarik tak $1',
+'revisionasof'           => '$1 ke badlao',
+'revision-info'          => '$2 ke badlao $1 tak', # Additionally available: $3: revision id
+'previousrevision'       => '� Purana badlao',
+'nextrevision'           => 'Nawaa badlao→',
+'currentrevisionlink'    => 'Abhi ke badlao',
+'cur'                    => 'abhi waala',
+'next'                   => 'duusra',
+'last'                   => 'aakhri',
+'page_first'             => 'pahila',
+'page_last'              => 'aakhri',
+'histlegend'             => 'Farak pasand: Antar dekhe khatir radio box me chinh lagao aur enter ke nai to niche ke button dabao.<br />
 
 Legend: (abhi) = abhi ke version se farka,
 (pahile waala) = pahile waala version se farka, M = chhota sampadan.',
-'deletedrev'          => '[matae dewa gais hai]',
-'histfirst'           => 'Sab se puraana',
-'histlast'            => 'Sab se nawaa',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(khali)',
+'history-fieldset-title' => 'Itihaas me khojo',
+'deletedrev'             => '[matae dewa gais hai]',
+'histfirst'              => 'Sab se puraana',
+'histlast'               => 'Sab se nawaa',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(khali)',
 
 # Revision feed
 'history-feed-title'          => 'Badlao ke itihass',
@@ -787,6 +811,7 @@ Note that using the navigation links will reset this column.',
 'mergehistory-invalid-destination' => 'Destination panna must be a valid title.',
 'mergehistory-autocomment'         => '[[:$1]] [[:$2]] me jorr dewa gais hai',
 'mergehistory-comment'             => '[[:$1]] [[:$2]] me jorr dewa gais hai: $3',
+'mergehistory-same-destination'    => 'Suruu aur khatam kare waala panna ek nai hoe sake hai.',
 
 # Merge log
 'mergelog'           => 'Log ke jorro',
@@ -799,124 +824,206 @@ Note that using the navigation links will reset this column.',
 'difference'              => '(Badlao me farak)',
 'lineno'                  => 'Rekha $1:',
 'compareselectedversions' => 'Chuna gae version ke compare karo',
+'visualcomparison'        => 'Aankhi se antar dekho',
+'wikicodecomparison'      => 'Wikitext ke antar dekho',
 'editundo'                => 'badlao ke pahile jaise kar do',
 'diff-multi'              => '({{PLURAL:$1|Ek biich waala badlao|$1 biich waala badlao}} nai dekhawa jae hai.)',
+'diff-movedto'            => 'badal ke $1 dewa gais hai',
+'diff-styleadded'         => '$1 style ke jorr dewa gais hai',
+'diff-added'              => '$1 jorr dewa gais hai',
+'diff-changedto'          => 'Badal ke $1 kar dewa gais hai',
+'diff-movedoutof'         => '$1 se nikal diya',
+'diff-styleremoved'       => '$1 style ke hatae dewa gais hai',
+'diff-removed'            => '$1 ke hatae dewa gais hai',
+'diff-changedfrom'        => '$1 se badla gais hai',
+'diff-src'                => 'suruu',
+'diff-withdestination'    => '$1 manjil ke saathe',
+'diff-with'               => '&#32;$1 $2 ke saathe',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;aur $1 $2',
+'diff-width'              => 'chaurrai',
+'diff-height'             => 'lambai',
+'diff-p'                  => "ek '''paragraph'''",
+'diff-blockquote'         => "ek '''quote'''",
+'diff-h1'                 => "ek '''heading (level 1)'''",
+'diff-h2'                 => "ek '''heading (level 2)'''",
+'diff-h3'                 => "ek '''heading (level 3)'''",
+'diff-h4'                 => "ek '''heading (level 4)'''",
+'diff-h5'                 => "ek '''heading (level 5)'''",
+'diff-pre'                => "ek '''preformatted block'''",
+'diff-div'                => "ek '''division'''",
+'diff-ul'                 => "ek '''unordered list'''",
+'diff-ol'                 => "ek '''ordered list'''",
+'diff-li'                 => "ek '''list item'''",
+'diff-table'              => "ek '''table'''",
+'diff-tbody'              => "ek '''table ke content'''",
+'diff-tr'                 => "ek '''row'''",
+'diff-td'                 => "ek '''cell'''",
+'diff-th'                 => "ek '''header'''",
+'diff-br'                 => "ek '''break'''",
+'diff-hr'                 => "ek '''horizontal rule'''",
+'diff-code'               => "ek '''computer code block'''",
+'diff-dl'                 => "ek '''definition list'''",
+'diff-dt'                 => "ek '''definition term'''",
+'diff-dd'                 => "ek '''definition'''",
+'diff-input'              => "ek '''input'''",
+'diff-form'               => "ek '''form'''",
+'diff-img'                => "ek '''chapa'''",
+'diff-span'               => "ek '''span'''",
+'diff-a'                  => "ek '''jorr'''",
+'diff-i'                  => "'''italics'''",
+'diff-b'                  => "'''bold'''",
+'diff-strong'             => "'''strong'''",
+'diff-em'                 => "'''emphasis'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''barra'''",
+'diff-del'                => "'''mitae dewa gais hai'''",
+'diff-tt'                 => "'''Pakka chaurrai'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''strikethrough'''",
 
 # Search results
-'searchresults'             => 'Khij ke results',
-'searchresulttext'          => '{{SITENAME}} me khoje khatir aur jaankari khatir, dekho [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Aap khoja rahaa  \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sab panna jon ki "$1" se suruu hoe hai]] | [[Special:WhatLinksHere/$1|sab panna jon ki "$1" se jurre hai]])',
-'searchsubtitleinvalid'     => "Aap '''$1''' ke khoja hai",
-'noexactmatch'              => "'''\"\$1\" naam ke koi panna nai hai.''' Aap saktaa hai [[:\$1|ii panna ke banae]].",
-'noexactmatch-nocreate'     => "'''\"\$1\" naam ke koi panna nai hai.'''",
-'toomanymatches'            => 'Bahut dher match mila, duusra query se kosis karo',
-'titlematches'              => 'Panna ke jon naam mile hai',
-'notitlematches'            => 'Koi pannake naam nai mile hai',
-'textmatches'               => 'Panna ke jon text mile hai',
-'notextmatches'             => 'Koi panna ke text nai mile hai',
-'prevn'                     => 'pahile waala $1',
-'nextn'                     => 'aage waala $1',
-'viewprevnext'              => 'Dekho ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 sabd|$2 sabd}})',
-'search-result-score'       => 'Len den: $1%',
-'search-redirect'           => '(redirect $1)',
-'search-section'            => '(section $1)',
-'search-suggest'            => 'Kya aap ke matlab rahaa: $1',
-'search-interwiki-caption'  => 'Saathe ke project',
-'search-interwiki-default'  => '$1 ke result:',
-'search-interwiki-more'     => '(aur)',
-'search-mwsuggest-enabled'  => 'bichar ke saathe',
-'search-mwsuggest-disabled' => 'koi bichar nai hai',
-'search-relatedarticle'     => 'sambandh rakkhe hai',
-'mwsuggest-disable'         => 'AJAX sughao ke beasar karo',
-'searchrelated'             => 'sambhand rakkhe hai',
-'searchall'                 => 'sab',
-'showingresults'            => "Niche dekhae hai {{PLURAL:$1|'''1''' result|'''$1''' results}} #'''$2''' se suruu hoe ke.",
-'showingresultsnum'         => "Niche dekhawa jae hai {{PLURAL:$3|'''1''' result|'''$3''' results}}, #'''$2''' se suruu hoe ke.",
-'showingresultstotal'       => "Niche dekhae hai {{PLURAL:$3|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}",
-'nonefound'                 => "'''Yaad rakhna''': apne se khaali thora namespaces me khoja jaae hai.
+'searchresults'                    => 'Khij ke results',
+'searchresults-title'              => '"$1" ke results ke khojo',
+'searchresulttext'                 => '{{SITENAME}} me khoje khatir aur jaankari khatir, dekho [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Aap khoja rahaa  \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sab panna jon ki "$1" se suruu hoe hai]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|sab panna jon ki "$1" se jurre hai]])',
+'searchsubtitleinvalid'            => "Aap '''$1''' ke khoja hai",
+'noexactmatch'                     => "'''\"\$1\" naam ke koi panna nai hai.''' Aap saktaa hai [[:\$1|ii panna ke banae]].",
+'noexactmatch-nocreate'            => "'''\"\$1\" naam ke koi panna nai hai.'''",
+'toomanymatches'                   => 'Bahut dher match mila, duusra query se kosis karo',
+'titlematches'                     => 'Panna ke jon naam mile hai',
+'notitlematches'                   => 'Koi pannake naam nai mile hai',
+'textmatches'                      => 'Panna ke jon text mile hai',
+'notextmatches'                    => 'Koi panna ke text nai mile hai',
+'prevn'                            => 'pahile waala $1',
+'nextn'                            => 'aage waala $1',
+'viewprevnext'                     => 'Dekho ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Khoje ke option',
+'searchmenu-exists'                => "'''Ii wiki me \"[[\$1]]\" naam ke panna hai'''",
+'searchmenu-new'                   => "'''Ii wiki me \"[[:\$1]]\" panna ke banao!'''",
+'searchhelp-url'                   => 'Help:Madat',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Ii prefix ke panna ke browse karo]]',
+'searchprofile-articles'           => 'Vishay suchi ke panna',
+'searchprofile-articles-and-proj'  => 'Vishay suchi aur project panna',
+'searchprofile-project'            => 'Project panna',
+'searchprofile-images'             => 'Files',
+'searchprofile-everything'         => 'Sab chij',
+'searchprofile-advanced'           => 'Advanced',
+'searchprofile-articles-tooltip'   => '$1 me khojo',
+'searchprofile-project-tooltip'    => '$1 me khojo',
+'searchprofile-images-tooltip'     => 'File ke khojo',
+'searchprofile-everything-tooltip' => 'Sab content me khojo (baat waala panna bhi)',
+'searchprofile-advanced-tooltip'   => 'Custom namespaces me khojo',
+'prefs-search-nsdefault'           => 'Defaults use kar ke khojo:',
+'prefs-search-nscustom'            => 'ustom namespaces me khojo:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 sabd|$2 sabd}})',
+'search-result-score'              => 'Len den: $1%',
+'search-redirect'                  => '(redirect $1)',
+'search-section'                   => '(section $1)',
+'search-suggest'                   => 'Kya aap ke matlab rahaa: $1',
+'search-interwiki-caption'         => 'Saathe ke project',
+'search-interwiki-default'         => '$1 ke result:',
+'search-interwiki-more'            => '(aur)',
+'search-mwsuggest-enabled'         => 'bichar ke saathe',
+'search-mwsuggest-disabled'        => 'koi bichar nai hai',
+'search-relatedarticle'            => 'sambandh rakkhe hai',
+'mwsuggest-disable'                => 'AJAX sughao ke beasar karo',
+'searchrelated'                    => 'sambhand rakkhe hai',
+'searchall'                        => 'sab',
+'showingresults'                   => "Niche dekhae hai {{PLURAL:$1|'''1''' result|'''$1''' results}} #'''$2''' se suruu hoe ke.",
+'showingresultsnum'                => "Niche dekhawa jae hai {{PLURAL:$3|'''1''' result|'''$3''' results}}, #'''$2''' se suruu hoe ke.",
+'showingresultstotal'              => "Niche dekhawa jae hai  {{PLURAL:$4|result '''$1''' of '''$3'''|results '''$1 - $2''' of '''$3'''}}",
+'nonefound'                        => "'''Yaad rakhna''': apne se khaali thora namespaces me khoja jaae hai.
 Aapan query ke ''all:'' se suruu kar ke visay suchi me khojo (including talk pages, templates, etc), nai to jon namespace aap mangtaa hai usse query suruu karo.",
-'powersearch'               => 'Visesh khoj',
-'powersearch-legend'        => 'Gahira khoj',
-'powersearch-ns'            => 'Namespaces me khojo:',
-'powersearch-redir'         => 'Redirects ke list karo',
-'powersearch-field'         => 'Iske khojo',
-'search-external'           => 'Bahaari khoj',
-'searchdisabled'            => '{{SITENAME}} me abhi khoje ke anumati nai hai.
+'search-nonefound'                 => 'There were no results matching the query.',
+'powersearch'                      => 'Visesh khoj',
+'powersearch-legend'               => 'Gahira khoj',
+'powersearch-ns'                   => 'Namespaces me khojo:',
+'powersearch-redir'                => 'Redirects ke list karo',
+'powersearch-field'                => 'Iske khojo',
+'search-external'                  => 'Bahaari khoj',
+'searchdisabled'                   => '{{SITENAME}} me abhi khoje ke anumati nai hai.
 Aap tab tak Google se khoje sakta hai.
 Yaad rakhna ki uu log ke {{SITENAME}} ke index saait purana hoi.',
 
 # Preferences page
-'preferences'              => 'Pasand',
-'mypreferences'            => 'Hamaar preferences',
-'prefs-edits'              => 'Badlao ke number:',
-'prefsnologin'             => 'Aap abhi logged in nai hai',
-'prefsnologintext'         => 'Aaap ke <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logged in]</span> chaahi rahe ke user preferences ke badle ke khatir.',
-'prefsreset'               => 'Preferences ke godaam se reset kar dewa gais hai.',
-'qbsettings'               => 'Quickbar',
-'qbsettings-none'          => 'Koi nai',
-'qbsettings-fixedleft'     => 'Left me fixed hai',
-'qbsettings-fixedright'    => 'Right me fixed hai',
-'qbsettings-floatingleft'  => 'Floating left',
-'qbsettings-floatingright' => 'Floating right',
-'changepassword'           => 'Pasword ke badlo',
-'skin'                     => 'Skin',
-'math'                     => 'Math',
-'dateformat'               => 'Date ke format',
-'datedefault'              => 'Koi pasand nai',
-'datetime'                 => 'Tarik aur time',
-'math_failure'             => 'Parse nai kare sakaa',
-'math_unknown_error'       => 'galti ke nai samajhta',
-'math_unknown_function'    => 'nai samajhta ki ii kon chij khatir hai',
-'math_lexing_error'        => 'lexing error',
-'math_syntax_error'        => 'syntax error',
-'math_image_error'         => 'PNG conversion fail hoe gais;
+'preferences'               => 'Pasand',
+'mypreferences'             => 'Hamaar preferences',
+'prefs-edits'               => 'Badlao ke number:',
+'prefsnologin'              => 'Aap abhi logged in nai hai',
+'prefsnologintext'          => 'Aaap ke <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logged in]</span> chaahi rahe ke user preferences ke badle ke khatir.',
+'prefsreset'                => 'Preferences ke godaam se reset kar dewa gais hai.',
+'qbsettings'                => 'Quickbar',
+'qbsettings-none'           => 'Koi nai',
+'qbsettings-fixedleft'      => 'Left me fixed hai',
+'qbsettings-fixedright'     => 'Right me fixed hai',
+'qbsettings-floatingleft'   => 'Floating left',
+'qbsettings-floatingright'  => 'Floating right',
+'changepassword'            => 'Pasword ke badlo',
+'skin'                      => 'Skin',
+'skin-preview'              => 'Jhalak',
+'math'                      => 'Math',
+'dateformat'                => 'Date ke format',
+'datedefault'               => 'Koi pasand nai',
+'datetime'                  => 'Tarik aur time',
+'math_failure'              => 'Parse nai kare sakaa',
+'math_unknown_error'        => 'galti ke nai samajhta',
+'math_unknown_function'     => 'nai samajhta ki ii kon chij khatir hai',
+'math_lexing_error'         => 'lexing error',
+'math_syntax_error'         => 'syntax error',
+'math_image_error'          => 'PNG conversion fail hoe gais;
 latex, dvips aur gs ke correct installation ke check kar ke convert convert karo',
-'math_bad_tmpdir'          => 'Math temporary directory nai banae sakta hai',
-'math_bad_output'          => 'Math output directory me likhe nai to banae nai sakta hai',
-'math_notexvc'             => 'Texvc executable nai hai;
+'math_bad_tmpdir'           => 'Math temporary directory nai banae sakta hai',
+'math_bad_output'           => 'Math output directory me likhe nai to banae nai sakta hai',
+'math_notexvc'              => 'Texvc executable nai hai;
 Configure kare khatir meharbani kar ke math/README ke dekho.',
-'prefs-personal'           => 'Sadasya ke profile',
-'prefs-rc'                 => 'Nawaa badlao',
-'prefs-watchlist'          => 'Dhyan suchi',
-'prefs-watchlist-days'     => 'Dhyan suchi me ketna roj dekhawa jaae:',
-'prefs-watchlist-edits'    => 'Barraa dhyan suchi me jaada se jaada ketna badlao dekhawa jaae:',
-'prefs-misc'               => 'Futkar',
-'saveprefs'                => 'Save karo',
-'resetprefs'               => 'Binaa bachawa gias badlao ke mitao',
-'oldpassword'              => 'Purana password:',
-'newpassword'              => 'Nawaa password:',
-'retypenew'                => 'Password fir se type karo:',
-'textboxsize'              => 'Badaltaa hai',
-'rows'                     => 'Rows:',
-'columns'                  => 'Columns:',
-'searchresultshead'        => 'Khojo',
-'resultsperpage'           => 'Panna ke ketna dafe dekha gais hai:',
-'contextlines'             => 'Lines per hit:',
-'contextchars'             => 'Context per line:',
-'stub-threshold'           => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):',
-'recentchangesdays'        => 'Nawaa badlao me ketna roj dekhawa jaae:',
-'recentchangescount'       => 'nawaa badla, itihaas aur log panna me ketna badlao dekhawa jaae:',
-'savedprefs'               => 'Aap ke pasand ke save kar lewa gais hai.',
-'timezonelegend'           => 'Time ke zone',
-'timezonetext'             => '¹ Aap ke local time aur server time (UTC) me ketna farka hai.',
-'localtime'                => 'Sthaniye samay',
-'timezoneoffset'           => 'Offset¹',
-'servertime'               => 'Server ke time',
-'guesstimezone'            => 'Browser se bharo',
-'allowemail'               => 'Aur sadasya se e-mail enable karo',
-'prefs-searchoptions'      => 'Khoje ke option',
-'prefs-namespaces'         => 'Namespaces',
-'defaultns'                => 'Default se ii namespacesme khojo:',
-'default'                  => 'default',
-'files'                    => 'Files',
+'prefs-personal'            => 'Sadasya ke profile',
+'prefs-rc'                  => 'Nawaa badlao',
+'prefs-watchlist'           => 'Dhyan suchi',
+'prefs-watchlist-days'      => 'Dhyan suchi me ketna roj dekhawa jaae:',
+'prefs-watchlist-days-max'  => '(jaada se jaada 7 din)',
+'prefs-watchlist-edits'     => 'Barraa dhyan suchi me jaada se jaada ketna badlao dekhawa jaae:',
+'prefs-watchlist-edits-max' => '(jaada se jaada: 1000)',
+'prefs-misc'                => 'Futkar',
+'prefs-resetpass'           => 'Password badlo',
+'saveprefs'                 => 'Save karo',
+'resetprefs'                => 'Binaa bachawa gias badlao ke mitao',
+'textboxsize'               => 'Badaltaa hai',
+'prefs-edit-boxsize'        => 'Edit window ke size.',
+'rows'                      => 'Rows:',
+'columns'                   => 'Columns:',
+'searchresultshead'         => 'Khojo',
+'resultsperpage'            => 'Panna ke ketna dafe dekha gais hai:',
+'contextlines'              => 'Lines per hit:',
+'contextchars'              => 'Context per line:',
+'stub-threshold'            => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):',
+'recentchangesdays'         => 'Nawaa badlao me ketna roj dekhawa jaae:',
+'recentchangesdays-max'     => '(sab se jaada $1 {{PLURAL:$1|din|din}})',
+'recentchangescount'        => 'Nawaa badlao me ketna badlao ke dekhae ke chaahi, panna ke itihaas, aur log me, default se:',
+'savedprefs'                => 'Aap ke pasand ke save kar lewa gais hai.',
+'timezonelegend'            => 'Time ke zone',
+'timezonetext'              => '¹ Aap ke local time aur server time (UTC) me ketna farka hai.',
+'localtime'                 => 'Sthaniye samay:',
+'timezoneselect'            => 'Time ke zone:',
+'timezoneuseserverdefault'  => 'Server default ke use karo',
+'timezoneuseoffset'         => 'Aur koi (offset ke specify karo)',
+'timezoneoffset'            => 'Offset¹:',
+'servertime'                => 'Server ke time:',
+'guesstimezone'             => 'Browser se bharo',
+'allowemail'                => 'Aur sadasya se e-mail enable karo',
+'prefs-searchoptions'       => 'Khoje ke option',
+'prefs-namespaces'          => 'Namespaces',
+'defaultns'                 => 'Default se ii namespacesme khojo:',
+'default'                   => 'default',
+'files'                     => 'Files',
 
 # User rights
 'userrights'                  => 'Sadasya ke adhikaar ke chalao', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Sadasya ke group ke manage karo',
 'userrights-user-editname'    => 'Ek Username ke enter karo:',
 'editusergroup'               => 'User groups ke badlo',
-'editinguser'                 => "'''[[User:$1|$1]]''' ke user rights badaltaa hai ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "'''[[User:$1|$1]]''' ke user rights badaltaa hai ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'User groupske badlo',
 'saveusergroups'              => 'User groups ke save karo',
 'userrights-groupsmember'     => 'Iske member hai:',
@@ -965,6 +1072,8 @@ Configure kare khatir meharbani kar ke math/README ke dekho.',
 'right-minoredit'            => 'Badlao ke chhota mark karo',
 'right-move'                 => 'Panna ke naam badlo',
 'right-move-subpages'        => 'Panna aur uske subpanna ke naam badlo',
+'right-move-rootuserpages'   => 'Root sadasya ke panna ke naam badlo',
+'right-movefile'             => 'File ke naam badlo',
 'right-suppressredirect'     => 'Panna ke naam badalte ke time, purana naam se redirect ke nai banao.',
 'right-upload'               => 'File ke upload karo',
 'right-reupload'             => 'Ek abhi waala file ke uppar se likho',
@@ -1015,9 +1124,46 @@ Configure kare khatir meharbani kar ke math/README ke dekho.',
 'rightslogentry' => '$1 ke group ke membership ke $2 se $3 badal dia hai',
 'rightsnone'     => '(koi nai hai)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'ii panna ke parrho',
+'action-edit'                 => 'ii panna ke badlo',
+'action-createpage'           => 'panna banao',
+'action-createtalk'           => 'salah waala panna banao',
+'action-createaccount'        => 'ii user account ke banao',
+'action-minoredit'            => 'ii badlao ke chhota mark karo',
+'action-move'                 => 'ii panna ke naam badlo',
+'action-move-subpages'        => 'ii panna, aur iske subpanna ke naam badal do',
+'action-move-rootuserpages'   => 'root sadasya panna ke naam badlo',
+'action-movefile'             => 'ii file ke naam badlo',
+'action-upload'               => 'ii file ke upload karo',
+'action-reupload'             => 'ii file ke uppar se likh do',
+'action-reupload-shared'      => 'override this file on a shared repository',
+'action-upload_by_url'        => 'ek URL address se ii file ke upload karo',
+'action-writeapi'             => 'use the write API',
+'action-delete'               => 'ii panna ke mitao',
+'action-deleterevision'       => 'ii badlao ke mitao',
+'action-deletedhistory'       => 'i panna ke mitawa waala itihaas dekho',
+'action-browsearchive'        => 'mitawa gais panna ke khojo',
+'action-undelete'             => 'ii panna ke fir se pahile jaise karo do',
+'action-suppressrevision'     => 'ii lukawa gais badlao ke fir se dekh ke pahile jaise karo',
+'action-suppressionlog'       => 'ii private log ke dekho',
+'action-block'                => 'ii sadasya ke panna badle se roko',
+'action-protect'              => 'ii panna ke protection levels ke badlo',
+'action-import'               => 'duusra wiki me se ii panna ke import karo',
+'action-importupload'         => 'ek file upload se ii panna ke import karo',
+'action-patrol'               => 'duusra jan ke badlao pe pahraa do',
+'action-autopatrol'           => 'aapan badlao pe pahraa do',
+'action-unwatchedpages'       => 'unwatched panna ke suchi dekho',
+'action-trackback'            => 'submit a trackback',
+'action-mergehistory'         => 'ii panna ke itihass ke ek karo',
+'action-userrights'           => 'sab sadasya ke adhikar ke badlo',
+'action-userrights-interwiki' => 'duusra wiki ke sadasya ke adhikar ke badlo',
+'action-siteadmin'            => 'database ke band karo nai to kholo',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|badlao|badlao}}',
 'recentchanges'                     => 'Nawaa badlao',
+'recentchanges-legend'              => 'Nawaa badlao options',
 'recentchangestext'                 => 'Wiki me ii panna ke nawaa badlao pe dhyan rakho.',
 'recentchanges-feed-description'    => 'Abhi haali me bhae ii wiki ke feed me ke track karo.',
 'rcnote'                            => "Niche {{PLURAL:$1|hai '''1''' badlao|aakhri hai '''$1''' badlao}} pahile {{PLURAL:$2|din|'''$2''' din}}, $5, $4 talak.",
@@ -1041,6 +1187,8 @@ Configure kare khatir meharbani kar ke math/README ke dekho.',
 'rc_categories'                     => 'Limit to categories (separate with "|")',
 'rc_categories_any'                 => 'Koi bhi',
 'newsectionsummary'                 => '/* $1 */ nawaa vibhag',
+'rc-enhanced-expand'                => 'Details dekhao (JavaScript jaruri hai)',
+'rc-enhanced-hide'                  => 'Details ke lukao',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Panna ke jurraa badlao',
@@ -1052,122 +1200,208 @@ Panna jon [[Special:Watchlist|aap ke dhyan suchi]] me hai '''bold''' karal hai."
 'recentchangeslinked-to'       => 'Badalo jon ki given panna se linked hai ke dekhao',
 
 # Upload
-'upload'                     => 'File ke upload karo',
-'uploadbtn'                  => 'File upload karo',
-'reupload'                   => 'Fir se upload karo',
-'reuploaddesc'               => 'Upload ke cancel kar ke upload form pe lauto',
-'uploadnologin'              => 'Aap abhi loged in nai hai',
-'uploadnologintext'          => 'Aap ke [[Special:UserLogin|logged in]] kare ke chaahi, file upload kare ke khatir.',
-'upload_directory_missing'   => 'Upload directory ($1) nai hai aur webserver iske nai banae sakis hai.',
-'upload_directory_read_only' => 'Upload directory ($1) ke webserver nai likhe sake hai.',
-'uploaderror'                => 'Upload nai hoe paais hai',
-'upload-permitted'           => 'File types jiske ijajat hai: $1.',
-'upload-preferred'           => 'Kon rakam ke file ke mangtaa hai: $1.',
-'upload-prohibited'          => 'Ii rakam ke file ke upload nai karaa jaae sake hai: $1.',
-'uploadlog'                  => 'upload karaa gae file ke log',
-'uploadlogpage'              => 'Suchi ke upload karo',
-'filename'                   => 'Filename',
-'filedesc'                   => 'Sanchhipt me',
-'fileuploadsummary'          => 'Sanchhipt me:',
-'filestatus'                 => 'Copyright ke haalat:',
-'filesource'                 => 'File ke source:',
-'uploadedfiles'              => 'Files jiske upload karaa gais hai.',
-'ignorewarning'              => 'Chetauni pe dhyan nai de ke file ke save karo',
-'ignorewarnings'             => 'Koi bhi chetauni pe dhyan nai do',
-'minlength1'                 => 'File ke naam me kamti se kamti ek letter hoe ke chaahi.',
-'illegalfilename'            => 'Filename "$1" me uu akchhar hai jiske panna ke title me allowed nai hai.
+'upload'                      => 'File ke upload karo',
+'uploadbtn'                   => 'File upload karo',
+'reupload'                    => 'Fir se upload karo',
+'reuploaddesc'                => 'Upload ke cancel kar ke upload form pe lauto',
+'uploadnologin'               => 'Aap abhi loged in nai hai',
+'uploadnologintext'           => 'Aap ke [[Special:UserLogin|logged in]] kare ke chaahi, file upload kare ke khatir.',
+'upload_directory_missing'    => 'Upload directory ($1) nai hai aur webserver iske nai banae sakis hai.',
+'upload_directory_read_only'  => 'Upload directory ($1) ke webserver nai likhe sake hai.',
+'uploaderror'                 => 'Upload nai hoe paais hai',
+'uploadtext'                  => "Niche waala form ke use kar ke file upload karo.
+Pahile upload karaa file ke dekhe khatir [[Special:FileList|list of uploaded files]] jao, (re)uploads are also logged in the [[Special:Log/upload|upload log]], deletions in the [[Special:Log/delete|deletion log]].
+
+To include a file in a page, use a link in one of the following forms:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' to use the full version of the file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' to use a 200 pixel wide rendition in a box in the left margin with 'alt text' as description
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' for directly linking to the file without displaying the file",
+'upload-permitted'            => 'File types jiske ijajat hai: $1.',
+'upload-preferred'            => 'Kon rakam ke file ke mangtaa hai: $1.',
+'upload-prohibited'           => 'Ii rakam ke file ke upload nai karaa jaae sake hai: $1.',
+'uploadlog'                   => 'upload karaa gae file ke log',
+'uploadlogpage'               => 'Suchi ke upload karo',
+'uploadlogpagetext'           => 'Niche ke list me haali ke uplaod karaa gae file ke suchi hai.
+Visual overview ke khatir [[Special:NewFiles|nawaa file ke gallery]] ke dekho.',
+'filename'                    => 'Filename',
+'filedesc'                    => 'Sanchhipt me',
+'fileuploadsummary'           => 'Sanchhipt me:',
+'filestatus'                  => 'Copyright ke haalat:',
+'filesource'                  => 'File ke source:',
+'uploadedfiles'               => 'Files jiske upload karaa gais hai.',
+'ignorewarning'               => 'Chetauni pe dhyan nai de ke file ke save karo',
+'ignorewarnings'              => 'Koi bhi chetauni pe dhyan nai do',
+'minlength1'                  => 'File ke naam me kamti se kamti ek letter hoe ke chaahi.',
+'illegalfilename'             => 'Filename "$1" me uu akchhar hai jiske panna ke title me allowed nai hai.
 Maharbaani kar ke file ke naam ke badal ke fir se upload kare ke kosis karo.',
-'badfilename'                => 'File ke naam badak ke "$1" kar dewa gais hai.',
-'filetype-badmime'           => 'MIME rakam "$1" ke upload kare ke ijajat nai hai.',
-'filetype-bad-ie-mime'       => 'Ii file ke upload nai kare sakta hai kahe ki Internet Explorer iske "$1" ke rakam dekhi, jon ki allowed nai hai aur khatarnaat rakam ke file jaana jaae hai.',
-'filetype-unwanted-type'     => "'''\".\$1\"''' rakam ke file ke hian nai maaga jaae hai.
+'badfilename'                 => 'File ke naam badak ke "$1" kar dewa gais hai.',
+'filetype-badmime'            => 'MIME rakam "$1" ke upload kare ke ijajat nai hai.',
+'filetype-bad-ie-mime'        => 'Ii file ke upload nai kare sakta hai kahe ki Internet Explorer iske "$1" ke rakam dekhi, jon ki allowed nai hai aur khatarnaat rakam ke file jaana jaae hai.',
+'filetype-unwanted-type'      => "'''\".\$1\"''' rakam ke file ke hian nai maaga jaae hai.
 Maange waala {{PLURAL:\$3|file ke rakam hai|file ke rakam hai}} \$2.",
-'filetype-banned-type'       => "'''\".\$1\"''' ke rakam ke file hian pe allowed nai hai.
+'filetype-banned-type'        => "'''\".\$1\"''' ke rakam ke file hian pe allowed nai hai.
 Allowed {{PLURAL:\$3|rakam ke file hai|rakam ke fle hai}} \$2.",
-'filetype-missing'           => 'File ke koi extension nai hai (jaise ki ".jpg").',
-'large-file'                 => 'Ii salah hai ki file ke size $1 se barraa nai rahe;
+'filetype-missing'            => 'File ke koi extension nai hai (jaise ki ".jpg").',
+'large-file'                  => 'Ii salah hai ki file ke size $1 se barraa nai rahe;
 ii file hai $2',
-'largefileserver'            => 'Ii file, jetna ki server allow kare hai, se barraa hai.',
-'emptyfile'                  => 'Jon file aap upload karaa rahaa uu khaali rahaa.
+'largefileserver'             => 'Ii file, jetna ki server allow kare hai, se barraa hai.',
+'emptyfile'                   => 'Jon file aap upload karaa rahaa uu khaali rahaa.
 Ii saait file ke naam likhe me typing mistake ke kaaran hoi.
 Meharbaani kar ke ii dekho ki aap such me ii file upload kare mangtaa hai ki nai.',
-'fileexists'                 => 'Ii naam ke file abhi hai, meharbani kar ke check karo <strong><tt>$1</tt></strong> agar jo aap sure nai hai ki aap iske badle mangta hai.',
-'filepageexists'             => 'Ii file ke description ke <strong><tt>$1</tt></strong> me banae dewa gais rakaa, lekin ii naam ke koi file abhi nai hai.
+'fileexists'                  => "Ii naam ke file abhi hai, meharbani kar ke check karo '''<tt>$1</tt>''' agar jo aap sure nai hai ki aap iske badle mangta hai.",
+'filepageexists'              => "Ii file ke description ke '''<tt>$1</tt>''' me banae dewa gais rakaa, lekin ii naam ke koi file abhi nai hai.
 Aap jon summary likhtaa hai uu panna ke description me nai dekhai.
-Description ke dekhae ke khatir, aap ke iske manually badle ke parri.',
-'fileexists-extension'       => 'Ii rakam ke naam ke ek aur file hai:<br />
-Uploading file ke naam: <strong><tt>$1</tt></strong><br />
-Abhi ke file ke naam: <strong><tt>$2</tt></strong><br />
-Meharbani kar ke duusra naam chuno.',
-'fileexists-thumb'           => "<center>'''Abhi ke file'''</center>",
-'fileexists-thumbnail-yes'   => 'Ii janawe hai ki ii file ek chhota chapa hai <i>(thumbnail)</i>.
-Meharbani kar ke file ke check karo <strong><tt>$1</tt></strong>.<br />
-Agar jo check karaa gais file wahi chhapa ke original size hai tab ek aur thumbnail ke upload kare ke jaruri nai hai.',
-'file-thumbnail-no'          => 'File ke naam <strong><tt>$1</tt></strong> se suruu hoe hai.
-Ii janawe hai ki ii chhota size ke chapa hai <i>(thumbnail)</i>.
-Agar jo aap ke lage ii chapa full resolution me hai tab uske upload karna, nai to file ke naam badlo.',
-'file-exists-duplicate'      => 'Ii file following file ke duplicate hai {{PLURAL:$1|file|files}}:',
-'successfulupload'           => 'Upload safal bhais',
-'uploadwarning'              => 'Upload warning',
-'savefile'                   => 'File ke save karo',
-'uploadedimage'              => '"[[$1]]" ke upload kar dewa gae',
-'overwroteimage'             => '"[[$1]]" ke nawaa version ke upload karaa gais hai',
-'uploaddisabled'             => 'Uploads ke disable kar dewa gais hai',
-'uploaddisabledtext'         => 'File uploads ke disable kar dewa gais hai.',
-'uploadscripted'             => 'Ii file me HTML nai to script code hai jiske web browser erroneously interpret kare sake hai.',
-'uploadcorrupt'              => 'Ii file chaahe ke corrupt hai nai to isme wrong extension hai.
+Description ke dekhae ke khatir, aap ke iske manually badle ke parri.",
+'fileexists-extension'        => "Ii rakam ke naam ke ek aur file hai:<br />
+Uploading file ke naam: '''<tt>$1</tt>'''<br />
+Abhi ke file ke naam: '''<tt>$2</tt>'''<br />
+Meharbani kar ke duusra naam chuno.",
+'fileexists-thumb'            => "<center>'''Abhi ke file'''</center>",
+'fileexists-thumbnail-yes'    => "Ii janawe hai ki ii file ek chhota chapa hai ''(thumbnail)''.
+Meharbani kar ke file ke check karo '''<tt>$1</tt>'''.<br />
+Agar jo check karaa gais file wahi chhapa ke original size hai tab ek aur thumbnail ke upload kare ke jaruri nai hai.",
+'file-thumbnail-no'           => "File ke naam '''<tt>$1</tt>''' se suruu hoe hai.
+Ii janawe hai ki ii chhota size ke chapa hai ''(thumbnail)''.
+Agar jo aap ke lage ii chapa full resolution me hai tab uske upload karna, nai to file ke naam badlo.",
+'fileexists-forbidden'        => 'Ii naam ke file abhi hai, aur iske badlawa nai jaae sake hai.
+Agar jo aap fir bhi aapan file ke upload kare mangta hai, tab pichhe jaae ke nawaa naam use karo. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Ii naam ke file abhi shared file repository me hai.
+Agar jo aap fir bhi aapan file upload kare manta hai tab pichhe jaae ke nawaa naam use karo. [[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'Ii file following file ke duplicate hai {{PLURAL:$1|file|files}}:',
+'file-deleted-duplicate'      => 'Yahii rakam ke ek aur file ([[$1]]) ke pahile delete karaa gais hai. Aap ke file ke deletion history ke check kare ke chaahi, upload kare se pahile.',
+'successfulupload'            => 'Upload safal bhais',
+'uploadwarning'               => 'Upload warning',
+'savefile'                    => 'File ke save karo',
+'uploadedimage'               => '"[[$1]]" ke upload kar dewa gae',
+'overwroteimage'              => '"[[$1]]" ke nawaa version ke upload karaa gais hai',
+'uploaddisabled'              => 'Uploads ke disable kar dewa gais hai',
+'uploaddisabledtext'          => 'File uploads ke disable kar dewa gais hai.',
+'uploadscripted'              => 'Ii file me HTML nai to script code hai jiske web browser erroneously interpret kare sake hai.',
+'uploadcorrupt'               => 'Ii file chaahe ke corrupt hai nai to isme wrong extension hai.
 Meharbani kar ke file ke check kar ke fir se upload karo.',
-'uploadvirus'                => 'Ii file me virus hai! Details: $1',
-'sourcefilename'             => 'Source filename:',
-'destfilename'               => 'Destination filename:',
-'upload-maxfilesize'         => 'jaada se jaada file size: $1',
-'watchthisupload'            => 'Ii panna pe dhyan rakho',
-'filewasdeleted'             => 'Ii naam ke file ke pahile upload kar ke baad me delete karaa gais hai.
+'uploadvirus'                 => 'Ii file me virus hai! Details: $1',
+'sourcefilename'              => 'Source filename:',
+'destfilename'                => 'Destination filename:',
+'upload-maxfilesize'          => 'jaada se jaada file size: $1',
+'watchthisupload'             => 'Ii panna pe dhyan rakho',
+'filewasdeleted'              => 'Ii naam ke file ke pahile upload kar ke baad me delete karaa gais hai.
 Aap ke chaahi ki aap $1 check kar lo fir se upload kare se pahile.',
-'upload-wasdeleted'          => "'''Chetauni: Aap uu file ke upload karta hai jiske pahile delete karaa gais hai.'''
+'upload-wasdeleted'           => "'''Chetauni: Aap uu file ke upload karta hai jiske pahile delete karaa gais hai.'''
 Aap ke ii soche ke chaahi ki ii file ke upload karna appropriate hai ki nai.
 Aap ke subidha khatir deletion log hian pe hai:",
-
-# Special:ImageList
-'imgfile'        => 'file',
-'imagelist'      => 'Chapa ke suchi',
-'imagelist_date' => 'Tarik',
-'imagelist_name' => 'Naam',
-'imagelist_user' => 'Sadasya',
-
-# Image description page
+'filename-bad-prefix'         => "Jon file aap upload kartaa hai uske naam '''\"\$1\"''' se suruu hoe hai, jon ki non-descriptive naam hai jiske jaada kar ke digital camera automatically assign kare hai.
+Meharbaani kar ke aur jaada descriptive filename chose karo.",
+
+'upload-proto-error'      => 'Protocol right nai hai',
+'upload-proto-error-text' => 'Duur ke upload maange hai URLs jon ki suruu hoe hai <code>http://</code> nai to <code>ftp://</code>.',
+'upload-file-error'       => 'Bhitri error',
+'upload-file-error-text'  => 'Server pe temporary file banae ke time ek bhitri error hoe gais.
+[[Special:ListUsers/sysop|administrator]] ke contact karo.',
+'upload-misc-error'       => 'Unknown upload error',
+'upload-misc-error-text'  => 'Upload kare ke time ek unknown error hoe gais hai.
+Meharbani kar ke verify karo ki URL valid aur accessible hai aur fir se kosis karo.
+Agar jo problem fir nai khatam hoe tab [[Special:ListUsers/sysop|administrator]] ke contact karo.',
+
+# Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
+'upload-curl-error6'       => 'URL pe pahunche nai paya hai',
+'upload-curl-error6-text'  => 'URL tak nahi pahunche sakaa hai.
+Meharbani kar ke fir se check karo ki URL correct hai aur site chale hai.',
+'upload-curl-error28'      => 'Upload ke time khalaas hoe gais hai',
+'upload-curl-error28-text' => 'Ii site respond kare ke bahut time liis hai.
+Meharbani kar ke dekho ki ii site chale hai, thora deri tak wait kar ke fir se kosis karo.
+Saait aap ke kamti busy time kosis kare ke chaahi.',
+
+'license'            => 'Licensing:',
+'nolicense'          => 'Koi bhi selct nai karaa gais hai',
+'license-nopreview'  => '(Preview abhi taiyaar nai hai)',
+'upload_source_url'  => ' (ek valid, publicly accessible URL)',
+'upload_source_file' => ' (aap ke computer me ek file)',
+
+# Special:ListFiles
+'listfiles-summary'     => 'Ii khaas panna sab uploaded file ke dekhae hai.
+Default se akhri uploaded file ke list me pahile dekhawa gais hai.
+Column header me click kare se sorting badal jaai.',
+'listfiles_search_for'  => 'Media ke naam khojo:',
+'imgfile'               => 'file',
+'listfiles'             => 'Chapa ke suchi',
+'listfiles_date'        => 'Tarik',
+'listfiles_name'        => 'Naam',
+'listfiles_user'        => 'Sadasya',
+'listfiles_size'        => 'Size',
+'listfiles_description' => 'Description',
+'listfiles_count'       => 'Versions',
+
+# File description page
 'filehist'                       => 'File ke itihaas',
 'filehist-help'                  => 'File ke dekhe khatir, jaise uu time dekhe me lagat rahaa, date/time pe click karo.',
 'filehist-deleteall'             => 'sab ke mitao',
 'filehist-deleteone'             => 'mitao',
+'filehist-revert'                => 'pahile jaise karo',
 'filehist-current'               => 'abhi waala',
 'filehist-datetime'              => 'Din/Time',
+'filehist-thumb'                 => 'Chhota chapa',
+'filehist-thumbtext'             => '$1 waala version ke chhota chapa',
+'filehist-nothumb'               => 'Chhota chap anai hai',
 'filehist-user'                  => 'Sadasya',
 'filehist-dimensions'            => 'Lambai aur chaurai',
 'filehist-filesize'              => 'File ke size',
 'filehist-comment'               => 'Tiprrin',
-'imagelinks'                     => 'Jorr',
+'imagelinks'                     => 'File ke jorr',
 'linkstoimage'                   => 'Ii sab panna ii file {{PLURAL:$1|panna ke jorr|$1 panna ke jorr}} se link hoe hai:',
+'linkstoimage-more'              => '$1 se jaada {{PLURAL:$1|panna ke jorr|panna ke jorr}} ii file se hai.
+Niche ke suchi dekhae hai {{PLURAL:$1|pahila panna ke jorr|pahila $1 panna ke jorr}} khaali ii file se.
+Ek [[Special:WhatLinksHere/$2|Puura suchi]] available hai.',
 'nolinkstoimage'                 => 'Ii file se koi panna nai jurre hai.',
+'morelinkstoimage'               => 'Dekho [[Special:WhatLinksHere/$1|more links]] ii file se.',
+'redirectstofile'                => 'Niche waala file ii file {{PLURAL:$1|file redirects|$1 files redirect}} se redirect hoe hai:',
+'duplicatesoffile'               => 'Niche ke suchi waala {{PLURAL:$1|file ke dui copy hai|$1 files ke dui copy hai}} ii file ke ([[Special:FileDuplicateSearch/$2|more details]]):',
 'sharedupload'                   => 'Ii file baatal hai aur duusra project me bhi kaam lawa jaae sake hai.',
+'shareduploadwiki'               => 'Aur jaankari khatir $1 ke dekho.',
+'shareduploadwiki-desc'          => 'Iske $1 pe description, shared repository me, niche dekhawa gais hai.',
+'shareduploadwiki-linktext'      => 'file description waala panna',
+'shareduploadduplicate'          => 'Ii file shared repository me ke  $1  ke duplicate hai.',
 'shareduploadduplicate-linktext' => 'duusra file',
+'shareduploadconflict'           => 'Ii file ke naam ke ek file $1 shared repository me hai.',
 'shareduploadconflict-linktext'  => 'duusra file',
 'noimage'                        => 'Ii naam ke koi file nai hai, lekin aap sakta hai $1.',
 'noimage-linktext'               => 'ek ke upload karo',
 'uploadnewversion-linktext'      => 'Ii file ke nawaa version ke upload karo',
+'imagepage-searchdupe'           => 'Dugna files ke khojo',
+
+# File reversion
+'filerevert'                => '$1 ke pahile jaise karo',
+'filerevert-legend'         => 'File ke pahile jaise karo',
+'filerevert-intro'          => "Aap '''[[Media:$1|$1]]''' ke [$4 version as of $3, $2] jaise kartaa hai.",
+'filerevert-comment'        => 'Vichar:',
+'filerevert-defaultcomment' => 'Version as of $2, $1 pe revert kar dewa gais hai',
+'filerevert-submit'         => 'Pahile jaise karo',
+'filerevert-success'        => "'''[[Media:$1|$1]]''' ke [$4 version as of $3, $2] pe revert kar dewa gais hai.",
+'filerevert-badversion'     => 'Dewa gais timestamp ke pahile ke ii file ke koi version nai hai.',
 
 # File deletion
 'filedelete'                  => '$1 ke mitao',
 'filedelete-legend'           => 'File ke mitao',
+'filedelete-intro'            => "Aap file '''[[Media:$1|$1]]''' ke delete kare waala hai iske itihaas ke saathe.",
+'filedelete-intro-old'        => "Aap '''[[Media:$1|$1]]''' ke version as of [$4 $3, $2] ke delete kartaa hai.",
 'filedelete-comment'          => 'Mitae ke kaaran:',
 'filedelete-submit'           => 'Mitao',
 'filedelete-success'          => "'''$1''' ke mitae dewa gais hai.",
+'filedelete-success-old'      => "'''[[Media:$1|$1]]''' ke version as of $3, $2 ke delete kar dewa gais hai.",
 'filedelete-nofile'           => "'''$1''' nai hai.",
+'filedelete-nofile-old'       => "'''$1''' ke specified attributes ke koi archived version nai hai.",
+'filedelete-otherreason'      => 'Duusra/aur kaaran:',
 'filedelete-reason-otherlist' => 'Duusra kaaran',
+'filedelete-reason-dropdown'  => '* Sadharan delete kare ke kaaran
+** Copyright ke violation
+** Dugnaa file',
+'filedelete-edit-reasonlist'  => 'Delete kare ke kaaran ke badlo',
 
 # MIME search
-'mimesearch' => 'MIME khojo',
-'download'   => 'download karo',
+'mimesearch'         => 'MIME khojo',
+'mimesearch-summary' => 'Ii panna filtering of files for its MIME-type ke enable kare hai.
+Input: contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
+'mimetype'           => 'MIME ke rakam:',
+'download'           => 'download karo',
 
 # Unwatched pages
 'unwatchedpages' => 'Panna jispe dhyan nai rakha gais hai',
@@ -1176,130 +1410,262 @@ Aap ke subidha khatir deletion log hian pe hai:",
 'listredirects' => 'Redirects list karo',
 
 # Unused templates
-'unusedtemplates' => 'Bina use bhae templates',
+'unusedtemplates'     => 'Bina use bhae templates',
+'unusedtemplatestext' => 'Ii panna {{ns:template}} namespace me uu panna ake suchi de hai jon ki koi duusra panna me nai hai.
+Templates ke delete kare se pahile duusra links ke bhi check kare ke nai bhulna.',
+'unusedtemplateswlh'  => 'duusra jorr',
 
 # Random page
-'randompage' => 'Koi bhi panna',
+'randompage'         => 'Koi bhi panna',
+'randompage-nopages' => 'Namespace "$1" me koi panna nai hai.',
 
 # Random redirect
-'randomredirect' => 'Random redirect',
+'randomredirect'         => 'Random redirect',
+'randomredirect-nopages' => 'Namespace "$1" me koi redirects nai hai.',
 
 # Statistics
-'statistics'             => 'Aankrra',
-'statistics-mostpopular' => 'Sab se jaada dekha gae panna',
-
-'disambiguations' => 'Disambiguation panna',
-
-'doubleredirects' => 'Dugna redirects',
-
-'brokenredirects' => 'Tuuta redirects',
-
-'withoutinterwiki' => 'Bina bhasa ke link waala panna',
+'statistics'                   => 'Aankrra',
+'statistics-header-pages'      => 'Panna ke ankrraa',
+'statistics-header-edits'      => 'Statistics ke badlo',
+'statistics-header-views'      => 'Statistics ke dekho',
+'statistics-header-users'      => 'Sadasya ke statistics',
+'statistics-articles'          => 'Content panna',
+'statistics-pages'             => 'Panna',
+'statistics-pages-desc'        => 'Wiki me sab panna, including salah waala panna, redirects, etc.',
+'statistics-files'             => 'Upload karaa gais files',
+'statistics-edits'             => '{{SITENAME}} ke suruu hoe se panna ke badlao',
+'statistics-edits-average'     => 'Average badlao per panna',
+'statistics-views-total'       => 'Views kul jorr',
+'statistics-views-peredit'     => 'Views per badlao',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] lambai',
+'statistics-users'             => 'Registered [[Special:ListUsers|sadasya]]',
+'statistics-users-active'      => 'Active sadasya',
+'statistics-users-active-desc' => 'Sadasya jon ki pichhle {{PLURAL:$1|din|$1 din}} me kuchh karin hai.',
+'statistics-mostpopular'       => 'Sab se jaada dekha gae panna',
+
+'disambiguations'      => 'Disambiguation panna',
+'disambiguationspage'  => 'Template:disambig',
+'disambiguations-text' => "Niche ke panna '''disambiguation panna''' se link hoe hai.
+They should link to the appropriate topic instead.<br />
+A page is treated as disambiguation page if it uses a template which is linked from [[MediaWiki:Disambiguationspage]]",
+
+'doubleredirects'            => 'Dugna redirects',
+'doubleredirectstext'        => 'Ii panna uu panna ke suchi de hai jon ki duusra redirect panna pe redirect kare hai. 
+Each row contains links to the first and second redirect, as well as the target of the second redirect, which is usually "real" target page, which the first redirect should point to.',
+'double-redirect-fixed-move' => '[[$1]] ke naam badal dewa gais hai, ab ii [[$2]] pe redirect kare hai',
+'double-redirect-fixer'      => 'Redirect ke banae waala',
+
+'brokenredirects'        => 'Tuuta redirects',
+'brokenredirectstext'    => 'Niche ke suchi me uu redirects hai jon ki non-existent panna pe redirect kare hai:',
+'brokenredirects-edit'   => '(badlo)',
+'brokenredirects-delete' => '(mitao)',
+
+'withoutinterwiki'         => 'Bina bhasa ke link waala panna',
+'withoutinterwiki-summary' => 'Niche waala panna duusra bhasa ke versions se nai jurre hai.',
+'withoutinterwiki-legend'  => 'Prefix',
+'withoutinterwiki-submit'  => 'Dekhao',
 
 'fewestrevisions' => 'Uu panna jisme sab se kamti badlao bhae hai.',
 
 # Miscellaneous special pages
 'nbytes'                  => '$1 {{PLURAL:$1|byte|bytes}}',
+'ncategories'             => '$1 {{PLURAL:$1|vibhag|vibhag}}',
 'nlinks'                  => '$1 {{PLURAL:$1|jorr|jorr}}',
 'nmembers'                => '$1 {{PLURAL:$1|sadasya|sadasya}}',
+'nrevisions'              => '$1 {{PLURAL:$1|badlao|badlao}}',
+'nviews'                  => '$1 {{PLURAL:$1|dafe dekha gais hai|dafe dekha gais hai}}',
+'specialpage-empty'       => 'Ii report khatir koi results nai hai.',
 'lonelypages'             => 'Akele waala panna',
+'lonelypagestext'         => 'Niche ke panna ke duusra paana jorre nai to  transclude nai kare hai {{SITENAME}} me.',
 'uncategorizedpages'      => 'Jon panna koi vibhag me nai hai',
 'uncategorizedcategories' => 'Uncategorized vibhag',
 'uncategorizedimages'     => 'Uncategorized files',
 'uncategorizedtemplates'  => 'Uncategorized templates',
 'unusedcategories'        => 'Bina use bhae category',
 'unusedimages'            => 'Bina use bhae files',
+'popularpages'            => 'Popular panna',
 'wantedcategories'        => 'Maange waala vibhag',
 'wantedpages'             => 'Jaruri panna',
+'wantedfiles'             => 'Maange waala files',
+'wantedtemplates'         => 'Maange waala templates',
 'mostlinked'              => 'Jon panna me sab se jaada chij jorra hai',
 'mostlinkedcategories'    => 'Jon vibhag me sab se jaada chij jorra hai',
 'mostlinkedtemplates'     => 'Jon template me sab se jaada fike jorra hai',
 'mostcategories'          => 'Sab se jaada vibhag waala panna',
 'mostimages'              => 'Jon file me sab se jaada file jorra hai',
 'mostrevisions'           => 'Sab se jaada badlao waala panna',
-'prefixindex'             => 'Prefix index',
+'prefixindex'             => 'Sab panna jisme prefix index hai',
 'shortpages'              => 'Chhota panna',
 'longpages'               => 'Lamba panna',
 'deadendpages'            => 'Jon panna se koi jurre nai hai',
+'deadendpagestext'        => 'Niche ke panna {{SITENAME}} ke koi bhi panna se nai jurre hai.',
 'protectedpages'          => 'Surakchhit panna',
+'protectedpages-indef'    => 'Khaali indefinite bachao',
+'protectedpages-cascade'  => 'Khaali cascading bachao',
+'protectedpagestext'      => 'Niche ke panna ke naam badle aur badle se rok lagawa gais hai',
+'protectedpagesempty'     => 'Ii parameters se koi bhi panna ke nai bachawa gais hai.',
+'protectedtitles'         => 'Bachawa gais titles',
+'protectedtitlestext'     => 'Niche ke title ke nai banawa jaae sake hai',
+'protectedtitlesempty'    => 'Ii parameters se koi bhi title ke nai bacawa gais hai.',
 'listusers'               => 'Sadasya ke suchi',
+'listusers-editsonly'     => 'Khaali uu sadasya ke dekhao jon ki koi badlao karis hai',
+'usereditcount'           => '$1 {{PLURAL:$1|badlao|badlao}}',
 'newpages'                => 'Nawaa panna',
+'newpages-username'       => 'Username:',
 'ancientpages'            => 'Sab se purana panna',
 'move'                    => 'Naam badlo',
 'movethispage'            => 'Panna ke naam badlo',
+'unusedimagestext'        => 'Yaad rakhna ki duusra web bhi direct URL se ek file se link hoe sake hai, aur may still be listed here despite being in active use.',
+'unusedcategoriestext'    => 'Niche ke category panna hai, jab ki koi aur panna aur category iske nai use kare hai.',
+'notargettitle'           => 'Koi target nai hai',
+'notargettext'            => 'Aap iifunction ke perform kare ke khatir koi target panna ke nai specify karaa hai.',
+'nopagetitle'             => 'Ii naam ke koi target panna nai hai',
+'nopagetext'              => 'Target panna jiske aap specify karaa hai exist nai hoe hai.',
 'pager-newer-n'           => '{{PLURAL:$1|nawaa 1|nawaa $1}}',
+'pager-older-n'           => '{{PLURAL:$1|purana 1|purana $1}}',
+'suppress'                => 'Oversight',
 
 # Book sources
-'booksources' => 'Pustak sources',
+'booksources'               => 'Pustak sources',
+'booksources-search-legend' => 'Book sources ke khojo',
+'booksources-go'            => 'Jao',
+'booksources-text'          => 'Niche ke suchi me uu websites ke jorr hai jon ki nawaa aur use karaa gais book ke beche hai aur jon book ke aap khojtaa hai uske baare aur jaankari de sake hai:',
+'booksources-invalid-isbn'  => 'Dewa gais ISBN valid nai hai; check for errors copying from the original source.',
 
 # Special:Log
 'specialloguserlabel'  => 'Sadasya:',
 'speciallogtitlelabel' => 'Title:',
 'log'                  => 'Suchi',
 'all-logs-page'        => 'Sab suchi',
+'alllogstext'          => '{{SITENAME}} ke sab logs ke combined display.
+You can narrow down the view by selecting a log type, the user name (case-sensitive), or the affected page (also case-sensitive).',
+'logempty'             => 'Log me koi matching item nai hai.',
+'log-title-wildcard'   => 'Ii text se suruu hoe waala titles ke khojo',
 
 # Special:AllPages
-'allpages'       => 'Sab panna',
-'alphaindexline' => '$1 se $2',
-'nextpage'       => 'Aglaa panna ($1)',
-'prevpage'       => 'Pichhla panna ($1)',
-'allpagesfrom'   => 'Panna dekhae ke suruu karo hian se:',
-'allarticles'    => 'Sab panna',
-'allpagessubmit' => 'Jao',
-'allpagesprefix' => 'Uu panna dekhao jiske prefix hai:',
+'allpages'          => 'Sab panna',
+'alphaindexline'    => '$1 se $2',
+'nextpage'          => 'Aglaa panna ($1)',
+'prevpage'          => 'Pichhla panna ($1)',
+'allpagesfrom'      => 'Panna dekhae ke suruu karo hian se:',
+'allpagesto'        => 'Dekhao panna ending at:',
+'allarticles'       => 'Sab panna',
+'allinnamespace'    => 'Sab panna ($1 namespace)',
+'allnotinnamespace' => 'Sab panna ($1 namespace me nai hai)',
+'allpagesprev'      => 'Pahile',
+'allpagesnext'      => 'Aage',
+'allpagessubmit'    => 'Jao',
+'allpagesprefix'    => 'Uu panna dekhao jiske prefix hai:',
+'allpagesbadtitle'  => 'Dewa gias panna ke title kharaab rahaa nai to inter-language nai to inter-wiki ke prefix hai.
+Is me ek nai to jaada akchhar hai jiske title me nai kaam me lawa jaae sake hai.',
+'allpages-bad-ns'   => '{{SITENAME}} me namespace "$1" nai hai.',
 
 # Special:Categories
-'categories' => 'Vibhag',
+'categories'                    => 'Vibhag',
+'categoriespagetext'            => 'Niche ke category me panna aur media hai.
+[[Special:UnusedCategories|Unused categories]] hian nai dekhawa jaae hai.
+[[Special:WantedCategories|wanted categories]] ke bhi dekho.',
+'categoriesfrom'                => 'Vibhag jon ki hian pe suruu hoe hai, ke dekhao:',
+'special-categories-sort-count' => 'ginti se sort karo',
+'special-categories-sort-abc'   => 'alphabetically sort karo',
+
+# Special:DeletedContributions
+'deletedcontributions' => 'Sadasya ke yogdaan ke mitae dia hai',
+
+# Special:LinkSearch
+'linksearch'       => 'Bahaari jorr',
+'linksearch-pat'   => 'Khoje ke pattern:',
+'linksearch-ns'    => 'Namespace:',
+'linksearch-ok'    => 'Khojo',
+'linksearch-text'  => 'Wildcards jaise ki "*.wikipedia.org" ke kaam me lawa jaae sake hai.<br />
+Supported protocols: <tt>$1</tt>',
+'linksearch-line'  => '$1, $2 se jurraa hai',
+'linksearch-error' => 'Wildcards khaali hostname ke suruu me hoe ke chaahi.',
+
+# Special:ListUsers
+'listusersfrom'      => 'Sadasya jon ki hian se suruu hoe hai ke dekhao:',
+'listusers-submit'   => 'Dekhao',
+'listusers-noresult' => 'Koi sadasya ke nai pawa gais hai.',
+
+# Special:Log/newusers
+'newuserlogpage'              => 'Sadasya ke banae waala log',
+'newuserlogpagetext'          => 'Ii sadasya ke banae waala log hai.',
+'newuserlog-byemail'          => 'password ke e-mail se bheja gais hai',
+'newuserlog-create-entry'     => 'Nawaa sadasya ke account',
+'newuserlog-create2-entry'    => 'nawaa account banaya $1',
+'newuserlog-autocreate-entry' => 'Account ke automatically banawa gais hai',
+
+# Special:ListGroupRights
+'listgrouprights'                 => 'Sadasya  ke group adhikar',
+'listgrouprights-summary'         => 'Niche likha hai ek suchi hai groups ke jon ki ii wiki me defined hai, aapan  associated access rights ke saathe
+[[{{MediaWiki:Listgrouprights-helppage}}|additional information]] individual rights ke baare me sait hoi.',
+'listgrouprights-group'           => 'Group',
+'listgrouprights-rights'          => 'Adhikar',
+'listgrouprights-helppage'        => 'Madat:Group adhikar',
+'listgrouprights-members'         => '(sadasya ke suchi)',
+'listgrouprights-addgroup'        => 'Sakta jorre {{PLURAL:$2|group|groups}}: $1',
+'listgrouprights-removegroup'     => 'SAkta hatae {{PLURAL:$2|group|groups}}: $1',
+'listgrouprights-addgroup-all'    => 'Sakta hai sab group jorre',
+'listgrouprights-removegroup-all' => 'Sab group ke hatae sakta hai',
 
 # E-mail user
-'emailuser' => 'Ii user ke E-mail karo',
+'mailnologin'     => 'Koi bheje waala address nai hai',
+'mailnologintext' => 'Duusra logan ke lage e-mail bheje ke khatir aap ke [[Special:UserLogin|logged in]] aur [[Special:Preferences|preferences]]  me thik e-mail hoew ke chaahi.',
+'emailuser'       => 'Ii user ke E-mail karo',
+'emailpage'       => 'User ke e-mail karo',
+'emailpagetext'   => 'Aap niche ke form ke use kar ke ii sadasya ke e-mail bheje sakta hai.
+Jon e-mail address aap [[Special:Preferences|your user preferences]] me enter karaa rahaa, "From" ke e-mail rahii, jisse ki e-mail receive kare waala aap ke sidha reply kare sake hai.',
+'usermailererror' => 'Mail object error return karis hai:',
+'defemailsubject' => '{{SITENAME}} e-mail',
 
 # Watchlist
-'watchlist'            => 'Hamaar dhyan suchi',
-'mywatchlist'          => 'Hamaar dhyaan suchi',
-'watchlistfor'         => "('''$1''' ke khatir)",
-'addedwatch'           => 'Dhyan suchi me jorro',
-'addedwatchtext'       => "Panna \"[[:\$1]]\" ke aap ke [[Special:Watchlist|watchlist]] me jorr dewa gais hai.
+'watchlist'         => 'Hamaar dhyan suchi',
+'mywatchlist'       => 'Hamaar dhyaan suchi',
+'watchlistfor'      => "('''$1''' ke khatir)",
+'addedwatch'        => 'Dhyan suchi me jorro',
+'addedwatchtext'    => "Panna \"[[:\$1]]\" ke aap ke [[Special:Watchlist|watchlist]] me jorr dewa gais hai.
 Ii panna ke aage ke badlao
 Future changes to this page and its associated talk page will be listed there, and the page will appear '''bolded''' in the [[Special:RecentChanges|list of recent changes]] to make it easier to pick out.",
-'removedwatch'         => 'Dhyan suchi me se hatao',
-'removedwatchtext'     => 'Panna "[[:$1]]" ke aap ke [[Special:Dhyan suchi|aap ke dhyan suchi]] se hatae dewa gais hai.',
-'watch'                => 'Dekho',
-'watchthispage'        => 'Ii panna par dhyan rakho',
-'unwatch'              => 'Nai dhyaan rakho',
-'watchlist-details'    => '{{PLURAL:$1|$1 panna|$1 panna}} pe dhyan dewa jae hai, baat waala panna ke chhorr ke.',
-'wlshowlast'           => 'Pichhla $1 ghanta $2 din $3 ke dekhao',
-'watchlist-hide-bots'  => 'Bot sampadan ke lukao',
-'watchlist-hide-own'   => 'Hamaar sampadan ke lukao',
-'watchlist-hide-minor' => 'Chhota sampadan ke nai dekhao.',
+'removedwatch'      => 'Dhyan suchi me se hatao',
+'removedwatchtext'  => 'Panna "[[:$1]]" ke aap ke [[Special:Dhyan suchi|aap ke dhyan suchi]] se hatae dewa gais hai.',
+'watch'             => 'Dekho',
+'watchthispage'     => 'Ii panna par dhyan rakho',
+'unwatch'           => 'Nai dhyaan rakho',
+'watchlist-details' => '{{PLURAL:$1|$1 panna|$1 panna}} pe dhyan dewa jae hai, baat waala panna ke chhorr ke.',
+'wlshowlast'        => 'Pichhla $1 ghanta $2 din $3 ke dekhao',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Dekhtaa...',
 'unwatching' => 'Nai dekhtaa...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Pana ke delete karo',
-'historywarning'              => 'Sawadhan: Jon page aap delete kare waala hai ke itihaas hai:',
-'confirmdeletetext'           => 'Aap ek panna ke uske itihaas ke saathe delete kare waala hai.
+# Delete
+'deletepage'            => 'Pana ke delete karo',
+'historywarning'        => 'Sawadhan: Jon page aap delete kare waala hai ke itihaas hai:',
+'confirmdeletetext'     => 'Aap ek panna ke uske itihaas ke saathe delete kare waala hai.
 Meharbani kar ke iske confirm karo, ki aap iske consequences ke samajhta hai, aur aap iske [[{{MediaWiki:Policy-url}}|the policy]] ke policy ke niche delete karta hai.',
-'actioncomplete'              => 'Action puura hoe gais hai',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ke delete kar dewa gais hai. Abhi jaldi ke deletions ke record dekhe khatir $2 ke dekho.',
-'deletedarticle'              => '"[[$1]]" ke hatae dewa gis hai',
-'dellogpage'                  => 'Hatane ke suchi',
-'deletecomment'               => 'Delete kare ke kaaran:',
-'deleteotherreason'           => 'Aur/duusra kaaran:',
-'deletereasonotherlist'       => 'Duusra kaaran',
-'rollbacklink'                => 'pahile jaise karo',
+'actioncomplete'        => 'Action puura hoe gais hai',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ke delete kar dewa gais hai. Abhi jaldi ke deletions ke record dekhe khatir $2 ke dekho.',
+'deletedarticle'        => '"[[$1]]" ke hatae dewa gis hai',
+'dellogpage'            => 'Hatane ke suchi',
+'deletecomment'         => 'Delete kare ke kaaran:',
+'deleteotherreason'     => 'Aur/duusra kaaran:',
+'deletereasonotherlist' => 'Duusra kaaran',
+
+# Rollback
+'rollbacklink' => 'pahile jaise karo',
+
+# Protect
 'protectlogpage'              => 'Surakchha suchi',
+'prot_1movedto2'              => '[[$1]] ke naam badal ke [[$2]] kar dewa gae hai',
 'protectcomment'              => 'Tiprri:',
 'protectexpiry'               => 'Khalas hoe hai:',
 'protect_expiry_invalid'      => 'Khalas hoe waala time valid nai hai.',
 'protect_expiry_old'          => 'Khalas hoe waala time past me hai.',
 'protect-unchain'             => 'Naam badle waala ijaajat kholo',
-'protect-text'                => 'Aap ii panna ke protection level ke dekhe aur badle sakta hai
-<strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Aap ke account ke panna ke ijaajat badle ijaajat nai dewe hai.
-Panna ke abhi ke settings hian hai <strong>$1</strong>:',
+'protect-text'                => "Aap ii panna ke protection level ke dekhe aur badle sakta hai
+'''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Aap ke account ke panna ke ijaajat badle ijaajat nai dewe hai.
+Panna ke abhi ke settings hian hai '''$1''':",
 'protect-cascadeon'           => 'Ii panna abhi surakchhit hai kahe ki isme hai {{PLURAL:$1|page, which has|pages, which have}} cascading protection turned on.
 
 Aap ii panna ke ijaajat level badle sakta hai, lekin ii cascading protection nai affect kari.',
@@ -1311,6 +1677,7 @@ Aap ii panna ke ijaajat level badle sakta hai, lekin ii cascading protection nai
 'protect-expiring'            => '$1 khalaas hoe hai (UTC)',
 'protect-cascade'             => 'Ii panna me ke panna ke bachao (cascading protection)',
 'protect-cantedit'            => 'Aap ii panna ke protection level badle nai sakta hai, kahe ki aap ke badle ke ijaajat nai hai.',
+'protect-expiry-options'      => '2 ghanta:2 hours,1 din:1 day,3 din:3 daya,1 hapta:1 week,2 hapta:2 weeks,1 mahina:1 month,3 mahina:3 months,6 mahina:6 months,1 saal:1 year,pura:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ijaajat:',
 'restriction-level'           => 'Roke ke niyam:',
 
@@ -1330,13 +1697,15 @@ Aap ii panna ke ijaajat level badle sakta hai, lekin ii cascading protection nai
 'month'         => 'Mahina se (aur pahile):',
 'year'          => 'Saal se (aur pahile):',
 
+'sp-contributions-newbies'     => 'Khaali nawaa account ke yogdaan dekhao',
 'sp-contributions-newbies-sub' => 'Nawaa account khatir',
 'sp-contributions-blocklog'    => 'Suchi roko',
+'sp-contributions-search'      => 'Yogdaan ke khojo',
+'sp-contributions-username'    => 'IP Address nai to username:',
 
 # What links here
 'whatlinkshere'       => 'Hian konchi link hoe',
 'whatlinkshere-title' => 'Panna jon ki $1 se jurre hai',
-'linklistsub'         => '(Links ke list)',
 'linkshere'           => "Niche waala panna '''[[:$1]]''' se jorre hai:",
 'nolinkshere'         => "Koi panna '''[[:$1]]''' ke nai jorre hai.",
 'isredirect'          => 'panna ke redirect karo',
@@ -1454,8 +1823,9 @@ Meharbani kar ke duusra naam choose karo.',
 'show-big-image'       => 'Puura resolution',
 'show-big-image-thumb' => '<small>Ii preview ke size: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Nawaa files ke gallery',
+'ilsubmit'  => 'Khojo',
 
 # Bad image list
 'bad_image_list' => 'Format ii rakam hai:
diff --git a/languages/messages/MessagesHil.php b/languages/messages/MessagesHil.php
index c2bba6ba..469feefc 100644
--- a/languages/messages/MessagesHil.php
+++ b/languages/messages/MessagesHil.php
@@ -15,8 +15,6 @@ $messages = array(
 'tog-justify'          => 'Tadlongon ang mga parapo',
 'tog-rememberpassword' => 'Dumdumon ang akon pagsulod sa sini nga kompyuter',
 
-'skinpreview' => '(Ipakita subong)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Lunes',
@@ -77,7 +75,7 @@ $messages = array(
 'qbspecialpages' => 'Pinasahi nga mga panid',
 'mytalk'         => 'Akon paghisayranay',
 'navigation'     => 'Nabigayson',
-'and'            => 'kag',
+'and'            => '&#32;kag',
 
 'tagline'          => 'Halin sa {{SITENAME}}',
 'help'             => 'Bulig',
@@ -151,7 +149,7 @@ Indi pagkalimti ang pag ilis sang imo mga pagpasulabi sa {{SITENAME}}.',
 'email'                   => 'E-mail',
 
 # Edit pages
-'summary'            => 'Kabilogan',
+'summary'            => 'Kabilogan:',
 'minoredit'          => 'Ini menor nga pag-ilis',
 'watchthis'          => 'Bantayan ining panid',
 'savearticle'        => 'Tiponon ining panid',
@@ -178,6 +176,7 @@ Indi pagkalimti ang pag ilis sang imo mga pagpasulabi sa {{SITENAME}}.',
 # Preferences page
 'mypreferences'     => 'Akon pagpalabi',
 'prefsnologin'      => 'Wala naka-sulod',
+'skin-preview'      => 'Ipakita subong',
 'prefs-rc'          => 'Mga Bag-o nga Inislan',
 'searchresultshead' => 'Pangita-a',
 
@@ -213,13 +212,13 @@ Indi pagkalimti ang pag ilis sang imo mga pagpasulabi sa {{SITENAME}}.',
 # Book sources
 'booksources-go' => 'Lakat',
 
-# Special:Log
-'log-search-submit' => 'Lakat',
-
 # Special:AllPages
 'alphaindexline' => '$1 sa $2',
 'allpagessubmit' => 'Sige',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Pangita-a',
+
 # Watchlist
 'watchlist'     => 'Akon Ginabantayan',
 'mywatchlist'   => 'Akon Ginabantayan',
@@ -227,9 +226,12 @@ Indi pagkalimti ang pag ilis sang imo mga pagpasulabi sa {{SITENAME}}.',
 'watch'         => 'Bantayan',
 'watchthispage' => 'Bantayan ining panid',
 
-# Delete/protect/revert
+# Delete
 'delete-legend' => 'Panason',
 
+# Protect
+'prot_1movedto2' => '[[$1]] gin saylo na sa [[$2]]',
+
 # Restrictions (nouns)
 'restriction-edit' => 'Ilisan',
 'restriction-move' => 'Saylohon',
@@ -254,6 +256,7 @@ Indi pagkalimti ang pag ilis sang imo mga pagpasulabi sa {{SITENAME}}.',
 # Move page
 'move-page-legend' => 'Saylohon ining panid',
 'movearticle'      => 'Saylohon ining panid:',
+'movenologin'      => 'Wala naka-sulod',
 'move-watch'       => 'Bantayan ining panid',
 'movepagebtn'      => 'Saylohon ining panid',
 'movedto'          => 'gin saylo sa',
@@ -286,7 +289,7 @@ Indi pagkalimti ang pag ilis sang imo mga pagpasulabi sa {{SITENAME}}.',
 # Media information
 'show-big-image' => 'Kabilogan nga resolusyon',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Pangita-a',
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index 6e1b9f74..b273f8a2 100644
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -18,44 +18,269 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'  => 'Standardna',
-	'nostalgia'  => 'Nostalgija',
-	'cologneblue'  => 'Kölnska plava',
-	'monobook'  => 'MonoBook',
-	'myskin'  => 'MySkin',
-	'chick'  => 'Chick'
+$namespaceNames = array(
+	NS_MEDIA            => 'Mediji',
+	NS_SPECIAL          => 'Posebno',
+	NS_TALK             => 'Razgovor',
+	NS_USER             => 'Suradnik',
+	NS_USER_TALK        => 'Razgovor_sa_suradnikom',
+	NS_PROJECT_TALK     => 'Razgovor_$1',
+	NS_FILE             => 'Datoteka',
+	NS_FILE_TALK        => 'Razgovor_o_datoteci',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_razgovor',
+	NS_TEMPLATE         => 'Predložak',
+	NS_TEMPLATE_TALK    => 'Razgovor_o_predlošku',
+	NS_HELP             => 'Pomoć',
+	NS_HELP_TALK        => 'Razgovor_o_pomoći',
+	NS_CATEGORY         => 'Kategorija',
+	NS_CATEGORY_TALK    => 'Razgovor_o_kategoriji',
 );
 
-$namespaceNames = array(
-	NS_MEDIA           => 'Mediji',
-	NS_SPECIAL         => 'Posebno',
-	NS_MAIN            => '',
-	NS_TALK            => 'Razgovor',
-	NS_USER            => 'Suradnik',
-	NS_USER_TALK       => 'Razgovor_sa_suradnikom',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK    => 'Razgovor_$1',
-	NS_IMAGE           => 'Slika',
-	NS_IMAGE_TALK      => 'Razgovor_o_slici',
-	NS_MEDIAWIKI       => 'MediaWiki',
-	NS_MEDIAWIKI_TALK  => 'MediaWiki_razgovor',
-	NS_TEMPLATE        => 'Predložak',
-	NS_TEMPLATE_TALK   => 'Razgovor_o_predlošku',
-	NS_HELP            => 'Pomoć',
-	NS_HELP_TALK       => 'Razgovor_o_pomoći',
-	NS_CATEGORY        => 'Kategorija',
-	NS_CATEGORY_TALK   => 'Razgovor_o_kategoriji'
+$namespaceAliases = array(
+	'Slika' => NS_FILE,
+	'Razgovor_o_slici' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Dvostruka_preusmjeravanja' ),
+	'BrokenRedirects'           => array( 'Kriva_preusmjeravanja' ),
+	'Disambiguations'           => array( 'Razdvojbe' ),
+	'Userlogin'                 => array( 'Prijava' ),
+	'Userlogout'                => array( 'Odjava' ),
+	'CreateAccount'             => array( 'Stvori_ra�un' ),
+	'Preferences'               => array( 'Postavke' ),
+	'Watchlist'                 => array( 'Praćene_stranice' ),
+	'Recentchanges'             => array( 'Nedavne_promjene' ),
+	'Upload'                    => array( 'Postavi_datoteku' ),
+	'Listfiles'                 => array( 'Slike' ),
+	'Newimages'                 => array( 'Nove_slike' ),
+	'Listusers'                 => array( 'Suradnici', 'Popis_suradnika' ),
+	'Listgrouprights'           => array( 'Suradni�ke_skupine' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Slu�ajna_stranica' ),
+	'Lonelypages'               => array( 'Siro�ad' ),
+	'Uncategorizedpages'        => array( 'Nekategorizirane_stranice' ),
+	'Uncategorizedcategories'   => array( 'Nekategorizirane_kategorije' ),
+	'Uncategorizedimages'       => array( 'Nekategorizirane_slike' ),
+	'Uncategorizedtemplates'    => array( 'Nekategorizirani_predlošci' ),
+	'Unusedcategories'          => array( 'Nekorištene_kategorije' ),
+	'Unusedimages'              => array( 'Nekorištene_slike' ),
+	'Wantedpages'               => array( 'Tražene_stranice' ),
+	'Wantedcategories'          => array( 'Tražene_kategorije' ),
+	'Wantedfiles'               => array( 'Tražene_datoteke' ),
+	'Wantedtemplates'           => array( 'Traženi_predlošci' ),
+	'Mostlinked'                => array( 'Najviše_povezane_stranice' ),
+	'Mostlinkedcategories'      => array( 'Najviše_povezane_kategorije' ),
+	'Mostlinkedtemplates'       => array( 'Najviše_povezani_predlošci' ),
+	'Mostcategories'            => array( 'Najviše_kategorija' ),
+	'Mostimages'                => array( 'Najviše_povezane_slike' ),
+	'Mostrevisions'             => array( 'Najviše_uređivane_stranice' ),
+	'Fewestrevisions'           => array( 'Najmanje_uređivane_stranice' ),
+	'Shortpages'                => array( 'Kratke_stranice' ),
+	'Longpages'                 => array( 'Duge_stranice' ),
+	'Newpages'                  => array( 'Nove_stranice' ),
+	'Ancientpages'              => array( 'Stare_stranice' ),
+	'Deadendpages'              => array( 'Slijepe_ulice' ),
+	'Protectedpages'            => array( 'Zaštićene_stranice' ),
+	'Protectedtitles'           => array( 'Zaštićeni_naslovi' ),
+	'Allpages'                  => array( 'Sve_stranice' ),
+	'Prefixindex'               => array( 'Prefiks_indeks', 'Stranice_po_prefiksu' ),
+	'Ipblocklist'               => array( 'Blokirane_adrese' ),
+	'Specialpages'              => array( 'Posebne_stranice' ),
+	'Contributions'             => array( 'Doprinosi' ),
+	'Emailuser'                 => array( 'Elektroni�ka_pošta', 'E-mail' ),
+	'Confirmemail'              => array( 'E-mail_potvrda' ),
+	'Whatlinkshere'             => array( 'Å to_vodi_ovamo' ),
+	'Recentchangeslinked'       => array( 'Povezane_promjene' ),
+	'Movepage'                  => array( 'Premjesti_stranicu' ),
+	'Blockme'                   => array( 'Blokiraj_me' ),
+	'Booksources'               => array( 'Traži_ISBN' ),
+	'Categories'                => array( 'Kategorije' ),
+	'Export'                    => array( 'Izvezi' ),
+	'Version'                   => array( 'Verzija' ),
+	'Allmessages'               => array( 'Sve_poruke' ),
+	'Log'                       => array( 'Evidencije' ),
+	'Blockip'                   => array( 'Blokiraj' ),
+	'Undelete'                  => array( 'Vrati' ),
+	'Import'                    => array( 'Uvezi' ),
+	'Lockdb'                    => array( 'Zaklju�aj_bazu' ),
+	'Unlockdb'                  => array( 'Otklju�aj_bazu' ),
+	'Userrights'                => array( 'Suradni�ka_prava' ),
+	'MIMEsearch'                => array( 'MIME_tražilica' ),
+	'FileDuplicateSearch'       => array( 'Traži_kopije_datoteka' ),
+	'Unwatchedpages'            => array( 'Negledane_stranice' ),
+	'Listredirects'             => array( 'Preusmjeravanja' ),
+	'Revisiondelete'            => array( 'Brisanje_izmjene' ),
+	'Unusedtemplates'           => array( 'Nekorišteni_predlošci' ),
+	'Randomredirect'            => array( 'Slu�ajno_preusmjeravanje' ),
+	'Mypage'                    => array( 'Moja_stranica' ),
+	'Mytalk'                    => array( 'Moj_razgovor' ),
+	'Mycontributions'           => array( 'Moji_doprinosi' ),
+	'Listadmins'                => array( 'Administratori', 'Admini' ),
+	'Listbots'                  => array( 'Botovi' ),
+	'Popularpages'              => array( 'Popularne_stranice' ),
+	'Search'                    => array( 'Traži' ),
+	'Resetpass'                 => array( 'Ponovno_postavi_lozinku' ),
+	'Withoutinterwiki'          => array( 'Bez_međuwikipoveznica', 'Bez_interwikija' ),
+	'MergeHistory'              => array( 'Spoji_povijest' ),
+	'Filepath'                  => array( 'Putanja_datoteke' ),
+	'Invalidateemail'           => array( 'Nevaljana_elektroni�ka_pošta' ),
+	'Blankpage'                 => array( 'Prazna_stranica' ),
+	'LinkSearch'                => array( 'Traži_poveznice', 'Traži_linkove' ),
+	'DeletedContributions'      => array( 'Obrisani_doprinosi' ),
 );
 
-$datePreferences = false;
+$magicWords = array(
+	'redirect'              => array( '0', '#PREUSMJERI', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__UKLJUČISADRŽAJ__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__SADRŽAJ__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__BEZURE�IVANJAODLOMAKA__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'TRENUTAÄŒNIMJESEC', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'TRENUTAÄŒNIMJESECIME', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'TRENUTAÄŒNIMJESECIMEGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'TRENUTAÄŒNIMJESECKRAT', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'TRENUTAÄŒNIDAN', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'TRENUTAÄŒNIDAN2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'TRENUTAÄŒNIDANIME', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'TRENUTAÄŒNAGODINA', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'TRENUTAÄŒNOVRIJEME', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'TRENUTAÄŒNISAT', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'MJESNIMJESEC', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'MJESNIMJESECIME', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'MJESNIMJESECIMEGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'MJESNIMJESECKRAT', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'MJESNIDAN', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'MJESNIDAN2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'MJESNIDANIME', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'MJESNAGODINA', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'MJESNOVRIJEME', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'MJESNISAT', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'BROJSTRANICA', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'BROJÄŒLANAKA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'BROJDATOTEKA', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'BROJSURADNIKA', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'BROJURE�IVANJA', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'IMESTRANICE', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'IMESTRANICEE', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'IMENSKIPROSTORE', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'RAZGOVOR', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'RAZGOVORE', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'PROSTORSTRANICE', 'IMPSTRANICE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'PROSTORSTRANICEE', 'IMPSTRANICEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'PUNOIMESTRANICE', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'PUNOIMESTRANICEE', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'IMEPODSTRANICE', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'IMEPODSTRANICEE', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'IMEOSNOVNESTRANICE', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'IMEOSNOVNESTRANICEE', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'IMERAZGOVORASTRANICE', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'IMERAZGOVORASTRANICEE', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'IMEGLAVNESTRANICE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'IMEGLAVNESTRANICEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subst'                 => array( '0', 'ZAMJENA:', 'SUBST:' ),
+	'img_thumbnail'         => array( '1', 'minijatura', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'minijatura=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'desno', 'right' ),
+	'img_left'              => array( '1', 'lijevo', 'left' ),
+	'img_none'              => array( '1', 'ništa', 'none' ),
+	'img_center'            => array( '1', 'središte', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'okvir', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'bezokvira', 'frameless' ),
+	'img_page'              => array( '1', 'stranica=$1', 'stranica $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'uspravno=$1', 'uspravno $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'obrub', 'border' ),
+	'img_baseline'          => array( '1', 'osnovnacrta', 'baseline' ),
+	'img_sub'               => array( '1', 'potpis', 'ind', 'sub' ),
+	'img_super'             => array( '1', 'natpis', 'eks', 'super', 'sup' ),
+	'img_top'               => array( '1', 'vrh', 'top' ),
+	'img_text_top'          => array( '1', 'tekst-vrh', 'text-top' ),
+	'img_middle'            => array( '1', 'pola', 'middle' ),
+	'img_bottom'            => array( '1', 'dno', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'tekst-dno', 'text-bottom' ),
+	'sitename'              => array( '1', 'IMEPROJEKTA', 'SITENAME' ),
+	'ns'                    => array( '0', 'IMP:', 'NS:' ),
+	'localurl'              => array( '0', 'MJESNIURL:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'MJESNIURLE:', 'LOCALURLE:' ),
+	'servername'            => array( '0', 'IMESERVERA', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'PUTANJASKRIPTE', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__BEZPRETVARANJANASLOVA__', '__BPN__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__BEZPRETVARANJASADRŽAJA__', '__BPS__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'TRENUTAÄŒNITJEDAN', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'TRENUTAÄŒNIDANTJEDNA', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'MJESNITJEDAN', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'MJESNIDANTJEDNA', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'IDIZMJENE', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'DANIZMJENE', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'DANIZMJENE2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'MJESECIZMJENE', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'GODINAIZMJENE', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'VREMENSKAOZNAKAIZMJENE', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'MNOŽINA:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'PUNIURL:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'PUNIURLE:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'MSPRVO:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'VSPRVO:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'MS:', 'LC:' ),
+	'uc'                    => array( '0', 'VS:', 'UC:' ),
+	'raw'                   => array( '0', 'NEOBRA�ENO:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'POKAŽINASLOV', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', 'NEO', 'R' ),
+	'newsectionlink'        => array( '1', '__NOVIODLOMAKPOVEZNICA__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'TRENUTAÄŒNAIZMJENA', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'URLKODIRANJE:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'SIDROKODIRANJE', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'TRENUTAÄŒNAOZNAKAVREMENA', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'MJESNAOZNAKAVREMENA', 'LOCALTIMESTAMP' ),
+	'language'              => array( '0', '#JEZIK:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'JEZIKPROJEKTA', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'STRANICEPOPROSTORU:', 'STRANICEUIMP', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'BROJADMINA', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'OBLIKBROJA', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'POSTAVALIJEVO', 'PADLEFT' ),
+	'padright'              => array( '0', 'POSTAVADESNO', 'PADRIGHT' ),
+	'special'               => array( '0', 'posebno', 'special' ),
+	'defaultsort'           => array( '1', 'GLAVNIRASPORED:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'PUTANJADATOTEKE:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'oznaka', 'tag' ),
+	'hiddencat'             => array( '1', '__SKRIVENAKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'STRANICEPOKATEGORIJI', 'STRANICEUKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'VELIÄŒINASTRANICE', 'PAGESIZE' ),
+	'index'                 => array( '1', '__KAZALO__', '__INDEX__' ),
+	'noindex'               => array( '1', '__BEZKAZALA__', '__NOINDEX__' ),
+	'staticredirect'        => array( '1', '__NEPOMIÄŒNOPREUSMJERAVANJE__', '__STATICREDIRECT__' ),
+);
+
+$datePreferences = array(
+	'default',
+	'dmy hr',
+	'mdy',
+	'ymd',
+	'ISO 8601',
+);
 
-$defaultDateFormat = 'dmy';
+$defaultDateFormat = 'dmy hr';
 
 $dateFormats = array(
-	'dmy time' => 'H:i',
-	'dmy date' => 'j. F Y.',
-	'dmy both' => 'H:i, j. F Y.',
+	'dmy hr time' => 'H:i',
+	'dmy hr date' => 'j. F Y.',
+	'dmy hr both' => 'H:i, j. F Y.',
+
+	'mdy time' => 'H:i',
+	'mdy date' => 'F j, Y',
+	'mdy both' => 'H:i, F j, Y',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y F j',
+	'ymd both' => 'H:i, Y F j',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
@@ -102,17 +327,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Sakrij moja uređivanja s popisa praćenja',
 'tog-watchlisthidebots'       => 'Sakrij uređivanja botova s popisa praćenja',
 'tog-watchlisthideminor'      => 'Sakrij manje promjene s popisa praćenja',
+'tog-watchlisthideliu'        => 'Sakrij uređivanja prijavljenih s popisa praćenja',
+'tog-watchlisthideanons'      => 'Sakrij uređivanja neprijavljenih s popisa praćenja',
 'tog-nolangconversion'        => 'Isklju�i pretvaranje pisma (latinica-ćirilica, kineske varijante itd.) ako to wiki podržava',
 'tog-ccmeonemails'            => 'Pošalji mi kopiju e-maila kojeg pošaljem drugim suradnicima',
 'tog-diffonly'                => 'Ne prikazuj sadržaj stranice prilikom usporedbe ina�ica',
 'tog-showhiddencats'          => 'Prikaži skrivene kategorije',
+'tog-norollbackdiff'          => 'Izostavi razliku nakon upotrebe ukloni',
 
 'underline-always'  => 'Uvijek',
 'underline-never'   => 'Nikad',
 'underline-default' => 'Prema postavkama preglednika',
 
-'skinpreview' => '(Pregled)',
-
 # Dates
 'sunday'        => 'nedjelja',
 'monday'        => 'ponedjeljak',
@@ -201,7 +427,7 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 'mytalk'         => 'Moj razgovor',
 'anontalk'       => 'Razgovor za ovu IP adresu',
 'navigation'     => 'Orijentacija',
-'and'            => 'i',
+'and'            => '&#32;i',
 
 # Metadata in edit box
 'metadata_help' => 'Metapodaci:',
@@ -238,14 +464,14 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 'talkpagelinktext'  => 'Razgovor',
 'specialpage'       => 'Posebna stranica',
 'personaltools'     => 'Osobni alati',
-'postcomment'       => 'Napiši komentar',
+'postcomment'       => 'Novi odlomak',
 'articlepage'       => 'Vidi �lanak',
 'talk'              => 'Razgovor',
 'views'             => 'Pogledi',
 'toolbox'           => 'Traka s alatima',
 'userpage'          => 'Vidi suradnikovu stranicu',
 'projectpage'       => 'Vidi stranicu o projektu',
-'imagepage'         => 'Vidi stranicu slike',
+'imagepage'         => 'Vidi stranicu datoteke',
 'mediawikipage'     => 'Vidi stranicu za razgovor',
 'templatepage'      => 'Vidi ovaj predložak',
 'viewhelppage'      => 'Vidi stranicu pomoći',
@@ -264,8 +490,6 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'O projektu {{SITENAME}}',
 'aboutpage'            => 'Project:O_projektu_{{SITENAME}}',
-'bugreports'           => 'Poruke o programskim pogreškama',
-'bugreportspage'       => 'Project:Poruke_o_programskim_pogreškama',
 'copyright'            => 'Sadržaji se koriste u skladu s $1.',
 'copyrightpagename'    => 'Autorska prava na projektu {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Autorska prava',
@@ -288,9 +512,7 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 
 'badaccess'        => 'Pogreška u ovlaštenjima',
 'badaccess-group0' => 'Nije vam dopušteno izvršiti ovaj zahvat.',
-'badaccess-group1' => 'Ovaj zahvat mogu izvršiti samo suradnici iz grupe $1.',
-'badaccess-group2' => 'Ovaj zahvat mogu izvršiti samo suradnici iz jedne od grupa $1.',
-'badaccess-groups' => 'Ovaj zahvat mogu izvršiti samo suradnici iz jedne od grupa $1.',
+'badaccess-groups' => 'Ovaj zahvat mogu izvršiti samo suradnici iz {{PLURAL:$2|skupine|jedne od skupina}}: $1.',
 
 'versionrequired'     => 'Potrebna ina�ica $1 MediaWikija',
 'versionrequiredtext' => 'Za korištenje ove stranice potrebna je ina�ica $1 MediaWiki softvera. Pogledaj [[Special:Version|ina�ice]]',
@@ -304,6 +526,8 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 'editsection'             => 'uredi',
 'editold'                 => 'uredi',
 'viewsourceold'           => 'vidi izvor',
+'editlink'                => 'uredi',
+'viewsourcelink'          => 'vidi izvornik',
 'editsectionhint'         => 'Uređivanje odlomka: $1',
 'toc'                     => 'Sadržaj',
 'showtoc'                 => 'prikaži',
@@ -318,13 +542,13 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 'site-atom-feed'          => '$1 Atom izvor',
 'page-rss-feed'           => '"$1" RSS izvor',
 'page-atom-feed'          => '"$1" Atom izvor',
-'red-link-title'          => '$1 (još nije napisano)',
+'red-link-title'          => '$1 (stranica ne postoji)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ÄŒlanak',
 'nstab-user'      => 'Stranica suradnika',
 'nstab-media'     => 'Mediji',
-'nstab-special'   => 'Posebno',
+'nstab-special'   => 'Posebna stranica',
 'nstab-project'   => 'Stranica o projektu',
 'nstab-image'     => 'Slika',
 'nstab-mediawiki' => 'Poruka',
@@ -334,8 +558,9 @@ i [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Vodi� za suradnike]
 
 # Main script and global functions
 'nosuchaction'      => 'Nema takve naredbe',
-'nosuchactiontext'  => 'Navedeni URL ozna�ava
-nepostojeću naredbu',
+'nosuchactiontext'  => 'Navedeni URL ozna�ava nepostojeću naredbu.
+Možda se pogrešno upisali URL ili slijedili pogrešnu poveznicu.
+Ovo također može ukazivati na grešku u softveru kojeg koristi {{SITENAME}}.',
 'nosuchspecialpage' => 'Posebna stranica ne postoji',
 'nospecialpagetext' => "<big>'''Takva posebna stranica ne postoji.'''</big>
 
@@ -388,7 +613,6 @@ Ako to nije slu�aj, možda se radi o softverskoj grešci. Molimo da u tom slu�
 'cannotdelete'         => 'Ne mogu obrisati navedenu stranicu ili sliku. (Moguće da je već obrisana.)',
 'badtitle'             => 'Loš naslov',
 'badtitletext'         => 'Navedeni naslov stranice nepravilan ili loše formirana interwiki poveznica.',
-'perfdisabled'         => 'Ova mogućnost je privremeno isklju�ena jer usporava bazu podataka do mjere koja svima onemogućava korištenje wikija.',
 'perfcached'           => 'Sljedeći podaci su iz međuspremnika i možda nisu najsvježiji:',
 'perfcachedts'         => 'Sljedeći podaci su iz međuspremnika i zadnji puta su ažurirani u $1.',
 'querypage-no-updates' => 'Osvježavanje ove stranice je trenuta�no onemogućeno. Nove promjene neće biti vidljive.',
@@ -402,7 +626,7 @@ Upit: $2',
 'protectedpagetext'    => 'Ova stranica je zaklju�ana da bi se onemogućile izmjene.',
 'viewsourcetext'       => 'Možete pogledati i kopirati izvorni sadržaj ove stranice:',
 'protectedinterface'   => 'Ova stranica je zaštićena od izmjena jer sadrži tekst MediaWiki softvera.',
-'editinginterface'     => "'''Upozorenje:''' Uređujete stranicu koja se rabi za prikaz teksta u su�elju softvera. Promjene u�injene na ovoj stranici će se odraziti na izgled korisni�kog su�elja kod drugih suradnika. Za prijevod, razmotrite korištenje [http://translatewiki.net/wiki/Main_Page?setlang=hr Betawiki], projekta lokalizacije MedijeWiki.",
+'editinginterface'     => "'''Upozorenje:''' Uređujete stranicu koja se rabi za prikaz teksta u su�elju softvera. Promjene u�injene na ovoj stranici će se odraziti na izgled korisni�kog su�elja kod drugih suradnika. Za prijevod, razmotrite korištenje [http://translatewiki.net/wiki/Main_Page?setlang=hr translatewiki.net], projekta lokalizacije MedijeWiki.",
 'sqlhidden'            => '(SQL upit sakriven)',
 'cascadeprotected'     => 'Ova je stranica zaklju�ana za uređivanja jer je uklju�ena u {{PLURAL:$1|slijedeću stranicu|slijedeće stranice}}, koje su zaštićene "prenosivom zaštitom":
 $2',
@@ -412,7 +636,7 @@ $2',
 'titleprotected'       => "Ovaj naslov je od kreiranja zaštitio suradnik [[User:$1|$1]], uz razlog: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Loša konfiguracija: nepoznati skener za viruse: <i>$1</i>',
+'virus-badscanner'     => "Loša konfiguracija: nepoznati skener za viruse: ''$1''",
 'virus-scanfailed'     => 'skeniranje neuspješno (kod $1)',
 'virus-unknownscanner' => 'nepoznati antivirus:',
 
@@ -433,7 +657,6 @@ Ne zaboravite prilagoditi [[Special:Preferences|{{SITENAME}} postavke]].',
 'remembermypassword'         => 'Trajno zapamti moju lozinku.',
 'yourdomainname'             => 'Vaša domena',
 'externaldberror'            => 'Došlo je do pogreške s vanjskom autorizacijom ili vam nije dopušteno osvježavanje vanjskog suradni�kog ra�una.',
-'loginproblem'               => '<b>Došlo je do pogreške s vašom prijavom.</b><br />Pokušajte iznova!',
 'login'                      => 'Prijavi se',
 'nav-login-createaccount'    => 'Prijavi se',
 'loginprompt'                => 'Za prijavu na sustav {{SITENAME}} morate u pregledniku uklju�iti kola�iće (cookies).',
@@ -459,7 +682,8 @@ Unesite neko drugo ime.',
 'yourvariant'                => 'Ina�ica:',
 'yournick'                   => 'Vaš nadimak (za potpisivanje)',
 'badsig'                     => 'Kôd vašeg potpisa nije valjan; provjerite HTML tagove.',
-'badsiglength'               => 'Suradni�ki potpis je preduga�ak. Mora imati manje od $1 {{PLURAL:$1|znaka|znakova}}.',
+'badsiglength'               => 'Vaš potpis je preduga�ak. 
+Mora imati manje od $1 {{PLURAL:$1|znaka|znakova}}.',
 'email'                      => 'Adresa elektroni�ke pošte *',
 'prefs-help-realname'        => '* Pravo ime (nije obvezno): za pravnu atribuciju vaših doprinosa.',
 'loginerror'                 => 'Pogreška u prijavi',
@@ -471,7 +695,9 @@ Možete omogućiti drugima da vas kontaktiraju na suradni�koj stranici ili stra
 'noname'                     => 'Niste unijeli valjano suradni�ko ime.',
 'loginsuccesstitle'          => 'Prijava uspješna',
 'loginsuccess'               => 'Prijavili ste se na wiki kao "$1".',
-'nosuchuser'                 => 'Ne postoji suradnik s imenom "$1". Provjerite jeste li to�no utipkali, ili [[Special:UserLogin/signup|otvorite novi suradni�ki ra�un]].',
+'nosuchuser'                 => 'Ne postoji suradnik s imenom "$1". 
+Suradni�ka imena su osjetljiva na veli�inu slova.
+Provjerite jeste li to�no upisali, ili [[Special:UserLogin/signup|otvorite novi suradni�ki ra�un]].',
 'nosuchusershort'            => 'Ne postoji suradnik s imenom "<nowiki>$1</nowiki>". Provjerite vaš unos.',
 'nouserspecified'            => 'Molimo navedite suradni�ko ime.',
 'wrongpassword'              => 'Lozinka koju ste unijeli nije ispravna. Pokušajte ponovno.',
@@ -495,11 +721,12 @@ molimo vas da otvorite e-mail i slijedite u njemu sadržana uputstva.',
 'throttled-mailpassword'     => 'Već Vam je poslan e-mail za promjenu lozinke, u {{PLURAL:$1|zadnjih sat vremena|zadnja $1 sata|zadnjih $1 sati}}.
 Da bi sprije�ili zloupotrebu, moguće je poslati samo jedan e-mail za promjenu lozinke {{PLURAL:$1|svakih sat vremena|svaka $1 sata|svakih $1 sati}}.',
 'mailerror'                  => 'Pogreška pri slanju e-maila: $1',
-'acct_creation_throttle_hit' => 'Nažalost, ne možete otvoriti nove suradni�ke ra�une. Već ste otvorili $1.',
-'emailauthenticated'         => 'Vaša e-mail adresa je ovjerena $1.',
+'acct_creation_throttle_hit' => 'Posjetioci ovom wikiju koji koriste vašu IP adresu napravili su {{PLURAL:$1|1 ra�un|$1 ra�una}} posljednjeg dana, što je najveći dozvoljeni broj u ovom vremenskom periodu.
+Zbog ovoga, posjetioci koji koriste ovu IP adresu ne mogu trenuta�no otvorite nove suradni�ke ra�une.',
+'emailauthenticated'         => 'Vaša e-mail adresa je ovjerena $2 u $3.',
 'emailnotauthenticated'      => 'Vaša e-mail adresa još nije ovjerena.
 Ne možemo poslati e-mail ni u jednoj od sljedećih naredbi.',
-'noemailprefs'               => '<strong>Nije navedena e-mail adresa</strong>, stoga sljedeće naredbe neće raditi.',
+'noemailprefs'               => 'Nije navedena e-mail adresa, stoga sljedeće naredbe neće raditi.',
 'emailconfirmlink'           => 'Potvrdite svoju e-mail adresu',
 'invalidemailaddress'        => 'Ne mogu prihvatiti e-mail adresu jer nije valjano oblikovana.
 Molim unesite ispravno oblikovanu adresu ili ostavite polje praznim.',
@@ -509,17 +736,25 @@ Molim unesite ispravno oblikovanu adresu ili ostavite polje praznim.',
 'createaccount-text'         => 'Netko je stvorio suradni�ki ra�un s vašom adresom elektronske pošte na {{SITENAME}} ($4) nazvan "$2", s lozinkom "$3". Trebali biste se prijaviti i odmah promijeniti lozinku.
 
 Možete zanemariti ovu poruku, ako je suradni�ki ra�un stvoren nenamjerno.',
+'login-throttled'            => 'Nedavno ste napravili previše pokušaja s lozinkom ovog ra�una. Molimo vas pri�ekajte prije sljedećeg pokušaja.',
 'loginlanguagelabel'         => 'Jezik: $1',
 
 # Password reset dialog
-'resetpass'               => 'Postavi novu lozinku',
-'resetpass_announce'      => 'Prijavljeni ste s privremenom lozinkom. Da završite proces mijenjanja lozinke, upišite ovdje novu lozinku:',
-'resetpass_header'        => 'Promijeni lozinku ra�una',
-'resetpass_submit'        => 'Postavite lozinku i prijavite se',
-'resetpass_success'       => 'Lozinka uspješno postavljena! Prijava u tijeku...',
-'resetpass_bad_temporary' => 'Nevažeća privremena lozinka. Možda ste već uspješno promijenili svoju lozinku ili ste zatražili novu privremenu lozinku.',
-'resetpass_forbidden'     => 'Lozinka ne može biti promijenjena',
-'resetpass_missing'       => 'Forma ne sadrži tražene podatke.',
+'resetpass'                 => 'Promijeni lozinku',
+'resetpass_announce'        => 'Prijavljeni ste s privremenom lozinkom. Da završite proces mijenjanja lozinke, upišite ovdje novu lozinku:',
+'resetpass_header'          => 'Promijeni lozinku ra�una',
+'oldpassword'               => 'Stara lozinka',
+'newpassword'               => 'Nova lozinka',
+'retypenew'                 => 'Ponovno unesite lozinku',
+'resetpass_submit'          => 'Postavite lozinku i prijavite se',
+'resetpass_success'         => 'Lozinka uspješno postavljena! Prijava u tijeku...',
+'resetpass_bad_temporary'   => 'Nevažeća privremena lozinka. Možda ste već uspješno promijenili svoju lozinku ili ste zatražili novu privremenu lozinku.',
+'resetpass_forbidden'       => 'Lozinka ne može biti promijenjena',
+'resetpass-no-info'         => 'Morate biti prijavljeni da biste izravno pristupili ovoj stranici.',
+'resetpass-submit-loggedin' => 'Promijeni lozinku',
+'resetpass-wrong-oldpass'   => 'Pogrešna privremena ili trenuta�na lozinka. 
+Možda ste već uspješno promijenili vašu lozinku ili ste zatražili novu privremenu lozinku.',
+'resetpass-temp-password'   => 'Privremena lozinka:',
 
 # Edit page toolbar
 'bold_sample'     => 'Podebljani tekst',
@@ -544,8 +779,8 @@ Možete zanemariti ovu poruku, ako je suradni�ki ra�un stvoren nenamjerno.',
 'hr_tip'          => 'Vodoravna crta (koristiti rijetko)',
 
 # Edit pages
-'summary'                          => 'Sažetak',
-'subject'                          => 'Predmet',
+'summary'                          => 'Sažetak:',
+'subject'                          => 'Predmet:',
 'minoredit'                        => 'Ovo je manja promjena',
 'watchthis'                        => 'Prati ovaj �lanak',
 'savearticle'                      => 'Sa�uvaj stranicu',
@@ -557,8 +792,8 @@ Možete zanemariti ovu poruku, ako je suradni�ki ra�un stvoren nenamjerno.',
 'missingsummary'                   => "'''Napomena:''' Niste unijeli sažetak promjena. Ako ponovno kliknete na 'Sa�uvaj', vaše će promjene biti snimljene bez sažetka.",
 'missingcommenttext'               => 'Molim unesite sažetak.',
 'missingcommentheader'             => "'''Upozorenje:''' Niste napisali sažetak ovog predmeta. Ako ponovno kliknete \"Sa�uvaj stranicu\", vaš će predmet biti snimljen bez sažetka.",
-'summary-preview'                  => 'Pregled sažetka',
-'subject-preview'                  => 'Pregled predmeta',
+'summary-preview'                  => 'Pregled sažetka:',
+'subject-preview'                  => 'Pregled predmeta:',
 'blockedtitle'                     => 'Suradnik je blokiran',
 'blockedtext'                      => '<big>\'\'\'Vaše suradni�ko ime ili IP adresa je blokirana\'\'\'</big>
 
@@ -608,55 +843,60 @@ Vaša trenuta�na IP adresa je $3, a oznaka bloka #$5. Molimo navedite ovaj broj
 *Ako vam treba pomoć, idite na [[{{MediaWiki:Helppage}}|stranicu za pomoć]].
 *Ako ste ovamo dospjeli slu�ajno, kliknite "Natrag" (Back) u svom programu.',
 'anontalkpagetext'                 => "----''Ovo je stranica za razgovor s neprijavljenim suradnikom koji nije otvorio suradni�ki ra�un ili se njime ne koristi. Zbog toga se moramo služiti broj�anom IP adresom kako bismo ga identificirali. Takvu adresu �esto koristi više ljudi. Ako ste neprijavljeni suradnik i smatrate da su vam upućeni irelevantni komentari, molimo vas da [[Special:UserLogin|otvorite suradni�ki ra�un ili se prijavite]] te tako u budućnosti izbjegnete zamjenu s drugim neprijavljenim suradnicima.''",
-'noarticletext'                    => 'Na ovoj stranici trenuta�no nema sadržaja, možete [[Special:Search/{{PAGENAME}}|potražiti ovaj naslov]] u drugim stranicama ili [{{fullurl:{{FULLPAGENAME}}|action=edit}} urediti ovu stranicu].',
+'noarticletext'                    => 'Na ovoj stranici trenuta�no nema sadržaja.
+Možete [[Special:Search/{{PAGENAME}}|potražiti ovaj naslov]] na drugim stranicama,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} pretražiti povezane evidencije]
+ili [{{fullurl:{{FULLPAGENAME}}|action=edit}} urediti ovu stranicu]</span>.',
 'userpage-userdoesnotexist'        => 'Suradni�ko ime "$1" nije prijavljeno. Jeste li sigurni da želite stvoriti/uređivati ovu stranicu?',
 'clearyourcache'                   => "'''Napomena:''' Nakon snimanja trebate o�istiti međuspremnik svog preglednika kako biste vidjeli promjene.
 '''Mozilla / Firefox / Safari:''' držite ''Shift'' i pritisnite ''Reload'', ili pritisnite ''Ctrl-F5'' ili ''Ctrl-R'' (''Cmd-R'' na Apple Macu); '''Konqueror:''' samo pritisnite dugme ''Reload'' ili pritisnite ''F5''; '''Opera:''' o�istiti cache u ''Tools → Preferences;'' '''Internet Explorer:''' držite ''Ctrl'' i pritisnite ''Refresh'', ili pritisnite ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Savjet:</strong> Koristite dugme 'Pokaži kako će izgledati' za testiranje svog CSS/JS prije snimanja.",
+'usercssjsyoucanpreview'           => "'''Savjet:''' Koristite dugme 'Pokaži kako će izgledati' za testiranje svog CSS/JS prije snimanja.",
 'usercsspreview'                   => "'''Ne zaboravite: samo isprobavate/pregledavate svoj suradni�ki CSS. Još nije snimljen!'''",
 'userjspreview'                    => "'''Ne zaboravite: samo isprobavate/pregledavate svoj suradni�ki JavaScript, i da još nije snimljen!'''",
 'userinvalidcssjstitle'            => "'''Upozorenje:''' Nema su�elja pod imenom \"\$1\". Ne zaboravite da imena stranica s .css and .js kodom po�inju malim slovom, npr. {{ns:user}}:Mate/monobook.css, a ne {{ns:user}}:Mate/Monobook.css.",
 'updated'                          => '(Ažurirano)',
-'note'                             => '<strong>Napomena:</strong>',
-'previewnote'                      => '<strong>Ne zaboravite da je ovo samo pregled kako će stranica izgledati i da stranica još nije snimljena!</strong>',
+'note'                             => "'''Napomena:'''",
+'previewnote'                      => "'''Ne zaboravite da je ovo samo pregled kako će stranica izgledati i da stranica još nije snimljena!'''",
 'previewconflict'                  => 'Ovaj pregled odražava stanje u gornjem polju za unos koje će biti sa�uvano
 ako pritisnete "Sa�uvaj stranicu".',
-'session_fail_preview'             => '<strong>Ispri�avamo se! Nismo mogli obraditi vašu izmjenu zbog gubitka podataka o prijavi.
-Molimo pokušajte ponovno. Ako i dalje ne bude radilo, pokušajte se odjaviti i ponovno prijaviti.</strong>',
-'session_fail_preview_html'        => "<strong>Oprostite! Pretpregled nije moguć jer je ''session'' istekao.</strong>
+'session_fail_preview'             => "'''Ispri�avamo se! Nismo mogli obraditi vašu izmjenu zbog gubitka podataka o prijavi.
+Molimo pokušajte ponovno. Ako i dalje ne bude radilo, pokušajte se odjaviti i ponovno prijaviti.'''",
+'session_fail_preview_html'        => "'''Oprostite! Pretpregled nije moguć jer je ''session'' istekao.'''
 
 ''Budući da je na ovom wikiju ({{SITENAME}}) omogućen unos HTML oznaka (tagova), pretpregled je skriven kao mjera predstrožnosti protiv napada pomoću JavaScripta.''
 
-<strong>Ukoliko ste pokušali vidjeti kako stranica izgleda, molimo probajte opet. Ako ne uspije, [[Special:UserLogout|odjavite se]] i prijavite se ponovo.</strong>",
-'token_suffix_mismatch'            => '<strong>Vaše uređivanje je odba�eno jer je vaš web preglednik ubacio znak/znakove interpunkcije u token uređivanja.
+'''Ukoliko ste pokušali vidjeti kako stranica izgleda, molimo probajte opet. Ako ne uspije, [[Special:UserLogout|odjavite se]] i prijavite se ponovo.'''",
+'token_suffix_mismatch'            => "'''Vaše uređivanje je odba�eno jer je vaš web preglednik ubacio znak/znakove interpunkcije u token uređivanja.
 Stoga je uređivanje odba�eno da se sprije�i uništavanje stranice.
-To se događa ponekad kad rabite neispravan web-baziran anonimni proxy.</strong>',
+To se događa ponekad kad rabite neispravan web-baziran anonimni proxy.'''",
 'editing'                          => 'Uređujete $1',
 'editingsection'                   => 'Uređujete $1 (odlomak)',
-'editingcomment'                   => 'Uređujete $1 (komentar)',
+'editingcomment'                   => 'Uređujete $1 (novi odlomak)',
 'editconflict'                     => 'Istovremeno uređivanje: $1',
 'explainconflict'                  => 'Netko je u međuvremenu promijenio stranicu. Gornje polje sadrži sadašnji tekst stranice.
 U donjem polju prikazane su vaše promjene. Morat ćete unijeti vaše promjene u sadašnji tekst. <b>Samo</b> će tekst
 u u gornjem polju biti sa�uvan kad pritisnete "Snimi stranicu".',
 'yourtext'                         => 'Vaš tekst',
 'storedversion'                    => 'Pohranjena ina�ica',
-'nonunicodebrowser'                => '<strong>UPOZORENJE: Vaš preglednik ne podržava Unicode zapis znakova, molimo promijenite ga prije sljedećeg uređivanja �lanaka.</strong>',
-'editingold'                       => '<strong>UPOZORENJE: Uređujete stariju ina�icu
-ove stranice. Ako je sa�uvate, sve će promjene u�injene nakon ove ina�ice biti izgubljene.</strong>',
+'nonunicodebrowser'                => "'''UPOZORENJE: Vaš preglednik ne podržava Unicode zapis znakova, molimo promijenite ga prije sljedećeg uređivanja �lanaka.'''",
+'editingold'                       => "'''UPOZORENJE: Uređujete stariju ina�icu
+ove stranice. Ako je sa�uvate, sve će promjene u�injene nakon ove ina�ice biti izgubljene.'''",
 'yourdiff'                         => 'Razlike',
-'copyrightwarning'                 => 'Molimo uo�ite da se svi doprinosi {{SITENAME}} smatraju objavljenima pod uvjetima $2 (vidi $1 za detalje). Ako ne želite da se vaše pisanje nemilosrdno uređuje i slobodno raspa�ava, nemojte ga ovamo slati. <br />
+'copyrightwarning'                 => "Molimo uo�ite da se svi doprinosi {{SITENAME}} smatraju objavljenima pod uvjetima $2 (vidi $1 za detalje). Ako ne želite da se vaše pisanje nemilosrdno uređuje i slobodno raspa�ava, nemojte ga ovamo slati. <br />
 Također nam obećavate da ste ovo sami napisali, ili da ste to prepisali iz ne�eg što je u javnom vlasništvu ili pod sli�nom slobodnom licencijom.<br />
-<strong>NE POSTAVLJAJTE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOPUŠTENJA!</strong>',
-'copyrightwarning2'                => 'Svi doprinosi {{SITENAME}} mogu biti mijenjani od strane svih suradnika. Ako ne želite da se vaše pisanje nemilosrdno uređuje, nemojte ga slati ovdje.<br /> Također nam obećavate da ste ovo sami napisali, ili da ste to prepisali iz ne�eg što je u javnom vlasništvu ili pod sli�nom slobodnom licencijom (vidi $1 za detalje). <strong>NE STAVLJAJTE ZAŠTIĆENE RADOVE BEZ DOPUŠTENJA!</strong>',
+'''NE POSTAVLJAJTE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOPUŠTENJA!'''",
+'copyrightwarning2'                => "Svi doprinosi {{SITENAME}} mogu biti mijenjani od strane svih suradnika. Ako ne želite da se vaše pisanje nemilosrdno uređuje, nemojte ga slati ovdje.<br /> Također nam obećavate da ste ovo sami napisali, ili da ste to prepisali iz ne�eg što je u javnom vlasništvu ili pod sli�nom slobodnom licencijom (vidi $1 za detalje). '''NE STAVLJAJTE ZAŠTIĆENE RADOVE BEZ DOPUŠTENJA!'''",
 'longpagewarning'                  => 'PAŽNJA: Ova stranica je duga�ka $1 kilobajta; neki bi preglednici mogli imati problema pri uređivanju stranica koje se približavaju ili su duže od 32 kb.
 Molimo razmislite o rastavljanju stranice na manje odjeljke.',
-'longpageerror'                    => '<strong>POGRJEŠKA: Tekst koji ste unijeli dug je $1 kilobajta, što je više od maksimalnih $2 kilobajta. Nije ga moguće snimiti.</strong>',
-'readonlywarning'                  => '<strong>UPOZORENJE: Baza podataka je zaklju�ana zbog održavanja, pa trenuta�no ne možete sa�uvati svoje
-promjene. Najbolje je da kopirate i zaljepite tekst u tekstualnu datoteku te je snimite za kasnije.</strong>',
-'protectedpagewarning'             => '<strong>UPOZORENJE: ova stranica je zaklju�ana i mogu je uređivati samo suradnici s administratorskim pravima.</strong>',
+'longpageerror'                    => "'''POGRJEŠKA: Tekst koji ste unijeli dug je $1 kilobajta, što je više od maksimalnih $2 kilobajta. Nije ga moguće snimiti.'''",
+'readonlywarning'                  => "'''UPOZORENJE: Baza podataka je zaklju�ana zbog održavanja, pa trenuta�no ne možete sa�uvati svoje
+promjene. Najbolje je da kopirate i zaljepite tekst u tekstualnu datoteku te je snimite za kasnije.'''
+
+Administrator je zaklju�ao bazu iz razloga: $1",
+'protectedpagewarning'             => "'''UPOZORENJE: ova stranica je zaklju�ana i mogu je uređivati samo suradnici s administratorskim pravima.'''",
 'semiprotectedpagewarning'         => "'''Napomena:''' Ovu stranicu mogu uređivati samo prijavljeni suradnici.",
 'cascadeprotectedwarning'          => "'''UPOZORENJE:''' Ova stranica je zaklju�ana i mogu je uređivati samo suradnici s administratorskim pravima, jer je uklju�ena u {{PLURAL:\$1|slijedeću stranicu|slijedeće stranice}} koje su zaštićene \"prenosivom\" zaštitom:",
-'titleprotectedwarning'            => '<strong>UPOZORENJE:  Ova stranica je zaklju�ana i samo je neki suradnici mogu stvoriti.</strong>',
+'titleprotectedwarning'            => "'''UPOZORENJE:  Ova stranica je zaklju�ana i samo je suradnici sa [[Special:ListGroupRights|slijedećim pravima]] mogu stvoriti.'''",
 'templatesused'                    => 'Predlošci korišteni na ovoj stranici:',
 'templatesusedpreview'             => 'Predlošci koji se koriste u ovom predpregledu:',
 'templatesusedsection'             => 'Predlošci koji se koriste u odjeljku:',
@@ -674,6 +914,17 @@ Možete se vratiti i uređivati već postojeće stranice ili se [[Special:UserLo
 
 Razmotrite je li nastavljanje uređivanja ove stranice u skladu s pravilima.
 Za vašu informaciju slijedi evidencija brisanja s obrazloženjem za prethodno brisanje:",
+'deleted-notice'                   => 'Ova stranica je bila izbrisana.
+Evidencija brisanja za ovu stranicu je pokazana niže.',
+'deletelog-fulllog'                => 'Vidi potpunu evidenciju',
+'edit-hook-aborted'                => 'Uređivanje prekinuto kukom.
+Razlog nije ponuđen.',
+'edit-gone-missing'                => 'Stranica nije spremljena.
+ÄŒini se kako je obrisana.',
+'edit-conflict'                    => 'Sukob uređivanja.',
+'edit-no-change'                   => 'Vaše uređivanje je zanemareno, jer nikakva promjena sadržaja nije napravljena.',
+'edit-already-exists'              => 'Neuspješno stvaranje nove stranice.
+Stranica već postoji.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Upozorenje: Ova stranica sadrži previše opterećujućih poziva parserskih funkcija
@@ -685,6 +936,8 @@ Neki predlošci neće biti uklju�eni.',
 'post-expand-template-inclusion-category' => 'Stranice gdje su uklju�eni predlošci preveliki',
 'post-expand-template-argument-warning'   => 'Upozorenje: Ova stranica sadrži najmanje jedan argument predložaka koji ima preveliko proširenje. Ovi su argumenti izostavljeni.',
 'post-expand-template-argument-category'  => 'Stranice koje sadrže izostavljene argumente za predloške',
+'parser-template-loop-warning'            => 'Otkrivena petlja predloška: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Dubina rekurzije predloška je izvan granice ($1)',
 
 # "Undo" feature
 'undo-success' => 'Izmjena je uklonjena (tekst u okviru ispod ne sadrži zadnju izmjenu). Molim sa�uvajte stranicu (provjerite sažetak).',
@@ -699,29 +952,28 @@ Neki predlošci neće biti uklju�eni.',
 Razlog koji je dao/la $3 je ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vidi evidencije za ovu stranicu',
-'nohistory'           => 'Ova stranica nema starijih izmjena.',
-'revnotfound'         => 'Stara izmjena nije nađena.',
-'revnotfoundtext'     => 'Ne mogu pronaći staru izmjenu stranice koju ste zatražili.
-Molimo provjerite URL koji vas je doveo ovamo.',
-'currentrev'          => 'Trenuta�na ina�ica',
-'revisionasof'        => 'Ina�ica od $1',
-'revision-info'       => 'Ina�ica od $1 koju je unio/unijela $2',
-'previousrevision'    => '�Starija ina�ica',
-'nextrevision'        => 'Novija ina�ica→',
-'currentrevisionlink' => 'vidi trenuta�nu ina�icu',
-'cur'                 => 'sad',
-'next'                => 'sljed',
-'last'                => 'pret',
-'page_first'          => 'prva',
-'page_last'           => 'zadnja',
-'histlegend'          => 'Uputa: (sad) = razlika od trenuta�ne ina�ice,
+'viewpagelogs'           => 'Vidi evidencije za ovu stranicu',
+'nohistory'              => 'Ova stranica nema starijih izmjena.',
+'currentrev'             => 'Trenuta�na ina�ica',
+'currentrev-asof'        => 'Trenuta�na izmjena od $1',
+'revisionasof'           => 'Ina�ica od $1',
+'revision-info'          => 'Ina�ica od $1 koju je unio/unijela $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Starija ina�ica',
+'nextrevision'           => 'Novija ina�ica→',
+'currentrevisionlink'    => 'vidi trenuta�nu ina�icu',
+'cur'                    => 'sad',
+'next'                   => 'sljed',
+'last'                   => 'pret',
+'page_first'             => 'prva',
+'page_last'              => 'zadnja',
+'histlegend'             => 'Uputa: (sad) = razlika od trenuta�ne ina�ice,
 (pret) = razlika od prethodne ina�ice, m = manja promjena',
-'deletedrev'          => '[izbrisano]',
-'histfirst'           => 'Najstarije',
-'histlast'            => 'Najnovije',
-'historysize'         => '({{PLURAL:$1|$1 bajt|$1 bajta|$1 bajtova}})',
-'historyempty'        => '(prazna stranica)',
+'history-fieldset-title' => 'Pretraži povijest',
+'deletedrev'             => '[izbrisano]',
+'histfirst'              => 'Najstarije',
+'histlast'               => 'Najnovije',
+'historysize'            => '({{PLURAL:$1|$1 bajt|$1 bajta|$1 bajtova}})',
+'historyempty'           => '(prazna stranica)',
 
 # Revision feed
 'history-feed-title'          => 'Povijest promjena',
@@ -811,6 +1063,7 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'mergehistory-invalid-destination' => 'Ciljna stranica mora imati valjani naziv.',
 'mergehistory-autocomment'         => 'Stranica [[:$1]] je spojena u [[:$2]]',
 'mergehistory-comment'             => 'Stranica [[:$1]] je spojena u [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Izvorna i ciljana stranica ne mogu biti iste',
 
 # Merge log
 'mergelog'           => 'Evidencija spajanja povijesti stranica',
@@ -823,119 +1076,200 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'difference'              => '(Usporedba među ina�icama)',
 'lineno'                  => 'Redak $1:',
 'compareselectedversions' => 'Usporedi odabrane ina�ice',
+'visualcomparison'        => 'Prikazivanje razlike',
+'wikicodecomparison'      => 'Wikitekst usporedba',
 'editundo'                => 'ukloni ovu izmjenu',
 'diff-multi'              => '({{PLURAL:$1|Nije prikazana jedna međuina�ica|Nisu prikazane $1 međuina�ice|Nije prikazano $1 međuina�ica}})',
+'diff-movedto'            => 'dodano: $1',
+'diff-styleadded'         => 'dodano oblikovanje $1',
+'diff-added'              => 'dodano $1',
+'diff-changedto'          => 'promijenjeno u: $1',
+'diff-movedoutof'         => 'uklonjeno: $1',
+'diff-styleremoved'       => 'uklonjeno oblikovanje $1',
+'diff-removed'            => 'uklonjeno $1',
+'diff-changedfrom'        => 'promijenjeno iz: $1',
+'diff-src'                => 'izvor',
+'diff-withdestination'    => 's ciljem $1',
+'diff-with'               => '&#32;sa $1 $2',
+'diff-with-final'         => '&#32;i $1 $2',
+'diff-width'              => 'Å¡irina',
+'diff-height'             => 'visina',
+'diff-p'                  => "'''paragraf'''",
+'diff-blockquote'         => "'''quote'''",
+'diff-h1'                 => "'''naslov (razina 1)'''",
+'diff-h2'                 => "'''naslov (razina 2)'''",
+'diff-h3'                 => "'''naslov (razina 3)'''",
+'diff-h4'                 => "'''naslov (razina 4)'''",
+'diff-h5'                 => "'''naslov (razina 5)'''",
+'diff-pre'                => "'''predformatirani blok'''",
+'diff-div'                => "'''odjeljak'''",
+'diff-ul'                 => "'''neuređeni popis'''",
+'diff-ol'                 => "'''uređeni popis'''",
+'diff-li'                 => "'''popis'''",
+'diff-table'              => "'''tablica'''",
+'diff-tbody'              => "'''sadržaj tablice'''",
+'diff-tr'                 => "'''red'''",
+'diff-td'                 => "'''polje'''",
+'diff-th'                 => "'''naslov'''",
+'diff-br'                 => "'''prekid'''",
+'diff-hr'                 => "'''vodoravna crta'''",
+'diff-code'               => "'''ra�unalni kod'''",
+'diff-dl'                 => "'''popis definicija'''",
+'diff-dt'                 => "'''pojam definicije'''",
+'diff-dd'                 => "'''zna�enje'''",
+'diff-input'              => "'''input'''",
+'diff-form'               => "'''form'''",
+'diff-img'                => "'''slika'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''poveznica'''",
+'diff-i'                  => "'''kosa slova'''",
+'diff-b'                  => "'''masna slova'''",
+'diff-strong'             => "'''strong'''",
+'diff-em'                 => "'''isticanje'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''velika slova'''",
+'diff-del'                => "'''obrisano'''",
+'diff-tt'                 => "'''jednaka Å¡irina'''",
+'diff-sub'                => "'''potpis'''",
+'diff-sup'                => "'''natpis'''",
+'diff-strike'             => "'''precrtano'''",
 
 # Search results
-'searchresults'             => 'Rezultati pretrage',
-'searchresulttext'          => 'Za više obavijesti o pretraživanju projekta {{SITENAME}} vidi [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Tražili ste \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sve stranice koje po�inju sa "$1"]] | [[Special:WhatLinksHere/$1|sve stranice koje povezuju na "$1"]])',
-'searchsubtitleinvalid'     => 'Za upit "$1"',
-'noexactmatch'              => "'''Ne postoji stranica naziva \"\$1\".''' Možete [[:\$1|kreirati tu stranicu]].",
-'noexactmatch-nocreate'     => "'''Nema stranice s imenom: \"\$1\".'''",
-'toomanymatches'            => 'Preveliki broj rezultata, molimo probajte druk�iji upit',
-'titlematches'              => 'Pronađene stranice prema naslovu',
-'notitlematches'            => 'Nema pronađenih stranica prema naslovu',
-'textmatches'               => 'Pronađene stranice prema tekstu �lanka',
-'notextmatches'             => 'Nema pronađenih stranica prema tekstu �lanka',
-'prevn'                     => 'prethodnih $1',
-'nextn'                     => 'sljedećih $1',
-'viewprevnext'              => 'Vidi ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 rije�|$2 rije�i}})',
-'search-result-score'       => 'Povezanost: $1%',
-'search-redirect'           => '(preusmjeravanje $1)',
-'search-section'            => '(odlomak $1)',
-'search-suggest'            => 'Mislili ste: $1',
-'search-interwiki-caption'  => 'Sestrinski projekti',
-'search-interwiki-default'  => '$1 rezultati:',
-'search-interwiki-more'     => '(više)',
-'search-mwsuggest-enabled'  => 's prijedlozima',
-'search-mwsuggest-disabled' => 'nema prijedloga',
-'search-relatedarticle'     => 'Povezano',
-'mwsuggest-disable'         => 'Isklju�i AJAX prijedloge',
-'searchrelated'             => 'povezano',
-'searchall'                 => 'sve',
-'showingresults'            => "Dolje {{PLURAL:$1|je prikazan '''$1''' rezultat|su prikazana '''$1''' rezultata|je prikazano '''$1''' rezultata}}, po�evši od '''$2'''.",
-'showingresultsnum'         => "Dolje {{PLURAL:$3|je prikazan '''$3''' rezultat|su prikazana '''$3''' rezultata|je prikazano '''$3''' rezultata}}, po�evši s brojem '''$2'''.",
-'showingresultstotal'       => "Rezultati pretraživanja {{PLURAL:$3| '''$1''' od '''$3'''| '''$1 - $2''' od '''$3'''}}",
-'nonefound'                 => '<b>Napomena</b>: pretrage su neuspješne ako tražite �este rije�i koje ne indeksiramo, ili u upitu navedete previše pojmova (u rezultatu se pojavlju samo stranice koje sadrže sve tražene pojmove).',
-'powersearch'               => 'Traženje',
-'powersearch-legend'        => 'Napredno pretraživanje',
-'powersearch-ns'            => 'Traži u imenskom prostoru:',
-'powersearch-redir'         => 'Prikaži preusmjerenja',
-'powersearch-field'         => 'Traži za',
-'search-external'           => 'Vanjski pretraživa�',
-'searchdisabled'            => '<p>Oprostite! Pretraga po cjelokupnoj bazi je zbog bržeg rada projekta {{SITENAME}} trenuta�no onemogućena. Možete se poslužiti tražilicom Google.</p>',
+'searchresults'                    => 'Rezultati pretrage',
+'searchresults-title'              => 'Rezultati traženja za "$1"',
+'searchresulttext'                 => 'Za više obavijesti o pretraživanju projekta {{SITENAME}} vidi [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Tražili ste \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sve stranice koje po�inju sa "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|sve stranice koje povezuju na "$1"]])',
+'searchsubtitleinvalid'            => 'Za upit "$1"',
+'noexactmatch'                     => "'''Ne postoji stranica naziva \"\$1\".''' Možete [[:\$1|kreirati tu stranicu]].",
+'noexactmatch-nocreate'            => "'''Nema stranice s imenom: \"\$1\".'''",
+'toomanymatches'                   => 'Preveliki broj rezultata, molimo probajte druk�iji upit',
+'titlematches'                     => 'Pronađene stranice prema naslovu',
+'notitlematches'                   => 'Nema pronađenih stranica prema naslovu',
+'textmatches'                      => 'Pronađene stranice prema tekstu �lanka',
+'notextmatches'                    => 'Nema pronađenih stranica prema tekstu �lanka',
+'prevn'                            => 'prethodnih $1',
+'nextn'                            => 'sljedećih $1',
+'viewprevnext'                     => 'Vidi ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Mogućnosti pretraživanja',
+'searchmenu-exists'                => "* Stranica '''[[$1]]'''",
+'searchmenu-new'                   => "'''Stvori stranicu \"[[:\$1]]\" na ovoj wiki!'''",
+'searchhelp-url'                   => 'Help:Pomoć',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Pretraži stranice s ovim prefiksom]]',
+'searchprofile-articles'           => 'Stranice sa sadržajem',
+'searchprofile-articles-and-proj'  => 'Stranice projekta i sa sadržajem',
+'searchprofile-project'            => 'Stranice projekta',
+'searchprofile-images'             => 'Datoteke',
+'searchprofile-everything'         => 'Sve',
+'searchprofile-advanced'           => 'Napredno',
+'searchprofile-articles-tooltip'   => 'Traži u $1',
+'searchprofile-project-tooltip'    => 'Traži u $1',
+'searchprofile-images-tooltip'     => 'Traži datoteke',
+'searchprofile-everything-tooltip' => 'Pretraži sav sadržaj (uklju�ujući i stranice za razgovor)',
+'searchprofile-advanced-tooltip'   => 'Traži u korisni�kom imenskom prostoru',
+'prefs-search-nsdefault'           => 'Pretraži koristeći zadano:',
+'prefs-search-nscustom'            => 'Pretraži korisni�ke imenske prostore:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 rije�|$2 rije�i}})',
+'search-result-score'              => 'Povezanost: $1%',
+'search-redirect'                  => '(preusmjeravanje $1)',
+'search-section'                   => '(odlomak $1)',
+'search-suggest'                   => 'Mislili ste: $1',
+'search-interwiki-caption'         => 'Sestrinski projekti',
+'search-interwiki-default'         => '$1 rezultati:',
+'search-interwiki-more'            => '(više)',
+'search-mwsuggest-enabled'         => 's prijedlozima',
+'search-mwsuggest-disabled'        => 'nema prijedloga',
+'search-relatedarticle'            => 'Povezano',
+'mwsuggest-disable'                => 'Isklju�i AJAX prijedloge',
+'searchrelated'                    => 'povezano',
+'searchall'                        => 'sve',
+'showingresults'                   => "Dolje {{PLURAL:$1|je prikazan '''$1''' rezultat|su prikazana '''$1''' rezultata|je prikazano '''$1''' rezultata}}, po�evši od '''$2'''.",
+'showingresultsnum'                => "Dolje {{PLURAL:$3|je prikazan '''$3''' rezultat|su prikazana '''$3''' rezultata|je prikazano '''$3''' rezultata}}, po�evši s brojem '''$2'''.",
+'showingresultstotal'              => "Rezultati pretraživanja {{PLURAL:$4| '''$1''' od '''$3'''| '''$1 - $2''' od '''$3'''}}",
+'nonefound'                        => "'''Napomena''': Glavne postavke pretražuju samo određene imenske prostore. Ako želite pretraživati sve, dodajte prefiks '''all:''' ispred traženog sadržaja (ovo uklju�uje stranice za razgovor, predloške i sl.), ili koristite prefiks željenog imenskog prostora.",
+'search-nonefound'                 => 'Ne postoje rezultati koji se podudaraju s upitom.',
+'powersearch'                      => 'Traženje',
+'powersearch-legend'               => 'Napredno pretraživanje',
+'powersearch-ns'                   => 'Traži u imenskom prostoru:',
+'powersearch-redir'                => 'Prikaži preusmjerenja',
+'powersearch-field'                => 'Traži za',
+'search-external'                  => 'Vanjski pretraživa�',
+'searchdisabled'                   => '<p>Oprostite! Pretraga po cjelokupnoj bazi je zbog bržeg rada projekta {{SITENAME}} trenuta�no onemogućena. Možete se poslužiti tražilicom Google.</p>',
 
 # Preferences page
-'preferences'              => 'Postavke',
-'mypreferences'            => 'Moje postavke',
-'prefs-edits'              => 'Broj vaših uređivanja:',
-'prefsnologin'             => 'Niste prijavljeni',
-'prefsnologintext'         => 'Morate biti <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} prijavljeni]</span> za podešavanje suradni�kih postavki.',
-'prefsreset'               => 'Postavke su vraćene na prvotne vrijednosti.',
-'qbsettings'               => 'Traka',
-'qbsettings-none'          => 'Bez',
-'qbsettings-fixedleft'     => 'Lijevo nepomi�no',
-'qbsettings-fixedright'    => 'Desno nepomi�no',
-'qbsettings-floatingleft'  => 'Lijevo leteće',
-'qbsettings-floatingright' => 'Desno leteće',
-'changepassword'           => 'Promjena lozinke',
-'skin'                     => 'Izgled',
-'math'                     => 'Prikaz matemati�kih formula',
-'dateformat'               => 'Format datuma',
-'datedefault'              => 'Nemoj postaviti',
-'datetime'                 => 'Datum i vrijeme',
-'math_failure'             => 'Obrada nije uspjela.',
-'math_unknown_error'       => 'nepoznata pogreška',
-'math_unknown_function'    => 'nepoznata funkcija',
-'math_lexing_error'        => 'rje�ni�ka pogreška (lexing error)',
-'math_syntax_error'        => 'sintaksna pogreška',
-'math_image_error'         => 'Konverzija u PNG nije uspjela; provjerite jesu li dobro instalirani latex, dvips, gs, i convert',
-'math_bad_tmpdir'          => 'Ne mogu otvoriti ili pisati u privremeni direktorij za matematiku',
-'math_bad_output'          => 'Ne mogu otvoriti ili pisati u odredišni direktorij za matematiku',
-'math_notexvc'             => 'Nedostaje izvršna datoteka texvc-a; pogledajte math/README za postavke.',
-'prefs-personal'           => 'Podaci o suradniku',
-'prefs-rc'                 => 'Nedavne promjene i kratki �lanci',
-'prefs-watchlist'          => 'Praćene stranice',
-'prefs-watchlist-days'     => 'Broj dana koji će se prikazati na popisu praćenja:',
-'prefs-watchlist-edits'    => 'Broj uređivanja koji će se prikazati na proširenom popisu praćenja:',
-'prefs-misc'               => 'Razno',
-'saveprefs'                => 'Spremi',
-'resetprefs'               => 'Vrati na prvotne postavke',
-'oldpassword'              => 'Stara lozinka',
-'newpassword'              => 'Nova lozinka',
-'retypenew'                => 'Ponovno unesite lozinku',
-'textboxsize'              => 'Širina okvira za uređivanje',
-'rows'                     => 'Redova',
-'columns'                  => 'Stupaca',
-'searchresultshead'        => 'Prikaz rezultata pretrage',
-'resultsperpage'           => 'Koliko pogodaka na jednoj stranici',
-'contextlines'             => 'Koliko redova teksta po pogotku',
-'contextchars'             => 'Koliko znakova po retku',
-'stub-threshold'           => 'Prag za formatiranje poput <a href="#" class="stub">poveznice mrve</a>:',
-'recentchangesdays'        => 'Broj dana prikazanih u nedavnim promjenama:',
-'recentchangescount'       => 'Broj naslova u nedavnim izmjenama',
-'savedprefs'               => 'Vaše postavke su sa�uvane.',
-'timezonelegend'           => 'Vremenska zona',
-'timezonetext'             => 'Unesite razliku između vašeg lokalnog vremena i vremena na poslužitelju (UTC).',
-'localtime'                => 'Lokalno vrijeme',
-'timezoneoffset'           => 'Razlika',
-'servertime'               => 'Vrijeme na poslužitelju',
-'guesstimezone'            => 'Vrijeme dobiveno od preglednika',
-'allowemail'               => 'Omogući primanje e-maila od drugih suradnika',
-'prefs-searchoptions'      => 'Na�in traženja',
-'prefs-namespaces'         => 'Imenski prostori',
-'defaultns'                => 'Ako ne navedem druga�ije, traži u ovim prostorima:',
-'default'                  => 'prvotno',
-'files'                    => 'Datoteke',
+'preferences'               => 'Postavke',
+'mypreferences'             => 'Moje postavke',
+'prefs-edits'               => 'Broj vaših uređivanja:',
+'prefsnologin'              => 'Niste prijavljeni',
+'prefsnologintext'          => 'Morate biti <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} prijavljeni]</span> za podešavanje suradni�kih postavki.',
+'prefsreset'                => 'Postavke su vraćene na prvotne vrijednosti.',
+'qbsettings'                => 'Traka',
+'qbsettings-none'           => 'Bez',
+'qbsettings-fixedleft'      => 'Lijevo nepomi�no',
+'qbsettings-fixedright'     => 'Desno nepomi�no',
+'qbsettings-floatingleft'   => 'Lijevo leteće',
+'qbsettings-floatingright'  => 'Desno leteće',
+'changepassword'            => 'Promjena lozinke',
+'skin'                      => 'Izgled',
+'skin-preview'              => 'Pregled',
+'math'                      => 'Prikaz matemati�kih formula',
+'dateformat'                => 'Format datuma',
+'datedefault'               => 'Nemoj postaviti',
+'datetime'                  => 'Datum i vrijeme',
+'math_failure'              => 'Obrada nije uspjela.',
+'math_unknown_error'        => 'nepoznata pogreška',
+'math_unknown_function'     => 'nepoznata funkcija',
+'math_lexing_error'         => 'rje�ni�ka pogreška (lexing error)',
+'math_syntax_error'         => 'sintaksna pogreška',
+'math_image_error'          => 'Konverzija u PNG nije uspjela; provjerite jesu li dobro instalirani latex, dvips, gs, i convert',
+'math_bad_tmpdir'           => 'Ne mogu otvoriti ili pisati u privremeni direktorij za matematiku',
+'math_bad_output'           => 'Ne mogu otvoriti ili pisati u odredišni direktorij za matematiku',
+'math_notexvc'              => 'Nedostaje izvršna datoteka texvc-a; pogledajte math/README za postavke.',
+'prefs-personal'            => 'Podaci o suradniku',
+'prefs-rc'                  => 'Nedavne promjene i kratki �lanci',
+'prefs-watchlist'           => 'Praćene stranice',
+'prefs-watchlist-days'      => 'Broj dana koji će se prikazati na popisu praćenja:',
+'prefs-watchlist-days-max'  => '(maksimalno 7 dana)',
+'prefs-watchlist-edits'     => 'Broj uređivanja koji će se prikazati na proširenom popisu praćenja:',
+'prefs-watchlist-edits-max' => '(maksimalni broj: 1000)',
+'prefs-misc'                => 'Razno',
+'prefs-resetpass'           => 'Promijeni lozinku',
+'saveprefs'                 => 'Spremi',
+'resetprefs'                => 'Vrati na prvotne postavke',
+'textboxsize'               => 'Širina okvira za uređivanje',
+'prefs-edit-boxsize'        => 'Veli�ina prozora za uređivanje.',
+'rows'                      => 'Redova',
+'columns'                   => 'Stupaca',
+'searchresultshead'         => 'Prikaz rezultata pretrage',
+'resultsperpage'            => 'Koliko pogodaka na jednoj stranici',
+'contextlines'              => 'Koliko redova teksta po pogotku',
+'contextchars'              => 'Koliko znakova po retku',
+'stub-threshold'            => 'Prag za formatiranje poput <a href="#" class="stub">poveznice mrve</a>:',
+'recentchangesdays'         => 'Broj dana prikazanih u nedavnim promjenama:',
+'recentchangesdays-max'     => '(maksimalno $1 {{PLURAL:$1|dan|dana}})',
+'recentchangescount'        => 'Broj izmjena za prikaz u nedavnim promjenama, povijesti stranice, i u evidencijama, po glavnom:',
+'savedprefs'                => 'Vaše postavke su sa�uvane.',
+'timezonelegend'            => 'Vremenska zona',
+'timezonetext'              => 'Unesite razliku između vašeg lokalnog vremena i vremena na poslužitelju (UTC).',
+'localtime'                 => 'Lokalno vrijeme:',
+'timezoneselect'            => 'Vremenska zona:',
+'timezoneuseserverdefault'  => 'Koristi vrijeme na poslužitelji',
+'timezoneuseoffset'         => 'Drugo (odredite razliku)',
+'timezoneoffset'            => 'Razlika¹:',
+'servertime'                => 'Vrijeme na poslužitelju:',
+'guesstimezone'             => 'Vrijeme dobiveno od preglednika',
+'allowemail'                => 'Omogući primanje e-maila od drugih suradnika',
+'prefs-searchoptions'       => 'Na�in traženja',
+'prefs-namespaces'          => 'Imenski prostori',
+'defaultns'                 => 'Ako ne navedem druga�ije, traži u ovim prostorima:',
+'default'                   => 'prvotno',
+'files'                     => 'Datoteke',
 
 # User rights
 'userrights'                  => 'Upravljanje suradni�kim pravima', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Upravljaj suradni�kim skupinama',
 'userrights-user-editname'    => 'Unesite suradni�ko ime:',
 'editusergroup'               => 'Uredi suradni�ke skupine',
-'editinguser'                 => "Promjena suradni�kih prava za suradnika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Promjena suradni�kih prava za suradnika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Uredi suradni�ke skupine',
 'saveusergroups'              => 'Snimi suradni�ke skupine',
 'userrights-groupsmember'     => 'ÄŒlan:',
@@ -984,6 +1318,8 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'right-minoredit'            => 'Ozna�avanje izmjene manjom',
 'right-move'                 => 'Premještanje stranica',
 'right-move-subpages'        => 'Premještanje stranica s njihovim podstranicama',
+'right-move-rootuserpages'   => 'Premještanje osnovne stranice suradnika',
+'right-movefile'             => 'Premještanje datoteka',
 'right-suppressredirect'     => 'Ne radi preusmjeravanje od starog imena prilikom premještanja stranice',
 'right-upload'               => 'Postavljanje datoteka',
 'right-reupload'             => 'Postavljanje nove ina�ice datoteke',
@@ -1021,7 +1357,7 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'right-patrol'               => 'Ozna�avanje izmjena pregledanim',
 'right-autopatrol'           => 'Izmjene su automatski ozna�ene kao pregledane',
 'right-patrolmarks'          => 'Vidljive oznake pregledavanja u nedavnim promjenama',
-'right-unwatchedpages'       => 'Vidljiv popis negledanih stranica',
+'right-unwatchedpages'       => 'Vidljiv popis nepraćenih stranica',
 'right-trackback'            => 'Podnijeti trackback',
 'right-mergehistory'         => 'Spajanje povijesti stranica',
 'right-userrights'           => 'Uređivanje svih suradni�kih prava',
@@ -1034,9 +1370,46 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'rightslogentry' => 'promijenjena suradni�ka prava za $1 iz $2 u $3',
 'rightsnone'     => '(suradnik)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '�itanje ove stranice',
+'action-edit'                 => 'uređivanje ove stranice',
+'action-createpage'           => 'stvaranje stranica',
+'action-createtalk'           => 'stvaranje stranica za razgovor',
+'action-createaccount'        => 'stvaranje ovog suradni�kog ra�una',
+'action-minoredit'            => 'ozna�avanje ove izmjene kao manju',
+'action-move'                 => 'premještanje ove stranice',
+'action-move-subpages'        => 'premještanje ove stranice, i njenih podstranica',
+'action-move-rootuserpages'   => 'premještanje osnovne stranice suradnika',
+'action-movefile'             => 'premjesti ovu datoteku',
+'action-upload'               => 'postavljanje ove datoteke',
+'action-reupload'             => 'postavljanje nove ina�ice ove datoteke',
+'action-reupload-shared'      => 'postavljanje nove ina�ice ove datoteke na zajedni�kom poslužitelju',
+'action-upload_by_url'        => 'postavljanje ove datoteke preko URL adrese',
+'action-writeapi'             => 'za korištenje pisanja API',
+'action-delete'               => 'brisanje ove stranice',
+'action-deleterevision'       => 'brisanje ove izmjene',
+'action-deletedhistory'       => 'gledanje obrisane povijesti ove stranice',
+'action-browsearchive'        => 'pretraživanje izbrisanih stranica',
+'action-undelete'             => 'vraćanje ove stranice',
+'action-suppressrevision'     => 'pregledavanje i vraćanje ove sakrivene izmjene',
+'action-suppressionlog'       => 'gledanje ove privatne evidencije',
+'action-block'                => 'blokiranje ovog suradnika',
+'action-protect'              => 'promjenu stupnja zaštite ove stranice',
+'action-import'               => 'uvoženje ove stranice s drugog wikija',
+'action-importupload'         => 'uvoženje ove stranice postavljanjem datoteke',
+'action-patrol'               => 'ozna�avanje tuđih izmjena pregledanim',
+'action-autopatrol'           => 'automatsko ozna�avanje pregledanim za svoje izmjene',
+'action-unwatchedpages'       => 'gledanje popisa stranica koje nisu praćene',
+'action-trackback'            => 'podnošenje povratne informacije',
+'action-mergehistory'         => 'spajanje povijesti ove stranice',
+'action-userrights'           => 'uređivanje svih suradni�kih prava',
+'action-userrights-interwiki' => 'uređivanje suradni�kih prava suradnika na drugim wikijima',
+'action-siteadmin'            => 'zaklju�avanje ili otklju�avanje baze podataka',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|$1 promjena|$1 promjene|$1 promjena}}',
 'recentchanges'                     => 'Nedavne promjene',
+'recentchanges-legend'              => 'Izbornik nedavnih promjena',
 'recentchangestext'                 => 'Na ovoj stranici možete pratiti nedavne promjene u wikiju.',
 'recentchanges-feed-description'    => 'Na ovoj stranici možete pratiti nedavne promjene u wikiju.',
 'rcnote'                            => "{{PLURAL:$1|Slijedi zadnja '''$1''' promjena|Slijede zadnje '''$1''' promjene|Slijedi zadnjih '''$1''' promjena}} u {{PLURAL:$2|zadnjem '''$2''' danu|zadnja '''$2''' dana|zadnjih '''$2''' dana}}, od $5, $4.",
@@ -1060,6 +1433,8 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'rc_categories'                     => 'Ograni�i na kategorije (odvojene znakom  "|")',
 'rc_categories_any'                 => 'Sve',
 'newsectionsummary'                 => '/* $1 */ Novi odlomak',
+'rc-enhanced-expand'                => 'Pokaži detalje (potreban JavaScript)',
+'rc-enhanced-hide'                  => 'Sakrij detalje',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Povezane stranice',
@@ -1080,11 +1455,11 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'upload_directory_read_only'  => 'Server ne može pisati u direktorij za postavljanje ($1).',
 'uploaderror'                 => 'Pogreška kod postavljanja',
 'uploadtext'                  => "Ovaj obrazac služi za postavljanje slika. 
-Za pregledavanje i pretraživanje već postavljenih slika vidi [[Special:ImageList|popis postavljenih datoteka]]. Postavljanja i brisanja bilježe se i u [[Special:Log|evidenciji]].
+Za pregledavanje i pretraživanje već postavljenih slika vidi [[Special:FileList|popis postavljenih datoteka]]. Postavljanja i brisanja bilježe se i u [[Special:Log|evidenciji]].
 
 Da biste na stranicu stavili sliku, koristite poveznice tipa
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Datoteka.jpg]]</nowiki></tt>''' za punu verziju datoteke
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Datoteka.png|200px|thumb|left|tekst]]</nowiki></tt>''' za datoteku Å¡irine 200 px u okviru s popratnim tekstom
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Datoteka.jpg]]</nowiki></tt>''' za punu verziju datoteke
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Datoteka.png|200px|mini|left|tekst]]</nowiki></tt>''' za datoteku Å¡irine 200 px u okviru s popratnim tekstom
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Datoteka.ogg]]</nowiki></tt>''' za direktno povezivanje na datoteku bez njenog pokazivanja",
 'upload-permitted'            => 'Dopušteni tipovi datoteka: $1.',
 'upload-preferred'            => 'Poželjni tipovi datoteka: $1.',
@@ -1111,23 +1486,25 @@ Da biste na stranicu stavili sliku, koristite poveznice tipa
 'large-file'                  => 'Preporu�ljivo je da datoteke ne prelaze $1; Ova datoteka je $2.',
 'largefileserver'             => 'Veli�ina ove datoteke veća je od one dopuštene postavkama poslužitelja.',
 'emptyfile'                   => 'Datoteka koju ste postavili je prazna. Možda se radi o krivo utipkanom imenu datoteke. Provjerite želite li zaista postaviti ovu datoteku.',
-'fileexists'                  => 'Datoteka s ovim imenom već postoji, pogledajte <strong><tt>$1</tt></strong> ako niste sigurni želite li je uistinu promijeniti.',
-'filepageexists'              => 'Stranica s opisom za ovu datoteku je već napravljena na <strong><tt>$1</tt></strong>, ali trenuta�no ne postoji datoteka s ovim imenom. Sažetak koji unesete se neće pojaviti na stranici s opisom. Kako bi se sažetak pojavio, morate ru�no urediti stranicu.',
-'fileexists-extension'        => 'Već postoji datoteka sa sli�nim imenom:<br />
-Ime datoteke koju postavljate: <strong><tt>$1</tt></strong><br />
-Ime postojeće datoteke: <strong><tt>$2</tt></strong><br />
-Molimo da izaberete drugo ime.',
+'fileexists'                  => "Datoteka s ovim imenom već postoji, pogledajte '''<tt>$1</tt>''' ako niste sigurni želite li je uistinu promijeniti.",
+'filepageexists'              => "Stranica s opisom za ovu datoteku je već napravljena na '''<tt>$1</tt>''', ali trenuta�no ne postoji datoteka s ovim imenom. Sažetak koji unesete se neće pojaviti na stranici s opisom. Kako bi se sažetak pojavio, morate ru�no urediti stranicu.",
+'fileexists-extension'        => "Već postoji datoteka sa sli�nim imenom:<br />
+Ime datoteke koju postavljate: '''<tt>$1</tt>'''<br />
+Ime postojeće datoteke: '''<tt>$2</tt>'''<br />
+Molimo da izaberete drugo ime.",
 'fileexists-thumb'            => "<center>'''Postojeća slika'''</center>",
-'fileexists-thumbnail-yes'    => 'Datoteka je najvjerojatnije slika u smanjenoj veli�ini <i>(thumbnail)</i>. Molimo provjerite datoteku <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Datoteka je najvjerojatnije slika u smanjenoj veli�ini ''(thumbnail)''. Molimo provjerite datoteku '''<tt>$1</tt>'''.<br />
 Ukoliko je ta datoteka ista kao i ova koju ste upravo pokušali snimiti, samo u višoj rezoluciji, nije nužno snimanje smanjenje slike<br />
-<i>(thumbnaila)</i>, prikazivanje smanjene slike iz izvornika radi se softverski.',
-'file-thumbnail-no'           => 'Ime datoteke po�inje s <strong><tt>$1</tt></strong>.
-Čini se da je to slika smanjene veli�ine <i>(minijatura)</i>.
-Ukoliko imate ovu sliku u punoj razlu�ljivosti (rezoluciji) postavite tu sliku, u protivnom, molimo promijenite ime datoteke.',
-'fileexists-forbidden'        => 'Datoteka s ovim imenom već postoji; molim postavite ju pod drugim imenom. [[Image:$1|thumb|center|$1]]',
+''(thumbnaila)'', prikazivanje smanjene slike iz izvornika radi se softverski.",
+'file-thumbnail-no'           => "Ime datoteke po�inje s '''<tt>$1</tt>'''.
+Čini se da je to slika smanjene veli�ine ''(minijatura)''.
+Ukoliko imate ovu sliku u punoj razlu�ljivosti (rezoluciji) postavite tu sliku, u protivnom, molimo promijenite ime datoteke.",
+'fileexists-forbidden'        => 'Datoteka s ovim imenom već postoji i nemože biti presnimljena.
+Ako i dalje želite postaviti svoju datoteku, molimo vratite se i odaberite novo ime. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Datoteka s ovim imenom već postoji u središnjem poslužitelju datoteka. 
-Ako još uvijek želite postaviti svoju datoteku, idite nazad i postavite ju pod drugim imenom. [[Image:$1|thumb|center|$1]]',
+Ako još uvijek želite postaviti svoju datoteku, idite nazad i postavite ju pod drugim imenom. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ova datoteka je duplikat {{PLURAL:$1|sljedeće datoteke|sljedećih datoteka}}:',
+'file-deleted-duplicate'      => 'Datoteka istovjetna ovoj datoteci ([[$1]]) prethodno je obrisana. Provjerite evidenciju brisanja za tu datoteke datoteku prije nego Å¡to nastavite s ponovnim postavljanjem.',
 'successfulupload'            => 'Postavljanje uspješno.',
 'uploadwarning'               => 'Upozorenje kod postavljanja',
 'savefile'                    => 'Sa�uvaj datoteku',
@@ -1147,7 +1524,7 @@ Ako još uvijek želite postaviti svoju datoteku, idite nazad i postavite ju pod
 
 Razmislite je li prigodno nastaviti s postavljanjem ove datoteke.
 Slijedi evidencija brisanja ove datoteke s obrazloženjem prethodnog brisanja:",
-'filename-bad-prefix'         => 'Ime datoteke koju snimate po�inje s <strong>"$1"</strong>, što je ime koje slikama tipi�no dodjeljuju digitalni fotoaparati. Molimo izaberite bolje ime (neko koje bolje opisuje sliku nego $1).',
+'filename-bad-prefix'         => "Ime datoteke koju snimate po�inje s '''\"\$1\"''', što je ime koje slikama tipi�no dodjeljuju digitalni fotoaparati. Molimo izaberite bolje ime (neko koje bolje opisuje sliku nego \$1).",
 
 'upload-proto-error'      => 'Protokol nije valjan',
 'upload-proto-error-text' => 'Udaljeno snimanje zahtijeva URL-ove koji po�inju sa <code>http://</code> ili <code>ftp://</code>.',
@@ -1170,20 +1547,21 @@ Ukoliko se problem ponovi, javite to [[Special:ListUsers/sysop|administratoru]].
 'upload_source_url'  => ' (valjani, javno dostupni URL)',
 'upload_source_file' => ' (datoteka na vašem ra�unalu)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ova posebna stranica pokazuje sve postavljene datoteke.
+# Special:ListFiles
+'listfiles-summary'     => 'Ova posebna stranica pokazuje sve postavljene datoteke.
 Na vrhu popisa se nalaze najnovije postavljene datoteke.
 Poredak datoteka mijenja se pritiskom na naslov stupca.',
-'imagelist_search_for'  => 'Traži ime slike:',
+'listfiles_search_for'  => 'Traži ime slike:',
 'imgfile'               => 'datoteka',
-'imagelist'             => 'Popis slika',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Naziv slike',
-'imagelist_user'        => 'Suradnik',
-'imagelist_size'        => 'Veli�ina (u bajtovima)',
-'imagelist_description' => 'Opis',
-
-# Image description page
+'listfiles'             => 'Popis slika',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Naziv slike',
+'listfiles_user'        => 'Suradnik',
+'listfiles_size'        => 'Veli�ina (u bajtovima)',
+'listfiles_description' => 'Opis',
+'listfiles_count'       => 'Ina�ice',
+
+# File description page
 'filehist'                       => 'Povijest datoteke',
 'filehist-help'                  => 'Kliknite na datum/vrijeme kako biste vidjeli datoteku kakva je tada bila.',
 'filehist-deleteall'             => 'izbriši sve',
@@ -1191,16 +1569,22 @@ Poredak datoteka mijenja se pritiskom na naslov stupca.',
 'filehist-revert'                => 'vrati',
 'filehist-current'               => 'sadašnja',
 'filehist-datetime'              => 'Datum/Vrijeme',
+'filehist-thumb'                 => 'Minijatura',
+'filehist-thumbtext'             => 'Minijatura za ina�icu od $1',
+'filehist-nothumb'               => 'Nema minijature',
 'filehist-user'                  => 'Suradnik',
 'filehist-dimensions'            => 'Dimenzije',
 'filehist-filesize'              => 'Veli�ina datoteke',
 'filehist-comment'               => 'Komentar',
-'imagelinks'                     => 'Poveznice slike',
-'linkstoimage'                   => '{{PLURAL:$1|Sljedeća stranica povezuje|$1 Sljedeće stranice povezuju}} na ovu datoteku:',
+'imagelinks'                     => 'Poveznice datoteke',
+'linkstoimage'                   => '{{PLURAL:$1|Sljedeća stranica povezuje|$1 sljedećih stranice povezuju}} na ovu datoteku:',
+'linkstoimage-more'              => 'Više od $1 {{PLURAL:$1|stranice povezuje|stranica povezuje}} na ovu datoteku.
+Slijedeći popis prikazuje {{PLURAL:$1|stranice koje|prvih $1 stranica koje}} vode na ovu datoteku.
+[[Special:WhatLinksHere/$2|Ovdje se nalazi]] potpuni popis.',
 'nolinkstoimage'                 => 'Nijedna stranica ne povezuje na ovu sliku.',
 'morelinkstoimage'               => 'Pogledaj [[Special:WhatLinksHere/$1|više poveznica]] za ovu datoteku.',
 'redirectstofile'                => '{{PLURAL:$1|Sljedeća datoteka preusmjerava|$1 Sljedeće datoteke preusmjeravaju}} na ovu datoteku:',
-'duplicatesoffile'               => '{{PLURAL:$1|Sljedeća datoteka je kopija|$1 Sljedeće datoteke su kopije}} ove datoteke:',
+'duplicatesoffile'               => '{{PLURAL:$1|Sljedeća datoteka je kopija|$1 sljedeće datoteke su kopije|$1 sljedećih datoteka su kopije}} ove datoteke ([[Special:FileDuplicateSearch/$2|više detalja]]):',
 'sharedupload'                   => 'Ova je datoteka postavljena na zajedni�kom poslužitelju i mogu je koristiti ostali wikiji',
 'shareduploadwiki'               => 'Za podrobnije informacije vidi $1.',
 'shareduploadwiki-desc'          => 'Opis datoteke $1 na zajedni�kom poslužitelju je prikazan ispod',
@@ -1227,7 +1611,7 @@ Poredak datoteka mijenja se pritiskom na naslov stupca.',
 # File deletion
 'filedelete'                  => 'Izbriši $1',
 'filedelete-legend'           => 'Izbriši datoteku',
-'filedelete-intro'            => "Brišete datoteku '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Brišete datoteku '''[[Media:$1|$1]]''' uklju�ujući i sve njezine stare izmjene.",
 'filedelete-intro-old'        => "Brišete ina�icu '''[[Media:$1|$1]]''' od [$4 $3, $2].",
 'filedelete-comment'          => 'Komentar:',
 'filedelete-submit'           => 'Izbriši',
@@ -1235,7 +1619,6 @@ Poredak datoteka mijenja se pritiskom na naslov stupca.',
 'filedelete-success-old'      => "Ina�ica datoteke '''[[Media:$1|$1]]''' od $3, $2 je obrisana.",
 'filedelete-nofile'           => "'''$1''' ne postoji.",
 'filedelete-nofile-old'       => "Nema arhivirane verzije datoteke '''$1''' s zadanim parametrima.",
-'filedelete-iscurrent'        => 'Pokušavate obrisati najnoviju ina�icu ove datoteke. Molimo vas da prije toga vratite na stariju ina�icu.',
 'filedelete-otherreason'      => 'Drugi/dodatni razlog:',
 'filedelete-reason-otherlist' => 'Drugi razlog',
 'filedelete-reason-dropdown'  => '*ÄŒesti razlozi brisanja
@@ -1251,7 +1634,7 @@ Poredak datoteka mijenja se pritiskom na naslov stupca.',
 'download'           => 'skidanje',
 
 # Unwatched pages
-'unwatchedpages' => 'Nenadgledane stranice',
+'unwatchedpages' => 'Nepraćene stranice',
 
 # List redirects
 'listredirects' => 'Popis preusmjeravanja',
@@ -1263,31 +1646,31 @@ Poredak datoteka mijenja se pritiskom na naslov stupca.',
 
 # Random page
 'randompage'         => 'Slu�ajna stranica',
-'randompage-nopages' => 'Nema stranica u ovom imenskom prostoru.',
+'randompage-nopages' => 'Nema stranica u imenskom prostoru "$1".',
 
 # Random redirect
 'randomredirect'         => 'Slu�ajno preusmjeravanje',
-'randomredirect-nopages' => 'Nema preusmjeravanja u ovom imenskom prostoru.',
+'randomredirect-nopages' => 'Nema preusmjeravanja u imenskom prostoru "$1".',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => 'Statistika ovog wikija',
-'userstats'              => 'Statistika suradnika',
-'sitestatstext'          => "U bazi podataka ukupno {{PLURAL:$1|je '''$1''' �lanak|su '''$1''' �lanka|je '''$1''' �lanaka}}.
-Ovaj broj uklju�uje stranice za raspravu, stranice o projektu u prostoru {{SITENAME}}, kratke �lanke,
-preusmjerene stranice, i sve ostale �lanke koje najvjerojatnije ne možemo ra�unati kao sadržaj.
-
-Trenuta�no je '''$2''' �lanaka koji predstavljaju valjan sadržaj (nalaze se u glavnom prostoru i sadrže
-barem jednu unutarnju poveznicu).
-
-Snimljeno je '''$8''' datoteka.
-
-Ukupno je '''$3''' pregleda stranica, i '''$4''' uređivanja �lanaka od pokretanja projekta {{SITENAME}}.
-U prosjeku to iznosi '''$5''' uređivanja po stranici, i '''$6''' pregleda po uređivanju.
-
-Duljina [http://www.mediawiki.org/wiki/Manual:Job_queue zadataka za izvršavanje] je '''$7'''.",
-'userstatstext'          => "Broj prijavljenih [[Special:ListUsers|suradnika]] je '''$1'''. Od toga {{PLURAL:$2|je '''$2''' (ili '''$4%''') administrator|su '''$2''' (ili '''$4%''') administratora|su '''$2''' (ili '''$4%''') administratori}}, tj. imaju $5 prava.",
-'statistics-mostpopular' => 'Najposjećenije stranice',
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Statistika stranica',
+'statistics-header-edits'      => 'Statistika uređivanja',
+'statistics-header-views'      => 'Statistika posjećivanja',
+'statistics-header-users'      => 'Statistika suradnika',
+'statistics-articles'          => 'Stranice sa sadržajem',
+'statistics-pages'             => 'Stranice',
+'statistics-pages-desc'        => 'Sve stranice na wikiju, uklju�ujući stranice za razgovor, preusmjeravanja i dr.',
+'statistics-files'             => 'Postavljene datoteke',
+'statistics-edits'             => 'Broj uređivanja od nastanka projekta {{SITENAME}}',
+'statistics-edits-average'     => 'Prosje�an broj uređivanja po stranici',
+'statistics-views-total'       => 'Posjeta ukupno',
+'statistics-views-peredit'     => 'Posjeta po uređivanju',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Red poslova]',
+'statistics-users'             => 'Prijavljeni [[Special:ListUsers|suradnici]]',
+'statistics-users-active'      => 'Aktivni suradnici',
+'statistics-users-active-desc' => 'Suradnici koji su napravili neku od radnji u posljednjih {{PLURAL:$1|dan|$1 dana}}',
+'statistics-mostpopular'       => 'Najposjećenije stranice',
 
 'disambiguations'      => 'Razdvojbene stranice',
 'disambiguationspage'  => 'Template:Razdvojba',
@@ -1303,7 +1686,7 @@ koja obi�no ukazuje na "pravu" odredišnu stranicu, na koju bi trebalo pokaziva
 'double-redirect-fixer'      => 'Popravlja� preusmjeravanja',
 
 'brokenredirects'        => 'Kriva preusmjeravanja',
-'brokenredirectstext'    => 'Sljedeća preusmjeravanja pokazuju na nepostojeće �lanke.',
+'brokenredirectstext'    => 'Sljedeća preusmjeravanja povezuju na nepostojeće stranice:',
 'brokenredirects-edit'   => '(uredi)',
 'brokenredirects-delete' => '(izbriši)',
 
@@ -1333,26 +1716,30 @@ koja obi�no ukazuje na "pravu" odredišnu stranicu, na koju bi trebalo pokaziva
 'popularpages'            => 'Popularne stranice',
 'wantedcategories'        => 'Tražene kategorije',
 'wantedpages'             => 'Tražene stranice',
-'missingfiles'            => 'Datoteke koje nedostaju',
+'wantedfiles'             => 'Tražene datoteke',
+'wantedtemplates'         => 'Traženi predlošci',
 'mostlinked'              => 'Stranice na koje vodi najviše poveznica',
 'mostlinkedcategories'    => 'Kategorije na koje vodi najviše poveznica',
 'mostlinkedtemplates'     => 'Predlošci na koje vodi najviše poveznica',
 'mostcategories'          => 'Popis �lanaka po broju kategorija',
 'mostimages'              => 'Slike na koje vodi najviše poveznica',
 'mostrevisions'           => 'Popis �lanaka po broju uređivanja',
-'prefixindex'             => 'Kazalo prema po�etku naslova',
+'prefixindex'             => 'Sve stranice prema po�etku naslova',
 'shortpages'              => 'Kratke stranice',
 'longpages'               => 'Duge stranice',
 'deadendpages'            => 'Slijepe ulice',
 'deadendpagestext'        => 'Slijedeće stranice nemaju poveznice na druge stranice na ovom wikiju ({{SITENAME}}).',
 'protectedpages'          => 'Zaštićene stranice',
 'protectedpages-indef'    => 'Samo neograni�ene zaštite',
+'protectedpages-cascade'  => 'Samo prenosiva zaštita',
 'protectedpagestext'      => 'Slijedeće stranice su zaštićene od premještanja ili uređivanja',
 'protectedpagesempty'     => 'Nema zaštićenih stranica koje ispunjavaju uvjete koje ste postavili.',
 'protectedtitles'         => 'Zaštićeni naslovi',
 'protectedtitlestext'     => 'Sljedeći naslovi su zaštićeni od kreiranja',
 'protectedtitlesempty'    => 'Nijedan naslov nije trenuta�no zaštićen s tim parametrima.',
 'listusers'               => 'Popis suradnika',
+'listusers-editsonly'     => 'Pokaži samo suradnike s uređivanjem',
+'usereditcount'           => '$1 {{PLURAL:$1|uređivanje|uređivanja|uređivanja}}',
 'newpages'                => 'Nove stranice',
 'newpages-username'       => 'Suradni�ko ime:',
 'ancientpages'            => 'Najstarije stranice',
@@ -1374,14 +1761,13 @@ wikija povezane na sliku neposrednim URLom, a nisu ovdje navedene unato� aktivn
 'booksources-search-legend' => 'Traženje izvora za knjigu',
 'booksources-go'            => 'Kreni',
 'booksources-text'          => 'Ovdje je popis vanjskih poveznica na internetskim stranicama koje prodaju nove i rabljene knjige, ali mogu sadržavati i ostale podatke o knjigama koje tražite:',
+'booksources-invalid-isbn'  => 'Čini se da dani ISBN nije valjan; provjerite greške kopirajući iz izvornika.',
 
 # Special:Log
 'specialloguserlabel'  => 'Suradnik:',
 'speciallogtitlelabel' => 'Naslov:',
 'log'                  => 'Evidencije',
 'all-logs-page'        => 'Sve evidencije',
-'log-search-legend'    => 'Pretraži evidencije',
-'log-search-submit'    => 'Kreni',
 'alllogstext'          => 'Skupni prikaz svih dostupnih evidencija za {{SITENAME}}.
 Možete suziti prikaz odabirući tip evidencije, suradni�ko ime ili stranicu u upitu.',
 'logempty'             => 'Nema pronađenih stavki.',
@@ -1393,6 +1779,7 @@ Možete suziti prikaz odabirući tip evidencije, suradni�ko ime ili stranicu u
 'nextpage'          => 'Sljedeća stranica ($1)',
 'prevpage'          => 'Prethodna stranica ($1)',
 'allpagesfrom'      => 'Pokaži stranice po�evši od:',
+'allpagesto'        => 'Pokaži stranice koje završavaju na:',
 'allarticles'       => 'Svi �lanci',
 'allinnamespace'    => 'Svi �lanci (prostor $1)',
 'allnotinnamespace' => 'Sve stranice koje nisu u prostoru $1',
@@ -1411,43 +1798,70 @@ Možete suziti prikaz odabirući tip evidencije, suradni�ko ime ili stranicu u
 'special-categories-sort-count' => 'razvrstavanje po broju',
 'special-categories-sort-abc'   => 'abecedno razvrstavanje',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Obrisani suradni�ki doprinosi',
+
+# Special:LinkSearch
+'linksearch'       => 'Vanjske poveznice',
+'linksearch-pat'   => 'Uzorak traženja:',
+'linksearch-ns'    => 'Imenski prostor:',
+'linksearch-ok'    => 'Traži',
+'linksearch-text'  => 'Možete koristiti džoker znakove poput "*.wikipedia.org".<br />Podržani su protokoli: <tt>$1</tt>',
+'linksearch-line'  => '$1 poveznica s �lanka $2',
+'linksearch-error' => 'Džoker znakovi se mogu rabiti samo na po�etku imena poslužitelja.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Prikaži suradnike po�evši od:',
 'listusers-submit'   => 'Prikaži',
 'listusers-noresult' => 'Nema takvih suradnika.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Evidencija novih suradnika',
+'newuserlogpagetext'          => 'Ispod je popis nedavno otvorenih suradni�kih imena.',
+'newuserlog-byemail'          => 'lozinka poslana e-poštom',
+'newuserlog-create-entry'     => 'Novi suradnik',
+'newuserlog-create2-entry'    => 'otvoren je novi suradni�ki ra�un $1',
+'newuserlog-autocreate-entry' => 'Automatski stvoren ra�un',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Prava suradni�kih skupina',
-'listgrouprights-summary'  => 'Ovo je popis suradni�kih skupina određenih na ovoj wiki, s njihovim pripadajućim pravima.
+'listgrouprights'                 => 'Prava suradni�kih skupina',
+'listgrouprights-summary'         => 'Ovo je popis suradni�kih skupina određenih na ovoj wiki, s njihovim pripadajućim pravima.
 Dodatne informacije o pojedinim pravim se mogu pronaći [[{{MediaWiki:Listgrouprights-helppage}}|ovdje]].',
-'listgrouprights-group'    => 'Skupina',
-'listgrouprights-rights'   => 'Prava',
-'listgrouprights-helppage' => 'Help:Suradni�ke skupine',
-'listgrouprights-members'  => '(popis �lanova)',
+'listgrouprights-group'           => 'Skupina',
+'listgrouprights-rights'          => 'Prava',
+'listgrouprights-helppage'        => 'Help:Suradni�ke skupine',
+'listgrouprights-members'         => '(popis �lanova)',
+'listgrouprights-addgroup'        => 'Moguće dodati {{PLURAL:$2|skupinu|skupine}}: $1',
+'listgrouprights-removegroup'     => 'Moguće ukloniti {{PLURAL:$2|skupinu|skupine}}: $1',
+'listgrouprights-addgroup-all'    => 'Moguće dodati sve skupine',
+'listgrouprights-removegroup-all' => 'Moguće ukloniti sve skupine',
 
 # E-mail user
-'mailnologin'     => 'Nema adrese pošiljaoca',
-'mailnologintext' => 'Morate biti [[Special:UserLogin|prijavljeni]]
+'mailnologin'      => 'Nema adrese pošiljaoca',
+'mailnologintext'  => 'Morate biti [[Special:UserLogin|prijavljeni]]
 i imati valjanu adresu e-pošte u svojim [[Special:Preferences|postavkama]]
 da bi mogli slati poštu drugim suradnicima.',
-'emailuser'       => 'Pošalji e-poštu ovom suradniku',
-'emailpage'       => 'Pošalji e-poštu suradniku',
-'emailpagetext'   => 'Možete koristiti ovaj obrazac za poslati elektroni�ku poštu ovom suradniku.
+'emailuser'        => 'Pošalji e-poštu ovom suradniku',
+'emailpage'        => 'Pošalji e-poštu suradniku',
+'emailpagetext'    => 'Možete koristiti ovaj obrazac za poslati elektroni�ku poštu ovom suradniku.
 E-mail adresa iz vaših [[Special:Preferences|postavki]] nalazit će se u "From" polju poruke i primatelj će vam moći odgovoriti.',
-'usermailererror' => 'Sustav pošte javio je pogrešku:',
-'defemailsubject' => '{{SITENAME}} elektroni�ka pošta (e-mail)',
-'noemailtitle'    => 'Nema adrese primaoca',
-'noemailtext'     => 'Ovaj suradnik nije unio valjanu e-mail adresu ili se odlu�io na neće primati poštu od drugih suradnika.',
-'emailfrom'       => 'Od:',
-'emailto'         => 'Za:',
-'emailsubject'    => 'Tema:',
-'emailmessage'    => 'Poruka:',
-'emailsend'       => 'Pošalji',
-'emailccme'       => 'Pošalji mi e-mailom kopiju moje poruke.',
-'emailccsubject'  => 'Kopija vaše poruke suradniku $1: $2',
-'emailsent'       => 'E-mail poslan',
-'emailsenttext'   => 'Vaša poruka je poslana.',
-'emailuserfooter' => 'Ovaj e-mail je poslan od $1 za $2 korištenjem "elektroni�ke pošte" s projekta {{SITENAME}}.',
+'usermailererror'  => 'Sustav pošte javio je pogrešku:',
+'defemailsubject'  => '{{SITENAME}} elektroni�ka pošta (e-mail)',
+'noemailtitle'     => 'Nema adrese primaoca',
+'noemailtext'      => 'Ovaj suradnik nije odredio valjanu e-mail adresu.',
+'nowikiemailtitle' => 'E-mail nije dozvoljen',
+'nowikiemailtext'  => 'Ovaj suradnik je odlu�io ne primati e-mail od drugih suradnika.',
+'email-legend'     => 'Pošalji elektroni�ku poštu drugom {{SITENAME}} suradniku',
+'emailfrom'        => 'Od:',
+'emailto'          => 'Za:',
+'emailsubject'     => 'Tema:',
+'emailmessage'     => 'Poruka:',
+'emailsend'        => 'Pošalji',
+'emailccme'        => 'Pošalji mi e-mailom kopiju moje poruke.',
+'emailccsubject'   => 'Kopija vaše poruke suradniku $1: $2',
+'emailsent'        => 'E-mail poslan',
+'emailsenttext'    => 'Vaša poruka je poslana.',
+'emailuserfooter'  => 'Ovaj e-mail je poslan od $1 za $2 korištenjem "elektroni�ke pošte" s projekta {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Moj popis praćenja',
@@ -1481,12 +1895,7 @@ Promjene na ovoj stranici i njenoj stranici za razgovor bit će tamo prikazani,
 'iteminvalidname'      => "Problem s izborom '$1', ime nije valjano...",
 'wlnote'               => "Ovdje {{PLURAL:$1|je posljednja $1 promjena|su posljednje $1 promjene|je posljednjih $1 promjena}} u {{PLURAL:$2|posljednjem '''$2''' satu|posljednja '''$2''' sata|posljednjih '''$2''' sati}}.",
 'wlshowlast'           => 'Pokaži zadnjih $1 sati $2 dana $3',
-'watchlist-show-bots'  => 'Prikaži botovske promjene',
-'watchlist-hide-bots'  => 'Sakrij botovske promjene',
-'watchlist-show-own'   => 'Prikaži moje promjene',
-'watchlist-hide-own'   => 'Sakrij moje promjene',
-'watchlist-show-minor' => 'Prikaži manje promjene',
-'watchlist-hide-minor' => 'Sakrij manje promjene',
+'watchlist-options'    => 'Izbornik popisa praćenja',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Pratim...',
@@ -1527,82 +1936,100 @@ Za promjene svog popisa praćenja posjetite
 Za pomoć posjetite:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Izbriši stranicu',
-'confirm'                     => 'Potvrdi',
-'excontent'                   => "sadržaj je bio: '$1'",
-'excontentauthor'             => "sadržaj je bio: '$1' (a jedini urednik '$2')",
-'exbeforeblank'               => "sadržaj prije brisanja je bio: '$1'",
-'exblank'                     => 'stranica je bila prazna',
-'delete-confirm'              => 'Obriši "$1"',
-'delete-legend'               => 'Izbriši',
-'historywarning'              => 'UPOZORENJE: Stranica koju želite obrisati ima prijašnje ina�ice:',
-'confirmdeletetext'           => 'Zauvijek ćete izbrisati stranicu ili sliku zajedno s prijašnjim ina�icama.
+# Delete
+'deletepage'             => 'Izbriši stranicu',
+'confirm'                => 'Potvrdi',
+'excontent'              => "sadržaj je bio: '$1'",
+'excontentauthor'        => "sadržaj je bio: '$1' (a jedini urednik '$2')",
+'exbeforeblank'          => "sadržaj prije brisanja je bio: '$1'",
+'exblank'                => 'stranica je bila prazna',
+'delete-confirm'         => 'Obriši "$1"',
+'delete-legend'          => 'Izbriši',
+'historywarning'         => 'UPOZORENJE: Stranica koju želite obrisati ima prijašnje ina�ice:',
+'confirmdeletetext'      => 'Zauvijek ćete izbrisati stranicu ili sliku zajedno s prijašnjim ina�icama.
 Molim potvrdite svoju namjeru, da razumijete posljedice i da ovo radite u skladu s [[{{MediaWiki:Policy-url}}|pravilima]].',
-'actioncomplete'              => 'Zahvat završen',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" je izbrisana.
+'actioncomplete'         => 'Zahvat završen',
+'deletedtext'            => '"<nowiki>$1</nowiki>" je izbrisana.
 Vidi $2 za evidenciju nedavnih brisanja.',
-'deletedarticle'              => 'izbrisano "$1"',
-'suppressedarticle'           => 'sakriven "[[$1]]"',
-'dellogpage'                  => 'Evidencija_brisanja',
-'dellogpagetext'              => 'Dolje je popis nedavnih brisanja.
+'deletedarticle'         => 'izbrisano "$1"',
+'suppressedarticle'      => 'sakriven "[[$1]]"',
+'dellogpage'             => 'Evidencija_brisanja',
+'dellogpagetext'         => 'Dolje je popis nedavnih brisanja.
 Sva vremena su prema poslužiteljevom vremenu.',
-'deletionlog'                 => 'evidencija brisanja',
-'reverted'                    => 'Vraćeno na prijašnju ina�icu',
-'deletecomment'               => 'Razlog za brisanje',
-'deleteotherreason'           => 'Drugi/dodatni razlog:',
-'deletereasonotherlist'       => 'Drugi razlog',
-'deletereason-dropdown'       => '*Razlozi brisanja stranica
+'deletionlog'            => 'evidencija brisanja',
+'reverted'               => 'Vraćeno na prijašnju ina�icu',
+'deletecomment'          => 'Razlog za brisanje',
+'deleteotherreason'      => 'Drugi/dodatni razlog:',
+'deletereasonotherlist'  => 'Drugi razlog',
+'deletereason-dropdown'  => '*Razlozi brisanja stranica
 ** Zahtjev autora
 ** Kršenje autorskih prava
 ** Vandalizam',
-'delete-edit-reasonlist'      => 'Uredi razloge brisanja',
-'delete-toobig'               => 'Ova stranica ima veliku povijest uređivanja, preko $1 {{PLURAL:$1|promjene|promjena}}. Brisanje takvih stranica je ograni�eno da se onemoguće slu�ajni problemi u radu {{SITENAME}}.',
-'delete-warning-toobig'       => 'Ova stranica ima veliku povijest uređivanja, preko $1 {{PLURAL:$1|promjene|promjena}}. Brisanje može poremetiti bazu podataka {{SITENAME}}; postupajte s oprezom.',
-'rollback'                    => 'Ukloni posljednju promjenu',
-'rollback_short'              => 'Ukloni',
-'rollbacklink'                => 'ukloni',
-'rollbackfailed'              => 'Uklanjanje neuspješno',
-'cantrollback'                => 'Ne mogu ukloniti posljednju promjenu, postoji samo jedna promjena.',
-'alreadyrolled'               => 'Ne mogu ukloniti posljednju promjenu �lanka [[:$1]] koju je napravio suradnik [[User:$2|$2]]
-([[User talk:$2|Razgovor]]); netko je već promijenio stranicu ili uklonio promjenu.
-
-Posljednju promjenu napravio je suradnik [[User:$3|$3]] ([[User talk:$3|Razgovor]]).',
-'editcomment'                 => 'Komentar promjene je: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Uklonjena promjena suradnika $2, vraćeno na zadnju ina�icu suradnika $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Uklonjeno uređivanje suradnika $1; vraćeno na zadnju ina�icu suradnika $2.',
-'sessionfailure'              => 'Uo�ili smo problem s vašom prijavom. Zadnja naredba nije izvršena
+'delete-edit-reasonlist' => 'Uredi razloge brisanja',
+'delete-toobig'          => 'Ova stranica ima veliku povijest uređivanja, preko $1 {{PLURAL:$1|promjene|promjena}}. Brisanje takvih stranica je ograni�eno da se onemoguće slu�ajni problemi u radu {{SITENAME}}.',
+'delete-warning-toobig'  => 'Ova stranica ima veliku povijest uređivanja, preko $1 {{PLURAL:$1|promjene|promjena}}. Brisanje može poremetiti bazu podataka {{SITENAME}}; postupajte s oprezom.',
+
+# Rollback
+'rollback'         => 'Ukloni posljednju promjenu',
+'rollback_short'   => 'Ukloni',
+'rollbacklink'     => 'ukloni',
+'rollbackfailed'   => 'Uklanjanje neuspješno',
+'cantrollback'     => 'Ne mogu ukloniti posljednju promjenu, postoji samo jedna promjena.',
+'alreadyrolled'    => 'Ne mogu ukloniti posljednju promjenu �lanka [[:$1]] koju je napravio  [[User:$2|$2]] ([[User talk:$2|Razgovor]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); netko je već promijenio stranicu ili uklonio promjenu.
+
+Posljednju promjenu napravio je [[User:$3|$3]] ([[User talk:$3|Razgovor]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Sažetak promjene je bio: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Uklonjena promjena suradnika $2, vraćeno na zadnju ina�icu suradnika $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Uklonjeno uređivanje suradnika $1; vraćeno na zadnju ina�icu suradnika $2.',
+'sessionfailure'   => 'Uo�ili smo problem s vašom prijavom. Zadnja naredba nije izvršena
 kako bi izbjegla zloupotreba. Molimo vas da u pregledniku pritisnete "Natrag" (Back) i ponovno u�itate stranicu
 s koje ste stigli.',
+
+# Protect
 'protectlogpage'              => 'Evidencija zaštićivanja',
 'protectlogtext'              => 'Ispod je evidencija zaštićivanja i uklanjanja zaštite pojedinih stranica.
 Pogledajte [[Special:ProtectedPages|zaštićene stranice]] za popis trenuta�no zaštićenih stranica.',
 'protectedarticle'            => '�lanak "[[$1]]" je zaštićen',
 'modifiedarticleprotection'   => 'promijenjen stupanj zaštite za "[[$1]]"',
 'unprotectedarticle'          => 'uklonjena zaštita �lanka "[[$1]]"',
+'movedarticleprotection'      => 'premještene postavke zaštite s "[[$2]]" na "[[$1]]"',
 'protect-title'               => 'Zaštićujem "$1"',
+'prot_1movedto2'              => '$1 premješteno na $2',
 'protect-legend'              => 'Potvrda zaštite',
 'protectcomment'              => 'Komentar:',
 'protectexpiry'               => 'Trajanje zaštite:',
 'protect_expiry_invalid'      => 'Upisani vremenski rok nije valjan.',
 'protect_expiry_old'          => 'Vrijeme isteka je u prošlosti.',
 'protect-unchain'             => 'Otklju�aj ovlaštenja za premještanje',
-'protect-text'                => 'Ovdje možete pregledati i promijeniti razinu zaštite za stranicu <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Ne možete mijenjati nivo zaštite dok ste blokirani.
-Slijede postavke stranice <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Razina zaštite ne može biti promijenjena jer je baza zaklju�ana.
-Slijede postavke stranice <strong>$1</strong>:',
-'protect-locked-access'       => 'Nemate ovlasti za mijenjanje razine zaštite.
-Slijede trenuta�ne postavke stranice <strong>$1</strong>:',
+'protect-text'                => "Ovdje možete pregledati i promijeniti razinu zaštite za stranicu '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Ne možete mijenjati nivo zaštite dok ste blokirani.
+Slijede postavke stranice '''$1''':",
+'protect-locked-dblock'       => "Razina zaštite ne može biti promijenjena jer je baza zaklju�ana.
+Slijede postavke stranice '''$1''':",
+'protect-locked-access'       => "Nemate ovlasti za mijenjanje razine zaštite.
+Slijede trenuta�ne postavke stranice '''$1''':",
 'protect-cascadeon'           => 'Ova stranica je zaštićena jer je uklju�ena u {{PLURAL:$1|stranicu, koja ima|stranice, koje imaju|stranice, koje imaju}} uklju�enu prenosivu zaštitu. Možete promijeniti stupanj zaštite ove stranice, no to neće utjecati na prenosivu zaštitu.',
-'protect-default'             => '(bez zaštite)',
+'protect-default'             => 'Omogući svim suradnicima',
 'protect-fallback'            => 'Potrebno je imati "$1" ovlasti',
-'protect-level-autoconfirmed' => 'Blokiraj neprijavljene suradnike',
+'protect-level-autoconfirmed' => 'Blokiraj nove i neprijavljene suradnike',
 'protect-level-sysop'         => 'Samo administratori',
 'protect-summary-cascade'     => 'prenosiva zaštita',
 'protect-expiring'            => 'istje�e $1 (UTC)',
+'protect-expiry-indefinite'   => 'neograni�eno',
 'protect-cascade'             => 'Prenosiva zaštita - zaštiti sve stranice koje su uklju�ene u ovu.',
 'protect-cantedit'            => 'Ne možete mijenjati razinu zaštite ove stranice, jer nemate prava uređivati ju.',
+'protect-othertime'           => 'Drugo vrijeme:',
+'protect-othertime-op'        => 'drugo vrijeme',
+'protect-existing-expiry'     => 'Postojeće vrijeme zaštite: $3, $2',
+'protect-otherreason'         => 'Drugi/dodatni razlog:',
+'protect-otherreason-op'      => 'drugi/dodatni razlog',
+'protect-dropdown'            => '*Naj�ešći razlozi zaštićivanja
+** U�estalo vandaliziranje
+** U�estalo spamiranje
+** Neproduktivni uređiva�ki rat
+** Zatrpavanje nedavnih promjena',
+'protect-edit-reasonlist'     => 'Uredi razloge zaštićivanja',
+'protect-expiry-options'      => '2 sata:2 hours,6 sati:6 hours,1 dan:1 day,3 dana:3 days,1 tjedan:1 week,2 tjedna:2 weeks,1 mjesec:1 month,3 mjeseca:3 months,6 mjeseci:6 months,1 godine:1 year,neograni�eno:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Dopuštenje:',
 'restriction-level'           => 'Stupanj ograni�enja:',
 'minimum-size'                => 'Najmanja veli�ina',
@@ -1625,7 +2052,8 @@ Slijede trenuta�ne postavke stranice <strong>$1</strong>:',
 'undeletepage'                 => 'Vidi i/ili vrati izbrisane stranice',
 'undeletepagetitle'            => "'''Sljedeći sadržaj se sastoji od izbrisanih izmjena [[:$1]]'''.",
 'viewdeletedpage'              => 'Pogledaj izbrisanu stranicu',
-'undeletepagetext'             => 'Sljedeće su stranice izbrisane, ali se još uvijek nalaze u bazi i mogu se obnoviti. Baza se povremeno �isti od ovakvih stranica.',
+'undeletepagetext'             => '{{PLURAL:$1|Sljedeća stranica je obrisana, ali se još uvijek nalazi|Sljedećih $1 stranica su obrisane, ali se još uvijek nalaze}} u bazi i mogu se obnoviti. 
+Baza se povremeno �isti od ovakvih stranica.',
 'undelete-fieldset-title'      => 'Vrati izmjene',
 'undeleteextrahelp'            => "Da biste vratili cijelu stranicu, ostavite sve ''kućice'' neozna�ene i kliknite '''Vrati!'''. Ako želite vratiti određene izmjene, ozna�ite ih i kliknite '''Vrati!'''. Klik na gumb '''O�isti''' će odzna�iti sve ''kućice'' i obrisati polje za komentar.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|ina�ica je arhivirana|ina�ice su arhivirane|ina�ica je arhivirano}}',
@@ -1635,13 +2063,14 @@ U takvim slu�ajevima morate isklju�iti ili otkriti najnovije obrisane promjene
 'undeletehistorynoadmin'       => 'Ovaj je �lanak izbrisan. Razlog za brisanje prikazan je u donjem sažetku, zajedno s
 detaljima o suradnicima koji su uređivali ovu stranicu prije brisanja.
 Tekst izbrisanih ina�ica dostupan je samo administratorima.',
-'undelete-revision'            => 'Izbrisana ina�ica �lanka $1 (dana $2), obrisao $3:',
+'undelete-revision'            => 'Izbrisana ina�ica �lanka $1 (od $4, $5) izbrisao $3:',
 'undeleterevision-missing'     => 'Nevaljana ili nepostojeća promjena. Poveznica je nevaljana,
 ili je promjena vraćena ili uklonjena iz arhive.',
 'undelete-nodiff'              => 'Prethodne promjene nisu nađene.',
 'undeletebtn'                  => 'Vrati!',
 'undeletelink'                 => 'vrati',
 'undeletereset'                => 'O�isti',
+'undeleteinvert'               => 'Obrni odabir',
 'undeletecomment'              => 'Komentar:',
 'undeletedarticle'             => 'vraćena stranica "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|$1 ina�ica vraćena|$1 ina�ice vraćene|$1 ina�ica vraćeno}}',
@@ -1673,26 +2102,27 @@ $1',
 'blanknamespace' => '(Glavni)',
 
 # Contributions
-'contributions' => 'Doprinosi suradnika',
-'mycontris'     => 'Moji doprinosi',
-'contribsub2'   => 'Za $1 ($2)',
-'nocontribs'    => 'Nema promjena koje udovoljavaju ovim kriterijima.',
-'uctop'         => ' (vrh)',
-'month'         => 'Od mjeseca (i ranije):',
-'year'          => 'Od godine (i ranije):',
-
-'sp-contributions-newbies'     => 'Prikaži samo doprinose novih suradnika',
-'sp-contributions-newbies-sub' => 'Za nove suradnike',
-'sp-contributions-blocklog'    => 'Evidencija blokiranja',
-'sp-contributions-search'      => 'Pretraži doprinose',
-'sp-contributions-username'    => 'IP adresa ili suradnik:',
-'sp-contributions-submit'      => 'Traži',
+'contributions'       => 'Doprinosi suradnika',
+'contributions-title' => 'Suradni�ki doprinosi za $1',
+'mycontris'           => 'Moji doprinosi',
+'contribsub2'         => 'Za $1 ($2)',
+'nocontribs'          => 'Nema promjena koje udovoljavaju ovim kriterijima.',
+'uctop'               => ' (vrh)',
+'month'               => 'Od mjeseca (i ranije):',
+'year'                => 'Od godine (i ranije):',
+
+'sp-contributions-newbies'       => 'Prikaži samo doprinose novih suradnika',
+'sp-contributions-newbies-sub'   => 'Za nove suradnike',
+'sp-contributions-newbies-title' => 'Doprinosi novih suradnika',
+'sp-contributions-blocklog'      => 'Evidencija blokiranja',
+'sp-contributions-search'        => 'Pretraži doprinose',
+'sp-contributions-username'      => 'IP adresa ili suradnik:',
+'sp-contributions-submit'        => 'Traži',
 
 # What links here
 'whatlinkshere'            => 'Å to vodi ovamo',
 'whatlinkshere-title'      => 'Stranice koje vode na "$1"',
 'whatlinkshere-page'       => 'Stranica:',
-'linklistsub'              => '(Popis poveznica)',
 'linkshere'                => 'Sljedeće stranice povezuju ovamo ([[:$1]]):',
 'nolinkshere'              => 'Nijedna stranica ne vodi ovamo (tj. nema poveznica na stranicu [[:$1]]).',
 'nolinkshere-ns'           => "Nijedna stranica ne vodi na '''[[:$1]]''' u odabranom imenskom prostoru.",
@@ -1740,6 +2170,8 @@ vandalizirane).',
 'ipbotherreason'                  => 'Drugi/dodatni razlog:',
 'ipbhidename'                     => 'Sakrij suradni�ko ime iz evidencije blokiranja, popisa blokiranja i popisa suradnika',
 'ipbwatchuser'                    => 'Prati suradni�ku stranicu i stranicu za razgovor ovog suradnika',
+'ipballowusertalk'                => 'Omogući suradniku uređivanje vlastite stranice za razgovor',
+'ipb-change-block'                => 'Ponovno blokiraj suradnika s ovim postavkama',
 'badipaddress'                    => 'Nevaljana IP adresa.',
 'blockipsuccesssub'               => 'Uspješno blokirano',
 'blockipsuccesstext'              => 'Suradnik [[Special:Contributions/$1|$1]] je blokiran.<br />
@@ -1749,14 +2181,18 @@ Pogledaj [[Special:IPBlockList|popis blokiranih IP adresa]] za pregled.',
 'ipb-unblock'                     => 'Odblokiraj suradni�ko ime ili IP adresu',
 'ipb-blocklist-addr'              => 'Postojeća blokiranja za $1',
 'ipb-blocklist'                   => 'Vidi postojeća blokiranja',
+'ipb-blocklist-contribs'          => 'Doprinosi za $1',
 'unblockip'                       => 'Deblokiraj suradnika',
 'unblockiptext'                   => 'Ovaj se obrazac koristi za vraćanje prava na pisanje prethodno blokiranoj IP adresi.',
-'ipusubmit'                       => 'Deblokiraj ovu adresu',
+'ipusubmit'                       => 'Ukloni ovaj blok',
 'unblocked'                       => '[[User:$1|$1]] je deblokiran',
 'unblocked-id'                    => 'Blok $1 je uklonjen',
 'ipblocklist'                     => 'Popis blokiranih IP adresa i suradni�kih ra�una',
 'ipblocklist-legend'              => 'Pronađi blokiranog suradnika',
 'ipblocklist-username'            => 'Ime suradnika ili IP adresa:',
+'ipblocklist-sh-userblocks'       => '$1 blokirane ra�une',
+'ipblocklist-sh-tempblocks'       => '$1 privremena blokiranja',
+'ipblocklist-sh-addressblocks'    => '$1 blokirane IP-eve',
 'ipblocklist-submit'              => 'Traži',
 'blocklistline'                   => '$1, $2 je blokirao $3 ($4)',
 'infiniteblock'                   => 'neograni�eno',
@@ -1765,25 +2201,32 @@ Pogledaj [[Special:IPBlockList|popis blokiranih IP adresa]] za pregled.',
 'noautoblockblock'                => 'blokiranje samoga sebe je onemogućeno',
 'createaccountblock'              => 'blokirano stvaranje suradni�kog ra�una',
 'emailblock'                      => 'e-mail je blokiran',
+'blocklist-nousertalk'            => 'bez uređivanja vlastite stranice za razgovor',
 'ipblocklist-empty'               => 'Popis blokiranja je prazan.',
 'ipblocklist-no-results'          => 'Tražena IP adresa ili suradni�ko ime nije blokirano.',
 'blocklink'                       => 'blokiraj',
 'unblocklink'                     => 'deblokiraj',
+'change-blocklink'                => 'promijeni blokiranje',
 'contribslink'                    => 'doprinosi',
 'autoblocker'                     => 'Automatski ste blokirani jer je vašu IP adresu nedavno koristio "[[User:$1|$1]]" koji je blokiran zbog: "$2".',
 'blocklogpage'                    => 'Evidencija blokiranja',
+'blocklog-fulllog'                => 'Potpuna evidencija blokiranja',
 'blocklogentry'                   => 'Blokiran je "[[$1]]" na rok $2 $3',
+'reblock-logentry'                => 'promijenjene postavke blokiranja za [[$1]] na rok od $2 $3',
 'blocklogtext'                    => 'Ovo je evidencija blokiranja i deblokiranja. Na popisu nema automatski blokiranih IP adresa. Za popis trenuta�nih zabrana i blokiranja vidi [[Special:IPBlockList|popis IP blokiranja]].',
 'unblocklogentry'                 => 'Deblokiran "$1"',
 'block-log-flags-anononly'        => 'samo za neprijavljene suradnike',
 'block-log-flags-nocreate'        => 'otvaranje novih suradni�kih imena nije moguće',
 'block-log-flags-noautoblock'     => 'autoblok je onemogućen',
 'block-log-flags-noemail'         => 'e-mail je blokiran',
+'block-log-flags-nousertalk'      => 'bez uređivanja vlastite stranice za razgovor',
 'block-log-flags-angry-autoblock' => 'Poboljšan autoblok uklju�en',
 'range_block_disabled'            => 'Isklju�ena je administratorska naredba za blokiranje raspona IP adresa.',
 'ipb_expiry_invalid'              => 'Vremenski rok nije valjan.',
 'ipb_expiry_temp'                 => 'Sakriveni ra�uni bi trebali biti trajno blokirani.',
 'ipb_already_blocked'             => '"$1" je već blokiran',
+'ipb-needreblock'                 => '== Već blokiran ==
+$1 je već blokiran. Želite promijeniti postavke blokiranja?',
 'ipb_cant_unblock'                => 'Pogreška: blok ID $1 nije nađen. Moguće je da je suradnik već odblokiran.',
 'ipb_blocked_as_range'            => 'Pogreška: IP adresa $1 nije blokirana direktno te stoga ne može biti odblokirana. Blokirana je kao dio opsega $2, koji može biti odblokiran.',
 'ip_range_invalid'                => 'Raspon IP adresa nije valjan.',
@@ -1794,6 +2237,7 @@ Pogledaj [[Special:IPBlockList|popis blokiranih IP adresa]] za pregled.',
 'proxyblocksuccess'               => 'Napravljeno.',
 'sorbsreason'                     => 'Vaša IP adresa je na popisu otvorenih posrednika na poslužitelju DNSBL.',
 'sorbs_create_account_reason'     => 'Vaša IP adresa je na popisu otvorenih posrednika na poslužitelju DNSBL. Ne možete otvoriti ra�un.',
+'cant-block-while-blocked'        => 'Ne možete blokirati druge suradnike dok ste vi blokirani.',
 
 # Developer tools
 'lockdb'              => 'Zaklju�aj bazu podataka',
@@ -1816,9 +2260,9 @@ mijenjanje postavki, uređivanje popisa praćenja i druge stvari koje zahtijevaj
 'databasenotlocked'   => 'Baza podataka nije zaklju�ana.',
 
 # Move page
-'move-page'               => 'Premjesti $1',
-'move-page-legend'        => 'Premjesti stranicu',
-'movepagetext'            => "Korištenjem ovog obrasca ćete preimenovati stranicu i premjestiti sve stare izmjene na novo ime.
+'move-page'                    => 'Premjesti $1',
+'move-page-legend'             => 'Premjesti stranicu',
+'movepagetext'                 => "Korištenjem ovog obrasca ćete preimenovati stranicu i premjestiti sve stare izmjene na novo ime.
 Stari će se naslov pretvoriti u stranicu koja automatski preusmjerava na novi naslov.
 Možete odabrati automatsko ažuriranje preusmjeravanja na originalni naslov.
 Ako se ne odlu�ite na to, provjerite [[Special:DoubleRedirects|dvostruka]] ili [[Special:BrokenRedirects|neispravna]] preusmjeravanja.
@@ -1828,50 +2272,63 @@ To zna�i: 1. ako pogriješite, možete opet preimenovati stranicu na stari nasl
 
 '''OPREZ!'''
 Ovo može biti drasti�na i neo�ekivana promjena kad su u pitanju popularne stranice, i zato dobro razmislite prije nego što preimenujete stranicu.",
-'movepagetalktext'        => "Stranica za razgovor, ako postoji, automatski će se premjestiti zajedno sa stranicom koju premještate. '''Stranica za razgovor neće se premjestiti ako:'''
+'movepagetalktext'             => "Stranica za razgovor, ako postoji, automatski će se premjestiti zajedno sa stranicom koju premještate. '''Stranica za razgovor neće se premjestiti ako:'''
 *premještate stranicu iz jednog prostora u drugi,
 *pod novim imenom već postoji stranica za razgovor s nekim sadržajem, ili
 *maknete kva�icu u kućici na dnu ove stranice.
 
 U tim slu�ajevima ćete morati sami premjestiti ili iskopirati stranicu za razgovor,
 ako to želite.",
-'movearticle'             => 'Premjesti stranicu',
-'movenotallowed'          => 'Nemate pravo premještanja stranica.',
-'newtitle'                => 'Na novi naslov',
-'move-watch'              => 'Prati ovu stranicu',
-'movepagebtn'             => 'Premjesti stranicu',
-'pagemovedsub'            => 'Premještanje uspjelo',
-'movepage-moved'          => '<big>\'\'\'"$1" je premješteno na "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Stranica pod tim imenom već postoji ili ime koje ste odabrali nije u skladu s pravilima.
+'movearticle'                  => 'Premjesti stranicu',
+'movenologin'                  => 'Niste prijavljeni',
+'movenologintext'              => 'Ako želite premjestiti stranicu morate biti [[Special:UserLogin|prijavljeni]].',
+'movenotallowed'               => 'Nemate pravo premještanja stranica.',
+'movenotallowedfile'           => 'Nemate ovlasti za premještanje datoteka.',
+'cant-move-user-page'          => 'Nemate dopuštenja za premještanje root suradni�kih stranica.',
+'cant-move-to-user-page'       => 'Nemate dopuštenje za premještanje stranice na suradni�ku stranicu (osim kao podstranicu)',
+'newtitle'                     => 'Na novi naslov',
+'move-watch'                   => 'Prati ovu stranicu',
+'movepagebtn'                  => 'Premjesti stranicu',
+'pagemovedsub'                 => 'Premještanje uspjelo',
+'movepage-moved'               => '<big>\'\'\'"$1" je premješteno na "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Napravljeno je preusmjeravanje.',
+'movepage-moved-noredirect'    => 'Stvaranje preusmjeravanja je izostavljeno.',
+'articleexists'                => 'Stranica pod tim imenom već postoji ili ime koje ste odabrali nije u skladu s pravilima.
 Molimo odaberite drugo ime.',
-'cantmove-titleprotected' => 'Ne možete premjestiti ovu stranicu na ovo mjesto, jer je novi naslov zaštićen od kreiranja',
-'talkexists'              => "'''Sama stranica je uspješno prenesena, ali stranicu za razgovor nije bilo moguće prenijeti jer na odredištu već postoji stranica za razgovor. Molimo da ih ru�no spojite.'''",
-'movedto'                 => 'premješteno na',
-'movetalk'                => 'Premjesti i njezinu stranicu za razgovor ako je moguće.',
-'move-subpages'           => 'Premjesti sve podstranice, ako je moguće',
-'move-talk-subpages'      => 'Premjesti sve podstranice od stranice za razgovor, ako je moguće',
-'movepage-page-exists'    => 'Stranica $1 već postoji i ne može biti automatski prepisana',
-'movepage-page-moved'     => 'Stranica $1 je premještena na $2.',
-'movepage-page-unmoved'   => 'Stranica $1 nije mogla biti premještena na $2.',
-'movepage-max-pages'      => 'Najveća koli�ina od $1 {{PLURAL:$1|stranice|stranica}} je premještena i više od toga neće biti automatski premješteno.',
-'1movedto2'               => '$1 premješteno na $2',
-'1movedto2_redir'         => '$1 premješteno na $2 preko postojećeg preusmjeravanja',
-'movelogpage'             => 'Evidencija premještanja',
-'movelogpagetext'         => 'Ispod je popis premještenih stranica.',
-'movereason'              => 'Razlog',
-'revertmove'              => 'vrati',
-'delete_and_move'         => 'Izbriši i premjesti',
-'delete_and_move_text'    => '==Nužno brisanje==
+'cantmove-titleprotected'      => 'Ne možete premjestiti ovu stranicu na ovo mjesto, jer je novi naslov zaštićen od kreiranja',
+'talkexists'                   => "'''Sama stranica je uspješno prenesena, ali stranicu za razgovor nije bilo moguće prenijeti jer na odredištu već postoji stranica za razgovor. Molimo da ih ru�no spojite.'''",
+'movedto'                      => 'premješteno na',
+'movetalk'                     => 'Premjesti i njezinu stranicu za razgovor ako je moguće.',
+'move-subpages'                => 'Premjesti sve podstranice, ako je moguće',
+'move-talk-subpages'           => 'Premjesti sve podstranice od stranice za razgovor, ako je moguće',
+'movepage-page-exists'         => 'Stranica $1 već postoji i ne može biti automatski prepisana',
+'movepage-page-moved'          => 'Stranica $1 je premještena na $2.',
+'movepage-page-unmoved'        => 'Stranica $1 nije mogla biti premještena na $2.',
+'movepage-max-pages'           => 'Najveća koli�ina od $1 {{PLURAL:$1|stranice|stranica}} je premještena i više od toga neće biti automatski premješteno.',
+'1movedto2'                    => '$1 premješteno na $2',
+'1movedto2_redir'              => '$1 premješteno na $2 preko postojećeg preusmjeravanja',
+'move-redirect-suppressed'     => 'izostavljeno preusmjeravanje',
+'movelogpage'                  => 'Evidencija premještanja',
+'movelogpagetext'              => 'Ispod je popis premještenih stranica.',
+'movereason'                   => 'Razlog',
+'revertmove'                   => 'vrati',
+'delete_and_move'              => 'Izbriši i premjesti',
+'delete_and_move_text'         => '==Nužno brisanje==
 
 Odredišni �lanak "[[:$1]]" već postoji. Želite li ga obrisati da biste napravili mjesto za premještaj?',
-'delete_and_move_confirm' => 'Da, izbriši stranicu',
-'delete_and_move_reason'  => 'Obrisano kako bi se napravilo mjesta za premještaj.',
-'selfmove'                => 'Izvorni i odredišni naslov su isti; ne mogu premjestiti stranicu na nju samu.',
-'immobile_namespace'      => 'Odredišni naslov pripada posebnom tipu; u taj prostor ne mogu pomicati stranice.',
-'imagenocrossnamespace'   => 'Datoteka ne može biti premještena u imenski prostor koji nije za datoteke',
-'imagetypemismatch'       => 'Ekstenzija nove datoteke se ne poklapa sa svojim tipom.',
-'imageinvalidfilename'    => 'Ciljano ime datoteke je nevaljano',
-'fix-double-redirects'    => 'Ažuriraj sva preusmjeravanja koja vode na originalni naslov',
+'delete_and_move_confirm'      => 'Da, izbriši stranicu',
+'delete_and_move_reason'       => 'Obrisano kako bi se napravilo mjesta za premještaj.',
+'selfmove'                     => 'Izvorni i odredišni naslov su isti; ne mogu premjestiti stranicu na nju samu.',
+'immobile-source-namespace'    => 'Ne mogu premjestiti stranice u imenski prostor "$1"',
+'immobile-target-namespace'    => 'Nemogu premjestiti stranice u imenski prostor "$1"',
+'immobile-target-namespace-iw' => 'Međuwiki poveznica nije valjano odredište za premještanje stranice.',
+'immobile-source-page'         => 'Ova stranica je se ne može premjestiti.',
+'immobile-target-page'         => 'Nemogu premjestiti na željeni naslov.',
+'imagenocrossnamespace'        => 'Datoteka ne može biti premještena u imenski prostor koji nije za datoteke',
+'imagetypemismatch'            => 'Ekstenzija nove datoteke se ne poklapa sa svojim tipom.',
+'imageinvalidfilename'         => 'Ciljano ime datoteke je nevaljano',
+'fix-double-redirects'         => 'Ažuriraj sva preusmjeravanja koja vode na originalni naslov',
+'move-leave-redirect'          => 'Ostavi preusmjeravanje',
 
 # Export
 'export'            => 'Izvezi stranice',
@@ -1879,7 +2336,7 @@ Odredišni �lanak "[[:$1]]" već postoji. Želite li ga obrisati da biste napra
 
 Za izvoz stranica unesite njihove naslove u polje ispod, jedan naslov po retku, i ozna�ite želite li trenuta�nu ina�icu zajedno sa svim prijašnjima, ili samo trenuta�nu ina�icu s informacijom o zadnjoj promjeni.
 
-U potonjem slu�aju možete koristiti i poveznicu, npr. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] za �lanak [[{{MediaWiki:Mainpage}}]].',
+U potonjem slu�aju možete koristiti i poveznicu, npr. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] za �lanak [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Uklju�i samo trenuta�nu ina�icu, ne i sve prijašnje',
 'exportnohistory'   => "----
 '''Napomena:''' izvoz cjelokupne stranice sa svim prethodnim izmjenama onemogućen je zbog opterećenja poslužitelja.",
@@ -1894,7 +2351,7 @@ U potonjem slu�aju možete koristiti i poveznicu, npr. [[{{ns:special}}:Export/
 'allmessagesname'           => 'Ime',
 'allmessagesdefault'        => 'Prvotni tekst',
 'allmessagescurrent'        => 'Trenuta�ni tekst',
-'allmessagestext'           => 'Ovo je popis svih sistemskih poruka u prostoru MediaWiki: .',
+'allmessagestext'           => 'Ovo je popis svih sistemskih poruka u imenskom prostoru MediaWiki. Molimo posjetite [http://www.mediawiki.org/wiki/Localisation lokalizaciju MediaWikija] i [http://translatewiki.net translatewiki.net] ukoliko želite doprinjeti lokalizaciji MediaWiki softvera.',
 'allmessagesnotsupportedDB' => "Ova stranica ne može biti korištena jer je isklju�en parametar '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Filter imena poruka:',
 'allmessagesmodified'       => 'Prikaži samo promijenjene',
@@ -1914,9 +2371,12 @@ U potonjem slu�aju možete koristiti i poveznicu, npr. [[{{ns:special}}:Export/
 'import-interwiki-text'      => 'Izaberite wiki i ime stranice za uvoz.
 Povijest stranice i imena suradnika će biti sa�uvani.
 Transwiki uvoz stranica je zabilježen u [[Special:Log/import|evidenciji uvoza stranica]].',
+'import-interwiki-source'    => 'Izvor wiki/stranica:',
 'import-interwiki-history'   => 'Prenesi sve ina�ice ove stranice',
 'import-interwiki-submit'    => 'Uvezi',
 'import-interwiki-namespace' => 'Odredišni imenski prostor:',
+'import-upload-filename'     => 'Ime datoteke:',
+'import-comment'             => 'Komentar:',
 'importtext'                 => 'Molim da izvezete ovu datoteku iz izvorišnog wikija koristeći pomagalo Special:Export, snimite je na svoj disk i postavite je ovdje.',
 'importstart'                => 'Uvozim stranice...',
 'import-revision-count'      => '$1 {{PLURAL:$1|izmjena|izmjene|izmjena}}',
@@ -1962,7 +2422,7 @@ Transwiki uvoz stranica je zabilježen u [[Special:Log/import|evidenciji uvoza s
 'tooltip-pt-logout'               => 'Odjavi se',
 'tooltip-ca-talk'                 => 'Razgovor o stranici',
 'tooltip-ca-edit'                 => 'Možete uređivati ovu stranicu. Koristite Pregled kako će izgledati prije nego što snimite.',
-'tooltip-ca-addsection'           => 'Dodaj komentar ovom razgovoru.',
+'tooltip-ca-addsection'           => 'Dodaj novi odlomak',
 'tooltip-ca-viewsource'           => 'Ova stranica je zaštićena. Možete pogledati izvorni kod.',
 'tooltip-ca-history'              => 'Ranije izmjene na ovoj stranici.',
 'tooltip-ca-protect'              => 'Zaštiti ovu stranicu',
@@ -2009,6 +2469,8 @@ Transwiki uvoz stranica je zabilježen u [[Special:Log/import|evidenciji uvoza s
 'tooltip-watch'                   => 'Dodaj na popis praćenja',
 'tooltip-recreate'                => 'Vrati stranicu unato� tome što je obrisana',
 'tooltip-upload'                  => "Pokreni snimanje (''upload'')",
+'tooltip-rollback'                => '"Ukloni" uklanja uređivanja zadnjeg suradnika na ovoj stranici.',
+'tooltip-undo'                    => '"Ukloni ovu izmjenu" uklanja ovu izmjenu i otvara okvir za uređivanje. Omogućava unošenje razloga u sažetak.',
 
 # Stylesheets
 'common.css'   => '/** Uređivanje ove CSS datoteke će se odraziti na sve skinove */',
@@ -2024,12 +2486,12 @@ Transwiki uvoz stranica je zabilježen u [[Special:Log/import|evidenciji uvoza s
 'notacceptable'     => 'Wiki server ne može dobaviti podatke u obliku kojega vaš klijent može pro�itati.',
 
 # Attribution
-'anonymous'        => 'Anonimni suradnik projekta {{SITENAME}}',
+'anonymous'        => 'Neprijavljeni {{PLURAL:$1|suradnik|suradnici}} projekta {{SITENAME}}',
 'siteuser'         => 'Suradnik $1 na projektu {{SITENAME}}',
 'lastmodifiedatby' => 'Ovu je stranicu zadnji put mijenjao dana $2, $1 suradnik $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Temelji se na doprinosu suradnika $1.',
 'others'           => 'drugih',
-'siteusers'        => '{{SITENAME}} suradnik(ci) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|suradnik|suradnici}} $1',
 'creditspage'      => 'Autori stranice',
 'nocredits'        => 'Za ovu stranicu nema podataka o autorima.',
 
@@ -2050,6 +2512,14 @@ Razlog je vjerojatno vanjska poveznica koja se nalazi na crnom popisu.',
 'numauthors'     => 'Broj autora (�lanak): $1',
 'numtalkauthors' => 'Broj autora (stranica za razgovor): $1',
 
+# Skin names
+'skinname-standard'    => 'Standardna',
+'skinname-nostalgia'   => 'Nostalgija',
+'skinname-cologneblue' => 'Kölnska plava',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chick',
+
 # Math options
 'mw_math_png'    => 'Uvijek kao PNG',
 'mw_math_simple' => 'Ako je vrlo jednostavno HTML, ina�e PNG',
@@ -2070,10 +2540,12 @@ Razlog je vjerojatno vanjska poveznica koja se nalazi na crnom popisu.',
 'markedaspatrollederror-noautopatrol' => 'Ne možete vlastite promjene ozna�iti patroliranima.',
 
 # Patrol log
-'patrol-log-page'   => 'Evidencija pregledavanja promjena',
-'patrol-log-header' => 'Ovo su evidencije patroliranih izmjena.',
-'patrol-log-line'   => 'promjena broj $1 stranice $2 pregledana $3',
-'patrol-log-auto'   => '(automatski pregledano)',
+'patrol-log-page'      => 'Evidencija pregledavanja promjena',
+'patrol-log-header'    => 'Ovo su evidencije patroliranih izmjena.',
+'patrol-log-line'      => 'promjena broj $1 stranice $2 pregledana $3',
+'patrol-log-auto'      => '(automatski pregledano)',
+'patrol-log-diff'      => 'promjena $1',
+'log-show-hide-patrol' => '$1 evidenciju patroliranja',
 
 # Image deletion
 'deletedrevision'                 => 'Izbrisana stara ina�ica $1',
@@ -2090,6 +2562,9 @@ $1',
 'previousdiff' => '� Starija izmjena',
 'nextdiff'     => 'Novija izmjena →',
 
+# Visual comparison
+'visual-comparison' => 'Prikazivanje razlike (usporedi)',
+
 # Media information
 'mediawarning'         => "'''Upozorenje''': Ova datoteka možda sadrži zlonamjerni program �ije bi izvršavanje moglo ugroziti vaš ra�unalni sustav.
 <hr />",
@@ -2103,10 +2578,12 @@ $1',
 'show-big-image'       => 'Vidi sliku u punoj veli�ini (rezoluciji)',
 'show-big-image-thumb' => '<small>Veli�ina pretpregleda: $1 × $2 piksela</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerija novih datoteka',
 'imagelisttext'         => 'Ispod je popis {{PLURAL:$1|$1 slike|$1 slike|$1 slika}} složen $2.',
 'newimages-summary'     => 'Ova posebna stranica pokazuje zadnje nedavno postavljene datoteke.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Naziv datoteke (ili njen dio):',
 'showhidebots'          => '($1 botova)',
 'noimages'              => 'Nema slika.',
 'ilsubmit'              => 'Traži',
@@ -2314,6 +2791,18 @@ Svaka sljedeća poveznica u istom retku je izuzetak, npr. kod stranica gdje se s
 'exif-lightsource-24'  => 'ISO studijska svjetiljka',
 'exif-lightsource-255' => 'Drugi izvor svjetla',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Bez upotrebe bljeskalice',
+'exif-flash-fired-1'    => 'S upotrebom bljeskalice',
+'exif-flash-return-0'   => 'bez upotrebe funkcije stroboskopa',
+'exif-flash-return-2'   => 'stroboskop nije opazio svjetlo',
+'exif-flash-return-3'   => 'stroboskop je opazio svjetlo',
+'exif-flash-mode-1'     => 'bljeskalica ru�no uklju�ena',
+'exif-flash-mode-2'     => 'bljeskalica ru�no isklju�ena',
+'exif-flash-mode-3'     => 'automatski na�in rada',
+'exif-flash-function-1' => 'Nema funkcije bljeskalice',
+'exif-flash-redeye-1'   => 'na�in rada za smanjenje crvenih o�iju',
+
 'exif-focalplaneresolutionunit-2' => 'in�i',
 
 'exif-sensingmethod-1' => 'Nedefinirano',
@@ -2460,21 +2949,10 @@ $1
 Potvrdite namjeru vraćanja ovog �lanka.",
 'recreate'            => 'Vrati',
 
-# HTML dump
-'redirectingto' => 'Preusmjeravam na [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Isprazniti međuspremnik stranice?
-
-$1',
 'confirm_purge_button' => 'U redu',
-
-# AJAX search
-'searchcontaining' => "Traži �lanke koji sadržavaju ''$1''.",
-'searchnamed'      => "Traži �lanke po imenu ''$1''.",
-'articletitles'    => "Članci koji po�inju s ''$1''",
-'hideresults'      => 'Sakrij rezultate',
-'useajaxsearch'    => 'Koristite AJAX-pretragu',
+'confirm-purge-top'    => 'Isprazniti međuspremnik stranice?',
+'confirm-purge-bottom' => 'Čišćenje stranice �isti priru�nu memoriju i prikazuje trenuta�nu ina�icu stranice.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� prethodna slika',
@@ -2537,6 +3015,7 @@ Također možete koristiti [[Special:Watchlist/edit|uređivanje popisa putem ''k
 
 # Core parser functions
 'unknown_extension_tag' => "Nepoznat ''tag'' ekstenzije \"\$1\"",
+'duplicate-defaultsort' => 'Upozorenje: Glavni raspored "$2" poništava raniji glavni raspored "$1".',
 
 # Special:Version
 'version'                          => 'Verzija softvera', # Not used as normal message but as header for the special page itself
@@ -2565,13 +3044,13 @@ Također možete koristiti [[Special:Watchlist/edit|uređivanje popisa putem ''k
 'filepath-submit'  => 'Putanja',
 'filepath-summary' => "Ova posebna stranica daje Vam kompletnu putanju do neke datoteke. Slike se na taj na�in prikazuju u punoj rezoluciji, drugi tipovi datoteka se otvaraju na klik (kako je već namješteno u vašem operacijskom sustavu).
 
-Unesite ime datoteke bez predmetka (''prefiksa'') imenskog prostora \"{{ns:image}}:\".",
+Unesite ime datoteke bez predmetka (''prefiksa'') imenskog prostora \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Traži kopije datoteka',
 'fileduplicatesearch-summary'  => 'Traži kopije datoteka na temelju njihove hash vrijednosti.
 
-Unesite ime datoteke bez prefiksa "{{ns:image}}:"',
+Unesite ime datoteke bez prefiksa "{{ns:file}}:"',
 'fileduplicatesearch-legend'   => 'Traži kopije datoteka',
 'fileduplicatesearch-filename' => 'Ime datoteke:',
 'fileduplicatesearch-submit'   => 'Traži',
@@ -2601,4 +3080,13 @@ Unesite ime datoteke bez prefiksa "{{ns:image}}:"',
 'blankpage'              => 'Prazna stranica',
 'intentionallyblankpage' => 'Ova stranica je namjerno ostavljena praznom',
 
+# External image whitelist
+'external_image_whitelist' => ' #Ovaj redak ostavite to�no ovakvim kakav je<pre>
+#Stavite ulomke s regularnim izrazom (samo dio koji ide između //) ispod
+#Ovo će biti usklađeno s URL-ovima vanjskih slika (hotlink)
+#Oni koji se poklapaju će biti prikazani kao slike, u suprotnom će biti prikazana samo poveznica do slike
+#Redovi koji po�inju sa # smatraju se komentarom.
+
+#Stavite sve regularne izraze iznad ovog reda. Ostavite ovaj redak to�no ovakvim kakav je</pre>',
+
 );
diff --git a/languages/messages/MessagesHsb.php b/languages/messages/MessagesHsb.php
index d9fc36a9..e86b73e3 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -15,14 +15,12 @@ $fallback = 'de';
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Specialnje',
-	NS_MAIN             => '',
 	NS_TALK             => 'Diskusija',
 	NS_USER             => 'Wužiwar',
 	NS_USER_TALK        => 'Diskusija_z_wužiwarjom',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_diskusija',
-	NS_IMAGE            => 'Wobraz',
-	NS_IMAGE_TALK       => 'Diskusija_k_wobrazej',
+	NS_FILE             => 'Dataja',
+	NS_FILE_TALK        => 'Diskusija_k_dataji',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskusija',
 	NS_TEMPLATE         => 'Předłoha',
@@ -30,80 +28,95 @@ $namespaceNames = array(
 	NS_HELP             => 'Pomoc',
 	NS_HELP_TALK        => 'Pomoc_diskusija',
 	NS_CATEGORY         => 'Kategorija',
-	NS_CATEGORY_TALK    => 'Diskusija_ke_kategoriji'
+	NS_CATEGORY_TALK    => 'Diskusija_ke_kategoriji',
+);
+
+$namespaceAliases = array(
+	'Wobraz' => NS_FILE,
+	'Diskusija_k_wobrazej' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( "Dwójne_daleposrědkowanja" ),
-	'BrokenRedirects'           => array( "Skóncowane_daleposrědkowanja" ),
-	'Disambiguations'           => array( "Rozjasnjenja_wjazmyslnosće" ),
-	'Userlogin'                 => array( "Přizwjewić" ),
-	'Userlogout'                => array( "Wotzjewić" ),
-	'Preferences'               => array( "Nastajenja" ),
-	'Watchlist'                 => array( "Wobkedźbowanki" ),
-	'Recentchanges'             => array( "Aktualne_změny" ),
-	'Upload'                    => array( "Nahraće" ),
-	'Imagelist'                 => array( "Dataje" ),
-	'Newimages'                 => array( "Nowe_dataje" ),
-	'Listusers'                 => array( "Wužiwarjo" ),
-	'Statistics'                => array( "Statistika" ),
-	'Randompage'                => array( "Připadna_strona" ),
-	'Lonelypages'               => array( "Wosyroćene_strony" ),
-	'Uncategorizedpages'        => array( "Njekategorizowane_strony" ),
-	'Uncategorizedcategories'   => array( "Njekategorizowane_kategorije" ),
-	'Uncategorizedimages'       => array( "Njekategorizowane_dataje" ),
-	'Uncategorizedtemplates'    => array( "Njekategorizowane_předłohi" ),
-	'Unusedcategories'          => array( "Njewužiwane_kategorije" ),
-	'Unusedimages'              => array( "Njewužiwane_dataje" ),
-	'Wantedpages'               => array( "Požadane_strony" ),
-	'Wantedcategories'          => array( "Požadane_kategorije" ),
-	'Mostlinked'                => array( "Z_najwjace_stronami_zwjazane_strony" ),
-	'Mostlinkedcategories'      => array( "Najhusćišo_wužiwane_kategorije" ),
-	'Mostlinkedtemplates'       => array( "Najhusćišo_wužiwane_předłohi" ),
-	'Mostcategories'            => array( "Strony_z_najwjace_kategorijemi" ),
-	'Mostimages'                => array( "Z_najwjace_stronami_zwjazane_dataje" ),
-	'Mostrevisions'             => array( "Strony_z_najwjace_wersijemi" ),
-	'Fewestrevisions'           => array( "Strony_z_najmjenje_wersijemi" ),
-	'Shortpages'                => array( "Najkrótše_strony" ),
-	'Longpages'                 => array( "Najdlěše_strony" ),
-	'Newpages'                  => array( "Nowe_strony" ),
-	'Ancientpages'              => array( "Najstarše_strony" ),
-	'Deadendpages'              => array( "Strony_bjez_wotkazow" ),
-	'Protectedpages'            => array( "Å kitane_strony" ),
-	'Allpages'                  => array( "Wšě_strony" ),
-	'Prefixindex'               => array( "Prefiksindeks" ),
-	'Ipblocklist'               => array( "Blokowane_IP-adresy" ),
-	'Specialpages'              => array( "Specialne_strony" ),
-	'Contributions'             => array( "Přinoški" ),
-	'Emailuser'                 => array( "E-Mejl" ),
-	'Whatlinkshere'             => array( "Lisćina_wotkazow" ),
-	'Recentchangeslinked'       => array( "Změny_zwjazanych_stronow" ),
-	'Movepage'                  => array( "Přesunyć" ),
-	'Blockme'                   => array( "Blokowanje_proksijow" ),
-	'Booksources'               => array( "Pytanje_po_ISBN" ),
-	'Categories'                => array( "Kategorije" ),
-	'Export'                    => array( "Eksport" ),
-	'Version'                   => array( "Wersija" ),
-	'Allmessages'               => array( "MediaWiki-zdźělenki" ),
-	'Log'                       => array( "Protokol" ),
-	'Blockip'                   => array( "Blokować" ),
-	'Undelete'                  => array( "Wobnowić" ),
-	'Import'                    => array( "Import" ),
-	'Lockdb'                    => array( "Datowu_banku_zamknyć" ),
-	'Unlockdb'                  => array( "Datowu_banku_wotamknyć" ),
-	'Userrights'                => array( "Prawa" ),
-	'MIMEsearch'                => array( "Pytanje_po_MIME" ),
-	'Unwatchedpages'            => array( "Njewobkedźbowane_strony" ),
-	'Listredirects'             => array( "Daleposrědkowanja" ),
-	'Revisiondelete'            => array( "Wušmórnjenje_wersijow" ),
-	'Unusedtemplates'           => array( "Njewužiwane_předłohi" ),
-	'Randomredirect'            => array( "Připadne_daleposrědkowanje" ),
-	'Mypage'                    => array( "Moja_wužiwarska_strona" ),
-	'Mytalk'                    => array( "Moja_diskusijna_strona" ),
-	'Mycontributions'           => array( "Moje_přinoški" ),
-	'Listadmins'                => array( "Administratorojo" ),
-	'Search'                    => array( "Pytać" ),
-	'Withoutinterwiki'          => array( "Falowace_mjezyrě�ne_wotkazy" ),
+	'DoubleRedirects'           => array( 'Dwójne daleposrědkowanja' ),
+	'BrokenRedirects'           => array( 'Skóncowane daleposrědkowanja' ),
+	'Disambiguations'           => array( 'Rozjasnjenja wjazmyslnosće' ),
+	'Userlogin'                 => array( 'Přizwjewić' ),
+	'Userlogout'                => array( 'Wotzjewić' ),
+	'CreateAccount'             => array( 'Konto wutworić' ),
+	'Preferences'               => array( 'Nastajenja' ),
+	'Watchlist'                 => array( 'Wobkedźbowanki' ),
+	'Recentchanges'             => array( 'Aktualne změny' ),
+	'Upload'                    => array( 'Nahraće' ),
+	'Listfiles'                 => array( 'Dataje' ),
+	'Newimages'                 => array( 'Nowe dataje' ),
+	'Listusers'                 => array( 'Wužiwarjo' ),
+	'Listgrouprights'           => array( 'Skupinske prawa' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Připadna strona' ),
+	'Lonelypages'               => array( 'Wosyroćene strony' ),
+	'Uncategorizedpages'        => array( 'Njekategorizowane strony' ),
+	'Uncategorizedcategories'   => array( 'Njekategorizowane kategorije' ),
+	'Uncategorizedimages'       => array( 'Njekategorizowane dataje' ),
+	'Uncategorizedtemplates'    => array( 'Njekategorizowane předłohi' ),
+	'Unusedcategories'          => array( 'Njewužiwane kategorije' ),
+	'Unusedimages'              => array( 'Njewužiwane dataje' ),
+	'Wantedpages'               => array( 'Požadane strony' ),
+	'Wantedcategories'          => array( 'Požadane kategorije' ),
+	'Mostlinked'                => array( 'Z najwjace stronami zwjazane strony' ),
+	'Mostlinkedcategories'      => array( 'Najhusćišo wužiwane kategorije' ),
+	'Mostlinkedtemplates'       => array( 'Najhusćišo wužiwane předłohi' ),
+	'Mostcategories'            => array( 'Strony z najwjace kategorijemi' ),
+	'Mostimages'                => array( 'Z najwjace stronami zwjazane dataje' ),
+	'Mostrevisions'             => array( 'Strony z najwjace wersijemi' ),
+	'Fewestrevisions'           => array( 'Strony z najmjenje wersijemi' ),
+	'Shortpages'                => array( 'Najkrótše strony' ),
+	'Longpages'                 => array( 'Najdlěše strony' ),
+	'Newpages'                  => array( 'Nowe strony' ),
+	'Ancientpages'              => array( 'Najstarše strony' ),
+	'Deadendpages'              => array( 'Strony bjez wotkazow' ),
+	'Protectedpages'            => array( 'Å kitane strony' ),
+	'Protectedtitles'           => array( 'Å kitane titule' ),
+	'Allpages'                  => array( 'WÅ¡Ä› strony' ),
+	'Prefixindex'               => array( 'Prefiksindeks' ),
+	'Ipblocklist'               => array( 'Blokowane IP-adresy' ),
+	'Specialpages'              => array( 'Specialne strony' ),
+	'Contributions'             => array( 'Přinoški' ),
+	'Emailuser'                 => array( 'E-Mejl' ),
+	'Confirmemail'              => array( 'E-Mejl potwjerdźić' ),
+	'Whatlinkshere'             => array( 'Lisćina wotkazow' ),
+	'Recentchangeslinked'       => array( 'Změny zwjazanych stronow' ),
+	'Movepage'                  => array( 'Přesunyć' ),
+	'Blockme'                   => array( 'Blokowanje proksijow' ),
+	'Booksources'               => array( 'Pytanje po ISBN' ),
+	'Categories'                => array( 'Kategorije' ),
+	'Export'                    => array( 'Eksport' ),
+	'Version'                   => array( 'Wersija' ),
+	'Allmessages'               => array( 'MediaWiki-zdźělenki' ),
+	'Log'                       => array( 'Protokol' ),
+	'Blockip'                   => array( 'Blokować' ),
+	'Undelete'                  => array( 'Wobnowić' ),
+	'Lockdb'                    => array( 'Datowu banku zamknyć' ),
+	'Unlockdb'                  => array( 'Datowu banku wotamknyć' ),
+	'Userrights'                => array( 'Prawa' ),
+	'MIMEsearch'                => array( 'Pytanje po MIME' ),
+	'FileDuplicateSearch'       => array( 'Duplikatowe pytanje' ),
+	'Unwatchedpages'            => array( 'Njewobkedźbowane strony' ),
+	'Listredirects'             => array( 'Daleposrědkowanja' ),
+	'Revisiondelete'            => array( 'Wušmórnjenje wersijow' ),
+	'Unusedtemplates'           => array( 'Njewužiwane předłohi' ),
+	'Randomredirect'            => array( 'Připadne daleposrědkowanje' ),
+	'Mypage'                    => array( 'Moja wužiwarska strona' ),
+	'Mytalk'                    => array( 'Moja diskusijna strona' ),
+	'Mycontributions'           => array( 'Moje přinoški' ),
+	'Listadmins'                => array( 'Administratorojo' ),
+	'Listbots'                  => array( 'Boćiki' ),
+	'Popularpages'              => array( 'Najwoblubowaniše strony' ),
+	'Search'                    => array( 'Pytać' ),
+	'Resetpass'                 => array( 'Hesło wróćo stajić' ),
+	'Withoutinterwiki'          => array( 'Falowace mjezyrě�ne wotkazy' ),
+	'MergeHistory'              => array( 'Stawizny zjednoćić' ),
+	'Filepath'                  => array( 'Datajowy puć' ),
+	'Invalidateemail'           => array( 'Njepłaćiwa e-mejl' ),
 );
 
 $messages = array(
@@ -144,17 +157,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Moje změny we wobkedźbowankach schować',
 'tog-watchlisthidebots'       => 'Změny awtomatiskich programow (botow) we wobkedźbowankach schować',
 'tog-watchlisthideminor'      => 'Snadne změny we wobkedźbowankach schować',
+'tog-watchlisthideliu'        => 'Změny přizjewjenych wužiwarjow z wobkedźbowankow schować',
+'tog-watchlisthideanons'      => 'Změny anonymnych wužiwarjow z wobkedźbowankow schować',
 'tog-nolangconversion'        => 'Konwertowanje rě�nych wariantow znjemóžnić',
 'tog-ccmeonemails'            => 'Kopije mejlkow dóstać, kiž druhim wužiwarjam pósćelu',
 'tog-diffonly'                => 'Jenož rozdźěle pokazać (nic pak zbytny wobsah)',
 'tog-showhiddencats'          => 'Schowane kategorije pokazać',
+'tog-norollbackdiff'          => 'Rozdźěl po wróćostajenju zanjechać',
 
 'underline-always'  => 'přeco',
 'underline-never'   => 'ženje',
 'underline-default' => 'po standardźe wobhladowaka',
 
-'skinpreview' => '(Přehlad)',
-
 # Dates
 'sunday'        => 'Njedźela',
 'monday'        => 'Póndźela',
@@ -248,7 +262,7 @@ $messages = array(
 'mytalk'         => 'Moja diskusija',
 'anontalk'       => 'Z tutej IP diskutować',
 'navigation'     => 'Nawigacija',
-'and'            => 'a',
+'and'            => '&#32;a',
 
 # Metadata in edit box
 'metadata_help' => 'Metadaty:',
@@ -285,14 +299,14 @@ $messages = array(
 'talkpagelinktext'  => 'diskusija',
 'specialpage'       => 'Specialna strona',
 'personaltools'     => 'Wosobinske nastroje',
-'postcomment'       => 'Komentar dodać',
+'postcomment'       => 'Nowy wotrězk',
 'articlepage'       => 'Nastawk',
 'talk'              => 'diskusija',
 'views'             => 'Zwobraznjenja',
 'toolbox'           => 'Nastroje',
 'userpage'          => 'Wužiwarsku stronu pokazać',
 'projectpage'       => 'Projektowu stronu pokazać',
-'imagepage'         => 'Wobrazowu stronu pokazać',
+'imagepage'         => 'Datajowu stronu sej wobhladać',
 'mediawikipage'     => 'Zdźělenku pokazać',
 'templatepage'      => 'Předłohu pokazać',
 'viewhelppage'      => 'Pomocnu stronu pokazać',
@@ -311,8 +325,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Wo {{GRAMMAR:lokatiw|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Wo',
-'bugreports'           => 'Zmylkowe wopisanja',
-'bugreportspage'       => 'Project:Zmylkowe wopisanja',
 'copyright'            => 'Wobsah steji pod $1.',
 'copyrightpagename'    => '{{SITENAME}} awtorske prawa',
 'copyrightpage'        => '{{ns:project}}:Awtorske prawa',
@@ -335,9 +347,7 @@ $messages = array(
 
 'badaccess'        => 'Nimaš wotpowědne dowolnosće',
 'badaccess-group0' => 'Nimaš wotpowědne dowolnosće za tutu akciju.',
-'badaccess-group1' => 'Tuta akcija da so jenož wot wužiwarjow skupiny $1 wuwjesć.',
-'badaccess-group2' => 'Tuta akcija da so jenož wot wužiwarjow skupin $1 wuwjesć.',
-'badaccess-groups' => 'Tuta akcija da so jenož wot wužiwarjow skupin $1 wuwjesć.',
+'badaccess-groups' => 'Akcija, kotruž sy požadał, wobmjezuje so na wužiwarjow w {{PLURAL:$2|skupinje|jednej ze skupinow}}: $1.',
 
 'versionrequired'     => 'Wersija $1 softwary MediaWiki trěbna',
 'versionrequiredtext' => 'Wersija $1 MediaWiki je trěbna, zo by so tuta strona wužiwać móhła. Hlej [[Special:Version|wersijowu stronu]]',
@@ -351,6 +361,8 @@ $messages = array(
 'editsection'             => 'wobdźěłać',
 'editold'                 => 'wobdźěłać',
 'viewsourceold'           => 'Žórło wobhladać',
+'editlink'                => 'wobdźěłać',
+'viewsourcelink'          => 'žórło wobhladać',
 'editsectionhint'         => 'Wotrězk wobdźěłać: $1',
 'toc'                     => 'Wobsah',
 'showtoc'                 => 'pokazać',
@@ -365,7 +377,7 @@ $messages = array(
 'site-atom-feed'          => 'Atom-kanal za $1',
 'page-rss-feed'           => 'RSS-kanal za „$1“',
 'page-atom-feed'          => 'Atom-Kanal za „$1“',
-'red-link-title'          => '$1 (strona hišće njepisana)',
+'red-link-title'          => '$1 (strona njeeksistuje)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Nastawk',
@@ -381,7 +393,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Žana tajka akcija',
-'nosuchactiontext'  => 'Akcija podata z URL njebu wot wikija připóznata.',
+'nosuchactiontext'  => 'Akcija, kotruž URL podawa, je njepłaćiwa.
+Sy so snano při zapodaću URL zapisał abo sy wopa�nemu wotkazej slědował.
+To móhło tež programowanski zmylk w {{GRAMMAR:lokatiw|{{SITENAME}}}} być.',
 'nosuchspecialpage' => 'Tuta specialna strona njeeksistuje.',
 'nospecialpagetext' => "<big>'''Tuta specialna strona wikiju njeeksistuje.'''</big>
 
@@ -433,7 +447,6 @@ Zdźěl to proÅ¡u [[Special:ListUsers/sysop|admininistratorej]] podawajo wotpowÄ
 'cannotdelete'         => 'Njeje móžno podatu stronu abo dataju wušmórnyć. (Po zdaću je to hižo něchtó druhi �inił.)',
 'badtitle'             => 'Wopa�ny titul',
 'badtitletext'         => 'Požadane mjeno strony běše njepłaćiwy, prózdny abo njekorektny titul z mjezyrěcneho abo interwikijoweho wotkaza. Snano wobsahuje jedne znamješko abo wjacore znamješka, kotrež w titulach dowolene njejsu.',
-'perfdisabled'         => 'Wodaj! Tuta funkcija bu nachwilnje znjemóžnjena, dokelž datowu banku tak spomaluje, zo hižo nichtó wiki wužiwać njemóže.',
 'perfcached'           => 'Sćěhowace daty z pufrowaka pochadźeja a snano cyle aktualne njejsu.',
 'perfcachedts'         => 'Sćěhowace daty su z pufrowaka a buchu $1 posledni raz zaktualizowane.',
 'querypage-no-updates' => "'''Aktualizacija za tutu stronu je tuchwilu znjemóžnjena. Daty so ha� na dalše njewobnowjeja.'''",
@@ -449,7 +462,7 @@ Wotprašenje: $2',
 'protectedpagetext'    => 'Strona je přećiwo wobdźěłowanju škitana.',
 'viewsourcetext'       => 'Móžeš pak jeje žórło wobhladać a jo kopěrować:',
 'protectedinterface'   => 'Tuta strona skići tekst za rě�ny zwjerch a je škitana zo by so znjewužiwanju zadźěwało.',
-'editinginterface'     => '<b>Kedźbu:</b> Wobdźěłuješ stronu, kotraž wobsahuje tekst za rě�ny zwjerch. Změny wuskutkuja so bjezposrědnje za wšěch druhich wužiwarjow tutoho rě�neho zwjercha.',
+'editinginterface'     => "'''Warnowanje:''' Wobdźěłuješ stronu, kotraž so wužiwa, zo by tekst za softwaru k dispoziciji stajiła. Změny wuskutkuja so na napohlad wužiwarskeho powjercha za druhich wužiwarjow. Hlej za přełožki [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], projekt lokalizacije MediaWiki.",
 'sqlhidden'            => '(SQL wotprašenje schowane)',
 'cascadeprotected'     => 'Strona je za wobdźěłowanje zawrjena, dokelž je w {{PLURAL:$1|slědowacej stronje|slědowacymaj stronomaj|slědowacych stronach}} zapřijata, {{PLURAL:$1|kotraž je|kotrejž stej|kotrež su}} přez kaskadowu opciju {{PLURAL:$1|škitana|škitanej|škitane}}:
 $2',
@@ -460,14 +473,14 @@ $2',
 Podata při�ina je ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Å patna konfiguracija: njeznaty wirusowy skener: <i>$1</i>',
+'virus-badscanner'     => "Å patna konfiguracija: njeznaty wirusowy skener: ''$1''",
 'virus-scanfailed'     => 'Skenowanje njeporadźiło (kode $1)',
 'virus-unknownscanner' => 'njeznaty antiwirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Wotzjewjenje',
-'logouttext'                 => '<strong>Sy nětko wotzjewjeny.</strong><br />
-Móžeš {{GRAMMAR:akuzatiw|{{SITENAME}}}} nětko anonymnje dale wužiwać abo so ze samsnym abo druhim wužiwarskim mjenom zaso přizjewić. Wobkedźbuj zo so někotre strony dale jewja kaž by hišće přizjewjeny był doniž pufrowak swojeho wobhladowaka njewuprózdnješ.',
+'logouttext'                 => "'''Sy nětko wotzjewjeny.'''<br />
+Móžeš {{GRAMMAR:akuzatiw|{{SITENAME}}}} nětko anonymnje dale wužiwać abo so ze samsnym abo druhim wužiwarskim mjenom zaso přizjewić. Wobkedźbuj zo so někotre strony dale jewja kaž by hišće přizjewjeny był doniž pufrowak swojeho wobhladowaka njewuprózdnješ.",
 'welcomecreation'            => '== Witaj, $1! ==
 
 Twoje konto bu wutworjene. Njezabudź swoje nastajenja za [[Special:Preferences|{{GRAMMAR:akuzatiw|{{SITENAME}}}}]] změnić.',
@@ -478,9 +491,6 @@ Twoje konto bu wutworjene. Njezabudź swoje nastajenja za [[Special:Preferences|
 'remembermypassword'         => 'Hesło na tutym li�aku sej spomjatkować',
 'yourdomainname'             => 'Twoja domejna',
 'externaldberror'            => 'Běše pak eksterny zmylk awtentifikacije datoweje banki, pak njesměš swoje eksterne konto aktualizować.',
-'loginproblem'               => '<b>Běše problem z přizjewjenjom.</b><br />
-
-Prošu spytaj hišće raz!',
 'login'                      => 'Přizjewić',
 'nav-login-createaccount'    => 'Konto wutworić abo so přizjewić',
 'loginprompt'                => 'Zo by so pola {{GRAMMAR:genitiw|{{SITENAME}}}} přizjewić móhł, dyrbja so placki (cookies) zmóžnić.',
@@ -505,7 +515,8 @@ Prošu spytaj hišće raz!',
 'yourvariant'                => 'Warianta:',
 'yournick'                   => 'Podpis:',
 'badsig'                     => 'Njepłaćiwa signatura, prošu HTML přepruwować.',
-'badsiglength'               => 'Podpis smě maksimalnje $1 {{PLURAL:$1|znamješko|znamješce|znamješka|znamješkow}} dołhi być.',
+'badsiglength'               => 'Twoja signatura je předołha.
+Smě mjenje ha� $1 {{PLURAL:$1|znamješko|znamješce|znamješka|znamješkow}} dołha być.',
 'email'                      => 'E-mejl',
 'prefs-help-realname'        => '* Woprawdźite mjeno (opcionalne): jeli so rozsudźiš to zapodać, budźe to so wužiwać, zo by tebi woprawnjenje za twoje dźěło dało.',
 'loginerror'                 => 'Zmylk při přizjewjenju',
@@ -516,7 +527,9 @@ Prošu spytaj hišće raz!',
 'noname'                     => 'Njejsy płaćiwe wužiwarske mjeno podał.',
 'loginsuccesstitle'          => 'Přizjewjenje wuspěšne',
 'loginsuccess'               => '<b>Sy nětko jako „$1� w {{GRAMMAR:lokatiw|{{SITENAME}}}} přizjewjeny.</b>',
-'nosuchuser'                 => 'Njeje wužiwar z mjenom "$1". Přepruwuj swój prawopis abo [[Special:UserLogin/signup|wutwor nowe konto]].',
+'nosuchuser'                 => 'Njeje wužiwar z mjenom "$1".
+Wužiwarske mjena wobkedźbuja wulkopisanje.
+Přepruwuj swój prawopis abo [[Special:UserLogin/signup|wutwor nowe konto]].',
 'nosuchusershort'            => 'Wužiwarske mjeno „<nowiki>$1</nowiki>� njeeksistuje. Prošu přepruwuj prawopis.',
 'nouserspecified'            => 'Dyrbiš wužiwarske mjeno podać',
 'wrongpassword'              => 'Hesło, kotrež sy zapodał, je wopa�ne. Prošu spytaj hišće raz.',
@@ -524,7 +537,7 @@ Prošu spytaj hišće raz!',
 'passwordtooshort'           => 'Hesło je překrótke. Dyrbi znajmjeńša $1 {{PLURAL:$1|znamješko|znamješce|znamješka|znamješkow}} měć.',
 'mailmypassword'             => 'Nowe hesło e-mejlować',
 'passwordremindertitle'      => 'Skedźbnjenje na hesło z {{GRAMMAR:genitiw|{{SITENAME}}}}',
-'passwordremindertext'       => 'Něchtó z IP-adresu $1 (najskerje ty) je wo nowe hesło za přizjewjenje za {{GRAMMAR:Akuzatiw|{{SITENAME}}}} ($4) prosył. Nachwilne hesło za wužiwarja "$2" je so wutworiło a je nětko "$3". Jeli je to twój wotpohlad było dyrbiš so nětko přizjewić a now hesło wubrać.
+'passwordremindertext'       => 'Něchtó z IP-adresu $1 (najskerje ty) je wo nowe hesło za přizjewjenje za {{GRAMMAR:Akuzatiw|{{SITENAME}}}} ($4) prosył. Nachwilne hesło za wužiwarja "$2" je so wutworiło a je nětko "$3". Jeli je to twój wotpohlad było dyrbiš so nětko přizjewić a nowe hesło wubrać.
 
 Jeli něchtó druhi wo nowe hesło prosył abo ty sy so zaso na swoje hesło dopomnił a hižo nochceš je změnić, móžeš tutu powěsć ignorować a swoje stare hesło dale wužiwać.',
 'noemail'                    => 'Za wužiwarja $1 žana e-mejlowa adresa podata njeje.',
@@ -535,10 +548,10 @@ Prošu přizjew so znowa, po tym zo sy je přijał.',
 Prjedy ha� so druha mejlka ke kontu pósćele, dyrbiš so po instrukcijach w mejlce měć, zo by wobkrućił, zo konto je woprawdźe twoje.',
 'throttled-mailpassword'     => 'Bu hižo nowe hesło za {{PLURAL:$1|poslednju hodźinu|poslednjej $1 hodźinje|poslednje $1 hodźiny|poslednich $1 hodźin}} pósłane. Zo by znjewužiwanju zadźěwało, so jenož jedne hesło na {{PLURAL:$1|hodźinu|$1 hodźinje|$1 hodźiny|$1 hodźinow}} pósćele.',
 'mailerror'                  => 'Zmylk při słanju mejlki: $1',
-'acct_creation_throttle_hit' => 'Wodaj, sy hižo $1 {{PLURAL:$1|konto|kontaj|konty|kontow}} wutworił. Njemóžeš dalše wutworić.',
-'emailauthenticated'         => 'Twoja e-mejlowa adresa bu $1 wobkrućena.',
+'acct_creation_throttle_hit' => 'Wopytowarjo tutoho wikija, kotřiž twoju IP-adresu wužiwaja, su {{PLURAL:$1|1 konto|$1 kontaj|$1 konty|$1 kontow}} posledni dźeń wutworił, štož je maksimalna li�ba za tutu periodu. Wopytowarjo, kotřiž tutu IP-adresu wužiwaja, njemóža tuchwilu dalše konta wutworić.',
+'emailauthenticated'         => 'Twoja e-mejlowa adresa bu $2 $3 hodź. wobkrućena.',
 'emailnotauthenticated'      => 'Twoja e-mejlowa adresa hišće wobkrućena <strong>njeje</strong>. Žane mejlki za jednu z sćěhowacych funkcijow pósłane njebudu.',
-'noemailprefs'               => 'Podaj e-mejlowu adresu za tute funkcije, zo bychu fungowali.',
+'noemailprefs'               => 'Podaj e-mejlowu adresu w swojich nastajenjach, zo bychu tute funkcije k dispoziciji stali.',
 'emailconfirmlink'           => 'Wobkruć swoju e-mejlowu adresu',
 'invalidemailaddress'        => 'E-mejlowa adresa so njeakceptuje, dokelž ma po zdaću njepłaćiwy format. Prošu zapodaj płaćiwu adresu abo wuprózdń te polo.',
 'accountcreated'             => 'Wužiwarske konto wutworjene',
@@ -547,18 +560,26 @@ Prjedy ha� so druha mejlka ke kontu pósćele, dyrbiš so po instrukcijach w me
 'createaccount-text'         => 'Něchtó je wužiwarske konto za twoju e-mejlowu adresu na {{SITENAME}} ($4) z mjenom "$2" z hesłom "$3" wutworił. Ty měł so nětko přizjewić a swoje hesło změnić.
 
 Móžeš tutu zdźělenku ignorować, jeli so wužiwarske konto zmylnje wutworiło.',
+'login-throttled'            => 'Sy přehusto spytał wopa�ne hesło zapodać. Po�akaj prošu, prjedy ha� spytaj znowa.',
 'loginlanguagelabel'         => 'Rě�: $1',
 
 # Password reset dialog
-'resetpass'               => 'Hesło za wužiwarske konto wróćo stajić',
-'resetpass_announce'      => 'Sy so z nachwilnym e-mejlowanym hesłom přizjewił. Zo by přizjewjenje zakón�ił, dyrbiš nětko nowe hesło postajić.',
-'resetpass_text'          => '<!-- Tu tekst zasunyć -->',
-'resetpass_header'        => 'Kontowe hesło změniś',
-'resetpass_submit'        => 'Hesło posrědkować a so přizjewić',
-'resetpass_success'       => 'Twoje hesło bu wuspěšnje změnjene! Nětko přizjewjenje běži...',
-'resetpass_bad_temporary' => 'Njepłaćiwe nachwilne hesło. Snano sy swoje hesło hižo wuspěšnje změnił abo nowe nachwilne hesło požadał.',
-'resetpass_forbidden'     => 'Hesła njedadźa so změnić.',
-'resetpass_missing'       => 'Prózdny formular.',
+'resetpass'                 => 'Hesło změnić',
+'resetpass_announce'        => 'Sy so z nachwilnym e-mejlowanym hesłom přizjewił. Zo by přizjewjenje zakón�ił, dyrbiš nětko nowe hesło postajić.',
+'resetpass_text'            => '<!-- Tu tekst zasunyć -->',
+'resetpass_header'          => 'Kontowe hesło změniś',
+'oldpassword'               => 'Stare hesło:',
+'newpassword'               => 'Nowe hesło:',
+'retypenew'                 => 'Nowe hesło wospjetować:',
+'resetpass_submit'          => 'Hesło posrědkować a so přizjewić',
+'resetpass_success'         => 'Twoje hesło bu wuspěšnje změnjene! Nětko přizjewjenje běži...',
+'resetpass_bad_temporary'   => 'Njepłaćiwe nachwilne hesło. Snano sy swoje hesło hižo wuspěšnje změnił abo nowe nachwilne hesło požadał.',
+'resetpass_forbidden'       => 'Hesła njedadźa so změnić.',
+'resetpass-no-info'         => 'Dyrbiš so přizjewić, zo by direktny přistup na tutu stronu měł.',
+'resetpass-submit-loggedin' => 'Hesło změnić',
+'resetpass-wrong-oldpass'   => 'Njepłaćiwe nachwilne abo aktualne hesło.
+Snano sy swoje hesło hižo wuspěšnje změnił abo nowe nachwilne hesło požadał.',
+'resetpass-temp-password'   => 'Nachwilne hesło:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tu�ny tekst',
@@ -583,8 +604,8 @@ MóžeÅ¡ tutu zdźělenku ignorować, jeli so wužiwarske konto zmylnje wutworiÅ
 'hr_tip'          => 'Wodoruna linija (zrědka wužiwać!)',
 
 # Edit pages
-'summary'                          => 'Zjeće',
-'subject'                          => 'Tema/Nadpismo',
+'summary'                          => 'Zjeće:',
+'subject'                          => 'Tema/Nadpismo:',
 'minoredit'                        => 'Snadna změna',
 'watchthis'                        => 'Stronu wobkedźbować',
 'savearticle'                      => 'Składować',
@@ -596,8 +617,8 @@ MóžeÅ¡ tutu zdźělenku ignorować, jeli so wužiwarske konto zmylnje wutworiÅ
 'missingsummary'                   => '<b>Kedźbu:</b> Njejsy žane zjeće zapodał. Jeli hišće raz na „Składować� kliknješ so twoje změny bjez komentara składuja.',
 'missingcommenttext'               => 'Prošu zapodaj zjeće.',
 'missingcommentheader'             => '<b>Kedźbu:</b> Njejsy nadpis za tutón komentar podał. Jeli na „Składować� kliknješ, składuje so twoja změna bjez nadpisa.',
-'summary-preview'                  => 'Přehlad zjeća',
-'subject-preview'                  => 'Přehlad temy',
+'summary-preview'                  => 'Přehlad zjeća:',
+'subject-preview'                  => 'Přehlad temy:',
 'blockedtitle'                     => 'Wužiwar je zablokowany',
 'blockedtext'                      => "<big>'''Twoje wužiwarske mjeno abo twoja IP-adresa bu zablokowane.'''</big>
 
@@ -643,53 +664,55 @@ ProÅ¡u podaj wÅ¡Ä› horjeka naspomnjene podrobnosće w napraÅ¡owanjach, kotrež Ä
 'newarticle'                       => '(Nowy nastawk)',
 'newarticletext'                   => 'Sy wotkaz k stronje slědował, kotraž hišće njeeksistuje. Zo by stronu wutworił, wupjelń slědowace tekstowe polo (hlej [[{{MediaWiki:Helppage}}|stronu pomocy]] za dalše informacije). Jeli sy zmylnje tu, klikń prosće na tłó�atko <b>Wróćo</b> we swojim wobhladowaku.',
 'anontalkpagetext'                 => "---- ''To je diskusijna strona za anonymneho wužiwarja, kiž hišće konto wutworił njeje abo je njewužiwa. Dyrbimy tohodla numerisku IP-adresu wužiwać, zo bychmy jeho/ju identifikowali. Tajka IP-adresa hodźi so wot wjacorych wužiwarjow zhromadnje wužiwać. Jeli sy anonymny wužiwar a měniš, zo buchu irelewantne komentary k tebi pósłane, [[Special:UserLogin/signup|wutwor prošu konto]] abo [[Special:UserLogin|přizjew so]], zo by přichodnu šmjatańcu z anonymnymi wužiwarjemi wobešoł.''",
-'noarticletext'                    => 'Tuchwilu tuta strona žadyn tekst njewobsahuje, móžeš jeje titul w druhich stronach [[Special:Search/{{PAGENAME}}|pytać]] abo [{{fullurl:{{FULLPAGENAME}}|action=edit}} stronu wobdźěłać].',
+'noarticletext'                    => 'Tuchwilu tuta strona žadyn tekst njewobsahuje, móžeš [[Special:Search/{{PAGENAME}}|tutón titul strony na druhich stronach pytać]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} wotpowědne protokole pytać] abo [{{fullurl:{{FULLPAGENAME}}|action=edit}} tutu stronu wobdźěłać]</span>.',
 'userpage-userdoesnotexist'        => 'Wužiwarske konto „$1“ njeje zregistrowane. Prošu pruwuj, ha� chceš tutu stronu woprawdźe wutworić/wobdźěłać.',
 'clearyourcache'                   => '<b>Kedźbu:</b> Po składowanju dyrbiš snano pufrowak swojeho wobhladowaka wuprózdnić, <b>Mozilla/Firefox/Safari:</b> tłó� na <i>Umsch</i> kliknjo na <i>Znowa</i> abo tłó� <i>Strg-Umsch-R</i> (<i>Cmd-Shift-R</i> na Apple Mac); <b>IE:</b> tłó� <i>Strg</i> kliknjo na symbol <i>Aktualisieren</i> abo tłó� <i>Strg-F5</i>; <b>Konqueror:</b>: Klikń jenož na tłó�atko <i>Erneut laden</i> abo tło�  <i>F5</i>; Wužiwarjo <b>Opery</b> móža swój pufrowak dospołnje  w <i>Tools→Preferences</i> wuprózdnić.',
-'usercssjsyoucanpreview'           => '<strong>Pokiw:</strong> Wužij tłó�ku „Přehlad�, zo by swój nowy css/js do składowanja testował.',
+'usercssjsyoucanpreview'           => "'''Pokiw:''' Wužij tłó�ku „Přehlad�, zo by swój nowy css/js do składowanja testował.",
 'usercsspreview'                   => "'''Wobkedźbujće, zo sej jenož přehlad swojeho wužiwarskeho CSS wobhladuješ. Hišće njeje składowany!'''",
 'userjspreview'                    => "== Přehlad twojeho wosobinskeho JavaScript ==
 
 '''Kedźbu:''' Po składowanju dyrbiš pufrowak swojeho wobhladowaka wuprózdnić '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userinvalidcssjstitle'            => "'''Warnowanje:''' Skin z mjenom „$1� njeeksistuje. Prošu mysli na to, zo wosobinske strony .css a .js titul z małym pismikom wuwziwaja, na př. {{ns:user}}:Foo/monobook.css město {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Zaktualizowany)',
-'note'                             => '<strong>Kedźbu:</strong>',
-'previewnote'                      => '<strong>Kedźbu, to je jenož přehlad, změny hišće składowane njejsu!</strong>',
+'note'                             => "'''Kedźbu:'''",
+'previewnote'                      => "'''Kedźbu, to je jenož přehlad, změny hišće składowane njejsu!'''",
 'previewconflict'                  => 'Tutón přehlad tekst w hornim tekstowym polu zwobrazni kaž so zjewi, jeli jón składuješ.',
-'session_fail_preview'             => '<strong>Njemóžachmy twoju změnu předźěłać, dokelž su so posedźenske daty zhubili. Spytaj prošu hišće raz.
-Jeli to hišće njefunguje, [[Special:UserLogout|wotzjew so]] a přizjew so zaso.</strong>',
-'session_fail_preview_html'        => "<strong>Njemóžachmy twoje změnu předźěłać, dokelž su so posedźenske daty zhubili.</strong>
+'session_fail_preview'             => "'''Njemóžachmy twoju změnu předźěłać, dokelž su so posedźenske daty zhubili. Spytaj prošu hišće raz.
+Jeli to hišće njefunguje, [[Special:UserLogout|wotzjew so]] a přizjew so zaso.'''",
+'session_fail_preview_html'        => "'''Njemóžachmy twoje změnu předźěłać, dokelž su so posedźenske daty zhubili.'''
 
 ''Dokelž we {{GRAMMAR:lokatiw|{{SITENAME}}}} je luty HTML zmóžnił, je přehlad jako wěstotna naprawa přećiwo atakam přez JavaScript schowany.''
 
-<strong>Jeli to je legitimny wobdźěłowanski pospyt, spytaj prošu hišće raz. Jeli to hišće njefunguje, [[Special:UserLogout|wotzjew so]] a přizjew so znowa.</strong>",
-'token_suffix_mismatch'            => '<strong>Twoja změna je so wotpokazała, dokelž twój wobhladowak je znamješka skepsał.
-Składowanje móže wobsah strony zni�ić. Móže so to na přikład přez wopa�nje dźěłowacy proksy stać.</strong>',
+'''Jeli to je legitimny wobdźěłowanski pospyt, spytaj prošu hišće raz. Jeli to hišće njefunguje, [[Special:UserLogout|wotzjew so]] a přizjew so znowa.'''",
+'token_suffix_mismatch'            => "'''Twoja změna je so wotpokazała, dokelž twój wobhladowak je znamješka skepsał.
+Składowanje móže wobsah strony zni�ić. Móže so to na přikład přez wopa�nje dźěłowacy proksy stać.'''",
 'editing'                          => 'Wobdźěłanje strony $1',
 'editingsection'                   => 'Wobdźěłanje strony $1 (wotrězk)',
-'editingcomment'                   => 'Wobdźěłanje strony $1 (komentar)',
+'editingcomment'                   => '$1 so wobdźěłuje (nowy wotrězk)',
 'editconflict'                     => 'Wobdźěłowanski konflikt: $1',
 'explainconflict'                  => 'Něchtó druhi je stronu změnił w samsnym �asu, hdyž sy spytał ju wobdźěłować. Hornje tekstowe polo wobsahuje tekst strony kaž tuchwilu eksistuje. Twoje změny so w delnim tekstowym polu pokazuja. Dyrbiš swoje změny do eksistowaceho teksta zadźěłać. <b>Jenož</b> tekst w hornim tekstowym polu so składuje hdyž znowa na „Składować� kliknješ.<br />',
 'yourtext'                         => 'Twój tekst',
 'storedversion'                    => 'Składowana wersija',
-'nonunicodebrowser'                => '<strong>KEDŹBU: Twój wobhladowak z Unikodu kompatibelny njeje. Prošu wužiwaj hinaši wobhladowak.</strong>',
-'editingold'                       => '<strong>KEDŹBU: Wobdźěłuješ staršu wersiju strony. Jeli ju składuješ, zjewi so jako najnowša wersija!</strong>',
+'nonunicodebrowser'                => "'''KEDŹBU: Twój wobhladowak z Unikodu kompatibelny njeje. Prošu wužiwaj hinaši wobhladowak.'''",
+'editingold'                       => "'''KEDŹBU: Wobdźěłuješ staršu wersiju strony. Jeli ju składuješ, zjewi so jako najnowša wersija!'''",
 'yourdiff'                         => 'Rozdźěle',
-'copyrightwarning'                 => 'Prošu wobkedźbuj, zo wšě přinoški k {{GRAMMAR:datiw|{{SITENAME}}}} $2 podleže (hlej $1 za podrobnosće). Jeli nochceš, zo so twój přinošk po dobrozdaću wobdźěłuje a znowa rozšěrja, njeskładuj jón.<br />
+'copyrightwarning'                 => "Prošu wobkedźbuj, zo wšě přinoški k {{GRAMMAR:datiw|{{SITENAME}}}} $2 podleže (hlej $1 za podrobnosće). Jeli nochceš, zo so twój přinošk po dobrozdaću wobdźěłuje a znowa rozšěrja, njeskładuj jón.<br />
 Lubiš tež, zo sy to sam napisał abo ze zjawneje domejny abo z podobneho žórła kopěrował.
-Kopěrowanje tekstow, kiž su přez awtorske prawa škitane, je zakazane! <strong>NJESK�ADUJ PŘINOŠKI Z COPYRIGHTOM BJEZ DOWOLNOSĆE!</strong>',
-'copyrightwarning2'                => 'Prošu wobkedźbuj, zo wšě přinoški k {{GRAMMAR:datiw|{{SITENAME}}}} hodźa so wot druhich wužiwarjow wobdźěłować, změnić abo wotstronić. Jeli nochceš, zo so twój přinošk po dobrozdaću wobdźěłuje, njeskładuj jón.<br />
+Kopěrowanje tekstow, kiž su přez awtorske prawa škitane, je zakazane! '''NJESK�ADUJ PŘINOŠKI Z COPYRIGHTOM BJEZ DOWOLNOSĆE!'''",
+'copyrightwarning2'                => "Prošu wobkedźbuj, zo wšě přinoški k {{GRAMMAR:datiw|{{SITENAME}}}} hodźa so wot druhich wužiwarjow wobdźěłować, změnić abo wotstronić. Jeli nochceš, zo so twój přinošk po dobrozdaću wobdźěłuje, njeskładuj jón.<br />
 
 Lubiš nam tež, zo sy jón sam napisał abo ze zjawneje domejny abo z podobneho swobodneho žórła kopěrował (hlej $1 za podrobnosće).
 
-<strong>NJESK�ADUJ PŘINOŠKI Z COPYRIGHTOM BJEZ DOWOLNOSĆE!</strong>',
-'longpagewarning'                  => '<strong>KEDŹBU: Strona wobsahuje $1 kB; někotre wobhladowaki maja problemy, strony wobdźěłać, kotrež wobsahuja 32 kB abo wjace. Prošu přemysli sej stronu do mjeńšich wotrězkow rozrjadować.</strong>',
-'longpageerror'                    => '<strong>ZMYLK: Tekst, kotryž sy spytał składować wobsahuje $1 kB, maksimalna wulkosć pak je $2 kB. Njehodźi so składować.</strong>',
-'readonlywarning'                  => '<strong>KEDŹBU: Datowa banka bu wothladanja dla zawrjena, tohodla njemóžeš swoje wobdźěłowanja nětko składować. Móžeš tekst do tekstoweje dataje přesunyć a jón za pozdźišo składować.</strong>',
-'protectedpagewarning'             => '<strong>KEDŹBU: Strona bu škitana, tak zo jenož wužiwarjo z prawami administratora móža ju wobdźěłać.</strong>',
+'''NJESK�ADUJ PŘINOŠKI Z COPYRIGHTOM BJEZ DOWOLNOSĆE!'''",
+'longpagewarning'                  => "'''KEDŹBU: Strona wobsahuje $1 kB; někotre wobhladowaki maja problemy, strony wobdźěłać, kotrež wobsahuja 32 kB abo wjace. Prošu přemysli sej stronu do mjeńšich wotrězkow rozrjadować.'''",
+'longpageerror'                    => "'''ZMYLK: Tekst, kotryž sy spytał składować wobsahuje $1 kB, maksimalna wulkosć pak je $2 kB. Njehodźi so składować.'''",
+'readonlywarning'                  => "'''KEDŹBU: Datowa banka bu wothladanja dla zawrjena, tohodla njemóžeš swoje změny nětko składować. Móžeš tekst do tekstoweje dataje přesunyć a jón za pozdźišo składować.'''
+
+Administrator, kiž je ju zawrjena, je tutu při�inu podał: $1",
+'protectedpagewarning'             => "'''KEDŹBU: Strona bu škitana, tak zo jenož wužiwarjo z prawami administratora móža ju wobdźěłać.'''",
 'semiprotectedpagewarning'         => '<b>Kedźbu:</b> Strona bu škitana, tak zo jenož přizjewjeni wužiwarjo móža ju wobdźěłać.',
 'cascadeprotectedwarning'          => "'''KEDŹBU:''' Tuta strona je škitana, tak zo móža ju jenož wužiwarjo z prawami administratora wobdźělać, dokelž je w {{PLURAL:$1|slědowacej stronje|slědowacych stronach}} zapřijata, {{PLURAL:$1|kotraž je|kotrež su}} přez kaskadowu opciju {{PLURAL:$1|škitana|škitane}}:",
-'titleprotectedwarning'            => '<strong>WARNOWANJE: Tuta strona bu zawrjena, jenož wěsći wužiwarjo móža ju wutworić.</strong>',
+'titleprotectedwarning'            => "'''WARNOWANJE: Tuta strona bu zawrjena, tak zo [[Special:ListGroupRights|wosebite prawa]] su trěbne, zo by ju wutworił.'''",
 'templatesused'                    => 'Na tutej stronje wužiwane předłohi:',
 'templatesusedpreview'             => 'W tutym přehledźe wužiwane předłohi:',
 'templatesusedsection'             => 'W tutym wotrězku wužiwane předłohi:',
@@ -707,20 +730,32 @@ Lubiš nam tež, zo sy jón sam napisał abo ze zjawneje domejny abo z podobneho
 
 Prošu přepruwuj, ha� je znowawutworjenje woprawnjena a wotpowěduje prawidłam projekta.
 Tu slěduje wujimk z protokola wušmórnjenjow z při�inu za předawše wušmórnjenje:",
+'deleted-notice'                   => 'Tuta strona bu wušmórnjena. Protokol wušmórnjenjow za tutu stronu so deleka jako referenca podawa.',
+'deletelog-fulllog'                => 'Dospołny protokol wobhladać',
+'edit-hook-aborted'                => 'Wobdźěłanje přez hoku přetorhnjene.
+Njeje žane wujasnjenje podała.',
+'edit-gone-missing'                => 'Strona njeje so aktualizować dała.
+Zda so, zo je hîžo wušmórnjena.',
+'edit-conflict'                    => 'Wobdźěłanski konflikt.',
+'edit-no-change'                   => 'Waše wobdźěłanje bu ignorowane, dokelž tekst njebu zm,ěnjeny.',
+'edit-already-exists'              => 'Njebě móžno nowu stronu wutworić.
+Eksistuje hižo.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Warnowanje: Tuta strona wobsahuje přewjele parserowych wołanjow, kotrež serwer poćežuja.
+'expensive-parserfunction-warning'        => 'Warnowanje: Tuta strona wobsahuje přewjele parserowych wołanjow.
  
-Jich dyrbi jenož $2 być, je nětko $1.',
+Dyrbjała mjenje ha� $2 {{PLURAL:$2|wołanje|wołanjej|wołanja|wołanjow}} měć, {{PLURAL:$1|je nětko $1 wołanje|stej nětko $1 wołanjej|su nětko $1 wołanja|je nětko $1 wołanjow}}.',
 'expensive-parserfunction-category'       => 'Strony, kotrež tajke parserowe funkcije přehusto wołaja, kotrež serwer poćežuja.',
 'post-expand-template-inclusion-warning'  => 'Warnowanje: Wulkosć zapřijatych předłohow je přewulka. Někotre předłohi so njezapřijmu.',
 'post-expand-template-inclusion-category' => 'Strony, hdźež maksimalna wulkosć zapřijatych předłohow je překro�ena',
 'post-expand-template-argument-warning'   => 'Warnowanje: Tuta strona wobsahuje znajmjeńša jedyn předłohowy argument, kotryž ma přewulku espansisku wulkosć. Tute argumenty bu wuwostajene.',
 'post-expand-template-argument-category'  => 'Strony, kotrež wuwostajene předłohowe argumenty wobsahuja',
+'parser-template-loop-warning'            => 'Předłohowa sekla wotkryta: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limit za rekursijnu hłubokosć předłohi překro�eny ($1)',
 
 # "Undo" feature
 'undo-success' => 'Wersija je so wuspěšnje wotstroniła. Prošu přepruwuj deleka w přirunanskim napohledźe, ha� twoja změna bu přewzata a klikń potom na „Składować�, zo by změnu składował.',
-'undo-failure' => '<span class="error">Wobdźěłanje njehodźeše so wotstronić, dokelž wotpowědny wotrězk bu mjeztym změnjeny.</span>',
+'undo-failure' => 'Wobdźěłanje njehodźeše so wotstronić, dokelž wotpowědny wotrězk bu mjeztym změnjeny.',
 'undo-norev'   => 'Změna njeda so cofnyć, dokelž njeeksistuje abo bu wušmórnjena.',
 'undo-summary' => 'Změna $1 [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusija]]) bu cofnjena.',
 
@@ -731,29 +766,29 @@ Jich dyrbi jenož $2 być, je nětko $1.',
 Při�ina za blokowanje, podata wot $3, je: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'protokole tuteje strony pokazać',
-'nohistory'           => 'Njeje žanych staršich wersijow strony.',
-'revnotfound'         => 'Njebě móžno, požadanu wersiju namakać',
-'revnotfoundtext'     => 'Stara wersija strony, kotruž sy žadał, njeda so namakać. Prošu pruwuj URL, kiž sy wužiwał.',
-'currentrev'          => 'Aktualna wersija',
-'revisionasof'        => 'Wersija z $1',
-'revision-info'       => 'Wersija z $1 wužiwarja $2',
-'previousrevision'    => '�starša wersija',
-'nextrevision'        => 'nowša wersija→',
-'currentrevisionlink' => 'Aktualnu wersiju pokazać',
-'cur'                 => 'akt',
-'next'                => 'přich',
-'last'                => 'posl',
-'page_first'          => 'spo�atk',
-'page_last'           => 'kónc',
-'histlegend'          => 'Diff wubrać: Wubjer opciske pola za přirunanje a tłó� na enter abo tłó�ku deleka.
+'viewpagelogs'           => 'protokole tuteje strony pokazać',
+'nohistory'              => 'Njeje žanych staršich wersijow strony.',
+'currentrev'             => 'Aktualna wersija',
+'currentrev-asof'        => 'Aktualna wersija wot $1',
+'revisionasof'           => 'Wersija z $1',
+'revision-info'          => 'Wersija z $1 wužiwarja $2', # Additionally available: $3: revision id
+'previousrevision'       => '�starša wersija',
+'nextrevision'           => 'nowša wersija→',
+'currentrevisionlink'    => 'Aktualnu wersiju pokazać',
+'cur'                    => 'akt',
+'next'                   => 'přich',
+'last'                   => 'posl',
+'page_first'             => 'spo�atk',
+'page_last'              => 'kónc',
+'histlegend'             => 'Diff wubrać: Wubjer opciske pola za přirunanje a tłó� na enter abo tłó�ku deleka.
 
 Legenda: (akt) = rozdźěl k tuchwilnej wersiji, (posl) = rozdźěl k předchadnej wersiji, S = snadna změna.',
-'deletedrev'          => '[wušmórnjena]',
-'histfirst'           => 'tuchwilnu',
-'histlast'            => 'najstaršu',
-'historysize'         => '({{PLURAL:$1|1 bajt|$1 bajtaj|$1 bajty|$1 bajtow}})',
-'historyempty'        => '(prózdna)',
+'history-fieldset-title' => 'Stawizny přepytać',
+'deletedrev'             => '[wušmórnjena]',
+'histfirst'              => 'tuchwilnu',
+'histlast'               => 'najstaršu',
+'historysize'            => '({{PLURAL:$1|1 bajt|$1 bajtaj|$1 bajty|$1 bajtow}})',
+'historyempty'           => '(prózdna)',
 
 # Revision feed
 'history-feed-title'          => 'Stawizny wersijow',
@@ -828,6 +863,7 @@ Zawěsć, zo tuta změna stawiznisku kontinuitu strony wobchowuje.',
 'mergehistory-invalid-destination' => 'Cilowa strona dyrbi płaćiwy titul być.',
 'mergehistory-autocomment'         => '[[:$1]] z [[:$2]] zjednoćeny',
 'mergehistory-comment'             => '[[:$1]] z [[:$2]] zjednoćeny: $3',
+'mergehistory-same-destination'    => 'Žórłowa a cilowa strona njesmějetej identiskej być',
 
 # Merge log
 'mergelog'           => 'Protokol zjednoćenja',
@@ -840,120 +876,202 @@ Zawěsć, zo tuta změna stawiznisku kontinuitu strony wobchowuje.',
 'difference'              => '(rozdźěl mjez wersijomaj)',
 'lineno'                  => 'Rjadka $1:',
 'compareselectedversions' => 'Wubranej wersiji přirunać',
+'visualcomparison'        => 'Wizuelne přirunanje',
+'wikicodecomparison'      => 'Přirunanje wikiteksta',
 'editundo'                => 'cofnyć',
 'diff-multi'              => '<small>(Přirunanje wersijow zapřija {{PLURAL:$1|jednu mjez nimaj ležacu wersiju|dwě mjez nimaj ležacej wersiji|$1 mjez nimaj ležace wersije|$1 mjez nimaj ležacych wersijow}}.)</small>',
+'diff-movedto'            => 'přesunjeny do $1',
+'diff-styleadded'         => 'Stil $1 přidaty',
+'diff-added'              => '$1 přidaty',
+'diff-changedto'          => 'Do $1 změnjeny',
+'diff-movedoutof'         => 'přesunjeny z $1',
+'diff-styleremoved'       => 'Stil $1 wotstronjeny',
+'diff-removed'            => '$1 wotstronjeny',
+'diff-changedfrom'        => 'Z $1 změnjeny',
+'diff-src'                => 'žórło',
+'diff-withdestination'    => 'z cilom $1',
+'diff-with'               => '&#32;z $1 $2',
+'diff-with-final'         => '&#32;a $1 $2',
+'diff-width'              => 'šěrokosć',
+'diff-height'             => 'wysokosć',
+'diff-p'                  => "'''wotstawk'''",
+'diff-blockquote'         => "'''blokowy citat'''",
+'diff-h1'                 => "'''nadpis (1. runina)'''",
+'diff-h2'                 => "'''nadpis (2. runina)'''",
+'diff-h3'                 => "'''nadpis (3. runina)'''",
+'diff-h4'                 => "'''nadpis (4. runina)'''",
+'diff-h5'                 => "'''nadpis (5. runina)'''",
+'diff-pre'                => "'''předformatowany blok'''",
+'diff-div'                => "'''blokowy element'''",
+'diff-ul'                 => "'''nje�isłowana lisćina'''",
+'diff-ol'                 => "'''�isłowana lisćina'''",
+'diff-li'                 => "'''lisćinowy zapisk'''",
+'diff-table'              => "'''tabela'''",
+'diff-tbody'              => "'''tabelowy wobsah'''",
+'diff-tr'                 => "'''rjadka'''",
+'diff-td'                 => "'''cela'''",
+'diff-th'                 => "'''nadpismo'''",
+'diff-br'                 => "'''linkowe Å‚amanje'''",
+'diff-hr'                 => "'''horicontalna linija'''",
+'diff-code'               => "'''blok kompjuteroweho koda'''",
+'diff-dl'                 => "'''definiciska lisćina'''",
+'diff-dt'                 => "'''definiciske zapřijeće'''",
+'diff-dd'                 => "'''definicija'''",
+'diff-input'              => "'''zapodaće'''",
+'diff-form'               => "'''formular'''",
+'diff-img'                => "'''wobraz'''",
+'diff-span'               => "'''linkowy element'''",
+'diff-a'                  => "'''wotkaz'''",
+'diff-i'                  => "'''kursiwny'''",
+'diff-b'                  => "'''tu�ny'''",
+'diff-strong'             => "'''sylny'''",
+'diff-em'                 => "'''wuzběhnjenje'''",
+'diff-font'               => "'''Pismo'''",
+'diff-big'                => "'''wulki'''",
+'diff-del'                => "'''wušmórnjeny'''",
+'diff-tt'                 => "'''kruta šěrokosć'''",
+'diff-sub'                => "'''hłuboko stajeny'''",
+'diff-sup'                => "'''horjeka stajeny'''",
+'diff-strike'             => "'''přešmórnyć'''",
 
 # Search results
-'searchresults'             => 'Pytanske wuslědki',
-'searchresulttext'          => 'Za dalše informacije wo pytanju {{GRAMMAR:genitiw|{{SITENAME}}}}, hlej [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Sy za \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|wšěmi stronami, kotrež zapo�inaja so z "$1"]] | [[Special:WhatLinksHere/$1|wšěmi stronami, kotrež na "$1" wotkazuja]]) pytal.',
-'searchsubtitleinvalid'     => 'Sy naprašowanje za „$1“ stajił.',
-'noexactmatch'              => "'''Strona z titulom \"\$1\" njeeksistuje.'''
+'searchresults'                    => 'Pytanske wuslědki',
+'searchresults-title'              => 'Pytanske wuslědki za "$1"',
+'searchresulttext'                 => 'Za dalše informacije wo pytanju {{GRAMMAR:genitiw|{{SITENAME}}}}, hlej [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Sy za \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|wšěmi stronami, kotrež zapo�inaja so z "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|wšěmi stronami, kotrež na "$1" wotkazuja]]) pytal.',
+'searchsubtitleinvalid'            => 'Sy naprašowanje za „$1“ stajił.',
+'noexactmatch'                     => "'''Strona z titulom \"\$1\" njeeksistuje.'''
 Móžeš [[:\$1|tutu stronu wutworić]].",
-'noexactmatch-nocreate'     => "'''Njeje strona z titulom \"\$1\".'''",
-'toomanymatches'            => 'Přewjele pytanskich wuslědkow, prošu spytaj druhe wotprašenje.',
-'titlematches'              => 'Strony z wotpowědowacym titulom',
-'notitlematches'            => 'Žane strony z wotpowědowacym titulom',
-'textmatches'               => 'Strony z wotpowědowacym tekstom',
-'notextmatches'             => 'Žane strony z wotpowědowacym tekstom',
-'prevn'                     => 'předchadne $1',
-'nextn'                     => 'přichodne $1',
-'viewprevnext'              => '($1) ($2) ($3) pokazać',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 słowo|$2 słowje|$2 słowa|$2 słowow}})',
-'search-result-score'       => 'Relewanca: $1 %',
-'search-redirect'           => '(Daleposrědkowanje $1)',
-'search-section'            => '(wotrězk $1)',
-'search-suggest'            => 'Měnješe ty $1?',
-'search-interwiki-caption'  => 'Sotrowske projekty',
-'search-interwiki-default'  => '$1 wuslědki:',
-'search-interwiki-more'     => '(dalše)',
-'search-mwsuggest-enabled'  => 'z namjetami',
-'search-mwsuggest-disabled' => 'žane namjety',
-'search-relatedarticle'     => 'Přiwuzne',
-'mwsuggest-disable'         => 'Namjety AJAX znjemóžnić',
-'searchrelated'             => 'přiwuzny',
-'searchall'                 => 'wšě',
-'showingresults'            => "Deleka so ha� {{PLURAL:$1|'''1''' wuslědk pokazuje|'''$1''' wuslědkaj pokazujetej|'''$1''' wuslědki pokazuja|'''$1''' wuslědkow pokazuje}}, zapo�inajo z #'''$2'''.",
-'showingresultsnum'         => "Deleka so {{PLURAL:$3|'''1''' wuslědk pokazuje|'''$3''' wuslědkaj pokazujetej|'''$3''' wuslědki pokazuja|'''$3''' wuslědkow pokazuje}}, zapo�inajo z #'''$2'''.",
-'showingresultstotal'       => "{{PLURAL:3|Slěduje wuslědk '''$1''' z '''$3'''|Slědujetej wuslědkaj '''$1 - $2''' z '''$3'''|Slěduja wuslědki '''$1 - $2''' z '''$3'''|Slěduje wuslědkow '''$1 - $2''' z '''$3'''}}",
-'nonefound'                 => '<b>Kedźbu:</b> Pytanja bjez wuspěcha so �asto z pytanjom za powšitkownymi słowami zawinuja, kotrež so njeindicěruja abo přez podaće wjace ha� jednoho pytanskeho wuraza. Jenož strony, kotrež wšě pytanske wurazy wobsahuja, so w lisćinje wuslědkow zjewja. W tym padźe spytaj li�bu pytanskich wurazow pomjeńšić.',
-'powersearch'               => 'Pytać',
-'powersearch-legend'        => 'Rozšěrjene pytanje',
-'powersearch-ns'            => 'W mjenowych rumach pytać:',
-'powersearch-redir'         => 'Daleposrědkowanja nalistować',
-'powersearch-field'         => 'Pytać za:',
-'search-external'           => 'Eksterne pytanje',
-'searchdisabled'            => 'Pytanje w {{GRAMMAR:lokatiw|{{SITENAME}}}} tuchwilu móžne njeje. Móžeš mjeztym z Google pytać. Wobkedźbuj, zo móža wuslědki z wobsaha {{GRAMMAR:genitiw|{{SITENAME}}}} zestarjene być.',
+'noexactmatch-nocreate'            => "'''Njeje strona z titulom \"\$1\".'''",
+'toomanymatches'                   => 'Přewjele pytanskich wuslědkow, prošu spytaj druhe wotprašenje.',
+'titlematches'                     => 'Strony z wotpowědowacym titulom',
+'notitlematches'                   => 'Žane strony z wotpowědowacym titulom',
+'textmatches'                      => 'Strony z wotpowědowacym tekstom',
+'notextmatches'                    => 'Žane strony z wotpowědowacym tekstom',
+'prevn'                            => 'předchadne $1',
+'nextn'                            => 'přichodne $1',
+'viewprevnext'                     => '($1) ($2) ($3) pokazać',
+'searchmenu-legend'                => 'Pytanske opcije',
+'searchmenu-exists'                => "'''Je strona z mjenom \"[[\$1]]\" na tutym wikiju'''",
+'searchmenu-new'                   => "'''Wutwor stronu \"[[:\$1|\$1]]\" na tutym wikiju!'''",
+'searchhelp-url'                   => 'Help:Wobsah',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Strony z tutym prefiksom přepytać]]',
+'searchprofile-articles'           => 'Wobsahowe strony',
+'searchprofile-articles-and-proj'  => 'Wobsahowe & projektowe strony',
+'searchprofile-project'            => 'Projektowe strony',
+'searchprofile-images'             => 'Dataje',
+'searchprofile-everything'         => 'WÅ¡itko',
+'searchprofile-advanced'           => 'Rozšěrjeny',
+'searchprofile-articles-tooltip'   => 'W $1 pytać',
+'searchprofile-project-tooltip'    => 'W $1 pytać',
+'searchprofile-images-tooltip'     => 'Za datajemi pytać',
+'searchprofile-everything-tooltip' => 'Cyły wobsah přepytać (inkluziwnje diskusijne strony)',
+'searchprofile-advanced-tooltip'   => 'W swójskich mjenowych rumach pytać',
+'prefs-search-nsdefault'           => 'Ze standardnymi nastajenjemi pytać:',
+'prefs-search-nscustom'            => 'Swójske mjenowe rumy přepytać:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 słowo|$2 słowje|$2 słowa|$2 słowow}})',
+'search-result-score'              => 'Relewanca: $1 %',
+'search-redirect'                  => '(Daleposrědkowanje $1)',
+'search-section'                   => '(wotrězk $1)',
+'search-suggest'                   => 'Měnješe ty $1?',
+'search-interwiki-caption'         => 'Sotrowske projekty',
+'search-interwiki-default'         => '$1 wuslědki:',
+'search-interwiki-more'            => '(dalše)',
+'search-mwsuggest-enabled'         => 'z namjetami',
+'search-mwsuggest-disabled'        => 'žane namjety',
+'search-relatedarticle'            => 'Přiwuzne',
+'mwsuggest-disable'                => 'Namjety AJAX znjemóžnić',
+'searchrelated'                    => 'přiwuzny',
+'searchall'                        => 'wšě',
+'showingresults'                   => "Deleka so ha� {{PLURAL:$1|'''1''' wuslědk pokazuje|'''$1''' wuslědkaj pokazujetej|'''$1''' wuslědki pokazuja|'''$1''' wuslědkow pokazuje}}, zapo�inajo z #'''$2'''.",
+'showingresultsnum'                => "Deleka so {{PLURAL:$3|'''1''' wuslědk pokazuje|'''$3''' wuslědkaj pokazujetej|'''$3''' wuslědki pokazuja|'''$3''' wuslědkow pokazuje}}, zapo�inajo z #'''$2'''.",
+'showingresultstotal'              => "{{PLURAL:$4|Slěduje wuslědk '''$1''' z '''$3'''|Slědujetej wuslědkaj '''$1 - $2''' z '''$3'''|Slěduja wuslědki '''$1 - $2''' z '''$3'''|Slěduje wuslědkow '''$1 - $2''' z '''$3'''}}",
+'nonefound'                        => "'''Kedźbu''': Jenož někotre mjenowe rumy pytaja so po standardźe.
+Spytaj swoje naprašowanje z prefiksom ''all:'' wužiwać, zo by wšón wobsah (inkluziwnje diskusijne strony, předłohi atd.) pytał abu wužij požadany mjenowy rum jako prefiks.",
+'search-nonefound'                 => 'Njebuchu wuslědki namakane, kotrež naprašowanju wotpowěduja.',
+'powersearch'                      => 'Pytać',
+'powersearch-legend'               => 'Rozšěrjene pytanje',
+'powersearch-ns'                   => 'W mjenowych rumach pytać:',
+'powersearch-redir'                => 'Daleposrědkowanja nalistować',
+'powersearch-field'                => 'Pytać za:',
+'search-external'                  => 'Eksterne pytanje',
+'searchdisabled'                   => 'Pytanje w {{GRAMMAR:lokatiw|{{SITENAME}}}} tuchwilu móžne njeje. Móžeš mjeztym z Google pytać. Wobkedźbuj, zo móža wuslědki z wobsaha {{GRAMMAR:genitiw|{{SITENAME}}}} zestarjene być.',
 
 # Preferences page
-'preferences'              => 'Nastajenja',
-'mypreferences'            => 'moje nastajenja',
-'prefs-edits'              => 'Li�ba změnow:',
-'prefsnologin'             => 'Njepřizjewjeny',
-'prefsnologintext'         => 'Dyrbiš <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} přizjewjeny]</span>  być, zo by móhł nastajenja postajić.',
-'prefsreset'               => 'Nastajenja su so ze składa wróćo stajili. Twoje změnjenja njejsu so składowali.',
-'qbsettings'               => 'Pobó�na lajsta',
-'qbsettings-none'          => 'Žane',
-'qbsettings-fixedleft'     => 'Leži nalěwo',
-'qbsettings-fixedright'    => 'Leži naprawo',
-'qbsettings-floatingleft'  => 'Wisa nalěwo',
-'qbsettings-floatingright' => 'Wisa naprawo',
-'changepassword'           => 'Hesło změnić',
-'skin'                     => 'Å at',
-'math'                     => 'Math',
-'dateformat'               => 'Format datuma',
-'datedefault'              => 'Žane nastajenje',
-'datetime'                 => 'Datum a �as',
-'math_failure'             => 'Analyza njeje so poradźiła',
-'math_unknown_error'       => 'njeznaty zmylk',
-'math_unknown_function'    => 'njeznata funkcija',
-'math_lexing_error'        => 'leksikalny zmylk',
-'math_syntax_error'        => 'syntaktiski zmylk',
-'math_image_error'         => 'Konwertowanje do PNG zwrěšćiło; kontroluj prawu instalaciju latex, dvips, gs a konwertuj',
-'math_bad_tmpdir'          => 'Njemóžno do nachwilneho matematiskeho zapisa pisać abo jón wutworić',
-'math_bad_output'          => 'Njemóžno do matematiskeho zapisa za wudaće pisać abo jón wutworić',
-'math_notexvc'             => 'Wuwjedźomny texvc pobrachuje; prošu hlej math/README za konfiguraciju.',
-'prefs-personal'           => 'Wužiwarske daty',
-'prefs-rc'                 => 'Aktualne změny',
-'prefs-watchlist'          => 'Wobkedźbowanki',
-'prefs-watchlist-days'     => 'Li�ba dnjow, kotrež maja so we wobkedźbowankach pokazać:',
-'prefs-watchlist-edits'    => 'Li�ba změnow, kotrež maja so we wobkedźbowankach pokazać:',
-'prefs-misc'               => 'WÅ¡elake nastajenja',
-'saveprefs'                => 'Składować',
-'resetprefs'               => 'Njeskładowane změny zaćisnyć',
-'oldpassword'              => 'Stare hesło:',
-'newpassword'              => 'Nowe hesło:',
-'retypenew'                => 'Nowe hesło wospjetować:',
-'textboxsize'              => 'Wobdźěłowanje',
-'rows'                     => 'Rjadki:',
-'columns'                  => 'Stołpiki:',
-'searchresultshead'        => 'Pytać',
-'resultsperpage'           => 'Wuslědki za stronu:',
-'contextlines'             => 'Rjadki na wuslědk:',
-'contextchars'             => 'Kontekst na rjadku:',
-'stub-threshold'           => 'Wotkazowe formatowanje <a href="#" class="stub">małych stronow</a> (w bajtach):',
-'recentchangesdays'        => 'Li�ba dnjow w lisćinje aktualnych změnow:',
-'recentchangescount'       => 'Li�ba stron w lisćinje aktualnych změnow, w stawiznach a w protokolach:',
-'savedprefs'               => 'Nastajenja buchu składowane.',
-'timezonelegend'           => 'ÄŒasowe pasmo',
-'timezonetext'             => '¹Zapisaj li�bu hodźin, wo kotrež so twój lokalny �as wot �asa serwera (UTC) wotchila.',
-'localtime'                => 'Lokalny �as',
-'timezoneoffset'           => 'Rozdźěl¹',
-'servertime'               => 'ÄŒas serwera',
-'guesstimezone'            => 'Z wobhladowaka přewzać',
-'allowemail'               => 'Mejlki wot druhich wužiwarjow přijimować',
-'prefs-searchoptions'      => 'Pytanske opcije',
-'prefs-namespaces'         => 'Mjenowe rumy',
-'defaultns'                => 'W tutych mjenowych rumach awtomatisce pytać:',
-'default'                  => 'standard',
-'files'                    => 'Dataje',
+'preferences'               => 'Nastajenja',
+'mypreferences'             => 'moje nastajenja',
+'prefs-edits'               => 'Li�ba změnow:',
+'prefsnologin'              => 'Njepřizjewjeny',
+'prefsnologintext'          => 'Dyrbiš <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} přizjewjeny]</span>  być, zo by móhł nastajenja postajić.',
+'prefsreset'                => 'Nastajenja su so ze składa wróćo stajili. Twoje změnjenja njejsu so składowali.',
+'qbsettings'                => 'Pobó�na lajsta',
+'qbsettings-none'           => 'Žane',
+'qbsettings-fixedleft'      => 'Leži nalěwo',
+'qbsettings-fixedright'     => 'Leži naprawo',
+'qbsettings-floatingleft'   => 'Wisa nalěwo',
+'qbsettings-floatingright'  => 'Wisa naprawo',
+'changepassword'            => 'Hesło změnić',
+'skin'                      => 'Å at',
+'skin-preview'              => 'Přehlad',
+'math'                      => 'Math',
+'dateformat'                => 'Format datuma',
+'datedefault'               => 'Žane nastajenje',
+'datetime'                  => 'Datum a �as',
+'math_failure'              => 'Analyza njeje so poradźiła',
+'math_unknown_error'        => 'njeznaty zmylk',
+'math_unknown_function'     => 'njeznata funkcija',
+'math_lexing_error'         => 'leksikalny zmylk',
+'math_syntax_error'         => 'syntaktiski zmylk',
+'math_image_error'          => 'Konwertowanje do PNG zwrěšćiło; kontroluj prawu instalaciju latex, dvips, gs a konwertuj',
+'math_bad_tmpdir'           => 'Njemóžno do nachwilneho matematiskeho zapisa pisać abo jón wutworić',
+'math_bad_output'           => 'Njemóžno do matematiskeho zapisa za wudaće pisać abo jón wutworić',
+'math_notexvc'              => 'Wuwjedźomny texvc pobrachuje; prošu hlej math/README za konfiguraciju.',
+'prefs-personal'            => 'Wužiwarske daty',
+'prefs-rc'                  => 'Aktualne změny',
+'prefs-watchlist'           => 'Wobkedźbowanki',
+'prefs-watchlist-days'      => 'Li�ba dnjow, kotrež maja so we wobkedźbowankach pokazać:',
+'prefs-watchlist-days-max'  => '(maksimalnje 7 dnjow)',
+'prefs-watchlist-edits'     => 'Li�ba změnow, kotrež maja so we wobkedźbowankach pokazać:',
+'prefs-watchlist-edits-max' => '(maksimalna li�ba: 1000)',
+'prefs-misc'                => 'WÅ¡elake nastajenja',
+'prefs-resetpass'           => 'Hesło změnić',
+'saveprefs'                 => 'Składować',
+'resetprefs'                => 'Njeskładowane změny zaćisnyć',
+'textboxsize'               => 'Wobdźěłowanje',
+'prefs-edit-boxsize'        => 'Wulkosć wobdźěłowanskeho wokna.',
+'rows'                      => 'Rjadki:',
+'columns'                   => 'Stołpiki:',
+'searchresultshead'         => 'Pytać',
+'resultsperpage'            => 'Wuslědki za stronu:',
+'contextlines'              => 'Rjadki na wuslědk:',
+'contextchars'              => 'Kontekst na rjadku:',
+'stub-threshold'            => 'Wotkazowe formatowanje <a href="#" class="stub">małych stronow</a> (w bajtach):',
+'recentchangesdays'         => 'Li�ba dnjow w lisćinje aktualnych změnow:',
+'recentchangesdays-max'     => '(Maksimalnje $1 {{PLURAL:$1|dźeń|dnjej|dny|dnjow}})',
+'recentchangescount'        => 'Li�ba stron w lisćinje aktualnych změnow, w stawiznach a w protokolach, po standardźe:',
+'savedprefs'                => 'Nastajenja buchu składowane.',
+'timezonelegend'            => 'ÄŒasowe pasmo',
+'timezonetext'              => '¹Zapisaj li�bu hodźin, wo kotrež so twój lokalny �as wot �asa serwera (UTC) wotchila.',
+'localtime'                 => 'Lokalny �as:',
+'timezoneselect'            => 'ÄŒasowe pasmo',
+'timezoneuseserverdefault'  => 'Standard serwera wužiwać',
+'timezoneuseoffset'         => 'Druhe (pódaj wotchilenje)',
+'timezoneoffset'            => 'Rozdźěl¹:',
+'servertime'                => 'ÄŒas serwera:',
+'guesstimezone'             => 'Z wobhladowaka přewzać',
+'allowemail'                => 'Mejlki wot druhich wužiwarjow přijimować',
+'prefs-searchoptions'       => 'Pytanske opcije',
+'prefs-namespaces'          => 'Mjenowe rumy',
+'defaultns'                 => 'W tutych mjenowych rumach awtomatisce pytać:',
+'default'                   => 'standard',
+'files'                     => 'Dataje',
 
 # User rights
 'userrights'                  => 'Zrjadowanje wužiwarskich prawow', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Wužiwarske skupiny zrjadować',
 'userrights-user-editname'    => 'Wužiwarske mjeno:',
 'editusergroup'               => 'Wužiwarske skupiny wobdźěłać',
-'editinguser'                 => "Měnja so wužiwarske prawa wot wužiwarja '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Měnja so wužiwarske prawa wot wužiwarja '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Wužiwarske skupiny wobdźěłać',
 'saveusergroups'              => 'Wužiwarske skupiny składować',
 'userrights-groupsmember'     => 'Čłon skupiny:',
@@ -1002,6 +1120,8 @@ Móžeš [[:\$1|tutu stronu wutworić]].",
 'right-minoredit'            => 'Změny jako snadne markěrować',
 'right-move'                 => 'Strony přesunyć',
 'right-move-subpages'        => 'Strony z jich podstronami přesunyć',
+'right-move-rootuserpages'   => 'Hłowne wužiwarske strony přesunyć',
+'right-movefile'             => 'Dataje přesunyć',
 'right-suppressredirect'     => 'Při přesunjenju strony ze stareho mjena žane daleposrědkowanje wutworić',
 'right-upload'               => 'Dataje nahrać',
 'right-reupload'             => 'Eksistowacu dataju přepisać',
@@ -1052,9 +1172,46 @@ Móžeš [[:\$1|tutu stronu wutworić]].",
 'rightslogentry' => 'skupinowe �łonstwo za $1 z $2 na $3 změnjene',
 'rightsnone'     => '(ni�o)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'tutu stronu �itać',
+'action-edit'                 => 'tutu stronu wobdźěłać',
+'action-createpage'           => 'strony wutworić',
+'action-createtalk'           => 'diskusijne strony wutworić',
+'action-createaccount'        => 'wužiwarske konto załožić',
+'action-minoredit'            => 'tutu změnu jako snadnu markěrować',
+'action-move'                 => 'tutu stronu přesunyć',
+'action-move-subpages'        => 'tutu stronu a jeje podstrony přesunyć',
+'action-move-rootuserpages'   => 'hłowne wužiwarske strony přesunyć',
+'action-movefile'             => 'Tutu dataju přesunyć',
+'action-upload'               => 'tutu dataju nahrać',
+'action-reupload'             => 'eksistowacu dataju přepisać',
+'action-reupload-shared'      => 'tutu dataju na zhromadnym repozitoriju přepisać',
+'action-upload_by_url'        => 'Tutu dataju z webadresy (URL) nahrać',
+'action-writeapi'             => 'API za napisanje wužiwać',
+'action-delete'               => 'tutu stronu zni�ić',
+'action-deleterevision'       => 'tutu wersiju wušmórnyć',
+'action-deletedhistory'       => 'Zni�ene wersije tuteje strony zwobraznić',
+'action-browsearchive'        => 'Zni�ene strony pytać',
+'action-undelete'             => 'tutu stronu wobnowić',
+'action-suppressrevision'     => 'Tutu schowanu wersiju přepruwować a wobnowić',
+'action-suppressionlog'       => 'Tutón priwatny protokol wobhladać',
+'action-block'                => 'Wobdźěłanju přez wužiwarja zadźěwać',
+'action-protect'              => 'škitowe runiny za tutu stronu změnić',
+'action-import'               => 'Tutu stronu z druheho wikija importować',
+'action-importupload'         => 'Tutu stronu z datajoweho nahraća importować',
+'action-patrol'               => 'Změny druhich wužiwarjiw jako dohladowane markować',
+'action-autopatrol'           => 'twoju změnu jako dohladowanu markować dać',
+'action-unwatchedpages'       => 'lisćinu njewobkedźbowanych stronow zwobraznić',
+'action-trackback'            => 'Trackback pósłać',
+'action-mergehistory'         => 'stawizny tuteje strony zjednoćić',
+'action-userrights'           => 'wšě wužiwarske prawa wobdźěłać',
+'action-userrights-interwiki' => 'Wužiwarske prawa wužiwarjow w druhich wikijach wobdźěłać',
+'action-siteadmin'            => 'Datowu banku zawrěć abo wotewrić',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|změna|změnje|změny|změnow}}',
 'recentchanges'                     => 'Aktualne změny',
+'recentchanges-legend'              => 'Opcije aktualnych změnow',
 'recentchangestext'                 => 'Na tutej stronje móžeš najaktualniše změny w {{GRAMMAR:lokatiw|{{SITENAME}}}} wobkedźbować.',
 'recentchanges-feed-description'    => 'Slěduj najaktualniše změny {{GRAMMAR:genitiw|{{SITENAME}}}} w tutym kanalu.',
 'rcnote'                            => "Deleka {{PLURAL:\$1|je '''1''' změna|stej poslednjej '''\$1''' změnje|su poslednje '''\$1''' změny|je poslednich '''\$1''' změnow}} za {{PLURAL:\$2|posledny dźeń|poslednjej '''\$2''' dnjej|poslednje '''\$2''' dny|poslednich '''\$2''' dnjow}}, staw wot \$4, \$5. 
@@ -1081,6 +1238,8 @@ Móžeš [[:\$1|tutu stronu wutworić]].",
 'rc_categories_any'                 => 'wšě',
 'rc-change-size'                    => '$1 {{PLURAL:$1|bajt|bajtaj|bajty|bajtow}}',
 'newsectionsummary'                 => 'nowy wotrězk: /* $1 */',
+'rc-enhanced-expand'                => 'Podrobnosće pokazać (wužaduje JavaScript)',
+'rc-enhanced-hide'                  => 'Podrobnosće schować',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Změny zwjazanych stron',
@@ -1102,11 +1261,11 @@ Strony na [[Special:Watchlist|wobkedźbowankach]] su '''tu�ne'''.",
 'upload_directory_read_only'  => 'Nahrawanski zapis ($1) njehodźi so přez webserwer popisować.',
 'uploaderror'                 => 'Zmylk při nahrawanju',
 'uploadtext'                  => "Wužij slědowacy formular, zo by nowe dataje nahrał.
-Zo by prjedy nahrate dataje wobhladał abo pytał dźi k [[Special:ImageList|lisćinje nahratych datajow]], nahraća so tež w [[Special:Log/upload|protokolu nahraćow]], wušmórnjenja  [[Special:Log/delete|protokolu wušmornjenjow]] protokoluja.
+Zo by prjedy nahrate dataje wobhladał abo pytał dźi k [[Special:FileList|lisćinje nahratych datajow]], nahraća so tež w [[Special:Log/upload|protokolu nahraćow]], wušmórnjenja  [[Special:Log/delete|protokolu wušmornjenjow]] protokoluja.
 
 Zo by dataju do strony zapřijał, wužij wotkaz w jednej ze slědowacych formow:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Dataja.jpg]]</nowiki></tt>''', zo by połnu wersiju dataje wužiwał
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Dataja.png|200px|thumb|left|alternatiwny tekst]]</nowiki></tt>''', zo by wobraz ze šěrokosću 200 pikselow do kašćika na lěwej kromje z alternatiwnym tekstom jako wopisanje wužiwał
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Dataja.jpg]]</nowiki></tt>''', zo by połnu wersiju dataje wužiwał
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Dataja.png|200px|thumb|left|alternatiwny tekst]]</nowiki></tt>''', zo by wobraz ze šěrokosću 200 pikselow do kašćika na lěwej kromje z alternatiwnym tekstom jako wopisanje wužiwał
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Dataja.ogg]]</nowiki></tt>''' zo by direktnje k dataji wotkazał, bjeztoho zo by so dataja zwobrazniła",
 'upload-permitted'            => 'Dowolene datajowe typy: $1.',
 'upload-preferred'            => 'Preferowane datajowe typy: $1.',
@@ -1114,7 +1273,7 @@ Zo by dataju do strony zapřijał, wužij wotkaz w jednej ze slědowacych formow
 'uploadlog'                   => 'Protokol nahraćow',
 'uploadlogpage'               => 'Protokol nahraćow',
 'uploadlogpagetext'           => 'Deleka je lisćina najnowšich nahratych datajow.
-Hlej [[Special:NewImages|galeriju nowych datajow]] za wizuelny přehlad.',
+Hlej [[Special:NewFiles|galeriju nowych datajow]] za wizuelny přehlad.',
 'filename'                    => 'Mjeno dataje',
 'filedesc'                    => 'Zjeće',
 'fileuploadsummary'           => 'Zjeće:',
@@ -1126,7 +1285,7 @@ Hlej [[Special:NewImages|galeriju nowych datajow]] za wizuelny přehlad.',
 'minlength1'                  => 'Datajowe mjena dyrbja znajmjeńša jedyn pismik dołhe być.',
 'illegalfilename'             => 'Mjeno dataje „$1� wobsahuje znamješka, kotrež w titlach stronow dowolene njejsu. Prošu přemjenuj dataju a spytaj ju znowa nahrać.',
 'badfilename'                 => 'Mjeno dataje bu do „$1� změnjene.',
-'filetype-badmime'            => 'Dataje družiny MIME „$1� njesmědźa so składować.',
+'filetype-badmime'            => 'Dataje typa MIME „$1� njesmědźa so nahrać.',
 'filetype-bad-ie-mime'        => 'Tuta dataja njeda so nahrać, dokelž Internet Explorer by ju jako "$1" interpretował, kotryž je njedowoleny a potencielnje strašny datajowy typ.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' je njepožadany datajowy typ. 
 {{PLURAL:\$3|Preferowany datajowy typ je|Preferowanej datajowej typaj stej|Preferowane datajowe typy su|Preferowane datajowe typy su}} \$2.",
@@ -1136,21 +1295,22 @@ Hlej [[Special:NewImages|galeriju nowych datajow]] za wizuelny přehlad.',
 'large-file'                  => 'Doporu�a so, zo dataje wjetše ha� $1 njejsu; tuta dataja ma $2.',
 'largefileserver'             => 'Dataja je wjetša ha� serwer dowoluje.',
 'emptyfile'                   => 'Dataja, kotruž sy nahrał, zda so prózdna być. Z při�inu móhł pisanski zmylk w mjenje dataje być. Prošu pruwuj ha� chceš ju woprawdźe nahrać.',
-'fileexists'                  => 'Dataja z tutym mjenom hižo eksistuje. Jeli kliknješ na „Składować�, so wona přepisuje. Prošu pruwuj <strong><tt>$1</tt></strong> jeli njejsy wěsty ha� chceš ju změnić.',
-'filepageexists'              => 'Wopisanska strona za tutu dataju bu hižo pola <strong><tt>$1</tt></strong> wutworjena,
-ale tuchwilu dataja z tutym mjeno njeeksistuje. Zjeće, kotrež zapodaš, njezjewi so na wopisanskej stronje. Zo by so twoje zjeće tam jewiło, dyrbiš ju manuelnje wobdźěłać.',
-'fileexists-extension'        => 'Dataja z podobnym mjenom hižo eksistuje:<br />
-Mjeno dataje, kotruž chceš nahrać: <strong><tt>$1</tt></strong><br />
-Mjeno eksistowaceje dataje: <strong><tt>$2</tt></strong><br />
-Jenož kóncowce rozeznawatej so we wulko- a małopisanju. Prošu wuzwol hinaše mjeno.',
+'fileexists'                  => "Dataja z tutym mjenom hižo eksistuje. Jeli kliknješ na „Składować�, so wona přepisuje. Prošu pruwuj '''<tt>$1</tt>''' jeli njejsy wěsty ha� chceš ju změnić.",
+'filepageexists'              => "Wopisanska strona za tutu dataju bu hižo pola '''<tt>$1</tt>''' wutworjena,
+ale tuchwilu dataja z tutym mjeno njeeksistuje. Zjeće, kotrež zapodaš, njezjewi so na wopisanskej stronje. Zo by so twoje zjeće tam jewiło, dyrbiš ju manuelnje wobdźěłać.",
+'fileexists-extension'        => "Dataja z podobnym mjenom hižo eksistuje:<br />
+Mjeno dataje, kotruž chceš nahrać: '''<tt>$1</tt>'''<br />
+Mjeno eksistowaceje dataje: '''<tt>$2</tt>'''<br />
+Jenož kóncowce rozeznawatej so we wulko- a małopisanju. Prošu wuzwol hinaše mjeno.",
 'fileexists-thumb'            => "<center>'''Eksistowacy wobraz'''</center>",
-'fileexists-thumbnail-yes'    => 'Dataja zda so minaturka <i>(thumbnail)</i> być. Prošu přepruwuj dataju <strong><tt>$1</tt></strong>.<br />
-Jeli je to wobraz w originalnej wulkosći, njetrjebaš minaturku nahrać.',
-'file-thumbnail-no'           => 'Mjeno dataje zapo�ina so z <strong><tt>$1</tt></strong>. Zda so, zo to je wobraz z redukowanej wulkosću <i>(thumbnail)</i> pokazać.
-Jeli maš tutón wobraz z połnym rozeznaćom, nahraj tutón, hewak změń prošu datajowe mjeno.',
-'fileexists-forbidden'        => 'Dataja z tutym mjenom hižo eksistuje; prošu dźi wróćo a nahraj tutu dataju z druhim mjenom. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Dataja z tutym mjenom hižo eksistuje w zhromadnej chowarni. Jeli hišće chceš swoju dataju nahrać,  dźi prošu wróćo a wužij nowe mjeno. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Dataja zda so minaturka ''(thumbnail)'' być. Prošu přepruwuj dataju '''<tt>$1</tt>'''.<br />
+Jeli je to wobraz w originalnej wulkosći, njetrjebaš minaturku nahrać.",
+'file-thumbnail-no'           => "Mjeno dataje zapo�ina so z '''<tt>$1</tt>'''. Zda so, zo to je wobraz z redukowanej wulkosću ''(thumbnail)'' pokazać.
+Jeli maš tutón wobraz z połnym rozeznaćom, nahraj tutón, hewak změń prošu datajowe mjeno.",
+'fileexists-forbidden'        => 'Dataja z tutym mjenom hižo eksistuje a njeda so přepisać. Jeli hišće chceš swoju dataju nahrać, dźi  prošu wróćo a wuž nowe mjeno. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Dataja z tutym mjenom hižo eksistuje w zhromadnej chowarni. Jeli hišće chceš swoju dataju nahrać,  dźi prošu wróćo a wužij nowe mjeno. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Tuta dataja je duplikat {{PLURAL:$1|slědowaceje dataje|slědowaceju datajow|slědowacych datajow|slědowacych datajow}}:',
+'file-deleted-duplicate'      => 'Dataja, kotraž je identiska z tutej dataju ([[$1]]), je so prjedy zni�iła. Ty měł stawizny zni�enja tuteje dataje přepruwować, prjedy pokro�uješ z jeje zasonahrawanjom.',
 'successfulupload'            => 'Dataja bu wuspěšnje nahrata',
 'uploadwarning'               => 'Warnowanje',
 'savefile'                    => 'Dataju składować',
@@ -1170,7 +1330,7 @@ Jeli maš tutón wobraz z połnym rozeznaćom, nahraj tutón, hewak změń proš
 
 Prošu přepruwuj dokładnje, ha� wospjetowane nahraće směrnicam wotpowěduje.
 Za twoju informaciju slěduje protokol wušmórnjenjow z wopodstatnjenjom za předchadne wušmórnjenje:",
-'filename-bad-prefix'         => 'Datajowe mjeno zapo�ina so z <strong>„$1“</strong>. To je powšitkownje datajowe mjeno, kotrež digitalna kamera zwjetša dawa a kotrež tohodla jara wuprajiwe njeje. Prošu wubjer bóle wuprajiwe mjeno za twoju dataju.',
+'filename-bad-prefix'         => "Datajowe mjeno zapo�ina so z '''„$1“'''. To je powšitkownje datajowe mjeno, kotrež digitalna kamera zwjetša dawa a kotrež tohodla jara wuprajiwe njeje. Prošu wubjer bóle wuprajiwe mjeno za twoju dataju.",
 'filename-prefix-blacklist'   => ' #<!-- Njezměń tutu linku! --> <pre>
 # Syntaksa:
 #   * Wšo wot znamješka "#" ha� ke kóncej linki je komentar
@@ -1206,18 +1366,19 @@ PICT # misc.
 'upload_source_url'  => ' (płaćiwy, zjawnje docpějomny URL)',
 'upload_source_file' => ' (dataja na twojim li�aku)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Tuta specialna strona nali�i wšě nahrate dataje. Standardnje so naposlědk nahrate dateje cyle horjeka pokazuja. Kliknjo na nadpisma stołpikow móžeš sortěrowanje wobroćić abo po druhich kriterijach rjadować.',
-'imagelist_search_for'  => 'Za mjenom wobraza pytać:',
+# Special:ListFiles
+'listfiles-summary'     => 'Tuta specialna strona nali�i wšě nahrate dataje. Standardnje so naposlědk nahrate dateje cyle horjeka pokazuja. Kliknjo na nadpisma stołpikow móžeš sortěrowanje wobroćić abo po druhich kriterijach rjadować.',
+'listfiles_search_for'  => 'Za mjenom wobraza pytać:',
 'imgfile'               => 'dataja',
-'imagelist'             => 'Lisćina datajow',
-'imagelist_date'        => 'datum',
-'imagelist_name'        => 'mjeno dataje',
-'imagelist_user'        => 'wužiwar',
-'imagelist_size'        => 'wulkosć (byte)',
-'imagelist_description' => 'wopisanje',
-
-# Image description page
+'listfiles'             => 'Lisćina datajow',
+'listfiles_date'        => 'datum',
+'listfiles_name'        => 'mjeno dataje',
+'listfiles_user'        => 'wužiwar',
+'listfiles_size'        => 'wulkosć (byte)',
+'listfiles_description' => 'wopisanje',
+'listfiles_count'       => 'Wersije',
+
+# File description page
 'filehist'                       => 'Wersije dataje',
 'filehist-help'                  => 'Klikń na wěsty �as, zo by wersiju dataje w tutym �asu zwobraznił.',
 'filehist-deleteall'             => 'wšě wersije wušmórnyć',
@@ -1225,19 +1386,25 @@ PICT # misc.
 'filehist-revert'                => 'cofnyć',
 'filehist-current'               => 'aktualnje',
 'filehist-datetime'              => 'ÄŒas',
+'filehist-thumb'                 => 'Wobrazowy napohlad',
+'filehist-thumbtext'             => 'Wobrazowy napohlad za wersiju wot $1',
+'filehist-nothumb'               => 'Žadyn wobrazowy napohlad',
 'filehist-user'                  => 'Wužiwar',
 'filehist-dimensions'            => 'Rozeznaće',
 'filehist-filesize'              => 'Wulkosć dataje',
 'filehist-comment'               => 'Komentar',
-'imagelinks'                     => 'Wotkazy',
+'imagelinks'                     => 'Datajowe wotkazy',
 'linkstoimage'                   => '{{PLURAL:$1|Slědowaca strona wotkazuje|Slědowacej $1 stronje wotkazujetej|Slědowace $1 strony wotkazuja|Slědowacych $1 stronow wotkazuje}} na tutu dataju:',
+'linkstoimage-more'              => 'Wjace ha� $1 {{PLURAL:$1|strona wotkazuje|stronje wotkazujetej|strony wotkazuja|stronow wotkazuje}} na tutu dataju.
+Slědowaca lisćina pokazuje jenož {{PLURAL:$1|prěni wotkaz strony|prěnjej $1 wotkazaj strony|prěnje $1 wotkazy strony|prěnich $1 wotkazow strony}} na tutu dataju.
+[[Special:WhatLinksHere/$2|Dospołna lisćina]] steji k dispoziciji.',
 'nolinkstoimage'                 => 'Njejsu strony, kotrež na tutu dataju wotkazuja.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Dalše wotkazy]] k tutej dataji wobhladać.',
 'redirectstofile'                => '{{PLURAL:$1|Slědowaca dataja pósrednja|Slědowacej $1 pósrědnjatej|Slědowace $1 posrědnjaju|Slěddowacych $1 pósrědnja}} k toś tej dataji dalej:',
-'duplicatesoffile'               => '{{PLURAL:$1|Slědowaca dataja je duplikat|Slědowacej $1 dataji stej duplikata|Slědowace $1 dataje su duplikaty|Slědowacych $1 duplikatow je duplikaty}} tuteje dataje:',
+'duplicatesoffile'               => '{{PLURAL:$1|Slědowaca dataja je duplikat|Slědowacej $1 dataji stej duplikata|Slědowace $1 dataje su duplikaty|Slědowacych $1 duplikatow je duplikaty}} tuteje dataje ([[Special:FileDuplicateSearch/$2|dalše podrobnosće]])::',
 'sharedupload'                   => 'Tuta dataja je zhromadne nahraće a móže so přez druhe projekty wužiwać.',
 'shareduploadwiki'               => 'Za dalše informacije hlej $1.',
-'shareduploadwiki-desc'          => 'Wopisanje na $1 so deleka w zhromadnym składźišću pokazuje.',
+'shareduploadwiki-desc'          => 'Wopisanje na $1 so deleka pokazuje.',
 'shareduploadwiki-linktext'      => 'stronu datajoweho wopisanja',
 'shareduploadduplicate'          => 'Tuta dataja je duplikat $1 z hromadźe wužiwaneho repozitorija.',
 'shareduploadduplicate-linktext' => 'druha dataja',
@@ -1261,7 +1428,7 @@ PICT # misc.
 # File deletion
 'filedelete'                  => '„$1“ wušmórnyć',
 'filedelete-legend'           => 'Wušmórnju dataju',
-'filedelete-intro'            => "Wušmórnješ '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Šmórnješ dataju '''[[Media:$1|$1]]''' zhromadnje z jeje cyłymi stawiznami.",
 'filedelete-intro-old'        => "Wušmórnješ wersiju '''[[Media:$1|$1]]''' wot [$4 wot $2, $3 hodź].",
 'filedelete-comment'          => 'Při�ina:',
 'filedelete-submit'           => 'Wušmórnyć',
@@ -1269,7 +1436,6 @@ PICT # misc.
 'filedelete-success-old'      => "Wersija '''[[Media:$1|$1]]''' wot $2, $3 hodź. bu zni�ena.",
 'filedelete-nofile'           => "'''„$1“''' njeeksistuje.",
 'filedelete-nofile-old'       => "Njeje žana archiwowana wersija '''$1''' z podatymi atributami.",
-'filedelete-iscurrent'        => 'Spytaš najnowšu wersiju dataje wušmórnyć. Prošu cofń do toho na staršu wersiju.',
 'filedelete-otherreason'      => 'Druha/přidatna při�ina:',
 'filedelete-reason-otherlist' => 'Druha při�ina',
 'filedelete-reason-dropdown'  => '*Powšitkowne při�ina za wušmórnjenja
@@ -1278,9 +1444,9 @@ PICT # misc.
 'filedelete-edit-reasonlist'  => 'Při�iny za wušmórnjenje wobdźěłać',
 
 # MIME search
-'mimesearch'         => 'Pytanje po družinje MIME',
-'mimesearch-summary' => 'Na tutej specialnej stronje hodźa so dataje po družinje MIME filtrować. Dyrbiš přeco družinu MIME a podrjadowanu družinu zapodać: <tt>image/jpeg</tt> (hlej stronu wopisanja dataje).',
-'mimetype'           => 'Družina MIME:',
+'mimesearch'         => 'Pytanje za typom MIME',
+'mimesearch-summary' => 'Na tutej specialnej stronje hodźa so dataje po typje MIME filtrować. Dyrbiš přeco typ MIME a podtyp zapodać: <tt>image/jpeg</tt> (hlej stronu z wopisanjom wobraza).',
+'mimetype'           => 'Typ MIME:',
 'download'           => 'Sćahnyć',
 
 # Unwatched pages
@@ -1296,27 +1462,31 @@ PICT # misc.
 
 # Random page
 'randompage'         => 'Připadny nastawk',
-'randompage-nopages' => 'W tutym mjenowym rumje strony njejsu.',
+'randompage-nopages' => 'W mjenowym rumje "$1" strony njejsu.',
 
 # Random redirect
 'randomredirect'         => 'Připadne daleposrědkowanje',
-'randomredirect-nopages' => 'Žane daleposrědkowanja w tutym mjenowym rumje.',
+'randomredirect-nopages' => 'Žane daleposrědkowanja w mjenowym rumje "$1".',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => 'Statistika {{GRAMMAR:genitiw|{{SITENAME}}}}',
-'userstats'              => 'Statistika wužiwarjow',
-'sitestatstext'          => "{{PLURAL:$1|Je|Stej|Su|Je}} dohromady {{PLURAL:$1|'''1''' strona|'''$1''' stronje|'''$1''' strony|'''$1''' stronow}} w datowej bance. To zapřija tež diskusijne strony, strony wo {{GRAMMAR:lokatiw|{{SITENAME}}}}, krótke nastawki, daleposrědkowanja a druhe, kotrež najskerje nastawki njejsu.
-
-{{PLURAL:$2|Zwostanje|Zwostanjetej|Zwostanu|Zwostanje}} {{PLURAL:$2|'''1''' strona|'''$2''' stronje|'''$2''' strony|'''$2''' stronow}}, {{PLURAL:$2|kotraž najskerje je|kotrejž najskerje stej|kotrež najskerje su|kotrež najskerje je}} {{PLURAL:$2|woprawdźity nastawk|woprawdźitej nastawkaj|woprawdźite nastawki|woprawdźitych nastawkow}}.
-
-{{PLURAL:$8|Je so 1 dataja nahrała|Stej so '''$8''' dataji nahrałoj|Su so '''$8''' dataje nahrali|Je so '''$8''' datajow nahrało}}.
-
-Běše dohromady '''$3''' {{PLURAL:$3|wobhladanje|wobhladani|wobhladanja|wobhladanjow}} stronow a '''$4''' {{PLURAL:$4|změna|změnje|změny|změnow}} stronow, wot toho zo bu {{SITENAME}} připrawjeny. Bě to přerěznje '''$5''' {{PLURAL:$5|změna|změnje|změny|změnow}} na stronu a '''$6''' {{PLURAL:$6|wobhladanje|wobhladani|wobhladanja|wobhladanjow}} na změnu.
-
-Dołhosć [http://www.mediawiki.org/wiki/Manual:Job_queue rynka nadawkow] je '''$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Je '''1''' [[Special:ListUsers|wužiwar]] zregistrowany|Staj '''$1''' [[Special:ListUsers|wužiwarjej]] zregistrowanej|Su '''$1''' [[Special:ListUsers|wužiwarjo]] zregistrowani|Je '''$1''' [[Special:ListUsers|wužiwarjow]] zregistrowanych}}, '''$2''' (abo '''$4%''') z nich {{PLURAL:$2|je|staj|su|je}} $5.",
-'statistics-mostpopular' => 'Najhusćišo wopytowane strony',
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Statistika stronow',
+'statistics-header-edits'      => 'Wobdźěłanska statistika',
+'statistics-header-views'      => 'Statistiku wobhladać',
+'statistics-header-users'      => 'Statistika wužiwarjow',
+'statistics-articles'          => 'Wobsahowe strony',
+'statistics-pages'             => 'Strony',
+'statistics-pages-desc'        => 'Wšě strony we wikiju, inkluziwnje diskusijnych stronow, daleposrědkowanja atd.',
+'statistics-files'             => 'Nahrate dataje',
+'statistics-edits'             => 'Změny stronow wot załoženja {{SITENAME}}',
+'statistics-edits-average'     => 'Změny na stronu w přerězku',
+'statistics-views-total'       => 'Zwobraznjenja dohromady',
+'statistics-views-peredit'     => 'Zwobraznjenja na změnu',
+'statistics-jobqueue'          => 'Dołhosć [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue]',
+'statistics-users'             => 'Zregistrowani [[Special:ListUsers|wužiwarjo]]',
+'statistics-users-active'      => 'Aktiwni wužiwarjo',
+'statistics-users-active-desc' => 'Wužiwarjo, kotřiž su {{PLURAL:$1|w�era|w zańdźenymaj $1 dnjomaj|w zańdźenych $1 dnjach|w zańdźenych $1 dnjach}} aktiwni byli',
+'statistics-mostpopular'       => 'Najhusćišo wopytowane strony',
 
 'disambiguations'      => 'Rozjasnjenja wjacezmyslnosće',
 'disambiguationspage'  => 'Template:Wjacezmyslnosć',
@@ -1358,26 +1528,30 @@ Dołhosć [http://www.mediawiki.org/wiki/Manual:Job_queue rynka nadawkow] je '''
 'popularpages'            => 'ÄŒasto wopytowane strony',
 'wantedcategories'        => 'Požadane kategorije',
 'wantedpages'             => 'Požadane strony',
-'missingfiles'            => 'Falowace dataje',
+'wantedfiles'             => 'Požadane dataje',
+'wantedtemplates'         => 'Falowace předłohi',
 'mostlinked'              => 'Z najwjace stronami zwjazane strony',
 'mostlinkedcategories'    => 'Z najwjace stronami zwjazane kategorije',
 'mostlinkedtemplates'     => 'Najhusćišo wužiwane předłohi',
 'mostcategories'          => 'Strony z najwjace kategorijemi',
 'mostimages'              => 'Z najwjace stronami zwjazane dataje',
 'mostrevisions'           => 'Nastawki z najwjace wersijemi',
-'prefixindex'             => 'WÅ¡Ä› nastawki (z prefiksom)',
+'prefixindex'             => 'WÅ¡Ä› strony z prefiksom',
 'shortpages'              => 'Krótke nastawki',
 'longpages'               => 'Dołhe nastawki',
 'deadendpages'            => 'Nastawki bjez wotkazow',
 'deadendpagestext'        => 'Slědowace strony njejsu z druhimi stronami w tutym wikiju zwjazane.',
 'protectedpages'          => 'Å kitane strony',
 'protectedpages-indef'    => 'Jenož strony z njewobmjezowanym škitom',
+'protectedpages-cascade'  => 'Jenož strony z kaskadowym škitom',
 'protectedpagestext'      => 'Tuta specialna strona nali�i wšě strony, kotrež su přećiwo přesunjenju abo wobdźěłowanju škitane.',
 'protectedpagesempty'     => 'Tuchwilu žane.',
 'protectedtitles'         => 'Å kitane titule',
 'protectedtitlestext'     => 'Slědowace titule su přećiwo wutworjenju škitane',
 'protectedtitlesempty'    => 'Žane titule njejsu tuchwilu z tutymi parametrami škitane.',
 'listusers'               => 'Lisćina wužiwarjow',
+'listusers-editsonly'     => 'Jenož wužiwarjow ze změnami pokazać',
+'usereditcount'           => '$1 {{PLURAL:$1|změna|změnje|změny|změnow}}',
 'newpages'                => 'Nowe strony',
 'newpages-username'       => 'Wužiwarske mjeno:',
 'ancientpages'            => 'Najstarše nastawki',
@@ -1398,14 +1572,13 @@ Dołhosć [http://www.mediawiki.org/wiki/Manual:Job_queue rynka nadawkow] je '''
 'booksources-search-legend' => 'Žórła za knihi pytać',
 'booksources-go'            => 'Pytać',
 'booksources-text'          => 'To je lisćina wotkazow k druhim sydłam, kotrež nowe a trjebane knihi předawaja. Tam móžeš tež dalše informacije wo knihach dóstać, kotrež pytaš:',
+'booksources-invalid-isbn'  => 'Podate ISBN-�isło njezda so płaćiwe być; přepruwuj za zmylkami, z tym zo z orginialneho žórła kopěruješ.',
 
 # Special:Log
 'specialloguserlabel'  => 'Wužiwar:',
 'speciallogtitlelabel' => 'Strona:',
 'log'                  => 'Protokole',
 'all-logs-page'        => 'WÅ¡Ä› protokole',
-'log-search-legend'    => 'Protokole přepytować',
-'log-search-submit'    => 'OK',
 'alllogstext'          => 'Kombinowane zwobraznjenje wšěch k dispozicij stejacych protokolow w {{GRAMMAR:lokatiw|{{SITENAME}}}}. Móžeš napohlad wobmjezować, wuběrajo typ protokola, wužiwarske mjeno (dźiwajo na wulkopisanje) abo potrjechu stronu (tež dźiwajo na wulkopisanje).',
 'logempty'             => 'Žane wotpowědowace zapiski w protokolu.',
 'log-title-wildcard'   => 'Titul zapo�ina so z …',
@@ -1416,6 +1589,7 @@ Dołhosć [http://www.mediawiki.org/wiki/Manual:Job_queue rynka nadawkow] je '''
 'nextpage'          => 'přichodna strona ($1)',
 'prevpage'          => 'předchadna strona ($1)',
 'allpagesfrom'      => 'Strony pokazać, zapo�inajo z:',
+'allpagesto'        => 'Strony pokazać, kotrež kón�a so na:',
 'allarticles'       => 'WÅ¡Ä› nastawki',
 'allinnamespace'    => 'WÅ¡Ä› strony (mjenowy rum $1)',
 'allnotinnamespace' => 'WÅ¡Ä› strony (nic w mjenowym rumje $1)',
@@ -1435,40 +1609,67 @@ Hlej tež [[Special:WantedCategories|požadane kategorije]].',
 'special-categories-sort-count' => 'Po li�bje sortěrować',
 'special-categories-sort-abc'   => 'Alfabetisce sortěrować',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'wušmórnjene přinoški',
+
+# Special:LinkSearch
+'linksearch'       => 'Eksterne wotkazy',
+'linksearch-pat'   => 'Pytanski muster:',
+'linksearch-ns'    => 'Mjenowy rum:',
+'linksearch-ok'    => 'OK',
+'linksearch-text'  => 'Zastupniske znamjenja kaž "*.wikipedia.org" smědźa so wužiwać.<br />Podpěrowane protokole: <tt>$1</tt>',
+'linksearch-line'  => '$1 je z $2 wotkazany.',
+'linksearch-error' => 'Zastupniske znamjenja dadźa so jenož na spo�atku URL wužiwać.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Zapo�inajo z:',
 'listusers-submit'   => 'Pokazać',
 'listusers-noresult' => 'Njemóžno wužiwarjow namakać. Prošu wobkedźbuj, zo so mało- abo wulkopisanje na wotprašowanje wuskutkuje.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Protokol nowych wužiwarjow',
+'newuserlogpagetext'          => 'To je protokol wutworjenja nowych wužiwarskich kontow.',
+'newuserlog-byemail'          => 'Hesło z e-mejlku pósłane',
+'newuserlog-create-entry'     => 'Nowy wužiwar',
+'newuserlog-create2-entry'    => 'Wutwori nowe konto za wužiwarja $1',
+'newuserlog-autocreate-entry' => 'Wužiwarske konto bu awtomatisce wutworjene.',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Prawa wužiwarskeje skupiny',
-'listgrouprights-summary'  => 'Slěduje lisćina wužiwarskich skupinow na tutej wikiju z jich wotpowědnymi přistupnymi prawami. Tu móžeš [[{{MediaWiki:Listgrouprights-helppage}}|dalše informacije]] wo jednotliwych prawach namakać.',
-'listgrouprights-group'    => 'Skupina',
-'listgrouprights-rights'   => 'Prawa',
-'listgrouprights-helppage' => 'Help:Skupinske prawa',
-'listgrouprights-members'  => '(lisćina �łonow)',
+'listgrouprights'                 => 'Prawa wužiwarskeje skupiny',
+'listgrouprights-summary'         => 'Slěduje lisćina wužiwarskich skupinow na tutej wikiju z jich wotpowědnymi přistupnymi prawami. Tu móžeš [[{{MediaWiki:Listgrouprights-helppage}}|dalše informacije]] wo jednotliwych prawach namakać.',
+'listgrouprights-group'           => 'Skupina',
+'listgrouprights-rights'          => 'Prawa',
+'listgrouprights-helppage'        => 'Help:Skupinske prawa',
+'listgrouprights-members'         => '(lisćina �łonow)',
+'listgrouprights-addgroup'        => 'Wužiwar hodźi so {{PLURAL:$2|tutej skupinje|tutymaj skupinomaj|tutym skupinam|tutym skupinam}} přidać: $1',
+'listgrouprights-removegroup'     => 'Wužiwar hodźi so z {{PLURAL:$2|tuteje skupiny|tuteju skupinow|tutych skupinow|tutych skupinow}} wotstronić: $1',
+'listgrouprights-addgroup-all'    => 'Hodźa so wšě skupiny přidać',
+'listgrouprights-removegroup-all' => 'Hodźa so wše skupiny wotstronić',
 
 # E-mail user
-'mailnologin'     => 'Njejsy přizjewjeny.',
-'mailnologintext' => 'Dyrbiš [[Special:UserLogin|přizjewjeny]] być a płaćiwu e-mejlowu adresu w swojich [[Special:Preferences|nastajenjach]] měć, zo by druhim wužiwarjam mejlki pósłać móhł.',
-'emailuser'       => 'Wužiwarjej mejlku pósłać',
-'emailpage'       => 'Wužiwarjej mejlku pósłać',
-'emailpagetext'   => 'Móžeš slědowacy formular wužiwać, zo by tutomu wužiwarjej e-mejlku pósłał.
+'mailnologin'      => 'Njejsy přizjewjeny.',
+'mailnologintext'  => 'Dyrbiš [[Special:UserLogin|přizjewjeny]] być a płaćiwu e-mejlowu adresu w swojich [[Special:Preferences|nastajenjach]] měć, zo by druhim wužiwarjam mejlki pósłać móhł.',
+'emailuser'        => 'Wužiwarjej mejlku pósłać',
+'emailpage'        => 'Wužiwarjej mejlku pósłać',
+'emailpagetext'    => 'Móžeš slědowacy formular wužiwać, zo by tutomu wužiwarjej e-mejlku pósłał.
 E-mejlowa adresa, kotruž sy w [[Special:Preferences|swojich wužiwarskich nastajenjach]] zapodał, zjewi so jako adresa "Wot" e-mejlki, tak zo přijimowar móže ći direktnje wotmołwić.',
-'usermailererror' => 'E-mejlowy objekt je zmylk wróćił:',
-'defemailsubject' => 'Powěsć z {{grammar:genitiw|{{SITENAME}}}}',
-'noemailtitle'    => 'Žana e-mejlowa adresa podata',
-'noemailtext'     => 'Tutón wužiwar njeje płaćiwu e-mejlowu adresu podał abo je so rozsudźił, zo nochce mejlki druhich wužiwarjow dóstać.',
-'emailfrom'       => 'Wot:',
-'emailto'         => 'Komu:',
-'emailsubject'    => 'Tema:',
-'emailmessage'    => 'Powěsć:',
-'emailsend'       => 'Wotesłać',
-'emailccme'       => 'E-mejluj mi kopiju mojeje powěsće.',
-'emailccsubject'  => 'Kopija twojeje powěsće wužiwarjej $1: $2',
-'emailsent'       => 'Mejlka wotesłana',
-'emailsenttext'   => 'Twoja mejlka bu wotesłana.',
-'emailuserfooter' => 'Tuta e-mejlka bu z pomocu funkcije "Wužiwarjej mejlku pósłać" na {{SITENAME}} wot $1 do $2 pósłana.',
+'usermailererror'  => 'E-mejlowy objekt je zmylk wróćił:',
+'defemailsubject'  => 'Powěsć z {{grammar:genitiw|{{SITENAME}}}}',
+'noemailtitle'     => 'Žana e-mejlowa adresa podata',
+'noemailtext'      => 'Tutón wužiwar njeje płaćiwu e-mejlowu adresu podał.',
+'nowikiemailtitle' => 'Žana e-mejl dowolena',
+'nowikiemailtext'  => 'Tutón wužiwar nochce žane e-mejlki wot druhich wužiwarjow dóstać.',
+'email-legend'     => 'E-mejlku druhemu wužiwarjej {{GRAMMAR:genitiw|{{SITENAME}}}} pósłać',
+'emailfrom'        => 'Wot:',
+'emailto'          => 'Komu:',
+'emailsubject'     => 'Tema:',
+'emailmessage'     => 'Powěsć:',
+'emailsend'        => 'Wotesłać',
+'emailccme'        => 'E-mejluj mi kopiju mojeje powěsće.',
+'emailccsubject'   => 'Kopija twojeje powěsće wužiwarjej $1: $2',
+'emailsent'        => 'Mejlka wotesłana',
+'emailsenttext'    => 'Twoja mejlka bu wotesłana.',
+'emailuserfooter'  => 'Tuta e-mejlka bu z pomocu funkcije "Wužiwarjej mejlku pósłać" na {{SITENAME}} wot $1 do $2 pósłana.',
 
 # Watchlist
 'watchlist'            => 'Wobkedźbowanki',
@@ -1501,12 +1702,7 @@ Jeli chceš stronu pozdźišo ze swojich wobkedźbowankow wotstronić, klikń na
 'iteminvalidname'      => 'Problem ze zapiskom „$1“, njepłaćiwe mjeno.',
 'wlnote'               => 'Deleka {{PLURAL:$1|je poslednja|stej poslednjej|su poslednje|su poslednje}} $1 {{PLURAL:$1|změna|změnje|změny|změnow}} za poslednje <b>$2</b> hodź.',
 'wlshowlast'           => 'Poslednje $1 hodź. - $2 dnjow - $3 pokazać',
-'watchlist-show-bots'  => 'změny botow pokazać',
-'watchlist-hide-bots'  => 'změny botow schować',
-'watchlist-show-own'   => 'moje změny pokazać',
-'watchlist-hide-own'   => 'moje změny schować',
-'watchlist-show-minor' => 'snadne změny pokazać',
-'watchlist-hide-minor' => 'snadne změny schować',
+'watchlist-options'    => 'Opcije wobkedźbowankow',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Wobkedźbuju…',
@@ -1547,55 +1743,61 @@ Zo by nastajenja twojich wobkedźbowankow změnił, wopytaj
 Wospjetne prašenja a dalša pomoc:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Stronu wušmórnyć',
-'confirm'                     => 'Wobkrućić',
-'excontent'                   => "wobsah běše: '$1'",
-'excontentauthor'             => "wobsah bě: '$1' (a jeni�ki wobdźěłowar bě '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "wobsah do wuprózdnjenja běše: '$1'",
-'exblank'                     => 'strona běše prózdna',
-'delete-confirm'              => '„$1“ wušmórnyć',
-'delete-legend'               => 'Wušmórnyć',
-'historywarning'              => 'KEDŹBU: Strona, kotruž chceš wušmórnyć, ma stawizny:',
-'confirmdeletetext'           => 'Sy so rozsudźił stronu ze jeje stawiznami wušmórnić.
+# Delete
+'deletepage'             => 'Stronu wušmórnyć',
+'confirm'                => 'Wobkrućić',
+'excontent'              => "wobsah běše: '$1'",
+'excontentauthor'        => "wobsah bě: '$1' (a jeni�ki wobdźěłowar bě '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "wobsah do wuprózdnjenja běše: '$1'",
+'exblank'                => 'strona běše prózdna',
+'delete-confirm'         => '„$1“ wušmórnyć',
+'delete-legend'          => 'Wušmórnyć',
+'historywarning'         => 'KEDŹBU: Strona, kotruž chceš wušmórnyć, ma stawizny:',
+'confirmdeletetext'      => 'Sy so rozsudźił stronu ze jeje stawiznami wušmórnić.
 Prošu potwjerdź, zo maš wotpohlad to �inić, zo rozumiš sćěwki a zo to wotpowědujo [[{{MediaWiki:Policy-url}}|zasadam tutoho wikija]] �iniš.',
-'actioncomplete'              => 'Dokón�ene',
-'deletedtext'                 => 'Strona „<nowiki>$1</nowiki>� bu wušmórnjena. Hlej $2 za lisćinu aktualnych wušmórnjenjow.',
-'deletedarticle'              => 'je stronu [[$1]] wušmórnył.',
-'suppressedarticle'           => '"[[$1]]" potłó�eny',
-'dellogpage'                  => 'Protokol wušmórnjenjow',
-'dellogpagetext'              => 'Deleka je lisćina najaktualnišich wušmórnjenjow.',
-'deletionlog'                 => 'Protokol wušmórnjenjow',
-'reverted'                    => 'Na staršu wersiju cofnjene',
-'deletecomment'               => 'Při�ina wušmórnjenja:',
-'deleteotherreason'           => 'Druha/přidatna při�ina:',
-'deletereasonotherlist'       => 'Druha při�ina',
-'deletereason-dropdown'       => '*Zwu�ene při�iny za wušmórnjenje
+'actioncomplete'         => 'Dokón�ene',
+'deletedtext'            => 'Strona „<nowiki>$1</nowiki>� bu wušmórnjena. Hlej $2 za lisćinu aktualnych wušmórnjenjow.',
+'deletedarticle'         => 'je stronu [[$1]] wušmórnył.',
+'suppressedarticle'      => '"[[$1]]" potłó�eny',
+'dellogpage'             => 'Protokol wušmórnjenjow',
+'dellogpagetext'         => 'Deleka je lisćina najaktualnišich wušmórnjenjow.',
+'deletionlog'            => 'Protokol wušmórnjenjow',
+'reverted'               => 'Na staršu wersiju cofnjene',
+'deletecomment'          => 'Při�ina wušmórnjenja:',
+'deleteotherreason'      => 'Druha/přidatna při�ina:',
+'deletereasonotherlist'  => 'Druha při�ina',
+'deletereason-dropdown'  => '*Zwu�ene při�iny za wušmórnjenje
 ** Požadanje awtora
 ** Zranjenje copyrighta
 ** Wandalizm',
-'delete-edit-reasonlist'      => 'Při�iny za wušmórnjenje wobdźěłać',
-'delete-toobig'               => 'Tuta strona ma z wjace ha� $1 {{PLURAL:$1|wersiju|wersijomaj|wersijemi|wersijemi}} wulke wobdźěłanske stawizny. Wušmórnjenje tajkich stronow bu wobmjezowane, zo by připadne přetorhnjenje {{SITENAME}} wobešło.',
-'delete-warning-toobig'       => 'Tuta strona ma z wjace ha� $1 {{PLURAL:$1|wersiju|wersijomaj|wersijemi|wersijemi}} wulke wobdźěłanske stawizny. Wušmórnjenje móže operacije datoweje banki {{SITENAME}} přetorhnyć; pokro�uj z kedźbliwosću.',
-'rollback'                    => 'Změny cofnyć',
-'rollback_short'              => 'Cofnyć',
-'rollbacklink'                => 'Cofnyć',
-'rollbackfailed'              => 'Cofnjenje njeporadźiło',
-'cantrollback'                => 'Njemóžno změnu cofnyć; strona nima druhich awtorow.',
-'alreadyrolled'               => 'Njemóžno poslednu změnu [[:$1]] přez wužiwarja [[User:$2|$2]] ([[User talk:$2|Diskusija]] | [[Special:Contributions/$2|{{int:contribslink}}]]) cofnyć; něchtó druhi je stronu wobdźěłał abo změnu hižo cofnył.
-
-Poslednja změna bě wot wužiwarja [[User:$3|$3]] ([[User talk:$3|Diskusija]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Komentar wobdźěłanja běše: „<i>$1</i>�.', # only shown if there is an edit comment
-'revertpage'                  => 'Změny [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]) cofnjene a nawróćene k poslednjej wersiji wužiwarja [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Změny wužiwarja $1 cofnjene; wróćo na wersiju wužiwarja $2.',
-'sessionfailure'              => 'Zda so, zo je problem z twojim přizjewjenjom; tuta akcija bu wěstosće dla přećiwo zadobywanju do posedźenja znjemóžniła. Prošu klikń na "Wróćo" a za�itaj stronu, z kotrejež přińdźeš, znowa; potom spytaj hišće raz.',
+'delete-edit-reasonlist' => 'Při�iny za wušmórnjenje wobdźěłać',
+'delete-toobig'          => 'Tuta strona ma z wjace ha� $1 {{PLURAL:$1|wersiju|wersijomaj|wersijemi|wersijemi}} wulke wobdźěłanske stawizny. Wušmórnjenje tajkich stronow bu wobmjezowane, zo by připadne přetorhnjenje {{SITENAME}} wobešło.',
+'delete-warning-toobig'  => 'Tuta strona ma z wjace ha� $1 {{PLURAL:$1|wersiju|wersijomaj|wersijemi|wersijemi}} wulke wobdźěłanske stawizny. Wušmórnjenje móže operacije datoweje banki {{SITENAME}} přetorhnyć; pokro�uj z kedźbliwosću.',
+
+# Rollback
+'rollback'         => 'Změny cofnyć',
+'rollback_short'   => 'Cofnyć',
+'rollbacklink'     => 'Cofnyć',
+'rollbackfailed'   => 'Cofnjenje njeporadźiło',
+'cantrollback'     => 'Njemóžno změnu cofnyć; strona nima druhich awtorow.',
+'alreadyrolled'    => 'Njemóžno poslednu změnu [[:$1]] přez wužiwarja [[User:$2|$2]] ([[User talk:$2|Diskusija]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) cofnyć; něchtó druhi je stronu wobdźěłał abo změnu hižo cofnył.
+
+Poslednja změna bě wot wužiwarja [[User:$3|$3]] ([[User talk:$3|Diskusija]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Zjeće wobdźěłanja bě: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Změny [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]) cofnjene a nawróćene k poslednjej wersiji wužiwarja [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Změny wužiwarja $1 cofnjene; wróćo na wersiju wužiwarja $2.',
+'sessionfailure'   => 'Zda so, zo je problem z twojim přizjewjenjom; tuta akcija bu wěstosće dla přećiwo zadobywanju do posedźenja znjemóžniła. Prošu klikń na "Wróćo" a za�itaj stronu, z kotrejež přińdźeš, znowa; potom spytaj hišće raz.',
+
+# Protect
 'protectlogpage'              => 'Protokol Å¡kita',
 'protectlogtext'              => 'To je protokol škitanych stronow a zběhnjenja škita.
 Hlej [[Special:ProtectedPages|tutu specialnu stronu]] za lisćinu škitanych stron.',
 'protectedarticle'            => 'je stronu [[$1]] škitał',
 'modifiedarticleprotection'   => 'je škit strony [[$1]] změnił',
 'unprotectedarticle'          => 'je škit strony [[$1]] zběhnył',
+'movedarticleprotection'      => 'škitowe nastajenja z "[[$2]]" do "[[$1]]" přesunjene',
 'protect-title'               => 'Stronu „$1� škitać',
+'prot_1movedto2'              => 'je [[$1]] pod hesło [[$2]] přesunył',
 'protect-legend'              => 'Škit wobkrućić',
 'protectcomment'              => 'Při�ina za škitanje:',
 'protectexpiry'               => 'ÄŒas Å¡kita:',
@@ -1603,18 +1805,31 @@ Hlej [[Special:ProtectedPages|tutu specialnu stronu]] za lisćinu škitanych str
 'protect_expiry_old'          => 'Čas škita leži w zańdźenosći.',
 'protect-unchain'             => 'Škit přećiwo přesunjenju změnić',
 'protect-text'                => 'Tu móžeš status škita strony <b><nowiki>$1</nowiki></b> wobhladać a změnić.',
-'protect-locked-blocked'      => 'Njemóžeš škit strony změni�, dokelž twoje konto je zablokowane. Tu widźiš aktualne škitne nastajenja za stronu<strong>„$1“:</strong>',
-'protect-locked-dblock'       => 'Datowa banka je zawrjena, tohodla njemóžeš škit strony změnić. Tu widźiš aktualne škitne nastajenja za stronu<strong>„$1“:</strong>',
-'protect-locked-access'       => 'Nimaš trěbne prawa, zo by škit strony změnił. Tu widźiš aktualne škitne nastajenja za stronu<strong>„$1“:</strong>',
+'protect-locked-blocked'      => "Njemóžeš škit strony změni�, dokelž twoje konto je zablokowane. Tu widźiš aktualne škitne nastajenja za stronu'''„$1“:'''",
+'protect-locked-dblock'       => "Datowa banka je zawrjena, tohodla njemóžeš škit strony změnić. Tu widźiš aktualne škitne nastajenja za stronu'''„$1“:'''",
+'protect-locked-access'       => "Nimaš trěbne prawa, zo by škit strony změnił. Tu widźiš aktualne škitne nastajenja za stronu'''„$1“:'''",
 'protect-cascadeon'           => 'Tuta strona je tuchwilu škitana, dokelž je w {{PLURAL:$1|slědowacej stronje|slědowacych stronach}} zapřijata, {{PLURAL:$1|kotraž je|kotrež su}} přez kaskadowu opciju {{PLURAL:$1|škitana|škitane}}. Móžeš škitowy status strony změnić, to wšak wliw na kaskadowy škit nima.',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Wšěch wužiwarjow dowolić',
 'protect-fallback'            => 'Prawo "$1" trěbne.',
-'protect-level-autoconfirmed' => 'jenož přizjewjeni wužiwarjo',
+'protect-level-autoconfirmed' => 'Nowych a njeregistrowanych wužiwarjow blokować',
 'protect-level-sysop'         => 'jenož administratorojo',
 'protect-summary-cascade'     => 'kaskadowacy',
 'protect-expiring'            => 'spadnje $1 (UTC)',
+'protect-expiry-indefinite'   => 'njewobmjezowany',
 'protect-cascade'             => 'Kaskadowacy škit – wšě w tutej stronje zapřijate strony so škituja.',
 'protect-cantedit'            => 'Njemóžeš škitowe runiny tuteje strony změnić, dokelž nimaš dowolnosć, zo by ju wobdźěłał.',
+'protect-othertime'           => 'Druhi �as:',
+'protect-othertime-op'        => 'druhi �as',
+'protect-existing-expiry'     => 'Eksistowacy �as spadnjenja: $2, $3 hodź.',
+'protect-otherreason'         => 'Druha/přidatna při�ina:',
+'protect-otherreason-op'      => 'druha/přidatna při�ina',
+'protect-dropdown'            => '*Powšitkowne škitowe při�iny
+** Ekscesiwny wandalizm
+** Ekscesiwne spamowanje
+** Wobdźěłanska wójna
+** Strona z jara wjele změnami',
+'protect-edit-reasonlist'     => 'Škitowe při�iny wobdźěłać',
+'protect-expiry-options'      => '1 hodźinu:1 hour,2 hodźinje:2 hours, 6 hodźiny:6 hours,1 dźeń:1 day,3 dny:3 days,1 tydźeń:1 week,2 njedźeli:2 weeks,1 měsać:1 month,3 měsacy:3 months,6 měsacow:6 months,1 lěto:1 year,na přeco:indefinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Å kitowy status',
 'restriction-level'           => 'Runina Å¡kita:',
 'minimum-size'                => 'Minimalna wulkosć:',
@@ -1637,7 +1852,8 @@ Hlej [[Special:ProtectedPages|tutu specialnu stronu]] za lisćinu škitanych str
 'undeletepage'                 => 'Wušmórnjene strony wobnowić',
 'undeletepagetitle'            => "'''Slědowace wudaće pokazuje wušmórnjene wersije wot [[:$1]]'''.",
 'viewdeletedpage'              => 'Wušmórnjene strony wobhladać',
-'undeletepagetext'             => 'Tute strony buchu wušmórnjene, su pak hišće w datowej bance składowane a móža so wobnowić.',
+'undeletepagetext'             => '{{PLURAL:$1|Slědowaca strona bu wušmórnjena, ale je|Slědowacej $1 stronje buštej wušmórnjenej, ale stej|Slědowace $1 strony buchu wušmórnjene, ale su|Slědowacych $1 bu wušmórnjene, ale je}} hišće w archiwje a {{PLURAL:$1|da so|datej so|dadźa so|da so}} wobnowić.
+Archiw da so periodisce wuprózdnić.',
 'undelete-fieldset-title'      => 'Wersije wobnowić',
 'undeleteextrahelp'            => "Zo by wšě stawizny strony wobnowił, wostaj prošu wšě kontrolowe kašćiki njewubrane a klikń na '''''Wobnowić'''''. Zo by selektiwne wobnowjenje přewjedł, wubjer kašćiki, kotrež wersijam wotpowěduja, kotrež maja so wobnowić a klikń na '''''Wobnowić'''''.
 Kliknjenje na '''''Wróćo stajić''''' komentarne polo a wšě kontrolowe kašćiki wuprózdni.",
@@ -1646,12 +1862,13 @@ Kliknjenje na '''''Wróćo stajić''''' komentarne polo a wÅ¡Ä› kontrolowe kaÅ¡Ä
 'undeleterevdel'               => 'Wobnowjenje so njepřewjedźe, jeli je najwyša strona docpěta abo datajowa wersija budźe so zdźěla wušmórnje. 
 W tutym padźe dyrbiš najnowšu wušmórnjenu wersiju znjemóžnić abo pokazać.',
 'undeletehistorynoadmin'       => 'Strona bu wušmórnjena. Při�ina za wušmórnjenje so deleka w zjeću pokazuje, zhromadnje z podrobnosćemi wužiwarjow, kotřiž běchu tutu stronu do zni�enja wobdźěłali. Tuchwilny wobsah strony je jenož administratoram přistupny.',
-'undelete-revision'            => 'Wušmórnjena wersija strony $1 - $2, $3:',
+'undelete-revision'            => 'Wušmórnjena wersija strony $1 (wot $4, $5 hodź.) wot $3:',
 'undeleterevision-missing'     => 'Njepłaćiwa abo pobrachowaca wersija. Pak je wotkaz wopa�ny, pak bu wotpowědna wersija z archiwa wobnowjena abo wotstronjena.',
 'undelete-nodiff'              => 'Předchadna wersija njeeksistuje.',
 'undeletebtn'                  => 'Wobnowić',
 'undeletelink'                 => 'wobnowić',
 'undeletereset'                => 'Cofnyć',
+'undeleteinvert'               => 'Wuběr wobroćić',
 'undeletecomment'              => 'Při�ina:',
 'undeletedarticle'             => 'Strona „$1� bu wuspěšnje wobnowjena.',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|wersija|wersiji|wersije|wersijow}} {{PLURAL:$1|wobnowjena|wobnowjenej|wobnowjene|wobnowjene}}',
@@ -1683,26 +1900,27 @@ $1',
 'blanknamespace' => '(Nastawki)',
 
 # Contributions
-'contributions' => 'Přinoški wužiwarja',
-'mycontris'     => 'Moje přinoški',
-'contribsub2'   => 'za wužiwarja $1 ($2)',
-'nocontribs'    => 'Žane změny, kotrež podatym kriterijam wotpowěduja.',
-'uctop'         => '(aktualnje)',
-'month'         => 'wot měsaca (a do toho):',
-'year'          => 'wot lěta (a do toho):',
-
-'sp-contributions-newbies'     => 'jenož přinoški nowa�kow pokazać',
-'sp-contributions-newbies-sub' => 'Za nowa�kow',
-'sp-contributions-blocklog'    => 'protokol zablokowanjow',
-'sp-contributions-search'      => 'Přinoški pytać',
-'sp-contributions-username'    => 'IP-adresa abo wužiwarske mjeno:',
-'sp-contributions-submit'      => 'OK',
+'contributions'       => 'Přinoški wužiwarja',
+'contributions-title' => 'Wužiwarske přinoški wot „$1“',
+'mycontris'           => 'Moje přinoški',
+'contribsub2'         => 'za wužiwarja $1 ($2)',
+'nocontribs'          => 'Žane změny, kotrež podatym kriterijam wotpowěduja.',
+'uctop'               => '(aktualnje)',
+'month'               => 'wot měsaca (a do toho):',
+'year'                => 'wot lěta (a do toho):',
+
+'sp-contributions-newbies'       => 'jenož přinoški nowa�kow pokazać',
+'sp-contributions-newbies-sub'   => 'Za nowa�kow',
+'sp-contributions-newbies-title' => 'Wužiwarske přinoški za nowe konta',
+'sp-contributions-blocklog'      => 'protokol zablokowanjow',
+'sp-contributions-search'        => 'Přinoški pytać',
+'sp-contributions-username'      => 'IP-adresa abo wužiwarske mjeno:',
+'sp-contributions-submit'        => 'OK',
 
 # What links here
 'whatlinkshere'            => 'Å to wotkazuje sem',
 'whatlinkshere-title'      => 'Strony, kotrež na „$1“ wotkazuja',
 'whatlinkshere-page'       => 'Strona:',
-'linklistsub'              => '(Lisćina wotkazow)',
 'linkshere'                => "Sćěhowace strony na stronu '''[[:$1]]''' wotkazuja:",
 'nolinkshere'              => "Žane strony na '''[[:$1]]''' njewotkazuja.",
 'nolinkshere-ns'           => "Žane strony njewotkazuja na '''[[:$1]]''' we wubranym mjenowym rumje.",
@@ -1747,6 +1965,8 @@ $1',
 'ipbotherreason'                  => 'Druha/přidatna při�ina:',
 'ipbhidename'                     => 'Wužiwarske mjeno/IP-adresu w protokolu zablokowanjow, w lisćinje aktiwnych zablokowanjow a w zapisu wužiwarjow schować.',
 'ipbwatchuser'                    => 'Wužiwarsku a diskusijnu stronu tutoho wužiwarja wobkedźbować',
+'ipballowusertalk'                => 'Tutomu wužiwarjej dowolić swójsku diskusijnu stronu wobdźěłać, mjeztym zo je blokowany',
+'ipb-change-block'                => 'Wužiwarja z tutymi nastajenjemi znowa blokować',
 'badipaddress'                    => 'Njepłaćiwa IP-adresa',
 'blockipsuccesssub'               => 'Zablokowanje wuspěšne',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] bu zablokowany.
@@ -1756,14 +1976,18 @@ $1',
 'ipb-unblock'                     => 'zablokowanje wužiwarja abo IP-adresy zběhnyć',
 'ipb-blocklist-addr'              => 'Eksistowace zablokowanja za "$1"',
 'ipb-blocklist'                   => 'tuchwilne blokowanja zwobraznić',
+'ipb-blocklist-contribs'          => 'Přinoški za $1',
 'unblockip'                       => 'Zablokowanje zběhnyć',
 'unblockiptext'                   => 'Wužij formular deleka, zo by blokowanje IP-adresy abo wužiwarskeho mjena zběhnył.',
-'ipusubmit'                       => 'Zablokowanje zběhnyć',
+'ipusubmit'                       => 'Tute blokěrowanje skón�ić',
 'unblocked'                       => 'Blokowanje wužiwarja [[User:$1|$1]] zběhnjene',
 'unblocked-id'                    => 'Blokowanje ID $1 bu zběhnjene.',
 'ipblocklist'                     => 'Zablokowane IP-adresy a wužiwarske mjena',
 'ipblocklist-legend'              => 'Pytanje za zablokowanym wužiwarjom',
 'ipblocklist-username'            => 'Wužiwarske mjeno abo IP-adresa:',
+'ipblocklist-sh-userblocks'       => '$1 kontowe zablokowanja',
+'ipblocklist-sh-tempblocks'       => '$1 nachwilne zablokowanja',
+'ipblocklist-sh-addressblocks'    => '$1 IP-zablokowanja',
 'ipblocklist-submit'              => 'Pytać',
 'blocklistline'                   => '$1, $2 je wužiwarja $3 zablokował ($4)',
 'infiniteblock'                   => 'na přeco',
@@ -1772,25 +1996,32 @@ $1',
 'noautoblockblock'                => 'awtoblokowanje znjemóžnjene',
 'createaccountblock'              => 'wutworjenje wužiwarskich kontow znjemóžnjene',
 'emailblock'                      => 'Wotpósłanje mejlkow bu znjemóžnjene',
+'blocklist-nousertalk'            => 'njemóže swójsku diskusijnu stronu wobdźěłać',
 'ipblocklist-empty'               => 'Liścina blokowanjow je prózdna.',
 'ipblocklist-no-results'          => 'Požadana IP-adresa/požadane wužiwarske mjeno njeje zablokowane.',
 'blocklink'                       => 'zablokować',
 'unblocklink'                     => 'blokowanje zběhnyć',
+'change-blocklink'                => 'Blokowanje změnić',
 'contribslink'                    => 'přinoški',
 'autoblocker'                     => 'Awtomatiske blokowanje, dokelž twoja IP-adresa bu njedawno wot wužiwarja „[[User:$1|$1]]� wužita. Při�ina, podata za blokowanje $1, je: "$2"',
 'blocklogpage'                    => 'Protokol zablokowanjow',
+'blocklog-fulllog'                => 'Połny protokol blokěrowanjow',
 'blocklogentry'                   => 'je wužiwarja [[$1]] zablokował z �asom spadnjenja $2 $3',
+'reblock-logentry'                => 'změni blokowanske nastajenja za [[$1]] z �asom spadnjenja $2 $3',
 'blocklogtext'                    => 'To je protokol blokowanja a wotblokowanja wužiwarjow. Awtomatisce blokowane IP-adresy so njenalistuja. Hlej [[Special:IPBlockList|lisćinu zablokowanych IP-adresow]] za lisćinu tuchwilnych wuhnaćow a zablokowanjow.',
 'unblocklogentry'                 => 'zablokowanje wužiwarja $1 bu zběhnjene',
 'block-log-flags-anononly'        => 'jenož anonymnych',
 'block-log-flags-nocreate'        => 'wutworjenje wužiwarskich kontow znjemóžnjene',
 'block-log-flags-noautoblock'     => 'awtomatiske zablokowanje znjemóžnjene',
 'block-log-flags-noemail'         => 'wotpósłanje mejlkow bu znjemóžnjene',
+'block-log-flags-nousertalk'      => 'njeje móžno swójsku diskusijnu stronu wobdźěłać',
 'block-log-flags-angry-autoblock' => 'polěpšene awtomatiske blokowanje zmóžnjene',
 'range_block_disabled'            => 'Kmanosć administratorow, cyłe wobłuki IP-adresow blokować, je znjemóžnjena.',
 'ipb_expiry_invalid'              => 'Čas spadnjenja je njepłaćiwy.',
 'ipb_expiry_temp'                 => 'Blokowanja schowanych wužiwarskich mjenow maja permanentne być.',
 'ipb_already_blocked'             => 'Wužiwar „$1� je hižo zablokowany.',
+'ipb-needreblock'                 => '== Hižo zablokowany ==
+$1 je hižo zablokowany. Chceš nastajenja změnić?',
 'ipb_cant_unblock'                => 'Zmylk: Njemóžno ID zablokowanja $1 namakać. Zablokowanje je so najskerje mjeztym zběhnyło.',
 'ipb_blocked_as_range'            => 'Zmylk: IP $1 njeje direktnje zablokowana a njeda so wublokować. Blokuje so wšak jako dźěl wobwoda $2, kotryž da so wublokować.',
 'ip_range_invalid'                => 'Njepłaciwy wobłuk IP-adresow.',
@@ -1802,6 +2033,7 @@ $1',
 'sorbs'                           => 'SORBS DNSbl',
 'sorbsreason'                     => 'Twoja IP-adresa je jako wotewrjeny proksy na DNSBL {{GRAMMAR:genitiw|{{SITENAME}}}} zapisana.',
 'sorbs_create_account_reason'     => 'Twoja IP-adresa je jako wotewrjeny proksy na DNSBL {{GRAMMAR:genitiw|{{SITENAME}}}} zapisana. Njemóžeš konto wutworić.',
+'cant-block-while-blocked'        => 'Njemóžeš druhich wužiwarjow blokować, mjeztym zo ty sy zablokowany.',
 
 # Developer tools
 'lockdb'              => 'Datowu banku zamknyć',
@@ -1822,54 +2054,67 @@ $1',
 'databasenotlocked'   => 'Datajowa banka zamknjena njeje.',
 
 # Move page
-'move-page'               => '$1 přesunyć',
-'move-page-legend'        => 'Stronu přesunyć',
-'movepagetext'            => 'Wužiwanje formulara deleka budźe stronu přemjenować, suwajo jeje cyłe stawizny pod nowe mjeno. Stary titl budźe daleposrědkowanje na nowy titl. Wotkazy na stary titl so njezměnja. Pruwuj za dwójnymi abo skóncowanymi daleposrědkowanjemi. Dyrbiš zaru�ić, zo wotkazy na stronu pokazuja, na kotruž dyrbja dowjesć.
+'move-page'                    => '$1 přesunyć',
+'move-page-legend'             => 'Stronu přesunyć',
+'movepagetext'                 => 'Wužiwanje formulara deleka budźe stronu přemjenować, suwajo jeje cyłe stawizny pod nowe mjeno. Stary titl budźe daleposrědkowanje na nowy titl. Wotkazy na stary titl so njezměnja. Pruwuj za dwójnymi abo skóncowanymi daleposrědkowanjemi. Dyrbiš zaru�ić, zo wotkazy na stronu pokazuja, na kotruž dyrbja dowjesć.
 
 Wobkedźbuj, zo strona so <b>nje</b> přesunje, jeli strona z nowym titlom hizo eksistuje, chibazo wona je prózdna abo dalesposrědkowanje a nima zašłe stawizny. To woznamjenja, zo móžeš stronu tam wróćo přemjenować, hdźež bu runje přemjenowana, jeli zmylk �iniš a njemóžeš wobstejacu stronu přepisować.
 
 <b>KEDŹBU!</b> Móže to drastiska a njewo�akowana změna za woblubowanu stronu być; prošu budź sej wěsty, zo sćěwki rozumiš, prjedy ha� pokro�uješ.',
-'movepagetalktext'        => 'Přisłušna diskusijna strona přesunje so awtomatisce hromadźe z njej, <b>chibazo:</b>
+'movepagetalktext'             => 'Přisłušna diskusijna strona přesunje so awtomatisce hromadźe z njej, <b>chibazo:</b>
 *Njeprózdna diskusijna strona pod nowym mjenom hižo eksistuje abo
 *wotstronješ hó�ku z kašćika deleka.
 
 W tutych padach dyrbiš stronu manuelnje přesunyć abo zaměšeć, jeli sej to přeješ.',
-'movearticle'             => 'Stronu přesunyć',
-'movenotallowed'          => 'Nimaš prawo, zo by strony přesunył.',
-'newtitle'                => 'pod nowe hesło',
-'move-watch'              => 'Stronu wobkedźbować',
-'movepagebtn'             => 'Stronu přesunyć',
-'pagemovedsub'            => 'Přesunjenje wuspěšne',
-'movepage-moved'          => '<big>\'\'\'Strona "$1" bu do "$2" přesunjena.\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Strona z tutym mjenom hižo eksistuje abo mjeno, kotrež sy wuzwolił, płaćiwe njeje. Prošu wuzwol druhe mjeno.',
-'cantmove-titleprotected' => 'Njemóžeš stronu do tutoho městna přesunyć, dokelž nowy titul bu přećiwo wutworjenju škitany',
-'talkexists'              => 'Strona sama bu z wuspěchom přesunjena, diskusijna strona pak njeda so přesunyć, dokelž pod nowym titulom hižo eksistuje. Prošu změš jeju manuelnje.',
-'movedto'                 => 'přesunjena do hesła',
-'movetalk'                => 'Přisłušnu diskusijnu stronu tohorunja přesunyć',
-'move-subpages'           => 'Wšě podstrony přesunyć, jeli eksistuja',
-'move-talk-subpages'      => 'Wšě podstrony diskusijnych stronow přesunyć, jeli eksistuja',
-'movepage-page-exists'    => 'Strona $1 hižo eksistuje a njeda so awtomatisce přepisać.',
-'movepage-page-moved'     => 'Strona $1 bu do $2 přesunjena.',
-'movepage-page-unmoved'   => 'Strona $1 njeda so do $2 přesunyć.',
-'movepage-max-pages'      => 'Maksimalna li�ba $1 {{PLURAL:$1|strony|stronow|stronow|stronow}} bu přesunjena, dalše strony so awtomatisce njepřesunu.',
-'1movedto2'               => 'je [[$1]] pod hesło [[$2]] přesunył',
-'1movedto2_redir'         => 'je [[$1]] pod hesło [[$2]] přesunył a při tym daleposrědkowanje přepisał.',
-'movelogpage'             => 'Protokol přesunjenjow',
-'movelogpagetext'         => 'Deleka je lisćina wšěch přesunjenych stronow.',
-'movereason'              => 'Při�ina',
-'revertmove'              => 'wróćo přesunyć',
-'delete_and_move'         => 'wušmórnyć a přesunyć',
-'delete_and_move_text'    => '== Wušmórnjenje trěbne ==
+'movearticle'                  => 'Stronu přesunyć',
+'movenologin'                  => 'Njejsy přizjewjeny.',
+'movenologintext'              => 'Dyrbiš zregistrowany wužiwar a [[Special:UserLogin|přizjewjeny]] być, zo by stronu přesunyć móhł.',
+'movenotallowed'               => 'Nimaš prawo, zo by strony přesunył.',
+'movenotallowedfile'           => 'Nimaš prawo dataje přesunyć.',
+'cant-move-user-page'          => 'Nimaš prawo wužiwarske strony přesunyć (wothladajo wot podstronow)',
+'cant-move-to-user-page'       => 'Nimaš prawo stronu do wužiwarskeje strony přesunyć (z wuwzaćom do wužiwarskeje podstrony).',
+'newtitle'                     => 'pod nowe hesło',
+'move-watch'                   => 'Stronu wobkedźbować',
+'movepagebtn'                  => 'Stronu přesunyć',
+'pagemovedsub'                 => 'Přesunjenje wuspěšne',
+'movepage-moved'               => '<big>\'\'\'Strona "$1" bu do "$2" přesunjena.\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Daleposrědkowanje je so wutworiło.',
+'movepage-moved-noredirect'    => 'Wutworjenje daleposrědkowanja bu potłó�ene.',
+'articleexists'                => 'Strona z tutym mjenom hižo eksistuje abo mjeno, kotrež sy wuzwolił, płaćiwe njeje. Prošu wuzwol druhe mjeno.',
+'cantmove-titleprotected'      => 'Njemóžeš stronu do tutoho městna přesunyć, dokelž nowy titul bu přećiwo wutworjenju škitany',
+'talkexists'                   => 'Strona sama bu z wuspěchom přesunjena, diskusijna strona pak njeda so přesunyć, dokelž pod nowym titulom hižo eksistuje. Prošu změš jeju manuelnje.',
+'movedto'                      => 'přesunjena do hesła',
+'movetalk'                     => 'Přisłušnu diskusijnu stronu tohorunja přesunyć',
+'move-subpages'                => 'Wšě podstrony přesunyć, jeli eksistuja',
+'move-talk-subpages'           => 'Wšě podstrony diskusijnych stronow přesunyć, jeli eksistuja',
+'movepage-page-exists'         => 'Strona $1 hižo eksistuje a njeda so awtomatisce přepisać.',
+'movepage-page-moved'          => 'Strona $1 bu do $2 přesunjena.',
+'movepage-page-unmoved'        => 'Strona $1 njeda so do $2 přesunyć.',
+'movepage-max-pages'           => 'Maksimalna li�ba $1 {{PLURAL:$1|strony|stronow|stronow|stronow}} bu přesunjena, dalše strony so awtomatisce njepřesunu.',
+'1movedto2'                    => 'je [[$1]] pod hesło [[$2]] přesunył',
+'1movedto2_redir'              => 'je [[$1]] pod hesło [[$2]] přesunył a při tym daleposrědkowanje přepisał.',
+'move-redirect-suppressed'     => 'daleposrědkowanje podtłó�ene',
+'movelogpage'                  => 'Protokol přesunjenjow',
+'movelogpagetext'              => 'Deleka je lisćina wšěch přesunjenych stronow.',
+'movereason'                   => 'Při�ina',
+'revertmove'                   => 'wróćo přesunyć',
+'delete_and_move'              => 'wušmórnyć a přesunyć',
+'delete_and_move_text'         => '== Wušmórnjenje trěbne ==
 
 Cilowa strona „[[:$1]]� hižo eksistuje. Chceš ju wušmórnyć, zo by so přesunjenje zmóžniło?',
-'delete_and_move_confirm' => 'Haj, stronu wušmórnyć.',
-'delete_and_move_reason'  => 'Strona bu wušmórnjena, zo by so přesunjenje zmóžniło.',
-'selfmove'                => 'Žórłowy a cilowy titl stej samsnej; strona njehodźi so na sebje samu přesunyć.',
-'immobile_namespace'      => 'Cilowy titl je wosebity typ; strony njehodźa so do tutoho mjenoweho ruma abo z njeho přesunyć.',
-'imagenocrossnamespace'   => 'Wobraz njeda so do druheho mjenoweho ruma ha� wobraz přesunyć',
-'imagetypemismatch'       => 'Nowa dataja swojemu typej njewotpowěduje',
-'imageinvalidfilename'    => 'Mjeno ciloweje dataje je njepłaćiwe',
-'fix-double-redirects'    => 'Daleposrědkowanja aktualizować, kotrež na prěnjotny titul pokazuja',
+'delete_and_move_confirm'      => 'Haj, stronu wušmórnyć.',
+'delete_and_move_reason'       => 'Strona bu wušmórnjena, zo by so přesunjenje zmóžniło.',
+'selfmove'                     => 'Žórłowy a cilowy titl stej samsnej; strona njehodźi so na sebje samu přesunyć.',
+'immobile-source-namespace'    => 'njemóže strony w mjenowym rumje "$1" přesunyć',
+'immobile-target-namespace'    => 'njemóže strono do mjenoweho ruma "$1" přesunyć',
+'immobile-target-namespace-iw' => 'Interwiki-wotkaz njeje płaćiwy cil za přesunjenja stronow.',
+'immobile-source-page'         => 'Strona njeda so přesunyć.',
+'immobile-target-page'         => 'Njemóžno do teje ciloweje strony přesunyć.',
+'imagenocrossnamespace'        => 'Wobraz njeda so do druheho mjenoweho ruma ha� wobraz přesunyć',
+'imagetypemismatch'            => 'Nowa dataja swojemu typej njewotpowěduje',
+'imageinvalidfilename'         => 'Mjeno ciloweje dataje je njepłaćiwe',
+'fix-double-redirects'         => 'Daleposrědkowanja aktualizować, kotrež na prěnjotny titul pokazuja',
+'move-leave-redirect'          => 'Daleposrědkowanje zawostajić',
 
 # Export
 'export'            => 'Strony eksportować',
@@ -1877,7 +2122,7 @@ Cilowa strona „[[:$1]]â€� hižo eksistuje. ChceÅ¡ ju wuÅ¡mórnyć, zo by so pÅ
 
 Zo by strony eksportował, zapodaj title deleka do tekstoweho pola, jedyn titul na linku, a wubjer, ha� chceš aktualnu wersiju kaž tež stare wersije z linkami stawiznow strony abo jenož aktualnu wersiju z informacijemi wo poslednjej změnje eksportować.
 
-W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]� za stronu „[[{{MediaWiki:Mainpage}}]]�.',
+W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]� za stronu „[[{{MediaWiki:Mainpage}}]]�.',
 'exportcuronly'     => 'Jenož aktualnu wersiju zapřijeć, nic dospołne stawizny',
 'exportnohistory'   => '----
 <b>Kedźbu:</b> Eksport cyłych stawiznow přez tutón formular bu z při�in wukonitosće serwera znjemóžnjeny.',
@@ -1892,7 +2137,7 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'allmessagesname'           => 'Mjeno',
 'allmessagesdefault'        => 'Standardny tekst',
 'allmessagescurrent'        => 'Aktualny tekst',
-'allmessagestext'           => 'To je lisćina wšěch systemowych zdźělenkow, kotrež w mjenowym rumje MediaWiki k dispoziciji steja.',
+'allmessagestext'           => 'To je lisćina systemowych zdźělenkow, kotrež w mjenowym rumje MediaWiki k dispoziciji steja. Prošu wopytaj [http://www.mediawiki.org/wiki/Localisation lokalizaciju MediaWiki] a [http://translatewiki.net translatewiki.net], jeli chceš k powšitkownej lokalizaciji MediaWiki přinošować.',
 'allmessagesnotsupportedDB' => "Tuta strona njeda so wužiwać, dokelž '''\$wgUseDatabaseMessages''' bu znjemóžnjeny.",
 'allmessagesfilter'         => 'Filter za jednotliwe zdźělenki:',
 'allmessagesmodified'       => 'Jenož změnjene pokazać',
@@ -1910,9 +2155,12 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'import'                     => 'Strony importować',
 'importinterwiki'            => 'Import z druheho wikija',
 'import-interwiki-text'      => 'Wuběr wiki a stronu za importowanje. Daty wersijow a mjena awtorow so zachowaja. Wšě akcije za transwiki-importy so w [[Special:Log/import|protokolu importow]] protokoluja.',
+'import-interwiki-source'    => 'Žórłowy wiki/Žórłowa strona:',
 'import-interwiki-history'   => 'Wšě wersije ze stawiznow tuteje strony kopěrować',
 'import-interwiki-submit'    => 'Importować',
 'import-interwiki-namespace' => 'Cilowy mjenowy rum:',
+'import-upload-filename'     => 'Datajowe mjeno:',
+'import-comment'             => 'Při�ina:',
 'importtext'                 => 'Prošu eksportuj dataju ze žórłoweho wikija z pomocu [[Special:Export|Strony eksportować]]. Składuj ju na swojim li�aku a nahraj ju sem.',
 'importstart'                => 'Importuju…',
 'import-revision-count'      => '$1 {{PLURAL:$1|wersija|wersiji|wersije|wersijow}}',
@@ -1946,19 +2194,19 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|wersija|wersiji|wersije|wersijow}} z $2 {{PLURAL:$1|importowana|importowanej|importowane|importowane}}',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'moja wužiwarska strona',
+'tooltip-pt-userpage'             => 'Twoja wužiwarska strona',
 'tooltip-pt-anonuserpage'         => 'Wužiwarska strona IP-adresy, z kotrejž tuchwilu dźěłaš',
-'tooltip-pt-mytalk'               => 'moja diskusijna strona',
+'tooltip-pt-mytalk'               => 'Twoja diskusijna strona',
 'tooltip-pt-anontalk'             => 'Diskusija wo změnach z tuteje IP-adresy',
 'tooltip-pt-preferences'          => 'moje nastajenja',
 'tooltip-pt-watchlist'            => 'lisćina stronow, kotrež wobkedźbuješ',
-'tooltip-pt-mycontris'            => 'lisćina mojich přinoškow',
+'tooltip-pt-mycontris'            => 'Lisćina twojich přinoškow',
 'tooltip-pt-login'                => 'Móžeš so woměrje přizjewić, to pak zawjazowace njeje.',
 'tooltip-pt-anonlogin'            => 'Móžeš so woměrje přizjewić, to pak zawjazowace njeje.',
 'tooltip-pt-logout'               => 'so wotzjewić',
 'tooltip-ca-talk'                 => 'diskusija wo stronje',
 'tooltip-ca-edit'                 => 'Móžeš stronu wobdźěłać. Prošu wužij tłó�ku „Přehlad� do składowanja.',
-'tooltip-ca-addsection'           => 'nowy wotrězk k diskusiji dodać',
+'tooltip-ca-addsection'           => 'Nowy wotrězk zapo�eć',
 'tooltip-ca-viewsource'           => 'Strona je škitana. Móžeš pak jeje žórło wobhladać.',
 'tooltip-ca-history'              => 'stawizny tuteje strony',
 'tooltip-ca-protect'              => 'stronu škitać',
@@ -2005,6 +2253,8 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'tooltip-watch'                   => 'tutu stronu wobkedźbowankam přidać',
 'tooltip-recreate'                => 'stronu znowa wutworić, ha�runjež bu wumšmórnjena',
 'tooltip-upload'                  => 'nahraće startować',
+'tooltip-rollback'                => '"Rollback" anuluje změny strony poslednjeho sobudźěłaćerja přez jedne kliknjenje.',
+'tooltip-undo'                    => 'anuluje tutu změnu a wo�inja wobdźěłowanski formular w přehladowym modusu. Zmóžnja při�inu w zjeću přidać.',
 
 # Stylesheets
 'common.css'   => '/* CSS w tutej dataji budźe so na wšěch stronow wuskutkować. */',
@@ -2020,12 +2270,12 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'notacceptable'     => 'Serwer wikija njemóže daty we formaće poskićić, kotryž twój wudawanski nastroj móže �itać.',
 
 # Attribution
-'anonymous'        => 'Anonymny wužiwar/anonymni wužiwarjo {{GRAMMAR:genitiw|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|Anonymny wužiwar|Anonymnaj wužiwarjej|Anonymni wužiwarjo|Anonymni wužiwarjo}} we {{GRAMMAR:lokatiw|{{SITENAME}}}}',
 'siteuser'         => 'wužiwar {{GRAMMAR:genitiw|{{SITENAME}}}} $1',
 'lastmodifiedatby' => 'Strona bu dnja $1 w $2 hodź. wot wužiwarja $3 změnjena.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Na zakładźe dźěła wužiwarja $1.',
 'others'           => 'druhich',
-'siteusers'        => 'wužiwarjow {{GRAMMAR:genitiw|{{SITENAME}}}} $1',
+'siteusers'        => '{{SITENAME}}  {{PLURAL:$2|wužiwar|wužiwarjej|wužiwarjo|wužiwarjow}} $1',
 'creditspage'      => 'Dźak awtoram',
 'nocredits'        => 'Za tutu stronu žane informacije wo zasłužbach njejsu.',
 
@@ -2045,6 +2295,16 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'numauthors'     => 'Li�ba rozdźělnych awtorow (nastawk): $1',
 'numtalkauthors' => 'Li�ba rozdźělnych awtorow (diskusijna strona): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasiski',
+'skinname-nostalgia'   => 'Nostalgija',
+'skinname-cologneblue' => 'Kölnjanska módrina',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Ćipka',
+'skinname-simple'      => 'Jednory',
+'skinname-modern'      => 'Moderny',
+
 # Math options
 'mw_math_png'    => 'Přeco jako PNG zwobraznić',
 'mw_math_simple' => 'HTML jeli jara jednory, hewak PNG',
@@ -2065,11 +2325,12 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'markedaspatrollederror-noautopatrol' => 'Njesměš swoje změny jako přepruwowane woznamjenjeć.',
 
 # Patrol log
-'patrol-log-page'   => 'Protokol přepruwowanjow',
-'patrol-log-header' => 'To je protokol dohladowanych wersijow.',
-'patrol-log-line'   => 'je $1 strony $2 jako přepruwowanu markěrował $3.',
-'patrol-log-auto'   => '(awtomatisce)',
-'patrol-log-diff'   => 'wersiju $1',
+'patrol-log-page'      => 'Protokol přepruwowanjow',
+'patrol-log-header'    => 'To je protokol dohladowanych wersijow.',
+'patrol-log-line'      => 'je $1 strony $2 jako přepruwowanu markěrował $3.',
+'patrol-log-auto'      => '(awtomatisce)',
+'patrol-log-diff'      => 'wersiju $1',
+'log-show-hide-patrol' => 'Protokol dohladowanja $1',
 
 # Image deletion
 'deletedrevision'                 => 'Stara wersija $1 wušmórnjena',
@@ -2086,23 +2347,28 @@ $1',
 'previousdiff' => '� Předchadna změna',
 'nextdiff'     => 'Přichodna změna →',
 
+# Visual comparison
+'visual-comparison' => 'Wizuelne přirunanje',
+
 # Media information
 'mediawarning'         => '<b>KEDŹBU:</b> Dataja móhła złowólny kod wobsahować, kotrehož wuwjedźenje móhło twój system wobškodźić.<hr />',
 'imagemaxsize'         => 'Wobrazy na stronach wobrazoweho wopisanja wobmjezować na:',
 'thumbsize'            => 'Wulkosć miniaturkow (thumbnails):',
 'widthheight'          => '$1x$2',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|strona|stronje|strony|stronow}}',
-'file-info'            => 'Wulkosć dataje: $1, družina MIME: $2',
-'file-info-size'       => '($1 × $2 pikselow, wulkosć dataje: $3, družina MIME: $4)',
+'file-info'            => 'Wulkosć dataje: $1, typ MIME: $2',
+'file-info-size'       => '($1 × $2 pikselow, wulkosć dataje: $3, typ MIME: $4)',
 'file-nohires'         => '<small>Za tutu dataju žane wyše rozeznaće njeje.</small>',
 'svg-long-desc'        => '(SVG-dataja, zakładna wulkosć: $1 × $2 pikselow, datajowa wulkosć: $3)',
 'show-big-image'       => 'Wersija z wyšim rozeznaćom',
 'show-big-image-thumb' => '<small>Wulkosć miniaturki: $1 × $2 pikselow</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Nowe dataje',
 'imagelisttext'         => "Deleka je lisćina '''$1''' {{PLURAL:$1|dataje|datajow|datajow|datajow}}, kotraž je po $2 sortěrowana.",
 'newimages-summary'     => 'Tuta specialna strona nali�i aktualnje nahrate wobrazy a druhe dataje.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Datajowe mjeno (abo dźěl z njeho):',
 'showhidebots'          => '(bots $1)',
 'noimages'              => 'Žane dataje.',
 'ilsubmit'              => 'Pytać',
@@ -2306,6 +2572,18 @@ Nasledne wotkazy na samsnej lince definuja wuwzaća, hdźež so wobraz smě naje
 'exif-lightsource-24'  => 'ISO studijowa wolframowa žehlawka',
 'exif-lightsource-255' => 'Druhe žórło swětła',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Błysk so njepušći',
+'exif-flash-fired-1'    => 'BÅ‚ysk zahibany',
+'exif-flash-return-0'   => 'žana funkcija za spóznaće błyskoweje refleksije',
+'exif-flash-return-2'   => 'žana refleksija błyska wotkryta',
+'exif-flash-return-3'   => 'refleksija błyska wotkryta',
+'exif-flash-mode-1'     => 'wunućeny błysk',
+'exif-flash-mode-2'     => 'Wunućeny błysk potłó�eny',
+'exif-flash-mode-3'     => 'awtomatiski modus',
+'exif-flash-function-1' => 'Žana błyskowa funkcija',
+'exif-flash-redeye-1'   => 'Redukcija �erwjenych wo�ow',
+
 'exif-focalplaneresolutionunit-2' => 'cól',
 
 'exif-sensingmethod-1' => 'Njedefinowany',
@@ -2328,6 +2606,7 @@ Nasledne wotkazy na samsnej lince definuja wuwzaća, hdźež so wobraz smě naje
 'exif-whitebalance-0' => 'Automatiske wurunanje běłeho',
 'exif-whitebalance-1' => 'Manuelne wurunanje běłeho',
 
+'exif-scenecapturetype-0' => 'Standard',
 'exif-scenecapturetype-1' => 'Krajina',
 'exif-scenecapturetype-2' => 'Portret',
 'exif-scenecapturetype-3' => 'Nócna scena',
@@ -2429,6 +2708,7 @@ Tute wobkrućenski kod spadnje $4.',
 'trackbackbox'      => '<div id="mw_trackbacks">Trackbacks za tutón nastawk:<br />
 $1</div>',
 'trackbackremove'   => '([$1 wušmórnyć])',
+'trackbacklink'     => 'Wróćosćěhowanje',
 'trackbackdeleteok' => 'Trackback bu wuspěšnje wušmórnjeny.',
 
 # Delete conflict
@@ -2438,19 +2718,10 @@ $1</div>',
 Prošu potwjerdź, zo chceš tutu stronu woprawdźe znowa wutworić.",
 'recreate'            => 'Znowa wutworić',
 
-# HTML dump
-'redirectingto' => 'Posrědkuju k stronje [[:$1]]',
-
 # action=purge
-'confirm_purge'        => 'Pufrowak strony wuprózdnić? $1',
 'confirm_purge_button' => 'W porjadku',
-
-# AJAX search
-'searchcontaining' => 'Strony pytać, kotrež <i>$1</i> wobsahuja.',
-'searchnamed'      => 'Strony pytać, w kotrychž titlach so <i>$1</i> jewi.',
-'articletitles'    => 'Strony pytać, kotrež so z <i>$1</i> zapo�inaja',
-'hideresults'      => 'Wuslědki schować',
-'useajaxsearch'    => 'Pytanje AJAX wužiwać',
+'confirm-purge-top'    => 'Pufrowak strony wuprózdnić?',
+'confirm-purge-bottom' => 'Wuprózdnja pufrowak a wunuzuje zwobraznjenje aktualneje wersije.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� předchadna strona',
@@ -2470,10 +2741,10 @@ Prošu potwjerdź, zo chceš tutu stronu woprawdźe znowa wutworić.",
 'table_pager_empty'        => 'Žane wuslědki',
 
 # Auto-summaries
-'autosumm-blank'   => 'Strona bu wuprózdnjena',
+'autosumm-blank'   => 'Je stronu wuprózdnił',
 'autosumm-replace' => "Strona bu z hinašim tekstom přepisana: '$1'",
 'autoredircomment' => 'posrědkuju k stronje „[[$1]]�',
-'autosumm-new'     => 'nowa strona: $1',
+'autosumm-new'     => "Wutwori stronu z '$1'",
 
 # Size units
 'size-kilobytes' => '$1 kB',
@@ -2520,6 +2791,7 @@ MóžeÅ¡ tež [[Special:Watchlist/edit|standardnu wobdźěłowansku stronu]] wuÅ
 
 # Core parser functions
 'unknown_extension_tag' => 'Njeznata tafli�ka rozšěrjenja "$1"',
+'duplicate-defaultsort' => 'Warnowanje: Standardny sortěrowonski klu� (DEFAULTSORTKEY) "$2" přepisa prjedawšu sortěrowanski klu� "$1".',
 
 # Special:Version
 'version'                          => 'Wersija', # Not used as normal message but as header for the special page itself
@@ -2548,13 +2820,13 @@ MóžeÅ¡ tež [[Special:Watchlist/edit|standardnu wobdźěłowansku stronu]] wuÅ
 'filepath-submit'  => 'Puć',
 'filepath-summary' => 'Tuta specialna strona wróća dospołny puć aktualneje datajoweje wersije. Wobrazy so połnym rozeznaću pokazuja, druhe datajowe typy so ze zwjazanym programom startuja.
 
-Zapodaj datajowe mjeno bjez dodawka "{{ns:image}}:".',
+Zapodaj datajowe mjeno bjez dodawka "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Dwójne dataje pytać',
 'fileduplicatesearch-summary'  => "Pytanje za duplikatnymi datajemi na zakładźe jich hašoweje hódnoty.
 
-Zapodaj datajowe mjeno '''bjez''' prefiksa \"{{ns:image}}:\".",
+Zapodaj datajowe mjeno '''bjez''' prefiksa \"{{ns:file}}:\".",
 'fileduplicatesearch-legend'   => 'Duplikaty pytać',
 'fileduplicatesearch-filename' => 'Datajowe mjeno:',
 'fileduplicatesearch-submit'   => 'Pytać',
@@ -2584,4 +2856,13 @@ Zapodaj datajowe mjeno '''bjez''' prefiksa \"{{ns:image}}:\".",
 'blankpage'              => 'Prózdna strona',
 'intentionallyblankpage' => 'Tuta strona je z wotpohladom prózdna.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Wostaj tutu linku eksaktnje kaž je<pre>
+#Zapodaj deleka fragmenty regularnych wurazow (jenož tón dźěl mjez //)
+#Tute přirunuja so z URL eksternych wobrazow
+#Přihódne zwobraznja so jako wobrazy, hewak so jenož wotkaz k wobrazej pokaza
+#Z linkami, kotrež so z # zapo�inaja, wobchadźeja kaž komentary
+
+#Zapodaj wšě fragmenty regularnych wurazow nad tutej linku. Wostaj tutu linku eksaktnje kaž je</pre>',
+
 );
diff --git a/languages/messages/MessagesHt.php b/languages/messages/MessagesHt.php
index 531c8d60..840afad6 100644
--- a/languages/messages/MessagesHt.php
+++ b/languages/messages/MessagesHt.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Diskisyon_Itilizatè',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Diskisyon_$1',
-	NS_IMAGE          => 'Imaj',
-	NS_IMAGE_TALK     => 'Diskisyon_Imaj',
+	NS_FILE           => 'Imaj',
+	NS_FILE_TALK      => 'Diskisyon_Imaj',
 	NS_MEDIAWIKI      => 'MedyaWiki',
 	NS_MEDIAWIKI_TALK => 'Diskisyon_MedyaWiki',
 	NS_TEMPLATE       => 'Modèl',
@@ -32,6 +32,93 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Diskisyon_Kategori'
 );
 
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'RedireksyonDouble' ),
+	'BrokenRedirects'           => array( 'RedireksyonKase' ),
+	'Disambiguations'           => array( 'Disanbigyasyon', 'Klarifikasyon' ),
+	'Userlogin'                 => array( 'Login', 'AntreLòg' ),
+	'Userlogout'                => array( 'Dekoneksyon', 'ExitLòg' ),
+	'CreateAccount'             => array( 'KreyeKonpt' ),
+	'Preferences'               => array( 'Preferans' ),
+	'Watchlist'                 => array( 'LisSwivi' ),
+	'Recentchanges'             => array( 'ChanjmanResan' ),
+	'Upload'                    => array( 'Telechaje' ),
+	'Listfiles'                 => array( 'LisImaj' ),
+	'Newimages'                 => array( 'NouvoImaj' ),
+	'Listusers'                 => array( 'LisItilizatè', 'LisYonItilizatè' ),
+	'Listgrouprights'           => array( 'LisDwaGroup' ),
+	'Statistics'                => array( 'Estatistik' ),
+	'Randompage'                => array( 'Randonm', 'PajRandonm' ),
+	'Lonelypages'               => array( 'PajSolitè', 'PajOfelen' ),
+	'Uncategorizedpages'        => array( 'PajEnkategorize' ),
+	'Uncategorizedcategories'   => array( 'KategoriEnkategorize' ),
+	'Uncategorizedimages'       => array( 'ImageEnkategorize' ),
+	'Uncategorizedtemplates'    => array( 'TenmplaEnkategorize' ),
+	'Unusedcategories'          => array( 'KategoriPaItilize' ),
+	'Unusedimages'              => array( 'ImajePaItilize' ),
+	'Wantedpages'               => array( 'PajBezwen', 'LyenKase' ),
+	'Wantedcategories'          => array( 'KategoriBezwen' ),
+	'Mostlinked'                => array( 'PlisLenke' ),
+	'Mostlinkedcategories'      => array( 'KategoriPlisLenke', 'KategoriPlisItilize' ),
+	'Mostlinkedtemplates'       => array( 'TenmplaPlisLenke', 'TenmplaPlisItilize' ),
+	'Mostcategories'            => array( 'PlisKategori' ),
+	'Mostimages'                => array( 'PlisImaj' ),
+	'Mostrevisions'             => array( 'PlisRevizyon' ),
+	'Fewestrevisions'           => array( 'MwensRevizyon' ),
+	'Shortpages'                => array( 'PajKout' ),
+	'Longpages'                 => array( 'PajLong' ),
+	'Newpages'                  => array( 'PajNouvo' ),
+	'Ancientpages'              => array( 'PajAnsyen' ),
+	'Deadendpages'              => array( 'PajMòtèl' ),
+	'Protectedpages'            => array( 'PajProteje' ),
+	'Protectedtitles'           => array( 'TitProteje' ),
+	'Allpages'                  => array( 'ToutPaj' ),
+	'Prefixindex'               => array( 'PrefixEndèx' ),
+	'Ipblocklist'               => array( 'LisIPBloke' ),
+	'Specialpages'              => array( 'PajEspesyal' ),
+	'Contributions'             => array( 'Kontribisyon' ),
+	'Emailuser'                 => array( 'EmèlItilizatè' ),
+	'Confirmemail'              => array( 'VerifyeEmèl' ),
+	'Whatlinkshere'             => array( 'SakLenkeLa' ),
+	'Recentchangeslinked'       => array( 'LyenChajmanResan', 'Chanjman Relativ' ),
+	'Movepage'                  => array( 'DeplasePaj' ),
+	'Blockme'                   => array( 'Bloke-m' ),
+	'Booksources'               => array( 'SousLiv' ),
+	'Categories'                => array( 'Kategori' ),
+	'Export'                    => array( 'Expòt' ),
+	'Version'                   => array( 'Vèsyon' ),
+	'Allmessages'               => array( 'ToutMesaj' ),
+	'Log'                       => array( 'Jounal', 'Lòg yo' ),
+	'Blockip'                   => array( 'BlokeIP' ),
+	'Undelete'                  => array( 'Restore' ),
+	'Import'                    => array( 'Enpòt' ),
+	'Lockdb'                    => array( 'KadnaseDB' ),
+	'Unlockdb'                  => array( 'DekadnaseDB' ),
+	'Userrights'                => array( 'DwaItilizatè' ),
+	'MIMEsearch'                => array( 'BouskayMIME' ),
+	'FileDuplicateSearch'       => array( 'BouskeFilDouplike' ),
+	'Unwatchedpages'            => array( 'PajPaSiveye' ),
+	'Listredirects'             => array( 'RedireksyonLis' ),
+	'Revisiondelete'            => array( 'RevizyonSiprime' ),
+	'Unusedtemplates'           => array( 'TanmplaVyèj' ),
+	'Randomredirect'            => array( 'RedireksyonRandonm' ),
+	'Mypage'                    => array( 'PajMwen' ),
+	'Mytalk'                    => array( 'Diskisyon-m' ),
+	'Mycontributions'           => array( 'Kontribisyon-m' ),
+	'Listadmins'                => array( 'AdminLis' ),
+	'Listbots'                  => array( 'RoboLis' ),
+	'Popularpages'              => array( 'PajPopilè' ),
+	'Search'                    => array( 'Chache', 'Fouye' ),
+	'Resetpass'                 => array( 'ResètMoPas' ),
+	'Withoutinterwiki'          => array( 'SanEntèwiki' ),
+	'MergeHistory'              => array( 'MeleIstwa' ),
+	'Filepath'                  => array( 'ChemenFil' ),
+	'Invalidateemail'           => array( 'EnvalideEmèl' ),
+	'Blankpage'                 => array( 'PajVid' ),
+	'LinkSearch'                => array( 'BouskeLyen' ),
+	'DeletedContributions'      => array( 'SiprimeKontribisyon' ),
+);
+
 $linkTrail = '/^([a-zàèòÀÈÒ]+)(.*)$/sDu';
 
 $messages = array(
@@ -80,8 +167,6 @@ $messages = array(
 'underline-never'   => 'Jamè',
 'underline-default' => 'Brozè defo',
 
-'skinpreview' => '(Voye kout zye)',
-
 # Dates
 'sunday'        => 'dimanch',
 'monday'        => 'lendi',
@@ -175,7 +260,7 @@ $messages = array(
 'mytalk'         => 'Paj diskisyon mwen an',
 'anontalk'       => 'Diskite avèk adrès IP sa',
 'navigation'     => 'Navigasyon',
-'and'            => 'epi',
+'and'            => '&#32;epi',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -238,8 +323,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Apwopo {{SITENAME}}',
 'aboutpage'            => 'Project:Apwopo',
-'bugreports'           => 'Rapò erè ki fèt',
-'bugreportspage'       => 'Project:Repòt erè yo',
 'copyright'            => 'Konteni avalab anba $1.',
 'copyrightpagename'    => '{{SITENAME}} dwa rezève',
 'copyrightpage'        => '{{ns:project}}:Dwa rezève',
@@ -262,9 +345,7 @@ $messages = array(
 
 'badaccess'        => 'Pèmisyon erè',
 'badaccess-group0' => 'Ou pa genyen pèmisyon pou ou ekzekite demand sa.',
-'badaccess-group1' => 'Aksyon ou esete reyalize-a limite sèlman pou itilizatè ki nan group $1.',
-'badaccess-group2' => 'Aksion ke w vle reyalize a limite sèlman pou itilizatè ki nan group sa yo $1.',
-'badaccess-groups' => 'Aksion ke w vle reyalize a limite sèlman pou itilizatè ki nan group sa yo $1.',
+'badaccess-groups' => 'Aksyon ke w vle reyalize a limite sèlman pou itilizatè ki nan {{PLURAL:$2|gwoup sa |yonn nan gwoup sa yo}}: $1.',
 
 'versionrequired'     => 'Vèzion $1 de MediaWiki nesesè',
 'versionrequiredtext' => 'Vèzion $1 de MediaWiki nesesè pou itilize paj sa. Wè [[Special:Version|version page]].',
@@ -278,6 +359,8 @@ $messages = array(
 'editsection'             => 'modifye',
 'editold'                 => 'modifye',
 'viewsourceold'           => 'Wè kòd paj an',
+'editlink'                => 'modifye',
+'viewsourcelink'          => 'wè kòd tèks sa',
 'editsectionhint'         => 'Modifye seksyon : $1',
 'toc'                     => 'Kontni yo',
 'showtoc'                 => 'montre',
@@ -360,7 +443,6 @@ Souple, kontakte yon [[Special:ListUsers/sysop|administratè]], ba l adrès sa,
 'cannotdelete'         => 'Nou pa kapab efase paj oubyen fichye ou bay an. (Yon lòt moun gen dwa fè l anvan ou.)',
 'badtitle'             => 'Tit ou bay an pa bon, li pa koresponn nan sistèm an, eseye byen ekri li',
 'badtitletext'         => 'Tit, sijè paj ou mande a pa korèk oubyen li pa egziste oubyen li nan yon lòt pwojè wiki yo (gade nan lòt pwojè wiki yo pou wè toutbon). Li mèt genyen tou kèk karaktè ki pa rekonèt nan sistèm an, eseye itilize bon karaktè yo nan tit ou yo.',
-'perfdisabled'         => 'Eskize nou ! Fonksyon sa a dezaktive pou moman sa paske l ap ralanti ekzekisyon bazdone an; pyès moun pa tap kapab itilize wiki a.',
 'perfcached'           => 'Sa se yon vèsyon sòti nan sistèm kach ou an.Li gen dwa pa a jou.',
 'perfcachedts'         => 'Done sa yo nan sistèm cach an, yo gen dwa pa fèk fèt. Dènye fwa nou mete l a jou sete $1.',
 'querypage-no-updates' => 'Nou pa kapab mete paj sa yo a jou paske fonksyon l dezaktive. Done ou ap twouve pli ba pa fèk mete.',
@@ -374,7 +456,7 @@ Demann : $2',
 'protectedpagetext'    => 'Paj sa pwoteje pou anpeche tout modifikasyon nou ta kapab fè sou li. Gade paj diskisyon sou li pito.',
 'viewsourcetext'       => 'Ou kapab gade epitou modifye kontni atik sa a pou ou travay anlè li :',
 'protectedinterface'   => 'Paj sa ap bay tèks pou entèfas lojisyèl an e li pwoteje pou anpeche move itilizasyon nou ta kapab fè ak li.',
-'editinginterface'     => "'''Pòte atansyon :''' ou ap modifye yon paj ki itilize nan kreyasyon tèks entèfas lojisyèl an. Chanjman yo ap ritounen, li ap depann de kèk sityasyon, nan tout paj ke lòt itilizatè yo kapab wè tou. Pou tradiksyon yo, nap envite w itilize pwojè MediaWiki pou mesaj entènasyonal yo (tradiksyon) nan paj sa [http://translatewiki.net/wiki/Main_Page?setlang=fr Betawiki].",
+'editinginterface'     => "'''Pòte atansyon :''' ou ap modifye yon paj ki itilize nan kreyasyon tèks entèfas lojisyèl an. Chanjman yo ap ritounen, li ap depann de kèk sityasyon, nan tout paj ke lòt itilizatè yo kapab wè tou. Pou tradiksyon yo, nap envite w itilize pwojè MediaWiki pou mesaj entènasyonal yo (tradiksyon) nan paj sa [http://translatewiki.net/wiki/Main_Page?setlang=fr translatewiki.net].",
 'sqlhidden'            => '(Demann SQL an kache)',
 'cascadeprotected'     => 'Paj sa pwoteje kounye a paske l nan {{PLURAL:$1|paj ki douvan l|paj yo ki douvan l}}, paske {{PLURAL:$1|l te pwoteje|yo te pwoteje}} ak opsyon « pwoteksyon pou tout paj ki nan premye paj an - kaskad » aktive :
 $2',
@@ -385,15 +467,15 @@ $2',
 Rezon li bay yo se « ''$2'' ».",
 
 # Virus scanner
-'virus-badscanner'     => 'Move konfigirasyon : eskanè viris sa, nou pa konenn l : <i>$1</i>',
+'virus-badscanner'     => "Move konfigirasyon : eskanè viris sa, nou pa konenn l : ''$1''",
 'virus-scanfailed'     => 'Rechèch an pa ritounen pyès rezilta (kòd $1)',
 'virus-unknownscanner' => 'antiviris nou pa konnen :',
 
 # Login and logout pages
 'logouttitle'                => 'Dekoneksyon-Sòti',
-'logouttext'                 => '<strong>Monchè oubyen machè, ou dekonekte kounye a.</strong>
+'logouttext'                 => "'''Monchè oubyen machè, ou dekonekte kounye a.'''
 
-Ou mèt kontinye itilize {{SITENAME}} san ou pa bezwen konekte w, oubyen si ou [[Special:UserLogin|rekonekte]] w ankò ak menm non an oubyen yon lòt.',
+Ou mèt kontinye itilize {{SITENAME}} san ou pa bezwen konekte w, oubyen si ou [[Special:UserLogin|rekonekte]] w ankò ak menm non an oubyen yon lòt.",
 'welcomecreation'            => '== Byenvini, $1 ! ==
 
 Kont ou an kreye. Pa bliye pèsonalize l nan  [[Special:Preferences|preferans ou an sou paj sa {{SITENAME}}]].',
@@ -404,7 +486,6 @@ Kont ou an kreye. Pa bliye pèsonalize l nan  [[Special:Preferences|preferans ou
 'remembermypassword'         => 'Anrejistre mopas mwen an nan òdinatè mwen an',
 'yourdomainname'             => 'Domèn ou an',
 'externaldberror'            => 'Li sanble ke yon erè pwodui ak bazdone a pou idantifikasyon ki pa nan sistèm an, oubyen ou pa otorize pou mete a jou kont ou genyen nan lòt sistèm yo.',
-'loginproblem'               => '<b>Pwoblèm idantifikasyon nan sistèm an.</b><br />Tanpri, eseye ankò !',
 'login'                      => 'Idantifikasyon',
 'nav-login-createaccount'    => 'Kreye yon kont oubyen konekte ou',
 'loginprompt'                => 'Ou dwèt aksepte (aktive) koukiz (cookies) yopou ou kapab [[Special:UserLogin|konekte nan {{SITENAME}}]].',
@@ -461,10 +542,10 @@ Si se pa ou menm ki mande modifye mopas ou an oubyen si ou konnen mopas ou an e
 Anvan yon lòt imèl voye, swiv komand ki nan mesaj imèl an epi konfime ke kont an se byen kont ou an.',
 'throttled-mailpassword'     => 'Yon imèl ki genyen anndan l mopas ou an pou rapèl voye pandan {{PLURAL:$1|dènye lè a|dènye $1 zè sa yo}}. Pou anpeche pwofitè ak kèk move itilizasyon, yon sèl imèl ap voye nan {{PLURAL:$1|è sa|entèval $1 zè sa yo}}.',
 'mailerror'                  => 'Erè ki vini lè nap voye imèl an : $1',
-'acct_creation_throttle_hit' => 'Eskize nou, ou ja kreye {{PLURAL:$1|$1 kont|$1 kont}}. Ou pa kapab kreye dòt ankò.',
-'emailauthenticated'         => 'Adrès imèl ou an otantifye nan sistèm nou an depi $1.',
+'acct_creation_throttle_hit' => 'Eskize nou, ou te deja kreye {{PLURAL:$1|1 kont|$1 kont}}. Ou pa kapab kreye dòt ankò.',
+'emailauthenticated'         => 'Adrès imèl ou an idantifye nan sistèm nou an depi $2 nan $3.',
 'emailnotauthenticated'      => '<strong>Nou pa kapab idantifye</strong> adrès imèl ou an. Pyès mesaj imèl ke voyen pou chak fonksyon sa yo.',
-'noemailprefs'               => '<strong>Ou pa bay pyès adrès imèl nan mesaj preferans ou an,</strong> fonksyon sa yo pe ke disponib.',
+'noemailprefs'               => 'Ou pa bay pyès adrès imèl nan mesaj preferans ou an, fonksyon sa yo pe ke disponib.',
 'emailconfirmlink'           => 'Konfime adrès imèl ou an',
 'invalidemailaddress'        => 'Nou pa kapab aksepte adrès imèl sa paske li sanble fòma l pa bon ditou. Tanpri, mete yon adrès ki nan yon bon fòma oubyen pa ranpli seksyon sa.',
 'accountcreated'             => 'Kont ou an kreye',
@@ -473,17 +554,23 @@ Anvan yon lòt imèl voye, swiv komand ki nan mesaj imèl an epi konfime ke kont
 'createaccount-text'         => 'Yon moun kreye yon kont pou adrès imèl ou an sou paj sa {{SITENAME}} ($4), non l se « $2 », mopas an se « $3 ». Ou ta dwèt ouvè yon sesyon pou chanje, kounye a mopas sa.
 
 Pa pòte atansyon pou mesaj sa si kont sa kreye pa erè.',
+'login-throttled'            => 'Ou fè twòp tantativ pou konekte w ak mopas ou an. Souple, atann yon ti moman anvan ou eseye ankò.',
 'loginlanguagelabel'         => 'Lang : $1',
 
 # Password reset dialog
-'resetpass'               => 'Efase mopas ou an pou konfigire yon lòt',
-'resetpass_announce'      => 'Ou anrejistre ou ak yon mopas ki valab yon moman; mopas sa te voye pa imèl. Pou ou kapab fini anrejistreman sa, ou dwèt mete yon nouvo mopas kote sit :',
-'resetpass_header'        => 'Mopas ou an reyinisyalize',
-'resetpass_submit'        => 'Chanje mopas epitou anrejistre',
-'resetpass_success'       => 'Nou chanje mopas ou an ak siksè ! Nap anrejistre ou kounye a...',
-'resetpass_bad_temporary' => 'Mopas tanporè sa pa bon ditou. Li sanble ou deja chanje mopas ou an oubyen ou mande yon lòt mopas tanporè.',
-'resetpass_forbidden'     => 'Nou pa kapab chanje mopas yo nan sistèm sa',
-'resetpass_missing'       => 'Ou pa bay pyès done',
+'resetpass'                 => 'Efase mopas ou an pou konfigire yon lòt oubyen chanje l',
+'resetpass_announce'        => 'Ou anrejistre ou ak yon mopas ki valab yon moman; mopas sa te voye pa imèl. Pou ou kapab fini anrejistreman sa, ou dwèt mete yon nouvo mopas kote sit :',
+'resetpass_header'          => 'Mopas ou an reyinisyalize',
+'retypenew'                 => 'Konfime nouvo mopas an :',
+'resetpass_submit'          => 'Chanje mopas epitou anrejistre',
+'resetpass_success'         => 'Nou chanje mopas ou an ak siksè ! Nap anrejistre ou kounye a...',
+'resetpass_bad_temporary'   => 'Mopas tanporè sa pa bon ditou. Li sanble ou deja chanje mopas ou an oubyen ou mande yon lòt mopas tanporè.',
+'resetpass_forbidden'       => 'Nou pa kapab chanje mopas yo nan sistèm sa',
+'resetpass-no-info'         => 'Ou dwèt konekte pou ou kapab vini nan paj sa.',
+'resetpass-submit-loggedin' => 'Modifye mopas sa',
+'resetpass-wrong-oldpass'   => 'Mopas sa pa bon ditou;i te mèt mopas ou an kounye a oubyen yonn ki pa ap dire lontan.
+Ou dwèt te deja modifye l oubyen mande yon nouvo mopas ki tap pèmèt ou chanje l.',
+'resetpass-temp-password'   => 'Mopas yo ba ou an (li pap rete lontan):',
 
 # Edit page toolbar
 'bold_sample'     => 'Tèks fonse',
@@ -506,8 +593,8 @@ Pa pòte atansyon pou mesaj sa si kont sa kreye pa erè.',
 'hr_tip'          => 'Liy orizontal (pa abize)',
 
 # Edit pages
-'summary'                          => 'Somè&nbsp;',
-'subject'                          => 'Sijè/tit',
+'summary'                          => 'Somè&nbsp;:',
+'subject'                          => 'Sijè/tit:',
 'minoredit'                        => 'Modifikasyon sa a pa enpòtan',
 'watchthis'                        => 'Swiv paj sa a',
 'savearticle'                      => 'Anrejistre',
@@ -521,8 +608,8 @@ Si ou klike sou \"Pibliye\", piblikasyon sa ke ap fèt san pyès avètisman.",
 'missingcommenttext'               => 'Souple, ekri komantè ou an pli ba nan paj sa.',
 'missingcommentheader'             => "'''Pòte atansyon :''' ou pa bay komantè ou an yon sijè/tit .
 Si ou klike sou \"Pibliye\", edisyon ou an pap genyen yon tit.",
-'summary-preview'                  => 'Kout zye nan rezime an anvan li anrejistre',
-'subject-preview'                  => 'Yon kout zye sou sijè/tit atik kontni sa',
+'summary-preview'                  => 'Kout zye nan rezime an anvan li anrejistre:',
+'subject-preview'                  => 'Yon kout zye sou sijè/tit atik kontni sa:',
 'blockedtitle'                     => 'itilizatè a bloke.',
 'blockedtext'                      => "<big>'''Kont itilizatè ou an (oubyen adrès IP ou an) bloke.'''</big>
 
@@ -580,16 +667,16 @@ Si se paske ou komèt yon erè ke ou ap twouve ou nan paj sa a, klike anlè bout
 'userjspreview'                    => "'''Sonje ke ou ap voye kout zye sou fèy JavaScript ou ekri an, li poko anrejistre !'''",
 'userinvalidcssjstitle'            => "'''Pòte atnasyon :''' estil \"\$1\" sa pa egziste. Raple ou ke paj pèsonèl ou yo ak ekstansyon .css epi .js ap itilize tit/sijè nan lèt miniskil, pa egzanp  {{ns:user}}:Foo/monobook.css se pa {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Li gen dènye vèsyon sou li)',
-'note'                             => '<strong>Nòt :</strong>',
-'previewnote'                      => '<strong>Atansyon, tèks sa a se yon previzyalizasyon, li poko anrejistre !</strong>',
+'note'                             => "'''Nòt :'''",
+'previewnote'                      => "'''Atansyon, tèks sa a se yon previzyalizasyon, li poko anrejistre !'''",
 'previewconflict'                  => 'Kout zye sa ap montre tèks ki nan bwat anwo pou ou wè modifikasyon ou an jan l ap parèt lè li ke pibliye.',
-'session_fail_preview'             => '<strong>Ekskize nou ! Nou pa kapab anrejistre modifikasyon ou an paske nou sanble pèdi kèk enfòmasyon koneksyon sou kont ou an, sou sesyon ou an. Eseye yon fwa ankò. Si li pa mache, dekonekte ou, apre ou ap konekte ou ankò.</strong>',
-'session_fail_preview_html'        => "<strong>Eskize nou ! Nou pa kapab anrejistre modifikasyon ou an paske nou pèdi yon pati nan enfomasyon sou sesyon ou an.</strong>
+'session_fail_preview'             => "'''Ekskize nou ! Nou pa kapab anrejistre modifikasyon ou an paske nou sanble pèdi kèk enfòmasyon koneksyon sou kont ou an, sou sesyon ou an. Eseye yon fwa ankò. Si li pa mache, dekonekte ou, apre ou ap konekte ou ankò.'''",
+'session_fail_preview_html'        => "'''Eskize nou ! Nou pa kapab anrejistre modifikasyon ou an paske nou pèdi yon pati nan enfomasyon sou sesyon ou an.'''
 
 ''HTML san foma, jan l ye a aktive nan wiki sa {{SITENAME}} , bouton pou gade sa lap bay an kache pou anpeche atak pa JavaScript.''
 
-<strong>Si ou panse ke modifikasyon ou an bon toutbon, ou mèt eseye anko. Si sistèm an pa aksepte l fwa la s, dekonekte w, rekonekte w anko.</strong>",
-'token_suffix_mismatch'            => '<strong>Modifikasyon ou fè an sanble pa aksepte paske navigatè, bwozè ou a melanje karaktè ponktyasyon yo nan idantifyan pou tèks sa. Modofikasyon pa aksepte pou li pa jenere kèk pwoblèm nan tèks ki te nan paj an. Pwoblèm sa kapab rive lè ou ap pase pa yon sèvè pwoksi (proxy).</strong>',
+'''Si ou panse ke modifikasyon ou an bon toutbon, ou mèt eseye anko. Si sistèm an pa aksepte l fwa la s, dekonekte w, rekonekte w anko.'''",
+'token_suffix_mismatch'            => "'''Modifikasyon ou fè an sanble pa aksepte paske navigatè, bwozè ou a melanje karaktè ponktyasyon yo nan idantifyan pou tèks sa. Modofikasyon pa aksepte pou li pa jenere kèk pwoblèm nan tèks ki te nan paj an. Pwoblèm sa kapab rive lè ou ap pase pa yon sèvè pwoksi (proxy).'''",
 'editing'                          => 'Modifikasyon pou $1',
 'editingsection'                   => 'Modifikasyon pou $1 (seksyon)',
 'editingcomment'                   => 'Modifikasyon pou $1 (komantè)',
@@ -598,11 +685,11 @@ Si se paske ou komèt yon erè ke ou ap twouve ou nan paj sa a, klike anlè bout
 'yourtext'                         => 'Tèks ou an',
 'storedversion'                    => 'Vèsyon ki anrejistre',
 'yourdiff'                         => 'Diferans',
-'copyrightwarning'                 => 'Souple, raple ou ke tout piblikasyon ki fèt nan {{SITENAME}} piblye anba kontra $2 an (wè $1 pou konnen plis). Si ou pa ta vle ke sa ou ekri pataje oubyen  modifye, ou pa dwèt soumèt yo isit.<br />
-Ou ap pwomèt tou ke sa ou ap ekri a se ou menm menm ki ekri li oubyen ke ou kopye li de yon sous ki nan domèn piblik, ou byen you sous ki lib. <strong>PA ITILIZE TRAVAY MOUN KI PA BAY OTORIZASYON PA LI TOUTBON !</strong>',
+'copyrightwarning'                 => "Souple, raple ou ke tout piblikasyon ki fèt nan {{SITENAME}} piblye anba kontra $2 an (wè $1 pou konnen plis). Si ou pa ta vle ke sa ou ekri pataje oubyen  modifye, ou pa dwèt soumèt yo isit.<br />
+Ou ap pwomèt tou ke sa ou ap ekri a se ou menm menm ki ekri li oubyen ke ou kopye li de yon sous ki nan domèn piblik, ou byen you sous ki lib. '''PA ITILIZE TRAVAY MOUN KI PA BAY OTORIZASYON PA LI TOUTBON !'''",
 'longpagewarning'                  => "'''AVÈTISMAN : paj sa a genyen yon gwosè ki pase $1 Kio ;
 Kèk bwozè (firefox,ie,opera,safari...) pa kapab afiche byen byen modifikasyon ki parèt nan paj ki genyen plis oubyen près 32 Kio. Oumèt dekoupe paj an nan 2 mòso oubyen ak seksyon pli piti.'''",
-'longpageerror'                    => '<strong>ERÈ : Tèks ou anrejistre a ap fè $1 Ko, tay sa a depase kapasite limit nou kapab aksepte kounye a: $2 Ko. Nou pa kapab anrejistre tèks sa. Eseye ritounen nan paj ou te ye anvan pou kopye modifikasyon ou yo.</strong>',
+'longpageerror'                    => "'''ERÈ : Tèks ou anrejistre a ap fè $1 Ko, tay sa a depase kapasite limit nou kapab aksepte kounye a: $2 Ko. Nou pa kapab anrejistre tèks sa. Eseye ritounen nan paj ou te ye anvan pou kopye modifikasyon ou yo.'''",
 'protectedpagewarning'             => "'''Pote atansyon : paj sa a pwoteje.
 Sèl itilizatè yo ki genyen estati administratè kapab modifye l.'''",
 'templatesused'                    => 'Modèl ki itilize nan paj sa a :',
@@ -620,6 +707,7 @@ Sèl itilizatè yo ki genyen estati administratè kapab modifye l.'''",
 'recreate-deleted-warn'            => "'''Atansyon : ou ap kreye yon pak ki te efase deja.'''
 
 Mande ou byen si ou ap byen fè kreye li ankò toutbon (gade jounal paj sa a pou konnene poukisa efasman yo te fèt anba) :s :",
+'deletelog-fulllog'                => 'Wè istorik, jounal konplè pou paj sa',
 
 # Parser/template warnings
 'post-expand-template-inclusion-category' => 'Paj yo ki genyen twop modèl anndan yo',
@@ -628,26 +716,26 @@ Mande ou byen si ou ap byen fè kreye li ankò toutbon (gade jounal paj sa a pou
 'cantcreateaccounttitle' => 'Ou pa kapab kreye yon kont.',
 
 # History pages
-'viewpagelogs'        => 'gade jounal paj sa a',
-'nohistory'           => 'Istorik pou paj sa pa egziste ditou.',
-'revnotfound'         => 'Vèsyon nou pa kapab twouve ditou',
-'currentrev'          => 'Vèsyon kounye a',
-'revisionasof'        => 'Vèsyon jou $1',
-'revision-info'       => 'Vèsyon pou $1 pa $2',
-'previousrevision'    => '� Vèsyon presedan',
-'nextrevision'        => 'Vèsyon swivan →',
-'currentrevisionlink' => 'Vèsyon kounye a',
-'cur'                 => 'kounye a',
-'next'                => 'pli douvan',
-'last'                => 'dènye',
-'page_first'          => 'premye',
-'page_last'           => 'dènye',
-'histlegend'          => 'Lejand : ({{MediaWiki:Cur}}) = diferans ak vèsyon kounye a, ({{MediaWiki:Last}}) = diferans ak vèsyon anvan, <b>m</b> = modifikasyon ki pa enpòtan',
-'deletedrev'          => '[efase]',
-'histfirst'           => 'Premye kontribisyon yo',
-'histlast'            => 'Dènye kontribisyon yo',
-'historysize'         => '({{PLURAL:$1|$1 okte|$1 okte yo}})',
-'historyempty'        => '(vid, pa gen anyen)',
+'viewpagelogs'           => 'gade jounal paj sa a',
+'nohistory'              => 'Istorik pou paj sa pa egziste ditou.',
+'currentrev'             => 'Vèsyon kounye a',
+'revisionasof'           => 'Vèsyon jou $1',
+'revision-info'          => 'Vèsyon pou $1 pa $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Vèsyon presedan',
+'nextrevision'           => 'Vèsyon swivan →',
+'currentrevisionlink'    => 'Vèsyon kounye a',
+'cur'                    => 'kounye a',
+'next'                   => 'pli douvan',
+'last'                   => 'dènye',
+'page_first'             => 'premye',
+'page_last'              => 'dènye',
+'histlegend'             => 'Lejand : ({{MediaWiki:Cur}}) = diferans ak vèsyon kounye a, ({{MediaWiki:Last}}) = diferans ak vèsyon anvan, <b>m</b> = modifikasyon ki pa enpòtan',
+'history-fieldset-title' => 'Navige nan istorik paj sa',
+'deletedrev'             => '[efase]',
+'histfirst'              => 'Premye kontribisyon yo',
+'histlast'               => 'Dènye kontribisyon yo',
+'historysize'            => '({{PLURAL:$1|$1 okte|$1 okte yo}})',
+'historyempty'           => '(vid, pa gen anyen)',
 
 # Revision feed
 'history-feed-title'          => 'Istorik vèsyon yo',
@@ -693,16 +781,17 @@ Mande ou byen si ou ap byen fè kreye li ankò toutbon (gade jounal paj sa a pou
 'diff-multi'              => '({{PLURAL:$1|Yon revizyon nan mitan evolisyon ki kache|$1 revizyon yo nan mitan evolisyon ki kache}})',
 
 # Search results
-'noexactmatch' => "'''Pa genyen pyès paj ki genyen non sa a « $1 ».''' Ou mèt [[:$1|kreye atik sa a]].",
-'prevn'        => '$1 anvan yo',
-'nextn'        => '$1 swivan yo',
-'viewprevnext' => 'Wè ($1) ($2) ($3).',
-'powersearch'  => 'Fouye fon',
+'noexactmatch'   => "'''Pa genyen pyès paj ki genyen non sa a « $1 ».''' Ou mèt [[:$1|kreye atik sa a]].",
+'prevn'          => '$1 anvan yo',
+'nextn'          => '$1 swivan yo',
+'viewprevnext'   => 'Wè ($1) ($2) ($3).',
+'searchhelp-url' => 'Help:Èd',
+'powersearch'    => 'Fouye fon',
 
 # Preferences page
 'preferences'   => 'Preferans yo',
 'mypreferences' => 'Preferans yo',
-'retypenew'     => 'Konfime nouvo mopas an :',
+'skin-preview'  => 'Voye kout zye',
 
 'grouppage-sysop' => '{{ns:project}}:Administratè',
 
@@ -743,10 +832,10 @@ Mande ou byen si ou ap byen fè kreye li ankò toutbon (gade jounal paj sa a pou
 'uploadlogpage' => 'Istorik chajman pou fichye miltimedya',
 'uploadedimage' => 'chaje « [[$1]] »',
 
-# Special:ImageList
-'imagelist' => 'Lis fichye yo',
+# Special:ListFiles
+'listfiles' => 'Lis fichye yo',
 
-# Image description page
+# File description page
 'filehist'                  => 'Istorik fichye a',
 'filehist-help'             => 'Klike anlè yon dat epi yon lè pou fichye a jan li te ye nan moman sa a.',
 'filehist-current'          => 'Kounye a',
@@ -848,54 +937,64 @@ Mande ou byen si ou ap byen fè kreye li ankò toutbon (gade jounal paj sa a pou
 'special-categories-sort-count' => 'klase pa valè',
 'special-categories-sort-abc'   => 'klase alfabetikalman',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Istorik pou kreyasyon kont itilizatè yo',
+'newuserlogpagetext'          => 'Men jounal, istorik kreyasyon kont itilizatè yo.',
+'newuserlog-byemail'          => 'mopas an voye pa imèl',
+'newuserlog-create-entry'     => 'Nouvo itilizatè',
+'newuserlog-create2-entry'    => 'kont kreye pou $1',
+'newuserlog-autocreate-entry' => 'Kont sa kreye otomatikman',
+
 # E-mail user
 'emailuser' => 'Voye yon mesaj (imèl) pou itilizatè sa a',
 
 # Watchlist
-'watchlist'            => 'Lis swivi',
-'mywatchlist'          => 'Lis swivi',
-'watchlistfor'         => "(pou itilizatè '''$1''')",
-'addedwatch'           => 'Ajoute nan lis swivi',
-'addedwatchtext'       => 'Paj « <nowiki>$1</nowiki> » an byen ajoute nan [[Special:Watchlist|lis swivi ou an]].
+'watchlist'         => 'Lis swivi',
+'mywatchlist'       => 'Lis swivi',
+'watchlistfor'      => "(pou itilizatè '''$1''')",
+'addedwatch'        => 'Ajoute nan lis swivi',
+'addedwatchtext'    => 'Paj « <nowiki>$1</nowiki> » an byen ajoute nan [[Special:Watchlist|lis swivi ou an]].
 Pwochen modifikasyon nan paj sa a ke make na lis swivi ou an, paj an ke parèt <b>fonse </b> nan [[Special:RecentChanges|chanjman ki fèk fèt]] pou ou kapab wè yo pli fasilman.',
-'removedwatch'         => 'Retire nan lis swivi',
-'removedwatchtext'     => 'Paj "[[:$1]]" byen retire nan [[Special:Watchlist|lis swivi ou an]].',
-'watch'                => 'Swiv',
-'watchthispage'        => 'Swiv paj sa a',
-'unwatch'              => 'Pa swiv ankò',
-'watchlist-details'    => 'Ou ap swiv {{PLURAL:$1|paj|paj}}, san konte paj diskisyon yo.',
-'wlshowlast'           => 'Montre dènye $1 zè yo, dènye $2 jou yo, oubyen $3.',
-'watchlist-hide-bots'  => 'Kache kontribisyon wobo yo (Bòt)',
-'watchlist-hide-own'   => 'kache modifikasyon mwen yo',
-'watchlist-hide-minor' => 'Kache modifikasyon ki pa enpòtan yo',
+'removedwatch'      => 'Retire nan lis swivi',
+'removedwatchtext'  => 'Paj "[[:$1]]" byen retire nan [[Special:Watchlist|lis swivi ou an]].',
+'watch'             => 'Swiv',
+'watchthispage'     => 'Swiv paj sa a',
+'unwatch'           => 'Pa swiv ankò',
+'watchlist-details' => 'Ou ap swiv {{PLURAL:$1|paj|paj}}, san konte paj diskisyon yo.',
+'wlshowlast'        => 'Montre dènye $1 zè yo, dènye $2 jou yo, oubyen $3.',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Swiv...',
 'unwatching' => 'Fini swiv paj sa a...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Efase yon paj',
-'historywarning'              => 'Atansyon, paj ou ap efase an genyen yon istorik :',
-'confirmdeletetext'           => 'Ou ap efase pou tout bon nan bazdone a yon paj oubyen yon imaj epi tout vèsyon li yo. Souple, konfime aksyon enpòtan sa a, ke ou konprann sa ou ap fè, nan dwa ak [[{{MediaWiki:Policy-url}}|lwa medyawiki a]].',
-'actioncomplete'              => 'Aksyon an fèt',
-'deletedtext'                 => '« <nowiki>$1</nowiki> » efase.
+# Delete
+'deletepage'            => 'Efase yon paj',
+'historywarning'        => 'Atansyon, paj ou ap efase an genyen yon istorik :',
+'confirmdeletetext'     => 'Ou ap efase pou tout bon nan bazdone a yon paj oubyen yon imaj epi tout vèsyon li yo. Souple, konfime aksyon enpòtan sa a, ke ou konprann sa ou ap fè, nan dwa ak [[{{MediaWiki:Policy-url}}|lwa medyawiki a]].',
+'actioncomplete'        => 'Aksyon an fèt',
+'deletedtext'           => '« <nowiki>$1</nowiki> » efase.
 Gade $2 pou wè yon lis efasman resan.',
-'deletedarticle'              => 'efase « [[$1]] »',
-'dellogpage'                  => 'Istorik efasman yo',
-'deletecomment'               => 'Rezon pou kilès la ou efase :',
-'deleteotherreason'           => 'Rezon an plis :',
-'deletereasonotherlist'       => 'Lòt rezon',
-'rollbacklink'                => 'anlve',
+'deletedarticle'        => 'efase « [[$1]] »',
+'dellogpage'            => 'Istorik efasman yo',
+'deletecomment'         => 'Rezon pou kilès la ou efase :',
+'deleteotherreason'     => 'Rezon an plis :',
+'deletereasonotherlist' => 'Lòt rezon',
+
+# Rollback
+'rollbacklink' => 'anlve',
+
+# Protect
 'protectlogpage'              => 'Istorik pwoteksyon yo',
+'prot_1movedto2'              => '[[$1]] renonmen, li kounye a [[$2]]',
 'protect-legend'              => 'Konfime pwoteksyon an',
 'protectcomment'              => 'Poukisa ou pwoteje li:',
 'protectexpiry'               => 'Ekspirasyon(Paj an pe ke ekspire si ou pa mete anyen)',
 'protect_expiry_invalid'      => 'Dat ou mete a pou li ekspire pa bon',
 'protect_expiry_old'          => 'dat ekspirasyon an ja pase;',
 'protect-unchain'             => 'Debloàke pèmisyon yo pou renonmen, deplase',
-'protect-text'                => 'Ou mèt konsilte epi modifye nivo pwoteksyon paj sa a <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Ou pa genyen dwa ki ap pèmèt ou modifye pwoteksyon paj sa a.
-Men reglaj pou paj <strong>$1</strong> an kounye a:',
+'protect-text'                => "Ou mèt konsilte epi modifye nivo pwoteksyon paj sa a '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Ou pa genyen dwa ki ap pèmèt ou modifye pwoteksyon paj sa a.
+Men reglaj pou paj '''$1''' an kounye a:",
 'protect-cascadeon'           => 'paj sa a pwoteje kounye a paske li nan {{PLURAL:$1|paj swivan|paj swivan yo}}, {{PLURAL:$1|ki li menm menm te pwoteje|ki yo menm menm te pwoteje}} epi opsyon pwoteksyon "enbrike" aktif. Ou mèt chanje nivo pwoteksyon paj sa a san ke li modifye pwoteksyon enbrike an.',
 'protect-default'             => '(pa genyen pwoteksyon)',
 'protect-fallback'            => 'Li bezwen pèmisyon "$1"',
@@ -905,6 +1004,7 @@ Men reglaj pou paj <strong>$1</strong> an kounye a:',
 'protect-expiring'            => 'ap ekspire $1',
 'protect-cascade'             => 'Pwoteksyon enbrike - ap pwoteje tout paj ki andidan paj sa a.',
 'protect-cantedit'            => 'Ou pa kapab modifye nivo pwoteksyon paj sa a paske ou pa gen dwa pou edite li.',
+'protect-expiry-options'      => '2 zè:2 hours,1 jou:1 day,3 jou:3 days,1 semèn:1 week,2 semèn:2 weeks,1 mwa:1 month,3 mwa:3 months,6 mwa:6 months,1 lane:1 year,ki pap janm fini:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pèmisyon:',
 'restriction-level'           => 'Nivo kontrent, restriksyon:',
 
@@ -933,7 +1033,6 @@ Men reglaj pou paj <strong>$1</strong> an kounye a:',
 # What links here
 'whatlinkshere'       => 'Paj ki lye nan paj sa a',
 'whatlinkshere-title' => 'Paj ki genyen lyen ki ap mennen nan "$1"',
-'linklistsub'         => '(Lis lyen yo)',
 'linkshere'           => 'Paj yo ki anba ap mene nan <b>[[:$1]]</b> :',
 'nolinkshere'         => 'Pyès paj genyen lyen pou paj sa a <b>[[:$1]]</b>.',
 'isredirect'          => 'Paj redireksyon',
@@ -1051,7 +1150,7 @@ Nan pozisyon sa a, ou ke dwèt renonmen oubyen fizyone ou menm menm paj an si ou
 'show-big-image'       => 'Imaj pli gwo, pli fin',
 'show-big-image-thumb' => '<small>Lajè kout zye sa a : $1 × $2 piksèl</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Galri pou nouvo fichye yo',
 
 # Bad image list
diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index 9b3283bf..ab079686 100644
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -7,143 +7,139 @@
  * @author Balasyum
  * @author Bdamokos
  * @author Bennó
+ * @author CERminator
  * @author Cerasus
  * @author Dani
  * @author Dorgan
+ * @author Glanthor Reviol
  * @author Gondnok
+ * @author KossuthRad
  * @author Samat
  * @author Terik
  * @author Tgr
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Média',
-	NS_SPECIAL        => 'Speciális',
-	NS_MAIN           => '',
-	NS_TALK           => 'Vita',
-	NS_USER           => 'Szerkesztő',
-	NS_USER_TALK      => 'Szerkesztővita',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1-vita',
-	NS_IMAGE          => 'Kép',
-	NS_IMAGE_TALK     => 'Képvita',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki-vita',
-	NS_TEMPLATE       => 'Sablon',
-	NS_TEMPLATE_TALK  => 'Sablonvita',
-	NS_HELP           => 'Segítség',
-	NS_HELP_TALK      => 'Segítségvita',
-	NS_CATEGORY       => 'Kategória',
-	NS_CATEGORY_TALK  => 'Kategóriavita',
+	NS_MEDIA            => 'Média',
+	NS_SPECIAL          => 'Speciális',
+	NS_TALK             => 'Vita',
+	NS_USER             => 'Szerkesztő',
+	NS_USER_TALK        => 'Szerkesztővita',
+	NS_PROJECT_TALK     => '$1-vita',
+	NS_FILE             => 'Fájl',
+	NS_FILE_TALK        => 'Fájlvita',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki-vita',
+	NS_TEMPLATE         => 'Sablon',
+	NS_TEMPLATE_TALK    => 'Sablonvita',
+	NS_HELP             => 'Segítség',
+	NS_HELP_TALK        => 'Segítségvita',
+	NS_CATEGORY         => 'Kategória',
+	NS_CATEGORY_TALK    => 'Kategóriavita',
 );
 
 $namespaceAliases = array(
+	'Kép' => NS_FILE,
+	'Képvita' => NS_FILE_TALK,
 	'User_vita'      => NS_USER_TALK,
 	'$1_vita'        => NS_PROJECT_TALK,
-	'Kép_vita'       => NS_IMAGE_TALK,
+	'Kép_vita'       => NS_FILE_TALK,
 	'MediaWiki_vita' => NS_MEDIAWIKI_TALK,
 	'Sablon_vita'    => NS_TEMPLATE_TALK,
 	'Segítség_vita'  => NS_HELP_TALK,
 	'Kategória_vita' => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'Klasszikus',
-	'nostalgia'   => 'Nosztalgia',
-	'cologneblue' => 'Kölni kék',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Chick',
-	'simple'      => 'Egyszerű',
-);
-
 $fallback8bitEncoding = "iso8859-2";
 $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Dupla átirányítások' ),
-	'BrokenRedirects'         => array( 'Nem létező lapra mutató átirányítások' ),
-	'Disambiguations'         => array( 'Egyértelműsítő lapok' ),
-	'Userlogin'               => array( 'Belépés' ),
-	'Userlogout'              => array( 'Kilépés' ),
-	'CreateAccount'           => array( 'Felhasználói fiók létrehozása' ),
-	'Preferences'             => array( 'Beállításaim' ),
-	'Watchlist'               => array( 'Figyelőlistám' ),
-	'Recentchanges'           => array( 'Friss változtatások' ),
-	'Upload'                  => array( 'Feltöltés' ),
-	'Imagelist'               => array( 'Képlista' ),
-	'Newimages'               => array( 'Új képek galériája' ),
-	'Listusers'               => array( 'Szerkesztők listája', 'Szerkesztők', 'Felhasználók' ),
-	'Listgrouprights'         => array( 'Szerkesztői csoportok jogai' ),
-	'Statistics'              => array( 'Statisztikák' ),
-	'Randompage'              => array( 'Lap találomra' ),
-	'Lonelypages'             => array( '�rva lapok', 'Magányos lapok' ),
-	'Uncategorizedpages'      => array( 'Kategorizálatlan lapok' ),
-	'Uncategorizedcategories' => array( 'Kategorizálatlan kategóriák' ),
-	'Uncategorizedimages'     => array( 'Kategorizálatlan képek', 'Kategorizálatlan fájlok' ),
-	'Uncategorizedtemplates'  => array( 'Kategorizálatlan sablonok' ),
-	'Unusedcategories'        => array( 'Nem használt kategóriák' ),
-	'Unusedimages'            => array( 'Nem használt képek' ),
-	'Wantedpages'             => array( 'Keresett lapok' ),
-	'Wantedcategories'        => array( 'Keresett kategóriák' ),
-	'Missingfiles'            => array( 'Hiányzó fájlok', 'Hiányzó képek' ),
-	'Mostlinked'              => array( 'Legtöbbet hivatkozott lapok' ),
-	'Mostlinkedcategories'    => array( 'Legtöbbet hivatkozott kategóriák' ),
-	'Mostlinkedtemplates'     => array( 'Legtöbbet hivatkozott sablonok' ),
-	'Mostcategories'          => array( 'Legtöbb kategóriába tartozó lapok' ),
-	'Mostimages'              => array( 'Legtöbbet használt képek' ),
-	'Mostrevisions'           => array( 'Legtöbbet szerkesztett lapok' ),
-	'Fewestrevisions'         => array( 'Legkevesebbet szerkesztett lapok' ),
-	'Shortpages'              => array( 'Rövid lapok' ),
-	'Longpages'               => array( 'Hosszú lapok' ),
-	'Newpages'                => array( 'Új lapok' ),
-	'Ancientpages'            => array( 'Régóta nem változott szócikkek' ),
-	'Deadendpages'            => array( 'Zsákutcalapok' ),
-	'Protectedpages'          => array( 'Védett lapok' ),
-	'Protectedtitles'         => array( 'Védett címek' ),
-	'Allpages'                => array( 'Az összes lap listája' ),
-	'Prefixindex'             => array( 'Egy névtérbe tartozó lapok listája' ),
-	'Ipblocklist'             => array( 'Blokkolt IP-címek listája' ),
-	'Specialpages'            => array( 'Speciális lapok' ),
-	'Contributions'           => array( 'Szerkesztő közreműködései' ),
-	'Emailuser'               => array( 'E-mail küldése', 'E-mail küldése ezen szerkesztőnek' ),
-	'Confirmemail'            => array( 'Emailcím megerősítése' ),
-	'Whatlinkshere'           => array( 'Mi hivatkozik erre' ),
-	'Recentchangeslinked'     => array( 'Kapcsolódó változtatások' ),
-	'Movepage'                => array( 'Lap átnevezése' ),
-	'Blockme'                 => array( 'Blokkolj' ),
-	'Booksources'             => array( 'Könyvforrások' ),
-	'Categories'              => array( 'Kategóriák' ),
-	'Export'                  => array( 'Lapok exportálása' ),
-	'Version'                 => array( 'Névjegy', 'Verziószám', 'Verzió' ),
-	'Allmessages'             => array( 'Rendszerüzenetek' ),
-	'Log'                     => array( 'Rendszernaplók', 'Naplók', 'Napló' ),
-	'Blockip'                 => array( 'Blokkolás' ),
-	'Undelete'                => array( 'Törölt lapváltozatok visszaállítása' ),
-	'Import'                  => array( 'Lapok importálása' ),
-	'Lockdb'                  => array( 'Adatbázis lezárása' ),
-	'Unlockdb'                => array( 'Adatbázis lezárás feloldása' ),
-	'Userrights'              => array( 'Szerkesztői jogok' ),
-	'MIMEsearch'              => array( 'Keresés MIME-típus alapján' ),
-	'FileDuplicateSearch'     => array( 'Duplikátumok keresése' ),
-	'Unwatchedpages'          => array( 'Nem figyelt lapok' ),
-	'Listredirects'           => array( '�tirányítások listája' ),
-	'Revisiondelete'          => array( 'Változat törlése' ),
-	'Unusedtemplates'         => array( 'Nem használt sablonok' ),
-	'Randomredirect'          => array( '�tirányítás találomra' ),
-	'Mypage'                  => array( 'Lapom', 'Userlapom' ),
-	'Mytalk'                  => array( 'Vitám', 'Vitalapom', 'Uservitalapom' ),
-	'Mycontributions'         => array( 'Közreműködéseim' ),
-	'Listadmins'              => array( 'Adminisztrátorok', 'Adminisztrátorok listája', 'Sysopok' ),
-	'Listbots'                => array( 'Botok', 'Botok listája' ),
-	'Popularpages'            => array( 'Népszerű oldalak' ),
-	'Search'                  => array( 'Keresés' ),
-	'Resetpass'               => array( 'Jelszócsere' ),
-	'Withoutinterwiki'        => array( 'Interwikilinkek nélküli lapok' ),
-	'MergeHistory'            => array( 'Laptörténetek egyesítése' ),
-	'Filepath'                => array( 'Fájl elérési útja' ),
-	'Invalidateemail'         => array( 'E-mail cím érvénytelenítése' ),
-	'Blankpage'               => array( 'Ãœres lap' ),
+	'DoubleRedirects'           => array( 'Kettős átirányítások', 'Dupla átirányítások' ),
+	'BrokenRedirects'           => array( 'Nem létező lapra mutató átirányítások', 'Hibás átirányítások' ),
+	'Disambiguations'           => array( 'Egyértelműsítő lapok' ),
+	'Userlogin'                 => array( 'Belépés' ),
+	'Userlogout'                => array( 'Kilépés' ),
+	'CreateAccount'             => array( 'Felhasználói fiók létrehozása' ),
+	'Preferences'               => array( 'Beállításaim' ),
+	'Watchlist'                 => array( 'Figyelőlistám' ),
+	'Recentchanges'             => array( 'Friss változtatások' ),
+	'Upload'                    => array( 'Feltöltés' ),
+	'Listfiles'                 => array( 'Fájllista', 'Képlista' ),
+	'Newimages'                 => array( 'Új fájlok', 'Új képek', 'Új képek galériája' ),
+	'Listusers'                 => array( 'Szerkesztők listája', 'Szerkesztők', 'Felhasználók' ),
+	'Listgrouprights'           => array( 'Szerkesztői csoportok jogai' ),
+	'Statistics'                => array( 'Statisztika', 'Statisztikák' ),
+	'Randompage'                => array( 'Lap találomra' ),
+	'Lonelypages'               => array( '�rva lapok', 'Magányos lapok' ),
+	'Uncategorizedpages'        => array( 'Kategorizálatlan lapok' ),
+	'Uncategorizedcategories'   => array( 'Kategorizálatlan kategóriák' ),
+	'Uncategorizedimages'       => array( 'Kategorizálatlan fájlok', 'Kategorizálatlan képek' ),
+	'Uncategorizedtemplates'    => array( 'Kategorizálatlan sablonok' ),
+	'Unusedcategories'          => array( 'Nem használt kategóriák' ),
+	'Unusedimages'              => array( 'Nem használt képek' ),
+	'Wantedpages'               => array( 'Keresett lapok' ),
+	'Wantedcategories'          => array( 'Keresett kategóriák' ),
+	'Wantedfiles'               => array( 'Keresett fájlok' ),
+	'Wantedtemplates'           => array( 'Keresett sablonok' ),
+	'Mostlinked'                => array( 'Legtöbbet hivatkozott lapok' ),
+	'Mostlinkedcategories'      => array( 'Legtöbbet hivatkozott kategóriák' ),
+	'Mostlinkedtemplates'       => array( 'Legtöbbet hivatkozott sablonok' ),
+	'Mostimages'                => array( 'Legtöbbet használt fájlok', 'Legtöbbet használt képek' ),
+	'Mostcategories'            => array( 'Legtöbb kategóriába tartozó lapok' ),
+	'Mostrevisions'             => array( 'Legtöbbet szerkesztett lapok' ),
+	'Fewestrevisions'           => array( 'Legkevesebbet szerkesztett lapok' ),
+	'Shortpages'                => array( 'Rövid lapok' ),
+	'Longpages'                 => array( 'Hosszú lapok' ),
+	'Newpages'                  => array( 'Új lapok' ),
+	'Ancientpages'              => array( 'Régóta nem változott szócikkek' ),
+	'Deadendpages'              => array( 'Zsákutcalapok' ),
+	'Protectedpages'            => array( 'Védett lapok' ),
+	'Protectedtitles'           => array( 'Védett címek' ),
+	'Allpages'                  => array( 'Az összes lap listája' ),
+	'Prefixindex'               => array( 'Egy névtérbe tartozó lapok listája' ),
+	'Ipblocklist'               => array( 'Blokkolt IP-címek listája' ),
+	'Specialpages'              => array( 'Speciális lapok' ),
+	'Contributions'             => array( 'Szerkesztő közreműködései' ),
+	'Emailuser'                 => array( 'E-mail küldése', 'E-mail küldése ezen szerkesztőnek' ),
+	'Confirmemail'              => array( 'Emailcím megerősítése' ),
+	'Whatlinkshere'             => array( 'Mi hivatkozik erre' ),
+	'Recentchangeslinked'       => array( 'Kapcsolódó változtatások' ),
+	'Movepage'                  => array( 'Lap átnevezése' ),
+	'Blockme'                   => array( 'Blokkolj' ),
+	'Booksources'               => array( 'Könyvforrások' ),
+	'Categories'                => array( 'Kategóriák' ),
+	'Export'                    => array( 'Lapok exportálása' ),
+	'Version'                   => array( 'Névjegy', 'Verziószám', 'Verzió' ),
+	'Allmessages'               => array( 'Rendszerüzenetek' ),
+	'Log'                       => array( 'Rendszernaplók', 'Naplók', 'Napló' ),
+	'Blockip'                   => array( 'Blokkolás' ),
+	'Undelete'                  => array( 'Törölt lapváltozatok visszaállítása' ),
+	'Import'                    => array( 'Lapok importálása' ),
+	'Lockdb'                    => array( 'Adatbázis lezárása' ),
+	'Unlockdb'                  => array( 'Adatbázis lezárás feloldása' ),
+	'Userrights'                => array( 'Szerkesztők jogai', 'Szerkesztői jogok', 'Szerkesztőjogok', 'Szerkesztő jogai' ),
+	'MIMEsearch'                => array( 'Keresés MIME-típus alapján' ),
+	'FileDuplicateSearch'       => array( 'Duplikátumok keresése' ),
+	'Unwatchedpages'            => array( 'Nem figyelt lapok' ),
+	'Listredirects'             => array( '�tirányítások listája' ),
+	'Revisiondelete'            => array( 'Változat törlése' ),
+	'Unusedtemplates'           => array( 'Nem használt sablonok' ),
+	'Randomredirect'            => array( '�tirányítás találomra' ),
+	'Mypage'                    => array( 'Lapom', 'Userlapom' ),
+	'Mytalk'                    => array( 'Vitám', 'Vitalapom', 'Uservitalapom' ),
+	'Mycontributions'           => array( 'Közreműködéseim' ),
+	'Listadmins'                => array( 'Adminisztrátorok', 'Adminisztrátorok listája', 'Sysopok' ),
+	'Listbots'                  => array( 'Botok', 'Botok listája' ),
+	'Popularpages'              => array( 'Népszerű oldalak' ),
+	'Search'                    => array( 'Keresés' ),
+	'Resetpass'                 => array( 'Jelszócsere' ),
+	'Withoutinterwiki'          => array( 'Wikiközi hivatkozás nélküli lapok', 'Interwikilinkek nélküli lapok' ),
+	'MergeHistory'              => array( 'Laptörténetek egyesítése', 'Laptörténet-egyesítés' ),
+	'Filepath'                  => array( 'Fájl elérési útja', 'Fájl elérési út' ),
+	'Invalidateemail'           => array( 'E-mail cím érvénytelenítése' ),
+	'Blankpage'                 => array( 'Ãœres lap' ),
+	'LinkSearch'                => array( 'Hivatkozás keresés' ),
+	'DeletedContributions'      => array( 'Törölt szerkesztések' ),
 );
 
 $datePreferences = array(
@@ -164,115 +160,117 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#�TIR�NY�T�S', '#REDIRECT' ),
-	'notoc'               => array( '0', '__NINCSTARTALOMJEGYZÉK__', '__NINCSTJ__', '__NOTOC__' ),
-	'nogallery'           => array( '0', '__NINCSGALÉRIA__', '__NOGALLERY__' ),
-	'forcetoc'            => array( '0', '__LEGYENTARTALOMJEGYZÉK__', '__LEGYENTJ__', '__FORCETOC__' ),
-	'toc'                 => array( '0', '__TARTALOMJEGYZÉK__', '__TJ__', '__TOC__' ),
-	'noeditsection'       => array( '0', '__NINCSSZERKESZTÉS__', '__NINCSSZERK__', '__NOEDITSECTION__' ),
-	'currentmonth'        => array( '1', 'JELENLEGIHÓNAP', 'CURRENTMONTH' ),
-	'currentmonthname'    => array( '1', 'JELENLEGIHÓNAPNEVE', 'CURRENTMONTHNAME' ),
-	'currentmonthabbrev'  => array( '1', 'JELENLEGIHÓNAPRÖVID', 'CURRENTMONTHABBREV' ),
-	'currentday'          => array( '1', 'MAINAP', 'CURRENTDAY' ),
-	'currentday2'         => array( '1', 'MAINAP2', 'CURRENTDAY2' ),
-	'currentdayname'      => array( '1', 'MAINAPNEVE', 'CURRENTDAYNAME' ),
-	'currentyear'         => array( '1', 'JELENLEGIÉV', 'CURRENTYEAR' ),
-	'currenttime'         => array( '1', 'JELENLEGIID�', 'CURRENTTIME' ),
-	'currenthour'         => array( '1', 'JELENLEGIÓRA', 'CURRENTHOUR' ),
-	'localmonth'          => array( '1', 'HELYIHÓNAP', 'LOCALMONTH' ),
-	'localmonthname'      => array( '1', 'HELYIHÓNAPNÉV', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'    => array( '1', 'HELYIHÓNAPRÖVID�TÉS', 'LOCALMONTHABBREV' ),
-	'localday'            => array( '1', 'HELYINAP', 'LOCALDAY' ),
-	'localday2'           => array( '1', 'HELYINAP2', 'LOCALDAY2' ),
-	'localdayname'        => array( '1', 'HELYINAPNEVE', 'LOCALDAYNAME' ),
-	'localyear'           => array( '1', 'HELYIÉV', 'LOCALYEAR' ),
-	'localtime'           => array( '1', 'HELYIID�', 'LOCALTIME' ),
-	'localhour'           => array( '1', 'HELYIÓRA', 'LOCALHOUR' ),
-	'numberofpages'       => array( '1', 'OLDALAKSZ�MA', 'LAPOKSZ�MA', 'NUMBEROFPAGES' ),
-	'numberofarticles'    => array( '1', 'SZÓCIKKEKSZ�MA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'       => array( '1', 'F�JLOKSZ�MA', 'KÉPEKSZ�MA', 'NUMBEROFFILES' ),
-	'numberofusers'       => array( '1', 'SZERKESZT�KSZ�MA', 'NUMBEROFUSERS' ),
-	'numberofedits'       => array( '1', 'SZERKESZTÉSEKSZ�MA', 'NUMBEROFEDITS' ),
-	'pagename'            => array( '1', 'OLDALNEVE', 'PAGENAME' ),
-	'pagenamee'           => array( '1', 'OLDALNEVEE', 'PAGENAMEE' ),
-	'namespace'           => array( '1', 'NÉVTERE', 'NAMESPACE' ),
-	'namespacee'          => array( '1', 'NÉVTEREE', 'NAMESPACEE' ),
-	'talkspace'           => array( '1', 'VITATERE', 'TALKSPACE' ),
-	'talkspacee'          => array( '1', 'VITATEREE', 'TALKSPACEE' ),
-	'subjectspace'        => array( '1', 'SZÓCIKKNÉVTERE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'       => array( '1', 'SZÓCIKKNÉVTEREE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'        => array( '1', 'LAPTELJESNEVE', 'FULLPAGENAME' ),
-	'fullpagenamee'       => array( '1', 'LAPTELJESNEVEE', 'FULLPAGENAMEE' ),
-	'subpagename'         => array( '1', 'ALLAPNEVE', 'SUBPAGENAME' ),
-	'subpagenamee'        => array( '1', 'ALLAPNEVEE', 'SUBPAGENAMEE' ),
-	'basepagename'        => array( '1', 'ALAPLAPNEVE', 'BASEPAGENAME' ),
-	'basepagenamee'       => array( '1', 'ALAPLAPNEVEE', 'BASEPAGENAMEE' ),
-	'talkpagename'        => array( '1', 'VITALAPNEVE', 'TALKPAGENAME' ),
-	'talkpagenamee'       => array( '1', 'VITALAPNEVEE', 'TALKPAGENAMEE' ),
-	'subjectpagename'     => array( '1', 'SZÓCIKKNEVE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'    => array( '1', 'SZÓCIKKNEVEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                 => array( '0', 'ÃœZENET:', 'ÃœZ:', 'MSG:' ),
-	'subst'               => array( '0', 'BEILLESZT:', 'BEM�SOL:', 'SUBST:' ),
-	'img_thumbnail'       => array( '1', 'bélyegkép', 'bélyeg', 'miniatűr', 'thumbnail', 'thumb' ),
-	'img_manualthumb'     => array( '1', 'bélyegkép=$1', 'bélyeg=$1', 'miniatűr=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'           => array( '1', 'jobb', 'jobbra', 'right' ),
-	'img_left'            => array( '1', 'bal', 'balra', 'left' ),
-	'img_none'            => array( '1', 'semmi', 'none' ),
-	'img_center'          => array( '1', 'közép', 'középre', 'center', 'centre' ),
-	'img_framed'          => array( '1', 'keretezett', 'keretes', 'keretben', 'kerettel', 'framed', 'enframed', 'frame' ),
-	'img_frameless'       => array( '1', 'keretnélküli', 'frameless' ),
-	'img_page'            => array( '1', 'oldal=$1', 'oldal $1', 'page=$1', 'page $1' ),
-	'img_upright'         => array( '1', 'fennjobbra', 'fennjobbra=$1', 'fennjobbra $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'          => array( '1', 'keret', 'border' ),
-	'img_baseline'        => array( '1', 'alapvonal', 'baseline' ),
-	'img_sub'             => array( '1', 'ai', 'alsóindex', 'sub' ),
-	'img_super'           => array( '1', 'fi', 'felsőindex', 'super', 'sup' ),
-	'img_top'             => array( '1', 'fenn', 'fent', 'top' ),
-	'img_text_top'        => array( '1', 'szöveg-fenn', 'szöveg-fent', 'text-top' ),
-	'img_middle'          => array( '1', 'középen', 'középre', 'middle' ),
-	'img_bottom'          => array( '1', 'lenn', 'lent', 'bottom' ),
-	'img_text_bottom'     => array( '1', 'szöveg-lenn', 'szöveg-lent', 'text-bottom' ),
-	'sitename'            => array( '1', 'OLDALNEVE', 'WIKINEVE', 'SITENAME' ),
-	'ns'                  => array( '0', 'NÉVTÉR:', 'NS:' ),
-	'localurl'            => array( '0', 'HELYIURL:', 'LOCALURL:' ),
-	'localurle'           => array( '0', 'HELYIURLE:', 'LOCALURLE:' ),
-	'server'              => array( '0', 'SZERVER', 'KISZOLG�LÓ', 'SERVER' ),
-	'servername'          => array( '0', 'SZERVERNEVE', 'KISZOLG�LÓNEVE', 'SERVERNAME' ),
-	'grammar'             => array( '0', 'NYELVTAN:', 'GRAMMAR:' ),
-	'currentweek'         => array( '1', 'JELENLEGIHÉT', 'CURRENTWEEK' ),
-	'currentdow'          => array( '1', 'JELENLEGIHÉTNAPJA', 'CURRENTDOW' ),
-	'localweek'           => array( '1', 'HELYIHÉT', 'LOCALWEEK' ),
-	'localdow'            => array( '1', 'HELYIHÉTNAPJA', 'LOCALDOW' ),
-	'revisionid'          => array( '1', 'V�LTOZATID', 'REVISIONID' ),
-	'revisionday'         => array( '1', 'V�LTOZATNAP', 'REVISIONDAY' ),
-	'revisionday2'        => array( '1', 'V�LTOZATNAP2', 'REVISIONDAY2' ),
-	'revisionmonth'       => array( '1', 'V�LTOZATHÓNAP', 'REVISIONMONTH' ),
-	'revisionyear'        => array( '1', 'V�LTOZATÉV', 'REVISIONYEAR' ),
-	'revisiontimestamp'   => array( '1', 'V�LTOZATID�BÉLYEG', 'V�LTOZATID�', 'REVISIONTIMESTAMP' ),
-	'plural'              => array( '0', 'TÖBBESSZ�M:', 'PLURAL:' ),
-	'fullurl'             => array( '0', 'TELJESURL:', 'FULLURL:' ),
-	'fullurle'            => array( '0', 'TELJESURLE:', 'FULLURLE:' ),
-	'lcfirst'             => array( '0', 'KISKEZD�:', 'KISKEZD�BETŰ:', 'LCFIRST:' ),
-	'ucfirst'             => array( '0', 'NAGYKEZD�:', 'NAGYKEZD�BETŰ:', 'UCFIRST:' ),
-	'lc'                  => array( '0', 'KISBETÅ°:', 'KISBETÅ°K:', 'KB:', 'KISBETÅ°S:', 'LC:' ),
-	'uc'                  => array( '0', 'NAGYBETÅ°:', 'NAGYBETÅ°K', 'NB:', 'NAGYBETÅ°S:', 'UC:' ),
-	'displaytitle'        => array( '1', 'MEGJELEN�TEND�C�M', 'C�M', 'DISPLAYTITLE' ),
-	'newsectionlink'      => array( '1', '__ÚJSZAKASZLINK__', '__NEWSECTIONLINK__' ),
-	'currentversion'      => array( '1', 'JELENLEGIV�LTOZAT', 'CURRENTVERSION' ),
-	'urlencode'           => array( '0', 'URLKÓDOLVA:', 'URLENCODE:' ),
-	'anchorencode'        => array( '0', 'HORGONYKÓDOLVA', 'ANCHORENCODE' ),
-	'currenttimestamp'    => array( '1', 'JELENLEGIID�BÉLYEG', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'      => array( '1', 'HELYIID�BÉLYEG', 'LOCALTIMESTAMP' ),
-	'directionmark'       => array( '1', 'IR�NYJELZ�', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'            => array( '0', '#NYELV:', '#LANGUAGE:' ),
-	'contentlanguage'     => array( '1', 'TARTALOMNYELVE', 'TARTNYELVE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'    => array( '1', 'OLDALAKNÉVTÉRBEN:', 'OLDALAKNBEN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'      => array( '1', 'ADMINOKSZ�MA', 'NUMBEROFADMINS' ),
-	'formatnum'           => array( '0', 'FORM�ZOTTSZ�M', 'SZ�MFORM�Z�S', 'SZ�MFORM', 'FORMATNUM' ),
-	'special'             => array( '0', 'speciális', 'special' ),
-	'defaultsort'         => array( '1', 'RENDEZÉS:', 'KULCS:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'            => array( '0', 'ELÉRÉSIÚT:', 'FILEPATH:' ),
-	'hiddencat'           => array( '1', '__REJTETTKAT__', '__REJTETTKATEGÓRIA__', '__HIDDENCAT__' ),
+	'redirect'              => array( '0', '#�TIR�NY�T�S', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__NINCSTARTALOMJEGYZÉK__', '__NINCSTJ__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__NINCSGALÉRIA__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__LEGYENTARTALOMJEGYZÉK__', '__LEGYENTJ__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__TARTALOMJEGYZÉK__', '__TJ__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__NINCSSZERKESZTÉS__', '__NINCSSZERK__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'JELENLEGIHÓNAP', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'JELENLEGIHÓNAPNEVE', 'CURRENTMONTHNAME' ),
+	'currentmonthabbrev'    => array( '1', 'JELENLEGIHÓNAPRÖVID', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'MAINAP', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'MAINAP2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'MAINAPNEVE', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'JELENLEGIÉV', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'JELENLEGIID�', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'JELENLEGIÓRA', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'HELYIHÓNAP', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'HELYIHÓNAPNÉV', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'      => array( '1', 'HELYIHÓNAPRÖVID�TÉS', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'HELYINAP', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'HELYINAP2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'HELYINAPNEVE', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'HELYIÉV', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'HELYIID�', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'HELYIÓRA', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'OLDALAKSZ�MA', 'LAPOKSZ�MA', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'SZÓCIKKEKSZ�MA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'F�JLOKSZ�MA', 'KÉPEKSZ�MA', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'SZERKESZT�KSZ�MA', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'SZERKESZTÉSEKSZ�MA', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'OLDALNEVE', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'OLDALNEVEE', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'NÉVTERE', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'NÉVTEREE', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'VITATERE', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'VITATEREE', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'SZÓCIKKNÉVTERE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'SZÓCIKKNÉVTEREE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'LAPTELJESNEVE', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'LAPTELJESNEVEE', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'ALLAPNEVE', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'ALLAPNEVEE', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'ALAPLAPNEVE', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'ALAPLAPNEVEE', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'VITALAPNEVE', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'VITALAPNEVEE', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'SZÓCIKKNEVE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'SZÓCIKKNEVEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'ÃœZENET:', 'ÃœZ:', 'MSG:' ),
+	'subst'                 => array( '0', 'BEILLESZT:', 'BEM�SOL:', 'SUBST:' ),
+	'img_thumbnail'         => array( '1', 'bélyegkép', 'bélyeg', 'miniatűr', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'bélyegkép=$1', 'bélyeg=$1', 'miniatűr=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'jobb', 'jobbra', 'right' ),
+	'img_left'              => array( '1', 'bal', 'balra', 'left' ),
+	'img_none'              => array( '1', 'semmi', 'none' ),
+	'img_center'            => array( '1', 'közép', 'középre', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'keretezett', 'keretes', 'keretben', 'kerettel', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'keretnélküli', 'frameless' ),
+	'img_page'              => array( '1', 'oldal=$1', 'oldal $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'fennjobbra', 'fennjobbra=$1', 'fennjobbra $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'keret', 'border' ),
+	'img_baseline'          => array( '1', 'alapvonal', 'baseline' ),
+	'img_sub'               => array( '1', 'ai', 'alsóindex', 'sub' ),
+	'img_super'             => array( '1', 'fi', 'felsőindex', 'super', 'sup' ),
+	'img_top'               => array( '1', 'fenn', 'fent', 'top' ),
+	'img_text_top'          => array( '1', 'szöveg-fenn', 'szöveg-fent', 'text-top' ),
+	'img_middle'            => array( '1', 'középen', 'középre', 'middle' ),
+	'img_bottom'            => array( '1', 'lenn', 'lent', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'szöveg-lenn', 'szöveg-lent', 'text-bottom' ),
+	'sitename'              => array( '1', 'OLDALNEVE', 'WIKINEVE', 'SITENAME' ),
+	'ns'                    => array( '0', 'NÉVTÉR:', 'NS:' ),
+	'localurl'              => array( '0', 'HELYIURL:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'HELYIURLE:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'SZERVER', 'KISZOLG�LÓ', 'SERVER' ),
+	'servername'            => array( '0', 'SZERVERNEVE', 'KISZOLG�LÓNEVE', 'SERVERNAME' ),
+	'grammar'               => array( '0', 'NYELVTAN:', 'GRAMMAR:' ),
+	'currentweek'           => array( '1', 'JELENLEGIHÉT', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'JELENLEGIHÉTNAPJA', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'HELYIHÉT', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'HELYIHÉTNAPJA', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'V�LTOZATID', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'V�LTOZATNAP', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'V�LTOZATNAP2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'V�LTOZATHÓNAP', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'V�LTOZATÉV', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'V�LTOZATID�BÉLYEG', 'V�LTOZATID�', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'TÖBBESSZ�M:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'TELJESURL:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'TELJESURLE:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'KISKEZD�:', 'KISKEZD�BETŰ:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'NAGYKEZD�:', 'NAGYKEZD�BETŰ:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'KISBETÅ°:', 'KISBETÅ°K:', 'KB:', 'KISBETÅ°S:', 'LC:' ),
+	'uc'                    => array( '0', 'NAGYBETÅ°:', 'NAGYBETÅ°K', 'NB:', 'NAGYBETÅ°S:', 'UC:' ),
+	'displaytitle'          => array( '1', 'MEGJELEN�TEND�C�M', 'C�M', 'DISPLAYTITLE' ),
+	'newsectionlink'        => array( '1', '__ÚJSZAKASZLINK__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'JELENLEGIV�LTOZAT', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'URLKÓDOLVA:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'HORGONYKÓDOLVA', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'JELENLEGIID�BÉLYEG', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'HELYIID�BÉLYEG', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'IR�NYJELZ�', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#NYELV:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'TARTALOMNYELVE', 'TARTNYELVE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'OLDALAKNÉVTÉRBEN:', 'OLDALAKNBEN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'ADMINOKSZ�MA', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'FORM�ZOTTSZ�M', 'SZ�MFORM�Z�S', 'SZ�MFORM', 'FORMATNUM' ),
+	'special'               => array( '0', 'speciális', 'special' ),
+	'defaultsort'           => array( '1', 'RENDEZÉS:', 'KULCS:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'ELÉRÉSIÚT:', 'FILEPATH:' ),
+	'hiddencat'             => array( '1', '__REJTETTKAT__', '__REJTETTKATEGÓRIA__', '__HIDDENCAT__' ),
+	'pagesize'              => array( '1', 'LAPMÉRET', 'PAGESIZE' ),
+	'staticredirect'        => array( '1', '__�LLANDÓ�TIR�NY�T�S__', '__STATIKUS�TIR�NY�T�S__', '__STATICREDIRECT__' ),
 );
 
 $linkTrail = '/^([a-záéíóúöüőű�É�ÓÚÖÜ�Ű]+)(.*)$/sDu';
@@ -280,23 +278,23 @@ $linkTrail = '/^([a-záéíóúöüőű�É�ÓÚÖÜ�Ű]+)(.*)$/sDu';
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Hivatkozások aláhúzása:',
-'tog-highlightbroken'         => 'Nem létező lapok <a href="" class="new">így</a> (alternatíva: így<a href="" class="internal">?</a>).',
-'tog-justify'                 => 'Bekezdések teljes szélességű tördelése („sorkizárás�)',
-'tog-hideminor'               => 'Apró változtatások elrejtése a Friss változtatások lapon',
+'tog-highlightbroken'         => 'A nem létező lapokat <a href="" class="new">így</a> jelölje. (Alternatíva: így<a href="" class="internal">?</a>)',
+'tog-justify'                 => 'Sorkizárt fejezetek',
+'tog-hideminor'               => 'Apró változtatások elrejtése a friss változtatások lapon',
 'tog-extendwatchlist'         => 'A figyelőlistán az összes változtatás látszódjon (ne csak az utolsó)',
-'tog-usenewrc'                => 'Fejlettebb friss változások listája (JavaScript)',
+'tog-usenewrc'                => 'Fejlettebb friss változások listája (JavaScript-alapú)',
 'tog-numberheadings'          => 'Fejezetcímek automatikus számozása',
-'tog-showtoolbar'             => 'Szerkesztőeszközsor látható (JavaScript)',
-'tog-editondblclick'          => 'A lapok szerkesztése dupla kattintásra (JavaScript)',
+'tog-showtoolbar'             => 'Szerkesztőeszközsor megjelenítése (JavaScript-alapú)',
+'tog-editondblclick'          => 'A lapok szerkesztése dupla kattintásra (JavaScript-alapú)',
 'tog-editsection'             => '[szerkesztés] linkek az egyes szakaszok szerkesztéséhez',
-'tog-editsectiononrightclick' => 'Szakaszok szerkesztése a szakaszcímre való jobb kattintással (JavaScript)',
+'tog-editsectiononrightclick' => 'Szakaszok szerkesztése a szakaszcímre való jobb kattintással (JavaScript-alapú)',
 'tog-showtoc'                 => 'Tartalomjegyzék megjelenítése a három fejezetnél többel rendelkező cikkeknél',
 'tog-rememberpassword'        => 'Emlékezzen rám ezen a számítógépen',
 'tog-editwidth'               => 'Teljes szélességű szerkesztőablak',
-'tog-watchcreations'          => '�ltalad létrehozott lapok felvétele a figyelőlistádra',
-'tog-watchdefault'            => 'Szerkesztett cikkek felvétele a figyelőlistára',
-'tog-watchmoves'              => '�tnevezett lapok felvétele a figyelőlistára',
-'tog-watchdeletion'           => 'Törölt cikkek felvétele a figyelőlistára',
+'tog-watchcreations'          => 'Az általam létrehozott lapok felvétele a figyelőlistára',
+'tog-watchdefault'            => 'Az általam szerkesztett lapok felvétele a figyelőlistára',
+'tog-watchmoves'              => 'Az általam átnevezett lapok felvétele a figyelőlistára',
+'tog-watchdeletion'           => 'Az általam törölt lapok felvétele a figyelőlistára',
 'tog-minordefault'            => 'Alapértelmezésben minden szerkesztésemet jelölje aprónak',
 'tog-previewontop'            => 'Előnézet megjelenítése a szerkesztőablak előtt',
 'tog-previewonfirst'          => 'Előnézet első szerkesztésnél',
@@ -307,25 +305,26 @@ $messages = array(
 'tog-enotifrevealaddr'        => 'Jelenítse meg az e-mail címemet a figyelmeztető e-mailekben',
 'tog-shownumberswatching'     => 'Az oldalt figyelő szerkesztők számának mutatása',
 'tog-fancysig'                => 'Aláírás automatikus hivatkozás nélkül',
-'tog-externaleditor'          => 'Külső szerkesztőprogram használata (csak haladók számára, speciális beállításokra van szükség a számítógépeden)',
-'tog-externaldiff'            => 'Külső diff program használata (csak haladók számára, speciális beállításokra van szükség a számítógépeden)',
+'tog-externaleditor'          => 'Külső szerkesztőprogram használata (csak haladók számára, speciális beállításokra van szükség a számítógépen)',
+'tog-externaldiff'            => 'Külső diff program használata (csak haladók számára, speciális beállításokra van szükség a számítógépen)',
 'tog-showjumplinks'           => 'Helyezzen el hivatkozást („Ugrás�) a beépített eszköztárra',
-'tog-uselivepreview'          => 'Élő előnézet használata (JavaScript) (Teszt)',
+'tog-uselivepreview'          => 'Élő előnézet használata (JavaScript-alapú, kísérleti)',
 'tog-forceeditsummary'        => 'Figyelmeztessen, ha nem adok meg szerkesztési összefoglalót',
 'tog-watchlisthideown'        => 'Saját szerkesztések elrejtése',
 'tog-watchlisthidebots'       => 'Robotok szerkesztéseinek elrejtése',
 'tog-watchlisthideminor'      => 'Apró változtatások elrejtése',
+'tog-watchlisthideliu'        => 'Bejelentkezett szerkesztők módosításainak elrejtése a figyelőlistáról',
+'tog-watchlisthideanons'      => 'Névtelen szerkesztések elrejtése a figyelőlistáról',
 'tog-nolangconversion'        => 'A változók átalakításának letiltása',
 'tog-ccmeonemails'            => 'A másoknak küldött e-mailjeimről kapjak én is másolatot',
 'tog-diffonly'                => 'Ne mutassa a lap tartalmát lapváltozatok közötti eltérések megtekintésekor',
 'tog-showhiddencats'          => 'Rejtett kategóriák megjelenítése',
+'tog-norollbackdiff'          => 'Ne jelenjenek meg az eltérések a visszaállítás után',
 
 'underline-always'  => 'Mindig',
 'underline-never'   => 'Soha',
 'underline-default' => 'A böngésző alapértelmezése szerint',
 
-'skinpreview' => '(előnézet)',
-
 # Dates
 'sunday'        => 'vasárnap',
 'monday'        => 'hétfő',
@@ -394,7 +393,7 @@ $messages = array(
 'category-file-count-limited'    => '{{PLURAL:$1|Egy|$1}} fájl található ebben a kategóriában.',
 'listingcontinuesabbrev'         => 'folyt.',
 
-'mainpagetext'      => "<big>'''A MediaWiki telepítése sikerült.'''</big>",
+'mainpagetext'      => "<big>'''A MediaWiki telepítése sikeresen befejeződött.'''</big>",
 'mainpagedocfooter' => "Ha segítségre van szükséged a wikiszoftver használatához, akkor keresd fel a [http://meta.wikimedia.org/wiki/Help:Contents User's Guide] oldalt.
 
 == Alapok (angol nyelven) ==
@@ -413,25 +412,25 @@ $messages = array(
 'qbpageinfo'     => 'Lapinformáció',
 'qbmyoptions'    => 'Lapjaim',
 'qbspecialpages' => 'Speciális lapok',
-'moredotdotdot'  => 'Tovább...',
+'moredotdotdot'  => 'Tovább…',
 'mypage'         => 'Lapom',
 'mytalk'         => 'Vitám',
 'anontalk'       => 'az IP-címhez tartozó vitalap',
 'navigation'     => 'Navigáció',
-'and'            => 'és',
+'and'            => '&#32;és',
 
 # Metadata in edit box
 'metadata_help' => 'Metaadatok:',
 
 'errorpagetitle'    => 'Hiba',
-'returnto'          => 'Vissza a(z) $1 cikkhez.',
+'returnto'          => 'Vissza a(z) $1 laphoz.',
 'tagline'           => 'A {{SITENAME}} wikiből',
 'help'              => 'Segítség',
 'search'            => 'Keresés',
 'searchbutton'      => 'Keresés',
 'go'                => 'Menj',
 'searcharticle'     => 'Menj',
-'history'           => 'laptörténet',
+'history'           => 'Laptörténet',
 'history_short'     => 'Laptörténet',
 'updatedmarker'     => 'az utolsó látogatásom óta frissítették',
 'info_short'        => 'Információ',
@@ -447,22 +446,22 @@ $messages = array(
 'undelete_short'    => '{{PLURAL:$1|Egy|$1}} szerkesztés helyreállítása',
 'protect'           => 'Lapvédelem',
 'protect_change'    => 'módosítás',
-'protectthispage'   => 'Lap védelme',
+'protectthispage'   => 'Lapvédelem',
 'unprotect'         => 'Védelem ki',
 'unprotectthispage' => 'Lapvédelem megszüntetése',
 'newpage'           => 'Új lap',
-'talkpage'          => 'Lap megbeszélése',
-'talkpagelinktext'  => 'vita',
+'talkpage'          => 'Megbeszélés a lappal kapcsolatban',
+'talkpagelinktext'  => 'vitalap',
 'specialpage'       => 'Speciális lap',
 'personaltools'     => 'Személyes eszközök',
-'postcomment'       => 'Megjegyzés beküldése',
+'postcomment'       => 'Új szakasz',
 'articlepage'       => 'Szócikk megtekintése',
 'talk'              => 'Vitalap',
 'views'             => 'Nézetek',
 'toolbox'           => 'Eszközök',
 'userpage'          => 'Szerkesztő lapjának megtekintése',
 'projectpage'       => 'Projektlap megtekintése',
-'imagepage'         => 'Képlap megtekintése',
+'imagepage'         => 'A fájl leírólapjának megtekintése',
 'mediawikipage'     => 'Üzenetlap megtekintése',
 'templatepage'      => 'Sablon lapjának megtekintése',
 'viewhelppage'      => 'Súgólap megtekintése',
@@ -472,7 +471,7 @@ $messages = array(
 'redirectedfrom'    => '($1 szócikkből átirányítva)',
 'redirectpagesub'   => '�tirányító lap',
 'lastmodifiedat'    => 'A lap utolsó módosítása: $1, $2', # $1 date, $2 time
-'viewcount'         => 'Ezt a lapot {{PLURAL:$1|egy|$1}} alkalommal keresték föl.',
+'viewcount'         => 'Ezt a lapot {{PLURAL:$1|egy|$1}} alkalommal keresték fel.',
 'protectedpage'     => 'Védett lap',
 'jumpto'            => 'Ugrás:',
 'jumptonavigation'  => 'navigáció',
@@ -481,8 +480,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'A {{SITENAME}} wikiről',
 'aboutpage'            => 'Project:Rólunk',
-'bugreports'           => 'Hibabejelentések',
-'bugreportspage'       => 'Project:Hibabejelentések',
 'copyright'            => 'A tartalom a(z) $1 feltételei szerint használható fel.',
 'copyrightpagename'    => '{{SITENAME}} szerzői jogok',
 'copyrightpage'        => '{{ns:project}}:Szerzői jogok',
@@ -491,7 +488,7 @@ $messages = array(
 'disclaimers'          => 'Jogi nyilatkozat',
 'disclaimerpage'       => 'Project:Jogi nyilatkozat',
 'edithelp'             => 'Szerkesztési súgó',
-'edithelppage'         => 'Help:Hogyan szerkessz lapokat?',
+'edithelppage'         => 'Help:Szerkesztés',
 'faq'                  => 'GyIK',
 'faqpage'              => 'Project:GyIK',
 'helppage'             => 'Help:Tartalom',
@@ -505,9 +502,7 @@ $messages = array(
 
 'badaccess'        => 'Engedélyezési hiba',
 'badaccess-group0' => 'Ezt a tevékenységet nem végezheted el.',
-'badaccess-group1' => 'Ezt a tevékenységet csak a(z) $1 csoportjába tartozó szerkesztő végezheti el.',
-'badaccess-group2' => 'Ezt a tevékenységet csak a(z) $1 csoportok valamelyikébe tartozó szerkesztő végezheti el.',
-'badaccess-groups' => 'Ezt a tevékenységet csak a(z) $1 csoportok valamelyikébe tartozó szerkesztő végezheti el.',
+'badaccess-groups' => 'Ezt a tevékenységet csak a(z) $1 {{PLURAL:$2|csoportba|csoportok valamelyikébe}} tartozó szerkesztő végezheti el.',
 
 'versionrequired'     => 'A MediaWiki $1-s verziója szükséges',
 'versionrequiredtext' => 'A lap használatához a MediaWiki $1-s verziójára van szükség. Lásd a [[Special:Version|verzió]] lapot.',
@@ -517,25 +512,27 @@ $messages = array(
 'youhavenewmessages'      => 'Új üzenet vár $1! (Az üzenetet $2.)',
 'newmessageslink'         => 'a vitalapodon',
 'newmessagesdifflink'     => 'külön is megtekintheted',
-'youhavenewmessagesmulti' => 'Új üzenetet vár a(z) $1 lapon',
+'youhavenewmessagesmulti' => 'Új üzenetet vár a(z) $1 wikin',
 'editsection'             => 'szerkesztés',
 'editold'                 => 'szerkesztés',
 'viewsourceold'           => 'lapforrás',
+'editlink'                => 'szerkesztés',
+'viewsourcelink'          => 'forráskód megtekintése',
 'editsectionhint'         => 'Szakasz szerkesztése: $1',
 'toc'                     => 'Tartalomjegyzék',
 'showtoc'                 => 'megjelenítés',
 'hidetoc'                 => 'elrejtés',
-'thisisdeleted'           => '$1 megtekintése vagy visszaállítása?',
+'thisisdeleted'           => '$1 megtekintése vagy helyreállítása?',
 'viewdeleted'             => '$1 megtekintése',
 'restorelink'             => '{{PLURAL:$1|Egy|$1}} törölt szerkesztés',
 'feedlinks'               => 'Hírcsatorna:',
 'feed-invalid'            => 'Érvénytelen a figyelt hírcsatorna típusa.',
-'feed-unavailable'        => 'A wikin nincs elérhető hírcsatorna',
+'feed-unavailable'        => 'Ezen wikin nincs elérhető hírcsatorna',
 'site-rss-feed'           => '$1 RSS csatorna',
 'site-atom-feed'          => '$1 Atom hírcsatorna',
 'page-rss-feed'           => '„$1� RSS hírcsatorna',
 'page-atom-feed'          => '„$1� Atom hírcsatorna',
-'red-link-title'          => '$1 (nincs még megírva)',
+'red-link-title'          => '$1 (a lap nem létezik)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Szócikk',
@@ -543,7 +540,7 @@ $messages = array(
 'nstab-media'     => 'Média',
 'nstab-special'   => 'Speciális lap',
 'nstab-project'   => 'Projektlap',
-'nstab-image'     => 'Kép',
+'nstab-image'     => 'Fájl',
 'nstab-mediawiki' => 'Ãœzenet',
 'nstab-template'  => 'Sablon',
 'nstab-help'      => 'Segítség',
@@ -551,12 +548,13 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Nincs ilyen művelet',
-'nosuchactiontext'  => 'Az URL-ben megadott műveletet
-a wiki nem ismeri fel',
+'nosuchactiontext'  => 'Az URL-ben megadott műveletet érvénytelen.
+Valószínűleg elgépelted, hibás hivatkozásra kattintottál, vagy a
+a(z) {{SITENAME}} által használt szoftver hibája is lehet.',
 'nosuchspecialpage' => 'Nem létezik ilyen speciális lap',
 'nospecialpagetext' => "<big>'''Érvénytelen speciális lapot akartál megtekinteni.'''</big>
 
-Az érvényes speciális lapok listáját a [[Special:SpecialPages|Speciális lapok]] címen találod.",
+Az érvényes speciális lapok listáját a [[Special:SpecialPages|Speciális lapok]] oldalon találod.",
 
 # General errors
 'error'                => 'Hiba',
@@ -605,7 +603,6 @@ Jelezd ezt egy [[Special:ListUsers/sysop|adminiszttrátornak]] az URL megadásá
 'cannotdelete'         => 'A megadott lapot vagy fájlt nem lehet törölni. (Talán már valaki más törölte.)',
 'badtitle'             => 'Hibás cím',
 'badtitletext'         => 'A kért oldal címe érvénytelen, üres, vagy rosszul hivatkozott nyelvközi vagy wikiközi cím volt. Olyan karaktereket is tartalmazhatott, melyek a címekben nem használhatóak.',
-'perfdisabled'         => 'Elnézést, de ez a lehetőség átmenetileg nem elérhető, mert annyira lelassítja az adatbázist, hogy senki nem tudja a wikit használni.',
 'perfcached'           => "Az alábbi adatok gyorsítótárból (''cache''-ből) származnak, és ezért lehetséges, hogy nem a legfrissebb változatot mutatják:",
 'perfcachedts'         => "Az alábbi adatok gyorsítótárból (''cache''-ből) származnak, legutóbbi frissítésük ideje $1.",
 'querypage-no-updates' => 'Az oldal frissítése jelenleg le van tiltva. Az itt szereplő adatok nem frissülnek azonnal.',
@@ -618,41 +615,41 @@ Lekérdezés: $2',
 'actionthrottledtext'  => 'A spamek elleni védekezés miatt nem végezheted el a műveletet túl sokszor egy adott időn belül, és te átlépted a megengedett határt. Próbálkozz újra néhány perc múlva.',
 'protectedpagetext'    => 'Ez egy védett lap, nem szerkeszthető.',
 'viewsourcetext'       => 'Megtekintheted és másolhatod a lap forrását:',
-'protectedinterface'   => 'Ez a lap a szoftver felületéhez szolgáltat szöveget, és a visszaélések elkerülése végett le van zárva.',
-'editinginterface'     => "'''Vigyázat:''' egy olyan lapot szerkesztesz, ami a MediaWiki szoftver felületéthez tarzozik. A lap megváltoztatása hatással lesz más szerkesztők számára is. Fordításra inkább használd a MediaWiki fordítására indított kezdeményezést, a [http://translatewiki.net/wiki/Main_Page?setlang=hu Betawikit].",
+'protectedinterface'   => 'Ez a lap a szoftver felületéhez szolgáltat szöveget, és a visszaélések elkerülése miatt le van zárva.',
+'editinginterface'     => "'''Vigyázat:''' egy olyan lapot szerkesztesz, ami a MediaWiki szoftver felületéthez tarzozik. A lap megváltoztatása hatással lesz más szerkesztők számára is. Fordításra inkább használd a MediaWiki fordítására indított kezdeményezést, a [http://translatewiki.net/wiki/Main_Page?setlang=hu translatewiki.nett].",
 'sqlhidden'            => '(rejtett SQL lekérdezés)',
 'cascadeprotected'     => 'Ez a lap szerkesztés elleni védelemmel lett ellátva, mert a következő {{PLURAL:$1|lapon|lapokon}} be van kapcsolva a „kaszkádolt� védelem:
 $2',
-'namespaceprotected'   => "Nincs jogosultságod a(z) '''$1''' névtérbeli lapok szerkesztésére.",
+'namespaceprotected'   => "Nincs jogosultságod a(z) '''$1''' névtérben található lapok szerkesztésére.",
 'customcssjsprotected' => 'Nincs jogosultságod a lap szerkesztéséhez, mert egy másik szerkesztő személyes beállításait tartalmazza.',
 'ns-specialprotected'  => 'A speciális lapok nem szerkeszthetőek.',
-'titleprotected'       => "A cikk elkészítését [[User:$1|$1]] blokkolta, oka: ''$2''.",
+'titleprotected'       => "Ilyen címmel nem lehet szócikket készíteni, [[User:$1|$1]] letiltotta.
+A blokkolás oka: „''$2''�.",
 
 # Virus scanner
-'virus-badscanner'     => 'Hibás beállítás: ismeretlen víruskereső: <i>$1</i>',
+'virus-badscanner'     => "Hibás beállítás: ismeretlen víruskereső: ''$1''",
 'virus-scanfailed'     => 'az ellenőrzés nem sikerült (hibakód: $1)',
 'virus-unknownscanner' => 'ismeretlen antivírus:',
 
 # Login and logout pages
 'logouttitle'                => 'Kijelentkezés',
-'logouttext'                 => '<strong>Sikeresen kijelentkeztél.</strong>
+'logouttext'                 => "'''Sikeresen kijelentkeztél.'''
 
-Folytathatod névtelenül  a(z) {{SITENAME}} használatát, vagy [[Special:UserLogin|ismét bejelentkezhetsz]] ugyanezzen, vagy egy másik névvel.
-Lehetséges, hogy néhány oldalon továbbra is azt látod, be vagy jelentkezve, mindaddig, amíg nem üríted a böngésződ gyorsítótárát.',
+Folytathatod névtelenül  a(z) {{SITENAME}} használatát, vagy [[Special:UserLogin|ismét bejelentkezhetsz]] ugyanezzel, vagy egy másik névvel.
+Lehetséges, hogy néhány oldalon továbbra is azt látod, be vagy jelentkezve, mindaddig, amíg nem üríted a böngésződ gyorsítótárát.",
 'welcomecreation'            => '== Köszöntünk, $1! ==
 A felhasználói fiókodat létrehoztuk.
 Ne felejtsd el átnézni a [[Special:Preferences|személyes beállításaidat]].',
 'loginpagetitle'             => 'Bejelentkezés',
-'yourname'                   => 'Felhasználói neved:',
+'yourname'                   => 'Szerkesztőneved:',
 'yourpassword'               => 'Jelszavad:',
 'yourpasswordagain'          => 'Jelszavad ismét:',
 'remembermypassword'         => 'Ne léptessen ki a böngésző bezárásakor.',
 'yourdomainname'             => 'A domainneved:',
 'externaldberror'            => 'Hiba történt a külső adatbázis hitelesítése közben, vagy nem vagy jogosult a külső fiókod frissítésére.',
-'loginproblem'               => '<b>Hiba történt a bejelentkezésed során.</b><br />Kérlek, próbálkozz újra!',
 'login'                      => 'Bejelentkezés',
 'nav-login-createaccount'    => 'Bejelentkezés / fiók létrehozása',
-'loginprompt'                => 'Engedélyezned kell a cookie-kat, hogy bejelentkezhess a {{grammar:be|{{SITENAME}}}}.',
+'loginprompt'                => "Engedélyezned kell a sütiket (''cookie''), hogy bejelentkezhess a(z) {{SITENAME}} wikibe.",
 'userlogin'                  => 'Bejelentkezés / fiók létrehozása',
 'logout'                     => 'Kijelentkezés',
 'userlogout'                 => 'Kijelentkezés',
@@ -664,9 +661,10 @@ Ne felejtsd el átnézni a [[Special:Preferences|személyes beállításaidat]].
 'gotaccountlink'             => 'jelentkezz be',
 'createaccountmail'          => 'e-mailben',
 'badretype'                  => 'Az általad megadott jelszavak nem egyeznek.',
-'userexists'                 => 'A megadott felhasználói név már foglalt. Kérlek, válassz másikat!',
+'userexists'                 => 'A megadott szerkesztőnév már foglalt.
+Kérlek, válassz másikat!',
 'youremail'                  => 'Az e-mail címed:',
-'username'                   => 'Felhasználói név:',
+'username'                   => 'Szerkesztőnév:',
 'uid'                        => 'Azonosító:',
 'prefs-memberingroups'       => '{{PLURAL:$1|Csoporttagság|Csoporttagságok}}:',
 'yourrealname'               => 'Valódi neved:',
@@ -674,7 +672,7 @@ Ne felejtsd el átnézni a [[Special:Preferences|személyes beállításaidat]].
 'yourvariant'                => 'Változó',
 'yournick'                   => 'Aláírás:',
 'badsig'                     => 'Érvénytelen aláírás; ellenőrizd a HTML-formázást.',
-'badsiglength'               => 'A megadott név túl hosszú;
+'badsiglength'               => 'Az aláírásod túl hosszú.
 {{PLURAL:$1|Egy|$1}} karakternél rövidebbnek kell lennie.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'A valódi nevet nem kötelező megadni, de ha úgy döntesz, hogy megadod, azzal leszel feltüntetve a munkád szerzőjeként.',
@@ -686,10 +684,11 @@ Ezen kívül más szerkesztők is kapcsolatba lépjenek veled a szerkesztői vag
 'nocookieslogin'             => 'A wiki sütiket („cookie�) használ a szerkesztők azonosításhoz.
 Nálad ezek le vannak tiltva.
 Engedélyezd őket, majd próbáld meg újra.',
-'noname'                     => 'Nem érvényes felhasználói nevet adtál meg.',
+'noname'                     => 'Érvénytelen szerkesztőnevet adtál meg.',
 'loginsuccesstitle'          => 'Sikeres bejelentkezés',
-'loginsuccess'               => 'Most már be vagy jelentkezve a(z) {{grammar:ba|{{SITENAME}}}} „$1� néven.',
+'loginsuccess'               => "'''Most már be vagy jelentkezve a(z) {{SITENAME}} wikibe „$1� néven.'''",
 'nosuchuser'                 => 'Nem létezik „$1� nevű szerkesztő.
+A szerkesztőnevek kis- és nagybetű-érzékenyek.
 Ellenőrizd, hogy helyesen írtad-e be, vagy [[Special:UserLogin/signup|hozz létre egy új fiókot]].',
 'nosuchusershort'            => 'Nem létezik „<nowiki>$1</nowiki>� nevű szerkesztő.
 Ellenőrizd, hogy helyesen írtad-e be.',
@@ -697,7 +696,7 @@ Ellenőrizd, hogy helyesen írtad-e be.',
 'wrongpassword'              => 'A megadott jelszó érvénytelen. Próbáld meg újra.',
 'wrongpasswordempty'         => 'Nem adtál meg jelszót. Próbáld meg újra.',
 'passwordtooshort'           => 'Az általad megadott jelszó érvénytelen vagy túl rövid.
-Legalább {{PLURAL:$1|egy|$1}} karakterből kell állnia, és nem egyezhet meg a felhasználói neveddel.',
+Legalább {{PLURAL:$1|egy|$1}} karakterből kell állnia, és nem egyezhet meg a szerkesztőneveddel.',
 'mailmypassword'             => 'Új jelszó küldése e-mailben',
 'passwordremindertitle'      => 'Ideiglenes jelszó a(z) {{SITENAME}} wikire',
 'passwordremindertext'       => 'Valaki (vélhetően te, a(z) $1 IP-címről) új jelszót kért a(z)
@@ -716,13 +715,12 @@ Lépj be a levélben található adatokkal.',
 'throttled-mailpassword'     => 'Már elküldtünk egy jelszóemlékeztetőt az utóbbi {{PLURAL:$1|egy|$1}} órában.
 A visszaélések elkerülése végett {{PLURAL:$1|egy|$1}} óránként csak egy jelszó-emlékeztetőt küldünk.',
 'mailerror'                  => 'Hiba történt az e-mail küldése közben: $1',
-'acct_creation_throttle_hit' => 'Már létrehoztál $1 felhasználói fiókot.
-Sajnáljuk, de többet nem hozhatsz létre.',
-'emailauthenticated'         => '$1-kor megerősítetted az e-mail címedet.',
+'acct_creation_throttle_hit' => 'A wiki látogatói ezt az IP-címet használva {{PLURAL:$1|egy|$1}} fiókot hoztak létre az elmúlt egy nap alatt . Ez a megengedett maximum ezen időtartam alatt, így az erről a címről látogatók jelenleg nem hozhatnak létre újabb fiókokat.',
+'emailauthenticated'         => 'Az e-mail címed megerősítésének ideje: $2, $3',
 'emailnotauthenticated'      => 'Az e-mail címed még <strong>nincs megerősítve</strong>. E-mailek küldése és fogadása nem engedélyezett.',
 'noemailprefs'               => 'Az alábbi funkciók használatához meg kell adnod az e-mail címedet.',
 'emailconfirmlink'           => 'E-mail cím megerősítése',
-'invalidemailaddress'        => 'A megadott e-mail cím érvénytelen formátumú. Kérlek, adj meg egy helyesen formázott e-mail címet vagy hagyd üresen azt a mezőt.',
+'invalidemailaddress'        => 'A megadott e-mail cím érvénytelen formátumú. Kérlek, adj meg egy érvényes e-mail címet vagy hagyd üresen azt a mezőt.',
 'accountcreated'             => 'Felhasználói fiók létrehozva',
 'accountcreatedtext'         => '$1 felhasználói fiókja sikeresen létrejött.',
 'createaccount-title'        => 'Új {{SITENAME}}-azonosító létrehozása',
@@ -730,18 +728,26 @@ Sajnáljuk, de többet nem hozhatsz létre.',
 A hozzátartozó jelszó "$3", melyet a bejelentkezés után minél előbb változtass meg.
 
 Ha nem kértél új azonosítót, és tévedésből kaptad ezt a levelet, nyugodtan hagyd figyelmen kívül.',
+'login-throttled'            => 'Túl sokszor próbálkoztál bejelentkezni ezzel a felhasználói fiókkal. Várj egy kicsit, majd próbáld újra.',
 'loginlanguagelabel'         => 'Nyelv: $1',
 
 # Password reset dialog
-'resetpass'               => 'A fiók jelszavának módosítása',
-'resetpass_announce'      => 'Az e-mailben elküldött ideiglenes kóddal jelentkeztél be. A bejelentkezés befejezéséhez meg kell megadnod egy új jelszót:',
-'resetpass_text'          => '<!-- Ide írd a szöveget -->',
-'resetpass_header'        => 'A fiókhoz tartozó jelszó megváltoztatása',
-'resetpass_submit'        => 'Add meg a jelszót és jelentkezz be',
-'resetpass_success'       => 'A jelszavad megváltoztatása sikeresen befejeződött! Bejelentkezés...',
-'resetpass_bad_temporary' => 'Az ideiglenes jelszó hibás. Lehet, hogy már sikeresen megváltoztattad a jelszavadat, vagy új ideiglenes jelszót kértél.',
-'resetpass_forbidden'     => 'A jelszavak nem változtathatóak meg',
-'resetpass_missing'       => 'Az űrlap adatai hiányoznak.',
+'resetpass'                 => 'Jelszó módosítása',
+'resetpass_announce'        => 'Az e-mailben elküldött ideiglenes kóddal jelentkeztél be. A bejelentkezés befejezéséhez meg kell megadnod egy új jelszót:',
+'resetpass_text'            => '<!-- Ide írd a szöveget -->',
+'resetpass_header'          => 'A fiókhoz tartozó jelszó megváltoztatása',
+'oldpassword'               => 'Régi jelszó:',
+'newpassword'               => 'Új jelszó:',
+'retypenew'                 => 'Új jelszó ismét:',
+'resetpass_submit'          => 'Add meg a jelszót és jelentkezz be',
+'resetpass_success'         => 'A jelszavad megváltoztatása sikeresen befejeződött! Bejelentkezés...',
+'resetpass_bad_temporary'   => 'Az ideiglenes jelszó hibás. Lehet, hogy már sikeresen megváltoztattad a jelszavadat, vagy új ideiglenes jelszót kértél.',
+'resetpass_forbidden'       => 'A jelszavak nem változtathatóak meg',
+'resetpass-no-info'         => 'Be kell jelentkezned hogy közvetlenül elérd ezt a lapot.',
+'resetpass-submit-loggedin' => 'Jelszó megváltoztatása',
+'resetpass-wrong-oldpass'   => 'Nem megfelelő ideiglenes vagy jelenlegi jelszó.
+Lehet, hogy már sikeresen megváltoztattad a jelszavad, vagy pedig időközben új ideiglenes jelszót kértél.',
+'resetpass-temp-password'   => 'Ideiglenes jelszó:',
 
 # Edit page toolbar
 'bold_sample'     => 'Félkövér szöveg',
@@ -756,18 +762,18 @@ Ha nem kértél új azonosítót, és tévedésből kaptad ezt a levelet, nyugod
 'headline_tip'    => 'Alfejezetcím',
 'math_sample'     => 'Ide írd a képletet',
 'math_tip'        => 'Matematikai képlet (LaTeX)',
-'nowiki_sample'   => 'Ide írd a nem-formázott szöveget',
+'nowiki_sample'   => 'Ide írd a formázatlan szöveget',
 'nowiki_tip'      => 'Wiki formázás kikapcsolása',
 'image_sample'    => 'Pelda.jpg',
-'image_tip'       => 'Kép beszúrása',
+'image_tip'       => 'Fájl (pl. kép) beszúrása',
 'media_sample'    => 'Peldaegyketto.ogg',
 'media_tip'       => 'Fájlhivatkozás',
 'sig_tip'         => 'Aláírás időponttal',
 'hr_tip'          => 'Vízszintes vonal (ritkán használd)',
 
 # Edit pages
-'summary'                          => 'Összefoglaló',
-'subject'                          => 'Téma/főcím',
+'summary'                          => 'Összefoglaló:',
+'subject'                          => 'Téma/főcím:',
 'minoredit'                        => 'Apró változtatás',
 'watchthis'                        => 'A lap figyelése',
 'savearticle'                      => 'Lap mentése',
@@ -778,24 +784,26 @@ Ha nem kértél új azonosítót, és tévedésből kaptad ezt a levelet, nyugod
 'anoneditwarning'                  => "'''Figyelem:''' Nem vagy bejelentkezve, ha szerkesztesz, az IP-címed látható lesz a laptörténetben.",
 'missingsummary'                   => "'''Emlékeztető:''' Nem adtál meg szerkesztési összefoglalót. Ha összefoglaló nélkül akarod elküldeni a szöveget, kattints újra a mentésre.",
 'missingcommenttext'               => 'Kérjük, hogy írj összefoglalót szerkesztésedhez.',
-'missingcommentheader'             => "'''Emlékeztető:''' Nem adtad meg a megjegyzés tárgyát/címét. Ha ismét a Mentés gombra kattintasz, akkor a szerkesztésed anélkül kerül mentésre.",
-'summary-preview'                  => 'A szerkesztési összefoglaló előnézete',
-'subject-preview'                  => 'A szakaszcím előnézete',
+'missingcommentheader'             => "'''Emlékeztető:''' Nem adtad meg a megjegyzés tárgyát vagy címét.
+Ha ismét a Mentés gombra kattintasz, akkor a szerkesztésed nélküle kerül mentésre.",
+'summary-preview'                  => 'A szerkesztési összefoglaló előnézete:',
+'subject-preview'                  => 'A téma/főcím előnézete:',
 'blockedtitle'                     => 'A szerkesztő blokkolva van',
-'blockedtext'                      => "<big>'''A felhasználói nevedet vagy az IP-címedet blokkoltuk.'''</big>
+'blockedtext'                      => "<big>'''A szerkesztőnevedet vagy az IP-címedet blokkoltuk.'''</big>
 
-A blokkolást $1 végezte el. Az általa felhozott indok: ''$2''.
+A blokkolást $1 végezte el.
+Az általa felhozott indok: ''$2''.
 
-* A blokkolás kezdete: $8
-* A blokkolás lejárata: $6
-* Blokkolt felhasználó: $7
+* A blokk kezdete: $8
+* A blokk lejárata: $6
+* Blokkolt szerkesztő: $7
 
 Kapcsolatba léphetsz $1 szerkesztőnkkel, vagy egy másik [[{{MediaWiki:Grouppage-sysop}}|adminisztrátorral]], és megbeszélheted vele a blokkolást.
-Az 'E-mail küldése ennek a szerkesztőnek' funkciót nem használhatod, ha a megadott e-mail cím a
-[[Special:Preferences|fiókbeállításaidban]] nem érvényes, és nem blokkolták annak a használatát.
+Az 'E-mail küldése ennek a szerkesztőnek' funkciót csak akkor használhatod, ha érvényes e-mail címet adtál meg
+[[Special:Preferences|fiókbeállításaidban]], és nem blokkolták a használatát.
 Jelenlegi IP-címed: $3, a blokkolás azonosítószáma: #$5.
 Kérjük, hogy érdeklődés esetén mindkettőt add meg.",
-'autoblockedtext'                  => "Az IP-címről automatikusan blokkolva lett, mert korábban egy olyan szerkesztő használta, akit $1 blokkolt, az alábbi indoklással:
+'autoblockedtext'                  => "Az IP-címed automatikusan blokkolva lett, mert korábban egy olyan szerkesztő használta, akit $1 blokkolt, az alábbi indoklással:
 
 :''$2''
 
@@ -805,118 +813,137 @@ Kérjük, hogy érdeklődés esetén mindkettőt add meg.",
 
 Kapcsolatba léphetsz $1 szerkesztőnkkel, vagy egy másik [[{{MediaWiki:Grouppage-sysop}}|adminisztrátorral]], és megbeszélheted vele a blokkolást.
 
-Az 'E-mail küldése ennek a szerkesztőnek' funkciót nem használhatod, ha a megadott e-mail cím a
-[[Special:Preferences|fiókbeállításaidban]] nem érvényes, és nem blokkolták annak a használatát.
+Az 'E-mail küldése ennek a szerkesztőnek' funkciót csak akkor használhatod, ha érvényes e-mail címet adtál meg
+[[Special:Preferences|fiókbeállításaidban]], és nem blokkolták a használatát.
 
-A jelenlegi IP-címed $3, a blokkolás azonosítószáma: $5.
+Jelenlegi IP-címed: $3, a blokkolás azonosítószáma: #$5.
 Kérjük, hogy érdeklődés esetén mindkettőt add meg.",
-'blockednoreason'                  => 'nem lett ok megadva',
-'blockedoriginalsource'            => "'''$1''' forrása alább látható:",
-'blockededitsource'                => "'''$1''' lapon '''általad végrehajtott szerkesztések''' szövege:",
-'whitelistedittitle'               => 'A szerkesztéshez be kell jelentkezned',
-'whitelistedittext'                => 'A szócikkek szerkesztéséhez $1.',
-'confirmedittitle'                 => 'Szerkesztéshez az e-mail cím megerősítése szükséges',
-'confirmedittext'                  => 'A lapok szerkesztése előtt meg kell erősítened az e-mail címedet. Kérjük, hogy a [[Special:Preferences|szerkesztői beállításaidban]] írd be, majd erősítsd meg az e-mail címedet.',
+'blockednoreason'                  => 'nem adott meg okot',
+'blockedoriginalsource'            => "A(z) '''$1''' lap forráskódja:",
+'blockededitsource'                => "A(z) '''$1''' lapon '''végrehajtott szerkesztésed''' szövege:",
+'whitelistedittitle'               => 'A lap szerkesztéséhez be kell jelentkezned',
+'whitelistedittext'                => 'Lapok szerkesztéséhez $1.',
+'confirmedittitle'                 => 'Lapok szerkesztéséhez meg kell erősítened az e-mail címedet',
+'confirmedittext'                  => 'Lapok szerkesztése előtt meg kell erősítened az e-mail címedet. Kérjük, hogy a [[Special:Preferences|szerkesztői beállításaidban]] add meg, majd erősítsd meg az e-mail címedet.',
 'nosuchsectiontitle'               => 'Nincs ilyen szakasz',
-'nosuchsectiontext'                => 'Egy olyan szakaszt próbáltál meg szerkeszteni, amely nem létezik.  Mivel nincs $1. szakasz, ezért nem lehet elmenteni.',
+'nosuchsectiontext'                => 'Egy olyan szakaszt próbáltál meg szerkeszteni, ami nem létezik.
+Mivel nincs $1. szakasz, ezért nincs hová elmenteni a szerkesztésedet.',
 'loginreqtitle'                    => 'Bejelentkezés szükséges',
 'loginreqlink'                     => 'be kell jelentkezned',
 'loginreqpagetext'                 => '$1 más oldalak megtekintéséhez.',
-'accmailtitle'                     => 'A jelszót elküldtük.',
+'accmailtitle'                     => 'Elküldtük a jelszót.',
 'accmailtext'                      => '„$1� jelszavát elküldtük a(z) $2 címre.',
 'newarticle'                       => '(Új)',
-'newarticletext'                   => "Egy olyan lapra mutató hivatkozást követtél, mely még nem létezik.
-Ha létre akarod hozni, csak gépeld be a szövegét a lenti szövegdobozba. Ha kész vagy, az „Előnézet megtekintése� gombbal ellenőrizheted, hogy úgy fog-e kinézni, ahogy szeretnéd, és a „Lap mentése� gombbal tudod elmenteni.
-
-A [[{{MediaWiki:Helppage}}|súgó]] lapon további információkat találsz, melyek segíthetnek eligazodni.
-
-Ha tévedésből jöttél ide, csak nyomd meg a böngésző '''Vissza/Back''' gombját.",
+'newarticletext'                   => "Egy olyan lapra mutató hivatkozást követtél, ami még nem létezik.
+A lap létrehozásához csak gépeld be a szövegét a lenti szövegdobozba. Ha kész vagy, az „Előnézet megtekintése� gombbal ellenőrizheted, hogy úgy fog-e kinézni, ahogy szeretnéd, és a „Lap mentése� gombbal tudod elmenteni. (További információkat a [[{{MediaWiki:Helppage}}|súgólapon]] találsz).
+Ha tévedésből jutottál ide, kattints a böngésződ '''vissza''' vagy '''back''' gombjára.",
 'anontalkpagetext'                 => "----''Ez egy olyan anonim szerkesztő vitalapja, aki még nem regisztrált, vagy csak nem jelentkezett be.
 Ezért az IP-címét használjuk az azonosítására.
-Ugyanazon az IP-címen egy sor szerkesztő osztozhat az idők folyamán.
+Ugyanazon az IP-címen számos szerkesztő osztozhat az idők folyamán.
 Ha úgy látod, hogy az üzenetek, amiket ide kapsz, nem neked szólnak, [[Special:UserLogin/signup|regisztrálj]] vagy ha már regisztráltál, [[Special:UserLogin|jelentkezz be]], hogy ne keverjenek össze másokkal.''",
-'noarticletext'                    => 'Ez a lap jelenleg nem tartalmaz szöveget. [[Special:Search/{{PAGENAME}}|Rákereshetsz erre a címszóra]], vagy [{{fullurl:{{FULLPAGENAME}}|action=edit}} szerkesztheted a lapot].',
-'userpage-userdoesnotexist'        => 'Nincs „$1� nevű regisztrált szerkesztő. Nézd meg, hogy valóban ezt a lapot szeretnéd létrehozni vagy szerkeszteni.',
+'noarticletext'                    => 'Ez a lap jelenleg nem tartalmaz szöveget.
+[[Special:Search/{{PAGENAME}}|Rákereshetsz erre a címszóra]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} megtekintheted a kapcsolódó naplókat],
+vagy [{{fullurl:{{FULLPAGENAME}}|action=edit}} szerkesztheted a lapot].',
+'userpage-userdoesnotexist'        => 'Nincs „$1� nevű regisztrált szerkesztőnk.
+Nézd meg, hogy valóban ezt a lapot szeretnéd létrehozni vagy szerkeszteni.',
 'clearyourcache'                   => "'''Megjegyzés: mentés után frissítened kell a böngésződ gyorsítótárát, hogy lásd a változásokat.''' '''Mozilla''' / '''Firefox''' / '''Safari:''' tartsd lenyomva a Shift gombot és kattints a ''Reload'' / ''Frissítés'' gombra az eszköztáron, vagy használd a ''Ctrl–F5'' billentyűkombinációt (Apple Mac-en ''Cmd–Shift–R''); '''Konqueror:''' egyszerűen csak kattints a ''Reload'' / ''Frissítés'' gombra vagy nyomj ''F5''-öt; '''Opera:''' ürítsd ki a gyorsítótárat az ''Eszközök→Személyes adatok törlése'' / ''Tools→Preferences'' menüben; '''Internet Explorer:''' tartsd nyomva a ''Ctrl''-t, és kattints a ''Reload / Frissítés'' gombra, vagy nyomj ''Ctrl–F5''-öt.",
-'usercssjsyoucanpreview'           => '<strong>Tipp:</strong> Használd az „Előnézet megtekintése� gombot az új CSS/JS teszteléséhez mentés előtt.',
-'usercsspreview'                   => "'''Ne felejtsd el, hogy ez csak a CSS előnézete és még nincs elmentve!'''",
+'usercssjsyoucanpreview'           => "'''Tipp:''' Használd az „Előnézet megtekintése� gombot az új CSS/JS teszteléséhez mentés előtt.",
+'usercsspreview'                   => "'''Ne felejtsd el, hogy ez csak a felhasználói CSS-ed előnézete és még nincs elmentve!'''",
 'userjspreview'                    => "'''Ne felejtsd el, hogy még csak teszteled a felhasználói JavaScriptedet, és még nincs elmentve!'''",
 'userinvalidcssjstitle'            => "'''Figyelem:''' Nincs „$1� nevű felület. A felületekhez tartozó .css/.js oldalak kisbetűvel kezdődnek, például ''{{ns:user}}:Gipsz Jakab/monobook.css'' és nem ''{{ns:user}}:Gipsz Jakab/Monobook.css''.",
 'updated'                          => '(frissítve)',
-'note'                             => '<strong>Megjegyzés:</strong>',
-'previewnote'                      => '<strong>Ne feledd, hogy ez csak előnézet, a munkád még nincs elmentve!</strong>',
-'previewconflict'                  => 'Ez az előnézet a felső szerkesztőablakban levő szöveg mentés utáni megfelelőjét mutatja.',
-'session_fail_preview'             => '<strong>Az elveszett munkamenetadatok miatt sajnos nem tudtuk feldolgozni a szerkesztésedet.
+'note'                             => "'''Megjegyzés:'''",
+'previewnote'                      => "'''Ne feledd, hogy ez csak előnézet, a változtatásaid még nincsenek elmentve!'''",
+'previewconflict'                  => 'Ez az előnézet a felső szerkesztődobozban levő szöveg mentés utáni megfelelőjét mutatja.',
+'session_fail_preview'             => "'''Az elveszett munkamenetadatok miatt sajnos nem tudtuk feldolgozni a szerkesztésedet.
 Kérjük próbálkozz újra!
-Amennyiben továbbra sem sikerül, próbálj meg [[Special:UserLogout|kijelentkezni]], majd ismét bejelentkezni!</strong>',
-'session_fail_preview_html'        => "<strong>Az elveszett munkamenetadatok miatt sajnos nem tudtuk feldolgozni a szerkesztésedet.</strong>
+Amennyiben továbbra sem sikerül, próbálj meg [[Special:UserLogout|kijelentkezni]], majd ismét bejelentkezni!'''",
+'session_fail_preview_html'        => "'''Az elveszett munkamenetadatok miatt sajnos nem tudtuk feldolgozni a szerkesztésedet.'''
 
 ''Mivel a wikiben engedélyezett a nyers HTML-kód használata, az előnézet el van rejtve a JavaScript-alapú támadások megakadályozása céljából.''
 
-<strong>Ha ez egy normális szerkesztési kísérlet, akkor próbálkozz újra. Amennyiben továbbra sem sikerül, próbálj meg [[Special:UserLogout|kijelentkezni]], majd ismét bejelentkezni!</strong>",
-'token_suffix_mismatch'            => '<strong>A szerkesztésedet elutasítottuk, mert a kliensprogramod megváltoztatta a központozó karaktereket
+'''Ha ez egy normális szerkesztési kísérlet, akkor próbálkozz újra. Amennyiben továbbra sem sikerül, próbálj meg [[Special:UserLogout|kijelentkezni]], majd ismét bejelentkezni!'''",
+'token_suffix_mismatch'            => "'''A szerkesztésedet elutasítottuk, mert a kliensprogramod megváltoztatta a központozó karaktereket
 a szerkesztési tokenben. A szerkesztés azért lett visszautasítva, hogy megelőzzük a lap szövegének sérülését.
-Ez a probléma akkor fordulhat elő, ha hibás, web-alapú proxyszolgáltatást használsz.</strong>',
+Ez a probléma akkor fordulhat elő, ha hibás, web-alapú proxyszolgáltatást használsz.'''",
 'editing'                          => '$1 szerkesztése',
 'editingsection'                   => '$1 szerkesztése (szakasz)',
-'editingcomment'                   => '$1 szerkesztése (üzenet)',
+'editingcomment'                   => '$1 szerkesztése (új szakasz)',
 'editconflict'                     => 'Szerkesztési ütközés: $1',
-'explainconflict'                  => "Valaki megváltoztatta a lapot azóta, hogy szerkeszteni kezdted.
-A felső szövegablak tartalmazza az oldal jelenlegi állapotát.
-A te módosításaid az alsó ablakban láthatóak.
-�t kell vezetned a módosításaidat a felső szövegbe.
-'''Csak''' a felső ablakban levő szöveg lesz elmentve, amikor a „Lap mentése� gombra kattintasz.",
+'explainconflict'                  => "Valaki megváltoztatta a lapot, mióta elkezdted szerkeszteni.
+A felső szövegdobozban láthatod az oldal jelenlegi tartalmát.
+A te módosításaid az alsó dobozban találhatóak.
+�t kell másolnod a módosításaidat a felsőbe.
+'''Csak''' a felső dobozban levő szöveg lesz elmentve, amikor a „Lap mentése� gombra kattintasz.",
 'yourtext'                         => 'A te változatod',
 'storedversion'                    => 'A tárolt változat',
-'nonunicodebrowser'                => '<strong>Figyelem: A böngésződ nem Unicode kompatibilis. Egy programozási trükk segítségével biztonságban szerkesztheted a cikkeket: a nem ASCII karakterek a szerkesztőablakban hexadeciális kódokként jelennek meg.</strong>',
-'editingold'                       => '<strong>FIGYELMEZTETÉS: A lap egy elavult változatát szerkeszted.
-Ha elmented, akkor az ezen változat után végzett összes módosítás elvész.</strong>',
+'nonunicodebrowser'                => "'''Figyelem: A böngésződ nem Unicode kompatibilis. Egy kerülő megoldásként biztonságban szerkesztheted a cikkeket: a nem ASCII karakterek a szerkesztőablakban hexadeciális kódokként jelennek meg.'''",
+'editingold'                       => "'''FIGYELMEZTETÉS: A lap egy elavult változatát szerkeszted.
+Ha elmented, akkor az ezen változat után végzett összes módosítás elvész.'''",
 'yourdiff'                         => 'Eltérések',
-'copyrightwarning'                 => 'A szöveg elküldésével tanúsítod, hogy nem sért szerzői jogokat, és engedélyezed a(z) $2 szerinti felhasználását (lásd $1). Ha nem akarod, hogy az írásodat módosítsák vagy továbbterjesszék, akkor ne küldd be.<br />
-<strong>Ne küldj be engedély nélkül szerzői jogilag védett munkákat!</strong>',
-'copyrightwarning2'                => 'A {{SITENAME}} tartalmát, így az általad beküldött szövegeket is más résztvevők átírhatják vagy törölhetik. Ha nem akarod, hogy a művedet átírják, ne küldd be ide.<br />
-A beküldéssel egyben azt is tanúsítod, hogy a beküldött szöveget magad írtad, vagy közkincsből vagy más szabadon felhasználható forrásból másoltad (a részletekért lásd: $1).
-<strong>NE KÜLDJ BE JOGVÉDETT MŰVET ENGEDÉLY NÉLKÜL!</strong>',
-'longpagewarning'                  => '<strong>FIGYELEM: Ez a lap $1 kilobájt hosszú; egyes
-böngészőknek problémát okoz a 32 kB-os vagy nagyobb lapok szerkesztése.
-Fontold meg a lap kisebb szakaszokra bontását.</strong>',
-'longpageerror'                    => '<strong>HIBA: Az általad beküldött szöveg $1 kilobájt hosszú, ami több a még engedélyezett $2 kilobájtnál, ezért nem tudom elmenteni.</strong>',
-'readonlywarning'                  => '<strong>FIGYELMEZTETÉS: A wiki adatbázisát karbantartás miatt zárolták,
-ezért sajnos nem tudod majd elmenteni a szerkesztéseidet. A lap szöveget kimásolhatod
-egy szövegfájlba, amit elmenthetsz későbbre.</strong>',
-'protectedpagewarning'             => '<strong>FIGYELEM: Ez a lap védett, csak adminisztrátorok szerkeszthetik.</strong>',
+'copyrightwarning'                 => "Vedd figyelembe, hogy a {{SITENAME}} wikin végzett összes módosítás a(z) $2 alatt jelenik meg (lásd a(z) $1 lapot a részletekért). Ha nem akarod, hogy az írásodat módosítsák vagy továbbterjesszék, akkor ne küldd be.<br />
+Azt is megígéred, hogy ezt magadtól írtad, vagy egy közkincsből vagy más szabad forrásból másoltad.
+'''NE KÜLDJ BE JOGVÉDETT MUNK�T ENGEDÉLY NÉLKÜL!'''",
+'copyrightwarning2'                => "Vedd figyelembe, hogy a {{SITENAME}} wikin végzett összes módosítást szerkeszthetik, módosíthatják vagy eltávolíthatják más szerkesztők.
+Ha nem akarod, hogy az írásodat módosítsák, akkor ne küldd be.<br />
+Azt is megígéred, hogy ezt magadtól írtad, vagy egy közkincsből vagy más szabad forrásból másoltad (lásd a(z) $1 lapot a részletekért).
+'''NE KÜLDJ BE JOGVÉDETT MUNK�T ENGEDÉLY NÉLKÜL!'''",
+'longpagewarning'                  => "'''FIGYELEM: Ez a lap $1 kilobájt hosszú;
+néhány böngészőnek problémát okoz a 32 kB-os vagy nagyobb lapok szerkesztése.
+Fontold meg a lap kisebb szakaszokra bontását.'''",
+'longpageerror'                    => "'''HIBA: Az általad beküldött szöveg $1 kilobájt hosszú, ami több az engedélyezett $2 kilobájtnál.
+A szerkesztést nem lehet elmenteni.'''",
+'readonlywarning'                  => "'''FIGYELMEZTETÉS: A wiki adatbázisát karbantartás miatt zárolták, ezért most nem fogod tudni elmenteni a szerkesztéseidet.
+A lap szöveget kimásolhatod egy szövegfájlba, amit elmenthetsz későbbre.'''
+
+Az adatbázist lezáró adminisztrátor az alábbi magyarázatot adta: $1",
+'protectedpagewarning'             => "'''FIGYELEM: Ez a lap védett, csak adminisztrátorok szerkeszthetik.'''",
 'semiprotectedpagewarning'         => "'''Megjegyzés:''' ez a lap védett, nem vagy újonnan regisztrált szerkesztők nem módosíthatják.",
 'cascadeprotectedwarning'          => "'''Figyelem:''' ez a lap le van zárva, csak adminisztrátorok szerkeszthetik, mert a következő kaszkádvédelemmel ellátott {{PLURAL:$1|lapon|lapokon}} szerepel beillesztve:",
-'titleprotectedwarning'            => '<strong>FIGYELEM:  Ez a lap úgy van levédve, hogy csak néhány felhasználó hozhatja létre.</strong>',
+'titleprotectedwarning'            => "'''FIGYELEM:  Ez a lap úgy van levédve, hogy csak néhány felhasználó hozhatja létre.'''",
 'templatesused'                    => 'A lapon használt sablonok:',
 'templatesusedpreview'             => 'Az előnézet megjelenítésekor használt sablonok:',
-'templatesusedsection'             => 'Ebben a szakaszban használt sablonok:',
+'templatesusedsection'             => 'Az ebben a szakaszban használt sablonok:',
 'template-protected'               => '(védett)',
 'template-semiprotected'           => '(félig védett)',
 'hiddencategories'                 => 'Ez a lap {{PLURAL:$1|egy|$1}} rejtett kategóriába tartozik:',
 'edittools'                        => '<!-- Ez a szöveg a szerkesztés és a feltöltés űrlap alatt lesz látható. -->',
-'nocreatetitle'                    => 'Az oldallétrehozás korlátozott',
-'nocreatetext'                     => 'Ezen a webhelyen korlátozták az új oldalak készítését.
+'nocreatetitle'                    => 'Az oldallétrehozás korlátozva van',
+'nocreatetext'                     => 'A(z) {{SITENAME}} wikin korlátozták az új oldalak létrehozásának lehetőségét.
 Visszamehetsz és szerkeszthetsz egy létező lapot, valamint [[Special:UserLogin|bejelentkezhetsz vagy készíthetsz egy felhasználói fiókot]].',
-'nocreate-loggedin'                => 'Nincs jogod új lapokat létrehozni.',
+'nocreate-loggedin'                => 'Nincs jogosultságod új lapokat létrehozni.',
 'permissionserrors'                => 'Engedélyezési hiba',
 'permissionserrorstext'            => 'A művelet elvégzése nem engedélyezett a számodra, a következő {{PLURAL:$1|ok|okok}} miatt:',
-'permissionserrorstext-withaction' => 'Nincs jogosultságod a következő művelet elvégzéséhez: $2, az alábbi {{PLURAL:$1|ok|okok}} miatt:',
-'recreate-deleted-warn'            => "'''Vigyázat: egy olyan lapot akarsz létrehozni, amelyet korábban már töröltünk.'''
+'permissionserrorstext-withaction' => 'Nincs jogosultságod a következő művelet elvégzéséhez: $2, a következő {{PLURAL:$1|ok|okok}} miatt:',
+'recreate-deleted-warn'            => "'''Vigyázat: egy olyan lapot akarsz létrehozni, amit korábban már töröltek.'''
 
-Mielőtt létrehoznád, nézd meg, miért került korábban törlésre és ellenőrizd,
+Mielőtt létrehoznád, nézd meg, miért került törölték és ellenőrizd,
 hogy a törlés indoka nem érvényes-e még. A törlési naplóban a lapról az alábbi bejegyzések szerepelnek:",
+'deleted-notice'                   => 'Az oldal korábban törölve lett.
+A lap törlési naplója alább olvasható.',
+'deletelog-fulllog'                => 'Teljes napló megtekintése',
+'edit-hook-aborted'                => 'A szerkesztés meg lett szakítva egy hook által.
+Nem lett magyarázat csatolva.',
+'edit-gone-missing'                => 'Nem lehet frissíteni a lapot.
+Úgy tűnik, hogy törölve lett.',
+'edit-conflict'                    => 'Szerkesztési ütközés.',
+'edit-no-change'                   => 'A szerkesztésed figyelmen kívül lett hagyva, mivel nem változtattál a lap szövegén.',
+'edit-already-exists'              => 'Az új lap nem készíthető el.
+Már létezik.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Figyelem: ezen a lapon túl sok értelmes sablon-hívás található.
+'expensive-parserfunction-warning'        => 'Figyelem: ezen a lapon túl sok erőforrásigényes értelmes sablon-hívás található.
 
-Kevesebb, mint $2 kellene, jelenleg $1 van.',
+Kevesebb, mint {{PLURAL:$2|egy|$2}} kellene, jelenleg {{PLURAL:$1|egy|$1}} van.',
 'expensive-parserfunction-category'       => 'Túl sok bonyolult értelmes sablon-hívással rendelkező lapok',
 'post-expand-template-inclusion-warning'  => 'Figyelem: a beillesztett sablonok mérete túl nagy.
 Néhány sablon nem fog megjelenni.',
 'post-expand-template-inclusion-category' => 'Lapok, melyeken a beillesztett sablon mérete meghaladja a megengedett méretet',
 'post-expand-template-argument-warning'   => 'Figyelem: Ez a lap legalább egy olyan sablonparamétert tartalmaz, amely kibontva túl nagy, így el lett(ek) hagyva.',
 'post-expand-template-argument-category'  => 'Elhagyott sablonparaméterekkel rendelkező lapok',
+'parser-template-loop-warning'            => 'Végtelen ciklus a következő sablonban: [[$1]]',
+'parser-template-recursion-depth-warning' => 'A sablon rekurzív beillesztésének mélysége átlépte a határérékét ($1)',
 
 # "Undo" feature
 'undo-success' => 'A szerkesztés visszavonható. Kérlek ellenőrizd alább a változásokat, hogy valóban ezt szeretnéd-e tenni, majd kattints a lap mentése gombra a visszavonás véglegesítéséhez.',
@@ -931,28 +958,28 @@ Néhány sablon nem fog megjelenni.',
 :''$2''",
 
 # History pages
-'viewpagelogs'        => 'A lap a rendszernaplókban',
-'nohistory'           => 'A lap nem rendelkezik laptörténettel.',
-'revnotfound'         => 'A változat nem található',
-'revnotfoundtext'     => 'A lap általad kért régi változatát nem találom. Kérlek, ellenőrizd az URL-t, amivel erre a lapra jutottál.',
-'currentrev'          => 'Aktuális változat',
-'revisionasof'        => 'A lap $1-kori változata',
-'revision-info'       => 'A lap korábbi változatát látod, amilyen $2 $1-kor történt szerkesztése után volt.',
-'previousrevision'    => '�Régebbi változat',
-'nextrevision'        => 'Újabb változat→',
-'currentrevisionlink' => 'Aktuális változat',
-'cur'                 => 'akt',
-'next'                => 'következő',
-'last'                => 'előző',
-'page_first'          => 'első',
-'page_last'           => 'utolsó',
-'histlegend'          => 'Eltérések kijelölése: jelöld ki az összehasonlítandó változatokat, majd nyomd meg az Enter billentyűt, vagy az alul lévő gombot.<br />
-Jelmagyarázat: (akt) = eltérés az aktuális változattól, (előző) = eltérés az előző változattól, A = Apró változtatás',
-'deletedrev'          => '[törölve]',
-'histfirst'           => 'legelső',
-'histlast'            => 'legutolsó',
-'historysize'         => '($1 bájt)',
-'historyempty'        => '(üres)',
+'viewpagelogs'           => 'A lap a rendszernaplókban',
+'nohistory'              => 'A lap nem rendelkezik laptörténettel.',
+'currentrev'             => 'Aktuális változat',
+'currentrev-asof'        => 'A lap jelenlegi, $1-kori változata',
+'revisionasof'           => 'A lap $1-kori változata',
+'revision-info'          => 'A lap korábbi változatát látod, amilyen $2 $1-kor történt szerkesztése után volt.', # Additionally available: $3: revision id
+'previousrevision'       => '�Régebbi változat',
+'nextrevision'           => 'Újabb változat→',
+'currentrevisionlink'    => 'Aktuális változat',
+'cur'                    => 'akt',
+'next'                   => 'következő',
+'last'                   => 'előző',
+'page_first'             => 'első',
+'page_last'              => 'utolsó',
+'histlegend'             => 'Eltérések kijelölése: jelöld ki az összehasonlítandó változatokat, majd nyomd meg az Enter billentyűt, vagy az alul lévő gombot.<br />
+Jelmagyarázat: (akt) = eltérés az aktuális változattól, (előző) = eltérés az előző változattól, a = apró szerkesztés',
+'history-fieldset-title' => 'Keresés a laptörténetben',
+'deletedrev'             => '[törölve]',
+'histfirst'              => 'legelső',
+'histlast'               => 'legutolsó',
+'historysize'            => '($1 bájt)',
+'historyempty'           => '(üres)',
 
 # Revision feed
 'history-feed-title'          => 'Laptörténet',
@@ -964,7 +991,7 @@ Próbálkozhatsz a témával kapcsolatos lapok [[Special:Search|keresésével]].
 
 # Revision deletion
 'rev-deleted-comment'         => '(megjegyzés eltávolítva)',
-'rev-deleted-user'            => '(felhasználónév eltávolítva)',
+'rev-deleted-user'            => '(szerkesztőnév eltávolítva)',
 'rev-deleted-event'           => '(bejegyzés eltávolítva)',
 'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
 Ezt a változatot eltávolítottuk a nyilvános archívumokból.
@@ -973,17 +1000,17 @@ További információkat a [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}
 Ezt a változatot eltávolították a nyilvános archívumokból.
 Mivel adminisztrátor vagy ezen a webhelyen, te megtekintheted; további részleteket a [{{fullurl:Special:Napló/delete|page={{FULLPAGENAMEE}}}} törlési naplóban] találhatsz.</div>',
 'rev-delundel'                => 'megjelenítés/elrejtés',
-'revisiondelete'              => 'Változatok törlése/helyreállítása',
+'revisiondelete'              => 'Változatok törlése vagy helyreállítása',
 'revdelete-nooldid-title'     => 'Érvénytelen célváltozat',
 'revdelete-nooldid-text'      => 'Nem adtad meg a célváltozato(ka)t, a megadott változat nem létezik,
 vagy a legutolsó változatot próbáltad meg elrejteni.',
-'revdelete-selected'          => "'''{{PLURAL:$2|Kiválasztott változat|Kiválasztott változatok}} - $1:'''",
+'revdelete-selected'          => "'''A(z) [[:$1]] lap {{PLURAL:$2|kiválasztott változata|kiválasztott változatai}}:'''",
 'logdelete-selected'          => "'''{{PLURAL:$1|Kiválasztott naplóesemény|Kiválasztott naplóesemények}}:'''",
-'revdelete-text'              => "'''A törölt változatok és események még láthatók lesznek a lap előzményeiben és naplójában,
-azonban a tartalmuknak csak egy része lesz a nyilvánosság számára hozzáférhetetlen.'''
+'revdelete-text'              => "'''A törölt változatok és események még láthatóak lesznek a laptörténetben és a naplókban,
+azonban a tartalmuk egyes részei el lesznek rejtve a nyilvánosság elől.'''
 
-Ezen wiki többi adminisztrátora még hozzá tud férni a rejtett tartalomhoz, és
-vissza tudja ugyanezen a kezelőfelületen keresztül állítani, ha nincs megadva további korlátozás.",
+A(z) {{SITENAME}} wiki adminisztrátorai továbbra is meg tudják tekinteni és helyre tudják állítani
+a tartalmat ugyanezen a felületen keresztül, ha nem adsz meg további korlátozásokat.",
 'revdelete-legend'            => 'Korlátozások megadása:',
 'revdelete-hide-text'         => 'Változat szövegének elrejtése',
 'revdelete-hide-name'         => 'Művelet és cél elrejtése',
@@ -1036,6 +1063,7 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'mergehistory-invalid-destination' => 'A céllapnak érvényes címet kell megadni.',
 'mergehistory-autocomment'         => 'Egyesítette a(z) [[:$1]] lapot a(z) [[:$2]] lappal',
 'mergehistory-comment'             => 'Egyesítette a(z) [[:$1]] lapot a(z) [[:$2]] lappal: $3',
+'mergehistory-same-destination'    => 'A forrás- és a céllap nem egyezhet meg',
 
 # Merge log
 'mergelog'           => 'Egyesítési napló',
@@ -1048,119 +1076,201 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'difference'              => '(Változatok közti eltérés)',
 'lineno'                  => '$1. sor:',
 'compareselectedversions' => 'Kiválasztott változatok összehasonlítása',
+'visualcomparison'        => 'Vizuális összehasonlítás',
+'wikicodecomparison'      => 'Wikikód összehasonlítása',
 'editundo'                => 'visszavonás',
 'diff-multi'              => '({{PLURAL:$1|Egy közbeeső változat|$1 közbeeső változat}} nincs mutatva)',
+'diff-movedto'            => '�thelyezve ide: $1',
+'diff-styleadded'         => 'A(z) $1 stílus hozzáadva',
+'diff-added'              => 'A(z) $1 hozzáadva',
+'diff-changedto'          => 'Cserélve erre: $1',
+'diff-movedoutof'         => 'Elrakva innen: $1',
+'diff-styleremoved'       => 'A(z) $1 stílus eltávolítva',
+'diff-removed'            => 'A(z) $1 eltávolítva',
+'diff-changedfrom'        => 'Cserélve erről: $1',
+'diff-src'                => 'forrás',
+'diff-withdestination'    => 'céllal $1',
+'diff-with'               => '&#32;$1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;és $1 $2',
+'diff-width'              => 'szélesség',
+'diff-height'             => 'magasság',
+'diff-p'                  => "egy '''bekezdés'''",
+'diff-blockquote'         => "egy '''idézet'''",
+'diff-h1'                 => "egy '''első szintű fejezetcím'''",
+'diff-h2'                 => "egy '''kettes szintű fejezetcím'''",
+'diff-h3'                 => "egy '''hármas szintű fejezetcím'''",
+'diff-h4'                 => "egy '''négyes szintű fejezetcím'''",
+'diff-h5'                 => "egy '''ötös szintű fejezetcím'''",
+'diff-pre'                => "egy '''formázatlan szöveget tartalmazó blokk'''",
+'diff-div'                => "egy '''div'''",
+'diff-ul'                 => "egy '''rendezetlen lista'''",
+'diff-ol'                 => "egy '''számozott lista'''",
+'diff-li'                 => "egy '''listaelem'''",
+'diff-table'              => "egy '''táblázat'''",
+'diff-tbody'              => "egy '''táblázat tartalma'''",
+'diff-tr'                 => "egy '''sor'''",
+'diff-td'                 => "egy '''cella'''",
+'diff-th'                 => "egy '''fejléc'''",
+'diff-br'                 => "egy '''sortörés'''",
+'diff-hr'                 => "egy '''vízszintes vonal'''",
+'diff-code'               => "egy '''programkód-blokk'''",
+'diff-dl'                 => "egy '''definíciós lista'''",
+'diff-dt'                 => "egy '''fogalom definíciója'''",
+'diff-dd'                 => "egy '''definíció'''",
+'diff-input'              => "egy '''beviteli mező'''",
+'diff-form'               => "egy '''űrlap'''",
+'diff-img'                => "egy '''fájl'''",
+'diff-span'               => "egy '''span'''",
+'diff-a'                  => "egy '''link'''",
+'diff-i'                  => "'''dőlt'''",
+'diff-b'                  => "'''félkövér'''",
+'diff-strong'             => "'''vastagított'''",
+'diff-em'                 => "'''kiemelés'''",
+'diff-font'               => "'''betűtípus'''",
+'diff-big'                => "'''nagy'''",
+'diff-del'                => "'''törölt'''",
+'diff-tt'                 => "'''fix szélességű szöveg'''",
+'diff-sub'                => "'''alsó index'''",
+'diff-sup'                => "'''felső index'''",
+'diff-strike'             => "'''áthúzás'''",
 
 # Search results
-'searchresults'             => 'A keresés eredménye',
-'searchresulttext'          => 'A keresésről a [[{{MediaWiki:Helppage}}|{{int:help}}]] lapon találhatsz további információkat.',
-'searchsubtitle'            => 'A keresett kifejezés: „[[:$1]]� ([[Special:Prefixindex/$1|minden, „$1� előtaggal kezdődő lap]] | [[Special:WhatLinksHere/$1|a(z) „$1� lapra hivatkozó lapok]])',
-'searchsubtitleinvalid'     => "A keresett kulcsszó: „'''$1'''�",
-'noexactmatch'              => "Nincs '''$1''' nevű lap. Készíthetsz egy [[:$1|új oldalt]] ezen a néven.",
-'noexactmatch-nocreate'     => "'''Nem található „$1� nevű lap.'''",
-'toomanymatches'            => 'Túl sok találat van, próbálkozz egy másik lekérdezéssel',
-'titlematches'              => 'Címbeli egyezések',
-'notitlematches'            => 'Nincs megegyező cím',
-'textmatches'               => 'Szövegbeli egyezések',
-'notextmatches'             => 'Nincsenek szövegbeli egyezések',
-'prevn'                     => 'előző $1',
-'nextn'                     => 'következő $1',
-'viewprevnext'              => '($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|egy|$2}} szó)',
-'search-result-score'       => 'Relevancia: $1%',
-'search-redirect'           => '(átirányítás ide: $1)',
-'search-section'            => '($1. fejezet)',
-'search-suggest'            => 'Keresési javaslat: $1',
-'search-interwiki-caption'  => 'Társlapok',
-'search-interwiki-default'  => '$1 találat',
-'search-interwiki-more'     => '(több)',
-'search-mwsuggest-enabled'  => 'javaslatokkal',
-'search-mwsuggest-disabled' => 'javaslatok nélkül',
-'search-relatedarticle'     => 'Kapcsolódó',
-'mwsuggest-disable'         => 'AJAX-alapú keresési javaslatok letiltása',
-'searchrelated'             => 'kapcsolódó',
-'searchall'                 => 'mind',
-'showingresults'            => "Lent '''{{PLURAL:$1|egy|$1}}''' találat látható, az eleje '''$2'''.",
-'showingresultsnum'         => "Lent '''{{PLURAL:$3|egy|$3}}''' találat látható, az eleje '''$2'''.",
-'showingresultstotal'       => "{{PLURAL:$3|Találat: '''$1''' (összesen '''$3''')|Találatok: '''$1 – $2''' (összesen '''$3''')}}",
-'nonefound'                 => "'''Megjegyzés''': Alapértelmezésben a keresés nem terjed ki minden névtérre. Ha az összes névtérben keresni akarsz, írd az ''all:'' karaktersorozatot a keresett kifejezés elé.",
-'powersearch'               => 'Részletes keresés',
-'powersearch-legend'        => 'Részletes keresés',
-'powersearch-ns'            => 'Névterek:',
-'powersearch-redir'         => '�tirányítások megjelenítése',
-'powersearch-field'         => 'Keresett szöveg:',
-'search-external'           => 'Külső kereső',
-'searchdisabled'            => 'Elnézésed kérjük, de a teljes szöveges keresés terhelési okok miatt átmenetileg nem használható. Ezidő alatt használhatod a lenti Google keresést, mely viszont lehetséges, hogy nem teljesen friss adatokkal dolgozik.',
+'searchresults'                    => 'A keresés eredménye',
+'searchresults-title'              => 'Keresési eredmények: „$1�',
+'searchresulttext'                 => 'A keresésről a [[{{MediaWiki:Helppage}}|{{int:help}}]] lapon találhatsz további információkat.',
+'searchsubtitle'                   => 'A keresett kifejezés: „[[:$1]]� ([[Special:Prefixindex/$1|minden, „$1� előtaggal kezdődő lap]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|a(z) „$1� lapra hivatkozó lapok]])',
+'searchsubtitleinvalid'            => "A keresett kulcsszó: „'''$1'''�",
+'noexactmatch'                     => "Nincs '''$1''' nevű lap. Készíthetsz egy [[:$1|új oldalt]] ezen a néven.",
+'noexactmatch-nocreate'            => "'''Nem található „$1� nevű lap.'''",
+'toomanymatches'                   => 'Túl sok találat van, próbálkozz egy másik lekérdezéssel',
+'titlematches'                     => 'Címbeli egyezések',
+'notitlematches'                   => 'Nincs megegyező cím',
+'textmatches'                      => 'Szövegbeli egyezések',
+'notextmatches'                    => 'Nincsenek szövegbeli egyezések',
+'prevn'                            => 'előző $1',
+'nextn'                            => 'következő $1',
+'viewprevnext'                     => '($1) ($2) ($3)',
+'searchmenu-legend'                => 'Keresési beállítások',
+'searchmenu-exists'                => "'''A wikin már van „[[:$1]]� nevű lap'''",
+'searchmenu-new'                   => "'''Hozd létre a(z) „[[:$1]]� nevű lapot ezen a wikin!'''",
+'searchhelp-url'                   => 'Help:Tartalom',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Ilyen előtagú lapok listázása]]',
+'searchprofile-articles'           => 'FÅ‘ tartalom',
+'searchprofile-articles-and-proj'  => 'Fő tartalom és projektlapok',
+'searchprofile-project'            => 'Projektlapok',
+'searchprofile-images'             => 'Fájlok',
+'searchprofile-everything'         => 'Minden lap',
+'searchprofile-advanced'           => 'Részletes',
+'searchprofile-articles-tooltip'   => 'A következőkben keres: $1',
+'searchprofile-project-tooltip'    => 'A következőkben keres: $1',
+'searchprofile-images-tooltip'     => 'Fájlok keresése',
+'searchprofile-everything-tooltip' => 'Minden névtérben keres (a vitalapokat is beleértve)',
+'searchprofile-advanced-tooltip'   => 'Keresés adott névterekben',
+'prefs-search-nsdefault'           => 'Keresés alapbeállítások használatával:',
+'prefs-search-nscustom'            => 'Egyedi névterek keresése:',
+'search-result-size'               => '$1 ({{PLURAL:$2|egy|$2}} szó)',
+'search-result-score'              => 'Relevancia: $1%',
+'search-redirect'                  => '(átirányítás ide: $1)',
+'search-section'                   => '($1. fejezet)',
+'search-suggest'                   => 'Keresési javaslat: $1',
+'search-interwiki-caption'         => 'Társlapok',
+'search-interwiki-default'         => '$1 találat',
+'search-interwiki-more'            => '(több)',
+'search-mwsuggest-enabled'         => 'javaslatokkal',
+'search-mwsuggest-disabled'        => 'javaslatok nélkül',
+'search-relatedarticle'            => 'Kapcsolódó',
+'mwsuggest-disable'                => 'AJAX-alapú keresési javaslatok letiltása',
+'searchrelated'                    => 'kapcsolódó',
+'searchall'                        => 'mind',
+'showingresults'                   => "Lent '''{{PLURAL:$1|egy|$1}}''' találat látható, az eleje '''$2'''.",
+'showingresultsnum'                => "Lent '''{{PLURAL:$3|egy|$3}}''' találat látható, az eleje '''$2'''.",
+'showingresultstotal'              => "{{PLURAL:$4|Találat: '''$1''' (összesen '''$3''')|Találatok: '''$1 – $2''' (összesen '''$3''')}}",
+'nonefound'                        => "'''Megjegyzés''': Alapértelmezésben a keresés nem terjed ki minden névtérre. Ha az összes névtérben keresni akarsz, írd az ''all:'' karaktersorozatot a keresett kifejezés elé.",
+'search-nonefound'                 => 'Nincs egyezés a megadott szöveggel.',
+'powersearch'                      => 'Részletes keresés',
+'powersearch-legend'               => 'Részletes keresés',
+'powersearch-ns'                   => 'Névterek:',
+'powersearch-redir'                => '�tirányítások megjelenítése',
+'powersearch-field'                => 'Keresett szöveg:',
+'search-external'                  => 'Külső kereső',
+'searchdisabled'                   => 'Elnézésed kérjük, de a teljes szöveges keresés terhelési okok miatt átmenetileg nem használható. Ezidő alatt használhatod a lenti Google keresést, mely viszont lehetséges, hogy nem teljesen friss adatokkal dolgozik.',
 
 # Preferences page
-'preferences'              => 'Beállításaim',
-'mypreferences'            => 'beállításaim',
-'prefs-edits'              => 'Szerkesztéseid száma:',
-'prefsnologin'             => 'Nem jelentkeztél be',
-'prefsnologintext'         => 'Saját beállításaid elmentéséhez <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} be kell jelentkezned.] </span>',
-'prefsreset'               => 'A beállítások visszaállításra kerültek a tárolóból.',
-'qbsettings'               => 'Gyorsmenü',
-'qbsettings-none'          => 'Nincs',
-'qbsettings-fixedleft'     => 'Fix baloldali',
-'qbsettings-fixedright'    => 'Fix jobboldali',
-'qbsettings-floatingleft'  => 'Lebegő baloldali',
-'qbsettings-floatingright' => 'Lebegő jobboldali',
-'changepassword'           => 'Jelszócsere',
-'skin'                     => 'Felület',
-'math'                     => 'Képletek',
-'dateformat'               => 'Dátum formátuma',
-'datedefault'              => 'Nincs beállítás',
-'datetime'                 => 'Dátum és idő',
-'math_failure'             => 'Értelmezés sikertelen',
-'math_unknown_error'       => 'ismeretlen hiba',
-'math_unknown_function'    => 'ismeretlen függvény',
-'math_lexing_error'        => 'lexikai hiba',
-'math_syntax_error'        => 'formai hiba',
-'math_image_error'         => 'Sikertelen PNG-vé alakítás; ellenőrizd a latex, dvips, gs telepítését',
-'math_bad_tmpdir'          => 'Nem írható vagy nem hozható létre a matematikai ideiglenes könyvtár',
-'math_bad_output'          => 'Nem lehet létrehozni vagy írni a matematikai függvények kimeneti könyvtárába',
-'math_notexvc'             => 'HIányzó texvc végrehajtható fájl; a beállítást lásd a math/README fájlban.',
-'prefs-personal'           => 'Felhasználói adatok',
-'prefs-rc'                 => 'Friss változtatások',
-'prefs-watchlist'          => 'Figyelőlista',
-'prefs-watchlist-days'     => 'A figyelőlistában mutatott napok száma:',
-'prefs-watchlist-edits'    => 'A kiterjesztett figyelőlistán mutatott szerkesztések száma:',
-'prefs-misc'               => 'Egyéb',
-'saveprefs'                => 'Mentés',
-'resetprefs'               => 'Alaphelyzet',
-'oldpassword'              => 'Régi jelszó:',
-'newpassword'              => 'Új jelszó:',
-'retypenew'                => 'Új jelszó ismét:',
-'textboxsize'              => 'Szerkesztés',
-'rows'                     => 'Sor',
-'columns'                  => 'Oszlop',
-'searchresultshead'        => 'Keresés',
-'resultsperpage'           => 'Laponként mutatott találatok száma:',
-'contextlines'             => 'Találatonként mutatott sorok száma:',
-'contextchars'             => 'Soronkénti szövegkörnyezet (karakterszám):',
-'stub-threshold'           => 'A hivatkozások <a href="#" class="stub">csonkként</a> történő formázásának határa (bájtban):',
-'recentchangesdays'        => 'A friss változtatásokban mutatott napok száma:',
-'recentchangescount'       => 'A friss változtatásokban, laptörténetben, naplókban mutatott szerkesztések száma:',
-'savedprefs'               => 'Az új beállításaid érvénybe léptek.',
-'timezonelegend'           => 'Időzóna',
-'timezonetext'             => '¹Ennyi óra az eltérés a helyi idő és a szerver ideje (UTC) között.',
-'localtime'                => 'Helyi idő:',
-'timezoneoffset'           => 'Eltérés:',
-'servertime'               => 'A kiszolgáló ideje:',
-'guesstimezone'            => 'Töltse ki a böngésző',
-'allowemail'               => 'E-mail engedélyezése más szerkesztőktől',
-'prefs-searchoptions'      => 'A keresés beállításai',
-'prefs-namespaces'         => 'Névterek',
-'defaultns'                => 'Alapértelmezett keresés az alábbi névterekben:',
-'default'                  => 'alapértelmezés',
-'files'                    => 'Fájlok',
+'preferences'               => 'Beállításaim',
+'mypreferences'             => 'Beállításaim',
+'prefs-edits'               => 'Szerkesztéseid száma:',
+'prefsnologin'              => 'Nem jelentkeztél be',
+'prefsnologintext'          => 'Saját beállításaid elmentéséhez <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} be kell jelentkezned.] </span>',
+'prefsreset'                => 'A beállítások visszaállításra kerültek a tárolóból.',
+'qbsettings'                => 'Gyorsmenü',
+'qbsettings-none'           => 'Nincs',
+'qbsettings-fixedleft'      => 'Fix baloldali',
+'qbsettings-fixedright'     => 'Fix jobboldali',
+'qbsettings-floatingleft'   => 'Lebegő baloldali',
+'qbsettings-floatingright'  => 'Lebegő jobboldali',
+'changepassword'            => 'Jelszócsere',
+'skin'                      => 'Felület',
+'skin-preview'              => 'előnézet',
+'math'                      => 'Képletek',
+'dateformat'                => 'Dátum formátuma',
+'datedefault'               => 'Nincs beállítás',
+'datetime'                  => 'Dátum és idő',
+'math_failure'              => 'Értelmezés sikertelen',
+'math_unknown_error'        => 'ismeretlen hiba',
+'math_unknown_function'     => 'ismeretlen függvény',
+'math_lexing_error'         => 'lexikai hiba',
+'math_syntax_error'         => 'formai hiba',
+'math_image_error'          => 'Sikertelen PNG-vé alakítás; ellenőrizd a latex, dvips, gs telepítését',
+'math_bad_tmpdir'           => 'Nem írható vagy nem hozható létre a matematikai ideiglenes könyvtár',
+'math_bad_output'           => 'Nem lehet létrehozni vagy írni a matematikai függvények kimeneti könyvtárába',
+'math_notexvc'              => 'HIányzó texvc végrehajtható fájl; a beállítást lásd a math/README fájlban.',
+'prefs-personal'            => 'Felhasználói adatok',
+'prefs-rc'                  => 'Friss változtatások',
+'prefs-watchlist'           => 'Figyelőlista',
+'prefs-watchlist-days'      => 'A figyelőlistában mutatott napok száma:',
+'prefs-watchlist-days-max'  => '(legfeljebb 7 nap)',
+'prefs-watchlist-edits'     => 'A kiterjesztett figyelőlistán mutatott szerkesztések száma:',
+'prefs-watchlist-edits-max' => '(legfeljebb 1000)',
+'prefs-misc'                => 'Egyéb',
+'prefs-resetpass'           => 'Jelszó megváltoztatása',
+'saveprefs'                 => 'Mentés',
+'resetprefs'                => 'Alaphelyzet',
+'textboxsize'               => 'Szerkesztés',
+'prefs-edit-boxsize'        => 'A szerkesztőablak mérete.',
+'rows'                      => 'Sor',
+'columns'                   => 'Oszlop',
+'searchresultshead'         => 'Keresés',
+'resultsperpage'            => 'Laponként mutatott találatok száma:',
+'contextlines'              => 'Találatonként mutatott sorok száma:',
+'contextchars'              => 'Soronkénti szövegkörnyezet (karakterszám):',
+'stub-threshold'            => 'A hivatkozások <a href="#" class="stub">csonkként</a> történő formázásának határa (bájtban):',
+'recentchangesdays'         => 'A friss változtatásokban mutatott napok száma:',
+'recentchangesdays-max'     => '(maximum {{PLURAL:$1|egy|$1}} nap)',
+'recentchangescount'        => 'A friss változtatásokban, a laptörténetekben és a naplókban mutatott szerkesztések száma:',
+'savedprefs'                => 'Az új beállításaid érvénybe léptek.',
+'timezonelegend'            => 'Időzóna',
+'timezonetext'              => '¹Ennyi óra az eltérés a helyi idő és a szerver ideje (UTC) között.',
+'localtime'                 => 'Helyi idő:',
+'timezoneselect'            => 'Időzóna:',
+'timezoneuseserverdefault'  => 'A kiszolgáló alapértelmezett értékének használata',
+'timezoneuseoffset'         => 'Egyéb (eltérés megadása)',
+'timezoneoffset'            => 'Eltérés¹:',
+'servertime'                => 'A kiszolgáló ideje:',
+'guesstimezone'             => 'Töltse ki a böngésző',
+'allowemail'                => 'E-mail engedélyezése más szerkesztőktől',
+'prefs-searchoptions'       => 'A keresés beállításai',
+'prefs-namespaces'          => 'Névterek',
+'defaultns'                 => 'Alapértelmezett keresés az alábbi névterekben:',
+'default'                   => 'alapértelmezés',
+'files'                     => 'Fájlok',
 
 # User rights
 'userrights'                  => 'Szerkesztői jogok beállítása', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Szerkesztőcsoportok beállítása',
 'userrights-user-editname'    => 'Add meg a szerkesztő nevét:',
 'editusergroup'               => 'Szerkesztőcsoportok módosítása',
-'editinguser'                 => "'''[[User:$1|$1]]''' jogainak megváltoztatása ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "'''[[User:$1|$1]]''' jogainak megváltoztatása ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Szerkesztőcsoportok módosítása',
 'saveusergroups'              => 'Szerkesztőcsoportok mentése',
 'userrights-groupsmember'     => 'Csoporttag:',
@@ -1208,10 +1318,12 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'right-minoredit'            => 'szerkesztések apróként jelölésének lehetősége',
 'right-move'                 => 'lapok átnevezése',
 'right-move-subpages'        => 'lapok átnevezése az allapjukkal együtt',
+'right-move-rootuserpages'   => 'szerkesztői lapok mozgatása',
+'right-movefile'             => 'fájlok átnevezése',
 'right-suppressredirect'     => 'nem készít átirányítást a régi néven lapok átnevezésekor',
 'right-upload'               => 'fájlok feltöltése',
 'right-reupload'             => 'létező fájlok felülírása',
-'right-reupload-own'         => 'saját maga által feltöltött képek felülírása',
+'right-reupload-own'         => 'a saját maga által feltöltött fájlok felülírása',
 'right-reupload-shared'      => 'felülírhatja a közös megosztóhelyen lévő fájlokat helyben',
 'right-upload_by_url'        => 'fájl feltöltése URL-cím alapján',
 'right-purge'                => 'oldal gyorsítótárának ürítése megerősítés nélkül',
@@ -1221,7 +1333,7 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'right-apihighlimits'        => 'nagyobb mennyiségű lekérdezés az API-n keresztül',
 'right-writeapi'             => 'a szerkesztő-API használata',
 'right-delete'               => 'lapok törlése',
-'right-bigdelete'            => 'nagy történettel rendelkező képek törlése',
+'right-bigdelete'            => 'nagy történettel rendelkező fájlok törlése',
 'right-deleterevision'       => 'lapok adott változatainak törlése és helyreállítása',
 'right-deletedhistory'       => 'törölt lapváltozatok megtekintése, a szövegük nélkül',
 'right-browsearchive'        => 'keresés a törölt lapok között',
@@ -1258,9 +1370,46 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'rightslogentry' => 'megváltoztatta $1 szerkesztő felhasználó jogait (régi: $2; új: $3)',
 'rightsnone'     => '(semmi)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lap olvasása',
+'action-edit'                 => 'lap szerkesztése',
+'action-createpage'           => 'új lap készítése',
+'action-createtalk'           => 'vitalap készítése',
+'action-createaccount'        => 'felhasználói fiók elkészítése',
+'action-minoredit'            => 'szerkesztés aprónak jelölése',
+'action-move'                 => 'lap átnevezése',
+'action-move-subpages'        => 'lap és allapjainak átnevezése',
+'action-move-rootuserpages'   => 'szerkesztői lapok átnevezése',
+'action-movefile'             => 'fájlok átnevezése',
+'action-upload'               => 'fájl feltöltése',
+'action-reupload'             => 'már létező fájl felülírása',
+'action-reupload-shared'      => 'közös megosztón található fájl felülírása',
+'action-upload_by_url'        => 'fájl feltöltése URL-címről',
+'action-writeapi'             => 'író API használata',
+'action-delete'               => 'lap törlése',
+'action-deleterevision'       => 'változat törlése',
+'action-deletedhistory'       => 'lap törölt laptörténetének megtekintése',
+'action-browsearchive'        => 'keresés a törölt lapok között',
+'action-undelete'             => 'lap helyreállítása',
+'action-suppressrevision'     => 'rejtett változat megtekintése és helyreállítása',
+'action-suppressionlog'       => 'privát napló megtekintése',
+'action-block'                => 'szerkesztő blokkolása',
+'action-protect'              => 'lap védelmi szintjének megváltoztatása',
+'action-import'               => 'lap importálása más wikiből',
+'action-importupload'         => 'lap importálása fájl feltöltésével',
+'action-patrol'               => 'mások szerkesztéseinek ellenőrzöttként való megjelölése',
+'action-autopatrol'           => 'saját szerkesztések ellenőrzöttként való megjelölése',
+'action-unwatchedpages'       => 'nem figyelt lapok listájának megtekintése',
+'action-trackback'            => 'trackback küldése',
+'action-mergehistory'         => 'lap laptörténetének egyesítése',
+'action-userrights'           => 'összes szerkesztő jogainak módosítása',
+'action-userrights-interwiki' => 'más wikik szerkesztői jogainak módosítása',
+'action-siteadmin'            => 'adatbázis lezárása vagy felnyitása',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|egy|$1}} változtatás',
 'recentchanges'                     => 'Friss változtatások',
+'recentchanges-legend'              => 'A friss változások beállításai',
 'recentchangestext'                 => 'Ezen a lapon a wikiben történt legutóbbi változásokat lehet nyomonkövetni.',
 'recentchanges-feed-description'    => 'Kövesd a wiki friss változtatásait ezzel a hírcsatornával.',
 'rcnote'                            => "Alább az utolsó '''{{PLURAL:$2|egy|$2}}''' nap utolsó '''{{PLURAL:$1|egy|$1}}''' változtatása látható. A lap generálásának időpontja $4, $5.",
@@ -1284,6 +1433,8 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'rc_categories'                     => 'Szűkítés kategóriákra („|� jellel válaszd el őket)',
 'rc_categories_any'                 => 'Bármelyik',
 'newsectionsummary'                 => '/* $1 */ (új szakasz)',
+'rc-enhanced-expand'                => 'Részletek megjelenítése (JavaScript szükséges)',
+'rc-enhanced-hide'                  => 'Részletek elrejtése',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Kapcsolódó változtatások',
@@ -1305,10 +1456,10 @@ A [[Special:Watchlist|figyelőlistádon]] szereplő lapok '''félkövérrel''' v
 'upload_directory_read_only'  => 'A feltöltési könyvtár ($1) nem írható a szerver által.',
 'uploaderror'                 => 'Feltöltési hiba',
 'uploadtext'                  => "Az alábbi űrlap használatával tölthetsz fel fájlokat.
-A korábban feltöltött képek megtekintéséhez vagy a köztük való kereséshez menj a [[Special:ImageList|feltöltött fájlok listájához]], a(z újra)feltöltések a [[Special:Log/upload|feltöltési naplóban]], a törlések a [[Special:Log/upload|törlési naplóban]] vannak jegyezve.
+A korábban feltöltött képek megtekintéséhez vagy a köztük való kereséshez menj a [[Special:FileList|feltöltött fájlok listájához]], a(z újra)feltöltések a [[Special:Log/upload|feltöltési naplóban]], a törlések a [[Special:Log/upload|törlési naplóban]] vannak jegyezve.
 
-Képet a következő módon illeszhetsz be egy oldalra: '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Kép.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Kép.png|alternatív szöveg]]</nowiki>''' vagy a közvetlen hivatkozáshoz használd a
+Képet a következő módon illeszhetsz be egy oldalra: '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Kép.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Kép.png|alternatív szöveg]]</nowiki>''' vagy a közvetlen hivatkozáshoz használd a
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fájl.ogg]]</nowiki>''' formát.",
 'upload-permitted'            => 'Megengedett fájltípusok: $1.',
 'upload-preferred'            => 'Támogatott fájltípusok: $1.',
@@ -1316,7 +1467,7 @@ Képet a következő módon illeszhetsz be egy oldalra: '''<nowiki>[[</nowiki>{{
 'uploadlog'                   => 'feltöltési napló',
 'uploadlogpage'               => 'Feltöltési_napló',
 'uploadlogpagetext'           => 'Lentebb látható a legutóbbi felküldések listája.
-Lásd még az [[Special:NewImages|új fáljlok galériáját]]',
+Lásd még az [[Special:NewFiles|új fáljlok galériáját]]',
 'filename'                    => 'Fájlnév',
 'filedesc'                    => 'Összegzés',
 'fileuploadsummary'           => 'Összefoglaló:',
@@ -1327,7 +1478,7 @@ Lásd még az [[Special:NewImages|új fáljlok galériáját]]',
 'ignorewarnings'              => 'Hagyd figyelmen kívül a figyelmeztetéseket',
 'minlength1'                  => 'A fájlnévnek legalább egy betűből kell állnia.',
 'illegalfilename'             => 'A „$1� lap neve olyan karaktereket tartalmaz, melyek nincsenek megengedve lapcímben. Kérlek, változtasd meg a nevet, és próbálkozz a mentéssel újra.',
-'badfilename'                 => 'A kép új neve „$1�.',
+'badfilename'                 => 'A fájl új neve „$1�.',
 'filetype-badmime'            => '„$1� MIME-típusú fájlokat nem lehet feltölteni.',
 'filetype-bad-ie-mime'        => 'A fájlt nem lehet feltölteni, mert az Internet Explorer „$1� típusúnak tekintené, ami tiltott és potenciálisan veszélyes fájltípus.',
 'filetype-unwanted-type'      => "A(z) '''„.$1�''' nem javasolt fájltípus.
@@ -1341,27 +1492,29 @@ a fájl, amit fel akarsz tölteni $2.',
 'emptyfile'                   => 'Az általad feltöltött fájl üresnek tűnik.
 Ez a fájlnévben lévő hibás karakter miatt lehet.
 Ellenőrizd, hogy valóban fel akarod-e tölteni ezt a fájlt.',
-'fileexists'                  => '<strong><tt>$1</tt></strong> névvel már létezik egy állomány. Ellenőrizd, hogy biztosan felül akarod-e írni!',
-'filepageexists'              => 'Ehhez a fájlnévhez már létezik leírás a <strong><tt>$1</tt></strong> lapon, de jelenleg nincs feltöltve ilyen nevű fájl. A leírás, amit ebbe az űrlapba írsz, nem fogja felülírni a már létezőt, és sehol nem fog megjelenni. Ha meg akarod változtatni a leírást, meg kell nyitnod szerkesztésre a lapját.',
-'fileexists-extension'        => 'Már van egy hasonló nevű feltöltött fájl:<br />
-A feltöltendő fájl neve: <strong><tt>$1</tt></strong><br />
-A már létező fájl neve: <strong><tt>$2</tt></strong><br />
-Kérjük, hogy válassz másik nevet.',
+'fileexists'                  => "'''<tt>$1</tt>''' névvel már létezik egy állomány. Ellenőrizd, hogy biztosan felül akarod-e írni!",
+'filepageexists'              => "Ehhez a fájlnévhez már létezik leírás a '''<tt>$1</tt>''' lapon, de jelenleg nincs feltöltve ilyen nevű fájl. A leírás, amit ebbe az űrlapba írsz, nem fogja felülírni a már létezőt, és sehol nem fog megjelenni. Ha meg akarod változtatni a leírást, meg kell nyitnod szerkesztésre a lapját.",
+'fileexists-extension'        => "Már van egy hasonló nevű feltöltött fájl:<br />
+A feltöltendő fájl neve: '''<tt>$1</tt>'''<br />
+A már létező fájl neve: '''<tt>$2</tt>'''<br />
+Kérjük, hogy válassz másik nevet.",
 'fileexists-thumb'            => "<center>'''Ilyen nevű fájl már van'''</center>",
-'fileexists-thumbnail-yes'    => 'A fájl egy kisméretű képnek <i>(bélyegképnek)</i> tűnik.
-Kérjük, hogy ellenőrizd a(z) <strong><tt>$1</tt></strong> fájlt.<br />
-Ha az ellenőrzött fájl ugyanakkora, mint az eredeti méretű kép, akkor nincs szükség bélyegkép feltöltésére.',
-'file-thumbnail-no'           => 'A fájlnév a(z) <strong><tt>$1</tt></strong> karakterlánccal kezdődik.
-Úgy tűnik, hogy ez egy kisméretű kép <i>(bélyegkép)</i>.
-Ha rendelkezel a teljesméretű képpel, akkor töltsd fel azt, egyébként kérjük, hogy változtasd meg a fájlnevet.',
-'fileexists-forbidden'        => 'Egy ugyanilyen nevű fájl már létezik; kérlek menj vissza és töltsd fel a fájlt egy másik néven. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Egy ugyanilyen nevű fájl már létezik a közös fájlmegosztóban; kérlek menj vissza és válassz egy másik nevet a fájlnak, ha még mindig fel akarod tölteni! [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "A fájl egy kisméretű képnek ''(bélyegképnek)'' tűnik.
+Kérjük, hogy ellenőrizd a(z) '''<tt>$1</tt>''' fájlt.<br />
+Ha az ellenőrzött fájl ugyanakkora, mint az eredeti méretű kép, akkor nincs szükség bélyegkép feltöltésére.",
+'file-thumbnail-no'           => "A fájlnév a(z) '''<tt>$1</tt>''' karakterlánccal kezdődik.
+Úgy tűnik, hogy ez egy kisméretű kép ''(bélyegkép)''.
+Ha rendelkezel a teljesméretű képpel, akkor töltsd fel azt, egyébként kérjük, hogy változtasd meg a fájlnevet.",
+'fileexists-forbidden'        => 'Már létezik egy ugyanilyen nevű fájl, és nem lehet felülírni.
+Ha még mindig fel szeretnéd tölteni a fájlt, menj vissza, és adj meg egy új nevet. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Egy ugyanilyen nevű fájl már létezik a közös fájlmegosztóban; kérlek menj vissza és válassz egy másik nevet a fájlnak, ha még mindig fel akarod tölteni! [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ez a következő {{PLURAL:$1|fájl|fájlok}} duplikátuma:',
+'file-deleted-duplicate'      => 'Egy ehhez hasonló fájlt ([[$1]]) korábban már töröltek. Ellenőrizd a fájl törlési naplóját, mielőtt újra feltöltenéd.',
 'successfulupload'            => 'A feltöltés sikerült',
 'uploadwarning'               => 'Feltöltési figyelmeztetés',
 'savefile'                    => 'Fájl mentése',
 'uploadedimage'               => '„[[$1]]� felküldve',
-'overwroteimage'              => 'feltöltötte a(z) „[[$1]]� kép új változatát',
+'overwroteimage'              => 'feltöltötte a(z) „[[$1]]� fájl új változatát',
 'uploaddisabled'              => 'Feltöltések kikapcsolva',
 'uploaddisabledtext'          => 'A fájlfeltöltés nem engedélyezett.',
 'uploadscripted'              => 'Ez a fájl olyan HTML- vagy parancsfájlkódot tartalmaz, melyet tévedésből egy webböngésző esetleg értelmezni próbálhatna.',
@@ -1375,7 +1528,7 @@ Ha rendelkezel a teljesméretű képpel, akkor töltsd fel azt, egyébként kér
 'upload-wasdeleted'           => "'''Vigyázat: egy olyan fájlt akarsz feltölteni, ami korábban már törölve lett.'''
 
 Mielőtt ismét feltöltenéd, nézd meg, miért lett korábban törölve, és ellenőrizd, hogy a törlés indoka nem érvényes-e még. A törlési naplóban a lapról az alábbi bejegyzések szerepelnek:",
-'filename-bad-prefix'         => 'Annak a fájlnak a neve, amelyet fel akarsz tölteni <strong>„$1�</strong> karakterekkel kezdődik. Ilyeneket általában a digitális kamerák adnak a fájloknak, automatikusan, azonban ezek nem írják le annak tartalmát. Válassz egy leíró nevet!',
+'filename-bad-prefix'         => "Annak a fájlnak a neve, amelyet fel akarsz tölteni '''„$1�''' karakterekkel kezdődik. Ilyeneket általában a digitális kamerák adnak a fájloknak, automatikusan, azonban ezek nem írják le annak tartalmát. Válassz egy leíró nevet!",
 'filename-prefix-blacklist'   => ' #<!-- ezt a sort hagyd így --> <pre>
 #A szintaktika a következő:
 #   * Minden a „#� karaktertől a sor végéig megjegyzésnek számít
@@ -1410,20 +1563,21 @@ PICT # ált.
 'upload_source_url'  => ' (egy érvényes, nyilvánosan elérhető URL)',
 'upload_source_file' => ' (egy fájl a számítógépeden)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ezen a speciális lapon látható az összes feltöltött fájl.
+# Special:ListFiles
+'listfiles-summary'     => 'Ezen a speciális lapon látható az összes feltöltött fájl.
 A legutóbb feltöltött fájlok vannak a lista elején.
 Az oszlopok címeire kattintva változtathatod meg a rendezést.',
-'imagelist_search_for'  => 'Keresés kép nevére:',
+'listfiles_search_for'  => 'Keresés fájl nevére:',
 'imgfile'               => 'fájl',
-'imagelist'             => 'Képlista',
-'imagelist_date'        => 'Dátum',
-'imagelist_name'        => 'Név',
-'imagelist_user'        => 'feltöltő',
-'imagelist_size'        => 'Méret',
-'imagelist_description' => 'Leírás',
-
-# Image description page
+'listfiles'             => 'Fájllista',
+'listfiles_date'        => 'Dátum',
+'listfiles_name'        => 'Név',
+'listfiles_user'        => 'feltöltő',
+'listfiles_size'        => 'Méret',
+'listfiles_description' => 'Leírás',
+'listfiles_count'       => 'Változatok',
+
+# File description page
 'filehist'                       => 'Fájltörténet',
 'filehist-help'                  => 'Kattints egy időpontra, hogy a fájl akkori állapotát láthasd.',
 'filehist-deleteall'             => 'összes törlése',
@@ -1431,16 +1585,22 @@ Az oszlopok címeire kattintva változtathatod meg a rendezést.',
 'filehist-revert'                => 'visszaállít',
 'filehist-current'               => 'aktuális',
 'filehist-datetime'              => 'Dátum/idő',
+'filehist-thumb'                 => 'Bélyegkép',
+'filehist-thumbtext'             => 'Bélyegkép a $1-kori változatról',
+'filehist-nothumb'               => 'Nincs bélyegkép',
 'filehist-user'                  => 'Feltöltő',
 'filehist-dimensions'            => 'Felbontás',
 'filehist-filesize'              => 'Fájlméret',
 'filehist-comment'               => 'Megjegyzés',
-'imagelinks'                     => 'Képhivatkozások',
+'imagelinks'                     => 'Fájlhivatkozások',
 'linkstoimage'                   => 'Az alábbi {{PLURAL:$1|lap hivatkozik|lapok hivatkoznak}} erre a fájlra:',
-'nolinkstoimage'                 => 'Erre a képre nem hivatkozik lap.',
+'linkstoimage-more'              => 'Több, mint {{PLURAL:$1|egy|$1}} oldal hivatkozik erre a fájlra.
+A következő lista csak az {{PLURAL:$1|első linket|első $1 linket}} tartalmazza.
+A teljes lista [[Special:WhatLinksHere/$2|ezen a lapon]] található meg.',
+'nolinkstoimage'                 => 'Erre a fájlra nem hivatkozik lap.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|További hivatkozások]] megtekintése',
 'redirectstofile'                => 'A következő {{PLURAL:$1|fájl|$1 fájl}} van átirányítva erre a névre:',
-'duplicatesoffile'               => 'A következő {{PLURAL:$1|fájl|$1 fájl}} ennek a fájlnak a duplikátuma:',
+'duplicatesoffile'               => 'A következő {{PLURAL:$1|fájl|$1 fájl}} ennek a fájlnak a duplikátuma ([[Special:FileDuplicateSearch/$2|további részletek]]):',
 'sharedupload'                   => 'Ez a fájl egy megosztott feltöltés, és más projektek használhatják.',
 'shareduploadwiki'               => 'Lásd a [$1 fájl leírólapját] a további információkért.',
 'shareduploadwiki-desc'          => 'A $1 található leírás alább látható.',
@@ -1467,7 +1627,7 @@ Az oszlopok címeire kattintva változtathatod meg a rendezést.',
 # File deletion
 'filedelete'                  => '$1 törlése',
 'filedelete-legend'           => 'Fájl törlése',
-'filedelete-intro'            => "Törölni készülsz a következő médiafájlt: '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Törölni készülsz a(z) '''[[Media:$1|$1]]''' médiafájlt, a teljes fájltörténetével együtt.",
 'filedelete-intro-old'        => '<span class="plainlinks">A(z) \'\'\'[[Media:$1|$1]]\'\'\' fájl, dátum: [$4 $3, $2] változatát törlöd.</span>',
 'filedelete-comment'          => 'Indoklás:',
 'filedelete-submit'           => 'Törlés',
@@ -1475,8 +1635,6 @@ Az oszlopok címeire kattintva változtathatod meg a rendezést.',
 'filedelete-success-old'      => "A(z) '''[[Media:$1|$1]]''' $3, $2-kori változata sikeresen törölve lett.",
 'filedelete-nofile'           => "'''$1''' nem létezik.",
 'filedelete-nofile-old'       => "A(z) '''$1''' fájlnak nincs a megadott tulajdonságokkal rendelkező archivált változata.",
-'filedelete-iscurrent'        => 'A fájl aktuális változatát próbáltad meg törölni.
-Először állítsd vissza az egyik régebbi változatot.',
 'filedelete-otherreason'      => 'Más/további ok:',
 'filedelete-reason-otherlist' => 'Más ok',
 'filedelete-reason-dropdown'  => '*�ltalános törlési okok
@@ -1504,28 +1662,31 @@ Ellenőrizd a meglévő hivatkozásokat, mielőtt törölnéd őket.',
 
 # Random page
 'randompage'         => 'Lap találomra',
-'randompage-nopages' => 'Ebben a névtérben nincsenek lapok.',
+'randompage-nopages' => 'A(z) „$1� névtérben nincsenek lapok.',
 
 # Random redirect
 'randomredirect'         => '�tirányítás találomra',
-'randomredirect-nopages' => 'Ebben a névtérben nincsenek átirányítások.',
+'randomredirect-nopages' => 'A(z) „$1� névtérben nincsenek átirányítások.',
 
 # Statistics
-'statistics'             => 'Statisztika',
-'sitestats'              => 'Tartalmi statisztika',
-'userstats'              => 'Szerkesztői statisztika',
-'sitestatstext'          => "A wikiben jelenleg '''{{PLURAL:$2|egy|$2}}''' szócikk található.
-Ebben nincsenek benne a vitalapok, az átirányítások,
-a közösségi lapok, a csonkok és más olyan lapok, amik nem számítanak igazi szócikkeknek.
-Ezeket is beleszámítva '''{{PLURAL:$1|egy|$1}}''' lapunk van.
-
-Összesen '''{{PLURAL:$8|egy|$8}}''' fájlt töltöttek fel.
-
-Összesen '''{{PLURAL:$3|egy|$3}}''' alkalommal tekintették meg az oldalakat, és '''{{PLURAL:$4|egy|$4}}''' szerkesztés történt a {{SITENAME}} indulása óta, ami oldalanként '''$5''' szerkesztésnek és '''$6''' megtekintésnek számít.
-
-A [http://www.mediawiki.org/wiki/Manual:Job_queue szerver számára sorban álló feladatok] száma '''$7'''.",
-'userstatstext'          => "Jelenleg '''{{PLURAL:$1|egy|$1}}''' regisztrált szerkesztőnk van; közülük '''{{PLURAL:$2|egy|$2}}''' ($4%) $5.",
-'statistics-mostpopular' => 'Legtöbbször megtekintett lapok',
+'statistics'                   => 'Statisztika',
+'statistics-header-pages'      => 'Lapstatisztikák',
+'statistics-header-edits'      => 'Szerkesztési statisztika',
+'statistics-header-views'      => 'Látogatási statisztika',
+'statistics-header-users'      => 'Szerkesztői statisztika',
+'statistics-articles'          => 'Tartalommal rendelkező lapok',
+'statistics-pages'             => 'Lapok száma',
+'statistics-pages-desc'        => 'A wikiben található összes lap, beleértve a vitalapokat és az átirányításokat is',
+'statistics-files'             => 'Feltöltött fájlok',
+'statistics-edits'             => 'Szerkesztések száma a(z) {{SITENAME}} indulása óta',
+'statistics-edits-average'     => 'Szerkesztések átlagos száma laponként',
+'statistics-views-total'       => 'Összes megtekintés',
+'statistics-views-peredit'     => 'Megtekintések szerkesztésenként',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue A szerver által végrehajtandó feladatok] száma',
+'statistics-users'             => 'Regisztrált [[Speciális:Szerkesztők listája|szerkesztők]]',
+'statistics-users-active'      => 'Aktív szerkesztők',
+'statistics-users-active-desc' => 'Szerkesztők, akik csináltak valamit az elmúlt $1 napban',
+'statistics-mostpopular'       => 'Legtöbbször megtekintett lapok',
 
 'disambiguations'      => 'Egyértelműsítő lapok',
 'disambiguationspage'  => 'Template:Egyért',
@@ -1539,7 +1700,7 @@ Egy oldal egyértelműsítő lapnak számít, ha tartalmazza a [[MediaWiki:Disam
 'double-redirect-fixer'      => '�tirányításjavító',
 
 'brokenredirects'        => 'Nem létező lapra mutató átirányítások',
-'brokenredirectstext'    => 'Az alábbi átirányítások nem létező lapokra mutatnak.',
+'brokenredirectstext'    => 'A következő átirányítások nem létező lapokra hivatkoznak:',
 'brokenredirects-edit'   => '(szerkesztés)',
 'brokenredirects-delete' => '(törlés)',
 
@@ -1562,14 +1723,15 @@ Egy oldal egyértelműsítő lapnak számít, ha tartalmazza a [[MediaWiki:Disam
 'lonelypagestext'         => 'A következő lapok nincsenek linkelve vagy beillesztve más lapokra a(z) {{SITENAME}} wikin.',
 'uncategorizedpages'      => 'Kategorizálatlan lapok',
 'uncategorizedcategories' => 'Kategorizálatlan kategóriák',
-'uncategorizedimages'     => 'Kategorizálatlan képek',
+'uncategorizedimages'     => 'Kategorizálatlan fájlok',
 'uncategorizedtemplates'  => 'Kategorizálatlan sablonok',
 'unusedcategories'        => 'Nem használt kategóriák',
-'unusedimages'            => 'Nem használt képek',
+'unusedimages'            => 'Nem használt fájlok',
 'popularpages'            => 'Népszerű lapok',
 'wantedcategories'        => 'Keresett kategóriák',
 'wantedpages'             => 'Keresett lapok',
-'missingfiles'            => 'Hiányzó fájlok',
+'wantedfiles'             => 'Keresett fájlok',
+'wantedtemplates'         => 'Keresett sablonok',
 'mostlinked'              => 'Legtöbbet hivatkozott lapok',
 'mostlinkedcategories'    => 'Legtöbbet hivatkozott kategóriák',
 'mostlinkedtemplates'     => 'Legtöbbet hivatkozott sablonok',
@@ -1583,12 +1745,15 @@ Egy oldal egyértelműsítő lapnak számít, ha tartalmazza a [[MediaWiki:Disam
 'deadendpagestext'        => 'Az itt található lapok nem kapcsolódnak hivatkozásokkal ezen wiki más oldalaihoz.',
 'protectedpages'          => 'Védett lapok',
 'protectedpages-indef'    => 'Csak a meghatározatlan idejű védelmek',
+'protectedpages-cascade'  => 'Csak a kaszkádvédelmek',
 'protectedpagestext'      => 'A következő lapok átnevezés vagy szerkesztés ellen védettek',
 'protectedpagesempty'     => 'Jelenleg nincsenek ilyen paraméterekkel védett lapok.',
 'protectedtitles'         => 'Létrehozás ellen védett lapok',
 'protectedtitlestext'     => 'A következő lapok védve vannak a létrehozás ellen',
 'protectedtitlesempty'    => 'Jelenleg nincsenek ilyen típusú védett lapok.',
 'listusers'               => 'Szerkesztők',
+'listusers-editsonly'     => 'Csak a szerkesztéssel rendelkező szerkesztők mutatása',
+'usereditcount'           => '{{PLURAL:$1|egy|$1}} szerkesztés',
 'newpages'                => 'Új lapok',
 'newpages-username'       => 'Felhasználói név:',
 'ancientpages'            => 'Régóta nem változott szócikkek',
@@ -1612,14 +1777,13 @@ ellenére, hogy aktívan használják.</p>',
 'booksources-go'            => 'Keresés',
 'booksources-text'          => 'Alább látható a másik webhelyekre mutató hivatkozások listája, ahol új és használt könyveket árulnak, és
 további információkat lelhetsz ott az általad keresett könyvekről:',
+'booksources-invalid-isbn'  => 'A megadott ISBN hibásnak tűnik; ellenőrizd, hogy jól másoltad-e át az eredeti forrásból.',
 
 # Special:Log
 'specialloguserlabel'  => 'Felhasználó:',
 'speciallogtitlelabel' => 'Cím:',
 'log'                  => 'Rendszernaplók',
 'all-logs-page'        => 'Rendszernaplók',
-'log-search-legend'    => 'Naplók keresése',
-'log-search-submit'    => 'Menj',
 'alllogstext'          => 'A(z) {{SITENAME}} naplóinak összesített listája.
 A napló típusának, a szerkesztő nevének (kis- és nagybetűérzékeny), vagy az érintett lap kiválasztásával (ez is kis- és nagybetűérzékeny) szűkítheted a találatok listáját.',
 'logempty'             => 'Nincs illeszkedő naplóbejegyzés.',
@@ -1631,6 +1795,7 @@ A napló típusának, a szerkesztő nevének (kis- és nagybetűérzékeny), vag
 'nextpage'          => 'Következő lap ($1)',
 'prevpage'          => 'Előző oldal ($1)',
 'allpagesfrom'      => 'Lapok listázása a következő címtől kezdve:',
+'allpagesto'        => 'Lapok listázása a következő címig:',
 'allarticles'       => 'Az összes lap listája',
 'allinnamespace'    => 'Összes lap ($1 névtér)',
 'allnotinnamespace' => 'Minden olyan lap, ami nem a(z) $1 névtérben van.',
@@ -1650,46 +1815,73 @@ Lásd még a [[Special:WantedCategories|keresett kategóriák]] listáját.',
 'special-categories-sort-count' => 'rendezés elemszám szerint',
 'special-categories-sort-abc'   => 'rendezés ABC szerint',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Törölt szerkesztések',
+
+# Special:LinkSearch
+'linksearch'       => 'Külső hivatkozások',
+'linksearch-pat'   => 'Keresett minta:',
+'linksearch-ns'    => 'Névtér:',
+'linksearch-ok'    => 'keresés',
+'linksearch-text'  => 'Helyettesítő karaktereket is lehet használni, például "*.wikipedia.org".<br />
+Támogatott protokollok: <tt>$1</tt>',
+'linksearch-line'  => '$1 hivatkozva innen: $2',
+'linksearch-error' => 'Helyettesítő karakterek csak a cím elején szerepelhetnek.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Szerkesztők listázása a következő névtől kezdve:',
 'listusers-submit'   => 'Megjelenítés',
 'listusers-noresult' => 'Nem található szerkesztő.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Új szerkesztők naplója',
+'newuserlogpagetext'          => 'Ez a napló az újonnan regisztrált szerkesztők listáját tartalmazza.',
+'newuserlog-byemail'          => 'a jelszót kiküldtük a megadott e-mail címre',
+'newuserlog-create-entry'     => 'új szerkesztőként regisztrált',
+'newuserlog-create2-entry'    => 'új felhasználói fiókot hozott létre $1 néven',
+'newuserlog-autocreate-entry' => 'Felhasználói fiók automatikusan létrehozva',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Szerkesztői csoportok jogai',
-'listgrouprights-summary'  => 'Lenn láthatóak a wikiben létező szerkesztői csoportok, valamint az azokhoz tartozó jogok.
+'listgrouprights'                 => 'Szerkesztői csoportok jogai',
+'listgrouprights-summary'         => 'Lenn láthatóak a wikiben létező szerkesztői csoportok, valamint az azokhoz tartozó jogok.
 Az egyes csoportokról további információt [[{{MediaWiki:Listgrouprights-helppage}}|itt]] találhatsz.',
-'listgrouprights-group'    => 'Csoport',
-'listgrouprights-rights'   => 'Jogok',
-'listgrouprights-helppage' => 'Help:Csoportok jogai',
-'listgrouprights-members'  => '(tagok listája)',
+'listgrouprights-group'           => 'Csoport',
+'listgrouprights-rights'          => 'Jogok',
+'listgrouprights-helppage'        => 'Help:Csoportok jogai',
+'listgrouprights-members'         => '(tagok listája)',
+'listgrouprights-addgroup'        => '{{PLURAL:$2|ehhez a csoporthoz|ezekhez a csoportokhoz}} adhat szerkesztőket: $1',
+'listgrouprights-removegroup'     => '{{PLURAL:$2|ebből a csoportból|ezekből a csoportokból}} távolíthat el szerkesztőket: $1',
+'listgrouprights-addgroup-all'    => 'bármelyik csoporthoz adhat szerkesztőket',
+'listgrouprights-removegroup-all' => 'bármelyik csoportból távolíthat el szerkesztőket',
 
 # E-mail user
-'mailnologin'     => 'Nincs feladó',
-'mailnologintext' => 'Ahhoz hogy másoknak e-mailt küldhess, [[Special:UserLogin|be kell jelentkezned]] és meg kell adnod egy érvényes e-mail címet a [[Special:Preferences|beállításaidban]].',
-'emailuser'       => 'E-mail küldése ezen szerkesztőnek',
-'emailpage'       => 'E-mail küldése',
-'emailpagetext'   => 'A szerkesztő e-mail-címére ezen űrlap kitöltésével üzenetet tudsz küldeni.
+'mailnologin'      => 'Nincs feladó',
+'mailnologintext'  => 'Ahhoz hogy másoknak e-mailt küldhess, [[Special:UserLogin|be kell jelentkezned]] és meg kell adnod egy érvényes e-mail címet a [[Special:Preferences|beállításaidban]].',
+'emailuser'        => 'E-mail küldése ezen szerkesztőnek',
+'emailpage'        => 'E-mail küldése',
+'emailpagetext'    => 'A szerkesztő e-mail-címére ezen űrlap kitöltésével üzenetet tudsz küldeni.
 Feladóként a [[Special:Preferences|beállításaid]]nál megadott e-mail-címed fog szerepelni, így a címzett közvetlenül neked tud majd válaszolni.',
-'usermailererror' => 'A postázó objektum által visszaadott hiba:',
-'defemailsubject' => '{{SITENAME}} e-mail',
-'noemailtitle'    => 'Nincs e-mail cím',
-'noemailtext'     => 'Ez a felhasználó nem adott meg e-mail címet, vagy
-nem kíván másoktól leveleket kapni.',
-'emailfrom'       => 'Feladó:',
-'emailto'         => 'Címzett:',
-'emailsubject'    => 'Téma:',
-'emailmessage'    => 'Ãœzenet:',
-'emailsend'       => 'Küldés',
-'emailccme'       => 'Az üzenet másolatát küldje el nekem is e-mailben.',
-'emailccsubject'  => '$1 szerkesztőnek küldött $2 tárgyú üzenet másolata',
-'emailsent'       => 'E-mail elküldve',
-'emailsenttext'   => 'Az e-mail üzenetedet elküldtem.',
-'emailuserfooter' => 'Ezt az e-mailt $1 küldte $2 számára, az „E-mail küldése ezen szerkesztőnek� funkció használatával a(z) {{SITENAME}} wikin.',
+'usermailererror'  => 'A levélküldő objektum hibával tért vissza:',
+'defemailsubject'  => '{{SITENAME}} e-mail',
+'noemailtitle'     => 'Nincs e-mail cím',
+'noemailtext'      => 'Ez a szerkesztő nem adott meg érvényes e-mail címet.',
+'nowikiemailtitle' => 'Nem küldhető e-mail üzenet',
+'nowikiemailtext'  => 'Ez a szerkesztő nem kíván másoktól e-mail üzeneteket fogadni.',
+'email-legend'     => 'E-mail küldése egy másik {{SITENAME}}-szerkesztőnek',
+'emailfrom'        => 'Feladó:',
+'emailto'          => 'Címzett:',
+'emailsubject'     => 'Téma:',
+'emailmessage'     => 'Ãœzenet:',
+'emailsend'        => 'Küldés',
+'emailccme'        => 'Az üzenet másolatát küldje el nekem is e-mailben.',
+'emailccsubject'   => '$1 szerkesztőnek küldött $2 tárgyú üzenet másolata',
+'emailsent'        => 'E-mail elküldve',
+'emailsenttext'    => 'Az e-mail üzenetedet elküldtem.',
+'emailuserfooter'  => 'Ezt az e-mailt $1 küldte $2 számára, az „E-mail küldése ezen szerkesztőnek� funkció használatával a(z) {{SITENAME}} wikin.',
 
 # Watchlist
 'watchlist'            => 'Figyelőlistám',
-'mywatchlist'          => 'figyelőlistám',
+'mywatchlist'          => 'Figyelőlistám',
 'watchlistfor'         => "('''$1''' részére)",
 'nowatchlist'          => 'Nincs lap a figyelőlistádon.',
 'watchlistanontext'    => 'A figyelőlistád megtekintéséhez és szerkesztéséhez $1.',
@@ -1716,12 +1908,7 @@ Ezután minden, a lapon vagy annak vitalapján történő változást ott fogsz
 'iteminvalidname'      => "Probléma a '$1' elemmel: érvénytelen név...",
 'wlnote'               => "Az utolsó '''{{PLURAL:$2|egy|$2}}''' óra '''{{PLURAL:$1|egy|$1}}''' változtatása látható az alábbiakban.",
 'wlshowlast'           => 'Az elmúlt $1 órában | $2 napon | $3 történt változtatások legyenek láthatóak',
-'watchlist-show-bots'  => 'Botok szerkesztéseinek megjelenítése',
-'watchlist-hide-bots'  => 'Botok szerkesztéseinek elrejtése',
-'watchlist-show-own'   => 'Saját szerkesztések megjelenítése',
-'watchlist-hide-own'   => 'Saját szerkesztések elrejtése',
-'watchlist-show-minor' => 'Apró módosítások megjelenítése',
-'watchlist-hide-minor' => 'Apró módosítások elrejtése',
+'watchlist-options'    => 'A figyelőlista beállításai',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Figyelés...',
@@ -1740,7 +1927,7 @@ Ezután minden, a lapon vagy annak vitalapján történő változást ott fogsz
 'enotif_body'                  => 'Kedves $WATCHINGUSERNAME!
 
 
-A(z) {{SITENAME}} $PAGETITLE című oldalát $CHANGEDORCREATED $PAGEEDITDATE-n $PAGEEDITOR, a jelenlegi verziót lásd a $PAGETITLE_URL webcímen.
+$PAGEEDITDATE-n $PAGEEDITOR $CHANGEDORCREATED a(z) {{SITENAME}} $PAGETITLE című oldalát; a jelenlegi verziót a $PAGETITLE_URL webcímen találod.
 
 $NEWPAGE
 
@@ -1750,72 +1937,75 @@ A szerkesztő elérhetősége:
 levél: $PAGEEDITOR_EMAIL
 wiki: $PAGEEDITOR_WIKI
 
-Ha nem keresed fel ezt az oldalt, akkor nem kapsz értesítést a további változtatásokról. A figyelőlistádon lévő lapok értesítési jelzőit is alaphelyzetbe állítottad.
+Amíg nem keresed fel az oldalt, vagy nem állítod alaphelyzetbe a figyelőlistádnál, nem kapsz értesítést a további változtatásokról.
 
              Baráti üdvözlettel: {{SITENAME}} értesítő rendszere
 
 --
-A figyelőlistád beállításainak módosításához keresd fel a
-{{fullurl:{{ns:special}}:Figyelőlistám/edit}} címet
+A figyelőlistád módosításához keresd fel a
+{{fullurl:{{ns:special}}:Watchlist/edit}} címet
 
 Visszajelzés és további segítség:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Lap törlése',
-'confirm'                     => 'Megerősítés',
-'excontent'                   => 'a lap tartalma: „$1�',
-'excontentauthor'             => 'a lap tartalma: „$1� (és csak „$2� szerkesztette)',
-'exbeforeblank'               => 'az eltávolítás előtti tartalom: „$1�',
-'exblank'                     => 'a lap üres volt',
-'delete-confirm'              => '$1 törlése',
-'delete-legend'               => 'Törlés',
-'historywarning'              => 'Figyelem: a lapnak, amit törölni készülsz, több változata van:',
-'confirmdeletetext'           => 'Egy lap vagy kép teljes laptörténetével együtti
-végleges törlésére készülsz.
-Kérjük, erősítsd meg, hogy valóban ezt szándékozod tenni,
-átlátod a következményeit, és a [[{{MediaWiki:Policy-url}}|törlési irányelvekkel]]
-összhangban cselekedsz.',
-'actioncomplete'              => 'Művelet végrehajtva',
-'deletedtext'                 => 'A(z) „<nowiki>$1</nowiki>� lapot törölted.
+# Delete
+'deletepage'             => 'Lap törlése',
+'confirm'                => 'Megerősítés',
+'excontent'              => 'a lap tartalma: „$1�',
+'excontentauthor'        => 'a lap tartalma: „$1� (és csak „$2� szerkesztette)',
+'exbeforeblank'          => 'az eltávolítás előtti tartalom: „$1�',
+'exblank'                => 'a lap üres volt',
+'delete-confirm'         => '$1 törlése',
+'delete-legend'          => 'Törlés',
+'historywarning'         => 'Figyelem: a lapnak, amit törölni készülsz, több változata van:',
+'confirmdeletetext'      => 'Egy lapot vagy fájlt készülsz törölni a teljes laptörténetével együtt.
+Kérjük, erősítsd meg, hogy valóban ezt szeretnéd tenni, átlátod a következményeit, és hogy a műveletet a [[{{MediaWiki:Policy-url}}|törlési irányelvekkel]] összhangban végzed.',
+'actioncomplete'         => 'Művelet végrehajtva',
+'deletedtext'            => 'A(z) „<nowiki>$1</nowiki>� lapot törölted.
 A legutóbbi törlések listájához lásd a $2 lapot.',
-'deletedarticle'              => '„$1� törölve',
-'suppressedarticle'           => 'elrejtette a(z) „[[$1]]� szócikket',
-'dellogpage'                  => 'Törlési_napló',
-'dellogpagetext'              => 'Itt láthatók a legutóbb törölt lapok.',
-'deletionlog'                 => 'törlési napló',
-'reverted'                    => 'Visszaállítva a korábbi változatra',
-'deletecomment'               => 'A törlés oka',
-'deleteotherreason'           => 'További indoklás:',
-'deletereasonotherlist'       => 'Egyéb indok',
-'deletereason-dropdown'       => '*Gyakori törlési okok
+'deletedarticle'         => '„$1� törölve',
+'suppressedarticle'      => 'elrejtette a(z) „[[$1]]� szócikket',
+'dellogpage'             => 'Törlési_napló',
+'dellogpagetext'         => 'Itt láthatók a legutóbb törölt lapok.',
+'deletionlog'            => 'törlési napló',
+'reverted'               => 'Visszaállítva a korábbi változatra',
+'deletecomment'          => 'A törlés oka',
+'deleteotherreason'      => 'További indoklás:',
+'deletereasonotherlist'  => 'Egyéb indok',
+'deletereason-dropdown'  => '*Gyakori törlési okok
 ** Szerző kérésére
 ** Jogsértő
 ** Vandalizmus',
-'delete-edit-reasonlist'      => 'Törlési okok szerkesztése',
-'delete-toobig'               => 'Ennek a lapnak a laptörténete több mint {{PLURAL:$1|egy|$1}} változatot őriz. A szervert kímélendő az ilyen lapok törlése nem engedélyezett.',
-'delete-warning-toobig'       => 'Ennek a lapnak a laptörténete több mint {{PLURAL:$1|egy|$1}} változatot őriz. Törlése fennakadásokat okozhat a wiki adatbázis-műveleteiben; óvatosan járj el.',
-'rollback'                    => 'Szerkesztések visszaállítása',
-'rollback_short'              => 'Visszaállítás',
-'rollbacklink'                => 'visszaállítás',
-'rollbackfailed'              => 'A visszaállítás nem sikerült',
-'cantrollback'                => 'Nem lehet visszaállítani: az utolsó szerkesztést végző felhasználó az egyetlen, aki a lapot szerkesztette.',
-'alreadyrolled'               => '[[:$1]] utolsó, [[User:$2|$2]] ([[User talk:$2|vita]] | [[Special:Contributions/$2|{{int:contribslink}}]]) általi szerkesztését nem lehet visszavonni:
+'delete-edit-reasonlist' => 'Törlési okok szerkesztése',
+'delete-toobig'          => 'Ennek a lapnak a laptörténete több mint {{PLURAL:$1|egy|$1}} változatot őriz. A szervert kímélendő az ilyen lapok törlése nem engedélyezett.',
+'delete-warning-toobig'  => 'Ennek a lapnak a laptörténete több mint {{PLURAL:$1|egy|$1}} változatot őriz. Törlése fennakadásokat okozhat a wiki adatbázis-műveleteiben; óvatosan járj el.',
+
+# Rollback
+'rollback'         => 'Szerkesztések visszaállítása',
+'rollback_short'   => 'Visszaállítás',
+'rollbacklink'     => 'visszaállítás',
+'rollbackfailed'   => 'A visszaállítás nem sikerült',
+'cantrollback'     => 'Nem lehet visszaállítani: az utolsó szerkesztést végző felhasználó az egyetlen, aki a lapot szerkesztette.',
+'alreadyrolled'    => '[[:$1]] utolsó, [[User:$2|$2]] ([[User talk:$2|vita]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) általi szerkesztését nem lehet visszavonni:
 időközben valaki már visszavonta, vagy szerkesztette a lapot.
 
-Az utolsó szerkesztést [[User:$3|$3]] ([[User talk:$3|vita]] | [[Special:Contributions/$3|{{int:contribslink}}]]) végezte.',
-'editcomment'                 => 'A változtatás összefoglalója „<i>$1</i>� volt.', # only shown if there is an edit comment
-'revertpage'                  => 'Visszaállítottam a lap korábbi változatát: [[Special:Contributions/$2|$2]]  ([[User talk:$2|vita]]) szerkesztéséről [[User:$1|$1]] szerkesztésére', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 szerkesztéseit visszaállítottam $2 utolsó változatára.',
-'sessionfailure'              => 'Úgy látszik, hogy probléma van a bejelentkezési munkameneteddel;
+Az utolsó szerkesztést [[User:$3|$3]] ([[User talk:$3|vita]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) végezte.',
+'editcomment'      => "A szerkesztési összefoglaló „''$1''� volt.", # only shown if there is an edit comment
+'revertpage'       => 'Visszaállítottam a lap korábbi változatát: [[Special:Contributions/$2|$2]]  ([[User talk:$2|vita]]) szerkesztéséről [[User:$1|$1]] szerkesztésére', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 szerkesztéseit visszaállítottam $2 utolsó változatára.',
+'sessionfailure'   => 'Úgy látszik, hogy probléma van a bejelentkezési munkameneteddel;
 ez a művelet a munkamenet eltérítése miatti óvatosságból megszakadt.
 Kérjük, hogy nyomd meg a "vissza" gombot, és töltsd le újra az oldalt, ahonnan jöttél, majd próbáld újra.',
+
+# Protect
 'protectlogpage'              => 'Lapvédelmi_napló',
 'protectlogtext'              => 'Ez a lapok lezárásának és megnyitásának listája. A [[Special:ProtectedPages|védett lapok listáján]] megtekintheted a jelenleg is érvényben lévő védelmeket.',
 'protectedarticle'            => 'levédte a(z) [[$1]] lapot',
 'modifiedarticleprotection'   => 'a védelmi szint a következőre változott: "[[$1]]"',
 'unprotectedarticle'          => 'eltávolította a védelmet a(z) „[[$1]]� lapról',
+'movedarticleprotection'      => 'áthelyezte „[[$2]]� védelmi beállításait „[[$1]]� cím alá',
 'protect-title'               => '„$1� levédése',
+'prot_1movedto2'              => '[[$1]] lapot átneveztem [[$2]] névre',
 'protect-legend'              => 'Levédés megerősítése',
 'protectcomment'              => 'A védelem oka',
 'protectexpiry'               => 'Időtartam',
@@ -1823,23 +2013,35 @@ Kérjük, hogy nyomd meg a "vissza" gombot, és töltsd le újra az oldalt, ahon
 'protect_expiry_old'          => 'A lejárati idő a múltban van.',
 'protect-unchain'             => '�tnevezési jogok állítása külön',
 'protect-text'                => 'Itt megtekintheted és módosíthatod a(z) [[$1]] lap védelmi szintjét. Légy szives, tartsd be a védett lapokkal kapcsolatos előírásokat.',
-'protect-locked-blocked'      => 'Nem változtathatod meg a védelmi szinteket, amíg blokkolnak. Itt vannak a(z)
-<strong>$1</strong> lap jelenlegi beállításai:',
-'protect-locked-dblock'       => 'A védelmi szinteket egy aktív adatbázis zárolás miatt nem változtathatod meg.
-Itt vannak a(z) <strong>$1</strong> lap jelenlegi beállításai:',
-'protect-locked-access'       => 'A fiókod számára nem engedélyezett a védelmi szintek megváltoztatása.
-Itt vannak a(z) <strong>$1</strong> lap jelenlegi beállításai:',
+'protect-locked-blocked'      => "Nem változtathatod meg a védelmi szinteket, amíg blokkolnak. Itt vannak a(z)
+'''$1''' lap jelenlegi beállításai:",
+'protect-locked-dblock'       => "A védelmi szinteket egy aktív adatbázis zárolás miatt nem változtathatod meg.
+Itt vannak a(z) '''$1''' lap jelenlegi beállításai:",
+'protect-locked-access'       => "A fiókod számára nem engedélyezett a védelmi szintek megváltoztatása.
+Itt vannak a(z) '''$1''' lap jelenlegi beállításai:",
 'protect-cascadeon'           => 'A lap le van védve, mert {{PLURAL:$1|tartalmazza az alábbi lap, amelyen|tartalmazzák az alábbi lapok, amelyeken}}
 be van kapcsolva a kaszkád védelem.
 Megváltoztathatod ezen lap védelmi szintjét, de az nem lesz hatással a kaszkád védelemre.',
-'protect-default'             => '(alapértelmezett)',
+'protect-default'             => 'Minden szerkesztő számára engedélyezett',
 'protect-fallback'            => '"$1" engedély szükséges hozzá',
-'protect-level-autoconfirmed' => 'Csak regisztrált felhasználók',
+'protect-level-autoconfirmed' => 'Nem és frissen regisztrált szerkesztők blokkolása',
 'protect-level-sysop'         => 'Csak adminisztrátorok',
 'protect-summary-cascade'     => 'kaszkád védelem',
 'protect-expiring'            => 'lejár: $1 (UTC)',
+'protect-expiry-indefinite'   => 'határozatlan',
 'protect-cascade'             => 'Kaszkád védelem – védjen le minden lapot, amit ez a lap tartalmaz.',
 'protect-cantedit'            => 'Nem változtathatod meg a lap védelmi szintjét, mert nincs jogod a szerkesztéséhez.',
+'protect-othertime'           => 'Más időtartam:',
+'protect-othertime-op'        => 'más időtartam',
+'protect-existing-expiry'     => 'Jelenleg érvényben lévő lejárati idő: $2, $3',
+'protect-otherreason'         => 'További okok:',
+'protect-otherreason-op'      => 'további okok',
+'protect-dropdown'            => '*�ltalános védelmi okok
+** Gyakori vandalizmus
+** Gyakori spamelés
+** Nagyforgalmú lap',
+'protect-edit-reasonlist'     => 'Lapvédelem oka',
+'protect-expiry-options'      => '1 óra:1 hour,1 nap:1 day,1 hét:1 week,2 hét:2 weeks,1 hónap:1 month,3 hónap:3 months,6 hónap:6 months,1 év:1 year,végtelen:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Engedély:',
 'restriction-level'           => 'Korlátozási szint:',
 'minimum-size'                => 'Legkisebb méret',
@@ -1848,7 +2050,7 @@ Megváltoztathatod ezen lap védelmi szintjét, de az nem lesz hatással a kaszk
 
 # Restrictions (nouns)
 'restriction-edit'   => 'Szerkesztés',
-'restriction-move'   => '�tmozgatás',
+'restriction-move'   => '�tnevezés',
 'restriction-create' => 'Létrehozás',
 'restriction-upload' => 'Feltöltés',
 
@@ -1862,8 +2064,8 @@ Megváltoztathatod ezen lap védelmi szintjét, de az nem lesz hatással a kaszk
 'undeletepage'                 => 'Törölt lapok megtekintése és helyreállítása',
 'undeletepagetitle'            => "'''A(z) [[:$1]] lap törölt változatai alább láthatók.'''",
 'viewdeletedpage'              => 'Törölt lapok megtekintése',
-'undeletepagetext'             => 'Az alábbi lapokat törölték, de még helyreállíthatók az archívumból
-(az archívumot időről időre üríthetik!).',
+'undeletepagetext'             => 'Az alábbi {{PLURAL:$1|lapot törölték, de még helyreállítható|$1 lapot törölték, de még helyreállíthatók}} az archívumból.
+Az archívumot időről időre üríthetik!',
 'undelete-fieldset-title'      => 'Változatok helyreállítása',
 'undeleteextrahelp'            => "A lap teljes helyreállításához ne jelölj be egy jelölőnégyzetet sem, csak kattints a '''''Helyreállítás''''' gombra.
 A lap részleges helyreállításához jelöld be a kívánt változatok melletti jelölőnégyzeteket, és kattints a '''''Helyreállítás''''' gombra.
@@ -1878,13 +2080,14 @@ melyek megtekintése a számodra nem engedélyezett, nem kerülnek visszaállít
 'undeletehistorynoadmin'       => 'Ezt a szócikket törölték. A törlés okát alább az összegzésben
 láthatod, az oldalt a törlés előtt szerkesztő felhasználók részleteivel együtt. Ezeknek
 a törölt változatoknak a tényleges szövege csak az adminisztrátorok számára hozzáférhető.',
-'undelete-revision'            => '$1 változatának törlése kész ($2), $3:',
+'undelete-revision'            => '$1 $4, $5-kori törölt változata (szerző: $3).',
 'undeleterevision-missing'     => 'Érvénytelen vagy hiányzó változat. Lehet, hogy rossz hivatkozásod van, ill. a
 változatot visszaállították vagy eltávolították az archívumból.',
 'undelete-nodiff'              => 'Nem található korábbi változat.',
 'undeletebtn'                  => 'Helyreállítás',
 'undeletelink'                 => 'helyreállít',
 'undeletereset'                => 'Vissza',
+'undeleteinvert'               => 'Kijelölés megfordítása',
 'undeletecomment'              => 'Helyreállítás oka:',
 'undeletedarticle'             => '„[[$1]]� helyreállítva',
 'undeletedrevisions'           => '$1 változat helyreállítva',
@@ -1916,26 +2119,27 @@ $1',
 'blanknamespace' => '(FÅ‘)',
 
 # Contributions
-'contributions' => 'Szerkesztő közreműködései',
-'mycontris'     => 'Közreműködéseim',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Nem található a feltételeknek megfelelő változtatás.',
-'uctop'         => ' (utolsó)',
-'month'         => 'E hónap végéig:',
-'year'          => 'Eddig az évig:',
-
-'sp-contributions-newbies'     => 'Csak a nemrég regisztrált szerkesztők közreműködéseinek mutatása',
-'sp-contributions-newbies-sub' => 'Új szerkesztők lapjai',
-'sp-contributions-blocklog'    => 'Blokkolási napló',
-'sp-contributions-search'      => 'Közreműködések szűrése',
-'sp-contributions-username'    => 'IP-cím vagy felhasználónév:',
-'sp-contributions-submit'      => 'Keresés',
+'contributions'       => 'Szerkesztő közreműködései',
+'contributions-title' => '$1 közreműködései',
+'mycontris'           => 'Közreműködéseim',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Nem található a feltételeknek megfelelő változtatás.',
+'uctop'               => ' (utolsó)',
+'month'               => 'E hónap végéig:',
+'year'                => 'Eddig az évig:',
+
+'sp-contributions-newbies'       => 'Csak a nemrég regisztrált szerkesztők közreműködéseinek mutatása',
+'sp-contributions-newbies-sub'   => 'Új szerkesztők lapjai',
+'sp-contributions-newbies-title' => 'Új szerkesztők közreműködései',
+'sp-contributions-blocklog'      => 'Blokkolási napló',
+'sp-contributions-search'        => 'Közreműködések szűrése',
+'sp-contributions-username'      => 'IP-cím vagy felhasználónév:',
+'sp-contributions-submit'        => 'Keresés',
 
 # What links here
 'whatlinkshere'            => 'Mi hivatkozik erre',
 'whatlinkshere-title'      => 'A(z) „$1� lapra hivatkozó lapok',
 'whatlinkshere-page'       => 'Oldal:',
-'linklistsub'              => '(Hivatkozások )',
 'linkshere'                => 'Az alábbi lapok hivatkoznak erre: [[:$1]]',
 'nolinkshere'              => '[[:$1]]: erre a lapra semmi nem hivatkozik.',
 'nolinkshere-ns'           => "A kiválasztott névtérben egyetlen oldal sem hivatkozik a(z) '''[[:$1]]''' lapra.",
@@ -1979,6 +2183,8 @@ $1',
 'ipbotherreason'                  => 'Más/további ok:',
 'ipbhidename'                     => 'A felhasználónév/IP elrejtése a blokkolási naplóból, az aktív blokkolási listából és a felhasználólistából',
 'ipbwatchuser'                    => 'A felhasználó lapjának és vitalapjának figyelése',
+'ipballowusertalk'                => 'A szerkesztő módosíthatja saját vitalapját a blokkolás ideje alatt',
+'ipb-change-block'                => 'Blokk beállításainak megváltoztatása',
 'badipaddress'                    => 'Érvénytelen IP-cím',
 'blockipsuccesssub'               => 'Sikeres blokkolás',
 'blockipsuccesstext'              => '„[[Special:Contributions/$1|$1]]� felhasználót blokkoltad.
@@ -1988,14 +2194,18 @@ $1',
 'ipb-unblock'                     => 'Felhasználónév vagy IP-cím blokkolásának feloldása',
 'ipb-blocklist-addr'              => '$1 aktív blokkjai',
 'ipb-blocklist'                   => 'Létező blokkok megtekintése',
+'ipb-blocklist-contribs'          => '$1 közreműködései',
 'unblockip'                       => 'Blokk feloldása',
 'unblockiptext'                   => 'Itt tudod visszaadni egy blokkolt felhasználónévnek vagy IP-nek a szerkesztési jogosultságot.',
-'ipusubmit'                       => 'Blokk feloldása',
+'ipusubmit'                       => 'Blokk eltávolítása',
 'unblocked'                       => '[[User:$1|$1]] blokkolása feloldva',
 'unblocked-id'                    => '$1 blokkolása feloldásra került',
 'ipblocklist'                     => 'Blokkolt IP-címek és felhasználónevek listája',
 'ipblocklist-legend'              => 'Blokkolt felhasználó keresése',
 'ipblocklist-username'            => 'Felhasználónév vagy IP-cím:',
+'ipblocklist-sh-userblocks'       => 'felhasználói fiókok blokkjainak $1',
+'ipblocklist-sh-tempblocks'       => 'ideiglenes blokkok $1',
+'ipblocklist-sh-addressblocks'    => 'egy IP-címre vonatkozó blokkok $1',
 'ipblocklist-submit'              => 'Keresés',
 'blocklistline'                   => '$1, $2 blokkolta $3 felhasználót ($4)',
 'infiniteblock'                   => 'végtelen',
@@ -2004,25 +2214,32 @@ $1',
 'noautoblockblock'                => 'az automatikus blokkolás letiltott',
 'createaccountblock'              => 'új felhasználó létrehozása blokkolva',
 'emailblock'                      => 'e-mail cím blokkolva',
+'blocklist-nousertalk'            => 'nem szerkeszthetik a vitalapjukat',
 'ipblocklist-empty'               => 'A blokkoltak listája üres.',
 'ipblocklist-no-results'          => 'A kért IP-cím vagy felhasználónév nem blokkolt.',
 'blocklink'                       => 'blokkolás',
 'unblocklink'                     => 'blokk feloldása',
+'change-blocklink'                => 'blokkolás módosítása',
 'contribslink'                    => 'szerkesztései',
 'autoblocker'                     => "Az általad használt IP-cím autoblokkolva van, mivel korábban a kitiltott „[[User:$1|$1]]� használta. ($1 blokkolásának indoklása: „'''$2'''�) Ha nem te vagy $1, lépj kapcsolatba valamelyik adminisztrátorral, és kérd az autoblokk feloldását. Ne felejtsd el megírni neki, hogy kinek szóló blokkba ütköztél bele!",
-'blocklogpage'                    => 'Blokkolási_napló',
+'blocklogpage'                    => 'Blokkolási napló',
+'blocklog-fulllog'                => 'Teljes blokkolási napló',
 'blocklogentry'                   => '„$1� blokkolva $2 $3 időtartamra',
+'reblock-logentry'                => 'megváltoztatta [[$1]] blokkjának beállításait, a blokk lejárta: $2 $3',
 'blocklogtext'                    => 'Ez a felhasználókra helyezett blokkoknak és azok feloldásának listája. Az IP-autoblokkok nem szerepelnek a listában. Lásd még [[Special:IPBlockList|a jelenleg életben lévő blokkok listáját]].',
 'unblocklogentry'                 => '„$1� blokkolása feloldva',
 'block-log-flags-anononly'        => 'csak névtelen felhasználók',
 'block-log-flags-nocreate'        => 'a fióklétrehozás letiltott',
 'block-log-flags-noautoblock'     => 'az automatikus blokkolás letiltott',
 'block-log-flags-noemail'         => 'e-mail blokkolva',
+'block-log-flags-nousertalk'      => 'saját vitalapját sem szerkesztheti',
 'block-log-flags-angry-autoblock' => 'bővített automatikus blokk bekapcsolva',
 'range_block_disabled'            => 'A rendszerfelelős tartományblokkolás létrehozási képessége letiltott.',
 'ipb_expiry_invalid'              => 'Hibás lejárati dátum.',
 'ipb_expiry_temp'                 => 'A láthatatlan felhasználóinév-blokkok lehetnek állandóak.',
 'ipb_already_blocked'             => '"$1" már blokkolva',
+'ipb-needreblock'                 => '== Már blokkolva ==
+$1 már blokkolva van. Meg szeretnéd változtatni a beállításokat?',
 'ipb_cant_unblock'                => 'Hiba: A(z) $1 blokkolási azonosító nem található. Lehet, hogy már feloldották a blokkolását.',
 'ipb_blocked_as_range'            => 'Hiba: a(z) $1 IP-cím nem blokkolható közvetlenül, és nem lehet feloldani. A(z) $2 tartomány részeként van blokkolva, amely feloldható.',
 'ip_range_invalid'                => 'Érvénytelen IP-tartomány.',
@@ -2033,6 +2250,7 @@ $1',
 'proxyblocksuccess'               => 'Kész.',
 'sorbsreason'                     => 'Az IP-címed nyitott proxyként szerepel e webhely által használt DNSBL listán.',
 'sorbs_create_account_reason'     => 'Az IP-címed nyitott proxyként szerepel e webhely által használt DNSBL listán. Nem hozhatsz létre fiókot.',
+'cant-block-while-blocked'        => 'Nem blokkolhatsz más szerkesztőket, miközben te magad blokkolva vagy.',
 
 # Developer tools
 'lockdb'              => 'Adatbázis zárolása',
@@ -2060,9 +2278,9 @@ változtatni. Kérjük, erősítsd meg, hogy ezt kívánod tenni.',
 'databasenotlocked'   => 'Az adatbázis nincs lezárva.',
 
 # Move page
-'move-page'               => '$1 átnevezése',
-'move-page-legend'        => 'Lap átnevezése',
-'movepagetext'            => "Az alábbi űrlap használatával nevezhetsz át egy lapot, és helyezheted át teljes laptörténetét az új nevére.
+'move-page'                    => '$1 átnevezése',
+'move-page-legend'             => 'Lap átnevezése',
+'movepagetext'                 => "Az alábbi űrlap használatával nevezhetsz át egy lapot, és helyezheted át teljes laptörténetét az új nevére.
 A régi cím az új címre való átirányítás lesz.
 Frissítheted az átirányításokat úgy, hogy azok automatikusan a megfelelő címre mutassanak;
 ha nem teszed, ellenőrizd a [[Special:DoubleRedirects|dupla]]- vagy [[Special:BrokenRedirects|hibás átirányításokat]].
@@ -2074,48 +2292,61 @@ Ez azt jelenti, hogy visszanevezheted az oldalt az eredeti nevére, ha véletlen
 '''FIGYELEM!'''
 Népszerű oldalak esetén ez drasztikus és nem várt változtatás lehet;
 győződj meg a folytatás előtt arról, hogy tisztában vagy-e a következményekkel.",
-'movepagetalktext'        => "A laphoz tartozó vitalap automatikusan átneveződik, '''kivéve, ha:'''
+'movepagetalktext'             => "A laphoz tartozó vitalap automatikusan átneveződik, '''kivéve, ha:'''
 *már létezik egy nem üres vitalap az új helyen,
 *nem jelölöd be a lenti pipát.
 
 Ezen esetekben a vitalapot külön, kézzel kell átnevezned a kívánságaid szerint.",
-'movearticle'             => 'Lap átnevezése',
-'movenotallowed'          => 'Nincs jogod a lapok átnevezéséhez.',
-'newtitle'                => 'Az új cím:',
-'move-watch'              => 'Figyeld a lapot',
-'movepagebtn'             => 'Lap átnevezése',
-'pagemovedsub'            => '�tnevezés sikeres',
-'movepage-moved'          => "<big>'''„$1� átnevezve „$2� névre'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Ilyen névvel már létezik lap, vagy az általad választott név érvénytelen.
+'movearticle'                  => 'Lap átnevezése',
+'movenologin'                  => 'Nem jelentkeztél be',
+'movenologintext'              => 'Ahhoz, hogy átnevezhess egy lapot, [[Special:UserLogin|be kell lépned]].',
+'movenotallowed'               => 'Nincs jogod a lapok átnevezéséhez.',
+'movenotallowedfile'           => 'Nincs megfelelő jogosultságod a fájlok átnevezéséhez.',
+'cant-move-user-page'          => 'Nem nevezhetsz át szerkesztői lapokat (az allapokon kívül).',
+'cant-move-to-user-page'       => 'Nincs jogosultságod átnevezni egy lapot szerkesztői lapnak (kivéve annak allapjának).',
+'newtitle'                     => 'Az új cím:',
+'move-watch'                   => 'Figyeld a lapot',
+'movepagebtn'                  => 'Lap átnevezése',
+'pagemovedsub'                 => '�tnevezés sikeres',
+'movepage-moved'               => "<big>'''„$1� átnevezve „$2� névre'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '�tirányítás létrehozva.',
+'movepage-moved-noredirect'    => 'A régi címről nem sikerült átirányítást készíteni.',
+'articleexists'                => 'Ilyen névvel már létezik lap, vagy az általad választott név érvénytelen.
 Kérlek, válassz egy másik nevet.',
-'cantmove-titleprotected' => 'Nem nevezheted át a lapot, mert az új cím le van védve a létrehozás ellen.',
-'talkexists'              => 'A lap átnevezése sikerült, de a hozzá tartozó vitalapot nem tudtam átnevezni, mert már létezik egy egyező nevű lap az új helyen. Kérjük, gondoskodj a két lap összefűzéséről.',
-'movedto'                 => 'átnevezve',
-'movetalk'                => 'Nevezd át a vitalapot is, ha lehetséges',
-'move-subpages'           => 'Allapok átnevezése, ha lehetséges',
-'move-talk-subpages'      => 'Vitalap allapjainak átnevezése, ha lehetséges',
-'movepage-page-exists'    => 'A(z) „$1� nevű lap már létezik, és nem írható felül automatikusan.',
-'movepage-page-moved'     => 'A(z) „$1� nevű lap át lett nevezve „$2� névre.',
-'movepage-page-unmoved'   => 'A(z) „$1� nevű lap nem nevezhető át „$2� névre.',
-'movepage-max-pages'      => '{{PLURAL:$1|Egy|$1}} lapnál több nem nevezhető át automatikusan, így a további lapok a helyükön maradnak.',
-'1movedto2'               => '[[$1]] lapot átneveztem [[$2]] névre',
-'1movedto2_redir'         => '[[$1]] lapot átneveztem [[$2]] névre (az átirányítást felülírva)',
-'movelogpage'             => '�tnevezési napló',
-'movelogpagetext'         => 'Az alábbiakban az átnevezett lapok listája látható.',
-'movereason'              => 'Indoklás',
-'revertmove'              => 'visszaállítás',
-'delete_and_move'         => 'Törlés és átnevezés',
-'delete_and_move_text'    => '== Törlés szükséges ==
+'cantmove-titleprotected'      => 'Nem nevezheted át a lapot, mert az új cím le van védve a létrehozás ellen.',
+'talkexists'                   => 'A lap átnevezése sikerült, de a hozzá tartozó vitalapot nem tudtam átnevezni, mert már létezik egy egyező nevű lap az új helyen. Kérjük, gondoskodj a két lap összefűzéséről.',
+'movedto'                      => 'átnevezve',
+'movetalk'                     => 'Nevezd át a vitalapot is, ha lehetséges',
+'move-subpages'                => 'Allapok átnevezése, ha lehetséges',
+'move-talk-subpages'           => 'Vitalap allapjainak átnevezése, ha lehetséges',
+'movepage-page-exists'         => 'A(z) „$1� nevű lap már létezik, és nem írható felül automatikusan.',
+'movepage-page-moved'          => 'A(z) „$1� nevű lap át lett nevezve „$2� névre.',
+'movepage-page-unmoved'        => 'A(z) „$1� nevű lap nem nevezhető át „$2� névre.',
+'movepage-max-pages'           => '{{PLURAL:$1|Egy|$1}} lapnál több nem nevezhető át automatikusan, így a további lapok a helyükön maradnak.',
+'1movedto2'                    => '[[$1]] lapot átneveztem [[$2]] névre',
+'1movedto2_redir'              => '[[$1]] lapot átneveztem [[$2]] névre (az átirányítást felülírva)',
+'move-redirect-suppressed'     => 'átirányítást felülírva',
+'movelogpage'                  => '�tnevezési napló',
+'movelogpagetext'              => 'Az alábbiakban az átnevezett lapok listája látható.',
+'movereason'                   => 'Indoklás',
+'revertmove'                   => 'visszaállítás',
+'delete_and_move'              => 'Törlés és átnevezés',
+'delete_and_move_text'         => '== Törlés szükséges ==
 
 Az átnevezés céljaként megadott „[[:$1]]� szócikk már létezik.  Ha az átnevezést végre akarod hajtani, ezt a lapot törölni kell.  Valóban ezt szeretnéd?',
-'delete_and_move_confirm' => 'Igen, töröld a lapot',
-'delete_and_move_reason'  => 'átnevezendő lap célneve felszabadítva',
-'selfmove'                => 'A cikk jelenlegi címe megegyezik azzal, amire át szeretnéd mozgatni. Egy szócikket saját magára mozgatni nem lehet.',
-'immobile_namespace'      => 'A forrás- vagy a célcím speciális típusú; nem helyezetsz át lapokat abba a névtérbe vagy onnan.',
-'imagenocrossnamespace'   => 'A fájlok nem helyezhetőek át más névtérbe',
-'imagetypemismatch'       => 'Az új kiterjesztés nem egyezik meg a fájl típusával',
-'imageinvalidfilename'    => 'A célnév érvénytelen',
-'fix-double-redirects'    => 'Az eredeti címre mutató hivatkozások frissítése',
+'delete_and_move_confirm'      => 'Igen, töröld a lapot',
+'delete_and_move_reason'       => 'átnevezendő lap célneve felszabadítva',
+'selfmove'                     => 'A cikk jelenlegi címe megegyezik azzal, amire át szeretnéd mozgatni. Egy szócikket saját magára mozgatni nem lehet.',
+'immobile-source-namespace'    => 'A(z) „$1� névtér lapjai nem nevezhetőek át',
+'immobile-target-namespace'    => 'A(z) „$1� névtérbe nem mozgathatsz át lapokat',
+'immobile-target-namespace-iw' => 'Wikiközi hivatkozás nem lehet a lap új neve.',
+'immobile-source-page'         => 'Ez a lap nem nevezhető át.',
+'immobile-target-page'         => 'A lap nem helyezhető át a megadott címre.',
+'imagenocrossnamespace'        => 'A fájlok nem helyezhetőek át más névtérbe',
+'imagetypemismatch'            => 'Az új kiterjesztés nem egyezik meg a fájl típusával',
+'imageinvalidfilename'         => 'A célnév érvénytelen',
+'fix-double-redirects'         => 'Az eredeti címre mutató hivatkozások frissítése',
+'move-leave-redirect'          => '�tirányítás készítése a régi címről az új címre',
 
 # Export
 'export'            => 'Lapok exportálása',
@@ -2127,7 +2358,7 @@ Lapok exportálásához add meg a címüket a lenti szövegdobozban (minden cím
 hogy az összes korábbi változatra és a teljes laptörténetekre szükséged van-e, vagy csak az aktuális
 változatok és a legutolsó változtatásokra vonatkozó információk kellenek.
 
-Az utóbbi esetben közvetlen hivatkozást is használhatsz, például a [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] a "[[{{MediaWiki:Mainpage}}]]" nevű lapot exportálja.',
+Az utóbbi esetben közvetlen hivatkozást is használhatsz, például a [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] a "[[{{MediaWiki:Mainpage}}]]" nevű lapot exportálja.',
 'exportcuronly'     => 'Csak a legfrissebb állapot, teljes laptörténet nélkül',
 'exportnohistory'   => "----
 '''Megjegyzés:''' A lapok teljes előzményeinek ezen az űrlapon keresztül történő exportálása teljesítményporlbémák miatt letiltott.",
@@ -2143,7 +2374,7 @@ Az utóbbi esetben közvetlen hivatkozást is használhatsz, például a [[{{ns:
 'allmessagesdefault'        => 'Alapértelmezett szöveg',
 'allmessagescurrent'        => 'Jelenlegi szöveg',
 'allmessagestext'           => 'Ez a MediaWiki-névtérben elérhető összes rendszerüzenet listája.
-Ha részt szeretnél venni a MediaWiki fordításában, látogass el a [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] és a [http://translatewiki.net Betawiki] oldalakra.',
+Ha részt szeretnél venni a MediaWiki fordításában, látogass el a [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] és a [http://translatewiki.net translatewiki.net] oldalakra.',
 'allmessagesnotsupportedDB' => "A '''''{{ns:special}}:Allmessages''''' lap nem használható, mert a '''\$wgUseDatabaseMessages''' ki van kapcsolva.",
 'allmessagesfilter'         => 'Üzenetnevek szűrése:',
 'allmessagesmodified'       => 'Csak a módosítottak mutatása',
@@ -2163,9 +2394,12 @@ Ha részt szeretnél venni a MediaWiki fordításában, látogass el a [http://w
 'import-interwiki-text'      => 'Válaszd ki az importálandó wikit és lapcímet.
 A változatok dátumai és a szerkesztők nevei megőrzésre kerülnek.
 Valamennyi transwiki importálási művelet az [[Special:Log/import|importálási naplóban]] kerül naplózásra.',
+'import-interwiki-source'    => 'Forrás wiki/lap:',
 'import-interwiki-history'   => 'A lap összes előzményváltozatainak másolása',
 'import-interwiki-submit'    => 'Importálás',
 'import-interwiki-namespace' => 'Célnévtér:',
+'import-upload-filename'     => 'Fájlnév:',
+'import-comment'             => 'Megjegyzés:',
 'importtext'                 => 'Kérjük, hogy a fájlt a forráswikiből a Special:Export segédeszköz használatával exportáld, mentsd a lemezedre, és töltsd ide föl.',
 'importstart'                => 'Lapok importálása...',
 'import-revision-count'      => '$1 {{PLURAL:$1|revision|változatok}}',
@@ -2199,7 +2433,7 @@ Valamennyi transwiki importálási művelet az [[Special:Log/import|importálás
 'import-logentry-interwiki-detail' => '$1 változat innen: $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'A felhasználói lapod',
+'tooltip-pt-userpage'             => 'A szerkesztőlapod',
 'tooltip-pt-anonuserpage'         => 'Az általad használt IP-címhez tartozó felhasználói lap',
 'tooltip-pt-mytalk'               => 'A vitalapod',
 'tooltip-pt-anontalk'             => 'Az általad használt IP-címről végrehajtott szerkesztések megvitatása',
@@ -2211,7 +2445,7 @@ Valamennyi transwiki importálási művelet az [[Special:Log/import|importálás
 'tooltip-pt-logout'               => 'Kijelentkezés',
 'tooltip-ca-talk'                 => 'Az oldal tartalmának megvitatása',
 'tooltip-ca-edit'                 => 'Te is szerkesztheted ezt az oldalt. Mentés előtt használd az előnézet gombot.',
-'tooltip-ca-addsection'           => 'Újabb fejezet nyitása a vitában.',
+'tooltip-ca-addsection'           => 'Új szakasz nyitása',
 'tooltip-ca-viewsource'           => 'Ez egy védett lap. Ide kattintva megnézheted a forrását.',
 'tooltip-ca-history'              => 'A lap korábbi változatai',
 'tooltip-ca-protect'              => 'A lap levédése',
@@ -2258,6 +2492,8 @@ Valamennyi transwiki importálási művelet az [[Special:Log/import|importálás
 'tooltip-watch'                   => 'Lap hozzáadása a figyelőlistádhoz',
 'tooltip-recreate'                => 'A lap újra létrehozása a törlés ellenére',
 'tooltip-upload'                  => 'Feltöltés indítása',
+'tooltip-rollback'                => '„Visszaállítás�: egy kattintással visszavonja az utolsó felhasználó egy vagy több szerkesztését.',
+'tooltip-undo'                    => '„Visszavonás�: visszavonja ezt a szerkesztést, valamint megnyitja a szerkesztőt előnézet módban. A szerkesztési összefoglalóban meg lehet adni a visszavonás okát.',
 
 # Stylesheets
 'common.css'   => '/* Közös CSS az összes felszínnek */',
@@ -2273,12 +2509,12 @@ Valamennyi transwiki importálási művelet az [[Special:Log/import|importálás
 'notacceptable'     => 'A wiki kiszolgálója nem tudja olyan formátumban biztosítani az adatokat, amit a kliens olvasni tud.',
 
 # Attribution
-'anonymous'        => 'Névtelen {{SITENAME}}-szerkesztő(k)',
+'anonymous'        => 'Névtelen {{SITENAME}}-{{PLURAL:$1|szerkesztő|szerkesztők}}',
 'siteuser'         => '$1 {{SITENAME}}-felhasználó',
 'lastmodifiedatby' => 'Ezt a lapot utoljára $3 módosította $2, $1 időpontban.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 munkája alapján.',
 'others'           => 'mások',
-'siteusers'        => '$1 {{SITENAME}}-felhasználó(k)',
+'siteusers'        => '$1 {{SITENAME}}-{{PLURAL:$2|szerkesztő|szerkesztők}}',
 'creditspage'      => 'A lap közreműködői',
 'nocredits'        => 'Ennek a lapnak nincs közreműködői információja.',
 
@@ -2299,6 +2535,16 @@ Ez valószínűleg egy olyan link miatt van, ami egy feketelistán lévő oldalr
 'numauthors'     => 'Önálló szerzők száma (szócikk): $1',
 'numtalkauthors' => 'Önálló szerzők száma (vitalap): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasszikus',
+'skinname-nostalgia'   => 'Nosztalgia',
+'skinname-cologneblue' => 'Kölni kék',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Csirke',
+'skinname-simple'      => 'Egyszerű',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Mindig készítsen PNG-t',
 'mw_math_simple' => 'HTML, ha nagyon egyszerű, egyébként PNG',
@@ -2319,10 +2565,12 @@ Ez valószínűleg egy olyan link miatt van, ami egy feketelistán lévő oldalr
 'markedaspatrollederror-noautopatrol' => 'A saját változtatásaid megjelölése ellenőrzöttként nem engedélyezett.',
 
 # Patrol log
-'patrol-log-page'   => 'Ellenőrzési napló',
-'patrol-log-header' => 'Ez az ellenőrzött változatok naplója.',
-'patrol-log-line'   => 'megjelölve $1 / $2 ellenőrizve $3',
-'patrol-log-auto'   => '(automatikus)',
+'patrol-log-page'      => 'Ellenőrzési napló',
+'patrol-log-header'    => 'Ez az ellenőrzött változatok naplója.',
+'patrol-log-line'      => 'ellenőrzöttnek jelölte a(z) $2 $1 $3',
+'patrol-log-auto'      => '(automatikus)',
+'patrol-log-diff'      => '$1 azonosítójú változatát',
+'log-show-hide-patrol' => 'járőrnapló $1',
 
 # Image deletion
 'deletedrevision'                 => 'Régebbi változat törölve: $1',
@@ -2339,6 +2587,9 @@ $1',
 'previousdiff' => '� Régebbi szerkesztés',
 'nextdiff'     => 'Újabb szerkesztés →',
 
+# Visual comparison
+'visual-comparison' => 'Vizuális összehasonlítás',
+
 # Media information
 'mediawarning'         => "'''Figyelmeztetés''': Ez a fájl kártékony kódot tartalmazhat, futtatása során kárt tehet a számítógépedben.<hr />",
 'imagemaxsize'         => 'A kép leírólapján mutatott legnagyobb képméret:',
@@ -2351,10 +2602,12 @@ $1',
 'show-big-image'       => 'A kép nagyfelbontású változata',
 'show-big-image-thumb' => '<small>Az előnézet mérete: $1 × $2 képpont</small>',
 
-# Special:NewImages
-'newimages'             => 'Új képek galériája',
+# Special:NewFiles
+'newimages'             => 'Új fájlok galériája',
 'imagelisttext'         => 'Lentebb $1 kép látható, $2 rendezve.',
 'newimages-summary'     => 'Ezen a speciális lapon láthatóak a legutóbb feltöltött fájlok.',
+'newimages-legend'      => 'Fájlnév',
+'newimages-label'       => 'Fájlnév (vagy annak részlete):',
 'showhidebots'          => '(botok szerkesztéseinek $1)',
 'noimages'              => 'Nem tekinthető meg semmi.',
 'ilsubmit'              => 'Keresés',
@@ -2560,6 +2813,18 @@ tartalmazni fogja. A többi alapértelmezésként rejtett marad.
 'exif-lightsource-24'  => 'ISO stúdió wolfram',
 'exif-lightsource-255' => 'Egyéb fényforrás',
 
+# Flash modes
+'exif-flash-fired-0'    => 'A vaku nem sült el',
+'exif-flash-fired-1'    => 'A vaku elsült',
+'exif-flash-return-0'   => 'Nincs strobe return detection funkció.',
+'exif-flash-return-2'   => 'strobe return light nincs érzékelve',
+'exif-flash-return-3'   => 'strobe return light érzékelve',
+'exif-flash-mode-1'     => 'Kötelező vaku',
+'exif-flash-mode-2'     => 'Kötelező vakuelnyomás',
+'exif-flash-mode-3'     => 'automatikus mód',
+'exif-flash-function-1' => 'Nincs vakufunkció',
+'exif-flash-redeye-1'   => 'Vörös szem eltávolító mód',
+
 'exif-focalplaneresolutionunit-2' => 'hüvelyk',
 
 'exif-sensingmethod-1' => 'Nem meghatározott',
@@ -2702,21 +2967,10 @@ $1
 Kérlek erősítsd meg, hogy tényleg újra akarod-e írni a lapot.",
 'recreate'            => 'Újraírás',
 
-# HTML dump
-'redirectingto' => '�tirányítás a következőre: [[:$1|$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Törlöd az oldal gyorsítótárban (cache) található változatát?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "''$1''-t tartalmazó lapokra keresés.",
-'searchnamed'      => "''$1'' című lapok keresése.",
-'articletitles'    => "''$1'' kezdetű szócikkek",
-'hideresults'      => 'Eredmények elrejtése',
-'useajaxsearch'    => 'AJAX-alapú kereső használata',
+'confirm-purge-top'    => 'Törlöd az oldal gyorsítótárban (cache) található változatát?',
+'confirm-purge-bottom' => 'A lap ürítésével törlődik annak gyorsítótárazott változata, és a legújabb tartalom fog megjelenni.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� előző oldal',
@@ -2736,7 +2990,7 @@ $1',
 'table_pager_empty'        => 'Nincs találat',
 
 # Auto-summaries
-'autosumm-blank'   => 'A lap teljes tartalmának eltávolítása',
+'autosumm-blank'   => 'Eltávolította a lap teljes tartalmát',
 'autosumm-replace' => 'A lap tartalmának cseréje erre: $1',
 'autoredircomment' => '�tirányítás ide: [[$1]]',
 'autosumm-new'     => 'Új oldal, tartalma: „$1�',
@@ -2779,6 +3033,7 @@ minden egyes sor egy figyelt lap címe. Ha kész vagy, kattints a lista alatt ta
 
 # Core parser functions
 'unknown_extension_tag' => 'Ismeretlen tag kiterjesztés: $1',
+'duplicate-defaultsort' => 'Figyelem: a(z) „$2� rendezőkulcs felülírja a korábbit („$1�).',
 
 # Special:Version
 'version'                          => 'Névjegy', # Not used as normal message but as header for the special page itself
@@ -2807,13 +3062,13 @@ minden egyes sor egy figyelt lap címe. Ha kész vagy, kattints a lista alatt ta
 'filepath-submit'  => 'Elérés',
 'filepath-summary' => 'Ezen lap segítségével lekérheted egy adott fájl pontos útvonalát. A képek teljes méretben jelennek meg, más fájltípusok közvetlenül a hozzájuk rendelt programmal indulnak el.
 
-Add meg a fájlnevet a „{{ns:image}}:� prefixum nélkül.',
+Add meg a fájlnevet a „{{ns:file}}:� prefixum nélkül.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Duplikátumok keresése',
 'fileduplicatesearch-summary'  => 'Fájlok duplikátumainak keresése hash értékük alapján.
 
-Add meg a fájl nevét „{{ns:image}}:� előtag nélkül.',
+Add meg a fájl nevét „{{ns:file}}:� előtag nélkül.',
 'fileduplicatesearch-legend'   => 'Duplikátum keresése',
 'fileduplicatesearch-filename' => 'Fájlnév:',
 'fileduplicatesearch-submit'   => 'Keresés',
@@ -2843,4 +3098,13 @@ Add meg a fájl nevét „{{ns:image}}:� előtag nélkül.',
 'blankpage'              => 'Ãœres lap',
 'intentionallyblankpage' => 'Ez a lap szándékosan maradt üresen',
 
+# External image whitelist
+'external_image_whitelist' => ' #Ezt a sort hagyd pontosan így, ahogy van<pre>
+#Ide reguláris kifejezéseket írharsz (Azon részüket, amik a // közé mennek)
+#Ezek egyeztetve lesznek a külső képek URL-jeivel
+#Azoknál, amelyeknél egyezés van, képként fognak megjelenni, egyébként csak egy link fog rá mutatni
+#A #-tel kezdődő sorok megjegyzésnek számítanak
+
+#A reguláris kifejezéseket ezen sor alá írd. Ezt a sort hagyd így, ahogy van.</pre>',
+
 );
diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php
index 7c96a330..a047bff1 100644
--- a/languages/messages/MessagesHy.php
+++ b/languages/messages/MessagesHy.php
@@ -22,14 +22,12 @@ $linkPrefixExtension = true;
 $namespaceNames = array(
 	NS_MEDIA          => 'Õ„Õ¥Õ¤Õ«Õ¡',
 	NS_SPECIAL        => 'Õ�ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¸Õ²',
-	NS_MAIN           => '',
 	NS_TALK           => 'Õ”Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´',
 	NS_USER           => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�',
 	NS_USER_TALK      => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ«_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '{{GRAMMAR:genitive|$1}}_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´',
-	NS_IMAGE          => 'ÕŠÕ¡Õ¿Õ¯Õ¥Ö€',
-	NS_IMAGE_TALK     => 'ÕŠÕ¡Õ¿Õ¯Õ¥Ö€Õ«_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´',
+	NS_FILE           => 'ÕŠÕ¡Õ¿Õ¯Õ¥Ö€',
+	NS_FILE_TALK      => 'ÕŠÕ¡Õ¿Õ¯Õ¥Ö€Õ«_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´',
 	NS_TEMPLATE       => 'Ô¿Õ¡Õ²Õ¡ÕºÕ¡Ö€',
@@ -41,18 +39,9 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	NS_SPECIAL => 'Õ�ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¸Õ²',
+	'Õ�ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¸Õ²' => NS_SPECIAL,
 );
 
-$skinNames = array(
-	'standard'    => 'Ô´Õ¡Õ½Õ¡Õ¯Õ¡Õ¶',
-	'nostalgia'   => 'Õ€Õ¡ÕµÖ€Õ¥Õ¶Õ¡Õ¢Õ¡Õ²Õ±Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
-	'cologneblue' => 'Õ”ÕµÕ¸Õ¬Õ¶Õ« Õ©Õ¡Õ­Õ«Õ®',
-	'monobook'    => 'Õ„Õ«Õ¡Ô³Õ«Ö€Ö„',
-	'myskin'      => 'Ô»Õ´Õ�Õ¥Õ½Ö„',
-	'chick'       => 'Ô¾Õ«Õ¿',
-	'simple'      => 'ÕŠÕ¡Ö€Õ¦',
-);
 
 $datePreferences = array(
 	'default',
@@ -210,7 +199,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Õ€Õ½Õ¯Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ¶Ö�Õ¡Õ¶Õ¯Õ¨' ),
 	'Recentchanges'             => array( 'ÕŽÕ¥Ö€Õ»Õ«Õ¶ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨' ),
 	'Upload'                    => array( 'Ô²Õ¥Õ¼Õ¶Õ¥Õ¬' ),
-	'Imagelist'                 => array( 'ÕŠÕ¡Õ¿Õ¯Õ¥Ö€Õ¶Õ¥Ö€Õ«Ö�Õ¡Õ¶Õ¯Õ¨' ),
+	'Listfiles'                 => array( 'ÕŠÕ¡Õ¿Õ¯Õ¥Ö€Õ¶Õ¥Ö€Õ«Ö�Õ¡Õ¶Õ¯Õ¨' ),
 	'Newimages'                 => array( 'Õ†Õ¸Ö€ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¶Õ¥Ö€' ),
 	'Listusers'                 => array( 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ«Ö�Õ¡Õ¶Õ¯Õ¨' ),
 	'Statistics'                => array( 'ÕŽÕ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶' ),
@@ -320,8 +309,6 @@ $messages = array(
 'underline-never'   => 'ÔµÖ€Õ¢Õ¥Ö„',
 'underline-default' => 'Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ« Õ¶Õ¡Õ­Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨',
 
-'skinpreview' => '(Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¥Õ¬)',
-
 # Dates
 'sunday'        => 'Ô¿Õ«Ö€Õ¡Õ¯Õ«',
 'monday'        => 'ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«',
@@ -407,7 +394,7 @@ $messages = array(
 'mytalk'         => 'Ô»Õ´ Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
 'anontalk'       => 'Õ”Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´ Õ¡ÕµÕ½ IP-Õ°Õ¡Õ½Ö�Õ¥Õ« Õ°Õ¡Õ´Õ¡Ö€',
 'navigation'     => 'Õ‡Ö€Õ»Õ¥Õ¬ Õ¯Õ¡ÕµÖ„Õ¸Ö‚Õ´',
-'and'            => 'Ö‡',
+'and'            => '&#32;Ö‡',
 
 # Metadata in edit box
 'metadata_help' => 'Õ„Õ¥Õ¿Õ¡Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Ö‰',
@@ -470,8 +457,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{grammar:genitive|{{SITENAME}}}} Õ´Õ¡Õ½Õ«Õ¶',
 'aboutpage'            => 'Project:Ô·Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨',
-'bugreports'           => 'Õ�Õ­Õ¡Õ¬Õ« Õ¦Õ¥Õ¯Õ¸Ö‚Ö�Õ¸Ö‚Õ´',
-'bugreportspage'       => 'Project:Õ�Õ­Õ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¦Õ¥Õ¯Õ¸Ö‚Ö�Õ¸Ö‚Õ´',
 'copyright'            => 'Կայքի բովանդակությունը գտնվում է «$1» լի�ենզիայի տակ։',
 'copyrightpagename'    => '{{SITENAME}} Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨',
 'copyrightpage'        => '{{ns:project}}:Õ€Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€',
@@ -494,8 +479,6 @@ $messages = array(
 
 'badaccess'        => 'Ô¹Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ´Õ¡Õ¶ Õ½Õ­Õ¡Õ¬',
 'badaccess-group0' => 'Õ�Õ¥Õ¦ Õ¹Õ« Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¾Õ¸Ö‚Õ´ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨Ö‰',
-'badaccess-group1' => 'Õ�Õ¾ÕµÕ¡Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ $1 Õ­Õ´Õ¢Õ« Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ¨Ö‰',
-'badaccess-group2' => 'Õ�Õ¾ÕµÕ¡Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ $1 Õ­Õ´Õ¢Õ¥Ö€Õ« Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ¨Ö‰',
 'badaccess-groups' => 'Õ�Õ¾ÕµÕ¡Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ $1 Õ­Õ´Õ¢Õ¥Ö€Õ« Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ¨Ö‰',
 
 'versionrequired'     => 'ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ§ MediaWiki Õ®Ö€Õ¡Õ£Ö€Õ« $1 Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨',
@@ -585,7 +568,6 @@ $1',
 'cannotdelete'         => 'Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ»Õ¶Õ»Õ¥Õ¬ Õ¶Õ·Õ¾Õ¡Õ® Õ§Õ»Õ¨ Õ¯Õ¡Õ´ Ö†Õ¡ÕµÕ¬Õ¨Ö‰ (Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ§ Õ¡ÕµÕ¶ Õ¡Ö€Õ¤Õ¥Õ¶ Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ§ Õ¡ÕµÕ¬ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�Ö‰)',
 'badtitle'             => 'Ô±Õ¶Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Õ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´',
 'badtitletext'         => 'Õ€Õ¡Ö€Ö�Õ¾Õ¡Õ® Õ§Õ»Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¨ Õ¡Õ¶Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Õ¬Õ« Õ§, Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§ Õ¯Õ¡Õ´ Õ½Õ­Õ¡Õ¬ Õ´Õ«Õ»-Õ¬Õ¥Õ¦Õ¾Õ¡Õ¯Õ¡Õ¶ Õ¯Õ¡Õ´ Õ«Õ¶Õ¿Õ¥Ö€Õ¾Õ«Ö„Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´ Õ§Ö‰ Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ§, Õ¸Ö€ Õ¡ÕµÕ¶ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§ Õ¡Õ¶Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ« Õ½Õ«Õ´Õ¾Õ¸Õ¬Õ¶Õ¥Ö€Ö‰',
-'perfdisabled'         => 'Ներե�ե՜ք։ Այս հնարավորությունը ժամանակավորապես անջատված է սերվերի գերբեռնվածության պատճառով։',
 'perfcached'           => 'Õ€Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¾Õ¥Ö€Ö�Õ¾Õ¡Õ® Õ¥Õ¶ Ö„Õ¥Õ·Õ«Ö� Ö‡ Õ°Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ§ Õ¹Õ¡Ö€Õ¿Õ¡Ö�Õ¸Õ¬Õ¥Õ¶ Õ¾Õ¥Ö€Õ»Õ«Õ¶ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨Ö‰',
 'perfcachedts'         => 'Õ€Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¾Õ¥Ö€Ö�Õ¾Õ¡Õ® Õ¥Õ¶ Ö„Õ¥Õ·Õ«Ö� Ö‡ Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¡Õ¶Õ£Õ¡Õ´ Õ©Õ¡Ö€Õ´Õ¡Ö�Õ¾Õ¥Õ¬ Õ¥Õ¶ $1Ö‰',
 'querypage-no-updates' => 'Ô±ÕµÕ½ Õ§Õ»Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ½ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ¥Õ¶Ö‰ Ô±ÕµÕ½Õ¿Õ¥Õ²Õ« Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¡ÕµÕªÕ´ Õ¹Õ¥Õ¶ Õ©Õ¡Ö€Õ´Õ¡Ö�Õ¾Õ«Ö‰',
@@ -607,8 +589,8 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¥Õ¬Ö„',
-'logouttext'                 => '<strong>Ô´Õ¸Ö‚Ö„ Õ¤Õ¸Ö‚Ö€Õ½ Õ¥Õ¯Õ¡Ö„ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ«Ö�Ö‰</strong><br />
-Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ·Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ {{SITENAME}} Õ¯Õ¡ÕµÖ„Õ¨ Õ¡Õ¶Õ¡Õ¶Õ¸Ö‚Õ¶, Õ¯Õ¡Õ´ Õ¯Ö€Õ¯Õ«Õ¶ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ� Õ¸Ö€ÕºÕ¥Õ½ Õ¶Õ¸Ö‚ÕµÕ¶Õ� Õ¯Õ¡Õ´ Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Ö‰ Ô» Õ¶Õ¯Õ¡Õ¿Õ« Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Ö„, Õ¸Ö€ Õ¸Ö€Õ¸Õ· Õ§Õ»Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Ö�Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¾Õ¥Õ¬ Õ¡ÕµÕ¶ÕºÕ¥Õ½Õ� Õ«Õ¶Õ¹ÕºÕ¥Õ½ Õ¥Õ©Õ¥ Õ¤Õ¥Õ¼ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¸Ö‚Õ´ Õ¬Õ«Õ¶Õ¥Õ«Ö„ Õ´Õ«Õ¶Õ¹Ö‡ Õ¸Ö€ Õ¹Õ»Õ¶Õ»Õ¥Ö„ Õ±Õ¥Ö€ Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ« Ö„Õ§Õ·Õ¨Ö‰',
+'logouttext'                 => "'''Ô´Õ¸Ö‚Ö„ Õ¤Õ¸Ö‚Ö€Õ½ Õ¥Õ¯Õ¡Ö„ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ«Ö�Ö‰'''<br />
+Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ·Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ {{SITENAME}} Õ¯Õ¡ÕµÖ„Õ¨ Õ¡Õ¶Õ¡Õ¶Õ¸Ö‚Õ¶, Õ¯Õ¡Õ´ Õ¯Ö€Õ¯Õ«Õ¶ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ� Õ¸Ö€ÕºÕ¥Õ½ Õ¶Õ¸Ö‚ÕµÕ¶Õ� Õ¯Õ¡Õ´ Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Ö‰ Ô» Õ¶Õ¯Õ¡Õ¿Õ« Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Ö„, Õ¸Ö€ Õ¸Ö€Õ¸Õ· Õ§Õ»Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Ö�Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¾Õ¥Õ¬ Õ¡ÕµÕ¶ÕºÕ¥Õ½Õ� Õ«Õ¶Õ¹ÕºÕ¥Õ½ Õ¥Õ©Õ¥ Õ¤Õ¥Õ¼ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¸Ö‚Õ´ Õ¬Õ«Õ¶Õ¥Õ«Ö„ Õ´Õ«Õ¶Õ¹Ö‡ Õ¸Ö€ Õ¹Õ»Õ¶Õ»Õ¥Ö„ Õ±Õ¥Ö€ Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ« Ö„Õ§Õ·Õ¨Ö‰",
 'welcomecreation'            => '== Ô²Õ¡Ö€Õ« Õ£Õ¡Õ¬Õ¸Ö‚Õ½Õ¿, $1 ==
 Õ�Õ¥Ö€ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ½Õ¿Õ¥Õ²Õ®Õ¾Õ¡Õ® Õ§Ö‰
 Õ‰Õ´Õ¸Õ¼Õ¡Õ¶Õ¡Ö„ Õ¡Õ¶Õ±Õ¶Õ¡Õ¾Õ¸Ö€Õ¥Õ¬ Õ±Õ¥Ö€ Õ¶Õ¡Õ­Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨Ö‰',
@@ -619,7 +601,6 @@ $2',
 'remembermypassword'         => 'Õ€Õ«Õ·Õ¥Õ¬ Õ«Õ´ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¾Õ¡Õ® Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨',
 'yourdomainname'             => 'Õ�Õ¥Ö€ Õ¤Õ¸Õ´Õ¥Õ¶Õ¨.',
 'externaldberror'            => 'Õ�Õ¥Õ²Õ« Õ§ Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Õ¬ Õ¾Õ¡Õ¾Õ¥Ö€Õ¡Ö�Õ´Õ¡Õ¶ Õ¡Ö€Õ¿Õ¡Ö„Õ«Õ¶ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ« Õ½Õ­Õ¡Õ¬, Õ¯Õ¡Õ´ Õ¤Õ¸Ö‚Ö„ Õ¹Õ¸Ö‚Õ¶Õ¥Ö„ Õ¢Õ¡Õ¾Õ¡Ö€Õ¡Ö€ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€ Õ±Õ¥Ö€ Õ¡Ö€Õ¿Õ¡Ö„Õ«Õ¶ Õ°Õ¡Õ·Õ¾Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€Ö‰',
-'loginproblem'               => '<b>Õ„Õ¸Ö‚Õ¿Ö„Õ¨ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£ Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö�Ö‰</b><br /> Õ“Õ¸Ö€Õ±Õ¥Ö„ Õ¯Ö€Õ¯Õ«Õ¶Ö‰',
 'login'                      => 'Õ„Õ¿Õ¶Õ¥Õ¬',
 'nav-login-createaccount'    => 'Õ„Õ¿Õ¶Õ¥Õ¬ / Ô³Ö€Õ¡Õ¶Ö�Õ¾Õ¥Õ¬',
 'loginprompt'                => '{{SITENAME}} Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ°Õ¡Ö€Õ¯Õ¡Õ¾Õ¸Ö€ Õ§ Ö„Õ¸Ö‚Ö„Õ«Õ¶Õ¥Ö€Õ¨ Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Ö‰',
@@ -691,11 +672,13 @@ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¶ Õ§Õ� <code>$3</code>Ö‰
 'resetpass_announce'      => 'Ô´Õ¸Ö‚Ö„ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡Ö�Õ¥Õ¬ Õ¥Ö„ Õ§Õ¬-ÖƒÕ¸Õ½Õ¿Õ¸Õ¾ Õ½Õ¿Õ¡Ö�Õ¾Õ¡Õ® ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¾Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¸Õ¾Ö‰ Õ€Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£ Õ´Õ¸Ö‚Õ¿Ö„Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬ Õ¡ÕµÕ½Õ¿Õ¥Õ².',
 'resetpass_text'          => '<!-- Ô±Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¡ÕµÕ½Õ¿Õ¥Õ² -->',
 'resetpass_header'        => 'ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨',
+'oldpassword'             => 'Õ€Õ«Õ¶ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.',
+'newpassword'             => 'Õ†Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.',
+'retypenew'               => 'Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.',
 'resetpass_submit'        => 'Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ Ö‡ Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£',
 'resetpass_success'       => '�եր գաղտնաբառը փոխված է։ Մուտք համակարգ…',
 'resetpass_bad_temporary' => 'ÔºÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¾Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ Õ½Õ­Õ¡Õ¬ Õ§Ö‰ Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ§ Õ¤Õ¸Ö‚Ö„ Õ¡Ö€Õ¤Õ¥Õ¶ ÖƒÕ¸Õ­Õ¥Õ¬ Õ¥Ö„ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ Õ¯Õ¡Õ´ Õ¶Õ¸Ö€Õ¶ Õ¥Ö„ Õ°Õ¡ÕµÖ�Õ¥Õ¬Ö‰',
 'resetpass_forbidden'     => 'Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ {{SITENAME}} Õ¯Õ¡ÕµÖ„Õ¸Ö‚Õ´ Õ¹Õ« Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¾Õ¸Ö‚Õ´',
-'resetpass_missing'       => 'Õ�Ö‡Õ¨ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€ Õ¹Õ« ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´Ö‰',
 
 # Edit page toolbar
 'bold_sample'     => 'Ô¹Õ¡Õ¾Õ¡Õ¿Õ¡Õ¼ Õ¿Õ¥Ö„Õ½Õ¿',
@@ -718,8 +701,8 @@ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¶ Õ§Õ� <code>$3</code>Ö‰
 'hr_tip'          => 'Õ€Õ¸Ö€Õ«Õ¦Õ¸Õ¶Õ¡Õ¯Õ¡Õ¶ Õ£Õ«Õ® (Õ´Õ«Õ¡ÕµÕ¶ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´)',
 
 # Edit pages
-'summary'                   => 'Ô±Õ´ÖƒÕ¸ÖƒÕ¸Ö‚Õ´',
-'subject'                   => 'ÕŽÕ¥Ö€Õ¶Õ¡Õ£Õ«Ö€',
+'summary'                   => 'Ô±Õ´ÖƒÕ¸ÖƒÕ¸Ö‚Õ´:',
+'subject'                   => 'ÕŽÕ¥Ö€Õ¶Õ¡Õ£Õ«Ö€:',
 'minoredit'                 => 'Õ�Õ¡ Õ¹Õ¶Õ¹Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´ Õ§',
 'watchthis'                 => 'Õ€Õ½Õ¯Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ¨',
 'savearticle'               => 'Õ€Õ«Õ·Õ¥Õ¬ Õ§Õ»Õ¨',
@@ -731,8 +714,8 @@ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¶ Õ§Õ� <code>$3</code>Ö‰
 'missingsummary'            => "'''Հիշե�ում.''' Դուք չեք տվել խմբագրման ամփոփում։ «Հիշել» կոճակի կրկնակի մատնահարման դեպքում փոփոխությունները կհիշվեն առան� ամփոփման։",
 'missingcommenttext'        => 'Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¡Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬ Õ½Õ¿Õ¸Ö€Ö‡Ö‰',
 'missingcommentheader'      => "'''Հիշե�ում.''' Դուք չեք նշել մեկնաբանության վերնագիրը։ «Հիշել» կոճակի կրկնակի մատնահարման դեպքում ձեր մեկնաբանությունը կհիշվի առան� վերնագրի։",
-'summary-preview'           => 'Ô±Õ´ÖƒÕ¸ÖƒÕ´Õ¡Õ¶ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´',
-'subject-preview'           => 'ÕŽÕ¥Ö€Õ¶Õ¡Õ£Ö€Õ« Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´',
+'summary-preview'           => 'Ô±Õ´ÖƒÕ¸ÖƒÕ´Õ¡Õ¶ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´:',
+'subject-preview'           => 'ÕŽÕ¥Ö€Õ¶Õ¡Õ£Ö€Õ« Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´:',
 'blockedtitle'              => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ§',
 'blockedtext'               => "<big>'''Õ�Õ¥Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Õ¯Õ¡Õ´ IP-Õ°Õ¡Õ½Ö�Õ¥Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ§Ö‰'''</big>
 
@@ -774,22 +757,22 @@ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¶ Õ§Õ� <code>$3</code>Ö‰
 'anontalkpagetext'          => "----''Ô±ÕµÕ½ Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ§Õ»Õ¨ ÕºÕ¡Õ¿Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ§ Õ¡Õ¶Õ¡Õ¶Õ¸Ö‚Õ¶ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ«Õ¶, Õ¸Ö€Õ¨ Õ¤Õ¥Õ¼ Õ¹Õ« Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ·Õ«Õ¾ Õ¯Õ¡Õ´ Õ¹Õ« Õ´Õ¿Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¸Õ¾Ö‰ Ô±ÕµÕ¤ Õ«Õ½Õ¯ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¸Ö‚Õ´ Õ§ Õ©Õ¾Õ¡ÕµÕ«Õ¶ IP-Õ°Õ¡Õ½Ö�Õ¥Õ¶Ö‰ Õ†Õ´Õ¡Õ¶ IP-Õ°Õ¡Õ½Ö�Õ¥Õ«Ö� Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Ö…Õ£Õ¿Õ¾Õ¥Õ¬ Õ´Õ« Ö„Õ¡Õ¶Õ« Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Ö‰ ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ¡Õ¶Õ¡Õ¶Õ¸Ö‚Õ¶ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö� Õ¥Ö„, Õ¢Õ¡ÕµÖ� Õ¯Õ¡Ö€Õ®Õ¸Ö‚Õ´ Õ¥Ö„, Õ¸Ö€ Õ¸Ö‚Ö€Õ«Õ·Õ¶Õ¥Ö€Õ«Õ¶ Õ¾Õ¥Ö€Õ¡Õ¢Õ¥Ö€Õ¸Õ² Õ¤Õ«Õ¿Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¡Ö€Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ Õ±Õ¥Ö€ Õ°Õ¡Õ½Ö�Õ¥Õ¸Õ¾, Õ¡ÕºÕ¡ Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ ÕºÕ¡Ö€Õ¦Õ¡ÕºÕ¥Õ½ [[Special:UserLogin|Õ£Ö€Õ¡Õ¶Ö�Õ¾Õ¥Õ¬ Õ¯Õ¡Õ´ Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£]], Õ¸Ö€ÕºÕ¥Õ½Õ¦Õ« Õ°Õ¥Õ¿Õ¡Õ£Õ¡ÕµÕ¸Ö‚Õ´ Õ±Õ¥Õ¦ Õ¹Õ·ÖƒÕ¸Õ©Õ¥Õ¶ Õ¡ÕµÕ¬ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿ Ö‡ Õ¹Õ¾Õ¥Ö€Õ¡Õ£Ö€Õ¥Õ¶ Õ±Õ¥Õ¦ Õ¶Ö€Õ¡Õ¶Ö� Õ¯Õ¡Õ¿Õ¡Ö€Õ¡Õ® Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨Ö‰''",
 'noarticletext'             => 'Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ½ Õ¡ÕµÕ½ Õ§Õ»Õ¸Ö‚Õ´ Õ¸Ö€Ö‡Õ§ Õ¿Õ¥Ö„Õ½Õ¿ Õ¹Õ¯Õ¡Ö‰ Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ [[Special:Search/{{PAGENAME}}|Õ¸Ö€Õ¸Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¨]] Õ¡ÕµÕ¬ Õ§Õ»Õ¥Ö€Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ [{{fullurl:{{FULLPAGENAME}}|action=edit}} Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€ Õ§Õ» Õ¡ÕµÕ½ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢]Ö‰',
 'clearyourcache'            => "'''Ծանու�ում.''' Հիշելու� հետո կատարված փոփոխությունները տեսնելու համար մաքրեք ձեր բրաուզերի քեշը. '''Mozilla / Firefox'''� ''Ctrl+Shift+R'', '''IE'''� ''Ctrl+F5'', '''Safari'''� ''Cmd+Shift+R'', '''Konqueror'''� ''F5'', '''Opera'''� ''Tools→Preferences'' ընտրա�անկի�։",
-'usercssjsyoucanpreview'    => '<strong>Õ€Õ¸Ö‚Õ·Õ¸Ö‚Õ´.</strong> Ô·Õ»Õ¨ Õ°Õ«Õ·Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Ö…Õ£Õ¿Õ¾Õ¥Ö„ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ´Õ¡Õ¶ Õ¯Õ¸Õ³Õ¡Õ¯Õ«Ö�Õ� Õ±Õ¥Ö€ Õ¶Õ¸Ö€ CSS/JS-Ö†Õ¡ÕµÕ¬Õ¨ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰',
+'usercssjsyoucanpreview'    => "'''Õ€Õ¸Ö‚Õ·Õ¸Ö‚Õ´.''' Ô·Õ»Õ¨ Õ°Õ«Õ·Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Ö…Õ£Õ¿Õ¾Õ¥Ö„ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ´Õ¡Õ¶ Õ¯Õ¸Õ³Õ¡Õ¯Õ«Ö�Õ� Õ±Õ¥Ö€ Õ¶Õ¸Ö€ CSS/JS-Ö†Õ¡ÕµÕ¬Õ¨ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
 'usercsspreview'            => "'''Õ†Õ¯Õ¡Õ¿Õ« Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Ö„, Õ¸Ö€ Õ¤Õ¸Ö‚Ö„ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´ Õ¥Ö„ Õ±Õ¥Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« CSS-Ö†Õ¡ÕµÕ¬Õ¨. Õ¡ÕµÕ¶ Õ¤Õ¥Õ¼ Õ°Õ«Õ·Õ¾Õ¡Õ® Õ¹Õ§Õ›Ö‰'''",
 'userjspreview'             => "'''Õ†Õ¯Õ¡Õ¿Õ« Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Ö„, Õ¸Ö€ Õ¤Õ¸Ö‚Ö„ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´ Õ¥Ö„ Õ±Õ¥Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« JavaScript-Ö†Õ¡ÕµÕ¬Õ¨. Õ¡ÕµÕ¶ Õ¤Õ¥Õ¼ Õ°Õ«Õ·Õ¾Õ¡Õ® Õ¹Õ§Õ›Ö‰'''",
 'userinvalidcssjstitle'     => "'''Զգուշա�ում.''' «$1» տեսք չի գտնվել։ Ի նկատի ունե�եք, որ մասնակ�ային .css և .js էջերը ունեն փոքրատառ անվանումներ, օր.� «{{ns:user}}:Ոմն/monobook.css», և ոչ թե «{{ns:user}}:Ոմն/Monobook.css»։",
 'updated'                   => '(Ô¹Õ¡Ö€Õ´Õ¡Ö�Õ¾Õ¡Õ®)',
-'note'                      => '<strong>Ô¾Õ¡Õ¶Õ¸Ö‚Ö�Õ¸Ö‚Õ´.</strong>',
-'previewnote'               => '<strong>Õ�Õ¡ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´Õ¶ Õ§. Õ±Õ¥Ö€ Õ¯Õ¡Õ¿Õ¡Ö€Õ¡Õ® ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¤Õ¥Õ¼ Õ¹Õ¥Õ›Õ¶ Õ°Õ«Õ·Õ¾Õ¥Õ¬Ö‰</strong>',
+'note'                      => "'''Ô¾Õ¡Õ¶Õ¸Ö‚Ö�Õ¸Ö‚Õ´.'''",
+'previewnote'               => "'''Õ�Õ¡ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´Õ¶ Õ§. Õ±Õ¥Ö€ Õ¯Õ¡Õ¿Õ¡Ö€Õ¡Õ® ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¤Õ¥Õ¼ Õ¹Õ¥Õ›Õ¶ Õ°Õ«Õ·Õ¾Õ¥Õ¬Ö‰'''",
 'previewconflict'           => 'Ô±ÕµÕ½ Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´Õ¨ Õ¡Ö€Õ¿Õ¡ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¸Ö‚Õ´ Õ§ Õ¾Õ¥Ö€Ö‡Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö‚Õ´ Õ¥Õ²Õ¡Õ® Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¡ÕµÕ¶ÕºÕ¥Õ½, Õ«Õ¶Õ¹ÕºÕ¥Õ½ Õ¡ÕµÕ¶ Õ¯Õ¥Ö€Ö‡Õ¡ Õ°Õ«Õ·Õ¾Õ¥Õ¬Õ¸Ö‚Ö� Õ°Õ¥Õ¿Õ¸Ö‰',
-'session_fail_preview'      => '<strong>Õ‘Õ¡Õ¾Õ¸Ö„Õ� Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ°Õ«Õ·Õ¥Õ¬ Õ±Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¯Õ¸Ö€Õ½Õ¿Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰
-Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¯Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬Ö‰ Õ�Õ­Õ¡Õ¬Õ« Õ¯Ö€Õ¯Õ¶Õ´Õ¡Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Õ� ÖƒÕ¸Ö€Õ±Õ¥Ö„ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬, Õ¡ÕºÕ¡ Õ¯Ö€Õ¯Õ«Õ¶ Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Ö‰</strong>',
-'session_fail_preview_html' => "<strong>Õ‘Õ¡Õ¾Õ¸Ö„Õ� Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ°Õ«Õ·Õ¥Õ¬ Õ±Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¯Õ¸Ö€Õ½Õ¿Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰</strong>
+'session_fail_preview'      => "'''Õ‘Õ¡Õ¾Õ¸Ö„Õ� Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ°Õ«Õ·Õ¥Õ¬ Õ±Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¯Õ¸Ö€Õ½Õ¿Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰
+Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¯Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬Ö‰ Õ�Õ­Õ¡Õ¬Õ« Õ¯Ö€Õ¯Õ¶Õ´Õ¡Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Õ� ÖƒÕ¸Ö€Õ±Õ¥Ö„ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬, Õ¡ÕºÕ¡ Õ¯Ö€Õ¯Õ«Õ¶ Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Ö‰'''",
+'session_fail_preview_html' => "'''Õ‘Õ¡Õ¾Õ¸Ö„Õ� Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ°Õ«Õ·Õ¥Õ¬ Õ±Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¯Õ¸Ö€Õ½Õ¿Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰'''
 
 ''Õ”Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ½ Õ¾Õ«Ö„Õ«Õ¶ Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¸Ö‚Õ´ Õ§ Õ°Õ¸Ö‚Õ´ HTML, Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§ JavaScript-Õ£Ö€Õ¸Õ°Õ« Õ¯Õ¡Õ¶Õ­Õ´Õ¡Õ¶ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾Ö‰''
 
-<strong>ÔµÕ©Õ¥ Õ½Õ¡ Õ¢Õ¡Ö€Õ¥Õ­Õ«Õ²Õ³ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ´Õ¡Õ¶ ÖƒÕ¸Ö€Õ± Õ§, Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¯Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬Ö‰ Õ�Õ­Õ¡Õ¬Õ« Õ¯Ö€Õ¯Õ¶Õ´Õ¡Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Õ� ÖƒÕ¸Ö€Õ±Õ¥Ö„ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬, Õ¡ÕºÕ¡ Õ¯Ö€Õ¯Õ«Õ¶ Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Ö‰</strong>",
-'token_suffix_mismatch'     => '<strong>Õ�Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨ Õ´Õ¥Ö€ÕªÕ¾Õ¥Õ¬ Õ§, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ±Õ¥Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¡Õ® Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¡Õ²Õ¡Õ¾Õ¡Õ²Õ¥Õ¬ Õ§ Õ¯Õ¥Õ¿Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö€Õ¨ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö‚Õ´Ö‰ Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨ Õ´Õ¥Ö€ÕªÕ¾Õ¥Õ¬ Õ§ Õ§Õ»Õ« Õ¿Õ¥Ö„Õ½Õ¿Õ« Õ­Õ¡Õ©Õ¡Ö€Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ¶Õ­Õ¥Õ¬Õ¸Ö‚ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾Ö‰ Õ�Õ¡ Õ¥Ö€Õ¢Õ¥Õ´Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¾Õ¸Ö€Õ¾Õ¡Õ® Õ§ Õ½Õ­Õ¡Õ¬Õ¶Õ¥Ö€ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Õ² Õ¡Õ¶Õ¡Õ¶Õ¾Õ¡Õ¶Õ¥Ö�Õ¶Õ¸Õ² Õ¾Õ¥Õ¢-ÖƒÕ¸Õ­Õ¡Ö€Õ«Õ¶Õ¸Ö€Õ¤ (proxy) Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¡Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ´Õ¢Ö‰</strong>',
+'''ÔµÕ©Õ¥ Õ½Õ¡ Õ¢Õ¡Ö€Õ¥Õ­Õ«Õ²Õ³ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ´Õ¡Õ¶ ÖƒÕ¸Ö€Õ± Õ§, Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¯Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬Ö‰ Õ�Õ­Õ¡Õ¬Õ« Õ¯Ö€Õ¯Õ¶Õ´Õ¡Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Õ� ÖƒÕ¸Ö€Õ±Õ¥Ö„ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬, Õ¡ÕºÕ¡ Õ¯Ö€Õ¯Õ«Õ¶ Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Ö‰'''",
+'token_suffix_mismatch'     => "'''Õ�Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨ Õ´Õ¥Ö€ÕªÕ¾Õ¥Õ¬ Õ§, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ±Õ¥Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¡Õ® Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¡Õ²Õ¡Õ¾Õ¡Õ²Õ¥Õ¬ Õ§ Õ¯Õ¥Õ¿Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö€Õ¨ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö‚Õ´Ö‰ Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨ Õ´Õ¥Ö€ÕªÕ¾Õ¥Õ¬ Õ§ Õ§Õ»Õ« Õ¿Õ¥Ö„Õ½Õ¿Õ« Õ­Õ¡Õ©Õ¡Ö€Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ¶Õ­Õ¥Õ¬Õ¸Ö‚ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾Ö‰ Õ�Õ¡ Õ¥Ö€Õ¢Õ¥Õ´Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¡Õ¾Õ¸Ö€Õ¾Õ¡Õ® Õ§ Õ½Õ­Õ¡Õ¬Õ¶Õ¥Ö€ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Õ² Õ¡Õ¶Õ¡Õ¶Õ¾Õ¡Õ¶Õ¥Ö�Õ¶Õ¸Õ² Õ¾Õ¥Õ¢-ÖƒÕ¸Õ­Õ¡Ö€Õ«Õ¶Õ¸Ö€Õ¤ (proxy) Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¡Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ´Õ¢Ö‰'''",
 'editing'                   => 'Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´. $1',
 'editingsection'            => 'Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´. $1 (Õ¢Õ¡ÕªÕ«Õ¶)',
 'editingcomment'            => 'Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´ $1 (Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶)',
@@ -801,18 +784,18 @@ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¶ Õ§Õ� <code>$3</code>Ö‰
 «Հիշել էջը» կոճակին սեղմելով կհիշվի '''միայն''' վերևվի դաշտի տեքստը:",
 'yourtext'                  => 'Õ�Õ¥Ö€ Õ¿Õ¥Ö„Õ½Õ¿Õ¨',
 'storedversion'             => 'ÕŠÕ¡Õ°Õ¾Õ¡Õ® Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯',
-'nonunicodebrowser'         => '<strong>Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Õ‹Õ¥Ö€ Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ¨ Õ¹Õ¸Ö‚Õ¶Õ« Õ…Õ¸Ö‚Õ¶Õ«Õ¯Õ¸Õ¤ Õ¡ÕºÕ¡Õ°Õ¸Õ¾Õ¸Ö‚Õ´Ö‰ Õ€Õ¸Õ¤Õ¾Õ¡Õ®Õ¶Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬Õ«Õ½ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¸Õ¹-ASCII Õ½Õ«Õ´Õ¾Õ¬Õ¸Õ¶Õ¥Ö€Õ¨ ÖƒÕ¸Õ­Õ¡Ö€Õ«Õ¶Õ¾Õ¥Õ¬Õ¸Ö‚ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ¿Õ¡Õ½Õ¶Õ¾Õ¥Ö�Õ¡Õ¯Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¸Õ¾Ö‰</strong>',
-'editingold'                => '<strong>Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Ô´Õ¸Ö‚Ö„ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ½ Õ§Õ»Õ« Õ°Õ¶Õ¡Ö�Õ¡Õ® Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Ö‰ Ô·Õ»Õ¨ Õ°Õ«Õ·Õ¥Õ¬Õ¸Ö‚Ö� Õ°Õ¥Õ¿Õ¸ Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¶Õ¥Ö€Õ¸Ö‚Õ´ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¡Õ® ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ¯Õ¸Ö€Õ¥Õ¶Ö‰</strong>',
+'nonunicodebrowser'         => "'''Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Õ‹Õ¥Ö€ Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ¨ Õ¹Õ¸Ö‚Õ¶Õ« Õ…Õ¸Ö‚Õ¶Õ«Õ¯Õ¸Õ¤ Õ¡ÕºÕ¡Õ°Õ¸Õ¾Õ¸Ö‚Õ´Ö‰ Õ€Õ¸Õ¤Õ¾Õ¡Õ®Õ¶Õ¥Ö€ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬Õ«Õ½ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¸Õ¹-ASCII Õ½Õ«Õ´Õ¾Õ¬Õ¸Õ¶Õ¥Ö€Õ¨ ÖƒÕ¸Õ­Õ¡Ö€Õ«Õ¶Õ¾Õ¥Õ¬Õ¸Ö‚ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ¿Õ¡Õ½Õ¶Õ¾Õ¥Ö�Õ¡Õ¯Õ¡Õ¶ Õ¯Õ¸Õ¤Õ¥Ö€Õ¸Õ¾Ö‰'''",
+'editingold'                => "'''Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Ô´Õ¸Ö‚Ö„ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ½ Õ§Õ»Õ« Õ°Õ¶Õ¡Ö�Õ¡Õ® Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Ö‰ Ô·Õ»Õ¨ Õ°Õ«Õ·Õ¥Õ¬Õ¸Ö‚Ö� Õ°Õ¥Õ¿Õ¸ Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¶Õ¥Ö€Õ¸Ö‚Õ´ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¡Õ® ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ¯Õ¸Ö€Õ¥Õ¶Ö‰'''",
 'yourdiff'                  => 'Õ�Õ¡Ö€Õ¢Õ¥Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨',
-'copyrightwarning'          => 'Ô» Õ¶Õ¯Õ¡Õ¿Õ« Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Ö„ Õ¸Ö€ Õ¿Õ¥Ö„Õ½Õ¿Õ« ÕµÕ¸Ö‚Ö€Õ¡Ö„Õ¡Õ¶Õ¹ÕµÕ¸Ö‚Ö€ Õ¬Ö€Õ¡Ö�Õ¸Ö‚Õ´ Ö‡ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ°Õ¡Õ´Õ¡Ö€Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¾Õ¡Õ® $2 Õ¬Õ«Ö�Õ¥Õ¶Õ¦Õ«ÕµÕ« Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ (Õ¿Õ¥Õ½ $1 Õ´Õ¡Õ¶Ö€Õ¡Õ´Õ¡Õ½Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€)Ö‰
+'copyrightwarning'          => "Ô» Õ¶Õ¯Õ¡Õ¿Õ« Õ¸Ö‚Õ¶Õ¥Ö�Õ¥Ö„ Õ¸Ö€ Õ¿Õ¥Ö„Õ½Õ¿Õ« ÕµÕ¸Ö‚Ö€Õ¡Ö„Õ¡Õ¶Õ¹ÕµÕ¸Ö‚Ö€ Õ¬Ö€Õ¡Ö�Õ¸Ö‚Õ´ Ö‡ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ°Õ¡Õ´Õ¡Ö€Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¾Õ¡Õ® $2 Õ¬Õ«Ö�Õ¥Õ¶Õ¦Õ«ÕµÕ« Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ (Õ¿Õ¥Õ½ $1 Õ´Õ¡Õ¶Ö€Õ¡Õ´Õ¡Õ½Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€)Ö‰
 ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ¹Õ¥Ö„ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´, Õ¸Ö€ Õ±Õ¥Ö€ Õ¶ÕµÕ¸Ö‚Õ©Õ¨ Õ¡Õ¶Õ¸Õ²Õ¸Ö„ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¾Õ« Õ¸Ö‚ Õ¡Õ¦Õ¡Õ¿ Õ¿Õ¡Ö€Õ¡Õ®Õ¾Õ«, Õ¡ÕºÕ¡ Õ´Õ«Õ› Õ¿Õ¥Õ²Õ¡Õ¤Ö€Õ¥Ö„ Õ¡ÕµÕ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰<br />
 Ô´Õ¸Ö‚Ö„ Õ¶Õ¡Ö‡ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ«Õ¡Ö�Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ´Õ¥Õ¦, Õ¸Ö€ Õ¶ÕµÕ¸Ö‚Õ©Õ¨ Õ£Ö€Õ¾Õ¡Õ® Õ§ Õ±Õ¥Ö€ Õ¯Õ¸Õ²Õ´Õ«Ö� Õ¯Õ¡Õ´ Õ¾Õ¥Ö€Ö�Õ¾Õ¡Õ® Õ§ Õ¡Õ¦Õ¡Õ¿ Õ¿Õ¡Ö€Õ¡Õ®Õ¸Ö‚Õ´ Ö‡ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¸Õ² Õ¡Õ²Õ¢ÕµÕ¸Ö‚Ö€Õ¶Õ¥Ö€Õ«Ö�Ö‰
-<strong>ՄԻ՛ �ԵՂԱԴ�ԵՔ ՀԵՂԻՆԱԿԱՅԻՆ Ի�ԱՎՈՒՆՔՆԵ�ՈՎ ՊԱՇ�ՊԱՆՎԱԾ ՆՅՈՒԹԵ� ԱՌԱՆՑ ԹՈՒՅԼԱ��ՈՒԹՅԱՆ։</strong>',
-'copyrightwarning2'         => 'Խնդրում ենք ի նկատի ունենալ, որ {{SITENAME}} կայքում արված բոլոր ներդրումները կարող են խմբագրվել, վերամշակվել կամ ջնջվել ուրիշ մասնակի�ների կողմի�։ Եթե դուք չեք �անկանում, որ ձեր նյութը խմբագրվի, ապա մի՛ տեղադրեք այն այստեղ։<br /> Դուք նաև հավաստիա�նում եք մեզ, որ նյութը գրված է ձեր կողմի� կամ վեր�ված է ազատ տարածում և պարունակության փոփոխություններ թույլատրող աղբյուրների� (մանրամասնությունների համար տես $1)։ <strong>ՄԻ՛ �ԵՂԱԴ�ԵՔ ՀԵՂԻՆԱԿԱՅԻՆ Ի�ԱՎՈՒՆՔՆԵ�ՈՎ ՊԱՇ�ՊԱՆՎԱԾ ՆՅՈՒԹԵ� ԱՌԱՆՑ ԹՈՒՅԼԱ��ՈՒԹՅԱՆ։</strong>',
-'longpagewarning'           => '<strong>Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Ô±ÕµÕ½ Õ§Õ»Õ« Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶ Õ§ $1 Õ¯Õ«Õ¬Õ¸Õ¢Õ¡ÕµÕ©Ö‰ ÕˆÖ€Õ¸Õ· Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ¶Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¤ÕªÕ¾Õ¡Ö€Õ¡Õ¶Õ¡Õ¬ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ 32 Ô¿Ô² Ö‡ Õ¡Õ¾Õ¥Õ¬ Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ¥Ö�Õ¸Õ² Õ§Õ»Õ¥Ö€Õ¨Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« Õ¿Ö€Õ¸Õ°Õ¸Ö‚Õ´Õ¨ ÖƒÕ¸Ö„Ö€ Õ¢Õ¡ÕªÕ«Õ¶Õ¶Õ¥Ö€Õ«Ö‰</strong>',
-'longpageerror'             => '<strong>Õ�Ô½Ô±Ô¼. Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ¡Ö�Õ¾Õ¡Õ® Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¸Ö‚Õ¶Õ« $1 Õ¯Õ«Õ¬Õ¸Õ¢Õ¡ÕµÕ© Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶, Õ«Õ¶Õ¹Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶Ö�Õ¸Ö‚Õ´ Õ§ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ® $2 Ô¿Ô² Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ¹Õ¡ÖƒÕ¨Ö‰ Ô·Õ»Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ°Õ«Õ·Õ¾Õ¥Õ¬Ö‰</strong>',
-'readonlywarning'           => '<strong>Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Õ�Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡Õ¶ Õ¯Õ¸Õ²ÕºÕ¾Õ¥Õ¬ Õ§ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾, Ö‡ Õ¤Õ¸Ö‚Ö„ Õ¹Õ¥Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ°Õ«Õ·Õ¥Õ¬ Õ±Õ¥Ö€ Õ¯Õ¡Õ¿Õ¡Ö€Õ¡Õ® ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¡ÕµÕ½ ÕºÕ¡Õ°Õ«Õ¶Ö‰ Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ«Õ´Õ¡Õ½Õ¿ Õ¸Ö‚Õ¶Õ« ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¿Õ¥Ö„Õ½Õ¿Õ¡ÕµÕ«Õ¶ Ö†Õ¡ÕµÕ¬Õ« Õ´Õ¥Õ» Ö‡ ÕºÕ¡Õ°Õ¥Õ¬ Õ¡ÕµÕ¶Õ� Õ°Õ¥Õ¿Õ¡Õ£Õ¡ÕµÕ¸Ö‚Õ´ Õ¶Õ¡Õ­Õ¡Õ£Õ®Õ¸Ö‚Õ´ Õ¡Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰</strong>',
-'protectedpagewarning'      => '<strong>Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Ô±ÕµÕ½ Õ§Õ»Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ«Ö�. Õ¡ÕµÕ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¡Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Ö€Õ¡Õ¿Õ¸Ö€Õ¶Õ¥Ö€Õ¨Ö‰</strong>',
+'''ՄԻ՛ �ԵՂԱԴ�ԵՔ ՀԵՂԻՆԱԿԱՅԻՆ Ի�ԱՎՈՒՆՔՆԵ�ՈՎ ՊԱՇ�ՊԱՆՎԱԾ ՆՅՈՒԹԵ� ԱՌԱՆՑ ԹՈՒՅԼԱ��ՈՒԹՅԱՆ։'''",
+'copyrightwarning2'         => "Խնդրում ենք ի նկատի ունենալ, որ {{SITENAME}} կայքում արված բոլոր ներդրումները կարող են խմբագրվել, վերամշակվել կամ ջնջվել ուրիշ մասնակի�ների կողմի�։ Եթե դուք չեք �անկանում, որ ձեր նյութը խմբագրվի, ապա մի՛ տեղադրեք այն այստեղ։<br /> Դուք նաև հավաստիա�նում եք մեզ, որ նյութը գրված է ձեր կողմի� կամ վեր�ված է ազատ տարածում և պարունակության փոփոխություններ թույլատրող աղբյուրների� (մանրամասնությունների համար տես $1)։ '''ՄԻ՛ �ԵՂԱԴ�ԵՔ ՀԵՂԻՆԱԿԱՅԻՆ Ի�ԱՎՈՒՆՔՆԵ�ՈՎ ՊԱՇ�ՊԱՆՎԱԾ ՆՅՈՒԹԵ� ԱՌԱՆՑ ԹՈՒՅԼԱ��ՈՒԹՅԱՆ։'''",
+'longpagewarning'           => "'''Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Ô±ÕµÕ½ Õ§Õ»Õ« Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶ Õ§ $1 Õ¯Õ«Õ¬Õ¸Õ¢Õ¡ÕµÕ©Ö‰ ÕˆÖ€Õ¸Õ· Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€Õ¶Õ¥Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¤ÕªÕ¾Õ¡Ö€Õ¡Õ¶Õ¡Õ¬ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ 32 Ô¿Ô² Ö‡ Õ¡Õ¾Õ¥Õ¬ Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ¥Ö�Õ¸Õ² Õ§Õ»Õ¥Ö€Õ¨Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« Õ¿Ö€Õ¸Õ°Õ¸Ö‚Õ´Õ¨ ÖƒÕ¸Ö„Ö€ Õ¢Õ¡ÕªÕ«Õ¶Õ¶Õ¥Ö€Õ«Ö‰'''",
+'longpageerror'             => "'''Õ�Ô½Ô±Ô¼. Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ¡Ö�Õ¾Õ¡Õ® Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¸Ö‚Õ¶Õ« $1 Õ¯Õ«Õ¬Õ¸Õ¢Õ¡ÕµÕ© Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶, Õ«Õ¶Õ¹Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶Ö�Õ¸Ö‚Õ´ Õ§ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ® $2 Ô¿Ô² Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ¹Õ¡ÖƒÕ¨Ö‰ Ô·Õ»Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ°Õ«Õ·Õ¾Õ¥Õ¬Ö‰'''",
+'readonlywarning'           => "'''Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Õ�Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡Õ¶ Õ¯Õ¸Õ²ÕºÕ¾Õ¥Õ¬ Õ§ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾, Ö‡ Õ¤Õ¸Ö‚Ö„ Õ¹Õ¥Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ°Õ«Õ·Õ¥Õ¬ Õ±Õ¥Ö€ Õ¯Õ¡Õ¿Õ¡Ö€Õ¡Õ® ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¡ÕµÕ½ ÕºÕ¡Õ°Õ«Õ¶Ö‰ Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ«Õ´Õ¡Õ½Õ¿ Õ¸Ö‚Õ¶Õ« ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¿Õ¥Ö„Õ½Õ¿Õ¨ Õ¿Õ¥Ö„Õ½Õ¿Õ¡ÕµÕ«Õ¶ Ö†Õ¡ÕµÕ¬Õ« Õ´Õ¥Õ» Ö‡ ÕºÕ¡Õ°Õ¥Õ¬ Õ¡ÕµÕ¶Õ� Õ°Õ¥Õ¿Õ¡Õ£Õ¡ÕµÕ¸Ö‚Õ´ Õ¶Õ¡Õ­Õ¡Õ£Õ®Õ¸Ö‚Õ´ Õ¡Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰'''",
+'protectedpagewarning'      => "'''Ô¶Ô³ÕˆÕ’Õ‡Ô±Õ‘ÕˆÕ’Õ„. Ô±ÕµÕ½ Õ§Õ»Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ«Ö�. Õ¡ÕµÕ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¡Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Ö€Õ¡Õ¿Õ¸Ö€Õ¶Õ¥Ö€Õ¨Ö‰'''",
 'semiprotectedpagewarning'  => "'''Ô¾Õ¡Õ¶Õ¸Ö‚Ö�Õ¸Ö‚Õ´.''' Ô±ÕµÕ½ Õ§Õ»Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§. Õ¡ÕµÕ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ£Ö€Õ¡Õ¶Ö�Õ¾Õ¡Õ® Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ¨Ö‰",
 'cascadeprotectedwarning'   => "'''Ô¶Õ£Õ¸Ö‚Õ·Õ¡Ö�Õ¸Ö‚Õ´.''' Ô±ÕµÕ½ Õ§Õ»Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§ Ö‡ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¾Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¡Õ¤Õ´Õ«Õ¶Õ«Õ½Õ¿Ö€Õ¡Õ¿Õ¸Ö€Õ¶Õ¥Ö€Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Õ¨Õ¶Õ¤Õ£Ö€Õ¯Õ¾Õ¡Õ® Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ¯Õ¡Õ½Õ¯Õ¡Õ¤Õ¡ÕµÕ«Õ¶-ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ´Õ¢ {{PLURAL:$1|Õ§Õ»Õ¸Ö‚Õ´|Õ§Õ»Õ¥Ö€Õ¸Ö‚Õ´}}.",
 'templatesused'             => 'Ô±ÕµÕ½ Õ§Õ»Õ¸Ö‚Õ´ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¡Õ® Õ¯Õ¡Õ²Õ¡ÕºÕ¡Ö€Õ¶Õ¥Ö€Õ¨.',
@@ -845,11 +828,9 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 # History pages
 'viewpagelogs'        => 'Ô´Õ«Õ¿Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¶Õ¥Ö€Õ¨',
 'nohistory'           => 'Ô±ÕµÕ½ Õ§Õ»Õ¨ Õ¹Õ¸Ö‚Õ¶Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Ö‰',
-'revnotfound'         => 'Õ�Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ¹Õ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬',
-'revnotfoundtext'     => 'Ô·Õ»Õ« Õ¸Ö€Õ¸Õ¶Õ¾Õ¡Õ® Õ°Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ¹Õ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ Õ¡ÕµÕ¶ Õ°Õ²Õ¸Ö‚Õ´Õ¨, Õ¸Ö€Õ¸Õ¾ Õ¡Õ¶Ö�Õ¥Õ¬ Õ¥Ö„ Õ¡ÕµÕ½ Õ§Õ»Õ«Õ¶Ö‰',
 'currentrev'          => 'Ô¸Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯',
 'revisionasof'        => '$1-Õ« Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯',
-'revision-info'       => '$1 Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯, $2',
+'revision-info'       => '$1 Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯, $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Նախորդ տարբերակ',
 'nextrevision'        => 'Հաջորդ տարբերակ→',
 'currentrevisionlink' => 'Ô¸Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯',
@@ -937,6 +918,7 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'prevn'                     => 'Õ¶Õ¡Õ­Õ¸Ö€Õ¤ $1',
 'nextn'                     => 'Õ°Õ¡Õ»Õ¸Ö€Õ¤ $1',
 'viewprevnext'              => 'Ô´Õ«Õ¿Õ¥Õ¬ ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:Ô³Õ¬Õ­Õ¡Ö�Õ¡Õ¶Õ¯',
 'search-mwsuggest-enabled'  => 'Õ¡Õ¼Õ¡Õ»Õ¡Ö€Õ¯Õ¶Õ¥Ö€Õ¸Õ¾',
 'search-mwsuggest-disabled' => 'Õ¡Õ¼Õ¡Õ¶Õ± Õ¡Õ¼Õ¡Õ»Õ¡Ö€Õ¯Õ¶Õ¥Ö€Õ«',
 'searchall'                 => 'Õ¢Õ¸Õ¬Õ¸Ö€',
@@ -961,6 +943,7 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'qbsettings-floatingright' => 'Ô±Õ»Õ«Ö� Õ¬Õ¸Õ²Õ¡Ö�Õ¸Õ²',
 'changepassword'           => 'Õ“Õ¸Õ­Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨',
 'skin'                     => 'Õ�Õ¥Õ½Ö„',
+'skin-preview'             => 'Õ¶Õ¡Õ­Õ¡Õ¤Õ«Õ¿Õ¥Õ¬',
 'math'                     => 'Õ„Õ¡Õ©',
 'dateformat'               => 'Õ•Ö€ Õ¸Ö‚ ÕªÕ¡Õ´Õ¾Õ¡ Õ±Ö‡Õ¨',
 'datedefault'              => 'Ô±Õ¼Õ¡Õ¶Ö� Õ¶Õ¡Õ­Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶',
@@ -982,9 +965,6 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'prefs-misc'               => 'Ô±ÕµÕ¬',
 'saveprefs'                => 'Õ€Õ«Õ·Õ¥Õ¬',
 'resetprefs'               => 'Ô±Õ¶Õ¿Õ¥Õ½Õ¥Õ¬ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨',
-'oldpassword'              => 'Õ€Õ«Õ¶ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.',
-'newpassword'              => 'Õ†Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.',
-'retypenew'                => 'Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.',
 'textboxsize'              => 'Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´',
 'rows'                     => 'Õ�Õ¸Õ²Õ¥Ö€`',
 'columns'                  => 'Õ�ÕµÕ¸Ö‚Õ¶Õ¡Õ¯Õ¶Õ¥Ö€',
@@ -1088,11 +1068,11 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'uploadnologintext'           => 'Õ–Õ¡ÕµÕ¬Õ¥Ö€ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ [[Special:UserLogin|Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£]]Ö‰',
 'upload_directory_read_only'  => 'ÕŽÕ¥Õ¢-Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ¨ Õ¹Õ¸Ö‚Õ¶Õ« Õ£Ö€Õ¥Õ¬Õ¸Ö‚ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„ Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ ($1)Ö‰',
 'uploaderror'                 => 'Ô²Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ½Õ­Õ¡Õ¬',
-'uploadtext'                  => "Õ–Õ¡ÕµÕ¬ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Ö„ Õ½Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ±Ö‡Õ¨Ö‰ Õ†Õ¡Õ­Õ¯Õ«Õ¶Õ¸Ö‚Õ´ Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ¨ Õ¤Õ«Õ¿Õ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Õ´ Õ¸Ö€Õ¸Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¡ÕµÖ�Õ¥Õ¬Õ¥Ö„ [[Special:ImageList|Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨]]Ö‰ Ô²Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Ö‡ Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¶Õ¡Ö‡ Õ£Ö€Õ¡Õ¶Ö�Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ [[Special:Log/upload|Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¸Ö‚Õ´]]Ö‰
+'uploadtext'                  => "Õ–Õ¡ÕµÕ¬ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Ö„ Õ½Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ±Ö‡Õ¨Ö‰ Õ†Õ¡Õ­Õ¯Õ«Õ¶Õ¸Ö‚Õ´ Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ¨ Õ¤Õ«Õ¿Õ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Õ´ Õ¸Ö€Õ¸Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¡ÕµÖ�Õ¥Õ¬Õ¥Ö„ [[Special:FileList|Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨]]Ö‰ Ô²Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Ö‡ Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¶Õ¡Ö‡ Õ£Ö€Õ¡Õ¶Ö�Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ [[Special:Log/upload|Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¸Ö‚Õ´]]Ö‰
 
 Ô±ÕµÕ½ Ö†Õ¡ÕµÕ¬Õ¨ Õ¸Ö€Ö‡Õ§ Õ§Õ»Õ¸Ö‚Õ´ Õ¨Õ¶Õ¤Õ£Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Ö„ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ°Õ²Õ´Õ¡Õ¶ Õ±Ö‡Õ¥Ö€Õ¨.
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|Õ¡ÕµÕ¬. Õ¿Õ¥Ö„Õ½Õ¿]]</nowiki>''' Õ¯Õ¡Õ´
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|Õ¡ÕµÕ¬. Õ¿Õ¥Ö„Õ½Õ¿]]</nowiki>''' Õ¯Õ¡Õ´
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' - Ö†Õ¡ÕµÕ¬Õ«Õ¶ Õ¸Ö‚Õ²Õ«Õ² Õ°Õ²Õ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€",
 'uploadlog'                   => 'Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
 'uploadlogpage'               => 'Ô²Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
@@ -1113,16 +1093,16 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'large-file'                  => 'Ô½Õ¸Ö€Õ°Õ¸Ö‚Ö€Õ¤ Õ§ Õ¿Ö€Õ¾Õ¸Ö‚Õ´ Õ¹Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ $1 Õ¢Õ¡ÕµÕ©Õ«Ö� Õ´Õ¥Õ® Ö†Õ¡ÕµÕ¬Õ¥Ö€. Õ¡ÕµÕ½ Ö†Õ¡ÕµÕ¬Õ« Õ¹Õ¡ÖƒÕ¶ Õ§Õ�  $2 Õ¢Õ¡ÕµÕ©Ö‰',
 'largefileserver'             => 'Ô±ÕµÕ½ Ö†Õ¡ÕµÕ¬Õ¨ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¡Õ® Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ¹Õ¡ÖƒÕ«Ö� Õ´Õ¥Õ® Õ§Ö‰',
 'emptyfile'                   => 'Õ�Õ¥Ö€ Õ¢Õ¥Õ¼Õ¶Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¨ Õ¨Õ½Õ¿ Õ¥Ö€Ö‡Õ¸Ö‚ÕµÕ©Õ«Õ¶ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§Ö‰ Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ§ Õ½Õ¡ Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¥Õ» Õ¿Õ¡Õ¼Õ¡Õ½Õ­Õ¡Õ¬Õ« Õ°Õ¥Õ¿Ö‡Õ¡Õ¶Ö„ Õ§Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬, Õ©Õ¥ Õ¡Ö€Õ¤ÕµÕ¸Ö„ Õ«Õ½Õ¯Õ¡ÕºÕ¥Õ½ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Ö„ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ Ö†Õ¡ÕµÕ¬Õ¨Ö‰',
-'fileexists'                  => 'Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ«Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ <strong><tt>$1</tt></strong>, Õ¥Õ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ°Õ¡Õ´Õ¸Õ¦Õ¾Õ¡Õ® Õ¹Õ¥Ö„, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶ ÖƒÕ¸Õ­Õ¡Ö€Õ«Õ¶Õ¥Õ¬Ö‰',
-'fileexists-extension'        => 'Ô³Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ« Õ°Õ¡Õ´Õ¡Õ¶Õ´Õ¡Õ¶ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬.<br />
-Ô²Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´. <strong><tt>$1</tt></strong><br />
-Ô³Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ¥Ö�Õ¸Õ² Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´. <strong><tt>$2</tt></strong><br />
-Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬ Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Ö‰',
+'fileexists'                  => "Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ«Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ '''<tt>$1</tt>''', Õ¥Õ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ°Õ¡Õ´Õ¸Õ¦Õ¾Õ¡Õ® Õ¹Õ¥Ö„, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶ ÖƒÕ¸Õ­Õ¡Ö€Õ«Õ¶Õ¥Õ¬Ö‰",
+'fileexists-extension'        => "Ô³Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ« Õ°Õ¡Õ´Õ¡Õ¶Õ´Õ¡Õ¶ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬.<br />
+Ô²Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´. '''<tt>$1</tt>'''<br />
+Ô³Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ¥Ö�Õ¸Õ² Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´. '''<tt>$2</tt>'''<br />
+Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬ Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Ö‰",
 'fileexists-thumb'            => "<center>'''Ô³Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ¥Ö�Õ¸Õ² ÕºÕ¡Õ¿Õ¯Õ¥Ö€'''</center>",
-'fileexists-thumbnail-yes'    => 'Õ–Õ¡ÕµÕ¬Õ¨ Õ¨Õ½Õ¿ Õ¥Ö€Ö‡Õ¸Ö‚ÕµÕ©Õ«Õ¶ ÖƒÕ¸Ö„Ö€Õ¡Ö�Õ¾Õ¡Õ® ÕºÕ¡Õ¿Õ³Õ¥Õ¶ Õ§ <i>(ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ«Õ¯)</i>: Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ <strong><tt>$1</tt></strong> Ö†Õ¡ÕµÕ¬Õ¨Ö‰<br /> ÔµÕ©Õ¥ Õ¶Õ·Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¸Ö‚ÕµÕ¶ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¶ Õ§ Õ¢Õ¶Ö…Ö€Õ«Õ¶Õ¡Õ¯ Õ¹Õ¡ÖƒÕ¸Õ¾, Õ¡ÕºÕ¡ Õ°Õ¡Ö€Õ¯Õ¸Õ¾Õ¸Ö€ Õ¹Õ§ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¶Ö€Õ¡ ÖƒÕ¸Ö„Ö€Õ¡Ö�Õ¾Õ¡Õ® ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¨Ö‰',
-'file-thumbnail-no'           => 'Õ–Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ¶ Õ½Õ¯Õ«Õ¦Õ¢Õ¶ Õ§Õ� <strong><tt>$1</tt></strong>Ö‰ Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ½Õ¡ ÖƒÕ¸Ö„Ö€Õ¡Ö�Õ¾Õ¡Õ® ÕºÕ¡Õ¿Õ³Õ¥Õ¶ Õ§ <i>(ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ«Õ¯)</i>Ö‰ ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ¸Ö‚Õ¶Õ¥Ö„ Õ¡ÕµÕ½ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¨ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¡Õ¯Õ¡Õ¶ Õ¹Õ¡ÖƒÕ¸Õ¾, Õ¡ÕºÕ¡ Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡ÕµÕ¶, Õ°Õ¡Õ¯Õ¡Õ¼Õ¡Õ¯ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Õ� Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ ÖƒÕ¸Õ­Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¨Ö‰',
-'fileexists-forbidden'        => 'Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ«Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¥Õ¿ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ Ö‡ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢Ö‰ [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ« Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ« Õ¨Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Õ¦Õ¥Õ¿Õ¥Õ²Õ¡Ö€Õ¡Õ¶Õ¸Ö‚Õ´Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¥Õ¿ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ Ö‡ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢Ö‰ [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Õ–Õ¡ÕµÕ¬Õ¨ Õ¨Õ½Õ¿ Õ¥Ö€Ö‡Õ¸Ö‚ÕµÕ©Õ«Õ¶ ÖƒÕ¸Ö„Ö€Õ¡Ö�Õ¾Õ¡Õ® ÕºÕ¡Õ¿Õ³Õ¥Õ¶ Õ§ ''(ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ«Õ¯)'': Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ '''<tt>$1</tt>''' Ö†Õ¡ÕµÕ¬Õ¨Ö‰<br /> ÔµÕ©Õ¥ Õ¶Õ·Õ¾Õ¡Õ® Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¸Ö‚ÕµÕ¶ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¶ Õ§ Õ¢Õ¶Ö…Ö€Õ«Õ¶Õ¡Õ¯ Õ¹Õ¡ÖƒÕ¸Õ¾, Õ¡ÕºÕ¡ Õ°Õ¡Ö€Õ¯Õ¸Õ¾Õ¸Ö€ Õ¹Õ§ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¶Ö€Õ¡ ÖƒÕ¸Ö„Ö€Õ¡Ö�Õ¾Õ¡Õ® ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¨Ö‰",
+'file-thumbnail-no'           => "Õ–Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ¶ Õ½Õ¯Õ«Õ¦Õ¢Õ¶ Õ§Õ� '''<tt>$1</tt>'''Ö‰ Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ½Õ¡ ÖƒÕ¸Ö„Ö€Õ¡Ö�Õ¾Õ¡Õ® ÕºÕ¡Õ¿Õ³Õ¥Õ¶ Õ§ ''(ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ«Õ¯)''Ö‰ ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ¸Ö‚Õ¶Õ¥Ö„ Õ¡ÕµÕ½ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¨ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¡Õ¯Õ¡Õ¶ Õ¹Õ¡ÖƒÕ¸Õ¾, Õ¡ÕºÕ¡ Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡ÕµÕ¶, Õ°Õ¡Õ¯Õ¡Õ¼Õ¡Õ¯ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Õ� Õ­Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ ÖƒÕ¸Õ­Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¨Ö‰",
+'fileexists-forbidden'        => 'Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ«Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¥Õ¿ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ Ö‡ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢Ö‰ [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢ Ö†Õ¡ÕµÕ¬ Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ« Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ« Õ¨Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Õ¦Õ¥Õ¿Õ¥Õ²Õ¡Ö€Õ¡Õ¶Õ¸Ö‚Õ´Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¥Õ¿ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ Ö‡ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢Ö‰ [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Ô²Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¡Õ® Õ§',
 'uploadwarning'               => 'Ô¶Õ£Õ¸Ö‚Õ·Õ¡Ö�Õ¸Ö‚Õ´',
 'savefile'                    => 'Õ€Õ«Õ·Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨',
@@ -1141,7 +1121,7 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 
 Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¾Õ¥Ö€Õ¡Õ¶Õ¡ÕµÕ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ« Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¡Õ°Õ¡Ö€Õ´Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨Ö‰
 Ô±ÕµÕ½ Ö†Õ¡ÕµÕ¬Õ« Õ»Õ¶Õ»Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¨ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ§ Õ½Õ¿Õ¸Ö€Ö‡.",
-'filename-bad-prefix'         => 'Բեռնվող ֆայլի անվանումը սկսվում է <strong><tt>«$1»</tt></strong> արտահայտությամբ, որը ոչ-նկարագրական է և սովորաբար տրվում է թվային լուսանկարչական ապարատների կողմի�։ Խնդրում ենք ընտրել ավելի նկարագրական անվանում ձեր ֆայլի համար։',
+'filename-bad-prefix'         => "Բեռնվող ֆայլի անվանումը սկսվում է '''<tt>«$1»</tt>''' արտահայտությամբ, որը ոչ-նկարագրական է և սովորաբար տրվում է թվային լուսանկարչական ապարատների կողմի�։ Խնդրում ենք ընտրել ավելի նկարագրական անվանում ձեր ֆայլի համար։",
 
 'upload-proto-error'      => 'Õ�Õ­Õ¡Õ¬ ÕºÖ€Õ¸Õ¿Õ¸Õ¯Õ¸Õ¬',
 'upload-proto-error-text' => 'Õ€Õ¥Õ¼Õ¡Õ¾Õ¸Ö€ Õ¢Õ¥Õ¼Õ¶Õ¸Ö‚Õ´Õ¨ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¸Ö‚Õ´ Õ§ URL-Õ°Õ¡Õ½Ö�Õ¥, Õ¸Ö€Õ¨ Õ½Õ¯Õ½Õ¾Õ¸Ö‚Õ´ Õ§ <code>http://</code> Õ¯Õ¡Õ´ <code>ftp://</code> Õ¶Õ¡Õ­Õ¡Õ®Õ¡Õ¶Ö�Õ¸Õ¾Ö‰',
@@ -1162,17 +1142,17 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'upload_source_url'  => ' (Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¶, Õ°Õ¡Õ¶Ö€Õ¡Õ´Õ¡Õ¿Õ¹Õ¥Õ¬Õ« URL-Õ°Õ¡Õ½Ö�Õ¥)',
 'upload_source_file' => ' (Ö†Õ¡ÕµÕ¬ Õ±Õ¥Ö€ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ« Õ¾Ö€Õ¡)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'ÕˆÖ€Õ¸Õ¶Õ¥Õ¬ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢.',
+# Special:ListFiles
+'listfiles_search_for'  => 'ÕˆÖ€Õ¸Õ¶Õ¥Õ¬ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ« Õ¡Õ¶Õ¾Õ¡Õ¶Õ´Õ¡Õ´Õ¢.',
 'imgfile'               => 'Ö†Õ¡ÕµÕ¬',
-'imagelist'             => 'Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯',
-'imagelist_date'        => 'Õ•Ö€/ÔºÕ¡Õ´',
-'imagelist_name'        => 'Ô±Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´',
-'imagelist_user'        => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�',
-'imagelist_size'        => 'Õ‰Õ¡Öƒ',
-'imagelist_description' => 'Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
-
-# Image description page
+'listfiles'             => 'Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯',
+'listfiles_date'        => 'Õ•Ö€/ÔºÕ¡Õ´',
+'listfiles_name'        => 'Ô±Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´',
+'listfiles_user'        => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�',
+'listfiles_size'        => 'Õ‰Õ¡Öƒ',
+'listfiles_description' => 'Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
+
+# File description page
 'filehist'                  => 'Õ–Õ¡ÕµÕ¬Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
 'filehist-help'             => 'Õ„Õ¡Õ¿Õ¶Õ¡Õ°Õ¡Ö€Õ¥Ö„ Ö…Ö€Õ¾Õ¡Õ¶/ÕªÕ¡Õ´Õ«Õ¶Õ� Ö†Õ¡ÕµÕ¬Õ« Õ¡ÕµÕ¤ ÕºÕ¡Õ°Õ«Õ¶ Õ¿Õ¥Õ½Ö„Õ¨ Õ¤Õ«Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰',
 'filehist-deleteall'        => 'Õ»Õ¶Õ»Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨',
@@ -1215,7 +1195,6 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'filedelete-success-old' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' Ö†Õ¡ÕµÕ¬Õ« $3, $2 ÕºÕ¡Õ°Õ¸Õ¾ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ§Ö‰</span>',
 'filedelete-nofile'      => "'''$1''' Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ« Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ¸Ö‚Õ´Ö‰",
 'filedelete-nofile-old'  => "'''$1''' Ö†Õ¡ÕµÕ¬Õ« Õ¶Õ·Õ¾Õ¡Õ® Õ°Õ¡Õ¿Õ¯Õ¡Õ¶Õ«Õ·Õ¶Õ¥Ö€Õ¸Õ¾ Õ¡Ö€Õ­Õ«Õ¾Õ¡ÕµÕ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯ Õ¹Õ¯Õ¡Ö‰",
-'filedelete-iscurrent'   => 'Ô´Õ¸Ö‚Ö„ ÖƒÕ¸Ö€Õ±Õ¸Ö‚Õ´ Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬ Õ¡ÕµÕ½ Ö†Õ¡ÕµÕ¬Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¡ÕµÕ¶ Õ¶Õ¡Õ­ Õ¥Õ¿ Õ·Ö€Õ»Õ¥Õ¬ Õ¸Ö€Ö‡Õ§ Õ¶Õ¡Õ­Õ¸Ö€Õ¤ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«Ö‰',
 
 # MIME search
 'mimesearch'         => 'ÕˆÖ€Õ¸Õ¶Õ¥Õ¬ MIME-Õ¿Õ¥Õ½Õ¡Õ¯Õ¸Õ¾',
@@ -1243,20 +1222,9 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'randomredirect-nopages' => 'Ô±ÕµÕ½ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¡Õ¿Õ¡Ö€Õ¡Õ®Ö„Õ¸Ö‚Õ´ Õ¾Õ¥Ö€Õ¡Õ°Õ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ¹Õ¯Õ¡Õ¶Ö‰',
 
 # Statistics
-'statistics'             => 'ÕŽÕ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
-'sitestats'              => 'Ô¿Õ¡ÕµÖ„Õ« Õ¾Õ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
-'userstats'              => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ« Õ¾Õ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
-'sitestatstext'          => "Õ�Õ¾ÕµÕ¬Õ¡Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ¸Ö‚Õ´ Õ¯Õ¡ '''$2''' Õ°Õ¸Õ¤Õ¾Õ¡Õ®Ö‰
-<br />Այս թիվը չի ընդգրկում մասնակի�ների և «քննարկման» էջերը, վերահղման, երկիմաստության փարատման և {{grammar:genitive|{{SITENAME}}}} կառավարման մասին էջերը, ինչպես նաև պատառ հոդվածները, որոնք չեն պարունակում ոչ մի ներքին հղում։ �րան� հետ մեկտեղ, ընդհանուր էջերի թիվն է� '''$1'''։
-
-{{grammar:genitive|{{SITENAME}}}} Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸Ö‚Õ´Õ«Ö� Õ« Õ¾Õ¥Ö€ Õ¥Õ²Õ¥Õ¬ Õ§ '''$3''' Õ§Õ»Õ« Õ¤Õ«Õ¿Õ¸Ö‚Õ´ Ö‡ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¥Õ¬ Õ§ '''$4''' Õ§Õ»Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Ö‰
-Õ�Õ¡ Õ¯Õ¡Õ¦Õ´Õ¸Ö‚Õ´ Õ§ Õ´Õ«Õ»Õ«Õ¶Õ¸Ö‚Õ´ '''$5''' Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´ Ö‡ '''$6''' Õ¤Õ«Õ¿Õ¸Ö‚Õ´ Õ´Õ¥Õ¯ Õ§Õ»Õ« Õ°Õ¡Õ·Õ¾Õ¸Õ¾Ö‰
-
-Ô²Õ¥Õ¼Õ¶Õ¾Õ¥Õ¬ Õ§ '''$8''' Ö†Õ¡ÕµÕ¬Ö‰
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Ô±Õ¼Õ¡Õ»Õ¡Õ¤Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ« Õ°Õ¥Ö€Õ©Õ«] Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶ Õ§Õ� '''$7'''Ö‰",
-'userstatstext'          => "Ô¿Õ¡Õ¶ '''$1''' Õ£Ö€Õ¡Õ¶Ö�Õ¾Õ¡Õ® Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€, Õ¸Ö€Õ¸Õ¶Ö�Õ«Ö� '''$2'''Õ¨ (Õ¯Õ¡Õ´ '''$4%'''Õ¨) $5 Õ¥Õ¶Ö‰",
-'statistics-mostpopular' => 'Ô±Õ´Õ¥Õ¶Õ¡Õ°Õ¡Õ³Õ¡Õ­ Õ¤Õ«Õ¿Õ¾Õ¸Õ² Õ§Õ»Õ¥Ö€',
+'statistics'              => 'ÕŽÕ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
+'statistics-header-users' => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ« Õ¾Õ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
+'statistics-mostpopular'  => 'Ô±Õ´Õ¥Õ¶Õ¡Õ°Õ¡Õ³Õ¡Õ­ Õ¤Õ«Õ¿Õ¾Õ¸Õ² Õ§Õ»Õ¥Ö€',
 
 'disambiguations'      => 'ÔµÖ€Õ¯Õ«Õ´Õ¡Õ½Õ¿Õ¸Ö‚Õ©ÕµÕ¡Õ¶ ÖƒÕ¡Ö€Õ¡Õ¿Õ´Õ¡Õ¶ Õ§Õ»Õ¥Ö€',
 'disambiguationspage'  => 'Template:ÔµÖ€Õ¯Õ«Õ´Õ¡Õ½Õ¿',
@@ -1334,8 +1302,6 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'speciallogtitlelabel' => 'Ô±Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´.',
 'log'                  => 'Õ�Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¶Õ¥Ö€',
 'all-logs-page'        => 'Ô²Õ¸Õ¬Õ¸Ö€ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¶Õ¥Ö€Õ¨',
-'log-search-legend'    => 'Õ�Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¶Õ¥Ö€Õ« Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´',
-'log-search-submit'    => 'Ô±Õ¶Ö�Õ¶Õ¥Õ¬',
 'alllogstext'          => '{{SITENAME}} Õ¯Õ¡ÕµÖ„Õ« Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¨Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Ö�Õ¡Õ¶Õ¯Ö‰
 Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Õ¨Õ½Õ¿ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ«, Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ« Õ¯Õ¡Õ´ Õ°Õ¡Õ´Õ¡ÕºÕ¡Õ¿Õ¡Õ½Õ­Õ¡Õ¶ Õ§Õ»Õ«Ö‰',
 'logempty'             => 'Õ�Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¸Ö‚Õ´ Õ¹Õ¯Õ¡Õ¶ Õ°Õ¡Õ´Õ¨Õ¶Õ¯Õ¶Õ¸Õ² Õ¿Õ¡Ö€Ö€Õ¥Ö€Ö‰',
@@ -1361,11 +1327,23 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'categories'         => 'Ô¿Õ¡Õ¿Õ¥Õ£Õ¸Ö€Õ«Õ¡Õ¶Õ¥Ö€',
 'categoriespagetext' => 'Õ€Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ¯Õ¡Õ¿Õ¥Õ£Õ¸Ö€Õ«Õ¡Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ¥Õ¶ Õ§Õ»Õ¥Ö€ Õ¯Õ¡Õ´ Õ´Õ¥Õ¤Õ«Õ¡Ö‰',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ¶Õ¥Ö€Õ¤Ö€Õ¸Ö‚Õ´',
+
+# Special:LinkSearch
+'linksearch-ok' => 'ÕˆÖ€Õ¸Õ¶Õ¥Õ¬',
+
 # Special:ListUsers
 'listusersfrom'      => 'Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ«Õ¶Õ� Õ½Õ¯Õ½Õ¡Õ®.',
 'listusers-submit'   => 'Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬',
 'listusers-noresult' => 'Ô±ÕµÕ¤ÕºÕ«Õ½Õ« Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€ Õ¹Õ£Õ¿Õ¶Õ¾Õ¥Ö�Õ«Õ¶Ö‰',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ« Õ£Ö€Õ¡Õ¶Ö�Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
+'newuserlogpagetext'       => 'Õ�Õ¡ Õ¶Õ¸Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ« Õ£Ö€Õ¡Õ¶Ö�Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¶ Õ§.',
+'newuserlog-create-entry'  => 'Õ†Õ¸Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�',
+'newuserlog-create2-entry' => 'Õ½Õ¿Õ¥Õ²Õ®Õ¥Ö� Õ¶Õ¸Ö€ Õ°Õ¡Õ·Õ«Õ¾ $1 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ°Õ¡Õ´Õ¡Ö€',
+
 # E-mail user
 'mailnologin'     => 'ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ°Õ¡Õ½Ö�Õ¥ Õ¹Õ¯Õ¡',
 'mailnologintext' => 'Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ [[Special:UserLogin|Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£]] Ö‡ Õ¸Ö‚Õ¶Õ¥Õ¶Õ¡Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ² Õ§Õ¬-ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½Ö�Õ¥ Õ±Õ¥Ö€ [[Special:Preferences|Õ¶Õ¡Õ­Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¸Ö‚Õ´]]Õ� Õ¸Ö‚Ö€Õ«Õ· Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¶Õ¥Ö€Õ«Õ¶ Õ§Õ¬Õ¥Õ¯Õ¿Ö€Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯Õ¶Õ¥Ö€ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰',
@@ -1416,12 +1394,6 @@ $3 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö�Õ¨ Õ¿Õ¾Õ¥Õ¬ Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨. ''$2''",
 'iteminvalidname'      => 'Խնդիր «$1» տարրի հետ, անթույլատրելի անվանում...',
 'wlnote'               => "Õ�Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® {{PLURAL:$1|Õ§ Õ¾Õ¥Ö€Õ»Õ«Õ¶ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨|Õ¥Õ¶ Õ¾Õ¥Ö€Õ»Õ«Õ¶ '''$1''' ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨}} Õ¾Õ¥Ö€Õ»Õ«Õ¶ <strong>$2</strong> ÕªÕ¡Õ´Õ¾Õ¡ Õ¨Õ¶Õ©Õ¡Ö�Ö„Õ¸Ö‚Õ´Ö‰",
 'wlshowlast'           => 'Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬ Õ¾Õ¥Ö€Õ»Õ«Õ¶ $1 ÕªÕ¡Õ´Õ¥Ö€Õ¨ $2 Ö…Ö€Õ¥Ö€Õ¨ $3',
-'watchlist-show-bots'  => 'Õ‘Õ¸Ö‚ÕµÖ� Õ¿Õ¡Õ¬ Õ¢Õ¸Õ¿Õ¥Ö€Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
-'watchlist-hide-bots'  => 'Ô¹Õ¡Ö„Ö�Õ¶Õ¥Õ¬ Õ¢Õ¸Õ¿Õ¥Ö€Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
-'watchlist-show-own'   => 'Õ‘Õ¸Ö‚ÕµÖ� Õ¿Õ¡Õ¬ Õ«Õ´ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
-'watchlist-hide-own'   => 'Ô¹Õ¡Ö„Ö�Õ¶Õ¥Õ¬ Õ«Õ´ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
-'watchlist-show-minor' => 'Õ‘Õ¸Ö‚ÕµÖ� Õ¿Õ¡Õ¬ Õ¹Õ¶Õ¹Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
-'watchlist-hide-minor' => 'Ô¹Õ¡Ö„Ö�Õ¶Õ¥Õ¬ Õ¹Õ¶Õ¹Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Õ€Õ½Õ¯Õ¾Õ¸Ö‚Õ´ Õ§...',
@@ -1460,57 +1432,62 @@ $NEWPAGE
 Õ€Õ¥Õ¿Õ¡Õ¤Õ¡Ö€Õ± Õ¯Õ¡Õº Ö‡ Ö…Õ£Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ�
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Õ‹Õ¶Õ»Õ¥Õ¬ Õ§Õ»Õ¨',
-'confirm'                     => 'Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬',
-'excontent'                   => 'բովանդակությունը սա էր` «$1»',
-'excontentauthor'             => 'Պարունակությունն էր. «$1» (և միակ հեղինակն էր� [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => 'պարունակությունը մինչև մաքրումը. «$1»',
-'exblank'                     => 'Õ§Õ»Õ¨ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§Ö€',
-'historywarning'              => 'Ô¶Õ£Õ¸Ö‚Õ·Õ¡Ö�Õ¸Ö‚Õ´. Õ§Õ»Õ¨, Õ¸Ö€Õ¨ Õ¤Õ¸Ö‚Ö„ ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¾Õ¸Ö‚Õ´ Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬ Õ¸Ö‚Õ¶Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Ö‰',
-'confirmdeletetext'           => 'Ô´Õ¸Ö‚Ö„ ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¾Õ¸Ö‚Õ´ Õ¥Ö„ Õ¨Õ¶Õ¤Õ´Õ«Õ·Õ¿ Õ»Õ¶Õ»Õ¥Õ¬ Õ§Õ»Õ¨ Õ¯Õ¡Õ´ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¨ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ«Ö� Õ«Ö€ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ°Õ¡Õ¶Õ¤Õ¥Ö€Õ±Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬, Õ¸Ö€ Õ¤Õ¸Ö‚Ö„ Õ«Ö€Õ¸Ö„ Õ´Õ¿Õ¡Õ¤Ö€Õ¾Õ¡Õ® Õ¥Ö„ Õ¤Õ¡ Õ¡Õ¶Õ¥Õ¬, Õ°Õ¡Õ½Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¤Ö€Õ¡ Õ°Õ¥Õ¿Ö‡Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Ö‡ Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ¥Ö„ [[{{MediaWiki:Policy-url}}|Õ¯Õ¡Õ¶Õ¸Õ¶Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶]] Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¸Ö‚Õ´Ö‰',
-'actioncomplete'              => 'Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¡Õ¾Õ¡Ö€Õ¿Õ¾Õ¡Õ®  Õ§',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» էջը ջնջված է։
+# Delete
+'deletepage'            => 'Õ‹Õ¶Õ»Õ¥Õ¬ Õ§Õ»Õ¨',
+'confirm'               => 'Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬',
+'excontent'             => 'բովանդակությունը սա էր` «$1»',
+'excontentauthor'       => 'Պարունակությունն էր. «$1» (և միակ հեղինակն էր� [[Special:Contributions/$2|$2]])',
+'exbeforeblank'         => 'պարունակությունը մինչև մաքրումը. «$1»',
+'exblank'               => 'Õ§Õ»Õ¨ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§Ö€',
+'historywarning'        => 'Ô¶Õ£Õ¸Ö‚Õ·Õ¡Ö�Õ¸Ö‚Õ´. Õ§Õ»Õ¨, Õ¸Ö€Õ¨ Õ¤Õ¸Ö‚Ö„ ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¾Õ¸Ö‚Õ´ Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬ Õ¸Ö‚Õ¶Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Ö‰',
+'confirmdeletetext'     => 'Ô´Õ¸Ö‚Ö„ ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¾Õ¸Ö‚Õ´ Õ¥Ö„ Õ¨Õ¶Õ¤Õ´Õ«Õ·Õ¿ Õ»Õ¶Õ»Õ¥Õ¬ Õ§Õ»Õ¨ Õ¯Õ¡Õ´ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¨ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ«Ö� Õ«Ö€ ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ°Õ¡Õ¶Õ¤Õ¥Ö€Õ±Ö‰ Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬, Õ¸Ö€ Õ¤Õ¸Ö‚Ö„ Õ«Ö€Õ¸Ö„ Õ´Õ¿Õ¡Õ¤Ö€Õ¾Õ¡Õ® Õ¥Ö„ Õ¤Õ¡ Õ¡Õ¶Õ¥Õ¬, Õ°Õ¡Õ½Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¤Ö€Õ¡ Õ°Õ¥Õ¿Ö‡Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Ö‡ Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ¥Ö„ [[{{MediaWiki:Policy-url}}|Õ¯Õ¡Õ¶Õ¸Õ¶Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶]] Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¸Ö‚Õ´Ö‰',
+'actioncomplete'        => 'Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¡Õ¾Õ¡Ö€Õ¿Õ¾Õ¡Õ®  Õ§',
+'deletedtext'           => '«<nowiki>$1</nowiki>» էջը ջնջված է։
 Õ�Õ¥Õ½ $2Õ� Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€Ö‰',
-'deletedarticle'              => 'ջնջված է «[[$1]]»',
-'dellogpage'                  => 'Õ‹Õ¶Õ»Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
-'dellogpagetext'              => 'Õ�Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ§ Õ¡Õ´Õ¥Õ¶Õ¡Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨Ö‰',
-'deletionlog'                 => 'Õ»Õ¶Õ»Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
-'reverted'                    => 'ÔµÕ¿ Õ§ Õ·Ö€Õ»Õ¾Õ¥Õ¬ Õ¶Õ¡Õ­Õ¸Ö€Õ¤ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«',
-'deletecomment'               => 'Õ‹Õ¶Õ»Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨',
-'deleteotherreason'           => 'Ô¼Ö€Õ¡Ö�Õ¸Ö‚Ö�Õ«Õ¹ ÕºÕ¡Õ¿Õ³Õ¡Õ¼',
-'deletereasonotherlist'       => 'ÕˆÖ‚Ö€Õ«Õ· ÕºÕ¡Õ¿Õ³Õ¡Õ¼',
-'rollback'                    => 'ÔµÕ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
-'rollback_short'              => 'ÔµÕ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬',
-'rollbacklink'                => 'Õ¥Õ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬',
-'rollbackfailed'              => 'ÔµÕ¿ Õ£Õ¬Õ¸Ö€Õ¸Ö‚Õ´Õ¨ Õ±Õ¡Õ­Õ¸Õ²Õ¾Õ¥Ö�',
-'cantrollback'                => 'Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ¥Õ¿ Õ·Ö€Õ»Õ¥Õ¬ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨Ö‰ ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¶Õ¥Ö€Õ¤Ö€Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¥Õ¬ Õ§ Õ§Õ»Õ« Õ´Õ«Õ¡Õ¯ Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�Ö‰',
-'alreadyrolled'               => 'Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ¥Õ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬ [[:$1]] Õ§Õ»Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Õ� Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¡Õ® [[User:$2|$2]] ([[User talk:$2|Õ”Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´]]) Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�Ö‰ Õ„Õ¥Õ¯ Õ¸Ö‚Ö€Õ«Õ·Õ¨ Õ¡Ö€Õ¤Õ¥Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ§ Õ¯Õ¡Õ´ Õ¥Õ¿ Õ§ Õ£Õ¬Õ¸Ö€Õ¥Õ¬ Õ§Õ»Õ¨Ö‰
+'deletedarticle'        => 'ջնջված է «[[$1]]»',
+'dellogpage'            => 'Õ‹Õ¶Õ»Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
+'dellogpagetext'        => 'Õ�Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ§ Õ¡Õ´Õ¥Õ¶Õ¡Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨Ö‰',
+'deletionlog'           => 'Õ»Õ¶Õ»Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
+'reverted'              => 'ÔµÕ¿ Õ§ Õ·Ö€Õ»Õ¾Õ¥Õ¬ Õ¶Õ¡Õ­Õ¸Ö€Õ¤ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«',
+'deletecomment'         => 'Õ‹Õ¶Õ»Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨',
+'deleteotherreason'     => 'Ô¼Ö€Õ¡Ö�Õ¸Ö‚Ö�Õ«Õ¹ ÕºÕ¡Õ¿Õ³Õ¡Õ¼',
+'deletereasonotherlist' => 'ÕˆÖ‚Ö€Õ«Õ· ÕºÕ¡Õ¿Õ³Õ¡Õ¼',
+
+# Rollback
+'rollback'         => 'ÔµÕ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨',
+'rollback_short'   => 'ÔµÕ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬',
+'rollbacklink'     => 'Õ¥Õ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬',
+'rollbackfailed'   => 'ÔµÕ¿ Õ£Õ¬Õ¸Ö€Õ¸Ö‚Õ´Õ¨ Õ±Õ¡Õ­Õ¸Õ²Õ¾Õ¥Ö�',
+'cantrollback'     => 'Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ¥Õ¿ Õ·Ö€Õ»Õ¥Õ¬ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨Ö‰ ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¶Õ¥Ö€Õ¤Ö€Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¥Õ¬ Õ§ Õ§Õ»Õ« Õ´Õ«Õ¡Õ¯ Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�Ö‰',
+'alreadyrolled'    => 'Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ¥Õ¿ Õ£Õ¬Õ¸Ö€Õ¥Õ¬ [[:$1]] Õ§Õ»Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Õ� Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¡Õ® [[User:$2|$2]] ([[User talk:$2|Õ”Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´]]) Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�Ö‰ Õ„Õ¥Õ¯ Õ¸Ö‚Ö€Õ«Õ·Õ¨ Õ¡Ö€Õ¤Õ¥Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ§ Õ¯Õ¡Õ´ Õ¥Õ¿ Õ§ Õ£Õ¬Õ¸Ö€Õ¥Õ¬ Õ§Õ»Õ¨Ö‰
 
 ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¥Õ¬ Õ§ [[User:$3|$3]] ([[User talk:$3|Õ”Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´]]) Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�Ö‰',
-'editcomment'                 => 'Խմբագրման մեկնաբանումն է. <i>«$1»</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'ÔµÕ¿ Õ¥Õ¶ Õ·Ö€Õ»Õ¾Õ¥Õ¬ [[Special:Contributions/$2|$2]] ([[User talk:$2|Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´]]) Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨. Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ±Õ¾Õ¥Õ¬ Õ§ [[User:$1|$1]] Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«Õ¶Ö‰', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'ÔµÕ¿ Õ¥Õ¶ Õ·Ö€Õ»Õ¾Õ¥Õ¬ $1 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨. Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ±Õ¾Õ¥Õ¬ Õ§ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«Õ¶Ö‰',
-'sessionfailure'              => 'Ô¿Õ¡Ö€Õ®Õ¥Õ½ Õ­Õ¶Õ¤Õ«Ö€ Õ§ Õ¡Õ¼Õ¡Õ»Õ¡Ö�Õ¥Õ¬ Õ¯Õ¡ÕºÕ¾Õ¡Õ® Õ±Õ¥Ö€ Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¡Õ·Õ­Õ¡Õ¿Õ¡Õ¶Ö„Õ¡ÕµÕ«Õ¶ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ°Õ¥Õ¿.
+'editcomment'      => "Խմբագրման մեկնաբանումն է. ''«$1»''.", # only shown if there is an edit comment
+'revertpage'       => 'ÔµÕ¿ Õ¥Õ¶ Õ·Ö€Õ»Õ¾Õ¥Õ¬ [[Special:Contributions/$2|$2]] ([[User talk:$2|Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´]]) Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨. Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ±Õ¾Õ¥Õ¬ Õ§ [[User:$1|$1]] Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«Õ¶Ö‰', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'ÔµÕ¿ Õ¥Õ¶ Õ·Ö€Õ»Õ¾Õ¥Õ¬ $1 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨. Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ±Õ¾Õ¥Õ¬ Õ§ $2 Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ« Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ«Õ¶Ö‰',
+'sessionfailure'   => 'Ô¿Õ¡Ö€Õ®Õ¥Õ½ Õ­Õ¶Õ¤Õ«Ö€ Õ§ Õ¡Õ¼Õ¡Õ»Õ¡Ö�Õ¥Õ¬ Õ¯Õ¡ÕºÕ¾Õ¡Õ® Õ±Õ¥Ö€ Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¡Õ·Õ­Õ¡Õ¿Õ¡Õ¶Ö„Õ¡ÕµÕ«Õ¶ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ°Õ¥Õ¿.
 Õ¡ÕµÕ½ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¢Õ¥Õ¯Õ¡Õ¶Õ¾Õ¥Õ¬ Õ§ Õ½Õ¥Õ½Õ«Õ¡ÕµÕ« Õ°Õ¡ÖƒÕ·Õ¿Õ¡Õ¯Õ´Õ¡Õ¶ Õ¯Õ¡Õ¶Õ­Õ´Õ¡Õ¶ Õ¶ÕºÕ¡Õ¿Õ¡Õ¯Õ¸Õ¾Ö‰
 Խնդրում ենք սեղմել «back» կոճակը և վերբեռնել այն էջը որտեղի� եկել եք ու փորձել կրկին։',
+
+# Protect
 'protectlogpage'              => 'ÕŠÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶',
 'protectlogtext'              => 'Õ�Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ§ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Ö‡ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö‚Õ´Õ«Ö� Õ°Õ¡Õ¶Õ¾Õ¡Õ® Õ§Õ»Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨Ö‰ Õ�Õ¥Õ½ Õ¶Õ¡Ö‡ [[Special:ProtectedPages|Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ½ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§Õ»Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨]]Ö‰',
 'protectedarticle'            => 'պաշտպանվե� «[[$1]]» էջը',
 'modifiedarticleprotection'   => 'փոխվե� պաշտպանման մակարդակը «[[$1]]» էջի համար',
 'unprotectedarticle'          => 'պաշտպանումը հանված է «[[$1]]» էջի�',
 'protect-title'               => '«$1» էջի պաշտպանման մակարդակի հաստատում',
+'prot_1movedto2'              => '«[[$1]]» վերանվանված է «[[$2]]»',
 'protect-legend'              => 'Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö‚Õ´Õ¨',
 'protectcomment'              => 'ÕŠÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨.',
 'protectexpiry'               => 'Õ„Õ¡Ö€Õ¸Ö‚Õ´.',
 'protect_expiry_invalid'      => 'Ô±Õ¶Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ« Õ´Õ¡Ö€Õ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¯Õ¥Õ¿Ö‰',
 'protect_expiry_old'          => 'Õ„Õ¡Ö€Õ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¯Õ¥Õ¿Õ¨ Õ¡Õ¶Ö�ÕµÕ¡Õ¬Õ¸Ö‚Õ´ Õ§Ö‰',
 'protect-unchain'             => 'Ô±Õ¶Õ¡Ö€Õ£Õ¥Õ¬Õ¥Õ¬ Õ§Õ»Õ« Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ¸Ö‚Õ´Õ¨',
-'protect-text'                => 'Ô±ÕµÕ½Õ¿Õ¥Õ² Õ¤Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ¤Õ«Õ¿Õ¥Õ¬ Ö‡ ÖƒÕ¸Õ­Õ¥Õ¬ <strong><nowiki>$1</nowiki></strong> Õ§Õ»Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨Ö‰',
-'protect-locked-blocked'      => 'Ô´Õ¸Ö‚Ö„ Õ¹Õ¥Ö„ Õ¯Õ¡Ö€Õ¸Õ² ÖƒÕ¸Õ­Õ¥Õ¬ Õ§Õ»Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨ Ö„Õ¡Õ¶Õ« Õ¤Õ¥Õ¼ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ¥Ö„Ö‰ Ô·Õ»Õ« Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶ Õ§Õ� <strong>$1</strong>.',
-'protect-locked-dblock'       => 'ÕŠÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² ÖƒÕ¸Õ­Õ¾Õ¥Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ« Õ¯Õ¸Õ²ÕºÕ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰ Ô·Õ»Õ« Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶ Õ§Õ� <strong>$1</strong>.',
-'protect-locked-access'       => 'Õ�Õ¥Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ¹Õ¸Ö‚Õ¶Õ« Õ§Õ»Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨ ÖƒÕ¸ÖƒÕ¸Õ­Õ¥Õ¬Õ¸Ö‚ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Ö‰
-Ô·Õ»Õ« Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶ Õ§Õ� <strong>$1</strong>.',
+'protect-text'                => "Ô±ÕµÕ½Õ¿Õ¥Õ² Õ¤Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ¤Õ«Õ¿Õ¥Õ¬ Ö‡ ÖƒÕ¸Õ­Õ¥Õ¬ '''<nowiki>$1</nowiki>''' Õ§Õ»Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨Ö‰",
+'protect-locked-blocked'      => "Ô´Õ¸Ö‚Ö„ Õ¹Õ¥Ö„ Õ¯Õ¡Ö€Õ¸Õ² ÖƒÕ¸Õ­Õ¥Õ¬ Õ§Õ»Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨ Ö„Õ¡Õ¶Õ« Õ¤Õ¥Õ¼ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ¥Ö„Ö‰ Ô·Õ»Õ« Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶ Õ§Õ� '''$1'''.",
+'protect-locked-dblock'       => "ÕŠÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² ÖƒÕ¸Õ­Õ¾Õ¥Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¢Õ¡Õ¦Õ¡ÕµÕ« Õ¯Õ¸Õ²ÕºÕ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾Ö‰ Ô·Õ»Õ« Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶ Õ§Õ� '''$1'''.",
+'protect-locked-access'       => "Õ�Õ¥Ö€ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Ö�Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ¹Õ¸Ö‚Õ¶Õ« Õ§Õ»Õ« ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨ ÖƒÕ¸ÖƒÕ¸Õ­Õ¥Õ¬Õ¸Ö‚ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Ö‰
+Ô·Õ»Õ« Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶ Õ§Õ� '''$1'''.",
 'protect-cascadeon'           => 'Ô±ÕµÕ½ Õ§Õ»Õ¨ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ½ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¡Õ® Õ§, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Õ¨Õ¶Õ¤Õ£Ö€Õ¯Õ¾Õ¡Õ® Õ§ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ {{PLURAL:$1|Õ§Õ»Õ¸Ö‚Õ´, Õ¸Ö€Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¥Õ¬ Õ§|Õ§Õ»Õ¥Ö€Õ¸Ö‚Õ´, Õ¸Ö€Õ¸Õ¶Ö„ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¾Õ¥Õ¬ Õ¥Õ¶}} Õ¯Õ¡Õ½Õ¯Õ¡Õ¤Õ¡ÕµÕ«Õ¶ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ´Õ¢Ö‰ Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ ÖƒÕ¸Õ­Õ¥Õ¬ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯Õ¨, Õ¢Õ¡ÕµÖ� Õ¤Õ¡ Õ¹Õ« Õ¡Õ¦Õ¤Õ« Õ¯Õ¡Õ½Õ¯Õ¡Õ¤Õ¡ÕµÕ«Õ¶ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ´Õ¡Õ¶ Õ¾Ö€Õ¡Ö‰',
 'protect-default'             => '(Õ¬Õ¼Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢)',
 'protect-fallback'            => 'Անհրաժեշտ է «$1» իրավունք',
@@ -1519,6 +1496,7 @@ $NEWPAGE
 'protect-summary-cascade'     => 'Õ¯Õ¡Õ½Õ¯Õ¡Õ¤Õ¡ÕµÕ«Õ¶',
 'protect-expiring'            => 'Õ´Õ¡Ö€Õ¸Ö‚Õ´Õ� $1 (UTC)',
 'protect-cascade'             => 'ÕŠÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ¸Ö‚Õ´ Õ¨Õ¶Õ¤Õ£Ö€Õ¯Õ¾Õ¡Õ® Õ§Õ»Õ¥Ö€Õ¨ (Õ¯Õ¡Õ½Õ¯Õ¡Õ¤Õ¡ÕµÕ«Õ¶ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö‚Õ´)',
+'protect-expiry-options'      => '2 ÕªÕ¡Õ´:2 hours,1 Ö…Ö€:1 day,3 Ö…Ö€:3 days,1 Õ·Õ¡Õ¢Õ¡Õ©:1 week,2 Õ·Õ¡Õ¢Õ¡Õ©:2 weeks,1 Õ¡Õ´Õ«Õ½:1 month,3 Õ¡Õ´Õ«Õ½:3 months,6 Õ¡Õ´Õ«Õ½:6 months,1 Õ¿Õ¡Ö€Õ«:1 year,Õ¡Õ¼Õ°Õ¡Õ¾Õ¥Õ¿:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ô»Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€.',
 'restriction-level'           => 'Õ�Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖƒÕ¡Õ¯Õ´Õ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö€Õ¤Õ¡Õ¯.',
 'minimum-size'                => 'Õ†Õ¾Õ¡Õ¦Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ¹Õ¡Öƒ',
@@ -1598,7 +1576,6 @@ $1',
 'whatlinkshere'       => 'Ô±ÕµÕ½Õ¿Õ¥Õ² Õ°Õ²Õ¾Õ¸Õ² Õ§Õ»Õ¥Ö€Õ¨',
 'whatlinkshere-title' => 'Ô·Õ»Õ¥Ö€, Õ¸Ö€Õ¸Õ¶Ö„ Õ°Õ²Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¤Õ¥ÕºÕ« $1',
 'whatlinkshere-page'  => 'Ô·Õ».',
-'linklistsub'         => '(Õ€Õ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯)',
 'linkshere'           => "Õ€Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ§Õ»Õ¥Ö€Õ¨ Õ°Õ²Õ¸Ö‚Õ´ Õ¥Õ¶ '''[[:$1]]''' Õ§Õ»Õ«Õ¶.",
 'nolinkshere'         => "ÕˆÖ‚Ö€Õ«Õ· Õ§Õ»Õ¥Ö€Õ«Ö� '''[[:$1]]''' Õ§Õ»Õ«Õ¶ Õ°Õ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ¹Õ¯Õ¡Õ¶Ö‰",
 'nolinkshere-ns'      => "Ô¸Õ¶Õ¿Ö€Õ¾Õ¡Õ® Õ¡Õ¶Õ¾Õ¡Õ¶Õ¡Õ¿Õ¡Ö€Õ¡Õ®Ö„Õ¸Ö‚Õ´ '''[[:$1]]''' Õ§Õ»Õ«Õ¶ Õ°Õ²Õ¾Õ¸Õ² Õ§Õ»Õ¥Ö€ Õ¹Õ¯Õ¡Õ¶Ö‰",
@@ -1722,6 +1699,8 @@ $1',
 
 Ô±ÕµÕ½ÕºÕ«Õ½Õ« Õ¤Õ¥ÕºÖ„Õ¥Ö€Õ¸Ö‚Õ´ Õ°Õ¡Ö€Õ¯Õ¡Õ¾Õ¸Ö€ Õ§ Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ¥Õ¬ Õ¯Õ¡Õ´ Õ´Õ«Õ¡Õ±Õ¸Ö‚Õ¬Õ¥Õ¬ Õ§Õ»Õ¥Ö€Õ¨ Õ±Õ¥Õ¼Ö„Õ¸Õ¾, Õ¥Õ©Õ¥ Õ¤Õ¡ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¡Ö„Ö‰",
 'movearticle'             => 'Õ�Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ¥Õ¬ Õ§Õ»Õ¨',
+'movenologin'             => 'Ô´Õ¸Ö‚Ö„ Õ¹Õ¥Ö„ Õ´Õ¿Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£',
+'movenologintext'         => 'Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ [[Special:UserLogin|Õ´Õ¿Õ¶Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£]]Õ� Õ§Õ»Õ¨ Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰',
 'movenotallowed'          => 'Ô´Õ¸Ö‚Ö„ Õ¹Õ¸Ö‚Õ¶Õ¥Ö„ {{SITENAME}}Õ¸Ö‚Õ´ Õ§Õ»Õ¥Ö€Õ« Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ´Õ¡Õ¶ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Ö‰',
 'newtitle'                => 'Õ†Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´.',
 'move-watch'              => 'Õ€Õ½Õ¯Õ¥Õ¬ Õ§Õ»Õ¨',
@@ -1745,7 +1724,6 @@ $1',
 'delete_and_move_confirm' => 'Ô±ÕµÕ¸, Õ»Õ¶Õ»Õ¥Õ¬ Õ§Õ»Õ¨',
 'delete_and_move_reason'  => 'Õ�Õ¶Õ»Õ¾Õ¡Õ® Õ§Õ� Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ´Õ¡Õ¶ Õ¿Õ¥Õ² Õ¡Õ¦Õ¡Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€',
 'selfmove'                => 'ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Ö‡ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ°Õ¡Õ´Õ¨Õ¶Õ¯Õ¶Õ¸Ö‚Õ´ Õ¥Õ¶. Õ¡Õ¶Õ°Õ¶Õ¡Ö€ Õ§ Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ¥Õ¬ Õ§Õ»Õ¨ Õ«Õ¶Ö„Õ¶ Õ«Ö€Õ¥Õ¶Ö‰',
-'immobile_namespace'      => 'ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Õ´ Õ¶Õ¸Ö€ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¨ ÕºÕ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ¥Õ¦Ö€. Õ¡Õ¶Õ°Õ¶Õ¡Ö€Õ«Õ¶ Õ§ Õ¡ÕµÕ¤ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¡Õ¿Õ¡Ö€Õ¡Õ®Ö„Õ«Ö� Ö‡ Õ¡ÕµÕ¤ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¡Õ¿Õ¡Ö€Õ¡Õ®Ö„ Õ§Õ»Õ« Õ¿Õ¥Õ²Õ¡ÖƒÕ¸Õ­Õ¸Ö‚Õ´Õ¨Ö‰',
 
 # Export
 'export'            => 'Ô±Ö€Õ¿Õ¡Õ®Õ¥Õ¬ Õ§Õ»Õ¥Ö€Õ¨',
@@ -1753,7 +1731,7 @@ $1',
 
 Ô·Õ»Õ¥Ö€ Õ¡Ö€Õ¿Õ¡Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¥Ö„ Õ¤Ö€Õ¡Õ¶Ö� Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö‚Õ´Õ� Õ´Õ¥Õ¯ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¸Ö‚Õ´ Õ¡Õ´Õ¥Õ¶ Õ¿Õ¸Õ²Õ¸Ö‚Õ´, Ö‡ Õ¨Õ¶Õ¿Ö€Õ¥Ö„Õ� Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡Ö€Õ¿Õ¡Õ®Õ¥Õ¬ Õ¡Õ´Õ¢Õ¸Õ²Õ» ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨, Õ©Õ¥ Õ´Õ«Õ¡ÕµÕ¶ Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¶Õ¥Ö€Õ¨, Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ­Õ´Õ¢Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ´Õ¡Õ½Õ«Õ¶ Õ¿Õ¥Õ²Õ¥Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿ Õ´Õ«Õ¡Õ½Õ«Õ¶Ö‰
 
-ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ¡Ö€Õ¿Õ¡Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¤Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ¶Õ¡Ö‡ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ°Õ¡Õ¿Õ¸Ö‚Õ¯ Õ°Õ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€, Ö…Ö€.Õ� [[{{MediaWiki:Mainpage}}]] Õ§Õ»Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ°Õ²Õ´Õ¡Õ¶ Õ°Õ¡Õ½Ö�Õ¥Õ¶ Õ§ [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]Ö‰',
+ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ¡Ö€Õ¿Õ¡Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¤Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ¶Õ¡Ö‡ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ°Õ¡Õ¿Õ¸Ö‚Õ¯ Õ°Õ²Õ¸Ö‚Õ´Õ¶Õ¥Ö€, Ö…Ö€.Õ� [[{{MediaWiki:Mainpage}}]] Õ§Õ»Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ°Õ²Õ´Õ¡Õ¶ Õ°Õ¡Õ½Ö�Õ¥Õ¶ Õ§ [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]Ö‰',
 'exportcuronly'     => 'Ô¸Õ¶Õ¤Õ£Ö€Õ¯Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¨Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨, Õ¡Õ¼Õ¡Õ¶Ö� Õ¬Ö€Õ«Õ¾ ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¡Õ¶',
 'exportnohistory'   => "----
 '''Ô¾Õ¡Õ¶Õ¸Ö‚Ö�Õ¸Ö‚Õ´.''' Õ§Õ»Õ¥Ö€Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¬Ö€Õ«Õ¾ ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Ö€Õ¿Õ¡Õ®Õ¸Ö‚Õ´Õ¨ Õ¡ÕµÕ½ Õ±Ö‡Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§ Õ¡Ö€Õ¿Õ¡Õ¤Ö€Õ¸Õ²Õ¡Õ¯Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¶Õ¯Õ¡Õ¿Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¸Õ¾Ö‰",
@@ -1768,7 +1746,7 @@ $1',
 'allmessagesdefault'        => 'Ô¼Õ¼Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¿Õ¥Ö„Õ½Õ¿',
 'allmessagescurrent'        => 'Ô¸Õ¶Õ©Õ¡Ö�Õ«Õ¯ Õ¿Õ¥Ö„Õ½Õ¿',
 'allmessagestext'           => '�տորև բերված է «MediaWiki» անվանատարածքի բոլոր համակարգային ուղերձների �անկը։
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "Ô±ÕµÕ½ Õ§Õ»Õ¨ Õ¹Õ« Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´, Ö„Õ¡Õ¶Õ« Õ¸Ö€ '''\$wgUseDatabaseMessages''' Õ°Õ¡Õ¿Õ¯Õ¡Õ¶Õ«Õ·Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§Ö‰",
 'allmessagesfilter'         => 'ÕˆÖ‚Õ²Õ²Õ¥Ö€Õ±Õ¶Õ¥Ö€Õ« Õ¡Õ¶Õ¾Õ¡Õ¶ Ö†Õ«Õ¬Õ¿Ö€.',
 'allmessagesmodified'       => 'Õ‘Õ¸Ö‚ÕµÖ� Õ¿Õ¡Õ¬ Õ´Õ«Õ¡ÕµÕ¶ ÖƒÕ¸ÖƒÕ¸Õ­Õ¾Õ¡Õ®Õ¶Õ¥Ö€Õ¨',
@@ -1791,6 +1769,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-interwiki-history'   => 'ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« ÖƒÕ¸ÖƒÕ¸Õ­Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¬Ö€Õ«Õ¾ ÕºÕ¡Õ¿Õ´Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨',
 'import-interwiki-submit'    => 'Õ†Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ¥Õ¬',
 'import-interwiki-namespace' => 'Õ�Õ¥Õ²Õ¡Õ¤Ö€Õ¥Õ¬ Õ§Õ»Õ¥Ö€Õ¨ Õ¡Õ¶Õ¾Õ¡Õ¶Õ¡Õ¿Õ¡Ö€Õ¡Õ®Ö„Õ¸Ö‚Õ´.',
+'import-comment'             => 'Õ„Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶.',
 'importtext'                 => 'Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¡Ö€Õ¿Õ¡Õ®Õ¥Ö„ Õ§Õ»Õ¨ Õ¥Õ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¾Õ«Ö„Õ«Õ«Ö� Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ Special:Export, Õ°Õ«Õ·Õ¥Ö„ Õ¡ÕµÕ¶ Ö†Õ¡ÕµÕ¬Õ« Õ¿Õ¥Õ½Ö„Õ¸Õ¾ Õ±Õ¥Ö€ Õ½Õ¯Õ¡Õ¾Õ¡Õ¼Õ¡Õ¯Õ« Õ¾Ö€Õ¡ Ö‡ Õ¡ÕµÕ¶Õ¸Ö‚Õ°Õ¥Õ¿Ö‡, Õ¢Õ¥Õ¼Õ¶Õ¥Ö„ Õ¡ÕµÕ¶ Õ¡ÕµÕ½Õ¿Õ¥Õ²Ö‰',
 'importstart'                => 'Ô·Õ»Õ¥Ö€Õ« Õ¶Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ¸Ö‚Õ´...',
 'import-revision-count'      => '$1 Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯',
@@ -1914,6 +1893,15 @@ The wiki server can't provide data in a format your client can read.",
 'numauthors'     => 'Õ�Õ¡Ö€Õ¢Õ¥Ö€ Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ¶Õ¥Ö€Õ« Õ©Õ«Õ¾ (Õ°Õ¸Õ¤Õ¾Õ¡Õ®). $1',
 'numtalkauthors' => 'Õ�Õ¡Ö€Õ¢Õ¥Ö€ Õ°Õ¥Õ²Õ«Õ¶Õ¡Õ¯Õ¶Õ¥Ö€Õ« Õ©Õ«Õ¾ (Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ´Õ¡Õ¶ Õ§Õ»). $1',
 
+# Skin names
+'skinname-standard'    => 'Ô´Õ¡Õ½Õ¡Õ¯Õ¡Õ¶',
+'skinname-nostalgia'   => 'Õ€Õ¡ÕµÖ€Õ¥Õ¶Õ¡Õ¢Õ¡Õ²Õ±Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶',
+'skinname-cologneblue' => 'Õ”ÕµÕ¸Õ¬Õ¶Õ« Õ©Õ¡Õ­Õ«Õ®',
+'skinname-monobook'    => 'Õ„Õ«Õ¡Ô³Õ«Ö€Ö„',
+'skinname-myskin'      => 'Ô»Õ´Õ�Õ¥Õ½Ö„',
+'skinname-chick'       => 'Ô¾Õ«Õ¿',
+'skinname-simple'      => 'ÕŠÕ¡Ö€Õ¦',
+
 # Math options
 'mw_math_png'    => 'Õ„Õ«Õ·Õ¿ Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬ PNG',
 'mw_math_simple' => 'HTMLÕ� ÕºÕ¡Ö€Õ¦ Õ¤Õ¥ÕºÖ„Õ¥Ö€Õ¸Ö‚Õ´, Õ¡ÕµÕ¬Õ¡ÕºÕ¥Õ½Õ� PNG',
@@ -1965,7 +1953,7 @@ $1',
 'show-big-image'       => 'Ô¼Ö€Õ«Õ¾ Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Õ¾Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢',
 'show-big-image-thumb' => '<small>Նախադիտման չափ. $1 × $2 փիքսել</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Õ†Õ¸Ö€ Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ« Õ½Ö€Õ¡Õ°',
 'imagelisttext'         => "Õ�Õ¿Õ¸Ö€Ö‡ Õ¢Õ¥Ö€Õ¾Õ¡Õ® Õ§ '''$1''' {{PLURAL:$1|Ö†Õ¡ÕµÕ¬Õ«|Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ«}} Ö�Õ¡Õ¶Õ¯Õ� Õ¤Õ¡Õ½Õ¡Õ¾Õ¸Ö€Õ¾Õ¡Õ® Õ¨Õ½Õ¿ $2Ö‰",
 'showhidebots'          => '($1 Õ¢Õ¸Õ¿Õ¥Ö€Õ«Õ¶)',
@@ -2067,20 +2055,9 @@ $1
 
 'unit-pixel' => ' ÖƒÕ«Ö„Õ½Õ¥Õ¬',
 
-# HTML dump
-'redirectingto' => 'Վերահղվում է դեպի [[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'Õ„Õ¡Ö„Ö€Õ¥ÕžÕ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« Ö„Õ¥Õ·Õ¨Ö‰
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => 'Որոնել էջեր, որոնք պարունակում են «$1»։',
-'searchnamed'      => '«$1» անվանմամբ էջերի որոնում։',
-'articletitles'    => "Õ€Õ¸Õ¤Õ¾Õ¡Õ®Õ¶Õ¥Ö€, Õ¸Ö€Õ¸Õ¶Ö„ Õ½Õ¯Õ½Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ ''$1''-Õ¸Õ¾Ö‰",
-'hideresults'      => 'Ô¹Õ¡Ö„Ö�Õ¶Õ¥Õ¬ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨',
+'confirm-purge-top'    => 'Õ„Õ¡Ö„Ö€Õ¥ÕžÕ¬ Õ¡ÕµÕ½ Õ§Õ»Õ« Ö„Õ¥Õ·Õ¨Ö‰',
 
 # Multipage image navigation
 'imgmultipageprev' => '� նախորդ էջ',
diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 02df73fb..1c947b92 100644
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -10,31 +10,120 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'cologneblue' => 'Blau Colonia',
-);
+$separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
+
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Special',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discussion',
-	NS_USER           => 'Usator',
-	NS_USER_TALK      => 'Discussion_Usator',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Imagine',
-	NS_IMAGE_TALK     => 'Discussion_Imagine',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
-	NS_TEMPLATE       => 'Patrono',
-	NS_TEMPLATE_TALK  => 'Discussion_Patrono',
-	NS_HELP           => 'Adjuta',
-	NS_HELP_TALK      => 'Discussion_Adjuta',
-	NS_CATEGORY       => 'Categoria',
-	NS_CATEGORY_TALK  => 'Discussion_Categoria'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Special',
+	NS_TALK             => 'Discussion',
+	NS_USER             => 'Usator',
+	NS_USER_TALK        => 'Discussion_Usator',
+	NS_PROJECT_TALK     => 'Discussion_$1',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussion_File',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
+	NS_TEMPLATE         => 'Patrono',
+	NS_TEMPLATE_TALK    => 'Discussion_Patrono',
+	NS_HELP             => 'Adjuta',
+	NS_HELP_TALK        => 'Discussion_Adjuta',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Discussion_Categoria',
+);
+
+$namespaceAliases = array(
+	'Imagine' => NS_FILE,
+	'Discussion_Imagine' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'RedirectionesDuple' ),
+	'BrokenRedirects'           => array( 'RedirectionesRupte' ),
+	'Disambiguations'           => array( 'Disambiguationes' ),
+	'Userlogin'                 => array( 'AperirSession', 'Identificar' ),
+	'Userlogout'                => array( 'ClauderSession', 'Disconnecter' ),
+	'CreateAccount'             => array( 'CrearConto' ),
+	'Preferences'               => array( 'Preferentias' ),
+	'Watchlist'                 => array( 'Observatorio' ),
+	'Recentchanges'             => array( 'ModificationesRecente' ),
+	'Upload'                    => array( 'Cargar' ),
+	'Listfiles'                 => array( 'ListaDeImagines' ),
+	'Newimages'                 => array( 'NoveImagines' ),
+	'Listusers'                 => array( 'ListarUsatores', 'ListaDeUsatores' ),
+	'Listgrouprights'           => array( 'ListarDerectosDeGruppos' ),
+	'Statistics'                => array( 'Statisticas' ),
+	'Randompage'                => array( 'Aleatori', 'PaginaAleatori' ),
+	'Lonelypages'               => array( 'PaginasOrphanate' ),
+	'Uncategorizedpages'        => array( 'PaginasNonCategorisate' ),
+	'Uncategorizedcategories'   => array( 'CategoriasNonCategorisate' ),
+	'Uncategorizedimages'       => array( 'ImaginesNonCategorisate' ),
+	'Uncategorizedtemplates'    => array( 'PatronosNonCategorisate' ),
+	'Unusedcategories'          => array( 'CategoriasNonUsate' ),
+	'Unusedimages'              => array( 'ImaginesNonUsate' ),
+	'Wantedpages'               => array( 'PaginasDesirate', 'LigaminesRupte' ),
+	'Wantedcategories'          => array( 'CategoriasDesirate' ),
+	'Wantedfiles'               => array( 'FilesDesirate' ),
+	'Wantedtemplates'           => array( 'PatronosDesirate' ),
+	'Mostlinked'                => array( 'LePlusLigate' ),
+	'Mostlinkedcategories'      => array( 'CategoriasLePlusLigate', 'CategoriasLePlusUsate' ),
+	'Mostlinkedtemplates'       => array( 'PatronosLePlusLigate', 'PatronosLePlusUsate' ),
+	'Mostcategories'            => array( 'LePlusCategorias' ),
+	'Mostimages'                => array( 'LePlusImagines' ),
+	'Mostrevisions'             => array( 'LePlusVersiones' ),
+	'Fewestrevisions'           => array( 'LeMinusVersiones' ),
+	'Shortpages'                => array( 'PaginasCurte' ),
+	'Longpages'                 => array( 'PaginasLonge' ),
+	'Newpages'                  => array( 'PaginasNove' ),
+	'Ancientpages'              => array( 'PaginasAncian' ),
+	'Deadendpages'              => array( 'PaginasSinExito' ),
+	'Protectedpages'            => array( 'PaginasProtegite' ),
+	'Protectedtitles'           => array( 'TitulosProtegite' ),
+	'Allpages'                  => array( 'ToteLePaginas' ),
+	'Prefixindex'               => array( 'IndiceDePrefixos' ),
+	'Ipblocklist'               => array( 'ListaDeBlocadasIP' ),
+	'Specialpages'              => array( 'PaginasSpecial' ),
+	'Contributions'             => array( 'Contributiones' ),
+	'Emailuser'                 => array( 'InviarEmailAUnUsator' ),
+	'Confirmemail'              => array( 'ConfirmarEmail' ),
+	'Whatlinkshere'             => array( 'ReferentiasAIstePagina' ),
+	'Recentchangeslinked'       => array( 'ModificationesRecenteLigate', 'ModificationesConnexe' ),
+	'Movepage'                  => array( 'RenominarPagina' ),
+	'Blockme'                   => array( 'BlocarMe' ),
+	'Booksources'               => array( 'FontesDeLibros' ),
+	'Categories'                => array( 'Categorias' ),
+	'Export'                    => array( 'Exportar' ),
+	'Allmessages'               => array( 'ToteLeMessages' ),
+	'Log'                       => array( 'Registro', 'Registros' ),
+	'Blockip'                   => array( 'BlocarIP' ),
+	'Undelete'                  => array( 'Restaurar' ),
+	'Import'                    => array( 'Importar' ),
+	'Lockdb'                    => array( 'BlocarBDD' ),
+	'Unlockdb'                  => array( 'DisblocarBDD' ),
+	'Userrights'                => array( 'DerectosDeUsatores' ),
+	'MIMEsearch'                => array( 'RecercaMIME' ),
+	'FileDuplicateSearch'       => array( 'RecercaDeFilesDuplice' ),
+	'Unwatchedpages'            => array( 'PaginasNonObservate' ),
+	'Listredirects'             => array( 'ListarRedirectiones' ),
+	'Revisiondelete'            => array( 'DeletionDeVersiones' ),
+	'Unusedtemplates'           => array( 'PatronosNonUsate' ),
+	'Randomredirect'            => array( 'RedirectionAleatori' ),
+	'Mypage'                    => array( 'MiPagina' ),
+	'Mytalk'                    => array( 'MiDiscussion' ),
+	'Mycontributions'           => array( 'MiContributiones' ),
+	'Listadmins'                => array( 'ListarAdministratores' ),
+	'Listbots'                  => array( 'ListarRobots' ),
+	'Popularpages'              => array( 'PaginasPopular' ),
+	'Search'                    => array( 'Cercar' ),
+	'Resetpass'                 => array( 'RedefinirContrasigno' ),
+	'Withoutinterwiki'          => array( 'SinInterwiki' ),
+	'MergeHistory'              => array( 'FusionarHistoria' ),
+	'Filepath'                  => array( 'CamminoAlFile' ),
+	'Invalidateemail'           => array( 'InvalidarEmail' ),
+	'Blankpage'                 => array( 'PaginaVacue' ),
+	'LinkSearch'                => array( 'RecercaDeLigamines' ),
+	'DeletedContributions'      => array( 'ContributionesDelite' ),
 );
-$linkTrail = "/^([a-z]+)(.*)\$/sD";
 
 $messages = array(
 # User preference toggles
@@ -74,17 +163,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Excluder mi proprie modificationes del observatorio',
 'tog-watchlisthidebots'       => 'Excluder le modificationes per bots del observatorio',
 'tog-watchlisthideminor'      => 'Excluder le modificationes minor del observatorio',
+'tog-watchlisthideliu'        => 'Celar modificationes per usatores identificate del observatorio',
+'tog-watchlisthideanons'      => 'Celar modificationes per usatores anonyme del observatorio',
 'tog-nolangconversion'        => 'Disactivar conversion de variantes',
 'tog-ccmeonemails'            => 'Inviar me copias del messages de e-mail que io invia a altere usatores',
 'tog-diffonly'                => 'Non monstrar le contento del pagina sub le comparation de duo versiones',
 'tog-showhiddencats'          => 'Monstrar categorias celate',
+'tog-noconvertlink'           => 'Disactivar conversion del titulo de ligamine',
+'tog-norollbackdiff'          => 'Omitter le diff post le execution de un revocation',
 
 'underline-always'  => 'Sempre',
 'underline-never'   => 'Nunquam',
 'underline-default' => 'Secundo le configuration del navigator',
 
-'skinpreview' => '(Previsualisation)',
-
 # Dates
 'sunday'        => 'dominica',
 'monday'        => 'lunedi',
@@ -177,7 +268,7 @@ $messages = array(
 'mytalk'         => 'Mi discussion',
 'anontalk'       => 'Discussion pro iste adresse IP',
 'navigation'     => 'Navigation',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadatos:',
@@ -214,14 +305,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discussion',
 'specialpage'       => 'Pagina special',
 'personaltools'     => 'Instrumentos personal',
-'postcomment'       => 'Publicar un commento',
+'postcomment'       => 'Nove section',
 'articlepage'       => 'Vider pagina de contento',
 'talk'              => 'Discussion',
 'views'             => 'Aspectos',
 'toolbox'           => 'Instrumentario',
 'userpage'          => 'Vider pagina del usator',
 'projectpage'       => 'Vider pagina de projecto',
-'imagepage'         => 'Vider pagina de media',
+'imagepage'         => 'Vider le pagina del file',
 'mediawikipage'     => 'Vider pagina de message',
 'templatepage'      => 'Vider pagina de patrono',
 'viewhelppage'      => 'Vider pagina de adjuta',
@@ -240,8 +331,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'A proposito de {{SITENAME}}',
 'aboutpage'            => 'Project:A proposito',
-'bugreports'           => 'Reportos de disfunctiones',
-'bugreportspage'       => 'Project:Reportos de disfunctiones',
 'copyright'            => 'Le contento es disponibile sub $1.',
 'copyrightpagename'    => 'Copyright de {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -264,9 +353,7 @@ $messages = array(
 
 'badaccess'        => 'Error de permission',
 'badaccess-group0' => 'Tu non ha le permission de executar le action que tu ha requestate.',
-'badaccess-group1' => 'Le action que tu ha requestate es limitate al usatores in le gruppo $1.',
-'badaccess-group2' => 'Le action que tu ha requestate es limitate al usatores in un del gruppos $1.',
-'badaccess-groups' => 'Le action que tu ha requestate es limitate al usatores in un del gruppos $1.',
+'badaccess-groups' => 'Le action que tu ha requestate es limitate al usatores in {{PLURAL:$2|le gruppo|un del gruppos}}: $1.',
 
 'versionrequired'     => 'Version $1 de MediaWiki requirite',
 'versionrequiredtext' => 'Le version $1 de MediaWiki es requirite pro usar iste pagina. Vide [[Special:Version|le pagina de version]].',
@@ -280,6 +367,8 @@ $messages = array(
 'editsection'             => 'modificar',
 'editold'                 => 'modificar',
 'viewsourceold'           => 'vider codice-fonte',
+'editlink'                => 'modificar',
+'viewsourcelink'          => 'vider codice-fonte',
 'editsectionhint'         => 'Modificar section: $1',
 'toc'                     => 'Contento',
 'showtoc'                 => 'revelar',
@@ -294,13 +383,13 @@ $messages = array(
 'site-atom-feed'          => 'Syndication Atom de $1',
 'page-rss-feed'           => 'Syndication RSS de "$1"',
 'page-atom-feed'          => 'Syndication Atom de "$1"',
-'red-link-title'          => '$1 (non ancora scribite)',
+'red-link-title'          => '$1 (pagina non existe)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pagina',
 'nstab-user'      => 'Pagina de usator',
 'nstab-media'     => 'Pagina de media',
-'nstab-special'   => 'Special',
+'nstab-special'   => 'Pagina special',
 'nstab-project'   => 'Pagina de projecto',
 'nstab-image'     => 'File',
 'nstab-mediawiki' => 'Message',
@@ -310,7 +399,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Non existe tal action',
-'nosuchactiontext'  => 'Le action specificate in le adresse URL non es recognoscite per le wiki',
+'nosuchactiontext'  => 'Le action specificate in le adresse URL non es valide.
+Es possibile que tu ha mal entrate le URL o sequite un ligamine incorrecte.
+Isto poterea equalmente indicar un defecto in le software usate per {{SITENAME}}.',
 'nosuchspecialpage' => 'Pagina special invalide',
 'nospecialpagetext' => "<big>'''Tu ha requestate un pagina special que es non es valide.'''</big>
 
@@ -347,7 +438,7 @@ Causas normal de iste problema es: tu ha consultate un \'\'diff\'\' obsolete, o
 
 Si isto non es le caso, es possibile que tu ha trovate un error in le software.
 Per favor reporta isto a un [[Special:ListUsers/sysop|administrator]], faciente nota del adresse URL.',
-'missingarticle-rev'   => '(numero del revision: $1)',
+'missingarticle-rev'   => '(numero del version: $1)',
 'missingarticle-diff'  => '(Diff: $1, $2)',
 'readonly_lag'         => 'Le base de datos ha essite automaticamente blocate durante que le servitores de base de datos secundari se synchronisa con le servitor principal.',
 'internalerror'        => 'Error interne',
@@ -366,7 +457,6 @@ Es possibile que un altere persona ha ja delite lo.',
 'badtitle'             => 'Titulo incorrecte',
 'badtitletext'         => 'Le titulo de pagina demandate esseva invalide, vacue, o constitueva un ligamine interlingual o interwiki incorrecte.
 Es possibile que illo contine un o plure characteres que non pote esser usate in titulos.',
-'perfdisabled'         => 'Pardono! Iste functionalitate ha essite temporarimente disactivate proque illo rende le operation del base de datos tanto lente que necuno pote usar le wiki.',
 'perfcached'           => 'Le sequente datos se recuperava del cache e possibilemente non es actual.',
 'perfcachedts'         => 'Le sequente datos se recuperava del cache. Ultime actualisation: le $1.',
 'querypage-no-updates' => 'Le actualisationes pro iste pagina es disactivate. Pro le momento, le datos hic non se cambiara.',
@@ -383,7 +473,7 @@ Per favor reprova post alcun minutas.',
 'protectedinterface'   => 'Iste pagina contine texto pro le interfacie del software, e es protegite pro impedir le abuso.',
 'editinginterface'     => "'''Attention:''' Tu va modificar un pagina que se usa pro texto del interfacie pro le software.
 Omne modification a iste pagina cambiara le apparentia del interfacie pro altere usatores.
-Pro traductiones, per favor considera usar [http://translatewiki.net/wiki/Main_Page?setlang=ia Betawiki], le projecto pro localisar MediaWiki.",
+Pro traductiones, per favor considera usar [http://translatewiki.net/wiki/Main_Page?setlang=ia translatewiki.net], le projecto pro localisar MediaWiki.",
 'sqlhidden'            => '(Consulta SQL celate)',
 'cascadeprotected'     => 'Iste pagina ha essite protegite contra modificationes, proque illo es includite in le sequente {{PLURAL:$1|pagina, le qual|paginas, le quales}} es protegite usante le option "cascada":
 $2',
@@ -394,16 +484,16 @@ $2',
 Le ration date es ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Configuration incorrecte: programma antivirus non cognoscite: <i>$1</i>',
+'virus-badscanner'     => "Configuration incorrecte: programma antivirus non cognoscite: ''$1''",
 'virus-scanfailed'     => 'scansion fallite (codice $1)',
 'virus-unknownscanner' => 'antivirus non cognoscite:',
 
 # Login and logout pages
 'logouttitle'                => 'Session claudite',
-'logouttext'                 => '<strong>Tu ha claudite tu session.</strong>
+'logouttext'                 => "'''Tu ha claudite tu session.'''
 
 Tu pote continuar a usar {{SITENAME}} anonymemente, o tu pote [[Special:UserLogin|initiar un nove session]] como le mesme o como un altere usator.
-Nota que alcun paginas pote continuar a monstrar se como si le session esserea ancora active. Pro remediar isto, tu pote vacuar le cache de tu navigator.',
+Nota que alcun paginas pote continuar a monstrar se como si le session esserea ancora active. Pro remediar isto, tu pote vacuar le cache de tu navigator.",
 'welcomecreation'            => '== Benvenite, $1! ==
 Tu conto ha essite create.
 Non oblida personalisar tu [[Special:Preferences|preferentias in {{SITENAME}}]].',
@@ -414,7 +504,6 @@ Non oblida personalisar tu [[Special:Preferences|preferentias in {{SITENAME}}]].
 'remembermypassword'         => 'Memorar mi contrasigno in iste computator',
 'yourdomainname'             => 'Tu dominio:',
 'externaldberror'            => 'O il occureva un error in le base de datos de authentification externe, o tu non ha le autorisation de actualisar tu conto externe.',
-'loginproblem'               => '<b>Un problema occureva con tu session.</b><br />Per favor reprova!',
 'login'                      => 'Aperir session',
 'nav-login-createaccount'    => 'Aperir session / crear conto',
 'loginprompt'                => 'Tu debe haber activate le cookies pro poter identificar te a {{SITENAME}}.',
@@ -440,7 +529,7 @@ Selige un altere nomine.',
 'yourvariant'                => 'Variante:',
 'yournick'                   => 'Signatura:',
 'badsig'                     => 'Signatura crude invalide; verificar le etiquettas HTML.',
-'badsiglength'               => 'Le signatura es troppo longe.
+'badsiglength'               => 'Tu signatura es troppo longe.
 Illo debe haber minus de $1 {{PLURAL:$1|character|characteres}}.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Le nomine real es optional.
@@ -459,6 +548,7 @@ Per favor activa lo e reprova.",
 'loginsuccesstitle'          => 'Session aperite con successo',
 'loginsuccess'               => "'''Tu es ora identificate in {{SITENAME}} como \"\$1\".'''",
 'nosuchuser'                 => 'Non existe un usator con le nomine "$1".
+In le nomines de usator se distingue inter majusculas e minusculas.
 Verifica le orthographia, o [[Special:UserLogin/signup|crea un nove conto]].',
 'nosuchusershort'            => 'Non existe un usator con le nomine "<nowiki>$1</nowiki>".
 Verifica le orthographia.',
@@ -487,9 +577,9 @@ Ante que alcun altere e-mail se invia al conto, tu debera sequer le instructione
 'throttled-mailpassword'     => 'Un memento del contrasigno jam esseva inviate durante le ultime {{PLURAL:$1|hora|$1 horas}}.
 Pro impedir le abuso, nos invia solmente un memento de contrasigno per {{PLURAL:$1|hora|$1 horas}}.',
 'mailerror'                  => 'Error de inviar e-mail: $1',
-'acct_creation_throttle_hit' => 'Excusa, tu jam ha create $1 contos.
-Tu non pote facer plus.',
-'emailauthenticated'         => 'Tu adresse de e-mail se authentificava le $1.',
+'acct_creation_throttle_hit' => 'Le visitatores de iste wiki usante tu adresse IP ha create {{PLURAL:$1|1 conto|$1 contos}} durante le ultime die, e isto es le maximo permittite in iste periodo de tempore.
+A causa de isto, le visitatores usante iste adresse IP non pote crear nove contos al momento.',
+'emailauthenticated'         => 'Tu adresse de e-mail se authentificava le $2 a $3.',
 'emailnotauthenticated'      => 'Tu adresse de e-mail non ha essite authentificate ancora.
 Nos non inviara e-mail pro alcun del sequente functiones.',
 'noemailprefs'               => 'Specifica un adresse de e-mail pro poter executar iste functiones.',
@@ -503,20 +593,28 @@ Entra un adresse ben formatate, o vacua ille campo.',
 Tu deberea aperir un session e cambiar tu contrasigno ora.
 
 Tu pote ignorar iste message si iste conto se creava in error.',
+'login-throttled'            => 'Tu ha facite troppo de tentativas recente a entrar le contrasigno de iste conto. Per favor attende ante que tu face un altere.',
 'loginlanguagelabel'         => 'Lingua: $1',
 
 # Password reset dialog
-'resetpass'               => 'Redefinir contrasigno del conto',
-'resetpass_announce'      => 'Tu ha aperite un session con un codice temporari que tu recipeva in e-mail.
+'resetpass'                 => 'Cambiar contrasigno',
+'resetpass_announce'        => 'Tu ha aperite un session con un codice temporari que tu recipeva in e-mail.
 Pro completar le session, tu debe definir un nove contrasigno hic:',
-'resetpass_text'          => '<!-- Adde texto hic -->',
-'resetpass_header'        => 'Cambiar le contrasigno del conto',
-'resetpass_submit'        => 'Definir contrasigno e aperir un session',
-'resetpass_success'       => 'Tu contrasigno ha essite cambiate! Ora se aperi tu session...',
-'resetpass_bad_temporary' => 'Contrasigno temporari invalide.
+'resetpass_text'            => '<!-- Adde texto hic -->',
+'resetpass_header'          => 'Cambiar le contrasigno del conto',
+'oldpassword'               => 'Contrasigno actual:',
+'newpassword'               => 'Nove contrasigno:',
+'retypenew'                 => 'Repete le nove contrasigno:',
+'resetpass_submit'          => 'Definir contrasigno e aperir un session',
+'resetpass_success'         => 'Tu contrasigno ha essite cambiate! Ora se aperi tu session...',
+'resetpass_bad_temporary'   => 'Contrasigno temporari invalide.
 Es possibile que tu ha ja cambiate tu contrasigno o ha requestate un nove contrasigno temporari.',
-'resetpass_forbidden'     => 'Le contrasignos non pote esser cambiate',
-'resetpass_missing'       => 'Le formulario non contineva alcun datos.',
+'resetpass_forbidden'       => 'Le contrasignos non pote esser cambiate',
+'resetpass-no-info'         => 'Tu debe aperir un session pro poter acceder directemente a iste pagina.',
+'resetpass-submit-loggedin' => 'Cambiar contrasigno',
+'resetpass-wrong-oldpass'   => 'Le contrasigno temporari o actual es invalide. 
+Es possibile que tu ha ja cambiate tu contrasigno o requestate un nove contrasigno temporari.',
+'resetpass-temp-password'   => 'Contrasigno temporari:',
 
 # Edit page toolbar
 'bold_sample'     => 'Texto grasse',
@@ -541,12 +639,12 @@ Es possibile que tu ha ja cambiate tu contrasigno o ha requestate un nove contra
 'hr_tip'          => 'Linea horizontal (usa con moderation)',
 
 # Edit pages
-'summary'                          => 'Summario',
-'subject'                          => 'Subjecto/titulo',
+'summary'                          => 'Summario:',
+'subject'                          => 'Subjecto/titulo:',
 'minoredit'                        => 'Isto es un modification minor',
 'watchthis'                        => 'Observar iste pagina',
 'savearticle'                      => 'Publicar articulo',
-'preview'                          => 'Previsualisar',
+'preview'                          => 'Previsualisation',
 'showpreview'                      => 'Monstrar previsualisation',
 'showlivepreview'                  => 'Previsualisation directe',
 'showdiff'                         => 'Detaliar modificationes',
@@ -557,8 +655,8 @@ Si tu clicca super Publicar de novo, le modification essera publicate sin summar
 'missingcommenttext'               => 'Per favor entra un commento infra.',
 'missingcommentheader'             => "'''Memento:''' Tu non entrava un subjecto/titulo pro iste commento.
 Si tu clicca super Publicar de novo, tu commento essera publicate sin subjecto/titulo.",
-'summary-preview'                  => 'Previsualisation del summario',
-'subject-preview'                  => 'Previsualisation del subjecto/titulo',
+'summary-preview'                  => 'Previsualisation del summario:',
+'subject-preview'                  => 'Previsualisation del subjecto/titulo:',
 'blockedtitle'                     => 'Le usator es blocate',
 'blockedtext'                      => "<big>'''Tu nomine de usator o adresse IP ha essite blocate.'''</big>
 
@@ -612,36 +710,39 @@ Si tu ha arrivate hic per error, clicca le button '''Retornar''' de tu navigator
 'anontalkpagetext'                 => "---- ''Isto es le pagina de discussion pro un usator anonyme qui non ha ancora create un conto, o qui non lo usa. Consequentemente nos debe usar le adresse IP numeric pro identificar le/la.
 Un tal adresse IP pote esser usate in commun per varie personas.
 Si tu es un usator anonyme e pensa que commentos irrelevante ha essite dirigite a te, per favor [[Special:UserLogin/signup|crea un conto]] o [[Special:UserLogin|aperi un session]] pro evitar futur confusiones con altere usatores anonyme.''",
-'noarticletext'                    => 'Actualmente il non ha texto in iste pagina. Tu pote [[Special:Search/{{PAGENAME}}|cercar iste titulo]] in le texto de altere paginas o [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificar iste pagina].',
+'noarticletext'                    => 'Al momento il non ha texto in iste pagina.
+Tu pote [[Special:Search/{{PAGENAME}}|cercar le titulo de iste pagina]] in altere paginas,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} cercar in le registros pertinente],
+o [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificar iste pagina].',
 'userpage-userdoesnotexist'        => 'Le conto de usator "$1" non es registrate. Per favor verifica que tu vole crear/modificar iste pagina.',
 'clearyourcache'                   => "'''Nota - Post confirmar, il pote esser necessari refrescar le ''cache'' de tu navigator pro vider le cambiamentos.''' '''Mozilla / Firefox / Safari:''' tenente ''Shift'' clicca ''Reload,'' o preme ''Ctrl-F5'' o ''Ctrl-R'' (''Command-R'' in un Macintosh); '''Konqueror: '''clicca ''Reload'' o preme ''F5;'' '''Opera:''' vacua le ''cache'' in ''Tools → Preferences;'' '''Internet Explorer:''' tenente ''Ctrl'' clicca ''Refresh,'' o preme ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Consilio:</strong> Usa le button 'Monstrar previsualisation' pro testar tu nove CSS/JS ante de publicar lo.",
+'usercssjsyoucanpreview'           => "'''Consilio:''' Usa le button 'Monstrar previsualisation' pro testar tu nove CSS/JS ante de publicar lo.",
 'usercsspreview'                   => "'''Non oblida que isto es solmente un previsualisation de tu CSS personalisate.
 Le modificationes non ha ancora essite immagazinate!'''",
 'userjspreview'                    => "'''Memora que isto es solmente un test/previsualisation de tu JavaScript personalisate, illo non ha ancora essite immagazinate!'''",
 'userinvalidcssjstitle'            => "'''Attention:''' Le stilo \"\$1\" non existe.
 Memora que le paginas .css and .js personalisate usa un titulo in minusculas, p.ex. {{ns:user}}:Foo/monobook.css e non {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Actualisate)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Isto es solmente un previsualisation;
-le modificationes non ha ancora essite publicate!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Isto es solmente un previsualisation;
+le modificationes non ha ancora essite publicate!'''",
 'previewconflict'                  => 'Iste previsualisation reflecte le apparentia final del texto in le area de modification superior
 si tu opta pro publicar lo.',
-'session_fail_preview'             => '<strong>Nos non poteva processar tu modification proque nos perdeva le datos del session.
+'session_fail_preview'             => "'''Nos non poteva processar tu modification proque nos perdeva le datos del session.
 Per favor reprova.
-Si illo ancora non va, prova [[Special:UserLogout|clauder tu session]] e aperir un nove session.</strong>',
-'session_fail_preview_html'        => "<strong>Nos non poteva processar tu modification proque nos perdeva le datos del session.</strong>
+Si illo ancora non va, prova [[Special:UserLogout|clauder tu session]] e aperir un nove session.'''",
+'session_fail_preview_html'        => "'''Nos non poteva processar tu modification proque nos perdeva le datos del session.'''
 
 ''Post que HTML crude es active in {{SITENAME}}, le previsualisation es celate como precaution contra attaccos via JavaScript.''
 
-<strong>Si isto es un tentativa de modification legitime, per favor reprova lo.
-Si illo ancora non va, prova [[Special:UserLogout|clauder tu session]] e aperir un nove session.</strong>",
-'token_suffix_mismatch'            => "<strong>Tu modification ha essite refusate proque tu cliente corrumpeva le characteres de punctuation in le indicio de modification.
+'''Si isto es un tentativa de modification legitime, per favor reprova lo.
+Si illo ancora non va, prova [[Special:UserLogout|clauder tu session]] e aperir un nove session.'''",
+'token_suffix_mismatch'            => "'''Tu modification ha essite refusate proque tu cliente corrumpeva le characteres de punctuation in le indicio de modification.
 Iste refusa es pro evitar le corruption del texto del pagina.
-Isto pote occurrer quando tu usa un servicio problematic de ''proxy'' anonyme a base de web.</strong>",
+Isto pote occurrer quando tu usa un servicio problematic de ''proxy'' anonyme a base de web.'''",
 'editing'                          => 'Modification de $1',
 'editingsection'                   => 'Modification de $1 (section)',
-'editingcomment'                   => 'Modification de $1 (commento)',
+'editingcomment'                   => 'Modification de $1 (nove section)',
 'editconflict'                     => 'Conflicto de modification: $1',
 'explainconflict'                  => "Alicuno ha modificate iste pagina post que tu
 ha comenciate a modificar lo.
@@ -652,30 +753,32 @@ Tu debera incorporar tu modificationes in le texto existente.
 quando tu clicca super \"Publicar articulo\".",
 'yourtext'                         => 'Tu texto',
 'storedversion'                    => 'Version immagazinate',
-'nonunicodebrowser'                => '<strong>ATTENTION: Tu utilisa un navigator non compatibile con le characteres Unicode.
-Se ha activate un systema de modification alternative que te permittera modificar articulos con securitate: le characteres non-ASCII apparera in le quadro de modification como codices hexadecimal.</strong>',
-'editingold'                       => '<strong>ATTENTION: Tu va modificar un version obsolete de iste pagina.
-Si tu lo publica, tote le modificationes facite post iste revision essera perdite.</strong>',
+'nonunicodebrowser'                => "'''ATTENTION: Tu utilisa un navigator non compatibile con le characteres Unicode.
+Se ha activate un systema de modification alternative que te permittera modificar articulos con securitate: le characteres non-ASCII apparera in le quadro de modification como codices hexadecimal.'''",
+'editingold'                       => "'''ATTENTION: Tu va modificar un version obsolete de iste pagina.
+Si tu lo publica, tote le modificationes facite post iste version essera perdite.'''",
 'yourdiff'                         => 'Differentias',
-'copyrightwarning'                 => 'Nota ben que tote le contributiones a {{SITENAME}} se considera publicate sub le $2 (vide plus detalios in $1).
+'copyrightwarning'                 => "Nota ben que tote le contributiones a {{SITENAME}} se considera publicate sub le $2 (vide plus detalios in $1).
 Si tu non vole que tu scripto sia modificate impietosemente e redistribuite a voluntate, alora non lo submitte hic.<br />
 In addition, tu nos garanti que tu es le autor de isto, o que tu lo ha copiate de un ressource a dominio public o alteremente libere de derectos.
-<strong>NON SUBMITTE MATERIAL SUBJECTE A COPYRIGHT SIN AUTORISATION EXPRESSE!</strong>',
-'copyrightwarning2'                => 'Nota ben que tote le contributiones a {{SITENAME}} pote esser redigite, alterate, o eliminate per altere contributores.
+'''NON SUBMITTE MATERIAL SUBJECTE A COPYRIGHT SIN AUTORISATION EXPRESSE!'''",
+'copyrightwarning2'                => "Nota ben que tote le contributiones a {{SITENAME}} pote esser redigite, alterate, o eliminate per altere contributores.
 Si tu non vole que tu scripto sia modificate impietosemente, alora non lo submitte hic.<br />
 In addition, tu nos garanti que tu es le autor de isto, o que tu lo ha copiate de un ressource a dominio public o alteremente libere de derectos (vide detalios in $1).
-<strong>NON SUBMITTE MATERIAL SUBJECTE A COPYRIGHT SIN AUTORISATION EXPRESSE!</strong>',
-'longpagewarning'                  => '<strong>ATTENTION: Iste pagina occupa $1 kilobytes;
+'''NON SUBMITTE MATERIAL SUBJECTE A COPYRIGHT SIN AUTORISATION EXPRESSE!'''",
+'longpagewarning'                  => "'''ATTENTION: Iste pagina occupa $1 kilobytes;
 alcun navigatores pote presentar problemas in modificar paginas que approxima o excede 32 kilobytes.
-Per favor considera divider le pagina in sectiones minus grande.</strong>',
-'longpageerror'                    => '<strong>ERROR: Le texto que tu submitteva occupa $1 kilobytes, excedente le maximo de $2 kilobytes.
-Illo non pote esser immagazinate.</strong>',
-'readonlywarning'                  => '<strong>ATTENTION: Le base de datos ha essite blocate pro mantenentia, ergo tu non pote immagazinar tu modificationes justo nunc.
-Nos recommenda copiar-e-collar le texto pro salveguardar lo in un file de texto, assi que tu potera publicar lo plus tarde.</strong>',
-'protectedpagewarning'             => '<strong>ATTENTION:  Iste pagina ha essite protegite. Solmente administratores pote modificar lo.</strong>',
+Per favor considera divider le pagina in sectiones minus grande.'''",
+'longpageerror'                    => "'''ERROR: Le texto que tu submitteva occupa $1 kilobytes, excedente le maximo de $2 kilobytes.
+Illo non pote esser immagazinate.'''",
+'readonlywarning'                  => "'''ATTENTION: Le base de datos ha essite blocate pro mantenentia, ergo tu non pote immagazinar tu modificationes justo nunc.
+Nos recommenda copiar-e-collar le texto pro immagazinar lo in un file de texto, assi que tu potera publicar lo plus tarde.'''
+
+Le administrator qui lo blocava dava iste explication: $1",
+'protectedpagewarning'             => "'''ATTENTION:  Iste pagina ha essite protegite. Solmente administratores pote modificar lo.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Iste pagina ha essite protegite de maniera que solmente usatores registrate pote modificar lo.",
 'cascadeprotectedwarning'          => "'''Attention:''' Iste pagina ha essite protegite de maniera que solmente administratores pote modificar lo, proque illo es includite in le protection in cascada del sequente {{PLURAL:$1|pagina|paginas}}:",
-'titleprotectedwarning'            => '<strong>ATTENTION:  Iste pagina ha essite protegite de maniera que solmente certe usatores specific pote crear lo.</strong>',
+'titleprotectedwarning'            => "'''ATTENTION:  Iste pagina ha essite protegite de maniera que [[Special:ListGroupRights|permissiones specific]] es requirite pro crear lo.'''",
 'templatesused'                    => 'Patronos usate in iste pagina:',
 'templatesusedpreview'             => 'Patronos usate in iste previsualisation:',
 'templatesusedsection'             => 'Patronos usate in iste section:',
@@ -694,11 +797,22 @@ Tu pote retornar e modificar un pagina existente, o [[Special:UserLogin|identifi
 
 Tu deberea considerar si il es appropriate crear iste pagina de novo.
 Le registro de deletiones pro iste pagina se trova infra pro major commoditate:",
+'deleted-notice'                   => 'Iste pagina ha essite delite.
+In basso se revela le registro de deletiones del pagina pro ulterior informationes.',
+'deletelog-fulllog'                => 'Vider registro complete',
+'edit-hook-aborted'                => 'Modification abortate per uncino.
+Illo non dava un explication.',
+'edit-gone-missing'                => 'Impossibile actualisar le pagina.
+Pare que illo ha essite delite.',
+'edit-conflict'                    => 'Conflicto inter modificationes.',
+'edit-no-change'                   => 'Tu modification ha essite ignorate, proque nulle cambio esseva facite in le texto.',
+'edit-already-exists'              => 'Non poteva crear un nove pagina.
+Illo existe ja.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Attention: Iste pagina contine troppo de appellos costose al functiones del analysator syntactic.
 
-Illo debe haber minus de $2, sed al momento ha $1.',
+Illo debe haber minus de $2 {{PLURAL:$2|appello|appellos}}, sed al momento ha $1 {{PLURAL:$1|appello|appellos}}.',
 'expensive-parserfunction-category'       => 'Paginas con troppo de appellos costose al functiones del analysator syntactic',
 'post-expand-template-inclusion-warning'  => 'Attention: Le grandor del patronos includite ha excedite le maximo.
 Alcun patronos non essera includite.',
@@ -706,13 +820,15 @@ Alcun patronos non essera includite.',
 'post-expand-template-argument-warning'   => 'Attention: Iste pagina contine al minus un parametro de patrono que ha un grandor de expansion excessive.
 Iste parametros ha essite omittite.',
 'post-expand-template-argument-category'  => 'Paginas que omitte alcun parametros de patrono',
+'parser-template-loop-warning'            => 'Recursion infinite detegite in patrono: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limite de recursion del patrono excedite ($1)',
 
 # "Undo" feature
 'undo-success' => 'Le modification pote esser annullate.
 Per favor controla le comparation infra pro verificar que tu vole facer isto, e alora immagazina le modificationes infra pro assi annullar le modification.',
 'undo-failure' => 'Le modification non poteva esser annullate a causa de conflicto con modificationes intermedie.',
 'undo-norev'   => 'Impossibile annullar le modification proque illo non existe o esseva delite.',
-'undo-summary' => 'Annullava le revision $1 per [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]] | [[Special:Contributions/$2|{{MediaWiki:Contribslink}}]])',
+'undo-summary' => 'Annullava le version $1 per [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]] | [[Special:Contributions/$2|{{MediaWiki:Contribslink}}]])',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Non pote crear conto',
@@ -721,34 +837,33 @@ Per favor controla le comparation infra pro verificar que tu vole facer isto, e
 Le motivo que $3 dava es ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vider le registro de iste pagina',
-'nohistory'           => 'Non existe un historia de modificationes pro iste pagina.',
-'revnotfound'         => 'Revision non trovate',
-'revnotfoundtext'     => 'Impossibile trovar le version anterior del pagina que tu ha demandate.
-Verifica le adresse URL que tu ha usate pro acceder a iste pagina.',
-'currentrev'          => 'Revision actual',
-'revisionasof'        => 'Revision del $1',
-'revision-info'       => 'Revision del $1 per $2',
-'previousrevision'    => '�Revision precedente',
-'nextrevision'        => 'Revision sequente→',
-'currentrevisionlink' => 'Revision actual',
-'cur'                 => 'actu',
-'next'                => 'sequ',
-'last'                => 'prec',
-'page_first'          => 'prime',
-'page_last'           => 'ultime',
-'histlegend'          => 'Pro detaliar le differentias inter duo versiones: marca lor circulos correspondente, e preme <code>Enter</code> o clicca le button in basso.<br />
+'viewpagelogs'           => 'Vider le registro de iste pagina',
+'nohistory'              => 'Non existe un historia de modificationes pro iste pagina.',
+'currentrev'             => 'Version actual',
+'currentrev-asof'        => 'Version actual in data del $1',
+'revisionasof'           => 'Version del $1',
+'revision-info'          => 'Version del $1 per $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Version precedente',
+'nextrevision'           => 'Version sequente →',
+'currentrevisionlink'    => 'Version actual',
+'cur'                    => 'actu',
+'next'                   => 'sequ',
+'last'                   => 'prec',
+'page_first'             => 'prime',
+'page_last'              => 'ultime',
+'histlegend'             => 'Pro detaliar le differentias inter duo versiones: marca lor circulos correspondente, e preme <code>Enter</code> o clicca le button in basso.<br />
 Legenda: (actu) = comparar con le version actual,
 (prec) = comparar con le version precedente, M = modification minor.',
-'deletedrev'          => '[delite]',
-'histfirst'           => 'Prime',
-'histlast'            => 'Ultime',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vacue)',
+'history-fieldset-title' => 'Examinar historia',
+'deletedrev'             => '[delite]',
+'histfirst'              => 'Prime',
+'histlast'               => 'Ultime',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vacue)',
 
 # Revision feed
-'history-feed-title'          => 'Historia de revisiones',
-'history-feed-description'    => 'Historia de revisiones de iste pagina in le wiki',
+'history-feed-title'          => 'Historia de versiones',
+'history-feed-description'    => 'Historia del versiones de iste pagina in le wiki',
 'history-feed-item-nocomment' => '$1 a $2', # user at time
 'history-feed-empty'          => 'Le pagina que tu requestava non existe.
 Es possibile que illo esseva delite del wiki, o renominate.
@@ -759,36 +874,36 @@ Prova [[Special:Search|cercar nove paginas relevante]] in le wiki.',
 'rev-deleted-user'            => '(nomine de usator eliminate)',
 'rev-deleted-event'           => '(entrata eliminate)',
 'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
-Iste revision del pagina ha essite eliminate del archivos public.
+Iste version del pagina ha essite eliminate del archivos public.
 Es possibile que se trova detalios in le [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} registro de deletiones].</div>',
 'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">
-Iste revision del pagina ha essite eliminate del archivos public.
+Iste version del pagina ha essite eliminate del archivos public.
 Como administrator in {{SITENAME}} tu pote vider lo;
 es possibile que se trova detalios in le [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} registro de deletiones].</div>',
 'rev-delundel'                => 'revelar/celar',
-'revisiondelete'              => 'Deler/restaurar revisiones',
-'revdelete-nooldid-title'     => 'Le revision de destination es invalide',
-'revdelete-nooldid-text'      => 'O tu non ha specificate alcun revision(es) de destination pro executar iste 
-function, o le revision specificate non existe, o tu essaya celar le revision actual.',
-'revdelete-selected'          => "'''{{PLURAL:$2|Revision seligite|Revisiones seligite}} de [[:$1]]:'''",
+'revisiondelete'              => 'Deler/restaurar versiones',
+'revdelete-nooldid-title'     => 'Le version de destination es invalide',
+'revdelete-nooldid-text'      => 'O tu non ha specificate alcun version(es) de destination pro executar iste 
+function, o le version specificate non existe, o tu essaya celar le version actual.',
+'revdelete-selected'          => "'''{{PLURAL:$2|Version seligite|Versiones seligite}} de [[:$1]]:'''",
 'logdelete-selected'          => "'''{{PLURAL:$1|Evento|Eventos}} de registro seligite:'''",
-'revdelete-text'              => "'''Le revisiones e eventos delite continuara a apparer in le historia e registro del pagina, sed partes de lor contento essera inaccessibile al publico.'''
+'revdelete-text'              => "'''Le versiones e eventos delite continuara a apparer in le historia e registro del pagina, sed partes de lor contento essera inaccessibile al publico.'''
 
 Altere administratores in {{SITENAME}} continuara a poter acceder al contento celate e pote restaurar lo per medio de iste mesme interfacie, si non se ha definite restrictiones additional.",
 'revdelete-legend'            => 'Definir restrictiones de visibilitate',
-'revdelete-hide-text'         => 'Celar texto del revision',
+'revdelete-hide-text'         => 'Celar texto del version',
 'revdelete-hide-name'         => 'Celar action e objectivo',
 'revdelete-hide-comment'      => 'Celar commento de modification',
 'revdelete-hide-user'         => 'Celar nomine de usator o adresse IP del modificator',
 'revdelete-hide-restricted'   => 'Applicar iste restrictiones al administratores e blocar iste interfacie',
 'revdelete-suppress'          => 'Supprimer datos e de Administratores e de alteres',
 'revdelete-hide-image'        => 'Celar contento del file',
-'revdelete-unsuppress'        => 'Eliminar restrictiones super revisiones restaurate',
+'revdelete-unsuppress'        => 'Eliminar restrictiones super versiones restaurate',
 'revdelete-log'               => 'Commento pro registro:',
-'revdelete-submit'            => 'Applicar al revision seligite',
-'revdelete-logentry'          => 'cambiava le visibilitate de revisiones pro [[$1]]',
+'revdelete-submit'            => 'Applicar al version seligite',
+'revdelete-logentry'          => 'cambiava le visibilitate de versiones pro [[$1]]',
 'logdelete-logentry'          => 'cambiava le visibilitate de eventos pro [[$1]]',
-'revdelete-success'           => "'''Le visibilitate de revisiones ha essite definite con successo.'''",
+'revdelete-success'           => "'''Le visibilitate de versiones ha essite definite con successo.'''",
 'logdelete-success'           => "'''Le visibilitate del registro ha essite definite con successo.'''",
 'revdel-restore'              => 'Cambiar visibilitate',
 'pagehist'                    => 'Historia del pagina',
@@ -800,7 +915,7 @@ Altere administratores in {{SITENAME}} continuara a poter acceder al contento ce
 'revdelete-unrestricted'      => 'restrictiones eliminate pro administratores',
 'revdelete-hid'               => 'celava $1',
 'revdelete-unhid'             => 'revelava $1',
-'revdelete-log-message'       => '$1 pro $2 {{PLURAL:$2|revision|revisiones}}',
+'revdelete-log-message'       => '$1 pro $2 {{PLURAL:$2|version|versiones}}',
 'logdelete-log-message'       => '$1 pro $2 {{PLURAL:$2|evento|eventos}}',
 
 # Suppression log
@@ -810,19 +925,19 @@ Vide le [[Special:IPBlockList|lista de blocadas IP]] pro le lista de bannimentos
 
 # History merging
 'mergehistory'                     => 'Fusionar historias del paginas',
-'mergehistory-header'              => 'Iste pagina te permitte fusionar revisiones del historia de un pagina de origine in un pagina plus nove.
+'mergehistory-header'              => 'Iste pagina te permitte fusionar versiones del historia de un pagina de origine in un pagina plus nove.
 Assecura te que iste cambio mantenera le continuitate historic del pagina.',
-'mergehistory-box'                 => 'Fusionar le revisiones de duo paginas:',
+'mergehistory-box'                 => 'Fusionar le versiones de duo paginas:',
 'mergehistory-from'                => 'Pagina de origine:',
 'mergehistory-into'                => 'Pagina de destination:',
 'mergehistory-list'                => 'Historia de modificationes fusionabile',
-'mergehistory-merge'               => 'Le sequente revisiones de [[:$1]] pote esser fusionate in [[:$2]].
-Usa le columna de buttones radio pro fusionar solmente le revisiones create in e ante le tempore specificate.
+'mergehistory-merge'               => 'Le sequente versiones de [[:$1]] pote esser fusionate in [[:$2]].
+Usa le columna de buttones radio pro fusionar solmente le versiones create in e ante le tempore specificate.
 Nota que le uso del ligamines de navigation causara le perdita de tote cambios in iste columna.',
 'mergehistory-go'                  => 'Revelar modificationes fusionabile',
-'mergehistory-submit'              => 'Fusionar revisiones',
-'mergehistory-empty'               => 'Nulle revisiones pote esser fusionate.',
-'mergehistory-success'             => '$3 {{PLURAL:$3|revision|revisiones}} de [[:$1]] fusionate in [[:$2]] con successo.',
+'mergehistory-submit'              => 'Fusionar versiones',
+'mergehistory-empty'               => 'Nulle versiones pote esser fusionate.',
+'mergehistory-success'             => '$3 {{PLURAL:$3|version|versiones}} de [[:$1]] fusionate in [[:$2]] con successo.',
 'mergehistory-fail'                => 'Impossibile executar le fusion del historia. Per favor reverifica le parametros del pagina e del tempore.',
 'mergehistory-no-source'           => 'Le pagina de origine $1 non existe.',
 'mergehistory-no-destination'      => 'Le pagina de destination $1 non existe.',
@@ -830,136 +945,218 @@ Nota que le uso del ligamines de navigation causara le perdita de tote cambios i
 'mergehistory-invalid-destination' => 'Le pagina de destination debe esser un titulo valide.',
 'mergehistory-autocomment'         => 'Fusionava [[:$1]] in [[:$2]]',
 'mergehistory-comment'             => 'Fusionava [[:$1]] in [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Le paginas de origine e de destination non pote esser le mesme',
 
 # Merge log
 'mergelog'           => 'Registro de fusiones',
-'pagemerge-logentry' => 'fusionava [[$1]] in [[$2]] (revisiones usque a $3)',
+'pagemerge-logentry' => 'fusionava [[$1]] in [[$2]] (versiones usque a $3)',
 'revertmerge'        => 'Reverter fusion',
 'mergelogpagetext'   => 'Infra es un lista del fusiones le plus recente de un historia de pagina in un altere.',
 
 # Diffs
-'history-title'           => 'Historia de revisiones de "$1"',
-'difference'              => '(Differentia inter revisiones)',
+'history-title'           => 'Historia de versiones de "$1"',
+'difference'              => '(Differentia inter versiones)',
 'lineno'                  => 'Linea $1:',
 'compareselectedversions' => 'Comparar versiones seligite',
+'visualcomparison'        => 'Comparation visual',
+'wikicodecomparison'      => 'Comparation del wikitexto',
 'editundo'                => 'annullar',
-'diff-multi'              => '({{PLURAL:$1|Un revision intermedie|$1 revisiones intermedie}} non se revela.)',
+'diff-multi'              => '({{PLURAL:$1|Un version intermedie|$1 versiones intermedie}} non se revela.)',
+'diff-movedto'            => 'displaciate verso $1',
+'diff-styleadded'         => '$1 stilo addite',
+'diff-added'              => '$1 addite',
+'diff-changedto'          => 'cambiate a $1',
+'diff-movedoutof'         => 'displaciate ex $1',
+'diff-styleremoved'       => '$1 stilo eliminate',
+'diff-removed'            => '$1 removite',
+'diff-changedfrom'        => 'cambiate ab $1',
+'diff-src'                => 'origine',
+'diff-withdestination'    => 'con destination $1',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'latitude',
+'diff-height'             => 'altitude',
+'diff-p'                  => "un '''paragrapho'''",
+'diff-blockquote'         => "un '''citation'''",
+'diff-h1'                 => "un '''titulo (nivello 1)'''",
+'diff-h2'                 => "un '''titulo (nivello 2)'''",
+'diff-h3'                 => "un '''titulo (nivello 3)'''",
+'diff-h4'                 => "un '''titulo (nivello 4)'''",
+'diff-h5'                 => "un '''titulo (nivello 5)'''",
+'diff-pre'                => "un '''bloco preformatate'''",
+'diff-div'                => "un '''division'''",
+'diff-ul'                 => "un '''lista non ordinate'''",
+'diff-ol'                 => "un '''lista ordinate'''",
+'diff-li'                 => "un '''entrata de lista'''",
+'diff-table'              => "un '''tabella'''",
+'diff-tbody'              => "le '''contento de un tabella'''",
+'diff-tr'                 => "un '''linea'''",
+'diff-td'                 => "un '''cellula'''",
+'diff-th'                 => "un '''titulo'''",
+'diff-br'                 => "un '''interruption de linea'''",
+'diff-hr'                 => "un '''linea horizontal'''",
+'diff-code'               => "un '''bloco de codice de computator'''",
+'diff-dl'                 => "un '''lista de definitiones'''",
+'diff-dt'                 => "un '''termino a definir'''",
+'diff-dd'                 => "un '''definition'''",
+'diff-input'              => "un '''entrata'''",
+'diff-form'               => "un '''formulario'''",
+'diff-img'                => "un '''imagine'''",
+'diff-span'               => "un '''portata'''",
+'diff-a'                  => "un '''ligamine'''",
+'diff-i'                  => "'''cursive'''",
+'diff-b'                  => "'''grasse'''",
+'diff-strong'             => "'''forte'''",
+'diff-em'                 => "'''emphase'''",
+'diff-font'               => "'''typo de litteras'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''delite'''",
+'diff-tt'                 => "'''latitude fixe'''",
+'diff-sub'                => "'''subscripto'''",
+'diff-sup'                => "'''superscripto'''",
+'diff-strike'             => "'''linea de cancellation'''",
 
 # Search results
-'searchresults'             => 'Resultatos del recerca',
-'searchresulttext'          => 'Pro plus informationes super le recerca in {{SITENAME}}, vide [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Tu cercava \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tote le paginas que comencia con "$1"]] | [[Special:WhatLinksHere/$1|tote le paginas con ligamines a "$1"]])',
-'searchsubtitleinvalid'     => "Tu cercava '''$1'''",
-'noexactmatch'              => "'''Non existe un pagina con le titulo \"\$1\".'''
+'searchresults'                    => 'Resultatos del recerca',
+'searchresults-title'              => 'Resultatos del recerca de "$1"',
+'searchresulttext'                 => 'Pro plus informationes super le recerca in {{SITENAME}}, vide [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Tu cercava \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tote le paginas que comencia con "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|tote le paginas con ligamines a "$1"]])',
+'searchsubtitleinvalid'            => "Tu cercava '''$1'''",
+'noexactmatch'                     => "'''Non existe un pagina con le titulo \"\$1\".'''
 Tu pote [[:\$1|crear iste pagina]].",
-'noexactmatch-nocreate'     => "'''Non existe un pagina con titulo \"\$1\".'''",
-'toomanymatches'            => 'Se retornava troppo de resultatos. Per favor prova un altere consulta.',
-'titlematches'              => 'Correspondentias in le titulos de paginas',
-'notitlematches'            => 'Nulle correspondentias in le titulos de paginas',
-'textmatches'               => 'Resultatos in le texto de paginas',
-'notextmatches'             => 'Nulle resultato in le texto de paginas',
-'prevn'                     => '$1 {{PLURAL:$1|precedente|precedentes}}',
-'nextn'                     => '$1 {{PLURAL:$1|sequente|sequentes}}',
-'viewprevnext'              => 'Vider ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 parola|$2 parolas}})',
-'search-result-score'       => 'Relevantia: $1%',
-'search-redirect'           => '(redirection verso $1)',
-'search-section'            => '(section $1)',
-'search-suggest'            => 'Esque tu vole dicer: $1',
-'search-interwiki-caption'  => 'Projectos fratres',
-'search-interwiki-default'  => 'Resultatos de $1:',
-'search-interwiki-more'     => '(plus)',
-'search-mwsuggest-enabled'  => 'con suggestiones',
-'search-mwsuggest-disabled' => 'sin suggestiones',
-'search-relatedarticle'     => 'Connexe',
-'mwsuggest-disable'         => 'Disactivar suggestiones via AJAX',
-'searchrelated'             => 'connexe',
-'searchall'                 => 'totes',
-'showingresults'            => "Infra se monstra non plus de {{PLURAL:$1|'''1''' resultato|'''$1''' resultatos}} a partir del numero '''$2'''.",
-'showingresultsnum'         => "Infra se monstra {{PLURAL:$3|'''1''' resultato|'''$3''' resultatos}} a partir del numero '''$2'''.",
-'showingresultstotal'       => "Infra se monstra le {{PLURAL:$3|resultato '''$1''' de '''$3'''|resultatos '''$1 - $2''' de '''$3'''}}",
-'nonefound'                 => "'''Nota:''' Normalmente, se cerca solmente in alcun spatios de nomines. Prova prefixar tu consulta con ''all:'' pro cercar in tote le contento (includente paginas de discussion, patronos, etc.), o usa le spatio de nomines desirate como prefixo.",
-'powersearch'               => 'Recerca avantiate',
-'powersearch-legend'        => 'Recerca avantiate',
-'powersearch-ns'            => 'Cercar in spatios de nomines:',
-'powersearch-redir'         => 'Listar redirectiones',
-'powersearch-field'         => 'Cercar',
-'search-external'           => 'Recerca externe',
-'searchdisabled'            => 'Le recerca in {{SITENAME}} es disactivate.
+'noexactmatch-nocreate'            => "'''Non existe un pagina con titulo \"\$1\".'''",
+'toomanymatches'                   => 'Se retornava troppo de resultatos. Per favor prova un altere consulta.',
+'titlematches'                     => 'Correspondentias in le titulos de paginas',
+'notitlematches'                   => 'Nulle correspondentias in le titulos de paginas',
+'textmatches'                      => 'Resultatos in le texto de paginas',
+'notextmatches'                    => 'Nulle resultato in le texto de paginas',
+'prevn'                            => '$1 {{PLURAL:$1|precedente|precedentes}}',
+'nextn'                            => '$1 {{PLURAL:$1|sequente|sequentes}}',
+'viewprevnext'                     => 'Vider ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Optiones de recerca',
+'searchmenu-exists'                => "'''Existe un pagina nominate \"[[\$1]]\" in iste wiki'''",
+'searchmenu-new'                   => "'''Crea le pagina \"[[:\$1]]\" in iste wiki!'''",
+'searchhelp-url'                   => 'Help:Contento',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Navigar per le paginas con iste prefixo]]',
+'searchprofile-articles'           => 'Paginas de contento',
+'searchprofile-articles-and-proj'  => 'Paginas de contento e de projecto',
+'searchprofile-project'            => 'Paginas de projecto',
+'searchprofile-images'             => 'Files',
+'searchprofile-everything'         => 'Toto',
+'searchprofile-advanced'           => 'Avantiate',
+'searchprofile-articles-tooltip'   => 'Cercar in $1',
+'searchprofile-project-tooltip'    => 'Cercar in $1',
+'searchprofile-images-tooltip'     => 'Cercar files',
+'searchprofile-everything-tooltip' => 'Cercar in tote le contento (includente le paginas de discussion)',
+'searchprofile-advanced-tooltip'   => 'Cercar in spatios de nomines personalisate',
+'prefs-search-nsdefault'           => 'Cercar usante valores predefinite:',
+'prefs-search-nscustom'            => 'Cercar in le spatios de nomines personalisate:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 parola|$2 parolas}})',
+'search-result-score'              => 'Relevantia: $1%',
+'search-redirect'                  => '(redirection verso $1)',
+'search-section'                   => '(section $1)',
+'search-suggest'                   => 'Esque tu vole dicer: $1',
+'search-interwiki-caption'         => 'Projectos fratres',
+'search-interwiki-default'         => 'Resultatos de $1:',
+'search-interwiki-more'            => '(plus)',
+'search-mwsuggest-enabled'         => 'con suggestiones',
+'search-mwsuggest-disabled'        => 'sin suggestiones',
+'search-relatedarticle'            => 'Connexe',
+'mwsuggest-disable'                => 'Disactivar suggestiones via AJAX',
+'searchrelated'                    => 'connexe',
+'searchall'                        => 'totes',
+'showingresults'                   => "Infra se monstra non plus de {{PLURAL:$1|'''1''' resultato|'''$1''' resultatos}} a partir del numero '''$2'''.",
+'showingresultsnum'                => "Infra se monstra {{PLURAL:$3|'''1''' resultato|'''$3''' resultatos}} a partir del numero '''$2'''.",
+'showingresultstotal'              => "Infra se monstra le {{PLURAL:$4|resultato '''$1''' de '''$3'''|resultatos '''$1 - $2''' de '''$3'''}}",
+'nonefound'                        => "'''Nota:''' Normalmente, se cerca solmente in alcun spatios de nomines. Prova prefixar tu consulta con ''all:'' pro cercar in tote le contento (includente paginas de discussion, patronos, etc.), o usa le spatio de nomines desirate como prefixo.",
+'search-nonefound'                 => 'Le recerca non ha producite resultatos.',
+'powersearch'                      => 'Recerca avantiate',
+'powersearch-legend'               => 'Recerca avantiate',
+'powersearch-ns'                   => 'Cercar in spatios de nomines:',
+'powersearch-redir'                => 'Listar redirectiones',
+'powersearch-field'                => 'Cercar',
+'search-external'                  => 'Recerca externe',
+'searchdisabled'                   => 'Le recerca in {{SITENAME}} es disactivate.
 Tu pote cercar via Google in le interim.
 Nota que lor indices del contento de {{SITENAME}} pote esser obsolete.',
 
 # Preferences page
-'preferences'              => 'Preferentias',
-'mypreferences'            => 'Mi preferentias',
-'prefs-edits'              => 'Numero de modificationes:',
-'prefsnologin'             => 'Tu non te ha identificate',
-'prefsnologintext'         => 'Tu debe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} aperir un session] pro poter configurar tu preferentias.',
-'prefsreset'               => 'Tu preferentias anterior ha essite restaurate.',
-'qbsettings'               => 'Barra rapide',
-'qbsettings-none'          => 'Necun',
-'qbsettings-fixedleft'     => 'Fixe a sinistra',
-'qbsettings-fixedright'    => 'Fixe a derecta',
-'qbsettings-floatingleft'  => 'Flottante a sinistra',
-'qbsettings-floatingright' => 'Flottante a derecta',
-'changepassword'           => 'Cambiar contrasigno',
-'skin'                     => 'Stilo',
-'math'                     => 'Mathematica',
-'dateformat'               => 'Formato de datas',
-'datedefault'              => 'Nulle preferentia',
-'datetime'                 => 'Data e hora',
-'math_failure'             => 'Error durante le analyse del syntaxe',
-'math_unknown_error'       => 'error incognite',
-'math_unknown_function'    => 'function incognite',
-'math_lexing_error'        => 'error lexic',
-'math_syntax_error'        => 'error de syntaxe',
-'math_image_error'         => "Le conversion in PNG ha fallite;
+'preferences'               => 'Preferentias',
+'mypreferences'             => 'Mi preferentias',
+'prefs-edits'               => 'Numero de modificationes:',
+'prefsnologin'              => 'Tu non te ha identificate',
+'prefsnologintext'          => 'Tu debe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} aperir un session] pro poter configurar tu preferentias.',
+'prefsreset'                => 'Tu preferentias anterior ha essite restaurate.',
+'qbsettings'                => 'Barra rapide',
+'qbsettings-none'           => 'Necun',
+'qbsettings-fixedleft'      => 'Fixe a sinistra',
+'qbsettings-fixedright'     => 'Fixe a derecta',
+'qbsettings-floatingleft'   => 'Flottante a sinistra',
+'qbsettings-floatingright'  => 'Flottante a derecta',
+'changepassword'            => 'Cambiar contrasigno',
+'skin'                      => 'Stilo',
+'skin-preview'              => 'Previsualisation',
+'math'                      => 'Mathematica',
+'dateformat'                => 'Formato de datas',
+'datedefault'               => 'Nulle preferentia',
+'datetime'                  => 'Data e hora',
+'math_failure'              => 'Error durante le analyse del syntaxe',
+'math_unknown_error'        => 'error incognite',
+'math_unknown_function'     => 'function incognite',
+'math_lexing_error'         => 'error lexic',
+'math_syntax_error'         => 'error de syntaxe',
+'math_image_error'          => "Le conversion in PNG ha fallite;
 verifica que le installation sia correcte del programmas ''latex, dvips, gs,'' e ''convert''.",
-'math_bad_tmpdir'          => 'Non pote scriber in o crear le directorio temporari "math".',
-'math_bad_output'          => 'Non pote scriber in o crear le directorio de output "math".',
-'math_notexvc'             => "Le executabile ''texvc'' manca;
+'math_bad_tmpdir'           => 'Non pote scriber in o crear le directorio temporari "math".',
+'math_bad_output'           => 'Non pote scriber in o crear le directorio de output "math".',
+'math_notexvc'              => "Le executabile ''texvc'' manca;
 per favor vide math/README pro configurar lo.",
-'prefs-personal'           => 'Profilo del usator',
-'prefs-rc'                 => 'Modificationes recente',
-'prefs-watchlist'          => 'Observatorio',
-'prefs-watchlist-days'     => 'Numero de dies a monstrar in le observatorio:',
-'prefs-watchlist-edits'    => 'Numero maximal de modificationes a monstrar in le observatorio expandite:',
-'prefs-misc'               => 'Misc',
-'saveprefs'                => 'Confirmar',
-'resetprefs'               => 'Reverter cambios',
-'oldpassword'              => 'Contrasigno actual:',
-'newpassword'              => 'Nove contrasigno:',
-'retypenew'                => 'Repete le nove contrasigno:',
-'textboxsize'              => 'Modification',
-'rows'                     => 'Lineas:',
-'columns'                  => 'Columnas:',
-'searchresultshead'        => 'Recerca',
-'resultsperpage'           => 'Resultatos per pagina:',
-'contextlines'             => 'Lineas per resultato:',
-'contextchars'             => 'Characteres de contexto per linea:',
-'stub-threshold'           => 'Limite pro formatar le ligamines in <a href="#" class="stub">stilo de peciettas</a> (bytes):',
-'recentchangesdays'        => 'Numero de dies a monstrar in modificationes recente:',
-'recentchangescount'       => 'Numero de modificationes a monstrar in paginas de modificationes recente, de historia e de registro:',
-'savedprefs'               => 'Tu preferentias ha essite confirmate.',
-'timezonelegend'           => 'Fuso horari',
-'timezonetext'             => '¹Le numero de horas inter tu hora local e le hora del servitor (UTC).',
-'localtime'                => 'Hora local',
-'timezoneoffset'           => 'Differentia¹',
-'servertime'               => 'Hora del servitor',
-'guesstimezone'            => 'Obtener del navigator',
-'allowemail'               => 'Activar reception de e-mail de altere usatores',
-'prefs-searchoptions'      => 'Optiones de recerca',
-'prefs-namespaces'         => 'Spatios de nomines',
-'defaultns'                => 'Cercar initialmente in iste spatios de nomines:',
-'default'                  => 'predefinition',
-'files'                    => 'Files',
+'prefs-personal'            => 'Profilo del usator',
+'prefs-rc'                  => 'Modificationes recente',
+'prefs-watchlist'           => 'Observatorio',
+'prefs-watchlist-days'      => 'Numero de dies a monstrar in le observatorio:',
+'prefs-watchlist-days-max'  => '(non plus de 7 dies)',
+'prefs-watchlist-edits'     => 'Numero maximal de modificationes a monstrar in le observatorio expandite:',
+'prefs-watchlist-edits-max' => '(numero maxime: 1000)',
+'prefs-misc'                => 'Misc',
+'prefs-resetpass'           => 'Cambiar contrasigno',
+'saveprefs'                 => 'Confirmar',
+'resetprefs'                => 'Reverter cambios',
+'textboxsize'               => 'Modification',
+'prefs-edit-boxsize'        => 'Dimensiones del fenestra de modification.',
+'rows'                      => 'Lineas:',
+'columns'                   => 'Columnas:',
+'searchresultshead'         => 'Recerca',
+'resultsperpage'            => 'Resultatos per pagina:',
+'contextlines'              => 'Lineas per resultato:',
+'contextchars'              => 'Characteres de contexto per linea:',
+'stub-threshold'            => 'Limite pro formatar le ligamines in <a href="#" class="stub">stilo de peciettas</a> (bytes):',
+'recentchangesdays'         => 'Numero de dies a monstrar in modificationes recente:',
+'recentchangesdays-max'     => '(non plus de $1 {{PLURAL:$1|die|dies}})',
+'recentchangescount'        => 'Numero de modificationes a monstrar in le modificationes recente, in historias de paginas e in registros, per predefinition:',
+'savedprefs'                => 'Tu preferentias ha essite confirmate.',
+'timezonelegend'            => 'Fuso horari',
+'timezonetext'              => '¹Le numero de horas inter tu hora local e le hora del servitor (UTC).',
+'localtime'                 => 'Hora local:',
+'timezoneselect'            => 'Fuso horari:',
+'timezoneuseserverdefault'  => 'Usar le hora del servitor',
+'timezoneuseoffset'         => 'Altere (specifica le differentia)',
+'timezoneoffset'            => 'Differentia¹:',
+'servertime'                => 'Hora del servitor:',
+'guesstimezone'             => 'Obtener del navigator',
+'allowemail'                => 'Activar reception de e-mail de altere usatores',
+'prefs-searchoptions'       => 'Optiones de recerca',
+'prefs-namespaces'          => 'Spatios de nomines',
+'defaultns'                 => 'Cercar initialmente in iste spatios de nomines:',
+'default'                   => 'predefinition',
+'files'                     => 'Files',
 
 # User rights
 'userrights'                  => 'Gestion de derectos de usator', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Gerer gruppos de usatores',
 'userrights-user-editname'    => 'Entra un nomine de usator:',
 'editusergroup'               => 'Modificar gruppos de usatores',
-'editinguser'                 => "Cambiamento del derectos del usator '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Cambiamento del derectos del usator '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modificar gruppos de usatores',
 'saveusergroups'              => 'Immagazinar gruppos de usatores',
 'userrights-groupsmember'     => 'Membro de:',
@@ -1008,6 +1205,8 @@ per favor vide math/README pro configurar lo.",
 'right-minoredit'            => 'Marcar modificationes como minor',
 'right-move'                 => 'Renominar paginas',
 'right-move-subpages'        => 'Renominar paginas con lor subpaginas',
+'right-move-rootuserpages'   => 'Renominar le paginas radice de usator',
+'right-movefile'             => 'Renominar files',
 'right-suppressredirect'     => 'Non rediriger le ancian nomine verso le nove quando se renomina un pagina',
 'right-upload'               => 'Cargar files',
 'right-reupload'             => 'Superscriber un file existente',
@@ -1022,11 +1221,11 @@ per favor vide math/README pro configurar lo.",
 'right-writeapi'             => 'Uso del API pro modificar le wiki',
 'right-delete'               => 'Deler paginas',
 'right-bigdelete'            => 'Deler paginas con historias longe',
-'right-deleterevision'       => 'Deler e restaurar revisiones specific de paginas',
+'right-deleterevision'       => 'Deler e restaurar versiones specific de paginas',
 'right-deletedhistory'       => 'Vider entratas de historia delite, sin lor texto associate',
 'right-browsearchive'        => 'Cercar in paginas delite',
 'right-undelete'             => 'Restaurar un pagina',
-'right-suppressrevision'     => 'Revider e restaurar revisiones celate ab administratores',
+'right-suppressrevision'     => 'Revider e restaurar versiones celate ab administratores',
 'right-suppressionlog'       => 'Vider registros private',
 'right-block'                => 'Blocar altere usatores de facer modificationes',
 'right-blockemail'           => 'Blocar un usator de inviar e-mail',
@@ -1058,9 +1257,46 @@ per favor vide math/README pro configurar lo.",
 'rightslogentry' => 'cambiava le gruppos del quales $1 es membro de $2 a $3',
 'rightsnone'     => '(nulle)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'leger iste pagina',
+'action-edit'                 => 'modificar iste pagina',
+'action-createpage'           => 'crear paginas',
+'action-createtalk'           => 'crear paginas de discussion',
+'action-createaccount'        => 'crear iste conto de usator',
+'action-minoredit'            => 'marcar iste modification como minor',
+'action-move'                 => 'renominar iste pagina',
+'action-move-subpages'        => 'renominar iste pagina e su subpaginas',
+'action-move-rootuserpages'   => 'renominar le paginas radice de usator',
+'action-movefile'             => 'renominar iste file',
+'action-upload'               => 'cargar iste file',
+'action-reupload'             => 'superscriber iste file existente',
+'action-reupload-shared'      => 'supplantar iste file in un deposito commun',
+'action-upload_by_url'        => 'cargar iste file ab un adresse URL',
+'action-writeapi'             => 'usar le API de scriptura',
+'action-delete'               => 'deler iste pagina',
+'action-deleterevision'       => 'deler iste version',
+'action-deletedhistory'       => 'vider le historia delite de iste pagina',
+'action-browsearchive'        => 'cercar in paginas delite',
+'action-undelete'             => 'restaurar iste pagina',
+'action-suppressrevision'     => 'revider e restaurar iste version celate',
+'action-suppressionlog'       => 'vider iste registro private',
+'action-block'                => 'blocar iste usator de facer modificationes',
+'action-protect'              => 'cambiar le nivellos de protection pro iste pagina',
+'action-import'               => 'importar iste pagina ab un altere wiki',
+'action-importupload'         => 'importar iste pagina ab un file cargate',
+'action-patrol'               => 'marcar le modificationes de alteros como patruliate',
+'action-autopatrol'           => 'haber tu modification marcate como patruliate',
+'action-unwatchedpages'       => 'vider le lista de paginas non observate',
+'action-trackback'            => 'submitter un trackback',
+'action-mergehistory'         => 'fusionar le historia de iste pagina',
+'action-userrights'           => 'modificar tote le derectos de usator',
+'action-userrights-interwiki' => 'modificar le derectos de usatores in altere wikis',
+'action-siteadmin'            => 'blocar e disblocar le base de datos',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|modification|modificationes}}',
 'recentchanges'                     => 'Modificationes recente',
+'recentchanges-legend'              => 'Optiones del modificationes recente',
 'recentchangestext'                 => 'Seque le plus recente modificationes a {{SITENAME}} in iste pagina.',
 'recentchanges-feed-description'    => 'Seque le modificationes le plus recente al wiki in iste syndication.',
 'rcnote'                            => "Infra es {{PLURAL:$1|'''1''' modification|le ultime '''$1''' modificationes}} in le ultime {{PLURAL:$2|die|'''$2''' dies}}, actualisate le $4 a $5.",
@@ -1084,6 +1320,8 @@ per favor vide math/README pro configurar lo.",
 'rc_categories'                     => 'Limite a categorias (separar con "|")',
 'rc_categories_any'                 => 'Qualcunque',
 'newsectionsummary'                 => '/* $1 */ nove section',
+'rc-enhanced-expand'                => 'Revelar detalios (require JavaScript)',
+'rc-enhanced-hide'                  => 'Celar detalios',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Modificationes correlate',
@@ -1105,11 +1343,11 @@ Le paginas presente in [[Special:Watchlist|tu observatorio]] se revela in litter
 'upload_directory_read_only'  => 'Le servitor de web non ha le permission de scriber in le directorio de cargamento ($1).',
 'uploaderror'                 => 'Error de carga',
 'uploadtext'                  => "Tu pote cargar files con le formulario infra.
-Pro vider o cercar imagines cargate anteriormente, visita le [[Special:ImageList|lista de imagines cargate]]. In ultra, le (re)cargas es registrate in le [[Special:Log/upload|registro de cargas]], le deletiones in le [[Special:Log/delete|registro de deletiones]].
+Pro vider o cercar imagines cargate anteriormente, visita le [[Special:FileList|lista de imagines cargate]]. In ultra, le (re)cargas es registrate in le [[Special:Log/upload|registro de cargas]], le deletiones in le [[Special:Log/delete|registro de deletiones]].
 
 Pro includer un file in un articulo, usa un ligamine in un del sequente formas:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' pro usar le version complete del file
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|texto alternative]]</nowiki></tt>''' pro usar un rendition a largor de 200 pixel in un quadro in le margine sinistre con 'texto alternative' qua description
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' pro usar le version complete del file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|texto alternative]]</nowiki></tt>''' pro usar un rendition a largor de 200 pixel in un quadro in le margine sinistre con 'texto alternative' qua description
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' pro facer un ligamine directe al file sin monstrar le file",
 'upload-permitted'            => 'Typos de file permittite: $1.',
 'upload-preferred'            => 'Typos de file preferite: $1.',
@@ -1117,7 +1355,7 @@ Pro includer un file in un articulo, usa un ligamine in un del sequente formas:
 'uploadlog'                   => 'registro de cargas',
 'uploadlogpage'               => 'Registro de cargas',
 'uploadlogpagetext'           => 'Infra es un lista del plus recente cargas de files.
-Vide le [[Special:NewImages|galeria de nove files]] pro un presentation plus visual.',
+Vide le [[Special:NewFiles|galeria de nove files]] pro un presentation plus visual.',
 'filename'                    => 'Nomine del file',
 'filedesc'                    => 'Summario',
 'fileuploadsummary'           => 'Summario:',
@@ -1143,26 +1381,27 @@ iste file occupa $2.',
 'emptyfile'                   => 'Le file que tu cargava pare esser vacue.
 Isto pote esser debite a un error in le nomine del file.
 Per favor verifica que tu realmente vole cargar iste file.',
-'fileexists'                  => 'Un file con iste nomine existe ja. Per favor verifica <strong><tt>$1</tt></strong> si tu non es secur de voler cambiar lo.',
-'filepageexists'              => 'Le pagina de description correspondente a iste file ha jam essite create a <strong><tt>$1</tt></strong>, sed un file con iste nomine non existe al momento.
+'fileexists'                  => "Un file con iste nomine existe ja. Per favor verifica '''<tt>$1</tt>''' si tu non es secur de voler cambiar lo.",
+'filepageexists'              => "Le pagina de description correspondente a iste file ha jam essite create a '''<tt>$1</tt>''', sed un file con iste nomine non existe al momento.
 Le summario que tu entra non apparera in le pagina de description.
-Si tu vole que illo appare, tu debe inserer lo manualmente.',
-'fileexists-extension'        => 'Un file con un nomine similar existe ja:<br />
-Nomine del file que tu carga: <strong><tt>$1</tt></strong><br />
-Nomine del file existente: <strong><tt>$2</tt></strong><br />
-Per favor selige un altere nomine.',
+Si tu vole que illo appare, tu debe inserer lo manualmente.",
+'fileexists-extension'        => "Un file con un nomine similar existe ja:<br />
+Nomine del file que tu carga: '''<tt>$1</tt>'''<br />
+Nomine del file existente: '''<tt>$2</tt>'''<br />
+Per favor selige un altere nomine.",
 'fileexists-thumb'            => "<center>'''File existente'''</center>",
-'fileexists-thumbnail-yes'    => 'Iste file pare esser un imagine a grandor reducite <i>(miniatura)</i>.
-Per favor verifica le file <strong><tt>$1</tt></strong>.<br />
-Si le file verificate es le mesme imagine a grandor original, non es necessari cargar un miniatura additional.',
-'file-thumbnail-no'           => 'Le nomine del file comencia con <strong><tt>$1</tt></strong>.
-Illo pare esser un imagine a grandor reducite <i>(miniatura)</i>.
-Si tu possede iste imagine in plen resolution, carga lo, alteremente cambia le nomine del file per favor.',
-'fileexists-forbidden'        => 'Un file con iste nomine existe ja;
-per favor retorna e carga iste file sub un altere nomine. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Un file con iste nomine existe ja in le repositorio de files commun.
-Si tu vole totevia cargar iste file, per favor retorna e usa un nove nomine. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Iste file pare esser un imagine a grandor reducite ''(miniatura)''.
+Per favor verifica le file '''<tt>$1</tt>'''.<br />
+Si le file verificate es le mesme imagine a grandor original, non es necessari cargar un miniatura additional.",
+'file-thumbnail-no'           => "Le nomine del file comencia con '''<tt>$1</tt>'''.
+Illo pare esser un imagine a grandor reducite ''(miniatura)''.
+Si tu possede iste imagine in plen resolution, carga lo, alteremente cambia le nomine del file per favor.",
+'fileexists-forbidden'        => 'Un file con iste nomine existe ja, e non pote esser superscribite.
+Si tu vole ancora cargar iste file, per favor retorna e usa un nove nomine. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Un file con iste nomine existe ja in le deposito de files commun.
+Si tu vole totevia cargar iste file, per favor retorna e usa un nove nomine. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Iste file es un duplicato del sequente {{PLURAL:$1|file|files}}:',
+'file-deleted-duplicate'      => 'Un file identic a iste file ([[$1]]) esseva ja delite anteriormente. Tu deberea verificar le registro de deletiones concernente iste file ante de re-cargar lo.',
 'successfulupload'            => 'Cargamento succedite',
 'uploadwarning'               => 'Advertimento de cargamento',
 'savefile'                    => 'Immagazinar file',
@@ -1184,8 +1423,8 @@ Tu debe verificar le $1 ante de proceder e recargar lo.',
 
 Tu debe considerar si es appropriate continuar a cargar iste file.
 Pro major commoditate se trova hic le registro de deletiones correspondente a iste file:",
-'filename-bad-prefix'         => 'Le nomine del file que tu va cargar comencia con <strong>"$1"</strong>, le qual es un nomine non descriptive, typicamente assignate automaticamente per le cameras digital.
-Per favor selige un nomine plus descriptive pro tu file.',
+'filename-bad-prefix'         => "Le nomine del file que tu va cargar comencia con '''\"\$1\"''', le qual es un nomine non descriptive, typicamente assignate automaticamente per le cameras digital.
+Per favor selige un nomine plus descriptive pro tu file.",
 'filename-prefix-blacklist'   => ' #<!-- non modificar de alcun modo iste linea --> <pre>
 # Le syntaxe es como seque:
 #   * Toto a partir de un character "#" usque al fin del linea es un commento
@@ -1226,20 +1465,21 @@ Pote esser preferite reprovar quando le sito es minus occupate.',
 'upload_source_url'  => ' (un adresse URL valide e publicamente accessibile)',
 'upload_source_file' => ' (un file in tu computator)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Iste pagina special monstra tote le files cargate.
+# Special:ListFiles
+'listfiles-summary'     => 'Iste pagina special monstra tote le files cargate.
 Per predefinition le ultime files cargate se monstra al initio del lista.
 Tu pote reordinar le lista con un clic super le titulo de un columna.',
-'imagelist_search_for'  => 'Cercar un nomine de media:',
+'listfiles_search_for'  => 'Cercar un nomine de media:',
 'imgfile'               => 'file',
-'imagelist'             => 'Lista de files',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nomine',
-'imagelist_user'        => 'Usator',
-'imagelist_size'        => 'Grandor',
-'imagelist_description' => 'Description',
-
-# Image description page
+'listfiles'             => 'Lista de files',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nomine',
+'listfiles_user'        => 'Usator',
+'listfiles_size'        => 'Grandor',
+'listfiles_description' => 'Description',
+'listfiles_count'       => 'Versiones',
+
+# File description page
 'filehist'                       => 'Historia del file',
 'filehist-help'                  => 'Clicca super un data/hora pro vider le file como appareva a ille tempore.',
 'filehist-deleteall'             => 'deler totes',
@@ -1247,23 +1487,29 @@ Tu pote reordinar le lista con un clic super le titulo de un columna.',
 'filehist-revert'                => 'reverter',
 'filehist-current'               => 'actual',
 'filehist-datetime'              => 'Data/Hora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura pro le version de $1',
+'filehist-nothumb'               => 'Nulle miniatura',
 'filehist-user'                  => 'Usator',
 'filehist-dimensions'            => 'Dimensiones',
 'filehist-filesize'              => 'Grandor del file',
 'filehist-comment'               => 'Commento',
-'imagelinks'                     => 'Ligamines',
+'imagelinks'                     => 'Ligamines verso iste file',
 'linkstoimage'                   => 'Le sequente {{PLURAL:$1|pagina ha un ligamine|$1 paginas ha ligamines}} verso iste file:',
+'linkstoimage-more'              => 'Plus de $1 {{PLURAL:$1|pagina ha un ligamine|paginas ha ligamines}} verso iste file.
+Le sequente lista monstra le {{PLURAL:$1|prime pagina|prime $1 paginas}} que puncta a iste file specific.
+Un [[Special:WhatLinksHere/$2|lista complete]] es disponibile.',
 'nolinkstoimage'                 => 'Nulle pagina se liga verso iste file.',
 'morelinkstoimage'               => 'Vider [[Special:WhatLinksHere/$1|plus ligamines]] a iste file.',
 'redirectstofile'                => 'Le sequente {{PLURAL:$1|file|$1 files}} se redirige a iste file:',
-'duplicatesoffile'               => 'Le sequente {{PLURAL:$1|files es un duplicato|$1 files es duplicatos}} de iste file:',
+'duplicatesoffile'               => 'Le sequente {{PLURAL:$1|file es un duplicato|$1 files es duplicatos}} de iste file ([[Special:FileDuplicateSearch/$2|plus detalios]]):',
 'sharedupload'                   => 'Iste file ha essite cargate pro uso in commun; altere projectos pote usar lo.',
 'shareduploadwiki'               => 'Per favor vide le $1 pro ulterior informationes.',
-'shareduploadwiki-desc'          => 'Infra se monstra le description in su $1 in le repositorio commun.',
+'shareduploadwiki-desc'          => 'Le description, prendite del $1 a iste sito, es monstrate infra.',
 'shareduploadwiki-linktext'      => 'pagina de description del file',
-'shareduploadduplicate'          => 'Iste file es un duplicato de $1 del repositorio commun.',
+'shareduploadduplicate'          => 'Iste file es un duplicato de $1 del deposito commun.',
 'shareduploadduplicate-linktext' => 'un altere file',
-'shareduploadconflict'           => 'Iste file ha le mesme nomine que $1 del repositorio commun.',
+'shareduploadconflict'           => 'Iste file ha le mesme nomine que $1 del deposito commun.',
 'shareduploadconflict-linktext'  => 'un altere file',
 'noimage'                        => 'Non existe un file con iste nomine, sed tu pote $1.',
 'noimage-linktext'               => 'cargar un',
@@ -1283,7 +1529,7 @@ Tu pote reordinar le lista con un clic super le titulo de un columna.',
 # File deletion
 'filedelete'                  => 'Deler $1',
 'filedelete-legend'           => 'Deler file',
-'filedelete-intro'            => "Tu va deler '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Tu es super le puncto de deler le file '''[[Media:$1|$1]]''' con tote su historia.",
 'filedelete-intro-old'        => "Tu va deler le version de '''[[Media:$1|$1]]''' del [$4 $3 a $2].",
 'filedelete-comment'          => 'Motivo pro deletion:',
 'filedelete-submit'           => 'Deler',
@@ -1291,8 +1537,6 @@ Tu pote reordinar le lista con un clic super le titulo de un columna.',
 'filedelete-success-old'      => "Le version de '''[[Media:$1|$1]]''' del $3 a $2 ha essite delite.",
 'filedelete-nofile'           => "'''$1''' non existe.",
 'filedelete-nofile-old'       => "Non existe un version archivate de '''$1''' con le attributos specificate.",
-'filedelete-iscurrent'        => 'Tu essaya deler le version le plus recente de iste file.
-Per favor reverte lo primo a un version anterior.',
 'filedelete-otherreason'      => 'Motivo altere/additional:',
 'filedelete-reason-otherlist' => 'Altere motivo',
 'filedelete-reason-dropdown'  => '*Motivos habitual pro deletion
@@ -1321,31 +1565,31 @@ Memora verificar que non existe altere ligamines al patronos ante que tu los del
 
 # Random page
 'randompage'         => 'Pagina aleatori',
-'randompage-nopages' => 'Il non ha paginas in iste spatio de nomines.',
+'randompage-nopages' => 'Il non ha paginas in le spatio de nomines "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redirection aleatori',
-'randomredirect-nopages' => 'Il non ha redirectiones in iste spatio de nomines.',
+'randomredirect-nopages' => 'Il non ha redirectiones in le spatio de nomines "$1".',
 
 # Statistics
-'statistics'             => 'Statisticas',
-'sitestats'              => 'Statisticas de accesso',
-'userstats'              => 'Statisticas de usatores',
-'sitestatstext'          => "Le base de datos contine un total de {{PLURAL:\$1|'''1''' pagina|'''\$1''' paginas}}.
-Iste numero include paginas de \"discussion\", paginas super {{SITENAME}}, \"peciettas\"
-minimal, redirectiones, e altere paginas que probabilemente non se qualifica como articulos.
-Excludente {{PLURAL:\$1|iste|istes}}, il remane {{PLURAL:\$2|'''1''' pagina|'''\$2''' paginas}} que probabilemente es
-{{PLURAL:\$2|un articulo|articulos}} legitime.
-
-'''\$8''' {{PLURAL:\$8|file|files}} ha essite cargate.
-
-Il habeva un total de '''\$3''' {{PLURAL:\$3|visita a un pagina|visitas a paginas}}, e '''\$4''' {{PLURAL:\$4|modification de un pagina|modificationes de paginas}}
-desde le establimento de {{SITENAME}}.
-Isto representa un media de '''\$5''' modificationes per pagina, e '''\$6''' visitas per modification.
-
-Le longor del [http://www.mediawiki.org/wiki/Manual:Job_queue cauda de actiones] es '''\$7'''.",
-'userstatstext'          => "Il ha {{PLURAL:$1|'''1''' [[Special:ListUsers|usator]]|'''$1''' [[Special:ListUsers|usatores]]}} registrate, del quales '''$2''' (i.e. '''$4%''') ha le derectos de $5.",
-'statistics-mostpopular' => 'Le paginas plus visitate',
+'statistics'                   => 'Statisticas',
+'statistics-header-pages'      => 'Statisticas de paginas',
+'statistics-header-edits'      => 'Statisticas de modificationes',
+'statistics-header-views'      => 'Statisticas de visitas',
+'statistics-header-users'      => 'Statisticas de usatores',
+'statistics-articles'          => 'Paginas de contento',
+'statistics-pages'             => 'Paginas',
+'statistics-pages-desc'        => 'Tote le paginas del wiki, includente paginas de discussion, redirectiones, etc.',
+'statistics-files'             => 'Files cargate',
+'statistics-edits'             => 'Modificationes de paginas depost le installation de {{SITENAME}}',
+'statistics-edits-average'     => 'Media del modificationes per pagina',
+'statistics-views-total'       => 'Visitas total',
+'statistics-views-peredit'     => 'Visitas per modification',
+'statistics-jobqueue'          => 'Longor del [http://www.mediawiki.org/wiki/Manual:Job_queue cauda de actiones]',
+'statistics-users'             => '[[Special:ListUsers|Usatores]] registrate',
+'statistics-users-active'      => 'Usatores active',
+'statistics-users-active-desc' => 'Usatores qui ha facite un action durante le {{PLURAL:$1|die|$1 dies}} passate',
+'statistics-mostpopular'       => 'Le paginas plus visitate',
 
 'disambiguations'      => 'Paginas de disambiguation',
 'disambiguationspage'  => 'Template:Disambiguation',
@@ -1360,7 +1604,7 @@ Cata linea contine ligamines al prime e al secunde redirection, con le destinati
 'double-redirect-fixer'      => 'Corrector de redirectiones',
 
 'brokenredirects'        => 'Redirectiones rupte',
-'brokenredirectstext'    => 'Le redirectiones sequente se liga verso articulos inexistente.',
+'brokenredirectstext'    => 'Le redirectiones sequente se liga verso articulos inexistente:',
 'brokenredirects-edit'   => '(modificar)',
 'brokenredirects-delete' => '(deler)',
 
@@ -1376,40 +1620,44 @@ Cata linea contine ligamines al prime e al secunde redirection, con le destinati
 'ncategories'             => '$1 {{PLURAL:$1|categoria|categorias}}',
 'nlinks'                  => '$1 {{PLURAL:$1|ligamine|ligamines}}',
 'nmembers'                => '$1 {{PLURAL:$1|membro|membros}}',
-'nrevisions'              => '$1 {{PLURAL:$1|revision|revisiones}}',
+'nrevisions'              => '$1 {{PLURAL:$1|version|versiones}}',
 'nviews'                  => '$1 {{PLURAL:$1|visita|visitas}}',
 'specialpage-empty'       => 'Il non ha resultatos pro iste reporto.',
 'lonelypages'             => 'Paginas orphanate',
 'lonelypagestext'         => 'Le sequente paginas non es ligate ni transcludite in altere paginas in {{SITENAME}}.',
-'uncategorizedpages'      => 'Paginas non classificate',
-'uncategorizedcategories' => 'Categorias non classificate',
+'uncategorizedpages'      => 'Paginas sin categoria',
+'uncategorizedcategories' => 'Categorias sin categoria',
 'uncategorizedimages'     => 'Files non categorisate',
-'uncategorizedtemplates'  => 'Patronos non classificate',
+'uncategorizedtemplates'  => 'Patronos sin categoria',
 'unusedcategories'        => 'Categorias non usate',
 'unusedimages'            => 'Imagines non usate',
 'popularpages'            => 'Paginas popular',
 'wantedcategories'        => 'Categorias plus demandate',
 'wantedpages'             => 'Paginas plus demandate',
-'missingfiles'            => 'Files mancante',
+'wantedfiles'             => 'Files desirate',
+'wantedtemplates'         => 'Patronos desirate',
 'mostlinked'              => 'Paginas le plus ligate',
 'mostlinkedcategories'    => 'Categorias le plus ligate',
 'mostlinkedtemplates'     => 'Patronos le plus utilisate',
 'mostcategories'          => 'Paginas con le plus categorias',
 'mostimages'              => 'Files le plus utilisate',
 'mostrevisions'           => 'Paginas le plus modificate',
-'prefixindex'             => 'Indice de prefixos',
+'prefixindex'             => 'Tote le paginas con prefixo',
 'shortpages'              => 'Paginas curte',
 'longpages'               => 'Paginas longe',
 'deadendpages'            => 'Paginas sin exito',
 'deadendpagestext'        => 'Le sequente paginas non ha ligamines a altere paginas in {{SITENAME}}.',
 'protectedpages'          => 'Paginas protegite',
 'protectedpages-indef'    => 'Solmente protectiones infinite',
+'protectedpages-cascade'  => 'Protectiones in cascada solmente',
 'protectedpagestext'      => 'Le sequente paginas es protegite de esser renominate o modificate',
 'protectedpagesempty'     => 'Nulle paginas es actualmente protegite con iste parametros.',
 'protectedtitles'         => 'Titulos protegite',
 'protectedtitlestext'     => 'Le sequente titulos es protegite de esser create',
 'protectedtitlesempty'    => 'Nulle titulos es actualmente protegite con iste parametros.',
 'listusers'               => 'Lista de usatores',
+'listusers-editsonly'     => 'Monstrar solmente usatores con modificationes',
+'usereditcount'           => '$1 {{PLURAL:$1|modification|modificationes}}',
 'newpages'                => 'Nove paginas',
 'newpages-username'       => 'Nomine de usator:',
 'ancientpages'            => 'Paginas le plus ancian',
@@ -1422,8 +1670,8 @@ Cata linea contine ligamines al prime e al secunde redirection, con le destinati
 executar iste function.',
 'nopagetitle'             => 'Le pagina de destination non existe',
 'nopagetext'              => 'Le pagina de destination que tu ha specificate non existe.',
-'pager-newer-n'           => '{{PLURAL:$1|1 plus recente|$1 plus recentes}}',
-'pager-older-n'           => '{{PLURAL:$1|1 minus recente|$1 minus recentes}}',
+'pager-newer-n'           => '{{PLURAL:$1|1 plus recente|$1 plus recente}}',
+'pager-older-n'           => '{{PLURAL:$1|1 minus recente|$1 minus recente}}',
 'suppress'                => 'Supervisor',
 
 # Book sources
@@ -1431,14 +1679,13 @@ executar iste function.',
 'booksources-search-legend' => 'Cercar fontes de libros',
 'booksources-go'            => 'Ir',
 'booksources-text'          => 'Infra es un lista de ligamines a altere sitos que vende libros nove e usate, e pote etiam haber altere informationes super libros que tu cerca:',
+'booksources-invalid-isbn'  => 'Le ISBN date non pare esser valide; verifica que tu non ha facite errores copiante lo del fonte original.',
 
 # Special:Log
 'specialloguserlabel'  => 'Usator:',
 'speciallogtitlelabel' => 'Titulo:',
 'log'                  => 'Registros',
 'all-logs-page'        => 'Tote le registros',
-'log-search-legend'    => 'Cercar registros',
-'log-search-submit'    => 'Ir',
 'alllogstext'          => 'Presentation combinate de tote le registros disponibile de {{SITENAME}}.
 Pro restringer le presentation, selige un typo de registro, le nomine de usator (sensibile al majusculas e minusculas), o le pagina in question (etiam sensibile al majusculas e minusculas).',
 'logempty'             => 'Le registro contine nihil pro iste pagina.',
@@ -1450,6 +1697,7 @@ Pro restringer le presentation, selige un typo de registro, le nomine de usator
 'nextpage'          => 'Sequente pagina ($1)',
 'prevpage'          => 'Precedente pagina ($1)',
 'allpagesfrom'      => 'Monstrar le paginas a partir de:',
+'allpagesto'        => 'Monstrar le paginas usque a:',
 'allarticles'       => 'Tote le paginas',
 'allinnamespace'    => 'Tote le paginas (del spatio de nomines $1)',
 'allnotinnamespace' => 'Tote le paginas (non in le spatio de nomines $1)',
@@ -1470,45 +1718,72 @@ Vide etiam le [[Special:WantedCategories|categorias desirate]].',
 'special-categories-sort-count' => 'ordinar per numero',
 'special-categories-sort-abc'   => 'ordinar alphabeticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contributiones delite de usatores',
+
+# Special:LinkSearch
+'linksearch'       => 'Ligamines externe',
+'linksearch-pat'   => 'Patrono a cercar:',
+'linksearch-ns'    => 'Spatio de nomines:',
+'linksearch-ok'    => 'Cercar',
+'linksearch-text'  => 'Es possibile usar metacharacteres como in "*.wikipedia.org".<br />
+Protocollos supportate: <tt>$1</tt>',
+'linksearch-line'  => '$1 ligate ab $2',
+'linksearch-error' => 'Le metacharacteres pote apparer solmente al initio del nomine del hospite.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Monstrar usatores a partir de:',
 'listusers-submit'   => 'Revelar',
 'listusers-noresult' => 'Nulle usator trovate.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Registro de creation de usatores',
+'newuserlogpagetext'          => 'Isto es un registro de creation de usatores.',
+'newuserlog-byemail'          => 'contrasigno inviate per e-mail',
+'newuserlog-create-entry'     => 'Nove usator',
+'newuserlog-create2-entry'    => 'creava le nove conto $1',
+'newuserlog-autocreate-entry' => 'Conto create automaticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Derectos del gruppos de usatores',
-'listgrouprights-summary'  => 'Lo sequente es un lista de gruppos de usatores definite in iste wiki, con lor derectos de accesso associate.
+'listgrouprights'                 => 'Derectos del gruppos de usatores',
+'listgrouprights-summary'         => 'Lo sequente es un lista de gruppos de usatores definite in iste wiki, con lor derectos de accesso associate.
 Il pote haber [[{{MediaWiki:Listgrouprights-helppage}}|informationes additional]] super derectos individual.',
-'listgrouprights-group'    => 'Gruppo',
-'listgrouprights-rights'   => 'Derectos',
-'listgrouprights-helppage' => 'Help:Derectos de gruppos',
-'listgrouprights-members'  => '(lista de membros)',
+'listgrouprights-group'           => 'Gruppo',
+'listgrouprights-rights'          => 'Derectos',
+'listgrouprights-helppage'        => 'Help:Derectos de gruppos',
+'listgrouprights-members'         => '(lista de membros)',
+'listgrouprights-addgroup'        => 'Pote adder {{PLURAL:$2|gruppo|gruppos}}: $1',
+'listgrouprights-removegroup'     => 'Pote remover {{PLURAL:$2|gruppo|gruppos}}: $1',
+'listgrouprights-addgroup-all'    => 'Pote adder tote le gruppos',
+'listgrouprights-removegroup-all' => 'Pote eliminar tote le gruppos',
 
 # E-mail user
-'mailnologin'     => 'Necun adresse de invio',
-'mailnologintext' => 'Tu debe [[Special:UserLogin|aperir un session]]
+'mailnologin'      => 'Necun adresse de invio',
+'mailnologintext'  => 'Tu debe [[Special:UserLogin|aperir un session]]
 e haber un adresse de e-mail valide in tu [[Special:Preferences|preferentias]]
 pro inviar e-mail a altere usatores.',
-'emailuser'       => 'Inviar e-mail a iste usator',
-'emailpage'       => 'Inviar e-mail al usator',
-'emailpagetext'   => 'Le formulario infra es pro inviar un message de e-mail a iste usator.
+'emailuser'        => 'Inviar e-mail a iste usator',
+'emailpage'        => 'Inviar e-mail al usator',
+'emailpagetext'    => 'Le formulario infra es pro inviar un message de e-mail a iste usator.
 Le adresse de e-mail que tu indicava in [[Special:Preferences|tu preferentias de usator]] apparera
 como le adresse del expeditor del e-mail, de modo que le destinatario pote responder directemente a te.',
-'usermailererror' => 'Le objecto de e-mail retornava le error:',
-'defemailsubject' => 'E-mail de {{SITENAME}}',
-'noemailtitle'    => 'Nulle adresse de e-mail',
-'noemailtext'     => 'Iste usator non ha specificate un adresse de e-mail valide,
-o ha optate pro non reciper e-mail de altere usatores.',
-'emailfrom'       => 'Expeditor:',
-'emailto'         => 'Destinatario:',
-'emailsubject'    => 'Subjecto:',
-'emailmessage'    => 'Message:',
-'emailsend'       => 'Inviar',
-'emailccme'       => 'Inviar me un copia de mi message.',
-'emailccsubject'  => 'Copia de tu message a $1: $2',
-'emailsent'       => 'E-mail inviate',
-'emailsenttext'   => 'Tu message de e-mail ha essite inviate.',
-'emailuserfooter' => 'Iste e-mail esseva inviate per $1 a $2 con le function "Inviar e-mail al usator" a {{SITENAME}}.',
+'usermailererror'  => 'Le objecto de e-mail retornava le error:',
+'defemailsubject'  => 'E-mail de {{SITENAME}}',
+'noemailtitle'     => 'Nulle adresse de e-mail',
+'noemailtext'      => 'Iste usator non ha specificate un adresse de e-mail valide.',
+'nowikiemailtitle' => 'E-mail non permittite',
+'nowikiemailtext'  => 'Iste usator ha optate pro non reciper e-mail de altere usatores.',
+'email-legend'     => 'Inviar e-mail a un altere usator de {{SITENAME}}',
+'emailfrom'        => 'Expeditor:',
+'emailto'          => 'Destinatario:',
+'emailsubject'     => 'Subjecto:',
+'emailmessage'     => 'Message:',
+'emailsend'        => 'Inviar',
+'emailccme'        => 'Inviar me un copia de mi message.',
+'emailccsubject'   => 'Copia de tu message a $1: $2',
+'emailsent'        => 'E-mail inviate',
+'emailsenttext'    => 'Tu message de e-mail ha essite inviate.',
+'emailuserfooter'  => 'Iste e-mail esseva inviate per $1 a $2 con le function "Inviar e-mail al usator" a {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Mi observatorio',
@@ -1528,9 +1803,9 @@ facilitar su identification.",
 'watch'                => 'Observar',
 'watchthispage'        => 'Observar iste pagina',
 'unwatch'              => 'Disobservar',
-'unwatchthispage'      => 'Cancellar observation',
+'unwatchthispage'      => 'Disobservar',
 'notanarticle'         => 'Non es un articulo',
-'notvisiblerev'        => 'Le revision ha essite delite',
+'notvisiblerev'        => 'Le version ha essite delite',
 'watchnochange'        => 'Nulle articulo que tu observa esseva modificate durante le periodo de tempore indicate.',
 'watchlist-details'    => '{{PLURAL:$1|$1 pagina|$1 paginas}} es in tu observatorio, sin contar le paginas de discussion.',
 'wlheader-enotif'      => '* Le notificationes via e-mail es active.',
@@ -1541,12 +1816,7 @@ facilitar su identification.",
 'iteminvalidname'      => "Problema con entrata '$1', nomine invalide...",
 'wlnote'               => "Infra es le ultime {{PLURAL:$1|modification|'''$1''' modificationes}} durante le ultime {{PLURAL:$2|hora|'''$2''' horas}}.",
 'wlshowlast'           => 'Revelar ultime $1 horas $2 dies $3',
-'watchlist-show-bots'  => 'Monstrar modificationes per bots',
-'watchlist-hide-bots'  => 'Celar modificationes per bots',
-'watchlist-show-own'   => 'Monstrar mi modificationes',
-'watchlist-hide-own'   => 'Celar mi modificationes',
-'watchlist-show-minor' => 'Monstrar modificationes minor',
-'watchlist-hide-minor' => 'Celar modificationes minor',
+'watchlist-options'    => 'Optiones del observatorio',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Observation in curso...',
@@ -1587,88 +1857,107 @@ Pro cambiar le configuration de tu observatorio, visita
 Reactiones e ulterior assistentia:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Deler pagina',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "contento esseva: '$1'",
-'excontentauthor'             => "contento esseva: '$1' (e le sol contributor esseva '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "contento ante radimento esseva: '$1'",
-'exblank'                     => 'pagina esseva vacue',
-'delete-confirm'              => 'Deler "$1"',
-'delete-legend'               => 'Deler',
-'historywarning'              => 'Attention: Le pagina que tu va deler ha un historia:',
-'confirmdeletetext'           => 'Tu va deler un pagina con tote su historia.
+# Delete
+'deletepage'             => 'Deler pagina',
+'confirm'                => 'Confirmar',
+'excontent'              => "contento esseva: '$1'",
+'excontentauthor'        => "contento esseva: '$1' (e le sol contributor esseva '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "contento ante radimento esseva: '$1'",
+'exblank'                => 'pagina esseva vacue',
+'delete-confirm'         => 'Deler "$1"',
+'delete-legend'          => 'Deler',
+'historywarning'         => 'Attention: Le pagina que tu va deler ha un historia:',
+'confirmdeletetext'      => 'Tu va deler un pagina con tote su historia.
 Per favor confirma que tu intende facer isto, que tu comprende le consequentias, e que tu face isto in accordo con [[{{MediaWiki:Policy-url}}|le politicas]].',
-'actioncomplete'              => 'Action complete',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ha essite delite.
+'actioncomplete'         => 'Action complete',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ha essite delite.
 Vide $2 pro un registro de deletiones recente.',
-'deletedarticle'              => 'deleva "[[$1]]"',
-'suppressedarticle'           => 'supprimeva "[[$1]]"',
-'dellogpage'                  => 'Registro de deletiones',
-'dellogpagetext'              => 'Infra es un lista del plus recente deletiones.
+'deletedarticle'         => 'deleva "[[$1]]"',
+'suppressedarticle'      => 'supprimeva "[[$1]]"',
+'dellogpage'             => 'Registro de deletiones',
+'dellogpagetext'         => 'Infra es un lista del plus recente deletiones.
 Tote le horas es in le fuso horari del servitor.',
-'deletionlog'                 => 'registro de deletiones',
-'reverted'                    => 'Revertite a revision anterior',
-'deletecomment'               => 'Motivo pro deletion:',
-'deleteotherreason'           => 'Motivo altere/additional:',
-'deletereasonotherlist'       => 'Altere motivo',
-'deletereason-dropdown'       => '*Motivos habitual pro deler paginas
+'deletionlog'            => 'registro de deletiones',
+'reverted'               => 'Revertite al version anterior',
+'deletecomment'          => 'Motivo pro deletion:',
+'deleteotherreason'      => 'Motivo altere/additional:',
+'deletereasonotherlist'  => 'Altere motivo',
+'deletereason-dropdown'  => '*Motivos habitual pro deler paginas
 ** Requesta del autor
 ** Violation de copyright
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Modificar le motivos pro deletion',
-'delete-toobig'               => 'Iste pagina ha un grande historia de modificationes con plus de $1 {{PLURAL:$1|revision|revisiones}}.
+'delete-edit-reasonlist' => 'Modificar le motivos pro deletion',
+'delete-toobig'          => 'Iste pagina ha un grande historia de modificationes con plus de $1 {{PLURAL:$1|version|versiones}}.
 Le deletion de tal paginas ha essite restringite pro impedir le disruption accidental de {{SITENAME}}.',
-'delete-warning-toobig'       => 'Iste pagina ha un grande historia de modificationes con plus de $1 {{PLURAL:$1|revision|revisiones}}.
+'delete-warning-toobig'  => 'Iste pagina ha un grande historia de modificationes con plus de $1 {{PLURAL:$1|version|versiones}}.
 Le deletion de illo pote disrumper le operationes del base de datos de {{SITENAME}};
 procede con caution.',
-'rollback'                    => 'Revocar modificationes',
-'rollback_short'              => 'Revocar',
-'rollbacklink'                => 'revocar',
-'rollbackfailed'              => 'Revocation fallite',
-'cantrollback'                => 'Impossibile revocar le modification;
+
+# Rollback
+'rollback'         => 'Revocar modificationes',
+'rollback_short'   => 'Revocar',
+'rollbacklink'     => 'revocar',
+'rollbackfailed'   => 'Revocation fallite',
+'cantrollback'     => 'Impossibile revocar le modification;
 le ultime contributor es le sol autor de iste pagina.',
-'alreadyrolled'               => 'Non pote revocar le ultime modification de [[:$1]] per [[User:$2|$2]] ([[User talk:$2|discussion]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+'alreadyrolled'    => 'Non pote revocar le ultime modification de [[:$1]] per [[User:$2|$2]] ([[User talk:$2|discussion]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 un altere persona ha ja modificate o revocate le pagina.
 
-Le ultime modification esseva facite per [[User:$3|$3]] ([[User talk:$3|discussion]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Le commento del modification esseva: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Reverteva modificationes per [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) al ultime version per [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Revocava modificationes per $1;
+Le ultime modification esseva facite per [[User:$3|$3]] ([[User talk:$3|discussion]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Le summario del modification esseva: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Reverteva modificationes per [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) al ultime version per [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Revocava modificationes per $1;
 retornava al version per $2.',
-'sessionfailure'              => 'Il pare haber un problema con tu session de conto;
+'sessionfailure'   => 'Il pare haber un problema con tu session de conto;
 iste action ha essite cancellate como precaution contra le sequestramento de sessiones.
 Per favor preme "retro" e recarga le pagina de ubi tu ha venite, postea reprova.',
+
+# Protect
 'protectlogpage'              => 'Registro de protectiones',
 'protectlogtext'              => 'Infra es un lista de protection e disprotection de paginas.
 Vide le [[Special:ProtectedPages|lista de paginas protegite]] pro le lista de protectiones de paginas actualmente in operation.',
 'protectedarticle'            => 'protegeva "[[$1]]"',
 'modifiedarticleprotection'   => 'cambiava nivello de protection de "[[$1]]"',
 'unprotectedarticle'          => 'disprotegeva "[[$1]]"',
+'movedarticleprotection'      => 'displaciava le configurationes de protection ab "[[$2]]" verso "[[$1]]"',
 'protect-title'               => 'Cambiar nivello de protection de "$1"',
+'prot_1movedto2'              => 'displaciava [[$1]] verso [[$2]]',
 'protect-legend'              => 'Confirmar protection',
 'protectcomment'              => 'Commento:',
 'protectexpiry'               => 'Expira:',
 'protect_expiry_invalid'      => 'Le tempore de expiration es invalide.',
 'protect_expiry_old'          => 'Le tempore de expiration es in le passato.',
 'protect-unchain'             => 'Disserrar permissiones de renomination',
-'protect-text'                => 'Tu pote vider e cambiar hic le nivello de protection del pagina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Tu non pote cambiar le nivellos de protection durante que tu es blocate.
-Ecce le configurationes actual del pagina <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Le nivellos de protection non pote esser cambiate proque es active un blocada del base de datos.
-Ecce le configurationes actual del pagina <strong>$1</strong>:',
-'protect-locked-access'       => 'Tu conto non ha permission a cambiar le nivellos de protection de paginas.
-Ecce le configurationes actual del pagina <strong>$1</strong>:',
+'protect-text'                => "Tu pote vider e cambiar hic le nivello de protection del pagina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Tu non pote cambiar le nivellos de protection durante que tu es blocate.
+Ecce le configurationes actual del pagina '''$1''':",
+'protect-locked-dblock'       => "Le nivellos de protection non pote esser cambiate proque es active un blocada del base de datos.
+Ecce le configurationes actual del pagina '''$1''':",
+'protect-locked-access'       => "Tu conto non ha permission a cambiar le nivellos de protection de paginas.
+Ecce le configurationes actual del pagina '''$1''':",
 'protect-cascadeon'           => 'Iste pagina es actualmente protegite proque es includite in le sequente {{PLURAL:$1|pagina, le qual|paginas, le quales}} ha activate le protection in cascada.
 Tu pote cambiar le nivello de protection de iste pagina, sed isto non cambiara le effecto del protection in cascada.',
-'protect-default'             => '(predefinition)',
+'protect-default'             => 'Permitter tote le usatores',
 'protect-fallback'            => 'Requirer permission de "$1"',
-'protect-level-autoconfirmed' => 'Blocar usatores non registrate',
+'protect-level-autoconfirmed' => 'Blocar usatores nove e non registrate',
 'protect-level-sysop'         => 'Administratores solmente',
 'protect-summary-cascade'     => 'in cascada',
 'protect-expiring'            => 'expira le $1 (UTC)',
+'protect-expiry-indefinite'   => 'infinite',
 'protect-cascade'             => 'Proteger le paginas includite in iste pagina (protection in cascada)',
 'protect-cantedit'            => 'Tu non pote cambiar le nivellos de protection de iste pagina, proque tu non ha le autorisation de modificar le pagina.',
+'protect-othertime'           => 'Altere duration:',
+'protect-othertime-op'        => 'altere duration',
+'protect-existing-expiry'     => 'Expiration existente: le $2 a $3',
+'protect-otherreason'         => 'Motivo altere/additional:',
+'protect-otherreason-op'      => 'motivo altere/additional',
+'protect-dropdown'            => '*Motivos commun de protection
+** Vandalismo excessive
+** Spam excessive
+** Guerra de modificationes contraproductive
+** Pagina frequentemente visitate',
+'protect-edit-reasonlist'     => 'Modificar le motivos pro protection',
+'protect-expiry-options'      => '2 horas:2 hours,1 die:1 day,3 dies:3 days,1 septimana:1 week,2 septimanas:2 weeks,1 mense:1 month,3 menses:3 months,6 menses:6 months,1 anno:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permission:',
 'restriction-level'           => 'Nivello de restriction:',
 'minimum-size'                => 'Grandor minime',
@@ -1689,34 +1978,35 @@ Tu pote cambiar le nivello de protection de iste pagina, sed isto non cambiara l
 # Undelete
 'undelete'                     => 'Vider paginas delite',
 'undeletepage'                 => 'Vider e restaurar paginas delite',
-'undeletepagetitle'            => "'''Lo sequente consiste de revisiones delite de [[:$1|$1]]'''.",
+'undeletepagetitle'            => "'''Lo sequente consiste de versiones delite de [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Vider paginas delite',
-'undeletepagetext'             => 'Le paginas sequente ha essite delite, sed es ancora in le archivo e pote esser restaurate.
+'undeletepagetext'             => 'Le {{PLURAL:$1|pagina|paginas}} sequente ha essite delite, sed es ancora in le archivo e pote esser restaurate.
 Le archivo pote esser vacuate periodicamente.',
-'undelete-fieldset-title'      => 'Restaurar revisiones',
+'undelete-fieldset-title'      => 'Restaurar versiones',
 'undeleteextrahelp'            => "Pro restaurar le historia integre del pagina, lassa tote le quadratos dismarcate e clicca '''''Restaurar'''''.
 Pro executar un restauration selective, marca le quadratos correspondente al versiones pro restaurar, e clicca '''''Restaurar'''''.
 Le button '''''Reinitiar''''' face rader le campo de commento e tote le quadratos.",
-'undeleterevisions'            => '$1 {{PLURAL:$1|revision|revisiones}} archivate',
-'undeletehistory'              => 'Si tu restaura un pagina, tote le revisiones essera restaurate al historia.
-Si un nove pagina con le mesme nomine ha essite create post le deletion, le revisiones
+'undeleterevisions'            => '$1 {{PLURAL:$1|version|versiones}} archivate',
+'undeletehistory'              => 'Si tu restaura un pagina, tote le versiones essera restaurate al historia.
+Si un nove pagina con le mesme nomine ha essite create post le deletion, le versiones
 restaurate apparera in le historia anterior.',
-'undeleterevdel'               => 'Le restauration non essera executate si illo resultara in le deletion partial del revision le plus recente del pagina o del file.
-In tal casos, tu debe dismarcar o revelar le revision delite le plus recente.',
+'undeleterevdel'               => 'Le restauration non essera executate si illo resultara in le deletion partial del version le plus recente del pagina o del file.
+In tal casos, tu debe dismarcar o revelar le version delite le plus recente.',
 'undeletehistorynoadmin'       => 'Iste pagina ha essite delite.
 Le motivo del deletion se monstra in le summario infra, con le detalios del usatores que habeva modificate iste pagina ante le deletion.
-Le texto complete de iste revisiones delite es solmente disponibile al administratores.',
-'undelete-revision'            => 'Revision delite del pagina $1 (facite le $2) per $3:',
-'undeleterevision-missing'     => 'Revision invalide o mancante.
-Es possibile que le adresse URL es invalide, o que le revision ha essite restaurate o eliminate del archivo.',
-'undelete-nodiff'              => 'Nulle revision precedente trovate.',
+Le texto complete de iste versiones delite es solmente disponibile al administratores.',
+'undelete-revision'            => 'Version delite de $1 (facite le $4 a $5) per $3:',
+'undeleterevision-missing'     => 'Version invalide o mancante.
+Es possibile que le adresse URL es invalide, o que le version ha essite restaurate o eliminate del archivo.',
+'undelete-nodiff'              => 'Nulle version precedente trovate.',
 'undeletebtn'                  => 'Restaurar',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Reinitiar',
+'undeleteinvert'               => 'Inverter selection',
 'undeletecomment'              => 'Commento:',
 'undeletedarticle'             => 'restaurava "[[$1]]"',
-'undeletedrevisions'           => '{{PLURAL:$1|1 revision|$1 revisiones}} restaurate',
-'undeletedrevisions-files'     => '{{PLURAL:$1|1 revision|$1 revisiones}} e {{PLURAL:$2|1 file|$2 files}} restaurate',
+'undeletedrevisions'           => '{{PLURAL:$1|1 version|$1 versiones}} restaurate',
+'undeletedrevisions-files'     => '{{PLURAL:$1|1 version|$1 versiones}} e {{PLURAL:$2|1 file|$2 files}} restaurate',
 'undeletedfiles'               => '$1 {{PLURAL:$1|archivo|archivos}} restaurate',
 'cannotundelete'               => 'Le restauration ha fallite;
 es possibile que un altere persona ha ja restaurate le pagina.',
@@ -1728,8 +2018,8 @@ Consulta le [[Special:Log/delete|registro de deletiones]] pro un lista de deleti
 'undelete-search-prefix'       => 'Monstrar paginas que comencia con:',
 'undelete-search-submit'       => 'Cercar',
 'undelete-no-results'          => 'Nulle paginas correspondente trovate in le archivo de deletiones.',
-'undelete-filename-mismatch'   => 'Non pote restaurar le revision del file con data e hora $1: le nomine del file non corresponde',
-'undelete-bad-store-key'       => 'Non pote restaurar le revision del file con data e hora $1: le file mancava ja ante le deletion.',
+'undelete-filename-mismatch'   => 'Non pote restaurar le version del file con data e hora $1: le nomine del file non corresponde',
+'undelete-bad-store-key'       => 'Non pote restaurar le version del file con data e hora $1: le file mancava ja ante le deletion.',
 'undelete-cleanup-error'       => 'Error durante le deletion del file de archivo non usate "$1".',
 'undelete-missing-filearchive' => 'Impossibile restaurar le file con ID de archvo $1 proque illo non es presente in le base de datos.
 Es possibile que illo ha ja essite restaurate.',
@@ -1746,26 +2036,27 @@ $1',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contributiones del usator',
-'mycontris'     => 'Mi contributiones',
-'contribsub2'   => 'Pro $1 ($2)',
-'nocontribs'    => 'Necun modification ha essite trovate secundo iste criterios.',
-'uctop'         => '(ultime)',
-'month'         => 'A partir del mense (e anterior):',
-'year'          => 'A partir del anno (e anterior):',
-
-'sp-contributions-newbies'     => 'Monstrar contributiones de nove contos solmente',
-'sp-contributions-newbies-sub' => 'Pro nove contos',
-'sp-contributions-blocklog'    => 'Registro de blocadas',
-'sp-contributions-search'      => 'Cercar contributiones',
-'sp-contributions-username'    => 'Adresse IP o nomine de usator:',
-'sp-contributions-submit'      => 'Cercar',
+'contributions'       => 'Contributiones del usator',
+'contributions-title' => 'Contributiones del usator $1',
+'mycontris'           => 'Mi contributiones',
+'contribsub2'         => 'Pro $1 ($2)',
+'nocontribs'          => 'Necun modification ha essite trovate secundo iste criterios.',
+'uctop'               => '(ultime)',
+'month'               => 'A partir del mense (e anterior):',
+'year'                => 'A partir del anno (e anterior):',
+
+'sp-contributions-newbies'       => 'Monstrar contributiones de nove contos solmente',
+'sp-contributions-newbies-sub'   => 'Pro nove contos',
+'sp-contributions-newbies-title' => 'Contributiones de nove contos de usator',
+'sp-contributions-blocklog'      => 'Registro de blocadas',
+'sp-contributions-search'        => 'Cercar contributiones',
+'sp-contributions-username'      => 'Adresse IP o nomine de usator:',
+'sp-contributions-submit'        => 'Cercar',
 
 # What links here
 'whatlinkshere'            => 'Referentias a iste pagina',
 'whatlinkshere-title'      => 'Paginas con ligamines verso $1',
 'whatlinkshere-page'       => 'Pagina:',
-'linklistsub'              => '(Lista de ligamines)',
 'linkshere'                => "Le paginas sequente se liga a '''[[:$1]]''':",
 'nolinkshere'              => "Necun pagina se liga a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nulle pagina liga a '''[[:$1]]''' in le spatio de nomines seligite.",
@@ -1814,6 +2105,8 @@ specific que ha essite vandalisate).',
 'ipbotherreason'                  => 'Motivo altere/additional:',
 'ipbhidename'                     => 'Celar le nomine del usator del registro de blodadas, del lista de blocadas active e del lista de usatores',
 'ipbwatchuser'                    => 'Observar le paginas de usator e de discussion de iste usator',
+'ipballowusertalk'                => 'Permitter que iste usator modifica su proprie pagina de discussion in despecto de esser blocate',
+'ipb-change-block'                => 'Reblocar le usator con iste configurationes',
 'badipaddress'                    => 'Adresse IP mal formate.',
 'blockipsuccesssub'               => 'Blocada succedite',
 'blockipsuccesstext'              => 'Le adresse IP "$1" ha essite blocate.
@@ -1823,15 +2116,19 @@ specific que ha essite vandalisate).',
 'ipb-unblock'                     => 'Disblocar un nomine de usator o un adresse IP',
 'ipb-blocklist-addr'              => 'Blocadas existente pro $1',
 'ipb-blocklist'                   => 'Vider blocadas existente',
+'ipb-blocklist-contribs'          => 'Contributiones de $1',
 'unblockip'                       => 'Disblocar adresse IP',
 'unblockiptext'                   => 'Usa le formulario infra pro restaurar le accesso de scriptura
 a un adresse IP blocate previemente.',
-'ipusubmit'                       => 'Disblocar iste adresse',
+'ipusubmit'                       => 'Cancellar iste blocada',
 'unblocked'                       => '[[User:$1|$1]] ha essite disblocate',
 'unblocked-id'                    => 'Le blocada $1 ha essite eliminate',
 'ipblocklist'                     => 'Adresses IP e nomines de usator blocate',
 'ipblocklist-legend'              => 'Cercar un usator blocate',
 'ipblocklist-username'            => 'Nomine de usator o adresse IP:',
+'ipblocklist-sh-userblocks'       => '$1 blocadas de contos',
+'ipblocklist-sh-tempblocks'       => '$1 blocadas temporari',
+'ipblocklist-sh-addressblocks'    => '$1 blocadas de singule adresses IP',
 'ipblocklist-submit'              => 'Cercar',
 'blocklistline'                   => '$1, $2 blocava $3 ($4)',
 'infiniteblock'                   => 'infinite',
@@ -1840,15 +2137,19 @@ a un adresse IP blocate previemente.',
 'noautoblockblock'                => 'autoblocadas disactivate',
 'createaccountblock'              => 'creation de contos blocate',
 'emailblock'                      => 'e-mail blocate',
+'blocklist-nousertalk'            => 'non pote modificar su proprie pagina de discussion',
 'ipblocklist-empty'               => 'Le lista de blocadas es vacue.',
 'ipblocklist-no-results'          => 'Le adresse IP o nomine de usator que tu requestava non es blocate.',
 'blocklink'                       => 'blocar',
 'unblocklink'                     => 'disblocar',
+'change-blocklink'                => 'cambiar blocada',
 'contribslink'                    => 'contributiones',
 'autoblocker'                     => 'Autoblocate proque tu adresse IP ha recentemente essite usate per "[[User:$1|$1]]".
 Le ration date pro le blocada de $1 es: "$2"',
 'blocklogpage'                    => 'Registro de blocadas',
+'blocklog-fulllog'                => 'Registro complete de blocadas',
 'blocklogentry'                   => 'blocava [[$1]] con un tempore de expiration de $2 $3',
+'reblock-logentry'                => 'cambiava configurationes de blocada pro [[$1]] con un tempore de expiration de $2 $3',
 'blocklogtext'                    => 'Isto es un registro de blocadas e disblocadas de usatores.
 Le adresses IP automaticamente blocate non es includite.
 Vide le [[Special:IPBlockList|lista de blocadas IP]] pro le lista de bannimentos e blocadas actualmente in operation.',
@@ -1857,11 +2158,14 @@ Vide le [[Special:IPBlockList|lista de blocadas IP]] pro le lista de bannimentos
 'block-log-flags-nocreate'        => 'creation de contos disactivate',
 'block-log-flags-noautoblock'     => 'autoblocadas disactivate',
 'block-log-flags-noemail'         => 'e-mail blocate',
+'block-log-flags-nousertalk'      => 'non pote modificar su proprie pagina de discussion',
 'block-log-flags-angry-autoblock' => 'autoblocadas avantiate activate',
 'range_block_disabled'            => 'Le capacitate del administratores a blocar intervallos de adresses IP es disactivate.',
 'ipb_expiry_invalid'              => 'Tempore de expiration invalide.',
 'ipb_expiry_temp'                 => 'Le blocadas de nomines de usator celate debe esser permanente.',
 'ipb_already_blocked'             => '"$1" es ja blocate',
+'ipb-needreblock'                 => '== Ja blocate ==
+$1 es ja blocate. Esque tu vole cambiar le configurationes?',
 'ipb_cant_unblock'                => 'Error: ID de blocada $1 non trovate. Es possibile que illo ha ja essite disblocate.',
 'ipb_blocked_as_range'            => 'Error: Le IP $1 non es blocate directemente e non pote esser disblocate.
 Illo es, nonobstante, blocate como parte del intervallo $2, le qual pote esser disblocate.',
@@ -1875,6 +2179,7 @@ Per favor contacta tu providitor de servicio internet o supporto technic e infor
 'sorbsreason'                     => 'Tu adresse IP es listate como proxy aperte in le DNSBL usate per {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Tu adresse IP es listate como proxy aperte in le DNSBL usate per {{SITENAME}}.
 Tu non pote crear un conto',
+'cant-block-while-blocked'        => 'Tu non pote blocar altere usatores durante que tu mesme es blocate.',
 
 # Developer tools
 'lockdb'              => 'Blocar base de datos',
@@ -1903,9 +2208,9 @@ Pro blocar o disblocar le base de datos, le servitor web debe poter scriber a is
 'databasenotlocked'   => 'Le base de datos non es blocate.',
 
 # Move page
-'move-page'               => 'Renominar $1',
-'move-page-legend'        => 'Renominar pagina',
-'movepagetext'            => "Per medio del formulario infra tu pote renominar un pagina, transferente tote su historia al nove nomine.
+'move-page'                    => 'Renominar $1',
+'move-page-legend'             => 'Renominar pagina',
+'movepagetext'                 => "Per medio del formulario infra tu pote renominar un pagina, transferente tote su historia al nove nomine.
 Le titulo anterior devenira un pagina de redirection verso le nove titulo.
 Tu pote actualisar automaticamente le redirectiones que puncta verso le titulo original.
 Si tu opta contra facer lo, assecura te de reparar omne redirectiones [[Special:DoubleRedirects|duple]] o [[Special:BrokenRedirects|defecte]].
@@ -1917,51 +2222,64 @@ Isto significa que tu pote renominar un pagina a su titulo original si tu lo ha
 '''ATTENTION!'''
 Isto pote esser un cambio drastic e inexpectate pro un pagina popular;
 per favor assecura te que tu comprende le consequentias de isto ante que tu procede.",
-'movepagetalktext'        => "Le pagina de discussion associate essera automaticamente renominate conjunctemente con illo '''a minus que''':
+'movepagetalktext'             => "Le pagina de discussion associate essera automaticamente renominate conjunctemente con illo '''a minus que''':
 *Un pagina de discussion non vacue ja existe sub le nove nomine, o
 *Tu dismarca le quadrato infra.
 
 Il tal casos, tu debera renominar o fusionar le pagina manualmente si desirate.",
-'movearticle'             => 'Renominar pagina:',
-'movenotallowed'          => 'Tu non ha le permission de renominar paginas.',
-'newtitle'                => 'Al nove titulo:',
-'move-watch'              => 'Observar iste pagina',
-'movepagebtn'             => 'Renominar pagina',
-'pagemovedsub'            => 'Renomination succedite',
-'movepage-moved'          => '<big>\'\'\'"$1" ha essite renominate a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Un pagina con iste nomine ja existe, o le nomine seligite non es valide.
+'movearticle'                  => 'Renominar pagina:',
+'movenologin'                  => 'Tu non ha aperite un session',
+'movenologintext'              => 'Tu debe esser un usator registrate e [[Special:UserLogin|aperir un session]]
+pro mover un pagina.',
+'movenotallowed'               => 'Tu non ha le permission de renominar paginas.',
+'movenotallowedfile'           => 'Tu non ha le permission de renominar files.',
+'cant-move-user-page'          => 'Tu non ha le permission de renominar paginas principal de usatores.',
+'cant-move-to-user-page'       => 'Tu non ha le permission de renominar un pagina verso un pagina de usator (excepte un subpagina de usator).',
+'newtitle'                     => 'Al nove titulo:',
+'move-watch'                   => 'Observar iste pagina',
+'movepagebtn'                  => 'Renominar pagina',
+'pagemovedsub'                 => 'Renomination succedite',
+'movepage-moved'               => '<big>\'\'\'"$1" ha essite renominate a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Un redirection ha essite create.',
+'movepage-moved-noredirect'    => 'Le creation de un redirection ha essite supprimite.',
+'articleexists'                => 'Un pagina con iste nomine ja existe, o le nomine seligite non es valide.
 Per favor selige un altere nomine.',
-'cantmove-titleprotected' => 'Tu non pote renominar un pagina a iste titulo, proque le nove titulo ha essite protegite contra creation',
-'talkexists'              => "'''Le pagina mesme ha essite renominate con successo, mais le pagina de discussion associate non ha essite renominate proque ja existe un sub le nove titulo.
+'cantmove-titleprotected'      => 'Tu non pote renominar un pagina a iste titulo, proque le nove titulo ha essite protegite contra creation',
+'talkexists'                   => "'''Le pagina mesme ha essite renominate con successo, mais le pagina de discussion associate non ha essite renominate proque ja existe un sub le nove titulo.
 Per favor fusiona los manualmente.'''",
-'movedto'                 => 'renominate a',
-'movetalk'                => 'Renominar etiam le pagina de discussion associate',
-'move-subpages'           => 'Renominar tote le subpaginas, si applicabile',
-'move-talk-subpages'      => 'Renominar tote le subpaginas del pagina de discussion, si applicabile',
-'movepage-page-exists'    => 'Le pagina $1 existe ja e non pote esser automaticamente superscribite.',
-'movepage-page-moved'     => 'Le pagina $1 ha essite renominate a $2.',
-'movepage-page-unmoved'   => 'Le pagina $1 non poteva esser renominate a $2.',
-'movepage-max-pages'      => 'Le maximo de $1 {{PLURAL:$1|pagina|paginas}} ha essite renominate e nulle altere pagina pote esser renominate automaticamente.',
-'1movedto2'               => 'renominava [[$1]] verso [[$2]]',
-'1movedto2_redir'         => 'renominava [[$1]] verso [[$2]] trans redirection',
-'movelogpage'             => 'Registro de renominationes',
-'movelogpagetext'         => 'Infra es un lista de paginas renominate.',
-'movereason'              => 'Motivo:',
-'revertmove'              => 'reverter',
-'delete_and_move'         => 'Deler e renominar',
-'delete_and_move_text'    => '==Deletion requirite==
+'movedto'                      => 'renominate a',
+'movetalk'                     => 'Renominar etiam le pagina de discussion associate',
+'move-subpages'                => 'Renominar tote le subpaginas, si applicabile',
+'move-talk-subpages'           => 'Renominar tote le subpaginas del pagina de discussion, si applicabile',
+'movepage-page-exists'         => 'Le pagina $1 existe ja e non pote esser automaticamente superscribite.',
+'movepage-page-moved'          => 'Le pagina $1 ha essite renominate a $2.',
+'movepage-page-unmoved'        => 'Le pagina $1 non poteva esser renominate a $2.',
+'movepage-max-pages'           => 'Le maximo de $1 {{PLURAL:$1|pagina|paginas}} ha essite renominate e nulle altere pagina pote esser renominate automaticamente.',
+'1movedto2'                    => 'renominava [[$1]] verso [[$2]]',
+'1movedto2_redir'              => 'renominava [[$1]] verso [[$2]] trans redirection',
+'move-redirect-suppressed'     => 'redirection supprimite',
+'movelogpage'                  => 'Registro de renominationes',
+'movelogpagetext'              => 'Infra es un lista de paginas renominate.',
+'movereason'                   => 'Motivo:',
+'revertmove'                   => 'reverter',
+'delete_and_move'              => 'Deler e renominar',
+'delete_and_move_text'         => '==Deletion requirite==
 Le pagina de destination "[[:$1]]" existe ja.
 Esque tu vole deler lo pro permitter le renomination?',
-'delete_and_move_confirm' => 'Si, deler le pagina',
-'delete_and_move_reason'  => 'Delite pro permitter renomination',
-'selfmove'                => 'Le titulos de origine e de destination es identic;
+'delete_and_move_confirm'      => 'Si, deler le pagina',
+'delete_and_move_reason'       => 'Delite pro permitter renomination',
+'selfmove'                     => 'Le titulos de origine e de destination es identic;
 non pote renominar un pagina al mesme titulo.',
-'immobile_namespace'      => 'Le titulo de origine o de destination es de un typo special;
-es impossibile cambiar le spatio de nomines de tal paginas.',
-'imagenocrossnamespace'   => 'Non pote renominar file verso un spatio de nomines non-file',
-'imagetypemismatch'       => 'Le nove extension del nomine del file non corresponde al typo del file',
-'imageinvalidfilename'    => 'Le nomine del file de destination es invalide',
-'fix-double-redirects'    => 'Actualisar tote le redirectiones que puncta verso le titulo original',
+'immobile-source-namespace'    => 'Non pote renominar paginas in le spatio de nomines "$1"',
+'immobile-target-namespace'    => 'Non pote renominar paginas verso le spatio de nomines "$1"',
+'immobile-target-namespace-iw' => 'Un ligamine interwiki non es un destination valide pro le renomination de un pagina.',
+'immobile-source-page'         => 'Iste pagina non es renominabile.',
+'immobile-target-page'         => 'Non pote renominar a iste titulo de destination.',
+'imagenocrossnamespace'        => 'Non pote renominar file verso un spatio de nomines non-file',
+'imagetypemismatch'            => 'Le nove extension del nomine del file non corresponde al typo del file',
+'imageinvalidfilename'         => 'Le nomine del file de destination es invalide',
+'fix-double-redirects'         => 'Actualisar tote le redirectiones que puncta verso le titulo original',
+'move-leave-redirect'          => 'Lassar un redirection',
 
 # Export
 'export'            => 'Exportar paginas',
@@ -1970,8 +2288,8 @@ Isto pote esser importate in un altere wiki que usa MediaWiki via le [[Special:I
 
 Pro exportar paginas, entra le titulos in le quadro de texto infra, un titulo per linea, e indica si tu vole haber le version currente con tote le versiones ancian, con le lineas de historia de paginas, o simplemente le version actual con le informationes super le ultime modification.
 
-In le secunde caso tu pote etiam usar un ligamine, p.ex. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pro le pagina "[[{{MediaWiki:Mainpage}}]]".',
-'exportcuronly'     => 'Includer solmente le revision actual, non le historia complete',
+In le secunde caso tu pote etiam usar un ligamine, p.ex. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pro le pagina "[[{{MediaWiki:Mainpage}}]]".',
+'exportcuronly'     => 'Includer solmente le version actual, non le historia complete',
 'exportnohistory'   => "----
 '''Nota:''' Le exportation del historia de paginas complete per medio de iste formulario ha essite disactivate pro motivos concernente le prestationes del servitor.",
 'export-submit'     => 'Exportar',
@@ -1986,7 +2304,7 @@ In le secunde caso tu pote etiam usar un ligamine, p.ex. [[{{ns:special}}:Export
 'allmessagesdefault'        => 'Texto predefinite',
 'allmessagescurrent'        => 'Texto actual',
 'allmessagestext'           => 'Isto es un lista de messages de systema disponibile in le spatio de nomines MediaWiki.
-Per favor visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net Betawiki] si tu desira contribuer al localisation general de MediaWiki.',
+Per favor visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] si tu desira contribuer al localisation general de MediaWiki.',
 'allmessagesnotsupportedDB' => "Iste pagina non pote esser usate proque '''\$wgUseDatabaseMessages''' ha essite disactivate.",
 'allmessagesfilter'         => 'Filtro de nomine de message:',
 'allmessagesmodified'       => 'Monstrar solmente modificates',
@@ -2004,15 +2322,18 @@ Per favor visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisat
 'import'                     => 'Importar paginas',
 'importinterwiki'            => 'Importation transwiki',
 'import-interwiki-text'      => 'Selige le wiki e le titulo del pagina a importar.
-Le datas del revisiones e nomines del contributores essera preservate.
+Le datas del versiones e nomines del contributores essera preservate.
 Tote le actiones de importation transwiki se registra in le [[Special:Log/import|registro de importationes]].',
+'import-interwiki-source'    => 'Wiki/pagina de origine:',
 'import-interwiki-history'   => 'Copiar tote le versiones del historia de iste pagina',
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Spatio de nomines de destination:',
+'import-upload-filename'     => 'Nomine del file:',
+'import-comment'             => 'Commento:',
 'importtext'                 => 'Per favor exporta le file del wiki de origine con le [[Special:Export|facilitate pro exportar]].
 Immagazina lo in tu disco e carga lo hic.',
 'importstart'                => 'Importation de paginas in curso…',
-'import-revision-count'      => '$1 {{PLURAL:$1|revision|revisiones}}',
+'import-revision-count'      => '$1 {{PLURAL:$1|version|versiones}}',
 'importnopages'              => 'Nulle paginas a importar.',
 'importfailed'               => 'Importation fallite: <nowiki>$1</nowiki>',
 'importunknownsource'        => 'Typo del origine de importation non cognoscite',
@@ -2020,7 +2341,7 @@ Immagazina lo in tu disco e carga lo hic.',
 'importbadinterwiki'         => 'Ligamine interwiki invalide',
 'importnotext'               => 'Texto vacue o mancante',
 'importsuccess'              => 'Importation complete!',
-'importhistoryconflict'      => 'Existe un conflicto in le historia de revisiones (es possibile que iste pagina ha essite importate anteriormente)',
+'importhistoryconflict'      => 'Existe un conflicto in le historia de versiones (es possibile que iste pagina ha essite importate anteriormente)',
 'importnosources'            => 'Nulle origine de importation transwiki ha essite definite e le cargas de historia directe es disactivate.',
 'importnofile'               => 'Nulle file de importation esseva cargate.',
 'importuploaderrorsize'      => 'Le carga del file de importation ha fallite. Le grandor del file excede le limite pro cargas.',
@@ -2028,7 +2349,7 @@ Immagazina lo in tu disco e carga lo hic.',
 'importuploaderrortemp'      => 'Le carga del file de importation ha fallite. Un directorio temporari manca.',
 'import-parse-failure'       => 'Error syntactic durante importation XML',
 'import-noarticle'           => 'Nulle pagina a importar!',
-'import-nonewrevisions'      => 'Tote le revisiones habeva ja essite importate anteriormente.',
+'import-nonewrevisions'      => 'Tote le versiones habeva ja essite importate anteriormente.',
 'xml-error-string'           => '$1 al linea $2, col $3 (byte $4): $5',
 'import-upload'              => 'Cargar datos XML',
 'import-token-mismatch'      => 'Perdita del datos del session. Per favor reprova.',
@@ -2038,24 +2359,24 @@ Immagazina lo in tu disco e carga lo hic.',
 'importlogpage'                    => 'Registro de importationes',
 'importlogpagetext'                => 'Importationes administrative de paginas con historia de modificationes desde altere wikis.',
 'import-logentry-upload'           => 'importava [[$1]] per medio de carga de file',
-'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|revision|revisiones}}',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|version|versiones}}',
 'import-logentry-interwiki'        => 'importava $1 transwiki',
-'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revision|revisiones}} desde $2',
+'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|version|versiones}} desde $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mi pagina de usator',
+'tooltip-pt-userpage'             => 'Tu pagina de usator',
 'tooltip-pt-anonuserpage'         => 'Le pagina de usator pro le adresse IP desde le qual tu face modificationes',
-'tooltip-pt-mytalk'               => 'Mi pagina de discussion',
+'tooltip-pt-mytalk'               => 'Tu pagina de discussion',
 'tooltip-pt-anontalk'             => 'Discussion super le modificationes facite desde iste adresse IP',
 'tooltip-pt-preferences'          => 'Mi preferentias',
 'tooltip-pt-watchlist'            => 'Le lista de paginas que tu survelia pro modificationes',
-'tooltip-pt-mycontris'            => 'Lista de mi contributiones',
+'tooltip-pt-mycontris'            => 'Lista de tu contributiones',
 'tooltip-pt-login'                => 'Nos recommenda que tu te identifica, ma il non es obligatori.',
 'tooltip-pt-anonlogin'            => 'Nos te invita a aperir un session, ma il non es obligatori.',
 'tooltip-pt-logout'               => 'Clauder session',
 'tooltip-ca-talk'                 => 'Discussiones a proposito del pagina de contento',
 'tooltip-ca-edit'                 => 'Tu pote modificar iste pagina. Per favor usa le button "Monstrar previsualisation" ante que tu publica tu modificationes.',
-'tooltip-ca-addsection'           => 'Adder un commento a iste discussion.',
+'tooltip-ca-addsection'           => 'Initiar un nove section',
 'tooltip-ca-viewsource'           => 'Iste pagina es protegite. Tu pote vider le codice-fonte de illo.',
 'tooltip-ca-history'              => 'Versiones anterior de iste pagina.',
 'tooltip-ca-protect'              => 'Proteger iste pagina',
@@ -2102,6 +2423,8 @@ Immagazina lo in tu disco e carga lo hic.',
 'tooltip-watch'                   => 'Adder iste pagina a tu observatorio',
 'tooltip-recreate'                => 'Recrear le pagina nonobstante que illo ha essite delite',
 'tooltip-upload'                  => 'Comencia cargar',
+'tooltip-rollback'                => '"Revocar" reverte le modification(es) de iste pagina del ultime contributor con un singule clic.',
+'tooltip-undo'                    => '"Annullar" reverte iste modification e aperi le formulario de modification in modo de previsualistion. Permitte adder un motivo in le summario.',
 
 # Stylesheets
 'common.css'      => '/* Le CSS placiate hic se applicara a tote le stilos */',
@@ -2131,12 +2454,12 @@ Immagazina lo in tu disco e carga lo hic.',
 'notacceptable'     => 'Le servitor wiki non pote provider datos in un formato que tu cliente sape leger.',
 
 # Attribution
-'anonymous'        => 'Usator(es) anonyme de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Usator|Usatores}} anonyme de {{SITENAME}}',
 'siteuser'         => 'Usator $1 de {{SITENAME}}',
 'lastmodifiedatby' => 'Le modification le plus recente de iste pagina esseva facite le $1 a $2 per $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'A base de contributiones per $1.',
 'others'           => 'alteres',
-'siteusers'        => 'Usator(es) de {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Usator|Usatores}} $1 de {{SITENAME}}',
 'creditspage'      => 'Autores del pagina',
 'nocredits'        => 'Nulle information es disponibile super le autores de iste pagina.',
 
@@ -2147,7 +2470,7 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 'spamprotectionmatch' => 'Le sequente texto es lo que activava nostre filtro antispam: $1',
 'spambot_username'    => 'Nettamento de spam in MediaWiki',
 'spam_reverting'      => 'Revertite al ultime version que non contine ligamines a $1',
-'spam_blanking'       => 'Tote le revisiones contineva ligamines a $1. Le pagina ha essite vacuate.',
+'spam_blanking'       => 'Tote le versiones contineva ligamines a $1. Le pagina ha essite vacuate.',
 
 # Info page
 'infosubtitle'   => 'Informationes del pagina',
@@ -2157,6 +2480,16 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 'numauthors'     => 'Numero de autores distincte (pagina): $1',
 'numtalkauthors' => 'Numero de autores distincte (pagina de discussion): $1',
 
+# Skin names
+'skinname-standard'    => 'Classic',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Blau Colonia',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Mi stilo',
+'skinname-chick'       => 'Chique',
+'skinname-simple'      => 'Simple',
+'skinname-modern'      => 'Moderne',
+
 # Math options
 'mw_math_png'    => 'Sempre producer PNG',
 'mw_math_simple' => 'HTML si multo simple, alteremente PNG',
@@ -2169,27 +2502,29 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 'markaspatrolleddiff'                 => 'Marcar como patruliate',
 'markaspatrolledtext'                 => 'Marcar iste pagina como patruliate',
 'markedaspatrolled'                   => 'Marcate como patruliate',
-'markedaspatrolledtext'               => 'Le revision seligite ha essite marcate como patruliate.',
+'markedaspatrolledtext'               => 'Le version seligite ha essite marcate como patruliate.',
 'rcpatroldisabled'                    => 'Patrulia de modificationes recente disactivate',
 'rcpatroldisabledtext'                => 'Le functionalitate de patrulia de modificationes recente es disactivate al momento.',
 'markedaspatrollederror'              => 'Impossibile marcar como patruliate',
-'markedaspatrollederrortext'          => 'Tu debe specificar un revision a marcar como patruliate.',
+'markedaspatrollederrortext'          => 'Tu debe specificar un version a marcar como patruliate.',
 'markedaspatrollederror-noautopatrol' => 'Tu non es permittite a marcar tu proprie modificationes como patruliate.',
 
 # Patrol log
-'patrol-log-page'   => 'Registro de patrulia',
-'patrol-log-header' => 'Isto es un registro de revisiones patruliate.',
-'patrol-log-line'   => 'marcava $1 de $2 como patruliate $3',
-'patrol-log-auto'   => '(automaticamente)',
+'patrol-log-page'      => 'Registro de patrulia',
+'patrol-log-header'    => 'Isto es un registro de versiones patruliate.',
+'patrol-log-line'      => 'marcava $1 de $2 como patruliate $3',
+'patrol-log-auto'      => '(automaticamente)',
+'patrol-log-diff'      => 'le version $1',
+'log-show-hide-patrol' => '$1 le registro de versiones patruliate',
 
 # Image deletion
-'deletedrevision'                 => 'Deleva le ancian revision $1',
+'deletedrevision'                 => 'Deleva le ancian version $1',
 'filedeleteerror-short'           => 'Error durante le deletion del file: $1',
 'filedeleteerror-long'            => 'Se incontrava errores durante le deletion del file:
 
 $1',
 'filedelete-missing'              => 'Le file "$1" non pote esser delite, proque illo non existe.',
-'filedelete-old-unregistered'     => 'Le revision del file specificate "$1" non existe in le base de datos.',
+'filedelete-old-unregistered'     => 'Le version del file specificate "$1" non existe in le base de datos.',
 'filedelete-current-unregistered' => 'Le file specificate "$1" non existe in le base de datos.',
 'filedelete-archive-read-only'    => 'Le servitor de web non pote scriber al directorio de archivo "$1".',
 
@@ -2197,6 +2532,9 @@ $1',
 'previousdiff' => '� Version plus ancian',
 'nextdiff'     => 'Version plus nove →',
 
+# Visual comparison
+'visual-comparison' => 'Comparation visual',
+
 # Media information
 'mediawarning'         => "'''Attention''': Iste file pote continer codice maligne. Si tu lo executa, tu systema pote esser compromittite.<hr />",
 'imagemaxsize'         => 'Limitar le imagines in paginas de description de files a:',
@@ -2209,10 +2547,12 @@ $1',
 'show-big-image'       => 'Plen resolution',
 'show-big-image-thumb' => '<small>Dimensiones de iste previsualisation: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria de nove files',
 'imagelisttext'         => "Infra es un lista de '''$1''' {{PLURAL:$1|imagine|imagines}} ordinate $2.",
 'newimages-summary'     => 'Iste pagina special detalia le recente files cargate.',
+'newimages-legend'      => 'Filtro',
+'newimages-label'       => 'Nomine del file (o un parte de illo):',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Nihil a vider.',
 'ilsubmit'              => 'Cercar',
@@ -2419,6 +2759,18 @@ Le alteres essera initialmente celate.
 'exif-lightsource-24'  => 'Tungsten de studio ISO',
 'exif-lightsource-255' => 'Altere origine de lumine',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flash non fulgurava',
+'exif-flash-fired-1'    => 'Flash fulgurava',
+'exif-flash-return-0'   => 'nulle function pro deteger stroboscopio',
+'exif-flash-return-2'   => 'stroboscopio non detegite',
+'exif-flash-return-3'   => 'stroboscopio detegite',
+'exif-flash-mode-1'     => 'fulguration flash compulsori',
+'exif-flash-mode-2'     => 'suppression del flash compulsori',
+'exif-flash-mode-3'     => 'modo automatic',
+'exif-flash-function-1' => 'Nulle function de flash',
+'exif-flash-redeye-1'   => 'modo de reduction de oculos rubie',
+
 'exif-focalplaneresolutionunit-2' => 'uncias',
 
 'exif-sensingmethod-1' => 'Non definite',
@@ -2565,21 +2917,10 @@ $1
 Per favor confirma que tu realmente vole recrear iste pagina.",
 'recreate'            => 'Recrear',
 
-# HTML dump
-'redirectingto' => 'Redirection verso [[:$1]] in curso…',
-
 # action=purge
-'confirm_purge'        => 'Rader le cache de iste pagina?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Cercar paginas continente ''$1''.",
-'searchnamed'      => "Cercar paginas nominate ''$1''.",
-'articletitles'    => "Paginas comenciante con ''$1''",
-'hideresults'      => 'Celar resultatos',
-'useajaxsearch'    => 'Usar cerca con AJAX',
+'confirm-purge-top'    => 'Rader le cache de iste pagina?',
+'confirm-purge-bottom' => 'Purgar un pagina vacua le cache e fortia que appare le version le plus recente.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� precedente pagina',
@@ -2599,10 +2940,10 @@ $1',
 'table_pager_empty'        => 'Nulle resultatos',
 
 # Auto-summaries
-'autosumm-blank'   => 'Tote le contento es removite del pagina',
+'autosumm-blank'   => 'Pagina vacuate',
 'autosumm-replace' => "Reimplacia contento del pagina con '$1'",
 'autoredircomment' => 'Redirection verso [[$1]]',
-'autosumm-new'     => 'Nove pagina: $1',
+'autosumm-new'     => "Pagina create con '$1'",
 
 # Live preview
 'livepreview-loading' => 'Cargamento in curso…',
@@ -2643,6 +2984,7 @@ Tu pote etiam [[Special:Watchlist/edit|usar le editor standard]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Etiquetta de extension incognite "$1"',
+'duplicate-defaultsort' => 'Attention: Le clave de ordination predefinite "$2" supplanta le anterior clave de ordination predefinite "$1".',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2672,13 +3014,13 @@ Tu pote etiam [[Special:Watchlist/edit|usar le editor standard]].',
 'filepath-summary' => 'Iste pagina special contine le cammino complete de un file.
 Le imagines se monstra in plen resolution, le altere typos de file se executa directemente con lor programmas associate.
 
-Entra le nomine del file sin le prefixo "{{ns:image}}:".',
+Entra le nomine del file sin le prefixo "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Cercar files duplicate',
 'fileduplicatesearch-summary'  => "Cercar files duplicate a base de lor summas de verification ''(hash).''
 
-Entra le nomine del file sin le prefixo \"{{ns:image}}:\".",
+Entra le nomine del file sin le prefixo \"{{ns:file}}:\".",
 'fileduplicatesearch-legend'   => 'Cercar un duplicato',
 'fileduplicatesearch-filename' => 'Nomine del file:',
 'fileduplicatesearch-submit'   => 'Cercar',
@@ -2708,4 +3050,13 @@ Entra le nomine del file sin le prefixo \"{{ns:image}}:\".",
 'blankpage'              => 'Pagina vacue',
 'intentionallyblankpage' => 'Iste pagina es intentionalmente vacue',
 
+# External image whitelist
+'external_image_whitelist' => ' #Lassa iste linea exactemente como illo es<pre>
+#Pone fragmentos de expressiones regular (solmente le parte que va inter //) infra
+#Istes correspondera con le adresses URL de imagines externe (a ligamine directe)
+#Le correspondentes se monstrara como imagines, le alteres solmente como ligamines a imagines
+#Le lineas comenciante con # essera tractate como commentos
+
+#Insere omne fragmentos regex super iste linea. Lassa iste linea exactemente como illo es</pre>',
+
 );
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index df5a3180..a50a8330 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Pembicaraan_Pengguna',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Pembicaraan_$1',
-	NS_IMAGE            => 'Berkas',
-	NS_IMAGE_TALK       => 'Pembicaraan_Berkas',
+	NS_FILE             => 'Berkas',
+	NS_FILE_TALK        => 'Pembicaraan_Berkas',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Pembicaraan_MediaWiki',
 	NS_TEMPLATE         => 'Templat',
@@ -48,13 +48,13 @@ $namespaceNames = array(
  * Array of namespace aliases, mapping from name to NS_xxx index
  */
 $namespaceAliases = array(
-	'Gambar_Pembicaraan'    => NS_IMAGE_TALK,
+	'Gambar_Pembicaraan'    => NS_FILE_TALK,
 	'MediaWiki_Pembicaraan' => NS_MEDIAWIKI_TALK,
 	'Templat_Pembicaraan'   => NS_TEMPLATE_TALK,
 	'Bantuan_Pembicaraan'   => NS_HELP_TALK,
 	'Kategori_Pembicaraan'  => NS_CATEGORY_TALK,
-	'Gambar'                => NS_IMAGE,
-	'Pembicaraan_Gambar'    => NS_IMAGE_TALK,
+	'Gambar'                => NS_FILE,
+	'Pembicaraan_Gambar'    => NS_FILE_TALK,
 	'Bicara'                => NS_TALK,
 	'Bicara_Pengguna'       => NS_USER_TALK,
 );
@@ -62,10 +62,6 @@ $namespaceAliases = array(
 /**
  * Skin names. If any key is not specified, the English one will be used.
  */
-$skinNames = array(
-	'standard' => 'Klasik',
-	'simple'   => 'Sederhana',
-);
 
 /**
  * Default list of book sources
@@ -202,21 +198,23 @@ $magicWords = array(
  * listed alias will be used as the default.
  */
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Pengalihan_ganda', 'Pengalihanganda' ),
-	'BrokenRedirects'           => array( 'Pengalihan_rusak', 'Pengalihanrusak' ),
+	'DoubleRedirects'           => array( 'Pengalihan ganda', 'Pengalihanganda' ),
+	'BrokenRedirects'           => array( 'Pengalihan rusak', 'Pengalihanrusak' ),
 	'Disambiguations'           => array( 'Disambiguasi' ),
-	'Userlogin'                 => array( 'Masuk_log', 'Masuklog' ),
-	'Userlogout'                => array( 'Keluar_log', 'Keluarlog' ),
+	'Userlogin'                 => array( 'Masuk log', 'Masuklog' ),
+	'Userlogout'                => array( 'Keluar log', 'Keluarlog' ),
+	'CreateAccount'             => array( 'BuatAkun', 'Buatakun', 'Buat akun' ),
 	'Preferences'               => array( 'Preferensi' ),
-	'Watchlist'                 => array( 'Daftar_pantauan', 'Daftarpantauan' ),
-	'Recentchanges'             => array( 'Perubahan_terbaru', 'Perubahanterbaru' ),
+	'Watchlist'                 => array( 'Daftar pantauan', 'Daftarpantauan' ),
+	'Recentchanges'             => array( 'Perubahan terbaru', 'Perubahanterbaru' ),
 	'Upload'                    => array( 'Pemuatan' ),
-	'Imagelist'                 => array( 'Daftar_berkas', 'Daftarberkas' ),
-	'Newimages'                 => array( 'Berkas_baru', 'Berkasbaru' ),
-	'Listusers'                 => array( 'Daftar_pengguna', 'Daftarpengguna' ),
+	'Listfiles'                 => array( 'Daftar berkas', 'Daftarberkas' ),
+	'Newimages'                 => array( 'Berkas baru', 'Berkasbaru' ),
+	'Listusers'                 => array( 'Daftar pengguna', 'Daftarpengguna' ),
+	'Listgrouprights'           => array( 'Daftar hak kelompok' ),
 	'Statistics'                => array( 'Statistik' ),
-	'Randompage'                => array( 'Halaman_sembarang', 'Halamansembarang' ),
-	'Lonelypages'               => array( 'Halaman_tak_bertuan', 'Halamantakbertuan' ),
+	'Randompage'                => array( 'Halaman sembarang', 'Halamansembarang' ),
+	'Lonelypages'               => array( 'Halaman tak bertuan', 'Halamantakbertuan' ),
 	'Uncategorizedpages'        => array( 'Halamantakterkategori' ),
 	'Uncategorizedcategories'   => array( 'Kategoritakterkategori' ),
 	'Uncategorizedimages'       => array( 'Berkastakterkategori' ),
@@ -232,52 +230,57 @@ $specialPageAliases = array(
 	'Mostimages'                => array( 'Berkastersering' ),
 	'Mostrevisions'             => array( 'Perubahanterbanyak' ),
 	'Fewestrevisions'           => array( 'Perubahantersedikit' ),
-	'Shortpages'                => array( 'Halaman_pendek', 'Halamanpendek' ),
-	'Longpages'                 => array( 'Halaman_panjang', 'Halamanpanjang' ),
-	'Newpages'                  => array( 'Halaman_baru', 'Halamanbaru' ),
-	'Ancientpages'              => array( 'Artikel_lama', 'Artikeltertua' ),
-	'Deadendpages'              => array( 'Halaman_buntu', 'Halamanbuntu' ),
+	'Shortpages'                => array( 'Halaman pendek', 'Halamanpendek' ),
+	'Longpages'                 => array( 'Halaman panjang', 'Halamanpanjang' ),
+	'Newpages'                  => array( 'Halaman baru', 'Halamanbaru' ),
+	'Ancientpages'              => array( 'Artikel lama', 'Artikeltertua' ),
+	'Deadendpages'              => array( 'Halaman buntu', 'Halamanbuntu' ),
 	'Protectedpages'            => array( 'Halamandilindungi' ),
 	'Protectedtitles'           => array( 'Judulyangdilindungi' ),
-	'Allpages'                  => array( 'Daftar_halaman', 'Daftarhalaman' ),
-	'Prefixindex'               => array( 'Indeksawalan' ),
-	'Ipblocklist'               => array( 'Daftar_pemblokiran', 'Daftarblokirip' ),
-	'Specialpages'              => array( 'Halaman_istimewa', 'Halamanistimewa' ),
-	'Contributions'             => array( 'Kontribusi_pengguna', 'Kontribusi' ),
+	'Allpages'                  => array( 'Daftar halaman', 'Daftarhalaman' ),
+	'Prefixindex'               => array( 'Indeks awalan', 'Indeksawalan' ),
+	'Ipblocklist'               => array( 'Daftar pemblokiran', 'Daftarblokirip' ),
+	'Specialpages'              => array( 'Halaman istimewa', 'Halamanistimewa' ),
+	'Contributions'             => array( 'Kontribusi pengguna', 'Kontribusi' ),
 	'Emailuser'                 => array( 'Suratepengguna' ),
-	'Confirmemail'              => array( 'Konfirmasi_surat_e', 'konfirmasisurate' ),
-	'Whatlinkshere'             => array( 'Pranala_balik', 'Pranalabalik' ),
-	'Recentchangeslinked'       => array( 'Perubahan_terkait', 'Perubahanterkait' ),
-	'Movepage'                  => array( 'Pindahkan_halaman', 'Pindahkanhalaman' ),
+	'Confirmemail'              => array( 'Konfirmasi surat e', 'konfirmasisurate' ),
+	'Whatlinkshere'             => array( 'Pranala balik', 'Pranalabalik' ),
+	'Recentchangeslinked'       => array( 'Perubahan terkait', 'Perubahanterkait' ),
+	'Movepage'                  => array( 'Pindahkan halaman', 'Pindahkanhalaman' ),
 	'Blockme'                   => array( 'Blokirsaya' ),
-	'Booksources'               => array( 'Sumber_buku', 'Sumberbuku' ),
-	'Categories'                => array( 'Daftar_kategori', 'Kategori' ),
+	'Booksources'               => array( 'Sumber buku', 'Sumberbuku' ),
+	'Categories'                => array( 'Daftar kategori', 'Kategori' ),
 	'Export'                    => array( 'Ekspor' ),
 	'Version'                   => array( 'Versi' ),
-	'Allmessages'               => array( 'Pesan_sistem', 'Pesansistem' ),
-	'Log'                       => array( 'Log' ),
-	'Blockip'                   => array( 'Blokir_pengguna', 'Blokirip' ),
-	'Undelete'                  => array( 'Pembatalan_penghapusan', 'Batalhapus' ),
+	'Allmessages'               => array( 'Pesan sistem', 'Pesansistem' ),
+	'Blockip'                   => array( 'Blokir pengguna', 'Blokirip' ),
+	'Undelete'                  => array( 'Pembatalan penghapusan', 'Batalhapus' ),
 	'Import'                    => array( 'Impor' ),
 	'Lockdb'                    => array( 'Kuncidb' ),
 	'Unlockdb'                  => array( 'Bukakuncidb' ),
-	'Userrights'                => array( 'Hakpengguna' ),
-	'MIMEsearch'                => array( 'Pencarian_MIME', 'CariMIME' ),
-	'FileDuplicateSearch'       => array( 'PencarianDuplikatBerkas' ),
+	'Userrights'                => array( 'Hak pengguna', 'Hakpengguna' ),
+	'MIMEsearch'                => array( 'Pencarian MIME', 'CariMIME' ),
+	'FileDuplicateSearch'       => array( 'Pencarianberkasduplikat' ),
 	'Unwatchedpages'            => array( 'Halamantakdipantau' ),
-	'Listredirects'             => array( 'Daftar_pengalihan', 'Daftarpengalihan' ),
+	'Listredirects'             => array( 'Daftar pengalihan', 'Daftarpengalihan' ),
 	'Revisiondelete'            => array( 'Hapusrevisi' ),
 	'Unusedtemplates'           => array( 'Templattakdigunakan' ),
-	'Randomredirect'            => array( 'Pengalihan_sembarang', 'Pengalihansembarang' ),
-	'Mypage'                    => array( 'Halamansaya' ),
-	'Mytalk'                    => array( 'Pembicaraansaya' ),
-	'Mycontributions'           => array( 'Kontribusisaya' ),
-	'Listadmins'                => array( 'Daftar_pengurus', 'Daftarpengurus' ),
-	'Listbots'                  => array( 'Daftar_bot', 'Daftarbot' ),
-	'Popularpages'              => array( 'Halaman_populer', 'Halamanpopuler' ),
+	'Randomredirect'            => array( 'Pengalihan sembarang', 'Pengalihansembarang' ),
+	'Mypage'                    => array( 'Halaman saya', 'Halamansaya' ),
+	'Mytalk'                    => array( 'Pembicaraan saya', 'Pembicaraansaya' ),
+	'Mycontributions'           => array( 'Kontribusi saya', 'Kontribusisaya' ),
+	'Listadmins'                => array( 'Daftar pengurus', 'Daftarpengurus' ),
+	'Listbots'                  => array( 'Daftar bot', 'Daftarbot' ),
+	'Popularpages'              => array( 'Halaman populer', 'Halamanpopuler' ),
 	'Search'                    => array( 'Pencarian', 'Cari' ),
-	'Resetpass'                 => array( 'Resetpass' ),
-	'Withoutinterwiki'          => array( 'Tanpa_interwiki', 'Tanpainterwiki' ),
+	'Resetpass'                 => array( 'Resetpass', 'Resetsandi' ),
+	'Withoutinterwiki'          => array( 'Tanpa interwiki', 'Tanpainterwiki' ),
+	'MergeHistory'              => array( 'Sejarah penggabungan', 'Sejarahpenggabungan' ),
+	'Filepath'                  => array( 'Lokasi arsip', 'Lokasiarsip' ),
+	'Invalidateemail'           => array( 'Batalkan validasi surel', 'Batalkanvalidasiemail' ),
+	'Blankpage'                 => array( 'Halaman kosong' ),
+	'LinkSearch'                => array( 'Pencarian pranala' ),
+	'DeletedContributions'      => array( 'Kontribusi yang dihapus' ),
 );
 
 $messages = array(
@@ -318,17 +321,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Sembunyikan suntingan saya di daftar pantauan',
 'tog-watchlisthidebots'       => 'Sembunyikan suntingan bot di daftar pantauan',
 'tog-watchlisthideminor'      => 'Sembunyikan suntingan kecil di daftar pantauan',
+'tog-watchlisthideliu'        => 'Sembunyikan suntingan pengguna yang masuk log dari daftar pantauan',
+'tog-watchlisthideanons'      => 'Sembunyikan suntingan pengguna anonim dari daftar pantauan',
 'tog-nolangconversion'        => 'Matikan konversi varian',
 'tog-ccmeonemails'            => 'Kirimkan saya salinan surat-e yang saya kirimkan ke orang lain',
 'tog-diffonly'                => 'Jangan tampilkan isi halaman di bawah perbedaan suntingan',
 'tog-showhiddencats'          => 'Tampilkan kategori tersembunyi',
+'tog-norollbackdiff'          => 'Hindari tampilan perbedaan setelah melakukan pengembalian',
 
 'underline-always'  => 'Selalu',
 'underline-never'   => 'Tidak',
 'underline-default' => 'Sesuai konfigurasi penjelajah web',
 
-'skinpreview' => '(Pratayang)',
-
 # Dates
 'sunday'        => 'Minggu',
 'monday'        => 'Senin',
@@ -421,7 +425,7 @@ $messages = array(
 'mytalk'         => 'Pembicaraan saya',
 'anontalk'       => 'Pembicaraan IP ini',
 'navigation'     => 'Navigasi',
-'and'            => 'dan',
+'and'            => '&#32;dan',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -458,7 +462,7 @@ $messages = array(
 'talkpagelinktext'  => 'Bicara',
 'specialpage'       => 'Halaman istimewa',
 'personaltools'     => 'Peralatan pribadi',
-'postcomment'       => 'Kirim komentar',
+'postcomment'       => 'Bagian baru',
 'articlepage'       => 'Lihat artikel',
 'talk'              => 'Pembicaraan',
 'views'             => 'Tampilan',
@@ -484,8 +488,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Perihal {{SITENAME}}',
 'aboutpage'            => 'Project:Perihal',
-'bugreports'           => 'Laporan bug',
-'bugreportspage'       => 'Project:Laporan bug',
 'copyright'            => 'Seluruh teks tersedia sesuai dengan $1.',
 'copyrightpagename'    => 'Hak cipta {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Hak cipta',
@@ -508,9 +510,7 @@ $messages = array(
 
 'badaccess'        => 'Kesalahan hak akses',
 'badaccess-group0' => 'Anda tidak diizinkan untuk melakukan tindakan yang Anda minta.',
-'badaccess-group1' => 'Tindakan yang Anda minta dibatasi untuk pengguna kelompok $1.',
-'badaccess-group2' => 'Tindakan yang Anda minta dibatasi untuk pengguna dalam kelompok $1.',
-'badaccess-groups' => 'Tindakan yang Anda minta dibatasi untuk pengguna dalam kelompok $1.',
+'badaccess-groups' => 'Tindakan yang Anda minta dibatasi untuk pengguna dalam {{PLURAL:$2|kelompok|salah satu dari kelompok}}: $1.',
 
 'versionrequired'     => 'Dibutuhkan MediaWiki versi $1',
 'versionrequiredtext' => 'MediaWiki versi $1 dibutuhkan untuk menggunakan halaman ini. Lihat [[Special:Version|halaman versi]]',
@@ -524,6 +524,8 @@ $messages = array(
 'editsection'             => 'sunting',
 'editold'                 => 'sunting',
 'viewsourceold'           => 'lihat sumber',
+'editlink'                => 'sunting',
+'viewsourcelink'          => 'lihat sumber',
 'editsectionhint'         => 'Sunting bagian: $1',
 'toc'                     => 'Daftar isi',
 'showtoc'                 => 'tampilkan',
@@ -538,7 +540,7 @@ $messages = array(
 'site-atom-feed'          => 'Umpan Atom $1',
 'page-rss-feed'           => 'Umpan RSS "$1"',
 'page-atom-feed'          => 'Umpan Atom "$1"',
-'red-link-title'          => '$1 (belum dibuat)',
+'red-link-title'          => '$1 (halaman belum tersedia)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Halaman',
@@ -554,7 +556,7 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Tidak ada tindakan tersebut',
-'nosuchactiontext'  => 'Tindakan yang dispesifikasikan oleh URL tersebut tidak dikenal oleh wiki.',
+'nosuchactiontext'  => 'Tindakan yang diminta oleh URL tersebut tidak valid. Anda mungkin salah mengetikkan URL, atau mengikuti suatu pranala yang tak betul. Hal ini juga mungkin mengindikasikan suatu bug pada perangkat lunak yang digunakan oleh {{SITENAME}}.',
 'nosuchspecialpage' => 'Tidak ada halaman istimewa tersebut',
 'nospecialpagetext' => "<big>'''Anda meminta halaman istimewa yang tidak sah.'''</big>
 
@@ -596,7 +598,6 @@ Silakan laporkan hal ini kepada salah seorang [[Special:ListUsers/sysop|Pengurus
 'cannotdelete'         => 'Tidak dapat menghapus halaman atau berkas yang diminta.',
 'badtitle'             => 'Judul tidak sah',
 'badtitletext'         => 'Judul halaman yang diminta tidak sah, kosong, atau judul antarbahasa atau antarwiki yang salah sambung.',
-'perfdisabled'         => 'Maaf! Fitur ini dimatikan sementara karena memperlambat basis data hingga tidak ada yang dapat menggunakan wiki ini.',
 'perfcached'           => 'Data berikut ini diambil dari <em>cache</em> dan mungkin bukan data mutakhir:',
 'perfcachedts'         => 'Data berikut ini diambil dari <em>cache</em>, dan terakhir diperbarui pada $1.',
 'querypage-no-updates' => 'Pemutakhiran dari halaman ini sedang dimatikan. Data yang ada di sini saat ini tidak akan dimuat ulang.',
@@ -608,7 +609,8 @@ Silakan laporkan hal ini kepada salah seorang [[Special:ListUsers/sysop|Pengurus
 'protectedpagetext'    => 'Halaman ini telah dikunci untuk menghindari penyuntingan.',
 'viewsourcetext'       => 'Anda dapat melihat atau menyalin sumber halaman ini:',
 'protectedinterface'   => 'Halaman ini berisi teks antarmuka untuk digunakan oleh perangkat lunak dan telah dikunci untuk menghindari kesalahan.',
-'editinginterface'     => "'''Peringatan:''' Anda menyunting halaman yang digunakan untuk menyediakan teks antarmuka dengan perangkat lunak. Perubahan teks ini akan mempengaruhi tampilan pada pengguna lain.",
+'editinginterface'     => "'''Peringatan:''' Anda menyunting suatu halaman yang digunakan untuk menyediakan teks antarmuka untuk perangkat lunak. Perubahan teks ini akan mempengaruhi tampilan pada antarmuka pengguna untuk pengguna lain.
+Untuk terjemahan, harap pertimbangkan untuk menggunakan [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], proyek pelokalan MediaWiki.",
 'sqlhidden'            => '(Permintaan SQL disembunyikan)',
 'cascadeprotected'     => 'Halaman ini telah dilindungi dari penyuntingan karena disertakan di {{PLURAL:$1|halaman|halaman-halaman}} berikut yang telah dilindungi dengan opsi "runtun":
 $2',
@@ -619,7 +621,7 @@ $2',
 Alasan yang diberikan adalah ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Kesalahan konfigurasi: pemindai virus tidak dikenal: <i>$1</i>',
+'virus-badscanner'     => "Kesalahan konfigurasi: pemindai virus tidak dikenal: ''$1''",
 'virus-scanfailed'     => 'Pemindaian gagal (kode $1)',
 'virus-unknownscanner' => 'Antivirus tidak dikenal:',
 
@@ -636,7 +638,6 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.',
 'remembermypassword'         => 'Ingat kata sandi saya di komputer ini',
 'yourdomainname'             => 'Domain Anda:',
 'externaldberror'            => 'Telah terjadi kesalahan otentikasi basis data eksternal atau Anda tidak diizinkan melakukan kemaskini terhadap akun eksternal Anda.',
-'loginproblem'               => '<strong>Ada masalah dengan proses masuk log Anda.</strong><br />Silakan coba lagi!',
 'login'                      => 'Masuk log',
 'nav-login-createaccount'    => 'Masuk log / buat akun',
 'loginprompt'                => "Anda harus mengaktifkan ''cookies'' untuk dapat masuk log ke {{SITENAME}}.",
@@ -662,8 +663,7 @@ Silakan pilih nama yang lain.',
 'yourvariant'                => 'Varian bahasa',
 'yournick'                   => 'Nama samaran:',
 'badsig'                     => 'Tanda tangan mentah tak sah; periksa tag HTML.',
-'badsiglength'               => 'Tanda tangan terlalu panjang.
-Maksimal $1 {{PLURAL:$1|karakter|karakter}}.',
+'badsiglength'               => 'Tanda tangan Anda terlalu panjang. Seharusnya kurang dari $1 {{PLURAL:$1|karakter|karakter}}.',
 'email'                      => 'Surat elektronik',
 'prefs-help-realname'        => '* Nama asli bersifat opsional dan jika Anda memberikannya, nama asli Anda akan digunakan untuk memberi pengenalan atas hasil kerja Anda.',
 'loginerror'                 => 'Kesalahan masuk log',
@@ -676,7 +676,8 @@ Anda juga dapat memilih untuk memungkinkan orang lain menghubungi Anda melalui h
 'loginsuccesstitle'          => 'Berhasil masuk log',
 'loginsuccess'               => "'''Anda sekarang masuk log di {{SITENAME}} sebagai \"\$1\".'''",
 'nosuchuser'                 => 'Tidak ada pengguna dengan nama "$1".
-Silakan periksa kembali ejaan Anda, atau [[Special:UserLogin/signup|buat akun baru]].',
+Nama pengguna membedakan kapitalisasi.
+Periksa kembali ejaan Anda, atau [[Special:UserLogin/signup|buat akun baru]].',
 'nosuchusershort'            => 'Tidak ada pengguna dengan nama "<nowiki>$1</nowiki>".
 Silakan periksa kembali ejaan Anda.',
 'nouserspecified'            => 'Anda harus memasukkan nama pengguna.',
@@ -696,8 +697,9 @@ Jika bukan Anda yang melakukan permintaan kata sandi baru, atau Anda telah mengi
 'throttled-mailpassword'     => 'Suatu pengingat kata sandi telah dikirimkan dalam {{PLURAL:$1|jam|$1 jam}} terakhir. 
 Untuk menghindari penyalahgunaan, hanya satu kata sandi yang akan dikirimkan setiap {{PLURAL:$1|jam|$1 jam}}.',
 'mailerror'                  => 'Kesalahan dalam mengirimkan surat-e: $1',
-'acct_creation_throttle_hit' => 'Alamat IP yang Anda gunakan telah membuat $1 akun dalam 24 jam terakhir, jumlah maksimum pembuatan akun yang diizinkan. Untuk sementara waktu pengguna dari alamat IP ini tidak bisa lagi membuat akun.',
-'emailauthenticated'         => 'Alamat surat-e Anda telah dikonfirmasi pada $1.',
+'acct_creation_throttle_hit' => 'Pengunjung wiki ini yang menggunakan alamat IP Anda telah membuat {{PLURAL:$1|1 akun|$1 akun}} dalam sehari terakhir, yang merupakan jumlah maksimum yang diijinkan dalam periode waktu ini.
+Karenanya, pengunjung yang menggunakan alamat IP ini tidak dapat lagi membuat akun lain pada saat ini.',
+'emailauthenticated'         => 'Alamat surat-e Anda telah dikonfirmasi pada $3, $2.',
 'emailnotauthenticated'      => 'Alamat surat-e Anda belum dikonfirmasi. Sebelum dikonfirmasi Anda tidak bisa menggunakan fitur surat elektronik.',
 'noemailprefs'               => 'Anda harus memasukkan suatu alamat surat-e untuk dapat menggunakan fitur ini.',
 'emailconfirmlink'           => 'Konfirmasikan alamat surat-e Anda',
@@ -709,18 +711,26 @@ Harap masukkan alamat surat-e dalam format yang benar atau kosongkan isian terse
 'createaccount-text'         => 'Seseorang telah membuat sebuah akun untuk alamat surat-e Anda di {{SITENAME}} ($4) dengan nama "$2" dan kata sandi "$3". Anda dianjurkan untuk masuk log dan mengganti kata sandi Anda sekarang.
 
 Anda dapat mengabaikan pesan nini jika akun ini dibuat karena suatu kesalahan.',
+'login-throttled'            => 'Anda telah berkali-kali mencoba memasukkan kata sandi untuk akun ini. Silakan menunggu sebelum mencoba lagi.',
 'loginlanguagelabel'         => 'Bahasa: $1',
 
 # Password reset dialog
-'resetpass'               => 'Atur ulang kata sandi akun',
-'resetpass_announce'      => 'Anda telah masuk log dengan kode sementara yang dikirim melalui surat-e. Untuk melanjutkan, Anda harus memasukkan kata sandi baru di sini:',
-'resetpass_text'          => '<!-- Tambahkan teks di sini -->',
-'resetpass_header'        => 'Atur ulang kata sandi',
-'resetpass_submit'        => 'Atur kata sandi dan masuk log',
-'resetpass_success'       => 'Kata sandi Anda telah berhasil diubah! Sekarang memproses masuk log Anda...',
-'resetpass_bad_temporary' => 'Kata sandi sementara salah. Anda mungkin pernah berhasil mengganti kata sandi Anda atau telah meminta kata sandi baru.',
-'resetpass_forbidden'     => 'Kata sandi tidak dapat diubah',
-'resetpass_missing'       => 'Data formulir tak dikenali.',
+'resetpass'                 => 'Ganti kata sandi',
+'resetpass_announce'        => 'Anda telah masuk log dengan kode sementara yang dikirim melalui surat-e. Untuk melanjutkan, Anda harus memasukkan kata sandi baru di sini:',
+'resetpass_text'            => '<!-- Tambahkan teks di sini -->',
+'resetpass_header'          => 'Ganti kata sandi akun',
+'oldpassword'               => 'Kata sandi lama:',
+'newpassword'               => 'Kata sandi baru:',
+'retypenew'                 => 'Ketik ulang kata sandi baru:',
+'resetpass_submit'          => 'Atur kata sandi dan masuk log',
+'resetpass_success'         => 'Kata sandi Anda telah berhasil diubah! Sekarang memproses masuk log Anda...',
+'resetpass_bad_temporary'   => 'Kata sandi sementara salah. Anda mungkin pernah berhasil mengganti kata sandi Anda atau telah meminta kata sandi baru.',
+'resetpass_forbidden'       => 'Kata sandi tidak dapat diubah',
+'resetpass-no-info'         => 'Anda harus masuk log untuk mengakses halaman ini secara langsung.',
+'resetpass-submit-loggedin' => 'Ganti kata sandi',
+'resetpass-wrong-oldpass'   => 'Kata sandi tidak sah.
+Anda mungkin telah berhasil mengganti kata sandi Anda atau telah meminta kata sandi sementara yang baru.',
+'resetpass-temp-password'   => 'Kata sandi sementara:',
 
 # Edit page toolbar
 'bold_sample'     => 'Teks ini akan dicetak tebal',
@@ -745,8 +755,8 @@ Anda dapat mengabaikan pesan nini jika akun ini dibuat karena suatu kesalahan.',
 'hr_tip'          => 'Garis horisontal',
 
 # Edit pages
-'summary'                          => 'Ringkasan',
-'subject'                          => 'Subjek/judul',
+'summary'                          => 'Ringkasan:',
+'subject'                          => 'Subjek/judul:',
 'minoredit'                        => 'Ini adalah suntingan kecil.',
 'watchthis'                        => 'Pantau halaman ini',
 'savearticle'                      => 'Simpan halaman',
@@ -758,8 +768,8 @@ Anda dapat mengabaikan pesan nini jika akun ini dibuat karena suatu kesalahan.',
 'missingsummary'                   => "'''Peringatan:''' Anda tidak memasukkan ringkasan penyuntingan. Jika Anda kembali menekan tombol Simpan, suntingan Anda akan disimpan tanpa ringkasan penyuntingan.",
 'missingcommenttext'               => 'Harap masukkan komentar di bawah ini.',
 'missingcommentheader'             => "'''Peringatan:''' Anda belum memberikan subjek atau judul untuk komentar Anda. Jika Anda kembali menekan Simpan, suntingan Anda akan disimpan tanpa komentar tersebut.",
-'summary-preview'                  => 'Pratayang ringkasan',
-'subject-preview'                  => 'Pratayang subyek/tajuk',
+'summary-preview'                  => 'Pratayang ringkasan:',
+'subject-preview'                  => 'Pratayang subyek/tajuk:',
 'blockedtitle'                     => 'Pengguna diblokir',
 'blockedtext'                      => "<big>'''Nama pengguna atau alamat IP Anda telah diblokir.'''</big>
 
@@ -811,51 +821,54 @@ Harap masukkan dan validasikan alamat surat-e Anda melalui [[Special:Preferences
 Dengan demikian, kami terpaksa harus memakai alamat IP yang bersangkutan untuk mengidentifikasikannya.
 Alamat IP seperti ini mungkin dipakai bersama oleh beberapa pengguna yang berbeda.
 Jika Anda adalah seorang pengguna anonim dan merasa mendapatkan komentar-komentar yang tidak relevan yang ditujukan langsung kepada Anda, silakan [[Special:UserLogin/signup|membuat akun]] atau [[Special:UserLogin|masuk log]] untuk menghindari kerancuan dengan pengguna anonim lainnya di lain waktu.''",
-'noarticletext'                    => 'Saat ini tidak ada teks dalam halaman ini. Anda dapat [[Special:Search/{{PAGENAME}}|melakukan pencarian untuk judul halaman ini]] di halaman-halaman lain atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} sunting halaman ini].',
+'noarticletext'                    => 'Saat ini tidak ada teks dalam halaman ini. Anda dapat [[Special:Search/{{PAGENAME}}|melakukan pencarian untuk judul halaman ini]] di halaman-halaman lain, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} mencari log terkait], atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} menyunting halaman ini]</span>.',
 'userpage-userdoesnotexist'        => 'Akun pengguna "$1" tidak terdaftar.',
 'clearyourcache'                   => "'''Catatan:''' Setelah menyimpan preferensi, Anda perlu membersihkan <em>cache</em> penjelajah web Anda untuk melihat perubahan. '''Mozilla / Firefox / Safari:''' tekan ''Ctrl-Shift-R'' (''Cmd-Shift-R'' pada Apple Mac); '''IE:''' tekan ''Ctrl-F5''; '''Konqueror:''': tekan ''F5''; '''Opera''' bersihkan <em>cache</em> melalui menu ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => "<strong>Tips:</strong> Gunakan tombol 'Lihat pratayang' untuk menguji CSS/JS baru Anda sebelum menyimpannya.",
+'usercssjsyoucanpreview'           => "'''Tips:''' Gunakan tombol 'Lihat pratayang' untuk menguji CSS/JS baru Anda sebelum menyimpannya.",
 'usercsspreview'                   => "'''Ingatlah bahwa Anda sedang menampilkan pratayang dari CSS Anda.
 Pratayang ini belum disimpan!'''",
 'userjspreview'                    => "'''Ingatlah bahwa yang Anda lihat hanyalah pratayang JavaScript Anda, dan bahwa pratayang tersebut belum disimpan!'''",
 'userinvalidcssjstitle'            => "'''Peringatan:''' Kulit \"\$1\" tidak ditemukan. Harap diingat bahwa halaman .css dan .js menggunakan huruf kecil, contoh {{ns:user}}:Foo/monobook.css dan bukannya {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Diperbarui)',
-'note'                             => '<strong>Catatan:</strong>',
-'previewnote'                      => '<strong>Ingatlah bahwa ini hanyalah pratayang yang belum disimpan!</strong>',
+'note'                             => "'''Catatan:'''",
+'previewnote'                      => "'''Ingatlah bahwa ini hanyalah pratayang yang belum disimpan!'''",
 'previewconflict'                  => 'Pratayang ini mencerminkan teks pada bagian atas kotak suntingan teks sebagaimana akan terlihat bila Anda menyimpannya.',
-'session_fail_preview'             => '<strong>Maaf, kami tidak dapat mengolah suntingan Anda akibat terhapusnya data sesi.
+'session_fail_preview'             => "'''Maaf, kami tidak dapat mengolah suntingan Anda akibat terhapusnya data sesi.
 Silakan coba sekali lagi.
-Jika masih tidak berhasil, cobalah [[Special:UserLogout|keluar lo]]g dan masuk log kembali.</strong>',
-'session_fail_preview_html'        => "<strong>Kami tidak dapat memproses suntingan Anda karena hilangnya data sesi.</strong>
+Jika masih tidak berhasil, cobalah [[Special:UserLogout|keluar lo]]g dan masuk log kembali.'''",
+'session_fail_preview_html'        => "'''Kami tidak dapat memproses suntingan Anda karena hilangnya data sesi.'''
 
 ''Karena {{SITENAME}} mengizinkan penggunaan HTML mentah, pratayang telah disembunyikan sebagai pencegahan terhadap serangan JavaScript.''
 
-<strong>Jika ini merupakan upaya suntingan yang sahih, silakan coba lagi.
-Jika masih tetap tidak berhasil, cobalah [[Special:UserLogout|keluar log]] dan masuk kembali.</strong>",
-'token_suffix_mismatch'            => '<strong>Suntingan Anda ditolak karena aplikasi klien Anda mengubah karakter tanda baca pada suntingan. Suntingan tersebut ditolak untuk mencegah kesalahan pada artikel teks. Hal ini kadang terjadi jika Anda menggunakan layanan proxy anonim berbasis web yang bermasalah.</strong>',
+'''Jika ini merupakan upaya suntingan yang sahih, silakan coba lagi.
+Jika masih tetap tidak berhasil, cobalah [[Special:UserLogout|keluar log]] dan masuk kembali.'''",
+'token_suffix_mismatch'            => "'''Suntingan Anda ditolak karena aplikasi klien Anda mengubah karakter tanda baca pada suntingan. Suntingan tersebut ditolak untuk mencegah kesalahan pada artikel teks. Hal ini kadang terjadi jika Anda menggunakan layanan proxy anonim berbasis web yang bermasalah.'''",
 'editing'                          => 'Menyunting $1',
 'editingsection'                   => 'Menyunting $1 (bagian)',
-'editingcomment'                   => 'Menyunting $1 (komentar)',
+'editingcomment'                   => 'Menyunting $1 (bagian baru)',
 'editconflict'                     => 'Konflik penyuntingan: $1',
 'explainconflict'                  => 'Orang lain telah menyunting halaman ini sejak Anda mulai menyuntingnya. Bagian atas teks ini mengandung teks halaman saat ini. Perubahan yang Anda lakukan ditunjukkan pada bagian bawah teks. Anda hanya perlu menggabungkan perubahan Anda dengan teks yang telah ada. <strong>Hanya</strong> teks pada bagian atas halamanlah yang akan disimpan apabila Anda menekan "Simpan halaman".<p>',
 'yourtext'                         => 'Teks Anda',
 'storedversion'                    => 'Versi tersimpan',
-'nonunicodebrowser'                => '<strong>PERINGATAN: Penjelajah web Anda tidak mendukung Unicode, silakan ganti penjelajah web Anda sebelum menyunting artikel.</strong>',
-'editingold'                       => '<strong>Peringatan:
+'nonunicodebrowser'                => "'''PERINGATAN: Penjelajah web Anda tidak mendukung Unicode, silakan ganti penjelajah web Anda sebelum menyunting artikel.'''",
+'editingold'                       => "'''Peringatan:
 Anda menyunting revisi lama suatu halaman.
-Jika Anda menyimpannya, perubahan-perubahan yang dibuat sejak revisi ini akan hilang.</strong>',
+Jika Anda menyimpannya, perubahan-perubahan yang dibuat sejak revisi ini akan hilang.'''",
 'yourdiff'                         => 'Perbedaan',
-'copyrightwarning'                 => 'Perhatikan bahwa semua kontribusi terhadap {{SITENAME}} dianggap dilisensikan sesuai dengan $2 (lihat $1 untuk informasi lebih lanjut). Jika Anda tidak ingin tulisan Anda disunting dan disebarkan ke halaman web yang lain, jangan kirimkan artikel Anda ke sini.<br />Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain. <strong>JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!</strong>',
-'copyrightwarning2'                => 'Perhatikan bahwa semua kontribusi terhadap {{SITENAME}} dapat disunting, diubah, atau dihapus oleh penyumbang lainnya. Jika Anda tidak ingin tulisan Anda disunting orang lain, jangan kirimkan artikel Anda ke sini.<br />Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain (lihat $1 untuk informasi lebih lanjut). <strong>JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!</strong>',
-'longpagewarning'                  => '<strong>PERINGATAN: Halaman ini panjangnya adalah $1 kilobita;
+'copyrightwarning'                 => "Perhatikan bahwa semua kontribusi terhadap {{SITENAME}} dianggap dilisensikan sesuai dengan $2 (lihat $1 untuk informasi lebih lanjut). Jika Anda tidak ingin tulisan Anda disunting dan disebarkan ke halaman web yang lain, jangan kirimkan artikel Anda ke sini.<br />Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain. '''JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!'''",
+'copyrightwarning2'                => "Perhatikan bahwa semua kontribusi terhadap {{SITENAME}} dapat disunting, diubah, atau dihapus oleh penyumbang lainnya. Jika Anda tidak ingin tulisan Anda disunting orang lain, jangan kirimkan artikel Anda ke sini.<br />Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain (lihat $1 untuk informasi lebih lanjut). '''JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!'''",
+'longpagewarning'                  => "'''PERINGATAN: Halaman ini panjangnya adalah $1 kilobita;
 beberapa penjelajah web lawas mungkin mengalami masalah dalam menyunting halaman yang panjangnya 32 kb atau lebih.
-Harap pertimbangkan untuk memecah halaman menjadi beberapa bagian yang lebih kecil.</strong>',
-'longpageerror'                    => '<strong>KESALAHAN: Teks yang Anda kirimkan sebesar $1 kilobita, yang berarti lebih besar dari jumlah maksimum $2 kilobita. Teks tidak dapat disimpan.</strong>',
-'readonlywarning'                  => '<strong>PERINGATAN: Basis data sedang dikunci karena pemeliharaan, sehingga saat ini Anda tidak akan dapat menyimpan hasil penyuntingan Anda. Anda mungkin perlu memindahkan hasil penyuntingan Anda ini ke tempat lain untuk disimpan belakangan.</strong>',
-'protectedpagewarning'             => '<strong>PERINGATAN: Halaman ini sedang dilindungi sehingga hanya pengguna dengan hak akses pengurus saja yang dapat menyuntingnya.</strong>',
+Harap pertimbangkan untuk memecah halaman menjadi beberapa bagian yang lebih kecil.'''",
+'longpageerror'                    => "'''KESALAHAN: Teks yang Anda kirimkan sebesar $1 kilobita, yang berarti lebih besar dari jumlah maksimum $2 kilobita. Teks tidak dapat disimpan.'''",
+'readonlywarning'                  => "'''PERINGATAN: Basis data sedang dikunci karena pemeliharaan, sehingga saat ini Anda tidak dapat menyimpan hasil suntingan Anda.
+Anda mungkin perlu menyalin teks suntingan Anda ini dan menyimpannya ke sebuah berkas teks dan memuatkannya lagi setelah pemeliharaan selesai.'''
+
+Pengurus yang mengunci basis data memberikan penjelasan berikut: $1",
+'protectedpagewarning'             => "'''PERINGATAN: Halaman ini sedang dilindungi sehingga hanya pengguna dengan hak akses pengurus saja yang dapat menyuntingnya.'''",
 'semiprotectedpagewarning'         => "'''Catatan:''' Halaman ini sedang dilindungi, sehingga hanya pengguna terdaftar yang bisa menyuntingnya.",
 'cascadeprotectedwarning'          => "'''PERINGATAN:''' Halaman ini sedang dilindungi sehingga hanya pengguna dengan hak akses pengurus saja yang dapat menyuntingnya karena disertakan dalam {{PLURAL:$1|halaman|halaman-halaman}} berikut yang telah dilindungi dengan opsi 'perlindungan runtun':",
-'titleprotectedwarning'            => '<strong>PERINGATAN: Halaman ini telah dikunci sehingga hanya beberapa pengguna yang dapat membuatnya.</strong>',
+'titleprotectedwarning'            => "'''PERINGATAN: Halaman ini telah dikunci hingga diperlukan [[Special:ListGroupRights|hak khusus]] untuk membuatnya.'''",
 'templatesused'                    => 'Templat yang digunakan di halaman ini:',
 'templatesusedpreview'             => 'Templat yang digunakan di pratayang ini:',
 'templatesusedsection'             => 'Templat yang digunakan di bagian ini:',
@@ -874,17 +887,29 @@ Anda dapat kembali dan menyunting halaman yang telah ada, atau silakan [[Special
 
 Harap pertimbangkan apakah layak untuk melanjutkan suntingan Anda.
 Berikut adalah log penghapusan dari halaman ini:",
+'deleted-notice'                   => 'Halaman ini telah dihapus. Sebagai referensi, berikut adalah log penghapusan halaman ini.',
+'deletelog-fulllog'                => 'Menampilkan seluruh log',
+'edit-hook-aborted'                => 'Suntingan dibatalkan oleh kait parser
+tanpa ada keterangan.',
+'edit-gone-missing'                => 'Tidak dapat memperbaharui halaman.
+Halaman kemungkinan telah dihapus.',
+'edit-conflict'                    => 'Konflik penyuntingan.',
+'edit-no-change'                   => 'Suntingan diabaikan, karena Anda tidak melakukan perubahan atas teks.',
+'edit-already-exists'              => 'Tidak dapat membuat halaman baru
+karena telah ada.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Peringatan: halaman ini mengandung terlalu banyak panggilan fungsi parser.
+'expensive-parserfunction-warning'        => 'Peringatan: Halaman ini mengandung terlalu banyak panggilan fungsi parser.
 
-Saat ini terdapat $1, seharusnya kurang dari $2.',
+Saat ini terdapat {{PLURAL:$1|$1 panggilan|$1 panggilan}}, seharusnya kurang dari $2 {{PLURAL:$2|panggilan|panggilan}}.',
 'expensive-parserfunction-category'       => 'Halaman dengan terlalu banyak panggilan fungsi parser',
 'post-expand-template-inclusion-warning'  => 'Peringatan: Ukuran templat yang digunakan terlalu besar.
 Beberapa templat akan diabaikan.',
 'post-expand-template-inclusion-category' => 'Halaman dengan ukuran templat yang melebihi batas',
 'post-expand-template-argument-warning'   => 'Peringatan: Halaman ini mengandung setidaknya satu argumen templat dengan ukuran ekspansi yang terlalu besar. Argumen-argumen tersebut telah diabaikan.',
 'post-expand-template-argument-category'  => 'Halaman dengan argumen templat yang diabaikan',
+'parser-template-loop-warning'            => 'Hubungan berulang templat terdeteksi: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limit kedalaman hubungan berulang templat terlampaui ($1)',
 
 # "Undo" feature
 'undo-success' => 'Suntingan ini dapat dibatalkan. Tolong cek perbandingan di bawah untuk meyakinkan bahwa benar itu yang Anda ingin lakukan, lalu simpan perubahan tersebut untuk menyelesaikan pembatalan suntingan.',
@@ -899,27 +924,27 @@ Beberapa templat akan diabaikan.',
 Alasan yang diberikan oleh $3 adalah ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Lihat log halaman ini',
-'nohistory'           => 'Tidak ada sejarah penyuntingan untuk halaman ini',
-'revnotfound'         => 'Revisi tidak ditemukan',
-'revnotfoundtext'     => 'Revisi lama halaman yang Anda minta tidak dapat ditemukan. Silakan periksa URL yang digunakan untuk mengakses halaman ini.',
-'currentrev'          => 'Revisi terkini',
-'revisionasof'        => 'Revisi per $1',
-'revision-info'       => 'Revisi per $1; $2',
-'previousrevision'    => '�Revisi sebelumnya',
-'nextrevision'        => 'Revisi selanjutnya→',
-'currentrevisionlink' => 'Revisi terkini',
-'cur'                 => 'skr',
-'next'                => 'selanjutnya',
-'last'                => 'akhir',
-'page_first'          => 'pertama',
-'page_last'           => 'terakhir',
-'histlegend'          => "Pilih dua tombol radio lalu tekan tombol ''bandingkan'' untuk membandingkan versi. Klik suatu tanggal untuk melihat versi halaman pada tanggal tersebut.<br />(skr) = perbedaan dengan versi sekarang, (akhir) = perbedaan dengan versi sebelumnya, '''k''' = suntingan kecil, '''b''' = suntingan bot, → = suntingan bagian, � = ringkasan otomatis",
-'deletedrev'          => '[dihapus]',
-'histfirst'           => 'Terlama',
-'histlast'            => 'Terbaru',
-'historysize'         => '($1 {{PLURAL:$1|bita|bita}})',
-'historyempty'        => '(kosong)',
+'viewpagelogs'           => 'Lihat log halaman ini',
+'nohistory'              => 'Tidak ada sejarah penyuntingan untuk halaman ini',
+'currentrev'             => 'Revisi terkini',
+'currentrev-asof'        => 'Revisi terkini pada $1',
+'revisionasof'           => 'Revisi per $1',
+'revision-info'          => 'Revisi per $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Revisi sebelumnya',
+'nextrevision'           => 'Revisi selanjutnya→',
+'currentrevisionlink'    => 'Revisi terkini',
+'cur'                    => 'skr',
+'next'                   => 'selanjutnya',
+'last'                   => 'akhir',
+'page_first'             => 'pertama',
+'page_last'              => 'terakhir',
+'histlegend'             => "Pilih dua tombol radio lalu tekan tombol ''bandingkan'' untuk membandingkan versi. Klik suatu tanggal untuk melihat versi halaman pada tanggal tersebut.<br />(skr) = perbedaan dengan versi sekarang, (akhir) = perbedaan dengan versi sebelumnya, '''k''' = suntingan kecil, '''b''' = suntingan bot, → = suntingan bagian, � = ringkasan otomatis",
+'history-fieldset-title' => 'Menjelajah versi terdahulu',
+'deletedrev'             => '[dihapus]',
+'histfirst'              => 'Terlama',
+'histlast'               => 'Terbaru',
+'historysize'            => '($1 {{PLURAL:$1|bita|bita}})',
+'historyempty'           => '(kosong)',
 
 # Revision feed
 'history-feed-title'          => 'Riwayat revisi',
@@ -997,6 +1022,7 @@ Pastikan bahwa perubahan ini tetap mempertahankan kontinuitas versi terdahulu ha
 'mergehistory-invalid-destination' => 'Judul halaman tujuan haruslah judul yang valid.',
 'mergehistory-autocomment'         => '[[:$1]] telah digabungkan ke [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] telah digabungkan ke [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Nama halaman sumber dan tujuan tidak boleh sama',
 
 # Merge log
 'mergelog'           => 'Gabung log',
@@ -1009,121 +1035,202 @@ Pastikan bahwa perubahan ini tetap mempertahankan kontinuitas versi terdahulu ha
 'difference'              => '(Perbedaan antarrevisi)',
 'lineno'                  => 'Baris $1:',
 'compareselectedversions' => 'Bandingkan versi terpilih',
+'visualcomparison'        => 'Perbandingan visual',
+'wikicodecomparison'      => 'Perbandingan teks wiki',
 'editundo'                => 'batalkan',
 'diff-multi'              => '({{PLURAL:$1|Satu|$1}} revisi antara tak ditampilkan.)',
+'diff-movedto'            => 'dipindahkan ke $1',
+'diff-styleadded'         => '$1 gaya ditambahkan',
+'diff-added'              => '$1 ditambahkan',
+'diff-changedto'          => 'diubah ke $1',
+'diff-movedoutof'         => 'dipindahkan dari $1',
+'diff-styleremoved'       => '$1 gaya dihapuskan',
+'diff-removed'            => '$1 dihapuskan',
+'diff-changedfrom'        => 'diubah dari $1',
+'diff-src'                => 'sumber',
+'diff-withdestination'    => 'dengan tujuan $1',
+'diff-with'               => '&#32;dengan $1 $2',
+'diff-with-final'         => '&#32;dan $1 $2',
+'diff-width'              => 'lebar',
+'diff-height'             => 'tinggi',
+'diff-p'                  => "sebuah '''paragraf'''",
+'diff-blockquote'         => "sebuah '''kutipan'''",
+'diff-h1'                 => "sebuah '''judul bagian (aras 1)'''",
+'diff-h2'                 => "sebuah '''judul bagian (aras 2)'''",
+'diff-h3'                 => "sebuah '''judul bagian (aras 3)'''",
+'diff-h4'                 => "sebuah '''judul bagian (aras 4)'''",
+'diff-h5'                 => "sebuah '''baris judul (aras 5)'''",
+'diff-pre'                => "sebuah '''blok dengan praformat'''",
+'diff-div'                => "sebuah '''bagian'''",
+'diff-ul'                 => "sebuah '''daftar takterurut'''",
+'diff-ol'                 => "sebuah '''daftar terurut'''",
+'diff-li'                 => "sebuah '''daftar butir'''",
+'diff-table'              => "sebuah '''tabel'''",
+'diff-tbody'              => "sebuah '''isi tabel'''",
+'diff-tr'                 => "sebuah '''baris'''",
+'diff-td'                 => "sebuah '''sel'''",
+'diff-th'                 => "sebuah '''tajuk'''",
+'diff-br'                 => "sebuah '''putus'''",
+'diff-hr'                 => "sebuah '''mistar horizontal'''",
+'diff-code'               => "sebuah '''blok kode komputer'''",
+'diff-dl'                 => "sebuah '''daftar definisi'''",
+'diff-dt'                 => "sebuah '''definisi istilah'''",
+'diff-dd'                 => "sebuah '''definisi'''",
+'diff-input'              => "sebuah '''masukan'''",
+'diff-form'               => "sebuah '''formulir'''",
+'diff-img'                => "sebuah '''gambar'''",
+'diff-span'               => "sebuah '''rentang'''",
+'diff-a'                  => "sebuah '''pranala'''",
+'diff-i'                  => "'''italik'''",
+'diff-b'                  => "'''tebal'''",
+'diff-strong'             => "'''keras'''",
+'diff-em'                 => "'''penekanan'''",
+'diff-font'               => "'''huruf'''",
+'diff-big'                => "'''besar'''",
+'diff-del'                => "'''dihapuskan'''",
+'diff-tt'                 => "'''lebar tetap'''",
+'diff-sub'                => "'''tika bawah'''",
+'diff-sup'                => "'''tika atas'''",
+'diff-strike'             => "'''coret'''",
 
 # Search results
-'searchresults'             => 'Hasil pencarian',
-'searchresulttext'          => 'Untuk informasi lebih lanjut tentang pencarian di {{SITENAME}}, lihat [[{{MediaWiki:Helppage}}|halaman bantuan]].',
-'searchsubtitle'            => "Anda mencari '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "Anda mencari '''$1'''",
-'noexactmatch'              => "'''Tidak ada halaman yang berjudul \"\$1\".''' Anda dapat [[:\$1|membuat halaman ini]].",
-'noexactmatch-nocreate'     => "'''Tidak ada halaman berjudul \"\$1\".'''",
-'toomanymatches'            => 'Pencarian menghasilkan terlalu banyak hasil, silakan masukkan kueri lain',
-'titlematches'              => 'Judul artikel yang sama',
-'notitlematches'            => 'Tidak ada judul halaman yang cocok',
-'textmatches'               => 'Teks artikel yang cocok',
-'notextmatches'             => 'Tidak ada teks halaman yang cocok',
-'prevn'                     => '$1 sebelumnya',
-'nextn'                     => '$1 berikutnya',
-'viewprevnext'              => 'Lihat ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 kata|$2 kata}})',
-'search-result-score'       => 'Relevansi: $1%',
-'search-redirect'           => '(pengalihan $1)',
-'search-section'            => '(bagian $1)',
-'search-suggest'            => 'Mungkin maksud Anda adalah: $1',
-'search-interwiki-caption'  => 'Proyek lain',
-'search-interwiki-default'  => 'Hasil $1:',
-'search-interwiki-more'     => '(selanjutnya)',
-'search-mwsuggest-enabled'  => 'dengan saran',
-'search-mwsuggest-disabled' => 'tidak ada saran',
-'search-relatedarticle'     => 'Berkaitan',
-'mwsuggest-disable'         => 'Non-aktifkan saran AJAX',
-'searchrelated'             => 'berkaitan',
-'searchall'                 => 'semua',
-'showingresults'            => "Di bawah ini ditampilkan hingga {{PLURAL:$1|'''1''' hasil|'''$1''' hasil}}, dimulai dari #'''$2'''.",
-'showingresultsnum'         => "Di bawah ini ditampilkan{{PLURAL:$3|'''1''' hasil|'''$3''' hasil}}, dimulai dari #'''$2'''.",
-'showingresultstotal'       => "Hasil pencarian {{PLURAL:$3|'''$1''' dari '''$3'''|'''$1 - $2''' dari '''$3'''}}",
-'nonefound'                 => "'''Catatan''': Kegagalan pencarian biasanya disebabkan oleh pencarian kata-kata umum dalam bahasa Inggris, seperti \"have\" dan \"from\", yang biasanya tidak diindeks, atau dengan menentukan lebih dari satu kriteria pencarian (hanya halaman yang mengandung semua kriteria pencarianlah yang akan ditampilkan dalam hasil pencarian)",
-'powersearch'               => 'Pencarian lanjut',
-'powersearch-legend'        => 'Pencarian lanjut',
-'powersearch-ns'            => 'Mencari di ruang nama:',
-'powersearch-redir'         => 'Daftar pengalihan',
-'powersearch-field'         => 'Mencari',
-'search-external'           => 'Pencarian eksternal',
-'searchdisabled'            => 'Pencarian {{SITENAME}} sementara dimatikan.
+'searchresults'                    => 'Hasil pencarian',
+'searchresults-title'              => 'Hasil pencarian untuk "$1"',
+'searchresulttext'                 => 'Untuk informasi lebih lanjut tentang pencarian di {{SITENAME}}, lihat [[{{MediaWiki:Helppage}}|halaman bantuan]].',
+'searchsubtitle'                   => 'Anda mencari \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|semua halaman yang dimulai dengan "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|semua halaman yang terpaut ke "$1"]])',
+'searchsubtitleinvalid'            => "Anda mencari '''$1'''",
+'noexactmatch'                     => "'''Tidak ada halaman yang berjudul \"\$1\".''' Anda dapat [[:\$1|membuat halaman ini]].",
+'noexactmatch-nocreate'            => "'''Tidak ada halaman berjudul \"\$1\".'''",
+'toomanymatches'                   => 'Pencarian menghasilkan terlalu banyak hasil, silakan masukkan kueri lain',
+'titlematches'                     => 'Judul artikel yang sama',
+'notitlematches'                   => 'Tidak ada judul halaman yang cocok',
+'textmatches'                      => 'Teks artikel yang cocok',
+'notextmatches'                    => 'Tidak ada teks halaman yang cocok',
+'prevn'                            => '$1 sebelumnya',
+'nextn'                            => '$1 berikutnya',
+'viewprevnext'                     => 'Lihat ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Opsi pencarian',
+'searchmenu-exists'                => "* Halaman '''[[$1]]'''",
+'searchmenu-new'                   => "'''Buat halaman \"[[:\$1]]\" di wiki ini!'''",
+'searchhelp-url'                   => 'Help:Isi',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Lihat daftar halaman dengan awalan ini]]',
+'searchprofile-articles'           => 'Halaman isi',
+'searchprofile-articles-and-proj'  => 'Halaman isi dan proyek',
+'searchprofile-project'            => 'Halaman proyek',
+'searchprofile-images'             => 'Berkas',
+'searchprofile-everything'         => 'Seluruhnya',
+'searchprofile-advanced'           => 'Lanjutan',
+'searchprofile-articles-tooltip'   => 'Pencarian di $1',
+'searchprofile-project-tooltip'    => 'Pencarian di $1',
+'searchprofile-images-tooltip'     => 'Pencarian berkas',
+'searchprofile-everything-tooltip' => 'Pencarian di seluruh isi (termasuk halaman pembicaraan)',
+'searchprofile-advanced-tooltip'   => 'Pencarian di ruang nama tersuai',
+'prefs-search-nsdefault'           => 'Cari menggunakan standar baku:',
+'prefs-search-nscustom'            => 'Cari di ruang nama buatan:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 kata|$2 kata}})',
+'search-result-score'              => 'Relevansi: $1%',
+'search-redirect'                  => '(pengalihan $1)',
+'search-section'                   => '(bagian $1)',
+'search-suggest'                   => 'Mungkin maksud Anda adalah: $1',
+'search-interwiki-caption'         => 'Proyek lain',
+'search-interwiki-default'         => 'Hasil $1:',
+'search-interwiki-more'            => '(selanjutnya)',
+'search-mwsuggest-enabled'         => 'dengan saran',
+'search-mwsuggest-disabled'        => 'tidak ada saran',
+'search-relatedarticle'            => 'Berkaitan',
+'mwsuggest-disable'                => 'Non-aktifkan saran AJAX',
+'searchrelated'                    => 'berkaitan',
+'searchall'                        => 'semua',
+'showingresults'                   => "Di bawah ini ditampilkan hingga {{PLURAL:$1|'''1''' hasil|'''$1''' hasil}}, dimulai dari #'''$2'''.",
+'showingresultsnum'                => "Di bawah ini ditampilkan{{PLURAL:$3|'''1''' hasil|'''$3''' hasil}}, dimulai dari #'''$2'''.",
+'showingresultstotal'              => "Hasil pencarian {{PLURAL:$4|'''$1'''|'''$1 - $2'''}} dari '''$3'''",
+'nonefound'                        => "'''Catatan''': Hanya beberapa ruang nama yang secara baku dimasukkan dalam pencarian. Coba awali permintaan Anda dengan ''all:'' untuk mencari semua isi (termasuk halaman pembicaraan, templat, dll), atau gunakan ruang nama yang diinginkan sebagai awalan.",
+'search-nonefound'                 => 'Tidak ada hasil yang sesuai dengan kriteria.',
+'powersearch'                      => 'Pencarian lanjut',
+'powersearch-legend'               => 'Pencarian lanjut',
+'powersearch-ns'                   => 'Mencari di ruang nama:',
+'powersearch-redir'                => 'Daftar pengalihan',
+'powersearch-field'                => 'Mencari',
+'search-external'                  => 'Pencarian eksternal',
+'searchdisabled'                   => 'Pencarian {{SITENAME}} sementara dimatikan.
 Anda dapat mencari melalui Google untuk sementara waktu.
 Perlu diingat bahwa indeks Google untuk konten {{SITENAME}} mungkin belum mencakup perubahan-perubahan terakhir.',
 
 # Preferences page
-'preferences'              => 'Preferensi',
-'mypreferences'            => 'Preferensi saya',
-'prefs-edits'              => 'Jumlah suntingan:',
-'prefsnologin'             => 'Belum masuk log',
-'prefsnologintext'         => 'Anda harus <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} masuk log]</span> untuk mengeset preferensi Anda.',
-'prefsreset'               => 'Preferensi telah dikembalikan ke konfigurasi baku.',
-'qbsettings'               => 'Pengaturan bar pintas',
-'qbsettings-none'          => 'Tidak ada',
-'qbsettings-fixedleft'     => 'Tetap sebelah kiri',
-'qbsettings-fixedright'    => 'Tetap sebelah kanan',
-'qbsettings-floatingleft'  => 'Mengambang sebelah kiri',
-'qbsettings-floatingright' => 'Mengambang sebelah kanan',
-'changepassword'           => 'Ganti kata sandi',
-'skin'                     => 'Kulit',
-'math'                     => 'Matematika',
-'dateformat'               => 'Format tanggal',
-'datedefault'              => 'Tak ada preferensi',
-'datetime'                 => 'Tanggal dan waktu',
-'math_failure'             => 'Gagal memparse',
-'math_unknown_error'       => 'Kesalahan yang tidak diketahui',
-'math_unknown_function'    => 'fungsi yang tidak diketahui',
-'math_lexing_error'        => 'kesalahan lexing',
-'math_syntax_error'        => 'kesalahan sintaks',
-'math_image_error'         => 'Konversi PNG gagal; periksa apakah latex, dvips, gs, dan convert terinstal dengan benar',
-'math_bad_tmpdir'          => 'Tidak dapat menulisi atau membuat direktori sementara math',
-'math_bad_output'          => 'Tidak dapat menulisi atau membuat direktori keluaran math',
-'math_notexvc'             => 'Executable texvc hilang; silakan lihat math/README untuk cara konfigurasi.',
-'prefs-personal'           => 'Profil',
-'prefs-rc'                 => 'Perubahan terbaru',
-'prefs-watchlist'          => 'Pemantauan',
-'prefs-watchlist-days'     => 'Jumlah hari maksimum yang ditampilkan di daftar pantauan:',
-'prefs-watchlist-edits'    => 'Jumlah suntingan maksimum yang ditampilkan di daftar pantauan yang lebih lengkap:',
-'prefs-misc'               => 'Lain-lain',
-'saveprefs'                => 'Simpan',
-'resetprefs'               => 'Batalkan perubahan',
-'oldpassword'              => 'Kata sandi lama:',
-'newpassword'              => 'Kata sandi baru:',
-'retypenew'                => 'Ketik ulang kata sandi baru:',
-'textboxsize'              => 'Penyuntingan',
-'rows'                     => 'Baris:',
-'columns'                  => 'Kolom:',
-'searchresultshead'        => 'Pencarian',
-'resultsperpage'           => 'Hasil per halaman:',
-'contextlines'             => 'Baris ditampilkan per hasil:',
-'contextchars'             => 'Karakter untuk konteks per baris:',
-'stub-threshold'           => 'Ambang batas untuk format <a href="#" class="stub">pranala rintisan</a>:',
-'recentchangesdays'        => 'Jumlah hari yang ditampilkan di perubahan terbaru:',
-'recentchangescount'       => 'Jumlah suntingan yang ditampilkan di perubahan terbaru:',
-'savedprefs'               => 'Preferensi Anda telah disimpan',
-'timezonelegend'           => 'Zona waktu',
-'timezonetext'             => 'Masukkan perbedaan waktu (dalam jam) antara waktu setempat dengan waktu server (UTC).',
-'localtime'                => 'Waktu setempat',
-'timezoneoffset'           => 'Perbedaan:',
-'servertime'               => 'Waktu server sekarang adalah',
-'guesstimezone'            => 'Isikan dari penjelajah web',
-'allowemail'               => 'Ijinkan pengguna lain mengirim surat-e',
-'prefs-searchoptions'      => 'Opsi pencarian',
-'prefs-namespaces'         => 'Ruang nama',
-'defaultns'                => 'Cari dalam ruang nama berikut ini secara baku:',
-'default'                  => 'baku',
-'files'                    => 'Berkas',
+'preferences'               => 'Preferensi',
+'mypreferences'             => 'Preferensi saya',
+'prefs-edits'               => 'Jumlah suntingan:',
+'prefsnologin'              => 'Belum masuk log',
+'prefsnologintext'          => 'Anda harus <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} masuk log]</span> untuk mengeset preferensi Anda.',
+'prefsreset'                => 'Preferensi telah dikembalikan ke konfigurasi baku.',
+'qbsettings'                => 'Pengaturan bar pintas',
+'qbsettings-none'           => 'Tidak ada',
+'qbsettings-fixedleft'      => 'Tetap sebelah kiri',
+'qbsettings-fixedright'     => 'Tetap sebelah kanan',
+'qbsettings-floatingleft'   => 'Mengambang sebelah kiri',
+'qbsettings-floatingright'  => 'Mengambang sebelah kanan',
+'changepassword'            => 'Ganti kata sandi',
+'skin'                      => 'Kulit',
+'skin-preview'              => 'Pratayang',
+'math'                      => 'Matematika',
+'dateformat'                => 'Format tanggal',
+'datedefault'               => 'Tak ada preferensi',
+'datetime'                  => 'Tanggal dan waktu',
+'math_failure'              => 'Gagal memparse',
+'math_unknown_error'        => 'Kesalahan yang tidak diketahui',
+'math_unknown_function'     => 'fungsi yang tidak diketahui',
+'math_lexing_error'         => 'kesalahan lexing',
+'math_syntax_error'         => 'kesalahan sintaks',
+'math_image_error'          => 'Konversi PNG gagal; periksa apakah latex, dvips, gs, dan convert terinstal dengan benar',
+'math_bad_tmpdir'           => 'Tidak dapat menulisi atau membuat direktori sementara math',
+'math_bad_output'           => 'Tidak dapat menulisi atau membuat direktori keluaran math',
+'math_notexvc'              => 'Executable texvc hilang; silakan lihat math/README untuk cara konfigurasi.',
+'prefs-personal'            => 'Profil',
+'prefs-rc'                  => 'Perubahan terbaru',
+'prefs-watchlist'           => 'Pemantauan',
+'prefs-watchlist-days'      => 'Jumlah hari maksimum yang ditampilkan di daftar pantauan:',
+'prefs-watchlist-days-max'  => '(maksimum 7 hari)',
+'prefs-watchlist-edits'     => 'Jumlah suntingan maksimum yang ditampilkan di daftar pantauan yang lebih lengkap:',
+'prefs-watchlist-edits-max' => '(nilai maksimum: 1000)',
+'prefs-misc'                => 'Lain-lain',
+'prefs-resetpass'           => 'Ganti kata sandi',
+'saveprefs'                 => 'Simpan',
+'resetprefs'                => 'Batalkan perubahan',
+'textboxsize'               => 'Penyuntingan',
+'prefs-edit-boxsize'        => 'Ukuran kotak penyuntingan.',
+'rows'                      => 'Baris:',
+'columns'                   => 'Kolom:',
+'searchresultshead'         => 'Pencarian',
+'resultsperpage'            => 'Hasil per halaman:',
+'contextlines'              => 'Baris ditampilkan per hasil:',
+'contextchars'              => 'Karakter untuk konteks per baris:',
+'stub-threshold'            => 'Ambang batas untuk format <a href="#" class="stub">pranala rintisan</a>:',
+'recentchangesdays'         => 'Jumlah hari yang ditampilkan di perubahan terbaru:',
+'recentchangesdays-max'     => '(maksimum $1 {{PLURAL:$1|hari|hari}})',
+'recentchangescount'        => 'Jumlah baku suntingan yang ditampilkan di perubahan terbaru, riwayat halaman, dan log:',
+'savedprefs'                => 'Preferensi Anda telah disimpan',
+'timezonelegend'            => 'Zona waktu',
+'timezonetext'              => 'Masukkan perbedaan waktu (dalam jam) antara waktu setempat dengan waktu server (UTC).',
+'localtime'                 => 'Waktu setempat:',
+'timezoneselect'            => 'Zona waktu:',
+'timezoneuseserverdefault'  => 'Gunakan standar server',
+'timezoneuseoffset'         => 'Lainnya (tentukan perbedaannya)',
+'timezoneoffset'            => 'Perbedaan¹:',
+'servertime'                => 'Waktu server:',
+'guesstimezone'             => 'Isikan dari penjelajah web',
+'allowemail'                => 'Ijinkan pengguna lain mengirim surat-e',
+'prefs-searchoptions'       => 'Opsi pencarian',
+'prefs-namespaces'          => 'Ruang nama',
+'defaultns'                 => 'Cari dalam ruang nama berikut ini secara baku:',
+'default'                   => 'baku',
+'files'                     => 'Berkas',
 
 # User rights
 'userrights'                  => 'Manajemen hak pengguna', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Mengatur kelompok pengguna',
 'userrights-user-editname'    => 'Masukkan nama pengguna:',
 'editusergroup'               => 'Sunting kelompok pengguna',
-'editinguser'                 => "Mengganti hak akses pengguna '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Mengganti hak akses pengguna '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Sunting kelompok pengguna',
 'saveusergroups'              => 'Simpan kelompok pengguna',
 'userrights-groupsmember'     => 'Anggota dari:',
@@ -1172,6 +1279,8 @@ Perlu diingat bahwa indeks Google untuk konten {{SITENAME}} mungkin belum mencak
 'right-minoredit'            => 'Menandai suntingan sebagai minor',
 'right-move'                 => 'Memindahkan halaman',
 'right-move-subpages'        => 'Pindahkan halaman dengan seluruh sub halamannya',
+'right-move-rootuserpages'   => 'Pindahkan halaman utama pengguna',
+'right-movefile'             => 'Pindahkan berkas',
 'right-suppressredirect'     => 'Tidak membuat pengalihan dari nama lama ketika memindahkan halaman',
 'right-upload'               => 'Memuat berkas',
 'right-reupload'             => 'Menimpa berkas yang sudah ada',
@@ -1222,9 +1331,46 @@ Perlu diingat bahwa indeks Google untuk konten {{SITENAME}} mungkin belum mencak
 'rightslogentry' => 'mengganti keanggotaan kelompok untuk $1 dari $2 menjadi $3',
 'rightsnone'     => '(tidak ada)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'membaca halaman ini',
+'action-edit'                 => 'menyunting halaman ini',
+'action-createpage'           => 'membuat halaman baru',
+'action-createtalk'           => 'membuat halaman pembicaraan baru',
+'action-createaccount'        => 'membuat akun pengguna ini',
+'action-minoredit'            => 'menandai sebagai suntingan kecil',
+'action-move'                 => 'memindahkan halaman ini',
+'action-move-subpages'        => 'memindahkan halaman ini, dan semua sub-halamannya',
+'action-move-rootuserpages'   => 'memindahkan halaman utama pengguna',
+'action-movefile'             => 'pindahkan berkas ini',
+'action-upload'               => 'memuatkan berkas ini',
+'action-reupload'             => 'menimpa berkas yang telah ada',
+'action-reupload-shared'      => 'menimpa berkas yang telah ada di tempat penyimpanan berkas bersama',
+'action-upload_by_url'        => 'memuatkan berkas ini dari sebuah alamat URL',
+'action-writeapi'             => 'menggunakan API penulisan',
+'action-delete'               => 'menghapus halaman ini',
+'action-deleterevision'       => 'menghapus revisi ini',
+'action-deletedhistory'       => 'melihat versi terdahulu halaman yang telah dihapus ini',
+'action-browsearchive'        => 'mencari halaman-halaman yang telah dihapus',
+'action-undelete'             => 'membatalkan penghapusan halaman ini',
+'action-suppressrevision'     => 'meninjau dan mengembalikan revisi yang disembunyikan ini',
+'action-suppressionlog'       => 'melihat log privat ini',
+'action-block'                => 'memblokir pengguna ini dari menyunting',
+'action-protect'              => 'mengganti tingkat perlindungan halaman ini',
+'action-import'               => 'mengimpor halaman ini dari wiki lain',
+'action-importupload'         => 'mengimpor halaman ini dari pemuatan berkas',
+'action-patrol'               => 'menandai suntingan pengguna lain sebagai terpatroli',
+'action-autopatrol'           => 'menandai suntingan Anda sendiri sebagai terpatroli',
+'action-unwatchedpages'       => 'melihat daftar halaman yang tidak dipantau',
+'action-trackback'            => 'mengirimkan penjejak balik',
+'action-mergehistory'         => 'menggabungkan revisi-revisi terdahulu halaman ini',
+'action-userrights'           => 'menyunting semua hak pengguna',
+'action-userrights-interwiki' => 'menyunting hak akses dari pengguna di wiki lain',
+'action-siteadmin'            => 'mengunci atau membuka kunci basis data',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|perubahan|perubahan}}',
 'recentchanges'                     => 'Perubahan terbaru',
+'recentchanges-legend'              => 'Opsi perubahan terbaru',
 'recentchangestext'                 => "Temukan perubahan terbaru dalam wiki di halaman ini. Keterangan: (beda) = perubahan, (versi) = sejarah revisi, '''B''' = halaman baru, '''k''' = suntingan kecil, '''b''' = suntingan bot, (± ''bita'') = jumlah penambahan/pengurangan isi, → = suntingan bagian, � = ringkasan otomatis.
 ----",
 'recentchanges-feed-description'    => 'Temukan perubahan terbaru dalam wiki di umpan ini.',
@@ -1249,6 +1395,8 @@ Perlu diingat bahwa indeks Google untuk konten {{SITENAME}} mungkin belum mencak
 'rc_categories'                     => 'Batasi sampai kategori (dipisah dengan "|")',
 'rc_categories_any'                 => 'Apapun',
 'newsectionsummary'                 => '/* $1 */ bagian baru',
+'rc-enhanced-expand'                => 'Tampilkan rincian (memerlukan JavaScript)',
+'rc-enhanced-hide'                  => 'Sembunyikan rincian',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Perubahan terkait',
@@ -1269,11 +1417,11 @@ Perlu diingat bahwa indeks Google untuk konten {{SITENAME}} mungkin belum mencak
 'upload_directory_read_only'  => 'Direktori pemuatan ($1) tidak dapat ditulis oleh server web.',
 'uploaderror'                 => 'Kesalahan pemuatan',
 'uploadtext'                  => "Gunakan formulir di bawah untuk memuat berkas.
-Untuk menampilkan atau mencari berkas-berkas yang sebelumnya dimuatkan, gunakan [[Special:ImageList|daftar pemuatan berkas]]. Pemuatan dan pemuatan kembali juga dicatat dalam [[Special:Log/upload|log pemuatan]]. Penghapusan berkas dicatat dalam [[Special:Log/delete|log penghapusan]].
+Untuk menampilkan atau mencari berkas-berkas yang sebelumnya dimuatkan, gunakan [[Special:FileList|daftar pemuatan berkas]]. Pemuatan dan pemuatan kembali juga dicatat dalam [[Special:Log/upload|log pemuatan]]. Penghapusan berkas dicatat dalam [[Special:Log/delete|log penghapusan]].
 
 Untuk menampilkan atau menyertakan berkas/gambar pada suatu halaman, gunakan pranala dengan salah satu format di bawah ini:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Berkas.jpg]]</nowiki></tt>''' untuk menampilkan berkas dalam ukuran aslinya
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Berkas.png|200px|thumb|left|teks alternatif]]</nowiki></tt>''' untuk menampilkan berkas dengan lebar 200px dalam sebuah kotak di kiri artikel dengan 'teks alternatif' sebagai keterangan gambar
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Berkas.jpg]]</nowiki></tt>''' untuk menampilkan berkas dalam ukuran aslinya
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Berkas.png|200px|thumb|left|teks alternatif]]</nowiki></tt>''' untuk menampilkan berkas dengan lebar 200px dalam sebuah kotak di kiri artikel dengan 'teks alternatif' sebagai keterangan gambar
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Berkas.ogg]]</nowiki></tt>''' sebagai pranala langsung ke berkas yang dimaksud tanpa menampilkan berkas tersebut melalui wiki",
 'upload-permitted'            => 'Jenis berkas yang diijinkan: $1.',
 'upload-preferred'            => 'Jenis berkas yang disarankan: $1.',
@@ -1293,6 +1441,7 @@ Untuk menampilkan atau menyertakan berkas/gambar pada suatu halaman, gunakan pra
 'illegalfilename'             => 'Nama berkas "$1" mengandung aksara yang tidak diperbolehkan ada dalam judul halaman. Silakan ubah nama berkas tersebut dan cobalah memuatkannya kembali.',
 'badfilename'                 => 'Nama berkas telah diubah menjadi "$1".',
 'filetype-badmime'            => 'Berkas dengan tipe MIME "$1" tidak diperkenankan untuk dimuat.',
+'filetype-bad-ie-mime'        => 'Tidak dapat memuat berkas ini karena Internet Explorer mendeteksinya sebagai "$1", yang tak diizinkan dan merupakan tipe berkas yang memiliki potensi bahaya.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' termasuk jenis berkas yang tidak diijinkan.
 {{PLURAL:\$3|Jenis berkas yang disarankan adalah|Jenis berkas yang disarankan adalah}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' termasuk dalam jenis berkas yang tidak diijinkan.
@@ -1301,24 +1450,25 @@ Untuk menampilkan atau menyertakan berkas/gambar pada suatu halaman, gunakan pra
 'large-file'                  => 'Ukuran berkas disarankan untuk tidak melebihi $1 bita; berkas ini berukuran $2 bita.',
 'largefileserver'             => 'Berkas ini lebih besar dari pada yang diizinkan server.',
 'emptyfile'                   => 'Berkas yang Anda muatkan kelihatannya kosong. Hal ini mungkin disebabkan karena adanya kesalahan ketik pada nama berkas. Silakan pastikan apakah Anda benar-benar ingin memuatkan berkas ini.',
-'fileexists'                  => 'Suatu berkas dengan nama tersebut telah ada, harap periksa <strong><tt>$1</tt></strong> jika Anda tidak yakin untuk mengubahnya.',
-'filepageexists'              => 'Halaman deskripsi untuk berkas ini telah dibuat di <strong><tt>$1</tt></strong>, tapi saat ini tak ditemukan berkas dengan nama tersebut. Ringkasan yang Anda masukkan tidak akan tampil pada halaman deskripsi. Untuk memunculkannya, Anda perlu untuk menyuntingnya secara manual',
-'fileexists-extension'        => 'Berkas dengan nama serupa telah ada:<br />
-Nama berkas yang akan dimuat: <strong><tt>$1</tt></strong><br />
-Nama berkas yang telah ada: <strong><tt>$2</tt></strong><br />
-Satu-satunya perbedaan adalah pada kapitalisasi ekstensi. Harap cek apakah berkas tersebut sama.',
+'fileexists'                  => "Suatu berkas dengan nama tersebut telah ada, harap periksa '''<tt>$1</tt>''' jika Anda tidak yakin untuk mengubahnya.",
+'filepageexists'              => "Halaman deskripsi untuk berkas ini telah dibuat di '''<tt>$1</tt>''', tapi saat ini tak ditemukan berkas dengan nama tersebut. Ringkasan yang Anda masukkan tidak akan tampil pada halaman deskripsi. Untuk memunculkannya, Anda perlu untuk menyuntingnya secara manual",
+'fileexists-extension'        => "Berkas dengan nama serupa telah ada:<br />
+Nama berkas yang akan dimuat: '''<tt>$1</tt>'''<br />
+Nama berkas yang telah ada: '''<tt>$2</tt>'''<br />
+Satu-satunya perbedaan adalah pada kapitalisasi ekstensi. Harap cek apakah berkas tersebut sama.",
 'fileexists-thumb'            => "<center>'''Berkas yang tersedia'''</center>",
-'fileexists-thumbnail-yes'    => 'Berkas ini tampaknya merupakan gambar yang ukurannya diperkecil <i>(miniatur)</i>.
-Harap periksa berkas <strong><tt>$1</tt></strong> tersebut.<br />
-Jika berkas tersebut memang merupakan gambar dalam ukuran aslinya, Anda tidak perlu untuk memuat kembali miniatur lainnya.',
-'file-thumbnail-no'           => 'Nama berkas dimulai dengan <strong><tt>$1</tt></strong>.
-Tampaknya berkas ini merupakan gambar dengan ukuran diperkecil <i>(miniatur)</i>.
-Jika Anda memiliki versi resolusi penuh dari gambar ini, harap muatkan berkas tersebut. Jika tidak, harap ubah nama berkas ini.',
-'fileexists-forbidden'        => 'Ditemukan berkas dengan nama yang sama;
-harap kembali dan muatkan berkas dengan nama lain. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Berkas ini tampaknya merupakan gambar yang ukurannya diperkecil ''(miniatur)''.
+Harap periksa berkas '''<tt>$1</tt>''' tersebut.<br />
+Jika berkas tersebut memang merupakan gambar dalam ukuran aslinya, Anda tidak perlu untuk memuat kembali miniatur lainnya.",
+'file-thumbnail-no'           => "Nama berkas dimulai dengan '''<tt>$1</tt>'''.
+Tampaknya berkas ini merupakan gambar dengan ukuran diperkecil ''(miniatur)''.
+Jika Anda memiliki versi resolusi penuh dari gambar ini, harap muatkan berkas tersebut. Jika tidak, harap ubah nama berkas ini.",
+'fileexists-forbidden'        => 'Suatu berkas dengan nama ini telah ada dan tak dapat ditimpa.
+Jika Anda masih ingin memuat berkas Anda, silakan kembali dan gunakan nama baru. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Ditemukan berkas lain dengan nama yang sama di repositori bersama.
-Jika Anda tetap ingin memuatkan berkas Anda, harap kembali dan gunakan nama lain. [[Image:$1|thumb|center|$1]]',
+Jika Anda tetap ingin memuatkan berkas Anda, harap kembali dan gunakan nama lain. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Berkas ini berduplikasi dengan {{PLURAL:$1|berkas|berkas-berkas}} berikut:',
+'file-deleted-duplicate'      => 'Sebuah berkas yang identik dengan berkas ini ([[$1]]) sudah pernah dihapuskan sebelumnya. Anda harus memeriksa sejarah penghapusan berkas tersebut sebelum melanjutkan memuat ulang berkas ini.',
 'successfulupload'            => 'Berhasil dimuat',
 'uploadwarning'               => 'Peringatan pemuatan',
 'savefile'                    => 'Simpan berkas',
@@ -1338,7 +1488,7 @@ Jika Anda tetap ingin memuatkan berkas Anda, harap kembali dan gunakan nama lain
 
 Anda harus mempertimbangkan apakah perlu untuk melanjutkan pemuatan berkas ini.
 Log penghapusan berkas adalah sebagai berikut:",
-'filename-bad-prefix'         => 'Nama berkas yang Anda muat diawali dengan <strong>"$1"</strong>, yang merupakan nama non-deskriptif yang biasanya diberikan secara otomatis oleh kamera digital. Harap pilih nama lain yang lebih deskriptif untuk berkas Anda.',
+'filename-bad-prefix'         => "Nama berkas yang Anda muat diawali dengan '''\"\$1\"''', yang merupakan nama non-deskriptif yang biasanya diberikan secara otomatis oleh kamera digital. Harap pilih nama lain yang lebih deskriptif untuk berkas Anda.",
 
 'upload-proto-error'      => 'Protokol tak tepat',
 'upload-proto-error-text' => 'Pemuatan jarak jauh membutuhkan URL yang diawali dengan <code>http://</code> atau <code>ftp://</code>.',
@@ -1359,20 +1509,21 @@ Log penghapusan berkas adalah sebagai berikut:",
 'upload_source_url'  => ' (suatu URL valid yang dapat diakses publik)',
 'upload_source_file' => ' (suatu berkas di komputer Anda)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Halaman istimewa ini menampilkan semua berkas yang telah dimuat.
+# Special:ListFiles
+'listfiles-summary'     => 'Halaman istimewa ini menampilkan semua berkas yang telah dimuat.
 Secara baku, berkas yang terakhir dimuat berada pada urutan teratas.
 Klik pada kepala kolom untuk mengubah urutan.',
-'imagelist_search_for'  => 'Cari nama berkas:',
+'listfiles_search_for'  => 'Cari nama berkas:',
 'imgfile'               => 'berkas',
-'imagelist'             => 'Daftar berkas',
-'imagelist_date'        => 'Tanggal',
-'imagelist_name'        => 'Nama',
-'imagelist_user'        => 'Pengguna',
-'imagelist_size'        => 'Besar',
-'imagelist_description' => 'Deskripsi',
-
-# Image description page
+'listfiles'             => 'Daftar berkas',
+'listfiles_date'        => 'Tanggal',
+'listfiles_name'        => 'Nama',
+'listfiles_user'        => 'Pengguna',
+'listfiles_size'        => 'Besar',
+'listfiles_description' => 'Deskripsi',
+'listfiles_count'       => 'Versi',
+
+# File description page
 'filehist'                       => 'Riwayat berkas',
 'filehist-help'                  => 'Klik pada tanggal/waktu untuk melihat berkas ini pada saat tersebut.',
 'filehist-deleteall'             => 'hapus semua',
@@ -1380,19 +1531,25 @@ Klik pada kepala kolom untuk mengubah urutan.',
 'filehist-revert'                => 'kembalikan',
 'filehist-current'               => 'saat ini',
 'filehist-datetime'              => 'Tanggal/Waktu',
+'filehist-thumb'                 => 'Miniatur',
+'filehist-thumbtext'             => 'Miniatur untuk versi per $1',
+'filehist-nothumb'               => 'Miniatur tidak tersedia',
 'filehist-user'                  => 'Pengguna',
 'filehist-dimensions'            => 'Dimensi',
 'filehist-filesize'              => 'Besar berkas',
 'filehist-comment'               => 'Komentar',
-'imagelinks'                     => 'Pranala',
+'imagelinks'                     => 'Pranala berkas',
 'linkstoimage'                   => 'Halaman berikut memiliki {{PLURAL:$1|pranala|$1 pranala}} ke berkas ini:',
+'linkstoimage-more'              => 'Lebih dari $1 {{PLURAL:$1|halaman|halaman}} memiliki pranala ke berkas ini.
+Daftar berikut menampilkan {{PLURAL:$1|halaman dengan pranala langsung|$1 halaman dengan pranala langsung}} ke berkas ini.
+Juga tersedia [[Special:WhatLinksHere/$2|daftar selengkapnya]].',
 'nolinkstoimage'                 => 'Tidak ada halaman yang memiliki pranala ke berkas ini.',
 'morelinkstoimage'               => 'Lihat [[Special:WhatLinksHere/$1|pranala lainnya]] ke berkas ini.',
 'redirectstofile'                => 'Berkas berikut {{PLURAL:$1|dialihkan|$1 dialihkan}} ke berkas ini:',
-'duplicatesoffile'               => 'Berkas berikut {{PLURAL:$1|merupakan duplikat|$1 merupakan duplikat}} dari berkas ini:',
+'duplicatesoffile'               => 'Sejumlah {{PLURAL:$1|satu berkas|$1 berkas}} berikut merupakan duplikat dari berkas ini ([[Special:FileDuplicateSearch/$2|detil lebih lanjut]]):',
 'sharedupload'                   => 'Berkas ini adalah pemuatan bersama yang mungkin juga dipakai oleh proyek lain.',
 'shareduploadwiki'               => 'Lihat $1 untuk informasi lebih lanjut.',
-'shareduploadwiki-desc'          => 'Deskripsi pada $1 ditampilkan di bawah.',
+'shareduploadwiki-desc'          => 'Deskripsi pada $1 ditampilkan di bawah ini.',
 'shareduploadwiki-linktext'      => 'halaman deskripsi berkas',
 'shareduploadduplicate'          => 'Berkas ini berduplikasi dengan $1 dari tempat penyimpanan bersama.',
 'shareduploadduplicate-linktext' => 'berkas lain',
@@ -1416,7 +1573,7 @@ Klik pada kepala kolom untuk mengubah urutan.',
 # File deletion
 'filedelete'                  => 'Menghapus $1',
 'filedelete-legend'           => 'Menghapus berkas',
-'filedelete-intro'            => "Anda menghapus '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Anda akan menghapus berkas '''[[Media:$1|$1]]''' berikut semua riwayatnya.",
 'filedelete-intro-old'        => '<span class="plainlinks">Anda menghapus versi \'\'\'[[Media:$1|$1]]\'\'\' hingga [$4 $3, $2].</span>',
 'filedelete-comment'          => 'Komentar:',
 'filedelete-submit'           => 'Hapus',
@@ -1424,7 +1581,6 @@ Klik pada kepala kolom untuk mengubah urutan.',
 'filedelete-success-old'      => "Berkas '''[[Media:$1|$1]]''' versi $3, $2 telah dihapus.",
 'filedelete-nofile'           => "'''$1''' tak ditemukan.",
 'filedelete-nofile-old'       => "Tak ditemukan arsip versi dari '''$1''' dengan atribut yang diberikan.",
-'filedelete-iscurrent'        => 'Anda mencoba menghapus versi terakhir berkas ini. Harap kembalikan dulu ke versi lama.',
 'filedelete-otherreason'      => 'Alasan lain:',
 'filedelete-reason-otherlist' => 'Alasan lain',
 'filedelete-reason-dropdown'  => '*Alasan penghapusan
@@ -1452,23 +1608,31 @@ Cek dahulu pranala lain ke templat tersebut sebelum menghapusnya.',
 
 # Random page
 'randompage'         => 'Halaman sembarang',
-'randompage-nopages' => 'Tak terdapat halaman pada ruang nama ini.',
+'randompage-nopages' => 'Tak terdapat halaman pada ruang nama "$1".',
 
 # Random redirect
 'randomredirect'         => 'Pengalihan sembarang',
-'randomredirect-nopages' => 'Tak terdapat pengalihan pada ruang nama ini.',
+'randomredirect-nopages' => 'Tak terdapat pengalihan pada ruang nama "$1".',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Statistik situs',
-'userstats'              => 'Statistik pengguna',
-'sitestatstext'          => "{{SITENAME}} saat ini memiliki '''$2''' {{PLURAL:$1|halaman|halaman}} yang termasuk artikel yang sah. Jumlah tersebut tidak memperhitungkan halaman pembicaraan, halaman tentang {{SITENAME}}, halaman rintisan minimum, halaman peralihan, dan halaman-halaman lain yang tidak masuk dalam kriteria artikel. Jika termasuk halaman-halaman ini, terdapat total '''$1''' halaman dalam basis data.
-
-Telah terjadi sejumlah '''$3''' penampilan halaman dan '''$4''' penyuntingan sejak {{SITENAME}} dimulai. Ini berarti rata-rata '''$5''' suntingan per halaman, dan '''$6''' penampilan per penyuntingan.
-
-Telah dimuat sejumlah '''$8''' berkas dan sedang terjadi '''$7''' [http://www.mediawiki.org/wiki/Manual:Job_queue antrian pekerjaan].",
-'userstatstext'          => "Terdapat {{PLURAL:$1|'''1''' [[Special:ListUsers|pengguna terdaftar]]|'''$1''' [[Special:ListUsers|pengguna terdaftar]]}}, dengan '''$2''' (atau '''$4%''') di antaranya memiliki hak akses $5.",
-'statistics-mostpopular' => 'Halaman yang paling banyak ditampilkan',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Statistik halaman',
+'statistics-header-edits'      => 'Statistik penyuntingan',
+'statistics-header-views'      => 'Statistik penampilan',
+'statistics-header-users'      => 'Statistik pengguna',
+'statistics-articles'          => 'Halaman konten',
+'statistics-pages'             => 'Jumlah halaman',
+'statistics-pages-desc'        => 'Semua halaman di wiki ini, termasuk halaman pembicaraan, pengalihan, dan lain-lain.',
+'statistics-files'             => 'Berkas yang dimuatkan',
+'statistics-edits'             => 'Jumlah suntingan sejak {{SITENAME}} dimulai',
+'statistics-edits-average'     => 'Rata-rata suntingan per halaman',
+'statistics-views-total'       => 'Jumlah penampilan halaman',
+'statistics-views-peredit'     => 'Jumlah penampilan per suntingan',
+'statistics-jobqueue'          => 'Jumlah [http://www.mediawiki.org/wiki/Manual:Job_queue antrian pekerjaan]',
+'statistics-users'             => 'Jumlah [[Special:ListUsers|pengguna terdaftar]]',
+'statistics-users-active'      => 'Jumlah pengguna aktif',
+'statistics-users-active-desc' => 'Pengguna yang telah melakukan suatu aktivitas dalam {{PLURAL:$1|sehari|$1 hari}} terakhir.',
+'statistics-mostpopular'       => 'Halaman yang paling banyak ditampilkan',
 
 'disambiguations'      => 'Halaman disambiguasi',
 'disambiguationspage'  => 'Template:Disambig',
@@ -1482,7 +1646,7 @@ Suatu halaman dianggap sebagai halaman disambiguasi apabila halaman tersebut men
 'double-redirect-fixer'      => 'Revisi pengalihan',
 
 'brokenredirects'        => 'Pengalihan rusak',
-'brokenredirectstext'    => 'Halaman-halaman berikut dialihkan ke halaman yang tidak ada.',
+'brokenredirectstext'    => 'Pengalihan-pengalihan berikut merujuk pada halaman yang tidak ada:',
 'brokenredirects-edit'   => '(sunting)',
 'brokenredirects-delete' => '(hapus)',
 
@@ -1512,26 +1676,30 @@ Suatu halaman dianggap sebagai halaman disambiguasi apabila halaman tersebut men
 'popularpages'            => 'Halaman populer',
 'wantedcategories'        => 'Kategori yang diinginkan',
 'wantedpages'             => 'Halaman yang diinginkan',
-'missingfiles'            => 'File-file hilang',
+'wantedfiles'             => 'Berkas yang diinginkan',
+'wantedtemplates'         => 'Templat yang diinginkan',
 'mostlinked'              => 'Halaman yang tersering dituju',
 'mostlinkedcategories'    => 'Kategori yang tersering digunakan',
 'mostlinkedtemplates'     => 'Templat yang tersering digunakan',
 'mostcategories'          => 'Artikel dengan kategori terbanyak',
 'mostimages'              => 'Berkas yang tersering digunakan',
 'mostrevisions'           => 'Artikel dengan perubahan terbanyak',
-'prefixindex'             => 'Daftar halaman dengan awalan',
+'prefixindex'             => 'Semua halaman dengan awalan',
 'shortpages'              => 'Halaman pendek',
 'longpages'               => 'Halaman panjang',
 'deadendpages'            => 'Halaman buntu',
 'deadendpagestext'        => 'Halaman-halaman berikut tidak memiliki pranala ke halaman manapun di wiki ini.',
 'protectedpages'          => 'Halaman yang dilindungi',
 'protectedpages-indef'    => 'Hanya untuk perlindungan dengan jangka waktu tak terbatas',
+'protectedpages-cascade'  => 'Hanya perlindungan runtun',
 'protectedpagestext'      => 'Halaman-halaman berikut dilindungi dari pemindahan atau penyuntingan.',
 'protectedpagesempty'     => 'Saat ini tidak ada halaman yang sedang dilindungi dengan parameter-parameter tersebut.',
 'protectedtitles'         => 'Judul yang dilindungi',
 'protectedtitlestext'     => 'Judul berikut ini dilindungi dari pembuatan',
 'protectedtitlesempty'    => 'Tidak ada judul yang dilindungi.',
 'listusers'               => 'Daftar pengguna',
+'listusers-editsonly'     => 'Tampilkan hanya pengguna yang memiliki kontribusi',
+'usereditcount'           => '$1 {{PLURAL:$1|suntingan|suntingan}}',
 'newpages'                => 'Halaman baru',
 'newpages-username'       => 'Nama pengguna:',
 'ancientpages'            => 'Artikel lama',
@@ -1552,14 +1720,13 @@ Suatu halaman dianggap sebagai halaman disambiguasi apabila halaman tersebut men
 'booksources-search-legend' => 'Cari di sumber buku',
 'booksources-go'            => 'Cari',
 'booksources-text'          => 'Di bawah ini adalah daftar pranala ke situs lain yang menjual buku baru dan bekas, dan mungkin juga mempunyai informasi lebih lanjut mengenai buku yang sedang Anda cari:',
+'booksources-invalid-isbn'  => 'ISBN yang diberikan tampaknya tidak valid; periksa kesalahan penyalinan dari sumber asli.',
 
 # Special:Log
 'specialloguserlabel'  => 'Pengguna:',
 'speciallogtitlelabel' => 'Judul:',
 'log'                  => 'Log',
 'all-logs-page'        => 'Semua log',
-'log-search-legend'    => 'Pencarian log',
-'log-search-submit'    => 'Cari',
 'alllogstext'          => 'Gabungan tampilan semua log yang tersedia di {{SITENAME}}.
 Anda dapat melakukan pembatasan tampilan dengan memilih jenis log, nama pengguna (sensitif kapital), atau judul halaman (juga sensitif kapital).',
 'logempty'             => 'Tidak ditemukan entri log yang sesuai.',
@@ -1571,6 +1738,7 @@ Anda dapat melakukan pembatasan tampilan dengan memilih jenis log, nama pengguna
 'nextpage'          => 'Halaman selanjutnya ($1)',
 'prevpage'          => 'Halaman sebelumnya ($1)',
 'allpagesfrom'      => 'Tampilkan halaman dimulai dari:',
+'allpagesto'        => 'Tampilkan halaman diakhiri pada:',
 'allarticles'       => 'Daftar artikel',
 'allinnamespace'    => 'Daftar halaman (ruang nama $1)',
 'allnotinnamespace' => 'Daftar halaman (bukan ruang nama $1)',
@@ -1590,40 +1758,67 @@ Lihat pula [[Special:WantedCategories|daftar kategori yang dibutuhkan]].',
 'special-categories-sort-count' => 'urutkan menurut jumlah',
 'special-categories-sort-abc'   => 'urutkan menurut abjad',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Kontribusi yang dihapus',
+
+# Special:LinkSearch
+'linksearch'       => 'Pranala luar',
+'linksearch-pat'   => 'Pola pencarian:',
+'linksearch-ns'    => 'Ruang nama:',
+'linksearch-ok'    => 'Cari',
+'linksearch-text'  => "Bentuk pencarian ''wildcards'' seperti \"*.wikipedia.org\" dapat digunakan.<br />Protokol yang didukung: <tt>\$1</tt>",
+'linksearch-line'  => '$1 memiliki pranala dari $2',
+'linksearch-error' => "''Wildcards'' hanya dapat digunakan di bagian awal dari nama host.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Tampilkan pengguna diawali dengan:',
 'listusers-submit'   => 'Tampilkan',
 'listusers-noresult' => 'Pengguna tidak ditemukan.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Log pengguna baru',
+'newuserlogpagetext'          => 'Di bawah ini adalah log pendaftaran pengguna baru',
+'newuserlog-byemail'          => 'kata sandi dikirim melalui surat-e',
+'newuserlog-create-entry'     => 'mendaftar sebagai pengguna',
+'newuserlog-create2-entry'    => 'membuat akun baru $1',
+'newuserlog-autocreate-entry' => 'akun pengguna dibuat secara otomatis',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Hak-hak grup pengguna',
-'listgrouprights-summary'  => 'Berikut adalah daftar kelompok pengguna yang terdapat di wiki ini, dengan daftar hak akses mereka masing-masing. Informasi lebih lanjut mengenai hak masing-masing dapat ditemukan di [[{{MediaWiki:Listgrouprights-helppage}}|halaman bantuan hak pengguna]].',
-'listgrouprights-group'    => 'Kelompok',
-'listgrouprights-rights'   => 'Hak',
-'listgrouprights-helppage' => 'Help:Hak kelompok',
-'listgrouprights-members'  => '(daftar anggota)',
+'listgrouprights'                 => 'Hak-hak grup pengguna',
+'listgrouprights-summary'         => 'Berikut adalah daftar kelompok pengguna yang terdapat di wiki ini, dengan daftar hak akses mereka masing-masing. Informasi lebih lanjut mengenai hak masing-masing dapat ditemukan di [[{{MediaWiki:Listgrouprights-helppage}}|halaman bantuan hak pengguna]].',
+'listgrouprights-group'           => 'Kelompok',
+'listgrouprights-rights'          => 'Hak',
+'listgrouprights-helppage'        => 'Help:Hak kelompok',
+'listgrouprights-members'         => '(daftar anggota)',
+'listgrouprights-addgroup'        => 'Dapat menambahkan {{PLURAL:$2|kelompok|kelompok}}: $1',
+'listgrouprights-removegroup'     => 'Dapat menghapus {{PLURAL:$2|kelompok|kelompok}}: $1',
+'listgrouprights-addgroup-all'    => 'Dapat menambahkan semua kelompok',
+'listgrouprights-removegroup-all' => 'Dapat mencabut semua kelompok',
 
 # E-mail user
-'mailnologin'     => 'Tidak ada alamat surat-e',
-'mailnologintext' => 'Anda harus [[Special:UserLogin|masuk log]] dan mempunyai alamat surat-e yang sah di dalam [[Special:Preferences|preferensi]] untuk mengirimkan surat-e kepada pengguna lain.',
-'emailuser'       => 'Surat-e pengguna',
-'emailpage'       => 'Kirimi pengguna ini surat-e',
-'emailpagetext'   => 'Anda dapat menggunakan formulir di bawah ini untuk mengirimkan pesan surat-e ke pengguna ini.
+'mailnologin'      => 'Tidak ada alamat surat-e',
+'mailnologintext'  => 'Anda harus [[Special:UserLogin|masuk log]] dan mempunyai alamat surat-e yang sah di dalam [[Special:Preferences|preferensi]] untuk mengirimkan surat-e kepada pengguna lain.',
+'emailuser'        => 'Surat-e pengguna',
+'emailpage'        => 'Kirimi pengguna ini surat-e',
+'emailpagetext'    => 'Anda dapat menggunakan formulir di bawah ini untuk mengirimkan pesan surat-e ke pengguna ini.
 Alamat surat-e yang Anda masukkan di [[Special:Preferences|preferensi akun Anda]] akan muncul sebagai alamat "Dari" dalam surat-e tersebut, sehingga penerima dapat membalasa surat-e langsung kepada Anda.',
-'usermailererror' => 'Kesalahan objek surat:',
-'defemailsubject' => 'Surat-e {{SITENAME}}',
-'noemailtitle'    => 'Tidak ada alamat surat-e',
-'noemailtext'     => 'Pengguna ini tidak memasukkan alamat surat-e yang sah, atau memilih untuk tidak menerima surat-e dari pengguna yang lain.',
-'emailfrom'       => 'Dari:',
-'emailto'         => 'Untuk:',
-'emailsubject'    => 'Perihal:',
-'emailmessage'    => 'Pesan:',
-'emailsend'       => 'Kirim',
-'emailccme'       => 'Kirimi saya salinan pesan saya.',
-'emailccsubject'  => 'Salinan pesan Anda untuk $1: $2',
-'emailsent'       => 'Surat-e terkirim',
-'emailsenttext'   => 'Surat-e Anda telah dikirimkan.',
-'emailuserfooter' => 'Surat-e ini dikirimkan oleh $1 kepada $2 menggunakan fungsi "Suratepengguna" di {{SITENAME}}.',
+'usermailererror'  => 'Kesalahan objek surat:',
+'defemailsubject'  => 'Surat-e {{SITENAME}}',
+'noemailtitle'     => 'Tidak ada alamat surat-e',
+'noemailtext'      => 'Pengguna ini tidak memberikan suatu alamat surat-e yang valid.',
+'nowikiemailtitle' => 'Surat-e tak diizinkan',
+'nowikiemailtext'  => 'Pengguna ini telah memilih untuk tidak menerima surat-e dari pengguna lain.',
+'email-legend'     => 'Kirim surat-e ke pengguna {{SITENAME}} lainnya',
+'emailfrom'        => 'Dari:',
+'emailto'          => 'Untuk:',
+'emailsubject'     => 'Perihal:',
+'emailmessage'     => 'Pesan:',
+'emailsend'        => 'Kirim',
+'emailccme'        => 'Kirimi saya salinan pesan saya.',
+'emailccsubject'   => 'Salinan pesan Anda untuk $1: $2',
+'emailsent'        => 'Surat-e terkirim',
+'emailsenttext'    => 'Surat-e Anda telah dikirimkan.',
+'emailuserfooter'  => 'Surat-e ini dikirimkan oleh $1 kepada $2 menggunakan fungsi "Suratepengguna" di {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Daftar pantauan',
@@ -1654,12 +1849,7 @@ Perubahan-perubahan berikutnya pada halaman tersebut dan halaman pembicaraan ter
 'iteminvalidname'      => "Ada masalah dengan '$1', namanya tidak sah...",
 'wlnote'               => "Di bawah ini adalah $1 {{PLURAL:$1|perubahan|perubahan}} terakhir dalam '''$2''' jam terakhir.",
 'wlshowlast'           => 'Tampilkan $1 jam $2 hari $3 terakhir',
-'watchlist-show-bots'  => 'Tampilkan suntingan bot',
-'watchlist-hide-bots'  => 'Sembunyikan suntingan bot',
-'watchlist-show-own'   => 'Tampilkan suntingan saya',
-'watchlist-hide-own'   => 'Sembunyikan suntingan saya',
-'watchlist-show-minor' => 'Tampilkan suntingan kecil',
-'watchlist-hide-minor' => 'Sembunyikan suntingan kecil',
+'watchlist-options'    => 'Opsi daftar pantauan',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Memantau...',
@@ -1698,76 +1888,95 @@ Untuk mengubah preferensi daftar pantauan Anda, kunjungi
 Umpan balik dan bantuan lanjutan:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Hapus halaman',
-'confirm'                     => 'Konfirmasikan',
-'excontent'                   => "isi sebelumnya: '$1'",
-'excontentauthor'             => "isinya hanya berupa: '$1' (dan satu-satunya penyumbang adalah '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "isi sebelum dikosongkan: '$1'",
-'exblank'                     => 'halaman kosong',
-'delete-confirm'              => 'Hapus "$1"',
-'delete-legend'               => 'Hapus',
-'historywarning'              => 'Peringatan: Halaman yang ingin Anda hapus mempunyai sejarah:',
-'confirmdeletetext'           => 'Anda akan menghapus halaman atau berkas ini secara permanen berikut semua sejarahnya dari basis data. Pastikan bahwa Anda memang ingin melakukannya, mengetahui segala akibatnya, dan apa yang Anda lakukan ini adalah sejalan dengan [[{{MediaWiki:Policy-url}}|kebijakan {{SITENAME}}]].',
-'actioncomplete'              => 'Proses selesai',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" telah dihapus. Lihat $2 untuk log terkini halaman yang telah dihapus.',
-'deletedarticle'              => 'menghapus "[[$1]]"',
-'suppressedarticle'           => '"[[$1]]" disembunyikan',
-'dellogpage'                  => 'Log penghapusan',
-'dellogpagetext'              => 'Di bawah ini adalah log penghapusan halaman. Semua waktu yang ditunjukkan adalah waktu server.',
-'deletionlog'                 => 'log penghapusan',
-'reverted'                    => 'Dikembalikan ke revisi sebelumnya',
-'deletecomment'               => 'Alasan penghapusan',
-'deleteotherreason'           => 'Lainnya/alasan tambahan:',
-'deletereasonotherlist'       => 'Alasan lain',
-'deletereason-dropdown'       => '*Alasan penghapusan
+# Delete
+'deletepage'             => 'Hapus halaman',
+'confirm'                => 'Konfirmasikan',
+'excontent'              => "isi sebelumnya: '$1'",
+'excontentauthor'        => "isinya hanya berupa: '$1' (dan satu-satunya penyumbang adalah '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "isi sebelum dikosongkan: '$1'",
+'exblank'                => 'halaman kosong',
+'delete-confirm'         => 'Hapus "$1"',
+'delete-legend'          => 'Hapus',
+'historywarning'         => 'Peringatan: Halaman yang ingin Anda hapus mempunyai sejarah:',
+'confirmdeletetext'      => 'Anda akan menghapus halaman atau berkas ini secara permanen berikut semua sejarahnya dari basis data. Pastikan bahwa Anda memang ingin melakukannya, mengetahui segala akibatnya, dan apa yang Anda lakukan ini adalah sejalan dengan [[{{MediaWiki:Policy-url}}|kebijakan {{SITENAME}}]].',
+'actioncomplete'         => 'Proses selesai',
+'deletedtext'            => '"<nowiki>$1</nowiki>" telah dihapus. Lihat $2 untuk log terkini halaman yang telah dihapus.',
+'deletedarticle'         => 'menghapus "[[$1]]"',
+'suppressedarticle'      => '"[[$1]]" disembunyikan',
+'dellogpage'             => 'Log penghapusan',
+'dellogpagetext'         => 'Di bawah ini adalah log penghapusan halaman. Semua waktu yang ditunjukkan adalah waktu server.',
+'deletionlog'            => 'log penghapusan',
+'reverted'               => 'Dikembalikan ke revisi sebelumnya',
+'deletecomment'          => 'Alasan penghapusan',
+'deleteotherreason'      => 'Lainnya/alasan tambahan:',
+'deletereasonotherlist'  => 'Alasan lain',
+'deletereason-dropdown'  => '*Alasan penghapusan
 ** Permintaan pengguna
 ** Pelanggaran hak cipta
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Sunting alasan penghapusan',
-'delete-toobig'               => 'Halaman ini memiliki sejarah penyuntingan yang panjang, melebihi {{PLURAL:$1|revisi|revisi}}.
+'delete-edit-reasonlist' => 'Sunting alasan penghapusan',
+'delete-toobig'          => 'Halaman ini memiliki sejarah penyuntingan yang panjang, melebihi {{PLURAL:$1|revisi|revisi}}.
 Penghapusan halaman dengan sejarah penyuntingan yang panjang tidak diperbolehkan untuk mencegah kerusakan di {{SITENAME}}.',
-'delete-warning-toobig'       => 'Halaman ini memiliki sejarah penyuntingan yang panjang, melebihi {{PLURAL:$1|revisi|revisi}}.
+'delete-warning-toobig'  => 'Halaman ini memiliki sejarah penyuntingan yang panjang, melebihi {{PLURAL:$1|revisi|revisi}}.
 Menghapus halaman ini dapat menyebabkan masalah dalam operasional basis data {{SITENAME}}.',
-'rollback'                    => 'Kembalikan suntingan',
-'rollback_short'              => 'Kembalikan',
-'rollbacklink'                => 'kembalikan',
-'rollbackfailed'              => 'Pengembalian gagal dilakukan',
-'cantrollback'                => 'Tidak dapat mengembalikan suntingan; pengguna terakhir adalah satu-satunya penulis artikel ini.',
-'alreadyrolled'               => 'Tidak dapat melakukan pengembalian ke revisi terakhir [[:$1]] oleh [[User:$2|$2]] ([[User talk:$2|bicara]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+
+# Rollback
+'rollback'         => 'Kembalikan suntingan',
+'rollback_short'   => 'Kembalikan',
+'rollbacklink'     => 'kembalikan',
+'rollbackfailed'   => 'Pengembalian gagal dilakukan',
+'cantrollback'     => 'Tidak dapat mengembalikan suntingan; pengguna terakhir adalah satu-satunya penulis artikel ini.',
+'alreadyrolled'    => 'Tidak dapat melakukan pengembalian ke revisi terakhir [[:$1]] oleh [[User:$2|$2]] ([[User talk:$2|bicara]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 pengguna lain telah menyunting atau melakukan pengembalian terhadap revisi tersebut.
 
-Suntingan terakhir dilakukan oleh [[User:$3|$3]] ([[User talk:$3|bicara]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Komentar penyuntingan adalah: "<em>$1</em>".', # only shown if there is an edit comment
-'revertpage'                  => 'Suntingan [[Special:Contributions/$2|$2]] ([[User talk:$2|bicara]]) dikembalikan ke versi terakhir oleh [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Pengembalian suntingan oleh $1; dikembalikan ke versi terakhir oleh $2.',
-'sessionfailure'              => 'Sepertinya ada masalah dengan sesi log anda; log anda telah dibatalkan untuk mencegah pembajakan. Silahkan tekan tombol "back" dan muat kembali halaman sebelum anda masuk, lalu coba lagi.',
+Suntingan terakhir dilakukan oleh [[User:$3|$3]] ([[User talk:$3|bicara]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Komentar penyuntingan adalah: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Suntingan [[Special:Contributions/$2|$2]] ([[User talk:$2|bicara]]) dikembalikan ke versi terakhir oleh [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Pengembalian suntingan oleh $1; dikembalikan ke versi terakhir oleh $2.',
+'sessionfailure'   => 'Sepertinya ada masalah dengan sesi log anda; log anda telah dibatalkan untuk mencegah pembajakan. Silahkan tekan tombol "back" dan muat kembali halaman sebelum anda masuk, lalu coba lagi.',
+
+# Protect
 'protectlogpage'              => 'Log perlindungan',
 'protectlogtext'              => 'Di bawah ini adalah log perlindungan halaman dan pembatalannya.
 Lihat [[Special:ProtectedPages|daftar halaman yang dilindungi]] untuk daftar terkini.',
 'protectedarticle'            => 'melindungi "[[$1]]"',
 'modifiedarticleprotection'   => 'mengubah tingkat perlindungan "[[$1]]"',
 'unprotectedarticle'          => 'menghilangkan perlindungan "[[$1]]"',
+'movedarticleprotection'      => 'memindahkan pengaturan proteksi dari "[[$2]]" ke "[[$1]]"',
 'protect-title'               => 'Melindungi "$1"',
+'prot_1movedto2'              => '[[$1]] dipindahkan ke [[$2]]',
 'protect-legend'              => 'Konfirmasi perlindungan',
 'protectcomment'              => 'Komentar:',
 'protectexpiry'               => 'Kadaluwarsa:',
 'protect_expiry_invalid'      => 'Waktu kadaluwarsa tidak sah.',
 'protect_expiry_old'          => 'Waktu kadaluwarsa adalah pada masa lampau.',
 'protect-unchain'             => 'Buka perlindungan pemindahan',
-'protect-text'                => 'Anda dapat melihat atau mengganti tingkatan perlindungan untuk halaman <strong><nowiki>$1</nowiki></strong> di sini.',
-'protect-locked-blocked'      => 'Anda tak dapat mengganti tingkat perlindungan selagi diblokir. Berikut adalah konfigurasi saat ini untuk halaman <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Tingkat perlindungan tak dapat diganti karena aktifnya penguncian basis data. Berikut adalah konfigurasi saat ini untuk halaman <strong>$1</strong>:',
-'protect-locked-access'       => 'Akun Anda tidak dapat memiliki hak untuk mengganti tingkat perlindungan halaman. Berikut adalah konfigurasi saat ini untuk halaman <strong>$1</strong>:',
+'protect-text'                => "Anda dapat melihat atau mengganti tingkatan perlindungan untuk halaman '''<nowiki>$1</nowiki>''' di sini.",
+'protect-locked-blocked'      => "Anda tak dapat mengganti tingkat perlindungan selagi diblokir. Berikut adalah konfigurasi saat ini untuk halaman '''$1''':",
+'protect-locked-dblock'       => "Tingkat perlindungan tak dapat diganti karena aktifnya penguncian basis data. Berikut adalah konfigurasi saat ini untuk halaman '''$1''':",
+'protect-locked-access'       => "Akun Anda tidak dapat memiliki hak untuk mengganti tingkat perlindungan halaman. Berikut adalah konfigurasi saat ini untuk halaman '''$1''':",
 'protect-cascadeon'           => 'Halaman ini sedang dilindungi karena disertakan dalam {{PLURAL:$1|halaman|halaman-halaman}} berikut yang telah dilindungi dengan pilihan perlindungan runtun diaktifkan. Anda dapat mengganti tingkat perlindungan untuk halaman ini, tapi hal tersebut tidak akan mempengaruhi perlindungan runtun.',
-'protect-default'             => '(baku)',
+'protect-default'             => 'Ijinkan semua pengguna',
 'protect-fallback'            => 'Memerlukan hak akses "$1"',
-'protect-level-autoconfirmed' => 'Hanya pengguna terdaftar',
+'protect-level-autoconfirmed' => 'Blokir pengguna baru dan tak terdaftar',
 'protect-level-sysop'         => 'Hanya pengurus',
 'protect-summary-cascade'     => 'runtun',
 'protect-expiring'            => 'kadaluwarsa $1 (UTC)',
+'protect-expiry-indefinite'   => 'selamanya',
 'protect-cascade'             => 'Lindungi semua halaman yang termasuk dalam halaman ini (perlindungan runtun)',
 'protect-cantedit'            => 'Anda tidak dapat mengubah tingkatan perlindungan halaman ini karena Anda tidak memiliki hak untuk itu.',
+'protect-othertime'           => 'Waktu lain:',
+'protect-othertime-op'        => 'waktu lain',
+'protect-existing-expiry'     => 'Waktu kadaluwarsa saat ini: $3, $2',
+'protect-otherreason'         => 'Alasan lain/tambahan:',
+'protect-otherreason-op'      => 'alasan lain/tambahan',
+'protect-dropdown'            => '*Alasan umum perlindungan
+** Vandalisme berulang
+** Spam berulang
+** Perang suntingan
+** Halaman dengan lalu-lintas tinggi',
+'protect-edit-reasonlist'     => 'Sunting alasan perlindungan',
+'protect-expiry-options'      => '1 jam:1 hour,1 hari:1 day,1 minggu:1 week,2 minggu:2 weeks,1 bulan:1 month,3 bulan:3 months,6 bulan:6 months,1 tahun:1 year,selamanya:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Perlindungan:',
 'restriction-level'           => 'Tingkatan:',
 'minimum-size'                => 'Ukuran minimum',
@@ -1790,7 +1999,7 @@ Lihat [[Special:ProtectedPages|daftar halaman yang dilindungi]] untuk daftar ter
 'undeletepage'                 => 'Pembatalan penghapusan',
 'undeletepagetitle'            => "'''Berikut daftar revisi yang dihapus dari [[:$1]]'''.",
 'viewdeletedpage'              => 'Lihat halaman yang telah dihapus',
-'undeletepagetext'             => 'Halaman-halaman berikut ini telah dihapus tapi masih ada di dalam arsip dan dapat dikembalikan. Arsip tersebut mungkin akan dibersihkan secara berkala.',
+'undeletepagetext'             => '{{PLURAL:$1|Halaman berikut|Sejumlah $1 halaman}} telah dihapus tapi masih ada di dalam arsip dan dapat dikembalikan. Arsip tersebut mungkin akan dibersihkan secara berkala.',
 'undelete-fieldset-title'      => 'Mengembalikan revisi',
 'undeleteextrahelp'            => "Untuk mengembalikan seluruh revisi-revisi terdahulu halaman, biarkan seluruh kotak cek tidak terpilih dan klik '''''Kembalikan'''''.
 Untuk melakukan pengembalian selektif, cek kotak revisi yang diinginkan dan klik '''''Kembalikan'''''.
@@ -1800,12 +2009,13 @@ Menekan tombol '''''Reset''''' akan mengosongkan isian komentar dan semua kotak
 Jika sebuah halaman baru dengan nama yang sama telah dibuat sejak penghapusan, revisi-revisi yang dikembalikan tersebut akan ditampilkan dalam daftar versi terdahulu.',
 'undeleterevdel'               => 'Pembatalan penghapusan tidak akan dilakukan jika hal tersebut akan mengakibatkan revisi terkini halaman terhapus sebagian. Pada kondisi tersebut, Anda harus menghilangkan cek atau menghilangkan penyembunyian revisi yang dihapus terakhir. Revisi berkas yang tidak dapat Anda lihat tidak akan dipulihkan.',
 'undeletehistorynoadmin'       => 'Artikel ini telah dihapus. Alasan penghapusan diberikan pada ringkasan di bawah ini, berikut detil pengguna yang telah melakukan penyuntingan pada halaman ini sebelum dihapus. Isi terakhir dari revisi yang telah dihapus ini hanya tersedia untuk pengurus.',
-'undelete-revision'            => 'Revisi yang telah dihapus dari $1 (sampai $2) oleh $3:',
+'undelete-revision'            => 'Revisi yang telah dihapus dari $1 (pada $5, $4) oleh $3:',
 'undeleterevision-missing'     => 'Revisi salah atau tak ditemukan. Anda mungkin mengikuti pranala yang salah, atau revisi tersebut telah dipulihkan atau dibuang dari arsip.',
 'undelete-nodiff'              => 'Tidak ada revisi yang lebih lama.',
 'undeletebtn'                  => 'Kembalikan!',
 'undeletelink'                 => 'kembalikan',
 'undeletereset'                => 'Reset',
+'undeleteinvert'               => 'Balikkan pilihan',
 'undeletecomment'              => 'Komentar:',
 'undeletedarticle'             => '"$1" telah dikembalikan',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|revisi|revisi}} telah dikembalikan',
@@ -1828,6 +2038,7 @@ Lihat [[Special:Log/delete|log penghapusan]] untuk data penghapusan dan pengemba
 'undelete-error-long'          => 'Terjadi kesalahan sewaktu membatalkan penghapusan berkas:
 
 $1',
+'undelete-show-file-confirm'   => 'Anda yakin untuk melihat revisi terhapus dari berkas "<nowiki>$1</nowiki>" pada $2 $3?',
 'undelete-show-file-submit'    => 'Ya',
 
 # Namespace form on various pages
@@ -1836,26 +2047,27 @@ $1',
 'blanknamespace' => '(Utama)',
 
 # Contributions
-'contributions' => 'Kontribusi pengguna',
-'mycontris'     => 'Kontribusi saya',
-'contribsub2'   => 'Untuk $1 ($2)',
-'nocontribs'    => 'Tidak ada perubahan yang sesuai dengan kriteria tersebut.',
-'uctop'         => ' (atas)',
-'month'         => 'Sejak bulan (dan sebelumnya):',
-'year'          => 'Sejak tahun (dan sebelumnya):',
-
-'sp-contributions-newbies'     => 'Hanya pengguna-pengguna baru',
-'sp-contributions-newbies-sub' => 'Untuk pengguna baru',
-'sp-contributions-blocklog'    => 'Log pemblokiran',
-'sp-contributions-search'      => 'Cari kontribusi',
-'sp-contributions-username'    => 'Alamat IP atau nama pengguna:',
-'sp-contributions-submit'      => 'Cari',
+'contributions'       => 'Kontribusi pengguna',
+'contributions-title' => 'Kontribusi pengguna untuk $1',
+'mycontris'           => 'Kontribusi saya',
+'contribsub2'         => 'Untuk $1 ($2)',
+'nocontribs'          => 'Tidak ada perubahan yang sesuai dengan kriteria tersebut.',
+'uctop'               => ' (atas)',
+'month'               => 'Sejak bulan (dan sebelumnya):',
+'year'                => 'Sejak tahun (dan sebelumnya):',
+
+'sp-contributions-newbies'       => 'Hanya pengguna-pengguna baru',
+'sp-contributions-newbies-sub'   => 'Untuk pengguna baru',
+'sp-contributions-newbies-title' => 'Kontribusi pengguna baru',
+'sp-contributions-blocklog'      => 'Log pemblokiran',
+'sp-contributions-search'        => 'Cari kontribusi',
+'sp-contributions-username'      => 'Alamat IP atau nama pengguna:',
+'sp-contributions-submit'        => 'Cari',
 
 # What links here
 'whatlinkshere'            => 'Pranala balik',
 'whatlinkshere-title'      => 'Halaman yang memiliki pranala ke "$1"',
 'whatlinkshere-page'       => 'Halaman:',
-'linklistsub'              => '(Daftar pranala)',
 'linkshere'                => "Halaman-halaman berikut ini memiliki pranala ke '''[[:$1]]''':",
 'nolinkshere'              => "Tidak ada halaman yang memiliki pranala ke '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Tidak ada halaman yang memiliki pranala ke '''[[:$1]]''' pada ruang nama yang dipilih.",
@@ -1902,6 +2114,8 @@ Masukkan alasan Anda di bawah (contoh, menuliskan nama halaman yang telah divand
 'ipbotherreason'                  => 'Alasan lain/tambahan:',
 'ipbhidename'                     => 'Sembunyikan nama pengguna atau IP dari log pemblokiran, daftar blokir aktif, serta daftar pengguna',
 'ipbwatchuser'                    => 'Pantau halaman pengguna dan pembicaraan pengguna ini',
+'ipballowusertalk'                => 'Izinkan pengguna ini untuk menyunting halaman pembicaraan sendiri ketika diblokir',
+'ipb-change-block'                => 'Blokir kembali pengguna dengan set konfigurasi berikut',
 'badipaddress'                    => 'Format alamat IP atau nama pengguna salah.',
 'blockipsuccesssub'               => 'Pemblokiran sukses',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] telah diblokir.<br />
@@ -1911,14 +2125,18 @@ Lihat [[Special:IPBlockList|Daftar IP]] untuk meninjau kembali pemblokiran.',
 'ipb-unblock'                     => 'Hilangkan blokir seorang pengguna atau suatu alamat IP',
 'ipb-blocklist-addr'              => 'Blokir yang diterapkan untuk $1',
 'ipb-blocklist'                   => 'Lihat blokir yang diterapkan',
+'ipb-blocklist-contribs'          => 'Kontribusi untuk $1',
 'unblockip'                       => 'Hilangkan blokir terhadap alamat IP atau pengguna',
 'unblockiptext'                   => 'Gunakan formulir di bawah untuk mengembalikan kemampuan menulis sebuah alamat IP atau pengguna yang sebelumnya telah diblokir.',
-'ipusubmit'                       => 'Hilangkan blokir terhadap alamat ini',
+'ipusubmit'                       => 'Hilangkan blokir ini',
 'unblocked'                       => 'Blokir terhadap [[User:$1|$1]] telah dicabut',
 'unblocked-id'                    => 'Blokir $1 telah dicabut',
 'ipblocklist'                     => 'Daftar pemblokiran alamat IP dan nama penguna',
 'ipblocklist-legend'              => 'Cari pengguna yang diblokir',
 'ipblocklist-username'            => 'Nama pengguna atau alamat IP:',
+'ipblocklist-sh-userblocks'       => '$1 pemblokiran akun',
+'ipblocklist-sh-tempblocks'       => '$1 pemblokiran sementara',
+'ipblocklist-sh-addressblocks'    => '$1 pemblokiran IP tunggal',
 'ipblocklist-submit'              => 'Cari',
 'blocklistline'                   => '$1, $2 memblokir $3 ($4)',
 'infiniteblock'                   => 'tak terbatas',
@@ -1927,14 +2145,18 @@ Lihat [[Special:IPBlockList|Daftar IP]] untuk meninjau kembali pemblokiran.',
 'noautoblockblock'                => 'pemblokiran otomatis dimatikan',
 'createaccountblock'              => 'pembuatan akun diblokir',
 'emailblock'                      => 'surat-e diblokir',
+'blocklist-nousertalk'            => 'tidak dapat menyunting halaman pembicaraan sendiri',
 'ipblocklist-empty'               => 'Daftar pemblokiran kosong.',
 'ipblocklist-no-results'          => 'alamat IP atau pengguna yang diminta tidak diblokir.',
 'blocklink'                       => 'blokir',
 'unblocklink'                     => 'hilangkan blokir',
+'change-blocklink'                => 'ubah blokir',
 'contribslink'                    => 'kontrib',
 'autoblocker'                     => 'Diblokir secara otomatis karena Anda berbagi alamat IP dengan "$1". Alasan "$2".',
 'blocklogpage'                    => 'Log pemblokiran',
+'blocklog-fulllog'                => 'Log pemblokiran penuh',
 'blocklogentry'                   => 'memblokir [[$1]] dengan waktu kadaluwarsa $2 $3',
+'reblock-logentry'                => 'mengubah pemblokiran [[$1]] dengan waktu kadaluwarsa $2 $3',
 'blocklogtext'                    => 'Di bawah ini adalah log pemblokiran dan pembukaan blokir terhadap pengguna.
 Alamat IP yang diblokir secara otomatis tidak terdapat di dalam daftar ini.
 Lihat [[Special:IPBlockList|daftar alamat IP yang diblokir]] untuk daftar pemblokiran terkini.',
@@ -1943,11 +2165,14 @@ Lihat [[Special:IPBlockList|daftar alamat IP yang diblokir]] untuk daftar pemblo
 'block-log-flags-nocreate'        => 'pembuatan akun dimatikan',
 'block-log-flags-noautoblock'     => 'blokir otomatis dimatikan',
 'block-log-flags-noemail'         => 'surat-e diblokir',
+'block-log-flags-nousertalk'      => 'tidak dapat menyunting halaman pembicaraan sendiri',
 'block-log-flags-angry-autoblock' => 'peningkatan sistem pemblokiran otomatis telah diaktifkan',
 'range_block_disabled'            => 'Kemampuan pengurus dalam membuat blokir blok IP dimatikan.',
 'ipb_expiry_invalid'              => 'Waktu kadaluwarsa tidak sah.',
 'ipb_expiry_temp'                 => 'Pemblokiran atas nama pengguna yang disembunyikan harus permanen.',
 'ipb_already_blocked'             => '"$1" telah diblokir',
+'ipb-needreblock'                 => '== Sudah diblokir ==
+$1 sudah diblokir. Apakah Anda ingin mengubah set pemblokiran yang bersangkutan?',
 'ipb_cant_unblock'                => 'Kesalahan: Blokir dengan ID $1 tidak ditemukan. Blokir tersebut kemungkinan telah dibuka.',
 'ipb_blocked_as_range'            => 'Kesalahan: IP $1 tidak diblok secara langsung dan tidak dapat dilepaskan. IP $1 diblok sebagai bagian dari pemblokiran kelompok IP $2, yang dapat dilepaskan.',
 'ip_range_invalid'                => 'Blok IP tidak sah.',
@@ -1958,6 +2183,7 @@ Lihat [[Special:IPBlockList|daftar alamat IP yang diblokir]] untuk daftar pemblo
 'proxyblocksuccess'               => 'Selesai.',
 'sorbsreason'                     => 'Alamat IP anda terdaftar sebagai proxy terbuka di DNSBL.',
 'sorbs_create_account_reason'     => 'Alamat IP anda terdaftar sebagai proxy terbuka di DNSBL. Anda tidak dapat membuat akun.',
+'cant-block-while-blocked'        => 'Anda tidak dapat memblokir pengguna lain ketika Anda sendiri sedang diblokir.',
 
 # Developer tools
 'lockdb'              => 'Kunci basis data',
@@ -1978,55 +2204,68 @@ Pastikan Anda [[Special:UnlockDB|membuka kuncinya]] setelah pemeliharaan selesai
 'databasenotlocked'   => 'Basis data tidak terkunci.',
 
 # Move page
-'move-page'               => 'Pindahkan $1',
-'move-page-legend'        => 'Pindahkan halaman',
-'movepagetext'            => "Formulir di bawah ini digunakan untuk mengubah nama suatu halaman dan memindahkan semua data sejarah ke nama baru. Judul yang lama akan menjadi halaman peralihan menuju judul yang baru. Pranala kepada judul lama tidak akan berubah. Pastikan untuk memeriksa terhadap peralihan halaman yang rusak atau berganda setelah pemindahan. Anda bertanggung jawab untuk memastikan bahwa pranala terus menyambung ke halaman yang seharusnya.
+'move-page'                    => 'Pindahkan $1',
+'move-page-legend'             => 'Pindahkan halaman',
+'movepagetext'                 => "Formulir di bawah ini digunakan untuk mengubah nama suatu halaman dan memindahkan semua data sejarah ke nama baru. Judul yang lama akan menjadi halaman peralihan menuju judul yang baru. Pranala kepada judul lama tidak akan berubah. Pastikan untuk memeriksa terhadap peralihan halaman yang rusak atau berganda setelah pemindahan. Anda bertanggung jawab untuk memastikan bahwa pranala terus menyambung ke halaman yang seharusnya.
 
 Perhatikan bahwa halaman '''tidak''' akan dipindah apabila telah ada halaman yang menggunakan judul yang baru, kecuali bila halaman tersebut kosong atau merupakan halaman peralihan dan tidak mempunyai sejarah penyuntingan. Ini berarti Anda dapat mengubah nama halaman kembali seperti semula apabila Anda membuat kesalahan, dan Anda tidak dapat menimpa halaman yang telah ada.
 
 '''Peringatan:''' Ini dapat mengakibatkan perubahan yang tak terduga dan drastis  bagi halaman yang populer. Pastikan Anda mengerti konsekuensi dari perbuatan ini sebelum melanjutkan.",
-'movepagetalktext'        => "Halaman pembicaraan yang berkaitan juga akan dipindahkan secara otomatis '''kecuali apabila:'''
+'movepagetalktext'             => "Halaman pembicaraan yang berkaitan juga akan dipindahkan secara otomatis '''kecuali apabila:'''
 
 *Sebuah halaman pembicaraan yang tidak kosong telah ada di bawah judul baru, atau
 *Anda tidak memberi tanda cek pada kotak di bawah ini
 
 Dalam kasus tersebut, apabila diinginkan, Anda dapat memindahkan atau menggabungkan halaman secara manual.",
-'movearticle'             => 'Pindahkan halaman:',
-'movenotallowed'          => 'Anda tak memiliki hak akses untuk memindahkan halaman.',
-'newtitle'                => 'Ke judul baru:',
-'move-watch'              => 'Pantau halaman ini',
-'movepagebtn'             => 'Pindahkan halaman',
-'pagemovedsub'            => 'Pemindahan berhasil',
-'movepage-moved'          => '<big>\'\'\'"$1" telah dipindahkan ke "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Halaman dengan nama tersebut telah ada atau nama yang dipilih tidak sah. Silakan pilih nama lain.',
-'cantmove-titleprotected' => 'Anda tidak dapat memindahkan halaman ke lokasi ini, karena judul tujuan sedang dilindungi dari pembuatan',
-'talkexists'              => 'Halaman tersebut berhasil dipindahkan, tetapi halaman pembicaraan dari halaman tersebut tidak dapat dipindahkan karena telah ada halaman pembicaraan pada judul yang baru. Silakan gabungkan halaman-halaman pembicaraan tersebut secara manual.',
-'movedto'                 => 'dipindahkan ke',
-'movetalk'                => 'Pindahkan halaman pembicaraan yang terkait',
-'move-subpages'           => 'Pindahkan semua subhalaman, bila ada',
-'move-talk-subpages'      => 'Pindahkan semua subhalaman pembicaraan, bila ada',
-'movepage-page-exists'    => 'Halaman $1 telah ada dan tidak dapat ditimpa secara otomatis.',
-'movepage-page-moved'     => 'Halaman $1 telah dipindahkan ke $2.',
-'movepage-page-unmoved'   => 'Halaman $1 tidak dapat dipindahkan ke $2.',
-'movepage-max-pages'      => 'Sejumlah maksimum $1 {{PLURAL:$1|halaman|halaman}} telah dipindahkan dan tidak ada lagi yang akan dipindahkan secara otomatis.',
-'1movedto2'               => 'memindahkan [[$1]] ke [[$2]]',
-'1movedto2_redir'         => 'memindahkan [[$1]] ke [[$2]] melalui peralihan',
-'movelogpage'             => 'Log pemindahan',
-'movelogpagetext'         => 'Di bawah ini adalah log pemindahan halaman.',
-'movereason'              => 'Alasan:',
-'revertmove'              => 'kembalikan',
-'delete_and_move'         => 'Hapus dan pindahkan',
-'delete_and_move_text'    => '==Penghapusan diperlukan==
+'movearticle'                  => 'Pindahkan halaman:',
+'movenologin'                  => 'Belum masuk log',
+'movenologintext'              => 'Anda harus menjadi pengguna terdaftar dan telah [[Special:UserLogin|masuk log]] untuk dapat memindahkan suatu halaman.',
+'movenotallowed'               => 'Anda tak memiliki hak akses untuk memindahkan halaman.',
+'movenotallowedfile'           => 'Anda tak memiliki hak untuk memindahkan berkas.',
+'cant-move-user-page'          => 'Anda tidak memiliki hak akses untuk memindahkan halaman pengguna (terpisah dari subhalaman).',
+'cant-move-to-user-page'       => 'Anda tidak memiliki hak akses untuk memindahkan halaman ke suatu halaman pengguna (kecuali ke subhalaman pengguna).',
+'newtitle'                     => 'Ke judul baru:',
+'move-watch'                   => 'Pantau halaman ini',
+'movepagebtn'                  => 'Pindahkan halaman',
+'pagemovedsub'                 => 'Pemindahan berhasil',
+'movepage-moved'               => '<big>\'\'\'"$1" telah dipindahkan ke "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Suatu pengalihan telah dibuat.',
+'movepage-moved-noredirect'    => 'Pembuatan pengalihan telah ditahan.',
+'articleexists'                => 'Halaman dengan nama tersebut telah ada atau nama yang dipilih tidak sah. Silakan pilih nama lain.',
+'cantmove-titleprotected'      => 'Anda tidak dapat memindahkan halaman ke lokasi ini, karena judul tujuan sedang dilindungi dari pembuatan',
+'talkexists'                   => 'Halaman tersebut berhasil dipindahkan, tetapi halaman pembicaraan dari halaman tersebut tidak dapat dipindahkan karena telah ada halaman pembicaraan pada judul yang baru. Silakan gabungkan halaman-halaman pembicaraan tersebut secara manual.',
+'movedto'                      => 'dipindahkan ke',
+'movetalk'                     => 'Pindahkan halaman pembicaraan yang terkait',
+'move-subpages'                => 'Pindahkan semua subhalaman, bila ada',
+'move-talk-subpages'           => 'Pindahkan semua subhalaman pembicaraan, bila ada',
+'movepage-page-exists'         => 'Halaman $1 telah ada dan tidak dapat ditimpa secara otomatis.',
+'movepage-page-moved'          => 'Halaman $1 telah dipindahkan ke $2.',
+'movepage-page-unmoved'        => 'Halaman $1 tidak dapat dipindahkan ke $2.',
+'movepage-max-pages'           => 'Sejumlah maksimum $1 {{PLURAL:$1|halaman|halaman}} telah dipindahkan dan tidak ada lagi yang akan dipindahkan secara otomatis.',
+'1movedto2'                    => 'memindahkan [[$1]] ke [[$2]]',
+'1movedto2_redir'              => 'memindahkan [[$1]] ke [[$2]] melalui peralihan',
+'move-redirect-suppressed'     => 'pengalihan ditahan',
+'movelogpage'                  => 'Log pemindahan',
+'movelogpagetext'              => 'Di bawah ini adalah log pemindahan halaman.',
+'movereason'                   => 'Alasan:',
+'revertmove'                   => 'kembalikan',
+'delete_and_move'              => 'Hapus dan pindahkan',
+'delete_and_move_text'         => '==Penghapusan diperlukan==
 
 Artikel yang dituju, "[[:$1]]", telah mempunyai isi. Apakah Anda hendak menghapusnya untuk memberikan ruang bagi pemindahan?',
-'delete_and_move_confirm' => 'Ya, hapus halaman tersebut',
-'delete_and_move_reason'  => 'Dihapus untuk mengantisipasikan pemindahan halaman',
-'selfmove'                => 'Pemindahan halaman tidak dapat dilakukan karena judul sumber dan judul tujuan sama.',
-'immobile_namespace'      => 'Judul sumber atau tujuan termasuk tipe khusus; tidak dapat memindahkan halaman ke ruang nama tersebut.',
-'imagenocrossnamespace'   => 'Tidak dapat memindahkan berkas ke ruang nama non-berkas',
-'imagetypemismatch'       => 'Ekstensi yang diberikan tidak cocok dengan tipe berkas',
-'imageinvalidfilename'    => 'Nama berkas tujuan tidak sah',
-'fix-double-redirects'    => 'Perbaiki semua pengalihan ganda yang mungkin terjadi',
+'delete_and_move_confirm'      => 'Ya, hapus halaman tersebut',
+'delete_and_move_reason'       => 'Dihapus untuk mengantisipasikan pemindahan halaman',
+'selfmove'                     => 'Pemindahan halaman tidak dapat dilakukan karena judul sumber dan judul tujuan sama.',
+'immobile-source-namespace'    => 'Tidak dapat memindahkan halaman dalam ruang nama "$1"',
+'immobile-target-namespace'    => 'Tidak dapat memindahkan halaman ke ruang nama "$1"',
+'immobile-target-namespace-iw' => 'Pranala interwiki bukanlah target yang valid untuk pemindahan halaman.',
+'immobile-source-page'         => 'Halaman ini tidak dapat dipindahkan.',
+'immobile-target-page'         => 'Tidak dapat memindahkan ke judul tujuan tersebut.',
+'imagenocrossnamespace'        => 'Tidak dapat memindahkan berkas ke ruang nama non-berkas',
+'imagetypemismatch'            => 'Ekstensi yang diberikan tidak cocok dengan tipe berkas',
+'imageinvalidfilename'         => 'Nama berkas tujuan tidak sah',
+'fix-double-redirects'         => 'Perbaiki semua pengalihan ganda yang mungkin terjadi',
+'move-leave-redirect'          => 'Buat pengalihan ke judul baru',
 
 # Export
 'export'            => 'Ekspor halaman',
@@ -2035,7 +2274,7 @@ Hasil ekspor ini selanjutnya dapat diimpor ke wiki lainnya yang menggunakan pera
 
 Untuk mengekspor halaman-halaman artikel, masukkan judul-judul dalam kotak teks di bawah ini, satu judul per baris, dan pilih apakah Anda ingin mengekspor lengkap dengan versi terdahulunya, atau hanya versi terbaru dengan catatan penyuntingan terakhir.
 
-Jika Anda hanya ingin mengimpor versi terbaru, Anda melakukannya lebih cepat dengan cara menggunakan pranala khusus, sebagai contoh: [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] untuk mengekspor artikel "[[{{MediaWiki:Mainpage}}]]".',
+Jika Anda hanya ingin mengimpor versi terbaru, Anda melakukannya lebih cepat dengan cara menggunakan pranala khusus, sebagai contoh: [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] untuk mengekspor artikel "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Hanya ekspor revisi sekarang, bukan seluruh versi terdahulu',
 'exportnohistory'   => "----
 '''Catatan:''' Mengekspor keseluruhan riwayat suntingan halaman melalui isian ini telah dinon-aktifkan karena alasan kinerja.",
@@ -2050,7 +2289,8 @@ Jika Anda hanya ingin mengimpor versi terbaru, Anda melakukannya lebih cepat den
 'allmessagesname'           => 'Nama',
 'allmessagesdefault'        => 'Teks baku',
 'allmessagescurrent'        => 'Teks sekarang',
-'allmessagestext'           => 'Ini adalah daftar semua pesan sistem yang tersedia dalam ruang nama MediaWiki:',
+'allmessagestext'           => 'Ini adalah daftar semua pesan sistem yang tersedia dalam ruang nama MediaWiki.
+Silakan kunjungi [http://www.mediawiki.org/wiki/Localisation Pelokalan MediaWiki] dan [http://translatewiki.net translatewiki.net] jika Anda ingin berkontribusi untuk pelokalan generik MediaWiki.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' tidak didukung karena '''\$wgUseDatabaseMessages''' dimatikan.",
 'allmessagesfilter'         => 'Filter nama pesan:',
 'allmessagesmodified'       => 'Hanya tampilkan yang diubah',
@@ -2070,9 +2310,12 @@ Jika Anda hanya ingin mengimpor versi terbaru, Anda melakukannya lebih cepat den
 'import-interwiki-text'      => 'Pilih suatu wiki dan judul halaman yang akan di impor.
 Tanggal revisi dan nama penyunting akan dipertahankan.
 Semua aktivitas impor transwiki akan dicatat di [[Special:Log/import|log impor]].',
+'import-interwiki-source'    => 'Wiki/halaman sumber:',
 'import-interwiki-history'   => 'Salin semua versi terdahulu dari halaman ini',
 'import-interwiki-submit'    => 'Impor',
-'import-interwiki-namespace' => 'Transfer halaman ke dalam ruang nama:',
+'import-interwiki-namespace' => 'Ruang nama tujuan:',
+'import-upload-filename'     => 'Nama berkas:',
+'import-comment'             => 'Komentar:',
 'importtext'                 => 'Silakan ekspor berkas dari wiki asal dengan menggunakan [[Special:Export|fasilitas ekspor]].
 Simpan ke komputer Anda lalu muatkan di sini.',
 'importstart'                => 'Mengimpor halaman...',
@@ -2107,19 +2350,19 @@ Simpan ke komputer Anda lalu muatkan di sini.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revisi}} dari $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Halaman pengguna saya',
+'tooltip-pt-userpage'             => 'Halaman pengguna Anda',
 'tooltip-pt-anonuserpage'         => 'Halaman pengguna IP Anda',
-'tooltip-pt-mytalk'               => 'Halaman pembicaraan saya',
+'tooltip-pt-mytalk'               => 'Halaman pembicaraan Anda',
 'tooltip-pt-anontalk'             => 'Pembicaraan tentang suntingan dari alamat IP ini',
 'tooltip-pt-preferences'          => 'Preferensi saya',
 'tooltip-pt-watchlist'            => 'Daftar halaman yang saya pantau.',
-'tooltip-pt-mycontris'            => 'Daftar kontribusi saya',
+'tooltip-pt-mycontris'            => 'Daftar kontribusi Anda',
 'tooltip-pt-login'                => 'Anda disarankan untuk masuk log, meskipun hal itu tidak diwajibkan.',
 'tooltip-pt-anonlogin'            => 'Anda disarankan untuk masuk log, meskipun hal itu tidak diwajibkan.',
 'tooltip-pt-logout'               => 'Keluar log',
 'tooltip-ca-talk'                 => 'Pembicaraan halaman isi',
 'tooltip-ca-edit'                 => 'Sunting halaman ini. Gunakan tombol pratayang sebelum menyimpan.',
-'tooltip-ca-addsection'           => 'Tambahkan komentar ke halaman pembicaraan ini.',
+'tooltip-ca-addsection'           => 'Mulai bagian baru',
 'tooltip-ca-viewsource'           => 'Halaman ini dilindungi. Anda hanya dapat melihat sumbernya.',
 'tooltip-ca-history'              => 'Versi-versi sebelumnya dari halaman ini.',
 'tooltip-ca-protect'              => 'Lindungi halaman ini',
@@ -2166,6 +2409,8 @@ Simpan ke komputer Anda lalu muatkan di sini.',
 'tooltip-watch'                   => 'Tambahkan halaman ini ke daftar pantauan Anda',
 'tooltip-recreate'                => 'Buat ulang halaman walaupun sebenarnya telah dihapus',
 'tooltip-upload'                  => 'Mulai pemuatan',
+'tooltip-rollback'                => 'Mengembalikan suntingan-suntingan di halaman ini ke kontributor terakhir dalam satu kali klik.',
+'tooltip-undo'                    => 'Mengembalikan revisi ini dan membuka kotak penyuntingan dengan mode pratayang. Alasan dapat ditambahkan di kotak ringkasan.',
 
 # Stylesheets
 'common.css'   => '/* CSS yang ada di sini akan diterapkan untuk semua kulit. */',
@@ -2181,12 +2426,12 @@ Simpan ke komputer Anda lalu muatkan di sini.',
 'notacceptable'     => 'Server wiki tidak dapat menyediakan data dalam format yang dapat dibaca oleh client Anda.',
 
 # Attribution
-'anonymous'        => 'Pengguna(-pengguna) anonim {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Pengguna|Pengguna-pengguna}} anonim di {{SITENAME}}',
 'siteuser'         => 'Pengguna {{SITENAME}} $1',
 'lastmodifiedatby' => 'Halaman ini terakhir kali diubah $2, $1 oleh $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Didasarkan pada karya $1.',
 'others'           => 'lainnya',
-'siteusers'        => 'Pengguna(-pengguna) {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Pengguna|Pengguna-pengguna}} {{SITENAME}} $1',
 'creditspage'      => 'Penghargaan halaman',
 'nocredits'        => 'Tidak ada informasi penghargaan yang tersedia untuk halaman ini.',
 
@@ -2207,6 +2452,10 @@ Ini mungkin disebabkan oleh pranala ke situs luar yang termasuk dalam daftar hit
 'numauthors'     => 'Jumlah pengarang yang berbeda (artikel): $1',
 'numtalkauthors' => 'Jumlah pengarang yang berbeda (halaman pembicaraan): $1',
 
+# Skin names
+'skinname-standard' => 'Klasik',
+'skinname-simple'   => 'Sederhana',
+
 # Math options
 'mw_math_png'    => 'Selalu buat PNG',
 'mw_math_simple' => 'HTML jika sangat sederhana atau PNG',
@@ -2227,10 +2476,12 @@ Ini mungkin disebabkan oleh pranala ke situs luar yang termasuk dalam daftar hit
 'markedaspatrollederror-noautopatrol' => 'Anda tidak diizinkan menandai suntingan Anda sendiri dipatroli.',
 
 # Patrol log
-'patrol-log-page'   => 'Log patroli',
-'patrol-log-header' => 'Ini adalah log revisi terpatroli.',
-'patrol-log-line'   => 'menandai $1 dari $2 terpatroli $3',
-'patrol-log-auto'   => '(otomatis)',
+'patrol-log-page'      => 'Log patroli',
+'patrol-log-header'    => 'Ini adalah log revisi terpatroli.',
+'patrol-log-line'      => 'menandai $1 dari $2 terpatroli $3',
+'patrol-log-auto'      => '(otomatis)',
+'patrol-log-diff'      => 'revisi $1',
+'log-show-hide-patrol' => '$1 log patroli',
 
 # Image deletion
 'deletedrevision'                 => 'Revisi lama yang dihapus $1',
@@ -2245,6 +2496,9 @@ Ini mungkin disebabkan oleh pranala ke situs luar yang termasuk dalam daftar hit
 'previousdiff' => '� Revisi sebelumnya',
 'nextdiff'     => 'Revisi selanjutnya →',
 
+# Visual comparison
+'visual-comparison' => 'Perbandingan visual',
+
 # Media information
 'mediawarning'         => "'''Peringatan:''' Berkas ini mungkin mengandung kode berbahaya yang jika dijalankan dapat mempengaruhi sistem Anda.<hr />",
 'imagemaxsize'         => 'Batasi ukuran gambar dalam halaman deskripsi berkas sampai:',
@@ -2257,10 +2511,12 @@ Ini mungkin disebabkan oleh pranala ke situs luar yang termasuk dalam daftar hit
 'show-big-image'       => 'Resolusi penuh',
 'show-big-image-thumb' => '<small>Ukuran pratayang ini: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Berkas baru',
 'imagelisttext'         => "Di bawah ini adalah daftar '''$1''' {{PLURAL:$1|berkas|berkas}} diurutkan $2.",
 'newimages-summary'     => 'Halaman istimewa berikut menampilkan daftar berkas yang terakhir dimuat',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Nama berkas (atau sebagian dari nama berkas):',
 'showhidebots'          => '($1 bot)',
 'noimages'              => 'Tidak ada yang dilihat.',
 'ilsubmit'              => 'Cari',
@@ -2464,6 +2720,18 @@ Pranala-pranala selanjutnya pada baris yang sama dianggap sebagai pengecualian,
 'exif-lightsource-24'  => 'studio ISO tungsten',
 'exif-lightsource-255' => 'Sumber cahaya lain',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Lampu kilat tidak menyala',
+'exif-flash-fired-1'    => 'Lampu kilat menyala',
+'exif-flash-return-0'   => 'tidak ada fungsi pendeteksian strobo balik',
+'exif-flash-return-2'   => 'lampu strobo balik tidak terdeteksi',
+'exif-flash-return-3'   => 'lampu strobo balik terdeteksi',
+'exif-flash-mode-1'     => 'lampu kilat diperlukan',
+'exif-flash-mode-2'     => 'lampu kilat dimatikan',
+'exif-flash-mode-3'     => 'modus otomatis',
+'exif-flash-function-1' => 'Tidak ada fungsi lampu kilat',
+'exif-flash-redeye-1'   => 'mode reduksi pantulan mata-merah',
+
 'exif-focalplaneresolutionunit-2' => 'inci',
 
 'exif-sensingmethod-1' => 'Tak terdefinisi',
@@ -2602,21 +2870,10 @@ $1
 Silakan konfirmasi jika Anda ingin membuat ulang halaman ini.",
 'recreate'            => 'Buat ulang',
 
-# HTML dump
-'redirectingto' => 'Sedang dialihkan ke [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Hapus ''cache'' halaman ini?
-
-$1",
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Mencari artikel yang mengandung ''$1''.",
-'searchnamed'      => "Mencari artikel yang berjudul ''$1''.",
-'articletitles'    => "Artikel yang diawali ''$1''",
-'hideresults'      => 'Sembunyikan hasil',
-'useajaxsearch'    => 'Gunakan pencarian AJAX',
+'confirm-purge-top'    => 'Hapus singgahan halaman ini?',
+'confirm-purge-bottom' => 'Membersihkan halaman akan sekaligus menghapus singgahan dan menampilkan versi halaman terkini.',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; halaman sebelumnya',
@@ -2679,6 +2936,7 @@ Anda juga dapat [[Special:Watchlist/raw|menyunting daftar mentahnya]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag ekstensi tidak dikenal "$1"',
+'duplicate-defaultsort' => 'Peringatan: Kunci pengurutan baku "$2" mengabaikan kunci pengurutan baku "$1" sebelumnya.',
 
 # Special:Version
 'version'                          => 'Versi', # Not used as normal message but as header for the special page itself
@@ -2708,13 +2966,13 @@ Anda juga dapat [[Special:Watchlist/raw|menyunting daftar mentahnya]].',
 'filepath-summary' => 'Halaman istimewa ini menampilkan jalur lengkap untuk suatu berkas.
 Gambar ditampilkan dalam resolusi penuh dan tipe lain berkas akan dibuka langsung dengan program terkaitnya.
 
-Masukkan nama berkas tanpa prefiks "{{ns:image}}:"-nya.',
+Masukkan nama berkas tanpa prefiks "{{ns:file}}:"-nya.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Pencarian berkas duplikat',
 'fileduplicatesearch-summary'  => 'Pencarian duplikat berkas berdasarkan nilai hash-nya.
 
-Masukkan nama berkas tanpa prefiks "{{ns:image}}:".',
+Masukkan nama berkas tanpa prefiks "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Cari duplikat',
 'fileduplicatesearch-filename' => 'Nama berkas:',
 'fileduplicatesearch-submit'   => 'Cari',
@@ -2745,4 +3003,13 @@ Keterangan tampilan:
 'blankpage'              => 'Halaman kosong',
 'intentionallyblankpage' => 'Halaman ini sengaja dibiarkan kosong dan digunakan di antaranya untuk pengukuran kinerja, dan lain-lain.',
 
+# External image whitelist
+'external_image_whitelist' => '  #Biarkan baris ini sebagaimana adanya dan jangan diubah<pre>
+#Gunakan fragmen-fragmen ekspresi regular (hanya bagian di antara //) di bawah ini
+#Fragmen-fragmen ini akan dicocokkan dengan URL dari gambar-gambar eksternal (yang dihubungkan langsung)
+#Fragmen yang cocok akan ditampilkan sebagai gambar, sisanya hanya sebagai pranala saja
+#Baris yang diawali dengan # akan diperlakukan sebagai baris komentar
+
+#Letakkan semua fragmen ekspresi regular di bawah baris ini. Biarkan baris ini sebagaimana adanya</pre>',
+
 );
diff --git a/languages/messages/MessagesIe.php b/languages/messages/MessagesIe.php
index 18950fc8..f97b843f 100644
--- a/languages/messages/MessagesIe.php
+++ b/languages/messages/MessagesIe.php
@@ -82,7 +82,7 @@ $messages = array(
 'moredotdotdot'  => 'Plu mult...',
 'mytalk'         => 'Mi discussion',
 'anontalk'       => 'Discussion por ti ci IP',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 'errorpagetitle'   => 'Errore',
 'returnto'         => 'Retornar a $1.',
@@ -122,8 +122,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Apropó de {{SITENAME}}',
 'aboutpage'            => 'Project:Apropó',
-'bugreports'           => 'Raportes de malfunctiones',
-'bugreportspage'       => 'Project:Raportes de malfunctiones',
 'copyright'            => 'Contenete disponibil sub $1.',
 'disclaimers'          => 'Advertimentes',
 'edithelp'             => 'Auxilie',
@@ -166,7 +164,6 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'yourpassword'               => 'Vor passa-parol:',
 'yourpasswordagain'          => 'Tippa denov vor passa-parol',
 'remembermypassword'         => 'Memorar mi passa-parol (per cookie)',
-'loginproblem'               => '<b>Hay un problema pri vor intrada.</b><br />Pena far it denov!',
 'login'                      => 'Aperter session',
 'nav-login-createaccount'    => 'Crear un conto o intrar',
 'loginprompt'                => 'Cookies deve esser permisset por intrar in {{SITENAME}}.',
@@ -187,8 +184,13 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'acct_creation_throttle_hit' => 'Vu ja ha creat $1 contos. Vu ne posse crear pli mult quam to.',
 'loginlanguagelabel'         => 'Lingue: $1',
 
+# Password reset dialog
+'oldpassword' => 'Anteyan passa-parol:',
+'newpassword' => 'Nov passa-parol:',
+'retypenew'   => 'Confirmar nov passa-parol',
+
 # Edit pages
-'summary'          => 'Resumate',
+'summary'          => 'Resumate:',
 'minoredit'        => 'Modification minori',
 'watchthis'        => 'Sequer ti articul',
 'savearticle'      => 'Conservar págine',
@@ -201,13 +203,14 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'editing'          => 'Modification de $1',
 'editingsection'   => 'modification de $1 (section)',
 'editingcomment'   => 'modification de $1 (comenta)',
-'copyrightwarning' => 'Omni contributiones a {{SITENAME}} es considerat quam publicat sub li termines del $2 (ples vider $1 por plu mult detallies). Si vu ne vole que vor ovres mey esser modificat e distribuet secun arbitrie, ples ne inviar les. Adplu, ples contribuer solmen vor propri ovres o ovres ex un fonte quel es líber de jures. <strong>NE UTILISA OVRES SUB JURE EDITORIAL SIN DEFINITIV AUTORISATION!</strong>',
+'copyrightwarning' => "Omni contributiones a {{SITENAME}} es considerat quam publicat sub li termines del $2 (ples vider $1 por plu mult detallies). Si vu ne vole que vor ovres mey esser modificat e distribuet secun arbitrie, ples ne inviar les. Adplu, ples contribuer solmen vor propri ovres o ovres ex un fonte quel es líber de jures. '''NE UTILISA OVRES SUB JURE EDITORIAL SIN DEFINITIV AUTORISATION!'''",
 
 # Diffs
 'lineno' => 'Linea $1:',
 
 # Search results
-'viewprevnext' => 'Vider ($1) ($2) ($3)',
+'viewprevnext'   => 'Vider ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Auxilie',
 
 # Preferences page
 'preferences'    => 'Preferenties',
@@ -216,9 +219,6 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'qbsettings'     => 'Personalisation del barre de utensiles',
 'changepassword' => 'Modificar passa-parol',
 'saveprefs'      => 'Conservar preferenties',
-'oldpassword'    => 'Anteyan passa-parol:',
-'newpassword'    => 'Nov passa-parol:',
-'retypenew'      => 'Confirmar nov passa-parol',
 
 # Groups
 'group-user' => 'Usatores',
@@ -250,10 +250,10 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'filedesc'  => 'Descrition',
 'savefile'  => 'Conservar file',
 
-# Special:ImageList
-'imagelist' => 'Liste de images',
+# Special:ListFiles
+'listfiles' => 'Liste de images',
 
-# Image description page
+# File description page
 'filehist-comment' => 'Comenta',
 
 # Random page
@@ -294,23 +294,23 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'categories' => 'Categories',
 
 # Watchlist
-'watchlist'            => 'Liste de sequet págines',
-'addedwatch'           => 'Adjuntet al liste',
-'addedwatchtext'       => "Li págine ''[[$1]]'' ha esset adjuntet a vor [[Special:Watchlist|liste de sequet págines]]. Li proxim modificationes de ti ci págine e del associat págine de discussion va esser listat ci, e li págine va aperir '''aspessat''' in li [[Special:RecentChanges|liste de recent modificationes]] por esser trovat plu facilmen. Por supresser ti ci págine ex vor liste, ples claccar sur « Ne plu sequer » in li cadre de navigation.",
-'watch'                => 'Sequer',
-'watchthispage'        => 'Sequer ti págine',
-'watchlist-hide-bots'  => 'Celar modificationes de bot',
-'watchlist-hide-own'   => 'Celar mi modificationes',
-'watchlist-hide-minor' => 'Celar modificationes minori',
-
-# Delete/protect/revert
+'watchlist'      => 'Liste de sequet págines',
+'addedwatch'     => 'Adjuntet al liste',
+'addedwatchtext' => "Li págine ''[[$1]]'' ha esset adjuntet a vor [[Special:Watchlist|liste de sequet págines]]. Li proxim modificationes de ti ci págine e del associat págine de discussion va esser listat ci, e li págine va aperir '''aspessat''' in li [[Special:RecentChanges|liste de recent modificationes]] por esser trovat plu facilmen. Por supresser ti ci págine ex vor liste, ples claccar sur « Ne plu sequer » in li cadre de navigation.",
+'watch'          => 'Sequer',
+'watchthispage'  => 'Sequer ti págine',
+
+# Delete
 'deletepage'            => 'Deleter págine',
 'actioncomplete'        => 'Supression efectuat',
 'deletecomment'         => 'Motive de deletion:',
 'deleteotherreason'     => 'Altri/suplementari motive:',
 'deletereasonotherlist' => 'Altri motive',
-'protectcomment'        => 'Comenta:',
-'restriction-type'      => 'Permission:',
+
+# Protect
+'prot_1movedto2'   => '[[$1]] moet a [[$2]]',
+'protectcomment'   => 'Comenta:',
+'restriction-type' => 'Permission:',
 
 # Namespace form on various pages
 'blanknamespace' => '(Principal)',
@@ -327,6 +327,7 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 
 # Move page
 'movearticle' => 'Moer págine:',
+'movenologin' => 'Vu ne ha intrat',
 'movepagebtn' => 'Moer págine',
 'movedto'     => 'moet a',
 '1movedto2'   => '[[$1]] moet a [[$2]]',
@@ -346,7 +347,7 @@ Vu posse continuar usar {{SITENAME}} anonimimen, o vu posse aperter un session d
 'tooltip-n-mainpage'     => 'Visita li Principal págine',
 'tooltip-t-specialpages' => 'Liste de omni special págines',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Galerie de nov images',
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesIi.php b/languages/messages/MessagesIi.php
index ebccf846..59c1930c 100644
--- a/languages/messages/MessagesIi.php
+++ b/languages/messages/MessagesIi.php
@@ -1,8 +1,9 @@
 <?php
-/** Yi (ꆇꉙ)
+/** Sichuan Yi (ꆇꉙ)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 $fallback = 'zh-cn';
diff --git a/languages/messages/MessagesIk.php b/languages/messages/MessagesIk.php
index 79cd154a..b00b96da 100644
--- a/languages/messages/MessagesIk.php
+++ b/languages/messages/MessagesIk.php
@@ -13,4 +13,7 @@ $messages = array(
 'mainpage-description' => 'Makpibaaq Kanna',
 'portal-url'           => 'Project:qargi',
 
+# Search results
+'searchhelp-url' => 'Help:anniqsuiruq',
+
 );
diff --git a/languages/messages/MessagesIke_cans.php b/languages/messages/MessagesIke_cans.php
index 703d2081..d302687b 100644
--- a/languages/messages/MessagesIke_cans.php
+++ b/languages/messages/MessagesIke_cans.php
@@ -4,7 +4,6 @@
  * @ingroup Language
  * @file
  *
- * @author Max sonnelid
  */
 
 $messages = array(
@@ -70,7 +69,7 @@ $messages = array(
 'mypage'         => '�ᒥ ᒪᑉ�ᑕᖅ',
 'mytalk'         => '�ᓪᓚ�ᑎᒃᑲ',
 'navigation'     => 'ᒥ�ᓂᕆᕚ',
-'and'            => '�ᒻᒪ',
+'and'            => '&#32;�ᒻᒪ',
 
 'errorpagetitle'    => 'ᑕᒻᒪᓇᖅ�ᖅ',
 'help'              => 'ᖃᔭᓕᑉ�',
@@ -165,14 +164,14 @@ $messages = array(
 'bold_tip'    => '�ᔾᔪᔪᒡ ᑕᖅᓴᓕᖅ�',
 
 # Edit pages
-'summary'         => 'ᓱᕕᑦ',
+'summary'         => 'ᓱᕕᑦ:',
 'minoredit'       => '�ᑭ�ᑭᓗ�ᖅ�ᖅ �ᓯ�ᙳ�ᖅ',
 'watchthis'       => '��ᕙ',
 'savearticle'     => '�ᖃ�ᓯᓪᓚᕆ�ᑕ ᑎᑎᕋᖅᑕ�ᓂ�ᑦ',
 'preview'         => '��ᕙ ᖃᖓᓵᖑᓕᖅ�ᖅ',
 'showpreview'     => 'ᓱ�ᓯᖅ� �ᓚᒃᑲ�ᑎᕗᖅ ᓯᕗᓕ�ᖅ� �ᖃ�ᓯᓪᓚᕆ�ᑕ ᑎᑎᕋᖅᑕ�ᓂ�ᑦ',
 'showdiff'        => '�ᓚᒃᑲᑎᑉ� �ᓯ�ᙳ�ᖅ',
-'summary-preview' => 'ᓱᕕᑦ',
+'summary-preview' => 'ᓱᕕᑦ:',
 'blockedtitle'    => '�ᖅᑭᒃᓱ�ᔨ �ᒥᙵᓯᓯᔪᖅ',
 'loginreqlink'    => '�ᑯ�ᓇ�ᖅ',
 'newarticle'      => '(�ᒋᕗᖅ)',
@@ -243,8 +242,8 @@ $messages = array(
 'randomredirect' => 'ᓇᑭ���ᓇᖅ ᖃ�ᔨᓴ�ᓂᖅ ᖃᓂᖓᓂ ᑲᒪᒋᔭᖅ �ᓯᑦ ᓇᑭᑦ',
 
 # Statistics
-'statistics' => 'ᑭᓯᑦᓯᓯᖕᖑ�ᓗᒋᑦ �ᓯᔅᓱᑎᔅᓴᑦ',
-'userstats'  => 'ᖃᑕᙳᑎ ᑭᓯᑦᓯᓯᖕᖑ�ᓗᒋᑦ �ᓯᔅᓱᑎᔅᓴᑦ',
+'statistics'              => 'ᑭᓯᑦᓯᓯᖕᖑ�ᓗᒋᑦ �ᓯᔅᓱᑎᔅᓴᑦ',
+'statistics-header-users' => 'ᖃᑕᙳᑎ ᑭᓯᑦᓯᓯᖕᖑ�ᓗᒋᑦ �ᓯᔅᓱᑎᔅᓴᑦ',
 
 'doubleredirects' => 'ᑕ��ᖃᓕᒃ ᖃᓂᖓᓂ ᑲᒪᒋᔭᖅ �ᓯᑦ ᓇᑭᑦ',
 
@@ -261,9 +260,6 @@ $messages = array(
 # Book sources
 'booksources-go' => '��ᕗᖅ',
 
-# Special:Log
-'log-search-submit' => '��ᕗᖅ',
-
 # Special:AllPages
 'allpages'       => 'ᓱᓇᒥᑦ�ᖅ ᒪᑉ�ᑕᖅ',
 'nextpage'       => 'ᑕᒡ� ᒪᑉ�ᑕᖅ ($1)',
@@ -290,9 +286,12 @@ $messages = array(
 'enotif_impersonal_salutation' => '{{SITENAME}} ᖃᑕᙳᑎ',
 'created'                      => 'ᒪᑉ�ᑕᖅ �ᓂᕗᖅ',
 
-# Delete/protect/revert
-'dellogpage'          => 'ᓂ�ᖅ ᓂ�',
-'deletionlog'         => 'ᓂ�ᖅ ᓂ�',
+# Delete
+'dellogpage'  => 'ᓂ�ᖅ ᓂ�',
+'deletionlog' => 'ᓂ�ᖅ ᓂ�',
+
+# Protect
+'prot_1movedto2'      => '[[$1]] ᓱ�ᕋᒪᔪᖅ [[$2]]',
 'protect-legend'      => '�ᑎᒻᒥᕚ ᓴ�ᒻᒥᕚ',
 'protect-level-sysop' => 'ᓯ�ᓚᒃ ᑎᑎᕋᖅᓯᒪᔪᓂᒃ �ᖅᑯᖅᑎᕆᔨ',
 
@@ -365,7 +364,7 @@ $messages = array(
 'previousdiff' => '� �ᓄᓪᓕ�ᖅ �ᓯ�ᙳ�ᖅ',
 'nextdiff'     => 'ᑕᒡ� �ᓯ�ᙳ�ᖅ ᒪᑉ�ᑕᖅ →',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => '�ᕚᖅ�ᖅ',
 'bydate'   => '�ᑖᕈᑦ�ᖅ �ᓅᓕ�ᕕᒃ',
 
@@ -381,9 +380,6 @@ $messages = array(
 # 'all' in various places, this might be different for inflected languages
 'monthsall' => 'ᓱᓇᒥᑦ�ᖅ',
 
-# HTML dump
-'redirectingto' => 'ᖃᓂᖓᓂ ᑲᒪᒋᔭᖅ �ᓯᑦ ᓇᑭᑦ [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => '�ᑲ�ᔪᖅ',
 
diff --git a/languages/messages/MessagesIke_latn.php b/languages/messages/MessagesIke_latn.php
index 43f7c689..5dbdc996 100644
--- a/languages/messages/MessagesIke_latn.php
+++ b/languages/messages/MessagesIke_latn.php
@@ -54,7 +54,7 @@ $messages = array(
 'mypage'         => 'ami mappitaq',
 'mytalk'         => 'atlarqutikka',
 'navigation'     => 'mianirivaa',
-'and'            => 'amma',
+'and'            => '&#32;amma',
 
 'help'              => 'qajalippaa',
 'search'            => 'ivaaqpuq',
@@ -143,14 +143,14 @@ pigivuq qatannguti uikipitia kiinaujaqutiqarvik isuillingaitjapaa. iqtuu suqusiq
 'bold_tip'    => 'ijjujug taqsaliqpaa',
 
 # Edit pages
-'summary'         => 'suvit',
+'summary'         => 'suvit:',
 'minoredit'       => 'ukiukiluaq asianngutuq',
 'watchthis'       => 'uvva',
 'savearticle'     => 'uqausillaringgita titiraqtauninggil',
 'preview'         => 'uvva qangasaanguliqtuq',
 'showpreview'     => 'surkuqpaa alakkautivuq sivuliqpaa uqaasillarigita titiraqtauningigit',
 'showdiff'        => 'alakkatippaa asianngutuq',
-'summary-preview' => 'suvit preview',
+'summary-preview' => 'suvit preview:',
 'blockedtitle'    => 'aaqqiksuiji uminngasisijuq',
 'loginreqlink'    => 'akunnapuq',
 'newarticle'      => '(pigivuk)',
@@ -214,8 +214,8 @@ pigivuq qatannguti uikipitia kiinaujaqutiqarvik isuillingaitjapaa. iqtuu suqusiq
 'randomredirect' => 'nakituinnaq qaujisarniq qaningani kamagijaq aasit nakit',
 
 # Statistics
-'statistics' => 'kisitsisillgurlugitpasissitissat',
-'userstats'  => 'qatannguti kisitsisillgurlugitpasissitissat',
+'statistics'              => 'kisitsisillgurlugitpasissitissat',
+'statistics-header-users' => 'qatannguti kisitsisillgurlugitpasissitissat',
 
 'doubleredirects' => 'tapirqilik qaningani kamagijaq aasit nakit',
 
@@ -232,9 +232,6 @@ pigivuq qatannguti uikipitia kiinaujaqutiqarvik isuillingaitjapaa. iqtuu suqusiq
 # Book sources
 'booksources-go' => 'aivuq',
 
-# Special:Log
-'log-search-submit' => 'aivuk',
-
 # Special:AllPages
 'allpages'       => 'sunamittuq mappitaq',
 'nextpage'       => 'tagga mappitaq ($1)',
@@ -260,9 +257,12 @@ pigivuq qatannguti uikipitia kiinaujaqutiqarvik isuillingaitjapaa. iqtuu suqusiq
 'enotif_impersonal_salutation' => '{{SITENAME}} qatannguti',
 'created'                      => 'mappitaq anivuq',
 
-# Delete/protect/revert
-'dellogpage'          => 'nipaq nipi',
-'deletionlog'         => 'nipaq nipi',
+# Delete
+'dellogpage'  => 'nipaq nipi',
+'deletionlog' => 'nipaq nipi',
+
+# Protect
+'prot_1movedto2'      => '[[$1]] surramajuq [[$2]]',
 'protect-legend'      => 'patimmivaa sapummivaa',
 'protect-level-sysop' => 'sirlak titiraqsimajunik tuqquqtiriji',
 
@@ -331,7 +331,7 @@ pigivuq qatannguti uikipitia kiinaujaqutiqarvik isuillingaitjapaa. iqtuu suqusiq
 'previousdiff' => '� tunullipaaq asiaNngutuq',
 'nextdiff'     => 'tagga asiaNngutuq mappitaq →',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'ivaaqpuq',
 'bydate'   => 'pitaaruttuq inuulirvik',
 
@@ -347,9 +347,6 @@ pigivuq qatannguti uikipitia kiinaujaqutiqarvik isuillingaitjapaa. iqtuu suqusiq
 # 'all' in various places, this might be different for inflected languages
 'monthsall' => 'sunamittuq',
 
-# HTML dump
-'redirectingto' => 'qaningani kamagijaq aasit nakit [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'akaujuq',
 
diff --git a/languages/messages/MessagesIlo.php b/languages/messages/MessagesIlo.php
index da3524ff..5f756a28 100644
--- a/languages/messages/MessagesIlo.php
+++ b/languages/messages/MessagesIlo.php
@@ -55,8 +55,6 @@ $messages = array(
 'underline-never'   => 'Saan',
 'underline-default' => 'Kasisigud ti browser',
 
-'skinpreview' => '(I-preview)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Lunes',
@@ -143,7 +141,7 @@ $messages = array(
 'mytalk'         => 'pakitungtongak',
 'anontalk'       => 'Tungtongan iti daytoy nga IP',
 'navigation'     => 'Pagdaliasatan',
-'and'            => 'ken',
+'and'            => '&#32;ken',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -206,8 +204,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Maipapan iti {{SITENAME}}',
 'aboutpage'            => 'Project:Maipapan',
-'bugreports'           => 'Dagiti report iti kammali',
-'bugreportspage'       => 'Project:Dagiti report iti kammali',
 'copyright'            => 'Dagiti linaon ket maidaya babaen ti $1.',
 'copyrightpagename'    => '{{SITENAME}} karbengan-pablaak',
 'copyrightpage'        => '{{ns:project}}:Dagiti Karbengan-Panagipablaak',
@@ -230,8 +226,6 @@ $messages = array(
 
 'badaccess'        => 'Biddut iti pammalubos',
 'badaccess-group0' => 'Saanka a mapalubosan a mangpataray iti aksion a kiniddawmo.',
-'badaccess-group1' => 'Ti kiniddawmo nga aramiden ket limitado laeng kadagiti agar-aramat iti bunggoy a $1.',
-'badaccess-group2' => 'Ti kiniddawmo nga aramiden ket limitado laeng kadagiti agar-aramat iti maysa kadagiti bunggoy $1.',
 'badaccess-groups' => 'Ti kiniddawmo nga aramiden ket limitado laeng kadagiti agar-aramat iti maysa kadagiti bunggoy $1.',
 
 'versionrequired'     => 'Masapul ti version $1 ti MediaWiki',
@@ -324,7 +318,7 @@ Query: $2',
 'viewsourcetext'       => 'Mabalinmo a kitaen ken kopiaen ti taudan daytoy a panid:',
 'editinginterface'     => "'''Ballaag:''' Ed-editem ti maysa a panid a maar-aramat a mangted iti texto ti interface para iti software.
 Dagiti panangbalbaliw iti daytoy a panid ket apektaranna ti langa ti user interface ti sabsabali nga agar-aramat.
-Para kadagiti patarus, pangngaasim ta padasem nga aramaten ti [http://translatewiki.net/wiki/Main_Page?setlang=ilo Betawiki], ti MediaWiki localisation project.",
+Para kadagiti patarus, pangngaasim ta padasem nga aramaten ti [http://translatewiki.net/wiki/Main_Page?setlang=ilo translatewiki.net], ti MediaWiki localisation project.",
 'sqlhidden'            => '(nakalemmeng ti SQL query)',
 'namespaceprotected'   => "Awananka iti pammalubos a mangbaliw kadagiti panid iti '''$1''' a namespace.",
 'customcssjsprotected' => 'Awananka iti pammalubos a mangedit iti daytoy a panid, agsipud ta adda linaonna a personal a settings ti sabali nga agar-aramat.',
@@ -334,7 +328,7 @@ Ti naited a rason ket ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Rummuar ti agar-aramat',
-'logouttext'                 => "<strong>Nakaruarkan.</strong>
+'logouttext'                 => "'''Nakaruarkan.'''
 
 Mabalinmo nga ituloy ti agaramat iti {{SITENAME}} a kas di am-ammo, wenno makastrek manen a kas iti sigud wenno kas sabali nga agar-aramat.
 Laglagipem a sumagmamano a pampanid ti mabalin a nakaparang latta a kasla nakaloginka pay laeng, agingga a dim' pay dalusan ti cache ti browsermo.",
@@ -347,7 +341,6 @@ Dimo liplipatan a sukatan dagiti preferenciam iti [[Special:Preferences|{{SITENA
 'yourpasswordagain'          => 'Uliten ti pasesbalikas',
 'remembermypassword'         => 'Laglagipennak',
 'yourdomainname'             => 'Ti bukodmo a domain:',
-'loginproblem'               => '<b>Adda a parikut iti panag-loginmo.</b><br />Padasem manen!',
 'login'                      => 'Sumrek',
 'nav-login-createaccount'    => 'Mangaramid iti account wenno ag-login',
 'loginprompt'                => 'Nasken a naka-enable dagiti cookies ti browser tapno maka-login iti {{SITENAME}}.',
@@ -419,10 +412,12 @@ Saankan a makaaramid pay.',
 # Password reset dialog
 'resetpass'           => 'Sukatan ti pasesbalikas ti account',
 'resetpass_header'    => 'Sukatan ti pasesbalikas',
+'oldpassword'         => 'Daan a pasesbalikas:',
+'newpassword'         => 'Baro a pasesbalikas:',
+'retypenew'           => 'Isurat manen ti baro a pasesbalikas:',
 'resetpass_submit'    => 'Ikabil ti pasesbalikas ken login',
 'resetpass_success'   => 'Sibaballigi a nabaliwan ti pasesbalikasmo! Sumsumrekkan...',
 'resetpass_forbidden' => 'Saan a mabalin a baliwan dagiti pasesbalikas iti {{SITENAME}}',
-'resetpass_missing'   => 'Awan ti form data.',
 
 # Edit page toolbar
 'bold_sample'     => 'Napuskol a texto',
@@ -445,8 +440,8 @@ Saankan a makaaramid pay.',
 'hr_tip'          => 'Pakuros a linia (manmano la nga aramaten)',
 
 # Edit pages
-'summary'                          => 'Pakabuklan',
-'subject'                          => 'Sujeto/paulo',
+'summary'                          => 'Pakabuklan:',
+'subject'                          => 'Sujeto/paulo:',
 'minoredit'                        => 'Bassit a balbaliw laeng daytoy',
 'watchthis'                        => 'Bantayan',
 'savearticle'                      => 'Idulin ti panid',
@@ -461,8 +456,8 @@ No iklikmo ti Idulin manen, saan a maidulin ti editmo no awan pakabuklan.",
 'missingcommenttext'               => 'Pangngaasim ta mangipanka iti komento iti baba.',
 'missingcommentheader'             => "'''Palagip:''' Saanka a nangipan iti subject/paulo para iti daytoy a komento.
 No iklikmo manen ti Save, maidulin ti panageditmo nga awanan subject wenno paulo.",
-'summary-preview'                  => 'Preview ti pakabuklan',
-'subject-preview'                  => 'Preview ti subject/headline',
+'summary-preview'                  => 'Preview ti pakabuklan:',
+'subject-preview'                  => 'Preview ti subject/headline:',
 'blockedtitle'                     => 'Nabangenan ti agar-aramat',
 'blockedtext'                      => "<big>'''Naserraan ti nagan wenno ti IP addressmo.'''</big>
 
@@ -495,8 +490,8 @@ Ket agsipud ta awan ti $1 a benneg, awan ti pangidulinan iti editmo.',
 'userpage-userdoesnotexist'        => 'Ti account ti agar-aramat "$1" ket saan a nakarehistro. Pangngaasim ta tsek-apem no kayatmo a partuaten wenno editen daytoy a panid.',
 'usercsspreview'                   => "'''Laglagipem nga ipre-previem laeng ti user CSS, saan pay a naidulin!'''",
 'updated'                          => '(Napabaro)',
-'note'                             => '<strong>Palagip:</strong>',
-'previewnote'                      => '<strong>Maysa laeng a preview daytoy; dagiti balbaliw ket saan pay a naidulin!</strong>',
+'note'                             => "'''Palagip:'''",
+'previewnote'                      => "'''Maysa laeng a preview daytoy; dagiti balbaliw ket saan pay a naidulin!'''",
 'editing'                          => 'Mabalbaliwan ti $1',
 'editingsection'                   => 'Mabalbaliwan ti $1 (benneg)',
 'editingcomment'                   => 'Mabalbaliwan ti $1 (komento)',
@@ -504,19 +499,19 @@ Ket agsipud ta awan ti $1 a benneg, awan ti pangidulinan iti editmo.',
 'yourtext'                         => 'Ti textom',
 'storedversion'                    => 'Version a nakakamada',
 'yourdiff'                         => 'Dagiti nagdudumaan',
-'copyrightwarning'                 => 'Laglagipenyo koma, apo, nga amin a kontribusion iti {{SITENAME}} ket maibilang a nairuar iti babaen ti $2 (kitaen ti $1 para kadagiti detalie). No dimo kayat a ti sinuratmo ket maedit wenno mabalbaliwan nga awanan-asi ken maiwaras nga awan sungsungbatan kenka, saanmo laengen nga ip-ipan wenno ipabpablaak ditoy.<br /><br /> Kasta met nga ikarim kadakami a bukodmo a sinurat wenno gapuanan daytoy, wenno kinopiam ngem iti maysa a nawaya a pagtagikuaan ti publiko wenno pumadmad a libre a pagtaudan. <strong>SAAN A MANGIPAN ITI ADDAAN COPYRIGHT NGA OBRA NO AWANAN PAMMALUBOS!</strong>',
-'copyrightwarning2'                => 'Pangngaasiyo, apo, ta laglagipen nga amin a kontribusion iti {{SITENAME}} ket mabalin a maedit wenno mabalbaliwan, masuktan, wenno ikkaten dagiti sabali pay a nga agar-aramat.
+'copyrightwarning'                 => "Laglagipenyo koma, apo, nga amin a kontribusion iti {{SITENAME}} ket maibilang a nairuar iti babaen ti $2 (kitaen ti $1 para kadagiti detalie). No dimo kayat a ti sinuratmo ket maedit wenno mabalbaliwan nga awanan-asi ken maiwaras nga awan sungsungbatan kenka, saanmo laengen nga ip-ipan wenno ipabpablaak ditoy.<br /><br /> Kasta met nga ikarim kadakami a bukodmo a sinurat wenno gapuanan daytoy, wenno kinopiam ngem iti maysa a nawaya a pagtagikuaan ti publiko wenno pumadmad a libre a pagtaudan. '''SAAN A MANGIPAN ITI ADDAAN COPYRIGHT NGA OBRA NO AWANAN PAMMALUBOS!'''",
+'copyrightwarning2'                => "Pangngaasiyo, apo, ta laglagipen nga amin a kontribusion iti {{SITENAME}} ket mabalin a maedit wenno mabalbaliwan, masuktan, wenno ikkaten dagiti sabali pay a nga agar-aramat.
 No dimo kayat a ti sinuratmo ket maedit wenno mabalbaliwan nga awanan-asi ken maiwaras nga awan sungsungbatan kenka, saanmo laengen nga ip-ipan wenno ipabpablaak ditoy.<br />
 Kasta met nga ikarim kadakami a bukodmo a sinurat wenno gapuanan daytoy, wenno kinopiam ngem iti maysa a nawaya a pagtagikuaan ti publiko wenno pumadmad a libre a pagtaudan (kitaen ti $1 para iti detalie).
-<strong>SAAN A MANGIPAN ITI ADDAAN COPYRIGHT NGA OBRA NO AWANAN PAMMALUBOS!</strong>',
-'longpagewarning'                  => '<strong>BALLAAG: Agatiddog daytoy a panid iti $1 a kilobytes;
+'''SAAN A MANGIPAN ITI ADDAAN COPYRIGHT NGA OBRA NO AWANAN PAMMALUBOS!'''",
+'longpagewarning'                  => "'''BALLAAG: Agatiddog daytoy a panid iti $1 a kilobytes;
 amangan ta sumagmamano a browsers ket agparikut iti panagedit iti pampanid a dandani 32 kb, wenno ad-adu pay, ti kaatiddogna.
-Pangngaasim ta padasem a pasetpasetem ti panid iti babbabassit a benneg.</strong>',
-'longpageerror'                    => "<strong>BIDDUT: Ti texto nga insumitem ket agatiddog iti $1 a kilobytes, nga at-atiddog nga amang ngem ti maximum a $2 a kilobytes.
-Isut' gapuna a saan a maidulin.</strong>",
-'protectedpagewarning'             => '<strong>BALLAAG:  Daytoy a panid ket nabalunetan tapno dagiti laeng agar-aramat nga addaan previlehio a sysop wenno administrador ti makabalbaliw itoy.</strong>',
+Pangngaasim ta padasem a pasetpasetem ti panid iti babbabassit a benneg.'''",
+'longpageerror'                    => "'''BIDDUT: Ti texto nga insumitem ket agatiddog iti $1 a kilobytes, nga at-atiddog nga amang ngem ti maximum a $2 a kilobytes.
+Isut' gapuna a saan a maidulin.'''",
+'protectedpagewarning'             => "'''BALLAAG:  Daytoy a panid ket nabalunetan tapno dagiti laeng agar-aramat nga addaan previlehio a sysop wenno administrador ti makabalbaliw itoy.'''",
 'semiprotectedpagewarning'         => "'''Pakaammo:''' Nabalunetan daytoy a panid tapno dagiti laeng nakarehistro nga agar-aramat ti makaedit.",
-'titleprotectedwarning'            => '<strong>BALLAAG:  Nabalunetan daytoy a panid tapno sumagmamano laeng nga agar-aramat ti mabalin a mangparnuay.</strong>',
+'titleprotectedwarning'            => "'''BALLAAG:  Nabalunetan daytoy a panid tapno sumagmamano laeng nga agar-aramat ti mabalin a mangparnuay.'''",
 'templatesused'                    => 'Dagiti template a naaramat iti daytoy a panid:',
 'templatesusedpreview'             => 'Dagiti template a naaramat iti daytoy a preview:',
 'templatesusedsection'             => 'Dagiti templates a naaramat iti daytoy a benneg:',
@@ -551,28 +546,28 @@ Adda ti log ti pannakaikkat daytoy a panid ditoy kas pangkitaan:",
 Ti inted a rason ni $3 ket ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Kitaen dagiti logs para iti daytoy a panid',
-'nohistory'           => 'Awan ti pakasaritaan ti panangbaliw iti daytoy a panid.',
-'revnotfound'         => 'Di masarakan ti panangbalbaliw',
-'currentrev'          => 'Agdama a revision',
-'revisionasof'        => 'Panangbalbaliw sipud $1',
-'revision-info'       => 'Panangbaliw ni $2 sipud idi $1',
-'previousrevision'    => '�Nadadaan a panangbalbaliw',
-'nextrevision'        => 'Nabarbaro a panangbalbaliw→',
-'currentrevisionlink' => 'kitaen ti agdama a revision',
-'cur'                 => 'agdama',
-'next'                => 'sumaruno',
-'last'                => 'naudi',
-'page_first'          => 'umuna',
-'page_last'           => 'naudi',
-'histlegend'          => 'Diff selection: markaan dagiti kahon ti radio dagiti version tapno mapaggidiat sa pislen ti enter wenno ti buton iti baba.<br />
+'viewpagelogs'           => 'Kitaen dagiti logs para iti daytoy a panid',
+'nohistory'              => 'Awan ti pakasaritaan ti panangbaliw iti daytoy a panid.',
+'currentrev'             => 'Agdama a revision',
+'revisionasof'           => 'Panangbalbaliw sipud $1',
+'revision-info'          => 'Panangbaliw ni $2 sipud idi $1', # Additionally available: $3: revision id
+'previousrevision'       => '�Nadadaan a panangbalbaliw',
+'nextrevision'           => 'Nabarbaro a panangbalbaliw→',
+'currentrevisionlink'    => 'kitaen ti agdama a revision',
+'cur'                    => 'agdama',
+'next'                   => 'sumaruno',
+'last'                   => 'naudi',
+'page_first'             => 'umuna',
+'page_last'              => 'naudi',
+'histlegend'             => 'Diff selection: markaan dagiti kahon ti radio dagiti version tapno mapaggidiat sa pislen ti enter wenno ti buton iti baba.<br />
 Legend: (agdama) = paggidiatan iti agdama a version,
 (naudi) = naggidiatan iti sarsarunuen a version, M = minor nga edit.',
-'deletedrev'          => '[naikkaten]',
-'histfirst'           => 'Kaunaan',
-'histlast'            => 'Kaudian',
-'historysize'         => '({{PLURAL:$1|1 a byte|$1 a bytes}})',
-'historyempty'        => '(blanko)',
+'history-fieldset-title' => 'Palabsan ti pakasaritaan',
+'deletedrev'             => '[naikkaten]',
+'histfirst'              => 'Kaunaan',
+'histlast'               => 'Kaudian',
+'historysize'            => '({{PLURAL:$1|1 a byte|$1 a bytes}})',
+'historyempty'           => '(blanko)',
 
 # Revision feed
 'history-feed-title'          => 'Pakasaritaan ti panamalbaliw',
@@ -650,6 +645,7 @@ Mabalinmo a [[:\$1|partuaten daytoy a panid]].",
 'prevn'                     => 'napalabas $1',
 'nextn'                     => 'sumaruno $1',
 'viewprevnext'              => 'Kitaen ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:Dagiti Linaon',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 a balikas|$2 a balbalikas}})',
 'search-result-score'       => 'Relevance: $1%',
 'search-redirect'           => '(ibaw-ing ti $1)',
@@ -686,6 +682,7 @@ Mabalinmo a [[:\$1|partuaten daytoy a panid]].",
 'qbsettings-floatingright' => 'Floating right',
 'changepassword'           => 'Baliwan ti password',
 'skin'                     => 'Kudil',
+'skin-preview'             => 'I-preview',
 'math'                     => 'Math',
 'dateformat'               => 'Format ti petsa',
 'datedefault'              => 'Awanan preferencia',
@@ -704,9 +701,6 @@ itsek ti husto a panangikapet iti latex, dvips, gs, samo i-convert',
 'prefs-misc'               => 'Misc',
 'saveprefs'                => 'I-save',
 'resetprefs'               => 'Dalusan dagiti saan a naidulin a panamalbaliw',
-'oldpassword'              => 'Daan a pasesbalikas:',
-'newpassword'              => 'Baro a pasesbalikas:',
-'retypenew'                => 'Isurat manen ti baro a pasesbalikas:',
 'searchresultshead'        => 'Sapulen',
 'resultsperpage'           => 'Hits ti kada panid:',
 'contextlines'             => 'Hit kada linia:',
@@ -866,17 +860,17 @@ Dagiti panid iti [[Special:Watchlist|listaan ti bambantayam]] ket '''naipuskol''
 'upload_source_url'  => ' (maysa a valido, ken maakses ti publico nga URL)',
 'upload_source_file' => ' (file iti kompiutermo)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Agsapul iti nagan ti media:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Agsapul iti nagan ti media:',
 'imgfile'               => 'file',
-'imagelist'             => 'Listaan ti file',
-'imagelist_date'        => 'Petsa',
-'imagelist_name'        => 'Nagan',
-'imagelist_user'        => 'Agar-aramat',
-'imagelist_size'        => 'Kadakkel',
-'imagelist_description' => 'Deskripsion',
-
-# Image description page
+'listfiles'             => 'Listaan ti file',
+'listfiles_date'        => 'Petsa',
+'listfiles_name'        => 'Nagan',
+'listfiles_user'        => 'Agar-aramat',
+'listfiles_size'        => 'Kadakkel',
+'listfiles_description' => 'Deskripsion',
+
+# File description page
 'filehist'                       => 'Pakasaritaan ti file',
 'filehist-help'                  => 'Mangiklikka iti maysa a petsa/oras tapno makitam ti file iti kasisigudna a langa iti dayta nga oras.',
 'filehist-deleteall'             => 'ikkaten amin',
@@ -949,10 +943,9 @@ Dagiti panid iti [[Special:Watchlist|listaan ti bambantayam]] ket '''naipuskol''
 'randomredirect-nopages' => 'Awan ti bawbaw-ing iti daytoy a namespace.',
 
 # Statistics
-'statistics'             => 'Estadistika',
-'sitestats'              => 'Statistics ti {{SITENAME}}',
-'userstats'              => 'Estadistika ti agar-aramat',
-'statistics-mostpopular' => 'Kanayon a mabuya a pampanid',
+'statistics'              => 'Estadistika',
+'statistics-header-users' => 'Estadistika ti agar-aramat',
+'statistics-mostpopular'  => 'Kanayon a mabuya a pampanid',
 
 'disambiguations'     => 'Dagiti panid ti panangilawlawag',
 'disambiguationspage' => 'Template:disambig',
@@ -1022,8 +1015,6 @@ Dagiti panid iti [[Special:Watchlist|listaan ti bambantayam]] ket '''naipuskol''
 'speciallogtitlelabel' => 'Titulo:',
 'log'                  => 'Dagiti Logs',
 'all-logs-page'        => 'Amin a log',
-'log-search-legend'    => 'Agsapul kadagiti logs',
-'log-search-submit'    => 'Inkan',
 'log-title-wildcard'   => 'Agsapul iti titulos nga agrugi iti daytoy a texto',
 
 # Special:AllPages
@@ -1047,6 +1038,9 @@ Dagiti panid iti [[Special:Watchlist|listaan ti bambantayam]] ket '''naipuskol''
 'special-categories-sort-count' => 'urnosen babaen ti bilang',
 'special-categories-sort-abc'   => 'urnosen nga alfabetikal',
 
+# Special:LinkSearch
+'linksearch' => 'Biroken dagiti panilpo a web',
+
 # Special:ListUsers
 'listusersfrom'      => 'Iparang dagiti agar-aramat mangrugi iti:',
 'listusers-submit'   => 'Ipakita',
@@ -1074,34 +1068,28 @@ Dagiti panid iti [[Special:Watchlist|listaan ti bambantayam]] ket '''naipuskol''
 'emailsenttext'   => 'Naipatuloden ti mensahe ti emailmo.',
 
 # Watchlist
-'watchlist'            => 'Dagiti bambantayak',
-'mywatchlist'          => 'Dagiti bambantayak',
-'watchlistfor'         => "(para ken ni '''$1''')",
-'nowatchlist'          => 'Awan ti pampanid iti listaan dagiti bambantayam.',
-'watchnologin'         => 'Saan a nakastrek',
-'watchnologintext'     => 'Nasken a [[Special:UserLogin|naka-loginka]] tapno mabaliwam dagiti bambantayam a panid.',
-'addedwatch'           => 'Nainayon kadagiti bambantayan',
-'addedwatchtext'       => "Nainayonen ti panid a \"[[:\$1]]\" iti [[Special:Watchlist|listaan ti bambantayam]].
+'watchlist'         => 'Dagiti bambantayak',
+'mywatchlist'       => 'Dagiti bambantayak',
+'watchlistfor'      => "(para ken ni '''$1''')",
+'nowatchlist'       => 'Awan ti pampanid iti listaan dagiti bambantayam.',
+'watchnologin'      => 'Saan a nakastrek',
+'watchnologintext'  => 'Nasken a [[Special:UserLogin|naka-loginka]] tapno mabaliwam dagiti bambantayam a panid.',
+'addedwatch'        => 'Nainayon kadagiti bambantayan',
+'addedwatchtext'    => "Nainayonen ti panid a \"[[:\$1]]\" iti [[Special:Watchlist|listaan ti bambantayam]].
 Mailistanto ditoy dagiti pannkabalbaliw daytoy a panid iti masakbayan agraman ti kanaigna a panid-tungtongan, ket agparang ti panid a kas '''napuskol''' iti [[Special:RecentChanges|listaan ti naudi a balbaliw]] tapno nalaklaka a malasin.",
-'removedwatch'         => 'Naikkaten kadagiti bambantayan',
-'removedwatchtext'     => 'Naikkaten ti panid a "[[:$1]]" iti listaan ti bambantayam.',
-'watch'                => 'bantayan',
-'watchthispage'        => 'Bantayan daytoy a panid',
-'unwatch'              => 'saanen a bantayan',
-'unwatchthispage'      => 'Isardeng a bantayan daytoy a panid',
-'notvisiblerev'        => 'Naikkaten ti panangbalbaliw',
-'watchlist-details'    => '{{PLURAL:$1|$1 panid|$1 pampanid}} a bambantayan, saan a mairaman dagiti panid ti tungtongan.',
-'wlheader-enotif'      => '* Napagbalin ti email notification.',
-'watchlistcontains'    => 'Addaan ti listaan ti bambantayam iti $1 {{PLURAL:$1|a panid|a pampanid}}.',
-'iteminvalidname'      => "Parikut iti item '$1', saan a mabalin a nagan...",
-'wlnote'               => "Adda iti baba {{PLURAL:$1|ti kaudian a pannakabaliw|dagiti kaudian '''$1''' a pannakabaliw}} iti naudi a {{PLURAL:$2|oras|'''$2''' oras}}.",
-'wlshowlast'           => 'Ipakita dagiti naudi a $1 nga or-oras $2 nga al-aldaw $3',
-'watchlist-show-bots'  => 'Ipakita dagiti bot edits',
-'watchlist-hide-bots'  => 'Ilemmeng dagiti bot edits',
-'watchlist-show-own'   => 'Ipakita dagiti panangbalbaliwko',
-'watchlist-hide-own'   => 'Ilemmeng dagiti panangbalbaliwko',
-'watchlist-show-minor' => 'Ipakita dagiti babassit a baliw',
-'watchlist-hide-minor' => 'Ilemmeng dagiti babassit a baliw',
+'removedwatch'      => 'Naikkaten kadagiti bambantayan',
+'removedwatchtext'  => 'Naikkaten ti panid a "[[:$1]]" iti listaan ti bambantayam.',
+'watch'             => 'bantayan',
+'watchthispage'     => 'Bantayan daytoy a panid',
+'unwatch'           => 'saanen a bantayan',
+'unwatchthispage'   => 'Isardeng a bantayan daytoy a panid',
+'notvisiblerev'     => 'Naikkaten ti panangbalbaliw',
+'watchlist-details' => '{{PLURAL:$1|$1 panid|$1 pampanid}} a bambantayan, saan a mairaman dagiti panid ti tungtongan.',
+'wlheader-enotif'   => '* Napagbalin ti email notification.',
+'watchlistcontains' => 'Addaan ti listaan ti bambantayam iti $1 {{PLURAL:$1|a panid|a pampanid}}.',
+'iteminvalidname'   => "Parikut iti item '$1', saan a mabalin a nagan...",
+'wlnote'            => "Adda iti baba {{PLURAL:$1|ti kaudian a pannakabaliw|dagiti kaudian '''$1''' a pannakabaliw}} iti naudi a {{PLURAL:$2|oras|'''$2''' oras}}.",
+'wlshowlast'        => 'Ipakita dagiti naudi a $1 nga or-oras $2 nga al-aldaw $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Bambantayan...',
@@ -1118,55 +1106,60 @@ Mailistanto ditoy dagiti pannkabalbaliw daytoy a panid iti masakbayan agraman ti
 'enotif_lastdiff'              => 'kitaen ti $1 tapno mabuya daytoy a panangbaliw.',
 'enotif_anon_editor'           => 'di am-ammo nga agar-aramat $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'Ikkaten ti panid',
-'confirm'                     => 'pasingkedan',
-'excontent'                   => "ti linaon ket: '$1'",
-'excontentauthor'             => "ti linaonna ket: '$1' (ket ti laeng contributor ket ni '[[Special:Contributions/$1|$2]]')",
-'exblank'                     => 'blanko ti panid',
-'delete-confirm'              => 'Ikkaten ti "$1"',
-'delete-legend'               => 'Ikkaten',
-'historywarning'              => 'Ballaag: Ti panid a kayatmo nga ikkaten ket addaan iti pakasaritaan:',
-'confirmdeletetext'           => 'Ikkatemon ti maysa a panid agraman am-amin a pakasaritaanna.
+# Delete
+'deletepage'             => 'Ikkaten ti panid',
+'confirm'                => 'pasingkedan',
+'excontent'              => "ti linaon ket: '$1'",
+'excontentauthor'        => "ti linaonna ket: '$1' (ket ti laeng contributor ket ni '[[Special:Contributions/$1|$2]]')",
+'exblank'                => 'blanko ti panid',
+'delete-confirm'         => 'Ikkaten ti "$1"',
+'delete-legend'          => 'Ikkaten',
+'historywarning'         => 'Ballaag: Ti panid a kayatmo nga ikkaten ket addaan iti pakasaritaan:',
+'confirmdeletetext'      => 'Ikkatemon ti maysa a panid agraman am-amin a pakasaritaanna.
 Pangngaasim ta pasingkedam a talaga a kayatmo nga aramiden daytoy, a maawatam ti bunga ti panangikkatmo, ken aramidem daytoy kas maiyannugot iti [[{{MediaWiki:Policy-url}}|annuroten]].',
-'actioncomplete'              => 'Nalpasen a naaramid',
-'deletedtext'                 => 'Naikkaten ti "<nowiki>$1</nowiki>".
+'actioncomplete'         => 'Nalpasen a naaramid',
+'deletedtext'            => 'Naikkaten ti "<nowiki>$1</nowiki>".
 Kitaen ti $2 para iti record dagiti naudi a naikkat.',
-'deletedarticle'              => 'naikkaten ti "[[$1]]"',
-'dellogpage'                  => 'Log ti naikkat',
-'dellogpagetext'              => 'Adda iti baba ti listaan dagiti kaudian a panangikkat.',
-'deletionlog'                 => 'log ti panagikkat',
-'reverted'                    => 'Naisubli iti immun-una a panamalbaliw',
-'deletecomment'               => 'Rason no apay nga ikkaten',
-'deleteotherreason'           => 'Sabali/dadduma pay a rason:',
-'deletereasonotherlist'       => 'Sabali a rason',
-'deletereason-dropdown'       => '*Kadawyan a gapgapu ti pannakaikkat
+'deletedarticle'         => 'naikkaten ti "[[$1]]"',
+'dellogpage'             => 'Log ti naikkat',
+'dellogpagetext'         => 'Adda iti baba ti listaan dagiti kaudian a panangikkat.',
+'deletionlog'            => 'log ti panagikkat',
+'reverted'               => 'Naisubli iti immun-una a panamalbaliw',
+'deletecomment'          => 'Rason no apay nga ikkaten',
+'deleteotherreason'      => 'Sabali/dadduma pay a rason:',
+'deletereasonotherlist'  => 'Sabali a rason',
+'deletereason-dropdown'  => '*Kadawyan a gapgapu ti pannakaikkat
 ** Kiddaw ti autor
 ** Panaglabsing iti copyright
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Editen dagiti rason ti panangikkat',
-'rollback'                    => 'Isubli dagiti panangbaliw',
-'rollback_short'              => 'Isubli',
-'rollbacklink'                => 'isubli',
-'rollbackfailed'              => 'Napaay ti panangisubli',
-'editcomment'                 => 'Ti komento ti panangedit ket: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Naikkat ti panangbaliw ni [[Special:Contributions/$2|$2]] ([[User talk:$2|Pagtutungtongan]]), naisubli iti kaudian a version ni [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Naibabawi dagiti panagedit ni $1;
+'delete-edit-reasonlist' => 'Editen dagiti rason ti panangikkat',
+
+# Rollback
+'rollback'         => 'Isubli dagiti panangbaliw',
+'rollback_short'   => 'Isubli',
+'rollbacklink'     => 'isubli',
+'rollbackfailed'   => 'Napaay ti panangisubli',
+'editcomment'      => "Ti komento ti panangedit ket: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Naikkat ti panangbaliw ni [[Special:Contributions/$2|$2]] ([[User talk:$2|Pagtutungtongan]]), naisubli iti kaudian a version ni [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Naibabawi dagiti panagedit ni $1;
 naisubli manen iti naudi a version ni $2.',
+
+# Protect
 'protectlogpage'              => 'Log ti panangsaluad',
 'protectedarticle'            => 'nasaluadanen ti "[[$1]]"',
 'modifiedarticleprotection'   => 'nasukatan ti level ti saluad para iti "[[$1]]"',
 'unprotectedarticle'          => 'naikkat ti saluad ti "[[$1]]"',
 'protect-title'               => 'Sukatan ti level ti saluad para iti "$1"',
+'prot_1movedto2'              => '[[$1]] naiyakar iti [[$2]]',
 'protect-legend'              => 'Pasingkedan ti panangsaluad',
 'protectcomment'              => 'Rason no apay a saluadan daytoy a panid',
 'protectexpiry'               => 'Agpaso inton:',
 'protect_expiry_invalid'      => 'Saan a mabalin ti oras a panagpaso.',
 'protect_expiry_old'          => 'Adda iti napalabas ti oras ti panagpaso.',
 'protect-unchain'             => 'Luktan dagiti pammalubos iti panagiyakar',
-'protect-text'                => 'Mabalinmo a kitaen ken sukatan ti agpang ti saluad ditoy ti panid a <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Awanan pammalubos ti accountmo a mangbaliw kadagiti level ti saluad ti panid.
-Dagitoy dagiti agdama a settings ti panid a <strong>$1</strong>:',
+'protect-text'                => "Mabalinmo a kitaen ken sukatan ti agpang ti saluad ditoy ti panid a '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Awanan pammalubos ti accountmo a mangbaliw kadagiti level ti saluad ti panid.
+Dagitoy dagiti agdama a settings ti panid a '''$1''':",
 'protect-cascadeon'           => 'Daytoy a panid ket sisasaluad iti agdama gapu ta nairaman iti sumaganad a {{PLURAL:$1|panid, nga addaan|pampanid, nga addaan}} iti sipapakat a cascading a saluad.
 Mabalinmo a sukatan ti level ti saluad daytoy a panid, ngem saanna nga apektaran ti cascading a saluad.',
 'protect-default'             => '(kasisigud)',
@@ -1177,6 +1170,7 @@ Mabalinmo a sukatan ti level ti saluad daytoy a panid, ngem saanna nga apektaran
 'protect-expiring'            => 'agpaso inton $1 (UTC)',
 'protect-cascade'             => 'Saluadan dagiti pampanid a nairaman iti daytoy a panid (babaen ti cascading a saluad)',
 'protect-cantedit'            => 'Saanmo a masuktan ti level ti saluad daytoy a panid, ta awananka iti pammalubos a mangbalbaliw..',
+'protect-expiry-options'      => '2 nga oras:2 hours,1 nga aldaw:1 day,3 nga aldaw:3 days,1 a lawas:1 week,2 a lawas:2 weeks,1 a bulan:1 month,3 a bulan:3 months,6 a bulan:6 months,1 a tawen:1 year,awan inggana:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pammalubos:',
 'restriction-level'           => 'Level ti pannakaiparit:',
 'minimum-size'                => 'Min a size',
@@ -1241,7 +1235,6 @@ Binsiren ti [[Special:Log/delete|log ti naik-ikkat]] para iti rekord dagiti naud
 'whatlinkshere'            => 'Dagiti nakasilpo ditoy',
 'whatlinkshere-title'      => 'Dagiti panid a nakasilpo iti $1',
 'whatlinkshere-page'       => 'Panid:',
-'linklistsub'              => '(Listaan dagiti panilpo)',
 'linkshere'                => "Nakasilpo ti sumaganad a pampanid iti '''[[:$1]]''':",
 'nolinkshere'              => "Awan pampanid a nakasilpo iti '''[[:$1]]'''.",
 'isredirect'               => 'ibaw-ing ti panid',
@@ -1343,6 +1336,8 @@ pangngaasim ta pasingkedam a maawatam ti ibunga dayoty sakbay nga agtuloyka a ma
 
 Kadagitoy a kaso, masapul nga iyakar wenno itiponmo a manual ti panid no kayatmo.",
 'movearticle'             => 'Iyakar ti panid',
+'movenologin'             => 'Saan a nakastrek',
+'movenologintext'         => 'Nasken a nakarehistroka nga agar-aramat ken [[Special:UserLogin|nakastrek]] tapno makaiyakarka iti panid.',
 'movenotallowed'          => 'Awanka iti pammalubos nga agiyakar iti pampanid.',
 'newtitle'                => 'Iti baro a titulo:',
 'move-watch'              => 'Bantayan daytoy a panid',
@@ -1390,6 +1385,7 @@ Pangngaasim ta i-manualmo lattan a pagtiponem ida.'''",
 'importinterwiki'          => 'Angkat a transwiki',
 'import-interwiki-history' => 'Kopiaen amin a versions ti pakasaritaan daytoy a panid',
 'import-interwiki-submit'  => 'Angkaten',
+'import-comment'           => 'Komento:',
 'importstart'              => 'Agang-angkat iti pampanid...',
 'import-revision-count'    => '$1 {{PLURAL:$1|a revision|a revisions}}',
 'importnopages'            => 'Awan pampanid a maangkat.',
@@ -1506,7 +1502,7 @@ Pangngaasim ta i-manualmo lattan a pagtiponem ida.'''",
 'show-big-image'       => 'Sibubukel a resolusion',
 'show-big-image-thumb' => '<small>Rukod daytoy a preview: $1 × $2 a pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria dagiti kabarbaro a files',
 'imagelisttext'         => "Adda iti baba ti listaan ti '''$1''' {{PLURAL:$1|a file|a files}} a naurnos kas $2.",
 'showhidebots'          => '($1 bots)',
@@ -1811,21 +1807,9 @@ $1
 'deletedwhileediting' => 'Ballaag: Naikkaten daytoy a panid kalpasan a rinugiam nga editen!',
 'recreate'            => 'Partuaten manen',
 
-# HTML dump
-'redirectingto' => 'Maibawbaw-ing iti [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Dalusan ti cache daytoy a panid?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Agsapul iti pampanid nga addaan ''$1''.",
-'searchnamed'      => "Agsapul iti pampanid a managan ''$1''.",
-'articletitles'    => "Pampanid nga agrugi iti ''$1''",
-'hideresults'      => 'Ilemmeng dagiti resulta',
-'useajaxsearch'    => 'Agaramat iti AJAX a pagbirok',
+'confirm-purge-top'    => 'Dalusan ti cache daytoy a panid?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� napalabas a panid',
diff --git a/languages/messages/MessagesInh.php b/languages/messages/MessagesInh.php
index 6c669f6e..03e325cd 100644
--- a/languages/messages/MessagesInh.php
+++ b/languages/messages/MessagesInh.php
@@ -54,8 +54,6 @@ $messages = array(
 'underline-never'   => 'ЦIаккха',
 'underline-default' => 'Браузер на�тройкаш хьа�ца',
 
-'skinpreview' => '(Хьажа)',
-
 # Dates
 'sunday'        => 'КIиранди',
 'monday'        => 'Оршот',
@@ -188,8 +186,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Опи�ани {{SITENAME}}',
 'aboutpage'            => 'Project:Опи�ани',
-'bugreports'           => 'Гiалата хоам',
-'bugreportspage'       => 'Project:Гiалата хоам',
 'currentevents'        => 'Хьанзар доалара хамаж',
 'currentevents-url'    => 'Project:Хьанзар доалара хама',
 'edithelp'             => 'Хувцамаш йие гIо',
@@ -207,8 +203,6 @@ $messages = array(
 
 'badaccess'        => 'Чу валар гIалата',
 'badaccess-group0' => 'Хьо де воалара хьюна де пурам дац',
-'badaccess-group1' => 'Хьо де воалара $1 группе бол чар ма де йиша �ц',
-'badaccess-group2' => 'Хьо де воалара $1 группаш юкъе бол чар ма де йиша �ц',
 'badaccess-groups' => 'Хьо де воалара $1 группаш юкъе бол чар ма де йиша �ц',
 
 'versionrequired'     => '$1 MediaWiki вер�и йиза',
@@ -216,6 +210,12 @@ $messages = array(
 
 'ok' => 'ОК',
 
+# Search results
+'searchhelp-url' => 'Help:Хьехар',
+
+# Preferences page
+'skin-preview' => 'Хьажа',
+
 # Special:Categories
 'categories' => 'Категореш',
 
diff --git a/languages/messages/MessagesIo.php b/languages/messages/MessagesIo.php
index 0c1c6150..141694c8 100644
--- a/languages/messages/MessagesIo.php
+++ b/languages/messages/MessagesIo.php
@@ -15,24 +15,27 @@
 $namespaceNames = array(
 	NS_MEDIA          => 'Media',
 	NS_SPECIAL        => 'Specala',
-	NS_MAIN           => '',
 	NS_TALK           => 'Debato',
 	NS_USER           => 'Uzanto',
 	NS_USER_TALK      => 'Uzanto_Debato',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_Debato',
-	NS_IMAGE          => 'Imajo',
-	NS_IMAGE_TALK     => 'Imajo_Debato',
+	NS_FILE           => 'Imajo',
+	NS_FILE_TALK      => 'Imajo_Debato',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Debato',
-	NS_TEMPLATE       => 'Shablono',
-	NS_TEMPLATE_TALK  => 'Shablono_Debato',
+	NS_TEMPLATE       => 'Modelo',
+	NS_TEMPLATE_TALK  => 'Modelo_Debato',
 	NS_HELP           => 'Helpo',
 	NS_HELP_TALK      => 'Helpo_Debato',
 	NS_CATEGORY       => 'Kategorio',
 	NS_CATEGORY_TALK  => 'Kategorio_Debato',
 );
 
+$namespaceAliases = array(
+	'Shablono' => NS_TEMPLATE,
+	'Shablono_Debato' => NS_TEMPLATE_TALK,
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'            => 'Sub-strekizez ligili:',
@@ -46,12 +49,11 @@ $messages = array(
 'tog-enotifusertalkpages'  => 'Sendez a me mesajo kande mea diskuto-pagino changesas',
 'tog-enotifminoredits'     => 'Sendez a me mesajo mem por mikra chanji',
 'tog-shownumberswatching'  => 'Montrez nombro di spektant uzeri',
+'tog-showhiddencats'       => 'Montrar celita kategorii',
 
 'underline-always' => 'Sempre',
 'underline-never'  => 'Nulatempe',
 
-'skinpreview' => '(Pre-videz)',
-
 # Dates
 'sunday'        => 'sundio',
 'monday'        => 'lundio',
@@ -105,11 +107,13 @@ $messages = array(
 'dec'           => 'dec',
 
 # Categories related messages
-'pagecategories'         => '{{PLURAL:$1|Kategorio|Kategorii}}',
-'category_header'        => 'Artikli en kategorio "$1"',
-'subcategories'          => 'Subkategorii',
-'category-empty'         => "''Nuntempe existas nula pagini en ita kategorio.''",
-'listingcontinuesabbrev' => 'seq.',
+'pagecategories'           => '{{PLURAL:$1|Kategorio|Kategorii}}',
+'category_header'          => 'Artikli en kategorio "$1"',
+'subcategories'            => 'Subkategorii',
+'category-empty'           => "''Nuntempe existas nula pagini en ita kategorio.''",
+'hidden-categories'        => '{{PLURAL:$1|Celita kategorio|Celita kategorii}}',
+'hidden-category-category' => 'Celita kategorii', # Name of the category where hidden categories will be listed
+'listingcontinuesabbrev'   => 'seq.',
 
 'mainpagetext' => "<big>'''MediaWiki instalesis sucese.'''</big>",
 
@@ -128,7 +132,7 @@ $messages = array(
 'mytalk'         => 'Mea diskuti',
 'anontalk'       => 'Diskuto relatant ad ica IP',
 'navigation'     => 'Navigado',
-'and'            => 'ed',
+'and'            => '&#32;ed',
 
 # Metadata in edit box
 'metadata_help' => 'Metadonaji:',
@@ -148,7 +152,7 @@ $messages = array(
 'printableversion'  => 'Imprimebla versiono',
 'permalink'         => 'Permananta ligilo',
 'print'             => 'Imprimar',
-'edit'              => 'Chanjez',
+'edit'              => 'Redaktar',
 'create'            => 'Krear',
 'editthispage'      => 'Redaktar ca pagino',
 'create-this-page'  => 'Kreez ca pagino',
@@ -156,6 +160,7 @@ $messages = array(
 'deletethispage'    => 'Efacar ica pagino',
 'undelete_short'    => 'Restaurar {{PLURAL:$1|1 redakto|$1 redakti}}',
 'protect'           => 'Protektar',
+'protect_change'    => 'chanjar',
 'protectthispage'   => 'Protektar ica pagino',
 'unprotect'         => 'Desprotektar',
 'unprotectthispage' => 'Desprotektar ica pagino',
@@ -164,14 +169,18 @@ $messages = array(
 'talkpagelinktext'  => 'Diskutez',
 'specialpage'       => 'Specala pagino',
 'personaltools'     => 'Personala utensili',
-'postcomment'       => 'komentez',
+'postcomment'       => 'Nova seciono',
 'articlepage'       => 'Regardar artiklo',
 'talk'              => 'Diskuto',
-'views'             => 'Nombro di vizitinti',
+'views'             => 'Apari',
 'toolbox'           => 'Utensili',
-'userpage'          => 'Vidar pagino di uzanto',
+'userpage'          => 'Vidar uzanto-pagino',
 'projectpage'       => 'Vidar projeto-pagino',
-'imagepage'         => 'Vidar pagino di imajo',
+'imagepage'         => 'Vidar arkivo-pagino',
+'mediawikipage'     => 'Vidar mesajo-pagino',
+'templatepage'      => 'Vidar shablono-pagino',
+'viewhelppage'      => 'Vidar helpo-pagino',
+'categorypage'      => 'Vidar kategorio-pagino',
 'viewtalkpage'      => 'Vidar debatado',
 'otherlanguages'    => 'En altra lingui',
 'redirectedfrom'    => '(Ridirektita de $1)',
@@ -186,8 +195,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Pri {{SITENAME}}',
 'aboutpage'            => 'Project:Pri',
-'bugreports'           => 'Informajo pri erori',
-'bugreportspage'       => 'Project:Informajo pri erori',
 'copyright'            => 'La kontenajo esas disponebla sub $1.',
 'currentevents'        => 'Aktualaji',
 'currentevents-url'    => 'Project:Aktualaji',
@@ -206,30 +213,32 @@ $messages = array(
 
 'badaccess'        => 'Eroro permisal',
 'badaccess-group0' => 'Vu ne permisesas agar quale vu demandas.',
-'badaccess-group1' => "L' ago quan vu demandabas es limitizita al uzeri en grupo $1.",
-'badaccess-group2' => "L' ago quan vu demandabas es limitizita al uzeri en un ek la grupi $1.",
-'badaccess-groups' => "L' ago quan vu demandabas es limitizita al uzeri en un ek la grupi $1.",
+'badaccess-groups' => "L'ago quan vu demandabas es limitizita al uzanti en {{PLURAL:$2|la grupo|un ek la grupi}}: $1.",
 
+'ok'                      => 'O.K.',
 'retrievedfrom'           => 'Obtenita de "$1"',
 'youhavenewmessages'      => 'Vu havas $1 ($2).',
 'newmessageslink'         => 'nova mesaji',
 'newmessagesdifflink'     => 'lasta chanjo',
 'youhavenewmessagesmulti' => 'Vu havas nova mesaji ye $1',
-'editsection'             => 'chanjez',
+'editsection'             => 'redaktar',
 'editold'                 => 'redaktar',
 'viewsourceold'           => 'vidar fonto',
-'editsectionhint'         => 'Chanjez segmento: $1',
+'editlink'                => 'redaktar',
+'viewsourcelink'          => 'vidar fonto',
+'editsectionhint'         => 'Redaktar seciono: $1',
 'toc'                     => 'Indexo',
 'showtoc'                 => 'montrar',
 'hidetoc'                 => 'celar',
 'thisisdeleted'           => 'Ka vidar o restaurar $1?',
 'viewdeleted'             => 'Vidar $1?',
 'restorelink'             => '{{PLURAL:$1|1 redakto efacita|$1 redakti efacita}}',
+'red-link-title'          => '$1 (pagino ne existas)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pagino',
 'nstab-user'      => 'Uzanto-pagino',
-'nstab-special'   => 'Specala',
+'nstab-special'   => 'Specala pagino',
 'nstab-project'   => 'Projeto pagino',
 'nstab-image'     => 'Arkivo',
 'nstab-mediawiki' => 'Mesajo',
@@ -247,7 +256,7 @@ A list of valid special pages can be found at [[Special:SpecialPages|{{int:speci
 # General errors
 'error'               => 'Eroro',
 'databaseerror'       => 'Datumarala eroro',
-'noconnect'           => 'Pardonez! La wiki havas ula teknikala desfacilaji ed ne povas konektar kun la datumaro. <br />
+'noconnect'           => 'Pardonez! La wiki havas ula teknikala desfacilaji ed ne povas konektar kun la datumaro.<br />
 $1',
 'nodb'                => 'Onu ne povas selektar datumaro $1',
 'cachederror'         => "Co esas kopiuro registragita ye la ''cache'' di la solicitita pagino, ed ol povus ne esar aktuala.",
@@ -269,16 +278,16 @@ evaluo pri kande eventos la desblokuso',
 'badtitle'            => 'Nekorekta titulo',
 'badtitletext'        => 'La solicitita pagino esas nevalida, vakua od esas
 nekorekta interlinguale od interwikale ligilo.',
-'perfdisabled'        => 'Pardonez! Ica traito desaktivigesis temporale pro olu lentigas la datumaro til facar {{SITENAME}} neuzebla.',
 'perfcached'          => 'La sequanta datumi esas kashizita* e li povus ne aktualigesar nuntempe.',
-'viewsource'          => 'Vidar *font-kodo',
+'viewsource'          => 'Vidar font-kodo',
 'viewsourcefor'       => 'de $1',
 'viewsourcetext'      => 'Vu povas vidar ed kopiar la fonto-kodexo di ta pagino:',
+'ns-specialprotected' => 'On ne povas redaktar speciala pagini.',
 
 # Login and logout pages
 'logouttitle'                => 'Ekiro',
-'logouttext'                 => '<strong>Vu esas nun ek {{SITENAME}}.</strong><br />
-Vu povas durar uzante {{SITENAME}} anonimale, o vu povas enirar altrafoye kom la sama o diferenta uzanto.',
+'logouttext'                 => "'''Vu esas nun ek {{SITENAME}}.'''<br />
+Vu povas durar uzante {{SITENAME}} anonimale, o vu povas enirar altrafoye kom la sama o diferenta uzanto.",
 'welcomecreation'            => '<h2>Bonveno, $1!</h2><p>Vua konto kreesis.
 Voluntez, ne obliviez chanjor vua preferaji.',
 'loginpagetitle'             => 'Registragar / Enirar',
@@ -287,13 +296,12 @@ Voluntez, ne obliviez chanjor vua preferaji.',
 'yourpasswordagain'          => 'Riskribez la pasovorto:',
 'remembermypassword'         => 'Memorez mea kontrolajo inter sesioni',
 'yourdomainname'             => 'Vua domano:',
-'loginproblem'               => '<b>Esis problemo kun vua eniro.</b><br />Probez altrafoye!',
 'login'                      => 'Enirar',
 'nav-login-createaccount'    => 'Enirar',
 'loginprompt'                => "Vu mustas permisar ''cookies'' por enirar a {{SITENAME}}.",
 'userlogin'                  => 'Enirar',
 'logout'                     => 'Ekirar',
-'userlogout'                 => 'Ekirez',
+'userlogout'                 => 'Ekirar',
 'notloggedin'                => 'Sesiono ne esas iniciata',
 'nologin'                    => 'Ka vu ne havas konto? $1.',
 'nologinlink'                => 'Kreez konto',
@@ -307,6 +315,7 @@ Voluntez, elektez ula diferanta uzantonomo.',
 'youremail'                  => 'Vua e-adreso:',
 'username'                   => 'Uzantonomo:',
 'uid'                        => 'ID dil uzanto:',
+'prefs-memberingroups'       => 'Membro di la {{PLURAL:$1|grupo|grupi}}:',
 'yourrealname'               => 'Vua reala nomo:',
 'yourlanguage'               => 'Linguo:',
 'yournick'                   => 'Signaturo:',
@@ -324,16 +333,26 @@ Kontrolez posibla erori od uzez la formularo infre por krear nova uzerokonto.',
 'wrongpasswordempty'         => 'Vu ne skribis pasovorto. Probez nove.',
 'passwordtooshort'           => 'Vua pasovorto es ne-valida o tro kurta.
 Ol mustas kontenar adminime {{PLURAL:$1|1 signo|$1 signi}} ed mustas esar diferanta kam vua uzantonomo.',
-'mailmypassword'             => 'Sendez a me nova pasovorto per e-posto.',
+'mailmypassword'             => 'Sendez nova pasovorto per e-posto',
 'passwordremindertitle'      => 'Pasovorto-memorilo por {{SITENAME}}',
 'noemail'                    => 'Ne esas e-adreso konservita por la uzanto "$1".',
 'passwordsent'               => 'Nova pasovorto sendesis a la e-adreso registragita por "$1".
 Voluntez enirar altrafoye pos recevar ol.',
 'mailerror'                  => 'Eroro sendante posto: $1',
-'acct_creation_throttle_hit' => 'Vu ja kreis $1 konti. Vu ne plus povas facar.',
+'acct_creation_throttle_hit' => 'Vu ja kreis {{PLURAL:$1|1 konto|$1 konti}}. Vu ne plus povas facar.',
+'accountcreated'             => 'Konto kreesis',
 'createaccount-title'        => 'Kreo di konto en {{SITENAME}}',
 'loginlanguagelabel'         => 'Linguo: $1',
 
+# Password reset dialog
+'resetpass'                 => 'Chanjar pasovorto',
+'resetpass_header'          => 'Chanjar pasovorto di konto',
+'oldpassword'               => 'Anciena pasovorto:',
+'newpassword'               => 'Nova pasovorto:',
+'retypenew'                 => 'Riskribez la nova pasovorto:',
+'resetpass-submit-loggedin' => 'Chanjar pasovorto',
+'resetpass-temp-password'   => 'Provizora pasovorto:',
+
 # Edit page toolbar
 'bold_sample'     => 'Dika literi',
 'bold_tip'        => 'Dika literi',
@@ -357,60 +376,67 @@ Voluntez enirar altrafoye pos recevar ol.',
 'hr_tip'          => 'Horizontala lineo (ne trouzez ol)',
 
 # Edit pages
-'summary'              => 'Rezumo',
-'subject'              => 'Temo / Titulo',
-'minoredit'            => 'Ico esas mikra chanjo',
-'watchthis'            => 'Surveyez ica artiklo',
-'savearticle'          => 'Registragar pagino',
-'preview'              => 'Previdar',
-'showpreview'          => 'Previdar',
-'showdiff'             => 'Montrez chanji',
-'blockedtitle'         => 'La uzanto esas blokusita',
-'whitelistedittitle'   => 'On mustas enskribar por redaktar',
-'whitelistedittext'    => 'Vu mustas $1 por redaktar pagini.',
-'loginreqtitle'        => 'Eniro esas postulata',
-'loginreqlink'         => 'enirar',
-'accmailtitle'         => 'Kontrolajo sendita.',
-'accmailtext'          => 'La kontrolajo por "$1" sendesis a $2.',
-'newarticle'           => '(nova)',
-'newarticletext'       => "Vu sequis ligilo a pagino qua ne existas ankore.
+'summary'               => 'Rezumo:',
+'subject'               => 'Temo / Titulo:',
+'minoredit'             => 'Ico esas mikra chanjo',
+'watchthis'             => 'Surveyar ica pagino',
+'savearticle'           => 'Registragar pagino',
+'preview'               => 'Previdar',
+'showpreview'           => 'Previdar',
+'showdiff'              => 'Montrez chanji',
+'summary-preview'       => 'Prevido di la rezumo:',
+'blockedtitle'          => 'La uzanto esas blokusita',
+'blockednoreason'       => 'nula motivo donesis',
+'blockedoriginalsource' => "La fonto di '''$1''' montresas infre:",
+'whitelistedittitle'    => 'On mustas enskribar por redaktar',
+'whitelistedittext'     => 'Vu mustas $1 por redaktar pagini.',
+'loginreqtitle'         => 'Eniro esas postulata',
+'loginreqlink'          => 'enirar',
+'accmailtitle'          => 'Kontrolajo sendita.',
+'accmailtext'           => 'La kontrolajo por "$1" sendesis a $2.',
+'newarticle'            => '(nova)',
+'newarticletext'        => "Vu sequis ligilo a pagino qua ne existas ankore.
 Por krear ica pagino, voluntez startar skribar en la infra buxo.
 (regardez la [[{{MediaWiki:Helppage}}|helpo]] por plusa informo).
 Se vu esas hike erore, kliktez sur la butono por retrovenar en vua ''browser''.",
-'noarticletext'        => 'Nuntempe ne esas texto en ica pagino. Vu povas [[Special:Search/{{PAGENAME}}|serchar ica titulo]] en altra pagini o [{{fullurl:{{FULLPAGENAME}}|action=edit}} redaktar ica pagino].',
-'usercsspreview'       => "'''Memorez ke vu nur previdas vua uzanto-css. Ol ne registragesis ankore!'''",
-'userjspreview'        => "'''Memorez ke vu nur previdas vua javascript di uzanto. Ol ne registragesis ankore!'''",
-'updated'              => '(Aktualigita)',
-'note'                 => '<strong>Noto:</strong>',
-'previewnote'          => '<strong>Atencez ke ico esas nur prevido ed ol ne registragesis ankore!</strong>',
-'editing'              => 'Editante $1',
-'editingsection'       => 'Editante $1 (seciono)',
-'editingcomment'       => 'Editante $1 (komento)',
-'editconflict'         => 'Konflikto di edito: $1',
-'explainconflict'      => 'Ulu chanjis ica pagino depos vu editeskis ol. La supra texto-areo kontenas la texto dil pagino quale ol existas aktuale. Vua chanji montresas en la infra texto-areo. Vu devas atachar vua chanji en la existanta texto. <b>Nur</b> la texto en la supra texto-areo registragesos kande vu presez sur "Registragar".',
-'yourtext'             => 'Vua texto',
-'storedversion'        => 'Gardita versiono',
-'editingold'           => '<strong>EGARDEZ: Vu redaktas anciena versiono di ca pagino.
-Se vu gardus ol, la chanji facita pos ita revizo perdesos.</strong>',
-'yourdiff'             => 'Diferi',
-'copyrightwarning'     => "Voluntez memorar ke omna kontributi a {{SITENAME}} esas sub la $2 (Videz $1 por detali).
+'noarticletext'         => 'Prezente, ne esas texto en ica pagino.
+Vu povas [[Special:Search/{{PAGENAME}}|serchar ica titulo]] en altra pagini,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} serchar en la relata "log"-i],
+o [{{fullurl:{{FULLPAGENAME}}|action=edit}} redaktar ica pagino]</span>.',
+'usercsspreview'        => "'''Memorez ke vu nur previdas vua uzanto-CSS.'''
+'''Ol ne registragesis ankore!'''",
+'userjspreview'         => "'''Memorez ke vu nur previdas vua javascript di uzanto. Ol ne registragesis ankore!'''",
+'updated'               => '(Aktualigita)',
+'note'                  => "'''Noto:'''",
+'previewnote'           => "'''Atencez ke ico esas nur prevido ed ol ne registragesis ankore!'''",
+'editing'               => 'Editante $1',
+'editingsection'        => 'Editante $1 (seciono)',
+'editingcomment'        => 'Editante $1 (nova seciono)',
+'editconflict'          => 'Konflikto di edito: $1',
+'explainconflict'       => 'Ulu chanjis ica pagino depos vu editeskis ol. La supra texto-areo kontenas la texto dil pagino quale ol existas aktuale. Vua chanji montresas en la infra texto-areo. Vu devas atachar vua chanji en la existanta texto. <b>Nur</b> la texto en la supra texto-areo registragesos kande vu presez sur "Registragar".',
+'yourtext'              => 'Vua texto',
+'storedversion'         => 'Gardita versiono',
+'editingold'            => "'''EGARDEZ: Vu redaktas anciena versiono di ca pagino.
+Se vu gardus ol, la chanji facita pos ita revizo perdesos.'''",
+'yourdiff'              => 'Diferi',
+'copyrightwarning'      => "Voluntez memorar ke omna kontributi a {{SITENAME}} esas sub la $2 (Videz $1 por detali).
 Se vu ne deziras ke altri modifikez vua artikli od oli distributesez libere, lore voluntez ne skribar oli hike.<br />
 Publikigante vua skribajo hike, vu asertas ke olu skribesis da vu ipsa o kopiesis de libera fonto.
-<strong>NE SENDEZ ARTIKLI KUN ''COPYRIGHT'' SEN PERMISO!</strong>",
-'protectedpagewarning' => "<strong>AVERTO: Ica pagino esas blokusita, do nur ''sysop''-i povas redaktar olu.</strong>",
-'templatesused'        => 'Shabloni uzata en ica pagino:',
-'templatesusedpreview' => 'Shabloni uzata en ica prevido:',
-'templatesusedsection' => 'Shabloni uzata en ica seciono:',
-'template-protected'   => '(protektita)',
+'''NE SENDEZ ARTIKLI KUN ''COPYRIGHT'' SEN PERMISO!'''",
+'protectedpagewarning'  => "'''AVERTO: Ica pagino esas blokusita, do nur ''sysop''-i povas redaktar olu.'''",
+'templatesused'         => 'Shabloni uzata en ica pagino:',
+'templatesusedpreview'  => 'Shabloni uzata en ica prevido:',
+'templatesusedsection'  => 'Shabloni uzata en ica seciono:',
+'template-protected'    => '(protektita)',
+'hiddencategories'      => 'Ca pagino esas membro di {{PLURAL:$1|1 celita kategorio|$1 celita kategorii}}:',
+'edit-conflict'         => 'Konflikto di editi.',
 
 # History pages
 'nohistory'           => 'Ne esas redakto-historio por ica pagino.',
-'revnotfound'         => 'Versiono ne trovita',
-'revnotfoundtext'     => "L' anciena versiono di la pagino, quan vu demandis, ne povis trovesar.
-Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'currentrev'          => 'Aktuala versiono',
+'currentrev-asof'     => 'Aktuala versiono ye $1',
 'revisionasof'        => 'Versiono ye $1',
-'revision-info'       => 'Versiono en $1 per $2',
+'revision-info'       => 'Versiono en $1 per $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Plu anciena versiono',
 'nextrevision'        => 'Plu recenta versiono→',
 'currentrevisionlink' => 'Aktuala versiono',
@@ -423,6 +449,7 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 :nuna = diferi kun l' aktuala versiono, 
 :lasta = diferi kun l' antea versiono, 
 :m = mikra edito.",
+'deletedrev'          => '[efacita]',
 'historyempty'        => '(vakua)',
 
 # Revision feed
@@ -434,7 +461,12 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'rev-delundel'           => 'montrar/celar',
 'revdelete-hide-comment' => 'Celar komento pri redakto',
 'revdelete-hide-user'    => 'Celar uzantonomo od IP di redaktanto',
+'revdelete-hide-image'   => 'Celar kontenajo dil arkivo',
+'revdelete-content'      => 'kontenajo',
+'revdelete-summary'      => 'edito-rezumo',
 'revdelete-uname'        => 'uzantonomo',
+'revdelete-hid'          => 'celis $1',
+'revdelete-unhid'        => 'revelis $1',
 
 # Diffs
 'history-title'           => 'Versionaro di "$1"',
@@ -442,116 +474,154 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'lineno'                  => 'Lineo $1:',
 'compareselectedversions' => 'Komparar selektita versioni',
 'editundo'                => 'des-facez',
+'diff-with-final'         => '&#32;e $1 $2',
 
 # Search results
-'searchresults'         => 'Rezultaji dil sercho',
-'searchresulttext'      => 'Por plusa informo pri quale serchar en {{SITENAME}}, videz [[{{MediaWiki:Helppage}}|help]].',
-'searchsubtitle'        => "Vu serchis '''[[:$1]]'''",
-'searchsubtitleinvalid' => "Vu serchis '''$1'''",
-'noexactmatch'          => "'''Es nula pagino titulizita \"\$1\".''' Vu darfas [[:\$1|krear ica pagino]].",
-'titlematches'          => 'Koincidi de titulo di artiklo',
-'notitlematches'        => 'No esas koincidi en la tituli dil artikli',
-'textmatches'           => 'Koincidi de texto di artiklo',
-'notextmatches'         => 'Nula paginala texto fitas',
-'prevn'                 => 'antea $1',
-'nextn'                 => 'sequanta $1',
-'viewprevnext'          => 'Vidar ($1) ($2) ($3).',
-'search-result-size'    => '$1 ({{PLURAL:$2|1 vorto|$2 vorti}})',
-'search-result-score'   => 'Importo: $1%',
-'search-section'        => '(seciono $1)',
-'searchall'             => 'omna',
-'showingresults'        => "Montrante infre {{PLURAL:$1|'''1''' rezulto|'''$1''' rezulti}}, qui komencas kun numero #'''$2'''.",
-'showingresultsnum'     => "Montrante infre {{PLURAL:$3|'''1''' rezulto|'''$3''' rezulti}}, qui komencas kun numero #'''$2'''.",
-'nonefound'             => 'La nesucesoza sercho ofte produktesas pro serchar vorti tro komuna quale "havar" e "di", qui ne esas indexizita, o pro serchar plu kam un vorto (En la rezulto aparos nur la pagini qui kontenas omna vorti serchata).',
-'powersearch'           => 'Avancita serchuro',
-'searchdisabled'        => 'La sercho en la kompleta texto desaktivigesis temporale pro superkargo dil servanto. Ni esperas riaktivigar ol pos facar ula proxima aktualigi. Dum ica tempo, vu povas serchar per Google.',
+'searchresults'             => 'Rezultaji dil sercho',
+'searchresults-title'       => 'Sercho-rezultaji por "$1"',
+'searchresulttext'          => 'Por plusa informo pri quale serchar en {{SITENAME}}, videz [[{{MediaWiki:Helppage}}|help]].',
+'searchsubtitle'            => "Vu serchis '''[[:$1]]'''",
+'searchsubtitleinvalid'     => "Vu serchis '''$1'''",
+'noexactmatch'              => "'''Es nula pagino titulizita \"\$1\".''' Vu darfas [[:\$1|krear ica pagino]].",
+'titlematches'              => 'Koincidi de titulo di artiklo',
+'notitlematches'            => 'No esas koincidi en la tituli dil artikli',
+'textmatches'               => 'Koincidi de texto di artiklo',
+'notextmatches'             => 'Nula paginala texto fitas',
+'prevn'                     => 'antea $1',
+'nextn'                     => 'sequanta $1',
+'viewprevnext'              => 'Vidar ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Helpo',
+'searchprofile-images'      => 'Arkivi',
+'searchprofile-everything'  => 'Omno',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 vorto|$2 vorti}})',
+'search-result-score'       => 'Importo: $1%',
+'search-section'            => '(seciono $1)',
+'search-suggest'            => 'Ka vu volis dicar: $1',
+'search-interwiki-default'  => 'Rezultaji di $1:',
+'search-mwsuggest-enabled'  => 'kun sugestaji',
+'search-mwsuggest-disabled' => 'sen sugestaji',
+'searchall'                 => 'omna',
+'showingresults'            => "Montrante infre {{PLURAL:$1|'''1''' rezulto|'''$1''' rezulti}}, qui komencas kun numero #'''$2'''.",
+'showingresultsnum'         => "Montrante infre {{PLURAL:$3|'''1''' rezulto|'''$3''' rezulti}}, qui komencas kun numero #'''$2'''.",
+'nonefound'                 => 'La nesucesoza sercho ofte produktesas pro serchar vorti tro komuna quale "havar" e "di", qui ne esas indexizita, o pro serchar plu kam un vorto (En la rezulto aparos nur la pagini qui kontenas omna vorti serchata).',
+'powersearch'               => 'Avancita serchuro',
+'powersearch-ns'            => 'Serchez en nomari:',
+'powersearch-field'         => 'Serchar',
+'search-external'           => 'Extera sercho',
+'searchdisabled'            => 'La sercho en la kompleta texto desaktivigesis temporale pro superkargo dil servanto. Ni esperas riaktivigar ol pos facar ula proxima aktualigi. Dum ica tempo, vu povas serchar per Google.',
 
 # Preferences page
-'preferences'        => 'Preferaji',
-'mypreferences'      => 'Mea preferaji',
-'prefsnologin'       => 'Vu ne eniris',
-'prefsnologintext'   => 'Vu mustas [[Special:UserLogin|enirir]] por establisar la preferaji.',
-'prefsreset'         => 'La preferaji riestablisesis da la depozeyo.',
-'qbsettings'         => 'Preferaji pri "Quickbar"',
-'qbsettings-none'    => 'Nula',
-'changepassword'     => 'Chanjar pasovorto',
-'skin'               => 'Pelo',
-'math'               => 'Quale montrar la formuli',
-'dateformat'         => 'Formo di dato',
-'datedefault'        => 'Sen prefero',
-'datetime'           => 'Dato e tempo',
-'math_unknown_error' => 'nekonocata eroro',
-'math_bad_tmpdir'    => 'Onu ne povas skribar o krear la tempala matematikala arkivaro',
-'math_bad_output'    => 'Onu ne povas skribar o krear la arkivaro por la matematiko',
-'prefs-personal'     => 'Personala informo',
-'prefs-rc'           => 'Recenta chanji e prizento di esbosuri',
-'prefs-watchlist'    => 'Surveyo-listo',
-'prefs-misc'         => 'Mixaji',
-'saveprefs'          => 'Registragar',
-'resetprefs'         => 'Riestablisar preferaji',
-'oldpassword'        => 'Anciena pasovorto:',
-'newpassword'        => 'Nova pasovorto:',
-'retypenew'          => 'Riskribez la nova pasovorto:',
-'textboxsize'        => 'Grandeso dil areo por texto',
-'rows'               => 'Linei:',
-'columns'            => 'Kolumni:',
-'searchresultshead'  => 'Preferaji di la rezultaji dil sercho',
-'resultsperpage'     => 'Trovaji po pagino:',
-'contextlines'       => 'Linei por montrar singlarezulte:',
-'contextchars'       => 'Tipi di kuntexto ye singla lineo:',
-'recentchangescount' => 'Quanto di tituli en la recenta chanji:',
-'savedprefs'         => 'Vua preferaji registragesis.',
-'timezonetext'       => 'Vua lokala tempo diferas de tempo dil servanto (UTC).',
-'localtime'          => 'Lokala tempo',
-'timezoneoffset'     => 'Difero',
-'servertime'         => 'La kloko en la servanto esas',
-'guesstimezone'      => 'Obtenar la kloko dil "browser"',
-'defaultns'          => 'Serchar en la spaco-nomi omise:',
-'files'              => 'Arkivi',
+'preferences'               => 'Preferaji',
+'mypreferences'             => 'Mea preferaji',
+'prefs-edits'               => 'Nombro di redaktaji:',
+'prefsnologin'              => 'Vu ne eniris',
+'prefsnologintext'          => 'Vu mustas <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} enirir] por establisar la preferaji.',
+'prefsreset'                => 'La preferaji riestablisesis da la depozeyo.',
+'qbsettings'                => 'Preferaji pri "Quickbar"',
+'qbsettings-none'           => 'Nula',
+'changepassword'            => 'Chanjar pasovorto',
+'skin'                      => 'Pelo',
+'skin-preview'              => 'Pre-videz',
+'math'                      => 'Quale montrar la formuli',
+'dateformat'                => 'Formo di dato',
+'datedefault'               => 'Sen prefero',
+'datetime'                  => 'Dato e tempo',
+'math_unknown_error'        => 'nekonocata eroro',
+'math_bad_tmpdir'           => 'Onu ne povas skribar o krear la tempala matematikala arkivaro',
+'math_bad_output'           => 'Onu ne povas skribar o krear la arkivaro por la matematiko',
+'prefs-personal'            => 'Personala informo',
+'prefs-rc'                  => 'Recenta chanji e prizento di esbosuri',
+'prefs-watchlist'           => 'Surveyo-listo',
+'prefs-watchlist-days-max'  => '(maximo 7 dii)',
+'prefs-watchlist-edits-max' => '(maxima nombro: 1000)',
+'prefs-misc'                => 'Mixaji',
+'prefs-resetpass'           => 'Chanjar pasovorto',
+'saveprefs'                 => 'Registragar',
+'resetprefs'                => 'Riestablisar preferaji',
+'textboxsize'               => 'Grandeso dil areo por texto',
+'rows'                      => 'Linei:',
+'columns'                   => 'Kolumni:',
+'searchresultshead'         => 'Preferaji di la rezultaji dil sercho',
+'resultsperpage'            => 'Trovaji po pagino:',
+'contextlines'              => 'Linei por montrar singlarezulte:',
+'contextchars'              => 'Tipi di kuntexto ye singla lineo:',
+'recentchangescount'        => 'Quanto di tituli en la recenta chanji:',
+'savedprefs'                => 'Vua preferaji registragesis.',
+'timezonelegend'            => 'Tempala zono',
+'timezonetext'              => 'Vua lokala tempo diferas de tempo dil servanto (UTC).',
+'localtime'                 => 'Lokala tempo:',
+'timezoneselect'            => 'Tempala zono:',
+'timezoneoffset'            => 'Difero¹:',
+'servertime'                => 'Kloko en la servanto:',
+'guesstimezone'             => 'Obtenar la kloko dil "browser"',
+'prefs-namespaces'          => 'Nomari',
+'defaultns'                 => 'Serchar en la spaco-nomi omise:',
+'files'                     => 'Arkivi',
 
 # User rights
-'userrights-groupsmember' => 'Membro di:',
+'userrights-user-editname' => 'Skribez uzantonomo:',
+'userrights-groupsmember'  => 'Membro di:',
 
 # Groups
 'group'            => 'Grupo:',
 'group-user'       => 'Uzanti',
+'group-sysop'      => 'Administranti',
 'group-bureaucrat' => 'Burokrati',
 'group-all'        => '(omna)',
 
 'group-user-member'       => 'Uzanto',
+'group-bot-member'        => 'Bot',
+'group-sysop-member'      => 'Administranto',
 'group-bureaucrat-member' => 'Burokrato',
 
+'grouppage-user'       => '{{ns:project}}:Uzanti',
 'grouppage-sysop'      => '{{ns:project}}:Administranti',
 'grouppage-bureaucrat' => '{{ns:project}}:Burokrati',
 
 # Rights
-'right-read'   => 'Lektar pagini',
-'right-edit'   => 'Redaktar pagini',
-'right-delete' => 'Efacar pagini',
+'right-read'          => 'Lektar pagini',
+'right-edit'          => 'Redaktar pagini',
+'right-move'          => 'Movar pagini',
+'right-movefile'      => 'Movar arkivi',
+'right-delete'        => 'Efacar pagini',
+'right-browsearchive' => 'Serchar pagini efacita',
 
 # User rights log
 'rightsnone' => '(nula)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'          => 'lektar ca pagino',
+'action-edit'          => 'redaktar ca pagino',
+'action-createpage'    => 'krear pagini',
+'action-move'          => 'movar ca pagino',
+'action-movefile'      => 'movar ca arkivo',
+'action-upload'        => 'adkargar ca arkivo',
+'action-browsearchive' => 'serchar pagini efacita',
+
 # Recent changes
-'nchanges'          => '$1 {{PLURAL:$1|chanjo|chanji}}',
-'recentchanges'     => 'Recenta chanji',
-'recentchangestext' => 'Regardez la maxim recenta chanji en Wiki per ica pagino.',
-'rcnote'            => "Infre esas la lasta {{PLURAL:$1|'''1''' chanjo|'''$1''' chanji}} dum la lasta {{PLURAL:$2|dio|'''$2''' dii}} ($3).",
-'rcnotefrom'        => "Infre esas la lasta chanji depos '''$2''' (montrita til '''$1''').",
-'rclistfrom'        => 'Montrar nova chanji startante de $1',
-'rcshowhideminor'   => '$1 mikra redakti',
-'rcshowhidebots'    => '$1 roboti',
-'rcshowhideliu'     => '$1 enirinta uzanti',
-'rcshowhideanons'   => '$1 anonima uzanti',
-'rcshowhidemine'    => '$1 mea redakti',
-'rclinks'           => 'Montrar la lasta $1 chanji dum la lasta $2 dii<br />$3',
-'diff'              => 'dif',
-'hist'              => 'vers',
-'hide'              => 'Celar',
-'show'              => 'Montrar',
-'minoreditletter'   => 'm',
-'newpageletter'     => 'N',
-'boteditletter'     => 'r',
+'nchanges'           => '$1 {{PLURAL:$1|chanjo|chanji}}',
+'recentchanges'      => 'Recenta chanji',
+'recentchangestext'  => 'Regardez la maxim recenta chanji en Wiki per ica pagino.',
+'rcnote'             => "Infre esas la lasta {{PLURAL:$1|'''1''' chanjo|'''$1''' chanji}} dum la lasta {{PLURAL:$2|dio|'''$2''' dii}} en $5, $4.",
+'rcnotefrom'         => "Infre esas la lasta chanji depos '''$2''' (montrita til '''$1''').",
+'rclistfrom'         => 'Montrar nova chanji startante de $1',
+'rcshowhideminor'    => '$1 mikra redakti',
+'rcshowhidebots'     => '$1 roboti',
+'rcshowhideliu'      => '$1 enirinta uzanti',
+'rcshowhideanons'    => '$1 anonima uzanti',
+'rcshowhidemine'     => '$1 mea redakti',
+'rclinks'            => 'Montrar la lasta $1 chanji dum la lasta $2 dii<br />$3',
+'diff'               => 'dif',
+'hist'               => 'vers',
+'hide'               => 'Celar',
+'show'               => 'Montrar',
+'minoreditletter'    => 'm',
+'newpageletter'      => 'N',
+'boteditletter'      => 'r',
+'rc_categories_any'  => 'Ula',
+'newsectionsummary'  => '/* $1 */ nova seciono',
+'rc-enhanced-expand' => 'Montrar detali (ico bezonas JavaScript)',
+'rc-enhanced-hide'   => 'Celar detali',
 
 # Recent changes linked
 'recentchangeslinked'      => 'Relatata chanji',
@@ -566,7 +636,8 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'uploadnologintext' => 'Vu mustas [[Special:UserLogin|enirir]] por adkargar arkivi.',
 'uploaderror'       => 'Eroro dum adkargo',
 'uploadlog'         => 'Adkargo-log',
-'uploadlogpagetext' => 'Infre esas listo di la plu recenta adkargaji.',
+'uploadlogpagetext' => 'Infre esas listo di la plu recenta adkargaji.
+Videz rezumo plu vidala en la [[Special:NewFiles|galerio di nova arkivi]].',
 'filename'          => 'Arkivo-nomo',
 'filedesc'          => 'Titulo',
 'fileuploadsummary' => 'Rezumo:',
@@ -575,36 +646,41 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'uploadedfiles'     => 'Adkargita arkivi',
 'ignorewarning'     => 'Ignorar la averto e gardar la arkivo irgakaze.',
 'badfilename'       => 'La imajo-nomo chanjesis a "$1".',
-'fileexists'        => 'Arkivo kun ica nomo ja existas. Volutez kontrolar <strong><tt>$1</tt></strong> se vu ne esas certa pri chanjar olu.',
+'fileexists'        => "Arkivo kun ica nomo ja existas. Volutez kontrolar '''<tt>$1</tt>''' se vu ne esas certa pri chanjar olu.",
 'successfulupload'  => 'Adcharjo sucesoza',
 'uploadwarning'     => 'Averto pri la adkargo di arkivo',
 'savefile'          => 'Registragar arkivo',
 'uploadedimage'     => 'adkargita "[[$1]]"',
 'uploaddisabled'    => 'Pardonez, la adkargo esas desaktiva.',
+'watchthisupload'   => 'Surveyar ica pagino',
 
-# Special:ImageList
-'imgfile'        => 'arkivo',
-'imagelist'      => 'Listo di imaji',
-'imagelist_date' => 'Dato',
-'imagelist_name' => 'Nomo',
-'imagelist_user' => 'Uzanto',
+# Special:ListFiles
+'imgfile'         => 'arkivo',
+'listfiles'       => 'Listo di imaji',
+'listfiles_date'  => 'Dato',
+'listfiles_name'  => 'Nomo',
+'listfiles_user'  => 'Uzanto',
+'listfiles_count' => 'Versioni',
 
-# Image description page
+# File description page
 'filehist'                       => 'Historio dil arkivo',
-'filehist-help'                  => 'Klikez sur la dato/horo por vidar arkivo quale ol aparis ye ta tempo.',
+'filehist-help'                  => 'Kliktez sur la dato/horo por vidar arkivo quale ol aparis ye ta tempo.',
 'filehist-current'               => 'aktuala',
 'filehist-datetime'              => 'Dato/Horo',
 'filehist-user'                  => 'Uzanto',
 'filehist-dimensions'            => 'Dimensioni',
 'filehist-filesize'              => 'Grandeso dil arkivo',
 'filehist-comment'               => 'Komento',
-'imagelinks'                     => 'Ligilo al imajo',
+'imagelinks'                     => 'Ligili al arkivo',
 'linkstoimage'                   => 'La {{PLURAL:$1|pagino|$1 pagini}} infre ligas a ca arkivo:',
 'nolinkstoimage'                 => 'Nula pagino ligas a ca pagino.',
 'shareduploadduplicate-linktext' => 'altra arkivo',
 'shareduploadconflict-linktext'  => 'altra arkivo',
 'uploadnewversion-linktext'      => 'Adkargez nova versiono dil arkivo',
 
+# File reversion
+'filerevert-comment' => 'Komento:',
+
 # File deletion
 'filedelete'                  => 'Efacar $1',
 'filedelete-legend'           => 'Efacar arkivo',
@@ -627,17 +703,17 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'randomredirect' => 'Ridirektilo hazarde',
 
 # Statistics
-'statistics'             => 'Statistiko',
-'sitestats'              => 'Statistiki di {{SITENAME}}',
-'userstats'              => 'Statistiki di uzanto',
-'statistics-mostpopular' => 'Maxim ofte vizitita pagini',
+'statistics'              => 'Statistiko',
+'statistics-header-users' => 'Statistiki di uzanto',
+'statistics-pages'        => 'Pagini',
+'statistics-mostpopular'  => 'Maxim ofte vizitita pagini',
 
 'disambiguations' => 'Pagini di desambiguizo',
 
 'doubleredirects' => 'Duopla ridirektili',
 
 'brokenredirects'        => 'Ridirektili nekorekta',
-'brokenredirectstext'    => 'La sequanta ridirektili ligas a ne-existanta artiklo:',
+'brokenredirectstext'    => 'La sequanta ridirektili ligas a ne-existanta pagini:',
 'brokenredirects-edit'   => '(redaktar)',
 'brokenredirects-delete' => '(efacar)',
 
@@ -660,14 +736,19 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'popularpages'            => 'Populara pagini',
 'wantedcategories'        => 'Dezirata kategorii',
 'wantedpages'             => 'Dezirata pagini',
+'wantedfiles'             => 'Dezirata arkivi',
+'wantedtemplates'         => 'Dezirata shabloni',
 'shortpages'              => 'Kurta pagini',
 'longpages'               => 'Longa pagini',
 'deadendpages'            => 'Pagini sen ekiraji',
+'protectedpages'          => 'Protektita pagini',
+'protectedtitles'         => 'Protektita tituli',
 'listusers'               => 'Uzanto-listo',
+'usereditcount'           => '$1 {{PLURAL:$1|edito|editi}}',
 'newpages'                => 'Nova pagini',
 'newpages-username'       => 'Uzantonomo:',
 'ancientpages'            => 'Maxim anciena artikli',
-'move'                    => 'Movez',
+'move'                    => 'Movar',
 'movethispage'            => 'Rinomizar ica pagino',
 'unusedimagestext'        => 'Voluntez egardez ke altra ret-situi povus ligar a arkivo per direta URL, e do ol povus esar enlistizita hike malgre olu havas aktiva uzo.',
 'notargettitle'           => 'Ne esas vakua pagino',
@@ -680,7 +761,6 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 # Special:Log
 'specialloguserlabel'  => 'Uzero:',
 'speciallogtitlelabel' => 'Titulo:',
-'log-search-submit'    => 'Irar',
 
 # Special:AllPages
 'allpages'          => 'Omna pagini',
@@ -699,6 +779,17 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 # Special:Categories
 'categories' => 'Kategorii',
 
+# Special:LinkSearch
+'linksearch'    => 'Extera ligili',
+'linksearch-ns' => 'Nomaro:',
+'linksearch-ok' => 'Serchez',
+
+# Special:ListUsers
+'listusers-submit' => 'Montrez',
+
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Nova uzanto',
+
 # Special:ListGroupRights
 'listgrouprights-group' => 'Grupo',
 
@@ -718,36 +809,35 @@ Voluntez kontrolar la URL quan vu uzis por acesar a ca pagino.",
 'emailsenttext'   => 'Vua e-posto sendesis',
 
 # Watchlist
-'watchlist'            => 'Mea surveyaji',
-'mywatchlist'          => 'Mea surveyaji',
-'watchlistfor'         => "(por '''$1''')",
-'nowatchlist'          => 'Vu ne havas objekti en vua listo di surveyaji.',
-'watchnologin'         => 'Vu ne startis sesiono',
-'watchnologintext'     => 'Vu mustas [[Special:UserLogin|enirir]] por modifikar vua surveyaji.',
-'addedwatch'           => 'Adjuntita a la listo de surveyaji',
-'addedwatchtext'       => "La pagino \"<nowiki>\$1</nowiki>\" atachesis a vua [[Special:Watchlist|listo de surveyaji]]. Futura chanji di ica pagino ed olua relatata debato-pagini montresos ibe, ed la pagino aparos per '''dika literi''' en la [[Special:RecentChanges|listo de recenta chanji]] por faciligar sua trovebleso.
+'watchlist'          => 'Mea surveyaji',
+'mywatchlist'        => 'Mea surveyaji',
+'watchlistfor'       => "(por '''$1''')",
+'nowatchlist'        => 'Vu ne havas objekti en vua listo di surveyaji.',
+'watchnologin'       => 'Vu ne startis sesiono',
+'watchnologintext'   => 'Vu mustas [[Special:UserLogin|enirir]] por modifikar vua surveyaji.',
+'addedwatch'         => 'Adjuntita a la listo de surveyaji',
+'addedwatchtext'     => "La pagino \"<nowiki>\$1</nowiki>\" atachesis a vua [[Special:Watchlist|listo de surveyaji]]. Futura chanji di ica pagino ed olua relatata debato-pagini montresos ibe, ed la pagino aparos per '''dika literi''' en la [[Special:RecentChanges|listo de recenta chanji]] por faciligar sua trovebleso.
 
 <p> Se vu volas efacar la pagino de vua listo de surveyaji pose, presez \"Ne plus surveyar\" en la selektaro.",
-'removedwatch'         => 'Efacita de surveyo-listo',
-'watch'                => 'Surveyar',
-'watchthispage'        => 'Surveyar ica pagino',
-'unwatch'              => 'Ne plus surveyar',
-'unwatchthispage'      => 'Ne plus surveyar',
-'notanarticle'         => 'Ne esas artiklo',
-'watchnochange'        => 'Nula artikli ek vua listo di surveyaji redaktesis dum la tempo montrata.',
-'watchmethod-recent'   => 'serchante recenta chanji en la listo di surveyaji',
-'watchmethod-list'     => 'serchante recenta redakti en la listo di surveyaji',
-'watchlistcontains'    => 'Vua listo di surveyaji kontenas $1 {{PLURAL:$1|pagino|pagini}}.',
-'iteminvalidname'      => "Problemo en la artiklo '$1', nevalida nomo...",
-'wlnote'               => "Infre esas la lasta {{PLURAL:$1|chanjo|'''$1''' chanji}} dum la lasta {{PLURAL:$2|horo|'''$2''' hori}}.",
-'wlshowlast'           => 'Montrar la lasta $1 hori $2 dii $3',
-'watchlist-hide-own'   => 'Celez chanji da me',
-'watchlist-hide-minor' => 'Celez mikra chanji',
-
-'enotif_newpagetext' => 'Ico esas nula pagino.',
-'enotif_anon_editor' => 'anonima uzanto $1',
-
-# Delete/protect/revert
+'removedwatch'       => 'Efacita de surveyo-listo',
+'watch'              => 'Surveyar',
+'watchthispage'      => 'Surveyar ica pagino',
+'unwatch'            => 'Ne plus surveyar',
+'unwatchthispage'    => 'Ne plus surveyar',
+'notanarticle'       => 'Ne esas artiklo',
+'watchnochange'      => 'Nula artikli ek vua listo di surveyaji redaktesis dum la tempo montrata.',
+'watchmethod-recent' => 'serchante recenta chanji en la listo di surveyaji',
+'watchmethod-list'   => 'serchante recenta redakti en la listo di surveyaji',
+'watchlistcontains'  => 'Vua listo di surveyaji kontenas $1 {{PLURAL:$1|pagino|pagini}}.',
+'iteminvalidname'    => "Problemo en la artiklo '$1', nevalida nomo...",
+'wlnote'             => "Infre esas la lasta {{PLURAL:$1|chanjo|'''$1''' chanji}} dum la lasta {{PLURAL:$2|horo|'''$2''' hori}}.",
+'wlshowlast'         => 'Montrar la lasta $1 hori $2 dii $3',
+
+'enotif_newpagetext'           => 'Ico esas nula pagino.',
+'enotif_impersonal_salutation' => 'Uzanto di {{SITENAME}}',
+'enotif_anon_editor'           => 'anonima uzanto $1',
+
+# Delete
 'deletepage'            => 'Efacar pagino',
 'confirm'               => 'Konfirmar',
 'excontent'             => "La kontenajo esis: '$1'",
@@ -766,35 +856,43 @@ Videz $2 por obtenar registro di recenta efaci.',
 'deletecomment'         => 'Motivo por la efaco',
 'deleteotherreason'     => 'Altra/adjuntita motivo:',
 'deletereasonotherlist' => 'Altra motivo',
-'rollback'              => 'Desfacar redakto',
-'rollback_short'        => 'Desfacar',
-'rollbacklink'          => 'desfacar',
-'rollbackfailed'        => 'Desfaco ne sucesis',
-'cantrollback'          => 'Ne esas posibla desfacar la edito. La lasta kontributanto esas la nura autoro di ica pagino.',
-'alreadyrolled'         => 'Onu ne povas desfacar la lasta chanjo di [[$1]]
+
+# Rollback
+'rollback'       => 'Desfacar redakto',
+'rollback_short' => 'Desfacar',
+'rollbacklink'   => 'desfacar',
+'rollbackfailed' => 'Desfaco ne sucesis',
+'cantrollback'   => 'Ne esas posibla desfacar la edito. La lasta kontributanto esas la nura autoro di ica pagino.',
+'alreadyrolled'  => 'Onu ne povas desfacar la lasta chanjo di [[$1]]
 da [[User:$2|$2]] ([[User talk:$2|Talk]]); ulu pluse ja editis o desfacis ica pagino.
 
 Lasta edito esis da [[User:$3|$3]] ([[User talk:$3|Talk]]).',
-'editcomment'           => 'La rezumo di la edito esis: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'            => 'Rekuperita redakti da [[Special:Contributions/$2|$2]] ([[User talk:$2|Debato]]); rekuperita la lasta redakto di [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'protectedarticle'      => 'protektita "[[$1]]"',
-'unprotectedarticle'    => 'desprotektita [[$1]]',
-'protect-title'         => 'Protektante "$1"',
-'protect-legend'        => 'Konfirmar protekto',
-'protectcomment'        => 'Motivo por la protekto',
+'editcomment'    => "La rezumo di la edito esis: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => 'Rekuperita redakti da [[Special:Contributions/$2|$2]] ([[User talk:$2|Debato]]); rekuperita la lasta redakto di [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
+'protectedarticle'       => 'protektita "[[$1]]"',
+'unprotectedarticle'     => 'desprotektita [[$1]]',
+'protect-title'          => 'Protektante "$1"',
+'prot_1movedto2'         => '[[$1]] movita a [[$2]]',
+'protect-legend'         => 'Konfirmar protekto',
+'protectcomment'         => 'Motivo por la protekto',
+'protect-level-sysop'    => 'Nur administranti',
+'protect-expiry-options' => '2 horo:2 hours,1 dio:1 day,3 dii:3 days,1 semano:1 week,2 semani:2 weeks,1 monato:1 month,3 monati:3 months,6 monati:6 months,1 yaro:1 year,infinita:infinite', # display1:time1,display2:time2,...
 
 # Restrictions (nouns)
 'restriction-edit' => 'Redaktar',
 
 # Undelete
-'undelete'               => 'Restaurar efacita artiklo',
-'undeletepage'           => 'Vidar e restaurar efacita pagini',
-'undeletepagetext'       => 'La sequanta pagini efacesis ma li ankore esas en la arkivo ed esas restaurebla. La arkivo povas netigesar periodale.',
-'undeleterevisions'      => '$1 {{PLURAL:$1|revizo|revizi}} konservita',
-'undeletebtn'            => 'Restaurar',
-'undeletecomment'        => 'Komento:',
-'undeletedarticle'       => 'Restaurita "$1"',
-'undelete-search-submit' => 'Serchar',
+'undelete'                  => 'Restaurar efacita artiklo',
+'undeletepage'              => 'Vidar e restaurar efacita pagini',
+'undeletepagetext'          => 'La sequanta {{PLURAL:$1|pagino|pagini}} efacesis ma {{PLURAL:$1|ol|li}} ankore esas en la arkivo ed esas restaurebla. La arkivo povas netigesar periodale.',
+'undeleterevisions'         => '$1 {{PLURAL:$1|revizo|revizi}} konservita',
+'undeletebtn'               => 'Restaurar',
+'undeletecomment'           => 'Komento:',
+'undeletedarticle'          => 'restaurita "[[$1]]"',
+'undelete-search-submit'    => 'Serchar',
+'undelete-show-file-submit' => 'Yes',
 
 # Namespace form on various pages
 'namespace'      => 'Nomaro:',
@@ -802,29 +900,34 @@ Lasta edito esis da [[User:$3|$3]] ([[User talk:$3|Talk]]).',
 'blanknamespace' => '(Chefa)',
 
 # Contributions
-'contributions' => 'Kontributadi dil uzanto',
-'mycontris'     => 'Mea adportado',
-'contribsub2'   => 'Pro $1 ($2)',
-'nocontribs'    => 'Ne trovesis chanji qui fitez ita kriterii.',
-'uctop'         => ' (lasta modifiko)',
-'month'         => 'De monato (e plu frue):',
-'year'          => 'De yaro (e plu frue):',
+'contributions'       => 'Kontributadi dil uzanto',
+'contributions-title' => 'Uzanto-kontributadi di $1',
+'mycontris'           => 'Mea kontributadi',
+'contribsub2'         => 'Pro $1 ($2)',
+'nocontribs'          => 'Ne trovesis chanji qui fitez ita kriterii.',
+'uctop'               => ' (lasta modifiko)',
+'month'               => 'De monato (e plu frue):',
+'year'                => 'De yaro (e plu frue):',
 
 'sp-contributions-newbies-sub' => 'Di nova konti',
+'sp-contributions-search'      => 'Serchar kontributadi',
+'sp-contributions-submit'      => 'Serchez',
 
 # What links here
-'whatlinkshere'           => 'Quo ligas hike',
-'whatlinkshere-title'     => 'Pagini qui ligas ad "$1"',
-'whatlinkshere-page'      => 'Pagino:',
-'linklistsub'             => '(Listo di ligili)',
-'linkshere'               => "Ca pagini esas ligilizita ad '''[[:$1]]''':",
-'nolinkshere'             => "Nula pagino ligas ad '''[[:$1]]'''.",
-'isredirect'              => 'ridirektanta pagino',
-'istemplate'              => 'inkluzo',
-'whatlinkshere-prev'      => '{{PLURAL:$1|antea|antea $1}}',
-'whatlinkshere-next'      => '{{PLURAL:$1|sequanta|sequanta $1}}',
-'whatlinkshere-links'     => '� ligili',
-'whatlinkshere-hidelinks' => '$1 ligili',
+'whatlinkshere'            => 'Quo ligas hike',
+'whatlinkshere-title'      => 'Pagini qui ligas ad "$1"',
+'whatlinkshere-page'       => 'Pagino:',
+'linkshere'                => "Ca pagini esas ligilizita ad '''[[:$1]]''':",
+'nolinkshere'              => "Nula pagino ligas ad '''[[:$1]]'''.",
+'isredirect'               => 'ridirektanta pagino',
+'istemplate'               => 'inkluzo',
+'whatlinkshere-prev'       => '{{PLURAL:$1|antea|antea $1}}',
+'whatlinkshere-next'       => '{{PLURAL:$1|sequanta|sequanta $1}}',
+'whatlinkshere-links'      => '� ligili',
+'whatlinkshere-hideredirs' => '$1 ridirektili',
+'whatlinkshere-hidelinks'  => '$1 ligili',
+'whatlinkshere-hideimages' => '$1 ligili di imaji',
+'whatlinkshere-filters'    => 'Filtrili',
 
 # Block/unblock
 'blockip'            => 'Blokusado di IP-adresi',
@@ -848,7 +951,7 @@ Videz [[Special:IPBlockList|IP-blokuslisto]] por revizor blokusadi.',
 'blocklistline'      => '$1, $2 blokusas $3 (expiras $4)',
 'blocklink'          => 'blokusar',
 'unblocklink'        => 'desblokusar',
-'contribslink'       => 'kontributaji',
+'contribslink'       => 'kontrib',
 'autoblocker'        => 'Autoblokusita nam vu havas la sama IP-adreso kam "[[User:$1|$1]]". Motivo: "$2"',
 'blocklogentry'      => 'blokusis [[$1]] dum periodo de $2 $3',
 'unblocklogentry'    => 'desblokusita "$1"',
@@ -886,7 +989,10 @@ Ico signifikas ke vu povos rinomizar pagino a olua originala titulo se eroras sk
 Ica povas esar drastika chanjo e ne-esperinda por populara pagino;
 voluntez certigar ke vu komprenas la konsequi qui eventos ante durar adavane.",
 'movearticle'             => 'Movar pagino',
+'movenologin'             => 'Sesiono ne iniciata',
+'movenologintext'         => 'Vu mustas esar registragita uzanto ed [[Special:UserLogin|enirir]] por rinomizar pagino.',
 'newtitle'                => 'a nova titulo',
+'move-watch'              => 'Surveyar ca pagino',
 'movepagebtn'             => 'Movar pagino',
 'pagemovedsub'            => 'Rinomizita sucese',
 'articleexists'           => 'Pagino kun sama nomo ja existas od la nomo
@@ -916,6 +1022,7 @@ Voluntez selektar altra nomo.',
 
 # Special:Import
 'import'                => 'Importacar pagini',
+'import-comment'        => 'Komento:',
 'importtext'            => 'Voluntez exportacar l\' arkivo de la fonto-wiki uzante la utensilo "Special:Export", registragar ol a vua disko ed adkargar ol hike.',
 'importfailed'          => 'La importaco faliis: $1',
 'importnotext'          => 'Vakua o sentexta',
@@ -923,19 +1030,21 @@ Voluntez selektar altra nomo.',
 'importhistoryconflict' => 'Existas versionaro konfliktiva (Ica pagino povus importacesir antee)',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mea uzanto-pagino',
-'tooltip-pt-mytalk'               => 'Mea diskuto-pagino',
+'tooltip-pt-userpage'             => 'Vua uzanto-pagino',
+'tooltip-pt-mytalk'               => 'Vua diskuto-pagino',
 'tooltip-pt-preferences'          => 'Mea preferaji',
 'tooltip-pt-watchlist'            => 'Listo di pagini quin vu kontrolas',
-'tooltip-pt-mycontris'            => 'Listo di mea kontributaji',
+'tooltip-pt-mycontris'            => 'Listo di vua kontributaji',
 'tooltip-pt-login'                => 'Vu darfas enirar uzante vua pas-vorto, ma lo ne esas preskriptata.',
-'tooltip-pt-logout'               => 'Ekirez',
+'tooltip-pt-logout'               => 'Ekirar',
 'tooltip-ca-talk'                 => 'Diskuto pri la pagino di kontenajo',
 'tooltip-ca-edit'                 => 'Vu darfas chanjar ta pagino. Voluntez pre-vidar chanji ante registragar oli.',
-'tooltip-ca-addsection'           => 'Adjuntar komento ad ica diskuto.',
+'tooltip-ca-addsection'           => 'Komencar nova seciono',
+'tooltip-ca-history'              => 'Pasinta versioni di ca pagino',
 'tooltip-ca-protect'              => 'Protektez ica pagino',
 'tooltip-ca-delete'               => 'Efacez ica pagino',
 'tooltip-ca-move'                 => 'Movez pagino',
+'tooltip-ca-watch'                => 'Adjuntez ca pagino a vua surveyaji',
 'tooltip-search'                  => 'Serchez en {{SITENAME}}',
 'tooltip-p-logo'                  => 'Frontispico',
 'tooltip-n-mainpage'              => 'Vizitez la Frontispico',
@@ -949,7 +1058,9 @@ Voluntez selektar altra nomo.',
 'tooltip-t-emailuser'             => 'Sendez mesajo al uzanto',
 'tooltip-t-upload'                => 'Adkargez arkivi',
 'tooltip-t-specialpages'          => 'Montrez listo di omna specala pagini',
+'tooltip-ca-nstab-main'           => 'Vidar la kontenajo di ca pagino',
 'tooltip-ca-nstab-user'           => 'Videz la pagino dil uzanto',
+'tooltip-ca-nstab-project'        => 'Vidar la projekto-pagino',
 'tooltip-ca-nstab-image'          => 'Videz la pagino dil arkivo',
 'tooltip-ca-nstab-template'       => 'Vidar la shablono',
 'tooltip-ca-nstab-help'           => 'Vidar la helpo-pagino',
@@ -967,32 +1078,39 @@ Voluntez selektar altra nomo.',
 'notacceptable' => 'La servanto di {{SITENAME}} ne povas provizar datumi en formato quan vua kliento povas komprenar.',
 
 # Attribution
-'anonymous'        => 'Anonima uzanti di {{SITENAME}}',
+'anonymous'        => 'Anonima {{PLURAL:$1|uzanto|uzanti}} di {{SITENAME}}',
 'siteuser'         => 'Uzanto che {{SITENAME}} $1',
 'lastmodifiedatby' => 'Ica pagino modifikesis ye $2, $1 da $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Bazizita en la laboro da $1.',
 'others'           => 'altra',
-'siteusers'        => 'Uzanti che {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Uzanto|Uzanti}} che {{SITENAME}} $1',
 
 # Spam protection
 'spamprotectiontitle' => 'Filtrilo kontre spamo',
 
+# Info page
+'numedits'    => 'Quanto di redakti (pagino): $1',
+'numwatchers' => 'Quanto di vizitanti: $1',
+'numauthors'  => 'Quanto di aparta autori (pagino): $1',
+
 # Patrol log
 'patrol-log-auto' => '(automata)',
 
 # Browsing diffs
-'previousdiff' => '� Antea dif',
-'nextdiff'     => 'Sequanta dif →',
+'previousdiff' => '� Plu anciena edito',
+'nextdiff'     => 'Plu recenta edito →',
 
 # Media information
-'widthheightpage' => '$1×$2, $3 {{PLURAL:$3|pagino|pagini}}',
+'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|pagino|pagini}}',
+'show-big-image-thumb' => '<small>Dimensioni di ca previdajo: $1 × $2 pixel-i</small>',
 
-# Special:NewImages
-'newimages'     => 'Galerio di nova arkivi',
-'imagelisttext' => "Infre esas listo di '''$1''' {{PLURAL:$1|arkivo|arkivi}} rangizita $2.",
-'showhidebots'  => '($1 bot-i)',
-'ilsubmit'      => 'Serchar',
-'bydate'        => 'per dato',
+# Special:NewFiles
+'newimages'        => 'Galerio di nova arkivi',
+'imagelisttext'    => "Infre esas listo di '''$1''' {{PLURAL:$1|arkivo|arkivi}} rangizita $2.",
+'newimages-legend' => 'Filtrilo',
+'showhidebots'     => '($1 bot-i)',
+'ilsubmit'         => 'Serchar',
+'bydate'           => 'per dato',
 
 # Metadata
 'metadata' => 'Metadonaji',
@@ -1006,6 +1124,8 @@ Voluntez selektar altra nomo.',
 'exif-gpslongitude'        => 'Longitudo',
 'exif-gpsaltitude'         => 'Altitudo',
 
+'exif-unknowndate' => 'Nesavata dato',
+
 'exif-orientation-1' => 'Normala', # 0th row: top; 0th column: left
 
 'exif-exposureprogram-1' => 'Manuala',
@@ -1039,11 +1159,8 @@ Voluntez selektar altra nomo.',
 # E-mail address confirmation
 'confirmemail_needlogin' => 'Vu mustas $1 pro konfirmar vua adreso di e-posto.',
 
-# HTML dump
-'redirectingto' => 'Ridirektante ad [[:$1]]...',
-
-# AJAX search
-'articletitles' => "Pagini komencanta per ''$1''",
+# action=purge
+'confirm_purge_button' => 'O.K.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� antea pagino',
@@ -1061,7 +1178,8 @@ Voluntez selektar altra nomo.',
 'table_pager_empty'        => 'Nula rezultajo',
 
 # Auto-summaries
-'autosumm-new' => 'Nova pagino: $1',
+'autoredircomment' => 'Ridirektas a [[$1]]',
+'autosumm-new'     => 'Nova pagino: $1',
 
 # Watchlist editor
 'watchlistedit-raw-title'  => 'Redaktar texto di surveyo-listo',
@@ -1079,6 +1197,7 @@ Voluntez selektar altra nomo.',
 'version-other'            => 'Altra',
 'version-version'          => 'Versiono',
 'version-license'          => 'Licenco',
+'version-software-product' => 'Produkturo',
 'version-software-version' => 'Versiono',
 
 # Special:FilePath
@@ -1088,7 +1207,9 @@ Voluntez selektar altra nomo.',
 'fileduplicatesearch-submit' => 'Serchar',
 
 # Special:SpecialPages
-'specialpages' => 'Specala pagini',
+'specialpages'             => 'Specala pagini',
+'specialpages-group-login' => 'Enirar / krear konto',
+'specialpages-group-users' => 'Uzanti e yuri',
 
 # Special:BlankPage
 'blankpage' => 'Pagino sen-skribura',
diff --git a/languages/messages/MessagesIs.php b/languages/messages/MessagesIs.php
index ed8577c8..81d8721e 100644
--- a/languages/messages/MessagesIs.php
+++ b/languages/messages/MessagesIs.php
@@ -15,15 +15,23 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Sígilt',
-	'nostalgia'   => 'Gamaldags',
-	'cologneblue' => 'Kölnarblátt',
-	'monobook'    => 'EinBók',
-	'myskin'      => 'Mitt þema',
-	'chick'       => 'Gella',
-	'simple'      => 'Einfalt',
-	'modern'      => 'Nútímalegt',
+$namespaceNames = array(
+	NS_MEDIA            => 'Miðill',
+	NS_SPECIAL          => 'Kerfissíða',
+	NS_TALK             => 'Spjall',
+	NS_USER             => 'Notandi',
+	NS_USER_TALK        => 'Notandaspjall',
+	NS_PROJECT_TALK     => '$1spjall',
+	NS_FILE             => 'Mynd',
+	NS_FILE_TALK        => 'Myndaspjall',
+	NS_MEDIAWIKI        => 'Melding',
+	NS_MEDIAWIKI_TALK   => 'Meldingarspjall',
+	NS_TEMPLATE         => 'Snið',
+	NS_TEMPLATE_TALK    => 'Sniðaspjall',
+	NS_HELP             => 'Hjálp',
+	NS_HELP_TALK        => 'Hjálparspjall',
+	NS_CATEGORY         => 'Flokkur',
+	NS_CATEGORY_TALK    => 'Flokkaspjall',
 );
 
 $datePreferences = array(
@@ -124,8 +132,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Notandaspjall',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1spjall',
-	NS_IMAGE          => 'Mynd',
-	NS_IMAGE_TALK     => 'Myndaspjall',
+	NS_FILE           => 'Mynd',
+	NS_FILE_TALK      => 'Myndaspjall',
 	NS_MEDIAWIKI      => 'Melding',
 	NS_MEDIAWIKI_TALK => 'Meldingarspjall',
 	NS_TEMPLATE       => 'Snið',
@@ -137,87 +145,87 @@ $namespaceNames = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Tvöfaldar_tilvísanir' ),
-	'BrokenRedirects'           => array( 'Brotnar_tilvísanir' ),
-	'Disambiguations'           => array( 'Tenglar_í_aðgreiningarsíður' ),
+	'DoubleRedirects'           => array( 'Tvöfaldar tilvísanir' ),
+	'BrokenRedirects'           => array( 'Brotnar tilvísanir' ),
+	'Disambiguations'           => array( 'Tenglar í aðgreiningarsíður' ),
 	'Userlogin'                 => array( 'Innskrá' ),
 	'Userlogout'                => array( 'Útskrá' ),
-	'CreateAccount'             => array( 'Búa_til_aðgang' ),
+	'CreateAccount'             => array( 'Búa til aðgang' ),
 	'Preferences'               => array( 'Stillingar' ),
 	'Watchlist'                 => array( 'Vaktlistinn' ),
-	'Recentchanges'             => array( 'Nýlegar_breytingar' ),
-	'Upload'                    => array( 'Hlaða_inn_skrá' ),
-	'Imagelist'                 => array( 'Skráalisti' ),
-	'Newimages'                 => array( 'Myndasafn_nýlegra_skráa' ),
+	'Recentchanges'             => array( 'Nýlegar breytingar' ),
+	'Upload'                    => array( 'Hlaða inn' ),
+	'Listfiles'                 => array( 'Myndalisti' ),
+	'Newimages'                 => array( 'Nýjar myndir' ),
 	'Listusers'                 => array( 'Notendalisti' ),
 	'Listgrouprights'           => array( 'Réttindalisti' ),
 	'Statistics'                => array( 'Tölfræði' ),
-	'Randompage'                => array( 'Handahófsvalin_grein' ),
-	'Lonelypages'               => array( 'Munaðarlausar_síður' ),
-	'Uncategorizedpages'        => array( 'Óflokkaðar_síður' ),
-	'Uncategorizedcategories'   => array( 'Óflokkaðir_flokkar' ),
-	'Uncategorizedimages'       => array( 'Óflokkaðar_skrár' ),
-	'Uncategorizedtemplates'    => array( 'Óflokkuð_snið' ),
-	'Unusedcategories'          => array( 'Ónotaðir_flokkar' ),
-	'Unusedimages'              => array( 'Munaðarlausar_skrár' ),
-	'Wantedpages'               => array( 'Eftirsóttar_síður' ),
-	'Wantedcategories'          => array( 'Eftirsóttir_flokkar' ),
-	'Mostlinked'                => array( 'Mest_ítengdu_síður' ),
-	'Mostlinkedcategories'      => array( 'Mest_ítengdu_flokkar' ),
-	'Mostlinkedtemplates'       => array( 'Mest_ítengdu_snið' ),
-	'Mostcategories'            => array( 'Mest_flokkaðar_greinar' ),
-	'Mostimages'                => array( 'Mest_ítengdu_myndir' ),
-	'Mostrevisions'             => array( 'Greinar_eftir_útgáfum' ),
-	'Fewestrevisions'           => array( 'Greinar_með_fæstar_breytingar' ),
-	'Shortpages'                => array( 'Stuttar_síður' ),
-	'Longpages'                 => array( 'Langar_síður' ),
-	'Newpages'                  => array( 'Nýjustu_greinar' ),
-	'Ancientpages'              => array( 'Elstu_síður' ),
+	'Randompage'                => array( 'Handahófsvalin síða' ),
+	'Lonelypages'               => array( 'Munaðarlausar síður' ),
+	'Uncategorizedpages'        => array( 'Óflokkaðar síður' ),
+	'Uncategorizedcategories'   => array( 'Óflokkaðir flokkar' ),
+	'Uncategorizedimages'       => array( 'Óflokkaðar myndir' ),
+	'Uncategorizedtemplates'    => array( 'Óflokkuð snið' ),
+	'Unusedcategories'          => array( 'Ónotaðir flokkar' ),
+	'Unusedimages'              => array( 'Munaðarlausar myndir' ),
+	'Wantedpages'               => array( 'Eftirsóttar síður' ),
+	'Wantedcategories'          => array( 'Eftirsóttir flokkar' ),
+	'Mostlinked'                => array( 'Mest ítengt' ),
+	'Mostlinkedcategories'      => array( 'Mest ítengdu flokkar' ),
+	'Mostlinkedtemplates'       => array( 'Mest ítengdu snið' ),
+	'Mostcategories'            => array( 'Flestir flokkar' ),
+	'Mostimages'                => array( 'Flestar myndir' ),
+	'Mostrevisions'             => array( 'Flestar útgáfur' ),
+	'Fewestrevisions'           => array( 'Fæstar útgáfur' ),
+	'Shortpages'                => array( 'Stuttar síður' ),
+	'Longpages'                 => array( 'Langar síður' ),
+	'Newpages'                  => array( 'Nýjustu greinar' ),
+	'Ancientpages'              => array( 'Elstu síður' ),
 	'Deadendpages'              => array( 'Botnlangar' ),
-	'Protectedpages'            => array( 'Verndaðar_síður' ),
-	'Protectedtitles'           => array( 'Verndaðir_titlar' ),
-	'Allpages'                  => array( 'Allar_síður' ),
-	'Prefixindex'               => array( 'Allar_greinar' ),
-	'Ipblocklist'               => array( 'Bannaðir_notendur_og_vistföng' ),
+	'Protectedpages'            => array( 'Verndaðar síður' ),
+	'Protectedtitles'           => array( 'Verndaðir titlar' ),
+	'Allpages'                  => array( 'Allar síður' ),
+	'Prefixindex'               => array( 'Forskeyti' ),
+	'Ipblocklist'               => array( 'Bönnuð vistföng' ),
 	'Specialpages'              => array( 'Kerfissíður' ),
-	'Contributions'             => array( 'Framlög_notanda' ),
-	'Emailuser'                 => array( 'Senda_tölvupóst' ),
-	'Confirmemail'              => array( 'Staðfesta_netfang' ),
-	'Whatlinkshere'             => array( 'Síður_sem_tengjast_hingað' ),
-	'Recentchangeslinked'       => array( 'Nýlegar_breytingar_tengdar' ),
-	'Movepage'                  => array( 'Færa_síðu' ),
-	'Blockme'                   => array( 'Banna_mig' ),
-	'Booksources'               => array( 'Bókaverslanir' ),
+	'Contributions'             => array( 'Framlög' ),
+	'Emailuser'                 => array( 'Senda tölvupóst' ),
+	'Confirmemail'              => array( 'Staðfesta netfang' ),
+	'Whatlinkshere'             => array( 'Síður sem tengjast hingað' ),
+	'Recentchangeslinked'       => array( 'Nýlegar breytingar tengdar' ),
+	'Movepage'                  => array( 'Færa síðu' ),
+	'Blockme'                   => array( 'Banna mig' ),
+	'Booksources'               => array( 'Bókaheimildir' ),
 	'Categories'                => array( 'Flokkar' ),
-	'Export'                    => array( 'Flytja_út_síður' ),
+	'Export'                    => array( 'Flytja út' ),
 	'Version'                   => array( 'Útgáfa' ),
 	'Allmessages'               => array( 'Meldingar' ),
 	'Log'                       => array( 'Aðgerðaskrár' ),
-	'Blockip'                   => array( 'Banna_notanda' ),
-	'Undelete'                  => array( 'Endurvekja_eydda_síðu' ),
-	'Import'                    => array( 'Flytja_inn_síður' ),
-	'Lockdb'                    => array( 'Læsa_gagnagrunni' ),
-	'Unlockdb'                  => array( 'Opna_gagnagrunn' ),
+	'Blockip'                   => array( 'Banna vistföng' ),
+	'Undelete'                  => array( 'Endurvekja eydda síðu' ),
+	'Import'                    => array( 'Flytja inn' ),
+	'Lockdb'                    => array( 'Læsa gagnagrunni' ),
+	'Unlockdb'                  => array( 'Opna gagnagrunn' ),
 	'Userrights'                => array( 'Notandaréttindi' ),
 	'MIMEsearch'                => array( 'MIME-leit' ),
 	'FileDuplicateSearch'       => array( 'Afritunarskráarleit' ),
-	'Unwatchedpages'            => array( 'Óvaktaðar_síður' ),
+	'Unwatchedpages'            => array( 'Óvaktaðar síður' ),
 	'Listredirects'             => array( 'Tilvísanalisti' ),
 	'Revisiondelete'            => array( 'Eyðingarendurskoðun' ),
-	'Unusedtemplates'           => array( 'Ónotuð_snið' ),
-	'Randomredirect'            => array( 'Handahófsvalin_tilvísun' ),
-	'Mypage'                    => array( 'Notendasíða_mín' ),
-	'Mytalk'                    => array( 'Spjallasíða_mín' ),
-	'Mycontributions'           => array( 'Framlög_mín' ),
+	'Unusedtemplates'           => array( 'Ónotuð snið' ),
+	'Randomredirect'            => array( 'Handahófsvalin tilvísun' ),
+	'Mypage'                    => array( 'Notandasíða mín' ),
+	'Mytalk'                    => array( 'Spjallasíða mín' ),
+	'Mycontributions'           => array( 'Framlög mín' ),
 	'Listadmins'                => array( 'Stjórnendalisti' ),
 	'Listbots'                  => array( 'Vélmennalisti' ),
-	'Popularpages'              => array( 'Vinsælar_síður' ),
+	'Popularpages'              => array( 'Vinsælar síður' ),
 	'Search'                    => array( 'Leit' ),
-	'Resetpass'                 => array( 'Endurkalla_aðgangsorðið' ),
-	'Withoutinterwiki'          => array( 'Síður_án_tungumálatengla' ),
-	'MergeHistory'              => array( 'Sameina_breytingaskrá' ),
+	'Resetpass'                 => array( 'Endurkalla aðgangsorðið' ),
+	'Withoutinterwiki'          => array( 'Síður án tungumálatengla' ),
+	'MergeHistory'              => array( 'Sameina breytingaskrá' ),
 	'Filepath'                  => array( 'Skráarslóð' ),
-	'Invalidateemail'           => array( 'Rangt_netfang' ),
+	'Invalidateemail'           => array( 'Rangt netfang' ),
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
@@ -262,6 +270,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ekki sýna mínar breytingar á vaktlistanum',
 'tog-watchlisthidebots'       => 'Ekki sýna breytingar vélmenna á vaktlistanum',
 'tog-watchlisthideminor'      => 'Ekki sýna minniháttar breytingar á vaktlistanum',
+'tog-watchlisthideliu'        => 'Ekki sýna breytingar innskráðra notenda á vaktlistanum',
+'tog-watchlisthideanons'      => 'Ekki sýna breytingar óþekktra notenda á vaktlistanum',
 'tog-ccmeonemails'            => 'Senda mér afrit af tölvupóstum sem ég sendi öðrum notendum',
 'tog-diffonly'                => 'Ekki sýna síðuefni undir mismunum',
 'tog-showhiddencats'          => 'Sýna falda flokka',
@@ -270,8 +280,6 @@ $messages = array(
 'underline-never'   => 'Aldrei',
 'underline-default' => 'skv. vafrastillingu',
 
-'skinpreview' => '(Forskoða)',
-
 # Dates
 'sunday'        => 'sunnudagur',
 'monday'        => 'mánudagur',
@@ -366,7 +374,7 @@ $messages = array(
 'mytalk'         => 'Spjall',
 'anontalk'       => 'Spjallsíða þessa vistfangs.',
 'navigation'     => 'Flakk',
-'and'            => 'og',
+'and'            => '&#32;og',
 
 # Metadata in edit box
 'metadata_help' => 'Lýsigögn:',
@@ -429,8 +437,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Um {{SITENAME}}',
 'aboutpage'            => 'Project:Um',
-'bugreports'           => 'Villuskýrslur',
-'bugreportspage'       => 'Project:Villutilkynningar',
 'copyright'            => 'Efni má nota samkvæmt $1.',
 'copyrightpagename'    => 'Höfundarréttarreglum {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Höfundarréttur',
@@ -453,9 +459,7 @@ $messages = array(
 
 'badaccess'        => 'Aðgangsvilla',
 'badaccess-group0' => 'Þú hefur ekki leyfi til að framkvæma þá aðgerð sem þú baðst um.',
-'badaccess-group1' => 'Aðgerðin sem þú reyndir að framkvæma er takmörkuð notendum fyrir utan $1.',
-'badaccess-group2' => 'Aðgerðin sem þú reyndir að framkvæma er takmörkuð einum af hópunum $1.',
-'badaccess-groups' => 'Aðgerðin sem þú reyndir að framkvæma er takmörkuð einum af hópunum $1.',
+'badaccess-groups' => 'Aðgerðin sem þú reyndir að framkvæma er takmörkuð notendum í {{PLURAL:$2|hópnum|einum af hópunum}}: $1.',
 
 'versionrequired'     => 'Þarfnast úgáfu $1 af MediaWiki',
 'versionrequiredtext' => 'Útgáfa $1 af MediaWiki er þörf til að geta skoðað þessa síðu.
@@ -470,6 +474,8 @@ Sjá [[Special:Version|útgáfusíðuna]].',
 'editsection'             => 'breyta',
 'editold'                 => 'breyta',
 'viewsourceold'           => 'skoða efni',
+'editlink'                => 'breyta',
+'viewsourcelink'          => 'skoða efni',
 'editsectionhint'         => 'Breyti hluta: $1',
 'toc'                     => 'Efnisyfirlit',
 'showtoc'                 => 'sýna',
@@ -484,7 +490,7 @@ Sjá [[Special:Version|útgáfusíðuna]].',
 'site-atom-feed'          => '$1 Atom-streymi',
 'page-rss-feed'           => '„$1“ RSS-streymi',
 'page-atom-feed'          => '„$1“ Atom-streymi',
-'red-link-title'          => '$1 (ekki enn skrifuð)',
+'red-link-title'          => '$1 (síða er ekki enn til)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Síða',
@@ -552,7 +558,6 @@ Gjörðu svo vel og tilkynntu atvikið til [[Special:ListUsers/sysop|stjórnanda
 'cannotdelete'         => 'Ekki var hægt að eyða síðunni eða myndinni sem valin var. (Líklegt er að einhver annar hafi gert það.)',
 'badtitle'             => 'Slæmur titill',
 'badtitletext'         => 'Umbeðin síðutitill er ógildur.',
-'perfdisabled'         => 'Þessi síða hefur verið gerð óvirk þar sem notkun hennar veldur of miklu álagi á gagnagrunninum.',
 'perfcached'           => 'Eftirfarandi er afrit af umbeðinni síðu og gæti því ekki verið nýjasta útgáfa hennar:',
 'perfcachedts'         => 'Eftirfarandi gögn eru í skyndiminninu, og voru síðast uppfærð $1.',
 'querypage-no-updates' => 'Lokað er fyrir uppfærslur af þessari síðu. Gögn sett hér munu ekki vistast.',
@@ -568,7 +573,7 @@ Spurn: $2',
 'protectedinterface'   => 'Þessi síða útvegar textann sem birtist í viðmóti hugbúnaðarins, og er læst til að koma í veg fyrir misnotkun.',
 'editinginterface'     => "'''Aðvörun:''' Þú ert að breyta síðu sem hefur að geyma texta fyrir notendaumhverfi hugbúnaðarins.
 Breytingar á þessari síðu munu hafa áhrif á notendaumhverfi annarra notenda.
-Fyrir þýðingar, gjörðu svo vel að nota [http://translatewiki.net/wiki/Main_Page?setlang=is Betawiki], staðfæringverkefni MediaWiki.",
+Fyrir þýðingar, gjörðu svo vel að nota [http://translatewiki.net/wiki/Main_Page?setlang=is translatewiki.net], staðfæringverkefni MediaWiki.",
 'sqlhidden'            => '(SQL-fyrirspurn falin)',
 'cascadeprotected'     => 'Þessi síða hefur verið vernduð fyrir breytingum, vegna þess að hún er innifalin í eftirfarandi {{PLURAL:$1|síðu, sem er vernduð|síðum, sem eru verndaðar}} með „keðjuverndun“:
 $2',
@@ -579,16 +584,16 @@ $2',
 �stæðan sem gefin var ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Slæm stilling: óþekktur veiruskannari: <i>$1</i>',
+'virus-badscanner'     => "Slæm stilling: óþekktur veiruskannari: ''$1''",
 'virus-scanfailed'     => 'skönnun mistókst (kóði $1)',
 'virus-unknownscanner' => 'óþekkt mótveira:',
 
 # Login and logout pages
 'logouttitle'                => 'Útskráning notanda',
-'logouttext'                 => '<strong>Þú hefur verið skráð(ur) út.</strong>
+'logouttext'                 => "'''Þú hefur verið skráð(ur) út.'''
 
 Þú getur haldið áfram að nota {{SITENAME}} óþekkt(ur), eða þú getur [[Special:UserLogin|skráð þig inn aftur]] sem sami eða annar notandi.
-Athugaðu að sumar síður kunna að birtast líkt og þú sért ennþá skráð(ur) inn, þangað til að þú hreinsar skyndiminnið í vafranum þínum.',
+Athugaðu að sumar síður kunna að birtast líkt og þú sért ennþá skráð(ur) inn, þangað til að þú hreinsar skyndiminnið í vafranum þínum.",
 'welcomecreation'            => '== Velkomin(n), $1! ==
 Aðgangurinn þinn hefur verið búinn til.
 Ekki gleyma að breyta [[Special:Preferences|{{SITENAME}}-stillingunum]] þínum.',
@@ -598,7 +603,6 @@ Ekki gleyma að breyta [[Special:Preferences|{{SITENAME}}-stillingunum]] þínum
 'yourpasswordagain'          => 'Endurrita lykilorð:',
 'remembermypassword'         => 'Muna innskráningu mína á þessari tölvu',
 'yourdomainname'             => 'Þitt lén:',
-'loginproblem'               => '<b>Það kom upp villa í innskráningunni.</b><br />Reyndu aftur!',
 'login'                      => 'Innskrá',
 'nav-login-createaccount'    => 'Innskrá / Búa til aðgang',
 'loginprompt'                => 'Þú verður að leyfa vefkökur til þess að geta [[Special:UserLogin|skráð þig inn á {{SITENAME}}]].',
@@ -666,8 +670,9 @@ Vinsamlegast skráðu þig inn á ný þegar þú hefur móttekið það.',
 'throttled-mailpassword'     => '�minning fyrir lykilorð hefur nú þegar verið send, innan við {{PLURAL:$1|síðasta klukkutímans|$1 síðustu klukkutímanna}}.
 Til að koma í veg fyrir misnotkun, er aðeins ein áminning send {{PLURAL:$1|hvern klukkutíma|hverja $1 klukkutíma}}.',
 'mailerror'                  => 'Upp kom villa við sendingu tölvupósts: $1',
-'acct_creation_throttle_hit' => 'Þú hefur nú þegar búið til $1 notendur. Þú getur ekki búið til fleiri.',
-'emailauthenticated'         => 'Netfang þitt var staðfest þann $1.',
+'acct_creation_throttle_hit' => 'Því miður, þú hefur nú þegar búið til {{PLURAL:$1|1 aðgang|$1 aðganga}}.
+Þú getur ekki búið til fleiri.',
+'emailauthenticated'         => 'Netfang þitt var staðfest þann $2 klukkan $3.',
 'emailnotauthenticated'      => 'Veffang þitt hefur ekki enn verið sannreynt. Enginn póstur verður sendur af neinum af eftirfarandi eiginleikum.',
 'noemailprefs'               => 'Tilgreindu netfang svo þessar aðgerðir virki.',
 'emailconfirmlink'           => 'Staðfesta netfang þitt',
@@ -680,20 +685,26 @@ Gjörðu svo vel og settu inn netfang á gildu formi eða tæmdu reitinn.',
 Þú ættir að skrá þig inn og breyta lykilorðinu núna.
 
 Þú getur hunsað þetta skilaboð, ef villa hefur átt sér stað.',
+'login-throttled'            => 'Þú hefur gert of margar tilraunir nýlega á lykilorð þessa aðgangs.
+Gjörðu svo vel og bíddu áður en að þú reynir aftur.',
 'loginlanguagelabel'         => 'Tungumál: $1',
 
 # Password reset dialog
-'resetpass'               => 'Endurkalla aðgangsorðið',
-'resetpass_announce'      => 'Þú skráðir þig inn með tímabundnum netfangskóða.
+'resetpass'                 => 'Breyta lykilorði',
+'resetpass_announce'        => 'Þú skráðir þig inn með tímabundnum netfangskóða.
 Til að klára að skrá þig inn, verður þú að endurstilla lykilorðið hér:',
-'resetpass_text'          => '<!-- Setja texta hér -->',
-'resetpass_header'        => 'Breyta lykilorði',
-'resetpass_submit'        => 'Skrifaðu aðgangsorðið og skráðu þig inn',
-'resetpass_success'       => 'Aðgangsorðinu þínu hefur verið breytt! Skráir þig inn...',
-'resetpass_bad_temporary' => 'Ógilt tímabundið lykilorð.
+'resetpass_text'            => '<!-- Setja texta hér -->',
+'resetpass_header'          => 'Breyta lykilorði',
+'oldpassword'               => 'Gamla lykilorðið',
+'newpassword'               => 'Nýja lykilorðið',
+'retypenew'                 => 'Endurtaktu nýja lykilorðið:',
+'resetpass_submit'          => 'Skrifaðu aðgangsorðið og skráðu þig inn',
+'resetpass_success'         => 'Aðgangsorðinu þínu hefur verið breytt! Skráir þig inn...',
+'resetpass_bad_temporary'   => 'Ógilt tímabundið lykilorð.
 Það kann að vera að þér hafi nú þegar tekist að breyta lykilorðinu þínu eða fengið nýtt tímabundið lykilorð.',
-'resetpass_forbidden'     => 'Ekki er hægt að breyta lykilorðum',
-'resetpass_missing'       => 'Engin gögn í eyðublaðinu',
+'resetpass_forbidden'       => 'Ekki er hægt að breyta lykilorðum',
+'resetpass-submit-loggedin' => 'Breyta lykilorði',
+'resetpass-temp-password'   => 'Tímabundið lykilorð:',
 
 # Edit page toolbar
 'bold_sample'     => 'Feitletraður texti',
@@ -718,8 +729,8 @@ Til að klára að skrá þig inn, verður þú að endurstilla lykilorðið hé
 'hr_tip'          => 'Lárétt lína (notist sparlega)',
 
 # Edit pages
-'summary'                          => 'Breytingarágrip',
-'subject'                          => 'Fyrirsögn',
+'summary'                          => 'Breytingarágrip:',
+'subject'                          => 'Fyrirsögn:',
 'minoredit'                        => 'Þetta er minniháttar breyting',
 'watchthis'                        => 'Vakta þessa síðu',
 'savearticle'                      => 'Vista síðu',
@@ -733,8 +744,8 @@ Ef þú smellir á Vista aftur, verður breyting þín vistuð án þess.",
 'missingcommenttext'               => 'Gerðu svo vel og skrifaðu athugasemd fyrir neðan.',
 'missingcommentheader'             => "'''�minning:''' Þú hefur ekki gefið upp umræðuefni/fyrirsögn.
 Ef þú smellir á Vista aftur, verður breyting þín vistuð án þess.",
-'summary-preview'                  => 'Forskoða breytingarágrip',
-'subject-preview'                  => 'Forskoðun umræðuefnis/fyrirsagnar',
+'summary-preview'                  => 'Forskoða breytingarágrip:',
+'subject-preview'                  => 'Forskoðun umræðuefnis/fyrirsagnar:',
 'blockedtitle'                     => 'Notandi er bannaður',
 'blockedtext'                      => "<big>'''Notandanafn þitt eða vistfang hefur verið bannað.'''</big>
 
@@ -787,7 +798,7 @@ Ef þú hefur óvart villst hingað geturðu notað '''til baka'''-hnappinn í v
 Þar af leiðandi þurfum við að nota vistfang til að bera kennsli á hann/hana.
 Nokkrir notendur geta deilt sama vistfangi.
 Ef þú ert óþekktur notandi og finnst að óviðkomandi athugasemdum hafa verið beint að þér, gjörðu svo vel og [[Special:UserLogin/signup|búðu til aðgang]] eða [[Special:UserLogin|skráðu þig inn]] til þess að koma í veg fyrir þennan rugling við aðra óþekkta notendur í framtíðinni.''",
-'noarticletext'                    => 'Það er enginn texti á þessari síðu en sem komið er, þú getur [[Special:Search/{{PAGENAME}}|leitað í öðrum síðum]] eða [{{fullurl:{{FULLPAGENAMEE}}|action=edit}} breytt henni sjálfur].',
+'noarticletext'                    => 'Enginn texti er á þessari síðu enn sem komið er. Þú getur [[Special:Search/{{PAGENAME}}|leitað í öðrum síðum]] eða [{{fullurl:{{FULLPAGENAMEE}}|action=edit}} breytt henni sjálfur].',
 'userpage-userdoesnotexist'        => 'Notandaaðgangurinn „$1“ er ekki skráður.
 Gjörðu svo vel og athugaðu hvort að þú viljir skapa/breyta þessari síðu.',
 'clearyourcache'                   => "'''Athugaðu - Eftir vistun, má vera að þú þurfir að komast hjá skyndiminni vafrans þíns til að sjá breytingarnar.'''
@@ -795,16 +806,16 @@ Gjörðu svo vel og athugaðu hvort að þú viljir skapa/breyta þessari síðu
 '''Konqueror: '''smelltu á ''Reload'' eða ýttu á ''F5'';
 '''Opera:''' hreinsaðu skyndiminnið í ''Tools → Prefernces'';
 '''Internet Explorer:''' haltu ''Ctrl'' og smelltu á ''Refresh'', eða ýttu á ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => '<strong>Ath:</strong> Hægt er að nota „Forskoða“ hnappinn til að prófa CSS og JavaScript-kóða áður en hann er vistaður.',
+'usercssjsyoucanpreview'           => "'''Ath:''' Hægt er að nota „Forskoða“ hnappinn til að prófa CSS og JavaScript-kóða áður en hann er vistaður.",
 'usercsspreview'                   => "'''Mundu að þú ert aðeins að forskoða CSS-kóðann þinn.'''
 '''Hann hefur ekki enn verið vistaður!'''",
 'userjspreview'                    => "'''Mundu að þú ert aðeins að prófa/forskoða JavaScript-kóðann þinn.'''
 '''Hann hefur ekki enn verið vistaður!'''",
 'updated'                          => '(Uppfært)',
-'note'                             => '<strong>Athugið:</strong>',
-'previewnote'                      => '<strong>Það sem sést hér er aðeins forskoðun og hefur ekki enn verið vistað!</strong>',
-'session_fail_preview'             => '<strong>Því miður! Gat ekki unnið úr breytingum þínum vegna týndra lotugagna.
-Vinsamlegast reyndu aftur síðar. Ef það virkar ekki heldur skaltu reyna að skrá þig út og inn á ný.</strong>',
+'note'                             => "'''Athugið:'''",
+'previewnote'                      => "'''Það sem sést hér er aðeins forskoðun og hefur ekki enn verið vistað!'''",
+'session_fail_preview'             => "'''Því miður! Gat ekki unnið úr breytingum þínum vegna týndra lotugagna.
+Vinsamlegast reyndu aftur síðar. Ef það virkar ekki heldur skaltu reyna að skrá þig út og inn á ný.'''",
 'editing'                          => 'Breyti $1',
 'editingsection'                   => 'Breyti $1 (hluta)',
 'editingcomment'                   => 'Breyti $1 (athugasemd)',
@@ -812,23 +823,26 @@ Vinsamlegast reyndu aftur síðar. Ef það virkar ekki heldur skaltu reyna að
 'explainconflict'                  => 'Síðunni hefur verið breytt síðan þú byrjaðir að gera breytingar á henni, textinn í efri reitnum inniheldur núverandi útgáfu úr gagnagrunni og sá neðri inniheldur þína útgáfu, þú þarft hér að færa breytingar sem þú vilt halda úr neðri reitnum í þann efri og vista síðuna. <strong>Aðeins</strong> texti úr efri reitnum mun vera vistaður þegar þú vistar.',
 'yourtext'                         => 'Þinn texti',
 'storedversion'                    => 'Geymd útgáfa',
-'editingold'                       => '<strong>ATH: Þú ert að breyta gamalli útgáfu þessarar síðu og munu allar breytingar sem gerðar hafa verið á henni frá þeirri útgáfu vera fjarlægðar ef þú vistar.</strong>',
+'editingold'                       => "'''ATH: Þú ert að breyta gamalli útgáfu þessarar síðu og munu allar breytingar sem gerðar hafa verið á henni frá þeirri útgáfu vera fjarlægðar ef þú vistar.'''",
 'yourdiff'                         => 'Mismunur',
-'copyrightwarning'                 => 'Vinsamlegast athugaðu að öll framlög á {{SITENAME}} eru álitin leyfisbundin samkvæmt $2 (sjá $1 fyrir frekari upplýsingar).  Ef þú vilt ekki að skrif þín falli undir þetta leyfi og öllum verði frjálst að breyta og endurútgefa efnið samkvæmt því skaltu ekki leggja þau fram hér.<br />
+'copyrightwarning'                 => "Vinsamlegast athugaðu að öll framlög á {{SITENAME}} eru álitin leyfisbundin samkvæmt $2 (sjá $1 fyrir frekari upplýsingar).  Ef þú vilt ekki að skrif þín falli undir þetta leyfi og öllum verði frjálst að breyta og endurútgefa efnið samkvæmt því skaltu ekki leggja þau fram hér.<br />
 Þú berð ábyrgð á framlögum þínum, þau verða að vera þín skrif eða afrit texta í almannaeigu eða sambærilegs frjáls texta.
-<strong>AFRITI� EKKI HÖFUNDARRÉTTARVARIN VERK � ÞESSA S��U �N LEYFIS</strong>',
-'copyrightwarning2'                => 'Vinsamlegast athugið að aðrir notendur geta breytt eða fjarlægt öll framlög til {{SITENAME}}.
+'''AFRITI� EKKI HÖFUNDARRÉTTARVARIN VERK � ÞESSA S��U �N LEYFIS'''",
+'copyrightwarning2'                => "Vinsamlegast athugið að aðrir notendur geta breytt eða fjarlægt öll framlög til {{SITENAME}}.
 Ef þú vilt ekki að textanum verði breytt skaltu ekki senda hann inn hér.<br />
 Þú lofar okkur einnig að þú hafir skrifað þetta sjálfur, að efnið sé í almannaeigu eða að það heyri undir frjálst leyfi. (sjá $1).
-<strong>EKKI SENDA INN HÖFUNDARRÉTTARVARI� EFNI �N LEYFIS RÉTTHAFA!</strong>',
-'longpagewarning'                  => '<strong>VI�VÖRUN: Þessi síða er $1 kílóbæta löng; sumir
+'''EKKI SENDA INN HÖFUNDARRÉTTARVARI� EFNI �N LEYFIS RÉTTHAFA!'''",
+'longpagewarning'                  => "'''VI�VÖRUN: Þessi síða er $1 kílóbæta löng; sumir
 vafrar gætu átt erfitt með að gera breytingar á síðum sem nálgast eða eru lengri en 32 kb.
-Vinsamlegast íhugaðu að skipta síðunni niður í smærri einingar.</strong>',
-'longpageerror'                    => '<strong>VILLA: Textinn sem þú sendir inn er $1 kílóbæti að lengd, en hámarkið er $2 kílóbæti. Ekki er hægt að vista textann.</strong>',
-'readonlywarning'                  => '<strong>VI�VÖRUN: Gagnagrunninum hefur verið læst til að unnt sé að framkvæma viðhaldsaðgerðir, svo að þú getur ekki vistað breytingar þínar núna. Þú gætir viljað afrita breyttan texta síðunnar yfir í textaskjal og geyma hann þar til síðar.</strong>',
-'protectedpagewarning'             => '<strong>Viðvörun: Þessari síðu hefur verið læst svo aðeins notendur með möppudýraréttindi geti breytt henni.</strong>',
+Vinsamlegast íhugaðu að skipta síðunni niður í smærri einingar.'''",
+'longpageerror'                    => "'''VILLA: Textinn sem þú sendir inn er $1 kílóbæti að lengd, en hámarkið er $2 kílóbæti. Ekki er hægt að vista textann.'''",
+'readonlywarning'                  => "'''A�VÖRUN: Gagnagrunninum hefur verið læst til að unnt sé að framkvæma viðhaldsaðgerðir, svo þú getur ekki vistað breytingar þínar núna.
+Þú kannt að vilja að klippa og líma textann í textaskjal og vista hann fyrir síðar.'''
+
+Stjórnandinn sem læsti honum gaf þessa skýringu: $1",
+'protectedpagewarning'             => "'''Viðvörun: Þessari síðu hefur verið læst svo aðeins notendur með möppudýraréttindi geti breytt henni.'''",
 'semiprotectedpagewarning'         => "'''Athugið''': Þessari síðu hefur verið læst þannig að aðeins innskráðir notendur geti breytt henni.",
-'titleprotectedwarning'            => '<strong>VI�VÖRUN: Þessari síðu hefur verið læst svo aðeins notendur geta breytt henni.</strong>',
+'titleprotectedwarning'            => "'''VI�VÖRUN: Þessari síðu hefur verið læst svo aðeins notendur geta breytt henni.'''",
 'templatesused'                    => 'Snið notuð á þessari síðu:',
 'templatesusedpreview'             => 'Snið notuð í forskoðuninni:',
 'templatesusedsection'             => 'Snið notuð á hlutanum:',
@@ -846,12 +860,24 @@ Vinsamlegast íhugaðu að skipta síðunni niður í smærri einingar.</strong>
 
 Athuga skal hvort viðeigandi sé að gera þessa síðu.
 Eyðingarskrá fyrir þessa síðu er útveguð hér til þæginda:",
+'deleted-notice'                   => 'Þessari síðu hefur verið eytt.
+Eyðingaskrá síðunnar er gefin fyrir neðan til tilvísunar.',
+'deletelog-fulllog'                => 'Skoða alla atburðaskrá',
+'edit-gone-missing'                => 'Gat ekki uppfært síðu.
+Svo virðist sem henni hafi verið eytt.',
+'edit-conflict'                    => 'Breytingaárekstur.',
+'edit-no-change'                   => 'Breyting þín var hunsuð, því engin breyting var á textanum.',
+'edit-already-exists'              => 'Gat ekki skapað nýja síðu.
+Hún er nú þegar til.',
+
+# Parser/template warnings
+'parser-template-loop-warning' => 'Lykkja í sniði fundin: [[$1]]',
 
 # "Undo" feature
 'undo-success' => 'Breytingin hefur verið tekin tilbaka. Vinsamlegast staðfestu og vistaðu svo.',
 'undo-failure' => 'Breytinguna var ekki hægt að taka tilbaka vegna breytinga í millitíðinni.',
 'undo-norev'   => 'Ekki var hægt að taka breytinguna aftr því að hún er ekki til eða henni var eytt.',
-'undo-summary' => 'Taka aftur breytingu $1 frá [[Special:Contributions/$2|$2]] ([[User talk:$2|Spjall]])',
+'undo-summary' => 'Tek aftur breytingu $1 frá [[Special:Contributions/$2|$2]] ([[User talk:$2|spjall]])',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Ekki hægt að búa til aðgang',
@@ -860,28 +886,29 @@ Eyðingarskrá fyrir þessa síðu er útveguð hér til þæginda:",
 �stæðan sem $3 gaf fyrir því er ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Sýna aðgerðir varðandi þessa síðu',
-'nohistory'           => 'Þessi síða hefur enga breytingaskrá.',
-'revnotfound'         => 'Breyting ekki fundin',
-'currentrev'          => 'Núverandi útgáfa',
-'revisionasof'        => 'Útgáfa síðunnar $1',
-'revision-info'       => 'Útgáfa frá $1 eftir $2',
-'previousrevision'    => '�Fyrri útgáfa',
-'nextrevision'        => 'Næsta útgáfa→',
-'currentrevisionlink' => 'Núverandi útgáfa',
-'cur'                 => 'fyrri',
-'next'                => 'næst',
-'last'                => 'þessa',
-'page_first'          => 'fyrsta',
-'page_last'           => 'síðasta',
-'histlegend'          => 'Mismunarval: merktu við einvalshnappanna fyrir þær útgáfur sem á að bera saman og styddu svo á færsluhnappinn.<br />
+'viewpagelogs'           => 'Sýna aðgerðir varðandi þessa síðu',
+'nohistory'              => 'Þessi síða hefur enga breytingaskrá.',
+'currentrev'             => 'Núverandi útgáfa',
+'currentrev-asof'        => 'Núverandi breyting frá og með $1',
+'revisionasof'           => 'Útgáfa síðunnar $1',
+'revision-info'          => 'Útgáfa frá $1 eftir $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Fyrri útgáfa',
+'nextrevision'           => 'Næsta útgáfa→',
+'currentrevisionlink'    => 'Núverandi útgáfa',
+'cur'                    => 'fyrri',
+'next'                   => 'næst',
+'last'                   => 'þessa',
+'page_first'             => 'fyrsta',
+'page_last'              => 'síðasta',
+'histlegend'             => 'Mismunarval: merktu við einvalshnappanna fyrir þær útgáfur sem á að bera saman og styddu svo á færsluhnappinn.<br />
 Skýringartexti: (nú) = skoðanamunur á núverandi útgáfu,
 (síðast) = skoðanamunur á undanfarandi útgáfu, M = minniháttar breyting.',
-'deletedrev'          => '[eytt]',
-'histfirst'           => 'elstu',
-'histlast'            => 'yngstu',
-'historysize'         => '({{PLURAL:$1|1 bæti|$1 bæti}})',
-'historyempty'        => '(tóm)',
+'history-fieldset-title' => 'Skoða breytingaskrá',
+'deletedrev'             => '[eytt]',
+'histfirst'              => 'elstu',
+'histlast'               => 'yngstu',
+'historysize'            => '({{PLURAL:$1|1 bæti|$1 bæti}})',
+'historyempty'           => '(tóm)',
 
 # Revision feed
 'history-feed-title'          => 'Breytingaskrá',
@@ -933,117 +960,177 @@ Prófaðu [[Special:Search|að leita á þessari wiki síðu]] að svipuðum sí
 'difference'              => '(Munur milli útgáfa)',
 'lineno'                  => 'Lína $1:',
 'compareselectedversions' => 'Bera saman valdar útgáfur',
+'visualcomparison'        => 'Sjónrænn samanburður',
+'wikicodecomparison'      => 'Wiki-texta samanburður',
 'editundo'                => 'Taka aftur þessa breytingu',
 'diff-multi'              => '({{PLURAL:$1|Ein millibreyting ekki sýnd|$1 millibreytingar ekki sýndar}}.)',
+'diff-width'              => 'breidd',
+'diff-height'             => 'hæð',
+'diff-p'                  => "'''klausa'''",
+'diff-blockquote'         => "'''tilvitnun'''",
+'diff-h1'                 => "'''fyrirsögn (stig 1)'''",
+'diff-h2'                 => "'''fyrirsögn (stig 2)'''",
+'diff-h3'                 => "'''fyrirsögn (stig 3)'''",
+'diff-h4'                 => "'''fyrirsögn (stig 4)'''",
+'diff-h5'                 => "'''fyrirsögn (stig 5)'''",
+'diff-div'                => "'''skipting'''",
+'diff-ul'                 => "'''óraðaður listi'''",
+'diff-ol'                 => "'''raðaður listi'''",
+'diff-li'                 => "'''listaatriði'''",
+'diff-table'              => "'''tafla'''",
+'diff-tbody'              => "'''innihald töflu'''",
+'diff-tr'                 => "'''röð'''",
+'diff-td'                 => "'''dálkur'''",
+'diff-th'                 => "'''haus'''",
+'diff-br'                 => "'''línubil'''",
+'diff-hr'                 => "'''lárétt strik'''",
+'diff-code'               => "'''tölvukóðabálkur'''",
+'diff-dl'                 => "'''skilgreiningarlisti'''",
+'diff-dt'                 => "'''skilgreiningarhugtak'''",
+'diff-dd'                 => "'''skilgreining'''",
+'diff-input'              => "'''inntak'''",
+'diff-form'               => "'''eyðublað'''",
+'diff-img'                => "'''mynd'''",
+'diff-span'               => "'''spönn'''",
+'diff-a'                  => "'''tengill'''",
+'diff-i'                  => "'''skáletur'''",
+'diff-b'                  => "'''feitletur'''",
+'diff-strong'             => "'''feitletur'''",
+'diff-em'                 => "'''skáletur'''",
+'diff-font'               => "'''leturgerð'''",
+'diff-big'                => "'''stór'''",
+'diff-del'                => "'''gegnumstrikað'''",
+'diff-tt'                 => "'''föst breidd'''",
+'diff-sub'                => "'''undirskrift'''",
+'diff-sup'                => "'''uppskrift'''",
+'diff-strike'             => "'''gegnumstrikað'''",
 
 # Search results
-'searchresults'             => 'Leitarniðurstöður',
-'searchresulttext'          => 'Fyrir frekari upplýsingar um leit á {{SITENAME}} farið á [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Þú leitaðir að '''[[:$1]]''' ([[Special:Prefixindex/$1|öllum síðum sem hefjast á „$1“]] | [[Special:WhatLinksHere/$1|öllum síðum sem tengja í „$1“]])",
-'searchsubtitleinvalid'     => "Þú leitaðir að '''$1'''",
-'noexactmatch'              => "'''Engin síða ber nafnið „$1“.''' Þú getur [[:$1|búið hana til]].",
-'noexactmatch-nocreate'     => "'''Það er engin síða sem ber nafnið „$1“.'''",
-'toomanymatches'            => 'Of mörgum niðurstöðum var skilað, gjörðu svo vel og reyndu aðra fyrirspurn',
-'titlematches'              => 'Titlar greina sem pössuðu við fyrirspurnina',
-'notitlematches'            => 'Engir greinartitlar pössuðu við fyrirspurnina',
-'textmatches'               => 'Leitarorð fannst/fundust í innihaldi eftirfarandi greina',
-'notextmatches'             => 'Engar samsvaranir á texta í síðum',
-'prevn'                     => 'síðustu $1',
-'nextn'                     => 'næstu $1',
-'viewprevnext'              => 'Skoða ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 orð|$2 orð}})',
-'search-result-score'       => 'Gildi: $1%',
-'search-redirect'           => '(tilvísun $1)',
-'search-section'            => '(hluti $1)',
-'search-suggest'            => 'Varstu að leita af: $1',
-'search-interwiki-caption'  => 'Systurverkefni',
-'search-interwiki-default'  => '$1 útkomur:',
-'search-interwiki-more'     => '(fleiri)',
-'search-mwsuggest-enabled'  => 'með uppástungum',
-'search-mwsuggest-disabled' => 'engar uppástungur',
-'search-relatedarticle'     => 'Tengt',
-'mwsuggest-disable'         => 'Gera AJAX-uppástungur óvirkar',
-'searchrelated'             => 'tengt',
-'searchall'                 => 'öllum',
-'showingresults'            => "Sýni {{PLURAL:$1|'''1''' niðurstöðu|'''$1''' niðurstöður}} frá og með #'''$2'''.",
-'showingresultsnum'         => "Sýni {{PLURAL:$3|'''$3''' niðurstöðu|'''$3''' niðurstöður}} frá og með #<b>$2</b>.",
-'showingresultstotal'       => "Sýni að neðan {{PLURAL:$3|útkomu '''$1''' af '''$3'''|útkomur '''$1 - $2''' af '''$3'''}}",
-'nonefound'                 => "'''Athugaðu''': Það er aðeins leitað í sumum nafnrýmum sjálfkrafa. Prófaðu að setja forskeytið ''all:'' í fyrirspurnina til að leita í öllu efni (þar á meðal notandaspjallsíðum, sniðum, o.s.frv.), eða notaðu tileigandi nafnrými sem forskeyti.",
-'powersearch'               => '�tarleg leit',
-'powersearch-legend'        => '�tarlegri leit',
-'powersearch-ns'            => 'Leita í nafnrýmum:',
-'powersearch-redir'         => 'Lista tilvísanir',
-'powersearch-field'         => 'Leita að',
-'search-external'           => 'Ytri leit',
-'searchdisabled'            => '{{SITENAME}}-leit er óvirk.
+'searchresults'                    => 'Leitarniðurstöður',
+'searchresults-title'              => 'Leitarniðurstöður fyrir „$1“',
+'searchresulttext'                 => 'Fyrir frekari upplýsingar um leit á {{SITENAME}} farið á [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Þú leitaðir að '''[[:$1]]''' ([[Special:Prefixindex/$1|öllum síðum sem hefjast á „$1“]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|öllum síðum sem tengja í „$1“]])",
+'searchsubtitleinvalid'            => "Þú leitaðir að '''$1'''",
+'noexactmatch'                     => "'''Engin síða ber nafnið „$1“.''' Þú getur [[:$1|búið hana til]].",
+'noexactmatch-nocreate'            => "'''Það er engin síða sem ber nafnið „$1“.'''",
+'toomanymatches'                   => 'Of mörgum niðurstöðum var skilað, gjörðu svo vel og reyndu aðra fyrirspurn',
+'titlematches'                     => 'Titlar greina sem pössuðu við fyrirspurnina',
+'notitlematches'                   => 'Engir greinartitlar pössuðu við fyrirspurnina',
+'textmatches'                      => 'Leitarorð fannst/fundust í innihaldi eftirfarandi greina',
+'notextmatches'                    => 'Engar samsvaranir á texta í síðum',
+'prevn'                            => 'síðustu $1',
+'nextn'                            => 'næstu $1',
+'viewprevnext'                     => 'Skoða ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Leitarvalmöguleikar',
+'searchmenu-exists'                => "'''Það er síða að nafni „[[$1]]“ á þessum wiki'''",
+'searchmenu-new'                   => "'''[[:$1|Skapaðu]] síðuna ''$1'' á þessum wiki!'''",
+'searchhelp-url'                   => 'Help:Efnisyfirlit',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Leita að síðum með þessu forskeyti]]',
+'searchprofile-articles'           => 'Efnissíður',
+'searchprofile-articles-and-proj'  => 'Efnis- og verkefnasíður',
+'searchprofile-project'            => 'Verkefnasíður',
+'searchprofile-images'             => 'Skrár',
+'searchprofile-articles-tooltip'   => 'Leita í $1',
+'searchprofile-project-tooltip'    => 'Leita í $1',
+'searchprofile-images-tooltip'     => 'Leita að skrám',
+'searchprofile-everything-tooltip' => 'Leita í öllu efni (þar á meðal spjallsíðum)',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 orð|$2 orð}})',
+'search-result-score'              => 'Gildi: $1%',
+'search-redirect'                  => '(tilvísun $1)',
+'search-section'                   => '(hluti $1)',
+'search-suggest'                   => 'Varstu að leita af: $1',
+'search-interwiki-caption'         => 'Systurverkefni',
+'search-interwiki-default'         => '$1 útkomur:',
+'search-interwiki-more'            => '(fleiri)',
+'search-mwsuggest-enabled'         => 'með uppástungum',
+'search-mwsuggest-disabled'        => 'engar uppástungur',
+'search-relatedarticle'            => 'Tengt',
+'mwsuggest-disable'                => 'Gera AJAX-uppástungur óvirkar',
+'searchrelated'                    => 'tengt',
+'searchall'                        => 'öllum',
+'showingresults'                   => "Sýni {{PLURAL:$1|'''1''' niðurstöðu|'''$1''' niðurstöður}} frá og með #'''$2'''.",
+'showingresultsnum'                => "Sýni {{PLURAL:$3|'''$3''' niðurstöðu|'''$3''' niðurstöður}} frá og með #<b>$2</b>.",
+'showingresultstotal'              => "Sýni að neðan {{PLURAL:$4|útkomu '''$1''' af '''$3'''|útkomur '''$1 - $2''' af '''$3'''}}",
+'nonefound'                        => "'''Athugaðu''': Það er aðeins leitað í sumum nafnrýmum sjálfkrafa. Prófaðu að setja forskeytið ''all:'' í fyrirspurnina til að leita í öllu efni (þar á meðal notandaspjallsíðum, sniðum, o.s.frv.), eða notaðu tileigandi nafnrými sem forskeyti.",
+'search-nonefound'                 => 'Engar niðurstöður pössuðu við fyrirspurnina.',
+'powersearch'                      => '�tarleg leit',
+'powersearch-legend'               => '�tarlegri leit',
+'powersearch-ns'                   => 'Leita í nafnrýmum:',
+'powersearch-redir'                => 'Lista tilvísanir',
+'powersearch-field'                => 'Leita að',
+'search-external'                  => 'Ytri leit',
+'searchdisabled'                   => '{{SITENAME}}-leit er óvirk.
 Þú getur leitað í genum Google á meðan.
 Athugaðu að skrár þeirra yfir {{SITENAME}}-efni kunna að vera úreltar.',
 
 # Preferences page
-'preferences'              => 'Stillingar',
-'mypreferences'            => 'Stillingar',
-'prefs-edits'              => 'Fjöldi breytinga:',
-'prefsnologin'             => 'Ekki innskráður',
-'prefsnologintext'         => 'Þú verður að vera <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} skráð(ur) inn]</span> til að breyta notandastillingum.',
-'prefsreset'               => 'Stillingum hefur verið breytt yfir í þær stillingar sem eru í minni.',
-'qbsettings'               => 'Valblað',
-'qbsettings-none'          => 'Sleppa',
-'qbsettings-fixedleft'     => 'Fast vinstra megin',
-'qbsettings-fixedright'    => 'Fast hægra megin',
-'qbsettings-floatingleft'  => 'Fljótandi til vinstri',
-'qbsettings-floatingright' => 'Fljótandi til hægri',
-'changepassword'           => 'Breyta lykilorði',
-'skin'                     => 'Þema',
-'math'                     => 'Stærðfræðiformúlur',
-'dateformat'               => 'Tímasnið',
-'datedefault'              => 'Sjálfgefið',
-'datetime'                 => 'Tímasnið og tímabelti',
-'math_failure'             => 'Þáttun mistókst',
-'math_unknown_error'       => 'óþekkt villa',
-'math_unknown_function'    => 'óþekkt virkni',
-'math_lexing_error'        => 'lestrarvilla',
-'math_syntax_error'        => 'málfræðivilla',
-'prefs-personal'           => 'Notandaupplýsingar',
-'prefs-rc'                 => 'Nýlegar breytingar',
-'prefs-watchlist'          => 'Vaktlistinn',
-'prefs-watchlist-days'     => 'Fjöldi daga sem vaktlistinn nær yfir:',
-'prefs-watchlist-edits'    => 'Fjöldi breytinga sem vaktlistinn nær yfir:',
-'prefs-misc'               => 'Aðrar stillingar',
-'saveprefs'                => 'Vista',
-'resetprefs'               => 'Endurstilla valmöguleika',
-'oldpassword'              => 'Gamla lykilorðið',
-'newpassword'              => 'Nýja lykilorðið',
-'retypenew'                => 'Endurtaktu nýja lykilorðið:',
-'textboxsize'              => 'Breytingarflipinn',
-'rows'                     => 'Raðir',
-'columns'                  => 'Dálkar',
-'searchresultshead'        => 'Leit',
-'resultsperpage'           => 'Niðurstöður á síðu',
-'contextlines'             => 'Línur á hverja niðurstöðu',
-'contextchars'             => 'Stafir í samhengi á hverja línu',
-'stub-threshold'           => 'Þröskuldur fyrir sniði <a href="#" class="stub">stubbatengla</a> (bæt):',
-'recentchangesdays'        => 'Hve marga daga á að sýna í nýlegum breytingum:',
-'recentchangescount'       => 'Fjöldi síðna á „nýlegum breytingum“',
-'savedprefs'               => 'Stillingarnar þínar hafa verið vistaðar.',
-'timezonelegend'           => 'Tímabelti',
-'timezonetext'             => 'Hliðrun staðartíma frá UTC+0.',
-'localtime'                => 'Staðartími',
-'timezoneoffset'           => 'Hliðrun',
-'servertime'               => 'Tími netþjóns',
-'guesstimezone'            => 'Fylla inn frá vafranum',
-'allowemail'               => 'Virkja tölvupóst frá öðrum notendum',
-'prefs-searchoptions'      => 'Leitarvalmöguleikar',
-'prefs-namespaces'         => 'Nafnrými',
-'defaultns'                => 'Leita í þessum nafnrýmum sjálfgefið:',
-'default'                  => 'sjálfgefið',
-'files'                    => 'Skrár',
+'preferences'               => 'Stillingar',
+'mypreferences'             => 'Stillingar',
+'prefs-edits'               => 'Fjöldi breytinga:',
+'prefsnologin'              => 'Ekki innskráður',
+'prefsnologintext'          => 'Þú verður að vera <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} skráð(ur) inn]</span> til að breyta notandastillingum.',
+'prefsreset'                => 'Stillingum hefur verið breytt yfir í þær stillingar sem eru í minni.',
+'qbsettings'                => 'Valblað',
+'qbsettings-none'           => 'Sleppa',
+'qbsettings-fixedleft'      => 'Fast vinstra megin',
+'qbsettings-fixedright'     => 'Fast hægra megin',
+'qbsettings-floatingleft'   => 'Fljótandi til vinstri',
+'qbsettings-floatingright'  => 'Fljótandi til hægri',
+'changepassword'            => 'Breyta lykilorði',
+'skin'                      => 'Þema',
+'skin-preview'              => 'Forskoða',
+'math'                      => 'Stærðfræðiformúlur',
+'dateformat'                => 'Tímasnið',
+'datedefault'               => 'Sjálfgefið',
+'datetime'                  => 'Tímasnið og tímabelti',
+'math_failure'              => 'Þáttun mistókst',
+'math_unknown_error'        => 'óþekkt villa',
+'math_unknown_function'     => 'óþekkt virkni',
+'math_lexing_error'         => 'lestrarvilla',
+'math_syntax_error'         => 'málfræðivilla',
+'prefs-personal'            => 'Notandaupplýsingar',
+'prefs-rc'                  => 'Nýlegar breytingar',
+'prefs-watchlist'           => 'Vaktlistinn',
+'prefs-watchlist-days'      => 'Fjöldi daga sem vaktlistinn nær yfir:',
+'prefs-watchlist-days-max'  => '(hámark 7 dagar)',
+'prefs-watchlist-edits'     => 'Fjöldi breytinga sem vaktlistinn nær yfir:',
+'prefs-watchlist-edits-max' => '(hámarkstala: 1000)',
+'prefs-misc'                => 'Aðrar stillingar',
+'prefs-resetpass'           => 'Breyta lykilorði',
+'saveprefs'                 => 'Vista',
+'resetprefs'                => 'Endurstilla valmöguleika',
+'textboxsize'               => 'Breytingarflipinn',
+'prefs-edit-boxsize'        => 'Stærð breytingagluggans.',
+'rows'                      => 'Raðir',
+'columns'                   => 'Dálkar',
+'searchresultshead'         => 'Leit',
+'resultsperpage'            => 'Niðurstöður á síðu',
+'contextlines'              => 'Línur á hverja niðurstöðu',
+'contextchars'              => 'Stafir í samhengi á hverja línu',
+'stub-threshold'            => 'Þröskuldur fyrir sniði <a href="#" class="stub">stubbatengla</a> (bæt):',
+'recentchangesdays'         => 'Hve marga daga á að sýna í nýlegum breytingum:',
+'recentchangesdays-max'     => '(hámark $1 {{PLURAL:$1|dag|daga}})',
+'recentchangescount'        => 'Fjöldi síðna á „nýlegum breytingum“',
+'savedprefs'                => 'Stillingarnar þínar hafa verið vistaðar.',
+'timezonelegend'            => 'Tímabelti',
+'timezonetext'              => 'Hliðrun staðartíma frá UTC+0.',
+'localtime'                 => 'Staðartími',
+'timezoneoffset'            => 'Hliðrun',
+'servertime'                => 'Tími netþjóns',
+'guesstimezone'             => 'Fylla inn frá vafranum',
+'allowemail'                => 'Virkja tölvupóst frá öðrum notendum',
+'prefs-searchoptions'       => 'Leitarvalmöguleikar',
+'prefs-namespaces'          => 'Nafnrými',
+'defaultns'                 => 'Leita í þessum nafnrýmum sjálfgefið:',
+'default'                   => 'sjálfgefið',
+'files'                     => 'Skrár',
 
 # User rights
 'userrights'                  => 'Breyta notandaréttindum', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Yfirlit notandahópa',
 'userrights-user-editname'    => 'Skráðu notandanafn:',
 'editusergroup'               => 'Breyta notandahópum',
-'editinguser'                 => "Breyti réttindum '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Breyti réttindum '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Breyta notandahópum',
 'saveusergroups'              => 'Vista notandahóp',
 'userrights-groupsmember'     => 'Meðlimur:',
@@ -1123,9 +1210,31 @@ Athugaðu að skrár þeirra yfir {{SITENAME}}-efni kunna að vera úreltar.',
 'rightslogentry' => 'breytti réttindum $1 frá $2 í $3',
 'rightsnone'     => '(engin)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lesa þessa síðu',
+'action-edit'                 => 'breyta þessari síðu',
+'action-createpage'           => 'skapa síður',
+'action-createtalk'           => 'skapa spjallsíður',
+'action-createaccount'        => 'skapa þennan notandaaðgang',
+'action-minoredit'            => 'merkja þessa breytingu sem minniháttar',
+'action-move'                 => 'færa þessa síðu',
+'action-move-subpages'        => 'færa þessa síðu, og undirsíður hennar',
+'action-upload'               => 'hlaða inn þessari skrá',
+'action-reupload'             => 'yfirrita þessa skrá',
+'action-delete'               => 'eyða þessari síðu',
+'action-deleterevision'       => 'eyða þessari breytingu',
+'action-deletedhistory'       => 'skoða breytingaskrá þessarar síðu',
+'action-browsearchive'        => 'leita í eyddum síðum',
+'action-undelete'             => 'endurvekja þessa síðu',
+'action-protect'              => 'breyta verndunarstigum fyrir þessa síðu',
+'action-userrights'           => 'breyta öllum notandaréttindum',
+'action-userrights-interwiki' => 'breyta notandaréttindum annarra notenda á öðrum wiki-verkefnum',
+'action-siteadmin'            => 'læsa eða opna gagnagrunninn',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|breyting|breytingar}}',
 'recentchanges'                     => 'Nýlegar breytingar',
+'recentchanges-legend'              => 'Stillingar nýlegra breytinga',
 'recentchangestext'                 => 'Hér geturðu fylgst með nýjustu breytingunum.',
 'recentchanges-feed-description'    => 'Hér er hægt að fylgjast með nýlegum breytingum á {{SITENAME}}.',
 'rcnote'                            => "Að neðan {{PLURAL:$1|er '''1''' breyting|eru síðustu '''$1''' breytingar}} síðast {{PLURAL:$2|liðinn dag|liðna '''$2''' daga}}, frá $5, $4.",
@@ -1149,6 +1258,7 @@ Athugaðu að skrár þeirra yfir {{SITENAME}}-efni kunna að vera úreltar.',
 'rc_categories'                     => 'Takmark á flokkum (aðskilja með "|")',
 'rc_categories_any'                 => 'Alla',
 'newsectionsummary'                 => 'Nýr hluti: /* $1 */',
+'rc-enhanced-hide'                  => 'Fela ítarefni',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Skyldar breytingar',
@@ -1169,10 +1279,10 @@ Síður á [[Special:Watchlist|vaktlistanum þínum]] eru '''feitletraðar'''.",
 til að hlaða inn skrám.',
 'uploaderror'            => 'Villa í innhlaðningu',
 'uploadtext'             => "Notaðu eyðublaðið hér fyrir neðan til að hlaða inn skrám.
-Til að skoða eða leita í áður innhlöðnum skrám ferðu á [[Special:ImageList|skráarlistann]], (endur)innhlaðnar skrár eru skráðar í [[Special:Log/upload|innhlaðningarskránni]], eyðingar í [[Special:Log/delete|eyðingaskránni]].
+Til að skoða eða leita í áður innhlöðnum skrám ferðu á [[Special:FileList|skráarlistann]], (endur)innhlaðnar skrár eru skráðar í [[Special:Log/upload|innhlaðningarskránni]], eyðingar í [[Special:Log/delete|eyðingaskránni]].
 
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Skrá.jpg]]</nowiki></tt>'''
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Skrá.png|200px|thumb|left|alt-texti]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Skrá.jpg]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Skrá.png|200px|thumb|left|alt-texti]]</nowiki></tt>'''
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Skrá.ogg]]</nowiki></tt>'''",
 'upload-permitted'       => 'Heimilaðar skráargerðir: $1.',
 'upload-preferred'       => '�kjósanlegustu skrárgerðirnar: $1.',
@@ -1180,7 +1290,7 @@ Til að skoða eða leita í áður innhlöðnum skrám ferðu á [[Special:Imag
 'uploadlog'              => 'innhlaðningarskrá',
 'uploadlogpage'          => 'Innhlaðningarskrá',
 'uploadlogpagetext'      => 'Fyrir neðan er listi yfir nýlegustu innhlöðnu skrárnar.
-Sjá [[Special:NewImages|myndasafn nýrra mynda]] fyrir myndrænna yfirlit.',
+Sjá [[Special:NewFiles|myndasafn nýrra mynda]] fyrir myndrænna yfirlit.',
 'filename'               => 'Skráarnafn',
 'filedesc'               => 'Lýsing',
 'fileuploadsummary'      => '�grip:',
@@ -1200,7 +1310,7 @@ Gjörðu svo vel og endurnefndu skrána og hladdu henni inn aftur.',
 {{PLURAL:$3|Leyfileg skráargerð er|Leyfilegar skráargerðir eru}} $2.",
 'filetype-missing'       => 'Skráin hefur engan viðauka (dæmi ".jpg").',
 'large-file'             => 'Það er mælt með að skrár séu ekki stærri en $1; þessi skrá er $2.',
-'fileexists'             => 'Skrá með þessu nafni er þegar til, skoðaðu <strong><tt>$1</tt></strong> ef þú ert óviss um hvort þú viljir breyta henni, ekki verður skrifað yfir gömlu skránna hlaðiru inn nýrri með sama nafni heldur verður núverandi útgáfa geymd í útgáfusögu.',
+'fileexists'             => "Skrá með þessu nafni er þegar til, skoðaðu '''<tt>$1</tt>''' ef þú ert óviss um hvort þú viljir breyta henni, ekki verður skrifað yfir gömlu skránna hlaðiru inn nýrri með sama nafni heldur verður núverandi útgáfa geymd í útgáfusögu.",
 'fileexists-thumb'       => "<center>'''Núverandi mynd'''</center>",
 'successfulupload'       => 'Innhlaðning tókst',
 'uploadwarning'          => 'Aðvörun',
@@ -1229,17 +1339,17 @@ Gjörðu svo vel og endurnefndu skrána og hladdu henni inn aftur.',
 'license-nopreview'  => '(Forskoðun ekki fáanleg)',
 'upload_source_file' => '(skrá á tölvunni þinni)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Leita að miðilsnafni:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Leita að miðilsnafni:',
 'imgfile'               => 'skrá',
-'imagelist'             => 'Skráalisti',
-'imagelist_date'        => 'Dagsetning',
-'imagelist_name'        => 'Nafn',
-'imagelist_user'        => 'Notandi',
-'imagelist_size'        => 'Stærð (bæti)',
-'imagelist_description' => 'Lýsing',
-
-# Image description page
+'listfiles'             => 'Skráalisti',
+'listfiles_date'        => 'Dagsetning',
+'listfiles_name'        => 'Nafn',
+'listfiles_user'        => 'Notandi',
+'listfiles_size'        => 'Stærð (bæti)',
+'listfiles_description' => 'Lýsing',
+
+# File description page
 'filehist'                       => 'Breytingaskrá skjals',
 'filehist-help'                  => 'Smelltu á dagsetningu eða tímasetningu til að sjá hvernig hún leit þá út.',
 'filehist-deleteall'             => 'eyða öllu',
@@ -1251,7 +1361,7 @@ Gjörðu svo vel og endurnefndu skrána og hladdu henni inn aftur.',
 'filehist-dimensions'            => 'Víddir',
 'filehist-filesize'              => 'Stærð skráar',
 'filehist-comment'               => 'Athugasemd',
-'imagelinks'                     => 'Tenglar',
+'imagelinks'                     => 'Skráatenglar',
 'linkstoimage'                   => 'Eftirfarandi {{PLURAL:$1|síða tengist|$1 síður tengjast}} í þessa skrá:',
 'nolinkstoimage'                 => 'Engar síður tengja í þessa skrá.',
 'sharedupload'                   => 'Þessari skrá er deilt meðal annarra verkefna og nýtist því þar.',
@@ -1301,30 +1411,31 @@ Gjörðu svo vel og endurnefndu skrána og hladdu henni inn aftur.',
 
 # Random page
 'randompage'         => 'Handahófsvalin grein',
-'randompage-nopages' => 'Það eru engar síður í þessu nafnrými.',
+'randompage-nopages' => 'Það eru engar síður í nafnrýminu „$1“.',
 
 # Random redirect
 'randomredirect'         => 'Handahófsvalin tilvísun',
-'randomredirect-nopages' => 'Það eru engar tilvísanir í þessu nafnrými.',
+'randomredirect-nopages' => 'Það eru engar tilvísanir í nafnrýminu „$1“.',
 
 # Statistics
-'statistics'             => 'Tölfræði',
-'sitestats'              => 'Tölfræði fyrir {{SITENAME}}',
-'userstats'              => 'Notandatölfræði',
-'sitestatstext'          => "Það {{PLURAL:$1|er '''1''' síða|eru '''$1''' síður}} í gagnagrunninum.
-Meðtaldar eru „spjallsíður“, síður varðandi {{SITENAME}}, smávægilegir „stubbar“, tilvísanir og aðrar síður sem mundu líklega ekki teljast sem efnislegar síður.
-Fyrir utan þær þá {{PLURAL:$2|er '''1''' síða sem líklega getur|eru '''$2''' síður sem líklega geta}} talist
-{{PLURAL:$2|efnisleg grein|efnislegar greinar}}.
-
-'''$8''' {{PLURAL:$8|skrá|skrám}} hefur verið hlaðið inn.
-
-Það hafa alls '''$3''' {{PLURAL:$3|síða verið skoðuð|síður verið skoðaðar}} og '''$4''' {{PLURAL:$4|síðubreyting|síðubreytingar}}
-síðan {{SITENAME}} hóf göngu sína.
-Sem gerir að meðaltali '''$5''' breytingar á hverja síðu og '''$6''' skoðanir á hverja breytingu.
-
-Lengdin á [http://www.mediawiki.org/wiki/Manual:Job_queue vinnsluröðinni] er '''$7'''.",
-'userstatstext'          => "Hér {{PLURAL:$1|er '''1''' skráður [[Special:ListUsers|notandi]]|eru '''$1''' skráðir [[Special:ListUsers|notendur]]}}, þar af '''$2''' (eða '''$4%''') {{PLURAL:$2|hefur|hafa}} $5 stjórnendaréttindi.",
-'statistics-mostpopular' => 'Mest skoðuðu síður',
+'statistics'                   => 'Tölfræði',
+'statistics-header-pages'      => 'Síðutölfræði',
+'statistics-header-edits'      => 'Breytingatölfræði',
+'statistics-header-views'      => 'Uppflettitölfræði',
+'statistics-header-users'      => 'Notandatölfræði',
+'statistics-articles'          => 'Greinar alls',
+'statistics-pages'             => 'Síður',
+'statistics-pages-desc'        => 'Allar síður wiki-verkefnisins, þar á meðal spjallsíður, tilvísanir o.fl.',
+'statistics-files'             => 'Skráafjöldi',
+'statistics-edits'             => 'Síðubreytingar frá því {{SITENAME}} byrjaði',
+'statistics-edits-average'     => 'Meðal breytingafjöldi á síðu',
+'statistics-views-total'       => 'Uppflettingar alls',
+'statistics-views-peredit'     => 'Uppflettingar á hverja breytingu (meðaltal)',
+'statistics-jobqueue'          => 'Lengd [http://www.mediawiki.org/wiki/Manual:Job_queue vinnuraðar]',
+'statistics-users'             => 'Skráðir  [[Special:ListUsers|notendur]]',
+'statistics-users-active'      => 'Virkir notendur',
+'statistics-users-active-desc' => 'Notendur sem hafa framkvæmt aðgerð {{PLURAL:$1|síðastliðin dag|síðastliðna $1 daga}}',
+'statistics-mostpopular'       => 'Mest skoðuðu síður',
 
 'disambiguations'      => 'Tenglar í aðgreiningarsíður',
 'disambiguationspage'  => 'Template:Aðgreining',
@@ -1365,7 +1476,7 @@ Farið er með síðu sem aðgreiningarsíðu ef að hún inniheldur snið sem v
 'popularpages'            => 'Vinsælar síður',
 'wantedcategories'        => 'Eftirsóttir flokkar',
 'wantedpages'             => 'Eftirsóttar síður',
-'missingfiles'            => 'Skrá vantar',
+'wantedfiles'             => 'Eftirsóttar skrár',
 'mostlinked'              => 'Mest ítengdu síður',
 'mostlinkedcategories'    => 'Mest ítengdu flokkar',
 'mostlinkedtemplates'     => 'Mest ítengdu snið',
@@ -1379,9 +1490,11 @@ Farið er með síðu sem aðgreiningarsíðu ef að hún inniheldur snið sem v
 'deadendpagestext'        => 'Eftirfarandi síður tengjast ekki við aðrar síður á {{SITENAME}}.',
 'protectedpages'          => 'Verndaðar síður',
 'protectedpages-indef'    => 'Aðeins óendanlegar verndanir',
+'protectedpages-cascade'  => 'Keðjuverndun eingöngu',
 'protectedpagestext'      => 'Eftirfarandi síður hafa verið verndaðar svo ekki sé hægt að breyta þeim eða færa þær',
 'protectedtitles'         => 'Verndaðir titlar',
 'listusers'               => 'Notendalisti',
+'usereditcount'           => '$1 {{PLURAL:$1|breyting|breytingar}}',
 'newpages'                => 'Nýjustu greinar',
 'newpages-username'       => 'Notandanafn:',
 'ancientpages'            => 'Elstu síður',
@@ -1404,8 +1517,6 @@ Farið er með síðu sem aðgreiningarsíðu ef að hún inniheldur snið sem v
 'speciallogtitlelabel' => 'Titill:',
 'log'                  => 'Aðgerðaskrár',
 'all-logs-page'        => 'Allar aðgerðir',
-'log-search-legend'    => 'Leita að aðgerð',
-'log-search-submit'    => '�fram',
 'alllogstext'          => 'Safn allra aðgerðaskráa {{SITENAME}}.
 Þú getur takmarkað listann með því að velja tegund aðgerðaskráar, notandarnafn, eða síðu.',
 'logempty'             => 'Engin slík aðgerð fannst.',
@@ -1417,6 +1528,7 @@ Farið er með síðu sem aðgreiningarsíðu ef að hún inniheldur snið sem v
 'nextpage'          => 'Næsta síða ($1)',
 'prevpage'          => 'Fyrri síða ($1)',
 'allpagesfrom'      => 'Sýna síður frá og með:',
+'allpagesto'        => 'Sýna síður sem enda á:',
 'allarticles'       => 'Allar greinar',
 'allinnamespace'    => 'Allar síður ($1 nafnrými)',
 'allnotinnamespace' => 'Allar síður (ekki í $1 nafnrýminu)',
@@ -1436,11 +1548,27 @@ Sjá einnig [[Special:WantedCategories|eftirsótta flokka]].',
 'special-categories-sort-count' => 'raða eftir fjölda',
 'special-categories-sort-abc'   => 'raða eftir stafrófinu',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Eyddar breytingar notenda',
+
+# Special:LinkSearch
+'linksearch'    => 'Leita að vefföngum',
+'linksearch-ns' => 'Nafnrými:',
+'linksearch-ok' => 'Leita',
+
 # Special:ListUsers
 'listusersfrom'      => 'Sýna notendur sem byrja á:',
 'listusers-submit'   => 'Sýna',
 'listusers-noresult' => 'Enginn notandi fannst.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Skrá yfir nýja notendur',
+'newuserlogpagetext'          => 'Þetta er skrá yfir nýskráða notendur.',
+'newuserlog-byemail'          => 'lykilorð sent með tölvupósti',
+'newuserlog-create-entry'     => 'Nýr notandi',
+'newuserlog-create2-entry'    => 'bjó til notanda fyrir $1',
+'newuserlog-autocreate-entry' => 'Aðgangur búinn til sjálfkrafa',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Notandahópréttindi',
 'listgrouprights-group'    => 'Hópur',
@@ -1457,6 +1585,7 @@ Sjá einnig [[Special:WantedCategories|eftirsótta flokka]].',
 'defemailsubject' => 'Varðandi {{SITENAME}}',
 'noemailtitle'    => 'Ekkert póstfang',
 'noemailtext'     => 'Notandi þessi hefur kosið að fá ekki tölvupóst frá öðrum notendum eða hefur ekki fyllt út netfang sitt í stillingum.',
+'email-legend'    => 'Senda tölvupóst á annan {{SITENAME}}-notanda',
 'emailfrom'       => 'Frá:',
 'emailto'         => 'Til:',
 'emailsubject'    => 'Fyrirsögn:',
@@ -1495,12 +1624,6 @@ Frekari breytingar á henni eða spallsíðu hennar munu verða sýndar þar, og
 'iteminvalidname'      => 'Vandamál með „$1“, rangt nafn...',
 'wlnote'               => "Að neðan {{PLURAL:$1|er síðasta breyting|eru síðustu '''$1''' breytingar}} {{PLURAL:$2|síðastliðinn klukkutímann|síðastliðna '''$2''' klukkutímana}}.",
 'wlshowlast'           => 'Sýna síðustu $1 klukkutíma, $2 daga, $3',
-'watchlist-show-bots'  => 'Sýna vélmennabreytingar',
-'watchlist-hide-bots'  => 'Fela vélmennabreytingar',
-'watchlist-show-own'   => 'Sýna mínar breytingar',
-'watchlist-hide-own'   => 'Fela mínar breytingar',
-'watchlist-show-minor' => 'Sýna minniháttar breytingar',
-'watchlist-hide-minor' => 'Fela minniháttar breytingar',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vakta...',
@@ -1514,46 +1637,50 @@ Frekari breytingar á henni eða spallsíðu hennar munu verða sýndar þar, og
 'enotif_lastdiff'              => 'Sjá $1 til að skoða þessa breytingu.',
 'enotif_anon_editor'           => 'ónefndur notandi $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'Eyða',
-'confirm'                     => 'Staðfesta',
-'excontent'                   => 'innihaldið var: „$1“',
-'excontentauthor'             => "innihaldið var: '$1' (og öll framlög voru frá '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "innihald fyrir tæmingu var: '$1'",
-'exblank'                     => 'síðan var tóm',
-'delete-confirm'              => 'Eyða „$1“',
-'delete-legend'               => 'Eyða',
-'historywarning'              => 'Athugið: Síðan sem þú ert um það bil að eyða á sér',
-'confirmdeletetext'           => 'Þú ert um það bil að eyða síðu ásamt breytingaskrá hennar.
+# Delete
+'deletepage'             => 'Eyða',
+'confirm'                => 'Staðfesta',
+'excontent'              => 'innihaldið var: „$1“',
+'excontentauthor'        => "innihaldið var: '$1' (og öll framlög voru frá '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "innihald fyrir tæmingu var: '$1'",
+'exblank'                => 'síðan var tóm',
+'delete-confirm'         => 'Eyða „$1“',
+'delete-legend'          => 'Eyða',
+'historywarning'         => 'Athugið: Síðan sem þú ert um það bil að eyða á sér',
+'confirmdeletetext'      => 'Þú ert um það bil að eyða síðu ásamt breytingaskrá hennar.
 Vinsamlegast staðfestu það að þú ætlir að gera svo, það að þú skiljir afleiðingarnar, og að þú sért að gera þetta í samræmi við [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Aðgerð lokið',
-'deletedtext'                 => '„<nowiki>$1</nowiki>“ hefur verið eytt.
+'actioncomplete'         => 'Aðgerð lokið',
+'deletedtext'            => '„<nowiki>$1</nowiki>“ hefur verið eytt.
 Sjá lista yfir nýlegar eyðingar í $2.',
-'deletedarticle'              => 'eyddi „[[$1]]“',
-'dellogpage'                  => 'Eyðingaskrá',
-'dellogpagetext'              => 'Að neðan gefur að líta lista yfir síður sem nýlega hefur verið eytt.',
-'deletionlog'                 => 'eyðingaskrá',
-'reverted'                    => 'Breytt aftur til fyrri útgáfu',
-'deletecomment'               => '�stæða fyrir eyðingu:',
-'deleteotherreason'           => 'Aðrar/fleiri ástæður:',
-'deletereasonotherlist'       => 'Önnur ástæða',
-'deletereason-dropdown'       => '* Algengar ástæður
+'deletedarticle'         => 'eyddi „[[$1]]“',
+'dellogpage'             => 'Eyðingaskrá',
+'dellogpagetext'         => 'Að neðan gefur að líta lista yfir síður sem nýlega hefur verið eytt.',
+'deletionlog'            => 'eyðingaskrá',
+'reverted'               => 'Breytt aftur til fyrri útgáfu',
+'deletecomment'          => '�stæða fyrir eyðingu:',
+'deleteotherreason'      => 'Aðrar/fleiri ástæður:',
+'deletereasonotherlist'  => 'Önnur ástæða',
+'deletereason-dropdown'  => '* Algengar ástæður
 ** Að beiðni höfundar
 ** Höfundaréttarbrot
 ** Skemmdarverk',
-'delete-edit-reasonlist'      => 'Breyta eyðingarástæðum',
-'rollback'                    => 'Taka aftur breytingar',
-'rollback_short'              => 'Taka aftur',
-'rollbacklink'                => 'taka aftur',
-'rollbackfailed'              => 'Mistókst að taka aftur',
-'cantrollback'                => 'Ekki hægt að taka aftur breytingu, síðasti höfundur er eini höfundur þessarar síðu.',
-'alreadyrolled'               => 'Ekki var hægt að taka síðustu breytingu [[:$1]] eftir [[User:$2|$2]] ([[User talk:$2|spjall]]) til baka;
+'delete-edit-reasonlist' => 'Breyta eyðingarástæðum',
+
+# Rollback
+'rollback'         => 'Taka aftur breytingar',
+'rollback_short'   => 'Taka aftur',
+'rollbacklink'     => 'taka aftur',
+'rollbackfailed'   => 'Mistókst að taka aftur',
+'cantrollback'     => 'Ekki hægt að taka aftur breytingu, síðasti höfundur er eini höfundur þessarar síðu.',
+'alreadyrolled'    => 'Ekki var hægt að taka síðustu breytingu [[:$1]] eftir [[User:$2|$2]] ([[User talk:$2|spjall]]) til baka;
 eitthver annar hefur breytt síðunni eða nú þegar tekið breytinguna til baka.
 
 Síðasta breyting er frá [[User:$3|$3]] ([[User talk:$3|Spjall]]).',
-'editcomment'                 => 'Beytingarágripið var: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Tók aftur breytingar [[Special:Contributions/$2|$2]] ([[User talk:$2|spjall]]), breytt til síðustu útgáfu [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Tók til baka breytingar eftir $1; núverandi $2.',
+'editcomment'      => "Beytingarágripið var: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Tók aftur breytingar [[Special:Contributions/$2|$2]] ([[User talk:$2|spjall]]), breytt til síðustu útgáfu [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Tók til baka breytingar eftir $1; núverandi $2.',
+
+# Protect
 'protectlogpage'              => 'Verndunarskrá',
 'protectlogtext'              => 'Fyrir neðan er listi yfir síðuverndanir og -afverndanir.
 Sjáðu [[Special:ProtectedPages|listann yfir verndaðar síður]] fyrir núverandi lista yfir verndaðar síður.',
@@ -1561,25 +1688,30 @@ Sjáðu [[Special:ProtectedPages|listann yfir verndaðar síður]] fyrir núvera
 'modifiedarticleprotection'   => 'breytti verndunarstigi fyrir "[[$1]]"',
 'unprotectedarticle'          => 'afverndaði „[[$1]]“',
 'protect-title'               => 'Vernda „$1“',
+'prot_1movedto2'              => '[[$1]] færð á [[$2]]',
 'protect-legend'              => 'Verndunarstaðfesting',
 'protectcomment'              => '�stæða',
 'protectexpiry'               => 'Rennur út:',
 'protect_expiry_invalid'      => 'Ógildur tími.',
 'protect_expiry_old'          => 'Tíminn er þegar runninn út.',
 'protect-unchain'             => 'Opna fyrir færslur',
-'protect-text'                => 'Hér getur þú skoðað og breytt verndunarstigi síðunnar <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Þú hefur ekki heimild til þess að vernda eða afvernda síður.
-Núverandi staða síðunnar er <strong>$1</strong>:',
+'protect-text'                => "Hér getur þú skoðað og breytt verndunarstigi síðunnar '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Þú hefur ekki heimild til þess að vernda eða afvernda síður.
+Núverandi staða síðunnar er '''$1''':",
 'protect-cascadeon'           => 'Þessi síða er vernduð vegna þess að hún er innifalin í eftirfarandi {{PLURAL:$1|síðu, sem er keðjuvernduð|síðum, sem eru keðjuverndaðar}}.
 Þú getur breytt verndunarstigi þessarar síðu, en það mun ekki hafa áhrif á keðjuverndunina.',
 'protect-default'             => '(sjálfgefið)',
 'protect-fallback'            => '„$1“ réttindi nauðsynleg',
-'protect-level-autoconfirmed' => 'Banna óinnskráða notendur',
+'protect-level-autoconfirmed' => 'Banna nýja og óinnskráða notendur',
 'protect-level-sysop'         => 'Leyfa aðeins stjórnendur',
 'protect-summary-cascade'     => 'keðjuvörn',
 'protect-expiring'            => 'rennur út $1 (UTC)',
+'protect-expiry-indefinite'   => 'ótiltekinn',
 'protect-cascade'             => 'Vernda innifaldar síður í þessari síðu (keðjuvörn)',
 'protect-cantedit'            => 'Þú getur ekki breytt verndunarstigi þessarar síðu, vegna þess að þú hefur ekki réttindin til að breyta því.',
+'protect-othertime'           => 'Annar tími:',
+'protect-othertime-op'        => 'annar tími',
+'protect-expiry-options'      => '2 tíma:2 hours,1 dag:1 day,3 daga:3 days,1 viku:1 week,2 vikur:2 weeks,1 mánuð:1 month,3 mánuði:3 months,6 mánuði:6 months,1 ár:1 year,aldrei:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Réttindi:',
 'restriction-level'           => 'Takmarkaði við:',
 'minimum-size'                => 'Lágmarksstærð',
@@ -1602,7 +1734,8 @@ Núverandi staða síðunnar er <strong>$1</strong>:',
 'undeletepage'              => 'Skoða og endurvekja eyddar síður',
 'undeletepagetitle'         => "'''Eftirfarandi er samansafn af eyddum breytingum á [[:$1|$1]]'''.",
 'viewdeletedpage'           => 'Skoða eyddar síður',
-'undeletepagetext'          => 'Eftirfarandi síðum hefur verið eitt en eru þó enn í gagnagrunninum og geta verið endurvaknar. Athugið að síður þessar eru reglulega fjarlægðar endanlega úr gagnagrunninum.',
+'undeletepagetext'          => 'Eftirfarandi {{PLURAL:$1|síðu hefur verið eytt en hún er þó enn í gagnagrunninum og getur verið endurvakin|$1 síðum hefur verið eytt en eru þó enn í gagnagrunninum og geta verið endurvaknar}}.
+Gagnagrunnurinn kann að vera tæmdur reglulega.',
 'undeleterevisions'         => '$1 {{PLURAL:$1|breyting|breytingar}}',
 'undeletehistorynoadmin'    => 'Þessari síðu hefur verið eytt. �stæðan sést í ágripinu fyrir neðan, ásamt upplýsingum um hvaða notendur breyttu síðunni fyrir eyðingu.
 Innihald greinarinnar er einungis aðgengilegt möppudýrum.',
@@ -1631,13 +1764,14 @@ Skoðaðu [[Special:Log/delete|eyðingaskrána]] til að skoða eyðingar og end
 'blanknamespace' => '(Aðalnafnrýmið)',
 
 # Contributions
-'contributions' => 'Framlög notanda',
-'mycontris'     => 'Framlög',
-'contribsub2'   => 'Eftir $1 ($2)',
-'nocontribs'    => 'Engar breytingar fundnar sem passa við þessa viðmiðun.',
-'uctop'         => '(nýjast)',
-'month'         => 'Frá mánuðinum (og fyrr):',
-'year'          => 'Frá árinu (og fyrr):',
+'contributions'       => 'Framlög notanda',
+'contributions-title' => 'Framlög notanda $1',
+'mycontris'           => 'Framlög',
+'contribsub2'         => 'Eftir $1 ($2)',
+'nocontribs'          => 'Engar breytingar fundnar sem passa við þessa viðmiðun.',
+'uctop'               => '(nýjast)',
+'month'               => 'Frá mánuðinum (og fyrr):',
+'year'                => 'Frá árinu (og fyrr):',
 
 'sp-contributions-newbies'     => 'Sýna aðeins breytingar frá nýjum notendum',
 'sp-contributions-newbies-sub' => 'Fyrir nýliða',
@@ -1650,7 +1784,6 @@ Skoðaðu [[Special:Log/delete|eyðingaskrána]] til að skoða eyðingar og end
 'whatlinkshere'            => 'Hvað tengist hingað',
 'whatlinkshere-title'      => 'Síður sem tengjast „$1“',
 'whatlinkshere-page'       => 'Síða:',
-'linklistsub'              => '(Listi yfir tengla)',
 'linkshere'                => "Eftirfarandi síður tengjast á '''[[:$1]]''':",
 'nolinkshere'              => "Engar síður tengjast á '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Engar síður tengjast '''[[:$1]]''' í þessu nafnrými.",
@@ -1705,6 +1838,7 @@ Sjá [[Special:IPBlockList|bannaðar notendur og vistföng]] fyrir yfirlit yfir
 'ipb-unblock'                 => 'Afbanna notanda eða vistfang',
 'ipb-blocklist-addr'          => 'Núverandi bönn fyrir $1',
 'ipb-blocklist'               => 'Sjá núverandi bönn',
+'ipb-blocklist-contribs'      => 'Framlög fyrir $1',
 'unblockip'                   => 'Afbanna notanda',
 'unblockiptext'               => 'Endurvekja skrifréttindi bannaðra notenda eða vistfanga.',
 'ipusubmit'                   => 'Afbanna',
@@ -1721,10 +1855,12 @@ Sjá [[Special:IPBlockList|bannaðar notendur og vistföng]] fyrir yfirlit yfir
 'noautoblockblock'            => 'sjálfbönnun óvirk',
 'createaccountblock'          => 'bann við stofnun nýrra aðganga',
 'emailblock'                  => 'tölvupóstur bannaður',
+'blocklist-nousertalk'        => 'getur ekki breytt eigin spjallsíðu',
 'ipblocklist-empty'           => 'Bannlistinn er tómur.',
 'ipblocklist-no-results'      => 'Umbeðið vistfang eða notandanafn er ekki í banni.',
 'blocklink'                   => 'banna',
 'unblocklink'                 => 'afbanna',
+'change-blocklink'            => 'breyta bönnun',
 'contribslink'                => 'framlög',
 'autoblocker'                 => 'Vistfang þitt er bannað vegna þess að það hefur nýlega verið notað af „[[User:$1|$1]]“.
 �stæðan fyrir því að $1 var bannaður er: „$2“',
@@ -1745,6 +1881,7 @@ Sjá [[Special:IPBlockList|ítarlegri lista]] fyrir öll núgildandi bönn.',
 'blockme'                     => 'Banna mig',
 'proxyblocker-disabled'       => 'Þessi virkni er óvirk.',
 'proxyblocksuccess'           => 'Búinn.',
+'cant-block-while-blocked'    => 'Þú getur ekki bannað aðra notendur á meðan þú ert í banni.',
 
 # Developer tools
 'lockdb'              => 'Læsa gagnagrunninum',
@@ -1762,57 +1899,66 @@ Mundu að [[Special:UnlockDB|opna hann aftur]] þegar þú hefur lokið viðgerÃ
 'databasenotlocked'   => 'Gagnagrunnurinn er ekki læstur.',
 
 # Move page
-'move-page'               => 'Færa $1',
-'move-page-legend'        => 'Færa síðu',
-'movepagetext'            => "Hér er hægt að endurnefna síðu. Hún færist, ásamt breytingaskránni, yfir á nýtt heiti og eldra heitið myndar tilvísun á það. Þú getur sjálfkrafa uppfært tilvísanir á nýja heitið. Ef þú vilt það síður, athugaðu þá hvort nokkuð myndist [[Special:DoubleRedirects|tvöfaldar]] eða [[Special:BrokenRedirects|brotnar tilvísanir]].
+'move-page'                 => 'Færa $1',
+'move-page-legend'          => 'Færa síðu',
+'movepagetext'              => "Hér er hægt að endurnefna síðu. Hún færist, ásamt breytingaskránni, yfir á nýtt heiti og eldra heitið myndar tilvísun á það. Þú getur sjálfkrafa uppfært tilvísanir á nýja heitið. Ef þú vilt það síður, athugaðu þá hvort nokkuð myndist [[Special:DoubleRedirects|tvöfaldar]] eða [[Special:BrokenRedirects|brotnar tilvísanir]].
 Þú berð ábyrgð á því að tenglar vísi á rétta staði.
 
 Athugaðu að síðan mun '''ekki''' færast ef þegar er síða á nafninu sem þú hyggst færa hana á, nema sú síða sé tóm eða tilvísun sem vísar á síðuna sem þú ætlar að færa. Þú getur þar með fært síðuna aftur til baka án þess að missa breytingarsöguna, en ekki fært hana yfir venjulega síðu.
 
 '''Varúð:'''
 Athugaðu að þessi aðgerð getur kallað fram viðbrögð annarra notenda og getur þýtt mjög rótækar breytingar á vinsælum síðum.",
-'movepagetalktext'        => 'Spallsíða síðunnar verður sjálfkrafa færð með ef hún er til nema:
+'movepagetalktext'          => 'Spallsíða síðunnar verður sjálfkrafa færð með ef hún er til nema:
 * Þú sért að færa síðuna á milli nafnrýma
 * Spallsíða sé þegar til undir nýja nafninu
 * Þú veljir að færa hana ekki
 � þeim tilfellum verður að færa hana handvirkt.',
-'movearticle'             => 'Færa síðu:',
-'movenotallowed'          => 'Þú hefur ekki leyfi til að færa síður.',
-'newtitle'                => '� nýja titilinn:',
-'move-watch'              => 'Vakta þessa síðu',
-'movepagebtn'             => 'Færa síðu',
-'pagemovedsub'            => 'Færsla tókst',
-'movepage-moved'          => "<big>'''„$1“ hefur verið færð á „$2“'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Annaðhvort er þegar til síða undir þessum titli, eða sá titill sem þú hefur valið er ekki gildur.
+'movearticle'               => 'Færa síðu:',
+'movenologin'               => 'Óinnskráð(ur)',
+'movenologintext'           => 'Þú verður að vera [[Special:UserLogin|innskráð(ur)]] til að geta fært síður.',
+'movenotallowed'            => 'Þú hefur ekki leyfi til að færa síður.',
+'cant-move-user-page'       => 'Þú hefur ekki leyfi til að færa notandasíðu (fyrir utan undirsíður).',
+'cant-move-to-user-page'    => 'Þú hefur ekki leyfi til að færa síðu á notandasíðu (að frátöldum undirsíðum notanda).',
+'newtitle'                  => '� nýja titilinn:',
+'move-watch'                => 'Vakta þessa síðu',
+'movepagebtn'               => 'Færa síðu',
+'pagemovedsub'              => 'Færsla tókst',
+'movepage-moved'            => "<big>'''„$1“ hefur verið færð á „$2“'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'Annaðhvort er þegar til síða undir þessum titli, eða sá titill sem þú hefur valið er ekki gildur.
 Vinsamlegast veldu annan titil.',
-'cantmove-titleprotected' => 'Þú getur ekki fært síðu á þessa staðsetningu, því nýi titillinn hefur verið verndaður gegn sköpun',
-'talkexists'              => "'''Færsla á síðunni sjálfri heppnaðist, en ekki var hægt að færa spjallsíðuna því hún er nú þegar til á nýja titlinum.
+'cantmove-titleprotected'   => 'Þú getur ekki fært síðu á þessa staðsetningu, því nýi titillinn hefur verið verndaður gegn sköpun',
+'talkexists'                => "'''Færsla á síðunni sjálfri heppnaðist, en ekki var hægt að færa spjallsíðuna því hún er nú þegar til á nýja titlinum.
 Gjörðu svo vel og færðu hana handvirkt.'''",
-'movedto'                 => 'fært á',
-'movetalk'                => 'Færa meðfylgjandi spjallsíðu',
-'move-subpages'           => 'Færa allar undirsíður ef það er hægt',
-'move-talk-subpages'      => 'Færa allar undirsíður spjallsíðunnar ef það er hægt',
-'movepage-page-exists'    => 'Síðan $1 er nú þegar til og er ekki hægt að yfirskrifa sjálfkrafa.',
-'movepage-page-moved'     => 'Síðan $1 hefur verið færð á $2.',
-'movepage-page-unmoved'   => 'Ekki var hægt að færa síðuna $1 á $2.',
-'movepage-max-pages'      => 'Hámarkinu, $1 {{PLURAL:$1|síða|síður}}, hefur verið náð og verða engar fleiri færðar sjálfvirkt.',
-'1movedto2'               => '[[$1]] færð á [[$2]]',
-'1movedto2_redir'         => '[[$1]] færð á [[$2]] yfir tilvísun',
-'movelogpage'             => 'Flutningaskrá',
-'movelogpagetext'         => 'Þetta er listi yfir síður sem nýlega hafa verið færðar.',
-'movereason'              => '�stæða:',
-'revertmove'              => 'taka til baka',
-'delete_and_move'         => 'Eyða og flytja',
-'delete_and_move_text'    => '==Beiðni um eyðingu==
+'movedto'                   => 'fært á',
+'movetalk'                  => 'Færa meðfylgjandi spjallsíðu',
+'move-subpages'             => 'Færa allar undirsíður ef það er hægt',
+'move-talk-subpages'        => 'Færa allar undirsíður spjallsíðunnar ef það er hægt',
+'movepage-page-exists'      => 'Síðan $1 er nú þegar til og er ekki hægt að yfirskrifa sjálfkrafa.',
+'movepage-page-moved'       => 'Síðan $1 hefur verið færð á $2.',
+'movepage-page-unmoved'     => 'Ekki var hægt að færa síðuna $1 á $2.',
+'movepage-max-pages'        => 'Hámarkinu, $1 {{PLURAL:$1|síða|síður}}, hefur verið náð og verða engar fleiri færðar sjálfvirkt.',
+'1movedto2'                 => '[[$1]] færð á [[$2]]',
+'1movedto2_redir'           => '[[$1]] færð á [[$2]] yfir tilvísun',
+'movelogpage'               => 'Flutningaskrá',
+'movelogpagetext'           => 'Þetta er listi yfir síður sem nýlega hafa verið færðar.',
+'movereason'                => '�stæða:',
+'revertmove'                => 'taka til baka',
+'delete_and_move'           => 'Eyða og flytja',
+'delete_and_move_text'      => '==Beiðni um eyðingu==
 
 Síðan „[[:$1]]“ er þegar til. Viltu eyða henni til þess að rýma til fyrir flutningi?',
-'delete_and_move_confirm' => 'Já, eyða síðunni',
-'delete_and_move_reason'  => 'Eytt til að rýma til fyrir flutning',
-'selfmove'                => 'Nýja nafnið er það sama og gamla, þú verður að velja annað nafn.',
-'imagenocrossnamespace'   => 'Get ekki fært skrá í skrálaust nafnrými',
-'imagetypemismatch'       => 'Nýi nafnaukinn passar ekki við tegund hennar',
-'imageinvalidfilename'    => 'Markskráarnafnið er ógilt',
-'fix-double-redirects'    => 'Uppfæra tilvísanir sem vísa á upphaflegan titil',
+'delete_and_move_confirm'   => 'Já, eyða síðunni',
+'delete_and_move_reason'    => 'Eytt til að rýma til fyrir flutning',
+'selfmove'                  => 'Nýja nafnið er það sama og gamla, þú verður að velja annað nafn.',
+'immobile-source-namespace' => 'Get ekki fært síður í nafnrýminu „$1“',
+'immobile-target-namespace' => 'Get ekki fært síður inn í nafnrýmið „$1“',
+'immobile-source-page'      => 'Þessi síða er ekki færanleg.',
+'immobile-target-page'      => 'Get ekki fært á áætlaðan titil.',
+'imagenocrossnamespace'     => 'Get ekki fært skrá í skrálaust nafnrými',
+'imagetypemismatch'         => 'Nýi nafnaukinn passar ekki við tegund hennar',
+'imageinvalidfilename'      => 'Markskráarnafnið er ógilt',
+'fix-double-redirects'      => 'Uppfæra tilvísanir sem vísa á upphaflegan titil',
+'move-leave-redirect'       => 'Skilja tilvísun eftir',
 
 # Export
 'export'            => 'Flytja út síður',
@@ -1830,7 +1976,7 @@ Síðan „[[:$1]]“ er þegar til. Viltu eyða henni til þess að rýma til f
 'allmessagesdefault'        => 'Sjálfgefinn texti',
 'allmessagescurrent'        => 'Núverandi texti',
 'allmessagestext'           => 'Þetta er listi yfir kerfismeldingar í Melding-nafnrýminu.
-Gjörðu svo vel og heimsæktu [http://www.mediawiki.org/wiki/Localisation MediaWiki-staðfæringuna] og [http://translatewiki.net Betawiki] ef þú vilt taka þátt í almennri MediaWiki-staðfæringu.',
+Gjörðu svo vel og heimsæktu [http://www.mediawiki.org/wiki/Localisation MediaWiki-staðfæringuna] og [http://translatewiki.net translatewiki.net] ef þú vilt taka þátt í almennri MediaWiki-staðfæringu.',
 'allmessagesnotsupportedDB' => "Það er ekki hægt að nota '''{{ns:special}}:Allmessages''' því '''\$wgUseDatabaseMessages''' hefur verið gerð óvirk.",
 'allmessagesmodified'       => 'Sýna aðeins breyttar',
 
@@ -1848,6 +1994,8 @@ Allir innflutningar eru skráð í [[Special:Log/import|innflutningsskránna]].'
 'import-interwiki-history'   => 'Afrita allar breytingar þessarar síðu',
 'import-interwiki-submit'    => 'Flytja inn',
 'import-interwiki-namespace' => '�kvörðunarnafnrými:',
+'import-upload-filename'     => 'Skráarnafn:',
+'import-comment'             => 'Athugasemdir:',
 'importstart'                => 'Flyt inn síður...',
 'import-revision-count'      => '$1 {{PLURAL:$1|breyting|breytingar}}',
 'importnopages'              => 'Engar síður til innflutnings.',
@@ -1867,9 +2015,9 @@ Allir innflutningar eru skráð í [[Special:Log/import|innflutningsskránna]].'
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|breyting|breytingar}} frá $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Notandasíðan mín',
+'tooltip-pt-userpage'             => 'Notandasíðan þín',
 'tooltip-pt-anonuserpage'         => 'Notandasíðan fyrir vistfangið þitt',
-'tooltip-pt-mytalk'               => 'Spallsíðan mín',
+'tooltip-pt-mytalk'               => 'Spjallsíðan þín',
 'tooltip-pt-anontalk'             => 'Spjallsíðan fyrir þetta vistfang',
 'tooltip-pt-preferences'          => 'Almennar stillingar',
 'tooltip-pt-watchlist'            => 'Listi yfir síður sem þú fylgist með breytingum á',
@@ -1935,12 +2083,12 @@ Allir innflutningar eru skráð í [[Special:Log/import|innflutningsskránna]].'
 'common.js' => '/* Allt JavaScript sem sett er hér mun virka í hvert skipti sem að síða hleðst. */',
 
 # Attribution
-'anonymous'        => 'Ónefndir notendur {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Óþekktur notandi|Óþekktir notendur}} á {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} notandi $1',
 'lastmodifiedatby' => 'Þessari síðu var síðast breytt $2, $1 af $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Byggt á verkum $1.',
 'others'           => 'aðrir',
-'siteusers'        => '{{SITENAME}} notandi/notendur $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|notandi|notendur}} $1',
 
 # Info page
 'infosubtitle'   => 'Upplýsingar um síðu',
@@ -1950,6 +2098,16 @@ Allir innflutningar eru skráð í [[Special:Log/import|innflutningsskránna]].'
 'numauthors'     => 'Fjöldi frábrugðinna höfunda (grein): $1',
 'numtalkauthors' => 'Fjöldi frábrugðinna höfunda (spjall síða): $1',
 
+# Skin names
+'skinname-standard'    => 'Sígilt',
+'skinname-nostalgia'   => 'Gamaldags',
+'skinname-cologneblue' => 'Kölnarblátt',
+'skinname-monobook'    => 'EinBók',
+'skinname-myskin'      => 'Mitt þema',
+'skinname-chick'       => 'Gella',
+'skinname-simple'      => 'Einfalt',
+'skinname-modern'      => 'Nútímalegt',
+
 # Math options
 'mw_math_png'    => 'Alltaf birta PNG mynd',
 'mw_math_simple' => 'HTML fyrir einfaldar jöfnur annars PNG',
@@ -1985,6 +2143,9 @@ Allir innflutningar eru skráð í [[Special:Log/import|innflutningsskránna]].'
 'previousdiff' => '� Eldri breyting',
 'nextdiff'     => 'Nýrri breyting →',
 
+# Visual comparison
+'visual-comparison' => 'Sjónrænn samanburður',
+
 # Media information
 'mediawarning'         => "'''A�VÖRUN''': Þessi skrá kann að hafa meinfýsinn kóða, ef keyrður kann hann að stofna kerfinu þínu í hættu.<hr />",
 'imagemaxsize'         => 'Takmarka myndir á skráarlýsingasíðum við:',
@@ -1997,10 +2158,12 @@ Allir innflutningar eru skráð í [[Special:Log/import|innflutningsskránna]].'
 'show-big-image'       => 'Mesta upplausn',
 'show-big-image-thumb' => '<small>Myndin er í upplausninni $1 × $2 </small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Myndasafn nýlegra skráa',
 'imagelisttext'         => 'Hér fyrir neðan er {{PLURAL:$1|einni skrá|$1 skrám}} raðað $2.',
 'newimages-summary'     => 'Þessi kerfissíða sýnir nýlega innhlaðnar skrár.',
+'newimages-legend'      => 'Sía',
+'newimages-label'       => 'Skráarnafn (eða hluti þess):',
 'showhidebots'          => '($1 vélmenni)',
 'noimages'              => 'Ekkert að sjá.',
 'ilsubmit'              => 'Leita',
@@ -2144,21 +2307,9 @@ $1
 Vinsamlegast staðfestu að þú viljir endurvekja hana.",
 'recreate'            => 'Endurvekja',
 
-# HTML dump
-'redirectingto' => 'Tilvísun á [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Hreinsa skyndiminni þessarar síðu?
-
-$1',
 'confirm_purge_button' => '� lagi',
-
-# AJAX search
-'searchcontaining' => "Leita að greinum sem innihalda ''$1''.",
-'searchnamed'      => "Leita að greinum sem heita ''$1''.",
-'articletitles'    => "Greinar sem hefjast á ''$1''",
-'hideresults'      => 'Fela niðurstöður',
-'useajaxsearch'    => 'Nota AJAX-leit',
+'confirm-purge-top'    => 'Hreinsa skyndiminni þessarar síðu?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� fyrri síða',
diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index 4753e2de..11cb1696 100644
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -7,6 +7,7 @@
  * @author .anaconda
  * @author Broc
  * @author BrokenArrow
+ * @author Brownout
  * @author Candalua
  * @author Cruccone
  * @author Cryptex
@@ -30,14 +31,12 @@
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Speciale',
-	NS_MAIN             => '',
 	NS_TALK             => 'Discussione',
 	NS_USER             => 'Utente',
 	NS_USER_TALK        => 'Discussioni_utente',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Discussioni_$1',
-	NS_IMAGE            => 'Immagine',
-	NS_IMAGE_TALK       => 'Discussioni_immagine',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussioni_file',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussioni_MediaWiki',
 	NS_TEMPLATE         => 'Template',
@@ -45,7 +44,12 @@ $namespaceNames = array(
 	NS_HELP             => 'Aiuto',
 	NS_HELP_TALK        => 'Discussioni_aiuto',
 	NS_CATEGORY         => 'Categoria',
-	NS_CATEGORY_TALK    => 'Discussioni_categoria'
+	NS_CATEGORY_TALK    => 'Discussioni_categoria',
+);
+
+$namespaceAliases = array(
+	'Immagine' => NS_FILE,
+	'Discussioni_immagine' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
@@ -70,39 +74,48 @@ $specialPageAliases = array(
 	'Disambiguations'           => array( 'Disambigue' ),
 	'Userlogin'                 => array( 'Entra', 'Login' ),
 	'Userlogout'                => array( 'Esci', 'Logout' ),
+	'CreateAccount'             => array( 'CreaAccount' ),
 	'Preferences'               => array( 'Preferenze' ),
 	'Watchlist'                 => array( 'OsservatiSpeciali' ),
 	'Recentchanges'             => array( 'UltimeModifiche' ),
 	'Upload'                    => array( 'Carica' ),
-	'Imagelist'                 => array( 'Immagini' ),
+	'Listfiles'                 => array( 'Immagini' ),
 	'Newimages'                 => array( 'ImmaginiRecenti' ),
 	'Listusers'                 => array( 'Utenti', 'ElencoUtenti' ),
+	'Listgrouprights'           => array( 'ElencoPermessiGruppi' ),
 	'Statistics'                => array( 'Statistiche' ),
 	'Randompage'                => array( 'PaginaCasuale' ),
 	'Lonelypages'               => array( 'PagineOrfane' ),
 	'Uncategorizedpages'        => array( 'PagineSenzaCategorie' ),
 	'Uncategorizedcategories'   => array( 'CategorieSenzaCategorie' ),
 	'Uncategorizedimages'       => array( 'ImmaginiSenzaCategorie' ),
+	'Uncategorizedtemplates'    => array( 'TemplateSenzaCategorie' ),
 	'Unusedcategories'          => array( 'CategorieNonUsate' ),
 	'Unusedimages'              => array( 'ImmaginiNonUsate' ),
 	'Wantedpages'               => array( 'PagineRichieste' ),
 	'Wantedcategories'          => array( 'CategorieRichieste' ),
+	'Wantedfiles'               => array( 'FileRichiesti' ),
 	'Mostlinked'                => array( 'PaginePiùRichiamate' ),
 	'Mostlinkedcategories'      => array( 'CategoriePiùRichiamate' ),
-	'Mostcategories'            => array( 'PagineConPiùCategorie'),
+	'Mostlinkedtemplates'       => array( 'TemplatePiùRichiamati' ),
+	'Mostcategories'            => array( 'PagineConPiùCategorie' ),
 	'Mostimages'                => array( 'ImmaginiPiùRichiamate' ),
 	'Mostrevisions'             => array( 'PagineConPiùRevisioni' ),
+	'Fewestrevisions'           => array( 'PagineConMenoRevisioni' ),
 	'Shortpages'                => array( 'PaginePiùCorte' ),
 	'Longpages'                 => array( 'PaginePiùLunghe' ),
 	'Newpages'                  => array( 'PaginePiùRecenti' ),
 	'Ancientpages'              => array( 'PagineMenoRecenti' ),
 	'Deadendpages'              => array( 'PagineSenzaUscita' ),
+	'Protectedpages'            => array( 'PagineProtette' ),
+	'Protectedtitles'           => array( 'TitoliProtetti' ),
 	'Allpages'                  => array( 'TutteLePagine' ),
-	'Prefixindex'               => array( 'Prefissi' ) ,
+	'Prefixindex'               => array( 'Prefissi' ),
 	'Ipblocklist'               => array( 'IPBloccati' ),
 	'Specialpages'              => array( 'PagineSpeciali' ),
 	'Contributions'             => array( 'Contributi', 'ContributiUtente' ),
 	'Emailuser'                 => array( 'InviaEMail' ),
+	'Confirmemail'              => array( 'ConfermaEMail' ),
 	'Whatlinkshere'             => array( 'PuntanoQui' ),
 	'Recentchangeslinked'       => array( 'ModificheCorrelate' ),
 	'Movepage'                  => array( 'Sposta', 'Rinomina' ),
@@ -120,9 +133,9 @@ $specialPageAliases = array(
 	'Unlockdb'                  => array( 'SbloccaDB' ),
 	'Userrights'                => array( 'PermessiUtente' ),
 	'MIMEsearch'                => array( 'RicercaMIME' ),
+	'FileDuplicateSearch'       => array( 'CercaFileDuplicati' ),
 	'Unwatchedpages'            => array( 'PagineNonOsservate' ),
 	'Listredirects'             => array( 'Redirect' ),
-	'Listinterwikis'            => array( 'Interwiki' ),
 	'Revisiondelete'            => array( 'CancellaRevisione' ),
 	'Unusedtemplates'           => array( 'TemplateNonUsati' ),
 	'Randomredirect'            => array( 'RedirectCasuale' ),
@@ -130,9 +143,17 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MieDiscussioni' ),
 	'Mycontributions'           => array( 'MieiContributi' ),
 	'Listadmins'                => array( 'Amministratori' ),
+	'Listbots'                  => array( 'Bot' ),
 	'Popularpages'              => array( 'PaginePiùVisitate' ),
 	'Search'                    => array( 'Ricerca', 'Cerca' ),
 	'Resetpass'                 => array( 'ReimpostaPassword' ),
+	'Withoutinterwiki'          => array( 'PagineSenzaInterwiki' ),
+	'MergeHistory'              => array( 'UnificaCronologia' ),
+	'Filepath'                  => array( 'Percorso' ),
+	'Invalidateemail'           => array( 'InvalidaEMail' ),
+	'Blankpage'                 => array( 'PaginaVuota' ),
+	'LinkSearch'                => array( 'CercaCollegamenti' ),
+	'DeletedContributions'      => array( 'ContributiCancellati' ),
 );
 
 $linkTrail = '/^([a-zàéèíîìóòúù]+)(.*)$/sDu';
@@ -167,25 +188,27 @@ $messages = array(
 'tog-enotifrevealaddr'        => 'Rivela il mio indirizzo e-mail nei messaggi di avviso',
 'tog-shownumberswatching'     => 'Mostra il numero di utenti che hanno la pagina in osservazione',
 'tog-fancysig'                => 'Non modificare il markup della firma (usare per firme non standard)',
-'tog-externaleditor'          => 'Usa per default un editor di testi esterno (solo per utenti esperti, ha bisogno di impostazioni speciali sul tuo computer)',
-'tog-externaldiff'            => 'Usa per default un programma di diff esterno (solo per utenti esperti, ha bisogno di impostazioni speciali sul tuo computer)',
+'tog-externaleditor'          => "Usa per default un editor di testi esterno (solo per utenti esperti, richiede l'uso di impostazioni particolari sul proprio computer)",
+'tog-externaldiff'            => "Usa per default un programma di diff esterno (solo per utenti esperti, richiede l'uso di impostazioni particolari sul proprio computer)",
 'tog-showjumplinks'           => 'Attiva i collegamenti accessibili "vai a"',
 'tog-uselivepreview'          => "Attiva la funzione ''Live preview'' (richiede JavaScript; sperimentale)",
 'tog-forceeditsummary'        => "Chiedi conferma se l'oggetto della modifica è vuoto",
 'tog-watchlisthideown'        => 'Nascondi le mie modifiche negli osservati speciali',
 'tog-watchlisthidebots'       => 'Nascondi le modifiche dei bot negli osservati speciali',
 'tog-watchlisthideminor'      => 'Nascondi le modifiche minori negli osservati speciali',
+'tog-watchlisthideliu'        => 'Nascondi le modifiche degli utenti registrati negli osservati speciali',
+'tog-watchlisthideanons'      => 'Nascondi le modifiche degli utenti anonimi negli osservati speciali',
 'tog-nolangconversion'        => 'Disattiva la conversione tra varianti linguistiche',
 'tog-ccmeonemails'            => 'Inviami una copia dei messaggi spediti agli altri utenti',
 'tog-diffonly'                => 'Non visualizzare il contenuto della pagina dopo il confronto tra versioni',
 'tog-showhiddencats'          => 'Mostra categorie nascoste',
+'tog-noconvertlink'           => 'Disattiva la conversione dei titoli dei link',
+'tog-norollbackdiff'          => 'Non mostrare il diff dopo aver effettuato un rollback',
 
 'underline-always'  => 'Sempre',
 'underline-never'   => 'Mai',
 'underline-default' => 'Mantieni le impostazioni del browser',
 
-'skinpreview' => '(anteprima)',
-
 # Dates
 'sunday'        => 'domenica',
 'monday'        => 'lunedì',
@@ -280,7 +303,7 @@ I seguenti collegamenti sono in lingua inglese:
 'mytalk'         => 'mie discussioni',
 'anontalk'       => 'Discussioni per questo IP',
 'navigation'     => 'Navigazione',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadati:',
@@ -317,7 +340,7 @@ I seguenti collegamenti sono in lingua inglese:
 'talkpagelinktext'  => 'discussione',
 'specialpage'       => 'Pagina speciale',
 'personaltools'     => 'Strumenti personali',
-'postcomment'       => 'Aggiungi un commento',
+'postcomment'       => 'Nuova sezione',
 'articlepage'       => 'Vedi la voce',
 'talk'              => 'Discussione',
 'views'             => 'Visite',
@@ -343,8 +366,6 @@ I seguenti collegamenti sono in lingua inglese:
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Informazioni su {{SITENAME}}',
 'aboutpage'            => 'Project:Informazioni',
-'bugreports'           => 'Malfunzionamenti',
-'bugreportspage'       => 'Project:Malfunzionamenti',
 'copyright'            => "Contenuti soggetti a licenza d'uso $1.",
 'copyrightpagename'    => 'Il copyright su {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -367,9 +388,7 @@ I seguenti collegamenti sono in lingua inglese:
 
 'badaccess'        => 'Permessi non sufficienti',
 'badaccess-group0' => "Non si dispone dei permessi necessari per eseguire l'azione richiesta.",
-'badaccess-group1' => 'La funzione richiesta è riservata agli utenti che appartengono al gruppo $1.',
-'badaccess-group2' => 'La funzione richiesta è riservata agli utenti che appartengono ai gruppi $1.',
-'badaccess-groups' => 'La funzione richiesta è riservata agli utenti che appartengono a uno dei seguenti gruppi: $1.',
+'badaccess-groups' => 'La funzione richiesta è riservata agli utenti che appartengono {{PLURAL:$2|al gruppo|a uno dei seguenti gruppi}}: $1.',
 
 'versionrequired'     => 'Versione $1 di MediaWiki richiesta',
 'versionrequiredtext' => "Per usare questa pagina è necessario disporre della versione $1 del software MediaWiki. Vedi [[Special:Version|l'apposita pagina]].",
@@ -383,6 +402,8 @@ I seguenti collegamenti sono in lingua inglese:
 'editsection'             => 'modifica',
 'editold'                 => 'modifica',
 'viewsourceold'           => 'visualizza sorgente',
+'editlink'                => 'modifica',
+'viewsourcelink'          => 'visualizza sorgente',
 'editsectionhint'         => 'Modifica la sezione $1',
 'toc'                     => 'Indice',
 'showtoc'                 => 'mostra',
@@ -397,13 +418,13 @@ I seguenti collegamenti sono in lingua inglese:
 'site-atom-feed'          => 'Feed Atom di $1',
 'page-rss-feed'           => 'Feed RSS per "$1"',
 'page-atom-feed'          => 'Feed Atom per "$1"',
-'red-link-title'          => '$1 (ancora da scrivere)',
+'red-link-title'          => '$1 (la pagina non esiste)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Voce',
 'nstab-user'      => 'Utente',
 'nstab-media'     => 'File multimediale',
-'nstab-special'   => 'Speciale',
+'nstab-special'   => 'Pagina speciale',
 'nstab-project'   => 'pagina di servizio',
 'nstab-image'     => 'File',
 'nstab-mediawiki' => 'Messaggio',
@@ -413,9 +434,13 @@ I seguenti collegamenti sono in lingua inglese:
 
 # Main script and global functions
 'nosuchaction'      => 'Operazione non riconosciuta',
-'nosuchactiontext'  => 'La URL immessa non corrisponde a un comando riconosciuto dal software MediaWiki',
+'nosuchactiontext'  => "L'azione specificata nella URL non è valida. 
+È possibile che la URL sia stata digitata in modo errato o che sia stato seguito un collegamento non valido. 
+Ciò potrebbe anche indicare un bug in {{SITENAME}}.",
 'nosuchspecialpage' => 'Pagina speciale non disponibile',
-'nospecialpagetext' => "La pagina speciale richiesta non è stata riconosciuta dal software MediaWiki; l'elenco delle pagine speciali valide si trova in [[Special:SpecialPages|Elenco delle pagine speciali]].",
+'nospecialpagetext' => "<big>'''La pagina speciale richiesta non è stata riconosciuta.'''</big>
+
+L'elenco delle pagine speciali valide si trova in [[Special:SpecialPages|Elenco delle pagine speciali]].",
 
 # General errors
 'error'                => 'Errore',
@@ -434,7 +459,7 @@ MySQL ha restituito il seguente errore "$3: $4".',
 'noconnect'            => 'Connessione al database non riuscita a causa di un problema tecnico del sito.<br />$1',
 'nodb'                 => 'Selezione del database $1 non riuscita',
 'cachederror'          => "Quella presentata di seguito è una copia ''cache'' della pagina richiesta; potrebbe quindi non essere aggiornata.",
-'laggedslavemode'      => 'Attenzione: la pagina potrebbe non contenere gli ultimi aggiornamenti.',
+'laggedslavemode'      => 'Attenzione: la pagina potrebbe non riportare gli aggiornamenti più recenti.',
 'readonly'             => 'Database bloccato',
 'enterlockreason'      => 'Indica il motivo del blocco, specificando il momento in cui è presumibile che venga rimosso',
 'readonlytext'         => "In questo momento il database è bloccato e non sono possibili aggiunte o modifiche alle pagine. Il blocco è di solito legato a operazioni di manutenzione ordinaria, al termine delle quali il database è di nuovo accessibile.
@@ -463,7 +488,6 @@ Si prega di segnalare l\'accaduto a un [[Special:ListUsers/sysop|amministratore]
 'cannotdelete'         => 'Impossibile cancellare la pagina o il file richiesto (potrebbe essere stato già cancellato).',
 'badtitle'             => 'Titolo non corretto',
 'badtitletext'         => 'Il titolo della pagina richiesta è vuoto, errato o con caratteri non ammessi oppure deriva da un errore nei collegamenti tra siti wiki diversi o versioni in lingue diverse dello stesso sito.',
-'perfdisabled'         => 'Siamo spiacenti, questa funzionalità è temporaneamente disabilitata perché il suo uso rallenta il database fino a rendere il sito inutilizzabile per tutti gli utenti.',
 'perfcached'           => "I dati che seguono sono estratti da una copia ''cache'' del database, non aggiornati in tempo reale.",
 'perfcachedts'         => "I dati che seguono sono estratti da una copia ''cache'' del database. Ultimo aggiornamento: $1.",
 'querypage-no-updates' => 'Gli aggiornamenti della pagina sono temporaneamente sospesi. I dati in essa contenuti non verranno aggiornati.',
@@ -478,7 +502,7 @@ Query: $2',
 'viewsourcetext'       => 'È possibile visualizzare e copiare il codice sorgente di questa pagina:',
 'protectedinterface'   => "Questa pagina contiene un elemento che fa parte dell'interfaccia utente del software; è quindi protetta per evitare possibili abusi.",
 'editinginterface'     => "'''Attenzione:''' Il testo di questa pagina fa parte dell'interfaccia utente del sito. Tutte le modifiche apportate a questa pagina si riflettono sui messaggi visualizzati per tutti gli utenti.
-Per le traduzioni, considera la possibilità di usare [http://translatewiki.net/wiki/Main_Page?setlang=it Betawiki], il progetto MediaWiki per la localizzazione.",
+Per le traduzioni, considera la possibilità di usare [http://translatewiki.net/wiki/Main_Page?setlang=it translatewiki.net], il progetto MediaWiki per la localizzazione.",
 'sqlhidden'            => '(la query SQL è stata nascosta)',
 'cascadeprotected'     => 'Su questa pagina non è possibile effettuare modifiche perché è stata inclusa {{PLURAL:$1|nella pagina indicata di seguito, che è stata protetta|nelle pagine indicate di seguito, che sono state protette}} selezionando la protezione "ricorsiva":
 $2',
@@ -489,16 +513,16 @@ $2',
 La motivazione è la seguente: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Errore di configurazione: antivirus sconosciuto: <i>$1</i>',
+'virus-badscanner'     => "Errore di configurazione: antivirus sconosciuto: ''$1''",
 'virus-scanfailed'     => 'scansione fallita (codice $1)',
 'virus-unknownscanner' => 'antivirus sconosciuto:',
 
 # Login and logout pages
 'logouttitle'                => 'Logout utente',
-'logouttext'                 => '<strong>Logout effettuato.</strong><br />
-Si può continuare ad usare {{SITENAME}} come utente anonimo oppure eseguire un nuovo accesso, con lo stesso nome utente o un nome diverso.
+'logouttext'                 => "'''Logout effettuato.'''
 
-Alcune pagine potrebbero continuare ad apparire come se il logout non fosse avvenuto finché non viene pulita la cache del proprio browser.',
+Si può continuare ad usare {{SITENAME}} come utente anonimo oppure eseguire un nuovo accesso, con lo stesso nome utente o un nome diverso.
+Alcune pagine potrebbero continuare ad apparire come se il logout non fosse avvenuto finché non viene pulita la cache del proprio browser.",
 'welcomecreation'            => "== Benvenuto, $1! ==
 
 L'account è stato creato correttamente. Non dimenticare di personalizzare le preferenze di {{SITENAME}}.",
@@ -509,7 +533,6 @@ L'account è stato creato correttamente. Non dimenticare di personalizzare le pr
 'remembermypassword'         => 'Ricorda la password su questo computer',
 'yourdomainname'             => 'Specificare il dominio',
 'externaldberror'            => 'Si è verificato un errore con il server di autenticazione esterno, oppure non si dispone delle autorizzazioni necessarie per aggiornare il proprio accesso esterno.',
-'loginproblem'               => "<b>Si è verificato un errore durante l'accesso.</b><br />Riprovare.",
 'login'                      => 'Entra',
 'nav-login-createaccount'    => 'Entra / Registrati',
 'loginprompt'                => 'Per accedere a {{SITENAME}} è necessario abilitare i cookie.',
@@ -524,7 +547,8 @@ L'account è stato creato correttamente. Non dimenticare di personalizzare le pr
 'gotaccountlink'             => 'Entra',
 'createaccountmail'          => 'via e-mail',
 'badretype'                  => 'Le password inserite non coincidono tra loro.',
-'userexists'                 => 'Il nome utente inserito è già utilizzato. Si scelga un nome utente diverso.',
+'userexists'                 => 'Il nome utente inserito è già utilizzato. 
+Scegliere un nome utente diverso.',
 'youremail'                  => 'Indirizzo e-mail:',
 'username'                   => 'Nome utente:',
 'uid'                        => 'ID utente:',
@@ -542,16 +566,16 @@ L'account è stato creato correttamente. Non dimenticare di personalizzare le pr
 'prefs-help-email-required'  => 'Indirizzo e-mail necessario.',
 'nocookiesnew'               => "La registrazione è stata completata, ma non è stato possibile accedere a {{SITENAME}} perché i cookie sono disattivati. Riprovare l'accesso con il nome utente e la password appena creati dopo aver attivato i cookie nel proprio browser.",
 'nocookieslogin'             => "L'accesso a {{SITENAME}} richiede l'uso dei cookie, che risultano disattivati. Riprovare l'accesso dopo aver attivato i cookie nel proprio browser.",
-'noname'                     => 'Il nome utente indicato non è valido, non è possibile creare un accesso a questo nome.',
+'noname'                     => 'Il nome utente indicato non è valido.',
 'loginsuccesstitle'          => 'Accesso effettuato',
 'loginsuccess'               => "'''Sei stato connesso al server di {{SITENAME}} con il nome utente di \"\$1\".'''",
-'nosuchuser'                 => 'Non è registrato alcun utente di nome "$1". Verificare il nome inserito o [[Special:UserLogin/signup|creare un nuovo accesso]].',
+'nosuchuser'                 => 'Non è registrato alcun utente di nome "$1". I nomi utente sono sensibili alle maiuscole. Verificare il nome inserito o [[Special:UserLogin/signup|creare un nuovo accesso]].',
 'nosuchusershort'            => 'Non è registrato alcun utente di nome "<nowiki>$1</nowiki>". Verificare il nome inserito.',
 'nouserspecified'            => 'È necessario specificare un nome utente.',
 'wrongpassword'              => 'La password inserita non è corretta. Riprovare.',
 'wrongpasswordempty'         => 'Non è stata inserita alcuna password. Riprovare.',
 'passwordtooshort'           => 'La password inserita non è valida o è troppo breve. 
-Deve contenere almeno {{PLURAL:$1|1 carattere|$1 caratteri}} ed essere diversa dal tuo nome utente.',
+Deve contenere almeno {{PLURAL:$1|1 carattere|$1 caratteri}} ed essere diversa dal nome utente.',
 'mailmypassword'             => 'Invia una nuova password al mio indirizzo e-mail',
 'passwordremindertitle'      => 'Servizio Password Reminder di {{SITENAME}}',
 'passwordremindertext'       => 'Qualcuno (probabilmente tu, con indirizzo IP $1) ha richiesto l\'invio di una nuova password di accesso a {{SITENAME}} ($4).
@@ -568,8 +592,8 @@ Per abilitare l'invio di messaggi e-mail per questo accesso è necessario seguir
 'throttled-mailpassword'     => 'Una nuova password è già stata inviata da meno di {{PLURAL:$1|1 ora|$1 ore}}.
 Per prevenire abusi, la funzione "Invia nuova password" può essere usata solo una volta ogni {{PLURAL:$1|ora|$1 ore}}.',
 'mailerror'                  => "Errore nell'invio del messaggio: $1",
-'acct_creation_throttle_hit' => 'Spiacente, hai già creato $1 account. Non puoi crearne altri.',
-'emailauthenticated'         => "L'indirizzo e-mail è stato confermato il $1.",
+'acct_creation_throttle_hit' => "I visitatori del sito che utilizzano questo indirizzo IP hanno creato {{PLURAL:$1|1 account|$1 account}} nell'ultimo giorno, che è il massimo consentito in questo periodo di tempo. Perciò, gli utenti che utilizzano questo indirizzo IP non possono creare altri account per il momento.",
+'emailauthenticated'         => "L'indirizzo e-mail è stato confermato il $2 alle $3.",
 'emailnotauthenticated'      => "L'indirizzo e-mail non è stato ancora confermato. Non verranno inviati messaggi e-mail attraverso le funzioni elencate di seguito.",
 'noemailprefs'               => 'Indicare un indirizzo e-mail per attivare queste funzioni.',
 'emailconfirmlink'           => 'Confermare il proprio indirizzo e-mail',
@@ -581,18 +605,27 @@ Per prevenire abusi, la funzione "Invia nuova password" può essere usata solo u
 È opportuno eseguire un accesso quanto prima e cambiare la password immediatamente.
 
 Se l\'accesso è stato creato per errore, si può ignorare questo messaggio.',
+'login-throttled'            => 'Sono stati effettuati troppi tentativi di accesso a questo account in breve tempo. 
+Riprovare più tardi.',
 'loginlanguagelabel'         => 'Lingua: $1',
 
 # Password reset dialog
-'resetpass'               => 'Reimposta la password',
-'resetpass_announce'      => "L'accesso è stato effettuato con un codice temporaneo, inviato via e-mail. Per completare l'accesso è necessario impostare una nuova password:",
-'resetpass_text'          => '<!-- Aggiungere il testo qui -->',
-'resetpass_header'        => "Cambia la password dell'account",
-'resetpass_submit'        => 'Imposta la password e accedi al sito',
-'resetpass_success'       => 'La password è stata modificata. Accesso in corso...',
-'resetpass_bad_temporary' => 'Password temporanea non valida. La password potrebbe essere stata già cambiata, oppure potrebbe essere stata richiesta una nuova password temporanea.',
-'resetpass_forbidden'     => 'Non è possibile modificare le password',
-'resetpass_missing'       => 'Dati mancanti nel modulo.',
+'resetpass'                 => 'Cambia la password',
+'resetpass_announce'        => "L'accesso è stato effettuato con un codice temporaneo, inviato via e-mail. Per completare l'accesso è necessario impostare una nuova password:",
+'resetpass_text'            => '<!-- Aggiungere il testo qui -->',
+'resetpass_header'          => "Cambia la password dell'account",
+'oldpassword'               => 'Vecchia password:',
+'newpassword'               => 'Nuova password:',
+'retypenew'                 => 'Riscrivi la nuova password:',
+'resetpass_submit'          => 'Imposta la password e accedi al sito',
+'resetpass_success'         => 'La password è stata modificata. Accesso in corso...',
+'resetpass_bad_temporary'   => 'Password temporanea non valida. La password potrebbe essere stata già cambiata, oppure potrebbe essere stata richiesta una nuova password temporanea.',
+'resetpass_forbidden'       => 'Non è possibile modificare le password',
+'resetpass-no-info'         => "Devi aver effettuato l'accesso per accedere a questa pagina direttamente.",
+'resetpass-submit-loggedin' => 'Cambia password',
+'resetpass-wrong-oldpass'   => 'Password temporanea o corrente non valida.
+La password potrebbe essere stata già cambiata, oppure potrebbe essere stata richiesta una nuova password temporanea.',
+'resetpass-temp-password'   => 'Password temporanea:',
 
 # Edit page toolbar
 'bold_sample'     => 'Grassetto',
@@ -617,8 +650,8 @@ Se l\'accesso è stato creato per errore, si può ignorare questo messaggio.',
 'hr_tip'          => 'Linea orizzontale (usare con giudizio)',
 
 # Edit pages
-'summary'                          => 'Oggetto',
-'subject'                          => 'Argomento (intestazione)',
+'summary'                          => 'Oggetto:',
+'subject'                          => 'Argomento (intestazione):',
 'minoredit'                        => 'Questa è una modifica minore',
 'watchthis'                        => 'Aggiungi agli osservati speciali',
 'savearticle'                      => 'Salva la pagina',
@@ -630,8 +663,8 @@ Se l\'accesso è stato creato per errore, si può ignorare questo messaggio.',
 'missingsummary'                   => "'''Attenzione:''' non è stato specificato l'oggetto di questa modifica. Premendo di nuovo '''Salva la pagina''' la modifica verrà salvata con l'oggetto vuoto.",
 'missingcommenttext'               => 'Inserire un commento qui sotto.',
 'missingcommentheader'             => "'''Attenzione:''' Non è stata specificata l'intestazione di questo commento. Premendo di nuovo '''Salva la pagina''' la modifica verrà salvata senza intestazione.",
-'summary-preview'                  => 'Anteprima oggetto',
-'subject-preview'                  => 'Anteprima oggetto/intestazione',
+'summary-preview'                  => 'Anteprima oggetto:',
+'subject-preview'                  => 'Anteprima oggetto/intestazione:',
 'blockedtitle'                     => 'Utente bloccato.',
 'blockedtext'                      => "<big>'''Questo nome utente o indirizzo IP sono stati bloccati.'''</big>
 
@@ -643,7 +676,7 @@ Il blocco è stato imposto da $1. La motivazione del blocco è la seguente: ''$2
 
 Se lo si desidera, è possibile contattare $1 o un altro [[{{MediaWiki:Grouppage-sysop}}|amministratore]] per discutere del blocco.
 
-Si noti che la funzione 'Scrivi all'utente' non è attiva se non è stato registrato un indirizzo e-mail valido nelle proprie [[Special:Preferences|preferenze]] e se si è stato bloccati dal suo utilizzo.
+Si noti che la funzione 'Scrivi all'utente' non è attiva se non è stato registrato un indirizzo e-mail valido nelle proprie [[Special:Preferences|preferenze]] o se l'utilizzo di tale funzione è stato bloccato.
 
 L'indirizzo IP attuale è $3, il numero ID del blocco è #$5.
 Si prega di specificare tutti i dettagli precedenti in qualsiasi richiesta di chiarimenti.",
@@ -675,57 +708,63 @@ Si prega di specificare tutti i dettagli qui inclusi nel compilare qualsiasi ric
 'loginreqlink'                     => "eseguire l'accesso",
 'loginreqpagetext'                 => 'Per vedere altre pagine è necessario $1.',
 'accmailtitle'                     => 'Password inviata.',
-'accmailtext'                      => 'La password per l\'utente "$1" è stata inviata all\'indirizzo $2.',
+'accmailtext'                      => "È stata inviata una password casuale per l'utente [[User talk:$1|$1]] all'indirizzo $2.
+
+La password relativa al nuovo account può essere modificata sulla pagina ''[[Special:ChangePassword|Cambia la password]]'' dopo aver effettuato l'accesso.",
 'newarticle'                       => '(Nuovo)',
 'newarticletext'                   => "Il collegamento appena seguito corrisponde a una pagina non ancora esistente.
 Se si desidera creare la pagina ora, basta cominciare a scrivere il testo nella casella qui sotto
 (fare riferimento alle [[{{MediaWiki:Helppage}}|pagine di aiuto]] per maggiori informazioni).
 Se il collegamento è stato seguito per errore, è sufficiente fare clic sul pulsante '''Indietro''' del proprio browser.",
 'anontalkpagetext'                 => "----''Questa è la pagina di discussione di un utente anonimo, che non ha ancora creato un accesso o comunque non lo usa. Per identificarlo è quindi necessario usare il numero del suo indirizzo IP. Gli indirizzi IP possono però essere condivisi da più utenti. Se sei un utente anonimo e ritieni che i commenti presenti in questa pagina non si riferiscano a te, [[Special:UserLogin|crea un nuovo accesso o entra]] con quello che già hai per evitare di essere confuso con altri utenti anonimi in futuro''",
-'noarticletext'                    => 'In questo momento la pagina richiesta è vuota. È possibile [[Special:Search/{{PAGENAME}}|cercare questo titolo]] nelle altre pagine del sito oppure [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificare la pagina ora].',
+'noarticletext'                    => 'In questo momento la pagina richiesta è vuota. È possibile [[Special:Search/{{PAGENAME}}|cercare questo titolo]] nelle altre pagine del sito, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} cercare nei registri correlati] oppure [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificare la pagina ora]</span>.',
 'userpage-userdoesnotexist'        => 'L\'account "$1" non corrisponde a un utente registrato. Verificare che si intenda davvero creare o modificare questa pagina.',
 'clearyourcache'                   => "'''Nota: dopo aver salvato è necessario pulire la cache del proprio browser per vedere i cambiamenti.''' Per '''Mozilla / Firefox / Safari''': fare clic su ''Ricarica'' tenendo premuto il tasto delle maiuscole, oppure premere ''Ctrl-F5'' o ''Ctrl-R'' (''Command-R'' su Mac); per '''Konqueror''': premere il pulsante ''Ricarica'' o il tasto ''F5''; per '''Opera''' può essere necessario svuotare completamente la cache dal menu ''Strumenti → Preferenze''; per '''Internet Explorer:''' mantenere premuto il tasto ''Ctrl'' mentre si preme il pulsante ''Aggiorna'' o premere ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>Suggerimento:</strong> si consiglia di usare il pulsante 'Visualizza anteprima' per provare i nuovi CSS o JavaScript prima di salvarli.",
+'usercssjsyoucanpreview'           => "'''Suggerimento:''' si consiglia di usare il pulsante 'Visualizza anteprima' per provare i nuovi CSS o JavaScript prima di salvarli.",
 'usercsspreview'                   => "'''Questa è solo un'anteprima del proprio CSS personale. Le modifiche non sono ancora state salvate!'''",
 'userjspreview'                    => "'''Questa è solo un'anteprima per provare il proprio JavaScript personale; le modifiche non sono ancora state salvate!'''",
 'userinvalidcssjstitle'            => "'''Attenzione:'''  Non esiste alcuna skin con nome \"\$1\". Si noti che le pagine per i .css e .js personalizzati hanno l'iniziale del titolo minuscola, ad esempio {{ns:user}}:Esempio/monobook.css e non {{ns:user}}:Esempio/Monobook.css.",
 'updated'                          => '(Aggiornato)',
-'note'                             => '<strong>NOTA:</strong>',
-'previewnote'                      => '<strong>Questa è solo una anteprima; le modifiche alla pagina NON sono ancora state salvate!</strong>',
+'note'                             => "'''NOTA:'''",
+'previewnote'                      => "'''Questa è solo un'anteprima; le modifiche alla pagina NON sono ancora state salvate!'''",
 'previewconflict'                  => 'L\'anteprima corrisponde al testo presente nella casella di modifica superiore e rappresenta la pagina come apparirà se si sceglie di premere "Salva la pagina" in questo momento.',
-'session_fail_preview'             => '<strong>Non è stato possibile elaborare la modifica perché sono andati persi i dati relativi alla sessione. Se il problema persiste, si può provare a [[Special:UserLogout|scollegarsi]] ed effettuare un nuovo accesso.</strong>',
-'session_fail_preview_html'        => "<strong>Non è stato possibile elaborare la modifica perché sono andati persi i dati relativi alla sessione.</strong>
+'session_fail_preview'             => "'''Non è stato possibile elaborare la modifica perché sono andati persi i dati relativi alla sessione. 
+Riprovare. 
+Se il problema persiste, si può provare a [[Special:UserLogout|scollegarsi]] ed effettuare un nuovo accesso.'''",
+'session_fail_preview_html'        => "'''Non è stato possibile elaborare la modifica perché sono andati persi i dati relativi alla sessione.'''
 
 ''Poiché in {{SITENAME}} è abilitato l'uso di HTML senza limitazioni, l'anteprima non viene visualizzata; si tratta di una misura di sicurezza contro gli attacchi JavaScript.''
 
-<strong>Se questo è un legittimo tentativo di modifica, riprovare. Se il problema persiste, si può provare a [[Special:UserLogout|scollegarsi]] ed effettuare un nuovo accesso.</strong>",
-'token_suffix_mismatch'            => "<strong>La modifica non è stata salvata perché il client ha mostrato di gestire in modo errato i caratteri di punteggiatura nel token associato alla stessa. Per evitare una possibile corruzione del testo della pagina, è stata rifiutata l'intera modifica. Questa situazione può verificarsi, talvolta, quando vengono usati alcuni servizi di proxy anonimi via web che presentano dei bug.</strong>",
+'''Se questo è un legittimo tentativo di modifica, riprovare. Se il problema persiste, si può provare a [[Special:UserLogout|scollegarsi]] ed effettuare un nuovo accesso.'''",
+'token_suffix_mismatch'            => "'''La modifica non è stata salvata perché il client ha mostrato di gestire in modo errato i caratteri di punteggiatura nel token associato alla stessa. Per evitare una possibile corruzione del testo della pagina, è stata rifiutata l'intera modifica. Questa situazione può verificarsi, talvolta, quando vengono usati alcuni servizi di proxy anonimi via web che presentano dei bug.'''",
 'editing'                          => 'Modifica di $1',
 'editingsection'                   => 'Modifica di $1 (sezione)',
-'editingcomment'                   => 'Modifica di $1 (commento)',
+'editingcomment'                   => 'Modifica di $1 (nuova sezione)',
 'editconflict'                     => 'Conflitto di edizione su $1',
 'explainconflict'                  => "Un altro utente ha salvato una nuova versione della pagina mentre stavi effettuando le modifiche.<br />
 La casella di modifica superiore contiene il testo della pagina attualmente online, così come è stato aggiornato dall'altro utente. La versione con le tue modifiche è invece riportata nella casella di modifica inferiore. Se desideri confermarle, devi riportare le tue modifiche nel testo esistente (casella superiore).
 Premendo il pulsante 'Salva la pagina', verrà salvato <b>solo</b> il testo contenuto nella casella di modifica superiore.<br />",
 'yourtext'                         => 'Il tuo testo',
 'storedversion'                    => 'La versione memorizzata',
-'nonunicodebrowser'                => '<strong>Attenzione: si sta utilizzando un browser non compatibile con i caratteri Unicode. Per consentire la modifica delle pagine senza creare inconvenienti, i caratteri non ASCII vengono visualizzati nella casella di modifica sotto forma di codici esadecimali.</strong>',
-'editingold'                       => '<strong>Attenzione: si sta modificando una versione non aggiornata della pagina.<br />
-Se si sceglie di salvarla, tutti i cambiamenti apportati dopo questa revisione andranno perduti.</strong>',
+'nonunicodebrowser'                => "'''Attenzione: si sta utilizzando un browser non compatibile con i caratteri Unicode. Per consentire la modifica delle pagine senza creare inconvenienti, i caratteri non ASCII vengono visualizzati nella casella di modifica sotto forma di codici esadecimali.'''",
+'editingold'                       => "'''Attenzione: si sta modificando una versione non aggiornata della pagina.<br />
+Se si sceglie di salvarla, tutti i cambiamenti apportati dopo questa revisione andranno perduti.'''",
 'yourdiff'                         => 'Differenze',
 'copyrightwarning'                 => "Nota: tutti i contributi a {{SITENAME}} si considerano rilasciati nei termini della licenza d'uso $2 (vedi $1 per maggiori dettagli). Se non desideri che i tuoi testi possano essere modificati e ridistribuiti da chiunque senza alcuna limitazione, non inviarli a {{SITENAME}}.<br />
 Con l'invio del testo dichiari inoltre, sotto la tua responsabilità, che il testo è stato scritto da te personalmente oppure che è stato copiato da una fonte di pubblico dominio o analogamente libera.
-<strong>NON INVIARE MATERIALE COPERTO DA DIRITTO DI AUTORE SENZA AUTORIZZAZIONE!</strong>",
+'''NON INVIARE MATERIALE COPERTO DA DIRITTO DI AUTORE SENZA AUTORIZZAZIONE!'''",
 'copyrightwarning2'                => "Nota: tutti i contributi inviati a {{SITENAME}} possono essere modificati, stravolti o cancellati da parte degli altri partecipanti. Se non desideri che i tuoi testi possano essere modificati senza alcun riguardo, non inviarli a questo sito.<br />
-Con l'invio del testo dichiari inoltre, sotto la tua responsabilità, che il testo è stato scritto da te personalmente oppure che è stato copiato da una fonte di pubblico dominio o analogamente libera. (vedi $1 per maggiori dettagli)
-<strong>NON INVIARE MATERIALE COPERTO DA DIRITTO DI AUTORE SENZA AUTORIZZAZIONE!</strong>",
-'longpagewarning'                  => "<strong>ATTENZIONE: Questa pagina è lunga $1 kilobyte; alcuni browser potrebbero presentare dei problemi nella modifica di pagine che si avvicinano o superano i 32 KB. Valuta l'opportunità di suddividere la pagina in sezioni più piccole.</strong>",
-'longpageerror'                    => '<strong>ERRORE: Il testo inviato è lungo $1 kilobyte, più della dimensione massima consentita ($2 kilobyte). Il testo non può essere salvato.</strong>',
-'readonlywarning'                  => '<strong>ATTENZIONE: Il database è stato bloccato per manutenzione, è quindi impossibile salvare le modifiche in questo momento. Per non perderle, è possibile copiare quanto inserito finora nella casella di modifica, incollarlo in un programma di elaborazione testi e salvarlo in attesa dello sblocco del database.</strong>',
-'protectedpagewarning'             => '<strong>ATTENZIONE: Questa pagina è stata bloccata in modo che solo gli utenti con privilegi di amministratore possano modificarla.</strong>',
+Con l'invio del testo dichiari inoltre, sotto la tua responsabilità, che il testo è stato scritto da te personalmente oppure che è stato copiato da una fonte di pubblico dominio o analogamente libera (vedi $1 per maggiori dettagli).
+'''NON INVIARE MATERIALE COPERTO DA DIRITTO DI AUTORE SENZA AUTORIZZAZIONE!'''",
+'longpagewarning'                  => "'''ATTENZIONE: Questa pagina è lunga $1 kilobyte; alcuni browser potrebbero presentare dei problemi nella modifica di pagine che si avvicinano o superano i 32 KB. Valuta l'opportunità di suddividere la pagina in sezioni più piccole.'''",
+'longpageerror'                    => "'''ERRORE: Il testo inviato è lungo $1 kilobyte, più della dimensione massima consentita ($2 kilobyte). Il testo non può essere salvato.'''",
+'readonlywarning'                  => "'''ATTENZIONE: Il database è stato bloccato per manutenzione, è quindi impossibile salvare le modifiche in questo momento. Per non perderle, è possibile copiare quanto inserito finora nella casella di modifica, incollarlo in un programma di elaborazione testi e salvarlo in attesa dello sblocco del database.'''
+
+L'amministratore che ha bloccato il database ha fornito questa spiegazione: $1",
+'protectedpagewarning'             => "'''ATTENZIONE: Questa pagina è stata bloccata in modo che solo gli utenti con privilegi di amministratore possano modificarla.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Questa pagina è stata bloccata in modo che solo gli utenti registrati possano modificarla.",
 'cascadeprotectedwarning'          => "'''Attenzione:''' Questa pagina è stata bloccata in modo che solo gli utenti con privilegi di amministratore possano modificarla. Ciò avviene perché la pagina è inclusa {{PLURAL:\$1|nella pagina indicata di seguito, che è stata protetta|nelle pagine indicate di seguito, che sono state protette}} selezionando la protezione \"ricorsiva\":",
-'titleprotectedwarning'            => '<strong>ATTENZIONE:  Questa pagina è stata bloccata in modo che solo alcune categorie di utenti possano crearla.</strong>',
+'titleprotectedwarning'            => "'''ATTENZIONE:  Questa pagina è stata bloccata in modo che siano necessari [[Special:ListGroupRights|diritti specifici]] per crearla.'''",
 'templatesused'                    => 'Template utilizzati in questa pagina:',
 'templatesusedpreview'             => 'Template utilizzati in questa anteprima:',
 'templatesusedsection'             => 'Template utilizzati in questa sezione:',
@@ -743,17 +782,29 @@ Con l'invio del testo dichiari inoltre, sotto la tua responsabilità, che il tes
 
 Accertarsi che sia davvero opportuno continuare a modificare questa pagina.
 L'elenco delle relative cancellazioni viene riportato di seguito per comodità:",
+'deleted-notice'                   => "Questa pagina è stata cancellata. L'elenco delle relative cancellazioni viene riportato di seguito per informazione.",
+'deletelog-fulllog'                => 'Visualizza registro completo',
+'edit-hook-aborted'                => "La modifica è stata annullata dall'hook.
+Non è stata restituita alcuna spiegazione.",
+'edit-gone-missing'                => 'Impossibile aggiornare la pagina.
+Sembra che sia stata cancellata.',
+'edit-conflict'                    => 'Conflitto di edizione.',
+'edit-no-change'                   => 'La modifica è stata ignorata poiché non sono stati apportati cambiamenti al testo.',
+'edit-already-exists'              => 'Impossibile creare una nuova pagina.
+Esiste già.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Attenzione: Questa pagina contiene troppe chiamate alle parser functions.
+'expensive-parserfunction-warning'        => "Attenzione: Questa pagina contiene troppe chiamate alle parser functions.
 
-Dovrebbe averne meno di $2, al momento ce ne sono $1.',
+Dovrebbe averne meno di $2, al momento ce {{PLURAL:$1|n'è $1|ne sono $1}}.",
 'expensive-parserfunction-category'       => 'Pagine con troppe chiamate alle parser functions',
 'post-expand-template-inclusion-warning'  => 'Attenzione: la dimensione dei template inclusi è troppo grande.
 Alcuni template non verranno inclusi.',
-'post-expand-template-inclusion-category' => 'Pagine dove la dimensione dei template inclusi supera il limite consentito',
+'post-expand-template-inclusion-category' => 'Pagine per le quali la dimensione dei template inclusi supera il limite consentito',
 'post-expand-template-argument-warning'   => 'Attenzione: questa pagina contiene almeno un argomento di un template che ha una dimensione troppo grande per essere espanso. Questi argomenti verranno omessi.',
 'post-expand-template-argument-category'  => 'Pagine contenenti template con argomenti mancanti',
+'parser-template-loop-warning'            => 'Rilevato loop del template: [[$1]]',
+'parser-template-recursion-depth-warning' => 'È stato raggiunto il limite di ricorsione nel template ($1)',
 
 # "Undo" feature
 'undo-success' => 'Questa modifica può essere annullata. Verificare il confronto presentato di seguito per accertarsi che il contenuto corrisponda a quanto desiderato e quindi salvare le modifiche per completare la procedura di annullamento.',
@@ -768,30 +819,29 @@ Alcuni template non verranno inclusi.',
 La motivazione del blocco fornita da $3 è la seguente: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Visualizza i log relativi a questa pagina.',
-'nohistory'           => 'Cronologia delle versioni di questa pagina non reperibile.',
-'revnotfound'         => 'Versione non trovata',
-'revnotfoundtext'     => 'La versione richiesta della pagina non è stata trovata.
-Verificare la URL usata per accedere a questa pagina.',
-'currentrev'          => 'Versione corrente',
-'revisionasof'        => 'Versione delle $1',
-'revision-info'       => 'Versione delle $1, autore: $2',
-'previousrevision'    => '� Versione meno recente',
-'nextrevision'        => 'Versione più recente →',
-'currentrevisionlink' => 'Versione corrente',
-'cur'                 => 'corr',
-'next'                => 'succ',
-'last'                => 'prec',
-'page_first'          => 'prima',
-'page_last'           => 'ultima',
-'histlegend'          => "Confronto tra versioni: selezionare le caselle corrispondenti alle versioni desiderate e premere Invio o il pulsante in basso.
-
-Legenda: (corr) = differenze con la versione corrente, (prec) = differenze con la versione precedente, '''m''' = modifica minore",
-'deletedrev'          => '[cancellata]',
-'histfirst'           => 'Prima',
-'histlast'            => 'Ultima',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(vuota)',
+'viewpagelogs'           => 'Visualizza i log relativi a questa pagina.',
+'nohistory'              => 'Cronologia delle versioni di questa pagina non reperibile.',
+'currentrev'             => 'Versione corrente',
+'currentrev-asof'        => 'Versione corrente delle $1',
+'revisionasof'           => 'Versione delle $1',
+'revision-info'          => 'Versione delle $1, autore: $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Versione meno recente',
+'nextrevision'           => 'Versione più recente →',
+'currentrevisionlink'    => 'Versione corrente',
+'cur'                    => 'corr',
+'next'                   => 'succ',
+'last'                   => 'prec',
+'page_first'             => 'prima',
+'page_last'              => 'ultima',
+'histlegend'             => "Confronto tra versioni: selezionare le caselle corrispondenti alle versioni desiderate e premere Invio o il pulsante in basso.
+
+Legenda: '''({{int:cur}})''' = differenze con la versione corrente, '''({{int:last}})''' = differenze con la versione precedente, '''{{int:minoreditletter}}''' = modifica minore",
+'history-fieldset-title' => 'Scorri nella cronologia',
+'deletedrev'             => '[cancellata]',
+'histfirst'              => 'Prima',
+'histlast'               => 'Ultima',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(vuota)',
 
 # Revision feed
 'history-feed-title'          => 'Cronologia',
@@ -820,7 +870,7 @@ Consultare il [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} log di cancella
 'logdelete-selected'          => "'''{{PLURAL:$1|Evento del registro selezionato|Eventi del registro selezionati}}:'''",
 'revdelete-text'              => "'''Le versioni cancellate restano visibili nella cronologia della pagina, mentre il testo contenuto non è accessibile al pubblico.'''
 
-Gli altri amministratori del sito potranno accedere comunque ai contenuti nascosti e ripristinarli attraverso questa stessa interfaccia, se non sono state impostate altre limitazioni in fase di installazione del sito.",
+Gli altri amministratori di {{SITENAME}} potranno accedere comunque ai contenuti nascosti e ripristinarli attraverso questa stessa interfaccia, se non sono state impostate altre limitazioni in fase di installazione del sito.",
 'revdelete-legend'            => 'Imposta le seguenti limitazioni sulle versioni cancellate:',
 'revdelete-hide-text'         => 'Nascondi il testo della versione',
 'revdelete-hide-name'         => 'Nascondi azione e oggetto della stessa',
@@ -873,6 +923,7 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'mergehistory-invalid-destination' => 'La pagina di destinazione deve avere un titolo corretto.',
 'mergehistory-autocomment'         => 'Unione di [[:$1]] in [[:$2]]',
 'mergehistory-comment'             => 'Unione di [[:$1]] in [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Le pagine di origine e di destinazione non possono coincidere',
 
 # Merge log
 'mergelog'           => 'Unioni',
@@ -885,119 +936,200 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'difference'              => '(Differenze fra le revisioni)',
 'lineno'                  => 'Riga $1:',
 'compareselectedversions' => 'Confronta le versioni selezionate',
+'visualcomparison'        => 'Confronto visuale',
+'wikicodecomparison'      => 'Confronto del wikitext',
 'editundo'                => 'annulla',
 'diff-multi'              => '({{PLURAL:$1|Una revisione intermedia non mostrata|$1 revisioni intermedie non mostrate}}.)',
+'diff-movedto'            => 'spostato a $1',
+'diff-styleadded'         => 'stile $1 aggiunto',
+'diff-added'              => '$1 aggiunto',
+'diff-changedto'          => 'cambiato in $1',
+'diff-movedoutof'         => 'spostato fuori da $1',
+'diff-styleremoved'       => 'stile $1 rimosso',
+'diff-removed'            => '$1 rimosso',
+'diff-changedfrom'        => 'cambiato da $1',
+'diff-src'                => 'origine',
+'diff-withdestination'    => 'con destinazione $1',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'larghezza',
+'diff-height'             => 'altezza',
+'diff-p'                  => "un '''paragrafo'''",
+'diff-blockquote'         => "una '''citazione'''",
+'diff-h1'                 => "un''''intestazione (livello 1)'''",
+'diff-h2'                 => "un''''intestazione (livello 2)'''",
+'diff-h3'                 => "un''''intestazione (livello 3)'''",
+'diff-h4'                 => "un''''intestazione (livello 4)'''",
+'diff-h5'                 => "un''''intestazione (livello 5)'''",
+'diff-pre'                => "un '''blocco preformattato'''",
+'diff-div'                => "una '''divisione'''",
+'diff-ul'                 => "un '''elenco puntato'''",
+'diff-ol'                 => "un '''elenco numerato'''",
+'diff-li'                 => "un '''elemento di lista'''",
+'diff-table'              => "una '''tabella'''",
+'diff-tbody'              => "un '''contenuto di tabella'''",
+'diff-tr'                 => "una '''riga'''",
+'diff-td'                 => "una '''cella'''",
+'diff-th'                 => "un''''intestazione'''",
+'diff-br'                 => "un '''a capo'''",
+'diff-hr'                 => "una '''linea orizzontale'''",
+'diff-code'               => "un '''blocco di codice per computer'''",
+'diff-dl'                 => "una '''lista di definizioni'''",
+'diff-dt'                 => "un '''termine di definizione'''",
+'diff-dd'                 => "una '''definizione'''",
+'diff-input'              => "un '''input'''",
+'diff-form'               => "un '''modulo'''",
+'diff-img'                => "un''''immagine'''",
+'diff-span'               => "uno '''span'''",
+'diff-a'                  => "un '''link'''",
+'diff-i'                  => "'''corsivo'''",
+'diff-b'                  => "'''grassetto'''",
+'diff-strong'             => "'''grassetto'''",
+'diff-em'                 => "'''enfasi'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''cancellato'''",
+'diff-tt'                 => "'''spaziatura fissa'''",
+'diff-sub'                => "'''pedice'''",
+'diff-sup'                => "'''apice'''",
+'diff-strike'             => "'''barrato'''",
 
 # Search results
-'searchresults'             => 'Risultati della ricerca',
-'searchresulttext'          => 'Per maggiori informazioni sulla ricerca interna di {{SITENAME}}, vedi [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Ricerca di '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "Ricerca di '''$1'''",
-'noexactmatch'              => "'''La pagina \"\$1\" non esiste.''' È possibile [[:\$1|crearla ora]].",
-'noexactmatch-nocreate'     => "'''La pagina con titolo \"\$1\" non esiste.'''",
-'toomanymatches'            => 'Troppe corrispondenze. Modificare la richiesta.',
-'titlematches'              => 'Corrispondenze nel titolo delle pagine',
-'notitlematches'            => 'Nessuna corrispondenza nei titoli delle pagine',
-'textmatches'               => 'Corrispondenze nel testo delle pagine',
-'notextmatches'             => 'Nessuna corrispondenza nel testo delle pagine',
-'prevn'                     => 'precedenti $1',
-'nextn'                     => 'successivi $1',
-'viewprevnext'              => 'Vedi ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|una parola|$2 parole}})',
-'search-result-score'       => 'Rilevanza: $1%',
-'search-redirect'           => '(redirect $1)',
-'search-section'            => '(sezione $1)',
-'search-suggest'            => 'Forse cercavi: $1',
-'search-interwiki-caption'  => 'Progetti fratelli',
-'search-interwiki-default'  => 'Risultati da $1:',
-'search-interwiki-more'     => '(altro)',
-'search-mwsuggest-enabled'  => 'con suggerimenti',
-'search-mwsuggest-disabled' => 'senza suggerimenti',
-'search-relatedarticle'     => 'Risultati correlati',
-'mwsuggest-disable'         => 'Disattiva suggerimenti AJAX',
-'searchrelated'             => 'correlati',
-'searchall'                 => 'tutti',
-'showingresults'            => "Di seguito {{PLURAL:$1|viene presentato al massimo '''1''' risultato|vengono presentati al massimo '''$1''' risultati}} a partire dal numero '''$2'''.",
-'showingresultsnum'         => "Di seguito {{PLURAL:$3|viene presentato '''1''' risultato|vengono presentati '''$3''' risultati}} a partire dal numero '''$2'''.",
-'showingresultstotal'       => "Di seguito {{PLURAL:$3|viene mostrato il risultato '''$1''' di '''$3'''|vengono mostrati i risultati '''$1 - $2''' di '''$3'''}}",
-'nonefound'                 => "'''Nota''': la ricerca è effettuata per default solo in alcuni namespace. Prova a premettere ''all:'' al testo della ricerca per cercare in tutti i namespace (compresi pagine di discussione, template, ecc) oppure usa il namespace desiderato come prefisso.",
-'powersearch'               => 'Ricerca',
-'powersearch-legend'        => 'Ricerca avanzata',
-'powersearch-ns'            => 'Cerca nei namespace:',
-'powersearch-redir'         => 'Elenca redirect',
-'powersearch-field'         => 'Cerca',
-'search-external'           => 'Ricerca esterna',
-'searchdisabled'            => 'La ricerca interna di {{SITENAME}} non è attiva; nel frattempo si può provare ad usare un motore di ricerca esterno come Google. (Si noti però che i contenuti di {{SITENAME}} presenti in tali motori potrebbero non essere aggiornati.)',
+'searchresults'                    => 'Risultati della ricerca',
+'searchresults-title'              => 'Risultati della ricerca di "$1"',
+'searchresulttext'                 => 'Per maggiori informazioni sulla ricerca interna di {{SITENAME}}, vedi [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Ricerca di \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tutte le pagine che iniziano per "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|tutte le pagine che puntano a "$1"]])',
+'searchsubtitleinvalid'            => "Ricerca di '''$1'''",
+'noexactmatch'                     => "'''La pagina \"\$1\" non esiste.''' È possibile [[:\$1|crearla ora]].",
+'noexactmatch-nocreate'            => "'''La pagina con titolo \"\$1\" non esiste.'''",
+'toomanymatches'                   => 'Troppe corrispondenze. Modificare la richiesta.',
+'titlematches'                     => 'Corrispondenze nel titolo delle pagine',
+'notitlematches'                   => 'Nessuna corrispondenza nei titoli delle pagine',
+'textmatches'                      => 'Corrispondenze nel testo delle pagine',
+'notextmatches'                    => 'Nessuna corrispondenza nel testo delle pagine',
+'prevn'                            => 'precedenti $1',
+'nextn'                            => 'successivi $1',
+'viewprevnext'                     => 'Vedi ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opzioni di ricerca',
+'searchmenu-exists'                => "'''Sul sito esiste una pagina il cui nome è \"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''Crea la pagina \"[[:\$1]]\" su questo sito'''",
+'searchhelp-url'                   => 'Help:Indice',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Visualizza le pagine con questo prefisso]]',
+'searchprofile-articles'           => 'Pagine di contenuti',
+'searchprofile-articles-and-proj'  => 'Contenuti e pagine relative al progetto',
+'searchprofile-project'            => 'Pagine relative al progetto',
+'searchprofile-images'             => 'File',
+'searchprofile-everything'         => 'Tutto',
+'searchprofile-advanced'           => 'Avanzata',
+'searchprofile-articles-tooltip'   => 'Cerca in $1',
+'searchprofile-project-tooltip'    => 'Cerca in $1',
+'searchprofile-images-tooltip'     => 'Cerca file',
+'searchprofile-everything-tooltip' => 'Cerca ovunque (incluse le pagine di discussione)',
+'searchprofile-advanced-tooltip'   => 'Cerca nei namespace personalizzati',
+'prefs-search-nsdefault'           => 'Ricerca utilizzando i predefiniti:',
+'prefs-search-nscustom'            => 'Ricerca nei namespace personalizzati:',
+'search-result-size'               => '$1 ({{PLURAL:$2|una parola|$2 parole}})',
+'search-result-score'              => 'Rilevanza: $1%',
+'search-redirect'                  => '(redirect $1)',
+'search-section'                   => '(sezione $1)',
+'search-suggest'                   => 'Forse cercavi: $1',
+'search-interwiki-caption'         => 'Progetti fratelli',
+'search-interwiki-default'         => 'Risultati da $1:',
+'search-interwiki-more'            => '(altro)',
+'search-mwsuggest-enabled'         => 'con suggerimenti',
+'search-mwsuggest-disabled'        => 'senza suggerimenti',
+'search-relatedarticle'            => 'Risultati correlati',
+'mwsuggest-disable'                => 'Disattiva suggerimenti AJAX',
+'searchrelated'                    => 'correlati',
+'searchall'                        => 'tutti',
+'showingresults'                   => "Di seguito {{PLURAL:$1|viene presentato al massimo '''1''' risultato|vengono presentati al massimo '''$1''' risultati}} a partire dal numero '''$2'''.",
+'showingresultsnum'                => "Di seguito {{PLURAL:$3|viene presentato '''1''' risultato|vengono presentati '''$3''' risultati}} a partire dal numero '''$2'''.",
+'showingresultstotal'              => "Di seguito {{PLURAL:$4|viene mostrato il risultato '''$1''' di '''$3'''|vengono mostrati i risultati '''$1 - $2''' di '''$3'''}}",
+'nonefound'                        => "'''Nota''': la ricerca è effettuata per default solo in alcuni namespace. Prova a premettere ''all:'' al testo della ricerca per cercare in tutti i namespace (compresi pagine di discussione, template, ecc) oppure usa il namespace desiderato come prefisso.",
+'search-nonefound'                 => 'La ricerca non ha prodotto risultati.',
+'powersearch'                      => 'Ricerca',
+'powersearch-legend'               => 'Ricerca avanzata',
+'powersearch-ns'                   => 'Cerca nei namespace:',
+'powersearch-redir'                => 'Elenca redirect',
+'powersearch-field'                => 'Cerca',
+'search-external'                  => 'Ricerca esterna',
+'searchdisabled'                   => 'La ricerca interna di {{SITENAME}} non è attiva; nel frattempo si può provare ad usare un motore di ricerca esterno come Google. (Si noti però che i contenuti di {{SITENAME}} presenti in tali motori potrebbero non essere aggiornati.)',
 
 # Preferences page
-'preferences'              => 'Preferenze',
-'mypreferences'            => 'preferenze',
-'prefs-edits'              => 'Modifiche effettuate:',
-'prefsnologin'             => 'Accesso non effettuato',
-'prefsnologintext'         => 'Per poter personalizzare le preferenze è necessario effettuare l\'<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} accesso]</span>.',
-'prefsreset'               => 'Le preferenze sono state ripristinate ai valori predefiniti.',
-'qbsettings'               => 'Quickbar',
-'qbsettings-none'          => 'Nessuno',
-'qbsettings-fixedleft'     => 'Fisso a sinistra',
-'qbsettings-fixedright'    => 'Fisso a destra',
-'qbsettings-floatingleft'  => 'Fluttuante a sinistra',
-'qbsettings-floatingright' => 'Fluttuante a destra',
-'changepassword'           => 'Cambia password',
-'skin'                     => 'Aspetto grafico (skin)',
-'math'                     => 'Formule matematiche',
-'dateformat'               => 'Formato della data',
-'datedefault'              => 'Nessuna preferenza',
-'datetime'                 => 'Data e ora',
-'math_failure'             => 'Errore del parser',
-'math_unknown_error'       => 'errore sconosciuto',
-'math_unknown_function'    => 'funzione sconosciuta',
-'math_lexing_error'        => 'errore lessicale',
-'math_syntax_error'        => 'errore di sintassi',
-'math_image_error'         => 'Conversione in PNG non riuscita; verificare che siano correttamente installati i seguenti programmi: latex, dvips, gs e convert.',
-'math_bad_tmpdir'          => 'Impossibile scrivere o creare la directory temporanea per math',
-'math_bad_output'          => 'Impossibile scrivere o creare la directory di output per math',
-'math_notexvc'             => 'Eseguibile texvc mancante; per favore consultare math/README per la configurazione.',
-'prefs-personal'           => 'Profilo utente',
-'prefs-rc'                 => 'Ultime modifiche',
-'prefs-watchlist'          => 'Osservati speciali',
-'prefs-watchlist-days'     => 'Numero di giorni da mostrare negli osservati speciali:',
-'prefs-watchlist-edits'    => 'Numero di modifiche da mostrare con le funzioni avanzate:',
-'prefs-misc'               => 'Varie',
-'saveprefs'                => 'Salva le preferenze',
-'resetprefs'               => 'Reimposta le preferenze',
-'oldpassword'              => 'Vecchia password:',
-'newpassword'              => 'Nuova password:',
-'retypenew'                => 'Riscrivi la nuova password:',
-'textboxsize'              => 'Casella di modifica',
-'rows'                     => 'Righe:',
-'columns'                  => 'Colonne:',
-'searchresultshead'        => 'Ricerca',
-'resultsperpage'           => 'Numero di risultati per pagina:',
-'contextlines'             => 'Righe di testo per ciascun risultato:',
-'contextchars'             => 'Numero di caratteri di contesto:',
-'stub-threshold'           => 'Valore minimo per i <a href="#" class="stub">collegamenti agli stub</a>:',
-'recentchangesdays'        => 'Numero di giorni da mostrare nelle ultime modifiche:',
-'recentchangescount'       => 'Numero di righe nelle ultime modifiche:',
-'savedprefs'               => 'Le preferenze sono state salvate.',
-'timezonelegend'           => 'Fuso orario',
-'timezonetext'             => "Numero di ore di differenza fra l'ora locale e l'ora del server (UTC).",
-'localtime'                => 'Ora locale',
-'timezoneoffset'           => 'Differenza¹',
-'servertime'               => 'Ora del server',
-'guesstimezone'            => "Usa l'ora del tuo browser",
-'allowemail'               => 'Abilita la ricezione di email da altri utenti¹',
-'prefs-searchoptions'      => 'Opzioni di ricerca',
-'prefs-namespaces'         => 'Namespace',
-'defaultns'                => 'Cerca in questi namespace se non diversamente specificato:',
-'default'                  => 'predefinito',
-'files'                    => 'File',
+'preferences'               => 'Preferenze',
+'mypreferences'             => 'preferenze',
+'prefs-edits'               => 'Modifiche effettuate:',
+'prefsnologin'              => 'Accesso non effettuato',
+'prefsnologintext'          => 'Per poter personalizzare le preferenze è necessario effettuare l\'<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} accesso]</span>.',
+'prefsreset'                => 'Le preferenze sono state ripristinate ai valori predefiniti.',
+'qbsettings'                => 'Quickbar',
+'qbsettings-none'           => 'Nessuno',
+'qbsettings-fixedleft'      => 'Fisso a sinistra',
+'qbsettings-fixedright'     => 'Fisso a destra',
+'qbsettings-floatingleft'   => 'Fluttuante a sinistra',
+'qbsettings-floatingright'  => 'Fluttuante a destra',
+'changepassword'            => 'Cambia password',
+'skin'                      => 'Aspetto grafico (skin)',
+'skin-preview'              => 'anteprima',
+'math'                      => 'Formule matematiche',
+'dateformat'                => 'Formato della data',
+'datedefault'               => 'Nessuna preferenza',
+'datetime'                  => 'Data e ora',
+'math_failure'              => 'Errore del parser',
+'math_unknown_error'        => 'errore sconosciuto',
+'math_unknown_function'     => 'funzione sconosciuta',
+'math_lexing_error'         => 'errore lessicale',
+'math_syntax_error'         => 'errore di sintassi',
+'math_image_error'          => 'Conversione in PNG non riuscita; verificare che siano correttamente installati i seguenti programmi: latex, dvips, gs e convert.',
+'math_bad_tmpdir'           => 'Impossibile scrivere o creare la directory temporanea per math',
+'math_bad_output'           => 'Impossibile scrivere o creare la directory di output per math',
+'math_notexvc'              => 'Eseguibile texvc mancante; per favore consultare math/README per la configurazione.',
+'prefs-personal'            => 'Profilo utente',
+'prefs-rc'                  => 'Ultime modifiche',
+'prefs-watchlist'           => 'Osservati speciali',
+'prefs-watchlist-days'      => 'Numero di giorni da mostrare negli osservati speciali:',
+'prefs-watchlist-days-max'  => '(massimo 7 giorni)',
+'prefs-watchlist-edits'     => 'Numero di modifiche da mostrare con le funzioni avanzate:',
+'prefs-watchlist-edits-max' => '(numero massimo: 1000)',
+'prefs-misc'                => 'Varie',
+'prefs-resetpass'           => 'Cambia password',
+'saveprefs'                 => 'Salva le preferenze',
+'resetprefs'                => 'Reimposta le preferenze',
+'textboxsize'               => 'Casella di modifica',
+'prefs-edit-boxsize'        => 'Dimensioni della finestra di modifica.',
+'rows'                      => 'Righe:',
+'columns'                   => 'Colonne:',
+'searchresultshead'         => 'Ricerca',
+'resultsperpage'            => 'Numero di risultati per pagina:',
+'contextlines'              => 'Righe di testo per ciascun risultato:',
+'contextchars'              => 'Numero di caratteri di contesto:',
+'stub-threshold'            => 'Valore minimo per i <a href="#" class="stub">collegamenti agli stub</a>, in byte:',
+'recentchangesdays'         => 'Numero di giorni da mostrare nelle ultime modifiche:',
+'recentchangesdays-max'     => '(massimo $1 {{PLURAL:$1|giorno|giorni}})',
+'recentchangescount'        => 'Numero di righe nelle ultime modifiche, cronologie e registri (valore predefinito):',
+'savedprefs'                => 'Le preferenze sono state salvate.',
+'timezonelegend'            => 'Fuso orario',
+'timezonetext'              => "Numero di ore di differenza fra l'ora locale e l'ora del server (UTC).",
+'localtime'                 => 'Ora locale:',
+'timezoneselect'            => 'Fuso orario:',
+'timezoneuseserverdefault'  => 'Usa ora del server',
+'timezoneuseoffset'         => 'Altro (specificare differenza)',
+'timezoneoffset'            => 'Differenza¹:',
+'servertime'                => 'Ora del server:',
+'guesstimezone'             => "Usa l'ora del tuo browser",
+'allowemail'                => 'Abilita la ricezione di messaggi e-mail da altri utenti¹',
+'prefs-searchoptions'       => 'Opzioni di ricerca',
+'prefs-namespaces'          => 'Namespace',
+'defaultns'                 => 'Cerca in questi namespace se non diversamente specificato:',
+'default'                   => 'predefinito',
+'files'                     => 'File',
 
 # User rights
 'userrights'                  => 'Gestione dei permessi relativi agli utenti', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Gestione dei gruppi utente',
 'userrights-user-editname'    => 'Inserire il nome utente:',
 'editusergroup'               => 'Modifica gruppi utente',
-'editinguser'                 => "Modifica dei diritti assegnati all'utente '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Modifica dei diritti assegnati all'utente '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modifica gruppi utente',
 'saveusergroups'              => 'Salva gruppi utente',
 'userrights-groupsmember'     => 'Appartiene ai gruppi:',
@@ -1046,7 +1178,9 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'right-minoredit'            => 'Segna le modifiche come minori',
 'right-move'                 => 'Sposta pagine',
 'right-move-subpages'        => 'Sposta le pagine insieme alle relative sottopagine',
-'right-suppressredirect'     => 'Evita la creazione automatica del redirect quando sposta una pagina da quel titolo',
+'right-move-rootuserpages'   => 'Sposta le pagine principali degli utenti',
+'right-movefile'             => 'Sposta file',
+'right-suppressredirect'     => 'Non crea un redirect automatico quando si sposta una pagina',
 'right-upload'               => 'Carica file',
 'right-reupload'             => 'Sovrascrive un file esistente',
 'right-reupload-own'         => 'Sovrascrive un file esistente caricato dallo stesso utente',
@@ -1057,7 +1191,7 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'right-bot'                  => 'Da trattare come processo automatico',
 'right-nominornewtalk'       => "Fa sì che le modifiche minori alle pagine di discussione non facciano comparire l'avviso di nuovo messaggio",
 'right-apihighlimits'        => 'Usa limiti più alti per le interrogazioni API',
-'right-writeapi'             => "Usa l'API per modificare il wiki",
+'right-writeapi'             => "Usa l'API in scrittura",
 'right-delete'               => 'Cancella pagine',
 'right-bigdelete'            => 'Cancella pagine con cronologie lunghe',
 'right-deleterevision'       => 'Nasconde revisioni specifiche delle pagine',
@@ -1076,12 +1210,12 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'right-editinterface'        => "Modifica l'interfaccia utente",
 'right-editusercssjs'        => 'Modifica i file CSS e JS di altri utenti',
 'right-rollback'             => "Rollback rapido delle modifiche dell'ultimo utente che ha modificato una particolare pagina",
-'right-markbotedits'         => 'Segna modifiche specifiche come bot',
+'right-markbotedits'         => 'Segna le modifiche soggette a rollback come effettuate da bot',
 'right-noratelimit'          => 'Non soggetto al limite di azioni',
 'right-import'               => 'Importa pagine da altri wiki',
 'right-importupload'         => 'Importa pagine da un upload di file',
 'right-patrol'               => 'Segna le modifiche degli altri utenti come verificate',
-'right-autopatrol'           => 'Segna automaticamente le sue modifiche come verificate',
+'right-autopatrol'           => 'Segna automaticamente le proprie modifiche come verificate',
 'right-patrolmarks'          => 'Usa la funzione di verifica delle ultime modifiche',
 'right-unwatchedpages'       => 'Visualizza una lista di pagine non osservate',
 'right-trackback'            => 'Invia un trackback',
@@ -1096,19 +1230,56 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'rightslogentry' => "ha modificato l'appartenenza di $1 dal gruppo $2 al gruppo $3",
 'rightsnone'     => '(nessuno)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'leggere questa pagina',
+'action-edit'                 => 'modificare questa pagina',
+'action-createpage'           => 'creare pagine',
+'action-createtalk'           => 'creare pagine di discussione',
+'action-createaccount'        => 'creare questo account utente',
+'action-minoredit'            => 'segnare questa modifica come minore',
+'action-move'                 => 'spostare questa pagina',
+'action-move-subpages'        => 'spostare questa pagina e le relative sottopagine',
+'action-move-rootuserpages'   => 'spostare le pagine principali degli utenti',
+'action-movefile'             => 'spostare questo file',
+'action-upload'               => 'caricare questo file',
+'action-reupload'             => 'sovrascrivere questo file esistente',
+'action-reupload-shared'      => "sovrascrivere questo file presente nell'archivio condiviso",
+'action-upload_by_url'        => 'caricare questo file da un indirizzo URL',
+'action-writeapi'             => 'usare le API in scrittura',
+'action-delete'               => 'cancellare questa pagina',
+'action-deleterevision'       => 'cancellare questa versione',
+'action-deletedhistory'       => 'visualizzare la cronologia cancellata di questa pagina',
+'action-browsearchive'        => 'cercare pagine cancellate',
+'action-undelete'             => 'recuperare questa pagina',
+'action-suppressrevision'     => 'rivedere e ripristinare le modifiche nascoste',
+'action-suppressionlog'       => 'visionare questo log privato',
+'action-block'                => 'bloccare questo utente in scrittura',
+'action-protect'              => 'modificare i livelli di protezione per questa pagina',
+'action-import'               => "importare questa pagina da un'altra wiki",
+'action-importupload'         => 'importare questa pagina tramite upload da file',
+'action-patrol'               => 'segnare le modifiche degli altri utenti come verificate',
+'action-autopatrol'           => 'segnare le proprie modifiche come verificate',
+'action-unwatchedpages'       => 'visionare la lista di pagine non osservate',
+'action-trackback'            => 'inviare una trackback',
+'action-mergehistory'         => 'unire la cronologia di questa pagina',
+'action-userrights'           => 'modificare tutti i diritti degli utenti',
+'action-userrights-interwiki' => 'modificare i diritti degli utenti su altre wiki',
+'action-siteadmin'            => 'bloccare e sbloccare il database',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|modifica|modifiche}}',
 'recentchanges'                     => 'Ultime modifiche',
+'recentchanges-legend'              => 'Opzioni ultime modifiche',
 'recentchangestext'                 => 'Questa pagina presenta le modifiche più recenti ai contenuti del sito.',
 'recentchanges-feed-description'    => 'Questo feed riporta le modifiche più recenti ai contenuti del sito.',
 'rcnote'                            => "Di seguito {{PLURAL:$1|è elencata la modifica più recente apportata|sono elencate le '''$1''' modifiche più recenti apportate}} al sito {{PLURAL:$2|nelle ultime 24 ore|negli scorsi '''$2''' giorni}}; i dati sono aggiornati alle $5 del $4.",
-'rcnotefrom'                        => 'Di seguito sono elencate le modifiche apportate a partire da <b>$2</b> (fino a <b>$1</b>).',
+'rcnotefrom'                        => "Di seguito sono elencate le modifiche apportate a partire da '''$2''' (fino a '''$1''').",
 'rclistfrom'                        => 'Mostra le modifiche apportate a partire da $1',
 'rcshowhideminor'                   => '$1 le modifiche minori',
 'rcshowhidebots'                    => '$1 i bot',
 'rcshowhideliu'                     => '$1 gli utenti registrati',
 'rcshowhideanons'                   => '$1 gli utenti anonimi',
-'rcshowhidepatr'                    => '$1 le modifiche controllate',
+'rcshowhidepatr'                    => '$1 le modifiche verificate',
 'rcshowhidemine'                    => '$1 le mie modifiche',
 'rclinks'                           => 'Mostra le $1 modifiche più recenti apportate negli ultimi $2 giorni<br />$3',
 'diff'                              => 'diff',
@@ -1122,12 +1293,14 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'rc_categories'                     => 'Limita alle categorie (separate da "|")',
 'rc_categories_any'                 => 'Qualsiasi',
 'newsectionsummary'                 => '/* $1 */ nuova sezione',
+'rc-enhanced-expand'                => 'Mostra dettagli (richiede JavaScript)',
+'rc-enhanced-hide'                  => 'Nascondi dettagli',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Modifiche correlate',
 'recentchangeslinked-title'    => 'Modifiche correlate a "$1"',
 'recentchangeslinked-noresult' => 'Nessuna modifica alle pagine collegate nel periodo specificato.',
-'recentchangeslinked-summary'  => "Questa pagina speciale mostra le modifiche più recenti alle pagine collegate a quella specificata. Le pagine osservate sono evidenziate in '''grassetto'''.",
+'recentchangeslinked-summary'  => "Questa pagina speciale mostra le modifiche più recenti alle pagine collegate a quella specificata. Le pagine contenute nella propria lista degli [[Special:Watchlist|Osservati Speciali]] sono evidenziate in '''grassetto'''.",
 'recentchangeslinked-page'     => 'Nome della pagina:',
 'recentchangeslinked-to'       => 'Mostra solo le modifiche alle pagine collegate a quella specificata',
 
@@ -1138,14 +1311,14 @@ Gli altri amministratori del sito potranno accedere comunque ai contenuti nascos
 'reuploaddesc'                => 'Torna al modulo per il caricamento.',
 'uploadnologin'               => 'Accesso non effettuato',
 'uploadnologintext'           => "Il caricamento dei file è consentito solo agli utenti registrati che hanno eseguito [[Special:UserLogin|l'accesso]] al sito.",
-'upload_directory_missing'    => 'La directory di upload ($1) non esiste e non può essere creata dal webserver.',
+'upload_directory_missing'    => 'La directory di upload ($1) non esiste e non può essere creata dal server web.',
 'upload_directory_read_only'  => 'Il server web non è in grado di scrivere nella directory di upload ($1).',
 'uploaderror'                 => 'Errore nel caricamento',
-'uploadtext'                  => "Usare il modulo sottostante per caricare nuovi file. Per visualizzare o ricercare i file già caricati, consultare il [[Special:ImageList|log dei file caricati]]. Caricamenti di file e di nuove versioni di file sono registrati nel [[Special:Log/upload|log degli upload]], le cancellazioni nell'[[Special:Log/delete|apposito]].
+'uploadtext'                  => "Usare il modulo sottostante per caricare nuovi file. Per visualizzare o ricercare i file già caricati, consultare il [[Special:FileList|log dei file caricati]]. Caricamenti di file e di nuove versioni di file sono registrati nel [[Special:Log/upload|log degli upload]], le cancellazioni nell'[[Special:Log/delete|apposito]].
 
 Per inserire un file all'interno di una pagina, fare un collegamento di questo tipo:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' per usare la versione intera del file
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|testo alternativo]]</nowiki></tt>''' per usare una versione larga 200 pixel inserita in un box, allineata a sinistra e con 'testo alternativo' come didascalia
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' per usare la versione completa del file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|testo alternativo]]</nowiki></tt>''' per usare una versione larga 200 pixel inserita in un box, allineata a sinistra e con 'testo alternativo' come didascalia
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' per generare un collegamento diretto al file senza visualizzarlo",
 'upload-permitted'            => 'Tipi di file consentiti: $1.',
 'upload-preferred'            => 'Tipi di file consigliati: $1.',
@@ -1153,7 +1326,7 @@ Per inserire un file all'interno di una pagina, fare un collegamento di questo t
 'uploadlog'                   => 'File caricati',
 'uploadlogpage'               => 'File caricati',
 'uploadlogpagetext'           => "Di seguito sono elencati gli ultimi file caricati.
-Guarda la [[Special:NewImages|galleria dei nuovi file]] per una visione d'insieme.",
+Consultare la [[Special:NewFiles|galleria dei nuovi file]] per una visione d'insieme.",
 'filename'                    => 'Nome del file',
 'filedesc'                    => 'Dettagli',
 'fileuploadsummary'           => 'Dettagli del file:',
@@ -1173,26 +1346,27 @@ Guarda la [[Special:NewImages|galleria dei nuovi file]] per una visione d'insiem
 'large-file'                  => 'Si raccomanda di non superare le dimensioni di $1 per ciascun file; questo file è grande $2.',
 'largefileserver'             => 'Il file supera le dimensioni consentite dalla configurazione del server.',
 'emptyfile'                   => 'Il file appena caricato sembra essere vuoto. Ciò potrebbe essere dovuto ad un errore nel nome del file. Verificare che si intenda realmente caricare questo file.',
-'fileexists'                  => 'Un file con questo nome esiste già. Verificare prima <strong><tt>$1</tt></strong> se non si è sicuri di volerlo sovrascrivere.',
-'filepageexists'              => "La pagina di descrizione di questo file è già stata creata all'indirizzo <strong><tt>$1</tt></strong>, anche se non esiste ancora un file con questo nome. La descrizione dell'oggetto inserita in fase di caricamento non apparirà sulla pagina di discussione. Per far sì che l'oggetto compaia sulla pagina di discussione, sarà necessario modificarla manualmente",
-'fileexists-extension'        => "Un file con nome simile a questo esiste già; l'unica differenza è l'uso delle maiuscole nell'estensione:<br />
-Nome del file caricato: <strong><tt>$1</tt></strong><br />
-Nome del file esistente: <strong><tt>$2</tt></strong><br />
-Verificare che i due file non siano identici.",
+'fileexists'                  => "Un file con questo nome esiste già. Verificare prima '''<tt>$1</tt>''' se non si è sicuri di volerlo sovrascrivere.",
+'filepageexists'              => "La pagina di descrizione di questo file è già stata creata all'indirizzo '''<tt>$1</tt>''', anche se non esiste ancora un file con questo nome. La descrizione dell'oggetto inserita in fase di caricamento non apparirà sulla pagina di discussione. Per far sì che l'oggetto compaia sulla pagina di discussione, sarà necessario modificarla manualmente",
+'fileexists-extension'        => "Un file con nome simile a questo esiste già:<br />
+Nome del file caricato: '''<tt>$1</tt>'''<br />
+Nome del file esistente: '''<tt>$2</tt>'''<br />
+Scegliere un nome diverso.",
 'fileexists-thumb'            => "<center>'''File preesistente'''</center>",
-'fileexists-thumbnail-yes'    => "Il file caricato sembra essere il risultato di un'anteprima <i>(thumbnail)</i>. Verificare, per confronto, il file <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Il file caricato sembra essere il risultato di un'anteprima ''(thumbnail)''. Verificare, per confronto, il file '''<tt>$1</tt>'''.<br />
 Se si tratta della stessa immagine, nelle dimensioni originali, non è necessario caricarne altre anteprime.",
-'file-thumbnail-no'           => "Il nome del file inizia con <strong><tt>$1</tt></strong>; sembra quindi essere il risultato di un'anteprima <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "Il nome del file inizia con '''<tt>$1</tt>'''; sembra quindi essere il risultato di un'anteprima ''(thumbnail)''.
 Se si dispone dell'immagine nella risoluzione originale, si prega di caricarla. In caso contrario, si prega di cambiare il nome del file.",
-'fileexists-forbidden'        => 'Un file con questo nome esiste già. Tornare indietro e modificare il nome con il quale caricare il file. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => "Un file con questo nome esiste già nell'archivio di risorse multimediali condivise. Se si desidera ancora caricare il file, tornare indietro e modificare il nome con il quale caricare il file. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => 'Un file con questo nome esiste già e non può essere sovrascritto. Tornare indietro e modificare il nome con il quale caricare il file. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => "Un file con questo nome esiste già nell'archivio di risorse multimediali condivise. Se si desidera ancora caricare il file, tornare indietro e modificare il nome con il quale caricare il file. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Questo file è un duplicato {{PLURAL:$1|del seguente|dei seguenti}} file:',
+'file-deleted-duplicate'      => 'Un file identico a questo ([[$1]]) è stato cancellato in passato. Verificare la cronologia delle cancellazioni prima di caricarlo di nuovo.',
 'successfulupload'            => 'Caricamento completato',
 'uploadwarning'               => 'Avviso di caricamento',
 'savefile'                    => 'Salva file',
 'uploadedimage'               => 'ha caricato "[[$1]]"',
 'overwroteimage'              => 'ha caricato una nuova versione di "[[$1]]"',
-'uploaddisabled'              => 'Siamo spiacenti, ma il caricamento di file è temporaneamente sospeso.',
+'uploaddisabled'              => 'Il caricamento dei file è temporaneamente sospeso.',
 'uploaddisabledtext'          => 'Il caricamento dei file non è attivo.',
 'uploadscripted'              => 'Questo file contiene codice HTML o di script, che potrebbe essere interpretato erroneamente da un browser web.',
 'uploadcorrupt'               => "Il file è corrotto o ha un'estensione non corretta. Controllare il file e provare di nuovo il caricamento.",
@@ -1206,7 +1380,7 @@ Se si dispone dell'immagine nella risoluzione originale, si prega di caricarla.
 
 Accertarsi che sia davvero opportuno continuare a caricare questo file.
 L'elenco delle relative cancellazioni viene riportato di seguito per comodità:",
-'filename-bad-prefix'         => 'Il nome del file che stai caricando inizia con <strong>"$1"</strong>, che è un nome non-descrittivo tipicamente assegnato automaticamente dalle fotocamere digitali. Per favore scegli un nome più descrittivo per il tuo file.',
+'filename-bad-prefix'         => "Il nome del file che stai caricando inizia con '''\"\$1\"''', che è un nome non-descrittivo tipicamente assegnato automaticamente dalle fotocamere digitali. Per favore scegli un nome più descrittivo per il tuo file.",
 'filename-prefix-blacklist'   => ' #<!-- lascia questa riga esattamente com\'è --> <pre>
 # La sintassi è la seguente:
 #   * Tutto ciò che segue il carattere "#" sino alla fine della riga è un commento
@@ -1225,9 +1399,9 @@ PICT # misc.
 'upload-proto-error'      => 'Protocollo errato',
 'upload-proto-error-text' => "Per l'upload remoto è necessario specificare URL che iniziano con <code>http://</code> oppure <code>ftp://</code>.",
 'upload-file-error'       => 'Errore interno',
-'upload-file-error-text'  => 'Si è verificato un errore interno durante la creazione di un file temporaneo sul server. Contattare un amministratore di sistema.',
+'upload-file-error-text'  => 'Si è verificato un errore interno durante la creazione di un file temporaneo sul server. Contattare un [[Special:ListUsers/sysop|amministratore]] del sito.',
 'upload-misc-error'       => "Errore non identificato per l'upload",
-'upload-misc-error-text'  => 'Si è verificato un errore non identificato durante il caricamento del file. Verificare che la URL sia corretta e accessibile e provare di nuovo. Se il problema persiste, contattare un amministratore di sistema.',
+'upload-misc-error-text'  => 'Si è verificato un errore non identificato durante il caricamento del file. Verificare che la URL sia corretta e accessibile e provare di nuovo. Se il problema persiste, contattare un [[Special:ListUsers/sysop|amministratore]] del sito.',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6'       => 'URL non raggiungibile',
@@ -1241,20 +1415,21 @@ PICT # misc.
 'upload_source_url'  => ' (una URL corretta e accessibile)',
 'upload_source_file' => ' (un file sul proprio computer)',
 
-# Special:ImageList
-'imagelist-summary'     => "Questa pagina speciale mostra tutti i file caricati.
+# Special:ListFiles
+'listfiles-summary'     => "Questa pagina speciale mostra tutti i file caricati.
 I file caricati più di recente vengono mostrati all'inizio della lista.
 Per modificare l'ordinamento, fare clic sull'intestazione della colonna prescelta.",
-'imagelist_search_for'  => 'Ricerca immagini per nome:',
+'listfiles_search_for'  => 'Ricerca immagini per nome:',
 'imgfile'               => 'file',
-'imagelist'             => 'Elenco dei file',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Utente',
-'imagelist_size'        => 'Dimensione in byte',
-'imagelist_description' => 'Descrizione',
-
-# Image description page
+'listfiles'             => 'Elenco dei file',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Utente',
+'listfiles_size'        => 'Dimensione in byte',
+'listfiles_description' => 'Descrizione',
+'listfiles_count'       => 'Versioni',
+
+# File description page
 'filehist'                       => 'Cronologia del file',
 'filehist-help'                  => 'Fare clic su un gruppo data/ora per vedere il file come si presentava nel momento indicato.',
 'filehist-deleteall'             => 'cancella tutto',
@@ -1262,19 +1437,25 @@ Per modificare l'ordinamento, fare clic sull'intestazione della colonna prescelt
 'filehist-revert'                => 'ripristina',
 'filehist-current'               => 'corrente',
 'filehist-datetime'              => 'Data/Ora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura della versione delle $1',
+'filehist-nothumb'               => 'Nessuna miniatura',
 'filehist-user'                  => 'Utente',
 'filehist-dimensions'            => 'Dimensioni',
 'filehist-filesize'              => 'Dimensione del file',
 'filehist-comment'               => 'Oggetto',
-'imagelinks'                     => "Collegamenti all'immagine",
-'linkstoimage'                   => "{{PLURAL:$1|La seguente pagina contiene|Le seguenti $1 pagine contengono}} collegamenti all'immagine:",
-'nolinkstoimage'                 => "Nessuna pagina contiene collegamenti all'immagine.",
+'imagelinks'                     => 'Collegamenti al file',
+'linkstoimage'                   => '{{PLURAL:$1|La seguente pagina contiene|Le seguenti $1 pagine contengono}} collegamenti al file:',
+'linkstoimage-more'              => 'Più di $1 {{PLURAL:$1|pagina punta|pagine puntano}} a questo file.
+Di seguito sono elencate solo {{PLURAL:$1|la prima pagina che punta|le prime $1 pagine che puntano}} a questo file.
+È disponibile un [[Special:WhatLinksHere/$2|elenco completo]].',
+'nolinkstoimage'                 => 'Nessuna pagina contiene collegamenti al file.',
 'morelinkstoimage'               => 'Visualizza [[Special:WhatLinksHere/$1|altri link]] a questo file.',
 'redirectstofile'                => '{{PLURAL:$1|Il seguente|I seguenti $1}} file {{PLURAL:$1|è|sono}} un redirect a questo file:',
-'duplicatesoffile'               => '{{PLURAL:$1|Il seguente|I seguenti $1}} file {{PLURAL:$1|è un duplicato|sono duplicati}} di questo file:',
+'duplicatesoffile'               => '{{PLURAL:$1|Il seguente file è un duplicato|I seguenti $1 file sono duplicati}} di questo file ([[Special:FileDuplicateSearch/$2|ulteriori dettagli]]):',
 'sharedupload'                   => 'Questo file è un upload condiviso; può essere quindi utilizzato da più progetti wiki.',
 'shareduploadwiki'               => 'Si veda $1 per ulteriori informazioni.',
-'shareduploadwiki-desc'          => 'La descrizione che appare in quella sede, sulla relativa $1, viene mostrata di seguito.',
+'shareduploadwiki-desc'          => 'La descrizione che appare sulla relativa $1 viene mostrata di seguito.',
 'shareduploadwiki-linktext'      => 'pagina di descrizione del file',
 'shareduploadduplicate'          => "Questo file è un duplicato di $1, presente nell'archivio condiviso.",
 'shareduploadduplicate-linktext' => 'un altro file',
@@ -1298,7 +1479,7 @@ Per modificare l'ordinamento, fare clic sull'intestazione della colonna prescelt
 # File deletion
 'filedelete'                  => 'Cancella $1',
 'filedelete-legend'           => 'Cancella il file',
-'filedelete-intro'            => "Stai per cancellare '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Stai per cancellare il file '''[[Media:$1|$1]]''' con tutta la sua cronologia.",
 'filedelete-intro-old'        => "Stai cancellando la versione di '''[[Media:$1|$1]]''' del [$4 $2, $3].",
 'filedelete-comment'          => 'Motivo della cancellazione:',
 'filedelete-submit'           => 'Cancella',
@@ -1306,7 +1487,6 @@ Per modificare l'ordinamento, fare clic sull'intestazione della colonna prescelt
 'filedelete-success-old'      => "La versione del file '''[[Media:$1|$1]]''' del $2, $3  è stata cancellata.",
 'filedelete-nofile'           => "Non esiste un file '''$1'''.",
 'filedelete-nofile-old'       => "In archivio non ci sono versioni di '''$1''' con le caratteristiche indicate",
-'filedelete-iscurrent'        => 'Stai provando a cancellare la versione più recente di questo file. Per cortesia, prima riportalo ad una versione precedente.',
 'filedelete-otherreason'      => 'Altra motivazione o motivazione aggiuntiva:',
 'filedelete-reason-otherlist' => 'Altra motivazione',
 'filedelete-reason-dropdown'  => '*Motivazioni più comuni per la cancellazione
@@ -1333,26 +1513,31 @@ Per modificare l'ordinamento, fare clic sull'intestazione della colonna prescelt
 
 # Random page
 'randompage'         => 'Una pagina a caso',
-'randompage-nopages' => 'Nessuna pagina nel namespace selezionato.',
+'randompage-nopages' => 'Non ci sono pagine nel namespace "$1".',
 
 # Random redirect
 'randomredirect'         => 'Un redirect a caso',
-'randomredirect-nopages' => 'Nessun redirect nel namespace selezionato.',
+'randomredirect-nopages' => 'Non ci sono redirect nel namespace "$1".',
 
 # Statistics
-'statistics'             => 'Statistiche',
-'sitestats'              => 'Statistiche relative a {{SITENAME}}',
-'userstats'              => 'Statistiche relative agli utenti',
-'sitestatstext'          => "Il database contiene complessivamente '''\$1''' {{PLURAL:\$1|pagina|pagine}}.
-Questa cifra comprende anche le pagine di discussione, quelle di servizio di {{SITENAME}}, le voci più esigue (\"stub\"), i redirect e altre pagine che probabilmente non vanno considerate tra i contenuti del sito. Escludendo le pagine sopra descritte, ve ne {{PLURAL:\$2|è '''1'''|sono '''\$2'''}} di contenuti veri e propri.
-
-{{PLURAL:\$8|È stato inoltre caricato|Sono stati inoltre caricati}} '''\$8''' file.
-
-Dall'installazione del sito sino a questo momento {{PLURAL:\$3|è stata visitata '''1''' pagina|sono state visitate '''\$3''' pagine}} ed {{PLURAL:\$4|eseguita '''1''' modifica|eseguite '''\$4''' modifiche}}, pari a una media di '''\$5''' modifiche per pagina e '''\$6''' richieste di lettura per ciascuna modifica.
-
-La [http://www.mediawiki.org/wiki/Manual:Job_queue coda dei processi] da eseguire in background contiene {{PLURAL:\$7|'''1''' elemento|'''\$7''' elementi}}.",
-'userstatstext'          => "In questo momento {{PLURAL:$1|è registrato '''1''' utente|sono registrati '''$1''' utenti}}. Il gruppo $5 è composto da '''$2''' {{PLURAL:$2|utente|utenti}}, pari al '''$4%''' dei registrati.",
-'statistics-mostpopular' => 'Pagine più visitate',
+'statistics'                   => 'Statistiche',
+'statistics-header-pages'      => 'Statistiche relative alle pagine',
+'statistics-header-edits'      => 'Statistiche relative alle modifiche',
+'statistics-header-views'      => 'Statistiche relative alle visualizzazioni',
+'statistics-header-users'      => 'Statistiche relative agli utenti',
+'statistics-articles'          => 'Pagine di contenuti',
+'statistics-pages'             => 'Pagine',
+'statistics-pages-desc'        => 'Tutte le pagine della wiki, comprese le pagina di discussione, i redirect, ecc.',
+'statistics-files'             => 'File caricati',
+'statistics-edits'             => "Modifiche a partire dall'installazione di {{SITENAME}}",
+'statistics-edits-average'     => 'Media delle modifiche per pagina',
+'statistics-views-total'       => 'Visualizzazioni totali',
+'statistics-views-peredit'     => 'Visualizzazioni per modifica',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Coda dei processi] da eseguire in background',
+'statistics-users'             => '[[Special:ListUsers|Utenti]] registrati',
+'statistics-users-active'      => 'Utenti attivi',
+'statistics-users-active-desc' => "Utenti che hanno effettuato un'azione {{PLURAL:$1|nell'ultimo giorno|negli ultimi $1 giorni}}",
+'statistics-mostpopular'       => 'Pagine più visitate',
 
 'disambiguations'      => 'Pagine di disambiguazione',
 'disambiguationspage'  => 'Template:Disambigua',
@@ -1395,7 +1580,8 @@ Ciascuna riga contiene i collegamenti al primo ed al secondo redirect, oltre all
 'popularpages'            => 'Pagine più visitate',
 'wantedcategories'        => 'Categorie richieste',
 'wantedpages'             => 'Pagine più richieste',
-'missingfiles'            => 'File inesistente',
+'wantedfiles'             => 'File richiesti',
+'wantedtemplates'         => 'Template richiesti',
 'mostlinked'              => 'Pagine più richiamate',
 'mostlinkedcategories'    => 'Categorie più richiamate',
 'mostlinkedtemplates'     => 'Template più utilizzati',
@@ -1406,26 +1592,29 @@ Ciascuna riga contiene i collegamenti al primo ed al secondo redirect, oltre all
 'shortpages'              => 'Pagine più corte',
 'longpages'               => 'Pagine più lunghe',
 'deadendpages'            => 'Pagine senza uscita',
-'deadendpagestext'        => 'Le pagine indicate di seguito sono prive di collegamenti verso altre pagine del sito.',
+'deadendpagestext'        => 'Le pagine indicate di seguito sono prive di collegamenti verso altre pagine di {{SITENAME}}.',
 'protectedpages'          => 'Pagine protette',
 'protectedpages-indef'    => 'Solo protezioni infinite',
+'protectedpages-cascade'  => 'Solo protezioni ricorsive',
 'protectedpagestext'      => 'Di seguito viene presentato un elenco di pagine protette, di cui è impedita la modifica o lo spostamento',
 'protectedpagesempty'     => 'Al momento non vi sono pagine protette',
 'protectedtitles'         => 'Titoli protetti',
 'protectedtitlestext'     => 'Non è possibile creare pagine con i titoli elencati di seguito',
 'protectedtitlesempty'    => 'Al momento non esistono titoli protetti con i parametri specificati.',
 'listusers'               => 'Elenco degli utenti',
+'listusers-editsonly'     => 'Mostra solo utenti con dei contributi',
+'usereditcount'           => '$1 {{PLURAL:$1|contributo|contributi}}',
 'newpages'                => 'Pagine più recenti',
 'newpages-username'       => 'Nome utente:',
 'ancientpages'            => 'Pagine meno recenti',
 'move'                    => 'Sposta',
 'movethispage'            => 'Sposta questa pagina',
-'unusedimagestext'        => 'In questo elenco sono presenti i file caricati e non usati nel sito. Potrebbero essere presenti immagini che sono usate da altri siti con un collegamento diretto.',
+'unusedimagestext'        => "Si noti che è possibile realizzare collegamenti ai file da altri siti, usando direttamente la URL; questi potrebbero quindi essere utilizzati anche se compaiono nell'elenco.",
 'unusedcategoriestext'    => 'Le pagine delle categorie indicate di seguito sono state create ma non contengono nessuna pagina né sottocategoria.',
 'notargettitle'           => 'Dati mancanti',
 'notargettext'            => "Non è stata indicata una pagina o un utente in relazione al quale eseguire l'operazione richiesta.",
 'nopagetitle'             => 'La pagina di destinazione non esiste',
-'nopagetext'              => 'La pagina che hai richiesto non esiste.',
+'nopagetext'              => 'La pagina richiesta non esiste.',
 'pager-newer-n'           => '{{PLURAL:$1|1 più recente|$1 più recenti}}',
 'pager-older-n'           => '{{PLURAL:$1|1 meno recente|$1 meno recenti}}',
 'suppress'                => 'Oversight',
@@ -1436,16 +1625,16 @@ Ciascuna riga contiene i collegamenti al primo ed al secondo redirect, oltre all
 'booksources-isbn'          => 'Codice ISBN:',
 'booksources-go'            => 'Vai',
 'booksources-text'          => 'Di seguito viene presentato un elenco di collegamenti verso siti esterni che vendono libri nuovi e usati, attraverso i quali è possibile ottenere maggiori informazioni sul testo cercato.',
+'booksources-invalid-isbn'  => "L'ISBN inserito sembra non essere valido; verificare che non siano stati commessi errori nel copiarlo dalla fonte originale.",
 
 # Special:Log
-'specialloguserlabel'  => 'Azione effettuata da:',
-'speciallogtitlelabel' => 'Azione effettuata su:',
+'specialloguserlabel'  => 'Utente:',
+'speciallogtitlelabel' => 'Titolo:',
 'log'                  => 'Log',
 'all-logs-page'        => 'Tutti i registri',
-'log-search-legend'    => 'Ricerca nei registri',
-'log-search-submit'    => 'Vai',
-'alllogstext'          => "Presentazione unificata di tutti i registri di {{SITENAME}}. Puoi restringere i criteri di ricerca selezionando il tipo di registro, l'utente che ha eseguito l'azione, e/o la pagina interessata (entrambi i campi sono sensibili al maiuscolo/minuscolo).",
-'logempty'             => 'Il log non contiene elementi corrispondenti alla ricerca.',
+'alllogstext'          => "Presentazione unificata di tutti i registri di {{SITENAME}}. 
+È possibile restringere i criteri di ricerca selezionando il tipo di registro, l'utente che ha eseguito l'azione, e/o la pagina interessata (entrambi i campi sono sensibili al maiuscolo/minuscolo).",
+'logempty'             => 'Il registro non contiene elementi corrispondenti alla ricerca.',
 'log-title-wildcard'   => 'Ricerca dei titoli che iniziano con',
 
 # Special:AllPages
@@ -1454,7 +1643,8 @@ Ciascuna riga contiene i collegamenti al primo ed al secondo redirect, oltre all
 'nextpage'          => 'Pagina successiva ($1)',
 'prevpage'          => 'Pagina precedente ($1)',
 'allpagesfrom'      => 'Mostra le pagine a partire da:',
-'allarticles'       => 'Tutte le voci',
+'allpagesto'        => 'Mostra le pagine fino a:',
+'allarticles'       => 'Tutte le pagine',
 'allinnamespace'    => 'Tutte le pagine del namespace $1',
 'allnotinnamespace' => 'Tutte le pagine, escluso il namespace $1',
 'allpagesprev'      => 'Precedenti',
@@ -1473,40 +1663,68 @@ Vedi anche le [[Special:WantedCategories|categorie richieste]].',
 'special-categories-sort-count' => 'ordina per numero',
 'special-categories-sort-abc'   => 'ordina alfabeticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contributi utente cancellati',
+
+# Special:LinkSearch
+'linksearch'       => 'Collegamenti esterni',
+'linksearch-pat'   => 'Pattern di ricerca:',
+'linksearch-ns'    => 'Namespace:',
+'linksearch-ok'    => 'Cerca',
+'linksearch-text'  => 'È possibile fare uso di metacaratteri, ad es. "*.wikipedia.org".<br />
+Protocolli supportati: <tt>$1</tt>',
+'linksearch-line'  => '$1 presente nella pagina $2',
+'linksearch-error' => "I metacaratteri possono essere usati solo all'inizio dell'indirizzo.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostra gli utenti a partire da:',
 'listusers-submit'   => 'Mostra',
 'listusers-noresult' => 'Nessun utente risponde ai criteri impostati.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Nuovi utenti',
+'newuserlogpagetext'          => 'Di seguito sono elencate le creazioni di nuovi account.',
+'newuserlog-byemail'          => 'password inviata via mail',
+'newuserlog-create-entry'     => 'si è appena registrato/a',
+'newuserlog-create2-entry'    => 'ha registrato il nuovo nome utente $1',
+'newuserlog-autocreate-entry' => 'account creato automaticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Diritti del gruppo utente',
-'listgrouprights-summary'  => "Di seguito sono elencati i gruppi utente definiti per questo wiki, con i diritti d'accesso loro associati.
+'listgrouprights'                 => 'Diritti del gruppo utente',
+'listgrouprights-summary'         => "Di seguito sono elencati i gruppi utente definiti per questo sito, con i diritti d'accesso loro associati.
 Potrebbero esserci [[{{MediaWiki:Listgrouprights-helppage}}|ulteriori informazioni]] sui diritti individuali.",
-'listgrouprights-group'    => 'Gruppo',
-'listgrouprights-rights'   => 'Diritti',
-'listgrouprights-helppage' => 'Help:Diritti del gruppo',
-'listgrouprights-members'  => '(Elenco dei membri)',
+'listgrouprights-group'           => 'Gruppo',
+'listgrouprights-rights'          => 'Diritti',
+'listgrouprights-helppage'        => 'Help:Diritti del gruppo',
+'listgrouprights-members'         => '(Elenco dei membri)',
+'listgrouprights-addgroup'        => 'Può aggiungere {{PLURAL:$2|il gruppo|i gruppi}}: $1',
+'listgrouprights-removegroup'     => 'Può rimuovere {{PLURAL:$2|il gruppo|i gruppi}}: $1',
+'listgrouprights-addgroup-all'    => 'Può aggiungere a tutti i gruppi',
+'listgrouprights-removegroup-all' => 'Può rimuovere tutti i gruppi',
 
 # E-mail user
-'mailnologin'     => 'Nessun indirizzo cui inviare il messaggio',
-'mailnologintext' => 'Per inviare messaggi e-mail ad altri utenti è necessario [[Special:UserLogin|accedere al sito]] e aver registrato un indirizzo valido nelle proprie [[Special:Preferences|preferenze]].',
-'emailuser'       => "Scrivi all'utente",
-'emailpage'       => "Invia un messaggio e-mail all'utente",
-'emailpagetext'   => 'È possibile utilizzare il modulo seguente per inviare un\'email a questo utente. L\'indirizzo indicato nelle [[Special:Preferences|preferenze]] del mittente apparirà nel campo "Da:" del messaggio per consentire al destinatario di rispondere direttamente.',
-'usermailererror' => "L'oggetto mail ha restituito l'errore:",
-'defemailsubject' => 'Messaggio da {{SITENAME}}',
-'noemailtitle'    => 'Nessun indirizzo e-mail',
-'noemailtext'     => 'Questo utente non ha indicato un indirizzo e-mail valido, oppure ha scelto di non ricevere messaggi di posta elettronica dagli altri utenti.',
-'emailfrom'       => 'Da:',
-'emailto'         => 'A:',
-'emailsubject'    => 'Oggetto:',
-'emailmessage'    => 'Messaggio:',
-'emailsend'       => 'Invia',
-'emailccme'       => 'Invia in copia al mio indirizzo.',
-'emailccsubject'  => 'Copia del messaggio inviato a $1: $2',
-'emailsent'       => 'Messaggio inviato',
-'emailsenttext'   => 'Il messaggio e-mail è stato inviato.',
-'emailuserfooter' => 'Questa e-mail è stata inviata da $1 a $2 attraverso la funzione "Invia un messaggio e-mail all\'utente" su {{SITENAME}}.',
+'mailnologin'      => 'Nessun indirizzo cui inviare il messaggio',
+'mailnologintext'  => 'Per inviare messaggi e-mail ad altri utenti è necessario [[Special:UserLogin|accedere al sito]] e aver registrato un indirizzo valido nelle proprie [[Special:Preferences|preferenze]].',
+'emailuser'        => "Scrivi all'utente",
+'emailpage'        => "Invia un messaggio e-mail all'utente",
+'emailpagetext'    => 'Usare il modulo sottostante per inviare un messaggio e-mail all\'utente indicato. L\'indirizzo specificato nelle [[Special:Preferences|preferenze]] del mittente apparirà nel campo "Da:" del messaggio per consentire al destinatario di rispondere direttamente.',
+'usermailererror'  => "L'oggetto mail ha restituito l'errore:",
+'defemailsubject'  => 'Messaggio da {{SITENAME}}',
+'noemailtitle'     => 'Nessun indirizzo e-mail',
+'noemailtext'      => 'Questo utente non ha indicato un indirizzo e-mail valido.',
+'nowikiemailtitle' => 'E-mail non permessa',
+'nowikiemailtext'  => 'Questo utente ha scelto di non ricevere messaggi di posta elettronica dagli altri utenti.',
+'email-legend'     => 'Invia un messaggio e-mail a un altro utente di {{SITENAME}}',
+'emailfrom'        => 'Da:',
+'emailto'          => 'A:',
+'emailsubject'     => 'Oggetto:',
+'emailmessage'     => 'Messaggio:',
+'emailsend'        => 'Invia',
+'emailccme'        => 'Invia in copia al mio indirizzo.',
+'emailccsubject'   => 'Copia del messaggio inviato a $1: $2',
+'emailsent'        => 'Messaggio inviato',
+'emailsenttext'    => 'Il messaggio e-mail è stato inviato.',
+'emailuserfooter'  => 'Questa e-mail è stata inviata da $1 a $2 attraverso la funzione "Invia un messaggio e-mail all\'utente" su {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Osservati speciali',
@@ -1519,11 +1737,9 @@ Potrebbero esserci [[{{MediaWiki:Listgrouprights-helppage}}|ulteriori informazio
 'addedwatch'           => 'Pagina aggiunta alla lista degli osservati speciali',
 'addedwatchtext'       => "La pagina \"[[:\$1]]\" è stata aggiunta alla propria [[Special:Watchlist|lista degli osservati speciali]]. 
 D'ora in poi, le modifiche apportate alla pagina e alla sua discussione verranno elencate in quella sede;
-il titolo della pagina apparirà in '''grassetto''' nella pagina delle [[Special:RecentChanges|ultime modifiche]] per renderlo più visibile. 
-
-Se in un secondo tempo si desidera eliminare la pagina dalla lista degli osservati speciali, fare clic su \"non seguire\" nella barra in alto.",
+il titolo della pagina apparirà in '''grassetto''' nella pagina delle [[Special:RecentChanges|ultime modifiche]] per renderlo più visibile.",
 'removedwatch'         => 'Pagina eliminata dalla lista degli osservati speciali',
-'removedwatchtext'     => 'La pagina  "[[:$1]]" è stata eliminata dalla lista degli osservati speciali.',
+'removedwatchtext'     => 'La pagina "[[:$1]]" è stata eliminata dalla lista degli osservati speciali.',
 'watch'                => 'Segui',
 'watchthispage'        => 'Segui questa pagina',
 'unwatch'              => 'Non seguire',
@@ -1540,12 +1756,7 @@ Se in un secondo tempo si desidera eliminare la pagina dalla lista degli osserva
 'iteminvalidname'      => "Problemi con la pagina '$1', nome non valido...",
 'wlnote'               => "Di seguito {{PLURAL:$1|è elencata la modifica più recente apportata|sono elencate le '''$1''' modifiche più recenti apportate}} {{PLURAL:$2|nella scorsa ora|nelle scorse '''$2''' ore}}.",
 'wlshowlast'           => 'Mostra le ultime $1 ore $2 giorni $3',
-'watchlist-show-bots'  => 'Mostra le modifiche dei bot',
-'watchlist-hide-bots'  => 'Nascondi le modifiche dei bot',
-'watchlist-show-own'   => 'Mostra le mie modifiche',
-'watchlist-hide-own'   => 'Nascondi le mie modifiche',
-'watchlist-show-minor' => 'Mostra le modifiche minori',
-'watchlist-hide-minor' => 'Nascondi le modifiche minori',
+'watchlist-options'    => 'Opzioni osservati speciali',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Aggiunta agli osservati speciali...',
@@ -1558,7 +1769,7 @@ Se in un secondo tempo si desidera eliminare la pagina dalla lista degli osserva
 'changed'                      => 'modificata',
 'created'                      => 'creata',
 'enotif_subject'               => 'La pagina $PAGETITLE di {{SITENAME}} è stata $CHANGEDORCREATED da $PAGEEDITOR',
-'enotif_lastvisited'           => 'Consulta $1 per vedere tutte le modifiche dalla tua ultima visita.',
+'enotif_lastvisited'           => 'Consultare $1 per vedere tutte le modifiche dalla tua ultima visita.',
 'enotif_lastdiff'              => 'Vedere $1 per visualizzare la modifica.',
 'enotif_anon_editor'           => 'utente anonimo $1',
 'enotif_body'                  => 'Gentile $WATCHINGUSERNAME,
@@ -1584,75 +1795,96 @@ Per modificare le impostazioni della lista degli osservati speciali, visita
 Per dare il tuo feedback e ricevere ulteriore assistenza:
 {{fullurl:Help:Aiuto}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Cancella pagina',
-'confirm'                     => 'Conferma',
-'excontent'                   => "il contenuto era: '$1'",
-'excontentauthor'             => "il contenuto era: '$1' (e l'unico contributore era '$2')",
-'exbeforeblank'               => "Il contenuto prima dello svuotamento era: '$1'",
-'exblank'                     => 'la pagina era vuota',
-'delete-confirm'              => 'Cancella "$1"',
-'delete-legend'               => 'Cancella',
-'historywarning'              => 'Attenzione! La pagina che si sta per cancellare ha una cronologia:',
-'confirmdeletetext'           => 'Stai per cancellare permanentemente dal database una pagina o una immagine, insieme a tutta la sua cronologia. Per cortesia, conferma che è tua intenzione procedere a tale cancellazione, che hai piena consapevolezza delle conseguenze della tua azione e che essa è conforme alle linee guida stabilite in [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Azione completata',
-'deletedtext'                 => 'La pagina "$1" è stata cancellata. 
+# Delete
+'deletepage'             => 'Cancella pagina',
+'confirm'                => 'Conferma',
+'excontent'              => "il contenuto era: '$1'",
+'excontentauthor'        => "il contenuto era: '$1' (e l'unico contributore era '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "Il contenuto prima dello svuotamento era: '$1'",
+'exblank'                => 'la pagina era vuota',
+'delete-confirm'         => 'Cancella "$1"',
+'delete-legend'          => 'Cancella',
+'historywarning'         => 'Attenzione! La pagina che si sta per cancellare ha una cronologia:',
+'confirmdeletetext'      => 'Stai per cancellare una pagina con tutta la sua cronologia. Per cortesia, conferma che è tua intenzione procedere a tale cancellazione, che hai piena consapevolezza delle conseguenze della tua azione e che essa è conforme alle linee guida stabilite in [[{{MediaWiki:Policy-url}}]].',
+'actioncomplete'         => 'Azione completata',
+'deletedtext'            => 'La pagina "<nowiki>$1</nowiki>" è stata cancellata. 
 Consultare il log delle $2 per un elenco delle pagine cancellate di recente.',
-'deletedarticle'              => 'ha cancellato "[[$1]]"',
-'suppressedarticle'           => 'soppresso "[[$1]]"',
-'dellogpage'                  => 'Cancellazioni',
-'dellogpagetext'              => 'Di seguito sono elencate le pagine cancellate di recente.',
-'deletionlog'                 => 'cancellazioni',
-'reverted'                    => 'Ripristinata la versione precedente',
-'deletecomment'               => 'Motivo della cancellazione:',
-'deleteotherreason'           => 'Altra motivazione o motivazione aggiuntiva:',
-'deletereasonotherlist'       => 'Altra motivazione',
-'deletereason-dropdown'       => "*Motivazioni più comuni per la cancellazione
+'deletedarticle'         => 'ha cancellato "[[$1]]"',
+'suppressedarticle'      => 'ha soppresso "[[$1]]"',
+'dellogpage'             => 'Cancellazioni',
+'dellogpagetext'         => 'Di seguito sono elencate le pagine cancellate di recente.',
+'deletionlog'            => 'cancellazioni',
+'reverted'               => 'Ripristinata la versione precedente',
+'deletecomment'          => 'Motivo della cancellazione:',
+'deleteotherreason'      => 'Altra motivazione o motivazione aggiuntiva:',
+'deletereasonotherlist'  => 'Altra motivazione',
+'deletereason-dropdown'  => "*Motivazioni più comuni per la cancellazione
 ** Richiesta dell'autore
 ** Violazione di copyright
 ** Vandalismo",
-'delete-edit-reasonlist'      => 'Modifica i motivi di cancellazione',
-'delete-toobig'               => 'La cronologia di questa pagina è molto lunga (oltre $1 {{PLURAL:$1|revisione|revisioni}}). La sua cancellazione è stata limitata per evitare di creare accidentalmente dei problemi di funzionamento al database di {{SITENAME}}.',
-'delete-warning-toobig'       => 'La cronologia di questa pagina è molto lunga (oltre $1 {{PLURAL:$1|revisione|revisioni}}). La sua cancellazione può creare dei problemi di funzionamento al database di {{SITENAME}}; procedere con cautela.',
-'rollback'                    => 'Annulla le modifiche',
-'rollback_short'              => 'Rollback',
-'rollbacklink'                => 'rollback',
-'rollbackfailed'              => 'Rollback fallito',
-'cantrollback'                => "Impossibile annullare le modifiche; l'utente che le ha effettuate è l'unico ad aver contribuito alla pagina.",
-'alreadyrolled'               => 'Non è possibile annullare le modifiche apportate alla pagina [[:$1]] da parte di [[User:$2|$2]] ([[User talk:$2|discussione]]); un altro utente ha già modificato la pagina oppure ha effettuato il rollback.
-
-La modifica più recente alla pagina è stata apportata da [[User:$3|$3]] ([[User talk:$3|discussione]]).',
-'editcomment'                 => 'Il commento alla modifica era: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Annullate le modifiche di [[Special:Contributions/$2|$2]] ([[User talk:$2|discussione]]), riportata alla versione precedente di [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "Annullate le modifiche di $1; pagina riportata all'ultima versione di $2.",
-'sessionfailure'              => "Si è verificato un problema nella sessione che identifica l'accesso; il sistema non ha eseguito il comando impartito per precauzione. Tornare alla pagina precedente con il tasto 'Indietro' del proprio browser, ricaricare la pagina e riprovare.",
+'delete-edit-reasonlist' => 'Modifica i motivi di cancellazione',
+'delete-toobig'          => 'La cronologia di questa pagina è molto lunga (oltre $1 {{PLURAL:$1|revisione|revisioni}}). La sua cancellazione è stata limitata per evitare di creare accidentalmente dei problemi di funzionamento al database di {{SITENAME}}.',
+'delete-warning-toobig'  => 'La cronologia di questa pagina è molto lunga (oltre $1 {{PLURAL:$1|revisione|revisioni}}). La sua cancellazione può creare dei problemi di funzionamento al database di {{SITENAME}}; procedere con cautela.',
+
+# Rollback
+'rollback'         => 'Annulla le modifiche',
+'rollback_short'   => 'Rollback',
+'rollbacklink'     => 'rollback',
+'rollbackfailed'   => 'Rollback fallito',
+'cantrollback'     => "Impossibile annullare le modifiche; l'utente che le ha effettuate è l'unico ad aver contribuito alla pagina.",
+'alreadyrolled'    => 'Non è possibile annullare le modifiche apportate alla pagina [[:$1]] da parte di [[User:$2|$2]] ([[User talk:$2|discussione]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); un altro utente ha già modificato la pagina oppure ha effettuato il rollback.
+
+La modifica più recente alla pagina è stata apportata da [[User:$3|$3]] ([[User talk:$3|discussione]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "L'oggetto della modifica era: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Annullate le modifiche di [[Special:Contributions/$2|$2]] ([[User talk:$2|discussione]]), riportata alla versione precedente di [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "Annullate le modifiche di $1; pagina riportata all'ultima versione di $2.",
+'sessionfailure'   => "Si è verificato un problema nella sessione che identifica l'accesso; il sistema non ha eseguito il comando impartito per precauzione. Tornare alla pagina precedente con il tasto 'Indietro' del proprio browser, ricaricare la pagina e riprovare.",
+
+# Protect
 'protectlogpage'              => 'Protezioni',
-'protectlogtext'              => 'Di seguito sono elencate le azioni di protezione e sblocco delle pagine.',
+'protectlogtext'              => "Di seguito sono elencate le azioni di protezione e sblocco delle pagine.
+Consultare la [[Special:ProtectedPages|lista delle pagine protette]] per l'elenco delle protezioni di pagina attive.",
 'protectedarticle'            => 'ha protetto "[[$1]]"',
 'modifiedarticleprotection'   => 'ha modificato il livello di protezione di "[[$1]]"',
 'unprotectedarticle'          => 'ha sprotetto [[$1]]',
-'protect-title'               => 'Protezione di "$1"',
+'movedarticleprotection'      => 'ha spostato la protezione da "[[$2]]" a "[[$1]]"',
+'protect-title'               => 'Modifica del livello di protezione per "$1"',
+'prot_1movedto2'              => 'ha spostato [[$1]] a [[$2]]',
 'protect-legend'              => 'Conferma la protezione',
 'protectcomment'              => 'Motivo della protezione:',
 'protectexpiry'               => 'Scadenza:',
 'protect_expiry_invalid'      => 'Scadenza non valida.',
 'protect_expiry_old'          => 'Scadenza già trascorsa.',
 'protect-unchain'             => 'Sblocca lo spostamento',
-'protect-text'                => 'Questo modulo consente di vedere e modificare il livello di protezione per la pagina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Non è possibile modificare i livelli di protezione quando è attivo un blocco. Le impostazioni correnti per la pagina sono <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Impossibile modificare i livelli di protezione durante un blocco del database.
-Le impostazioni correnti per la pagina sono <strong>$1</strong>:',
-'protect-locked-access'       => 'Non si dispone dei permessi necessari per modificare i livelli di protezione della pagina.
-Le impostazioni correnti per la pagina sono <strong>$1</strong>:',
+'protect-text'                => "Questo modulo consente di vedere e modificare il livello di protezione per la pagina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Non è possibile modificare i livelli di protezione quando è attivo un blocco. Le impostazioni correnti per la pagina sono '''$1''':",
+'protect-locked-dblock'       => "Impossibile modificare i livelli di protezione durante un blocco del database.
+Le impostazioni correnti per la pagina sono '''$1''':",
+'protect-locked-access'       => "Non si dispone dei permessi necessari per modificare i livelli di protezione della pagina.
+Le impostazioni correnti per la pagina sono '''$1''':",
 'protect-cascadeon'           => 'Al momento questa pagina è bloccata perché viene inclusa {{PLURAL:$1|nella pagina indicata di seguito, per la quale|nelle pagine indicate di seguito, per le quali}} è attiva la protezione ricorsiva. È possibile modificare il livello di protezione individuale della pagina, ma le impostazioni derivanti dalla protezione ricorsiva non saranno modificate.',
-'protect-default'             => '(predefinito)',
+'protect-default'             => 'Autorizza tutti gli utenti',
 'protect-fallback'            => 'È richiesto il permesso "$1"',
-'protect-level-autoconfirmed' => 'Solo utenti registrati',
+'protect-level-autoconfirmed' => 'Blocca gli utenti nuovi e i non registrati',
 'protect-level-sysop'         => 'Solo amministratori',
 'protect-summary-cascade'     => 'ricorsiva',
 'protect-expiring'            => 'scadenza: $1 (UTC)',
-'protect-cascade'             => 'Protezione ricorsiva: protegge tutte le pagine incluse in questa pagina. Abilitare l\'opzione solo dopo aver controllato gli include ed esclusivamente se sei sicuro di cosa stai facendo. La scadenza della protezione, diversa da infinito, si può specificare \'\'\'in lingua inglese\'\'\' usando il formato standard GNU, descritto nel manuale di tar (per esempio: "1 hour", "2 days", "next Wednesday", "1 January 2017"). In alternativa, la scadenza può essere "indefinite" o "infinite" (senza scadenza).',
+'protect-expiry-indefinite'   => 'infinito',
+'protect-cascade'             => 'Protezione ricorsiva (estende la protezione a tutte le pagine incluse in questa).',
 'protect-cantedit'            => 'Non è possibile modificare i livelli di protezione per la pagina in quanto non si dispone dei permessi necessari per modificare la pagina stessa.',
+'protect-othertime'           => 'Durata non in elenco:',
+'protect-othertime-op'        => 'durata non in elenco',
+'protect-existing-expiry'     => 'Scadenza attuale: $2, $3',
+'protect-otherreason'         => 'Altri motivi/dettagli:',
+'protect-otherreason-op'      => 'altri motivi/dettagli',
+'protect-dropdown'            => '*Motivi comuni di protezione
+** Reiterati vandalismi
+** Reiterati inserimenti di spam
+** Edit war
+** Pagina molto usata
+** Pagina archiviata',
+'protect-edit-reasonlist'     => 'Modifica i motivi per la protezione',
+'protect-expiry-options'      => '2 ore:2 hours,1 giorno:1 day,3 giorni:3 days,1 settimana:1 week,2 settimane:2 weeks,1 mese:1 month,3 mesi:3 months,6 mesi:6 months,1 anno:1 year,infinito:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permesso',
 'restriction-level'           => 'Livello di restrizione',
 'minimum-size'                => 'Dimensione minima',
@@ -1673,23 +1905,24 @@ Le impostazioni correnti per la pagina sono <strong>$1</strong>:',
 # Undelete
 'undelete'                     => 'Visualizza pagine cancellate',
 'undeletepage'                 => 'Visualizza e recupera le pagine cancellate',
-'undeletepagetitle'            => "'''Quanto segue è composto da revisioni cancellate di [[:$1]]'''.",
+'undeletepagetitle'            => "'''Quanto segue è composto da revisioni cancellate di [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Visualizza le pagine cancellate',
-'undeletepagetext'             => "Le pagine indicate di seguito sono state cancellate, ma sono ancora in archivio e pertanto possono essere recuperate. L'archivio può essere svuotato periodicamente.",
+'undeletepagetext'             => "{{PLURAL:$1|La pagina indicata di seguito è stata cancellata, ma è ancora in archivio e pertanto può essere recuperata|Le pagine indicate di seguito sono state cancellate, ma sono ancora in archivio e pertanto possono essere recuperate}}. L'archivio può essere svuotato periodicamente.",
 'undelete-fieldset-title'      => 'Recupera revisioni',
 'undeleteextrahelp'            => "Per recuperare l'intera cronologia della pagina, lasciare tutte le caselle deselezionate e fare clic su '''''Ripristina'''''. Per effettuare un ripristino selettivo, selezionare le caselle corrispondenti alle revisioni da ripristinare e fare clic su '''''Ripristina'''''. Facendo clic su '''''Reimposta''''' verranno deselezionate tutte le caselle e svuotato lo spazio per il commento.",
 'undeleterevisions'            => '{{PLURAL:$1|Una revisione|$1 revisioni}} in archivio',
-'undeletehistory'              => 'Recuperando questa pagina, tutte le sue revisioni verranno inserite di nuovo nella relativa cronologia. Se dopo la cancellazione è stata creata una nuova pagina con lo stesso titolo, le revisioni recuperate saranno inserite nella cronologia e la versione attualmente online della pagina non verrà modificata.',
+'undeletehistory'              => 'Recuperando questa pagina, tutte le sue revisioni verranno ripristinate nella relativa cronologia. Se dopo la cancellazione è stata creata una nuova pagina con lo stesso titolo, le revisioni recuperate saranno inserite nella cronologia precedente.',
 'undeleterevdel'               => "Il ripristino non verrà effettuato se determina la cancellazione parziale della versione corrente della pagina o del file interessato. In tal caso, è necessario rimuovere il segno di spunta o l'oscuramento dalle revisioni cancellate più recenti.",
 'undeletehistorynoadmin'       => "Questa pagina è stata cancellata. 
 Il motivo della cancellazione è mostrato qui sotto, assieme ai dettagli dell'utente che ha modificato questa pagina prima della cancellazione. 
 Il testo contenuto nelle revisioni cancellate è disponibile solo agli amministratori.",
-'undelete-revision'            => 'Revisione cancellata della pagina $1, inserita il $2 da $3:',
+'undelete-revision'            => 'Revisione cancellata della pagina $1, inserita il $4 alle $5 da $3:',
 'undeleterevision-missing'     => "Revisione errata o mancante. Il collegamento è errato oppure la revisione è stata già ripristinata o eliminata dall'archivio.",
 'undelete-nodiff'              => 'Non è stata trovata nessuna revisione precedente.',
 'undeletebtn'                  => 'Ripristina',
 'undeletelink'                 => 'ripristina',
 'undeletereset'                => 'Reimposta',
+'undeleteinvert'               => 'Inverti selezione',
 'undeletecomment'              => 'Commento:',
 'undeletedarticle'             => 'ha recuperato "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|Una revisione recuperata|$1 revisioni recuperate}}',
@@ -1698,12 +1931,12 @@ Il testo contenuto nelle revisioni cancellate è disponibile solo agli amministr
 'cannotundelete'               => 'Ripristino non riuscito; è possibile che la pagina sia già stata recuperata da un altro utente.',
 'undeletedpage'                => "<big>'''La pagina $1 è stata recuperata'''</big>
 
-Consulta il [[Special:Log/delete|log delle cancellazioni]] per vedere le cancellazioni e i recuperi più recenti.",
+Consultare il [[Special:Log/delete|log delle cancellazioni]] per vedere le cancellazioni e i recuperi più recenti.",
 'undelete-header'              => 'Consultare il [[Special:Log/delete|log delle cancellazioni]] per vedere le cancellazioni più recenti.',
 'undelete-search-box'          => 'Ricerca nelle pagine cancellate',
 'undelete-search-prefix'       => 'Mostra le pagine il cui titolo inizia con:',
 'undelete-search-submit'       => 'Cerca',
-'undelete-no-results'          => "Nessuna pagina corrispondente nell'archivio dele cancellazioni.",
+'undelete-no-results'          => "Nessuna pagina corrispondente nell'archivio delle cancellazioni.",
 'undelete-filename-mismatch'   => 'Impossibile annullare la cancellazione della revisione del file con timestamp $1: nome file non corrispondente.',
 'undelete-bad-store-key'       => 'Impossibile annullare la cancellazione della revisione del file con timestamp $1: file non disponibile prima della cancellazione.',
 'undelete-cleanup-error'       => 'Errore nella cancellazione del file di archivio non utilizzato "$1".',
@@ -1712,7 +1945,7 @@ Consulta il [[Special:Log/delete|log delle cancellazioni]] per vedere le cancell
 'undelete-error-long'          => 'Si sono verificati degli errori nel tentativo di annullare la cancellazione del file:
 
 $1',
-'undelete-show-file-confirm'   => 'Si desidera visualizzare la revisione cancellate del file "<nowiki>$1</nowiki>" del $2 alle $3?',
+'undelete-show-file-confirm'   => 'Si desidera visualizzare la versione cancellata del file "<nowiki>$1</nowiki>" del $2 alle $3?',
 'undelete-show-file-submit'    => 'Sì',
 
 # Namespace form on various pages
@@ -1721,26 +1954,27 @@ $1',
 'blanknamespace' => '(Principale)',
 
 # Contributions
-'contributions' => 'Contributi utente',
-'mycontris'     => 'Miei contributi',
-'contribsub2'   => 'Per $1 ($2)',
-'nocontribs'    => 'Non sono state trovate modifiche che soddisfino i criteri di ricerca.',
-'uctop'         => '(ultima per la pagina)',
-'month'         => 'Dal mese (e precedenti):',
-'year'          => "Dall'anno (e precedenti):",
-
-'sp-contributions-newbies'     => 'Mostra solo i contributi dei nuovi utenti',
-'sp-contributions-newbies-sub' => 'Per i nuovi utenti',
-'sp-contributions-blocklog'    => 'blocchi',
-'sp-contributions-search'      => 'Ricerca contributi',
-'sp-contributions-username'    => 'Indirizzo IP o nome utente:',
-'sp-contributions-submit'      => 'Ricerca',
+'contributions'       => 'Contributi utente',
+'contributions-title' => 'Contributi di $1',
+'mycontris'           => 'Miei contributi',
+'contribsub2'         => 'Per $1 ($2)',
+'nocontribs'          => 'Non sono state trovate modifiche che soddisfino i criteri di ricerca.',
+'uctop'               => '(ultima per la pagina)',
+'month'               => 'Dal mese (e precedenti):',
+'year'                => "Dall'anno (e precedenti):",
+
+'sp-contributions-newbies'       => 'Mostra solo i contributi dei nuovi utenti',
+'sp-contributions-newbies-sub'   => 'Per i nuovi utenti',
+'sp-contributions-newbies-title' => 'Contributi dei nuovi utenti',
+'sp-contributions-blocklog'      => 'blocchi',
+'sp-contributions-search'        => 'Ricerca contributi',
+'sp-contributions-username'      => 'Indirizzo IP o nome utente:',
+'sp-contributions-submit'        => 'Ricerca',
 
 # What links here
 'whatlinkshere'            => 'Puntano qui',
 'whatlinkshere-title'      => 'Pagine che puntano a "$1"',
 'whatlinkshere-page'       => 'Pagina:',
-'linklistsub'              => '(Lista dei collegamenti)',
 'linkshere'                => "Le seguenti pagine contengono dei collegamenti a '''[[:$1]]''':",
 'nolinkshere'              => "Nessuna pagina contiene collegamenti che puntano a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Non vi sono pagine che puntano a '''[[:$1]]''' nel namespace selezionato.",
@@ -1759,11 +1993,9 @@ $1',
 # Block/unblock
 'blockip'                         => 'Blocco utente',
 'blockip-legend'                  => "Blocca l'utente",
-'blockiptext'                     => "Usa il modulo sottostante per bloccare l'accesso in scrittura a uno specifico indirizzo IP o un utente registrato. 
-
+'blockiptext'                     => "Usare il modulo sottostante per bloccare l'accesso in scrittura a uno specifico indirizzo IP o un utente registrato. 
 Il blocco dev'essere operato per prevenire atti di vandalismo e in stretta osservanza della [[{{MediaWiki:Policy-url}}|policy di {{SITENAME}}]].
-
-Indica il motivo specifico per il quale procedi al blocco dell'indirizzo IP o dell'utente (per esempio, cita i titoli di eventuali pagine che siano state oggetto di vandalismo).",
+Indicare il motivo specifico per il quale si procede al blocco (per esempio, citando i titoli di eventuali pagine oggetto di vandalismo).",
 'ipaddress'                       => 'Indirizzo IP:',
 'ipadressorusername'              => 'Indirizzo IP o nome utente:',
 'ipbexpiry'                       => 'Scadenza del blocco:',
@@ -1774,13 +2006,13 @@ Indica il motivo specifico per il quale procedi al blocco dell'indirizzo IP o de
 ** Rimozione di contenuti dalle pagine
 ** Collegamenti promozionali a siti esterni
 ** Inserimento di contenuti privi di senso
-** Commportamenti intimidatori o molestie
+** Comportamenti intimidatori o molestie
 ** Uso indebito di più account
 ** Nome utente non consono',
-'ipbanononly'                     => 'Blocca solo utenti anonimi (gli utenti registrati che condividono lo stesso IP non vengono bloccati)',
+'ipbanononly'                     => 'Blocca solo utenti anonimi',
 'ipbcreateaccount'                => 'Impedisci la creazione di altri account',
 'ipbemailban'                     => "Impedisci all'utente l'invio di e-mail",
-'ipbenableautoblock'              => "Blocca automaticamente l'ultimo indirizzo IP usato dall'utente e i successivi con cui vengono  tentate modifiche",
+'ipbenableautoblock'              => "Blocca automaticamente l'ultimo indirizzo IP usato dall'utente e i successivi con cui vengono tentate modifiche",
 'ipbsubmit'                       => "Blocca l'utente",
 'ipbother'                        => 'Durata non in elenco:',
 'ipboptions'                      => '2 ore:2 hours,1 giorno:1 day,3 giorni:3 days,1 settimana:1 week,2 settimane:2 weeks,1 mese:1 month,3 mesi:3 months,6 mesi:6 months,1 anno:1 year,infinito:infinite', # display1:time1,display2:time2,...
@@ -1788,6 +2020,8 @@ Indica il motivo specifico per il quale procedi al blocco dell'indirizzo IP o de
 'ipbotherreason'                  => 'Altri motivi/dettagli:',
 'ipbhidename'                     => "Nascondi il nome utente dal log dei blocchi, dall'elenco dei blocchi attivi e dall'elenco utenti.",
 'ipbwatchuser'                    => 'Segui le pagine e le discussioni utente di questo utente',
+'ipballowusertalk'                => "Permetti all'utente di modificare la propria pagina di discussione mentre è bloccato",
+'ipb-change-block'                => "Ri-blocca l'utente con queste impostazioni",
 'badipaddress'                    => 'Indirizzo IP non valido.',
 'blockipsuccesssub'               => 'Blocco eseguito',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] è stato bloccato. <br />
@@ -1797,14 +2031,18 @@ Consultare la [[Special:IPBlockList|lista degli IP bloccati]] per vedere i blocc
 'ipb-unblock'                     => 'Sblocca un utente o un indirizzo IP',
 'ipb-blocklist-addr'              => 'Blocchi attivi per $1',
 'ipb-blocklist'                   => 'Elenca i blocchi attivi',
+'ipb-blocklist-contribs'          => 'Contributi di $1',
 'unblockip'                       => "Sblocca l'utente",
 'unblockiptext'                   => "Usare il modulo sottostante per restituire l'accesso in scrittura ad un utente o indirizzo IP bloccato.",
-'ipusubmit'                       => "Sblocca l'utente",
+'ipusubmit'                       => 'Rimuovi questo blocco',
 'unblocked'                       => "L'utente [[User:$1|$1]] è stato sbloccato",
 'unblocked-id'                    => 'Il blocco $1 è stato rimosso',
 'ipblocklist'                     => 'Utenti e indirizzi IP bloccati',
 'ipblocklist-legend'              => 'Trova un utente bloccato',
 'ipblocklist-username'            => 'Nome utente o indirizzo IP:',
+'ipblocklist-sh-userblocks'       => '$1 i blocchi degli utenti registrati',
+'ipblocklist-sh-tempblocks'       => '$1 i blocchi temporanei',
+'ipblocklist-sh-addressblocks'    => '$1 i blocchi dei singoli IP',
 'ipblocklist-submit'              => 'Ricerca',
 'blocklistline'                   => '$1, $2 ha bloccato $3 ($4)',
 'infiniteblock'                   => 'infinito',
@@ -1813,26 +2051,33 @@ Consultare la [[Special:IPBlockList|lista degli IP bloccati]] per vedere i blocc
 'noautoblockblock'                => 'blocco automatico disabilitato',
 'createaccountblock'              => 'creazione account bloccata',
 'emailblock'                      => 'e-mail bloccate',
+'blocklist-nousertalk'            => 'non può modificare la propria pagina di discussione',
 'ipblocklist-empty'               => "L'elenco dei blocchi è vuoto.",
 'ipblocklist-no-results'          => "L'indirizzo IP o nome utente richiesto non è bloccato.",
 'blocklink'                       => 'blocca',
 'unblocklink'                     => 'sblocca',
+'change-blocklink'                => 'cambia blocco',
 'contribslink'                    => 'contributi',
 'autoblocker'                     => 'Bloccato automaticamente perché l\'indirizzo IP è condiviso con l\'utente "[[User:$1|$1]]".
 Il blocco dell\'utente $1 è stato imposto per il seguente motivo: "$2".',
 'blocklogpage'                    => 'Blocchi',
+'blocklog-fulllog'                => 'Registro completo dei blocchi',
 'blocklogentry'                   => 'ha bloccato [[$1]] per un periodo di $2 $3',
+'reblock-logentry'                => 'ha cambiato le impostazioni del blocco per [[$1]] con una scadenza di $2 $3',
 'blocklogtext'                    => "Di seguito sono elencate le azioni di blocco e sblocco utenti. Gli indirizzi IP bloccati automaticamente non sono elencati. Consultare l'[[Special:IPBlockList|elenco IP bloccati]] per l'elenco degli indirizzi e nomi utente il cui blocco è operativo.",
 'unblocklogentry'                 => 'ha sbloccato $1',
 'block-log-flags-anononly'        => 'solo utenti anonimi',
 'block-log-flags-nocreate'        => 'creazione account bloccata',
 'block-log-flags-noautoblock'     => 'blocco automatico disattivato',
 'block-log-flags-noemail'         => 'e-mail bloccate',
+'block-log-flags-nousertalk'      => 'non può modificare la propria pagina di discussione',
 'block-log-flags-angry-autoblock' => 'blocco automatico avanzato attivo',
 'range_block_disabled'            => 'La possibilità di bloccare intervalli di indirizzi IP non è attiva al momento.',
-'ipb_expiry_invalid'              => 'Durata o scadenza del blocco non valida. Controlla il [http://www.gnu.org/software/shishi/manual/html_node/Relative-items-in-date-strings.html manuale di tar] per la sintassi esatta.',
+'ipb_expiry_invalid'              => 'Durata o scadenza del blocco non valida.',
 'ipb_expiry_temp'                 => 'I blocchi dei nomi utenti nascosti dovrebbero essere infiniti',
 'ipb_already_blocked'             => 'L\'utente "$1" è già bloccato',
+'ipb-needreblock'                 => "== Già bloccato ==
+L'utente $1 è già bloccato. Modificare le impostazioni?",
 'ipb_cant_unblock'                => 'Errore: Impossibile trovare il blocco con ID $1. Il blocco potrebbe essere già stato rimosso.',
 'ipb_blocked_as_range'            => "Errore: L'indirizzo IP $1 non è soggetto a blocco individuale e non può essere sbloccato. Il blocco è invece attivo a livello dell'intervallo $2, che può essere sbloccato.",
 'ip_range_invalid'                => 'Intervallo di indirizzi IP non valido.',
@@ -1841,8 +2086,9 @@ Il blocco dell\'utente $1 è stato imposto per il seguente motivo: "$2".',
 'proxyblocker-disabled'           => 'Questa funzione non è attiva.',
 'proxyblockreason'                => 'Questo indirizzo IP è stato bloccato perché risulta essere un proxy aperto. Si prega di contattare il proprio fornitore di accesso a Internet o il supporto tecnico e informarli di questo grave problema di sicurezza.',
 'proxyblocksuccess'               => 'Blocco eseguito.',
-'sorbsreason'                     => 'Questo indirizzo IP è elencato come proxy aperto nella blacklist DNSBL.',
-'sorbs_create_account_reason'     => 'Non è possibile creare nuovi accessi da questo indirizzo IP perché è elencato come proxy aperto nella blacklist DNSBL.',
+'sorbsreason'                     => 'Questo indirizzo IP è elencato come proxy aperto nella blacklist DNSBL utilizzata da {{SITENAME}}.',
+'sorbs_create_account_reason'     => 'Non è possibile creare nuovi accessi da questo indirizzo IP perché è elencato come proxy aperto nella blacklist DNSBL utilizzata da {{SITENAME}}.',
+'cant-block-while-blocked'        => 'Non è possibile bloccare altri utenti mentre si è bloccati.',
 
 # Developer tools
 'lockdb'              => 'Blocca il database',
@@ -1853,66 +2099,80 @@ Il blocco dell\'utente $1 è stato imposto per il seguente motivo: "$2".',
 'unlockconfirm'       => 'Sì, intendo effettivamente sbloccare il database.',
 'lockbtn'             => 'Blocca il database',
 'unlockbtn'           => 'Sblocca il database',
-'locknoconfirm'       => 'Non è stata spuntata la casellina di conferma.',
+'locknoconfirm'       => 'Non è stata spuntata la casella di conferma.',
 'lockdbsuccesssub'    => 'Blocco del database eseguito',
 'unlockdbsuccesssub'  => 'Sblocco del database eseguito',
-'lockdbsuccesstext'   => 'Il database è stato bloccato.
-<br />Ricorda di rimuovere il blocco dopo aver terminato le operazioni di manutenzione.',
-'unlockdbsuccesstext' => ' Il database è stato sbloccato.',
+'lockdbsuccesstext'   => 'Il database è stato bloccato.<br />
+Ricordare di [[Special:UnlockDB|rimuovere il blocco]] dopo aver terminato le operazioni di manutenzione.',
+'unlockdbsuccesstext' => 'Il database è stato sbloccato.',
 'lockfilenotwritable' => "Impossibile scrivere sul file di ''lock'' del database. L'accesso in scrittura a tale file da parte del server web è necessario per bloccare e sbloccare il database.",
 'databasenotlocked'   => 'Il database non è bloccato.',
 
 # Move page
-'move-page'               => 'Spostamento di $1',
-'move-page-legend'        => 'Spostamento di pagina',
-'movepagetext'            => "Questo modulo consente di rinominare una pagina, spostando tutta la sua cronologia al nuovo nome. La pagina attuale diverrà automaticamente un redirect al nuovo titolo. Puoi aggiornare automaticamente i redirect che puntano al titolo originale. Puoi decidere di non farlo, ma ricordati di verificare che lo spostamento non abbia creato [[Special:DoubleRedirects|doppi redirect]] o [[Special:BrokenRedirects|redirect errati]]. L'onere di garantire che i collegamenti alla pagina restino corretti spetta a chi la sposta.
+'move-page'                    => 'Spostamento di $1',
+'move-page-legend'             => 'Spostamento di pagina',
+'movepagetext'                 => "Questo modulo consente di rinominare una pagina, spostando tutta la sua cronologia al nuovo nome. La pagina attuale diverrà automaticamente un redirect al nuovo titolo. Puoi aggiornare automaticamente i redirect che puntano al titolo originale. Puoi decidere di non farlo, ma ricordati di verificare che lo spostamento non abbia creato [[Special:DoubleRedirects|doppi redirect]] o [[Special:BrokenRedirects|redirect errati]]. L'onere di garantire che i collegamenti alla pagina restino corretti spetta a chi la sposta.
 
 Si noti che la pagina '''non''' sarà spostata se ne esiste già una con il nuovo nome, a meno che non sia vuota o costituita solo da un redirect alla vecchia e sia priva di versioni precedenti. In caso di spostamento errato si può quindi tornare subito al vecchio titolo, e non è possibile sovrascrivere per errore una pagina già esistente.
 
 '''ATTENZIONE:'''
 Un cambiamento così drastico può creare contrattempi e problemi, soprattutto per le pagine più visitate. Accertarsi di aver valutato le conseguenze dello spostamento prima di procedere.",
-'movepagetalktext'        => "La corrispondente pagina di discussione, se esiste, sarà spostata automaticamente insieme alla pagina principale, '''tranne che nei seguenti casi''':
+'movepagetalktext'             => "La corrispondente pagina di discussione, se esiste, sarà spostata automaticamente insieme alla pagina principale, '''tranne che nei seguenti casi''':
 * lo spostamento della pagina è tra namespace diversi;
 * in corrispondenza del nuovo titolo esiste già una pagina di discussione (non vuota);
 * la casella qui sotto è stata deselezionata.
 
 In questi casi, se lo si ritiene opportuno, occorre spostare o aggiungere manualmente le informazioni contenute nella pagina di discussione.",
-'movearticle'             => 'Sposta la pagina',
-'movenotallowed'          => 'Non si dispone dei permessi necessari allo spostamento delle pagine.',
-'newtitle'                => 'Nuovo titolo:',
-'move-watch'              => 'Aggiungi la pagina agli osservati speciali',
-'movepagebtn'             => 'Sposta la pagina',
-'pagemovedsub'            => 'Spostamento effettuato con successo',
-'movepage-moved'          => '<big>\'\'\'"$1" è stata spostata a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Una pagina con questo nome esiste già, oppure il nome che hai scelto non è valido.<br /> Scegli, per cortesia, un titolo diverso per la pagina.',
-'cantmove-titleprotected' => 'Lo spostamento della pagina non è possibile in quanto il nuovo titolo è stato protetto per impedirne la creazione',
-'talkexists'              => "'''La pagina è stata spostata correttamente, ma non è stato possibile spostare la pagina di discussione perché ne esiste già un'altra con il nuovo titolo. Integrare manualmente i contenuti delle due pagine.'''",
-'movedto'                 => 'spostata a',
-'movetalk'                => 'Sposta anche la pagina di discussione.',
-'move-subpages'           => 'Sposta tutte le sottopagine, se possibile',
-'move-talk-subpages'      => 'Sposta tutte le sottopagine di discussione, se possibile',
-'movepage-page-exists'    => 'La pagina $1 esiste già e non può essere automaticamente sovrascritta.',
-'movepage-page-moved'     => 'La pagina $1 è stata spostata a $2.',
-'movepage-page-unmoved'   => 'La pagina $1 non può essere spostata a $2.',
-'movepage-max-pages'      => 'È stato spostato il numero massimo di $1 {{PLURAL:$1|pagina|pagine}} e non protranno essere spostate ulteriori pagine automaticamente.',
-'1movedto2'               => 'ha spostato [[$1]] a [[$2]]',
-'1movedto2_redir'         => 'ha spostato [[$1]] a [[$2]] tramite redirect',
-'movelogpage'             => 'Spostamenti',
-'movelogpagetext'         => 'Di seguito sono elencate le pagine spostate di recente.',
-'movereason'              => 'Motivo:',
-'revertmove'              => 'ripristina',
-'delete_and_move'         => 'Cancella e sposta',
-'delete_and_move_text'    => '==Cancellazione richiesta==
+'movearticle'                  => 'Sposta la pagina:',
+'movenologin'                  => 'Accesso non effettuato',
+'movenologintext'              => "Lo spostamento delle pagine è consentito solo agli utenti registrati che hanno eseguito l'[[Special:UserLogin|accesso]] al sito.",
+'movenotallowed'               => 'Non si dispone dei permessi necessari per spostare le pagine.',
+'movenotallowedfile'           => 'Non si dispone dei permessi necessari per spostare i file.',
+'cant-move-user-page'          => 'Non si dispone dei permessi necessari per spostare le pagine utente (escluse le sottopagine).',
+'cant-move-to-user-page'       => 'Non si dispone dei permessi necessari per spostare la pagina su una pagina utente (escluse le sottopagine utente).',
+'newtitle'                     => 'Nuovo titolo:',
+'move-watch'                   => 'Aggiungi la pagina agli osservati speciali',
+'movepagebtn'                  => 'Sposta la pagina',
+'pagemovedsub'                 => 'Spostamento effettuato con successo',
+'movepage-moved'               => '<big>\'\'\'"$1" è stata spostata a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'È stato creato un redirect.',
+'movepage-moved-noredirect'    => 'La creazione di un redirect è stata soppressa.',
+'articleexists'                => 'Una pagina con questo nome esiste già oppure il nome scelto non è valido.
+Scegliere un titolo diverso per la pagina.',
+'cantmove-titleprotected'      => 'Lo spostamento della pagina non è possibile in quanto il nuovo titolo è stato protetto per impedirne la creazione',
+'talkexists'                   => "'''La pagina è stata spostata correttamente, ma non è stato possibile spostare la pagina di discussione perché ne esiste già un'altra con il nuovo titolo. Integrare manualmente i contenuti delle due pagine.'''",
+'movedto'                      => 'spostata a',
+'movetalk'                     => 'Sposta anche la pagina di discussione.',
+'move-subpages'                => 'Sposta tutte le sottopagine, se possibile',
+'move-talk-subpages'           => 'Sposta tutte le sottopagine di discussione, se possibile',
+'movepage-page-exists'         => 'La pagina $1 esiste già e non può essere automaticamente sovrascritta.',
+'movepage-page-moved'          => 'La pagina $1 è stata spostata a $2.',
+'movepage-page-unmoved'        => 'La pagina $1 non può essere spostata a $2.',
+'movepage-max-pages'           => 'È stato spostato il numero massimo di $1 {{PLURAL:$1|pagina|pagine}} e non protranno essere spostate ulteriori pagine automaticamente.',
+'1movedto2'                    => 'ha spostato [[$1]] a [[$2]]',
+'1movedto2_redir'              => 'ha spostato [[$1]] a [[$2]] tramite redirect',
+'move-redirect-suppressed'     => 'redirect soppresso',
+'movelogpage'                  => 'Spostamenti',
+'movelogpagetext'              => 'Di seguito sono elencate le pagine spostate di recente.',
+'movereason'                   => 'Motivo:',
+'revertmove'                   => 'ripristina',
+'delete_and_move'              => 'Cancella e sposta',
+'delete_and_move_text'         => '==Cancellazione richiesta==
 
 La pagina specificata come destinazione "[[:$1]]" esiste già. Vuoi cancellarla per proseguire con lo spostamento?',
-'delete_and_move_confirm' => 'Sì, sovrascrivi la pagina esistente',
-'delete_and_move_reason'  => 'Cancellata per rendere possibile lo spostamento',
-'selfmove'                => "Il titolo di destinazione inserito è uguale a quello di provenienza: '''attenzione''', leggi i titoli dei campi prima di confermare un comando! Il secondo campo contiene un commento che è necessario per giustificare lo spostamento della pagine e viene memorizzato nel log.",
-'immobile_namespace'      => 'Il nuovo titolo corrisponde a una pagina speciale; impossibile spostare pagine in quel namespace.',
-'imagenocrossnamespace'   => "Non puoi spostare un'immagine fuori del namespace Immagine.",
-'imagetypemismatch'       => 'La nuova estensione del file non corrisponde alla sua reale estensione',
-'imageinvalidfilename'    => "Il nome dell'immagine non è valido",
-'fix-double-redirects'    => 'Aggiorna tutti i redirect che puntano al titolo originale',
+'delete_and_move_confirm'      => 'Sì, sovrascrivi la pagina esistente',
+'delete_and_move_reason'       => 'Cancellata per rendere possibile lo spostamento',
+'selfmove'                     => 'Il nuovo titolo è uguale al vecchio; impossibile spostare la pagina su se stessa.',
+'immobile-source-namespace'    => 'Non è possibile spostare pagine del namespace "$1"',
+'immobile-target-namespace'    => 'Non è possibile spostare pagine nel namespace "$1"',
+'immobile-target-namespace-iw' => 'Il link interwiki non è una destinazione valida per spostare la pagina.',
+'immobile-source-page'         => 'Questa pagina non può essere spostata.',
+'immobile-target-page'         => 'Non è possibile spostare sul titolo indicato.',
+'imagenocrossnamespace'        => 'Non è possibile spostare un file fuori dal relativo namespace.',
+'imagetypemismatch'            => 'La nuova estensione del file non corrisponde al tipo dello stesso',
+'imageinvalidfilename'         => "Il nome dell'immagine non è valido",
+'fix-double-redirects'         => 'Aggiorna tutti i redirect che puntano al titolo originale',
+'move-leave-redirect'          => 'Crea un redirect con lo spostamento',
 
 # Export
 'export'            => 'Esporta pagine',
@@ -1920,7 +2180,7 @@ La pagina specificata come destinazione "[[:$1]]" esiste già. Vuoi cancellarla
 
 Per esportare le pagine indicare i titoli nella casella di testo sottostante, uno per riga, e specificare se si desidera ottenere la versione corrente e tutte le versioni precedenti, con i dati della cronologia della pagina, oppure soltanto l'ultima versione e i dati corrispondenti all'ultima modifica.
 
-In quest'ultimo caso si può anche utilizzare un collegamento, ad esempio [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] per esportare \"[[{{MediaWiki:Mainpage}}]]\".",
+In quest'ultimo caso si può anche utilizzare un collegamento, ad esempio [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] per esportare \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => "Includi solo la revisione attuale, non l'intera cronologia",
 'exportnohistory'   => "----
 '''Nota:''' l'esportazione dell'intera cronologia delle pagine attraverso questa interfaccia è stata disattivata per motivi legati alle prestazioni del sistema.",
@@ -1935,8 +2195,9 @@ In quest'ultimo caso si può anche utilizzare un collegamento, ad esempio [[{{ns
 'allmessagesname'           => 'Nome',
 'allmessagesdefault'        => 'Testo predefinito',
 'allmessagescurrent'        => 'Testo attuale',
-'allmessagestext'           => 'Questa è la lista di tutti i messaggi di sistema disponibili nel namespace MediaWiki:',
-'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' non è supportato perché il flag '''\$wgUseDatabaseMessages''' non è attivo.",
+'allmessagestext'           => 'Questa è la lista di tutti i messaggi di sistema disponibili nel namespace MediaWiki.
+Visitare [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] se si desidera contribuire alla localizzazione generica di MediaWiki.',
+'allmessagesnotsupportedDB' => "Non è possibile utilizzare questa pagina perché il flag '''\$wgUseDatabaseMessages''' non è attivo.",
 'allmessagesfilter'         => 'Filtro sui messaggi:',
 'allmessagesmodified'       => 'Mostra solo quelli modificati',
 
@@ -1955,14 +2216,17 @@ In quest'ultimo caso si può anche utilizzare un collegamento, ad esempio [[{{ns
 'import-interwiki-text'      => 'Selezionare un progetto wiki e il titolo della pagina da importare.
 Le date di pubblicazione e i nomi degli autori delle varie versioni saranno conservati.
 Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log/import|log di importazione]].',
+'import-interwiki-source'    => 'Sorgente wiki/pagina:',
 'import-interwiki-history'   => "Copia l'intera cronologia di questa pagina",
 'import-interwiki-submit'    => 'Importa',
 'import-interwiki-namespace' => 'Namespace di destinazione:',
+'import-upload-filename'     => 'Nome file:',
+'import-comment'             => 'Oggetto:',
 'importtext'                 => 'Si prega di esportare il file dal sito wiki di origine con la funzione Special:Export, salvarlo sul proprio disco e poi caricarlo qui.',
 'importstart'                => 'Importazione delle pagine in corso...',
 'import-revision-count'      => '{{PLURAL:$1|una revisione importata|$1 revisioni importate}}',
 'importnopages'              => 'Nessuna pagina da importare.',
-'importfailed'               => 'Importazione non riuscita: $1',
+'importfailed'               => 'Importazione non riuscita: <nowiki>$1</nowiki>',
 'importunknownsource'        => "Tipo di origine sconosciuto per l'importazione",
 'importcantopen'             => 'Impossibile aprire il file di importazione',
 'importbadinterwiki'         => 'Collegamento inter-wiki errato',
@@ -1997,13 +2261,13 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 'tooltip-pt-anontalk'             => 'Discussioni sulle modifiche fatte da questo indirizzo IP',
 'tooltip-pt-preferences'          => 'Le mie preferenze',
 'tooltip-pt-watchlist'            => 'La lista delle pagine che stai tenendo sotto osservazione',
-'tooltip-pt-mycontris'            => "L'elenco dei tuoi contributi",
+'tooltip-pt-mycontris'            => 'Elenco dei tuoi contributi',
 'tooltip-pt-login'                => 'La registrazione è consigliata, anche se non obbligatoria',
 'tooltip-pt-anonlogin'            => 'La registrazione è consigliata, anche se non obbligatoria',
 'tooltip-pt-logout'               => 'Uscita (logout)',
 'tooltip-ca-talk'                 => 'Vedi le discussioni relative a questa pagina',
 'tooltip-ca-edit'                 => 'Puoi modificare questa pagina. Per favore usa il pulsante di anteprima prima di salvare',
-'tooltip-ca-addsection'           => 'Aggiungi un commento a questa discussione',
+'tooltip-ca-addsection'           => 'Inizia una nuova sezione',
 'tooltip-ca-viewsource'           => 'Questa pagina è protetta, ma puoi vedere il suo codice sorgente',
 'tooltip-ca-history'              => 'Versioni precedenti di questa pagina',
 'tooltip-ca-protect'              => 'Proteggi questa pagina',
@@ -2044,12 +2308,14 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 'tooltip-ca-nstab-category'       => 'Vedi la pagina della categoria',
 'tooltip-minoredit'               => 'Segnala come modifica minore',
 'tooltip-save'                    => 'Salva le modifiche',
-'tooltip-preview'                 => 'Anteprima delle modifiche (consigliata, prima di salvare!)',
-'tooltip-diff'                    => 'Guarda le modifiche apportate al testo.',
+'tooltip-preview'                 => 'Anteprima delle modifiche (consigliata prima di salvare)',
+'tooltip-diff'                    => 'Guarda le modifiche apportate al testo',
 'tooltip-compareselectedversions' => 'Guarda le differenze tra le due versioni selezionate di questa pagina.',
 'tooltip-watch'                   => 'Aggiungi questa pagina alla lista degli osservati speciali',
 'tooltip-recreate'                => 'Ricrea la pagina anche se è stata cancellata',
 'tooltip-upload'                  => 'Inizia il caricamento',
+'tooltip-rollback'                => '"Rollback" annulla le modifiche a questa pagina dell\'ultimo contributore con un solo clic.',
+'tooltip-undo'                    => '"Annulla" permette di annullare questa modifica e apre il modulo di modifica in modalità di anteprima. Permette di inserire una motivazione nell\'oggetto della modifica.',
 
 # Stylesheets
 'common.css'      => '/* Gli stili CSS inseriti qui si applicano a tutte le skin */',
@@ -2075,16 +2341,16 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 
 # Metadata
 'nodublincore'      => 'Metadati Dublin Core RDF non attivi su questo server.',
-'nocreativecommons' => 'Metadati Commons RDF non attivi su questo server.',
+'nocreativecommons' => 'Metadati Creative Commons RDF non attivi su questo server.',
 'notacceptable'     => 'Il server wiki non è in grado di fornire i dati in un formato leggibile dal tuo client.',
 
 # Attribution
-'anonymous'        => 'uno o più utenti anonimi di {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utente anonimo|Utenti anonimi}} di {{SITENAME}}',
 'siteuser'         => '$1, utente di {{SITENAME}}',
 'lastmodifiedatby' => "Questa pagina è stata modificata per l'ultima volta il $2, $1 da $3.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Il testo attuale è basato su contributi di $1.',
 'others'           => 'altri',
-'siteusers'        => '$1, utenti di {{SITENAME}}',
+'siteusers'        => '$1, {{PLURAL:$2|utente|utenti}} di {{SITENAME}}',
 'creditspage'      => 'Autori della pagina',
 'nocredits'        => 'Nessuna informazione sugli autori disponibile per questa pagina.',
 
@@ -2124,11 +2390,12 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 'markedaspatrollederror-noautopatrol' => 'Non si dispone dei permessi necessari per segnare le proprie modifiche come verificate.',
 
 # Patrol log
-'patrol-log-page'   => 'Modifiche verificate',
-'patrol-log-header' => 'Di seguito sono elencate le verifiche delle modifiche.',
-'patrol-log-line'   => 'ha segnato la $1 alla pagina $2 come verificata $3',
-'patrol-log-auto'   => '(verifica automatica)',
-'patrol-log-diff'   => 'modifica $1',
+'patrol-log-page'      => 'Modifiche verificate',
+'patrol-log-header'    => 'Di seguito sono elencate le verifiche delle modifiche.',
+'patrol-log-line'      => 'ha segnato la $1 alla pagina $2 come verificata $3',
+'patrol-log-auto'      => '(verifica automatica)',
+'patrol-log-diff'      => 'modifica $1',
+'log-show-hide-patrol' => '$1 log delle modifiche verificate',
 
 # Image deletion
 'deletedrevision'                 => 'Cancellata la vecchia revisione di $1.',
@@ -2145,26 +2412,31 @@ $1',
 'previousdiff' => '� Differenza precedente',
 'nextdiff'     => 'Differenza successiva →',
 
+# Visual comparison
+'visual-comparison' => 'Confronto visuale',
+
 # Media information
-'mediawarning'         => "'''Attenzione''': Questo file può contenere codice maligno; la sua esecuzione può danneggiare il proprio sistema informatico.<hr />",
+'mediawarning'         => "'''Attenzione''': Questo file potrebbe contenere codice maligno, la sua esecuzione potrebbe danneggiare il tuo sistema.<hr />",
 'imagemaxsize'         => 'Dimensione massima delle immagini sulle relative pagine di discussione:',
 'thumbsize'            => 'Grandezza delle miniature:',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|pagina|pagine}}',
-'file-info'            => 'Dimensioni: $1, tipo MIME: $2',
-'file-info-size'       => '($1 × $2 pixel, dimensioni: $3, tipo MIME: $4)',
+'file-info'            => '(dimensione del file: $1, tipo MIME: $2)',
+'file-info-size'       => '($1 × $2 pixel, dimensione del file: $3, tipo MIME: $4)',
 'file-nohires'         => '<small>Non sono disponibili versioni a risoluzione più elevata.</small>',
 'svg-long-desc'        => '(file in formato SVG, dimensioni nominali $1 × $2 pixel, dimensione del file: $3)',
 'show-big-image'       => 'Versione ad alta risoluzione',
 'show-big-image-thumb' => '<small>Dimensioni di questa anteprima: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galleria dei nuovi file',
-'imagelisttext'         => "La lista presentata di seguito, costituita da {{PLURAL:$1|un file|'''$1''' file}}, è ordinata per $2.",
+'imagelisttext'         => "La lista presentata di seguito, costituita da {{PLURAL:$1|un file|'''$1''' file}}, è ordinata $2.",
 'newimages-summary'     => 'Questa pagina speciale mostra i file caricati più di recente.',
+'newimages-legend'      => 'Nome file',
+'newimages-label'       => 'Nome file (o una parte di esso):',
 'showhidebots'          => '($1 i bot)',
 'noimages'              => "Non c'è nulla da vedere.",
 'ilsubmit'              => 'Ricerca',
-'bydate'                => 'data',
+'bydate'                => 'per data',
 'sp-newimages-showfrom' => 'Mostra i file più recenti a partire dalle ore $2 del $1',
 
 # Bad image list
@@ -2275,9 +2547,9 @@ I collegamenti successivi, sulla stessa riga, sono considerati come eccezioni (o
 'exif-subjectdistancerange'        => 'Scala distanza soggetto',
 'exif-imageuniqueid'               => 'ID univoco immagine',
 'exif-gpsversionid'                => 'Versione dei tag GPS',
-'exif-gpslatituderef'              => 'Latitudine Nord/Sud',
+'exif-gpslatituderef'              => 'Latitudine nord/sud',
 'exif-gpslatitude'                 => 'Latitudine',
-'exif-gpslongituderef'             => 'Longitudine Est/Ovest',
+'exif-gpslongituderef'             => 'Longitudine est/ovest',
 'exif-gpslongitude'                => 'Longitudine',
 'exif-gpsaltituderef'              => "Riferimento per l'altitudine",
 'exif-gpsaltitude'                 => 'Altitudine',
@@ -2373,6 +2645,18 @@ I collegamenti successivi, sulla stessa riga, sono considerati come eccezioni (o
 'exif-lightsource-24'  => 'Lampada da studio ISO al tungsteno',
 'exif-lightsource-255' => 'Altra sorgente luminosa',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Il flash non è scattato',
+'exif-flash-fired-1'    => 'Flash scattato',
+'exif-flash-return-0'   => 'nessuna funzione di individuazione del ritorno della luce stroboscopica',
+'exif-flash-return-2'   => 'luce stroboscopica di ritorno non individuata',
+'exif-flash-return-3'   => 'luce stroboscopica di ritorno individuata',
+'exif-flash-mode-1'     => 'attivazione flash forzato',
+'exif-flash-mode-2'     => 'rimozione flash forzato',
+'exif-flash-mode-3'     => 'modalità automatica',
+'exif-flash-function-1' => 'Disattiva flash',
+'exif-flash-redeye-1'   => 'modalità riduzione occhi rossi',
+
 'exif-focalplaneresolutionunit-2' => 'pollici',
 
 'exif-sensingmethod-1' => 'Non definito',
@@ -2424,12 +2708,12 @@ I collegamenti successivi, sulla stessa riga, sono considerati come eccezioni (o
 'exif-subjectdistancerange-3' => 'Soggetto lontano',
 
 # Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
-'exif-gpslatitude-n' => 'Latitudine Nord',
-'exif-gpslatitude-s' => 'Latitudine Sud',
+'exif-gpslatitude-n' => 'Latitudine nord',
+'exif-gpslatitude-s' => 'Latitudine sud',
 
 # Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
-'exif-gpslongitude-e' => 'Longitudine Est',
-'exif-gpslongitude-w' => 'Longitudine Ovest',
+'exif-gpslongitude-e' => 'Longitudine est',
+'exif-gpslongitude-w' => 'Longitudine ovest',
 
 'exif-gpsstatus-a' => 'Misurazione in corso',
 'exif-gpsstatus-v' => 'Misurazione interoperabile',
@@ -2460,7 +2744,7 @@ I collegamenti successivi, sulla stessa riga, sono considerati come eccezioni (o
 # E-mail address confirmation
 'confirmemail'             => 'Conferma indirizzo e-mail',
 'confirmemail_noemail'     => 'Non è stato indicato un indirizzo e-mail valido nelle proprie [[Special:Preferences|preferenze]].',
-'confirmemail_text'        => "Questo sito richiede la verifica dell'indirizzo e-mail prima di poter usare le funzioni connesse all'email. Premere il pulsante qui sotto per inviare una richiesta di conferma al proprio indirizzo; nel messaggio è presente un collegamento che contiene un codice. Visitare il collegamento con il proprio browser per confermare che l'indirizzo e-mail è valido.",
+'confirmemail_text'        => "{{SITENAME}} richiede la verifica dell'indirizzo e-mail prima di poter usare le relative funzioni. Premere il pulsante qui sotto per inviare una richiesta di conferma al proprio indirizzo; nel messaggio è presente un collegamento che contiene un codice. Visitare il collegamento con il proprio browser per confermare che l'indirizzo e-mail è valido.",
 'confirmemail_pending'     => '<div class="error">
 Il codice di conferma è già stato spedito via posta elettronica; se l\'account è stato
 creato di recente, si prega di attendere l\'arrivo del codice per qualche minuto prima
@@ -2477,7 +2761,7 @@ uso della posta elettronica.",
 Messaggio di errore del mailer: $1',
 'confirmemail_invalid'     => 'Codice di conferma non valido. Il codice potrebbe essere scaduto.',
 'confirmemail_needlogin'   => 'È necessario $1 per confermare il proprio indirizzo e-mail.',
-'confirmemail_success'     => "L'indirizzo e-mail è confermato. Ora è possibile eseguire l'accesso e fare pieno uso del sito.",
+'confirmemail_success'     => "L'indirizzo e-mail è confermato. Ora è possibile [[Special:UserLogin|eseguire l'accesso]] e fare pieno uso del sito.",
 'confirmemail_loggedin'    => "L'indirizzo e-mail è stato confermato.",
 'confirmemail_error'       => 'Errore nel salvataggio della conferma.',
 'confirmemail_subject'     => "{{SITENAME}}: richiesta di conferma dell'indirizzo",
@@ -2498,11 +2782,11 @@ Questo codice di conferma scadrà automaticamente alle $4.',
 # Scary transclusion
 'scarytranscludedisabled' => "[L'inclusione di pagine tra siti wiki non è attiva]",
 'scarytranscludefailed'   => '[Errore: Impossibile ottenere il template $1]',
-'scarytranscludetoolong'  => '[Errore: URL troppo lungo]',
+'scarytranscludetoolong'  => '[Errore: URL troppo lunga]',
 
 # Trackbacks
 'trackbackbox'      => '<div id="mw_trackbacks">
-Informazioni di trackback per questa voce:<br />
+Informazioni di trackback per questa pagina:<br />
 $1
 </div>',
 'trackbackremove'   => ' ([$1 Elimina])',
@@ -2515,30 +2799,10 @@ $1
 Per favore, conferma che desideri veramente ricreare questa pagina.",
 'recreate'            => 'Ricrea',
 
-# HTML dump
-'redirectingto' => 'Reindirizzamento a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Vuoi pulire la cache di questa pagina?  $1
-
-La ''cache'' è un archivio che contiene una copia provvisoria delle pagine web.
-
-Ogni volta che apri una pagina, il software si connette al database e crea al momento la pagina che viene inviata al tuo ''browser'' e visualizzata sul tuo computer. Questo processo impiega tempo e risorse. 
-
-Per le pagine più frequentemente richieste, questo processo risulterebbe troppo oneroso e perciò ingestibile. Per ovviare al problema il software crea automaticamente una copia della pagina che viene conservata per un certo tempo in una ''cache'', una memoria transitoria appositamente dedicata. In questo modo non è necessario effettuare ogni volta il processo di creazione, poichè la pagina è già pronta.
-
-* vantaggi: minor carico di lavoro per il sistema e maggiore velocità
-* svantaggi: è possibile che la pagina caricata non sia la versione più recente; la pagina potrebbe essere stata modificata dopo essere stata copiata nella ''cache''
-
-Pertanto, pulire (o aggiornare) la ''cache'' di una pagina, significa assicurarsi di visualizzare la versione più recente.",
 'confirm_purge_button' => 'Conferma',
-
-# AJAX search
-'searchcontaining' => "Ricerca delle voci che contengono ''$1''.",
-'searchnamed'      => "Ricerca delle voci con titolo ''$1''.",
-'articletitles'    => "Ricerca delle voci che iniziano con ''$1''",
-'hideresults'      => 'Nascondi i risultati',
-'useajaxsearch'    => 'Usa la ricerca AJAX',
+'confirm-purge-top'    => 'Vuoi pulire la cache di questa pagina?',
+'confirm-purge-bottom' => 'Ripulire la cache di una pagina consente di mostrare la sua versione più aggiornata.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pagina precedente',
@@ -2558,10 +2822,10 @@ Pertanto, pulire (o aggiornare) la ''cache'' di una pagina, significa assicurars
 'table_pager_empty'        => 'Nessun risultato',
 
 # Auto-summaries
-'autosumm-blank'   => 'Pagina svuotata completamente',
+'autosumm-blank'   => 'Pagina svuotata',
 'autosumm-replace' => "Pagina sostituita con '$1'",
 'autoredircomment' => 'Redirect alla pagina [[$1]]',
-'autosumm-new'     => 'Nuova pagina: $1',
+'autosumm-new'     => "Creata pagina con '$1'",
 
 # Size units
 'size-bytes' => '$1 byte',
@@ -2602,6 +2866,7 @@ Usare l\'anteprima standard.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag estensione sconosciuto: "$1"',
+'duplicate-defaultsort' => 'Attenzione: la chiave di ordinamento predefinita "$2" sostituisce la precedente "$1".',
 
 # Special:Version
 'version'                          => 'Versione', # Not used as normal message but as header for the special page itself
@@ -2630,17 +2895,17 @@ Usare l\'anteprima standard.',
 'filepath-submit'  => 'Percorso',
 'filepath-summary' => 'Questa pagina speciale restituisce il percorso completo di un file. Le immagini vengono mostrate alla massima risoluzione disponibile, per gli altri tipi di file viene avviato direttamente il programma associato.
 
-Inserire il nome del file senza il prefisso "{{ns:image}}:"',
+Inserire il nome del file senza il prefisso "{{ns:file}}:"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Ricerca dei file duplicati',
 'fileduplicatesearch-summary'  => "Ricerca di eventuali duplicati del file in base al valore di ''hash''.
 
-Inserire il nome del file senza il prefisso \"{{ns:image}}:\"",
+Inserire il nome del file senza il prefisso \"{{ns:file}}:\"",
 'fileduplicatesearch-legend'   => 'Ricerca di un duplicato',
 'fileduplicatesearch-filename' => 'Nome del file:',
 'fileduplicatesearch-submit'   => 'Ricerca',
-'fileduplicatesearch-info'     => '$1 × $2 pixel<br />Dimensioni: $3<br />Tipo MIME: $4',
+'fileduplicatesearch-info'     => '$1 × $2 pixel<br />Dimensione del file: $3<br />Tipo MIME: $4',
 'fileduplicatesearch-result-1' => 'Non esistono duplicati identici al file "$1".',
 'fileduplicatesearch-result-n' => '{{PLURAL:$2|Esiste un duplicato identico|Esistono $2 duplicati identici}} al file "$1".',
 
@@ -2666,4 +2931,13 @@ Inserire il nome del file senza il prefisso \"{{ns:image}}:\"",
 'blankpage'              => 'Pagina vuota',
 'intentionallyblankpage' => 'Questa pagina è lasciata volutamente vuota ed è usata per benchmark, ecc.',
 
+# External image whitelist
+'external_image_whitelist' => " #lascia questa riga esattamente com'è<pre>
+#Inserisci i frammenti di espressioni regolari (solo la parte che va fra //) di seguito
+#Queste corrisponderanno con gli URL di immagini esterne (hotlinked)
+#Quelle che corrisponderanno saranno mostrate come immagini, altrimenti verrà mostrano solo un collegamento all'immagine
+#Le linee che iniziano con # sono di commento
+
+#Inserisci sopra questa riga tutti i frammenti di regex. Lascia questa riga esattamente com'è</pre>",
+
 );
diff --git a/languages/messages/MessagesIu.php b/languages/messages/MessagesIu.php
index ff0379de..c00beb99 100644
--- a/languages/messages/MessagesIu.php
+++ b/languages/messages/MessagesIu.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  * @comment Macro language; kept for backward compatibility
+ *
  */
 
 $fallback = 'ike-cans';
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index e4b0ce5c..7384c1c8 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -18,6 +18,7 @@
  * @author Kahusi
  * @author Kkkdc
  * @author Koba-chan
+ * @author Lovekhmer
  * @author Marine-Blue
  * @author Mizusumashi
  * @author Muttley
@@ -26,12 +27,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => "標準",
-	'nostalgia' => "ノスタルジア",
-	'cologneblue' => "ケルンブルー",
-);
-
 $datePreferences = array(
 	'default',
 	'ISO 8601',
@@ -46,24 +41,166 @@ $dateFormats = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => "Media", /* Media */
-	NS_SPECIAL        => "特別", /* Special */
-	NS_MAIN           => "",
-	NS_TALK           => "ノート", /* Talk */
-	NS_USER           => "利用者", /* User */
-	NS_USER_TALK      => "利用者�会話", /* User_talk */
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1�ノート', /* Wikipedia_talk */
-	NS_IMAGE          => "画�", /* Image */
-	NS_IMAGE_TALK     => "画��ノート", /* Image_talk */
-	NS_MEDIAWIKI      => "MediaWiki", /* MediaWiki */
-	NS_MEDIAWIKI_TALK => "MediaWiki�ノート", /* MediaWiki_talk */
-	NS_TEMPLATE       => "Template", /* Template */
-	NS_TEMPLATE_TALK  => "Template�ノート", /* Template_talk */
-	NS_HELP           => "Help", /* Help */
-	NS_HELP_TALK      => "Help�ノート", /* Help_talk */
-	NS_CATEGORY       => "Category", /* Category */
-	NS_CATEGORY_TALK  => "Category�ノート" /* Category_talk */
+	NS_MEDIA            => 'メディア',
+	NS_SPECIAL          => '特別',
+	NS_TALK             => 'ノート',
+	NS_USER             => '利用者',
+	NS_USER_TALK        => '利用者�会話',
+	NS_PROJECT_TALK     => '$1�ノート',
+	NS_FILE             => 'ファイル',
+	NS_FILE_TALK        => 'ファイル�ノート',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki�ノート',
+	NS_TEMPLATE         => 'Template',
+	NS_TEMPLATE_TALK    => 'Template�ノート',
+	NS_HELP             => 'Help',
+	NS_HELP_TALK        => 'Help�ノート',
+	NS_CATEGORY         => 'Category',
+	NS_CATEGORY_TALK    => 'Category�ノート',
+);
+
+$namespaceAliases = array(
+	'画�' => NS_FILE,
+	'画��ノート' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( '二�リダイレクト' ),
+	'BrokenRedirects'           => array( '迷��リダイレクト' ),
+	'Disambiguations'           => array( '曖昧�回��ページ', '曖昧�回�' ),
+	'Userlogin'                 => array( 'ログイン' ),
+	'Userlogout'                => array( 'ログアウト' ),
+	'CreateAccount'             => array( 'アカウント作�' ),
+	'Preferences'               => array( '個人設定', 'オプション' ),
+	'Watchlist'                 => array( 'ウォッ�リスト' ),
+	'Recentchanges'             => array( '最近更新��ページ' ),
+	'Upload'                    => array( 'アップロード' ),
+	'Listfiles'                 => array( 'ファイルリスト' ),
+	'Newimages'                 => array( '新��ファイル�一覧', '新�画�展示室' ),
+	'Listusers'                 => array( '登録利用者�一覧' ),
+	'Listgrouprights'           => array( '利用者グループ�権�一覧' ),
+	'Statistics'                => array( '統計' ),
+	'Randompage'                => array( '����表示' ),
+	'Lonelypages'               => array( '孤立���るページ' ),
+	'Uncategorizedpages'        => array( 'カテゴリ未導入�ページ' ),
+	'Uncategorizedcategories'   => array( 'カテゴリ未導入�カテゴリ' ),
+	'Uncategorizedimages'       => array( 'カテゴリ未導入�ファイル' ),
+	'Uncategorizedtemplates'    => array( 'カテゴリ未導入�テンプレート' ),
+	'Unusedcategories'          => array( '使�れ����カテゴリ', '未使用カテゴリ' ),
+	'Unusedimages'              => array( '使�れ����ファイル', '未使用ファイル', '未使用画�' ),
+	'Wantedpages'               => array( '存在���ページ��リンク', '赤リンク' ),
+	'Wantedcategories'          => array( '存在���カテゴリ��リンク', '赤リンクカテゴリ' ),
+	'Wantedfiles'               => array( 'ファイルページ�存在���ファイル', '赤リンクファイル' ),
+	'Wantedtemplates'           => array( '存在���テンプレート��リンク', '赤リンクテンプレート' ),
+	'Mostlinked'                => array( '被リンク�多�ページ' ),
+	'Mostlinkedcategories'      => array( '被リンク�多�カテゴリ' ),
+	'Mostlinkedtemplates'       => array( '被リンク�多�テンプレート', '使用箇所�多�テンプレート' ),
+	'Mostimages'                => array( '被リンク�多�ファイル', '使用箇所�多�ファイル' ),
+	'Mostcategories'            => array( 'カテゴリ�多�項目', 'カテゴリ�多�ページ' ),
+	'Mostrevisions'             => array( '編集履歴�多�ページ', '版�多�項目', '版�多�ページ' ),
+	'Fewestrevisions'           => array( '編集履歴�少��ページ', '版�少��項目', '版�少��ページ' ),
+	'Shortpages'                => array( '短�ページ' ),
+	'Longpages'                 => array( '長�ページ' ),
+	'Newpages'                  => array( '新��ページ', '新�項目' ),
+	'Ancientpages'              => array( '更新�れ����ページ' ),
+	'Deadendpages'              => array( '有効�ページ��リンク���ページ', '行�止�りページ' ),
+	'Protectedpages'            => array( '�護�れ��るページ' ),
+	'Protectedtitles'           => array( '作��護�れ��るページ�' ),
+	'Allpages'                  => array( '全ページ', 'ページ一覧' ),
+	'Prefixindex'               => array( '始点指定ページ一覧' ),
+	'Ipblocklist'               => array( 'ブロック�一覧' ),
+	'Specialpages'              => array( '特別ページ一覧' ),
+	'Contributions'             => array( '投稿記録' ),
+	'Emailuser'                 => array( 'ウィキメール' ),
+	'Confirmemail'              => array( 'メールアドレス�確�' ),
+	'Whatlinkshere'             => array( 'リンク元' ),
+	'Recentchangeslinked'       => array( 'リンク先�更新状�', '関連ページ�更新状�' ),
+	'Movepage'                  => array( '移動' ),
+	'Blockme'                   => array( '自己ブロック' ),
+	'Booksources'               => array( '文献資料' ),
+	'Categories'                => array( 'カテゴリ', 'カテゴリ一覧' ),
+	'Export'                    => array( 'データ書�出�' ),
+	'Version'                   => array( '�ージョン情報' ),
+	'Allmessages'               => array( 'メッセージ一覧', '表示メッセージ�一覧' ),
+	'Log'                       => array( 'ログ' ),
+	'Blockip'                   => array( '投稿ブロック' ),
+	'Undelete'                  => array( '復帰' ),
+	'Import'                    => array( 'イン�ート' ),
+	'Lockdb'                    => array( 'データベースロック' ),
+	'Unlockdb'                  => array( 'データベース解除' ),
+	'Userrights'                => array( '利用者権�' ),
+	'MIMEsearch'                => array( 'MIME検索' ),
+	'FileDuplicateSearch'       => array( '�複ファイル検索' ),
+	'Unwatchedpages'            => array( 'ウォッ��れ����ページ' ),
+	'Listredirects'             => array( 'リダイレクト�一覧' ),
+	'Revisiondelete'            => array( '特定版削除' ),
+	'Unusedtemplates'           => array( '使�れ����テンプレート', '未使用テンプレート' ),
+	'Randomredirect'            => array( '����リダイレクト' ),
+	'Mypage'                    => array( '利用者ページ', 'マイページ', 'マイ・ページ' ),
+	'Mytalk'                    => array( '会話ページ', 'マイトーク', 'マイ・トーク' ),
+	'Mycontributions'           => array( '自分�投稿記録' ),
+	'Listadmins'                => array( '管�者一覧' ),
+	'Listbots'                  => array( 'Bot一覧', 'ボット一覧' ),
+	'Popularpages'              => array( '人気ページ' ),
+	'Search'                    => array( '検索' ),
+	'Resetpass'                 => array( 'パスワード�変更', 'パスワード変更', 'パスワード�発行', 'パスワード��発行' ),
+	'Withoutinterwiki'          => array( '言語間リンクを����ページ', '言語間リンク���ページ' ),
+	'MergeHistory'              => array( '履歴統�' ),
+	'Filepath'                  => array( 'パス��得' ),
+	'Invalidateemail'           => array( 'ウィキメール無効' ),
+	'Blankpage'                 => array( '白紙ページ' ),
+	'LinkSearch'                => array( '外部リンク検索' ),
+	'DeletedContributions'      => array( '削除�れ�投稿記録', '削除歴' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#転�', '#リダイレクト', '＃転�', '＃リダイレクト', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__目次�表示__', '＿＿目次�表示＿＿', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__ギャラリー�表示__', '＿＿ギャラリー�表示＿＿', '__NOGALLERY__' ),
+	'toc'                   => array( '0', '__目次__', '＿＿目次＿＿', '__TOC__' ),
+	'noeditsection'         => array( '0', '__セクション編集�表示__', '＿＿セクション編集�表示＿＿', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__見出��表示__', '＿＿見出��表示＿＿', '__NOHEADER__' ),
+	'localyear'             => array( '1', 'ローカル年', '�地年', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'ローカルタイム', '�地時間', 'LOCALTIME' ),
+	'pagename'              => array( '1', 'ページ�', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'ページ�E', 'ページ�エンコード', 'PAGENAMEE' ),
+	'namespace'             => array( '1', '��空間', 'NAMESPACE' ),
+	'namespacee'            => array( '1', '��空間E', '��空間エンコード', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'トークスペース', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'トークスペースE', 'TALKSPACEE' ),
+	'fullpagename'          => array( '1', '完全�ページ�', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', '完全�ページ�E', '完全�ページ�エンコード', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'サブページ�', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'サブページ�E', 'サブページ�エンコード', 'SUBPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'トークページ�', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'トークページ�E', 'トークページ�エンコード', 'TALKPAGENAMEE' ),
+	'img_right'             => array( '1', '�', 'right' ),
+	'img_left'              => array( '1', 'å·¦', 'left' ),
+	'sitename'              => array( '1', 'サイト�', 'サイト�ーム', 'SITENAME' ),
+	'ns'                    => array( '0', '��空間:', '�空:', 'NS:' ),
+	'localurl'              => array( '0', 'ローカルURL:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'ローカルURLE:', 'ローカルURLエンコード:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'サー�ー', 'サー�', 'SERVER' ),
+	'servername'            => array( '0', 'サー�ー�', 'サー�ー�ーム', 'サー��', 'サー��ーム', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'スクリプトパス', 'SCRIPTPATH' ),
+	'notitleconvert'        => array( '0', '__タイトルコン�ート拒�__', '＿＿タイトルコン�ート拒�＿＿', '__タイトル�表示__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'revisionid'            => array( '1', 'リビジョンID', '差分ID', 'REVISIONID' ),
+	'revisiontimestamp'     => array( '1', 'リビジョンタイムスタンプ', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', '複数:', 'PLURAL:' ),
+	'fullurl'               => array( '0', '完全�URL:', 'フルURL:', 'FULLURL:' ),
+	'fullurle'              => array( '0', '完全�URLE:', 'フルURLE:', 'FULLURLE:' ),
+	'newsectionlink'        => array( '1', '__新��セクションリンク__', '__新セクションリンク__', '__NEWSECTIONLINK__' ),
+	'urlencode'             => array( '0', 'URLエンコード:', 'URLENCODE:' ),
+	'localtimestamp'        => array( '1', 'ローカルタイムスタンプ', 'LOCALTIMESTAMP' ),
+	'language'              => array( '0', '#言語:', '#LANGUAGE:' ),
+	'special'               => array( '0', '特別', 'special' ),
+	'defaultsort'           => array( '1', 'デフォルトソート:', 'デフォルトソートキー:', 'デフォルトカテゴリソート:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'ファイルパス:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'ã‚¿ã‚°', 'tag' ),
+	'hiddencat'             => array( '1', '__カテゴリ�表示__', '__カテ�表示__', '__�表示カテ__', '__HIDDENCAT__' ),
+	'pagesize'              => array( '1', 'ページサイズ', 'PAGESIZE' ),
+	'index'                 => array( '1', '__インデックス__', '＿＿インデックス＿＿', '__INDEX__' ),
+	'noindex'               => array( '1', '__インデックス拒�__', '＿＿インデックス拒�＿＿', '__NOINDEX__' ),
 );
 
 $messages = array(
@@ -71,11 +208,11 @@ $messages = array(
 'tog-underline'               => 'リンク�下線:',
 'tog-highlightbroken'         => '未作��ページ��リンクを�イライト�る',
 'tog-justify'                 => '段�を�等割り付��る',
-'tog-hideminor'               => '最近更新��ページ�ら細部�編集を隠�',
+'tog-hideminor'               => '最近更新��ページ�細部�編集を表示���',
 'tog-extendwatchlist'         => 'ウォッ�リストを拡張�る',
-'tog-usenewrc'                => '最近更新��ページを拡張�る（ブラウザ�よ���使�������り��）',
+'tog-usenewrc'                => '最近更新��ページを拡張�る (JavaScript)',
 'tog-numberheadings'          => '見出��番�を振る',
-'tog-showtoolbar'             => '編集ボタンを表示�る',
+'tog-showtoolbar'             => '編集ボタンを表示�る (JavaScript)',
 'tog-editondblclick'          => 'ダブルクリック�編集�る (JavaScript)',
 'tog-editsection'             => 'セクション編集用リンクを有効��る',
 'tog-editsectiononrightclick' => 'セクションタイトル��クリック�セクション編集を行�るよ���る (JavaScript)',
@@ -95,26 +232,28 @@ $messages = array(
 'tog-enotifminoredits'        => '細部�編集�もメールを���る',
 'tog-enotifrevealaddr'        => '���以外��られる通知メール�����メールアドレスを記載�る',
 'tog-shownumberswatching'     => 'ページをウォッ����る利用者数を表示�る',
-'tog-fancysig'                => '署��利用者ページ��自動的�リンクを付���（���ェックを付�る場��も利用者ページ��リンクを外���よ�����ょ�）',
+'tog-fancysig'                => '署�を加工���使� (自動�リンク���)',
 'tog-externaleditor'          => '編集�外部アプリケーションを使� (上級者��・コンピュータ�特殊�設定�必�)',
 'tog-externaldiff'            => '差分表示�外部アプリケーションを使� (上級者��・コンピュータ�特殊�設定�必�)',
-'tog-showjumplinks'           => 'アクセシビリティ���� "{{int:jumpto}}" リンクを有効��る',
+'tog-showjumplinks'           => 'アクセシビリティ����「{{int:jumpto}}�リンクを有効��る',
 'tog-uselivepreview'          => 'ライブプレビューを使用�る (JavaScript, 試験中�機能)',
 'tog-forceeditsummary'        => '�約欄�空欄�場��警告�る',
 'tog-watchlisthideown'        => 'ウォッ�リスト�自分�編集を表示���',
 'tog-watchlisthidebots'       => 'ウォッ�リスト�ボット�よる編集を表示���',
 'tog-watchlisthideminor'      => 'ウォッ�リスト�細部�編集を表示���',
-'tog-nolangconversion'        => '字形変�を無効��る',
+'tog-watchlisthideliu'        => 'ウォッ�リスト�ログイン利用者�編集を表示���',
+'tog-watchlisthideanons'      => 'ウォッ�リスト�匿�利用者�編集を表示���',
+'tog-nolangconversion'        => '言語変種変�を無効��る',
 'tog-ccmeonemails'            => '他�利用者��信��メール�控�を自分�も�る',
 'tog-diffonly'                => '差分表示�下�記事本文を表示���',
 'tog-showhiddencats'          => '隠�カテゴリを表示�る',
+'tog-noconvertlink'           => 'リンクタイトル変�を無効��る',
+'tog-norollbackdiff'          => 'ロール�ック後�差分を表示���',
 
 'underline-always'  => '常�付�る',
 'underline-never'   => '常�付���',
 'underline-default' => 'WWWブラウザ既定',
 
-'skinpreview' => '（プレビュー）',
-
 # Dates
 'sunday'        => '日曜日',
 'monday'        => '月曜日',
@@ -172,7 +311,7 @@ $messages = array(
 'category_header'                => 'カテゴリ “$1� ��るページ',
 'subcategories'                  => 'サブカテゴリ',
 'category-media-header'          => 'カテゴリ “$1� ��るメディア',
-'category-empty'                 => '��カテゴリ��ページ���メディア����も�り��ん。',
+'category-empty'                 => "''��カテゴリ��ページ���メディア����も�り��ん。''",
 'hidden-categories'              => '隠�カテゴリ',
 'hidden-category-category'       => '隠�カテゴリ', # Name of the category where hidden categories will be listed
 'category-subcat-count'          => '{{PLURAL:$2|��カテゴリ��次�1サブカテゴリ��属�����ん。|以下���カテゴリ�属���るサブカテゴリ $2 個中 $1 個を表示�����。}}',
@@ -199,16 +338,16 @@ $messages = array(
 'qbfind'         => '検索',
 'qbbrowse'       => '閲覧',
 'qbedit'         => '編集',
-'qbpageoptions'  => '個人用ツール',
-'qbpageinfo'     => 'ページ情報',
-'qbmyoptions'    => '個人設定',
+'qbpageoptions'  => '��ページ����',
+'qbpageinfo'     => '関連情報',
+'qbmyoptions'    => '利用者用ページ',
 'qbspecialpages' => '特別ページ',
-'moredotdotdot'  => '���表示�る',
-'mypage'         => 'マイ・ページ',
+'moredotdotdot'  => '続�…',
+'mypage'         => '自分�ページ',
 'mytalk'         => '自分�会話',
 'anontalk'       => '��IP利用者�会話',
-'navigation'     => 'ナビゲーション',
-'and'            => '�よ�',
+'navigation'     => '案内',
+'and'            => '&#32;�よ�',
 
 # Metadata in edit box
 'metadata_help' => 'メタデータ:',
@@ -245,34 +384,32 @@ $messages = array(
 'talkpagelinktext'  => '会話',
 'specialpage'       => '特別ページ',
 'personaltools'     => '個人用ツール',
-'postcomment'       => '新��コメントを投稿',
-'articlepage'       => '項目を表示',
+'postcomment'       => '新��セクション',
+'articlepage'       => '記事を表示',
 'talk'              => 'ノート',
 'views'             => '表示',
 'toolbox'           => 'ツールボックス',
 'userpage'          => '利用者ページを表示',
 'projectpage'       => 'プロジェクトページを表示',
-'imagepage'         => 'メディアページを表示',
+'imagepage'         => 'ファイルページを表示',
 'mediawikipage'     => 'メッセージページを表示',
 'templatepage'      => 'テンプレートページを表示',
 'viewhelppage'      => 'ヘルプページを表示',
 'categorypage'      => 'カテゴリページを表示',
 'viewtalkpage'      => 'ノートを表示',
 'otherlanguages'    => '他�言語',
-'redirectedfrom'    => '（$1 �ら転�）',
+'redirectedfrom'    => '($1 �ら転�)',
 'redirectpagesub'   => 'リダイレクトページ',
 'lastmodifiedat'    => '最終更新 $1 $2', # $1 date, $2 time
 'viewcount'         => '��ページ� $1 回アクセス�れ���。',
 'protectedpage'     => '�護�れ�ページ',
 'jumpto'            => '移動:',
-'jumptonavigation'  => 'ナビゲーション',
+'jumptonavigation'  => 'メニュー',
 'jumptosearch'      => '検索',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}����',
 'aboutpage'            => 'Project:{{SITENAME}}����',
-'bugreports'           => '�グ�報告',
-'bugreportspage'       => 'Project:�グ�報告',
 'copyright'            => 'コンテンツ�$1�ライセンス�利用�る�������。',
 'copyrightpagename'    => '{{SITENAME}}�著作権',
 'copyrightpage'        => '{{ns:project}}:著作権',
@@ -295,29 +432,29 @@ $messages = array(
 
 'badaccess'        => '権���り��ん',
 'badaccess-group0' => '�������作を行�権�を������ん。',
-'badaccess-group1' => '��処�� $1 �権�を���利用者���実行����。',
-'badaccess-group2' => '��処�� $1 �����ら��権�を���利用者���実行����。',
-'badaccess-groups' => '��処�� $1 �����れ��権�を���利用者���実行����。',
+'badaccess-groups' => '���作��$1 {{PLURAL:$2|�|���れ��}}グループ�属�る利用者���実行����。',
 
 'versionrequired'     => 'MediaWiki �ージョン $1 �必�',
 'versionrequiredtext' => '��ページ�利用�� MediaWiki �ージョン $1 �必���。[[Special:Version|�ージョン情報]]を確�������。',
 
 'ok'                      => 'OK',
-'retrievedfrom'           => ' "$1" より作�',
-'youhavenewmessages'      => '���宛�$1�届�����。（$2）',
-'newmessageslink'         => '新��メッセージ',
+'retrievedfrom'           => '"$1" より作�',
+'youhavenewmessages'      => '���宛�$1�届�����。($2)',
+'newmessageslink'         => '新���言',
 'newmessagesdifflink'     => '差分',
-'youhavenewmessagesmulti' => '$1 �新��メッセージ�届�����',
+'youhavenewmessagesmulti' => '$1 ����宛�新���言�届�����',
 'editsection'             => '編集',
 'editold'                 => '編集',
 'viewsourceold'           => 'ソースを表示',
+'editlink'                => '編集',
+'viewsourcelink'          => 'ソースを表示',
 'editsectionhint'         => 'セクションを編集: $1',
 'toc'                     => '目次',
 'showtoc'                 => '表示',
 'hidetoc'                 => '�表示',
-'thisisdeleted'           => '$1 を表示���復帰����？',
+'thisisdeleted'           => '$1を閲覧���復帰�る',
 'viewdeleted'             => '$1�削除記録�履歴を確��る',
-'restorelink'             => '削除�れ� $1 編集',
+'restorelink'             => '削除�れ�$1件�編集',
 'feedlinks'               => 'フィード:',
 'feed-invalid'            => 'フィード形��指定�間������。',
 'feed-unavailable'        => 'フィード��信�対応�����ん。',
@@ -325,14 +462,14 @@ $messages = array(
 'site-atom-feed'          => '$1 Atomフィード',
 'page-rss-feed'           => '"$1" �RSSフィード',
 'page-atom-feed'          => '"$1" �Atomフィード',
-'red-link-title'          => '$1 （未作�ページ）',
+'red-link-title'          => '$1 (未作�ページ)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => '本文',
 'nstab-user'      => '利用者ページ',
 'nstab-media'     => 'メディア',
 'nstab-special'   => '特別ページ',
-'nstab-project'   => '解説',
+'nstab-project'   => 'プロジェクトページ',
 'nstab-image'     => 'ファイル',
 'nstab-mediawiki' => 'メッセージ',
 'nstab-template'  => 'テンプレート',
@@ -341,11 +478,11 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '��よ���作��り��ん',
-'nosuchactiontext'  => '��URL�指定�れ��作�{{SITENAME}}��識����ん。',
+'nosuchactiontext'  => '��URL�指定�れ��作�無効��。����URLを間���打����無効�リンクを辿���能性��り��。���{{SITENAME}} �利用�るソフトウェア��グ��る�能性も�り��。',
 'nosuchspecialpage' => '��よ��特別ページ��り��ん',
 'nospecialpagetext' => "<big>'''�求�れ�特別ページ�存在���ん。'''</big>
 
-有効�特別ページ�一覧�[[Special:SpecialPages]]��り��。",
+有効�特別ページ�一覧�[[Special:SpecialPages|{{int:specialpages}}]]��り��。",
 
 # General errors
 'error'                => 'エラー',
@@ -377,11 +514,10 @@ $1',
 
 削除�れ�版�ページ����差分表示や固定リンクを����時���よ������り��。
 
-�れ以外��作���メッセージ�表示�れ�場��ソフトウェア��グ��能性��り��。
-[[Special:ListUsers/sysop|管�者]]��URL �情報を添���知ら�����。',
-'missingarticle-rev'   => '(版#: $1)',
+�れ以外��作���メッセージ�表示�れ�場��ソフトウェア��グ��能性��り��。[[Special:ListUsers/sysop|管�者]]����URLを添���知ら�����。',
+'missingarticle-rev'   => '(版番�: $1)',
 'missingarticle-diff'  => '(差分: $1, $2)',
-'readonly_lag'         => 'データベース�スレーブ・サー�ー�マスタ・サー�ー��期�る��自動的�ロック�れ����。��ら��待�����。',
+'readonly_lag'         => 'データベース�スレーブ・サー�ー�マスター・サー�ー��期�る��自動的�ロック�れ����',
 'internalerror'        => '内部処�エラー',
 'internalerror_info'   => '内部処�エラー: $1',
 'filecopyerror'        => 'ファイル "$1" �ら "$2" �コピー����ん���。',
@@ -394,9 +530,8 @@ $1',
 'formerror'            => 'エラー: フォームを�信����ん���',
 'badarticleerror'      => '��ページ���求�れ��作を行���ん。',
 'cannotdelete'         => '指定�れ�ページ���ファイルを削除����ん���。���他�利用者�よ��削除�れ��能性��り��。',
-'badtitle'             => 'ページタイトル�間��',
+'badtitle'             => '�正�ページ�',
 'badtitletext'         => 'ページ��未入力�無効����正����言語間リンク・ウィキ間リンク��。ページ��利用����文字���れ��る�能性��り��。',
-'perfdisabled'         => '��機能�データベース�負�を軽��る����在使���������。',
 'perfcached'           => '以下�データ�キャッシュ��り�最新�更新を�映������能性��り��。',
 'perfcachedts'         => '以下�データ� $1 �最終更新�れ�キャッシュ��。',
 'querypage-no-updates' => 'ページ�更新�無効�������。以下�データ�更新��在行�れ����ん。',
@@ -408,10 +543,10 @@ $1',
 'actionthrottled'      => '�作�制',
 'actionthrottledtext'  => '����大���作を通常考�られ����短�間隔�行�����スパム防止�観点�ら実行を制�����。少�時間を����らも�一度�作������。',
 'protectedpagetext'    => '��ページ�編集����よ���護�れ����。',
-'viewsourcetext'       => '以下�ソースを表示�����:',
+'viewsourcetext'       => '��ページ�ソースを閲覧��コピー�る�������:',
 'protectedinterface'   => '��ページ�ソフトウェア�インターフェース�使用�れるテキスト��存�れ��り����ら���防止�����護�れ����。',
-'editinginterface'     => "'''警告:''' ����ソフトウェア�インターフェース�使用�れ��るテキストを編集�����。��ページ�変更�����利用者�ユーザインタフェース�影響���。翻訳を�る場��MediaWiki �多言語対応プロジェクト��る [http://translatewiki.net/wiki/Main_Page?setlang=ja Betawiki] �利用を検討������。",
-'sqlhidden'            => '（SQLクエリ�表示）',
+'editinginterface'     => "'''警告:''' ����ソフトウェア�インターフェース�使用�れ��るテキストを編集�����。��ページ�変更�����利用者�ユーザインタフェース�影響���。翻訳を�る場��MediaWiki �多言語対応プロジェクト��る [http://translatewiki.net/wiki/Main_Page?setlang=ja translatewiki.net] �利用を検討������。",
+'sqlhidden'            => '(SQLクエリ�表示)',
 'cascadeprotected'     => '��ページ�カスケード�護�れ��る以下�ページ�ら呼�出�れ��る���編集����よ���護�れ����。
 $2',
 'namespaceprotected'   => "'''$1''' ��空間�属�るページを編集�る権���り��ん。",
@@ -421,19 +556,19 @@ $2',
 �護��由�次�通り��。: ''$2''",
 
 # Virus scanner
-'virus-badscanner'     => '環境設定������: �明�ウイルス検知ソフト: <i>$1</i>',
+'virus-badscanner'     => "環境設定������: �明�ウイルス検知ソフト: ''$1''",
 'virus-scanfailed'     => 'スキャン�失敗���� (コード $1)',
 'virus-unknownscanner' => '�明�ウイルス駆除プログラム:',
 
 # Login and logout pages
 'logouttitle'                => 'ログアウト',
-'logouttext'                 => '<strong>ログアウト����。</strong>
+'logouttext'                 => "'''ログアウト����。'''
 
 ����匿��{{SITENAME}}を使�続�る�������。も�一度元���る��別�利用者���ログイン�る��も����。
-���ブラウザ�キャッシュをクリア�る���ログイン���る��よ��表示�れる����り��。',
+���ブラウザ�キャッシュをクリア�る���ログイン���る��よ��表示�れる����り��。",
 'welcomecreation'            => '== $1 �ん�よ���� ==
 ����アカウント������。
-�好������[[Special:Preferences|個人設定（{{SITENAME}}）]]を変更�る�������。',
+�好������{{SITENAME}}内��[[Special:Preferences|個人設定]]を変更�る�������。',
 'loginpagetitle'             => 'ログイン',
 'yourname'                   => '利用者�:',
 'yourpassword'               => 'パスワード:',
@@ -441,7 +576,6 @@ $2',
 'remembermypassword'         => 'セッションを越��パスワードを記憶�る',
 'yourdomainname'             => '����ドメイン:',
 'externaldberror'            => '外部��証データベース�エラー�発生�������外部アカウント情報�更新�許��れ����ん。',
-'loginproblem'               => '<b>ログイン�エラー�発生����。</b><br />�度実行������。',
 'login'                      => 'ログイン',
 'nav-login-createaccount'    => 'ログイン���アカウント作�',
 'loginprompt'                => '{{SITENAME}}�ログイン�る��クッキーを有効��る必���り��。',
@@ -452,7 +586,7 @@ $2',
 'nologin'                    => 'アカウントを������り��ん�? $1',
 'nologinlink'                => 'アカウントを作�',
 'createaccount'              => 'アカウント作�',
-'gotaccount'                 => '���アカウントを����場�: $1',
+'gotaccount'                 => '���アカウントを������? $1',
 'gotaccountlink'             => 'ログイン',
 'createaccountmail'          => 'メール��信',
 'badretype'                  => '両方�パスワード�一致���ん。',
@@ -463,12 +597,12 @@ $2',
 'prefs-memberingroups'       => 'グループ�構�員:',
 'yourrealname'               => '本�:',
 'yourlanguage'               => '使用言語:',
-'yourvariant'                => '言語�亜種:',
+'yourvariant'                => '言語変種:',
 'yournick'                   => '署�:',
 'badsig'                     => '署��正���り��ん。HTMLタグを見直������。',
-'badsiglength'               => '署��長����。$1文字以下��る必���り��。',
+'badsiglength'               => '����署��長����。$1文字以下��る必���り��。',
 'email'                      => 'メールアドレス',
-'prefs-help-realname'        => '本�登録�任���。本�を入力�る��ページ・クレジット�利用者�（アカウント�）�代�り�本��表示�れ��。',
+'prefs-help-realname'        => '本�登録�任���。本�を登録��場������著作物�帰属表示�用�られ��。',
 'loginerror'                 => 'ログイン失敗',
 'prefs-help-email'           => 'メールアドレス�設定�任�����設定�����パスワードを忘れ�際�新��パスワードを電�メール����る�������。
 ���他�利用者�ら�ウィキメールを���る�����るよ���り��。��時点������メールアドレス���利用者�知られる����り��ん。��������ら�信�れ������メールアドレス�先方�通知�れ��。',
@@ -478,7 +612,7 @@ $2',
 'noname'                     => '利用者�を正��指定�����ん。',
 'loginsuccesstitle'          => 'ログイン�功',
 'loginsuccess'               => "'''{{SITENAME}} � \"\$1\" ���ログイン����。'''",
-'nosuchuser'                 => '"$1"���利用者�見当�り��ん。綴り�正����を�度確��る��[[Special:UserLogin/signup|アカウントを作�������]]。',
+'nosuchuser'                 => '「$1�������利用者�見当�り��ん。利用者���大文字��文字を区別���。綴り�正����を確��る��[[Special:UserLogin/signup|新��アカウントを作�������]]。',
 'nosuchusershort'            => '"<nowiki>$1</nowiki>" ���利用者�見当�り��ん。綴り�正����を�度確�������。',
 'nouserspecified'            => '利用者�を指定������。',
 'wrongpassword'              => 'パスワード�間������。�度入力������。',
@@ -495,10 +629,11 @@ $2',
 'eauthentsent'               => '指定�れ�メールアドレス�アドレス確�����メールを�信����。��アカウント�本当�����も���る�確��る�������メール�内容�従����り���他�メール���アカウント宛���信�れ��ん。',
 'throttled-mailpassword'     => '新��パスワード� $1 時間以内��信済���。悪用防止����パスワード� $1 時間間隔��発行�能��り��。',
 'mailerror'                  => 'メール��信中�エラー�発生����: $1',
-'acct_creation_throttle_hit' => '����既� $1 アカウントを作������。�れ以上作�����ん。',
-'emailauthenticated'         => '����メールアドレス� $1 �確��れ����。',
-'emailnotauthenticated'      => '����メールアドレス�<strong>確��れ����ん</strong>。確��れる��以下����るメールも�られ��ん。',
-'noemailprefs'               => '<strong>�れら�機能を有効��る��メールアドレスを登録������。</strong>',
+'acct_creation_throttle_hit' => '������IPアドレス���ウィキ�訪れ�方��昨日一日� $1個�アカウントを作��れ���。�れ�一定期間中�作��許��れ��る最大数��。
+������在��IPアドレス�利用者�アカウントを�れ以上作�����ん。',
+'emailauthenticated'         => '����メールアドレス� $2 � $3 �確��れ����。',
+'emailnotauthenticated'      => '����メールアドレス�確��れ����ん。確��れる��以下����るメールも�られ��ん。',
+'noemailprefs'               => '�れら�機能を有効��る����個人設定�メールアドレスを登録�る必���り��。',
 'emailconfirmlink'           => 'メールアドレスを確��る',
 'invalidemailaddress'        => '入力�れ�メールアドレス�正��形��従����������付�られ��ん。正��形��入力�直���メールアドレス欄を空�������。',
 'accountcreated'             => 'アカウントを作�����',
@@ -514,25 +649,33 @@ $2',
 今��ログイン��パスワードを変更������。
 
 何��手���アカウント�作��れ����場����メッセージ�無視������。',
+'login-throttled'            => 'パスワード入力�失敗�制�回数を超����。��ら�時間を����ら�度�試�����。',
 'loginlanguagelabel'         => '言語: $1',
 
 # Password reset dialog
-'resetpass'               => 'パスワード��設定',
-'resetpass_announce'      => 'メール�信�れ�仮パスワード�ログイン�����。ログインを完了�る���新��パスワードを設定����必���り��。',
-'resetpass_text'          => '<!-- ���テキストを挿入 -->',
-'resetpass_header'        => 'アカウント�パスワードを変更',
-'resetpass_submit'        => '�設定��ログイン',
-'resetpass_success'       => '����パスワード�変更�れ���。ログイン�����...',
-'resetpass_bad_temporary' => '無効�仮パスワード��。���パスワード変更を行���る��新��仮パスワード�発行を�頼�����ん�。',
-'resetpass_forbidden'     => '��ウィキ��パスワード�変更�許��れ����ん。',
-'resetpass_missing'       => 'データ�セット�れ����ん。',
+'resetpass'                 => 'パスワード�変更',
+'resetpass_announce'        => 'メール�信�れ�仮パスワード�ログイン�����。ログインを完了�る���新��パスワードを設定����必���り��。',
+'resetpass_text'            => '<!-- ���テキストを挿入 -->',
+'resetpass_header'          => 'アカウント�パスワードを変更',
+'oldpassword'               => '��パスワード:',
+'newpassword'               => '新��パスワード:',
+'retypenew'                 => '新��パスワードを�入力:',
+'resetpass_submit'          => '�設定��ログイン',
+'resetpass_success'         => '����パスワード�変更�れ���。ログイン�����...',
+'resetpass_bad_temporary'   => '無効�仮パスワード��。���パスワード変更を行���る��新��仮パスワード�発行を�頼�����ん�。',
+'resetpass_forbidden'       => '��ウィキ��パスワード�変更�許��れ����ん。',
+'resetpass-no-info'         => '��ページ�直接アクセス�る����ログイン���る必���り��。',
+'resetpass-submit-loggedin' => 'パスワードを変更',
+'resetpass-wrong-oldpass'   => '仮パスワード����在�パスワード�無効��。
+���パスワード変更を行���る��新��仮パスワード�発行を�頼�����ん�。',
+'resetpass-temp-password'   => '仮パスワード:',
 
 # Edit page toolbar
 'bold_sample'     => '強�強調（太字）',
 'bold_tip'        => '強�強調（太字）',
 'italic_sample'   => '弱�強調（斜体）',
 'italic_tip'      => '弱�強調（斜体）',
-'link_sample'     => '項目�',
+'link_sample'     => 'ページ�',
 'link_tip'        => '内部リンク',
 'extlink_sample'  => 'http://www.example.com リンク�タイトル',
 'extlink_tip'     => '外部リンク（http:// を忘れ���������）',
@@ -549,8 +692,8 @@ $2',
 'hr_tip'          => '水平線（利用�控���）',
 
 # Edit pages
-'summary'                          => '編集内容��約',
-'subject'                          => '題�・見出�',
+'summary'                          => '編集内容��約:',
+'subject'                          => '題�・見出�:',
 'minoredit'                        => '�れ�細部�編集��',
 'watchthis'                        => 'ウォッ�リスト�追加',
 'savearticle'                      => 'ページを�存',
@@ -558,13 +701,13 @@ $2',
 'showpreview'                      => 'プレビューを表示',
 'showlivepreview'                  => 'ライブプレビュー',
 'showdiff'                         => '差分を表示',
-'anoneditwarning'                  => "'''警告:'''����ログイン�����ん。����投稿を行��場������IPアドレス���項目�履歴�記録�れ��。",
+'anoneditwarning'                  => "'''警告:''' ����ログイン�����ん。����投稿を行��場������IPアドレス���ページ�編集履歴�記録�れ��。",
 'missingsummary'                   => "'''注�:''' �約欄�空欄��。投稿ボタンをも�一度押����約�����投稿�れ��。",
 'missingcommenttext'               => '以下�コメントを入力������。',
 'missingcommentheader'             => "'''注�:''' 題�・見出��空欄��。投稿ボタンをも�一度押����約�����投稿�れ��。",
-'summary-preview'                  => '�約�プレビュー',
-'subject-preview'                  => '題�・見出��プレビュー',
-'blockedtitle'                     => '投稿ブロック',
+'summary-preview'                  => '�約�プレビュー:',
+'subject-preview'                  => '題�・見出��プレビュー:',
+'blockedtitle'                     => '投稿ブロック�れ����',
 'blockedtext'                      => "<big>'''��利用者����IPアドレス��投稿�ブロック�れ����。'''</big>
 
 ブロック� $1 �よ��実施�れ���。
@@ -595,7 +738,7 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'blockededitsource'                => "'''$1''' �� '''����編集''' を以下�示���:",
 'whitelistedittitle'               => '編集��ログイン�必�',
 'whitelistedittext'                => '��ページを編集�る�� $1 �る必���り��。',
-'confirmedittitle'                 => '編集��メールアドレス�確��必���。',
+'confirmedittitle'                 => '編集��メールアドレス�確��必�',
 'confirmedittext'                  => 'ページ�編集を始�る��メールアドレス�確�を�る必���り��。[[Special:Preferences|個人設定]]�メールアドレスを設定��確�を行������。',
 'nosuchsectiontitle'               => 'セクション�存在���ん',
 'nosuchsectiontext'                => '指定�れ�セクション��り��ん。セクション $1 ��り��ん������セクション編集�無効��り��。編集内容��存�れ��ん。',
@@ -604,7 +747,7 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'loginreqpagetext'                 => '他�ページを閲覧�る��$1�る必���り��。',
 'accmailtitle'                     => 'パスワードを�信����',
 'accmailtext'                      => '"$1" �パスワードを $2 ��信����。',
-'newarticle'                       => '（新�）',
+'newarticle'                       => '(新�)',
 'newarticletext'                   => '����クリック��リンク先�ページ���存在�����ん。
 
 ��ページを新��作��る���下�ボックス�内容を書�込ん�����（詳���[[{{MediaWiki:Helppage}}|ヘルプページ]]を�照������）。
@@ -612,41 +755,38 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 ページを作��る�もり���場����ブラウザ�「戻る�ボタンを使����ページ�戻������。',
 'anontalkpagetext'                 => "----
 ''�れ�アカウントを��作���������る��使�����匿�利用者����会話ページ��。匿�利用者�識別�利用者����り�IPアドレスを用���。IPアドレス�何人��共有�れる����り��。も�����匿�利用者�無関係�コメント�寄�られ��る��考��場���[[Special:UserLogin/signup|アカウントを作��る]]�[[Special:UserLogin|ログイン��]]他�匿�利用者�間��られ��よ�������るよ��願����。''",
-'noarticletext'                    => '�在��ページ��内容��り��ん。他�ページ�ら[[Special:Search/{{PAGENAME}}|��ページタイトルを検索�る]]��[{{fullurl:{{FULLPAGENAME}}|action=edit}} ��ページを編集]����。',
+'noarticletext'                    => '�在��ページ��内容��り��ん。他�ページ�ら[[Special:Search/{{PAGENAME}}|��ページ�を検索�る]]��も���<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} 関連記録�ら検索�る]��[{{fullurl:{{FULLPAGENAME}}|action=edit}} ��ページを編集]</span>�る������。',
 'userpage-userdoesnotexist'        => '"$1" ������アカウント�登録�れ����ん。��ページを編集�る����切����確�������。',
 'clearyourcache'                   => "'''�知ら�:''' �存��後�ブラウザ�キャッシュをクリア�る必���り��。
 * '''Mozilla / Firefox / Safari:''' [Shift] を押���ら [�読�込�] をクリック���� [Ctrl]-[F5] � [Ctrl]-[R] （Macintosh�� [Cmd]-[Shift]-[R]）
 * '''IE:''' [Ctrl] を押���ら [更新] をクリック���� [Ctrl]-[F5]
 * '''Konqueror:''' [�読�込�] をクリック���� [F5]
 * '''Opera:''' 「ツール�→「設定��らキャッシュをクリア。",
-'usercssjsyoucanpreview'           => '<strong>ヒント:</strong> 「{{int:showpreview}}�ボタンを使���存��新��スタイルシート・スクリプトをテスト����。',
+'usercssjsyoucanpreview'           => "'''助言:''' 「{{int:showpreview}}�ボタンを使���存��新��スタイルシートやスクリプトをテスト����。",
 'usercsspreview'                   => "'''����ユーザースタイルシートをプレビュー�����。���存�れ������注�������。'''",
-'userjspreview'                    => "'''����ユーザースクリプトをテスト・プレビュー�����。���存�れ������注�������。'''",
-'userinvalidcssjstitle'            => "'''警告:''' \"\$1\" ���外装��り��ん。.css � .js ページを編集�る際��タイトルを�文字��る��を忘れ�������。例�� {{ns:user}}:Hoge/Monobook.css ���� {{ns:user}}:Hoge/monobook.css ��り��。",
-'updated'                          => '（更新）',
-'note'                             => '<strong>�知ら�:</strong>',
-'previewnote'                      => '<strong>�れ�プレビュー��。
-���存�れ����ん!</strong>',
+'userjspreview'                    => "'''����ユーザースクリプトを試験的�プレビュー�����。���存�れ������注�������。'''",
+'userinvalidcssjstitle'            => "'''警告:''' 「$1����スキン��り��ん。.css � .js ページを編集�る際��サブページ�を�文字��る��を忘れ�������。例�� {{ns:user}}:Hoge/Monobook.css ���� {{ns:user}}:Hoge/monobook.css ��り��。",
+'updated'                          => '(æ›´æ–°)',
+'note'                             => "'''�知ら�:'''",
+'previewnote'                      => "'''�れ�プレビュー��。���存�れ����ん�'''",
 'previewconflict'                  => '��プレビュー��上�文章編集エリア�文章を�存��場����見�るよ���る�を示�も���。',
-'session_fail_preview'             => '<strong>申�訳�り��ん�セッション�切断�れ���編集を�存����ん���。も�一度やり��������。�れ�も失敗�る場��ログアウト���らログイン�直������。</strong>',
-'session_fail_preview_html'        => "<strong>申�訳�り��ん。セッション�切断�れ���編集を�存�る�������ん���。</strong>
+'session_fail_preview'             => "'''申�訳�り��ん�セッション�切断�れ���編集を�存����ん���。も�一度やり��������。�れ�も失敗�る場��ログアウト���らログイン�直������。'''",
+'session_fail_preview_html'        => "'''申�訳�り��ん。セッション�切断�れ���編集を�存�る�������ん���。'''
 
 ''{{SITENAME}}��HTML�使用�制�を設���ら��JavaScript ��攻撃を予防�る���プレビューを表示�����ん。''
 
-<strong>��編集��題��も���る�ら��度�存������。�れ�も�������際��一度[[Special:UserLogout|ログアウト]]���も�一度ログイン��������。</strong>",
-'token_suffix_mismatch'            => '<strong>����使用���るクライアント��エディット・トークン内��読点を正��処��������を確�����。
-��ページ�文章�破��る�を防��������編集��映�れ��ん。
-�題��る匿�プロキシサービスを利用���る�����題�起�る����り��。</strong>',
+'''��編集��題��も���る�ら��度�存������。�れ�も�������際��一度[[Special:UserLogout|ログアウト]]���も�一度ログイン��������。'''",
+'token_suffix_mismatch'            => "'''����使用���るクライアント��編集トークン内��読点を正��処��������を確�����。��ページ�文章�破��る�を防��������編集��映�れ��ん。�題��る匿�プロキシサービスを利用���る�����題�起�る����り��。'''",
 'editing'                          => '$1 を編集中',
 'editingsection'                   => '$1 を編集中（セクション��編集）',
-'editingcomment'                   => '$1 を編集中（新�コメント）',
+'editingcomment'                   => '$1 を編集中（新��セクション）',
 'editconflict'                     => '編集競�: $1',
 'explainconflict'                  => '������ページを編集�始��後��他�誰����ページを変更����。上��テキストエリア��在�最新�状態��。����編集����文章�下��テキストエリア�示�れ����。編集����文章を�上��テキストエリア�文章�組�込ん�����。<strong>上��テキストエリア�内容��</strong>��「{{int:Savearticle}}�をクリック��時�実際��存�れ��。',
 'yourtext'                         => '����文章',
 'storedversion'                    => '�存�れ�版',
-'nonunicodebrowser'                => '<strong>警告: ����使用���るブラウザ�Unicode互����り��ん。項目を編集�る��ブラウザを変更������。</strong>',
-'editingold'                       => '<strong>警告: ������ページ���版を編集�����。も���文章を�存�る����版以��追加�れ�全��変更�無効���������。</strong>',
-'yourdiff'                         => '����更新内容',
+'nonunicodebrowser'                => "'''警告: ����使用���るブラウザ�ユニコード�準拠�����ん。ページを編集�る��ブラウザを変更������。'''",
+'editingold'                       => "'''警告: ������ページ���版を編集�����。も���文章を�存�る����版以��追加�れ�全��変更�無効���������。'''",
+'yourdiff'                         => '更新内容',
 'copyrightwarning'                 => "'''■投稿�る��以下を確�������■'''
 * {{SITENAME}}�投稿�れ�文書�����$2（詳細�$1を�照）�よ��公開�れる�����������。
 * ����文章�他人�よ��自由�編集��布�れる��を望���場���投稿を控������。
@@ -654,18 +794,20 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'copyrightwarning2'                => "'''■投稿�る��以下を確�������■'''
 * ����文章�他人�よ��自由�編集��布�れる��を望���場���投稿を控������。
 * ����投稿�る文章����自身�よ��書�れ�も���る��パブリック・ドメイン��れ�類�る自由�リソース�ら�複製��る��を約�������（詳細�$1を�照）。'''����著作権を�������作�を許諾���投稿�������ん!'''",
-'longpagewarning'                  => '<strong>警告: ��ページ�サイズ� $1 キロ�イト��。一部�ブラウザ�� 32 キロ�イト以上�ページを編集�る��題�起�るも���り��。ページをセクション�分�る��を検討������。</strong>',
-'longpageerror'                    => '<strong>エラー: ����投稿��テキスト� $1 キロ�イト�長���り��。�れ�投稿��る最大�長���る $2 キロ�イトを超�����。��編集を�存�る�������ん。</strong>',
-'readonlywarning'                  => '<strong>警告: データベース�メンテナンス����ロック�れ����。�在�編集�果を�存����ん。文章をカットアンドペースト��ローカルファイル����存��後���存をやり直������。</strong>',
+'longpagewarning'                  => "'''警告: ��ページ�サイズ� $1 キロ�イト��。一部�ブラウザ�� 32 キロ�イト以上�ページを編集�る��題�起�るも���り��。ページをセクション�分�る��を検討������。'''",
+'longpageerror'                    => "'''エラー: ����投稿��テキスト� $1 キロ�イト�長���り��。�れ�投稿��る最大�長���る $2 キロ�イトを超�����。��編集を�存�る�������ん。'''",
+'readonlywarning'                  => "'''警告: データベース�メンテナンス����ロック�れ��る����在�編集�果を�存����ん。必���れ�文章をカットアンドペースト��ローカルファイル����存��後���存をやり直������。'''
+
+データベースをロック��管�者�よるロック�説明�次�通り��: $1",
 'protectedpagewarning'             => "'''警告:''' ��ページ��護�れ����。{{int:group-sysop}}��編集����ん。",
 'semiprotectedpagewarning'         => "'''�知ら�:''' ��ページ�登録利用者���編集��るよ��護�れ����。",
 'cascadeprotectedwarning'          => "'''警告:''' ��ページ�カスケード�護�れ��る以下�ページ�ら呼�出�れ��る���{{int:group-sysop}}��編集����ん。",
-'titleprotectedwarning'            => '<strong>警告:  ��ページ�ロック�れ��る���特定�利用者以外�作��る�������ん。</strong>',
+'titleprotectedwarning'            => "'''警告: ��ページ�ロック�れ��る���作���[[Special:ListGroupRights|特別�権�]]�必���。'''",
 'templatesused'                    => '��ページ�使�れ��るテンプレート:',
 'templatesusedpreview'             => '��プレビュー�使�れ��るテンプレート:',
 'templatesusedsection'             => '��セクション�使�れ��るテンプレート:',
-'template-protected'               => '（�護）',
-'template-semiprotected'           => '（��護）',
+'template-protected'               => '(�護)',
+'template-semiprotected'           => '(��護)',
 'hiddencategories'                 => '��ページ�$1個�隠�カテゴリ�属�����:',
 'edittools'                        => '<!-- ���書��テキスト�編集��アップロード�フォーム�下�表示�れ��。 -->',
 'nocreatetitle'                    => 'ページを作�����ん',
@@ -674,25 +816,36 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'permissionserrors'                => '�証エラー',
 'permissionserrorstext'            => '�������ページ�編集権���り��ん。�由�以下�通り��:',
 'permissionserrorstext-withaction' => '以下�示�れ��由�より$2を行��������ん:',
-'recreate-deleted-warn'            => "'''警告:����以��削除�れ�ページを�作��よ�������。'''
-
-��ページ�編集��切��る����確�������。�考���以下���ページ�削除記録を表示�����:",
+'recreate-deleted-warn'            => "'''警告: ����以��削除�れ�ページを�作��よ�������。'''
+
+��ページを編集�続�る����切��る����確�������。�考���以下���ページ�削除記録を表示�����:",
+'deleted-notice'                   => '��ページ�削除�れ����。
+�考������ページ�削除ログ�以下�表示�れ����。',
+'deletelog-fulllog'                => '完全�ログを表示',
+'edit-hook-aborted'                => 'フック�よ��編集�破棄�れ���。�由��明��。',
+'edit-gone-missing'                => 'ページをアップデート����ん���。既�削除�れ��るよ���。',
+'edit-conflict'                    => '編集競�。',
+'edit-no-change'                   => 'テキスト�変更�れ�����������編集��映�れ��ん���。',
+'edit-already-exists'              => '新��ページを作�����ん���。
+��ページ�����存在�����。',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => '警告: ��ページ��件文関数�呼�出�負��高����。
+'expensive-parserfunction-warning'        => '警告：��ページ�高負��件文関数�使用回数�多����。
 
-�在� $1 ��。$2 より低�必���り��。',
+�在� $1 ����$2 以下��る必���り��。',
 'expensive-parserfunction-category'       => '高負��件文関数�多��るページ',
 'post-expand-template-inclusion-warning'  => '警告: テンプレート�読�込�サイズ�大�����。�����テンプレート�展開�れ��ん。',
 'post-expand-template-inclusion-category' => 'テンプレート読�込�サイズ�制�値を越���るページ',
 'post-expand-template-argument-warning'   => '警告：��ページ��展開後�サイズ�大���るテンプレート引数�1�以上��れ����。�れら�テンプレート引数�無視�れ���。',
 'post-expand-template-argument-category'  => '無視�れ�テンプレート引数を�むページ',
+'parser-template-loop-warning'            => 'テンプレート�ループ�検出�れ���： [[$1]]',
+'parser-template-recursion-depth-warning' => 'テンプレート��帰回数��界を超���� ($1)',
 
 # "Undo" feature
 'undo-success' => '編集��り消���能��。�れ������図��編集��る��下�表示�れ��る差分を確�������。�存ボタンを押���り消��確定�れ��。',
 'undo-failure' => '中間�版��編集�競�������り消���ん���。',
 'undo-norev'   => '�り消�����編集�存在�������削除�れ�����り消���ん���。',
-'undo-summary' => '[[Special:Contributions/$2|$2]] ([[User talk:$2|会話]]) �よる版 ID:$1 を�り消�',
+'undo-summary' => '[[Special:Contributions/$2|$2]] ([[User talk:$2|会話]]) �よる ID:$1 �版を�り消�',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'アカウントを作�����ん',
@@ -701,28 +854,28 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 ブロック�由: ''$2''",
 
 # History pages
-'viewpagelogs'        => '��ページ�関�るログを表示',
-'nohistory'           => '��ページ��変更履歴��り��ん。',
-'revnotfound'         => '�求�れ�版�見��り��ん。',
-'revnotfoundtext'     => '�求�れ���ページ�旧版�見��り��ん���。��ページ�アクセス��URLをも�一度確�������。',
-'currentrev'          => '最新版',
-'revisionasof'        => '$1時点���る版',
-'revision-info'       => '$1時点���る $2 �よる版',
-'previousrevision'    => '���版',
-'nextrevision'        => '次�版→',
-'currentrevisionlink' => '最新版を表示',
-'cur'                 => '最新版',
-'next'                => '次�版',
-'last'                => '��版',
-'page_first'          => '先頭',
-'page_last'           => '末尾',
-'histlegend'          => '差分を表示�る��比較���版�ラジオボタンを�択��エンターキーを押���ページ下部�ボタンを押���。<br />
-凡例:（最新版）= 最新版��比較�（��版）= 直��版��比較�{{int:minoreditletter}} = 細部�編集',
-'deletedrev'          => '[削除済�]',
-'histfirst'           => '最�',
-'histlast'            => '最新',
-'historysize'         => '（$1 �イト）',
-'historyempty'        => '（空��）',
+'viewpagelogs'           => '��ページ�関�るログを表示',
+'nohistory'              => '��ページ��変更履歴��り��ん。',
+'currentrev'             => '最新版',
+'currentrev-asof'        => '$1 時点���る最新版',
+'revisionasof'           => '$1時点���る版',
+'revision-info'          => '$1時点���る $2 �よる版', # Additionally available: $3: revision id
+'previousrevision'       => '���版',
+'nextrevision'           => '次�版→',
+'currentrevisionlink'    => '最新版を表示',
+'cur'                    => '最新版',
+'next'                   => '次�版',
+'last'                   => '��版',
+'page_first'             => '先頭',
+'page_last'              => '末尾',
+'histlegend'             => "差分を表示�る��比較���版�ラジオボタンを�択��エンターキーを押���下部�ボタンを押���。<br />
+凡例: '''({{int:cur}})''' = 最新版��比較�'''({{int:last}})''' = 直��版��比較�'''{{int:minoreditletter}}''' = 細部�編集",
+'history-fieldset-title' => '履歴�検索',
+'deletedrev'             => '[削除済�]',
+'histfirst'              => '最�',
+'histlast'               => '最新',
+'historysize'            => '($1 �イト)',
+'historyempty'           => '(空)',
 
 # Revision feed
 'history-feed-title'          => '変更履歴',
@@ -731,9 +884,9 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'history-feed-empty'          => '�求��ページ�存在���ん。既�削除�れ��移動�れ��能性��り��。 [[Special:Search|��ウィキ�検索]]�関連�る新��ページを探��������。',
 
 # Revision deletion
-'rev-deleted-comment'         => '（�約�削除�れ����）',
-'rev-deleted-user'            => '（投稿者��削除�れ����）',
-'rev-deleted-event'           => '（ログ�記録�削除�れ����）',
+'rev-deleted-comment'         => '(�約�削除�れ����)',
+'rev-deleted-user'            => '(投稿者��削除�れ����)',
+'rev-deleted-event'           => '(ログ�削除�れ����)',
 'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
 ��版�公�アーカイブ�ら削除�れ����。削除�詳細�[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} 削除記録]を�照������。</div>',
 'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">
@@ -769,8 +922,8 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'revdelete-content'           => '本文',
 'revdelete-summary'           => '編集内容��約',
 'revdelete-uname'             => '利用者�',
-'revdelete-restricted'        => '管�者�対���用�る制�',
-'revdelete-unrestricted'      => '管�者�対��解除�る制�',
+'revdelete-restricted'        => '管�者�対�る制�を�用����',
+'revdelete-unrestricted'      => '管�者�対�る制�を解除����',
 'revdelete-hid'               => '$1を隠����',
 'revdelete-unhid'             => '$1�秘匿を解除����',
 'revdelete-log-message'       => '$2版�対��$1',
@@ -797,10 +950,11 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'mergehistory-fail'                => '履歴�統�を行����出���ん。統�を行�ページ�時刻を�確�������。',
 'mergehistory-no-source'           => '統�元��るページ $1 �存在���ん。',
 'mergehistory-no-destination'      => '統�先�ページ $1 �存在���ん。',
-'mergehistory-invalid-source'      => '統�元��るページ�正確�タイトルを指定������。',
-'mergehistory-invalid-destination' => '統�先�ページ�正確�タイトルを指定������。',
+'mergehistory-invalid-source'      => '統�元��るページ�正確���を指定������。',
+'mergehistory-invalid-destination' => '統�先�ページ�正確���を指定������。',
 'mergehistory-autocomment'         => '[[:$1]]を[[:$2]]�統�',
 'mergehistory-comment'             => '[[:$1]]を[[:$2]]�統�: $3',
+'mergehistory-same-destination'    => '統�元�統�先���ページを設定�る�������ん。',
 
 # Merge log
 'mergelog'           => '統�記録',
@@ -813,119 +967,201 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'difference'              => '版間��差分',
 'lineno'                  => '$1 行',
 'compareselectedversions' => '�択��版�士を比較',
+'visualcomparison'        => '表示�果�比較',
+'wikicodecomparison'      => 'ウィキテキスト�比較',
 'editundo'                => '�り消�',
-'diff-multi'              => '（間� $1 版分��表示��）',
+'diff-multi'              => '(間� $1版分��表示)',
+'diff-movedto'            => '$1�移動',
+'diff-styleadded'         => '$1 �スタイル追加',
+'diff-added'              => '$1�追加',
+'diff-changedto'          => '$1�変更',
+'diff-movedoutof'         => '$1�ら移動',
+'diff-styleremoved'       => '$1�スタイル除去',
+'diff-removed'            => '$1�除去',
+'diff-changedfrom'        => '$1�ら変更',
+'diff-src'                => '出典',
+'diff-withdestination'    => '変更先�$1',
+'diff-with'               => '$1 $2 �&#32;',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32; �よ� $1 $2',
+'diff-width'              => 'å¹…',
+'diff-height'             => '高�',
+'diff-p'                  => "'''パラグラフ'''",
+'diff-blockquote'         => "'''引用'''",
+'diff-h1'                 => "'''見出� (レベル1)'''",
+'diff-h2'                 => "'''見出� (レベル2)'''",
+'diff-h3'                 => "'''見出� (レベル3)'''",
+'diff-h4'                 => "'''見出� (レベル4)'''",
+'diff-h5'                 => "'''見出� (レベル5)'''",
+'diff-pre'                => "'''未整形�文章群'''",
+'diff-div'                => "'''分割'''",
+'diff-ul'                 => "'''番���リスト'''",
+'diff-ol'                 => "'''番�付�リスト'''",
+'diff-li'                 => "'''リスト・アイテム'''",
+'diff-table'              => "'''表'''",
+'diff-tbody'              => "'''表�中身'''",
+'diff-tr'                 => "'''列'''",
+'diff-td'                 => "'''セル'''",
+'diff-th'                 => "'''ヘッダ'''",
+'diff-br'                 => "'''改行'''",
+'diff-hr'                 => "'''水平線'''",
+'diff-code'               => "'''プログラムコード'''",
+'diff-dl'                 => "'''定義リスト'''",
+'diff-dt'                 => "'''定義語'''",
+'diff-dd'                 => "'''定義'''",
+'diff-input'              => "'''入力'''",
+'diff-form'               => "'''フォーム'''",
+'diff-img'                => "'''画�'''",
+'diff-span'               => "'''スパン'''",
+'diff-a'                  => "'''リンク'''",
+'diff-i'                  => "'''イタリック体'''",
+'diff-b'                  => "'''ボールド体'''",
+'diff-strong'             => "'''強調'''",
+'diff-em'                 => "'''強調'''",
+'diff-font'               => "'''フォント'''",
+'diff-big'                => "'''大��'''",
+'diff-del'                => "'''削除済�'''",
+'diff-tt'                 => "'''幅修正済�'''",
+'diff-sub'                => "'''下付�'''",
+'diff-sup'                => "'''上付�'''",
+'diff-strike'             => "'''�り消�線'''",
 
 # Search results
-'searchresults'             => '検索�果',
-'searchresulttext'          => '{{SITENAME}}�検索�関�る詳��情報��[[{{MediaWiki:Helppage}}|{{int:help}}]]を�覧����。',
-'searchsubtitle'            => '検索語: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" �ら始�るページ]] | [[Special:WhatLinksHere/$1|"$1" �リンク元]])',
-'searchsubtitleinvalid'     => "検索語: '''$1'''",
-'noexactmatch'              => "'''「$1����タイトル�ページ�存在���ん。'''[[:$1|新�作��る]]�������。",
-'noexactmatch-nocreate'     => "'''「$1����タイトル�ページ�存在���ん。'''",
-'toomanymatches'            => '一致��ページ�多�����他�検索語を指定������',
-'titlematches'              => 'ページタイトル�一致',
-'notitlematches'            => 'ページ���一致���ん���',
-'textmatches'               => 'ページ内本文�一致',
-'notextmatches'             => 'ページ内本文��一致���ん���',
-'prevn'                     => '� $1',
-'nextn'                     => '次 $1',
-'viewprevnext'              => '（$1）（$2）（$3）を表示',
-'search-result-size'        => '$1 ($2語)',
-'search-result-score'       => '関連度: $1%',
-'search-redirect'           => '($1 �リダイレクト)',
-'search-section'            => '(セクション $1)',
-'search-suggest'            => 'も����: $1',
-'search-interwiki-caption'  => '姉妹プロジェクト',
-'search-interwiki-default'  => '$1��果:',
-'search-interwiki-more'     => '(���)',
-'search-mwsuggest-enabled'  => '検索候補を表示',
-'search-mwsuggest-disabled' => '検索候補を表示���',
-'search-relatedarticle'     => '関連',
-'mwsuggest-disable'         => 'AJAX �よるサジェストを無効��る',
-'searchrelated'             => '関連',
-'searchall'                 => 'all',
-'showingresults'            => '<b>$2</b> 件目�ら <b>$1</b> 件を表示�����。',
-'showingresultsnum'         => '<b>$2</b> 件目�ら <b>$3</b> 件を表示�����。',
-'showingresultstotal'       => "'''$3''' 件中 {{PLURAL:$3|'''$1''|'''$1 - $2'''}} 件目�検索�果を表示",
-'nonefound'                 => "'''注�''':通常�設定��一部���空間��検索�れ��ん。全ページを検索�る�����''all:'' を冒頭����検索�る��検索を行�����空間を指定������。",
-'powersearch'               => '検索',
-'powersearch-legend'        => '高度�検索',
-'powersearch-ns'            => '��空間を指定��検索:',
-'powersearch-redir'         => 'リダイレクト�一覧',
-'powersearch-field'         => '検索キーワード:',
-'search-external'           => '外部検索',
-'searchdisabled'            => '<p>全文検索�サー�ー負��都��ら�一時的�使用�止�����。元�戻る��Google��全文検索を利用������。検索�果�少���内容��り��。</p>',
+'searchresults'                    => '検索�果',
+'searchresults-title'              => '「$1��検索�果',
+'searchresulttext'                 => '{{SITENAME}}�検索�関�る詳��情報��[[{{MediaWiki:Helppage}}|{{int:help}}]]を�覧����。',
+'searchsubtitle'                   => '検索語: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" �ら始�るページ]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" �リンク元]])',
+'searchsubtitleinvalid'            => "検索語: '''$1'''",
+'noexactmatch'                     => "'''「$1�������ページ�存在���ん。'''[[:$1|新�作��る]]�������。",
+'noexactmatch-nocreate'            => "'''「$1�������ページ�存在���ん。'''",
+'toomanymatches'                   => '一致��ページ�多�����他�検索語を指定������',
+'titlematches'                     => 'ページ��一致',
+'notitlematches'                   => 'ページ���一致���ん���',
+'textmatches'                      => 'ページ内本文�一致',
+'notextmatches'                    => 'ページ内本文��一致���ん���',
+'prevn'                            => '� $1',
+'nextn'                            => '次 $1',
+'viewprevnext'                     => '($1) ($2) ($3) を表示',
+'searchmenu-legend'                => '検索オプション',
+'searchmenu-exists'                => "'''��ウィキ��「[[$1]]�������ページ��り��'''",
+'searchmenu-new'                   => "'''��ウィキ�ページ\"[[:\$1|\$1]]\"を新�作��る'''",
+'searchhelp-url'                   => 'Help:目次',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|��文字列�ら始�る���ページを見る]]',
+'searchprofile-articles'           => '記事',
+'searchprofile-articles-and-proj'  => '記事�プロジェクト文書',
+'searchprofile-project'            => 'プロジェクトページ',
+'searchprofile-images'             => 'ファイル',
+'searchprofile-everything'         => '全�',
+'searchprofile-advanced'           => '詳細',
+'searchprofile-articles-tooltip'   => '$1 ��空間を検索',
+'searchprofile-project-tooltip'    => '$1 ��空間を検索',
+'searchprofile-images-tooltip'     => 'ファイルを検索',
+'searchprofile-everything-tooltip' => '全ページ (ノート�会話ページ�む) を検索',
+'searchprofile-advanced-tooltip'   => '��空間を指定��検索',
+'prefs-search-nsdefault'           => '標準�設定�検索:',
+'prefs-search-nscustom'            => '指定����空間を検索:',
+'search-result-size'               => '$1 ($2語)',
+'search-result-score'              => '関連度: $1%',
+'search-redirect'                  => '($1 �リダイレクト)',
+'search-section'                   => '(セクション $1)',
+'search-suggest'                   => 'も����: $1',
+'search-interwiki-caption'         => '姉妹プロジェクト',
+'search-interwiki-default'         => '$1��果:',
+'search-interwiki-more'            => '(���)',
+'search-mwsuggest-enabled'         => '検索候補を表示',
+'search-mwsuggest-disabled'        => '検索候補を表示���',
+'search-relatedarticle'            => '関連',
+'mwsuggest-disable'                => 'AJAX�よる検索候補��示を無効��る',
+'searchrelated'                    => '関連',
+'searchall'                        => 'all',
+'showingresults'                   => '<b>$2</b> 件目�ら <b>$1</b> 件を表示�����。',
+'showingresultsnum'                => '<b>$2</b> 件目�ら <b>$3</b> 件を表示�����。',
+'showingresultstotal'              => "'''$3''' 件中 {{PLURAL:$4|'''$1'''|'''$1 - $2'''}}件目�検索�果を表示�����",
+'nonefound'                        => "'''注�''': 通常�設定��一部���空間��検索�れ��ん。全ページを検索�る�����''all:'' を冒頭����検索�る��検索を行�����空間を指定������。",
+'search-nonefound'                 => '�������致�る�果��り��ん���。',
+'powersearch'                      => '検索',
+'powersearch-legend'               => '高度�検索',
+'powersearch-ns'                   => '��空間を指定��検索:',
+'powersearch-redir'                => 'リダイレクトを表示',
+'powersearch-field'                => '検索キーワード:',
+'search-external'                  => '外部検索',
+'searchdisabled'                   => '{{SITENAME}} �全文検索�サー�ー負��都��ら�一時的�使用�止�����。元�戻る�� Google ��全文検索を利用������。検索�果�少���内容��り��。',
 
 # Preferences page
-'preferences'              => '個人設定',
-'mypreferences'            => '個人設定',
-'prefs-edits'              => '編集回数:',
-'prefsnologin'             => 'ログイン�����ん',
-'prefsnologintext'         => '個人設定を変更�る����<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ログイン]</span>���る必���り��。',
-'prefsreset'               => '個人設定を�存�れ��る状態�復帰����。',
-'qbsettings'               => 'クイック�ー設定',
-'qbsettings-none'          => '��',
-'qbsettings-fixedleft'     => '左端',
-'qbsettings-fixedright'    => '�端',
-'qbsettings-floatingleft'  => 'ウィンドウ�左上�固定',
-'qbsettings-floatingright' => 'ウィンドウ��上�固定',
-'changepassword'           => 'パスワード変更',
-'skin'                     => '外装',
-'math'                     => '数�',
-'dateformat'               => '日付�書�',
-'datedefault'              => '�択��',
-'datetime'                 => '日付�時刻',
-'math_failure'             => '構文解�失敗',
-'math_unknown_error'       => '�明�エラー',
-'math_unknown_function'    => '�明�関数',
-'math_lexing_error'        => '字�解�エラー',
-'math_syntax_error'        => '構文エラー',
-'math_image_error'         => 'PNG��変��失敗����。latex, dvips, gs, convert�正��インストール�れ��る�確�������。',
-'math_bad_tmpdir'          => 'TeX一時ディレクトリを作����書�込�����ん',
-'math_bad_output'          => 'TeX出力用ディレクトリを作����書�込�����ん',
-'math_notexvc'             => 'texvcプログラム�見��り��ん。math/READMEを読ん�正��設定������。',
-'prefs-personal'           => '利用者情報',
-'prefs-rc'                 => '最近更新��ページ',
-'prefs-watchlist'          => 'ウォッ�リスト',
-'prefs-watchlist-days'     => 'ウォッ�リスト�表示�る日数:',
-'prefs-watchlist-edits'    => '拡張��ウォッ�リスト�表示�る件数:',
-'prefs-misc'               => '��他',
-'saveprefs'                => '設定��存',
-'resetprefs'               => '変更を破棄',
-'oldpassword'              => '��パスワード:',
-'newpassword'              => '新��パスワード:',
-'retypenew'                => '新��パスワードを�入力:',
-'textboxsize'              => '編集画�',
-'rows'                     => '縦:',
-'columns'                  => '横:',
-'searchresultshead'        => '検索',
-'resultsperpage'           => '1ページ��り�表示件数:',
-'contextlines'             => '1件��り�行数:',
-'contextchars'             => '1行��り�文字数:',
-'stub-threshold'           => '<a href="#" class="stub">スタブリンク</a>���表示�る���値:',
-'recentchangesdays'        => '最近更新��ページ�表示日数:',
-'recentchangescount'       => '最近更新��ページ・履歴・ログページ�表示件数:',
-'savedprefs'               => '個人設定を�存����。',
-'timezonelegend'           => 'タイムゾーン',
-'timezonetext'             => '¹サー�ー�時刻（UTC）�����地域�標準時��時差。',
-'localtime'                => '�����在時刻',
-'timezoneoffset'           => '時差¹',
-'servertime'               => 'サー�ー��在時刻',
-'guesstimezone'            => '自動設定',
-'allowemail'               => '他�利用者�ら�メール����りを許��る',
-'prefs-searchoptions'      => '検索�オプション',
-'prefs-namespaces'         => '��空間',
-'defaultns'                => '標準�検索�る��空間:',
-'default'                  => 'デフォルト',
-'files'                    => 'ファイル',
+'preferences'               => '個人設定',
+'mypreferences'             => '個人設定',
+'prefs-edits'               => '編集回数:',
+'prefsnologin'              => 'ログイン�����ん',
+'prefsnologintext'          => '個人設定を変更�る����<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ログイン]</span>�る必���り��。',
+'prefsreset'                => '個人設定を�存�れ��る状態�復帰����。',
+'qbsettings'                => 'クイック�ー',
+'qbsettings-none'           => '��',
+'qbsettings-fixedleft'      => '左端',
+'qbsettings-fixedright'     => '�端',
+'qbsettings-floatingleft'   => 'ウィンドウ�左上�固定',
+'qbsettings-floatingright'  => 'ウィンドウ��上�固定',
+'changepassword'            => 'パスワード変更',
+'skin'                      => '外装',
+'skin-preview'              => 'プレビュー',
+'math'                      => '数�',
+'dateformat'                => '日付�書�',
+'datedefault'               => '�択��',
+'datetime'                  => '日付�時刻',
+'math_failure'              => '構文解�失敗',
+'math_unknown_error'        => '�明�エラー',
+'math_unknown_function'     => '�明�関数',
+'math_lexing_error'         => '字�解�エラー',
+'math_syntax_error'         => '構文エラー',
+'math_image_error'          => 'PNG��変��失敗����。latex, dvips, gs, convert�正��インストール�れ��る�確�������。',
+'math_bad_tmpdir'           => 'TeX一時ディレクトリを作����書�込�����ん',
+'math_bad_output'           => 'TeX出力用ディレクトリを作����書�込�����ん',
+'math_notexvc'              => 'texvcプログラム�見��り��ん。math/READMEを読ん�正��設定������。',
+'prefs-personal'            => '利用者情報',
+'prefs-rc'                  => '最近更新��ページ',
+'prefs-watchlist'           => 'ウォッ�リスト',
+'prefs-watchlist-days'      => 'ウォッ�リスト�表示�る日数:',
+'prefs-watchlist-days-max'  => '(最大7日間)',
+'prefs-watchlist-edits'     => '拡張��ウォッ�リスト�表示�る件数:',
+'prefs-watchlist-edits-max' => '(最大数: 1000)',
+'prefs-misc'                => '��他',
+'prefs-resetpass'           => 'パスワード�変更',
+'saveprefs'                 => '設定を�存',
+'resetprefs'                => '変更を破棄',
+'textboxsize'               => '編集画�',
+'prefs-edit-boxsize'        => '編集ウィンドウ�サイズ。',
+'rows'                      => '縦:',
+'columns'                   => '横:',
+'searchresultshead'         => '検索',
+'resultsperpage'            => '1ページ��り�表示件数:',
+'contextlines'              => '1件��り�行数:',
+'contextchars'              => '1行��り�文字数:',
+'stub-threshold'            => '<a href="#" class="stub">スタブリンク</a>���表示�る���値:',
+'recentchangesdays'         => '最近更新��ページ�表示日数:',
+'recentchangesdays-max'     => '(最大$1日間)',
+'recentchangescount'        => '{{int:Recentchanges}}�ページ履歴��よ�ログ�表示�る既定�件数:',
+'savedprefs'                => '個人設定を�存����。',
+'timezonelegend'            => 'タイムゾーン',
+'timezonetext'              => '¹サー�ー�時刻 (UTC) �����地域�標準時��時差。',
+'localtime'                 => '�地時間:',
+'timezoneselect'            => 'タイムゾーン:',
+'timezoneuseserverdefault'  => 'サー�ー�既定を使用',
+'timezoneuseoffset'         => '��他 (時差を指定)',
+'timezoneoffset'            => '時差¹:',
+'servertime'                => 'サー�ー�時刻:',
+'guesstimezone'             => '自動設定',
+'allowemail'                => '他�利用者�ら�メール����りを許��る',
+'prefs-searchoptions'       => '検索�オプション',
+'prefs-namespaces'          => '��空間',
+'defaultns'                 => '標準�検索�る��空間:',
+'default'                   => 'デフォルト',
+'files'                     => 'ファイル',
 
 # User rights
 'userrights'                  => '利用者権��管�', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => '利用者グループを管�',
 'userrights-user-editname'    => '利用者�:',
 'editusergroup'               => '利用者グループを編集',
-'editinguser'                 => "利用者 [[User:$1|$1]]'''（[[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]）�権�を編集中",
+'editinguser'                 => "利用者 '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) �権�を変更中",
 'userrights-editusergroup'    => '利用者グループを編集',
 'saveusergroups'              => '利用者グループを�存',
 'userrights-groupsmember'     => '所属グループ:',
@@ -948,8 +1184,8 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'group-bot'           => 'ボット',
 'group-sysop'         => '管�者',
 'group-bureaucrat'    => 'ビューロクラット',
-'group-suppress'      => 'Oversights',
-'group-all'           => '（���）',
+'group-suppress'      => 'Oversight',
+'group-all'           => '(全員)',
 
 'group-user-member'          => '利用者',
 'group-autoconfirmed-member' => '{{int:group-autoconfirmed}}',
@@ -968,23 +1204,25 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 # Rights
 'right-read'                 => 'ページ�閲覧',
 'right-edit'                 => 'ページ�編集',
-'right-createpage'           => 'ページ�作�（ノートページ以外）',
+'right-createpage'           => '(ノートページ以外�) ページ�作�',
 'right-createtalk'           => 'ノートページ�作�',
 'right-createaccount'        => '新��利用者アカウント�作�',
 'right-minoredit'            => '細部�編集����',
 'right-move'                 => 'ページ�移動',
 'right-move-subpages'        => 'サブページを���ページ�移動',
+'right-move-rootuserpages'   => '利用者ページ本体�移動',
+'right-movefile'             => 'ファイル�移動',
 'right-suppressredirect'     => 'ページ�移動�際�も��ページ��ら�リダイレクトを作����',
 'right-upload'               => 'ファイル�アップロード',
 'right-reupload'             => '存在�るファイル�上書�',
 'right-reupload-own'         => '自ら�アップロード��存在�るファイル�上書�',
-'right-reupload-shared'      => 'メディア共有レ�ジトリ�ファイル�ローカル��上書�',
+'right-reupload-shared'      => '共有メディア・リ�ジトリ上�ファイル�ローカル��上書�',
 'right-upload_by_url'        => 'URL アドレス�ら�ファイル�アップロード',
 'right-purge'                => '確�を�略��サイトキャッシュ�破棄',
 'right-autoconfirmed'        => '��護�れ�ページ�編集',
 'right-bot'                  => '自動処�����識',
 'right-nominornewtalk'       => 'ノートページ�細部�編集�行�れ�際�「新��メッセージ��知ら����表示',
-'right-apihighlimits'        => 'より高�APIクエリ�制�値',
+'right-apihighlimits'        => 'APIクエリ�制�値�標準より高�',
 'right-writeapi'             => '編集API�使用',
 'right-delete'               => 'ページ�削除',
 'right-bigdelete'            => '履歴�大��ページ�削除',
@@ -1005,9 +1243,9 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'right-editusercssjs'        => '他利用者�CSS・JSファイル�編集',
 'right-rollback'             => '特定ページを最後�編集��利用者�編集��時ロール�ック',
 'right-markbotedits'         => 'ロール�ックをボット�編集������',
-'right-noratelimit'          => 'レート制�を����',
+'right-noratelimit'          => '速度制�を����',
 'right-import'               => '他�ウィキ�ら�ページ�イン�ート',
-'right-importupload'         => 'ファイル�アップロード�ら�ページ�イン�ート',
+'right-importupload'         => 'ファイルアップロード�ら�ページ�イン�ート',
 'right-patrol'               => '他人�編集をパトロール済�������',
 'right-autopatrol'           => '自分�編集をパトロール済����自動的���る',
 'right-patrolmarks'          => '最近更新��ページ�パトロールマーク�閲覧',
@@ -1016,21 +1254,58 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'right-mergehistory'         => 'ページ�履歴�統�',
 'right-userrights'           => '全利用者権��編集',
 'right-userrights-interwiki' => '他�ウィキ�利用者�利用者権��編集',
-'right-siteadmin'            => 'データベース�ロック・ロック解除',
+'right-siteadmin'            => 'データベース�ロック�よ�ロック解除',
 
 # User rights log
 'rightslog'      => '利用者権�変更記録',
 'rightslogtext'  => '以下�利用者�権�変更�一覧��。',
 'rightslogentry' => '$1 �権�を $2 �ら $3 �変更����。',
-'rightsnone'     => '（権���）',
+'rightsnone'     => '(権���)',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '��ページ�読�込�',
+'action-edit'                 => 'ページ�編集',
+'action-createpage'           => 'ページ�新�作�',
+'action-createtalk'           => 'ノートページ�新�作�',
+'action-createaccount'        => '��アカウント�作�',
+'action-minoredit'            => '細部�編集����',
+'action-move'                 => '��ページ�移動',
+'action-move-subpages'        => '��ページ��サブページ�移動',
+'action-move-rootuserpages'   => '利用者ページ本体�移動',
+'action-movefile'             => '��ファイル�移動',
+'action-upload'               => '��ファイル�アップロード',
+'action-reupload'             => '��ファイル�上書�',
+'action-reupload-shared'      => '共有リ�ジトリ��る��ファイル�上書�',
+'action-upload_by_url'        => 'URLアドレス�ら�ファイル�アップロード',
+'action-writeapi'             => 'API書�込�',
+'action-delete'               => '��ページ�削除',
+'action-deleterevision'       => '��版�削除',
+'action-deletedhistory'       => '��ページ�削除履歴�表示',
+'action-browsearchive'        => '削除�れ�ページ�検索',
+'action-undelete'             => '��ページ�復帰',
+'action-suppressrevision'     => '秘匿版�閲覧�復帰',
+'action-suppressionlog'       => '���公開ログ�表示',
+'action-block'                => '��利用者�投稿ブロック',
+'action-protect'              => '��ページ��護レベル�変更',
+'action-import'               => '他�ウィキ�ら���ページ�イン�ート',
+'action-importupload'         => 'ファイルアップロード�ら���ページ�イン�ート',
+'action-patrol'               => '他�利用者�編集�対�るパトロール済�����',
+'action-autopatrol'           => '����編集��パトロール済�����',
+'action-unwatchedpages'       => 'ウォッ��れ����ページ一覧�表示',
+'action-trackback'            => 'トラック�ック�投稿',
+'action-mergehistory'         => '��ページ�履歴統�',
+'action-userrights'           => '全利用者権��変更',
+'action-userrights-interwiki' => '他�ウィキ上�利用者�利用者権�変更',
+'action-siteadmin'            => 'データベース�ロックも���ロック解除',
 
 # Recent changes
 'nchanges'                          => '$1 回�更新',
 'recentchanges'                     => '最近更新��ページ',
+'recentchanges-legend'              => '最近更新�れ�ページ�オプション',
 'recentchangestext'                 => '最近�更新���ページ�ら確�����。',
-'recentchanges-feed-description'    => '最近付�加�られ�変更���フィード�確�����。',
-'rcnote'                            => '以下� $5$4 ���<strong>$2</strong>日間�編集�れ�<strong>$1</strong>�変更��（<strong>{{int:newpageletter}}</strong>=新�項目�<strong>{{int:minoreditletter}}</strong>=細部�編集�<strong>{{int:boteditletter}}</strong>=ボット�編集）',
-'rcnotefrom'                        => '以下� <b>$2</b> ���更新��。（最大 <b>$1</b> 件）',
+'recentchanges-feed-description'    => '最近�更新���フィード�確�����。',
+'rcnote'                            => "以下� $4 $5 ���{{PLURAL:$2|1日|'''$2'''日間}}���れ�'''$1'''件�変更��。(<strong>{{int:newpageletter}}</strong>=新�ページ�<strong>{{int:minoreditletter}}</strong>=細部�編集�<strong>{{int:boteditletter}}</strong>=ボット�編集)",
+'rcnotefrom'                        => "以下� '''$2''' 以����れ�変更�� (最大 '''$1'''件)。",
 'rclistfrom'                        => '$1�ら�更新を表示�る',
 'rcshowhideminor'                   => '細部�編集を$1',
 'rcshowhidebots'                    => 'ボット�編集を$1',
@@ -1050,12 +1325,14 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'rc_categories'                     => 'カテゴリを制�（"|" �区切る）',
 'rc_categories_any'                 => '���',
 'newsectionsummary'                 => '/* $1 */ 新��セクション',
+'rc-enhanced-expand'                => '詳細を表示（JavaScript�必�）',
+'rc-enhanced-hide'                  => '詳細を隠�',
 
 # Recent changes linked
-'recentchangeslinked'          => 'リンク先�更新状�',
-'recentchangeslinked-title'    => '"$1" �らリンク�れ��るページ�更新状�',
+'recentchangeslinked'          => '関連ページ�更新状�',
+'recentchangeslinked-title'    => '"$1" �関連�るページ�更新状�',
 'recentchangeslinked-noresult' => '指定期間中�指定ページ�リンク先�更新��り��ん���。',
-'recentchangeslinked-summary'  => "��特別ページ�リンク先�更新状���。����ウォッ�リスト��るページ�'''太字'''�表示�れ��。",
+'recentchangeslinked-summary'  => "以下�指定�れ�ページ�らリンク���るページ（も���指定�れ�カテゴリ���れ��るページ）�最近加�られ�変更�一覧��。[[Special:Watchlist|����ウォッ�リスト]]��るページ�'''太字'''�表示�れ����。",
 'recentchangeslinked-page'     => 'ページ�:',
 'recentchangeslinked-to'       => 'リンク元�更新状��切り替�る',
 
@@ -1068,19 +1345,19 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'uploadnologintext'           => 'ファイルをアップロード�る��[[Special:UserLogin|ログイン]]�る必���り��。',
 'upload_directory_missing'    => 'アップロードディレクトリ ($1) �見��ら�ウェブサー��よ��も作�����ん���。',
 'upload_directory_read_only'  => 'アップロード先�ディレクトリ ($1) �ウェブサー�ー�書�込���ん。',
-'uploaderror'                 => 'アップロード エラー',
-'uploadtext'                  => "ファイルを新��アップロード�る場����以下�フォームを利用������。�去�アップロード�れ�ファイル�閲覧・検索��[[Special:ImageList|{{int:imagelist}}]]を�利用����。アップロード�記録�[[Special:Log/upload|アップロード記録]]�削除�記録�[[Special:Log/delete|削除記録]]�も記録�れ��。
+'uploaderror'                 => 'アップロード�エラー',
+'uploadtext'                  => "ファイルを新��アップロード�る場����以下�フォームを利用������。�去�アップロード�れ�ファイル�表示・検索��[[Special:FileList|{{int:imagelist}}]]を�利用����。アップロード�記録�[[Special:Log/upload|アップロード記録]]�削除�記録�[[Special:Log/delete|削除記録]]�も記録�れ��。
 
 ページ�ファイルを挿入�る��以下�書��リンクを使���。
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:<nowiki>File.jpg]]</nowiki></tt>''' ��る�ファイルをも��サイズ���表示���
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:<nowiki>File.png|200px|thumb|left|代替テキスト]]</nowiki></tt>''' ��る�左寄��枠内�200px幅�縮���画�を説明文（代替テキスト）を添��表示���
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:<nowiki>File.jpg]]</nowiki></tt>''' ��る�ファイルをも��サイズ���表示���
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:<nowiki>File.png|200px|thumb|left|代替テキスト]]</nowiki></tt>''' ��る�左寄��枠内�200px幅�縮���画�を説明文（代替テキスト）を添��表示���
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:<nowiki>File.ogg]]</nowiki></tt>''' ��る�ファイルを表示���直接ファイル�リンク���",
-'upload-permitted'            => '許��れ��るファイル形�： $1',
-'upload-preferred'            => '推奨�れ��るファイル形�： $1',
-'upload-prohibited'           => '�止�れ��るファイル形�： $1',
+'upload-permitted'            => '許��れ��るファイル形�: $1',
+'upload-preferred'            => '推奨�れ��るファイル形�: $1',
+'upload-prohibited'           => '�止�れ��るファイル形�: $1',
 'uploadlog'                   => 'アップロード記録',
 'uploadlogpage'               => 'アップロード記録',
-'uploadlogpagetext'           => '以下�ファイルアップロード�最近�記録��。画�付��見る��[[Special:NewImages|新�画�ギャラリー]]を�覧����。',
+'uploadlogpagetext'           => '以下�ファイルアップロード�最近�記録��。画�付��見る��[[Special:NewFiles|新�ファイル�一覧]]を�覧����。',
 'filename'                    => 'ファイル�',
 'filedesc'                    => 'ファイル�概�',
 'fileuploadsummary'           => 'ファイル�概�:',
@@ -1090,7 +1367,7 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'ignorewarning'               => '警告を無視���存�����',
 'ignorewarnings'              => '警告を無視',
 'minlength1'                  => 'ファイル��1文字以上��る必���り��。',
-'illegalfilename'             => 'ファイル� "$1" �ページ・タイトル���使���文字���れ����。ファイル�を変更���らも�一度アップロード������。',
+'illegalfilename'             => 'ファイル�「$1��ページ����使���文字���れ����。ファイル�を変更���らも�一度アップロード������。',
 'badfilename'                 => 'ファイル�� "$1" �変更�れ���。',
 'filetype-badmime'            => 'MIME タイプ "$1" �ファイル�アップロード�許��れ����ん。',
 'filetype-bad-ie-mime'        => '��ファイル���止�れ��る潜在的��険�ファイル形� "$1" ��る�Internet Explorer ��識�������アップロード����ん。',
@@ -1100,23 +1377,24 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'large-file'                  => 'ファイルサイズ� $1 �イト以下�抑�る���推奨�れ����。��ファイル� $2 �イト��。',
 'largefileserver'             => 'ファイル�大�����。サー�ー設定�許�れ��る最大値を超�����。',
 'emptyfile'                   => '����アップロード�よ�����るファイル�内容�空��る��も���ファイル��指定�間������。も�一度�ファイル��正�����る��アップロード�よ����ファイル��る����を確�������。',
-'fileexists'                  => '�����ファイル�既�存在�����。置������確信�も���場�� <strong><tt>$1</tt></strong> を確�������。',
-'filepageexists'              => '��ファイル <strong><tt>$1</tt></strong> �関�る説明ページ�既�存在�����ファイル自体�存在������状��。よ��������ファイルをアップロード�る����能����説明ページ��入力�れ�概���映�れ��ん。新��概��更新�る�����説明ページを手動�編集�る必���り��。',
-'fileexists-extension'        => '類似�����ファイル�既�存在�����:<br />
-アップロード中�ファイル: <strong><tt>$1</tt></strong><br />
-既存�ファイル: <strong><tt>$2</tt></strong><br />
-ファイル�本当���も���る��確�������。',
+'fileexists'                  => "�����ファイル�既�存在�����。置������確信�も���場�� '''<tt>$1</tt>''' を確�������。",
+'filepageexists'              => "��ファイル '''<tt>$1</tt>''' �関�る説明ページ�既�存在�����ファイル自体�存在������状��。よ��������ファイルをアップロード�る����能����説明ページ��入力�れ�概���映�れ��ん。新��概��更新�る�����説明ページを手動�編集�る必���り��。",
+'fileexists-extension'        => "類似�����ファイル�既�存在�����:<br />
+アップロード中�ファイル: '''<tt>$1</tt>'''<br />
+既存�ファイル: '''<tt>$2</tt>'''<br />
+ファイル�本当���も���る��確�������。",
 'fileexists-thumb'            => "<center>'''既存�ファイル'''</center>",
-'fileexists-thumbnail-yes'    => '��ファイル�サム�イル（縮�版画�）��る�能性��り��。以下�ファイルを確�������: <strong><tt>$1</tt></strong><br />
-確���ファイル�通常サイズ�元画���る場��追加�サム�イルを登録�る必���り��ん。',
-'file-thumbnail-no'           => 'ファイル�� <strong><tt>$1</tt></strong> �ら始����り�サム�イル（縮�版画�）��る�能性�高���。
-より高精細�画�を����場���フルサイズ版をアップロード������。�����場��ファイル�を変更������。',
-'fileexists-forbidden'        => '�����ファイル�既�存在�����。��ページ�戻り�別�ファイル��アップロード�直������。
-[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => '�����ファイル�共有ファイルリ�ジトリ�既�存在�����。アップロードを継続���場�����ページ�戻り�別�ファイル�を�択������。[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "��ファイル�サム�イル（縮�版画�）��る�能性��り��。以下�ファイルを確�������: '''<tt>$1</tt>'''<br />
+確���ファイル�通常サイズ�元画���る場��追加�サム�イルを登録�る必���り��ん。",
+'file-thumbnail-no'           => "ファイル�� '''<tt>$1</tt>''' �ら始����り�サム�イル（縮�版画�）��る�能性�高���。
+より高精細�画�を����場���フルサイズ版をアップロード������。�����場��ファイル�を変更������。",
+'fileexists-forbidden'        => '�����ファイル�既�存在���り�上書�����ん。�れ�もファイルをアップロード���場��戻��新����を使用������。
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => '�����ファイル�共有ファイルリ�ジトリ�既�存在�����。アップロードを継続���場�����ページ�戻り�別�ファイル�を�択������。[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => '��ファイル�以下�ファイル��複�����',
+'file-deleted-duplicate'      => '��ファイル ([[$1]]) ��一�ファイル�以��削除�れ����。�度アップロードを�る���以�削除�れ�ファイル�削除記録を確�������。',
 'successfulupload'            => 'アップロード�功',
-'uploadwarning'               => 'アップロード 警告',
+'uploadwarning'               => 'アップロード警告',
 'savefile'                    => 'ファイルを�存',
 'uploadedimage'               => '"$1" をアップロード����。',
 'overwroteimage'              => '"[[$1]]"�新��版をアップロード����',
@@ -1133,7 +1411,7 @@ $1 ã�¾ã�Ÿã�¯ä»–ã�®[[{{MediaWiki:Grouppage-sysop}}|管ç�†è€…]]ã�«ã�“ã�®ä»¶ã�«ã�¤ã
 'upload-wasdeleted'           => "'''警告:�����去�削除�れ�ファイルをアップロード�よ�������。'''
 
 ����アップロードを行�����切����確�������。�考���以下���ファイル�削除記録を表示�����:",
-'filename-bad-prefix'         => 'アップロード�よ�����る <strong>"$1"</strong> �ファイル���デジタルカメラ�よ��自動的�付与�れるよ���称�������。��よ��ファイル��る���ファイル�を見����も分�るよ���称�������。',
+'filename-bad-prefix'         => "アップロード�よ�����る '''\"\$1\"''' �ファイル���デジタルカメラ�よ��自動的�付与�れるよ���称�������。��よ��ファイル��る���ファイル�を見����も分�るよ���称�������。",
 'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
 # 構文�以下:
 #   * "#" 記��ら行末�������コメント
@@ -1164,24 +1442,23 @@ PICT # misc.
 
 'license'            => 'ライセンス:',
 'nolicense'          => 'ライセンス情報を�択������:',
-'license-nopreview'  => '（プレビュー��り��ん）',
-'upload_source_url'  => '（インター�ット上�URL）',
-'upload_source_file' => '（����コンピューター上�ファイル）',
-
-# Special:ImageList
-'imagelist-summary'     => '��特別ページ������アップロード�れ�ファイル�一覧を表示���。
+'license-nopreview'  => '(プレビュー��り��ん)',
+'upload_source_url'  => ' (インター�ット上�有効�URL)',
+'upload_source_file' => ' (����コンピュータ上�ファイル)',
 
-ソート�デフォルト��新��順��。ヘッダ�クリック�ソート順�種類を変更����。',
-'imagelist_search_for'  => 'メディア��検索:',
+# Special:ListFiles
+'listfiles-summary'     => '��特別ページ��アップロード�れ�����ファイルを一覧表示���。既定��上�ら新��順�ファイル�並ん����。�列�ヘッダ部分をクリック��並�順を変更����。',
+'listfiles_search_for'  => 'メディア��検索:',
 'imgfile'               => 'ファイル',
-'imagelist'             => 'ファイルリスト',
-'imagelist_date'        => '日時',
-'imagelist_name'        => '��',
-'imagelist_user'        => '利用者',
-'imagelist_size'        => 'サイズ（�イト）',
-'imagelist_description' => '概�',
-
-# Image description page
+'listfiles'             => 'ファイルリスト',
+'listfiles_date'        => '日時',
+'listfiles_name'        => '��',
+'listfiles_user'        => '利用者',
+'listfiles_size'        => 'サイズ（�イト）',
+'listfiles_description' => '概�',
+'listfiles_count'       => '版数',
+
+# File description page
 'filehist'                       => 'ファイル�履歴',
 'filehist-help'                  => '�去�版�ファイルを表示�る���表示���版�日付/時刻をクリック������。',
 'filehist-deleteall'             => '全�削除',
@@ -1189,23 +1466,27 @@ PICT # misc.
 'filehist-revert'                => '差�戻�',
 'filehist-current'               => '�在�版',
 'filehist-datetime'              => '日付/時刻',
+'filehist-thumb'                 => 'サム�イル',
+'filehist-thumbtext'             => '$1時点���る版�サム�イル',
+'filehist-nothumb'               => 'サム�イル��',
 'filehist-user'                  => '利用者',
 'filehist-dimensions'            => '解�度',
 'filehist-filesize'              => 'ファイルサイズ',
 'filehist-comment'               => 'コメント',
-'imagelinks'                     => 'リンク',
+'imagelinks'                     => 'ファイルリンク',
 'linkstoimage'                   => '��ファイル�以下�{{PLURAL:$1|ページ|$1ページ}}�使用�れ����:',
+'linkstoimage-more'              => '$1 以上�ページ���ファイル�リンク�����。以下�リスト���ファイル�リンク���る最��$1ページ�リンク��を表示�����。[[Special:WhatLinksHere/$2|完全�リスト]]も�照������。',
 'nolinkstoimage'                 => '��ファイルを使用���るページ��り��ん。',
 'morelinkstoimage'               => '��ファイル�[[Special:WhatLinksHere/$1|リンク元]]を表示�る。',
 'redirectstofile'                => '��ファイル�以下�{{PLURAL:$1|ファイル|$1ファイル}}�らリダイレクト�れ����:',
-'duplicatesoffile'               => '以下���ファイル��一�ファイル $1 件を表示�����:',
+'duplicatesoffile'               => '以下� $1件�ファイル����ファイル�内容��一�� ([[Special:FileDuplicateSearch/$2|詳細]]):',
 'sharedupload'                   => '��ファイル�共有�れ��り�他�プロジェクト�使用�れ��る�能性��り��。',
 'shareduploadwiki'               => '詳��情報�$1を�照������。',
-'shareduploadwiki-desc'          => '共有リ�ジトリ内�$1��る��ファイル�説明�以下�通り��。',
+'shareduploadwiki-desc'          => '��$1��る�ファイル�説明�以下�通り��。',
 'shareduploadwiki-linktext'      => 'ファイル�詳細ページ',
-'shareduploadduplicate'          => '��ファイル�共有レ�ジトリ� $1 ��複�����。',
+'shareduploadduplicate'          => '��ファイル�共有リ�ジトリ�$1��複�����。',
 'shareduploadduplicate-linktext' => '別�ファイル',
-'shareduploadconflict'           => '��ファイル�共有レ�ジトリ� $1 �ファイル������。',
+'shareduploadconflict'           => '��ファイル�共有リ�ジトリ�$1�ファイル������。',
 'shareduploadconflict-linktext'  => '別�ファイル',
 'noimage'                        => '���ファイル�存在���ん。「$1�リンクをクリック������。',
 'noimage-linktext'               => '��ファイル��アップロード�る',
@@ -1225,7 +1506,7 @@ PICT # misc.
 # File deletion
 'filedelete'                  => '$1�削除',
 'filedelete-legend'           => 'ファイル�削除',
-'filedelete-intro'            => "����'''[[Media:$1|$1]]'''を削除�よ�������。",
+'filedelete-intro'            => "����全��履歴��も�'''[[Media:$1|$1]]'''を削除�よ�������。",
 'filedelete-intro-old'        => "����'''[[Media:$1|$1]]'''�[$4 $3, $2]�版を削除�よ�������。",
 'filedelete-comment'          => '削除�由:',
 'filedelete-submit'           => '削除�る',
@@ -1233,7 +1514,6 @@ PICT # misc.
 'filedelete-success-old'      => "'''[[Media:$1|$1]]''' � $2 $3 版�削除�れ����。",
 'filedelete-nofile'           => "'''$1''' �存在���ん。",
 'filedelete-nofile-old'       => "指定�れ�属性を��'''$1'''���版�存在���ん。",
-'filedelete-iscurrent'        => '��ファイル�最新版を削除�よ�������。直��版�差�戻������。',
 'filedelete-otherreason'      => '��他/�由�付記:',
 'filedelete-reason-otherlist' => '��他��由',
 'filedelete-reason-dropdown'  => '*よ��る削除�由
@@ -1261,25 +1541,31 @@ PICT # misc.
 
 # Random page
 'randompage'         => '����表示',
-'randompage-nopages' => '����空間��ページ��り��ん。',
+'randompage-nopages' => '「$1���空間���ページ��り��ん。',
 
 # Random redirect
 'randomredirect'         => '����リダイレクト',
-'randomredirect-nopages' => '����空間��リダイレクト��り��ん。',
+'randomredirect-nopages' => '「$1���空間���リダイレクト��り��ん。',
 
 # Statistics
-'statistics'             => 'サイト�統計',
-'sitestats'              => 'サイト全体�統計',
-'userstats'              => '利用者登録統計',
-'sitestatstext'          => "データベース内��'''$1'''ページ�データ��り��。��数字��「ノートページ�や「{{SITENAME}}関連�ページ��「書����ページ��「リダイレクト����記事�������ページ���れ����。�れらを除���記事����れるページ数�約'''$2'''ページ��り��。
-
-'''$8'''個�ファイル�アップロード�れ���。
-
-ページ��閲覧回数�'''$3'''回��。���'''$4'''回�編集�行�れ���。平��る��1ページ��り'''$5'''回�編集�行�れ�1編集��り'''$6'''回閲覧�れ����。
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue] �長�� '''$7''' ��。",
-'userstatstext'          => "登録済��利用者�'''$1'''人��内'''$2'''人 ('''$4%''') �$5権�を������。($3を�照)",
-'statistics-mostpopular' => '最も閲覧�れ��るページ',
+'statistics'                   => 'サイト�統計',
+'statistics-header-pages'      => 'ページ�関�る統計',
+'statistics-header-edits'      => '編集�関�る統計',
+'statistics-header-views'      => '閲覧�関�る統計',
+'statistics-header-users'      => '登録利用者�関�る統計',
+'statistics-articles'          => '記事数',
+'statistics-pages'             => '�ページ数',
+'statistics-pages-desc'        => 'ノートページやリダイレクト��を�ん���ウィキ内�全��ページ��。',
+'statistics-files'             => 'アップロード�れ�ファイル数',
+'statistics-edits'             => '編集回数��計',
+'statistics-edits-average'     => '1ページ��り�編集回数',
+'statistics-views-total'       => '�閲覧回数',
+'statistics-views-peredit'     => '閲覧回数�対�る編集回数�割�',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue ジョブ・キュー]�長�',
+'statistics-users'             => '[[Special:ListUsers|登録利用者]]',
+'statistics-users-active'      => '活動中�利用者',
+'statistics-users-active-desc' => '�去$1日間�何ら���作を行��利用者',
+'statistics-mostpopular'       => '最も閲覧�れ��るページ',
 
 'disambiguations'      => '曖昧�回�ページ',
 'disambiguationspage'  => 'Template:Aimai',
@@ -1289,7 +1575,7 @@ PICT # misc.
 'doubleredirects'            => '二�リダイレクト',
 'doubleredirectstext'        => '��ページ�他�リダイレクトページ�リダイレクト���るページ�一覧��。�行�始点�リダイレクト���リダイレクト先�リダイレクトページ��よ������リダイレクト���る先�ページを�ん����。3�目�ページ������「真��リダイレクト先��り�1�目�リダイレクト���を直接指�����。',
 'double-redirect-fixed-move' => '[[$1]] �移動�れ��る���リダイレクト先を移動先� [[$2]] �変更����。',
-'double-redirect-fixer'      => 'リダイレクトフィクサー',
+'double-redirect-fixer'      => 'リダイレクト修正係',
 
 'brokenredirects'        => '迷��リダイレクト',
 'brokenredirectstext'    => '以下�存在���ページ�リンク���るリダイレクト��。',
@@ -1298,7 +1584,7 @@ PICT # misc.
 
 'withoutinterwiki'         => '言語間リンクを����ページ',
 'withoutinterwiki-summary' => '以下�ページ��多言語版��リンク��り��ん:',
-'withoutinterwiki-legend'  => 'プレフィックス',
+'withoutinterwiki-legend'  => '先頭文字列',
 'withoutinterwiki-submit'  => '表示',
 
 'fewestrevisions' => '編集履歴�少��ページ',
@@ -1307,7 +1593,7 @@ PICT # misc.
 'nbytes'                  => '$1 �イト',
 'ncategories'             => '$1 �カテゴリ',
 'nlinks'                  => '$1 個�リンク',
-'nmembers'                => '$1 é …ç›®',
+'nmembers'                => '$1é …ç›®',
 'nrevisions'              => '$1 �版',
 'nviews'                  => '$1 回表示',
 'specialpage-empty'       => '�致�るも���り��ん。',
@@ -1322,35 +1608,39 @@ PICT # misc.
 'popularpages'            => '人気�ページ',
 'wantedcategories'        => 'カテゴリページ�存在���カテゴリ',
 'wantedpages'             => 'ページ�存在���リンク',
-'missingfiles'            => '見��ら��ファイル',
+'wantedfiles'             => 'ファイル情報ページ�存在���ファイル',
+'wantedtemplates'         => 'テンプレートページ�存在���テンプレート',
 'mostlinked'              => '被リンク�多�ページ',
 'mostlinkedcategories'    => '項目�多�カテゴリ',
 'mostlinkedtemplates'     => '使用箇所�多�テンプレート',
-'mostcategories'          => 'カテゴリ�多�項目',
+'mostcategories'          => 'カテゴリ�多�ページ',
 'mostimages'              => 'リンク�多�ファイル',
-'mostrevisions'           => '版�多�項目',
-'prefixindex'             => '全ページ (ページ指定)',
+'mostrevisions'           => '版�多�ページ',
+'prefixindex'             => '�方一致ページ一覧',
 'shortpages'              => '短�ページ',
 'longpages'               => '長�ページ',
 'deadendpages'            => '有効�ページ��リンク���ページ',
 'deadendpagestext'        => '以下�ページ����ウィキ�他�ページ�リンク�����ページ��。',
 'protectedpages'          => '�護�れ��るページ',
 'protectedpages-indef'    => '無期��護��',
+'protectedpages-cascade'  => 'カスケード�護��',
 'protectedpagestext'      => '以下�ページ�移動や編集��止�れ����。',
 'protectedpagesempty'     => '�在�護中�ページ��り��ん。',
 'protectedtitles'         => '作��護�れ��るページ�',
 'protectedtitlestext'     => '以下�ページ�新�作���止�れ����',
 'protectedtitlesempty'    => '�在作��護�れ��るページ��り��ん。',
 'listusers'               => '登録利用者�一覧',
+'listusers-editsonly'     => '投稿記録��る利用者��を表示',
+'usereditcount'           => '編集回数 $1 回',
 'newpages'                => '新��ページ',
 'newpages-username'       => '利用者�:',
 'ancientpages'            => '更新�れ����ページ',
 'move'                    => '移動',
 'movethispage'            => '��ページを移動',
 'unusedimagestext'        => '他�ウェブサイト�URLを直接用��ファイル�リンク���る場�も�り��。以下�ファイル一覧�����よ��形�利用�れ��るファイル���れ��る�能性��り��。',
-'unusedcategoriestext'    => '以下�カテゴリページ���項目・カテゴリ�らも使�れ����ん。',
+'unusedcategoriestext'    => '以下�カテゴリ�ページ�存在�����他���ページ�よ�カテゴリ�らも使�れ����ん。',
 'notargettitle'           => '対象��るページ�存在���ん',
-'notargettext'            => '対象��るページ��利用者�指定�れ����ん',
+'notargettext'            => '対象��るページ���利用者�指定�れ����ん。',
 'nopagetitle'             => '��よ��ページ��り��ん',
 'nopagetext'              => '����指定��ページ�存在���ん。',
 'pager-newer-n'           => '{{PLURAL:$1|� 1|� $1}}',
@@ -1362,24 +1652,24 @@ PICT # misc.
 'booksources-search-legend' => '文献資料を検索',
 'booksources-go'            => '検索',
 'booksources-text'          => '以下�リスト��新本��本��を販売���る外部サイト��リンク��。�����探��本�����更�詳��情報��供�れ��る場�も�り��。',
+'booksources-invalid-isbn'  => '指定�れ�ISBN番��有効����よ���。�照���る資料�ら写�間������ん�。',
 
 # Special:Log
 'specialloguserlabel'  => '利用者�:',
-'speciallogtitlelabel' => 'タイトル:',
+'speciallogtitlelabel' => 'ページ�:',
 'log'                  => 'ログ',
 'all-logs-page'        => '全��記録',
-'log-search-legend'    => 'ログ�検索',
-'log-search-submit'    => '検索',
 'alllogstext'          => '{{SITENAME}}��得�能�ログ�����表示�れ����。ログ�種類�実行��利用者�影響を���ページ（利用者）�よる絞り込������。',
 'logempty'             => '�件�マッ��る記録��り��ん。',
 'log-title-wildcard'   => '��文字列�始�るタイトルを検索�る',
 
 # Special:AllPages
-'allpages'          => '全ページ',
+'allpages'          => 'ページ一覧',
 'alphaindexline'    => '$1―$2',
-'nextpage'          => '次�ページ（$1）',
-'prevpage'          => '��ページ（$1）',
-'allpagesfrom'      => '表示開始ページ:',
+'nextpage'          => '次�ページ ($1)',
+'prevpage'          => '��ページ ($1)',
+'allpagesfrom'      => '最��表示�るページ:',
+'allpagesto'        => '最後�表示�るページ:',
 'allarticles'       => '全ページ',
 'allinnamespace'    => '全ページ ($1 ��空間)',
 'allnotinnamespace' => '全ページ ($1 ��空間を除�)',
@@ -1387,56 +1677,82 @@ PICT # misc.
 'allpagesnext'      => '次�',
 'allpagessubmit'    => '表示',
 'allpagesprefix'    => '次�文字列�ら始�るページを表示:',
-'allpagesbadtitle'  => '指定��タイトル�無効��他言語版���他ウィキ内�タイトル��。ページタイトル�使用����文字���れ��る�能性��り��。',
+'allpagesbadtitle'  => '指定��ページ��無効��他言語版���他ウィキ内�ページ���。ページ��使用����文字���れ��る�能性��り��。',
 'allpages-bad-ns'   => '{{SITENAME}}� "$1" �����空間��り��ん。',
 
 # Special:Categories
 'categories'                    => 'カテゴリ',
-'categoriespagetext'            => '以下�カテゴリ��ページ���メディア�存在���。[[Special:UnusedCategories|未使用�カテゴリ]]�����表示�れ����ん。 [[Special:WantedCategories|カテゴリページ�存在���カテゴリ]]も�照������。',
+'categoriespagetext'            => '以下�カテゴリ��ページ���メディア�存在���。[[Special:UnusedCategories|未使用�カテゴリ]]�����表示�れ����ん。[[Special:WantedCategories|カテゴリページ�存在���カテゴリ]]も�照������。',
 'categoriesfrom'                => '表示開始カテゴリ:',
 'special-categories-sort-count' => '項目数順',
 'special-categories-sort-abc'   => 'アルファベット順',
 
+# Special:DeletedContributions
+'deletedcontributions' => '削除�れ�投稿履歴',
+
+# Special:LinkSearch
+'linksearch'       => '外部リンク',
+'linksearch-pat'   => '検索パターン:',
+'linksearch-ns'    => '��空間:',
+'linksearch-ok'    => '検索',
+'linksearch-text'  => '"*.wikipedia.org" �よ��ワイルドカードを使��������。<br />対応プロトコル: <tt>$1</tt>',
+'linksearch-line'  => '$1 � $2 �らリンク�れ����',
+'linksearch-error' => 'ワイルドカード�ホスト��先頭���使用����。',
+
 # Special:ListUsers
 'listusersfrom'      => '��文字�ら表示:',
 'listusers-submit'   => '表示',
 'listusers-noresult' => '利用者�見��り��ん���。大文字・�文字�区別を確�������。',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'アカウント作�記録',
+'newuserlogpagetext'          => '以下�最近作��れ�アカウント�一覧��。',
+'newuserlog-byemail'          => 'パスワードを電�メール��信����',
+'newuserlog-create-entry'     => '新�利用者',
+'newuserlog-create2-entry'    => 'アカウント $1 �作��れ���',
+'newuserlog-autocreate-entry' => 'アカウント�自動的�作��れ���',
+
 # Special:ListGroupRights
-'listgrouprights'          => '利用者グループ�権�',
-'listgrouprights-summary'  => '以下���ウィキ�登録�れ��る利用者グループ��れ�れ�割り当�られ��る権��一覧��。
-個々�権��関�る更�る情報�[[{{MediaWiki:Listgrouprights-helppage}}]]を見�����。',
-'listgrouprights-group'    => 'グループ',
-'listgrouprights-rights'   => '権�',
-'listgrouprights-helppage' => 'Help:グループ権�',
-'listgrouprights-members'  => '(該当者一覧)',
+'listgrouprights'                 => '利用者グループ�権�',
+'listgrouprights-summary'         => '以下���ウィキ�登録�れ��る利用者グループ��れ�れ�割り当�られ��る権��一覧��。個々�権��関�る更�る情報�[[{{MediaWiki:Listgrouprights-helppage}}]]を見�����。',
+'listgrouprights-group'           => 'グループ',
+'listgrouprights-rights'          => '権�',
+'listgrouprights-helppage'        => 'Help:グループ権�',
+'listgrouprights-members'         => '(該当者一覧)',
+'listgrouprights-addgroup'        => '$2グループ追加�能: $1',
+'listgrouprights-removegroup'     => '$2グループ削除�能: $1',
+'listgrouprights-addgroup-all'    => '全グループ追加�能',
+'listgrouprights-removegroup-all' => '全グループ削除�能',
 
 # E-mail user
-'mailnologin'     => 'メールアドレス�記載��り��ん。',
-'mailnologintext' => '他�利用者宛��メールを�信�る�����[[Special:UserLogin|ログイン]]������メールアドレスを[[Special:Preferences|個人設定]]�設定�る必���り��。',
-'emailuser'       => '��利用者�メールを�信',
-'emailpage'       => 'メール�信ページ',
-'emailpagetext'   => '下�フォームを通�����利用者�メールを�る�������。
+'mailnologin'      => 'メールアドレス�記載��り��ん。',
+'mailnologintext'  => '他�利用者宛��メールを�信�る�����[[Special:UserLogin|ログイン]]������メールアドレスを[[Special:Preferences|個人設定]]�設定�る必���り��。',
+'emailuser'        => '��利用者�メールを�信',
+'emailpage'        => 'メール�信ページ',
+'emailpagetext'    => '下�フォームを通�����利用者�メールを�る�������。
 ����[[Special:Preferences|{{int:preferences}}]]�登録���自分�メールアドレス���信�れるメール�Fromアドレス�自動的�組�込�れ������相手�直接����返事を出�るよ��������。',
-'usermailererror' => 'メール�信時�以下�エラー�発生����:',
-'defemailsubject' => '{{SITENAME}} 電�メール',
-'noemailtitle'    => '�り先�メールアドレス��り��ん。',
-'noemailtext'     => '��利用者�有効�メールアドレスを登録�������メールを���ら��設定������。',
-'emailfrom'       => '����アドレス',
-'emailto'         => '��先',
-'emailsubject'    => '題�',
-'emailmessage'    => '本文',
-'emailsend'       => 'メール�信',
-'emailccme'       => '自分宛�控�を�信�る',
-'emailccsubject'  => '$1宛�ウィキメール�控�: $2',
-'emailsent'       => 'メールを�り���',
-'emailsenttext'   => 'メール�無事�信�れ���。',
-'emailuserfooter' => '��電�メール� $1 �ら $2 ��{{SITENAME}}�「利用者�メールを�信�機能を使���られ���。',
+'usermailererror'  => 'メール�信時�以下�エラー�発生����:',
+'defemailsubject'  => '{{SITENAME}} 電�メール',
+'noemailtitle'     => '�り先�メールアドレス��り��ん。',
+'noemailtext'      => '��利用者�有効�メールアドレスを登録�����ん。',
+'nowikiemailtitle' => '電�メール�許�',
+'nowikiemailtext'  => '��利用者�他�利用者�らメールを���ら��設定������。',
+'email-legend'     => '{{SITENAME}}�他�利用者�電�メールを�る',
+'emailfrom'        => '����アドレス',
+'emailto'          => '��先',
+'emailsubject'     => '題�',
+'emailmessage'     => '本文',
+'emailsend'        => 'メール�信',
+'emailccme'        => '自分宛�控�を�信�る',
+'emailccsubject'   => '$1宛�ウィキメール�控�: $2',
+'emailsent'        => 'メールを�り���',
+'emailsenttext'    => 'メール�無事�信�れ���。',
+'emailuserfooter'  => '��電�メール� $1 �ら $2 ��{{SITENAME}}�「利用者�メールを�信�機能を使���られ���。',
 
 # Watchlist
 'watchlist'            => 'ウォッ�リスト',
 'mywatchlist'          => 'ウォッ�リスト',
-'watchlistfor'         => "'''$1'''",
+'watchlistfor'         => "('''$1''')",
 'nowatchlist'          => '����ウォッ�リスト�空��。',
 'watchlistanontext'    => 'ウォッ�リスト�入���る項目を表示・編集�る�� $1 ������。',
 'watchnologin'         => 'ログイン�����ん',
@@ -1453,24 +1769,19 @@ PICT # misc.
 'watchthispage'        => 'ウォッ�リスト�追加',
 'unwatch'              => 'ウォッ�リスト�ら削除',
 'unwatchthispage'      => 'ウォッ�リスト�ら削除',
-'notanarticle'         => '�れ�記事���り��ん。',
+'notanarticle'         => '記事���り��ん',
 'notvisiblerev'        => '��版�削除�れ���',
 'watchnochange'        => '��期間内�ウォッ�リスト��るページ��れも編集�れ����ん。',
-'watchlist-details'    => '����ウォッ�リスト�� $1 �ページ�入�����（ノートページ�数���ん）。',
+'watchlist-details'    => '����ウォッ�リスト�� $1件�ページ�入�����（ノートページ�数���ん）。',
 'wlheader-enotif'      => '* メール通知�有効�������',
 'wlheader-showupdated' => "* ����最後�訪������変更�れ�ページ�'''ボールド体'''�表示�れ��",
 'watchmethod-recent'   => 'ウォッ�リスト�中�ら最近編集�れ�も�を抽出',
 'watchmethod-list'     => '最近編集�れ�中�らウォッ����るページを抽出',
-'watchlistcontains'    => '����ウォッ�リスト�� $1 ページ登録�れ����。',
+'watchlistcontains'    => '����ウォッ�リスト�� $1件�ページ�登録�れ����。',
 'iteminvalidname'      => '"$1" をウォッ�リスト�ら削除����ん。ページ���正��。',
 'wlnote'               => '以下�最近 <strong>$2</strong> 時間�編集�れ� <strong>$1</strong> ページ��。',
 'wlshowlast'           => '最近� [$1時間] [$2日間] [$3] �も�を表示�る',
-'watchlist-show-bots'  => 'ボット�編集を表示',
-'watchlist-hide-bots'  => 'ボット�編集を隠�',
-'watchlist-show-own'   => '自分�編集を表示',
-'watchlist-hide-own'   => '自分�編集を隠�',
-'watchlist-show-minor' => '細部�編集を表示',
-'watchlist-hide-minor' => '細部�編集を隠�',
+'watchlist-options'    => 'ウォッ�リスト�オプション',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ウォッ�リスト�追加�����...',
@@ -1483,9 +1794,7 @@ PICT # misc.
 'changed'                      => '変更',
 'created'                      => '作�',
 'enotif_subject'               => '{{SITENAME}} �ページ "$PAGETITLE" � $PAGEEDITOR �よ��$CHANGEDORCREATED�れ���',
-'enotif_lastvisited'           => '
-����最後�閲覧���ら�差分を見る��以下�URL�アクセス������:
-$1',
+'enotif_lastvisited'           => '����最後�閲覧���ら��れ�全��変更を $1 �確�����。',
 'enotif_lastdiff'              => '��変更内容を表示�る�� $1 を見�����。',
 'enotif_anon_editor'           => '匿�利用者 $1',
 'enotif_body'                  => '$WATCHINGUSERNAME�ん�
@@ -1514,54 +1823,60 @@ $NEWPAGE
 助��必����:
 {{fullurl:Help:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'ページを削除',
-'confirm'                     => '確�',
-'excontent'                   => "内容: '$1'",
-'excontentauthor'             => "内容: '$1' (投稿者 [[Special:Contributions/$2|$2]] ��)",
-'exbeforeblank'               => "白紙化��内容: '$1'",
-'exblank'                     => '白紙ページ',
-'delete-confirm'              => '"$1" �削除',
-'delete-legend'               => '削除',
-'historywarning'              => '警告: 削除�よ�����るページ��履歴��り��:',
-'confirmdeletetext'           => '指定��ページを��全変更履歴��も�削除�よ�������。
+# Delete
+'deletepage'             => 'ページを削除',
+'confirm'                => '確�',
+'excontent'              => "内容: '$1'",
+'excontentauthor'        => "内容: '$1' (投稿者 [[Special:Contributions/$2|$2]] ��)",
+'exbeforeblank'          => "白紙化��内容: '$1'",
+'exblank'                => '白紙ページ',
+'delete-confirm'         => '"$1" �削除',
+'delete-legend'          => '削除',
+'historywarning'         => '警告: 削除�よ�����るページ��履歴��り��:',
+'confirmdeletetext'      => '指定��ページを��全変更履歴��も�削除�よ�������。
 ����削除を望ん��り��れ�も�ら�帰�を�解���り��������よ�����る���[[{{MediaWiki:Policy-url}}|方�]]����も���る��を確�������。',
-'actioncomplete'              => '完了����',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" �削除�れ���。最近�削除�関��� $2 を�照������。',
-'deletedarticle'              => '"$1" を削除����。',
-'suppressedarticle'           => '"[[$1]]"�秘匿を実施',
-'dellogpage'                  => '削除記録',
-'dellogpagetext'              => '以下�最近�削除�復帰�記録��。',
-'deletionlog'                 => '削除記録',
-'reverted'                    => '以���ージョン��差�戻�',
-'deletecomment'               => '削除�由:',
-'deleteotherreason'           => '��他 / �由�付記:',
-'deletereasonotherlist'       => '��他��由',
-'deletereason-dropdown'       => '*よ��る削除�由
+'actioncomplete'         => '完了����',
+'deletedtext'            => '"<nowiki>$1</nowiki>" �削除�れ���。最近�削除�関��� $2 を�照������。',
+'deletedarticle'         => '"$1" を削除����。',
+'suppressedarticle'      => '"[[$1]]"�秘匿を実施',
+'dellogpage'             => '削除記録',
+'dellogpagetext'         => '以下�最近�削除�復帰�記録��。',
+'deletionlog'            => '削除記録',
+'reverted'               => '以���ージョン��差�戻�',
+'deletecomment'          => '削除�由:',
+'deleteotherreason'      => '��他 / �由�付記:',
+'deletereasonotherlist'  => '��他��由',
+'deletereason-dropdown'  => '*よ��る削除�由
 ** 投稿者�頼
 ** 著作権侵害
 ** �ら�',
-'delete-edit-reasonlist'      => '削除�由を編集�る',
-'delete-toobig'               => '��ページ���$1版を超�る多��編集履歴��り��。処�負�増大�よ��{{SITENAME}}��発的�トラブル�起�る��を防������よ��ページ�削除�制��れ����。',
-'delete-warning-toobig'       => '��ページ��� $1版を超�る多��編集履歴��り��。削除�際�{{SITENAME}}�データベース処��大��負����り������分�注�������。',
-'rollback'                    => '編集�差�戻�',
-'rollback_short'              => '差�戻�',
-'rollbacklink'                => '差�戻�',
-'rollbackfailed'              => '差�戻��失敗����',
-'cantrollback'                => '投稿者���一人��る���編集を差�戻���ん。',
-'alreadyrolled'               => 'ページ [[:$1]] � [[User:$2|$2]] ([[User talk:$2|会話]] | [[Special:Contributions/$2|{{int:contribslink}}]])�よる編集�ロール�ック�失敗����。他�利用者����編集を行���ロール�ック������。
-
-��ページ�最後�編集� [[User:$3|$3]] ([[User talk:$3|会話]] | [[Special:Contributions/$3|{{int:contribslink}}]]) �よるも���。',
-'editcomment'                 => '編集内容��約: <i>$1</i>', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|会話]]) �よる編集を [[User:$1|$1]] �よる版�差�戻�', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 �よる編集を�り消�� $2 �よる直��版�差�戻����。',
-'sessionfailure'              => 'ログイン・セッション��題�発生����。セッション�イジャックを防�����作��り消�れ���。ブラウザ�「戻る�を押��直��ページを�度読�込ん�後��も�一度�作を行������。',
+'delete-edit-reasonlist' => '削除�由を編集�る',
+'delete-toobig'          => '��ページ���$1版を超�る多��編集履歴��り��。処�負�増大�よ��{{SITENAME}}��発的�トラブル�起�る��を防������よ��ページ�削除�制��れ����。',
+'delete-warning-toobig'  => '��ページ��� $1版を超�る多��編集履歴��り��。削除�際�{{SITENAME}}�データベース処��大��負����り������分�注�������。',
+
+# Rollback
+'rollback'         => '編集�差�戻�',
+'rollback_short'   => '差�戻�',
+'rollbacklink'     => '差�戻�',
+'rollbackfailed'   => '差�戻��失敗����',
+'cantrollback'     => '投稿者���一人��る���編集を差�戻���ん。',
+'alreadyrolled'    => 'ページ [[:$1]] � [[User:$2|$2]] ([[User talk:$2|会話]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]])�よる編集�ロール�ック�失敗����。他�利用者����編集を行���ロール�ック������。
+
+��ページ�最後�編集� [[User:$3|$3]] ([[User talk:$3|会話]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) �よるも���。',
+'editcomment'      => "編集内容��約: \"''\$1''\"", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|会話]]) �よる編集を [[User:$1|$1]] �よる版�差�戻�', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 �よる編集を�り消�� $2 �よる直��版�差�戻����。',
+'sessionfailure'   => 'ログイン・セッション��題�発生����。セッション�イジャックを防�����作��り消�れ���。ブラウザ�「戻る�を押��直��ページを�度読�込ん�後��も�一度�作を行������。',
+
+# Protect
 'protectlogpage'              => '�護記録',
 'protectlogtext'              => '以下�ページ��護・�護解除�一覧��。',
 'protectedarticle'            => '"[[$1]]" を�護����。',
 'modifiedarticleprotection'   => '"[[$1]]" ��護レベルを変更����。',
 'unprotectedarticle'          => '"[[$1]]" ��護を解除����。',
+'movedarticleprotection'      => '�護�設定を "[[$2]]" �ら "[[$1]]" �移動',
 'protect-title'               => '"$1" ��護',
+'prot_1movedto2'              => 'ページ [[$1]] を [[$2]] �移動',
 'protect-legend'              => '�護�確�',
 'protectcomment'              => '�護・�護解除��由',
 'protectexpiry'               => '期�:',
@@ -1569,26 +1884,36 @@ $NEWPAGE
 'protect_expiry_old'          => '�護期���去�時刻��。',
 'protect-unchain'             => '移動権�を�作',
 'protect-text'                => "ページ \"'''<nowiki>\$1</nowiki>'''\" ��護レベルを表示・�作����。",
-'protect-locked-blocked'      => '����ブロック�れ��る����護レベルを変更����ん。
-�在�ページ<strong>$1</strong>�状態�以下�通り��:',
-'protect-locked-dblock'       => '�在データベース�ロック�れ��る���護レベルを変更����ん
-�在�ページ<strong>$1</strong>�状態�以下�通り��:',
-'protect-locked-access'       => '����アカウント�ページ��護レベルを変更�る権�を������ん。
-�在�ページ<strong>$1</strong>�状態�以下�通り��:',
+'protect-locked-blocked'      => "����ブロック�れ��る����護レベルを変更����ん。�在�ページ '''$1''' �状態�以下�通り��:",
+'protect-locked-dblock'       => "�在データベース�ロック�れ��る����護レベルを変更����ん。�在�ページ '''$1''' �状態�以下�通り��:",
+'protect-locked-access'       => "����アカウント�ページ��護レベルを変更�る権�を������ん。�在�ページ'''$1'''�状態�以下�通り��:",
 'protect-cascadeon'           => '��ページ�カスケード�護�れ��る以下�ページ�ら呼�出�れ��る���編集����よ���護�れ����。�護レベルを変更�る����能������カスケード�護��影響���ん。',
-'protect-default'             => '（解除）',
+'protect-default'             => '����利用者を許�',
 'protect-fallback'            => '"$1" 権��必���',
 'protect-level-autoconfirmed' => '新�利用者�匿�利用者を�止',
 'protect-level-sysop'         => '{{int:group-sysop}}��',
 'protect-summary-cascade'     => 'カスケード',
 'protect-expiring'            => '$1 �解除',
+'protect-expiry-indefinite'   => '無期�',
 'protect-cascade'             => 'カスケード�護 - ��ページ��り込ん��る全��他ページも�護�れ��。',
 'protect-cantedit'            => '�������ページ�編集権�������護レベルを変更����ん。',
+'protect-othertime'           => '期間（��他���）:',
+'protect-othertime-op'        => '期間（��他���）',
+'protect-existing-expiry'     => '�在��護期�: $2 $3',
+'protect-otherreason'         => '�由（��他/追加）:',
+'protect-otherreason-op'      => '��他/�由�追加',
+'protect-dropdown'            => '*よ��る�護�由
+** 度��る�ら�
+** 度��るスパム投稿
+** 編集�戦
+** 高負�ページ',
+'protect-edit-reasonlist'     => '�護�由を編集�る',
+'protect-expiry-options'      => '15分:15 minutes,30分:30 minutes,2時間:2 hours,1日:1 day,3日:3 days,1週間:1 week,2週間:2 weeks,1�月:1 month,3�月:3 months,6�月:6 months,1年:1 year,無期�:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '制�:',
 'restriction-level'           => '�護レベル:',
 'minimum-size'                => '最�サイズ',
 'maximum-size'                => '最大サイズ',
-'pagesize'                    => '（�イト）',
+'pagesize'                    => '(�イト)',
 
 # Restrictions (nouns)
 'restriction-edit'   => '編集',
@@ -1606,7 +1931,7 @@ $NEWPAGE
 'undeletepage'                 => '削除�れ�ページ�表示�復帰',
 'undeletepagetitle'            => "'''以下�表示�れ��る�� [[:$1]] �削除�れ�版��'''。",
 'viewdeletedpage'              => '削除�れ�ページを表示',
-'undeletepagetext'             => '以下�ページ�削除�れ������アーカイブ�残���る���復帰����。アーカイブ�定期的�消去�れ��。',
+'undeletepagetext'             => '以下�ページ�削除�れ������アーカイブ�残���る���復帰����。アーカイブ�定期的�消去�れる�能性��り��。',
 'undelete-fieldset-title'      => '削除�れ�版�復帰',
 'undeleteextrahelp'            => '全��版を復帰�る場���全��版��ェックボックスを�択�����状態�「{{int:undeletebtn}}�ボタンをクリック������。
 特定�版を復帰�る場���復帰�る版��ェックボックスを�択��状態�「{{int:undeletebtn}}�ボタンをクリック������。
@@ -1615,12 +1940,13 @@ $NEWPAGE
 'undeletehistory'              => 'ページ�復帰を行���全��特定版�履歴�復帰���。ページ�削除�れ�後�������新��ページ�作��れ���場��復帰��特定版������履歴���出����。',
 'undeleterevdel'               => 'トップページ�版�一時的�削除�れ��るも��対����復帰処�を実行����ん。��よ��場�����最新�削除履歴�対�る�ェック���隠蔽を解除�る必���り��。ファイル履歴を表示�る権����場�も�復帰��る�������ん。',
 'undeletehistorynoadmin'       => '�去���ページ�全�も���一部�削除�れ����。以下�示���削除記録�削除�れ�版�履歴��。削除�れ��版�内容�{{int:group-sysop}}���閲覧����。',
-'undelete-revision'            => '$1 �削除�れ� $2 �版 投稿者 $3 :',
+'undelete-revision'            => '$1 �削除�れ�版 ($4 $5時点�投稿者$3) :',
 'undeleterevision-missing'     => '無効��る��誤��版��。当該版�既�復帰�れ���アーカイブ�ら削除�れ��能性��り��。',
 'undelete-nodiff'              => '�れより��版��り��ん。',
 'undeletebtn'                  => '復帰',
 'undeletelink'                 => '復帰',
 'undeletereset'                => 'リセット',
+'undeleteinvert'               => '�択を逆転�る',
 'undeletecomment'              => 'コメント:',
 'undeletedarticle'             => '"$1" を復帰����。',
 'undeletedrevisions'           => '$1 版を復帰����。',
@@ -1641,35 +1967,36 @@ $NEWPAGE
 'undelete-missing-filearchive' => 'ID $1 �記録�データベース�存在�����復帰����ん。既�復帰�れ��る�能性��り��。',
 'undelete-error-short'         => 'ファイル復帰エラー: $1',
 'undelete-error-long'          => '$1 �復帰中�エラー�発生����',
-'undelete-show-file-confirm'   => 'ファイル<nowiki>$1</nowiki>" �削除�れ�版（$2$3）を本当�表示����？',
+'undelete-show-file-confirm'   => 'ファイル「<nowiki>$1</nowiki>��削除�れ�版 ($2 $3) を本当�表示����？',
 'undelete-show-file-submit'    => '��',
 
 # Namespace form on various pages
 'namespace'      => '��空間:',
-'invert'         => '�択����空間を隠�',
-'blanknamespace' => '（標準）',
+'invert'         => '�択��も�を除�',
+'blanknamespace' => '(標準)',
 
 # Contributions
-'contributions' => '利用者�投稿記録',
-'mycontris'     => '自分�投稿記録',
-'contribsub2'   => '利用者�: $1 ($2)',
-'nocontribs'    => '利用者�投稿記録�見��り��ん���。',
-'uctop'         => '（最新）',
-'month'         => '月:',
-'year'          => 'å¹´:',
-
-'sp-contributions-newbies'     => '新�利用者�投稿��表示',
-'sp-contributions-newbies-sub' => '新�利用者',
-'sp-contributions-blocklog'    => '投稿ブロック記録',
-'sp-contributions-search'      => '投稿履歴�検索',
-'sp-contributions-username'    => '利用者���� IPアドレス:',
-'sp-contributions-submit'      => '検索',
+'contributions'       => '利用者�投稿記録',
+'contributions-title' => '$1 �投稿記録',
+'mycontris'           => '自分�投稿記録',
+'contribsub2'         => '利用者�: $1 ($2)',
+'nocontribs'          => '利用者�投稿記録�見��り��ん���。',
+'uctop'               => '(最新)',
+'month'               => '月:',
+'year'                => 'å¹´:',
+
+'sp-contributions-newbies'       => '新�利用者�投稿��表示',
+'sp-contributions-newbies-sub'   => '新�利用者',
+'sp-contributions-newbies-title' => '新�アカウント�投稿記録',
+'sp-contributions-blocklog'      => '投稿ブロック記録',
+'sp-contributions-search'        => '投稿履歴�検索',
+'sp-contributions-username'      => '利用者���� IPアドレス:',
+'sp-contributions-submit'        => '検索',
 
 # What links here
 'whatlinkshere'            => 'リンク元',
 'whatlinkshere-title'      => '$1 �リンク���るページ',
 'whatlinkshere-page'       => 'ページ:',
-'linklistsub'              => 'リンク�一覧',
 'linkshere'                => '[[:$1]] �以下�ページ�らリンク�れ����',
 'nolinkshere'              => '[[:$1]] �リンク���るページ��り��ん。',
 'nolinkshere-ns'           => "指定�れ���空間中��'''[[:$1]]''' �リンク���るページ��り��ん。",
@@ -1683,15 +2010,15 @@ $NEWPAGE
 'whatlinkshere-hidetrans'  => 'テンプレート呼出を$1',
 'whatlinkshere-hidelinks'  => 'リンクを$1',
 'whatlinkshere-hideimages' => 'ファイル呼�出�を$1',
-'whatlinkshere-filters'    => 'フィルタ',
+'whatlinkshere-filters'    => '絞り込�',
 
 # Block/unblock
 'blockip'                         => '投稿ブロック',
 'blockip-legend'                  => '利用者�ブロック',
-'blockiptext'                     => '指定��利用者やIPアドレス�ら�投稿をブロック�る�������。',
+'blockiptext'                     => '以下�フォームを使用��指定��利用者やIPアドレス�ら�投稿をブロック�る�������。��よ��措置��ら��ら�防御������行�れる����り���[[{{MediaWiki:Policy-url}}|方�]]�沿��も���る����。以下�ブロック��由を具体的�書������（�ら�れ�ページ��言���）。',
 'ipaddress'                       => 'IPアドレス',
 'ipadressorusername'              => '利用者� / IPアドレス',
-'ipbexpiry'                       => '期間',
+'ipbexpiry'                       => '期間:',
 'ipbreason'                       => '�由:',
 'ipbreasonotherlist'              => '��他',
 'ipbreason-dropdown'              => '*よ��るブロック�由
@@ -1708,11 +2035,13 @@ $NEWPAGE
 'ipbenableautoblock'              => '��利用者�最後�使用��IPアドレスを自動的�ブロック（ブロック後�使用��IPアドレスも�む）',
 'ipbsubmit'                       => '投稿ブロック�る',
 'ipbother'                        => '期間 (��他���)',
-'ipboptions'                      => '15分:15 minutes,30分:30 minutes,2時間:2 hours,1日:1 day,3日:3 days,1週間:1 week,2週間:2 weeks,1ヶ月:1 month,3ヶ月:3 months,6ヶ月:6 months,1年:1 year,無期�:infinite', # display1:time1,display2:time2,...
+'ipboptions'                      => '15分:15 minutes,30分:30 minutes,2時間:2 hours,1日:1 day,3日:3 days,1週間:1 week,2週間:2 weeks,1�月:1 month,3�月:3 months,6�月:6 months,1年:1 year,無期�:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => '��他',
 'ipbotherreason'                  => '�由（��他/追加）',
 'ipbhidename'                     => '利用者�/IPを{{int:blocklogpage}}�{{int:ipblocklist}}�{{int:listusers}}���載���',
 'ipbwatchuser'                    => '��利用者�利用者ページ�利用者�会話ページをウォッ�リスト�追加',
+'ipballowusertalk'                => 'ブロック�れる利用者�対��ブロック中�自身�会話ページ編集を許�',
+'ipb-change-block'                => '上記�設定�利用者を��ブロック',
 'badipaddress'                    => 'IPアドレス�異常��。',
 'blockipsuccesssub'               => 'ブロック��功����。',
 'blockipsuccesstext'              => '利用者���IPアドレス [[Special:Contributions/$1|$1]] �投稿をブロック����。<br />
@@ -1722,53 +2051,63 @@ $NEWPAGE
 'ipb-unblock'                     => '利用者���IPアドレス�ブロックを解除�る',
 'ipb-blocklist-addr'              => '$1 �対�る�在有効�ブロック',
 'ipb-blocklist'                   => '�在有効�ブロックを表示',
+'ipb-blocklist-contribs'          => '$1 �投稿記録',
 'unblockip'                       => '投稿ブロックを解除�る',
 'unblockiptext'                   => '以下�フォーム�利用者���IPアドレス�投稿ブロックを解除����。',
-'ipusubmit'                       => '投稿ブロックを解除�る',
+'ipusubmit'                       => '��投稿ブロックを解除',
 'unblocked'                       => '[[User:$1|$1]] �投稿ブロックを解除����',
 'unblocked-id'                    => 'ブロック $1 �解除�れ���',
 'ipblocklist'                     => '投稿ブロック中�利用者やIPアドレス',
 'ipblocklist-legend'              => 'ブロック中�利用者を検索',
 'ipblocklist-username'            => '利用者����IPアドレス:',
+'ipblocklist-sh-userblocks'       => 'アカウント�ブロックを$1',
+'ipblocklist-sh-tempblocks'       => '期�付�ブロックを$1',
+'ipblocklist-sh-addressblocks'    => 'シングルIPブロックを$1',
 'ipblocklist-submit'              => '検索',
-'blocklistline'                   => '$1, $2 � $3 をブロック （$4）',
+'blocklistline'                   => '$1�$2 � $3 をブロック ($4)',
 'infiniteblock'                   => '無期�',
 'expiringblock'                   => '$1 �解除',
 'anononlyblock'                   => '匿���',
 'noautoblockblock'                => '自動ブロック��',
 'createaccountblock'              => 'アカウント作��ブロック',
 'emailblock'                      => 'メール�信�ブロック',
+'blocklist-nousertalk'            => '自身�会話ページ編集�止',
 'ipblocklist-empty'               => '{{int:ipblocklist}}��り��ん。',
 'ipblocklist-no-results'          => '指定�れ�IPアドレス���利用者��ブロック�れ����ん。',
 'blocklink'                       => 'ブロック',
 'unblocklink'                     => 'ブロック解除',
+'change-blocklink'                => '設定変更',
 'contribslink'                    => '投稿記録',
 'autoblocker'                     => '投稿ブロック�れ��る利用者 "$1" ���IPアドレス����自動的�ブロック�れ����。ブロック��由� "$2" ��。',
 'blocklogpage'                    => '投稿ブロック記録',
-'blocklogentry'                   => '"$1" を $2 ブロック���� $3',
+'blocklog-fulllog'                => '投稿ブロック記録全�を見る',
+'blocklogentry'                   => '$1 を $2 ブロック���� $3',
+'reblock-logentry'                => '"[[$1]]" �ブロック�設定を $2 �変更���� $3',
 'blocklogtext'                    => '��ページ�投稿ブロック�解除��作記録��。自動的�投稿ブロック�れ�IPアドレス�記録�れ����ん。�時点�有効�投稿ブロック�[[Special:IPBlockList|ブロック中�利用者一覧]]を�覧����。',
 'unblocklogentry'                 => '"$1" をブロック解除����',
 'block-log-flags-anononly'        => '匿���',
 'block-log-flags-nocreate'        => 'アカウント作��ブロック',
 'block-log-flags-noautoblock'     => '自動ブロック無効',
 'block-log-flags-noemail'         => 'メール�信�ブロック',
+'block-log-flags-nousertalk'      => '自身�会話ページ�編集�止',
 'block-log-flags-angry-autoblock' => '拡張自動ブロック有効',
 'range_block_disabled'            => '広域ブロック�無効�設定�れ����。',
 'ipb_expiry_invalid'              => '�正�期間��。',
 'ipb_expiry_temp'                 => '利用者�を秘匿��ブロック�無期����れ��り��ん。',
-'ipb_already_blocked'             => '"$1" �既�ブロック�れ����',
+'ipb_already_blocked'             => '「$1��既�ブロック�れ����',
+'ipb-needreblock'                 => '== ���ブロック�れ���� ==
+$1 �����ブロック�れ����。設定を変更����？',
 'ipb_cant_unblock'                => 'エラー: ブロック�れ� ID $1 �見��り��ん。��ら�既�ブロック解除�れ����。',
 'ipb_blocked_as_range'            => 'エラー: IPアドレス $1 �直接的�ブロック対象�������ん��ブロックを解除����ん���。�れ��ら��ブロック解除����IPアドレス空間 $2 �範囲���れ��る����。',
 'ip_range_invalid'                => '�正�IPアドレス範囲��。',
 'blockme'                         => 'ブロック�る',
 'proxyblocker'                    => 'プロキシブロッカー',
 'proxyblocker-disabled'           => '��機能�無効�������。',
-'proxyblockreason'                => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.
-
-:����使用���るIPアドレス�公開プロキシ��る��投稿ブロック�れ����。����インター�ット・サービス・プロ�イダ�も���技術担当者�連絡を�り��れ�深刻�セキュリティ�題��る��を�������。',
-'proxyblocksuccess'               => '終了����。',
+'proxyblockreason'                => '����使用���るIPアドレス�公開プロキシ��る��投稿ブロック�れ����。����インター�ット・サービス・プロ�イダ�も���技術担当者�連絡を�り��れ�深刻�セキュリティ�題��る��を�������。',
+'proxyblocksuccess'               => '完了。',
 'sorbsreason'                     => '����IPアドレス�公開プロキシ��る��{{SITENAME}}�ブラックリスト�掲載�れ����。',
 'sorbs_create_account_reason'     => '����IPアドレス�公開プロキシ��る�{{SITENAME}}�ブラックリスト�掲載�れ��る���アカウントを作�����ん。',
+'cant-block-while-blocked'        => '����投稿ブロック�れ��る���他�利用者を投稿ブロック�る�������ん。',
 
 # Developer tools
 'lockdb'              => 'データベース�ロック',
@@ -1789,9 +2128,9 @@ $NEWPAGE
 'databasenotlocked'   => 'データベース�ロック�れ����ん。',
 
 # Move page
-'move-page'               => '$1 �移動',
-'move-page-legend'        => 'ページ�移動',
-'movepagetext'            => "下�フォームを利用�る��ページ��変更�れ���履歴も変更先�移動���。
+'move-page'                    => '$1 �移動',
+'move-page-legend'             => 'ページ�移動',
+'movepagetext'                 => "下�フォームを利用�る��ページ��変更�れ���履歴も変更先�移動���。
 ��ページ�変更先��リダイレクトページ��り��。
 変更��ページ��リダイレクト�自動的�修正�る�������。
 自動的�修正を�択���場���[[Special:DoubleRedirects|二�リダイレクト]]や[[Special:BrokenRedirects|迷��リダイレクト]]を確��る必���り��。リンクを正��維��る������責任��。
@@ -1802,61 +2141,75 @@ $NEWPAGE
 '''注��'''
 よ�閲覧�れるページや�他�多��ページ�らリンク�れ��るページを移動�る�予期���果�起�る�も�れ��ん。
 ページ�移動�伴�影響をよ�考���ら��切るよ��������。",
-'movepagetalktext'        => '付��るノート�ページ��る場����基本的���一緒�移動�れる����り��。
+'movepagetalktext'             => '付��るノート�ページ��る場����基本的���一緒�移動�れる����り��。
 
-但��以下�場������別��。
+����以下�場������別��。
 *��空間を���る移動�場�
 *移動先�既�履歴��るノートページ�存在�る場�
 *下��ェックボックス��ェックマークを消��場�
 
 �れら�場��ノートページを移動�る場����別�作業�る必���り��。',
-'movearticle'             => '移動�るページ',
-'movenotallowed'          => '�����ページを移動�る権���り��ん。',
-'newtitle'                => '新��ページ�',
-'move-watch'              => '移動�るページをウォッ�',
-'movepagebtn'             => 'ページを移動',
-'pagemovedsub'            => '無事移動����。',
-'movepage-moved'          => '<big>\'\'\'"$1"�"$2"�移動�れ���。\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '指定�れ�移動先��既�ページ�存在�る�������切��。',
-'cantmove-titleprotected' => '移動先ページ�作��護対象�����る���ページを移動����ん。',
-'talkexists'              => "'''ページ自身�移動�れ�����付��ノートページ�移動先�ページ�存在����移動����ん���。手動�内容を統�������。'''",
-'movedto'                 => '移動先:',
-'movetalk'                => 'ノートページ�付��る場�����れも一緒�移動�る',
-'move-subpages'           => 'サブページも���移動�る',
-'move-talk-subpages'      => 'ノートページ�サブページも���移動�る',
-'movepage-page-exists'    => '$1 ������ページ�既�存在�る��自動的�上書��行�れ��ん���。',
-'movepage-page-moved'     => '$1 � $2 �移動�れ���。',
-'movepage-page-unmoved'   => '$1 を $2 �移動����ん���。',
-'movepage-max-pages'      => '自動的�移動��る�� $1ページ �����れ以上�移動�れ��ん。',
-'1movedto2'               => 'ページ [[$1]] を [[$2]] �移動',
-'1movedto2_redir'         => 'ページ [[$1]] を��ページ���リダイレクト [[$2]] �移動',
-'movelogpage'             => '移動記録',
-'movelogpagetext'         => '以下�ページ移動�記録��。',
-'movereason'              => '�由',
-'revertmove'              => '差�戻�',
-'delete_and_move'         => '削除��移動�る',
-'delete_and_move_text'    => '== 削除�必��� ==
+'movearticle'                  => '移動�るページ',
+'movenologin'                  => 'ログイン�����ん',
+'movenologintext'              => 'ページを移動�る�����アカウント作��上�[[Special:UserLogin|ログイン]]���る必���り��。',
+'movenotallowed'               => '�����ページを移動�る権���り��ん。',
+'movenotallowedfile'           => '�����ファイルを移動��る権���り��ん。',
+'cant-move-user-page'          => '�����（サブページ�別���）利用者ページを移動��る権�を������ん。',
+'cant-move-to-user-page'       => '�����（利用者サブページを除�）利用者ページ�ページを移動��る権�を������ん。',
+'newtitle'                     => '新��ページ�',
+'move-watch'                   => '移動�るページをウォッ�',
+'movepagebtn'                  => 'ページを移動',
+'pagemovedsub'                 => '無事移動����。',
+'movepage-moved'               => "<big>'''「$1��「$2��移動�れ���'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'リダイレクト�作��れ���。',
+'movepage-moved-noredirect'    => 'リダイレクト�作��れ��ん���。',
+'articleexists'                => '指定�れ�移動先��既�ページ�存在�る�������切��。',
+'cantmove-titleprotected'      => '移動先ページ�作��護対象�����る���ページを移動����ん。',
+'talkexists'                   => "'''ページ自身�移動�れ�����付��ノートページ�移動先�ページ�存在����移動����ん���。手動�内容を統�������。'''",
+'movedto'                      => '移動先:',
+'movetalk'                     => 'ノートページ�付��る場�����れも一緒�移動�る',
+'move-subpages'                => 'サブページも���移動�る',
+'move-talk-subpages'           => 'ノートページ�サブページも���移動�る',
+'movepage-page-exists'         => '$1 ������ページ�既�存在�る��自動的�上書��行�れ��ん���。',
+'movepage-page-moved'          => '$1 � $2 �移動�れ���。',
+'movepage-page-unmoved'        => '$1 を $2 �移動����ん���。',
+'movepage-max-pages'           => '自動的�移動��る�� $1ページ �����れ以上�移動�れ��ん。',
+'1movedto2'                    => 'ページ [[$1]] を [[$2]] �移動',
+'1movedto2_redir'              => 'ページ [[$1]] を��ページ���リダイレクト [[$2]] �移動',
+'move-redirect-suppressed'     => 'リダイレクト�作�',
+'movelogpage'                  => '移動記録',
+'movelogpagetext'              => '以下�ページ移動�記録��。',
+'movereason'                   => '�由',
+'revertmove'                   => '差�戻�',
+'delete_and_move'              => '削除��移動�る',
+'delete_and_move_text'         => '== 削除�必��� ==
 移動先 "[[:$1]]" �既�存在�����。��ページを移動����削除����?',
-'delete_and_move_confirm' => 'ページ削除�確�',
-'delete_and_move_reason'  => '移動����削除',
-'selfmove'                => '移動元�移動先�ページ������。自分自身��移動����ん。',
-'immobile_namespace'      => '移動先�ページ��特別�ページ��。����空間�ページを移動�る�������ん。',
-'imagenocrossnamespace'   => 'ファイル用���空間以外��ファイルを移動�る�������ん。',
-'imagetypemismatch'       => '新��ファイル�拡張��ファイル�タイプ�一致�����ん。',
-'imageinvalidfilename'    => '指定��ファイル��無効��',
-'fix-double-redirects'    => '��ページ��リダイレクト��れ���リダイレクトを修正�る',
+'delete_and_move_confirm'      => 'ページ削除�確�',
+'delete_and_move_reason'       => '移動����削除',
+'selfmove'                     => '移動元�移動先�ページ������。自分自身��移動����ん。',
+'immobile-source-namespace'    => '$1��空間�ページを移動��る�������ん。',
+'immobile-target-namespace'    => '$1��空間��ページを移動��る�������ん。',
+'immobile-target-namespace-iw' => 'インターウィキリンク�ページ�移動先���指定����ん。',
+'immobile-source-page'         => '��ページを移動��る�������ん。',
+'immobile-target-page'         => '目的�ページ���移動��る�������ん。',
+'imagenocrossnamespace'        => 'ファイル用���空間以外��ファイルを移動�る�������ん。',
+'imagetypemismatch'            => '新��ファイル�拡張��ファイル�タイプ�一致�����ん。',
+'imageinvalidfilename'         => '指定��ファイル��無効��',
+'fix-double-redirects'         => '��ページ��リダイレクト��れ���リダイレクトを修正�る',
+'move-leave-redirect'          => '移動元�リダイレクトを作��る',
 
 # Export
 'export'            => 'ページデータ�書�出�',
-'exporttext'        => '�����独����複数�ページ�テキスト�編集履歴をXML�形�書�出��������。書�出�れ�XML文書�他�MediaWiki�動���るウィキ�[[Special:Import|イン�ートページ]]を使���り込���。
+'exporttext'        => '�����独����複数�ページ�テキスト�編集履歴をXML�形�書�出��������。書�出�れ�XML文書�他� MediaWiki �動���るウィキ�[[Special:Import|�り込�ページ]]を使���り込���。
 
-ページデータを書�出���下�テキストボックス�書�出���ページ�タイトルを一行�一ページ��記入������。��編集履歴��も�全����版を�ん�書�出����最新版��を書�出����択������。
+ページデータを書�出���下�テキストボックス�書�出���ページ���を一行�一���記入������。��編集履歴��も�全����版を�ん�書�出����最新版��を書�出����択������。
 
-後者�ケース��リンク�形�使���も����。例: "[[{{MediaWiki:Mainpage}}]]"�最新版を�得�る��[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]を使用���。',
+後者�場���リンク�形�使���も����。例���「[[{{MediaWiki:Mainpage}}]]��最新版を�得�る�� [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] ����。',
 'exportcuronly'     => '����履歴を������最新版��を書�出�',
-'exportnohistory'   => "'''�知ら�:''' パフォーマンス上��由�より���フォーム�よるページ�完全�履歴�書�出��行���ん。",
+'exportnohistory'   => "----
+'''注:''' パフォーマンス上��由�より���フォーム�よるページ�完全�履歴�書�出��行���ん。",
 'export-submit'     => '書�出�',
-'export-addcattext' => 'カテゴリ内�ページを対象�加�る。 Category:',
+'export-addcattext' => '次�カテゴリ内�ページを対象�加�る:',
 'export-addcat'     => '追加',
 'export-download'   => '書�出���果をファイル��存�る',
 'export-templates'  => 'テンプレートも��る',
@@ -1866,9 +2219,9 @@ $NEWPAGE
 'allmessagesname'           => 'メッセージ�',
 'allmessagesdefault'        => '既定�文章',
 'allmessagescurrent'        => '�在�文章',
-'allmessagestext'           => '�れ�MediaWiki��空間�利用�能�システムメッセージ�一覧��。も� MediaWiki �一般的�ローカリゼーション�貢献���場���[http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] や [http://translatewiki.net?setlang=ja Betawiki] を訪れ�������。',
+'allmessagestext'           => '�れ� MediaWiki ��空間�利用�能�システムメッセージ�一覧��。MediaWiki �一般的�ローカリゼーション�貢献���場���[http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] や [http://translatewiki.net?setlang=ja translatewiki.net] を訪れ�������。',
 'allmessagesnotsupportedDB' => "'''\$wgUseDatabaseMessages''' �無効������ページを使��������ん。",
-'allmessagesfilter'         => 'メッセージ�フィルタ:',
+'allmessagesfilter'         => 'メッセージ��絞り込�:',
 'allmessagesmodified'       => '変更�れ�も���を表示',
 
 # Thumbnails
@@ -1884,15 +2237,18 @@ $NEWPAGE
 'import'                     => 'ページデータ��り込�',
 'importinterwiki'            => 'Transwikiイン�ート',
 'import-interwiki-text'      => 'イン�ート�るウィキ�ページ�を�択������。変更履歴�日付�編集者�������れ��。トランスウィキ・イン�ート��作�全�[[Special:Log/import|イン�ート記録]]�記録�れ��。',
+'import-interwiki-source'    => '�り込�元�ウィキ�ページ:',
 'import-interwiki-history'   => '��ページ�全��版を複製�る',
 'import-interwiki-submit'    => '�り込�',
 'import-interwiki-namespace' => '目的���空間:',
+'import-upload-filename'     => 'ファイル���:',
+'import-comment'             => 'コメント:',
 'importtext'                 => '書�出�元��るウィキ�ら[[Special:Export|書�出�用ユーティリティ]]を使��XMLファイルを書�出������。����コンピュータ��存��後����アップロード������。',
 'importstart'                => 'ページを�り込ん����...',
 'import-revision-count'      => '$1 版',
 'importnopages'              => 'イン�ート�るページ��り��ん',
 'importfailed'               => '�り込��失敗����: $1',
-'importunknownsource'        => 'イン�ート�るソース�ファイルタイプ��明��',
+'importunknownsource'        => '�り込�元�ファイルタイプ��明��',
 'importcantopen'             => 'イン�ートファイルを開���ん���',
 'importbadinterwiki'         => '他ウィキ��リンク�正���り��ん',
 'importnotext'               => '内容�空��テキスト��り��ん。',
@@ -1906,7 +2262,7 @@ $NEWPAGE
 'import-parse-failure'       => 'XML�構文解��失敗����',
 'import-noarticle'           => 'イン�ート�るページ��り��ん�',
 'import-nonewrevisions'      => '��れ���履歴�全�既�イン�ート済���。',
-'xml-error-string'           => '"$1" $2行 $3文字目（$4�イト目）: $5',
+'xml-error-string'           => '"$1" $2行�$3文字目 ($4�イト目): $5',
 'import-upload'              => 'XMLデータをアップロード',
 'import-token-mismatch'      => 'セッションデータを�失����。も�一度試������。',
 'import-invalid-interwiki'   => '指定�れ�ウィキ�らイン�ート�る�������ん���。',
@@ -1920,19 +2276,19 @@ $NEWPAGE
 'import-logentry-interwiki-detail' => '$2 � $1 版',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => '自分�利用者ページ',
+'tooltip-pt-userpage'             => '����利用者ページ',
 'tooltip-pt-anonuserpage'         => '����IPアドレス用�利用者ページ',
-'tooltip-pt-mytalk'               => '自分�会話ページ',
+'tooltip-pt-mytalk'               => '����会話ページ',
 'tooltip-pt-anontalk'             => '����IPアドレス�ら��れ�編集�会話ページ',
 'tooltip-pt-preferences'          => '個人設定',
 'tooltip-pt-watchlist'            => '変更を監視���るページ�一覧',
-'tooltip-pt-mycontris'            => '自分�投稿記録',
+'tooltip-pt-mycontris'            => '����投稿記録',
 'tooltip-pt-login'                => 'ログイン�る���推奨�れ��������も構���ん。',
 'tooltip-pt-anonlogin'            => 'ログイン�る���推奨�れ��������も構���ん。',
 'tooltip-pt-logout'               => 'ログアウト',
-'tooltip-ca-talk'                 => '項目�ノート',
+'tooltip-ca-talk'                 => '記事�����議論',
 'tooltip-ca-edit'                 => '��ページを編集����。投稿���「{{int:showpreview}}�ボタンを使������。',
-'tooltip-ca-addsection'           => '��ページ�コメントを加�る',
+'tooltip-ca-addsection'           => '新��セクションを開始�る',
 'tooltip-ca-viewsource'           => '��ページ��護�れ����。ページ�ソースを閲覧����。',
 'tooltip-ca-history'              => '��ページ��去�版',
 'tooltip-ca-protect'              => '��ページを�護',
@@ -1942,7 +2298,7 @@ $NEWPAGE
 'tooltip-ca-watch'                => '��ページをウォッ�リスト�追加',
 'tooltip-ca-unwatch'              => '��ページをウォッ�リスト�ら外�',
 'tooltip-search'                  => 'ウィキ内を検索',
-'tooltip-search-go'               => '入力�れ�文字列�一致�る項目��る場���ページ�移動���',
+'tooltip-search-go'               => '入力�れ�文字列�一致�るも���る場����ページ�移動���',
 'tooltip-search-fulltext'         => '入力�れ�文字列���れるページを検索���',
 'tooltip-p-logo'                  => 'メインページ',
 'tooltip-n-mainpage'              => 'メインページ�移動',
@@ -1950,9 +2306,9 @@ $NEWPAGE
 'tooltip-n-currentevents'         => '最近�出�事',
 'tooltip-n-recentchanges'         => '最近更新�行�れ�ページ�一覧',
 'tooltip-n-randompage'            => 'ランダム�記事を�ん�表示',
-'tooltip-n-help'                  => 'ヘルプ・使�方',
+'tooltip-n-help'                  => '使�方���情報を得る場所��',
 'tooltip-t-whatlinkshere'         => '��ページ�リンク���るページ�一覧',
-'tooltip-t-recentchangeslinked'   => '最近更新�行�れ���ページ�リンク先',
+'tooltip-t-recentchangeslinked'   => '��ページ�らリンク���るページ�最近�更新',
 'tooltip-feed-rss'                => '��ページ�RSSフィード',
 'tooltip-feed-atom'               => '��ページ�Atomフィード',
 'tooltip-t-contributions'         => '��利用者�投稿記録を表示',
@@ -1979,28 +2335,32 @@ $NEWPAGE
 'tooltip-watch'                   => '��ページをウォッ�リスト�追加���。',
 'tooltip-recreate'                => '������ページを新�作��る',
 'tooltip-upload'                  => 'アップロードを開始',
+'tooltip-rollback'                => '「ロール�ック����ページ�最後�編集者�よる��ページ��全��編集を1回�クリック�差�戻���。',
+'tooltip-undo'                    => '「�り消�� (undo) ���編集を差�戻��プレビュー付��編集画�を開���。�約欄��り消���由を追加�る�������。',
 
 # Stylesheets
 'common.css'      => '/* ���書�� CSS �全��外装��映�れ�� */',
-'standard.css'    => '/* ���記述��CSS� Standard スキン�利用者�影響��� */',
-'nostalgia.css'   => '/* ���記述��CSS� Nostalgia スキン�利用者�影響��� */',
-'cologneblue.css' => '/* ���記述��CSS� Cologne Blue スキン�利用者�影響��� */',
-'monobook.css'    => '/* ���書�� CSS � Monobook 外装��映�れ�� */',
-'myskin.css'      => '/* ���記述��CSS� Myskin スキン�利用者�影響��� */',
-'chick.css'       => '/* ���記述��CSS� Chick スキン�利用者�影響��� */',
-'simple.css'      => '/* ���記述��CSS� Simple スキン�利用者�影響��� */',
-'modern.css'      => '/* ���記述��CSS� Modern スキン�利用者�影響��� */',
+'standard.css'    => '/* ���記述��CSS�クラシック・スキン�利用者�影響��� */',
+'nostalgia.css'   => '/* ���記述��CSS�ノスタルジア・スキン�利用者�影響��� */',
+'cologneblue.css' => '/* ���記述��CSS�ケルンブルー・スキン�利用者�影響��� */',
+'monobook.css'    => '/* ���記述��CSS�モノブック・スキン��映�れ�� */',
+'myskin.css'      => '/* ���記述��CSS�マイスキン・スキン�利用者�影響��� */',
+'chick.css'       => '/* ���記述��CSS��ック・スキン�利用者�影響��� */',
+'simple.css'      => '/* ���記述��CSS�シンプル・スキン�利用者�影響��� */',
+'modern.css'      => '/* ���記述��CSS�モダン・スキン�利用者�影響��� */',
+'print.css'       => '/* ���記述��CSS��刷出力�影響��� */',
+'handheld.css'    => '/* ���記述��CSS� $wgHandheldStyle �設定�れ�スキン�基���帯機器�影響��� */',
 
 # Scripts
 'common.js'      => '/* ���書�� JavaScript �全��ページ上�実行�れ�� */',
-'standard.js'    => '/* ���記述��JavaScript� Standard スキン�利用者�影響��� */',
-'nostalgia.js'   => '/* ���記述��JavaScript� Nostalgia スキン�利用者�影響��� */',
-'cologneblue.js' => '/* ���記述��JavaScript� Cologne Blue スキン�利用者�影響��� */',
-'monobook.js'    => '/* ���書�れ� JavaScript � MonoBook スキンを使���る全利用者��用�れ�� */',
-'myskin.js'      => '/* ���記述��JavaScript� Myskin スキン�利用者�影響��� */',
-'chick.js'       => '/* ���記述��JavaScript� Chick スキン�利用者�影響��� */',
-'simple.js'      => '/* ���記述��JavaScript� Simple スキン�利用者�影響��� */',
-'modern.js'      => '/* ���記述��JavaScript� Modern スキン�利用者�影響��� */',
+'standard.js'    => '/* ���記述��JavaScript�クラシック・スキン�利用者�影響��� */',
+'nostalgia.js'   => '/* ���記述��JavaScript�ノスタルジア・スキン�利用者�影響��� */',
+'cologneblue.js' => '/* ���記述��JavaScript�ケルンブルー・スキン�利用者�影響��� */',
+'monobook.js'    => '/* ���記述��JavaScript�モノブック・スキン�利用者�影響��� */',
+'myskin.js'      => '/* ���記述��JavaScript�マイスキン・スキン�利用者�影響��� */',
+'chick.js'       => '/* ���記述��JavaScript��ック・スキン�利用者�影響��� */',
+'simple.js'      => '/* ���記述��JavaScript�シンプル・スキン�利用者�影響��� */',
+'modern.js'      => '/* ���記述��JavaScript�モダン・スキン�利用者�影響��� */',
 
 # Metadata
 'nodublincore'      => '��サー�ー�� Dublin Core RDF メタデータ�許��れ����ん。',
@@ -2013,7 +2373,7 @@ $NEWPAGE
 'lastmodifiedatby' => '最終更新� $3 �よる $2, $1 �編集��。', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1�版�基����。',
 'others'           => '��他�利用者',
-'siteusers'        => '{{SITENAME}}�利用者$1',
+'siteusers'        => '{{SITENAME}}�$2人�利用者�$1',
 'creditspage'      => 'ページ・クレジット',
 'nocredits'        => '��ページ��有効�クレジット情報��り��ん。',
 
@@ -2027,12 +2387,22 @@ $NEWPAGE
 
 # Info page
 'infosubtitle'   => 'ページ情報',
-'numedits'       => '編集数（項目）: $1',
+'numedits'       => '編集数（主ページ）: $1',
 'numtalkedits'   => '編集数（ノート）: $1',
 'numwatchers'    => 'ウォッ����る利用者数: $1',
-'numauthors'     => '投稿者数（項目）: $1',
+'numauthors'     => '投稿者数（主ページ）: $1',
 'numtalkauthors' => '投稿者数（ノート）: $1',
 
+# Skin names
+'skinname-standard'    => 'クラシック',
+'skinname-nostalgia'   => 'ノスタルジア',
+'skinname-cologneblue' => 'ケルンブルー',
+'skinname-monobook'    => 'モノブック',
+'skinname-myskin'      => 'マイスキン',
+'skinname-chick'       => '�ック',
+'skinname-simple'      => 'シンプル',
+'skinname-modern'      => 'モダン',
+
 # Math options
 'mw_math_png'    => '常�PNG',
 'mw_math_simple' => 'シンプル�数��HTML��れ以外�PNG',
@@ -2043,21 +2413,22 @@ $NEWPAGE
 
 # Patrolling
 'markaspatrolleddiff'                 => 'パトロール済���る',
-'markaspatrolledtext'                 => '��項目をパトロール済���る',
+'markaspatrolledtext'                 => '��ページをパトロール済���る',
 'markedaspatrolled'                   => 'パトロール済������。',
 'markedaspatrolledtext'               => '�択�れ�編集をパトロール済������。',
-'rcpatroldisabled'                    => 'RCパトロール�無効��',
+'rcpatroldisabled'                    => '最近更新��ページ�パトロール�無効',
 'rcpatroldisabledtext'                => '最近更新�れ�ページ�パトロール機能��在無効�������。',
 'markedaspatrollederror'              => 'パトロール済������ん。',
 'markedaspatrollederrortext'          => 'パトロール済���る������版�を指定�る必���り��。',
 'markedaspatrollederror-noautopatrol' => '自分自身�よる編集をパトロール済���る権���り��ん。',
 
 # Patrol log
-'patrol-log-page'   => 'パトロール記録',
-'patrol-log-header' => '以下�パトロール�れ�版�記録��。',
-'patrol-log-line'   => '$2 � $1 をパトロール済��マーク$3',
-'patrol-log-auto'   => '（自動）',
-'patrol-log-diff'   => 'ID:$1 �版',
+'patrol-log-page'      => 'パトロール記録',
+'patrol-log-header'    => '以下�パトロール�れ�版�記録��。',
+'patrol-log-line'      => '$2 � $1 をパトロール済��マーク$3',
+'patrol-log-auto'      => '(自動)',
+'patrol-log-diff'      => 'ID:$1 �版',
+'log-show-hide-patrol' => 'パトロール記録を$1',
 
 # Image deletion
 'deletedrevision'                 => '��版 $1 を削除����',
@@ -2072,6 +2443,9 @@ $NEWPAGE
 'previousdiff' => '���差分',
 'nextdiff'     => '次�差分→',
 
+# Visual comparison
+'visual-comparison' => '表示�果�比較',
+
 # Media information
 'mediawarning'         => "'''警告:''' ��ファイル�悪���るコードを�ん��る�能性��り�実行�る�コンピューター��害を被る場���り��。
 ----",
@@ -2085,21 +2459,22 @@ $NEWPAGE
 'show-big-image'       => '高解�度��画�',
 'show-big-image-thumb' => '<small>��プレビュー�サイズ: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '新�ファイルギャラリー',
 'imagelisttext'         => "'''$1''' 個�ファイルを $2 �表示�����",
 'newimages-summary'     => '��特別ページ��最近�アップロード�れ�ファイルを表示���。',
-'showhidebots'          => '（ボットを$1）',
+'newimages-legend'      => '絞り込�',
+'newimages-label'       => 'ファイル� (も�����一部):',
+'showhidebots'          => '(ボットを$1)',
 'noimages'              => '画���り��ん。',
 'ilsubmit'              => '検索',
 'bydate'                => '日付順',
 'sp-newimages-showfrom' => '$1 $2 以後�在���新�ファイルを表示',
 
 # Bad image list
-'bad_image_list' => '書��以下�通り��：
+'bad_image_list' => '書��以下�通り��:
 
-リストアイテム（ * �始�る行）����る���考慮�れ����。�行最��リンク��好�����ファイル��リンク�������。
-�行2番目以��リンク����り���り��ん。���ファイル��リンクを列挙�る����。',
+箇�書�項目（* �始�る行）���考慮�れ��。�行最��リンク��好�����ファイル��リンク�������。�行2番目以��リンク����り���り��ん。���ファイル��リンクを列挙�る����。',
 
 /*
 Short names for language variants used for language conversion links.
@@ -2109,10 +2484,10 @@ Variants for Chinese language
 */
 'variantname-zh-hans' => '簡体',
 'variantname-zh-hant' => '正字',
-'variantname-zh-cn'   => '簡体（中国）',
-'variantname-zh-tw'   => '正字（�湾）',
-'variantname-zh-hk'   => '正字（香港）',
-'variantname-zh-sg'   => '簡体（シンガ�ール）',
+'variantname-zh-cn'   => '簡体 (中国)',
+'variantname-zh-tw'   => '正字 (�湾)',
+'variantname-zh-hk'   => '正字 (香港)',
+'variantname-zh-sg'   => '簡体 (シンガ�ール)',
 'variantname-zh'      => '無変�',
 
 # Metadata
@@ -2309,6 +2684,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ISOスタジオタングステン',
 'exif-lightsource-255' => '��他',
 
+# Flash modes
+'exif-flash-fired-0'    => 'フラッシュ�光り��ん���',
+'exif-flash-fired-1'    => 'フラッシュ�光り���',
+'exif-flash-return-0'   => 'ストロボ�応検知機能��り��ん',
+'exif-flash-return-2'   => 'ストロボ�応光�検知�れ��ん���',
+'exif-flash-return-3'   => 'ストロボ�応光�検知�れ���',
+'exif-flash-mode-1'     => '強制フラッシュ',
+'exif-flash-mode-2'     => '強制フラッシュ�止',
+'exif-flash-mode-3'     => '自動モード',
+'exif-flash-function-1' => 'フラッシュ機能��り��ん',
+'exif-flash-redeye-1'   => '赤目防止モード',
+
 'exif-focalplaneresolutionunit-2' => 'イン�',
 
 'exif-sensingmethod-1' => '未定義',
@@ -2441,8 +2828,7 @@ $5
 'scarytranscludetoolong'  => '[URL�長����]',
 
 # Trackbacks
-'trackbackbox'      => '<div id="mw_trackbacks">
-��項目��トラック�ック:
+'trackbackbox'      => '<div id="mw_trackbacks">��ページ��トラック�ック:<br />
 $1
 </div>',
 'trackbackremove'   => ' ([$1 削除])',
@@ -2456,21 +2842,10 @@ $1
 ������ページを新�作���良��確�������。",
 'recreate'            => '新�作��る',
 
-# HTML dump
-'redirectingto' => '[[:$1]]�転������...',
-
 # action=purge
-'confirm_purge'        => 'ページ�キャッシュを破棄���。よ������?
-
-$1',
 'confirm_purge_button' => '��',
-
-# AJAX search
-'searchcontaining' => "'''$1''' を�むページ�検索。",
-'searchnamed'      => "ページ�� '''$1''' �項目�検索。",
-'articletitles'    => "''$1'' �ら���る項目",
-'hideresults'      => '�果を隠�',
-'useajaxsearch'    => 'Ajax �よる検索を利用�る',
+'confirm-purge-top'    => 'ページ�キャッシュを破棄���。よ������?',
+'confirm-purge-bottom' => 'ページをパージ�る��キャッシュを破棄��強制的�最新�版�表示�れ��。',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; �ページ',
@@ -2493,7 +2868,7 @@ $1',
 'autosumm-blank'   => 'ページ�白紙化',
 'autosumm-replace' => "ページ�置�: '$1'",
 'autoredircomment' => '[[$1]]��リダイレクト',
-'autosumm-new'     => "新��ページ: '$1'",
+'autosumm-new'     => 'ページ�作�: $1',
 
 # Size units
 'size-bytes'     => '$1 �イト',
@@ -2514,21 +2889,21 @@ $1',
 'lag-warn-high'   => 'データベースサー��負�����期��れ����。��一覧��$1秒����編集��映�れ�����能性��り��。',
 
 # Watchlist editor
-'watchlistedit-numitems'       => '����ウォッ�リスト�� $1タイトル�登録�れ����（ノートページも����登録�れ����）。',
-'watchlistedit-noitems'        => '����ウォッ�リスト����在タイトル��り��ん。',
+'watchlistedit-numitems'       => '����ウォッ�リスト�� $1件�ページ�登録�れ����（ノートページ�数���ん）。',
+'watchlistedit-noitems'        => '����ウォッ�リスト��項目��り��ん。',
 'watchlistedit-normal-title'   => 'ウォッ�リスト�編集',
-'watchlistedit-normal-legend'  => 'ウォッ�リスト�らタイトルを削除',
-'watchlistedit-normal-explain' => '����ウォッ�リスト��るタイトル�以下�表示�れ����。タイトル�横��る�ェックボックス��ェックを入れ�「{{int:watchlistedit-normal-submit}}�を���削除����。���[[Special:Watchlist/raw|一覧をテキスト�編集]]�る��も����。',
-'watchlistedit-normal-submit'  => 'タイトル�削除',
-'watchlistedit-normal-done'    => '����ウォッ�リスト�ら $1 タイトルを削除����:',
+'watchlistedit-normal-legend'  => 'ウォッ�リスト�ら項目を削除',
+'watchlistedit-normal-explain' => '����ウォッ�リスト�入���る項目�以下�表示�れ����。項目�横��る�ェックボックス��ェックを入れ�「{{int:watchlistedit-normal-submit}}�を���削除����。���[[Special:Watchlist/raw|一覧をテキスト�編集]]�る��も����。',
+'watchlistedit-normal-submit'  => '項目�削除',
+'watchlistedit-normal-done'    => '����ウォッ�リスト�ら $1件�項目を削除����:',
 'watchlistedit-raw-title'      => 'ウォッ�リストをテキスト�編集',
 'watchlistedit-raw-legend'     => 'ウォッ�リストをテキスト�編集',
-'watchlistedit-raw-explain'    => '����ウォッ�リスト��るタイトル�以下�表示�れ����。1行���1��タイトルを表��タイトルを追加・削除�る���より編集����。編集を�映��る時� "{{int:Watchlistedit-raw-submit}}" を����。��編集方法�他��[[Special:Watchlist/edit|標準的�エディタ]]も利用����。',
-'watchlistedit-raw-titles'     => 'タイトル:',
+'watchlistedit-raw-explain'    => '����ウォッ�リスト���れるページ�以下�表示�れ����。1行���1��ページを表��リスト�ら追加・削除�る���より編集����。編集を�映��る��「{{int:Watchlistedit-raw-submit}}�を����。��編集方法�他��[[Special:Watchlist/edit|標準�エディタ]]も利用����。',
+'watchlistedit-raw-titles'     => 'é …ç›®:',
 'watchlistedit-raw-submit'     => 'ウォッ�リストを更新',
 'watchlistedit-raw-done'       => '����ウォッ�リストを更新����。',
-'watchlistedit-raw-added'      => '$1 タイトルを追加����:',
-'watchlistedit-raw-removed'    => '$1 タイトルを削除����:',
+'watchlistedit-raw-added'      => '$1件追加����:',
+'watchlistedit-raw-removed'    => '$1件削除����:',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'ウォッ�リスト�確�',
@@ -2570,6 +2945,8 @@ $1',
 'hebrew-calendar-m4'      => 'テベット',
 'hebrew-calendar-m5'      => 'シュ�ット',
 'hebrew-calendar-m6'      => 'アダル',
+'hebrew-calendar-m6a'     => 'アダル・アレフ',
+'hebrew-calendar-m6b'     => 'アダル・ベート',
 'hebrew-calendar-m7'      => 'ニサン',
 'hebrew-calendar-m8'      => 'イヤール',
 'hebrew-calendar-m9'      => 'シ�ン',
@@ -2582,6 +2959,8 @@ $1',
 'hebrew-calendar-m4-gen'  => 'テベット',
 'hebrew-calendar-m5-gen'  => 'シュ�ット',
 'hebrew-calendar-m6-gen'  => 'アダル',
+'hebrew-calendar-m6a-gen' => 'アダル・アレフ',
+'hebrew-calendar-m6b-gen' => 'アダル・ベート',
 'hebrew-calendar-m7-gen'  => 'ニサン',
 'hebrew-calendar-m8-gen'  => 'イヤール',
 'hebrew-calendar-m9-gen'  => 'シ�ン',
@@ -2591,6 +2970,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '拡張機能タグ "$1" �登録�れ����ん',
+'duplicate-defaultsort' => '警告：デフォルトソートキー「$2������書�れ��るデフォルトソートキー「$1�を無効������。',
 
 # Special:Version
 'version'                          => '�ージョン情報', # Not used as normal message but as header for the special page itself
@@ -2617,16 +2997,15 @@ $1',
 'filepath'         => 'パス��得',
 'filepath-page'    => 'ファイル�:',
 'filepath-submit'  => 'パスを�得',
-'filepath-summary' => '��特別ページ��ファイル��完全�パスを返���。
-画��最大解�度�表示�れ�他�ファイルタイプ��関連付�られ�プログラム�直接起動���。
+'filepath-summary' => '��特別ページ��ファイル��完全�パスを返���。画��最大解�度�表示�れ�他�ファイルタイプ�関連付��れ�プログラム�直接起動���。
 
-ファイル��"{{ns:image}}:"を付���入力������。',
+ファイル��接頭辞「{{ns:file}}:�を付���入力������。',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '�複ファイル�検索',
 'fileduplicatesearch-summary'  => '�複ファイルを�ファイル��ッシュ値�基���検索���。
 
-先頭�「{{ns:image}}:�を付����ファイル�を入力������。',
+先頭�「{{ns:file}}:�を付����ファイル�を入力������。',
 'fileduplicatesearch-legend'   => '�複�検索',
 'fileduplicatesearch-filename' => 'ファイル�:',
 'fileduplicatesearch-submit'   => '検索',
@@ -2656,4 +3035,13 @@ $1',
 'blankpage'              => '白紙ページ',
 'intentionallyblankpage' => '��ページ��図的�白紙��れ����',
 
+# External image whitelist
+'external_image_whitelist' => ' #��行���������������<pre>
+#��下�正�表� (//�間��る記述) を置������
+#外部� (ホットリンク���表示���る) 画�� URL �一致�る�検査�れ��
+#一致�る場��画�����一致���場��画���リンク���表示�れ��
+#行�頭� # を��る�コメント���扱�れ��
+
+#正�表��全���行�上�置������。��行を変更��������</pre>',
+
 );
diff --git a/languages/messages/MessagesJbo.php b/languages/messages/MessagesJbo.php
index 3f4c8c74..a79e04bc 100644
--- a/languages/messages/MessagesJbo.php
+++ b/languages/messages/MessagesJbo.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Homo logos
  * @author Malafaya
  * @author OldakQuill
  */
@@ -46,7 +47,9 @@ $messages = array(
 'may'           => 'la mumast.',
 
 # Categories related messages
-'pagecategories' => '{{PLURAL:$1|klesi|klesi}}',
+'pagecategories'  => '{{PLURAL:$1|klesi|klesi}}',
+'category_header' => 'fe le kibypapri cu klesi "$1"',
+'subcategories'   => "le'a ti",
 
 'qbedit'        => 'stika',
 'qbpageoptions' => 'ti ckupau',
@@ -82,6 +85,23 @@ $messages = array(
 'portal-url'           => 'Project:bende ckupau',
 'privacy'              => "javni be sera'a lo sivni",
 
+'editsection'          => 'stika ti',
+'editsection-brackets' => '[$1]',
+'editold'              => 'edit',
+'viewsourceold'        => 'catlu le mifra',
+'editlink'             => 'stika ti',
+'viewsourcelink'       => 'casnu le mifra',
+'editsectionhint'      => 'stika ti: $1',
+'toc'                  => 'ckupau pakbu',
+'showtoc'              => 'jarco',
+'hidetoc'              => 'toljarco',
+'thisisdeleted'        => 'View or restore $1?',
+'viewdeleted'          => 'View $1?',
+'restorelink'          => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}',
+'feedlinks'            => 'Feed:',
+'feed-invalid'         => 'Invalid subscription feed type.',
+'feed-unavailable'     => 'Syndication feeds are not available',
+
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-mediawiki' => 'notci',
 'nstab-category'  => 'klesi',
@@ -103,6 +123,11 @@ $messages = array(
 'editingsection' => 'ca galfi le selcmene be zoi $1 (section)',
 'editingcomment' => 'ca galfi le selcmene be zoi $1 (comment)',
 
+# History pages
+'last'       => "prula'i",
+'page_first' => 'pamoi',
+'page_last'  => 'fanmo',
+
 # Search results
 'searchresults' => "tu'a le se sisku",
 
@@ -139,7 +164,7 @@ $messages = array(
 'watch'         => 'zgana',
 'watchthispage' => 'zgana ti',
 
-# Delete/protect/revert
+# Delete
 'deletedarticle' => "pu daspo la'e lu [[$1]] li'u",
 'dellogpage'     => 'plivei fi loi nu daspo',
 'deletionlog'    => 'plivei fi loi nu daspo',
@@ -157,14 +182,20 @@ $messages = array(
 'whatlinkshere' => 'ma jorne ti',
 
 # Block/unblock
-'blocklink' => 'zunti',
+'blocklink'    => 'zunti',
+'contribslink' => 'selstika',
 
 # Move page
 'movedto'   => 'te muvdu',
 '1movedto2' => "le pu se cmene lu [[$1]] li'u cu ca se cmene lu [[$2]] li'u",
 
 # Tooltip help for the actions
-'tooltip-pt-logout' => "co'u se jaspu",
+'tooltip-pt-logout'             => "co'u se jaspu",
+'tooltip-n-mainpage'            => 'vitke le ralju ckupau',
+'tooltip-n-randompage'          => 'jarco lo cunso ckupau',
+'tooltip-n-help'                => 'sidju kibypapri',
+'tooltip-t-whatlinkshere'       => "nu liste lo zifyga'ikibjudri poi ke'a kibjorne le vi ckupau",
+'tooltip-t-recentchangeslinked' => "lo puzi nunga'i pe lo kibypapri poi kibjorne le vi ckupau",
 
 # Special:FilePath
 'filepath-page' => 'se datnyvei zoi',
diff --git a/languages/messages/MessagesJut.php b/languages/messages/MessagesJut.php
index 5259711d..72421ba7 100644
--- a/languages/messages/MessagesJut.php
+++ b/languages/messages/MessagesJut.php
@@ -57,8 +57,6 @@ $messages = array(
 'underline-never'   => 'Ã¥ldreg',
 'underline-default' => 'æfter brovserendstellenge',
 
-'skinpreview' => '(Førhåndsvesnenge)',
-
 # Dates
 'sunday'        => 'søndåg',
 'monday'        => 'måndåg',
@@ -140,7 +138,7 @@ $messages = array(
 'mytalk'         => 'Min diskusje',
 'anontalk'       => 'Diskusjeside før denne IP-adresse',
 'navigation'     => 'Navigasje',
-'and'            => 'og',
+'and'            => '&#32;og',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -203,8 +201,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => "{{SITENAME}}'m",
 'aboutpage'            => 'Project:Ã…m',
-'bugreports'           => 'Fejlgåde',
-'bugreportspage'       => 'Project:Fejlgåde',
 'copyright'            => 'Endholtet er udgævet under $1.',
 'copyrightpagename'    => '{{SITENAME}} åphavsret',
 'copyrightpage'        => '{{ns:project}}:Ã…phavsret',
@@ -227,8 +223,6 @@ $messages = array(
 
 'badaccess'        => 'Manglende rettigheder',
 'badaccess-group0' => 'Du harst ekke de nødvendege rettegheder til denne håndlenge.',
-'badaccess-group1' => "Denne håndlenge ken kun udføres åf brugere, søm tilhører'n gruppe „$1“.",
-'badaccess-group2' => 'Denne håndlenge ken kun udføres åf brugere, søm tilhører en åf grupperne „$1“.',
 'badaccess-groups' => 'Denne håndlenge ken kun udføres åf brugere, søm tilhører en åf grupperne „$1“.',
 
 'versionrequired'     => 'Kræver versje $1 åf MediaWiki',
@@ -362,6 +356,9 @@ Du bør lo�ge på og ændre din adgangskode straks æfter du harst modtaget æ
 
 Før en e-mail ken modtages åf andre brugere åf æ {{SITENAME}}-mailfunksje, skel æ adresse og dens tilhørsførholt til denne bruger bekræftes. Følg venlegst anvesnengerne i denne mail.',
 
+# Password reset dialog
+'retypenew' => 'Gentag ny adgangskode',
+
 # Edit page toolbar
 'bold_sample'     => 'Fed skrevselenger',
 'bold_tip'        => 'Fed skrevselenger',
@@ -383,8 +380,8 @@ Før en e-mail ken modtages åf andre brugere åf æ {{SITENAME}}-mailfunksje, s
 'hr_tip'          => 'Plat lenje (brug den sparsåmt)',
 
 # Edit pages
-'summary'                => 'Beskrevelse',
-'subject'                => 'Emne/Ã¥verskreft',
+'summary'                => 'Beskrevelse:',
+'subject'                => 'Emne/Ã¥verskreft:',
 'minoredit'              => "Dette'r en mendre æller lile ændrenge.",
 'watchthis'              => 'Åvervåg denne ertikel',
 'savearticle'            => 'Gem side',
@@ -392,7 +389,7 @@ Før en e-mail ken modtages åf andre brugere åf æ {{SITENAME}}-mailfunksje, s
 'showpreview'            => 'Førhåndsvesnenge',
 'showdiff'               => 'Ves ændrenger',
 'anoneditwarning'        => "Du arbejder uden at være lo�get på. Estedet før brugernav veses så'n IP-adresse i'n hersenengerskigt.",
-'summary-preview'        => 'Førhåndsvesnenge åf beskrevelselejne',
+'summary-preview'        => 'Førhåndsvesnenge åf beskrevelselejne:',
 'blockedtext'            => "<big>'''Dit brugernav æller din IP-adresse er blevet blokeret.'''</big>
 
 Æ blokerenge er lavet åf $1. Æ begrundelse er ''$2''.
@@ -411,14 +408,14 @@ Du ken ekke bruge æ funksje 'e-mail til denne bruger' vemendre der er ångevet
 * Æller [[Special:Search/{{PAGENAME}}|sø�e æfter {{PAGENAME}}]] i andre ertikler 
 ---- 
 * Ves du har åprettet denne ertikel endenfør de sedste få minutter, så ken de skyldes at der er ledt førsenkelse i'n åpdaterenge åf {{SITENAME}}s cache. Vent venligst og tjek igen senere'n ertikel'm dukker åp, enden du førsø�er at åprette'n ertikel igen.",
-'previewnote'            => '<strong>Husk at dette er kun en førhåndsvesnenge, æ side er ekke gemt endnu!</strong>',
+'previewnote'            => "'''Husk at dette er kun en førhåndsvesnenge, æ side er ekke gemt endnu!'''",
 'editing'                => 'Redigærer $1',
 'editingsection'         => 'Redigærer $1 (åfsnet)',
-'copyrightwarning'       => "<strong>Husk: <big>åpskrev engen websider</big>, søm ekke tilhører dig selv, brug <big>engen åphavsretsligt beskyttede værker</big> uden tilladelse frå'n ejer!</strong><br />
-Du lover os hermed, at du selv <strong>har skrevet skrevselenger</strong>, at skrevselenger tilhører ålmenheden, er (<strong>åpværer hus</strong>), æller at æ <strong>åphavsrets-endehaver</strong> har gevet sen <strong>tilladelse</strong>. Ves denne skrevselenger ålerede er åfentliggkort andre steder, skrev det venligst på æ diskusjesside.
+'copyrightwarning'       => "'''Husk: <big>åpskrev engen websider</big>, søm ekke tilhører dig selv, brug <big>engen åphavsretsligt beskyttede værker</big> uden tilladelse frå'n ejer!'''<br />
+Du lover os hermed, at du selv '''har skrevet skrevselenger''', at skrevselenger tilhører ålmenheden, er ('''åpværer hus'''), æller at æ '''åphavsrets-endehaver''' har gevet sen '''tilladelse'''. Ves denne skrevselenger ålerede er åfentliggkort andre steder, skrev det venligst på æ diskusjesside.
 <i>Bemærk venligst, at ål {{SITENAME}}-ertikler åtomatisk står under „$2“ (se $1 før lileskrevselenger). Ves du ekke vel, at dit arbejde her ændres og udbredes åf andre, så tryk ekke på „Gem“.</i>",
-'longpagewarning'        => "<strong>ADVARSEL: Denne side er $1 kilobyte stor; nogle browsere ken have pårblæmer ve at redigære sider der nærmer sig æller er større end 32 kb. 
-Åvervej æ side'm ken åpdeles i mendre dæle.</strong>",
+'longpagewarning'        => "'''ADVARSEL: Denne side er $1 kilobyte stor; nogle browsere ken have pårblæmer ve at redigære sider der nærmer sig æller er større end 32 kb. 
+Åvervej æ side'm ken åpdeles i mendre dæle.'''",
 'templatesused'          => 'Skablåner der er brugt på denne side:',
 'templatesusedpreview'   => 'Følgende skablåner bruges åf denne ertikelførhåndsvesnenge:',
 'template-protected'     => '(skrevebeskyttet)',
@@ -433,7 +430,7 @@ denne side er vest nedenfør:",
 'viewpagelogs'        => 'Ves loglister før denne side',
 'currentrev'          => 'Nuværende hersenenge',
 'revisionasof'        => 'Hersenenger frå $1',
-'revision-info'       => 'Hersenenge frå $1 til $2',
+'revision-info'       => 'Hersenenge frå $1 til $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Ældre hersenenge',
 'nextrevision'        => 'Nyere hersenenge→',
 'currentrevisionlink' => 'se nuværende hersenenge',
@@ -458,17 +455,18 @@ hersenenge, (førge) = førskel til den førge hersenenge, l = lile til mendre Ã
 'diff-multi'              => '(Æ hersenengssammenlegnenge vetåger {{PLURAL:$1|en mellemleggende hersenenge|$1 mellemleggende hersenenger}}.)',
 
 # Search results
-'noexactmatch' => "'''{{SITENAME}} har engen ertikel ve dette nav.''' Du ken [[:$1|Ã¥prette en ertikel ve dette nav]].",
-'prevn'        => 'førge $1',
-'nextn'        => 'nægste $1',
-'viewprevnext' => 'Ves ($1) ($2) ($3)',
-'searchall'    => 'Ã¥l',
-'powersearch'  => 'Sø�',
+'noexactmatch'   => "'''{{SITENAME}} har engen ertikel ve dette nav.''' Du ken [[:$1|Ã¥prette en ertikel ve dette nav]].",
+'prevn'          => 'førge $1',
+'nextn'          => 'nægste $1',
+'viewprevnext'   => 'Ves ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Hjælpførside',
+'searchall'      => 'Ã¥l',
+'powersearch'    => 'Sø�',
 
 # Preferences page
 'preferences'   => 'Endstellenger',
 'mypreferences' => 'Endstellenger',
-'retypenew'     => 'Gentag ny adgangskode',
+'skin-preview'  => 'Førhåndsvesnenge',
 
 'grouppage-sysop' => '{{ns:project}}:Administråtorer',
 
@@ -509,10 +507,10 @@ hersenenge, (førge) = førskel til den førge hersenenge, l = lile til mendre Ã
 'uploadlogpage' => 'Åplægnengslog',
 'uploadedimage' => 'Lå�de "[[$1]]" åp',
 
-# Special:ImageList
-'imagelist' => 'Billetliste',
+# Special:ListFiles
+'listfiles' => 'Billetliste',
 
-# Image description page
+# File description page
 'filehist'                  => 'Billetskigt',
 'filehist-help'             => "Klik på'n dato/tid før at se den hersenenge åf gøret.",
 'filehist-current'          => 'nuværende',
@@ -609,52 +607,73 @@ hersenenge, (førge) = førskel til den førge hersenenge, l = lile til mendre Ã
 # Special:Categories
 'categories' => 'Klynger',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Slettede brugerbidråg',
+
+# Special:LinkSearch
+'linksearch'       => 'Sø� i weblinks',
+'linksearch-pat'   => 'Sø� æfter links til:',
+'linksearch-ns'    => 'Navnerum:',
+'linksearch-ok'    => 'Sø�',
+'linksearch-text'  => 'Wildkårter søm "*.wikipedia.org" ken benyttes.<br />Understøttede pråtåkoller: <tt>$1</tt>',
+'linksearch-line'  => '$2 linker til $1',
+'linksearch-error' => "Wildkårter må ken benyttes i'n stårt åf håstnavnet.",
+
+# Special:Log/newusers
+'newuserlogpage'           => 'Brugeråprettelseslog',
+'newuserlogpagetext'       => "Dett'er en log åver de senest åprettede brugere.",
+'newuserlog-byemail'       => 'kodeort tilsend via e-mail',
+'newuserlog-create-entry'  => 'Ny bruger',
+'newuserlog-create2-entry' => 'åprettede brugerkonto før $1',
+
 # E-mail user
 'emailuser' => 'E-mail til denne bruger',
 
 # Watchlist
-'watchlist'            => 'Åvervågnengsliste',
-'mywatchlist'          => 'Åvervågnengsliste',
-'watchlistfor'         => "(før '''$1''')",
-'addedwatch'           => 'Tilføjet til din åvervågnengsliste',
-'addedwatchtext'       => "Æ side \"[[:\$1]]\" er blevet tilføjet til din [[Special:Watchlist|åvervågningsliste]]. Fremtidige ændrenger til denne side og den tilhørende diskusjeside hvil bleve listet der, og æ side hvil fremstå '''fremhævet''' i'n [[Special:RecentChanges|liste ve de seneste ændrenger]] før at gøre det lettere at finde den. Hves du senere hvilst fjerne'n side frå din åvervågningsliste, så klik \"Fjern åvervågnenge\".",
-'removedwatch'         => 'Fjernet frå åvervågnengsliste',
-'removedwatchtext'     => 'Æ side "<nowiki>$1</nowiki>" er blevet fjernet frå din åvervågnengsliste.',
-'watch'                => 'Åvervåg',
-'watchthispage'        => 'Åvervåg side',
-'unwatch'              => 'Fjern åvervågnenge',
-'watchlist-details'    => 'Du har $1 {{PLURAL:$1|side|sider}} på din åvervågnengsliste (øn diskusjesider).',
-'wlshowlast'           => 'Ves de seneste $1 têmer $2 dåg $3',
-'watchlist-hide-bots'  => 'Skjule bot-ændrenger',
-'watchlist-hide-own'   => 'skjule egne ændrenger',
-'watchlist-hide-minor' => 'skjule små ændrenger',
+'watchlist'         => 'Åvervågnengsliste',
+'mywatchlist'       => 'Åvervågnengsliste',
+'watchlistfor'      => "(før '''$1''')",
+'addedwatch'        => 'Tilføjet til din åvervågnengsliste',
+'addedwatchtext'    => "Æ side \"[[:\$1]]\" er blevet tilføjet til din [[Special:Watchlist|åvervågningsliste]]. Fremtidige ændrenger til denne side og den tilhørende diskusjeside hvil bleve listet der, og æ side hvil fremstå '''fremhævet''' i'n [[Special:RecentChanges|liste ve de seneste ændrenger]] før at gøre det lettere at finde den. Hves du senere hvilst fjerne'n side frå din åvervågningsliste, så klik \"Fjern åvervågnenge\".",
+'removedwatch'      => 'Fjernet frå åvervågnengsliste',
+'removedwatchtext'  => 'Æ side "<nowiki>$1</nowiki>" er blevet fjernet frå din åvervågnengsliste.',
+'watch'             => 'Åvervåg',
+'watchthispage'     => 'Åvervåg side',
+'unwatch'           => 'Fjern åvervågnenge',
+'watchlist-details' => 'Du har $1 {{PLURAL:$1|side|sider}} på din åvervågnengsliste (øn diskusjesider).',
+'wlshowlast'        => 'Ves de seneste $1 têmer $2 dåg $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Åvervåge …',
 'unwatching' => 'Ekke åvervåge …',
 
-# Delete/protect/revert
-'deletepage'                  => 'Slet side',
-'historywarning'              => 'Advarsel: Æ side du erst ve at slette har en skigte:',
-'confirmdeletetext'           => "Du erst ve permanent at slette en side
+# Delete
+'deletepage'            => 'Slet side',
+'historywarning'        => 'Advarsel: Æ side du erst ve at slette har en skigte:',
+'confirmdeletetext'     => "Du erst ve permanent at slette en side
 æller et billet sammen ve hæle den tilhørende skigte frå'n database. Bekræft venlegst at du virkelg hvilst gøre dette, at du førstårst konsekvenserne, og at du gør dette i åverensstemmelse ve
 [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Gennemført',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" er slettet. Sæg $2 før en førtegnelse åver de nyeste sletnenger.',
-'deletedarticle'              => 'slettede "[[$1]]"',
-'dellogpage'                  => 'Sletnengslog',
-'deletecomment'               => 'Begrundelse før sletnenge:',
-'deleteotherreason'           => 'Anden/uddybende begrundelse:',
-'deletereasonotherlist'       => 'Anden begrundelse',
-'rollbacklink'                => 'fjern redigærenge',
+'actioncomplete'        => 'Gennemført',
+'deletedtext'           => '"<nowiki>$1</nowiki>" er slettet. Sæg $2 før en førtegnelse åver de nyeste sletnenger.',
+'deletedarticle'        => 'slettede "[[$1]]"',
+'dellogpage'            => 'Sletnengslog',
+'deletecomment'         => 'Begrundelse før sletnenge:',
+'deleteotherreason'     => 'Anden/uddybende begrundelse:',
+'deletereasonotherlist' => 'Anden begrundelse',
+
+# Rollback
+'rollbacklink' => 'fjern redigærenge',
+
+# Protect
 'protectlogpage'              => 'Liste åver beskyttede sider',
+'prot_1movedto2'              => '[[$1]] flyttet til [[$2]]',
 'protectcomment'              => 'Begrundelse før beskyttelse',
 'protectexpiry'               => 'Udløb:',
 'protect_expiry_invalid'      => 'Æ udløbstiid er ugyldeg.',
 'protect_expiry_old'          => "Æ udløbstiid legger i'n førtiid.",
 'protect-unchain'             => 'Ændre flytnengsbeskyttelse',
 'protect-text'                => "Her ken beskyttelsesståt før æ side '''<nowiki>$1</nowiki>''' ses og ændres.",
-'protect-locked-access'       => 'Den brugerkonto har ekke de nødvendege rettegheder til at æ ændre sidebeskyttelse. Her er de aktuelle beskyttelsesendstellenger før æ side <strong>„$1“:</strong>',
+'protect-locked-access'       => "Den brugerkonto har ekke de nødvendege rettegheder til at æ ændre sidebeskyttelse. Her er de aktuelle beskyttelsesendstellenger før æ side '''„$1“:'''",
 'protect-cascadeon'           => 'Denne side er del åf en nedarvet skrevebeskyttelse. Wen er endeholt i nedenstående {{PLURAL:$1|side|sider}}, søm er skrevebeskyttet ve tilvalg åf "nedarvende sidebeskyttelse" Æ sidebeskyttelse ken ændres før denne side, det påverker dog ekke\'n kaskadespærrenge:',
 'protect-default'             => 'Ål (standård)',
 'protect-fallback'            => 'Kræv "$1"-tilladelse',
@@ -664,6 +683,7 @@ hersenenge, (førge) = førskel til den førge hersenenge, l = lile til mendre Ã
 'protect-expiring'            => 'til $1 (UTC)',
 'protect-cascade'             => 'Nedarvende spærrenge – ål skabelåner, søm er endbundet i denne side spærres også.',
 'protect-cantedit'            => 'Du kenst ekke ændre beskyttelsesnivå før denne side, da du ekke kenst redigære føden.',
+'protect-expiry-options'      => '1 tême:1 hour,2 têmer:2 hours,6 têmer:6 hours,1 då�:1 day,3 då�:3 days,1 uge:1 week,2 uger:2 weeks,1 måned:1 month,3 måneder:3 months,1 år:1 year,ubegrænset:indefinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Beskyttelsesståt',
 'restriction-level'           => 'Beskyttelseshøjde',
 
@@ -689,7 +709,6 @@ hersenenge, (førge) = førskel til den førge hersenenge, l = lile til mendre Ã
 # What links here
 'whatlinkshere'       => 'Vat henveser hertil',
 'whatlinkshere-title' => 'Sider der henveser til $1',
-'linklistsub'         => '(Henvesnengsliste)',
 'linkshere'           => "De følgende sider henveser til '''„[[:$1]]“''':",
 'nolinkshere'         => "Engen sider henveser til '''„[[:$1]]“'''.",
 'isredirect'          => 'Ã¥mstyrsside',
@@ -808,7 +827,7 @@ navn du harst valgt er ekke gyldegt. Vælg et andet navn.',
 'show-big-image'       => 'Hersenenge i større åpløsnenge',
 'show-big-image-thumb' => '<small>Størrelse åf førhåndsvesnenge: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Liste ve de nyeste billeter',
 
 # Bad image list
diff --git a/languages/messages/MessagesJv.php b/languages/messages/MessagesJv.php
index 8f4fa848..fa6bf5bf 100644
--- a/languages/messages/MessagesJv.php
+++ b/languages/messages/MessagesJv.php
@@ -8,6 +8,7 @@
  * @author Helix84
  * @author Meursault2004
  * @author Pras
+ * @author Rex
  * @author לערי ריינה�רט
  */
 
@@ -22,8 +23,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Dhiskusi_Panganggo',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Dhiskusi_$1',
-	NS_IMAGE            => 'Gambar',
-	NS_IMAGE_TALK       => 'Dhiskusi_Gambar',
+	NS_FILE             => 'Gambar',
+	NS_FILE_TALK        => 'Dhiskusi_Gambar',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Dhiskusi_MediaWiki',
 	NS_TEMPLATE         => 'Cithakan',
@@ -35,7 +36,7 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Gambar_Dhiskusi' => NS_IMAGE_TALK,
+	'Gambar_Dhiskusi' => NS_FILE_TALK,
 	'MediaWiki_Dhiskusi' => NS_MEDIAWIKI_TALK,
 	'Cithakan_Dhiskusi' => NS_TEMPLATE_TALK,
 	'Pitulung_Dhiskusi' => NS_HELP_TALK,
@@ -80,17 +81,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Delikna suntinganku ing daftar pangawasan',
 'tog-watchlisthidebots'       => 'Delikna suntingan ing daftar pangawasan',
 'tog-watchlisthideminor'      => 'Delikna suntingan kecil di daftar pangawasan',
+'tog-watchlisthideliu'        => 'Ngumpetaké suntingan panganggo sing mlebu log seka daftar pangawasan',
+'tog-watchlisthideanons'      => 'Ngumpetaké suntingan panganggo anonim seka daftar pangawasan',
 'tog-nolangconversion'        => 'Patènana konvèrsi varian',
 'tog-ccmeonemails'            => 'Kirimana aku salinan layang e-mail sing tak-kirimaké menyang wong liya',
 'tog-diffonly'                => 'Aja dituduhaké isi kaca ing ngisor bédané suntingan',
 'tog-showhiddencats'          => 'Tuduhna kategori sing didelikaké',
+'tog-norollbackdiff'          => 'Lirwaaké prabédan sawusé nglakokaké sawijining pambalikan.',
 
 'underline-always'  => 'Tansah',
 'underline-never'   => 'Ora',
 'underline-default' => 'Miturut konfigurasi panjlajah wèb',
 
-'skinpreview' => '(Pratayang)',
-
 # Dates
 'sunday'        => 'Minggu',
 'monday'        => 'Senèn',
@@ -182,7 +184,7 @@ $messages = array(
 'mytalk'         => 'Gunemanku',
 'anontalk'       => 'Dhiskusi IP puniki',
 'navigation'     => 'Pandhu Arah',
-'and'            => 'Lan',
+'and'            => '&#32;Lan',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -245,8 +247,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Prakara {{SITENAME}}',
 'aboutpage'            => 'Project:Prakara',
-'bugreports'           => 'Laporan bug',
-'bugreportspage'       => 'Project:Laporan bug',
 'copyright'            => 'Kabèh tèks kasedyakaké miturut $1.',
 'copyrightpagename'    => 'Hak cipta {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Hak cipta',
@@ -269,9 +269,7 @@ $messages = array(
 
 'badaccess'        => 'Aksès ora olèh',
 'badaccess-group0' => 'Panjenengan ora pareng nglakokaké tindhakan sing panjenengan gayuh.',
-'badaccess-group1' => 'Pratingkah sing panjenengan suwun namung bisa kanggo panganggo klompok $1.',
-'badaccess-group2' => 'Pratingkah sing panjenengan suwun diwatesi kanggo panganggo ing klompok $1.',
-'badaccess-groups' => 'Pratingkah panjenengan diwatesi tumrap panganggo ing klompoké $1.',
+'badaccess-groups' => 'Pratingkah panjenengan diwatesi tumrap panganggo ing {{PLURAL:$2|klompoké|klompoké}}: $1.',
 
 'versionrequired'     => 'Dibutuhaké MediaWiki vèrsi $1',
 'versionrequiredtext' => 'MediaWiki vèrsi $1 dibutuhaké kanggo nggunakaké kaca iki. Mangga mirsani [[Special:Version|kaca iki]]',
@@ -285,6 +283,8 @@ $messages = array(
 'editsection'             => 'sunting',
 'editold'                 => 'sunting',
 'viewsourceold'           => 'deleng sumber',
+'editlink'                => 'sunting',
+'viewsourcelink'          => 'deleng sumber',
 'editsectionhint'         => 'Sunting bagian: $1',
 'toc'                     => 'Bab lan paragraf',
 'showtoc'                 => 'tuduhna',
@@ -299,13 +299,13 @@ $messages = array(
 'site-atom-feed'          => "$1 ''Atom Feed''",
 'page-rss-feed'           => "\"\$1\" ''RSS Feed''",
 'page-atom-feed'          => "\"\$1\" ''Atom Feed''",
-'red-link-title'          => '$1 (durung digawé)',
+'red-link-title'          => '$1 (kaca durung ana)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikel',
 'nstab-user'      => 'Panganggo',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Astamewa',
+'nstab-special'   => 'Istiméwa',
 'nstab-project'   => 'Proyek',
 'nstab-image'     => 'Gambar',
 'nstab-mediawiki' => 'Pariwara',
@@ -352,7 +352,6 @@ Yèn dudu iki panyebabé, panjenengan manawa bisa nemokaké kasalahan (''bug'')
 'cannotdelete'         => 'Ora bisa mbusak kaca, gambar utawa berkas sing disuwun.',
 'badtitle'             => 'Judhulé ora sah',
 'badtitletext'         => 'Judhul kaca sing panjenengan ora bisa dituduhaké, kosong, utawa dadi judhul antar-basa utawa judhul antar-wiki. Iku bisa uga ana  sawijining utawa luwih aksara sing ora bisa didadèkaké judhul.',
-'perfdisabled'         => 'Nuwun sèwu! Fitur iki sawetara dipatèni amerga nggawé rindhik databasé nganti ora ana sing bisa nganggo wiki iki.',
 'perfcached'           => 'Data iki dijupuk saka <em>cache</em> lan mbokmenawa dudu data pungkasan:',
 'perfcachedts'         => 'Data iki dijupuk saka <em>cache</em>, lan dianyaraké ing pungkasan ing $1.',
 'querypage-no-updates' => 'Update saka kaca iki lagi dipatèni. Data sing ana ing kéné saiki ora bisa bakal dibalèni unggah manèh.',
@@ -376,7 +375,7 @@ $2',
 Alesané yaiku ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Kasalahan konfigurasi: pamindai virus ora dikenal: <i>$1</i>',
+'virus-badscanner'     => "Kasalahan konfigurasi: pamindai virus ora dikenal: ''$1''",
 'virus-scanfailed'     => "''Pemindaian'' utawa ''scan'' gagal (kode $1)",
 'virus-unknownscanner' => 'Antivirus ora ditepungi:',
 
@@ -394,7 +393,6 @@ Akun panjenengan wis kacipta. Aja lali nata konfigurasi {{SITENAME}} panjenengan
 'remembermypassword'         => 'Éling tembung sandhi',
 'yourdomainname'             => 'Dhomain panjenengan',
 'externaldberror'            => 'Ana kasalahan otèntikasi basis dhata èksternal utawa panjenengan ora pareng nglakoni pemutakhiran marang akun èksternal panjenengan.',
-'loginproblem'               => '<strong>Ana masalah ing prosès mlebu log panjenengan.</strong><br />Sumangga nyoba manèh!',
 'login'                      => 'Mlebu log',
 'nav-login-createaccount'    => 'Log mlebu / nggawé rékening (akun)',
 'loginprompt'                => "Panjenengan kudu ngaktifaké ''cookies'' supaya bisa mlebu (log in) ing {{SITENAME}}.",
@@ -453,8 +451,8 @@ Panjenengan disaranaké sigra mlebu log lan ngganti tembung sandhi.',
 'throttled-mailpassword'     => 'Sawijining pènget tembung sandhi wis dikirim, jroning $1 jam pungkasan iki.
 Kanggo nyegah salah-guna, mung siji tembung sandhi waé sing bisa dikirim saben $1 jam.',
 'mailerror'                  => 'Kasalahan ing ngirimaké layang e-mail: $1',
-'acct_creation_throttle_hit' => 'Nuwun sèwu, panjenengan wis nggawé akun $1. Panjenengan ora bisa nggawé manèh.',
-'emailauthenticated'         => 'Alamat layang élèktronik (e-mail) panjenengan wis didhedhes (dikonfirmasi) ing $1.',
+'acct_creation_throttle_hit' => 'Nuwun sèwu, panjenengan wis nggawé {{PLURAL:$1|1 akun|$1 akun}}. Panjenengan ora bisa nggawé manèh.',
+'emailauthenticated'         => 'Alamat layang élèktronik (e-mail) panjenengan wis didhedhes (dikonfirmasi) ing $3, $2.',
 'emailnotauthenticated'      => 'Alamat layang élèktronik panjenengan durung didhedhes (dikonfirmasi). Sadurungé didhedhes, panjenengan ora bisa nganggo fitur layang élèktronik (e-mail).',
 'noemailprefs'               => 'Panjenengan kudu milih alamat e-mail supaya bisa nganggo fitur iki.',
 'emailconfirmlink'           => 'Ndhedhes (konfirmasi) alamat e-mail panjenengan',
@@ -465,18 +463,27 @@ Kanggo nyegah salah-guna, mung siji tembung sandhi waé sing bisa dikirim saben
 'createaccount-text'         => 'Ana wong sing nggawé sawijining akun utawa rékening kanggo alamat e-mail panjenengan ing {{SITENAME}} ($4) mawa jeneng "$2" lan tembung sandi "$3". Panjenengan disaranaké kanggo mlebu log lan ngganti tembung sandi panjenengan saiki.
 
 Panjenengan bisa nglirwakaké pesen iki yèn akun utawa rékening iki digawé déné sawijining kaluputan.',
+'login-throttled'            => 'Panjenengan wis kekerepen njajal nglebokaké tembung sandi ing rékening utawa akun iki.
+Tulung nunggu dhisik sadurungé njajal manèh.',
 'loginlanguagelabel'         => 'Basa: $1',
 
 # Password reset dialog
-'resetpass'               => 'Nata mbalèni tembung sandhi akun',
-'resetpass_announce'      => 'Panjenengan wis mlebu log mawa kodhe sementara sing dikirim mawa e-mail. Menawa kersa nglanjutaké, panjenengan kudu milih tembung sandhi anyar ing kéné:',
-'resetpass_text'          => '<!-- Tambahaké teks ing kéné -->',
-'resetpass_header'        => 'Nata bali tembung sandhi',
-'resetpass_submit'        => 'Nata tembung sandhi lan mlebu log',
-'resetpass_success'       => 'Tembung sandhi panjenengan wis suksès diowahi! Saiki mrosès mlebu log panjenengan...',
-'resetpass_bad_temporary' => 'Tembung sandhi sementara salah. Panjenengan mbokmenawa tau ngganti tembung sandhi panjenengan utawa tau nyuwun tembung sandhi anyar.',
-'resetpass_forbidden'     => 'Tembung sandhi ora bisa diganti',
-'resetpass_missing'       => 'Data formulir ora ditepangi.',
+'resetpass'                 => 'Ngowahi utawa mbalèkaké tembung sandhi akun',
+'resetpass_announce'        => 'Panjenengan wis mlebu log mawa kodhe sementara sing dikirim mawa e-mail. Menawa kersa nglanjutaké, panjenengan kudu milih tembung sandhi anyar ing kéné:',
+'resetpass_text'            => '<!-- Tambahaké teks ing kéné -->',
+'resetpass_header'          => 'Nata bali tembung sandhi',
+'oldpassword'               => 'Tembung sandi lawas:',
+'newpassword'               => 'Tembung sandi anyar:',
+'retypenew'                 => 'Ketik ulang tembung sandi anyar:',
+'resetpass_submit'          => 'Nata tembung sandhi lan mlebu log',
+'resetpass_success'         => 'Tembung sandhi panjenengan wis suksès diowahi! Saiki mrosès mlebu log panjenengan...',
+'resetpass_bad_temporary'   => 'Tembung sandhi sementara salah. Panjenengan mbokmenawa tau ngganti tembung sandhi panjenengan utawa tau nyuwun tembung sandhi anyar.',
+'resetpass_forbidden'       => 'Tembung sandhi ora bisa diganti',
+'resetpass-no-info'         => 'Panjenengan kudu mlebu log kanggo ngaksès kaca iki sacara langsung.',
+'resetpass-submit-loggedin' => 'Ganti tembung sandi',
+'resetpass-wrong-oldpass'   => 'Tembung sandi ora sah. 
+Panjengen manawa wis kasil ganti tembung sandi utawa nyuwun tembung sandi sauntara sing anyar.',
+'resetpass-temp-password'   => 'Tembung sandi sauntara:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tèks iki bakal dicithak kandel',
@@ -501,8 +508,8 @@ Panjenengan bisa nglirwakaké pesen iki yèn akun utawa rékening iki digawé dÃ
 'hr_tip'          => 'Garis horisontal',
 
 # Edit pages
-'summary'                          => 'Ringkesan',
-'subject'                          => 'Subyek/judhul',
+'summary'                          => 'Ringkesan:',
+'subject'                          => 'Subyek/judhul:',
 'minoredit'                        => 'Iki suntingan cilik.',
 'watchthis'                        => 'Awasana kaca iki',
 'savearticle'                      => 'Simpen kaca',
@@ -514,8 +521,8 @@ Panjenengan bisa nglirwakaké pesen iki yèn akun utawa rékening iki digawé dÃ
 'missingsummary'                   => "'''Pènget:''' Panjenengan ora nglebokaké ringkesan panyuntingan. Menawa panjenengan mencèt tombol Simpen manèh, suntingan panjenengan bakal kasimpen tanpa ringkesan panyuntingan.",
 'missingcommenttext'               => 'Tulung lebokna komentar ing ngisor iki.',
 'missingcommentheader'             => "'''Pènget:''' Panjenengan durung mènèhi subyèk utawa judhul kanggo komentar panjenengan. Menawa panjenengan mencèt Simpan, suntingan panjenengan bakal kasimpen tanpa komentar iku.",
-'summary-preview'                  => 'Pratayang ringkesan',
-'subject-preview'                  => 'Pratayang subyèk/judhul',
+'summary-preview'                  => 'Pratayang ringkesan:',
+'subject-preview'                  => 'Pratayang subyèk/judhul:',
 'blockedtitle'                     => 'Panganggo diblokir',
 'blockedtext'                      => "<big>'''Asma panganggo utawa alamat IP panjenengan diblokir.'''</big>
 
@@ -564,28 +571,29 @@ ID pamblokiran panjenengan iku #$5 lan alamat IP panjenengan iku $3. Tulung sert
 Manawa kersa manulis artikel iki, manggaa. (Mangga mirsani [[{{MediaWiki:Helppage}}|Pitulung]] kanggo informasi sabanjuré).
 Yèn ora sengaja tekan kéné, bisa ngeklik pencètan '''back''' waé ing panjlajah wèb panjenengan.",
 'anontalkpagetext'                 => "---- ''Iki yaiku kaca dhiskusi sawijining panganggo anonim sing durung kagungan akun utawa ora nganggo akuné, dadi kita keeksa kudu nganggo alamat IP-né kanggo nepangi. Alamat IP kaya mengkéné iki bisa dienggo déning panganggo sing séjé-séjé. Yèn panjenengan pancèn panganggo anonim lan olèh komentar-komentar miring, mangga [[Special:UserLogin|nggawé akun utawa log mlebu]] supaya ora rancu karo panganggo anonim liyané ing mangsa ngarep.''",
-'noarticletext'                    => 'Saiki ora ana tèks ing kaca iki. Panjenengan bisa [[Special:Search/{{PAGENAME}}|nglakoni panggolèkan kanggo judhul iki kaca iki]] ing kaca-kaca liyané utawa [{{fullurl:{{FULLPAGENAME}}|action=edit}} nyunting kaca iki].',
+'noarticletext'                    => 'Saiki ora ana tèks ing kaca iki. Panjenengan bisa [[Special:Search/{{PAGENAME}}|nglakoni panggolèkan kanggo judhul iki kaca iki]] ing kaca-kaca liyané, <span class="plainlinks">[{{fullurl:Special:Log|kaca={{urlencode:{{FULLPAGENAME}}}}}} nggolèki log kagandhèng],
+utawa [{{fullurl:{{FULLPAGENAME}}|action=edit}} nyunting kaca iki]</span>.',
 'userpage-userdoesnotexist'        => 'Akun utawa rékening panganggo "$1" ora kadaftar.',
 'clearyourcache'                   => "'''Cathetan:''' Sawisé nyimpen préférènsi, panjenengan prelu ngresiki <em>cache</em> panjlajah wèb panjenengan kanggo mirsani pangowahan. '''Mozilla / Firefox / Safari:''' pencèt ''Ctrl-Shift-R'' (''Cmd-Shift-R'' pada Apple Mac); '''IE:''' tekan ''Ctrl-F5''; '''Konqueror:''': pencèt ''F5''; '''Opera''' resikana <em>cache</em> miturut menu ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => "<strong>Tips:</strong> Gunakna tombol 'Deleng pratilik' kanggo ngetès CSS/JS anyar panjenengan sadurungé disimpen.",
+'usercssjsyoucanpreview'           => "'''Tips:''' Gunakna tombol 'Deleng pratilik' kanggo ngetès CSS/JS anyar panjenengan sadurungé disimpen.",
 'usercsspreview'                   => "'''Pèngeten yèn panjenengan namung mirsani pratilik CSS panjenengan.'''' 
 '''Pratilik iku durung kasimpen!'''",
 'userjspreview'                    => "'''Pèngeten yèn sing panjenengan pirsani namung pratilik JavaScript panjenengan, lan menawa pratilik iku dèrèng kasimpen!'''",
 'userinvalidcssjstitle'            => "'''Pènget:''' Kulit \"\$1\" ora ditemokaké. Muga dipèngeti yèn kaca .css lan .js nggunakaké huruf cilik, conto {{ns:user}}:Foo/monobook.css lan dudu {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Dianyari)',
-'note'                             => '<strong>Cathetan:</strong>',
-'previewnote'                      => '<strong>Muga digatèkaké menawa iki namung pratilik waé, durung disimpen!</strong>',
+'note'                             => "'''Cathetan:'''",
+'previewnote'                      => "'''Muga digatèkaké menawa iki namung pratilik waé, durung disimpen!'''",
 'previewconflict'                  => 'Pratilik iki nuduhaké tèks ing bagian dhuwur kothak suntingan tèks kayadéné bakal katon yèn panjenengan bakal simpen.',
-'session_fail_preview'             => "<strong>Nuwun sèwu, suntingan panjenengan ora bisa diolah amarga dhata sèsi kabusak.
-Coba kirim dhata manèh. Yèn tetep ora bisa, coba log metua lan mlebu log manèh.</strong>'''Amerga wiki iki marengaké panggunan kodhe HTML mentah, mula pratilik didhelikaké minangka pancegahan marang serangan JavaScript.'''
-<strong>Menawa iki sawijining usaha panyuntingan sing sah, mangga dicoba manèh.
-Yèn isih tetep ora kasil, cobanen metu log lan mlebu manèh.</strong>",
-'session_fail_preview_html'        => "<strong>Nuwun sèwu! Kita ora bisa prosès suntingan panjenengan amerga data sési ilang.</strong>
+'session_fail_preview'             => "'''Nuwun sèwu, suntingan panjenengan ora bisa diolah amarga dhata sèsi kabusak.
+Coba kirim dhata manèh. Yèn tetep ora bisa, coba log metua lan mlebu log manèh.''''''Amerga wiki iki marengaké panggunan kodhe HTML mentah, mula pratilik didhelikaké minangka pancegahan marang serangan JavaScript.'''
+'''Menawa iki sawijining usaha panyuntingan sing sah, mangga dicoba manèh.
+Yèn isih tetep ora kasil, cobanen metu log lan mlebu manèh.'''",
+'session_fail_preview_html'        => "'''Nuwun sèwu! Kita ora bisa prosès suntingan panjenengan amerga data sési ilang.'''
 
 ''Amerga wiki iki ngidinaké panrapan HTML mentah, pratayang didelikaké minangka penggakan marang serangan Javascript.''
 
-<strong>Yèn iki sawijining upaya suntingan sing absah, mangga dicoba manèh. Yèn isih tetep ora kasil, cobanen metu log utawa oncat lan mlebua manèh.</strong>",
-'token_suffix_mismatch'            => '<strong>Suntingan panjenengan ditulak amerga aplikasi klièn panjenengan ngowahi karakter tandha wewacan ing suntingan. Suntingan iku ditulak kanggo untuk menggak kaluputan ing tèks artikel. Prekara iki kadhangkala dumadi yèn panjenengan ngangem dines layanan proxy anonim adhedhasar situs wèb sing duwé masalah.</strong>',
+'''Yèn iki sawijining upaya suntingan sing absah, mangga dicoba manèh. Yèn isih tetep ora kasil, cobanen metu log utawa oncat lan mlebua manèh.'''",
+'token_suffix_mismatch'            => "'''Suntingan panjenengan ditulak amerga aplikasi klièn panjenengan ngowahi karakter tandha wewacan ing suntingan. Suntingan iku ditulak kanggo untuk menggak kaluputan ing tèks artikel. Prekara iki kadhangkala dumadi yèn panjenengan ngangem dines layanan proxy anonim adhedhasar situs wèb sing duwé masalah.'''",
 'editing'                          => 'Nyunting $1',
 'editingsection'                   => 'Nyunting $1 (bagian)',
 'editingcomment'                   => 'Nyunting $1 (komentar)',
@@ -593,20 +601,22 @@ Yèn isih tetep ora kasil, cobanen metu log lan mlebu manèh.</strong>",
 'explainconflict'                  => 'Wong liya wis nyunting kaca iki wiwit panjenengan mau nyunting. Bagian dhuwur tèks iki ngamot tèks kaca vèrsi saiki. Pangowahan sing panjenengan lakoni dituduhaké ing bagian ngisor tèks. Panjenengan namung prelu nggabungaké pangowahan panjenengan karo tèks sing wis ana. <strong>Namung</strong> tèks ing bagian dhuwur kaca sing bakal kasimpen menawa panjenengan mencèt "Simpen kaca".<p>',
 'yourtext'                         => 'Tèks panjenengan',
 'storedversion'                    => 'Versi sing kasimpen',
-'nonunicodebrowser'                => '<strong>PÈNGET: Panjlajah wèb panjenengan ora ndhukung Unicode, mangga gantènana panjlajah wèb panjenengan sadurungé nyunting artikel.</strong>',
+'nonunicodebrowser'                => "'''PÈNGET: Panjlajah wèb panjenengan ora ndhukung Unicode, mangga gantènana panjlajah wèb panjenengan sadurungé nyunting artikel.'''",
 'editingold'                       => "'''PÈNGET:''' Panjenengan nyunting revisi lawas sawijining kaca. Yèn versi iki panjenengan simpen, mengko pangowahan-pangowahan sing wis digawé wiwit revisi iki bakal ilang.",
 'yourdiff'                         => 'Prabédan',
-'copyrightwarning'                 => 'Tulung dipun-gatèkaké menawa kabèh sumbangsih utawa kontribusi kanggo {{SITENAME}} iku dianggep wis diluncuraké miturut $2 GNU (mangga priksanen $1 kanggo ditèlé).
+'copyrightwarning'                 => "Tulung dipun-gatèkaké menawa kabèh sumbangsih utawa kontribusi kanggo {{SITENAME}} iku dianggep wis diluncuraké miturut $2 GNU (mangga priksanen $1 kanggo ditèlé).
 Menawa panjenengan ora kersa menawa tulisan panjenengan bakal disunting karo disebar, aja didokok ing kéné.<br />
-Panjenengan uga janji menawa apa-apa sing katulis ing kéné, iku karyané panjenengan dhéwé, utawa disalin saka sumber bébas. <strong>AJA NDOKOK KARYA SING DIREKSA DÉNING UNDHANG-UNDHANG HAK CIPTA TANPA IDIN!</strong>',
-'copyrightwarning2'                => 'Mangga digatèkaké yèn kabèh kontribusi marang  {{SITENAME}} bisa disunting, diowahi, utawa dibusak déning penyumbang liyané. Yèn panjenengan ora kersa yèn tulisan panjenengan bisa disunting wong liya, aja ngirim artikel panjenengan ing kéné.<br />Panjenengan uga janji yèn tulisan panjenengan iku kasil karya panjenengan dhéwé, utawa disalin saka sumber umum utawa sumber bébas liyané (mangga delengen $1 kanggo informasi sabanjuré). <strong>AJA NGIRIM KARYA SING DIREKSA DÉNING UNDHANG-UNDHANG HAK CIPTA TANPA IDIN!</strong>',
+Panjenengan uga janji menawa apa-apa sing katulis ing kéné, iku karyané panjenengan dhéwé, utawa disalin saka sumber bébas. '''AJA NDOKOK KARYA SING DIREKSA DÉNING UNDHANG-UNDHANG HAK CIPTA TANPA IDIN!'''",
+'copyrightwarning2'                => "Mangga digatèkaké yèn kabèh kontribusi marang  {{SITENAME}} bisa disunting, diowahi, utawa dibusak déning penyumbang liyané. Yèn panjenengan ora kersa yèn tulisan panjenengan bisa disunting wong liya, aja ngirim artikel panjenengan ing kéné.<br />Panjenengan uga janji yèn tulisan panjenengan iku kasil karya panjenengan dhéwé, utawa disalin saka sumber umum utawa sumber bébas liyané (mangga delengen $1 kanggo informasi sabanjuré). '''AJA NGIRIM KARYA SING DIREKSA DÉNING UNDHANG-UNDHANG HAK CIPTA TANPA IDIN!'''",
 'longpagewarning'                  => "'''PÈNGET: Kaca iki dawané $1 kilobita; sawetara panjlajah wèb mbokmenawa ngalami masalah kanggo nyunting kaca sing dawané 32 kb utawa luwih. Muga digalih dhisik mbokmenawa kaca iki bisa dipérang dadi pirang-pirang kaca sing luwih cilik.'''",
-'longpageerror'                    => '<strong>KALUPUTAN: Tèks sing panjenengan kirim gedhéné $1 kilobita, sing tegesé luwih gedhé tinimbang cacah maksimum $2 kilobita. Tèks iki ora bisa disimpen.</strong>',
-'readonlywarning'                  => '<strong>PÈNGET: Basis data lagi dikunci amerga ana pangopènan, dadi saiki panjenengan ora bisa nyimpen kasil panyuntingan panjenengan. Panjenengan mbokmenawa prelu mindhahaké kasil panyuntingan panjenengan iki menyang panggonan liya kanggo disimpen bésuk.</strong>',
-'protectedpagewarning'             => '<strong>PÈNGET:  Kaca iki wis dikunci dadi namung panganggo sing nduwé hak aksès pangurus baé sing bisa nyunting.</strong>',
+'longpageerror'                    => "'''KALUPUTAN: Tèks sing panjenengan kirim gedhéné $1 kilobita, sing tegesé luwih gedhé tinimbang cacah maksimum $2 kilobita. Tèks iki ora bisa disimpen.'''",
+'readonlywarning'                  => "'''PÈNGET: Basis data lagi dikunci amerga ana pangopènan, dadi saiki panjenengan ora bisa nyimpen kasil panyuntingan panjenengan. Panjenengan mbokmenawa prelu mindhahaké kasil panyuntingan panjenengan iki menyang panggonan liya kanggo disimpen bésuk.'''
+
+Pangurus sing ngunci basis data mènèhi katrangan kaya mengkéné: $1",
+'protectedpagewarning'             => "'''PÈNGET:  Kaca iki wis dikunci dadi namung panganggo sing nduwé hak aksès pangurus baé sing bisa nyunting.'''",
 'semiprotectedpagewarning'         => "'''Cathetan:''' Kaca iki lagi direksa, dadi namung panganggo kadaftar sing bisa nyunting.",
 'cascadeprotectedwarning'          => "'''PÈNGET:''' Kaca iki wis dikunci dadi namung panganggo mawa hak aksès pangurus waé sing bisa nyunting, amerga kalebu {{PLURAL:$1|kaca|kaca-kaca}} ing ngisor iki sing wis direksa mawa opsi 'pangreksan runtun' diaktifaké:",
-'titleprotectedwarning'            => '<strong>PÈNGET: Kaca iki wis dikunci dadi namung sawetara panganggo waé sing bisa nggawé.</strong>',
+'titleprotectedwarning'            => "'''PÈNGET: Kaca iki wis dikunci dadi namung sawetara panganggo waé sing bisa nggawé.'''",
 'templatesused'                    => 'Cithakan kang digunakaké ing kaca iki:',
 'templatesusedpreview'             => 'Cithakan kang digunakaké ing pratilik iki:',
 'templatesusedsection'             => 'Cithakan kang digunakaké ing bagian iki:',
@@ -624,17 +634,29 @@ Panjenengan uga janji menawa apa-apa sing katulis ing kéné, iku karyané panje
 
 Mangga digagas manèh apa suntingan panjenengan iki layak ora.
 Ing ngisor iki kapacak log pambusakan saka kaca iki:",
+'deleted-notice'                   => 'Kaca iki wis dibusak. Minangka réferènsi, mangga iki log pambusakan kaca iki.',
+'deletelog-fulllog'                => 'Tudhuhna kabèh log',
+'edit-hook-aborted'                => 'Suntingan dibatalaké déning kait parser
+Tanpa ana katrangan.',
+'edit-gone-missing'                => 'Ora bisa nganyari kaca.
+Katoné kaca iki wis dibusak.',
+'edit-conflict'                    => 'Konflik panyuntingan.',
+'edit-no-change'                   => 'Suntingan panjenengan dilirwakaké amerga panjenengan ora nglakoni pangowahan apa-apa ing tèks.',
+'edit-already-exists'              => 'Ora bisa nggawé kaca anyar.
+Amerga wis ana.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Pènget: Kaca iki ngandhut kakèhan panggunan fungsi ''parser'' sing larang.
 
-Sajatiné kuduné duwé kurang saka $2, saiki ana $1.",
+Sajatiné kuduné duwé kurang saka {{PLURAL:$2|panggilan|panggilan}}, saiki ana {{PLURAL:$1|$1 panggilan|$1 panggilan}}.",
 'expensive-parserfunction-category'       => "Kaca-kaca mawa panggunan fungsi ''parser'' sing kakèhan",
 'post-expand-template-inclusion-warning'  => 'Pènget: Cithakan klebu ukurané kegedhèn.
 Sawetara cithakan bakal dilirwakaké.',
 'post-expand-template-inclusion-category' => 'Kaca-kaca kanthi cithakan klebu ukuran sing ngluwihi wates',
 'post-expand-template-argument-warning'   => 'Pènget: Kaca iki ngandhut saora-orané siji argumen cithakan kanthi ukuran èkspansi sing kegedhèn. Argumèn-argumèn kasebut wis dilirwakaké.',
 'post-expand-template-argument-category'  => 'Kaca-kaca kanthi argumèn cithakan sing dilirwakaké',
+'parser-template-loop-warning'            => "Ana ''loop'' cithakan: [[$1]]",
+'parser-template-recursion-depth-warning' => "Wates ''recursion depth'' cithakan wis ngliwati ($1)",
 
 # "Undo" feature
 'undo-success' => 'Suntingan iki bisa dibatalaké. Tulung priksa prabandhingan ing ngisor iki kanggo mesthèkaké yèn prakara iki pancèn sing bener panjenengan pèngin lakoni, banjur simpenen pangowahan iku kanggo ngrampungaké pambatalan suntingan.',
@@ -649,27 +671,27 @@ Sawetara cithakan bakal dilirwakaké.',
 Alesané miturut $3 yaiku ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Mirsani log kaca iki',
-'nohistory'           => 'Ora ana sajarah panyuntingan kanggo kaca iki',
-'revnotfound'         => 'Revisi ora ditemokaké',
-'revnotfoundtext'     => 'Revisi lawas kaca sing panjenengan suwun ora bisa ditemokaké. Mangga priksanen URL sing digunakaké kanggo ngaksès kaca iki.',
-'currentrev'          => 'Revisi saiki',
-'revisionasof'        => 'Revisi per $1',
-'revision-info'       => 'Revisi per $1; $2',
-'previousrevision'    => '�Revisi sadurungé',
-'nextrevision'        => 'Revisi sabanjuré→',
-'currentrevisionlink' => 'Revisi saiki',
-'cur'                 => 'saiki',
-'next'                => 'sabanjuré',
-'last'                => 'akir',
-'page_first'          => 'kapisan',
-'page_last'           => 'pungkasan',
-'histlegend'          => "Pilihen rong tombol radhio banjur pencèten tombol ''bandhingna'' kanggo mbandhingaké versi. Klik sawijining tanggal kanggo ndeleng versi kaca ing tanggal iku.<br />(skr) = prabédan karo vèrsi saiki, (akir) = prabédan karo vèrsi sadurungé, '''s''' = suntingan sithik, '''b''' = suntingan bot, → = suntingan bagian, � = ringkesan otomatis",
-'deletedrev'          => '[dibusak]',
-'histfirst'           => 'Suwé dhéwé',
-'histlast'            => 'Anyar dhéwé',
-'historysize'         => '($1 {{PLURAL:$1|bita|bita}})',
-'historyempty'        => '(kosong)',
+'viewpagelogs'           => 'Mirsani log kaca iki',
+'nohistory'              => 'Ora ana sajarah panyuntingan kanggo kaca iki',
+'currentrev'             => 'Revisi saiki',
+'currentrev-asof'        => 'Révisi anyar dhéwé ing tanggal $1',
+'revisionasof'           => 'Revisi per $1',
+'revision-info'          => 'Revisi per $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Revisi sadurungé',
+'nextrevision'           => 'Revisi sabanjuré→',
+'currentrevisionlink'    => 'Revisi saiki',
+'cur'                    => 'saiki',
+'next'                   => 'sabanjuré',
+'last'                   => 'akir',
+'page_first'             => 'kapisan',
+'page_last'              => 'pungkasan',
+'histlegend'             => "Pilihen rong tombol radhio banjur pencèten tombol ''bandhingna'' kanggo mbandhingaké versi. Klik sawijining tanggal kanggo ndeleng versi kaca ing tanggal iku.<br />(skr) = prabédan karo vèrsi saiki, (akir) = prabédan karo vèrsi sadurungé, '''s''' = suntingan sithik, '''b''' = suntingan bot, → = suntingan bagian, � = ringkesan otomatis",
+'history-fieldset-title' => 'Njlajah sajarah vèrsi sadhurungé',
+'deletedrev'             => '[dibusak]',
+'histfirst'              => 'Suwé dhéwé',
+'histlast'               => 'Anyar dhéwé',
+'historysize'            => '($1 {{PLURAL:$1|bita|bita}})',
+'historyempty'           => '(kosong)',
 
 # Revision feed
 'history-feed-title'          => 'Riwayat revisi',
@@ -747,6 +769,7 @@ Gunakna tombol radio kanggo nggabungaké révisi-révisi sing digawé sadurungé
 'mergehistory-invalid-destination' => 'Irah-irahan kaca tujuan kudu irah-irahan utawa judhul sing bener.',
 'mergehistory-autocomment'         => 'Nggabung [[:$1]] menyang [[:$2]]',
 'mergehistory-comment'             => 'Nggabung [[:$1]] menyang [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Jeneng kaca sumber lan tujuan ora kena padha',
 
 # Merge log
 'mergelog'           => 'Gabung log',
@@ -759,120 +782,198 @@ Gunakna tombol radio kanggo nggabungaké révisi-révisi sing digawé sadurungé
 'difference'              => '(Prabédan antarrevisi)',
 'lineno'                  => 'Larikan $1:',
 'compareselectedversions' => 'Bandhingna vèrsi kapilih',
+'visualcomparison'        => 'Prabandhingan visual',
+'wikicodecomparison'      => 'Prabandhingan tèks wiki',
 'editundo'                => 'batalna',
 'diff-multi'              => '({{PLURAL:$1|Sawiji|$1}} revisi antara sing ora dituduhaké.)',
+'diff-movedto'            => 'dialihaké menyang $1',
+'diff-styleadded'         => '$1 gaya ditambahaké',
+'diff-added'              => '$1 ditambahaké',
+'diff-changedto'          => 'diowahi dadi $1',
+'diff-movedoutof'         => 'dipindahaké saka $1',
+'diff-styleremoved'       => '$1 gaya dibusak',
+'diff-removed'            => '$1 dibusak',
+'diff-changedfrom'        => 'diowahi saka $1',
+'diff-src'                => 'sumber',
+'diff-withdestination'    => 'kanthi tujuan $1',
+'diff-with'               => '&#32;karo $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;lan $1 $2',
+'diff-width'              => 'amba',
+'diff-height'             => 'dhuwur',
+'diff-p'                  => "sawijining '''paragraf'''",
+'diff-blockquote'         => "sawijining '''sitat'''",
+'diff-h1'                 => "sawijining '''judhul bagéyan (tataran 1)'''",
+'diff-h2'                 => "sawijining '''judhul bagéyan (tataran 2)'''",
+'diff-h3'                 => "sawijining '''judhul bagéyan (tataran 3)'''",
+'diff-h4'                 => "sawijining '''judhul bagéyan (tataran 4)'''",
+'diff-h5'                 => "sawijining '''judhul bagéyan (tataran 5)'''",
+'diff-pre'                => "sawijining '''blok kanthi praformat'''",
+'diff-div'                => "sawijining '''bagéyan'''",
+'diff-ul'                 => "sawijining '''dhaftar ora kaurut'''",
+'diff-ol'                 => "sawijining '''dhaftar kaurut'''",
+'diff-li'                 => "sawijining '''dhaftar butir'''",
+'diff-table'              => "sawijining '''tabel'''",
+'diff-tbody'              => "sawijining '''isi tabel'''",
+'diff-tr'                 => "sawijining '''larikan'''",
+'diff-td'                 => "sawijining '''sèl'''",
+'diff-th'                 => "sawijining '''tajuk'''",
+'diff-br'                 => "sawijining '''jeda'''",
+'diff-hr'                 => "sawijining '''mistar dhatar'''",
+'diff-code'               => "sawijining '''blok kodhe komputer'''",
+'diff-dl'                 => "sawijining '''dhaftar dhéfinisi'''",
+'diff-dt'                 => "sawijining '''dhéfinisi istilah'''",
+'diff-dd'                 => "sawijining '''dhéfinisi'''",
+'diff-input'              => "sawijining '''lebonan'''",
+'diff-form'               => "sawijining '''formulir'''",
+'diff-img'                => "sawijining '''gambar'''",
+'diff-span'               => "sawijining '''rentang'''",
+'diff-a'                  => "sawijining '''pranala'''",
+'diff-i'                  => "'''italik'''",
+'diff-b'                  => "'''kandel'''",
+'diff-strong'             => "'''kuwat'''",
+'diff-em'                 => "'''panekanan'''",
+'diff-font'               => "'''aksara'''",
+'diff-big'                => "'''gedhé'''",
+'diff-del'                => "'''dibusak'''",
+'diff-tt'                 => "'''amba maton'''",
+'diff-sub'                => "'''tik ngisor'''",
+'diff-sup'                => "'''tik ndhuwur'''",
+'diff-strike'             => "'''corèk'''",
 
 # Search results
-'searchresults'             => 'Kasil panggolèkan',
-'searchresulttext'          => 'Kanggo informasi sabanjuré ngenani panggolèkan ing {{SITENAME}}, mangga mirsani [[{{MediaWiki:Helppage}}|kaca pitulung]].',
-'searchsubtitle'            => 'Panjenengan nggolèki \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|kabèh kaca sing diwiwiti kanthi "$1"]] | [[Special:WhatLinksHere/$1|kabèh kaca sing kagandhèng karo/menyang "$1"]])',
-'searchsubtitleinvalid'     => "Panjenengan nggolèki '''$1'''",
-'noexactmatch'              => "'''Ora ana kaca mawa irah-irahan utawa judhul \"\$1\".''' Panjenengan bisa [[:\$1|nggawé kaca iki]].",
-'noexactmatch-nocreate'     => "'''Ora ana kaca mawa irah-irahan utawa judhul \"\$1\".'''",
-'toomanymatches'            => "Olèhé panjenengan golèk ngasilaké kakèhan pituwas, mangga nglebokaké ''query'' liyané",
-'titlematches'              => 'Irah-irahan artikel sing cocog',
-'notitlematches'            => 'Ora ana irah-irahan artikel sing cocog',
-'textmatches'               => 'Tèks artikel sing cocog',
-'notextmatches'             => 'Ora ana tèks kaca sing cocog',
-'prevn'                     => '$1 sadurungé',
-'nextn'                     => '$1 sabanjuré',
-'viewprevnext'              => 'Deleng ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 tembung|$2 tembung}})',
-'search-result-score'       => 'Relevansi: $1%',
-'search-redirect'           => '(pangalihan $1)',
-'search-section'            => '(sèksi $1)',
-'search-suggest'            => 'Apa panjenengan kersané: $1',
-'search-interwiki-caption'  => 'Proyèk-proyèk kagandhèng',
-'search-interwiki-default'  => 'Pituwas $1:',
-'search-interwiki-more'     => '(luwih akèh)',
-'search-mwsuggest-enabled'  => 'mawa sugèsti',
-'search-mwsuggest-disabled' => 'ora ana sugèsti',
-'search-relatedarticle'     => 'Kagandhèng',
-'mwsuggest-disable'         => 'Patènana sugèsti AJAX',
-'searchrelated'             => 'kagandhèng',
-'searchall'                 => 'kabèh',
-'showingresults'            => "Ing ngisor iki dituduhaké {{PLURAL:$1|'''1''' kasil|'''$1''' kasil}}, wiwitané saking #<strong>$2</strong>.",
-'showingresultsnum'         => "Ing ngisor iki dituduhaké {{PLURAL:$3|'''1''' kasil|'''$3''' kasil}}, wiwitané saka #<strong>$2</strong>.",
-'showingresultstotal'       => "Ing ngisor iki kapacak pituwas '''$1 - $2''' of '''$3'''",
-'nonefound'                 => "'''Cathetan''': Namung sawetara bilik nama sing digolèki sacara baku. Coba seselana mawa awalan ''all:'' kanggo golèk kabèh isi (kalebu kaca dhiskusi, cithakan lsp.), utawa nganggo bilik nama sing dipèngèni minangka préfiks.",
-'powersearch'               => 'Golèk (ing tataran sing luwih dhuwur/maju)',
-'powersearch-legend'        => "Panggolèkan sabanjuré (''advance search'')",
-'powersearch-ns'            => 'Panggolèkan ing ruang jeneng:',
-'powersearch-redir'         => 'Pratélan pangalihan',
-'powersearch-field'         => 'Nggolèki',
-'search-external'           => 'Panggolèkan èkstèrnal',
-'searchdisabled'            => 'Sawetara wektu iki panjenengan ora bisa nggolèk mawa fungsi golèk {{SITENAME}}. Kanggo saiki mangga panjenengan bisa golèk nganggo Google. Nanging isi indèks Google kanggo {{SITENAME}} bisa waé lawas lan durung dianyari.',
+'searchresults'                    => 'Kasil panggolèkan',
+'searchresults-title'              => 'Kasil panggolèkan saka "$1"',
+'searchresulttext'                 => 'Kanggo informasi sabanjuré ngenani panggolèkan ing {{SITENAME}}, mangga mirsani [[{{MediaWiki:Helppage}}|kaca pitulung]].',
+'searchsubtitle'                   => 'Panjenengan nggolèki \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|kabèh kaca sing diwiwiti kanthi "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|kabèh kaca sing kagandhèng karo/menyang "$1"]])',
+'searchsubtitleinvalid'            => "Panjenengan nggolèki '''$1'''",
+'noexactmatch'                     => "'''Ora ana kaca mawa irah-irahan utawa judhul \"\$1\".''' Panjenengan bisa [[:\$1|nggawé kaca iki]].",
+'noexactmatch-nocreate'            => "'''Ora ana kaca mawa irah-irahan utawa judhul \"\$1\".'''",
+'toomanymatches'                   => "Olèhé panjenengan golèk ngasilaké kakèhan pituwas, mangga nglebokaké ''query'' liyané",
+'titlematches'                     => 'Irah-irahan artikel sing cocog',
+'notitlematches'                   => 'Ora ana irah-irahan artikel sing cocog',
+'textmatches'                      => 'Tèks artikel sing cocog',
+'notextmatches'                    => 'Ora ana tèks kaca sing cocog',
+'prevn'                            => '$1 sadurungé',
+'nextn'                            => '$1 sabanjuré',
+'viewprevnext'                     => 'Deleng ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Pilihan panggolèkan',
+'searchmenu-exists'                => "'''Ana kaca kanthi jeneng \"[[\$1]]\" ing wiki iki'''",
+'searchmenu-new'                   => "'''[[:\$1|Gawé]] kaca \"\$1\" ing wiki iki!'''",
+'searchhelp-url'                   => 'Help:Isi',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Tlusuri kaca-kaca kanthi tembung-wiwitan iki]]',
+'searchprofile-articles'           => 'Kaca-kaca isi',
+'searchprofile-articles-and-proj'  => 'Kaca isi & kaca proyèk',
+'searchprofile-project'            => 'Kaca proyèk',
+'searchprofile-images'             => 'Berkas',
+'searchprofile-everything'         => 'Kabèh',
+'searchprofile-advanced'           => 'Tataran luwih dhuwur/maju',
+'searchprofile-articles-tooltip'   => 'Panggolèkan ing $1',
+'searchprofile-project-tooltip'    => 'Panggolèkan ing $1',
+'searchprofile-images-tooltip'     => 'Panggolèkan berkas',
+'searchprofile-everything-tooltip' => 'Panggolèkan kabèh isi (klebu kaca-kaca wicara)',
+'searchprofile-advanced-tooltip'   => "Panggolèkan ing bilik jeneng biasa (''custom'')",
+'prefs-search-nsdefault'           => "Panggolèkan migunakaké standar asli (''default''):",
+'prefs-search-nscustom'            => "Panggolèkan bilikjeneng biasa (''custom''):",
+'search-result-size'               => '$1 ({{PLURAL:$2|1 tembung|$2 tembung}})',
+'search-result-score'              => 'Relevansi: $1%',
+'search-redirect'                  => '(pangalihan $1)',
+'search-section'                   => '(sèksi $1)',
+'search-suggest'                   => 'Apa panjenengan kersané: $1',
+'search-interwiki-caption'         => 'Proyèk-proyèk kagandhèng',
+'search-interwiki-default'         => 'Pituwas $1:',
+'search-interwiki-more'            => '(luwih akèh)',
+'search-mwsuggest-enabled'         => 'mawa sugèsti',
+'search-mwsuggest-disabled'        => 'ora ana sugèsti',
+'search-relatedarticle'            => 'Kagandhèng',
+'mwsuggest-disable'                => 'Patènana sugèsti AJAX',
+'searchrelated'                    => 'kagandhèng',
+'searchall'                        => 'kabèh',
+'showingresults'                   => "Ing ngisor iki dituduhaké {{PLURAL:$1|'''1''' kasil|'''$1''' kasil}}, wiwitané saking #<strong>$2</strong>.",
+'showingresultsnum'                => "Ing ngisor iki dituduhaké {{PLURAL:$3|'''1''' kasil|'''$3''' kasil}}, wiwitané saka #<strong>$2</strong>.",
+'showingresultstotal'              => "Ing ngisor iki kapacak pituwas {{PLURAL:$4|'''$1'''|'''$1 - $2'''}} saka '''$3'''",
+'nonefound'                        => "'''Cathetan''': Namung sawetara bilik nama sing digolèki sacara baku. Coba seselana mawa awalan ''all:'' kanggo golèk kabèh isi (kalebu kaca dhiskusi, cithakan lsp.), utawa nganggo bilik nama sing dipèngèni minangka préfiks.",
+'search-nonefound'                 => "Ora ana kasil sing cocog karo pitakonan (''query'').",
+'powersearch'                      => 'Golèk (ing tataran sing luwih dhuwur/maju)',
+'powersearch-legend'               => "Panggolèkan sabanjuré (''advance search'')",
+'powersearch-ns'                   => 'Panggolèkan ing ruang jeneng:',
+'powersearch-redir'                => 'Pratélan pangalihan',
+'powersearch-field'                => 'Nggolèki',
+'search-external'                  => 'Panggolèkan èkstèrnal',
+'searchdisabled'                   => 'Sawetara wektu iki panjenengan ora bisa nggolèk mawa fungsi golèk {{SITENAME}}. Kanggo saiki mangga panjenengan bisa golèk nganggo Google. Nanging isi indèks Google kanggo {{SITENAME}} bisa waé lawas lan durung dianyari.',
 
 # Preferences page
-'preferences'              => 'Preferensi (pilihan)',
-'mypreferences'            => 'Préferènsiku',
-'prefs-edits'              => 'Gunggungé suntingan:',
-'prefsnologin'             => 'Durung mlebu log',
-'prefsnologintext'         => 'Panjenengan kudu <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}}| mlebu log]</span> kanggo ngowahin préferènsi njenengan.',
-'prefsreset'               => 'Préferènsi wis dibalèkaké menyang konfigurasi baku.',
-'qbsettings'               => 'Pengaturan bar sidhatan',
-'qbsettings-none'          => 'Ora ana',
-'qbsettings-fixedleft'     => 'Tetep sisih kiwa',
-'qbsettings-fixedright'    => 'Tetep sisih tengen',
-'qbsettings-floatingleft'  => 'Ngambang sisih kiwa',
-'qbsettings-floatingright' => 'Ngambang sisih tengen',
-'changepassword'           => 'Ganti tembung sandi',
-'skin'                     => 'Kulit',
-'math'                     => 'Matématika',
-'dateformat'               => 'Format tanggal',
-'datedefault'              => 'Ora ana préferènsi',
-'datetime'                 => 'Tanggal lan wektu',
-'math_failure'             => 'Gagal nglakoni parse',
-'math_unknown_error'       => 'Kaluputan sing ora dimangertèni',
-'math_unknown_function'    => 'fungsi sing ora dimangertèni',
-'math_lexing_error'        => "kaluputan ''lexing''",
-'math_syntax_error'        => "''syntax error'' (kaluputan sintaksis)",
-'math_image_error'         => 'Konversi PNG gagal; priksa apa latex, dvips, gs, lan convert wis diinstalasi sing bener',
-'math_bad_tmpdir'          => 'Ora bisa nulis utawa nggawé dirèktori sauntara math',
-'math_bad_output'          => 'Ora bisa nulis utawa nggawé dirèktori paweton math',
-'math_notexvc'             => 'Executable texvc ilang;
+'preferences'               => 'Preferensi (pilihan)',
+'mypreferences'             => 'Préferènsiku',
+'prefs-edits'               => 'Gunggungé suntingan:',
+'prefsnologin'              => 'Durung mlebu log',
+'prefsnologintext'          => 'Panjenengan kudu <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}}| mlebu log]</span> kanggo ngowahin préferènsi njenengan.',
+'prefsreset'                => 'Préferènsi wis dibalèkaké menyang konfigurasi baku.',
+'qbsettings'                => 'Pengaturan bar sidhatan',
+'qbsettings-none'           => 'Ora ana',
+'qbsettings-fixedleft'      => 'Tetep sisih kiwa',
+'qbsettings-fixedright'     => 'Tetep sisih tengen',
+'qbsettings-floatingleft'   => 'Ngambang sisih kiwa',
+'qbsettings-floatingright'  => 'Ngambang sisih tengen',
+'changepassword'            => 'Ganti tembung sandi',
+'skin'                      => 'Kulit',
+'skin-preview'              => 'Pratilik',
+'math'                      => 'Matématika',
+'dateformat'                => 'Format tanggal',
+'datedefault'               => 'Ora ana préferènsi',
+'datetime'                  => 'Tanggal lan wektu',
+'math_failure'              => 'Gagal nglakoni parse',
+'math_unknown_error'        => 'Kaluputan sing ora dimangertèni',
+'math_unknown_function'     => 'fungsi sing ora dimangertèni',
+'math_lexing_error'         => "kaluputan ''lexing''",
+'math_syntax_error'         => "''syntax error'' (kaluputan sintaksis)",
+'math_image_error'          => 'Konversi PNG gagal; priksa apa latex, dvips, gs, lan convert wis diinstalasi sing bener',
+'math_bad_tmpdir'           => 'Ora bisa nulis utawa nggawé dirèktori sauntara math',
+'math_bad_output'           => 'Ora bisa nulis utawa nggawé dirèktori paweton math',
+'math_notexvc'              => 'Executable texvc ilang;
 mangga delengen math/README kanggo cara konfigurasi.',
-'prefs-personal'           => 'Profil panganggo',
-'prefs-rc'                 => 'Owah-owahan pungkasan',
-'prefs-watchlist'          => 'Dhaftar pangawasan',
-'prefs-watchlist-days'     => 'Cacahé dina sing dituduhaké ing dhaftar pangawasan:',
-'prefs-watchlist-edits'    => 'Cacahé suntingan maksimum sing dituduhaké ing dhaftar pangawasan sing luwih jangkep:',
-'prefs-misc'               => 'Liya-liya',
-'saveprefs'                => 'Simpen',
-'resetprefs'               => 'Resikana owah-owahan sing ora disimpen',
-'oldpassword'              => 'Tembung sandi lawas:',
-'newpassword'              => 'Tembung sandi anyar:',
-'retypenew'                => 'Ketik ulang tembung sandi anyar:',
-'textboxsize'              => 'Panyuntingan',
-'rows'                     => 'Larikan:',
-'columns'                  => 'Kolom:',
-'searchresultshead'        => 'Panggolèkan',
-'resultsperpage'           => 'Cacahing klik saben kaca:',
-'contextlines'             => 'Baris dituduhaké per pituwas (kasil):',
-'contextchars'             => 'Karakter kanggo kontèks per baris:',
-'stub-threshold'           => 'Ambang wates kanggo format <a href="#" class="stub">pranala rintisan</a>:',
-'recentchangesdays'        => 'Cacahé dina sing dituduhaké ing owah-owahan pungkasan:',
-'recentchangescount'       => 'Cacahé suntingan sing dituduhaké ing kaca owah-owahan pungkasan:',
-'savedprefs'               => 'Préferènsi Panjenengan wis disimpen',
-'timezonelegend'           => 'Zona wektu',
-'timezonetext'             => '¹Lebokna prabédan wektu (ing jam) antara wektu saenggon karo wektu server (UTC).',
-'localtime'                => 'Wektu saenggon',
-'timezoneoffset'           => 'Prabédan:',
-'servertime'               => 'Wektu server saiki iku',
-'guesstimezone'            => 'Isinen saka panjlajah wèb',
-'allowemail'               => 'Marengaké panganggo liyané ngirim layang èlèktronik (email).',
-'prefs-searchoptions'      => 'Opsi-opsi panggolèkan',
-'prefs-namespaces'         => 'Ruang jeneng / Bilik jeneng',
-'defaultns'                => "Golèk ing bilik jeneng (''namespace'') iki mawa baku:",
-'default'                  => 'baku',
-'files'                    => 'Berkas',
+'prefs-personal'            => 'Profil panganggo',
+'prefs-rc'                  => 'Owah-owahan pungkasan',
+'prefs-watchlist'           => 'Dhaftar pangawasan',
+'prefs-watchlist-days'      => 'Cacahé dina sing dituduhaké ing dhaftar pangawasan:',
+'prefs-watchlist-days-max'  => '(maksimum 7 dina)',
+'prefs-watchlist-edits'     => 'Cacahé suntingan maksimum sing dituduhaké ing dhaftar pangawasan sing luwih jangkep:',
+'prefs-watchlist-edits-max' => '(gunggung maksimum: 1000)',
+'prefs-misc'                => 'Liya-liya',
+'prefs-resetpass'           => 'Ganti tembung sandi',
+'saveprefs'                 => 'Simpen',
+'resetprefs'                => 'Resikana owah-owahan sing ora disimpen',
+'textboxsize'               => 'Panyuntingan',
+'rows'                      => 'Larikan:',
+'columns'                   => 'Kolom:',
+'searchresultshead'         => 'Panggolèkan',
+'resultsperpage'            => 'Cacahing klik saben kaca:',
+'contextlines'              => 'Baris dituduhaké per pituwas (kasil):',
+'contextchars'              => 'Karakter kanggo kontèks per baris:',
+'stub-threshold'            => 'Ambang wates kanggo format <a href="#" class="stub">pranala rintisan</a>:',
+'recentchangesdays'         => 'Cacahé dina sing dituduhaké ing owah-owahan pungkasan:',
+'recentchangesdays-max'     => '(maksimum $1 {{PLURAL:$1|dina|dina}})',
+'recentchangescount'        => 'Cacahé suntingan sing dituduhaké ing kaca owah-owahan pungkasan:',
+'savedprefs'                => 'Préferènsi Panjenengan wis disimpen',
+'timezonelegend'            => 'Zona wektu',
+'timezonetext'              => '¹Lebokna prabédan wektu (ing jam) antara wektu saenggon karo wektu server (UTC).',
+'localtime'                 => 'Wektu saenggon',
+'timezoneoffset'            => 'Prabédan:',
+'servertime'                => 'Wektu server saiki iku',
+'guesstimezone'             => 'Isinen saka panjlajah wèb',
+'allowemail'                => 'Marengaké panganggo liyané ngirim layang èlèktronik (email).',
+'prefs-searchoptions'       => 'Opsi-opsi panggolèkan',
+'prefs-namespaces'          => 'Ruang jeneng / Bilik jeneng',
+'defaultns'                 => "Golèk ing bilik jeneng (''namespace'') iki mawa baku:",
+'default'                   => 'baku',
+'files'                     => 'Berkas',
 
 # User rights
 'userrights'                  => 'Manajemen hak panganggo', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Ngatur kelompok panganggo',
 'userrights-user-editname'    => 'Lebokna jeneng panganggo:',
 'editusergroup'               => 'Sunting kelompok panganggo',
-'editinguser'                 => "Ngowahi hak-hak aksès panganggo saka panganggo '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ngowahi hak-hak aksès panganggo saka panganggo '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Sunting kelompok panganggo',
 'saveusergroups'              => 'Simpen kelompok panganggo',
 'userrights-groupsmember'     => 'Anggota saka:',
@@ -921,6 +1022,7 @@ mangga delengen math/README kanggo cara konfigurasi.',
 'right-minoredit'            => 'Tandhanan suntingan minangka minor',
 'right-move'                 => 'Pindhahna kaca',
 'right-move-subpages'        => 'Pindhahaké kaca lan kabèh anak-kacané',
+'right-move-rootuserpages'   => 'Pindhahaké kaca utama panganggo',
 'right-suppressredirect'     => 'Aja nggawé pangalihan saka kaca sing lawas yèn mindhah sawijining kaca',
 'right-upload'               => 'Ngunggahaké berkas-berkas',
 'right-reupload'             => 'Tindhihana sawijining berkas sing wis ana',
@@ -971,9 +1073,45 @@ mangga delengen math/README kanggo cara konfigurasi.',
 'rightslogentry' => 'ngganti kaanggotan kelompok kanggo $1 saka $2 dadi $3',
 'rightsnone'     => '(ora ana)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'maca kaca iki',
+'action-edit'                 => 'sunting kaca iki',
+'action-createpage'           => 'nggawé kaca-kaca',
+'action-createtalk'           => 'gawé kaca wicara anyar',
+'action-createaccount'        => 'gawé akun panganggo iki',
+'action-minoredit'            => 'nandhani minangka suntingan sithik',
+'action-move'                 => 'alihna kaca iki',
+'action-move-subpages'        => 'mindahaké kaca iki, lan kabèh anak-kacané',
+'action-move-rootuserpages'   => 'mindhahaké kaca utama panganggo',
+'action-upload'               => 'ngunggahaké berkas iki',
+'action-reupload'             => 'nindhih berkas sing wis ana',
+'action-reupload-shared'      => 'nindhih berkas sing wis ana ing papan panyimpanan berkas sing dianggo bebarengan',
+'action-upload_by_url'        => 'unggahna berkas iki saka sawijining alamat URL',
+'action-writeapi'             => 'migunakaké API panulisan',
+'action-delete'               => 'busak kaca iki',
+'action-deleterevision'       => 'busak revisi iki',
+'action-deletedhistory'       => 'pirsani sajarah kaca sing wis dibusak iki',
+'action-browsearchive'        => 'nggolèki kaca-kaca sing wis dibusak',
+'action-undelete'             => 'mbatalaké pambusakan kaca iki',
+'action-suppressrevision'     => 'ninjo lan mbalèkaké revisi sing didhelikaké iki',
+'action-suppressionlog'       => 'mirsani log pribadi iki',
+'action-block'                => 'blok panganggo iki saka panyuntingan',
+'action-protect'              => 'owahi tataran pangreksan kaca iki',
+'action-import'               => 'impor kaca iki saka wiki liya',
+'action-importupload'         => 'impor kaca iki saka pamunggahan berkas',
+'action-patrol'               => 'nandhani suntingan panganggo liya minangka wis kapriksa',
+'action-autopatrol'           => 'nandhani suntingan panjenengan dhéwé minangka wis kapriksa',
+'action-unwatchedpages'       => 'pirsani dhaftar kaca-kaca sing ora kaawasi',
+'action-trackback'            => 'kirim panjejak balik',
+'action-mergehistory'         => 'nggabungaké sajarah kaca iki',
+'action-userrights'           => 'ngowahi kabèh hak panganggo',
+'action-userrights-interwiki' => 'ngowahi hak aksès saka panganggo ing wiki liya',
+'action-siteadmin'            => 'ngunci utawa mbukak kunci basis data',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|pangowahan|owah-owahan}}',
 'recentchanges'                     => 'Owah-owahan',
+'recentchanges-legend'              => 'Pilihan owah-owahan pungkasan',
 'recentchangestext'                 => 'Runutna owah-owahan pungkasan ing wiki iki ing kaca iki.',
 'recentchanges-feed-description'    => "Urutna owah-owahan anyar ing wiki ing ''feed'' iki.",
 'rcnote'                            => 'Ing ngisor iki kapacak {{PLURAL:$1|pangowahan|owah-owahan}} pungkasan ing  <strong>$2</strong> dina pungkasan ing $5, $4.',
@@ -997,6 +1135,8 @@ mangga delengen math/README kanggo cara konfigurasi.',
 'rc_categories'                     => 'Watesana nganti kategori (dipisah karo "|")',
 'rc_categories_any'                 => 'Apa waé',
 'newsectionsummary'                 => '/* $1 */ bagéyan anyar',
+'rc-enhanced-expand'                => 'Tuduhaké princèn (merlokaké JavaScript)',
+'rc-enhanced-hide'                  => 'Dhelikaké princèn',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Pranala Pilihan',
@@ -1016,19 +1156,20 @@ mangga delengen math/README kanggo cara konfigurasi.',
 'upload_directory_missing'    => 'Direktori pamunggahan ($1) ora ditemokaké lan ora bisa digawé déning server wèb.',
 'upload_directory_read_only'  => 'Dirèktori pangunggahan ($1) ora bisa ditulis déning server wèb.',
 'uploaderror'                 => 'Kaluputan pangunggahan berkas',
-'uploadtext'                  => "Enggonen formulir ing ngisor iki kanggo ngunggahaké berkas. Gunakna [[Special:ImageList|daftar berkas]] utawa [[Special:Log/upload|log pangunggahan]] kanggo nuduhaké utawa nggolèk berkas utawa gambar sing wis diunggahaké sadurungé.
+'uploadtext'                  => "Anggonen formulir ing ngisor iki kanggo ngunggahaké berkas. 
+Kanggo mirsani utawa nggolèki berkas sing wis diunggah sadurungé pigunakaké [[Special:FileList|dhaftar berkas sing wis diunggah]], berkas sing diunggah ulang uga kadhaftar ing [[Special:Log/upload|log pangunggahan]], pambusakan ing [[Special:Log/delete|Log pambusakan]].
 
-Kanggo nuduhaké utawa nyertakaké berkas utawa gambar ing sawijining kaca, gunakna pranala mawa format
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Berkas.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Berkas.png|tèks alternatif]]</nowiki>''' utawa
-'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Berkas.ogg]]</nowiki>''' kanggo langsung tumuju berkas sing dikarepaké.",
+Kanggo nyertakaké berkas ing sawijining kaca, pigunakaké pranala salah siji saka format ing ngisor iki:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Berkas.jpg]]</nowiki></tt>''' kanggo migunakaké versi pepak berkas
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Berkas.png|200px|thumb|left|tèks alt]]</nowiki></tt>''' kanggo migunakaké berkas ambané 200 piksel jroning kothak ing sisih kiwa kanthi 'tèks alt' minangka panjelasan
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Berkas.ogg]]</nowiki></tt>''' kanggo nggandhèng langsung menyang berkas tanpa nampilaké berkas",
 'upload-permitted'            => 'Jenis berkas sing diidinaké: $1.',
 'upload-preferred'            => 'Jenis berkas sing disaranaké: $1.',
 'upload-prohibited'           => 'Jenis berkas sing dilarang: $1.',
 'uploadlog'                   => 'log pangunggahan',
 'uploadlogpage'               => 'Log pangunggahan',
 'uploadlogpagetext'           => 'Ing ngisor iki kapacak log pangunggahan berkas sing anyar dhéwé.
-Mangga mirsani [[Special:NewImages|galeri berkas-berkas anyar]] kanggo pratélan visual.',
+Mangga mirsani [[Special:NewFiles|galeri berkas-berkas anyar]] kanggo pratélan visual.',
 'filename'                    => 'Jeneng berkas',
 'filedesc'                    => 'Ringkesan',
 'fileuploadsummary'           => 'Ringkesan:',
@@ -1049,23 +1190,24 @@ Luwih becik {{PLURAL:\$3|jinis berkas|Jinis-jinis berkas}} \$2.",
 'large-file'                  => 'Ukuran berkas disaranaké supaya ora ngluwihi $1 bita; berkas iki ukurané $2 bita.',
 'largefileserver'             => 'Berkas iki luwih gedhé tinimbang sing bisa kaparengaké server.',
 'emptyfile'                   => 'Berkas sing panjenengan unggahaké katoné kosong. Mbokmenawa iki amerga anané salah ketik ing jeneng berkas. Mangga dipastèkaké apa panjenengan pancèn kersa ngunggahaké berkas iki.',
-'fileexists'                  => 'Sawijining berkas mawa jeneng iku wis ana, mangga dipriksa <strong><tt>$1</tt></strong> yèn panjenengan ora yakin sumedya ngowahiné.',
-'filepageexists'              => 'Kaca dèskripsi kanggo berkas iki wis digawé ing <strong><tt>$1</tt></strong>, nanging saiki iki ora ditemokaké berkas mawa jeneng iku. Ringkesan sing panjenengan lebokaké ora bakal metu ing kaca dèskripsi. Kanggo ngetokaké dèskripsi iki, panjenengan kudu nyunting sacara manual',
-'fileexists-extension'        => 'Berkas mawa jeneng sing padha wis ana:<br />
-Jeneng berkas sing bakal diunggahaké: <strong><tt>$1</tt></strong><br />
-Jeneng berkas sing wis ana: <strong><tt>$2</tt></strong><br />
-Mangga milih jeneng liya.',
+'fileexists'                  => "Sawijining berkas mawa jeneng iku wis ana, mangga dipriksa '''<tt>$1</tt>''' yèn panjenengan ora yakin sumedya ngowahiné.",
+'filepageexists'              => "Kaca dèskripsi kanggo berkas iki wis digawé ing '''<tt>$1</tt>''', nanging saiki iki ora ditemokaké berkas mawa jeneng iku. Ringkesan sing panjenengan lebokaké ora bakal metu ing kaca dèskripsi. Kanggo ngetokaké dèskripsi iki, panjenengan kudu nyunting sacara manual",
+'fileexists-extension'        => "Berkas mawa jeneng sing padha wis ana:<br />
+Jeneng berkas sing bakal diunggahaké: '''<tt>$1</tt>'''<br />
+Jeneng berkas sing wis ana: '''<tt>$2</tt>'''<br />
+Mangga milih jeneng liya.",
 'fileexists-thumb'            => "<center>'''Berkas sing wis ana'''</center>",
-'fileexists-thumbnail-yes'    => 'Berkas iki katoné gambar mawa ukuran sing luwih cilik <em>(thumbnail)</em>. 
-Tulung dipriksa berkas <strong><tt>$1</tt></strong>.<br />
-Yèn berkas sing wis dipriksa iku padha, ora perlu panjenengan ngunggahaké vèrsi cilik liyané manèh.',
-'file-thumbnail-no'           => 'Jeneng berkas diwiwiti kanthi <strong><tt>$1</tt></strong>. Katoné berkas iki sawijining gambar mawa ukuran sing dicilikaké <em>(thumbnail)</em>.
-Yèn panjenengan kagungan vèrsi mawa résolusi kebak saka gambar iki, mangga diunggahaké. Yèn ora, tulung jeneng berkas diganti.',
+'fileexists-thumbnail-yes'    => "Berkas iki katoné gambar mawa ukuran sing luwih cilik <em>(thumbnail)</em>. 
+Tulung dipriksa berkas '''<tt>$1</tt>'''.<br />
+Yèn berkas sing wis dipriksa iku padha, ora perlu panjenengan ngunggahaké vèrsi cilik liyané manèh.",
+'file-thumbnail-no'           => "Jeneng berkas diwiwiti kanthi '''<tt>$1</tt>'''. Katoné berkas iki sawijining gambar mawa ukuran sing dicilikaké <em>(thumbnail)</em>.
+Yèn panjenengan kagungan vèrsi mawa résolusi kebak saka gambar iki, mangga diunggahaké. Yèn ora, tulung jeneng berkas diganti.",
 'fileexists-forbidden'        => 'Berkas mawa jeneng sing padha wis ana; 
-tulung berkasé diunggahaké manèh mawa jeneng liya. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Wis ana berkas liyané mawa jeneng sing padha ing papan gudhang berkas bebarengan;
-mangga berkas diunggahaké ulang mawa jeneng liya. [[Image:$1|thumb|center|$1]]',
+tulung berkasé diunggahaké manèh mawa jeneng liya. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Wis ana berkas liyané mawa jeneng sing padha ing gudhang berkas sing dianggo bebarengan.
+Yèn isih ngersakaké ngunggahaké, mangga berkas diunggahaké manèh mawa jeneng liya. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Berkas iki duplikat utawa padha karo {{PLURAL:$1|berkas|berkas-berkas}} ing ngisor:',
+'file-deleted-duplicate'      => 'Sawijining berkas persis berkas iki ([[$1]]) wis tau dibusak. Mangga panjenengan priksani sajarah pambusakan berkas kasebut sadurungé nerusaké ngunggahaké berkas kuwi manèh.',
 'successfulupload'            => 'Kasil diamot',
 'uploadwarning'               => 'Pèngetan pangunggahan berkas',
 'savefile'                    => 'Simpen berkas',
@@ -1086,7 +1228,7 @@ Mangga priksanen $1 sadurungé ngunggahaké berkas iku manèh.',
 
 Panjenengan kudu nggalih perlu utawa ora mbanjuraké pangunggahan berkas ini.
 Log pambusakan berkas iki kaya mangkéné:",
-'filename-bad-prefix'         => 'Jeneng berkas sing panjenengan unggahaké, diawali mawa <strong>"$1"</strong>, sing sawijining jeneng non-dèskriptif sing biasané diwènèhaké sacara otomatis déning kamera digital. Mangga milih jeneng liyané sing luwih dèskriptif kanggo berkas panjenengan.',
+'filename-bad-prefix'         => "Jeneng berkas sing panjenengan unggahaké, diawali mawa '''\"\$1\"''', sing sawijining jeneng non-dèskriptif sing biasané diwènèhaké sacara otomatis déning kamera digital. Mangga milih jeneng liyané sing luwih dèskriptif kanggo berkas panjenengan.",
 
 'upload-proto-error'      => 'Protokol ora bener',
 'upload-proto-error-text' => 'Pangunggahan jarah adoh mbutuhaké URL sing diawali karo <code>http://</code> utawa <code>ftp://</code>.',
@@ -1111,20 +1253,20 @@ Mbok-menawa panjenengan bisa nyoba manèh ing wektu sing luwih longgar.',
 'upload_source_url'  => ' (sawijining URL absah sing bisa diaksès publik)',
 'upload_source_file' => ' (sawijining berkas ing komputeré panjenengan)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Kaca astaméwa utawa kusus iki nuduhaké kabèh berkas sing wis diunggahaké.
+# Special:ListFiles
+'listfiles-summary'     => 'Kaca astaméwa utawa kusus iki nuduhaké kabèh berkas sing wis diunggahaké.
 Sacara baku, berkas pungkasan sing diunggahaké dituduhaké ing urutan dhuwur dhéwé.
 Klik sirahé kolom kanggo ngowahi urutan.',
-'imagelist_search_for'  => 'Golèk jeneng gambar:',
+'listfiles_search_for'  => 'Golèk jeneng gambar:',
 'imgfile'               => 'gambar',
-'imagelist'             => 'Daftar gambar',
-'imagelist_date'        => 'Tanggal',
-'imagelist_name'        => 'Jeneng',
-'imagelist_user'        => 'Panganggo',
-'imagelist_size'        => 'Ukuran (bita)',
-'imagelist_description' => 'Dèskripsi',
-
-# Image description page
+'listfiles'             => 'Daftar gambar',
+'listfiles_date'        => 'Tanggal',
+'listfiles_name'        => 'Jeneng',
+'listfiles_user'        => 'Panganggo',
+'listfiles_size'        => 'Ukuran (bita)',
+'listfiles_description' => 'Dèskripsi',
+
+# File description page
 'filehist'                       => 'Sajarah berkas',
 'filehist-help'                  => 'Klik ing tanggal/wektu kanggo deleng berkas iki ing wektu iku.',
 'filehist-deleteall'             => 'busaken kabèh',
@@ -1132,19 +1274,25 @@ Klik sirahé kolom kanggo ngowahi urutan.',
 'filehist-revert'                => 'balèkna',
 'filehist-current'               => 'saiki iki',
 'filehist-datetime'              => 'Tanggal/Wektu',
+'filehist-thumb'                 => "Miniatur (''thumbnail'')",
+'filehist-thumbtext'             => 'Miniatur kanggo versi ing $1',
+'filehist-nothumb'               => 'Ora ana miniatur',
 'filehist-user'                  => 'Panganggo',
 'filehist-dimensions'            => 'Ukuran',
 'filehist-filesize'              => 'Gedhené berkas',
 'filehist-comment'               => 'Komentar',
-'imagelinks'                     => 'Pranala',
+'imagelinks'                     => 'Pranala gambar',
 'linkstoimage'                   => 'Kaca-kaca sing kapacak iki duwé {{PLURAL:$1|pranala|$1 pranala}} menyang berkas iki:',
+'linkstoimage-more'              => 'Luwih saka $1 {{PLURAL:$1|kaca|kaca-kaca}} nduwèni pranala menyang berkas iki.
+Dhaftar ing ngisor nuduhaké {{PLURAL:$1|kaca pisanan kanthi pranala langsung|$1 kaca kanthi pranala langsung}} menyang berkas iki.
+[[Special:WhatLinksHere/$2|dhaftar pepak]] uga ana.',
 'nolinkstoimage'                 => 'Ora ana kaca sing nyambung menyang berkas iki.',
 'morelinkstoimage'               => 'Ndeleng [[Special:WhatLinksHere/$1|luwih akèh pranala]] menyang berkas iki.',
 'redirectstofile'                => '{{PLURAL:$1|berkas kaalihaké|$1 berkas-berkas kaalihaké}} menyang berkas iki:',
 'duplicatesoffile'               => 'Ing ngisor iki {{PLURAL:$1|berkas arupa duplikat|$1 berkas-berkas arupa duplikat}} saka berkas iki:',
 'sharedupload'                   => 'Berkas iki sawijining pangunggahan bebarengan sing uga bisa dienggo déning proyèk-proyèk liyané.',
 'shareduploadwiki'               => 'Mangga mirsani $1 kanggo informasi sabanjuré.',
-'shareduploadwiki-desc'          => 'Dèskripsi ing $1 sajroning khazanah binagi dituduhaké ing ngisor iki.',
+'shareduploadwiki-desc'          => 'Dhèskripsi ing $1 ditampilaké ing ngisor.',
 'shareduploadwiki-linktext'      => 'kaca dèskripsi berkas',
 'shareduploadduplicate'          => 'Berkas iki sawijining duplikat $1 saka khazanah binagi.',
 'shareduploadduplicate-linktext' => 'Berkas liya',
@@ -1176,8 +1324,6 @@ Klik sirahé kolom kanggo ngowahi urutan.',
 'filedelete-success-old'      => "Berkas '''[[Media:$1|$1]]''' vèrsi $3, $2 wis dibusak.",
 'filedelete-nofile'           => "'''$1''' ora ana.",
 'filedelete-nofile-old'       => "Ora ditemokaké arsip vèrsi saka '''$1''' mawa atribut sing diwènèhaké.",
-'filedelete-iscurrent'        => 'Panjenengan nyoba mbusak vèrsi pungkasan berkas iki.
-Mangga bali ing vèrsi sing luwih lawas dhisik.',
 'filedelete-otherreason'      => 'Alesan tambahan/liya:',
 'filedelete-reason-otherlist' => 'Alesan liya',
 'filedelete-reason-dropdown'  => '*Alesan pambusakan
@@ -1205,29 +1351,31 @@ Priksanen dhisik pranala-pranala menyang cithakan iki sadurungé mbusak.',
 
 # Random page
 'randompage'         => 'Sembarang kaca',
-'randompage-nopages' => 'Ora ana kaca ing bilik jeneng iki.',
+'randompage-nopages' => 'Ora ana kaca ing bilik jeneng "$1".',
 
 # Random redirect
 'randomredirect'         => 'Pangalihan sembarang',
-'randomredirect-nopages' => 'Ing bilik nama iki ora ana pangalihan.',
+'randomredirect-nopages' => 'Ora ana pangalihan ing bilik jeneng "$1".',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Statistik situs',
-'userstats'              => 'Statistik panganggo',
-'sitestatstext'          => "{{SITENAME}} saiki iki duwèni '''\$2''' {{PLURAL:\$1|kaca|kaca}} artikel sing absah. 
-
-Saliyané iku saiki gunggungé ana {{PLURAL:\$1|kaca|kaca}} ''database''. Ing iku kalebu kaca-kaca dhiskusi, prakara {{SITENAME}}, artikel \"stub\" (rintisan), kaca pangalihan (''redirect''), karo kaca-kaca sing dudu kaca isi.
-
-Banjur wis ana '''\$8''' berkas sing diunggahaké.
-
-Wis tau ana '''\$3''' kaca dituduhaké karo '''\$4''' kaca tau disunting sawisé wiki iki diadegaké.
-
-Dadi tegesé rata-rata ana '''\$5''' suntingan per kaca karo '''\$6''' tayangan per suntingan.
-
-Dawané [http://www.mediawiki.org/wiki/Manual:Job_queue antrian tugas] ana '''\$7'''.",
-'userstatstext'          => "Ana '''$1''' [[Special:ListUsers|{{PLURAL:$1|panganggo|panganggo}}]] sing wis ndaftar. '''$2''' (utawa '''$4%''') antarané iku {{PLURAL:$2|duwé|duwé}} hak aksès $5.",
-'statistics-mostpopular' => 'Kaca sing paling akèh dideleng',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Statistik kaca',
+'statistics-header-edits'      => 'Statistik panyuntingan',
+'statistics-header-views'      => 'Statistik penampilan',
+'statistics-header-users'      => 'Statistik panganggo',
+'statistics-articles'          => 'Kaca-kaca isi',
+'statistics-pages'             => 'Gunggung kaca',
+'statistics-pages-desc'        => 'Kabèh kaca ing wiki iki, klebu kaca wicara, pangalihan, lan liya-liyané.',
+'statistics-files'             => 'Berkas sing diunggahaké',
+'statistics-edits'             => 'Gunggung suntingan wiwit {{SITENAME}} diwiwiti',
+'statistics-edits-average'     => 'Rata-rata suntingan saben kaca',
+'statistics-views-total'       => 'Gunggung panampilan kaca',
+'statistics-views-peredit'     => 'Gunggung/cacahing panampilan saben suntingan',
+'statistics-jobqueue'          => 'Dawaning [http://www.mediawiki.org/wiki/Manual:Job_queue antrian pegawéan]',
+'statistics-users'             => 'Gunggung [[Special:ListUsers|panganggo kadaftar]]',
+'statistics-users-active'      => 'Para panganggo aktif',
+'statistics-users-active-desc' => 'Panganggo sing nduwèni kontribusi jroning sewulan pungkasan',
+'statistics-mostpopular'       => 'Kaca sing paling akèh dideleng',
 
 'disambiguations'      => 'Kaca disambiguasi',
 'disambiguationspage'  => 'Template:Disambig',
@@ -1271,26 +1419,30 @@ Sawijining kaca dianggep minangka kaca disambiguasi yèn kaca iku nganggo cithak
 'popularpages'            => 'Kaca populèr',
 'wantedcategories'        => 'Kategori sing diperlokaké',
 'wantedpages'             => 'Kaca sing dipèngini',
-'missingfiles'            => 'Berkas-berkas ilang',
+'wantedfiles'             => 'Berkas sing diperlokaké',
+'wantedtemplates'         => 'Cithakan sing diperlokaké',
 'mostlinked'              => 'Kaca sing kerep dhéwé dituju',
 'mostlinkedcategories'    => 'Kategori sing kerep dhéwé dienggo',
 'mostlinkedtemplates'     => 'Cithakan sing kerep dhéwé dienggo',
 'mostcategories'          => 'Kaca sing kategoriné akèh dhéwé',
 'mostimages'              => 'Berkas sing kerep dhéwé dienggo',
 'mostrevisions'           => 'Kaca mawa pangowahan sing akèh dhéwé',
-'prefixindex'             => 'Indeks awalan',
+'prefixindex'             => 'Kabèh kaca mawa ater-ater',
 'shortpages'              => 'Kaca cendhak',
 'longpages'               => 'Kaca dawa',
 'deadendpages'            => 'Kaca-kaca buntu (tanpa pranala)',
 'deadendpagestext'        => 'kaca-kaca iki ora nduwé pranala tekan ngendi waé ing wiki iki..',
 'protectedpages'          => 'Kaca sing direksa',
 'protectedpages-indef'    => 'Namung pangreksan ora langgeng waé',
+'protectedpages-cascade'  => 'Amung kaca rineksan kang runtut',
 'protectedpagestext'      => 'Kaca-kaca sing kapacak iki direksa déning pangalihan utawa panyuntingan.',
 'protectedpagesempty'     => 'Saat ini tidak ada halaman yang sedang dilindungi.',
 'protectedtitles'         => 'Irah-irahan sing direksa',
 'protectedtitlestext'     => 'Irah-irahan sing kapacak ing ngisor iki direksa lan ora bisa digawé',
 'protectedtitlesempty'    => 'Ora ana irah-irahan utawa judhul sing direksa karo paramèter-paramèter iki.',
 'listusers'               => 'Daftar panganggo',
+'listusers-editsonly'     => 'Tampilaké mung panganggo sing nduwèni kontribusi',
+'usereditcount'           => '$1 {{PLURAL:$1|suntingan|suntingan}}',
 'newpages'                => 'Kaca anyar',
 'newpages-username'       => 'Asma panganggo:',
 'ancientpages'            => 'Kaca-kaca langkung sepuh',
@@ -1317,8 +1469,6 @@ Sawijining kaca dianggep minangka kaca disambiguasi yèn kaca iku nganggo cithak
 'speciallogtitlelabel' => 'Irah-irahan (judhul):',
 'log'                  => 'Log',
 'all-logs-page'        => 'Kabèh log',
-'log-search-legend'    => 'Golèk log',
-'log-search-submit'    => 'Golèk',
 'alllogstext'          => 'Gabungan tampilam kabèh log sing ana ing {{SITENAME}}. 
 Panjenengan bisa mbatesi tampilan kanthi milih jinis log, jeneng panganggo (sènsitif aksara gedhé/cilik), utawa kaca sing magepokan (uga sènsitif aksara gedhé/cilik).',
 'logempty'             => 'Ora ditemokaké èntri log sing pas.',
@@ -1330,6 +1480,7 @@ Panjenengan bisa mbatesi tampilan kanthi milih jinis log, jeneng panganggo (sèn
 'nextpage'          => 'Kaca sabanjuré ($1)',
 'prevpage'          => 'Kaca sadurungé ($1)',
 'allpagesfrom'      => 'Kaca-kaca kawiwitan kanthi:',
+'allpagesto'        => 'Tampilaké kaca dipungkasi ing:',
 'allarticles'       => 'Kabèh artikel',
 'allinnamespace'    => 'Kabeh kaca ($1 namespace)',
 'allnotinnamespace' => 'Sedaya kaca (mboten panggènan asma $1)',
@@ -1349,19 +1500,43 @@ Deleng uga [[Special:WantedCategories|kategori-kategori sing diperlokaké]].',
 'special-categories-sort-count' => 'urutna miturut angka',
 'special-categories-sort-abc'   => 'urutna miturut abjad',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Kontribusi panganggo sing dibusak',
+
+# Special:LinkSearch
+'linksearch'       => 'Pranala jaba',
+'linksearch-pat'   => 'Pola panggolèkan:',
+'linksearch-ns'    => 'Bilik nama:',
+'linksearch-ok'    => 'Golèk',
+'linksearch-text'  => "''Wildcards'' kaya ta \"*.wikipedia.org\" bisa dienggo.<br />Protokol sing disengkuyung: <tt>\$1</tt>",
+'linksearch-line'  => '$1 disambung saka $2',
+'linksearch-error' => "''Wildcards'' namung bisa dienggo ing bagéyan awal saka jeneng host.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Tuduhna panganggo sing diawali karo:',
 'listusers-submit'   => 'Tuduhna',
 'listusers-noresult' => 'Panganggo ora ditemokaké.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Log panganggo anyar',
+'newuserlogpagetext'          => 'Ing ngisor iki kapacak log pandaftaran panganggo anyar.',
+'newuserlog-byemail'          => 'tembung sandhi wis dikirim liwat e-mail',
+'newuserlog-create-entry'     => 'Panganggo anyar',
+'newuserlog-create2-entry'    => 'ndaftaraké rékening (akun) kanggo $1',
+'newuserlog-autocreate-entry' => 'akun panganggo digawé otomatis',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Hak-hak grup panganggo',
-'listgrouprights-summary'  => 'Ing ngisor iki kapacak dhaftar grup panganggo sing didéfinisi ing wiki iki, kanthi hak-hak aksès gandhèngané.
+'listgrouprights'                 => 'Hak-hak grup panganggo',
+'listgrouprights-summary'         => 'Ing ngisor iki kapacak dhaftar grup panganggo sing didéfinisi ing wiki iki, kanthi hak-hak aksès gandhèngané.
 Informasi tambahan perkara hak-hak individual bisa ditemokaké ing [[{{MediaWiki:Listgrouprights-helppage}}|kéné]].',
-'listgrouprights-group'    => 'Grup',
-'listgrouprights-rights'   => 'Hak-hak',
-'listgrouprights-helppage' => 'Help:Hak-hak grup',
-'listgrouprights-members'  => '(daftar anggota)',
+'listgrouprights-group'           => 'Grup',
+'listgrouprights-rights'          => 'Hak-hak',
+'listgrouprights-helppage'        => 'Help:Hak-hak grup',
+'listgrouprights-members'         => '(daftar anggota)',
+'listgrouprights-addgroup'        => 'Bisa nambahaké {{PLURAL:$2|klompok|klompok}}: $1',
+'listgrouprights-removegroup'     => 'Bisa mbusak {{PLURAL:$2|klompok|klompok}}: $1',
+'listgrouprights-addgroup-all'    => 'Bisa nambahaké kabèh klompok',
+'listgrouprights-removegroup-all' => 'Bisa mbusak kabèh klompok',
 
 # E-mail user
 'mailnologin'     => 'Ora ana alamat layang e-mail',
@@ -1374,6 +1549,7 @@ Alamat layang-e sing panjenengan lebokaké ing [[Special:Preferences|préferèsi
 'defemailsubject' => 'Layang e-mail {{SITENAME}}',
 'noemailtitle'    => 'Ora ana alamat layang e-mail',
 'noemailtext'     => 'Panganggo iki ora nglebokaké alamat layang e-mail sing absah, utawa milih ora gelem nampa layang e-mail saka panganggo liyané.',
+'email-legend'    => 'Ngirim layang-e katujokaké panganggo  {{SITENAME}} liyané',
 'emailfrom'       => 'Saka:',
 'emailto'         => 'Kanggo:',
 'emailsubject'    => 'Prekara:',
@@ -1414,12 +1590,7 @@ Owah-owahan sing dumadi ing tembé ing kaca iku lan kaca dhiskusi sing kagandhè
 'iteminvalidname'      => "Ana masalah karo '$1', jenengé ora absah...",
 'wlnote'               => "Ing ngisor iki kapacak $1 {{PLURAL:$1|owah-owahan|owah-owahan}} pungkasan ing '''$2''' jam kapungkur.",
 'wlshowlast'           => 'Tuduhna $1 jam $2 dina $3 pungkasan',
-'watchlist-show-bots'  => 'Tuduhna suntingan bot',
-'watchlist-hide-bots'  => 'Delikna suntingan bot',
-'watchlist-show-own'   => 'Tuduhna suntinganku',
-'watchlist-hide-own'   => 'Delikna suntinganku',
-'watchlist-show-minor' => 'Tuduhna suntingan cilik',
-'watchlist-hide-minor' => 'Delikna suntingan cilik',
+'watchlist-options'    => 'Opsi daftar pangawasan',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ngawasi...',
@@ -1458,79 +1629,98 @@ Kanggo ngowahi préferènsi ing daftar pangawasan panjenengan, mangga mirsani
 Umpan balik lan pitulung sabanjuré:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Busak kaca',
-'confirm'                     => 'Dhedhes (konfirmasi)',
-'excontent'                   => "isi sadurungé: '$1'",
-'excontentauthor'             => "isiné mung arupa: '$1' (lan siji-sijiné sing nyumbang yaiku '$2')",
-'exbeforeblank'               => "isi sadurungé dikosongaké: '$1'",
-'exblank'                     => 'kaca kosong',
-'delete-confirm'              => 'Busak "$1"',
-'delete-legend'               => 'Busak',
-'historywarning'              => 'Pènget: Kaca sing bakal panjenengan busak ana sajarahé:',
-'confirmdeletetext'           => 'Panjenengan bakal mbusak kaca utawa berkas iki minangka permanèn karo kabèh sajarahé saka basis data. Pastèkna dhisik menawa panjenengan pancèn nggayuh iki, ngerti kabèh akibat lan konsekwènsiné, lan apa sing bakal panjenengan tumindak iku cocog karo [[{{MediaWiki:Policy-url}}|kawicaksanan {{SITENAME}}]].',
-'actioncomplete'              => 'Proses tuntas',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" sampun kabusak. Coba pirsani $2 kanggé log paling énggal kaca ingkang kabusak.',
-'deletedarticle'              => 'mbusak "[[$1]]"',
-'suppressedarticle'           => 'ndelikaké "[[$1]]"',
-'dellogpage'                  => 'Cathetan pambusakan',
-'dellogpagetext'              => 'Ing ngisor iki kapacak log pambusakan kaca sing anyar dhéwé.',
-'deletionlog'                 => 'Cathetan sing dibusak',
-'reverted'                    => 'Dibalèkaké ing revisi sadurungé',
-'deletecomment'               => 'Alesan dibusak:',
-'deleteotherreason'           => 'Alesan liya utawa tambahan:',
-'deletereasonotherlist'       => 'Alesan liya',
-'deletereason-dropdown'       => '*Alesan pambusakan
+# Delete
+'deletepage'             => 'Busak kaca',
+'confirm'                => 'Dhedhes (konfirmasi)',
+'excontent'              => "isi sadurungé: '$1'",
+'excontentauthor'        => "isiné mung arupa: '$1' (lan siji-sijiné sing nyumbang yaiku '$2')",
+'exbeforeblank'          => "isi sadurungé dikosongaké: '$1'",
+'exblank'                => 'kaca kosong',
+'delete-confirm'         => 'Busak "$1"',
+'delete-legend'          => 'Busak',
+'historywarning'         => 'Pènget: Kaca sing bakal panjenengan busak ana sajarahé:',
+'confirmdeletetext'      => 'Panjenengan bakal mbusak kaca utawa berkas iki minangka permanèn karo kabèh sajarahé saka basis data. Pastèkna dhisik menawa panjenengan pancèn nggayuh iki, ngerti kabèh akibat lan konsekwènsiné, lan apa sing bakal panjenengan tumindak iku cocog karo [[{{MediaWiki:Policy-url}}|kawicaksanan {{SITENAME}}]].',
+'actioncomplete'         => 'Proses tuntas',
+'deletedtext'            => '"<nowiki>$1</nowiki>" sampun kabusak. Coba pirsani $2 kanggé log paling énggal kaca ingkang kabusak.',
+'deletedarticle'         => 'mbusak "[[$1]]"',
+'suppressedarticle'      => 'ndelikaké "[[$1]]"',
+'dellogpage'             => 'Cathetan pambusakan',
+'dellogpagetext'         => 'Ing ngisor iki kapacak log pambusakan kaca sing anyar dhéwé.',
+'deletionlog'            => 'Cathetan sing dibusak',
+'reverted'               => 'Dibalèkaké ing revisi sadurungé',
+'deletecomment'          => 'Alesan dibusak:',
+'deleteotherreason'      => 'Alesan liya utawa tambahan:',
+'deletereasonotherlist'  => 'Alesan liya',
+'deletereason-dropdown'  => '*Alesan pambusakan
 ** Disuwun sing nulis
 ** Nglanggar hak cipta
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Sunting alesan pambusakan',
-'delete-toobig'               => 'Kaca iki ndarbèni sajarah panyuntingan sing dawa, yaiku ngluwihi $1 {{PLURAL:$1|revision|révisi}}. 
+'delete-edit-reasonlist' => 'Sunting alesan pambusakan',
+'delete-toobig'          => 'Kaca iki ndarbèni sajarah panyuntingan sing dawa, yaiku ngluwihi $1 {{PLURAL:$1|revision|révisi}}. 
 Pambusakan kaca sing kaya mangkono mau wis ora diparengaké kanggo menggak anané karusakan ing {{SITENAME}}.',
-'delete-warning-toobig'       => 'Kaca iki duwé sajarang panyuntingan sing dawa, luwih saka $1 {{PLURAL:$1|revision|révisi}}.
+'delete-warning-toobig'  => 'Kaca iki duwé sajarang panyuntingan sing dawa, luwih saka $1 {{PLURAL:$1|revision|révisi}}.
 Mbusak kaca iki bisa ngrusak operasi basis data ing {{SITENAME}};
 kudu ngati-ati.',
-'rollback'                    => 'Mbalèkaké suntingan',
-'rollback_short'              => 'Balèkna',
-'rollbacklink'                => 'balèaké',
-'rollbackfailed'              => 'Pambalèkan gagal dilakoni',
-'cantrollback'                => 'Ora bisa mbalèkaké suntingan; panganggo pungkasan iku siji-sijiné penulis artikel iki.',
-'alreadyrolled'               => 'Ora bisa mbalèkaké suntingan pungkasan [[:$1]] déning [[User:$2|$2]] ([[User talk:$2|Wicara]] | [[Special:Contributions/$2|{{int:contribslink}}]]); wong liya wis nyunting utawa mbalèkaké kaca artikel iku. 
-
-Suntingan pungkasan dilakoni déning [[User:$3|$3]] ([[User talk:$3|Wicara]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Komentar panyuntingané yaiku: "<em>$1</em>".', # only shown if there is an edit comment
-'revertpage'                  => 'Suntingan [[Special:Contributions/$2|$2]] ([[User talk:$2|dhiskusi]]) dipunwangsulaken dhateng ing vèrsi pungkasan déning [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Suntingan dibalèkaké déning $1;
+
+# Rollback
+'rollback'         => 'Mbalèkaké suntingan',
+'rollback_short'   => 'Balèkna',
+'rollbacklink'     => 'balèaké',
+'rollbackfailed'   => 'Pambalèkan gagal dilakoni',
+'cantrollback'     => 'Ora bisa mbalèkaké suntingan; panganggo pungkasan iku siji-sijiné penulis artikel iki.',
+'alreadyrolled'    => 'Ora bisa mbalèkaké suntingan pungkasan [[:$1]] déning [[User:$2|$2]] ([[User talk:$2|Wicara]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); wong liya wis nyunting utawa mbalèkaké kaca artikel iku. 
+
+Suntingan pungkasan dilakoni déning [[User:$3|$3]] ([[User talk:$3|Wicara]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => 'Komentar panyuntingané yaiku: "<em>$1</em>".', # only shown if there is an edit comment
+'revertpage'       => 'Suntingan [[Special:Contributions/$2|$2]] ([[User talk:$2|dhiskusi]]) dipunwangsulaken dhateng ing vèrsi pungkasan déning [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Suntingan dibalèkaké déning $1;
 diowahi bali menyang vèrsi pungkasan déning $2.',
-'sessionfailure'              => 'Katoné ana masalah karo sèsi log panjenengan; log panjenengan wis dibatalaké kanggo nyegah pambajakan. Mangga mencèt tombol "back" lan unggahaké manèh kaca sadurungé mlebu log, lan coba manèh.',
+'sessionfailure'   => 'Katoné ana masalah karo sèsi log panjenengan; log panjenengan wis dibatalaké kanggo nyegah pambajakan. Mangga mencèt tombol "back" lan unggahaké manèh kaca sadurungé mlebu log, lan coba manèh.',
+
+# Protect
 'protectlogpage'              => 'Log pangreksan',
 'protectlogtext'              => 'Ing ngisor iki kapacak log pangreksan lan panjabelan reksa kaca.
 Mangga mirsani [[Special:ProtectedPages|daftar kaca sing direksa]] kanggo daftar pangreksan kaca pungkasan.',
 'protectedarticle'            => 'ngreksa "[[$1]]"',
 'modifiedarticleprotection'   => 'ngowahi tingkat pangreksan "[[$1]]"',
 'unprotectedarticle'          => 'ngilangi pangreksan "[[$1]]"',
+'movedarticleprotection'      => 'mindhahaké pangaturan protèksi saka "[[$2]]" menyang "[[$1]]"',
 'protect-title'               => 'Ngowahi tingkatan pangreksan kanggo "$1"',
+'prot_1movedto2'              => '$1 dialihaké menyang $2',
 'protect-legend'              => 'Konfirmasi pangreksan',
 'protectcomment'              => 'Komentar:',
 'protectexpiry'               => 'Kadaluwarsa:',
 'protect_expiry_invalid'      => 'Wektu kadaluwarsané ora sah.',
 'protect_expiry_old'          => 'Wektu kadaluwarsané kuwi ana ing jaman biyèn.',
 'protect-unchain'             => 'Bukak pangreksan pamindhahan',
-'protect-text'                => 'Panjenengan bisa mirsani utawa ngganti tingkatan pangreksan kanggo kaca <strong><nowiki>$1</nowiki></strong> ing kéné.',
-'protect-locked-blocked'      => 'Panjenengan ora bisa ngganti tingkat pangreksan yèn lagi diblokir.
-Ing ngisor iki kapacak konfigurasi saiki iki kanggo kaca <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Tingkat pangreksan ora bisa diganti amerga anané panguncèn aktif basis data.
-Ing ngisor iki kapacak konfigurasi kanggo kaca <strong>$1</strong>:',
-'protect-locked-access'       => 'Akun utawa rékening panjenengan ora awèh idin kanggo ngganti tingkat pangreksan kaca. Ing ngisor iki kapacak konfigurasi saiki iki kanggo kaca <strong>$1</strong>:',
+'protect-text'                => "Panjenengan bisa mirsani utawa ngganti tingkatan pangreksan kanggo kaca '''<nowiki>$1</nowiki>''' ing kéné.",
+'protect-locked-blocked'      => "Panjenengan ora bisa ngganti tingkat pangreksan yèn lagi diblokir.
+Ing ngisor iki kapacak konfigurasi saiki iki kanggo kaca '''$1''':",
+'protect-locked-dblock'       => "Tingkat pangreksan ora bisa diganti amerga anané panguncèn aktif basis data.
+Ing ngisor iki kapacak konfigurasi kanggo kaca '''$1''':",
+'protect-locked-access'       => "Akun utawa rékening panjenengan ora awèh idin kanggo ngganti tingkat pangreksan kaca. Ing ngisor iki kapacak konfigurasi saiki iki kanggo kaca '''$1''':",
 'protect-cascadeon'           => 'Kaca iki lagi direksa amerga disertakaké ing {{PLURAL:$1|kaca|kaca-kaca}} sing wis direksa mawa pilihan pangreksan runtun diaktifaké. Panjenengan bisa ngganti tingkat pangreksan kanggo kaca iki, nanging perkara iku ora awèh pengaruh pangreksan runtun.',
-'protect-default'             => '(baku)',
+'protect-default'             => 'Idinaké kabèh panganggo',
 'protect-fallback'            => 'Perlu idin hak aksès "$1"',
-'protect-level-autoconfirmed' => 'Blokir panganggo sing ora kadaftar',
+'protect-level-autoconfirmed' => 'Blokir panganggo anyar lan ora kadhaptar',
 'protect-level-sysop'         => 'Namung opsis (operator sistem)',
 'protect-summary-cascade'     => 'runtun',
 'protect-expiring'            => 'kadaluwarsa $1 (UTC)',
+'protect-expiry-indefinite'   => 'salawasé',
 'protect-cascade'             => 'Reksanen kabèh kaca sing kalebu ing kaca iki (pangreksan runtun).',
 'protect-cantedit'            => 'Panjenengan ora pareng ngowahi tingkatan pangreksan kaca iki amerga panjenengan ora kagungan idin nyunting kaca iki.',
+'protect-othertime'           => 'Wektu liya:',
+'protect-othertime-op'        => 'wektu liya',
+'protect-existing-expiry'     => 'Wektu kadaluwarsa saiki: $3, $2',
+'protect-otherreason'         => 'Alesan liya/tambahan:',
+'protect-otherreason-op'      => 'alesan liya/tambahan',
+'protect-dropdown'            => '*Alesan umum pangreksan
+** Vandalisme makaping-kaping
+** Spam makaping-kaping
+** Perang suntingan
+** Kaca kerep disunting',
+'protect-edit-reasonlist'     => 'Nyunting alesan reksan',
+'protect-expiry-options'      => '2 jam:2 hours,1 dina:1 day,3 dina:3 days,1 minggu:1 week,2 minggu:2 weeks,1 sasi:1 month,3 sasi:3 months,6 sasi:6 months,1 taun:1 year,tanpa wates:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pangreksan:',
 'restriction-level'           => 'Tingkatan pambatesan:',
 'minimum-size'                => 'Ukuran minimum',
@@ -1567,13 +1757,14 @@ Ing kasus kaya mengkono, panjenengan kudu ngilangaké cèk utawa mbusak pandelik
 'undeletehistorynoadmin'       => 'Kaca iki wis dibusak.
 Alesané dituduhaké ing ringkesan ing ngisor iki, karo détail para panganggo sing wis nyunting kaca iki sadurungé dibusak.
 Isi pungkasan tèks iki wis dibusak lan namung bisa dideleng para pangurus.',
-'undelete-revision'            => 'Révisi sing wis dibusak saka $1 (nganti $2) déning $3:',
+'undelete-revision'            => 'Révisi sing wis dibusak saka $1 (ing $5, $4) déning $3:',
 'undeleterevision-missing'     => 'Revisi salah utawa ora ditemokaké. 
 Panjenengan mbokmenawa ngetutaké pranala sing salah, utawa revisi iku wis dipulihaké utawa diguwang saka arsip.',
 'undelete-nodiff'              => 'Ora ditemokaké révisi sing luwih lawas.',
 'undeletebtn'                  => 'Balèkna!',
 'undeletelink'                 => 'balèkna',
 'undeletereset'                => "''Reset''",
+'undeleteinvert'               => 'Walik pilihan',
 'undeletecomment'              => 'Komentar:',
 'undeletedarticle'             => '"$1" wis dibalèkaké',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|révisi|révisi}} wis dibalèkaké',
@@ -1607,26 +1798,27 @@ $1',
 'blanknamespace' => '(Utama)',
 
 # Contributions
-'contributions' => 'Sumbangan panganggo',
-'mycontris'     => 'Kontribusiku',
-'contribsub2'   => 'Kanggo $1 ($2)',
-'nocontribs'    => 'Ora ditemokaké owah-owahan sing cocog karo kritéria kasebut iku.',
-'uctop'         => ' (dhuwur)',
-'month'         => 'Wiwit sasi (lan sadurungé):',
-'year'          => 'Wiwit taun (lan sadurungé):',
-
-'sp-contributions-newbies'     => 'Namung panganggo-panganggo anyar',
-'sp-contributions-newbies-sub' => 'Kanggo panganggo anyar',
-'sp-contributions-blocklog'    => 'Log pemblokiran',
-'sp-contributions-search'      => 'Golèk kontribusi',
-'sp-contributions-username'    => 'Alamat IP utawa jeneng panganggo:',
-'sp-contributions-submit'      => 'Golèk',
+'contributions'       => 'Sumbangan panganggo',
+'contributions-title' => 'Kontribusi panganggo kanggo $1',
+'mycontris'           => 'Kontribusiku',
+'contribsub2'         => 'Kanggo $1 ($2)',
+'nocontribs'          => 'Ora ditemokaké owah-owahan sing cocog karo kritéria kasebut iku.',
+'uctop'               => ' (dhuwur)',
+'month'               => 'Wiwit sasi (lan sadurungé):',
+'year'                => 'Wiwit taun (lan sadurungé):',
+
+'sp-contributions-newbies'       => 'Namung panganggo-panganggo anyar',
+'sp-contributions-newbies-sub'   => 'Kanggo panganggo anyar',
+'sp-contributions-newbies-title' => 'Kontribusi panganggo anyar',
+'sp-contributions-blocklog'      => 'Log pemblokiran',
+'sp-contributions-search'        => 'Golèk kontribusi',
+'sp-contributions-username'      => 'Alamat IP utawa jeneng panganggo:',
+'sp-contributions-submit'        => 'Golèk',
 
 # What links here
 'whatlinkshere'            => 'Pranala balik',
 'whatlinkshere-title'      => 'Kaca-kaca sing duwé pranala menyang "$1"',
 'whatlinkshere-page'       => 'Kaca:',
-'linklistsub'              => '(Daftar pranala)',
 'linkshere'                => "Kaca-kaca iki nduwé pranala menyang '''[[:$1]]''':",
 'nolinkshere'              => "Ora ana kaca sing nduwé pranala menyang '''[[:$1]]'''.",
 'nolinkshere-ns'           => " Ora ana kaca sing nduwé pranala menyang '''[[:$1]]''' ing bilik jeneng sing kapilih.",
@@ -1672,6 +1864,8 @@ Lebokna alesan panjenengan ing ngisor iki (contoné njupuk conto kaca sing wis t
 'ipbotherreason'                  => 'Alesan liya/tambahan',
 'ipbhidename'                     => 'Delikna jeneng panganggo utawa alamat IP saka log pamblokiran, daftar blokir aktif, sarta daftar panganggo',
 'ipbwatchuser'                    => 'Ngawasi kaca panganggo lan kaca-kaca dhiskusi panganggo iki',
+'ipballowusertalk'                => 'Idinaké panganggo iki nyunting kaca wicarané dhéwé nalika diblokir',
+'ipb-change-block'                => 'Blokir manèh panganggo kanthi sèting iki',
 'badipaddress'                    => 'Alamat IP klèntu',
 'blockipsuccesssub'               => 'Pemblokiran suksès',
 'blockipsuccesstext'              => 'Alamat IP utawa panganggo "$1" wis diblokir. <br />Delengen [[Special:IPBlockList|Daftar IP lan panganggo diblokir]] kanggo ndeleng manèh pemblokiran.',
@@ -1680,6 +1874,7 @@ Lebokna alesan panjenengan ing ngisor iki (contoné njupuk conto kaca sing wis t
 'ipb-unblock'                     => 'Ilangna blokir sawijining panganggo utawa alamat IP',
 'ipb-blocklist-addr'              => 'Blokir sing dipatrapaké kanggo $1',
 'ipb-blocklist'                   => 'Ndeleng blokir sing lagi ditrapaké',
+'ipb-blocklist-contribs'          => 'Kontribusi kanggo $1',
 'unblockip'                       => 'Jabel blokir marang alamat IP utawa panganggo',
 'unblockiptext'                   => 'Nggonen formulir ing ngisor iki kanggo mbalèkaké aksès nulis sawijining alamt IP utawa panganggo sing sadurungé diblokir.',
 'ipusubmit'                       => 'Ilangna blokir ing alamat iki',
@@ -1688,6 +1883,9 @@ Lebokna alesan panjenengan ing ngisor iki (contoné njupuk conto kaca sing wis t
 'ipblocklist'                     => 'Daftar alamat-alamat IP lan para panganggo sing diblokir',
 'ipblocklist-legend'              => 'Golèk panganggo sing diblokir',
 'ipblocklist-username'            => 'Jeneng panganggo utawa alamat IP:',
+'ipblocklist-sh-userblocks'       => '$1 pamblokiran akun',
+'ipblocklist-sh-tempblocks'       => '$1 pamblokiran sauntara wektu',
+'ipblocklist-sh-addressblocks'    => '$1 pamblokiran IP tunggal',
 'ipblocklist-submit'              => 'Golèk',
 'blocklistline'                   => '$1, $2 mblokir $3 ($4)',
 'infiniteblock'                   => 'salawasé',
@@ -1696,14 +1894,18 @@ Lebokna alesan panjenengan ing ngisor iki (contoné njupuk conto kaca sing wis t
 'noautoblockblock'                => 'pamblokiran otomatis dipatèni',
 'createaccountblock'              => 'ndamelipun akun dipunblokir',
 'emailblock'                      => 'layang e-mail diblokir',
+'blocklist-nousertalk'            => 'ora éntuk nyunting kaca gunemané dhéwé',
 'ipblocklist-empty'               => 'Daftar pamblokiran kosong.',
 'ipblocklist-no-results'          => 'alamat IP utawa panganggo sing disuwun ora diblokir.',
 'blocklink'                       => 'blokir',
 'unblocklink'                     => 'jabel blokir',
+'change-blocklink'                => 'owahi blokir',
 'contribslink'                    => 'sumbangan',
 'autoblocker'                     => 'Panjenengan otomatis dipun-blok amargi nganggé alamat protokol internet (IP) ingkang sami kaliyan "[[User:$1|$1]]". Alesanipun $1 dipun blok inggih punika "\'\'\'$2\'\'\'"',
 'blocklogpage'                    => 'Log pamblokiran',
+'blocklog-fulllog'                => 'Log pamblokiran total',
 'blocklogentry'                   => 'mblokir "[[$1]]" dipun watesi wedalipun $2 $3',
+'reblock-logentry'                => 'Ngowahi sèting pamblokiran [[$1]] kanthi wektu daluwarsa $2 $3',
 'blocklogtext'                    => 'Ing ngisor iki kapacak log pamblokiran lan panjabelan blokir panganggo. 
 Alamat IP sing diblokir sacara otomatis ora ana ing daftar iki. 
 Mangga mirsani [[Special:IPBlockList|daftar alamat IP sing diblokir]] kanggo daftar blokir pungkasan.',
@@ -1712,11 +1914,14 @@ Mangga mirsani [[Special:IPBlockList|daftar alamat IP sing diblokir]] kanggo daf
 'block-log-flags-nocreate'        => 'opsi nggawé akun utawa rékening dipatèni',
 'block-log-flags-noautoblock'     => 'blokir otomatis dipatèni',
 'block-log-flags-noemail'         => 'e-mail diblokir',
+'block-log-flags-nousertalk'      => 'ora éntuk nyunting kaca gunemané dhéwé',
 'block-log-flags-angry-autoblock' => 'paningkatan sistem pamblokiran otomatis wis diaktifaké',
 'range_block_disabled'            => 'Fungsi pamblokir blok IP kanggo para opsis dipatèni.',
 'ipb_expiry_invalid'              => 'Wektu kadaluwarsa ora absah.',
 'ipb_expiry_temp'                 => 'Pamblokiran tumrap jeneng panganggo sing didhelikaké kudu permanèn.',
 'ipb_already_blocked'             => '"$1" wis diblokir',
+'ipb-needreblock'                 => '== Sudah diblokir ==
+$1 wis diblokir. Apa panjenengan sedya ngowahi patrapan blokiran kasebut?',
 'ipb_cant_unblock'                => 'Kaluputan: Blokir mawa ID $1 ora ditemokaké. Blokir iku mbok-menawa wis dibuka.',
 'ipb_blocked_as_range'            => 'Kaluputan: IP $1 ora diblokir sacara langsung lan ora bisa dijabel blokiré. IP $1 diblokir mawa bagéyan saka pamblokiran kelompok IP $2, sing bisa dijabel pamblokirané.',
 'ip_range_invalid'                => 'Blok IP ora absah.',
@@ -1728,6 +1933,7 @@ Mangga ngubungi sing nyedyakaké dines internèt panjenengan utawa pitulungan tÃ
 'proxyblocksuccess'               => 'Bubar.',
 'sorbsreason'                     => "Alamat IP panjenengan didaftar minangka ''open proxy'' ing DNSBL.",
 'sorbs_create_account_reason'     => "Alamat IP panjenengan didaftar minangka ''open proxy'' ing DNSBL. Panjenengan ora bisa nggawé akun utawa rékening.",
+'cant-block-while-blocked'        => 'Panjenengan ora bisa mblokir panganggo liya nalika panjenengan dhéwé pinuju diblokir.',
 
 # Developer tools
 'lockdb'              => 'Kunci basis data',
@@ -1749,59 +1955,66 @@ Tulung pastèkna yèn iki pancèn sing panjenengan gayuh.',
 'databasenotlocked'   => 'Basis data ora dikunci.',
 
 # Move page
-'move-page'               => 'Pindhahna $1',
-'move-page-legend'        => 'Mindhah kaca',
-'movepagetext'            => "Formulir ing ngisor iki bakal ngowahi jeneng sawijining kaca, mindhah kabèh sajarahé menyang kaca sing anyar. Irah-irahan utawa judhul sing lawas bakal dadi kaca pangalihan menyang irah-irahan sing anyar. Pranala menyang kaca sing lawas ora bakal diowahi; dadi pastèkna dhisik mriksa pangalihan [[Special:DoubleRedirects|dobel]] utawa [[Special:BrokenRedirects|pangalihan sing rusak]] sawisé pamindhahan. Panjenengan sing tanggung jawab mastèkaké menawa kabèh pranala-pranala tetep nyambung ing kaca panujon kaya samesthiné.
+'move-page'                 => 'Pindhahna $1',
+'move-page-legend'          => 'Mindhah kaca',
+'movepagetext'              => "Formulir ing ngisor iki bakal ngowahi jeneng sawijining kaca, mindhah kabèh sajarahé menyang kaca sing anyar. Irah-irahan utawa judhul sing lawas bakal dadi kaca pangalihan menyang irah-irahan sing anyar. Pranala menyang kaca sing lawas ora bakal diowahi; dadi pastèkna dhisik mriksa pangalihan [[Special:DoubleRedirects|dobel]] utawa [[Special:BrokenRedirects|pangalihan sing rusak]] sawisé pamindhahan. Panjenengan sing tanggung jawab mastèkaké menawa kabèh pranala-pranala tetep nyambung ing kaca panujon kaya samesthiné.
 
 Gatèkna yèn kaca iki '''ora''' bakal dipindhah yèn wis ana kaca liyané sing nganggo irah-irahan sing anyar, kejaba kaca iku kosong utawa ora nduwé sajarah panyuntingan. Dadi tegesé panjenengan bisa ngowahi jeneng kaca iku manèh kaya sedyakala menawa panjenengan luput, lan panjenengan ora bisa nimpani kaca sing wis ana.
 
 '''PÈNGET!''' 
 Perkara iki bisa ngakibataké owah-owahan sing drastis lan ora kaduga kanggo kaca-kaca sing populèr;
 pastekaké dhisik panjenengan ngerti konsekwènsi saka panggayuh panjenengan sadurungé dibanjuraké.",
-'movepagetalktext'        => "Kaca dhiskusi sing kagandhèng uga bakal dipindhahaké sacara otomatis '''kejaba yèn:'''
+'movepagetalktext'          => "Kaca dhiskusi sing kagandhèng uga bakal dipindhahaké sacara otomatis '''kejaba yèn:'''
 
 *Sawijining kaca dhiskusi sing ora kosong wis ana sangisoring irah-irahan (judhul) anyar, utawa
 *Panjenengan ora maringi tandha cèk ing kothak ing ngisor iki.
 
 Ing kasus-kasus iku, yèn panjenengan gayuh, panjenengan bisa mindhahaké utawa nggabung kaca iku sacara manual.",
-'movearticle'             => 'Pindhah kaca',
-'movenotallowed'          => 'Panjenengan ora pareng ngalihaké kaca.',
-'newtitle'                => 'Menyang irah-irahan utawa judhul anyar:',
-'move-watch'              => 'Awasna kaca iki',
-'movepagebtn'             => 'Pindhahna kaca',
-'pagemovedsub'            => 'Bisa kasil dipindhahaké',
-'movepage-moved'          => '<big>\'\'\'"$1" dipindhahaké menyang "$2".\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Satunggalipun kaca kanthi asma punika sampun wonten, utawi asma ingkang panjenengan pendhet mboten leres. Sumangga nyobi asma sanèsipun.',
-'cantmove-titleprotected' => 'Panjenengan ora bisa mindhahaké kaca iki menyang lokasi iki, amerga irah-irahan tujuan lagi direksa; ora olèh digawé',
-'talkexists'              => 'Kaca iku kasil dipindhahaké, nanging kaca dhiskusi saka kaca iku ora bisa dipindhahaké amerga wis ana kaca dhiskusi ing irah-irahan (judhul) sing anyar. Mangga kaca-kaca dhiskusi wau digabung sacara manual.',
-'movedto'                 => 'dipindhah menyang',
-'movetalk'                => 'Pindahna kaca dhiskusi sing ana gandhèngané.',
-'move-subpages'           => 'Pindhahen kabèh anak-kaca, yèn ana',
-'move-talk-subpages'      => 'Pindhahen kabèh anak-kaca wicara, yèn ana',
-'movepage-page-exists'    => 'Kaca $1 wis ana lan ora bisa ditindhes sacara otomatis.',
-'movepage-page-moved'     => 'Kaca $1 wis dipindhah menyang $2.',
-'movepage-page-unmoved'   => 'Kaca $1 ora bisa dialihaké menyang $2.',
-'movepage-max-pages'      => 'Paling akèh $1 {{PLURAL:$1|kaca|kaca}} wis dialihaké lan ora ana manèh sing bakal dialihaké sacara otomatis.',
-'1movedto2'               => '$1 dialihaké menyang $2',
-'1movedto2_redir'         => '[[$1]] dipunalihaken menyang [[$2]] via pangalihan',
-'movelogpage'             => 'Log pamindhahan',
-'movelogpagetext'         => 'Ing ngisor iki kapacak log pangalihan kaca.',
-'movereason'              => 'Alesan:',
-'revertmove'              => 'balèkaké',
-'delete_and_move'         => 'busak lan kapindahaken',
-'delete_and_move_text'    => '== Perlu mbusak ==
+'movearticle'               => 'Pindhah kaca',
+'movenologin'               => 'Durung mlebu log',
+'movenologintext'           => 'Panjenengan kudu dadi panganggo sing wis ndaftar lan wis [[Special:UserLogin|mlebu log]] kanggo mindhah kaca.',
+'movenotallowed'            => 'Panjenengan ora pareng ngalihaké kaca.',
+'cant-move-user-page'       => 'Panjenengan ora nduwèni hak aksès kanggo mindhahaké kaca panganggo (kapisah saka anak-kaca).',
+'cant-move-to-user-page'    => 'Panjenengan ora nduwèni hak aksès kanggo mindhahaké kaca menyang sawijining kaca panganggoa (kajaba menyang anak-kaca panganggo).',
+'newtitle'                  => 'Menyang irah-irahan utawa judhul anyar:',
+'move-watch'                => 'Awasna kaca iki',
+'movepagebtn'               => 'Pindhahna kaca',
+'pagemovedsub'              => 'Bisa kasil dipindhahaké',
+'movepage-moved'            => '<big>\'\'\'"$1" dipindhahaké menyang "$2".\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'Satunggalipun kaca kanthi asma punika sampun wonten, utawi asma ingkang panjenengan pendhet mboten leres. Sumangga nyobi asma sanèsipun.',
+'cantmove-titleprotected'   => 'Panjenengan ora bisa mindhahaké kaca iki menyang lokasi iki, amerga irah-irahan tujuan lagi direksa; ora olèh digawé',
+'talkexists'                => 'Kaca iku kasil dipindhahaké, nanging kaca dhiskusi saka kaca iku ora bisa dipindhahaké amerga wis ana kaca dhiskusi ing irah-irahan (judhul) sing anyar. Mangga kaca-kaca dhiskusi wau digabung sacara manual.',
+'movedto'                   => 'dipindhah menyang',
+'movetalk'                  => 'Pindahna kaca dhiskusi sing ana gandhèngané.',
+'move-subpages'             => 'Pindhahen kabèh anak-kaca, yèn ana',
+'move-talk-subpages'        => 'Pindhahen kabèh anak-kaca wicara, yèn ana',
+'movepage-page-exists'      => 'Kaca $1 wis ana lan ora bisa ditindhes sacara otomatis.',
+'movepage-page-moved'       => 'Kaca $1 wis dipindhah menyang $2.',
+'movepage-page-unmoved'     => 'Kaca $1 ora bisa dialihaké menyang $2.',
+'movepage-max-pages'        => 'Paling akèh $1 {{PLURAL:$1|kaca|kaca}} wis dialihaké lan ora ana manèh sing bakal dialihaké sacara otomatis.',
+'1movedto2'                 => '$1 dialihaké menyang $2',
+'1movedto2_redir'           => '[[$1]] dipunalihaken menyang [[$2]] via pangalihan',
+'movelogpage'               => 'Log pamindhahan',
+'movelogpagetext'           => 'Ing ngisor iki kapacak log pangalihan kaca.',
+'movereason'                => 'Alesan:',
+'revertmove'                => 'balèkaké',
+'delete_and_move'           => 'busak lan kapindahaken',
+'delete_and_move_text'      => '== Perlu mbusak ==
 
 Artikel sing dituju, "[[:$1]]", wis ana isiné. 
 Apa panjenengan kersa mbusak iku supaya kacané bisa dialihaké?',
-'delete_and_move_confirm' => 'Ya, busak kaca iku.',
-'delete_and_move_reason'  => 'Dibusak kanggo antisipasi pangalihan kaca',
-'selfmove'                => 'Pangalihan kaca ora bisa dilakoni amerga irah-irahan utawa judhul sumber lan tujuané padha.',
-'immobile_namespace'      => 'Irah-irahan sumber utawa tujuan kalebu tipe kusus; 
-ora bisa mindhahaké kaca saka lan menyang bilik nama iku.',
-'imagenocrossnamespace'   => 'Ora bisa mindhahaké gambar menyang bilik nama non-gambar',
-'imagetypemismatch'       => 'Èkstènsi anyar berkas ora cocog karo jenisé',
-'imageinvalidfilename'    => 'Jeneng berkas tujuan ora sah',
-'fix-double-redirects'    => 'Dandani kabèh pangalihan gandha sing tumuju marang irah-irahan asli',
+'delete_and_move_confirm'   => 'Ya, busak kaca iku.',
+'delete_and_move_reason'    => 'Dibusak kanggo antisipasi pangalihan kaca',
+'selfmove'                  => 'Pangalihan kaca ora bisa dilakoni amerga irah-irahan utawa judhul sumber lan tujuané padha.',
+'immobile-source-namespace' => 'Ora bisa mindhahaké kaca jroning bilik jeneng "$1"',
+'immobile-target-namespace' => 'Ora bisa mindhahaké kaca menyang bilik jeneng "$1"',
+'immobile-source-page'      => 'Kaca iki ora bisa dipindhahaké.',
+'immobile-target-page'      => 'Ora bisa mindhahaké menyang irah-irahan tujuan kasebut.',
+'imagenocrossnamespace'     => 'Ora bisa mindhahaké gambar menyang bilik nama non-gambar',
+'imagetypemismatch'         => 'Èkstènsi anyar berkas ora cocog karo jenisé',
+'imageinvalidfilename'      => 'Jeneng berkas tujuan ora sah',
+'fix-double-redirects'      => 'Dandani kabèh pangalihan gandha sing tumuju marang irah-irahan asli',
+'move-leave-redirect'       => 'Gawé pangalihan menyang irah-irahan anyar',
 
 # Export
 'export'            => 'Ekspor kaca',
@@ -1809,7 +2022,7 @@ ora bisa mindhahaké kaca saka lan menyang bilik nama iku.',
 
 Kanggo ngèkspor kaca-kaca artikel, lebokna irah-irahan utawa judhul sajroning kothak tèks ing ngisor iki, irah-irahan utawa judhul siji per baris, lan pilihen apa panjenengan péngin ngèkspor jangkep karo vèrsi sadurungé, utawa namung vèrsi saiki mawa cathetan panyuntingan pungkasan.
 
-Yèn panjenengan namun péngin ngimpor vèrsi pungkasan, panjenengan uga bisa nganggo pranala kusus, contoné [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] kanggo ngèkspor artikel "[[{{MediaWiki:Mainpage}}]]".',
+Yèn panjenengan namun péngin ngimpor vèrsi pungkasan, panjenengan uga bisa nganggo pranala kusus, contoné [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] kanggo ngèkspor artikel "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Namung èkspor révisi saiki, dudu kabèh vèrsi lawas',
 'exportnohistory'   => "----
 '''Cathetan:''' Ngèkspor kabèh sajarah suntingan kaca ngliwati formulir iki wis dinon-aktifaké déning alesan kinerja.",
@@ -1847,6 +2060,7 @@ Kabèh aktivitas impor transwiki bakal dilog ing [[Special:Log/import|log impor]
 'import-interwiki-history'   => 'Tuladen kabèh vèrsi lawas saka kaca iki',
 'import-interwiki-submit'    => 'Impor',
 'import-interwiki-namespace' => 'Pindhahna kaca ing bilik nama:',
+'import-comment'             => 'Komentar:',
 'importtext'                 => "Mangga ngèkspor berkas saka wiki sumber nganggo [[Special:Export|piranti èkspor]]. 
 Simpenen ing cakram padhet (''harddisk'') panjenengan lan unggahna ing kéné.",
 'importstart'                => 'Ngimpor kaca...',
@@ -1881,19 +2095,19 @@ Simpenen ing cakram padhet (''harddisk'') panjenengan lan unggahna ing kéné.",
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|révisi}} saka $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Kaca panganggoku',
+'tooltip-pt-userpage'             => 'Kaca panganggo panjenengan',
 'tooltip-pt-anonuserpage'         => 'Kaca panganggo IP panjenengan',
-'tooltip-pt-mytalk'               => 'Kaca gunemanku',
+'tooltip-pt-mytalk'               => 'Kaca wicara panjenengan',
 'tooltip-pt-anontalk'             => 'Dhiskusi perkara suntingan saka alamat IP iki',
 'tooltip-pt-preferences'          => 'Préferènsiku',
 'tooltip-pt-watchlist'            => 'Daftar kaca sing tak-awasi.',
-'tooltip-pt-mycontris'            => 'Daftar kontribusiku',
+'tooltip-pt-mycontris'            => 'Dhaptar kontribusi panjenengan',
 'tooltip-pt-login'                => 'Panjenengan diaturi mlebu log, nanging ora dikudokaké.',
 'tooltip-pt-anonlogin'            => 'Panjenengan disaranaké mlebu log, nanging ora diwajibaké.',
 'tooltip-pt-logout'               => 'Log metu (oncat)',
 'tooltip-ca-talk'                 => 'Dhiskusi perkara isi',
 'tooltip-ca-edit'                 => 'Sunting kaca iki. Nganggoa tombol pratayang sadurungé nyimpen.',
-'tooltip-ca-addsection'           => 'Tambah komentar ing kaca dhiskusi iki.',
+'tooltip-ca-addsection'           => 'Miwiti bagèyan anyar',
 'tooltip-ca-viewsource'           => 'Kaca iki direksa. Panjenengan namung bisa mirsani sumberé.',
 'tooltip-ca-history'              => 'Vèrsi-vèrsi sadurungé saka kaca iki.',
 'tooltip-ca-protect'              => 'Reksa kaca iki',
@@ -1940,6 +2154,8 @@ Simpenen ing cakram padhet (''harddisk'') panjenengan lan unggahna ing kéné.",
 'tooltip-watch'                   => 'Tambahna kaca iki ing daftar pangawasan panjenengan',
 'tooltip-recreate'                => 'Gawéa kaca iki manèh senadyan tau dibusak',
 'tooltip-upload'                  => 'Miwiti pangunggahan',
+'tooltip-rollback'                => 'Mbalèkaké suntingan-suntingan ing kaca iki menyang kontributor pungkasan nganggo sak klik.',
+'tooltip-undo'                    => 'Mbalèkaké révisi iki lan mbukak kothak panyuntingan jroning mode pratayang. Wènèhi kasempatan kanggo ngisi alesan ing kothak ringkesan.',
 
 # Metadata
 'nodublincore'      => 'Metadata Dublin Core RDF dipatèni ing server iki.',
@@ -1947,12 +2163,12 @@ Simpenen ing cakram padhet (''harddisk'') panjenengan lan unggahna ing kéné.",
 'notacceptable'     => 'Server wiki ora bisa nyedyakaké data sajroning format sing bisa diwaca déning klièn panjenengan.',
 
 # Attribution
-'anonymous'        => 'Panganggé {{SITENAME}} ingkang mboten kinawruhan.',
+'anonymous'        => '{{PLURAL:$1|Panganggo|panganggo}} anon ing {{SITENAME}}.',
 'siteuser'         => 'Panganggo {{SITENAME}} $1',
 'lastmodifiedatby' => 'Kaca iki pungkasan diowahi  $2, $1 déning $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Adhedhasar karyané $1.',
 'others'           => 'liya-liyané',
-'siteusers'        => 'Panganggo(-panganggo) {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Panganggo|Panganggo-panganggo}} {{SITENAME}} $1',
 'creditspage'      => 'Informasi para panulis kaca',
 'nocredits'        => 'Ora ana informasi ngenani para panulis ing kaca iki.',
 
@@ -1993,10 +2209,11 @@ Mbokmanawa iki disebabaké anané pranala jaba sing klebu dhaptar ireng.',
 'markedaspatrollederror-noautopatrol' => 'Panjenengan ora pareng nandhani suntingan panjenengan dhéwé minangka dipatroli.',
 
 # Patrol log
-'patrol-log-page'   => 'Log patroli',
-'patrol-log-header' => 'Iki log revisi sing wis dipatroli.',
-'patrol-log-line'   => 'nandhani $1 saka $2 sing dipatroli $3',
-'patrol-log-auto'   => '(otomatis)',
+'patrol-log-page'      => 'Log patroli',
+'patrol-log-header'    => 'Iki log revisi sing wis dipatroli.',
+'patrol-log-line'      => 'nandhani $1 saka $2 sing dipatroli $3',
+'patrol-log-auto'      => '(otomatis)',
+'log-show-hide-patrol' => '$1 log patroli',
 
 # Image deletion
 'deletedrevision'                 => 'Revisi lawas sing dibusak $1.',
@@ -2011,6 +2228,9 @@ Mbokmanawa iki disebabaké anané pranala jaba sing klebu dhaptar ireng.',
 'previousdiff' => '� Panyuntingan sadurungé',
 'nextdiff'     => 'Panyuntingan sing luwih anyar →',
 
+# Visual comparison
+'visual-comparison' => 'Prabédan kanthi visual',
+
 # Media information
 'mediawarning'         => "'''Pènget:''' Berkas iki mbokmenawa ngandhut kode sing bebayani, yèn dilakokaké sistém panjenengan bisa kena pangaruh ala.<hr />",
 'imagemaxsize'         => 'Watesana ukuran gambar ing kaca dèskripsi berkas dadi:',
@@ -2023,10 +2243,12 @@ Mbokmanawa iki disebabaké anané pranala jaba sing klebu dhaptar ireng.',
 'show-big-image'       => 'Résolusi kebak',
 'show-big-image-thumb' => '<small>Ukuran pratayang iki: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeri berkas anyar',
 'imagelisttext'         => "Ing ngisor iki kapacak daftar '''$1''' {{PLURAL:$1|berkas|berkas}} sing diurutaké $2.",
 'newimages-summary'     => 'Kaca astaméwa utawa kusus iki nuduhaké daftar berkas anyar dhéwé sing diunggahaké.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Jeneng berkas (utawa sapérangan seka jeneng berkas):',
 'showhidebots'          => '($1 bot)',
 'noimages'              => 'Ora ana sing dideleng.',
 'ilsubmit'              => 'Golek',
@@ -2229,6 +2451,18 @@ Pranala-pranala sabanjuré ing baris sing padha dianggep minangka ''pengecualian
 'exif-lightsource-24'  => 'ISO studio tungsten',
 'exif-lightsource-255' => 'Sumber cahya liya',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Lampu kilat ora murub',
+'exif-flash-fired-1'    => 'Lampu kilat murub',
+'exif-flash-return-0'   => 'ora ana fungsi panditèksian strobo balik',
+'exif-flash-return-2'   => 'lampu strobo balik ora kaditèksi',
+'exif-flash-return-3'   => 'lampu strobo balik kaditèksi',
+'exif-flash-mode-1'     => 'lampu kilat diperlokaké',
+'exif-flash-mode-2'     => 'lampu kilat dipatèni',
+'exif-flash-mode-3'     => 'modus otomatis',
+'exif-flash-function-1' => "Ora ana fungsi lampu blitz (''flash'')",
+'exif-flash-redeye-1'   => 'modus réduksi mata-abang',
+
 'exif-focalplaneresolutionunit-2' => 'inci',
 
 'exif-sensingmethod-1' => 'Ora didéfinisi',
@@ -2369,19 +2603,10 @@ $1
 Mangga didhedhes (dikonfirmasi) menawa panjenengan kersa nggawé ulang kaca iki.",
 'recreate'            => 'Gawé ulang',
 
-# HTML dump
-'redirectingto' => 'Dipun-alihaken tumuju [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Busak ''cache'' kaca iki?$1",
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Golèk artikel sing ngamot ''$1''.",
-'searchnamed'      => "Golèk artikel sing ajudhul ''$1''.",
-'articletitles'    => "Artikel sing diawali ''$1''",
-'hideresults'      => 'Delikna pituwas',
-'useajaxsearch'    => 'Nganggoa panggolèkan AJAX',
+'confirm-purge-top'    => "Busak ''cache'' kaca iki?",
+'confirm-purge-bottom' => 'Ngresiki kaca bakal sekaligus mbusak singgahan lan nampilaké vèrsi kaca pungkasan.',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; kaca sadurungé',
@@ -2445,6 +2670,7 @@ Panjenengan uga bisa [[Special:Watchlist/edit|nganggo éditor standar panjenenga
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag èkstènsi ora ditepungi "$1"',
+'duplicate-defaultsort' => 'Pènget: Kunci pilih asal (\'\'Default sort key\'\') "$2" nggantèkaké kunci pilih asal sadurungé "$1".',
 
 # Special:Version
 'version'                          => 'Versi', # Not used as normal message but as header for the special page itself
@@ -2474,13 +2700,13 @@ Panjenengan uga bisa [[Special:Watchlist/edit|nganggo éditor standar panjenenga
 'filepath-summary' => 'Kaca astaméwa utawa kusus iki nuduhaké jalur pepak sawijining berkas.
 Gambar dituduhaké mawa résolusi kebak lan tipe liyané berkas bakal dibuka langsung mawa program kagandhèng.
 
-Lebokna jeneng berkas tanpa imbuhan awalan "{{ns:image}}:".',
+Lebokna jeneng berkas tanpa imbuhan awalan "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Golèk berkas duplikat',
 'fileduplicatesearch-summary'  => 'Golèk duplikat berkas adhedhasar biji hash-é.
 
-Lebokna jeneng berkas tanpa imbuhan awal "{{ns:image}}:".',
+Lebokna jeneng berkas tanpa imbuhan awal "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Golèk duplikat',
 'fileduplicatesearch-filename' => 'Jeneng berkas:',
 'fileduplicatesearch-submit'   => 'Golèk',
@@ -2511,4 +2737,13 @@ Katrangan tampilan:
 'blankpage'              => 'Kaca kosong',
 'intentionallyblankpage' => 'Kaca iki disengajakaké kosong',
 
+# External image whitelist
+'external_image_whitelist' => '  #Umbarna baris iki apa anané<pre>
+#Pigunakaké fragmèn-fragmèn èksprèsi regular (mung bagéyan ing antara //) ing ngisor
+#Fragmèn-fragmèn ini bakal dicocogaké karo URL saka gambar-gambar eksternal (sing kahubung langsung)
+#Fragmèn sing cocog bakal ditampilaké minangka gambar, yèn ora mung pranala menyang gambar waé sing dituduhaké
+#Larikan sing diwiwiti nganggo # dianggep komentar
+
+#Dèlèhen kabèh fragmèn èksprèsi regular sadhuwuré baris iki. Umbarna baris ini apa anané</pre>',
+
 );
diff --git a/languages/messages/MessagesKa.php b/languages/messages/MessagesKa.php
index 2133a77f..fa3c5b55 100644
--- a/languages/messages/MessagesKa.php
+++ b/languages/messages/MessagesKa.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author Alsandro
+ * @author Dato deutschland
  * @author Malafaya
  * @author Sopho
  * @author Temuri rajavi
@@ -15,36 +16,82 @@
 $namespaceNames = array(
 	NS_MEDIA            => 'მედი�',
 	NS_SPECIAL          => 'სპეცი�ლური',
-	NS_MAIN             => '',
 	NS_TALK             => 'გ�ნხილვ�',
 	NS_USER             => 'მ�მხმ�რებელი',
-	NS_USER_TALK        => 'მ�მხმ�რებელი_გ�ნხილვ�',
-	# NS_PROJECT set by $wgMetaNamespace
+	NS_USER_TALK        => 'მ�მხმ�რებლის_გ�ნხილვ�',
 	NS_PROJECT_TALK     => '$1_გ�ნხილვ�',
-	NS_IMAGE            => 'სურ�თი',
-	NS_IMAGE_TALK       => 'სურ�თი_გ�ნხილვ�',
+	NS_FILE             => 'ფ�ილი',
+	NS_FILE_TALK        => 'ფ�ილის_გ�ნხილვ�',
 	NS_MEDIAWIKI        => 'მედი�ვიკი',
-	NS_MEDIAWIKI_TALK   => 'მედი�ვიკი_გ�ნხილვ�',
+	NS_MEDIAWIKI_TALK   => 'მედი�ვიკის_გ�ნხილვ�',
 	NS_TEMPLATE         => 'თ�რგი',
-	NS_TEMPLATE_TALK    => 'თ�რგი_გ�ნხილვ�',
+	NS_TEMPLATE_TALK    => 'თ�რგის_გ�ნხილვ�',
 	NS_HELP             => 'დ�ხმ�რებ�',
-	NS_HELP_TALK        => 'დ�ხმ�რებ�_გ�ნხილვ�',
+	NS_HELP_TALK        => 'დ�ხმ�რების_გ�ნხილვ�',
 	NS_CATEGORY         => 'კ�ტეგ�რი�',
-	NS_CATEGORY_TALK    => 'კ�ტეგ�რი�_გ�ნხილვ�'
+	NS_CATEGORY_TALK    => 'კ�ტეგ�რიის_გ�ნხილვ�',
 );
 
-$linkPrefixExtension = true;
+$namespaceAliases = array(
+	'მ�მხმ�რებელი_გ�ნხილვ�' => NS_USER_TALK,
+	'სურ�თი' => NS_FILE,
+	'სურ�თი_გ�ნხილვ�' => NS_FILE_TALK,
+	'მედი�ვიკი_გ�ნხილვ�' => NS_MEDIAWIKI_TALK,
+	'თ�რგი_გ�ნხილვ�' => NS_TEMPLATE_TALK,
+	'დ�ხმ�რებ�_გ�ნხილვ�' => NS_HELP_TALK,
+	'კ�ტეგ�რი�_გ�ნხილვ�' => NS_CATEGORY_TALK,
+);
 
-$linkTrail = '/^([a-z�ბგდევზთიკლმნ�პჟრსტუფქღყშჩცძწჭხჯჰ“»]+)(.*)$/sDu';
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( '�რმ�გიგ�დ�მის�მ�რთებ�' ),
+	'BrokenRedirects'           => array( 'გ�წყვეტილიგ�დ�მის�მ�რთებ�' ),
+	'Disambiguations'           => array( 'მრ�ვ�ლმნიშვნელ�ვნებ�' ),
+	'Userlogin'                 => array( 'შესვლ�' ),
+	'Userlogout'                => array( 'გ�სვლ�' ),
+	'CreateAccount'             => array( '�ნგ�რიშის შექმნ�' ),
+	'Preferences'               => array( 'კ�ნფიგურ�ცი�' ),
+	'Watchlist'                 => array( 'კ�ნტრ�ლსი�' ),
+	'Recentchanges'             => array( 'ბ�ლ�ცვლილებები' ),
+	'Upload'                    => array( '�ტვირთვ�' ),
+	'Listfiles'                 => array( 'სურსი�' ),
+	'Newimages'                 => array( '�ხსურ�თები' ),
+	'Listusers'                 => array( 'მ�მხმ�რებელთ� სი�' ),
+	'Statistics'                => array( 'სტ�ტისტიკ�' ),
+	'Randompage'                => array( 'შემთხვევით', 'შემთხვევითიგვერდი' ),
+	'Lonelypages'               => array( '�ბ�ლიგვერდები' ),
+	'Uncategorizedpages'        => array( 'უკ�ტეგ�რი� გვერდები' ),
+	'Uncategorizedcategories'   => array( 'უკ�ტეგ�რი� კ�ტეგ�რიები' ),
+	'Uncategorizedimages'       => array( 'უკ�ტეგ�რი� ფ�ილები' ),
+	'Uncategorizedtemplates'    => array( 'უკ�ტეგ�რი� თ�რგები' ),
+	'Unusedcategories'          => array( 'გ�მ�უყკ�ტეგ�რიები' ),
+	'Unusedimages'              => array( 'გ�მ�უყსურ�თები' ),
+	'Wantedpages'               => array( 'ს�ჭირ� გვერდები' ),
+	'Wantedcategories'          => array( 'მ�თხ�ვნილიკ�ტეგ�რიები' ),
+	'Wantedfiles'               => array( 'ს�ჭირ� ფ�ილები' ),
+	'Shortpages'                => array( 'მ�კლეგვერდები' ),
+	'Longpages'                 => array( 'გრძელიგვერდები' ),
+	'Newpages'                  => array( '�ხ�ლიგვერდები' ),
+	'Ancientpages'              => array( 'მხც�ვ�ნიგვერდები' ),
+	'Allpages'                  => array( 'ყველ�გვერდი' ),
+	'Categories'                => array( 'კ�ტეგ�რიები' ),
+	'Version'                   => array( 'ვერსი�' ),
+	'Undelete'                  => array( '�ღდგენ�' ),
+	'Userrights'                => array( 'მ�მხმ�რებელთ� უფლებები' ),
+	'Mypage'                    => array( 'ჩემიგვერდი' ),
+	'Mytalk'                    => array( 'ჩენი გ�ნხილვ�' ),
+	'Mycontributions'           => array( 'ჩემი წვლილი' ),
+	'Popularpages'              => array( 'პ�პგვერდები' ),
+	'Search'                    => array( 'ძიებ�' ),
+	'Withoutinterwiki'          => array( 'ინტერვიკისგ�რეშე' ),
+);
 
-# Note to translators:
-#   Please include the English words as synonyms.  This allows people
-#   from other wikis to contribute more easily.
-#
 $magicWords = array(
 	'redirect' => array( 0   , '#REDIRECT', '#გ�დ�მის�მ�რთებ�' ),
 );
 
+$linkPrefixExtension = true;
+$linkTrail = '/^([a-z�ბგდევზთიკლმნ�პჟრსტუფქღყშჩცძწჭხჯჰ“»]+)(.*)$/sDu';
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'ხ�ზი გ�უსვი ბმულებს:',
@@ -89,8 +136,6 @@ $messages = array(
 'underline-never'   => '�რ�სდრ�ს',
 'underline-default' => 'ბრ�უზერის უპირ�ბ� �რჩევ�ნი',
 
-'skinpreview' => '(წინ�სწ�რი გ�დ�ხედვ�)',
-
 # Dates
 'sunday'        => 'კვირ�',
 'monday'        => '�რშ�ბ�თი',
@@ -144,15 +189,17 @@ $messages = array(
 'dec'           => 'დეკ',
 
 # Categories related messages
-'pagecategories'           => '{{PLURAL:$1|კ�ტეგ�რი�|კ�ტეგ�რიები}}',
-'category_header'          => 'სტ�ტიები კ�ტეგ�რი�ში "$1"',
-'subcategories'            => 'ქვეკ�ტეგ�რიები',
-'category-media-header'    => 'მედი� კ�ტეგ�რი�ში "$1"',
-'category-empty'           => "''ეს კ�ტეგ�რი� �მჟ�მ�დ გვერდებს �ნ მედი�ს �რ შეიც�ვს.''",
-'hidden-categories'        => 'დ�მ�ლული {{PLURAL:$1|კ�ტეგ�რი�|კ�ტეგ�რიები}}',
-'hidden-category-category' => 'დ�მ�ლული კ�ტეგ�რიები', # Name of the category where hidden categories will be listed
-'category-subcat-count'    => '{{PLURAL:$2|ეს კ�ტეგ�რი� შეიც�ვს მხ�ლ�დ შემდეგ ქვეკ�ტეგ�რი�ს.|�მ კ�ტეგ�რი�ში მ�ცემული� $1 ქვეკ�ტეგ�რი� $2-დ�ნ.}}',
-'listingcontinuesabbrev'   => 'გ�გრძ.',
+'pagecategories'                => '{{PLURAL:$1|კ�ტეგ�რი�|კ�ტეგ�რიები}}',
+'category_header'               => 'სტ�ტიები კ�ტეგ�რი�ში "$1"',
+'subcategories'                 => 'ქვეკ�ტეგ�რიები',
+'category-media-header'         => 'მედი� კ�ტეგ�რი�ში "$1"',
+'category-empty'                => "''ეს კ�ტეგ�რი� �მჟ�მ�დ გვერდებს �ნ მედი�ს �რ შეიც�ვს.''",
+'hidden-categories'             => 'დ�მ�ლული {{PLURAL:$1|კ�ტეგ�რი�|კ�ტეგ�რიები}}',
+'hidden-category-category'      => 'დ�მ�ლული კ�ტეგ�რიები', # Name of the category where hidden categories will be listed
+'category-subcat-count'         => '{{PLURAL:$2|ეს კ�ტეგ�რი� შეიც�ვს მხ�ლ�დ შემდეგ ქვეკ�ტეგ�რი�ს.|�მ კ�ტეგ�რი�ში მ�ცემული� $1 ქვეკ�ტეგ�რი� $2-დ�ნ.}}',
+'category-subcat-count-limited' => 'ეს კ�ტეგ�რი� მ�იც�ვს შემდეგ $1 ქვეკ�ტეგ�რი�ს.',
+'category-file-count-limited'   => 'შემდეგი {{PLURAL:$1|ფ�ილი|$1 ფ�ილები}} �მ კ�ტეგ�რი�ში�.',
+'listingcontinuesabbrev'        => 'გ�გრძ.',
 
 'linkprefix'        => '/^(.*?)(„|«)$/sD',
 'mainpagetext'      => "<big>'''მედი�ვიკი წ�რმ�ტებით ჩ�იტვირთ�.'''</big>",
@@ -180,7 +227,7 @@ $messages = array(
 'mytalk'         => 'ჩემი გ�ნხილვ�',
 'anontalk'       => '�მ IP-ს გ�ნხილვ�',
 'navigation'     => 'ნ�ვიგ�ცი�',
-'and'            => 'დ�',
+'and'            => '&#32;დ�',
 
 # Metadata in edit box
 'metadata_help' => 'მეტ�მ�ნ�ცემები (იხ. [[Project:მეტ�მ�ნ�ცემები|მეტ�მ�ნ�ცემები]] გ�ნმ�რტებისთვის):',
@@ -192,7 +239,7 @@ $messages = array(
 'search'            => 'ძიებ�',
 'searchbutton'      => 'ძიებ�',
 'go'                => 'სტ�ტი�',
-'searcharticle'     => 'სტ�ტი�',
+'searcharticle'     => 'გვერდი',
 'history'           => 'გვერდის ისტ�რი�',
 'history_short'     => 'ისტ�რი�',
 'updatedmarker'     => 'გ�ნ�ხლდ� ჩემი ბ�ლ� შემ�სვლის შემდეგ',
@@ -217,14 +264,14 @@ $messages = array(
 'talkpagelinktext'  => 'გ�ნხილვ�',
 'specialpage'       => 'სპეცი�ლური გვერდი',
 'personaltools'     => 'პირ�დი ხელს�წყ�ები',
-'postcomment'       => 'კ�მენტ�რის გ�კეთებ�',
+'postcomment'       => '�ხ�ლი სექცი�',
 'articlepage'       => 'სტ�ტიის ნ�ხვ�',
 'talk'              => 'გ�ნხილვ�',
 'views'             => 'გ�დ�ხედვ�',
 'toolbox'           => 'ინსტრუმენტები',
 'userpage'          => 'გ�დ�ხედე მ�მხმ�რებლის გვერდს',
 'projectpage'       => 'დ��თვ�ლიერე პრ�ექტის გვერდი',
-'imagepage'         => 'დ��თვ�ლიერე ფ�ილის გვერდი',
+'imagepage'         => 'ფ�ილის გვერდის ნ�ხვ�',
 'mediawikipage'     => 'გ�დ�ხედე შეტყ�ბინების გვერდს',
 'templatepage'      => 'გ�დ�ხედე თ�რგის გვერდს',
 'viewhelppage'      => 'გ�დ�ხედე დ�ხმ�რების გვერდს',
@@ -243,8 +290,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}-ის შეს�ხებ',
 'aboutpage'            => 'Project:შეს�ხებ',
-'bugreports'           => '�ნგ�რიში შეცდ�მის შეს�ხებ',
-'bugreportspage'       => 'Project:�ნგ�რიში შეცდ�მის შეს�ხებ',
 'copyrightpagename'    => 'ვიკიპედი� ს��ვტ�რ� უფლებები',
 'copyrightpage'        => '{{ns:project}}:ს��ვტ�რ� უფლებები',
 'currentevents'        => 'მიმდინ�რე მ�ვლენები',
@@ -266,9 +311,7 @@ $messages = array(
 
 'badaccess'        => 'ნებ�რთვის შეცდ�მ�',
 'badaccess-group0' => 'თქვენ �რ გ�ქვთ მ�თხ�ვნილი მ�ქმედების შესრულების უფლებ�',
-'badaccess-group1' => 'მ�თხ�ვნილი მ�ქმედების შესრულებ� შეუძლი�თ $1 ჯგუფის მ�მხმ�რებლებს.',
-'badaccess-group2' => 'მ�თხ�ვნილი მ�ქმედების შესრულებ� შეუძლი�თ $1 ჯგუფებიდ�ნ ერთერთში მყ�ფ მ�მხმ�რებლებს.',
-'badaccess-groups' => 'მ�თხ�ვნილი მ�ქმედების შესრულებ� შეუძლი�თ $1 ჯგუფებიდ�ნ ერთერთში მყ�ფ მ�მხმ�რებლებს.',
+'badaccess-groups' => 'მ�თხ�ვნილი მ�ქმედების შესრულებ� შეუძლი�თ მხ�ლ�დ {{PLURAL:$2|შემდეგ ჯგუფში|შემდეგი ჯგუფებიდ�ნ ერთ-ერთში}} მყ�ფ მ�მხმ�რებლებს: $1.',
 
 'versionrequired'     => 'ს�ჭირ�� მედი�ვიკის ვერსი� $1',
 'versionrequiredtext' => 'მ�ცემული გვერდის გ�მ�ს�ყენებლ�დ ს�ჭირ�� მედი�ვიკის ვერსი� $1. იხილეთ [[Special:Version|სპეცი�ლური:ვერსი�]]',
@@ -282,6 +325,8 @@ $messages = array(
 'editsection'             => 'რედ�ქტირებ�',
 'editold'                 => 'რედ�ქტირებ�',
 'viewsourceold'           => 'წყ�რ�ს ჩვენებ�',
+'editlink'                => 'რედ�ქტირებ�',
+'viewsourcelink'          => 'იხილე წყ�რ�',
 'editsectionhint'         => 'სექციის რედ�ქტირებ�: $1',
 'toc'                     => 'ს�რჩევი',
 'showtoc'                 => 'ჩვენებ�',
@@ -294,13 +339,13 @@ $messages = array(
 'site-atom-feed'          => '$1-ის �რხი Atom',
 'page-rss-feed'           => '"$1"-ის �რხი RSS',
 'page-atom-feed'          => '"$1"-ის �რხი Atom',
-'red-link-title'          => '$1 (ჯერ �რ�� დ�წერილი)',
+'red-link-title'          => '$1 (გვერდი �რ �რსებ�ბს)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'სტ�ტი�',
 'nstab-user'      => 'მ�მხმ�რებლის გვერდი',
 'nstab-media'     => 'მედიის გვერდი',
-'nstab-special'   => 'სპეცი�ლური',
+'nstab-special'   => 'სპეცი�ლური გვერდი',
 'nstab-project'   => 'პრ�ექტის გვერდი',
 'nstab-image'     => 'ფ�ილი',
 'nstab-mediawiki' => 'შეტყ�ბინებ�',
@@ -310,8 +355,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'მ�ქმედებ� �რ �რსებ�ბს',
-'nosuchactiontext'  => 'მ�ქმედებ� მითითებული URL-ის მიერ
-გ�უგებ�რი� ვიკისთვის',
+'nosuchactiontext'  => 'URL-ის მიერ მითითებული მ�ქმედებ� მცდ�რი�.
+შეს�ძლ�� შეცდ�მით �კრიფეთ URL, �ნ �რ�სწ�რ ბმულზე გ�დ�ხვედით.
+�გრეთვე შეს�ძლ��, {{SITENAME}}-ს მიერ გ�მ�ყენებულ პრ�გრ�მულ უზრუნველყ�ფ�ში იყ�ს შეცდ�მ�.',
 'nosuchspecialpage' => 'სპეცი�ლური გვერდი �რ �რსებ�ბს',
 'nospecialpagetext' => "<big>'''თქვენ �რ�სწ�რი სპეცი�ლური გვერდი მ�ითხ�ვეთ.'''</big>
 
@@ -353,7 +399,6 @@ $1',
 'cannotdelete'         => '�ღნიშნული გვერდის �ნ ფ�ილის წ�შლ� შეუძლებელი� (შეს�ძლ��, იგი უკვე წ�შ�ლ� სხვ� �დმინისტრ�ტ�რმ�).',
 'badtitle'             => '�რ�სწ�რი ს�თ�ური',
 'badtitletext'         => 'მ�თხ�ვნილი გვერდის ს�თ�ური იყ� �რ�სწ�რი, ც�რიელი, �ნ წ�რმ��დგენდ� შეცდ�მით გ�კეთებულ ბმულს ენ�თ�შ�რისი �ნ ინტერ-ვიკი ს�თ�ურიდ�ნ.',
-'perfdisabled'         => 'უკ�ცრ�ვ�დ! ეს ფუნქცი� დრ�ებით შეჩერებული�, ვინ�იდ�ნ ის იმდენ�დ �ნელებს მ�ნ�ცემთ� ბ�ზ�ს, რ�მ ვიკის გ�მ�ყენებ� შეუძლებელი ხდებ�.',
 'wrong_wfQuery_params' => '�რ�სწ�რი პ�რ�მეტრები ფუნქციის�თვის wfQuery()<br />
 ფუნქცი�: $1<br />
 მ�თხ�ვნ�: $2',
@@ -362,7 +407,7 @@ $1',
 'protectedpagetext'    => 'ეს გვერდი დ�ბლ�კილი� რედ�ქტირებისთვის.',
 'viewsourcetext'       => 'თქვენ შეგიძლი�თ ნ�ხ�თ �მ გვერდის ს�წყისი ფ�ილი დ� მისი �სლი შექმნ�თ:',
 'protectedinterface'   => 'ეს გვერდი პრ�გრ�მის ინტერფეისის ნ�წილი� დ� დ�ცული� ვ�ნდ�ლიზმის �ღკვეთის მიზნით.',
-'editinginterface'     => "'''ყურ�დღებ�:''' თქვენ რედ�ქტ�რ�ბთ გვერდს, რ�მელიც პრ�გრ�მის ინტერფეისის ტექსტს შეიც�ვს. �მ გვერდზე გ�ნხ�რციელებული რედ�ქტირებ� გ�მ�იწვევს სხვ� მ�მხმ�რებელთ� ს�მუშ�� ინტერფეისის შეცვლ�ს�ც. თ�რგმ�ნის�თვის უმჯ�ბესი� გ�მ�იყენ�თ [http://translatewiki.net/wiki/Main_Page?setlang=ka Betawiki], მედი�ვიკის ლ�კ�ლიზ�ციის პრ�ექტი.",
+'editinginterface'     => "'''ყურ�დღებ�:''' თქვენ რედ�ქტ�რ�ბთ გვერდს, რ�მელიც პრ�გრ�მის ინტერფეისის ტექსტს შეიც�ვს. �მ გვერდზე გ�ნხ�რციელებული რედ�ქტირებ� გ�მ�იწვევს სხვ� მ�მხმ�რებელთ� ს�მუშ�� ინტერფეისის შეცვლ�ს�ც. თ�რგმ�ნის�თვის უმჯ�ბესი� გ�მ�იყენ�თ [http://translatewiki.net/wiki/Main_Page?setlang=ka translatewiki.net], მედი�ვიკის ლ�კ�ლიზ�ციის პრ�ექტი.",
 'cascadeprotected'     => 'ეს გვერდი რედ�ქტირებისგ�ნ დ�ცული�, რ�დგ�ნ იგი ჩ�რთული� შემდეგ {{PLURAL:$1|გვერდში, რ�მლის |გვერდებში, რ�მელთ�}} დ�ს�ც�ვ�დ�ც ჩ�რთული� პ�რ�მეტრი "იერ�რქიული":
 $2',
 'namespaceprotected'   => "თქვენ �რ გ�ქვთ '''$1''' ს�ხელთ� სივრცეში გვერდების რედ�ქტირების უფლებ�.",
@@ -374,11 +419,11 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'მ�მხმ�რებლის სისტემიდ�ნ გ�სვლ�',
-'logouttext'                 => '<strong>თქვენ �მჟ�მ�დ სისტემიდ�ნ გ�სული ხ�რთ.</strong>
+'logouttext'                 => "'''თქვენ �მჟ�მ�დ სისტემიდ�ნ გ�სული ხ�რთ.'''
 
 შეგიძლი�თ გ�მ�იყენ�თ {{SITENAME}} �ნ�ნიმურ�დ, �ნ შეგიძლი�თ
 [[Special:UserLogin|შეხვიდეთ ისევ]] რ�გ�რც იგივე �ნ სხვ� მ�მხმ�რებელი.
-შენიშნეთ, რ�მ ზ�გიერთ გვერდზე შეს�ძლ�� ისევ უჩვენებდეს რ�მ შესული ხ�რთ ს�ნ�მ თქვენი ბრ�უზერის მეხსიერებ�ს �რ გ�წმენდთ.',
+შენიშნეთ, რ�მ ზ�გიერთ გვერდზე შეს�ძლ�� ისევ უჩვენებდეს რ�მ შესული ხ�რთ ს�ნ�მ თქვენი ბრ�უზერის მეხსიერებ�ს �რ გ�წმენდთ.",
 'welcomecreation'            => '== მ�გეს�ლმებით, $1! ==
 თქვენი �ნგ�რიში შექმნილი�.
 �რ დ�გ�ვიწყდეთ თქვენი [[Special:Preferences|{{SITENAME}}-ის კ�ნფიგურ�ციის]] შეცვლ�.',
@@ -388,7 +433,6 @@ $2',
 'yourpasswordagain'          => 'ხელმე�რედ შეიყვ�ნეთ პ�რ�ლი',
 'remembermypassword'         => 'დ�მიმ�ხს�ვრე',
 'yourdomainname'             => 'თქვენი დ�მენი',
-'loginproblem'               => '<b>თქვენი რეგისტრ�ცი� ვერ მ�ხერხდ�.</b><br />სც�დეთ ხელმე�რედ!',
 'login'                      => 'შესვლ�',
 'nav-login-createaccount'    => 'შესვლ�',
 'loginprompt'                => '{{SITENAME}}-ში შეს�სვლელ�დ ს�ჭირ�� კუკის (cookies) გ��ქტიურებ�.',
@@ -404,20 +448,22 @@ $2',
 'createaccountmail'          => 'ელ-ფ�სტით',
 'badretype'                  => 'თქვენს მიერ შეყვ�ნილი პ�რ�ლები ერთმ�ნეთს �რ ემთხვევ�.',
 'userexists'                 => 'შეყვ�ნილი ს�ხელი უკვე გ�მ�ყენებული�. გთხ�ვთ �ირჩი�თ სხვ� ს�ხელი.',
-'youremail'                  => 'ელექტრ�ნული ფ�სტ� *',
+'youremail'                  => 'ელექტრ�ნული ფ�სტ�:',
 'username'                   => 'მ�მხმ�რებლის ს�ხელი:',
 'uid'                        => 'მ�მხმ�რებლის იდენტიფიკ�ცი�:',
-'yourrealname'               => 'ნ�მდვილი ს�ხელი *',
+'prefs-memberingroups'       => '{{PLURAL:$1|ჯგუფის|ჯგუფების}} წევრი:',
+'yourrealname'               => 'ნ�მდვილი ს�ხელი:',
 'yourlanguage'               => 'ენ�:',
 'yourvariant'                => 'ვ�რი�ნტი',
 'yournick'                   => 'მეტს�ხელი:',
 'badsig'                     => '�რ�სწ�რი ნედლი ხელმ�წერ�; შე�მ�წმეთ HTML ჭდეები.',
-'badsiglength'               => 'მეტს�ხელი ძ�ლი�ნ გრძელი�.
-უნდ� იყ�ს $1 ნიშ�ნზე ნ�კლები.',
+'badsiglength'               => 'ხელმ�წერ� ძ�ლი�ნ გრძელი�.
+უნდ� შედგებ�დეს მ�ქსიმუმ $1 ნიშნის�გ�ნ.',
 'email'                      => 'ელ. ფ�სტ�',
 'prefs-help-realname'        => 'ნ�მდვილი ს�ხელის მითითებ� �უცილებელი �რ �რის, მ�გრ�მ თუ მიუთითებთ ის გ�მ�ყენებული იქნებ� თქვენი ნ�მუშევრის �ღს�ნიშნ�ვ�დ.',
 'loginerror'                 => 'შეცდ�მ� შესვლ�ში',
-'prefs-help-email'           => 'ელ. ფ�სტის მის�მ�რთი �რ�ს�ვ�ლდებულ��, მ�გრ�მ ს�შუ�ლებ�ს �ძლევს სხვ� მ�მხმ�რებლებს დ�გიკ�ვშირდნენ თქვენი მ�მხმ�რებლის გვერდის �ნ გ�ნხილვის გვერდის მეშვე�ბით თქვენი ვინ��ბის ჩვენების ს�ჭირ�ების გ�რეშე.',
+'prefs-help-email'           => 'ელ. ფ�სტის მის�მ�რთი �რ�ს�ვ�ლდებულ��, მ�გრ�მ იძლევ� �ხ�ლი პ�რ�ლის გ�მ�გზ�ვნის ს�შუ�ლებ�ს თქვენი პ�რ�ლის დ�ვიწყების შემთხვევ�ში.
+�სევე შეგიძლი�თ ს�შუ�ლებ� მისცეთ სხვ� მ�მხმ�რებლებს დ�გიკ�ვშირდნენ თქვენი მ�მხმ�რებლის გვერდის �ნ გ�ნხილვის გვერდის მეშვე�ბით თქვენი ვინ��ბის ჩვენების ს�ჭირ�ების გ�რეშე.',
 'prefs-help-email-required'  => 'თქვენი ელ-ფ�სტის მის�მ�რთი �უცილებელი�.',
 'nocookiesnew'               => 'მ�მხმ�რებლის ჩ�ნ�წერი შექმნილი�, მ�გრ�მ თქვენ �რ გ�გივლი�თ რეგისტრ�ცი�. {{SITENAME}} იყენებს cookies, რ�მლებიც თქვენს ბრ�უზერში გ�თიშული�. გთხ�ვთ, ��მ�ქმედ�თ ისინი დ� შემდგ�მ ხელ�ხლ� გ�ი�რეთ რეგისტრ�ცი�.',
 'nocookieslogin'             => '{{SITENAME}} მ�მხმ�რებლების შესვლისთვის იყენებს "ქუქის ჩ�ნ�წერს". თქვენ იგი გ�თიშეთ. გთხ�ვთ, ჩ�რთ�თ ისინი დ� ხელმე�რედ მ�სინჯ�თ.',
@@ -453,13 +499,14 @@ $2',
 ბ�რ�ტ�დ გ�მ�ყენების თ�ვიდ�ნ �ცილებისთვის, მხ�ლ�დ ერთი შეხსენებ� იგზ�ვნებ� ყ�ველ
 $1 ს��თში.',
 'mailerror'                  => 'შეცდ�მ� ფ�სტის გ�გზ�ვნ�ში: $1',
-'acct_creation_throttle_hit' => 'თქვენ უკვე შექმენით $1 �ნგ�რიში. მეტის შექმნ� �რ შეგიძლი�თ.',
-'emailauthenticated'         => 'თქვენი ელ. ფ�სტის მის�მ�რთი გ�დ�მ�წმებული� $1-ზე.',
+'acct_creation_throttle_hit' => 'ბ�დიში, თქვენ უკვე შექმენით $1 �ნგ�რიში.
+მეტის შექმნ� �რ შეგიძლი�თ.',
+'emailauthenticated'         => 'თქვენი ელ. ფ�სტის მის�მ�რთი გ�დ�მ�წმებული� $2 $3-ზე.',
 'emailnotauthenticated'      => 'თქვენი ელ. ფ�სტის მის�მ�რთი ჯერ �რ �რის გ�დ�მ�წმებული. შემდეგი ფუნქციები გ�მ�რთული�.',
-'noemailprefs'               => '<strong>თქვენ �რ გ�ქვთ ელ. ფ�სტის მის�მ�რთი მითითებული,</strong>�ღნიშნული ფუნქციები �მის გ�მ� �რ დრ�ისთვის შეუძლებელი�.',
+'noemailprefs'               => 'თქვენ �რ გ�ქვთ ელ. ფ�სტის მის�მ�რთი მითითებული,�ღნიშნული ფუნქციები �მის გ�მ� �რ დრ�ისთვის შეუძლებელი�.',
 'emailconfirmlink'           => 'დ��დ�სტურეთ თქვენი ელ. ფ�სტის მის�მ�რთი',
-'invalidemailaddress'        => 'ელ. ფ�სტის მის�მ�რთის ფ�რმ�ტში შეცდ�მ� უნდ� იყ�ს.
-გთხვ�თ ხელ�ხლ� შეიყვ�ნ�თ იგი �ნ წ�შ�ლ�თ ეს ველი.',
+'invalidemailaddress'        => 'ელ. ფ�სტის მის�მ�რთი �რ იქნ� მიღებული, ვინ�იდ�ნ იგი �რ�სწ�რი ფ�რმ�ტით�� წ�რმ�დგენილი.
+გთხ�ვთ, სწ�რ�დ შეიყვ�ნ�თ იგი �ნ წ�შ�ლ�თ ეს ველი.',
 'accountcreated'             => '�ნგ�რიში შეიქმნ�',
 'accountcreatedtext'         => 'მ�მხმ�რებლის �ნგ�რიში $1-სთვის შექმნილი�.',
 'createaccount-title'        => '�ნგ�რიშის შექმნ� {{SITENAME}}-თვის',
@@ -469,13 +516,17 @@ $1 ს��თში.',
 'loginlanguagelabel'         => 'ენ�: $1',
 
 # Password reset dialog
-'resetpass'           => 'შეცვ�ლეთ �ნგ�რიშის პ�რ�ლი',
-'resetpass_announce'  => 'თქვენ შემ�ხვედით დრ�ებით ელ-ფ�სტის კ�დით. რეგისტრ�ციის დ�სრულებისთვის, უნდ� შექმნ�თ �ხ�ლი პ�რ�ლი �ქ:',
-'resetpass_text'      => '<!-- დ�მ�ტებითი ტექსტი �ქ -->',
-'resetpass_header'    => 'გ�იმე�რეთ პ�რ�ლი',
-'resetpass_submit'    => 'მიუთითეთ პ�რ�ლი დ� დ�რეგისტრირდით',
-'resetpass_success'   => 'თქვენი პ�რ�ლი წ�რმ�ტებით შეიცვ�ლ�! �მჟ�მ�დ რეგისტრირდებით...',
-'resetpass_forbidden' => 'პ�რ�ლის შეცვლ� შეუძლებელი�',
+'resetpass'               => 'შეცვ�ლეთ პ�რ�ლი',
+'resetpass_announce'      => 'თქვენ შემ�ხვედით დრ�ებით ელ-ფ�სტის კ�დით. რეგისტრ�ციის დ�სრულებისთვის, უნდ� შექმნ�თ �ხ�ლი პ�რ�ლი �ქ:',
+'resetpass_text'          => '<!-- დ�მ�ტებითი ტექსტი �ქ -->',
+'resetpass_header'        => 'შეცვ�ლეთ �ნგ�რიშის პ�რ�ლი',
+'oldpassword'             => 'ძველი პ�რ�ლი:',
+'newpassword'             => '�ხ�ლი პ�რ�ლი:',
+'retypenew'               => '�ხ�ლი პ�რ�ლი გ�ნმე�რებით:',
+'resetpass_submit'        => 'მიუთითეთ პ�რ�ლი დ� დ�რეგისტრირდით',
+'resetpass_success'       => 'თქვენი პ�რ�ლი წ�რმ�ტებით შეიცვ�ლ�! �მჟ�მ�დ რეგისტრირდებით...',
+'resetpass_forbidden'     => 'პ�რ�ლის შეცვლ� შეუძლებელი�',
+'resetpass-temp-password' => 'დრ�ებითი პ�რ�ლი:',
 
 # Edit page toolbar
 'bold_sample'     => 'მუქი ტექსტი',
@@ -499,8 +550,8 @@ $1 ს��თში.',
 'hr_tip'          => 'ჰ�რიზ�ნტ�ლური ხ�ზი (ნუ გ�მ�იყენებთ ხშირ�დ)',
 
 # Edit pages
-'summary'                   => 'რეზიუმე',
-'subject'                   => 'თემ�/ს�თ�ური',
+'summary'                   => 'რეზიუმე:',
+'subject'                   => 'თემ�/ს�თ�ური:',
 'minoredit'                 => 'მცირე რედ�ქტირებ�',
 'watchthis'                 => 'უთვ�ლთვ�ლე �მ გვერდს',
 'savearticle'               => 'შენ�ხვ�',
@@ -513,8 +564,8 @@ $1 ს��თში.',
 თუ ისევ დ��წკ�პუნებთ შენ�ხვ�ზე, თქვენი რედ�ქტირებ� რეზიუმეს გ�რეშე დ�მ�ხს�ვრდებ�.",
 'missingcommenttext'        => 'გთხ�ვთ კ�მენტ�რი შეიყვ�ნ�თ ქვემ�თ.',
 'missingcommentheader'      => "'''შეხსენებ�:''' თქვენ �მ კ�მენტ�რისთვის ს�თ�ური/თემ� �რ მიგითითები�თ. თუ შენ�ხვ�ზე დ��წკ�პუნებთ, თქვენი ცვლილებ� მის გ�რეშე იქნებ� შენ�ხული.",
-'summary-preview'           => 'რეზიუმეს წინ�სწ�რი გ�დ�ხედვ�',
-'subject-preview'           => 'თემის/ს�თ�ურის წინ�სწ�რი გ�დ�ხედვ�',
+'summary-preview'           => 'რეზიუმეს წინ�სწ�რი გ�დ�ხედვ�:',
+'subject-preview'           => 'თემის/ს�თ�ურის წინ�სწ�რი გ�დ�ხედვ�:',
 'blockedtitle'              => 'მ�მხმ�რებელი ბლ�კირებული�',
 'blockedtext'               => '<big>\'\'\'თქვენი მ�მხმ�რებლის ს�ხელი �ნ IP მის�მ�რთი დ�ბლ�კილ იქნ�.\'\'\'</big>
 
@@ -564,23 +615,26 @@ $1 ს��თში.',
 (იხ. [[{{MediaWiki:Helppage}}|დ�ხმ�რების გვერდი]] დ�მ�ტებითი ინფ�რმ�ციისთვის).
 თუ �მ გვერდზე შეცდ�მით მ�ხვდით, დ�ბრუნდით უკ�ნ თქვენი ბრ�უზერის მეშვე�ბით.',
 'anontalkpagetext'          => "----''ეს �რის �ნ�ნიმური მ�მხმ�რებლის გ�ნხილვის გვერდი, რ�მელს�ც �ნგ�რიში ჯერ �რ შეუქმნი� �ნ �რ იყენებს მ�ს. შეს�ბ�მის�დ, ჩვენ მისი ციფრული IP მის�მ�რთი უნდ� გ�მ�ვიყენ�თ მისი იდენტიფიცირებისთვის. �მგვ�რი მის�მ�რთი შეიძლებ� რ�მდენიმე მ�მხმ�რებელმ� გ�მ�იყენ�ს. თუ თქვენ �ნ�ნიმური მ�მხმ�რებელი ხ�რთ დ� თვლით, რ�მ სხვისთვის გ�მიზნული მითითებ� მიიღეთ, გთხ�ვთ [[Special:UserLogin|შექმენით �ნგ�რიში �ნ დ�რეგისტრირდით]] მ�მ�ვ�ლში გ�უგებრ�ბის თ�ვიდ�ნ �ს�ცილებლ�დ.''",
-'noarticletext'             => '�მჟ�მ�დ �მ გვერდზე ტექსტი �რ �რსებ�ბს, თქვენ შგიძლი�თ [[Special:Search/{{PAGENAME}}|მ�ძებნ�თ �მ გვერდის ს�თ�ური]] სხვ� გვერდებზე �ნ [{{fullurl:{{FULLPAGENAME}}|action=edit}} დ�იწყ�თ �მ გვერდის რედ�ქტირებ�].',
+'noarticletext'             => '�მჟ�მ�დ �მ გვერდზე ტექსტი �რ �რსებ�ბს.
+თქვენ შეგიძლი�თ [[Special:Search/{{PAGENAME}}|მ�ძებნ�თ �მ გვერდის ს�თ�ური]] სხვ� გვერდებზე,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} მ�ძებნ�თ შეს�ბ�მისი ჟურნ�ლები],
+�ნ [{{fullurl:{{FULLPAGENAME}}|action=edit}} დ�იწყ�თ �მ გვერდის რედ�ქტირებ�]</span>.',
 'clearyourcache'            => "'''შენიშვნ�:''' შენ�ხვის შემდეგ შეს�ძლ�� დ�გჭირდეთ ბრ�უზერის ქეშის გ�წმენდ� ცვლილებების ს�ნ�ხ�ვ�დ. '''Mozilla / Firefox / Safari:''' დ��ჭირეთ ''Shift'' ''Reload''-ზე დ�წკ�პების�ს, �ნ დ��ჭირეთ ''Ctrl-Shift-R'' (''Cmd-Shift-R'' Apple Mac-ზე); '''IE:''' დ��ჭირეთ ''Ctrl'' ''Refresh''-ზე დ�წკ�პების�ს, �ნ დ��ჭირეთ ''Ctrl-F5''; '''Konqueror:''': მხ�ლ�დ დ��წკ�პეთ ''Reload'' ღილ�კს, �ნ დ��ჭირეთ ''F5''; '''Opera''' შეს�ძლ�� ს�ჭირ� გ�ხდეს ქეშის სრული�დ გ�წმენდ� ''Tools→Preferences''-დ�ნ.",
-'usercssjsyoucanpreview'    => "<strong>რჩევ�:</strong> შენ�ხვ�მდე გ�მ�იყენეთ 'წინ�სწ�რი გ�დ�ხედვის' ღილ�კი თქვენი �ხ�ლი CSS/JS ტესტირებისთვის.",
+'usercssjsyoucanpreview'    => "'''რჩევ�:''' შენ�ხვ�მდე გ�მ�იყენეთ 'წინ�სწ�რი გ�დ�ხედვის' ღილ�კი თქვენი �ხ�ლი CSS/JS ტესტირებისთვის.",
 'usercsspreview'            => "'''დ�იმ�ხს�ვრეთ, რ�მ თქვენ მხ�ლ�დ წინ�სწ�რ გ�დ�ხედვ�ს უყურებთ თქვენს მ�მხმ�რებლის CSS-ს, ის ჯერ შენ�ხული �რ �რის!'''",
 'userjspreview'             => "'''გ�ხს�ვდეთ, რ�მ თქვენ მხ�ლ�დ ტესტირებ�ს უკეთებთ �ნ �კვირდებით წინ�სწ�რ ხედს თქვენი მ�მხმ�რებლის ჯ�ვ�სკრიპტს - ის ჯერ �რ �რის დ�მ�ხს�ვრებული!'''",
 'updated'                   => '(გ�ნ�ხლდ�)',
-'note'                      => '<strong>შენიშვნ�:</strong>',
-'previewnote'               => '<strong>ეს მხ�ლ�დ ნიმუში�; ცვლილებები ჯერ �რ შენ�ხულ�!</strong>',
+'note'                      => "'''შენიშვნ�:'''",
+'previewnote'               => "'''ეს მხ�ლ�დ ნიმუში�; ცვლილებები ჯერ �რ შენ�ხულ�!'''",
 'previewconflict'           => 'შ�ვი ნიმუში უჩვენებს ტექსტს ზედ� რედ�ქტირების ფ�ნჯ�რ�ში, რ�გ�რც ის გ�მ�ჩნდებ� თუ თქვენ მ�ს შეინ�ხ�ვთ.',
-'session_fail_preview'      => '<strong>უკ�ცრ�ვ�დ! ვერ შევძელით თქვენი რედ�ქტირების შენ�ხვ� სესიის მ�ნ�ცემთ� დ�კ�რგვის გ�მ�.
+'session_fail_preview'      => "'''უკ�ცრ�ვ�დ! ვერ შევძელით თქვენი რედ�ქტირების შენ�ხვ� სესიის მ�ნ�ცემთ� დ�კ�რგვის გ�მ�.
 გთხ�ვთ ისევ სც�დ�თ.
-თუ პრ�ბლემ� გ�ნმე�რდ�, სც�დეთ [[Special:UserLogout|სისტემიდ�ნ გ�სვლ�]] დ� ხელ�ხლ� შემ�სვლ�.</strong>',
-'session_fail_preview_html' => "<strong>ბ�დიში! ჩვენ ვერ გ�ნვ�ხ�რციელეთ თქვენი რედ�ქტირებ� სესიის მ�ნ�ცემთ� დ�კ�რგვის გ�მ�.</strong>
+თუ პრ�ბლემ� გ�ნმე�რდ�, სც�დეთ [[Special:UserLogout|სისტემიდ�ნ გ�სვლ�]] დ� ხელ�ხლ� შემ�სვლ�.'''",
+'session_fail_preview_html' => "'''ბ�დიში! ჩვენ ვერ გ�ნვ�ხ�რციელეთ თქვენი რედ�ქტირებ� სესიის მ�ნ�ცემთ� დ�კ�რგვის გ�მ�.'''
 
 ''რ�დგ�ნ�ც �მ ვიკის �ქვს დ�უმუშ�ვებელი HTML ჩ�რთული, წინ�სწ�რი გ�დ�ხედვ� დ�მ�ლული� ჯ�ვ�სკრიპტის შეტევის ს�წინ��ღმდეგ�დ სიფრთხილის მიზნით.''
 
-<strong>თუ ეს მიღებული რედ�ქტირების მცდელ�ბ� იყ�, გთხ�ვთ ისევ სც�დ�თ. თუ იგი კვლ�ვ �რ მუშ��ბს, სც�დეთ თ�ვიდ�ნ დ�რეგისტრირებ� (შესვლ�)</strong>",
+'''თუ ეს მიღებული რედ�ქტირების მცდელ�ბ� იყ�, გთხ�ვთ ისევ სც�დ�თ. თუ იგი კვლ�ვ �რ მუშ��ბს, სც�დეთ თ�ვიდ�ნ დ�რეგისტრირებ� (შესვლ�)'''",
 'editing'                   => 'რედ�ქტირებ� - $1',
 'editingsection'            => 'რედ�ქტირებ� - $1 (სექცი�)',
 'editingcomment'            => 'რედ�ქტირებ�: $1 (კ�მენტ�რი)',
@@ -588,21 +642,21 @@ $1 ს��თში.',
 'explainconflict'           => 'სხვ� მ�მხმ�რებელმ� შეცვ�ლ� ეს გვერდი მ�ს შემდეგ რ�ც თქვენ დ�იწყეთ მისი რედ�ტირებ�. ზედ� ტექსტური ველი შეიც�ვს გვერდის შიგთ�ვსს მისი �მჟ�მინდელი ს�ხით. თქვენი ცვლილებები ნ�ჩვენები� ქვედ� ტექსტურ ველში. თქვენ მ�გიწევთ თქვენი ცვლილებების შერწყმ� �რსებულ ტექსტთ�ნ. <b>მხ�ლ�დ</b> ზედ� ველში �რსებული ტექსტი იქნებ� შენ�ხული, რ�დეს�ც "გვერდის შენ�ხვ�ს" დ��ჭერთ.<br />',
 'yourtext'                  => 'თქვენი ტექსტი',
 'storedversion'             => 'შენ�ხული ვერსი�',
-'nonunicodebrowser'         => '<strong>გ�ფრთხილებ�: თქვენი ბრ�უზერი უნიკ�დთ�ნ თ�ვსებ�დი �რ �რის. ჩვენ ვცდილ�ბთ �მ პრ�ბლემის გ�დ�ჭრ�ს, რ�თ� თქვენ შეძლ�თ უს�ფრთხ�დ შეიტ�ნ�თ ცვლილებები გვერდებზე: �რ�-ASCII ნიშნები რედ�ქტირების ფ�ნჯ�რ�ში გ�მ�ჩნდებ� რ�გ�რც ჰექს�დეციმ�ლური კ�დები.</strong>',
-'editingold'                => '<strong>ყურ�დღებ�: თქვენ �მუშ�ვებთ �მ გვერდის მ�ძველებულ ვერსი�ს. გვერდის შენ�ხვის შემდეგ მ�მდევნ� ვერსიებში გ�კეთებული ცვლილებები დ�იკ�რგებ�.</strong>',
+'nonunicodebrowser'         => "'''გ�ფრთხილებ�: თქვენი ბრ�უზერი უნიკ�დთ�ნ თ�ვსებ�დი �რ �რის. ჩვენ ვცდილ�ბთ �მ პრ�ბლემის გ�დ�ჭრ�ს, რ�თ� თქვენ შეძლ�თ უს�ფრთხ�დ შეიტ�ნ�თ ცვლილებები გვერდებზე: �რ�-ASCII ნიშნები რედ�ქტირების ფ�ნჯ�რ�ში გ�მ�ჩნდებ� რ�გ�რც ჰექს�დეციმ�ლური კ�დები.'''",
+'editingold'                => "'''ყურ�დღებ�: თქვენ �მუშ�ვებთ �მ გვერდის მ�ძველებულ ვერსი�ს. გვერდის შენ�ხვის შემდეგ მ�მდევნ� ვერსიებში გ�კეთებული ცვლილებები დ�იკ�რგებ�.'''",
 'yourdiff'                  => 'გ�ნსხვ�ვებები',
-'copyrightwarning'          => 'ყურ�დღებ� მი�ქციეთ: ნებისმიერი წვლილი გვერდზე {{SITENAME}} $2 ლიცენზი�ს ექვემდებ�რებ� (იხ. $1 დეტ�ლებისთვის). თუ �რ გსურთ თქვენი ნ�მუშევ�რი თ�ვისუფლ�დ გ�ვრცელდეს დ� მისი დ�უნდ�ბელი რედ�ქტირებ� მ�ხდეს, მ�შინ ნუ შეიყვ�ნთ მ�ს �ქ.<br />
+'copyrightwarning'          => "ყურ�დღებ� მი�ქციეთ: ნებისმიერი წვლილი გვერდზე {{SITENAME}} $2 ლიცენზი�ს ექვემდებ�რებ� (იხ. $1 დეტ�ლებისთვის). თუ �რ გსურთ თქვენი ნ�მუშევ�რი თ�ვისუფლ�დ გ�ვრცელდეს დ� მისი დ�უნდ�ბელი რედ�ქტირებ� მ�ხდეს, მ�შინ ნუ შეიყვ�ნთ მ�ს �ქ.<br />
 თქვენ �სევე პირ�ბ�ს დებთ, რ�მ ეს თქვენი დ�წერილი�, �ნ გ�დმ�ღებული� ს�ზ�გ�დ�ებრივი დ�მენიდ�ნ, �ნ მსგ�ვსი თ�ვისუფ�ლი წყ�რ�დ�ნ.
-<strong>ნუ შემ�იტ�ნთ ს��ვტ�რ� უფლებებით დ�ცულ ნ�შრ�მს �ვტ�რის თ�ნხმ�ბის გ�რეშე!</strong>',
-'copyrightwarning2'         => '*გ�ითვ�ლისწინეთ, რ�მ ნებისმიერი წვლილი {{SITENAME}}-ში შეიძლებ� ჩ�სწ�რდეს, შეიცვ�ლ�ს �ნ წ�იშ�ლ�ს სხვ� რედ�ქტ�რების მიერ.
+'''ნუ შემ�იტ�ნთ ს��ვტ�რ� უფლებებით დ�ცულ ნ�შრ�მს �ვტ�რის თ�ნხმ�ბის გ�რეშე!'''",
+'copyrightwarning2'         => "*გ�ითვ�ლისწინეთ, რ�მ ნებისმიერი წვლილი {{SITENAME}}-ში შეიძლებ� ჩ�სწ�რდეს, შეიცვ�ლ�ს �ნ წ�იშ�ლ�ს სხვ� რედ�ქტ�რების მიერ.
 *თუ �რ გსურთ, რ�მ თქვენი ნ�მუშევ�რი შეუზღუდ�ვ�დ იქნეს რედ�ქტირებული, მ�ს �ქ ნუ გ�ნ�თ�ვსებთ.<br />
 *თქვენ �გრეთვე პირ�ბ�ს დებთ, რ�მ თქვენს მიერ გ�ნთ�ვსებული ტექსტი თქვენი დ�წერილი�, �ნ გ�დმ�წერილი� ს�ზ�გ�დ�ებრივი დ�მენიდ�ნ �ნ მსგ�ვსი თ�ვისუფ�ლი წყ�რ�დ�ნ. (იხ. $1 დეტ�ლებისთვის).
-*<strong>ნუ შემ�იტ�ნთ ს��ვტ�რ� უფლებებით დ�ცულ ნ�შრ�მს �ვტ�რის ნებ�რთვის გ�რეშე!</strong>',
-'longpagewarning'           => '<strong>გ�ფრთხილებ�: ეს გვერდი $1 კილ�ბ�იტი�; ზ�გიერთ ბრ�უზერს უჭირს გვერდების რედ�ქტირებ�, რ�მელთ� ზ�მ� �ღემ�ტებ� 32 კბ-ს. გთხ�ვთ იქ�ნი�თ მხედეველ�ბ�ში შედ�რებით მცირე სექციებ�დ გვერდის გ�ყ�ფ�.</strong>',
-'longpageerror'             => '<strong>შეცდ�მ�: თქვენს მიერ შემ�ტ�ნილი ტექსტი $1 კილ�ბ�იტი�, რ�ც �ღემ�ტებ� მ�ქსიმ�ლურ�დ დ�ს�შვებ $2 კბ-ს. მისი შენ�ხვ� შეუძლებელი�.</strong>',
-'readonlywarning'           => '<strong>გ�ფრთხილებ�: მ�ნ�ცემთ� ბ�ზ� დ�ხურული� პერი�დული შემ�წმებისთვის, შეს�ბ�მის�დ თქვენ ვერ შეძლებთ რედ�ქტირებ�ს �მ მ�მენტში.
-ს�სურველი� ტექსტის �სლი შეინ�ხ�თ ტექსტურ რედ�ქტ�რში დ� მ�გვი�ნებით შემ�იტ�ნ�თ.</strong>',
-'protectedpagewarning'      => '<strong>გ�ფრთხილებ�:  ეს გვერდი დ�ბლ�კილი� დ� მისი რედ�ქტირებ� შეუძლი�თ მხ�ლ�დ მ�მხმ�რებლებს sysop პრივილეგიებით.</strong>',
+*'''ნუ შემ�იტ�ნთ ს��ვტ�რ� უფლებებით დ�ცულ ნ�შრ�მს �ვტ�რის ნებ�რთვის გ�რეშე!'''",
+'longpagewarning'           => "'''გ�ფრთხილებ�: ეს გვერდი $1 კილ�ბ�იტი�; ზ�გიერთ ბრ�უზერს უჭირს გვერდების რედ�ქტირებ�, რ�მელთ� ზ�მ� �ღემ�ტებ� 32 კბ-ს. გთხ�ვთ იქ�ნი�თ მხედეველ�ბ�ში შედ�რებით მცირე სექციებ�დ გვერდის გ�ყ�ფ�.'''",
+'longpageerror'             => "'''შეცდ�მ�: თქვენს მიერ შემ�ტ�ნილი ტექსტი $1 კილ�ბ�იტი�, რ�ც �ღემ�ტებ� მ�ქსიმ�ლურ�დ დ�ს�შვებ $2 კბ-ს. მისი შენ�ხვ� შეუძლებელი�.'''",
+'readonlywarning'           => "'''გ�ფრთხილებ�: მ�ნ�ცემთ� ბ�ზ� დ�ხურული� პერი�დული შემ�წმებისთვის, შეს�ბ�მის�დ თქვენ ვერ შეძლებთ რედ�ქტირებ�ს �მ მ�მენტში.
+ს�სურველი� ტექსტის �სლი შეინ�ხ�თ ტექსტურ რედ�ქტ�რში დ� მ�გვი�ნებით შემ�იტ�ნ�თ.'''",
+'protectedpagewarning'      => "'''გ�ფრთხილებ�:  ეს გვერდი დ�ბლ�კილი� დ� მისი რედ�ქტირებ� შეუძლი�თ მხ�ლ�დ მ�მხმ�რებლებს sysop პრივილეგიებით.'''",
 'semiprotectedpagewarning'  => "'''შენიშვნ�:''' ეს გვერდი დ�ბლ�კილი� დ� მისი რედ�ქტირებ� მხ�ლ�დ რეგისტრირებულ მ�მხმ�რებლებს შეუძლი�თ.",
 'cascadeprotectedwarning'   => "'''გ�ფრთხილებ�:''' ეს გვერდი ჩ�კეტილი� ისე რ�მ მისი რედ�ქტირებ� მხ�ლ�დ �დმინისტრ�ტ�რებს შეუძლი�, რ�დგ�ნ იგი ეკუთვნის შემდეგ კ�სკ�დურ�დ დ�ცვის {{PLURAL:$1|გვერდს|გვერდებს}}:",
 'templatesused'             => '�მ გვერდზე გ�მ�ყენებული თ�რგები:',
@@ -618,6 +672,10 @@ $1 ს��თში.',
 
 გთხ�ვთ დ�ფიქრდეთ, მის�ღები �რის თუ �რ� �მ გვერდის რედ�ქტირების გ�გრძელებ�.
 ინფ�რმ�ციისთვის ქვემ�თ მ�ყვ�ნილი� �მ გვერდის წ�შლის ისტ�რი�:",
+'deletelog-fulllog'         => 'სრული ჟურნ�ლის ნ�ხვ�',
+'edit-conflict'             => 'რედ�ქციების კ�ნფლიქტი.',
+'edit-already-exists'       => '�ხ�ლი გვერდის შექმნ� �რ მ�ხერხდ�.
+ის უკვე �რსებ�ბს.',
 
 # "Undo" feature
 'undo-success' => 'რედ�ქტირების გ�უქმებ� შეს�ძლებელი�. გთხ�ვთ შე�მ�წმ�თ გ�ნსხვ�ვებ� ქვევით, რ�თ� დ�რწმუნდეთ, რ�მ ეს ის �რის რ�ც თქვენ გსურთ, შემდეგ კი შეინ�ხეთ ცვლილებები რ�თ� დ��სრულ�თ რედ�ქტირების გ�უქმებ�.',
@@ -628,28 +686,28 @@ $1 ს��თში.',
 'cantcreateaccounttitle' => '�ნგ�რიშის შექმნ� ვერ ხერხდებ�',
 
 # History pages
-'viewpagelogs'        => '�მ გვერდისთვის ს�რეგისტრ�ცი� ჟურნ�ლების ჩვენებ�',
-'nohistory'           => '�მ გვერდს გ�ნხილვის გვერდი ც�რიელი �ქვს.',
-'revnotfound'         => 'ცვლილებ� ვერ ვიპ�ვეთ',
-'currentrev'          => 'მიმდინ�რე შესწ�რებ�',
-'revisionasof'        => '$1-ის ვერსი�',
-'revision-info'       => '$1-ის ვერსი�, შეტ�ნილი $2-ის მიერ',
-'previousrevision'    => '�წინ� ვერსი�',
-'nextrevision'        => 'შემდეგი ვერსი�→',
-'currentrevisionlink' => 'მიმდინ�რე ვერსი�',
-'cur'                 => 'მიმდ.',
-'next'                => 'შემდეგი',
-'last'                => 'ბ�ლ�',
-'page_first'          => 'პირველი',
-'page_last'           => 'ბ�ლ�',
-'histlegend'          => '*ვერსიის დ�თვ�ლიერებ�: დ��წკ�პუნეთ ს�სურველი ვერსიის თ�რიღზე მის დ�ს�თვ�ლიერებლ�დ.
+'viewpagelogs'           => '�მ გვერდისთვის ს�რეგისტრ�ცი� ჟურნ�ლების ჩვენებ�',
+'nohistory'              => '�მ გვერდს გ�ნხილვის გვერდი ც�რიელი �ქვს.',
+'currentrev'             => 'მიმდინ�რე შესწ�რებ�',
+'revisionasof'           => '$1-ის ვერსი�',
+'revision-info'          => '$1-ის ვერსი�, შეტ�ნილი $2-ის მიერ', # Additionally available: $3: revision id
+'previousrevision'       => '�წინ� ვერსი�',
+'nextrevision'           => 'შემდეგი ვერსი�→',
+'currentrevisionlink'    => 'მიმდინ�რე ვერსი�',
+'cur'                    => 'მიმდ.',
+'next'                   => 'შემდეგი',
+'last'                   => 'ბ�ლ�',
+'page_first'             => 'პირველი',
+'page_last'              => 'ბ�ლ�',
+'histlegend'             => '*ვერსიის დ�თვ�ლიერებ�: დ��წკ�პუნეთ ს�სურველი ვერსიის თ�რიღზე მის დ�ს�თვ�ლიერებლ�დ.
 *ვერსიების შედ�რებ�: �ირჩიეთ ს�სურველი ვერსიები რ�დი�-რგ�ლების მ�ნიშვნით დ� დ��წკ�პუნეთ შედ�რების ღილ�კზე.
 *შემ�კლებები: (მიმდ.) = სხვ��ბ� მიმდინ�რე ვერსი�სთ�ნ, (ბ�ლ�) = სხვ��ბ� წინ� ვერსი�სთ�ნ, მ = მცირე შესწ�რებ�.',
-'deletedrev'          => '[წ�შლილი�]',
-'histfirst'           => 'პირველი',
-'histlast'            => 'უკ�ნ�სკნელი',
-'historysize'         => '($1 ბ�იტი)',
-'historyempty'        => '(ც�რიელი)',
+'history-fieldset-title' => 'დ�თვ�ლიერების ისტ�რი�',
+'deletedrev'             => '[წ�შლილი�]',
+'histfirst'              => 'პირველი',
+'histlast'               => 'უკ�ნ�სკნელი',
+'historysize'            => '($1 ბ�იტი)',
+'historyempty'           => '(ც�რიელი)',
 
 # Revision feed
 'history-feed-title'          => 'რედ�ქტირების ისტ�რი�',
@@ -674,6 +732,7 @@ $1 ს��თში.',
 'pagehist'               => 'გვერდის ისტ�რი�',
 'deletedhist'            => 'წ�შლილი ისტ�რი�',
 'revdelete-content'      => 'შინ��რსი',
+'revdelete-uname'        => 'მ�მხმ�რებლის ს�ხელი',
 
 # History merging
 'mergehistory'                => 'გვერდების ისტ�რიის შერწყმ�',
@@ -689,28 +748,44 @@ $1 ს��თში.',
 'compareselectedversions' => '�რჩეული ვერსიების შედ�რებ�',
 'editundo'                => 'გ�უქმებ�',
 'diff-multi'              => '({{PLURAL:$1|ერთი|$1}} შუ� ვერსი� �რ �რის ნ�ჩვენები.)',
+'diff-src'                => 'წყ�რ�',
+'diff-width'              => 'სიგ�ნე',
+'diff-height'             => 'სიმ�ღლე',
+'diff-big'                => "'''დიდი'''",
 
 # Search results
-'searchresults'         => 'ძიების შედეგები',
-'searchresulttext'      => 'მეტი ინფ�რმ�ციის�თვის ვიკიპედიის ს�ძიებლის შეს�ხებ გთხ�ვთ ნ�ხ�თ [[{{ns:project}}:ძიებ�|ძიებ� {{SITENAME}}]].',
-'searchsubtitle'        => "თქვენ მ�იძიეთ '''[[:$1]]'''",
-'searchsubtitleinvalid' => "თქვენ მ�იძიეთ '''$1'''",
-'noexactmatch'          => "'''გვერდი �მ ს�თ�ურით \"\$1\" �რ �რსებ�ბს.''' თქვენ შეგიძლი�თ [[:\$1|შექმნ�თ ეს გვერდი]].",
-'noexactmatch-nocreate' => "'''გვერდი �მ ს�თ�ურით \"\$1\" �რ �რსებ�ბს.'''",
-'titlematches'          => 'სტ�ტიის ს�თ�ური შეეს�ბ�მებ�',
-'notitlematches'        => '�რ შეეს�ბ�მებ� �რცერთი გვერდის ს�თ�ური',
-'textmatches'           => 'გვერდის ტექსტი შეს�ბ�მისი�',
-'notextmatches'         => '�რ შეეს�ბ�მებ� �რცერთი გვერდის ტექსტი',
-'prevn'                 => 'წინ� $1',
-'nextn'                 => 'შემდეგი $1',
-'viewprevnext'          => 'იხილე  ($1) ($2) ($3).',
-'search-result-size'    => '$1 ($2 სიტყვ�)',
-'searchall'             => 'ყველ�',
-'showingresults'        => 'ქვემ�თ იხილეთ <b>$1</b>-მდე შედეგი დ�წყებული #<b>$2</b>-იდ�ნ.',
-'showingresultsnum'     => 'ქვემ�თ იხილეთ <b>$3</b> შედეგი დ�წყებული #<b>$2</b>-იდ�ნ.',
-'nonefound'             => "'''შენიშვნ�''':წ�რუმ�ტებელი ძებნ� შეიძლებ� გ�მ�წვეული იყ� ს�ერთ� სიტყვების ცდით, რ�მლებიც ინდექსირებ�ს �რ ექვემდებ�რებ�.",
-'powersearch'           => 'ძიებ�',
-'searchdisabled'        => '{{SITENAME}}ში ძებნ� გ�უქმებული�. თქვენ შეგიძლი�თ დრ�ის შუ�ლედით Google-ით ძებნ�. მი�ქციეთ ყურ�დღებ�, რ�მ {{SITENAME}}ში შეს�ძლებელი� მ�თი ინდექსები �ქტუ�ლური �რ �რის.',
+'searchresults'                => 'ძიების შედეგები',
+'searchresults-title'          => 'ძიების შედეგები "$1"',
+'searchresulttext'             => 'მეტი ინფ�რმ�ციის�თვის ვიკიპედიის ს�ძიებლის შეს�ხებ გთხ�ვთ ნ�ხ�თ [[{{ns:project}}:ძიებ�|ძიებ� {{SITENAME}}]].',
+'searchsubtitle'               => "თქვენ მ�იძიეთ '''[[:$1]]'''",
+'searchsubtitleinvalid'        => "თქვენ მ�იძიეთ '''$1'''",
+'noexactmatch'                 => "'''გვერდი �მ ს�თ�ურით \"\$1\" �რ �რსებ�ბს.''' თქვენ შეგიძლი�თ [[:\$1|შექმნ�თ ეს გვერდი]].",
+'noexactmatch-nocreate'        => "'''გვერდი �მ ს�თ�ურით \"\$1\" �რ �რსებ�ბს.'''",
+'titlematches'                 => 'სტ�ტიის ს�თ�ური შეეს�ბ�მებ�',
+'notitlematches'               => '�რ შეეს�ბ�მებ� �რცერთი გვერდის ს�თ�ური',
+'textmatches'                  => 'გვერდის ტექსტი შეს�ბ�მისი�',
+'notextmatches'                => '�რ შეეს�ბ�მებ� �რცერთი გვერდის ტექსტი',
+'prevn'                        => 'წინ� $1',
+'nextn'                        => 'შემდეგი $1',
+'viewprevnext'                 => 'იხილე  ($1) ($2) ($3).',
+'searchhelp-url'               => 'Help:დ�ხმ�რებ�',
+'searchprofile-project'        => 'პრ�ექტის გვერდები',
+'searchprofile-images'         => 'ფ�ილები',
+'searchprofile-everything'     => 'ყველ�ფერი',
+'searchprofile-images-tooltip' => 'ფ�ილების ძიებ�',
+'search-result-size'           => '$1 ($2 სიტყვ�)',
+'search-section'               => '(სექცი� $1)',
+'search-interwiki-caption'     => 'დ�ბილი პრ�ექტები',
+'search-interwiki-default'     => 'შედეგები $1-დ�ნ:',
+'search-interwiki-more'        => '(გ�გრძელებ�)',
+'search-mwsuggest-enabled'     => 'რჩევებით',
+'search-mwsuggest-disabled'    => 'რჩევების გ�რეშე',
+'searchall'                    => 'ყველ�',
+'showingresults'               => 'ქვემ�თ იხილეთ <b>$1</b>-მდე შედეგი დ�წყებული #<b>$2</b>-იდ�ნ.',
+'showingresultsnum'            => 'ქვემ�თ იხილეთ <b>$3</b> შედეგი დ�წყებული #<b>$2</b>-იდ�ნ.',
+'nonefound'                    => "'''შენიშვნ�''':წ�რუმ�ტებელი ძებნ� შეიძლებ� გ�მ�წვეული იყ� ს�ერთ� სიტყვების ცდით, რ�მლებიც ინდექსირებ�ს �რ ექვემდებ�რებ�.",
+'powersearch'                  => 'ძიებ�',
+'searchdisabled'               => '{{SITENAME}}ში ძებნ� გ�უქმებული�. თქვენ შეგიძლი�თ დრ�ის შუ�ლედით Google-ით ძებნ�. მი�ქციეთ ყურ�დღებ�, რ�მ {{SITENAME}}ში შეს�ძლებელი� მ�თი ინდექსები �ქტუ�ლური �რ �რის.',
 
 # Preferences page
 'preferences'              => 'კ�ნფიგურ�ცი�',
@@ -726,6 +801,7 @@ $1 ს��თში.',
 'qbsettings-floatingright' => 'მ�რჯვნივ მცურ�ვი',
 'changepassword'           => 'პ�რ�ლის შეცვლ�',
 'skin'                     => 'გ�რეკ�ნი',
+'skin-preview'             => 'წინ�სწ�რი გ�დ�ხედვ�',
 'math'                     => 'მ�თემ�ტიკ�',
 'dateformat'               => 'თ�რიღის ფ�რმ�ტი',
 'datedefault'              => 'წყ�რ� მითითებული �რ��',
@@ -737,14 +813,14 @@ $1 ს��თში.',
 'prefs-rc'                 => 'ბ�ლ� ცვლილებები',
 'prefs-watchlist'          => 'კ�ნტრ�ლის სი�',
 'prefs-watchlist-days'     => 'კ�ნტრ�ლის სი�ში ს�ჩვენებელი დღეები:',
+'prefs-watchlist-days-max' => '(მ�ქსიმუმ 7 დღე)',
 'prefs-watchlist-edits'    => 'ცვლილებების მ�ქსიმ�ლური რ��დენ�ბის ჩვენებ� ვრცელ კ�ნტრ�ლის სი�ში:',
 'prefs-misc'               => 'სხვ�დ�სხვ�',
+'prefs-resetpass'          => 'შეცვ�ლეთ პ�რ�ლი',
 'saveprefs'                => 'შენ�ხვ�',
 'resetprefs'               => 'გ�დ�ტვირთვ�',
-'oldpassword'              => 'ძველი პ�რ�ლი:',
-'newpassword'              => '�ხ�ლი პ�რ�ლი:',
-'retypenew'                => '�ხ�ლი პ�რ�ლი გ�ნმე�რებით:',
 'textboxsize'              => 'რედ�ქტირებ�',
+'prefs-edit-boxsize'       => 'რედ�ქტირების ფ�ნჯრის ზ�მ�.',
 'rows'                     => 'რიგები:',
 'columns'                  => 'სვეტები',
 'searchresultshead'        => 'ძიებ�',
@@ -755,12 +831,15 @@ $1 ს��თში.',
 'recentchangescount'       => 'რედ�ქციების რ��დენ�ბ� ბ�ლ� ცვლილებებში, ისტ�რი�ში დ� ჟურნ�ლებში ს�ჩვენებლ�დ:',
 'savedprefs'               => 'თქვენს მიერ შერჩეული პ�რ�მეტრები დ�მ�ხს�ვრებული�.',
 'timezonelegend'           => 'დრ�ის ზ�ნ�',
-'timezonetext'             => 'ს��თების რ��დენ�ბ�, რ�მლით�ც თქვენი �დგილ�ბრივი დრ� გ�ნსხვ�ვდებ� სერვერის დრ�ის�გ�ნ (UTC).',
-'localtime'                => '�დგილ�ბრივი დრ�',
-'timezoneoffset'           => '�ფსეტი¹',
-'servertime'               => 'სერვერის დრ�',
+'timezonetext'             => '¹ს��თების რ��დენ�ბ�, რ�მლით�ც თქვენი �დგილ�ბრივი დრ� გ�ნსხვ�ვდებ� სერვერის დრ�ის�გ�ნ (UTC).',
+'localtime'                => '�დგილ�ბრივი დრ�:',
+'timezoneselect'           => 'დრ�ის ს�რტყელი:',
+'timezoneoffset'           => 'გ�ნსხვ�ვებ�¹:',
+'servertime'               => 'სერვერის დრ�:',
 'guesstimezone'            => 'ბრ�უზერიდ�ნ შევსებ�',
 'allowemail'               => 'სხვ� მ�მხმ�რებლებისგ�ნ ელ. ფ�სტის მიღების ნებ�რთვ�',
+'prefs-searchoptions'      => 'ძიების პ�რ�მეტრები',
+'prefs-namespaces'         => 'ს�ხელთ� სივრცეები',
 'defaultns'                => 'სტ�ნდ�რტული ძიებ� �მ ს�ხელთ� სივრცეებში:',
 'default'                  => 'სტ�ნდ�რტული',
 'files'                    => 'ფ�ილები',
@@ -770,7 +849,7 @@ $1 ს��თში.',
 'userrights-lookup-user'      => 'მ�მხმ�რებელთ� ჯგუფების მ�რთვ�',
 'userrights-user-editname'    => 'მ�მხმ�რებლის ს�ხელის შეტ�ნ�:',
 'editusergroup'               => 'მ�მხმ�რებელთ� ჯგუფების რედ�ქტირებ�',
-'editinguser'                 => "მ�მხმ�რებლის '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) უფლებების შეცვლ�",
+'editinguser'                 => "მ�მხმ�რებლის '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) უფლებების შეცვლ�",
 'userrights-editusergroup'    => 'რედ�ქტირებ� გ�უკეთეთ მ�მხმ�რებელთ� ჯგუფებს',
 'saveusergroups'              => 'მ�მხმ�რებელთ� ჯგუფების შენ�ხვ�',
 'userrights-groupsmember'     => 'ჯგუფის წევრი:',
@@ -806,6 +885,7 @@ $1 ს��თში.',
 'right-createtalk'    => 'გ�ნხილვის გვერდების შექმნ�',
 'right-minoredit'     => 'ცვლილებების მითითებ�, რ�გ�რც "მცირე რედ�ქტირებ�"',
 'right-move'          => 'გვერდების გ�დ�ტ�ნ�',
+'right-movefile'      => 'ფ�ილების გ�დ�ტ�ნ�',
 'right-upload'        => 'ფ�ილების �ტვირთვ�',
 'right-delete'        => 'გვერდების წ�შლ�',
 'right-browsearchive' => 'წ�შლილი გვერდების ძიებ�',
@@ -816,9 +896,21 @@ $1 ს��თში.',
 'rightslog'  => 'მ�მხმ�რებლის უფლებების ჟურნ�ლი',
 'rightsnone' => '(�რცერთი)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit'          => '�მ გვერდის რედ�ქტირებ�',
+'action-createpage'    => 'გვერდების შექმნ�',
+'action-createtalk'    => 'გ�ნხილვის გვერდების შექმნ�',
+'action-createaccount' => '�მ �ნგ�რიშის შექმნ�',
+'action-minoredit'     => 'მ�ნიშვნ�, რ�გ�რც მცირე რედ�ქტირებ�',
+'action-move'          => '�მ გვერდის გ�დ�ტ�ნ�',
+'action-delete'        => '�მ გვერდის წ�შლ�',
+'action-block'         => '�მ მ�მხმ�რებლისთვის რედ�ქტირების დ�ბლ�კვ�',
+'action-autopatrol'    => 'თქვენი ცვლილების მ�ნიშვნ� პ�ტრულირებ�დით',
+
 # Recent changes
 'nchanges'                          => '$1 ცვლილებ�',
 'recentchanges'                     => 'ბ�ლ� ცვლილებები',
+'recentchanges-legend'              => 'ბ�ლ� ცვლილებების პ�რ�მეტრები',
 'recentchangestext'                 => 'უთვ�ლთვ�ლეთ ვიკიში ბ�ლ� ცვლილებებს �მ გვერდზე.',
 'recentchanges-feed-description'    => 'ვიკის უ�ხლესი ცვლილებების მეთვ�ლყურე�ბ� �მ �რხში.',
 'rcnote'                            => "ქვემ�თ იხილეთ ბ�ლ� '''$1''' ცვლილებ� უკ�ნ�სკნელი '''$2''' დღის მ�ნძილზე, $5, $4 მდგ�მ�რე�ბით.",
@@ -842,6 +934,7 @@ $1 ს��თში.',
 'rc_categories'                     => 'მხ�ლ�დ კ�ტეგ�რიებიდ�ნ (გ�ნ�ც�ლკევეთ "|"-ის მიხედვით)',
 'rc_categories_any'                 => 'ნებისმიერი',
 'newsectionsummary'                 => '/* $1 */ �ხ�ლი სექცი�',
+'rc-enhanced-hide'                  => 'დეტ�ლების დ�მ�ლვ�',
 
 # Recent changes linked
 'recentchangeslinked'          => 'დ�კ�ვშირებული ცვლილებები',
@@ -849,6 +942,7 @@ $1 ს��თში.',
 'recentchangeslinked-noresult' => 'მითითებულ პერი�დში ცვლილებები დ�კ�ვშირებულ გვერდებზე �რ მ�მხდ�რ�.',
 'recentchangeslinked-summary'  => "ეს �რის მითითებულ გვერდთ�ნ (�ნ მითითებული კ�ტეგ�რიის წევრებთ�ნ) დ�კ�ვშირებულ გვერდებში ბ�ლ� დრ�ს გ�ნხ�რციელებული ცვლილებების სი�. 
 გვერდები [[Special:Watchlist|თქვენი კ�ნტრ�ლის სი�ში]] გ�მ�ყ�ფილი� '''სქლ�დ'''.",
+'recentchangeslinked-page'     => 'გვერდის დ�ს�ხელებ�:',
 
 # Upload
 'upload'                      => 'ფ�ილის დ�მ�ტებ�',
@@ -892,14 +986,14 @@ $1 ს��თში.',
 'large-file'                  => 'ს�სურველი� ფ�ილი �რ �ღემ�ტებ�დეს $1-ს; ეს ფ�ილი� $2.',
 'largefileserver'             => 'ეს ფ�ილი სერვერის მიერ დ�შვებულ ზ�მ�ს �ღემ�ტებ�.',
 'emptyfile'                   => 'თქვენს მიერ ჩ�ტვირთული ფ�ილი ც�რიელი�. შეს�ძლ��, შეცდ�მ� მ�ხდ� ფ�ილის ს�ხელის �კრეფის დრ�ს. გთხ�ვთ შე�მ�წმ�თ ნ�მდვილ�დ გსურთ თუ �რ� �მ ფ�ილის ჩ�ტვირთვ�.',
-'fileexists'                  => 'ფ�ილი �მ ს�ხელით უკვე �რსებ�ბს, გთხ�ვთ შე�მ�წმ�თ <strong><tt>$1</tt></strong> თუ �რ� ხ�რთ დ�რწმუნებული, რ�მ მისი შეცვლ� ნ�მდვილ�დ გსურთ.',
-'fileexists-extension'        => 'ფ�ილი მსგ�ვსი ს�ხელით �რსებ�ბს:<br />
-�ს�ტვირთი ფ�ილის ს�ხელი: <strong><tt>$1</tt></strong><br />
-�რსებული ფ�ილის ს�ხელი: <strong><tt>$2</tt></strong><br />
-გთხ�ვთ გ�ნსხვ�ვებული ს�ხელი �ირჩი�თ.',
+'fileexists'                  => "ფ�ილი �მ ს�ხელით უკვე �რსებ�ბს, გთხ�ვთ შე�მ�წმ�თ '''<tt>$1</tt>''' თუ �რ� ხ�რთ დ�რწმუნებული, რ�მ მისი შეცვლ� ნ�მდვილ�დ გსურთ.",
+'fileexists-extension'        => "ფ�ილი მსგ�ვსი ს�ხელით �რსებ�ბს:<br />
+�ს�ტვირთი ფ�ილის ს�ხელი: '''<tt>$1</tt>'''<br />
+�რსებული ფ�ილის ს�ხელი: '''<tt>$2</tt>'''<br />
+გთხ�ვთ გ�ნსხვ�ვებული ს�ხელი �ირჩი�თ.",
 'fileexists-thumb'            => "'''<center>�რსებული სურ�თი</center>'''",
 'fileexists-forbidden'        => 'ფ�ილი �მ ს�ხელით უკვე �რსებ�ბს; გთხ�ვთ დ�ბრუნდეთ უკ�ნ დ� �ტვირთ�თ ფ�ილი �ხ�ლი ს�ხელით. [[სურ�თი:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'ფ�ილი �მ ს�ხელწ�დებით უკვე �რსებ�ბს ფ�ილების ს�ერთ� ს�ც�ვში. თუ შეიძლებ�, უკ�ნ დ�ბრუნდით დ� ჩ�ტვირთეთ ფ�ილი სხვ� ს�ხელწ�დებით. [[Image:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'ფ�ილი �მ ს�ხელწ�დებით უკვე �რსებ�ბს ფ�ილების ს�ერთ� ს�ც�ვში. თუ შეიძლებ�, უკ�ნ დ�ბრუნდით დ� ჩ�ტვირთეთ ფ�ილი სხვ� ს�ხელწ�დებით. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'წ�რმ�ტებული გ�დ�ტვირთვ�',
 'uploadwarning'               => 'გ�დ�ტვირთვის შეხსენებ�',
 'savefile'                    => 'ფ�ილის შენ�ხვ�',
@@ -932,17 +1026,18 @@ $1 ს��თში.',
 'nolicense'          => '�რ�ფერი �რის მ�ნიშნული',
 'upload_source_file' => ' (ფ�ილი შენს კ�მპიუტერზე)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'ძიებ� სურ�თის ს�ხელის მიხედვით:',
+# Special:ListFiles
+'listfiles_search_for'  => 'ძიებ� სურ�თის ს�ხელის მიხედვით:',
 'imgfile'               => 'ფ�ილი',
-'imagelist'             => 'სურ�თების სი�',
-'imagelist_date'        => 'თ�რიღი',
-'imagelist_name'        => 'ს�ხელი',
-'imagelist_user'        => 'მ�მხმ�რებელი',
-'imagelist_size'        => 'ზ�მ� (ბ�იტები)',
-'imagelist_description' => '�ღწერილ�ბ�',
-
-# Image description page
+'listfiles'             => 'სურ�თების სი�',
+'listfiles_date'        => 'თ�რიღი',
+'listfiles_name'        => 'ს�ხელი',
+'listfiles_user'        => 'მ�მხმ�რებელი',
+'listfiles_size'        => 'ზ�მ� (ბ�იტები)',
+'listfiles_description' => '�ღწერილ�ბ�',
+'listfiles_count'       => 'ვერსიები',
+
+# File description page
 'filehist'                       => 'ფ�ილის ისტ�რი�',
 'filehist-help'                  => 'დ��წკ�პუნეთ თ�რიღზე/დრ�ზე, რ�თ� იხილ�თ ფ�ილი, რ�გ�რც ის მ�შინ გ�მ�იყურებ�დ�.',
 'filehist-deleteall'             => 'წ�შ�ლე ყველ�',
@@ -950,11 +1045,12 @@ $1 ს��თში.',
 'filehist-revert'                => 'დ��ბრუნე',
 'filehist-current'               => 'მიმდინ�რე',
 'filehist-datetime'              => 'თ�რიღი/დრ�',
+'filehist-thumb'                 => 'მინი�ტურ�',
 'filehist-user'                  => 'მ�მხმ�რებელი',
 'filehist-dimensions'            => 'გ�ნზ�მილებები',
 'filehist-filesize'              => 'ფ�ილის ზ�მ�',
 'filehist-comment'               => 'კ�მენტ�რი',
-'imagelinks'                     => 'ბმულები',
+'imagelinks'                     => 'ფ�ილების ბმულები',
 'linkstoimage'                   => 'მ�მდევნ� {{PLURAL:$1|გვერდი|გვერდები}} ებმის �მ ფ�ილს:',
 'nolinkstoimage'                 => '�რ �რსებ�ბს �მ ფ�ილთ�ნ დ�კ�ვშირებული გვერდები.',
 'sharedupload'                   => 'ეს ფ�ილი ჩ�ტვირთული� ს�ერთ� ს�რგებლ�ბის�თვის დ� შეიძლებ� გ�მ�ყენებულ იქნეს სხვ� პრ�ექტების მიერ.',
@@ -984,7 +1080,6 @@ $1 ს��თში.',
 'filedelete-success'          => "'''$1''' წ�შლილი�.",
 'filedelete-nofile'           => "'''$1''' �რ �რსებ�ბს.",
 'filedelete-nofile-old'       => "მითითებული �ტრიბუტებით '''$1'''-ის �რქივირებული ვერსი� �რ �რსებ�ბს.",
-'filedelete-iscurrent'        => 'თქვენ ცდილ�ბთ �მ ფ�ილის ყველ�ზე �ხ�ლი ვერსიის წ�შლ�ს. გთხ�ვთ, ის ჯერ წინ� ვერსი�ზე გ�დ�იტ�ნ�თ.',
 'filedelete-otherreason'      => 'სხვ�/დ�მ�ტებითი მიზეზი:',
 'filedelete-reason-otherlist' => 'სხვ� მიზეზი',
 'filedelete-edit-reasonlist'  => 'წ�შლის მიზეზების რედ�ქტირებ�',
@@ -1002,30 +1097,27 @@ $1 ს��თში.',
 
 # Unused templates
 'unusedtemplates'     => 'გ�მ�უყენებელი თ�რგები',
-'unusedtemplatestext' => 'ეს გვერდი თ�რგების ს�ხელთ� სივრცეში მ�იც�ვს ყველ� იმ გვერდის ჩ�მ�ნ�თვ�ლს, რ�მელიც �რ �რის მ�თ�ვსებული სხვ� გვერდებზე. გ�ხს�ვდეთ თ�რგების  სხვ� ბმულებს  ს�ნ�მ წ�შლით შე�მ�წმეთ.',
+'unusedtemplatestext' => 'ეს გვერდი ს�ხელთ� სივრცეში "{{ns:template}}" მ�იც�ვს ყველ� იმ გვერდის ჩ�მ�ნ�თვ�ლს, რ�მელიც �რ �რის მ�თ�ვსებული სხვ� გვერდებზე.
+გ�ხს�ვდეთ თ�რგების სხვ� ბმულებს ს�ნ�მ წ�შლით შე�მ�წმეთ.',
 'unusedtemplateswlh'  => 'სხვ� ბმულები',
 
 # Random page
 'randompage'         => 'ნებისმიერი გვერდი',
-'randompage-nopages' => '�მ ს�ხელთ� სივრცეში �რ �რის გვერდები.',
+'randompage-nopages' => 'ს�ხელთ� სივრცეში "$1" �რ �რის გვერდები.',
 
 # Random redirect
 'randomredirect'         => 'ნებისმიერი გ�დ�მის�მ�რთებ�',
-'randomredirect-nopages' => '�მ ს�ხელთ� სივრცეში გ�დ�მის�მ�რთებები �რ �რის.',
+'randomredirect-nopages' => 'ს�ხელთ� სივრცეში "$1" �რ �რის გ�დ�მის�მ�რთებები.',
 
 # Statistics
-'statistics'             => 'სტ�ტისტიკ�',
-'sitestats'              => 'ს�იტის სტ�ტისტიკ�',
-'userstats'              => 'მ�მხმ�რებლის სტ�ტისტიკ�',
-'sitestatstext'          => "მ�ნ�ცემთ� ბ�ზ�ში სულ �რის '''$1''' გვერდი. მ�სში შედის: სტ�ტიების ''გ�ნხილვის'' გვერდები, გვერდები {{SITENAME}} შეს�ხებ, გ�დ�მის�მ�რთების გვერდები, �გრეთვე სხვები, რ�მლებიც  შეს�ძლ�� �რ წ�რმ��დგენს �ენციკლ�პედიურ გვერდებს�. �მის გ�თვ�ლისწინებით, სრულფ�ს�ვნ�დ მიჩნეული�  '''$2''' გვერდი.
-
-�ტვირთული� '''$8''' ფ�ილი.
-
-ვიკის დ��რსებიდ�ნ დღემდე გვერდები დ�თვ�ლიერებულ იქნ� '''$3'''-ჯერ, ხ�ლ� რედ�ქტირებ� გ�ნხ�რციელდ� '''$4'''-ჯერ. ეს ნიშნ�ვს, რ�მ ყ�ველ გვერდზე ს�შუ�ლ�დ მ�დის '''$6''' დ�თვ�ლიერებ� დ� '''$5''' რედ�ქტირებ�.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue დ�ვ�ლებ�თ� რიგის] სიგრძე� '''$7'''.",
-'userstatstext'          => "�რსებ�ბენ '''$1''' რეგისტრირებული მ�მხმ�რებელი, რ�მელთ� შ�რის '''$2''' (�ნ '''$4%''') �დმინისტრ�ტ�რი�. (იხილეთ $3).",
-'statistics-mostpopular' => 'ყველზე ხშირ�დ ხილვ�დი გვერდები',
+'statistics'              => 'სტ�ტისტიკ�',
+'statistics-header-pages' => 'გვერდების სტ�ტისტიკ�',
+'statistics-header-users' => 'მ�მხმ�რებლის სტ�ტისტიკ�',
+'statistics-pages'        => 'გვერდები',
+'statistics-files'        => '�ვტვირთული ფ�ილები',
+'statistics-users'        => 'დ�რეგისტრირებული [[Special:ListUsers|მ�მხმ�რებლები]]',
+'statistics-users-active' => '�ქტიური მ�მხმ�რებლები',
+'statistics-mostpopular'  => 'ყველზე ხშირ�დ ხილვ�დი გვერდები',
 
 'disambiguations'     => 'მრ�ვ�ლმნიშვნელ�ვ�ნი გვერდები',
 'disambiguationspage' => 'Template:მრ�ვ�ლმნიშვნელ�ვ�ნი',
@@ -1063,6 +1155,8 @@ $1 ს��თში.',
 'popularpages'            => 'პ�პულ�რული გვერდები',
 'wantedcategories'        => 'მ�თხ�ვნილი კ�ტეგ�რიები',
 'wantedpages'             => 'მ�თხ�ვნილი გვერდები',
+'wantedfiles'             => 'მ�თხ�ვნილი ფ�ილები',
+'wantedtemplates'         => 'მ�თხ�ვნილი თ�რგები',
 'mostlinked'              => 'ყველ�ზე მეტი ბმულების მქ�ნე გვერდები',
 'mostlinkedcategories'    => 'ყველ�ზე მეტი ბმულების მქ�ნე კ�ტეგ�რიები',
 'mostlinkedtemplates'     => 'ყველ�ზე მეტი ბმულების მქ�ნე თ�რგები',
@@ -1077,6 +1171,7 @@ $1 ს��თში.',
 'protectedpages'          => 'დ�ცული გვერდები',
 'protectedtitles'         => 'დ�ცული ს�თ�ურები',
 'listusers'               => 'მ�მხმ�რებლების სი�',
+'usereditcount'           => '$1 რედ�ქტირებ�',
 'newpages'                => '�ხ�ლი გვერდები',
 'newpages-username'       => 'მ�მხმ�რებლის ს�ხელი:',
 'ancientpages'            => 'ხ�ნდ�ზმული გვერდები',
@@ -1101,7 +1196,6 @@ $1 ს��თში.',
 'speciallogtitlelabel' => 'ს�თ�ური:',
 'log'                  => 'ჟურნ�ლები',
 'all-logs-page'        => 'ყველ� ჟურნ�ლი',
-'log-search-submit'    => 'ძიებ�',
 'alllogstext'          => '�ტვირთვის, წ�შლის, დ�ცვის, ბლ�კირების დ� �დმინისტრ�ტ�რის ჟურნ�ლის კ�მბინირებული �ს�ხვ�. შეგიძლი�თ გ�ფილტრ�თ ჟურნ�ლის ტიპით, მ�მხმ�რებლის ს�ხელით �ნ სტ�ტიის მიხედვით.',
 'logempty'             => 'რეზულტ�ტები �რ �რის სი�ში.',
 
@@ -1126,10 +1220,21 @@ $1 ს��თში.',
 'categoriespagetext'          => 'ვიკიპედი�ში შემდეგი კ�ტეგ�რიები�.',
 'special-categories-sort-abc' => '�ნბ�ნზე დ�ლ�გებ�',
 
+# Special:LinkSearch
+'linksearch'    => 'გ�რე ბმულები',
+'linksearch-ns' => 'ს�ხელთ� სივრცე:',
+'linksearch-ok' => 'ძიებ�',
+
 # Special:ListUsers
 'listusers-submit'   => 'ჩვენებ�',
 'listusers-noresult' => 'მ�მხმ�რებელი ვერ ვიპ�ვეთ.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'მ�მხმ�რებლის რეგისტრ�ციის ჟურნ�ლი',
+'newuserlog-byemail'          => 'პ�რ�ლი ელ-ფ�სტით�� გ�მ�გზ�ვნილი',
+'newuserlog-create-entry'     => '�ხ�ლი მ�მხმ�რებელი',
+'newuserlog-autocreate-entry' => '�ვტ�მ�ტურ�დ შექმნილი �ნგ�რიში',
+
 # Special:ListGroupRights
 'listgrouprights-group'    => 'ჯგუფი',
 'listgrouprights-rights'   => 'უფლებები',
@@ -1185,12 +1290,6 @@ $1 ს��თში.',
 'iteminvalidname'      => "'$1' - პრ�ბლემ� �ქვს, ს�ხელი �რ�სწ�რი�...",
 'wlnote'               => 'ქვემ�თ მ�ყვ�ნილი� ბ�ლ� $1 ცვლილებ� უკ�ნ�სკნელი <b>$2</b> ს��თის გ�ნმ�ვლ�ბ�ში.',
 'wlshowlast'           => '�ჩვენე ბ�ლ� $1 ს��თის $2 დღის $3',
-'watchlist-show-bots'  => '�ჩვენე რ�ბ�ტის ცვლილებები',
-'watchlist-hide-bots'  => 'რ�ბ�ტის ცვლილებების დ�მ�ლვ�',
-'watchlist-show-own'   => '�ჩვენე ჩემი ცვლილებები',
-'watchlist-hide-own'   => 'ჩემი რედ�ქტირების დ�მ�ლვ�',
-'watchlist-show-minor' => '�ჩვენე მცირე ცვლილებები',
-'watchlist-hide-minor' => 'მცირე რედ�ქტირებების დ�მ�ლვ�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'კ�ნტრ�ლებ�დი...',
@@ -1229,64 +1328,71 @@ $NEWPAGE
 შემდგ�მი დ�ხმ�რებ�:
 {{SERVER}}{{localurl:Help:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'გვერდის წ�შლ�',
-'confirm'                     => 'დ�დ�სტურებ�',
-'excontent'                   => "შინ��რსი იყ�: '$1'",
-'excontentauthor'             => "შინ��რსი იყ�: '$1' (დ� ერთ�დერთი �ვტ�რი იყ� '$2')",
-'exbeforeblank'               => "გვერდის შინ��რსი წ�შლ�მდე იყ� შემდეგი: '$1'",
-'exblank'                     => 'გვერდი ც�რიელი იყ�',
-'delete-confirm'              => '"$1"-ის წ�შლ�',
-'delete-legend'               => 'წ�შლ�',
-'historywarning'              => 'ყურ�დღებ�: გვერდს, რ�მლის წ�შლ�ს�ც �პირებთ, �ქვს ისტ�რი�:',
-'confirmdeletetext'           => 'თქვენ �პირებთ გვერდის �ნ გ�მ�ს�ხულების მისი ისტ�რიით მ�ნ�ცემთ� ბ�ზიდ�ნ ს�მუდ�მ�დ წ�შლ�ს. გთხ�ვთ დ��დ�სტურ�თ რ�მ გესმით �მის შედეგები დ� �კეთებთ �მ�ს [[{{ns:project}}:წესები]] თ�ნ�ხმ�დ.',
-'actioncomplete'              => 'მ�ქმედებ� შესრულებული�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" წ�შლილი�. ბ�ლ� წ�შლილი გვერდების სი� იხილეთ $2-ში.',
-'deletedarticle'              => 'წ�შლილი� "[[$1]]"',
-'dellogpage'                  => 'წ�შლილთ�_სი�',
-'dellogpagetext'              => 'ქვემ�თ იხილეთ �ხლ�დ წ�შლილთ� სი�.',
-'deletionlog'                 => 'წ�შლილთ� სი�',
-'reverted'                    => 'დ�ბრუნდ� წინ� ვერსი�ზე',
-'deletecomment'               => 'წ�შლის მიზეზი',
-'deleteotherreason'           => 'სხვ�/დ�მ�ტებითი მიზეზი:',
-'deletereasonotherlist'       => 'სხვ� მიზეზი',
-'deletereason-dropdown'       => '* წ�შლის ხშირი მიზეზები
+# Delete
+'deletepage'             => 'გვერდის წ�შლ�',
+'confirm'                => 'დ�დ�სტურებ�',
+'excontent'              => "შინ��რსი იყ�: '$1'",
+'excontentauthor'        => "შინ��რსი იყ�: '$1' (დ� ერთ�დერთი �ვტ�რი იყ� '$2')",
+'exbeforeblank'          => "გვერდის შინ��რსი წ�შლ�მდე იყ� შემდეგი: '$1'",
+'exblank'                => 'გვერდი ც�რიელი იყ�',
+'delete-confirm'         => '"$1"-ის წ�შლ�',
+'delete-legend'          => 'წ�შლ�',
+'historywarning'         => 'ყურ�დღებ�: გვერდს, რ�მლის წ�შლ�ს�ც �პირებთ, �ქვს ისტ�რი�:',
+'confirmdeletetext'      => 'თქვენ �პირებთ გვერდის �ნ გ�მ�ს�ხულების მისი ისტ�რიით მ�ნ�ცემთ� ბ�ზიდ�ნ ს�მუდ�მ�დ წ�შლ�ს. გთხ�ვთ დ��დ�სტურ�თ რ�მ გესმით �მის შედეგები დ� �კეთებთ �მ�ს [[{{ns:project}}:წესები]] თ�ნ�ხმ�დ.',
+'actioncomplete'         => 'მ�ქმედებ� შესრულებული�',
+'deletedtext'            => '"<nowiki>$1</nowiki>" წ�შლილი�. ბ�ლ� წ�შლილი გვერდების სი� იხილეთ $2-ში.',
+'deletedarticle'         => 'წ�შლილი� "[[$1]]"',
+'dellogpage'             => 'წ�შლილთ�_სი�',
+'dellogpagetext'         => 'ქვემ�თ იხილეთ �ხლ�დ წ�შლილთ� სი�.',
+'deletionlog'            => 'წ�შლილთ� სი�',
+'reverted'               => 'დ�ბრუნდ� წინ� ვერსი�ზე',
+'deletecomment'          => 'წ�შლის მიზეზი',
+'deleteotherreason'      => 'სხვ�/დ�მ�ტებითი მიზეზი:',
+'deletereasonotherlist'  => 'სხვ� მიზეზი',
+'deletereason-dropdown'  => '* წ�შლის ხშირი მიზეზები
 ** �ვტ�რის თხ�ვნით
 ** ს��ვტ�რ� უფლების დ�რღვევ�
 ** ვ�ნდ�ლიზმი',
-'delete-edit-reasonlist'      => 'წ�შლის მიზეზების რედ�ქტირებ�',
-'rollback'                    => 'რედ�ქტირების გ�უქმებ�',
-'rollback_short'              => 'გ�უქმებ�',
-'rollbacklink'                => 'გ�უქმებ�',
-'cantrollback'                => 'შეუძლებელი� უწინდელი რედ�ქციის �ღდგენ�; ის, ვინც უკ�ნ�სკნელი ცვლილებები შეიტ�ნ�, �მ სტ�ტიის ერთ�დერთი �ვტ�რი�.',
-'alreadyrolled'               => '[[:$1]]-ს უკ�ნ�სკნელი რედ�ქტირების უკუქცევ� შეუძლებელი� [[User:$2|$2]] ([[User talk:$2|Talk]]); ვიღ�ც�მ უკვე დ��რედ�ქტირ� �ნ უკუ�ქცი� გვერდი. უკ�ნ�სკნელი რედ�ქტ�რი [[User:$3|$3]] ([[User talk:$3|Talk]]).',
-'editcomment'                 => 'რედ�ქტირებ� გ�ნმ�რტებული იყ� შემდეგნ�ირ�დ: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]]-ის რედ�ქტირებ� გ�უქმდ�; �ღდგ� ბ�ლ�ს [[User:$1|$1]]-ის მიერ რედ�ქტირებული ვერსი�', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'sessionfailure'              => 'ჩ�ნს, რ�მ პრ�ბლემ�� თქვენი რეგისტრ�ციის სესიის�თვის;
+'delete-edit-reasonlist' => 'წ�შლის მიზეზების რედ�ქტირებ�',
+
+# Rollback
+'rollback'       => 'რედ�ქტირების გ�უქმებ�',
+'rollback_short' => 'გ�უქმებ�',
+'rollbacklink'   => 'გ�უქმებ�',
+'cantrollback'   => 'შეუძლებელი� უწინდელი რედ�ქციის �ღდგენ�; ის, ვინც უკ�ნ�სკნელი ცვლილებები შეიტ�ნ�, �მ სტ�ტიის ერთ�დერთი �ვტ�რი�.',
+'alreadyrolled'  => '[[:$1]]-ს უკ�ნ�სკნელი რედ�ქტირების უკუქცევ� შეუძლებელი� [[User:$2|$2]] ([[User talk:$2|Talk]]); ვიღ�ც�მ უკვე დ��რედ�ქტირ� �ნ უკუ�ქცი� გვერდი. უკ�ნ�სკნელი რედ�ქტ�რი [[User:$3|$3]] ([[User talk:$3|Talk]]).',
+'editcomment'    => "რედ�ქტირებ� გ�ნმ�რტებული იყ� შემდეგნ�ირ�დ: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => '[[Special:Contributions/$2|$2]]-ის რედ�ქტირებ� გ�უქმდ�; �ღდგ� ბ�ლ�ს [[User:$1|$1]]-ის მიერ რედ�ქტირებული ვერსი�', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'sessionfailure' => 'ჩ�ნს, რ�მ პრ�ბლემ�� თქვენი რეგისტრ�ციის სესიის�თვის;
 ეს მ�ქმედებ� შეჩერდ� თქვენი სესი�ში შემ�ჭრის თ�ვიდ�ნ �ს�ცილებლ�დ.
 გთხ�ვთ, დ��წკ�პუნ�თ ღილ�კს "უკ�ნ" დ� თ�ვიდ�ნ ჩ�რთ�თ გვერდი, რ�მლიდ�ნ�ც შემ�ხვედით დ� სც�დ�თ გ�ნმე�რებით.',
+
+# Protect
 'protectlogpage'              => 'დ�ცვის ისტ�რი�',
 'protectedarticle'            => 'დ�ცული� "[[$1]]"',
 'unprotectedarticle'          => 'დ�ცვ� მ�ხსნილი� "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] გ�დ�ტ�ნილი� გვერდზე [[$2]]',
 'protect-legend'              => 'დ�ცვის დ�დ�სტურებ�',
 'protectcomment'              => 'კ�მენტ�რი:',
 'protectexpiry'               => 'ვ�დ�',
 'protect_expiry_invalid'      => 'ვ�დის გ�სვლის დრ� �რ�სწ�რი�.',
 'protect_expiry_old'          => 'ვ�დის გ�სვლის დრ� წ�რსულში�.',
 'protect-unchain'             => 'გ�დ�ტ�ნის ნებ�რთვებზე ბლ�კის მ�ხსნ�',
-'protect-text'                => 'თქვენ შეგიძლი�თ �ქ იხილ�თ დ� შეცვ�ლ�თ დ�ცვის დ�ნე გვერდისთვის <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'თქვენს �ნგ�რიშს �რ �ქვს გვერდის დ�ცვის დ�ნეების შეცვლის ნებ�რთვ�.
-იხილეთ ქვემ�თ �მჟ�მინდელი პ�რ�მეტრები გვერდისთვის <strong>$1</strong>:',
+'protect-text'                => "თქვენ შეგიძლი�თ �ქ იხილ�თ დ� შეცვ�ლ�თ დ�ცვის დ�ნე გვერდისთვის '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "თქვენს �ნგ�რიშს �რ �ქვს გვერდის დ�ცვის დ�ნეების შეცვლის ნებ�რთვ�.
+იხილეთ ქვემ�თ �მჟ�მინდელი პ�რ�მეტრები გვერდისთვის '''$1''':",
 'protect-cascadeon'           => 'ეს გვერდი �მჟ�მ�დ დ�ცული�, ვინ�იდ�ნ იგი ნ�წილი� �მ {{PLURAL:$1|გვერდის, რ�მელს�ც|გვერდების, რ�მელთ�ც}} კ�სკ�დური დ�ცვ� �ქვს ჩ�რთული.
 თქვენ შეგიძლი�თ �მ გვერდის დ�ცვის დ�ნე შეცვ�ლ�თ, თუმც� ეს კ�სკ�დურ დ�ცვ�ზე გ�ვლენ�ს �რ იქ�ნიებს.',
 'protect-default'             => '(სტ�ნდ�რტული)',
 'protect-fallback'            => 'ს�ჭირ�� "$1"-ის უფლებ�',
-'protect-level-autoconfirmed' => '�რ�რეგისტრირებული მ�მხმ�რებლების დ�ბლ�კვ�',
+'protect-level-autoconfirmed' => '�ხ�ლი დ� �რ�რეგისტრირებული მ�მხმ�რებლების დ�ბლ�კვ�',
 'protect-level-sysop'         => 'მხ�ლ�დ �დმინისტრ�ტ�რები',
 'protect-summary-cascade'     => 'იერ�რქიული',
 'protect-expiring'            => 'ვ�დ� გ�სდის: $1 (UTC)',
+'protect-expiry-indefinite'   => 'გ�ნუს�ზღვრელი',
 'protect-cascade'             => '�მ გვერდში ჩ�რთული გვერდების დ�ცვ� (იერ�რქიული დ�ცვ�)',
 'protect-cantedit'            => 'თქვენ �რ შეგიძლი�თ �მ გვერდის დ�ცვის დ�ნის შეცვლ�, ვინ�იდ�ნ �რ გ�ქვთ მისი რედ�ქტირების ნებ�რთვ�.',
+'protect-expiry-options'      => '2 ს��თი:2 hours,1 დღე:1 day,3 დღე:3 days,1 კვირ�:1 week,2 კვირ�:2 weeks,1 თვე:1 month,3 თვე:3 months,6 თვე:6 months,1 წელი:1 year,გ�ნუს�ზღვრელი ვ�დით:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'უფლებ�',
 'restriction-level'           => 'შეზღუდვის დ�ნე:',
 'minimum-size'                => 'მინ ზ�მ�',
@@ -1305,31 +1411,33 @@ $NEWPAGE
 'restriction-level-all'           => 'ნებისმიერი დ�ნე',
 
 # Undelete
-'undelete'                 => '�ჩვენე წ�შლილი გვერდები',
-'undeletepage'             => 'იხილეთ დ� �ღ�დგინეთ წ�შლილი გვერდები',
-'viewdeletedpage'          => 'იხილეთ წ�შლილი გვერდები',
-'undeletepagetext'         => 'მ�მდევნ� გვრდები წ�შლილი�, მ�გრ�მ ჯერ კიდევ �რქივში� დ� შეს�ძლებელი� �ღდგენ�. �რქივი შეს�ძლებელი� პერი�დულ�დ გ�სუფთ�ვდეს.',
-'undeleteextrahelp'        => "�მ მთლი�ნი გვერდის �ღს�დგენ�დ, დ�ტ�ვეთ ყველ� მ�ს�ნიშნი უჯრ� მ�უნიშნ�ვ�დ დ� დ��წკ�პუნეთ '''�ღდგენ�'''. იმის�თვის, რ�მ მ��ხდინ�თ შერჩევითი �ღდგენ� მ�ნიშნეთ უჯრები ჩ�ს�ტ�რებელი ვერსიების შეს�ბ�მის�დ დ� დ��წკ�პუნეთ '''�ღდგენ�'''. '''გ�დ�ტვირთვ�ზე''' დ�წკ�პუნებით გ�უქმდებ� ყველ� კ�მენტ�რის ველი დ� ყველ� მ�ს�ნიშნი უჯრ�.",
-'undeleterevisions'        => '$1 ვერსიები დ��რქივებული�',
-'undeletehistory'          => 'თუ თქვენ �ღ�დგენთ გვერდს, ყველ� ვერსი� �ღდგებ� ისტ�რი�ში. თუ �ხ�ლი გვერდი იგივე ს�ხელით შეიქმნ� მისი წ�შლის შემდეგ, �ღდგენილი ვერსიები გ�მ�ჩნდებ� წინ� ისტ�რი�ში დ� მიმდინ�რე ვერსი� �ვტ�მ�ტურ�დ �რ ჩ�ნ�ცვლდებ�.',
-'undeletehistorynoadmin'   => 'ეს სტ�ტი� წ�შლილი�. წ�შლის მიზეზი ნ�ჩვენები� მ�კლე �ნ�ტ�ცი�ში ქვემ�თ, იმ მ�მხმ�რებელთ� დეტ�ლებთ�ნ ერთ�დ ვინც რედ�ქტირებ� გ�უკეთ� �მ გვერდს წ�შლის წინ. იმ წ�შლილი ტექსტების �ქტუ�ლური ვერსიები მიღწევ�დი� მხ�ლ�დ �დმინისტრ�ტ�რების�თვის.',
-'undelete-nodiff'          => 'წინ� ცვლილებ� ვერ ვიპ�ვეთ.',
-'undeletebtn'              => '�ღდგენ�',
-'undeletelink'             => '�ღდგენ�',
-'undeletereset'            => 'გ�დ�ტვირთეთ',
-'undeletecomment'          => 'კ�მენტ�რი:',
-'undeletedarticle'         => '�ღდგენილი� "[[$1]]"',
-'undeletedrevisions'       => '$1 ვერსი� �ღდგენილი�',
-'undeletedrevisions-files' => '$1 ვერსი� დ� $2 ფ�ილი �ღდგენილი�',
-'undeletedfiles'           => '$1 ფ�ილი �ღდგენილი�',
-'cannotundelete'           => 'წ�შლის გ�უქმებ� ვერ გ�ნხ�რციელდ�; შეს�ძლ�� თქვენ�მდე სხვ�მ უკვე გ��უქმ� წ�შლ�.',
-'undeletedpage'            => "<big>'''$1 �ღდგენილი�'''</big>
+'undelete'                  => '�ჩვენე წ�შლილი გვერდები',
+'undeletepage'              => 'იხილეთ დ� �ღ�დგინეთ წ�შლილი გვერდები',
+'viewdeletedpage'           => 'იხილეთ წ�შლილი გვერდები',
+'undeletepagetext'          => 'მ�მდევნ� {{PLURAL:$1|გვერდი|$1 გვერდი}} წ�შლილი�, მ�გრ�მ ჯერ კიდევ �რქივში� დ� შეს�ძლებელი� �ღდგენ�.
+�რქივი შეს�ძლებელი� პერი�დულ�დ გ�სუფთ�ვდეს.',
+'undeleteextrahelp'         => "�მ მთლი�ნი გვერდის �ღს�დგენ�დ, დ�ტ�ვეთ ყველ� მ�ს�ნიშნი უჯრ� მ�უნიშნ�ვ�დ დ� დ��წკ�პუნეთ '''�ღდგენ�'''. იმის�თვის, რ�მ მ��ხდინ�თ შერჩევითი �ღდგენ� მ�ნიშნეთ უჯრები ჩ�ს�ტ�რებელი ვერსიების შეს�ბ�მის�დ დ� დ��წკ�პუნეთ '''�ღდგენ�'''. '''გ�დ�ტვირთვ�ზე''' დ�წკ�პუნებით გ�უქმდებ� ყველ� კ�მენტ�რის ველი დ� ყველ� მ�ს�ნიშნი უჯრ�.",
+'undeleterevisions'         => '$1 ვერსიები დ��რქივებული�',
+'undeletehistory'           => 'თუ თქვენ �ღ�დგენთ გვერდს, ყველ� ვერსი� �ღდგებ� ისტ�რი�ში. თუ �ხ�ლი გვერდი იგივე ს�ხელით შეიქმნ� მისი წ�შლის შემდეგ, �ღდგენილი ვერსიები გ�მ�ჩნდებ� წინ� ისტ�რი�ში დ� მიმდინ�რე ვერსი� �ვტ�მ�ტურ�დ �რ ჩ�ნ�ცვლდებ�.',
+'undeletehistorynoadmin'    => 'ეს სტ�ტი� წ�შლილი�. წ�შლის მიზეზი ნ�ჩვენები� მ�კლე �ნ�ტ�ცი�ში ქვემ�თ, იმ მ�მხმ�რებელთ� დეტ�ლებთ�ნ ერთ�დ ვინც რედ�ქტირებ� გ�უკეთ� �მ გვერდს წ�შლის წინ. იმ წ�შლილი ტექსტების �ქტუ�ლური ვერსიები მიღწევ�დი� მხ�ლ�დ �დმინისტრ�ტ�რების�თვის.',
+'undelete-nodiff'           => 'წინ� ცვლილებ� ვერ ვიპ�ვეთ.',
+'undeletebtn'               => '�ღდგენ�',
+'undeletelink'              => '�ღდგენ�',
+'undeletereset'             => 'გ�დ�ტვირთეთ',
+'undeletecomment'           => 'კ�მენტ�რი:',
+'undeletedarticle'          => '�ღდგენილი� "[[$1]]"',
+'undeletedrevisions'        => '$1 ვერსი� �ღდგენილი�',
+'undeletedrevisions-files'  => '$1 ვერსი� დ� $2 ფ�ილი �ღდგენილი�',
+'undeletedfiles'            => '$1 ფ�ილი �ღდგენილი�',
+'cannotundelete'            => 'წ�შლის გ�უქმებ� ვერ გ�ნხ�რციელდ�; შეს�ძლ�� თქვენ�მდე სხვ�მ უკვე გ��უქმ� წ�შლ�.',
+'undeletedpage'             => "<big>'''$1 �ღდგენილი�'''</big>
 
 უკ�ნ�სკნელი წ�შლილთ� დ� �ღდგენის სი� შეგიძლი�თ ნ�ხ�თ [[Special:Log/delete|წ�შლილთ� სი�ში]].",
-'undelete-search-box'      => 'წ�შლილი გვერდების ძიებ�',
-'undelete-search-prefix'   => 'უჩვენეთ გვერდები, რ�მლებიც იწყებ� �მგვ�რ�დ:',
-'undelete-search-submit'   => 'ძიებ�',
-'undelete-error-short'     => 'შეცდ�მ� ფ�ილის წ�შლის გ�უქმებ�ში: $1',
+'undelete-search-box'       => 'წ�შლილი გვერდების ძიებ�',
+'undelete-search-prefix'    => 'უჩვენეთ გვერდები, რ�მლებიც იწყებ� �მგვ�რ�დ:',
+'undelete-search-submit'    => 'ძიებ�',
+'undelete-error-short'      => 'შეცდ�მ� ფ�ილის წ�შლის გ�უქმებ�ში: $1',
+'undelete-show-file-submit' => 'ჰ�',
 
 # Namespace form on various pages
 'namespace'      => 'ს�ხელთ� სივრცე:',
@@ -1337,13 +1445,14 @@ $NEWPAGE
 'blanknamespace' => '(მთ�ვ�რი)',
 
 # Contributions
-'contributions' => 'მ�მხმ�რებლის წვლილი',
-'mycontris'     => 'ჩემი წვლილი',
-'contribsub2'   => '$1 ($2) თვის',
-'nocontribs'    => 'ძებნის�ს მითითებული პ�რ�მეტრების შეს�ბ�მისი �რც ერთი ცვლილებ� ნ�პ�ვნი �რ �რის',
-'uctop'         => '(თ�ვი)',
-'month'         => 'თვე:',
-'year'          => 'წელი:',
+'contributions'       => 'მ�მხმ�რებლის წვლილი',
+'contributions-title' => 'მ�მხმ�რებლის წვლილი $1',
+'mycontris'           => 'ჩემი წვლილი',
+'contribsub2'         => '$1 ($2) თვის',
+'nocontribs'          => 'ძებნის�ს მითითებული პ�რ�მეტრების შეს�ბ�მისი �რც ერთი ცვლილებ� ნ�პ�ვნი �რ �რის',
+'uctop'               => '(თ�ვი)',
+'month'               => 'თვე:',
+'year'                => 'წელი:',
 
 'sp-contributions-newbies'     => 'მხ�ლ�დ �ხ�ლი მ�მხმ�რებლების წვლილის ჩვენებ�',
 'sp-contributions-newbies-sub' => '�ხ�ლბედებისთვის',
@@ -1356,11 +1465,11 @@ $NEWPAGE
 'whatlinkshere'            => 'ს�დ�� მითითებული ეს გვერდი',
 'whatlinkshere-title'      => 'გვერდები, რ�მლებიც შეიც�ვენ ბმულებს "$1"-ზე',
 'whatlinkshere-page'       => 'გვერდი:',
-'linklistsub'              => '(ბმულების სი�)',
 'linkshere'                => "მ�მდევნ� გვერდები შეიც�ვენ ბმულებს '''[[:$1]]'''-ზე:",
 'nolinkshere'              => "'''[[:$1]]'''-ზე ბმული �რ �რის.",
 'isredirect'               => 'გ�დ�მის�მ�რთების გვერდი',
 'istemplate'               => 'ჩ�რთვ�',
+'isimage'                  => 'სურ�თის ბმული',
 'whatlinkshere-prev'       => '{{PLURAL:$1|წინ�|წინ� $1}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|შემდეგი|შემდეგი $1}}',
 'whatlinkshere-links'      => '� ბმულები',
@@ -1407,6 +1516,7 @@ $NEWPAGE
 'ipblocklist-submit'       => 'ძიებ�',
 'blocklistline'            => '$1, $2 დ�ბლ�კ� $3 ($4)',
 'infiniteblock'            => 'უს�სრულ�',
+'expiringblock'            => 'ვ�დის გ�სვლის დრ� $1',
 'anononlyblock'            => 'მხ�ლ�დ �ნ�ნ.',
 'createaccountblock'       => '�ნგ�რიშის გ�ხსნ� ბლ�კირებული�',
 'emailblock'               => 'დ�იბლ�კ� ელ. ფ�სტ�',
@@ -1455,7 +1565,8 @@ $NEWPAGE
 
 �მ შემთხვევებში, თქვენ თ�ვ�დ მ�გიწევთ �მ გვერდის გ�დ�ტ�ნ�, სურვილის�მებრ.",
 'movearticle'             => 'გვერდის გ�დ�ტ�ნ�',
-'movenotallowed'          => 'თქვენ �რ გ�ქვთ {{SITENAME}}-ში გვერდების გ�დ�ტ�ნის უფლებ�.',
+'movenologin'             => 'რეგისტრ�ცი� ვერ გ�ი�რ�',
+'movenotallowed'          => 'თქვენ �რ გ�ქვთ გვერდების გ�დ�ტ�ნის უფლებ�.',
 'newtitle'                => '�ხ�ლი ს�თ�ური',
 'move-watch'              => '�მ გვერდის კ�ნტრ�ლი',
 'movepagebtn'             => 'გვერდის გ�დ�ტ�ნ�',
@@ -1505,6 +1616,7 @@ $NEWPAGE
 'import'                     => 'გვერდების იმპ�რტი',
 'import-interwiki-submit'    => 'იმპ�რტირებ�',
 'import-interwiki-namespace' => 'გვერდების გ�დ�ტ�ნ� ს�ხელთ� სივრცეში:',
+'import-comment'             => 'კ�მენტ�რი:',
 'importstart'                => 'გვერდების იმპ�რტი...',
 'import-revision-count'      => '$1 ცვლილებ�',
 'importnopages'              => 'იმპ�რტისთვის გვერდები �რ �რის.',
@@ -1521,16 +1633,16 @@ $NEWPAGE
 'import-logentry-interwiki-detail' => '$1 ცვლილებ� $2-დ�ნ',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'ჩემი მ�მხმ�რებლის გვერდი',
-'tooltip-pt-mytalk'               => 'ჩემი გ�ნხილვის გვერდი',
+'tooltip-pt-userpage'             => 'თქვენი მ�მხმ�რებლის გვერდი',
+'tooltip-pt-mytalk'               => 'თქვენი გ�ნხილვის გვერდი',
 'tooltip-pt-preferences'          => 'ჩემი კ�ნფიგურ�ცი�',
 'tooltip-pt-watchlist'            => 'გვერდების სი�, რ�მელთ� ცვლილებებს თქვენ უთვ�ლთვ�ლებთ',
-'tooltip-pt-mycontris'            => 'ჩემი წვლილის სი�',
+'tooltip-pt-mycontris'            => 'თქვენი წვლილის სი�',
 'tooltip-pt-login'                => 'ს�სურველი� დ�რეგისტრირდეთ, თუმც� �უცილებელი� �რ��.',
 'tooltip-pt-logout'               => 'გ�სვლ�',
 'tooltip-ca-talk'                 => 'შიგთ�ვსის გვერდის გ�ნხილვ�',
 'tooltip-ca-edit'                 => 'თქვენ შეგიძლი�თ �მ გვერდის რედ�ქტირებ�. გთხ�ვთ გ�მ�იყენ�თ  წინ�სწ�რი ხედვის ღილ�კი ს�ნ�მ გვერდს შეინ�ხ�ვთ.',
-'tooltip-ca-addsection'           => 'დ��მ�ტეთ კ�მენტ�რი �მ გ�ნხილვ�ს.',
+'tooltip-ca-addsection'           => '�ხ�ლი სექციის შექმნ�',
 'tooltip-ca-viewsource'           => 'გვერდი დ�ცული�. შეგიძლი�თ იხილ�თ მისი წყ�რ�.',
 'tooltip-ca-history'              => '�მ გვერდის ბ�ლ� ვერსიები.',
 'tooltip-ca-protect'              => 'გვერდის დ�ცვ�',
@@ -1540,6 +1652,7 @@ $NEWPAGE
 'tooltip-ca-unwatch'              => 'მ�ხსენით ეს გვერდი თქვენი კ�ნტრ�ლის სიიდ�ნ',
 'tooltip-search'                  => 'ძიებ� {{SITENAME}}',
 'tooltip-search-go'               => 'მ�იძიე გვერდი ზუსტ�დ �მ ს�ხელით',
+'tooltip-search-fulltext'         => 'მ�ძებნე გვერდები, რ�მლებიც �მ ტექსტს შეიც�ვენ',
 'tooltip-p-logo'                  => 'მთ�ვ�რი გვერდი',
 'tooltip-n-mainpage'              => 'იხილეთ მთ�ვ�რი გვერდი',
 'tooltip-n-portal'                => 'პრ�ექტის შეს�ხებ, რ� შეგიძლი�თ გ��კეთ�თ, ს�დ იპ�ვ�თ',
@@ -1553,7 +1666,9 @@ $NEWPAGE
 'tooltip-t-upload'                => 'ჩ�ტვირთეთ მედი�ფ�ილები',
 'tooltip-t-specialpages'          => 'ყველ� სპეცი�ლური გვერდის სი�',
 'tooltip-t-print'                 => '�მ გვერდის დ�ს�ბეჭდი ვერსი�',
+'tooltip-ca-nstab-main'           => 'შინ��რსის ჩვენებ�',
 'tooltip-ca-nstab-user'           => 'მ�მხმ�რებლის გვერდის ჩვენებ�',
+'tooltip-ca-nstab-special'        => 'ეს სპეცი�ლური გვერდი�. მისი რედ�ქტირებ� �რ შეგიძლი�თ.',
 'tooltip-ca-nstab-project'        => 'იხილეთ პრ�ექტის გვერდი',
 'tooltip-ca-nstab-image'          => 'სურ�თის გვერდის ჩვენებ�',
 'tooltip-ca-nstab-mediawiki'      => 'იხილე სისტემური შეტყ�ბინებ�',
@@ -1581,12 +1696,12 @@ $NEWPAGE
 'nocreativecommons' => 'Creative Commons RDF მეტ�მ�ნ�ცემები �მ სერვერისთვის გ�მ�რთული�.',
 
 # Attribution
-'anonymous'        => 'ვიკიპედიის �ნ�ნიმური მ�მხმ�რებლები',
+'anonymous'        => '{{SITENAME}}-ის �ნ�ნიმური {{PLURAL:$1|მ�მხმ�რებელი|მ�მხმ�რებლები}}',
 'siteuser'         => '{{SITENAME}} მ�მხმ�რებელი $1',
 'lastmodifiedatby' => 'ეს გვერდი ბ�ლ�ს შეიცვ�ლ� $2, $1  $3-ით.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1-ს ნ�მუშევრის მიხედვით.',
 'others'           => 'სხვები',
-'siteusers'        => '{{SITENAME}} მ�მხმ�რებელი $1',
+'siteusers'        => '{{SITENAME}}-ის {{PLURAL:$2|მ�მხმ�რებელი|მ�მხმ�რებლები|}} $1',
 'creditspage'      => 'წვლილი',
 'nocredits'        => '�ქ �მ გვერდისთვის ხელმის�წვდ�მი ინფ�რმ�ცი� �რ �რსებ�ბს.',
 
@@ -1635,9 +1750,10 @@ $NEWPAGE
 'show-big-image'       => 'სრული გ�რჩევ�დ�ბ�',
 'show-big-image-thumb' => '<small>ზ�მ� წინ�სწ�რი გ�დ�ხედვის�ს: $1 × $2 პიქსელი</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '�ხ�ლი სურ�თები',
 'imagelisttext'         => "ქვემ�თ მ�ცემული� '''$1''' ფ�ილის სი� დ�ხ�რისხებული მ�მხმ�რებლის $2 მიერ.",
+'newimages-legend'      => 'ფილტრი',
 'showhidebots'          => '(რ�ბ�ტების $1)',
 'noimages'              => 'გ�დ�ს�ხედი �რ�ფერი�.',
 'ilsubmit'              => 'ძიებ�',
@@ -1831,7 +1947,7 @@ $3
 
 # Scary transclusion
 'scarytranscludefailed'  => '[ვწუხვ�რთ, რ�მ $1-თვის თ�რგთ�ნ კ�ვშირი �რ გ�ნხ�რციელდ�]',
-'scarytranscludetoolong' => '[URL ძ�ლი�ნ გრძელი�; უკ�ცრ�ვ�დ]',
+'scarytranscludetoolong' => '[URL ძ�ლი�ნ გრძელი�]',
 
 # Trackbacks
 'trackbackbox'      => '<div id="mw_trackbacks">
@@ -1848,20 +1964,9 @@ $1
 გთხ�ვთ დ��დ�სტურ�თ, რ�მ ნ�მდვილ�დ გსურთ �მ გვერდის �ღდგენ�.",
 'recreate'            => '�ღ�დგინე',
 
-# HTML dump
-'redirectingto' => 'გ�დ�მის�მ�რთდებ� [[:$1]]-ზე...',
-
 # action=purge
-'confirm_purge'        => 'გსურთ �მ გვერდის ქეშის წ�შლ�?
-
-$1',
 'confirm_purge_button' => 'კ�რგი',
-
-# AJAX search
-'searchcontaining' => "მ�ძებნე სტ�ტიები, რ�მლებიც შეიც�ვს ''$1''.",
-'searchnamed'      => "მ�ძებნე სტ�ტიები ს�ხელით ''$1''.",
-'articletitles'    => "სტ�ტიები, რ�მლებიც იწყებ� ''$1''-ით",
-'hideresults'      => 'დ�მ�ლე შედეგები',
+'confirm-purge-top'    => 'გსურთ �მ გვერდის ქეშის წ�შლ�?',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; წინ� გვერდი',
diff --git a/languages/messages/MessagesKaa.php b/languages/messages/MessagesKaa.php
index 019cc17c..ad8d6991 100644
--- a/languages/messages/MessagesKaa.php
+++ b/languages/messages/MessagesKaa.php
@@ -22,24 +22,86 @@ $fallback8bitEncoding = 'windows-1254';
 $linkPrefixExtension = true;
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Arnawlı',
-	NS_MAIN           => '',
-	NS_TALK           => "Sa'wbet",
-	NS_USER           => 'Paydalanıwshı',
-	NS_USER_TALK      => "Paydalanıwshı_sa'wbeti",
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => "$1_sa'wbeti",
-	NS_IMAGE          => "Su'wret",
-	NS_IMAGE_TALK     => "Su'wret_sa'wbeti",
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => "MediaWiki_sa'wbeti",
-	NS_TEMPLATE       => 'Shablon',
-	NS_TEMPLATE_TALK  => "Shablon_sa'wbeti",
-	NS_HELP           => 'Anıqlama',
-	NS_HELP_TALK      => "Anıqlama_sa'wbeti",
-	NS_CATEGORY       => 'Kategoriya',
-	NS_CATEGORY_TALK  => "Kategoriya_sa'wbeti",
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Arnawlı',
+	NS_TALK             => 'Sa\'wbet',
+	NS_USER             => 'Paydalanıwshı',
+	NS_USER_TALK        => 'Paydalanıwshı_sa\'wbeti',
+	NS_PROJECT_TALK     => '$1_sa\'wbeti',
+	NS_FILE             => 'Su\'wret',
+	NS_FILE_TALK        => 'Su\'wret_sa\'wbeti',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_sa\'wbeti',
+	NS_TEMPLATE         => 'Shablon',
+	NS_TEMPLATE_TALK    => 'Shablon_sa\'wbeti',
+	NS_HELP             => 'Anıqlama',
+	NS_HELP_TALK        => 'Anıqlama_sa\'wbeti',
+	NS_CATEGORY         => 'Kategoriya',
+	NS_CATEGORY_TALK    => 'Kategoriya_sa\'wbeti',
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Qos burıwshılar' ),
+	'BrokenRedirects'           => array( 'Jaramsız burıwshılar' ),
+	'Disambiguations'           => array( 'Ko\'p ma\'nisliler' ),
+	'Userlogin'                 => array( 'Kiriw', 'Paydalanıwshı kiriw' ),
+	'Userlogout'                => array( 'Shıg\'ıw', 'Paydalanıwshı shıg\'ıw' ),
+	'Preferences'               => array( 'Sazlawlar' ),
+	'Watchlist'                 => array( 'Baqlaw dizimi' ),
+	'Recentchanges'             => array( 'Aqırg\'ı o\'zgerisler' ),
+	'Listfiles'                 => array( 'Su\'wretler dizimi' ),
+	'Newimages'                 => array( 'Taza su\'wretler' ),
+	'Listusers'                 => array( 'Paydalanıwshılar', 'Paydalanıwshı dizimi' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Qa\'legen', 'Qa\'legen bet' ),
+	'Lonelypages'               => array( 'Hesh betten siltelmegen betler' ),
+	'Uncategorizedpages'        => array( 'Kategoriyasız betler' ),
+	'Uncategorizedcategories'   => array( 'Kategoriyasız kategoriyalar' ),
+	'Uncategorizedimages'       => array( 'Kategoriyasız su\'wretler' ),
+	'Uncategorizedtemplates'    => array( 'Kategoriyasız shablonlar' ),
+	'Unusedcategories'          => array( 'Paydalanılmag\'an kategoriyalar' ),
+	'Unusedimages'              => array( 'Paydalanılmag\'an fayllar', 'Paydalanılmag\'an su\'wretler' ),
+	'Wantedpages'               => array( 'Talap qılıng\'an betler', 'Jaramsız sıltewler' ),
+	'Wantedcategories'          => array( 'Talap qılıng\'an kategoriyalar' ),
+	'Mostlinked'                => array( 'Ko\'p siltelgenler' ),
+	'Mostlinkedcategories'      => array( 'Ko\'p paydalanılg\'an kategoriyalar' ),
+	'Mostlinkedtemplates'       => array( 'Ko\'p paydalanılg\'an shablonlar' ),
+	'Mostcategories'            => array( 'Ko\'p kategoriyalang\'anlar' ),
+	'Mostimages'                => array( 'Ko\'p paydalanılg\'an su\'wretler' ),
+	'Mostrevisions'             => array( 'Ko\'p du\'zetilgenler' ),
+	'Fewestrevisions'           => array( 'Az du\'zetilgenler' ),
+	'Shortpages'                => array( 'Qqısqa betler' ),
+	'Longpages'                 => array( 'Uzın betler' ),
+	'Newpages'                  => array( 'Taza betler' ),
+	'Ancientpages'              => array( 'Eski betler' ),
+	'Deadendpages'              => array( 'Hesh betke siltemeytug\'ın betler' ),
+	'Protectedpages'            => array( 'Qorg\'alg\'an betler' ),
+	'Allpages'                  => array( 'Ha\'mme betler' ),
+	'Specialpages'              => array( 'Arnawlı betler' ),
+	'Contributions'             => array( 'Paydalanıwshı u\'lesi' ),
+	'Emailuser'                 => array( 'Xat jiberiw' ),
+	'Whatlinkshere'             => array( 'Siltelgen betler' ),
+	'Recentchangeslinked'       => array( 'Baylanıslı aqırg\'ı o\'zgerisler' ),
+	'Movepage'                  => array( 'Betti ko\'shiriw' ),
+	'Categories'                => array( 'Kategoriyalar' ),
+	'Export'                    => array( 'Eksport' ),
+	'Version'                   => array( 'Versiya' ),
+	'Allmessages'               => array( 'Ha\'mme xabarlar' ),
+	'Log'                       => array( 'Jurnal', 'Jurnallar' ),
+	'Userrights'                => array( 'Paydalanıwshı huqıqları' ),
+	'MIMEsearch'                => array( 'MIME izlew' ),
+	'Unwatchedpages'            => array( 'Baqlanılmag\'an betler' ),
+	'Listredirects'             => array( 'Burıwshılar dizimi' ),
+	'Revisiondelete'            => array( 'Nusqanı o\'shiriw' ),
+	'Unusedtemplates'           => array( 'Paydalanılmag\'an shablonlar' ),
+	'Randomredirect'            => array( 'Qa\'legen burıwshı' ),
+	'Mypage'                    => array( 'Menin\' betim' ),
+	'Mytalk'                    => array( 'Menin\' sa\'wbetim' ),
+	'Mycontributions'           => array( 'Menin\' u\'lesim' ),
+	'Listadmins'                => array( 'Administratorlar' ),
+	'Popularpages'              => array( 'Ko\'p ko\'rilgen betler' ),
+	'Search'                    => array( 'Ä°zlew' ),
+	'Withoutinterwiki'          => array( 'Hesh tilge siltemeytug\'ın betler' ),
 );
 
 $datePreferences = array(
@@ -122,16 +184,17 @@ $messages = array(
 'tog-watchlisthideown'        => "Baqlaw dizimindegi menin' o'zgertiwlerimdi jasır",
 'tog-watchlisthidebots'       => "Baqlaw dizimindegi bot o'zgertiwlerin jasır",
 'tog-watchlisthideminor'      => "Baqlaw diziminen kishi o'zgerislerdi jasır",
+'tog-watchlisthideliu'        => "Baqlaw dizimindegi kirgen paydalanıwshılardın' o'zgerislerin jasır",
+'tog-watchlisthideanons'      => "Baqlaw dizimindegi anonim paydalanıwshılardın' o'zgerislerin jasır",
 'tog-ccmeonemails'            => "Basqa qollanıwshılarg'a jibergen xatlarımnın' ko'shirmesin mag'an da jiber",
 'tog-diffonly'                => "Bet mag'lıwmatın parqlardan to'mengi jerde ko'rsetpe",
 'tog-showhiddencats'          => "Jasırın kategoriyalardı ko'rset",
+'tog-norollbackdiff'          => "Artqa qaytarıwdan keyin parqlardı ko'rsetpe",
 
 'underline-always'  => "Ha'r dayım",
 'underline-never'   => 'Hesh qashan',
 'underline-default' => "Brawzerdin' sazlawları boyınsha",
 
-'skinpreview' => '(Korip al)',
-
 # Dates
 'sunday'        => 'Ekshenbi',
 'monday'        => "Du'yshenbi",
@@ -225,7 +288,7 @@ $messages = array(
 'mytalk'         => "Menin' sa'wbetim",
 'anontalk'       => "Usı IP sa'wbeti",
 'navigation'     => 'Navigatsiya',
-'and'            => "ha'm",
+'and'            => "&#32;ha'm",
 
 # Metadata in edit box
 'metadata_help' => "Metamag'lıwmat:",
@@ -288,8 +351,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} haqqında',
 'aboutpage'            => 'Project:Proyekt haqqında',
-'bugreports'           => 'Qatelik esabatları',
-'bugreportspage'       => 'Project:Qatelik esabatları',
 'copyright'            => "Mag'lıwmat $1 boyınsha alıng'an.",
 'copyrightpagename'    => "{{SITENAME}} proyektinin' avtorlıq huquqları",
 'copyrightpage'        => '{{ns:project}}:Avtorlıq huquqları',
@@ -312,9 +373,7 @@ $messages = array(
 
 'badaccess'        => 'Ruxsatnama qateligi',
 'badaccess-group0' => "Soralıp atırg'an ha'reketin'izdi bejeriwge ruqsatın'ız joq.",
-'badaccess-group1' => "Soralıp atırg'an ha'reketin'iz $1 toparının' paydalanıwshılarına sheklengen.",
-'badaccess-group2' => "Soralıp atırg'an ha'reketin'iz $1 toparlarının' birinin' paydalanıwshılarına sheklengen.",
-'badaccess-groups' => "Soralıp atırg'an ha'reketin'iz $1 toparlarının' birinin' paydalanıwshılarına sheklengen.",
+'badaccess-groups' => "Soralıp atırg'an ha'reketin'iz to'mendegi {{PLURAL:$2|topar|toparlardın' birinin'}} paydalanıwshılarına sheklengen: $1",
 
 'versionrequired'     => "MediaWikidin' $1 nusqası kerek",
 'versionrequiredtext' => "Bul betti paydalanıw ushın MediaWikidin' $1 nusqası kerek. [[Special:Version|Nusqa beti]]n qaran'.",
@@ -328,6 +387,8 @@ $messages = array(
 'editsection'             => "o'zgertiw",
 'editold'                 => "o'zgertiw",
 'viewsourceold'           => "deregin ko'riw",
+'editlink'                => "o'zgertiw",
+'viewsourcelink'          => "kodın ko'riw",
 'editsectionhint'         => "$1 bo'limin o'zgertiw",
 'toc'                     => 'Mazmunı',
 'showtoc'                 => "ko'rset",
@@ -344,13 +405,13 @@ $messages = array(
 'page-atom-feed'          => '"$1" betinin\' "Atom" jolag\'ı',
 'feed-atom'               => '"Atom"',
 'feed-rss'                => '"RSS"',
-'red-link-title'          => "$1 (ele jaratılmag'an)",
+'red-link-title'          => "$1 (bet ele jaratılmag'an)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Bet',
 'nstab-user'      => 'Paydalanıwshı',
 'nstab-media'     => 'Media beti',
-'nstab-special'   => 'Arnawlı',
+'nstab-special'   => 'Arnawlı bet',
 'nstab-project'   => 'Proyekt beti',
 'nstab-image'     => 'Fayl beti',
 'nstab-mediawiki' => 'Xabar',
@@ -428,7 +489,7 @@ Birneshe minuttan keyin qaytadan ha'reket qılıp ko'rin'.",
 'viewsourcetext'       => "Bul bettin' deregin qarawın'ızg'a ha'mde ko'shirip alıwın'ızg'a boladı:",
 'editinginterface'     => "'''Esletpe:''' Siz ishinde MediaWiki sistema xabarı bar bolg'an betti o'zgertip atırsız. 
 Bul bettin' o'zgeriwi basqa paydalanıwshılardın' sırtqı interfeisine ta'sir etedi.
-Audarıw ushın,  MediaWiki programmasın jersindiriw [http://translatewiki.net/wiki/Main_Page?setlang=kaa Betawiki proyektisin] qarap shıg'ın'ız.",
+Audarıw ushın,  MediaWiki programmasın jersindiriw [http://translatewiki.net/wiki/Main_Page?setlang=kaa translatewiki.net proyektisin] qarap shıg'ın'ız.",
 'sqlhidden'            => "(SQL sorawı jasırılg'an)",
 'namespaceprotected'   => "'''$1''' isimler ko'pligindegi betlerdi o'zgertiwge ruxsatın'ız joq.",
 'customcssjsprotected' => "Bul betti o'zgertiwin'izge ruqsatın'ız joq, sebebi bul jerde basqa paydalanıwshılardın' jeke sazlawları bar.",
@@ -441,7 +502,7 @@ Keltirilgen sebep: ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => "Shıg'ıw",
-'logouttext'                 => "<strong>Siz endi sayttan shıqtın'ız.</strong><br />
+'logouttext'                 => "'''Siz endi sayttan shıqtın'ız.'''<br />
 Siz {{SITENAME}} saytınan anonim halda paydalanıwın'ız mu'mkin. Yamasa siz ja'ne ha'zirgi yaki basqa paydalanıwshı atı menen [[Special:UserLogin|qaytadan sistemag'a kiriwin'izge]] boladı. Sonı este saqlan', ayrım betler sizin' brauzerin'izdin' keshi tazalanbag'anlıg'ı sebebli sistemada kirgenin'izdey ko'riniste dawam ettire beriwi mu'mkin.",
 'welcomecreation'            => "== Xosh keldin'iz, $1! ==
 
@@ -453,7 +514,6 @@ Akkauntın'ız jaratıldı.
 'yourpasswordagain'          => "Paroldi qayta kiritin':",
 'remembermypassword'         => "Menin' kirgenimdi usı kompyuterde saqlap qal",
 'yourdomainname'             => "Sizin' domen:",
-'loginproblem'               => "<b>Kiriw waqtında mashaqatlar sa'dir boldı.</b><br />Qaytadan kirip ko'rin'.",
 'login'                      => 'Kiriw',
 'nav-login-createaccount'    => 'Kiriw / akkaunt jaratıw',
 'loginprompt'                => "{{SITENAME}} saytına kiriw ushın kukiler qosılg'an bolıwı kerek.",
@@ -525,8 +585,9 @@ tastıyıqlaw ushın xattag'ı ko'rsetpelerdi bejerin'.",
 'throttled-mailpassword'     => "Aqırg'ı {{PLURAL:$1|saat|$1 saat}} ishinde parol eskertiw xatı jiberildi.
 Jaman jolda paydalanıwdın' aldın alıw ushın, ha'r {{PLURAL:$1|saat|$1 saat}} sayın tek g'ana bir parol eskertiw xatı jiberiledi.",
 'mailerror'                  => 'Xat jiberiwde qatelik juz berdi: $1',
-'acct_creation_throttle_hit' => "Keshirersiz, siz aldın $1 akkaunt jaratqansız. Bunnan artıq jaratıw mu'mkinshiligin'iz joq.",
-'emailauthenticated'         => "Sizin' e-mail adresin'iz tastıyıqlandı: $1.",
+'acct_creation_throttle_hit' => "Keshirersiz, siz aldın {{PLURAL:$1|1 akkaunt|$1 akkaunt}} jaratqansız. 
+Bunnan artıq jaratıw mu'mkinshiligin'iz joq.",
+'emailauthenticated'         => "Sizin' e-mail adresin'iz tastıyqlang'an waqtı: $2, $3.",
 'emailnotauthenticated'      => "E-mail adresin'iz ele tastıyıqlanbag'an.
 To'mendegi mu'mkinshilikler ushın hesh xat jiberilmeydi.",
 'noemailprefs'               => "Usı mu'mkinshilikler islewi ushın e-mail adresin'izdi ko'rsetin'.",
@@ -543,16 +604,20 @@ Eger bul akkaunt nadurıs jaratılg\'an bolsa, bul xabarg\'a itibar bermesen\'iz
 'loginlanguagelabel'         => 'Til: $1',
 
 # Password reset dialog
-'resetpass'               => "Akkaunt parolin aldıng'ı qa'lpine keltiriw",
-'resetpass_announce'      => "E-mailin'izge jiberilgen waqtınshalıq kod penen kirdin'iz.
+'resetpass'                 => "Paroldi o'zgertiw",
+'resetpass_announce'        => "E-mailin'izge jiberilgen waqtınshalıq kod penen kirdin'iz.
 Kiriw protsessin juwmaqlaw ushın jan'a parolin'izdi usı jerge kiritin':",
-'resetpass_header'        => "Akkaunt parolin o'zgertiw",
-'resetpass_submit'        => "Paroldi kirgizin'",
-'resetpass_success'       => "Parolin'iz sa'tli o'zgertildi! Endi kirin'...",
-'resetpass_bad_temporary' => "Waqtinshalıq parol nadurıs.
+'resetpass_header'          => "Akkaunt parolin o'zgertiw",
+'oldpassword'               => "Aldıng'ı parol:",
+'newpassword'               => 'Taza parol:',
+'retypenew'                 => "Taza paroldi qayta kiritin':",
+'resetpass_submit'          => "Paroldi kirgizin'",
+'resetpass_success'         => "Parolin'iz sa'tli o'zgertildi! Endi kirin'...",
+'resetpass_bad_temporary'   => "Waqtinshalıq parol nadurıs.
 Ba'lkim a'lle qashan parolin'izdi o'zgertken shıg'arsız yamasa jan'a waqtınshalıq parol sorag'an bolıwın'ız mu'mkin.",
-'resetpass_forbidden'     => "Paroller o'zgertile almaydi",
-'resetpass_missing'       => "Forma mag'lıwmatı joq.",
+'resetpass_forbidden'       => "Paroller o'zgertile almaydi",
+'resetpass-submit-loggedin' => "Paroldi o'zgertiw",
+'resetpass-temp-password'   => 'Waqtınshalıq parol:',
 
 # Edit page toolbar
 'bold_sample'     => 'Yarım juwan tekst',
@@ -575,25 +640,25 @@ Ba'lkim a'lle qashan parolin'izdi o'zgertken shıg'arsız yamasa jan'a waqtınsh
 'hr_tip'          => "Gorizont bag'ıtındag'ı sızıq (dım ko'p paydalanban')",
 
 # Edit pages
-'summary'                   => 'Juwmaq',
-'subject'                   => 'Ataması',
-'minoredit'                 => "Bul kishi o'zgeris",
-'watchthis'                 => 'Bul betti baqlaw',
-'savearticle'               => 'Betti saqla',
-'preview'                   => "Ko'rip shıg'ıw",
-'showpreview'               => "Ko'rip shıq",
-'showlivepreview'           => "Tez ko'rip shıg'ıw",
-'showdiff'                  => "O'zgerislerdi ko'rset",
-'anoneditwarning'           => "'''Esletpe:''' Siz kirmedin'iz. Sizin' IP adresin'iz usi bettin' o'zgeris tariyxında saqlanıp qaladı.",
-'missingsummary'            => "'''Esletpe:''' O'zgeristin' qısqasha mazmunın ko'rsetpedin'iz.
+'summary'                          => 'Juwmaq:',
+'subject'                          => 'Ataması:',
+'minoredit'                        => "Bul kishi o'zgeris",
+'watchthis'                        => 'Bul betti baqlaw',
+'savearticle'                      => 'Betti saqla',
+'preview'                          => "Ko'rip shıg'ıw",
+'showpreview'                      => "Ko'rip shıq",
+'showlivepreview'                  => "Tez ko'rip shıg'ıw",
+'showdiff'                         => "O'zgerislerdi ko'rset",
+'anoneditwarning'                  => "'''Esletpe:''' Siz kirmedin'iz. Sizin' IP adresin'iz usi bettin' o'zgeris tariyxında saqlanıp qaladı.",
+'missingsummary'                   => "'''Esletpe:''' O'zgeristin' qısqasha mazmunın ko'rsetpedin'iz.
 \"Saqlaw\"dı ja'ne bassan'ız, o'zgerislerin'iz hesh qanday kommentariysiz saqlanadı.",
-'missingcommenttext'        => "Kommentariydi to'mende kiritin'.",
-'missingcommentheader'      => "'''Eskertpe:''' Bul kommentariy ushın atama ko'rsetpedin'iz.
+'missingcommenttext'               => "Kommentariydi to'mende kiritin'.",
+'missingcommentheader'             => "'''Eskertpe:''' Bul kommentariy ushın atama ko'rsetpedin'iz.
 Eger ja'ne \"Saqlaw\"dı bassan'ız, o'zgerislerin'iz olsız saqlanadı.",
-'summary-preview'           => "Juwmag'ın ko'rip shıg'ıw",
-'subject-preview'           => 'Atamanı aldınnan qaraw',
-'blockedtitle'              => "Paydalanıwshı bloklang'an",
-'blockedtext'               => "<big>'''Paydalaniwshı atın'ız yamasa IP adresin'iz bloklang'an.'''</big>
+'summary-preview'                  => "Juwmag'ın ko'rip shıg'ıw:",
+'subject-preview'                  => 'Atamanı aldınnan qaraw:',
+'blockedtitle'                     => "Paydalanıwshı bloklang'an",
+'blockedtext'                      => "<big>'''Paydalaniwshı atın'ız yamasa IP adresin'iz bloklang'an.'''</big>
 
 Bloklawdı \$1 a'melge asırg'an. 
 Keltirilgen sebebi: ''\$2''.
@@ -606,61 +671,73 @@ Usı bloklawdı diskussiya qılıw ushın \$1 yamasa basqa [[{{MediaWiki:Grouppa
 Siz [[Special:Preferences|akkaunt sazlawların'ızda]] haqıyqıy e-mailin'izdı ko'rsetpegenin'izshe ha'mde onı paydalanıwdan bloklang'an bolg'anısha \"Usı paydalanıwshıg'a xat jazıw\" qa'siyetinen qollana almaysız.
 Sizin' ha'zirgi IP adresin'iz: \$3, bloklaw IDı: #\$5. 
 Usılardın' birewin yamasa ekewinde ha'r bir sorawın'ızg'a qosın'.",
-'blockednoreason'           => 'hesh sebep keltirilmegen',
-'blockedoriginalsource'     => "'''$1''' degennin' deregi
+'blockednoreason'                  => 'hesh sebep keltirilmegen',
+'blockedoriginalsource'            => "'''$1''' degennin' deregi
 to'mende ko'rsetilgen:",
-'blockededitsource'         => "'''$1''' degennin' '''siz ozgertken''' teksti to'mende ko'rsetilgen:",
-'whitelistedittitle'        => "O'zgertiw ushın sistemag'a kiriwin'iz kerek",
-'whitelistedittext'         => "Betterdi o'zgertiw ushın $1 sha'rt.",
-'confirmedittitle'          => "O'zgertiw ushın e-mail tastıyıqlaması kerek",
-'confirmedittext'           => "Betlerge o'zgeris kiritiwin'iz ushın aldın E-pochta adresin'izdi tastıyıqlawın'ız kerek.
+'blockededitsource'                => "'''$1''' degennin' '''siz ozgertken''' teksti to'mende ko'rsetilgen:",
+'whitelistedittitle'               => "O'zgertiw ushın sistemag'a kiriwin'iz kerek",
+'whitelistedittext'                => "Betterdi o'zgertiw ushın $1 sha'rt.",
+'confirmedittitle'                 => "O'zgertiw ushın e-mail tastıyıqlaması kerek",
+'confirmedittext'                  => "Betlerge o'zgeris kiritiwin'iz ushın aldın E-pochta adresin'izdi tastıyıqlawın'ız kerek.
 E-pochta adresin'izdi [[Special:Preferences|paydalanıwshı sazlawları bo'limi]] arqalı ko'rsetin' ha'm jaramlılıg'ın tekserin'.",
-'nosuchsectiontitle'        => "Bunday bo'lim joq",
-'nosuchsectiontext'         => "Ele jaratılmag'an bo'limdi o'zgerpekshisiz.
+'nosuchsectiontitle'               => "Bunday bo'lim joq",
+'nosuchsectiontext'                => "Ele jaratılmag'an bo'limdi o'zgerpekshisiz.
 $1 bo'limi joq bolg'anlıg'ı sebepli sizin' o'zgertiwin'izdi saqlawg'a orın joq.",
-'loginreqtitle'             => "Sistemag'a kiriw kerek",
-'loginreqlink'              => 'kiriw',
-'loginreqpagetext'          => "Basqa betlerdi ko'riw ushın sizge $1 kerek.",
-'accmailtitle'              => 'Parol jiberildi.',
-'accmailtext'               => '"$1" paroli $2 g\'a jiberildi.',
-'newarticle'                => '(Taza)',
-'newarticletext'            => "Siz ele jaratılmag'an betke siltew arqalı o'ttin'iz.
+'loginreqtitle'                    => "Sistemag'a kiriw kerek",
+'loginreqlink'                     => 'kiriw',
+'loginreqpagetext'                 => "Basqa betlerdi ko'riw ushın sizge $1 kerek.",
+'accmailtitle'                     => 'Parol jiberildi.',
+'accmailtext'                      => '"$1" paroli $2 g\'a jiberildi.',
+'newarticle'                       => '(Taza)',
+'newarticletext'                   => "Siz ele jaratılmag'an betke siltew arqalı o'ttin'iz.
 Betti jaratıw ushın to'mendegi aynada tekstin'izdi kiritin' (qosımsha mag'lıwmat ushın [[{{MediaWiki:Helppage}}|anıqlama betin]] qaran').
 Eger bul jerge aljasıp o'tken bolsan'ız, brauzerin'izdin' «Arqag'a» knopkasın basın'.",
-'noarticletext'             => "Ha'zirgi waqıtta bul bette hesh qanday mag'lıwmat joq. Basqa betlerden usı bet atamasın [[Special:Search/{{PAGENAME}}|izlep ko'riwin'izge]] yamasa usı betti [{{fullurl:{{FULLPAGENAME}}|action=edit}} jaratıwin'ızga'] boladi.",
-'userpage-userdoesnotexist' => "\"\$1\" paydalanıwshı akkauntı registratsiya qılınbag'an. Bul betti jaratqın'ız yamasa o'zgertkin'iz kelse tekserip ko'rin'.",
-'updated'                   => "(Jan'alang'an)",
-'note'                      => '<strong>Eskertiw:</strong>',
-'previewnote'               => "<strong>Bul ele tek aldınnan ko'rip shıg'ıw; o'zgerisler ele saqlanbadı!</strong>",
-'session_fail_preview'      => "<strong>Keshirersiz! Sessiya mag'lıwmatlarının' jog'alıwı sebepli o'zgerislerin'izdi qabıl ete almaymız.
-Qaytadan ha'reket qılıp ko'rin'. Eger bul payda bermese, [[Special:UserLogout|shıg'ıp]] qaytadan kirip ko'rin'.</strong>",
-'editing'                   => "$1 o'zgertilmekte",
-'editingsection'            => "$1 (bo'limi) o'zgertilmekte",
-'editingcomment'            => "$1 (kommentariyi) o'zgertilmekte",
-'editconflict'              => "O'zgertiw konflikti: $1",
-'yourtext'                  => "Sizin' tekst",
-'storedversion'             => "Saqlang'an nusqası",
-'yourdiff'                  => 'Parqlar',
-'copyrightwarning'          => "Este tutın', {{SITENAME}} proyektinde jaylastırılg'an ha'm o'zgertilgen maqalalar tekstleri $2 sha'rt tiykarında qaraladı (tolıqraq mag'lıwmat ushın: $1). Eger siz tekstin'izdin' erkin tarqatılıwın ha'mde qa'legen paydalanıwshı o'zgertiwin qa'lemesen'iz, bul jerge jaylastırmag'anın'ız maqul.<br />
+'noarticletext'                    => "Ha'zirgi waqıtta bul bette hesh qanday mag'lıwmat joq. 
+Basqa betlerden usı bet atamasın [[Special:Search/{{PAGENAME}}|izlep ko'riwin'izge]],
+<span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} tiyisli jurnallardı izlewin'izge],
+yamasa usı betti [{{fullurl:{{FULLPAGENAME}}|action=edit}} jaratıwin'ızga'] boladi.",
+'userpage-userdoesnotexist'        => "\"\$1\" paydalanıwshı akkauntı registratsiya qılınbag'an. Bul betti jaratqın'ız yamasa o'zgertkin'iz kelse tekserip ko'rin'.",
+'updated'                          => "(Jan'alang'an)",
+'note'                             => "'''Eskertiw:'''",
+'previewnote'                      => "'''Bul ele tek aldınnan ko'rip shıg'ıw; o'zgerisler ele saqlanbadı!'''",
+'session_fail_preview'             => "'''Keshirersiz! Sessiya mag'lıwmatlarının' jog'alıwı sebepli o'zgerislerin'izdi qabıl ete almaymız.
+Qaytadan ha'reket qılıp ko'rin'. Eger bul payda bermese, [[Special:UserLogout|shıg'ıp]] qaytadan kirip ko'rin'.'''",
+'editing'                          => "$1 o'zgertilmekte",
+'editingsection'                   => "$1 (bo'limi) o'zgertilmekte",
+'editingcomment'                   => "$1 (kommentariyi) o'zgertilmekte",
+'editconflict'                     => "O'zgertiw konflikti: $1",
+'yourtext'                         => "Sizin' tekst",
+'storedversion'                    => "Saqlang'an nusqası",
+'yourdiff'                         => 'Parqlar',
+'copyrightwarning'                 => "Este tutın', {{SITENAME}} proyektinde jaylastırılg'an ha'm o'zgertilgen maqalalar tekstleri $2 sha'rt tiykarında qaraladı (tolıqraq mag'lıwmat ushın: $1). Eger siz tekstin'izdin' erkin tarqatılıwın ha'mde qa'legen paydalanıwshı o'zgertiwin qa'lemesen'iz, bul jerge jaylastırmag'anın'ız maqul.<br />
 Qosqan u'lesin'iz o'zin'izdin' jazg'anın'ız yamasa ashıq tu'rdegi derekten alıng'anlig'ına wa'de berin'.
-<strong>AVTORLIQ HUQUQI MENEN QORG'ALG'AN MAG'LIWMATLARDI RUXSATSIZ JAYLASTIRMAN'!</strong>",
-'copyrightwarning2'         => "Este tutın', {{SITENAME}} proyektindegi barlıq u'lesler basqa paydalanıwshılar arqalı o'zgertiliwi yamasa o'shiriliwi mu'mkin. Eger siz tekstin'izdin' erkin tarqatılıwın ha'mde qa'legen paydalanıwshı o'zgertiwin qa'lemesen'iz, bul jerge jaylastırmag'anın'ız maqul.<br /> Qosqan u'lesin'iz o'zin'izdin' jazg'anın'ız yamasa ashıq tu'rdegi derekten alıng'anlig'ına wa'de berin' (qosımsha mag'lıwmat ushın $1 hu'jjetin qaran'). <strong>AVTORLIQ HUQUQI MENEN QORG'ALG'AN MAG'LIWMATLARDI RUXSATSIZ JAYLASTIRMAN'!</strong>",
-'longpagewarning'           => "<strong>ESLETPE: Bul bettin' ha'jmi $1 kilobayt, geybir brauzerler 32 kBqa jaqın yamasa onnan u'lken bolg'an betlerdi o'zgertiwde qıyınshılıqlarg'a tuwra keliwi mu'mkin. Betti kishi bo'leklerge bo'liw haqqında oylap ko'rin'.</strong>",
-'semiprotectedpagewarning'  => "'''Eskertiw:''' Bet qulplang'an, tek registratsiyadan o'tken paydalanıwshılar g'ana o'zgerte aladı.",
-'templatesused'             => "Bul bette qollanılg'an shablonlar:",
-'templatesusedpreview'      => "Bul aldınnan ko'riw betinde qollanılg'an shablonlar:",
-'templatesusedsection'      => "Bul bo'limde qollanılg'an shablonlar:",
-'template-protected'        => "(qorg'alg'an)",
-'template-semiprotected'    => "(yarım-qorg'alg'an)",
-'nocreatetitle'             => 'Bet jaratıw sheklengen',
-'nocreatetext'              => "{{SITENAME}} saytında taza betlerdi jaratıw sheklengen.
+'''AVTORLIQ HUQUQI MENEN QORG'ALG'AN MAG'LIWMATLARDI RUXSATSIZ JAYLASTIRMAN'!'''",
+'copyrightwarning2'                => "Este tutın', {{SITENAME}} proyektindegi barlıq u'lesler basqa paydalanıwshılar arqalı o'zgertiliwi yamasa o'shiriliwi mu'mkin. Eger siz tekstin'izdin' erkin tarqatılıwın ha'mde qa'legen paydalanıwshı o'zgertiwin qa'lemesen'iz, bul jerge jaylastırmag'anın'ız maqul.<br /> Qosqan u'lesin'iz o'zin'izdin' jazg'anın'ız yamasa ashıq tu'rdegi derekten alıng'anlig'ına wa'de berin' (qosımsha mag'lıwmat ushın $1 hu'jjetin qaran'). '''AVTORLIQ HUQUQI MENEN QORG'ALG'AN MAG'LIWMATLARDI RUXSATSIZ JAYLASTIRMAN'!'''",
+'longpagewarning'                  => "'''ESLETPE: Bul bettin' ha'jmi $1 kilobayt, geybir brauzerler 32 kBqa jaqın yamasa onnan u'lken bolg'an betlerdi o'zgertiwde qıyınshılıqlarg'a tuwra keliwi mu'mkin. Betti kishi bo'leklerge bo'liw haqqında oylap ko'rin'.'''",
+'semiprotectedpagewarning'         => "'''Eskertiw:''' Bet qulplang'an, tek registratsiyadan o'tken paydalanıwshılar g'ana o'zgerte aladı.",
+'templatesused'                    => "Bul bette qollanılg'an shablonlar:",
+'templatesusedpreview'             => "Bul aldınnan ko'riw betinde qollanılg'an shablonlar:",
+'templatesusedsection'             => "Bul bo'limde qollanılg'an shablonlar:",
+'template-protected'               => "(qorg'alg'an)",
+'template-semiprotected'           => "(yarım-qorg'alg'an)",
+'hiddencategories'                 => "Bul bet {{PLURAL:$1|1 jasırın kategoriyasının'|$1 jasırın kategoriyalarının'}} ag'zası:",
+'nocreatetitle'                    => 'Bet jaratıw sheklengen',
+'nocreatetext'                     => "{{SITENAME}} saytında taza betlerdi jaratıw sheklengen.
 Arqag'a qaytıp bar betti o'zgertiwin'izge yamasa [[Special:UserLogin|kiriwin'izge / akkaunt jaratıwın'ızg'a]] boladı.",
-'nocreate-loggedin'         => "Taza betler jaratıwın'ızg'a ruxsatın'ız joq.",
-'permissionserrors'         => 'Ruxsatnamalar Qatelikleri',
-'recreate-deleted-warn'     => "'''Esletpe: Aldın o'shirilgen betti qayta jaratajaqsız.'''
+'nocreate-loggedin'                => "Taza betler jaratıwın'ızg'a ruxsatın'ız joq.",
+'permissionserrors'                => 'Ruxsatnamalar Qatelikleri',
+'permissionserrorstext-withaction' => "$2 ha'reketine ruxsatın'ız joq, to'mendegi {{PLURAL:$1|sebep|sebepler}} boyınsha:",
+'recreate-deleted-warn'            => "'''Esletpe: Aldın o'shirilgen betti qayta jaratajaqsız.'''
 
 Usi betti qaytadan jaratıw tuwrılıg'ın oylap ko'rin'.
 Qolaylıq ushın to'mende o'shiriw jurnalı keltirilgen:",
+'deleted-notice'                   => "Bul bet o'shirilgen.
+To'mende mag'lıwmat ushın bettin' o'shiriw jurnalı ko'rsetilgen.",
+'deletelog-fulllog'                => 'Tolıq jurnaldı qaraw',
+'edit-conflict'                    => "O'zgerislerdegi konflikt.",
+
+# Parser/template warnings
+'parser-template-loop-warning' => 'Shablonlarda qaytalanıw tabıldı: [[$1]]',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Akkaunt jaratılmadı',
@@ -669,28 +746,29 @@ Qolaylıq ushın to'mende o'shiriw jurnalı keltirilgen:",
 $3 keltirilgen sebebi: ''$2''",
 
 # History pages
-'viewpagelogs'        => "Usı bettin' jurnalın ko'riw",
-'nohistory'           => "Bul bettin' o'zgertiw tariyxı joq.",
-'revnotfound'         => 'Nusqa tabılmadı',
-'currentrev'          => "Ha'zirgi nusqa",
-'revisionasof'        => '$1 waqtındagı nusqası',
-'revision-info'       => "$1 waqtındag'ı $2 istegen nusqası",
-'previousrevision'    => '�Eskilew nusqası',
-'nextrevision'        => "Jan'alaw nusqası→",
-'currentrevisionlink' => "Ha'zirgi nusqa",
-'cur'                 => "ha'z.",
-'next'                => 'keyin.',
-'last'                => 'aqır.',
-'page_first'          => 'birinshi',
-'page_last'           => "aqırg'ı",
-'histlegend'          => "Tu'sindirme: salıstırajaq nusqaların'ızdı saylan' ha'mde <Enter> knopkasın yamasa to'mendegi knopkani basın'.<br />
+'viewpagelogs'           => "Usı bettin' jurnalın ko'riw",
+'nohistory'              => "Bul bettin' o'zgertiw tariyxı joq.",
+'currentrev'             => "Ha'zirgi nusqa",
+'currentrev-asof'        => "Bul nusqanın' waqtı: $1",
+'revisionasof'           => '$1 waqtındagı nusqası',
+'revision-info'          => "$1 waqtındag'ı $2 istegen nusqası", # Additionally available: $3: revision id
+'previousrevision'       => '�Eskilew nusqası',
+'nextrevision'           => "Jan'alaw nusqası→",
+'currentrevisionlink'    => "Ha'zirgi nusqa",
+'cur'                    => "ha'z.",
+'next'                   => 'keyin.',
+'last'                   => 'aqır.',
+'page_first'             => 'birinshi',
+'page_last'              => "aqırg'ı",
+'histlegend'             => "Tu'sindirme: salıstırajaq nusqaların'ızdı saylan' ha'mde <Enter> knopkasın yamasa to'mendegi knopkani basın'.<br />
 Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 (aqır.) = aldıng'ı nusqasi menen parqı, k = kishi o'zgeris",
-'deletedrev'          => "[o'shirilgen]",
-'histfirst'           => "En' aldıng'ısı",
-'histlast'            => "En' aqırg'ısı",
-'historysize'         => '({{PLURAL:$1|1 bayt|$1 bayt}})',
-'historyempty'        => '(bos)',
+'history-fieldset-title' => 'Tariyxınan izlew',
+'deletedrev'             => "[o'shirilgen]",
+'histfirst'              => "En' aldıng'ısı",
+'histlast'               => "En' aqırg'ısı",
+'historysize'            => '({{PLURAL:$1|1 bayt|$1 bayt}})',
+'historyempty'           => '(bos)',
 
 # Revision feed
 'history-feed-title'          => 'Nusqa tariyxı',
@@ -751,6 +829,7 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'mergehistory-invalid-destination' => "Aqırg'ı bet durıs atamag'a iye bolıwı sha'rt.",
 'mergehistory-autocomment'         => '[[:$1]] degen [[:$2]] degenge biriktirildi',
 'mergehistory-comment'             => '[[:$1]] degen [[:$2]] degenge biriktirildi: $3',
+'mergehistory-same-destination'    => "Derek ha'm aqırg'ı betler birdey bolmawı kerek",
 
 # Merge log
 'mergelog'           => 'Biriktiriw jurnalı',
@@ -763,107 +842,190 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'difference'              => "(Nusqalar arasındag'ı ayırmashılıq)",
 'lineno'                  => 'Qatar No $1:',
 'compareselectedversions' => "Saylang'an nusqalardı salıstırıw",
+'visualcomparison'        => "Ko'risli salıstırması",
+'wikicodecomparison'      => 'Wikitekst salıstırıwı',
 'editundo'                => 'qaytar',
 'diff-multi'              => "(Aradag'ı {{PLURAL:$1|bir nusqa|$1 nusqa}} ko'rsetilmeydi.)",
+'diff-movedto'            => "$1 degenge ko'shirildi",
+'diff-styleadded'         => '$1 stili qosıldı',
+'diff-added'              => '$1 qosıldı',
+'diff-changedto'          => "$1 degenge o'zgertildi",
+'diff-movedoutof'         => "$1 ko'shirildi",
+'diff-styleremoved'       => "$1 stili o'shirildi",
+'diff-removed'            => "$1 o'shirildi",
+'diff-changedfrom'        => "$1 keyingi o'zgerisler",
+'diff-src'                => 'derek',
+'diff-with'               => '&#32;$1 $2 birgelikte',
+'diff-with-final'         => "&#32;ha'm $1 $2",
+'diff-width'              => 'en',
+'diff-height'             => 'uzunlıq',
+'diff-p'                  => "'''jan'a qatar'''",
+'diff-blockquote'         => "'''sitata'''",
+'diff-h1'                 => "'''1shi da'rejeli atama'''",
+'diff-h2'                 => "'''2shi da'rejeli atama'''",
+'diff-h3'                 => "'''3shi da'rejeli atama'''",
+'diff-h4'                 => "'''4shi da'rejeli atama'''",
+'diff-h5'                 => "'''5shi da'rejeli atama'''",
+'diff-pre'                => "'''berilgen formattag'ı blok'''",
+'diff-div'                => "'''bo'lim'''",
+'diff-ul'                 => "'''ta'rtipke keltirilmegen dizim'''",
+'diff-ol'                 => "'''ta'rtipke keltirilgen dizim'''",
+'diff-li'                 => "'''dizim elementi'''",
+'diff-table'              => "'''keste'''",
+'diff-tbody'              => "'''keste mazmunı'''",
+'diff-tr'                 => "'''qatar'''",
+'diff-td'                 => "'''kletka'''",
+'diff-th'                 => "'''atama'''",
+'diff-br'                 => "'''u'zilis'''",
+'diff-hr'                 => "'''gorizontal sızıqsha'''",
+'diff-code'               => "'''kompyuter kodı blogı'''",
+'diff-dl'                 => "'''anıqlama dizimi'''",
+'diff-dt'                 => "'''anıqlama termini'''",
+'diff-dd'                 => "'''anıqlama'''",
+'diff-input'              => "'''kiriw'''",
+'diff-form'               => "'''forma'''",
+'diff-img'                => "'''su'wret'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''siltew'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''qalın''''",
+'diff-strong'             => "'''strong'''",
+'diff-em'                 => "'''saylandı'''",
+'diff-font'               => "'''shrift'''",
+'diff-big'                => "'''u'lken'''",
+'diff-del'                => "'''o'shirilgen'''",
+'diff-tt'                 => "'''belgilengen enli'''",
+'diff-sub'                => "'''qatar astı'''",
+'diff-sup'                => "'''qatar u'stı'''",
+'diff-strike'             => "'''u'sti sızılg'an'''",
 
 # Search results
-'searchresults'             => "Ä°zlew na'tiyjeleri",
-'searchresulttext'          => "{{SITENAME}} saytında izlew haqqında ko'birek mag'lıwmat alg'ın'ız kelse, [[{{MediaWiki:Helppage}}|{{int:help}} betine]] o'tip qarap ko'rin'.",
-'searchsubtitle'            => 'İzlegenin\'iz: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" baslanıwshı barlıq betler]] | [[Special:WhatLinksHere/$1|"$1" siltewshi barlıq betler]])',
-'searchsubtitleinvalid'     => "'''$1''' ushın izlegenin'iz",
-'noexactmatch'              => "'''\"\$1\" atamalı bet joq.''' Bul betti [[:\$1|jaratıwın'ız]] mu'mkin.",
-'noexactmatch-nocreate'     => "'''\"\$1\" atamalı bet joq.'''",
-'toomanymatches'            => "Dım ko'p sa'ykeslikler qaytarıldı, basqa sorawdı isletip ko'rin'",
-'titlematches'              => "Bet ataması sa'ykes keledi",
-'notitlematches'            => 'Hesh qanday bet ataması tuwra kelmedi',
-'textmatches'               => "Bet tekstinin' tuwra kelgenleri",
-'notextmatches'             => 'Hesh qanday bet teksti tuwra kelmedi',
-'prevn'                     => "aldıng'ı $1",
-'nextn'                     => 'keyingi $1',
-'viewprevnext'              => "Ko'riw: ($1) ($2) ($3)",
-'search-result-size'        => "$1 ({{PLURAL:$2|1 so'z|$2 so'z}})",
-'search-result-score'       => "Qatnasıqlıg'ı: $1%",
-'search-redirect'           => "(qayta bag'ıtlandırıw $1)",
-'search-section'            => "(bo'lim $1)",
-'search-suggest'            => "Ba'lkim, siz bunı na'zerde tutqan shig'arsız: $1",
-'search-interwiki-caption'  => 'Qarındas proektler',
-'search-interwiki-default'  => "$1 na'tiyje:",
-'search-interwiki-more'     => "(ko'birek)",
-'search-mwsuggest-enabled'  => 'usınıslar menen',
-'search-mwsuggest-disabled' => 'usınıslarsız',
-'search-relatedarticle'     => 'Baylanıslı',
-'mwsuggest-disable'         => "AJAX usınısların o'shir",
-'searchrelated'             => 'baylanıslı',
-'searchall'                 => 'barlıq',
-'showingresults'            => "To'mende '''$2''' ornınan baslap {{PLURAL:$1|'''1''' na'tiyje|'''$1''' shekemgi na'tiyjeler}} ko'rsetilgen.",
-'showingresultsnum'         => "To'mende '''$2''' ornınan baslap {{PLURAL:$3|'''1''' na'tiyje|'''$3''' na'tiyje}} ko'rsetilgen.",
-'nonefound'                 => "'''Esletpe''': Defolt boyınsha tek g'ana sheklengen isimler ko'pliginen izlenedi. Barlıq mag'lıwmat tu'rin (sonın' ishinde sa'wbet betlerdi, shablonlardı h.t.b.) izlew ushın izlewin'izdi ''barlıq:'' prefiksi menen baslan', yamasa qa'legen isimler ko'pligin prefiks esabında qollanın'.",
-'powersearch'               => "Ken'eytilgen izlew",
-'powersearch-legend'        => "Ken'eytilgen izlew",
-'powersearch-ns'            => "Usı isimler ko'pliginen izlew:",
-'powersearch-redir'         => "Qayta bag'ıtlawshı betlerdi ko'rset",
-'powersearch-field'         => "İzlenetug'ın so'z (yamasa so'z dizbegi):",
-'search-external'           => 'Sırtqı izlewshi',
+'searchresults'                    => "Ä°zlew na'tiyjeleri",
+'searchresults-title'              => '"$1" sorawnaması boyınsha tabılg\'an na\'tiyjeler',
+'searchresulttext'                 => "{{SITENAME}} saytında izlew haqqında ko'birek mag'lıwmat alg'ın'ız kelse, [[{{MediaWiki:Helppage}}|{{int:help}} betine]] o'tip qarap ko'rin'.",
+'searchsubtitle'                   => 'İzlegenin\'iz: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|"$1" baslanıwshı barlıq betler]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" siltewshi barlıq betler]])',
+'searchsubtitleinvalid'            => "'''$1''' ushın izlegenin'iz",
+'noexactmatch'                     => "'''\"\$1\" atamalı bet joq.''' Bul betti [[:\$1|jaratıwın'ız]] mu'mkin.",
+'noexactmatch-nocreate'            => "'''\"\$1\" atamalı bet joq.'''",
+'toomanymatches'                   => "Dım ko'p sa'ykeslikler qaytarıldı, basqa sorawdı isletip ko'rin'",
+'titlematches'                     => "Bet ataması sa'ykes keledi",
+'notitlematches'                   => 'Hesh qanday bet ataması tuwra kelmedi',
+'textmatches'                      => "Bet tekstinin' tuwra kelgenleri",
+'notextmatches'                    => 'Hesh qanday bet teksti tuwra kelmedi',
+'prevn'                            => "aldıng'ı $1",
+'nextn'                            => 'keyingi $1',
+'viewprevnext'                     => "Ko'riw: ($1) ($2) ($3)",
+'searchmenu-legend'                => 'İzlew sazlawları',
+'searchmenu-exists'                => "'''Bul wikide \"[[:\$1]]\" atamalı bet bar'''",
+'searchmenu-new'                   => "'''Bul wikide \"[[:\$1]]\" betin jaratıw!'''",
+'searchhelp-url'                   => 'Help:Mazmunı',
+'searchmenu-prefix'                => "[[Special:PrefixIndex/$1|Usı prefiks penen baslanıwshı betlerdi ko'rset]]",
+'searchprofile-articles'           => "Mag'lıwmat betleri",
+'searchprofile-articles-and-proj'  => "Mag'lıwmat & proekt betleri",
+'searchprofile-project'            => 'Proekt betleri',
+'searchprofile-images'             => 'Fayllar',
+'searchprofile-everything'         => 'Barlıq jerde',
+'searchprofile-advanced'           => "Ken'eytilgen",
+'searchprofile-articles-tooltip'   => '$1 izlew',
+'searchprofile-project-tooltip'    => '$1 izlew',
+'searchprofile-images-tooltip'     => 'Fayllardı izlew',
+'searchprofile-everything-tooltip' => "Barlıq betlerde izlew (sa'wbet betlerin qosıp)",
+'searchprofile-advanced-tooltip'   => "Berilgen isimler ko'pliginde izlew",
+'prefs-search-nsdefault'           => "Baslang'ısh parametrler boyınsha izlew:",
+'prefs-search-nscustom'            => "Berilgen isimler ko'pligin izlew:",
+'search-result-size'               => "$1 ({{PLURAL:$2|1 so'z|$2 so'z}})",
+'search-result-score'              => "Qatnasıqlıg'ı: $1%",
+'search-redirect'                  => "(qayta bag'ıtlandırıw $1)",
+'search-section'                   => "(bo'lim $1)",
+'search-suggest'                   => "Ba'lkim, siz bunı na'zerde tutqan shig'arsız: $1",
+'search-interwiki-caption'         => 'Qarındas proektler',
+'search-interwiki-default'         => "$1 na'tiyje:",
+'search-interwiki-more'            => "(ko'birek)",
+'search-mwsuggest-enabled'         => 'usınıslar menen',
+'search-mwsuggest-disabled'        => 'usınıslarsız',
+'search-relatedarticle'            => 'Baylanıslı',
+'mwsuggest-disable'                => "AJAX usınısların o'shir",
+'searchrelated'                    => 'baylanıslı',
+'searchall'                        => 'barlıq',
+'showingresults'                   => "To'mende '''$2''' ornınan baslap {{PLURAL:$1|'''1''' na'tiyje|'''$1''' shekemgi na'tiyjeler}} ko'rsetilgen.",
+'showingresultsnum'                => "To'mende '''$2''' ornınan baslap {{PLURAL:$3|'''1''' na'tiyje|'''$3''' na'tiyje}} ko'rsetilgen.",
+'showingresultstotal'              => "To'mende {{PLURAL:$4|'''$3''' arasınan '''$1''' na'tiyje ko'rsetiledi|'''$3''' arasınan '''$1 — $2''' na'tiyjeler ko'rsetiledi}}",
+'nonefound'                        => "'''Esletpe''': Defolt boyınsha tek g'ana sheklengen isimler ko'pliginen izlenedi. 
+Barlıq mag'lıwmat tu'rin (sonın' ishinde sa'wbet betlerdi, shablonlardı h.t.b.) izlew ushın izlewin'izdi ''all:'' prefiksi menen baslan', yamasa qa'legen isimler ko'pligin prefiks esabında qollanın'.",
+'search-nonefound'                 => "Sorawg'a sa'ykes na'tiyje tabılmadı.",
+'powersearch'                      => "Ken'eytilgen izlew",
+'powersearch-legend'               => "Ken'eytilgen izlew",
+'powersearch-ns'                   => "Usı isimler ko'pliginen izlew:",
+'powersearch-redir'                => "Qayta bag'ıtlawshı betlerdi ko'rset",
+'powersearch-field'                => "İzlenetug'ın so'z (yamasa so'z dizbegi):",
+'search-external'                  => 'Sırtqı izlewshi',
 
 # Preferences page
-'preferences'              => 'Sazlawlar',
-'mypreferences'            => "Menin' sazlawlarım",
-'prefs-edits'              => "O'zgertiwler sanı:",
-'prefsnologin'             => 'Kirilmegen',
-'prefsnologintext'         => 'Sazlawların\'ızdı ornatıw ushın <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} kiriwin\'iz]</span> sha\'rt.',
-'prefsreset'               => "Sazlawlar baslang'ısh qa'lpine keltirildi.",
-'qbsettings'               => 'Navigatsiya paneli',
-'qbsettings-none'          => 'Hesh qanday',
-'qbsettings-fixedleft'     => 'Shepke bekitilgen',
-'qbsettings-fixedright'    => "On'g'a bekitilgen",
-'qbsettings-floatingleft'  => 'Shepte jıljıwshı',
-'qbsettings-floatingright' => "On'da jıljıwshı",
-'changepassword'           => "Paroldi o'zgertiw",
-'skin'                     => "Sırtqı ko'rinis",
-'math'                     => 'Formulalar',
-'dateformat'               => "Sa'ne formatı",
-'datedefault'              => 'Hesh sazlawlarsız',
-'datetime'                 => "Sa'ne ha'm waqıt",
-'math_unknown_error'       => "belgisiz qa'telik",
-'math_unknown_function'    => 'belgisiz funktsiya',
-'math_lexing_error'        => "leksikalıq qa'telik",
-'math_syntax_error'        => "sintaksikalıq qa'telik",
-'prefs-personal'           => 'Paydalanıwshı profaylı',
-'prefs-rc'                 => "Aqırg'ı o'zgerisler",
-'prefs-watchlist'          => 'Baqlaw dizimi',
-'prefs-watchlist-days'     => "Baqlaw dizimindegi ku'nlerdin' ko'rsetiw sanı:",
-'prefs-watchlist-edits'    => "Ken'eytilgen baqlaw dizimindegi o'zgeristerdin' en' ko'p ko'rsetiw sanı:",
-'prefs-misc'               => 'Basqa',
-'saveprefs'                => 'Saqla',
-'resetprefs'               => "Saqlanbag'an o'zgerislerdi o'shir",
-'oldpassword'              => "Aldıng'ı parol:",
-'newpassword'              => 'Taza parol:',
-'retypenew'                => "Taza paroldi qayta kiritin':",
-'textboxsize'              => "O'zgertiw",
-'rows'                     => 'Qatarlar:',
-'columns'                  => "Bag'analar:",
-'searchresultshead'        => 'Ä°zlew',
-'recentchangesdays'        => "Aqırg'ı o'zgerislerde ko'rsetiletug'ın ku'nler:",
-'recentchangescount'       => "Aqırg'ı o'zgerisler, tariyx ha'm jurnal betlerinde ko'rsetiletug'ın o'zgerisler sanı:",
-'savedprefs'               => "Sizin' sazlawların'ız saqlandı.",
-'timezonelegend'           => 'Waqıt zonası',
-'timezonetext'             => "¹Jergilikli waqıtın'ız benen server waqıtının' (UTC) arasındag'ı ayırmashılıq saat sanı.",
-'localtime'                => 'Jergilikli waqıt',
-'servertime'               => "Serverdin' waqtı",
-'guesstimezone'            => 'Brauzerden alıp toltırıw',
-'allowemail'               => 'Basqalardan xat qabıllawdı qos',
-'prefs-searchoptions'      => 'İzlew sazlawları',
-'prefs-namespaces'         => "Ä°simler ko'plikleri",
-'defaultns'                => "Usı isimler ko'pliklerinen defolt boyınsha izdew:",
-'default'                  => 'defolt',
-'files'                    => 'Fayllar',
+'preferences'               => 'Sazlawlar',
+'mypreferences'             => "Menin' sazlawlarım",
+'prefs-edits'               => "O'zgertiwler sanı:",
+'prefsnologin'              => 'Kirilmegen',
+'prefsnologintext'          => 'Sazlawların\'ızdı ornatıw ushın <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} kiriwin\'iz]</span> sha\'rt.',
+'prefsreset'                => "Sazlawlar baslang'ısh qa'lpine keltirildi.",
+'qbsettings'                => 'Navigatsiya paneli',
+'qbsettings-none'           => 'Hesh qanday',
+'qbsettings-fixedleft'      => 'Shepke bekitilgen',
+'qbsettings-fixedright'     => "On'g'a bekitilgen",
+'qbsettings-floatingleft'   => 'Shepte jıljıwshı',
+'qbsettings-floatingright'  => "On'da jıljıwshı",
+'changepassword'            => "Paroldi o'zgertiw",
+'skin'                      => "Sırtqı ko'rinis",
+'skin-preview'              => 'Korip al',
+'math'                      => 'Formulalar',
+'dateformat'                => "Sa'ne formatı",
+'datedefault'               => 'Hesh sazlawlarsız',
+'datetime'                  => "Sa'ne ha'm waqıt",
+'math_unknown_error'        => "belgisiz qa'telik",
+'math_unknown_function'     => 'belgisiz funktsiya',
+'math_lexing_error'         => "leksikalıq qa'telik",
+'math_syntax_error'         => "sintaksikalıq qa'telik",
+'prefs-personal'            => 'Paydalanıwshı profaylı',
+'prefs-rc'                  => "Aqırg'ı o'zgerisler",
+'prefs-watchlist'           => 'Baqlaw dizimi',
+'prefs-watchlist-days'      => "Baqlaw dizimindegi ku'nlerdin' ko'rsetiw sanı:",
+'prefs-watchlist-days-max'  => "(maksimum 7 ku'n)",
+'prefs-watchlist-edits'     => "Ken'eytilgen baqlaw dizimindegi o'zgeristerdin' en' ko'p ko'rsetiw sanı:",
+'prefs-watchlist-edits-max' => '(maksimum: 1000)',
+'prefs-misc'                => 'Basqa',
+'prefs-resetpass'           => "Paroldi o'zgertiw",
+'saveprefs'                 => 'Saqla',
+'resetprefs'                => "Saqlanbag'an o'zgerislerdi o'shir",
+'textboxsize'               => "O'zgertiw",
+'prefs-edit-boxsize'        => "O'zgertiw aynasının' o'lshemi.",
+'rows'                      => 'Qatarlar:',
+'columns'                   => "Bag'analar:",
+'searchresultshead'         => 'Ä°zlew',
+'recentchangesdays'         => "Aqırg'ı o'zgerislerde ko'rsetiletug'ın ku'nler:",
+'recentchangesdays-max'     => "(maksimum $1 {{PLURAL:$1|ku'n|ku'n}})",
+'recentchangescount'        => "Aqırg'ı o'zgerisler, tariyx ha'm jurnal betlerinde ko'rsetiletug'ın o'zgerisler sanı:",
+'savedprefs'                => "Sizin' sazlawların'ız saqlandı.",
+'timezonelegend'            => 'Waqıt zonası',
+'timezonetext'              => "¹Jergilikli waqıtın'ız benen server waqıtının' (UTC) arasındag'ı ayırmashılıq saat sanı.",
+'localtime'                 => 'Jergilikli waqıt:',
+'timezoneselect'            => 'Waqıt zonası:',
+'timezoneuseserverdefault'  => "Serverdin' baslang'ısh sazlawların qollanıw",
+'timezoneuseoffset'         => "Basqa (o'zgeristi ko'rsetin')",
+'timezoneoffset'            => "Saat o'zgerisi¹:",
+'servertime'                => 'Server waqtı:',
+'guesstimezone'             => 'Brauzerden alıp toltırıw',
+'allowemail'                => 'Basqalardan xat qabıllawdı qos',
+'prefs-searchoptions'       => 'İzlew sazlawları',
+'prefs-namespaces'          => "Ä°simler ko'plikleri",
+'defaultns'                 => "Usı isimler ko'pliklerinen defolt boyınsha izdew:",
+'default'                   => 'defolt',
+'files'                     => 'Fayllar',
 
 # User rights
 'userrights'                  => 'Paydalanıwshı huqıqların basqarıw', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Paydalanıwshı toparların basqarıw',
 'userrights-user-editname'    => "Paydalanıwshı atın kiritin':",
 'editusergroup'               => "Paydalanıwshı Toparların O'zgertiw",
-'editinguser'                 => "<b>$1</b> ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) paydalanıwshısının' huquqları o'zgertilmekte",
+'editinguser'                 => "<b>$1</b> ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) paydalanıwshısının' huquqları o'zgertilmekte",
 'userrights-editusergroup'    => "Paydalanıwshı toparların o'zgertiw",
 'saveusergroups'              => 'Paydalanıwshı Toparların Saqlaw',
 'userrights-groupsmember'     => "Ag'zalıq toparı:",
@@ -904,6 +1066,7 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'right-minoredit'            => "O'zgerislerdi kishi dep belgilew",
 'right-move'                 => "Betlerdi ko'shiriw",
 'right-move-subpages'        => "Betlerdi bag'ınıslıları menen birge ko'shiriw",
+'right-move-rootuserpages'   => "Tiykarg'ı paydalanıwshı betlerin ko'shiriw",
 'right-suppressredirect'     => "Betti ko'shirgende eski atamasınan qayta bag'ıtlawshı jaratpaw",
 'right-upload'               => 'Fayllardı aploud qılıw',
 'right-reupload'             => "Bar fayldın' u'stine jazıw",
@@ -945,9 +1108,43 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'rightslogentry' => "$1 paydalanıwshısının' ag'za bolg'an toparları $2 degennen $3 degenge o'zgertti",
 'rightsnone'     => '(hesh qanday)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'bul betti oqıw',
+'action-edit'                 => "bul betti o'zgertiw",
+'action-createpage'           => 'betlerdi jaratıw',
+'action-createtalk'           => "Sa'wbet betlerin jaratıw",
+'action-createaccount'        => 'bul paydalanıwshı akkauntın jaratıw',
+'action-minoredit'            => "bul o'zgeristi kish dep esaplaw",
+'action-move'                 => "bul betti ko'shiriw",
+'action-move-subpages'        => "bu; bet ha'm onın' bag'ınıslıların ko'shiriw",
+'action-move-rootuserpages'   => "tiykarg'ı paydalanıwshı betlerin ko'shiriw",
+'action-upload'               => 'bul fayldı aploud qılıw',
+'action-reupload'             => "usı fayldı u'stine jazıw",
+'action-reupload-shared'      => "ortalıq repozitariyindegi usı fayldı u'stine jaz",
+'action-upload_by_url'        => 'bul fayldı URL adresinen aploud qılıw',
+'action-writeapi'             => "o'zgerisler ushın APIdı paydalanıw",
+'action-delete'               => "bul betti o'shiriw",
+'action-deleterevision'       => "bul nusqanı o'shiriw",
+'action-deletedhistory'       => "bul bettin' o'shirilgen tariyxın ko'riw",
+'action-browsearchive'        => "o'shirilgen betlerdi izlew",
+'action-undelete'             => 'bul betti qayta tiklew',
+'action-suppressrevision'     => "bul jasırın nusqanı qayta ko'riw ha'm qayta tiklew",
+'action-suppressionlog'       => "bul jeke jurnaldı ko'riw",
+'action-block'                => "bul paydalanıwshını o'zgerisler kiritiwden bloklaw",
+'action-protect'              => "bul bettin' qorg'aw da'rejelerin o'zgertiw",
+'action-import'               => 'bul betti basqa wikiden import qılıw',
+'action-importupload'         => 'bul betti fayl aploudı arqalı aploud qılıw',
+'action-unwatchedpages'       => "baqlanbaytug'ın betlerdin' dizimin ko'riw",
+'action-trackback'            => '"trackback"tı jiberiw',
+'action-mergehistory'         => "bul bettin' tariyxın birlestiriw",
+'action-userrights'           => "paydalanıwshılardın barlıq huquqların o'zgertiw",
+'action-userrights-interwiki' => "basqa wikilerdegi paydalanıwshılar huquqların o'zgertiw",
+'action-siteadmin'            => "mag'lıwmatlar bazasın bloklaw yamasa bloklawdan shıg'arıw",
+
 # Recent changes
 'nchanges'                          => "{{PLURAL:$1|1 o'zgeris|$1 o'zgeris}}",
 'recentchanges'                     => "Aqırg'ı o'zgerisler",
+'recentchanges-legend'              => "Aqırg'ı o'zgerisler sazlawları",
 'recentchangestext'                 => "Bul bette usı wikidegi ha'zirgi o'zgerisler baqlanadı.",
 'recentchanges-feed-description'    => "Wikidin' usı ag'ımındag'ı en' aqırg'ı o'zgerislerin baqlaw.",
 'rcnote'                            => "To'mende $4, $5 waqtındag'ı aqırg'ı {{PLURAL:$2|ku'ndegi|'''$2''' ku'ndegi}} {{PLURAL:$1|'''1''' o'zgeris ko'rsetilgen|aqırg'ı '''$1''' o'zgeris ko'rsetilgen}}.",
@@ -971,6 +1168,8 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'rc_categories'                     => 'Kategoriyalarg\'a sheklew ("|" belgisi menen ajıratın\')',
 'rc_categories_any'                 => "Ha'r qanday",
 'newsectionsummary'                 => "/* $1 */ taza bo'lim",
+'rc-enhanced-expand'                => "Tolıq mag'lıwmattı ko'rsetiw (JavaScriptti talap etedi)",
+'rc-enhanced-hide'                  => "Tolıq mag'lıwmattı jasırıw",
 
 # Recent changes linked
 'recentchangeslinked'          => "Baylanıslı o'zgerisler",
@@ -1034,17 +1233,17 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'upload_source_url'  => " (jaramlı, ha'mmege ashıq URL)",
 'upload_source_file' => " (sizin' kompyuterin'izdegi fayl)",
 
-# Special:ImageList
-'imagelist_search_for'  => 'Media atamasın izlew:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Media atamasın izlew:',
 'imgfile'               => 'fayl',
-'imagelist'             => 'Fayllar dizimi',
-'imagelist_date'        => "Sa'ne",
-'imagelist_name'        => 'Atama',
-'imagelist_user'        => 'Paydalnıwshı',
-'imagelist_size'        => "Ha'jim",
-'imagelist_description' => 'Kommentariy',
-
-# Image description page
+'listfiles'             => 'Fayllar dizimi',
+'listfiles_date'        => "Sa'ne",
+'listfiles_name'        => 'Atama',
+'listfiles_user'        => 'Paydalnıwshı',
+'listfiles_size'        => "Ha'jim",
+'listfiles_description' => 'Kommentariy',
+
+# File description page
 'filehist'                       => 'Fayl tariyxı',
 'filehist-help'                  => "Aldın usı fayl qanday ko'riniste bolg'anın ko'riw ushin ku'n-ay/waqıt degendi basın'.",
 'filehist-deleteall'             => "ha'mmesin o'shir",
@@ -1052,11 +1251,14 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 'filehist-revert'                => 'qaytarıw',
 'filehist-current'               => "ha'zirgi",
 'filehist-datetime'              => "Sa'ne/Waqıt",
+'filehist-thumb'                 => 'Miniatyurası',
+'filehist-thumbtext'             => "$1 waqtındag'ı nusqanın' miniatyurası",
+'filehist-nothumb'               => 'Miniatyurası joq',
 'filehist-user'                  => 'Paydalanıwshı',
 'filehist-dimensions'            => "O'lshemleri",
 'filehist-filesize'              => "Fayldın' ha'jmi",
 'filehist-comment'               => 'Kommentariy',
-'imagelinks'                     => 'Siltewler',
+'imagelinks'                     => 'Fayl siltewleri',
 'linkstoimage'                   => "To'mendegi {{PLURAL:$1|bet|$1 bet}} bul faylg'a siltelgen:",
 'nolinkstoimage'                 => "Bul faylg'a hesh bir bet siltelmegen.",
 'sharedupload'                   => "Bul ortalıq fayl ha'm basqa proektlerde paydalanılsa boladı.",
@@ -1106,28 +1308,29 @@ Sha'rtli belgiler: (ha'z.) = ha'zirgi nusqasi menen parqı,
 
 # Random page
 'randompage'         => "Qa'legen bet",
-'randompage-nopages' => "Bul isimler ko'pliginde hesh bet joq.",
+'randompage-nopages' => '"$1" isimler ko\'pliginde hesh bet joq.',
 
 # Random redirect
 'randomredirect'         => "Qa'legen burıwshı",
-'randomredirect-nopages' => "Bul isimler ko'pliginde hesh burıwshı joq.",
+'randomredirect-nopages' => '"$1" isimler ko\'pliginde qayta bag\'ıtlang\'an betler joq.',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => '{{SITENAME}} statistikası',
-'userstats'              => 'Paydalanıwshı statistikası',
-'sitestatstext'          => "Mag'lıwmatlar bazasında {{PLURAL:$1|'''1'''|ha'mmesi bolıp '''$1'''}} bet bar.
-Bug'an «sa'wbet» betleri, {{SITENAME}} haqqındag'ı betler, «shala» betler, burıwshı betler, ja'ne de basqa mag'lıwmat dep tanılmaytug'ın betler kiritiledi.
-Usılardı esapqa almag'anda, haqıyqıy mag'lıwmatqa iye '''$2''' bet bar dep boljanadı.
-
-'''$8''' fayl aploud qılındı.
-
-{{SITENAME}} ornatılg'annan beri betler {{PLURAL:$3|'''1'''|ha'mmesi bolıp '''$3'''}} ret qaralg'an, '''$4''' ret o'zgertilgen.
-Bunın' na'tiyjesinde ortasha esap penen ha'r bir betke '''$5''' o'zgeris tuwrı keledi, ha'mde ha'r bir o'zgeriske '''$6''' qaraw tuwrı  keledi.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Tapsırımalar gezeginin'] uzınlıg'ı: '''$7'''.",
-'userstatstext'          => "Bul jerde '''$1''' [[Special:ListUsers|esapqa alıng'an paydalanıwshı]] bar, solardın' ishinen '''$2''' (yag'nıy '''$4 %''') paydalanıwshısında $5 huquqları bar.",
-'statistics-mostpopular' => "En' ko'p ko'rilgen betler",
+'statistics'               => 'Statistika',
+'statistics-header-pages'  => 'Bet statistikası',
+'statistics-header-edits'  => "Statistikanı o'zgertiw",
+'statistics-header-views'  => "Statistikanı ko'riw",
+'statistics-header-users'  => 'Paydalanıwshı statistikası',
+'statistics-articles'      => 'Maqalalar',
+'statistics-pages'         => 'Betler',
+'statistics-pages-desc'    => "Wikidegi barlıw betler, sawbet, qayta bag'itlang'an h.t.b. betlerin qosqanda.",
+'statistics-files'         => "Aploud qılıng'an fayllar",
+'statistics-edits'         => "{{SITENAME}} ornatılg'anlı beri bettegi o'zgerisler sanı",
+'statistics-edits-average' => "Ha'r bir betke ortasha kiritilgen o'zgerisler sanı",
+'statistics-views-total'   => "Barlıq ko'riwler",
+'statistics-views-peredit' => "Ha'r bir o'zgeriske ko'riwler sanı",
+'statistics-users'         => "Registratsiyadan o'tken [[Special:ListUsers|paydalanıwshılar]]",
+'statistics-users-active'  => 'Aktiv paydalanıwshılar',
+'statistics-mostpopular'   => "En' ko'p ko'rilgen betler",
 
 'disambiguations'     => "Ko'p ma'nisli betler",
 'disambiguationspage' => '{{ns:template}}:disambig',
@@ -1166,24 +1369,29 @@ Bunın' na'tiyjesinde ortasha esap penen ha'r bir betke '''$5''' o'zgeris tuwrı
 'popularpages'            => "En' ko'p ko'rilgen betler",
 'wantedcategories'        => "Talap qılıng'an kategoriyalar",
 'wantedpages'             => "Talap qılıng'an betler",
+'wantedfiles'             => 'Kerekli fayllar',
+'wantedtemplates'         => 'Kerekli shablonlar',
 'mostlinked'              => "En' ko'p siltelgen betler",
 'mostlinkedcategories'    => "En' ko'p paydalanılg'an kategoriyalar",
 'mostlinkedtemplates'     => "En' ko'p paydalanılg'an shablonlar",
 'mostcategories'          => "En' ko'p kategoriyalang'an betler",
 'mostimages'              => "En' ko'p paydalanılg'an fayllar",
 'mostrevisions'           => "En' ko'p du'zetilgen betler",
-'prefixindex'             => 'Atama baslaw dizimi',
+'prefixindex'             => 'Prefiksi bar barlıq betler',
 'shortpages'              => "En' qısqa betler",
 'longpages'               => "En' uzın betler",
 'deadendpages'            => "Hesh betke siltemeytug'ın betler",
 'deadendpagestext'        => "To'mendegi betler {{SITENAME}} proyektindegi basqa betlerge siltelmegen.",
 'protectedpages'          => "Qorg'alg'an betler",
 'protectedpages-indef'    => "Tek belgisiz qorg'awlar",
+'protectedpages-cascade'  => "Tek kaskadlı qorg'awlar",
 'protectedpagestext'      => "To'mendegi betler ko'shiriw ha'm o'zgertiwden qorg'alg'an",
 'protectedpagesempty'     => "Usı parametrler menen ha'zir hesh bet qorg'almag'an",
 'protectedtitles'         => "Qorg'alg'an atamalar",
 'protectedtitlestext'     => "To'mendegi atamalar jaratılıwdan qorg'alg'an",
 'listusers'               => 'Paydalanıwshı dizimi',
+'listusers-editsonly'     => "Tek o'zgeris kiritken paydalanıwshılardı ko'rset",
+'usereditcount'           => "$1 {{PLURAL:$1|o'zgeris|o'zgeris}}",
 'newpages'                => "En' taza betler",
 'newpages-username'       => 'Paydalanıwshı atı:',
 'ancientpages'            => "En' eski betler",
@@ -1203,8 +1411,6 @@ Bunın' na'tiyjesinde ortasha esap penen ha'r bir betke '''$5''' o'zgeris tuwrı
 'speciallogtitlelabel' => 'Atama:',
 'log'                  => 'Jurnallar',
 'all-logs-page'        => "Ha'mme jurnallar",
-'log-search-legend'    => 'Jurnallardı izlew',
-'log-search-submit'    => "O'tin'",
 'log-title-wildcard'   => "Usı tekstten baslang'an atamalardı izlew",
 
 # Special:AllPages
@@ -1213,6 +1419,7 @@ Bunın' na'tiyjesinde ortasha esap penen ha'r bir betke '''$5''' o'zgeris tuwrı
 'nextpage'          => 'Keyingi bet ($1)',
 'prevpage'          => "Aldıng'ı bet ($1)",
 'allpagesfrom'      => "Mına betten baslap ko'rsetiw:",
+'allpagesto'        => "Usı betke shekem ko'rsetiw:",
 'allarticles'       => "Ha'mme betler",
 'allinnamespace'    => "Ha'mme betler ($1 isimler ko'pligi)",
 'allnotinnamespace' => "Ha'mme betler ($1 isimler ko'pliginen emes)",
@@ -1231,17 +1438,39 @@ Ja'nede [[Special:WantedCategories|kerekli kategoriyalardı]] qarap ko'rin'.",
 'special-categories-sort-count' => "sanı boyınsha ta'rtiplew",
 'special-categories-sort-abc'   => "a'lipbe boyınsha ta'rtiplew",
 
+# Special:DeletedContributions
+'deletedcontributions' => "Paydalanıwshının' o'shiriw u'lesi",
+
+# Special:LinkSearch
+'linksearch'      => 'Sırtqı siltewler',
+'linksearch-pat'  => 'İzlew shablonı:',
+'linksearch-ns'   => "Ä°simler ko'pligi:",
+'linksearch-ok'   => 'Ä°zlew',
+'linksearch-line' => '$2 degennen $1 siltegen',
+
 # Special:ListUsers
 'listusersfrom'      => "Mına paydalanıwshıdan baslap ko'rsetiw:",
 'listusers-submit'   => "Ko'rset",
 'listusers-noresult' => 'Paydalanıwshı tabılmadı.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Paydalanıwshılardı esapqa alıw jurnalı',
+'newuserlogpagetext'          => 'Bul paydalanıwshılardı esapqa alıw jurnalı',
+'newuserlog-byemail'          => 'parol e-mail arqalı jiberildi',
+'newuserlog-create-entry'     => "Jan'a paydalanıwshı",
+'newuserlog-create2-entry'    => "jan'a akkaunt jarattı: $1",
+'newuserlog-autocreate-entry' => 'Akkaunt avtomatik halda jaratıldı',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Paydalanıwshılar toparı huqıqları',
-'listgrouprights-group'    => 'Topar',
-'listgrouprights-rights'   => 'Huquqları',
-'listgrouprights-helppage' => "Ja'rdem:Topar huquqları",
-'listgrouprights-members'  => "(ag'zalar dizimi)",
+'listgrouprights'                 => 'Paydalanıwshılar toparı huqıqları',
+'listgrouprights-group'           => 'Topar',
+'listgrouprights-rights'          => 'Huquqları',
+'listgrouprights-helppage'        => "Ja'rdem:Topar huquqları",
+'listgrouprights-members'         => "(ag'zalar dizimi)",
+'listgrouprights-addgroup'        => "$1 {{PLURAL:$2|toparın|toparların}} qosıwı mu'mkin",
+'listgrouprights-removegroup'     => "$1 {{PLURAL:$2|toparın|toparların}} o'shiriwi mu'mkin",
+'listgrouprights-addgroup-all'    => "Barlıq toparlardı qosıwı mu'mkin",
+'listgrouprights-removegroup-all' => "Barlıq toparlardı o'shiriwi mu'mkin",
 
 # E-mail user
 'mailnologin'     => 'Jiberiwge adres tabılmadı',
@@ -1249,6 +1478,7 @@ Ja'nede [[Special:WantedCategories|kerekli kategoriyalardı]] qarap ko'rin'.",
 'emailpage'       => "Paydalanıwshıg'a e-mail jiberiw",
 'defemailsubject' => '{{SITENAME}} e-mail',
 'noemailtitle'    => 'E-mail adresi joq',
+'email-legend'    => 'Basqa {{SITENAME}} paydalanıwshısına xat jiberiw',
 'emailfrom'       => 'Kimnen:',
 'emailto'         => 'Kimge:',
 'emailsubject'    => 'Teması:',
@@ -1259,36 +1489,31 @@ Ja'nede [[Special:WantedCategories|kerekli kategoriyalardı]] qarap ko'rin'.",
 'emailsenttext'   => "E-mail xatın'ız jiberildi.",
 
 # Watchlist
-'watchlist'            => 'Betlerdi baqlaw dizimi',
-'mywatchlist'          => "Menin' baqlaw dizimim",
-'watchlistfor'         => "('''$1''' ushın)",
-'nowatchlist'          => "Baqlaw dizimin'iz bos.",
-'watchlistanontext'    => "Baqlaw dizimin'izdegilerdi qaraw yamasa o'zgertiw ushın $1 kerek.",
-'watchnologin'         => 'Kirilmegen',
-'watchnologintext'     => "Baqlaw dizimin'izdi o'zgertiw ushın [[Special:UserLogin|kiriwin'iz]] kerek.",
-'addedwatch'           => 'Baqlaw dizimine qosıldı',
-'addedwatchtext'       => "\"[[:\$1]]\" beti [[Special:Watchlist|baqlaw dizimin'izge]] qosıldı.
+'watchlist'         => 'Betlerdi baqlaw dizimi',
+'mywatchlist'       => "Menin' baqlaw dizimim",
+'watchlistfor'      => "('''$1''' ushın)",
+'nowatchlist'       => "Baqlaw dizimin'iz bos.",
+'watchlistanontext' => "Baqlaw dizimin'izdegilerdi qaraw yamasa o'zgertiw ushın $1 kerek.",
+'watchnologin'      => 'Kirilmegen',
+'watchnologintext'  => "Baqlaw dizimin'izdi o'zgertiw ushın [[Special:UserLogin|kiriwin'iz]] kerek.",
+'addedwatch'        => 'Baqlaw dizimine qosıldı',
+'addedwatchtext'    => "\"[[:\$1]]\" beti [[Special:Watchlist|baqlaw dizimin'izge]] qosıldı.
 Usı ha'm og'an baylanıslı bolg'an sa'wbet betlerinde bolatug'ın keleshektegi o'zgerisler usı dizimde ko'rsetiledi ha'mde betti tabıwdı an'satlastırıw ushın [[Special:RecentChanges|taza o'zgerisler diziminde]] '''juwan ha'ripte''' ko'rsetiledi.
 Eger siz bul betti baqlaw dizimin'izden o'shirmekshi bolsan'ız bettin' joqarg'ı on' jag'ındag'ı \"Baqlamaw\" jazıwın basın'.",
-'removedwatch'         => "Baqlaw diziminen o'shirildi",
-'removedwatchtext'     => '"[[:$1]]" beti baqlaw dizimin\'izden o\'shirildi.',
-'watch'                => 'Baqlaw',
-'watchthispage'        => 'Bul betti baqlaw',
-'unwatch'              => 'Baqlamaw',
-'unwatchthispage'      => 'Baqlawdı toqtatıw',
-'notanarticle'         => "Mag'lıwmat beti emes",
-'notvisiblerev'        => "Nusqa o'shirildi",
-'watchlist-details'    => "Baqlaw dizimin'izde (sa'wbet betlerin esapqa almag'anda) {{PLURAL:$1|1 bet|$1 bet}} bar.",
-'wlheader-enotif'      => "* E-mail arqalı eskertiw qosılg'an.",
-'watchlistcontains'    => "Sizin' baqlaw dizimin'izde {{PLURAL:$1|1 bet|$1 bet}} bar.",
-'wlnote'               => "To'mende aqırg'ı {{PLURAL:$2|saattag'ı|'''$2''' saattag'ı}} {{PLURAL:$1|aqırg'ı o'zgeris bar|aqırg'ı '''$1''' o'zgeris bar}}.",
-'wlshowlast'           => "Aqırg'ı $1 saat, $2 ku'n, $3 ko'rset",
-'watchlist-show-bots'  => "Bot o'zgertiwlerin' ko'rset",
-'watchlist-hide-bots'  => "Bot o'zgertiwlerin' jasır",
-'watchlist-show-own'   => "O'zgertiwlerimdi ko'rset",
-'watchlist-hide-own'   => "O'zgertiwlerimdi jasır",
-'watchlist-show-minor' => "Kishi o'zgerislerdi ko'rset",
-'watchlist-hide-minor' => "Kishi o'zgerislerdi jasır",
+'removedwatch'      => "Baqlaw diziminen o'shirildi",
+'removedwatchtext'  => '"[[:$1]]" beti baqlaw dizimin\'izden o\'shirildi.',
+'watch'             => 'Baqlaw',
+'watchthispage'     => 'Bul betti baqlaw',
+'unwatch'           => 'Baqlamaw',
+'unwatchthispage'   => 'Baqlawdı toqtatıw',
+'notanarticle'      => "Mag'lıwmat beti emes",
+'notvisiblerev'     => "Nusqa o'shirildi",
+'watchlist-details' => "Baqlaw dizimin'izde (sa'wbet betlerin esapqa almag'anda) {{PLURAL:$1|1 bet|$1 bet}} bar.",
+'wlheader-enotif'   => "* E-mail arqalı eskertiw qosılg'an.",
+'watchlistcontains' => "Sizin' baqlaw dizimin'izde {{PLURAL:$1|1 bet|$1 bet}} bar.",
+'wlnote'            => "To'mende aqırg'ı {{PLURAL:$2|saattag'ı|'''$2''' saattag'ı}} {{PLURAL:$1|aqırg'ı o'zgeris bar|aqırg'ı '''$1''' o'zgeris bar}}.",
+'wlshowlast'        => "Aqırg'ı $1 saat, $2 ku'n, $3 ko'rset",
+'watchlist-options' => "Baqlaw diziminin' sazlawları",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Baqlaw...',
@@ -1305,33 +1530,37 @@ Eger siz bul betti baqlaw dizimin'izden o'shirmekshi bolsan'ız bettin' joqarg'Ä
 'enotif_lastdiff'              => "Usı o'zgeris ushın $1 degendi ko'rin'iz.",
 'enotif_anon_editor'           => 'anonim paydalanıwshı $1',
 
-# Delete/protect/revert
-'deletepage'                  => "Betti o'shir",
-'confirm'                     => 'Tastıyıqlaw',
-'excontent'                   => "bolg'an mag'lıwmat: '$1'",
-'excontentauthor'             => "bolg'an mag'lıwmat: '$1' (tek '[[Special:Contributions/$2|$2]]' u'lesi)",
-'exblank'                     => 'bet bos edi',
-'delete-confirm'              => '"$1" o\'shiriw',
-'delete-legend'               => "O'shiriw",
-'historywarning'              => "Esletpe: O'shireyin dep atırg'an betin'izdin' tariyxi bar:",
-'confirmdeletetext'           => "Siz bul betti yamasa su'wretti barliq tariyxı menen mag'lıwmatlar bazasınan o'shirejaqsız.
+# Delete
+'deletepage'            => "Betti o'shir",
+'confirm'               => 'Tastıyıqlaw',
+'excontent'             => "bolg'an mag'lıwmat: '$1'",
+'excontentauthor'       => "bolg'an mag'lıwmat: '$1' (tek '[[Special:Contributions/$2|$2]]' u'lesi)",
+'exblank'               => 'bet bos edi',
+'delete-confirm'        => '"$1" o\'shiriw',
+'delete-legend'         => "O'shiriw",
+'historywarning'        => "Esletpe: O'shireyin dep atırg'an betin'izdin' tariyxi bar:",
+'confirmdeletetext'     => "Siz bul betti yamasa su'wretti barliq tariyxı menen mag'lıwmatlar bazasınan o'shirejaqsız.
 Bunın' aqıbetin tu'singenin'izdi ha'm [[{{MediaWiki:Policy-url}}]] siyasatına ılayıqlı ekenligin tastıyıqlan'.",
-'actioncomplete'              => "Ha'reket tamamlandı",
-'deletedtext'                 => "\"<nowiki>\$1</nowiki>\" o'shirildi.
+'actioncomplete'        => "Ha'reket tamamlandı",
+'deletedtext'           => "\"<nowiki>\$1</nowiki>\" o'shirildi.
 Aqırg'ı o'shirilgenlerdin' dizimin ko'riw ushin \$2 ni qaran'",
-'deletedarticle'              => '"[[$1]]" o\'shirildi',
-'dellogpage'                  => "O'shiriw jurnalı",
-'dellogpagetext'              => "To'mende en' aqırg'ı o'shirilgenlerdin' dizimi keltirilgen",
-'deletionlog'                 => "o'shiriw jurnalı",
-'reverted'                    => "Aldınraqtag'ı nusqasına qaytarılg'an",
-'deletecomment'               => "O'shiriwdin' sebebi:",
-'deleteotherreason'           => 'Basqa/qosımsha sebep:',
-'deletereasonotherlist'       => 'Basqa sebep',
-'rollback'                    => "O'zgerislerdi biykar etiw",
-'rollback_short'              => 'Biykar etiw',
-'rollbacklink'                => 'qaytarıw',
-'rollbackfailed'              => "Biykar etiw sa'tsiz tamamlandı",
-'editcomment'                 => 'O\'zgertiwdin\' bolg\'an kommentariyi: "<i>$1</i>".', # only shown if there is an edit comment
+'deletedarticle'        => '"[[$1]]" o\'shirildi',
+'dellogpage'            => "O'shiriw jurnalı",
+'dellogpagetext'        => "To'mende en' aqırg'ı o'shirilgenlerdin' dizimi keltirilgen",
+'deletionlog'           => "o'shiriw jurnalı",
+'reverted'              => "Aldınraqtag'ı nusqasına qaytarılg'an",
+'deletecomment'         => "O'shiriwdin' sebebi:",
+'deleteotherreason'     => 'Basqa/qosımsha sebep:',
+'deletereasonotherlist' => 'Basqa sebep',
+
+# Rollback
+'rollback'       => "O'zgerislerdi biykar etiw",
+'rollback_short' => 'Biykar etiw',
+'rollbacklink'   => 'qaytarıw',
+'rollbackfailed' => "Biykar etiw sa'tsiz tamamlandı",
+'editcomment'    => "O'zgertiwdin' bolg'an kommentariyi: \"''\$1''\".", # only shown if there is an edit comment
+
+# Protect
 'protectlogpage'              => "Qorg'aw jurnalı",
 'protectedarticle'            => '"[[$1]]" qorg\'alg\'an',
 'modifiedarticleprotection'   => '"[[$1]]" betinin\' qorg\'aw da\'rejesi ozgertildi',
@@ -1342,18 +1571,25 @@ Aqırg'ı o'shirilgenlerdin' dizimin ko'riw ushin \$2 ni qaran'",
 'protect_expiry_invalid'      => "Nadurıs ku'shin joytıw waqtı.",
 'protect_expiry_old'          => "Kushin joytıw waqtı o'tip ketken.",
 'protect-unchain'             => "Ko'shiriw ruxsatın beriw",
-'protect-text'                => "<strong><nowiki>$1</nowiki></strong> betinin' qorg'aw da'rejesin ko're yamasa o'zgerte alasız.",
+'protect-text'                => "'''<nowiki>$1</nowiki>''' betinin' qorg'aw da'rejesin ko're yamasa o'zgerte alasız.",
 'protect-locked-access'       => "Akkauntın'ızdın' bettın' qorg'aw da'rejesin o'zgertiwge ruxsatı joq.
-<strong>$1</strong> betinin' ha'zirgi sazlawları:",
+'''$1''' betinin' ha'zirgi sazlawları:",
 'protect-cascadeon'           => "Bul bet ha'zirgi waqıtta qorg'alg'an, sebebi usı bet kaskadlı qorg'awı bar {{PLURAL:$1|betke|betlerine}} qosılg'an. Bul bettin' qorg'aw da'rejesin o'zgerte alasız, biraq bul kaskadlı qorg'awg'a ta'sir etpeydi.",
-'protect-default'             => '(defolt)',
+'protect-default'             => "Barlıq paydalanıwshılarg'a ruxsat etilgen",
 'protect-fallback'            => '"$1" ruxsatı kerek',
-'protect-level-autoconfirmed' => 'Anonim paydalanıwshılardı bloklaw',
+'protect-level-autoconfirmed' => "Taza ha'm dizimnen o'tpegen paydalanıwshılardı bloklaw",
 'protect-level-sysop'         => 'Tek administratorlar',
 'protect-summary-cascade'     => "kaskadlang'an",
 'protect-expiring'            => 'pitiw waqtı: $1 (UTC)',
+'protect-expiry-indefinite'   => "ma'ngi",
 'protect-cascade'             => "Bul betke qosılg'an betlerdi qorg'aw (kaskadlı qorg'aw).",
 'protect-cantedit'            => "Bul bettin' qorg'aw da'rejesin o'zgerte almaysız, sebebi oni o'zgertiwge sizin' ruxsatın'ız joq.",
+'protect-othertime'           => 'Basqa waqıt:',
+'protect-othertime-op'        => 'basqa waqıt',
+'protect-otherreason'         => 'Basqa/qosımsha sebep:',
+'protect-otherreason-op'      => 'basqa/qosımsha sebep',
+'protect-edit-reasonlist'     => "Qorg'aw sebeplerin o'zgertiw",
+'protect-expiry-options'      => "1 saat:1 hours,1 ku'n:1 day,1 ha'pte:1 week,2 ha'pte:2 weeks,1 ay:1 month,3 ay:3 months,6 ay:6 months,1 jıl:1 year,ma'ngi:infinite", # display1:time1,display2:time2,...
 'restriction-type'            => 'Ruxsatnama:',
 'restriction-level'           => "Sheklew da'rejesi:",
 'minimum-size'                => "En' az o'lshemi",
@@ -1375,9 +1611,10 @@ Aqırg'ı o'shirilgenlerdin' dizimin ko'riw ushin \$2 ni qaran'",
 'undelete'                 => "O'shirilgen betlerdi ko'riw",
 'undeletepage'             => "O'shirilgen betlerdi ko'riw ha'm qayta tiklew",
 'viewdeletedpage'          => "O'shirilgen betlerdi ko'riw",
-'undelete-revision'        => "$2 waqtında $3 o'shirgen $1 nusqası:",
+'undelete-revision'        => "$1 betinin' $4, $5 waqtındag'ı $3 paydalanıwshı ta'repinen o'shirilgen nusqası:",
 'undelete-nodiff'          => "Hesh aldıng'ı nusqa tabılmadı.",
 'undeletebtn'              => 'Qayta tiklew',
+'undeletelink'             => 'qayta tiklew',
 'undeletecomment'          => 'Kommentariy:',
 'undeletedarticle'         => '"[[$1]]" qayta tiklendi',
 'undeletedrevisions'       => '{{PLURAL:$1|1 nusqa|$1 nusqa}} qayta tiklendi',
@@ -1394,12 +1631,13 @@ Aqırg'ı o'shirilgenlerdin' dizimin ko'riw ushin \$2 ni qaran'",
 'blanknamespace' => '(Baslı)',
 
 # Contributions
-'contributions' => "Paydalanıwshı u'lesi",
-'mycontris'     => "Menin' u'lesim",
-'contribsub2'   => '$1 ushın ($2)',
-'uctop'         => "(joqarg'ı)",
-'month'         => "Aydag'ı (ha'm onnanda erterek):",
-'year'          => "Jıldag'ı (ha'm onnanda erterek):",
+'contributions'       => "Paydalanıwshı u'lesi",
+'contributions-title' => "$1 paydalanıwshısının' qosqan u'lesi",
+'mycontris'           => "Menin' u'lesim",
+'contribsub2'         => '$1 ushın ($2)',
+'uctop'               => "(joqarg'ı)",
+'month'               => "Aydag'ı (ha'm onnanda erterek):",
+'year'                => "Jıldag'ı (ha'm onnanda erterek):",
 
 'sp-contributions-newbies'     => "Tek taza akkauntlar u'leslerin ko'rset",
 'sp-contributions-newbies-sub' => 'Taza akkauntlar ushın',
@@ -1412,7 +1650,6 @@ Aqırg'ı o'shirilgenlerdin' dizimin ko'riw ushin \$2 ni qaran'",
 'whatlinkshere'            => 'Siltelgen betler',
 'whatlinkshere-title'      => '"$1" betine siltelgen betler',
 'whatlinkshere-page'       => 'Bet:',
-'linklistsub'              => '(Siltewler dizimi)',
 'linkshere'                => "To'mendegi betler mınag'an siltelgen: '''[[:$1]]''':",
 'nolinkshere'              => "'''[[:$1]]''' degenge hesh bet siltemeydi.",
 'isredirect'               => 'burıwshı bet',
@@ -1422,6 +1659,7 @@ Aqırg'ı o'shirilgenlerdin' dizimin ko'riw ushin \$2 ni qaran'",
 'whatlinkshere-next'       => '{{PLURAL:$1|keyingi|keyingi $1}}',
 'whatlinkshere-links'      => '� siltewler',
 'whatlinkshere-hideredirs' => "qayta bag'ıtlawshılardı $1",
+'whatlinkshere-hidetrans'  => "qosılg'anlardı $1",
 'whatlinkshere-hidelinks'  => 'siltewlerdi $1',
 'whatlinkshere-hideimages' => "su'wret siltewlerin $1",
 'whatlinkshere-filters'    => 'Filtrler',
@@ -1466,9 +1704,11 @@ Basqa bloklawlar ushın [[Special:IPBlockList|IP bloklaw dizimin]] ko'rip shıg'
 'ipblocklist-empty'           => 'Bloklaw dizimi bos.',
 'blocklink'                   => 'bloklaw',
 'unblocklink'                 => 'bloklamaw',
+'change-blocklink'            => "bloklawdı o'zgertiw",
 'contribslink'                => "u'lesi",
 'blocklogpage'                => 'Bloklaw jurnalı',
 'blocklogentry'               => "[[$1]] $2 waqıt aralıg'ına bloklandı $3",
+'unblocklogentry'             => "$1 bloklawdı o'shirdi",
 'block-log-flags-anononly'    => 'tek anonim paydalanıwshılar',
 'block-log-flags-nocreate'    => "Akkaunt jaratıw o'shirilgen",
 'block-log-flags-noautoblock' => "Avtoqulplaw o'shirilgen",
@@ -1511,6 +1751,7 @@ dawam ettiriwden aldın qanday aqıbetlerge alıp keliwin oylap ko'rin'.",
 
 Bul jag'daylarda eger qa'lesen'iz betti qoldan ko'shiriwin'iz yamasa qosıwın'izg'a boladı.",
 'movearticle'             => "Ko'shiriletug'ın bet:",
+'movenologin'             => 'Kirilmegen',
 'newtitle'                => 'Taza atama:',
 'move-watch'              => 'Bul betti baqlaw',
 'movepagebtn'             => "Betti ko'shir",
@@ -1543,7 +1784,7 @@ Basqa atama saylan'",
 'allmessagesdefault'  => 'Defolt tekst',
 'allmessagescurrent'  => "Ha'zirgi tekst",
 'allmessagestext'     => "Bul {{ns:mediawiki}} isimler ko'pligindegi bar bolg'an sistema xabarları dizimi.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.",
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.",
 'allmessagesfilter'   => 'Xabar atamasın filtrlew:',
 'allmessagesmodified' => "Tek o'zgertilgenlerdi ko'rset",
 
@@ -1556,6 +1797,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 # Special:Import
 'import'                  => 'Betlerdi import qılıw',
 'import-interwiki-submit' => 'Import',
+'import-comment'          => 'Kommentariy:',
 'importstart'             => 'Betler import qılınbaqta...',
 'import-revision-count'   => '{{PLURAL:$1|1 nusqa|$1 nusqa}}',
 'importnopages'           => "Import qılınatug'ın betler joq.",
@@ -1568,19 +1810,19 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'import-logentry-interwiki-detail' => '$2 degennen {{PLURAL:$1|1 nusqa|$1 nusqa}}',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "Menin' paydalanıwshı betim",
+'tooltip-pt-userpage'             => "Sizin' paydalanıwshı betin'iz",
 'tooltip-pt-anonuserpage'         => 'Bul IP adres paydalanıwshı beti',
-'tooltip-pt-mytalk'               => "Menin' sa'wbetim",
+'tooltip-pt-mytalk'               => "Sizin' sa'wbet betin'iz",
 'tooltip-pt-anontalk'             => "Bul IP adresten kiritilgen o'zgerisler haqqında diskussiya",
 'tooltip-pt-preferences'          => "Menin' sazlawlarım",
 'tooltip-pt-watchlist'            => "O'zgerislerin baqlap turg'an betler dizimi",
-'tooltip-pt-mycontris'            => "Menin' u'lesler dizimim",
+'tooltip-pt-mycontris'            => "Sizin' u'lesler dizimin'iz",
 'tooltip-pt-login'                => "Kiriwin'iz usınıladı, biraq ma'jbu'riy bolmag'an xalda.",
 'tooltip-pt-anonlogin'            => "Kiriwin'iz usınıladı, biraq ma'jbu'riy bolmag'an xalda.",
 'tooltip-pt-logout'               => "Shıg'ıw",
 'tooltip-ca-talk'                 => "Mag'lıwmat beti haqqında diskussiya",
 'tooltip-ca-edit'                 => "Siz bul betti o'zgertiwin'izge boladi. Iltimas betti saqlawdan aldın ko'rip shig'ıw knopkasın paydalanın'.",
-'tooltip-ca-addsection'           => "Bul diskussiyag'a kommentariy qosıw.",
+'tooltip-ca-addsection'           => "Jan'a bo'lim jaratıw.",
 'tooltip-ca-viewsource'           => "Bul bet qorg'alg'an. Biraq ko'rip shıg'ıwın'ızg'a boladı.",
 'tooltip-ca-history'              => "Bul bettin' aqırg'ı nusqaları.",
 'tooltip-ca-protect'              => "Bul betti qorg'aw",
@@ -1590,6 +1832,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-ca-watch'                => "Bul betti menin' baqlaw dizimime qosiw",
 'tooltip-ca-unwatch'              => "Bul betti menin' baqlaw dizimimnen alıp tasla",
 'tooltip-search'                  => '{{SITENAME}} saytınan izlew',
+'tooltip-search-go'               => "Eger usı atamag'a iye bolg'an bet bolsa, tuwrı o'tip ketiw",
 'tooltip-search-fulltext'         => 'Usı tekst ushın betlerdi izlew',
 'tooltip-p-logo'                  => 'Bas bet',
 'tooltip-n-mainpage'              => "Bas betke o'tiw",
@@ -1625,13 +1868,14 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-compareselectedversions' => "Bettin' eki nusqasının' ayırmashılıg'ın qaraw.",
 'tooltip-watch'                   => "Bul betti baqlaw dizimin'izge qosıw",
 'tooltip-upload'                  => 'Aploudtı basla',
+'tooltip-rollback'                => "\"Biykar etiw\" arqalı usı betke aqırg'ı u'les qosıwshının' kirgizgen o'zgerislerin qaytarıw mu'mkinshiligine iyesiz",
 
 # Attribution
-'anonymous'        => '{{SITENAME}} anonim paydalanıwshı(ları)',
+'anonymous'        => "{{SITENAME}} saytının' anonim {{PLURAL:$1|paydalanıwshısı|paydalanıwshıları}}",
 'siteuser'         => '{{SITENAME}} paydalanıwshısı $1',
 'lastmodifiedatby' => "Bul bettin' aqırg'ı ma'rte $3 o'zgertken waqtı: $2, $1.", # $1 date, $2 time, $3 user
 'others'           => 'basqalar',
-'siteusers'        => '{{SITENAME}} paydalanıwshı(ları) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|paydalanıwshı|paydalanıwshıları}} $1',
 'creditspage'      => 'Bet avtorları',
 
 # Info page
@@ -1651,6 +1895,9 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'previousdiff' => "� Aldıng'ı parq",
 'nextdiff'     => 'Keyingi parq →',
 
+# Visual comparison
+'visual-comparison' => "Ko'risli salıstırması",
+
 # Media information
 'thumbsize'            => "Miniatyuranın' ha'jmi:",
 'widthheight'          => '$1 × $2',
@@ -1662,7 +1909,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'show-big-image'       => 'Joqarı imkaniyatlı',
 'show-big-image-thumb' => "<small>Bul aldinnan ko'riwdin' ha'jmi: $1 × $2 piksel</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Taza fayllar galereyasi',
 'showhidebots'          => '(botlardı $1)',
 'noimages'              => "Ko'riwge su'wret joq.",
@@ -1752,18 +1999,9 @@ Bul tastıyıqlaw kodının' pitetug'ın waqtı: $4.",
 
 'unit-pixel' => ' px',
 
-# HTML dump
-'redirectingto' => '[[:$1]] degenge burılmaqta...',
-
 # action=purge
 'confirm_purge_button' => 'OK',
 
-# AJAX search
-'searchcontaining' => "''$1'' mag'lıwmatı bar betlerdi izlew.",
-'searchnamed'      => "''$1'' ataması bar betlerdi izlew.",
-'articletitles'    => "''$1'' degen menen baslag'an betlerdi",
-'hideresults'      => "Na'tiyjelerdi jasır",
-
 # Multipage image navigation
 'imgmultipageprev' => "� aldıng'ı bet",
 'imgmultipagenext' => 'keyingi bet →',
diff --git a/languages/messages/MessagesKab.php b/languages/messages/MessagesKab.php
index ffebd659..ad534ff5 100644
--- a/languages/messages/MessagesKab.php
+++ b/languages/messages/MessagesKab.php
@@ -6,6 +6,7 @@
  *
  * @author Agurzil
  * @author Agzennay
+ * @author Azwaw
  * @author Teak
  * @author Urhixidur
  */
@@ -19,8 +20,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Amyannan_umsqedac',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Amyannan_n_$1',
-	NS_IMAGE            => 'Tugna',
-	NS_IMAGE_TALK       => 'Amyannan_n_tugna',
+	NS_FILE             => 'Tugna',
+	NS_FILE_TALK        => 'Amyannan_n_tugna',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Amyannan_n_MediaWiki',
 	NS_TEMPLATE         => 'Talɣa',
@@ -60,7 +61,7 @@ $messages = array(
 'tog-previewontop'            => 'Ssken pre-timeẓriwt uqbel tankult ubeddel',
 'tog-previewonfirst'          => 'Ssken pre-timeẓriwt akk d ubeddel amezwaru',
 'tog-nocache'                 => 'Kkes lkac n usebter',
-'tog-enotifwatchlistpages'    => 'Azen-iyi-d e-mail asmi yettubeddel asebter i ttɛassaɣ',
+'tog-enotifwatchlistpages'    => "Azen-iyi-d e-mail m'ara yettubeddel asebter i ttɛassaɣ",
 'tog-enotifusertalkpages'     => 'Azen-iyi-d e-mail asmi sɛiɣ izen amaynut',
 'tog-enotifminoredits'        => 'Azen-iyi-d e-mail ma llan ibeddlen ifessasen',
 'tog-enotifrevealaddr'        => 'Ssken e-mail inu asmi yettwazen email n talɣut',
@@ -82,8 +83,6 @@ $messages = array(
 'underline-never'   => 'Abaden',
 'underline-default' => 'Browser/Explorateur ameslugen',
 
-'skinpreview' => '(Pre-timeẓriwt)',
-
 # Dates
 'sunday'        => 'Lḥedd',
 'monday'        => 'Letnayen',
@@ -159,7 +158,7 @@ $messages = array(
 'mytalk'         => 'Amyannan inu',
 'anontalk'       => 'Amyannan n IP-yagi',
 'navigation'     => 'Ẓer isebtar',
-'and'            => 'u',
+'and'            => '&#32;u',
 
 'errorpagetitle'    => 'Agul',
 'returnto'          => 'UÉ£al ar $1.',
@@ -217,8 +216,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Awal ɣef {{SITENAME}}',
 'aboutpage'            => 'Project:Awal ɣef...',
-'bugreports'           => "In'aɣ ibugiyen (bug)",
-'bugreportspage'       => "Project:In'aɣ ibugiyen",
 'copyright'            => 'Tzemre� ad twali� ayen yella deg $1.',
 'copyrightpagename'    => 'Copyright n {{SITENAME}}',
 'currentevents'        => 'Isallen',
@@ -239,8 +236,6 @@ $messages = array(
 
 'badaccess'        => 'Agul n turagt',
 'badaccess-group0' => 'Ur tettalase� ara ad texedme� tigawt i tseqsi�.',
-'badaccess-group1' => 'Tigawt i steqsi�, llan ala imseqdacen n adrum n $1 i zemren a t-xedmen.',
-'badaccess-group2' => 'Tigawt i steqsi�, llan ala imseqdacen seg yiwen n yiderman n $1 i zemren a t-xedmen.',
 'badaccess-groups' => 'Tigawt i steqsi�, llan ala imseqdacen seg yiwen n yiderman n $1 i zemren a t-xedmen.',
 
 'versionrequired'     => 'Yessefk ad tesɛi� tasiwelt $1 n MediaWiki',
@@ -317,7 +312,6 @@ Win (anedbal) isekker-itt yenna-d: $1',
 'cannotdelete'         => 'Ur yezmir ara ad yemḥu asebter neɣ afaylu i tebɣi�. (Ahat amdan waye� yemḥa-t.)',
 'badtitle'             => 'Azwel ur yelhi',
 'badtitletext'         => 'Asebter i testeqsi� fell-as ma��i ṣaḥiḥ, d ilem, neɣ yella ugul deg wezday seg wikipedia s tutlayt taye� neɣ deg wezday n wiki nni�en. Ahat tesɛa asekkil ur yezmir ara ad yettuseqdac deg wezwel.',
-'perfdisabled'         => 'Suref-aɣ! a�aɣar-agi ur yettuseqdac ara tura axaṭer iɛeṭṭel aṭas database.',
 'perfcached'           => 'Talɣut deg ukessar seg lkac u waqila ma��i d tasiwelt taneggarut.',
 'perfcachedts'         => 'Talɣut deg ukessar seg lkac, tasiwelt taneggarut n wass $1.',
 'querypage-no-updates' => 'Ibeddlen n usebter-agi ur ttbanen ara tura. Tilɣa ines qrib a d-banen.',
@@ -335,8 +329,8 @@ Query: $2',
 
 # Login and logout pages
 'logouttitle'                => 'Tuffɣa',
-'logouttext'                 => '<strong>Tura teffɣe�.</strong><br />
-Tzemre� ad tesseqdce� {{SITENAME}} d udrig, neɣ tzemre� ad tkecme� daɣen s yisem n wemseqdac inek (neɣ nni�en). Kra n isebtar zemren ad sskanen belli mazal-ik s yisem n wemseqdac inek armi temḥu� lkac.',
+'logouttext'                 => "'''Tura teffɣe�.'''<br />
+Tzemre� ad tesseqdce� {{SITENAME}} d udrig, neɣ tzemre� ad tkecme� daɣen s yisem n wemseqdac inek (neɣ nni�en). Kra n isebtar zemren ad sskanen belli mazal-ik s yisem n wemseqdac inek armi temḥu� lkac.",
 'welcomecreation'            => '== Aná¹£uf yis-k, $1! ==
 
 Isem n wemseqdac inek yettwaxleq. Ur tettu� ara ad tbeddle� Isemyifiyen n {{SITENAME}} inek.',
@@ -347,7 +341,6 @@ Isem n wemseqdac inek yettwaxleq. Ur tettu� ara ad tbeddle� Isemyifiyen n {{
 'remembermypassword'         => 'Cfu ɣef wawal n tba�nit inu di uselkim-agi.',
 'yourdomainname'             => 'Taɣult inek',
 'externaldberror'            => 'Yella ugul aberrani n database neɣ ur tettalase� ara ad tbeddle� isem an wemseqdac aberrani inek.',
-'loginproblem'               => '<b>Yella ugur akk d ukcam inek.</b><br />�re� daɣen!',
 'login'                      => 'Kcem',
 'nav-login-createaccount'    => 'Kcem / Xleq isem n wemseqdac',
 'loginprompt'                => 'Yessefk ad teǧǧi� ikukiyen (cookies) iwakken ad tkecme� ar {{SITENAME}}.',
@@ -418,11 +411,13 @@ iwakken ad tbeyyne� belli tansa n email inek.',
 'resetpass_announce'      => 'Tkecme� s ungal yettwazen-ak s e-mail (ungal-nni qrib yemmut). Iwekken tkemmle�, yessefk ad textare� awal n tba�nit amaynut dagi:',
 'resetpass_text'          => '<!-- Rnu a�ris dagi -->',
 'resetpass_header'        => '�iwed awal n tba�nit',
+'oldpassword'             => 'Awal n tba�nit aqdim:',
+'newpassword'             => 'Awal n tba�nit amaynut:',
+'retypenew'               => '�iwed ssekcem n tba�nit amaynut:',
 'resetpass_submit'        => 'Eg awal n tba�nit u kcem',
 'resetpass_success'       => 'Awal n tba�nit yettubeddel! Qrib ad tkecme�...',
 'resetpass_bad_temporary' => 'Ungal ma��i d ṣaḥiḥ. Ahat tbeddle� awal n tba�nit inek neɣ tetseqsi� ɣef wawal n tba�nit amaynut.',
 'resetpass_forbidden'     => 'Ur tezmire� ara ad tbeddle� awal n tba�nit deg wiki-yagi',
-'resetpass_missing'       => 'Ulac talɣut.',
 
 # Edit page toolbar
 'bold_sample'     => 'A�ris aberbuz',
@@ -447,8 +442,8 @@ iwakken ad tbeyyne� belli tansa n email inek.',
 'hr_tip'          => 'Ajerri� aglawan (ur te��erɛi� ara)',
 
 # Edit pages
-'summary'                   => 'Agzul',
-'subject'                   => 'Asentel/Azwel azellum',
+'summary'                   => 'Agzul:',
+'subject'                   => 'Asentel/Azwel azellum:',
 'minoredit'                 => 'Wagi d abeddel afessas',
 'watchthis'                 => '�ass asebter-agi',
 'savearticle'               => 'Beddel asebter',
@@ -460,8 +455,8 @@ iwakken ad tbeyyne� belli tansa n email inek.',
 'missingsummary'            => "'''Ur tettu� ara:''' Ur tefki� ara azwel i ubeddel inek. Lukan twekki� ''Smekti'' tikelt nni�en, abeddel inek ad yettusmekti mebla azwel.",
 'missingcommenttext'        => 'Ssekcem awennit deg ukessar.',
 'missingcommentheader'      => "'''Ur tettu� ara:''' Ur tefki� ara azwel-azellum i ubeddel inek. Lukan twekki� ''Smekti'' tikelt nni�en, abeddel inek ad yettusmekti mebla azwel-azellum.",
-'summary-preview'           => 'Pre-timeẓriwt n ugzul',
-'subject-preview'           => 'Pre-timeẓriwt asentel/azwel azellum',
+'summary-preview'           => 'Pre-timeẓriwt n ugzul:',
+'subject-preview'           => 'Pre-timeẓriwt asentel/azwel azellum:',
 'blockedtitle'              => 'Amseqdac iɛekkel',
 'blockedtext'               => "<big>'''Isem n wemseqdac neɣ tansa n IP inek ɛekkelen.'''</big>
 
@@ -490,21 +485,21 @@ Ma tɣelṭe�, wekki kan ɣef tqeffalt "Back/Précédent" n browser/explorateu
 'anontalkpagetext'          => "----''Wagi d asebter n umyennan n wemseqdac adrig. Ihi, yessef ad as nefk ID, nesseqdac tansa IP ines akken a t-neɛqel. Tansa IP nni ahat tettuseqdac sɣur aṭṭas n yimdanen. Lukan ula d ke�� aqla-k amseqdac adrig u ur tebɣi� ara ad tettwabcre� izen am wigini, ihi [[Special:UserLogin|xleq isem n wemseqdac neɣ kcem]].''",
 'noarticletext'             => 'Ulac a�ris deg usebter-agi, tzemre� ad [[Special:Search/{{PAGENAME}}|tnadi� ɣef wezwel n usebter-agi]] deg isebtar wiya� neɣ [{{fullurl:{{FULLPAGENAME}}|action=edit}} tettbeddile� asebter-agi].',
 'clearyourcache'            => "'''Tamawt:''' Beɛd asmekti, ahat yessefk ad temḥu� lkac n browser/explorateur inek akken teẓri� ibeddlen. '''Mozilla / Firefox / Safari:''' qqim twekki� ''Shift'' u wekki ɣef ''Reload/Recharger'', neɣ wekki ɣef ''Ctrl-Shift-R'' (''Cmd-Shift-R'' deg Apple Mac); '''IE:''' qqim twekki� ɣef ''Ctrl'' u wekki ɣef ''Refresh/Actualiser'', neɣ wekki ɣef ''Ctrl-F5''; '''Konqueror:''': wekki kan ɣef taqeffalt ''Reload'', neɣ wekki ɣef ''F5''; '''Opera''' yessefk ad tesseqdce� ''Tools→Preferences/Outils→Préférences'' akken ad temḥud akk lkac.",
-'usercssjsyoucanpreview'    => "<strong>Tixidest:</strong> Sseqdec taqeffalt 'Ssken pre-timeẓriwt' iwakken ad tɛer�e� CSS/JS amynut inek uqbel ad tesmekti�.",
+'usercssjsyoucanpreview'    => "'''Tixidest:''' Sseqdec taqeffalt 'Ssken pre-timeẓriwt' iwakken ad tɛer�e� CSS/JS amynut inek uqbel ad tesmekti�.",
 'usercsspreview'            => "'''Smekti belli aql-ak twali� CSS inek kan, mazal ur yettusmekti ara!'''",
 'userjspreview'             => "'''Smekti belli aql-ak tɛer�e� JavaScript inek kan, mazal ur yettusmekti ara!'''",
 'userinvalidcssjstitle'     => '\'\'\'Aɣtal:\'\'\' Aglim "$1" ulac-it. Ur tettu� ara belli isebtar ".css" d ".js" i txedme� sseqdacen azwel i yesɛan isekkilen imecṭuḥen, s umedya: {{ns:user}}:Foo/monobook.css akk d {{ns:user}}:Foo/Monobook.css.',
 'updated'                   => '(Yettubeddel)',
-'note'                      => '<strong>Tamawt:</strong>',
-'previewnote'               => '<strong>Tagi d pre-timeẓriwt kan, ibeddlen mazal ur ttusmektin ara!</strong>',
+'note'                      => "'''Tamawt:'''",
+'previewnote'               => "'''Tagi d pre-timeẓriwt kan, ibeddlen mazal ur ttusmektin ara!'''",
 'previewconflict'           => 'Pre-timeẓriwt-agi tesskan a�ris i yellan deg usawen lemmer tebɣi� a tt-tesmekti�.',
-'session_fail_preview'      => '<strong>Suref-aɣ! ur nezmir ara a nesmekti abeddil inek axaṭer yella ugur.
-G leɛnayek ɛre� tikelt nni�en. Lukan mazal yella ugur, ffeɣ umbeɛd kcem.</strong>',
-'session_fail_preview_html' => "<strong>Suref-aɣ! ur nezmir ara a nesmekti abeddel inek axaṭer yella ugur.</strong>
+'session_fail_preview'      => "'''Suref-aɣ! ur nezmir ara a nesmekti abeddil inek axaṭer yella ugur.
+G leɛnayek ɛre� tikelt nni�en. Lukan mazal yella ugur, ffeɣ umbeɛd kcem.'''",
+'session_fail_preview_html' => "'''Suref-aɣ! ur nezmir ara a nesmekti abeddel inek axaṭer yella ugur.'''
 
 ''Awaṭer wiki-yagi teǧǧa HTML, teffer pre-timeẓriwt akken teǧǧanez antag n JavaScript.''
 
-<strong>Lukan abeddel agi d aḥeqqani, g leɛnayek ɛre� tikelt nni�en.. Lukan mazal yella ugur, ffeɣ umbeɛd kcem.</strong>",
+'''Lukan abeddel agi d aḥeqqani, g leɛnayek ɛre� tikelt nni�en.. Lukan mazal yella ugur, ffeɣ umbeɛd kcem.'''",
 'editing'                   => 'Abeddel n $1',
 'editingsection'            => 'Abeddel n $1 (amur)',
 'editingcomment'            => 'Abeddel n $1 (awennit)',
@@ -516,23 +511,23 @@ Yesfek ad txelṭe� ibeddlen inek akk d usebter i yellan.
 '''Ala''' a�ris deg usawen i yettusmekta asmi twekki� \"Smekti asebter\".",
 'yourtext'                  => 'A�ris inek',
 'storedversion'             => 'Tasiwelt yettusmketen',
-'nonunicodebrowser'         => '<strong>AƔTAL: Browser/Explorateur inek ur yebil ara unicode. Nexdem akken ad tzemre� ad tbeddle� mebla amihi: isekkilin i ma��i ASCII ttbanen deg tankult ubeddel s ungilen hexadecimal.</strong>',
-'editingold'                => '<strong>AƔTAL: Aqlak tettbeddile� tasiwelt taqdimt n usebter-agi.
-Ma ara t-tesmekti�, akk ibeddlen i yexdmen seg tasiwelt-agi ruḥen.</strong>',
+'nonunicodebrowser'         => "'''AƔTAL: Browser/Explorateur inek ur yebil ara unicode. Nexdem akken ad tzemre� ad tbeddle� mebla amihi: isekkilin i ma��i ASCII ttbanen deg tankult ubeddel s ungilen hexadecimal.'''",
+'editingold'                => "'''AƔTAL: Aqlak tettbeddile� tasiwelt taqdimt n usebter-agi.
+Ma ara t-tesmekti�, akk ibeddlen i yexdmen seg tasiwelt-agi ruḥen.'''",
 'yourdiff'                  => 'Imgerraden',
-'copyrightwarning'          => 'Ssen belli akk tikkin deg {{SITENAME}} hatent ttwaznen seddaw $2 (Ẓer $1 akken ad tessne� kter). Lukan ur tebɣi� ara aru inek yettubeddel neɣ yettwazen u yettwaru deg imkanen nni�en, ihi ur t-tazne� ara dagi.<br />
+'copyrightwarning'          => "Ssen belli akk tikkin deg {{SITENAME}} hatent ttwaznen seddaw $2 (Ẓer $1 akken ad tessne� kter). Lukan ur tebɣi� ara aru inek yettubeddel neɣ yettwazen u yettwaru deg imkanen nni�en, ihi ur t-tazne� ara dagi.<br />
 Aqlak teggale� belli ture� wagi d ke��, neɣ teddmi�-t seg taɣult azayez neɣ iɣbula tilelliyin.
-<strong>UR TEFKIḌ ARA AXDAM S COPYRIGHT MEBLA TURAGT!</strong>',
-'copyrightwarning2'         => 'Ssen belli akk tikkin deg {{SITENAME}} zemren ad ttubeddlen neɣ ttumḥan sɣur imdanen wiya�. Lukan ur tebɣi� ara aru inek yettubeddel neɣ yettwazen u yettwaru deg imkanen nni�en, ihi ur t-tazne� ara dagi.<br />
+'''UR TEFKIḌ ARA AXDAM S COPYRIGHT MEBLA TURAGT!'''",
+'copyrightwarning2'         => "Ssen belli akk tikkin deg {{SITENAME}} zemren ad ttubeddlen neɣ ttumḥan sɣur imdanen wiya�. Lukan ur tebɣi� ara aru inek yettubeddel neɣ yettwazen u yettwaru deg imkanen nni�en, ihi ur t-tazne� ara dagi.<br />
 Aqlak teggale� belli ture� wagi d ke��, neɣ teddmi�-t seg taɣult azayez neɣ iɣbula tilelliyin (ẓer $1 akken ad tessne� kter).
-<strong>UR TEFKIḌ ARA AXDAM S COPYRIGHT MEBLA TURAGT!</strong>',
-'longpagewarning'           => '<strong>AƔTAL: Asebter-agi yesɛa $1 kilobytes/kilooctets; kra n browsers/explorateur ur zemren ara ad beddlen isebtar i yesɛan 32 kB/ko neɣ kter.
-G leɛnayek frec asebter-nni.</strong>',
-'longpageerror'             => '<strong>AGUL: A�ris i tefki� yesɛa $1 kB/ko, tiddi-yagi kter n $2 kB/ko, ur yezmir ara ad yesmekti.</strong>',
-'readonlywarning'           => '<strong>AƔTAL: Database d tamsekker akken ad teddwaxdem,
+'''UR TEFKIḌ ARA AXDAM S COPYRIGHT MEBLA TURAGT!'''",
+'longpagewarning'           => "'''AƔTAL: Asebter-agi yesɛa $1 kilobytes/kilooctets; kra n browsers/explorateur ur zemren ara ad beddlen isebtar i yesɛan 32 kB/ko neɣ kter.
+G leɛnayek frec asebter-nni.'''",
+'longpageerror'             => "'''AGUL: A�ris i tefki� yesɛa $1 kB/ko, tiddi-yagi kter n $2 kB/ko, ur yezmir ara ad yesmekti.'''",
+'readonlywarning'           => "'''AƔTAL: Database d tamsekker akken ad teddwaxdem,
 ihi ur tezmire� ara ad tesmekti� ibeddlen inek tura. Smekti a�ris inek
-deg afaylu nni�en akken tesseqdce�-it umbeɛd.</strong>',
-'protectedpagewarning'      => '<strong>AƔTAL:  Asebter-agi yettwaḥrez, ala inedbalen zemren a t-beddlen</strong>',
+deg afaylu nni�en akken tesseqdce�-it umbeɛd.'''",
+'protectedpagewarning'      => "'''AƔTAL:  Asebter-agi yettwaḥrez, ala inedbalen zemren a t-beddlen'''",
 'semiprotectedpagewarning'  => "'''Tamawt:''' Asebter-agi yettwaḥrez, ala imseqdacen i yesɛan isem n wemseqdac zemren a t-beddlen.",
 'cascadeprotectedwarning'   => "'''Aɣtal:''' Asebter-agi iɛekkel iwakken ad zemren ala inedbalen a t-beddlen, axaṭer yettwassekcem deg isebtar i yettwaḥerzen agi (acercur):",
 'templatesused'             => 'Talɣiwin ttuseqdacen deg usebter-agi:',
@@ -556,12 +551,9 @@ Tzemre� a d-uɣale� u tbeddle� asebter i yellan, neɣ ad [[Special:UserLog
 # History pages
 'viewpagelogs'        => 'Ẓer aɣmis n usebter-agi',
 'nohistory'           => 'Ulac amezruy n yibeddlen i usebter-agi.',
-'revnotfound'         => 'Ur yezmir ara ad yaf tasiwelt',
-'revnotfoundtext'     => 'Tasiwelt taqdimt n usebter-agi i testeqsi� ulac-it.
-Ssenqed URL i tesseqdac.',
 'currentrev'          => 'Tasiwelt n tura',
 'revisionasof'        => 'Tasiwelt n wass $1',
-'revision-info'       => 'Tasiwelt n wass $1 sɣur $2',
+'revision-info'       => 'Tasiwelt n wass $1 sɣur $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Tasiwelt taqdimt',
 'nextrevision'        => 'Tasiwelt tamaynut→',
 'currentrevisionlink' => 'Tasiwelt n tura',
@@ -646,6 +638,7 @@ Inedbalen wiya� deg wiki-yagi zemren ad ẓren imuren i yettwafren u zemren a
 'prevn'                 => '$1 ssabeq',
 'nextn'                 => '$1 ame�fir',
 'viewprevnext'          => 'Ẓer ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Agbur',
 'showingresults'        => "Tamuli n {{PLURAL:$1|'''Yiwen''' wegmud|'''$1''' n yigmad}} seg  #'''$2'''.",
 'showingresultsnum'     => "Tamuli n {{PLURAL:$3|'''Yiwen''' wegmud|'''$3''' n yigmad}} seg  #'''$2'''.",
 'nonefound'             => "'''Tamawt''': S umata, asmi ur tufi� acemma
@@ -669,6 +662,7 @@ i yesɛan akk awalen i banen-d).",
 'qbsettings-floatingright' => 'Tufeg ayeffus',
 'changepassword'           => 'Beddel awal n tba�nit',
 'skin'                     => 'Aglim',
+'skin-preview'             => 'Pre-timeẓriwt',
 'math'                     => 'Tusnakt',
 'dateformat'               => 'talɣa n uzemz',
 'datedefault'              => 'Ur sɛiɣ ara asemyifi',
@@ -690,9 +684,6 @@ i yesɛan akk awalen i banen-d).",
 'prefs-misc'               => 'Isemyifiyen wiya�',
 'saveprefs'                => 'Smekti',
 'resetprefs'               => 'Reset/réinitialiser isemyifiyen',
-'oldpassword'              => 'Awal n tba�nit aqdim:',
-'newpassword'              => 'Awal n tba�nit amaynut:',
-'retypenew'                => '�iwed ssekcem n tba�nit amaynut:',
 'textboxsize'              => 'Abedddil',
 'rows'                     => 'Ijerri�en:',
 'columns'                  => 'Tigejda:',
@@ -775,11 +766,11 @@ i yesɛan akk awalen i banen-d).",
 iwakken ad tazne� afaylu.',
 'upload_directory_read_only'  => 'Weserver/serveur Web ur yezmir ara ad yaru deg ($1).',
 'uploaderror'                 => 'Agul deg usekcam',
-'uploadtext'                  => "Sseqdec talɣa deg ukessar akken ad tazene� tugnawin, akken ad teẓred neɣ ad tnadi� tugnawin yettwaznen, ruḥ ɣer [[Special:ImageList|umuɣ n usekcam n tugnawin]], Amezruy n usekcam d umḥay hatent daɣen deg [[Special:Log/upload|amezruy n usekcam]].
+'uploadtext'                  => "Sseqdec talɣa deg ukessar akken ad tazene� tugnawin, akken ad teẓred neɣ ad tnadi� tugnawin yettwaznen, ruḥ ɣer [[Special:FileList|umuɣ n usekcam n tugnawin]], Amezruy n usekcam d umḥay hatent daɣen deg [[Special:Log/upload|amezruy n usekcam]].
 
 Akken ad tessekcme� tugna deg usebter, seqdec azay am wagi
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Afaylu.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Afaylu.png|a�ris]]</nowiki>''' neɣ
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Afaylu.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Afaylu.png|a�ris]]</nowiki>''' neɣ
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Afaylu.ogg]]</nowiki>''' akken ad iruḥ wezday qbala ar ufaylu.",
 'uploadlog'                   => 'amezruy n usekcam',
 'uploadlogpage'               => 'Amezruy n usekcam',
@@ -799,18 +790,18 @@ Akken ad tessekcme� tugna deg usebter, seqdec azay am wagi
 'large-file'                  => 'Ilaq tiddi n ufayluwen ur tettili kter n $1; tiddi n ufaylu-agi $2.',
 'largefileserver'             => 'Afaylu meqqer aá¹­á¹­as, server ur t-yeqbil ara.',
 'emptyfile'                   => 'Afaylu i tazne� d ilem. Waqila tɣelṭe� deg isem-is. G leɛnayek ssenqed-it.',
-'fileexists'                  => 'Afaylu s yisem-agi yewǧed yagi, ssenqed <strong><tt>$1</tt></strong> ma telli� ma��i me�mun akken a t-tbeddle�.',
-'fileexists-extension'        => 'Afaylu s yisem-agi yewǧed:<br />
-Isem n ufaylu i tazne�: <strong><tt>$1</tt></strong><br />
-Isem n ufaylu i yewǧed: <strong><tt>$2</tt></strong><br />
-Amgirred i yella kan deg isekkilen imecṭuḥen/imeqqranen deg taseggiwit (am ".jpg"/".jPg"). G leɛnayek ssenqed-it.',
+'fileexists'                  => "Afaylu s yisem-agi yewǧed yagi, ssenqed '''<tt>$1</tt>''' ma telli� ma��i me�mun akken a t-tbeddle�.",
+'fileexists-extension'        => "Afaylu s yisem-agi yewǧed:<br />
+Isem n ufaylu i tazne�: '''<tt>\$1</tt>'''<br />
+Isem n ufaylu i yewǧed: '''<tt>\$2</tt>'''<br />
+Amgirred i yella kan deg isekkilen imecṭuḥen/imeqqranen deg taseggiwit (am \".jpg\"/\".jPg\"). G leɛnayek ssenqed-it.",
 'fileexists-thumb'            => "<center>'''Tugna i tewǧed'''</center>",
-'fileexists-thumbnail-yes'    => 'Iban-d belli tugna-nni d tugna tamecṭuht n tugna nni�en <i>(thumbnail)</i>. G leɛnayek ssenqed tugna-agi <strong><tt>$1</tt></strong>.<br />
-Ma llant kif-kif ur tt-taznepd ara.',
-'file-thumbnail-no'           => 'Isem n tugna yebda s <strong><tt>$1</tt></strong>. Waqila tugna-nni d tugna tamecṭuht n tugna nni�en <i>(thumbnail)</i>.
-Ma tesɛi� tugna-nni s resolution tameqqrant, azen-it, ma ulac beddel isem-is.',
-'fileexists-forbidden'        => 'Tugna s yisem kif-kif tewǧed yagi; g leɛnayek uɣal u beddel isem-is. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Tugna s yisem kif-kif tewǧed yagi; g leɛnayek uɣal u beddel isem-is. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Iban-d belli tugna-nni d tugna tamecṭuht n tugna nni�en ''(thumbnail)''. G leɛnayek ssenqed tugna-agi '''<tt>$1</tt>'''.<br />
+Ma llant kif-kif ur tt-taznepd ara.",
+'file-thumbnail-no'           => "Isem n tugna yebda s '''<tt>$1</tt>'''. Waqila tugna-nni d tugna tamecṭuht n tugna nni�en ''(thumbnail)''.
+Ma tesɛi� tugna-nni s resolution tameqqrant, azen-it, ma ulac beddel isem-is.",
+'fileexists-forbidden'        => 'Tugna s yisem kif-kif tewǧed yagi; g leɛnayek uɣal u beddel isem-is. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Tugna s yisem kif-kif tewǧed yagi; g leɛnayek uɣal u beddel isem-is. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Azen yekfa',
 'uploadwarning'               => 'AÉ£tal deg wazan n ufayluwen',
 'savefile'                    => 'Smekti afaylu',
@@ -843,17 +834,17 @@ Ma tesɛi� tugna-nni s resolution tameqqrant, azen-it, ma ulac beddel isem-is.
 'upload_source_url'  => ' (URL saḥiḥ)',
 'upload_source_file' => ' (afaylu deg uselkim inek)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Nadi ɣef yisem n tugna:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Nadi ɣef yisem n tugna:',
 'imgfile'               => 'afaylu',
-'imagelist'             => 'Umuɣ n tugniwin',
-'imagelist_date'        => 'Azemz',
-'imagelist_name'        => 'Isem',
-'imagelist_user'        => 'Amseqdac',
-'imagelist_size'        => 'Tiddi (bytes/octets)',
-'imagelist_description' => 'Aglam',
-
-# Image description page
+'listfiles'             => 'Umuɣ n tugniwin',
+'listfiles_date'        => 'Azemz',
+'listfiles_name'        => 'Isem',
+'listfiles_user'        => 'Amseqdac',
+'listfiles_size'        => 'Tiddi (bytes/octets)',
+'listfiles_description' => 'Aglam',
+
+# File description page
 'filehist-current'          => 'Lux a',
 'filehist-user'             => 'Amseqdac',
 'imagelinks'                => 'Izdayen',
@@ -891,22 +882,9 @@ Ma tesɛi� tugna-nni s resolution tameqqrant, azen-it, ma ulac beddel isem-is.
 'randomredirect' => 'Asemmime� menwala',
 
 # Statistics
-'statistics'             => 'Tisnaddanin',
-'sitestats'              => 'Tisnaddanin n {{SITENAME}}',
-'userstats'              => 'Tisnaddanin n wemseqdac',
-'sitestatstext'          => "{{PLURAL:\$1|Yella '''yiwen''' usebter|Llan '''\$1''' n isebtar}} deg database.
-Azwil-agi yesɛa daɣen akk isebtar \"amyannan\", d isebtar ɣef {{SITENAME}}, d isebtar \"imecṭuḥen\", isebtar ismim�en, d wiya�.
-Asmi ttwakksen wigini, {{PLURAL:\$2|yella '''yiwen''' usebter|llan '''\$2''' n isebtar}} d {{PLURAL:\$2|amliḥ|imliḥen}} . 
-
-'''\$8''' {{PLURAL:\$8|afaylu|ifayluwen}} ttwaznen.
-
-{{PLURAL:\$3|tella|llant}} '''\$3''' n {{PLURAL:\$3|timeẓriwt|timeẓriwin}}, '''\$4''' n {{PLURAL:\$4|ubeddel|yibeddlen}} n usebtar segmi {{SITENAME}} yettwaxleq.
-Ihi, {{PLURAL:\$5|yella|llan}} '''\$5''' n {{PLURAL:\$5|ubeddel|ibeddlen}} i mkul asebter, d '''\$6''' timeẓriwin i mkul abeddel.
-
-Ṭul n [http://www.mediawiki.org/wiki/Manual:Job_queue umuti n wexdam] '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Yella '''yiwen''' wemseqdac|Llan '''$1''' n yimseqdacen}}, seg-sen
-'''$2''' (neɣ '''$4%''') {{PLURAL:$2|yesɛa|sɛan}} izerfan n $5.",
-'statistics-mostpopular' => 'isebtar mmeẓren aṭṭas',
+'statistics'              => 'Tisnaddanin',
+'statistics-header-users' => 'Tisnaddanin n wemseqdac',
+'statistics-mostpopular'  => 'isebtar mmeẓren aṭṭas',
 
 'disambiguations'      => 'isebtar n usefham',
 'disambiguationspage'  => 'Template:Asefham',
@@ -977,8 +955,6 @@ Ihi, {{PLURAL:\$5|yella|llan}} '''\$5''' n {{PLURAL:\$5|ubeddel|ibeddlen}} i mku
 'speciallogtitlelabel' => 'Azwel:',
 'log'                  => 'AÉ£mis',
 'all-logs-page'        => 'Akk iɣmisen',
-'log-search-legend'    => 'Nadi ɣef yiɣmisen',
-'log-search-submit'    => 'OK',
 'alllogstext'          => 'Ssken akk iɣmisen n {{SITENAME}}.
 Tzemre� ad textare� cwiṭ seg-sen ma tebɣi�.',
 'logempty'             => 'Ur yufi ara deg uɣmis.',
@@ -1064,12 +1040,6 @@ Ma tebɣi� ad tekkse� asebter seg wumuɣ n uɛessi inek, wekki ɣef \"Fakk a
 'iteminvalidname'      => "Agnu akk d uferdis '$1', isem ma��i ṣaḥiḥ...",
 'wlnote'               => "Deg ukessar {{PLURAL:$1|yella yiwen ubeddel aneggaru|llan '''$1''' n yibeddlen ineggura}} deg {{PLURAL:$2|saɛa taneggarut|'''$2''' swayeɛ tineggura}}.",
 'wlshowlast'           => 'Ssken $1 n swayeɛ $2 n wussan neɣ $3 ineggura',
-'watchlist-show-bots'  => 'Ssken ibeddlen n yiboá¹­iyen (bots)',
-'watchlist-hide-bots'  => 'Ffer ibeddlen n yiboá¹­iyen (bots)',
-'watchlist-show-own'   => 'Ssken ibeddlen inu',
-'watchlist-hide-own'   => 'Ffer ibeddlen inu',
-'watchlist-show-minor' => 'Ssken ibeddlen ifessasen',
-'watchlist-hide-minor' => 'Ffer ibeddlen ifessasen',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ad iɛass...',
@@ -1107,32 +1077,37 @@ Akken ad tbeddle� n wumuɣ n uɛessi inek settings, ruḥ ɣer
 Tadhelt:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'              => 'Mḥu asebter',
-'confirm'                 => 'Sentem',
-'excontent'               => "Ayen yella: '$1'",
-'excontentauthor'         => "Ayen yella: '$1' ('[[Special:Contributions/$2|$2]]' kan i yekken deg-s)",
-'exbeforeblank'           => "Ayen yella uqbal ma yettumḥa: '$1'",
-'exblank'                 => 'asebter yella d ilem',
-'historywarning'          => 'Aɣtal: Asebter i ara temḥu� yesɛa amezruy:',
-'actioncomplete'          => 'Axdam yekfa',
-'deletedtext'             => '"<nowiki>$1</nowiki>" yettumḥa.
+# Delete
+'deletepage'      => 'Mḥu asebter',
+'confirm'         => 'Sentem',
+'excontent'       => "Ayen yella: '$1'",
+'excontentauthor' => "Ayen yella: '$1' ('[[Special:Contributions/$2|$2]]' kan i yekken deg-s)",
+'exbeforeblank'   => "Ayen yella uqbal ma yettumḥa: '$1'",
+'exblank'         => 'asebter yella d ilem',
+'historywarning'  => 'Aɣtal: Asebter i ara temḥu� yesɛa amezruy:',
+'actioncomplete'  => 'Axdam yekfa',
+'deletedtext'     => '"<nowiki>$1</nowiki>" yettumḥa.
 Ẓer $2 i aɣmis n yimḥayin imaynuten.',
-'deletedarticle'          => '"[[$1]]" yettumḥa',
-'dellogpage'              => 'Aɣmis n umḥay',
-'dellogpagetext'          => 'Deg ukessar, yella wumuɣ n yimḥayin imaynuten.',
-'deletionlog'             => 'Aɣmis n umḥay',
-'reverted'                => 'Asuɣal i tasiwel taqdimt',
-'deletecomment'           => 'Ayɣer tebɣi� ad temḥu�',
-'cantrollback'            => 'Ur yezmir ara ad yessuɣal; yella yiwen kan amseqdac iwumi ibeddel/yexleq asebter-agi.',
-'editcomment'             => 'Agzul n ubeddel yella: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'              => 'Yessuɣal ibeddlen n [[Special:Contributions/$2|$2]] ([[User talk:$2|Meslay]]); yettubeddel ɣer tasiwelt taneggarut n [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'sessionfailure'          => 'Yella ugul akk d takmect inek;
+'deletedarticle'  => '"[[$1]]" yettumḥa',
+'dellogpage'      => 'Aɣmis n umḥay',
+'dellogpagetext'  => 'Deg ukessar, yella wumuɣ n yimḥayin imaynuten.',
+'deletionlog'     => 'Aɣmis n umḥay',
+'reverted'        => 'Asuɣal i tasiwel taqdimt',
+'deletecomment'   => 'Ayɣer tebɣi� ad temḥu�',
+
+# Rollback
+'cantrollback'   => 'Ur yezmir ara ad yessuɣal; yella yiwen kan amseqdac iwumi ibeddel/yexleq asebter-agi.',
+'editcomment'    => "Agzul n ubeddel yella: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => 'Yessuɣal ibeddlen n [[Special:Contributions/$2|$2]] ([[User talk:$2|Meslay]]); yettubeddel ɣer tasiwelt taneggarut n [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'sessionfailure' => 'Yella ugul akk d takmect inek;
 Axdam-agi yebṭel axaṭer waqila yella wemdan nni�en i yeddem isem n wemseqdac inek.
 G leɛnayek wekki ɣef taqeffalt "Back/Précédent" n browser/explorateur inek, umbeɛd wekki ɣef "Actualiser/reload" akk ad tɛer�e� tikelt nni�en.',
+
+# Protect
 'protectlogpage'          => 'Aɣmis n wemḥay',
 'protectedarticle'        => '"[[$1]]" yettwaḥrez',
 'protect-title'           => 'Ad yeḥrez "$1"',
+'prot_1movedto2'          => '[[$1]] yettusmime� ar [[$2]]',
 'protect-legend'          => 'Sentem tiḥḥerzi',
 'protect-default'         => '(ameslugen)',
 'protect-level-sysop'     => 'Inedbalen kan',
@@ -1175,7 +1150,6 @@ G leɛnayek wekki ɣef taqeffalt "Back/Précédent" n browser/explorateur inek,
 
 # What links here
 'whatlinkshere'       => 'Ayen i d-yettawi ɣer da',
-'linklistsub'         => '(Umuɣ n yizdayen)',
 'linkshere'           => "Isebtar-agi sɛan azday ɣer '''[[:$1]]''':",
 'nolinkshere'         => "Ulac asebter i yesɛan azday ɣer '''[[:$1]]'''.",
 'nolinkshere-ns'      => "Ulac asebter i yesɛan azday ɣer '''[[:$1]]''' deg yisem n taɣult i textare�.",
@@ -1221,6 +1195,9 @@ Yernu, tzemre� ad tesmime� asebter ɣer isem-is aqdim ma tɣelṭe�.",
 
 Lukan akka, yessefk a t-tedme� weḥdek.",
 'movearticle'             => 'Smime� asebter',
+'movenologin'             => 'Ur tekcime� ara',
+'movenologintext'         => 'Yessefk ad tesɛu� isem n wemseqdac u [[Special:UserLogin|tkecme�]]
+iwakken ad tesmim�e� asebter.',
 'newtitle'                => 'Ar azwel amaynut',
 'move-watch'              => '�ass asebter-agi',
 'movepagebtn'             => 'Smime� asebter',
@@ -1244,7 +1221,6 @@ Anda tebɣi� tesmime� "[[:$1]]" yella yagi. tebɣi� ad temḥu� iwakken
 'delete_and_move_confirm' => 'Ih, mḥu asebter',
 'delete_and_move_reason'  => 'Mḥu iwakken yeqqim-d wemkan i usmime�',
 'selfmove'                => 'Izwal amezwaru d uneggaru kif-kif; ur yezmir ara ad yesmime� asebter ɣur iman-is.',
-'immobile_namespace'      => 'Azwel n uɣbalu neɣ anda tebɣi� tesmime� d anaw aslig; ur yezmir ara ad yesmime� isebtar seg/ɣer isem n taɣult-agi.',
 
 # Export
 'export'            => 'Ssufeɣ isebtar',
@@ -1259,7 +1235,7 @@ Anda tebɣi� tesmime� "[[:$1]]" yella yagi. tebɣi� ad temḥu� iwakken
 'allmessagesdefault'        => 'A�ris ameslugen',
 'allmessagescurrent'        => 'A�ris n tura',
 'allmessagestext'           => 'Wagi d umuɣ n izen n system i yellan deg yisem n taɣult.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' ut yezmir ara ad yettuseqdac axaá¹­er '''\$wgUseDatabaseMessages''' yettwakkes.",
 'allmessagesfilter'         => 'Tastayt n yisem n izen:',
 'allmessagesmodified'       => 'Ssken win yettubeddlen kan',
@@ -1418,7 +1394,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'show-big-image'       => 'Resolution tameqqrant',
 'show-big-image-thumb' => '<small>Tiddi n pre-timeẓriwt-agi: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Umuɣ n ifayluwen imaynuten',
 'imagelisttext'         => "Deg ukessar yella wumuɣ n '''$1''' {{PLURAL:$1|ufaylu|yifayluwen}} $2.",
 'noimages'              => 'Tugna ulac-itt.',
@@ -1501,19 +1477,8 @@ $1
 G leɛnaya-k sentem belli ṣaḥḥ tebɣi� ad tɛiwede� axlaq n usebter-agi.",
 'recreate'            => '�iwed xleq',
 
-# HTML dump
-'redirectingto' => 'Asemmime� ar [[:$1]]...',
-
 # action=purge
-'confirm_purge' => 'Mḥu lkac n usebter-agi?
-
-$1',
-
-# AJAX search
-'searchcontaining' => "Inadi isebtar i yesɛan ''$1''.",
-'searchnamed'      => "Nadi ɣef imagraden ttusemman ''$1''.",
-'articletitles'    => "Imagraden i yebdan s ''$1''",
-'hideresults'      => 'Ffer igmad',
+'confirm-purge-top' => 'Mḥu lkac n usebter-agi?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� asebter ssabeq',
diff --git a/languages/messages/MessagesKk_arab.php b/languages/messages/MessagesKk_arab.php
index b46281bc..7945c1e1 100644
--- a/languages/messages/MessagesKk_arab.php
+++ b/languages/messages/MessagesKk_arab.php
@@ -63,8 +63,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'قاتىسۋشى_تالقىلاۋى',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_تالقىلاۋى',
-	NS_IMAGE            => 'سۋرەت',
-	NS_IMAGE_TALK       => 'سۋرەت_تالقىلاۋى',
+	NS_FILE             => 'سۋرەت',
+	NS_FILE_TALK        => 'سۋرەت_تالقىلاۋى',
 	NS_MEDIAWIKI        => 'مەدىياۋىيكىي',
 	NS_MEDIAWIKI_TALK   => 'مەدىياۋىيكىي_تالقىلاۋى',
 	NS_TEMPLATE         => 'Û‡Ù„Ú¯Ù‰',
@@ -83,8 +83,8 @@ $namespaceAliases = array(
 	'Қаты�ушы'            => NS_USER,
 	'Қаты�ушы_талқылауы'  => NS_USER_TALK,
 	'$1_талқылауы'        => NS_PROJECT_TALK,
-	'Сурет'               => NS_IMAGE,
-	'Сурет_талқылауы'     => NS_IMAGE_TALK,
+	'Сурет'               => NS_FILE,
+	'Сурет_талқылауы'     => NS_FILE_TALK,
 	'МедиаУики'           => NS_MEDIAWIKI,
 	'МедиаУики_талқылауы' => NS_MEDIAWIKI_TALK,
 	'Үлгі'                => NS_TEMPLATE,
@@ -101,8 +101,8 @@ $namespaceAliases = array(
 	'Qatıswşı'            => NS_USER,
 	'Qatıswşı_talqılawı'  => NS_USER_TALK,
 	'$1_talqılawı'        => NS_PROJECT_TALK,
-	'Swret'               => NS_IMAGE,
-	'Swret_talqılawı'     => NS_IMAGE_TALK,
+	'Swret'               => NS_FILE,
+	'Swret_talqılawı'     => NS_FILE_TALK,
 	'MedïaWïkï'           => NS_MEDIAWIKI,
 	'MedïaWïkï_talqılawı' => NS_MEDIAWIKI_TALK,
 	'Ãœlgi'                => NS_TEMPLATE,
@@ -121,16 +121,6 @@ $namespaceAliases = array(
 	'ٴۇلگٴى_تالقىلاۋى'    => NS_TEMPLATE_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'داعدىلى (standard)',
-	'nostalgia'   => 'اڭساۋ (nostalgia)',
-	'cologneblue' => 'كولن زەڭگىرلىگى (cologneblue)',
-	'monobook'    => 'دارا كىتاپ (monobook)',
-	'myskin'      => 'ٴوز مانەرىم (myskin)',
-	'chick'       => 'بالاپان (chick)',
-	'simple'      => 'كادىمگى (simple)',
-	'modern'      => 'زاماناۋىي (modern)',
-);
 
 $datePreferences = array(
 	'default',
@@ -335,7 +325,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'باقىلاۋ_تىزىمى' ),
 	'Recentchanges'             => array( 'جۋىقتاعى_وزگەرىستەر' ),
 	'Upload'                    => array( 'قوتارىپ_بەرۋ', 'قوتارۋ' ),
-	'Imagelist'                 => array( 'سۋرەت_تىزىمى' ),
+	'Listfiles'                 => array( 'سۋرەت_تىزىمى' ),
 	'Newimages'                 => array( 'جاڭا_سۋرەتتەر' ),
 	'Listusers'                 => array( 'قاتىسۋشىلار', 'قاتىسۋشى_تىزىمى' ),
 	'Listgrouprights'           => array( 'توپ_قۇقىقتارى_تىزىمى' ),
@@ -350,7 +340,6 @@ $specialPageAliases = array(
 	'Unusedimages'              => array( 'پايدالانىلماعان_سۋرەتتەر' ),
 	'Wantedpages'               => array( 'تولتىرىلماعان_بەتتەر', 'جارامسىز_سىلتەمەلەر' ),
 	'Wantedcategories'          => array( 'تولتىرىلماعان_ساناتتار' ),
-	'Missingfiles'              => array( 'جوق_�ايلدار', 'جوق_سۋرەتتەر' ),
 	'Mostlinked'                => array( 'ەڭ_كوپ_سىلتەنگەن_بەتتەر' ),
 	'Mostlinkedcategories'      => array( 'ەڭ_كوپ_پايدالانىلعان_ساناتتار', 'ەڭ_كوپ_سىلتەنگەن_ساناتتار' ),
 	'Mostlinkedtemplates'       => array( 'ەڭ_كوپ_پايدالانىلعان_ۇلگىلەر', 'ەڭ_كوپ_سىلتەنگەن_ۇلگىلەر' ),
@@ -458,8 +447,6 @@ $messages = array(
 'underline-never'   => 'ەشقاشان',
 'underline-default' => 'شولعىش بويىنشا',
 
-'skinpreview' => '(قاراپ شىعۋ)',
-
 # Dates
 'sunday'        => 'جەكسەنبى',
 'monday'        => 'دۇيسەنبى',
@@ -552,7 +539,7 @@ $messages = array(
 'mytalk'         => 'تالقىلاۋىم',
 'anontalk'       => 'IP تالقىلاۋى',
 'navigation'     => 'شارلاۋ',
-'and'            => 'جانە',
+'and'            => '&#32;جانە',
 
 # Metadata in edit box
 'metadata_help' => 'قوسىمشا دەرەكتەر:',
@@ -615,8 +602,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} تۋرالى',
 'aboutpage'            => 'Project:جوبا تۋرالى',
-'bugreports'           => 'قاتەلىك باياناتتارى',
-'bugreportspage'       => 'Project:قاتەلىك ەسەپتەمەلەرى',
 'copyright'            => 'ماعلۇمات $1 شارتىمەن جەتىمدى.',
 'copyrightpagename'    => '{{SITENAME}} اۋتورلىق قۇقىقتارى',
 'copyrightpage'        => '{{ns:project}}:اۋتورلىق قۇقىقتار',
@@ -639,8 +624,6 @@ $messages = array(
 
 'badaccess'        => 'رۇقسات قاتەسى',
 'badaccess-group0' => 'سۇراتىلعان ارەكەتىڭىزدى جەگۋىڭىزگە رۇقسات ەتىلمەيدى.',
-'badaccess-group1' => 'سۇراتىلعان ارەكەتىڭىز $1 توبىنىڭ قاتىسۋشىلارىنا شەكتەلەدى.',
-'badaccess-group2' => 'سۇراتىلعان ارەكەتىڭىز $1 توپتارى ٴبىرىنىڭ قاتۋسىشىلارىنا شەكتەلەدى.',
 'badaccess-groups' => 'سۇراتىلعان ارەكەتىڭىز $1 توپتارى ٴبىرىنىڭ قاتۋسىشىلارىنا شەكتەلەدى.',
 
 'versionrequired'     => 'MediaWiki $1 نۇسقاسى كەرەك',
@@ -741,7 +724,6 @@ $1',
 'badtitle'             => 'جارامسىز تاقىرىپ اتى',
 'badtitletext'         => 'سۇرالعان بەت تاقىرىبىنىڭ اتى جارامسىز, بوس, تىلارالىق سىلتەمەسى نە ۋىيكىي-ارالىق تاقىرىپ اتى بۇرىس ەنگىزىلگەن.
 مىندا تاقىرىپ اتىندا قولدالمايتىن بىرقاتار تاڭبالار بولۋى مۇمكىن.',
-'perfdisabled'         => 'عا�ۋ ەتىڭىز! بۇل مۇمكىندىك, دەرەكقوردىڭ جىلدامىلىعىنا اسەر ەتىپ, ەشكىمگە ۋىيكىيدى پايدالانۋعا بەرمەگەسىن, ۋاقىتشا وشىرىلگەن.',
 'perfcached'           => 'كەلەسى دەرەك بۇركەمەلەنگەن, سوندىقتان تولىقتاي جاڭالانماعان بولۋى مۇمكىن.',
 'perfcachedts'         => 'كەلەسى دەرەك بۇركەمەلەنگەن, سوڭعى جاڭالانلعان كەزى: $1.',
 'querypage-no-updates' => 'بۇل بەتتىڭ جاڭارتىلۋى اعىمدا وشىرىلگەن. دەرەكتەرى قازىر وزگەرتىلمەيدى.',
@@ -758,7 +740,7 @@ $1',
 'protectedinterface'   => 'بۇل بەت باعدارلامالىق جاساقتامانىڭ تىلدەسۋ ٴماتىنىن جەتىستىرەدى, سوندىقتان قىيياناتتى قاقپايلاۋ ٴۇشىن وزگەرتۋى قۇلىپتالعان.',
 'editinginterface'     => "'''قۇلاقتاندىرۋ:''' باعدارلامالىق جاساقتامانىڭ تىلدەسۋ ٴماتىنىن جەتىستىرەتىن بەتىن وڭدەپ جاتىرسىز.
 بۇل بەتتىڭ وزگەرتۋى باسقا قاتىسۋشىلارعا پايدالانۋشىلىق تىلدەسۋى قالاي كورىنەتىنە اسەر ەتەدى.
-اۋدارمالار ٴۇشىن, MediaWiki باعدارلاماسىن جەرسىندىرۋ [http://translatewiki.net/wiki/Main_Page?setlang=kk Betawiki جوباسى] ارقىلى قاراپ شەشىڭىز.",
+اۋدارمالار ٴۇشىن, MediaWiki باعدارلاماسىن جەرسىندىرۋ [http://translatewiki.net/wiki/Main_Page?setlang=kk translatewiki.net جوباسى] ارقىلى قاراپ شەشىڭىز.",
 'sqlhidden'            => '(SQL سۇرانىمى جاسىرىلعان)',
 'cascadeprotected'     => 'بۇل بەت وڭدەۋدەن قورعالعان, سەبەبى بۇل كەلەسى «باۋلى قورعاۋى» قوسىلعان {{PLURAL:$1|بەتتىڭ|بەتتەردىڭ}} كىرىكبەتى:
 $2',
@@ -770,10 +752,10 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'قاتىسۋشى شىعۋى',
-'logouttext'                 => '<strong>ەندى جۇيەدەن شىقتىڭىز.</strong>
+'logouttext'                 => "'''ەندى جۇيەدەن شىقتىڭىز.'''
 
 جۇيەگە كىرمەستەن {{SITENAME}} جوباسىن پايدالانۋىن جالعاستىرا الاسىز, نەمەسە ٴدال سول نە وزگە قاتىسۋشى بوپ قايتا كرۋىڭىز مۇمكىن.
-اڭعارتپا: كەيبىر بەتتەر شولعىشىڭىزدىڭ بۇركەمەسىن تازارتقانشا دەيىن ٴالى دە كىرپ قالعانىڭىزداي كورىنۋى مۇمكىن.',
+اڭعارتپا: كەيبىر بەتتەر شولعىشىڭىزدىڭ بۇركەمەسىن تازارتقانشا دەيىن ٴالى دە كىرپ قالعانىڭىزداي كورىنۋى مۇمكىن.",
 'welcomecreation'            => '== قوش كەلدىڭىز, $1! ==
 جاڭا تىركەلگىڭىز جاسالدى.
 {{SITENAME}} باپتالىمدارىڭىزدى وزگەرتۋىن ۇمىتپاڭىز.',
@@ -784,7 +766,6 @@ $2',
 'remembermypassword'         => 'مەنىڭ كىرگەنىمدى بۇل كومپيۋتەردە ۇمىتپا',
 'yourdomainname'             => 'جەلى ۇيشىگىڭىز:',
 'externaldberror'            => 'وسى ارادا نە شەتتىك راستاۋ دەرەكقورىندا قاتە بولدى, نەمەسە شەتتىك تىركەلگىڭىزدى جاڭالاۋ رۇقساتى جوق.',
-'loginproblem'               => '<b>كىرۋىڭىز كەزىندە وسىندا قىيىندىققا تاپ بولدىق.</b><br />قايتا بايقاپ كورىڭىز.',
 'login'                      => 'كىرۋ',
 'nav-login-createaccount'    => 'كىرۋ / تىركەلگى جاساۋ',
 'loginprompt'                => '{{SITENAME}} تورابىنا كىرۋىڭىز ٴۇشىن «cookies» قوسىلۋى ٴجون.',
@@ -877,12 +858,14 @@ $2',
 'resetpass_announce'      => 'حاتپەن جىبەرىلگەن ۋاقىتشا كودىمەن كىرگەنسىز.
 كىرۋىڭىزدى ٴبىتىرۋ ٴۇشىن, جاڭا قۇپىييا ٴسوزىڭىزدى مىندا ەنگىزۋىڭىز ٴجون:',
 'resetpass_header'        => 'قۇپىييا ٴسوزدى وزگەرتۋ',
+'oldpassword'             => 'اعىمدىق قۇپىييا ٴسوزىڭىز:',
+'newpassword'             => 'جاڭا قۇپىييا ٴسوزىڭىز:',
+'retypenew'               => 'جاڭا قۇپىييا ٴسوزىڭىزدى قايتالاڭىز:',
 'resetpass_submit'        => 'قۇپىييا ٴسوزدى قويىڭىز دا كىرىڭىز',
 'resetpass_success'       => 'قۇپىييا ٴسوزىڭىز ٴساتتى وزگەرتىلدى! ەندى كىرىڭىز…',
 'resetpass_bad_temporary' => 'ۋاقىتشا قۇپىييا ٴسوز جارامسىز.
 مۇمكىن قۇپىييا ٴسوزىڭىزدى الداقاشان ٴساتتى وزگەرتكەن بولارسىز نەمەسە جاڭا ۋاقىتشا قۇپىييا ٴسوزىن سۇراتىلعانسىز.',
 'resetpass_forbidden'     => '{{SITENAME}} جوباسىندا قۇپىييا سوزدەر وزگەرتىلمەيدى',
-'resetpass_missing'       => 'ەش ٴپىشىن دەرەكتەرى جوق.',
 
 # Edit page toolbar
 'bold_sample'     => 'جۋان ٴماتىن',
@@ -905,8 +888,8 @@ $2',
 'hr_tip'          => 'دەرەلەي سىزىق (ۇنەمدى قولدانىڭىز)',
 
 # Edit pages
-'summary'                          => 'قىسقاشا مازمۇنداماسى',
-'subject'                          => 'تاقىرىبى/باس جولى',
+'summary'                          => 'قىسقاشا مازمۇنداماسى:',
+'subject'                          => 'تاقىرىبى/باس جولى:',
 'minoredit'                        => 'بۇل شاعىن وڭدەمە',
 'watchthis'                        => 'بەتتى باقىلاۋ',
 'savearticle'                      => 'بەتتى ساقتا!',
@@ -921,8 +904,8 @@ IP مەكەنجايىڭىز بۇل بەتتىڭ تۇزەتۋ تارىيحىندØ
 'missingcommenttext'               => 'ماندەمەڭىزدى تومەندە ەنگىزىڭىز.',
 'missingcommentheader'             => "'''ەسكەرتپە:''' بۇل ماندەمەگە تاقىرىپ/باسجول جەتىستىرمەپسىز.
 ەگەر تاعى دا ساقتاۋ تۇيمەسىن نۇقىساڭىز, وڭدەمەڭىز سولسىز ساقتالادى.",
-'summary-preview'                  => 'قىسقاشا مازمۇنداماسىن قاراپ شىعۋ',
-'subject-preview'                  => 'تاقىرىبىن/باس جولىن قاراپ شىعۋ',
+'summary-preview'                  => 'قىسقاشا مازمۇنداماسىن قاراپ شىعۋ:',
+'subject-preview'                  => 'تاقىرىبىن/باس جولىن قاراپ شىعۋ:',
 'blockedtitle'                     => 'قاتىسۋشى بۇعاتتالعان',
 'blockedtext'                      => "<big>'''قاتىسۋشى اتىڭىز نە IP مەكەنجايىڭىز بۇعاتتالعان.'''</big>
 
@@ -975,26 +958,26 @@ IP مەكەنجايىڭىز بۇل بەتتىڭ تۇزەتۋ تارىيحىندØ
 'noarticletext'                    => 'بۇل بەتتە اعىمدا ەش ٴماتىن جوق, باسقا بەتتەردەن وسى بەت اتاۋىن [[Special:Search/{{PAGENAME}}|ىزدەپ كورۋىڭىزگە]] نەمەسە وسى بەتتى [{{fullurl:{{FULLPAGENAME}}|action=edit}} تۇزەتۋىڭىزگە] بولادى.',
 'userpage-userdoesnotexist'        => '«$1» قاتىسۋشى تىركەلگىسى جازىپ الىنباعان. بۇل بەتتى باستاۋ/وڭدەۋ تالابىڭىزدى تەكسەرىپ شىعىڭىز.',
 'clearyourcache'                   => "'''اڭعارتپا:''' ساقتاعاننان كەيىن, وزگەرىستەردى كورۋ ٴۇشىن شولعىش بۇركەمەسىن وراعىتۋ ىقتىيمال. '''Mozilla / Firefox / Safari:''' ''قايتا جۇكتەۋ'' باتىرماسىن نۇقىعاندا ''Shift'' تۇتىڭىز, نە ''Ctrl-Shift-R'' باسىڭىز (Apple Mac — ''Cmd-Shift-R''); '''IE:''' ''جاڭارتۋ'' باتىرماسىن نۇقىعاندا ''Ctrl'' تۇتىڭىز, نە ''Ctrl-F5'' باسىڭىز; '''Konqueror:''': ''جاڭارتۋ'' باتىرماسىن جاي نۇقىڭىز, نە ''F5'' باسىڭىز; '''Opera''' پايدانۋشىلارى ''قۇرالدار→باپتالىمدار'' دەگەنگە بارىپ بۇركەمەسىن تولىق تازارتۋ ٴجون.",
-'usercssjsyoucanpreview'           => '<strong>اقىل-كەڭەس:</strong> جاڭا CSS/JS �ايلىن ساقتاۋ الدىندا «قاراپ شىعۋ» باتىرماسىن قولدانىپ سىناقتاڭىز.',
+'usercssjsyoucanpreview'           => "'''اقىل-كەڭەس:''' جاڭا CSS/JS �ايلىن ساقتاۋ الدىندا «قاراپ شىعۋ» باتىرماسىن قولدانىپ سىناقتاڭىز.",
 'usercsspreview'                   => "'''مىناۋ CSS ٴماتىنىن تەك قاراپ شىعۋ ەكەنىن ۇمىتپاڭىز, ول ٴالى ساقتالعان جوق!'''",
 'userjspreview'                    => "'''مىناۋ JavaScript قاتىسۋشى باعدارلاماسىن تەكسەرۋ/قاراپ شىعۋ ەكەنىن ۇمىتپاڭىز, ول ٴالى ساقتالعان جوق!'''",
 'userinvalidcssjstitle'            => "'''قۇلاقتاندىرۋ:''' وسى ارادا «$1» دەگەن ەش مانەر جوق.
 قاتىسۋشىنىڭ .css جانە .js �ايل اتاۋى كىشى ارىپپپەن جازىلۋ ٴتىيىستى ەكەنىن ۇمىتپاڭىز, مىسالعا {{ns:user}}:Foo/monobook.css دەگەندى {{ns:user}}:Foo/Monobook.css دەگەنمەن سالىستىرىپ قاراڭىز.",
 'updated'                          => '(جاڭارتىلعان)',
-'note'                             => '<strong>اڭعارتپا:</strong>',
-'previewnote'                      => '<strong>مىناۋ تەك قاراپ شىعۋ ەكەنىن ۇمىتپاڭىز;
-وزگەرىستەر ٴالى ساقتالعان جوق!</strong>',
+'note'                             => "'''اڭعارتپا:'''",
+'previewnote'                      => "'''مىناۋ تەك قاراپ شىعۋ ەكەنىن ۇمىتپاڭىز;
+وزگەرىستەر ٴالى ساقتالعان جوق!'''",
 'previewconflict'                  => 'بۇل قاراپ شىعۋ بەتى جوعارعى كىرىستىرۋ ورنىنداعى ٴماتىندى قامتىيدى دا جانە ساقتالعانداعى ٴوڭدى كورسەتپەك.',
-'session_fail_preview'             => '<strong>عا�ۋ ەتىڭىز! سەسسىييا دەرەكتەرى جوعالۋى سالدارىنان وڭدەمەڭىزدى بىتىرە المايمىز.
-قايتا بايقاپ كورىڭىز. ەگەر بۇل ٴالى ىستەلمەسە, شىعۋدى جانە قايتا كىرۋدى بايقاپ كورىڭىز.</strong>',
-'session_fail_preview_html'        => "<strong>عا�ۋ ەتىڭىز! سەسسىييا دەرەكتەرى جوعالۋى سالدارىنان وڭدەمەڭىزدى بىتىرە المايمىز.</strong>
+'session_fail_preview'             => "'''عا�ۋ ەتىڭىز! سەسسىييا دەرەكتەرى جوعالۋى سالدارىنان وڭدەمەڭىزدى بىتىرە المايمىز.
+قايتا بايقاپ كورىڭىز. ەگەر بۇل ٴالى ىستەلمەسە, شىعۋدى جانە قايتا كىرۋدى بايقاپ كورىڭىز.'''",
+'session_fail_preview_html'        => "'''عا�ۋ ەتىڭىز! سەسسىييا دەرەكتەرى جوعالۋى سالدارىنان وڭدەمەڭىزدى بىتىرە المايمىز.'''
 
 ''{{SITENAME}} جوباسىندا قام HTML قوسىلعان, JavaScript شابۋىلداردان قورعانۋ ٴۇشىن الدىن الا قاراپ شىعۋ جاسىرىلعان.''
 
-<strong>ەگەر بۇل وڭدەمە ادال تالاپ بولسا, قايتا بايقاپ كورىڭىز. ەگەر بۇل ٴالى ىستەمەسە, شىعۋدى جانە قايتا كىرۋدى بايقاپ كورىڭىز.</strong>",
-'token_suffix_mismatch'            => '<strong>وڭدەمەڭىز تايدىرىلدى, سەبەبى تۇتىنعىشىڭىز وڭدەمە دەرەكتەر بۋماسىنداعى تىنىس بەلگىلەرىن ٴبۇلدىرتتى.
+'''ەگەر بۇل وڭدەمە ادال تالاپ بولسا, قايتا بايقاپ كورىڭىز. ەگەر بۇل ٴالى ىستەمەسە, شىعۋدى جانە قايتا كىرۋدى بايقاپ كورىڭىز.'''",
+'token_suffix_mismatch'            => "'''وڭدەمەڭىز تايدىرىلدى, سەبەبى تۇتىنعىشىڭىز وڭدەمە دەرەكتەر بۋماسىنداعى تىنىس بەلگىلەرىن ٴبۇلدىرتتى.
 بەت ٴماتىنى بۇلىنبەۋ ٴۇشىن وڭدەمەڭىز تايدىرىلادى.
-بۇل كەي ۋاقىتتا قاتەسى تولعان ۆەب-نەگىزىندە تىركەلۋى جوق پروكسىي-سەرۆەردى پايدالانعان بولۋى مۇمكىن.</strong>',
+بۇل كەي ۋاقىتتا قاتەسى تولعان ۆەب-نەگىزىندە تىركەلۋى جوق پروكسىي-سەرۆەردى پايدالانعان بولۋى مۇمكىن.'''",
 'editing'                          => 'وڭدەلۋدە: $1',
 'editingsection'                   => 'وڭدەلۋدە: $1 (ٴبولىمى)',
 'editingcomment'                   => 'وڭدەلۋدە: $1 (ماندەمەسى)',
@@ -1006,30 +989,30 @@ IP مەكەنجايىڭىز بۇل بەتتىڭ تۇزەتۋ تارىيحىندØ
 «بەتتى ساقتا! باتىرماسىن باسقاندا '''تەك''' جوعارعى كىرىستىرۋ ورنىنداعى ٴماتىن ساقتالادى.",
 'yourtext'                         => 'ٴماتىنىڭىز',
 'storedversion'                    => 'ساقتالعان نۇسقاسى',
-'nonunicodebrowser'                => '<strong>قۇلاقتاندىرۋ: شولعىشىڭىز Unicode بەلگىلەۋىنە ۇيلەسىمدى ەمەس, سوندىقتان لاتىن ەمەس ارىپتەرى بار بەتتەردى وڭدەۋ ٴزىل بولۋ مۇمكىن.
-جۇمىس ىستەۋگە ىقتىيمالدىق بەرۋ ٴۇشىن, تومەندەگى كىرىستىرۋ ورنىندا ASCII ەمەس تاڭبالار ونالتىلىق كودىمەن كورسەتىلەدى</strong>.',
-'editingold'                       => '<strong>قۇلاقتاندىرۋ: وسى بەتتىڭ ەرتەرەك تۇزەتۋىن وڭدەپ جاتىرسىز.
-بۇنى ساقتاساڭىز, وسى تۇزەتۋدەن كەيىنگى بارلىق وزگەرىستەر جويىلادى.</strong>',
+'nonunicodebrowser'                => "'''قۇلاقتاندىرۋ: شولعىشىڭىز Unicode بەلگىلەۋىنە ۇيلەسىمدى ەمەس, سوندىقتان لاتىن ەمەس ارىپتەرى بار بەتتەردى وڭدەۋ ٴزىل بولۋ مۇمكىن.
+جۇمىس ىستەۋگە ىقتىيمالدىق بەرۋ ٴۇشىن, تومەندەگى كىرىستىرۋ ورنىندا ASCII ەمەس تاڭبالار ونالتىلىق كودىمەن كورسەتىلەدى'''.",
+'editingold'                       => "'''قۇلاقتاندىرۋ: وسى بەتتىڭ ەرتەرەك تۇزەتۋىن وڭدەپ جاتىرسىز.
+بۇنى ساقتاساڭىز, وسى تۇزەتۋدەن كەيىنگى بارلىق وزگەرىستەر جويىلادى.'''",
 'yourdiff'                         => 'ايىرمالار',
-'copyrightwarning'                 => 'اڭعارتپا: {{SITENAME}} جوباسىنا بەرىلگەن بارلىق ۇلەستەر $2 (كوبىرەك اقپارات ٴۇشىن: $1) قۇجاتىنا ساي دەپ سانالادى.
+'copyrightwarning'                 => "اڭعارتپا: {{SITENAME}} جوباسىنا بەرىلگەن بارلىق ۇلەستەر $2 (كوبىرەك اقپارات ٴۇشىن: $1) قۇجاتىنا ساي دەپ سانالادى.
 ەگەر جازۋىڭىزدىڭ ەركىن وڭدەلۋىن جانە اقىسىز كوپشىلىككە تاراتۋىن قالاماساڭىز, مىندا جارىييالاماۋىڭىز ٴجون.<br />
 تاعى دا, بۇل ماعلۇمات ٴوزىڭىز جازعانىڭىزعا, نە قوعام قازىناسىنان نەمەسە سونداي اشىق قورلاردان كوشىرىلگەنىنە بىزگە ۋادە بەرەسىز.
-<strong>اۋتورلىق قۇقىقپەن قورعاۋلى ماعلۇماتتى رۇقساتسىز جارىييالاماڭىز!</strong>',
-'copyrightwarning2'                => 'اڭعارتپا: {{SITENAME}} جوباسىنا بەرىلگەن بارلىق ۇلەستەردى باسقا ۇلەسكەرلەر وڭدەۋگە, وزگەرتۋگە, نە الاستاۋعا مۇمكىن.
+'''اۋتورلىق قۇقىقپەن قورعاۋلى ماعلۇماتتى رۇقساتسىز جارىييالاماڭىز!'''",
+'copyrightwarning2'                => "اڭعارتپا: {{SITENAME}} جوباسىنا بەرىلگەن بارلىق ۇلەستەردى باسقا ۇلەسكەرلەر وڭدەۋگە, وزگەرتۋگە, نە الاستاۋعا مۇمكىن.
 ەگەر جازۋىڭىزدىڭ ەركىن وڭدەلۋىن قالاماساڭىز, مىندا جارىييالاماۋىڭىز ٴجون.<br />
 تاعى دا, بۇل ماعلۇمات ٴوزىڭىز جازعانىڭىزعا, نە قوعام قازىناسىنان نەمەسە سونداي اشىق قورلاردان كوشىرىلگەنىنە بىزگە ۋادە بەرەسىز (كوبىرەك اقپارات ٴۇشىن $1 قۋجاتىن قاراڭىز).
-<strong>اۋتورلىق قۇقىقپەن قورعاۋلى ماعلۇماتتى رۇقساتسىز جارىييالاماڭىز!</strong>',
-'longpagewarning'                  => '<strong>قۇلاقتاندىرۋ: بۇل بەتتىڭ مولشەرى — $1 kB;
+'''اۋتورلىق قۇقىقپەن قورعاۋلى ماعلۇماتتى رۇقساتسىز جارىييالاماڭىز!'''",
+'longpagewarning'                  => "'''قۇلاقتاندىرۋ: بۇل بەتتىڭ مولشەرى — $1 kB;
 كەيبىر شولعىشتاردا بەت مولشەرى 32 kB جەتسە نە ونى اسسا وڭدەۋ كۇردەلى بولۋى مۇمكىن.
-بەتتى بىرنەشە كىشكىن بولىمدەرگە ٴبولىپ كورىڭىز.</strong>',
-'longpageerror'                    => '<strong>قاتەلىك: جونەلتپەك ٴماتىنىڭىزدىن مولشەرى — $1 KB, ەڭ كوبى $2 KB رۇقسات ەتىلگەن مولشەرىنەن اسقان.
-بۇل ساقتاي الىنبايدى.</strong>',
-'readonlywarning'                  => '<strong>قۇلاقتاندىرۋ: دەرەكقور باپتاۋ ٴۇشىن قۇلىپتالعان, سوندىقتان ٴدال قازىر وڭدەمەڭىزدى ساقتاي المايسىز.
-كەيىن قولدانۋ ٴۇشىن ٴماتاندى قيىپ الىپ جانە قويىپ, ٴماتىن �ايلىنا ساقتاۋڭىزعا بولادى.</strong>',
-'protectedpagewarning'             => '<strong>قۇلاقتاندىرۋ: بۇل بەت قورعالعان. تەك اكىمشى قۇقىقتارى بار قاتىسۋشىلار وڭدەي الادى.</strong>',
+بەتتى بىرنەشە كىشكىن بولىمدەرگە ٴبولىپ كورىڭىز.'''",
+'longpageerror'                    => "'''قاتەلىك: جونەلتپەك ٴماتىنىڭىزدىن مولشەرى — $1 KB, ەڭ كوبى $2 KB رۇقسات ەتىلگەن مولشەرىنەن اسقان.
+بۇل ساقتاي الىنبايدى.'''",
+'readonlywarning'                  => "'''قۇلاقتاندىرۋ: دەرەكقور باپتاۋ ٴۇشىن قۇلىپتالعان, سوندىقتان ٴدال قازىر وڭدەمەڭىزدى ساقتاي المايسىز.
+كەيىن قولدانۋ ٴۇشىن ٴماتاندى قيىپ الىپ جانە قويىپ, ٴماتىن �ايلىنا ساقتاۋڭىزعا بولادى.'''",
+'protectedpagewarning'             => "'''قۇلاقتاندىرۋ: بۇل بەت قورعالعان. تەك اكىمشى قۇقىقتارى بار قاتىسۋشىلار وڭدەي الادى.'''",
 'semiprotectedpagewarning'         => "'''اڭعارتپا:''' بەت جارتىلاي قورعالعان, سوندىقتان وسىنى تەك تىركەلگەن قاتىسۋشىلار وڭدەي الادى.",
 'cascadeprotectedwarning'          => "'''قۇلاقتاندىرۋ''': بۇل بەت قۇلىپتالعان, ەندى تەك اكىمشى قۇقىقتارى بار قاتىسۋشىلار بۇنى وڭدەي الادى.بۇنىڭ سەبەبى: بۇل بەت «باۋلى قورعاۋى» بار كەلەسى {{PLURAL:$1|بەتتىڭ|بەتتەردىڭ}} كىرىكبەتى:",
-'titleprotectedwarning'            => '<strong>قۇلاقتاندىرۋ:  بۇل بەت قۇلىپتالعان, سوندىقتان تەك بىرقاتار قاتىسۋشىلار بۇنى باستاي الادى.</strong>',
+'titleprotectedwarning'            => "'''قۇلاقتاندىرۋ:  بۇل بەت قۇلىپتالعان, سوندىقتان تەك بىرقاتار قاتىسۋشىلار بۇنى باستاي الادى.'''",
 'templatesused'                    => 'بۇل بەتتە قولدانىلعان ۇلگىلەر:',
 'templatesusedpreview'             => 'بۇنى قاراپ شىعۋعا قولدانىلعان ۇلگىلەر:',
 'templatesusedsection'             => 'بۇل بولىمدە قولدانىلعان ۇلگىلەر:',
@@ -1075,11 +1058,9 @@ $3 كەلتىرىلگەن سەبەبى: ''$2''",
 # History pages
 'viewpagelogs'        => 'بۇل بەت ٴۇشىن جۋرنال وقىيعالارىن قاراۋ',
 'nohistory'           => 'مىندا بۇل بەتتىنىڭ تۇزەتۋ تارىيحى جوق.',
-'revnotfound'         => 'تۇزەتۋ تابىلمادى',
-'revnotfoundtext'     => 'بۇل بەتتىڭ سۇرالعان ەسكى تۇزەتۋى تابىلعان جوق. وسى بەت قاتىناۋىنا پايدالانعان URL تەكسەرىپ شىعىڭىز.',
 'currentrev'          => 'اعىمدىق تۇزەتۋ',
 'revisionasof'        => '$1 كەزىندەگى تۇزەتۋ',
-'revision-info'       => '$1 كەزىندەگى $2 ىستەگەن تۇزەتۋ',
+'revision-info'       => '$1 كەزىندەگى $2 ىستەگەن تۇزەتۋ', # Additionally available: $3: revision id
 'previousrevision'    => '� ەسكىلەۋ تۇزەتۋى',
 'nextrevision'        => 'جاڭالاۋ تۇزەتۋى →',
 'currentrevisionlink' => 'اعىمدىق تۇزەتۋى',
@@ -1212,6 +1193,7 @@ $3 كەلتىرىلگەن سەبەبى: ''$2''",
 'prevn'                     => 'الدىڭعى $1',
 'nextn'                     => 'كەلەسى $1',
 'viewprevnext'              => 'كورسەتىلۋى: ($1) ($2) ($3) جازبا',
+'searchhelp-url'            => 'Help:مازمۇنى',
 'search-result-size'        => '$1 ($2 ٴسوز)',
 'search-result-score'       => 'اراقاتىناستىلىعى: $1 %',
 'search-redirect'           => '(ايداعىش $1)',
@@ -1255,6 +1237,7 @@ $3 كەلتىرىلگەن سەبەبى: ''$2''",
 'qbsettings-floatingright' => 'وڭعا قالقىعان',
 'changepassword'           => 'قۇپىييا ٴسوزدى وزگەرتۋ',
 'skin'                     => 'مانەرلەر',
+'skin-preview'             => 'قاراپ شىعۋ',
 'math'                     => 'ورنەكتەر',
 'dateformat'               => 'كۇن-اي ٴپىشىمى',
 'datedefault'              => 'ەش قالاۋسىز',
@@ -1278,9 +1261,6 @@ latex, dvips, gs جانە convert باعدارلامالارىنىڭ دۇرىس
 'prefs-misc'               => 'ارقىيلى',
 'saveprefs'                => 'ساقتا',
 'resetprefs'               => 'ساقتالماعان وزگەرىستەردى تازارت',
-'oldpassword'              => 'اعىمدىق قۇپىييا ٴسوزىڭىز:',
-'newpassword'              => 'جاڭا قۇپىييا ٴسوزىڭىز:',
-'retypenew'                => 'جاڭا قۇپىييا ٴسوزىڭىزدى قايتالاڭىز:',
 'textboxsize'              => 'وڭدەۋ',
 'rows'                     => 'جولدار:',
 'columns'                  => 'باعاندار:',
@@ -1310,7 +1290,7 @@ latex, dvips, gs جانە convert باعدارلامالارىنىڭ دۇرىس
 'userrights-lookup-user'      => 'قاتىسۋشى توپتارىن رەتتەۋ',
 'userrights-user-editname'    => 'قاتىسۋشى اتىن ەنگىزىڭىز:',
 'editusergroup'               => 'قاتىسۋشى توپتارىن وڭدەۋ',
-'editinguser'                 => "قاتىسۋشى قۇقىقتارىن وزگەرتۋ: '''[[User:$1|$1]]''' ([[User_talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "قاتىسۋشى قۇقىقتارىن وزگەرتۋ: '''[[User:$1|$1]]''' ([[User_talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'قاتىسۋشى توپتارىن وڭدەۋ',
 'saveusergroups'              => 'قاتىسۋشى توپتارىن ساقتاۋ',
 'userrights-groupsmember'     => 'مۇشەلىگى:',
@@ -1456,11 +1436,11 @@ latex, dvips, gs جانە convert باعدارلامالارىنىڭ دۇرىس
 'upload_directory_read_only'  => 'قوتارىپ بەرمەك قالتاسىنا ($1) ۆەب-سەرۆەر جازا المايدى.',
 'uploaderror'                 => 'قوتارىپ بەرۋ قاتەسى',
 'uploadtext'                  => "تومەندەگى ٴپىشىندى �ايلداردى قوتارىپ بەرۋ ٴۇشىن قولدانىڭىز. 
-الدىندا قوتارىلىپ بەرىلگەن �ايلداردى قاراۋ نە ىزدەۋ ٴۇشىن [[{{#special:Imagelist}}|قوتارىپ بەرىلگەن �ايلدار تىزىمىنە]] بارىڭىز, تاعى دا قوتارىپ بەرۋى مەن جويۋى  [[{{#special:Log}}/upload|قوتارىپ بەرۋ جۋرنالىنا]] جازىلىپ الىنادى.
+الدىندا قوتارىلىپ بەرىلگەن �ايلداردى قاراۋ نە ىزدەۋ ٴۇشىن [[{{#special:FileList}}|قوتارىپ بەرىلگەن �ايلدار تىزىمىنە]] بارىڭىز, تاعى دا قوتارىپ بەرۋى مەن جويۋى  [[{{#special:Log}}/upload|قوتارىپ بەرۋ جۋرنالىنا]] جازىلىپ الىنادى.
 
 سۋرەتتى بەتكە كىرىستىرۋگە, �ايلعا تۋرا سىلتەۋ ٴۇشىن مىنا پىشىندەگى سىلتەمەنى قولدانىڭىز:
-'''[[{{ns:image}}:File.jpg]]''',
-'''[[{{ns:image}}:File.png|بالاما ٴماتىن]]''' نە
+'''[[{{ns:file}}:File.jpg]]''',
+'''[[{{ns:file}}:File.png|بالاما ٴماتىن]]''' نە
 '''[[{{ns:media}}:File.ogg]]'''.",
 'upload-permitted'            => 'رۇقسات ەتىلگەن �ايل تۇرلەرى: $1.',
 'upload-preferred'            => 'ۇنامدى �ايل تۇرلەرى $1.',
@@ -1489,25 +1469,25 @@ latex, dvips, gs جانە convert باعدارلامالارىنىڭ دۇرىس
 'largefileserver'             => 'وسى �ايلدىڭ مولشەرى سەرۆەردىڭ قالاۋىنان اسىپ كەتكەن.',
 'emptyfile'                   => 'قوتارىپ بەرىلگەن �ايلىڭىز بوس سىيياقتى. �ايل اتاۋى قاتە جازىلعان مۇمكىن.
 بۇل �ايلدى قوتارىپ بەرۋى ناقتى تالابىڭىز ەكەنىن تەكسەرىپ شىعىڭىز.',
-'fileexists'                  => 'بىلاي اتالعان �ايل الداقاشان بار, ەگەر بۇنى وزگەرتۋگە باتىلىڭىز جوق بولسا <strong><tt>$1</tt></strong> دەگەندى تەكسەرىپ شىعىڭىز.',
-'filepageexists'              => 'بۇل �ايلدىڭ سىيپاتتاما بەتى الداقاشان <strong><tt>$1</tt></strong> دەگەندە جاسالعان, بىراق اعىمدا بىلاي اتالعان ەش �ايل جوق.
+'fileexists'                  => "بىلاي اتالعان �ايل الداقاشان بار, ەگەر بۇنى وزگەرتۋگە باتىلىڭىز جوق بولسا '''<tt>$1</tt>''' دەگەندى تەكسەرىپ شىعىڭىز.",
+'filepageexists'              => "بۇل �ايلدىڭ سىيپاتتاما بەتى الداقاشان '''<tt>$1</tt>''' دەگەندە جاسالعان, بىراق اعىمدا بىلاي اتالعان ەش �ايل جوق.
 ەنگىزگەن قىسقاشا مازمۇنداماڭىز سىيپاتتاماسى بەتىندە كورسەتىلمەيدى.
-قىسقاشا مازمۇنداماڭىز وسى ارادا كورسەتىلۋ ٴۇشىن, بۇنى قولمەن وڭدەمەك بولىڭىز',
-'fileexists-extension'        => 'ۇقساس اتاۋى بار �ايل تابىلدى:<br />
-قوتارىپ بەرىلەتىن �ايل اتاۋى: <strong><tt>$1</tt></strong><br />
-بار بولعان �ايل اتاۋى: <strong><tt>$2</tt></strong><br />
-وزگە اتاۋدى تاڭداڭىز.',
+قىسقاشا مازمۇنداماڭىز وسى ارادا كورسەتىلۋ ٴۇشىن, بۇنى قولمەن وڭدەمەك بولىڭىز",
+'fileexists-extension'        => "ۇقساس اتاۋى بار �ايل تابىلدى:<br />
+قوتارىپ بەرىلەتىن �ايل اتاۋى: '''<tt>$1</tt>'''<br />
+بار بولعان �ايل اتاۋى: '''<tt>$2</tt>'''<br />
+وزگە اتاۋدى تاڭداڭىز.",
 'fileexists-thumb'            => "<center>'''بار بولعان سۋرەت'''</center>",
-'fileexists-thumbnail-yes'    => 'وسى �ايل — مولشەرى كىشىرىتىلگەن سۋرەت <i>(نوباي)</i> سىيياقتى.
-بۇل <strong><tt>$1</tt></strong> دەگەن �ايلدى سىناپ شىعىڭىز.<br />
-ەگەر سىنالعان �ايل تۇپنۇسقالى مولشەرى بار دالمە-ٴدال سۋرەت بولسا, قوسىسمشا نوبايدى قوتارىپ بەرۋ كەرەگى جوق.',
-'file-thumbnail-no'           => '�ايل اتاۋى <strong><tt>$1</tt></strong> دەگەنمەن باستالادى.
-بۇل — مولشەرى كىشىرىتىلگەن سۋرەت <i>(نوباي)</i> سىيياقتى.
-ەگەر بۇل سۋرەتتىڭ تولىق اجىراتىلىمدىعى بولسا, بۇنى قوتارىپ بەرىڭىز, ايتپەسە �ايل اتاۋىن وزگەرتىڭىز.',
+'fileexists-thumbnail-yes'    => "وسى �ايل — مولشەرى كىشىرىتىلگەن سۋرەت ''(نوباي)'' سىيياقتى.
+بۇل '''<tt>$1</tt>''' دەگەن �ايلدى سىناپ شىعىڭىز.<br />
+ەگەر سىنالعان �ايل تۇپنۇسقالى مولشەرى بار دالمە-ٴدال سۋرەت بولسا, قوسىسمشا نوبايدى قوتارىپ بەرۋ كەرەگى جوق.",
+'file-thumbnail-no'           => "�ايل اتاۋى '''<tt>$1</tt>''' دەگەنمەن باستالادى.
+بۇل — مولشەرى كىشىرىتىلگەن سۋرەت ''(نوباي)'' سىيياقتى.
+ەگەر بۇل سۋرەتتىڭ تولىق اجىراتىلىمدىعى بولسا, بۇنى قوتارىپ بەرىڭىز, ايتپەسە �ايل اتاۋىن وزگەرتىڭىز.",
 'fileexists-forbidden'        => 'وسىلاي اتالعان �ايل الداقاشان بار;
-كەرى قايتىڭىز دا, وسى �ايلدى جاڭا اتىمەن قوتارىپ بەرىڭىز. [[{{ns:image}}:$1|thumb|center|$1]]',
+كەرى قايتىڭىز دا, وسى �ايلدى جاڭا اتىمەن قوتارىپ بەرىڭىز. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'وسىلاي اتالعان �ايل ورتاق قويمادا الداقاشان بار;
-كەرى قايتىڭىز دا, وسى �ايلدى جاڭا اتىمەن قوتارىپ بەرىڭىز. [[{{ns:image}}:$1|thumb|center|$1]]',
+كەرى قايتىڭىز دا, وسى �ايلدى جاڭا اتىمەن قوتارىپ بەرىڭىز. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'بۇل �ايل كەلەسى {{PLURAL:$1|�ايلدىڭ|�ايلدارىنىڭ}} تەلنۇسقاسى:',
 'successfulupload'            => 'ٴساتتى قوتارىپ بەرىلدى',
 'uploadwarning'               => 'قوتارىپ بەرۋ جونىندە قۇلاقتاندىرۋ',
@@ -1530,8 +1510,8 @@ latex, dvips, gs جانە convert باعدارلامالارىنىڭ دۇرىس
 
 بۇل �ايلدى قوتارىپ بەرۋىن جالعاستىرۋ ٴۇشىن بۇنىڭ ىڭعايلىعىن تەكسەرىپ شىعۋىڭىز ٴجون.
 قولايلى بولۋى ٴۇشىن بۇل �ايلدىڭ جويۋ جۋرنالى كەلتىرىلگەن:",
-'filename-bad-prefix'         => 'قوتارىپ بەرمەك �ايلىڭىزدىڭ اتاۋى <strong>«$1» </strong> دەپ باستالادى, مىناداي سىيپاتتاۋسىز اتاۋدى ادەتتە ساندىق كامەرالار وزدىكتىك بەرەدى.
-�ايلىڭىزعا سىيپاتتىلاۋ اتاۋدى تاڭداڭىز.',
+'filename-bad-prefix'         => "قوتارىپ بەرمەك �ايلىڭىزدىڭ اتاۋى '''«$1» ''' دەپ باستالادى, مىناداي سىيپاتتاۋسىز اتاۋدى ادەتتە ساندىق كامەرالار وزدىكتىك بەرەدى.
+�ايلىڭىزعا سىيپاتتىلاۋ اتاۋدى تاڭداڭىز.",
 
 'upload-proto-error'      => 'بۇرىس حاتتاما',
 'upload-proto-error-text' => 'شەتتەن قوتارىپ بەرۋ ٴۇشىن URL جايلارى <code>http://</code> نەمەسە <code>ftp://</code> دەگەندەردەن باستالۋ ٴجون.',
@@ -1558,20 +1538,20 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'upload_source_url'  => ' (جارامدى, بارشاعا قاتىناۋلى URL)',
 'upload_source_file' => ' (كومپيۋتەرىڭىزدەگى �ايل)',
 
-# Special:ImageList
-'imagelist-summary'     => 'بۇل ارنايى بەتتە بارلىق قوتارىپ بەرىلگەن �ايلدار كورسەتىلەدى.
+# Special:ListFiles
+'listfiles-summary'     => 'بۇل ارنايى بەتتە بارلىق قوتارىپ بەرىلگەن �ايلدار كورسەتىلەدى.
 سوڭعى قوتارىپ بەرىلگەن �ايلدار تىزىمدە جوعارعى شەتىمەن ادەپكىدەن كورسەتىلەدى.
 باعاننىڭ باس جولىن نۇقىعاندا سۇرىپتاۋدىڭ رەتتەۋى وزگەرتىلەدى.',
-'imagelist_search_for'  => 'تاسپا اتاۋىن ىزدەۋ:',
+'listfiles_search_for'  => 'تاسپا اتاۋىن ىزدەۋ:',
 'imgfile'               => '�ايل',
-'imagelist'             => '�ايل ٴتىزىمى',
-'imagelist_date'        => 'كۇن-ايى',
-'imagelist_name'        => 'اتاۋى',
-'imagelist_user'        => 'قاتىسۋشى',
-'imagelist_size'        => 'مولشەرى',
-'imagelist_description' => 'سىيپاتتاماسى',
-
-# Image description page
+'listfiles'             => '�ايل ٴتىزىمى',
+'listfiles_date'        => 'كۇن-ايى',
+'listfiles_name'        => 'اتاۋى',
+'listfiles_user'        => 'قاتىسۋشى',
+'listfiles_size'        => 'مولشەرى',
+'listfiles_description' => 'سىيپاتتاماسى',
+
+# File description page
 'filehist'                       => '�ايل تارىيحى',
 'filehist-help'                  => '�ايلدىڭ قاي ۋاقىتتا قالاي كورىنەتىن ٴۇشىن كۇن-اي/ۋاقىت دەگەندى نۇقىڭىز.',
 'filehist-deleteall'             => 'بارلىعىن جوي',
@@ -1623,8 +1603,6 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[{{ns:media}}:$1|$1]]\'\'\' — $3, $2 كەزىندەگى نۇسقاسى جويىلدى.</span>',
 'filedelete-nofile'           => "'''$1''' دەگەن {{SITENAME}} جوباسىندا جوق.",
 'filedelete-nofile-old'       => "كەلتىرىلگەن انىقتاۋىشتارىمەن '''$1''' دەگەننىڭ مۇراعاتتالعان نۇسقاسى مىندا جوق.",
-'filedelete-iscurrent'        => 'بۇل �ايلدىڭ ەڭ سوڭعى نۇسقاسىن جويۋ تالاپ ەتكەنسىز.
-ەڭ الدىنان ەسكىلەۋ نۇسقاسىنا قايتارىڭىز.',
 'filedelete-otherreason'      => 'باسقا/قوسىمشا سەبەپ:',
 'filedelete-reason-otherlist' => 'باسقا سەبەپ',
 'filedelete-reason-dropdown'  => '* جويۋدىڭ جالپى سەبەپتەرى
@@ -1660,21 +1638,9 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'randomredirect-nopages' => 'بۇل ەسىم اياسىندا ەش ايداعىش جوق.',
 
 # Statistics
-'statistics'             => 'ساناق',
-'sitestats'              => '{{SITENAME}} ساناعى',
-'userstats'              => 'قاتىسۋشى ساناعى',
-'sitestatstext'          => "دەرەكقوردا {{PLURAL:$1|'''1'''|جالپى '''$1'''}} بەت بار.
-بۇعان «تالقىلاۋ» بەتتەرى, {{SITENAME}} جوباسى تۋرالى بەتتەر, تىم قىسقا «بىتەمە» بەتتەرى, ايداعىشتار, تاعى دا باسقا ماعلۇمات دەپ تانىلمايتىن بەتتەر كىرىستىرلەدى.
-سولاردى ەسەپتەن شىعارعاندا, مىندا ماعلۇمات {{PLURAL:$2|بەتى|بەتتەرى}} دەپ سانالاتىن '''$2''' بەت بار دەپ بولجانادى.
-
-'''$8''' �ايل قوتارىپ بەرىلدى.
-
-{{SITENAME}} ورناتىلعاننان بەرى بەتتەر {{PLURAL:$3|'''1'''|جالپى '''$3'''}} رەت قارالعان, جانە بەتتەر '''$4''' رەت وڭدەلگەن.
-بۇنىڭ ناتىيجەسىندە ورتاشا ەسەپپەن ٴاربىر بەتكە '''$5''' وڭدەمە كەلەدى, جانە ٴاربىر وڭدەمەگە '''$6''' قاراۋ كەلەدى.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue تاپسىرىمالار كەزەگىنىڭ] ۇزىندىعى: '''$7'''.",
-'userstatstext'          => "مىندا '''$1''' [[{{#special:Listusers}}|تىركەلگەن قاتىسۋشى]] بار, سونىڭ ىشىندە '''$2''' (نە '''$4 %''') قاتىسۋشىسىندا $5 قۇقىقتارى بار",
-'statistics-mostpopular' => 'ەڭ كوپ قارالعان بەتتەر',
+'statistics'              => 'ساناق',
+'statistics-header-users' => 'قاتىسۋشى ساناعى',
+'statistics-mostpopular'  => 'ەڭ كوپ قارالعان بەتتەر',
 
 'disambiguations'      => 'ايرىقتى بەتتەر',
 'disambiguationspage'  => '{{ns:template}}:ايرىق',
@@ -1716,7 +1682,6 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'popularpages'            => 'ەڭ كوپ قارالعان بەتتەر',
 'wantedcategories'        => 'باستالماعان ساناتتار',
 'wantedpages'             => 'باستالماعان بەتتەر',
-'missingfiles'            => 'جوق �ايلدار',
 'mostlinked'              => 'ەڭ كوپ سىلتەلگەن بەتتەر',
 'mostlinkedcategories'    => 'ەڭ كوپ پايدالانىلعان ساناتتار',
 'mostlinkedtemplates'     => 'ەڭ كوپ پايدالانىلعان ۇلگىلەر',
@@ -1762,8 +1727,6 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'speciallogtitlelabel' => 'تاقىرىپ اتى:',
 'log'                  => 'جۋرنالدار',
 'all-logs-page'        => 'بارلىق جۋرنالدار',
-'log-search-legend'    => 'جۋرنالداردان ىزدەۋ',
-'log-search-submit'    => 'ٴوت',
 'alllogstext'          => '{{SITENAME}} جوباسىنىڭ بارلىق قاتىناۋلى جۋرنالدارىن بىرىكتىرىپ كورسەتۋى.
 جۋرنال ٴتۇرىن, قاتىسۋشى اتىن, نە ٴتىيىستى بەتىن بولەكتەپ, تارىلتىپ قاراي الاسىز.',
 'logempty'             => 'جۋرنالدا سايكەس دانالار جوق.',
@@ -1793,11 +1756,29 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'special-categories-sort-count' => 'سانىمەن سۇرىپتاۋ',
 'special-categories-sort-abc'   => 'الىپبىيمەن سۇرىپتاۋ',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'قاتىسۋشىنىڭ جويىلعان ۇلەسى',
+
+# Special:LinkSearch
+'linksearch'       => 'سىرتقى سٸلتەمەلەردٸ ٸزدەۋ',
+'linksearch-pat'   => 'ٸزدەۋ شارتى:',
+'linksearch-ns'    => 'ەسٸم اياسى:',
+'linksearch-ok'    => 'ٸزدەۋ',
+'linksearch-text'  => '«*.wikipedia.org» اتاۋىنا ۇقساستى بٵدەل نىشانداردى قولدانۋعا بولادى.',
+'linksearch-line'  => '$2 دەگەننەن $1 سٸلتەگەن',
+'linksearch-error' => 'بٵدەل نىشاندار تەك سەرۆەر جايى اتاۋىنىڭ باستاۋىندا بولۋى مٷمكٸن.',
+
 # Special:ListUsers
 'listusersfrom'      => 'مىنا قاتىسۋشىدان باستاپ كورسەتۋ:',
 'listusers-submit'   => 'كورسەت',
 'listusers-noresult' => 'قاتىسۋشى تابىلعان جوق.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'تىركەلۋ جۋرنالى',
+'newuserlogpagetext'       => 'بۇل قاتىسۋشى تىركەلگى جاساۋ جۋرنالى',
+'newuserlog-create-entry'  => 'جاڭا قاتىسۋشى',
+'newuserlog-create2-entry' => 'جاڭا تىركەلگى جاسادى — $1',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'قاتىسۋشى توبى قۇقىقتارى',
 'listgrouprights-summary'  => 'كەلەسى تىزىمدە بۇل ۋىيكىيدە تاعايىندالعان قاتىسۋشى قۇقىقتارى (بايلانىستى قاتىناۋ قۇقىقتارىمەن بىرگە) كورسەتىلەدى.
@@ -1857,12 +1838,6 @@ URL دۇرىس ەكەندىگىن جانە توراپ ىستەپ تۇرعانىÙ
 'iteminvalidname'      => "'$1' دانادا اقاۋ بار — جارامسىز اتاۋ…",
 'wlnote'               => "تومەندە سوڭعى {{PLURAL:$2|ساعاتتا|'''$2''' ساعاتتا}} بولعان, {{PLURAL:$1|جۋىقتاعى وزگەرىس|جۋىقتاعى '''$1''' وزگەرىس}} كورسەتىلەدى.",
 'wlshowlast'           => 'سوڭعى $1 ساعاتتاعى, $2 كۇندەگى, $3 بولعان وزگەرىستى كورسەتۋ',
-'watchlist-show-bots'  => 'بوت وڭدەمەلەرىن كورسەت',
-'watchlist-hide-bots'  => 'بوت وڭدەمەلەرىن جاسىر',
-'watchlist-show-own'   => 'وڭدەمەلەرىمدى كورسەت',
-'watchlist-hide-own'   => 'وڭدەمەلەرىمدى جاسىر',
-'watchlist-show-minor' => 'شاعىن وڭدەمەلەردى كورسەت',
-'watchlist-hide-minor' => 'شاعىن وڭدەمەلەردى جاسىر',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'باقىلاۋدا…',
@@ -1903,57 +1878,61 @@ $NEWPAGE
 سىن-پىكىر بەرۋ جانە بىلايعى جاردەم الۋ ٴۇشىن:
 {{fullurl:{{{{ns:mediawiki}}:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'بەتتى جويۋ',
-'confirm'                     => 'قۇپتاۋ',
-'excontent'                   => "بولعان ماعلۇماتى: '$1'",
-'excontentauthor'             => "بولعان ماعلۇماتى (تەك '[[{{#special:Contributions}}/$2|$2]]' ۇلەسى): '$1'",
-'exbeforeblank'               => "تازارتۋ الدىنداعى بولعان ماعلۇماتى: '$1'",
-'exblank'                     => 'بەت بوس بولدى',
-'delete-confirm'              => '«$1» دەگەندى جويۋ',
-'delete-legend'               => 'جويۋ',
-'historywarning'              => 'قۇلاقتاندىرۋ: جويۋى كوزدەلگەن بەتتە تارىيحى بار:',
-'confirmdeletetext'           => 'بەتتى بۇكىل تارىيحىمەن بىرگە دەرەكقوردان جوييۋىن كوزدەدىڭىز.
+# Delete
+'deletepage'             => 'بەتتى جويۋ',
+'confirm'                => 'قۇپتاۋ',
+'excontent'              => "بولعان ماعلۇماتى: '$1'",
+'excontentauthor'        => "بولعان ماعلۇماتى (تەك '[[{{#special:Contributions}}/$2|$2]]' ۇلەسى): '$1'",
+'exbeforeblank'          => "تازارتۋ الدىنداعى بولعان ماعلۇماتى: '$1'",
+'exblank'                => 'بەت بوس بولدى',
+'delete-confirm'         => '«$1» دەگەندى جويۋ',
+'delete-legend'          => 'جويۋ',
+'historywarning'         => 'قۇلاقتاندىرۋ: جويۋى كوزدەلگەن بەتتە تارىيحى بار:',
+'confirmdeletetext'      => 'بەتتى بۇكىل تارىيحىمەن بىرگە دەرەكقوردان جوييۋىن كوزدەدىڭىز.
 وسىنى ىستەۋ نىييەتىڭىزدى, سالدارىن بايىمداۋىڭىزدى جانە [[{{{{ns:mediawiki}}:Policy-url}}]] دەگەنگە لايىقتى دەپ ىستەمەكتەنگەڭىزدى قۇپتاڭىز.',
-'actioncomplete'              => 'ارەكەت ٴبىتتى',
-'deletedtext'                 => '«$1» جويىلدى.
+'actioncomplete'         => 'ارەكەت ٴبىتتى',
+'deletedtext'            => '«$1» جويىلدى.
 جۋىقتاعى جويۋلار تۋرالى جازبالارىن $2 دەگەننەن قاراڭىز.',
-'deletedarticle'              => '«[[$1]]» دەگەندى جويدى',
-'suppressedarticle'           => '«[[$1]]» دەگەندى شەتتەتتى',
-'dellogpage'                  => 'جويۋ_جۋرنالى',
-'dellogpagetext'              => 'تومەندە جۋىقتاعى جويۋلاردىڭ ٴتىزىمى بەرىلگەن.',
-'deletionlog'                 => 'جويۋ جۋرنالى',
-'reverted'                    => 'ەرتەرەك تۇزەتۋىنە قايتارىلعان',
-'deletecomment'               => 'جويۋدىڭ سەبەبى:',
-'deleteotherreason'           => 'باسقا/قوسىمشا سەبەپ:',
-'deletereasonotherlist'       => 'باسقا سەبەپ',
-'deletereason-dropdown'       => '* جويۋدىڭ جالپى سەبەپتەرى
+'deletedarticle'         => '«[[$1]]» دەگەندى جويدى',
+'suppressedarticle'      => '«[[$1]]» دەگەندى شەتتەتتى',
+'dellogpage'             => 'جويۋ_جۋرنالى',
+'dellogpagetext'         => 'تومەندە جۋىقتاعى جويۋلاردىڭ ٴتىزىمى بەرىلگەن.',
+'deletionlog'            => 'جويۋ جۋرنالى',
+'reverted'               => 'ەرتەرەك تۇزەتۋىنە قايتارىلعان',
+'deletecomment'          => 'جويۋدىڭ سەبەبى:',
+'deleteotherreason'      => 'باسقا/قوسىمشا سەبەپ:',
+'deletereasonotherlist'  => 'باسقا سەبەپ',
+'deletereason-dropdown'  => '* جويۋدىڭ جالپى سەبەپتەرى
 ** اۋتوردىڭ سۇرانىمى بويىنشا
 ** اۋتورلىق قۇقىقتارىن بۇزۋ
 ** بۇزاقىلىق',
-'delete-edit-reasonlist'      => 'جويۋ سەبەپتەرىن وڭدەۋ',
-'delete-toobig'               => 'بۇل بەتتە بايتاق تۇزەتۋ تارىيحى بار, $1 تۇزەتۋدەن استام.
+'delete-edit-reasonlist' => 'جويۋ سەبەپتەرىن وڭدەۋ',
+'delete-toobig'          => 'بۇل بەتتە بايتاق تۇزەتۋ تارىيحى بار, $1 تۇزەتۋدەن استام.
 بۇنداي بەتتەردىڭ جويۋى {{SITENAME}} تورابىن الدەقالاي ٴۇزىپ تاستاۋىنا بوگەت سالۋ ٴۇشىن تىيىمدالعان.',
-'delete-warning-toobig'       => 'بۇل بەتتە بايتاق تۇزەتۋ تارىيحى بار, $1 تۇزەتۋدەن استام.
+'delete-warning-toobig'  => 'بۇل بەتتە بايتاق تۇزەتۋ تارىيحى بار, $1 تۇزەتۋدەن استام.
 بۇنىڭ جويۋى {{SITENAME}} تورابىنداعى دەرەكقور ارەكەتتەردى ٴۇزىپ تاستاۋىن مۇمكىن;
 بۇنى ابايلاپ وتكىزىڭىز.',
-'rollback'                    => 'وڭدەمەلەردى شەگىندىرۋ',
-'rollback_short'              => 'شەگىندىرۋ',
-'rollbacklink'                => 'شەگىندىرۋ',
-'rollbackfailed'              => 'شەگىندىرۋ ٴساتسىز ٴبىتتى',
-'cantrollback'                => 'وڭدەمە قايتارىلمادى;
+
+# Rollback
+'rollback'         => 'وڭدەمەلەردى شەگىندىرۋ',
+'rollback_short'   => 'شەگىندىرۋ',
+'rollbacklink'     => 'شەگىندىرۋ',
+'rollbackfailed'   => 'شەگىندىرۋ ٴساتسىز ٴبىتتى',
+'cantrollback'     => 'وڭدەمە قايتارىلمادى;
 سوڭعى ۇلەسكەرى تەك وسى بەتتىڭ باستاۋشىسى بولدى.',
-'alreadyrolled'               => '[[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|تالقىلاۋى]]) ىستەگەن [[:$1]] سوڭعى وڭدەمەسى شەگىندىرىلمەدى;
+'alreadyrolled'    => '[[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|تالقىلاۋى]]) ىستەگەن [[:$1]] سوڭعى وڭدەمەسى شەگىندىرىلمەدى;
 باسقا بىرەۋ بۇل بەتتى الداقاشان وڭدەگەن نە شەگىندىرگەن.
 
 سوڭعى وڭدەمەسىن [[{{ns:user}}:$3|$3]] ([[{{ns:user_talk}}:$3|تالقىلاۋى]]) ىستەگەن.',
-'editcomment'                 => 'بولعان وڭدەمە ماندەمەسى: «<i>$1</i>».', # only shown if there is an edit comment
-'revertpage'                  => '[[{{#special:Contributions}}/$2|$2]] ([[{{ns:user_talk}}:$2|تالقىلاۋى]]) وڭدەمەلەرىنەن [[{{ns:user}}:$1|$1]] سوڭعى نۇسقاسىنا قايتاردى', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 وڭدەمەلەرىنەن قايتارعان;
+'editcomment'      => "بولعان وڭدەمە ماندەمەسى: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => '[[{{#special:Contributions}}/$2|$2]] ([[{{ns:user_talk}}:$2|تالقىلاۋى]]) وڭدەمەلەرىنەن [[{{ns:user}}:$1|$1]] سوڭعى نۇسقاسىنا قايتاردى', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 وڭدەمەلەرىنەن قايتارعان;
 $2 سوڭعى نۇسقاسىنا وزگەرتتى.',
-'sessionfailure'              => 'كىرۋ سەسسىيياسىندا شاتاق بولعان سىيياقتى;
+'sessionfailure'   => 'كىرۋ سەسسىيياسىندا شاتاق بولعان سىيياقتى;
 سەسسىيياعا شابۋىلداۋداردان قورعانۋ ٴۇشىن, وسى ارەكەت توقتاتىلدى.
 «ارتقا» دەگەندى باسىڭىز, جانە بەتتى قايتا جۇكتەڭىز دە, قايتا بايقاپ كورىڭىز.',
+
+# Protect
 'protectlogpage'              => 'قورعاۋ جۋرنالى',
 'protectlogtext'              => 'تومەندە بەتتەردىڭ قورعاۋ/قورعاماۋ ٴتىزىمى بەرىلگەن.
 اعىمداعى قورعاۋ ارەكتتەر بار بەتتەر ٴۇشىن [[{{#special:Protectedpages}}|قورعالعان بەت ٴتىزىمىن]] قاراڭىز.',
@@ -1961,19 +1940,20 @@ $2 سوڭعى نۇسقاسىنا وزگەرتتى.',
 'modifiedarticleprotection'   => '«[[$1]]» قورعالۋ دەڭگەيى وزگەردى',
 'unprotectedarticle'          => '«[[$1]]» قورعالۋى ٴوشىرىلدى',
 'protect-title'               => '«$1» قورعاۋ دەڭگەيىن وزگەرتۋ',
+'prot_1movedto2'              => '[[$1]] دەگەندى [[$2]] دەگەنگە جىلجىتتى',
 'protect-legend'              => 'قورعاۋدى قۇپتاۋ',
 'protectcomment'              => 'ماندەمەسى:',
 'protectexpiry'               => 'مەرزىمى بىتپەك:',
 'protect_expiry_invalid'      => 'بىتەتىن ۋاقىتى جارامسىز.',
 'protect_expiry_old'          => 'بىتەتىن ۋاقىتى ٴوتىپ كەتكەن.',
 'protect-unchain'             => 'جىلجىتۋ رۇقساتتارىن بەرۋ',
-'protect-text'                => '<strong>$1</strong> بەتىنىڭ قورعاۋ دەڭگەيىن قاراپ جانە وزگەرتىپ شىعا الاسىز.',
-'protect-locked-blocked'      => 'بۇعاتتاۋىڭىز وشىرىلگەنشە دەيىن قورعاۋ دەڭگەيىن وزگەرتە المايسىز.
-مىنا <strong>$1</strong> بەتتىڭ اعىمدىق باپتاۋلارى:',
-'protect-locked-dblock'       => 'دەرەكقوردىڭ قۇلىپتاۋى بەلسەندى بولعاندىقتان قورعاۋ دەڭگەيلەرى وزگەرتىلمەيدى.
-مىنا <strong>$1</strong> بەتتىڭ اعىمدىق باپتاۋلارى:',
-'protect-locked-access'       => 'تىركەلگىڭىزگە بەت قورعاۋ دەنگەيلەرىن وزگەرتۋىنە رۇقسات جوق.
-مىنا <strong>$1</strong> بەتتىڭ اعىمدىق باپتاۋلارى:',
+'protect-text'                => "'''$1''' بەتىنىڭ قورعاۋ دەڭگەيىن قاراپ جانە وزگەرتىپ شىعا الاسىز.",
+'protect-locked-blocked'      => "بۇعاتتاۋىڭىز وشىرىلگەنشە دەيىن قورعاۋ دەڭگەيىن وزگەرتە المايسىز.
+مىنا '''$1''' بەتتىڭ اعىمدىق باپتاۋلارى:",
+'protect-locked-dblock'       => "دەرەكقوردىڭ قۇلىپتاۋى بەلسەندى بولعاندىقتان قورعاۋ دەڭگەيلەرى وزگەرتىلمەيدى.
+مىنا '''$1''' بەتتىڭ اعىمدىق باپتاۋلارى:",
+'protect-locked-access'       => "تىركەلگىڭىزگە بەت قورعاۋ دەنگەيلەرىن وزگەرتۋىنە رۇقسات جوق.
+مىنا '''$1''' بەتتىڭ اعىمدىق باپتاۋلارى:",
 'protect-cascadeon'           => 'بۇل بەت اعىمدا قورعالعان, سەبەبى وسى بەت «باۋلى قورعاۋى» بار كەلەسى {{PLURAL:$1|بەتتىڭ|بەتتەردىڭ}} كىرىكبەتى.
 بۇل بەتتىڭ قورعاۋ دەڭگەيىن وزگەرتە الاسىز, بىراق بۇل باۋلى قورعاۋعا ىقپال ەتپەيدى.',
 'protect-default'             => '(ادەپكى)',
@@ -1984,6 +1964,7 @@ $2 سوڭعى نۇسقاسىنا وزگەرتتى.',
 'protect-expiring'            => 'مەرزىمى بىتپەك: $1 (UTC)',
 'protect-cascade'             => 'بۇل بەتتىڭ كىرىكبەتتەرىن قورعاۋ (باۋلى قورعاۋ).',
 'protect-cantedit'            => 'بۇل بەتتىڭ قورعاۋ دەڭگەيىن وزگەرتە المايسىز, سەبەبى بۇنى وڭدەۋگە رۇقستاڭىز جوق.',
+'protect-expiry-options'      => '2 ساعات:2 hours,1 كۇن:1 day,3 كۇن:3 days,1 اپتا:1 week,2 اپتا:2 weeks,1 اي:1 month,3 اي:3 months,6 اي:6 months,1 جىل:1 year,مانگى:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'رۇقساتى:',
 'restriction-level'           => 'تىيىمدىق دەڭگەيى:',
 'minimum-size'                => 'ەڭ از مولشەرى',
@@ -2076,7 +2057,6 @@ $1',
 'whatlinkshere'            => 'سىلتەلگەن بەتتەر',
 'whatlinkshere-title'      => '$1 دەگەنگە سىلتەلگەن بەتتەر',
 'whatlinkshere-page'       => 'بەت:',
-'linklistsub'              => '(سىلتەمەلەر ٴتىزىمى)',
 'linkshere'                => "'''[[:$1]]''' دەگەنگە مىنا بەتتەر سىلتەيدى:",
 'nolinkshere'              => "'''[[:$1]]''' دەگەنگە ەش بەت سىلتەمەيدى.",
 'nolinkshere-ns'           => "تاڭدالعان ەسىم اياسىندا '''[[:$1]]''' دەگەنگە ەشقانداي بەت سىلتەمەيدى.",
@@ -2223,6 +2203,8 @@ $1 بۇعاتتاۋى ٴۇشىن كەلتىرىلگەن سەبەبى: «$2».',
 
 وسى ورايدا, قالاۋىڭىز بولسا, بەتتى قولدان جىلجىتا نە قوسا الاسىز.",
 'movearticle'             => 'جىلجىتپاق بەت:',
+'movenologin'             => 'جۇيەگە كىرمەگەنسىز',
+'movenologintext'         => 'بەتتى جىلجىتۋ ٴۇشىن تىركەلگەن بولۋىڭىز جانە [[{{#special:Userlogin}}|كىرۋىڭىز]] ٴجون.',
 'movenotallowed'          => '{{SITENAME}} جوباسىندا بەتتەردى جىلجىتۋ رۋقساتىڭىز جوق.',
 'newtitle'                => 'جاڭا تاقىرىپ اتىنا:',
 'move-watch'              => 'بۇل بەتتى باقىلاۋ',
@@ -2255,8 +2237,6 @@ $1 بۇعاتتاۋى ٴۇشىن كەلتىرىلگەن سەبەبى: «$2».',
 'delete_and_move_reason'  => 'جىلجىتۋعا جول بەرۋ ٴۇشىن جويىلعان',
 'selfmove'                => 'قاينار جانە نىسانا تاقىرىپ اتتارى بىردەي;
 بەت ٴوزىنىڭ ۇستىنە جىلجىتىلمايدى.',
-'immobile_namespace'      => 'قاينار نە نىسانا تاقىرىپ اتى ارناۋلى تۇرىنە جاتادى;
-بەتتەر بۇل ەسىم اياسى سىرتىنا جانە ىشىنە جىلجىتىلمايدى.',
 'imagenocrossnamespace'   => '�ايل ەمەس ەسىم اياسىنا �ايل جىلجىتىلمايدى',
 'imagetypemismatch'       => '�ايلدىڭ جاڭا كەڭەيتىمى بۇنىڭ تۇرىنە سايكەس ەمەس',
 
@@ -2283,7 +2263,7 @@ MediaWiki جۇيەسىنىڭ [[{{#special:Import}}|سىرتتان الۋ بەتÙ
 'allmessagesdefault'        => 'ادەپكى ٴماتىنى',
 'allmessagescurrent'        => 'اعىمدىق ٴماتىنى',
 'allmessagestext'           => 'مىندا {{ns:mediawiki}} ەسىم اياسىندا جەتىمدى جۇيە حابار ٴتىزىمى بەرىلەدى.
-ەگەر امبەباپ MediaWiki جەرسىندىرۋگە ۇلەس قوسقىڭىز كەلسە [http://www.mediawiki.org/wiki/Localisation MediaWiki جەرسىندىرۋ بەتىنە] جانە [http://translatewiki.net Betawiki جوباسىنا] بارىپ شىعىڭىز.',
+ەگەر امبەباپ MediaWiki جەرسىندىرۋگە ۇلەس قوسقىڭىز كەلسە [http://www.mediawiki.org/wiki/Localisation MediaWiki جەرسىندىرۋ بەتىنە] جانە [http://translatewiki.net translatewiki.net جوباسىنا] بارىپ شىعىڭىز.',
 'allmessagesnotsupportedDB' => "'''\$wgUseDatabaseMessages''' وشىرىلگەن سەبەبىنەن '''{{ns:special}}:AllMessages''' بەتى قولدانىلمايدى.",
 'allmessagesfilter'         => 'حاباردى اتاۋىمەن سۇزگىلەۋ:',
 'allmessagesmodified'       => 'تەك وزگەرتىلگەندى كورسەت',
@@ -2306,6 +2286,7 @@ MediaWiki جۇيەسىنىڭ [[{{#special:Import}}|سىرتتان الۋ بەتÙ
 'import-interwiki-history'   => 'بۇل بەتتىڭ بارلىق تارىيحىي نۇسقالارىن كوشىرۋ',
 'import-interwiki-submit'    => 'سىرتتان الۋ',
 'import-interwiki-namespace' => 'بەتتەردى مىنا ەسىم اياسىنا اپارۋ:',
+'import-comment'             => 'ماندەمەسى:',
 'importtext'                 => 'قاينار ۋىيكىيدەن «{{#special:Export}}» قۋرالىن قولدانىپ �ايلدى سىرتقا بەرىڭىز, دىيسكىڭىزگە ساقتاڭىز دا مىندا قوتارىپ بەرىڭىز.',
 'importstart'                => 'بەتتەردى سىرتتان الۋدا…',
 'import-revision-count'      => '$1 تۇزەتۋ',
@@ -2451,6 +2432,16 @@ MediaWiki جۇيەسىنىڭ [[{{#special:Import}}|سىرتتان الۋ بەتÙ
 'numauthors'     => 'ٴارتۇرلى اۋتور سانى (بەت): $1',
 'numtalkauthors' => 'ٴارتۇرلى اۋتور سانى (تالقىلاۋ بەتى): $1',
 
+# Skin names
+'skinname-standard'    => 'داعدىلى (standard)',
+'skinname-nostalgia'   => 'اڭساۋ (nostalgia)',
+'skinname-cologneblue' => 'كولن زەڭگىرلىگى (cologneblue)',
+'skinname-monobook'    => 'دارا كىتاپ (monobook)',
+'skinname-myskin'      => 'ٴوز مانەرىم (myskin)',
+'skinname-chick'       => 'بالاپان (chick)',
+'skinname-simple'      => 'كادىمگى (simple)',
+'skinname-modern'      => 'زاماناۋىي (modern)',
+
 # Math options
 'mw_math_png'    => 'ارقاشان PNG پىشىنىمەن كورسەتكىز',
 'mw_math_simple' => 'ەگەر وتە قاراپايىم بولسا — HTML, ايتپەسە PNG',
@@ -2504,7 +2495,7 @@ $1',
 'show-big-image'       => 'جوعارى اجىراتىلىمدى',
 'show-big-image-thumb' => '<small>قاراپ شىعۋ مولشەرى: $1 × $2 نۇكتە</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'جاڭا �ايلدار كورمەسى',
 'imagelisttext'         => "تومەندە $2 سۇرىپتالعان '''$1''' �ايل ٴتىزىمى.",
 'newimages-summary'     => 'بۇل ارنايى بەتىندە سوڭعى قوتارىپ بەرىلگەن �ايلدار كورسەتىلەدى',
@@ -2869,24 +2860,12 @@ $1
 
 'unit-pixel' => ' نۇكتە',
 
-# HTML dump
-'redirectingto' => '[[:$1]] بەتىنە ايداتۋدا…',
-
 # action=purge
-'confirm_purge'        => 'بۇل بەتتىن بۇركەمەسىن تازارتاسىز با?
-
-$1',
 'confirm_purge_button' => 'جارايدى',
-
-# AJAX search
-'searchcontaining' => "''$1'' ماعلۇماتى بار بەتتەردەن ىزدەۋ.",
-'searchnamed'      => "''$1'' اتاۋى بار بەتتەردەن ىزدەۋ.",
-'articletitles'    => "''$1'' دەپ باستالعان بەتتەردى",
-'hideresults'      => 'ناتىيجەلەردى جاسىر',
-'useajaxsearch'    => 'AJAX قولدانىپ ىزدەۋ',
+'confirm-purge-top'    => 'بۇل بەتتىن بۇركەمەسىن تازارتاسىز با?',
 
 # Separators for various lists, etc.
-'semicolon-separator' => 'Ø›',
+'semicolon-separator' => 'Ø›&#32;',
 'comma-separator'     => '،&#32;',
 
 # Multipage image navigation
@@ -3027,13 +3006,13 @@ $1',
 'filepath-summary' => 'بۇل ارنايى بەت �ايل ورنالاسۋى تولىق جولىن قايتارادى.
 سۋرەتتەر تولىق اجىراتىلىمدىعىمەن كورسەتىلەدى, باسقا �ايل تۇرلەرىنە قاتىستى باعدارلاماسى تۋرا جەگىلەدى.
 
-�ايل اتاۋىن «{{ns:image}}:» دەگەن باستاۋىشسىز ەڭگىزىڭىز.',
+�ايل اتاۋىن «{{ns:file}}:» دەگەن باستاۋىشسىز ەڭگىزىڭىز.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '�ايل تەلنۇسقالارىن ىزدەۋ',
 'fileduplicatesearch-summary'  => '�ايل حەشى ماعىناسى نەگىزىندە تەلنۇسقالارىن ىزدەۋ.
 
-�ايل اتاۋىن «{{ns:image}}:» دەگەن باستاۋىشسىز ەنگىزىڭىز.',
+�ايل اتاۋىن «{{ns:file}}:» دەگەن باستاۋىشسىز ەنگىزىڭىز.',
 'fileduplicatesearch-legend'   => 'تەلنۇسقانى ىزدەۋ',
 'fileduplicatesearch-filename' => '�ايل اتاۋى:',
 'fileduplicatesearch-submit'   => 'ىزدە',
diff --git a/languages/messages/MessagesKk_cn.php b/languages/messages/MessagesKk_cn.php
index 133170d6..4fef8156 100644
--- a/languages/messages/MessagesKk_cn.php
+++ b/languages/messages/MessagesKk_cn.php
@@ -1,10 +1,10 @@
 <?php
-/**
-  * Kazakh (China) (قازاقشا (جۇنگو))
-  *
-  * @ingroup Language
-  * @file
-  */
+/** Kazakh (China) (‫قازاقشا (جۇنگو)‬)
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
 
 # Inherit everything for now
 $fallback = 'kk-arab';
diff --git a/languages/messages/MessagesKk_cyrl.php b/languages/messages/MessagesKk_cyrl.php
index f2f388fc..919b48b5 100644
--- a/languages/messages/MessagesKk_cyrl.php
+++ b/languages/messages/MessagesKk_cyrl.php
@@ -39,8 +39,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Қаты�ушы_талқылауы',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_талқылауы',
-	NS_IMAGE            => 'Сурет',
-	NS_IMAGE_TALK       => 'Сурет_талқылауы',
+	NS_FILE             => 'Сурет',
+	NS_FILE_TALK        => 'Сурет_талқылауы',
 	NS_MEDIAWIKI        => 'МедиаУики',
 	NS_MEDIAWIKI_TALK   => 'МедиаУики_талқылауы',
 	NS_TEMPLATE         => 'Үлгі',
@@ -59,8 +59,8 @@ $namespaceAliases = array(
 	'Qatıswşı'            => NS_USER,
 	'Qatıswşı_talqılawı'  => NS_USER_TALK,
 	'$1_talqılawı'        => NS_PROJECT_TALK,
-	'Swret'               => NS_IMAGE,
-	'Swret_talqılawı'     => NS_IMAGE_TALK,
+	'Swret'               => NS_FILE,
+	'Swret_talqılawı'     => NS_FILE_TALK,
 	'MedïaWïkï'           => NS_MEDIAWIKI,
 	'MedïaWïkï_talqılawı' => NS_MEDIAWIKI_TALK,
 	'Ãœlgi'                => NS_TEMPLATE,
@@ -85,8 +85,8 @@ $namespaceAliases = array(
 	'قاتىسۋشى'          => NS_USER,
 	'قاتىسۋشى_تالقىلاۋى'=> NS_USER_TALK,
 	'$1_تالقىلاۋى'        => NS_PROJECT_TALK,
-	'سۋرەت'              => NS_IMAGE,
-	'سۋرەت_تالقىلاۋى'    => NS_IMAGE_TALK,
+	'سۋرەت'              => NS_FILE,
+	'سۋرەت_تالقىلاۋى'    => NS_FILE_TALK,
 	'مەدياۋيكي'           => NS_MEDIAWIKI,
 	'مەدياۋيكي_تالقىلاۋى' => NS_MEDIAWIKI_TALK,
 	'ٷلگٸ'              => NS_TEMPLATE,
@@ -97,16 +97,6 @@ $namespaceAliases = array(
 	'سانات_تالقىلاۋى'    => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'Дағдылы (standard)',
-	'nostalgia'   => '�ң�ау (nostalgia)',
-	'cologneblue' => 'Көлн зеңгірлігі (cologneblue)',
-	'monobook'    => 'Дара кітап (monobook)',
-	'myskin'      => 'Өз мәнерім (myskin)',
-	'chick'       => 'Балапан (chick)',
-	'simple'      => 'Кәдімгі (simple)',
-	'modern'      => 'Заманауи (modern)',
-);
 
 $datePreferences = array(
 	'default',
@@ -158,19 +148,6 @@ $dateFormats = array(
 	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
 );
 
-/**
- * Magic words
- * Customisable syntax for wikitext and elsewhere.
- *
- * IDs must be valid identifiers, they can't contain hyphens. 
- *
- * Note to translators:
- *   Please include the English words as synonyms.  This allows people
- *   from other wikis to contribute more easily.
- *   Please don't remove deprecated values, them should be keeped for backward compatibility.
- *
- * This array can be modified at runtime with the LanguageGetMagic hook
- */
 $magicWords = array(
 #   ID                                 CASE  SYNONYMS
 	'redirect'               => array( 0,    '#REDIRECT', '#�ЙД�У' ),
@@ -310,7 +287,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Бақылау_тізімі' ),
 	'Recentchanges'             => array( 'Жуықтағы_өзгері�тер' ),
 	'Upload'                    => array( 'Қотарып_беру', 'Қотару' ),
-	'Imagelist'                 => array( 'Сурет_тізімі' ),
+	'Listfiles'                 => array( 'Сурет_тізімі' ),
 	'Newimages'                 => array( 'Жаңа_�уреттер' ),
 	'Listusers'                 => array( 'Қаты�ушылар', 'Қаты�ушы_тізімі' ),
 	'Listgrouprights'           => array( 'Топ_құқықтары_тізімі' ),
@@ -325,7 +302,6 @@ $specialPageAliases = array(
 	'Unusedimages'              => array( 'Пайдаланылмаған_�уреттер' ),
 	'Wantedpages'               => array( 'Толтырылмаған_беттер', 'Жарам�ыз_�ілтемелер' ),
 	'Wantedcategories'          => array( 'Толтырылмаған_�анаттар' ),
-	'Missingfiles'              => array( 'Жоқ_файлдар', 'Жоқ_�уреттер' ),
 	'Mostlinked'                => array( 'Ең_көп_�ілтенген_беттер' ),
 	'Mostlinkedcategories'      => array( 'Ең_көп_пайдаланылған_�анаттар', 'Ең_көп_�ілтенген_�анаттар' ),
 	'Mostlinkedtemplates'       => array( 'Ең_көп_пайдаланылған_үлгілер', 'Ең_көп_�ілтенген_үлгілер' ),
@@ -384,10 +360,6 @@ $specialPageAliases = array(
 	'Invalidateemail'           => array( 'Құптамау_хаты' ),
 );
 
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Сілтеменің а�тын �ыз:',
@@ -435,8 +407,6 @@ $messages = array(
 'underline-never'   => 'Ешқашан',
 'underline-default' => 'Шолғыш бойынша',
 
-'skinpreview' => '(Қарап шығу)',
-
 # Dates
 'sunday'        => 'Жек�енбі',
 'monday'        => 'Дүй�енбі',
@@ -529,7 +499,7 @@ $messages = array(
 'mytalk'         => 'Талқылауым',
 'anontalk'       => 'IP талқылауы',
 'navigation'     => 'Шарлау',
-'and'            => 'және',
+'and'            => '&#32;және',
 
 # Metadata in edit box
 'metadata_help' => 'Қо�ымша деректер:',
@@ -592,8 +562,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} туралы',
 'aboutpage'            => 'Project:Жоба туралы',
-'bugreports'           => 'Қателік ба�наттары',
-'bugreportspage'       => 'Project:Қателік ба�наттары',
 'copyright'            => 'Мағлұмат $1 шартымен жетімді.',
 'copyrightpagename'    => '{{SITENAME}} ауторлық құқықтары',
 'copyrightpage'        => '{{ns:project}}:�уторлық құқықтар',
@@ -616,8 +584,6 @@ $messages = array(
 
 'badaccess'        => 'Рұқ�ат қате�і',
 'badaccess-group0' => 'Сұратылған әрекетіңізді жегуіңізге рұқ�ат етілмейді.',
-'badaccess-group1' => 'Сұратылған әрекетіңіз $1 тобының қаты�ушыларына шектеледі.',
-'badaccess-group2' => 'Сұратылған әрекетіңіз $1 топтары бірінің қату�ышыларына шектеледі.',
 'badaccess-groups' => 'Сұратылған әрекетіңіз $1 топтары бірінің қату�ышыларына шектеледі.',
 
 'versionrequired'     => 'MediaWiki $1 нұ�қа�ы керек',
@@ -718,7 +684,6 @@ $1',
 'badtitle'             => 'Жарам�ыз тақырып аты',
 'badtitletext'         => 'Сұралған бет тақырыбының аты жарам�ыз, бо�, тіларалық �ілтеме�і не уики-аралық тақырып аты бұры� енгізілген.
 Мында тақырып атында қолдалмайтын бірқатар таңбалар болуы мүмкін.',
-'perfdisabled'         => 'Ғафу етіңіз! Бұл мүмкіндік, дерекқордың жылдамылығына ә�ер етіп, ешкімге уикиді пайдалануға бермеге�ін, уақытша өшірілген.',
 'perfcached'           => 'Келе�і дерек бүркемеленген, �ондықтан толықтай жаңаланмаған болуы мүмкін.',
 'perfcachedts'         => 'Келе�і дерек бүркемеленген, �оңғы жаңаланлған кезі: $1.',
 'querypage-no-updates' => 'Бұл беттің жаңартылуы ағымда өшірілген. Деректері қазір өзгертілмейді.',
@@ -735,7 +700,7 @@ $1',
 'protectedinterface'   => 'Бұл бет бағдарламалық жа�ақтаманың тілде�у мәтінін жеті�тіреді, �ондықтан қи�натты қақпайлау үшін өзгертуі құлыпталған.',
 'editinginterface'     => "'''Құлақтандыру:''' Бағдарламалық жа�ақтаманың тілде�у мәтінін жеті�тіретін бетін өңдеп жатыр�ыз.
 Бұл беттің өзгертуі ба�қа қаты�ушыларға пайдаланушылық тілде�уі қалай көрінетіне ә�ер етеді.
-�удармалар үшін, MediaWiki бағдарлама�ын жер�індіру [http://translatewiki.net/wiki/Main_Page?setlang=kk Betawiki жоба�ы] арқылы қарап шешіңіз.",
+�удармалар үшін, MediaWiki бағдарлама�ын жер�індіру [http://translatewiki.net/wiki/Main_Page?setlang=kk translatewiki.net жоба�ы] арқылы қарап шешіңіз.",
 'sqlhidden'            => '(SQL �ұранымы жа�ырылған)',
 'cascadeprotected'     => 'Бұл бет өңдеуден қорғалған, �ебебі бұл келе�і «баулы қорғауы» қо�ылған {{PLURAL:$1|беттің|беттердің}} кірікбеті:
 $2',
@@ -747,10 +712,10 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'Қаты�ушы шығуы',
-'logouttext'                 => '<strong>Енді жүйеден шықтыңыз.</strong>
+'logouttext'                 => "'''Енді жүйеден шықтыңыз.'''
 
 Жүйеге кірме�тен {{SITENAME}} жоба�ын пайдалануын жалға�тыра ала�ыз, неме�е дәл �ол не өзге қаты�ушы боп қайта круіңіз мүмкін.
-�ңғартпа: Кейбір беттер шолғышыңыздың бүркеме�ін тазартқанша дейін әлі де кірп қалғаныңыздай көрінуі мүмкін.',
+�ңғартпа: Кейбір беттер шолғышыңыздың бүркеме�ін тазартқанша дейін әлі де кірп қалғаныңыздай көрінуі мүмкін.",
 'welcomecreation'            => '== Қош келдіңіз, $1! ==
 Жаңа тіркелгіңіз жа�алды.
 {{SITENAME}} бапталымдарыңызды өзгертуін ұмытпаңыз.',
@@ -761,7 +726,6 @@ $2',
 'remembermypassword'         => 'Менің кіргенімді бұл компьютерде ұмытпа',
 'yourdomainname'             => 'Желі үйшігіңіз:',
 'externaldberror'            => 'О�ы арада не шеттік ра�тау дерекқорында қате болды, неме�е шеттік тіркелгіңізді жаңалау рұқ�аты жоқ.',
-'loginproblem'               => '<b>Кіруіңіз кезінде о�ында қиындыққа тап болдық.</b><br />Қайта байқап көріңіз.',
 'login'                      => 'Кіру',
 'nav-login-createaccount'    => 'Кіру / Тіркелгі жа�ау',
 'loginprompt'                => '{{SITENAME}} торабына кіруіңіз үшін «cookies» қо�ылуы жөн.',
@@ -854,12 +818,14 @@ $2',
 'resetpass_announce'      => 'Хатпен жіберілген уақытша кодымен кірген�із.
 Кіруіңізді бітіру үшін, жаңа құпи� �өзіңізді мында енгізуіңіз жөн:',
 'resetpass_header'        => 'Құпи� �өзді өзгерту',
+'oldpassword'             => '�ғымдық құпи� �өзіңіз:',
+'newpassword'             => 'Жаңа құпи� �өзіңіз:',
+'retypenew'               => 'Жаңа құпи� �өзіңізді қайталаңыз:',
 'resetpass_submit'        => 'Құпи� �өзді қойыңыз да кіріңіз',
 'resetpass_success'       => 'Құпи� �өзіңіз �әтті өзгертілді! Енді кіріңіз…',
 'resetpass_bad_temporary' => 'Уақытша құпи� �өз жарам�ыз.
 Мүмкін құпи� �өзіңізді алдақашан �әтті өзгерткен болар�ыз неме�е жаңа уақытша құпи� �өзін �ұратылған�ыз.',
 'resetpass_forbidden'     => '{{SITENAME}} жоба�ында құпи� �өздер өзгертілмейді',
-'resetpass_missing'       => 'Еш пішін деректері жоқ.',
 
 # Edit page toolbar
 'bold_sample'     => 'Жуан мәтін',
@@ -882,8 +848,8 @@ $2',
 'hr_tip'          => 'Дерелей �ызық (үнемді қолданыңыз)',
 
 # Edit pages
-'summary'                          => 'Түйіндеме�і',
-'subject'                          => 'Тақырыбы/ба� жолы',
+'summary'                          => 'Түйіндеме�і:',
+'subject'                          => 'Тақырыбы/ба� жолы:',
 'minoredit'                        => 'Бұл шағын өңдеме',
 'watchthis'                        => 'Бетті бақылау',
 'savearticle'                      => 'Бетті �ақта!',
@@ -898,8 +864,8 @@ IP мекенжайыңыз бұл беттің түзету тарихында
 'missingcommenttext'               => 'Мәндемеңізді төменде енгізіңіз.',
 'missingcommentheader'             => "'''Е�кертпе:''' Бұл мәндемеге тақырып/ба�жол жеті�тірмеп�із.
 Егер тағы да Сақтау түйме�ін нұқы�аңыз, өңдемеңіз �ол�ыз �ақталады.",
-'summary-preview'                  => 'Қы�қаша мазмұндама�ын қарап шығу',
-'subject-preview'                  => 'Тақырыбын/ба� жолын қарап шығу',
+'summary-preview'                  => 'Қы�қаша мазмұндама�ын қарап шығу:',
+'subject-preview'                  => 'Тақырыбын/ба� жолын қарап шығу:',
 'blockedtitle'                     => 'Қаты�ушы бұғатталған',
 'blockedtext'                      => "<big>'''Қаты�ушы атыңыз не IP мекенжайыңыз бұғатталған.'''</big>
 
@@ -953,26 +919,26 @@ IP мекенжайыңыз бұл беттің түзету тарихында
 'noarticletext'                    => 'Бұл бетте ағымда еш мәтін жоқ, дегенмен ба�қа беттерден [[{{#special:Search}}/{{PAGENAME}}|бұл бет тақырыбы атын іздей]] не [{{fullurl:{{FULLPAGENAME}}|action=edit}} бұл бетті өңдей] ала�ыз.',
 'userpage-userdoesnotexist'        => '«$1» қаты�ушы тіркелгі�і жазып алынбаған. Бұл бетті ба�тау/өңдеу талабыңызды тек�еріп шығыңыз.',
 'clearyourcache'                   => "'''�ңғартпа:''' Сақтағаннан кейін, өзгері�терді көру үшін шолғыш бүркеме�ін орағыту ықтимал. '''Mozilla / Firefox / Safari:''' ''Қайта жүктеу'' батырма�ын нұқығанда ''Shift'' тұтыңыз, не ''Ctrl-Shift-R'' ба�ыңыз (Apple Mac — ''Cmd-Shift-R''); '''IE:''' ''Жаңарту'' батырма�ын нұқығанда ''Ctrl'' тұтыңыз, не ''Ctrl-F5'' ба�ыңыз; '''Konqueror:''': ''Жаңарту'' батырма�ын жай нұқыңыз, не ''F5'' ба�ыңыз; '''Opera''' пайданушылары ''Құралдар→Бапталымдар'' дегенге барып бүркеме�ін толық тазарту жөн.",
-'usercssjsyoucanpreview'           => '<strong>�қыл-кеңе�:</strong> Жаңа CSS/JS файлын �ақтау алдында «Қарап шығу» батырма�ын қолданып �ынақтаңыз.',
+'usercssjsyoucanpreview'           => "'''�қыл-кеңе�:''' Жаңа CSS/JS файлын �ақтау алдында «Қарап шығу» батырма�ын қолданып �ынақтаңыз.",
 'usercsspreview'                   => "'''Мынау CSS мәтінін тек қарап шығу екенін ұмытпаңыз, ол әлі �ақталған жоқ!'''",
 'userjspreview'                    => "'''Мынау JavaScript қаты�ушы бағдарлама�ын тек�еру/қарап шығу екенін ұмытпаңыз, ол әлі �ақталған жоқ!'''",
 'userinvalidcssjstitle'            => "'''Құлақтандыру:''' О�ы арада «$1» деген еш мәнер жоқ.
 Қаты�ушының .css және .js файл атауы кіші әріпппен жазылу тиі�ті екенін ұмытпаңыз, мы�алға {{ns:user}}:Foo/monobook.css дегенді {{ns:user}}:Foo/Monobook.css дегенмен �алы�тырып қараңыз.",
 'updated'                          => '(Жаңартылған)',
-'note'                             => '<strong>�ңғартпа:</strong>',
-'previewnote'                      => '<strong>Мынау тек қарап шығу екенін ұмытпаңыз;
-өзгері�тер әлі �ақталған жоқ!</strong>',
+'note'                             => "'''�ңғартпа:'''",
+'previewnote'                      => "'''Мынау тек қарап шығу екенін ұмытпаңыз;
+өзгері�тер әлі �ақталған жоқ!'''",
 'previewconflict'                  => 'Бұл қарап шығу беті жоғарғы кірі�тіру орнындағы мәтінді қамтиды да және �ақталғандағы өңді көр�етпек.',
-'session_fail_preview'             => '<strong>Ғафу етіңіз! Се��и� деректері жоғалуы �алдарынан өңдемеңізді бітіре алмаймыз.
-Қайта байқап көріңіз. Егер бұл әлі і�телме�е, шығуды және қайта кіруді байқап көріңіз.</strong>',
-'session_fail_preview_html'        => "<strong>Ғафу етіңіз! Се��и� деректері жоғалуы �алдарынан өңдемеңізді бітіре алмаймыз.</strong>
+'session_fail_preview'             => "'''Ғафу етіңіз! Се��и� деректері жоғалуы �алдарынан өңдемеңізді бітіре алмаймыз.
+Қайта байқап көріңіз. Егер бұл әлі і�телме�е, шығуды және қайта кіруді байқап көріңіз.'''",
+'session_fail_preview_html'        => "'''Ғафу етіңіз! Се��и� деректері жоғалуы �алдарынан өңдемеңізді бітіре алмаймыз.'''
 
 ''{{SITENAME}} жоба�ында қам HTML қо�ылған, JavaScript шабуылдардан қорғану үшін алдын ала қарап шығу жа�ырылған.''
 
-<strong>Егер бұл өңдеме адал талап бол�а, қайта байқап көріңіз. Егер бұл әлі і�теме�е, шығуды және қайта кіруді байқап көріңіз.</strong>",
-'token_suffix_mismatch'            => '<strong>Өңдемеңіз тайдырылды, �ебебі тұтынғышыңыз өңдеме деректер бума�ындағы тыны� белгілерін бүлдіртті.
+'''Егер бұл өңдеме адал талап бол�а, қайта байқап көріңіз. Егер бұл әлі і�теме�е, шығуды және қайта кіруді байқап көріңіз.'''",
+'token_suffix_mismatch'            => "'''Өңдемеңіз тайдырылды, �ебебі тұтынғышыңыз өңдеме деректер бума�ындағы тыны� белгілерін бүлдіртті.
 Бет мәтіні бүлінбеу үшін өңдемеңіз тайдырылады.
-Бұл кей уақытта қате�і толған веб-негізінде тіркелуі жоқ прок�и-�ерверді пайдаланған болуы мүмкін.</strong>',
+Бұл кей уақытта қате�і толған веб-негізінде тіркелуі жоқ прок�и-�ерверді пайдаланған болуы мүмкін.'''",
 'editing'                          => 'Өңделуде: $1',
 'editingsection'                   => 'Өңделуде: $1 (бөлімі)',
 'editingcomment'                   => 'Өңделуде: $1 (мәндеме�і)',
@@ -984,30 +950,30 @@ IP мекенжайыңыз бұл беттің түзету тарихында
 «Бетті �ақта! батырма�ын ба�қанда '''тек''' жоғарғы кірі�тіру орнындағы мәтін �ақталады.",
 'yourtext'                         => 'Мәтініңіз',
 'storedversion'                    => 'Сақталған нұ�қа�ы',
-'nonunicodebrowser'                => '<strong>ҚҰЛ�ҚТ��ДЫРУ: Шолғышыңыз Unicode белгілеуіне үйле�імді еме�, �ондықтан латын еме� әріптері бар беттерді өңдеу зіл болу мүмкін.
-Жұмы� і�теуге ықтималдық беру үшін, төмендегі кірі�тіру орнында ASCII еме� таңбалар оналтылық кодымен көр�етіледі</strong>.',
-'editingold'                       => '<strong>ҚҰЛ�ҚТ��ДЫРУ: О�ы беттің ертерек түзетуін өңдеп жатыр�ыз.
-Бұны �ақта�аңыз, о�ы түзетуден кейінгі барлық өзгері�тер жойылады.</strong>',
+'nonunicodebrowser'                => "'''ҚҰЛ�ҚТ��ДЫРУ: Шолғышыңыз Unicode белгілеуіне үйле�імді еме�, �ондықтан латын еме� әріптері бар беттерді өңдеу зіл болу мүмкін.
+Жұмы� і�теуге ықтималдық беру үшін, төмендегі кірі�тіру орнында ASCII еме� таңбалар оналтылық кодымен көр�етіледі'''.",
+'editingold'                       => "'''ҚҰЛ�ҚТ��ДЫРУ: О�ы беттің ертерек түзетуін өңдеп жатыр�ыз.
+Бұны �ақта�аңыз, о�ы түзетуден кейінгі барлық өзгері�тер жойылады.'''",
 'yourdiff'                         => '�йырмалар',
-'copyrightwarning'                 => '�ңғартпа: {{SITENAME}} жоба�ына берілген барлық үле�тер $2 (көбірек ақпарат үшін: $1) құжатына �ай деп �аналады.
+'copyrightwarning'                 => "�ңғартпа: {{SITENAME}} жоба�ына берілген барлық үле�тер $2 (көбірек ақпарат үшін: $1) құжатына �ай деп �аналады.
 Егер жазуыңыздың еркін өңделуін және ақы�ыз көпшілікке таратуын қалама�аңыз, мында жари�ламауыңыз жөн.<br />
 Тағы да, бұл мағлұмат өзіңіз жазғаныңызға, не қоғам қазына�ынан неме�е �ондай ашық қорлардан көшірілгеніне бізге уәде бере�із.
-<strong>�УТОРЛЫҚ ҚҰҚЫҚПЕ� ҚОРҒ�УЛЫ М�ҒЛҰМ�ТТЫ РҰҚС�ТСЫЗ Ж�РИЯЛ�М�ҢЫЗ!</strong>',
-'copyrightwarning2'                => '�ңғартпа: {{SITENAME}} жоба�ына берілген барлық үле�терді ба�қа үле�керлер өңдеуге, өзгертуге, не ала�тауға мүмкін.
+'''�УТОРЛЫҚ ҚҰҚЫҚПЕ� ҚОРҒ�УЛЫ М�ҒЛҰМ�ТТЫ РҰҚС�ТСЫЗ Ж�РИЯЛ�М�ҢЫЗ!'''",
+'copyrightwarning2'                => "�ңғартпа: {{SITENAME}} жоба�ына берілген барлық үле�терді ба�қа үле�керлер өңдеуге, өзгертуге, не ала�тауға мүмкін.
 Егер жазуыңыздың еркін өңделуін қалама�аңыз, мында жари�ламауыңыз жөн.<br />
 Тағы да, бұл мағлұмат өзіңіз жазғаныңызға, не қоғам қазына�ынан неме�е �ондай ашық қорлардан көшірілгеніне бізге уәде бере�із (көбірек ақпарат үшін $1 қужатын қараңыз).
-<strong>�УТОРЛЫҚ ҚҰҚЫҚПЕ� ҚОРҒ�УЛЫ М�ҒЛҰМ�ТТЫ РҰҚС�ТСЫЗ Ж�РИЯЛ�М�ҢЫЗ!</strong>',
-'longpagewarning'                  => '<strong>ҚҰЛ�ҚТ��ДЫРУ: Бұл беттің мөлшері — $1 kB;
+'''�УТОРЛЫҚ ҚҰҚЫҚПЕ� ҚОРҒ�УЛЫ М�ҒЛҰМ�ТТЫ РҰҚС�ТСЫЗ Ж�РИЯЛ�М�ҢЫЗ!'''",
+'longpagewarning'                  => "'''ҚҰЛ�ҚТ��ДЫРУ: Бұл беттің мөлшері — $1 kB;
 кейбір шолғыштарда бет мөлшері 32 kB жет�е не оны а��а өңдеу күрделі болуы мүмкін.
-Бетті бірнеше кішкін бөлімдерге бөліп көріңіз.</strong>',
-'longpageerror'                    => '<strong>Қ�ТЕЛІК: Жөнелтпек мәтініңіздін мөлшері — $1 KB, ең көбі $2 KB рұқ�ат етілген мөлшерінен а�қан.
-Бұл �ақтай алынбайды.</strong>',
-'readonlywarning'                  => '<strong>ҚҰЛ�ҚТ��ДЫРУ: Дерекқор баптау үшін құлыпталған, �ондықтан дәл қазір өңдемеңізді �ақтай алмай�ыз.
-Кейін қолдану үшін мәтәнді қйып алып және қойып, мәтін файлына �ақтауңызға болады.</strong>',
-'protectedpagewarning'             => '<strong>ҚҰЛ�ҚТ��ДЫРУ: Бұл бет қорғалған. Тек әкімші құқықтары бар қаты�ушылар өңдей алады.</strong>',
+Бетті бірнеше кішкін бөлімдерге бөліп көріңіз.'''",
+'longpageerror'                    => "'''Қ�ТЕЛІК: Жөнелтпек мәтініңіздін мөлшері — $1 KB, ең көбі $2 KB рұқ�ат етілген мөлшерінен а�қан.
+Бұл �ақтай алынбайды.'''",
+'readonlywarning'                  => "'''ҚҰЛ�ҚТ��ДЫРУ: Дерекқор баптау үшін құлыпталған, �ондықтан дәл қазір өңдемеңізді �ақтай алмай�ыз.
+Кейін қолдану үшін мәтәнді қйып алып және қойып, мәтін файлына �ақтауңызға болады.'''",
+'protectedpagewarning'             => "'''ҚҰЛ�ҚТ��ДЫРУ: Бұл бет қорғалған. Тек әкімші құқықтары бар қаты�ушылар өңдей алады.'''",
 'semiprotectedpagewarning'         => "'''�ңғартпа:''' Бет жартылай қорғалған, �ондықтан о�ыны тек тіркелген қаты�ушылар өңдей алады.",
 'cascadeprotectedwarning'          => "'''Құлақтандыру''': Бұл бет құлыпталған, енді тек әкімші құқықтары бар қаты�ушылар бұны өңдей алады.Бұның �ебебі: бұл бет «баулы қорғауы» бар келе�і {{PLURAL:$1|беттің|беттердің}} кірікбеті:",
-'titleprotectedwarning'            => '<strong>ҚҰЛ�ҚТ��ДЫРУ:  Бұл бет құлыпталған, �ондықтан тек бірқатар қаты�ушылар бұны ба�тай алады.</strong>',
+'titleprotectedwarning'            => "'''ҚҰЛ�ҚТ��ДЫРУ:  Бұл бет құлыпталған, �ондықтан тек бірқатар қаты�ушылар бұны ба�тай алады.'''",
 'templatesused'                    => 'Бұл бетте қолданылған үлгілер:',
 'templatesusedpreview'             => 'Бұны қарап шығуға қолданылған үлгілер:',
 'templatesusedsection'             => 'Бұл бөлімде қолданылған үлгілер:',
@@ -1051,29 +1017,28 @@ IP мекенжайыңыз бұл беттің түзету тарихында
 $3 келтірілген �ебебі: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Бұл бет үшін журнал оқиғаларын қарау',
-'nohistory'           => 'Мында бұл беттінің түзету тарихы жоқ.',
-'revnotfound'         => 'Түзету табылмады',
-'revnotfoundtext'     => 'Бұл беттің �ұралған е�кі түзетуі табылған жоқ. О�ы бет қатынауына пайдаланған URL тек�еріп шығыңыз.',
-'currentrev'          => '�ғымдық түзету',
-'revisionasof'        => '$1 кезіндегі түзету',
-'revision-info'       => '$1 кезіндегі $2 і�теген түзету',
-'previousrevision'    => '� Е�кілеу түзетуі',
-'nextrevision'        => 'Жаңалау түзетуі →',
-'currentrevisionlink' => '�ғымдық түзетуі',
-'cur'                 => 'ағым.',
-'next'                => 'кел.',
-'last'                => '�оң.',
-'page_first'          => 'алғашқы�ына',
-'page_last'           => '�оңғы�ына',
-'histlegend'          => '�йырма�ын бөлектеу: �алы�тырмақ нұ�қаларының қо�у көздерін белгілеп <Enter> перне�ін ба�ыңыз, неме�е төмендегі батырманы нұқыңыз.<br />
+'viewpagelogs'           => 'Бұл бет үшін журнал оқиғаларын қарау',
+'nohistory'              => 'Мында бұл беттінің түзету тарихы жоқ.',
+'currentrev'             => '�ғымдық түзету',
+'revisionasof'           => '$1 кезіндегі түзету',
+'revision-info'          => '$1 кезіндегі $2 і�теген түзету', # Additionally available: $3: revision id
+'previousrevision'       => '� Е�кілеу түзетуі',
+'nextrevision'           => 'Жаңалау түзетуі →',
+'currentrevisionlink'    => '�ғымдық түзетуі',
+'cur'                    => 'ағым.',
+'next'                   => 'кел.',
+'last'                   => '�оң.',
+'page_first'             => 'алғашқы�ына',
+'page_last'              => '�оңғы�ына',
+'histlegend'             => '�йырма�ын бөлектеу: �алы�тырмақ нұ�қаларының қо�у көздерін белгілеп <Enter> перне�ін ба�ыңыз, неме�е төмендегі батырманы нұқыңыз.<br />
 Шартты белгілер: (ағым.) = ағымдық нұ�қамен айырма�ы,
 (�оң.) = алдыңғы нұ�қамен айырма�ы, ш = шағын өңдеме',
-'deletedrev'          => '[жойылған]',
-'histfirst'           => 'Ең алғашқы�ына',
-'histlast'            => 'Ең �оңғы�ына',
-'historysize'         => '($1 байт)',
-'historyempty'        => '(бо�)',
+'history-fieldset-title' => 'Тарихынан іздеу',
+'deletedrev'             => '[жойылған]',
+'histfirst'              => 'Ең алғашқы�ына',
+'histlast'               => 'Ең �оңғы�ына',
+'historysize'            => '($1 байт)',
+'historyempty'           => '(бо�)',
 
 # Revision feed
 'history-feed-title'          => 'Түзету тарихы',
@@ -1176,6 +1141,7 @@ $3 келтірілген �ебебі: ''$2''",
 
 # Search results
 'searchresults'             => 'Іздеу нәтижелері',
+'searchresults-title'       => '"$1" �ұранымына табылған нәтижелер',
 'searchresulttext'          => '{{SITENAME}} жоба�ында іздеу туралы көбірек ақпарат үшін, [[{{{{ns:mediawiki}}:helppage}}|{{int:help}} бетін]] қараңыз.',
 'searchsubtitle'            => "Іздегеніңіз: '''[[:$1]]'''",
 'searchsubtitleinvalid'     => "Іздегеніңіз: '''$1'''",
@@ -1190,6 +1156,7 @@ $3 келтірілген �ебебі: ''$2''",
 'prevn'                     => 'алдыңғы $1',
 'nextn'                     => 'келе�і $1',
 'viewprevnext'              => 'Көр�етілуі: ($1) ($2) ($3) жазба',
+'searchhelp-url'            => 'Help:Мазмұны',
 'search-result-size'        => '$1 ($2 �өз)',
 'search-result-score'       => '�рақатына�тылығы: $1 %',
 'search-redirect'           => '(айдағыш $1)',
@@ -1233,6 +1200,7 @@ $3 келтірілген �ебебі: ''$2''",
 'qbsettings-floatingright' => 'Оңға қалқыған',
 'changepassword'           => 'Құпи� �өзді өзгерту',
 'skin'                     => 'Мәнерлер',
+'skin-preview'             => 'Қарап шығу',
 'math'                     => 'Өрнектер',
 'dateformat'               => 'Күн-ай пішімі',
 'datedefault'              => 'Еш қалау�ыз',
@@ -1256,9 +1224,6 @@ latex, dvips, gs және convert бағдарламаларының дұры�
 'prefs-misc'               => 'Әрқилы',
 'saveprefs'                => 'Сақта',
 'resetprefs'               => 'Сақталмаған өзгері�терді тазарт',
-'oldpassword'              => '�ғымдық құпи� �өзіңіз:',
-'newpassword'              => 'Жаңа құпи� �өзіңіз:',
-'retypenew'                => 'Жаңа құпи� �өзіңізді қайталаңыз:',
 'textboxsize'              => 'Өңдеу',
 'rows'                     => 'Жолдар:',
 'columns'                  => 'Бағандар:',
@@ -1288,7 +1253,7 @@ latex, dvips, gs және convert бағдарламаларының дұры�
 'userrights-lookup-user'      => 'Қаты�ушы топтарын реттеу',
 'userrights-user-editname'    => 'Қаты�ушы атын енгізіңіз:',
 'editusergroup'               => 'Қаты�ушы топтарын өңдеу',
-'editinguser'                 => "Қаты�ушы құқықтарын өзгерту: '''[[{{ns:user}}:$1|$1]]''' ([[{{ns:user_talk}}:$1|{{int:talkpagelinktext}}]] | [[{{#special:Contributions}}/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Қаты�ушы құқықтарын өзгерту: '''[[{{ns:user}}:$1|$1]]''' ([[{{ns:user_talk}}:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[{{#special:Contributions}}/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Қаты�ушы топтарын өңдеу',
 'saveusergroups'              => 'Қаты�ушы топтарын �ақтау',
 'userrights-groupsmember'     => 'Мүшелігі:',
@@ -1434,11 +1399,11 @@ latex, dvips, gs және convert бағдарламаларының дұры�
 'upload_directory_read_only'  => 'Қотарып бермек қалта�ына ($1) веб-�ервер жаза алмайды.',
 'uploaderror'                 => 'Қотарып беру қате�і',
 'uploadtext'                  => "Төмендегі пішінді файлдарды қотарып беру үшін қолданыңыз. 
-�лдында қотарылып берілген файлдарды қарау не іздеу үшін [[{{#special:Imagelist}}|қотарып берілген файлдар тізіміне]] барыңыз, тағы да қотарып беруі мен жоюы  [[{{#special:Log}}/upload|қотарып беру журналына]] жазылып алынады.
+�лдында қотарылып берілген файлдарды қарау не іздеу үшін [[{{#special:FileList}}|қотарып берілген файлдар тізіміне]] барыңыз, тағы да қотарып беруі мен жоюы  [[{{#special:Log}}/upload|қотарып беру журналына]] жазылып алынады.
 
 Суретті бетке кірі�тіруге, файлға тура �ілтеу үшін мына пішіндегі �ілтемені қолданыңыз:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|балама мәтін]]</nowiki>''' не
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|балама мәтін]]</nowiki>''' не
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>'''.",
 'upload-permitted'            => 'Рұқ�ат етілген файл түрлері: $1.',
 'upload-preferred'            => 'Ұнамды файл түрлері $1.',
@@ -1467,25 +1432,25 @@ latex, dvips, gs және convert бағдарламаларының дұры�
 'largefileserver'             => 'О�ы файлдың мөлшері �ервердің қалауынан а�ып кеткен.',
 'emptyfile'                   => 'Қотарып берілген файлыңыз бо� �и�қты. Файл атауы қате жазылған мүмкін.
 Бұл файлды қотарып беруі нақты талабыңыз екенін тек�еріп шығыңыз.',
-'fileexists'                  => 'Былай аталған файл алдақашан бар, егер бұны өзгертуге батылыңыз жоқ бол�а <strong><tt>$1</tt></strong> дегенді тек�еріп шығыңыз.',
-'filepageexists'              => 'Бұл файлдың �ипаттама беті алдақашан <strong><tt>$1</tt></strong> дегенде жа�алған, бірақ ағымда былай аталған еш файл жоқ.
+'fileexists'                  => "Былай аталған файл алдақашан бар, егер бұны өзгертуге батылыңыз жоқ бол�а '''<tt>$1</tt>''' дегенді тек�еріп шығыңыз.",
+'filepageexists'              => "Бұл файлдың �ипаттама беті алдақашан '''<tt>$1</tt>''' дегенде жа�алған, бірақ ағымда былай аталған еш файл жоқ.
 Енгізген қы�қаша мазмұндамаңыз �ипаттама�ы бетінде көр�етілмейді.
-Қы�қаша мазмұндамаңыз о�ы арада көр�етілу үшін, бұны қолмен өңдемек болыңыз',
-'fileexists-extension'        => 'Ұқ�а� атауы бар файл табылды:<br />
-Қотарып берілетін файл атауы: <strong><tt>$1</tt></strong><br />
-Бар болған файл атауы: <strong><tt>$2</tt></strong><br />
-Өзге атауды таңдаңыз.',
+Қы�қаша мазмұндамаңыз о�ы арада көр�етілу үшін, бұны қолмен өңдемек болыңыз",
+'fileexists-extension'        => "Ұқ�а� атауы бар файл табылды:<br />
+Қотарып берілетін файл атауы: '''<tt>$1</tt>'''<br />
+Бар болған файл атауы: '''<tt>$2</tt>'''<br />
+Өзге атауды таңдаңыз.",
 'fileexists-thumb'            => "<center>'''Бар болған �урет'''</center>",
-'fileexists-thumbnail-yes'    => 'О�ы файл — мөлшері кішірітілген �урет <i>(нобай)</i> �и�қты.
-Бұл <strong><tt>$1</tt></strong> деген файлды �ынап шығыңыз.<br />
-Егер �ыналған файл түпнұ�қалы мөлшері бар дәлме-дәл �урет бол�а, қо�ы�мша нобайды қотарып беру керегі жоқ.',
-'file-thumbnail-no'           => 'Файл атауы <strong><tt>$1</tt></strong> дегенмен ба�талады.
-Бұл — мөлшері кішірітілген �урет <i>(нобай)</i> �и�қты.
-Егер бұл �уреттің толық ажыратылымдығы бол�а, бұны қотарып беріңіз, әйтпе�е файл атауын өзгертіңіз.',
+'fileexists-thumbnail-yes'    => "О�ы файл — мөлшері кішірітілген �урет ''(нобай)'' �и�қты.
+Бұл '''<tt>$1</tt>''' деген файлды �ынап шығыңыз.<br />
+Егер �ыналған файл түпнұ�қалы мөлшері бар дәлме-дәл �урет бол�а, қо�ы�мша нобайды қотарып беру керегі жоқ.",
+'file-thumbnail-no'           => "Файл атауы '''<tt>$1</tt>''' дегенмен ба�талады.
+Бұл — мөлшері кішірітілген �урет ''(нобай)'' �и�қты.
+Егер бұл �уреттің толық ажыратылымдығы бол�а, бұны қотарып беріңіз, әйтпе�е файл атауын өзгертіңіз.",
 'fileexists-forbidden'        => 'О�ылай аталған файл алдақашан бар;
-кері қайтыңыз да, о�ы файлды жаңа атымен қотарып беріңіз. [[{{ns:image}}:$1|thumb|center|$1]]',
+кері қайтыңыз да, о�ы файлды жаңа атымен қотарып беріңіз. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'О�ылай аталған файл ортақ қоймада алдақашан бар;
-кері қайтыңыз да, о�ы файлды жаңа атымен қотарып беріңіз. [[{{ns:image}}:$1|thumb|center|$1]]',
+кері қайтыңыз да, о�ы файлды жаңа атымен қотарып беріңіз. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Бұл файл келе�і {{PLURAL:$1|файлдың|файлдарының}} телнұ�қа�ы:',
 'successfulupload'            => 'Сәтті қотарып берілді',
 'uploadwarning'               => 'Қотарып беру жөнінде құлақтандыру',
@@ -1508,8 +1473,8 @@ latex, dvips, gs және convert бағдарламаларының дұры�
 
 Бұл файлды қотарып беруін жалға�тыру үшін бұның ыңғайлығын тек�еріп шығуыңыз жөн.
 Қолайлы болуы үшін бұл файлдың жою журналы келтірілген:",
-'filename-bad-prefix'         => 'Қотарып бермек файлыңыздың атауы <strong>«$1» </strong> деп ба�талады, мынадай �ипаттау�ыз атауды әдетте �андық камералар өздіктік береді.
-Файлыңызға �ипаттылау атауды таңдаңыз.',
+'filename-bad-prefix'         => "Қотарып бермек файлыңыздың атауы '''«$1» ''' деп ба�талады, мынадай �ипаттау�ыз атауды әдетте �андық камералар өздіктік береді.
+Файлыңызға �ипаттылау атауды таңдаңыз.",
 
 'upload-proto-error'      => 'Бұры� хаттама',
 'upload-proto-error-text' => 'Шеттен қотарып беру үшін URL жайлары <code>http://</code> неме�е <code>ftp://</code> дегендерден ба�талу жөн.',
@@ -1536,20 +1501,20 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'upload_source_url'  => ' (жарамды, баршаға қатынаулы URL)',
 'upload_source_file' => ' (компьютеріңіздегі файл)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Бұл арнайы бетте барлық қотарып берілген файлдар көр�етіледі.
+# Special:ListFiles
+'listfiles-summary'     => 'Бұл арнайы бетте барлық қотарып берілген файлдар көр�етіледі.
 Соңғы қотарып берілген файлдар тізімде жоғарғы шетімен әдепкіден көр�етіледі.
 Бағанның ба� жолын нұқығанда �ұрыптаудың реттеуі өзгертіледі.',
-'imagelist_search_for'  => 'Та�па атауын іздеу:',
+'listfiles_search_for'  => 'Та�па атауын іздеу:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Файл тізімі',
-'imagelist_date'        => 'Күн-айы',
-'imagelist_name'        => '�тауы',
-'imagelist_user'        => 'Қаты�ушы',
-'imagelist_size'        => 'Мөлшері',
-'imagelist_description' => 'Сипаттама�ы',
-
-# Image description page
+'listfiles'             => 'Файл тізімі',
+'listfiles_date'        => 'Күн-айы',
+'listfiles_name'        => '�тауы',
+'listfiles_user'        => 'Қаты�ушы',
+'listfiles_size'        => 'Мөлшері',
+'listfiles_description' => 'Сипаттама�ы',
+
+# File description page
 'filehist'                       => 'Файл тарихы',
 'filehist-help'                  => 'Файлдың қай уақытта қалай көрінетін үшін Күн-ай/Уақыт дегенді нұқыңыз.',
 'filehist-deleteall'             => 'барлығын жой',
@@ -1601,8 +1566,6 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[{{ns:media}}:$1|$1]]\'\'\' — $3, $2 кезіндегі нұ�қа�ы жойылды.</span>',
 'filedelete-nofile'           => "'''$1''' деген {{SITENAME}} жоба�ында жоқ.",
 'filedelete-nofile-old'       => "Келтірілген анықтауыштарымен '''$1''' дегеннің мұрағатталған нұ�қа�ы мында жоқ.",
-'filedelete-iscurrent'        => 'Бұл файлдың ең �оңғы нұ�қа�ын жою талап еткен�із.
-Ең алдынан е�кілеу нұ�қа�ына қайтарыңыз.',
 'filedelete-otherreason'      => 'Ба�қа/қо�ымша �ебеп:',
 'filedelete-reason-otherlist' => 'Ба�қа �ебеп',
 'filedelete-reason-dropdown'  => '* Жоюдың жалпы �ебептері
@@ -1638,21 +1601,9 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'randomredirect-nopages' => 'Бұл е�ім а��ында еш айдағыш жоқ.',
 
 # Statistics
-'statistics'             => 'Санақ',
-'sitestats'              => '{{SITENAME}} �анағы',
-'userstats'              => 'Қаты�ушы �анағы',
-'sitestatstext'          => "Дерекқорда {{PLURAL:$1|'''1'''|жалпы '''$1'''}} бет бар.
-Бұған «талқылау» беттері, {{SITENAME}} жоба�ы туралы беттер, тым қы�қа «бітеме» беттері, айдағыштар, тағы да ба�қа мағлұмат деп танылмайтын беттер кірі�тірледі.
-Соларды е�ептен шығарғанда, мында мағлұмат {{PLURAL:$2|беті|беттері}} деп �аналатын '''$2''' бет бар деп болжанады.
-
-'''$8''' файл қотарып берілді.
-
-{{SITENAME}} орнатылғаннан бері беттер {{PLURAL:$3|'''1'''|жалпы '''$3'''}} рет қаралған, және беттер '''$4''' рет өңделген.
-Бұның нәтиже�інде орташа е�еппен әрбір бетке '''$5''' өңдеме келеді, және әрбір өңдемеге '''$6''' қарау келеді.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Тап�ырымалар кезегінің] ұзындығы: '''$7'''.",
-'userstatstext'          => "Мында '''$1''' [[{{#special:Listusers}}|тіркелген қаты�ушы]] бар, �оның ішінде '''$2''' (не '''$4 %''') қаты�ушы�ында $5 құқықтары бар",
-'statistics-mostpopular' => 'Ең көп қаралған беттер',
+'statistics'              => 'Санақ',
+'statistics-header-users' => 'Қаты�ушы �анағы',
+'statistics-mostpopular'  => 'Ең көп қаралған беттер',
 
 'disambiguations'      => '�йрықты беттер',
 'disambiguationspage'  => '{{ns:template}}:�йрық',
@@ -1694,7 +1645,6 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'popularpages'            => 'Ең көп қаралған беттер',
 'wantedcategories'        => 'Ба�талмаған �анаттар',
 'wantedpages'             => 'Ба�талмаған беттер',
-'missingfiles'            => 'Жоқ файлдар',
 'mostlinked'              => 'Ең көп �ілтенген беттер',
 'mostlinkedcategories'    => 'Ең көп пайдаланылған �анаттар',
 'mostlinkedtemplates'     => 'Ең көп пайдаланылған үлгілер',
@@ -1740,8 +1690,6 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'speciallogtitlelabel' => 'Тақырып аты:',
 'log'                  => 'Журналдар',
 'all-logs-page'        => 'Барлық журналдар',
-'log-search-legend'    => 'Журналдардан іздеу',
-'log-search-submit'    => 'Өт',
 'alllogstext'          => '{{SITENAME}} жоба�ының барлық қатынаулы журналдарын біріктіріп көр�етуі.
 Журнал түрін, қаты�ушы атын, не тиі�ті бетін бөлектеп, тарылтып қарай ала�ыз.',
 'logempty'             => 'Журналда �әйке� даналар жоқ.',
@@ -1771,11 +1719,29 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'special-categories-sort-count' => '�анымен �ұрыптау',
 'special-categories-sort-abc'   => 'әліпбимен �ұрыптау',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Қаты�ушының жойылған үле�і',
+
+# Special:LinkSearch
+'linksearch'       => 'Сыртқы �ілтемелерді іздеу',
+'linksearch-pat'   => 'Іздеу шарты:',
+'linksearch-ns'    => 'Е�ім а��ы:',
+'linksearch-ok'    => 'Іздеу',
+'linksearch-text'  => '«*.wikipedia.org» атауына ұқ�а�ты бәдел нышандарды қолдануға болады.',
+'linksearch-line'  => '$2 дегеннен $1 �ілтеген',
+'linksearch-error' => 'Бәдел нышандар тек �ервер жайы атауының ба�тауында болуы мүмкін.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Мына қаты�ушыдан ба�тап көр�ету:',
 'listusers-submit'   => 'Көр�ет',
 'listusers-noresult' => 'Қаты�ушы табылған жоқ.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Тіркелу журналы',
+'newuserlogpagetext'       => 'Бұл қаты�ушы тіркелгі жа�ау журналы',
+'newuserlog-create-entry'  => 'Жаңа қаты�ушы',
+'newuserlog-create2-entry' => 'жаңа тіркелгі жа�ады — $1',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Қаты�ушы тобы құқықтары',
 'listgrouprights-summary'  => 'Келе�і тізімде бұл уикиде тағайындалған қаты�ушы құқықтары (байланы�ты қатынау құқықтарымен бірге) көр�етіледі.
@@ -1835,12 +1801,6 @@ URL дұрыÑ� екендігін және торап Ñ–Ñ�теп тұрғаныÐ
 'iteminvalidname'      => "'$1' данада ақау бар — жарам�ыз атау…",
 'wlnote'               => "Төменде �оңғы {{PLURAL:$2|�ағатта|'''$2''' �ағатта}} болған, {{PLURAL:$1|жуықтағы өзгері�|жуықтағы '''$1''' өзгері�}} көр�етіледі.",
 'wlshowlast'           => 'Соңғы $1 �ағаттағы, $2 күндегі, $3 болған өзгері�ті көр�ету',
-'watchlist-show-bots'  => 'Бот өңдемелерін көр�ет',
-'watchlist-hide-bots'  => 'Бот өңдемелерін жа�ыр',
-'watchlist-show-own'   => 'Өңдемелерімді көр�ет',
-'watchlist-hide-own'   => 'Өңдемелерімді жа�ыр',
-'watchlist-show-minor' => 'Шағын өңдемелерді көр�ет',
-'watchlist-hide-minor' => 'Шағын өңдемелерді жа�ыр',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Бақылауда…',
@@ -1881,57 +1841,61 @@ $NEWPAGE
 Сын-пікір беру және былайғы жәрдем алу үшін:
 {{fullurl:{{{{ns:mediawiki}}:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Бетті жою',
-'confirm'                     => 'Құптау',
-'excontent'                   => "болған мағлұматы: '$1'",
-'excontentauthor'             => "болған мағлұматы (тек '[[{{#special:Contributions}}/$2|$2]]' үле�і): '$1'",
-'exbeforeblank'               => "тазарту алдындағы болған мағлұматы: '$1'",
-'exblank'                     => 'бет бо� болды',
-'delete-confirm'              => '«$1» дегенді жою',
-'delete-legend'               => 'Жою',
-'historywarning'              => 'Құлақтандыру: Жоюы көзделген бетте тарихы бар:',
-'confirmdeletetext'           => 'Бетті бүкіл тарихымен бірге дерекқордан жойюын коздедіңіз.
+# Delete
+'deletepage'             => 'Бетті жою',
+'confirm'                => 'Құптау',
+'excontent'              => "болған мағлұматы: '$1'",
+'excontentauthor'        => "болған мағлұматы (тек '[[{{#special:Contributions}}/$2|$2]]' үле�і): '$1'",
+'exbeforeblank'          => "тазарту алдындағы болған мағлұматы: '$1'",
+'exblank'                => 'бет бо� болды',
+'delete-confirm'         => '«$1» дегенді жою',
+'delete-legend'          => 'Жою',
+'historywarning'         => 'Құлақтандыру: Жоюы көзделген бетте тарихы бар:',
+'confirmdeletetext'      => 'Бетті бүкіл тарихымен бірге дерекқордан жойюын коздедіңіз.
 О�ыны і�теу ниетіңізді, �алдарын байымдауыңызды және [[{{{{ns:mediawiki}}:Policy-url}}]] дегенге лайықты деп і�темектенгеңізді құптаңыз.',
-'actioncomplete'              => 'Әрекет бітті',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» жойылды.
+'actioncomplete'         => 'Әрекет бітті',
+'deletedtext'            => '«<nowiki>$1</nowiki>» жойылды.
 Жуықтағы жоюлар туралы жазбаларын $2 дегеннен қараңыз.',
-'deletedarticle'              => '«[[$1]]» дегенді жойды',
-'suppressedarticle'           => '«[[$1]]» дегенді шеттетті',
-'dellogpage'                  => 'Жою_журналы',
-'dellogpagetext'              => 'Төменде жуықтағы жоюлардың тізімі берілген.',
-'deletionlog'                 => 'жою журналы',
-'reverted'                    => 'Ертерек түзетуіне қайтарылған',
-'deletecomment'               => 'Жоюдың �ебебі:',
-'deleteotherreason'           => 'Ба�қа/қо�ымша �ебеп:',
-'deletereasonotherlist'       => 'Ба�қа �ебеп',
-'deletereason-dropdown'       => '* Жоюдың жалпы �ебептері
+'deletedarticle'         => '«[[$1]]» дегенді жойды',
+'suppressedarticle'      => '«[[$1]]» дегенді шеттетті',
+'dellogpage'             => 'Жою_журналы',
+'dellogpagetext'         => 'Төменде жуықтағы жоюлардың тізімі берілген.',
+'deletionlog'            => 'жою журналы',
+'reverted'               => 'Ертерек түзетуіне қайтарылған',
+'deletecomment'          => 'Жоюдың �ебебі:',
+'deleteotherreason'      => 'Ба�қа/қо�ымша �ебеп:',
+'deletereasonotherlist'  => 'Ба�қа �ебеп',
+'deletereason-dropdown'  => '* Жоюдың жалпы �ебептері
 ** �утордың �ұранымы бойынша
 ** �уторлық құқықтарын бұзу
 ** Бұзақылық',
-'delete-edit-reasonlist'      => 'Жою �ебептерін өңдеу',
-'delete-toobig'               => 'Бұл бетте байтақ түзету тарихы бар, $1 түзетуден а�там.
+'delete-edit-reasonlist' => 'Жою �ебептерін өңдеу',
+'delete-toobig'          => 'Бұл бетте байтақ түзету тарихы бар, $1 түзетуден а�там.
 Бұндай беттердің жоюы {{SITENAME}} торабын әлдеқалай үзіп та�тауына бөгет �алу үшін тиымдалған.',
-'delete-warning-toobig'       => 'Бұл бетте байтақ түзету тарихы бар, $1 түзетуден а�там.
+'delete-warning-toobig'  => 'Бұл бетте байтақ түзету тарихы бар, $1 түзетуден а�там.
 Бұның жоюы {{SITENAME}} торабындағы дерекқор әрекеттерді үзіп та�тауын мүмкін;
 бұны абайлап өткізіңіз.',
-'rollback'                    => 'Өңдемелерді шегіндіру',
-'rollback_short'              => 'Шегіндіру',
-'rollbacklink'                => 'шегіндіру',
-'rollbackfailed'              => 'Шегіндіру �әт�із бітті',
-'cantrollback'                => 'Өңдеме қайтарылмады;
+
+# Rollback
+'rollback'         => 'Өңдемелерді шегіндіру',
+'rollback_short'   => 'Шегіндіру',
+'rollbacklink'     => 'шегіндіру',
+'rollbackfailed'   => 'Шегіндіру �әт�із бітті',
+'cantrollback'     => 'Өңдеме қайтарылмады;
 �оңғы үле�кері тек о�ы беттің ба�таушы�ы болды.',
-'alreadyrolled'               => '[[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|талқылауы]]) і�теген [[:$1]] �оңғы өңдеме�і шегіндірілмеді;
+'alreadyrolled'    => '[[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|талқылауы]]) і�теген [[:$1]] �оңғы өңдеме�і шегіндірілмеді;
 ба�қа біреу бұл бетті алдақашан өңдеген не шегіндірген.
 
 �оңғы өңдеме�ін [[{{ns:user}}:$3|$3]] ([[{{ns:user_talk}}:$3|талқылауы]]) і�теген.',
-'editcomment'                 => 'Болған өңдеме мәндеме�і: «<i>$1</i>».', # only shown if there is an edit comment
-'revertpage'                  => '[[{{#special:Contributions}}/$2|$2]] ([[{{ns:user_talk}}:$2|талқылауы]]) өңдемелерінен [[{{ns:user}}:$1|$1]] �оңғы нұ�қа�ына қайтарды', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 өңдемелерінен қайтарған;
+'editcomment'      => "Болған өңдеме мәндеме�і: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => '[[{{#special:Contributions}}/$2|$2]] ([[{{ns:user_talk}}:$2|талқылауы]]) өңдемелерінен [[{{ns:user}}:$1|$1]] �оңғы нұ�қа�ына қайтарды', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 өңдемелерінен қайтарған;
 $2 �оңғы нұ�қа�ына өзгертті.',
-'sessionfailure'              => 'Кіру �е��и��ында шатақ болған �и�қты;
+'sessionfailure'   => 'Кіру �е��и��ында шатақ болған �и�қты;
 �е��и�ға шабуылдаудардан қорғану үшін, о�ы әрекет тоқтатылды.
 «�ртқа» дегенді ба�ыңыз, және бетті қайта жүктеңіз де, қайта байқап көріңіз.',
+
+# Protect
 'protectlogpage'              => 'Қорғау журналы',
 'protectlogtext'              => 'Төменде беттердің қорғау/қорғамау тізімі берілген.
 �ғымдағы қорғау әректтер бар беттер үшін [[{{#special:Protectedpages}}|қорғалған бет тізімін]] қараңыз.',
@@ -1939,19 +1903,20 @@ $2 �оңғы нұ�қа�ына өзгертті.',
 'modifiedarticleprotection'   => '«[[$1]]» қорғалу деңгейі өзгерді',
 'unprotectedarticle'          => '«[[$1]]» қорғалуы өшірілді',
 'protect-title'               => '«$1» қорғау деңгейін өзгерту',
+'prot_1movedto2'              => '[[$1]] дегенді [[$2]] дегенге жылжытты',
 'protect-legend'              => 'Қорғауды құптау',
 'protectcomment'              => 'Мәндеме�і:',
 'protectexpiry'               => 'Мерзімі бітпек:',
 'protect_expiry_invalid'      => 'Бітетін уақыты жарам�ыз.',
 'protect_expiry_old'          => 'Бітетін уақыты өтіп кеткен.',
 'protect-unchain'             => 'Жылжыту рұқ�аттарын беру',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> бетінің қорғау деңгейін қарап және өзгертіп шыға ала�ыз.',
-'protect-locked-blocked'      => 'Бұғаттауыңыз өшірілгенше дейін қорғау деңгейін өзгерте алмай�ыз.
-Мына <strong>$1</strong> беттің ағымдық баптаулары:',
-'protect-locked-dblock'       => 'Дерекқордың құлыптауы бел�енді болғандықтан қорғау деңгейлері өзгертілмейді.
-Мына <strong>$1</strong> беттің ағымдық баптаулары:',
-'protect-locked-access'       => 'Тіркелгіңізге бет қорғау денгейлерін өзгертуіне рұқ�ат жоқ.
-Мына <strong>$1</strong> беттің ағымдық баптаулары:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' бетінің қорғау деңгейін қарап және өзгертіп шыға ала�ыз.",
+'protect-locked-blocked'      => "Бұғаттауыңыз өшірілгенше дейін қорғау деңгейін өзгерте алмай�ыз.
+Мына '''$1''' беттің ағымдық баптаулары:",
+'protect-locked-dblock'       => "Дерекқордың құлыптауы бел�енді болғандықтан қорғау деңгейлері өзгертілмейді.
+Мына '''$1''' беттің ағымдық баптаулары:",
+'protect-locked-access'       => "Тіркелгіңізге бет қорғау денгейлерін өзгертуіне рұқ�ат жоқ.
+Мына '''$1''' беттің ағымдық баптаулары:",
 'protect-cascadeon'           => 'Бұл бет ағымда қорғалған, �ебебі о�ы бет «баулы қорғауы» бар келе�і {{PLURAL:$1|беттің|беттердің}} кірікбеті.
 Бұл беттің қорғау деңгейін өзгерте ала�ыз, бірақ бұл баулы қорғауға ықпал етпейді.',
 'protect-default'             => '(әдепкі)',
@@ -1962,6 +1927,7 @@ $2 �оңғы нұ�қа�ына өзгертті.',
 'protect-expiring'            => 'мерзімі бітпек: $1 (UTC)',
 'protect-cascade'             => 'Бұл беттің кірікбеттерін қорғау (баулы қорғау).',
 'protect-cantedit'            => 'Бұл беттің қорғау деңгейін өзгерте алмай�ыз, �ебебі бұны өңдеуге рұқ�таңыз жоқ.',
+'protect-expiry-options'      => '2 �ағат:2 hours,1 күн:1 day,3 күн:3 days,1 апта:1 week,2 апта:2 weeks,1 ай:1 month,3 ай:3 months,6 ай:6 months,1 жыл:1 year,мәнгі:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Рұқ�аты:',
 'restriction-level'           => 'Тиымдық деңгейі:',
 'minimum-size'                => 'Ең аз мөлшері',
@@ -2054,7 +2020,6 @@ $1',
 'whatlinkshere'            => 'Мында �ілтейтін беттер',
 'whatlinkshere-title'      => '$1 дегенге �ілтейтін беттер',
 'whatlinkshere-page'       => 'Бет:',
-'linklistsub'              => '(Сілтемелер тізімі)',
 'linkshere'                => "'''[[:$1]]''' дегенге мына беттер �ілтейді:",
 'nolinkshere'              => "'''[[:$1]]''' дегенге еш бет �ілтемейді.",
 'nolinkshere-ns'           => "Таңдалған е�ім а��ында '''[[:$1]]''' дегенге ешқандай бет �ілтемейді.",
@@ -2201,6 +2166,8 @@ $1 бұғаттауы үшін келтірілген �ебебі: «$2».',
 
 О�ы орайда, қалауыңыз бол�а, бетті қолдан жылжыта не қо�а ала�ыз.",
 'movearticle'             => 'Жылжытпақ бет:',
+'movenologin'             => 'Жүйеге кірмеген�із',
+'movenologintext'         => 'Бетті жылжыту үшін тіркелген болуыңыз және [[{{#special:Userlogin}}|кіруіңіз]] жөн.',
 'movenotallowed'          => '{{SITENAME}} жоба�ында беттерді жылжыту руқ�атыңыз жоқ.',
 'newtitle'                => 'Жаңа тақырып атына:',
 'move-watch'              => 'Бұл бетті бақылау',
@@ -2234,8 +2201,6 @@ $1 бұғаттауы үшін келтірілген �ебебі: «$2».',
 'delete_and_move_reason'  => 'Жылжытуға жол беру үшін жойылған',
 'selfmove'                => 'Қайнар және ны�ана тақырып аттары бірдей;
 бет өзінің ү�тіне жылжытылмайды.',
-'immobile_namespace'      => 'Қайнар не ны�ана тақырып аты арнаулы түріне жатады;
-беттер бұл е�ім а��ы �ыртына және ішіне жылжытылмайды.',
 'imagenocrossnamespace'   => 'Файл еме� е�ім а��ына файл жылжытылмайды',
 'imagetypemismatch'       => 'Файлдың жаңа кеңейтімі бұның түріне �әйке� еме�',
 'imageinvalidfilename'    => '�ы�ана файл атауы жарам�ыз',
@@ -2263,7 +2228,7 @@ MediaWiki жүйеÑ�інің [[{{#special:Import}}|Ñ�ырттан алу бетÑ
 'allmessagesdefault'        => 'Әдепкі мәтіні',
 'allmessagescurrent'        => '�ғымдық мәтіні',
 'allmessagestext'           => 'Мында {{ns:mediawiki}} е�ім а��ында жетімді жүйе хабар тізімі беріледі.
-Егер әмбебап MediaWiki жер�індіруге үле� қо�қыңыз кел�е [http://www.mediawiki.org/wiki/Localisation MediaWiki жер�індіру бетіне] және [http://translatewiki.net Betawiki жоба�ына] барып шығыңыз.',
+Егер әмбебап MediaWiki жер�індіруге үле� қо�қыңыз кел�е [http://www.mediawiki.org/wiki/Localisation MediaWiki жер�індіру бетіне] және [http://translatewiki.net translatewiki.net жоба�ына] барып шығыңыз.',
 'allmessagesnotsupportedDB' => "'''\$wgUseDatabaseMessages''' өшірілген �ебебінен '''{{#special:AllMessages}}''' беті қолданылмайды.",
 'allmessagesfilter'         => 'Хабарды атауымен �үзгілеу:',
 'allmessagesmodified'       => 'Тек өзгертілгенді көр�ет',
@@ -2286,6 +2251,7 @@ MediaWiki жүйеÑ�інің [[{{#special:Import}}|Ñ�ырттан алу бетÑ
 'import-interwiki-history'   => 'Бұл беттің барлық тарихи нұ�қаларын көшіру',
 'import-interwiki-submit'    => 'Сырттан алу',
 'import-interwiki-namespace' => 'Беттерді мына е�ім а��ына апару:',
+'import-comment'             => 'Мәндеме�і:',
 'importtext'                 => 'Қайнар уикиден «{{#special:Export}}» қуралын қолданып файлды �ыртқа беріңіз, ди�кіңізге �ақтаңыз да мында қотарып беріңіз.',
 'importstart'                => 'Беттерді �ырттан алуда…',
 'import-revision-count'      => '$1 түзету',
@@ -2431,6 +2397,16 @@ MediaWiki жүйеÑ�інің [[{{#special:Import}}|Ñ�ырттан алу бетÑ
 'numauthors'     => 'Әртүрлі аутор �аны (бет): $1',
 'numtalkauthors' => 'Әртүрлі аутор �аны (талқылау беті): $1',
 
+# Skin names
+'skinname-standard'    => 'Дағдылы (standard)',
+'skinname-nostalgia'   => '�ң�ау (nostalgia)',
+'skinname-cologneblue' => 'Көлн зеңгірлігі (cologneblue)',
+'skinname-monobook'    => 'Дара кітап (monobook)',
+'skinname-myskin'      => 'Өз мәнерім (myskin)',
+'skinname-chick'       => 'Балапан (chick)',
+'skinname-simple'      => 'Кәдімгі (simple)',
+'skinname-modern'      => 'Заманауи (modern)',
+
 # Math options
 'mw_math_png'    => 'Әрқашан PNG пішінімен көр�еткіз',
 'mw_math_simple' => 'Егер өте қарапайым бол�а — HTML, әйтпе�е PNG',
@@ -2484,10 +2460,11 @@ $1',
 'show-big-image'       => 'Жоғары ажыратылымды',
 'show-big-image-thumb' => '<small>Қарап шығу мөлшері: $1 × $2 нүкте</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Жаңа файлдар көрме�і',
 'imagelisttext'         => "Төменде $2 �ұрыпталған '''$1''' файл тізімі.",
 'newimages-summary'     => 'Бұл арнайы бетінде �оңғы қотарып берілген файлдар көр�етіледі',
+'newimages-legend'      => 'Сүзгі',
 'showhidebots'          => '(боттарды $1)',
 'noimages'              => 'Көретін ештеңе жоқ.',
 'ilsubmit'              => 'Ізде',
@@ -2849,25 +2826,12 @@ $1
 
 'unit-pixel' => ' нүкте',
 
-# HTML dump
-'redirectingto' => '[[:$1]] бетіне айдатуда…',
-
 # action=purge
-'confirm_purge'        => 'Бұл беттін бүркеме�ін тазарта�ыз ба?
-
-$1',
 'confirm_purge_button' => 'Жарайды',
-
-# AJAX search
-'searchcontaining' => "''$1'' мағлұматы бар беттерден іздеу.",
-'searchnamed'      => "''$1'' атауы бар беттерден іздеу.",
-'articletitles'    => "''$1'' деп ба�талған беттерді",
-'hideresults'      => '�әтижелерді жа�ыр',
-'useajaxsearch'    => 'AJAX қолданып іздеу',
+'confirm-purge-top'    => 'Бұл беттін бүркеме�ін тазарта�ыз ба?',
 
 # Separators for various lists, etc.
 'semicolon-separator' => ';',
-'comma-separator'     => ',&#32;',
 'colon-separator'     => ':&#32;',
 
 # Multipage image navigation
@@ -3008,13 +2972,13 @@ $1',
 'filepath-summary' => 'Бұл арнайы бет файл орнала�уы толық жолын қайтарады.
 Суреттер толық ажыратылымдығымен көр�етіледі, ба�қа файл түрлеріне қаты�ты бағдарлама�ы тура жегіледі.
 
-Файл атауын «{{ns:image}}:» деген ба�тауыш�ыз еңгізіңіз.',
+Файл атауын «{{ns:file}}:» деген ба�тауыш�ыз еңгізіңіз.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Файл телнұ�қаларын іздеу',
 'fileduplicatesearch-summary'  => 'Файл хеші мағына�ы негізінде телнұ�қаларын іздеу.
 
-Файл атауын «{{ns:image}}:» деген ба�тауыш�ыз енгізіңіз.',
+Файл атауын «{{ns:file}}:» деген ба�тауыш�ыз енгізіңіз.',
 'fileduplicatesearch-legend'   => 'Телнұ�қаны іздеу',
 'fileduplicatesearch-filename' => 'Файл атауы:',
 'fileduplicatesearch-submit'   => 'Ізде',
diff --git a/languages/messages/MessagesKk_latn.php b/languages/messages/MessagesKk_latn.php
index 1e4d9792..2b8fdd92 100644
--- a/languages/messages/MessagesKk_latn.php
+++ b/languages/messages/MessagesKk_latn.php
@@ -43,8 +43,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Qatıswşı_talqılawı',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talqılawı',
-	NS_IMAGE            => 'Swret',
-	NS_IMAGE_TALK       => 'Swret_talqılawı',
+	NS_FILE             => 'Swret',
+	NS_FILE_TALK        => 'Swret_talqılawı',
 	NS_MEDIAWIKI        => 'MedïaWïkï',
 	NS_MEDIAWIKI_TALK   => 'MedïaWïkï_talqılawı',
 	NS_TEMPLATE         => 'Ãœlgi',
@@ -63,8 +63,8 @@ $namespaceAliases = array(
 	'Қаты�ушы'            => NS_USER,
 	'Қаты�ушы_талқылауы'  => NS_USER_TALK,
 	'$1_талқылауы'        => NS_PROJECT_TALK,
-	'Сурет'               => NS_IMAGE,
-	'Сурет_талқылауы'     => NS_IMAGE_TALK,
+	'Сурет'               => NS_FILE,
+	'Сурет_талқылауы'     => NS_FILE_TALK,
 	'МедиаУики'           => NS_MEDIAWIKI,
 	'МедиаУики_талқылауы' => NS_MEDIAWIKI_TALK,
 	'Үлгі'                => NS_TEMPLATE,
@@ -89,8 +89,8 @@ $namespaceAliases = array(
 	'قاتىسۋشى'          => NS_USER,
 	'قاتىسۋشى_تالقىلاۋى'=> NS_USER_TALK,
 	'$1_تالقىلاۋى'        => NS_PROJECT_TALK,
-	'سۋرەت'              => NS_IMAGE,
-	'سۋرەت_تالقىلاۋى'    => NS_IMAGE_TALK,
+	'سۋرەت'              => NS_FILE,
+	'سۋرەت_تالقىلاۋى'    => NS_FILE_TALK,
 	'مەدياۋيكي'           => NS_MEDIAWIKI,
 	'مەدياۋيكي_تالقىلاۋى' => NS_MEDIAWIKI_TALK,
 	'ٷلگٸ'              => NS_TEMPLATE,
@@ -101,16 +101,6 @@ $namespaceAliases = array(
 	'سانات_تالقىلاۋى'    => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'Dağdılı (standard)',
-	'nostalgia'   => 'Añsaw (nostalgia)',
-	'cologneblue' => 'Köln zeñgirligi (cologneblue)',
-	'monobook'    => 'Dara kitap (monobook)',
-	'myskin'      => 'Öz mänerim (myskin)',
-	'chick'       => 'Balapan (chick)',
-	'simple'      => 'Kädimgi (simple)',
-	'modern'      => 'Zamanawï (modern)',
-);
 
 $datePreferences = array(
 	'default',
@@ -162,19 +152,6 @@ $dateFormats = array(
 	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
 );
 
-/**
- * Magic words
- * Customisable syntax for wikitext and elsewhere.
- *
- * IDs must be valid identifiers, they can't contain hyphens. 
- *
- * Note to translators:
- *   Please include the English words as synonyms.  This allows people
- *   from other wikis to contribute more easily.
- *   Please don't remove deprecated values, them should be keeped for backward compatibility.
- *
- * This array can be modified at runtime with the LanguageGetMagic hook
- */
 $magicWords = array(
 #   ID                                 CASE  SYNONYMS
 	'redirect'               => array( 0,    '#REDIRECT', '#A�DAW' ),
@@ -314,7 +291,7 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Baqılaw_tizimi' ),
 	'Recentchanges'             => array( 'Jwıqtağı_özgerister' ),
 	'Upload'                    => array( 'Qotarıp_berw', 'Qotarw' ),
-	'Imagelist'                 => array( 'Swret_tizimi' ),
+	'Listfiles'                 => array( 'Swret_tizimi' ),
 	'Newimages'                 => array( 'Jaña_swretter' ),
 	'Listusers'                 => array( 'Qatıswşılar', 'Qatıswşı_tizimi' ),
 	'Listgrouprights'           => array( 'Top_quqıqtarı_tizimi' ),
@@ -329,7 +306,6 @@ $specialPageAliases = array(
 	'Unusedimages'              => array( 'Paýdalanılmağan_swretter' ),
 	'Wantedpages'               => array( 'Toltırılmağan_better', 'Jaramsız_siltemeler' ),
 	'Wantedcategories'          => array( 'Toltırılmağan_sanattar' ),
-	'Missingfiles'              => array( 'Joq_faýldar', 'Joq_swretter' ),
 	'Mostlinked'                => array( 'Eñ_köp_siltengen_better' ),
 	'Mostlinkedcategories'      => array( 'Eñ_köp_paýdalanılğan_sanattar', 'Eñ_köp_siltengen_sanattar' ),
 	'Mostlinkedtemplates'       => array( 'Eñ_köp_paýdalanılğan_ülgiler', 'Eñ_köp_siltengen_ülgiler' ),
@@ -388,10 +364,6 @@ $specialPageAliases = array(
 	'Invalidateemail'           => array( 'Quptamaw_xatı' ),
 );
 
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Siltemeniñ astın sız:',
@@ -439,8 +411,6 @@ $messages = array(
 'underline-never'   => 'EÅŸqaÅŸan',
 'underline-default' => 'Şolğış boýınşa',
 
-'skinpreview' => '(Qarap şığw)',
-
 # Dates
 'sunday'        => 'Jeksenbi',
 'monday'        => 'Düýsenbi',
@@ -533,7 +503,7 @@ $messages = array(
 'mytalk'         => 'Talqılawım',
 'anontalk'       => 'IP talqılawı',
 'navigation'     => 'Åžarlaw',
-'and'            => 'jäne',
+'and'            => '&#32;jäne',
 
 # Metadata in edit box
 'metadata_help' => 'Qosımşa derekter:',
@@ -596,8 +566,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} twralı',
 'aboutpage'            => 'Project:Joba twralı',
-'bugreports'           => 'Qatelik bayanattarı',
-'bugreportspage'       => 'Project:Qatelik eseptemeleri',
 'copyright'            => 'Mağlumat $1 şartımen jetimdi.',
 'copyrightpagename'    => '{{SITENAME}} awtorlıq quqıqtarı',
 'copyrightpage'        => '{{ns:project}}:Awtorlıq quqıqtar',
@@ -620,8 +588,6 @@ $messages = array(
 
 'badaccess'        => 'Ruqsat qatesi',
 'badaccess-group0' => 'Suratılğan äreketiñizdi jegwiñizge ruqsat etilmeýdi.',
-'badaccess-group1' => 'Suratılğan äreketiñiz $1 tobınıñ qatıswşılarına şekteledi.',
-'badaccess-group2' => 'Suratılğan äreketiñiz $1 toptarı biriniñ qatwsışılarına şekteledi.',
 'badaccess-groups' => 'Suratılğan äreketiñiz $1 toptarı biriniñ qatwsışılarına şekteledi.',
 
 'versionrequired'     => 'MediaWiki $1 nusqası kerek',
@@ -722,7 +688,6 @@ Bunı basqa birew aldaqaşan joýğan mümkin.',
 'badtitle'             => 'Jaramsız taqırıp atı',
 'badtitletext'         => 'Suralğan bet taqırıbınıñ atı jaramsız, bos, tilaralıq siltemesi ne wïkï-aralıq taqırıp atı burıs engizilgen.
 Mında taqırıp atında qoldalmaýtın birqatar tañbalar bolwı mümkin.',
-'perfdisabled'         => 'Ğafw etiñiz! Bul mümkindik, derekqordıñ jıldamılığına äser etip, eşkimge wïkïdi paýdalanwğa bermegesin, waqıtşa öşirilgen.',
 'perfcached'           => 'Kelesi derek bürkemelengen, sondıqtan tolıqtaý jañalanmağan bolwı mümkin.',
 'perfcachedts'         => 'Kelesi derek bürkemelengen, soñğı jañalanlğan kezi: $1.',
 'querypage-no-updates' => 'Bul bettiñ jañartılwı ağımda öşirilgen. Derekteri qazir özgertilmeýdi.',
@@ -739,7 +704,7 @@ Birneşe mïnöttan qaýta baýqap köriñiz.',
 'protectedinterface'   => 'Bul bet bağdarlamalıq jasaqtamanıñ tildesw mätinin jetistiredi, sondıqtan qïyanattı qaqpaýlaw üşin özgertwi qulıptalğan.',
 'editinginterface'     => "'''Qulaqtandırw:''' Bağdarlamalıq jasaqtamanıñ tildesw mätinin jetistiretin betin öñdep jatırsız.
 Bul bettiñ özgertwi basqa qatıswşılarğa paýdalanwşılıq tildeswi qalaý körinetine äser etedi.
-Awdarmalar üşin, MediaWiki bağdarlamasın jersindirw [http://translatewiki.net/wiki/Main_Page?setlang=kk Betawiki jobası] arqılı qarap şeşiñiz.",
+Awdarmalar üşin, MediaWiki bağdarlamasın jersindirw [http://translatewiki.net/wiki/Main_Page?setlang=kk translatewiki.net jobası] arqılı qarap şeşiñiz.",
 'sqlhidden'            => '(SQL suranımı jasırılğan)',
 'cascadeprotected'     => 'Bul bet öñdewden qorğalğan, sebebi bul kelesi «bawlı qorğawı» qosılğan {{PLURAL:$1|bettiñ|betterdiñ}} kirikbeti:
 $2',
@@ -751,10 +716,10 @@ Keltirilgen sebebi: ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Qatıswşı şığwı',
-'logouttext'                 => '<strong>Endi jüýeden şıqtıñız.</strong>
+'logouttext'                 => "'''Endi jüýeden şıqtıñız.'''
 
 Jüýege kirmesten {{SITENAME}} jobasın paýdalanwın jalğastıra alasız, nemese däl sol ne özge qatıswşı bop qaýta krwiñiz mümkin.
-Añğartpa: Keýbir better şolğışıñızdıñ bürkemesin tazartqanşa deýin äli de kirp qalğanıñızdaý körinwi mümkin.',
+Añğartpa: Keýbir better şolğışıñızdıñ bürkemesin tazartqanşa deýin äli de kirp qalğanıñızdaý körinwi mümkin.",
 'welcomecreation'            => '== Qoş keldiñiz, $1! ==
 Jaña tirkelgiñiz jasaldı.
 {{SITENAME}} baptalımdarıñızdı özgertwin umıtpañız.',
@@ -765,7 +730,6 @@ Jaña tirkelgiñiz jasaldı.
 'remembermypassword'         => 'Meniñ kirgenimdi bul komp′ywterde umıtpa',
 'yourdomainname'             => 'Jeli üýşigiñiz:',
 'externaldberror'            => 'Osı arada ne şettik rastaw derekqorında qate boldı, nemese şettik tirkelgiñizdi jañalaw ruqsatı joq.',
-'loginproblem'               => '<b>Kirwiñiz kezinde osında qïındıqqa tap boldıq.</b><br />Qaýta baýqap köriñiz.',
 'login'                      => 'Kirw',
 'nav-login-createaccount'    => 'Kirw / Tirkelgi jasaw',
 'loginprompt'                => '{{SITENAME}} torabına kirwiñiz üşin «cookies» qosılwı jön.',
@@ -858,12 +822,14 @@ Eger bul tirkelgi qatelikpen jasalsa, osı xabarğa elemewiñiz mümkin.',
 'resetpass_announce'      => 'Xatpen jiberilgen waqıtşa kodımen kirgensiz.
 Kirwiñizdi bitirw üşin, jaña qupïya söziñizdi mında engizwiñiz jön:',
 'resetpass_header'        => 'Qupïya sözdi özgertw',
+'oldpassword'             => 'Ağımdıq qupïya söziñiz:',
+'newpassword'             => 'Jaña qupïya söziñiz:',
+'retypenew'               => 'Jaña qupïya söziñizdi qaýtalañız:',
 'resetpass_submit'        => 'Qupïya sözdi qoýıñız da kiriñiz',
 'resetpass_success'       => 'Qupïya söziñiz sätti özgertildi! Endi kiriñiz…',
 'resetpass_bad_temporary' => 'Waqıtşa qupïya söz jaramsız.
 Mümkin qupïya söziñizdi aldaqaşan sätti özgertken bolarsız nemese jaña waqıtşa qupïya sözin suratılğansız.',
 'resetpass_forbidden'     => '{{SITENAME}} jobasında qupïya sözder özgertilmeýdi',
-'resetpass_missing'       => 'EÅŸ piÅŸin derekteri joq.',
 
 # Edit page toolbar
 'bold_sample'     => 'Jwan mätin',
@@ -886,8 +852,8 @@ Mümkin qupïya söziñizdi aldaqaşan sätti özgertken bolarsız nemese jaña
 'hr_tip'          => 'Dereleý sızıq (ünemdi qoldanıñız)',
 
 # Edit pages
-'summary'                          => 'Tüýindemesi',
-'subject'                          => 'Taqırıbı/bas jolı',
+'summary'                          => 'Tüýindemesi:',
+'subject'                          => 'Taqırıbı/bas jolı:',
 'minoredit'                        => 'Bul şağın öñdeme',
 'watchthis'                        => 'Betti baqılaw',
 'savearticle'                      => 'Betti saqta!',
@@ -902,8 +868,8 @@ IP mekenjaýıñız bul bettiñ tüzetw tarïxında jazılıp alınadı.",
 'missingcommenttext'               => 'Mändemeñizdi tömende engiziñiz.',
 'missingcommentheader'             => "'''Eskertpe:''' Bul mändemege taqırıp/basjol jetistirmepsiz.
 Eger tağı da Saqtaw tüýmesin nuqısañız, öñdemeñiz solsız saqtaladı.",
-'summary-preview'                  => 'Qısqaşa mazmundamasın qarap şığw',
-'subject-preview'                  => 'Taqırıbın/bas jolın qarap şığw',
+'summary-preview'                  => 'Qısqaşa mazmundamasın qarap şığw:',
+'subject-preview'                  => 'Taqırıbın/bas jolın qarap şığw:',
 'blockedtitle'                     => 'Qatıswşı buğattalğan',
 'blockedtext'                      => "<big>'''Qatıswşı atıñız ne IP mekenjaýıñız buğattalğan.'''</big>
 
@@ -956,26 +922,26 @@ Eger siz tirkelgisiz qatıswşı bolsañız jäne sizge qatıssız mändemeler j
 'noarticletext'                    => 'Bul bette ağımda eş mätin joq, basqa betterden osı bet atawın [[Special:Search/{{PAGENAME}}|izdep körwiñizge]] nemese osı betti [{{fullurl:{{FULLPAGENAME}}|action=edit}} tüzetwiñizge] boladı.',
 'userpage-userdoesnotexist'        => '«$1» qatıswşı tirkelgisi jazıp alınbağan. Bul betti bastaw/öñdew talabıñızdı tekserip şığıñız.',
 'clearyourcache'                   => "'''Añğartpa:''' Saqtağannan keýin, özgeristerdi körw üşin şolğış bürkemesin orağıtw ıqtïmal. '''Mozilla / Firefox / Safari:''' ''Qaýta jüktew'' batırmasın nuqığanda ''Shift'' tutıñız, ne ''Ctrl-Shift-R'' basıñız (Apple Mac — ''Cmd-Shift-R''); '''IE:''' ''Jañartw'' batırmasın nuqığanda ''Ctrl'' tutıñız, ne ''Ctrl-F5'' basıñız; '''Konqueror:''': ''Jañartw'' batırmasın jaý nuqıñız, ne ''F5'' basıñız; '''Opera''' paýdanwşıları ''Quraldar→Baptalımdar'' degenge barıp bürkemesin tolıq tazartw jön.",
-'usercssjsyoucanpreview'           => '<strong>Aqıl-keñes:</strong> Jaña CSS/JS faýlın saqtaw aldında «Qarap şığw» batırmasın qoldanıp sınaqtañız.',
+'usercssjsyoucanpreview'           => "'''Aqıl-keñes:''' Jaña CSS/JS faýlın saqtaw aldında «Qarap şığw» batırmasın qoldanıp sınaqtañız.",
 'usercsspreview'                   => "'''Mınaw CSS mätinin tek qarap şığw ekenin umıtpañız, ol äli saqtalğan joq!'''",
 'userjspreview'                    => "'''Mınaw JavaScript qatıswşı bağdarlamasın tekserw/qarap şığw ekenin umıtpañız, ol äli saqtalğan joq!'''",
 'userinvalidcssjstitle'            => "'''Qulaqtandırw:''' Osı arada «$1» degen eş mäner joq.
 Qatıswşınıñ .css jäne .js faýl atawı kişi äripppen jazılw tïisti ekenin umıtpañız, mısalğa {{ns:user}}:Foo/monobook.css degendi {{ns:user}}:Foo/Monobook.css degenmen salıstırıp qarañız.",
 'updated'                          => '(Jañartılğan)',
-'note'                             => '<strong>Añğartpa:</strong>',
-'previewnote'                      => '<strong>Mınaw tek qarap şığw ekenin umıtpañız;
-özgerister äli saqtalğan joq!</strong>',
+'note'                             => "'''Añğartpa:'''",
+'previewnote'                      => "'''Mınaw tek qarap şığw ekenin umıtpañız;
+özgerister äli saqtalğan joq!'''",
 'previewconflict'                  => 'Bul qarap şığw beti joğarğı kiristirw ornındağı mätindi qamtïdı da jäne saqtalğandağı öñdi körsetpek.',
-'session_fail_preview'             => '<strong>Ğafw etiñiz! Sessïya derekteri joğalwı saldarınan öñdemeñizdi bitire almaýmız.
-Qaýta baýqap köriñiz. Eger bul äli istelmese, şığwdı jäne qaýta kirwdi baýqap köriñiz.</strong>',
-'session_fail_preview_html'        => "<strong>Ğafw etiñiz! Sessïya derekteri joğalwı saldarınan öñdemeñizdi bitire almaýmız.</strong>
+'session_fail_preview'             => "'''Ğafw etiñiz! Sessïya derekteri joğalwı saldarınan öñdemeñizdi bitire almaýmız.
+Qaýta baýqap köriñiz. Eger bul äli istelmese, şığwdı jäne qaýta kirwdi baýqap köriñiz.'''",
+'session_fail_preview_html'        => "'''Ğafw etiñiz! Sessïya derekteri joğalwı saldarınan öñdemeñizdi bitire almaýmız.'''
 
 ''{{SITENAME}} jobasında qam HTML qosılğan, JavaScript şabwıldardan qorğanw üşin aldın ala qarap şığw jasırılğan.''
 
-<strong>Eger bul öñdeme adal talap bolsa, qaýta baýqap köriñiz. Eger bul äli istemese, şığwdı jäne qaýta kirwdi baýqap köriñiz.</strong>",
-'token_suffix_mismatch'            => '<strong>Öñdemeñiz taýdırıldı, sebebi tutınğışıñız öñdeme derekter bwmasındağı tınıs belgilerin büldirtti.
+'''Eger bul öñdeme adal talap bolsa, qaýta baýqap köriñiz. Eger bul äli istemese, şığwdı jäne qaýta kirwdi baýqap köriñiz.'''",
+'token_suffix_mismatch'            => "'''Öñdemeñiz taýdırıldı, sebebi tutınğışıñız öñdeme derekter bwmasındağı tınıs belgilerin büldirtti.
 Bet mätini bülinbew üşin öñdemeñiz taýdırıladı.
-Bul keý waqıtta qatesi tolğan veb-negizinde tirkelwi joq proksï-serverdi paýdalanğan bolwı mümkin.</strong>',
+Bul keý waqıtta qatesi tolğan veb-negizinde tirkelwi joq proksï-serverdi paýdalanğan bolwı mümkin.'''",
 'editing'                          => 'Öñdelwde: $1',
 'editingsection'                   => 'Öñdelwde: $1 (bölimi)',
 'editingcomment'                   => 'Öñdelwde: $1 (mändemesi)',
@@ -987,30 +953,30 @@ Tömengi kiristirw ornında siz özgertken mätini körsetiledi.
 «Betti saqta! batırmasın basqanda '''tek''' joğarğı kiristirw ornındağı mätin saqtaladı.",
 'yourtext'                         => 'Mätiniñiz',
 'storedversion'                    => 'Saqtalğan nusqası',
-'nonunicodebrowser'                => '<strong>QULAQTANDIRW: Şolğışıñız Unicode belgilewine üýlesimdi emes, sondıqtan latın emes äripteri bar betterdi öñdew zil bolw mümkin.
-Jumıs istewge ıqtïmaldıq berw üşin, tömendegi kiristirw ornında ASCII emes tañbalar onaltılıq kodımen körsetiledi</strong>.',
-'editingold'                       => '<strong>QULAQTANDIRW: Osı bettiñ erterek tüzetwin öñdep jatırsız.
-Bunı saqtasañız, osı tüzetwden keýingi barlıq özgerister joýıladı.</strong>',
+'nonunicodebrowser'                => "'''QULAQTANDIRW: Şolğışıñız Unicode belgilewine üýlesimdi emes, sondıqtan latın emes äripteri bar betterdi öñdew zil bolw mümkin.
+Jumıs istewge ıqtïmaldıq berw üşin, tömendegi kiristirw ornında ASCII emes tañbalar onaltılıq kodımen körsetiledi'''.",
+'editingold'                       => "'''QULAQTANDIRW: Osı bettiñ erterek tüzetwin öñdep jatırsız.
+Bunı saqtasañız, osı tüzetwden keýingi barlıq özgerister joýıladı.'''",
 'yourdiff'                         => 'Aýırmalar',
-'copyrightwarning'                 => 'Añğartpa: {{SITENAME}} jobasına berilgen barlıq ülester $2 (köbirek aqparat üşin: $1) qujatına saý dep sanaladı.
+'copyrightwarning'                 => "Añğartpa: {{SITENAME}} jobasına berilgen barlıq ülester $2 (köbirek aqparat üşin: $1) qujatına saý dep sanaladı.
 Eger jazwıñızdıñ erkin öñdelwin jäne aqısız köpşilikke taratwın qalamasañız, mında jarïyalamawıñız jön.<br />
 Tağı da, bul mağlumat öziñiz jazğanıñızğa, ne qoğam qazınasınan nemese sondaý aşıq qorlardan köşirilgenine bizge wäde beresiz.
-<strong>AWTORLIQ QUQIQPEN QORĞAWLI MAĞLUMATTI RUQSATSIZ JAR�YALAMAÑIZ!</strong>',
-'copyrightwarning2'                => 'Añğartpa: {{SITENAME}} jobasına berilgen barlıq ülesterdi basqa üleskerler öñdewge, özgertwge, ne alastawğa mümkin.
+'''AWTORLIQ QUQIQPEN QORĞAWLI MAĞLUMATTI RUQSATSIZ JAR�YALAMAÑIZ!'''",
+'copyrightwarning2'                => "Añğartpa: {{SITENAME}} jobasına berilgen barlıq ülesterdi basqa üleskerler öñdewge, özgertwge, ne alastawğa mümkin.
 Eger jazwıñızdıñ erkin öñdelwin qalamasañız, mında jarïyalamawıñız jön.<br />
 Tağı da, bul mağlumat öziñiz jazğanıñızğa, ne qoğam qazınasınan nemese sondaý aşıq qorlardan köşirilgenine bizge wäde beresiz (köbirek aqparat üşin $1 qwjatın qarañız).
-<strong>AWTORLIQ QUQIQPEN QORĞAWLI MAĞLUMATTI RUQSATSIZ JAR�YALAMAÑIZ!</strong>',
-'longpagewarning'                  => '<strong>QULAQTANDIRW: Bul bettiñ mölşeri — $1 kB;
+'''AWTORLIQ QUQIQPEN QORĞAWLI MAĞLUMATTI RUQSATSIZ JAR�YALAMAÑIZ!'''",
+'longpagewarning'                  => "'''QULAQTANDIRW: Bul bettiñ mölşeri — $1 kB;
 keýbir şolğıştarda bet mölşeri 32 kB jetse ne onı assa öñdew kürdeli bolwı mümkin.
-Betti birneşe kişkin bölimderge bölip köriñiz.</strong>',
-'longpageerror'                    => '<strong>QATELİK: Jöneltpek mätiniñizdin mölşeri — $1 KB, eñ köbi $2 KB ruqsat etilgen mölşerinen asqan.
-Bul saqtaý alınbaýdı.</strong>',
-'readonlywarning'                  => '<strong>QULAQTANDIRW: Derekqor baptaw üşin qulıptalğan, sondıqtan däl qazir öñdemeñizdi saqtaý almaýsız.
-Keýin qoldanw üşin mätändi qýıp alıp jäne qoýıp, mätin faýlına saqtawñızğa boladı.</strong>',
-'protectedpagewarning'             => '<strong>QULAQTANDIRW: Bul bet qorğalğan. Tek äkimşi quqıqtarı bar qatıswşılar öñdeý aladı.</strong>',
+Betti birneşe kişkin bölimderge bölip köriñiz.'''",
+'longpageerror'                    => "'''QATELİK: Jöneltpek mätiniñizdin mölşeri — $1 KB, eñ köbi $2 KB ruqsat etilgen mölşerinen asqan.
+Bul saqtaý alınbaýdı.'''",
+'readonlywarning'                  => "'''QULAQTANDIRW: Derekqor baptaw üşin qulıptalğan, sondıqtan däl qazir öñdemeñizdi saqtaý almaýsız.
+Keýin qoldanw üşin mätändi qýıp alıp jäne qoýıp, mätin faýlına saqtawñızğa boladı.'''",
+'protectedpagewarning'             => "'''QULAQTANDIRW: Bul bet qorğalğan. Tek äkimşi quqıqtarı bar qatıswşılar öñdeý aladı.'''",
 'semiprotectedpagewarning'         => "'''Añğartpa:''' Bet jartılaý qorğalğan, sondıqtan osını tek tirkelgen qatıswşılar öñdeý aladı.",
 'cascadeprotectedwarning'          => "'''Qulaqtandırw''': Bul bet qulıptalğan, endi tek äkimşi quqıqtarı bar qatıswşılar bunı öñdeý aladı.Bunıñ sebebi: bul bet «bawlı qorğawı» bar kelesi {{PLURAL:$1|bettiñ|betterdiñ}} kirikbeti:",
-'titleprotectedwarning'            => '<strong>QULAQTANDIRW:  Bul bet qulıptalğan, sondıqtan tek birqatar qatıswşılar bunı bastaý aladı.</strong>',
+'titleprotectedwarning'            => "'''QULAQTANDIRW:  Bul bet qulıptalğan, sondıqtan tek birqatar qatıswşılar bunı bastaý aladı.'''",
 'templatesused'                    => 'Bul bette qoldanılğan ülgiler:',
 'templatesusedpreview'             => 'Bunı qarap şığwğa qoldanılğan ülgiler:',
 'templatesusedsection'             => 'Bul bölimde qoldanılğan ülgiler:',
@@ -1056,11 +1022,9 @@ $3 keltirilgen sebebi: ''$2''",
 # History pages
 'viewpagelogs'        => 'Bul bet üşin jwrnal oqïğaların qaraw',
 'nohistory'           => 'Mında bul bettiniñ tüzetw tarïxı joq.',
-'revnotfound'         => 'Tüzetw tabılmadı',
-'revnotfoundtext'     => 'Bul bettiñ suralğan eski tüzetwi tabılğan joq. Osı bet qatınawına paýdalanğan URL tekserip şığıñız.',
 'currentrev'          => 'Ağımdıq tüzetw',
 'revisionasof'        => '$1 kezindegi tüzetw',
-'revision-info'       => '$1 kezindegi $2 istegen tüzetw',
+'revision-info'       => '$1 kezindegi $2 istegen tüzetw', # Additionally available: $3: revision id
 'previousrevision'    => '� Eskilew tüzetwi',
 'nextrevision'        => 'Jañalaw tüzetwi →',
 'currentrevisionlink' => 'Ağımdıq tüzetwi',
@@ -1193,6 +1157,7 @@ Añğartpa: bağıttaw siltemelerin qoldanğanda bul bağan qaýta qoýıladı.'
 'prevn'                     => 'aldıñğı $1',
 'nextn'                     => 'kelesi $1',
 'viewprevnext'              => 'Körsetilwi: ($1) ($2) ($3) jazba',
+'searchhelp-url'            => 'Help:Mazmunı',
 'search-result-size'        => '$1 ($2 söz)',
 'search-result-score'       => 'Araqatınastılığı: $1 %',
 'search-redirect'           => '(aýdağış $1)',
@@ -1236,6 +1201,7 @@ Añğartpa: {{SITENAME}} torabınıñ mağlumat tizbeleri eskirgen bolwı mümki
 'qbsettings-floatingright' => 'Oñğa qalqığan',
 'changepassword'           => 'Qupïya sözdi özgertw',
 'skin'                     => 'Mänerler',
+'skin-preview'             => 'Qarap şığw',
 'math'                     => 'Örnekter',
 'dateformat'               => 'Kün-aý pişimi',
 'datedefault'              => 'Eş qalawsız',
@@ -1259,9 +1225,6 @@ baptaw üşin math/README qujatın qarañız.',
 'prefs-misc'               => 'Ärqïlı',
 'saveprefs'                => 'Saqta',
 'resetprefs'               => 'Saqtalmağan özgeristerdi tazart',
-'oldpassword'              => 'Ağımdıq qupïya söziñiz:',
-'newpassword'              => 'Jaña qupïya söziñiz:',
-'retypenew'                => 'Jaña qupïya söziñizdi qaýtalañız:',
 'textboxsize'              => 'Öñdew',
 'rows'                     => 'Joldar:',
 'columns'                  => 'BaÄŸandar:',
@@ -1291,7 +1254,7 @@ baptaw üşin math/README qujatın qarañız.',
 'userrights-lookup-user'      => 'Qatıswşı toptarın rettew',
 'userrights-user-editname'    => 'Qatıswşı atın engiziñiz:',
 'editusergroup'               => 'Qatıswşı toptarın öñdew',
-'editinguser'                 => "Qatıswşı quqıqtarın özgertw: '''[[User:$1|$1]]''' ([[User_talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Qatıswşı quqıqtarın özgertw: '''[[User:$1|$1]]''' ([[User_talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Qatıswşı toptarın öñdew',
 'saveusergroups'              => 'Qatıswşı toptarın saqtaw',
 'userrights-groupsmember'     => 'Müşeligi:',
@@ -1437,11 +1400,11 @@ baptaw üşin math/README qujatın qarañız.',
 'upload_directory_read_only'  => 'Qotarıp bermek qaltasına ($1) veb-server jaza almaýdı.',
 'uploaderror'                 => 'Qotarıp berw qatesi',
 'uploadtext'                  => "Tömendegi pişindi faýldardı qotarıp berw üşin qoldanıñız. 
-Aldında qotarılıp berilgen faýldardı qaraw ne izdew üşin [[{{#special:Imagelist}}|qotarıp berilgen faýldar tizimine]] barıñız, tağı da qotarıp berwi men joywı  [[{{#special:Log}}/upload|qotarıp berw jwrnalına]] jazılıp alınadı.
+Aldında qotarılıp berilgen faýldardı qaraw ne izdew üşin [[{{#special:FileList}}|qotarıp berilgen faýldar tizimine]] barıñız, tağı da qotarıp berwi men joywı  [[{{#special:Log}}/upload|qotarıp berw jwrnalına]] jazılıp alınadı.
 
 Swretti betke kiristirwge, faýlğa twra siltew üşin mına pişindegi siltemeni qoldanıñız:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|balama mätin]]</nowiki>''' ne
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|balama mätin]]</nowiki>''' ne
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>'''.",
 'upload-permitted'            => 'Ruqsat etilgen faýl türleri: $1.',
 'upload-preferred'            => 'Unamdı faýl türleri $1.',
@@ -1470,25 +1433,25 @@ bul faýl mölşeri — $2.',
 'largefileserver'             => 'Osı faýldıñ mölşeri serverdiñ qalawınan asıp ketken.',
 'emptyfile'                   => 'Qotarıp berilgen faýlıñız bos sïyaqtı. Faýl atawı qate jazılğan mümkin.
 Bul faýldı qotarıp berwi naqtı talabıñız ekenin tekserip şığıñız.',
-'fileexists'                  => 'Bılaý atalğan faýl aldaqaşan bar, eger bunı özgertwge batılıñız joq bolsa <strong><tt>$1</tt></strong> degendi tekserip şığıñız.',
-'filepageexists'              => 'Bul faýldıñ sïpattama beti aldaqaşan <strong><tt>$1</tt></strong> degende jasalğan, biraq ağımda bılaý atalğan eş faýl joq.
+'fileexists'                  => "Bılaý atalğan faýl aldaqaşan bar, eger bunı özgertwge batılıñız joq bolsa '''<tt>$1</tt>''' degendi tekserip şığıñız.",
+'filepageexists'              => "Bul faýldıñ sïpattama beti aldaqaşan '''<tt>$1</tt>''' degende jasalğan, biraq ağımda bılaý atalğan eş faýl joq.
 Engizgen qısqaşa mazmundamañız sïpattaması betinde körsetilmeýdi.
-Qısqaşa mazmundamañız osı arada körsetilw üşin, bunı qolmen öñdemek bolıñız',
-'fileexists-extension'        => 'Uqsas atawı bar faýl tabıldı:<br />
-Qotarıp beriletin faýl atawı: <strong><tt>$1</tt></strong><br />
-Bar bolğan faýl atawı: <strong><tt>$2</tt></strong><br />
-Özge atawdı tañdañız.',
+Qısqaşa mazmundamañız osı arada körsetilw üşin, bunı qolmen öñdemek bolıñız",
+'fileexists-extension'        => "Uqsas atawı bar faýl tabıldı:<br />
+Qotarıp beriletin faýl atawı: '''<tt>$1</tt>'''<br />
+Bar bolğan faýl atawı: '''<tt>$2</tt>'''<br />
+Özge atawdı tañdañız.",
 'fileexists-thumb'            => "<center>'''Bar bolÄŸan swret'''</center>",
-'fileexists-thumbnail-yes'    => 'Osı faýl — mölşeri kişiritilgen swret <i>(nobaý)</i> sïyaqtı.
-Bul <strong><tt>$1</tt></strong> degen faýldı sınap şığıñız.<br />
-Eger sınalğan faýl tüpnusqalı mölşeri bar dälme-däl swret bolsa, qosısmşa nobaýdı qotarıp berw keregi joq.',
-'file-thumbnail-no'           => 'Faýl atawı <strong><tt>$1</tt></strong> degenmen bastaladı.
-Bul — mölşeri kişiritilgen swret <i>(nobaý)</i> sïyaqtı.
-Eger bul swrettiñ tolıq ajıratılımdığı bolsa, bunı qotarıp beriñiz, äýtpese faýl atawın özgertiñiz.',
+'fileexists-thumbnail-yes'    => "Osı faýl — mölşeri kişiritilgen swret ''(nobaý)'' sïyaqtı.
+Bul '''<tt>$1</tt>''' degen faýldı sınap şığıñız.<br />
+Eger sınalğan faýl tüpnusqalı mölşeri bar dälme-däl swret bolsa, qosısmşa nobaýdı qotarıp berw keregi joq.",
+'file-thumbnail-no'           => "Faýl atawı '''<tt>$1</tt>''' degenmen bastaladı.
+Bul — mölşeri kişiritilgen swret ''(nobaý)'' sïyaqtı.
+Eger bul swrettiñ tolıq ajıratılımdığı bolsa, bunı qotarıp beriñiz, äýtpese faýl atawın özgertiñiz.",
 'fileexists-forbidden'        => 'Osılaý atalğan faýl aldaqaşan bar;
-keri qaýtıñız da, osı faýldı jaña atımen qotarıp beriñiz. [[{{ns:image}}:$1|thumb|center|$1]]',
+keri qaýtıñız da, osı faýldı jaña atımen qotarıp beriñiz. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Osılaý atalğan faýl ortaq qoýmada aldaqaşan bar;
-keri qaýtıñız da, osı faýldı jaña atımen qotarıp beriñiz. [[{{ns:image}}:$1|thumb|center|$1]]',
+keri qaýtıñız da, osı faýldı jaña atımen qotarıp beriñiz. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Bul faýl kelesi {{PLURAL:$1|faýldıñ|faýldarınıñ}} telnusqası:',
 'successfulupload'            => 'Sätti qotarıp berildi',
 'uploadwarning'               => 'Qotarıp berw jöninde qulaqtandırw',
@@ -1511,8 +1474,8 @@ Bunı qaýta qotarıp berw aldınan $1 degendi tekserip şığıñız.',
 
 Bul faýldı qotarıp berwin jalğastırw üşin bunıñ ıñğaýlığın tekserip şığwıñız jön.
 Qolaýlı bolwı üşin bul faýldıñ joyw jwrnalı keltirilgen:",
-'filename-bad-prefix'         => 'Qotarıp bermek faýlıñızdıñ atawı <strong>«$1» </strong> dep bastaladı, mınadaý sïpattawsız atawdı ädette sandıq kameralar özdiktik beredi.
-Faýlıñızğa sïpattılaw atawdı tañdañız.',
+'filename-bad-prefix'         => "Qotarıp bermek faýlıñızdıñ atawı '''«$1» ''' dep bastaladı, mınadaý sïpattawsız atawdı ädette sandıq kameralar özdiktik beredi.
+Faýlıñızğa sïpattılaw atawdı tañdañız.",
 
 'upload-proto-error'      => 'Burıs xattama',
 'upload-proto-error-text' => 'Şetten qotarıp berw üşin URL jaýları <code>http://</code> nemese <code>ftp://</code> degenderden bastalw jön.',
@@ -1539,20 +1502,20 @@ Talabıñızdı qol tïgen kezinde qaýta baýqap körwiñiz mümkin.',
 'upload_source_url'  => ' (jaramdı, barşağa qatınawlı URL)',
 'upload_source_file' => ' (komp′ywteriñizdegi faýl)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Bul arnaýı bette barlıq qotarıp berilgen faýldar körsetiledi.
+# Special:ListFiles
+'listfiles-summary'     => 'Bul arnaýı bette barlıq qotarıp berilgen faýldar körsetiledi.
 Soñğı qotarıp berilgen faýldar tizimde joğarğı şetimen ädepkiden körsetiledi.
 Bağannıñ bas jolın nuqığanda surıptawdıñ rettewi özgertiledi.',
-'imagelist_search_for'  => 'Taspa atawın izdew:',
+'listfiles_search_for'  => 'Taspa atawın izdew:',
 'imgfile'               => 'faýl',
-'imagelist'             => 'Faýl tizimi',
-'imagelist_date'        => 'Kün-aýı',
-'imagelist_name'        => 'Atawı',
-'imagelist_user'        => 'Qatıswşı',
-'imagelist_size'        => 'Mölşeri',
-'imagelist_description' => 'Sïpattaması',
-
-# Image description page
+'listfiles'             => 'Faýl tizimi',
+'listfiles_date'        => 'Kün-aýı',
+'listfiles_name'        => 'Atawı',
+'listfiles_user'        => 'Qatıswşı',
+'listfiles_size'        => 'Mölşeri',
+'listfiles_description' => 'Sïpattaması',
+
+# File description page
 'filehist'                       => 'Faýl tarïxı',
 'filehist-help'                  => 'Faýldıñ qaý waqıtta qalaý körinetin üşin Kün-aý/Waqıt degendi nuqıñız.',
 'filehist-deleteall'             => 'barlığın joý',
@@ -1604,8 +1567,6 @@ Bağannıñ bas jolın nuqığanda surıptawdıñ rettewi özgertiledi.',
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[{{ns:media}}:$1|$1]]\'\'\' — $3, $2 kezindegi nusqası joýıldı.</span>',
 'filedelete-nofile'           => "'''$1''' degen {{SITENAME}} jobasında joq.",
 'filedelete-nofile-old'       => "Keltirilgen anıqtawıştarımen '''$1''' degenniñ murağattalğan nusqası mında joq.",
-'filedelete-iscurrent'        => 'Bul faýldıñ eñ soñğı nusqasın joyw talap etkensiz.
-Eñ aldınan eskilew nusqasına qaýtarıñız.',
 'filedelete-otherreason'      => 'Basqa/qosımşa sebep:',
 'filedelete-reason-otherlist' => 'Basqa sebep',
 'filedelete-reason-dropdown'  => '* Joywdıñ jalpı sebepteri
@@ -1641,21 +1602,9 @@ Kirisi: mağlumat_türi/tür_tarawı, mısalı <tt>image/jpeg</tt>.',
 'randomredirect-nopages' => 'Bul esim ayasında eş aýdağış joq.',
 
 # Statistics
-'statistics'             => 'Sanaq',
-'sitestats'              => '{{SITENAME}} sanağı',
-'userstats'              => 'Qatıswşı sanağı',
-'sitestatstext'          => "Derekqorda {{PLURAL:$1|'''1'''|jalpı '''$1'''}} bet bar.
-Buğan «talqılaw» betteri, {{SITENAME}} jobası twralı better, tım qısqa «biteme» betteri, aýdağıştar, tağı da basqa mağlumat dep tanılmaýtın better kiristirledi.
-Solardı esepten şığarğanda, mında mağlumat {{PLURAL:$2|beti|betteri}} dep sanalatın '''$2''' bet bar dep boljanadı.
-
-'''$8''' faýl qotarıp berildi.
-
-{{SITENAME}} ornatılğannan beri better {{PLURAL:$3|'''1'''|jalpı '''$3'''}} ret qaralğan, jäne better '''$4''' ret öñdelgen.
-Bunıñ nätïjesinde ortaşa eseppen ärbir betke '''$5''' öñdeme keledi, jäne ärbir öñdemege '''$6''' qaraw keledi.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Tapsırımalar kezeginiñ] uzındığı: '''$7'''.",
-'userstatstext'          => "Mında '''$1''' [[{{#special:Listusers}}|tirkelgen qatıswşı]] bar, sonıñ işinde '''$2''' (ne '''$4 %''') qatıswşısında $5 quqıqtarı bar",
-'statistics-mostpopular' => 'Eñ köp qaralğan better',
+'statistics'              => 'Sanaq',
+'statistics-header-users' => 'Qatıswşı sanağı',
+'statistics-mostpopular'  => 'Eñ köp qaralğan better',
 
 'disambiguations'      => 'Aýrıqtı better',
 'disambiguationspage'  => '{{ns:template}}:Aýrıq',
@@ -1697,7 +1646,6 @@ Eger [[{{ns:mediawiki}}:Disambiguationspage]] tizimindegi ülgi qoldanılsa, bet
 'popularpages'            => 'Eñ köp qaralğan better',
 'wantedcategories'        => 'BastalmaÄŸan sanattar',
 'wantedpages'             => 'BastalmaÄŸan better',
-'missingfiles'            => 'Joq faýldar',
 'mostlinked'              => 'Eñ köp siltengen better',
 'mostlinkedcategories'    => 'Eñ köp paýdalanılğan sanattar',
 'mostlinkedtemplates'     => 'Eñ köp paýdalanılğan ülgiler',
@@ -1743,8 +1691,6 @@ Eger [[{{ns:mediawiki}}:Disambiguationspage]] tizimindegi ülgi qoldanılsa, bet
 'speciallogtitlelabel' => 'Taqırıp atı:',
 'log'                  => 'Jwrnaldar',
 'all-logs-page'        => 'Barlıq jwrnaldar',
-'log-search-legend'    => 'Jwrnaldardan izdew',
-'log-search-submit'    => 'Öt',
 'alllogstext'          => '{{SITENAME}} jobasınıñ barlıq qatınawlı jwrnaldarın biriktirip körsetwi.
 Jwrnal türin, qatıswşı atın, ne tïisti betin bölektep, tarıltıp qaraý alasız.',
 'logempty'             => 'Jwrnalda säýkes danalar joq.',
@@ -1774,11 +1720,29 @@ Mında taqırıp atında qoldalmaýtın birqatar tañbalar bolwı mümkin.',
 'special-categories-sort-count' => 'sanımen surıptaw',
 'special-categories-sort-abc'   => 'älipbïmen surıptaw',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Qatıswşınıñ joýılğan ülesi',
+
+# Special:LinkSearch
+'linksearch'       => 'Sırtqı siltemelerdi izdew',
+'linksearch-pat'   => 'İzdew şartı:',
+'linksearch-ns'    => 'Esim ayası:',
+'linksearch-ok'    => 'Ä°zdew',
+'linksearch-text'  => '«*.wikipedia.org» atawına uqsastı bädel nışandardı qoldanwğa boladı.',
+'linksearch-line'  => '$2 degennen $1 siltegen',
+'linksearch-error' => 'Bädel nışandar tek server jaýı atawınıñ bastawında bolwı mümkin.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Mına qatıswşıdan bastap körsetw:',
 'listusers-submit'   => 'Körset',
 'listusers-noresult' => 'Qatıswşı tabılğan joq.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Tirkelw jwrnalı',
+'newuserlogpagetext'       => 'Bul qatıswşı tirkelgi jasaw jwrnalı',
+'newuserlog-create-entry'  => 'Jaña qatıswşı',
+'newuserlog-create2-entry' => 'jaña tirkelgi jasadı — $1',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Qatıswşı tobı quqıqtarı',
 'listgrouprights-summary'  => 'Kelesi tizimde bul wïkïde tağaýındalğan qatıswşı quqıqtarı (baýlanıstı qatınaw quqıqtarımen birge) körsetiledi.
@@ -1838,12 +1802,6 @@ Bul bettiñ jäne baýlanıstı talqılaw betiniñ keleşektegi özgeristeri mı
 'iteminvalidname'      => "'$1' danada aqaw bar — jaramsız ataw…",
 'wlnote'               => "Tömende soñğı {{PLURAL:$2|sağatta|'''$2''' sağatta}} bolğan, {{PLURAL:$1|jwıqtağı özgeris|jwıqtağı '''$1''' özgeris}} körsetiledi.",
 'wlshowlast'           => 'Soñğı $1 sağattağı, $2 kündegi, $3 bolğan özgeristi körsetw',
-'watchlist-show-bots'  => 'Bot öñdemelerin körset',
-'watchlist-hide-bots'  => 'Bot öñdemelerin jasır',
-'watchlist-show-own'   => 'Öñdemelerimdi körset',
-'watchlist-hide-own'   => 'Öñdemelerimdi jasır',
-'watchlist-show-minor' => 'Şağın öñdemelerdi körset',
-'watchlist-hide-minor' => 'Şağın öñdemelerdi jasır',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Baqılawda…',
@@ -1884,57 +1842,61 @@ Baqılaw tizimiñizdiñ baptawlırın özgertw üşin, mında kelip-ketiñiz:
 Sın-pikir berw jäne bılaýğı järdem alw üşin:
 {{fullurl:{{{{ns:mediawiki}}:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Betti joyw',
-'confirm'                     => 'Quptaw',
-'excontent'                   => "bolğan mağlumatı: '$1'",
-'excontentauthor'             => "bolğan mağlumatı (tek '[[{{#special:Contributions}}/$2|$2]]' ülesi): '$1'",
-'exbeforeblank'               => "tazartw aldındağı bolğan mağlumatı: '$1'",
-'exblank'                     => 'bet bos boldı',
-'delete-confirm'              => '«$1» degendi joyw',
-'delete-legend'               => 'Joyw',
-'historywarning'              => 'Qulaqtandırw: Joywı közdelgen bette tarïxı bar:',
-'confirmdeletetext'           => 'Betti bükil tarïxımen birge derekqordan joýywın kozdediñiz.
+# Delete
+'deletepage'             => 'Betti joyw',
+'confirm'                => 'Quptaw',
+'excontent'              => "bolğan mağlumatı: '$1'",
+'excontentauthor'        => "bolğan mağlumatı (tek '[[{{#special:Contributions}}/$2|$2]]' ülesi): '$1'",
+'exbeforeblank'          => "tazartw aldındağı bolğan mağlumatı: '$1'",
+'exblank'                => 'bet bos boldı',
+'delete-confirm'         => '«$1» degendi joyw',
+'delete-legend'          => 'Joyw',
+'historywarning'         => 'Qulaqtandırw: Joywı közdelgen bette tarïxı bar:',
+'confirmdeletetext'      => 'Betti bükil tarïxımen birge derekqordan joýywın kozdediñiz.
 Osını istew nïetiñizdi, saldarın baýımdawıñızdı jäne [[{{{{ns:mediawiki}}:Policy-url}}]] degenge laýıqtı dep istemektengeñizdi quptañız.',
-'actioncomplete'              => 'Äreket bitti',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» joýıldı.
+'actioncomplete'         => 'Äreket bitti',
+'deletedtext'            => '«<nowiki>$1</nowiki>» joýıldı.
 Jwıqtağı joywlar twralı jazbaların $2 degennen qarañız.',
-'deletedarticle'              => '«[[$1]]» degendi joýdı',
-'suppressedarticle'           => '«[[$1]]» degendi şettetti',
-'dellogpage'                  => 'Joyw_jwrnalı',
-'dellogpagetext'              => 'Tömende jwıqtağı joywlardıñ tizimi berilgen.',
-'deletionlog'                 => 'joyw jwrnalı',
-'reverted'                    => 'Erterek tüzetwine qaýtarılğan',
-'deletecomment'               => 'Joywdıñ sebebi:',
-'deleteotherreason'           => 'Basqa/qosımşa sebep:',
-'deletereasonotherlist'       => 'Basqa sebep',
-'deletereason-dropdown'       => '* Joywdıñ jalpı sebepteri
+'deletedarticle'         => '«[[$1]]» degendi joýdı',
+'suppressedarticle'      => '«[[$1]]» degendi şettetti',
+'dellogpage'             => 'Joyw_jwrnalı',
+'dellogpagetext'         => 'Tömende jwıqtağı joywlardıñ tizimi berilgen.',
+'deletionlog'            => 'joyw jwrnalı',
+'reverted'               => 'Erterek tüzetwine qaýtarılğan',
+'deletecomment'          => 'Joywdıñ sebebi:',
+'deleteotherreason'      => 'Basqa/qosımşa sebep:',
+'deletereasonotherlist'  => 'Basqa sebep',
+'deletereason-dropdown'  => '* Joywdıñ jalpı sebepteri
 ** Awtordıñ suranımı boýınşa
 ** Awtorlıq quqıqtarın buzw
 ** Buzaqılıq',
-'delete-edit-reasonlist'      => 'Joyw sebepterin öñdew',
-'delete-toobig'               => 'Bul bette baýtaq tüzetw tarïxı bar, $1 tüzetwden astam.
+'delete-edit-reasonlist' => 'Joyw sebepterin öñdew',
+'delete-toobig'          => 'Bul bette baýtaq tüzetw tarïxı bar, $1 tüzetwden astam.
 Bundaý betterdiñ joywı {{SITENAME}} torabın äldeqalaý üzip tastawına böget salw üşin tïımdalğan.',
-'delete-warning-toobig'       => 'Bul bette baýtaq tüzetw tarïxı bar, $1 tüzetwden astam.
+'delete-warning-toobig'  => 'Bul bette baýtaq tüzetw tarïxı bar, $1 tüzetwden astam.
 Bunıñ joywı {{SITENAME}} torabındağı derekqor äreketterdi üzip tastawın mümkin;
 bunı abaýlap ötkiziñiz.',
-'rollback'                    => 'Öñdemelerdi şegindirw',
-'rollback_short'              => 'Åžegindirw',
-'rollbacklink'                => 'ÅŸegindirw',
-'rollbackfailed'              => 'Şegindirw sätsiz bitti',
-'cantrollback'                => 'Öñdeme qaýtarılmadı;
+
+# Rollback
+'rollback'         => 'Öñdemelerdi şegindirw',
+'rollback_short'   => 'Åžegindirw',
+'rollbacklink'     => 'ÅŸegindirw',
+'rollbackfailed'   => 'Şegindirw sätsiz bitti',
+'cantrollback'     => 'Öñdeme qaýtarılmadı;
 soñğı üleskeri tek osı bettiñ bastawşısı boldı.',
-'alreadyrolled'               => '[[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|talqılawı]]) istegen [[:$1]] soñğı öñdemesi şegindirilmedi;
+'alreadyrolled'    => '[[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|talqılawı]]) istegen [[:$1]] soñğı öñdemesi şegindirilmedi;
 basqa birew bul betti aldaqaşan öñdegen ne şegindirgen.
 
 soñğı öñdemesin [[{{ns:user}}:$3|$3]] ([[{{ns:user_talk}}:$3|talqılawı]]) istegen.',
-'editcomment'                 => 'Bolğan öñdeme mändemesi: «<i>$1</i>».', # only shown if there is an edit comment
-'revertpage'                  => '[[{{#special:Contributions}}/$2|$2]] ([[{{ns:user_talk}}:$2|talqılawı]]) öñdemelerinen [[{{ns:user}}:$1|$1]] soñğı nusqasına qaýtardı', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 öñdemelerinen qaýtarğan;
+'editcomment'      => "Bolğan öñdeme mändemesi: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => '[[{{#special:Contributions}}/$2|$2]] ([[{{ns:user_talk}}:$2|talqılawı]]) öñdemelerinen [[{{ns:user}}:$1|$1]] soñğı nusqasına qaýtardı', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 öñdemelerinen qaýtarğan;
 $2 soñğı nusqasına özgertti.',
-'sessionfailure'              => 'Kirw sessïyasında şataq bolğan sïyaqtı;
+'sessionfailure'   => 'Kirw sessïyasında şataq bolğan sïyaqtı;
 sessïyağa şabwıldawdardan qorğanw üşin, osı äreket toqtatıldı.
 «Artqa» degendi basıñız, jäne betti qaýta jükteñiz de, qaýta baýqap köriñiz.',
+
+# Protect
 'protectlogpage'              => 'Qorğaw jwrnalı',
 'protectlogtext'              => 'Tömende betterdiñ qorğaw/qorğamaw tizimi berilgen.
 Ağımdağı qorğaw ärektter bar better üşin [[{{#special:Protectedpages}}|qorğalğan bet tizimin]] qarañız.',
@@ -1942,19 +1904,20 @@ Ağımdağı qorğaw ärektter bar better üşin [[{{#special:Protectedpages}}|q
 'modifiedarticleprotection'   => '«[[$1]]» qorğalw deñgeýi özgerdi',
 'unprotectedarticle'          => '«[[$1]]» qorğalwı öşirildi',
 'protect-title'               => '«$1» qorğaw deñgeýin özgertw',
+'prot_1movedto2'              => '[[$1]] degendi [[$2]] degenge jıljıttı',
 'protect-legend'              => 'Qorğawdı quptaw',
 'protectcomment'              => 'Mändemesi:',
 'protectexpiry'               => 'Merzimi bitpek:',
 'protect_expiry_invalid'      => 'Bitetin waqıtı jaramsız.',
 'protect_expiry_old'          => 'Bitetin waqıtı ötip ketken.',
 'protect-unchain'             => 'Jıljıtw ruqsattarın berw',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> betiniñ qorğaw deñgeýin qarap jäne özgertip şığa alasız.',
-'protect-locked-blocked'      => 'Buğattawıñız öşirilgenşe deýin qorğaw deñgeýin özgerte almaýsız.
-Mına <strong>$1</strong> bettiñ ağımdıq baptawları:',
-'protect-locked-dblock'       => 'Derekqordıñ qulıptawı belsendi bolğandıqtan qorğaw deñgeýleri özgertilmeýdi.
-Mına <strong>$1</strong> bettiñ ağımdıq baptawları:',
-'protect-locked-access'       => 'Tirkelgiñizge bet qorğaw dengeýlerin özgertwine ruqsat joq.
-Mına <strong>$1</strong> bettiñ ağımdıq baptawları:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' betiniñ qorğaw deñgeýin qarap jäne özgertip şığa alasız.",
+'protect-locked-blocked'      => "Buğattawıñız öşirilgenşe deýin qorğaw deñgeýin özgerte almaýsız.
+Mına '''$1''' bettiñ ağımdıq baptawları:",
+'protect-locked-dblock'       => "Derekqordıñ qulıptawı belsendi bolğandıqtan qorğaw deñgeýleri özgertilmeýdi.
+Mına '''$1''' bettiñ ağımdıq baptawları:",
+'protect-locked-access'       => "Tirkelgiñizge bet qorğaw dengeýlerin özgertwine ruqsat joq.
+Mına '''$1''' bettiñ ağımdıq baptawları:",
 'protect-cascadeon'           => 'Bul bet ağımda qorğalğan, sebebi osı bet «bawlı qorğawı» bar kelesi {{PLURAL:$1|bettiñ|betterdiñ}} kirikbeti.
 Bul bettiñ qorğaw deñgeýin özgerte alasız, biraq bul bawlı qorğawğa ıqpal etpeýdi.',
 'protect-default'             => '(ädepki)',
@@ -1965,6 +1928,7 @@ Bul bettiñ qorğaw deñgeýin özgerte alasız, biraq bul bawlı qorğawğa ıq
 'protect-expiring'            => 'merzimi bitpek: $1 (UTC)',
 'protect-cascade'             => 'Bul bettiñ kirikbetterin qorğaw (bawlı qorğaw).',
 'protect-cantedit'            => 'Bul bettiñ qorğaw deñgeýin özgerte almaýsız, sebebi bunı öñdewge ruqstañız joq.',
+'protect-expiry-options'      => '2 sağat:2 hours,1 kün:1 day,3 kün:3 days,1 apta:1 week,2 apta:2 weeks,1 aý:1 month,3 aý:3 months,6 aý:6 months,1 jıl:1 year,mängi:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ruqsatı:',
 'restriction-level'           => 'Tïımdıq deñgeýi:',
 'minimum-size'                => 'Eñ az mölşeri',
@@ -2057,7 +2021,6 @@ $1',
 'whatlinkshere'            => 'Mında silteýtin better',
 'whatlinkshere-title'      => '$1 degenge silteýtin better',
 'whatlinkshere-page'       => 'Bet:',
-'linklistsub'              => '(Siltemeler tizimi)',
 'linkshere'                => "'''[[:$1]]''' degenge mına better silteýdi:",
 'nolinkshere'              => "'''[[:$1]]''' degenge eş bet siltemeýdi.",
 'nolinkshere-ns'           => "Tañdalğan esim ayasında '''[[:$1]]''' degenge eşqandaý bet siltemeýdi.",
@@ -2204,6 +2167,8 @@ osınıñ saldarın baýımdawıñızdı ärekettiñ aldınan batıl bolıñız.
 
 Osı oraýda, qalawıñız bolsa, betti qoldan jıljıta ne qosa alasız.",
 'movearticle'             => 'Jıljıtpaq bet:',
+'movenologin'             => 'Jüýege kirmegensiz',
+'movenologintext'         => 'Betti jıljıtw üşin tirkelgen bolwıñız jäne [[{{#special:Userlogin}}|kirwiñiz]] jön.',
 'movenotallowed'          => '{{SITENAME}} jobasında betterdi jıljıtw rwqsatıñız joq.',
 'newtitle'                => 'Jaña taqırıp atına:',
 'move-watch'              => 'Bul betti baqılaw',
@@ -2237,8 +2202,6 @@ Jıljıtwğa jol berw üşin bunı joyasız ba?',
 'delete_and_move_reason'  => 'Jıljıtwğa jol berw üşin joýılğan',
 'selfmove'                => 'Qaýnar jäne nısana taqırıp attarı birdeý;
 bet öziniñ üstine jıljıtılmaýdı.',
-'immobile_namespace'      => 'Qaýnar ne nısana taqırıp atı arnawlı türine jatadı;
-better bul esim ayası sırtına jäne işine jıljıtılmaýdı.',
 'imagenocrossnamespace'   => 'Faýl emes esim ayasına faýl jıljıtılmaýdı',
 'imagetypemismatch'       => 'Faýldıñ jaña keñeýtimi bunıñ türine säýkes emes',
 
@@ -2265,7 +2228,7 @@ Soñğı jağdaýda siltemeni de, mısalı «{{{{ns:mediawiki}}:Mainpage}}» bet
 'allmessagesdefault'        => 'Ädepki mätini',
 'allmessagescurrent'        => 'Ağımdıq mätini',
 'allmessagestext'           => 'Mında {{ns:mediawiki}} esim ayasında jetimdi jüýe xabar tizimi beriledi.
-Eger ämbebap MediaWiki jersindirwge üles qosqıñız kelse [http://www.mediawiki.org/wiki/Localisation MediaWiki jersindirw betine] jäne [http://translatewiki.net Betawiki jobasına] barıp şığıñız.',
+Eger ämbebap MediaWiki jersindirwge üles qosqıñız kelse [http://www.mediawiki.org/wiki/Localisation MediaWiki jersindirw betine] jäne [http://translatewiki.net translatewiki.net jobasına] barıp şığıñız.',
 'allmessagesnotsupportedDB' => "'''\$wgUseDatabaseMessages''' öşirilgen sebebinen '''{{ns:special}}:AllMessages''' beti qoldanılmaýdı.",
 'allmessagesfilter'         => 'Xabardı atawımen süzgilew:',
 'allmessagesmodified'       => 'Tek özgertilgendi körset',
@@ -2288,6 +2251,7 @@ Wïkï-aparw üşin sırttan alw barlıq äreketter [[{{#special:Log}}/import|sÄ
 'import-interwiki-history'   => 'Bul bettiñ barlıq tarïxï nusqaların köşirw',
 'import-interwiki-submit'    => 'Sırttan alw',
 'import-interwiki-namespace' => 'Betterdi mına esim ayasına aparw:',
+'import-comment'             => 'Mändemesi:',
 'importtext'                 => 'Qaýnar wïkïden «{{#special:Export}}» qwralın qoldanıp faýldı sırtqa beriñiz, dïskiñizge saqtañız da mında qotarıp beriñiz.',
 'importstart'                => 'Betterdi sırttan alwda…',
 'import-revision-count'      => '$1 tüzetw',
@@ -2433,6 +2397,16 @@ Bunıñ sebebi şettik torap siltemesinen bolwı mümkin.',
 'numauthors'     => 'Ärtürli awtor sanı (bet): $1',
 'numtalkauthors' => 'Ärtürli awtor sanı (talqılaw beti): $1',
 
+# Skin names
+'skinname-standard'    => 'Dağdılı (standard)',
+'skinname-nostalgia'   => 'Añsaw (nostalgia)',
+'skinname-cologneblue' => 'Köln zeñgirligi (cologneblue)',
+'skinname-monobook'    => 'Dara kitap (monobook)',
+'skinname-myskin'      => 'Öz mänerim (myskin)',
+'skinname-chick'       => 'Balapan (chick)',
+'skinname-simple'      => 'Kädimgi (simple)',
+'skinname-modern'      => 'Zamanawï (modern)',
+
 # Math options
 'mw_math_png'    => 'Ärqaşan PNG pişinimen körsetkiz',
 'mw_math_simple' => 'Eger öte qarapaýım bolsa — HTML, äýtpese PNG',
@@ -2486,7 +2460,7 @@ $1',
 'show-big-image'       => 'Joğarı ajıratılımdı',
 'show-big-image-thumb' => '<small>Qarap şığw mölşeri: $1 × $2 nükte</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Jaña faýldar körmesi',
 'imagelisttext'         => "Tömende $2 surıptalğan '''$1''' faýl tizimi.",
 'newimages-summary'     => 'Bul arnaýı betinde soñğı qotarıp berilgen faýldar körsetiledi',
@@ -2850,21 +2824,9 @@ Osı betti qaýta bastawın naqtı tilegeniñizdi quptañız.",
 
 'unit-pixel' => ' nükte',
 
-# HTML dump
-'redirectingto' => '[[:$1]] betine aýdatwda…',
-
 # action=purge
-'confirm_purge'        => 'Bul bettin bürkemesin tazartasız ba?
-
-$1',
 'confirm_purge_button' => 'Jaraýdı',
-
-# AJAX search
-'searchcontaining' => "''$1'' mağlumatı bar betterden izdew.",
-'searchnamed'      => "''$1'' atawı bar betterden izdew.",
-'articletitles'    => "''$1'' dep bastalÄŸan betterdi",
-'hideresults'      => 'Nätïjelerdi jasır',
-'useajaxsearch'    => 'AJAX qoldanıp izdew',
+'confirm-purge-top'    => 'Bul bettin bürkemesin tazartasız ba?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� aldıñğı betke',
@@ -3004,13 +2966,13 @@ Tağı da [[{{#special:Watchlist}}/edit|qalıpalğan öñdewişti paýdalana]] a
 'filepath-summary' => 'Bul arnaýı bet faýl ornalaswı tolıq jolın qaýtaradı.
 Swretter tolıq ajıratılımdığımen körsetiledi, basqa faýl türlerine qatıstı bağdarlaması twra jegiledi.
 
-Faýl atawın «{{ns:image}}:» degen bastawışsız eñgiziñiz.',
+Faýl atawın «{{ns:file}}:» degen bastawışsız eñgiziñiz.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Faýl telnusqaların izdew',
 'fileduplicatesearch-summary'  => 'Faýl xeşi mağınası negizinde telnusqaların izdew.
 
-Faýl atawın «{{ns:image}}:» degen bastawışsız engiziñiz.',
+Faýl atawın «{{ns:file}}:» degen bastawışsız engiziñiz.',
 'fileduplicatesearch-legend'   => 'Telnusqanı izdew',
 'fileduplicatesearch-filename' => 'Faýl atawı:',
 'fileduplicatesearch-submit'   => 'Ä°zde',
diff --git a/languages/messages/MessagesKk_tr.php b/languages/messages/MessagesKk_tr.php
index 01a69196..dd44c0ad 100644
--- a/languages/messages/MessagesKk_tr.php
+++ b/languages/messages/MessagesKk_tr.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Kazakh (Turkey) (Qazaqşa (Türkïya))
+/** Kazakh (Turkey) (‪Qazaqşa (Türkïya)‬)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesKl.php b/languages/messages/MessagesKl.php
index c3e465d7..40cea09c 100644
--- a/languages/messages/MessagesKl.php
+++ b/languages/messages/MessagesKl.php
@@ -101,7 +101,7 @@ $messages = array(
 'acct_creation_throttle_hit' => 'Utoqqatterpunga, $1 kontonik pilersereersimavutit. Pilersitseqqissinnaanngilatit.',
 
 # Edit pages
-'summary'      => 'Qanoq issusersiuineq',
+'summary'      => 'Qanoq issusersiuineq:',
 'accmailtitle' => 'Password-i nassiunneqarsimavoq.',
 'accmailtext'  => 'Password-i "$1" $2-mut nassiunneqarsimavoq.',
 'newarticle'   => '(Nuutaq)',
@@ -122,7 +122,7 @@ $messages = array(
 # Upload
 'upload' => 'Læg en fil op',
 
-# Image description page
+# File description page
 'filehist-user' => 'Pineqartoq',
 
 # MIME search
@@ -150,9 +150,12 @@ $messages = array(
 Qupperneq nakkutilliinermi allattorsimaffik kingusinnerusukkut piissagukku, taava quppernerup sinaatungaani \"Nakkutilliinermi allattorsimaffik peeruk\" tooruk.",
 'watch'          => 'Piggassineq',
 
-# Delete/protect/revert
+# Delete
 'actioncomplete' => 'Naammassineqareersimavoq',
 
+# Protect
+'prot_1movedto2' => '[[$1]]-i nuunneqarsimavoq [[$2]]-mut',
+
 # Contributions
 'uctop' => '(kaarfa)',
 
diff --git a/languages/messages/MessagesKm.php b/languages/messages/MessagesKm.php
index ef425986..8bc7ea14 100644
--- a/languages/messages/MessagesKm.php
+++ b/languages/messages/MessagesKm.php
@@ -15,6 +15,44 @@
  * @author �ឹក ប៊ុនលី
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'ម�ឌា',
+	NS_SPECIAL          => 'ពិស�ស',
+	NS_TALK             => 'ការពិភាក្សា',
+	NS_USER             => 'អ្នកប្រើប្រាស់',
+	NS_USER_TALK        => 'ការពិភាក្សារបស់អ្នកប្រើប្រាស់',
+	NS_PROJECT_TALK     => 'ការពិភាក្សាអំពី$1',
+	NS_FILE             => 'ឯកសារ',
+	NS_FILE_TALK        => 'ការពិភាក្សាអំពីឯកសារ',
+	NS_MEDIAWIKI        => 'ម�ឌាវិគី',
+	NS_MEDIAWIKI_TALK   => 'ការពិភាក្សាអំពីម�ឌាវិគី',
+	NS_TEMPLATE         => 'ទំព�រគំរូ',
+	NS_TEMPLATE_TALK    => 'ការពិភាក្សាអំពីទំព�រគំរូ',
+	NS_HELP             => 'ជំនួយ',
+	NS_HELP_TALK        => 'ការពិភាក្សាអំពីជំនួយ',
+	NS_CATEGORY         => 'ចំនា�់�្នាក់ក្រុម',
+	NS_CATEGORY_TALK    => 'ការពិភាក្សាអំពីចំនា�់�្នាក់ក្រុម',
+);
+
+$namespaceAliases = array(
+	'មីឌា' => NS_MEDIA,
+	'ពិភាក្សា' => NS_TALK,
+	'អ្នកប្រើប្រាស់-ពិភាក្សា' => NS_USER_TALK,
+	'$1_ពិភាក្ស' => NS_PROJECT_TALK,
+	'រូបភាព' => NS_FILE,
+	'ការពិភាក្សាអំពីរូបភាព' => NS_FILE_TALK,
+	'រូបភាព-ពិភាក្សា' => NS_FILE_TALK,
+	'មីឌាវិគី' => NS_MEDIAWIKI,
+	'មីឌាវិគី-ពិភាក្សា' => NS_MEDIAWIKI_TALK,
+	'ទំព�រគំរូ-ពិភាក្សា' => NS_TEMPLATE_TALK,
+	'ជំនួយ-ពិភាក្សា' => NS_HELP_TALK,
+	'ចំណា�់�្នាក់ក្រុម' => NS_CATEGORY,
+	'ចំណា�់ក្រុម' => NS_CATEGORY,
+	'ការពិភាក្សាអំពីចំណា�់�្នាក់ក្រុម' => NS_CATEGORY_TALK,
+	'ចំណា�់ក្រុម-ពិភាក្សា' => NS_CATEGORY_TALK,
+);
+
+
 $digitTransformTable = array(
 	'0' => '០', # &#x17e0;
 	'1' => '១', # &#x17e1;
@@ -47,244 +85,165 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'ការបញ្ជូនបន្�ទ្វ�ដង' ),
-	'BrokenRedirects'         => array( 'ការបញ្ជូនបន្�ដែល�ូច' ),
-	'Userlogin'               => array( 'ការឡុកអ៊ីននៃអ្នកប្រើប្រាស់' ),
-	'Userlogout'              => array( 'ការចាកច�ញរបស់អ្នកប្រើប្រាស់' ),
-	'CreateAccount'           => array( 'បង្កើ�គណនី' ),
-	'Preferences'             => array( 'ចំណង់ចំណូលចិ�្�' ),
-	'Watchlist'               => array( 'បញ្ជី�ាមដាន' ),
-	'Recentchanges'           => array( 'បំលាស់ប្�ូរ�្មីៗ' ),
-	'Upload'                  => array( 'ផ្ទុកឯកសារឡើង' ),
-	'Imagelist'               => array( 'បញ្ជីរូបភាព' ),
-	'Newimages'               => array( 'រូបភាព�្មីៗ' ),
-	'Listusers'               => array( 'បញ្ជីឈ្មោះអ្នកប្រើប្រាស់' ),
-	'Statistics'              => array( 'ស្�ិ�ិ' ),
-	'Randompage'              => array( 'ទំព�រចៃដន្យ' ),
-	'Lonelypages'             => array( 'ទំព�រកំព្រា' ),
-	'Uncategorizedpages'      => array( 'ទំព�រដែលគ្មានចំនា�់�្នាក់ក្រុម' ),
-	'Uncategorizedcategories' => array( 'ចំនា�់�្នាក់ក្រុមដែលគ្មានចំនា�់�្នាក់ក្រុម' ),
-	'Uncategorizedimages'     => array( 'រូបភាពដែលគ្មានចំនា�់�្នាក់ក្រុម' ),
-	'Uncategorizedtemplates'  => array( 'ទំព�រគំរូដែលគ្មានចំនា�់�្នាក់ក្រុម' ),
-	'Unusedcategories'        => array( 'ចំនា�់�្នាក់ក្រុមដែលមិន�្រូវបានប្រើប្រាស់' ),
-	'Unusedimages'            => array( 'រូបភាពដែលមិន�្រូវបានប្រើប្រាស់' ),
-	'Shortpages'              => array( 'ទំព�រ�្លីៗ' ),
-	'Longpages'               => array( 'ទំព�រវែងៗ' ),
-	'Newpages'                => array( 'ទំព�រ�្មីៗ' ),
-	'Ancientpages'            => array( 'ទំព�រចាស់ៗ' ),
-	'Protectedpages'          => array( 'ទំព�របានការពារ' ),
-	'Protectedtitles'         => array( 'ចំនងជើងបានការពារ' ),
-	'Allpages'                => array( 'គ្រប់ទំព�រ' ),
-	'Prefixindex'             => array( 'លិបិក្រមបុព្វបទ' ),
-	'Ipblocklist'             => array( 'បញ្ជីហាមឃា�់IP' ),
-	'Specialpages'            => array( 'ទំព�រពិស�សៗ' ),
-	'Contributions'           => array( 'ការរួមចំនែក' ),
-	'Emailuser'               => array( 'អ្នកប្រើប្រាស់អ៊ីមែល' ),
-	'Confirmemail'            => array( 'បញ្ជាក់ទទួលស្គាល់អ៊ីមែល' ),
-	'Whatlinkshere'           => array( 'អ្វីដែលភ្ជាប់មកទីន�ះ' ),
-	'Movepage'                => array( 'ប្�ូរទី�ាំងទំព�រ' ),
-	'Booksources'             => array( 'ប្រភពសៀវភៅ' ),
-	'Categories'              => array( 'ចំនា�់�្នាក់ក្រុម' ),
-	'Export'                  => array( 'នាំច�ញ' ),
-	'Version'                 => array( 'កំណែ' ),
-	'Allmessages'             => array( 'គ្រប់សារ' ),
-	'Log'                     => array( 'កំណ�់ហ��ុ' ),
-	'Blockip'                 => array( 'ហាមឃា�់IP' ),
-	'Undelete'                => array( 'ឈប់លុបច�ញ' ),
-	'Import'                  => array( 'នាំចូល' ),
-	'Lockdb'                  => array( 'ចាក់សោមូលដ្ឋានទិន្នន�យ' ),
-	'Unlockdb'                => array( 'ដោះសោមូលដ្ឋានទិន្នន�យ' ),
-	'Userrights'              => array( 'សិទ្ធិអ្នកប្រើប្រាស់' ),
-	'FileDuplicateSearch'     => array( 'ស្វែងរកឯកសារជាន់គ្នា' ),
-	'Unwatchedpages'          => array( 'ទំព�រលែងបាន�ាមដាន' ),
-	'Listredirects'           => array( 'បញ្ជីទំព�របញ្ជូនបន្�' ),
-	'Unusedtemplates'         => array( 'ទំព�រគំរូដែលមិន�្រូវបានប្រើប្រាស់' ),
-	'Randomredirect'          => array( 'ការបញ្ជូនបន្�ដោយចៃដន្យ' ),
-	'Mypage'                  => array( 'ទំព�ររបស់�្ញុំ' ),
-	'Mytalk'                  => array( 'ការពិភាក្សារបស់�្ញុំ' ),
-	'Mycontributions'         => array( 'ការរួមចំនែករបស់�្ញុំ' ),
-	'Listadmins'              => array( 'បញ្ជីអ្នកអភិបាល' ),
-	'Listbots'                => array( 'បញ្ជីរូបយន្�' ),
-	'Popularpages'            => array( 'ទំព�រដែលមានប្រជាប្រិយ' ),
-	'Search'                  => array( 'ស្វែងរក' ),
-	'Resetpass'               => array( 'ដាក់ពាក្យសំងា�់�្មីឡើងវិញ' ),
-	'Withoutinterwiki'        => array( 'ដោយគ្មានអន្�រវិគី' ),
-	'MergeHistory'            => array( 'ច្របាច់បញ្ជូលប្រវ�្�ិ' ),
-	'Filepath'                => array( 'ផ្លូវនៃឯកសារ' ),
-	'Invalidateemail'         => array( 'អ៊ីមែលមិន�្រឹម�្រូវ' ),
-	'Blankpage'               => array( 'ទំព�រទទ�' ),
-);
-
-$skinNames = array(
-	'standard'    => 'បុរាណ',
-	'nostalgia'   => 'អាឡោះអាល�យ',
-	'cologneblue' => 'ទឹកអប់�ៀវ',
-	'monobook'    => 'សៀវភៅឯក',
-	'myskin'      => 'សំបក�្ញុំ',
-	'chick'       => 'កូនមាន់',
-	'simple'      => 'សាមញ្ញ',
-	'modern'      => 'ទំនើប',
-);
-
-$namespaceNames = array(
-	NS_MEDIA          => 'ម�ឌា',
-	NS_SPECIAL        => 'ពិស�ស',
-	NS_TALK           => 'ការពិភាក្សា',
-	NS_USER           => 'អ្នកប្រើប្រាស់',
-	NS_USER_TALK      => 'ការពិភាក្សារបស់អ្នកប្រើប្រាស់',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'ការពិភាក្សាអំពី$1',
-	NS_IMAGE          => 'រូបភាព',
-	NS_IMAGE_TALK     => 'ការពិភាក្សាអំពីរូបភាព',
-	NS_MEDIAWIKI      => 'ម�ឌាវិគី',
-	NS_MEDIAWIKI_TALK => 'ការពិភាក្សាអំពីម�ឌាវិគី',
-	NS_TEMPLATE       => 'ទំព�រគំរូ',
-	NS_TEMPLATE_TALK  => 'ការពិភាក្សាអំពីទំព�រគំរូ',
-	NS_HELP           => 'ជំនួយ',
-	NS_HELP_TALK      => 'ការពិភាក្សាអំពីជំនួយ',
-	NS_CATEGORY       => 'ចំណា�់�្នាក់ក្រុម',
-	NS_CATEGORY_TALK  => 'ការពិភាក្សាអំពីចំណា�់�្នាក់ក្រុម',
-);
-
-$namespaceAliases = array(
-	'មីឌា'           => NS_MEDIA,
-	'ពិភាក្សា'         => NS_TALK,
-	'អ្នកប្រើប្រាស់-ពិភាក្សា' => NS_USER_TALK,
-	'$1_ពិភាក្ស'      => NS_PROJECT_TALK,
-	'រូបភាព-ពិភាក្សា'     => NS_IMAGE_TALK,
-	'មីឌាវិគី'         => NS_MEDIAWIKI,
-	'មីឌាវិគី-ពិភាក្សា'    => NS_MEDIAWIKI_TALK,
-	'ទំព�រគំរូ-ពិភាក្សា'   => NS_TEMPLATE_TALK,
-	'ជំនួយ-ពិភាក្សា'     => NS_HELP_TALK,
-	'ចំណា�់ក្រុម'       => NS_CATEGORY,
-	'ចំណា�់ក្រុម-ពិភាក្សា'  => NS_CATEGORY_TALK,
+	'DoubleRedirects'           => array( 'ការបញ្ជូនបន្�ទ្វ�ដង' ),
+	'BrokenRedirects'           => array( 'ការបញ្ជូនបន្�ដែល�ូច' ),
+	'Disambiguations'           => array( 'ចំណងជើងស្រដៀងគ្នា' ),
+	'Userlogin'                 => array( 'ការឡុកអ៊ីនរបស់អ្នកប្រើប្រាស់' ),
+	'Userlogout'                => array( 'ការចាកច�ញរបស់អ្នកប្រើប្រាស់' ),
+	'CreateAccount'             => array( 'បង្កើ�គណនី' ),
+	'Preferences'               => array( 'ចំណង់ចំណូលចិ�្�' ),
+	'Watchlist'                 => array( 'បញ្ជី�ាមដាន' ),
+	'Recentchanges'             => array( 'បំលាស់ប្ដូរ�្មីៗ' ),
+	'Upload'                    => array( 'ផ្ទុកឯកសារឡើង' ),
+	'Listfiles'                 => array( 'បញ្ជីរូបភាព' ),
+	'Newimages'                 => array( 'រូបភាព�្មីៗ' ),
+	'Listusers'                 => array( 'បញ្ជីឈ្មោះអ្នកប្រើប្រាស់' ),
+	'Listgrouprights'           => array( 'បញ្ជីក្រុមសិទ្ធិ' ),
+	'Statistics'                => array( 'ស្�ិ�ិ' ),
+	'Randompage'                => array( 'ទំព�រចៃដន្យ' ),
+	'Lonelypages'               => array( 'ទំព�រកំព្រា' ),
+	'Uncategorizedpages'        => array( 'ទំព�រដែលគ្មានចំណា�់�្នាក់ក្រុម' ),
+	'Uncategorizedcategories'   => array( 'ចំណា�់�្នាក់ក្រុមដែលគ្មានចំណា�់�្នាក់ក្រុម' ),
+	'Uncategorizedimages'       => array( 'រូបភាពដែលគ្មានចំណា�់�្នាក់ក្រុម' ),
+	'Uncategorizedtemplates'    => array( 'ទំព�រគំរូដែលគ្មានចំណា�់�្នាក់ក្រុម' ),
+	'Unusedcategories'          => array( 'ចំណា�់�្នាក់ក្រុមដែលមិន�្រូវបានប្រើប្រាស់' ),
+	'Unusedimages'              => array( 'រូបភាពដែលមិន�្រូវបានប្រើប្រាស់' ),
+	'Wantedpages'               => array( 'ទំព�រប្រើប្រាស់ច្រើន' ),
+	'Wantedcategories'          => array( 'ចំណា�់�្នាក់ក្រុមប្រើប្រាស់ច្រើន' ),
+	'Wantedfiles'               => array( 'រូបភាពប្រើប្រាស់ច្រើន' ),
+	'Wantedtemplates'           => array( 'ទំព�រគំរូប្រើប្រាស់ច្រើន' ),
+	'Mostlinked'                => array( 'ទំព�រមាន�ំណភ្ជាប់មកច្រើនជាងគ�' ),
+	'Mostlinkedcategories'      => array( 'ចំណា�់�្នាក់ក្រុមមាន�ំណភ្ជាប់មកច្រើនជាងគ�' ),
+	'Mostlinkedtemplates'       => array( 'ទំព�រគំរូមាន�ំណភ្ជាប់មកច្រើនជាងគ�' ),
+	'Mostimages'                => array( 'ទំព�រមានរូបភាពច្រើនជាងគ�' ),
+	'Mostcategories'            => array( 'ទំព�រមានចំណា�់�្នាក់ច្រើនជាងគ�' ),
+	'Mostrevisions'             => array( 'ទំព�រមានកំណែច្រើនជាងគ�' ),
+	'Fewestrevisions'           => array( 'ទំព�រមានកំណែ�ិចជាងគ�' ),
+	'Shortpages'                => array( 'ទំព�រ�្លីៗ' ),
+	'Longpages'                 => array( 'ទំព�រវែងៗ' ),
+	'Newpages'                  => array( 'ទំព�រ�្មីៗ' ),
+	'Ancientpages'              => array( 'ទំព�រចាស់ៗ' ),
+	'Deadendpages'              => array( 'ទំព�រទាល់' ),
+	'Protectedpages'            => array( 'ទំព�របានការពារ' ),
+	'Protectedtitles'           => array( 'ចំណងជើងបានការពារ' ),
+	'Allpages'                  => array( 'គ្រប់ទំព�រ' ),
+	'Prefixindex'               => array( 'លិបិក្រមបុព្វបទ' ),
+	'Ipblocklist'               => array( 'បញ្ជីហាមឃា�់IP' ),
+	'Specialpages'              => array( 'ទំព�រពិស�សៗ' ),
+	'Contributions'             => array( 'ការរួមចំណែក' ),
+	'Emailuser'                 => array( 'អ្នកប្រើប្រាស់អ៊ីមែល' ),
+	'Confirmemail'              => array( 'បញ្ជាក់ទទួលស្គាល់អ៊ីមែល' ),
+	'Whatlinkshere'             => array( 'អ្វីដែលភ្ជាប់មកទីន�ះ' ),
+	'Recentchangeslinked'       => array( 'បំលាស់ប្ដូរទាក់ទិន' ),
+	'Movepage'                  => array( 'ប្ដូរទី�ាំងទំព�រ' ),
+	'Blockme'                   => array( 'រាំង�្ទប់' ),
+	'Booksources'               => array( 'ប្រភពសៀវភៅ' ),
+	'Categories'                => array( 'ចំណា�់�្នាក់ក្រុម' ),
+	'Export'                    => array( 'នាំច�ញ' ),
+	'Version'                   => array( 'កំណែ' ),
+	'Allmessages'               => array( 'គ្រប់សារ' ),
+	'Log'                       => array( 'កំណ�់ហ��ុ' ),
+	'Blockip'                   => array( 'រាំង�្ទប់IP' ),
+	'Undelete'                  => array( 'ឈប់លុបច�ញ' ),
+	'Import'                    => array( 'នាំចូល' ),
+	'Lockdb'                    => array( 'ចាក់សោមូលដ្ឋានទិន្នន�យ' ),
+	'Unlockdb'                  => array( 'ដោះសោមូលដ្ឋានទិន្នន�យ' ),
+	'Userrights'                => array( 'សិទ្ធិអ្នកប្រើប្រាស់' ),
+	'MIMEsearch'                => array( 'MIMEស្វែងរក' ),
+	'FileDuplicateSearch'       => array( 'ស្វែងរកឯកសារដូចគ្នាប�ះបិទ' ),
+	'Unwatchedpages'            => array( 'ទំព�រលែងបាន�ាមដាន' ),
+	'Listredirects'             => array( 'បញ្ជីទំព�របញ្ជូនបន្�' ),
+	'Revisiondelete'            => array( 'កំណែបានលុបចោល' ),
+	'Unusedtemplates'           => array( 'ទំព�រគំរូដែលមិន�្រូវបានប្រើប្រាស់' ),
+	'Randomredirect'            => array( 'ការបញ្ជូនបន្�ដោយចៃដន្យ' ),
+	'Mypage'                    => array( 'ទំព�ររបស់�្ញុំ' ),
+	'Mytalk'                    => array( 'ការពិភាក្សារបស់�្ញុំ' ),
+	'Mycontributions'           => array( 'ការរួមចំណែករបស់�្ញុំ' ),
+	'Listadmins'                => array( 'បញ្ជីអ្នកអភិបាល' ),
+	'Listbots'                  => array( 'បញ្ជីរូបយន្�' ),
+	'Popularpages'              => array( 'ទំព�រដែលមានប្រជាប្រិយ' ),
+	'Search'                    => array( 'ស្វែងរក' ),
+	'Resetpass'                 => array( 'ដាក់ពាក្យសំងា�់�្មីឡើងវិញ' ),
+	'Withoutinterwiki'          => array( 'ដោយគ្មានអន្�រវិគី' ),
+	'MergeHistory'              => array( 'ច្របាច់បញ្ជូលប្រវ�្�ិ' ),
+	'Filepath'                  => array( 'ផ្លូវនៃឯកសារ' ),
+	'Invalidateemail'           => array( 'អ៊ីមែលមិន�្រឹម�្រូវ' ),
+	'Blankpage'                 => array( 'ទំព�រទទ�' ),
+	'LinkSearch'                => array( 'ស្វែងរក�ំណភ្ជាប់' ),
+	'DeletedContributions'      => array( 'ការរួមចំណែកដែល�្រូវបានលុបចោល' ),
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#REDIRECT', '#បញ្ជូនបន្�', '#ប្�ូរទី�ាំងទៅ', '#ប្�ូរទី�ាំង' ),
-	'notoc'               => array( '0', '__NOTOC__', '__លាក់មា�ិកា__', '__លាក់បញ្ជីអ�្�បទ__', '__គ្មានមា�ិកា__', '__គ្មានបញ្ជីអ�្�បទ__', '__កុំបង្ហាញមា�ិកា__' ),
-	'nogallery'           => array( '0', '__NOGALLERY__' ),
-	'forcetoc'            => array( '0', '__FORCETOC__', '__បង្�ំមា�ិកា__', '__បង្�ំបញ្ជីអ�្�បទ__', '__បង្�ំអោយបង្ហាញមា�ិកា__' ),
-	'toc'                 => array( '0', '__TOC__', '__មា�ិកា__', '__បញ្ជីអ�្�បទ__' ),
-	'noeditsection'       => array( '0', '__NOEDITSECTION__', '__ផ្នែកមិន�្រូវកែប្រែ__', '__មិនមានផ្នែកកែប្រែ__', '__លាក់ផ្នែកកែប្រែ__' ),
-	'currentmonth'        => array( '1', 'CURRENTMONTH', '�ែន�ះ' ),
-	'currentmonthname'    => array( '1', 'CURRENTMONTHNAME', 'ឈ្មោះ�ែន�ះ' ),
-	'currentmonthnamegen' => array( '1', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'  => array( '1', 'CURRENTMONTHABBREV' ),
-	'currentday'          => array( '1', 'CURRENTDAY', '�្ងៃន�ះ' ),
-	'currentday2'         => array( '1', 'CURRENTDAY2' ),
-	'currentdayname'      => array( '1', 'CURRENTDAYNAME', 'ឈ្មោះ�្ងៃន�ះ' ),
-	'currentyear'         => array( '1', 'CURRENTYEAR', 'ឆ្នាំន�ះ' ),
-	'currenttime'         => array( '1', 'CURRENTTIME', 'ព�លន�ះ' ),
-	'currenthour'         => array( '1', 'CURRENTHOUR', 'ម៉ោងន�ះ', 'ម៉ោងឥឡូវ' ),
-	'localmonth'          => array( '1', 'LOCALMONTH' ),
-	'localmonthname'      => array( '1', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'   => array( '1', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'    => array( '1', 'LOCALMONTHABBREV' ),
-	'localday'            => array( '1', 'LOCALDAY' ),
-	'localday2'           => array( '1', 'LOCALDAY2' ),
-	'localdayname'        => array( '1', 'LOCALDAYNAME' ),
-	'localyear'           => array( '1', 'LOCALDAYNAME' ),
-	'localtime'           => array( '1', 'LOCALTIME', 'ព�លវ�លាក្នុង�ំបន់' ),
-	'localhour'           => array( '1', 'LOCALHOUR', 'ម៉ោង�ំបន់' ),
-	'numberofpages'       => array( '1', 'NUMBEROFPAGES', 'ចំនួនទំព�រ' ),
-	'numberofarticles'    => array( '1', 'NUMBEROFARTICLES', 'ចំនួនអ�្�បទ' ),
-	'numberoffiles'       => array( '1', 'NUMBEROFFILES', 'ចំនួនឯកសារ' ),
-	'numberofusers'       => array( '1', 'NUMBEROFUSERS', 'ចំនួនអ្នកប្រើប្រាស់' ),
-	'numberofedits'       => array( '1', 'NUMBEROFEDITS', 'ចំនួនកំនែប្រែ' ),
-	'pagename'            => array( '1', 'PAGENAME', 'ឈ្មោះទំព�រ' ),
-	'pagenamee'           => array( '1', 'PAGENAMEE' ),
-	'namespace'           => array( '1', 'NAMESPACE', 'លំហឈ្មោះ' ),
-	'namespacee'          => array( '1', 'NAMESPACEE' ),
-	'talkspace'           => array( '1', 'TALKSPACE', 'លំហឈ្មោះទំព�រពិភាក្សា' ),
-	'talkspacee'          => array( '1', 'TALKSPACEE' ),
-	'subjectspace'        => array( '1', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'       => array( '1', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'        => array( '1', 'FULLPAGENAME', 'ឈ្មោះទំព�រព�ញ' ),
-	'fullpagenamee'       => array( '1', 'FULLPAGENAMEE' ),
-	'subpagename'         => array( '1', 'SUBPAGENAME', 'ឈ្មោះទំព�ររង' ),
-	'subpagenamee'        => array( '1', 'SUBPAGENAMEE' ),
-	'basepagename'        => array( '1', 'BASEPAGENAME' ),
-	'basepagenamee'       => array( '1', 'BASEPAGENAMEE' ),
-	'talkpagename'        => array( '1', 'TALKPAGENAME', 'ឈ្មោះទំព�រពិភាក្សា' ),
-	'talkpagenamee'       => array( '1', 'TALKPAGENAMEE' ),
-	'subjectpagename'     => array( '1', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'    => array( '1', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                 => array( '0', 'MSG:', 'សារ:' ),
-	'subst'               => array( '0', 'SUBST:' ),
-	'msgnw'               => array( '0', 'MSGNW:', 'សារមិនមែនជាកូដវិគី:' ),
-	'img_thumbnail'       => array( '1', 'thumbnail', 'thumb', 'រូបភាព�ូច', 'រូប�ូច' ),
-	'img_manualthumb'     => array( '1', 'thumbnail=$1', 'thumb=$1', 'រូបភាព�ូច=$1', 'រូប�ូច=$1' ),
-	'img_right'           => array( '1', 'right', 'ស្�ាំ', '�ាងស្�ាំ' ),
-	'img_left'            => array( '1', 'left', 'ធ្វ�ង', '�ាងធ្វ�ង' ),
-	'img_none'            => array( '1', 'none', 'ទទ�', 'គ្មាន' ),
-	'img_width'           => array( '1', '$1px', '$1ភីកសែល', '$1ភស' ),
-	'img_center'          => array( '1', 'center', 'centre', 'កណ្�ាល' ),
-	'img_framed'          => array( '1', 'framed', 'enframed', 'frame', 'ស៊ុម' ),
-	'img_frameless'       => array( '1', 'frameless', 'គ្មានស៊ុម' ),
-	'img_page'            => array( '1', 'page=$1', 'page $1', 'ទំព�រ=$1', 'ទំព�រ$1' ),
-	'img_upright'         => array( '1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'          => array( '1', 'border' ),
-	'img_baseline'        => array( '1', 'baseline' ),
-	'img_sub'             => array( '1', 'sub' ),
-	'img_super'           => array( '1', 'super', 'sup' ),
-	'img_top'             => array( '1', 'top', 'ផ្នែកលើ', 'ផ្នែក�ាងលើ' ),
-	'img_text_top'        => array( '1', 'text-top', 'ឃ្លានៅផ្នែក�ាងលើ', 'ឃ្លាផ្នែក�ាងលើ' ),
-	'img_middle'          => array( '1', 'middle', 'ផ្នែកកណ្�ាល' ),
-	'img_bottom'          => array( '1', 'bottom', 'បា�', 'ផ្នែកបា�' ),
-	'img_text_bottom'     => array( '1', 'text-bottom', 'ឃ្លានៅផ្នែកបា�', 'ឃ្លាផ្នែកបា�' ),
-	'int'                 => array( '0', 'INT:' ),
-	'sitename'            => array( '1', 'SITENAME', 'ឈ្មោះវិបសាយ', 'ឈ្មោះគ�ហទំព�រ' ),
-	'ns'                  => array( '0', 'NS:', 'លឈ:' ),
-	'localurl'            => array( '0', 'LOCALURL:' ),
-	'localurle'           => array( '0', 'LOCALURLE:' ),
-	'server'              => array( '0', 'SERVER', 'ម៉ាស៊ីនបំរើស�វា' ),
-	'servername'          => array( '0', 'SERVERNAME', 'ឈ្មោះម៉ាស៊ីនបំរើស�វា' ),
-	'scriptpath'          => array( '0', 'SCRIPTPATH', 'ផ្លូវស្រ្គីប' ),
-	'grammar'             => array( '0', 'GRAMMAR:', 'វ�យ្យាករណ�:' ),
-	'notitleconvert'      => array( '0', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'    => array( '0', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'         => array( '1', 'CURRENTWEEK', 'សប្�ាហ�ន�ះ' ),
-	'currentdow'          => array( '1', 'CURRENTDOW' ),
-	'localweek'           => array( '1', 'LOCALWEEK' ),
-	'localdow'            => array( '1', 'LOCALDOW' ),
-	'revisionid'          => array( '1', 'REVISIONID' ),
-	'revisionday'         => array( '1', 'REVISIONDAY' ),
-	'revisionday2'        => array( '1', 'REVISIONDAY2' ),
-	'revisionmonth'       => array( '1', 'REVISIONMONTH' ),
-	'revisionyear'        => array( '1', 'REVISIONYEAR' ),
-	'revisiontimestamp'   => array( '1', 'REVISIONTIMESTAMP' ),
-	'plural'              => array( '0', 'PLURAL:', 'ពហុវចនៈ:' ),
-	'fullurl'             => array( '0', 'FULLURL:', 'URLព�ញ:' ),
-	'fullurle'            => array( '0', 'FULLURLE:' ),
-	'lcfirst'             => array( '0', 'LCFIRST:' ),
-	'ucfirst'             => array( '0', 'UCFIRST:' ),
-	'lc'                  => array( '0', 'LC:' ),
-	'uc'                  => array( '0', 'UC:' ),
-	'raw'                 => array( '0', 'RAW:' ),
-	'displaytitle'        => array( '1', 'DISPLAYTITLE', 'បង្ហាញចំណងជើង', 'បង្ហាញចំនងជើង' ),
-	'rawsuffix'           => array( '1', 'R' ),
-	'newsectionlink'      => array( '1', '__NEWSECTIONLINK__', '__�ំនភ្ជាប់ផ្នែក�្មី__', '__�ំណភ្ជាប់ផ្នែក�្មី__' ),
-	'currentversion'      => array( '1', 'CURRENTVERSION' ),
-	'urlencode'           => array( '0', 'URLENCODE:' ),
-	'anchorencode'        => array( '0', 'ANCHORENCODE' ),
-	'currenttimestamp'    => array( '1', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'      => array( '1', 'LOCALTIMESTAMP' ),
-	'directionmark'       => array( '1', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'            => array( '0', '#LANGUAGE:', '#ភាសា:' ),
-	'contentlanguage'     => array( '1', 'CONTENTLANGUAGE', 'CONTENTLANG', 'កូដភាសា' ),
-	'pagesinnamespace'    => array( '1', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'      => array( '1', 'NUMBEROFADMINS', 'ចំនួនអ្នកអភិបាល', 'ចំនួនអ្នក�ែទាំប្រព�ន្ធ' ),
-	'formatnum'           => array( '0', 'FORMATNUM' ),
-	'padleft'             => array( '0', 'PADLEFT' ),
-	'padright'            => array( '0', 'PADRIGHT' ),
-	'special'             => array( '0', 'special', 'ពិស�ស' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'            => array( '0', 'FILEPATH:', 'ផ្លូវនៃឯកសារ:' ),
-	'tag'                 => array( '0', 'tag', 'ផ្លាក', 'ស្លាក' ),
-	'hiddencat'           => array( '1', '__HIDDENCAT__' ),
-	'pagesincategory'     => array( '1', 'PAGESINCATEGORY', 'PAGESINCAT', 'ចំនួនទំព�រក្នុងចំនា�់�្នាក់ក្រុម', 'ចំនួនទំព�រក្នុងចំណា�់�្នាក់ក្រុម' ),
-	'pagesize'            => array( '1', 'PAGESIZE', 'ទំហំទំព�រ' ),
+	'redirect'              => array( '0', '#បញ្ជូនបន្�', '#ប្ដូរទី�ាំងទៅ #ប្�ូរទី�ាំងទៅ', '#ប្ដូរទី�ាំង', '#ប្�ូរទី�ាំង', '#ប្ដូរចំណងជើង', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__លាក់មា�ិកា__', '__លាក់បញ្ជីអ�្�បទ__', '__គ្មានមា�ិកា__', '__គ្មានបញ្ជីអ�្�បទ__', '__កុំបង្ហាញមា�ិកា__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__លាក់វិចិ�្រសាល__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__បង្�ំមា�ិកា__', '__បង្�ំបញ្ជីអ�្�បទ__', '__បង្�ំអោយបង្ហាញមា�ិកា__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__មា�ិកា__', '__បញ្ជីអ�្�បទ__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__ផ្នែកមិន�្រូវកែប្រែ__', '__មិនមានផ្នែកកែប្រែ__', '__លាក់ផ្នែកកែប្រែ__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__លាក់បឋមក�ា__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', '�ែន�ះ', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'ឈ្មោះ�ែន�ះ', 'CURRENTMONTHNAME' ),
+	'currentday'            => array( '1', '�្ងៃន�ះ', 'CURRENTDAY' ),
+	'currentdayname'        => array( '1', 'ឈ្មោះ�្ងៃន�ះ', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'ឆ្នាំន�ះ', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'ព�លន�ះ', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'ម៉ោងន�ះ', 'ម៉ោងឥឡូវ', 'CURRENTHOUR' ),
+	'localyear'             => array( '1', 'LOCALDAYNAME', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'ព�លវ�លាក្នុង�ំបន់', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'ម៉ោង�ំបន់', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'ចំនួនទំព�រ', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'ចំនួនអ�្�បទ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'ចំនួនឯកសារ', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'ចំនួនអ្នកប្រើប្រាស់', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'ចំនួនកំណែប្រែ', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'ឈ្មោះទំព�រ', 'PAGENAME' ),
+	'namespace'             => array( '1', 'លំហឈ្មោះ', 'NAMESPACE' ),
+	'talkspace'             => array( '1', 'លំហឈ្មោះទំព�រពិភាក្សា', 'TALKSPACE' ),
+	'fullpagename'          => array( '1', 'ឈ្មោះទំព�រព�ញ', 'FULLPAGENAME' ),
+	'subpagename'           => array( '1', 'ឈ្មោះទំព�ររង', 'SUBPAGENAME' ),
+	'talkpagename'          => array( '1', 'ឈ្មោះទំព�រពិភាក្សា', 'TALKPAGENAME' ),
+	'msg'                   => array( '0', 'សារ:', 'MSG:' ),
+	'msgnw'                 => array( '0', 'សារមិនមែនជាកូដវិគី:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'រូបភាព�ូច', 'រូប�ូច', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'រូបភាព�ូច=$1', 'រូប�ូច=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'ស្�ាំ', '�ាងស្�ាំ', 'right' ),
+	'img_left'              => array( '1', 'ធ្វ�ង', '�ាងធ្វ�ង', 'left' ),
+	'img_none'              => array( '1', 'ទទ�', 'គ្មាន', 'none' ),
+	'img_width'             => array( '1', '$1ភីកសែល', '$1ភស', '$1px' ),
+	'img_center'            => array( '1', 'កណ្�ាល', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'ស៊ុម', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'គ្មានស៊ុម', 'frameless' ),
+	'img_page'              => array( '1', 'ទំព�រ=$1', 'ទំព�រ$1', 'page=$1', 'page $1' ),
+	'img_top'               => array( '1', 'ផ្នែកលើ', 'ផ្នែក�ាងលើ', 'top' ),
+	'img_text_top'          => array( '1', 'ឃ្លានៅផ្នែក�ាងលើ', 'ឃ្លាផ្នែក�ាងលើ', 'text-top' ),
+	'img_middle'            => array( '1', 'ផ្នែកកណ្�ាល', 'middle' ),
+	'img_bottom'            => array( '1', 'បា�', 'ផ្នែកបា�', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'ឃ្លានៅផ្នែកបា�', 'ឃ្លាផ្នែកបា�', 'text-bottom' ),
+	'img_link'              => array( '1', '�ំនភ្ជាប់=$1', '�ំណភ្ជាប់=$1', 'link=$1' ),
+	'sitename'              => array( '1', 'ឈ្មោះវិបសាយ', 'ឈ្មោះគ�ហទំព�រ', 'SITENAME' ),
+	'ns'                    => array( '0', 'លឈ:', 'NS:' ),
+	'server'                => array( '0', 'ម៉ាស៊ីនបម្រើស�វា', 'SERVER' ),
+	'servername'            => array( '0', 'ឈ្មោះម៉ាស៊ីនបម្រើស�វា', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'ផ្លូវស្រ្គីប', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'វ�យ្យាករណ�:', 'GRAMMAR:' ),
+	'currentweek'           => array( '1', 'សប្ដាហ�ន�ះ', 'CURRENTWEEK' ),
+	'plural'                => array( '0', 'ពហុវចនៈ:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'URLព�ញ:', 'FULLURL:' ),
+	'displaytitle'          => array( '1', 'បង្ហាញចំណងជើង', 'បង្ហាញចំនងជើង', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', 'ážš', 'R' ),
+	'newsectionlink'        => array( '1', '__�ំនភ្ជាប់ផ្នែក�្មី__', '__�ំណភ្ជាប់ផ្នែក�្មី__', '__NEWSECTIONLINK__' ),
+	'language'              => array( '0', '#ភាសា:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'កូដភាសា', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'numberofadmins'        => array( '1', 'ចំនួនអ្នកអភិបាល', 'ចំនួនអ្នក�ែទាំប្រព�ន្ធ', 'NUMBEROFADMINS' ),
+	'special'               => array( '0', 'ពិស�ស', 'special' ),
+	'filepath'              => array( '0', 'ផ្លូវនៃឯកសារ:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'ប្លាក', 'tag' ),
+	'hiddencat'             => array( '1', '__ចំណា�់�្នាក់ក្រុមមិនបានបង្ហាញ__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'ចំនួនទំព�រក្នុងចំនា�់�្នាក់ក្រុម', 'ចំនួនទំព�រក្នុងចំណា�់�្នាក់ក្រុម', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'ទំហំទំព�រ', 'PAGESIZE' ),
+	'index'                 => array( '1', '__លិបិក្រម__', '__INDEX__' ),
+	'noindex'               => array( '1', '__មិនមានលិបិក្រម__', '__NOINDEX__' ),
+	'staticredirect'        => array( '1', '__ស្�ិ�ិទំព�របញ្ជូនបន្�__', '__STATICREDIRECT__' ),
 );
 
 $messages = array(
@@ -325,6 +284,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'បិទបាំង​កំណែប្រែ​របស់�្ញុំ​ពី​បញ្ជី�ាមដាន',
 'tog-watchlisthidebots'       => 'បិទបាំង​កំណែប្រែ​របស់​រូបយន្�​ពី​បញ្ជី�ាមដាន',
 'tog-watchlisthideminor'      => 'បិទបាំង​កំណែប្រែ�ិច�ួច​ពីបញ្ជី�ាមដាន',
+'tog-watchlisthideliu'        => 'លាក់កំណែប្រែរបស់អ្នកប្រើប្រាស់ដែលបានឡុកអ៊ីនពីបញ្ជី�ាមដាន',
+'tog-watchlisthideanons'      => 'លាក់កំណែប្រែរបស់អ្នកប្រើប្រាស់អនាមិកពីបញ្ជី�ាមដាន',
 'tog-ccmeonemails'            => 'ផ្ញើមក�្ញុំផងដែរនូវច្បាប់ចម្លង​អ៊ីមែលដែល�្ញុំផ្ញើទៅកាន់អ្នកប្រើប្រាស់ផ្ស�ងទៀ�',
 'tog-diffonly'                => 'សូមកុំបង្ហាញ�្លឹមសារទំព�រនៅពីក្រោមភាព�ុសគ្នា',
 'tog-showhiddencats'          => 'បង្ហាញចំណា�់�្នាក់ក្រុមដែល�្រូវបានបិទបាំង',
@@ -333,8 +294,6 @@ $messages = array(
 'underline-never'   => 'មិនដែលសោះ',
 'underline-default' => '�ាមលំនាំដើម',
 
-'skinpreview' => '(មើលជាមុន)',
-
 # Dates
 'sunday'        => '�្ងៃអាទិ�្យ',
 'monday'        => '�្ងៃច�ន្ទ',
@@ -428,7 +387,7 @@ $messages = array(
 'mytalk'         => 'ការពិភាក្សា​',
 'anontalk'       => 'ពិភាក្សាចំពោះ IP ន�ះ',
 'navigation'     => 'ទិសដៅ',
-'and'            => 'áž“áž·áž„',
+'and'            => '&#32;áž“áž·áž„',
 
 # Metadata in edit box
 'metadata_help' => 'ទិន្នន�យម��ា៖',
@@ -465,14 +424,14 @@ $messages = array(
 'talkpagelinktext'  => 'ការពិភាក្សា',
 'specialpage'       => 'ទំព�រពិស�ស',
 'personaltools'     => 'ឧបករណ�ផ្ទាល់�្លួន',
-'postcomment'       => 'ផ្�ល់យោបល់',
+'postcomment'       => 'ផ្នែក�្មី',
 'articlepage'       => 'មើលអ�្�បទ',
 'talk'              => 'ការពិភាក្សា',
 'views'             => 'ការមើលនានា',
 'toolbox'           => 'ប្រអប់​ឧបករណ�',
 'userpage'          => 'មើលទំព�រអ្នកប្រើប្រាស់',
 'projectpage'       => 'មើល​ទំព�រគម្រោង',
-'imagepage'         => 'មើលទំព�រម�ឌា',
+'imagepage'         => 'មើល​ទំព�រ​ឯកសារ',
 'mediawikipage'     => 'មើល​ទំព�រសារ',
 'templatepage'      => 'មើលទំព�រគំរូ',
 'viewhelppage'      => 'មើលទំព�រជំនួយ',
@@ -491,8 +450,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'អំពី{{SITENAME}}',
 'aboutpage'            => 'Project:អំពី',
-'bugreports'           => 'របាយការណ�ដែលមានកំហុស',
-'bugreportspage'       => 'Project:របាយការណ�ដែលមានកំហុស',
 'copyright'            => 'រក្សាសិទ្ធិគ្រប់យ៉ាងដោយ$1។',
 'copyrightpagename'    => 'រក្សាសិទ្ធិដោយ{{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:រក្សាសិទ្ធិ​',
@@ -515,9 +472,7 @@ $messages = array(
 
 'badaccess'        => 'កំហុសនៃការអនុញ្ញា�',
 'badaccess-group0' => 'សកម្មភាពដែលអ្នកបានស្នើមិន�្រូវបានអនុញ្ញា�ទ� ។',
-'badaccess-group1' => 'មាន�ែអ្នកប្រើប្រាស់ក្នុងក្រុម $1 ទើបអាចធ្វើសកម្មភាពដែលអ្នកបានស្នើ ។',
-'badaccess-group2' => 'មាន�ែ​អ្នកប្រើប្រាស់​ក្នុងក្រុម១នៃក្រុម $1 ទ� ទើបអាចធ្វើសកម្មភាព​ដែលអ្នកបានស្នើ។',
-'badaccess-groups' => 'មាន�ែ​អ្នកប្រើប្រាស់​ក្នុងក្រុម១នៃក្រុម $1 ទ� ​ទើបអាចធ្វើសកម្មភាព​ដែលអ្នកបានស្នើ។',
+'badaccess-groups' => 'មាន�ែ​អ្នកប្រើប្រាស់​ក្នុង{{PLURAL:$2|ក្រុម|ក្រុម១នៃក្រុម}}៖ $1 ទ� ​ទើបអាចធ្វើសកម្មភាព​ដែលអ្នកបានស្នើ។',
 
 'versionrequired'     => '�ម្រូវឱ្យមាន​កំណែ $1 នៃម�ឌាវិគី',
 'versionrequiredtext' => '�្រូវការកំណែ $1 នៃម�ឌាវិគី (MediaWiki) ដើម្បីប្រើប្រាស់ទំព�រន�ះ។ សូមមើល [[Special:Version|ទំព�រកំណែ]]។',
@@ -531,6 +486,8 @@ $messages = array(
 'editsection'             => 'កែប្រែ',
 'editold'                 => 'កែប្រែ',
 'viewsourceold'           => 'មើលកូដ',
+'editlink'                => 'កែប្រែ',
+'viewsourcelink'          => 'មើលកូដ',
 'editsectionhint'         => "កែប្រែផ្នែក៖ '''$1'''",
 'toc'                     => 'មា�ិកា',
 'showtoc'                 => 'បង្ហាញ',
@@ -544,13 +501,13 @@ $messages = array(
 'site-atom-feed'          => 'បម្រែបម្រួល Atom នៃ $1',
 'page-rss-feed'           => 'បម្រែបម្រួល RSS នៃ "$1"',
 'page-atom-feed'          => 'បម្រែបម្រួល Atom Feed នៃ "$1"',
-'red-link-title'          => '$1 (មិនទាន់​បានសរស�រ)',
+'red-link-title'          => '$1 (មិនទាន់​មានទំព�រន�ះទ�)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'អ�្�បទ',
 'nstab-user'      => 'ទំព�រអ្នកប្រើប្រាស់',
 'nstab-media'     => 'ទំព�រម�ឌា',
-'nstab-special'   => 'ពិស�ស',
+'nstab-special'   => 'ទំព�រពិស�ស',
 'nstab-project'   => 'ទំព�រគម្រោង',
 'nstab-image'     => 'ឯកសារ',
 'nstab-mediawiki' => 'សារ',
@@ -594,7 +551,6 @@ $1',
 'cannotdelete'         => 'មិនអាច​លុបច�ញ ទំព�រ ឬ ឯកសារ ដែលបានសំដៅ។ វាអាច​�្រូវបានលុបច�ញហើយ​ដោយ​នរណាម្នាក់ផ្ស�ងទៀ�។',
 'badtitle'             => 'ចំណងជើង​មិនល្អ',
 'badtitletext'         => 'ចំណងជើងទំព�រដែលបានស្នើ គ្មានសុពលភាព, ទទ�, ឬ ចំណងជើង�ំណភ្ជាប់អន្�រភាសាឬអន្�រវិគី មិន�្រឹម�្រូវ ។ វាអាចមាន មួយ ឬ ច្រើនអក្សរ ដែលមិន​អាចប្រើប្រាស់​ក្នុង​ចំណងជើង។',
-'perfdisabled'         => 'សូមអភ�យទោស!លក្�ណៈពិស�សន�ះ�្រូវបានបិទជាបណ្ណោះអាសន្ន ដោយហ��ុ�ាវាធ្វើឱ្យមូលដ្ឋានទិន្នន�យធ្លាក់ចុះដល់កំរិ�មួយដែលគ្មាននរណាម្នាក់អាចប្រើវីគីបាន។',
 'perfcached'           => 'ទិន្នន�យទាំងន�ះ�្រូវបានដាក់ទៅស�ិភ្ជាប់និងប្រហែលជាមិនទាន់សម�យ ។',
 'perfcachedts'         => 'ទិន្នន�យ�ាងក្រោមន�ះ�្រូវបានដាក់ក្នុងឃ្លាំងសំងា�់ (Cache) និង បាន�្រូវបន្ទាន់សម�យចុងក្រោយនៅ$1។',
 'querypage-no-updates' => 'ការធ្វើឱ្យទាន់សម�យសម្រាប់ទំព�រន�ះគឺមិនអាចធ្វើទៅរួចទ�នាព�លឥឡូវ។ ទិន្នន�យនៅទីន�ះនឹងមិន�្រូវផ្លាស់ប្ដូរ�្មីនាព�លបច្ចុប្បន្ន។',
@@ -607,7 +563,7 @@ $1',
 'protectedpagetext'    => 'ទំព�រន�ះបាន�្រូវចាក់សោដើម្បីការពារមិនឱ្យកែប្រែ​។',
 'viewsourcetext'       => 'លោកអ្នកអាចមើលនិងចម្លងកូដនៃទំព�រន�ះ៖',
 'protectedinterface'   => 'ទំព�រន�ះ ផ្ដល់នូវ អ�្�បទអន្�រមុ� សម្រាប់ផ្នែកទន់, និង បាន�្រូវចាក់សោ ដើម្បីចៀសវាង ការបំពាន ។',
-'editinginterface'     => "'''សូមប្រយ��្ន៖''' អ្នកកំពុង�ែកែប្រែទំព�រដែលបានប្រើប្រាស់​ដើម្បីផ្ដល់នូវអន្�រមុ�សម្រាប់ផ្នែកទន់​។ បំលាស់ប្ដូរចំពោះទំព�រន�ះ​នឹងប៉ះពាល់ដល់ទំព�រអន្�រមុ�នៃអ្នកប្រើប្រាស់​ជាច្រើន ដែលប្រើប្រាស់វិបសាយន�ះ។ សម្រាប់ការបកប្រែ សូមពិចារណាប្រើប្រាស់ [http://translatewiki.net/wiki/Main_Page?setlang=km Betawiki] (ប��ាវិគី) គម្រោង​អន្�រជា�ូបនីយកម្ម​នៃម�ឌាវិគី ។",
+'editinginterface'     => "'''សូមប្រយ��្ន៖''' អ្នកកំពុង�ែកែប្រែទំព�រដែលបានប្រើប្រាស់​ដើម្បីផ្ដល់នូវអន្�រមុ�សម្រាប់ផ្នែកទន់​។ បំលាស់ប្ដូរចំពោះទំព�រន�ះ​នឹងប៉ះពាល់ដល់ទំព�រអន្�រមុ�នៃអ្នកប្រើប្រាស់​ជាច្រើន ដែលប្រើប្រាស់វិបសាយន�ះ។ សម្រាប់ការបកប្រែ សូមពិចារណាប្រើប្រាស់ [http://translatewiki.net/wiki/Main_Page?setlang=km translatewiki.net] (ប��ាវិគី) គម្រោង​អន្�រជា�ូបនីយកម្ម​នៃម�ឌាវិគី ។",
 'sqlhidden'            => '(ការអង្ក�� SQL �្រូវបិទបាំង)',
 'cascadeprotected'     => 'ទំព�រន�ះ�្រូវបានការពារពីការការប្រែដោយសារវាមាន{{PLURAL:$1|page, which is|pages, which are}} ដែល�្រូវបានការពារជាមួយ"cascading" option turned on:
 $2',
@@ -623,7 +579,7 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'ការចាកច�ញរបស់អ្នកប្រើប្រាស់',
-'logouttext'                 => "<strong>ឥឡូវន�ះលោកអ្នកបានចាកច�ញពីគណនីរបស់លោកអ្នកហើយ!</strong> 
+'logouttext'                 => "'''ឥឡូវន�ះលោកអ្នកបានចាកច�ញពីគណនីរបស់លោកអ្នកហើយ!''' 
 
 អ្នកអាចបន្�ប្រើប្រាស់{{SITENAME}}ក្នុងភាពអនាមិក ឬ [[Special:UserLogin|ឡុកអ៊ីនម្ដងទៀ�]] ក្នុងនាមជាអ្នកប្រើប្រាស់ដដែលឬផ្ស�ងទៀ�។
 
@@ -638,7 +594,6 @@ $2',
 'yourpasswordagain'          => 'វាយពាក្យសំងា�់ម្�ងទៀ�៖',
 'remembermypassword'         => 'ចងចាំការឡុកអ៊ីនរបស់�្ញុំក្នុងកុំព្យូទ�រន�ះ',
 'yourdomainname'             => 'ដែនរបស់អ្នក៖',
-'loginproblem'               => '<b>មានបញ្ហា​ចំពោះការឡុកអ៊ីន​របស់អ្នក។</b><br />សូម​ព្យាយាមឡើងវិញ!',
 'login'                      => 'ឡុកអ៊ីន',
 'nav-login-createaccount'    => 'ឡុកអ៊ីនឬបង្កើ�គណនី',
 'loginprompt'                => 'អ្នក​�្រូវ�ែ​មាន​�ូគី (cookies) ដើម្បី​អាច​ឡុកអ៊ីនចូល​ទៅ {{SITENAME}}។',
@@ -663,7 +618,7 @@ $2',
 'yourlanguage'               => 'ភាសា៖',
 'yournick'                   => 'ហ�្�ល��ា៖',
 'badsig'                     => 'ហ�្�ល��ាឆៅមិន�្រឹម�្រូវ;ពិនិ�្យមើលប្លាក HTML ។',
-'badsiglength'               => 'ហ�្�ល��ាន�ះវែងជ្រុល។
+'badsiglength'               => 'ហ�្�ល��ារបស់អ្នកវែងជ្រុល។
 
 វា�្រូវ�ែ�ិចជាង $1 {{PLURAL:$1|អក្សរ|អក្សរ}}។',
 'email'                      => 'អ៊ីមែល',
@@ -702,10 +657,10 @@ $2',
 
 ដើម្បីបង្ការអំពើបំពាន អ៊ីមែលរំលឹកពាក្យសំងា�់�ែមួយគ�់នឹង�្រូវបាន​ផ្ញើក្នុងរយៈព�ល{{PLURAL:$1|ម៉ោង|$1ម៉ោង}}។',
 'mailerror'                  => 'កំហុសនៃការផ្ញើសារ៖ $1',
-'acct_creation_throttle_hit' => 'សូមអភ�យទោស, អ្នកបានបង្កើ�គណនី $1 រួចហើយ ។ អ្នកមិនអាចធ្វើអ្វីបន្�ែមទៀ�ទ�​ ។',
-'emailauthenticated'         => 'អាសយដ្ឋានអ៊ីមែលរបស់លោកអ្នក�្រូវបានបញ្ជាក់�ា�្រឹម�្រូវពិ�ប្រាកដនៅ  $1។',
+'acct_creation_throttle_hit' => 'អ្នកទស្សនា​វិគី​ន�ះ​កំពុង�ែ​ប្រើប្រាស់​អាសយដ្ឋាន IP របស់​អ្នក​បង្កើ� {{PLURAL:$1|គណនី 1|គណនី $1}} នា​�្ងៃ​ចុងក្រោយ ដែល​ជា​ចំនួន​អ�ិបរមារ​ដែល​�្រូវ​បាន​អនុញ្ញា�​សម្រាប់​រយៈព�ល​ន�ះ​។ ជា​លទ្ធផល អ្នកទស្សនា​ដែល​ប្រើប្រាស់​អាសយដ្ឋាន IP ន�ះ​​មិន​អាច​បង្កើ�​គណនី​ផ្ស�ងទៀ�​នៅ​�ណៈន�ះ​បាន​ទ�​។',
+'emailauthenticated'         => 'អាសយដ្ឋានអ៊ីមែលរបស់លោកអ្នក​�្រូវបានបញ្ជាក់�ា�្រឹម�្រូវពិ�ប្រាកដក្នុង$2នៅ$3។',
 'emailnotauthenticated'      => 'អាសយដ្ឋានអ៊ីមែលរបស់លោកអ្នក មិនទាន់�្រូវបានបញ្ជាក់�ា�្រឹម�្រូវពិ�ប្រាកដនៅឡើយទ�។ មិនមានអ៊ីមែល ដែលនឹង�្រូវបានផ្ញើ សម្រាប់មុ�ងារពិស�សណាមួយដូច�ាងក្រោម។',
-'noemailprefs'               => '<strong>បញ្ជាក់អាសយដ្ឋានអ៊ីមែលសម្រាប់លក្�ណៈទាំងន�ះដើម្បីធ្វើការ</strong> ។',
+'noemailprefs'               => 'បញ្ជាក់​អាសយដ្ឋាន​អ៊ីមែល​នៅ​ក្នុង​ចំណង់ចំណូលចិ�្�​របស់​អ្នក​សម្រាប់​លក្�ណៈ​ទាំងន�ះ​ដើម្បី​ធ្វើការ​។',
 'emailconfirmlink'           => 'បញ្ជាក់ទទួលស្គាល់អាសយដ្ឋានអ៊ីមែលរបស់អ្នក',
 'invalidemailaddress'        => 'អាសយដ្ឋានអ៊ីមែល​ន�ះមិនអាចទទួលយកបានទ�​ដោយសារវាមានទម្រង់​​មិន�្រឹម�្រូវ។ 
 
@@ -716,18 +671,24 @@ $2',
 'createaccount-text'         => 'មានអ្នកណាម្នាក់បានបង្កើ�គណនីជាឈ្មោះ "$2" លើ{{SITENAME}}($4) ព្រមទាំងពាក្យសំងា�់ "$3" ។ អ្នកគួរ�ែឡុកអ៊ីនហើយផ្លាស់ប្�ូរពាក្យសំងា�់របស់អ្នកនៅព�លន�ះ។
 
 អ្នកអាចរំលងសារន�ះ ប្រសិនបើ​គណនីន�ះ�្រូវបានបង្កើ�ដោយមានបញ្ហា។',
+'login-throttled'            => 'អ្នកបានព្យាយាមបញ្ជូលពាក្យសំងា�់ចូលទៅក្នុងគណនីន�ះច្រើនដងព�កហើយ។​ សូមរងចាំមួយរយៈ មុនព�លសាកល្បងម្ដងទៀ�។',
 'loginlanguagelabel'         => 'ភាសា៖ $1',
 
 # Password reset dialog
-'resetpass'               => 'បង្កើ�ពាក្យសំងា�់សារឡើងវិញ',
-'resetpass_announce'      => 'អ្នកបានឡុកអ៊ីន​ដោយ​អក្សរកូដអ៊ីមែល​បណ្�ោះអាសន្ន​មួយ​។ ដើម្បី​បញ្ចប់​ការឡុកអ៊ីន អ្នក�្រូវ�ែ​កំណ�់​ពាក្យសំងា�់�្មី​មួយនៅទីន�ះ ៖',
-'resetpass_text'          => '<!-- បន្�ែមឃ្លានៅទីន�ះ -->',
-'resetpass_header'        => 'ប្ដូរ​ពាក្យសំងា�់​គណនី',
-'resetpass_submit'        => 'ដាក់ពាក្យសំងា�់ និង​ឡុកអ៊ីន',
-'resetpass_success'       => 'ពាក្យសំងា�់របស់អ្នក�្រូវបានផ្លាស់ប្�ូរដោយជោគជ�យហើយ! ឥឡូវន�ះកំពុងឡុកអ៊ីន...',
-'resetpass_bad_temporary' => 'ពាក្យសំងា�់បណ្�ោះអាសន្នមិន�្រឹម�្រូវទ�។ ប្រហែលជាអ្នកបានផ្លាស់ប្�ូរពាក្យសំងា�់របស់អ្នករួចហើយ ឬបានស្នើពាក្យសំងា�់បណ្�ោះអាសន្ន�្មីហើយ។',
-'resetpass_forbidden'     => 'ពាក្យសំងា�់មិនអាចផ្លាស់ប្�ូរបានទ�',
-'resetpass_missing'       => 'ទិន្នន�យមិន�្រូវបានបញ្ចូលទ�។',
+'resetpass'                 => '​ប្�ូរ​ពាក្យសំងា�់​',
+'resetpass_announce'        => 'អ្នកបានឡុកអ៊ីន​ដោយ​អក្សរកូដអ៊ីមែល​បណ្�ោះអាសន្ន​មួយ​។ ដើម្បី​បញ្ចប់​ការឡុកអ៊ីន អ្នក�្រូវ�ែ​កំណ�់​ពាក្យសំងា�់�្មី​មួយនៅទីន�ះ ៖',
+'resetpass_text'            => '<!-- បន្�ែមឃ្លានៅទីន�ះ -->',
+'resetpass_header'          => 'ប្ដូរ​ពាក្យសំងា�់​គណនី',
+'oldpassword'               => 'ពាក្យសំងា�់ចាស់៖',
+'newpassword'               => 'ពាក្យសំងា�់�្មី៖',
+'retypenew'                 => 'សូមវាយពាក្យសំងា�់�្មី​ម្�ងទៀ�៖',
+'resetpass_submit'          => 'ដាក់ពាក្យសំងា�់ និង​ឡុកអ៊ីន',
+'resetpass_success'         => 'ពាក្យសំងា�់របស់អ្នក�្រូវបានផ្លាស់ប្�ូរដោយជោគជ�យហើយ! ឥឡូវន�ះកំពុងឡុកអ៊ីន...',
+'resetpass_bad_temporary'   => 'ពាក្យសំងា�់បណ្�ោះអាសន្នមិន�្រឹម�្រូវទ�។ ប្រហែលជាអ្នកបានផ្លាស់ប្�ូរពាក្យសំងា�់របស់អ្នករួចហើយ ឬបានស្នើពាក្យសំងា�់បណ្�ោះអាសន្ន�្មីហើយ។',
+'resetpass_forbidden'       => 'ពាក្យសំងា�់មិនអាចផ្លាស់ប្�ូរបានទ�',
+'resetpass-no-info'         => 'អ្នក​ចាំបាច់​�្រូវ�ែ​ឡុកអ៊ីន ដើម្បី​ចូលដំណើរការ​ទំព�រ​ន�ះ​ដោយផ្ទាល់​។',
+'resetpass-submit-loggedin' => 'ប្�ូរពាក្យសំងា�់',
+'resetpass-temp-password'   => 'ពាក្យសំងា�់បណ្�ោះអាសន្ន:',
 
 # Edit page toolbar
 'bold_sample'     => 'អក្សរដិ�',
@@ -752,8 +713,8 @@ $2',
 'hr_tip'          => 'បន្ទា�់ដ�ក (មិនសូវប្រើទ�)',
 
 # Edit pages
-'summary'                          => 'ស�ចក្ដីសង្��ប',
-'subject'                          => 'ប្រធានបទ/ចំណងជើងរង',
+'summary'                          => 'ស�ចក្ដីសង្��ប:',
+'subject'                          => 'ប្រធានបទ/ចំណងជើងរង:',
 'minoredit'                        => 'ន�ះជា​កំណែប្រែ�ិច�ួចប៉ុណ្ណោះ',
 'watchthis'                        => '�ាមដាន​ទំព�រន�ះ',
 'savearticle'                      => 'រក្សាទំព�រទុក',
@@ -767,8 +728,8 @@ $2',
 'missingcommenttext'               => 'សូមបញ្ចូលមួយវិចារនៅ�ាងក្រោម។',
 'missingcommentheader'             => "'''រំលឹក៖''' អ្នកមិនទាន់បានផ្ដល់ឱ្យនូវ ប្រធានបទ/ចំណងជើង របស់វិចារន�ះទ�។
 បើសិនជាអ្នកចុច '''រក្សាទុក''' ម្ដងទៀ�នោះកំណែប្រែរបស់អ្នកនឹង�្រូវរក្សាទុកដោយគ្មានវា។",
-'summary-preview'                  => 'ការមើលជាមុននូវស�ចក្ដីសង្��ប',
-'subject-preview'                  => 'ការមើលជាមុននូវប្រធានបទ/ចំណងជើង',
+'summary-preview'                  => 'ការមើលជាមុននូវស�ចក្ដីសង្��ប:',
+'subject-preview'                  => 'ការមើលជាមុននូវប្រធានបទ/ចំណងជើង:',
 'blockedtitle'                     => 'អ្នកប្រើប្រាស់�្រូវបានហាមឃា�់',
 'blockedtext'                      => '<big>\'\'\'ឈ្មោះគណនី (ឬអាសយដ្ឋាន IP)របស់អ្នក�្រូវបានហាមឃា�់ហើយ។\'\'\'</big>
 
@@ -835,53 +796,55 @@ $2',
 * '''IE(Internet Explorer):''' សង្ក�់ [Ctrl] ឱ្យជាប់ រួចចុច ''Refresh''ប៊ូ�ុង ឬក�ចុច ''Ctrl-F5''​។ 
 * '''Konqueror:''' ចុចប៊ូ�ុង  ''Reload'' ឬក�ចុច ''F5'' 
 * '''Opera:''' សូមចុច  ''[Tools]→[Preferences]''​។",
-'usercssjsyoucanpreview'           => "<strong>គន្លឹះ ៖ </strong> សូមប្រើប្រាស់​ប្រអប់ 'បង្ហាញការមើលមុន' ដើម្បី​ធ្វើ��ស្�​សន្លឹក CSS/JS �្មីរបស់អ្នក​មុននឹង​រក្សាទុកវា ។",
+'usercssjsyoucanpreview'           => "'''គន្លឹះ ៖ ''' សូមប្រើប្រាស់​ប្រអប់ 'បង្ហាញការមើលមុន' ដើម្បី​ធ្វើ��ស្�​សន្លឹក CSS/JS �្មីរបស់អ្នក​មុននឹង​រក្សាទុកវា ។",
 'usercsspreview'                   => "'''កុំភ្ល�ច�ា​អ្នកគ្រាន់�ែ​កំពុងមើលជាមុនសន្លឹក CSS របស់អ្នក។ 
 វាមិនទាន់​�្រូវបានរក្សាទុកទ�!'''",
 'userjspreview'                    => "'កុំភ្ល�ច�ាអ្នកគ្រាន់�ែកំពុង ធ្វើ��ស្�/មើលមុន ទំព�រអ្នកប្រើប្រាស់  JavaScript របស់អ្នក។ វាមិនទាន់�្រូវបានរក្សាទុកទ�!'''",
 'userinvalidcssjstitle'            => "'''ប្រយ��្ន៖''' គ្មានសំបក \"\$1\"។ ចងចាំ�ា ទំព�រផ្ទាល់�្លួន .css និង .js ប្រើប្រាស់ ចំណងជើង ជាអក្សរ�ូច, ឧទាហរណ�  {{ns:user}}:Foo/monobook.css �្រឹម�្រូវ, រីឯ {{ns:user}}:Foo/Monobook.css មិន�្រឹម�្រូវ។",
 'updated'                          => '(បានបន្ទាន់សម�យ)',
-'note'                             => '<strong>ចំណាំ៖</strong>',
-'previewnote'                      => '<strong>ន�ះគ្រាន់�ែជា​ការបង្ហាញការមើលជាមុនប៉ុណ្ណោះ។ បំលាស់ប្ដូរ​មិនទាន់បាន​រក្សាទុកទ�!</strong>',
+'note'                             => "'''ចំណាំ៖'''",
+'previewnote'                      => "'''ន�ះគ្រាន់�ែជា​ការបង្ហាញការមើលជាមុនប៉ុណ្ណោះ។ បំលាស់ប្ដូរ​មិនទាន់បាន​រក្សាទុកទ�!'''",
 'previewconflict'                  => 'ការមើលមុនន�ះយោង�ាមអ�្�បទក្នុងប្រអប់កែប្រែ�ាងលើ។ ទំព�រអ�្�បទនឹងបង្ហាញច�ញបែបន�ះប្រសិនបើអ្នកជ្រើសរើសរក្សាទុក។',
-'session_fail_preview'             => '<strong>សូមអភ�យទោស! យើងមិនអាចរក្សាទុកការកែប្រែរបស់អ្នកបានទ� ដោយសារបា�់ទិន្នន�យវ�នការងារ។
+'session_fail_preview'             => "'''សូមអភ�យទោស! យើងមិនអាចរក្សាទុកការកែប្រែរបស់អ្នកបានទ� ដោយសារបា�់ទិន្នន�យវ�នការងារ។
 
 សូមព្យាយាមម្�ងទៀ�។ 
 
-បើនៅ�ែមិនបានទ� សូមព្យាយាម[[Special:UserLogout|ចាកច�ញពីគណនីរបស់អ្នក]] រួចឡុកអ៊ីនឡើងវិញ។</strong>',
-'session_fail_preview_html'        => "<strong>សូមអភ�យទោស! យើងមិនអាចរក្សាទុកកំណែប្រែរបស់លោកអ្នកបានទ� ដោយសារបា�់ទិន្នន�យវ�នការងារ។</strong>
+បើនៅ�ែមិនបានទ� សូមព្យាយាម[[Special:UserLogout|ចាកច�ញពីគណនីរបស់អ្នក]] រួចឡុកអ៊ីនឡើងវិញ។'''",
+'session_fail_preview_html'        => "'''សូមអភ�យទោស! យើងមិនអាចរក្សាទុកកំណែប្រែរបស់លោកអ្នកបានទ� ដោយសារបា�់ទិន្នន�យវ�នការងារ។'''
 
 ''ដោយសារ {{SITENAME}} មានអក្សរកូដ HTMLឆៅ �្រូវបានបើកឱ្យប្រើប្រាស់ ហ��ុន�ះទំព�រមើលមុន�្រូវបានបិទបាំង ដើម្បីចៀសវាងការវាយលុកដោយ JavaScript ។''
 
-<strong>បើន�ះជាការប៉ុនប៉ងកែប្រែសមស្រប សូមព្យាយាមម្�ងទៀ�។ 
+'''បើន�ះជាការប៉ុនប៉ងកែប្រែសមស្រប សូមព្យាយាមម្�ងទៀ�។ 
 
-បើនៅ�ែមិនបានទ� សូមព្យាយាម[[Special:UserLogout|ចាកច�ញពីគណនីរបស់អ្នក]] រួចឡុកអ៊ីនឡើងវិញ។</strong>",
+បើនៅ�ែមិនបានទ� សូមព្យាយាម[[Special:UserLogout|ចាកច�ញពីគណនីរបស់អ្នក]] រួចឡុកអ៊ីនឡើងវិញ។'''",
 'editing'                          => 'កំពុងកែប្រែ​ $1',
 'editingsection'                   => "កំពុងកែប្រែ'''$1'''(ផ្នែក)",
-'editingcomment'                   => 'កែប្រែ $1 (យោបល់)',
+'editingcomment'                   => 'កែប្រែ $1 (ផ្នែក�្មី)',
 'editconflict'                     => 'ភាពឆ្គងនៃកំណែប្រែ៖ $1',
 'explainconflict'                  => 'ចាប់�ាំងពីអ្នកបានបង្កើ�ទំព�រន�ះមក មានអ្នកដទៃបានកែប្រែវាហើយ។ ផ្នែក�ាងលើនៃទំព�រអ�្�បទ គឺជាកំណែប្រែ�្មី។ កំណែប្រែរបស់អ្នក គឺនៅផ្នែក�ាងក្រោម។ ចូរដាក់កំណែប្រែរបស់អ្នកបញ្ចូលគ្នាជាមួយអ�្�បទដែលមាននៅផ្នែក�ាងលើ។​ <strong>អ�្�បទនៅផ្នែក��ាងលើ</strong> នឹង�្រូវរក្សាទុក នៅព�លអ្នក ចុច"រក្សាទំព�រ"។',
 'yourtext'                         => 'អ�្�បទរបស់អ្នក',
 'storedversion'                    => 'កំណែដែលបានស្�ារឡើងវិញ',
-'editingold'                       => '<strong>បម្រាម:អ្នកកំពុង�ែកែកំណែប្រែដែលហួសសម�យរបស់ទំព�រន�ះ។
+'editingold'                       => "'''បម្រាម:អ្នកកំពុង�ែកែកំណែប្រែដែលហួសសម�យរបស់ទំព�រន�ះ។
 
-ប្រសិនបើអ្នករក្សាវាទុក កំណែប្រែពីមុនទាំងប៉ុន្មាននឹង�្រូវបា�់បង់។</strong>',
+ប្រសិនបើអ្នករក្សាវាទុក កំណែប្រែពីមុនទាំងប៉ុន្មាននឹង�្រូវបា�់បង់។'''",
 'yourdiff'                         => 'ភាព�ុសគ្នា',
-'copyrightwarning'                 => 'សូមធ្វើការក�់សម្គាល់​�ា គ្រប់ការរួមចំណែក​របស់អ្នក​នៅលើ {{SITENAME}} �្រូវបាន​ពិចារណា​ដើម្បី​ផ្សព្វផ្សាយ​�ាម​លិ�ិ�អនុញ្ញា� $2 (សូម​មើល $1 សម្រាប់​ព��៌មាន​លំអិ�) ។ បើអ្នកមិនចង់ឱ្យ​សំណ�រ​របស់អ្នក​�្រូវបានគ�លុប កែប្រែ ឬក�អ្នកមិនមានបំណងផ្សព្វផ្សាយវា សូមកុំដាក់​ស្នើវា​នៅទីន�ះអី។<br />
+'copyrightwarning'                 => "សូមធ្វើការក�់សម្គាល់​�ា គ្រប់ការរួមចំណែក​របស់អ្នក​នៅលើ {{SITENAME}} �្រូវបាន​ពិចារណា​ដើម្បី​ផ្សព្វផ្សាយ​�ាម​លិ�ិ�អនុញ្ញា� $2 (សូម​មើល $1 សម្រាប់​ព��៌មាន​លំអិ�) ។ បើអ្នកមិនចង់ឱ្យ​សំណ�រ​របស់អ្នក​�្រូវបានគ�លុប កែប្រែ ឬក�អ្នកមិនមានបំណងផ្សព្វផ្សាយវា សូមកុំដាក់​ស្នើវា​នៅទីន�ះអី។<br />
 អ្នក�្រូវសន្យា�ា ​អ្នកសរស�រវា​ដោយ�្លួនអ្នក ឬបានចម្លងវា​ពី​កម្មសិទ្ធិសាធារណៈឬពីប្រភពស�រី ។
-<strong>មិន�្រូវ​ដាក់ស្នើ​ការងារមានរក្សាសិទ្ធិកម្មសិទ្ឋិបញ្ញាដោយគ្មានការអនុញ្ញា�ទ�!</strong>',
-'copyrightwarning2'                => 'សូមធ្វើការក�់សម្គាល់​�ា គ្រប់ការរួមចំណែក​ទៅ {{SITENAME}} អាច​�្រូវបាន​កែប្រែ​ ផ្លាស់ប្ដូរ រឺលុបចោល ដោយអ្នករួមចំណែកដទៃទៀ�។ បើអ្នកមិនចង់ឱ្យ​សំណ�ររបស់អ្នក​�្រូវបានគ�កែប្រែដោយ​គ្មានអាសូរទ�នោះ សូមកុំដាក់​ស្នើវា​នៅទីន�ះអី។<br />
+'''មិន�្រូវ​ដាក់ស្នើ​ការងារមានរក្សាសិទ្ធិកម្មសិទ្ឋិបញ្ញាដោយគ្មានការអនុញ្ញា�ទ�!'''",
+'copyrightwarning2'                => "សូមធ្វើការក�់សម្គាល់​�ា គ្រប់ការរួមចំណែក​ទៅ {{SITENAME}} អាច​�្រូវបាន​កែប្រែ​ ផ្លាស់ប្ដូរ រឺលុបចោល ដោយអ្នករួមចំណែកដទៃទៀ�។ បើអ្នកមិនចង់ឱ្យ​សំណ�ររបស់អ្នក​�្រូវបានគ�កែប្រែដោយ​គ្មានអាសូរទ�នោះ សូមកុំដាក់​ស្នើវា​នៅទីន�ះអី។<br />
 អ្នក�្រូវសន្យាជាមួយ​យើង​�្ញុំផងដែរ�ា ​អ្នកសរស�រវា​ដោយ�្លួនអ្នក ឬ បានចម្លងវា​ពី​កម្មសិទ្ធិសាធារណៈឬពីប្រភពស�រី (សូមមើល $1 សម្រាប់ព��៌មាន​លំអិ�)។
 
-<strong>មិន�្រូវ​ដាក់ស្នើ​ការងារមានរក្សាសិទ្ធិកម្មសិទ្ឋិបញ្ញាដោយគ្មានការអនុញ្ញា�ទ�!</strong>',
-'longpagewarning'                  => '<strong>ប្រយ��្ន ៖ ទំព�រន�ះមានទំហំ $1 គីឡូបៃ។ ឧបករណ�រាវរក(browser)�្លះអាចមានបញ្ហាក្នុងការកែប្រែទំព�រក្បែរឬធំជាង៣២គីឡូបៃ​។
+'''មិន�្រូវ​ដាក់ស្នើ​ការងារមានរក្សាសិទ្ធិកម្មសិទ្ឋិបញ្ញាដោយគ្មានការអនុញ្ញា�ទ�!'''",
+'longpagewarning'                  => "'''ប្រយ��្ន ៖ ទំព�រន�ះមានទំហំ $1 គីឡូបៃ។ ឧបករណ�រាវរក(browser)�្លះអាចមានបញ្ហាក្នុងការកែប្រែទំព�រក្បែរឬធំជាង៣២គីឡូបៃ​។
 
-សូមពិចារណាអំពីលទ្ឋភាពបំបែកទំព�រជាផ្នែក�ូចៗ ។ </strong>',
-'longpageerror'                    => '<strong>កំហុស៖ អ�្�បទ​ដែល​អ្នក​បានដាក់​ស្នើ​មានទំហំ $1 គីឡូបៃ ដែលធំជាង​ទំហំអ�ិបរមា $2 គីឡូបៃ។ អ�្�បទន�ះ​មិនអាច​រក្សាទុកបានទ�។</strong>',
-'readonlywarning'                  => '<strong>បម្រាម​៖ មូលដ្ឋានទិន្នន�យ​�្រូវ​បាន​ចាក់សោ​សម្រាប់​ការរក្សាទុក ដូច្ន�ះ​អ្នក​នឹង​មិន​អាច​រក្សាទុក​រាល់​កំណែប្រែ​របស់​អ្នក​បាន​ទ�​ឥឡូវន�ះ​។ សូម​អ្នក​ចម្លង​អ�្�បទ រួច​ដាក់​ទៅ​ក្នុង​ឯកសារ​ដែល​ជា​អ�្�បទ ហើយ​បន្ទាប់មក​រក្សាវាទុក​។</strong>',
-'protectedpagewarning'             => '<strong>ប្រយ��្ន៖ ទំព�រន�ះ​�្រូវបានចាក់សោ។ ដូច្ន�ះ​មាន�ែ​អ្នកប្រើប្រាស់​ដែល​មាន​អភ�យឯកសិទ្ឋិ​ជាអ្នក�ែទាំប្រព�ន្ឋ​ (sysop) ទ�ទើបអាច​កែប្រែ​វាបាន។</strong>',
+សូមពិចារណាអំពីលទ្ឋភាពបំបែកទំព�រជាផ្នែក�ូចៗ ។ '''",
+'longpageerror'                    => "'''កំហុស៖ អ�្�បទ​ដែល​អ្នក​បានដាក់​ស្នើ​មានទំហំ $1 គីឡូបៃ ដែលធំជាង​ទំហំអ�ិបរមា $2 គីឡូបៃ។ អ�្�បទន�ះ​មិនអាច​រក្សាទុកបានទ�។'''",
+'readonlywarning'                  => "'''ប្រយ��្ន:មូលដ្ឋានទិន្នន�យ�្រូវបានចាក់សោសម្រាប់ការរក្សាទុក ដូច្ន�ះអ្នកនឹងមិនអាចរក្សាទុករាល់កំណែប្រែរបស់អ្នកបានទ�ឥឡូវន�ះ។ សូមអ្នកចម្លងអ�្�បទ រួចដាក់ទៅក្នុងឯកសារដែលជាអ�្�បទ ហើយបន្ទាប់មករក្សាវាទុកនៅព�លក្រោយ។'''
+
+អ្នកអភិបាលដែលបានចាក់សោវា បានផ្ដល់នួវការពន្យល់ដូច�ទៅ៖ $1",
+'protectedpagewarning'             => "'''ប្រយ��្ន៖ ទំព�រន�ះ​�្រូវបានចាក់សោ។ ដូច្ន�ះ​មាន�ែ​អ្នកប្រើប្រាស់​ដែល​មាន​អភ�យឯកសិទ្ឋិ​ជាអ្នក�ែទាំប្រព�ន្ឋ​ (sysop) ទ�ទើបអាច​កែប្រែ​វាបាន។'''",
 'semiprotectedpagewarning'         => "'''សម្គាល់៖''' ទំព�រន�ះ​បាន�្រូវ​ចាក់សោ។ ដូច្ន�ះ​មាន�ែអ្នកប្រើប្រាស់​ដែលបានចុះឈ្មោះ​ទើបអាចកែប្រែ​វា​បាន។",
-'titleprotectedwarning'            => '<strong>ប្រយ��្ន៖ ទំព�រន�ះ�្រូវបានចាក់សោ ដូច្ន�ះមាន�ែអ្នកប្រើប្រាស់មួយចំនួនប៉ុណ្ណោះអាចបង្កើ�វា។</strong>',
+'titleprotectedwarning'            => "'''ប្រយ��្ន៖ ទំព�រន�ះ�្រូវបានចាក់សោ ដូច្ន�ះមាន�ែអ្នកប្រើប្រាស់មួយចំនួនប៉ុណ្ណោះអាចបង្កើ�វា។'''",
 'templatesused'                    => 'ទំព�រគំរូប្រើនៅក្នុងទំព�រន�ះគឺ៖',
 'templatesusedpreview'             => 'ទំព�រគំរូ​នានាដែល​បានប្រើប្រាស់​ក្នុងការមើលមុនន�ះ៖',
 'templatesusedsection'             => 'ទំព�រគំរូដែល�្រូវបានប្រើប្រាស់ក្នុងផ្នែកន�ះ៖',
@@ -900,6 +863,16 @@ $2',
 អ្នក​គួរពិចារណាមើល​�ើជាការសមស្របទ� ដែលបន្�កែប្រែ​ទំព�រន�ះ ។
 
 កំណ�់ហ��ុ​លុបច�ញ​ចំពោះទំព�រន�ះ �្រូវបានផ្ដល់​ទីន�ះ​ដើម្បីងាយ​�ាមដាន ៖",
+'deleted-notice'                   => 'ទំព�រន�ះ�្រូវបានលុបច�ញហើយ។
+កំណ�់ហ��ុចំពោះ​ទំព�រន�ះ�្រូវបាន​ផ្ដល់ឱ្យ�ាងក្រោម​សម្រាប់ជាការសំអាង។',
+'deletelog-fulllog'                => 'មើលកំណ�់ហ��ុព�ញល�ញ',
+'edit-gone-missing'                => 'មិនអាចបន្ទាន់សម�យទំព�រន�ះទ�។
+
+ទំព�រន�ះហាក់ដូចជា�្រូវបានលុបចោលហើយ។',
+'edit-no-change'                   => 'ការកែប្រែរបស់អ្នក�្រូវបានចោល ព្រោះគ្មានការផ្លាស់ប្ដូរណាមួយ�្រូវបានធ្វើនៅលើអ�្�បទន�ះទ�។',
+'edit-already-exists'              => 'មិនអាចបង្កើ�ទំព�រ�្មីមួយទ�។
+
+ទំព�រន�ះមានរួចហើយ។',
 
 # Parser/template warnings
 'post-expand-template-inclusion-warning'  => 'ប្រយ��្ន៖ ទំព�រគំរូដែលបានបញ្ចូលមានទំហំធំព�កហើយ។
@@ -917,28 +890,28 @@ $2',
 ហ��ុផលដែល�្រូវលើកឡើងដោយ $3 គឺ ''$2''",
 
 # History pages
-'viewpagelogs'        => 'មើលកំណ�់ហ��ុសម្រាប់ទំព�រន�ះ',
-'nohistory'           => 'មិនមានប្រវ�្�ិកំណែប្រែ​ចំពោះទំព�រន�ះ។',
-'revnotfound'         => 'រកមិនឃើញ​កំណែ',
-'revnotfoundtext'     => 'កំណែប្រែចាស់របស់ទំព�រដែលអ្នកស្វែងរកមិនមានទ�។ ចូរពិនិ�្យURLដែលអ្នកធ្លាប់ដំណើរការទំព�រន�ះ។',
-'currentrev'          => 'កំណែបច្ចុប្បន្ន',
-'revisionasof'        => 'កំណែ​របស់ $1',
-'revision-info'       => 'កំណែ​របស់ $1 ដោយ $2',
-'previousrevision'    => '� កំណែ​មុន',
-'nextrevision'        => 'កំណែបន្ទាប់ →',
-'currentrevisionlink' => 'កំណែប្រែបច្ចុប្បន្ន',
-'cur'                 => 'បច្ចុប្បន្ន',
-'next'                => 'បន្ទាប់',
-'last'                => 'ចុងក្រោយ',
-'page_first'          => 'ដំបូង',
-'page_last'           => 'ចុងក្រោយ',
-'histlegend'          => "ជម្រើសផ្ស�ងគ្នា៖ សូមគូសក្នុងកូនប្រអប់ពីមុ�កំណែ(versions)ដែលអ្នកចង់ប្រៀបធៀប រួចចុចច្នុច enter ឬប៊ូ�ុងនៅ�ាងក្រោម។<br />
+'viewpagelogs'           => 'មើលកំណ�់ហ��ុសម្រាប់ទំព�រន�ះ',
+'nohistory'              => 'មិនមានប្រវ�្�ិកំណែប្រែ​ចំពោះទំព�រន�ះ។',
+'currentrev'             => 'កំណែបច្ចុប្បន្ន',
+'currentrev-asof'        => 'កំណែប្រែបច្ចុប្បន្ន $1',
+'revisionasof'           => 'កំណែ​របស់ $1',
+'revision-info'          => 'កំណែ​របស់ $1 ដោយ $2', # Additionally available: $3: revision id
+'previousrevision'       => '� កំណែ​មុន',
+'nextrevision'           => 'កំណែបន្ទាប់ →',
+'currentrevisionlink'    => 'កំណែប្រែបច្ចុប្បន្ន',
+'cur'                    => 'បច្ចុប្បន្ន',
+'next'                   => 'បន្ទាប់',
+'last'                   => 'ចុងក្រោយ',
+'page_first'             => 'ដំបូង',
+'page_last'              => 'ចុងក្រោយ',
+'histlegend'             => "ជម្រើសផ្ស�ងគ្នា៖ សូមគូសក្នុងកូនប្រអប់ពីមុ�កំណែ(versions)ដែលអ្នកចង់ប្រៀបធៀប រួចចុចច្នុច enter ឬប៊ូ�ុងនៅ�ាងក្រោម។<br />
 '''ពាក្យ�ំណាង'''៖(បច្ចុប្បន្ន) = ភាព�ុសគ្នាជាមួយនឹងកំណែបច្ចុប្បន្ន, (ចុងក្រោយ) = ភាព�ុសគ្នារវាងកំណែប្រែពីមុន, �ិច = កំណែប្រែ�ិច�ួច",
-'deletedrev'          => '[�្រូវបាន​លុបចោល]',
-'histfirst'           => 'ដំបូងៗបំផុ�',
-'histlast'            => '�្មីៗបំផុ�',
-'historysize'         => '({{PLURAL:$1|1បៃ|$1បៃ}})',
-'historyempty'        => '(ទទ�)',
+'history-fieldset-title' => 'ស្វែងរកក្នុងប្រវ�្�ិ',
+'deletedrev'             => '[�្រូវបាន​លុបចោល]',
+'histfirst'              => 'ដំបូងៗបំផុ�',
+'histlast'               => '�្មីៗបំផុ�',
+'historysize'            => '({{PLURAL:$1|1បៃ|$1បៃ}})',
+'historyempty'           => '(ទទ�)',
 
 # Revision feed
 'history-feed-title'          => 'ប្រវ�្�ិនៃកំណែ',
@@ -998,6 +971,7 @@ $2',
 'mergehistory-invalid-destination' => 'ទំព�រ គោលដៅ �្រូវ�ែមាន មួយចំណងជើង បានការ។',
 'mergehistory-autocomment'         => 'បានរំលាយបញ្ចូល [[:$1]] ទៅក្នុង [[:$2]]',
 'mergehistory-comment'             => 'រំលាយបញ្ចូល [[:$1]] ទៅក្នុង [[:$2]]: $3',
+'mergehistory-same-destination'    => 'ទំព�រប្រភពនិងទំព�រគោលដៅមិនអាចមានចំណងជើងដូចគ្នាបានទ�។',
 
 # Merge log
 'mergelog'           => 'កំណ�់ហ��ុនៃការបញ្ចូលរួមគ្នា',
@@ -1010,115 +984,177 @@ $2',
 'difference'              => '(ភាព�ុសគ្នានៃកំណែនានា)',
 'lineno'                  => 'បន្ទា�់ទី$1៖',
 'compareselectedversions' => 'ប្រៀបធៀប​កំណែប្រែ​ដែលបាន​ជ្រើសយក',
+'visualcomparison'        => 'បំរៀបធៀបរាងរៅ',
+'wikicodecomparison'      => 'បំរៀបធៀបអ�្�បទវិគី',
 'editundo'                => 'មិនធ្វើវិញ',
 'diff-multi'              => '({{PLURAL:$1|កំណែប្រែកម្រិ�បង្គួរមួយ|កំណែប្រែកម្រិ�បង្គួរចំនួន$1}}មិន�្រូវបានបង្ហាញ)',
+'diff-movedto'            => 'បានប្ដូរទី�ាំងទៅ $1',
+'diff-styleadded'         => 'បានបន្�ែម$1រចនាប�',
+'diff-added'              => 'បានបន្�ែម$1',
+'diff-changedto'          => 'បានផ្លាស់ប្ដូរទៅ$1',
+'diff-movedoutof'         => 'បានប្ដូរទី�ាំងច�ញពី $1',
+'diff-styleremoved'       => 'បានដកច�ញ$1រចនាប�',
+'diff-removed'            => 'បានដកច�ញ$1',
+'diff-changedfrom'        => 'បានផ្លាស់ប្ដូរពី$1',
+'diff-src'                => 'ប្រភព',
+'diff-withdestination'    => 'ជាមួយនឹងគោលដៅ$1',
+'diff-with'               => '&#32;ជាមួយ $1 $2',
+'diff-with-final'         => '&#32;áž“áž·áž„ $1 $2',
+'diff-width'              => 'ទទឹង',
+'diff-height'             => 'កម្ពស់',
+'diff-p'                  => "'''ក�ា�ណ្ឌ'''មួយ",
+'diff-h1'                 => "'''ចំណងជើង (កម្រិ� ១)'''មួយ",
+'diff-h2'                 => "'''ចំណងជើង (កម្រិ� ២)'''មួយ",
+'diff-h3'                 => "'''ចំណងជើង (កម្រិ� ៣)'''មួយ",
+'diff-h4'                 => "'''ចំណងជើង (កម្រិ� ៤)'''មួយ",
+'diff-h5'                 => "'''ចំណងជើង (កម្រិ� ៥)'''មួយ",
+'diff-ul'                 => "'''បញ្ជីគ្មានរបៀប'''មួយ",
+'diff-ol'                 => "'''បញ្ជីមានរបៀប'''មួយ",
+'diff-table'              => "'''�ារាង'''មួយ",
+'diff-tbody'              => "'''មា�ិកា�ារាង'''មួយ",
+'diff-tr'                 => "'''ជួរដ�ក'''មួយ",
+'diff-td'                 => "'''ប្រអប់'''មួយ",
+'diff-br'                 => "'''ចុះបន្ទា�់'''",
+'diff-hr'                 => "'''បន្ទា�់ដ�ក'''មួយ",
+'diff-dl'                 => "'''បញ្ជីនិយមន�យ'''មួយ",
+'diff-dd'                 => "'''និយមន�យ'''មួយ",
+'diff-img'                => "'''រូបភាព'''មួយ",
+'diff-a'                  => "'''�ំណភ្ជាប់'''មួយ",
+'diff-i'                  => "'''អក្សរទ្រ��'''",
+'diff-b'                  => "'''អក្សរដិ�'''",
+'diff-font'               => "'''ពុម្ពអក្សរ'''",
+'diff-big'                => "'''ធំ'''",
+'diff-del'                => "'''�្រូវបានលប់ចោល'''",
+'diff-tt'                 => "'''ទទឹង��រ'''",
+'diff-sub'                => "'''អក្សរ�ូចក្រោម'''",
+'diff-sup'                => "'''អក្សរ�ូចលើ'''",
+'diff-strike'             => "'''ឆូ�'''",
 
 # Search results
-'searchresults'             => 'លទ្ធផលស្វែងរក',
-'searchresulttext'          => 'ចំពោះព��៌មានបន្�ែមអំពីការស្វែងរកក្នុង{{SITENAME}}, សូមមើល[[ជំនួយ:មា�ិកា|ទំព�រជំនួយ]]។',
-'searchsubtitle'            => 'អ្នកបានស្វែងរក \'\'\'[[:$1]]\'\'\'([[Special:Prefixindex/$1|គ្រប់ទំព�រដែលផ្ដើមដោយ "$1"]] | [[Special:WhatLinksHere/$1|គ្រប់ទំព�រដែលភ្ជាប់មក "$1"]])',
-'searchsubtitleinvalid'     => "អ្នកបានស្វែងរក '''$1'''",
-'noexactmatch'              => "'''គ្មានទំព�រ​ណាដែលមានចំណងជើង \"\$1\" ទ�។''' អ្នកអាច [[:\$1|បង្កើ�ទំព�រន�ះ]]។",
-'noexactmatch-nocreate'     => "'''គ្មានទំព�រ​ណាដែលមានចំណងជើង \"\$1\"ទ�។'''",
-'toomanymatches'            => 'មាន�ំណភ្ជាប់ច្រើនណាស់�្រូវបានបង្ហាញ ចូរព្យាយាមប្រើសំណួរផ្ស�ងមួយទៀ�',
-'titlematches'              => 'ភាព�្រូវគ្នានៃចំណងជើងទំព�រ',
-'notitlematches'            => 'ពុំមានចំណងជើងទំព�រណាផ្គូផ្គងទ�',
-'textmatches'               => 'ទំព�រអ�្�បទផ្គូរផ្គងគ្នា',
-'notextmatches'             => 'គ្មានទំព�រណាមួយដែលមាន�្លឹមសារផ្គូផ្គងនឹងឃ្លាឬពាក្យន�ះទ�',
-'prevn'                     => 'មុន $1',
-'nextn'                     => 'បន្ទាប់ $1',
-'viewprevnext'              => 'មើល ($1) ($2) ($3)',
-'search-result-size'        => '$1({{PLURAL:$2|១ពាក្យ|$2ពាក្យ}})',
-'search-result-score'       => 'កម្រិ�នៃភាពទាក់ទិន៖ $1%',
-'search-redirect'           => '(បញ្ជូនបន្� $1)',
-'search-section'            => '(ផ្នែក $1)',
-'search-suggest'            => 'ប្រហែលជាអ្នកចង់រក៖ $1',
-'search-interwiki-caption'  => 'គម្រោងជាបងប្អូន',
-'search-interwiki-default'  => '$1 លទ្ធផល៖',
-'search-interwiki-more'     => '(បន្�ែមទៀ�)',
-'search-mwsuggest-enabled'  => 'មានសំណើ',
-'search-mwsuggest-disabled' => 'គ្មានសំណើ',
-'search-relatedarticle'     => 'ទាក់ទិន',
-'searchrelated'             => 'ទាក់ទិន',
-'searchall'                 => 'ទាំងអស់',
-'showingresults'            => "�ាងក្រោមកំពុងបង្ហាញរហូ�ដល់ {{PLURAL:$1|'''១''' លទ្ឋផល|'''$1''' លទ្ឋផល}} ចាប់ផ្ដើមពីល�� #'''$2'''។",
-'showingresultsnum'         => "កំពុងបង្ហាញ {{PLURAL:$3|'''1''' result|'''$3''' លទ្ឋផល}}�ាងក្រោម ចាប់ផ្ដើមដោយ #'''$2''' ។",
-'showingresultstotal'       => "�ាងក្រោមកំពុងបង្ហាញ {{PLURAL:$3|result '''$1''' of '''$3'''|លទ្ឋផល '''$1 - $2''' នៃ '''$3'''}}",
-'powersearch'               => 'ស្វែងរក�្នាក់�្ពស់',
-'powersearch-legend'        => 'ស្វែងរក�្នាក់�្ពស់',
-'powersearch-ns'            => 'ស្វែងរកក្នុងលំហឈ្មោះ:',
-'powersearch-redir'         => 'បញ្ជីការបញ្ជូនបន្�',
-'powersearch-field'         => 'ស្វែងរក',
-'search-external'           => 'ស្វែងរកនៅ�ាងក្រៅ',
+'searchresults'                    => 'លទ្ធផលស្វែងរក',
+'searchresults-title'              => 'លទ្ធផល​ស្វែងរក​សម្រាប់ "$1"',
+'searchresulttext'                 => 'ចំពោះព��៌មានបន្�ែមអំពីការស្វែងរកក្នុង{{SITENAME}}, សូមមើល[[ជំនួយ:មា�ិកា|ទំព�រជំនួយ]]។',
+'searchsubtitle'                   => 'អ្នកបានស្វែងរក \'\'\'[[:$1]]\'\'\'([[Special:Prefixindex/$1|គ្រប់ទំព�រដែលផ្ដើមដោយ "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|គ្រប់ទំព�រដែលភ្ជាប់មក "$1"]])',
+'searchsubtitleinvalid'            => "អ្នកបានស្វែងរក '''$1'''",
+'noexactmatch'                     => "'''គ្មានទំព�រ​ណាដែលមានចំណងជើង \"\$1\" ទ�។''' អ្នកអាច [[:\$1|បង្កើ�ទំព�រន�ះ]]។",
+'noexactmatch-nocreate'            => "'''គ្មានទំព�រ​ណាដែលមានចំណងជើង \"\$1\"ទ�។'''",
+'toomanymatches'                   => 'មាន�ំណភ្ជាប់ច្រើនណាស់�្រូវបានបង្ហាញ ចូរព្យាយាមប្រើសំណួរផ្ស�ងមួយទៀ�',
+'titlematches'                     => 'ភាព�្រូវគ្នានៃចំណងជើងទំព�រ',
+'notitlematches'                   => 'ពុំមានចំណងជើងទំព�រណាផ្គូផ្គងទ�',
+'textmatches'                      => 'ទំព�រអ�្�បទផ្គូរផ្គងគ្នា',
+'notextmatches'                    => 'គ្មានទំព�រណាមួយដែលមាន�្លឹមសារផ្គូផ្គងនឹងឃ្លាឬពាក្យន�ះទ�',
+'prevn'                            => 'មុន $1',
+'nextn'                            => 'បន្ទាប់ $1',
+'viewprevnext'                     => 'មើល ($1) ($2) ($3)',
+'searchmenu-legend'                => 'ជម្រើសនានាក្នុងការស្វែងរក',
+'searchmenu-exists'                => "* ទំព�រ '''[[$1]]'''",
+'searchmenu-new'                   => "'''[[:$1|បង្កើ�]]ទំព�រ ''[[$1]]'' នៅ​លើ​វិគី​ន�ះ!'''",
+'searchhelp-url'                   => 'Help:មា�ិកា',
+'searchprofile-articles'           => 'ទំព�រ​�្លឹមសារ',
+'searchprofile-articles-and-proj'  => 'ទំព�រ​មា�ិកា​និង​ទំព�រ​គម្រោង',
+'searchprofile-project'            => 'ទំព�រ​គម្រោង',
+'searchprofile-images'             => 'ឯកសារ',
+'searchprofile-everything'         => 'ទាំងអស់',
+'searchprofile-advanced'           => 'កម្រិ��្ពស់',
+'searchprofile-articles-tooltip'   => 'ស្វែងរកក្នុង $1',
+'searchprofile-project-tooltip'    => 'ស្វែងរកក្នុង $1',
+'searchprofile-images-tooltip'     => 'ស្វែងរកឯកសាររូបភាព',
+'searchprofile-everything-tooltip' => 'ស្វែងរកក្នុង�្លឹមសារទាំងអស់(រួមបញ្ចូលទាំងទំព�រពិភាក្សា)',
+'search-result-size'               => '$1({{PLURAL:$2|១ពាក្យ|$2ពាក្យ}})',
+'search-result-score'              => 'កម្រិ�នៃភាពទាក់ទិន៖ $1%',
+'search-redirect'                  => '(បញ្ជូនបន្� $1)',
+'search-section'                   => '(ផ្នែក $1)',
+'search-suggest'                   => 'ប្រហែលជាអ្នកចង់រក៖ $1',
+'search-interwiki-caption'         => 'គម្រោងជាបងប្អូន',
+'search-interwiki-default'         => '$1 លទ្ធផល៖',
+'search-interwiki-more'            => '(បន្�ែមទៀ�)',
+'search-mwsuggest-enabled'         => 'មានសំណើ',
+'search-mwsuggest-disabled'        => 'គ្មានសំណើ',
+'search-relatedarticle'            => 'ទាក់ទិន',
+'searchrelated'                    => 'ទាក់ទិន',
+'searchall'                        => 'ទាំងអស់',
+'showingresults'                   => "�ាងក្រោមកំពុងបង្ហាញរហូ�ដល់ {{PLURAL:$1|'''១''' លទ្ឋផល|'''$1''' លទ្ឋផល}} ចាប់ផ្ដើមពីល�� #'''$2'''។",
+'showingresultsnum'                => "កំពុងបង្ហាញ {{PLURAL:$3|'''1''' result|'''$3''' លទ្ឋផល}}�ាងក្រោម ចាប់ផ្ដើមដោយ #'''$2''' ។",
+'showingresultstotal'              => "{{PLURAL:$4|លទ្ឋផលស្វែងរក '''$1''' ក្នុងចំណោមលទ្ឋផលសរុប '''$3'''|លទ្ឋផលស្វែងរក '''$1 - $2''' ក្នុងចំណោមលទ្ឋផលសរុប '''$3'''}}",
+'search-nonefound'                 => 'មិនមានលទ្ធផលណាមួយ​�្រូវគ្នានឹងសំណើសុំន�ះទ�',
+'powersearch'                      => 'ស្វែងរក�្នាក់�្ពស់',
+'powersearch-legend'               => 'ស្វែងរក�្នាក់�្ពស់',
+'powersearch-ns'                   => 'ស្វែងរកក្នុងលំហឈ្មោះ:',
+'powersearch-redir'                => 'បញ្ជីការបញ្ជូនបន្�',
+'powersearch-field'                => 'ស្វែងរក',
+'search-external'                  => 'ស្វែងរកនៅ�ាងក្រៅ',
 
 # Preferences page
-'preferences'              => 'ចំណង់ចំណូលចិ�្�',
-'mypreferences'            => 'ចំណង់ចំណូលចិ�្�​',
-'prefs-edits'              => 'ចំនួនកំណែប្រែ៖',
-'prefsnologin'             => 'មិនបានឡុកអ៊ីន',
-'prefsnologintext'         => 'អ្នកចាំបាច់�្រូវ�ែ<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ឡុកអ៊ីន]</span> ដើម្បីកំណ�់ចំណង់ចំណូលចិ�្�របស់អ្នកប្រើប្រាស់។',
-'prefsreset'               => 'ចំណូលចិ�្�​ផ្ទាល់�្លួន�្រូវបានធ្វើឱ្យដូចដើមវិញពីកំណែមុនន�ះហើយ។',
-'qbsettings'               => 'របារទាន់ចិ�្�',
-'qbsettings-none'          => 'ទទ�',
-'qbsettings-fixedleft'     => 'ចុង�ាងឆ្វ�ង',
-'qbsettings-fixedright'    => 'ចុង�ាងស្�ាំ',
-'qbsettings-floatingleft'  => 'អណ្�ែ�ឆ្វ�ង',
-'qbsettings-floatingright' => 'អណ្�ែ�ស្�ាំ',
-'changepassword'           => 'ប្�ូរពាក្យសំងា�់',
-'skin'                     => 'សំបក',
-'math'                     => 'គណិ�',
-'dateformat'               => 'ទម្រង់កាលបរិច្ឆ�ទ',
-'datedefault'              => 'គ្មានចំណូលចិ�្�',
-'datetime'                 => 'កាលបរិច្ឆ�ទនិងល្វែងម៉ោង',
-'math_failure'             => 'Failed to parse',
-'math_unknown_error'       => 'កំហុសមិនស្គាល់',
-'math_unknown_function'    => 'អនុគមន�​មិន​ស្គាល់',
-'math_syntax_error'        => 'កំហុសពាក្យសម្ព�ន្ធ',
-'math_image_error'         => 'ការបម្លែងជា PNG បានបរាជ�យ។
+'preferences'               => 'ចំណង់ចំណូលចិ�្�',
+'mypreferences'             => 'ចំណង់ចំណូលចិ�្�​',
+'prefs-edits'               => 'ចំនួនកំណែប្រែ៖',
+'prefsnologin'              => 'មិនបានឡុកអ៊ីន',
+'prefsnologintext'          => 'អ្នកចាំបាច់�្រូវ�ែ<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ឡុកអ៊ីន]</span> ដើម្បីកំណ�់ចំណង់ចំណូលចិ�្�របស់អ្នកប្រើប្រាស់។',
+'prefsreset'                => 'ចំណូលចិ�្�​ផ្ទាល់�្លួន�្រូវបានធ្វើឱ្យដូចដើមវិញពីកំណែមុនន�ះហើយ។',
+'qbsettings'                => 'របារទាន់ចិ�្�',
+'qbsettings-none'           => 'ទទ�',
+'qbsettings-fixedleft'      => 'ចុង�ាងឆ្វ�ង',
+'qbsettings-fixedright'     => 'ចុង�ាងស្�ាំ',
+'qbsettings-floatingleft'   => 'អណ្�ែ�ឆ្វ�ង',
+'qbsettings-floatingright'  => 'អណ្�ែ�ស្�ាំ',
+'changepassword'            => 'ប្�ូរពាក្យសំងា�់',
+'skin'                      => 'សំបក',
+'skin-preview'              => 'មើលជាមុន',
+'math'                      => 'គណិ�',
+'dateformat'                => 'ទម្រង់កាលបរិច្ឆ�ទ',
+'datedefault'               => 'គ្មានចំណូលចិ�្�',
+'datetime'                  => 'កាលបរិច្ឆ�ទនិងល្វែងម៉ោង',
+'math_failure'              => 'Failed to parse',
+'math_unknown_error'        => 'កំហុសមិនស្គាល់',
+'math_unknown_function'     => 'អនុគមន�​មិន​ស្គាល់',
+'math_syntax_error'         => 'កំហុសពាក្យសម្ព�ន្ធ',
+'math_image_error'          => 'ការបម្លែងជា PNG បានបរាជ�យ។
 សូមពិនិ�្យមើល�ើ latex, dvips, gs, បានដំឡើង�្រឹម�្រូវឬអ�់ រួចបម្លែង',
-'math_bad_tmpdir'          => 'មិនអាចសរស�រទៅ ឬ បង្កើ���ឯកសារគណិ�បណ្�ោះអាសន្ន',
-'math_bad_output'          => 'មិនអាច សរស�រទៅ ឬ បង្កើ� ��ឯកសារ គណិ� ទិន្នផល',
-'prefs-personal'           => 'ប្រវ�្�ិរូប',
-'prefs-rc'                 => 'បំលាស់ប្ដូរ�្មីៗ',
-'prefs-watchlist'          => 'បញ្ជី�ាមដាន',
-'prefs-watchlist-days'     => 'ចំនួន�្ងៃ�្រូវបង្ហាញក្នុងបញ្ជី�ាមដាន៖',
-'prefs-watchlist-edits'    => 'ចំនួនអ�ិបរមានៃបំលាស់ប្�ូរ�្រូវបង្ហាញក្នុងបញ្ជី�ាមដានដែលបានពង្រីក៖',
-'prefs-misc'               => 'ផ្ស�ងៗ',
-'saveprefs'                => 'រក្សាទុក',
-'resetprefs'               => 'លុបចោលបំលាស់ប្ដូរមិនបានរក្សាទុក',
-'oldpassword'              => 'ពាក្យសំងា�់ចាស់៖',
-'newpassword'              => 'ពាក្យសំងា�់�្មី៖',
-'retypenew'                => 'សូមវាយពាក្យសំងា�់�្មី​ម្�ងទៀ�៖',
-'textboxsize'              => 'កំណែប្រែ',
-'rows'                     => 'ជួរដ�ក៖',
-'columns'                  => 'ជួរឈរ៖',
-'searchresultshead'        => 'ស្វែងរក',
-'resultsperpage'           => 'ចំនួនលទ្ធផលក្នុងមួយទំព�រ៖',
-'contextlines'             => 'ចំនួនបន្ទា�់ក្នុងមួយលទ្ធផល៖',
-'contextchars'             => 'ចំនួនអក្សរក្នុងមួយជួរ៖',
-'stub-threshold'           => 'កម្រិ� ចំពោះ <a href="#" class="stub">�ំណភ្ជាប់​ទៅ ពង្រាង </a> (បៃ)៖',
-'recentchangesdays'        => 'ចំនួន�្ងៃបង្ហាញក្នុងទំព�របំលាស់ប្�ូរ�្មីៗ៖',
-'recentchangescount'       => 'ចំនួនកំណែប្រែ�្រូវបង្ហាញក្នុងបំលាស់ប្�ូរ�្មីៗ ប្រវ�្�ិនិងទំព�រកំណ�់ហ��ុ៖',
-'savedprefs'               => 'ចំណូលចិ�្�នានារបស់អ្នក�្រូវបានរក្សាទុកហើយ។',
-'timezonelegend'           => 'ល្វែងម៉ោង',
-'timezonetext'             => '¹ចំនួន​ម៉ោង​ដែល​ម៉ោងក្នុងស្រុក​របស់​អ្នក​�ុសពី​ម៉ោងម៉ាស៊ីនបម្រើស�វា (UTC)។',
-'localtime'                => 'ម៉ោងក្នុងស្រុក',
-'timezoneoffset'           => 'ទូទា�់¹',
-'servertime'               => 'ម៉ោងម៉ាស៊ីនបម្រើស�វា',
-'guesstimezone'            => 'បំព�ញពីកម្មវិធីរាវរក',
-'allowemail'               => 'អាចទទួលអ៊ីមែលពីអ្នកប្រើប្រាស់ដទៃទៀ�',
-'prefs-searchoptions'      => 'ជម្រើសក្នុងការស្វែងរក',
-'prefs-namespaces'         => 'លំហឈ្មោះ',
-'defaultns'                => 'ស្វែងរកក្នុងលំហឈ្មោះទាំងន�ះ�ាមលំនាំដើម៖',
-'default'                  => 'លំនាំដើម',
-'files'                    => 'ឯកសារ',
+'math_bad_tmpdir'           => 'មិនអាចសរស�រទៅ ឬ បង្កើ���ឯកសារគណិ�បណ្�ោះអាសន្ន',
+'math_bad_output'           => 'មិនអាច សរស�រទៅ ឬ បង្កើ� ��ឯកសារ គណិ� ទិន្នផល',
+'prefs-personal'            => 'ប្រវ�្�ិរូប',
+'prefs-rc'                  => 'បំលាស់ប្ដូរ�្មីៗ',
+'prefs-watchlist'           => 'បញ្ជី�ាមដាន',
+'prefs-watchlist-days'      => 'ចំនួន�្ងៃ�្រូវបង្ហាញក្នុងបញ្ជី�ាមដាន៖',
+'prefs-watchlist-days-max'  => '(អ�ិបរមា ៧�្ងៃ)',
+'prefs-watchlist-edits'     => 'ចំនួនអ�ិបរមានៃបំលាស់ប្�ូរ�្រូវបង្ហាញក្នុងបញ្ជី�ាមដានដែលបានពង្រីក៖',
+'prefs-watchlist-edits-max' => '(ចំនួនអ�ិបរមា៖ ១០០០)',
+'prefs-misc'                => 'ផ្ស�ងៗ',
+'prefs-resetpass'           => 'ប្�ូរពាក្យសំងា�់',
+'saveprefs'                 => 'រក្សាទុក',
+'resetprefs'                => 'លុបចោលបំលាស់ប្ដូរមិនបានរក្សាទុក',
+'textboxsize'               => 'កំណែប្រែ',
+'rows'                      => 'ជួរដ�ក៖',
+'columns'                   => 'ជួរឈរ៖',
+'searchresultshead'         => 'ស្វែងរក',
+'resultsperpage'            => 'ចំនួនលទ្ធផលក្នុងមួយទំព�រ៖',
+'contextlines'              => 'ចំនួនបន្ទា�់ក្នុងមួយលទ្ធផល៖',
+'contextchars'              => 'ចំនួនអក្សរក្នុងមួយជួរ៖',
+'stub-threshold'            => 'កម្រិ� ចំពោះ <a href="#" class="stub">�ំណភ្ជាប់​ទៅ ពង្រាង </a> (បៃ)៖',
+'recentchangesdays'         => 'ចំនួន�្ងៃបង្ហាញក្នុងទំព�របំលាស់ប្�ូរ�្មីៗ៖',
+'recentchangesdays-max'     => '(អ�ិបរមា $1 {{PLURAL:$1|�្ងៃ|�្ងៃ}})',
+'recentchangescount'        => 'ចំនួន​កំណែប្រែ​ដែល​�្រូវ​បង្ហាញ​នៅ​ក្នុង​បំលាស់ប្�ូរ�្មីៗ ប្រវ�្�ិ​ទំព�រ និង​នៅ​ក្នុង​កំណ�់ហ��ុ �ាមលំនាំដើម៖',
+'savedprefs'                => 'ចំណូលចិ�្�នានារបស់អ្នក�្រូវបានរក្សាទុកហើយ។',
+'timezonelegend'            => 'ល្វែងម៉ោង',
+'timezonetext'              => '¹ចំនួន​ម៉ោង​ដែល​ម៉ោងក្នុងស្រុក​របស់​អ្នក​�ុសពី​ម៉ោងម៉ាស៊ីនបម្រើស�វា (UTC)។',
+'localtime'                 => 'ម៉ោងក្នុងស្រុក​៖',
+'timezoneselect'            => 'ល្វែងម៉ោង​៖',
+'timezoneoffset'            => 'ទូទា�់¹​៖',
+'servertime'                => 'ម៉ោងម៉ាស៊ីនបម្រើ​៖',
+'guesstimezone'             => 'បំព�ញពីកម្មវិធីរាវរក',
+'allowemail'                => 'អាចទទួលអ៊ីមែលពីអ្នកប្រើប្រាស់ដទៃទៀ�',
+'prefs-searchoptions'       => 'ជម្រើសក្នុងការស្វែងរក',
+'prefs-namespaces'          => 'លំហឈ្មោះ',
+'defaultns'                 => 'ស្វែងរកក្នុងលំហឈ្មោះទាំងន�ះ�ាមលំនាំដើម៖',
+'default'                   => 'លំនាំដើម',
+'files'                     => 'ឯកសារ',
 
 # User rights
 'userrights'                  => 'ការគ្រប់គ្រងសិទ្ធិអ្នកប្រើប្រាស់', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'គ្រប់គ្រងក្រុមអ្នកប្រើប្រាស់',
 'userrights-user-editname'    => 'បញ្ចូលឈ្មោះអ្នកប្រើប្រាស់៖',
 'editusergroup'               => 'កែប្រែក្រុមអ្នកប្រើប្រាស់',
-'editinguser'                 => "ការប្ដូរសិទ្ធិអ្នកប្រើប្រាស់ '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "ការប្ដូរសិទ្ធិអ្នកប្រើប្រាស់ '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'កែប្រែក្រុមអ្នកប្រើប្រាស់',
 'saveusergroups'              => 'រក្សាក្រុមអ្នកប្រើប្រាស់ទុក',
 'userrights-groupsmember'     => 'ក្រុមសមាជិកភាព៖',
@@ -1193,9 +1229,41 @@ $2',
 'rightslogentry' => 'បានប្ដូរក្រុមសមាជិកភាពសម្រាប់ $1 ពី $2 ទៅ $3',
 'rightsnone'     => '(ទទ�)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'អានទំព�រន�ះ',
+'action-edit'                 => 'កែប្រែទំព�រន�ះ',
+'action-createpage'           => 'បង្កើ�ទំព�រនានា',
+'action-createtalk'           => 'បង្កើ�ទំព�រពិភាក្សានានា',
+'action-createaccount'        => 'បង្កើ�គណនីអ្នកប្រើប្រាស់ន�ះ',
+'action-minoredit'            => 'ចំណាំកំណែប្រែន�ះ�ាជាកំណែប្រែ�ិច�ួច',
+'action-move'                 => 'ប្ដូរទី�ាំងទំព�រន�ះ',
+'action-move-subpages'        => 'ប្ដូរទី�ាំងទំព�រន�ះព្រមទាំងអនុទំព�ររបស់វា',
+'action-move-rootuserpages'   => 'ប្ដូរទី�ាំងឫសទំព�រអ្នកប្រើប្រាស់',
+'action-upload'               => 'ផ្ទុកឡើងឯកសារន�ះ',
+'action-reupload'             => 'ផ្ទុកជាន់ពីលើឯកសារដែលមានស្រាប់ហើយន�ះ',
+'action-upload_by_url'        => 'ផ្ទុក​ឯកសារ​ន�ះ​ឡើង​ពី​អាសយដ្ឋាន URL',
+'action-delete'               => 'លុបទំព�រន�ះ',
+'action-deleterevision'       => 'លុបកំណែប្រែន�ះ',
+'action-deletedhistory'       => 'មើលប្រវ�្�ិលុបរបស់ទំព�រន�ះ',
+'action-browsearchive'        => 'ស្វែងរកទំព�រដែល�្រូវបានលុបចោល',
+'action-undelete'             => 'ឈប់លុបទំព�រន�ះ',
+'action-suppressionlog'       => 'មើលកំណ�់ហ��ុឯកជនន�ះ',
+'action-block'                => 'រាំង�្ទប់អ្នកប្រើប្រាស់ន�ះមិនឱ្យធ្វើការកែប្រែ',
+'action-protect'              => 'ប្ដូរកម្រិ�ការពារសម្រាប់ទំព�រន�ះ',
+'action-import'               => 'នាំចូលទំព�រន�ះពីវិគីផ្ស�ងមួយទៀ�',
+'action-importupload'         => 'នាំចូលទំព�រន�ះពីឯកសារដែលបានផ្ទុកឡើង',
+'action-patrol'               => 'ចំណាំកំណែប្រែរបស់អ្នកដទៃ�ាបានល្បា�',
+'action-autopatrol'           => 'ផ្ដល់សិទ្ធិឱ្យគ�ចំណាំកំណែរបស់អ្នក�ាបានល្បា�',
+'action-unwatchedpages'       => 'មើលបញ្ជីនៃទំព�រមិន�ាមដាន',
+'action-mergehistory'         => 'ច្របាច់បញ្ចូលប្រវ�្�ិរបស់ទំព�រន�ះ',
+'action-userrights'           => 'កែប្រែសិទ្ធិរបស់អ្នកប្រើប្រាស់ទាំងអស់',
+'action-userrights-interwiki' => 'កែប្រែសិទ្ធិនានារបស់អ្នកប្រើប្រាស់នៅលើវិគីដទៃ',
+'action-siteadmin'            => 'ចាក់សោឬដោះសោមូលដ្ឋានទិន្នន�យ',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|បំលាស់ប្ដូរ|បំលាស់ប្ដូរ}}',
 'recentchanges'                     => 'បំលាស់ប្ដូរ​�្មីៗ',
+'recentchanges-legend'              => 'ជម្រើសនានា​សម្រាប់ការបង្ហាញបំលាស់ប្ដូរ�្មីៗ',
 'recentchangestext'                 => '�ាមដានរាល់បំលាស់ប្ដូរ�្មីៗបំផុ�ចំពោះវិគីនៅលើទំព�រន�ះ។',
 'recentchanges-feed-description'    => '�ាមដាន​បំលាស់ប្ដូរ�្មីៗ​បំផុ�​នៃ​វិគី​ន�ះក្នុង​ម�ិព��៌មាន​ន�ះ​។',
 'rcnote'                            => "�ាងក្រោម​ន�ះ​ជា​{{PLURAL:$1|១បំលាស់ប្ដូរ|'''$1'''បំលាស់ប្ដូរ}}​ចុងក្រោយក្នុងរយៈព�ល​{{PLURAL:$2|�្ងៃ|'''$2'''�្ងៃ}}​ចុងក្រោយគិ��្រឹម$5 $4 ។",
@@ -1207,7 +1275,7 @@ $2',
 'rcshowhideanons'                   => '$1អ្នកប្រើប្រាស់អនាមិក',
 'rcshowhidepatr'                    => '$1កំណែប្រែដែលបានល្បា�',
 'rcshowhidemine'                    => '$1កំណែប្រែរបស់�្ញុំ',
-'rclinks'                           => 'បង្ហាញ$1ឧទាហរណ�.jpgចុងក្រោយក្នុងរយៈព�ល$2�្ងៃចុងក្រោយ<br />$3',
+'rclinks'                           => 'បង្ហាញ$1ចុងក្រោយក្នុងរយៈព�ល$2�្ងៃចុងក្រោយ<br />$3',
 'diff'                              => 'ភាព�ុសគ្នា',
 'hist'                              => 'ប្រវ�្�ិ',
 'hide'                              => 'លាក់',
@@ -1219,6 +1287,8 @@ $2',
 'rc_categories'                     => 'កម្រិ�ទី�ាំងចំណា�់�្នាក់ក្រុម(�ណ្ឌដោយសញ្ញា "|")',
 'rc_categories_any'                 => 'មួយណាក�បាន',
 'newsectionsummary'                 => '/* $1 */ ផ្នែក�្មី',
+'rc-enhanced-expand'                => 'បង្ហាញភាពលំអិ� (�្រូវការ JavaScript)',
+'rc-enhanced-hide'                  => 'លាក់ភាពលំអិ�',
 
 # Recent changes linked
 'recentchangeslinked'          => 'បំលាស់ប្ដូរពាក់ព�ន្ធ',
@@ -1238,12 +1308,12 @@ $2',
 'uploaderror'                 => 'កំហុសផ្ទុកឡើង',
 'uploadtext'                  => "សូមប្រើប្រាស់បែបបទ�ាងក្រោមដើម្បីផ្ទុកឯកសារ​ឡើង។
 
-ដើមីមើល ឬស្វែងរកឯកសារដែលបានផ្ទុកឡើងពីព�លមុន សូមចូលទៅ[[Special:ImageList|បញ្ជីឯកសារដែលបានផ្ទុកឡើង]]។ ការផ្ទុកឡើងវិញ​នូវឯកសារបង្ហាញនៅក្នុង[[Special:Log/upload|កំណ�់ហ��ុនៃការផ្ទុកឯកសារឡើង]] និងការលុបច�ញមានបង្ហាញនៅក្នុង[[Special:Log/delete|កំណ�់ហ��ុនៃការលុប]]។
+ដើម្បីមើល ឬស្វែងរកឯកសារដែលបានផ្ទុកឡើងពីព�លមុន សូមចូលទៅ[[Special:FileList|បញ្ជីឯកសារដែលបានផ្ទុកឡើង]]។ ការផ្ទុកឡើងវិញ​នូវឯកសារបង្ហាញនៅក្នុង[[Special:Log/upload|កំណ�់ហ��ុនៃការផ្ទុកឯកសារឡើង]] និងការលុបច�ញមានបង្ហាញនៅក្នុង[[Special:Log/delete|កំណ�់ហ��ុនៃការលុប]]។
 
 
 ដើម្បីដាក់រូបភាពទៅក្នុងទំព�រ សូមប្រើប្រាស់�ំណភ្ជាប់ក្នុងទម្រង់ដូច�ាងក្រោម៖
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:ឈ្មោះឯកសារ.jpg]]</nowiki></tt>'''ដើម្បីប្រើប្រាស់ទម្រង់ព�ញល�ញនៃឯកសារ
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:ឈ្មោះឯកសារ.png|200px|thumb|left|ឃ្លាពិពណ៌នា]]</nowiki></tt>''' ដោយប្រើប្រាស់ទំហំ​២០០ភីកសែលក្នុងប្រអប់នៅ​គ�ម�ាងធ្វ�ង​ជាមួយនឹង​ឃ្លារៀបរាប់អំពីឯកសារន�ះ។
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:ឈ្មោះឯកសារ.jpg]]</nowiki></tt>'''ដើម្បីប្រើប្រាស់ទម្រង់ព�ញល�ញនៃឯកសារ
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:ឈ្មោះឯកសារ.png|200px|thumb|left|ឃ្លាពិពណ៌នា]]</nowiki></tt>''' ដោយប្រើប្រាស់ទំហំ​២០០ភីកសែលក្នុងប្រអប់នៅ​គ�ម�ាងធ្វ�ង​ជាមួយនឹង​ឃ្លារៀបរាប់អំពីឯកសារន�ះ។
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:ឈ្មោះឯកសារ.ogg]]</nowiki></tt>''' ដើម្បី�ភ្ជាប់​ដោយផ្ទាល់ទៅឯកសារន�ះ​ដោយមិនបង្ហាញឯកសារ។",
 'upload-permitted'            => 'ប្រភ�ទឯកសារដែល�្រូវបានអនុញ្ញា�៖ $1 ។',
 'upload-preferred'            => 'ប្រភ�ទឯកសារដែលគួរប្រើប្រាស់៖ $1 ។',
@@ -1252,7 +1322,7 @@ $2',
 'uploadlogpage'               => 'កំណ�់ហ��ុនៃការផ្ទុកឡើង',
 'uploadlogpagetext'           => '�ាងក្រោមន�ះ​ជាបញ្ជីនៃការផ្ទុកឡើង​�្មីបំផុ�។
 
-សូមមើល [[Special:NewImages|វិចិ�្រសាលរូបភាព�្មីៗ]] ដើម្បីមើលដោយផ្ទាល់ភ្នែក។',
+សូមមើល [[Special:NewFiles|វិចិ�្រសាលរូបភាព�្មីៗ]] ដើម្បីមើលដោយផ្ទាល់ភ្នែក។',
 'filename'                    => 'ឈ្មោះឯកសារ',
 'filedesc'                    => 'ស�ចក្�ីសង្��ប',
 'fileuploadsummary'           => 'ស�ចក្�ីសង្��ប៖',
@@ -1273,19 +1343,19 @@ $2',
 'large-file'                  => 'ឯកសារ​គួរ�ែ​មាន​​ទំហំ​មិនលើសពី $1។ ឯកសារ​ន�ះមាន​ទំហំ $2។',
 'largefileserver'             => 'ឯកសារន�ះមានទំហំធំជាងទំហំដែលម៉ាស៊ីនបម្រើការ(server)អនុញ្ញា�។',
 'emptyfile'                   => 'ឯកសារដែលអ្នកបានដាក់បញ្ច�ញ ហាក់បីដូចជាទទ�។​ ន�ះប្រហែលជាមកពីកំហុសនៃការសរស�រឈ្មោះឯកសារ។ ចូរពិនិ�្យ �ា�ើអ្នកពិ�ជាចង់ដាក់បញ្ច�ញឯកសារន�ះឬក�អ�់។',
-'fileexists'                  => 'ឯកសារដែលមានឈ្មោះន�ះមានរួចហើយ​ ចូរពិនិ�្យ <strong><tt>$1</tt></strong> ប្រសិនបើអ្នកមិនច្បាស់�ា�ើអ្នកចង់ប្�ូរវាឬក�អ�់។',
-'fileexists-extension'        => 'មាន​ឯកសារ​មួយ​ដែល​មាន​ឈ្មោះស្រដៀង​៖<br />
-ឈ្មោះ​ឯកសារដែលបាន​ផ្ទុកឡើង​ ៖ <strong><tt>$1</tt></strong><br />
-ឈ្មោះ​ឯកសារ​ដែល​មានស្រាប់​៖ <strong><tt>$2</tt></strong><br />
-សូម​ជ្រើសរើសឈ្មោះ​ផ្ស�ងទៀ�។',
+'fileexists'                  => "ឯកសារដែលមានឈ្មោះន�ះមានរួចហើយ​ ចូរពិនិ�្យ '''<tt>$1</tt>''' ប្រសិនបើអ្នកមិនច្បាស់�ា�ើអ្នកចង់ប្�ូរវាឬក�អ�់។",
+'fileexists-extension'        => "មាន​ឯកសារ​មួយ​ដែល​មាន​ឈ្មោះស្រដៀង​៖<br />
+ឈ្មោះ​ឯកសារដែលបាន​ផ្ទុកឡើង​ ៖ '''<tt>$1</tt>'''<br />
+ឈ្មោះ​ឯកសារ​ដែល​មានស្រាប់​៖ '''<tt>$2</tt>'''<br />
+សូម​ជ្រើសរើសឈ្មោះ​ផ្ស�ងទៀ�។",
 'fileexists-thumb'            => "<center>'''រូបភាពមានស្រ�ច'''</center>",
-'fileexists-thumbnail-yes'    => 'ឯកសារន�ះទំនងជារូបភាពដែលបានបង្រួមទំហំ <i>(កូនរូបភាព thumbnail)</i>.
-សូមពិនិ�្យមើលឯកសារ <strong><tt>$1</tt></strong>។<br />
-បើសិនជាឯកសារដែលអ្នកបានពិនិ�្យ�ាងលើគឺជារូបភាព�ែមួយដែលមានទំហំដើម នោះអ្នកមិនចាំបាច់ផ្ទុកឡើងនូវកូនរូបភាព (thumbnail) បន្�ែមទ�។',
-'fileexists-forbidden'        => 'ឯកសារដែលមានឈ្មោះន�ះមានរួចហើយ។ ចូរ�្រឡប់ក្រោយវិញ ហើយដាក់បញ្ច�ញឯកសារដែលមានឈ្មោះ�្មីមួយ។​[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "ឯកសារន�ះទំនងជារូបភាពដែលបានបង្រួមទំហំ ''(កូនរូបភាព thumbnail)''.
+សូមពិនិ�្យមើលឯកសារ '''<tt>$1</tt>'''។<br />
+បើសិនជាឯកសារដែលអ្នកបានពិនិ�្យ�ាងលើគឺជារូបភាព�ែមួយដែលមានទំហំដើម នោះអ្នកមិនចាំបាច់ផ្ទុកឡើងនូវកូនរូបភាព (thumbnail) បន្�ែមទ�។",
+'fileexists-forbidden'        => 'មាន​ឯកសារ​ដែល​មាន​ឈ្មោះ​ន�ះ​រួចហើយ និង​មិន​អាច​សរស�រ​ជាន់​ពីលើ​បាន​ទ�​។ ប្រសិនបើ អ្នក​នៅ�ែ​ចង់​ផ្ទុក​ឯកសារ​របស់​អ្នក​ឡើង សូម​�្រឡប់​ក្រោយ ហើយ​ប្រើ​ឈ្មោះ​�្មី​មួយ​ផ្ស�ង​វិញ​។​[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'ឯកសារដែលមានឈ្មោះន�ះ មានរួចហើយនៅក្នុងកន្លែងដាក់ឯកសាររួម។
 
-ចូរ�្រឡប់ក្រោយវិញ​ហើយដាក់បញ្ច�ញឯកសារន�ះឡើងវិញ​ជាមួយ​នឹងឈ្មោះ�្មី។ [[Image:$1|thumb|center|$1]]',
+ចូរ�្រឡប់ក្រោយវិញ​ហើយដាក់បញ្ច�ញឯកសារន�ះឡើងវិញ​ជាមួយ​នឹងឈ្មោះ�្មី។ [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'ឯកសារន�ះជាច្បាប់ចម្លងរបស់ {{PLURAL:$1|ឯកសារ|ឯកសារ}}ដូច�ទៅន�ះ៖',
 'successfulupload'            => 'ផ្ទុកឯកសារឡើងដោយជោគជ�យ',
 'uploadwarning'               => 'សូមប្រុងប្រយ��្ន!',
@@ -1332,18 +1402,18 @@ $2',
 'upload_source_url'  => ' (URL �្រឹម�្រូវនិងបើកចំហជាសាធារណៈ)',
 'upload_source_file' => ' (ឯកសារក្នុងកុំព្យូទ�ររបស់អ្នក)',
 
-# Special:ImageList
-'imagelist-summary'     => 'ទំព�រពិស�ស​ន�ះ​បង្ហាញ​គ្រប់​ឯកសារ​ដែល​បានផ្ទុកឡើង។ �ាម​លំនាំដើម​ឯកសារ​ដែល​បានផ្ទុកឡើង​ចុងក្រោយ​�្រូវបាន​បង្ហាញ​នៅ​លើគ�​នៃបញ្ជីន�ះ។ ការចុច​លើ​ក្បាល​ជួរ​ឈរ​ក�​អាច​ផ្លាស់ប្�ូរ​�ម្រៀប​នៃ​ការ​បង្ហាញ​បាន​ដែរ។',
-'imagelist_search_for'  => 'ស្វែងរកឈ្មោះម�ឌា៖',
+# Special:ListFiles
+'listfiles-summary'     => 'ទំព�រពិស�ស​ន�ះ​បង្ហាញ​គ្រប់​ឯកសារ​ដែល​បានផ្ទុកឡើង។ �ាម​លំនាំដើម​ឯកសារ​ដែល​បានផ្ទុកឡើង​ចុងក្រោយ​�្រូវបាន​បង្ហាញ​នៅ​លើគ�​នៃបញ្ជីន�ះ។ ការចុច​លើ​ក្បាល​ជួរ​ឈរ​ក�​អាច​ផ្លាស់ប្�ូរ​�ម្រៀប​នៃ​ការ​បង្ហាញ​បាន​ដែរ។',
+'listfiles_search_for'  => 'ស្វែងរកឈ្មោះម�ឌា៖',
 'imgfile'               => 'ឯកសារ',
-'imagelist'             => 'បញ្ជីរូបភាព',
-'imagelist_date'        => 'កាលបរិច្ឆ�ទ',
-'imagelist_name'        => 'ឈ្មោះ',
-'imagelist_user'        => 'អ្នកប្រើប្រាស់',
-'imagelist_size'        => 'ទំហំ',
-'imagelist_description' => 'ការពិពណ៌នា',
-
-# Image description page
+'listfiles'             => 'បញ្ជីរូបភាព',
+'listfiles_date'        => 'កាលបរិច្ឆ�ទ',
+'listfiles_name'        => 'ឈ្មោះ',
+'listfiles_user'        => 'អ្នកប្រើប្រាស់',
+'listfiles_size'        => 'ទំហំ',
+'listfiles_description' => 'ការពិពណ៌នា',
+
+# File description page
 'filehist'                       => 'ប្រវ�្�ិ​ឯកសារ',
 'filehist-help'                  => "ចុចលើ'''ម៉ោងនិងកាលបរិច្ឆ�ទ'''ដើម្បីមើលឯកសារដែលបានផ្ទុកនៅព�លនោះ។",
 'filehist-deleteall'             => 'លុបទាំងអស់',
@@ -1351,16 +1421,18 @@ $2',
 'filehist-revert'                => '�្រឡប់',
 'filehist-current'               => 'បច្ចុប្បន្ន',
 'filehist-datetime'              => 'ម៉ោងនិងកាលបរិច្ឆ�ទ',
+'filehist-thumb'                 => 'កូនរូបភាព',
+'filehist-nothumb'               => 'គ្មានកូនរូបភាព',
 'filehist-user'                  => 'អ្នកប្រើប្រាស់',
 'filehist-dimensions'            => 'វិមា�្រ',
 'filehist-filesize'              => 'ទំហំឯកសារ',
 'filehist-comment'               => 'យោបល់',
-'imagelinks'                     => '�ំណភ្ជាប់​',
+'imagelinks'                     => '�ំណភ្ជាប់​​ឯកសារ',
 'linkstoimage'                   => '{{PLURAL:$1|ទំព�រ​|$1 ទំព�រ}} �ាងក្រោម​មាន�ំណភ្ជាប់មក​ឯកសារន�ះ ៖',
 'nolinkstoimage'                 => 'គ្មានទំព�រណាមួយដែល�ភ្ជាប់មកឯកសារន�ះទ�។',
 'morelinkstoimage'               => 'មើល [[Special:WhatLinksHere/$1|�ំណភ្ជាប់បន្�ែមទៀ�]] ដែល�ភ្ជាប់មកកាន់ឯកសារន�ះ។',
 'redirectstofile'                => '{{PLURAL:$1|file redirects|$1 ឯកសារ​បញ្ជូនបន្�}}ដូច�ទៅន�ះ �្រូវ​បញ្ជូនបន្ដទៅ​ឯកសារ​ន�ះ​៖',
-'duplicatesoffile'               => '{{PLURAL:$1|file is a duplicate|$1 ឯកសារ​ជាច្បាប់ចម្លង}}ដូច�ទៅ​នៃ​ឯកសារ​ន�ះ​​៖',
+'duplicatesoffile'               => '{{PLURAL:$1|file is a duplicate|$1 ឯកសារ​ជាច្បាប់ចម្លង}}ដូច�ទៅ​នៃ​ឯកសារ​ន�ះ​ ([[Special:FileDuplicateSearch/$2|ព��៌មាន​លំអិ�]])​៖',
 'sharedupload'                   => 'ឯកសារន�ះ​�្រូវបានផ្ទុកឡើង​ដើម្បីចែករំលែក និង អាច�្រូវបានប្រើប្រាស់​នៅគម្រោង​ដទៃ ។',
 'shareduploadwiki'               => 'សូម​មើល $1 សម្រាប់ព��៌មានបន្�ែម​។',
 'shareduploadwiki-desc'          => 'ស�ចក្�ីអធិប្បាយរបស់ឯកសារដែលមាននៅក្នុង$1 គឺ�្រូវបានបង្ហាញដូច�ាងក្រោម។',
@@ -1389,7 +1461,6 @@ $2',
 'filedelete-submit'           => 'លុបច�ញ',
 'filedelete-success'          => "'''$1''' �្រូវបានលុបចោលហើយ",
 'filedelete-nofile'           => "មិនមាន '''$1''' ទ�។",
-'filedelete-iscurrent'        => 'អ្នកកំពុង�ែមានបំណងលុបកំណែប្រែដ��្មីបំផុ�របស់ឯកសារន�ះ។ ជាដំបូងចូរអ្នកធ្វើវាឱ្យទៅជាកំណែប្រែចាស់ជាមុនសិន។',
 'filedelete-otherreason'      => 'មូលហ��ុបន្�ែមផ្ស�ងទៀ�៖',
 'filedelete-reason-otherlist' => 'មូលហ��ុផ្ស�ងទៀ�',
 'filedelete-reason-dropdown'  => '*ហ��ុផលដែលលុបជារឿយៗ
@@ -1414,27 +1485,30 @@ $2',
 
 # Random page
 'randompage'         => 'ទំព�រចៃដន្យ',
-'randompage-nopages' => 'គ្មានទំព�រណាមួយក្នុងលំហឈ្មោះន�ះទ�។',
+'randompage-nopages' => 'គ្មាន​ទំព�រ​ណាមួយ​ក្នុង​លំហឈ្មោះ "$1" ទ�។',
 
 # Random redirect
 'randomredirect'         => 'ទំព�របញ្ជូនបន្�ចៃដន្យ',
-'randomredirect-nopages' => 'គ្មានទំព�របញ្ជូនបន្�ណាមួយនៅក្នុងលំហឈ្មោះន�ះទ�។',
+'randomredirect-nopages' => 'គ្មានទំព�របញ្ជូនបន្�ណាមួយនៅក្នុងលំហឈ្មោះ "$1" ទ�។',
 
 # Statistics
-'statistics'             => 'ស្�ិ�ិ',
-'sitestats'              => 'ស្�ិ�ិ{{SITENAME}}',
-'userstats'              => 'ស្�ិ�ិអ្នកប្រើប្រាស់',
-'sitestatstext'          => "*បច្ចុប្បន្នមានទំព�រសរុបចំនួន{{PLURAL:\$1|'''១'''|'''\$1'''}}នៅក្នុងទិន្នន�យ។ ស្�ិ�ិន�ះគឺរាប់បញ្ចូលទាំងទំព�រពិភាក្សា ទំព�រគំរូ ទំព�រចំណា�់�្នាក់ក្រុម ទំព�រជំនួយ ទំព�រអំពី{{SITENAME}} ទំព�របញ្ជូនបន្� និងទំព�រផ្ស�ងៗជាច្រើនទៀ�។ ប្រសិនបើមិនរាប់បញ្ចូលទំព�រទាំងនោះទ� ទំព�រដែលមាន�្លឹមសារល្អមាន'''\$2''' (មាន'''\$2'''អ�្�បទ)។
-
-*មាន'''\$8'''ឯកសារ(រូបភាពនិងម�ឌា)�្រូវបានផ្ទុកឡើង ។
-
-*គ្រប់ទំព�រ�្រូវបានចូលមើលសរុបចំនួន '''\$3'''{{PLURAL:\$3|ដង|ដង}}​ និង�្រូវបានកែប្រែចំនួន '''\$4'''{{PLURAL:\$4|ដង|ដង}} ចាប់�ាំងពីព�លដែល{{SITENAME}}�្រូវបានដំឡើង។
-
-*គិ�ជាមធ្យមមាន '''\$5''' កំណែប្រែក្នុងមួយទំព�រ និង '''\$6'''ដងនៃការចូលមើលក្នុងមួយកំណែប្រែ។
-
-*<span class=\"plainlinks\">[http://www.mediawiki.org/wiki/Manual:Job_queue ជួរការងារ]</span>(job queue)ឥឡូវន�ះមានប្រវែង '''\$7''' ។",
-'userstatstext'          => "នៅព�លន�ះមាន[[Special:ListUsers|អ្នកប្រើប្រាស់]]​ដែលបានចុះឈ្មោះចំនួន '''$1'''នាក់ ដែលក្នុងនោះមាន'''$2'''នាក់(ស្មើនឹង'''$4%''') {{PLURAL:$2|មានសិទ្ធិជា|មានសិទ្ធិជា}}$5 ។",
-'statistics-mostpopular' => 'ទំព�រដែល�្រូវបានមើលច្រើនបំផុ�',
+'statistics'               => 'ស្�ិ�ិ',
+'statistics-header-pages'  => 'ស្�ិ�ិទំព�រ',
+'statistics-header-edits'  => 'ស្�ិ�ិកំណែប្រែ',
+'statistics-header-views'  => 'មើលស្�ិ�ិ',
+'statistics-header-users'  => 'ស្�ិ�ិអ្នកប្រើប្រាស់',
+'statistics-articles'      => 'ទំព�រ�្លឹមសារ',
+'statistics-pages'         => 'ចំនួនទំព�រសរុប',
+'statistics-pages-desc'    => 'ទំព�រទាំងអស់នៅក្នុងវិគី រាប់បញ្ចូលទាំងទំព�រពិភាក្សា ទំព�របញ្ជូនបន្� -ល-',
+'statistics-files'         => 'ឯកសារបានផ្ទុកឡើង',
+'statistics-edits'         => 'ការកែប្រែទំព�រចាប់�ាំងពី{{SITENAME}}�្រូវបានដំឡើង',
+'statistics-edits-average' => 'កំណែប្រែជាមធ្យមក្នុងមួយទំព�រ',
+'statistics-views-total'   => 'ចំនួនការចូលមើលសរុប',
+'statistics-views-peredit' => 'ចំនួនការចូលមើលក្នុងមួយកំណែប្រែ',
+'statistics-jobqueue'      => 'ប្រវែង[http://www.mediawiki.org/wiki/Manual:Job_queue ជួរការងារ]',
+'statistics-users'         => '[[Special:ListUsers|អ្នកប្រើប្រាស់]]ដែលបានចុះឈ្មោះ',
+'statistics-users-active'  => 'អ្នកប្រើប្រាស់សកម្ម',
+'statistics-mostpopular'   => 'ទំព�រដែល�្រូវបានមើលច្រើនបំផុ�',
 
 'disambiguations' => 'ទំព�រមានចំណងជើងស្រដៀងគ្នា',
 
@@ -1472,7 +1546,8 @@ $2',
 'popularpages'            => 'ទំព�រដែលមានប្រជាប្រិយ',
 'wantedcategories'        => 'ចំណា�់�្នាក់ក្រុមដែលគ្រប់គ្នាចង់បាន',
 'wantedpages'             => 'ទំព�រ​ដែល​គ្រប់គ្នា​ចង់បាន',
-'missingfiles'            => 'ឯកសារដែលបា�់',
+'wantedfiles'             => 'ឯកសារចង់បាន',
+'wantedtemplates'         => 'ទំព�រគំរូចង់បាន',
 'mostlinked'              => 'ទំព�រដែល�្រូវបាន�ភ្ជាប់មកច្រើនបំផុ�',
 'mostlinkedcategories'    => 'ចំណា�់�្នាក់ក្រុមដែល�្រូវបាន�ភ្ជាប់មកច្រើនបំផុ�',
 'mostlinkedtemplates'     => 'ទំព�រគំរូ​ដែល�្រូវបានប្រើប្រាស់​ច្រើនបំផុ�',
@@ -1492,6 +1567,8 @@ $2',
 'protectedtitlestext'     => 'ចំណងជើងទំព�រ�្រូវបានការពារមិនឱ្យបង្កើ�',
 'protectedtitlesempty'    => 'មិន​មាន​ចំណងជើង​ណា​ដែល​�្រូវ​បាន​ការពារ​ជាមួយនឹង​ប៉ារ៉ាម៉ែ�​ទាំងន�ះ​ទ�​នាព�ល�្មីៗន�ះ។',
 'listusers'               => 'បញ្ជីអ្នកប្រើប្រាស់',
+'listusers-editsonly'     => 'បង្ហាញអ្នកប្រើប្រាស់ដែលមានកំណែប្រែប៉ុណ្ណោះ',
+'usereditcount'           => '$1 {{PLURAL:$1|កំណែប្រែ|កំណែប្រែ}}',
 'newpages'                => 'ទំព�រ�្មីៗ',
 'newpages-username'       => 'ឈ្មោះអ្នកប្រើប្រាស់៖',
 'ancientpages'            => 'ទំព�រ​ចាស់ៗ',
@@ -1515,8 +1592,6 @@ $2',
 'speciallogtitlelabel' => 'ចំណងជើង៖',
 'log'                  => 'កំណ�់ហ��ុ',
 'all-logs-page'        => 'កំណ�់ហ��ុទាំងអស់',
-'log-search-legend'    => 'ស្វែងរកកំណ�់ហ��ុ',
-'log-search-submit'    => 'ទៅ',
 'logempty'             => 'គ្មានអ្វីក្នុងកំណ�់ហ��ុ�្រូវនឹងទំព�រន�ះទ�។',
 'log-title-wildcard'   => 'ស្វែងរកចំណងជើងចាប់ផ្�ើមដោយឃ្លាន�ះ',
 
@@ -1526,6 +1601,7 @@ $2',
 'nextpage'          => 'ទំព�របន្ទាប់ ($1)',
 'prevpage'          => 'ទំព�រមុន ($1)',
 'allpagesfrom'      => 'បង្ហាញទំព�រផ្ដើមដោយ៖',
+'allpagesto'        => 'បង្ហាញទំព�របញ្ជប់ដោយ៖',
 'allarticles'       => 'គ្រប់ទំព�រ',
 'allinnamespace'    => 'គ្រប់ទំព�រ(លំហឈ្មោះ$1)',
 'allnotinnamespace' => 'គ្រប់ទំព�រ(មិននៅក្នុងលំហឈ្មោះ$1)',
@@ -1546,18 +1622,40 @@ $2',
 'special-categories-sort-count' => '�ម្រៀប�ាមចំនួន',
 'special-categories-sort-abc'   => '�ម្រៀប�ាមអក្�រក្រម',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'ការរួមចំណែកដែល�្រូវបានលុប',
+
+# Special:LinkSearch
+'linksearch'      => 'ស្វែងរក�ំណភ្ជាប់វិប',
+'linksearch-pat'  => 'ស្វែងរកគំរូ៖',
+'linksearch-ns'   => 'លំហឈ្មោះ៖',
+'linksearch-ok'   => 'ស្វែងរក',
+'linksearch-line' => '$1បាន�ភ្ជាប់ពី$2',
+
 # Special:ListUsers
 'listusersfrom'      => 'បង្ហាញអ្នកប្រើប្រាស់ចាប់ផ្�ើមដោយ៖',
 'listusers-submit'   => 'បង្ហាញ',
 'listusers-noresult' => 'មិនមានអ្នកប្រើប្រាស់នៅក្នុងក្រុមន�ះទ�។',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'កំណ�់ហ��ុនៃការបង្កើ�គណនី',
+'newuserlogpagetext'          => 'ន�ះជាកំណ�់ហ��ុនៃការបង្កើ�អ្នកប្រើប្រាស់។',
+'newuserlog-byemail'          => 'ពាក្យសំងា�់�្រូវបានផ្ញើ�ាមអ៊ីមែល',
+'newuserlog-create-entry'     => 'អ្នកប្រើប្រាស់�្មី',
+'newuserlog-create2-entry'    => "បាន​បង្កើ�​គណនី​�្មី​សម្រាប់ '''$1'''",
+'newuserlog-autocreate-entry' => 'គណនី�្រូវបានបង្កើ�ដោយស្វ�យប្រវ�្�ិ',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'សិទ្ធិនិងក្រុមអ្នកប្រើប្រាស់',
-'listgrouprights-summary'  => '�ាងក្រោមន�ះជាបញ្ជីរាយឈ្មោះក្រុមអ្នកប្រើប្រាស់ដែលបានកំណ�់ជាមួយនឹងសិទ្ធិរបស់គ�នៅលើវិគីន�ះ។ មាន[[{{MediaWiki:Listgrouprights-helppage}}|ព��៌មានបន្�ែម]] អំពីសិទ្ធិផ្ទាល់�្លួន។',
-'listgrouprights-group'    => 'ក្រុម',
-'listgrouprights-rights'   => 'សិទ្ធិ',
-'listgrouprights-helppage' => 'Help:ក្រុមនិងសិទ្ធិ',
-'listgrouprights-members'  => '(បញ្ជីរាយនាមសមាជិក)',
+'listgrouprights'                 => 'សិទ្ធិនិងក្រុមអ្នកប្រើប្រាស់',
+'listgrouprights-summary'         => '�ាងក្រោមន�ះជាបញ្ជីរាយឈ្មោះក្រុមអ្នកប្រើប្រាស់ដែលបានកំណ�់ជាមួយនឹងសិទ្ធិរបស់គ�នៅលើវិគីន�ះ។ មាន[[{{MediaWiki:Listgrouprights-helppage}}|ព��៌មានបន្�ែម]] អំពីសិទ្ធិផ្ទាល់�្លួន។',
+'listgrouprights-group'           => 'ក្រុម',
+'listgrouprights-rights'          => 'សិទ្ធិ',
+'listgrouprights-helppage'        => 'Help:ក្រុមនិងសិទ្ធិ',
+'listgrouprights-members'         => '(បញ្ជីរាយនាមសមាជិក)',
+'listgrouprights-addgroup'        => 'អាចបន្�ែម{{PLURAL:$2|ក្រុម|ក្រុម}}៖ $1',
+'listgrouprights-removegroup'     => 'អាចដកច�ញ {{PLURAL:$2|group|ក្រុម}}​៖ $1',
+'listgrouprights-addgroup-all'    => 'អាចបន្�ែមគ្រប់ក្រុម',
+'listgrouprights-removegroup-all' => 'អាចដកច�ញគ្រប់ក្រុម',
 
 # E-mail user
 'mailnologin'     => 'មិនមានអាសយដ្ឋានផ្ញើទ�',
@@ -1568,6 +1666,7 @@ $2',
 'defemailsubject' => 'អ៊ីមែលពី{{SITENAME}}',
 'noemailtitle'    => 'គ្មានអាសយដ្ឋានអ៊ីមែល',
 'noemailtext'     => 'អ្នកប្រើប្រាស់ន�ះមិនបានបញ្ជាក់អំពីអាសយដ្ឋានអ៊ីមែលដែលមានសុពលភាព ឬក�មិនបានជ្រើសយកការទទួលអ៊ីមែលពីអ្នកដទៃ។',
+'email-legend'    => 'ផ្ញើអ៊ីមែលទៅអ្នកប្រើប្រាស់{{SITENAME}}ម្នាក់ទៀ�',
 'emailfrom'       => 'ពី៖',
 'emailto'         => 'ទៅកាន់៖',
 'emailsubject'    => 'ប្រធានបទ៖',
@@ -1607,12 +1706,7 @@ $2',
 'iteminvalidname'      => "មានបញ្ហាជាមួយនឹង'$1'​។ ឈ្មោះគឺមិន�្រឹម�្រូវ...",
 'wlnote'               => "�ាងក្រោមន�ះជា {{PLURAL:$1|បំលាស់ប្�ូរចុងក្រោយ|'''$1'''បំលាស់ប្�ូរចុងក្រោយ}}ក្នុងរយះព�ល{{PLURAL:$2|'''$2'''ម៉ោង}}ចុងក្រោយ។",
 'wlshowlast'           => 'បង្ហាញ $1ម៉ោងចុងក្រោយ $2�្ងៃចុងក្រោយ ឬ$3',
-'watchlist-show-bots'  => 'បង្ហាញកំណែប្រែរបស់រូបយន្�',
-'watchlist-hide-bots'  => 'លាក់ការកែប្រែធ្វើឡើងដោយរូបយន្�',
-'watchlist-show-own'   => 'បង្ហាញកំណែប្រែរបស់�្ញុំ',
-'watchlist-hide-own'   => 'លាក់កំណែប្រែរបស់�្ញុំ',
-'watchlist-show-minor' => 'បង្ហាញកំណែប្រែ�ិច�ួច',
-'watchlist-hide-minor' => 'លាក់កំណែប្រែ�ិច�ួច',
+'watchlist-options'    => 'ជម្រើសនានាក្នុងបញ្ជី�ាមដាន',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'កំពុង​�ាមដាន...',
@@ -1654,39 +1748,43 @@ $NEWPAGE
 ប្រ�ិកម្ម និង ជំនួយបន្�ែម ៖
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'លុបទំព�រច�ញ',
-'confirm'                     => 'បញ្ជាក់ទទួលស្គាល់',
-'excontent'                   => "�្លឹមសារគឺ៖ '$1'",
-'excontentauthor'             => "អ�្�ន�យគឺ៖ '$1' (ហើយអ្នករួមចំណែក�ែម្នាក់គ�់គឺ '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "អ�្�ន�យមុនព�លលុបច�ញ៖ '$1'",
-'exblank'                     => 'ទំព�រទទ�',
-'delete-confirm'              => 'លុប"$1"',
-'delete-legend'               => 'លុប',
-'historywarning'              => 'ប្រយ��្ន​៖ ទំព�រដែលអ្នកទំនងជានឹងលុបមានប្រវ�្�ិ​៖',
-'confirmdeletetext'           => 'អ្នកប្រុងនឹងលុបច�ញទាំងស្រុង នូវទំព�រមួយដោយរួមបញ្ចូលទាំងប្រវ�្�ិកែប្រែរបស់វាផង។
+# Delete
+'deletepage'             => 'លុបទំព�រច�ញ',
+'confirm'                => 'បញ្ជាក់ទទួលស្គាល់',
+'excontent'              => "�្លឹមសារគឺ៖ '$1'",
+'excontentauthor'        => "អ�្�ន�យគឺ៖ '$1' (ហើយអ្នករួមចំណែក�ែម្នាក់គ�់គឺ '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "អ�្�ន�យមុនព�លលុបច�ញ៖ '$1'",
+'exblank'                => 'ទំព�រទទ�',
+'delete-confirm'         => 'លុប"$1"',
+'delete-legend'          => 'លុប',
+'historywarning'         => 'ប្រយ��្ន​៖ ទំព�រដែលអ្នកទំនងជានឹងលុបមានប្រវ�្�ិ​៖',
+'confirmdeletetext'      => 'អ្នកប្រុងនឹងលុបច�ញទាំងស្រុង នូវទំព�រមួយដោយរួមបញ្ចូលទាំងប្រវ�្�ិកែប្រែរបស់វាផង។
 សូមអ្នកអះអាង�ា អ្នកពិ�ជាមានច��នាធ្វើបែបហ្នឹង និង�ាអ្នកបានយល់ច្បាស់ពីផលវិបាកទាំងឡាយដែលអាចកើ�មាន និង​សូមអះអាង�ា អ្នកធ្វើស្រប�ាម [[{{MediaWiki:Policy-url}}|គោលការណ�]]។',
-'actioncomplete'              => 'សកម្មភាពរួចរាល់ជាស្�ាពរ',
-'deletedtext'                 => '"<nowiki>$1</nowiki>"�្រូវបានលុបរួចហើយ។ សូមមើល$2ចំពោះបញ្ជីនៃការលុបនាមព�ល�្មីៗ។',
-'deletedarticle'              => 'បានលុប"[[$1]]"',
-'dellogpage'                  => 'កំណ�់ហ��ុនៃការលុប',
-'dellogpagetext'              => '�ាងក្រោមជាបញ្ជីនៃការលុបច�ញ�្មីៗបំផុ�។',
-'deletionlog'                 => 'កំណ�់ហ��ុនៃការលុប',
-'reverted'                    => 'បាន�្រឡប់ ទៅកំណែមុន',
-'deletecomment'               => 'មូលហ��ុ៖',
-'deleteotherreason'           => 'មូលហ��ុបន្�ែមផ្ស�ងទៀ�៖',
-'deletereasonotherlist'       => 'មូលហ��ុផ្ស�ងទៀ�',
-'deletereason-dropdown'       => '*ហ��ុផលលុបជាទូទៅ
+'actioncomplete'         => 'សកម្មភាពរួចរាល់ជាស្�ាពរ',
+'deletedtext'            => '"<nowiki>$1</nowiki>"�្រូវបានលុបរួចហើយ។ សូមមើល$2ចំពោះបញ្ជីនៃការលុបនាមព�ល�្មីៗ។',
+'deletedarticle'         => 'បានលុប"[[$1]]"',
+'dellogpage'             => 'កំណ�់ហ��ុនៃការលុប',
+'dellogpagetext'         => '�ាងក្រោមជាបញ្ជីនៃការលុបច�ញ�្មីៗបំផុ�។',
+'deletionlog'            => 'កំណ�់ហ��ុនៃការលុប',
+'reverted'               => 'បាន�្រឡប់ ទៅកំណែមុន',
+'deletecomment'          => 'មូលហ��ុ៖',
+'deleteotherreason'      => 'មូលហ��ុបន្�ែមផ្ស�ងទៀ�៖',
+'deletereasonotherlist'  => 'មូលហ��ុផ្ស�ងទៀ�',
+'deletereason-dropdown'  => '*ហ��ុផលលុបជាទូទៅ
 ** សំណើរបស់អ្នកនិពន្ធ
 ** បំពានសិទ្ធិអ្នកនិពន្ធ
 ** អំពើបំផ្លាញទ្រព្យសម្ប�្�ិឯកជនឬសាធារណៈ',
-'delete-edit-reasonlist'      => 'ពិនិ�្យផ្ទៀងផ្ទា�់ហ��ុផលនៃការលុប',
-'rollback'                    => '�្រឡប់កំណែប្រែ',
-'rollback_short'              => '�្រឡប់',
-'rollbacklink'                => '�្រឡប់',
-'cantrollback'                => 'មិនអាច�្រឡប់កំណែប្រែ។ អ្នករួមចំណែកចុងក្រោយទើបជាអ្នកនិពន្ធ​របស់ទំព�រន�ះ។',
-'editcomment'                 => 'វិចារក្នុងការកែប្រែ៖ "<i>$1</i>"។', # only shown if there is an edit comment
-'revertpage'                  => 'បាន�្រឡប់កំណែប្រែដោយ[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) ទៅកំណែប្រែចុងក្រោយដោយ [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'delete-edit-reasonlist' => 'ពិនិ�្យផ្ទៀងផ្ទា�់ហ��ុផលនៃការលុប',
+
+# Rollback
+'rollback'       => '�្រឡប់កំណែប្រែ',
+'rollback_short' => '�្រឡប់',
+'rollbacklink'   => '�្រឡប់',
+'cantrollback'   => 'មិនអាច�្រឡប់កំណែប្រែ។ អ្នករួមចំណែកចុងក្រោយទើបជាអ្នកនិពន្ធ​របស់ទំព�រន�ះ។',
+'editcomment'    => "វិចារក្នុងការកែប្រែ៖ \"''\$1''\"។", # only shown if there is an edit comment
+'revertpage'     => 'បាន�្រឡប់កំណែប្រែដោយ[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) ទៅកំណែប្រែចុងក្រោយដោយ [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'កំណ�់ហ��ុនៃការការពារ',
 'protectlogtext'              => '�ាងក្រោមន�ះជាបញ្ជីនៃទំព�រដែល�្រូវបានចាក់សោនិងដោះសោ។
 
@@ -1695,16 +1793,17 @@ $NEWPAGE
 'modifiedarticleprotection'   => 'បានផ្លាស់ប្�ូរកម្រិ�ការពារនៃ"[[$1]]"',
 'unprotectedarticle'          => 'បានឈប់ការពារ៖ "[[$1]]"',
 'protect-title'               => 'ការពារ "$1"',
+'prot_1movedto2'              => 'បានប្�ូរទី�ាំង [[$1]] ទៅ [[$2]]',
 'protect-legend'              => 'បញ្ជាក់ទទួលស្គាល់ការការពារ',
 'protectcomment'              => 'យោបល់៖',
 'protectexpiry'               => 'ផុ�កំណ�់៖',
 'protect_expiry_invalid'      => 'ព�លវ�លាផុ�កំណ�់ មិន�្រឹម�្រូវ។',
 'protect_expiry_old'          => 'ព�លវ�លាផុ�កំណ�់ ឋិ�ក្នុងអ�ី�កាល។',
 'protect-unchain'             => 'ឈប់ហាមឃា�់ការអនុញ្ញា�ប្ដូរទី�ាំង',
-'protect-text'                => 'លោកអ្នកអាចមើលនិងផ្លាស់ប្ដូរកម្រិ�ការពារទីន�ះចំពោះទំព�រ<strong><nowiki>$1</nowiki></strong>។',
-'protect-locked-blocked'      => 'អ្នកមិនអាចប្�ូរកម្រិ�ការពារនៅក្នុងកំលុងព�លដែល�្រូវបានគ�រារាំង។ ន�ះគឺជាការរៀបចំ�្មីៗសម្រាប់ទំព�រ<strong>$1</strong>:',
-'protect-locked-access'       => 'គណនីរបស់អ្នកគ្មានការអនុញ្ញា�ក្នុងការផ្លាស់ប្ដូរ កម្រិ�កាពារទំព�រ ។
-ន�ះជាការកំណ�់បច្ចុប្បន្ន ចំពោះទំព�រ <strong>$1</strong> ៖',
+'protect-text'                => "លោកអ្នកអាចមើលនិងផ្លាស់ប្ដូរកម្រិ�ការពារទីន�ះចំពោះទំព�រ'''<nowiki>$1</nowiki>'''។",
+'protect-locked-blocked'      => "អ្នកមិនអាចប្�ូរកម្រិ�ការពារនៅក្នុងកំលុងព�លដែល�្រូវបានគ�រារាំង។ ន�ះគឺជាការរៀបចំ�្មីៗសម្រាប់ទំព�រ'''$1''':",
+'protect-locked-access'       => "គណនីរបស់អ្នកគ្មានការអនុញ្ញា�ក្នុងការផ្លាស់ប្ដូរ កម្រិ�កាពារទំព�រ ។
+ន�ះជាការកំណ�់បច្ចុប្បន្ន ចំពោះទំព�រ '''$1''' ៖",
 'protect-cascadeon'           => 'បច្ចុប្បន្ន ទំព�រន�ះ �្រូវបានការពារ ព្រោះ វាបាន ស្�ិ�ក្នុង {{PLURAL:$1|ទំព�រ, ដែលមាន|ទំព�រ, ដែលមាន}} ការការពារ ជា�្នាក់ បានសកម្ម ​។ អ្នកអាច ផ្លាស់ប្�ូរ កម្រិ�ការពារ នៃ ទំព�រ, វានឹង មិនប៉ះពាល់ ការការពារ ជា�្នាក់ ។',
 'protect-default'             => '(លំនាំដើម)',
 'protect-fallback'            => '�ម្រូវឱ្យមានការអនុញ្ញា�នៃ "$1"',
@@ -1712,8 +1811,21 @@ $NEWPAGE
 'protect-level-sysop'         => 'សម្រាប់�ែអ្នក�ែទាំប្រព�ន្ធ',
 'protect-summary-cascade'     => 'ការពារជា​�្នាក់',
 'protect-expiring'            => 'ផុ�កំណ�់ $1 (UTC)',
+'protect-expiry-indefinite'   => 'គ្មានកំណ�់',
 'protect-cascade'             => 'ការពារគ្រប់ទំព�រដែលឋិ�ក្នុងទំព�រន�ះ (ការពារជា�្នាក់)',
 'protect-cantedit'            => 'អ្នកមិនអាចផ្លាស់ប្ដូរកម្រិ�ការពារនៃទំព�រន�ះទ� ព្រោះអ្នកគ្មានការអនុញ្ញា�ក្នុងការកែប្រែវា។',
+'protect-othertime'           => 'រយៈព�លផុ�កំណ�់ផ្ស�ងទៀ�៖',
+'protect-othertime-op'        => 'រយៈព�លផុ�កំណ�់ផ្ស�ងទៀ�',
+'protect-existing-expiry'     => 'រយៈព�លផុ�កំណ�់មានស្រាប់៖ $3, $2',
+'protect-otherreason'         => 'មូលហ��ុបន្�ែមផ្ស�ងៗទៀ�៖',
+'protect-otherreason-op'      => 'មូលហ��ុបន្�ែមផ្ស�ងៗទៀ�',
+'protect-dropdown'            => '*មូលហ��ុការពារជាទូទៅ
+** ទទួលការបំផ្លិចបំផ្លាញយ៉ាងសំបើមក្រៃលែង
+** ស្ព៊ែមយ៉ាងសំបើមក្រៃលែង
+** សង្រ្គាមនៃការកែប្រែដែលនាំឲ�ូចប្រយោជន�
+** ទំព�រដែលមានចរាចរកម្រិ��្ពស់',
+'protect-edit-reasonlist'     => 'មូលហ��ុដែលគ�ការពារមិនឱ្យមានការកែប្រែ',
+'protect-expiry-options'      => '១ ម៉ោង:1 hour,១ �្ងៃ:1 day,១ សប្ដាហ�:1 week,២ សប្ដាហ�:2 weeks,១ �ែ:1 month,៣ �ែ:3 months,៦ �ែ:6 months,១ ឆ្នាំ:1 year,គ្មានកំណ�់:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'ការអនុញ្ញា�៖',
 'restriction-level'           => 'កម្រិ�​នៃ​ការដាក់កំហិ� ៖',
 'minimum-size'                => 'ទំហំអប្បបរមា',
@@ -1743,6 +1855,7 @@ $NEWPAGE
 'undeletebtn'               => 'ស្ដារឡើងវិញ',
 'undeletelink'              => 'ស្�ារឡើងវិញ',
 'undeletereset'             => 'ធ្វើឱ្យដូចដើមវិញ',
+'undeleteinvert'            => 'បញ្ច្រាសជម្រើស',
 'undeletecomment'           => 'យោបល់៖',
 'undeletedarticle'          => 'បានស្�ារ"[[$1]]"ឡើងវិញ',
 'undeletedrevisions'        => 'បានស្�ារឡើងវិញនូវ{{PLURAL:$1|១កំណែ|$1កំណែ}}',
@@ -1770,26 +1883,27 @@ $1',
 'blanknamespace' => '(ទូទៅ)',
 
 # Contributions
-'contributions' => 'ការរួមចំណែក​របស់អ្នកប្រើប្រាស់',
-'mycontris'     => 'ការរួមចំណែក',
-'contribsub2'   => 'សម្រាប់ $1 ($2)',
-'nocontribs'    => 'គ្មានការផ្លាស់ប្�ូរ�្រូវបានឃើញដូចនឹងលក្�ណៈវិនិច្ឆ�យទាំងន�ះ។',
-'uctop'         => '(ទាន់សម�យ)',
-'month'         => '�ែ៖',
-'year'          => 'ឆ្នាំ៖',
-
-'sp-contributions-newbies'     => 'បង្ហាញ�ែការរួមចំណែករបស់អ្នកប្រើប្រាស់�្មីៗ',
-'sp-contributions-newbies-sub' => 'ចំពោះគណនី�្មីៗ',
-'sp-contributions-blocklog'    => 'កំណ�់ហ��ុនៃការហាមឃា�់',
-'sp-contributions-search'      => 'ស្វែងរកការរួមចំណែក',
-'sp-contributions-username'    => 'អាសយដ្ឋាន IP ឬឈ្មោះអ្នកប្រើ៖',
-'sp-contributions-submit'      => 'ស្វែងរក',
+'contributions'       => 'ការរួមចំណែក​របស់អ្នកប្រើប្រាស់',
+'contributions-title' => 'ការរួមចំណែករបស់អ្នកប្រើប្រាស់ $1',
+'mycontris'           => 'ការរួមចំណែក',
+'contribsub2'         => 'សម្រាប់ $1 ($2)',
+'nocontribs'          => 'គ្មានការផ្លាស់ប្�ូរ�្រូវបានឃើញដូចនឹងលក្�ណៈវិនិច្ឆ�យទាំងន�ះ។',
+'uctop'               => '(ទាន់សម�យ)',
+'month'               => '�ែ៖',
+'year'                => 'ឆ្នាំ៖',
+
+'sp-contributions-newbies'       => 'បង្ហាញ�ែការរួមចំណែករបស់អ្នកប្រើប្រាស់�្មីៗ',
+'sp-contributions-newbies-sub'   => 'ចំពោះគណនី�្មីៗ',
+'sp-contributions-newbies-title' => 'ការរួមចំណែករបស់អ្នកប្រើប្រាស់ចំពោះគណនី�្មី',
+'sp-contributions-blocklog'      => 'កំណ�់ហ��ុនៃការហាមឃា�់',
+'sp-contributions-search'        => 'ស្វែងរកការរួមចំណែក',
+'sp-contributions-username'      => 'អាសយដ្ឋាន IP ឬឈ្មោះអ្នកប្រើ៖',
+'sp-contributions-submit'        => 'ស្វែងរក',
 
 # What links here
 'whatlinkshere'            => 'អ្វី​ដែលភ្ជាប់មកទីន�ះ',
 'whatlinkshere-title'      => 'ទំព�រនានាដែល​�ភ្ជាប់​ទៅ "$1"',
 'whatlinkshere-page'       => 'ទំព�រ៖',
-'linklistsub'              => '(បញ្ជី​នៃ​�ំណភ្ជាប់)',
 'linkshere'                => "ទំព�រដូច�ទៅ​ន�ះ�ភ្ជាប់មក '''[[:$1]]''' ៖",
 'nolinkshere'              => "គ្មានទំព�រណាមួយ�ភ្ជាប់ទៅ '''[[:$1]]''' ទ�។",
 'nolinkshere-ns'           => "គ្មានទំព�រណាមួយ �ភ្ជាប់ ទៅ '''[[:$1]]''' ក្នុងវាលឈ្មោះ ដែលបានជ្រើសរើស។",
@@ -1805,17 +1919,17 @@ $1',
 'whatlinkshere-filters'    => '�ម្រងការពារនានា',
 
 # Block/unblock
-'blockip'                     => 'ហាមឃា�់អ្នកប្រើប្រាស់',
-'blockip-legend'              => 'ហាមឃា�់អ្នកប្រើប្រាស់',
-'blockiptext'                 => 'សូម​ប្រើប្រាស់​សំណុំ​បែបបទ​�ាងក្រោម​ដើម្បី​រាំង�្ទប់​ការសរស�រ​ពី​អាសយដ្ឋាន IP ឬ​ឈ្មោះ​អ្នកប្រើប្រាស់ កំណ�់​មួយ​។
+'blockip'                      => 'ហាមឃា�់អ្នកប្រើប្រាស់',
+'blockip-legend'               => 'ហាមឃា�់អ្នកប្រើប្រាស់',
+'blockiptext'                  => 'សូម​ប្រើប្រាស់​សំណុំ​បែបបទ​�ាងក្រោម​ដើម្បី​រាំង�្ទប់​ការសរស�រ​ពី​អាសយដ្ឋាន IP ឬ​ឈ្មោះ​អ្នកប្រើប្រាស់ កំណ�់​មួយ​។
 ការ​ធ្វើ​បែបន�ះ​គួរ�ែ​ធ្វើឡើង​ក្នុង​គោលបំណង​បង្ការ​ការប៉ុនប៉ង​បំផ្លាញ(vandalism)ដូច​ដែល​មាន​ចែង​ក្នុង[[{{MediaWiki:Policy-url}}|គោលការណ�]]។
 សូមបំព�ញមូលហ��ុច្បាស់លាស់មួយ�ាងក្រោម (ឧទាហរណ�៖ រាយឈ្មោះទំព�រនានាដែល�្រូវបានគ�បំផ្លាញ)។',
-'ipaddress'                   => 'អាសយដ្ឋាន IP ៖',
-'ipadressorusername'          => 'អាសយដ្ឋាន IP ឬឈ្មោះអ្នកប្រើ៖',
-'ipbexpiry'                   => 'រយៈព�លផុ�កំណ�់៖',
-'ipbreason'                   => 'មូលហ��ុ៖',
-'ipbreasonotherlist'          => 'មូលហ��ុផ្ស�ងទៀ�',
-'ipbreason-dropdown'          => '*មូលហ��ុហាមឃា�់ជាទូទៅ
+'ipaddress'                    => 'អាសយដ្ឋាន IP ៖',
+'ipadressorusername'           => 'អាសយដ្ឋាន IP ឬឈ្មោះអ្នកប្រើ៖',
+'ipbexpiry'                    => 'រយៈព�លផុ�កំណ�់៖',
+'ipbreason'                    => 'មូលហ��ុ៖',
+'ipbreasonotherlist'           => 'មូលហ��ុផ្ស�ងទៀ�',
+'ipbreason-dropdown'           => '*មូលហ��ុហាមឃា�់ជាទូទៅ
 ** ដាក់បញ្ចូលព��៌មានមិនពិ�
 ** ដក�្លឹមទាំងស្រុងពីទំព�រ
 ** Spamming links to external sites
@@ -1823,68 +1937,79 @@ $1',
 ** Intimidating behaviour/harassment
 ** Abusing multiple accounts
 ** ប្រើប្រាស់ឈ្មោះដែលមិនអាចទទួលយកបាន',
-'ipbanononly'                 => 'ហាមឃា�់�ែអ្នកប្រើប្រាស់ជាអនាមិកជនប៉ុណ្ណោះ',
-'ipbcreateaccount'            => 'ការពារការបង្កើ�គណនី',
-'ipbemailban'                 => 'ការពារអ្នកប្រើប្រាស់ពីការផ្ញើរអ៊ីមែល',
-'ipbsubmit'                   => 'ហាមឃា�់អ្នកប្រើប្រាស់ន�ះ',
-'ipbother'                    => 'រយៈព�លផ្ស�ងទៀ�៖',
-'ipboptions'                  => '២ម៉ោង:2 hours,១�្ងៃ:1 day,៣�្ងៃ:3 days,១សប្�ាហ�:1 week,២សប្�ាហ�:2 weeks,១�ែ:1 month,៣�ែ:3 months,៦�ែ:6 months,១ឆ្នាំ:1 year,គ្មានកំណ�់:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'ផ្ស�ងៗទៀ�',
-'ipbotherreason'              => 'មូលហ��ុ(ផ្ស�ងទៀ�ឬបន្�ែម)៖',
-'ipbwatchuser'                => '�ាមដានទំព�រអ្នកប្រើប្រាស់និងទំព�រពិភាក្សារបស់អ្នកប្រើប្រាស់ន�ះ។',
-'badipaddress'                => 'អាសយដ្ឋានIPមិន�្រឹម�្រូវ',
-'blockipsuccesssub'           => 'បានហាមឃា�់ដោយជោគជ�យ',
-'ipb-edit-dropdown'           => 'កែប្រែ ហ��ុផល រាំង�្ទប់',
-'ipb-unblock-addr'            => 'ឈប់ហាមឃា�់$1',
-'ipb-unblock'                 => 'លែងរាំង�្ទប់ អ្នកប្រើប្រាស់ ឬ អាសយដ្ឋាន IP',
-'ipb-blocklist-addr'          => 'ការរាំង�្ទប់ដែលមានស្រ�ចសម្រាប់$1',
-'ipb-blocklist'               => 'មើលការហាមឃា�់ដែលមានស្រ�ច',
-'unblockip'                   => 'ឈប់ហាមឃា�់អ្នកប្រើប្រាស់',
-'unblockiptext'               => 'សូម​ប្រើប្រាស់​ទម្រង់​បែបបទ​�ាងក្រោម​ន�ះ ដើម្បី​បើក​សិទ្ឋិ​សរស�រ​ឡើងវិញ សម្រាប់​អាសយដ្ឋាន​IP​ឬ​អ្នកប្រើប្រាស់​ដែល​�្រូវ​បាន​រាំង�្ទប់​ពីមុន​។',
-'ipusubmit'                   => 'លែងរាំង�្ទប់ អាសយដ្ឋាន ន�ះ',
-'unblocked'                   => '[[User:$1|$1]] �្រូវបានឈប់ហាមឃា�់',
-'unblocked-id'                => '$1 �្រូវបានឈប់ហាមឃា�់ហើយ',
-'ipblocklist'                 => 'ឈ្មោះអ្នកប្រើប្រាស់ និង អាសយដ្ឋាន IP ដែល�្រូវបានរាំង�្ទប់',
-'ipblocklist-legend'          => 'រកមើល អ្នកប្រើប្រាស់ ដែល�្រូវបានរាំង�្ទប់',
-'ipblocklist-username'        => 'ឈ្មោះអ្នកប្រើឬអាសយដ្ឋានIP៖',
-'ipblocklist-submit'          => 'ស្វែងរក',
-'blocklistline'               => '$1, $2 បានហាមឃា�់ $3 (រយៈព�ល$4)',
-'infiniteblock'               => 'គ្មានកំណ�់',
-'expiringblock'               => 'ផុ�កំណ�់ $1',
-'anononlyblock'               => 'សម្រាប់�ែអនាមិកជនប៉ុណ្ណោះ',
-'noautoblockblock'            => 'ការហាមឃា�់ដោយស្វ�យប្រវ�្�ិមិន�្រូវបានអនុញ្ញា�ទ�',
-'createaccountblock'          => 'ការបង្កើ�គណនី�្រូវបានហាមឃា�់',
-'emailblock'                  => 'អ៊ីមែលដែល�្រូវបានហាមឃា�់',
-'ipblocklist-empty'           => 'បញ្ជីរហាមឃា�់គឺទទ�។',
-'ipblocklist-no-results'      => 'អាសយដ្ឋានIPឬឈ្មោះអ្នកប្រើដែលបានស្នើសុំគឺមិន�្រូវបានរារាំងទ�។',
-'blocklink'                   => 'ហាមឃា�់',
-'unblocklink'                 => 'ឈប់ហាមឃា�់',
-'contribslink'                => 'ការរួមចំណែក',
-'autoblocker'                 => 'អ្នកបាន�្រូវបានហាមឃា�់ដោយស្វ�យប្រវ�្�ិ ពីព្រោះអាសយដ្ឋានIPរបស់អ្នក�្រូវបានប្រើប្រាស់ដោយ"[[User:$1|$1]]"។ មូលហ��ុលើកឡើងចំពោះការហាមឃា�់$1គឺ៖ "$2"',
-'blocklogpage'                => 'កំណ�់ហ��ុនៃការហាមឃា�់',
-'blocklogentry'               => 'បានហាមឃា�់ [[$1]]​ដោយរយៈព�លផុ�កំណ�់$2 $3',
-'blocklogtext'                => 'ន�ះជាកំណ�់ហ��ុនៃការហាមឃា�់និងឈប់ហាមឃា�់អ្នកប្រើប្រាស់។ អាសយដ្ឋានIPដែល�្រូវបានហាមឃា�់ដោយស្វ�យប្រវ�្�ិមិន�្រូវបានដាក់ក្នុងបញ្ជីន�ះទ�។ សូមមើល[[Special:IPBlockList|បញ្ជីនៃការហាមឃា�់IP]]ចំពោះបញ្ជីនៃហាមឃា�់នា�្មីៗ។',
-'unblocklogentry'             => 'បានឈប់ហាមឃា�់ $1',
-'block-log-flags-anononly'    => 'សម្រាប់​�ែ​អ្នកប្រើប្រាស់​អនាមិក​ប៉ុណ្ណោះ',
-'block-log-flags-nocreate'    => 'ការបង្កើ�គណនី�្រូវបានហាមឃា�់',
-'block-log-flags-noautoblock' => 'ការហាមឃា�់ដោយស្វ�យប្រវ�្�ិមិន�្រូវបានអនុញ្ញា�ទ�',
-'block-log-flags-noemail'     => 'អ៊ីមែល�្រូវបានហាមឃា�់',
-'ipb_expiry_invalid'          => 'កាលបរិច្ឆ�ទផុ�កំណ�់មិន�្រឹម�្រូវទ�។',
-'ipb_already_blocked'         => '"$1"�្រូវបានរាំង�្ទប់ហើយ',
-'ipb_cant_unblock'            => 'កំហុស៖ រកមិនឃើញ ID រាំង�្ទប់ $1 ។
+'ipbanononly'                  => 'ហាមឃា�់�ែអ្នកប្រើប្រាស់ជាអនាមិកជនប៉ុណ្ណោះ',
+'ipbcreateaccount'             => 'ការពារការបង្កើ�គណនី',
+'ipbemailban'                  => 'ការពារអ្នកប្រើប្រាស់ពីការផ្ញើរអ៊ីមែល',
+'ipbsubmit'                    => 'ហាមឃា�់អ្នកប្រើប្រាស់ន�ះ',
+'ipbother'                     => 'រយៈព�លផ្ស�ងទៀ�៖',
+'ipboptions'                   => '២ម៉ោង:2 hours,១�្ងៃ:1 day,៣�្ងៃ:3 days,១សប្�ាហ�:1 week,២សប្�ាហ�:2 weeks,១�ែ:1 month,៣�ែ:3 months,៦�ែ:6 months,១ឆ្នាំ:1 year,គ្មានកំណ�់:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'               => 'ផ្ស�ងៗទៀ�',
+'ipbotherreason'               => 'មូលហ��ុ(ផ្ស�ងទៀ�ឬបន្�ែម)៖',
+'ipbwatchuser'                 => '�ាមដានទំព�រអ្នកប្រើប្រាស់និងទំព�រពិភាក្សារបស់អ្នកប្រើប្រាស់ន�ះ។',
+'ipballowusertalk'             => 'អនុញ្ញា�ឱ្យអ្នកប្រើប្រាស់ន�ះ​កែប្រែទំព�រពិភាក្សារបស់�្លួន ទោះជា�្រូវបានរាំង�្ទប់ក�ដោយ',
+'badipaddress'                 => 'អាសយដ្ឋានIPមិន�្រឹម�្រូវ',
+'blockipsuccesssub'            => 'បានហាមឃា�់ដោយជោគជ�យ',
+'ipb-edit-dropdown'            => 'កែប្រែ ហ��ុផល រាំង�្ទប់',
+'ipb-unblock-addr'             => 'ឈប់ហាមឃា�់$1',
+'ipb-unblock'                  => 'លែងរាំង�្ទប់ អ្នកប្រើប្រាស់ ឬ អាសយដ្ឋាន IP',
+'ipb-blocklist-addr'           => 'ការរាំង�្ទប់ដែលមានស្រ�ចសម្រាប់$1',
+'ipb-blocklist'                => 'មើលការហាមឃា�់ដែលមានស្រ�ច',
+'ipb-blocklist-contribs'       => 'ការរួមចំណែកសម្រាប់ $1',
+'unblockip'                    => 'ឈប់ហាមឃា�់អ្នកប្រើប្រាស់',
+'unblockiptext'                => 'សូម​ប្រើប្រាស់​ទម្រង់​បែបបទ​�ាងក្រោម​ន�ះ ដើម្បី​បើក​សិទ្ឋិ​សរស�រ​ឡើងវិញ សម្រាប់​អាសយដ្ឋាន​IP​ឬ​អ្នកប្រើប្រាស់​ដែល​�្រូវ​បាន​រាំង�្ទប់​ពីមុន​។',
+'ipusubmit'                    => 'ដក​ការរាំង�្ទប់​ន�ះ​ច�ញ',
+'unblocked'                    => '[[User:$1|$1]] �្រូវបានឈប់ហាមឃា�់',
+'unblocked-id'                 => '$1 �្រូវបានឈប់ហាមឃា�់ហើយ',
+'ipblocklist'                  => 'ឈ្មោះអ្នកប្រើប្រាស់ និង អាសយដ្ឋាន IP ដែល�្រូវបានរាំង�្ទប់',
+'ipblocklist-legend'           => 'រកមើល អ្នកប្រើប្រាស់ ដែល�្រូវបានរាំង�្ទប់',
+'ipblocklist-username'         => 'ឈ្មោះអ្នកប្រើឬអាសយដ្ឋានIP៖',
+'ipblocklist-sh-userblocks'    => '$1 ការរាំង�្ទប់គណនី',
+'ipblocklist-sh-tempblocks'    => '$1 ការរាំង�្ទប់បណ្ដោះអាសន្ន',
+'ipblocklist-sh-addressblocks' => '$1 ការរាំង�្ទប់ IP �ែមួយ',
+'ipblocklist-submit'           => 'ស្វែងរក',
+'blocklistline'                => '$1, $2 បានហាមឃា�់ $3 (រយៈព�ល$4)',
+'infiniteblock'                => 'គ្មានកំណ�់',
+'expiringblock'                => 'ផុ�កំណ�់ $1',
+'anononlyblock'                => 'សម្រាប់�ែអនាមិកជនប៉ុណ្ណោះ',
+'noautoblockblock'             => 'ការហាមឃា�់ដោយស្វ�យប្រវ�្�ិមិន�្រូវបានអនុញ្ញា�ទ�',
+'createaccountblock'           => 'ការបង្កើ�គណនី�្រូវបានហាមឃា�់',
+'emailblock'                   => 'អ៊ីមែលដែល�្រូវបានហាមឃា�់',
+'blocklist-nousertalk'         => 'មិនអាចកែប្រែទំព�រពិភាក្សា�្លួនឯងទ�',
+'ipblocklist-empty'            => 'បញ្ជីរហាមឃា�់គឺទទ�។',
+'ipblocklist-no-results'       => 'អាសយដ្ឋានIPឬឈ្មោះអ្នកប្រើដែលបានស្នើសុំគឺមិន�្រូវបានរារាំងទ�។',
+'blocklink'                    => 'ហាមឃា�់',
+'unblocklink'                  => 'ឈប់ហាមឃា�់',
+'contribslink'                 => 'ការរួមចំណែក',
+'autoblocker'                  => 'អ្នកបាន�្រូវបានហាមឃា�់ដោយស្វ�យប្រវ�្�ិ ពីព្រោះអាសយដ្ឋានIPរបស់អ្នក�្រូវបានប្រើប្រាស់ដោយ"[[User:$1|$1]]"។ មូលហ��ុលើកឡើងចំពោះការហាមឃា�់$1គឺ៖ "$2"',
+'blocklogpage'                 => 'កំណ�់ហ��ុនៃការហាមឃា�់',
+'blocklog-fulllog'             => 'កំណ�់ហ��ុនៃការហាមឃា�់ព�ញល�ញ',
+'blocklogentry'                => 'បានហាមឃា�់ [[$1]]​ដោយរយៈព�លផុ�កំណ�់$2 $3',
+'blocklogtext'                 => 'ន�ះជាកំណ�់ហ��ុនៃការហាមឃា�់និងឈប់ហាមឃា�់អ្នកប្រើប្រាស់។ អាសយដ្ឋានIPដែល�្រូវបានហាមឃា�់ដោយស្វ�យប្រវ�្�ិមិន�្រូវបានដាក់ក្នុងបញ្ជីន�ះទ�។ សូមមើល[[Special:IPBlockList|បញ្ជីនៃការហាមឃា�់IP]]ចំពោះបញ្ជីនៃហាមឃា�់នា�្មីៗ។',
+'unblocklogentry'              => 'បានឈប់ហាមឃា�់ $1',
+'block-log-flags-anononly'     => 'សម្រាប់​�ែ​អ្នកប្រើប្រាស់​អនាមិក​ប៉ុណ្ណោះ',
+'block-log-flags-nocreate'     => 'ការបង្កើ�គណនី�្រូវបានហាមឃា�់',
+'block-log-flags-noautoblock'  => 'ការហាមឃា�់ដោយស្វ�យប្រវ�្�ិមិន�្រូវបានអនុញ្ញា�ទ�',
+'block-log-flags-noemail'      => 'អ៊ីមែល�្រូវបានហាមឃា�់',
+'block-log-flags-nousertalk'   => 'មិនអាចកែប្រែទំព�រពិភាក្សាផ្ទាល់�្លួនទ�',
+'ipb_expiry_invalid'           => 'កាលបរិច្ឆ�ទផុ�កំណ�់មិន�្រឹម�្រូវទ�។',
+'ipb_already_blocked'          => '"$1"�្រូវបានរាំង�្ទប់ហើយ',
+'ipb-needreblock'              => '== ទប់ស្កា�់​រួចរាល់ ==
+$1 �្រូវ​បាន​ទប់ស្កា�់​ហើយ​។ �ើ​អ្នក​ចង់​ធ្វើការ​ផ្លាស់ប្ដូរ​ការកំណ�់​?',
+'ipb_cant_unblock'             => 'កំហុស៖ រកមិនឃើញ ID រាំង�្ទប់ $1 ។
 
 វាប្រហែលជា�្រូវបានគ�ឈប់រាំង�្ទប់ហើយ។',
-'ip_range_invalid'            => 'ដែនកំណ�់ IP គ្មានសុពលភាព។',
-'blockme'                     => 'ហាមឃា�់�្ញុំ',
-'proxyblocker-disabled'       => 'មុ�ងារន�ះ�្រូវបានអសកម្ម។',
-'proxyblockreason'            => 'អាសយដ្ឋាន IP របស់អ្នក�្រូវបានរាំង�្ទប់ហើយ ពីព្រោះវាជាប្រុកស៊ី(proxy)ចំហ។
+'ip_range_invalid'             => 'ដែនកំណ�់ IP គ្មានសុពលភាព។',
+'blockme'                      => 'ហាមឃា�់�្ញុំ',
+'proxyblocker-disabled'        => 'មុ�ងារន�ះ�្រូវបានអសកម្ម។',
+'proxyblockreason'             => 'អាសយដ្ឋាន IP របស់អ្នក�្រូវបានរាំង�្ទប់ហើយ ពីព្រោះវាជាប្រុកស៊ី(proxy)ចំហ។
 
 សូមទំនាក់ទំនងអ្នកផ្ដល់ស�វាអ៊ីនធឺណិ�ឬអ្នកបច្ច�កទ�សរបស់អ្នក ហើយប្រាប់ពួកគ�ពីបញ្ហាសុវ�្�ិភាពដ�សំ�ាន់ន�ះ។',
-'proxyblocksuccess'           => 'រួចរាល់ជាស្�ាពរ។',
-'sorbsreason'                 => 'អាសយដ្ឋាន IP របស់អ្នកមានឈ្មោះក្នុងបញ្ជីប្រុកស៊ី(proxy)ចំហ នៅក្នុង DNSBL របស់ {{SITENAME}}។',
-'sorbs_create_account_reason' => 'អាសយដ្ឋាន IP របស់អ្នកមានឈ្មោះក្នុងបញ្ជីប្រុកស៊ី(proxy)ចំហ នៅក្នុង DNSBL របស់ {{SITENAME}}។
+'proxyblocksuccess'            => 'រួចរាល់ជាស្�ាពរ។',
+'sorbsreason'                  => 'អាសយដ្ឋាន IP របស់អ្នកមានឈ្មោះក្នុងបញ្ជីប្រុកស៊ី(proxy)ចំហ នៅក្នុង DNSBL របស់ {{SITENAME}}។',
+'sorbs_create_account_reason'  => 'អាសយដ្ឋាន IP របស់អ្នកមានឈ្មោះក្នុងបញ្ជីប្រុកស៊ី(proxy)ចំហ នៅក្នុង DNSBL របស់ {{SITENAME}}។
 
 អ្នកមិនអាចបង្កើ�គណនីបានទ�',
+'cant-block-while-blocked'     => 'អ្នកមិនអាចរាំង�្ទប់អ្នកប្រើប្រាស់ដទៃបានទ� ព្រោះអ្នកក��្រូវបានរាំង�្ទប់ដែរ។',
 
 # Developer tools
 'lockdb'              => 'ចាក់សោមូលដ្ឋានទិន្នន�យ',
@@ -1908,9 +2033,9 @@ $1',
 'databasenotlocked'   => 'មូលដ្ឋានទិន្នន�យ មិន�្រូវបានចាក់សោ។',
 
 # Move page
-'move-page'               => 'ប្�ូរទី�ាំង $1',
-'move-page-legend'        => 'ប្�ូរទី�ាំងទំព�រ',
-'movepagetext'            => "ការប្រើប្រាស់​ទម្រង់​�ាងក្រោម​នឹង​ប្�ូរ​ឈ្មោះ​ទំព�រ ប្�ូរទី�ាំង​គ្រប់​ប្រវ�្�ិ​របស់​វា​ទៅ​ឈ្មោះ�្មី​។
+'move-page'                 => 'ប្�ូរទី�ាំង $1',
+'move-page-legend'          => 'ប្�ូរទី�ាំងទំព�រ',
+'movepagetext'              => "ការប្រើប្រាស់​ទម្រង់​�ាងក្រោម​នឹង​ប្�ូរ​ឈ្មោះ​ទំព�រ ប្�ូរទី�ាំង​គ្រប់​ប្រវ�្�ិ​របស់​វា​ទៅ​ឈ្មោះ�្មី​។
 ចំណងជើង​ចាស់​នឹង​ក្លាយជា​ទំព�រ​ប្�ូរទិសទៅ​ចំណងជើង�្មី​។
 �ំណភ្ជាប់​ទៅ​ចំណងជើង នៃ​ទំព�រចាស់​នឹង​មិន​បាន​�្រូវ​ផ្លាស់ប្�ូរ; សូម​ពិនិ�្យមើល ការប្�ូរទិស មិនបានបង្កើ� ទំព�រប្�ូរទិសទ្វ� ឬ ទំព�រប្�ូរទិសបាក់ ។
 អ្នក�្រូវ�ែធានាប្រាកដ �ា​�ំណភ្ជាប់ទាំងនោះ បន្�សំដៅ​ទៅ​គោលដៅបានសន្ម�​។
@@ -1919,46 +2044,53 @@ $1',
 
 '''ប្រយ��្ន!'''
 វាអាចជា បំលាស់ប្�ូរដល់ឫសគល់ និង​មិននឹកស្មានជាមុន ចំពោះ​ទំព�រប្រជាប្រិយ​។ អ្នក�្រូវ�ែ​ដឹងប្រាកដ​អំពី​ផលវិបាកទាំងអស់ មុននឹង​បន្�ទង្វើន�ះ​។",
-'movepagetalktext'        => "ទំព�រសហពិភាក្សាបើមាន នឹង�្រូវបានប្�ូរទៅឈ្មោះ​�្មី​ជាមួយគ្នា​ដោយ​ស្វ�យប្រវ�្�ិ '''លើកលែង�ែ៖'''
+'movepagetalktext'          => "ទំព�រសហពិភាក្សាបើមាន នឹង�្រូវបានប្�ូរទៅឈ្មោះ​�្មី​ជាមួយគ្នា​ដោយ​ស្វ�យប្រវ�្�ិ '''លើកលែង�ែ៖'''
 *ទំព�រពិភាក្សាមិនទទ�និងមានរួចរាល់ក្រោមឈ្មោះ�្មី ឬ
 *អ្នក​ដោះប្រអប់ធីក​�ាងក្រោម។
 
 ក្នុង​ករណី​ទាំង​នោះ អ្នក​នឹង​�្រូវ�ែ​ប្�ូរឈ្មោះ​ទំព�រ​ឬ​បញ្ចូលរួមគ្នា​បើ​អ្នក​ចង់។",
-'movearticle'             => 'ប្ដូរទី�ាំងទំព�រ៖',
-'movenotallowed'          => 'អ្នកមិន�្រូវបាន​អនុញ្ញា�​ឱ្យ​ប្�ូរទី�ាំងទំព�រ​ទ�។',
-'newtitle'                => 'ទៅចំណងជើង�្មី៖',
-'move-watch'              => '�ាមដានទំព�រន�ះ',
-'movepagebtn'             => 'ប្ដូរទី�ាំង',
-'pagemovedsub'            => 'ប្ដូរទី�ាំងដោយជោគជ�យ',
-'movepage-moved'          => '<big>\'\'\'"$1"�្រូវបានប្�ូរទី�ាំងទៅ"$2"\'\'\'ហើយ</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'ទំព�រដែលមានឈ្មោះបែបន�ះមានរួចហើយ ឬ ឈ្មោះដែលអ្នកបានជ្រើសរើសមិន�្រឹម�្រូវ។
+'movearticle'               => 'ប្ដូរទី�ាំងទំព�រ៖',
+'movenologin'               => 'មិនបានឡុកអ៊ីន',
+'movenologintext'           => 'អ្នក​�្រូវ�ែ​ជា​អ្នកប្រើប្រាស់​ដែល​បាន​ចុះឈ្មោះ ហើយបាន [[Special:UserLogin|ឡុកអ៊ីន]] ដើម្បីប្ដូរទី�ាំងទំព�រមួយ។',
+'movenotallowed'            => 'អ្នកមិន�្រូវបាន​អនុញ្ញា�​ឱ្យ​ប្�ូរទី�ាំងទំព�រ​ទ�។',
+'cant-move-user-page'       => 'អ្នកមិន�្រូវបានអនុញ្ញា�ឱ្យប្ដូរទី�ាំងទំព�រអ្នកប្រើប្រាស់នានា(ដាច់ពីអនុទំព�ររបស់វា)ទ�។',
+'newtitle'                  => 'ទៅចំណងជើង�្មី៖',
+'move-watch'                => '�ាមដានទំព�រន�ះ',
+'movepagebtn'               => 'ប្ដូរទី�ាំង',
+'pagemovedsub'              => 'ប្ដូរទី�ាំងដោយជោគជ�យ',
+'movepage-moved'            => '<big>\'\'\'"$1"�្រូវបានប្�ូរទី�ាំងទៅ"$2"\'\'\'ហើយ</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'ទំព�រដែលមានឈ្មោះបែបន�ះមានរួចហើយ ឬ ឈ្មោះដែលអ្នកបានជ្រើសរើសមិន�្រឹម�្រូវ។
 សូមជ្រើសរើសឈ្មោះមួយផ្ស�ងទៀ�។',
-'cantmove-titleprotected' => 'អ្នកមិនអាច​ប្�ូទី�ាំង ទំព�រ​ ទៅទី�ាំងន�ះ, ព្រោះ ចំណងជើង�្មី បាន�្រូវការពារ ចំពោះការបង្កើ�វា',
-'talkexists'              => "'''ទំព�រ �្លួនវា បាន�្រូវប្ដូរទី�ាំង ដោយជោគជ�យ, ប៉ុន្�ែ ទំព�រពិភាក្សា មិនអាច�្រូវបាន ប្ដូរទី�ាំង ព្រោះ នៅមាន មួយទំព�រពិភាក្សា នៅ ចំណងជើង�្មី  ។ សូម បញ្ចូលរួមគ្នា ពួកវា ដោយដៃ ។'''",
-'movedto'                 => 'បានប្ដូរទី�ាំងទៅ',
-'movetalk'                => 'ប្ដូរទី�ាំងទំព�រសហពិភាក្សា',
-'move-subpages'           => 'ប្�ូរទី�ាំងគ្រប់ទំព�ររងប្រសិនបើអាច',
-'move-talk-subpages'      => 'ប្�ូរទី�ាំងគ្រប់ទំព�ររងនៃទំព�រពិភាក្សាប្រសិនបើអាច',
-'movepage-page-exists'    => 'ទំព�រ $1 មាន​រួច​ជា​ស្រ�ច​ហើយ​និង​មិន​អាច​សរស�រ​ជាន់​ពី​លើ​ដោយ​ស្វ�យប្រវ�្�ិ​បាន​ទ�​។',
-'movepage-page-moved'     => 'ទំព�រ$1�្រូវបានប្�ូរទី�ាំងទៅកាន់$2ហើយ។',
-'movepage-page-unmoved'   => 'ទំព�រ$1មិនអាចប្�ូរទី�ាំងទៅ$2បានទ�។',
-'1movedto2'               => 'បានប្ដូរទី�ាំង [[$1]] ទៅ [[$2]]',
-'1movedto2_redir'         => 'ទំព�រ [[$1]] �្រូវបានប្�ូរទី�ាំងទៅ [[$2]] �ាមរយៈការបញ្ជូនបន្�។',
-'movelogpage'             => 'កំណ�់ហ��ុនៃការប្ដូរទី�ាំង',
-'movelogpagetext'         => '�ាងក្រោមន�ះជាបញ្ជីនៃទំព�រដែល�្រូវបានប្�ូរទី�ាំង។',
-'movereason'              => 'មូលហ��ុ៖',
-'revertmove'              => '�្រឡប់',
-'delete_and_move'         => 'លុបនិងប្�ូរទី�ាំង',
-'delete_and_move_text'    => '==ការលុបជាចាំបាច់==
+'cantmove-titleprotected'   => 'អ្នកមិនអាច​ប្�ូទី�ាំង ទំព�រ​ ទៅទី�ាំងន�ះ, ព្រោះ ចំណងជើង�្មី បាន�្រូវការពារ ចំពោះការបង្កើ�វា',
+'talkexists'                => "'''ទំព�រ �្លួនវា បាន�្រូវប្ដូរទី�ាំង ដោយជោគជ�យ, ប៉ុន្�ែ ទំព�រពិភាក្សា មិនអាច�្រូវបាន ប្ដូរទី�ាំង ព្រោះ នៅមាន មួយទំព�រពិភាក្សា នៅ ចំណងជើង�្មី  ។ សូម បញ្ចូលរួមគ្នា ពួកវា ដោយដៃ ។'''",
+'movedto'                   => 'បានប្ដូរទី�ាំងទៅ',
+'movetalk'                  => 'ប្ដូរទី�ាំងទំព�រសហពិភាក្សា',
+'move-subpages'             => 'ប្�ូរទី�ាំងគ្រប់ទំព�ររងប្រសិនបើអាច',
+'move-talk-subpages'        => 'ប្�ូរទី�ាំងគ្រប់ទំព�ររងនៃទំព�រពិភាក្សាប្រសិនបើអាច',
+'movepage-page-exists'      => 'ទំព�រ $1 មាន​រួច​ជា​ស្រ�ច​ហើយ​និង​មិន​អាច​សរស�រ​ជាន់​ពី​លើ​ដោយ​ស្វ�យប្រវ�្�ិ​បាន​ទ�​។',
+'movepage-page-moved'       => 'ទំព�រ$1�្រូវបានប្�ូរទី�ាំងទៅកាន់$2ហើយ។',
+'movepage-page-unmoved'     => 'ទំព�រ$1មិនអាចប្�ូរទី�ាំងទៅ$2បានទ�។',
+'1movedto2'                 => 'បានប្ដូរទី�ាំង [[$1]] ទៅ [[$2]]',
+'1movedto2_redir'           => 'ទំព�រ [[$1]] �្រូវបានប្�ូរទី�ាំងទៅ [[$2]] �ាមរយៈការបញ្ជូនបន្�។',
+'movelogpage'               => 'កំណ�់ហ��ុនៃការប្ដូរទី�ាំង',
+'movelogpagetext'           => '�ាងក្រោមន�ះជាបញ្ជីនៃទំព�រដែល�្រូវបានប្�ូរទី�ាំង។',
+'movereason'                => 'មូលហ��ុ៖',
+'revertmove'                => '�្រឡប់',
+'delete_and_move'           => 'លុបនិងប្�ូរទី�ាំង',
+'delete_and_move_text'      => '==ការលុបជាចាំបាច់==
 "[[:$1]]"ដែលជាទី�ាំងទំព�រ�្រូវបញ្ជូនទៅ មានរួចជាស្រ�ចហើយ។
 �ើអ្នកចង់លុបវាដើម្បីជាវិធីសម្រាប់ប្�ូរទី�ាំងទ�?',
-'delete_and_move_confirm' => 'យល់ព្រម​លុប​ទំព�រ​ន�ះ',
-'delete_and_move_reason'  => 'បានលុបដើម្បីផ្លាស់ប្�ូរទី�ាំង',
-'selfmove'                => 'ចំណងជើងប្រភពនិងចំណងជើងគោលដៅគឺ�ែមួយ។
+'delete_and_move_confirm'   => 'យល់ព្រម​លុប​ទំព�រ​ន�ះ',
+'delete_and_move_reason'    => 'បានលុបដើម្បីផ្លាស់ប្�ូរទី�ាំង',
+'selfmove'                  => 'ចំណងជើងប្រភពនិងចំណងជើងគោលដៅគឺ�ែមួយ។
 
 មិនអាចប្ដូរទី�ាំងទំព�រមួយទៅលើ�្លួនវាបានទ�។',
-'imageinvalidfilename'    => 'ឈ្មោះឯកសារគោលដៅមិន�្រឹម�្រូវ',
-'fix-double-redirects'    => 'បន្ទាន់សម�យនូវរាល់ការបញ្ជូនបន្�ដែលសំដៅទៅរកចំណងជើងដើម',
+'immobile-source-namespace' => 'មិនអាចប្�ូរទី�ាំងទំព�រក្នុងលំហឈ្មោះ "$1" បានទ�',
+'immobile-target-namespace' => 'មិនអាចប្�ូរទី�ាំងទំព�រទៅលំហឈ្មោះ "$1" បានទ�',
+'immobile-source-page'      => 'ទំព�រន�ះមិនអាចប្ដូរទី�ាំងបានទ�។',
+'immobile-target-page'      => 'មិនអាចប្ដូរទី�ាំងទៅកាន់ចំណងជើងគោលដៅនោះបានទ�។',
+'imageinvalidfilename'      => 'ឈ្មោះឯកសារគោលដៅមិន�្រឹម�្រូវ',
+'fix-double-redirects'      => 'បន្ទាន់សម�យនូវរាល់ការបញ្ជូនបន្�ដែលសំដៅទៅរកចំណងជើងដើម',
 
 # Export
 'export'            => 'នាំទំព�រច�ញ',
@@ -1966,7 +2098,7 @@ $1',
 
 ដើម្បី នាំច�ញ ទំព�រ, អ្នក�្រូវ បញ្ចូលចំណងជើង ក្នុងប្រអប់អ�្�បទ �ាងក្រោម, មួយចំណងជើង ក្នុងមួយបន្ទា�់, និង ជ្រើសយក កំណែ �ាមបំណង របស់អ្នក (កំណែចាស់ ឬ កំណែ�្មី), រួមនឹង ប្រវ�្�ិ នៃ​ទំព�រ, ឬ �្រឹម�ែ កំណែបច្ចុប្បន្ន ដែលមានព��៌មាន អំពី កំណែប្រែ ចុងក្រោយ។
 
-ក្នុងករណី បន្ទាប់ អ្នកអាចប្រើប្រាស់ �ំណភ្ជាប់, ដូចជា [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] ចំពោះ ទំព�រ "[[{{MediaWiki:Mainpage}}]]"។',
+ក្នុងករណី បន្ទាប់ អ្នកអាចប្រើប្រាស់ �ំណភ្ជាប់, ដូចជា [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] ចំពោះ ទំព�រ "[[{{MediaWiki:Mainpage}}]]"។',
 'export-submit'     => 'នាំច�ញ',
 'export-addcattext' => 'បន្�ែមទំព�រនានាពីចំណា�់�្នាក់ក្រុម៖',
 'export-addcat'     => 'បន្�ែម',
@@ -1997,6 +2129,7 @@ $1',
 'import-interwiki-history'   => 'ចម្លង គ្រប់កំណែចាស់ នៃទំព�រន�ះ',
 'import-interwiki-submit'    => 'នាំចូល',
 'import-interwiki-namespace' => 'បញ្ជូនទំព�រទៅក្នុងលំហឈ្មោះ​៖',
+'import-comment'             => 'យោបល់៖',
 'importtext'                 => 'សូមនាំច�ញឯកសារន�ះពីវិគីប្រភពដោយប្រើប្រាស់[[Special:Export|ឧបករណ�នាំច�ញ]]។
 
 រក្សាវាទុកទៅក្នុងកុំព្យូទ�ររបស់អ្នករួចផ្ទុកវាឡើងនៅទីន�ះ។',
@@ -2029,7 +2162,7 @@ $1',
 'tooltip-pt-anontalk'             => 'ការពិភាក្សាអំពីកំណែប្រែពីអាសយដ្ឋានIPន�ះ',
 'tooltip-pt-preferences'          => 'ចំណង់ចំណូលចិ�្�',
 'tooltip-pt-watchlist'            => 'បញ្ជី​នៃ​ទំព�រ​ដែលអ្នកកំពុង​�្រួ�ពិនិ�្យ​រក​បំលាស់ប្ដូរ',
-'tooltip-pt-mycontris'            => 'បញ្ជីរួមចំណែក​របស់�្ញុំ',
+'tooltip-pt-mycontris'            => 'បញ្ជី​នៃ​ការរួមចំណែក​របស់​អ្នក',
 'tooltip-pt-login'                => 'អ្នក�្រូវបានលើកទឹកចិ�្�ឱ្យឡុកអ៊ីន។ ប៉ុន្�ែន�ះមិនមែនជាការបង្�ំទ�។',
 'tooltip-pt-anonlogin'            => 'អ្នក�្រូវបានលើកទឹកចិ�្�ឱ្យឡុកអ៊ីន មិនមែនជាការបង្�ំទ�។',
 'tooltip-pt-logout'               => 'ចាកច�ញ',
@@ -2088,12 +2221,12 @@ $1',
 'monobook.css' => '/* CSS បានដាក់ទីន�ះនឹងមានអនុភាពលើអ្នកប្រើប្រាស់នៃសំបកសៀវភៅឯក */',
 
 # Attribution
-'anonymous'        => 'អ្នកប្រើប្រាស់អនាមិក នៃ {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|user|អ្នកប្រើប្រាស់}}អនាមិកនៃ {{SITENAME}}',
 'siteuser'         => 'អ្នកប្រើប្រាស់$1នៃ{{SITENAME}}',
 'lastmodifiedatby' => 'ទំព�រន�ះ�្រូវបានប្�ូរចុងក្រោយដោយ$3នៅវ�លា$2,$1។', # $1 date, $2 time, $3 user
 'othercontribs'    => 'ផ្អែកលើការងាររបស់$1។',
 'others'           => 'ផ្ស�ងៗទៀ�',
-'siteusers'        => 'អ្នកប្រើប្រាស់ $1 នៃ {{SITENAME}}',
+'siteusers'        => '{{PLURAL:$2|user|អ្នកប្រើប្រាស់}} $1 នៃ {{SITENAME}}',
 
 # Spam protection
 'spamprotectiontitle' => '�ម្រងការពារស្ប៉ាម(Spam)',
@@ -2110,6 +2243,16 @@ $1',
 'numauthors'     => 'ចំនួនអ្នកនិពន្ឋ (អ�្�បទ): $1',
 'numtalkauthors' => 'ចំនួនអ្នកនិពន្ធ (ទំព�រពិភាក្សា): $1',
 
+# Skin names
+'skinname-standard'    => 'បុរាណ',
+'skinname-nostalgia'   => 'អាឡោះអាល�យ',
+'skinname-cologneblue' => 'ទឹកអប់�ៀវ',
+'skinname-monobook'    => 'សៀវភៅឯក',
+'skinname-myskin'      => 'សំបក�្ញុំ',
+'skinname-chick'       => 'កូនមាន់',
+'skinname-simple'      => 'សាមញ្ញ',
+'skinname-modern'      => 'ទំនើប',
+
 # Math options
 'mw_math_png'    => 'ជានិច្ចការជាPNG',
 'mw_math_simple' => 'ជា HTML បើសាមញ្ញបំផុ� ឬ ផ្ទុយទៅវិញ ជា PNG',
@@ -2156,10 +2299,12 @@ $1',
 'show-big-image'       => 'រូបភាពព�ញ',
 'show-big-image-thumb' => '<small>ទំហំ​នៃការមើលជាមុនន�ះ៖ $1 × $2 ភីកសែល</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'វិចិ�្រសាលរូបភាព�្មីៗ',
 'imagelisttext'         => "�ាងក្រោមន�ះជាបញ្ជី'''$1'''{{PLURAL:$1|ឯកសារ|ឯកសារ}}បានរៀប�ាមលំដាប់$2។",
 'newimages-summary'     => 'ទំព�រពិស�សន�ះបង្ហាញឯកសារដែលផ្ទុកឡើងចុងក្រោយគ�។',
+'newimages-legend'      => '�ម្រងការពារ',
+'newimages-label'       => 'ឈ្មោះរូបភាព៖',
 'showhidebots'          => '($1រូបយន្�)',
 'noimages'              => 'គ្មានឃើញអី សោះ។',
 'ilsubmit'              => 'ស្វែងរក',
@@ -2352,21 +2497,9 @@ $5
 សូមអះអាង�ាអ្នកពិ�ជាចង់បង្កើ�ទំព�រន�ះឡើងវិញពិ�ប្រាកដមែន។",
 'recreate'            => 'បង្កើ�ឡើងវិញ',
 
-# HTML dump
-'redirectingto' => 'កំពុងប្�ូរទិស ទៅ [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'សំអា�ឃ្លាំងសំងា�់(cache)នៃទំព�រន�ះ?
-
-$1',
 'confirm_purge_button' => 'យល់ព្រម',
-
-# AJAX search
-'searchcontaining' => "ស្វែងរកអ�្�បទដែលផ្ទុក ''$1'' ។",
-'searchnamed'      => "ស្វែងរកអ�្�បទដែលមានឈ្មោះ ''$1'' ។",
-'articletitles'    => "អ�្�បទផ្�ើមដោយ ''$1''",
-'hideresults'      => 'លាក់លទ្ធផល',
-'useajaxsearch'    => 'ប្រើប្រាស់ការស្វែងរករបស់ AJAX',
+'confirm-purge-top'    => 'សំអា�ឃ្លាំងសំងា�់(cache)នៃទំព�រន�ះ?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� ទំព�រមុន',
@@ -2460,7 +2593,7 @@ $1',
 'filepath-summary' => 'ទំព�រពិស�សន�ះ បង្ហាញផ្លូវព�ញល�ញ នៃ មួយឯកសារ។
 រូបភាព�្រូវបានបង្ហាញ ជាភាពម៉�់�្ពស់, ប្រភ�ទឯកសារ ដទៃទៀ� ធ្វើការដោយផ្ទាល់ ជាមួយ សហកម្មវិធី ។
 
-បញ្ចូល ឈ្មោះឯកសារ ដោយគ្មានការភ្ជាប់ "{{ns:image}}:" នៅពីមុ�វា ។',
+បញ្ចូល ឈ្មោះឯកសារ ដោយគ្មានការភ្ជាប់ "{{ns:file}}:" នៅពីមុ�វា ។',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'ស្វែងរកឯកសារដូចគ្នាប�ះបិទ',
diff --git a/languages/messages/MessagesKn.php b/languages/messages/MessagesKn.php
index cbdc5e5b..d5a72539 100644
--- a/languages/messages/MessagesKn.php
+++ b/languages/messages/MessagesKn.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'ಸದಸ�ಯರ_ಚರ�ಚೆಪ�ಟ',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_ಚರ�ಚೆ',
-	NS_IMAGE            => 'ಚಿತ�ರ',
-	NS_IMAGE_TALK       => 'ಚಿತ�ರ_ಚರ�ಚೆಪ�ಟ',
+	NS_FILE             => 'ಚಿತ�ರ',
+	NS_FILE_TALK        => 'ಚಿತ�ರ_ಚರ�ಚೆಪ�ಟ',
 	NS_MEDIAWIKI        => 'ಮೀಡಿಯವಿಕಿ',
 	NS_MEDIAWIKI_TALK   => 'ಮೀಡೀಯವಿಕಿ_ಚರ�ಚೆ',
 	NS_TEMPLATE         => 'ಟೆಂಪ�ಲೇಟ�',
@@ -84,6 +84,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'ವೀಕ�ಷಣಾ ಪಟ�ಟಿಯಲ�ಲಿ ನನ�ನ ಸಂಪಾದನೆಗಳನ�ನ� ತೋರಿಸಬೇಡ',
 'tog-watchlisthidebots'       => 'ವೀಕ�ಷಣಾಪಟ�ಟಿಯಲ�ಲಿ ಬಾಟ� ಸಂಪಾದನೆಗಳನ�ನ� ಅಡಗಿಸ�',
 'tog-watchlisthideminor'      => 'ಚಿಕ�ಕ ಬದಲಾವಣೆಗಳನ�ನ� ವೀಕ�ಷಣಾ ಪಟ�ಟಿಯಿಂದ ಅಡಗಿಸ�',
+'tog-watchlisthideliu'        => 'ಲಾಗ� ಇನ� ಆಗಿರ�ವ ಸದಸ�ಯರ ಸಂಪಾದನೆಗಳನ�ನ� ವೀಕ�ಷಣಾಪಟ�ಟಿಯಲ�ಲಿ ಅಡಗಿಸ�',
+'tog-watchlisthideanons'      => 'ಅನಾಮಧೇಯ ಬಳಕೆದಾರರ ಸಂಪಾದನೆಗಳನ�ನ� ವೀಕ�ಷಣಾಪಟ�ಟಿಯಲ�ಲಿ ಅಡಗಿಸ�',
 'tog-ccmeonemails'            => 'ಇತರರಿಗೆ ನಾನ� ಕಳ�ಹಿಸ�ವ ಇ-ಅಂಚೆಯ ಪ�ರತಿಯನ�ನ� ನನಗೂ ಕಳ�ಹಿಸ�',
 'tog-diffonly'                => 'ವ�ಯತ�ಯಾಸಗಳ ಕೆಳಗಿರ�ವ ಪ�ಟದ ವಿವರಗಳನ�ನ� ತೋರಿಸಬೇಡ',
 'tog-showhiddencats'          => 'ಅಡಗಿಸಲ�ಪಟ�ಟ ವರ�ಗಗಳನ�ನ� ತೋರಿಸ�',
@@ -92,8 +94,6 @@ $messages = array(
 'underline-never'   => 'ಎಂದಿಗೂ ಇಲ�ಲ',
 'underline-default' => 'ಬ�ರೌಸರ��ನ ಯಥಾಸ�ಥಿತಿ',
 
-'skinpreview' => '(ಮ�ನ�ನೋಟ)',
-
 # Dates
 'sunday'        => 'ಭಾನ�ವಾರ',
 'monday'        => 'ಸೋಮವಾರ',
@@ -187,7 +187,7 @@ $messages = array(
 'mytalk'         => 'ನನ�ನ ಚರ�ಚೆ',
 'anontalk'       => 'ಈ �.ಪಿ ಗೆ ಮಾತನಾಡಿ',
 'navigation'     => 'ಸಂಚರಣೆ',
-'and'            => 'ಮತ�ತ�',
+'and'            => '&#32;ಮತ�ತ�',
 
 # Metadata in edit box
 'metadata_help' => 'ಮೂಲಮಾಹಿತಿ:',
@@ -250,8 +250,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'ಕನ�ನಡ {{SITENAME}} ಬಗ�ಗೆ',
 'aboutpage'            => 'Project:ನಮ�ಮ ಬಗ�ಗೆ',
-'bugreports'           => 'ದೋಷ ವರದಿಗಳ�',
-'bugreportspage'       => 'Project:ದೋಷ ವರದಿಗಳ�',
 'copyright'            => 'ಇದ� ಈ ಕಾಪಿರೈಟ�‌ನಲ�ಲಿ ಲಭ�ಯವಿದೆ $1.',
 'copyrightpagename'    => '{{SITENAME}} ಕಾಪಿರೈಟ�',
 'copyrightpage'        => '{{ns:project}}:ಕೃತಿಸ�ವಾಮ�ಯತೆಗಳ�',
@@ -274,9 +272,7 @@ $messages = array(
 
 'badaccess'        => 'ಅನ�ಮತಿ ದೋಷ',
 'badaccess-group0' => 'ನೀವ� ಕೋರಿರ�ವ ಕ�ರಿಯೆಯನ�ನ� ನಿರ�ವಹಿಲ� ನಿಮಗೆ ಅನ�ಮತಿ ಇಲ�ಲ.',
-'badaccess-group1' => 'ನೀವ� ಕೋರಿರ�ವ ಕ�ರಿಯೆಯ� ಕೇವಲ $1 ಗ�ಂಪಿಗೆ ಸೇರಿರ�ವ ಬಳಕೆದಾರರಿಗೆ ಸೀಮಿತ.',
-'badaccess-group2' => 'ನೀವ� ಕೋರಿರ�ವ ಕ�ರಿಯೆಯ� ಕೇವಲ $1 ಗ�ಂಪ�ಗಳಲ�ಲಿ ಒಂದಕ�ಕೆ ಸೇರಿರ�ವ ಬಳಕೆದಾರರಿಗೆ ಸೀಮಿತ.',
-'badaccess-groups' => 'ನೀವ� ಕೋರಿರ�ವ ಕ�ರಿಯೆಯ� ಕೇವಲ $1 ಗ�ಂಪ�ಗಳಲ�ಲಿ ಒಂದಕ�ಕೆ ಸೇರಿರ�ವ ಬಳಕೆದಾರರಿಗೆ ಸೀಮಿತ.',
+'badaccess-groups' => 'ನೀವ� ಕೋರಿರ�ವ ಕ�ರಿಯೆಯ� ಕೇವಲ ಈ {{PLURAL:$2|ಗ�ಂಪಿಗೆ|ಗ�ಂಪ�ಗಳಲ�ಲಿ ಒಂದಕ�ಕೆ}} ಸೇರಿರ�ವ ಬಳಕೆದಾರರಿಗೆ ಸೀಮಿತವಾಗಿದೆ: $1.',
 
 'versionrequired'     => 'ಮೀಡಿಯವಿಕಿಯ $1 ನೇ ಅವೃತ�ತಿ ಬೇಕಾಗ�ತ�ತದೆ',
 'versionrequiredtext' => 'ಈ ಪ�ಟವನ�ನ� ವೀಕ�ಷಿಸಲ� ಮೀಡಿಯವಿಕಿಯ $1 ನೇ ಆವೃತ�ತಿ ಬೇಕಾಗಿದೆ. [[Special:Version|ಆವೃತ�ತಿ]] ಪ�ಟವನ�ನ� ನೋಡಿ.',
@@ -290,6 +286,8 @@ $messages = array(
 'editsection'             => 'ಬದಲಾಯಿಸಿ',
 'editold'                 => 'ಬದಲಾಯಿಸಿ',
 'viewsourceold'           => 'ಮೂಲವನ�ನ� ನೋಡ�',
+'editlink'                => 'ಸಂಪಾದಿಸಿ',
+'viewsourcelink'          => 'ಮೂಲವನ�ನ� ವೀಕ�ಷಿಸಿ',
 'editsectionhint'         => '$1 ವಿಭಾಗ ಸಂಪಾದಿಸಿ',
 'toc'                     => 'ಪರಿವಿಡಿ',
 'showtoc'                 => 'ತೋರಿಸ�',
@@ -367,7 +365,6 @@ $1',
 'badtitle'             => 'ಸರಿಯಿಲ�ಲದ ಹೆಸರ�',
 'badtitletext'         => 'ನೀವ� ಕೋರಿದ ಪ�ಟದ ಶೀರ�ಷಿಕೆ ಸಿಂಧ�ವಲ�ಲದ�ದ� ಅಥವ ಖಾಲಿ ಅಥವ ಸರಿಯಾದ ಕೊಂಡಿಯಲ�ಲದ ಅಂತರ-ಭಾಷೆ/ಅಂತರ-ವಿಕಿ ಸಂಪರ�ಕವಾಗಿದೆ. 
 ಅದರಲ�ಲಿ ಒಂದ� ಅಥವ ಹೆಚ�ಚ� ಶೀರ�ಷಿಕೆಯಲ�ಲಿ ಬಳಸಲ� ನಿಷಿದ�ಧವಾಗಿರ�ವ ಅಕ�ಷರಗಳ� ಇರಬಹ�ದ�.',
-'perfdisabled'         => 'ಕ�ಷಮಿಸಿ! ಈ ಲಕ�ಷಣವ� ಡೇಟಾಬೇಸ� ಅನ�ನ� ಯಾರೂ ಉಪಯೋಗಿಸಲ� ಆಗದಷ�ಟ� ನಿಧಾನವಾಗಿಸ�ತ�ತ ಇರ�ವ�ದರಿಂದ ಇದನ�ನ� ತಾತ�ಕಾಲಿಕವಾಗಿ ಸ�ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ.',
 'perfcached'           => 'ಈ ಕೆಳಗಿನ ಮಾಹಿತಿಯ� cache ಇಂದ ಬಂದಿರ�ವ�ದ� ಮತ�ತ� ಪ�ರಸಕ�ತ ಸ�ಥಿತಿಯನ�ನ� ಬಿಂಬಿಸದಿರಬಹ�ದ�.',
 'perfcachedts'         => 'ಈ ಕೆಳಗಿನ ಮಾಹಿತಿ cache ಆಗಿರ�ವ�ದ�, ಮತ�ತ� ಇದರ ಕೊನೆಯ ಬದಲಾವಣೆ ಆಗಿರ�ವ�ದ� $1.',
 'querypage-no-updates' => 'ಈ ಪ�ಟದ ಅಪ�ಡೇಟ��ಗಳನ�ನ� ಪ�ರಸಕ�ತವಾಗಿ ನಿಲ�ಗಡೆ ಮಾಡಲಾಗಿದೆ. ಇಲ�ಲಿರ�ವ ಮಾಹಿತಿಯನ�ನ� ಸದ�ಯಕ�ಕೆ ನವೀಕರಿಸಲಾಗ�ವ�ದಿಲ�ಲ.',
@@ -389,10 +386,10 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'ಸದಸ�ಯ ಲಾಗೌಟ�',
-'logouttext'                 => '<strong>ನೀವ� ಈಗ ಲಾಗ� ಔಟ� ಆಗಿರ�ವಿರಿ.</strong>
+'logouttext'                 => "'''ನೀವ� ಈಗ ಲಾಗ� ಔಟ� ಆಗಿರ�ವಿರಿ.'''
 
 ನೀವ� {{SITENAME}} ಅನ�ನ� ಅನಾಮಧೇಯವಾಗಿ ಉಪಯೋಗಿಸಬಹ�ದ�, ಅಥವ ಮತ�ತೆ ಇದೇ ಹೆಸರಿನಲ�ಲಿ ಅಥವ ಬೇರೆ ಹೆಸರಿನಲ�ಲಿ [[Special:UserLogin|ಲಾಗ� ಇನ�]] ಆಗಬಹ�ದ�.
-ಗಮನಿಸಿ: ನಿಮ�ಮ ಬ�ರೌಸರ��ನ cache ಅನ�ನ� ಅಳಿಸ�ವವರೆಗೂ ಕೆಲವ� ಪ�ಟಗಳ� ನೀವಿನ�ನೂ ಲಾಗ� ಇನ� ಆಗಿರ�ವಂತೆ ಪ�ರದರ�ಶಿತವಾಗಬಹ�ದ�.',
+ಗಮನಿಸಿ: ನಿಮ�ಮ ಬ�ರೌಸರ��ನ cache ಅನ�ನ� ಅಳಿಸ�ವವರೆಗೂ ಕೆಲವ� ಪ�ಟಗಳ� ನೀವಿನ�ನೂ ಲಾಗ� ಇನ� ಆಗಿರ�ವಂತೆ ಪ�ರದರ�ಶಿತವಾಗಬಹ�ದ�.",
 'welcomecreation'            => '== ಸ�ಸ�ವಾಗತ, $1! ==
 ನಿಮ�ಮ ಅಕೌಂಟನ�ನ� ಸೃಷ�ಟಿಸಲಾಗಿದೆ. 
 ನಿಮ�ಮ [[Special:Preferences|{{SITENAME}} ಪ�ರಾಶಸ�ತ�ಯಗಳನ�ನ�]] ಬದಲಾಯಿಸ�ವ�ದನ�ನ� ಮರೆಯಬೇಡಿ.',
@@ -401,7 +398,6 @@ $2',
 'yourpassword'               => 'ನಿಮ�ಮ ಪ�ರವೇಶಪದ',
 'yourpasswordagain'          => 'ಪ�ರವೇಶ ಪದ ಮತ�ತೊಮ�ಮೆ ಟೈಪ� ಮಾಡಿ',
 'remembermypassword'         => 'ಈ ಗಣಕಯಂತ�ರದಲ�ಲಿ ನನ�ನ ಪ�ರವೇಶ ಪದವನ�ನ� ನೆನಪಿನಲ�ಲಿಟ�ಟ�ಕೊ',
-'loginproblem'               => '<b>ನಿಮ�ಮ ಲಾಗಿನ� ನಲ�ಲಿ ತೊ೦ದರೆಯಾಯಿತ�.</b><br />ಮತ�ತೆ ಪ�ರಯತ�ನಿಸಿ!',
 'login'                      => 'ಲಾಗ� ಇನ�',
 'nav-login-createaccount'    => 'ಲಾಗ� ಇನ� - log in',
 'loginprompt'                => '{{SITENAME}} ತಾಣಕ�ಕೆ ಲಾಗ� ಇನ� ಆಗಲ� ನಿಮ�ಮ ಗಣಕಯಂತ�ರದಲ�ಲಿ ಕ�ಕೀ (cookie) ಸೌಲಭ�ಯವಿರಬೇಕ�.',
@@ -467,8 +463,9 @@ $2',
 'throttled-mailpassword'     => 'ಕಳೆದ $1 ಗಂಟೆಗಳ ಒಳಗೆ ಒಂದ� ಪ�ರವೇಶ ಪದವನ�ನ� ಕಳ�ಹಿಸಲಾಗಿದೆ.
 ದ�ರ�ಪಯೋಗಗಳನ�ನ� ತಡೆಗಟ�ಟಲ� ಪ�ರವೇಶಪದಗಳನ�ನ� ಪ�ರತಿ {{PLURAL:$1|ಗಂಟೆಗೆ|$1 ಗಂಟೆಗಳಲ�ಲಿ}} ಕೇವಲ ಒಂದ� ಬಾರಿ ಕಳ�ಹಿಸಲಾಗ�ವ�ದ�.',
 'mailerror'                  => 'ಅಂಚೆ ಕಳ�ಹಿಸ�ವಲ�ಲಿ ದೋಷ: $1',
-'acct_creation_throttle_hit' => 'ಕ�ಷಮಿಸಿ, ನೀವಾಗಲೇ $1 ಖಾತೆಗಳನ�ನ� ತೆರೆದಿದ�ದೀರಿ. ಇನ�ನ� ಖಾತೆಗಳನ�ನ� ತೆರೆಯಲಾಗ�ವ�ದಿಲ�ಲ.',
-'emailauthenticated'         => 'ನಿಮ�ಮ ಇ-ಅಂಚೆ ವಿಳಾಸ $1 ಅಂದ� ಧೃಡೀಕೃತವಾಗಿದೆ.',
+'acct_creation_throttle_hit' => 'ಕ�ಷಮಿಸಿ, ನೀವಾಗಲೇ{{PLURAL:$1|೧ ಖಾತೆಯನ�ನ�|$1 ಖಾತೆಗಳನ�ನ�}} ತೆರೆದಿದ�ದೀರಿ. 
+ಇನ�ನ� ಹೆಚ�ಚಿನ ಖಾತೆಗಳನ�ನ� ತೆರೆಯಲಾಗ�ವ�ದಿಲ�ಲ.',
+'emailauthenticated'         => 'ನಿಮ�ಮ ಇ-ಅಂಚೆ ವಿಳಾಸವ� ದಿನಾಂಕ $2 ಸಮಯ $3 ಅಂದ� ಧೃಡೀಕೃತವಾಗಿದೆ.',
 'emailnotauthenticated'      => 'ನಿಮ�ಮ ಇ-ಅಂಚೆ ವಿಳಾಸ ಇನ�ನೂ ಧೃಡೀಕೃತವಾಗಿಲ�ಲ. 
 ಈ ಕೆಳಗಿನ ವೈಶಿಷ�ಟತೆಗಳಿಗೆ ಇ-ಅಂಚೆಯನ�ನ� ನಿಮಗೆ ಕಳ�ಹಿಸಲ� ಆಗ�ವ�ದಿಲ�ಲ.',
 'noemailprefs'               => 'ಈ ಸೌಲಭ�ಯಗಳ� ಕೆಲಸ ಮಾಡಬೇಕಾದರೆ ಒಂದ� ಇ-ಅಂಚೆ ವಿಳಾಸವನ�ನ� ನಮೂದಿಸಿ.',
@@ -489,6 +486,9 @@ $2',
 'resetpass_announce'      => 'ನೀವ� ತಾತ�ಕಾಲಿಕ ಇ-ಅಂಚೆ ಕೋಡ� ಅನ�ನ� ಉಪಯೋಗಿಸಿ ಲಾಗ� ಇನ� ಆಗಿರ�ವಿರಿ.
 ಲಾಗ� ಇನ� ಪೂರ�ಣಗೊಳಿಸಲ� ನೀವಿಲ�ಲ ಹೊಸ ಪ�ರವೇಶಪದ ನೀಡಬೇಕ�:',
 'resetpass_header'        => 'ನಿಮ�ಮ ಗ�ಪ�ತಪದ ರಿಸೆಟ� ಮಾಡಿ',
+'oldpassword'             => 'ಹಳೆಯ ಪ�ರವೇಶ ಪದ',
+'newpassword'             => 'ಹೊಸ ಪ�ರವೇಶ ಪದ',
+'retypenew'               => 'ಹೊಸ ಪ�ರವೇಶಪದವನ�ನ� ಮತ�ತೆ ಟೈಪಿಸ�:',
 'resetpass_submit'        => 'ಪ�ರವೇಶ ಪದವನ�ನ� ನಿಶ�ಚಯಿಸಿ ಲಾಗ� ಇನ� ಆಗಿ',
 'resetpass_success'       => 'ನಿಮ�ಮ ಪ�ರವೇಶ ಪದವನ�ನ� ಯಶಸ�ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ. ಈಗ ನಿಮ�ಮನ�ನ� ಲಾಗ� ಇನ� ಮಾಡಲಾಗ�ತ�ತಿದೆ...',
 'resetpass_bad_temporary' => 'ಸರಿಯಾಗಿರದ ತಾತ�ಕಾಲಿಕ ಪ�ರವೇಶಪದ.
@@ -516,8 +516,8 @@ $2',
 'hr_tip'          => 'ಅಡ�ಡ ಗೆರೆ (ಆದಷ�ಟ� ಕಡಿಮೆ ಉಪಯೋಗಿಸಿ)',
 
 # Edit pages
-'summary'                          => 'ಸಾರಾಂಶ',
-'subject'                          => 'ವಿಷಯ/ತಲೆಬರಹ',
+'summary'                          => 'ಸಾರಾಂಶ:',
+'subject'                          => 'ವಿಷಯ/ತಲೆಬರಹ:',
 'minoredit'                        => 'ಇದ� ಚ�ಟ�ಕಾದ ಬದಲಾವಣೆ',
 'watchthis'                        => 'ಈ ಪ�ಟವನ�ನ� ವೀಕ�ಷಿಸಿ',
 'savearticle'                      => 'ಪ�ಟವನ�ನ� ಉಳಿಸಿ',
@@ -528,8 +528,8 @@ $2',
 'missingsummary'                   => "'''ಗಮನಿಸಿ:''' ನಿಮ�ಮ ಸಂಪಾದನೆಯ ಸಾರಾಂಶವನ�ನ� ನೀವ� ನೀಡಿಲ�ಲ. ಮತ�ತೊಮ�ಮೆ \"ಉಳಿಸ�\" ಗ�ಂಡಿಯನ�ನ� ಒತ�ತಿದರೆ, ಸಾರಾಂಶವಿಲ�ಲದೆಯೇ ನಿಮ�ಮ ಸಂಪಾದನೆಯನ�ನ� ಉಳಿಸಲಾಗ�ವ�ದ�.",
 'missingcommentheader'             => "'''ಗಮನಿಸಿ:''' ಈ ವ�ಯಾಖ�ಯಾನದ ವಿಷಯ ಅಥವ ತಲೆಬರಹ ನೀವ� ಸೂಚಿಸಿಲ�ಲ.
 ಮತ�ತೊಮೆ ಉಳಿಸಿ ಅನ�ನ� ಒತ�ತಿದರೆ ನಿಮ�ಮ ಸಂಪಾದನೆಯನ�ನ� ಹಾಗೆಯೇ ಉಳಿಸಲಾಗ�ವ�ದ�.",
-'summary-preview'                  => 'ತಾತ�ಪರ�ಯ ಮ�ನ�ನೋಟ',
-'subject-preview'                  => 'ವಿಷಯದ/ತಲೆಬರಹದ ಮ�ನ�ನೋಟ',
+'summary-preview'                  => 'ತಾತ�ಪರ�ಯ ಮ�ನ�ನೋಟ:',
+'subject-preview'                  => 'ವಿಷಯದ/ತಲೆಬರಹದ ಮ�ನ�ನೋಟ:',
 'blockedtitle'                     => 'ಈ ಸದಸ�ಯರನ�ನ� ತಡೆ ಹಿಡಿಯಲಾಗಿದೆ.',
 'blockedtext'                      => "<big>'''ನಿಮ�ಮ ಸದಸ�ಯತ�ವವನ�ನ� ಅಥವ IP ವಿಳಾಸವನ�ನ� ನಿರ�ಬಂಧಿಸಲಾಗಿದೆ.'''</big>
 
@@ -583,12 +583,12 @@ $2',
 ನೀವ� ಅನಾಮಧೇಯ ಬಳಕೆದಾರರಾಗಿದ�ದಲ�ಲಿ, ಹಾಗ� ನಿಮಗೆ ಸಂಬಂಧವಿಲ�ಲದಂತ ಸಂದೇಶಗಳ� ಬರ�ತ�ತಿವೆ ಎಂದ� ಅನಿಸಿದರೆ, ಮ�ಂದೆ ಬೇರೆ ಅನಾಮಧೇಯ ಬಳಕೆದಾರರೊಂದಿಗೆ ತಪ�ಪಾಗಿ ಗ�ರ�ತಿಸಬಾರದೆಂದಿದ�ದರೆ ದಯವಿಟ�ಟ� [[Special:UserLogin|ಸದಸ�ಯರಾಗಿ ಅಥವ ಲಾಗ� ಇನ� ಆಗಿ]].''",
 'noarticletext'                    => 'ಈ ಪ�ಟದಲ�ಲಿ ಸದ�ಯಕ�ಕೆ �ನೂ ಇಲ�ಲ, ನೀವ� ಇತರ ಪ�ಟಗಳಲ�ಲಿ [[Special:Search/{{PAGENAME}}|ಈ ಹೆಸರನ�ನ� ಹ�ಡ�ಕಬಹ�ದ�]] ಅಥವ [{{fullurl:{{FULLPAGENAME}}|action=edit}} ಈ ಪ�ಟವನ�ನ� ಸಂಪಾದಿಸಬಹ�ದ�].',
 'userpage-userdoesnotexist'        => 'ಬಳಕೆದಾರ ಖಾತೆ "$1" ದಾಖಲಾಗಿಲ�ಲ. ನೀವ� ಇದೇ ಪ�ಟವನ�ನ� ಸೃಷ�ಟಿ/ಸಂಪಾದನೆ ಮಾಡಬೇಕೆಂದಿರ�ವಿರಿ ಎಂದ� ಖಾತ�ರಿ ಮಾಡಿಕೊಳ�ಳಿ.',
-'usercssjsyoucanpreview'           => "<strong>ಗಮನಿಸಿ:</strong> ಉಳಿಸ�ವ ಮ�ನ�ನ 'ಮ�ನ�ನೋಟ' ಗ�ಂಡಿಯನ�ನ� ಉಪಯೋಗಿಸಿ ನಿಮ�ಮ ಹೊಸ CSS/JS ಅನ�ನ� ಪ�ರಯೋಗ ಮಾಡಿ.",
+'usercssjsyoucanpreview'           => "'''ಗಮನಿಸಿ:''' ಉಳಿಸ�ವ ಮ�ನ�ನ 'ಮ�ನ�ನೋಟ' ಗ�ಂಡಿಯನ�ನ� ಉಪಯೋಗಿಸಿ ನಿಮ�ಮ ಹೊಸ CSS/JS ಅನ�ನ� ಪ�ರಯೋಗ ಮಾಡಿ.",
 'usercsspreview'                   => "'''ನೆನಪಿಡಿ: ನೀವ� ಇಲ�ಲಿ ಕೇವಲ ನಿಮ�ಮ ಬಳಕೆದಾರ CSSನ ಮ�ನ�ನೋಟ ನೋಡ�ತ�ತಿರ�ವಿರಿ.'''
 '''ಅದನ�ನ� ಇನ�ನೂ ಉಳಿಸಲಾಗಿಲ�ಲ!'''",
 'userjspreview'                    => "'''ಗಮನಿಸಿ: ನೀವ� ನಿಮ�ಮ ಬಳಕೆದಾರ JavaScriptನ ಮ�ನ�ನೋಟ ನೋಡ�ತ�ತಿರ�ವಿರಿ ಅಥವ ಪ�ರಯೋಗ ಮಾಡ�ತ�ತಿರ�ವಿರಿ. ಅದನ�ನಿನ�ನೂ ಉಳಿಸಲಾಗಿಲ�ಲ!'''",
-'note'                             => '<strong>ಸೂಚನೆ:</strong>',
-'previewnote'                      => '<strong>ಇದ� ಕೇವಲ ಮ�ನ�ನೋಟ; ಪ�ಟವನ�ನ� ಇನ�ನೂ ಉಳಿಸಲಾಗಿಲ�ಲ ಎಂಬ�ದನ�ನ� ಮರೆಯದಿರಿ!</strong>',
+'note'                             => "'''ಸೂಚನೆ:'''",
+'previewnote'                      => "'''ಇದ� ಕೇವಲ ಮ�ನ�ನೋಟ; ಪ�ಟವನ�ನ� ಇನ�ನೂ ಉಳಿಸಲಾಗಿಲ�ಲ ಎಂಬ�ದನ�ನ� ಮರೆಯದಿರಿ!'''",
 'editing'                          => "'$1' ಲೇಖನ ಬದಲಾಯಿಸಲಾಗ�ತ�ತಿದೆ",
 'editingsection'                   => '$1 (ವಿಭಾಗ) ಅನ�ನ� ಸಂಪಾದಿಸ�ತ�ತಿರ�ವಿರಿ',
 'editingcomment'                   => '$1 (ಚರ�ಚೆ) ಸಂಪಾದಿಸಲಾಗ�ತ�ತಿದೆ',
@@ -599,24 +599,24 @@ $2',
 ನೀವ� ಪ�ಟವನ�ನ� ಉಳಿಸಿದಾಗ '''ಮೇಲಿನ ಚೌಕದಲ�ಲಿ ನೀವ� ಮಾಡ�ವ ಬದಲಾವಣೆಗಳನ�ನ� ಮಾತ�ರ''' ಉಳಿಸಲಾಗ�ತ�ತದೆ.",
 'yourtext'                         => 'ನಿಮ�ಮ ಸಂಪಾದನೆ',
 'storedversion'                    => 'ಈಗಾಗಲೇ ಉಳಿಸಲಾಗಿರ�ವ ಆವೃತ�ತಿ',
-'editingold'                       => '<strong>ಎಚ�ಚರಿಕೆ: ಈ ಪ�ಟದ ಹಳೆಯ ಆವೃತ�ತಿಯನ�ನ� ಬದಲಾಯಿಸ�ತ�ತಿದ�ದೀರಿ. ಈ ಬದಲಾವಣೆಗಳನ�ನ� ಉಳಿಸಿದಲ�ಲಿ, ನಂತರದ ಆವೃತ�ತಿಗಳೆಲ�ಲವೂ ಕಳೆದ�ಹೋಗ�ತ�ತವೆ.</strong>',
+'editingold'                       => "'''ಎಚ�ಚರಿಕೆ: ಈ ಪ�ಟದ ಹಳೆಯ ಆವೃತ�ತಿಯನ�ನ� ಬದಲಾಯಿಸ�ತ�ತಿದ�ದೀರಿ. ಈ ಬದಲಾವಣೆಗಳನ�ನ� ಉಳಿಸಿದಲ�ಲಿ, ನಂತರದ ಆವೃತ�ತಿಗಳೆಲ�ಲವೂ ಕಳೆದ�ಹೋಗ�ತ�ತವೆ.'''",
 'yourdiff'                         => 'ವ�ಯತ�ಯಾಸಗಳ�',
-'copyrightwarning'                 => 'ದಯವಿಟ�ಟ� ಗಮನಿಸಿ: {{SITENAME}} ಸೈಟಿನಲ�ಲಿ ನಿಮ�ಮ ಎಲ�ಲಾ ಕಾಣಿಕೆಗಳನ�ನೂ $2 ಅಡಿಯಲ�ಲಿ ಬಿಡ�ಗಡೆ ಮಾಡಲಾಗ�ತ�ತದೆ (ಮಾಹಿತಿಗೆ $1 ನೋಡಿ). ನಿಮ�ಮ ಸಂಪಾದನೆಗಳನ�ನ� ಬೇರೆಯವರ� ನಿರ�ಧಾಕ�ಷಿಣ�ಯವಾಗಿ ಬದಲಾಯಿಸಿ ಬೇರೆ ಕಡೆಗಳಲ�ಲಿ ಹಂಚಬಹ�ದ�. ಇದಕ�ಕೆ ನಿಮ�ಮ ಒಪ�ಪಿಗೆ ಇದ�ದರೆ ಮಾತ�ರ ಇಲ�ಲಿ ಸಂಪಾದನೆ ಮಾಡಿ.<br />
+'copyrightwarning'                 => "ದಯವಿಟ�ಟ� ಗಮನಿಸಿ: {{SITENAME}} ಸೈಟಿನಲ�ಲಿ ನಿಮ�ಮ ಎಲ�ಲಾ ಕಾಣಿಕೆಗಳನ�ನೂ $2 ಅಡಿಯಲ�ಲಿ ಬಿಡ�ಗಡೆ ಮಾಡಲಾಗ�ತ�ತದೆ (ಮಾಹಿತಿಗೆ $1 ನೋಡಿ). ನಿಮ�ಮ ಸಂಪಾದನೆಗಳನ�ನ� ಬೇರೆಯವರ� ನಿರ�ಧಾಕ�ಷಿಣ�ಯವಾಗಿ ಬದಲಾಯಿಸಿ ಬೇರೆ ಕಡೆಗಳಲ�ಲಿ ಹಂಚಬಹ�ದ�. ಇದಕ�ಕೆ ನಿಮ�ಮ ಒಪ�ಪಿಗೆ ಇದ�ದರೆ ಮಾತ�ರ ಇಲ�ಲಿ ಸಂಪಾದನೆ ಮಾಡಿ.<br />
 ಅಲ�ಲದೆ ನಿಮ�ಮ ಸಂಪಾದನೆಗಳನ�ನ� ಸ�ವತಃ ರಚಿಸಿದ�ದ�, ಅಥವ ಕೃತಿಸ�ವಾಮ�ಯತೆಯಿಂದ ಮ�ಕ�ತವಾಗಿರ�ವ ಕಡೆಯಿಂದ ಪಡೆದಿದ�ದ� ಎಂದ� ಪ�ರಮಾಣಿಸ�ತ�ತಿರ�ವಿರಿ.
-<strong>ಕೃತಿಸ�ವಾಮ�ಯತೆಯ ಅಡಿಯಲ�ಲಿರ�ವ ರಚನೆಗಳನ�ನ� ಅನ�ಮತಿ ಇಲ�ಲದೆ ಇಲ�ಲಿಗೆ ಹಾಕಬೇಡಿ!</strong>',
-'copyrightwarning2'                => 'ದಯವಿಟ�ಟ� ಗಮನಿಸಿ: {{SITENAME}} ಸೈಟಿನಲ�ಲಿ ನಿಮ�ಮ ಎಲ�ಲಾ ಸಂಪಾದನೆಗಳನ�ನ� ಬೇರೆಯವರ� ಬದಲಾಯಿಸಬಹ�ದ� ಅಥವ ಅಳಿಸಬಹ�ದ�.
+'''ಕೃತಿಸ�ವಾಮ�ಯತೆಯ ಅಡಿಯಲ�ಲಿರ�ವ ರಚನೆಗಳನ�ನ� ಅನ�ಮತಿ ಇಲ�ಲದೆ ಇಲ�ಲಿಗೆ ಹಾಕಬೇಡಿ!'''",
+'copyrightwarning2'                => "ದಯವಿಟ�ಟ� ಗಮನಿಸಿ: {{SITENAME}} ಸೈಟಿನಲ�ಲಿ ನಿಮ�ಮ ಎಲ�ಲಾ ಸಂಪಾದನೆಗಳನ�ನ� ಬೇರೆಯವರ� ಬದಲಾಯಿಸಬಹ�ದ� ಅಥವ ಅಳಿಸಬಹ�ದ�.
 ನಿಮ�ಮ ಬರಹಗಳನ�ನ� ಬೇರೆಯವರ� ನಿರ�ದಾಕ�ಷಿಣ�ಯವಾಗಿ ಸಂಪಾದನೆ ಮಾಡ�ವ�ದ� ನಿಮಗೆ ಇಷ�ಟವಿಲ�ಲದಿದ�ದರೆ ಇಲ�ಲಿ ಸಂಪಾದನೆ ಮಾಡಬೇಡಿ.<br />
 ಅಲ�ಲದೆ ನಿಮ�ಮ ಸಂಪಾದನೆಗಳನ�ನ� ನೀವೇ ಸ�ವತಃ ರಚಿಸಿದ�ದ�, ಅಥವ ಕೃತಿಸ�ವಾಮ�ಯತೆಯಿಂದ ಮ�ಕ�ತವಾಗಿರ�ವ ಕಡೆಯಿಂದ ಪಡೆದಿದ�ದ� ಎಂದ� ನೀವ� ಪ�ರಮಾಣಿಸ�ತ�ತಿರ�ವಿರಿ (ಮಾಹಿತಿಗೆ $1 ನೋಡಿ).
-<strong>ಕೃತಿಸ�ವಾಮ�ಯತೆಯ ಅಡಿಯಲ�ಲಿರ�ವ ರಚನೆಗಳನ�ನ� ಅನ�ಮತಿ ಇಲ�ಲದೆ ಇಲ�ಲಿಗೆ ಹಾಕಬೇಡಿ!</strong>',
-'longpagewarning'                  => '<strong>ಎಚ�ಚರ: ಈ ಪ�ಟ $1 ಕಿಲೋಬೈಟ��ಗಳಷ�ಟ� ಉದ�ದ ಇದೆ; ಕೆಲವ� ಬ�ರೌಸರ��ಗಳಲ�ಲಿ ೩೨ ಕಿಲೋಬೈಟ��ಗಳಿಗಿಂತ ಉದ�ದದ ಪ�ಟಗಳನ�ನ� ಸಂಪಾದನೆ ಮಾಡ�ವ�ದ� ಕಷ�ಟ. ಪ�ಟವನ�ನ� ಆದಷ�ಟ� ವಿಭಾಗಗಳಾಗಿ ವಿಂಗಡಿಸಲ� ಪ�ರಯತ�ನಿಸಿ.</strong>',
-'longpageerror'                    => '<strong>ದೋಷ: ನೀವ� ಸಲ�ಲಿಸಿರ�ವ ಪಠ�ಯವ� $1 ಕಿಲೊಬೈಟ� ಉದ�ದದ�ದಾಗಿದೆ. ಇದ� ನಿಯಮಿತವಾಗಿರ�ವ ಗರಿಷ�ಠವಾದ $2 ಕಿಲೊಬೈಟ��ಗಳಿಗಿಂತ ಹೆಚ�ಚಾಗಿದೆ.
-ಆದ�ದರಿಂದ ಇದನ�ನ� ಉಳಿಸಲ� ಆಗ�ವ�ದಿಲ�ಲ.</strong>',
-'readonlywarning'                  => '<strong>ಗಮನಿಸಿ: ಡೇಟಾಬೇಸ� ಅನ�ನ� ದ�ರಸ�ತಿಗಾಗಿ ಮ�ಚ�ಚಲಾಗಿದೆ. ಹಾಗಾಗಿ ನಿಮ�ಮ ಸಂಪಾದನೆಗಳನ�ನ� ಈಗ ಉಳಿಸಲ� ಆಗ�ವ�ದಿಲ�ಲ.
-ನಿಮ�ಮ ಸಂಪಾದನೆಯನ�ನ� ನೀವ� ಬೇರೆ ಕಡೆ ಉಳಿಸಿ ನಂತರ ಇಲ�ಲಿಗೆ cut-n-paste ಮಾಡಬಹ�ದ�.</strong>',
-'protectedpagewarning'             => '<strong>ಎಚ�ಚರಿಕೆ: ಈ ಪ�ಟವನ�ನ� ಸಂರಕ�ಷಿಸಲಾಗಿದೆ. ಇದನ�ನ� ಕೇವಲ ನಿರ�ವಾಹಕರ� ಬದಲಾಯಿಸಬಹ�ದ�.</strong>',
+'''ಕೃತಿಸ�ವಾಮ�ಯತೆಯ ಅಡಿಯಲ�ಲಿರ�ವ ರಚನೆಗಳನ�ನ� ಅನ�ಮತಿ ಇಲ�ಲದೆ ಇಲ�ಲಿಗೆ ಹಾಕಬೇಡಿ!'''",
+'longpagewarning'                  => "'''ಎಚ�ಚರ: ಈ ಪ�ಟ $1 ಕಿಲೋಬೈಟ��ಗಳಷ�ಟ� ಉದ�ದ ಇದೆ; ಕೆಲವ� ಬ�ರೌಸರ��ಗಳಲ�ಲಿ ೩೨ ಕಿಲೋಬೈಟ��ಗಳಿಗಿಂತ ಉದ�ದದ ಪ�ಟಗಳನ�ನ� ಸಂಪಾದನೆ ಮಾಡ�ವ�ದ� ಕಷ�ಟ. ಪ�ಟವನ�ನ� ಆದಷ�ಟ� ವಿಭಾಗಗಳಾಗಿ ವಿಂಗಡಿಸಲ� ಪ�ರಯತ�ನಿಸಿ.'''",
+'longpageerror'                    => "'''ದೋಷ: ನೀವ� ಸಲ�ಲಿಸಿರ�ವ ಪಠ�ಯವ� $1 ಕಿಲೊಬೈಟ� ಉದ�ದದ�ದಾಗಿದೆ. ಇದ� ನಿಯಮಿತವಾಗಿರ�ವ ಗರಿಷ�ಠವಾದ $2 ಕಿಲೊಬೈಟ��ಗಳಿಗಿಂತ ಹೆಚ�ಚಾಗಿದೆ.
+ಆದ�ದರಿಂದ ಇದನ�ನ� ಉಳಿಸಲ� ಆಗ�ವ�ದಿಲ�ಲ.'''",
+'readonlywarning'                  => "'''ಗಮನಿಸಿ: ಡೇಟಾಬೇಸ� ಅನ�ನ� ದ�ರಸ�ತಿಗಾಗಿ ಮ�ಚ�ಚಲಾಗಿದೆ. ಹಾಗಾಗಿ ನಿಮ�ಮ ಸಂಪಾದನೆಗಳನ�ನ� ಈಗ ಉಳಿಸಲ� ಆಗ�ವ�ದಿಲ�ಲ.
+ನಿಮ�ಮ ಸಂಪಾದನೆಯನ�ನ� ನೀವ� ಬೇರೆ ಕಡೆ ಉಳಿಸಿ ನಂತರ ಇಲ�ಲಿಗೆ cut-n-paste ಮಾಡಬಹ�ದ�.'''",
+'protectedpagewarning'             => "'''ಎಚ�ಚರಿಕೆ: ಈ ಪ�ಟವನ�ನ� ಸಂರಕ�ಷಿಸಲಾಗಿದೆ. ಇದನ�ನ� ಕೇವಲ ನಿರ�ವಾಹಕರ� ಬದಲಾಯಿಸಬಹ�ದ�.'''",
 'semiprotectedpagewarning'         => "'''ಗಮನಿಸಿ:''' ಈ ಪ�ಟವನ�ನ� ಕೇವಲ ನೊಂದಯಿತ ಸದಸ�ಯರ� ಸಂಪಾದನೆ ಮಾಡಬರ�ವಂತೆ ಸಂರಕ�ಷಿಸಲಾಗಿದೆ.",
 'cascadeprotectedwarning'          => "'''ಎಚ�ಚರಿಕೆ:''' ಈ ಪ�ಟವ� ಕೆಳಗೆ ಪಟ�ಟಿ ಮಾಡಿರ�ವ ತಡಸಲ�-ಸಂರಕ�ಷಣೆ ಹೊಂದಿರ�ವ {{PLURAL:$1|ಪ�ಟದಲ�ಲಿ|ಪ�ಟಗಳಲ�ಲಿ}} ಸೇರಿರ�ವ�ದರಿಂದ, ಇದನ�ನ� ಕೇವಲ ನಿರ�ವಾಹಕರ� ಸಂಪಾದಿಸಬಹ�ದಂತೆ ಸಂರಕ�ಷಿಸಲಾಗಿದೆ :",
-'titleprotectedwarning'            => '<strong>ಎಚ�ಚರಿಕೆ:  ಈ ಪ�ಟವನ�ನ� ಕೆಲ ಬಳಕೆದಾರರ� ಮಾತ�ರ ಸೃಷ�ಟಿಸಬಹ�ದಂತೆ ಸಂರಕ�ಷಿಸಲಾಗಿದೆ. </strong>',
+'titleprotectedwarning'            => "'''ಎಚ�ಚರಿಕೆ:  ಈ ಪ�ಟವನ�ನ� ಕೆಲ ಬಳಕೆದಾರರ� ಮಾತ�ರ ಸೃಷ�ಟಿಸಬಹ�ದಂತೆ ಸಂರಕ�ಷಿಸಲಾಗಿದೆ. '''",
 'templatesused'                    => 'ಈ ಪ�ಟದಲ�ಲಿ ಉಪಯೋಗಿಸಲಾಗಿರ�ವ ಟೆಂಪ�ಲೇಟ�ಗಳ�:',
 'templatesusedpreview'             => 'ಈ ಮ�ನ�ನೋಟದಲ�ಲಿ ಉಪಯೋಗಿಸಲ�ಪಟ�ಟಿರ�ವ ಟೆಂಪ�ಲೇಟ�ಗಳ�:',
 'templatesusedsection'             => 'ಈ ವಿಭಾಗದಲ�ಲಿ ಉಪಯೋಗಿಸಲ�ಪಟ�ಟಿರ�ವ ಟೆಂಪ�ಲೇಟ�ಗಳ�:',
@@ -638,36 +638,35 @@ $2',
 # Parser/template warnings
 'expensive-parserfunction-warning'  => 'ಎಚ�ಚರಿಕೆ: ಈ ಪ�ಟದಲ�ಲಿ ಬಹ�ತೇಕ ದ�ಬಾರಿ parser function ಕರೆಗಳಿವೆ.
 
-ಇವ� $2ಕ�ಕಿಂತ ಕಡಿಮೆಯಿರಬೇಕ�, ಈಗ ಇವ� $1ರಷ�ಟ� ಇವೆ.',
+ಈಗ {{PLURAL:$1|$1 ಕರೆ|$1 ಕರೆಗಳ�}} ಇದ�ದ�, $2 {{PLURAL:$2|ಕರೆಗಿಂತ|ಕರೆಗಳಿಗಿಂತ}} ಕಡಿಮೆ ಇರಬೇಕ�.',
 'expensive-parserfunction-category' => 'ಬಹ�ತೇಕ ದ�ಬಾರಿ parser function ಕರೆಗಳಿರ�ವ ಪ�ಟಗಳ�',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'ಖಾತೆಯನ�ನ� ಸೃಷ�ಟಿಸಲಾಗ�ತ�ತಿಲ�ಲ',
 
 # History pages
-'viewpagelogs'        => 'ಈ ಪ�ಟಗಳ ದಾಖಲೆಗಳನ�ನ� ವೀಕ�ಷಿಸಿ',
-'nohistory'           => 'ಈ ಪ�ಟಕ�ಕೆ ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ ಇಲ�ಲ.',
-'revnotfound'         => 'ಆವೃತ�ತಿ ಸಿಗಲಿಲ�ಲ',
-'revnotfoundtext'     => 'ನೀವ� ಕೋರಿದ ಪ�ಟದ ಹಳೆ ಆವೃತ�ತಿ ಸಿಗಲಿಲ�ಲ. ದಯವಿಟ�ಟ� ಈ ಪ�ಟವನ�ನ� ತಲ�ಪಲ� ಉಪಯೋಗಿಸಿದ URL ಅನ�ನ� ಒಮ�ಮೆ ಪರೀಕ�ಷಿಸಿ.',
-'currentrev'          => 'ಈಗಿನ ತಿದ�ದ�ಪಡಿ',
-'revisionasof'        => '$1 ದಿನದ ಆವೃತ�ತಿ',
-'revision-info'       => '$2 ಅವರ� $1 ಅಂದ� ಸಂಪಾದನೆ ಮಾಡಿದ ನಂತರದ ಆವೃತ�ತಿ',
-'previousrevision'    => '�ಹಿಂದಿನ ಪರಿಷ�ಕರಣೆ',
-'nextrevision'        => 'ಮ�ಂದಿನ ಪರಿಷ�ಕರಣೆ',
-'currentrevisionlink' => 'ಈಗಿನ ಪರಿಷ�ಕರಣೆ',
-'cur'                 => 'ಸದ�ಯದ',
-'next'                => 'ಮ�ಂದಿನದ�',
-'last'                => 'ಕೊನೆಯ',
-'page_first'          => 'ಮೊದಲ',
-'page_last'           => 'ಕೊನೆಯ',
-'histlegend'          => 'ವ�ಯತ�ಯಾಸಗಳ ಆಯ�ಕೆ: ಹೋಲಿಕೆ ಮಾಡಬೇಕ� ಎಂದಿರ�ವ ಎರಡ� ಆವೃತ�ತಿಗಳ ಪಕ�ಕದಲ�ಲಿ ಇರ�ವ ಗ�ಂಡಿಗಳನ�ನ� ಗ�ರ�ತ� ಮಾಡಿ. ನಂತರ enter ಅನ�ನ� ಒತ�ತಿ ಅಥವ ಪಟ�ಟಿಯ ಅಂತ�ಯದಲ�ಲಿರ�ವ ಗ�ಂಡಿಯನ�ನ� ಒತ�ತಿ.<br />
+'viewpagelogs'           => 'ಈ ಪ�ಟಗಳ ದಾಖಲೆಗಳನ�ನ� ವೀಕ�ಷಿಸಿ',
+'nohistory'              => 'ಈ ಪ�ಟಕ�ಕೆ ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ ಇಲ�ಲ.',
+'currentrev'             => 'ಈಗಿನ ತಿದ�ದ�ಪಡಿ',
+'revisionasof'           => '$1 ದಿನದ ಆವೃತ�ತಿ',
+'revision-info'          => '$2 ಅವರ� $1 ಅಂದ� ಸಂಪಾದನೆ ಮಾಡಿದ ನಂತರದ ಆವೃತ�ತಿ', # Additionally available: $3: revision id
+'previousrevision'       => '�ಹಿಂದಿನ ಪರಿಷ�ಕರಣೆ',
+'nextrevision'           => 'ಮ�ಂದಿನ ಪರಿಷ�ಕರಣೆ',
+'currentrevisionlink'    => 'ಈಗಿನ ಪರಿಷ�ಕರಣೆ',
+'cur'                    => 'ಸದ�ಯದ',
+'next'                   => 'ಮ�ಂದಿನದ�',
+'last'                   => 'ಕೊನೆಯ',
+'page_first'             => 'ಮೊದಲ',
+'page_last'              => 'ಕೊನೆಯ',
+'histlegend'             => 'ವ�ಯತ�ಯಾಸಗಳ ಆಯ�ಕೆ: ಹೋಲಿಕೆ ಮಾಡಬೇಕ� ಎಂದಿರ�ವ ಎರಡ� ಆವೃತ�ತಿಗಳ ಪಕ�ಕದಲ�ಲಿ ಇರ�ವ ಗ�ಂಡಿಗಳನ�ನ� ಗ�ರ�ತ� ಮಾಡಿ. ನಂತರ enter ಅನ�ನ� ಒತ�ತಿ ಅಥವ ಪಟ�ಟಿಯ ಅಂತ�ಯದಲ�ಲಿರ�ವ ಗ�ಂಡಿಯನ�ನ� ಒತ�ತಿ.<br />
 ಆಖ�ಯಾನ: (ಈಗಿನ) = ಪ�ರಸಕ�ತ ಆವೃತ�ತಿಯೊಂದಿಗೆ ವ�ಯತ�ಯಾಸಗಳ�,
 (ಕೊನೆಯ) = ಹಿಂದಿನ ಆವೃತ�ತಿಯೊಂದಿಗೆ ವ�ಯತ�ಯಾಸಗಳ�, ಚ� = ಚ�ಟ�ಕಾದ ಬದಲಾವಣೆ.',
-'deletedrev'          => '[ಅಳಿಸಲಾಗಿದೆ]',
-'histfirst'           => 'ಅತ�ಯಂತ ಮ�ಂಚಿನ',
-'histlast'            => 'ಅತ�ಯಂತ ಇತ�ತೀಚಿನ',
-'historysize'         => '({{PLURAL:$1|೧ ಬೈಟ�|$1 ಬೈಟ��ಗಳ�}})',
-'historyempty'        => '(ಖಾಲಿ)',
+'history-fieldset-title' => 'ಇತಿಹಾಸದಲ�ಲಿ ಹ�ಡ�ಕಿ',
+'deletedrev'             => '[ಅಳಿಸಲಾಗಿದೆ]',
+'histfirst'              => 'ಅತ�ಯಂತ ಮ�ಂಚಿನ',
+'histlast'               => 'ಅತ�ಯಂತ ಇತ�ತೀಚಿನ',
+'historysize'            => '({{PLURAL:$1|೧ ಬೈಟ�|$1 ಬೈಟ��ಗಳ�}})',
+'historyempty'           => '(ಖಾಲಿ)',
 
 # Revision feed
 'history-feed-title'          => 'ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ',
@@ -744,11 +743,28 @@ $2',
 'compareselectedversions' => 'ಆಯ�ಕೆ ಮಾಡಿದ ಆವೃತ�ತಿಗಳನ�ನ� ಹೊಂದಾಣಿಕೆ ಮಾಡಿ ನೋಡಿ',
 'editundo'                => 'ಹಿಂದಿನಂತೆ',
 'diff-multi'              => '(ಮಧ�ಯದಲ�ಲಿ ಆಗಿರ�ವ {{PLURAL:$1|೧ ಬದಲಾವಣೆಯನ�ನ�|$1 ಬದಲಾವಣೆಗಳನ�ನ�}} ತೋರಿಸಲಾಗಿಲ�ಲ.)',
+'diff-added'              => '$1 ಸೇರಿಸಲಾಗಿದೆ',
+'diff-changedto'          => '$1 ಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ',
+'diff-movedoutof'         => '$1 ಇಂದ ಸ�ಥಳಾಂತರಿಸಲಾಗಿದೆ',
+'diff-removed'            => '$1 ತೆಗೆಯಲಾಗಿದೆ',
+'diff-changedfrom'        => '$1 ಇಂದ ಬದಲಾವಣೆ',
+'diff-src'                => 'ಮೂಲ',
+'diff-with'               => '&#32;$1 $2 ಒಂದಿಗೆ',
+'diff-width'              => 'ಅಗಲ',
+'diff-height'             => 'ಉದ�ದ',
+'diff-p'                  => "ಒ೦ದ� '''ಪ�ಯಾರ '''",
+'diff-h1'                 => "ಒಂದ� '''ಶೀರ�ಷಿಕೆ (ಮಟ�ಟ ೧)'''",
+'diff-h2'                 => "ಒಂದ� '''ಶೀರ�ಷಿಕೆ (ಮಟ�ಟ ೨)'''",
+'diff-h3'                 => "ಒಂದ� '''ಶೀರ�ಷಿಕೆ (ಮಟ�ಟ ೩)'''",
+'diff-img'                => "ಒ೦ದ� '''ಚಿತ�ರ'''",
+'diff-a'                  => "ಒ೦ದ� '''ಕೊ೦ಡಿ'''",
+'diff-i'                  => "'''ವಾರೆಯಾಗಿರ�ವ'''",
+'diff-b'                  => "'''ದಪ�ಪ'''",
 
 # Search results
 'searchresults'             => 'ಶೋಧನೆಯ ಫಲಿತಾಂಶಗಳ�',
 'searchresulttext'          => '{{SITENAME}} ಅಲ�ಲಿ ಹ�ಡ�ಕಾಟ ನಡೆಸ�ವ ಬಗ�ಗೆ ಹೆಚ�ಚಿನ ಮಾಹಿತಿಗೆ [[{{MediaWiki:Helppage}}|{{int:help}}]] ಅನ�ನ� ನೋಡಿ.',
-'searchsubtitle'            => 'ನೀವ� \'\'\'[[:$1]]\'\'\' ಅನ�ನ� ಹ�ಡ�ಕಿದಿರಿ ([[Special:Prefixindex/$1|"$1" ಇಂದ ಪ�ರಾರಂಭವಾಗ�ವ ಎಲ�ಲಾ ಪ�ಟಗಳ�]] | [[Special:WhatLinksHere/$1|"$1" ಗೆ ಸಂಪರ�ಕ ಹೊಂದಿರ�ವ ಎಲ�ಲಾ ಪ�ಟಗಳ�]])',
+'searchsubtitle'            => 'ನೀವ� \'\'\'[[:$1]]\'\'\' ಅನ�ನ� ಹ�ಡ�ಕಿದಿರಿ ([[Special:Prefixindex/$1|"$1" ಇಂದ ಪ�ರಾರಂಭವಾಗ�ವ ಎಲ�ಲಾ ಪ�ಟಗಳ�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" ಗೆ ಸಂಪರ�ಕ ಹೊಂದಿರ�ವ ಎಲ�ಲಾ ಪ�ಟಗಳ�]])',
 'searchsubtitleinvalid'     => "'''$1''' ಅನ�ನ� ಹ�ಡ�ಕಿದಿರಿ",
 'noexactmatch'              => "'''\"\$1\" ಹೆಸರಿನ ಯಾವ ಪ�ಟವೂ ಇಲ�ಲ.''' ನೀವ� ಅದನ�ನ� [[:\$1|ಸೃಷ�ಟಿಸಬಹ�ದ�]].",
 'noexactmatch-nocreate'     => "'''\"\$1\" ಹೆಸರಿನ ಯಾವ ಪ�ಟವೂ ಇಲ�ಲ.'''",
@@ -760,6 +776,7 @@ $2',
 'prevn'                     => 'ಹಿಂದಿನ $1',
 'nextn'                     => 'ಮ�ಂದಿನ $1',
 'viewprevnext'              => 'ವೀಕ�ಷಿಸ� ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:ಪರಿವಿಡಿ',
 'search-result-size'        => '$1 ({{PLURAL:$2|೧ ಪದ|$2 ಪದಗಳ�}})',
 'search-result-score'       => 'ಸಂಬದ�ಧತೆ: $1%',
 'search-redirect'           => '(ಪ�ನರ�ನಿರ�ದೇಶನ $1)',
@@ -795,6 +812,7 @@ $2',
 'qbsettings-floatingright' => 'ಬಲಕ�ಕೆ ತೇಲ�ತ�ತಿದೆ',
 'changepassword'           => 'ಪ�ರವೇಶ ಪದ ಬದಲಾಯಿಸಿ',
 'skin'                     => 'ಚರ�ಮ',
+'skin-preview'             => 'ಮ�ನ�ನೋಟ',
 'math'                     => 'ಗಣಿತ',
 'dateformat'               => 'ದಿನಾಂಕದ ಫಾರ�ಮ�ಯಾಟ�',
 'datedefault'              => 'ಯಾವ�ದೇ ಪ�ರಾಶಸ�ತ�ಯ ಇಲ�ಲ',
@@ -810,9 +828,6 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'prefs-misc'               => 'ಇತರೆ',
 'saveprefs'                => 'ಉಳಿಸಿ',
 'resetprefs'               => 'ಉಳಿಸಿಲ�ಲದ ಬದಲಾವಣೆಗಳನ�ನ� ಅಳಿಸ�',
-'oldpassword'              => 'ಹಳೆಯ ಪ�ರವೇಶ ಪದ',
-'newpassword'              => 'ಹೊಸ ಪ�ರವೇಶ ಪದ',
-'retypenew'                => 'ಹೊಸ ಪ�ರವೇಶಪದವನ�ನ� ಮತ�ತೆ ಟೈಪಿಸ�:',
 'textboxsize'              => 'ಸಂಪಾದನೆ',
 'rows'                     => 'ಸಾಲ�ಗಳ�:',
 'searchresultshead'        => 'ಹ�ಡ�ಕ�',
@@ -836,7 +851,7 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'userrights-lookup-user'      => 'ಬಳಕೆದಾರ ಗ�ಂಪ�ಗಳನ�ನ� ನಿರ�ವಹಿಸ�',
 'userrights-user-editname'    => 'ಬಳಕೆದಾರ ಹೆಸರನ�ನ� ಸೂಚಿಸಿ:',
 'editusergroup'               => 'ಬಳಕೆದಾರ ಗ�ಂಪ�ಗಳನ�ನ� ಸಂಪಾದಿಸ�',
-'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) ಅವರ ಸದಸ�ಯತ�ವದ ಹಕ�ಕ�ಗಳನ�ನ� ಬದಲಾಗಿಸಲಾಗ�ತ�ತಿದೆ.",
+'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) ಅವರ ಸದಸ�ಯತ�ವದ ಹಕ�ಕ�ಗಳನ�ನ� ಬದಲಾಗಿಸಲಾಗ�ತ�ತಿದೆ.",
 'userrights-editusergroup'    => 'ಬಳಕೆದಾರ ಗ�ಂಪ�ಗಳನ�ನ� ಸಂಪಾದಿಸ�',
 'saveusergroups'              => 'ಬಳಕೆದಾರ ಗ�ಂಪ�ಗಳನ�ನ� ಉಳಿಸ�',
 'userrights-groupsmember'     => 'ಗ�ಂಪ�ಗಳ ಸದಸ�ಯತ�ವ:',
@@ -891,6 +906,10 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'rightslogentry' => '$1 ಅವರ ಗ�ಂಪ� ಸದಸ�ಯತ�ವವನ�ನ� $2 ಇಂದ $3 ಗೆ ಬದಲಾಯಿಸಲಾಯಿತ�',
 'rightsnone'     => '(ಯಾವೂ ಇಲ�ಲ)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-block'   => 'ಈ ಸದಸ�ಯರನ�ನ� ಸಂಪಾದಿಸಲ� ಆಗದಂತೆ ನಿರ�ಭಂಧಿಸಿ',
+'action-protect' => 'ಈ ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟಗಳನ�ನ� ಬದಲಾಯಿಸಲ�',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|ಬದಲಾವಣೆ|ಬದಲಾವಣೆಗಳ�}}',
 'recentchanges'                     => 'ಇತ�ತೀಚೆಗಿನ ಬದಲಾವಣೆಗಳ�',
@@ -941,7 +960,7 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'uploadlog'                   => 'ಅಪ�ಲೋಡ� ದಾಖಲೆಗಳ�',
 'uploadlogpage'               => 'ಅಪ�ಲೋಡ� ದಾಖಲೆ',
 'uploadlogpagetext'           => 'ಇತ�ತೀಚೆಗೆ ಅಪ�ಲೋಡ� ಆಗಿರ�ವ ಫೈಲ�ಗಳ ಪಟ�ಟಿ ಕೆಳಗಿದೆ.
-ಈ ಫೈಲ�ಗಳನ�ನ� ನೇರವಾಗಿ ವೀಕ�ಷಿಸಲ� [[Special:NewImages|ಹೊಸ ಫೈಲ�ಗಳ ವೀಕ�ಷಣಾಲಯ]] ನೋಡಿ.',
+ಈ ಫೈಲ�ಗಳನ�ನ� ನೇರವಾಗಿ ವೀಕ�ಷಿಸಲ� [[Special:NewFiles|ಹೊಸ ಫೈಲ�ಗಳ ವೀಕ�ಷಣಾಲಯ]] ನೋಡಿ.',
 'filename'                    => 'ಕಡತದ ಹೆಸರ�',
 'filedesc'                    => 'ಸಾರಾಂಶ',
 'fileuploadsummary'           => 'ತಾತ�ಪರ�ಯ:',
@@ -963,25 +982,25 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'largefileserver'             => 'ಈ ಫೈಲ� ಸರ�ವರ��ನಲ�ಲಿ ಸೇರ�ಪಡೆ ಮಾಡಲ� ಶಿಫಾರಿತ ಗಾತ�ರಕ�ಕಿಂತ ದೊಡ�ಡದಾಗಿದೆ.',
 'emptyfile'                   => 'ನೀವ� ಅಪ�ಲೋಡ� ಮಾಡಿದ ಫೈಲ� ಖಾಲಿಯಿದ�ದಂತಿದೆ. ಫೈಲಿನ ಹೆಸರ� ಬಹ�ಶಃ ತಪ�ಪಾಗಿರಬಹ�ದ�.
 ದಯವಿಟ�ಟ� ನೀವ� ಅಪ�ಲೋಡ� ಮಾಡಬೇಕೆಂದಿರ�ವ�ದ� ಇದೇ ಫೈಲ� ಎಂದ� ಖಾತ�ರಿ ಮಾಡಿ.',
-'fileexists'                  => 'ಈ ಹೆಸರಿನ ಫೈಲ� ಆಗಲೇ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ಈ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸಲ� ಇಚ�ಛೆಯಿಲ�ಲದಿದ�ದರೆ, ದಯವಿಟ�ಟ� <strong><tt>$1</tt></strong> ಅನ�ನ� ಪರೀಕ�ಷಿಸಿ.',
-'filepageexists'              => 'ಈ ಫೈಲಿಗೆ ಮಾಹಿತಿ ಪ�ಟವೊಂದ� ಆಗಲೆ <strong><tt>$1</tt></strong> ಎಂಬಲ�ಲಿ ಇದೆ, ಆದರೆ ಈ ಹೆಸರಿನಲ�ಲಿ ಯಾವ ಫೈಲೂ ಅಸ�ಥಿತ�ವದಲ�ಲಿ ಇಲ�ಲ.
+'fileexists'                  => "ಈ ಹೆಸರಿನ ಫೈಲ� ಆಗಲೇ ಅಸ�ತಿತ�ವದಲ�ಲಿದೆ. ಈ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸಲ� ಇಚ�ಛೆಯಿಲ�ಲದಿದ�ದರೆ, ದಯವಿಟ�ಟ� '''<tt>$1</tt>''' ಅನ�ನ� ಪರೀಕ�ಷಿಸಿ.",
+'filepageexists'              => "ಈ ಫೈಲಿಗೆ ಮಾಹಿತಿ ಪ�ಟವೊಂದ� ಆಗಲೆ '''<tt>$1</tt>''' ಎಂಬಲ�ಲಿ ಇದೆ, ಆದರೆ ಈ ಹೆಸರಿನಲ�ಲಿ ಯಾವ ಫೈಲೂ ಅಸ�ಥಿತ�ವದಲ�ಲಿ ಇಲ�ಲ.
 ನೀವ� ನೀಡ�ವ ಸಾರಾಂಶವ� ಮಾಹಿತಿ ಪ�ಟದಲ�ಲಿ ತೋರ�ವ�ದಿಲ�ಲ.
-ಸಾರಾಂಶವ� ಅಲ�ಲಿ ತೋರಲ� ನೀವ� ಆನಂತರ ಕೈಯಾರೆ ಸಂಪಾದನೆ ಮಾಡಬೇಕ�',
-'fileexists-extension'        => 'ಈ ಹೆಸರನ�ನ� ಹೋಲ�ವಂತಹ ಫೈಲೊಂದ� ಆಗಲೇ ಇದೆ:<br />
-ಅಪ�ಲೋಡ� ಮಾಡ�ತ�ತಿರ�ವ ಫೈಲಿನ ಹೆಸರ�: <strong><tt>$1</tt></strong><br />
-ಅಸ�ಥಿತ�ವದಲ�ಲಿರ�ವ ಫೈಲಿನ ಹೆಸರ�: <strong><tt>$2</tt></strong><br />
-ದಯವಿಟ�ಟ� ಬೇರೆ ಹೆಸರೊಂದನ�ನ� ಆಯ�ಕೆಮಾಡಿ.',
+ಸಾರಾಂಶವ� ಅಲ�ಲಿ ತೋರಲ� ನೀವ� ಆನಂತರ ಕೈಯಾರೆ ಸಂಪಾದನೆ ಮಾಡಬೇಕ�",
+'fileexists-extension'        => "ಈ ಹೆಸರನ�ನ� ಹೋಲ�ವಂತಹ ಫೈಲೊಂದ� ಆಗಲೇ ಇದೆ:<br />
+ಅಪ�ಲೋಡ� ಮಾಡ�ತ�ತಿರ�ವ ಫೈಲಿನ ಹೆಸರ�: '''<tt>$1</tt>'''<br />
+ಅಸ�ಥಿತ�ವದಲ�ಲಿರ�ವ ಫೈಲಿನ ಹೆಸರ�: '''<tt>$2</tt>'''<br />
+ದಯವಿಟ�ಟ� ಬೇರೆ ಹೆಸರೊಂದನ�ನ� ಆಯ�ಕೆಮಾಡಿ.",
 'fileexists-thumb'            => "<center>'''ಅಸ�ಥಿತ�ವದಲ�ಲಿರ�ವ ಫೈಲ�'''</center>",
-'fileexists-thumbnail-yes'    => 'ಈ ಫೈಲ� ಯಾವ�ದೋ ಚಿತ�ರದ ಕಿರ�ನೋಟ <i>(thumbnail)</i> ಇರಬಹ�ದೆಂದ� ಅನಿಸ�ತ�ತದೆ .
-ದಯವಿಟ�ಟ� <strong><tt>$1</tt></strong> ಫೈಲನ�ನೊಮ�ಮೆ ಪರೀಕ�ಷಿಸಿ.<br />
-ನೀವ� ಪರೀಕ�ಷಿಸಿದ ಫೈಲ� ಆ ಚಿತ�ರದ ಮೂಲ ಗಾತ�ರದ�ದಾಗಿದ�ದಲ�ಲಿ ಈ ಕಿರ�ನೋಟವನ�ನ� ಅಪ�ಲೋಡ� ಮಾಡ�ವ ಅಗತ�ಯವಿಲ�ಲ.',
-'file-thumbnail-no'           => 'ಈ ಫೈಲಿನ ಹೆಸರ� <strong><tt>$1</tt></strong> ಇಂದ ಶ�ರ�ವಾಗ�ತ�ತಿದೆ.
-ಈ ಫೈಲ� ಯಾವ�ದೋ ಚಿತ�ರದ ಕಿರ�ನೋಟ <i>(thumbnail)</i> ಇರಬಹ�ದೆಂದ� ಅನಿಸ�ತ�ತದೆ .
-ಮೂಲ ಗಾತ�ರದ ಆ ಚಿತ�ರ ನಿಮ�ಮ ಬಳಿಯಿದ�ದಲ�ಲಿ ಅದನ�ನ� ಅಪ�ಲೋಡ� ಮಾಡಿ, ಇಲ�ಲ ದಯವಿಟ�ಟ� ಫೈಲಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸಿ.',
+'fileexists-thumbnail-yes'    => "ಈ ಫೈಲ� ಯಾವ�ದೋ ಚಿತ�ರದ ಕಿರ�ನೋಟ ''(thumbnail)'' ಇರಬಹ�ದೆಂದ� ಅನಿಸ�ತ�ತದೆ .
+ದಯವಿಟ�ಟ� '''<tt>$1</tt>''' ಫೈಲನ�ನೊಮ�ಮೆ ಪರೀಕ�ಷಿಸಿ.<br />
+ನೀವ� ಪರೀಕ�ಷಿಸಿದ ಫೈಲ� ಆ ಚಿತ�ರದ ಮೂಲ ಗಾತ�ರದ�ದಾಗಿದ�ದಲ�ಲಿ ಈ ಕಿರ�ನೋಟವನ�ನ� ಅಪ�ಲೋಡ� ಮಾಡ�ವ ಅಗತ�ಯವಿಲ�ಲ.",
+'file-thumbnail-no'           => "ಈ ಫೈಲಿನ ಹೆಸರ� '''<tt>$1</tt>''' ಇಂದ ಶ�ರ�ವಾಗ�ತ�ತಿದೆ.
+ಈ ಫೈಲ� ಯಾವ�ದೋ ಚಿತ�ರದ ಕಿರ�ನೋಟ ''(thumbnail)'' ಇರಬಹ�ದೆಂದ� ಅನಿಸ�ತ�ತದೆ .
+ಮೂಲ ಗಾತ�ರದ ಆ ಚಿತ�ರ ನಿಮ�ಮ ಬಳಿಯಿದ�ದಲ�ಲಿ ಅದನ�ನ� ಅಪ�ಲೋಡ� ಮಾಡಿ, ಇಲ�ಲ ದಯವಿಟ�ಟ� ಫೈಲಿನ ಹೆಸರನ�ನ� ಬದಲಾಯಿಸಿ.",
 'fileexists-forbidden'        => 'ಆ ಹೆಸರಿನಲ�ಲಿ ಫೈಲೊಂದ� ಆಗಲೆ ಇದೆ;
-ದಯವಿಟ�ಟ� ಹಿಂದಕ�ಕೆ ಹೋಗಿ ಈ ಫೈಲನ�ನ� ಹೊಸ ಹೆಸರಿನಲ�ಲಿ ಅಪ�ಲೋಡ� ಮಾಡಿ. [[Image:$1|thumb|center|$1]]',
+ದಯವಿಟ�ಟ� ಹಿಂದಕ�ಕೆ ಹೋಗಿ ಈ ಫೈಲನ�ನ� ಹೊಸ ಹೆಸರಿನಲ�ಲಿ ಅಪ�ಲೋಡ� ಮಾಡಿ. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'ಆ ಹೆಸರಿನಲ�ಲಿ ಫೈಲೊಂದ� ಸಾಮೂಹಿಕ ಫೈಲಿನ ಆಗರದಲ�ಲಿ ಆಗಲೆ ಇದೆ;
-ದಯವಿಟ�ಟ� ಹಿಂದಕ�ಕೆ ಹೋಗಿ ಈ ಫೈಲನ�ನ� ಹೊಸ ಹೆಸರಿನಲ�ಲಿ ಅಪ�ಲೋಡ� ಮಾಡಿ. [[Image:$1|thumb|center|$1]]',
+ದಯವಿಟ�ಟ� ಹಿಂದಕ�ಕೆ ಹೋಗಿ ಈ ಫೈಲನ�ನ� ಹೊಸ ಹೆಸರಿನಲ�ಲಿ ಅಪ�ಲೋಡ� ಮಾಡಿ. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'ಯಶಸ�ವಿ ಅಪ�ಲೋಡ�',
 'uploadwarning'               => 'ಅಪ�ಲೋಡ� ಎಚ�ಚರಿಕೆ',
 'savefile'                    => 'ಕಡತವನ�ನ� ಉಳಿಸಿ',
@@ -1016,19 +1035,19 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'upload_source_url'  => ' (ಒಂದ� ಮನ�ನಿತ, ಸಾರ�ವಜನಿಕವಾಗಿ ಎಟಕ�ವ URL)',
 'upload_source_file' => ' (ನಿಮ�ಮ ಗಣಕಯಂತ�ರದಲ�ಲಿರ�ವ ಒಂದ� ಫೈಲ�)',
 
-# Special:ImageList
-'imagelist-summary'     => 'ಈ ವಿಶೇಷ ಪ�ಟವ� ಎಲ�ಲಾ ಅಪ�ಲೋಡ� ಆಗಿರ�ವ ಫೈಲ�ಗಳನ�ನ� ತೋರ�ತ�ತದೆ.
+# Special:ListFiles
+'listfiles-summary'     => 'ಈ ವಿಶೇಷ ಪ�ಟವ� ಎಲ�ಲಾ ಅಪ�ಲೋಡ� ಆಗಿರ�ವ ಫೈಲ�ಗಳನ�ನ� ತೋರ�ತ�ತದೆ.
 ವಸ�ತ�ಸ�ಥಿತಿಯಲ�ಲಿ, ಕೊನೆಯದಾಗಿ ಅಪ�ಲೋಡ� ಆಗಿರ�ವ ಫೈಲ�ಗಳ� ಪಟ�ಟಿಯ ಪ�ರಾರಂಭದಲ�ಲಿ ಕಾಣ�ತ�ತವೆ.
 ಪಟ�ಟಿಯ ವಿಭಾಗದ ತಲೆಬರಹವನ�ನ� ಕ�ಲಿಕ� ಮಾಡಿದರೆ ಪಟ�ಟಿಯ ರಚನೆ ಬದಲಾಗ�ತ�ತದೆ.',
 'imgfile'               => 'ಫೈಲ�',
-'imagelist'             => 'ಚಿತ�ರಗಳ ಪಟ�ಟಿ',
-'imagelist_date'        => 'ದಿನಾಂಕ',
-'imagelist_name'        => 'ಹೆಸರ�',
-'imagelist_user'        => 'ಸದಸ�ಯ',
-'imagelist_size'        => 'ಗಾತ�ರ',
-'imagelist_description' => 'ವಿವರ',
-
-# Image description page
+'listfiles'             => 'ಚಿತ�ರಗಳ ಪಟ�ಟಿ',
+'listfiles_date'        => 'ದಿನಾಂಕ',
+'listfiles_name'        => 'ಹೆಸರ�',
+'listfiles_user'        => 'ಸದಸ�ಯ',
+'listfiles_size'        => 'ಗಾತ�ರ',
+'listfiles_description' => 'ವಿವರ',
+
+# File description page
 'filehist'                  => 'ಕಡತದ ಇತಿಹಾಸ',
 'filehist-help'             => 'ದಿನ/ಕಾಲ ಒತ�ತಿದರೆ ಆ ಸಮಯದಲ�ಲಿ ಈ ಕಡತದ ವಸ�ತ�ಸ�ಥಿತಿ ತೋರ�ತ�ತದೆ.',
 'filehist-deleteall'        => 'ಎಲ�ಲವನ�ನೂ ಅಳಿಸ�',
@@ -1092,21 +1111,9 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'randomredirect-nopages' => 'ಈ ಪ�ಟಪ�ರಬೇಧದಲ�ಲಿ ಯಾವ ಪ�ನರ�ನಿರ�ದೇಶನಗಳೂ ಇಲ�ಲ.',
 
 # Statistics
-'statistics'             => 'ಅಂಕಿ ಅಂಶಗಳ�',
-'sitestats'              => 'ತಾಣದ ಅಂಕಿಅಂಶಗಳ�',
-'userstats'              => 'ಸದಸ�ಯರ ಅಂಕಿ ಅಂಶ',
-'sitestatstext'          => "ಡೇಟಾಬೇಸ��ನಲ�ಲಿ ಒಟ�ಟ� {{PLURAL:\$1|'''೧''' ಪ�ಟವಿದೆ|'''\$1''' ಪ�ಟಗಳಿವೆ}}.
-ಇದರಲ�ಲಿ \"ಚರ�ಚೆ\" ಪ�ಟಗಳ�, {{SITENAME}} ಬಗ�ಗೆ ಪ�ಟಗಳ�, \"ಚ�ಟ�ಕ�\" ಪ�ಟಗಳ�, ಪ�ನರ�ನಿರ�ದೇಶನಗಳ�, ಮತ�ತ� ಇತರೆ ಪ�ಟಗಳ� ಸೇರಿವೆ .
-ಅವ�ಗಳನ�ನ� ಬಿಟ�ಟ�, ಒಟ�ಟ� {{PLURAL:\$2|'''೧''' ಪ�ಟ|'''\$2''' ಪ�ಟಗಳ�}} ಬಹ�ಶಃ ನಿಜವಾದ ಲೇಖನಗಳಿಂದ ಕೂಡಿರ�ವ {{PLURAL:\$2|ಪ�ಟವಿದೆ|ಪ�ಟಗಳಿವೆ}}.
-
-'''\$8''' {{PLURAL:\$8|ಫೈಲ�|ಫೈಲ�ಗಳ�}} ಅಪ�ಲೋಡ� {{PLURAL:\$8|ಆಗಿದೆ|ಆಗಿವೆ}}.
-
-{{SITENAME}} ಸ�ಥಾಪಿತವಾದ ಮೇಲೆ ಒಟ�ಟ� '''\$3''' ಪ�ಟ {{PLURAL:\$3|ವೀಕ�ಷಣೆ ಆಗಿದೆ|ವೀಕ�ಷಣೆಗಳ� ಆಗಿವೆ}}, ಮತ�ತ� '''\$4''' ಪ�ಟ {{PLURAL:\$4|ಸಂಪಾದನೆ ಆಗಿದೆ|ಸಂಪಾದನೆಗಳ� ಆಗಿವೆ}}.
-ಆ ಲೆಕ�ಕದಲ�ಲಿ ಸರಸರಿ ಪ�ಟಕ�ಕೆ '''\$5''' ಸಂಪಾದನೆಗಳ�, ಮತ�ತ� '''\$6''' ವೀಕ�ಷಣೆಗಳ� ಆಗಿವೆ.
-
-ಈಗಿನ [http://www.mediawiki.org/wiki/Manual:Job_queue ಕೆಲಸದ ಸಾಲಿನ] ಉದ�ದ '''\$7'''.",
-'userstatstext'          => "ಇಲ�ಲಿ ಒಟ�ಟ� {{PLURAL:$1|'''೧''' ನೊಂದಾಯಿತ [[Special:ListUsers|ಬಳಕೆದಾರ]]|'''$1''' ನೊಂದಾಯಿತ [[Special:ListUsers|ಬಳಕೆದಾರರ�]]}} ಇದ�ದಾರೆ, ಮತ�ತ� ಅವರಲ�ಲಿ {{PLURAL:$2|ಒಬ�ಬರಿಗೆ|'''$2''' ಬಳಕೆದಾರರಿಗೆ}} (ಅಂದರೆ '''$4%''') $5 ಹಕ�ಕ�ಗಳಿವೆ.",
-'statistics-mostpopular' => 'ಅತ�ಯಂತ ಹೆಚ�ಚ� ವೀಕ�ಷಿತ ಪ�ಟಗಳ�',
+'statistics'              => 'ಅಂಕಿ ಅಂಶಗಳ�',
+'statistics-header-users' => 'ಸದಸ�ಯರ ಅಂಕಿ ಅಂಶ',
+'statistics-mostpopular'  => 'ಅತ�ಯಂತ ಹೆಚ�ಚ� ವೀಕ�ಷಿತ ಪ�ಟಗಳ�',
 
 'disambiguations'     => 'ದ�ವಂದ�ವನಿವಾರಣಾ ಪ�ಟಗಳ�',
 'disambiguationspage' => 'Template:ದ�ವಂದ�ವ ನಿವಾರಣೆ',
@@ -1180,8 +1187,6 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'speciallogtitlelabel' => 'ಶೀರ�ಷಿಕೆ:',
 'log'                  => 'ದಾಖಲೆಗಳ�',
 'all-logs-page'        => 'ಎಲ�ಲಾ ದಾಖಲೆಗಳ�',
-'log-search-legend'    => 'ದಾಖಲೆಗಳಿಗೆ ಹ�ಡ�ಕ�',
-'log-search-submit'    => 'ಹೋಗ�',
 'logempty'             => 'ದಾಖಲೆಗಳಲ�ಲಿ ಇದಕ�ಕೆ ಹೋಲ�ವ ಯಾವ ವಸ�ತ�ವೂ ಇಲ�ಲ.',
 'log-title-wildcard'   => 'ಈ ಪದಗಳಿಂದ ಪ�ರಾರಂಭವಾಗ�ವ ಶೀರ�ಷಿಕೆಗಳನ�ನ� ಹ�ಡ�ಕ�',
 
@@ -1263,12 +1268,6 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'watchmethod-list'     => 'ವೀಕ�ಷಣಾಪಟ�ಟಿಗೆ ಸೇರ�ವ ಪ�ಟಗಳಲ�ಲಿ ಇತ�ತೀಚಿನ ಸಂಪಾದನೆಗಳಿಗೆ ಹ�ಡ�ಕ�',
 'watchlistcontains'    => 'ನಿಮ�ಮ ವೀಕ�ಷಣಾಪಟ�ಟಿಯಲ�ಲಿ $1 {{PLURAL:$1|ಪ�ಟ|ಪ�ಟಗಳ�}} ಇವೆ.',
 'wlshowlast'           => 'ಕೊನೆಯ $1 ಗಂಟೆ $2 ದಿನಗಳ� $3 ಅನ�ನ� ತೋರಿಸ�',
-'watchlist-show-bots'  => 'ಬಾಟ� ಸಂಪಾದನೆಗಳನ�ನ� ತೋರಿಸ�',
-'watchlist-hide-bots'  => 'ಬಾಟ� ಸಂಪಾದನೆಗಳನ�ನ� ಅಡಗಿಸ�',
-'watchlist-show-own'   => 'ನನ�ನ ಸಂಪಾದನೆಗಳನ�ನ� ತೋರಿಸ�',
-'watchlist-hide-own'   => 'ನನ�ನ ಸಂಪಾದನೆಗಳನ�ನ� ಅಡಗಿಸ�',
-'watchlist-show-minor' => 'ಚಿಕ�ಕಪ�ಟ�ಟ ಬದಲಾವಣೆಗಳನ�ನ� ತೋರಿಸ�',
-'watchlist-hide-minor' => 'ಚಿಕ�ಕಪ�ಟ�ಟ ಬದಲಾವಣೆಗಳನ�ನ� ಅಡಗಿಸ�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ವೀಕ�ಷಣೆಗೆ ಸೇರಿಸಲಾಗ�ತ�ತಿದೆ...',
@@ -1281,46 +1280,51 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'enotif_lastvisited' => 'ನಿಮ�ಮ ಕಳೆದ ಭೇಟಿಯ ನಂತರದ ಎಲ�ಲಾ ಬದಲಾವಣೆಗಳಿಗೆ $1 ನೋಡಿ.',
 'enotif_anon_editor' => 'ಅನಾಮಧೇಯ ಸದಸ�ಯ $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'ಪ�ಟವನ�ನ� ಅಳಿಸಿ',
-'confirm'                     => 'ಧೃಡಪಡಿಸ�',
-'exblank'                     => 'ಪ�ಟ ಖಾಲಿ ಇತ�ತ�',
-'delete-confirm'              => '"$1" ಅಳಿಸ�ವಿಕೆ',
-'delete-legend'               => 'ಅಳಿಸ�',
-'historywarning'              => 'ಎಚ�ಚರಿಕೆ: ನೀವ� ಅಳಿಸಲ� ಹೊರಟಿರ�ವ ಪ�ಟಕ�ಕೆ ಸಂಪಾದನೆಯ ಇತಿಹಾಸವಿದೆ:',
-'confirmdeletetext'           => 'ಒಂದ� ಪ�ಟವನ�ನ� ಮತ�ತ� ಅದರ ಸಂಪೂರ�ಣ ಇತಿಹಾಸವನ�ನ� ನೀವ� ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕ�ತ�ತಿರ�ವಿರಿ.
+# Delete
+'deletepage'             => 'ಪ�ಟವನ�ನ� ಅಳಿಸಿ',
+'confirm'                => 'ಧೃಡಪಡಿಸ�',
+'exblank'                => 'ಪ�ಟ ಖಾಲಿ ಇತ�ತ�',
+'delete-confirm'         => '"$1" ಅಳಿಸ�ವಿಕೆ',
+'delete-legend'          => 'ಅಳಿಸ�',
+'historywarning'         => 'ಎಚ�ಚರಿಕೆ: ನೀವ� ಅಳಿಸಲ� ಹೊರಟಿರ�ವ ಪ�ಟಕ�ಕೆ ಸಂಪಾದನೆಯ ಇತಿಹಾಸವಿದೆ:',
+'confirmdeletetext'      => 'ಒಂದ� ಪ�ಟವನ�ನ� ಮತ�ತ� ಅದರ ಸಂಪೂರ�ಣ ಇತಿಹಾಸವನ�ನ� ನೀವ� ಶಾಶ�ವತವಾಗಿ ಅಳಿಸಿಹಾಕ�ತ�ತಿರ�ವಿರಿ.
 ಇದನ�ನ� ನೀವ� ಮಾಡಬಯಸ�ವಿರಿ, ಇದರ ಪರಿಣಾಮಗಳನ�ನ� ಬಲ�ಲಿರಿ, ಮತ�ತ� [[{{MediaWiki:Policy-url}}|ಕಾರ�ಯನೀತಿಗಳ]] ಅನ�ಸಾರ ಇದನ�ನ� ಮಾಡ�ತ�ತಿದ�ದೀರಿ ಎಂದ� ದೃಢಪಡಿಸಿ.',
-'actioncomplete'              => 'ಕಾರ�ಯ ಸಂಪೂರ�ಣ',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ಅನ�ನ� ಅಳಿಸಲಾಯಿತ�.
+'actioncomplete'         => 'ಕಾರ�ಯ ಸಂಪೂರ�ಣ',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ಅನ�ನ� ಅಳಿಸಲಾಯಿತ�.
 ಇತ�ತೀಚೆಗಿನ ಅಳಿಸ�ವಿಕೆಗಳ ಪಟ�ಟಿಗಾಗಿ $2 ಅನ�ನ� ನೋಡಿ.',
-'deletedarticle'              => '"$1" ಅಳಿಸಲಾಯಿತ�',
-'dellogpage'                  => 'ಅಳಿಸ�ವಿಕೆ ದಾಖಲೆ',
-'dellogpagetext'              => 'ಇತ�ತೀಚಿನ ಅಳಿಸ�ವಿಕೆಗಳ ಪಟ�ಟಿ ಕೆಳಗಿದೆ.',
-'deletionlog'                 => 'ಅಳಿಸ�ವಿಕೆ ದಿನಚರಿ',
-'deletecomment'               => 'ಅಳಿಸ�ವ�ದರ ಕಾರಣ',
-'deleteotherreason'           => 'ಇತರ/ಹೆಚ�ಚ�ವರಿ ಕಾರಣ:',
-'deletereasonotherlist'       => 'ಇತರ ಕಾರಣ',
-'deletereason-dropdown'       => '*ಸಾಮಾನ�ಯ ಅಳಿಸ�ವಿಕೆಯ ಕಾರಣಗಳ�
+'deletedarticle'         => '"$1" ಅಳಿಸಲಾಯಿತ�',
+'dellogpage'             => 'ಅಳಿಸ�ವಿಕೆ ದಾಖಲೆ',
+'dellogpagetext'         => 'ಇತ�ತೀಚಿನ ಅಳಿಸ�ವಿಕೆಗಳ ಪಟ�ಟಿ ಕೆಳಗಿದೆ.',
+'deletionlog'            => 'ಅಳಿಸ�ವಿಕೆ ದಿನಚರಿ',
+'deletecomment'          => 'ಅಳಿಸ�ವ�ದರ ಕಾರಣ',
+'deleteotherreason'      => 'ಇತರ/ಹೆಚ�ಚ�ವರಿ ಕಾರಣ:',
+'deletereasonotherlist'  => 'ಇತರ ಕಾರಣ',
+'deletereason-dropdown'  => '*ಸಾಮಾನ�ಯ ಅಳಿಸ�ವಿಕೆಯ ಕಾರಣಗಳ�
 ** ಸಂಪಾದಕರ ಕೋರಿಕೆ
 ** ಕೃತಿಸ�ವಾಮ�ಯತೆಯ ಉಲ�ಲಂಘನೆ
 ** Vandalism',
-'delete-edit-reasonlist'      => 'ಅಳಿಸ�ವಿಕೆ ಕಾರಣಗಳನ�ನ� ಸಂಪಾದಿಸ�',
-'rollback_short'              => 'ತೊಡೆದ�ಹಾಕ�',
-'rollbacklink'                => 'ತೊಡೆದ�ಹಾಕ�',
+'delete-edit-reasonlist' => 'ಅಳಿಸ�ವಿಕೆ ಕಾರಣಗಳನ�ನ� ಸಂಪಾದಿಸ�',
+
+# Rollback
+'rollback_short' => 'ತೊಡೆದ�ಹಾಕ�',
+'rollbacklink'   => 'ತೊಡೆದ�ಹಾಕ�',
+
+# Protect
 'protectlogpage'              => 'ಸಂರಕ�ಷಣೆ ದಿನಚರಿ',
 'protectedarticle'            => '"[[$1]]" ಸಂರಕ�ಷಿಸಲಾಗಿದೆ.',
 'modifiedarticleprotection'   => '"[[$1]]" ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟವನ�ನ� ಬದಲಾಯಿಸಲಾಯಿತ�',
 'unprotectedarticle'          => '"[[$1]]" ಪ�ಟದ ಸಂರಕ�ಷಣೆ ತೆಗೆಯಲಾಯಿತ�',
 'protect-title'               => '"$1" ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟವನ�ನ� ಬದಲಾಯಿಸ�',
+'prot_1movedto2'              => '[[$1]] - [[$2]] ಪ�ಟಕ�ಕೆ ಸ�ಥಳಾಂತರಿಸಲಾಗಿದೆ',
 'protect-legend'              => 'ಸಂರಕ�ಷಣೆ ಧೃಡಪಡಿಸಿ',
 'protectcomment'              => 'ಸಂರಕ�ಷಿಸಲ� ಕಾರಣ:',
 'protectexpiry'               => 'ಮ�ಕ�ತಾಯ:',
 'protect_expiry_invalid'      => 'ಮ�ಕ�ತಾಯದ ಕಾಲ ಸಿಂಧ�ವಲ�ಲ.',
 'protect_expiry_old'          => 'ಮ�ಕ�ತಾಯದ ಕಾಲ ಭೂತಕಾಲದಲ�ಲಿ ಇದೆ.',
 'protect-unchain'             => 'ಸ�ಥಳಾತಂರಿಸ�ವ ಅನ�ಮತಿಗಳನ�ನ� ತೆರೆ',
-'protect-text'                => 'ನೀವ� ಇಲ�ಲಿ <strong><nowiki>$1</nowiki></strong> ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟವನ�ನ� ವೀಕ�ಷಿಸಬಹ�ದ� ಮತ�ತ� ಬದಲಾಯಿಸಬಹ�ದ�.',
-'protect-locked-access'       => 'ನಿಮ�ಮ ಖಾತೆಗೆ ಪ�ಟ ಸಂರಕ�ಷಣ ಮಟ�ಟಗಳನ�ನ� ಬದಲಾಯಿಸ�ವ ಅನ�ಮತಿ ಇಲ�ಲ. 
-ಈ ಪ�ಟದ ಪ�ರಸಕ�ತ ವಸ�ತ�ಸ�ಥಿತಿ ಹೀಗಿದೆ: <strong>$1</strong>:',
+'protect-text'                => "ನೀವ� ಇಲ�ಲಿ '''<nowiki>$1</nowiki>''' ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟವನ�ನ� ವೀಕ�ಷಿಸಬಹ�ದ� ಮತ�ತ� ಬದಲಾಯಿಸಬಹ�ದ�.",
+'protect-locked-access'       => "ನಿಮ�ಮ ಖಾತೆಗೆ ಪ�ಟ ಸಂರಕ�ಷಣ ಮಟ�ಟಗಳನ�ನ� ಬದಲಾಯಿಸ�ವ ಅನ�ಮತಿ ಇಲ�ಲ. 
+ಈ ಪ�ಟದ ಪ�ರಸಕ�ತ ವಸ�ತ�ಸ�ಥಿತಿ ಹೀಗಿದೆ: '''$1''':",
 'protect-cascadeon'           => 'ಈ ಕೆಳಗಿನ ತಡಸಲ� ಸಂರಕ�ಷಣೆ (cascading protection) ಹೊಂದಿರ�ವ {{PLURAL:$1|ಪ�ಟದಲ�ಲಿ|ಪ�ಟಗಳಲ�ಲಿ}} ಸೇರ�ಪಡೆ ಆಗಿರ�ವ�ದರಿಂದ ಈ ಪ�ಟವೂ ಸಂರಕ�ಷಿತವಾಗಿದೆ.
 ನೀವ� ಈ ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟವನ�ನ� ಬದಲಾಯಿಸಬಹ�ದ�, ಆದರೆ ಅದ� ತಡಸಲ� ಸಂರಕ�ಷಣೆಯನ�ನ� ಬದಲಾಯಿಸ�ವ�ದಿಲ�ಲ.',
 'protect-default'             => '(ಸಾಮಾನ�ಯ ಸ�ಥಿತಿ)',
@@ -1331,6 +1335,7 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'protect-expiring'            => 'ಮ�ಕ�ತಾಯ $1 (UTC)',
 'protect-cascade'             => 'ಈ ಪ�ಟದಲ�ಲಿ ಸೇರಿಸಲಾಗಿರ�ವ ಪ�ಟಗಳನ�ನ� ಸಂರಕ�ಷಿಸ� (ತಡಸಲ� ಸಂರಕ�ಷಣೆ - cascading protection)',
 'protect-cantedit'            => 'ನೀವ� ಈ ಪ�ಟದ ಸಂರಕ�ಷಣೆ ಮಟ�ಟವನ�ನ� ಬದಲಾಯಿಸ�ವ ಅನ�ಮತಿಯನ�ನ� ಹೊಂದಿಲ�ಲ.',
+'protect-expiry-options'      => '೨ ಗಂಟೆಗಳ�:2 hours,೧ ದಿನ:1 day,೩ ದಿನಗಳ�:3 days,೧ ವಾರ:1 week,೨ ವಾರಗಳ�:2 weeks,೧ ತಿಂಗಳ�:1 month,೩ ತಿಂಗಳ�ಗಳ�:3 months,೬ ತಿಂಗಳ�ಗಳ�:6 months,೧ ವರ�ಷ:1 year,ಅನಿರ�ಧಿಷ�ಟ:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'ಅನ�ಮತಿ:',
 'restriction-level'           => 'ನಿರ�ಬಂಧನೆಯ ಮಟ�ಟ:',
 'minimum-size'                => 'ಕನಿಷ�ಠ ಗಾತ�ರ',
@@ -1385,7 +1390,6 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'whatlinkshere'            => 'ಇಲ�ಲಿಗೆ ಯಾವ ಸಂಪರ�ಕ ಕೂಡ�ತ�ತದೆ',
 'whatlinkshere-title'      => '"$1" ಪ�ಟಕ�ಕೆ ಸಂಪರ�ಕ ಹೊಂದಿರ�ವ ಪ�ಟಗಳ�',
 'whatlinkshere-page'       => 'ಪ�ಟ:',
-'linklistsub'              => '(ಸಂಪರ�ಕಗಳ ಪಟ�ಟಿ)',
 'linkshere'                => "'''[[:$1]]'''ಗೆ ಈ ಪ�ಟಗಳ� ಸಂಪರ�ಕ ಹೊಂದಿವೆ:",
 'nolinkshere'              => "'''[[:$1]]''' ಗೆ ಯಾವ ಪ�ಟಗಳೂ ಸಂಪರ�ಕ ಹೊಂದಿಲ�ಲ.",
 'nolinkshere-ns'           => "ಆಯ�ಕೆ ಮಾಡಿದ ಪ�ಟಪ�ರಬೇಧದಲ�ಲಿ ಯಾವ ಪ�ಟವೂ '''[[:$1]]''' ಅಲ�ಲಿಗೆ ಸಂಪರ�ಕ ಹೊಂದಿಲ�ಲ.",
@@ -1491,6 +1495,8 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 
 ಈ ಪ�ರಸಂಗಗಳಲ�ಲಿ ನೀವ� ಸ�ವತಃ ಚರ�ಚೆ ಪ�ಟವನ�ನ� ಸ�ಥಳಾಂತರಿಸಬೇಕ� ಅಥವ ಒಂದ�ಗೂಡಿಸಬೇಕ�.",
 'movearticle'             => 'ಪ�ಟವನ�ನ� ಸ�ಥಳಾಂತರಿಸಿ',
+'movenologin'             => 'ಲಾಗಿನ� ಆಗಿಲ�ಲ',
+'movenologintext'         => 'ಪ�ಟವನ�ನ� ಸ�ಥಳಾಂತರಿಸಲ� ನೀವ� ನೋಂದಾಯಿತ ಸದಸ�ಯರಾಗಿದ�ದ� [[Special:UserLogin|ಲಾಗಿನ�]] ಆಗಿರಬೇಕ�.',
 'movenotallowed'          => 'ನಿಮಗೆ {{SITENAME}} ಅಲ�ಲಿ ಪ�ಟಗಳನ�ನ� ಸ�ಥಳಾಂತರಿಸ�ವ ಅನ�ಮತಿ ಇಲ�ಲ.',
 'newtitle'                => 'ಈ ಹೊಸ ಶೀರ�ಷಿಕೆಗೆ:',
 'move-watch'              => 'ಈ ಪ�ಟವನ�ನ� ವೀಕ�ಷಿಸ�',
@@ -1616,11 +1622,11 @@ latex, dvips, gs, ಸರಿಯಾಗಿ ಸà³�ಥಾಪಿತವಾಗಿದೆà
 'tooltip-upload'                  => 'ಅಪ�ಲೋಡ� ಅನ�ನ� ಪ�ರಾರಂಭಿಸ�',
 
 # Attribution
-'anonymous'     => '{{SITENAME}} : ಅನಾಮಧೇಯ ಬಳಕೆದಾರ(ರ�)',
+'anonymous'     => '{{SITENAME}} ತಾಣದ ಅನಾಮಧೇಯ {{PLURAL:$1|ಬಳಕೆದಾರ|ಬಳಕೆದಾರರ�}}',
 'siteuser'      => '{{SITENAME}} ಬಳಕೆದಾರ $1',
 'othercontribs' => '$1 ರ ಕೆಲಸವನ�ನ� ಆಧರಿಸಿ.',
 'others'        => 'ಇತರರ�',
-'siteusers'     => '{{SITENAME}} ಸದಸ�ಯ(ರ�) $1',
+'siteusers'     => '{{SITENAME}} {{PLURAL:$2|ಸದಸ�ಯ|ಸದಸ�ಯರ�}} $1',
 'creditspage'   => 'ಪ�ಟದ ಗೌರವಗಳ�',
 
 # Info page
@@ -1656,7 +1662,7 @@ $1',
 'show-big-image'       => 'ಅತಿ ಹೆಚ�ಚ� ವಿವರವಾದ ನೋಟ',
 'show-big-image-thumb' => '<small>ಈ ಮ�ನ�ನೋಟದ ಅಳತೆ: $1 × $2 ಚಿತ�ರಬಿಂದ�ಗಳ�</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'ಹೊಸ ಫೈಲ�ಗಳ ಪ�ರದರ�ಶನ',
 'imagelisttext'         => "ಕೆಳಗೆ ಇರ�ವ�ದ� '''$1''' {{PLURAL:$1|ಫೈಲಿನ|ಫೈಲ�ಗಳ}} ಪಟ�ಟಿ, $2 �ರ�ಪಾಟಾಗಿದೆ.",
 'newimages-summary'     => 'ಈ ವಿಶೇಷ ಪ�ಟವ� ಕೊನೆಯದಾಗಿ ಅಪ�ಲೋಡ� ಆಗಿರ�ವ ಫೈಲ�ಗಳನ�ನ� ತೋರ�ತ�ತದೆ',
@@ -1822,16 +1828,6 @@ $5
 ದಯವಿಟ�ಟ� ಈ ಪ�ಟವನ�ನ� ನೀವ� ಪ�ನಃ ಸೃಷ�ಟಿಸಬೇಕೆಂದಿರ�ವಿರಿ ಎಂದ� ಧೃಡೀಕರಿಸಿ.",
 'recreate'            => 'ಪ�ನಃ ಸೃಷ�ಟಿಸ�',
 
-# HTML dump
-'redirectingto' => '[[:$1]] ಪ�ಟಕ�ಕೆ ಪ�ನರ�ನಿರ�ದೇಶಿತವಾಗ�ತ�ತಿದೆ...',
-
-# AJAX search
-'searchcontaining' => "''$1'' ಅನ�ನ� ಹೊಂದಿರ�ವ ಪ�ಟಗಳನ�ನ� ಹ�ಡ�ಕ�.",
-'searchnamed'      => "''$1'' ಎಂದ� ಹೆಸರಿಸಲಾದ ಪ�ಟಗಳನ�ನ� ಹ�ಡ�ಕ�.",
-'articletitles'    => "''$1'' ಇಂದ ಪ�ರಾರಂಭವಾಗ�ವ ಪ�ಟಗಳ�",
-'hideresults'      => 'ಫಲಿತಾಂಶಗಳನ�ನ� ಅಡಗಿಸ�',
-'useajaxsearch'    => 'AJAX ಹ�ಡ�ಕಾಟವನ�ನ� ಉಪಯೋಗಿಸಿ',
-
 # Multipage image navigation
 'imgmultipageprev' => '� ಹಿಂದಿನ ಪ�ಟ',
 'imgmultipagenext' => 'ಮ�ಂದಿನ ಪ�ಟ →',
diff --git a/languages/messages/MessagesKo.php b/languages/messages/MessagesKo.php
index eee0b877..de2f8cae 100644
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -17,30 +17,219 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => '특수기능',
-	NS_MAIN           => '',
-	NS_TALK           => '토론',
-	NS_USER           => '사용�',
-	NS_USER_TALK      => '사용�토론',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1토론',
-	NS_IMAGE          => '그림',
-	NS_IMAGE_TALK     => '그림토론',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki토론',
-	NS_TEMPLATE       => 'í‹€',
-	NS_TEMPLATE_TALK  => '틀토론',
-	NS_HELP           => '�움�',
-	NS_HELP_TALK      => '�움�토론',
-	NS_CATEGORY       => '분류',
-	NS_CATEGORY_TALK  => '분류토론',
+	NS_MEDIA            => '미디어',
+	NS_SPECIAL          => '특수기능',
+	NS_TALK             => '토론',
+	NS_USER             => '사용�',
+	NS_USER_TALK        => '사용�토론',
+	NS_PROJECT_TALK     => '$1토론',
+	NS_FILE             => '파�',
+	NS_FILE_TALK        => '파�토론',
+	NS_MEDIAWIKI        => '미디어위키',
+	NS_MEDIAWIKI_TALK   => '미디어위키토론',
+	NS_TEMPLATE         => 'í‹€',
+	NS_TEMPLATE_TALK    => '틀토론',
+	NS_HELP             => '�움�',
+	NS_HELP_TALK        => '�움�토론',
+	NS_CATEGORY         => '분류',
+	NS_CATEGORY_TALK    => '분류토론',
 );
 
-$skinNames = array(
-	'standard' => '표준',
-	'monobook' => '모노�',
-	'myskin'   => '내 스킨',
+$namespaceAliases = array(
+	'특'  => NS_SPECIAL,
+	'MediaWiki토론' => NS_MEDIAWIKI_TALK,
+	'그림' => NS_FILE,
+	'파�토론' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( '�중넘겨주기' ),
+	'BrokenRedirects'           => array( '�긴넘겨주기' ),
+	'Disambiguations'           => array( '����', '����문서' ),
+	'Userlogin'                 => array( '로그�' ),
+	'Userlogout'                => array( '로그아웃' ),
+	'CreateAccount'             => array( '가입', '계정만들기' ),
+	'Preferences'               => array( '환경설정' ),
+	'Watchlist'                 => array( '주시문서', '주시목�' ),
+	'Recentchanges'             => array( '최근바뀜' ),
+	'Upload'                    => array( '파�올리기', '그림올리기' ),
+	'Listfiles'                 => array( '파�', '그림', '파�목�', '그림목�' ),
+	'Newimages'                 => array( '새파�', '새그림' ),
+	'Listusers'                 => array( '사용�', '사용�목�' ),
+	'Listgrouprights'           => array( '사용�권한', '권한목�' ),
+	'Statistics'                => array( '통계' ),
+	'Randompage'                => array( '임�문서', '랜�문서' ),
+	'Lonelypages'               => array( '외톨�문서' ),
+	'Uncategorizedpages'        => array( '분류안�문서' ),
+	'Uncategorizedcategories'   => array( '분류안�분류' ),
+	'Uncategorizedimages'       => array( '분류안�파�', '분류안�그림' ),
+	'Uncategorizedtemplates'    => array( '분류안�틀' ),
+	'Unusedcategories'          => array( '안쓰는분류' ),
+	'Unusedimages'              => array( '안쓰는파�', '안쓰는그림' ),
+	'Wantedpages'               => array( '필요한문서' ),
+	'Wantedcategories'          => array( '필요한분류' ),
+	'Wantedfiles'               => array( '필요한파�', '필요한그림' ),
+	'Wantedtemplates'           => array( '필요한틀' ),
+	'Mostlinked'                => array( '많����문서' ),
+	'Mostlinkedcategories'      => array( '많�쓰는분류' ),
+	'Mostlinkedtemplates'       => array( '많�쓰는틀' ),
+	'Mostimages'                => array( '많�쓰는파�', '많�쓰는그림' ),
+	'Mostcategories'            => array( '많�분류�문서' ),
+	'Mostrevisions'             => array( '역사긴문서' ),
+	'Fewestrevisions'           => array( '역사짧�문서' ),
+	'Shortpages'                => array( '짧�문서' ),
+	'Longpages'                 => array( '긴문서' ),
+	'Newpages'                  => array( '새문서' ),
+	'Ancientpages'              => array( '오래�문서' ),
+	'Deadendpages'              => array( '막다른문서' ),
+	'Protectedpages'            => array( '보호�문서' ),
+	'Protectedtitles'           => array( '�성보호�문서' ),
+	'Allpages'                  => array( '모든문서' ),
+	'Prefixindex'               => array( '접�어찾기' ),
+	'Ipblocklist'               => array( '차단�사용�', '차단목�' ),
+	'Specialpages'              => array( '특수기능' ),
+	'Contributions'             => array( '기여', '기여목�', '사용�기여' ),
+	'Emailuser'                 => array( '�메�보내기' ),
+	'Confirmemail'              => array( '�메���' ),
+	'Whatlinkshere'             => array( '가리키는문서', '��하는문서' ),
+	'Recentchangeslinked'       => array( '��최근바뀜' ),
+	'Movepage'                  => array( '��', '문서��' ),
+	'Booksources'               => array( '책찾기' ),
+	'Categories'                => array( '분류' ),
+	'Export'                    => array( '내보내기' ),
+	'Version'                   => array( '버전' ),
+	'Allmessages'               => array( '모든메시지' ),
+	'Log'                       => array( '기�', '로그' ),
+	'Blockip'                   => array( '차단' ),
+	'Undelete'                  => array( '삭제취소', '삭제�문서' ),
+	'Import'                    => array( '가져오기' ),
+	'Lockdb'                    => array( 'DB잠금' ),
+	'Unlockdb'                  => array( 'DB잠금취소', 'DB잠금해제' ),
+	'Userrights'                => array( '권한조정' ),
+	'MIMEsearch'                => array( 'MIME찾기', 'MIME검색' ),
+	'FileDuplicateSearch'       => array( '중복파�찾기' ),
+	'Unwatchedpages'            => array( '주시안�는문서' ),
+	'Listredirects'             => array( '넘겨주기', '넘겨주기목�' ),
+	'Revisiondelete'            => array( '특정�삭제' ),
+	'Unusedtemplates'           => array( '안쓰는틀' ),
+	'Randomredirect'            => array( '임�넘겨주기', '랜�넘겨주기' ),
+	'Mypage'                    => array( '내사용�문서' ),
+	'Mytalk'                    => array( '내사용�토론' ),
+	'Mycontributions'           => array( '내기여', '내기여목�' ),
+	'Listadmins'                => array( '관리�', '관리�목�' ),
+	'Listbots'                  => array( '봇', '봇목�' ),
+	'Popularpages'              => array( '�기있는문서' ),
+	'Search'                    => array( '찾기', '검색' ),
+	'Resetpass'                 => array( '비밀번호초기화', '암호초기화', '비밀번호변경' ),
+	'Withoutinterwiki'          => array( '�터위키없는문서' ),
+	'MergeHistory'              => array( '역사합치기' ),
+	'Filepath'                  => array( '파�경로', '그림경로' ),
+	'Blankpage'                 => array( '빈문서' ),
+	'LinkSearch'                => array( '외부��찾기', '외부��검색' ),
+	'DeletedContributions'      => array( '삭제�기여' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#넘겨주기', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__목차숨김__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__화랑숨김__', '__갤러리숨김__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__목차보임__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__목차__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__단�편집숨김__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', '현재월', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', '현재월�름', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', '현재월�름소유격', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', '현재월�름약�', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', '현재�', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', '현재�2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', '현재요�', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', '현재년', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', '현재시분', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', '현재시', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', '지역월', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', '지역월�름', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', '지역월�름소유격', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', '지역월�름약�', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', '지역�', 'LOCALDAY' ),
+	'localday2'             => array( '1', '지역�2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', '지역요�', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', '지역년', 'LOCALYEAR' ),
+	'localtime'             => array( '1', '지역시분', 'LOCALTIME' ),
+	'localhour'             => array( '1', '지역시', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', '모든문서수', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', '문서수', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', '파�수', '그림수', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', '사용�수', '계정수', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', '편집수', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', '문서�름', 'PAGENAME' ),
+	'pagenamee'             => array( '1', '문서�름E', 'PAGENAMEE' ),
+	'namespace'             => array( '1', '�름공간', 'NAMESPACE' ),
+	'namespacee'            => array( '1', '�름공간E', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', '토론�름공간', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', '토론�름공간E', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', '본문서�름공간', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', '본문서�름공간E', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', '전체문서�름', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', '전체문서�름E', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', '하위문서�름', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', '하위문서�름E', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', '�위문서�름', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', '�위문서�름E', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', '토론문서�름', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', '토론문서�름E', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', '본문서�름', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', '본문서�름E', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subst'                 => array( '0', '풀기:', 'SUBST:' ),
+	'img_thumbnail'         => array( '1', '섬네�', '�네�', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', '섬네�=$1', '�네�=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', '오른쪽', 'right' ),
+	'img_left'              => array( '1', '왼쪽', 'left' ),
+	'img_none'              => array( '1', '없�', 'none' ),
+	'img_width'             => array( '1', '$1픽셀', '$1px' ),
+	'img_center'            => array( '1', '가운�', 'center', 'centre' ),
+	'img_framed'            => array( '1', '프레임', 'framed', 'enframed', 'frame' ),
+	'img_border'            => array( '1', '테�리', 'border' ),
+	'sitename'              => array( '1', '사�트�름', 'SITENAME' ),
+	'ns'                    => array( '0', '�름:', 'NS:' ),
+	'localurl'              => array( '0', '지역주소:', 'LOCALURL:' ),
+	'localurle'             => array( '0', '지역주소E:', 'LOCALURLE:' ),
+	'server'                => array( '0', '서버', 'SERVER' ),
+	'servername'            => array( '0', '서버�름', 'SERVERNAME' ),
+	'grammar'               => array( '0', '문법:', 'GRAMMAR:' ),
+	'currentweek'           => array( '1', '현재주', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', '현재요�숫�', 'CURRENTDOW' ),
+	'localweek'             => array( '1', '지역주', 'LOCALWEEK' ),
+	'localdow'              => array( '1', '지역요�숫�', 'LOCALDOW' ),
+	'revisionid'            => array( '1', '�번호', 'REVISIONID' ),
+	'revisionday'           => array( '1', '��', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', '��2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', '�월', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', '�년', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', '�타임스탬프', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', '복수:', 'PLURAL:' ),
+	'fullurl'               => array( '0', '전체주소:', 'FULLURL:' ),
+	'fullurle'              => array( '0', '전체주소E:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', '첫소문�:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', '첫대문�:', 'UCFIRST:' ),
+	'lc'                    => array( '0', '소문�:', 'LC:' ),
+	'uc'                    => array( '0', '대문�:', 'UC:' ),
+	'newsectionlink'        => array( '1', '__새글쓰기__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', '현재버전', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', '주소�코딩:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', '책갈피�코딩', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', '현재타임스탬프', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', '지역타임스탬프', 'LOCALTIMESTAMP' ),
+	'language'              => array( '0', '#언어:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', '기본언어', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', '�름공간문서수', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', '관리�수', 'NUMBEROFADMINS' ),
+	'special'               => array( '0', '특수기능', 'special' ),
+	'defaultsort'           => array( '1', '기본정렬:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', '파�경로:', '그림경로:', 'FILEPATH:' ),
+	'hiddencat'             => array( '1', '__숨�분류__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', '분류문서수', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', '문서�기', 'PAGESIZE' ),
+	'staticredirect'        => array( '1', '__넘겨주기고정__', '__STATICREDIRECT__' ),
 );
 
 $bookstoreList = array(
@@ -48,7 +237,6 @@ $bookstoreList = array(
 	'inherit' => true,
 );
 
-$datePreferences = false;
 $defaultDateFormat = 'ko';
 $dateFormats = array(
 	'ko time' => 'H:i',
@@ -94,16 +282,17 @@ $messages = array(
 'tog-watchlisthideown'        => '주시문서 목��서 내 편집� 숨기기',
 'tog-watchlisthidebots'       => '주시문서 목��서 봇 편집� 숨기기',
 'tog-watchlisthideminor'      => '주시문서 목��서 사소한 편집� 숨기기',
+'tog-watchlisthideliu'        => '주시문서 목��서 로그�한 사용�� 편집� 숨기기',
+'tog-watchlisthideanons'      => '주시문서 목��서 비등� 사용�� 편집� 숨기기',
 'tog-ccmeonemails'            => '�메�� 보낼 때 내 �메�로 복사본� 보내기',
 'tog-diffonly'                => '편집 차�를 비�할 때 문서 내용� 보여주지 않기',
 'tog-showhiddencats'          => '숨겨진 분류 보기',
+'tog-norollbackdiff'          => '��리기 후 차�를 보�지 않기',
 
 'underline-always'  => '항�',
 'underline-never'   => '치지 않�',
 'underline-default' => '브�우저 설정� 따르기',
 
-'skinpreview' => '(미리 보기)',
-
 # Dates
 'sunday'        => '�요�',
 'monday'        => '월요�',
@@ -197,7 +386,7 @@ $messages = array(
 'mytalk'         => '내 사용� 토론',
 'anontalk'       => '�명 사용� 토론',
 'navigation'     => '둘러보기',
-'and'            => '그리고',
+'and'            => ',',
 
 # Metadata in edit box
 'metadata_help' => '메타��터:',
@@ -234,7 +423,7 @@ $messages = array(
 'talkpagelinktext'  => '토론',
 'specialpage'       => '특수 문서',
 'personaltools'     => '개� �구',
-'postcomment'       => '�견 쓰기',
+'postcomment'       => '새 주제',
 'articlepage'       => '문서 보기',
 'talk'              => '토론',
 'views'             => '보기',
@@ -260,8 +449,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} 소개',
 'aboutpage'            => 'Project:소개',
-'bugreports'           => '버그 신고',
-'bugreportspage'       => 'Project:버그 신고',
 'copyright'            => '문서는 $1 ��센스 하� 있습니다.',
 'copyrightpagename'    => '{{SITENAME}} 저작권',
 'copyrightpage'        => '{{ns:project}}:저작권',
@@ -284,9 +471,7 @@ $messages = array(
 
 'badaccess'        => '권한 오류',
 'badaccess-group0' => '요청한 �작� 실행할 권한� 없습니다.',
-'badaccess-group1' => '요청한 �작�는 $1 권한� 필요합니다.',
-'badaccess-group2' => '요청한 �작� $1 중 하나� 권한� 가진 사용��게만 가능합니다.',
-'badaccess-groups' => '요청한 �작� $1 중 하나� 권한� 가진 사용��게만 가능합니다.',
+'badaccess-groups' => '요청한 �작� {{PLURAL:$2|다�|다� 중 하나�}} 권한� 가진 사용��게만 가능합니다: $1.',
 
 'versionrequired'     => '미디어위키 $1 버전 필요',
 'versionrequiredtext' => '� 문서를 사용하려면 $1 버전 미디어위키가 필요합니다. [[Special:Version|설치� 미디어위키 버전]]� 확�해주세요.',
@@ -300,6 +485,8 @@ $messages = array(
 'editsection'             => '편집',
 'editold'                 => '편집',
 'viewsourceold'           => '내용 보기',
+'editlink'                => '편집',
+'viewsourcelink'          => '내용 보기',
 'editsectionhint'         => '부분 편집: $1',
 'toc'                     => '목차',
 'showtoc'                 => '보�기',
@@ -330,7 +517,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '해당하는 �작� 없습니다.',
-'nosuchactiontext'  => 'URL로 요청한 �작� 위키�서 �별할 수 없습니다.',
+'nosuchactiontext'  => 'URL로 요청한 �작� 잘못�었습니다.
+당신� URL� 잘못 입력하였거나, 잘못� ��를 따�갔� 수 있습니다.
+�것� {{SITENAME}}� 버그� 수� 있습니다.',
 'nosuchspecialpage' => '해당하는 특수기능� 없습니다.',
 'nospecialpagetext' => "<big>'''요청한 특수 문서가 존재하지 않습니다.'''</big>
 
@@ -372,19 +561,19 @@ $messages = array(
 'cannotdelete'         => '문서나 파�� 삭제할 수 없습니다. �미 삭제�었� 수� 있습니다.',
 'badtitle'             => '잘못� 제목',
 'badtitletext'         => '문서 제목� 잘못�었거나 비어있습니다.',
-'perfdisabled'         => '� 기능� 위키가 사용 불가능할 정�로 ��터베�스를 �리게 만들기 때문� 임시�으로 사용� 중지�었습니다.',
 'perfcached'           => '다� �료는 �시� 것�므로 현재 �황� 반�하지 않� 수 있습니다.',
 'perfcachedts'         => '다� �료는 �시� 것으로, $1� 마지막으로 갱신�었습니다.',
 'querypage-no-updates' => '� 문서� 갱신� 현재 비활성화�어 있습니다. �료가 잠시 갱신�지 않� 것입니다.',
 'wrong_wfQuery_params' => 'wfQuery()�서 잘못� 매개변수 발�<br />함수: $1<br />쿼리: $2',
 'viewsource'           => '내용 보기',
 'viewsourcefor'        => '$1� 문서 내용',
+'actionthrottled'      => '명령 �� ��',
 'actionthrottledtext'  => '스팸� 막기 위해 � 작업� 짧� 시간� 너무 많� 하는 것� 막고 있습니다.
 제한� 넘었으니 몇 분 후� 새로 시�하세요.',
 'protectedpagetext'    => '� 문서는 문서 편집� 불가능하�� 보호�어 있습니다.',
 'viewsourcetext'       => '문서� �본� 보거나 복사할 수 있습니다:',
 'protectedinterface'   => '� 문서는 소프트웨어 �터페�스� 쓰�는 문서로, 잠겨 있습니다.',
-'editinginterface'     => "'''경고''': 소프트웨어�서 사용하는 메시지 문서를 고치고 있습니다. �것� 모든 사용��게 �향� �칩니다. 번역�지 않� 메시지를 번역하려는 경우�는, [http://translatewiki.net/wiki/Main_Page?setlang=ko 베타위키(Betawiki)]� 참여하면 메시지 번역� 미디어위키� �접 반�할 수 있습니다.",
+'editinginterface'     => "'''경고''': 소프트웨어�서 사용하는 메시지 문서를 고치고 있습니다. �것� 모든 사용��게 �향� �칩니다. 번역�지 않� 메시지를 번역하려는 경우�는, [http://translatewiki.net/wiki/Main_Page?setlang=ko 베타위키(translatewiki.net)]� 참여하면 메시지 번역� 미디어위키� �접 반�할 수 있습니다.",
 'sqlhidden'            => '(SQL 쿼리 숨겨�)',
 'cascadeprotected'     => '� 문서는 연쇄 보호가 걸린 문서� �함�어 있어, 함께 보호�니다. 연쇄 보호� 문서:',
 'namespaceprotected'   => "'''$1''' 네임스페�스를 편집할 수 있는 권한� 없습니다.",
@@ -394,16 +583,16 @@ $messages = array(
 �유는 다�과 같습니다. ‘''$2''’",
 
 # Virus scanner
-'virus-badscanner'     => '잘못� 설정: 알 수 없는 바�러스 검사기: <i>$1</i>',
+'virus-badscanner'     => "잘못� 설정: 알 수 없는 바�러스 검사기: ''$1''",
 'virus-scanfailed'     => '검사 실패 (코드 $1)',
 'virus-unknownscanner' => '알려지지 않� 백신:',
 
 # Login and logout pages
 'logouttitle'                => '로그아웃',
-'logouttext'                 => '<strong>{{SITENAME}}�서 로그아웃했습니다.</strong>
+'logouttext'                 => "'''{{SITENAME}}�서 로그아웃했습니다.'''
 
 �대로 �름 없� {{SITENAME}}�(를) �용하거나, 방금 사용했� 계정�나 다른 계정으로 다시 [[Special:UserLogin|로그�]]해서 �용할 수 있습니다.
-웹 브�우저� �시를 지우지 않으면 몇몇 문서�서 로그�� �어 있는 것처럼 보� 수 있다는 �� 유�해 주세요.',
+웹 브�우저� �시를 지우지 않으면 몇몇 문서�서 로그�� �어 있는 것처럼 보� 수 있다는 �� 유�해 주세요.",
 'welcomecreation'            => '== $1 님, 환�합니다! ==
 계정� 만들어졌습니다.
 [[Special:Preferences|당신� {{SITENAME}} 사용� 환경 설정]]� 바꿀 수 있습니다.',
@@ -414,7 +603,6 @@ $messages = array(
 'remembermypassword'         => '로그� �태를 저장하기',
 'yourdomainname'             => '�메� �름',
 'externaldberror'            => '외부 �� ��터베�스� 오류가 있거나, 외부 계정� 갱신할 권한� 없습니다.',
-'loginproblem'               => "'''로그�� 문제가 발�했습니다.'''<br />다시 시�해 보세요.",
 'login'                      => '로그�',
 'nav-login-createaccount'    => '로그� / 계정 만들기',
 'loginprompt'                => '{{SITENAME}}� 로그�하려면 쿠키를 사용할 수 있어야 합니다.',
@@ -439,7 +627,8 @@ $messages = array(
 'yourlanguage'               => '언어:',
 'yournick'                   => '서명:',
 'badsig'                     => '서명� 잘못�었습니다. HTML 태그를 확�해주세요.',
-'badsiglength'               => '서명� 너무 �니다. 서명� $1�보다 짧아야 합니다.',
+'badsiglength'               => '서명� 너무 �니다.
+서명� $1�보다 짧아야 합니다.',
 'email'                      => '�메�',
 'prefs-help-realname'        => '실명 기입� �유입니다. 실명� 입력할 경우 문서 기여� �신� �름� 들어가게 �니다.',
 'loginerror'                 => '로그� 오류',
@@ -451,7 +640,9 @@ $messages = array(
 'noname'                     => '사용� �름� 올바르지 않습니다.',
 'loginsuccesstitle'          => '로그� 성공',
 'loginsuccess'               => "'''{{SITENAME}}� ‘$1’ 계정으로 로그�했습니다.'''",
-'nosuchuser'                 => '"$1" 사용�가 존재하지 않습니다. 철�가 맞는지 확�해주세요. �는 [[Special:UserLogin/signup|새 계정� 만들 수 있습니다]].',
+'nosuchuser'                 => '"$1" 사용�가 존재하지 않습니다.
+사용� �름� 대소문�를 구별합니다. 철�가 맞는지 확�해주세요.
+�는 [[Special:UserLogin/signup|새 계정� 만들 수 있습니다]].',
 'nosuchusershort'            => '‘<nowiki>$1</nowiki>’ 사용�가 존재하지 않습니다. 철�가 맞는지 확�해 주세요.',
 'nouserspecified'            => '사용� �름� 입력하지 않았습니다.',
 'wrongpassword'              => '암호가 틀립니다. 다시 시�해 주세요.',
@@ -460,7 +651,7 @@ $messages = array(
 암호 길�는 �어� $1�보다 길고 사용� �름과 달�야 합니다.',
 'mailmypassword'             => '새 암호를 �메�로 보내기',
 'passwordremindertitle'      => '{{SITENAME}}�서 보내는 새 임시 암호',
-'passwordremindertext'       => 'IP 주소 $1�게서 당신�게 {{SITENAME}}($4)� 새 암호를 보내달�는 요청� 왔습니다.
+'passwordremindertext'       => 'IP 주소 $1�게서 당신�게 {{SITENAME}} ($4)� 새 암호를 보내달�는 요청� 왔습니다.
 사용� ‘$2’� 암호는 �제 ‘$3’입니다. 로그�한 다� 암호를 변경해 주세요.
 
 만약 � 암호 요청� 다른 사람� 보낸 것�거나, �는 예전� 사용하� 암호를 기억해냈다면 � 메시지를 무시하고 예전 암호를 계� 사용할 수 있습니다.',
@@ -470,8 +661,9 @@ $messages = array(
 'eauthentsent'               => '확� �메�� 보냈습니다. �메� 내용� 지시대로 계정 확� 절차를 실행해 주십시오.',
 'throttled-mailpassword'     => '비밀번호 확� �메�� �미 최근 $1시간 안� 보냈습니다. 악용� 방지하기 위해 비밀번호 확�� $1시간마다 하나씩만 보낼 수 있습니다.',
 'mailerror'                  => '메� 보내기 오류: $1',
-'acct_creation_throttle_hit' => '당신� �미 $1개� 계정� 있습니다. � �� 만들 수 없습니다.',
-'emailauthenticated'         => '당신� �메� 주소는 $1� ���었습니다.',
+'acct_creation_throttle_hit' => '당신� IP 주소를 �용한 방문�가 �전� �미 $1개� 계정� �성하여, 계정 �성 한�를 초과하였습니다.
+따�서 현재로서는 � IP 주소로는 계정� � �� 만들 수 없습니다.',
+'emailauthenticated'         => '당신� �메� 주소는 $2 $3� ���었습니다.',
 'emailnotauthenticated'      => '�메� 주소를 ��하지 않았습니다. �메� 확� 절차를 거치지 않으면 다� �메� 기능� 사용할 수 없습니다.',
 'noemailprefs'               => '� 기능� 사용하기 위해서는 �메� 주소를 기입해야 합니다.',
 'emailconfirmlink'           => '�메� 주소 확�',
@@ -483,17 +675,26 @@ $messages = array(
 'createaccount-text'         => '{{SITENAME}}($4)�서 계정 �름 ‘$2’, 비밀번호 ‘$3’으로 계정� 만들었습니다. 로그�� 한 다� 암호를 바꾸어 주세요.
 
 계정� 잘못 만들었다면 � 메시지는 무시해� �니다.',
+'login-throttled'            => '로그� 하려는 계정� 비밀번호를 연�으로 잘못 입력하였습니다.
+잠시 후� 다시 시�해주세요.',
 'loginlanguagelabel'         => '언어: $1',
 
 # Password reset dialog
-'resetpass'               => '계정 비밀번호 초기화',
-'resetpass_announce'      => '�메�로 받� 임시 암호로 로그�했습니다. 로그�� 마치려면 새 암호를 입력해 주세요:',
-'resetpass_header'        => '비밀번호 변경',
-'resetpass_submit'        => '암호를 변경하고 로그�하기',
-'resetpass_success'       => '암호가 성공�으로 변경�었습니다! 로그�� 해 주세요.',
-'resetpass_bad_temporary' => '임시 암호가 잘못�었습니다. 암호를 �미 바꾸었거나, 임시 암호를 새로 받았� 수 있습니다.',
-'resetpass_forbidden'     => '비밀번호 변경 불가',
-'resetpass_missing'       => '입력값 없�.',
+'resetpass'                 => '비밀번호 바꾸기',
+'resetpass_announce'        => '�메�로 받� 임시 암호로 로그�했습니다. 로그�� 마치려면 새 암호를 입력해 주세요:',
+'resetpass_header'          => '비밀번호 변경',
+'oldpassword'               => '예전 암호:',
+'newpassword'               => '새 암호:',
+'retypenew'                 => '새 암호 확�:',
+'resetpass_submit'          => '암호를 변경하고 로그�하기',
+'resetpass_success'         => '암호가 성공�으로 변경�었습니다! 로그�� 해 주세요.',
+'resetpass_bad_temporary'   => '임시 암호가 잘못�었습니다. 암호를 �미 바꾸었거나, 임시 암호를 새로 받았� 수 있습니다.',
+'resetpass_forbidden'       => '비밀번호 변경 불가',
+'resetpass-no-info'         => '� 특수 문서� �접 접근하려면 반드시 로그�해야 합니다.',
+'resetpass-submit-loggedin' => '비밀번호 변경',
+'resetpass-wrong-oldpass'   => '비밀번호가 잘못�었거나 현재� 비밀번호와 같습니다.
+당신� �미 비밀번호를 성공�으로 변경하였거나 새 임시 비밀번호를 발급받았� 수 있습니다.',
+'resetpass-temp-password'   => '임시 비밀번호:',
 
 # Edit page toolbar
 'bold_sample'     => '굵� 글씨',
@@ -507,17 +708,17 @@ $messages = array(
 'headline_sample' => '제목',
 'headline_tip'    => '2단계 문단 제목',
 'math_sample'     => '여기� 수�� 쓰세요',
-'math_tip'        => '수� (LaTeX)',
+'math_tip'        => '수�(LaTeX)',
 'nowiki_sample'   => '여기� 위키 문법� 사용하지 않� 글� �어 주세요',
-'nowiki_tip'      => '위키 문법 무시하기',
+'nowiki_tip'      => '위키 문법 사용하지 않기',
 'image_tip'       => '파� 넣기',
 'media_tip'       => '파� ��하기',
 'sig_tip'         => '내 서명과 현재 시�',
 'hr_tip'          => '가로줄(��� 사용하지 �아 주세요)',
 
 # Edit pages
-'summary'                          => '편집 요약',
-'subject'                          => '주제/제목',
+'summary'                          => '편집 요약:',
+'subject'                          => '주제/제목:',
 'minoredit'                        => '사소한 편집',
 'watchthis'                        => '� 문서 주시하기',
 'savearticle'                      => '저장',
@@ -528,8 +729,10 @@ $messages = array(
 'anoneditwarning'                  => "'''주�''': 로그�하고 있지 않습니다. 당신� IP 주소가 문서 역사� 남게 �니다.",
 'missingsummary'                   => "'''알림:''' 편집 요약� �지 않았습니다. 그대로 저장하면 편집 요약 없� 저장�니다.",
 'missingcommenttext'               => '아래� 내용� 채워 넣어 주세요.',
-'summary-preview'                  => '편집 요약 미리 보기',
-'subject-preview'                  => '주제/제목 미리 보기',
+'missingcommentheader'             => "'''알림:''' 당신� � 글� 제목� 입력하지 않으셨습니다.
+다시 저장 버튼� �릭하신다면, 당신� 글� 제목 없� 저장� 것입니다.",
+'summary-preview'                  => '편집 요약 미리 보기:',
+'subject-preview'                  => '주제/제목 미리 보기:',
 'blockedtitle'                     => '차단�',
 'blockedtext'                      => "<big>'''당신� 계정 혹� IP 주소가 차단�었습니다.'''</big>
 
@@ -574,7 +777,8 @@ $1, ë˜�는 [[{{MediaWiki:Grouppage-sysop}}|다른 관리ìž�]]ì—�게 차단ì—� ëŒ
 만약 잘못 찾아온 문서�면, 웹 브�우저� '''뒤로''' 버튼� 눌러 주세요.",
 'anontalkpagetext'                 => '----
 여기는 계정� 만들지 않았거나 사용하고 있지 않� 비등� 사용�를 위한 토론 문서입니다. 비등� 사용�를 구별하기 위해서는 숫�로 � IP 주소를 사용해야만 합니다. IP 주소는 여러 사용�� �해 공유� 수 있습니다. �신과 관계없는 �견� �신�게 남겨져 있어 불쾌하다고 ��하는 비등� 사용��게는 [[Special:UserLogin/signup|계정� 만들고]] [[Special:UserLogin|로그� 하여]] 추후� 다른 비등� 사용��게 올 수 있는 혼란� 줄�는 것� 추천합니다.',
-'noarticletext'                    => '현재 문서는 비어 있습니다. � 제목으로 [[Special:Search/{{PAGENAME}}|검색]]하거나 문서를 [{{fullurl:{{FULLPAGENAME}}|action=edit}} 편집]할 수 있습니다.',
+'noarticletext'                    => '� 문서가 존재하지 않습니다.
+� 제목으로 [[Special:Search/{{PAGENAME}}|검색]]하거나, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} 문서� 관련� 기�� 열람]하거나 문서를 [{{fullurl:{{FULLPAGENAME}}|action=edit}} 편집]</span>할 수 있습니다.',
 'userpage-userdoesnotexist'        => '‘$1’ 계정� 등��어 있지 않습니다. � 문서를 만들거나 편집하려면 계정� 존재 하는지 확�해주세요.',
 'clearyourcache'                   => "'''참고 - 설정� 저장한 후� 바� �� 확�하기 위해서는 브�우저� �시를 갱신해야 합니다.'''
 
@@ -584,16 +788,17 @@ $1, ë˜�는 [[{{MediaWiki:Grouppage-sysop}}|다른 관리ìž�]]ì—�게 차단ì—� ëŒ
 'userjspreview'                    => "'''�것� �바스�립트 미리 보기로, 아� 저장하지 않았다는 것� 주�해 주세요!'''",
 'userinvalidcssjstitle'            => "'''경고''': ‘$1’ 스킨� 존재하지 않습니다. .css와 .js 문서� 제목� {{ns:user}}:Foo/monobook.css처럼 소문�로 �야 합니다. {{ns:user}}:Foo/Monobook.css와 같� 대문�로 쓸 경우 작�하지 않습니다.",
 'updated'                          => '(바뀜)',
-'note'                             => '<strong>주�:</strong>',
-'previewnote'                      => '<strong>지금 미리 보기로 보고 있는 내용� 아� 저장�지 않았습니다!</strong>',
+'note'                             => "'''주�:'''",
+'previewnote'                      => "'''지금 미리 보기로 보고 있는 내용� 아� 저장�지 않았습니다!'''",
 'previewconflict'                  => '� 미리 보기는 저장할 때� 모습, 즉 위쪽 편집창� 문서를 반�합니다.',
-'session_fail_preview'             => '<strong>세션 ��터가 없어져 편집� 저장하지 못했습니다.
-다시 시�해� �지 않으면 [[Special:UserLogout|로그아웃]]한 다� 다시 로그�해 보십시오.</strong>',
-'session_fail_preview_html'        => '<strong>세션 ��터가 없어져 편집� 저장하지 못했습니다.</strong>
+'session_fail_preview'             => "'''세션 ��터가 없어져 편집� 저장하지 못했습니다.
+다시 시�해� �지 않으면 [[Special:UserLogout|로그아웃]]한 다� 다시 로그�해 보십시오.'''",
+'session_fail_preview_html'        => "'''세션 ��터가 없어져 편집� 저장하지 못했습니다.'''
 
 {{SITENAME}}�서 HTML 입력� 허용하기 때문�, �바스�립트 공격� 막기 위해 미리 보기는 숨겨져 있습니다.
 
-<strong>다시 시�해� �지 않으면 [[Special:UserLogout|로그아웃]]한 다� 다시 로그�� 해 보십시오.</strong>',
+'''다시 시�해� �지 않으면 [[Special:UserLogout|로그아웃]]한 다� 다시 로그�� 해 보십시오.'''",
+'token_suffix_mismatch'            => "'''저장하려는 내용� 문장 부호가 �가져 있습니다. 문서 보호를 위해 해당 내용� 저장하지 않습니다. 버그가 있는 �명 프�시 서비스 등� 사용할 때 �런 문제가 발�할 수 있습니다.'''",
 'editing'                          => '$1 편집하기',
 'editingsection'                   => '$1 편집하기 (부분)',
 'editingcomment'                   => '$1 편집하기 (�붙�기)',
@@ -605,23 +810,26 @@ $1, ë˜�는 [[{{MediaWiki:Grouppage-sysop}}|다른 관리ìž�]]ì—�게 차단ì—� ëŒ
 'yourtext'                         => '당신� 편집',
 'storedversion'                    => '현재 문서',
 'nonunicodebrowser'                => "'''주�: 당신� 웹 브�우저가 유니코드를 완벽하게 지�하지 않습니다. 몇몇 문�가 16진수 코드로 나타날 수 있습니다.'''",
-'editingold'                       => '<strong>경고:
+'editingold'                       => "'''경고:
 지금 옛날 버전� 문서를 고치고 있습니다.
-�것� 저장하면 최근� 편집� 부분� 사�질 수 있습니다.</strong>',
+�것� 저장하면 최근� 편집� 부분� 사�질 수 있습니다.'''",
 'yourdiff'                         => '차�',
-'copyrightwarning'                 => "{{SITENAME}}�서� 모든 기여는 $2 ��센스� 따� 배��다는 �� 유�해 주세요($1�서 �세한 사항� �어 주세요). 만약 �� 대해 찬성하지 않는다면, 문서를 저장하지 �아 주세요.<br />
+'copyrightwarning'                 => "{{SITENAME}}�서� 모든 기여는 $2 ��센스� 따� 배��다는 �� 유�해 주세요($1�서 �세한 사항� �어 주세요). 만약 �� 대해 ��하지 않는다면, 문서를 저장하지 �아 주세요.<br />
 �한 당신� 기여는 �접 작성했거나, �는 �블릭 �메�과 같� �유 문서�서 가져왔다는 것� 보�해야 합니다.
 '''저작권� 있는 내용� 허가 없� 저장하지 마세요!'''",
-'copyrightwarning2'                => "{{SITENAME}}�서� 모든 기여는 다른 사용�가 편집, 수정, 삭제할 수 있다는 �� 유�해 주세요. 만약 �� 대해 찬성하지 않는다면, 문서를 저장하지 �아 주세요.<br />
-�한 당신� 기여는 �접 작성했거나, �는 �블릭 �메�과 같� �유 문서�서 가져왔다는 것� 보�해야 합니다($1�서 �세한 사항� �어 주세요).
+'copyrightwarning2'                => "{{SITENAME}}�서� 모든 기여는 다른 사용�가 편집, 수정, 삭제할 수 있다는 �� 유�해 주세요. 만약 �� 대해 ��하지 않는다면, 문서를 저장하지 �아 주세요.<br />
+�한 당신� 기여는 �접 작성했거나, �는 �블릭 �메�과 같� �유 문서�서 가져왔다는 것� 보�해야 합니다 ($1�서 �세한 사항� �어 주세요).
 '''저작권� 있는 내용� 허가 없� 저장하지 마세요!'''",
 'longpagewarning'                  => "'''주�: � 문서� 용량� $1킬로바�트입니다. 몇몇 웹 브�우저�서는 32킬로바�트 ��� 문서를 편집할 때 문제가 발�할 수 있습니다. 만약� 경우를 대비하여, 문서를 여러 문단으로 나누어서 편집할 수 있습니다.'''",
 'longpageerror'                    => "'''오류: 문서� �기가 $1킬로바�트로, 최대 가능한 �기� $2킬로바�트보다 �니다. 저장할 수 없습니다.'''",
-'readonlywarning'                  => "'''주�: ��터베�스가 관리를 위해 잠겨 있습니다. 따�서 문서를 편집한 내용� 지금 저장할 수 없습니다. 편집 내용� �단 다른 곳� 저장한 후, 나중� 다시 시�해 주세요.'''",
+'readonlywarning'                  => "'''주�: ��터베�스가 관리를 위해 잠겨 있습니다. 따�서 문서를 편집한 내용� 지금 저장할 수 없습니다.
+편집 내용� 복사 붙여넣기 등� 사용하여 �단 다른 곳� 저장한 후, 나중� 다시 시�해 주세요.'''
+
+잠근 관리�가 남긴 설명� 다�과 같습니다: $1",
 'protectedpagewarning'             => "'''경고: � 문서는 관리�만� 편집할 수 있�� 보호�어 있습니다.'''",
 'semiprotectedpagewarning'         => "'''안내:''' � 문서는 가입한지 3�� 지난 사용�만� 편집할 수 있�� 잠겨 있습니다.",
 'cascadeprotectedwarning'          => "'''주�''': � 문서는 ��으로 잠겨 있어 관리�만 편집할 수 있습니다. 연쇄� 보호가 걸린 다�� 문서�서 � 문서를 사용하고 있습니다:",
-'titleprotectedwarning'            => '<strong>주�: � 문서는 잠겨 있어, �부 사용�만� �성할 수 있습니다.</strong>',
+'titleprotectedwarning'            => "'''경고: � 문서는 잠겨 있어, 문서를 �성하려면 [[Special:ListGroupRights|특정 권한]]� 필요합니다.'''",
 'templatesused'                    => '� 문서�서 사용한 틀:',
 'templatesusedpreview'             => '� 미리 보기�서 사용하고 있는 틀:',
 'templatesusedsection'             => '� 부분�서 사용하고 있는 틀:',
@@ -639,12 +847,31 @@ $1, ë˜�는 [[{{MediaWiki:Grouppage-sysop}}|다른 관리ìž�]]ì—�게 차단ì—� ëŒ
 
 � 문서를 계� 편집하는 것� �합한 것�지 확�해주세요.
 과거 삭제 기�� 다�과 같습니다:",
+'deleted-notice'                   => '� 문서는 삭제�어 있습니다.
+� 문서� 삭제 기�� 다�과 같습니다.',
+'deletelog-fulllog'                => '전체 기� 보기',
+'edit-hook-aborted'                => '훅� �해 편집� 중단�었습니다.
+아무런 설명� 주어지지 않았습니다.',
+'edit-gone-missing'                => '문서를 저장하지 못했습니다.
+문서가 삭제�었� 수 있습니다.',
+'edit-conflict'                    => '편집 충�.',
+'edit-no-change'                   => '문서� 아무런 변화가 없기 때문�, 당신� 편집� 무시�었습니다.',
+'edit-already-exists'              => '새 문서를 만들 수 없습니다.
+문서가 �미 존재합니다.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'  => '경고: � 문서는 지나치게 많� �린 파서 함수를 호출하고 있습니다.
-
-$2보다 �어야 하지만 지금� $1번 입니다.',
-'expensive-parserfunction-category' => '�린 파서 함수 호출� 너무 많� 하는 문서',
+'expensive-parserfunction-warning'        => '경고: � 문서는 너무 많� 파서 함수를 �함하고 있습니다.
+
+현재 $1개� 함수가 �함�어 있으며, 파서 함수는 $2개 �하로 하는 것� 좋습니다.',
+'expensive-parserfunction-category'       => '�린 파서 함수 호출� 너무 많� 하는 문서',
+'post-expand-template-inclusion-warning'  => '경고: 틀 �함 �기가 너무 �니다.
+�부 틀� �함�지 않� 수 있습니다.',
+'post-expand-template-inclusion-category' => '틀 �함 �기가 지나치게 � 문서� 목�',
+'post-expand-template-argument-warning'   => '경고: � 문서는 전개 후 �기가 너무 � 틀 변수가 하나 �� �함�어 있습니다.
+� 변수들� �략�었습니다.',
+'post-expand-template-argument-category'  => '�략� 틀 변수를 �함한 문서',
+'parser-template-loop-warning'            => '틀 회귀 발견: [[$1]]',
+'parser-template-recursion-depth-warning' => '틀 반복 횟수 제한� 초과함($1)',
 
 # "Undo" feature
 'undo-success' => '� 편집� ��리려면 아래� 변경�는 사항� 확�한 후 저장해주세요.',
@@ -659,27 +886,27 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 차단 �유는 다�과 같습니다: $2",
 
 # History pages
-'viewpagelogs'        => '� 문서� 기� 보기',
-'nohistory'           => '� 문서는 편집 역사가 없습니다.',
-'revnotfound'         => '버전 없�',
-'revnotfoundtext'     => '문서� 해당 버전� 찾지 못했습니다. 접� URL� 확�해 주세요.',
-'currentrev'          => '현재 �',
-'revisionasof'        => '$1 �',
-'revision-info'       => '$2 사용�� $1 버전',
-'previousrevision'    => '� �전 �',
-'nextrevision'        => '다� � →',
-'currentrevisionlink' => '현재 �',
-'cur'                 => '현재',
-'next'                => '다�',
-'last'                => '�전',
-'page_first'          => '처�',
-'page_last'           => '마지막',
-'histlegend'          => '비�하려는 �들� 선�한 아래 버튼� 누르세요.<br />설명: (현재) = 현재 �과� 차�, (�전) = 바로 �전 �과� 차�, 잔글 = 사소한 편집',
-'deletedrev'          => '[삭제�]',
-'histfirst'           => '처�',
-'histlast'            => '마지막',
-'historysize'         => '($1 바�트)',
-'historyempty'        => '(비었�)',
+'viewpagelogs'           => '� 문서� 기� 보기',
+'nohistory'              => '� 문서는 편집 역사가 없습니다.',
+'currentrev'             => '현재 �',
+'currentrev-asof'        => '$1 현재 �',
+'revisionasof'           => '$1 �',
+'revision-info'          => '$2 사용�� $1 버전', # Additionally available: $3: revision id
+'previousrevision'       => '� �전 �',
+'nextrevision'           => '다� � →',
+'currentrevisionlink'    => '현재 �',
+'cur'                    => '현재',
+'next'                   => '다�',
+'last'                   => '�전',
+'page_first'             => '처�',
+'page_last'              => '마지막',
+'histlegend'             => '비�하려는 �들� 선�한 아래 버튼� 누르세요.<br />설명: (현재) = 현재 �과� 차�, (�전) = 바로 �전 �과� 차�, 잔글 = 사소한 편집',
+'history-fieldset-title' => '문서� 변경 내력 찾기',
+'deletedrev'             => '[삭제�]',
+'histfirst'              => '처�',
+'histlast'               => '마지막',
+'historysize'            => '($1 바�트)',
+'historyempty'           => '(비었�)',
 
 # Revision feed
 'history-feed-title'          => '편집 역사',
@@ -690,164 +917,287 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 [[Special:Search|위키 검색 기능]]� �용해 관련 문서를 찾아보세요.',
 
 # Revision deletion
-'rev-deleted-comment'    => '(편집 요약 삭제�)',
-'rev-deleted-user'       => '(계정 �름 삭제�)',
-'rev-deleted-event'      => '(로그 삭제�)',
-'rev-delundel'           => '보�기/숨기기',
-'revisiondelete'         => '버전 삭제/복구',
-'revdelete-selected'     => "'''[[:$1]]� 선�� �:'''",
-'revdelete-legend'       => '보�기 제한� 설정',
-'revdelete-hide-text'    => '�� 내용� 숨기기',
-'revdelete-hide-comment' => '편집 요약� 숨기기',
-'revdelete-hide-user'    => '편집�� 계정 �름/IP를 숨기기',
-'revdelete-suppress'     => '문서 내용� 관리��게� 보�지 않게 숨기기',
-'revdelete-hide-image'   => '파�� 숨기기',
-'revdelete-unsuppress'   => '복구� �� 대한 제한� 해제',
-'revdelete-submit'       => '선�� �� �용',
-'revdelete-logentry'     => '[[$1]]� �� 보�기 설정� 변경함',
-'logdelete-logentry'     => '[[$1]]� 로그 보�기 설정� 변경함',
-'revdelete-success'      => "'''�� 보�기 설정� 성공�으로 변경�었습니다.'''",
-'logdelete-success'      => "'''기�� 보�기 설정� 성공�으로 변경�었습니다.'''",
-'revdel-restore'         => '보�기 설정 변경',
-'pagehist'               => '문서 역사',
-'deletedhist'            => '삭제� 역사',
-'revdelete-content'      => 'ë‚´ìš©',
-'revdelete-summary'      => '편집 요약',
-'revdelete-uname'        => '사용� �름',
-'revdelete-restricted'   => '관리��게 제한� �용함',
-'revdelete-hid'          => '$1� 숨김',
-'revdelete-unhid'        => '$1� 숨김 해제함',
-'revdelete-log-message'  => '$2개� �� 대해 $1',
+'rev-deleted-comment'         => '(편집 요약 삭제�)',
+'rev-deleted-user'            => '(계정 �름 삭제�)',
+'rev-deleted-event'           => '(로그 삭제�)',
+'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
+� 문서� 편집� 문서 역사�서 제거�었습니다.
+[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} 삭제 기�]�서 �세한 내용� 볼 수 있습니다..</div>',
+'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">
+� 문서� 편집� 문서 역사�서 제거�었습니다.
+당신� {{SITENAME}}� 관리�로서, 삭제� 편집� 볼 수 있습니다;
+[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} 삭제 기�]�서 �세한 내용� 볼 수 있습니다.</div>',
+'rev-delundel'                => '보�기/숨기기',
+'revisiondelete'              => '버전 삭제/복구',
+'revdelete-nooldid-title'     => '대� �� 잘못�었습니다.',
+'revdelete-nooldid-text'      => '당신� � 기능� 수행할 특정 �� 제시하지 않았거나, 해당 �� 존재하지 않습니다. �는 현재 �� 숨기려 하고 있� 수� 있습니다.',
+'revdelete-selected'          => "'''[[:$1]]� 선�� �:'''",
+'logdelete-selected'          => "'''선�한 로그:'''",
+'revdelete-text'              => "'''삭제� �과 기�� 문서 역사와 기�� 계� 나타나지만, 내용� 공개�지 않� 것입니다.'''
+
+{{SITENAME}}� 다른 관리�는 다른 제한� 설정�어 있지 않는 한, 숨겨진 내용� 볼 수 있고, 같� �구를 �용해 복구할 수 있습니다.",
+'revdelete-legend'            => '보�기 제한� 설정',
+'revdelete-hide-text'         => '�� 내용� 숨기기',
+'revdelete-hide-name'         => '로그 내용과 대�� 숨기기',
+'revdelete-hide-comment'      => '편집 요약� 숨기기',
+'revdelete-hide-user'         => '편집�� 계정 �름/IP를 숨기기',
+'revdelete-hide-restricted'   => '관리��게� � 제한� �용하고 � �터페�스를 잠금',
+'revdelete-suppress'          => '문서 내용� 관리��게� 보�지 않게 숨기기',
+'revdelete-hide-image'        => '파�� 숨기기',
+'revdelete-unsuppress'        => '복구� �� 대한 제한� 해제',
+'revdelete-log'               => '�유:',
+'revdelete-submit'            => '선�� �� �용',
+'revdelete-logentry'          => '[[$1]]� �� 보�기 설정� 변경함',
+'logdelete-logentry'          => '[[$1]]� 로그 보�기 설정� 변경함',
+'revdelete-success'           => "'''�� 보�기 설정� 성공�으로 변경�었습니다.'''",
+'logdelete-success'           => "'''기�� 보�기 설정� 성공�으로 변경�었습니다.'''",
+'revdel-restore'              => '보�기 설정 변경',
+'pagehist'                    => '문서 역사',
+'deletedhist'                 => '삭제� 역사',
+'revdelete-content'           => 'ë‚´ìš©',
+'revdelete-summary'           => '편집 요약',
+'revdelete-uname'             => '사용� �름',
+'revdelete-restricted'        => '관리��게 제한� �용함',
+'revdelete-unrestricted'      => '관리�� 대한 제한� 해제함',
+'revdelete-hid'               => '$1� 숨김',
+'revdelete-unhid'             => '$1� 숨김 해제함',
+'revdelete-log-message'       => '$2개� �� 대해 $1',
+'logdelete-log-message'       => '$2개� 로그� 대해 $1',
 
 # Suppression log
-'suppressionlog' => '숨기기 기�',
+'suppressionlog'     => '숨기기 기�',
+'suppressionlogtext' => '다�� 관리�로부터 숨겨진 내용� 대한 삭제, 차단 기�입니다.
+현재 차단� 사용� 목�� 보시려면 [[Special:IPBlockList|차단� 사용� 목�]]� 참조하십시오.',
 
 # History merging
-'mergehistory'             => '문서 역사 합치기',
-'mergehistory-box'         => '� 문서� 역사 합치기:',
-'mergehistory-list'        => '병합 가능한 문서 역사',
-'mergehistory-go'          => '합칠 수 있는 편집 보기',
-'mergehistory-submit'      => '문서 역사 합치기',
-'mergehistory-empty'       => '합칠 수 있는 �� 없습니다.',
-'mergehistory-success'     => '[[:$1]]� $3개� �� [[:$2]]� 성공�으로 합�졌습니다.',
-'mergehistory-autocomment' => '[[:$1]] 문서를 [[:$2]]로 병합함',
-'mergehistory-comment'     => '[[:$1]] 문서를 [[:$2]] 문서와 합침: $3',
+'mergehistory'                     => '문서 역사 합치기',
+'mergehistory-header'              => '� 문서는 한 문서�서 다른 문서로 문서 역사를 합치게 할 것입니다.
+�전 문서를 역사� 기�으로 계� 남겨둘 것�지 확�해주세요.',
+'mergehistory-box'                 => '� 문서� 역사 합치기:',
+'mergehistory-from'                => '�본 문서 �름:',
+'mergehistory-into'                => '새 문서 �름:',
+'mergehistory-list'                => '병합 가능한 문서 역사',
+'mergehistory-merge'               => '[[:$1]] 문서� 다� �� [[:$2]] 문서로 병합� 수 있습니다.
+병합하려는 �과 그 �전� �� 선�하시려면 �디오 버튼� �용해주세요.
+둘러보기 ��를 �용하는 것� � 문서를 초기화시킬 것입니다.',
+'mergehistory-go'                  => '합칠 수 있는 편집 보기',
+'mergehistory-submit'              => '문서 역사 합치기',
+'mergehistory-empty'               => '합칠 수 있는 �� 없습니다.',
+'mergehistory-success'             => '[[:$1]]� $3개� �� [[:$2]]� 성공�으로 합�졌습니다.',
+'mergehistory-fail'                => '문서 역사 합치기 명령� 수행할 수 없습니다. 문서와 시간 변수를 다시 확�하십시오.',
+'mergehistory-no-source'           => '�본 문서 $1� 존재하지 않습니다.',
+'mergehistory-no-destination'      => '대� 문서 $1� 존재하지 않습니다.',
+'mergehistory-invalid-source'      => '�본 문서 �름�는 반드시 유효한 제목� 입력해야 합니다.',
+'mergehistory-invalid-destination' => '대� 문서 �름�는 반드시 유효한 제목� 입력해야 합니다.',
+'mergehistory-autocomment'         => '[[:$1]] 문서를 [[:$2]]로 병합함',
+'mergehistory-comment'             => '[[:$1]] 문서를 [[:$2]] 문서와 합침: $3',
+'mergehistory-same-destination'    => '�본 문서 �름과 새 문서 �름� 같� 수 없습니다.',
 
 # Merge log
-'mergelog'    => '합병 기�',
-'revertmerge' => '병합 해제',
+'mergelog'           => '합병 기�',
+'pagemerge-logentry' => '[[$1]]� [[$2]]� 병합 ($3�� 위로 옮겨�)',
+'revertmerge'        => '병합 해제',
+'mergelogpagetext'   => '다�� 한 문서� 역사를 다른 문서� 역사와 합친 최근 기�입니다.',
 
 # Diffs
-'history-title'           => '"$1" 문서� 변경 내력',
+'history-title'           => '‘$1’ 문서� 변경 내력',
 'difference'              => '(버전 사�� 차�)',
 'lineno'                  => '$1번째 줄:',
 'compareselectedversions' => '선�� �들� 비�하기',
+'visualcomparison'        => '시�� 비�',
+'wikicodecomparison'      => '위키�스트 비�',
 'editundo'                => '편집 취소',
 'diff-multi'              => '(중간 $1개� 편집� 숨겨�)',
+'diff-movedto'            => '$1(으)로 ��',
+'diff-styleadded'         => '$1 스타� 추가�',
+'diff-added'              => '$1 추가�',
+'diff-changedto'          => '$1(으)로 변경',
+'diff-movedoutof'         => '$1 밖으로 ��',
+'diff-styleremoved'       => '$1 스타� 제거�',
+'diff-removed'            => '$1 제거�',
+'diff-changedfrom'        => '$1�서 바꿈',
+'diff-src'                => '출처',
+'diff-withdestination'    => '$1 대�',
+'diff-with'               => '&#32;$1 $2와 함께',
+'diff-with-final'         => '&#32;그리고 $1 $2',
+'diff-width'              => '너비',
+'diff-height'             => '높�',
+'diff-p'                  => "'''문단'''",
+'diff-blockquote'         => "'''�용'''",
+'diff-h1'                 => "'''1단계 제목'''",
+'diff-h2'                 => "'''2단계 제목'''",
+'diff-h3'                 => "'''3단계 제목'''",
+'diff-h4'                 => "'''4단계 제목'''",
+'diff-h5'                 => '5단계 제목',
+'diff-pre'                => "'''미리 보기 블�'''",
+'diff-div'                => "'''구역'''",
+'diff-ul'                 => "'''순서 없는 목�'''",
+'diff-ol'                 => "'''순서 있는 목�'''",
+'diff-li'                 => "'''목�'''",
+'diff-table'              => "'''표'''",
+'diff-tbody'              => "'''표� 내용'''",
+'diff-tr'                 => "'''í–‰'''",
+'diff-td'                 => "'''칸'''",
+'diff-th'                 => "'''제목'''",
+'diff-br'                 => "'''줄바꿈'''",
+'diff-hr'                 => "'''가로줄'''",
+'diff-code'               => "'''컴퓨터 코드 블�'''",
+'diff-dl'                 => "'''정� 목�'''",
+'diff-dt'                 => "'''정�할 용어'''",
+'diff-dd'                 => "'''정�'''",
+'diff-input'              => "'''입력 ��'''",
+'diff-form'               => "'''양�'''",
+'diff-img'                => "'''그림'''",
+'diff-span'               => "'''span''' 태그",
+'diff-a'                  => "'''��'''",
+'diff-i'                  => "'''기울임꼴'''",
+'diff-b'                  => "'''굵� 글씨'''",
+'diff-strong'             => "'''굵� 글씨'''",
+'diff-em'                 => "'''ê°•ì¡°'''",
+'diff-font'               => "'''글꼴'''",
+'diff-big'                => "'''� 글씨'''",
+'diff-del'                => "'''삭제�'''",
+'diff-tt'                 => "'''고정� 글꼴'''",
+'diff-sub'                => "'''아랫첨�'''",
+'diff-sup'                => "'''윗첨�'''",
+'diff-strike'             => "'''삭제선'''",
 
 # Search results
-'searchresults'            => '검색 결과',
-'searchresulttext'         => '{{SITENAME}}� 찾기 기능� 대한 �세한 정보는 [[{{MediaWiki:Helppage}}|{{int:help}}]] 문서를 참고해주세요.',
-'searchsubtitle'           => "'''[[:$1]]''' 문서를 검색하고 있습니다. ([[Special:Prefixindex/$1|�름� ‘$1’(으)로 시작하는 문서 목�]] | [[Special:WhatLinksHere/$1|‘$1’ 문서를 가리키는 문서 목�]])",
-'searchsubtitleinvalid'    => "검색 단어 '''$1'''",
-'noexactmatch'             => "'''$1 문서가 없습니다.''' 문서를 [[:$1|만들 수]] 있습니다.",
-'noexactmatch-nocreate'    => "'''\"\$1\" 문서가 존재하지 않습니다.'''",
-'titlematches'             => '문서 제목 �치',
-'notitlematches'           => '해당하는 제목 없�',
-'textmatches'              => '문서 내용 �치',
-'notextmatches'            => '해당하는 문서 없�',
-'prevn'                    => '�전 $1개',
-'nextn'                    => '다� $1개',
-'viewprevnext'             => '보기: ($1) ($2) ($3).',
-'search-result-size'       => '$1 ($2개 단어)',
-'search-result-score'      => '유사�: $1%',
-'search-redirect'          => '($1로 넘겨줌)',
-'search-suggest'           => '$1 문서를 찾고 계신가요?',
-'search-interwiki-caption' => '�매 프로�트',
-'search-interwiki-default' => '$1 ê²°ê³¼:',
-'search-interwiki-more'    => '(� 보기)',
-'mwsuggest-disable'        => 'AJAX 추천 기능 �기',
-'searchall'                => '모�',
-'showingresults'           => '<strong>$2</strong>번 부터 <strong>$1</strong>개� 결과입니다.',
-'showingresultsnum'        => "'''$2'''번 부터 '''$3'''개� 결과입니다.",
-'nonefound'                => "'''참고''': 몇개� �름공간만 기본 검색 범위입니다. 토론�나 틀 등� 모든 �료를 검색하기 위해서는 접�어로 '''all:''' 어떤 �름공간� 위해서는 접�어로 그 �름공간� 쓸 수 있습니다.",
-'powersearch'              => '찾기',
-'powersearch-legend'       => '고급 검색',
-'powersearch-ns'           => '다�� �름공간�서 찾기:',
-'powersearch-redir'        => '넘겨주기 목�',
-'powersearch-field'        => '검색',
-'search-external'          => '외부 검색',
-'searchdisabled'           => '{{SITENAME}} 검색 기능� 비활성화�어 있습니다. 기능� 작�하지 않는 �안�는 구글(Google)� �용해 검색할 수 있습니다. 검색 엔진� 내용� 최근 것� 아� 수 있다는 �� 주�해주세요.',
+'searchresults'                    => '검색 결과',
+'searchresults-title'              => '"$1"� 대한 검색 결과',
+'searchresulttext'                 => '{{SITENAME}}� 찾기 기능� 대한 �세한 정보는 [[{{MediaWiki:Helppage}}|{{int:help}}]] 문서를 참고해주세요.',
+'searchsubtitle'                   => "'''[[:$1]]''' 문서를 검색하고 있습니다. ([[Special:Prefixindex/$1|�름� ‘$1’(으)로 시작하는 문서 목�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|‘$1’ 문서를 가리키는 문서 목�]])",
+'searchsubtitleinvalid'            => "검색 단어 '''$1'''",
+'noexactmatch'                     => "'''$1 문서가 없습니다.''' 문서를 [[:$1|만들 수]] 있습니다.",
+'noexactmatch-nocreate'            => "'''\"\$1\" 문서가 존재하지 않습니다.'''",
+'toomanymatches'                   => '�치하는 결과가 너무 많습니다. 다른 검색어를 입력해주세요.',
+'titlematches'                     => '문서 제목 �치',
+'notitlematches'                   => '해당하는 제목 없�',
+'textmatches'                      => '문서 내용 �치',
+'notextmatches'                    => '해당하는 문서 없�',
+'prevn'                            => '�전 $1개',
+'nextn'                            => '다� $1개',
+'viewprevnext'                     => '보기: ($1) ($2) ($3).',
+'searchmenu-legend'                => '검색 설정',
+'searchmenu-exists'                => "'''� 위키� \"[[\$1]]\"� �름� 가진 문서가 있습니다.'''",
+'searchmenu-new'                   => "'''� 위키� \"[[:\$1]]\" 문서를 만드십시오!'''",
+'searchhelp-url'                   => 'Help:목차',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|� 접�어로 시작하는 문서 찾기]]',
+'searchprofile-articles'           => '�반 문서',
+'searchprofile-articles-and-proj'  => '�반 � 프로�트 문서',
+'searchprofile-project'            => '프로�트 문서',
+'searchprofile-images'             => '파�',
+'searchprofile-everything'         => '모든 문서 검색',
+'searchprofile-advanced'           => '고급 검색',
+'searchprofile-articles-tooltip'   => '$1�서 찾기',
+'searchprofile-project-tooltip'    => '$1�서 찾기',
+'searchprofile-images-tooltip'     => '파� 찾기',
+'searchprofile-everything-tooltip' => '토론 문서를 �함한 모든 문서 찾기',
+'searchprofile-advanced-tooltip'   => '다� 설정� �름공간�서 찾기',
+'prefs-search-nsdefault'           => '다�� 기본으로 검색:',
+'prefs-search-nscustom'            => '다� �름공간�서 찾기:',
+'search-result-size'               => '$1 ($2개 단어)',
+'search-result-score'              => '유사�: $1%',
+'search-redirect'                  => '($1�서 넘어옴)',
+'search-section'                   => '($1 문단)',
+'search-suggest'                   => '$1 문서를 찾고 계신가요?',
+'search-interwiki-caption'         => '�매 프로�트',
+'search-interwiki-default'         => '$1 ê²°ê³¼:',
+'search-interwiki-more'            => '(� 보기)',
+'search-mwsuggest-enabled'         => '검색어 제안 기능 있�',
+'search-mwsuggest-disabled'        => '검색어 제한 없�',
+'search-relatedarticle'            => '관련',
+'mwsuggest-disable'                => 'AJAX 추천 기능 �기',
+'searchrelated'                    => '관련',
+'searchall'                        => '모�',
+'showingresults'                   => '<strong>$2</strong>번 부터 <strong>$1</strong>개� 결과입니다.',
+'showingresultsnum'                => "'''$2'''번 부터 '''$3'''개� 결과입니다.",
+'showingresultstotal'              => "'''$3'''개� 결과 중 {{PLURAL:$4|'''$1'''|'''$1 - $2'''}}",
+'nonefound'                        => "'''참고''': 몇개� �름공간만 기본 검색 범위입니다. 토론�나 틀 등� 모든 �료를 검색하기 위해서는 접�어로 '''all:''' 어떤 �름공간� 위해서는 접�어로 그 �름공간� 쓸 수 있습니다.",
+'search-nonefound'                 => '쿼리� 맞는 결과가 없습니다.',
+'powersearch'                      => '찾기',
+'powersearch-legend'               => '고급 검색',
+'powersearch-ns'                   => '다�� �름공간�서 찾기:',
+'powersearch-redir'                => '넘겨주기 목�',
+'powersearch-field'                => '검색',
+'search-external'                  => '외부 검색',
+'searchdisabled'                   => '{{SITENAME}} 검색 기능� 비활성화�어 있습니다. 기능� 작�하지 않는 �안�는 구글(Google)� �용해 검색할 수 있습니다. 검색 엔진� 내용� 최근 것� 아� 수 있다는 �� 주�해주세요.',
 
 # Preferences page
-'preferences'              => '사용� 환경 설정',
-'mypreferences'            => '사용� 환경 설정',
-'prefs-edits'              => '편집 횟수:',
-'prefsnologin'             => '로그�하지 않�',
-'prefsnologintext'         => '사용� 환경 설정� 바꾸려면 먼저 <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 로그�]</span>해야 합니다.',
-'prefsreset'               => '사용� 환경 설정� 기본값으로 ��렸습니다.',
-'qbsettings'               => '빨리가기 맞춤',
-'qbsettings-none'          => '없�',
-'qbsettings-fixedleft'     => '왼쪽 고정',
-'qbsettings-fixedright'    => '오른쪽 고정',
-'qbsettings-floatingleft'  => '왼쪽 유�',
-'qbsettings-floatingright' => '오른쪽 유�',
-'changepassword'           => '암호 바꾸기',
-'skin'                     => '스킨',
-'math'                     => '수�',
-'dateformat'               => '날짜 형�',
-'datedefault'              => '기본값',
-'datetime'                 => '날짜와 시�',
-'math_failure'             => '해� 실패',
-'math_unknown_error'       => '알 수 없는 오류',
-'math_unknown_function'    => '알 수 없는 함수',
-'math_lexing_error'        => '어휘 오류',
-'math_syntax_error'        => '구문 오류',
-'math_image_error'         => 'PNG 변환 실패 - latex, dvips, gs, convert가 올바르게 설치�어 있는지 확�해 주세요.',
-'math_bad_tmpdir'          => '수�� 임시 ��� 저장하거나 ��를 만들 수 없습니다.',
-'math_bad_output'          => '수�� 출력 ��� 저장하거나 ��를 만들 수 없습니다.',
-'math_notexvc'             => '실행할 수 있는 texvc� 없습니다. 설정� 위해 math/README를 �어 주세요.',
-'prefs-personal'           => '사용� 정보',
-'prefs-rc'                 => '최근 바뀜',
-'prefs-watchlist'          => '주시문서 목�',
-'prefs-watchlist-days'     => '주시문서 목��서 보여줄 날짜 수:',
-'prefs-watchlist-edits'    => '주시문서 목�� 보�는 편집 갯수:',
-'prefs-misc'               => '기타',
-'saveprefs'                => '저장',
-'resetprefs'               => '저장하지 않� 설정 ��리기',
-'oldpassword'              => '예전 암호:',
-'newpassword'              => '새 암호:',
-'retypenew'                => '새 암호 확�:',
-'textboxsize'              => '편집�� �기',
-'rows'                     => '줄 수:',
-'columns'                  => 'ì—´:',
-'searchresultshead'        => '찾기',
-'resultsperpage'           => '쪽마다 보�는 결과 수:',
-'contextlines'             => '결과마다 보�는 줄 수:',
-'contextchars'             => '� 줄� 보�는 글 수:',
-'stub-threshold'           => '��를 <a href="#" class="stub">토막글 ��</a>로 표시할 문서 �기(바�트 수):',
-'recentchangesdays'        => '최근 바뀜� 표시할 날짜 수:',
-'recentchangescount'       => '최근 바뀜, 역사, 기� 보기� 표시할 문서 수:',
-'savedprefs'               => '설정� 저장했습니다.',
-'timezonelegend'           => '시간대',
-'timezonetext'             => '¹현지 시�과 서버 시�(UTC) 사�� 시차를 � 주세요.',
-'localtime'                => '현지 시�',
-'timezoneoffset'           => '시차¹',
-'servertime'               => '서버 시�',
-'guesstimezone'            => '웹 브�우저 설정�서 가져오기',
-'allowemail'               => '다른 사용�로부터� �메� 허용',
-'prefs-searchoptions'      => '검색 설정',
-'prefs-namespaces'         => '네임스페�스',
-'defaultns'                => '기본으로 다�� �름공간�서 찾기:',
-'default'                  => '기본값',
-'files'                    => '파�',
+'preferences'               => '사용� 환경 설정',
+'mypreferences'             => '사용� 환경 설정',
+'prefs-edits'               => '편집 횟수:',
+'prefsnologin'              => '로그�하지 않�',
+'prefsnologintext'          => '사용� 환경 설정� 바꾸려면 먼저 <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 로그�]</span>해야 합니다.',
+'prefsreset'                => '사용� 환경 설정� 기본값으로 ��렸습니다.',
+'qbsettings'                => '빨리가기 맞춤',
+'qbsettings-none'           => '없�',
+'qbsettings-fixedleft'      => '왼쪽 고정',
+'qbsettings-fixedright'     => '오른쪽 고정',
+'qbsettings-floatingleft'   => '왼쪽 유�',
+'qbsettings-floatingright'  => '오른쪽 유�',
+'changepassword'            => '비밀번호 바꾸기',
+'skin'                      => '스킨',
+'skin-preview'              => '미리 보기',
+'math'                      => '수�',
+'dateformat'                => '날짜 형�',
+'datedefault'               => '기본값',
+'datetime'                  => '날짜와 시�',
+'math_failure'              => '해� 실패',
+'math_unknown_error'        => '알 수 없는 오류',
+'math_unknown_function'     => '알 수 없는 함수',
+'math_lexing_error'         => '어휘 오류',
+'math_syntax_error'         => '구문 오류',
+'math_image_error'          => 'PNG 변환 실패 - latex, dvips, gs, convert가 올바르게 설치�어 있는지 확�해 주세요.',
+'math_bad_tmpdir'           => '수�� 임시 ��� 저장하거나 ��를 만들 수 없습니다.',
+'math_bad_output'           => '수�� 출력 ��� 저장하거나 ��를 만들 수 없습니다.',
+'math_notexvc'              => '실행할 수 있는 texvc� 없습니다. 설정� 위해 math/README를 �어 주세요.',
+'prefs-personal'            => '사용� 정보',
+'prefs-rc'                  => '최근 바뀜',
+'prefs-watchlist'           => '주시문서 목�',
+'prefs-watchlist-days'      => '주시문서 목��서 보여줄 날짜 수:',
+'prefs-watchlist-days-max'  => '(최대 7�)',
+'prefs-watchlist-edits'     => '주시문서 목�� 보�는 편집 갯수:',
+'prefs-watchlist-edits-max' => '(최대 1000개)',
+'prefs-misc'                => '기타',
+'prefs-resetpass'           => '비밀번호 바꾸기',
+'saveprefs'                 => '저장',
+'resetprefs'                => '저장하지 않� 설정 ��리기',
+'textboxsize'               => '편집�� �기',
+'prefs-edit-boxsize'        => '편집 창� �기',
+'rows'                      => '줄 수:',
+'columns'                   => 'ì—´:',
+'searchresultshead'         => '찾기',
+'resultsperpage'            => '쪽마다 보�는 결과 수:',
+'contextlines'              => '결과마다 보�는 줄 수:',
+'contextchars'              => '� 줄� 보�는 글 수:',
+'stub-threshold'            => '��를 <a href="#" class="stub">토막글 ��</a>로 표시할 문서 �기(바�트 수):',
+'recentchangesdays'         => '최근 바뀜� 표시할 날짜 수:',
+'recentchangesdays-max'     => '(최대 $1�)',
+'recentchangescount'        => '최근 바뀜, 문서 역사, 기� 보기� 기본으로 표시할 문서 수:',
+'savedprefs'                => '설정� 저장했습니다.',
+'timezonelegend'            => '시간대',
+'timezonetext'              => '¹현지 시�과 서버 시�(UTC) 사�� 시차를 � 주세요.',
+'localtime'                 => '현지 시�:',
+'timezoneselect'            => '시간대:',
+'timezoneuseserverdefault'  => '서버 기본값� 사용',
+'timezoneuseoffset'         => '기타 (시차를 입력해주세요)',
+'timezoneoffset'            => '시차¹:',
+'servertime'                => '서버 시�:',
+'guesstimezone'             => '웹 브�우저 설정�서 가져오기',
+'allowemail'                => '다른 사용�로부터� �메� 허용',
+'prefs-searchoptions'       => '검색 설정',
+'prefs-namespaces'          => '�름공간',
+'defaultns'                 => '기본으로 다�� �름공간�서 찾기:',
+'default'                   => '기본값',
+'files'                     => '파�',
 
 # User rights
 'userrights'                  => '사용� 권한 관리', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => '사용� 권한 관리',
 'userrights-user-editname'    => '계정 �름:',
 'editusergroup'               => '사용� 그룹 편집',
-'editinguser'                 => "'''[[User:$1|$1]]'''([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) 사용�� 권한 변경",
+'editinguser'                 => "'''[[User:$1|$1]]'''([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) 사용�� 권한 변경",
 'userrights-editusergroup'    => '사용� 그룹 편집',
 'saveusergroups'              => '사용� 권한 저장',
 'userrights-groupsmember'     => '현재 권한:',
@@ -885,6 +1235,7 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'grouppage-bot'           => '{{ns:project}}:ë´‡',
 'grouppage-sysop'         => '{{ns:project}}:관리�',
 'grouppage-bureaucrat'    => '{{ns:project}}:뷰로�랫',
+'grouppage-suppress'      => '{{ns:project}}:오버사�트',
 
 # Rights
 'right-read'                 => '문서 �기',
@@ -895,6 +1246,8 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'right-minoredit'            => '사소한 편집 사용 가능',
 'right-move'                 => '문서 ��',
 'right-move-subpages'        => '문서와 하위 문서 ��하기',
+'right-move-rootuserpages'   => '최�위 사용� 문서 ��',
+'right-movefile'             => '파�� 옮기기',
 'right-suppressredirect'     => '문서 ��시� 옛날 �름� 넘겨주기를 남기지 않�',
 'right-upload'               => '파� 올리기',
 'right-reupload'             => '�미 존재하는 파� �어쓰기',
@@ -904,6 +1257,7 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'right-purge'                => '확� 없� 문서� �시를 갱신',
 'right-autoconfirmed'        => '준보호� 문서 편집',
 'right-bot'                  => '봇� 편집으로 취급',
+'right-nominornewtalk'       => '토론 문서를 새로 만들때 사소한 편집 사용 불가능',
 'right-apihighlimits'        => 'API �한 �승',
 'right-writeapi'             => 'API 작성',
 'right-delete'               => '문서 삭제',
@@ -944,9 +1298,46 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'rightslogentry' => '$1� 권한� $2�서 $3으로 변경',
 'rightsnone'     => '(없�)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '� 문서를 �기',
+'action-edit'                 => '문서 편집',
+'action-createpage'           => '문서 �성',
+'action-createtalk'           => '토론 문서 �성하기',
+'action-createaccount'        => '새 계정 만들기',
+'action-minoredit'            => '� 편집� 사소한 편집으로 표시하기',
+'action-move'                 => '� 문서 옮기기',
+'action-move-subpages'        => '하위 문서를 함께 옮길',
+'action-move-rootuserpages'   => '최�위 사용� 문서를 ��할',
+'action-movefile'             => '� 파�� 옮길',
+'action-upload'               => '� 파�� 올리기',
+'action-reupload'             => '�미 존재하는 파� �어쓰기',
+'action-reupload-shared'      => '공용 저장소� 파�� 무시하고 저장할',
+'action-upload_by_url'        => 'URL 주소를 통해 � 파�� 올리기',
+'action-writeapi'             => 'API를 작성할',
+'action-delete'               => '� 문서 삭제하기',
+'action-deleterevision'       => '� �� 삭제',
+'action-deletedhistory'       => '� 문서� 삭제� 기여� 역사 보기',
+'action-browsearchive'        => '삭제� 문서 찾기',
+'action-undelete'             => '� 문서를 복구하기',
+'action-suppressrevision'     => '� 숨겨진 �� 검토하고 복구할',
+'action-suppressionlog'       => '비공개 로그를 볼',
+'action-block'                => '� 사용�를 편집하지 못하�� 차단',
+'action-protect'              => '� 문서� 보호 설정� 변경하기',
+'action-import'               => '다른 위키�서 � 문서를 가져오기',
+'action-importupload'         => '파� 올리기를 통해 문서를 가져올',
+'action-patrol'               => '다른 사용�� 편집� 검토� 것으로 표시하기',
+'action-autopatrol'           => '�신� 편집� 검토� 것으로 표시할',
+'action-unwatchedpages'       => '주시�지 않� 문서� 목�� 볼',
+'action-trackback'            => '트랙백 보내기',
+'action-mergehistory'         => '� 문서� 역사 합치기',
+'action-userrights'           => '모든 사용�� 권한� 조정',
+'action-userrights-interwiki' => '다른 위키� 사용� 권한� 조정',
+'action-siteadmin'            => '��터베�스를 잠그거나 잠금 해제하기',
+
 # Recent changes
 'nchanges'                          => '$1개 바뀜',
 'recentchanges'                     => '최근 바뀜',
+'recentchanges-legend'              => '최근 바뀜 설정',
 'recentchangestext'                 => '위키� 최근 바뀜 내역� 나와 있습니다.',
 'recentchanges-feed-description'    => '위키� 최근 바뀜',
 'rcnote'                            => "다�� $4 $5 까지� '''$2'''��안 바� '''$1'''개� 문서입니다.",
@@ -958,7 +1349,7 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'rcshowhideanons'                   => '�명 사용�를 $1',
 'rcshowhidepatr'                    => '검토� 편집� $1',
 'rcshowhidemine'                    => '내 편집� $1',
-'rclinks'                           => '최근 $2� �안� 바� $1개� 문서를 봅니다.<br />$3',
+'rclinks'                           => '최근 $2�간� $1개 변경 기� 보기<br />$3',
 'diff'                              => '차�',
 'hist'                              => '역사',
 'hide'                              => '숨기기',
@@ -970,10 +1361,12 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'rc_categories'                     => '다� 분류로 제한 (‘|’로 구분)',
 'rc_categories_any'                 => '모�',
 'newsectionsummary'                 => '새 주제: /* $1 */',
+'rc-enhanced-expand'                => '세부 기� 보기 (�바스�립트 필요)',
+'rc-enhanced-hide'                  => '세부기� 숨기기',
 
 # Recent changes linked
 'recentchangeslinked'          => '가리키는 글� 바뀜',
-'recentchangeslinked-title'    => '"$1" 문서� 관련� 문서 바뀜',
+'recentchangeslinked-title'    => '‘$1’ 문서� 관련� 문서 바뀜',
 'recentchangeslinked-noresult' => '여기를 가리키는 글 중�는 주어진 기간 �안� 최근 바뀜� 없습니다.',
 'recentchangeslinked-summary'  => "여기를 가리키는 문서(분류� 경우 � 분류� �함� 문서)� 대한 최근 바뀜� 나와 있습니다.
 [[Special:Watchlist|주시하는 문서]]는 '''굵�''' 글씨로 나타납니다.",
@@ -987,22 +1380,23 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'reuploaddesc'                => '올리기를 취소하고 올리기 양�으로 �아가기',
 'uploadnologin'               => '로그�하지 않�',
 'uploadnologintext'           => '파�� 올리려면 [[Special:UserLogin|로그�]]해야 합니다.',
+'upload_directory_missing'    => '파� 올리기용 디렉토리 ($1)가 존재하지 않고 웹 서버� �해 �성�지 못했습니다.',
 'upload_directory_read_only'  => '파� 저장 디렉토리($1)� 쓰기 권한� 없습니다.',
 'uploaderror'                 => '올리기 오류',
 'uploadtext'                  => "파�� 올리기 위해서는 아래� 양�� 채워주세요.
-[[Special:ImageList|파� 목�]]�서 �전� 올�온 파�� 찾� 수 있습니다. [[Special:Log/upload|올리기 기�]]�는 파�� 올�온 기�� 남습니다. 삭제 기�� [[Special:Log/delete|삭제 로그]]�서 볼 수 있습니다.
+[[Special:FileList|파� 목�]]�서 �전� 올�온 파�� 찾� 수 있습니다. [[Special:Log/upload|올리기 기�]]�는 파�� 올�온 기�� 남습니다. 삭제 기�� [[Special:Log/delete|삭제 로그]]�서 볼 수 있습니다.
 
-문서� 그림� 넣으려면 아래 방법 중 하나를 사용하세요.
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' 그림� 온전한 모양� 사용하고� 할 때.
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200픽셀|섬네�|왼쪽|설명]]</nowiki></tt>''' 그림� 넓�를 200픽셀로 하고 왼쪽 정렬하며 '설명' ��는 주�� 그림 밑� 달 때.
+문서� 파�� 넣으려면 아래 방법 중 하나를 사용하세요.
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' 파�� 온전한 모양� 사용하고� 할 때.
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200픽셀|섬네�|왼쪽|설명]]</nowiki></tt>''' 파�� 넓�를 200픽셀로 하고 왼쪽 정렬하며 '설명' ��는 주�� 파� 밑� 달 때.
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' 파�� �접 보여주지 않고 파�로 바로 ��할때.",
 'upload-permitted'            => '허용하는 파� 확장�: $1',
 'upload-preferred'            => '권장하는 파� 확장�: $1',
 'upload-prohibited'           => '금지하는 파� 확장�: $1',
 'uploadlog'                   => '올리기 기�',
 'uploadlogpage'               => '올리기 기�',
-'uploadlogpagetext'           => '최근 올�온 그림 목�입니다.
-보다 시��으로 확�하고 싶으시다면 [[Special:NewImages|새 그림 화랑]]� 보세요.',
+'uploadlogpagetext'           => '최근 올�온 파� 목�입니다.
+갤러리 형�으로 확�하고 싶으시다면 [[Special:NewFiles|새 파� 목�]]� 보세요.',
 'filename'                    => '파� �름',
 'filedesc'                    => '파�� 설명',
 'fileuploadsummary'           => '설명:',
@@ -1015,32 +1409,38 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 'illegalfilename'             => '파�명 "$1"�는 문서 제목으로 허용�지 않는 글�가 �함�어 있습니다. �름� 바꾸어 다시 시�해 주세요.',
 'badfilename'                 => '파� �름� ‘$1’(으)로 바뀌었습니다.',
 'filetype-badmime'            => '‘$1’ MIME� 가진 파�� 올릴 수 없습니다.',
+'filetype-bad-ie-mime'        => '�터넷 �스플로러가 잠재�으로 위험한 파� 형�으로 �단�어 사용� 금지� "$1"로 ��할 수 있기 때문� � 파�� 올릴 수 없습니다.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' 확장�는 추천하지 않습니다. 추천하는 파� 확장�는 \$2입니다.",
 'filetype-banned-type'        => "‘'''.$1'''’ 확장�는 올릴 수 없습니다. $2 확장�만� 사용 가능합니다.",
 'filetype-missing'            => '파�� 확장�(‘.jpg’ 등)가 없습니다.',
 'large-file'                  => '파� �기는 $1� 넘지 않는 것� 추천합니다. � 파�� �기는 $2입니다.',
 'largefileserver'             => '� 파�� �기가 서버�서 허용� 설정보다 �니다.',
 'emptyfile'                   => '당신� 올린 파�� 빈 파�입니다. 파�명� 잘못 입력했� 수� 있습니다. 다시 한 번 확�해 주시기 바�니다.',
-'fileexists'                  => '같� �름� 파�� �미 있습니다. 파�� 바꾸고 싶지 않다면 <strong><tt>$1</tt></strong> 파�� 확�해 주세요.',
-'filepageexists'              => '� 파�� 설명 문서가 <strong><tt>$1</tt></strong>� 존재하지만, � �름� 가진 파�� 존재하지 않습니다.
+'fileexists'                  => "같� �름� 파�� �미 있습니다. 파�� 바꾸고 싶지 않다면 '''<tt>$1</tt>''' 파�� 확�해 주세요.",
+'filepageexists'              => "� 파�� 설명 문서가 '''<tt>$1</tt>'''� 존재하지만, � �름� 가진 파�� 존재하지 않습니다.
 당신� 입력한 설명� 설명 문서� 반��지 않� 것입니다.
-당신� 설명� 반�시키려면, �접 편집하셔야 합니다.',
-'fileexists-extension'        => '비슷한 �름� 파�� 존재합니다:<br />
-올리려는 파� �름: <strong><tt>$1</tt></strong><br />
-존재하는 파� �름: <strong><tt>$2</tt></strong><br />
-다른 �름으로 시�해 주세요.',
+당신� 설명� 반�시키려면, �접 편집하셔야 합니다.",
+'fileexists-extension'        => "비슷한 �름� 파�� 존재합니다:<br />
+올리려는 파� �름: '''<tt>$1</tt>'''<br />
+존재하는 파� �름: '''<tt>$2</tt>'''<br />
+다른 �름으로 시�해 주세요.",
 'fileexists-thumb'            => "<center>'''존재하는 파�'''</center>",
-'file-thumbnail-no'           => '파� �름� <strong><tt>$1</tt></strong>으로 시작합니다.
-�것� 파�� �기가 줄어든 그림 (�네�)으로 보입니다.
-당신� 최대 해��� 파�� 갖고 있다면 최대 해��� 파�로 올려주세요, 아니�면 파�� �름� 바꿔 주세요.',
-'fileexists-forbidden'        => '같� �름� 파�� �미 있습니다. 뒤로 �아가서 다른 �름으로 시�해 주시기 바�니다. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "� 파�� �본 그림� 아닌, 다른 그림� �기를 줄� 섬네� 파�� 것 같습니다.
+'''<tt>$1</tt>''' 파�� 확�해주세요.<br />
+해당 파�� 현재 올리려는 파�과 같다면, � 작� �기� 그림� 올릴 필요는 없습니다.",
+'file-thumbnail-no'           => "파� �름� '''<tt>$1</tt>'''으로 시작합니다.
+� 파�� �본 그림� 아닌, 다른 그림� �기를 줄� 섬네� 파�� 것 같습니다.
+� 해��가 좋� 파�� 있다면 그 파�� 올려주세요. 아니면 올리려는 파� �름� 바꾸어 주세요.",
+'fileexists-forbidden'        => '같� �름� 파�� �미 있고, �어쓸 수 없습니다.
+그래� 파�� 올리시려면, 뒤로 �아가서 다른 �름으로 시�해 주시기 바�니다. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => '같� �름� 파�� �미 위키미디어 공용� 있습니다.
-파�� 업로드하길 �하신다면 뒤로 �아가서 다른 �름으로 시�해 주시기 바�니다. [[Image:$1|thumb|center|$1]]',
+파�� 업로드하길 �하신다면 뒤로 �아가서 다른 �름으로 시�해 주시기 바�니다. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => '현재 올리고 있는 파�� 아래 파�과 중복�니다:',
+'file-deleted-duplicate'      => '� 파�과 같� 파� ([[$1]])� �전� 삭제� �� 있습니다. 파�� 다시 올리기 전� 문서� 삭제 기�� 확�해 주시기 바�니다.',
 'successfulupload'            => '올리기 성공',
 'uploadwarning'               => '올리기 경고',
 'savefile'                    => '파� 저장',
-'uploadedimage'               => '‘[[$1]]’�(를) 올렸습니다.',
+'uploadedimage'               => '‘[[$1]]’ 파�� 올렸습니다.',
 'overwroteimage'              => '‘[[$1]]’ 파�� 새 버전� 올렸습니다.',
 'uploaddisabled'              => '올리기 비활성화�',
 'uploaddisabledtext'          => '파� 올리기 기능� 비활성화�어 있습니다.',
@@ -1056,7 +1456,7 @@ $2보다 �어야 하지만 지금� $1번 입니다.',
 
 � 파�� 올리는 것� �절한지 다시 한번 ��해주십시오.
 편�를 위해 삭제 기�� 제공합니다.",
-'filename-bad-prefix'         => '올리려고 하는 파� �름� <strong>"$1"</strong>(으)로 시작합니다.
+'filename-bad-prefix'         => '올리려고 하는 파� �름� \'\'\'"$1"\'\'\'(으)로 시작합니다.
 "$1"�(는) 디지털 사진기가 ��으로 붙�는 �미없는 �름입니다.
 파�� 대해 알기 쉬운 �름� 골�주세요.',
 'filename-prefix-blacklist'   => ' #<!-- � 줄� 그대로 �십시오. --> <pre>
@@ -1094,19 +1494,21 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'upload_source_url'  => ' (유효하고, 모든 사람� 접근 가능한 URL)',
 'upload_source_file' => ' (당신� 컴퓨터� 있는 파�)',
 
-# Special:ImageList
-'imagelist-summary'     => '� 위키� 올�와 있는 모든 파�� 나열�어 있습니다.
+# Special:ListFiles
+'listfiles-summary'     => '� 위키� 올�와 있는 모든 파�� 나열�어 있습니다.
 기본�으로 가장 최근� 올�온 파�� 가장 위� 올�와 있습니다.
 다른 방�으로 정렬하려면 기준 열� 머리칸� 눌러주세요.',
+'listfiles_search_for'  => '다� �름� 가진 미디어 찾기:',
 'imgfile'               => '파�',
-'imagelist'             => '파� 목�',
-'imagelist_date'        => '날짜',
-'imagelist_name'        => '�름',
-'imagelist_user'        => '사용�',
-'imagelist_size'        => '�기',
-'imagelist_description' => '설명',
-
-# Image description page
+'listfiles'             => '파� 목�',
+'listfiles_date'        => '날짜',
+'listfiles_name'        => '�름',
+'listfiles_user'        => '사용�',
+'listfiles_size'        => '�기',
+'listfiles_description' => '설명',
+'listfiles_count'       => '버전',
+
+# File description page
 'filehist'                       => '파� 역사',
 'filehist-help'                  => '날짜/시간 ��를 �릭하면 해당 시간� 파�� 볼 수 있습니다.',
 'filehist-deleteall'             => '모� 삭제',
@@ -1114,21 +1516,29 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'filehist-revert'                => '��리기',
 'filehist-current'               => '현재',
 'filehist-datetime'              => '날짜/시간',
+'filehist-thumb'                 => '섬네�',
+'filehist-thumbtext'             => '$1 버전� 파�',
+'filehist-nothumb'               => '섬네� 없�',
 'filehist-user'                  => '사용�',
 'filehist-dimensions'            => '�기',
 'filehist-filesize'              => '파� �기',
 'filehist-comment'               => 'ë‚´ìš©',
 'imagelinks'                     => '파� ��',
-'linkstoimage'                   => '다� $1개� 문서가 � 그림� 사용하고 있습니다:',
-'nolinkstoimage'                 => '� 그림� 사용하는 문서가 없습니다.',
+'linkstoimage'                   => '다� $1개� 문서가 � 파�� 사용하고 있습니다:',
+'linkstoimage-more'              => '$1개 ��� 문서들� � 파�� 가리키고 있습니다.
+다� 목�� � 파�� 가리키는 처� $1개 문서만 보여주고 있습니다. 
+� 파�� 가리키는 모든 문서를 보려면 [[Special:WhatLinksHere/$2|여기]]를 참고해 주십시오.',
+'nolinkstoimage'                 => '� 파�� 사용하는 문서가 없습니다.',
 'morelinkstoimage'               => '� 파�� 쓰�고 있는 문서 목� [[Special:WhatLinksHere/$1|� 보기]].',
-'duplicatesoffile'               => '다� $1개� 파�� 중복�니다:',
+'redirectstofile'                => '다� {{PLURAL:$1|파�|$1개� 파�}}� � 파�로 넘겨주고 있습니다:',
+'duplicatesoffile'               => '다� {{PLURAL:$1|파��|$1개� 파��}} � 파�과 중복�니다 ([[Special:FileDuplicateSearch/$2|�세한 정보]]):',
 'sharedupload'                   => '� �료는 위키미디어 공용� 있습니다. 다른 프로�트�서 사용하고 있� 가능성� 있습니다.',
 'shareduploadwiki'               => '$1�서 � �세한 정보를 얻� 수 있습니다.',
-'shareduploadwiki-desc'          => '� $1를 아래� 표시합니다.',
+'shareduploadwiki-desc'          => '$1� 설명� 아래� 표시합니다.',
 'shareduploadwiki-linktext'      => '�료� 설명 문서',
 'shareduploadduplicate'          => '� 파�� 공용 저장소� $1과 중복�어 있습니다.',
 'shareduploadduplicate-linktext' => '다른 파�',
+'shareduploadconflict'           => '� 파�� 공용 저장소� 같� �름� 가진 $1과 중복�니다.',
 'shareduploadconflict-linktext'  => '다른 파�',
 'noimage'                        => '파�� 없습니다. $1 할 수 있습니다.',
 'noimage-linktext'               => '업로드',
@@ -1143,11 +1553,12 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'filerevert-defaultcomment' => '$1 $2 버전으로 ��림',
 'filerevert-submit'         => '��리기',
 'filerevert-success'        => "'''[[Media:$1|$1]]''' 파�� [$4 $2 $3 버전]으로 ��렸습니다.",
+'filerevert-badversion'     => '주어진 타임스탬프를 가진 파�� 로컬 버전� 없습니다.',
 
 # File deletion
 'filedelete'                  => '$1 삭제하기',
 'filedelete-legend'           => '파� 삭제하기',
-'filedelete-intro'            => "'''[[Media:$1|$1]]''' 파�� 삭제합니다.",
+'filedelete-intro'            => "'''[[Media:$1|$1]]''' 파�과 모든 역사를 삭제합니다.",
 'filedelete-intro-old'        => "'''[[Media:$1|$1]]''' 파�� [$4 $2 $3] 버전� 삭제합니다.",
 'filedelete-comment'          => '삭제 �유:',
 'filedelete-submit'           => '삭제',
@@ -1155,7 +1566,6 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'filedelete-success-old'      => "'''[[Media:$1|$1]]''' 파�� $2 $3 버전� 삭제했습니다.",
 'filedelete-nofile'           => "'''$1''' 파�� 존재하지 않습니다.",
 'filedelete-nofile-old'       => "해당 조건� 맞는 과거 '''$1''' 파�� 존재하지 않습니다.",
-'filedelete-iscurrent'        => '가장 최신 버전� 파�� 삭제하려고 하고 있습니다. 먼저 �전 버전으로 ��린 다�� 삭제해주세요.',
 'filedelete-otherreason'      => '다른 �유/추가�� �유:',
 'filedelete-reason-otherlist' => '다른 �유',
 'filedelete-reason-dropdown'  => '*�반�� 삭제 �유
@@ -1177,32 +1587,38 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 
 # Unused templates
 'unusedtemplates'     => '사용하지 않는 틀 목�',
-'unusedtemplatestext' => '다른 문서�서 사용하지 않는 {{ns:template}} 네임스페�스 문서� 목�입니다.
+'unusedtemplatestext' => '다른 문서�서 사용하지 않는 {{ns:template}} �름공간 문서� 목�입니다.
 
 삭제하기 전� 사용 여부를 다시 확�해 주세요.',
 'unusedtemplateswlh'  => '다른 ��',
 
 # Random page
 'randompage'         => '임� 문서로',
-'randompage-nopages' => '� 네임스페�스�는 문서가 없습니다.',
+'randompage-nopages' => '"$1" �름공간�는 문서가 없습니다.',
 
 # Random redirect
 'randomredirect'         => '임� 넘겨주기 문서로',
-'randomredirect-nopages' => '� 네임스페�스�서 해당하는 넘겨주기 문서가 없습니다.',
+'randomredirect-nopages' => '"$1" �름공간�서 해당하는 넘겨주기 문서가 없습니다.',
 
 # Statistics
-'statistics'             => '통계',
-'sitestats'              => '{{SITENAME}} 통계',
-'userstats'              => '사용� 통계',
-'sitestatstext'          => "현재 ��터베�스�는 '''\$1'''개� 문서가 있습니다. �것� 토론 문서, {{SITENAME}} 문서, \"토막글\" 문서, 넘겨주기 문서 등� �함하고 있습니다. �것들� 제외하면 '''\$2'''개� 문서가 있습니다.
-
-'''\$8'''개� 파�� 올�와 있습니다.
-
-위키가 설치� 후 문서는 전체 '''\$3'''번 �혔고, '''\$4'''번 편집�었습니다. 문서당 �균 편집 횟수는 '''\$5'''번�고, 한번 편집할 때마다 �균 '''\$6'''번 문서를 보았습니다.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue]� 길�는 '''\$7'''입니다.",
-'userstatstext'          => "'''$1'''명� [[Special:ListUsers|사용�]]가 등��어 있고, � 중 $5 권한� 가진 사용� 수는 '''$2'''명('''$4%''')입니다.",
-'statistics-mostpopular' => '가장 많� �힌 문서',
+'statistics'                   => '통계',
+'statistics-header-pages'      => '문서 통계',
+'statistics-header-edits'      => '편집 통계',
+'statistics-header-views'      => '방문 통계',
+'statistics-header-users'      => '사용� 통계',
+'statistics-articles'          => '�반 문서',
+'statistics-pages'             => '전체 문서',
+'statistics-pages-desc'        => '토론 문서, 넘겨주기 문서 등� �함.',
+'statistics-files'             => '올려져 있는 파�',
+'statistics-edits'             => '{{SITENAME}} 설치 후 문서� 전체 편집 횟수',
+'statistics-edits-average'     => '문서당 �균 편집 횟수',
+'statistics-views-total'       => '� 방문 수',
+'statistics-views-peredit'     => '편집당 방문 횟수',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue]� 길�',
+'statistics-users'             => '등�� [[Special:ListUsers|사용�]]',
+'statistics-users-active'      => '활� 중� 사용�',
+'statistics-users-active-desc' => '지난 $1�간 활�한 사용�',
+'statistics-mostpopular'       => '가장 많� �힌 문서',
 
 'disambiguations'      => '���� 문서 목�',
 'disambiguationspage'  => 'Template:Disambig',
@@ -1246,35 +1662,41 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'popularpages'            => '�기있는 문서 목�',
 'wantedcategories'        => '필요한 분류 목�',
 'wantedpages'             => '필요한 문서 목�',
+'wantedfiles'             => '필요한 파� 목�',
+'wantedtemplates'         => '필요한 틀 목�',
 'mostlinked'              => '가장 많� 연결� 문서 목�',
 'mostlinkedcategories'    => '가장 많� 연결� 분류 목�',
 'mostlinkedtemplates'     => '가장 많� 사용� 틀 목�',
 'mostcategories'          => '가장 많� 분류� 문서 목�',
 'mostimages'              => '가장 많� 사용� 파� 목�',
 'mostrevisions'           => '가장 많� 편집� 문서 목�',
-'prefixindex'             => '접�어 목�',
+'prefixindex'             => '접�어� 따른 문서 목�',
 'shortpages'              => '짧� 문서 목�',
 'longpages'               => '긴 문서 목�',
 'deadendpages'            => '막다른 문서 목�',
 'deadendpagestext'        => '{{SITENAME}} 내� 다른 문서로 나가는 ��가 없는 문서� 목�입니다.',
 'protectedpages'          => '보호� 문서 목�',
 'protectedpages-indef'    => '오른쪽 조건� 맞는 보호만 보기',
+'protectedpages-cascade'  => '연쇄� 보호만 보기',
 'protectedpagestext'      => '다�� 문서는 ��/편집� 불가능하�� 보호�어 있습니다.',
 'protectedpagesempty'     => '보호�어 있는 문서가 없습니다.',
 'protectedtitles'         => '�성 보호� 표제어 목�',
 'protectedtitlestext'     => '다� 표제어들� �성� 금지�어 있습니다.',
 'protectedtitlesempty'    => '해당 조건� 맞는 �성 금지 표제어가 없습니다.',
 'listusers'               => '사용� 목�',
+'listusers-editsonly'     => '기여가 있는 사용�만 보기',
+'usereditcount'           => '$1개� 편집',
 'newpages'                => '새 문서 목�',
 'newpages-username'       => '�름:',
 'ancientpages'            => '오래� 문서 목�',
 'move'                    => '��',
 'movethispage'            => '문서 ��하기',
-'unusedimagestext'        => '다른 사�트�서 그림� URL� �접 사용하고 있� 가능성� 있고, 따�서 그림� � 목�� 있어� 실제로 어딘가�서 사용하고 있� 수 있습니다.',
+'unusedimagestext'        => '다른 사�트�서 URL 접근� 통해 파�� 사용할 수 있기 때문�, 아래 목�� 있는 파�� 실제로 사용 중� 가능성� 있다는 �� 주�해주세요.',
 'unusedcategoriestext'    => '사용하지 않는 분류 문서들� 목�입니다.',
 'notargettitle'           => '해당하는 문서 없�',
-'notargettext'            => '기능� 수행할 목표 문서나 목표 사용�를 지정하지 않았습니다.',
+'notargettext'            => '기능� 수행할 대� 문서나 사용�를 지정하지 않았습니다.',
 'nopagetitle'             => '해당 문서 없�',
+'nopagetext'              => '당신� 찾는 문서는 존재하지 않습니다.',
 'pager-newer-n'           => '�전 $1개',
 'pager-older-n'           => '다� $1개',
 'suppress'                => '오버사�트',
@@ -1284,14 +1706,13 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'booksources-search-legend' => '책 찾기',
 'booksources-go'            => '찾기',
 'booksources-text'          => '아래� 목�� 새 책�나 중고 책� �매하는 외부 사�트로, �하는 책� 정보를 얻� 수 있습니다:',
+'booksources-invalid-isbn'  => '입력한 ISBN� 잘못� 것으로 보입니다; �본과 대조해 보십시오.',
 
 # Special:Log
 'specialloguserlabel'  => '�름:',
 'speciallogtitlelabel' => '제목:',
 'log'                  => '로그 목�',
 'all-logs-page'        => '모든 기�',
-'log-search-legend'    => '로그 검색',
-'log-search-submit'    => '찾기',
 'alllogstext'          => '{{SITENAME}}�서� 기�� 모� 나와 있습니다.
 로그 종류, 계정 �름, 문서 �름� 선�해서 볼 수 있습니다. 검색시�는 대소문�를 구별합니다.',
 'logempty'             => '�치하는 항목� 없습니다.',
@@ -1303,6 +1724,7 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'nextpage'          => '다� 문서 ($1)',
 'prevpage'          => '�전 문서 ($1)',
 'allpagesfrom'      => '다�으로 시작하는 문서들� 보여주기:',
+'allpagesto'        => '다�으로 �나는 문서들� 보여주기:',
 'allarticles'       => '모든 문서',
 'allinnamespace'    => '$1 �름공간� 모든 문서',
 'allnotinnamespace' => '$1 네임스페�스를 제외한 모든 문서 목�',
@@ -1314,46 +1736,77 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'allpages-bad-ns'   => '{{SITENAME}}�는 ‘$1’ 네임스페�스를 사용하지 않습니다.',
 
 # Special:Categories
-'categories'                  => '분류',
-'categoriespagetext'          => '문서나 �료를 담고 있는 분류 목�입니다.
+'categories'                    => '분류',
+'categoriespagetext'            => '문서나 �료를 담고 있는 분류 목�입니다.
 [[Special:UnusedCategories|사용�지 않는 분류]]는 여기� 보�지 않습니다.
 [[Special:WantedCategories|필요한 분류]]� 참고하세요.',
-'special-categories-sort-abc' => '알파벳순으로 정렬',
+'categoriesfrom'                => '다�으로 시작하는 분류들� 보여주기:',
+'special-categories-sort-count' => '항목 갯수 순으로 정렬',
+'special-categories-sort-abc'   => '알파벳순으로 정렬',
+
+# Special:DeletedContributions
+'deletedcontributions' => '삭제� 기여 목�',
+
+# Special:LinkSearch
+'linksearch'       => '웹 �� 찾기',
+'linksearch-pat'   => '검색 패턴:',
+'linksearch-ns'    => '�름공간:',
+'linksearch-ok'    => '검색',
+'linksearch-text'  => '"*.wikipedia.org"와 같� 와�드카드를 사용할 수 있습니다.<br />
+지�하는 프로토콜 목�: <tt>$1</tt>',
+'linksearch-line'  => '$2�서 $1 � ��하고 있습니다.',
+'linksearch-error' => '와�드카드는 주소� 처� 부분�만 사용� 수 있습니다.',
 
 # Special:ListUsers
 'listusersfrom'      => '다�으로 시작하는 사용� 보�기:',
 'listusers-submit'   => '보�기',
 'listusers-noresult' => '해당 사용�가 없습니다.',
 
+# Special:Log/newusers
+'newuserlogpage'              => '사용� 등� 기�',
+'newuserlogpagetext'          => '사용� 등� 기�입니다.',
+'newuserlog-byemail'          => '�메�로 보낸 암호',
+'newuserlog-create-entry'     => '새 사용�',
+'newuserlog-create2-entry'    => '$1 계정� 새로 만듦',
+'newuserlog-autocreate-entry' => '계정� ��으로 만들어졌습니다.',
+
 # Special:ListGroupRights
-'listgrouprights'         => '사용� 권한 목�',
-'listgrouprights-summary' => '다�� � 위키�서 설정� 사용� 권한 그룹� 목�입니다.
+'listgrouprights'                 => '사용� 권한 목�',
+'listgrouprights-summary'         => '다�� � 위키�서 설정� 사용� 권한 그룹� 목�입니다.
 ��� 권한� 대해서는 [[{{MediaWiki:Listgrouprights-helppage}}|�곳]]� 참조하십시오.',
-'listgrouprights-group'   => '그룹',
-'listgrouprights-rights'  => '권한',
-'listgrouprights-members' => '(사용� 목�)',
+'listgrouprights-group'           => '그룹',
+'listgrouprights-rights'          => '권한',
+'listgrouprights-helppage'        => 'Help:사용� 권한 그룹',
+'listgrouprights-members'         => '(사용� 목�)',
+'listgrouprights-addgroup'        => '$1 권한� 부여',
+'listgrouprights-removegroup'     => '$1 권한� 해제',
+'listgrouprights-addgroup-all'    => '모든 권한� 부여',
+'listgrouprights-removegroup-all' => '모든 권한� 회수',
 
 # E-mail user
-'mailnologin'     => '보낼 �메� 주소가 없�',
-'mailnologintext' => '다른 사용��게 �메�� 보내려면, [[Special:UserLogin|로그�]]한 다� [[Special:Preferences|사용� 환경 설정]]�서 �신� �메� 주소를 저장해야 합니다.',
-'emailuser'       => '�메� 보내기',
-'emailpage'       => '사용��게 �메� 보내기',
-'emailpagetext'   => '� 사용�가 환경 설정� 올바른 �메� 주소를 �었다면, 아래 양�� 통해 �메�� 보낼 수 있습니다.
+'mailnologin'      => '보낼 �메� 주소가 없�',
+'mailnologintext'  => '다른 사용��게 �메�� 보내려면, [[Special:UserLogin|로그�]]한 다� [[Special:Preferences|사용� 환경 설정]]�서 �신� �메� 주소를 저장해야 합니다.',
+'emailuser'        => '�메� 보내기',
+'emailpage'        => '사용��게 �메� 보내기',
+'emailpagetext'    => '� 사용�가 환경 설정� 올바른 �메� 주소를 �었다면, 아래 양�� 통해 �메�� 보낼 수 있습니다.
 �메�� 받� 사용�가 바로 답장할 수 있�� 하기 위해 당신� [[Special:Preferences|사용� 환경 설정]]� �� �메� 주소가 "발신�" 정보� 들어갑니다. 따�서 수신�가 당신�게 �접 답장� 보낼 수 있습니다.',
-'usermailererror' => '메� �체�서 오류 발�:',
-'defemailsubject' => '{{SITENAME}} �메�',
-'noemailtitle'    => '�메� 주소 없�',
-'noemailtext'     => '� 사용�는 올바른 �메� 주소를 입력하지 않았거나, �메�� 받지 않�� 설정해 놓았습니다.',
-'emailfrom'       => '�메� 발신�:',
-'emailto'         => '수신�:',
-'emailsubject'    => '제목:',
-'emailmessage'    => 'ë‚´ìš©:',
-'emailsend'       => '보내기',
-'emailccme'       => '메� 사본� 내 �메�로 보내기',
-'emailccsubject'  => '$1�게 보낸 메� 사본: $2',
-'emailsent'       => '�메� 보냄',
-'emailsenttext'   => '�메�� 보냈습니다.',
-'emailuserfooter' => '� �메�� {{SITENAME}}� $1 사용�가 $2 사용��게 "�메� 보내기" 기능� 통해 전송�었습니다.',
+'usermailererror'  => '메� �체�서 오류 발�:',
+'defemailsubject'  => '{{SITENAME}} �메�',
+'noemailtitle'     => '�메� 주소 없�',
+'noemailtext'      => '� 사용�는 올바른 �메� 주소를 입력하지 않았습니다.',
+'nowikiemailtitle' => '�메�� 허용�지 않�',
+'nowikiemailtext'  => '� 사용�는 다른 사용�로부터� �메�� 받지 않�� 설정하였습니다.',
+'email-legend'     => '{{SITENAME}}� 다른 사용��게 �메�� 보내기',
+'emailfrom'        => '�메� 발신�:',
+'emailto'          => '수신�:',
+'emailsubject'     => '제목:',
+'emailmessage'     => 'ë‚´ìš©:',
+'emailsend'        => '보내기',
+'emailccme'        => '메� 사본� 내 �메�로 보내기',
+'emailccsubject'   => '$1�게 보낸 메� 사본: $2',
+'emailsent'        => '�메� 보냄',
+'emailsenttext'    => '�메�� 보냈습니다.',
+'emailuserfooter'  => '� �메�� {{SITENAME}}� $1 사용�가 $2 사용��게 "�메� 보내기" 기능� 통해 전송�었습니다.',
 
 # Watchlist
 'watchlist'            => '주시문서 목�',
@@ -1377,16 +1830,13 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'watchlist-details'    => '$1개(토론 제외)� 문서를 주시하고 있습니다.',
 'wlheader-enotif'      => '* �메� 알림 기능� 활성화�었습니다.',
 'wlheader-showupdated' => "* 마지막으로 방문한 �후� 바� 문서들� '''굵� 글씨'''로 표시�니다.",
+'watchmethod-recent'   => '주시� 문서를 확�하고� 최근 편집� 확�',
+'watchmethod-list'     => '최근 편집� 확�하고� 주시� 문서 확�',
 'watchlistcontains'    => '$1개� 문서를 주시하고 있습니다.',
 'iteminvalidname'      => '"$1" 항목� 문제가 발�했습니다. �름� 잘못�었습니다...',
 'wlnote'               => "다�� 최근 '''$2'''시간 �안� 바� $1개� 문서입니다.",
 'wlshowlast'           => '최근 $1 시간 $2 � �는 $3 �안� 바� 문서',
-'watchlist-show-bots'  => '봇� 편집� 보�기',
-'watchlist-hide-bots'  => '봇� 편집� 숨기기',
-'watchlist-show-own'   => '나� 편집� 보�기',
-'watchlist-hide-own'   => '나� 편집� 숨기기',
-'watchlist-show-minor' => '사소한 편집� 보�기',
-'watchlist-hide-minor' => '사소한 편집� 숨기기',
+'watchlist-options'    => '주시문서 목� 설정',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '주시하는 중...',
@@ -1400,6 +1850,7 @@ URL� 맞고 해당 웹사�트가 작�하는지 확�해주세요.',
 'created'                      => '만들',
 'enotif_subject'               => '{{SITENAME}}�서 $PAGEEDITOR 사용�가 $PAGETITLE 문서를 $CHANGEDORCREATED었습니다.',
 'enotif_lastvisited'           => '당신� 마지막 방문 �후� 모든 변경사항� 보려면 $1�(를) 보십시오.',
+'enotif_lastdiff'              => '� 바뀜� 보려면 $1� 참조하십시오.',
 'enotif_anon_editor'           => '�명 사용� $1',
 'enotif_body'                  => '$WATCHINGUSERNAME님,
 
@@ -1425,73 +1876,92 @@ $NEWPAGE
 �움�:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '문서 삭제하기',
-'confirm'                     => '확�',
-'excontent'                   => '내용: ‘$1’',
-'excontentauthor'             => '내용: ‘$1’ (그리고 편집한 사람� ‘$2’�)',
-'exbeforeblank'               => '비우기 전� 내용: ‘$1’',
-'exblank'                     => '빈 문서',
-'delete-confirm'              => '‘$1’ 삭제',
-'delete-legend'               => '삭제',
-'historywarning'              => '주�: 현재 삭제하려는 문서�는 문서 역사가 있습니다:',
-'confirmdeletetext'           => '문서와 문서 역사를 삭제하려고 합니다. 삭제하려는 문서가 맞는지, � 문서를 삭제하는 것� [[{{MediaWiki:Policy-url}}|정책]]� 맞는 행��지를 확�해 주세요.',
-'actioncomplete'              => '명령완료',
-'deletedtext'                 => '‘<nowiki>$1</nowiki>’ 문서를 삭제했습니다. 최근 삭제 기�� $2� 있습니다.',
-'deletedarticle'              => '�(가) [[$1]]�(를) 삭제하였습니다.',
-'suppressedarticle'           => '"[[$1]]"를 숨김',
-'dellogpage'                  => '삭제 기�',
-'dellogpagetext'              => '아래� 목�� 최근� 삭제� 문서들입니다.',
-'deletionlog'                 => '삭제 기�',
-'reverted'                    => '�전 버전으로 ��렸습니다.',
-'deletecomment'               => '삭제 �유:',
-'deleteotherreason'           => '다른 �유/추가�� �유:',
-'deletereasonotherlist'       => '다른 �유',
-'deletereason-dropdown'       => '*�반�� 삭제 �유
+# Delete
+'deletepage'             => '문서 삭제하기',
+'confirm'                => '확�',
+'excontent'              => '내용: ‘$1’',
+'excontentauthor'        => '내용: ‘$1’ (그리고 편집한 사람� ‘$2’�)',
+'exbeforeblank'          => '비우기 전� 내용: ‘$1’',
+'exblank'                => '빈 문서',
+'delete-confirm'         => '‘$1’ 삭제',
+'delete-legend'          => '삭제',
+'historywarning'         => '주�: 현재 삭제하려는 문서�는 문서 역사가 있습니다:',
+'confirmdeletetext'      => '문서와 문서 역사를 삭제하려고 합니다. 삭제하려는 문서가 맞는지, � 문서를 삭제하는 것� [[{{MediaWiki:Policy-url}}|정책]]� 맞는 행��지를 확�해 주세요.',
+'actioncomplete'         => '명령완료',
+'deletedtext'            => '‘<nowiki>$1</nowiki>’ 문서를 삭제했습니다. 최근 삭제 기�� $2� 있습니다.',
+'deletedarticle'         => '�(가) [[$1]]�(를) 삭제하였습니다.',
+'suppressedarticle'      => '"[[$1]]"를 숨김',
+'dellogpage'             => '삭제 기�',
+'dellogpagetext'         => '아래� 목�� 최근� 삭제� 문서들입니다.',
+'deletionlog'            => '삭제 기�',
+'reverted'               => '�전 버전으로 ��렸습니다.',
+'deletecomment'          => '삭제 �유:',
+'deleteotherreason'      => '다른 �유/추가�� �유:',
+'deletereasonotherlist'  => '다른 �유',
+'deletereason-dropdown'  => '*�반�� 삭제 �유
 ** 작성�� 요청
 ** 저작권 침해
 ** 잘못� 문서',
-'delete-edit-reasonlist'      => '삭제 �유 편집',
-'delete-toobig'               => '� 문서�는 편집 역사가 $1개 있습니다. 편집 역사가 긴 문서를 삭제하면 {{SITENAME}}� � 혼란� 줄 수 있기 때문� 삭제할 수 없습니다.',
-'delete-warning-toobig'       => '� 문서�는 편집 역사가 $1개 있습니다. 편집 역사가 긴 문서를 삭제하면 {{SITENAME}} ��터베�스 �작� � �향� 줄 수 있기 때문�, 주�해 주세요.',
-'rollback'                    => '편집 ��리기',
-'rollback_short'              => '��리기',
-'rollbacklink'                => '��리기',
-'rollbackfailed'              => '��리기 실패',
-'cantrollback'                => '편집� ��릴 수 없습니다. 문서를 편집한 사용�가 한명�입니다.',
-'alreadyrolled'               => '[[:$1]]�서 [[User:$2|$2]] ([[User talk:$2|토론]] | [[Special:Contributions/$2|{{int:contribslink}}]]) � 편집� ��릴 수 없습니다; 누군가가 문서를 고치거나 ��렸습니다.
-
-마지막으로 문서를 편집한 사람� [[User:$3|$3]] ([[User talk:$3|토론]] | [[Special:Contributions/$3|{{int:contribslink}}]]) 입니다.',
-'editcomment'                 => "편집 요약: ''$1''", # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]]([[User talk:$2|토론]])� 편집� [[User:$1|$1]]� 마지막 버전으로 ��림', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1� 편집� $2� 마지막 버전으로 ��렸습니다.',
-'sessionfailure'              => '로그� 세션� 문제가 발�한 것 같습니다. 세션 하�재킹� 막기 위해 �작� 취소�었습니다. 브�우저� "뒤로" 버튼� 누르고 문서를 새로고침한 후� 다시 시�해 주세요.',
+'delete-edit-reasonlist' => '삭제 �유 편집',
+'delete-toobig'          => '� 문서�는 편집 역사가 $1개 있습니다. 편집 역사가 긴 문서를 삭제하면 {{SITENAME}}� � 혼란� 줄 수 있기 때문� 삭제할 수 없습니다.',
+'delete-warning-toobig'  => '� 문서�는 편집 역사가 $1개 있습니다. 편집 역사가 긴 문서를 삭제하면 {{SITENAME}} ��터베�스 �작� � �향� 줄 수 있기 때문�, 주�해 주세요.',
+
+# Rollback
+'rollback'         => '편집 ��리기',
+'rollback_short'   => '��리기',
+'rollbacklink'     => '��리기',
+'rollbackfailed'   => '��리기 실패',
+'cantrollback'     => '편집� ��릴 수 없습니다. 문서를 편집한 사용�가 한명�입니다.',
+'alreadyrolled'    => '[[:$1]]�서 [[User:$2|$2]] ([[User talk:$2|토론]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) � 편집� ��릴 수 없습니다; 누군가가 문서를 고치거나 ��렸습니다.
+
+마지막으로 문서를 편집한 사람� [[User:$3|$3]] ([[User talk:$3|토론]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) 입니다.',
+'editcomment'      => "편집 요약: ''$1''", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]]([[User talk:$2|토론]])� 편집� [[User:$1|$1]]� 마지막 버전으로 ��림', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1� 편집� $2� 마지막 버전으로 ��렸습니다.',
+'sessionfailure'   => '로그� 세션� 문제가 발�한 것 같습니다. 세션 하�재킹� 막기 위해 �작� 취소�었습니다. 브�우저� "뒤로" 버튼� 누르고 문서를 새로고침한 후� 다시 시�해 주세요.',
+
+# Protect
 'protectlogpage'              => '문서 보호 기�',
 'protectlogtext'              => '아래� 목�� 문서 보호와 보호 해제 기�입니다.',
 'protectedarticle'            => '‘[[$1]]’ 문서를 보호함',
 'modifiedarticleprotection'   => '‘[[$1]]’ 문서� 보호 설정� 변경함',
 'unprotectedarticle'          => '‘[[$1]]’ 문서를 보호 해제함',
+'movedarticleprotection'      => '문서� 보호 설정� "[[$2]]"�서 "[[$1]]"으로 옮김',
 'protect-title'               => '"$1" 보호하기',
+'prot_1movedto2'              => '[[$1]]�(를) [[$2]](으)로 옮김',
 'protect-legend'              => '보호 확�',
 'protectcomment'              => '보호 �유:',
 'protectexpiry'               => '보호 기간:',
 'protect_expiry_invalid'      => '보호 기간� 잘못�었습니다.',
-'protect_expiry_old'          => '만료�는 시간� 과거로 입력했습니다.',
+'protect_expiry_old'          => '기한� 과거로 입력했습니다.',
 'protect-unchain'             => '�� 권한� 수�으로 조정',
 'protect-text'                => "'''<nowiki>$1</nowiki>''' 문서� 보호 수준� 보거나 변경할 수 있습니다.",
 'protect-locked-blocked'      => "차단� �안�는 보호 설정� 바꿀 수 없습니다. '''$1''' 문서� 보호 설정� 다�과 같습니다:",
 'protect-locked-dblock'       => "��터베�스가 잠겨 문서 보호 설정� 바꿀 수 없습니다. '''$1''' 문서� 현재 설정� 다�과 같습니다:",
-'protect-locked-access'       => '문서 보호 수준� 변경할 권한� 없습니다. <strong>$1</strong> 문서� 권한� 다�과 같습니다.',
+'protect-locked-access'       => "문서 보호 수준� 변경할 권한� 없습니다. '''$1''' 문서� 권한� 다�과 같습니다.",
 'protect-cascadeon'           => '다�� 틀�서 � 문서를 사용하고 있고 그 틀� 연쇄� 보호가 걸려 있어 � 문서� ��으로 보호�니다.
 � 문서� 보호 설정� 바꾸어� 연쇄� 보호� �향� 주지 않습니다.',
-'protect-default'             => '(기본값)',
+'protect-default'             => '모든 사용��게 허용',
 'protect-fallback'            => '‘$1’ 권한 필요',
 'protect-level-autoconfirmed' => '등�� 사용�만 가능',
 'protect-level-sysop'         => '관리�만 가능',
 'protect-summary-cascade'     => '연쇄�',
 'protect-expiring'            => '$1 (UTC)� 만료',
+'protect-expiry-indefinite'   => '무기한',
 'protect-cascade'             => '연쇄� 보호 - � 문서�서 사용�는 다른 문서를 함께 보호합니다.',
 'protect-cantedit'            => '� 문서� 보호 설정� 바꿀 권한� 없습니다.',
+'protect-othertime'           => '다른 기간:',
+'protect-othertime-op'        => '다른 기간',
+'protect-existing-expiry'     => '현재 만료 기간: $2 $3',
+'protect-otherreason'         => '다른 �유/추가�� �유:',
+'protect-otherreason-op'      => '다른 �유/추가�� �유',
+'protect-dropdown'            => '*�반�� 보호 �유
+** 빈번한 훼� 행위
+** 빈번한 광고 행위
+** 비�산�� 편집 분�
+** 방문� 많� 문서',
+'protect-edit-reasonlist'     => '보호 �유를 편집하기',
+'protect-expiry-options'      => '2시간:2 hours,1�:1 day,3�:3 days,1주�:1 week,2주�:2 weeks,1개월:1 month,3개월:3 months,6개월:6 months,1년:1 year,무기한:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '권한:',
 'restriction-level'           => '보호 수준:',
 'minimum-size'                => '최소 �기',
@@ -1502,6 +1972,7 @@ $NEWPAGE
 'restriction-edit'   => '편집',
 'restriction-move'   => '��',
 'restriction-create' => '만들기',
+'restriction-upload' => '올리기',
 
 # Restriction levels
 'restriction-level-sysop'         => '보호�',
@@ -1509,41 +1980,53 @@ $NEWPAGE
 'restriction-level-all'           => '모�',
 
 # Undelete
-'undelete'                  => '삭제� 문서 보기',
-'undeletepage'              => '삭제� 문서를 보거나 �살리기',
-'undeletepagetitle'         => "'''아래는 [[:$1|$1]]� 삭제� �입니다.'''.",
-'viewdeletedpage'           => '삭제� 문서 보기',
-'undeletepagetext'          => '다�� 문서는 삭제�었지만 보관�어 있고, �살릴 수 있습니다. 보관� 문서들� 주기�으로 삭제� 것입니다.',
-'undelete-fieldset-title'   => '문서 복구',
-'undeleteextrahelp'         => "문서 역사 전체를 복구하려면 모든 체�박스를 선� 해제한 뒤 '''복구'''를 누르세요.
+'undelete'                     => '삭제� 문서 보기',
+'undeletepage'                 => '삭제� 문서를 보거나 �살리기',
+'undeletepagetitle'            => "'''아래는 [[:$1|$1]]� 삭제� �입니다.'''.",
+'viewdeletedpage'              => '삭제� 문서 보기',
+'undeletepagetext'             => '다� {{PLURAL:$1|문서는|$1개� 문서는}} 삭제�었지만 보관�어 있고, �살릴 수 있습니다.
+보관� 문서들� 주기�으로 삭제� 것입니다.',
+'undelete-fieldset-title'      => '문서 복구',
+'undeleteextrahelp'            => "문서 역사 전체를 복구하려면 모든 체�박스를 선� 해제한 뒤 '''복구'''를 누르세요.
 특정한 버전만� 복구하려면 복구하려는 버전들� 선�한 뒤 '''복구'''를 누르세요. '''초기화'''를 누르면 모든 선�� 취소�니다.",
-'undeleterevisions'         => '$1개� 버전 보관중',
-'undeletehistory'           => '문서를 �살리면 모든 역사가 같� 복구�니다.
+'undeleterevisions'            => '$1개� 버전 보관중',
+'undeletehistory'              => '문서를 �살리면 모든 역사가 같� 복구�니다.
 문서가 삭제� 후� 같� �름� 문서가 만들어졌다면, 복구�는 버전들� 역사� 과거 부분� 나타날 것입니다.',
-'undeleterevdel'            => '복구하려는 문서� 최신�� 삭제�어 있는 경우 문서를 복구시킬 수 없습니다. �러한 경우, 삭제� 최신� 문서� 체�박스를 선� 해제하거나 숨김� 해제해야 합니다.',
-'undeletehistorynoadmin'    => '� 문서는 삭제�어 있습니다. 삭제� �유와 삭제�기 전� � 문서를 편집한 사용�들� 아래� 나와 있습니다. 삭제� 문서를 보려면 관리� 권한� 필요합니다.',
-'undelete-nodiff'           => '�전� �� 없습니다.',
-'undeletebtn'               => '복구',
-'undeletelink'              => '�살리기',
-'undeletereset'             => '초기화',
-'undeletecomment'           => '설명:',
-'undeletedarticle'          => '"[[$1]]" 복구�',
-'undeletedrevisions'        => '$1개� 버전� 복구�었습니다.',
-'undeletedrevisions-files'  => '$1개� 버전과 $2개� 파�� 복구�었습니다.',
-'undeletedfiles'            => '$1개� 파�� 복구�었습니다.',
-'cannotundelete'            => '복구� 실패했습니다. 다른 누군가가 �미 복구했� 수� 있습니다.',
-'undeletedpage'             => "<big>'''$1�(가) 복구�었습니다.'''</big>
+'undeleterevdel'               => '복구하려는 문서� 최신�� 삭제�어 있는 경우 문서를 복구시킬 수 없습니다. �러한 경우, 삭제� 최신� 문서� 체�박스를 선� 해제하거나 숨김� 해제해야 합니다.',
+'undeletehistorynoadmin'       => '� 문서는 삭제�어 있습니다. 삭제� �유와 삭제�기 전� � 문서를 편집한 사용�들� 아래� 나와 있습니다. 삭제� 문서를 보려면 관리� 권한� 필요합니다.',
+'undelete-revision'            => '삭제� $1 문서� $4 $5 버전 (기여� $3):',
+'undeleterevision-missing'     => '해당 �� 잘못�었거나 존재하지 않습니다.
+잘못� ��를 따�왔거나, 특정 �� �미 복구�거나 ��터베�스�서 제거�었� 수� 있습니다.',
+'undelete-nodiff'              => '�전� �� 없습니다.',
+'undeletebtn'                  => '복구',
+'undeletelink'                 => '�살리기',
+'undeletereset'                => '초기화',
+'undeleteinvert'               => '선� 반전',
+'undeletecomment'              => '설명:',
+'undeletedarticle'             => '"[[$1]]" 복구�',
+'undeletedrevisions'           => '$1개� 버전� 복구�었습니다.',
+'undeletedrevisions-files'     => '$1개� 버전과 $2개� 파�� 복구�었습니다.',
+'undeletedfiles'               => '$1개� 파�� 복구�었습니다.',
+'cannotundelete'               => '복구� 실패했습니다. 다른 누군가가 �미 복구했� 수� 있습니다.',
+'undeletedpage'                => "<big>'''$1�(가) 복구�었습니다.'''</big>
 
 [[Special:Log/delete|삭제 기�]]�서 최근� 삭제/복구 기�� 볼 수 있습니다.",
-'undelete-header'           => '최근� 삭제� 문서 기�� [[Special:Log/delete|여기]]�서 볼 수 있습니다.',
-'undelete-search-box'       => '삭제� 문서 찾기',
-'undelete-search-prefix'    => '다�으로 시작하는 문서 보�기:',
-'undelete-search-submit'    => '찾기',
-'undelete-error-short'      => '파� 복구 오류: $1',
-'undelete-error-long'       => '파�� 복구하는 중 오류 발�:
+'undelete-header'              => '최근� 삭제� 문서 기�� [[Special:Log/delete|여기]]�서 볼 수 있습니다.',
+'undelete-search-box'          => '삭제� 문서 찾기',
+'undelete-search-prefix'       => '다�으로 시작하는 문서 보�기:',
+'undelete-search-submit'       => '찾기',
+'undelete-no-results'          => '삭제� 문서 보존 �료�서 입력한 값� 맞는 문서가 없습니다.',
+'undelete-filename-mismatch'   => '타임스탬프가 $1� 파�� 버전� 복구할 수 없습니다: 파� �름� �치하지 않습니다.',
+'undelete-bad-store-key'       => '타임스탬프가 $1� 파�� 버전� 복구할 수 없습니다: 파�� 삭제�기 전� 사�졌습니다.',
+'undelete-cleanup-error'       => '사용�지 않는 보존� 파� "$1"� 삭제하는 � 오류가 발�했습니다.',
+'undelete-missing-filearchive' => '��터베�스� 존재하지 않기 때문� 파� 보존 ID가 $1� 파�� 복구할 수 없습니다.
+�미 복구�었� 수 있습니다.',
+'undelete-error-short'         => '파� 복구 오류: $1',
+'undelete-error-long'          => '파�� 복구하는 중 오류 발�:
 
 $1',
-'undelete-show-file-submit' => '예',
+'undelete-show-file-confirm'   => '정� "<nowiki>$1</nowiki>" 파�� 삭제� $2 $3 버전� 보시겠습니까?',
+'undelete-show-file-submit'    => '예',
 
 # Namespace form on various pages
 'namespace'      => '�름공간:',
@@ -1551,26 +2034,27 @@ $1',
 'blanknamespace' => '(�반)',
 
 # Contributions
-'contributions' => '사용� 기여',
-'mycontris'     => '내 기여 목�',
-'contribsub2'   => '$1($2)� 기여',
-'nocontribs'    => '� 사용�는 어디�� 기여하지 않았습니다.',
-'uctop'         => '(최신)',
-'month'         => 'ì›”:',
-'year'          => '연�:',
-
-'sp-contributions-newbies'     => '새 사용�� 기여만 보기',
-'sp-contributions-newbies-sub' => '새 사용�들� 기여',
-'sp-contributions-blocklog'    => '차단 기�',
-'sp-contributions-search'      => '기여 검색',
-'sp-contributions-username'    => 'IP 주소 혹� 계정 �름:',
-'sp-contributions-submit'      => '찾기',
+'contributions'       => '사용� 기여',
+'contributions-title' => '$1 사용�� 기여 목�',
+'mycontris'           => '내 기여 목�',
+'contribsub2'         => '$1($2)� 기여',
+'nocontribs'          => '� 사용�는 어디�� 기여하지 않았습니다.',
+'uctop'               => '(최신)',
+'month'               => 'ì›”:',
+'year'                => '연�:',
+
+'sp-contributions-newbies'       => '새 사용�� 기여만 보기',
+'sp-contributions-newbies-sub'   => '새 사용�들� 기여',
+'sp-contributions-newbies-title' => '새 사용�� 기여',
+'sp-contributions-blocklog'      => '차단 기�',
+'sp-contributions-search'        => '기여 검색',
+'sp-contributions-username'      => 'IP 주소 혹� 계정 �름:',
+'sp-contributions-submit'        => '찾기',
 
 # What links here
 'whatlinkshere'            => '여기를 가리키는 글',
 'whatlinkshere-title'      => '"$1" 문서를 가리키는 문서 목�',
 'whatlinkshere-page'       => '문서:',
-'linklistsub'              => '(�� 목�)',
 'linkshere'                => "다�� 문서들� '''[[:$1]]''' 문서를 가리키고 있습니다:",
 'nolinkshere'              => "'''[[:$1]]''' 문서를 가리키는 문서가 없습니다.",
 'nolinkshere-ns'           => "해당 네임스페�스�서 '''[[:$1]]''' 문서를 가리키는 문서가 없습니다.",
@@ -1615,7 +2099,9 @@ $1',
 'ipbotheroption'                  => '수�으로 지정',
 'ipbotherreason'                  => '다른 �유/추가�� �유:',
 'ipbhidename'                     => '사용� �름� 차단 기�, 차단� 사용� 목�, 사용� 목��서 숨기기',
-'ipbwatchuser'                    => '� 사용� 문서와 사용�토론 문서를 주시하기',
+'ipbwatchuser'                    => '� 사용�� 사용� 문서와 토론 문서를 주시하기',
+'ipballowusertalk'                => '차단�어 있는 중�� �신� 토론 문서를 편집할 수 있게 허용',
+'ipb-change-block'                => '� 설정으로 � 사용�를 다시 차단합니다',
 'badipaddress'                    => '잘못� IP 주소',
 'blockipsuccesssub'               => '차단 완료',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] 사용�가 차단�었습니다. 차단� 사용� 목�� [[Special:IPBlockList|여기]]�서 볼 수 있습니다.',
@@ -1624,6 +2110,7 @@ $1',
 'ipb-unblock'                     => '사용�/IP 주소 차단 해제하기',
 'ipb-blocklist-addr'              => '$1� 현재 차단 기� 보기',
 'ipb-blocklist'                   => '현재 차단 기� 보기',
+'ipb-blocklist-contribs'          => '$1� 기여',
 'unblockip'                       => '사용� 차단 해제',
 'unblockiptext'                   => '아래� 양�� 차단 해제하려는 IP 주소나 사용� �름� 입력하세요.',
 'ipusubmit'                       => '차단 해제',
@@ -1632,6 +2119,9 @@ $1',
 'ipblocklist'                     => '차단 중� IP 주소와 계정 �름',
 'ipblocklist-legend'              => '차단 중� 사용� 찾기',
 'ipblocklist-username'            => '계정 �름/IP 주소:',
+'ipblocklist-sh-userblocks'       => '계정 차단� $1',
+'ipblocklist-sh-tempblocks'       => '임시 차단� $1',
+'ipblocklist-sh-addressblocks'    => '단� IP 차단� $1',
 'ipblocklist-submit'              => '찾기',
 'blocklistline'                   => '$1, $2 사용�는 $3� 차단함 ($4)',
 'infiniteblock'                   => '무기한',
@@ -1640,35 +2130,44 @@ $1',
 'noautoblockblock'                => '�� 차단 비활성화�',
 'createaccountblock'              => '계정 �성 금지�',
 'emailblock'                      => '�메� 차단�',
+'blocklist-nousertalk'            => '�신� 토론 문서 편집 불가',
 'ipblocklist-empty'               => '차단� 사용�가 없습니다.',
 'ipblocklist-no-results'          => '당신� 입력한 IP 주소나 사용�는 차단�지 않았습니다.',
 'blocklink'                       => '차단',
 'unblocklink'                     => '차단 해제',
+'change-blocklink'                => '차단 설정 변경',
 'contribslink'                    => '기여',
 'autoblocker'                     => "당신� IP 주소는 최근 ‘[[User:$1|$1]]’�(가) 사용하였기 때문� ��으로 차단�었습니다. $1� 차단 �유는 다�과 같습니다: '''$2'''",
 'blocklogpage'                    => '차단 기�',
+'blocklog-fulllog'                => '전체 차단 기�',
 'blocklogentry'                   => '[[$1]] 사용�를 $2 $3 차단함',
+'reblock-logentry'                => '[[$1]] 사용�� 차단 기간� $2(으)로 변경 $3',
 'blocklogtext'                    => '� 목�� 사용� 차단/차단 해제 기�입니다. ��으로 차단� IP 주소는 여기� 나오지 않습니다. [[Special:IPBlockList|여기]]�서 현재 차단� 사용� 목�� 볼 수 있습니다.',
 'unblocklogentry'                 => '$1� 차단 해제했습니다.',
 'block-log-flags-anononly'        => 'IP만 막�',
 'block-log-flags-nocreate'        => '계정 �성 막�',
 'block-log-flags-noautoblock'     => '�� 차단 비활성화�',
 'block-log-flags-noemail'         => '�메� 막�',
+'block-log-flags-nousertalk'      => '�신� 토론 문서 편집 불가',
 'block-log-flags-angry-autoblock' => '향�� �� 차단 활성화�',
 'range_block_disabled'            => 'IP 범위 차단 기능� 비활성화�어 있습니다.',
 'ipb_expiry_invalid'              => '차단 기간� 잘못�었습니다.',
 'ipb_expiry_temp'                 => '사용� �름� 숨기는 차단� 반드시 무기한�어야 합니다.',
 'ipb_already_blocked'             => '"$1" 사용�는 �미 차단�',
+'ipb-needreblock'                 => '== �미 차단�어 있습니다 ==
+$1 사용�는 �미 차단�었습니다. 차단 설정� 바꾸시겠습니까?',
 'ipb_cant_unblock'                => '오류: 차단 ID $1�(가) 존재하지 않습니다. �미 차단 해제�었� 수 있습니다.',
 'ipb_blocked_as_range'            => '오류: IP 주소 $1� �접 차단�지 않았기 때문� 차단 해제할 수 없습니다.
 하지만 $2로 광역 차단�었기 때문�, 광역 차단 해제로 차단� 해제할 수 있습니다.',
 'ip_range_invalid'                => 'IP 범위가 잘못�었습니다.',
+'blockme'                         => '�가 차단',
 'proxyblocker'                    => '프�시 차단',
 'proxyblocker-disabled'           => '� 기능� 비활성�어 있습니다.',
 'proxyblockreason'                => '당신� IP 주소는 공개 프�시로 �혀져 ��으로 차단�니다. 만약 �터넷 사용� 문제가 있다면 �터넷 서비스 공급��게 문�해주세요.',
 'proxyblocksuccess'               => '완료.',
 'sorbsreason'                     => '당신� IP 주소는 {{SITENAME}}�서 사용하는 DNSBL 공개 프�시 목�� 들어 있습니다.',
 'sorbs_create_account_reason'     => '당신� IP 주소는 {{SITENAME}}�서 사용하는 DNSBL 공개 프�시 목�� 들어 있습니다. 계정� 만들 수 없습니다.',
+'cant-block-while-blocked'        => '당신� 차단�어 있는 �안�는 다른 사용�를 차단할 수 없습니다.',
 
 # Developer tools
 'lockdb'              => '��터베�스 잠그기',
@@ -1689,9 +2188,9 @@ $1',
 'databasenotlocked'   => '��터베�스가 잠겨 있지 않습니다.',
 
 # Move page
-'move-page'               => '�� $1',
-'move-page-legend'        => '문서 ��하기',
-'movepagetext'            => "아래 양�� 채워 문서� �름� 바꾸고 모든 역사를 새 �름으로 옮길 수 있습니다.
+'move-page'                    => '�� $1',
+'move-page-legend'             => '문서 ��하기',
+'movepagetext'                 => "아래 양�� 채워 문서� �름� 바꾸고 모든 역사를 새 �름으로 옮길 수 있습니다.
 기존� �름� 새 �름으로 넘겨주는 문서가 �니다.
 �래 �름� 가리키는 넘겨주기를 ��으로 갱신할 수 있습니다.
 만약 � 설정� 선�하지 않았다면 [[Special:DoubleRedirects|�중 넘겨주기]]와 [[Special:BrokenRedirects|�긴 넘겨주기]]를 확�해주세요.
@@ -1702,43 +2201,59 @@ $1',
 '''주�!'''
 �주 사용하는 문서를 ��하면 위험한 결과를 가져올 수 있습니다.
 ��하기 전�, � 문서를 ��해� 문제가 없다는 것� 확�해주세요.",
-'movepagetalktext'        => "딸린 토론 문서� ��으로 ��합니다. 다�� 경우는 '''��하지 않습니다''':
+'movepagetalktext'             => "딸린 토론 문서� ��으로 ��합니다. 다�� 경우는 '''��하지 않습니다''':
 * ��할 �름으로 � 문서가 �미 있는 경우
 * 아래� 선�� 해제하는 경우
 � 경우�는 문서를 �접 ��하거나 � 문서를 합�야 합니다.",
-'movearticle'             => '문서 ��하기',
-'movenotallowed'          => '문서를 ��할 권한� 없습니다.',
-'newtitle'                => '새 문서 �름',
-'move-watch'              => '� 문서 주시하기',
-'movepagebtn'             => '��',
-'pagemovedsub'            => '문서 ��함',
-'movepage-moved'          => "<big>'''‘$1’ 문서를 ‘$2’ 문서로 ��했습니다.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '문서가 �미 존재하거나, 문서 �름� 올바르지 않습니다. 다른 제목으로 시�해주세요.',
-'cantmove-titleprotected' => '새로운 제목으로 문서를 만드는 것� 금지�어 있어, 문서를 ��할 수 없습니다.',
-'talkexists'              => "'''문서는 ���었습니다. 하지만 딸린 토론 문서� 새 �름으로 � 문서가 �미 존재해서, 토론 문서는 ��하지 않았습니다. �접 문서를 합� 주세요.'''",
-'movedto'                 => '새 �름',
-'movetalk'                => '딸린 토론� 함께 ��합니다.',
-'move-subpages'           => '하위 문서� 함께 ��합니다.',
-'move-talk-subpages'      => '토론 문서� 딸린 문서� 함께 ��합니다.',
-'movepage-page-exists'    => '��할 수 없습니다. ‘$1’ 문서가 �미 존재합니다.',
-'movepage-page-moved'     => '$1 문서가 $2 (으)로 ���었습니다.',
-'movepage-page-unmoved'   => '$1 문서를 $2로 ��할 수 없습니다.',
-'1movedto2'               => '[[$1]]�(를) [[$2]](으)로 옮김',
-'1movedto2_redir'         => '[[$1]]�(를) [[$2]](으)로 옮기면서 넘겨주기를 �어 씀',
-'movelogpage'             => '�� 기�',
-'movelogpagetext'         => '아래는 옮겨진 문서� 목�입니다.',
-'movereason'              => '�유',
-'revertmove'              => '��리기',
-'delete_and_move'         => '삭제하고 ��',
-'delete_and_move_text'    => '== 삭제 필요 ==
+'movearticle'                  => '문서 ��하기',
+'movenologin'                  => '로그�하지 않�',
+'movenologintext'              => '[[Special:UserLogin|로그�]]해야만 문서를 ��할 수 있습니다.',
+'movenotallowed'               => '문서를 ��할 권한� 없습니다.',
+'movenotallowedfile'           => '당신� 파�� 옮길 권한� 없습니다.',
+'cant-move-user-page'          => '당신� 사용� 문서(하위 문서를 제외)를 옮길 권한� 없습니다.',
+'cant-move-to-user-page'       => '당신� 문서를 사용� 문서로 옮길 권한� 없습니다. (하위 문서는 제외)',
+'newtitle'                     => '새 문서 �름',
+'move-watch'                   => '� 문서 주시하기',
+'movepagebtn'                  => '��',
+'pagemovedsub'                 => '문서 ��함',
+'movepage-moved'               => "<big>'''‘$1’ 문서를 ‘$2’ 문서로 ��함'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '넘겨주기 문서가 �성�었습니다.',
+'movepage-moved-noredirect'    => '넘겨주기 문서가 �성�지 않았습니다.',
+'articleexists'                => '문서가 �미 존재하거나, 문서 �름� 올바르지 않습니다. 다른 제목으로 시�해주세요.',
+'cantmove-titleprotected'      => '새로운 제목으로 문서를 만드는 것� 금지�어 있어, 문서를 ��할 수 없습니다.',
+'talkexists'                   => "'''문서는 ���었습니다. 하지만 딸린 토론 문서� 새 �름으로 � 문서가 �미 존재해서, 토론 문서는 ��하지 않았습니다. �접 문서를 합� 주세요.'''",
+'movedto'                      => '새 �름',
+'movetalk'                     => '딸린 토론� 함께 ��합니다.',
+'move-subpages'                => '하위 문서� 함께 ��합니다.',
+'move-talk-subpages'           => '토론 문서� 딸린 문서� 함께 ��합니다.',
+'movepage-page-exists'         => '��할 수 없습니다. ‘$1’ 문서가 �미 존재합니다.',
+'movepage-page-moved'          => '$1 문서가 $2 (으)로 ���었습니다.',
+'movepage-page-unmoved'        => '$1 문서를 $2로 ��할 수 없습니다.',
+'movepage-max-pages'           => '최대 $1개� 문서가 ���었고, 나머지는 ���으로 옮겨지지 않� 것입니다.',
+'1movedto2'                    => '[[$1]]�(를) [[$2]](으)로 옮김',
+'1movedto2_redir'              => '[[$1]]�(를) [[$2]](으)로 옮기면서 넘겨주기를 �어 씀',
+'move-redirect-suppressed'     => '넘겨주기가 �성�지 않�',
+'movelogpage'                  => '�� 기�',
+'movelogpagetext'              => '아래는 옮겨진 문서� 목�입니다.',
+'movereason'                   => '�유',
+'revertmove'                   => '��리기',
+'delete_and_move'              => '삭제하고 ��',
+'delete_and_move_text'         => '== 삭제 필요 ==
 
 ��하려는 제목으로 � 문서 [[:$1]]�(가) �미 존재합니다. 삭제하고 ��할까요?',
-'delete_and_move_confirm' => '네. 문서를 삭제합니다',
-'delete_and_move_reason'  => '문서를 ��하기 위해 삭제함',
-'selfmove'                => '��하려는 제목� �래 제목과 같습니다. ��할 수 없습니다.',
-'immobile_namespace'      => '특수한 네임스페�스로는 ��할 수 없습니다.',
-'imagenocrossnamespace'   => '파�� 파�� 아닌 �름공간으로 옮길 수 없습니다.',
-'fix-double-redirects'    => '기존 �름� 가리키는 넘겨주기를 갱신',
+'delete_and_move_confirm'      => '네. 문서를 삭제합니다',
+'delete_and_move_reason'       => '문서를 ��하기 위해 삭제함',
+'selfmove'                     => '��하려는 제목� �래 제목과 같습니다. ��할 수 없습니다.',
+'immobile-source-namespace'    => '"$1" �름공간� �한 문서는 ��시킬 수 없습니다.',
+'immobile-target-namespace'    => '"$1" �름공간� �한 문서는 ��시킬 수 없습니다.',
+'immobile-target-namespace-iw' => '�터위키 ��를 넘어 문서를 ��할 수 없습니다.',
+'immobile-source-page'         => '� 문서는 ��할 수 없습니다.',
+'immobile-target-page'         => '새 �름으로 옮길 수 없습니다.',
+'imagenocrossnamespace'        => '파�� 파�� 아닌 �름공간으로 옮길 수 없습니다.',
+'imagetypemismatch'            => '새 파�� 확장�가 �래� 확장�와 �치하지 않습니다.',
+'imageinvalidfilename'         => '새 파� �름� 잘못�었습니다.',
+'fix-double-redirects'         => '기존 �름� 가리키는 넘겨주기를 갱신',
+'move-leave-redirect'          => '�� 후 넘겨주기를 남기기',
 
 # Export
 'export'            => '문서 내보내기',
@@ -1746,7 +2261,7 @@ $1',
 
 문서를 내보내려면, 내보내려는 문서 제목� 한 줄� 하나씩 입력해주세요. 그리고 문서� 전체 역사가 필요한지, 혹� 현재 버전만� 필요한지를 선�해 주세요.
 
-특정 문서를 내보내려면, 예를 들어 ‘[[{{MediaWiki:Mainpage}}]]’ 문서를 내보내려면 [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] ��를 사용할 수� 있습니다.',
+특정 문서를 내보내려면, 예를 들어 ‘[[{{MediaWiki:Mainpage}}]]’ 문서를 내보내려면 [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] ��를 사용할 수� 있습니다.',
 'exportcuronly'     => '현재 버전만 �함하고, 전체 역사는 �함하지 않�',
 'exportnohistory'   => "----
 '''주�:''' 전체 문서 역사를 내보내는 기능� 성능 문제로 �해 비활성�어 있습니다.",
@@ -1767,33 +2282,52 @@ $1',
 'allmessagesmodified'       => '변경� 것만 보여주기',
 
 # Thumbnails
-'thumbnail-more'  => '실제 �기로',
-'filemissing'     => '파� 사��',
-'thumbnail_error' => '섬네�� 만드는 중 오류 발�: $1',
-'djvu_no_xml'     => 'DjVu 파�� XML 정보를 �� 수 없�',
+'thumbnail-more'           => '실제 �기로',
+'filemissing'              => '파� 사��',
+'thumbnail_error'          => '섬네�� 만드는 중 오류 발�: $1',
+'djvu_page_error'          => 'DjVu 페�지 범위 벗어남',
+'djvu_no_xml'              => 'DjVu 파�� XML 정보를 �� 수 없�',
+'thumbnail_invalid_params' => '섬네� 매개변수가 잘못�었습니다.',
+'thumbnail_dest_directory' => '새 목� 디렉토리를 �성할 수 없습니다.',
 
 # Special:Import
-'import'                   => '문서 가져오기',
-'importinterwiki'          => '다른 위키�서 문서 가져오기',
-'import-interwiki-submit'  => '가져오기',
-'importtext'               => '�본 위키�서 [[Special:Export|내보내기]] 기능� 사용해 파�� 내려받아서 여기� 올려주세요.',
-'importstart'              => '문서를 가져오는 중...',
-'import-revision-count'    => '$1개� �',
-'importnopages'            => '가져올 문서가 없습니다.',
-'importfailed'             => '가져오기 실패: <nowiki>$1</nowiki>',
-'importcantopen'           => '파�� 열 수 없습니다.',
-'importbadinterwiki'       => '�터위키 ��가 잘못�었습니다.',
-'importnotext'             => '내용� 없습니다.',
-'importsuccess'            => '가져오기 완료!',
-'importnofile'             => '가져오기용 파�� 업로드�지 않았습니다.',
-'importuploaderrorsize'    => '파� 올리기를 통한 가져오기� 실패했습니다.
+'import'                     => '문서 가져오기',
+'importinterwiki'            => '다른 위키�서 문서 가져오기',
+'import-interwiki-text'      => '문서를 가져올 위키를 선�하고, 문서 제목� 입력해주세요.
+편집 날짜와 편집�� �름� 보존� 것입니다.
+모든 가져오기는 [[Special:Log/import|가져오기 기�]]� 기�� 것입니다.',
+'import-interwiki-source'    => '�본 위키/문서:',
+'import-interwiki-history'   => '� 문서� 모든 역사를 가져오기',
+'import-interwiki-submit'    => '가져오기',
+'import-interwiki-namespace' => '새 �름공간:',
+'import-upload-filename'     => '파� �름:',
+'import-comment'             => '�유:',
+'importtext'                 => '�본 위키�서 [[Special:Export|내보내기]] 기능� 사용해 파�� 내려받아서 여기� 올려주세요.',
+'importstart'                => '문서를 가져오는 중...',
+'import-revision-count'      => '$1개� �',
+'importnopages'              => '가져올 문서가 없습니다.',
+'importfailed'               => '가져오기 실패: <nowiki>$1</nowiki>',
+'importunknownsource'        => '알 수 없는 가져오기 소스 유형',
+'importcantopen'             => '파�� 열 수 없습니다.',
+'importbadinterwiki'         => '�터위키 ��가 잘못�었습니다.',
+'importnotext'               => '내용� 없습니다.',
+'importsuccess'              => '가져오기 완료!',
+'importhistoryconflict'      => '문서 역사가 충�하는 버전� 있습니다. (�전� � 문서가 가져오기� �� 있� 수 있습니다)',
+'importnosources'            => '문서를 가져올 출처가 정��지 않았고, 문서 역사 올리기가 비활성화�었습니다.',
+'importnofile'               => '가져오기용 파�� 업로드�지 않았습니다.',
+'importuploaderrorsize'      => '파� 올리기를 통한 가져오기� 실패했습니다.
 파�� 허용� �기 제한보다 �니다.',
-'import-parse-failure'     => 'XML 문서 분� 실패',
-'import-noarticle'         => '가져올 문서가 없습니다!',
-'import-nonewrevisions'    => '모든 �� �전� 가져오기�었습니다.',
-'import-upload'            => 'XML ��터 올리기',
-'import-token-mismatch'    => '세션 ��터가 �실�었습니다. 다시 시�해주세요.',
-'import-invalid-interwiki' => '해당 위키�서 문서를 가져올 수 없습니다.',
+'importuploaderrorpartial'   => '가져오기 파�� 올리는 � 실패하였습니다.
+파�� 부분�으로만 업로드�었습니다.',
+'importuploaderrortemp'      => '가져오기 파�� 올리는 � 실패했습니다.
+임시 ��가 존재하지 않습니다.',
+'import-parse-failure'       => 'XML 문서 분� 실패',
+'import-noarticle'           => '가져올 문서가 없습니다!',
+'import-nonewrevisions'      => '모든 �� �전� 가져오기�었습니다.',
+'xml-error-string'           => '$3단 $2줄 (바�트 $4)�서 $1: $5',
+'import-upload'              => 'XML ��터 올리기',
+'import-token-mismatch'      => '세션 ��터가 �실�었습니다. 다시 시�해주세요.',
+'import-invalid-interwiki'   => '해당 위키�서 문서를 가져올 수 없습니다.',
 
 # Import log
 'importlogpage'                    => '가져오기 기�',
@@ -1863,6 +2397,9 @@ $1',
 'tooltip-watch'                   => '� 문서를 주시문서 목�� 추가',
 'tooltip-recreate'                => '문서를 편집하는 중 삭제�어� 새로 만들기',
 'tooltip-upload'                  => '파� 올리기 시작',
+'tooltip-rollback'                => '"��리기" 기능� 사용하면 � 문서� 대한 마지막 기여�� 편집� 모� ��릴 수 있습니다.',
+'tooltip-undo'                    => '"편집 취소" 기능� 사용하면 � 편집� ��려지고, 차�보기 기능� 미리보기 형�으로 나타납니다. 
+편집 요약� � 편집� 왜 ��리는지� 대한 �유를 쓸 수 있습니다.',
 
 # Stylesheets
 'common.css'   => '/** � CSS 설정� 모든 스킨� �용�니다 */',
@@ -1878,12 +2415,12 @@ $1',
 'notacceptable'     => '���언트�서 �� 가능한 출력 �맷� 없습니다.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}� �명 사용�',
+'anonymous'        => '{{SITENAME}} �명 사용�',
 'siteuser'         => '{{SITENAME}} 사용� $1',
 'lastmodifiedatby' => '� 문서는 $3� �해 $2, $1� 마지막으로 바뀌었습니다.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1� 작업� 바탕으로 함.',
 'others'           => '기타',
-'siteusers'        => '{{SITENAME}} 사용� $1',
+'siteusers'        => '{{SITENAME}}� $2명� 사용� $1',
 'creditspage'      => '문서 기여�들',
 'nocredits'        => '� 문서�서는 기여� 정보가 없습니다.',
 
@@ -1904,6 +2441,16 @@ $1',
 'numauthors'     => '기여한 사용� 수(문서): $1',
 'numtalkauthors' => '기여한 사용� 수(토론 문서): $1',
 
+# Skin names
+'skinname-standard'    => '�래�',
+'skinname-nostalgia'   => '노스탤지아',
+'skinname-cologneblue' => '쾰른 블루',
+'skinname-monobook'    => '모노�',
+'skinname-myskin'      => '마�스킨',
+'skinname-chick'       => '치�',
+'skinname-simple'      => '심플',
+'skinname-modern'      => '모�',
+
 # Math options
 'mw_math_png'    => '항� PNG로 표시',
 'mw_math_simple' => '아주 간단한 것� HTML로, 나머지는 PNG로',
@@ -1924,11 +2471,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '�신� 편집� 스스로 검토� 것으로 표시하는 것� 허용�지 않습니다.',
 
 # Patrol log
-'patrol-log-page'   => '검토 기�',
-'patrol-log-header' => '� 기�� 검토� 문서� 대한 기�입니다.',
-'patrol-log-line'   => '$2 문서� $1� 검토함 $3',
-'patrol-log-auto'   => '(��)',
-'patrol-log-diff'   => '$1�',
+'patrol-log-page'      => '검토 기�',
+'patrol-log-header'    => '� 기�� 검토� 문서� 대한 기�입니다.',
+'patrol-log-line'      => '$2 문서� $1� 검토함 $3',
+'patrol-log-auto'      => '(��)',
+'patrol-log-diff'      => '$1�',
+'log-show-hide-patrol' => '검토 기�� $1',
 
 # Image deletion
 'deletedrevision'                 => '예전 버전 $1�(가) 삭제�었습니다.',
@@ -1945,9 +2493,12 @@ $1',
 'previousdiff' => '� �전 편집',
 'nextdiff'     => '다� 편집 →',
 
+# Visual comparison
+'visual-comparison' => '시�� 비�',
+
 # Media information
 'mediawarning'         => "'''경고''': � 파��는 시스템� 위험하게 만드는 악성 코드가 들어있� 수 있습니다.<hr />",
-'imagemaxsize'         => '그림 설명 문서� 그림 �기를 제한:',
+'imagemaxsize'         => '파� 설명 문서� 그림 �기를 제한하기:',
 'thumbsize'            => '섬네� �기:',
 'widthheightpage'      => '$1×$2, $3페�지',
 'file-info'            => '(파� �기: $1, MIME 종류: $2)',
@@ -1957,10 +2508,12 @@ $1',
 'show-big-image'       => '최대 해��',
 'show-big-image-thumb' => '<small>미리보기 �기: $1 × $2 픽셀</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '새 파� 목�',
 'imagelisttext'         => '$1개� 파�� $2 순으로 정렬�어 있습니다.',
 'newimages-summary'     => '� 특수 문서는 최근� 올�온 파�� 나열하고 있습니다.',
+'newimages-legend'      => 'í•„í„°',
+'newimages-label'       => '파� �름 (�는 그 �부분):',
 'showhidebots'          => '(봇� $1)',
 'noimages'              => '그림� 없습니다.',
 'ilsubmit'              => '찾기',
@@ -1985,7 +2538,7 @@ Variants for Chinese language
 
 # Metadata
 'metadata'          => '메타��터',
-'metadata-help'     => '� 파�� 카메�/스�너�서 추가한 부가 정보를 담고 있습니다. 파�� 편집한다면, 변경� 그림�는 �부 부가 정보가 빠질 수 있습니다.',
+'metadata-help'     => '� 파�� 카메�/스�너�서 기�한 부가 정보를 가지고 있습니다. 프로그램�서 파�� 편집할 경우, 새로 저장한 그림 파�� �부 부가 정보가 빠질 수 있습니다.',
 'metadata-expand'   => '�세한 정보 보�기',
 'metadata-collapse' => '�세한 정보 숨기기',
 'metadata-fields'   => 'EXIF 메타��터 표가 접혀 있� 때, 다�� �성값만� 기본�으로 보�게 �니다. 나머지 값� ���으로 숨겨집니다.
@@ -1997,48 +2550,127 @@ Variants for Chinese language
 * focallength', # Do not translate list items
 
 # EXIF tags
-'exif-imagewidth'          => '너비',
-'exif-imagelength'         => '높�',
-'exif-orientation'         => 'ë°©í–¥',
-'exif-xresolution'         => '수� 해��',
-'exif-yresolution'         => '수� 해��',
-'exif-datetime'            => '파�� 변경� 날짜와 시간',
-'exif-imagedescription'    => '그림 제목',
-'exif-make'                => '카메� 제조사',
-'exif-model'               => '카메� 모�',
-'exif-software'            => '사용� 소프트웨어',
-'exif-artist'              => '저작�',
-'exif-copyright'           => '저작권�',
-'exif-exifversion'         => 'Exif 버전',
-'exif-colorspace'          => '색 공간',
-'exif-pixelydimension'     => '유효한 그림 너비',
-'exif-pixelxdimension'     => '유효한 그림 높�',
-'exif-relatedsoundfile'    => '관련� 오디오 파�',
-'exif-datetimeoriginal'    => '날짜와 시간',
-'exif-exposuretime'        => '노출 시간',
-'exif-exposuretime-format' => '$1ì´ˆ ($2)',
-'exif-fnumber'             => 'F 번호',
-'exif-exposureprogram'     => '노출 프로그램',
-'exif-shutterspeedvalue'   => '셔터 ��',
-'exif-aperturevalue'       => '조리개',
-'exif-brightnessvalue'     => '�기',
-'exif-lightsource'         => '광�',
-'exif-flash'               => '플래시',
-'exif-focallength'         => '렌즈 초� 거리',
-'exif-exposureindex'       => '노출 지수',
-'exif-exposuremode'        => '노출 방�',
-'exif-whitebalance'        => '화�트 밸런스',
-'exif-digitalzoomratio'    => '디지털 줌 비율',
-'exif-saturation'          => '채�',
-'exif-gpslatituderef'      => '�위 �는 남위',
-'exif-gpslatitude'         => '위�',
-'exif-gpslongituderef'     => '�경 �는 서경',
-'exif-gpslongitude'        => '경�',
-'exif-gpsaltituderef'      => '고� 정보',
-'exif-gpsaltitude'         => '고�',
-'exif-gpstimestamp'        => 'GPS 시간 (�� 시계)',
-'exif-gpsstatus'           => '수신기 �태',
-'exif-gpsdatestamp'        => 'GPS 날짜',
+'exif-imagewidth'                  => '너비',
+'exif-imagelength'                 => '높�',
+'exif-bitspersample'               => '픽셀당 비트 수',
+'exif-compression'                 => '압축 방�',
+'exif-photometricinterpretation'   => '픽셀 배열',
+'exif-orientation'                 => 'ë°©í–¥',
+'exif-samplesperpixel'             => '화소 수',
+'exif-planarconfiguration'         => '��터 정렬 방�',
+'exif-ycbcrsubsampling'            => 'Y와 C� 축소 비율',
+'exif-ycbcrpositioning'            => 'Y와 C 위치',
+'exif-xresolution'                 => '수� 해��',
+'exif-yresolution'                 => '수� 해��',
+'exif-resolutionunit'              => 'X, Y방향 해�� 단위',
+'exif-stripoffsets'                => '�미지 ��터 위치',
+'exif-rowsperstrip'                => '스트립당 줄� 수',
+'exif-stripbytecounts'             => '압축� 스트립당 바�트 수',
+'exif-jpeginterchangeformat'       => 'JPEG SOI와� 차�',
+'exif-jpeginterchangeformatlength' => 'JPEG ��터 바�트 수',
+'exif-transferfunction'            => '광학 전달 함수',
+'exif-whitepoint'                  => '화�트 ��트 색�',
+'exif-primarychromaticities'       => '색�� 우선 색',
+'exif-ycbcrcoefficients'           => '색 공간 변환 표 계수',
+'exif-referenceblackwhite'         => '�백 값� 대한 정보',
+'exif-datetime'                    => '파�� 변경� 날짜와 시간',
+'exif-imagedescription'            => '그림 제목',
+'exif-make'                        => '카메� 제조사',
+'exif-model'                       => '카메� 모�',
+'exif-software'                    => '사용� 소프트웨어',
+'exif-artist'                      => '저작�',
+'exif-copyright'                   => '저작권�',
+'exif-exifversion'                 => 'Exif 버전',
+'exif-flashpixversion'             => '지�하는 플래시픽스 버전',
+'exif-colorspace'                  => '색 공간',
+'exif-componentsconfiguration'     => '� 구성 요소� �미',
+'exif-compressedbitsperpixel'      => '�미지 압축 방�',
+'exif-pixelydimension'             => '유효한 그림 너비',
+'exif-pixelxdimension'             => '유효한 그림 높�',
+'exif-makernote'                   => '제조사 주',
+'exif-usercomment'                 => '사용� 주',
+'exif-relatedsoundfile'            => '관련� 오디오 파�',
+'exif-datetimeoriginal'            => '날짜와 시간',
+'exif-datetimedigitized'           => '디지털화� 날짜와 시간',
+'exif-subsectime'                  => '파�� 변경� 날짜와 시간 (초 단위 미만)',
+'exif-subsectimeoriginal'          => '파� �성시 날짜와 시간 (초단위 미만)',
+'exif-subsectimedigitized'         => '디지털화� 날짜와 시간 (초단위 미만)',
+'exif-exposuretime'                => '노출 시간',
+'exif-exposuretime-format'         => '$1ì´ˆ ($2)',
+'exif-fnumber'                     => 'F 번호',
+'exif-exposureprogram'             => '노출 프로그램',
+'exif-spectralsensitivity'         => '스펙트럼 ��',
+'exif-isospeedratings'             => 'ISO ��',
+'exif-oecf'                        => '광전� 변환 함수',
+'exif-shutterspeedvalue'           => '셔터 ��',
+'exif-aperturevalue'               => '조리개',
+'exif-brightnessvalue'             => '�기',
+'exif-exposurebiasvalue'           => '노출 보정값',
+'exif-maxaperturevalue'            => '최대 조리개 값 (최소 F 값)',
+'exif-subjectdistance'             => '대�과� 거리',
+'exif-meteringmode'                => '측광 방�',
+'exif-lightsource'                 => '광�',
+'exif-flash'                       => '플래시',
+'exif-focallength'                 => '렌즈 초� 거리',
+'exif-subjectarea'                 => '대� 위치',
+'exif-flashenergy'                 => '플래시 광량',
+'exif-spatialfrequencyresponse'    => '공간 주파수 반�',
+'exif-focalplanexresolution'       => '초�면 X방향 해��',
+'exif-focalplaneyresolution'       => '초�면 Y방향 해��',
+'exif-focalplaneresolutionunit'    => '초�면 해�� 단위',
+'exif-subjectlocation'             => '대� 위치',
+'exif-exposureindex'               => '노출 지수',
+'exif-sensingmethod'               => '�지 방�',
+'exif-filesource'                  => '파� 출처',
+'exif-scenetype'                   => '촬� 모드',
+'exif-cfapattern'                  => 'CFA 패턴',
+'exif-customrendered'              => '�미지 처리 방�',
+'exif-exposuremode'                => '노출 방�',
+'exif-whitebalance'                => '화�트 밸런스',
+'exif-digitalzoomratio'            => '디지털 줌 비율',
+'exif-focallengthin35mmfilm'       => '35 mm 필름�서� 초� 거리',
+'exif-scenecapturetype'            => '장면 �착 방�',
+'exif-gaincontrol'                 => '장면 제어',
+'exif-contrast'                    => '대비',
+'exif-saturation'                  => '채�',
+'exif-sharpness'                   => '선명�',
+'exif-devicesettingdescription'    => '장치 설정� 대한 설명',
+'exif-subjectdistancerange'        => '대�과� 거리 범위',
+'exif-imageuniqueid'               => '�미지 고유 ID',
+'exif-gpsversionid'                => 'GPS 태그 버전',
+'exif-gpslatituderef'              => '�위 �는 남위',
+'exif-gpslatitude'                 => '위�',
+'exif-gpslongituderef'             => '�경 �는 서경',
+'exif-gpslongitude'                => '경�',
+'exif-gpsaltituderef'              => '고� 정보',
+'exif-gpsaltitude'                 => '고�',
+'exif-gpstimestamp'                => 'GPS 시간 (�� 시계)',
+'exif-gpssatellites'               => '측정� 사용� 위성',
+'exif-gpsstatus'                   => '수신기 �태',
+'exif-gpsmeasuremode'              => '측정 방�',
+'exif-gpsdop'                      => '측정 정확�',
+'exif-gpsspeedref'                 => '�� 단위',
+'exif-gpsspeed'                    => 'GPS 수신기 ��',
+'exif-gpstrackref'                 => '�� 방향� 대한 정보',
+'exif-gpstrack'                    => '�� 방향',
+'exif-gpsimgdirectionref'          => '�미지 방향� 대한 정보',
+'exif-gpsimgdirection'             => '�미지 방향',
+'exif-gpsmapdatum'                 => '측지 조사 ��처 사용',
+'exif-gpsdestlatituderef'          => '목�지� 위� 정보',
+'exif-gpsdestlatitude'             => '목�지� 위�',
+'exif-gpsdestlongituderef'         => '목�지� 경� 정보',
+'exif-gpsdestlongitude'            => '목�지� 경�',
+'exif-gpsdestbearingref'           => '목�지� 방향� 대한 정보',
+'exif-gpsdestbearing'              => '목�지� 방향',
+'exif-gpsdestdistanceref'          => '목�지까지� 거리 정보',
+'exif-gpsdestdistance'             => '목�지와� 거리',
+'exif-gpsprocessingmethod'         => 'GPS 처리 방�� �름',
+'exif-gpsareainformation'          => 'GPS 구역 �름',
+'exif-gpsdatestamp'                => 'GPS 날짜',
+'exif-gpsdifferential'             => 'GPS 차� 보정',
+
+# EXIF attributes
+'exif-compression-1' => '압축�지 않�',
 
 'exif-unknowndate' => '날짜를 알 수 없�',
 
@@ -2051,19 +2683,40 @@ Variants for Chinese language
 'exif-orientation-7' => '시계 방향으로 90° 회전하고 수�으로 뒤집�', # 0th row: right; 0th column: bottom
 'exif-orientation-8' => '시계 반대 방향으로 90° 회전�', # 0th row: left; 0th column: bottom
 
+'exif-planarconfiguration-1' => '�어리 형�',
+'exif-planarconfiguration-2' => '�면형',
+
+'exif-componentsconfiguration-0' => '존재하지 않�',
+
+'exif-exposureprogram-0' => '정��지 않�',
 'exif-exposureprogram-1' => '수�',
+'exif-exposureprogram-2' => '�반 프로그램',
 'exif-exposureprogram-3' => '조리개 우선',
 'exif-exposureprogram-4' => '셔터 우선',
+'exif-exposureprogram-5' => '�리��티브 프로그램 (깊� 부분 우선)',
+'exif-exposureprogram-6' => '액션 프로그램 (빠른 셔터 ��� 치중)',
+'exif-exposureprogram-7' => '�물 사진 모드 (배경� 초� 밖으로 하여 대�� 강조)',
+'exif-exposureprogram-8' => '�경 모드 (초�� 배경� �경 사진용)',
 
 'exif-subjectdistance-value' => '$1 미터',
 
-'exif-meteringmode-0' => '알 수 없�',
+'exif-meteringmode-0'   => '알 수 없�',
+'exif-meteringmode-1'   => '�균 측광',
+'exif-meteringmode-2'   => '중앙 중� �균 측광',
+'exif-meteringmode-3'   => '스팟 측광',
+'exif-meteringmode-4'   => '멀티스팟 측광',
+'exif-meteringmode-5'   => '�가 측광',
+'exif-meteringmode-6'   => '부분',
+'exif-meteringmode-255' => '기타',
 
 'exif-lightsource-0'   => '알 수 없�',
 'exif-lightsource-1'   => '태양광',
 'exif-lightsource-2'   => '형광등',
 'exif-lightsource-3'   => '텅스� (백열광)',
 'exif-lightsource-4'   => '플래시',
+'exif-lightsource-9'   => '맑� 날씨',
+'exif-lightsource-10'  => '�린 날씨',
+'exif-lightsource-11'  => '그늘',
 'exif-lightsource-12'  => '주광색 형광등 (D 5700 – 7100K)',
 'exif-lightsource-13'  => '주백색 형광등 (N 4600 – 5400K)',
 'exif-lightsource-14'  => '냉백색 형광등 (W 3900 – 4500K)',
@@ -2071,12 +2724,39 @@ Variants for Chinese language
 'exif-lightsource-17'  => '표준 A',
 'exif-lightsource-18'  => '표준 B',
 'exif-lightsource-19'  => '표준 C',
+'exif-lightsource-24'  => 'ISO 스튜디오 백열광',
 'exif-lightsource-255' => '다른 광�',
 
+# Flash modes
+'exif-flash-fired-0'    => '플래시가 터지지 않�',
+'exif-flash-fired-1'    => '플래시 터�',
+'exif-flash-return-0'   => '플래시 반사광 �지 기능� 사용하지 않�',
+'exif-flash-return-2'   => '플래시 반사광� �지�지 않�',
+'exif-flash-return-3'   => '플래시 반사광� �지�',
+'exif-flash-mode-1'     => '플래시 강제',
+'exif-flash-mode-2'     => '플래시 억제',
+'exif-flash-mode-3'     => '�� 모드',
+'exif-flash-function-1' => '플래시 기능 없�',
+'exif-flash-redeye-1'   => '�목 방지 모드',
+
 'exif-focalplaneresolutionunit-2' => '�치',
 
+'exif-sensingmethod-1' => '정��지 않�',
+'exif-sensingmethod-2' => '1칩 색 공간 센서',
+'exif-sensingmethod-3' => '2칩 색 공간 센서',
+'exif-sensingmethod-4' => '3칩 색 공간 센서',
+'exif-sensingmethod-5' => '순차� 색 공간 센서',
+'exif-sensingmethod-7' => '3선 센서',
+'exif-sensingmethod-8' => '순차� 색 공간 선형 센서',
+
+'exif-scenetype-1' => '�접 촬�� �미지',
+
+'exif-customrendered-0' => '�반',
+'exif-customrendered-1' => '사용� 정�',
+
 'exif-exposuremode-0' => '�� 노출',
 'exif-exposuremode-1' => '수� 노출',
+'exif-exposuremode-2' => '�� 노출 브래킷',
 
 'exif-whitebalance-0' => '�� 화�트 밸런스',
 'exif-whitebalance-1' => '수� 화�트 밸런스',
@@ -2086,10 +2766,29 @@ Variants for Chinese language
 'exif-scenecapturetype-2' => '�물 사진',
 'exif-scenecapturetype-3' => '야경 사진',
 
+'exif-gaincontrol-0' => '없�',
+'exif-gaincontrol-1' => '약하게 �가',
+'exif-gaincontrol-2' => '강하게 �가',
+'exif-gaincontrol-3' => '약하게 �소',
+'exif-gaincontrol-4' => '강하게 �소',
+
+'exif-contrast-0' => '보통',
+'exif-contrast-1' => '부드러움',
+'exif-contrast-2' => '강함',
+
 'exif-saturation-0' => '보통',
 'exif-saturation-1' => '저채�',
 'exif-saturation-2' => '고채�',
 
+'exif-sharpness-0' => '보통',
+'exif-sharpness-1' => '부드러움',
+'exif-sharpness-2' => '강함',
+
+'exif-subjectdistancerange-0' => '알 수 없�',
+'exif-subjectdistancerange-1' => '접사',
+'exif-subjectdistancerange-2' => '근거리',
+'exif-subjectdistancerange-3' => '�거리',
+
 # Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
 'exif-gpslatitude-n' => '�위',
 'exif-gpslatitude-s' => '남위',
@@ -2098,6 +2797,12 @@ Variants for Chinese language
 'exif-gpslongitude-e' => '�경',
 'exif-gpslongitude-w' => '서경',
 
+'exif-gpsstatus-a' => '측정 중',
+'exif-gpsstatus-v' => '�터랙티브 측정',
+
+'exif-gpsmeasuremode-2' => '2차� 측정',
+'exif-gpsmeasuremode-3' => '3차� 측정',
+
 # Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
 'exif-gpsspeed-k' => '킬로미터 매 시간',
 'exif-gpsspeed-m' => '마� 매 시간',
@@ -2168,28 +2873,20 @@ $5
 문서를 다시 �살릴 필요가 있는지를 확�해주세요.',
 'recreate'            => '새로 만들기',
 
-# HTML dump
-'redirectingto' => '[[:$1]]로 넘어가는 중...',
-
 # action=purge
-'confirm_purge'        => '문서� �시를 지울까요?
-
-$1',
 'confirm_purge_button' => '확�',
-
-# AJAX search
-'searchcontaining' => '"$1"� �함� 글� 검색합니다.',
-'searchnamed'      => '"$1" �름� 가진 문서를 검색합니다.',
-'articletitles'    => "''$1''(으)로 시작하는 문서들",
-'hideresults'      => '결과 숨기기',
-'useajaxsearch'    => 'AJAX 찾기 기능 사용하기',
+'confirm-purge-top'    => '문서� �시를 지울까요?',
+'confirm-purge-bottom' => '문서를 새로고침하는 것� �시를 갱신하고 가장 최근� 버전� 나타나게 할 것입니다.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� �전 문서',
 'imgmultipagenext' => '다� 문서 →',
 'imgmultigo'       => '��',
+'imgmultigoto'     => '$1 문서로 가기',
 
 # Table pager
+'ascending_abbrev'         => '오름차순',
+'descending_abbrev'        => '내림차순',
 'table_pager_next'         => '다� 문서',
 'table_pager_prev'         => '�전 문서',
 'table_pager_first'        => '처� 문서',
@@ -2199,13 +2896,17 @@ $1',
 'table_pager_empty'        => '결과 없�',
 
 # Auto-summaries
-'autosumm-blank'   => '문서� 모든 내용� 삭제',
+'autosumm-blank'   => '문서를 비움',
 'autosumm-replace' => '문서 내용� ‘$1’으로 �체',
 'autoredircomment' => '[[$1]](으)로 넘겨주기',
 'autosumm-new'     => '새 문서: $1',
 
 # Live preview
 'livepreview-loading' => '불러오는 중...',
+'livepreview-ready'   => '불러 오는 중… 준비!',
+'livepreview-failed'  => 'Live 미리 보기 실패! �반 미리 보기를 �용해주세요.',
+'livepreview-error'   => '연결� 실패하였습니다: $1 "$2"
+�반 미리보기를 �용하십시오.',
 
 # Friendlier slave lag warnings
 'lag-warn-normal' => '최근 $1 초 안� 변경� 문서 목�� 표시�지 않� 수 있습니다.',
@@ -2234,36 +2935,45 @@ $1',
 'watchlisttools-edit' => '주시문서 목� 보기/편집하기',
 'watchlisttools-raw'  => '주시문서 목� �접 편집하기',
 
+# Core parser functions
+'unknown_extension_tag' => '알 수 없는 확장 기능 태그 "$1"',
+'duplicate-defaultsort' => '경고: 기본 정렬 키 "$2"가 �전� 기본 정렬 키 "$2"를 �어쓰고 있습니다.',
+
 # Special:Version
-'version'                      => '버전', # Not used as normal message but as header for the special page itself
-'version-extensions'           => '설치� 확장 기능',
-'version-specialpages'         => '특수 문서',
-'version-parserhooks'          => '파서 훅',
-'version-other'                => '기타',
-'version-hooks'                => 'í›…',
-'version-extension-functions'  => '확장 함수',
-'version-parser-extensiontags' => '파서 확장 태그',
-'version-hook-name'            => '훅 �름',
-'version-version'              => '버전',
-'version-license'              => '��센스',
-'version-software'             => '설치� 프로그램',
-'version-software-product'     => '제품',
-'version-software-version'     => '버전',
+'version'                          => '버전', # Not used as normal message but as header for the special page itself
+'version-extensions'               => '설치� 확장 기능',
+'version-specialpages'             => '특수 문서',
+'version-parserhooks'              => '파서 훅',
+'version-variables'                => '변수',
+'version-other'                    => '기타',
+'version-mediahandlers'            => '미디어 핸들러',
+'version-hooks'                    => 'í›…',
+'version-extension-functions'      => '확장 함수',
+'version-parser-extensiontags'     => '파서 확장 태그',
+'version-parser-function-hooks'    => '파서 기능 훅',
+'version-skin-extension-functions' => '스킨 확장 기능',
+'version-hook-name'                => '훅 �름',
+'version-hook-subscribedby'        => '훅� 사용� 위치',
+'version-version'                  => '버전',
+'version-license'                  => '��센스',
+'version-software'                 => '설치� 프로그램',
+'version-software-product'         => '제품',
+'version-software-version'         => '버전',
 
 # Special:FilePath
 'filepath'         => '파� 경로',
 'filepath-page'    => '파�:',
 'filepath-submit'  => '경로',
-'filepath-summary' => '파�� 전체 주소를 알려�니다.
-그림� 최고 해��로 보여주고 다른 파�� 연결� 프로그램으로 바로 실행합니다.
+'filepath-summary' => '파�� 실제 URL 주소를 엽니다.
+그림 파�� 경우 �본 해��� 파�� 열립니다. 다른 종류� 파�� 경우 그 파�� 종류� 맞는 프로그램� 실행�니다.
 
-"{{ns:image}}:" 접�어를 빼고 파� �름만 넣으세요.',
+"{{ns:file}}:" 접�어를 뺀 파� �름� 입력해주세요.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '중복� 파� 찾기',
 'fileduplicatesearch-summary'  => '파� 해시값� �용해 중복 파�� 찾습니다.
 
-"{{ns:image}}:" 접�어를 뺀 파� �름� 넣어주세요.',
+"{{ns:file}}:" 접�어를 뺀 파� �름� 넣어주세요.',
 'fileduplicatesearch-legend'   => '중복 찾기',
 'fileduplicatesearch-filename' => '파� �름:',
 'fileduplicatesearch-submit'   => '찾기',
@@ -2287,8 +2997,19 @@ $1',
 'specialpages-group-pagetools'   => '문서 �구',
 'specialpages-group-wiki'        => '위키 정보와 �구',
 'specialpages-group-redirects'   => '넘겨주기 특수 문서',
+'specialpages-group-spam'        => '스팸 처리 �구',
 
 # Special:BlankPage
-'blankpage' => '빈 문서',
+'blankpage'              => '빈 문서',
+'intentionallyblankpage' => '� 문서는 고��으로 빈 채 방치�어 있습니다.',
+
+# External image whitelist
+'external_image_whitelist' => '  #� 줄� 그대로 �십시오<pre>
+#정규 표현�� 아래� � 주십시오.
+#� 목�� 외부 �미지� URL과 대조� 것입니다.
+#� 목�과 �치하는 것� 그림� �접 보여지지만, 그렇지 않� 경우 그림� 가리키는 ��만 보�게 � 것입니다.
+# "#"으로 시작하는 줄� 주�으로 간주�니다.
+
+#모든 정규 표현�� � 줄 위� 넣어 주십시오. 그리고 � 줄� 그대로 �십시오.</pre>',
 
 );
diff --git a/languages/messages/MessagesKri.php b/languages/messages/MessagesKri.php
new file mode 100644
index 00000000..4050abc9
--- /dev/null
+++ b/languages/messages/MessagesKri.php
@@ -0,0 +1,407 @@
+<?php
+/** Krio (Krio)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Jose77
+ * @author Meno25
+ * @author Protostar
+ */
+
+$messages = array(
+# User preference toggles
+'tog-justify'         => 'johstifai di paragraf-dehm',
+'tog-hideminor'       => 'Aid di smohl-smohl chenj-dehm na di list ov tin-dehm we dehm johs chenj',
+'tog-extendwatchlist' => 'Luk di big watchlist we geht ohltin we dehm dohn chenj',
+
+# Dates
+'sun'           => 'Sohn',
+'mon'           => 'Mohn',
+'tue'           => 'Tyu',
+'wed'           => 'Wehn',
+'thu'           => 'Toh',
+'fri'           => 'Frai',
+'sat'           => 'Sat',
+'january'       => 'Janyuari',
+'february'      => 'Fèbyuari',
+'march'         => 'Mach',
+'april'         => 'Epril',
+'may_long'      => 'Mey',
+'june'          => 'Jun',
+'july'          => 'Julai',
+'august'        => 'Ògòst',
+'september'     => 'Sèptèmba',
+'october'       => 'Ã’ktoba',
+'november'      => 'Novèmba',
+'december'      => 'Disèmba',
+'january-gen'   => 'Janyuari',
+'february-gen'  => 'Fehbuari',
+'march-gen'     => 'Mach',
+'april-gen'     => 'Epril',
+'may-gen'       => 'Mey',
+'june-gen'      => 'Jun',
+'july-gen'      => 'Julai',
+'august-gen'    => 'Ohgohst',
+'september-gen' => 'Sehptehmba',
+'october-gen'   => 'Ohktoba',
+'november-gen'  => 'Novehmba',
+'december-gen'  => 'Disehmba',
+'jan'           => 'Jan',
+'feb'           => 'Fèb',
+'mar'           => 'Mach',
+'apr'           => 'Apr',
+'may'           => 'Mey',
+'jun'           => 'Jun',
+'jul'           => 'Jul',
+'aug'           => 'Ã’g',
+'sep'           => 'Seh',
+'oct'           => 'Ã’kt',
+'nov'           => 'Nov',
+'dec'           => 'Dis',
+
+# Categories related messages
+'pagecategories'        => '{{PLURAL:$1|Katigòri|Katigòri-dèm}}',
+'category_header'       => 'Pej-dehm we de na katigori "$1"',
+'subcategories'         => 'Sohbkatigori-dehm',
+'category-media-header' => 'Midya we de na katigori "$1"',
+'category-empty'        => "''Dis katigori-ya noh geht noh pej o midya foh naw.''",
+'hidden-categories'     => '{{PLURAL:$1|Katigori we dehm dohn ayd|Katigori-dehm we dehm dohn ayd}}',
+
+'qbedit' => 'Chenj',
+'mytalk' => 'Mi Tohk',
+
+'returnto'         => 'Go bak tu $1.',
+'tagline'          => 'Dis kòmòt {{SITENAME}}',
+'help'             => 'Ehp mi',
+'search'           => 'Luk fò am',
+'searchbutton'     => 'Luk fò am',
+'go'               => 'Go to am',
+'searcharticle'    => 'Go de',
+'history'          => 'Pej-im istri',
+'history_short'    => 'Istri',
+'updatedmarker'    => 'wetin dehm dohn ohpdet since wehn ah las kam',
+'info_short'       => 'Infohmeshohn',
+'printableversion' => 'Vazhòn fò Print',
+'permalink'        => 'Pamanènt link',
+'print'            => 'Print am',
+'edit'             => 'Chenj',
+'create'           => 'Mek sòmtin',
+'editthispage'     => 'Edit dis pej-ya',
+'create-this-page' => 'Mek dis pej-ya',
+'delete'           => 'Ires',
+'deletethispage'   => 'Ires dis pej-ya',
+'protectthispage'  => 'Protekt dis pej-ya',
+'talkpagelinktext' => 'Tòk',
+'specialpage'      => 'Spehshal Pej',
+'personaltools'    => 'Mi-yon tul-dèm',
+'postcomment'      => 'Lef yu-yon opinyon',
+'articlepage'      => 'Luk wetin de insai',
+'talk'             => 'Diskòshòn',
+'views'            => 'We-dèm fò luk dis pej-ya',
+'toolbox'          => 'Tulbòks',
+'userpage'         => 'Luk dis pohsin-im yuza-pej',
+'jumpto'           => 'Jomp go:',
+'jumptonavigation' => 'navigeshòn',
+'jumptosearch'     => 'luk fò am',
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite'            => 'Na bòt {{SITENAME}}',
+'aboutpage'            => 'Project:Na bòt',
+'copyright'            => 'Dis kòtènt-im prais nò pass $1 .',
+'copyrightpagename'    => '{{wehbsait-im nem}} kohpirait',
+'disclaimers'          => 'Disklema-dèm',
+'disclaimerpage'       => 'Project:Disklema fò òltin',
+'edithelp'             => 'Advais foh we yu wan ehdit',
+'edithelppage'         => 'Help:Ehditin',
+'faq'                  => 'Kweshtyohn-dehm we ohlman de aks',
+'faqpage'              => 'Project:Kwehstyohn-dehm we ohlman de aks',
+'helppage'             => 'Help:Kohntehnt-dehm',
+'mainpage'             => 'Men Pej',
+'mainpage-description' => 'Men Pej',
+'policy-url'           => 'Project:Pohlisi',
+'portal'               => 'Mitin-ples foh yuza-dehm',
+'portal-url'           => 'Project:Mitin-ples foh yuza-dehm',
+'privacy'              => 'Pohlisi fò Praivesi',
+'privacypage'          => 'Project:Pòlisi fò Praivesi',
+
+'badaccess'        => 'Yu noh geh pamishohn foh luk dis',
+'badaccess-group0' => 'Yu noh geht pamishohn foh du wetin yu johs chuz',
+'badaccess-groups' => 'Na di pipul-dehm we dohn johyn {{PLURAL:$2|the group|one of the groups}}: $1 nohmoh ebul du wetin yu johs chuz.',
+
+'versionrequired'     => 'Yu nid MediaWiki Vazhohn $1',
+'versionrequiredtext' => 'Yu nid MediaWiki Vazhohn $1 foh yuz dis pej-ya.
+Luk [[Special:Version|version page]].',
+
+'ok'                   => 'OK',
+'retrievedfrom'        => 'Dis kòmòt "$1"',
+'youhavenewmessages'   => 'Yu dohn geht $1 ($2).',
+'editsection'          => 'chenj',
+'editsection-brackets' => '[$1]',
+'editold'              => 'chenj',
+'viewsourceold'        => 'luk di source',
+'editsectionhint'      => 'chenj dis sèkshòn: $1',
+'toc'                  => 'Wetin de insai',
+'showtoc'              => 'sho am',
+'hidetoc'              => 'aid am',
+'thisisdeleted'        => 'Luk wetin i bi naw o tohn am bak tu wetin i bin bi bifo $1?',
+'viewdeleted'          => 'Luk am $1?',
+'restorelink'          => '{{PLURAL:$1|wan chenj we dehm dohn ires|$1 chenj-dehm we dehm dohn ires}}',
+'feedlinks'            => 'Feed:',
+'site-rss-feed'        => '$1 RSS Feed',
+'site-atom-feed'       => '$1 Atom Feed',
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-user'      => 'Yuza-im Pej',
+'nstab-media'     => 'Media Pej',
+'nstab-special'   => 'Spèshal Pej',
+'nstab-project'   => 'Projèkt Pej',
+'nstab-image'     => 'Fail',
+'nstab-mediawiki' => 'Mèsej',
+'nstab-template'  => 'Tèmplet',
+'nstab-help'      => 'Advais pej',
+'nstab-category'  => 'Katigòri',
+
+# Main script and global functions
+'nosuchaction'      => 'Da kain akshòn nò de',
+'nosuchactiontext'  => 'Di wiki nò de òndastand di akshòn we di URL tèll am fò du',
+'nosuchspecialpage' => 'Da kain spehshal pej noh de',
+
+# General errors
+'viewsource' => 'Luk di source',
+
+# Login and logout pages
+'nav-login-createaccount' => ' Kam insai di sait/ Mek yu-yon yuza',
+'loginprompt'             => 'Yu go geht foh lait yu cookies bifo yu go ebul foh kam insai {{SITENAME}}.',
+'userlogin'               => 'Kam insai di sait / Mek yu-yon yuza',
+'logout'                  => 'Kohmoh na di sait',
+'userlogout'              => 'Kohmoh na di sait',
+'notloggedin'             => 'Yu noh kam insai di sait yet',
+'nologin'                 => 'Yu noh geht yuza login? $1.',
+'nologinlink'             => 'Mek yu-yon yuza login',
+'createaccount'           => 'I dohn',
+'gotaccount'              => 'Yu dohn mek yu yuza login? $1.',
+'gotaccountlink'          => 'Kam insai di sait',
+'createaccountmail'       => 'wit e-mel',
+'badretype'               => 'Di tu paswohd-dehm noh mach.',
+'userexists'              => 'Ohda pohsin dohn tek da yuzanem de.
+Yu go geht foh pik ohda wan.',
+'youremail'               => 'E-mail:',
+'username'                => 'Yuzanem:',
+
+# Edit pages
+'watchthis'                        => 'Wach dis pej-ya',
+'savearticle'                      => 'Sev dis pej-ya',
+'showpreview'                      => 'Luk di privyu',
+'showlivepreview'                  => 'Luk di laiv privyu',
+'showdiff'                         => 'Sho wetin dohn chenj',
+'anoneditwarning'                  => "'''Wet O:''' Yu noh log-in yet.
+So dehm go sev yu IP address na di pej-im chenj istri",
+'missingsummary'                   => "'''Mehmba se:''' yu noh mek chenj sohmari.
+If yu pres Sev bak, dehm go sev yu chenj lehk so.",
+'missingcommenttext'               => 'Rait yu opinyohn ohnda yah.',
+'permissionserrorstext-withaction' => 'Yu noh go ebul fo $2, bicoh {{PLURAL:$1|reason|reasons}}:',
+'recreate-deleted-warn'            => "'''Ebo!!: Yu de mek bak wan pej we dehm bin dohn ires.'''
+
+Yu sabi if yu foh wok pan dis pej-ya.
+Di log we dehm kip foh dis pej-in dilishohn de ya:",
+'deleted-notice'                   => 'Dehm dohn ires dis pej-ya.
+Di log we dehm kip foh dis pej-in dilishohn de ya:',
+'deletelog-fulllog'                => 'Luk di wan-ol lohg',
+'edit-hook-aborted'                => 'Wan Hook dohn pul wetin yu chenj.
+I noh eksplen wetin-mek.',
+'edit-gone-missing'                => 'Wi noh ebul updet dis pej-ya.
+Sohmtehm dehm dohn ires am.',
+'edit-conflict'                    => 'Chenj dehm tin-dehm ya we noh gri wit dehm kohmpin.',
+'edit-no-change'                   => 'Wi no luk wetin yu chenj, bicoh yu no chenj wetin rait de.',
+
+# History pages
+'last'       => 'las',
+'page_first' => 'fohs',
+'page_last'  => 'las',
+
+# Merge log
+'revertmerge' => 'Ã’nmaj',
+
+# Diffs
+'editundo'          => 'chenj am bak tu wetin i bin bi bifo',
+'diff-multi'        => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown)',
+'diff-movedto'      => 'dèm dòn muf am go $1',
+'diff-styleadded'   => '$1 dèm dòn add dis stail',
+'diff-added'        => '$1 dèm dòn add am',
+'diff-changedto'    => 'Dèm dòn chenj am tu $1',
+'diff-movedoutof'   => 'Dèm dòn muf am kòmòt $1',
+'diff-styleremoved' => '$1 dèm dòn pul dis stail',
+'diff-removed'      => '$1 Dèm dòn pul am',
+'diff-changedfrom'  => 'Dèm dòn tek $1 mek',
+'diff-src'          => 'sòce',
+
+# Search results
+'prevn'              => 'Go bak $1',
+'nextn'              => 'nèks wan $1',
+'searchhelp-url'     => 'Help:Kohntehnt-dehm',
+'powersearch'        => 'Luk fò sòmtin kyaful-wan',
+'powersearch-legend' => 'Luk fò sòmtin fain-wan',
+'powersearch-ns'     => 'Luk fò sòmtin na namespaces:',
+'powersearch-redir'  => 'List de sèn yu kam yah',
+'powersearch-field'  => 'Luk fò',
+'search-external'    => 'Go fehn am ohdasai',
+'searchdisabled'     => '{{websait-im nem}} Di shach no de wok.
+We yu de wet foh mek im kam bak yu kin yuz Google yon.
+Mehmba se sohmtehm dehm indeks-dehm noh ohp-tu-det {{SITENAME}}.',
+
+# Preferences page
+'prefsnologin'      => 'Yu noh kam insai di sait yet',
+'searchresultshead' => 'Luk foh am',
+
+# Upload
+'upload'          => 'Ã’plod fail',
+'uploadbtn'       => 'Ohplod fail',
+'uploadnologin'   => 'Yu noh kam insai di sait yet',
+'watchthisupload' => 'Wach dis pej-ya',
+
+# File description page
+'filehist-deleteone' => 'ires',
+'filehist-datetime'  => 'Det/Taim',
+'filehist-thumb'     => 'Tohmnel',
+'imagelinks'         => 'Link-dehm',
+'linkstoimage'       => 'Dehm {{PLURAL:$1|pej de link|pej-dehm ya de link}} go dis fail:',
+'linkstoimage-more'  => 'I pahs wan $1 {{PLURAL:$1|pej we de link|pej-dem we delink}} go dis fail-ya.
+Dis list geht di{{PLURAL:$1|fohs pej link|fohs $1 pej link-dehm}} foh dis fail nohmoh.
+Di [[Special:WhatLinksHere/$2|ful list]] de yah.',
+'nolinkstoimage'     => 'Dis fail-ya noh geht noh pej we de link go tu am.',
+
+# File deletion
+'filedelete-submit' => 'Ires',
+
+'brokenredirects-edit'   => '(chenj)',
+'brokenredirects-delete' => '(ires)',
+
+# Miscellaneous special pages
+'movethispage' => 'Muf dis pej-ya',
+
+# Book sources
+'booksources-go' => 'Go to am',
+
+# Special:AllPages
+'alphaindexline' => '$1 tu $2',
+
+# Special:LinkSearch
+'linksearch-ok' => 'Luk foh am',
+
+# Watchlist
+'watchlist'         => 'Mi list foh wach',
+'mywatchlist'       => 'Mi list foh wach',
+'watchlistfor'      => "(foh '''$1''')",
+'nowatchlist'       => 'Yu noh geht natin na yu list foh wach.',
+'watchlistanontext' => '$1 Foh luk o chenj wetin de na yu list foh wach',
+'watchnologin'      => 'Yu noh kam insai di sait yet',
+'watch'             => 'Wach',
+'watchthispage'     => 'Wach dis pej-ya',
+'unwatch'           => 'Lèf fò wach dis pej-ya',
+'unwatchthispage'   => 'Lehf foh wach',
+'notanarticle'      => 'Dis pej-ya noh de tehl yu wetin de insai',
+'notvisiblerev'     => 'Dehm dohn ires di rivizhon',
+
+# Displayed when you click the "watch" button and it is in the process of watching
+'watching'   => 'Ah de wach...',
+'unwatching' => 'Ah de lehf foh wach...',
+
+# Delete
+'deletepage'    => 'Ires dis pej-ya',
+'confirm'       => 'Kohnfam',
+'excontent'     => "Nah dis i bin geht/ de tohk boht: '$1'",
+'delete-legend' => 'Ires',
+'dellogpage'    => 'Di list ov wetin dehn dohn ires',
+
+# Restrictions (nouns)
+'restriction-edit'   => 'Chenj',
+'restriction-create' => 'Mek sohmtin',
+
+# Undelete
+'undelete-search-submit' => 'Luk foh am',
+
+'sp-contributions-submit' => 'Luk foh am',
+
+# What links here
+'whatlinkshere' => 'Wetin de link kam yah',
+
+# Block/unblock
+'ipblocklist-submit' => 'Luk foh am',
+'contribslink'       => 'kòntribyushòn-dèm',
+
+# Move page
+'movenologin' => 'Yu noh kam insai di sait yet',
+'move-watch'  => 'Wach dis pej-ya',
+
+# Thumbnails
+'thumbnail-more'  => 'Mek i big',
+'filemissing'     => 'Di fail noh de',
+'thumbnail_error' => 'Nah prohblehm foh mek dis tohmbnel: $1',
+
+# Tooltip help for the actions
+'tooltip-pt-mytalk'               => 'Mi tohk pej',
+'tooltip-pt-mycontris'            => 'List ov wetin ah dohn kohntribyut',
+'tooltip-pt-login'                => 'I go bèttè if yu log-in, bòt if yu nò du am i nò bad.',
+'tooltip-pt-anonlogin'            => 'I go behteh if yu log-in, boht if yu noh du am i noh bad.',
+'tooltip-pt-logout'               => 'Kohmoh na di sait',
+'tooltip-ca-talk'                 => 'Diskòshòn bòt wetin de na di kòntènt pej',
+'tooltip-ca-edit'                 => 'Yu ebul fò chenj dis pej-ya
+Bòt prèss di privyu bòtin bifo yu sev am',
+'tooltip-ca-addsection'           => 'Lehf yu-yon opinyon na dis diskohshohn.',
+'tooltip-ca-viewsource'           => 'Yu noh go ebul chenj di pej-ya.
+Na im source nohmoh yu go ebul luk.',
+'tooltip-ca-history'              => 'Dèm wan-dèm-ya na  di pej-im ol vazhon-dèm.',
+'tooltip-ca-protect'              => 'Protekt dis pej-ya',
+'tooltip-ca-delete'               => 'Ires dis pej-ya',
+'tooltip-ca-undelete'             => 'Bring bak di chenj-dehm we dehm bin mek na dis pej-ya bifo dehm ires am.',
+'tooltip-ca-move'                 => 'Muf dis pej-ya',
+'tooltip-ca-watch'                => 'Put dis pej na yu list foh wach',
+'tooltip-ca-unwatch'              => 'Pul dis pej komoh nah yu list foh wach',
+'tooltip-search'                  => 'Luk nah dis wèbsait {{SITENAME}}',
+'tooltip-n-mainpage'              => 'Go si di Men Pej',
+'tooltip-n-portal'                => 'Infòmashòn bòt di projèkt, wetin yu ebul du, usai fò fèn òltin',
+'tooltip-n-currentevents'         => 'Luk fò infòmashòn bòt wetin de apin nawnaw',
+'tooltip-n-recentchanges'         => 'List òv wetin dèm dòn chenj risèntli na di wiki.',
+'tooltip-n-randompage'            => 'Go tu èni pej',
+'tooltip-n-help'                  => 'Di ples fò lan.',
+'tooltip-t-whatlinkshere'         => 'Pej we gèt òl di wiki pej-dèm we de link kam yah',
+'tooltip-t-recentchangeslinked'   => 'Chenj-dèm we dèm dòn mek na di pej-dem we de link kòmòt na dis pej-ya',
+'tooltip-feed-rss'                => 'RSS feed foh dis pej-ya',
+'tooltip-feed-atom'               => 'Atom feed foh dis pej-ya',
+'tooltip-t-contributions'         => 'dis yuza-im kohntribyushohn list',
+'tooltip-t-emailuser'             => 'Sehn e-mail gi dis yuza',
+'tooltip-t-upload'                => 'Òplod fail-dèm',
+'tooltip-t-specialpages'          => 'Spèshal pej list',
+'tooltip-t-print'                 => 'Vazhon fò print',
+'tooltip-t-permalink'             => 'Pamanènt link fò go dis vazhòn',
+'tooltip-save'                    => 'Sev wetin yu dohn chenj',
+'tooltip-preview'                 => 'Luk wetin you dohn chenj, Luk am bifo yu sev!',
+'tooltip-diff'                    => 'Luk us chenj-dehm yu mek nah di tehks.',
+'tooltip-compareselectedversions' => 'Luk wetin difrehnt pan dehm tu vazhon-dehm we yu dohn chuz',
+'tooltip-watch'                   => 'Put dis pej-ya na yu list foh wach',
+
+# Special:NewFiles
+'ilsubmit' => 'Luk foh am',
+
+# 'all' in various places, this might be different for inflected languages
+'namespacesall' => 'ohl',
+'monthsall'     => 'ohl',
+
+# E-mail address confirmation
+'confirmemail'         => 'Konfam yu e-mail adrehs',
+'confirmemail_noemail' => 'Di email adrehs we yu pu na [[Special:Preferences|user preferences]] noh de.',
+
+# Multipage image navigation
+'imgmultigo' => 'Go to am!',
+
+# Table pager
+'table_pager_limit_submit' => 'Go to am',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch-submit' => 'Luk foh am',
+
+# Special:SpecialPages
+'specialpages' => 'Spèshal pej-dèm',
+
+);
diff --git a/languages/messages/MessagesKrj.php b/languages/messages/MessagesKrj.php
index 5dbffbf3..7da78478 100644
--- a/languages/messages/MessagesKrj.php
+++ b/languages/messages/MessagesKrj.php
@@ -40,8 +40,6 @@ $messages = array(
 'underline-never'   => 'Indi gid',
 'underline-default' => 'Onay nga browser',
 
-'skinpreview' => '(Bilid)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Lones',
@@ -154,7 +152,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Tunggəd sa {{SITENAME}}',
 'aboutpage'            => 'Project:Tunggəd',
-'bugreports'           => "Mga report kang ''bug''",
 'disclaimers'          => 'Mga Panginwala',
 'disclaimerpage'       => 'Project:Panginwala nga Pangtanan',
 'edithelp'             => 'Panoytoy sa Pag-ilis',
@@ -168,6 +165,7 @@ $messages = array(
 
 'badaccess'        => 'Sayup sa lisensya',
 'badaccess-group0' => 'Indi kaw ginpasogtan nga himoon ang lihuk nga ginalaum mo.',
+'badaccess-groups' => 'Ang imo ginpangayo nga lihuk ay para lang sa mga users sa {{PLURAL:$2|nga grupo|sara sa mga grupo}}: $1.',
 
 'versionrequired'     => 'Version $1 kang MediaWiki kinahanglan',
 'versionrequiredtext' => 'Version $1 of MediaWiki kinahanglan para magamit ang page nga ja.
@@ -222,6 +220,7 @@ Lantawa sa [[Special:Version|version kang page]].',
 'preview' => 'Bilid',
 
 # Preferences page
+'skin-preview'      => 'Bilid',
 'searchresultshead' => 'Sagap',
 
 # Recent changes
@@ -230,7 +229,7 @@ Lantawa sa [[Special:Version|version kang page]].',
 
 'upload-file-error' => 'Sayup internal',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile' => 'inayap',
 
 # File deletion
@@ -244,19 +243,19 @@ Lantawa sa [[Special:Version|version kang page]].',
 # Book sources
 'booksources-go' => 'Agto',
 
-# Special:Log
-'log-search-submit' => 'Agto',
-
 # Special:Categories
 'categories' => 'Manga Kategorya',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Sagap',
+
 # Special:ListUsers
 'listusers-submit' => 'Ipakita',
 
 # E-mail user
 'emailmessage' => 'Mensahe',
 
-# Delete/protect/revert
+# Delete
 'delete-legend' => 'Para',
 
 # Restrictions (nouns)
@@ -291,7 +290,7 @@ Lantawa sa [[Special:Version|version kang page]].',
 'tooltip-t-contributions'       => 'Lantawa ang listahan kang mga ginbulig kang user nga ja',
 'tooltip-t-emailuser'           => 'Padarhi kang e-mail ang user nga ja',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Sagap',
 
 # action=purge
diff --git a/languages/messages/MessagesKs.php b/languages/messages/MessagesKs.php
index a356c7e9..603b37b0 100644
--- a/languages/messages/MessagesKs.php
+++ b/languages/messages/MessagesKs.php
@@ -1,8 +1,9 @@
 <?php
-/** Kashmiri language file ( कश�मीरी - (ﻚﺸﻤﻳﺮﻳ) )
+/** Kashmiri (कश�मीरी - (كشميري))
  *
  * @ingroup Language
  * @file
+ *
  */
 
 #FIXME: inherit almost everything for now
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index 956251e6..49d28384 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -29,9 +29,6 @@
  * and not from the Akademie (for example: Gedöns, geeße, gegovve, aadig, iggelig, nüdig)
  * Otherwise most part of the following expressions are taken from the Akademie.
  *
- * @ingroup Language
- *
- * @author Caesius noh en Idee vum Manes
  */
 /** 
  * Hints for editing
@@ -40,74 +37,147 @@
  * ä => ä, ö => ö, ü => ü, Ä => Ä, Ö => Ö, Ãœ => Ü, ß => ß
  * „ => „, “ => “
  */
-/**
- * Fallback language, used for all unspecified messages and behaviour. This
- * is English by default, for all files other than this one.
- */
+
 $fallback = 'de';
 
 $namespaceNames = array(
-        NS_MEDIA            => 'Medie',
-        NS_SPECIAL          => 'Spezial',
-        NS_MAIN             => '',
-        NS_TALK             => 'Klaaf',
-        NS_USER             => 'Metmaacher',
-        NS_USER_TALK        => 'Metmaacher_Klaaf',
-        # NS_PROJECT set by $wgMetaNamespace
-        NS_PROJECT_TALK     => '$1_Klaaf',
-        NS_IMAGE            => 'Beld',
-        NS_IMAGE_TALK       => 'Belder_Klaaf',
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'MediaWiki_Klaaf',
-        NS_TEMPLATE         => 'Schablon',
-        NS_TEMPLATE_TALK    => 'Schablone_Klaaf',
-        NS_HELP             => 'Hölp',
-        NS_HELP_TALK        => 'Hölp_Klaaf',
-        NS_CATEGORY         => 'Saachjrupp',
-        NS_CATEGORY_TALK    => 'Saachjrupp_Klaaf',
+	NS_MEDIA            => 'Medie',
+	NS_SPECIAL          => 'Spezial',
+	NS_TALK             => 'Klaaf',
+	NS_USER             => 'Metmaacher',
+	NS_USER_TALK        => 'Metmaacher_Klaaf',
+	NS_PROJECT_TALK     => '$1_Klaaf',
+	NS_FILE             => 'Datei',
+	NS_FILE_TALK        => 'Dateie_Klaaf',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Klaaf',
+	NS_TEMPLATE         => 'Schablon',
+	NS_TEMPLATE_TALK    => 'Schablone_Klaaf',
+	NS_HELP             => 'Hölp',
+	NS_HELP_TALK        => 'Hölp_Klaaf',
+	NS_CATEGORY         => 'Saachjrupp',
+	NS_CATEGORY_TALK    => 'Saachjruppe_Klaaf',
 );
 
-/**
- * Array of namespace aliases, mapping from name to NS_xxx index
- */
 $namespaceAliases = array(
 	'Meedije'           => NS_MEDIA,
 	'Shpezjal'          => NS_SPECIAL,
 	'Medmaacher'        => NS_USER,
 	'Medmaacher_Klaaf'  => NS_USER_TALK,
-	'Belld'             => NS_IMAGE,
-	'Bellder_Klaaf'     => NS_IMAGE_TALK,
+	'Beld'              => NS_FILE,
+	'Belld'             => NS_FILE,
+	'Belder_Klaaf'      => NS_FILE_TALK,
+	'Bellder_Klaaf'     => NS_FILE_TALK,
 	'MedijaWikki'       => NS_MEDIAWIKI,
 	'MedijaWikki_Klaaf' => NS_MEDIAWIKI_TALK,
 	'Hülp'              => NS_HELP,
 	'Hülp_Klaaf'        => NS_HELP_TALK,
 	'Sachjrop'          => NS_CATEGORY,
-	'Sachjrop_Klaaf'    => NS_CATEGORY_TALK,
+	'Saachjrop'         => NS_CATEGORY,
 	'Saachjropp'        => NS_CATEGORY,
-	'Saachjroppe_Klaaf' => NS_CATEGORY_TALK,
 	'Kattejori'         => NS_CATEGORY,
-	'Kattejori_Klaaf'   => NS_CATEGORY_TALK,
 	'Kategorie'         => NS_CATEGORY,
-	'Kategorie_Klaaf'   => NS_CATEGORY_TALK,
 	'Katejori'          => NS_CATEGORY,
+	'Sachjrop_Klaaf'    => NS_CATEGORY_TALK,
+	'Saachjroppe_Klaaf' => NS_CATEGORY_TALK,
+        'Saachjrupp_Klaaf'  => NS_CATEGORY_TALK,
+	'Kattejori_Klaaf'   => NS_CATEGORY_TALK,
+	'Kattejorije_Klaaf' => NS_CATEGORY_TALK,
+	'Kategorie_Klaaf'   => NS_CATEGORY_TALK,
 	'Katejorije_Klaaf'  => NS_CATEGORY_TALK,
 );
 
 $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
 
-/**
- * Skin names. If any key is not specified, the English one will be used.
- */
 
-$skinNames = array(
-	'standard'    => 'Klassesch',
-	'nostalgia'   => 'Nostaljesch',
-	'cologneblue' => 'Kölsch Blau',
-	'monobook'    => 'MonoBoch',
-	'myskin'      => 'Ming Skin',
-	'chick'       => 'Höhnche',
-	'simple'      => 'Eifach',
-	'modern'      => 'Modern',
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Ömleitunge op Ömleitunge' ),
+	'BrokenRedirects'           => array( 'Ömleitunge en et Leere' ),
+	'Disambiguations'           => array( 'Wat-es-dat-Sigge', 'Watt ėßß datt?' ),
+	'Userlogin'                 => array( 'Enlogge' ),
+	'Userlogout'                => array( 'Ußlogge' ),
+	'CreateAccount'             => array( 'Aanmelde', 'Medmaacher wääde', 'Metmaacher wääde' ),
+	'Preferences'               => array( 'Ming Enstellunge', 'Enstellunge' ),
+	'Watchlist'                 => array( 'Ming Oppassliss', 'Oppassliss' ),
+	'Recentchanges'             => array( 'Neuste Änderunge', 'Änderunge' ),
+	'Upload'                    => array( 'Daate huhlade', 'Huhlade' ),
+	'Listfiles'                 => array( 'Datei', 'Dateie' ),
+	'Newimages'                 => array( 'Neu Dateie' ),
+	'Listusers'                 => array( 'Medmaacher', 'Metmaacher' ),
+	'Listgrouprights'           => array( 'Jrupperääschte', 'Jropperrääschte' ),
+	'Statistics'                => array( 'Statistik', 'Shtatißtike' ),
+	'Randompage'                => array( 'Zofällije Sigg' ),
+	'Lonelypages'               => array( 'Sigge ohne Links drop' ),
+	'Uncategorizedpages'        => array( 'Sigge ohne Saachjruppe' ),
+	'Uncategorizedcategories'   => array( 'Saachjruppe ohne Saachjruppe' ),
+	'Uncategorizedimages'       => array( 'Dateie ohne Saachjruppe' ),
+	'Uncategorizedtemplates'    => array( 'Schablone ohne Saachjruppe' ),
+	'Unusedcategories'          => array( 'Schablone ohne Links drop' ),
+	'Unusedimages'              => array( 'Dateie ohne Links drop' ),
+	'Wantedpages'               => array( 'Sigge fähle' ),
+	'Wantedcategories'          => array( 'Saachjruppe fähle', 'Saachjroppe fähle' ),
+	'Wantedfiles'               => array( 'Dateie fähle' ),
+	'Wantedtemplates'           => array( 'Schablone fähle' ),
+	'Mostlinked'                => array( 'Sigge met de mieste Links drop' ),
+	'Mostlinkedcategories'      => array( 'Et miehts jebruchte Saachjruppe', 'Et miehts jebruchte Saachjroppe' ),
+	'Mostlinkedtemplates'       => array( 'Et miehts jebruchte Schablone' ),
+	'Mostcategories'            => array( 'Sigge met de mieste Saachjroppe', 'Sigge met de mieste Saachjruppe' ),
+	'Mostimages'                => array( 'Dateie met de mieste Links drop' ),
+	'Mostrevisions'             => array( 'Öff beärbeit', 'Öff beärbeidt', 'Off bearbeit' ),
+	'Fewestrevisions'           => array( 'Winnig beärbeit', 'Winnish beärbeidt', 'Winnich bearbeit' ),
+	'Shortpages'                => array( 'Koote Atikelle' ),
+	'Longpages'                 => array( 'Lang Atikelle' ),
+	'Newpages'                  => array( 'Neu Atikelle' ),
+	'Ancientpages'              => array( 'Ahl Atikelle' ),
+	'Deadendpages'              => array( 'Sigge ohne Links dren' ),
+	'Protectedpages'            => array( 'Siggeschotz' ),
+	'Protectedtitles'           => array( 'Tittelschotz' ),
+	'Allpages'                  => array( 'All Sigge' ),
+	'Ipblocklist'               => array( 'Jesperrt', 'Jeshpächt' ),
+	'Specialpages'              => array( 'Sondersigge', 'Söndersigge' ),
+	'Contributions'             => array( 'Beidräch', 'Beidrääsh' ),
+	'Emailuser'                 => array( 'Email', 'E-mail' ),
+	'Confirmemail'              => array( 'Email Bestätije', 'E-mail Bestätije', 'EmailBestätije', 'E-mailBestätije' ),
+	'Whatlinkshere'             => array( 'Wat noh hee link' ),
+	'Movepage'                  => array( 'Ömnenne', 'Ömdäufe' ),
+	'Blockme'                   => array( 'Proxy-Sperre' ),
+	'Booksources'               => array( 'ISBN', 'Böcher', 'Böösher' ),
+	'Categories'                => array( 'Saachjruppe' ),
+	'Export'                    => array( 'Expocht' ),
+	'Allmessages'               => array( 'MediaWiki-Appachtemang' ),
+	'Log'                       => array( 'Logböcher', 'Logböösher' ),
+	'Blockip'                   => array( 'IP-Sperre' ),
+	'Undelete'                  => array( 'Zeröckholle' ),
+	'Import'                    => array( 'Emport', 'Empocht' ),
+	'Lockdb'                    => array( 'Datebank-deeschmaache' ),
+	'Unlockdb'                  => array( 'Datebank-opmaache' ),
+	'Userrights'                => array( 'Medmaacherrääschte', 'Metmaacherrääschte' ),
+	'MIMEsearch'                => array( 'MIME-Typ', 'MIMEtüp' ),
+	'FileDuplicateSearch'       => array( 'Dubbel Dateie' ),
+	'Unwatchedpages'            => array( 'Sigge oohne Oppasser' ),
+	'Listredirects'             => array( 'Ömleitunge' ),
+	'Revisiondelete'            => array( 'Version fottschmieße' ),
+	'Unusedtemplates'           => array( 'Nit jebruchte Schablone' ),
+	'Randomredirect'            => array( 'Zofällije Ömleitung' ),
+	'Mypage'                    => array( 'Ming Medmaachersigg', 'Ming Metmaachersigg', 'Medmaachersigg', 'Metmaachersigg' ),
+	'Mytalk'                    => array( 'Ming Klaafsigg', 'Klaaf' ),
+	'Mycontributions'           => array( 'Ming Beidräch', 'Ming Beidrääsh' ),
+	'Listadmins'                => array( 'Köbese', 'Köbeße', 'Wiki-Köbesse' ),
+	'Listbots'                  => array( 'Bots' ),
+	'Popularpages'              => array( 'Miehts affjeroofe Sigge' ),
+	'Search'                    => array( 'Sök', 'Söök', 'Söke', 'Sööke' ),
+	'Resetpass'                 => array( 'Neu Passwood' ),
+	'Withoutinterwiki'          => array( 'Ohne Shproche Lenks' ),
+	'MergeHistory'              => array( 'Versione zosammeschmieße' ),
+	'Filepath'                  => array( 'Dateipaad' ),
+	'Invalidateemail'           => array( 'Onjöltije e-mail Addräß', 'Onjöltije E-Mail Adress' ),
+	'Blankpage'                 => array( 'Leddijje Sigge' ),
+	'LinkSearch'                => array( 'Websigge Söke' ),
+	'DeletedContributions'      => array( 'Fotjeschmeße' ),
+);
+
+$imageFiles = array(
+    'button-italic'   => 'ksh/button_S_italic.png',
 );
 
 $messages = array(
@@ -116,10 +186,10 @@ $messages = array(
 'tog-highlightbroken'         => 'Zeich de Links op Sigge, die et noch nit jitt, esu met: „<a href="" class="new">Lemma</a>“ aan.<br />Wann De dat nit wells, weed et esu: „Lemma<a href="" class="internal">?</a>“ jezeich.',
 'tog-justify'                 => 'Dun de Avschnedde em Blocksatz aanzeije',
 'tog-hideminor'               => 'Dun de klein Mini-Änderunge (<strong>M</strong>) en de Liss  met „{{int:Recentchanges}}“ <strong>nit</strong> aanzeije',
-'tog-extendwatchlist'         => 'Verjrößer de Oppassliss för jede Aat vun müjjelich Änderunge ze zeije',
+'tog-extendwatchlist'         => 'Verjrößer de Oppassliss för jede Aat vun müjjeliche Änderunge ze zeije',
 'tog-usenewrc'                => 'Dun de opgemotzte Liss met „{{int:Recentchanges}}“ aanzeije (bruch Java_Skripp)',
 'tog-numberheadings'          => 'Dun de Ãœvverschrefte automatisch nummereere',
-'tog-showtoolbar'             => 'Zeich de Werkzeuchliss zom Ändere aan (bruch Java_Skripp)',
+'tog-showtoolbar'             => 'Zeich de Werkzüchliss zom Ändere aan (bruch Java_Skripp)',
 'tog-editondblclick'          => 'Sigge met Dubbel-Klicke ändere (bruch Java_Skripp)',
 'tog-editsection'             => 'Maach [{{int:Editsection}}]-Links aan de Avschnedde dran',
 'tog-editsectiononrightclick' => 'Avschnedde met Räächs-Klicke op de Üvverschrefte ändere (bruch Java_Skripp)',
@@ -148,17 +218,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Dun ming eije Änderunge <strong>nit</strong> en minger Oppassliss aanzeije',
 'tog-watchlisthidebots'       => 'Dun jedes Mol dä Bots ehr Änderunge <strong>nit</strong> en minger Oppassliss zeije',
 'tog-watchlisthideminor'      => 'Dun jedes Mol de klein Mini-Änderunge <strong>nit</strong> en minger Oppassliss zeije',
+'tog-watchlisthideliu'        => 'Enjeloggte Metmaacher ier Änderunge jedesmol <strong>nit</strong> en minger Oppassliss aanzeije',
+'tog-watchlisthideanons'      => 'Namelose Metmaacher ier Änderunge jedesmol <strong>nit</strong> en minger Oppassliss aanzeije',
 'tog-nolangconversion'        => 'Sprochevariante nit ömwandele',
 'tog-ccmeonemails'            => 'Scheck mer en Kopie, wann ich en E-mail an ene andere Metmaacher scheck',
 'tog-diffonly'                => 'Zeich beim Versione Verjliche nur de Ungerscheid aan (ävver pack nit noch de janze Sigg dodronger)',
-'tog-showhiddencats'          => 'Verstoche Saachjroppe aanzeije',
+'tog-showhiddencats'          => 'Donn Verstoche Saachjroppe aanzeije',
+'tog-noconvertlink'           => 'Don de Tittele nit ümwandelle',
+'tog-norollbackdiff'          => 'Donn noh „{{int:Rollback}}“ de Ungerscheide nit aanzeije',
 
 'underline-always'  => 'jo, ongershtriishe',
 'underline-never'   => 'nä',
 'underline-default' => 'nemm dem Brauser sing Enstellung',
 
-'skinpreview' => '(Vör-Ansich)',
-
 # Dates
 'sunday'        => 'Sonndaach',
 'monday'        => 'Mondaach',
@@ -288,15 +360,15 @@ Dat es och all op Änglesch:
 'talkpage'          => 'Ãœvver die Sigg hee schwaade',
 'talkpagelinktext'  => 'Klaaf',
 'specialpage'       => 'Sondersigg',
-'personaltools'     => 'Metmaacher Werkzeuch',
-'postcomment'       => 'Neu Avschnedd op de Klaafsigg',
+'personaltools'     => 'Metmaacher Werkzüch',
+'postcomment'       => 'Neu Avschnedd op de Klaafsigg donn',
 'articlepage'       => 'Aanluure wat op dä Sigg drop steiht',
 'talk'              => 'Klaaf',
 'views'             => 'Aansichte',
-'toolbox'           => 'Werkzeuch',
+'toolbox'           => 'Werkzüch',
 'userpage'          => 'Däm Metmaacher sing Sigg aanluure',
 'projectpage'       => 'De Projeksigg aanluure',
-'imagepage'         => 'Sigg för e Beld odder en anndere Medije-Dattei aanluure',
+'imagepage'         => 'De Sigg övver die Dattei aanluure',
 'mediawikipage'     => 'De Mediesigg aanluure',
 'templatepage'      => 'De Schablohn ier Sigk aanluere',
 'viewhelppage'      => 'De Hölpsigg aanluure',
@@ -315,8 +387,6 @@ Dat es och all op Änglesch:
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ãœvver de {{SITENAME}}',
 'aboutpage'            => 'Project:Ãœvver de {{SITENAME}}',
-'bugreports'           => 'Fähler melde',
-'bugreportspage'       => 'Project:Kontak',
 'copyright'            => 'Dä Enhald steiht unger de $1.',
 'copyrightpagename'    => 'Lizenz',
 'copyrightpage'        => '{{ns:project}}:Lizenz',
@@ -339,9 +409,7 @@ Dat es och all op Änglesch:
 
 'badaccess'        => 'Nit jenoch Räächde',
 'badaccess-group0' => 'Do häs nit jenoch Räächde.',
-'badaccess-group1' => 'Wat Do wells, dat dürfe nor Metmaacher, die $1 sin.',
-'badaccess-group2' => 'Wat Do wells, dat dürfe nor de Metmaacher us dä Jruppe: $1.',
-'badaccess-groups' => 'Wat Do wells, dat dürfe nor de Metmaacher us eine vun dä Jruppe: $1.',
+'badaccess-groups' => 'Wat Do wells, dat dürfe nor de Metmaacher us {{PLURAL:$2|dä Jrupp „$1“.|eine vun dä Jruppe: $1.|jaa keine Jrupp.}}',
 
 'versionrequired'     => 'De Version $1 vun MediaWiki Soffwär es nüdich',
 'versionrequiredtext' => 'De Version $1 vun MediaWiki Soffwär es nüdich, öm die Sigg hee bruche ze künne. Süch op [[Special:Version|de Versionssigg]], wat mer hee för ene Soffwärstand han.',
@@ -357,6 +425,8 @@ Dat es och all op Änglesch:
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'Hee die Version ändere',
 'viewsourceold'           => 'Wikitex zeije',
+'editlink'                => 'ändere',
+'viewsourcelink'          => 'aanloore',
 'editsectionhint'         => 'Avschnedd $1 ändere',
 'toc'                     => 'Enhaldsüvversich',
 'showtoc'                 => 'enblende',
@@ -372,13 +442,14 @@ Dat es och all op Änglesch:
 'page-rss-feed'           => 'RSS-Abonnomang-Kannal (<i lang="en">Feed</i>) för de Sigg „$1“',
 'page-atom-feed'          => 'Atom-Abonnomang-Kannal (<i lang="en">Feed</i>) för de Sigg „$1“',
 'feed-atom'               => 'Atom',
+'feed-rss'                => 'RSS',
 'red-link-title'          => '$1 — en Sigg, die et noch nit jitt',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Atikkel',
 'nstab-user'      => 'Metmaachersigg',
 'nstab-media'     => 'Medijesigg',
-'nstab-special'   => 'Spezial',
+'nstab-special'   => 'Söndersigg',
 'nstab-project'   => 'Projeksigg',
 'nstab-image'     => 'Datei',
 'nstab-mediawiki' => 'Tex',
@@ -388,7 +459,9 @@ Dat es och all op Änglesch:
 
 # Main script and global functions
 'nosuchaction'      => 'Die Aufgab (action) kenne mer nit',
-'nosuchactiontext'  => '<strong>Na su jet:</strong> De Aufgab us dä URL, die do hinger „<code>action=</code>“ dren steiht, jo die kennt hee dat Wiki jar nit.',
+'nosuchactiontext'  => '<strong>Na su jet:</strong> De Aufgab us dä URL, die do hinger „<code>action=</code>“ dren steiht, jo die kennt hee dat Wiki jar nit.
+Do künns Desch vertipp han, udder ene verkeehte Lengk hät Desch noh hee jebraat.
+Et künnt sesch och öm ene Fäähler en dä Sofware fum Wiki handelle.',
 'nosuchspecialpage' => "Esu en Sondersigg ha'mer nit",
 'nospecialpagetext' => 'De aanjefrochte Sondersigg jitt et nit, de [[Special:SpecialPages|Liss met de Sondersigge]] helf Der wigger.',
 
@@ -442,7 +515,6 @@ wat en Ãœvverschrefte nit erlaub es.
 Et künnt ussinn, wie ene InterWikiLink,
 dat jeiht ävver nit.
 Muss De repareere.',
-'perfdisabled'         => "<strong>'''Opjepass:'''</strong> Dat maache mer jetz nit - dä Sörver hät jrad zovill Lass - do si'mer jet vürsichtich.",
 'perfcached'           => 'De Daate heenoh kumme usem Zweschespeicher (Cache) un künnte nit mieh janz de allerneuste sin.',
 'perfcachedts'         => 'De Daate heenoh kumme usem Zweschespeicher (Cache) un woodte $1 opjenumme. Se künnte nit janz de allerneuste sin.',
 'querypage-no-updates' => "'''Hee die Sigg weed nit mieh op ene neue Stand jebraat.'''",
@@ -468,16 +540,16 @@ $2',
 'titleprotected'       => "Dä Tittel för en Sigg eß verbodde, fum [[User:$1]], un dr Jrond wohr: ''„$2“''",
 
 # Virus scanner
-'virus-badscanner'     => 'Fääler en de Enstellunge: Dat Projramm <i>$1</i> fö noh Kompjuterwiere ze söke, dat kenne mer nit.',
+'virus-badscanner'     => "Fääler en de Enstellunge: Dat Projramm ''$1'' fö noh Kompjuterwiere ze söke, dat kenne mer nit.",
 'virus-scanfailed'     => 'Dat Söhke eß donevve jejange, dä Kood för dä Fähler es „$1“.',
 'virus-unknownscanner' => 'Dat Projamm fö noh Komjuterviere ze sööke kenne mer nit:',
 
 # Login and logout pages
 'logouttitle'                => 'Uslogge',
-'logouttext'                 => '<strong>Jetz bes de usjelogg</strong>
+'logouttext'                 => "'''Jetz bes de usjelogg'''
 
 Do künnts op de {{SITENAME}} wigger maache, als ene namelose Metmaacher. Do kanns De ävver och [[Special:UserLogin|widder enlogge]], als däselve oder och ene andere Metmaacher.
-Künnt sin, dat De de ein oder ander Sigg immer wigger aanjezeich kriss, wie wann de noch enjelogg wörs. Dun Dingem Brauser singe Cache fottschmieße oder leddich maache, öm us dä Nummer erus ze kumme!',
+Künnt sin, dat De de ein oder ander Sigg immer wigger aanjezeich kriss, wie wann de noch enjelogg wörs. Dun Dingem Brauser singe Cache fottschmieße oder leddich maache, öm us dä Nummer erus ze kumme!",
 'welcomecreation'            => '== Dach, $1! ==
 Dinge Zojang för hee es do.
 Do bes jetz aanjemeldt.
@@ -489,7 +561,6 @@ Denk dran, Do künnts Der [[Special:Preferences|Ding Enstellunge hee op de {{SIT
 'remembermypassword'         => 'Op Duur Aanmelde',
 'yourdomainname'             => 'Ding Domain',
 'externaldberror'            => 'Do wor ene Fähler en de externe Daatebank, oder Do darfs Ding extern Daate nit ändere. Dat Aanmelde jingk jedenfalls donevve.',
-'loginproblem'               => '<strong>Met däm Enlogge es jet scheiv jelaufe.</strong><br />Bes esu jod, un dun et noch ens versöke!',
 'login'                      => 'Enlogge',
 'nav-login-createaccount'    => 'Enlogge, Aanmälde',
 'loginprompt'                => 'Öm op de {{SITENAME}} enlogge ze künne, muss De de Cookies en Dingem Brauser enjeschalt han.',
@@ -514,16 +585,12 @@ Denk dran, Do künnts Der [[Special:Preferences|Ding Enstellunge hee op de {{SIT
 'yourvariant'                => 'Ding Variant',
 'yournick'                   => 'Name för en Ding Ungerschreff:',
 'badsig'                     => 'Di Ungeschreff jëijd_esu nit — luer noh dem HTML do_dren un maach et rėshtėsh.',
-'badsiglength'               => 'Ding Unterschref darf nit länger wi {{PLURAL:$1|eij|$1|keij}} Zeische sin.',
-'email'                      => 'e-mail',
+'badsiglength'               => 'Ding „Unterschref“ es zoo lang.
+Et dörve darf nit nieh wi {{PLURAL:$1|eij|$1|keij}} Zeische do dren sin.',
+'email'                      => 'E-mail',
 'prefs-help-realname'        => '* Dinge richtije Name - kanns De fott looße - wann De en nenne wells, dann weed hee jebruch, öm Ding Beidräch domet ze schmöcke.',
 'loginerror'                 => 'Fähler beim Enlogge',
-'prefs-help-email'           => 'E-mail - kanns De fottlooße, un es för Andre nit ze sinn - mäht
-et ävver müjjelich, Der e neu Passwoot ze schecke, wann De et
-ens verjäße häß. Do kannß och zohlohße, dat mer met Der övver Ding
-Metmaacherklaafsigg en e-mail schecke kann. Esu künne ander Metmaacher
-met Der en Kontak kumme, ohne dat se Dinge Name oder Ding e-Mail Adress
-kenne mööte.',
+'prefs-help-email'           => '* Ding <i lang="en">e-mail</i> Adress - kanns De fottlooße, un se es för Andre nit ze sinn - mäht et ävver müjjelich, Der e neu Passwoot ze schecke, wann De et ens verjäße häß. Do kannß och zohlohße, dat mer Der domet övver Ding Metmaacherklaafsigg en <i lang="en">e-mail</i> schecke kann. Esu künne ander Metmaacher met Der en Kontak kumme, ohne dat se Dinge Name oder Ding <i lang="en">e-Mail</i> Adress kenne mööte.',
 'prefs-help-email-required'  => 'Do moß en jöltije E-Mail-Adress aanjevve.',
 'nocookiesnew'               => 'Dinge neue Metmaacher Name es enjerich, ävver dat automatisch Enlogge wor dann nix. 
 Schad.
@@ -535,8 +602,10 @@ Sök Der ene Brauser, dä et kann, dun se enschalte, un dann log Dich noch ens n
 'loginsuccesstitle'          => 'Dat Enlogge hät jeflupp.',
 'loginsuccess'               => '<br />Do bes jetz enjelogg bei de <strong>{{SITENAME}}</strong>, un Dinge Metmaacher Name es „<strong>$1</strong>“.<br />',
 'nosuchuser'                 => 'Dä Metmaacher Name „$1“ wor verkihrt.
+Jroß- un Kleinboochshtabe maache ene Ungerscheid!
+<br />
 Jetz muss De et noch ens versöke.
-Udder donn_<span class="plainlinks">[{{FULLURL:Special:UserLogin|type=signup}} ene neue Metmaacher aanmelde]</span>.',
+Udder donn_[[Special:UserLogin/signup|ene neue Metmaacher aanmelde]].',
 'nosuchusershort'            => 'Dä Metmaacher Name „<nowiki>$1</nowiki>“ wor verkihrt. Jetz muss De et noch ens versöke.',
 'nouserspecified'            => 'Dat jeiht nit als ene Metmaacher Name',
 'wrongpassword'              => 'Dat Passwood oder dä Metmaacher Name wor verkihrt. Jetz muss De et noch ens versöke.',
@@ -555,8 +624,9 @@ för et Enlogge en de {{SITENAME}} op
 Alsu, e neu Passwood för "$2"
 es jetz vürjemerk: "$3".
 Do solls De tirek jlich enlogge,
-un dat Passwood widder ändere.
-Dä Transport üvver et Netz met E-Mail
+un dat Passwood widder ändere,
+wann dat esu Dinge Wonsch wor.
+Dä Transport üvver et Netz met e-mail
 es unsecher, do künne Fremde metlese,
 un winnichstens de Jeheimdeenste dun
 dat och. Usserdäm es "$3" 
@@ -567,7 +637,7 @@ neue Passwood verlank hät, wann De
 Dich jetz doch widder aan Ding ahl Passwood
 entsenne kanns, jo do bruchs de jar nix
 ze dun, do kanns De Ding ahl Passwood wigger 
-bruche, un die E-Mail hee, die kanns De 
+bruche, un die e-mail hee, die kanns De 
 jlatt verjesse.
 
 Ene schöne Jroß vun de {{SITENAME}}.
@@ -582,8 +652,13 @@ Ih dat E-Mails üvver de {{SITENAME}} ehre E-Mail-Knopp verscheck wääde künne
 eets  ens bestätich woode sin. Wat mer doför maache muss, steiht en dä E-Mail dren, die jrad avjescheck woode es.',
 'throttled-mailpassword'     => 'En Erennerung för di Passwood es ungerwähs. Domet ene fiese Möpp keine Dress fabrizeet, passeet dat hüchstens eimol en {{PLURAL:$1|der Stund|$1 Stunde|nidd ens eine Stund}}.',
 'mailerror'                  => 'Fähler beim E-Mail Verschecke: $1.',
-'acct_creation_throttle_hit' => '<b>Schad.</b> Do häs ald {{PLURAL:$1|eine|$1|keine}} Metmaacher Name aanjelaht. Mieh sin nit müjjelich.',
-'emailauthenticated'         => 'Ding E-Mail Adress wood bestätich om: <strong>$1</strong>.',
+'acct_creation_throttle_hit' => '<b>Schad.</b> 
+Besöker fun däm Wiki hee han övver de IP-Addräß, övver di De jraad aam
+Netz aam hange bes, övver der letzte Daach (24 Stunde) zosamme jenumme ald
+{{PLURAL:$1|eine|$1|keine}} mol enen neuen Metmaacher aanjelaht.
+Mieh sin nit müjjelich. Dröm künne Lück, die jraad die IP-Addräß han,
+för der Momang nit noch mit Metmaacher neu aanmellde.',
+'emailauthenticated'         => 'Ding E-Mail Adress wood aam <strong>$2</strong> öm <strong>$3</strong> Uhr bestätich.',
 'emailnotauthenticated'      => 'Ding E-Mail Adress es <strong>nit</strong> bestätich. Dröm kann kein E-Mail aan Dich jescheck wääde för:',
 'noemailprefs'               => 'Dun en E-Mail Adress endrage, domet dat et all fluppe kann.',
 'emailconfirmlink'           => 'Dun Ding E-Mail Adress bestätije looße',
@@ -599,18 +674,28 @@ Don jlisch enlogge un donn et ändere.
 
 Wann Dat all böömesch Dörver för Desch sin, da fojeß hee di
 e-mail eijfach. Wann De en däm Wikki nit metmaache wells, och.',
+'login-throttled'            => 'Do häs zo öff, zo vill, un zo lang en de letzde Zick aan dämm Passwoot eröm probeet.
+Waat e Wielsche, ih dat De et widder versöhks.',
 'loginlanguagelabel'         => 'Sproch: $1',
 
 # Password reset dialog
-'resetpass'               => 'Neu Zweschepasswoot övver e-mail bekumme',
-'resetpass_announce'      => 'De beß jez enjelogg med ennem Zweschepasswoot, wat De övver e-mail krääje häs. Dat kanns De nit einfar_esu behallde. Alsu donn jetz e neu Passwoot för op Duur aanjevve.',
-'resetpass_text'          => '<!-- Donn der Täx hee dobei -->',
-'resetpass_header'        => 'Neu Passwood faßlääje',
-'resetpass_submit'        => 'E neu Zweschepasswood övvermeddele un aanmellde',
-'resetpass_success'       => 'Passwood jeändert. Jetz küdd_et Enlogge&nbsp;…',
-'resetpass_bad_temporary' => 'Da Zweschepasswoot es nix. Do häs ald ding Passwoot jeändert, udder De häs zweschedren ald widder e neu Passwoot pä e-mail jescheck bekumme.',
-'resetpass_forbidden'     => 'E Passwoot kann nit jeändert wääde.',
-'resetpass_missing'       => "'''Fähler:''' Nix enjejovve, odder de Daate ussem Fomulaa sen fott.",
+'resetpass'                 => 'Passwood tuusche udder neu ußjävve',
+'resetpass_announce'        => 'De beß jez enjelogg med ennem Zweschepasswoot, wat De övver e-mail krääje häs. Dat kanns De nit einfar_esu behallde. Alsu donn jetz e neu Passwoot för op Duur aanjevve.',
+'resetpass_text'            => '<!-- Donn der Täx hee dobei -->',
+'resetpass_header'          => 'Neu Passwood faßlääje',
+'oldpassword'               => 'Et ahle Passwood:',
+'newpassword'               => 'Et neue Passwood:',
+'retypenew'                 => 'Noch ens dat neue Passwood:',
+'resetpass_submit'          => 'E neu Zweschepasswood övvermeddele un aanmellde',
+'resetpass_success'         => 'Passwood jeändert. Jetz küdd_et Enlogge&nbsp;…',
+'resetpass_bad_temporary'   => 'Da Zweschepasswoot es nix. Do häs ald ding Passwoot jeändert, udder De häs zweschedren ald widder e neu Passwoot pä e-mail jescheck bekumme.',
+'resetpass_forbidden'       => 'E Passwoot kann nit jeändert wääde.',
+'resetpass-no-info'         => 'Do mööts ad enjelogg sin, öm tiräk op di Sigg jonn ze dörve',
+'resetpass-submit-loggedin' => 'Passwood tuusche',
+'resetpass-wrong-oldpass'   => 'Dat Zweschepasswood udder dat aktoälle Passwood stemmp nit.
+Müjjelesch, Do häs Ding Passwood ald jetuusch, künnt och sin,
+Do häs Der enzwesche e neuZweschepasswood jehollt.',
+'resetpass-temp-password'   => 'Zweschepasswood:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fätte Schreff',
@@ -635,7 +720,7 @@ e-mail eijfach. Wann De en däm Wikki nit metmaache wells, och.',
 'hr_tip'          => 'En Querlinnich',
 
 # Edit pages
-'summary'                          => 'Koot Zosammejefass, Quell',
+'summary'                          => 'Koot Zosammejefass, Quell:',
 'subject'                          => 'Üvverschreff - wodröm jeiht et?',
 'minoredit'                        => 'Dat es en klein Änderung (mini)',
 'watchthis'                        => 'Op die Sigg hee oppasse',
@@ -648,8 +733,8 @@ e-mail eijfach. Wann De en däm Wikki nit metmaache wells, och.',
 'missingsummary'                   => '<strong>Opjepass:</strong> Do häs nix bei „Koot Zosammejefass, Quell“ enjejovve. Dun noch ens op „<b style="padding:2px; background-color:#ddd; color:black">De Sigg Avspeichere</b>“ klicke, öm Ding Änderunge ohne de Zosammefassung ze Speicheree. Ävver besser jiss De do jetz tirek ens jet en!',
 'missingcommenttext'               => 'Jevv en „Koot Zosammejefass, Quell“ aan!',
 'missingcommentheader'             => "'''Opjepass:''' Do häs kein Üvverschreff för Dinge Beidrach enjejovve. Wann De noch ens op „De Sigg Avspeichere“ dröcks, weed dä Beidrach ohne Üvverschreff avjespeichert.",
-'summary-preview'                  => 'Vör-Aansich vun „Koot Zosammejefass, Quell“',
-'subject-preview'                  => 'Vör-Aansich vun de Üvverschreff',
+'summary-preview'                  => 'Vör-Aansich vun „Koot Zosammejefass, Quell“:',
+'subject-preview'                  => 'Vör-Aansich vun de Üvverschreff:',
 'blockedtitle'                     => 'Dä Metmaacher es jesperrt',
 'blockedtext'                      => "<big>'''Dinge Metmaacher-Name oder IP Adress es vun „\$1“ jesperrt woode.'''</big>
 
@@ -721,7 +806,7 @@ zwesche de ungerscheidlichste IP Adresse wähßele, womöchlich ohne dat hä et
 Metmaacher bes, un fings, dat hee Saache an Dich jeschrevve wääde, wo Do jar nix met am Hot häs, dann bes Do 
 wahrscheinlich och nit jemeint. Denk villeich ens drüvver noh, datte Dich [[Special:UserLogin/signup|anmelde]] deis, 
 domet De dann donoh nit mieh met esu en Ömständ ze dun häs, wie de andere namenlose Metmaacher hee. Wann de aanjemelldt bes un deis [[Special:UserLogin|enlogge]], dann kam_mer Desch och dun alle andere Metmaacher ongerschejde.</i>',
-'noarticletext'                    => '<span class="plainlinks">Em Momang es keine Tex op dä Sigg. Jangk en de Texte vun ander Sigge [[Special:Search/{{PAGENAME}}|noh däm Titel söke]], oder [{{FULLURL:{{FULLPAGENAME}}|action=edit}} fang die Sigg aan] ze schrieve, oder jangk zeröck wo de her koms. Dinge Brauser hät ene Knopp doför.</span>',
+'noarticletext'                    => '<span class="plainlinks">Em Momang es keine Tex op dä Sigg. Jangk en de Texte vun ander Sigge [[Special:Search/{{PAGENAME}}|noh däm Titel söke]], odder [{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} donn en de Logböcher doför loore], oder [{{FULLURL:{{FULLPAGENAME}}|action=edit}} fang die Sigg aan] ze schrieve, oder jangk zeröck wo de her koms. Do hät Dinge Brauser ene Knopp för.</span>',
 'userpage-userdoesnotexist'        => 'Enne Metmaacher „$1“ hammer nit, beß De secher, dat De die Metmaachersigg ändere oder aanläje wellss?.',
 'clearyourcache'                   => "<br clear=\"all\" style=\"clear:both\">
 '''Opjepass:'''
@@ -756,22 +841,22 @@ et ess en bunte Welt!",
 denk dran, dat ene Metmaacher eije Dateie för et Ussinn han kann, un dat die met kleine Buchstave 
 aanfange dun, alsu etwa: {{ns:user}}:Name/monobook.css, un {{ns:user}}:Name/monobook.js heiße.',
 'updated'                          => '(Aanjepack)',
-'note'                             => '<strong>Opjepass:</strong>',
-'previewnote'                      => '<strong>Hee kütt nor de Vör-Aansich - Ding Änderunge sin noch nit jesechert!</strong>',
+'note'                             => "'''Opjepass:'''",
+'previewnote'                      => "'''Hee kütt nor de Vör-Aansich - Ding Änderunge sin noch nit jesechert!'''",
 'previewconflict'                  => 'Hee die Vör-Aansich zeich dä Enhald vum bovvere Texfeld.
 Esu wööd dä Atikkel ussinn, wann De n jetz avspeichere däts.',
-'session_fail_preview'             => '<strong>Schad: Ding Änderunge kunnte mer su nix met aanfange.
+'session_fail_preview'             => "'''Schad: Ding Änderunge kunnte mer su nix met aanfange.
 Versök et jrad noch ens.
-Wann dat widder nit flupp, dann versök et ens met [[Special:UserLogout|Uslogge]] un widder Enlogge.</strong>',
-'session_fail_preview_html'        => "<strong>Schad: Ding Änderunge kunnte mer su nix met aanfange. De Daate vun Dinge Login-Säschen sin nit öntlich erüvver jekumme, oder einfach ze alt.</strong>
+Wann dat widder nit flupp, dann versök et ens met [[Special:UserLogout|Uslogge]] un widder Enlogge.'''",
+'session_fail_preview_html'        => "'''Schad: Ding Änderunge kunnte mer su nix met aanfange. De Daate vun Dinge Login-Säschen sin nit öntlich erüvver jekumme, oder einfach ze alt.'''
 
 ''Dat Wiki hee hät rüh HTML zojelooße, dröm weed de Vör-Aansich nit jezeich. Domet solls De jeschötz wääde - hoffe mer - un Aanjreffe met Java_Skripp jäje Dinge Kompjuter künne Der nix aandun.''
 
-<strong>Falls för Dich söns alles jod ussüht, versök et jrad noch ens. Wann dat widder nit flupp, dann versök et ens met [[Special:UserLogout|Uslogge]] un widder Enlogge.</strong>",
-'token_suffix_mismatch'            => '<strong>Ding Änderung ham_mer nit övvernomme. Dinge Brauser hät Sazzeijche em verstoche <i lang="en">Token</i> för et Ändere versout. Dat paßeet och ens, wann enne <i lang="en">Proxy</i> nit fungkßjeneet. Et Affspeichere wör do jefährlesch, do künt dä Sigge_Enhaldt kapott bei jon.</strong>',
+'''Falls för Dich söns alles jod ussüht, versök et jrad noch ens. Wann dat widder nit flupp, dann versök et ens met [[Special:UserLogout|Uslogge]] un widder Enlogge.'''",
+'token_suffix_mismatch'            => "'''Ding Änderung ham_mer nit övvernomme. Dinge Brauser hät Sazzeijche em verstoche <i lang=\"en\">Token</i> för et Ändere versout. Dat paßeet och ens, wann enne <i lang=\"en\">Proxy</i> nit fungkßjeneet. Et Affspeichere wör do jefährlesch, do künt dä Sigge_Enhaldt kapott bei jon.'''",
 'editing'                          => 'De Sigg „$1“ ändere',
 'editingsection'                   => 'Ne Avschnedd vun dä Sigg: „$1“ ändere',
-'editingcomment'                   => '„$1“ Ändere (ene neue Avschnedd schrieve)',
+'editingcomment'                   => '„$1“ ändere (ene neue Avschnedd schrieve)',
 'editconflict'                     => 'Problemche: „$1“ dubbelt bearbeidt.',
 'explainconflict'                  => '<br />Ene andere Metmaacher hät aan dä Sigg och jet jeändert, un zwar nohdäm Do et Ändere aanjefange häs. Jetz ha\'mer dr Dress am Jang, un Do darfs et widder uszoteere.
 <strong>Opjepass:</strong>
@@ -787,10 +872,10 @@ jods jemaat häs.
 Alles Klor?<br /><br />',
 'yourtext'                         => 'Dinge Tex',
 'storedversion'                    => 'De jespeicherte Version',
-'nonunicodebrowser'                => '<strong>Opjepass:</strong>
+'nonunicodebrowser'                => "'''Opjepass:'''
 Dinge Brauser kann nit öntlich met däm Unicode un singe Buchstave ömjonn.
-Bes esu jod un nemm ene andere Brauser för hee die Sigg!',
-'editingold'                       => '<strong>Opjepass!<br />
+Bes esu jod un nemm ene andere Brauser för hee die Sigg!",
+'editingold'                       => "'''Opjepass!<br />
 Do bes en ahle, üvverhollte Version vun dä Sigg hee am Ändere.
 Wann De die avspeichere deis,
 wie se es,
@@ -798,26 +883,28 @@ dann jonn all die Änderunge fleute,
 die zickdäm aan dä Sigg jemaht woode sin.
 Alsu:
 Bes De secher, watte mähs?
-</strong>',
+'''",
 'yourdiff'                         => 'Ungerscheide',
 'copyrightwarning'                 => 'Ding Beidräch stonn unger de [[$2]], süch $1. Wann De nit han wells, dat Dinge Tex ömjemodelt weed, un söns wohin verdeilt, dun en hee nit speichere. Mem Avspeichere sähs De och zo, dat et vun Dir selvs es, un/oder Do dat Rääch häs, en hee zo verbreide. Wann et nit stemmp, oder Do kanns et nit nohwiese, kann Dich dat en dr Bau bränge!',
 'copyrightwarning2'                => 'De Beidräch en de {{SITENAME}} künne vun andere Metmaacher ömjemodelt 
 oder fottjeschmesse wääde. Wann Der dat nit rääch es, schriev nix. Et es och nüdich, dat et vun Dir selvs es, oder dat Do dat Rääch häs, et hee öffentlich wigger ze jevve. Süch $1. Wann et nit stemmp, oder Do kanns et nit nohwiese, künnt Dich dat en dr Bau bränge!',
-'longpagewarning'                  => '<strong>Oppjepass:</strong> Dä Tex, dä De hee jescheck häs, dä es <strong>$1</strong> 
-Kilobyte jroß. Manch Brauser kütt nit domet klor, wann et mieh wie <strong>32</strong> Kilobyte sin. Do künnts De drüvver nohdenke, dat Dinge en kleiner Stöckche ze zerkloppe.',
-'longpageerror'                    => '<big><strong>Janz schlemme Fähler:</strong></big>
-Dä Tex, dä De hee jescheck häs, dä es <strong>$1</strong> Kilobyte jroß. 
-Dat sin mieh wie <strong>$2</strong> Kilobyte. Dat künne mer nit speichere!
-<strong>Maach kleiner Stöcke drus.</strong><br />',
-'readonlywarning'                  => '<strong>Opjepass:</strong>
+'longpagewarning'                  => "'''Oppjepass:''' Dä Tex, dä De hee jescheck häs, dä es '''$1''' 
+Kilobyte jroß. Manch Brauser kütt nit domet klor, wann et mieh wie '''32''' Kilobyte sin. Do künnts De drüvver nohdenke, dat Dinge en kleiner Stöckche ze zerkloppe.",
+'longpageerror'                    => "<big>'''Janz schlemme Fähler:'''</big>
+Dä Tex, dä De hee jescheck häs, dä es '''$1''' Kilobyte jroß. 
+Dat sin mieh wie '''$2''' Kilobyte. Dat künne mer nit speichere!
+'''Maach kleiner Stöcke drus.'''<br />",
+'readonlywarning'                  => "'''Opjepass:'''
 De Daatebank es jesperrt woode, wo Do ald am Ändere wors. 
 Dä.
 Jetz kanns De Ding Änderunge nit mieh avspeichere.
-Dun se bei Dir om Rechner fasshalde un versök et späder noch ens.',
-'protectedpagewarning'             => '<strong>Opjepass: Die Sigg hee es jäje Veränderunge jeschötz. Nor de Wiki-Köbesse künne se ändere.</strong>',
+Dun se bei Dir om Rechner fasshalde un versök et späder noch ens.
+
+Nävvebei, dä Datenbank-Köbes hät för et Sperre och ene Jrund aanjejovve: $1",
+'protectedpagewarning'             => "'''Opjepass: Die Sigg hee es jäje Veränderunge jeschötz. Nor de Wiki-Köbesse künne se ändere.'''",
 'semiprotectedpagewarning'         => "'''Opjepass:''' Die Sigg hee es halv jesperrt, wie mer sage, dat heiß, Do muss aanjemeldt un enjelogg sin, wann De dran ändere wells.",
 'cascadeprotectedwarning'          => "'''Opjepaß:''' Die Sigg es jeschöz, un nur de Wiki-Köbesse künne se ändere. Se es en en Schotz-Kaskad enjebonge, zosamme met dä {{PLURAL:$1|Sigg|Sigge}}:",
-'titleprotectedwarning'            => '<strong> <span style="text-transform:uppercase"> Opjepaß! </span> Di Sigg hee is jesperrt woode. Bloß bestemmpte Metmaacher dörve di Sigg neu aanläje.</strong>',
+'titleprotectedwarning'            => "<span style=\"text-transform:uppercase\"> Opjepaß! </span> Di Sigg hee is jesperrt woode. Bloß [[Special:ListGroupRights|bestemmpte]] Metmaacher dörve di Sigg neu aanläje.'''",
 'templatesused'                    => 'De Schablone, die vun dä Sigg hee jebruch wääde, sinn:',
 'templatesusedpreview'             => 'Schablone en dä Vör-Aansich hee:',
 'templatesusedsection'             => 'Schablone en däm Avschnedd hee:',
@@ -836,21 +923,31 @@ Dun se bei Dir om Rechner fasshalde un versök et späder noch ens.',
 Bes förseschtesch un övverlääsch Der, of dat en joode Idee es, di Sigg widder opzemaache.
 Domet De Bescheid weiß, hee dä Endraach em Logboch vum Sigge-Fottschmieße mem Jrond,
 woröm di Sigg dohmohls fottjeschmesse woode es:",
+'deleted-notice'                   => 'Di Sigg es fottjeschmeße. He kütt e Shtöck uß däm Logbooch fum Sigge-Fotschmieße, för hee di Sigg.',
+'deletelog-fulllog'                => 'Et kompläte Logboch aanloore',
+'edit-hook-aborted'                => 'Et Ändere wood affjebroche övver ene sujenannte „Hoke“ en de ßoffwäer.
+Ene Jrond weße mer nit.',
+'edit-gone-missing'                => 'Kunnt di Sigg nit änndere. Se schingk verschwunde un weed fottjeschemeße woode sin.',
+'edit-conflict'                    => 'Dubbelt beärbeit.',
+'edit-no-change'                   => 'Do häs ja nix aan dä Sigg jeändert, do dom_mer och nix domet.',
+'edit-already-exists'              => 'Kunnt kei neu Sigg aanlääje. Di Sigg jidd_et ald.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => "'''Opjepaß:''' Die Sigge hee määt zovill Opwand met Paaser-Funkßjohne.
+'expensive-parserfunction-warning'        => "'''Opjepaß:''' Die Sigg hee määt zovill Opwand met Paaser-Funkßjohne.
 
-{{PLURAL:$2|Eine Oproof|Beß $2 Oproofe|Keine Oproof}} es älaup, {{PLURAL:$1|un eine Oproof|ävver $1 Oproofe|un keine Oproof}} määt di Sigg.",
+{{PLURAL:$2|Eine Oproof|Beß $2 Oproofe|Keine Oproof}} es älaup, {{PLURAL:$1|un eine Oproof|ävver $1 Oproofe|un keine Oproof}} määt di Sigg em Momang.",
 'expensive-parserfunction-category'       => 'Sigge met zovill Opwand en Paaser-Funkßjohne',
 'post-expand-template-inclusion-warning'  => 'Warnung: Hee in di Sigg wääde zo fill Bytes övver Schablone erin jebraat. Nit all di Schablone künne enjbonge wäde.',
 'post-expand-template-inclusion-category' => 'Sigge met zoh jruuße Schablone enjebonge',
 'post-expand-template-argument-warning'   => 'Opjepaß: Di Sigg hee hät winnischßdens eine Parrammeeter en ennem Schablone-Oprof wat ze jroß weed beim Enfölle. Esu en Parrameetere möße mer övverjonn.',
 'post-expand-template-argument-category'  => 'Sigge met övverjange Parrammeeter fun Schablone',
+'parser-template-loop-warning'            => 'Schablon roofe sesch em Kringel op: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Schablone refe sesch zo öff sellver op ($1)',
 
 # "Undo" feature
 'undo-success' => 'De Änderung könnte mer zeröck nämme. Beloor Der de Ungerscheid un dann donn di Sigg avspeichere, wann De dengks, et es en Oodenung esu.',
-'undo-failure' => '<span class="error">Dat kunnt mer nit zeröck nämme, dä Afschnedd wood enzwesche ald widder beärbeidt.</span>',
-'undo-norev'   => '<span class="error">Do ka\'mer nix zeröck nämme. Di Version jidd_et nit, odder se es verstoche odder fottjeschmesse woode.</span>',
+'undo-failure' => 'Dat kunnt mer nit zeröck nämme, dä Afschnedd wood enzwesche ald widder beärbeidt.',
+'undo-norev'   => "Do ka'mer nix zeröck nämme. Di Version jidd_et nit, odder se es verstoche odder fottjeschmesse woode.",
 'undo-summary' => 'De Änderung $1 fum [[Special:Contributions/$2|$2]] ([[User talk:$2|Klaaf]]) zeröck jenomme.',
 
 # Account creation failure
@@ -860,24 +957,21 @@ woröm di Sigg dohmohls fottjeschmesse woode es:",
 Als Jrund för et Sperre es enjedraare: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'De Logböcher för hee die Sigg beloore',
-'nohistory'           => 'Et jitt kei fottjeschmesse, zeröckhollba Versione vun dä Sigg.',
-'revnotfound'         => "Die Version ha'mer nit jefunge.",
-'revnotfoundtext'     => '<b>Dä.</b> Die ählere Version vun dä Sigg, wo De noh frochs, es nit do. Schad. Luur ens 
-op die URL, die Dich herjebraht hät, die weed verkihrt sin, oder se es villeich üvverhollt, weil einer die Sigg 
-fottjeschmesse hät?',
-'currentrev'          => 'Neuste Version',
-'revisionasof'        => 'Version vum $1',
-'revision-info'       => 'Dat es de Version vum $1 vum $2.',
-'previousrevision'    => '� De Version dovör zeije',
-'nextrevision'        => 'De Version donoh zeije →',
-'currentrevisionlink' => 'De neuste Version',
-'cur'                 => 'met jetz',
-'next'                => 'wigger',
-'last'                => 'met dovör',
-'page_first'          => 'Aanfang',
-'page_last'           => 'Engk',
-'histlegend'          => 'Hee kanns De Versione för et Verjliche ussöke: Dun met dä Knöpp die zweij markiere, 
+'viewpagelogs'           => 'De Logböcher för hee die Sigg beloore',
+'nohistory'              => 'Et jitt kei fottjeschmesse, zeröckhollba Versione vun dä Sigg.',
+'currentrev'             => 'Neuste Version',
+'currentrev-asof'        => 'De neuste Version fum $1',
+'revisionasof'           => 'Version vum $1',
+'revision-info'          => 'Dat es de Version vum $1 vum $2.', # Additionally available: $3: revision id
+'previousrevision'       => '� De Version dovör zeije',
+'nextrevision'           => 'De Version donoh zeije →',
+'currentrevisionlink'    => 'De neuste Version',
+'cur'                    => 'met jetz',
+'next'                   => 'wigger',
+'last'                   => 'met dovör',
+'page_first'             => 'Aanfang',
+'page_last'              => 'Engk',
+'histlegend'             => 'Hee kanns De Versione för et Verjliche ussöke: Dun met dä Knöpp die zweij markiere, 
 zwesche dänne De de Ungerscheid jezeich krije wells, dann dröck „<b style="padding:2px; background-color:#ddd; 
 color:black">{{int:compareselectedversions}}</b>“ udder „<b style="padding:2px; background-color:#ddd; 
 color:black">{{int:visualcomparison}}</b>“ udder „<b style="padding:2px; background-color:#ddd; 
@@ -887,11 +981,12 @@ Verklierung:
 ({{int:last}}) = donn met de Version ein doför verjliche,
 <b>M</b> = en klein <b>M</b>ini-Änderung,
 Dattum+Uhrzigg = don de Version fun dämm Daach un dä Zigg aanzeije.',
-'deletedrev'          => '[fott]',
-'histfirst'           => 'Ählste',
-'histlast'            => 'Neuste',
-'historysize'         => '({{PLURAL:$1|1 Byte|$1 Bytes|0 Byte}})',
-'historyempty'        => '(leddich)',
+'history-fieldset-title' => 'Wat uß de Verjangeheit ußwähle?',
+'deletedrev'             => '[fott]',
+'histfirst'              => 'Ählste',
+'histlast'               => 'Neuste',
+'historysize'            => '({{PLURAL:$1|1 Byte|$1 Bytes|0 Byte}})',
+'historyempty'           => '(leddich)',
 
 # Revision feed
 'history-feed-title'          => 'De Versione',
@@ -971,6 +1066,7 @@ Donn de Version makeere bes wohen (inklusive) dat övverdraare wäde sull. Donn
 'mergehistory-invalid-destination' => 'De Zielsigg ier Name moß och ene reschtijje Siggetittel sin.',
 'mergehistory-autocomment'         => '„[[:$1]]“ es jetz zosamme jelaat met „[[:$2]]“',
 'mergehistory-comment'             => '„[[:$1]]“ zosamme jelaat met „[[:$2]]“ — $3',
+'mergehistory-same-destination'    => 'De Quell-Sigg un de Ziel-Sigg dörve nit deselve Sigg sinn.',
 
 # Merge log
 'mergelog'           => 'Logboch fum Sigge zesamme Läje',
@@ -983,51 +1079,130 @@ Donn de Version makeere bes wohen (inklusive) dat övverdraare wäde sull. Donn
 'difference'              => '(Ungerscheid zwesche de Versione)',
 'lineno'                  => 'Reih $1:',
 'compareselectedversions' => 'Dun de markeete Version verjliche',
+'visualcomparison'        => 'Änderonge en dä Sigg makeere',
+'wikicodecomparison'      => 'Wikitäxte nevvenanderlääje',
 'editundo'                => 'De letzte Änderung zeröck nämme',
 'diff-multi'              => '(Mer don hee {{PLURAL:$1|eij Version|$1 Versione|keij Version}} dozwesche beim Verjliesche översprenge)',
+'diff-movedto'            => 'noh $1 jebraat',
+'diff-styleadded'         => 'Dä Stil <strong>$1</strong> för_t CSS dobei jedonn',
+'diff-added'              => '<strong>$1</strong> dobei jedonn',
+'diff-changedto'          => 'ömjeändert noh <strong>$1</strong>',
+'diff-movedoutof'         => 'fun $1 noh he jebraat',
+'diff-styleremoved'       => 'em CSS singe Stil <strong>$1</strong> he fottjenumme',
+'diff-removed'            => '<strong>$1</strong> fottjenumme',
+'diff-changedfrom'        => 'ömjeändert fun <strong>$1</strong>',
+'diff-src'                => 'Hääkunf',
+'diff-withdestination'    => 'met Ziel <strong>$1</strong>',
+'diff-with'               => '&#32;met $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => ', un $1 $2',
+'diff-width'              => 'Breed',
+'diff-height'             => 'Hühde',
+'diff-p'                  => "ene '''Afsatz'''",
+'diff-blockquote'         => "ene '''Zittaatblock'''",
+'diff-h1'                 => "en '''Övverschref''' om hühste Nivoh",
+'diff-h2'                 => "en '''Övverschref''' om zwetthühste Nivoh",
+'diff-h3'                 => "en '''Övverschref''' om dretthühste Nivoh",
+'diff-h4'                 => "en '''Övverschref''' om feethühste Nivoh",
+'diff-h5'                 => "en '''Övverschref''' om fönnefhühste Nivoh",
+'diff-pre'                => "ene '''förfommatteete Block'''",
+'diff-div'                => "e '''Blockelement'''",
+'diff-ul'                 => "en '''Leß''' ohne Nummere",
+'diff-ol'                 => "en '''Leß met Nummere'''",
+'diff-li'                 => "ene '''Endraach en en Leß'''",
+'diff-table'              => "en '''Tabäll'''",
+'diff-tbody'              => "dä '''Enhallt fun ene Tabäll'''",
+'diff-tr'                 => "en '''Reih''' en ene Tabäll",
+'diff-td'                 => "en '''Käßje''' en ene Tabäll",
+'diff-th'                 => "en '''Övverschreff''' för Spalld_en ene Tabäll",
+'diff-br'                 => "et '''Engk fun ene Reih'''",
+'diff-hr'                 => "en '''Queer Linisch'''",
+'diff-code'               => "e '''Stöck Kompjuter-Kood'''",
+'diff-dl'                 => "en '''Leß met su jenannte Definizjuhne'''",
+'diff-dt'                 => "ene '''Jäjestand uß ene su jenannte Definizjuhn'''",
+'diff-dd'                 => "en '''su jenannte Definizjuhn'''",
+'diff-input'              => "e '''Feld för jet Enzejävve'''",
+'diff-form'               => "e '''Fommulaa'''",
+'diff-img'                => "e '''Beld'''",
+'diff-span'               => "e '''inline-Element'''",
+'diff-a'                  => "ene '''Lengk'''",
+'diff-i'                  => "'''scheive Schreff'''",
+'diff-b'                  => "'''fätte Schreff'''",
+'diff-strong'             => "'''kräfteje Schreff'''",
+'diff-em'                 => "'''fürjehovve Schreff'''",
+'diff-font'               => "en '''Schrefftüpe'''",
+'diff-big'                => "'''jruße Schreff'''",
+'diff-del'                => "'''Fottjelohße'''",
+'diff-tt'                 => "'''Schreff met einheitlesch ejaale Wigde fun de Boochshtave'''",
+'diff-sub'                => "'''deefjestallte Schreff'''",
+'diff-sup'                => "'''huhjestallte Schreff'''",
+'diff-strike'             => "'''dorschjeshtreche Schreff'''",
 
 # Search results
-'searchresults'             => 'Wat beim Söke eruskom',
-'searchresulttext'          => 'Luur en de [[{{MediaWiki:Helppage}}|{{int:help}}]]-Sigge noh, wann de mieh drüvver wesse wells, wie mer en de {{SITENAME}} jet fingk.',
-'searchsubtitle'            => 'För Ding Froch noh „[[:$1|$1]]“ — ([[Special:Prefixindex/$1|Sigge, di met „$1“ annfange]] | [[Special:WhatLinksHere/$1|Sigge, di Links noh „$1“ han]])',
-'searchsubtitleinvalid'     => 'För Ding Froch noh „$1“',
-'noexactmatch'              => 'Mer han kein Sigg met jenau däm Name „<strong>$1</strong>“ jefunge.
+'searchresults'                    => 'Wat beim Söke eruskom',
+'searchresults-title'              => 'Noh „$1“ jesoht.',
+'searchresulttext'                 => 'Luur en de [[{{MediaWiki:Helppage}}|{{int:help}}]]-Sigge noh, wann de mieh drüvver wesse wells, wie mer en de {{SITENAME}} jet fingk.',
+'searchsubtitle'                   => 'För Ding Froch noh „[[:$1|$1]]“ — ([[Special:Prefixindex/$1|Sigge, di met „$1“ annfange]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|Sigge, di Links noh „$1“ han]])',
+'searchsubtitleinvalid'            => 'För Ding Froch noh „$1“',
+'noexactmatch'                     => 'Mer han kein Sigg met jenau däm Name „<strong>$1</strong>“ jefunge.
 Do kanns se [[:$1|aanläje]], wann De wells.',
-'noexactmatch-nocreate'     => "'''Et jitt kei Sigg met däm Titel „$1“.'''",
-'toomanymatches'            => 'Dat wore zo vill Treffer, beß esu joot, un donn en annder Ußwahl probeere!',
-'titlematches'              => 'Zopass Ãœvverschrefte',
-'notitlematches'            => 'Kein zopass Ãœvverschrefte',
-'textmatches'               => 'Sigge met däm Täx',
-'notextmatches'             => 'Kein Sigg met däm Tex',
-'prevn'                     => 'de $1 doför zeije',
-'nextn'                     => 'de nächste $1 zeije',
-'viewprevnext'              => 'Bläddere: ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|Eij Woot|$2 Wööter|Keij Woot}})',
-'search-result-score'       => 'Jeweesch: $1%',
-'search-redirect'           => '(Ömleitung $1)',
-'search-section'            => '(Avschnett $1)',
-'search-suggest'            => 'Häß De „$1“ jemeint?',
-'search-interwiki-caption'  => 'Schwesterprojekte',
-'search-interwiki-default'  => '$1 hät hee di Träffer jefonge:',
-'search-interwiki-more'     => '(mieh)',
-'search-mwsuggest-enabled'  => 'met Vürschläsh',
-'search-mwsuggest-disabled' => 'ohne Vürschläsh',
-'search-relatedarticle'     => 'Ähnlesch',
-'mwsuggest-disable'         => 'Kein automatische Hölp-Liss per Ajax beim Tippe em Feld för et Söke',
-'searchrelated'             => 'ähnlesch',
-'searchall'                 => 'all',
-'showingresults'            => 'Unge {{PLURAL:$1|weed <strong>eine</strong>|wääde bes <strong>$1</strong>|weed <strong>keine</strong>}} vun de jefunge Endräch jezeich, vun de Nummer <strong>$2</strong> av.',
-'showingresultsnum'         => 'Unge {{PLURAL:$3|es ein|sin <strong>$3</strong>|sin <strong>kein</strong>}} vun de jefunge Endräch opjeliss, vun de Nummer <strong>$2</strong> av.',
-'showingresultstotal'       => "Hee {{PLURAL:$4|kütt der Treffer Numero '''$1''' uß|kumme de Treffer '''$1''' beß '''$2''' fun}} '''$3:'''",
-'nonefound'                 => '<strong>Opjepass:</strong>
-Wann beim Söke nix erus kütt, do kann dat dran lije, dat mer esu janz jewöhnliche Wööd, wie „hät“, „alsu“, „wääde“, un „sin“, uew. jar nit esu en de Daatebank dren han, dat se jefonge wääde künnte.',
-'powersearch'               => 'Söke',
-'powersearch-legend'        => 'Extra Sööke',
-'powersearch-ns'            => 'Söök en de Apachtemangs:',
-'powersearch-redir'         => 'Ömleidunge aanzeije',
-'powersearch-field'         => 'Söök noh:',
-'search-external'           => 'Söke fun Ußerhallef',
-'searchdisabled'            => 'Dat Söke hee op de {{SITENAME}} es em Momang avjeschalt.
+'noexactmatch-nocreate'            => "'''Et jitt kei Sigg met däm Titel „$1“.'''",
+'toomanymatches'                   => 'Dat wore zo vill Treffer, beß esu joot, un donn en annder Ußwahl probeere!',
+'titlematches'                     => 'Zopass Ãœvverschrefte',
+'notitlematches'                   => 'Kein zopass Ãœvverschrefte',
+'textmatches'                      => 'Sigge met däm Täx',
+'notextmatches'                    => 'Kein Sigg met däm Tex',
+'prevn'                            => 'de $1 doför zeije',
+'nextn'                            => 'de nächste $1 zeije',
+'viewprevnext'                     => 'Bläddere: ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Enstellunge för et Söhke',
+'searchmenu-exists'                => "*Sigg '''[[$1]]'''",
+'searchmenu-new'                   => "'''Donn de Sigg „[[:$1|$1]]“ hee em Wiki aanlääje'''",
+'searchhelp-url'                   => 'Help:Hölp',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Zeich all Sigge, di met däm Tex aanfange]]',
+'searchprofile-articles'           => 'Sigge vum Enhalt',
+'searchprofile-articles-and-proj'  => 'Sigge vum Enhallt un vum Projek',
+'searchprofile-project'            => 'Projeksigge',
+'searchprofile-images'             => 'Dateie',
+'searchprofile-everything'         => 'Övverall noh',
+'searchprofile-advanced'           => 'Extra',
+'searchprofile-articles-tooltip'   => 'Söök en de $1',
+'searchprofile-project-tooltip'    => 'Söök en de $1',
+'searchprofile-images-tooltip'     => 'Söök noh Dateie',
+'searchprofile-everything-tooltip' => 'Söök övverall dren, och op de Klaafsigge',
+'searchprofile-advanced-tooltip'   => 'Donn en ußjesohte Appachtemangs sööke',
+'prefs-search-nsdefault'           => 'Sök met dä Standat-Enstellunge:',
+'prefs-search-nscustom'            => 'Sök en dä Appachtemangs:',
+'search-result-size'               => '$1 ({{PLURAL:$2|Eij Woot|$2 Wööter|Keij Woot}})',
+'search-result-score'              => 'Jeweesch: $1%',
+'search-redirect'                  => '(Ömleitung $1)',
+'search-section'                   => '(Avschnett $1)',
+'search-suggest'                   => 'Häß De „$1“ jemeint?',
+'search-interwiki-caption'         => 'Schwesterprojekte',
+'search-interwiki-default'         => '$1 hät hee di Träffer jefonge:',
+'search-interwiki-more'            => '(mieh)',
+'search-mwsuggest-enabled'         => 'met Vürschläsh',
+'search-mwsuggest-disabled'        => 'ohne Vürschläsh',
+'search-relatedarticle'            => 'Ähnlesch',
+'mwsuggest-disable'                => 'Kein automatische Hölp-Liss per Ajax beim Tippe em Feld för et Söke',
+'searchrelated'                    => 'ähnlesch',
+'searchall'                        => 'all',
+'showingresults'                   => 'Unge {{PLURAL:$1|weed <strong>eine</strong>|wääde bes <strong>$1</strong>|weed <strong>keine</strong>}} vun de jefunge Endräch jezeich, vun de Nummer <strong>$2</strong> av.',
+'showingresultsnum'                => 'Unge {{PLURAL:$3|es ein|sin <strong>$3</strong>|sin <strong>kein</strong>}} vun de jefunge Endräch opjeliss, vun de Nummer <strong>$2</strong> av.',
+'showingresultstotal'              => "Hee {{PLURAL:$4|kütt der Treffer Numero '''$1''' uß|kumme de Treffer '''$1''' beß '''$2''' fun}} '''$3:'''",
+'nonefound'                        => '<strong>Opjepass:</strong>
+Standatmääßesch don mer nur en bestemmpte Appachtemangs söke.
+Donn „<code>all:</code>“ för Ding Wööt saze, wan de en alle Appachtemangs
+söke wells, och Klaafsigge, Schabloone, un esu, udder nemm dä zopaß
+Appachtemangs-Name.',
+'search-nonefound'                 => 'Mer han nix zopaß jefonge för Ding Aanfrohch.',
+'powersearch'                      => 'Söke',
+'powersearch-legend'               => 'Extra Sööke',
+'powersearch-ns'                   => 'Söök en de Apachtemangs:',
+'powersearch-redir'                => 'Ömleidunge aanzeije',
+'powersearch-field'                => 'Söök noh:',
+'search-external'                  => 'Söke fun Ußerhallef',
+'searchdisabled'                   => 'Dat Söke hee op de {{SITENAME}} es em Momang avjeschalt.
 Dat weed op dänne Sörver ad ens jemaat, domet de Lass op inne nit ze jroß weed,
 un winnichstens dat normale Sigge Oprofe flöck jenoch jeiht.
 
@@ -1038,76 +1213,83 @@ dat dänne ihr Daate topaktuell sin,
 ävver et es besser wie jar nix.',
 
 # Preferences page
-'preferences'              => 'ming Enstellunge',
-'mypreferences'            => 'ming Enstellunge',
-'prefs-edits'              => 'Aanzahl Änderunge am Wiki:',
-'prefsnologin'             => 'Nit Enjelogg',
-'prefsnologintext'         => 'Do mööts ald <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} enjelogg]</span> sin, öm Ding Enstellunge ze ändere.',
-'prefsreset'               => 'De Enstellunge woodte jetz op Standard zeröck jesatz.',
-'qbsettings'               => '„Flöcke Links“',
-'qbsettings-none'          => 'Fottlooße, dat well ich nit sinn',
-'qbsettings-fixedleft'     => 'Am linke Rand fass aanjepapp',
-'qbsettings-fixedright'    => 'Am rächte Rand fass aanjepapp',
-'qbsettings-floatingleft'  => 'Am linke Rand am Schwevve',
-'qbsettings-floatingright' => 'Am rächte Rand am Schwevve',
-'changepassword'           => 'Passwood ändere',
-'skin'                     => 'Et Ussinn',
-'math'                     => 'Mathematisch Formele',
-'dateformat'               => 'Em Datum sing Fomat',
-'datedefault'              => 'Ejaal - kein Vörliebe',
-'datetime'                 => 'Datum un Uhrzigge',
-'math_failure'             => 'Fähler vum Parser',
-'math_unknown_error'       => 'Fähler, dä mer nit kenne',
-'math_unknown_function'    => 'en Funktion, die mer nit kenne',
-'math_lexing_error'        => 'Fähler beim Lexing',
-'math_syntax_error'        => 'Fähler en de Syntax',
-'math_image_error'         => 'De Ömwandlung noh PNG es donevve jejange. Dun ens noh de richtije Enstallation luure bei <i>latex</i>, <i>dvips</i>, <i>gs</i>, un <i>convert</i>. Oder sag et enem Sörver-Admin, oder enem Wiki Köbes.',
-'math_bad_tmpdir'          => 'Dat Zwescheverzeichnis för de mathematische Formele lööt sich nit aanläje oder nix eren schrieve. Dat es Dress. Sag et enem Wiki-Köbes oder enem Sörver-Minsch.',
-'math_bad_output'          => 'Dat Verzeichnis för de mathematische Formele lööt sich nit aanläje oder mer kann nix eren schrieve. Dat es Dress. Sag et enem Wiki-Köbes oder enem Sörver-Minsch.',
-'math_notexvc'             => "Dat Projamm <code>texvc</code> ha'mer nit jefunge. Sag et enem 
+'preferences'               => 'ming Enstellunge',
+'mypreferences'             => 'ming Enstellunge',
+'prefs-edits'               => 'Aanzahl Änderunge am Wiki:',
+'prefsnologin'              => 'Nit Enjelogg',
+'prefsnologintext'          => 'Do mööts ald <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} enjelogg]</span> sin, öm Ding Enstellunge ze ändere.',
+'prefsreset'                => 'De Enstellunge woodte jetz op Standard zeröck jesatz.',
+'qbsettings'                => '„Flöcke Links“',
+'qbsettings-none'           => 'Fottlooße, dat well ich nit sinn',
+'qbsettings-fixedleft'      => 'Am linke Rand fass aanjepapp',
+'qbsettings-fixedright'     => 'Am rächte Rand fass aanjepapp',
+'qbsettings-floatingleft'   => 'Am linke Rand am Schwevve',
+'qbsettings-floatingright'  => 'Am rächte Rand am Schwevve',
+'changepassword'            => 'Passwood *',
+'skin'                      => 'Et Ussinn',
+'skin-preview'              => 'Vör-Ansich',
+'math'                      => 'Mathematisch Formele',
+'dateformat'                => 'Em Datum sing Fomat',
+'datedefault'               => 'Ejaal - kein Vörliebe',
+'datetime'                  => 'Datum un Uhrzigge',
+'math_failure'              => 'Fähler vum Parser',
+'math_unknown_error'        => 'Fähler, dä mer nit kenne',
+'math_unknown_function'     => 'en Funktion, die mer nit kenne',
+'math_lexing_error'         => 'Fähler beim Lexing',
+'math_syntax_error'         => 'Fähler en de Syntax',
+'math_image_error'          => 'De Ömwandlung noh PNG es donevve jejange. Dun ens noh de richtije Enstallation luure bei <i>latex</i>, <i>dvips</i>, <i>gs</i>, un <i>convert</i>. Oder sag et enem Sörver-Admin, oder enem Wiki Köbes.',
+'math_bad_tmpdir'           => 'Dat Zwescheverzeichnis för de mathematische Formele lööt sich nit aanläje oder nix eren schrieve. Dat es Dress. Sag et enem Wiki-Köbes oder enem Sörver-Minsch.',
+'math_bad_output'           => 'Dat Verzeichnis för de mathematische Formele lööt sich nit aanläje oder mer kann nix eren schrieve. Dat es Dress. Sag et enem Wiki-Köbes oder enem Sörver-Minsch.',
+'math_notexvc'              => "Dat Projamm <code>texvc</code> ha'mer nit jefunge. Sag et enem 
 Wiki-Köbes, enem Sörver-Minsch, oder luur ens en de 
 <code>math/README</code>.",
-'prefs-personal'           => 'De Enstellunge',
-'prefs-rc'                 => 'Neuste Änderunge',
-'prefs-watchlist'          => 'De Oppassliss',
-'prefs-watchlist-days'     => 'Aanzahl Dage för en ming Oppassliss aanzezeije:',
-'prefs-watchlist-edits'    => 'Aanzahl Änderunge för en ming verjrößerte Oppassliss aanzezeije:',
-'prefs-misc'               => 'Söns',
-'saveprefs'                => 'Fasshalde',
-'resetprefs'               => 'Zeröck setze',
-'oldpassword'              => 'Et ahle Passwood:',
-'newpassword'              => 'Et neue Passwood:',
-'retypenew'                => 'Noch ens dat neue Passwood:',
-'textboxsize'              => 'Beim Bearbeide',
-'rows'                     => 'Reihe:',
-'columns'                  => 'Spalte:',
-'searchresultshead'        => 'Beim Söke',
-'resultsperpage'           => 'Zeich Treffer pro Sigg:',
-'contextlines'             => 'Reihe för jede Treffer:',
-'contextchars'             => 'Zëijshe uß de Ömjävung, pro Rëij:',
-'stub-threshold'           => 'Links passend för <a href="#" class="stub">klein Sigge</a> fomateere av esu vill Bytes:',
-'recentchangesdays'        => 'Aanzahl Dage en de Liss met de „Neuste Änderunge“ — als Standad:',
-'recentchangescount'       => 'Aanzahl Endräch en de Liss met de „Neuste Änderunge“, Fojangeheit un Logbööcher — als Standad:',
-'savedprefs'               => 'Ding Enstellunge sin jetz jesechert.',
-'timezonelegend'           => 'Ziggzon-Affstand',
-'timezonetext'             => '¹ Dat sin de Stunde un Minutte zwesche de Zigg op de Uhre bei Dir am Oot un däm Sörver, dä met UTC läuf.',
-'localtime'                => 'De Zigg op Dingem Kompjuter:',
-'timezoneoffset'           => 'Dä Ungerscheed¹ es:',
-'servertime'               => 'De Uhrzigg om Sörver es jetz:',
-'guesstimezone'            => 'Fingk et erus üvver dä Brauser',
-'allowemail'               => 'E-Mail vun andere Metmaacher zolooße',
-'prefs-searchoptions'      => 'Enstellunge för et Sööke',
-'prefs-namespaces'         => 'Appachtemangs',
-'defaultns'                => 'Dun standaadmäßich en hee dä Appachtemengs söke:',
-'default'                  => 'Standaad',
-'files'                    => 'Dateie',
+'prefs-personal'            => 'De Enstellunge',
+'prefs-rc'                  => 'Neuste Änderunge',
+'prefs-watchlist'           => 'De Oppassliss',
+'prefs-watchlist-days'      => 'Aanzahl Dage för en ming Oppassliss aanzezeije:',
+'prefs-watchlist-days-max'  => '(Nit mieh wie 7 Dääch)',
+'prefs-watchlist-edits'     => 'Aanzahl Änderunge för en ming verjrößerte Oppassliss aanzezeije:',
+'prefs-watchlist-edits-max' => '(Nit mieh wie 1000)',
+'prefs-misc'                => 'Söns',
+'prefs-resetpass'           => 'Dat Passwood ändere',
+'saveprefs'                 => 'Fasshalde',
+'resetprefs'                => 'Zeröck setze',
+'textboxsize'               => 'Beim Bearbeide',
+'prefs-edit-boxsize'        => 'Dat Feld zöm Schrieve sull han:',
+'rows'                      => 'Reihe:',
+'columns'                   => 'Spalte:',
+'searchresultshead'         => 'Beim Söke',
+'resultsperpage'            => 'Zeich Treffer pro Sigg:',
+'contextlines'              => 'Reihe för jede Treffer:',
+'contextchars'              => 'Zëijshe uß de Ömjävung, pro Rëij:',
+'stub-threshold'            => 'Links passend för <a href="#" class="stub">klein Sigge</a> fomateere av esu vill Bytes:',
+'recentchangesdays'         => 'Aanzahl Dage en de Liss met de „Neuste Änderunge“ — als Standad:',
+'recentchangesdays-max'     => '(Nit mieh wie {{PLURAL:$1|eine Daach|$1 Dääsh|keine Daach}})',
+'recentchangescount'        => 'Aanzahl Änderunge en de Liss met de „{{int:recentchanges}}“,
+de Versione uß de Fojangeheit, un de Logbööcher — als Standad:',
+'savedprefs'                => 'Ding Enstellunge sin jetz jesechert.',
+'timezonelegend'            => 'Ziggzon-Affstand',
+'timezonetext'              => '¹ Dat sin de Stunde un Minutte zwesche de Zigg op de Uhre bei Dir am Oot un däm Sörver, dä met UTC läuf.',
+'localtime'                 => 'De Zigg op Dingem Kompjuter:',
+'timezoneselect'            => 'De Ziggzon es:',
+'timezoneuseserverdefault'  => 'Nemm däm Server sing Zigg',
+'timezoneuseoffset'         => 'Söns jet, jiff dä Ungerscheid aan',
+'timezoneoffset'            => 'Dä Ungerscheid¹ es:',
+'servertime'                => 'De Uhrzigg om Sörver es jetz:',
+'guesstimezone'             => 'Fingk et erus üvver dä Brauser',
+'allowemail'                => 'E-Mail vun andere Metmaacher zolooße',
+'prefs-searchoptions'       => 'Enstellunge för et Sööke',
+'prefs-namespaces'          => 'Appachtemangs',
+'defaultns'                 => 'Dun standaadmäßich en hee dä Appachtemengs söke:',
+'default'                   => 'Standaad',
+'files'                     => 'Dateie',
 
 # User rights
 'userrights'                  => 'Metmaacher ehr Räächde verwalte', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Metmaacher Jruppe verwalte',
 'userrights-user-editname'    => 'Metmaacher Name:',
 'editusergroup'               => 'Däm Metmaacher sing Jruppe Räächde bearbeide',
-'editinguser'                 => "Däm '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) sing Metmaachersigg ändere",
+'editinguser'                 => "Däm '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) sing Metmaachersigg ändere",
 'userrights-editusergroup'    => 'Metmaacher Jruppe aanpasse',
 'saveusergroups'              => 'Metmaacher Jruppe avspeichere',
 'userrights-groupsmember'     => 'Es en de Metmaacher Jruppe:',
@@ -1155,6 +1337,8 @@ Wiki-Köbes, enem Sörver-Minsch, oder luur ens en de
 'right-minoredit'            => 'Eije Änderung als klein Mini-Änderung makeere',
 'right-move'                 => 'Sigge ömnenne',
 'right-move-subpages'        => 'Sigge, un ier Ungersigge, zosamme ömnenne',
+'right-move-rootuserpages'   => '(Houp)-Metmaacher-Sigg Ömnänne',
+'right-movefile'             => 'Dateie ömnenne',
 'right-suppressredirect'     => 'Kein automatesche Ömleidung aanlääje beim Ömnenne',
 'right-upload'               => 'Dateie huhlade',
 'right-reupload'             => 'En Datei ußtuusche, di ussem Wiki kütt',
@@ -1205,9 +1389,46 @@ Wiki-Köbes, enem Sörver-Minsch, oder luur ens en de
 'rightslogentry' => 'hät däm Metmaacher „$1“ sing Räächde vun „$2“ op „$3“ ömjestallt.',
 'rightsnone'     => '(nix)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'di Sigg ze lesse',
+'action-edit'                 => 'di Sigg ze ändere',
+'action-createpage'           => 'di Sigg aanzeläje',
+'action-createtalk'           => 'Klaafsigge aanzeläje',
+'action-createaccount'        => 'hee dä neue Metmaacher aanzemelde',
+'action-minoredit'            => 'hee di Änderung als klein „mini“ ze makkeere',
+'action-move'                 => 'di Sigg ömzebenänne',
+'action-move-subpages'        => 'hee di Sigg un ier Ongersigge ömzebenänne',
+'action-move-rootuserpages'   => 'enem Metmaacher sing (Houp)-Metmaacher-Sigg ömzenänne',
+'action-movefile'             => 'Die Datei ömnenne',
+'action-upload'               => 'hee di Datei huhzelade',
+'action-reupload'             => 'hee di Datei, di et ald jitt, ußzetuusche',
+'action-reupload-shared'      => 'hee di Datei „för“ di ze säze, di et en de jemeinsame Biblijoteek ald jitt',
+'action-upload_by_url'        => 'hee di Datei fun en URL erövver trecke ze lohße',
+'action-writeapi'             => 'dat API zom Schriive ze bruche',
+'action-delete'               => 'hee di Sigg fottzeschmiiße',
+'action-deleterevision'       => 'hee di Versijon fottzeschmiiße',
+'action-deletedhistory'       => 'vun hee dä Sigg de Leß met de fottjeschmeße Versijone aanzeloore',
+'action-browsearchive'        => 'noh fottjeschmeße Sigge ze söke',
+'action-undelete'             => 'hee di fottjeschmeße Sigg widder zeröck ze holle',
+'action-suppressrevision'     => 'hee di fottjeschmeße Versijon aanzeloore un womööschlesch widder zeröck ze holle',
+'action-suppressionlog'       => 'hee dat jeheime Logbooch aanzeloore',
+'action-block'                => 'hee dämm Metmaacher et Sigge Ändere ze verbeede',
+'action-protect'              => 'hee dä Sigg iere Sigge-Schotz ze ändere',
+'action-import'               => 'hee di Sigg uss enem andere Wiki ze empotteere',
+'action-importupload'         => 'hee di Sigg uss ene huhjelaade Datei ze impotteere',
+'action-patrol'               => 'anderlüx Änderunge als „nohjeloort“ ze makeere',
+'action-autopatrol'           => 'Ding eije Änderunge sälver als „nohjeloort“ ze makeere',
+'action-unwatchedpages'       => 'de Leß met de Sigg en kei Oppassleß aanzeloore',
+'action-trackback'            => 'e <i lang="en">trackback</i> enzedraare',
+'action-mergehistory'         => 'hee dä Sigg ier Verjangeheit un Versijon met ene andere zosamme ze lääje',
+'action-userrights'           => 'alle Metmaacher ier Rääschte ze ändere',
+'action-userrights-interwiki' => 'dä Metmaacher fun ander Wikis ier Rääschte ze ändere',
+'action-siteadmin'            => 'de Datebank ze sperre udder widder freizejävve',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|Ein Änderung|$1 Änderunge|Kein Änderung}}',
 'recentchanges'                     => 'Neuste Änderunge',
+'recentchanges-legend'              => 'Enstellunge',
 'recentchangestext'                 => 'Op dä Sigg hee sin de neuste Änderunge am Wiki opjeliss.',
 'recentchanges-feed-description'    => 'Op dämm Abonnomang-Kannal (<i lang="en">Feed</i>) kannze de {{int:recentchanges}} aam Wiki en Laif un en Färve metloore.',
 'rcnote'                            => '{{PLURAL:$1|Hee is de letzte Änderung us|Hee sin de letzte <strong>$1</strong> Änderunge us|Et jit <strong>kei</strong> Änderunge en}} {{PLURAL:$2|däm letzte Dag|de letzte <strong>$2</strong> Dage|dä Zick}} vum $4 aff $5 Uhr beß jetz.',
@@ -1232,10 +1453,13 @@ Wiki-Köbes, enem Sörver-Minsch, oder luur ens en de
 'rc_categories_any'                 => 'All, wat mer han',
 'rc-change-size'                    => '$1 {{PLURAL:$1|Byte|Bytes}}',
 'newsectionsummary'                 => 'Neu Avschnet /* $1 */',
+'rc-enhanced-expand'                => 'Einzelheite zeije (bruch JavaSkripp)',
+'rc-enhanced-hide'                  => 'Einzelheite versteiche',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Änderunge aan Sigge, wo hee drop jelink es',
 'recentchangeslinked-title'    => 'Änderunge aan Sigge, die vun „$1“ uß verlink sin',
+'recentchangeslinked-backlink' => '�&nbsp;$1',
 'recentchangeslinked-noresult' => 'Et woodte kein Änderunge aan verlinkte Sigge jemaat en dä Zick.',
 'recentchangeslinked-summary'  => "Hee die Sondersigg hät en Liß met Änderunge aan Sigge, di vun de aanjejovve Sigg uß verlink sin.
 Bei Saachjruppe sen et de Sigge en dä Saachjrupp.
@@ -1258,16 +1482,16 @@ Dat Fo'zeishnis <code>$1</code> för de huhjelaade Dateie es fott, un dat Websö
 <ul style=\"list-style:none outside none; 
 list-style-position:outside; list-style-image:none; list-style-type:none\"><li style=\"list-style:none outside none; 
 list-style-position:outside; list-style-image:none; 
-list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:image}}:'''''Beldche'''''.jpg]]'''</code></li><li style=\"list-style:none outside none; 
+list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:file}}:'''''Beldche'''''.jpg]]'''</code></li><li style=\"list-style:none outside none; 
 list-style-position:outside; list-style-image:none; 
-list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:image}}:'''''Beld'''''.svg| '''''200''''' px|thumb]]'''</code></li><li
+list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:file}}:'''''Beld'''''.svg| '''''200''''' px|thumb]]'''</code></li><li
 style=\"list-style:none outside none; list-style-position:outside; list-style-image:none; 
-list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:image}}:'''''Su süht dat us'''''.png | '''''ene Tex, för zem zeije, wann Brausere kein Belder zeije künne oder kein Belder zeije sulle''''' ]]'''</code></li><li style=\"list-style:none outside none; 
+list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:file}}:'''''Su süht dat us'''''.png | '''''ene Tex, för zem zeije, wann Brausere kein Belder zeije künne oder kein Belder zeije sulle''''' ]]'''</code></li><li style=\"list-style:none outside none; 
 list-style-position:outside; list-style-image:none; 
 list-style-type:none\"><code>'''<nowiki>[[</nowiki>{{ns:media}}:'''''Esu hürt sich dat aan'''''.ogg]]'''</code></li></ul>
 Usführlich met alle Müjjelichkeite fings de dat bei de Hölp.
 Wann De jetz entschlosse bes, dat De et hee huhlade wells:
-* Aanluure, wat mer hee en de {{SITENAME}} ald han, kanns De en uns [[Special:ImageList|Liss med huhjelade Dateie]].
+* Aanluure, wat mer hee en de {{SITENAME}} ald han, kanns De en uns [[Special:FileList|Liss med huhjelade Dateie]].
 * Wenn De jet söke wells, eets ens nohluure wells, wat ald huhjelade, oder villeich widder fottjeschmesse wood, dat steiht em [[Special:Log/upload|Logboch vum Huhlade]].
 * Nohluure, wat fottjeschmesse wood, kanns De em [[Special:Log/delete|Logboch vum Sigge Fottschmie0e]].
 Esu, un jetz loss jonn:</div>
@@ -1278,7 +1502,7 @@ Esu, un jetz loss jonn:</div>
 'uploadlog'                   => 'LogBoch vum Dateie Huhlade',
 'uploadlogpage'               => 'Logboch met de huhjelade Dateie',
 'uploadlogpagetext'           => 'Hee sin de Neuste huhjelade Dateie opjeliss un wä dat jedon hät.
-(En de [[Special:NewImages|Jalleri met neu Dateie]] kriß De ene Övverbleck med Belldsche)',
+(En de [[Special:NewFiles|Jalleri met neu Dateie]] kriß De ene Övverbleck med Belldsche)',
 'filename'                    => 'Dä Name vun dä Datei',
 'filedesc'                    => 'Beschrievungstex un Zosammefassung',
 'fileuploadsummary'           => 'Beschrievungstex un Zosammefassung:',
@@ -1305,24 +1529,26 @@ hallde deiht, wat nit erlaub, un müjjelelscherwies ene jefährlesche Dattei-Typ
 'large-file'                  => 'Dateie sullte nit jröößer wääde, wi $1, ävver Ding Datei es $2 jroß.',
 'largefileserver'             => 'De Datei es ze jroß. Jrößer wie däm Sörver sing Enstellung erlaub.',
 'emptyfile'                   => 'Wat De hee jetz huhjelade häs, hät kein Daate dren jehatt. Künnt sin, dat De Dich verdon häs, un dä Name wo verkihrt jeschrevve. Luur ens ov De wirklich <strong>die</strong> Datei hee huhlade wells.',
-'fileexists'                  => 'Et jitt ald en Datei met däm Name. Wann De op „Datei avspeichere“ klicks, weed se ersetz. Bes esu jod  un luur Der <strong><tt>$1</tt></strong> aan, wann De nit 100% secher bes.',
-'filepageexists'              => 'En Sigg övver di Datei met däm Tittel <strong><tt>$1</tt></strong> es ald doh, ävver en Datei met däm Name ham_mer nit. Dinge Tex kütt nit automattesch op di Sigg övver di Dattei. Di Sigg moß De wann nüüdesch noch ens extra ändere.',
-'fileexists-extension'        => '<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="2">Mer han ald en Dattei, di bahl jenou esu heijß:</td></tr><tr><td>Huh am laade sim_mer:&nbsp;</td><td><strong><tt>$1</tt></strong></td></tr><tr><td>Ald om ßörve eß:</td><td><strong><tt>$2</tt></strong></td></tr><tr><td colspan="2">Bes esu joot un söök Der ene ander Name fö di Datei us.</td></tr></table>',
+'fileexists'                  => "Et jitt ald en Datei met däm Name. Wann De op „Datei avspeichere“ klicks, weed se ersetz. Bes esu jod  un luur Der '''<tt>$1</tt>''' aan, wann De nit 100% secher bes.",
+'filepageexists'              => "En Sigg övver di Datei met däm Tittel '''<tt>$1</tt>''' es ald doh, ävver en Datei met däm Name ham_mer nit. Dinge Tex kütt nit automattesch op di Sigg övver di Dattei. Di Sigg moß De wann nüüdesch noch ens extra ändere.",
+'fileexists-extension'        => '<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="2">Mer han ald en Dattei, di bahl jenou esu heijß:</td></tr><tr><td>Huh am laade sim_mer:&nbsp;</td><td>\'\'\'<tt>$1</tt>\'\'\'</td></tr><tr><td>Ald om ßörve eß:</td><td>\'\'\'<tt>$2</tt>\'\'\'</td></tr><tr><td colspan="2">Bes esu joot un söök Der ene ander Name fö di Datei us.</td></tr></table>',
 'fileexists-thumb'            => "<center>'''Datei'''</center>",
-'fileexists-thumbnail-yes'    => 'Dat süühd uß, wi wann dat hee en Minni-Beldsche em Breefmarrke-Fommaat (<i><span lang="en">thumbnail</span></i>) wöhr. Don ens di Dattei <strong><tt>$1</tt></strong> prööfe. Wann dat de Orjinaaljrüß es, do moß keij för dat Beld keij extra Vör-Aansich huhjelade wäde.',
-'file-thumbnail-no'           => 'Dä Name fö di Datei fängk met <strong><tt>$1</tt></strong> aan.
+'fileexists-thumbnail-yes'    => "Dat süühd uß, wi wann dat hee en Minni-Beldsche em Breefmarrke-Fommaat (''<span lang=\"en\">thumbnail</span>'') wöhr. Don ens di Dattei '''<tt>\$1</tt>''' prööfe. Wann dat de Orjinaaljrüß es, do moß keij för dat Beld keij extra Vör-Aansich huhjelade wäde.",
+'file-thumbnail-no'           => "Dä Name fö di Datei fängk met '''<tt>\$1</tt>''' aan.
 Dat süühd uß, wi wann dat en Minni-Beldsche em Breefmarrke-Fommaat
-(<i><span lang="en">thumbnail</span></i>) wöhr. Don ens di Dattei
-<strong><tt>$1</tt></strong> prööfe, of de nit e besser opjelööß Beld
+(''<span lang=\"en\">thumbnail</span>'') wöhr. Don ens di Dattei
+'''<tt>\$1</tt>''' prööfe, of de nit e besser opjelööß Beld
 dofun häß, un don dat met singe Orjinaaljrüß huhlade, wann müjjelesch.
-Söns donn besser ene andere Dateiname ußsöke.',
-'fileexists-forbidden'        => 'Et jitt ald en Datei met däm Name.
-Jangk zeröck un lad se unger enem andere Name huh. [[Image:$1|thumb|center|$1]]',
+Söns donn besser ene andere Dateiname ußsöke.",
+'fileexists-forbidden'        => 'Et jitt ald en Dattei met däm Name, un mer kann se nit övverschriive.
+Wann de Ding Dattei trozdämm huhlaade wells, da jangk zeröck un lad se
+unger enem andere Name huh. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Et jitt ald en Datei met däm Name em jemeinsame Speicher:
-[[Image:$1|thumb|center|$1]]
+[[File:$1|thumb|center|$1]]
 Jangk zeröck un lad Ding Datei unger enem andere Name huh,
 wann De se noch han wells.',
 'file-exists-duplicate'       => 'Di Dattei hät dersellve Enhallt wi hee di {{PLURAL:$1|Datei|Dateie|}}:',
+'file-deleted-duplicate'      => 'En Datei mem sellve Enhallt wi „[[$1]]“ es ens fottjeschmeße woode. Donn dä Zosammehang em „{{int:dellogpage}}“ nokike, ih dat De se widder huhläds.',
 'successfulupload'            => 'Et Huhlade hät jeflupp',
 'uploadwarning'               => 'Warnung beim Huhlade',
 'savefile'                    => 'Datei avspeichere',
@@ -1351,8 +1577,23 @@ De Einzelheite: $1',
 
 Bes esu joot un don Der övverlääje, of di Dattei mem sellve Name norr_ens huh ze lade en Odenung es.
 Hee es dat Logbooch met de fotjeschmesse Dateie, met däm Jrond, woröm di Dattei dohmohls fottjeschmesse woode es:",
-'filename-bad-prefix'         => 'Dä Datei ier Name fängk met <strong>„$1“</strong> aan. dat eß fä jewöhnlesch ene Name, dä en dijjitaale Kammerra iere Belder jitt. Esu en Name donn uns esu winnisch verzälle, dat mer se nit jän em Wiki han wulle.
-Bes esu joot un jiff dä enne Name, wo mer mieh met aanfange, öm ze wesse, wat en dä Datei dren es.',
+'filename-bad-prefix'         => "Dä Datei ier Name fängk met '''„$1“''' aan. dat eß fä jewöhnlesch ene Name, dä en dijjitaale Kammerra iere Belder jitt. Esu en Name donn uns esu winnisch verzälle, dat mer se nit jän em Wiki han wulle.
+Bes esu joot un jiff dä enne Name, wo mer mieh met aanfange, öm ze wesse, wat en dä Datei dren es.",
+'filename-prefix-blacklist'   => ' #<!-- Lohß di Reih jenou esu wie se es! --> <pre>
+#  Syntax:
+#   * Alles zwesche em #-Zeiche bes nohm Engk vun de Reih es ene Kommäntaa
+#   * Jede Reih met jet dren es ene typpesche Aanfang för ene Datteiname,
+#   * dä automattesch vun ene Dijjitahlkammera kütt
+CIMG # Casio
+DSC_ # Nikon
+DSCF # Fuji
+DSCN # Nikon
+DUW # - et ein udder andere mobile Tellefohn -
+IMG # - alljemein üplesch -
+JD # Jenoptik
+MGP # Pentax
+PICT # - diverse -
+ #</pre> <!-- Lohß di Reih jenou esu wie se es! -->',
 
 'upload-proto-error'      => 'Verkihrt Protokoll',
 'upload-proto-error-text' => 'Ene URL för en Datei fun huhzelade moß met <code>http://</code> uder <code>ftp://</code> aafange.',
@@ -1380,18 +1621,19 @@ Velleich probees De et och zo en Zick, wo winnijer loss es.',
 'upload_source_url'  => ' (richtije öffentlije URL)',
 'upload_source_file' => ' (en Datei op Dingem Kompjuter)',
 
-# Special:ImageList
-'imagelist-summary'     => "Hee sin de huhjeladene Dateie opjelis. Et eetz wäde de zoletz huhjeladene Dateie aanjezeich. Wa'mer op de Övverschreff von ene Spalt klick, weed die Spalt sotteet, wa'mer norrens klick, weed de Reiejfolg ömjedrieht.",
-'imagelist_search_for'  => 'Sök noh däm Name vun däm Beld:',
+# Special:ListFiles
+'listfiles-summary'     => "Hee sin de huhjeladene Dateie opjelis. Et eetz wäde de zoletz huhjeladene Dateie aanjezeich. Wa'mer op de Övverschreff von ene Spalt klick, weed die Spalt sotteet, wa'mer norrens klick, weed de Reiejfolg ömjedrieht.",
+'listfiles_search_for'  => 'Sök noh däm Name vun däm Beld:',
 'imgfile'               => 'Datei',
-'imagelist'             => 'Belder, Tön, uew. (all)',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Name',
-'imagelist_user'        => 'Metmaacher',
-'imagelist_size'        => 'Byte',
-'imagelist_description' => 'Wat es op däm Beld drop?',
-
-# Image description page
+'listfiles'             => 'Dateie opleste',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Name',
+'listfiles_user'        => 'Metmaacher',
+'listfiles_size'        => 'Byte',
+'listfiles_description' => 'Wat es op däm Beld drop?',
+'listfiles_count'       => 'Versione',
+
+# File description page
 'filehist'                       => 'De Versione vun dä Datei',
 'filehist-help'                  => 'Di domohlije Version kriß De jezeich övver dä Link op em Dattum.',
 'filehist-deleteall'             => 'All Versione fottschmieße',
@@ -1399,20 +1641,26 @@ Velleich probees De et och zo en Zick, wo winnijer loss es.',
 'filehist-revert'                => 'Zeröck nemme',
 'filehist-current'               => 'Von jetz',
 'filehist-datetime'              => 'Version vom',
+'filehist-thumb'                 => 'Mini-Beldsche',
+'filehist-thumbtext'             => 'Mini-Beldsche för de Version fum $1',
+'filehist-nothumb'               => 'Kei Mini-Beldsche',
 'filehist-user'                  => 'Metmaacher',
 'filehist-dimensions'            => 'Pixelle Breed×Hühte (Dateiömfang)',
 'filehist-filesize'              => 'Dateiömfang',
 'filehist-comment'               => 'Aanmerkung',
-'imagelinks'                     => 'Jebruch en',
+'imagelinks'                     => 'Lenks op hee die Datei',
 'linkstoimage'                   => 'Hee {{PLURAL:$1|kütt di Sigg|kumme de $1 Sigge|sin keij Sigge}}, die op die Datei linke {{PLURAL:$1|deiht|dun|dun}}:',
+'linkstoimage-more'              => 'Mieh wie {{PLURAL:$1|ein Sigg link|$1 Sigge linke|kein Sigg link}} op di Datei.
+De Liß hee dronger zeisch nur {{PLURAL:$1|der eetse Link|de eetste $1 Links|keine Link}} op di Datei.
+Mer ävver han och en [[Special:WhatLinksHere/$2|Komplätte Leß]].',
 'nolinkstoimage'                 => 'Nix link op hee die Datei.',
 'morelinkstoimage'               => 'Belohr Der [[Special:WhatLinksHere/$1|de Links]] op di Datei.',
 'redirectstofile'                => 'Di {{PLURAL:$1|Datei heenoh leid|$1 Dateie leide}} op he di Datei öm:',
-'duplicatesoffile'               => 'De Datei{{PLURAL:$1||e|e}} hee noh {{PLURAL:$1|is en|sen}} dubbelte fon he dä Datei, un {{PLURAL:$1|hät|han|}} dersellve Enhalldt:',
+'duplicatesoffile'               => 'Mer hann_er {{PLURAL:$1|en dubbelte Datei|$1 dubbelte Dateie|kei dubbelte Dateije}} fon he dä Datei, di {{PLURAL:$1|hät|han all|han}} dersellve Enhalldt ([[Special:FileDuplicateSearch/$2|mieh Einzelheite]]):',
 'sharedupload'                   => 'De Datei es esu parat jelaht, dat se en diverse, ungerscheidlije Projekte jebruch wääde kann.',
 'shareduploadwiki'               => 'Mieh Informatione fings De op dä $1.',
 'shareduploadwiki-desc'          => 'Hee noh kütt dä Enhalt fun dä $1 uß dämm jemeinsame Beshtand.',
-'shareduploadwiki-linktext'      => 'Sigg övver de Datei',
+'shareduploadwiki-linktext'      => 'Sigg övver die Datei',
 'shareduploadduplicate'          => 'Di Datei es dubbelt met „$1“ ussem jemeinsame Beshtand.',
 'shareduploadduplicate-linktext' => 'hee dä Datei',
 'shareduploadconflict'           => 'Di Datei hät dersellve Namen wi „$1“ uss_em jemeinsame Beshtand.',
@@ -1424,6 +1672,7 @@ Velleich probees De et och zo en Zick, wo winnijer loss es.',
 
 # File reversion
 'filerevert'                => '„$1“ zerök holle',
+'filerevert-backlink'       => '�&nbsp;$1',
 'filerevert-legend'         => 'Datei zeröck holle',
 'filerevert-intro'          => '<span class="plainlinks">Do bes di Datei \'\'\'[[Media:$1|$1]]\'\'\' op di [$4 Version fum $2 öm $3 Uhr] zeröck aam sätze.</span>',
 'filerevert-comment'        => 'Jrond:',
@@ -1434,8 +1683,9 @@ Velleich probees De et och zo en Zick, wo winnijer loss es.',
 
 # File deletion
 'filedelete'                  => 'Schmieß „$1“ fott',
+'filedelete-backlink'         => '�&nbsp;$1',
 'filedelete-legend'           => 'Schmieß de Datei fott',
-'filedelete-intro'            => "Do beß di Datei '''„[[Media:$1|$1]]“''' am Fottschmieße.",
+'filedelete-intro'            => "Do beß di Datei '''„[[Media:$1|$1]]“''' am Fottschmieße, un och all ier vörrije Versione, der Text övver se, un all de Änderunge draan.",
 'filedelete-intro-old'        => '<span class="plainlinks">Do schmiiß de Version [$4 fum $2 öm $3 Uhr] fun dä Datei „[[Media:$1|$1]]“ fott.</span>',
 'filedelete-comment'          => 'Der Jrund för et Fottschmieße:',
 'filedelete-submit'           => 'Fottschmieße',
@@ -1443,7 +1693,6 @@ Velleich probees De et och zo en Zick, wo winnijer loss es.',
 'filedelete-success-old'      => "Fun dä Datei '''„[[Media:$1|$1]]“''' es jäz di Version fum $2 öm $3 Uhr fottjeschmeße woode.",
 'filedelete-nofile'           => "„$1“''' jidd_et nit.",
 'filedelete-nofile-old'       => "Fun '''„$1“''' ham_mer kein arschiveete Version met dä Eijeschaffte.",
-'filedelete-iscurrent'        => 'Ih dat De de neuste Version fun dä Datei fottschmieße kanns, wat jrad versoht häs, do mos De ehts ens op en älldere Version zeröck jonn, di aanjezeish wäde soll, söns weet dat nix!',
 'filedelete-otherreason'      => 'Ander Jrund oder Zosätzlich:',
 'filedelete-reason-otherlist' => 'Ne andere Jrund',
 'filedelete-reason-dropdown'  => '* Alljemein Jrönd
@@ -1453,7 +1702,7 @@ Velleich probees De et och zo en Zick, wo winnijer loss es.',
 'filedelete-edit-reasonlist'  => 'De Jrönde för et Fottschmieße beärbeide',
 
 # MIME search
-'mimesearch'         => 'Belder, Tön, uew. üvver ehr MIME-Typ söke',
+'mimesearch'         => 'Dateie üvver dänne ehre <span lang="en">MIME</span>-Typ söke',
 'mimesearch-summary' => 'Op hee dä Sondersigg könne de Dateie noh em MIME-Tüpp ußjesöök wäde.
 Mer moß immer der Medietüp un der Ongertüp aanjevve.
 Zem Beispell: <tt>image/jpeg</tt>
@@ -1476,28 +1725,32 @@ wääde, un luur Der der iehr ander Links aan!',
 
 # Random page
 'randompage'         => 'Zofällije Sigg',
-'randompage-nopages' => 'En däm Appachtemang hee sin ja kein Sigge dren.',
+'randompage-nopages' => 'En dem Appachtemang „$1“ sin ja kein Sigge dren.',
 
 # Random redirect
 'randomredirect'         => 'Zofällije Ömleitung',
-'randomredirect-nopages' => 'En däm Appachtemang hee sin ja kein Ömleidunge dren.',
+'randomredirect-nopages' => 'En däm Appachtemang „$1“ sin ja kein Ömleidunge dren.',
 
 # Statistics
-'statistics'             => 'Statistike',
-'sitestats'              => 'Statistike üvver de {{SITENAME}}',
-'userstats'              => 'Statistike üvver de Metmaacher',
-'sitestatstext'          => '* Et jitt en etwa <strong>$2</strong> richtije Atikkele hee.
-* En de Daatebank sinner ävver <strong>$1</strong> Sigge, aan dänne bes jetz zosamme <strong>$4</strong> Mol jet jeändert woode es. Em Schnedd woodte alsu <strong>$5</strong> Änderunge pro Sigg jemaht. <br /><small> (Do sin ävver de Klaafsigge metjezallt, de Sigge üvver de {{SITENAME}}, un usserdäm jede kleine Futz un Stümpchenssigg, Ömleitunge, Schablone, Saachjruppe, un ander Zeuch, wat mer nit jod als ene Atikkel zälle kann)</small>
-
-* <strong>$8</strong> Belder, Tön, un esun ähnlije Daate woodte ald huhjelade.
-
-* Et {{PLURAL:$7|es noch <strong>ein</strong> Opjav|sin noch <strong>$7</strong> Opjave|es <strong>kein</strong> Opjav mieh}} en de Liss.
-{{PLURAL:$3|
-* <strong>Ein</strong> mol wood en Sigg hee avjerofe, dat sin <strong>$6</strong> Avrofe pro Sigg.|
-* <strong>$3</strong> mol wood en Sigg hee avjerofe, dat sin <strong>$6</strong> Avrofe pro Sigg.|<!-- -->}}',
-'userstatstext'          => '* {{PLURAL:$1|<strong>Eine</strong> Metmaacher hät|<strong>$1</strong> Metmaacher han|<strong>Keine</strong> Metmaacher hät}} sich bes jetz aanjemeldt.
-* {{PLURAL:$2|<strong>Eine</strong> dovun es|<strong>$2</strong> dovun sin|<strong>Keine</strong> es}} $5, dat {{PLURAL:$4|es|sinner|sinner}} <strong>$4%</strong>.',
-'statistics-mostpopular' => 'De miets affjeroofe Sigge',
+'statistics'                   => 'Statistike',
+'statistics-header-pages'      => 'Zahle övver Sigge',
+'statistics-header-edits'      => 'Zahle övver Änderunge',
+'statistics-header-views'      => 'Zahle övver afjeroofe Sigge',
+'statistics-header-users'      => 'Statistike üvver de Metmaacher',
+'statistics-articles'          => 'Atikele',
+'statistics-pages'             => 'Sigge jesamp',
+'statistics-pages-desc'        => '
+All de Sigge em Wiki, och Klaafsigge, Ömleitunge, un esu jet',
+'statistics-files'             => 'Huhjelade Dateie',
+'statistics-edits'             => 'Änderunge aan Sigge',
+'statistics-edits-average'     => 'Aanzahl Änderunge pro Sigg em Dorschschnett',
+'statistics-views-total'       => 'Sigge affjeroofe, ėnßjesamp',
+'statistics-views-peredit'     => 'Sigge affjeroofe, pro Änderung',
+'statistics-jobqueue'          => 'Endrääch en de [http://www.mediawiki.org/wiki/Manual:Job_queue Leß met de Aufjabe]',
+'statistics-users'             => '[[Special:ListUsers|Metmaacher]] aajemelldt',
+'statistics-users-active'      => 'Aktive Metmaacher',
+'statistics-users-active-desc' => 'Metmaacher, die {{PLURAL:$1|hück un jesterre|en de läzte $1 Dääsh|hück}} jät jemaat han.',
+'statistics-mostpopular'       => 'De miets affjeroofe Sigge',
 
 'disambiguations'      => '„(Wat es dat?)“-Sigge',
 'disambiguationspage'  => 'Template:Disambig',
@@ -1518,7 +1771,7 @@ vun dä Sigg dovör.',
 'double-redirect-fixer'      => '(Opjaveleß)',
 
 'brokenredirects'        => 'Ömleitunge, die en et Leere jonn',
-'brokenredirectstext'    => 'Die Ömleitunge hee jonn op Sigge, die mer jar nit han:',
+'brokenredirectstext'    => 'Die Ömleitunge hee jonn op Sigge, die mer jaa nit han:',
 'brokenredirects-edit'   => '(ändere)',
 'brokenredirects-delete' => '(fottschmieße)',
 
@@ -1527,7 +1780,7 @@ vun dä Sigg dovör.',
 'withoutinterwiki-legend'  => 'Aanfang fum Sigge-Tittel',
 'withoutinterwiki-submit'  => 'Zeije',
 
-'fewestrevisions' => 'Arikele met de winnischste Versione',
+'fewestrevisions' => 'Atikele met de winnischste Versione',
 
 # Miscellaneous special pages
 'nbytes'                  => '$1 Byte{{PLURAL:$1||s|}}',
@@ -1541,33 +1794,37 @@ vun dä Sigg dovör.',
 'lonelypagestext'         => 'De Sigge hee noh sin nörjenzwoh ennjebonge un et jonn och kein Linkß drop.',
 'uncategorizedpages'      => 'Atikele, die en kein Saachjrupp sin',
 'uncategorizedcategories' => 'Saachjruppe, die selvs en kein Saachjruppe sin',
-'uncategorizedimages'     => 'Belder, Tön, uew., die en kein Saachjruppe dren sin',
+'uncategorizedimages'     => 'Dateie, die en kein Saachjruppe dren sin',
 'uncategorizedtemplates'  => 'Schablone, die en kein Saachjruppe sen',
 'unusedcategories'        => 'Saachjruppe met nix dren',
-'unusedimages'            => 'Belder, Tön, uew., die nit en Sigge dren stäche',
+'unusedimages'            => 'Dateie, die nit en Sigge dren stäche',
 'popularpages'            => 'Sigge, die off avjerofe wääde',
 'wantedcategories'        => 'Saachjruppe, die mer noch nit han, die noch jebruch wääde',
 'wantedpages'             => 'Sigge, die mer noch nit han, die noch jebruch wääde',
-'missingfiles'            => 'Dateie, die fäähle',
+'wantedfiles'             => 'Dateie, di onß noch fähle',
+'wantedtemplates'         => 'Schablone, die mer noch nit han, die noch jebruch wääde',
 'mostlinked'              => 'Atikele met de miehste Links drop',
 'mostlinkedcategories'    => 'Saachjruppe met de miehste Links drop',
 'mostlinkedtemplates'     => 'Schablone met de miehßte Lenks drop',
 'mostcategories'          => 'Atikkele met de miehste Saachjruppe',
-'mostimages'              => 'Belder, Tön, uew. met de miehste Links drop',
+'mostimages'              => 'Dateie met de miehste Links drop',
 'mostrevisions'           => 'Atikkele met de miehste Änderunge',
-'prefixindex'             => 'All Sigge, die dänne ehr Name met enem bestemmte Wood oder Tex aanfange deit',
+'prefixindex'             => 'All Sigge, dänne ehr Name met enem bestemmte Wood oder Tex aanfängk',
 'shortpages'              => 'Atikele zoteet vun koot noh lang',
 'longpages'               => 'Atikele zoteet vun lang noh koot',
 'deadendpages'            => 'Atikele ohne Links dren',
 'deadendpagestext'        => 'De Atikele hee han kein Links op ander Atikele em Wiki.',
 'protectedpages'          => 'Jeschötzte Sigge',
 'protectedpages-indef'    => 'Nor de Sigge zeije, woh alleins de Wiki-Köbesse draan dörrve',
+'protectedpages-cascade'  => 'Nur Sigge en ener Schotz-Kaskad',
 'protectedpagestext'      => '<!-- -->',
 'protectedpagesempty'     => 'Op di Aat sin jrad kein Sigge jeschötz.',
 'protectedtitles'         => 'Verbodde Titele för Sigge',
 'protectedtitlestext'     => 'Sigge met hee dä Tittele lohße mer nit zo, un di künne dröm nit aanjelääsch wäde:',
 'protectedtitlesempty'    => 'Op di Aat sin jrad kein Sigge jäje et neu Aanlääje jeschötz.',
 'listusers'               => 'Metmaacherliss',
+'listusers-editsonly'     => 'Donn nor Metmaacher zeije, di och ens jät jeschrevve han.',
+'usereditcount'           => '{{PLURAL:$1|Ein Änderung|$1 Änderuge|Nix jedonn}}',
 'newpages'                => 'Neu Sigge',
 'newpages-username'       => 'Metmaacher Name:',
 'ancientpages'            => 'Atikele zoteet vun Ahl noh Neu',
@@ -1601,14 +1858,13 @@ wat Koßte un Jefaare met sesh brenge künndt.
 Wo_t jëijdt,
 jonn di Lengkß hee tirrägg_op dat Booch,
 wadd_Er am Sööke sidt.',
+'booksources-invalid-isbn'  => 'De ISBNummer schingk verkeeht ze sin. Loohr ens donoh, woh se häe kütt.',
 
 # Special:Log
 'specialloguserlabel'  => 'Metmaacher:',
 'speciallogtitlelabel' => 'Siggename:',
 'log'                  => 'Logböcher ehr Opzeichnunge (all)',
 'all-logs-page'        => 'All Logböcher',
-'log-search-legend'    => 'En de Logböcher söke',
-'log-search-submit'    => 'Loß Jonn!',
 'alllogstext'          => "Dat hee es en jesamte Liss us all dä Logböcher en de {{SITENAME}}.
 Dä Logböcher ehre Enhald ka'mer all noh de Aat, de Metmaacher,
 oder de Sigge ehr Name, un esu, einzel zoteet aanluure.
@@ -1622,6 +1878,7 @@ Bei de Name moß mer op Jruß- un Kleinschreff aachjävve.",
 'nextpage'          => 'De nächste Sigg: „$1“',
 'prevpage'          => 'Vörijje Sigg ($1)',
 'allpagesfrom'      => 'Sigge aanzeije av däm Name:',
+'allpagesto'        => 'Sigge aanzeije bes:',
 'allarticles'       => 'All Atikkele',
 'allinnamespace'    => 'All Sigge (Em Appachtemeng „$1“)',
 'allnotinnamespace' => 'All Sigge (usser em Appachtemeng „$1“)',
@@ -1635,7 +1892,7 @@ eins vun all däm op eimol.',
 
 # Special:Categories
 'categories'                    => 'Saachjruppe',
-'categoriespagetext'            => 'Hee sin nur Saachjruppe met jät dren jeliss.
+'categoriespagetext'            => 'Hee sin nur Saachjruppe jeliss, met jät dren.<br />
 Mer han_er eije Leßte för de
 [[Special:UnusedCategories|Saachjruppe met nix dren]], un de
 [[Special:WantedCategories|jewönschte un nit aanjelaate Saachjruppe]].',
@@ -1643,47 +1900,78 @@ Mer han_er eije Leßte för de
 'special-categories-sort-count' => 'Zoteere noh de Aanzahl',
 'special-categories-sort-abc'   => 'Zoteere nohm Alphabett',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Fottjeschmesse Versione',
+
+# Special:LinkSearch
+'linksearch'       => 'Lėngkß noh ußerhallef sööke',
+'linksearch-pat'   => 'Sök noh:',
+'linksearch-ns'    => 'Appachtemang:',
+'linksearch-ok'    => 'Sööke',
+'linksearch-text'  => 'Di Sondersigg hee mäd_et müjjelesch noh Sigge ze söke, woh beshtemmpte Links op Websigge dren enthallde sin.
+
+Beim Söke künnd_Er Shternshe aanjevve för e Shtöckshe fun ennem Name, wo mer nit jenou weiß, wi et heiß udder wat me nit kenne deit, zem Beishpöll esu: <tt>http://*.example.com</tt>
+
+De Brauserprotokolle, di beim Söke aanjejovve wäde künne, sen: <tt>$1</tt>',
+'linksearch-line'  => '„$2“ hät ene Link op $1',
+'linksearch-error' => 'Shternshe kam_mer nor aam Aanfang fum Domain-Name bruche.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Zeich de Metmaacher vun:',
 'listusers-submit'   => 'Zeije',
 'listusers-noresult' => 'Keine Metmaacher jefonge.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logbooch för nöü Metmaachere',
+'newuserlogpagetext'          => 'He sin de Metmaacher opjelėßß, di sesh nöü aanjemäldt han.',
+'newuserlog-byemail'          => 'dat Passwood wood med de e-mail loßjescheck',
+'newuserlog-create-entry'     => 'eß enne nöüje Metmaacher',
+'newuserlog-create2-entry'    => 'hät ene nöüje Zojang enjerėshdt för „$1“',
+'newuserlog-autocreate-entry' => 'dä Metmaacher wood automattesch aanjemelldt',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Metmaacher-Jruppe-Rääschte',
-'listgrouprights-summary'  => 'Hee kütt de Liss met dä Medmaacher-Jruppe, di dat Wiki hee kennt, un denne ier Rääschte.
+'listgrouprights'                 => 'Metmaacher-Jruppe-Rääschte',
+'listgrouprights-summary'         => 'Hee kütt de Liss met dä Medmaacher-Jruppe, di dat Wiki hee kennt, un denne ier Rääschte.
 Mieh övver de einzel Rääschte fenkt Er op de [[{{MediaWiki:Listgrouprights-helppage}}|Hölp-Sigg övver de Medmaacher ier Rääschte]].',
-'listgrouprights-group'    => 'Jrupp',
-'listgrouprights-rights'   => 'Räächte',
-'listgrouprights-helppage' => 'Help:Jrupperäächte',
-'listgrouprights-members'  => '(opliste)',
+'listgrouprights-group'           => 'Jrupp',
+'listgrouprights-rights'          => 'Räächte',
+'listgrouprights-helppage'        => 'Help:Jrupperäächte',
+'listgrouprights-members'         => '(opliste)',
+'listgrouprights-addgroup'        => 'Metmaacher en {{PLURAL:$2|de Metmaacher-Jrupp|de Metmaacher-Jruppe|kein Metmaacher-Jrupp}} $1 erin dunn',
+'listgrouprights-removegroup'     => 'Metmaacher us {{PLURAL:$2|dä Metmaacher-Jrupp|de Metmaacher-Jruppe|jaa kei Metmaacher-Jrupp}} $1 eruß nämme',
+'listgrouprights-addgroup-all'    => 'Metmaacher en alle Metmaacher-Jruppe erin donn',
+'listgrouprights-removegroup-all' => 'Metmaacher us alle Metmaacher-Jruppe eruß nämme',
 
 # E-mail user
-'mailnologin'     => 'Keij E-Mail Adress',
-'mailnologintext' => 'Do mööts ald aanjemeldt un [[Special:UserLogin|enjelogg]] sin, un en jode E-Mail 
+'mailnologin'      => 'Keij E-Mail Adress',
+'mailnologintext'  => 'Do mööts ald aanjemeldt un [[Special:UserLogin|enjelogg]] sin, un en jode E-Mail 
 Adress en Dinge [[Special:Preferences|ming Enstellunge]] stonn han, öm en E-Mail aan andere Metmaacher ze 
 schecke.',
-'emailuser'       => 'E-mail aan dä Metmaacher',
-'emailpage'       => 'E-mail aan ene Metmaacher',
-'emailpagetext'   => 'Wann dä Metmaacher en E-mail Adress aanjejovve hätt en singe Enstellunge,
+'emailuser'        => 'E-mail aan dä Metmaacher',
+'emailpage'        => 'E-mail aan ene Metmaacher',
+'emailpagetext'    => 'Wann dä Metmaacher en E-mail Adress aanjejovve hätt en singe Enstellunge,
 un die deit et och, dann kanns De met däm Fomular hee unge en einzelne E-Mail aan dä Metmaacher schecke.
 Ding E-mail Adress, die De en [[Special:Preferences|Ding eije Enstellunge]] aanjejovve häs,
 die weed als em Avsender sing Adress en die E-Mail enjedrage.
 Domet kann, wä die E-Mail kritt, drop antwoote, un die Antwood jeiht tirek aan Dech.
 Alles klor?',
-'usermailererror' => 'Dat E-Mail-Objek jov ene Fähler us:',
-'defemailsubject' => 'E-Mail üvver de {{SITENAME}}.',
-'noemailtitle'    => 'Kein E-Mail Adress',
-'noemailtext'     => 'Dä Metmaacher hät kein E-Mail Adress enjedrage, oder hä well kein E-Mail krije.',
-'emailfrom'       => 'Vun:',
-'emailto'         => 'Aan:',
-'emailsubject'    => 'Ãœvverschreff:',
-'emailmessage'    => 'Dä Tex fun Dinge Nohresch:',
-'emailsend'       => 'Avschecke',
-'emailccme'       => 'Scheck mer en Kopie vun dä E-Mail.',
-'emailccsubject'  => 'En Kopie vun Dinger E-Mail aan $1: $2',
-'emailsent'       => 'E-Mail es ungerwähs',
-'emailsenttext'   => 'Ding E-Mail es jetz lossjescheck woode.',
-'emailuserfooter' => 'Hee di e-mail hät dä „$1“ an „$2“ jescheck, un doför en de {{SITENAME}} dat „{{int:emailuser}}“ jebruch.',
+'usermailererror'  => 'Dat E-Mail-Objek jov ene Fähler us:',
+'defemailsubject'  => 'E-Mail üvver de {{SITENAME}}.',
+'noemailtitle'     => 'Kein E-Mail Adress',
+'noemailtext'      => 'Dä Metmaacher hät kein jöltijje Adreß för sing <i lang="en">e-mail</i> enjedrage.<!-- oder hä well kein E-Mail krije. -->',
+'nowikiemailtitle' => 'Kein <i lang="en">e-mail</i> zojelohße',
+'nowikiemailtext'  => 'Hee dä Metmaacher well kein <i lang="en">e-mail</i> vun ander Metmaachere jescheck krijje.',
+'email-legend'     => 'Scheck en<i lang="en"> e-mail</i> aan ene andere Metmaacher fum Wiki',
+'emailfrom'        => 'Vun:',
+'emailto'          => 'Aan:',
+'emailsubject'     => 'Ãœvverschreff:',
+'emailmessage'     => 'Dä Tex fun Dinge Nohresch:',
+'emailsend'        => 'Avschecke',
+'emailccme'        => 'Scheck mer en Kopie vun dä E-Mail.',
+'emailccsubject'   => 'En Kopie vun Dinger E-Mail aan $1: $2',
+'emailsent'        => 'E-Mail es ungerwähs',
+'emailsenttext'    => 'Ding E-Mail es jetz lossjescheck woode.',
+'emailuserfooter'  => 'Hee di e-mail hät dä „$1“ an „$2“ jescheck, un doför en de {{SITENAME}} dat „{{int:emailuser}}“ jebruch.',
 
 # Watchlist
 'watchlist'            => 'ming Oppassliss',
@@ -1718,12 +2006,7 @@ dann klick op „Nimieh drop oppasse“ wann De die Sigg om Schirm häs.",
 'iteminvalidname'      => 'Dä Endrach „$1“ hät ene kapodde Name.',
 'wlnote'               => '{{PLURAL:$1|Hee es de letzte Änderung us|Hee sin de letzte <strong>$1</strong> Änderunge us|Mer han kein Äbderunge en}} de letzte {{PLURAL:$2|Stund|<strong>$2</strong> Stunde|<strong>noll</strong> Stunde}}.',
 'wlshowlast'           => 'Zeich de letzte | $1 | Stunde | $2 | Dage | $3 | aan, dun',
-'watchlist-show-bots'  => 'de Bots ier Änderunge zeije',
-'watchlist-hide-bots'  => 'de Bots ier Änderunge fottlohße',
-'watchlist-show-own'   => 'de eije Änderunge zeije',
-'watchlist-hide-own'   => 'de eije Änderunge fottlohße',
-'watchlist-show-minor' => 'klein Mini-Änderunge zeije',
-'watchlist-hide-minor' => 'klein Mini-Änderunge fottlohße',
+'watchlist-options'    => 'Eijeschaffte fun de Oppassless',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Drop oppasse…',
@@ -1760,77 +2043,96 @@ Do kanns hee Ding Oppassliss ändere:
 Do kanns hee noh Hölp luure:
 {{FULLURL:int:MediaWiki:Helppage}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Schmieß die Sigg jetz fott',
-'confirm'                     => 'Dä Schotz för die Sigg ändere',
-'excontent'                   => 'drop stundt: „$1“',
-'excontentauthor'             => 'drop stundt: „$1“ un dä einzije Schriever woh: „$2“',
-'exbeforeblank'               => 'drop stundt vörher: „$1“',
-'exblank'                     => 'drop stundt nix',
-'delete-confirm'              => '„$1“ fottschmieße',
-'delete-legend'               => 'Fottschmieße',
-'historywarning'              => '<strong>Opjepass:</strong> Die Sigg hät ene janze Püngel Versione',
-'confirmdeletetext'           => 'Do bes koot dovör, en Sigg för iwich fottzeschmieße. Dobei verschwind och de janze Verjangenheit vun dä Sigg us de Daatebank, met all ehr Änderunge un Metmaacher Name, un all dä Opwand, dä do dren stich. Do muss hee jetz bestätije, dat de versteihs, wat dat bedügg, un dat De weiß, wat Do do mähs.
+# Delete
+'deletepage'             => 'Schmieß die Sigg jetz fott',
+'confirm'                => 'Dä Schotz för die Sigg ändere',
+'excontent'              => 'drop stundt: „$1“',
+'excontentauthor'        => 'drop stundt: „$1“ un dä einzije Schriever woh: „$2“',
+'exbeforeblank'          => 'drop stundt vörher: „$1“',
+'exblank'                => 'drop stundt nix',
+'delete-confirm'         => '„$1“ fottschmieße',
+'delete-legend'          => 'Fottschmieße',
+'historywarning'         => '<strong>Opjepass:</strong> Die Sigg hät ene janze Püngel Versione',
+'confirmdeletetext'      => 'Do bes koot dovör, en Sigg för iwich fottzeschmieße. Dobei verschwind och de janze Verjangenheit vun dä Sigg us de Daatebank, met all ehr Änderunge un Metmaacher Name, un all dä Opwand, dä do dren stich. Do muss hee jetz bestätije, dat de versteihs, wat dat bedügg, un dat De weiß, wat Do do mähs.
 <strong>Dun et nor, wann dat met de [[{{MediaWiki:Policy-url}}|Rejelle]] wirklich zosamme jeiht!</strong>',
-'actioncomplete'              => 'Erledich',
-'deletedtext'                 => 'De Sigg „<nowiki>$1</nowiki>“ es jetz fottjeschmesse woode. Luur Der „$2“ aan, do häs De en Liss met de Neuste fottjeschmesse Sigge.',
-'deletedarticle'              => 'hät fottjeschmesse: „[[$1]]“',
-'suppressedarticle'           => 'han „[[$1]]“ verstoche',
-'dellogpage'                  => 'Logboch met de fottjeschmesse Sigge',
-'dellogpagetext'              => 'Hee sin de Sigge oppjeliss, die et neus fottjeschmesse woodte.',
-'deletionlog'                 => 'Dat Logboch fum Sigge-Fottschmieße',
-'reverted'                    => 'Han de ählere Version vun dä Sigg zoröck jehollt',
-'deletecomment'               => 'Aanlass för et Fottschmieße',
-'deleteotherreason'           => 'Ander Jrund oder Zosätzlich:',
-'deletereasonotherlist'       => 'Ander Jrund',
-'deletereason-dropdown'       => '* Alljemein Jrönde
+'actioncomplete'         => 'Erledich',
+'deletedtext'            => 'De Sigg „<nowiki>$1</nowiki>“ es jetz fottjeschmesse woode. Luur Der „$2“ aan, do häs De en Liss met de Neuste fottjeschmesse Sigge.',
+'deletedarticle'         => 'hät fottjeschmesse: „[[$1]]“',
+'suppressedarticle'      => 'han „[[$1]]“ verstoche',
+'dellogpage'             => 'Logboch met de fottjeschmesse Sigge',
+'dellogpagetext'         => 'Hee sin de Sigge oppjeliss, die et neus fottjeschmesse woodte.',
+'deletionlog'            => 'Dat Logboch fum Sigge-Fottschmieße',
+'reverted'               => 'Han de ählere Version vun dä Sigg zoröck jehollt',
+'deletecomment'          => 'Aanlass för et Fottschmieße',
+'deleteotherreason'      => 'Ander Jrund oder Zosätzlich:',
+'deletereasonotherlist'  => 'Ander Jrund',
+'deletereason-dropdown'  => '* Alljemein Jrönde
 ** dä Schriever wollt et esu
 ** wohr jäje et Urhävverrääsch
 ** et wohd jet kapott jemaat
 ** et wohr bloß Keu
 ** mem Name verdonn bemm Aanläje',
-'delete-edit-reasonlist'      => 'De Jrönde för et Fottschmieße beärbeide',
-'delete-toobig'               => 'Di Sigg hät {{PLURAL:$1|ein Version|$1 Versione|jakein Version}}. Dat sinn_er ärsch fill. Domet unsere ßööver do nit draan en de Kneen jeit, dom_mer esu en Sigg nit fottschmieße.',
-'delete-warning-toobig'       => 'Di Sigg hät {{PLURAL:$1|ein Version|$1 Versione|jakein Version}}. Dat sinn_er ärsch fill. Wann De die all fottschmieße wells, dat kann dem Wiki sing Datenbangk schwer ußbremse.',
-'rollback'                    => 'Em Letzte sing Änderunge zeröcknemme',
-'rollback_short'              => 'Zeröcknemme',
-'rollbacklink'                => 'Zeröcknemme',
-'rollbackfailed'              => 'Dat Zeröcknemme jingk scheiv',
-'cantrollback'                => 'De letzte Änderung zeröckzenemme es nit müjjelich. Dä letzte Schriever es dä einzije, dä aan dä Sigg hee jet jedon hät!',
-'alreadyrolled'               => 'Mer künne de letzte Änderunge vun dä Sigg „[[:$1]]“ vum Metmaacher „[[User:$2|$2]]“ ([[User talk:$2|Klaaf]] | [[Special:Contributions/$2|{{int:contribslink}}]]) nimieh zeröcknemme, dat hät ene Andere enzwesche ald jedon, udder de Sigg ömjeändert.
-
-De Neuste Änderung aan dä Sigg es jetz vun däm Metmaacher „[[User:$3|$3]]“ ([[User talk:$3|Klaaf]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Bei dä Änderung stundt: „<i>$1</i>“.', # only shown if there is an edit comment
-'revertpage'                  => 'Änderunge vun däm Metmaacher „[[Special:Contributions/$2|$2]]“ ([[User talk:$2|däm sing Klaafsigg]]) fottjeschmesse, un doför de letzte Version vum „[[User:$1|$1]]“ widder zeröckjehollt', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'De Änderungen vum $1 zeröckjenumme, un dobei de letzte Version vum $2 widder jehollt.',
-'sessionfailure'              => "Et jov wall e technisch Problem met Dingem Login. Dröm ha'mer dat us Vörsich jetz nit jemaht, domet mer nit villeich Ding Änderung däm verkihrte Metmaacher ungerjubele. Jangk zeröck un versök et noch ens.",
+'delete-edit-reasonlist' => 'De Jrönde för et Fottschmieße beärbeide',
+'delete-toobig'          => 'Di Sigg hät {{PLURAL:$1|ein Version|$1 Versione|jakein Version}}. Dat sinn_er ärsch fill. Domet unsere ßööver do nit draan en de Kneen jeit, dom_mer esu en Sigg nit fottschmieße.',
+'delete-warning-toobig'  => 'Di Sigg hät {{PLURAL:$1|ein Version|$1 Versione|jakein Version}}. Dat sinn_er ärsch fill. Wann De die all fottschmieße wells, dat kann dem Wiki sing Datenbangk schwer ußbremse.',
+
+# Rollback
+'rollback'         => 'Em Letzte sing Änderunge zeröcknemme',
+'rollback_short'   => 'Zeröcknemme',
+'rollbacklink'     => 'Zeröcknemme',
+'rollbackfailed'   => 'Dat Zeröcknemme jingk scheiv',
+'cantrollback'     => 'De letzte Änderung zeröckzenemme es nit müjjelich. Dä letzte Schriever es dä einzije, dä aan dä Sigg hee jet jedon hät!',
+'alreadyrolled'    => 'Mer künne de letzte Änderunge vun dä Sigg „[[:$1]]“ vum Metmaacher „[[User:$2|$2]]“ ([[User talk:$2|Klaaf]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) nimieh zeröcknemme, dat hät ene Andere enzwesche ald jedon, udder de Sigg ömjeändert.
+
+De Neuste Änderung aan dä Sigg es jetz vun däm Metmaacher „[[User:$3|$3]]“ ([[User talk:$3|Klaaf]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Bei dä Änderung stundt: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Änderunge vun däm Metmaacher „[[Special:Contributions/$2|$2]]“ ([[User talk:$2|däm sing Klaafsigg]]) fottjeschmesse, un doför de letzte Version vum „[[User:$1|$1]]“ widder zeröckjehollt', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'De Änderungen vum $1 zeröckjenumme, un dobei de letzte Version vum $2 widder jehollt.',
+'sessionfailure'   => "Et jov wall e technisch Problem met Dingem Login. Dröm ha'mer dat us Vörsich jetz nit jemaht, domet mer nit villeich Ding Änderung däm verkihrte Metmaacher ungerjubele. Jangk zeröck un versök et noch ens.",
+
+# Protect
 'protectlogpage'              => 'Logboch vum Sigge Schötze',
 'protectlogtext'              => 'Hee es de Liss vun de Sigge, die jeschötz oder frei jejovve woode sin.',
 'protectedarticle'            => 'hät de Sigg „[[$1]]“ jeschötz',
 'modifiedarticleprotection'   => 'hät dä Schoz för die Sigg „[[$1]]“ jeändert',
 'unprotectedarticle'          => 'hät der Schotz för die Sigg „[[$1]]“ opjehovve',
+'movedarticleprotection'      => 'hät de Enstellunge för der Sigge-Schotz fun „[[$2]]“ noh „[[$1]]“ övvernomme',
 'protect-title'               => 'Sigge Schotz för „$1“ ändere',
+'prot_1movedto2'              => 'hät de Sigg vun „[[$1]]“ en „[[$2]]“ ömjenannt.',
 'protect-legend'              => 'Sigg schötze',
 'protectcomment'              => 'Dä Jrund oder Aanlass för et Schötze',
 'protectexpiry'               => 'Duur, wi lang:',
 'protect_expiry_invalid'      => 'Die Duur för ze Schötz es Kappes, di künne mer nit verstonn.',
 'protect_expiry_old'          => 'Do häs De Desch verdonn. Die Zick för ze Schötze es doch ald eröm!',
 'protect-unchain'             => 'Et Schötze jäje Ömnenne extra enstelle looße',
-'protect-text'                => 'Hee kanns De dä Schotz jäje Veränderunge för de Sigg „<strong><nowiki>$1</nowiki></strong>“ aanluure un ändere.',
-'protect-locked-blocked'      => 'Do kanns nit der Siggeschotz ändere, esu lang wi Dinge Zojang zom Wiki jesperrt es. Hee es der aktuelle Stand fum Siggeschotz för di Sigg <strong>„$1“:</strong>',
-'protect-locked-dblock'       => 'De Datebank es jesperrt. Dröm künne mer der Siggeschotz nit ändere.
-Hee es der aktuelle Stand fum Siggeschotz för di Sigg <strong>„$1“:</strong>',
-'protect-locked-access'       => 'Do häs nit dat Rääsch, hee em Wiki Sigge ze schötze udder dä Schotz widder opzehevve.
-Di Sigg <strong>„$1“:</strong> es jetz jrad:',
+'protect-text'                => "Hee kanns De dä Schotz jäje Veränderunge för de Sigg „'''<nowiki>$1</nowiki>'''“ aanluure un ändere.",
+'protect-locked-blocked'      => "Do kanns nit der Siggeschotz ändere, esu lang wi Dinge Zojang zom Wiki jesperrt es. Hee es der aktuelle Stand fum Siggeschotz för di Sigg '''„$1“:'''",
+'protect-locked-dblock'       => "De Datebank es jesperrt. Dröm künne mer der Siggeschotz nit ändere.
+Hee es der aktuelle Stand fum Siggeschotz för di Sigg '''„$1“:'''",
+'protect-locked-access'       => "Do häs nit dat Rääsch, hee em Wiki Sigge ze schötze udder dä Schotz widder opzehevve.
+Di Sigg '''„$1“:''' es jetz jrad:",
 'protect-cascadeon'           => 'Die Sigg es en enne Schotz-Kaskad. Se es enjebonge en {{PLURAL:$1|die Sigg|$1 Sigge|kein Sigg}}, die per Kaskade-Schotz jeschötz {{PLURAL:$1|es|sin|es}}. Do kanns dä Schotz för die Sigg hee ändere, ävver di Kaskad blief bestonn. Dat hee sin die Sigge en dä Kaskad:',
-'protect-default'             => '-(Standaad)-',
+'protect-default'             => 'Jeede Metmaacher eraan lohße',
 'protect-fallback'            => 'Do weet dat Rääsch „$1“ jebruch.',
-'protect-level-autoconfirmed' => 'nor Metmaacher dranlooße, die sich aanjemeldt han',
+'protect-level-autoconfirmed' => 'Donn neu Metmaacher un namelose Metmaacher nit dranlooße',
 'protect-level-sysop'         => 'Nor de Wiki-Köbesse dranlooße',
 'protect-summary-cascade'     => 'met Schotz-Kaskad',
-'protect-expiring'            => 'bes $1 (UTC)',
+'protect-expiring'            => 'bes öm $2 Uhr (UTC) aam $3',
+'protect-expiry-indefinite'   => 'för iewich',
 'protect-cascade'             => 'Maach en Schoz-Kaskaade — all de Schablone en dä Sigg krijje dersellve Schoz, wi die Sigg sellver en kritt.',
 'protect-cantedit'            => 'Do kanns dä Siggeschotz hee nit ändere, esu lang wie De di Sigg nit ändere darfs.',
+'protect-othertime'           => 'En ander Door:',
+'protect-othertime-op'        => 'en ander Door',
+'protect-existing-expiry'     => 'Beß am $2 öm $3 Uhr',
+'protect-otherreason'         => 'En andere udder zosätzlijje Jrund:',
+'protect-otherreason-op'      => 'ene andere udder zosätzlijje Jrund',
+'protect-dropdown'            => '* Jewöhnlijje Jrönd för dä Sigge-Schotz
+** ußerjewöhnlesch fill Kapottmaacherei
+** ußerjewöhnlesch fill SPAMlinks op ander Sigge wäde neu enjedraare
+** Hen- un her-Änderei, woh mer süht, dat nix mieh joods erus kumme weed
+** janz weschtejje Sigg, met ußerjewöhnlesch fill Afroofe',
+'protect-edit-reasonlist'     => 'Don de Grönd för t Schöze beärrbeide',
+'protect-expiry-options'      => '1 Stund:1 hour,2 Stund:2 hours,3 Stund:3 hours,6 Stund:6 hours,12 Stund:12 hours,1 Dach:1 day,3 Däch:3 days,1 Woch:1 week,2 Woche:2 weeks,3 Woche:3 weeks,1 Mond:1 month,3 Mond:3 months,6 Mond:6 months,9 Mond:9 months,1 Johr:1 year,2 Johre:2 years,3 Johre:3 years,Unbejrenz:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'jespecht es:',
 'restriction-level'           => 'ändere darf:',
 'minimum-size'                => 'met mieh wie',
@@ -1853,7 +2155,7 @@ Di Sigg <strong>„$1“:</strong> es jetz jrad:',
 'undeletepage'                 => 'Fottjeschmesse Sigge aanluure un widder zeröckholle',
 'undeletepagetitle'            => "'''He dat sin de fottjeschmeße Versione fun [[:$1|$1]]'''",
 'viewdeletedpage'              => 'Fottjeschmesse Sigge aanzeije',
-'undeletepagetext'             => 'De Sigge heenoh sin fottjeschmesse, mer künne se ävver immer noch usem Müllemmer eruskrose.',
+'undeletepagetext'             => '{{PLURAL:$1|De Sigg heenoh es|De $1 Sigge heenoh sin|De 0 Sigge heenoh sin}} fottjeschmesse, mer künne se ävver immer noch usem Müllemmer eruskrose.',
 'undelete-fieldset-title'      => 'Versione zeröck holle',
 'undeleteextrahelp'            => 'Öm de janze Sigg met all ehre Versione widder ze holle, looß all de Versione ohne Hökche, un klick op „<b style="padding:2px; background-color:#ddd; color:black">{{int:Undeletebtn}}</b>“.<br />
 Öm bloß einzel Versione zeröckzeholle, maach Hökche aan die Versione, die De widder han wells, un dann dun „<b style="padding:2px; background-color:#ddd; color:black">{{int:Undeletebtn}}</b>“ klicke.<br />
@@ -1867,12 +2169,13 @@ dann wääde de zeröckjehollte Versione einfach als zosätzlije äldere
 Versione för die neu Sigg enjerich. Die neu Sigg weed nit ersetz.',
 'undeleterevdel'               => 'Dat Zeröckholle flupp nit, wann de neuste Version verstoche es udder verstoche Aandeile do dren sin. En esu en Fäll darrf de neuste Version kei Höksche krijje, udder se moß eets ens en en nommaale Version ömjewandelt wääde, di nit mieh verstoche es.',
 'undeletehistorynoadmin'       => 'Die Sigg es fottjeschmesse woode. Dä Jrund döför es en de Liss unge ze finge, jenau esu wie de Metmaacher, wo de Sigg verändert han, ih dat se fottjeschmesse wood. Wat op dä Sigg ehre fottjeschmesse ahle Versione stundt, dat künne nor de Wiki-Köbesse noch aansinn (un och widder zeröckholle)',
-'undelete-revision'            => 'Fottjeschmeße Version fun dä Sigg „$1“ fum $2, et letz jändert fum $3:',
+'undelete-revision'            => 'Fottjeschmeße Version fun dä Sigg „$1“ fum $4 öm $5 Uhr, et letz jändert fum $3:',
 'undeleterevision-missing'     => 'De Version stemmp nit. Dat wor ene verkihrte Link, oder de Version wood usem Archiv zeröck jehollt, oder fottjeschmesse.',
 'undelete-nodiff'              => 'Mer han kei ällder Version jefonge.',
 'undeletebtn'                  => 'Zeröckholle!',
 'undeletelink'                 => 'widder zeröckholle',
 'undeletereset'                => 'De Felder usleere',
+'undeleteinvert'               => 'De Ußwahl ömdrije',
 'undeletecomment'              => 'Erklärung (för en et Logboch):',
 'undeletedarticle'             => '„$1“ zeröckjehollt',
 'undeletedrevisions'           => '{{PLURAL:$1|ein Version|$1 Versione}} zeröckjehollt',
@@ -1904,27 +2207,27 @@ $1',
 'blanknamespace' => '(Atikkele)',
 
 # Contributions
-'contributions' => 'Däm Metmaacher sing Beidräch',
-'mycontris'     => 'ming Beidräch',
-'contribsub2'   => 'För dä Metmaacher: $1 ($2)',
-'nocontribs'    => 'Mer han kein Änderunge jefonge, en de Logböcher, die do passe däte.',
-'uctop'         => ' (Neuste)',
-'month'         => 'un Moohnt:',
-'year'          => 'Beß Johr:',
-
-'sp-contributions-newbies'     => 'Nor neu Metmaacher ier Beidräg zeije',
-'sp-contributions-newbies-sub' => 'För neu Metmaacher',
-'sp-contributions-blocklog'    => 'Logboch met Metmaacher-Sperre',
-'sp-contributions-search'      => 'Söök noh Metmaacher ier Beidräg',
-'sp-contributions-username'    => 'Metmaachername odder IP-Address:',
-'sp-contributions-submit'      => 'Sööke',
+'contributions'       => 'Däm Metmaacher sing Beidräch',
+'contributions-title' => 'Beidräsch fum  $1',
+'mycontris'           => 'ming Beidräch',
+'contribsub2'         => 'För dä Metmaacher: $1 ($2)',
+'nocontribs'          => 'Mer han kein Änderunge jefonge, en de Logböcher, die do passe däte.',
+'uctop'               => ' (Neuste)',
+'month'               => 'un Moohnt:',
+'year'                => 'Beß Johr:',
+
+'sp-contributions-newbies'       => 'Nor neu Metmaacher ier Beidräg zeije',
+'sp-contributions-newbies-sub'   => 'För neu Metmaacher',
+'sp-contributions-newbies-title' => 'Neu Metmaacher ier Beidräsch',
+'sp-contributions-blocklog'      => 'Logboch met Metmaacher-Sperre',
+'sp-contributions-search'        => 'Söök noh Metmaacher ier Beidräg',
+'sp-contributions-username'      => 'Metmaachername odder IP-Address:',
+'sp-contributions-submit'        => 'Sööke',
 
 # What links here
 'whatlinkshere'            => 'Wat noh hee link',
 'whatlinkshere-title'      => 'Sigge, woh Links op „$1“ dren sen',
 'whatlinkshere-page'       => 'Sigg:',
-'whatlinkshere-barrow'     => '>',
-'linklistsub'              => '(Liss met de Links)',
 'linkshere'                => 'Dat sin de Sigge, die op <strong>„[[:$1]]“</strong> linke dun:',
 'nolinkshere'              => 'Kein Sigg link noh <strong>„[[:$1]]“</strong>.',
 'nolinkshere-ns'           => 'Nix link op <strong>„[[:$1]]“</strong> en dämm Appachtemang.',
@@ -1963,8 +2266,8 @@ Drag bei „Aanlass“ ene möchlichs jenaue Jrund en, wöröm dat Sperre passee
 * Op en IP-Adräß betrocke Jrönd
 ** dat es en Proxy ßööver övver dänn de Lück zo vill Driß aanjestellt han',
 'ipbanononly'                     => 'Nor de namelose Metmaacher sperre',
-'ipbcreateaccount'                => 'et neu Aanmelde verbeede',
-'ipbemailban'                     => 'Et e-mail-Verschecke ongerbenge',
+'ipbcreateaccount'                => 'Et Neu-Aanmelde verbeede',
+'ipbemailban'                     => 'Et <i lang="en">e-mail</i>-Verschecke ongerbenge',
 'ipbenableautoblock'              => 'Dun automatisch de letzte IP-Adress sperre, die dä Metmaacher jehatt hät, un och all die IP-Adresse, vun wo dä versök, jet ze ändere.',
 'ipbsubmit'                       => 'Dun dä Metmaacher sperre',
 'ipbother'                        => 'För en ander Duur:',
@@ -1973,6 +2276,8 @@ Drag bei „Aanlass“ ene möchlichs jenaue Jrund en, wöröm dat Sperre passee
 'ipbotherreason'                  => 'Ander Jrund oder Zosätzlich:',
 'ipbhidename'                     => ' Don däm Metmaacher singe Name versteiche: Em [[Special:Log/block|{{int:blocklogpage}}]], en de [[Special:IPBlockList|{{int:ipblocklist}}]], un en de [[Special:ListUsers|{{int:listusers}}]].',
 'ipbwatchuser'                    => 'Op däm Metmaacher sing Metmaachersigg un Klaafsigg oppasse',
+'ipballowusertalk'                => 'Lohß dä Metmaacher an sing eije Klaafsigg ändere, och su lang, wi sing Sperr dooht',
+'ipb-change-block'                => 'Wigger sperre met dä neue Enstellunge',
 'badipaddress'                    => 'Wat De do jeschrevve häs, dat es kein öntlije IP-Adress.',
 'blockipsuccesssub'               => 'De IP-Adress es jetz jesperrt',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] es jetz jesperrt.
@@ -1983,14 +2288,18 @@ un och wann De se ändere wells.',
 'ipb-unblock'                     => 'En IP-Addräß ov ene Metmaacher widder zohlohße',
 'ipb-blocklist-addr'              => 'De Sperre för „$1“ aanzeije, die jrad bestonn',
 'ipb-blocklist'                   => 'All de Sperre för Metmaacher un IP-Adresse aanzeije, die jrad bestonn',
+'ipb-blocklist-contribs'          => 'De Metmaacher ier Bäjdrähsch för „$1“',
 'unblockip'                       => 'Dä Medmacher widder maache looße',
 'unblockiptext'                   => 'Hee kanns De vörher jesperrte IP_Adresse oder Metmaacher widder freijevve, un dänne esu dat Rääch för ze Schrieve hee em Wiki widder jevve.',
-'ipusubmit'                       => 'Dun de Sperr för die Adress widder ophevve',
+'ipusubmit'                       => 'Sperr ophevve!',
 'unblocked'                       => '[[User:$1|$1]] wood widder zojelooße',
 'unblocked-id'                    => 'De Sperr met dä Nommer $1 es opjehovve',
 'ipblocklist'                     => 'Liss met jesperrte IP-Adresse un Metmaacher Name',
 'ipblocklist-legend'              => 'Ene jesperrte Metmaacher fenge',
 'ipblocklist-username'            => 'Metmaacher-Name udder IP-Address:',
+'ipblocklist-sh-userblocks'       => '$1 de einzel Metmaacher ier Sperre',
+'ipblocklist-sh-tempblocks'       => '$1 de Sperre op Zick',
+'ipblocklist-sh-addressblocks'    => '$1 de einzel IP-Addresse ier Sperre',
 'ipblocklist-submit'              => 'Sööke',
 'blocklistline'                   => '$1, $2 hät „$3“ jesperrt ($4)',
 'infiniteblock'                   => 'för iwich',
@@ -1999,14 +2308,18 @@ un och wann De se ändere wells.',
 'noautoblockblock'                => 'automatisch Sperre avjeschalt',
 'createaccountblock'              => 'Aanmelde es nit müjjelich',
 'emailblock'                      => 'Et E-Mail-Schecke es jrad jespert',
+'blocklist-nousertalk'            => 'darref de eieje Klaafsigg nit änndere',
 'ipblocklist-empty'               => 'Do es nix en de Sperrleß.',
 'ipblocklist-no-results'          => 'Dä Metmaacher udder di IP-Adrress es janit jesperrt.',
 'blocklink'                       => 'Sperre',
 'unblocklink'                     => 'widder freijevve',
+'change-blocklink'                => 'Sperr ändere',
 'contribslink'                    => 'Beidräch',
-'autoblocker'                     => 'Automatich jesperrt. Ding IP_Adress wood vör kootem vun däm Metmaacher „[[User:$1|$1]]“ jebruch. Dä es jesperrt woode wäje: „<i>$2</i>“',
+'autoblocker'                     => 'Automattisch jesperrt. Ding IP_Adress wood vör kootem vun däm Metmaacher „[[User:$1|$1]]“ jebruch. Dä es jesperrt woode wäje: „$2“',
 'blocklogpage'                    => 'Logboch met Metmaacher-Sperre',
+'blocklog-fulllog'                => 'Et janze Logboch fum Metmaacher-Sperre',
 'blocklogentry'                   => 'hät „[[$1]]“ fö de Zick vun $2 jesperrt. $3',
+'reblock-logentry'                => 'hät di Sperr för dä „[[$1]]“ met dä Duuer fun $2 $3 jeändert',
 'blocklogtext'                    => 'Hee es dat Logboch för et Metmaacher Sperre un Freijevve.
 Automatich jesperrte IP-Adresse sin nit hee, ävver en de [[Special:IPBlockList|{{int:ipblocklist}}]] ze finge.',
 'unblocklogentry'                 => 'Metmaacher „$1“ freijejovve',
@@ -2014,11 +2327,14 @@ Automatich jesperrte IP-Adresse sin nit hee, ävver en de [[Special:IPBlockList|
 'block-log-flags-nocreate'        => 'neu Metmaacher aanlääje es verbodde',
 'block-log-flags-noautoblock'     => 'nit automatesch all däm sing IP-Adresse sperre',
 'block-log-flags-noemail'         => 'och et E-Mail Verschecke sperre',
+'block-log-flags-nousertalk'      => 'kann de eije Klaafsigg nit ändere',
 'block-log-flags-angry-autoblock' => 'automatesch all däm sing IP-Adresse sperre, un noch mieh',
 'range_block_disabled'            => 'Adresse Jebeede ze sperre, es nit erlaub.',
 'ipb_expiry_invalid'              => 'De Duur es Dress. Jevv se richtich aan.',
 'ipb_expiry_temp'                 => 'Sperre för Metmaacher met verstoche Name mößße för iewish doore.',
 'ipb_already_blocked'             => '„$1“ es ald jesperrt',
+'ipb-needreblock'                 => '== Ald jespert ==
+Dä Metmaacher „$1“ es ald jesperrt. Wellß De de Enstellunge för di Spär ändere?',
 'ipb_cant_unblock'                => '<strong>Ene Fähler:</strong> En Sperr met dä Nummer $1 es nit ze finge. Se künnt ald widder freijejovve woode sin.',
 'ipb_blocked_as_range'            => 'Dat jeit nit. De IP-Adress „$1“ es nit tirek jesperrt. Se es ävver en däm jesperrte Bereich „$2“ dren. Die Sperr kam_mer ophevve. Donoh kam_mer och kleiner Aandeile fun däm Bereich widder neu sperre. Di Adress alleins kam_mer ävver nit freijevve.',
 'ip_range_invalid'                => 'Dä Bereich vun IP_Adresse es nit en Oodnung.',
@@ -2030,9 +2346,9 @@ Dröm kanns De hee em Wiki nix maache.
 Schwaad met Dingem System-Minsch udder Netzwerk-Techniker udder ISP (<i lang="en">Internet Service Provider</i>)
 un verzäll dänne vun däm ärrje Risiko för de Secherheit fun dänne ehr Rääschnere!',
 'proxyblocksuccess'               => 'Jedonn.',
-'sorbs'                           => 'DNSBL',
 'sorbsreason'                     => 'Ding IP-Adress weed en de DNSbl als ene offe Proxy jeliss. Schwaad met Dingem System-Minsch oder Netzwerk-Techniker (ISP Internet Service Provider) drüvver, un verzäll dänne vun däm Risiko för ehr Secherheit!',
 'sorbs_create_account_reason'     => 'Ding IP-Adress weed en de DNSbl als ene offe Proxy jeliss. Dröm kanns De Dich hee em Wiki nit als ene neue Metmaacher aanmelde. Schwaad met Dingem System-Minsch oder Netzwerk-Techniker oder (ISP Internet Service Provider) drüvver, un verzäll dänne vun däm Risiko för ehr Secherheit!',
+'cant-block-while-blocked'        => 'Do kanns ander Metmaacher nit sperre, esu lang wi De sellver jesperrt bes.',
 
 # Developer tools
 'lockdb'              => 'Daatebank sperre',
@@ -2052,10 +2368,9 @@ un verzäll dänne vun däm ärrje Risiko för de Secherheit fun dänne ehr RäÃ
 'databasenotlocked'   => '<strong>Opjepass:</strong> De Daatebank es <strong>nit</strong> jesperrt.',
 
 # Move page
-'move-page'               => 'De Sigg „$1“ ömnenne',
-'move-page-backlink'      => '� $1',
-'move-page-legend'        => 'Sigg Ömnenne',
-'movepagetext'            => "Hee kanns De en Sigg ömnenne.
+'move-page'                    => 'De Sigg „$1“ ömnenne',
+'move-page-legend'             => 'Sigg Ömnenne',
+'movepagetext'                 => "Hee kanns De en Sigg ömnenne.
 Domet kritt die Sigg ene neue Name, un all vörherije Versione vun dä Sigg och.
 Unger däm ahle Name weed automatisch en Ömleitung op dä neue Name enjedrage.
 
@@ -2071,46 +2386,59 @@ Esu ka'mer en Sigg jlich widder zeröck ömnenne, wa'mer sich mem Ömnenne verdo
 '''Oppjepass!'''
 Wat beim Ömnenne erus kütt, künnt en opfällije un villeich stürende Änderung am Wiki sin, besonders bei off jebruchte Sigge.
 Alsu bes secher, datte versteihs, watte hee am maache bes, ih dattet mähs!",
-'movepagetalktext'        => "Dä Sigg ehr Klaafsigg, wann se ein hät, weed automatisch met  ömjenannt, '''usser''' wann:
+'movepagetalktext'             => "Dä Sigg ehr Klaafsigg, wann se ein hät, weed automatisch met  ömjenannt, '''usser''' wann:
 * de Sigg en en ander Appachtemeng kütt,
 * en Klaafsigg met däm neue Name ald do es, un et steiht och jet drop,
 * De unge en däm Kääsje '''kei''' Hökche aan häs.
 En dänne Fäll, muss De Der dä Enhald vun dä Klaafsigge selvs vörnemme, un eröm kopeere watte bruchs.",
-'movearticle'             => 'Sigg zem Ömnenne:',
-'movenotallowed'          => 'Do kriss nit erlaub, en däm Wiki hee de Sigge ömzenenne.',
-'newtitle'                => 'op dä neue Name',
-'move-watch'              => 'Op die Sigg hee oppasse',
-'movepagebtn'             => 'Ömnenne',
-'pagemovedsub'            => 'Dat Ömnenne hät jeflupp',
-'movepage-moved'          => "<big>'''De Sigg „$1“ es jez en „$2“ ömjenannt.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "De Sigg met däm Name jitt et ald, oder dä Name ka'mer oder darf mer nit bruche.<br />Do muss Der ene andere Name ussöke.",
-'cantmove-titleprotected' => 'Die Sigg ömzenänne es esu nit müjjelesch, dänn dä neu Name vun dä Sigg es jäje et Neu-Aanlääje jeschötz.',
-'talkexists'              => '<strong>Opjepass:</strong> De Sigg selver woodt jetz ömjenannt, ävver dä ehr Klaafsigg kunnte mer nit met ömnenne. Et jitt ald ein met däm neue Name. Bes esu jod un dun die zwei vun Hand zosamme läje!',
-'movedto'                 => 'ömjenannt en',
-'movetalk'                => 'dä ehr Klaafsigg met ömnenne, wat et jeiht',
-'move-subpages'           => 'Don de Ongersigge met_ömnënne',
-'move-talk-subpages'      => 'Don de Ongersigge von de Klaafsigge met_ömnënne',
-'movepage-page-exists'    => 'En Sigg „$1“ ham_mer ald, un di bliif och beshtonn, mer don se nit ottomatėsch ußtuusche.',
-'movepage-page-moved'     => 'Di eejemoolijje Sigg „$1“ es jëz op „$2“ ömjenannt.',
-'movepage-page-unmoved'   => 'Mer kůnnte di Sigg „$1“ nit op „$2“ ömnënne.',
-'movepage-max-pages'      => 'Mer han jëtz {{PLURAL:$1|ëijn Sigg|$1 Sigge|kein Sigg}} ömjenanndt. Mieh jeiht nit automatėsch.',
-'1movedto2'               => 'hät de Sigg vun „[[$1]]“ en „[[$2]]“ ömjenannt.',
-'1movedto2_redir'         => 'hät de Sigg vun „[[$1]]“ en „[[$2]]“ ömjenannt un doför de ahl Ömleitungs-Sigg fottjeschmesse.',
-'movelogpage'             => 'Logboch vum Sigge Ömnenne',
-'movelogpagetext'         => 'Hee sin de Neuste ömjenannte Sigge opjeliss, un wä et jedon hät.',
-'movereason'              => 'Aanlass:',
-'revertmove'              => 'Et Ömnänne zerök_nämme',
-'delete_and_move'         => 'Fottschmieße un Ömnenne',
-'delete_and_move_text'    => '== Dä! Dubbelte Name ==
+'movearticle'                  => 'Sigg zem Ömnenne:',
+'movenologin'                  => 'Nit Enjelogg',
+'movenologintext'              => 'Do mööts ald aanjemeldt un [[Special:UserLogin|enjelogg]] sin, öm en Sigg ömzenenne.',
+'movenotallowed'               => 'Do kriss nit erlaub, en däm Wiki hee de Sigge ömzenenne.',
+'movenotallowedfile'           => 'Do häs nit dat Rääsch, Dateie ömzenenne.',
+'cant-move-user-page'          => 'Do häs nit dat Rääsch, öm enem Metmaacher sing eetzte Sigg ömzedeufe.',
+'cant-move-to-user-page'       => 'Do häs nit dat Rääsch, en Sigg tirkäk op en Metmaacher-Sigg ömzenänne, Do kanns se ävver op en Ungersigg dofun ömnenne.',
+'newtitle'                     => 'op dä neue Name',
+'move-watch'                   => 'Op die Sigg hee oppasse',
+'movepagebtn'                  => 'Ömnenne',
+'pagemovedsub'                 => 'Dat Ömnenne hät jeflupp',
+'movepage-moved'               => "<big>'''De Sigg „$1“ es jez en „$2“ ömjenannt.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'En Ömleidung es aanjelaat woode.',
+'movepage-moved-noredirect'    => 'Kein Ömleidung woodt aanjelaat.',
+'articleexists'                => "De Sigg met däm Name jitt et ald, oder dä Name ka'mer oder darf mer nit bruche.<br />Do muss Der ene andere Name ussöke.",
+'cantmove-titleprotected'      => 'Die Sigg ömzenänne es esu nit müjjelesch, dänn dä neu Name vun dä Sigg es jäje et Neu-Aanlääje jeschötz.',
+'talkexists'                   => '<strong>Opjepass:</strong> De Sigg selver woodt jetz ömjenannt, ävver dä ehr Klaafsigg kunnte mer nit met ömnenne. Et jitt ald ein met däm neue Name. Bes esu jod un dun die zwei vun Hand zosamme läje!',
+'movedto'                      => 'ömjenannt en',
+'movetalk'                     => 'dä ehr Klaafsigg met ömnenne, wat et jeiht',
+'move-subpages'                => 'Don de Ongersigge met_ömnënne',
+'move-talk-subpages'           => 'Don de Ongersigge von de Klaafsigge met_ömnënne',
+'movepage-page-exists'         => 'En Sigg „$1“ ham_mer ald, un di bliif och beshtonn, mer don se nit ottomatėsch ußtuusche.',
+'movepage-page-moved'          => 'Di eejemoolijje Sigg „$1“ es jëz op „$2“ ömjenannt.',
+'movepage-page-unmoved'        => 'Mer kůnnte di Sigg „$1“ nit op „$2“ ömnënne.',
+'movepage-max-pages'           => 'Mer han jëtz {{PLURAL:$1|ëijn Sigg|$1 Sigge|kein Sigg}} ömjenanndt. Mieh jeiht nit automatėsch.',
+'1movedto2'                    => 'hät de Sigg vun „[[$1]]“ en „[[$2]]“ ömjenannt.',
+'1movedto2_redir'              => 'hät de Sigg vun „[[$1]]“ en „[[$2]]“ ömjenannt un doför de ahl Ömleitungs-Sigg fottjeschmesse.',
+'move-redirect-suppressed'     => 'Ömleidung ongerdrök',
+'movelogpage'                  => 'Logboch vum Sigge Ömnenne',
+'movelogpagetext'              => 'Hee sin de Neuste ömjenannte Sigge opjeliss, un wä et jedon hät.',
+'movereason'                   => 'Aanlass:',
+'revertmove'                   => 'Et Ömnänne zerök_nämme',
+'delete_and_move'              => 'Fottschmieße un Ömnenne',
+'delete_and_move_text'         => '== Dä! Dubbelte Name ==
 Di Sigg „[[:$1]]“ jitt et ald. Wollts De se fottschmieße, öm hee di Sigg ömnenne ze künne?',
-'delete_and_move_confirm' => 'Jo, dun di Sigg fottschmieße.',
-'delete_and_move_reason'  => 'Fottjeschmesse, öm Platz för et Ömnenne ze maache',
-'selfmove'                => 'Du Doof! - dä ahle Name un dä neue Name es däselve - do hät et Ömnenne winnich Senn.',
-'immobile_namespace'      => 'Do künne mer Sigge nit hen ömnenne, dat Appachtemeng es speziell, un dä neue Name för de Sigg jeiht deswäje nit.',
-'imagenocrossnamespace'   => 'Dateije kam_mer nor in et Appachtemang „{{ns:file}}“ donn, noh wonaders hen kam_mer se och nit ömnemme!',
-'imagetypemismatch'       => 'De neu Datei-Endong moß met däm Datei-Tüp zesamme passe',
-'imageinvalidfilename'    => 'Dä Ziel-Name för de Datei es verkeht',
-'fix-double-redirects'    => 'Don noh em Ömnenne de Ömleidunge automattesch ändere, di noch op dä ahle Tittel zeije, also de neu entshtande dubbelte Ömleidunge oplöse.',
+'delete_and_move_confirm'      => 'Jo, dun di Sigg fottschmieße.',
+'delete_and_move_reason'       => 'Fottjeschmesse, öm Platz för et Ömnenne ze maache',
+'selfmove'                     => 'Du Doof! - dä ahle Name un dä neue Name es däselve - do hät et Ömnenne winnich Senn.',
+'immobile-source-namespace'    => 'Sigge en dämm Appachtemang „$1“ künne nit ömjenannt wääde',
+'immobile-target-namespace'    => 'Sigge künne nit en dat Appachtemang „$1“ erenn ömjenannt wääde',
+'immobile-target-namespace-iw' => 'Ene Ingerwikilink es nix, woh mer en Sigg hen ömnenne künnt!',
+'immobile-source-page'         => 'Di Sigg kann nit ömjenannt wääde.',
+'immobile-target-page'         => 'Op dä Tittel kann kei Sigg ömjenannt wääde.',
+'imagenocrossnamespace'        => 'Dateije kam_mer nor in et Appachtemang „{{ns:file}}“ donn, noh wonaders hen kam_mer se och nit ömnemme!',
+'imagetypemismatch'            => 'De neu Datei-Endong moß met däm Datei-Tüp zesamme passe',
+'imageinvalidfilename'         => 'Dä Ziel-Name för de Datei es verkeht',
+'fix-double-redirects'         => 'Don noh em Ömnenne de Ömleidunge automattesch ändere, di noch op dä ahle Tittel zeije, also de neu entshtande dubbelte Ömleidunge oplöse.',
+'move-leave-redirect'          => 'Donn en Ömleidung doför ennreschte',
 
 # Export
 'export'            => 'Sigge Exporteere',
@@ -2121,7 +2449,7 @@ Dat ka'mer en en ander Wiki — wann et och met dä MediaWiki-Soffwär läuf —
 Schriev de Titele vun dä Sigge en dat Feld för Tex enzejevve, unge, eine Titel en jede Reih.
 Dann dun onoch ussöke, ov De all de vörherije Versione vun dä Sigge han wells, oder nor de aktuelle met dä Informatione vun de letzte Änderung.
 
-En däm Fall künns De, för en einzelne Sigg, och ene tirekte Link bruche, zom Beispill „[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]“ för de Sigg „[[{{MediaWiki:Mainpage}}]]“ ze exporteere.",
+En däm Fall künns De, för en einzelne Sigg, och ene tirekte Link bruche, zom Beispill „[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]“ för de Sigg „[[{{MediaWiki:Mainpage}}]]“ ze exporteere.",
 'exportcuronly'     => 'Bloß de aktuelle Version usjevve (un <strong>nit</strong> de janze ahle Versione onoch met dobei dun)',
 'exportnohistory'   => '----
 <strong>Opjepass:</strong> de janze Versione Exporteere es hee em Wiki avjeschalt. Schad, ävver et wör en 
@@ -2138,7 +2466,7 @@ zo jroße Lass för dä Sörver.',
 'allmessagesdefault'        => 'Dä standaadmäßije Tex',
 'allmessagescurrent'        => 'Esu es dä Tex jetz',
 'allmessagestext'           => 'Hee kütt en Liss met Texte, Texstöck, un Nachrichte em Appachtemeng „MediaWiki“ — Do draan Ändere löht et Wiki anders ußsin, dat darf dröm nit jede maache.
-Wenn De jenerell aan [http://www.mediawiki.org/wiki/Localisation MediaWiki singe Översezung] jet anders han wells, do jangk noh [http://translatewiki.net Betawiki].',
+Wenn De jenerell aan [http://www.mediawiki.org/wiki/Localisation MediaWiki singe Översezung] jet anders han wells, do jangk noh [http://translatewiki.net translatewiki.net].',
 'allmessagesnotsupportedDB' => '<strong>Dat wor nix!</strong> Mer künne „{{ns:special}}:Allmessages“ nit zeije, <code>$wgUseDatabaseMessages</code> es usjeschalt!',
 'allmessagesfilter'         => 'Fingk dat Stöck hee em Name:',
 'allmessagesmodified'       => 'Dun nor de Veränderte aanzeije',
@@ -2158,9 +2486,12 @@ Wenn De jenerell aan [http://www.mediawiki.org/wiki/Localisation MediaWiki singe
 'import-interwiki-text'      => 'Wähl en Wiki un en Sigg zem Emporteere us.
 Et Datum vun de Versione un de Metmaacher Name vun de Schriever wääde dobei metjenomme.
 All de Trans Wiki Emporte wääde em [[Special:Log/import|Emport_Logboch]] fassjehallde.',
+'import-interwiki-source'    => 'Quelle-Wiki un -Sigg:',
 'import-interwiki-history'   => 'All de Versione vun dä Sigg hee kopeere',
 'import-interwiki-submit'    => 'Huhlade!',
 'import-interwiki-namespace' => 'Dun de Sigge emporteere en dat Appachtemeng:',
+'import-upload-filename'     => 'Dä Name fun dä Datei:',
+'import-comment'             => 'Jrond:',
 'importtext'                 => 'Dun de Daate met däm „[[Special:Export|Export]]“ vun do vun enem Wiki Exporteere, dobei dun et - etwa bei Dir om Rechner - avspeichere, un dann hee huhlade.',
 'importstart'                => 'Ben Sigge am emporteere …',
 'import-revision-count'      => '({{PLURAL:$1|ein Version|$1 Versione|kein Version}})',
@@ -2196,9 +2527,9 @@ Bes esu joot, un versök et noch ens.',
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|ein Version|$1 Versione|kein Version}} vun „$2“',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Ming eije Metmaachersigg',
+'tooltip-pt-userpage'             => 'Don Ding eije Metmaachersigg aanzeije',
 'tooltip-pt-anonuserpage'         => 'Metmaachersigg för die IP-Adress, vun wo uß De jraad Ding Änderunge un Äjänzunge aam Wiki am maache bes',
-'tooltip-pt-mytalk'               => 'Dun ming eije Klaafsigg aanzeije',
+'tooltip-pt-mytalk'               => 'Dun Ding eije Klaafsigg aanzeije',
 'tooltip-pt-anontalk'             => 'Klaaf övver Änderunge, di vun dä IP-Adress uß jemaat wodte',
 'tooltip-pt-preferences'          => 'De eije Enstellunge',
 'tooltip-pt-watchlist'            => 'De Liss met de Sigge en Dinge eije Oppassliss',
@@ -2208,7 +2539,7 @@ Bes esu joot, un versök et noch ens.',
 'tooltip-pt-logout'               => 'Uslogge',
 'tooltip-ca-talk'                 => 'Dun die Sigg met däm Klaaf övver hee de Sigg aanzeije',
 'tooltip-ca-edit'                 => 'De kanns die Sigg hee ändere — für em Avspeichere, donn eetß ens enen Bleck op de Vör-Aansich',
-'tooltip-ca-addsection'           => 'Donn ennen Beidrach zo dämm Klaaf hee afjävve.',
+'tooltip-ca-addsection'           => 'Donn hee enne neue Afschnett opmaache.',
 'tooltip-ca-viewsource'           => "Die Sigg es jeschötz. Dä Wikitex kam'mer ävver beloore.",
 'tooltip-ca-history'              => 'Ällder Versione vun dä Sigg',
 'tooltip-ca-protect'              => 'Dun die Sigg schötze',
@@ -2255,6 +2586,10 @@ Bes esu joot, un versök et noch ens.',
 'tooltip-watch'                   => 'Op die Sigg hee oppasse.',
 'tooltip-recreate'                => 'En fottjeschmesse Sigg widder zeröckholle',
 'tooltip-upload'                  => 'Mem Dattei-Huhlaade loßlääje',
+'tooltip-rollback'                => 'Nemmp alle Änderunge zeröck, di dä Läzde jemaat hät, dä aan dä Sigg övverhoup jet jedonn hät. Deit nimmieh frore un määd ene automattesche Endraach en „{{int:Summary}}“',
+'tooltip-undo'                    => '„{{UCfirst:{{int:editundo}}}}“ määt der förije Zostand
+fun dä Sigg op, zom Beärbeide un widder Afspeichere.
+Esu kam_mer noch en Aanmerkung en „{{int:summary}}“ maache.',
 
 # Stylesheets
 'common.css'      => '/* CSS hee aan dä Stell hät Uswirkunge op all Ovverflääsche */',
@@ -2266,6 +2601,7 @@ Bes esu joot, un versök et noch ens.',
 'chick.css'       => '/* CSS hee aan dä Stell wirrek nur op de Ovverflääsch "Höhnsche" */',
 'simple.css'      => '/* CSS hee aan dä Stell wirrek nur op de Ovverflääsch "Eijfach" */',
 'modern.css'      => '/* CSS hee aan dä Stell wirrek nur op de Ovverflääsch "Modern" */',
+'print.css'       => '/* CSS hee aan dä Stell wirrek nur op et Sigge Drokke */',
 
 # Scripts
 'common.js'      => '/* Jedes JavaScrit hee küt für jede Metmaacher in jede Sigg erinn */',
@@ -2284,12 +2620,12 @@ Bes esu joot, un versök et noch ens.',
 'notacceptable'     => '<strong>Blöd:</strong> Dä Wiki_Sörver kann de Daate nit en einem Format erüvverjevve, wat Dinge Client oder Brauser verstonn künnt.',
 
 # Attribution
-'anonymous'        => 'Namelose Metmaacher vun de {{SITENAME}}',
+'anonymous'        => 'Namelose {{PLURAL:$1|Metmaacher|Metmaacher|Metmaacher}} vun de {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Metmaacher $1',
 'lastmodifiedatby' => 'Die Sigg hee wood et letz am $1 öm $2 Uhr vum $3 jeändert.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Baut op de Arbeid vun „<strong>$1</strong>“ op.',
 'others'           => 'ander',
-'siteusers'        => '{{SITENAME}}-Metmaacher $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|Metmaacher|Metmaacher|Metmaacher}}: $1',
 'creditspage'      => 'Üvver de Metmaacher un ehre Beidräch för heh die Sigg',
 'nocredits'        => "För die Sigg ha'mer nix en de Liss.",
 
@@ -2309,6 +2645,16 @@ Bes esu joot, un versök et noch ens.',
 'numauthors'     => 'Aanzahl Metmaacher, die aan däm Atikkel met jeschrevve han: <strong>$1</strong>',
 'numtalkauthors' => 'Aanzahl Metmaacher beim Klaaf: <strong>$1</strong>',
 
+# Skin names
+'skinname-standard'    => 'Klassesch',
+'skinname-nostalgia'   => 'Nostaljesch',
+'skinname-cologneblue' => 'Kölsch Blau',
+'skinname-monobook'    => 'MonoBoch',
+'skinname-myskin'      => 'Ming Skin',
+'skinname-chick'       => 'Höhnche',
+'skinname-simple'      => 'Eifach',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Immer nor PNG aanzeije',
 'mw_math_simple' => 'En einfache Fäll maach HTML, söns PNG',
@@ -2329,11 +2675,12 @@ Bes esu joot, un versök et noch ens.',
 'markedaspatrollederror-noautopatrol' => 'Do darrefs Ding eije Änderunge nit op „Nohjeloort“ setze!',
 
 # Patrol log
-'patrol-log-page'   => 'Logboch vun de nohjeloorte Änderunge',
-'patrol-log-header' => '<!-- -->',
-'patrol-log-line'   => 'hät $1 von „$2“ $3 nohjeloort.',
-'patrol-log-auto'   => '(automatisch)',
-'patrol-log-diff'   => 'de Version $1',
+'patrol-log-page'      => 'Logboch vun de nohjeloorte Änderunge',
+'patrol-log-header'    => '<!-- -->',
+'patrol-log-line'      => 'hät $1 von „$2“ $3 nohjeloort.',
+'patrol-log-auto'      => '(automatisch)',
+'patrol-log-diff'      => 'de Version $1',
+'log-show-hide-patrol' => '$1 et Logbuch vum Sigge nohlooere',
 
 # Image deletion
 'deletedrevision'                 => 'De ahl Version „$1“ es fottjeschmesse',
@@ -2350,6 +2697,9 @@ $1',
 'previousdiff' => '� De Änderung dovör zeije',
 'nextdiff'     => 'De Änderung donoh zeije →',
 
+# Visual comparison
+'visual-comparison' => 'De Ungerscheide',
+
 # Media information
 'mediawarning'         => "<strong>Opjepass</strong>: En dä Datei künnt en <b>jefährlich Projrammstöck</b> dren stecke. Wa'mer et laufe looße dät, do künnt dä Sörver met för de Cracker opjemaht wääde. <hr />",
 'imagemaxsize'         => 'Belder op de Sigge, wo se beschrevve wääde, nit jrößer maache wie:',
@@ -2363,10 +2713,12 @@ $1',
 'show-big-image'       => 'Jröößer Oplöösung',
 'show-big-image-thumb' => '<small>Di Vör-Aansich es $1 × $2 Pixelle jroß</small>',
 
-# Special:NewImages
-'newimages'             => 'Belder, Tön, uew. als Jalerie',
+# Special:NewFiles
+'newimages'             => 'Neu Dateie als Jaleri',
 'imagelisttext'         => 'Hee küt en Liss vun <strong>$1</strong> Datei{{PLURAL:$1||e}}, zoteet $2.',
 'newimages-summary'     => 'Hee die Sigg zeig die zoletz huhjeladene Belder un Dateie aan.',
+'newimages-legend'      => 'Ußwähle',
+'newimages-label'       => 'Dä Dattei ier Name udder e Stöck dofun:',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'Kein Dateie jefunge.',
 'ilsubmit'              => 'Sök',
@@ -2568,8 +2920,8 @@ Donoh kumme, en däsellve Reih, Links op Sigge wo dat Beld trotz dämm jenehm eÃ
 'exif-lightsource-9'   => 'Joodt Wedder',
 'exif-lightsource-10'  => 'Wedder met Wolke',
 'exif-lightsource-11'  => 'Schadde',
-'exif-lightsource-12'  => 'Taresleesch — selfs aam leuschte (D 5700–7100 K)',
-'exif-lightsource-13'  => 'Tareswiiß Leesch — selfs aam leuschte (N 4600–5400 K)',
+'exif-lightsource-12'  => 'Daresleesch — selfs aam leuschte (D 5700–7100 K)',
+'exif-lightsource-13'  => 'Daresleechs-Wiiß — selfs aam leuschte (N 4600–5400 K)',
 'exif-lightsource-14'  => 'Kaal Wieß Leesch — selfs aam leuschte (W 3900–4500 K)',
 'exif-lightsource-15'  => 'Wieß Leesch — selfs aam leuschte (WW 3200–3700 K)',
 'exif-lightsource-17'  => 'Standat Leech Tüp A',
@@ -2579,6 +2931,18 @@ Donoh kumme, en däsellve Reih, Links op Sigge wo dat Beld trotz dämm jenehm eÃ
 'exif-lightsource-24'  => 'Studio-Kunsleesch noh ISO-Norrem',
 'exif-lightsource-255' => 'Söns en Leechquell',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Bletz hät nit jedonn',
+'exif-flash-fired-1'    => 'met Bletz',
+'exif-flash-return-0'   => 'Dä Bletz säät nit, wat loß es',
+'exif-flash-return-2'   => 'Däm Bletz sing Leesch schingk nit zeröck jekumme ze sin',
+'exif-flash-return-3'   => 'Däm Bletz sing Leesch es zeröck jekumme',
+'exif-flash-mode-1'     => 'Dä Bletz moot ußjelöß wääde',
+'exif-flash-mode-2'     => 'Dä Bletz wohr afjeschalldt',
+'exif-flash-mode-3'     => 'Automattesch',
+'exif-flash-function-1' => 'Kammera ohne Bletz',
+'exif-flash-redeye-1'   => 'Ruude Aure fott jemaat',
+
 'exif-focalplaneresolutionunit-2' => 'Zoll',
 
 'exif-sensingmethod-1' => 'Onbikannt',
@@ -2747,24 +3111,15 @@ Wells Do jetz met en neu Version die Sigg widder neu aanläje?',
 
 'unit-pixel' => 'px',
 
-# HTML dump
-'redirectingto' => 'Leit öm op: „[[:$1]]“',
-
 # action=purge
-'confirm_purge'        => 'Dä Zweschespeicher för die Sigg fottschmieße?
-
-$1',
 'confirm_purge_button' => 'Jo — loss jonn!',
-
-# AJAX search
-'searchcontaining' => 'Sök noh Atikkele, wo „$1“ em Tex vörkütt.',
-'searchnamed'      => 'Sök noh Atikkele, wo „$1“ em Name vörkütt.',
-'articletitles'    => 'Atikkele, die met „$1“ aanfange',
-'hideresults'      => 'Versteiche wat erus küt',
-'useajaxsearch'    => 'AJAX-Hölp beim Sööke bruche',
+'confirm-purge-top'    => 'Dä Zweschespeicher för die Sigg fottschmieße?',
+'confirm-purge-bottom' => 'Dä Zweschespeicher för de Sigg fottzeschmieße sorresch doför, dat af dann de neuste Version vun dä Sigg (de Version vun jetz) aanjezeich weet.',
 
 # Separators for various lists, etc.
-'autocomment-prefix' => '-',
+'semicolon-separator' => ';',
+'autocomment-prefix'  => '-',
+'word-separator'      => '&#32;',
 
 # Multipage image navigation
 'imgmultipageprev' => '� de Sigg dovör',
@@ -2787,7 +3142,7 @@ $1',
 'autosumm-blank'   => 'Dä janze Enhald vun dä Sigg fottjemaht',
 'autosumm-replace' => "Dä jannze Enhallt fon dä Sigk ußjetuusch: '$1'",
 'autoredircomment' => 'Leit öm op „[[$1]]“',
-'autosumm-new'     => 'Neu Sigg: $1',
+'autosumm-new'     => 'De Sigg wood neu aanlelaat met däm Aanfang: $1',
 
 # Size units
 'size-bytes'     => '$1 Bytes',
@@ -2845,9 +3200,21 @@ De könnts Ding Oppassliss ävver och [[Special:Watchlist/edit|övver e Fomulaa
 'hebrew-calendar-m5'  => 'Shevat',
 'hebrew-calendar-m6'  => 'Adar',
 'hebrew-calendar-m6a' => 'Adar I',
+'hebrew-calendar-m6b' => 'Adar II',
+'hebrew-calendar-m7'  => 'Nisan',
+'hebrew-calendar-m8'  => 'Iyar',
+'hebrew-calendar-m9'  => 'Sivan',
+'hebrew-calendar-m10' => 'Tamuz',
+'hebrew-calendar-m11' => 'Av',
+'hebrew-calendar-m12' => 'Elul',
+
+# Signatures
+'timezone-utc' => 'UTC',
 
 # Core parser functions
 'unknown_extension_tag' => '„<code>$1</code>“ es en zosäzlejje Kennzeichnung, die kenne mer nit.',
+'duplicate-defaultsort' => "'''Opjepaß:'''
+Dä Shtanndat-Zoot-Schlößel „$1“ övverschriif dä älldere Zoot-Schlößel „$2“.",
 
 # Special:Version
 'version'                          => 'Version vun de Wiki Soffwär zeije', # Not used as normal message but as header for the special page itself
@@ -2876,13 +3243,13 @@ De könnts Ding Oppassliss ävver och [[Special:Watchlist/edit|övver e Fomulaa
 'filepath-submit'  => 'Zëijsh dä Pahdt',
 'filepath-summary' => "Med dä Söndersigg hee künnd'Er dä kompläte Paad vun de neuste Version vun ene Datei direk erusfenge. Die Datei weed jlich aanjezeig, odder med däm paßende Projramm op jemaat.
 
-Doht der Name ohne „{{ns:image}}:“ doför ennjävve.",
+Doht der Name ohne „{{ns:file}}:“ doför ennjävve.",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Sök noh dubbelte Dateie',
 'fileduplicatesearch-summary'  => 'Söök noh dubbelte Dateie övver dänne iere Häsh-Zahl.
 
-Der Name moß ohne der Försatz „{{ns:image}}:“ aanjejovve wääde.',
+Der Name moß ohne der Försatz „{{ns:file}}:“ aanjejovve wääde.',
 'fileduplicatesearch-legend'   => 'Sök noh ene dubbelte Datei',
 'fileduplicatesearch-filename' => 'Dateiname:',
 'fileduplicatesearch-submit'   => 'Sööke',
@@ -2903,13 +3270,22 @@ Der Name moß ohne der Försatz „{{ns:image}}:“ aanjejovve wääde.',
 'specialpages-group-users'       => 'Metmaacher un denne ier Rääschte',
 'specialpages-group-highuse'     => 'Öff jebruchte Sigge',
 'specialpages-group-pages'       => 'Siggeliste',
-'specialpages-group-pagetools'   => 'Werrekzeuch för Sigge',
-'specialpages-group-wiki'        => 'Werrekzeuch un Date vum Systeem',
+'specialpages-group-pagetools'   => 'Werrekzüch för Sigge',
+'specialpages-group-wiki'        => 'Werrekzüch un Date vum Systeem',
 'specialpages-group-redirects'   => 'Sondersigge, die ömleite, söke, un finge',
-'specialpages-group-spam'        => 'Werrekzeuch jäje SPÄM',
+'specialpages-group-spam'        => 'Werrekzüch jäje SPÄM',
 
 # Special:BlankPage
 'blankpage'              => 'Vakat-Sigg',
 'intentionallyblankpage' => 'Op dä Sigg es med Afseesh nix drop.',
 
+# External image whitelist
+'external_image_whitelist' => ' # Donn aan dä Reih hee nix ändere<pre>
+# Onge künne Brochstöck fun regular expressions aanjejovve wäde, 
+# alsu dä Deil zwesche / und /
+# Noh em Verjliische met däm URL vun enm Beld fun ußerhallef:
+# Treffer: Dat Beld weed jezeich. Söns: ene Link weed aanjezeich.
+# Reije met # am Aanfang, sen bloß Kommenta
+# Donn de Brochstöck hee noh endrare, un di Reih sellver nit ändere</pre>',
+
 );
diff --git a/languages/messages/MessagesKu.php b/languages/messages/MessagesKu.php
index 6f278d8e..d0772270 100644
--- a/languages/messages/MessagesKu.php
+++ b/languages/messages/MessagesKu.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Kurdish (latin)
+/** Kurdish (Kurdî / كوردی)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 $fallback = 'ku-latn';
diff --git a/languages/messages/MessagesKu_arab.php b/languages/messages/MessagesKu_arab.php
index c6b126a4..6dea4326 100644
--- a/languages/messages/MessagesKu_arab.php
+++ b/languages/messages/MessagesKu_arab.php
@@ -5,20 +5,13 @@
  * @file
  *
  * @author Aras Noori
+ * @author Arastein
  * @author Asoxor
+ * @author Cyrus abdi
  */
 
 $fallback = 'ku-latn';
 
-$skinNames = array(
-'standard'    => 'كلاسیك',
-'nostalgia'   => 'قاوه‌یی',
-'cologneblue' => 'شین',
-'monobook'    => 'Ù…Û†Ù†Û†',
-'myskin'      => 'پێستی خۆم',
-'chick'       => 'جوجه‌',
-'simple'      => 'ساده‌'
-);
 
 $digitTransformTable = array(
 	'0' => 'Ù ', # &#x0660;
@@ -37,19 +30,19 @@ $digitTransformTable = array(
 
 $messages = array(
 # User preference toggles
-'tog-underline'               => 'هێڵ به‌ژێر به‌سته‌ر دا بهێنه‌ :',
+'tog-underline'               => 'هێڵ بە ژێر بەستەرەکاندا بهێنە:',
 'tog-highlightbroken'         => 'شێوازدانان بگۆڕه‌',
 'tog-justify'                 => 'كۆپله‌كه‌ ڕێك بكه‌',
-'tog-hideminor'               => 'دوا گۆڕانكارییه‌ گچكه‌كان ون بكه‌',
+'tog-hideminor'               => 'دەستکارییە بچوکەکان بشارەوە لە دوا گۆڕانکارییەکاندا',
 'tog-extendwatchlist'         => 'لیستی ته‌ماشاكردن درێژبكه‌ره‌وه‌ تاكوو هه‌موو گۆڕانكارییه‌كان به‌رچاوت بكه‌وێ',
-'tog-usenewrc'                => 'دوا گۆڕانكارییه‌كان چاك بكه‌ (سكریپتی جاڤا)',
+'tog-usenewrc'                => 'دوا گۆڕانکارییەکان پەرە پێبدە (پێویستی بە جاڤاسکریپتە)',
 'tog-numberheadings'          => 'ژماره‌ی سه‌رتا خۆكارانه‌ دابنێ',
-'tog-showtoolbar'             => 'تووڵامرازی ده‌ستكاری نیشان بده‌ -سكریپتی جاڤا',
+'tog-showtoolbar'             => 'شریتی ئامرازەکان نیشان بدە (JavaScript)',
 'tog-editondblclick'          => 'ده‌ستكاریی په‌ڕه‌كه‌ بكه‌ به‌ دووكرته‌ لێكردنی (سكریپتی جاڤا)',
 'tog-editsection'             => 'ده‌ستكاریی كردنی به‌ش چالاك بكه‌ له‌ڕێگه‌ی به‌سته‌ری [ده‌ستكاریی] یه‌وه‌',
 'tog-editsectiononrightclick' => 'ده‌ستكاریی كردنی به‌ش چالاك بكه‌ به‌هۆی كرته‌ كردن له‌ ناونیشانی به‌شه‌كه‌ (سكریپتی جاڤا)',
 'tog-showtoc'                 => 'ناوه‌ڕۆك نیشان بده‌ (بۆ ئه‌و په‌ڕانه‌ی كه‌ زیاتر له‌ ٣ به‌شه‌وتار یان هه‌یه‌)',
-'tog-rememberpassword'        => 'زانیاریی چوونه‌ناوه‌وه‌م له‌م كۆمپیوته‌ره‌دا پاشه‌كه‌وت بكه‌',
+'tog-rememberpassword'        => 'چوونەژوورەوەم بەبیربهێنەوە لەسەر ئەم کۆمپیوتەرە',
 'tog-editwidth'               => 'سندوقی نووسینه‌كه‌ گه‌وره‌ترین درێژی هه‌یه‌',
 'tog-watchcreations'          => 'ئه‌و په‌ڕانه‌ زیاد بكه‌ كه‌ من دروستم كردوون‌ له‌ لیسته‌ی ته‌ماشاكردندا',
 'tog-watchdefault'            => 'ئه‌و په‌ڕانه‌ زیاد بكه‌ كه‌ من ده‌ستكارییم كردوون له‌ لیسته‌ی ته‌ماشاكردندا‌',
@@ -63,19 +56,23 @@ $messages = array(
 'tog-enotifusertalkpages'     => 'پۆستی ئه‌لیكترۆنیم بۆ بنێره‌ گه‌ر په‌ڕه‌ی به‌كارهێنانی وتووێژ گۆڕانكاریی به‌سه‌ردا هات‌',
 'tog-enotifminoredits'        => 'له‌ گۆڕانكارییه‌ ورده‌كانیش ئاگادارم بكه‌ره‌وه‌ له‌ ڕێگه‌ی پۆستی ئه‌لیكترۆنییه‌وه',
 'tog-shownumberswatching'     => 'ژماره‌ی چاولێكه‌ران نیسان بده‌',
+'tog-fancysig'                => 'ئیمزای خام (جگە لە بەستەری خۆکار بۆ پەڕەی بەکارھێنەر)',
 'tog-externaleditor'          => 'ده‌س',
 'tog-showjumplinks'           => 'ڕێگه‌پێدانی بازدان بۆ به‌سته‌ره‌كان چالاك بكه‌',
+'tog-watchlisthideown'        => 'دەستکارییەکانم بشارەوە لە لیستی چاودێری',
+'tog-watchlisthidebots'       => 'دەستکارییەکانی بۆت بشارەوە لە لیستی چاودێری',
 'tog-watchlisthideminor'      => 'ورده‌ ده‌ستكارییه‌كان له‌ لیسته‌ی ته‌ماشاكردندا بشاره‌وه‌',
+'tog-watchlisthideliu'        => 'دەستکارییەکانی ئەو بەکارهێنەرانەی لە ژوورەوەن بشارەوە لە لیستی چاودێری',
+'tog-watchlisthideanons'      => 'دەستکارییەکانی بەکارهێنەرانی نەناسراو بشارەوە لە لیستی چاودێری',
 'tog-nolangconversion'        => 'وتووێژی هه‌مه‌چه‌شن ناچالاك بكه‌',
 'tog-ccmeonemails'            => 'له‌به‌رگیراوه‌م بۆ بنێره‌ له‌و پۆستی ئه‌لیكترۆنییانه‌ی كه‌ بۆ به‌كارهێنه‌رانی دیكه‌ ناردوومه‌',
 'tog-diffonly'                => 'په‌ڕه‌یه‌ك ئه‌م جیاوازییانه‌ی خواره‌وه‌ی له‌خۆ گرتبێت نیشانی مه‌ده‌‌',
+'tog-showhiddencats'          => 'هاوپۆلە شاردراوکان پیشان بدە',
 
 'underline-always'  => 'هه‌میشه‌',
 'underline-never'   => 'هیچ كات',
 'underline-default' => 'نمایشكه‌ری پێوانه‌یی',
 
-'skinpreview' => '(پێش بینین)',
-
 # Dates
 'sunday'        => 'یه‌كشه‌ممه‌',
 'monday'        => 'دووشه‌ممه‌',
@@ -91,18 +88,18 @@ $messages = array(
 'thu'           => 'پێنجشەممە',
 'fri'           => 'ھەینی',
 'sat'           => 'شه‌ممه‌',
-'january'       => 'كانونی دووه‌م',
+'january'       => 'کانوونی دووەم',
 'february'      => 'شوبات',
-'march'         => 'مارت',
-'april'         => 'نیسان',
-'may_long'      => 'مایس',
-'june'          => 'حوزه‌یران',
-'july'          => 'ته‌مموز',
+'march'         => 'ئازار',
+'april'         => 'ئاپریل',
+'may_long'      => 'ئایار',
+'june'          => 'حوزەیران',
+'july'          => 'تەمموز',
 'august'        => 'ئاب',
-'september'     => 'ئه‌یلول',
-'october'       => 'تشرینی یه‌كه‌م',
-'november'      => 'تشرینی دووه‌م',
-'december'      => 'كانونی یه‌كه‌م',
+'september'     => 'ئەیلوول',
+'october'       => 'تشرینی یەکەم',
+'november'      => 'تشرینی دووەم',
+'december'      => 'کانونی یەکەم',
 'january-gen'   => 'كانونی دووه‌م',
 'february-gen'  => 'شوبات',
 'march-gen'     => 'مارت',
@@ -129,8 +126,8 @@ $messages = array(
 'dec'           => 'كا١',
 
 # Categories related messages
-'pagecategories'        => '$1 هاوپۆله‌كان',
-'category_header'       => 'په‌ڕه‌ی هاوپۆلی "$1" de',
+'pagecategories'        => '{{PLURAL:$1|ھاوپۆل|ھاوپۆلەکان}}',
+'category_header'       => 'پەڕە ھاوپۆلەکانی "$1"',
 'subcategories'         => 'به‌شه‌هاوپۆله‌كان',
 'category-media-header' => 'میدیا له‌ هاوپۆلی "$1" دا',
 'category-empty'        => "''ئه‌م هاوپۆله‌ هه‌نووكه‌ هیچ له‌خۆ ناگرێت - به‌تاڵه‌''",
@@ -147,7 +144,7 @@ $messages = array(
 'about'          => 'سه‌باره‌ت',
 'article'        => 'بابه‌ت',
 'newwindow'      => '(لە پەڕەیەکی نوێ دەکرێتەوە)',
-'cancel'         => 'ھەڵوەشاندن',
+'cancel'         => 'ھەڵوەشاندنەوە',
 'qbfind'         => 'دۆزه‌ر',
 'qbbrowse'       => 'بگه‌ڕێ',
 'qbedit'         => 'دەستكاری',
@@ -159,7 +156,8 @@ $messages = array(
 'mypage'         => 'په‌ڕه‌ی من',
 'mytalk'         => 'په‌ڕه‌ی گ�توگۆی من',
 'anontalk'       => 'گ�توگۆ بۆ ئه‌م ئای‌پی‌ یه‌',
-'navigation'     => 'نمایشكردن',
+'navigation'     => 'ڕێدۆزی',
+'and'            => '&#32;Ùˆ',
 
 # Metadata in edit box
 'metadata_help' => 'دراوه‌ی مێتا:',
@@ -169,7 +167,7 @@ $messages = array(
 'tagline'           => 'له‌ {{SITENAME}}',
 'help'              => 'ڕێنمایی',
 'search'            => 'گەڕان',
-'searchbutton'      => 'بگەڕە',
+'searchbutton'      => 'بگەڕێ',
 'go'                => 'ده‌ی',
 'searcharticle'     => 'بڕۆ',
 'history'           => 'مێژووی په‌ڕه‌',
@@ -180,26 +178,26 @@ $messages = array(
 'permalink'         => 'بەسته‌ری ھەمیشەیی',
 'print'             => 'چاپ',
 'edit'              => 'دەستكاری',
-'create'            => 'دروست کردن',
+'create'            => 'دروستکردن',
 'editthispage'      => 'ده‌ستكاری ئه‌م په‌ڕه‌یه‌ بكه‌',
 'create-this-page'  => 'ئەم پەڕە دروست بکە',
 'delete'            => 'سڕینه‌وه‌',
 'deletethispage'    => 'سڕینه‌وه‌ی ئه‌م په‌ڕه‌یه‌',
 'undelete_short'    => 'به‌جێ بهێنه‌ {{PLURAL:$1|سڕاوه‌|$1 سڕاوه‌كان}}هێنانه‌وه‌ی',
 'protect'           => 'پاراستن',
-'protect_change'    => ' پاراستنەکە بگۆڕە',
+'protect_change'    => 'گۆڕین',
 'protectthispage'   => 'ئه‌م په‌ڕه‌یه‌ بپارێزه‌',
 'unprotect'         => 'مه‌پارێزه‌',
 'unprotectthispage' => 'ئه‌م په‌ڕه‌یه‌ مه‌پارێزه‌',
 'newpage'           => 'په‌ڕه‌یه‌كی نوێ',
 'talkpage'          => 'گ�توگۆ له‌سه‌ر ئه‌م په‌ڕه‌یه بكه‌',
-'talkpagelinktext'  => 'وتووێژ',
+'talkpagelinktext'  => 'وتە',
 'specialpage'       => 'په‌ڕه‌ی تایبه‌ت',
-'personaltools'     => 'ئامرازی تایبه‌تی',
-'postcomment'       => 'لێدوان بنێره‌',
+'personaltools'     => 'ئامڕازە تاکەکەسییەکان',
+'postcomment'       => 'بەشی نوێ',
 'articlepage'       => 'ناوه‌ڕۆكی بابه‌ت ببینه‌',
-'talk'              => 'قسەوباس',
-'views'             => 'بینین',
+'talk'              => 'گ�توگۆ',
+'views'             => 'بینینەکان',
 'toolbox'           => 'ئامرازدان',
 'userpage'          => 'په‌ڕه‌ی به‌كارهێنه‌ر نیشانبده‌',
 'projectpage'       => 'په‌ڕه‌ی پرۆژه‌ نیشانبده‌',
@@ -215,22 +213,31 @@ $messages = array(
 'lastmodifiedat'    => 'ئه‌م په‌ڕه‌یه‌ دواجار نوێكراوه‌ته‌وه‌ له‌ $2, $1', # $1 date, $2 time
 'viewcount'         => 'ئه‌م په‌ڕه‌یه‌ ده‌ستكاریی كراوه‌ {{PLURAL:$1|یه‌كجار|$1 جار}}',
 'protectedpage'     => 'په‌ڕه‌یه‌كی پارێزراو',
-'jumpto'            => 'باز بده‌ بۆ:',
-'jumptonavigation'  => 'ڕوانگە',
+'jumpto'            => 'باز بدە بۆ:',
+'jumptonavigation'  => 'ڕێدۆزی',
 'jumptosearch'      => 'گه‌ڕان',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'دەربارەی {{SITENAME}}',
+'aboutpage'            => 'Project:دەربارە',
+'copyright'            => 'ناوەڕۆک ئامادەیە لە ژێر $1.',
 'copyrightpage'        => '{{ns:project}}:ما�ەکانی لەبەرگرتنەوە',
+'currentevents'        => 'ڕووداوە هەنووکەییەکان',
 'currentevents-url'    => 'Project:ڕووداوە بەردەوامەکان',
-'edithelp'             => 'ڕێنمایی بۆ دەستکاری کردن',
-'edithelppage'         => 'Help:دەستکاری کردن',
-'faq'                  => 'پرسیاری هه‌میشه‌ دووباره‌(پهد(',
-'mainpage'             => 'ده‌ستپێک',
+'disclaimers'          => 'بەرپرس‌نەبوونییەکان',
+'edithelp'             => 'ڕێنمایی بۆ دەستکاریکردن',
+'edithelppage'         => 'Help:دەستکاریکردن',
+'faq'                  => 'پرسیار و وەڵام (FAQ)',
+'faqpage'              => 'Project:پرسیار و وەڵام',
+'helppage'             => 'Help:رێنمایییەکان',
+'mainpage'             => 'دەستپێک',
 'mainpage-description' => 'ده‌ستپێک',
 'portal'               => 'دەروازەی بەکارھێنەران',
 'portal-url'           => 'Project: دەروازەی بەکارھێنەران',
 'privacy'              => 'سیاسەتی پاراستنی داتاکان',
+'privacypage'          => 'Project:پاراستنی زانیارییەکان',
+
+'badaccess' => 'ھەڵە لە بە دەست ھێنان',
 
 'versionrequired'     => 'پێویستیت به‌ وه‌شانی $1 ـی‌ ویكیمیدیایه‌',
 'versionrequiredtext' => 'پێویستیت به‌ وه‌شانی $1 ـێ ویكیمیدیا هه‌یه‌ بۆ به‌كاربردنی ئه‌م په‌ڕه‌یه‌
@@ -238,23 +245,31 @@ $messages = array(
 
 'ok'                      => 'باشه‌',
 'retrievedfrom'           => 'له‌ لایه‌ن "$1" گه‌ڕاوه‌ته‌وه‌.',
+'youhavenewmessages'      => '$1ت ھەیە ($2).',
 'newmessageslink'         => 'په‌یامێكی نوێ',
 'newmessagesdifflink'     => 'دوا گۆڕانكارییه‌كان',
 'youhavenewmessagesmulti' => 'په‌یامێكی نوێت هه‌یه‌ له‌ $1.',
 'editsection'             => 'ده‌ستكاری',
-'editsectionhint'         => 'ده‌ستكاریی به‌شی: $1',
+'editold'                 => 'دەستکاری',
+'viewsourceold'           => 'بینینی سەرچاوە',
+'editlink'                => 'دەستکاری',
+'viewsourcelink'          => 'بینینی سەرچاوە',
+'editsectionhint'         => 'دەستكاری به‌شی: $1',
 'toc'                     => 'ناوەڕۆک',
 'showtoc'                 => 'نیشاندان',
 'hidetoc'                 => 'شاردنەوە',
 'thisisdeleted'           => '؟$1 نیشانی بده‌ یا بیگه‌ڕێنه‌ره‌وه‌',
 'viewdeleted'             => '$1 نیشان بده‌؟',
-'restorelink'             => '{{PLURAL:$1|ده‌ستكاریی سڕدراوه‌كه‌ بكه‌|$1 ده‌ستكارییان بكه‌}}',
+'restorelink'             => '{{PLURAL:$1|گۆڕانکاریی سڕاو|$1 یەک گۆڕانکاریی سڕاو}}',
+'site-rss-feed'           => 'RSS FEED ـی $1',
+'site-atom-feed'          => 'Atom Feed ـی $1',
+'red-link-title'          => '$1 (پەڕە بوونی نییە)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
-'nstab-main'      => 'وتار',
+'nstab-main'      => 'Ù¾Û•Ú•Û•',
 'nstab-user'      => 'پەڕەی بەکارھێنەر',
 'nstab-media'     => 'میدیا',
-'nstab-special'   => 'تایبه‌ت',
+'nstab-special'   => 'په‌ڕه‌ی تایبه‌ت',
 'nstab-project'   => 'په‌ڕه‌ی پرۆژه‌',
 'nstab-image'     => 'وێنه‌',
 'nstab-mediawiki' => 'په‌یام',
@@ -273,6 +288,14 @@ $messages = array(
 # General errors
 'error'              => 'هه‌ڵه‌',
 'databaseerror'      => 'هه‌ڵه‌ له‌ بنكه‌دراوه‌دا هه‌یه‌',
+'readonly'           => 'بنکەدراوە داخراوە',
+'missing-article'    => 'دانەگە (دەیتابەیس) نەیتوانی دەقی لاپەڕەیەک بدۆزێتەوە کە دەبوا بیدۆزایەتوە، بەناوی "$1" $2 .
+
+This is usually caused by following an outdated diff or history link to a page that has been deleted.
+
+ئەگەر وا نەبێت، ئەوا ڕەنگە گر�تێکت لەم نەرمامێرە دا ھەبێت، کە تۆ پێت زانیوە..
+تکایە ئەم بە یەکێک لە ئەندامانی [[Special:ListUsers/sysop|administrator]] ڕاپۆرت بدە، و ناونیشانی URLـەکەی پێ بدە.',
+'missingarticle-rev' => '(پیاچوونەوە#: $1)',
 'readonly_lag'       => 'بنكه‌دراوه‌كه‌ به‌شێوه‌ی خۆكار به‌ندكراوه‌، له‌كاتێكدا بنكه‌دراوه‌ی ڕاژه‌كاره‌كه‌ ڕۆڵی له‌خۆگرتن ده‌گێڕێت',
 'internalerror'      => 'هه‌ڵه‌یه‌كی ناوخۆیی ڕویدا',
 'internalerror_info' => 'هه‌ڵه‌ی ناوخۆیی: $1',
@@ -285,6 +308,7 @@ $messages = array(
 'viewsourcefor'      => 'بۆ $1',
 
 # Login and logout pages
+'logouttitle'             => 'دەرچوونی بەکارهێنەر',
 'welcomecreation'         => '== خۆش هاتیت, $1! ==
 
 هه‌ژماری تایبه‌تی تۆ سه‌ركه‌وتووانه‌ دروست كرا، له‌بیرت نه‌چێت گۆڕانكاری له {{SITENAME}} تایبه‌ت به‌خۆت دا بكه‌.',
@@ -295,171 +319,682 @@ $messages = array(
 'remembermypassword'      => 'زانیاریی چوونه‌ ژووره‌وه‌م له‌سه‌ر ئه‌م كۆمپیوته‌ره‌ پاشه‌كه‌وت بكه‌',
 'yourdomainname'          => 'ناوی دۆمه‌ینی خۆت',
 'login'                   => 'تێکەوە (login)',
-'nav-login-createaccount' => 'دروست کردنی ھەژمار/چوونە ژورەوە',
+'nav-login-createaccount' => 'چوونەژوورەوە / دروستکردنی هەژمار',
 'userlogin'               => 'دروست کردنی ھەژمار/چوونە ژورەوە',
 'logout'                  => 'ده‌رچوون',
 'userlogout'              => 'دەرچوون',
 'notloggedin'             => 'له‌ ژووره‌وه‌ نیت',
-'nologin'                 => 'ناتوانیت بچییه‌ ژووره‌وه‌؟ $1.',
+'nologin'                 => 'ھەژمارت نییە؟  $1.',
 'nologinlink'             => 'ببه‌ به‌ ئه‌ندام',
-'createaccount'           => 'هه‌ژماری نوێ',
+'createaccount'           => 'ھەژمار دروست بکە',
 'gotaccount'              => 'خاوه‌نی هه‌ژماری خۆتی؟ $1.',
 'gotaccountlink'          => 'چوونه‌ ژووره‌وه‌',
 'createaccountmail'       => 'به‌ پۆستی ئه‌لیكترۆنی',
 'badretype'               => 'وشه‌ نهێنییه‌كان له‌یه‌ك ناچن',
-'userexists'              => 'ئه‌و ناوه‌ی تۆ داوته‌ پێشتر كه‌سێكی دیكه‌ به‌كاری بردووه‌',
-'youremail'               => 'پۆستی ئه‌لیكترۆنی خۆت*',
+'userexists'              => 'ئەو ناوەی تۆ داوتە پێشتر کەسێکی دیکە بەکاری بردووە.
+ناوێکی دیکە ھەڵبژێرە.',
+'youremail'               => 'E-mail:',
 'username'                => 'ناوی به‌كارهێنه‌ر:',
 'uid'                     => 'ژماره‌ی خۆت ID:',
-'yourrealname'            => 'ناوی ڕاستی خۆت*',
+'prefs-memberingroups'    => 'ئەندامی {{PLURAL:$1|گرووپی|گرووپەکانی}}:',
+'yourrealname'            => 'ناوی ڕاستی:',
 'yourlanguage'            => 'زمان',
-'yourvariant'             => 'ڕه‌گه‌ز',
+'yourvariant'             => 'زاراوە:',
 'yournick'                => 'نازناو',
 'badsig'                  => 'ئیمزاكه‌ هه‌ڵه‌یه‌، ته‌ماشای كۆدی HTML بكه‌‌',
-'emailauthenticated'      => 'پۆستی ئه‌لیكترۆنی ناسراو: $1.',
+'email'                   => 'E-mail',
+'prefs-help-realname'     => 'ناوی ڕاستی دڵخوازە.
+ئەگەر پێت خۆش بێت بیدەی، زۆرتر ڕاتدەکێشێت بۆ کارەکانت.',
+'loginerror'              => 'ھەڵە لە چوونە ژوورەوەدا',
+'prefs-help-email'        => 'ئەدرەسی e-mail دڵخوازە.
+�بەڵام ئەگەر تێپەڕوشەکەت لە بیر چوو، لە ڕێگەی e-mailەوە تێپەڕوشەیەکی نوێت بۆ دەنێردرێتەوە. ھەروەھا بە بەکارھێنەرانی دیکەش لە رێگەی e-mailەوە دەتوانن پەیوەندیت لەگەڵ گرن ئەگەر تۆ حەز بکەیت.',
+'loginsuccesstitle'       => 'سرەکەوتی بۆ چوونە ژوورەوە!',
+'wrongpassword'           => 'تێپەڕوشەی ھەڵە. 
+تکایە دووبارە تێبکۆشە.',
+'wrongpasswordempty'      => 'تێپەڕەوشەی لێدراو بەتاڵبوو.
+تکایە هەوڵ بدەوە.',
+'mailmypassword'          => 'تێپەڕوشەیەکی نوێ بنێرە بۆ E-mailەکەم',
+'passwordremindertitle'   => 'تێپەڕوشەیەکی نوێی کاتی بۆ  {{SITENAME}}',
+'noemail'                 => 'ھیچ ئەدرەسێکی e-mail تۆمار نەکراوە بۆ بەکارھێنەر  "$1" .',
+'mailerror'               => 'هەڵە ڕوویدا لە ناردنی ئیمەیل: $1',
+'emailauthenticated'      => 'ئیمەیلەکەت بە ڕاست ناسرا لە $3ی $2 دا',
+'emailnotauthenticated'   => 'ئیمەیلەکەت ھێشتا نەناسراوە.
+ھیچ ئیمەیلێک بۆ ئەم بابەتانەی خوارەوە نانێردرێت.',
 'emailconfirmlink'        => 'پۆستی ئه‌لیكترۆنی خۆت بنووسه‌',
 'accountcreated'          => 'هه‌ژماره‌كه‌ سه‌ركه‌وتووانه‌ دروست كرا',
 'loginlanguagelabel'      => 'زمان: $1',
 
 # Password reset dialog
-'resetpass_text'   => '<!-- تێپه‌ڕه‌وشه‌ی هه‌ژماره‌كه‌ س�ر بكه‌ره‌وه‌ -->',
-'resetpass_header' => 'تێپه‌ڕه‌وشه‌ س�ر بكه‌ره‌وه‌',
+'resetpass'                 => 'گۆڕینی تێپەڕوشە',
+'resetpass_text'            => '<!-- تێپه‌ڕه‌وشه‌ی هه‌ژماره‌كه‌ س�ر بكه‌ره‌وه‌ -->',
+'resetpass_header'          => 'تێپەڕوشەی ھەژمار بەتاڵ بکە',
+'oldpassword'               => 'تێپەڕوشەی پێشو:',
+'newpassword'               => 'تێپەڕوشەی نوێ:',
+'retypenew'                 => 'تێپەڕوشەی نوێ دوبارە بنووسەوە:',
+'resetpass_submit'          => 'تێپەڕوشە رێکخە و بچۆ ژوورەوە',
+'resetpass_success'         => 'تێپەروشەکەت بە سەرکەوتوویی گۆڕدرا. ئێستا چوونە ژوورەوەت...',
+'resetpass_bad_temporary'   => 'تێپەڕوشەی کاتی ھەڵەیە.
+وا دیارە تێپەڕوشەکەت بە سەرکەوتوویی گۆڕدراوە یان داوای تێپەڕوشەیەکی نوێت کردووە.',
+'resetpass_forbidden'       => 'تێپەڕوشەکە ناگۆڕدرێت',
+'resetpass-no-info'         => 'بۆ گەیشتنی راستەوخۆ بەم پەڕە ئەشێ بچیتە ژوورەوە.',
+'resetpass-submit-loggedin' => 'گۆڕینی تێپەڕوشە',
+'resetpass-wrong-oldpass'   => 'تێپەڕوشەی ھەنووکەیی یان تێپەڕوشەی کاتی ھەڵەیە.
+وا دیارە تێپەڕوشەکەت بە سەرکەوتوویی گۆڕدراوە یان داوای تێپەڕوشەیەکی نوێت کردووە.',
+'resetpass-temp-password'   => 'تێپەڕوشەی کاتی:',
 
 # Edit page toolbar
-'bold_sample'    => 'ده‌قی ئه‌ستوور',
-'bold_tip'       => 'ده‌قی ئه‌ستوور',
-'italic_sample'  => 'دەقی لار',
-'italic_tip'     => 'دەقی لار',
-'link_sample'    => 'نێوی بەستەر',
-'link_tip'       => 'به‌سته‌رێكی ناوخۆیی',
-'extlink_sample' => 'http://www.example.com سەردێڕی بەستەر',
-'extlink_tip'    => 'به‌سته‌ری ده‌ره‌كی ( ده‌ست پێ ده‌كاتhttp:// سه‌ره‌تاكه‌ی به‌ )',
-'headline_tip'   => 'سەردێڕی ئاست ۲',
-'math_sample'    => 'لەگرە �ۆرموول بخەسەر',
-'math_tip'       => ' �ۆرموولی بیرکاریی (LaTeX)',
-'nowiki_sample'  => 'لەگەرە دەقی نەڕازراو تێ‌بخە',
-'nowiki_tip'     => 'لەبەرچاو نەگرتنی دارشتنەکانی ویکی',
-'image_tip'      => 'وێنەی نێو دەق',
-'media_tip'      => 'لینکی پەڕگە',
-'sig_tip'        => 'ئیمزاكه‌ت به‌ مۆری ڕێكه‌وته‌وه‌',
-'hr_tip'         => 'هێڵی ئاسۆیی (ده‌گمه‌ن به‌كاری بهێنه‌)',
+'bold_sample'     => 'ده‌قی ئه‌ستوور',
+'bold_tip'        => 'ده‌قی ئه‌ستوور',
+'italic_sample'   => 'دەقی لار',
+'italic_tip'      => 'دەقی لار',
+'link_sample'     => 'نێوی بەستەر',
+'link_tip'        => 'به‌سته‌رێكی ناوخۆیی',
+'extlink_sample'  => 'http://www.example.com سەردێڕی بەستەر',
+'extlink_tip'     => 'به‌سته‌ری ده‌ره‌كی ( ده‌ست پێ ده‌كاتhttp:// سه‌ره‌تاكه‌ی به‌ )',
+'headline_sample' => 'دەقی سەردێڕ',
+'headline_tip'    => 'سەردێڕی ئاست ۲',
+'math_sample'     => 'لەگرە �ۆرموول بخەسەر',
+'math_tip'        => ' �ۆرموولی بیرکاریی (LaTeX)',
+'nowiki_sample'   => 'لەگەرە دەقی نەڕازراو تێ‌بخە',
+'nowiki_tip'      => 'لەبەرچاو نەگرتنی دارشتنەکانی ویکی',
+'image_sample'    => 'نموونە.jpg',
+'image_tip'       => 'وێنەی نێو دەق',
+'media_sample'    => 'نموونە.ogg',
+'media_tip'       => 'لینکی پەڕگە',
+'sig_tip'         => 'ئیمزاکەت بە مۆری ڕێکەوتەوە',
+'hr_tip'          => 'هێڵی ئاسۆیی (ده‌گمه‌ن به‌كاری بهێنه‌)',
 
 # Edit pages
-'summary'                => 'پوختە',
-'subject'                => 'بابه‌ت / سه‌روتار',
+'summary'                => 'پوختە:',
+'subject'                => 'بابه‌ت / سه‌روتار:',
 'minoredit'              => 'ئەم گۆڕانکاری‌یە بچووکە',
 'watchthis'              => 'چاودێڕی ئه‌م په‌ڕه‌یه‌ بكه‌',
-'savearticle'            => 'په‌ڕه‌كه‌ پاشه‌كه‌وت بكه‌',
+'savearticle'            => 'پاشەکەوتکردنی پەرە',
 'preview'                => 'پێشبینین',
 'showpreview'            => 'پێشبینینی پەڕە',
 'showlivepreview'        => 'پێشبینینی ڕاسته‌وخۆ',
 'showdiff'               => 'گۆڕانكارییه‌كان نیشانبده‌',
+'anoneditwarning'        => "'''وشیار بە:''' نەچوویتەتە ژوورەوە.
+ئەدرەسی ئەکەت لە مێژووی ئەم پەڕە دا تۆمار دەکرێ.",
+'missingsummary'         => "'''وە بیر خستنەوە:''' پوختەیەکت نەنووسیوە بۆ چۆنیەتی گۆڕانکارییەکەت.
+ئەگەر جارێکی تر پاشکەوت کردن لێبدەی، بێ پوختە تۆمار دەکرێ.",
+'missingcommenttext'     => 'تکایە لە خوارەوە شرۆڤەیەک بنووسە.',
+'summary-preview'        => 'پێشبینینی کورتە:',
+'newarticle'             => '(نوێ)',
 'newarticletext'         => "بە دوای بەستەری پەڕەیەک کەوتووی کە ھێشتا دروست نەکراوە. <br /> بۆ دروست کردنی پەڕەکە، لە چوارچێوەکەی خوارەوە دەست کە بە تایپ کردن. (بۆ زانیاری زورتر[[یارمەتی|{{MediaWiki:Helppage}}]] ببینە). <br />  ئەگەر بە ھەڵەوە ھاتویتە ئەگرە، لە سەر دوگمەی '''back'''ی وێبگەڕەکەت کلیک کە.",
-'copyrightwarning'       => "تکایە ئاگادار بن کە ھەموو بەشدارییەک بۆ  {{SITENAME}} وا �ەرز ئەکرێت کە لە ژێر «$2» بڵاو دەبنەوە(بۆ ئاگاداری زۆرتر $1 سەیر کە). ئەگەر ناتەوێ  نوسراوەکەت بێ‌ڕەحمانە دەستکاری بکرێت و  بە دڵخواز دیسان بڵاو ببێتەوە، لەگرە پێشکەشی مەکە. <br />\\n ھەروەھا بەڵین ئەدەی کە خۆت ئەمەت نووسیوە، یان لە سەرچاوەیەکی بە دەسەڵاتی گشتی ''(public domain)'' یان سەرچاوەیەکی ھاوتا لەبەرت‌گرتوەتەو.
-<strong>«بەرھەمێک کە ما�ی لەبەرگرتنەوەی پارێزراوە، بێ ئیجازە  بڵاو مەکەرەوە.»</strong>",
+'previewnote'            => "'''لە بیرت بێت کە ئەمە تەنها پێشبینینە.
+گۆڕانکارییەکانت تا ئێستا پاشەکەوت نەکراون!'''",
+'editing'                => 'دەستکاریکردنی $1',
+'editingsection'         => 'گۆڕاندنی: $1 (بەش)',
+'editingcomment'         => 'گۆڕاندنی $1 (بەشی  نوێ)',
+'copyrightwarning'       => "تکایە ئاگادار بن کە ھەموو بەشدارییەک بۆ  {{SITENAME}} وا �ەرز ئەکرێت کە لە ژێر «$2» بڵاو دەبێتەوە (بۆ ئاگاداری زۆرتر $1 سەیر کە). ئەگەر ناتەوێ نوسراوەکەت بێ‌ڕەحمانە دەستکاری بکرێت و  بە دڵخواز دیسان بڵاو ببێتەوە، لەگرە پێشکەشی مەکە. ھەروەھا بەڵین ئەدەی کە خۆت ئەمەت نووسیوە، یان لە سەرچاوەیەکی بە دەسەڵاتی گشتی ''(public domain)'' یان سەرچاوەیەکی ھاوتا لەبەرت‌گرتوەتەو.
+'''«بەرھەمێک کە ما�ی لەبەرگرتنەوەی پارێزراوە، بێ ئیجازە  بڵاو مەکەرەوە.»'''",
+'templatesused'          => 'ئەو قاڵبانە کە لەم پەڕەیەدا بە کارھێنراون:',
+'templatesusedpreview'   => 'ئەو قاڵبانە کە لەم پێشبینینەدا بە کارھێنراون:',
+'templatesusedsection'   => 'ئەو قاڵبانە کە لەم بەشەدا بە کارھێنراون:',
+'template-protected'     => '(پارێزراو)',
 'template-semiprotected' => '(نیوەپارێزراو)',
+'deleted-notice'         => 'ئەم پەڕەیە سڕدراوەتەوە.
+لۆگی سڕینەوە بۆ پەڕەکە لە خوارەوە دابینکراوە.',
 
 # History pages
-'revisionasof' => 'وەک بینینەوەی $1',
-'cur'          => 'ئێستا',
-'last'         => 'پێشوو',
-'histlegend'   => 'وەشانەکان بۆ ھەڵسەنگاندن دیاری بکە و ئەم دوگمەی خوارەوە لێبدە. <br />
+'viewpagelogs'           => 'لۆگەکانی ئەم پەڕەیە ببینە',
+'revisionasof'           => 'وەک بینینەوەی $1',
+'previousrevision'       => '�پیاچوونەوەی کۆنتر',
+'nextrevision'           => 'پیاچوونەوەی نوێتر→',
+'currentrevisionlink'    => 'پیاچوونەوەی ئێستا',
+'cur'                    => 'ئێستا',
+'last'                   => 'پێشوو',
+'histlegend'             => 'وەشانەکان بۆ ھەڵسەنگاندن دیاری بکە و ئەم دوگمەی خوارەوە لێبدە. <br />
 ڕێنمایی:
 (ئێستا) = جیاوازی لەگەڵ وەشانی ئێستا،
 (پێشوو) =جیاوازی لەگەڵ وەشانی پێشوو،
 ب = گۆڕانکاریی بچووک',
-'histfirst'    => 'کۆنترین',
-'histlast'     => 'نوێترین',
+'history-fieldset-title' => 'گەشتی مێژوو',
+'deletedrev'             => '[سڕاو]',
+'histfirst'              => 'کۆنترین',
+'histlast'               => 'نوێترین',
+'historysize'            => '({{PLURAL:$1|1 بایت|$1 بایت}})',
+'historyempty'           => '(پووچ)',
+
+# Revision feed
+'history-feed-title'          => 'مێژووی پیاچوونەوە',
+'history-feed-description'    => 'مێژووی پیاچوونەوە بۆ ئەم پەڕە لە ویکییەکە',
+'history-feed-item-nocomment' => '$1 Ù„Û• $2', # user at time
+
+# Revision deletion
+'rev-delundel'   => 'پیشاندان/شاردنەوە',
+'revdel-restore' => 'چۆنیەتی دەرکەوتن بگۆڕە',
+
+# Merge log
+'revertmerge' => 'لەیەک جیاکردنەوە',
 
 # Diffs
 'difference'              => '(جیاوازی نێوان پیاچوونەوەکان)',
 'lineno'                  => 'ھێڵی  $1:',
 'compareselectedversions' => 'ھەڵسەنگاندنی وەشانە ھەڵبژاردراوەکان',
+'editundo'                => 'پاشگەزبوونەوە',
 
 # Search results
-'noexactmatch' => "'''ھیچ پەڕەیەک ھەر بەم سەردێڕەوە نیە.''' 
-ئێستە دەتوانی ئەم پەڕە دروست بکەیت",
-'powersearch'  => 'بە ھێز بگەڕە',
+'searchresults'             => 'ئەنجامەکانی گەڕان',
+'searchresults-title'       => 'ئەنجامەکانی گەڕان بۆ "$1"',
+'searchresulttext'          => 'بۆ زانیاری زیاتر دەربارەی گەڕان {{SITENAME}} ، بڕوانە لە  [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'            => 'گەڕایت بۆ \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|هەموو ئەو پەڕانەی دەستپێدەکەن بە "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|هەموو ئەو پەڕانەی بەستەرکراون بۆ "$1"]])',
+'searchsubtitleinvalid'     => "گەڕایت بۆ '''$1'''",
+'noexactmatch'              => "'''پەڕەیەک بە ناوی  \"\$1\"ەوە نیە.'''
+دەتوانی ئەم پەڕە [[:\$1|دروست بکەیت]].",
+'noexactmatch-nocreate'     => "'''هیچ پەڕەیەک نییە بە ناونیشانی \"\$1\".'''",
+'notitlematches'            => 'لە نێو سەردێڕەکان نەبینرا',
+'notextmatches'             => 'لە دەقی نووسراوەکان دا نەبینرا',
+'prevn'                     => '$1ی پێشوو',
+'nextn'                     => '$1ی دواتر',
+'viewprevnext'              => '($1) ($2) ($3) ببینە',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 وشە|$2 وشە}})',
+'search-redirect'           => '(ئاڵوگۆڕ $1)',
+'search-section'            => '(بەشی $1)',
+'search-suggest'            => 'ئایا مەبەستت ئەمە بوو: $1',
+'search-interwiki-caption'  => 'پرۆژە خوشکەکان',
+'search-interwiki-default'  => '$1 ئەنجام:',
+'search-interwiki-more'     => '(زیاتر)',
+'search-mwsuggest-enabled'  => 'بە پێشنیارەکانەوە',
+'search-mwsuggest-disabled' => 'بێ پێشنیار',
+'showingresults'            => "لە خوارەوە {{PLURAL:$1|'''1''' ئەنجام|'''$1''' ئەنجام}} ئەبینن کە بە #'''$2'''ەوە دەست پێ‌ئەکات .",
+'showingresultsnum'         => "لە خوارەوە {{PLURAL:$1|'''1''' ئەنجام|'''$1''' ئەنجام}} ئەبینن کە بە #'''$2'''ەوە دەست پێ‌ئەکات .",
+'showingresultstotal'       => "نیشاندان لە خوارەوە{{PLURAL:$4|result '''$1''' of '''$3'''|ئاکامەکان '''$1 - $2''' of '''$3'''}}",
+'powersearch'               => 'بە ھێز بگەڕە',
+'powersearch-legend'        => 'گەڕانی پێشکەوتوو',
+'powersearch-ns'            => 'لە namespace بگەڕە:',
+'powersearch-redir'         => 'گواستنەوەکانی لیست',
+'powersearch-field'         => 'گەڕان بۆ',
 
 # Preferences page
-'mypreferences' => 'ھەڵبژاردەکانی من',
+'preferences'              => 'ھەڵبژاردەکان',
+'mypreferences'            => 'ھەڵبژاردەکانی من',
+'prefs-edits'              => 'ژمارەی گۆڕانکارییەکان:',
+'changepassword'           => 'تێپەڕوشە بگۆڕە',
+'skin'                     => 'پێستە',
+'skin-preview'             => 'پێش بینین',
+'math'                     => 'بیرکاری',
+'dateformat'               => 'ڕازاندەوەی ڕێکەوت',
+'datedefault'              => 'ھەڵنەبژێردراو',
+'datetime'                 => 'کات و ڕێکەوت',
+'prefs-personal'           => 'پرۆ�ایلی بەکارھێنەر',
+'prefs-rc'                 => 'دوایین گۆڕانکارییەکان',
+'prefs-watchlist'          => 'لیستی چاودێڕییەکان',
+'prefs-watchlist-days'     => 'ژمارە ڕۆژە نیشاندراوەکان لە لیستی چاودێڕییەکان:',
+'prefs-watchlist-days-max' => '(ئه‌وپه‌ڕی 7 ڕۆژە)',
+'prefs-misc'               => 'جۆراوجۆر',
+'prefs-resetpass'          => 'تێپەڕوشە بگۆڕە',
+'saveprefs'                => 'پاشکەوت',
+'resetprefs'               => 'گۆڕانکارییە پاشکەوت نەکراوەکان پاک بکەرەوە',
+'textboxsize'              => 'دەستکاری کردن',
+'prefs-edit-boxsize'       => 'قەبارەی پەنجەرەی گۆڕانکاری.',
+'rows'                     => 'ڕێز:',
+'columns'                  => 'ستوون:',
+'searchresultshead'        => 'گەڕان',
+'timezonelegend'           => 'کاتی ھەرێمی',
+'timezonetext'             => '¹ ژمارە ئەو کاتژمێرانە کە کاتی ھەرێمیت لەگەڵ کاتی server (UTC)، ئیختیلا�ی ھەیە.',
+'localtime'                => 'کاتی ناوچەیی:',
+'timezoneoffset'           => 'جیاوازی¹:',
+'servertime'               => 'کاتی server:',
+'guesstimezone'            => 'لە وێبگەڕەکە browser بیگرە',
+'allowemail'               => 'لە بەکارھێنەرانی دیکەوە e-mail قەبووڵ دەکەم',
+'prefs-searchoptions'      => 'ھەڵبژاردەکانی گەڕان',
+'prefs-namespaces'         => 'بۆشایییەکانی ناو',
+'defaultns'                => 'لە حاڵەتی بنەڕەت لەم بۆشایی ناوانەدا بگەڕە:',
+'default'                  => 'بنچینەیی',
+'files'                    => 'پەڕگەکان',
+
+# Groups
+'group-sysop'      => 'بەڕێوبەران',
+'group-bureaucrat' => 'بورووکراتەکان',
+
+'group-user-member' => 'بەکارھێنەر',
+
+'grouppage-user'  => '{{ns:project}}:بەکارھێنەران',
+'grouppage-sysop' => '{{ns:project}}:بەڕێوبەران',
+
+# User rights log
+'rightslog' => 'لۆگی ما�ەکانی بەکارهێنەر',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'دەستکاری ئەم پەڕەیە بکە',
 
 # Recent changes
-'recentchanges'   => 'دوایین گۆڕانکارییەکان',
-'rcnote'          => "لە خوارەوەدا {{PLURAL:$1|'''۱''' گۆڕانکاری |دوایین '''$1''' گۆڕانکارییەکان}} لە دوایین {{PLURAL:$2|ڕۆژ|'''$2''' ڕۆژەوە}} ، تا $5، $4 دەبینن.",
-'diff'            => 'جیاوازی',
-'hist'            => 'مێژوو',
-'hide'            => 'شاردنەوە',
-'show'            => 'نیشان بە',
-'minoreditletter' => 'ور',
-'newpageletter'   => 'Ù†',
-'boteditletter'   => 'Ú•',
+'recentchanges'        => 'دوایین گۆڕانکارییەکان',
+'recentchanges-legend' => 'هەڵبژاردنەکانی دوا گۆڕانکارییەکان',
+'rcnote'               => "لە خوارەوەدا {{PLURAL:$1|'''۱''' گۆڕانکاری |دوایین '''$1''' گۆڕانکارییەکان}} لە دوایین {{PLURAL:$2|ڕۆژ|'''$2''' ڕۆژەوە}} ، تا $5، $4 دەبینن.",
+'rclistfrom'           => 'گۆڕانکارییە نوێکان کە لە $1ەوە دەست پێدەکەن نیشان بدە.',
+'rcshowhideminor'      => '$1 دەستکارییە بچووکەکان',
+'rcshowhidebots'       => 'ڕۆبۆتەکان $1',
+'rcshowhideliu'        => 'بەکارھێنەرە لە ژوورەکان $1',
+'rcshowhideanons'      => 'بەکارھێنەرە نەناسراوەکان $1',
+'rcshowhidepatr'       => 'گۆرانکارییە کۆنترۆڵکراوەکان $1',
+'rcshowhidemine'       => '$1 دەستکارییەکانم',
+'rclinks'              => 'دوایین $1 گۆڕانکارییەکانی دوایین $2 ڕۆژی <br />$3',
+'diff'                 => 'جیاوازی',
+'hist'                 => 'مێژوو',
+'hide'                 => 'بشارەوە',
+'show'                 => 'نیشان بدە',
+'minoreditletter'      => 'ب',
+'newpageletter'        => 'Ù†',
+'boteditletter'        => 'Ú•',
+'rc-enhanced-expand'   => 'وردەکارییەکان پیشان بدە (پێویستی بە جاڤاسکریپتە)',
+'rc-enhanced-hide'     => 'وردەکارییەکان بشارەوە',
 
 # Recent changes linked
-'recentchangeslinked' => 'گۆڕانکارییە پەیوەندی‌دارەکان',
+'recentchangeslinked'         => 'گۆڕانکارییە پەیوەندی‌دارەکان',
+'recentchangeslinked-title'   => 'گۆڕانکارییە پەیوەندیدارەکان بە "$1" ـەوە',
+'recentchangeslinked-summary' => "Ev rûpela taybetî guherandinên dawî ji rûpelên lînkkirî nîşandide.
+ئەو پەڕانە کە لە [[Special:Watchlist|لیستی چاودێڕییەکانت]]دان '''ئەستوورن'''",
+'recentchangeslinked-page'    => 'ناوی پەڕە:',
 
 # Upload
-'upload' => 'وێنەیەک بار بکە',
+'upload'             => 'پەڕگەیەک بار بکە',
+'uploadbtn'          => 'پەڕگە بار بکە',
+'reupload'           => 'دیسان بار بکە',
+'uploadtext'         => "�ۆرمی خوارەوە بەکاربێنن بۆ بارکردنی پەڕگە.
+بۆ بینینی ئەو پەڕگانە کە پێشتر بار کراون بڕۆ بۆ [[Special:FileList|لیستی پەڕگە بارکراوەکان]]، ھەروەھا
+[[Special:Log/upload|ڕەشنووسی بارکردنەکان]] و [[Special:Log/delete|رەشنووسی سڕینەوەکان]].
 
-# Image description page
-'filehist'   => 'مێژووی پەڕگە',
-'imagelinks' => 'بەستەرەکان',
+بۆ بەکارھێنانی پەڕگەیەک لە پەڕەیەک دا، بەستەرێک بە یەکێک لەم شۆوازانەی خوارەوە بە کار بێنن:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' 
+to use the full version of the file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>'''
+to use a 200 pixel wide rendition in a box in the left margin with 'alt text' as description
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>'''
+for directly linking to the file without displaying the file",
+'upload-permitted'   => 'نەوعە پەڕگە قەبووڵ کراوەکان: $1.',
+'uploadlogpage'      => 'لۆگ باربکە',
+'filename'           => 'ناوی پەڕگە',
+'filedesc'           => 'پوختە',
+'fileuploadsummary'  => 'پوختە:',
+'filestatus'         => 'بارودۆخی ما�ی لەبەرگرتنەوە:',
+'filesource'         => 'سەرچاوە:',
+'ignorewarnings'     => 'گوێ مەدە بە ئاگادارییەکان',
+'uploadwarning'      => 'ئاگادارییەکانی بارکردن',
+'savefile'           => 'پەڕگە پاشەکەوت بکە',
+'uploadedimage'      => '"[[$1]]" بار کراو',
+'overwroteimage'     => 'وەشانێ نوێی "[[$1]]" بار کرا',
+'uploaddisabled'     => 'بارکردن قەدەخە کراوە',
+'sourcefilename'     => 'ناوی پەڕگەی سەرچاوە:',
+'destfilename'       => 'ناوی مەبەست:',
+'upload-maxfilesize' => 'ئەو پەری قەبارەی �ایل: $1',
+'watchthisupload'    => 'چاودێڕی ئەم پەڕە بکە',
+
+# Special:ListFiles
+'imgfile'        => 'Ù¾Û•Ú•Ú¯Û•',
+'listfiles'      => 'لیستی پەرگەکان',
+'listfiles_date' => 'ڕێکەوت',
+'listfiles_name' => 'ناو',
+'listfiles_user' => 'بەکارھێنەر',
+
+# File description page
+'filehist'                  => 'مێژووی پەڕگە',
+'filehist-current'          => 'هەنووکە',
+'filehist-datetime'         => 'ڕێکەوت/کات',
+'filehist-user'             => 'بەکارهێنەر',
+'filehist-dimensions'       => 'دوورییەکان',
+'filehist-comment'          => 'لێدوان',
+'imagelinks'                => 'بەستەرەکانی پەڕگە',
+'shareduploadwiki-linktext' => 'پەڕەی پەسنی پەڕگە',
+'uploadnewversion-linktext' => 'وەشانێکی نوێی ئەم پەڕەیە بار بکە',
+
+# Unused templates
+'unusedtemplates' => 'قاڵبە بە کار نەھێراوەکان',
 
 # Random page
 'randompage' => 'پەڕەیەک بە ھەرەمەکی',
 
+# Statistics
+'statistics'              => 'ئامارەکان',
+'statistics-header-pages' => 'ئامارەکانی پەڕەکان',
+'statistics-header-edits' => 'ئامارەکانی گۆڕانکارییەکان',
+'statistics-header-views' => 'ئامارەکانی سەردانەکان',
+'statistics-header-users' => 'ئامارەکانی بەکارھێنەران',
+'statistics-articles'     => 'پەڕە بە ناوەڕۆکەکان',
+'statistics-pages'        => 'پەڕەکان',
+
+'disambiguations' => 'پەڕەکانی جوداکردنەوە (لێڵی لابەر)',
+
+'withoutinterwiki' => 'پەڕەکان کە بەستەرەکانی زمانیان نییە',
+
 # Miscellaneous special pages
-'nbytes'   => '$1 {{PLURAL:$1|بایت|بایت}}',
-'newpages' => 'پەڕە نوێکان',
-'move'     => 'ناوی ئەم پەڕە بگۆڕە',
+'nbytes'                  => '$1 {{PLURAL:$1|بایت|بایت}}',
+'ncategories'             => '$1 {{PLURAL:$1|ھاوپۆل|ھاوپۆل}}',
+'nlinks'                  => '$1 {{PLURAL:$1|بەستەر|بەستەر}}',
+'nmembers'                => '$1 {{PLURAL:$1|ئەندام|ئەندام}}',
+'nrevisions'              => '$1 {{PLURAL:$1|پیاچوونەوە|پیاچوونەوە}}',
+'nviews'                  => '$1 جار {{PLURAL:$1|بینراو|بینراو}}',
+'uncategorizedpages'      => 'پەڕە بێ ھاوپۆلەکان',
+'uncategorizedcategories' => 'ھاوپۆلە ھاوپۆلدارنەکراوەکان',
+'uncategorizedimages'     => 'پەڕگە بێ ھاوپۆلەکان',
+'uncategorizedtemplates'  => 'قاڵبە بێ ھاوپۆلەکان',
+'unusedcategories'        => 'ھاوپۆلە بەکارنەھێنراوەکان',
+'unusedimages'            => 'پەڕگە بەکارنەھێنراوەکان',
+'popularpages'            => 'پەڕە مەحبووبەکان',
+'wantedcategories'        => 'ھاوپۆلە داواکراوەکان',
+'wantedpages'             => 'پەڕە داواکراوەکان',
+'wantedfiles'             => 'پەڕگە داواکراوەکان',
+'wantedtemplates'         => 'قاڵبە داواکراوەکان',
+'mostcategories'          => 'پەڕەکان بە زۆرترین ھاوپۆلەوە',
+'prefixindex'             => 'هەموو پەڕەکان بە prefix ـەوە',
+'shortpages'              => 'پەڕە کورتەکان',
+'longpages'               => 'پەڕە دڕێژەکان',
+'newpages'                => 'پەڕە نوێکان',
+'ancientpages'            => 'کۆنترین پەڕەکان',
+'move'                    => 'ناوی ئەم پەڕە بگۆڕە',
+'movethispage'            => 'ئەم پەڕەیە بگوازەوە',
+'pager-newer-n'           => '{{PLURAL:$1|نوێتر 1|نوێتر $1}}',
+'pager-older-n'           => '{{PLURAL:$1|کۆنتر 1|کۆنتر $1}}',
+
+# Book sources
+'booksources'               => 'سەرچاوەکانی کتێب',
+'booksources-search-legend' => 'بۆ سەرچاوەی کتێب بگەڕێ',
+'booksources-go'            => 'بڕۆ',
+
+# Special:Log
+'log' => 'لۆگەکان',
 
 # Special:AllPages
-'allarticles' => 'ھەمووی وتارەکان',
+'allpages'       => 'ھەموو پەڕەکان',
+'alphaindexline' => '$1 تا $2',
+'nextpage'       => 'پەڕەی پاشەوە ($1)',
+'prevpage'       => 'پەڕەی پێشەوە ($1)',
+'allpagesfrom'   => 'بینینی پەڕەکان بە دەست پێ کردن لە:',
+'allarticles'    => 'ھەمووی وتارەکان',
+'allpagesprev'   => 'Ù¾ÛŽØ´',
+'allpagesnext'   => 'پاش',
+'allpagessubmit' => 'بڕۆ',
 
 # Special:Categories
 'categories' => 'هاوپۆله‌كان',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'بەشدارییە بەکارھێنەریە سڕاوەکان',
+
+# Special:LinkSearch
+'linksearch' => 'بەستەرە دەرەکییەکان',
+
+# Special:Log/newusers
+'newuserlog-create-entry' => 'بەکارھێنەری نوێ',
+
+# Special:ListGroupRights
+'listgrouprights'         => 'ما�ەکانی گرووپە بەکارھێنەرییەکان',
+'listgrouprights-members' => '(لیستی ئەندامەکان)',
+
 # E-mail user
-'emailuser' => 'بۆ ئەم بەکارھێنەرە E-Mail بنێرە',
+'emailuser'       => 'بۆ ئەم بەکارھێنەرە E-Mail بنێرە',
+'emailfrom'       => 'Ù„Û•:',
+'emailto'         => 'بۆ:',
+'emailsubject'    => 'بابەت:',
+'emailmessage'    => 'نامە:',
+'emailsend'       => 'بینێرە',
+'emailccme'       => 'کۆپییەک لە نامەکە بنێرە بۆ ئیمەیلەکەم.',
+'emailccsubject'  => 'کۆپیی نامەکەت بۆ $1: $2',
+'emailsent'       => 'نامەکەت ناردرا',
+'emailsenttext'   => 'نامەکەت ناردرا',
+'emailuserfooter' => 'ئەم ئیمەیلە لە $1ەوە ناردرا بۆ $2 بە "Email user" لە {{SITENAME}}ەوە.',
 
 # Watchlist
-'mywatchlist' => 'لیستی چاودێڕی‌یەکانم',
-'watch'       => 'چاودێڕی بکە',
+'watchlist'            => 'لیستی چاودێڕییەکانی من',
+'mywatchlist'          => 'لیستی چاودێڕی‌یەکانم',
+'watchlistfor'         => "(بۆ '''$1''')",
+'nowatchlist'          => 'لە لیستی چاودێڕییەکانتدا ھیچ نیە.',
+'watchnologin'         => 'لە ژوورەوە نیت.',
+'addedwatch'           => 'بە لیستی چاودێڕییەکانت زێدە کرا',
+'removedwatch'         => 'لە لیستی چاودێڕییەکانت لابرا',
+'watch'                => 'چاودێڕی بکە',
+'watchthispage'        => 'چاودێڕیی ئەم پەڕە بکە',
+'unwatch'              => 'لابردنی چاودێڕی',
+'unwatchthispage'      => 'ئیتر چاودێڕی مەکە',
+'notanarticle'         => 'پەڕەی بێ ناوەڕۆک',
+'notvisiblerev'        => 'پیاچوونەوە سڕاوەتەوە',
+'watchnochange'        => 'لە کاتی دیاری کراو دا، بابەتە چاودێڕی کراوەکانت، دەستکاری نەکراون',
+'watchlist-details'    => '* {{PLURAL:$1|پەڕە tê|$1 پەڕە}} لە چاودێڕیەکانت، پەڕەی وتووێژەکان حسێب ناکەن',
+'wlheader-enotif'      => '* ئەکرێ بە E-mail ئاگاداری بدەی',
+'wlheader-showupdated' => "* �ئەو پەڕانە کە لە پاش دواین سەردانت دەستکاری کراون بە '''ئەستوور''' نیشان دراون",
+'watchlistcontains'    => 'لیستی چاودێڕییەکانت $1 {{PLURAL:$1|پەڕە|پەڕە}}ی تێدایە.',
+'iteminvalidname'      => "ھەڵە لەگەڵ بابەتی '$1'، ناوی نادروست...",
+'wlnote'               => "خوارەوە {{PLURAL:$1|دوایین گۆڕانکاریە|دوایین '''$1''' گۆڕانکارییەکانن}} لە دواین  {{PLURAL:$2|کاتژمێر|'''$2''' کاتژمێر}} دا.",
+'wlshowlast'           => 'نیشان دانی دوایین $1 کاتژمێری، $2 ڕۆژ لە $3',
+'watchlist-options'    => 'ھەڵبژاردەکانی لیستی چاودێڕییەکان',
 
 # Displayed when you click the "watch" button and it is in the process of watching
-'watching' => 'چاودێڕی...',
+'watching'   => 'چاودێڕی...',
+'unwatching' => 'لابردنی چاودێڕی...',
 
-# Delete/protect/revert
+'enotif_reset' => 'ھەمووی پەڕەکان وەک بینراو دیاری بکە',
+
+# Delete
+'deletepage'            => 'پەڕە بسڕەوەو',
+'confirm'               => 'پشتدار بکەرەوە',
+'excontent'             => "ناوەڕۆک ئەمە بو: '$1'",
+'excontentauthor'       => "ناوەڕۆک ئەمە بو: '$1'(و تەنھا بەشداریکەر  '[[Special:Contributions/$2|$2]]' بوو)",
+'exbeforeblank'         => "ناوەڕۆک بەر لە بەتاڵ کردنەوە ئەمە بوو: '$1'",
+'exblank'               => 'پەڕە خاڵی بوو',
+'delete-confirm'        => 'سڕینەوەی "$1"',
+'delete-legend'         => 'سڕینەوە',
+'historywarning'        => 'ئاگاداری: ئەم پەڕە کە ئەتەوێ بیسڕیتەوە مێژووی ھەیە',
+'deletedarticle'        => '"[[$1]]" سڕدرایەوە',
+'dellogpage'            => 'لۆگی سڕینەوە',
+'deletecomment'         => 'ھۆکاری سڕینەوە:',
+'deleteotherreason'     => 'ھۆکاری دیکە:',
+'deletereasonotherlist' => 'ھۆکاری دیکە',
+
+# Rollback
 'rollbacklink' => 'گەڕاندنەوە',
 
+# Protect
+'protectlogpage'              => 'لۆگی پاراستن',
+'protectedarticle'            => 'پارێزراو[[$1]]',
+'modifiedarticleprotection'   => 'ئاستی پاراستنی "[[$1]]"ی گۆڕا',
+'unprotectedarticle'          => '"[[$1]]" لە حاڵی ئێستا دا نەپازراوە',
+'movedarticleprotection'      => 'ڕێککارییەکانی پاراستن لە  "[[$2]]" گوازرایەوە بۆ "[[$1]]"',
+'protect-title'               => 'ئاستی پاراستنی "$1" بگۆڕە',
+'prot_1movedto2'              => '[[$1]] گوازراوەتەوە بۆ [[$2]]',
+'protect-backlink'            => '� $1',
+'protect-legend'              => 'پاراستن تەیید بکە',
+'protectcomment'              => 'ھۆکاری پاراستن:',
+'protectexpiry'               => 'ھەتا:',
+'protect_expiry_invalid'      => 'کاتی بەسەرچوون نادروستە:',
+'protect_expiry_old'          => 'کاتی بەسەرچوون ڕابردووە',
+'protect-unchain'             => 'ئاستەنگی ئیزنی گواستنەوە لا ببە',
+'protect-text'                => "تۆ دەتوانی لێرە ئاستی پاراستنی لاپەڕەکە ببینی وە بیگۆڕی '''<nowiki>$1</nowiki>''' .",
+'protect-locked-access'       => "ئەکانتەکەی تۆ ڕێگەی ئەوەی پێ نەدراوە کە بتوانێت ئاستی پاراستنی لاپەڕە بگۆڕێت.
+ڕێککارییەکانی ئێستای لاپەڕەکە لێرەدایە '''$1''':",
+'protect-cascadeon'           => 'ئەم لاپەڕە لە حاڵی ئێستا دا پارێزراوە چونکا لە نێو ئەم {{PLURAL:$1|لاپەڕ(ان)ە دایە کە }} حاڵەتی پاراستنی تاڤگەیی ئەو(ان) ھەڵکراوە
+
+تۆ دەتوانی ئاستی پاراستنی ئەم لاپەڕە بگۆڕی، بەڵام ئەم گۆڕانە ھیچ کاریگەر نابێت لە سەر پاراستنی تاڤگەیی',
+'protect-default'             => 'بە ھەموو بەکارھێنەران ڕێگە بدە',
+'protect-fallback'            => 'پێویستی بە ئیزنی "$1" ھەیە',
+'protect-level-autoconfirmed' => 'بەکارھێنەرانی نوێ و تۆمارنەکراو ئاستەنگ بکە',
+'protect-level-sysop'         => 'تەنھا بەڕێوەبەران (admînan)',
+'protect-summary-cascade'     => 'تاڤگەیی',
+'protect-expiring'            => 'لەم بەروارە بەسەر دەچێت $1 (UTC)',
+'protect-cascade'             => 'لاپەڕەکانی نێو ئەم لاپەتە بپارێزە (پاراستنی تاڤگەیی)',
+'protect-cantedit'            => 'ئێمە ناتوانین ئاستی پاراستنی ئەم لاپەڕە بگۆڕین، چونکا تۆ ئیجازەی گۆڕینت نیە.',
+'restriction-type'            => 'ئیزن:',
+'restriction-level'           => 'ئاستی سنووردارکردن:',
+
+# Undelete
+'undeletelink'     => 'گێڕاندنەوە',
+'undeletedarticle' => '"[[$1]]" گێڕدرایەوە',
+
 # Namespace form on various pages
+'namespace'      => 'بۆشاییی ناو',
 'invert'         => 'ھەڵبژاردەکان پێچەوانە بکە',
 'blanknamespace' => '(سەرەکی)',
 
 # Contributions
-'mycontris' => 'بەشدارییەکانی من',
+'contributions'       => 'بەشدارییەکانی بەکارھێنەر',
+'contributions-title' => 'بەشدارییەکانی بەکارھێنەر $1',
+'mycontris'           => 'بەشدارییەکانی من',
+'contribsub2'         => 'بۆ$1 ($2)',
+'uctop'               => '(لوتکە)',
+'month'               => 'لە مانگی (و پێشترەوە):',
+'year'                => 'لە ساڵی (و پێشترەوە):',
+
+'sp-contributions-newbies'     => 'تەنھا بەشدارییەکانی بەکارھێنەرە تازەکان نیشان بدە',
+'sp-contributions-newbies-sub' => 'لە بەکارھێنەرە تازەکانەوە',
+'sp-contributions-blocklog'    => 'لۆگی بلۆککردن',
+'sp-contributions-search'      => 'گەڕین بۆ بەشدارییەکان',
+'sp-contributions-username'    => 'ئەدرەسی IP یان بەکارھێنەر:',
+'sp-contributions-submit'      => 'بگەڕە',
 
 # What links here
-'whatlinkshere'       => 'بەسراوەکان بە ئێرەوە',
-'whatlinkshere-links' => '� بەستەرەکان',
+'whatlinkshere'           => 'بەسراوەکان بە ئێرەوە',
+'whatlinkshere-title'     => 'ئەو پەڕانەی بەستەرکراون بۆ "$1"',
+'whatlinkshere-page'      => 'Ù¾Û•Ú•Û•:',
+'isimage'                 => 'بەستەری وێنە',
+'whatlinkshere-links'     => '� بەستەرەکان',
+'whatlinkshere-hidelinks' => '$1 بەستەر',
+'whatlinkshere-filters'   => 'پاڵێوەرەکان',
 
 # Block/unblock
-'blocklink' => 'بەربەستن',
+'blockip'                  => 'بەکارھێنەر ئاستەنگ بکە',
+'ipboptions'               => '2 کاتژمێر:2 hours,1 ڕۆژ:1 day,3 ڕۆژ:3 days,1 ھە�تە:1 week,2 ھە�تە:2 weeks,1 مانگ:1 month,3 مانگ:3 months,6 مانگ:6 months,1 ساڵ:1 year,بێ سنوور:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'           => 'دیکە',
+'blocklink'                => 'بەربەستن',
+'unblocklink'              => 'لابردنی ئاستەنگ',
+'change-blocklink'         => 'گۆڕاندنی ئاستەنگ',
+'contribslink'             => 'بەشداری',
+'blocklogpage'             => 'لۆگی بلۆککردن',
+'block-log-flags-nocreate' => 'دروستکردنی هەژمار ناچالاککراوە',
+
+# Move page
+'movepagetext'   => "لە ڕێگەی ئەم �ۆرمەی خوارەوە ناوی پەڕە دەگۆڕدرێت، وە ھەموو مێژووەکەی دەگوازێتەوە بۆ ناوی نوێ.
+ئەگەر لە بەشی گەڕان ناوە کۆنەکەی پێ بدەی بە شێوەی خۆکار پەڕەکە دەگوازرێتەوە بۆ ناوە نوێکە .
+تۆ دەتوانی ئەو بەستەری ئاڵوگۆرانە بگۆڕی کە بەشێوەی خۆکار دەچێنە سەر لاپەڕەی ئەسڵی
+ئەگەر ناتەوێت ئەم کارە بکەی، دڵنیا بە کە [[Special:DoubleRedirects|دوبلەکان]]   یان [[Special:BrokenRedirects|شکاوەکان]] تاقی بکەیتەوە.
+تۆ دەتوانی ئەو بەستەری ئاڵوگۆرانە تازە بکەیتەوە کە بەشێوەی خۆکار دەچێنە سەر لاپەڕەی ئەسڵی
+ئەگەر ناتەوێت ئەم کارە بکەی، دڵنیا بە کە [[Special:DoubleRedirects|دوبلەکان]]   یان [[Special:BrokenRedirects|شکاوەکان]] تاقی بکەیتەوە.
+تۆ بەرپرسیاری دڵنیا ببیتەوە لەوەی کە بەستەرەکان دەچنە سەر خاڵێک کە چاوەروان دەکرێت بچنە ئەوێ.
+
+دەبێت بزانی کە ئەگەر پێشتر لاپەڕەیەک بەم ناوە ھەبێت لاپەڕەکە ناگوازرێتەوە، مەگەر ئەوەی کە لاپەڕەکە بەتاڵ بێت یان ئاڵوگۆر بێت وە ھیچ مێژووی گۆڕاندنی پێشووی نەبێت.
+
+ئەمە بەو واتایە کە ئەگەر ھەڵەیەک بکەی دەتوانی ناوی لاپەڕەکە دیسانەوە بگۆڕی بۆ ناوی پێشووی، وە ناتوانی بیخەیە جێگەی پەڕەیەک کە ھەنووکە ھەیە.
+
+'''ئاگاداریی'''
+ئەمە دەتوانێت گۆڕانێکی زۆر نابەجێ و چاوەڕوانەکراو بێت لە لاپەڕەیەکی ناسراو؛
+تکایە پێش گۆڕینی ناو باش بیر لە ئاکامەکەی بکەوە.",
+'movearticle'    => 'ئەم لاپەڕە بگوازەوە:',
+'newtitle'       => 'بۆ ناوێکی نوێ:',
+'move-watch'     => 'ئەم لاپەڕە چاودێری بکە',
+'movepagebtn'    => 'ئەم لاپەڕە بگوازەوە',
+'pagemovedsub'   => 'گواستنەوە بە سەرکەوتوویی جێبەجێ کرا',
+'movepage-moved' => '<big>\'\'\'"$1" گوازراوەتەوە بۆ "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'  => 'لاپەڕەیەک بەم ناوە ھەیە، یان ئەو ناوەی تۆ ھەڵتبژاردووە بایەخدار نیە.
+تکایە ناوێکی دیکە ھەڵبژێرە',
+'movedto'        => 'بوو بە',
+'movetalk'       => 'پەڕەی گو�توگۆکەشی بگۆزەرەوە',
+'movelogpage'    => 'لۆگ بگوازەوە',
+'movereason'     => 'بە ھۆی:',
+'revertmove'     => 'پێچەوانەکردنەوە',
+
+# Export
+'export' => 'پەڕەکان هەناردە بکە',
 
 # Thumbnails
 'thumbnail-more' => 'گەورە کردنەوە',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'په‌ڕه‌ی تایبه‌تی خۆم',
+'tooltip-pt-userpage'             => 'پەڕە شەخسییەکەت',
+'tooltip-pt-mytalk'               => 'پەڕەی وتوبێژی تۆ',
+'tooltip-pt-preferences'          => 'بژاردەکانت',
+'tooltip-pt-watchlist'            => 'لیستی ئەو لاپەرانی کە چاودێری گۆڕانکارییەکانیان دەکەی',
+'tooltip-pt-mycontris'            => 'لیستی بەشدارییەکانت',
+'tooltip-pt-login'                => 'هاندەدرێیت کە بچیتە ژوورەوە؛ هەرچەندە، پێویست نییە',
+'tooltip-pt-logout'               => 'دەرچوون',
+'tooltip-ca-talk'                 => 'گ�توگۆ دەربارەی ناوەڕۆکی پەرە',
+'tooltip-ca-edit'                 => 'ئەتوانی دەستکاری ئەم پەڕەیە بکەیت.
+تکایە دوگمەی پێشبینین بەکارببە پێش پاشەکەوتکردن.',
+'tooltip-ca-addsection'           => 'بەشێکی نوێ دەست پێ بکە',
+'tooltip-ca-viewsource'           => 'ئەم پەڕەیە پارێزراوە.
+ئەتوانی سەرچاوەکەی ببینیت',
+'tooltip-ca-history'              => 'وەشانەکانی پێشووی ئەم پەڕەیە',
+'tooltip-ca-protect'              => 'ئەم پەڕەیە بپارێزە',
+'tooltip-ca-delete'               => 'ئەم پەڕەیە بسڕەوە',
+'tooltip-ca-move'                 => 'ئەم پەڕەیە بگوازەوە',
+'tooltip-ca-watch'                => 'ئەم پەڕە بخە سەر لیستی چاودێریت',
+'tooltip-search'                  => 'لە {{SITENAME}} بگەڕێ',
+'tooltip-search-go'               => 'بڕۆ بۆ پەڕەیەک کە بە تەواوەتی ئەم ناوەی تیادایە ئەگەر هەبێت',
+'tooltip-search-fulltext'         => 'لە پەڕەکاندا بگەڕێ بۆ ئەم دەقە',
+'tooltip-n-mainpage'              => 'بینینی پەڕەی دەستپێک',
+'tooltip-n-portal'                => 'دەربارەی پڕۆژەکە، چی ئەتوانی بکەیت، لە کوێ شتەکان بدۆزیتەوە',
+'tooltip-n-currentevents'         => 'زانیاری پێشینە بەدەست بھێنە دەربارەی بۆنە ھەنووکەییەکان',
+'tooltip-n-recentchanges'         => 'لیستی دوایین گۆڕانکارییەکان لەم ویکییەدا',
+'tooltip-n-randompage'            => 'پەڕەیەکی ڕەمەکی پیشان بدە',
+'tooltip-n-help'                  => 'شوێنێک بۆ دۆزینەوەی',
+'tooltip-t-whatlinkshere'         => 'لیستی هەموو ئەو پەڕانەی ویکی کە بەستەرکراون بۆ ئێرە',
+'tooltip-t-recentchangeslinked'   => 'دوایین گۆڕانکارییەکان لەو پەڕانە کە بەگرەوە گرێ دراون',
+'tooltip-feed-rss'                => 'RSS بۆ ئەم گۆڕانکارییەکانی ئەم پەڕە',
+'tooltip-feed-atom'               => 'Atom feed بۆ ئەم گۆڕانکارییەکانی ئەم پەڕە',
+'tooltip-t-contributions'         => 'بینینی بەشدارییەکانی ئەم بەکارھێنەرە',
+'tooltip-t-emailuser'             => 'ئیمەیلێک بنێرە بۆ ئەم بەکارھێنەرە',
+'tooltip-t-upload'                => 'پەڕگەیەک (�ایل) بار بکە',
+'tooltip-t-specialpages'          => 'لیستی ھەموو پەڕە تایبەتەکان',
+'tooltip-t-print'                 => 'وەشانی چاپی ئەم پەڕەیە',
+'tooltip-t-permalink'             => 'گرێدەری ھەمیشەیی بۆ ئەم وەشنەی ئەم پەڕەیە',
+'tooltip-ca-nstab-main'           => 'بینینی پەڕەی ناوەڕۆک',
 'tooltip-ca-nstab-user'           => 'پەڕەی بەکارھێنەر تەماشا بکە',
+'tooltip-ca-nstab-media'          => 'پەڕەی میدیا چاو لێ بکە',
+'tooltip-ca-nstab-special'        => 'ئەمە پەڕەیەکی تایبەتە، ناتوانی ئەم پەڕە خۆی دەستکاری بکەیت',
+'tooltip-ca-nstab-project'        => 'بینینی پەڕەی پرۆژە',
+'tooltip-ca-nstab-image'          => 'بینینی پەڕەی پەڕگە',
+'tooltip-ca-nstab-mediawiki'      => 'بینینی پەیامی سیستەم',
+'tooltip-ca-nstab-template'       => 'بینینی شابلۆنەکە',
+'tooltip-ca-nstab-help'           => 'بینینی پەڕەی رێنمایی',
+'tooltip-ca-nstab-category'       => 'بینینی پەڕەی ھاوپۆلەکان',
+'tooltip-minoredit'               => 'ئەمە وەک گۆڕانکارییەکی بچووک دیاری بکە',
+'tooltip-save'                    => 'گۆڕانکارییەکانی خۆت پاشکەوت بکە',
+'tooltip-preview'                 => 'پێش بینینی گۆڕانکارییەکان، تکایە پێش پاشکەوت کردن ئەمە بەکار بھێنە',
 'tooltip-compareselectedversions' => 'جیاوازییەکانی دوو وەشانە دیاریکراوەی ئەم پەڕە ببینە.',
 
+# Skin names
+'skinname-standard'    => 'کلاسیک',
+'skinname-nostalgia'   => 'خەریبی',
+'skinname-cologneblue' => 'شینی کۆلۆن',
+'skinname-monobook'    => 'Ù…Û†Ù†Û†',
+'skinname-myskin'      => 'پێستی خۆم',
+'skinname-chick'       => 'جوجه‌',
+'skinname-simple'      => 'ساده‌',
+'skinname-modern'      => 'مۆدێڕن',
+
+# Math options
+'mw_math_png'    => 'ھەموو جارێک وەک PNG نیشان بدە',
+'mw_math_simple' => 'HTML ئەگەر ساکار بێت, ئەگەرنا PNG',
+'mw_math_html'   => 'ئەگەر بکرێ بە HTML ، ئەگەرنا بە PNG',
+
+# Browsing diffs
+'previousdiff' => '� دەستکاری کۆنتر',
+'nextdiff'     => 'دەستکاری نوێتر →',
+
 # Media information
-'show-big-image' => 'گەورە کردنەوە',
+'thumbsize'            => 'قەبارەی Thumbnail:',
+'svg-long-desc'        => '(پەڕگەی SVG، بە ناو $1 × $2 خاڵ، قەبارەی پەڕگە: $3)',
+'show-big-image'       => 'گەورە کردنەوە',
+'show-big-image-thumb' => '<small>قەبارەی ئەم پێشبینینە: $1 × $2 خاڵە</small>',
+
+# Special:NewFiles
+'newimages' => 'پێشانگای پەڕگە نوێکان',
+
+# Bad image list
+'bad_image_list' => '�ۆرمات بەم شێوەی خوارەوەیە:
+
+تەنھا ئەو بابەتانەی کە کە لیست کراون (واتە ئەو دێڕانەی بە * دەست پێ دەکەن) لێک ئەدرێتەوە.
+یەکەم بەستەر لە سەر دێڕێک دەبێت بەستەری �ایلێکی خراپ بێت.
+ھەموو بەستەرەکانی دوای ئەو کە لەسەر ھەمان دێڕن وەکوو نائاسایی دێتە ھەژمار، واتە ئەو لاپەڕانەی کە ڕەنگە تێدا �ایل بە شێوەی ئینلاین بێت',
+
+# Variants for Kurdish language
+'variantname-ku-arab' => 'ئەل�وبێی عەرەبی',
+'variantname-ku-latn' => 'ئەل�وبێی لاتینی',
 
 # Metadata
-'metadata-help'   => 'ئەم پەڕگە زانیاری زێدەی ھەیە، کە لەوە دەچێت کامێرا یان ھێماگر (scanner) خستبێتیە سەری. ئەگەر پەڕگەکە لە حاڵەتی سەرەتاییەکەیەوە دەستکاری کرابێ، شایەد بڕێ لە بڕگەکان بە تەواوی زانیارەکانی وێنە گۆڕدراوەکە نیشان نەدەن.',
-'metadata-fields' => 'ئەو کێڵگە EXIFانە لەم پەیامە بە ڕیز کراون، کاتێک خشتەی metadata کۆ کراوەش بێ ھەر نیشان ئەدرێت. کێڵگەکانی تر تا خشتەکە باز نەکرێ، شاراوەن.
+'metadata-help'     => 'ئەم پەڕگە زانیاری زێدەی ھەیە، کە لەوە دەچێت کامێرا یان ھێماگر (scanner) خستبێتیە سەری. ئەگەر پەڕگەکە لە حاڵەتی سەرەتاییەکەیەوە دەستکاری کرابێ، شایەد بڕێ لە بڕگەکان بە تەواوی زانیارەکانی وێنە گۆڕدراوەکە نیشان نەدەن.',
+'metadata-expand'   => 'وردەکارییە درێژکراوەکان پیشان بدە',
+'metadata-collapse' => 'وردەکارییە درێژکراوەکان بشارەوە',
+'metadata-fields'   => 'ئەو کێڵگە EXIFانە لەم پەیامە بە ڕیز کراون، کاتێک خشتەی metadata کۆ کراوەش بێ ھەر نیشان ئەدرێت. کێڵگەکانی تر تا خشتەکە باز نەکرێ، شاراوەن.
 * make
 * model
 * datetimeoriginal
@@ -467,8 +1002,18 @@ $messages = array(
 * fnumber
 * focallength', # Do not translate list items
 
+# External editor support
+'edit-externally' => 'دەستکاری ئەم پەڕەیە بکە بە بەکارهێنانی پڕۆگرامێکی دەرەکی',
+
+# 'all' in various places, this might be different for inflected languages
+'recentchangesall' => 'ھەموو',
+'imagelistall'     => 'ھەموو',
+'watchlistall2'    => 'ھەموو',
+'namespacesall'    => 'ھەموو',
+'monthsall'        => 'هەموو',
+
 # Separators for various lists, etc.
-'semicolon-separator' => 'Ø›',
+'semicolon-separator' => 'Ø›&#32;',
 'comma-separator'     => '،&#32;',
 
 # Live preview
@@ -476,9 +1021,40 @@ $messages = array(
 'livepreview-ready'   => 'ئاماده‌یه‌',
 
 # Watchlist editor
-'watchlistedit-noitems' => 'لیستی ته‌ماشاكردنی خۆت به‌تاڵه‌',
+'watchlistedit-numitems' => 'بێجگە لە پەڕەی وتووێژەکان، لیستی چاودێڕییەکانت {{PLURAL:$1|1 بابەت|$1 بابەت}}ی تێدایە،',
+'watchlistedit-noitems'  => 'لیستی چاودێڕییەکانت ھیچ بابەتێکی تێدا نییە.',
+
+# Watchlist editing tools
+'watchlisttools-view' => 'بینینی گۆڕانکارییە پەیوەندی‌دارەکان',
+'watchlisttools-edit' => 'بینین و دەستکاری کردنی لیستی چاودێڕییەکان',
+'watchlisttools-raw'  => 'دەستکاری کردنی لیستی خامی چاودێڕییەکان',
+
+# Iranian month names
+'iranian-calendar-m1' => 'خاکەلێوە',
+'iranian-calendar-m2' => 'گوڵان',
+'iranian-calendar-m3' => 'جۆزەردان',
+'iranian-calendar-m4' => 'پووشپەڕ',
+'iranian-calendar-m5' => 'گەلاوێژ',
+'iranian-calendar-m6' => 'خەرمانان',
+
+# Special:Version
+'version' => 'وەشان', # Not used as normal message but as header for the special page itself
+
+# Special:FilePath
+'filepath'        => 'ڕێڕەوی پەڕگە',
+'filepath-page'   => 'Ù¾Û•Ú•Ú¯Û•:',
+'filepath-submit' => 'Ú•ÛŽÚ•Û•Ùˆ',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch' => 'گەڕان بۆ پەڕگە دووپات کراوەکان',
 
 # Special:SpecialPages
-'specialpages' => 'لاپەڕە تایبەتەکان',
+'specialpages'               => 'لاپەڕە تایبەتەکان',
+'specialpages-group-other'   => 'پەڕە تایبەتەکانی دیکە',
+'specialpages-group-login'   => 'چوونە ژوورەوە/ناونووسین',
+'specialpages-group-changes' => 'دوایین گۆڕانکارییەکان و ڕەشنووسەکان',
+'specialpages-group-media'   => 'گوزارشتەکان و بارکردنەکانی مێدیا',
+'specialpages-group-users'   => 'بەکارھێنەران و ما�ەمان',
+'specialpages-group-pages'   => 'لیستی پەڕەکان',
 
 );
diff --git a/languages/messages/MessagesKu_latn.php b/languages/messages/MessagesKu_latn.php
index c7eb2152..9ad01f3b 100644
--- a/languages/messages/MessagesKu_latn.php
+++ b/languages/messages/MessagesKu_latn.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Asoxor
  * @author Bangin
  * @author Erdal Ronahi
  */
@@ -17,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Bikarhêner_nîqaş',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_nîqaş',
-	NS_IMAGE            => 'Wêne',
-	NS_IMAGE_TALK       => 'Wêne_nîqaş',
+	NS_FILE             => 'Wêne',
+	NS_FILE_TALK        => 'Wêne_nîqaş',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_nîqaş',
 	NS_TEMPLATE         => 'Åžablon',
@@ -67,17 +68,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Guherandinên min ji lîsteya şopandinê veşêre',
 'tog-watchlisthidebots'       => "Guherandinên bot'an ji lîsteya şopandinê veşêre",
 'tog-watchlisthideminor'      => 'Xeyrandinên biçûk pêşneke',
+'tog-watchlisthideliu'        => 'Guherandinên bikarhênerên qeydkirî ji lîsteya şopandinê veşêre',
+'tog-watchlisthideanons'      => 'Guherandinên bikarhênerên neqeydkirî ji lîsteya şopandinê veşêre',
 'tog-nolangconversion'        => 'Konvertkirinê varîyantên zimên biskînîne',
 'tog-ccmeonemails'            => 'Kopîyan ji e-nameyan ji min ra bişîne yê min şande bikarhênerên din',
 'tog-diffonly'                => 'Li cem nîşandinê versyonan bes ferqê nîşanbide, ne rûpel tevda',
 'tog-showhiddencats'          => 'Kategorîyên veşartî bibîne',
+'tog-norollbackdiff'          => 'Ciyawazîyê piştî şondakirinê veşêre',
 
 'underline-always'  => 'Tim',
 'underline-never'   => 'Ne carekê',
 'underline-default' => "Tercihên browser'ê da",
 
-'skinpreview' => '(Pêşdîtin)',
-
 # Dates
 'sunday'        => 'yekÅŸem',
 'monday'        => 'duÅŸem',
@@ -171,7 +173,7 @@ $messages = array(
 'mytalk'         => 'Rûpela guftûgo ya min',
 'anontalk'       => 'Guftûgo ji bo vê IPê',
 'navigation'     => 'Navîgasyon',
-'and'            => 'û',
+'and'            => '&#32;û',
 
 # Metadata in edit box
 'metadata_help' => "Data'yên meta:",
@@ -234,8 +236,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Der barê {{SITENAME}}',
 'aboutpage'            => 'Project:Der barê',
-'bugreports'           => 'Raporên çewtiyan',
-'bugreportspage'       => 'Project:Raporên çewtiyan',
 'copyright'            => 'Ji bo naverokê $1 derbas dibe.',
 'copyrightpagename'    => 'Mafên nivîsanê',
 'copyrightpage'        => '{{ns:project}}:Mafên nivîsanê',
@@ -258,9 +258,7 @@ $messages = array(
 
 'badaccess'        => 'Eror li bi dest Hînan',
 'badaccess-group0' => 'Tu nikanî vê tiştî bikê.',
-'badaccess-group1' => 'Ev tişta yê tu dixazê bikê bes ji bikarhênerên yê grupê $1 tê qebûlkirin.',
-'badaccess-group2' => 'Ev tişta yê tu dixazê bikê bes ji bikarhênerên ra ye, yê bi kêmani di grupê $1 da ne.',
-'badaccess-groups' => 'Ev tişta yê tu dixazê bikê bes ji bikarhênerên ra ye, yê bi kêmani di grupê $1 da ne.',
+'badaccess-groups' => 'Ev tişta yê tu dixazê bikê bes ji bikarhênerên ra ye, yê bi kêmani di {{PLURAL:$2|van grûpan|vê grupê}} da {{PLURAL:$2|ne|ye}}: $1.',
 
 'versionrequired'     => 'Verzîyonê $1 ji MediaWiki pêwîste',
 'versionrequiredtext' => 'Verzîyonê $1 ji MediaWiki pêwîste ji bo bikaranîna vê rûpelê. Li [[Special:Version|versyon]] seke.',
@@ -274,6 +272,8 @@ $messages = array(
 'editsection'             => 'biguherîne',
 'editold'                 => 'biguherîne',
 'viewsourceold'           => 'çavkanî bibîne',
+'editlink'                => 'sererastkirin',
+'viewsourcelink'          => 'çavkanî bibîne',
 'editsectionhint'         => 'Beşê biguherîne: $1',
 'toc'                     => 'Tabloya Naverokê',
 'showtoc'                 => 'nîşan bide',
@@ -345,7 +345,6 @@ Sedemê girtinê ev e: $1",
 'cannotdelete'         => 'Ev rûpela nikanî hatiba jêbirin. Meqûle ku kesekî din vê rûpelê jêbir.',
 'badtitle'             => 'Sernivîsa nebaş',
 'badtitletext'         => "Sernavê rûpelê xastî qedexe ye, vala ye ya lînkekî zimanekî wîkî'yekî din e.",
-'perfdisabled'         => "Bibexşîne! Ev fonksîyona ji bo westîyanê server'ê niha hatîye sikinandin.",
 'perfcached'           => "Ev data'yan ji cache'ê ne û belkî ne zindî bin.",
 'perfcachedts'         => "Ev data'ya hatîye cache'kirin û carê paşîn $1 hate zindîkirin.",
 'querypage-no-updates' => "Fonksîyonê zindîkirinê yê vê rûpelê hatîye sikinandin. Data'yên vir netên zindîkirin.",
@@ -359,7 +358,7 @@ Jêpirskirin: $2",
 'protectedpagetext'    => 'Ev rûpela hatîye parastin ji bo nenivîsandinê.',
 'viewsourcetext'       => 'Tu dikarê li çavkanîyê vê rûpelê sekê û wê kopîbikê:',
 'protectedinterface'   => "Di vê rûpelê da nivîsandin ji bo interface'î zimanan yê vê software'ê ye. Ew tê parstin ji bo vandalîzm li vê derê çênebe.",
-'editinginterface'     => "'''Hîşyar:''' Tu rûpelekî diguherînê yê ji wêşandinê înformasyonan di sistêmê da girîn in. Guherandin di vê rûpelê da ji her bikarhêneran ra yê were dîtin. Ji bo tercemekirinan, xêra xwe di [http://translatewiki.net/wiki/Main_Page?setlang=ku Betawiki] da bixebite, projeyê MediaWiki.",
+'editinginterface'     => "'''Hîşyar:''' Tu rûpelekî diguherînê yê ji wêşandinê înformasyonan di sistêmê da girîn in. Guherandin di vê rûpelê da ji her bikarhêneran ra yê were dîtin. Ji bo tercemekirinan, xêra xwe di [http://translatewiki.net/wiki/Main_Page?setlang=ku translatewiki.net] da bixebite, projeyê MediaWiki.",
 'sqlhidden'            => '(Jêpirskirina SQL hatîye veşartin)',
 'cascadeprotected'     => '<strong>Ev rûpela hatîye parastin ji ber guherandinê, ji ber ku ev rûpela di {{PLURAL:$1|vê rûpelê|van rûpelan da}} tê bikaranîn:
 $2
@@ -372,8 +371,8 @@ $2
 
 # Login and logout pages
 'logouttitle'                => 'Derketina bikarhêner',
-'logouttext'                 => '<strong>Tu niha derketî (logged out).</strong><br />
-Tu dikarî {{SITENAME}} niha weke bikarhênerekî nediyarkirî bikarbînî, yan jî tu dikarî dîsa bi vî navê xwe yan navekî din wek bikarhêner têkevî. Bila di bîra te de be ku gengaz e hin rûpel mîna ku tu hîn bi navê xwe qeyd kiriyî werin nîşandan, heta ku tu nîşanên çavlêgerandina (browser) xwe jênebî.',
+'logouttext'                 => "'''Tu niha derketî (logged out).'''<br />
+Tu dikarî {{SITENAME}} niha weke bikarhênerekî nediyarkirî bikarbînî, yan jî tu dikarî dîsa bi vî navê xwe yan navekî din wek bikarhêner [[Special:UserLogin|dîsa têkevî]]. Bila di bîra te de be ku gengaz e hin rûpel mîna ku tu hîn bi navê xwe qeyd kiriyî werin nîşandan, heta ku tu nîşanên çavlêgerandina (browser) xwe jênebî.",
 'welcomecreation'            => '== Bi xêr hatî, $1! ==
 
 Hesaba te hat afirandin. Tu dikarî niha [[Special:Preferences|tercîhên xwe di {{SITENAME}}]] da eyar bikî.',
@@ -384,7 +383,6 @@ Hesaba te hat afirandin. Tu dikarî niha [[Special:Preferences|tercîhên xwe di
 'remembermypassword'         => 'Şifreya min di her rûniştdemê de bîne bîra xwe.',
 'yourdomainname'             => 'Domaînê te',
 'externaldberror'            => "Ya şaşbûnek di naskirinê derva heye, ya tu nikarî account'î xwe yê derva bikarwînê.",
-'loginproblem'               => '<b>Di qeyda te (login) de pirsgirêkek derket.</b><br />Careke din biceribîne!',
 'login'                      => 'Têkeve (login)',
 'nav-login-createaccount'    => 'Têkeve an hesabeke nû çêke',
 'loginprompt'                => "<b>Eger tu xwe nû qeyd bikî, nav û şîfreya xwe hilbijêre.</b> Ji bo xwe qeyd kirinê di {{SITENAME}} de divê ku ''cookies'' gengaz be.",
@@ -457,11 +455,13 @@ Eger account\'a bikarhêneran şaşî hate çêkirin, guhdare vê peyamê meke.'
 'resetpass_announce'      => 'Te xwe bi şîfreyekê qeydkir, yê bi e-nameyekê ji te ra hate şandin. Ji bo xelaskirinê qeydkirinê, tu niha gireke şîfreyeka nuh binivisînê.',
 'resetpass_text'          => '<!-- Nivîsê xwe li vir binivisîne -->',
 'resetpass_header'        => 'Şîfreya xwe betalbike',
+'oldpassword'             => 'Şîfreya kevn',
+'newpassword'             => 'Şîfreya nû',
+'retypenew'               => 'Şîfreya nû careke din binîvîse',
 'resetpass_submit'        => 'Şîfrê bişîne û xwe qedybike',
 'resetpass_success'       => 'Şîfreya te hate guherandin! Niha tu tê qeydkirin...',
 'resetpass_bad_temporary' => 'Şîfreya te niha netê qebûlkirin. Te berê şîfreyekî nuh tomarkir ya şîfreyekî nuh xast.',
 'resetpass_forbidden'     => 'Şîfre nikanin werin guhartin',
-'resetpass_missing'       => 'Tablo vala ye.',
 
 # Edit page toolbar
 'bold_sample'     => 'Nivîsa estûr',
@@ -486,8 +486,8 @@ Eger account\'a bikarhêneran şaşî hate çêkirin, guhdare vê peyamê meke.'
 'hr_tip'          => 'Rastexêza berwarî (kêm bi kar bîne)',
 
 # Edit pages
-'summary'                          => 'Kurte û çavkanî (Te çi kir?)',
-'subject'                          => 'Mijar/sernivîs',
+'summary'                          => 'Kurte û çavkanî (Te çi kir?):',
+'subject'                          => 'Mijar/sernivîs:',
 'minoredit'                        => 'Ev guheraniyekê biçûk e',
 'watchthis'                        => 'Vê gotarê bişopîne',
 'savearticle'                      => 'Rûpelê tomar bike',
@@ -499,8 +499,8 @@ Eger account\'a bikarhêneran şaşî hate çêkirin, guhdare vê peyamê meke.'
 'missingsummary'                   => "<span style=\"color:#990000;\">'''Zanibe:'''</span> Te nivîsekî kurt ji bo guherandinê ra nenivîsand. Eger tu niha carekî din li Tomar xê, guherandinê te vê nivîsekî kurt yê were tomarkirin.",
 'missingcommenttext'               => 'Xêra xwe kurtehîya naverokê li jêr binivisîne.',
 'missingcommentheader'             => "<span style=\"color:#990000;\">'''Zanibe:'''</span> Te sernavekî nenivîsandîye. Eger tu niha carekî din li Tomar xê, ev guherandina vê sernavekê yê were tomarkirin.",
-'summary-preview'                  => 'Pêşdîtinê kurtenivîsê',
-'subject-preview'                  => 'Pêşdîtinê sernivîsê',
+'summary-preview'                  => 'Pêşdîtinê kurtenivîsê:',
+'subject-preview'                  => 'Pêşdîtinê sernivîsê:',
 'blockedtitle'                     => 'Bikarhêner hat asteng kirin',
 'blockedtext'                      => "<big>'''Navî te ya IP'ya te hate astengkirin.'''</big>
 
@@ -553,12 +553,13 @@ Eger tu bi şaştî hatî, bizivire rûpela berê.",
 'noarticletext'                    => 'Ev rûpel niha vala ye, tu dikarî [[Special:Search/{{PAGENAME}}|Di nav gotarên din de li "{{PAGENAME}}" bigere]] an [{{fullurl:{{FULLPAGENAME}}|action=edit}} vê rûpelê biguherînî].',
 'userpage-userdoesnotexist'        => 'Account\'î bikarhêneran "$1" nehatîye qeydkirin. Xêra xwe seke ku tu dixazê vê rûpelê çêkê/biguherînê.',
 'clearyourcache'                   => "'''Zanibe:''' Piştî tomarkirinê, tu gireke cache'a browser'î xwe dîsa wînê ji bo dîtina guherandinan. '''Mozilla / Firefor /Safari:''' Kepsa ''Shift'' bigre û li ''Reload'' xe, ya ''Ctrl-Shift-R'' bikepsîne (''Cmd-Shift-R'' li cem Apple Mac); '''IE:''' Kepsa ''Ctrl'' bigre û li ''Reload'' xe, ya li ''Ctrl-F5''; '''Konqueror:''' bes li ''Reload'' xe ya li kepsa ''F5'' xe; bikarhênerên '''Opera''' girekin belkî cache'a xwe tevda di bin ''Tools → Preferences'' da valabikin.",
-'usercssjsyoucanpreview'           => "<strong>Tîp:</strong> 'Pêşdîtin' bikarwîne ji bo tu bibînê çawa CSS/JS'ê te yê nuh e berî tomarkirinê.",
-'usercsspreview'                   => "'''Zanibe ku tu bes CSS'ê xwe pêşdibînê, ew ne hatîye tomarkirin!'''",
+'usercssjsyoucanpreview'           => "'''Tîp:''' 'Pêşdîtin' bikarwîne ji bo tu bibînê çawa CSS/JS'ê te yê nuh e berî tomarkirinê.",
+'usercsspreview'                   => "'''Zanibe ku tu bes CSS'ê xwe pêşdibînê.'''
+'''Ew hên nehatîye tomarkirin!'''",
 'userjspreview'                    => "'''Zanibe ku tu bes JavaScript'a xwe dicerbînê, ew hên nehatîye tomarkirin!'''",
 'updated'                          => '(Hat taze kirin)',
-'note'                             => '<strong>Not:</strong>',
-'previewnote'                      => '<strong>Ji bîr neke ku ev bi tenê çavdêriyek e, ev rûpel hîn nehat qeyd kirin!</strong>',
+'note'                             => "'''Not:'''",
+'previewnote'                      => "'''Ji bîr neke ku ev bi tenê çavdêriyek e, ev rûpel hîn nehat qeyd kirin!'''",
 'editing'                          => 'Biguherîne: "$1"',
 'editingsection'                   => 'Tê guherandin: $1 (beş)',
 'editingcomment'                   => '$1 (şîrove) tê guherandin.',
@@ -570,16 +571,16 @@ Divê tû wan bikî yek.
 Heke niha tomar bikî, '''bi tene''' nivîsara qutiya jor wê bê tomarkirin.",
 'yourtext'                         => 'Nivîsara te',
 'storedversion'                    => 'Versiyona qeydkirî',
-'editingold'                       => '<strong>HÎŞYAR: Tu ser revîsyoneke kevn a vê rûpelê dixebitî.
+'editingold'                       => "'''HÎŞYAR: Tu ser revîsyoneke kevn a vê rûpelê dixebitî.
 Eger tu qeyd bikî, hemû guhertinên ji vê revîzyonê piştre winda dibin.
-</strong>',
+'''",
 'yourdiff'                         => 'Ciyawazî',
 'copyrightwarning'                 => "Dîqat bike: Hemû tevkariyên {{SITENAME}} di bin $2 de tên belav kirin (ji bo hûragahiyan li $1 binêre). Eger tu nexwazî ku nivîsên te bê dilrehmî bên guherandin û li gora keyfa herkesî bên belavkirin, li vir neweşîne.<br />
 Tu soz didî ku te ev bi xwe nivîsand an jî ji çavkaniyekê azad an geliyane ''(public domain)'' girt.
-<strong>BERHEMÊN MAFÊN WAN PARASTÎ (©) BÊ DESTÛR NEWEŞÎNE!</strong>",
+'''BERHEMÊN MAFÊN WAN PARASTÎ (©) BÊ DESTÛR NEWEŞÎNE!'''",
 'longpagewarning'                  => "HIŞYAR: Drêjahiya vê rûpelê $1 kB (kilobyte) e, ev pir e. Dibe ku çend ''browser''
 baş nikarin rûpelên ku ji 32 kB drêjtir in biguherînin. Eger tu vê rûpelê beş beş bikî gelo ne çêtir e?",
-'protectedpagewarning'             => '<strong>ŞIYARÎ:  Ev rûpel tê parastin. Bi tenê bikarhênerên ku xwediyên mafên "sysop" ne, dikarin vê rûpelê biguherînin.</strong>',
+'protectedpagewarning'             => "'''ŞIYARÎ:  Ev rûpel tê parastin. Bi tenê bikarhênerên ku xwediyên mafên \"sysop\" ne, dikarin vê rûpelê biguherînin.'''",
 'templatesused'                    => 'Şablon di van rûpelan da tê bikaranîn',
 'templatesusedpreview'             => 'Şablon yê di vê pêşdîtinê da tên bikaranîn:',
 'templatesusedsection'             => 'Şablon yê di vê perçê da tên bikaranîn:',
@@ -591,6 +592,10 @@ baÅŸ nikarin rûpelên ku ji 32 kB drêjtir in biguherînin. Eger tu vê rûpelÃ
 
 Zanibe ku nuhçêkirinê vê rûpelê hêja ye ya na.
 Înformasyon li ser jêbirinê vê rûpelê li vir e:",
+'deletelog-fulllog'                => 'Reşahîyê tevda bibîne',
+'edit-no-change'                   => 'Guherandina te hate nehate hesibandin, ji ber ku guherandinên nivîsê tune bûn.',
+'edit-already-exists'              => 'Nikarî rûpeleka nuh çêke.
+Ew berê heye.',
 
 # "Undo" feature
 'undo-success' => 'Ev guherandina kane were şondakirin. Xêra xwe ferqê piştî tomarkirinê bibîne û seke, ku tu ew versîyona dixwazê û tomarbike. Eger te şaşbûnekî kir, xêra xwe derkeve.',
@@ -606,7 +611,6 @@ Sedemê qedexekirinê ji $3 ev e: ''$2''",
 # History pages
 'viewpagelogs'        => 'Reşahîyên vê rûpelê bibîne',
 'nohistory'           => 'Ew rûpel dîroka guherandinê tune.',
-'revnotfound'         => 'Revîzyon nehat dîtin',
 'currentrev'          => 'Revîzyona niha',
 'revisionasof'        => 'Revîzyon a $1',
 'previousrevision'    => '�Rêvîzyona kevintir',
@@ -643,10 +647,15 @@ Ev verzyona vê rûpelê hatîye jêbirin. Belkî înformasyon di [{{fullurl:Spe
 'revdelete-hide-user'         => "Navî bikarhêner/IP'yê veşêre",
 'revdelete-hide-restricted'   => 'Ev qebûlkirinan ji koordînatoran ra ye jî û ev rûpela tê girtin',
 'revdelete-suppress'          => 'Sedemê jêbirinê ji koordînatoran ra jî veşêre',
+'revdelete-hid'               => '$1 veşêre',
+'revdelete-unhid'             => '$1 nîşanbide',
 
 # History merging
 'mergehistory-from' => 'Çavkanîya rûpelê:',
 
+# Merge log
+'mergelog' => 'Reşahîya yekkirinê',
+
 # Diffs
 'history-title'           => 'Dîroka versyonên "$1"',
 'difference'              => '(Ciyawaziya nav revîzyonan)',
@@ -654,99 +663,147 @@ Ev verzyona vê rûpelê hatîye jêbirin. Belkî înformasyon di [{{fullurl:Spe
 'compareselectedversions' => 'Guhartoyan bide ber hev',
 'editundo'                => 'Betalbike',
 'diff-multi'              => '({{PLURAL:$1|Verzyonekî navberê netê|$1 verzyonên navberê netên}} dîtin.)',
+'diff-movedto'            => 'çû $1',
+'diff-removed'            => '$1 hate jêbirin',
+'diff-src'                => 'çavkanî',
+'diff-h1'                 => "'''sernav (level 1)'''",
+'diff-h2'                 => "'''sernav (level 2)'''",
+'diff-h3'                 => "'''sernav (level 3)'''",
+'diff-h4'                 => "'''sernav (level 4)'''",
+'diff-h5'                 => "'''sernav (level 5)'''",
+'diff-img'                => "'''wêneyek'''",
+'diff-a'                  => "'''lînkek'''",
+'diff-big'                => "'''mezin'''",
+'diff-del'                => "'''jêbirî'''",
 
 # Search results
-'searchresults'         => 'Encamên lêgerînê',
-'searchresulttext'      => 'Ji bo zêdetir agahî der barê lêgerînê di {{SITENAME}} de, binêre [[{{MediaWiki:Helppage}}|Searching {{SITENAME}}]].',
-'searchsubtitle'        => 'Ji bo query "[[:$1]]"',
-'searchsubtitleinvalid' => 'Ji bo query "$1"',
-'noexactmatch'          => "'''Rûpeleke bi navê \"\$1\" tune.''' Tu dikarî [[:\$1|vê rûpelê biafirînî]]",
-'noexactmatch-nocreate' => "'''Rûpelek bi nava \"\$1\" tune ye.'''",
-'titlematches'          => 'Dîtinên di sernivîsên gotaran de',
-'notitlematches'        => 'Di nav sernivîsan de nehat dîtin.',
-'textmatches'           => 'Dîtinên di nivîsara rûpelan de',
-'notextmatches'         => 'Di nivîsarê de nehat dîtin.',
-'prevn'                 => '$1 paÅŸ',
-'nextn'                 => '$1 pêş',
-'viewprevnext'          => '($1) ($2) ($3).',
-'searchall'             => 'hemû',
-'showingresults'        => "{{PLURAL:$1|Encamek|'''$1''' encam}}, bi #'''$2''' dest pê dike.",
-'showingresultsnum'     => '<b>$3</b> encam, bi #<b>$2</b> dest pê dike.',
-'powersearch'           => 'Lê bigere',
-'searchdisabled'        => '<p>Tu dikarî li {{SITENAME}} bi Google an Yahoo! bigere. Têbînî: Dibe ku encamen lêgerîne ne yên herî nû ne.
+'searchresults'                  => 'Encamên lêgerînê',
+'searchresulttext'               => 'Ji bo zêdetir agahî der barê lêgerînê di {{SITENAME}} de, binêre [[{{MediaWiki:Helppage}}|Searching {{SITENAME}}]].',
+'searchsubtitle'                 => 'Ji bo query "[[:$1]]"',
+'searchsubtitleinvalid'          => 'Ji bo query "$1"',
+'noexactmatch'                   => "'''Rûpeleke bi navê \"\$1\" tune.''' Tu dikarî [[:\$1|vê rûpelê biafirînî]]",
+'noexactmatch-nocreate'          => "'''Rûpelek bi nava \"\$1\" tune ye.'''",
+'titlematches'                   => 'Dîtinên di sernivîsên gotaran de',
+'notitlematches'                 => 'Di nav sernivîsan de nehat dîtin.',
+'textmatches'                    => 'Dîtinên di nivîsara rûpelan de',
+'notextmatches'                  => 'Di nivîsarê de nehat dîtin.',
+'prevn'                          => '$1 paÅŸ',
+'nextn'                          => '$1 pêş',
+'viewprevnext'                   => '($1) ($2) ($3).',
+'searchhelp-url'                 => 'Help:Alîkarî',
+'searchprofile-articles-tooltip' => 'Di $1 da lêbigere',
+'searchprofile-project-tooltip'  => 'Di $1 da lêbigere',
+'search-result-size'             => '$1 ({{PLURAL:$2|peyvek|$2 peyvan}})',
+'searchall'                      => 'hemû',
+'showingresults'                 => "{{PLURAL:$1|Encamek|'''$1''' encam}}, bi #'''$2''' dest pê dike.",
+'showingresultsnum'              => "{{PLURAL:$3|'''1'''|'''$3'''}} encam, bi #<b>$2</b> dest pê dike.",
+'powersearch'                    => 'Lê bigere',
+'powersearch-ns'                 => "Di namespace'an da lêbigere:",
+'searchdisabled'                 => '<p>Tu dikarî li {{SITENAME}} bi Google an Yahoo! bigere. Têbînî: Dibe ku encamen lêgerîne ne yên herî nû ne.
 </p>',
 
 # Preferences page
-'preferences'        => 'Tercîhên min',
-'mypreferences'      => 'Tercihên min',
-'prefs-edits'        => 'Hejmarê guherandinan:',
-'prefsnologin'       => 'Xwe qeyd nekir',
-'prefsnologintext'   => 'Tu gireke xwe [[Special:UserLogin|qeydbikê]] ji bo guherandina tercihên bikarhêneran.',
-'prefsreset'         => 'Tercih hatin ÅŸondakirin.',
-'qbsettings-none'    => 'Tune',
-'changepassword'     => 'Şîfre biguherîne',
-'skin'               => 'Pêste',
-'math'               => 'TeX',
-'dateformat'         => 'Formata rojê',
-'datedefault'        => 'Tercih tune ne',
-'datetime'           => 'Dem û rêkewt',
-'math_unknown_error' => 'şaşbûnekî nezanîn',
-'math_image_error'   => 'Wêşandana PNG nemeşî',
-'prefs-personal'     => 'Agahiyên bikarhênerê/î',
-'prefs-rc'           => 'Guherandinên dawî',
-'prefs-watchlist'    => 'Lîsteya şopandinê',
-'prefs-misc'         => 'Eyaren cuda',
-'saveprefs'          => 'Tercîhan qeyd bike',
-'resetprefs'         => 'Nivîsarên netomarkirî şondabike',
-'oldpassword'        => 'Şîfreya kevn',
-'newpassword'        => 'Şîfreya nû',
-'retypenew'          => 'Şîfreya nû careke din binîvîse',
-'textboxsize'        => 'Guheranin',
-'rows'               => 'Rêz',
-'columns'            => 'sitûn',
-'searchresultshead'  => 'Eyarên encamên lêgerinê',
-'savedprefs'         => 'Tercîhên te qeyd kirî ne.',
-'timezonelegend'     => 'Navçeya demê',
-'timezonetext'       => '¹Hejmara saetan têkê, yê navbera navçeya demê te û UTC da ne.',
-'localtime'          => 'Demê vê cihê',
-'timezoneoffset'     => 'Cudahî:¹',
-'servertime'         => "Dema server'ê",
-'guesstimezone'      => "Ji browser'î xwe têkê",
-'allowemail'         => 'Qebûlbike ku bikarhênerên di e-nameyan ji te ra bişînin',
-'default'            => 'asayî',
-'files'              => 'Dosya',
+'preferences'         => 'Tercîhên min',
+'mypreferences'       => 'Tercihên min',
+'prefs-edits'         => 'Hejmarê guherandinan:',
+'prefsnologin'        => 'Xwe qeyd nekir',
+'prefsnologintext'    => 'Tu gireke xwe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} qeydbikê]</span> ji bo guherandina tercihên bikarhêneran.',
+'prefsreset'          => 'Tercih hatin ÅŸondakirin.',
+'qbsettings-none'     => 'Tune',
+'changepassword'      => 'Şîfre biguherîne',
+'skin'                => 'Pêste',
+'skin-preview'        => 'Pêşdîtin',
+'math'                => 'TeX',
+'dateformat'          => 'Formata rojê',
+'datedefault'         => 'Tercih tune ne',
+'datetime'            => 'Dem û rêkewt',
+'math_unknown_error'  => 'şaşbûnekî nezanîn',
+'math_image_error'    => 'Wêşandana PNG nemeşî',
+'prefs-personal'      => 'Agahiyên bikarhênerê/î',
+'prefs-rc'            => 'Guherandinên dawî',
+'prefs-watchlist'     => 'Lîsteya şopandinê',
+'prefs-misc'          => 'Eyaren cuda',
+'prefs-resetpass'     => 'Şifreyê biguherîne',
+'saveprefs'           => 'Tercîhan qeyd bike',
+'resetprefs'          => 'Nivîsarên netomarkirî şondabike',
+'textboxsize'         => 'Guheranin',
+'rows'                => 'Rêz',
+'columns'             => 'sitûn',
+'searchresultshead'   => 'Eyarên encamên lêgerinê',
+'savedprefs'          => 'Tercîhên te qeyd kirî ne.',
+'timezonelegend'      => 'Navçeya demê',
+'timezonetext'        => '¹Hejmara saetan têkê, yê navbera navçeya demê te û UTC da ne.',
+'localtime'           => 'Demê vê cihê',
+'timezoneoffset'      => 'Cudahî¹:',
+'servertime'          => "Dema server'ê:",
+'guesstimezone'       => "Ji browser'î xwe têkê",
+'allowemail'          => 'Qebûlbike ku bikarhênerên di e-nameyan ji te ra bişînin',
+'prefs-searchoptions' => 'Tercihên lêgerînê',
+'default'             => 'asayî',
+'files'               => 'Dosya',
 
 # User rights
-'userrights'               => 'Îdarekirina mafên bikarhêneran', # Not used as normal message but as header for the special page itself
-'userrights-lookup-user'   => 'Îdarekirina grûpan',
-'userrights-user-editname' => 'Navî bikarhênerê têke:',
-'editusergroup'            => 'Grûpên bikarhêneran biguherîne',
-'editinguser'              => "Mafên bikarhêner '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) tên xeyrandin",
-'userrights-editusergroup' => 'Grûpên bikarhêneran biguherîne',
-'saveusergroups'           => 'Grûpên bikarhêneran tomarbike',
-'userrights-groupsmember'  => 'Endamê:',
-'userrights-reason'        => 'Sedemê guherandinê:',
-'userrights-no-interwiki'  => 'Mafên te ji bo guherandina mafên bikarhêneran di Wîkîyên din da tune ne.',
-'userrights-nodatabase'    => "Database'a $1 tune ye ya ne yê vir e.",
-'userrights-nologin'       => "Ji bo guherandina mafên bikarhêneran, tu gereke xwe bi account'eka koordînatorekî [[Special:UserLogin|qeydbikê]].",
-'userrights-notallowed'    => "Account'a te mafê xwe tune ye ji bo guherandina mafên bikarhêneran.",
+'userrights'                  => 'Îdarekirina mafên bikarhêneran', # Not used as normal message but as header for the special page itself
+'userrights-lookup-user'      => 'Îdarekirina grûpan',
+'userrights-user-editname'    => 'Navî bikarhênerê têke:',
+'editusergroup'               => 'Grûpên bikarhêneran biguherîne',
+'editinguser'                 => "Mafên bikarhêner '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) tên xeyrandin",
+'userrights-editusergroup'    => 'Grûpên bikarhêneran biguherîne',
+'saveusergroups'              => 'Grûpên bikarhêneran tomarbike',
+'userrights-groupsmember'     => 'Endamê:',
+'userrights-groups-help'      => 'Tu dikarê grûpên bikarhêneran yê vê bikarhênerê biguherînê:
+* Çargoşeyekî nîşankirî dibêje ku ev bikarhênera di wê grûpê da ye.
+* Çargoşeyekî nenîşankirî dibêje ku ev bikarhênera ne di wê grûpê da ye.
+* Stêrkek (*) nîşandide ku du nikarê wê grûpê dîsa jêbibê eger te da wî.',
+'userrights-reason'           => 'Sedemê guherandinê:',
+'userrights-no-interwiki'     => 'Mafên te ji bo guherandina mafên bikarhêneran di Wîkîyên din da tune ne.',
+'userrights-nodatabase'       => "Database'a $1 tune ye ya ne yê vir e.",
+'userrights-nologin'          => "Ji bo guherandina mafên bikarhêneran, tu gereke xwe bi account'eka koordînatorekî [[Special:UserLogin|qeydbikê]].",
+'userrights-notallowed'       => "Account'a te mafê xwe tune ye ji bo guherandina mafên bikarhêneran.",
+'userrights-changeable-col'   => 'Grûpan yên tu dikarê biguherînê',
+'userrights-unchangeable-col' => 'Grûpan yên tu nikarê biguherînê',
 
 # Groups
-'group'            => 'Kom:',
+'group'            => 'گرووپ:',
+'group-user'       => 'بەکارھێنەران',
 'group-bot'        => 'Bot',
 'group-sysop'      => 'Koordînatoran',
 'group-bureaucrat' => 'Bûrokrat',
 'group-all'        => '(hemû)',
 
+'group-user-member'       => 'Bikarhêner',
 'group-bot-member'        => 'Bot',
 'group-sysop-member'      => 'Koordînator',
 'group-bureaucrat-member' => 'Burokrat',
 
 'grouppage-sysop' => '{{ns:project}}:Admînistrator',
 
+# Rights
+'right-read' => 'Rûpelan bixûne',
+'right-edit' => 'Rûpelan biguherîne',
+'right-move' => 'Rûpelan bigerîne',
+
 # User rights log
-'rightslog'  => 'Reşahîya mafên bikarhêneran',
-'rightsnone' => '(tune)',
+'rightslog'      => 'Reşahîya mafên bikarhêneran',
+'rightslogtext'  => 'Ev reşahîyek ji bo guherandinên mafên bikarhêneran e.',
+'rightslogentry' => 'grûpa bikarhêneran ji bo $1 ji $2 guherande $3',
+'rightsnone'     => '(tune)',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'           => 'vê rûpelê bixûne',
+'action-edit'           => 'vê rûpelê biguherîne',
+'action-createpage'     => 'rûpelan çêke',
+'action-createtalk'     => 'rûpelên guftûgoyan çêke',
+'action-createaccount'  => "vê account'ê bikarhênerê çêke",
+'action-move'           => 'vê rûpelê bigerîne',
+'action-move-subpages'  => 'vê rûpelê û binrûpelên wê bigerîne',
+'action-movefile'       => "vê data'yê bigerîne",
+'action-upload'         => "vê data'yê barbike",
+'action-delete'         => 'vê rûpelê jêbibe',
+'action-deleterevision' => 'vê rêvîzyonê jêbibe',
+'action-deletedhistory' => 'dîroka vê rûpelê jêbirî bibîne',
+'action-browsearchive'  => 'li rûpelên jêbirî bigere',
+'action-undelete'       => 'vê rûpelê dîsa çêke',
 
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|guherandinek|guherandin}}',
@@ -782,11 +839,11 @@ Ev verzyona vê rûpelê hatîye jêbirin. Belkî înformasyon di [{{fullurl:Spe
 'uploadnologin'          => 'Xwe qeyd nekir',
 'uploadnologintext'      => 'Ji bo barkirina wêneyan divê ku tu [[Special:UserLogin|têkevî]].',
 'uploaderror'            => 'Şaşbûn bo barkirinê',
-'uploadtext'             => "Berê tu wêneyên nû bar bikî, ji bo dîtin an vedîtina wêneyên ku ji xwe hene binêre: [[Special:ImageList|lîsteya wêneyên barkirî]]. Herwisa wêneyên ku hatine barkirin an jî jê birin li vir dikarî bibînî: [[Special:Log/upload|reşahîya barkirîyan]].
+'uploadtext'             => "Berê tu wêneyên nû bar bikî, ji bo dîtin an vedîtina wêneyên ku ji xwe hene binêre: [[Special:FileList|lîsteya wêneyên barkirî]]. Herwisa wêneyên ku hatine barkirin an jî jê birin li vir dikarî bibînî: [[Special:Log/upload|reşahîya barkirîyan]].
 
 Yek ji lînkên jêr ji bo bikarhînana wêne an file'ê di gotarê de bikar bihîne:
-'''<nowiki>[[</nowiki>{{ns:image}}:File.jpg<nowiki>]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}:File.png|alt text<nowiki>]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}:File.jpg<nowiki>]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}:File.png|alt text<nowiki>]]</nowiki>''',
 anjî ji bo file'ên dengî '''<nowiki>[[</nowiki>{{ns:media}}:File.ogg<nowiki>]]</nowiki>'''",
 'upload-permitted'       => "Formatên data'yan, yên tên qebûlkirin: $1.",
 'upload-preferred'       => "Formatên data'yan, yên tên xastin: $1.",
@@ -804,20 +861,22 @@ anjî ji bo file'ên dengî '''<nowiki>[[</nowiki>{{ns:media}}:File.ogg<nowiki>]
 'illegalfilename'        => 'Navî datayê "$1" ne tê qebûlkirin ji ber ku tişt tê da hatine nivîsandin yê qedexe ne. Xêra xwe navî datayê biguherîne û carekî din barbike.',
 'badfilename'            => 'Navê vî wêneyî hat guherandin û bû "$1".',
 'filetype-badmime'       => 'Data bi formata MIME yê "$1" nameşin werin barkirin.',
-'filetype-unwanted-type' => "'''\".\$1\"''' formatekî nexastî ye. Format yên tên qebûlkirin ev in: \$2.",
-'filetype-banned-type'   => "'''\".\$1\"''' formatekî qedexe ye. Format yên tên qebûlkirin ev in: \$2.",
+'filetype-unwanted-type' => '\'\'\'".$1"\'\'\' formatekî nexastî ye.
+Format {{PLURAL:$3|yê tê|yên tên}} qebûlkirin {{PLURAL:$3|ev e|ev in}}: $2.',
+'filetype-banned-type'   => '\'\'\'".$1"\'\'\' formatekî qedexe ye.
+Format {{PLURAL:$3|yê tê|yên tên}} xastin {{PLURAL:$3|ev e|ev in}}: $2.',
 'filetype-missing'       => 'Piştnavî datayê tune (wek ".jpg").',
 'large-file'             => "Mezinbûna data'yan bila ne ji $1 mezintir bin; ev data'ya $2 mezin e.",
 'emptyfile'              => "Data'ya barkirî vala ye. Sedemê valabûnê belkî şaşnivîsek di navê data'yê da ye. Xêra xwe seke, ku tu rast dixazê vê data'yê barbikê.",
-'fileexists'             => 'Datayek bi vê navê berê heye. Eger tu niha li „Tomarbike“ xê, ew wêneyê kevin ê here û wêneyê te ê were barkirin di bin wê navê. Di bin <strong><tt>$1</tt></strong> du dikarî sekê, ku di dixwazê wê wêneyê biguherînê. Eger tu naxazê, xêra xwe li „Betal“ xe.',
-'fileexists-extension'   => 'Datayek wek vê navê berê heye:<br />
-Navî datayê yê tê barkirin: <strong><tt>$1</tt></strong><br />
-Navî datayê yê berê heyê: <strong><tt>$2</tt></strong><br />
-Xêra xwe navekî din bibîne.',
+'fileexists'             => "Datayek bi vê navê berê heye. Eger tu niha li „Tomarbike“ xê, ew wêneyê kevin ê here û wêneyê te ê were barkirin di bin wê navê. Di bin '''<tt>$1</tt>''' du dikarî sekê, ku di dixwazê wê wêneyê biguherînê. Eger tu naxazê, xêra xwe li „Betal“ xe.",
+'fileexists-extension'   => "Datayek wek vê navê berê heye:<br />
+Navî datayê yê tê barkirin: '''<tt>$1</tt>'''<br />
+Navî datayê yê berê heyê: '''<tt>$2</tt>'''<br />
+Xêra xwe navekî din bibîne.",
 'fileexists-thumb'       => "<center>'''Wêne yê berê heye'''</center>",
-'file-thumbnail-no'      => 'Navî vê datayê bi <strong><tt>$1</tt></strong> destpêdike. Ev dibêje ku ev wêneyekî çûçik e <i>(thumbnail)</i>. Xêra xwe seke, ku belkî versyonekî mezin yê vê wêneyê li cem te heye û wê wêneyê mezintir di bin navî orîjînal da barbike.',
+'file-thumbnail-no'      => "Navî vê datayê bi '''<tt>$1</tt>''' destpêdike. Ev dibêje ku ev wêneyekî çûçik e ''(thumbnail)''. Xêra xwe seke, ku belkî versyonekî mezin yê vê wêneyê li cem te heye û wê wêneyê mezintir di bin navî orîjînal da barbike.",
 'fileexists-forbidden'   => 'Medyayek bi vê navî heye; xêra xwe şonda here û vê medyayê bi navekî din barbike.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'successfulupload'       => 'Barkirin serkeftî',
 'uploadwarning'          => 'Hişyara barkirinê',
 'savefile'               => 'Dosyayê tomar bike',
@@ -836,20 +895,20 @@ Xêra xwe navekî din bibîne.',
 Zanibe, ku ev barkirina kê were qebûlkirin ya na.
 
 Înformasyonan li ser jêbirinê kevin ra:",
-'filename-bad-prefix'    => 'Nava wê data\'yê, yê tu niha bardikê, bi <strong>"$1"</strong> destpêdike. Kamêrayên dîjîtal wan navan didin wêneyên xwe. Ji kerema xwe navekî baştir binivisîne ji bo mirov zûtir zanibin ku şayeşê vê wêneyê çî ye.',
+'filename-bad-prefix'    => "Nava wê data'yê, yê tu niha bardikê, bi '''\"\$1\"''' destpêdike. Kamêrayên dîjîtal wan navan didin wêneyên xwe. Ji kerema xwe navekî baştir binivisîne ji bo mirov zûtir zanibin ku şayeşê vê wêneyê çî ye.",
 
 'license' => 'Lîsens:',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Li navî wêneyê bigere:',
-'imagelist'             => 'Listeya wêneyan',
-'imagelist_date'        => 'Dem',
-'imagelist_name'        => 'Nav',
-'imagelist_user'        => 'Bikarhêner',
-'imagelist_size'        => 'Mezinbûn',
-'imagelist_description' => 'Wesif',
+# Special:ListFiles
+'listfiles_search_for'  => 'Li navî wêneyê bigere:',
+'listfiles'             => 'Listeya wêneyan',
+'listfiles_date'        => 'Dem',
+'listfiles_name'        => 'Nav',
+'listfiles_user'        => 'Bikarhêner',
+'listfiles_size'        => 'Mezinbûn',
+'listfiles_description' => 'Wesif',
 
-# Image description page
+# File description page
 'filehist'                  => 'Dîroka datayê',
 'filehist-help'             => 'Li demekê xe ji bo dîtina verzyona wê demê',
 'filehist-deleteall'        => 'giştika jêbibe',
@@ -907,25 +966,14 @@ Zanibe, ku ev barkirina kê were qebûlkirin ya na.
 'randompage' => 'Rûpelek bi helkeft',
 
 # Statistics
-'statistics'    => 'Statîstîk',
-'sitestats'     => 'Statîstîkên rûpelê',
-'userstats'     => 'Statistîkên bikarhêneran',
-'sitestatstext' => "Di ''database'' de {{PLURAL:$1|rûpelek|'''$1''' rûpel}} hene.
-Tê de rûpelên guftûgoyê, rûpelên der barê {{SITENAME}}, rûpelên pir kurt (stub), rûpelên ragihandinê (redirect) û rûpelên din ku qey ne gotar in hene.
-Derve wan, {{PLURAL:$2|rûpelek|'''$2''' rûpel}} hene, ku qey {{PLURAL:$2|gotarêkî rewa ye|gotarên rewa ne}}.
-
-{{PLURAL:$8|Dosyayek hatîye|'''$8''' dosya hatine}} barkirin.
-
-Ji afirandina Wîkiyê heta roja îro '''$3''' {{PLURAL:$3|cara rûpelek hate|caran rûpelan hatin}} mezekirin û '''$4''' {{PLURAL:$3|cara rûpelek hate|caran rûpelan hatin}} guherandin ji destpêkê {{SITENAME}} da.
-Ji ber wê di nîvî de her rûpel '''$5''' carî hatiye guherandin, û nîspeta dîtun û guherandinan '''$6''' e.
-
-Dirêjahîya [http://www.mediawiki.org/wiki/Manual:Job_queue ''job queue''] '''$7''' e.",
-'userstatstext' => "Li vir {{PLURAL:$1|[[Special:ListUsers|bikarhênerekî]]|'''$1''' [[Special:ListUsers|bikarhênerên]]}} qeydkirî {{PLURAL:$1|heye|hene}}, ji wan '''$2''' (an '''$4%''') qebûlkirinên $5 {{PLURAL:$2|birîye|birine}}.",
+'statistics'              => 'Statîstîk',
+'statistics-header-users' => 'Statistîkên bikarhêneran',
 
 'disambiguations'     => 'Rûpelên cudakirinê',
 'disambiguationspage' => 'Template:disambig',
 
-'doubleredirects' => "Redirect'ên ducarî",
+'doubleredirects'            => "Redirect'ên ducarî",
+'double-redirect-fixed-move' => "cihê [[$1]] hatîye gerandin, ew niha redirect'ek berve [[$2]] ye",
 
 'brokenredirects'        => 'Ragihandinên jê bûye',
 'brokenredirects-edit'   => '(biguherîne)',
@@ -978,8 +1026,6 @@ Dirêjahîya [http://www.mediawiki.org/wiki/Manual:Job_queue ''job queue''] '''$
 'speciallogtitlelabel' => 'Sernav:',
 'log'                  => 'Reşahîyan',
 'all-logs-page'        => 'Hemû reşahîyan',
-'log-search-legend'    => 'Li reşahîyan bigere',
-'log-search-submit'    => 'Dê',
 'alllogstext'          => 'Ev nîşandana hemû reşahîyên {{SITENAME}} e.
 
 Tu dikarê ji xwe ra reşahîyekê bibê, navî bikarhênerekê ya navî rûpelekê binivisînê û înformasyonan li ser wê bibînê.',
@@ -1004,14 +1050,26 @@ Tu dikarê ji xwe ra reşahîyekê bibê, navî bikarhênerekê ya navî rûpele
 
 # Special:Categories
 'categories'                    => 'Kategorî',
-'categoriespagetext'            => 'Di vê wîkiyê de ev kategorî hene:',
+'categoriespagetext'            => 'Di van kategorîyan da rûpel ya medya hene.
+[[Special:UnusedCategories|Kategorîyên netên bikaranîn]] li vir netên nîşandan.
+Binêre [[Special:WantedCategories|kategorîyên xastî]].',
 'special-categories-sort-count' => 'hatîye rêzkirin li gorî hejmaran',
 'special-categories-sort-abc'   => 'hatîye rêzkirin li gorî alfabeyê',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Guherandinên bikarhênerekî yê jêbirî',
+
+# Special:LinkSearch
+'linksearch-ok' => 'Lêbigere',
+
 # Special:ListUsers
 'listusers-submit'   => 'Pêşêkê',
 'listusers-noresult' => 'Ne bikarhênerek hate dîtin.',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Reşahiya çêkirina hesabên nû',
+'newuserlog-create-entry' => 'Bikarhênerekî nuh',
+
 # E-mail user
 'mailnologin'     => 'Navnîşan neşîne',
 'mailnologintext' => 'Te gireke xwe [[Special:UserLogin|qeydbikê]] û adrêsa e-nameyan di [[Special:Preferences|tercihên xwe]] da nivîsandibe ji bo şandina e-nameyan ji bikarhênerên din ra.',
@@ -1058,12 +1116,6 @@ Li rûpela [[Special:RecentChanges|Guherandinên dawî]] jî ji bo hasan dîtina
 'watchlistcontains'    => 'Di lîsteya şopandina te de {{PLURAL:$1|rûpelek heye|$1 rûpel hene}}.',
 'wlnote'               => "Niha {{PLURAL:$1|xeyrandinê|'''$1''' xeyrandinên}} dawî yê {{PLURAL:$2|seetê|'''$2''' seetên}} dawî {{PLURAL:$1|tê|tên}} dîtin.",
 'wlshowlast'           => 'Xeyrandînên berî $1 seetan, $2 rojan, ya $3 (di rojên sîyî paşî)',
-'watchlist-show-bots'  => "Guherandinên bot'an nîşan bide",
-'watchlist-hide-bots'  => "Guherandinên Bot'an veşêre",
-'watchlist-show-own'   => 'Guherandinên min pêşke',
-'watchlist-hide-own'   => 'Guherandinên min veşêre',
-'watchlist-show-minor' => 'Guherandinên biçûk pêşke',
-'watchlist-hide-minor' => 'Guherandinên biçûk veşêre',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Bişopîne...',
@@ -1100,51 +1152,56 @@ Eger tu dixazê lîstêya xwe yê şopandinê biguherînê, li
 "Feedback" û alîkarîyê din:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Rûpelê jê bibe',
-'confirm'                     => 'Pesend bike',
-'excontent'                   => "Naveroka berê: '$1'",
-'excontentauthor'             => "Nawerokê wê rûpelê ew bû: '$1' (û tenya bikarhêner '$2' bû)",
-'exbeforeblank'               => "Nawerok berî betal kirinê ew bû: '$1'",
-'exblank'                     => 'rûpel vala bû',
-'delete-confirm'              => 'Jêbirina "$1"',
-'delete-legend'               => 'Jêbirin',
-'historywarning'              => 'Hîşyar: Ew rûpel ku tu dixwazî jê bibî dîrokek heye:',
-'confirmdeletetext'           => 'Tu kê niha rûpelekê bi tev dîroka wê jêbibê. Xêra xwe zanibe tu kê niha çi bikê û zanibe, çi di wîkîyê da yê bibe. Hên jî seke, ku ev jêbirina bi [[{{MediaWiki:Policy-url}}|mafên wîkîyê]] ra dimeşin ya na.',
-'actioncomplete'              => 'Çalakî temam',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" hat jêbirin. Ji bo qeyda rûpelên ku di dema nêzîk de hatin jêbirin binêre $2.',
-'deletedarticle'              => '"$1" hat jêbirin',
-'dellogpage'                  => 'Reşahîya jêbirin',
-'dellogpagetext'              => 'Li jêr lîsteyek ji jêbirinên dawî heye.',
-'deletionlog'                 => 'reşahîya jêbirin',
-'reverted'                    => 'Hate şondabirin berve verzyonekî berê',
-'deletecomment'               => 'Sedema jêbirinê',
-'deleteotherreason'           => 'Sedemekî din:',
-'deletereasonotherlist'       => 'Sedemekî din',
-'deletereason-dropdown'       => "*Sedemên jêbirinê
+# Delete
+'deletepage'             => 'Rûpelê jê bibe',
+'confirm'                => 'Pesend bike',
+'excontent'              => "Naveroka berê: '$1'",
+'excontentauthor'        => "Nawerokê wê rûpelê ew bû: '$1' (û tenya bikarhêner '$2' bû)",
+'exbeforeblank'          => "Nawerok berî betal kirinê ew bû: '$1'",
+'exblank'                => 'rûpel vala bû',
+'delete-confirm'         => 'Jêbirina "$1"',
+'delete-legend'          => 'Jêbirin',
+'historywarning'         => 'Hîşyar: Ew rûpel ku tu dixwazî jê bibî dîrokek heye:',
+'confirmdeletetext'      => 'Tu kê niha rûpelekê bi tev dîroka wê jêbibê. Xêra xwe zanibe tu kê niha çi bikê û zanibe, çi di wîkîyê da yê bibe. Hên jî seke, ku ev jêbirina bi [[{{MediaWiki:Policy-url}}|mafên wîkîyê]] ra dimeşin ya na.',
+'actioncomplete'         => 'Çalakî temam',
+'deletedtext'            => '"<nowiki>$1</nowiki>" hat jêbirin. Ji bo qeyda rûpelên ku di dema nêzîk de hatin jêbirin binêre $2.',
+'deletedarticle'         => '"$1" hat jêbirin',
+'dellogpage'             => 'Reşahîya jêbirin',
+'dellogpagetext'         => 'Li jêr lîsteyek ji jêbirinên dawî heye.',
+'deletionlog'            => 'reşahîya jêbirin',
+'reverted'               => 'Hate şondabirin berve verzyonekî berê',
+'deletecomment'          => 'Sedema jêbirinê',
+'deleteotherreason'      => 'Sedemekî din:',
+'deletereasonotherlist'  => 'Sedemekî din',
+'deletereason-dropdown'  => "*Sedemên jêbirinê
 ** vandalîzm
 ** vala
 ** ne girek e
 ** ne gotarek e
 ** ceribandina IP'yekê",
-'delete-edit-reasonlist'      => 'Sedemên jêbirinê biguherîne',
-'delete-toobig'               => 'Dîroka vê rûpelê pir mezin e, zêdetirî $1 guherandin. Jêbirina van rûpelan hatîye sînorkirin, ji bo pir şaşbûn (error) di {{SITENAME}} da çênebin.',
-'delete-warning-toobig'       => "Dîroka vê rûpelê pir mezin e, zêdetirî $1 guherandin. Jêbirina van rûpelan dikarin şaşbûnan di database'ê {{SITENAME}} da çêkin; zandibe tu çi dikê!",
-'rollback_short'              => 'Bizivirîne pêş',
-'rollbacklink'                => 'bizivirîne pêş',
-'cantrollback'                => "Guharto naye vegerandin; bikarhêrê dawî, '''tenya''' nivîskarê wê rûpelê ye.",
-'alreadyrolled'               => 'Guherandina dawiya [[$1]]
+'delete-edit-reasonlist' => 'Sedemên jêbirinê biguherîne',
+'delete-toobig'          => 'Dîroka vê rûpelê pir mezin e, zêdetirî $1 guherandin. Jêbirina van rûpelan hatîye sînorkirin, ji bo pir şaşbûn (error) di {{SITENAME}} da çênebin.',
+'delete-warning-toobig'  => "Dîroka vê rûpelê pir mezin e, zêdetirî $1 guherandin. Jêbirina van rûpelan dikarin şaşbûnan di database'ê {{SITENAME}} da çêkin; zandibe tu çi dikê!",
+
+# Rollback
+'rollback_short'   => 'Bizivirîne pêş',
+'rollbacklink'     => 'bizivirîne pêş',
+'cantrollback'     => "Guharto naye vegerandin; bikarhêrê dawî, '''tenya''' nivîskarê wê rûpelê ye.",
+'alreadyrolled'    => 'Guherandina dawiya [[$1]]
 bi [[User:$2|$2]] ([[User talk:$2|guftûgo]]) venizivre; keseke din wê rûpelê zivrandiye an guherandiye.
 
 Guhartoya dawî bi [[User:$3|$3]] ([[User talk:$3|guftûgo]]).',
-'editcomment'                 => 'Kurtenivîsê guherandinê ev bû: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Guherandina $2 hat betal kirin, vegerand guhartoya dawî ya $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Guherandina $1 şondakir; dîsa guharte verzyona $2.',
+'editcomment'      => "Kurtenivîsê guherandinê ev bû: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Guherandina $2 hat betal kirin, vegerand guhartoya dawî ya $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Guherandina $1 şondakir; dîsa guharte verzyona $2.',
+
+# Protect
 'protectlogpage'              => 'Reşahîya parastîyan',
 'protectedarticle'            => 'parastî [[$1]]',
 'modifiedarticleprotection'   => 'parastina "[[$1]]" guherand',
 'unprotectedarticle'          => '"[[$1]]" niha vê parastin e',
 'protect-title'               => 'parastina "$1" biguherîne',
+'prot_1movedto2'              => '$1 çû cihê $2',
 'protect-legend'              => 'Parastinê teyîd bike',
 'protectcomment'              => 'Sedema parastinê',
 'protectexpiry'               => 'Heta:',
@@ -1154,6 +1211,7 @@ Guhartoya dawî bi [[User:$3|$3]] ([[User talk:$3|guftûgo]]).',
 'protect-level-autoconfirmed' => 'Bikarhênerên neqeydkirî astengbike',
 'protect-level-sysop'         => 'Bes koordînatoran (admînan)',
 'protect-expiring'            => 'heta rojê $1 (UTC)',
+'protect-expiry-options'      => '1 seet:1 hour,2 seet:2 hours,6 seet:6 hours,1 roj:1 day,3 roj:3 days,1 hefte:1 week,2 hefte:2 weeks,1 mihe:1 month,3 mihe:3 months,1 sal:1 year,ji her demê ra:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Destûr:',
 
 # Restrictions (nouns)
@@ -1215,7 +1273,6 @@ Ji bo jêbirinan û çêkirinên nuh ra, xêra xwe di [[Special:Log/delete|reşa
 'whatlinkshere'            => 'Lînk yê tên ser vê rûpelê',
 'whatlinkshere-title'      => 'Rûpelan, yê berve $1 tên',
 'whatlinkshere-page'       => 'Rûpel:',
-'linklistsub'              => '(Listeya lînkan)',
 'linkshere'                => "Ev rûpel tên ser vê rûpelê '''„[[:$1]]“''':",
 'nolinkshere'              => "Ne ji rûpelekê lînk tên ser '''„[[:$1]]“'''.",
 'nolinkshere-ns'           => "Ne lînkek berve '''[[:$1]]''' di vê namespace'a da tê.",
@@ -1299,8 +1356,11 @@ Sedemekê binivîse!',
 'block-log-flags-nocreate'    => "çêkirina account'an hatîye qedexekirin",
 'block-log-flags-noautoblock' => 'astengkirina otomatik tune',
 'block-log-flags-noemail'     => 'Şandina e-nameyan hatîye qedexekirin',
+'block-log-flags-nousertalk'  => 'nikare guftûgoyê xwe biguherîne',
 'ipb_expiry_invalid'          => 'Dem ne serrast e.',
 'ipb_already_blocked'         => '"$1" berê hatîye astengkirin',
+'ipb-needreblock'             => '== Hatîye astengkirin ==
+$1 berê hatîye astengkirin. Tu dixazî astengkirinê biguherînê?',
 'ipb_cant_unblock'            => "Şaşbûn: ID'ya astengkirinê $1 nehate dîtin. Astengkirinê xwe niha belkî hatîye rakirin.",
 'blockme'                     => 'Min astengbike',
 'proxyblocksuccess'           => 'Çêbû.',
@@ -1308,8 +1368,9 @@ Sedemekê binivîse!',
 'sorbs_create_account_reason' => "Adrêsa IP ya te ji DNSBL'a {{SITENAME}} wek proxy'eka vekirî tê naskirin. Tu nikarê account'ekê ji xwe ra çêkê.",
 
 # Move page
-'move-page-legend'        => 'Vê rûpelê bigerîne',
-'movepagetalktext'        => "Rûpela '''guftûgoyê''' vê rûpelê wê were, eger hebe, gerandin. Lê ev tişta nameşe, eger
+'move-page'                 => '$1 bigerîne',
+'move-page-legend'          => 'Vê rûpelê bigerîne',
+'movepagetalktext'          => "Rûpela '''guftûgoyê''' vê rûpelê wê were, eger hebe, gerandin. Lê ev tişta nameşe, eger
 
 *berê guftûgoyek bi wê navê hebe ya
 *tu tiştekî jêr hilbijêrê.
@@ -1317,27 +1378,40 @@ Sedemekê binivîse!',
 Eger ev mişkla çêbû, tu gireke vê rûpelê bi xwe bigerînê.
 
 Xêra xwe navî nuh û sedemê navgerandinê binivisîne.",
-'movearticle'             => 'Rûpelê bigerîne',
-'movenotallowed'          => 'Tu nikanê navên gotarên {{SITENAME}} biguherînê.',
-'newtitle'                => 'Sernivîsa nû',
-'move-watch'              => 'Vê rûpelê bişopîne',
-'movepagebtn'             => 'Vê rûpelê bigerîne',
-'pagemovedsub'            => 'Gerandin serkeftî',
-'articleexists'           => 'Rûpela bi vî navî heye, an navê ku te hilbijart derbas nabe. Navekî din hilbijêre.',
-'movedto'                 => 'bû',
-'movetalk'                => "Rûpela '''guftûgo''' ya wê jî bigerîne, eger gengaz be.",
-'1movedto2'               => '$1 çû cihê $2',
-'1movedto2_redir'         => '$1 çû cihê $2 ser redirect',
-'movelogpage'             => 'Reşahîya nav guherandin',
-'movelogpagetext'         => 'Li jêr lîsteyek ji rûpelan ku navê wan hatiye guherandin heye.',
-'movereason'              => 'Sedem',
-'revertmove'              => 'ÅŸondabike',
-'delete_and_move'         => 'Jêbibe û nav biguherîne',
-'delete_and_move_text'    => '== Jêbirin gireke ==
+'movearticle'               => 'Rûpelê bigerîne',
+'movenologin'               => 'Xwe qeyd nekir',
+'movenologintext'           => 'Tu dive bikarhênereke qeydkirî bî û [[Special:UserLogin|werî nav sîstemê]]
+da bikarî navê wê rûpelê biguherînî.',
+'movenotallowed'            => 'Mafên te bo guherandina navên gotaran tune ye.',
+'movenotallowedfile'        => "Mafê te bo guherandina navên data'yan tune ye.",
+'cant-move-user-page'       => 'Mafê te bo guherandina navên rûpelên bikarhêneran tune ye.',
+'cant-move-to-user-page'    => 'Mafê te bo guherandina navên rûpelan berve rûpelên bikarhêneran da tune ye.',
+'newtitle'                  => 'Sernivîsa nû',
+'move-watch'                => 'Vê rûpelê bişopîne',
+'movepagebtn'               => 'Vê rûpelê bigerîne',
+'pagemovedsub'              => 'Gerandin serkeftî',
+'movepage-moved'            => '<big>\'\'\'"$1" çû cihê "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-noredirect' => "Redirect'ek nehate çêkirin",
+'articleexists'             => 'Rûpela bi vî navî heye, an navê ku te hilbijart derbas nabe. Navekî din hilbijêre.',
+'cantmove-titleprotected'   => 'Tu nikanê vê rûpelê bervê vê cihê bigerînê ji ber ku sernava nuh tê parastin ji bo çêkirinê',
+'movedto'                   => 'bû',
+'movetalk'                  => "Rûpela '''guftûgo''' ya wê jî bigerîne, eger gengaz be.",
+'movepage-page-exists'      => 'Rûpela $1 berê heye û ew nikane otomatîk were jêbirin.',
+'movepage-page-moved'       => 'Rûpela $1 çû cihê $2.',
+'movepage-page-unmoved'     => 'Rûpela $1 nikanî çûba ciha $2.',
+'1movedto2'                 => '$1 çû cihê $2',
+'1movedto2_redir'           => '$1 çû cihê $2 ser redirect',
+'movelogpage'               => 'Reşahîya nav guherandin',
+'movelogpagetext'           => 'Li jêr lîsteyek ji rûpelan ku navê wan hatiye guherandin heye.',
+'movereason'                => 'Sedem',
+'revertmove'                => 'ÅŸondabike',
+'delete_and_move'           => 'Jêbibe û nav biguherîne',
+'delete_and_move_text'      => '== Jêbirin gireke ==
 
 Rûpela "[[:$1]]" berê heye. Tu rast dixazê wê jêbibê ji bo navguherandinê ra?',
-'delete_and_move_confirm' => 'Erê, wê rûpelê jêbibe',
-'delete_and_move_reason'  => 'Jêbir ji bo navguherandinê',
+'delete_and_move_confirm'   => 'Erê, wê rûpelê jêbibe',
+'delete_and_move_reason'    => 'Jêbir ji bo navguherandinê',
+'immobile-source-page'      => 'Nava vê rûpelê nikare were guherandin.',
 
 # Namespace 8 related
 'allmessages'        => 'Hemû mesajên sîstemê',
@@ -1352,6 +1426,7 @@ Rûpela "[[:$1]]" berê heye. Tu rast dixazê wê jêbibê ji bo navguherandinê
 # Special:Import
 'import'                  => 'Rûpelan wîne (import)',
 'import-interwiki-submit' => 'Wîne',
+'import-comment'          => 'Nivîs:',
 'importtext'              => 'Please export the file from the source wiki using the {{ns:special}}:Export utility, save it to your disk and upload it here.',
 'importstart'             => 'Rûpel tên împortkirin...',
 'importnopages'           => 'Ne rûpelek ji împortkirinê ra heye.',
@@ -1511,7 +1586,7 @@ if (wgUserLanguage == "ku-arab")
 'show-big-image'       => 'Mezînbûn',
 'show-big-image-thumb' => '<small>Mezinbûna vê pêşnîşandanê: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Pêşangeha wêneyên nû',
 'imagelisttext'         => "Jêr lîsteyek ji $1 file'an heye, duxrekirin $2.",
 'showhidebots'          => "($1 bot'an)",
@@ -1567,14 +1642,9 @@ Lê eger ev *ne* tu bû, li lînkê netikîne. Ev e-nameya di rojê $4 da netê
 Xêra xwe zanibe ku tu bi rastî dixwazê vê rûpelê dîsa çêkê",
 'recreate'            => 'Dîsa tomarbike',
 
-# HTML dump
-'redirectingto' => 'Redirect berve [[:$1]] tê çêkirin...',
-
 # action=purge
-'confirm_purge'        => 'Bîra vê rûpelê jêbîbe ?
-
-$1',
 'confirm_purge_button' => 'Temam',
+'confirm-purge-top'    => 'Bîra vê rûpelê jêbîbe ?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� rûpela berî vê',
diff --git a/languages/messages/MessagesKv.php b/languages/messages/MessagesKv.php
index 30575a83..71b595ba 100644
--- a/languages/messages/MessagesKv.php
+++ b/languages/messages/MessagesKv.php
@@ -106,7 +106,7 @@ $messages = array(
 'upload'    => 'Файл �ӧвтны',
 'uploadbtn' => 'Файл �ӧвтны',
 
-# Image description page
+# File description page
 'filehist-datetime' => 'Кадпа�/кад',
 'filehist-user'     => 'Вӧлы�ь',
 'filehist-comment'  => 'Па�йӧд',
@@ -125,8 +125,10 @@ $messages = array(
 # Special:AllPages
 'allarticles' => 'Став гижӧдъ��',
 
-# Delete/protect/revert
-'deletepage'          => 'Ли�т бокӧ� бырӧдны',
+# Delete
+'deletepage' => 'Ли�т бокӧ� бырӧдны',
+
+# Protect
 'protect-level-sysop' => '�дмини�траторъ�� �ӧмын',
 
 # Contributions
diff --git a/languages/messages/MessagesKw.php b/languages/messages/MessagesKw.php
index 13ace6d3..32d3c5e4 100644
--- a/languages/messages/MessagesKw.php
+++ b/languages/messages/MessagesKw.php
@@ -80,6 +80,9 @@ $messages = array(
 'userlogin'  => 'Entra / kreatya akont',
 'userlogout' => 'Omdenna',
 
+# Search results
+'searchhelp-url' => 'Help:Gweres',
+
 # Preferences page
 'preferences'   => 'Teythi ow akont',
 'mypreferences' => 'Teythi ow akont',
@@ -114,7 +117,7 @@ $messages = array(
 # Tooltip help for the actions
 'tooltip-pt-preferences' => 'Teythi ow akont',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Hwilas',
 
 # Special:SpecialPages
diff --git a/languages/messages/MessagesKy.php b/languages/messages/MessagesKy.php
index 406d2388..0ac25542 100644
--- a/languages/messages/MessagesKy.php
+++ b/languages/messages/MessagesKy.php
@@ -55,7 +55,7 @@ $messages = array(
 'mypage'        => 'Барагым',
 'mytalk'        => 'Маегим',
 'navigation'    => 'Багыттоо',
-'and'           => 'жана',
+'and'           => '&#32;жана',
 
 'errorpagetitle'   => 'Жаңылыш',
 'tagline'          => '{{SITENAME}} дан',
@@ -140,8 +140,12 @@ $messages = array(
 'accountcreated'     => 'Катталды',
 'loginlanguagelabel' => 'Тил: $1',
 
+# Password reset dialog
+'oldpassword' => 'Э�ки �ыр�өз:',
+'newpassword' => 'Жаңы �ыр�өз:',
+
 # Edit pages
-'summary'            => 'Кы�ка түшүндүрүү',
+'summary'            => 'Кы�ка түшүндүрүү:',
 'savearticle'        => 'Баракты �актап кой',
 'whitelistedittitle' => 'Оңдоо үчүн катоодон өтүү зарыл',
 'accmailtitle'       => 'Сыр�өз жөнөтүлдү.',
@@ -171,8 +175,6 @@ $messages = array(
 'prefs-rc'           => 'Соңку өзгөрүүлөр',
 'prefs-watchlist'    => 'Байкоо тизме',
 'saveprefs'          => 'Сактап кой',
-'oldpassword'        => 'Э�ки �ыр�өз:',
-'newpassword'        => 'Жаңы �ыр�өз:',
 'textboxsize'        => 'Оңдоо',
 'searchresultshead'  => 'Издөө',
 'localtime'          => 'Жергиликтүү убакыт',
@@ -203,10 +205,10 @@ $messages = array(
 
 'license' => 'Лицензи�лоо:',
 
-# Special:ImageList
-'imagelist' => 'Файлдар тизме�и',
+# Special:ListFiles
+'listfiles' => 'Файлдар тизме�и',
 
-# Image description page
+# File description page
 'imagelinks' => 'Шилтемелер',
 
 # Unused templates
@@ -217,8 +219,8 @@ $messages = array(
 'randompage' => 'Тушкелди макала',
 
 # Statistics
-'statistics' => 'Стати�тика',
-'userstats'  => 'Колдонуучулардын �тати�тика�ы',
+'statistics'              => 'Стати�тика',
+'statistics-header-users' => 'Колдонуучулардын �тати�тика�ы',
 
 # Miscellaneous special pages
 'unusedcategories' => 'Колдонулбаган категори�лар',
@@ -259,7 +261,7 @@ $messages = array(
 'changed' => 'өзгөртүлдү',
 'created' => 'түзүлдү',
 
-# Delete/protect/revert
+# Delete
 'deletepage'     => 'Баракты өчүрүп кой',
 'confirm'        => 'Ыра�тоо',
 'actioncomplete' => 'Иш-аракет жыйынтыкталды',
@@ -302,7 +304,7 @@ $messages = array(
 # Browsing diffs
 'nextdiff' => 'Кийинки айырма →',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Жаңы файлдардын галлере��ы',
 'ilsubmit'  => 'Издөө',
 'bydate'    => 'Күнү боюнча',
diff --git a/languages/messages/MessagesLa.php b/languages/messages/MessagesLa.php
index 0c0754e3..bc8a5d5b 100644
--- a/languages/messages/MessagesLa.php
+++ b/languages/messages/MessagesLa.php
@@ -4,38 +4,38 @@
  * @ingroup Language
  * @file
  *
+ * @author Esteban97
  * @author LeighvsOptimvsMaximvs
  * @author Omnipaedista
  * @author OrbiliusMagister
+ * @author Ornil
  * @author Rafaelgarcia
  * @author SPQRobin
  * @author UV
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => 'Norma',
-	'cologneblue' => 'Caerulus Colonia'
+$namespaceNames = array(
+	NS_SPECIAL          => 'Specialis',
+	NS_TALK             => 'Disputatio',
+	NS_USER             => 'Usor',
+	NS_USER_TALK        => 'Disputatio_Usoris',
+	NS_PROJECT_TALK     => 'Disputatio_{{GRAMMAR:genitive|$1}}',
+	NS_FILE             => 'Fasciculus',
+	NS_FILE_TALK        => 'Disputatio_Fasciculi',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Disputatio_MediaWiki',
+	NS_TEMPLATE         => 'Formula',
+	NS_TEMPLATE_TALK    => 'Disputatio_Formulae',
+	NS_HELP             => 'Auxilium',
+	NS_HELP_TALK        => 'Disputatio_Auxilii',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Disputatio_Categoriae',
 );
 
-$namespaceNames = array(
-	NS_SPECIAL        => 'Specialis',
-	NS_MAIN           => '',
-	NS_TALK           => 'Disputatio',
-	NS_USER           => 'Usor',
-	NS_USER_TALK      => 'Disputatio_Usoris',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Disputatio_{{grammar:genitive|$1}}',
-	NS_IMAGE          => 'Imago',
-	NS_IMAGE_TALK     => 'Disputatio_Imaginis',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Disputatio_MediaWiki',
-	NS_TEMPLATE       => 'Formula',
-	NS_TEMPLATE_TALK  => 'Disputatio_Formulae',
-	NS_HELP           => 'Auxilium',
-	NS_HELP_TALK      => 'Disputatio_Auxilii',
-	NS_CATEGORY       => 'Categoria',
-	NS_CATEGORY_TALK  => 'Disputatio_Categoriae',
+$namespaceAliases = array(
+	'Imago' => NS_FILE,
+	'Disputatio_Imaginis' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array( ',' => "\xc2\xa0" );
@@ -59,92 +59,97 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Redirectiones duplices' ),
-	'BrokenRedirects'         => array( 'Redirectiones fractae' ),
-	'Disambiguations'         => array( 'Paginae disambiguationis', 'Disambiguationes' ),
-	'Userlogin'               => array( 'Conventum aperire' ),
-	'Userlogout'              => array( 'Conventum concludere' ),
-	'CreateAccount'           => array( 'Rationem creare' ),
-	'Preferences'             => array( 'Praeferentiae' ),
-	'Watchlist'               => array( 'Paginae custoditae' ),
-	'Recentchanges'           => array( 'Nuper mutata', 'Mutationes recentes' ),
-	'Upload'                  => array( 'Fasciculos onerare', 'Imagines onerare' ),
-	'Imagelist'               => array( 'Fasciculi', 'Imagines' ),
-	'Newimages'               => array( 'Fasciculi novi', 'Imagines novae' ),
-	'Listusers'               => array( 'Usores' ),
-	'Statistics'              => array( 'Census' ),
-	'Randompage'              => array( 'Pagina fortuita' ),
-	'Lonelypages'             => array( 'Paginae non annexae' ),
-	'Uncategorizedpages'      => array( 'Paginae sine categoriis' ),
-	'Uncategorizedcategories' => array( 'Categoriae sine categoriis' ),
-	'Uncategorizedimages'     => array( 'Fasciculi sine categoriis', 'Imagines sine categoriis' ),
-	'Uncategorizedtemplates'  => array( 'Formulae sine categoriis' ),
-	'Unusedcategories'        => array( 'Categoriae non in usu', 'Categoriae vacuae' ),
-	'Unusedimages'            => array( 'Fasciculi non in usu', 'Imagines non in usu' ),
-	'Wantedpages'             => array( 'Paginae desideratae', 'Nexus fracti' ),
-	'Wantedcategories'        => array( 'Categoriae desideratae' ),
-	'Missingfiles'            => array( 'Fasciculi desiderati', 'Imagines desideratae' ),
-	'Mostlinked'              => array( 'Paginae maxime annexae' ),
-	'Mostlinkedcategories'    => array( 'Categoriae maxime annexae' ),
-	'Mostlinkedtemplates'     => array( 'Formulae maxime annexae' ),
-	'Mostcategories'          => array( 'Paginae plurimis categoriis' ),
-	'Mostimages'              => array( 'Fasciculi maxime annexi', 'Imagines maxime annexae' ),
-	'Mostrevisions'           => array( 'Paginae plurimum mutatae' ),
-	'Fewestrevisions'         => array( 'Paginae minime mutatae' ),
-	'Shortpages'              => array( 'Paginae breves' ),
-	'Longpages'               => array( 'Paginae longae' ),
-	'Newpages'                => array( 'Paginae novae' ),
-	'Ancientpages'            => array( 'Paginae veterrimae' ),
-	'Deadendpages'            => array( 'Paginae sine nexu' ),
-	'Protectedpages'          => array( 'Paginae protectae' ),
-	'Protectedtitles'         => array( 'Tituli protecti' ),
-	'Allpages'                => array( 'Paginae omnes', 'Omnes paginae' ),
-	'Prefixindex'             => array( 'Praefixa', 'Quaerere per praefixa' ),
-	'Ipblocklist'             => array( 'Usores obstructi' ),
-	'Specialpages'            => array( 'Paginae speciales' ),
-	'Contributions'           => array( 'Conlationes', 'Conlationes usoris' ),
-	'Emailuser'               => array( 'Litteras electronicas usori mittere', 'Littera electronica' ),
-	'Confirmemail'            => array( 'Inscriptionem electronicam confirmare' ),
-	'Whatlinkshere'           => array( 'Nexus ad paginam' ),
-	'Recentchangeslinked'     => array( 'Nuper mutata annexorum' ),
-	'Movepage'                => array( 'Paginam movere', 'Movere' ),
-	'Blockme'                 => array( 'Usor obstructus' ),
-	'Booksources'             => array( 'Librorum fontes' ),
-	'Categories'              => array( 'Categoriae' ),
-	'Export'                  => array( 'Exportare', 'Paginas exportare' ),
-	'Version'                 => array( 'Versio' ),
-	'Allmessages'             => array( 'Nuntia systematis' ),
-	'Log'                     => array( 'Acta' ),
-	'Blockip'                 => array( 'Usorem obstruere' ),
-	'Undelete'                => array( 'Paginam restituere' ),
-	'Import'                  => array( 'Importare', 'Paginas importare' ),
-	'Lockdb'                  => array( 'Basem datorum obstruere' ),
-	'Unlockdb'                => array( 'Basem datorum deobstruere' ),
-	'Userrights'              => array( 'Iura usorum' ),
-	'MIMEsearch'              => array( 'Quaerere per MIME' ),
-	'Unwatchedpages'          => array( 'Paginae incustoditae' ),
-	'Listredirects'           => array( 'Redirectiones' ),
-	'Revisiondelete'          => array( 'Emendationem delere' ),
-	'Unusedtemplates'         => array( 'Formulae non in usu' ),
-	'Randomredirect'          => array( 'Redirectio fortuita' ),
-	'Mypage'                  => array( 'Pagina mea' ),
-	'Mytalk'                  => array( 'Disputatio mea' ),
-	'Mycontributions'         => array( 'Conlationes meae' ),
-	'Listadmins'              => array( 'Magistratus' ),
-	'Listbots'                => array( 'Automata' ),
-	'Popularpages'            => array( 'Paginae saepe monstratae' ),
-	'Search'                  => array( 'Quaerere' ),
-	'Resetpass'               => array( 'Tesseram novam creare' ),
-	'Withoutinterwiki'        => array( 'Paginae sine nexibus ad linguas alias', 'Paginae sine nexibus intervicis' ),
-	'MergeHistory'            => array( 'Historias paginarum confundere' ),
-	'Invalidateemail'         => array( 'Adfimationem inscriptionis electronicae abrogare' ),
-	'Blankpage'               => array( 'Pagina vacua' ),
+	'DoubleRedirects'           => array( 'Redirectiones duplices' ),
+	'BrokenRedirects'           => array( 'Redirectiones fractae' ),
+	'Disambiguations'           => array( 'Paginae disambiguationis', 'Disambiguationes' ),
+	'Userlogin'                 => array( 'Conventum aperire' ),
+	'Userlogout'                => array( 'Conventum concludere' ),
+	'CreateAccount'             => array( 'Rationem creare' ),
+	'Preferences'               => array( 'Praeferentiae' ),
+	'Watchlist'                 => array( 'Paginae custoditae' ),
+	'Recentchanges'             => array( 'Nuper mutata', 'Mutationes recentes' ),
+	'Upload'                    => array( 'Fasciculos onerare', 'Imagines onerare' ),
+	'Listfiles'                 => array( 'Fasciculi', 'Imagines' ),
+	'Newimages'                 => array( 'Fasciculi novi', 'Imagines novae' ),
+	'Listusers'                 => array( 'Usores' ),
+	'Listgrouprights'           => array( 'Gregum usorum potestates', 'Iura gregum' ),
+	'Statistics'                => array( 'Census' ),
+	'Randompage'                => array( 'Pagina fortuita' ),
+	'Lonelypages'               => array( 'Paginae non annexae' ),
+	'Uncategorizedpages'        => array( 'Paginae sine categoriis' ),
+	'Uncategorizedcategories'   => array( 'Categoriae sine categoriis' ),
+	'Uncategorizedimages'       => array( 'Fasciculi sine categoriis', 'Imagines sine categoriis' ),
+	'Uncategorizedtemplates'    => array( 'Formulae sine categoriis' ),
+	'Unusedcategories'          => array( 'Categoriae non in usu', 'Categoriae vacuae' ),
+	'Unusedimages'              => array( 'Fasciculi non in usu', 'Imagines non in usu' ),
+	'Wantedpages'               => array( 'Paginae desideratae', 'Nexus fracti' ),
+	'Wantedcategories'          => array( 'Categoriae desideratae' ),
+	'Wantedfiles'               => array( 'Fasciculi desiderati', 'Imagines desideratae' ),
+	'Wantedtemplates'           => array( 'Formulae desideratae' ),
+	'Mostlinked'                => array( 'Paginae maxime annexae' ),
+	'Mostlinkedcategories'      => array( 'Categoriae maxime annexae' ),
+	'Mostlinkedtemplates'       => array( 'Formulae maxime annexae' ),
+	'Mostimages'                => array( 'Fasciculi maxime annexi', 'Imagines maxime annexae' ),
+	'Mostcategories'            => array( 'Paginae plurimis categoriis' ),
+	'Mostrevisions'             => array( 'Paginae plurimum mutatae' ),
+	'Fewestrevisions'           => array( 'Paginae minime mutatae' ),
+	'Shortpages'                => array( 'Paginae breves' ),
+	'Longpages'                 => array( 'Paginae longae' ),
+	'Newpages'                  => array( 'Paginae novae' ),
+	'Ancientpages'              => array( 'Paginae veterrimae' ),
+	'Deadendpages'              => array( 'Paginae sine nexu' ),
+	'Protectedpages'            => array( 'Paginae protectae' ),
+	'Protectedtitles'           => array( 'Tituli protecti' ),
+	'Allpages'                  => array( 'Paginae omnes', 'Omnes paginae' ),
+	'Prefixindex'               => array( 'Praefixa', 'Quaerere per praefixa' ),
+	'Ipblocklist'               => array( 'Usores obstructi' ),
+	'Specialpages'              => array( 'Paginae speciales' ),
+	'Contributions'             => array( 'Conlationes', 'Conlationes usoris' ),
+	'Emailuser'                 => array( 'Litteras electronicas usori mittere', 'Littera electronica' ),
+	'Confirmemail'              => array( 'Inscriptionem electronicam confirmare' ),
+	'Whatlinkshere'             => array( 'Nexus ad paginam' ),
+	'Recentchangeslinked'       => array( 'Nuper mutata annexorum' ),
+	'Movepage'                  => array( 'Paginam movere', 'Movere' ),
+	'Blockme'                   => array( 'Usor obstructus' ),
+	'Booksources'               => array( 'Librorum fontes' ),
+	'Categories'                => array( 'Categoriae' ),
+	'Export'                    => array( 'Exportare', 'Paginas exportare' ),
+	'Version'                   => array( 'Versio' ),
+	'Allmessages'               => array( 'Nuntia systematis' ),
+	'Log'                       => array( 'Acta' ),
+	'Blockip'                   => array( 'Usorem obstruere' ),
+	'Undelete'                  => array( 'Paginam restituere' ),
+	'Import'                    => array( 'Importare', 'Paginas importare' ),
+	'Lockdb'                    => array( 'Basem datorum obstruere' ),
+	'Unlockdb'                  => array( 'Basem datorum deobstruere' ),
+	'Userrights'                => array( 'Usorum potestates', 'Iura usorum' ),
+	'MIMEsearch'                => array( 'Quaerere per MIME' ),
+	'FileDuplicateSearch'       => array( 'Quaerere fasciculos duplices', 'Quaerere imagines duplices' ),
+	'Unwatchedpages'            => array( 'Paginae incustoditae' ),
+	'Listredirects'             => array( 'Redirectiones' ),
+	'Revisiondelete'            => array( 'Emendationem delere' ),
+	'Unusedtemplates'           => array( 'Formulae non in usu' ),
+	'Randomredirect'            => array( 'Redirectio fortuita' ),
+	'Mypage'                    => array( 'Pagina mea' ),
+	'Mytalk'                    => array( 'Disputatio mea' ),
+	'Mycontributions'           => array( 'Conlationes meae' ),
+	'Listadmins'                => array( 'Magistratus' ),
+	'Listbots'                  => array( 'Automata' ),
+	'Popularpages'              => array( 'Paginae saepe monstratae' ),
+	'Search'                    => array( 'Quaerere' ),
+	'Resetpass'                 => array( 'Tesseram novam creare' ),
+	'Withoutinterwiki'          => array( 'Paginae sine nexibus ad linguas alias', 'Paginae sine nexibus intervicis' ),
+	'MergeHistory'              => array( 'Historias paginarum confundere' ),
+	'Invalidateemail'           => array( 'Adfimationem inscriptionis electronicae abrogare' ),
+	'Blankpage'                 => array( 'Pagina vacua' ),
+	'LinkSearch'                => array( 'Quaerere nexus externos' ),
+	'DeletedContributions'      => array( 'Conlationes deletae', 'Conlationes usoris deletae' ),
 );
 
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Nexus linea subscribere:',
-'tog-highlightbroken'         => 'Formare nexus fractos <a href="" class="new">sici</a> (alioqui: sic<a href="" class="internal">?</a>).',
+'tog-highlightbroken'         => 'Formare nexus fractos <a href="" class="new">sici</a> (alioqui: sic<a href="" class="internal">?</a>)',
 'tog-justify'                 => 'Iustificare paragrapha',
 'tog-hideminor'               => 'Celare recensiones minores in indice nuper mutatorum',
 'tog-extendwatchlist'         => 'Extendere indicem paginarum custoditarum ut omnes emendationes monstrentur',
@@ -179,16 +184,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'Celare recensiones meas in paginarum custoditarum indice',
 'tog-watchlisthidebots'       => 'Celare recensiones automatarias in paginarum custoditarum indice',
 'tog-watchlisthideminor'      => 'Celare recensiones minores in paginarum custoditarum indice',
+'tog-watchlisthideliu'        => 'Celare recensiones usorum notorum in paginarum custoditarum indice',
+'tog-watchlisthideanons'      => 'Celare recensiones usorum ignotorum in paginarum custoditarum indice',
 'tog-ccmeonemails'            => 'Mitte mihi transcriptiones litterarum quas ad alios usores mitto',
 'tog-diffonly'                => 'Noli monstrare contenta paginae infra dissimilitudinem',
 'tog-showhiddencats'          => 'Categorias celatas monstrare',
+'tog-norollbackdiff'          => 'Noli monstrare dissimilitudinem post reversionem paginae',
 
 'underline-always'  => 'Semper',
 'underline-never'   => 'Numquam',
 'underline-default' => 'Defalta navigatri interretialis',
 
-'skinpreview' => '(Praevisum)',
-
 # Dates
 'sunday'        => 'dies Solis',
 'monday'        => 'dies Lunae',
@@ -273,7 +279,7 @@ $messages = array(
 'mytalk'         => 'Disputatio mea',
 'anontalk'       => 'Disputatio huius IP',
 'navigation'     => 'Navigatio',
-'and'            => 'et',
+'and'            => '&#32;et',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -309,7 +315,7 @@ $messages = array(
 'talkpagelinktext'  => 'Disputatio',
 'specialpage'       => 'Pagina specialis',
 'personaltools'     => 'Instrumenta personalia',
-'postcomment'       => 'Adnotare',
+'postcomment'       => 'Nova pars',
 'articlepage'       => 'Videre rem',
 'talk'              => 'Disputatio',
 'views'             => 'Visae',
@@ -335,8 +341,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'De {{grammar:ablative|{{SITENAME}}}}',
 'aboutpage'            => 'Project:De {{GRAMMAR:ablative|{{SITENAME}}}}',
-'bugreports'           => 'Renuntiare errata',
-'bugreportspage'       => 'Project:Renuntiare errores',
 'copyright'            => 'Res ad manum sub $1.',
 'copyrightpagename'    => '{{grammar:genitive|{{SITENAME}}}} verba privata',
 'copyrightpage'        => '{{ns:project}}:Verba privata',
@@ -359,9 +363,7 @@ $messages = array(
 
 'badaccess'        => 'Permissus erratum',
 'badaccess-group0' => 'Non licet tibi actum quod petivisti agere.',
-'badaccess-group1' => 'Actum quod petivisti solum potest agi ab usoribus ex grege $1.',
-'badaccess-group2' => 'Actum quod petivisti solum potest agi ab usoribus ex uno gregum $1.',
-'badaccess-groups' => 'Actum quod petivisti solum potest agi ab usoribus ex uno gregum $1.',
+'badaccess-groups' => 'Actum quod petivisti solum potest agi ab usoribus ex {{PLURAL:$2|grege|uno gregum}}: $1.',
 
 'versionrequired'     => 'MediaWiki versio $1 necesse',
 'versionrequiredtext' => 'MediaWiki versio $1 necesse est ad hanc paginam videndum.
@@ -376,6 +378,8 @@ Vide [[Special:Version|paginam versionis]].',
 'editsection'             => 'recensere',
 'editold'                 => 'recensere',
 'viewsourceold'           => 'fontem videre',
+'editlink'                => 'recensere',
+'viewsourcelink'          => 'fontem videre',
 'editsectionhint'         => 'Recensere partem: $1',
 'toc'                     => 'Index',
 'showtoc'                 => 'monstrare',
@@ -383,13 +387,19 @@ Vide [[Special:Version|paginam versionis]].',
 'thisisdeleted'           => 'Videre aut restituere $1?',
 'viewdeleted'             => 'Visne conspicere $1?',
 'restorelink'             => '{{PLURAL:$1|unam emendationem deletam|$1 emendationes deletas}}',
-'red-link-title'          => '$1 (pagina nondum scripta est)',
+'feedlinks'               => 'Fluxus:',
+'feed-unavailable'        => 'Fluxus syndicationis non praestiti',
+'site-rss-feed'           => '$1 Fluxus RSS',
+'site-atom-feed'          => '$1 Fluxus Atom',
+'page-rss-feed'           => '"$1" Fluxus RSS',
+'page-atom-feed'          => '"$1" Fluxus Atom',
+'red-link-title'          => '$1 (non est haec pagina)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Res',
 'nstab-user'      => 'Pagina usoris',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Specialis',
+'nstab-special'   => 'Pagina specialis',
 'nstab-project'   => 'Consilium',
 'nstab-image'     => 'Fasciculus',
 'nstab-mediawiki' => 'Nuntium',
@@ -412,6 +422,7 @@ Pro indice paginarum specialum validarum, vide [[Special:SpecialPages|{{int:spec
 $1',
 'cachederror'          => 'Quae sequuntur sunt ex exemplo conditivo paginae quaesitae, fortasse non recente.',
 'readonly'             => 'Basis datorum obstructa',
+'missingarticle-rev'   => '(numerus emendationis: $1)',
 'missingarticle-diff'  => '(Diss: $1, $2)',
 'internalerror'        => 'Erratum internum',
 'internalerror_info'   => 'Erratum internum: $1',
@@ -424,27 +435,31 @@ $1',
 'cannotdelete'         => 'Pagina vel fasciculus deleri non potuit. (Fortasse usor alius iam deleverat.)',
 'badtitle'             => 'Titulus malus',
 'badtitletext'         => 'Nomen paginae quaestae fuit invalidum, vacuum, aut praeverbium interlingualem vel intervicialem habuit. Fortasse insunt una aut plus litterarum quae in titulis non possunt inscribier.',
+'wrong_wfQuery_params' => 'Parametri incorrectae pro wfQuery()<br />
+Functio: $1<br />
+Inquisitio: $2',
 'viewsource'           => 'Fontem videre',
 'viewsourcefor'        => 'pro $1',
 'actionthrottled'      => 'Actio strangulata',
 'protectedpagetext'    => 'Haec pagina protecta est, ut emendationes prohibeantur.',
 'viewsourcetext'       => 'Fontem videas et exscribeas:',
 'protectedinterface'   => 'Haec pagina dat textum interfaciei pro logiciali, et est protecta ad vandalismum vetandum.',
-'editinginterface'     => "'''Caveat censor:''' Emendas iam paginam quae textum interfaciei logicialem dat. Mutationes vultum {{grammar:genitive|{{SITENAME}}}} omnibus usoribus afficient. In nuntia MediaWiki vertendo, quaesumus te uti [http://translatewiki.net/wiki/Main_Page?setlang=la Betawiki].",
+'editinginterface'     => "'''Caveat censor:''' Emendas iam paginam quae textum interfaciei logicialem dat. Mutationes vultum {{grammar:genitive|{{SITENAME}}}} omnibus usoribus afficient. In nuntia MediaWiki vertendo, quaesumus te uti [http://translatewiki.net/wiki/Main_Page?setlang=la translatewiki.net].",
+'sqlhidden'            => '(inquisitio SQL celata)',
 'namespaceprotected'   => "Tibi non licet paginas spatii nominalis '''$1''' recensere.",
 'ns-specialprotected'  => 'Paginae speciales recenseri non possunt.',
-'titleprotected'       => "Hic titulus protectus est ab usore [[User:$1|$1]] ne creetur.
-Ratio data est ''$2''.",
+'titleprotected'       => 'Hic titulus protectus est ab usore [[User:$1|$1]] ne creetur.
+Ratio data est "\'\'$2\'\'".',
 
 # Virus scanner
 'virus-unknownscanner' => 'antivirus incognitus:',
 
 # Login and logout pages
 'logouttitle'                => 'Conventum concludere',
-'logouttext'                 => '<strong>Conventum tuum conclusum est.</strong>
+'logouttext'                 => "'''Conventum tuum conclusum est.'''
 
 Ignote continues {{grammar:ablative|{{SITENAME}}}} uti, aut conventum novum vel sub eodem vel novo nomine [[Special:UserLogin|aperias]].
-Nota bene paginas fortasse videantur quasi tuum conventum esset apertum, priusquam navigatrum purgaveris.',
+Nota bene paginas fortasse videantur quasi tuum conventum esset apertum, priusquam navigatrum purgaveris.",
 'welcomecreation'            => '== Salve, $1! ==
 Ratio tua iam creata est.
 Noli oblivisci [[Special:Preferences|praeferentias tuas]] apud {{grammar:accusative|{{SITENAME}}}} mutare.',
@@ -454,7 +469,6 @@ Noli oblivisci [[Special:Preferences|praeferentias tuas]] apud {{grammar:accusat
 'yourpasswordagain'          => 'Tesseram tuam adfirmare:',
 'remembermypassword'         => 'Tesseram meam inter conventa memento',
 'yourdomainname'             => 'Regnum tuum:',
-'loginproblem'               => '<b>Problema erat aperiens conventum tuum.</b><br />Conare denuo!',
 'login'                      => 'Conventum aperire',
 'nav-login-createaccount'    => 'Conventum aperire / conventum creare',
 'loginprompt'                => 'Cookies potestatem facere debes ut conventum aperire.',
@@ -478,8 +492,8 @@ Nomen usoris alium selige.',
 'yourlanguage'               => 'Lingua tua:',
 'yourvariant'                => 'Differentia:',
 'yournick'                   => 'Subscriptio:',
-'badsig'                     => 'Subscriptio cruda non est valida; scrutina HTML textos.',
-'badsiglength'               => 'Subscriptio nimis longa est.
+'badsig'                     => 'Subscriptio cruda non est valida; scrutina affixa HTML.',
+'badsiglength'               => 'Subscriptio tua nimis longa est.
 {{PLURAL:$1|Una littera est|$1 litterae sunt}} longitudo maxima.',
 'email'                      => 'Litterae electronicae',
 'prefs-help-realname'        => 'Nomen verum non necesse est.
@@ -494,7 +508,7 @@ Si vis, sinit etiam aliis tecum loqui per tuam paginam usoris vel disputationis,
 'loginsuccesstitle'          => 'Conventum prospere apertum est',
 'loginsuccess'               => "'''Apud {{grammar:accusative|{{SITENAME}}}} agnosceris ut \"\$1\".'''",
 'nosuchuser'                 => 'Usor "$1" non est.
-Confirma orthographiam, aut [[Special:UserLogin/signup|crea novam rationem]].',
+Confirma orthographiam (cave litteras maiusculas minusculasque), aut [[Special:UserLogin/signup|novam rationem crea]].',
 'nosuchusershort'            => 'Usor "<nowiki>$1</nowiki>" non est.
 Confirma orthographiam.',
 'nouserspecified'            => 'Nomen usoris indicare debes.',
@@ -510,8 +524,9 @@ Si vis, conventum aperias et statim tesseram tuam mutes.
 Si non ipse hanc petitionem fecisti, aut si tesserae tuae
 meministi et etiam nolis eam mutare, potes hunc nuntium
 ignorare, et tessera seni uti continuare.',
-'acct_creation_throttle_hit' => 'Nos paenitet, etiam rationes $1 creavisti. Plurimas non tibi licet creare.',
-'emailauthenticated'         => 'Tua inscriptio electronica recognita est $1.',
+'acct_creation_throttle_hit' => 'Ex loco IP tuo, die proximo iam {{PLURAL:$1|una ratio creata est|rationes $1 creatae sunt}}.
+Plurimas non licet creare. Ergo, ex hoc loco IP rationes plurimas hodie creari non possunt.',
+'emailauthenticated'         => 'Tua inscriptio electronica recognita est $3, $2.',
 'accountcreated'             => 'Ratio creata',
 'accountcreatedtext'         => 'Ratio pro usore $1 creata est.',
 'createaccount-title'        => 'Ratio creata apud {{grammar:accusative|{{SITENAME}}}}',
@@ -521,34 +536,40 @@ Hunc nuntium ignorare potes, si nolis hac ratione uti.',
 'loginlanguagelabel'         => 'Lingua: $1',
 
 # Password reset dialog
-'resetpass'           => 'Tesseram novam creare',
-'resetpass_header'    => 'Tesseram rationis mutare',
-'resetpass_submit'    => 'Tesseram mutare et conventum aperire',
-'resetpass_success'   => 'Tessera tua prospere mutata est. Aperiens conventum...',
-'resetpass_forbidden' => 'Tesserae mutari non possunt',
-'resetpass_missing'   => 'Nulla data formarum.',
+'resetpass'                 => 'Tesseram mutare',
+'resetpass_header'          => 'Tesseram rationis mutare',
+'oldpassword'               => 'Tessera vetus:',
+'newpassword'               => 'Tessera nova:',
+'retypenew'                 => 'Adfirmare tesseram novam:',
+'resetpass_submit'          => 'Tesseram mutare et conventum aperire',
+'resetpass_success'         => 'Tessera tua prospere mutata est. Aperiens conventum...',
+'resetpass_forbidden'       => 'Tesserae mutari non possunt',
+'resetpass-no-info'         => 'Necesse est conventum aperire ad hanc paginam adhibendum.',
+'resetpass-submit-loggedin' => 'Tesseram mutare',
 
 # Edit page toolbar
-'bold_sample'    => 'Litterae pingues',
-'bold_tip'       => 'Litterae pingues',
-'italic_sample'  => 'Textus litteris italicis scriptus',
-'italic_tip'     => 'Textus litteris italicis scriptus',
-'link_sample'    => 'Titulum nexere',
-'link_tip'       => 'Nexus internus',
-'extlink_sample' => 'http://www.example.com titulus nexus externi',
-'extlink_tip'    => 'Nexus externus (memento praefixi http://)',
-'math_sample'    => 'Hic inscribe formulam',
-'math_tip'       => 'Formula mathematica (LaTeX)',
-'image_sample'   => 'Exemplum.jpg',
-'image_tip'      => 'Imago in pagina imposita',
-'media_sample'   => 'Exemplum.ogg',
-'media_tip'      => 'Nexus ad fasciculum mediorum',
-'sig_tip'        => 'Subscriptio tua cum indicatione temporis',
-'hr_tip'         => 'Linea horizontalis (noli saepe uti)',
+'bold_sample'     => 'Litterae pingues',
+'bold_tip'        => 'Litterae pingues',
+'italic_sample'   => 'Textus litteris italicis scriptus',
+'italic_tip'      => 'Textus litteris italicis scriptus',
+'link_sample'     => 'Titulum nexere',
+'link_tip'        => 'Nexus internus',
+'extlink_sample'  => 'http://www.example.com titulus nexus externi',
+'extlink_tip'     => 'Nexus externus (memento praefixi http://)',
+'headline_sample' => 'Textus capituli',
+'headline_tip'    => 'Linea capitalis scalae 2',
+'math_sample'     => 'Hic inscribe formulam',
+'math_tip'        => 'Formula mathematica (LaTeX)',
+'image_sample'    => 'Exemplum.jpg',
+'image_tip'       => 'Imago in pagina imposita',
+'media_sample'    => 'Exemplum.ogg',
+'media_tip'       => 'Nexus ad fasciculum mediorum',
+'sig_tip'         => 'Subscriptio tua cum indicatione temporis',
+'hr_tip'          => 'Linea horizontalis (noli saepe uti)',
 
 # Edit pages
-'summary'                          => 'Summarium',
-'subject'                          => 'Res/titulus',
+'summary'                          => 'Summarium:',
+'subject'                          => 'Res/titulus:',
 'minoredit'                        => 'Haec est recensio minor',
 'watchthis'                        => 'Custodire hanc paginam',
 'savearticle'                      => 'Servare hanc rem',
@@ -558,8 +579,8 @@ Hunc nuntium ignorare potes, si nolis hac ratione uti.',
 'showdiff'                         => 'Mutata ostendere',
 'anoneditwarning'                  => "'''Monitio:''' Conventum tuum non apertum. Locus IP tuus in historia huius paginae notabitur.",
 'missingcommenttext'               => 'Sententiam subter inscribe.',
-'summary-preview'                  => 'Praevisum summarii',
-'subject-preview'                  => 'Praevisum rei/tituli',
+'summary-preview'                  => 'Praevisum summarii:',
+'subject-preview'                  => 'Praevisum rei/tituli:',
 'blockedtitle'                     => 'Usor obstructus est',
 'blockedtext'                      => '<big>\'\'\'Nomen usoris aut locus IP tuus obstructus est\'\'\'</big> a magistratu $1.
 
@@ -567,24 +588,25 @@ Ratio data est: \'\'$2\'\'.
 
 * Initium obstructionis: $8
 * Finis obstructionis: $6
-* Obstructus est: $7
+* Obstructus destinatus: $7
 
 Potes ad $1 aut [[{{MediaWiki:Grouppage-sysop}}|magistratum]] alium nuntium mittere ad impedimentum disputandum.
 Nota bene te non posse proprietate "Litteras electronicas usori mittere" uti, nisi tibi est inscriptio electronica confirmata apud [[Special:Preferences|praeferentias usoris tuas]] vel si tibi etiam litterae electronicae obstructi sunt.
-Locus IP tuus est $3, et numerus obstructionis est #$5. Quaesumus te eos scripturum si quaestiones ullas roges.',
+Locus IP tuus temporarius est $3, et numerus obstructionis est #$5. Quaesumus te eos scripturum si quaestiones ullas roges.',
 'autoblockedtext'                  => 'Locus IP tuus automatice obstructus est quia usor alius, qui a magistratu $1 obstructus est, eum adhiberat.
 Ratio data est:
 
 :\'\'$2\'\'
 
-* Initium obstructionis erit: $8
-* Finis obstructionis erit: $6
+* Initium obstructionis: $8
+* Finis obstructionis: $6
+* Obstructus destinatus: $7
 
 Potes ad $1 aut [[{{MediaWiki:Grouppage-sysop}}|magistratum]] alium nuntium mittere ad impedimentum disputandum.
 
 Nota bene te non posse proprietate "Litteras electronicas usori mittere" uti, nisi tibi est inscriptio electronica confirmata apud [[Special:Preferences|praeferentias usoris tuas]].
 
-Numerus obstructionis tuus est #$5. Quaesumus te eum scripturum si quaestiones ullas roges.',
+Locus IP tuus temporarius $3 est et numerus obstructionis tuus est #$5. Quaesumus te eos scripturum si quaestiones ullas roges.',
 'blockednoreason'                  => 'nulla causa data',
 'blockedoriginalsource'            => "Fons '''$1''' subter monstratur:",
 'blockededitsource'                => "Textus '''tuarum emendationum''' in '''$1''' subter monstratur:",
@@ -605,14 +627,17 @@ Novam paginam si vis creare, in capsam infra praebitam scribe.
 (Vide [[{{MediaWiki:Helppage}}|paginam auxilii]] si plura cognoscere vis.)
 Si hic es propter errorem, solum '''Retrorsum''' in navigatro tuo preme.",
 'anontalkpagetext'                 => "----''Haec est pagina disputationis usoris anonymi, solum a loco IP suo noti. Memento locos IP aliquando mutaturos, et a usoribus multis fortasse adhibitos. Si es usor ignotus, et tibi querulae sine causa datae sunt, conventum [[Special:UserLogin/signup|crea]] vel [[Special:UserLogin|aperi]] ad confusionem futuram evitendam.''",
-'noarticletext'                    => 'In hac pagina nondum litterae sunt. Potes etiam [[Special:Search/{{PAGENAME}}|hanc rem in aliis paginis quaerere]] aut [{{fullurl:{{FULLPAGENAME}}|action=edit}} hanc paginam creare].',
+'noarticletext'                    => 'Hac in pagina non sunt litterae.
+Potes [[Special:Search/{{PAGENAME}}|hanc rem in aliis paginis quaerere]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} acta huius paginae videre]
+aut [{{fullurl:{{FULLPAGENAME}}|action=edit}} hanc paginam creare]</span>.',
 'userpage-userdoesnotexist'        => 'Usor "$1" non est. Visne re vera hanc paginam creare vel recensere?',
 'updated'                          => '(Novata)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Memento hanc paginam solum praevisum esse, neque iam servatam!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Memento hanc paginam solum praevisum esse, neque iam servatam!'''",
 'editing'                          => 'Recensio paginae "$1"',
 'editingsection'                   => 'Recensens $1 (partem)',
-'editingcomment'                   => 'Recensens $1 (adnotum)',
+'editingcomment'                   => 'Recensens $1 (nova pars)',
 'editconflict'                     => 'Contentio recensionis: $1',
 'explainconflict'                  => "Alius hanc paginam mutavit postquam eadem recensere incipiebas.
 Capsa superior paginae verba recentissima continet.
@@ -621,34 +646,48 @@ Mutationes tuae in verba superiora adiungare debes.
 '''Solum''' verba capsae superioris servabuntur quando \"Servare hanc rem\" premes.",
 'yourtext'                         => 'Sententia tua',
 'storedversion'                    => 'Verba recentissima',
-'nonunicodebrowser'                => '<strong>CAVETO: Navigatorium retiale tuum systemati UNICODE morem non gerit. Modum habemus quo commentationes sine damno recenseas: litterae non-ASCII in capsa sub veste hexadecimali ostendentur.</strong>',
-'editingold'                       => '<strong>MONITIO: Formam obsoletam huius paginae mutas.
-Si eam servaveris, omnes mutationes recentiores obrogatae peribunt!</strong>',
+'nonunicodebrowser'                => "'''CAVETO: Navigatorium retiale tuum systemati UNICODE morem non gerit. Modum habemus quo commentationes sine damno recenseas: litterae non-ASCII in capsa sub veste hexadecimali ostendentur.'''",
+'editingold'                       => "'''MONITIO: Emendationem obsoletam huius paginae mutas.
+Si eam servaveris, omnes mutationes recentiores obrogatae peribunt!'''",
 'yourdiff'                         => 'Dissimilitudo',
-'copyrightwarning'                 => 'Nota bene omnia contributa divulgari sub \'\'$2\'\' (vide singula apud $1).
+'copyrightwarning'                 => "Nota bene omnia contributa divulgari sub ''\$2'' (vide singula apud \$1).
 Nisi vis verba tua crudelissime recenseri, mutari, et ad libidinem redistribui, noli ea submittere.<br />
-Nobis etiam spondes te esse ipsum horum verborum scriptorem primum, aut ex opere in "dominio publico" exscripsisse.
-<strong>NOLI OPERIBUS SUB IURE DIVULGANDI UTI SINE POTESTATE!</strong>',
-'copyrightwarning2'                => 'Nota bene omnia contributa apud {{grammar:accusative|{{SITENAME}}}} ab aliis recenseri, mutari vel removi posse.
+Nobis etiam spondes te esse ipsum horum verborum scriptorem primum, aut ex opere in \"dominio publico\" exscripsisse.
+'''NOLI OPERIBUS SUB IURE DIVULGANDI UTI SINE POTESTATE!'''",
+'copyrightwarning2'                => "Nota bene omnia contributa apud {{grammar:accusative|{{SITENAME}}}} ab aliis recenseri, mutari vel removi posse.
 Nisi vis verba tua crudelissime recenseri, noli ea submittere.<br />
-Nobis etiam spondes te esse ipsum horum verborum scriptorem primum, aut ex opere in "dominio publico" vel ex  libere fonte simili exscripsisse (vide singula apud $1).
-<strong>NOLI OPERIBUS SUB IURE DIVULGANDI UTI SINE POTESTATE!</strong>',
+Nobis etiam spondes te esse ipsum horum verborum scriptorem primum, aut ex opere in \"dominio publico\" vel ex  libere fonte simili exscripsisse (vide singula apud \$1).
+'''NOLI OPERIBUS SUB IURE DIVULGANDI UTI SINE POTESTATE!'''",
 'longpagewarning'                  => 'MONITIO: Haec pagina est $1 chilioctetis longa;
 aliquae navigatra paginas longiores quam 32 chiliocteti recensere non possunt.
 Considera paginam in partes minores frangere.',
-'protectedpagewarning'             => '<strong>CAVE: Haec pagina protecta est ut magistratus soli eam recenseant.</strong>',
+'protectedpagewarning'             => "'''CAVE: Haec pagina protecta est ut magistratus soli eam recenseant.'''",
 'templatesused'                    => 'Formulae hac in pagina adhibitae:',
 'templatesusedpreview'             => 'Formulae hoc in praeviso adhibitae:',
 'templatesusedsection'             => 'Formulae hac in parte adhibitae:',
 'template-protected'               => '(protecta)',
 'template-semiprotected'           => '(semi-protecta)',
 'hiddencategories'                 => 'Haec pagina ad {{PLURAL:$1|unam categoriam celatam|$1 categorias celatas}} pertinet:',
+'nocreatetitle'                    => 'Creatio paginarum coercita',
 'nocreate-loggedin'                => 'Tibi non licet paginas novas creare.',
 'permissionserrors'                => 'Errores permissionis',
-'permissionserrorstext-withaction' => 'Tibi non licet $2, quia:',
+'permissionserrorstext-withaction' => 'Tibi non licet $2, ex {{PLURAL:$1|ratione|rationibus}}:',
 'recreate-deleted-warn'            => "'''Cave: paginam qui antea iam deleta est creas.'''
 
 Tibi oportet meditari utrum hanc paginam creare tamen convenit. Commodule notatio paginarum deletarum hic datur:",
+'deleted-notice'                   => 'Haec pagina deleta est. Commodule notatio paginarum deletarum subter datur.',
+'deletelog-fulllog'                => 'Inspicere acta plenissima',
+'edit-hook-aborted'                => 'Recensio a hamo abrogata est.
+Hamus nullam causam dedit.',
+'edit-gone-missing'                => 'Non potui paginam modificare.
+Haec pagina deleta esse videtur.',
+'edit-conflict'                    => 'Contentio recensionis.',
+'edit-no-change'                   => 'Recensio tua non servata est, quia contenta paginae non mutavisti.',
+'edit-already-exists'              => 'Non potui paginam novam creare
+quia haec pagina iam est.',
+
+# Parser/template warnings
+'parser-template-loop-warning' => 'Ansa formulae detecta: [[$1]]',
 
 # "Undo" feature
 'undo-norev'   => 'Recensio abrogari non potuit quia non est aut deleta est.',
@@ -661,84 +700,154 @@ Tibi oportet meditari utrum hanc paginam creare tamen convenit. Commodule notati
 Ille hanc causam dedit: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vide acta huius paginae',
-'nohistory'           => 'Huic paginae non est historia.',
-'revnotfound'         => 'Emendatio non inventa',
-'revnotfoundtext'     => 'Emendatio quem rogavisti non inventa est.
-Confirma URL paginae.',
-'currentrev'          => 'Emendatio recentissima',
-'revisionasof'        => 'Emendatio ex $1',
-'revision-info'       => 'Emendatio ex $1 ab $2',
-'previousrevision'    => '� Emendatio senior',
-'nextrevision'        => 'Emendatio novior →',
-'currentrevisionlink' => 'Emendatio currens',
-'cur'                 => 'nov',
-'next'                => 'seq',
-'last'                => 'prox',
-'page_first'          => 'prim',
-'page_last'           => 'ult',
-'histlegend'          => 'Selige pro dissimilitudine: indica in botones radiales et "intrare" in claviatura imprime ut conferas.
-
-Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma proxima, M = recensio minor',
-'deletedrev'          => '[deleta]',
-'histfirst'           => 'Veterrimus',
-'histlast'            => 'Novissimus',
-'historysize'         => '({{PLURAL:$1|1 octetus|$1 octeti}})',
-'historyempty'        => '(vacua)',
+'viewpagelogs'           => 'Vide acta huius paginae',
+'nohistory'              => 'Huic paginae non est historia.',
+'currentrev'             => 'Emendatio recentissima',
+'currentrev-asof'        => 'Emendatio recentissima ex $1',
+'revisionasof'           => 'Emendatio ex $1',
+'revision-info'          => 'Emendatio ex $1 ab $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Emendatio senior',
+'nextrevision'           => 'Emendatio novior →',
+'currentrevisionlink'    => 'Emendatio currens',
+'cur'                    => 'nov',
+'next'                   => 'seq',
+'last'                   => 'prox',
+'page_first'             => 'prim',
+'page_last'              => 'ult',
+'histlegend'             => "Selige pro dissimilitudine: indica emendationes in botones radiales et \"intrare\" in claviatura vel \"comparatio\" imprime ut conferas.<br />
+Titulus: '''({{int:cur}})''' = dissimilis ab emendatione novissima,
+'''({{int:last}})''' = dissimilis ab emendatione proxima, '''{{int:minoreditletter}}''' = recensio minor.",
+'history-fieldset-title' => 'Quaerere in paginae historia',
+'deletedrev'             => '[deleta]',
+'histfirst'              => 'Veterrimus',
+'histlast'               => 'Novissimus',
+'historysize'            => '({{PLURAL:$1|1 octetus|$1 octeti}})',
+'historyempty'           => '(vacua)',
 
 # Revision feed
 'history-feed-title'          => 'Historia',
 'history-feed-item-nocomment' => '$1 ad $2', # user at time
 
 # Revision deletion
-'rev-deleted-user' => '(nomen usoris remotum est)',
-'rev-delundel'     => 'monstrare/celare',
-'revisiondelete'   => 'Emendationem delere',
-'pagehist'         => 'Historia paginae',
-'revdelete-uname'  => 'nomen usoris',
+'rev-deleted-comment'    => '(summarium celatum)',
+'rev-deleted-user'       => '(nomen usoris celatum est)',
+'rev-deleted-event'      => '(perscriptio celata)',
+'rev-delundel'           => 'monstrare/celare',
+'revisiondelete'         => 'Emendationem delere',
+'revdelete-selected'     => "'''{{PLURAL:$2|Emendatio selecta|Emendationes selectae}} paginae [[:$1]]:'''",
+'revdelete-hide-text'    => 'Celare textum emendationis',
+'revdelete-hide-comment' => 'Celare summarium emendationis',
+'revdelete-hide-image'   => 'Celare contentum fasciculi',
+'revdelete-log'          => 'Summarium pro actis:',
+'revdel-restore'         => 'Visibilitatem mutare',
+'pagehist'               => 'Historia paginae',
+'deletedhist'            => 'Historia deleta',
+'revdelete-content'      => 'contenta',
+'revdelete-summary'      => 'summarium recensionis',
+'revdelete-uname'        => 'nomen usoris',
+'revdelete-hid'          => 'celavit $1',
+'revdelete-unhid'        => 'monstravit $1',
+'revdelete-log-message'  => '$1 {{PLURAL:$2|unius emendationis|$2 emendationum}}',
+'logdelete-log-message'  => '$1 {{PLURAL:$2|unius eventi|$2 eventorum}}',
 
 # History merging
-'mergehistory-from' => 'Pagina imponenda:',
-'mergehistory-into' => 'Pagina petita:',
+'mergehistory-from'        => 'Pagina imponenda:',
+'mergehistory-into'        => 'Pagina petita:',
+'mergehistory-submit'      => 'Confundere emendationes',
+'mergehistory-autocomment' => 'confundavit [[:$1]] cum [[:$2]]',
+'mergehistory-comment'     => 'confundavit [[:$1]] cum [[:$2]]: $3',
+
+# Merge log
+'mergelog'    => 'Acta confundendi',
+'revertmerge' => 'Inconfundere',
 
 # Diffs
 'history-title'           => 'Historia paginae "$1"',
 'difference'              => '(Dissimilitudo inter emendationes)',
+'lineno'                  => 'Linea $1:',
 'compareselectedversions' => 'Conferre versiones selectas',
+'visualcomparison'        => 'Comparatio visualis',
+'wikicodecomparison'      => 'Comparatio vicitexti',
 'editundo'                => 'abrogare',
+'diff-added'              => '$1 additum',
+'diff-src'                => 'fons',
+'diff-withdestination'    => 'cum destinatione $1',
+'diff-with'               => '&#32;cum $1 $2',
+'diff-with-final'         => '&#32;et $1 $2',
+'diff-width'              => 'amplitudo',
+'diff-height'             => 'altitudo',
+'diff-p'                  => "'''paragraphus'''",
+'diff-blockquote'         => "'''citatus'''",
+'diff-h1'                 => "'''capitulum (scalae 1)'''",
+'diff-h2'                 => "'''capitulum (scalae 2)'''",
+'diff-h3'                 => "'''capitulum (scalae 3)'''",
+'diff-h4'                 => "'''capitulum (scalae 4)'''",
+'diff-h5'                 => "'''capitulum (scalae 5)'''",
+'diff-pre'                => "'''copia praeformata'''",
+'diff-div'                => "'''divisio'''",
+'diff-table'              => "'''tabula'''",
+'diff-tr'                 => "'''linea'''",
+'diff-td'                 => "'''cella'''",
+'diff-th'                 => "'''capitulum'''",
+'diff-hr'                 => "'''linea horizontalis'''",
+'diff-dd'                 => "'''definitio'''",
+'diff-form'               => "'''forma'''",
+'diff-img'                => "'''imago'''",
+'diff-span'               => "'''diductio'''",
+'diff-a'                  => "'''nexus'''",
+'diff-i'                  => "'''litterae obliquae'''",
+'diff-b'                  => "'''litterae pingues'''",
+'diff-strong'             => "'''fortis'''",
+'diff-em'                 => "'''emphasis'''",
+'diff-font'               => "'''series litterarum'''",
+'diff-big'                => "'''magnum'''",
+'diff-del'                => "'''deleta'''",
+'diff-tt'                 => "'''amplitudo certa'''",
+'diff-sub'                => "'''subscriptum'''",
+'diff-sup'                => "'''superscriptum'''",
+'diff-strike'             => "'''talea transversalis'''",
 
 # Search results
-'searchresults'         => 'Eventum investigationis',
-'searchresulttext'      => 'Pro plurimis nuntiis de investigatione in {{grammar:ablative|{{SITENAME}}}}, vide [[{{MediaWiki:Helppage}}|{{MediaWiki:Help}}]].',
-'searchsubtitle'        => 'Quaesitum est \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|omnes paginae quarum titulus incipit litteris "$1"]] | [[Special:WhatLinksHere/$1|omnes paginae quae ad "$1" nectunt]])',
-'searchsubtitleinvalid' => 'Pro investigatione "$1"',
-'noexactmatch'          => "'''Nulla pagina cum titulo \"\$1\" exacto existit.''' Potes [[:\$1|eam creare]].",
-'noexactmatch-nocreate' => "'''Nulla pagina cum titulo \"\$1\" exacto existit.'''",
-'titlematches'          => 'Exaequata indicibus rerum',
-'notitlematches'        => 'Nulla exaequata',
-'notextmatches'         => 'Nihil verbis quaesitis congruit',
-'prevn'                 => '$1 superiores',
-'nextn'                 => '$1 proxima',
-'viewprevnext'          => 'Videre ($1) ($2) ($3).',
-'search-result-size'    => '$1 ({{PLURAL:$2|1 verbum|$2 verba}})',
-'search-result-score'   => 'Gravitas: $1%',
-'search-redirect'       => '(redirectio $1)',
-'search-section'        => '(pars $1)',
-'search-suggest'        => 'Nonne dicere voluisti: $1',
-'search-interwiki-more' => '(plus)',
-'search-relatedarticle' => 'Relata',
-'searchrelated'         => 'relata',
-'searchall'             => 'omnia',
-'showingresults'        => "Subter monstrans {{PLURAL:$1|'''1''' eventu|'''$1''' eventibus}} tenus incipiens ab #'''$2'''.",
-'showingresultsnum'     => "Subter monstrans {{PLURAL:$3|'''1''' eventum|'''$3''' eventus}} incipiens ab #'''$2'''.",
-'showingresultstotal'   => "Subter monstrans {{PLURAL:$3|eventum '''$1''' ex '''$3'''|eventus '''$1 - $2''' ex '''$3'''}}",
-'nonefound'             => "'''Nota''': investigationes saepe infelices sunt propter verba frequentes huiusmodi \"que\" et \"illo\", aut quod plus unum verba quaerere designavisti (solae paginae qui tota verba investigationis continent in evento apparebit).",
-'powersearch'           => 'Quaerere',
-'powersearch-legend'    => 'Quaerere',
-'powersearch-ns'        => 'Quaerere in spatiis nominalibus:',
-'powersearch-redir'     => 'Monstrare redirectiones',
-'powersearch-field'     => 'Quaerere',
-'searchdisabled'        => 'Per {{grammar:accusative|{{SITENAME}}}} ad tempus non potes quaerere. Interea per [http://www.google.com Googlem] quaeras. Nota indices {{grammar:genitive|{{SITENAME}}}} contentorum apud Googlem fortasse antiquiores esse.',
+'searchresults'            => 'Eventum investigationis',
+'searchresulttext'         => 'Pro plurimis nuntiis de investigatione in {{grammar:ablative|{{SITENAME}}}}, vide [[{{MediaWiki:Helppage}}|{{MediaWiki:Help}}]].',
+'searchsubtitle'           => 'Quaesitum est \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|omnes paginae quarum titulus incipit litteris "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|omnes paginae quae ad "$1" nectunt]])',
+'searchsubtitleinvalid'    => 'Pro investigatione "$1"',
+'noexactmatch'             => "'''Nulla pagina cum titulo \"\$1\" exacto existit.''' Potes [[:\$1|eam creare]].",
+'noexactmatch-nocreate'    => "'''Nulla pagina cum titulo \"\$1\" exacto existit.'''",
+'titlematches'             => 'Exaequata indicibus rerum',
+'notitlematches'           => 'Nulla exaequata',
+'notextmatches'            => 'Nihil verbis quaesitis congruit',
+'prevn'                    => '$1 superiores',
+'nextn'                    => '$1 proxima',
+'viewprevnext'             => 'Videre ($1) ($2) ($3).',
+'searchmenu-exists'        => "'''Iam est pagina \"[[:\$1]]\"'''",
+'searchmenu-new'           => "'''Creare paginam \"[[:\$1]]\"'''",
+'searchhelp-url'           => 'Help:Adiutatum',
+'searchprofile-project'    => 'Paginae incepti',
+'searchprofile-images'     => 'Fasciculi',
+'searchprofile-everything' => 'Omnia',
+'searchprofile-advanced'   => 'Callidissime',
+'search-result-size'       => '$1 ({{PLURAL:$2|1 verbum|$2 verba}})',
+'search-result-score'      => 'Gravitas: $1%',
+'search-redirect'          => '(redirectio $1)',
+'search-section'           => '(pars $1)',
+'search-suggest'           => 'Nonne dicere voluisti: $1',
+'search-interwiki-default' => '$1 eventa:',
+'search-interwiki-more'    => '(plus)',
+'search-relatedarticle'    => 'Relata',
+'searchrelated'            => 'relata',
+'searchall'                => 'omnia',
+'showingresults'           => "Subter monstrans {{PLURAL:$1|'''1''' eventu|'''$1''' eventibus}} tenus incipiens ab #'''$2'''.",
+'showingresultsnum'        => "Subter monstrans {{PLURAL:$3|'''1''' eventum|'''$3''' eventus}} incipiens ab #'''$2'''.",
+'showingresultstotal'      => "Subter monstrans {{PLURAL:$4|eventum '''$1''' ex '''$3'''|eventus '''$1 - $2''' ex '''$3'''}}",
+'nonefound'                => "'''Note''': Only some namespaces are searched by default.
+Try prefixing your query with ''all:'' to search all content (including talk pages, templates, etc), or use the desired namespace as prefix.",
+'powersearch'              => 'Quaerere callidissime',
+'powersearch-legend'       => 'Quaerere callidissime',
+'powersearch-ns'           => 'Quaerere in spatiis nominalibus:',
+'powersearch-redir'        => 'Monstrare redirectiones',
+'powersearch-field'        => 'Quaerere',
+'searchdisabled'           => 'Per {{grammar:accusative|{{SITENAME}}}} ad tempus non potes quaerere. Interea per [http://www.google.com Googlem] quaeras. Nota indices {{grammar:genitive|{{SITENAME}}}} contentorum apud Googlem fortasse antiquiores esse.',
 
 # Preferences page
 'preferences'              => 'Praeferentiae',
@@ -755,6 +864,7 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 'qbsettings-floatingright' => 'Innens a dextra',
 'changepassword'           => 'Tesseram mutare',
 'skin'                     => 'Aspectum',
+'skin-preview'             => 'Praevisum',
 'math'                     => 'Interpretatio artis mathematicae',
 'dateformat'               => 'Forma diei',
 'datedefault'              => 'Nullum praeferentiae',
@@ -768,14 +878,14 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 'prefs-rc'                 => 'Nuper mutata',
 'prefs-watchlist'          => 'Paginae custoditae',
 'prefs-watchlist-days'     => 'Numerus dierum displicandus in paginis tuis custoditis:',
+'prefs-watchlist-days-max' => '(maximum 7 dies)',
 'prefs-watchlist-edits'    => 'Numerus recensionum displicandus in paginis tuis custoditis extensis:',
 'prefs-misc'               => 'Misc',
+'prefs-resetpass'          => 'Tesseram mutare',
 'saveprefs'                => 'Servare praeferentias',
 'resetprefs'               => 'Reddere praeferentias',
-'oldpassword'              => 'Tessera vetus:',
-'newpassword'              => 'Tessera nova:',
-'retypenew'                => 'Adfirmare tesseram novam:',
 'textboxsize'              => 'Mensura capsae verbi',
+'prefs-edit-boxsize'       => 'Magnitudo capsae recensionis.',
 'rows'                     => 'Lineae:',
 'columns'                  => 'Columnae:',
 'searchresultshead'        => 'Figuratio eventorum investigationis',
@@ -787,9 +897,11 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 'savedprefs'               => 'Praeferentiae tuae servatae sunt.',
 'timezonelegend'           => 'Zona temporis',
 'timezonetext'             => '¹Numerus horarum inter horam tuam et illam moderatri (UTC).',
-'localtime'                => 'Hora indigena',
-'timezoneoffset'           => 'Dissimilitudo cinguli horae¹',
-'servertime'               => 'Hora moderatri nunc est',
+'localtime'                => 'Hora indigena:',
+'timezoneselect'           => 'Zona temporis:',
+'timezoneuseoffset'        => 'Alia (da dissimilitudinem cinguli horae)',
+'timezoneoffset'           => 'Dissimilitudo cinguli horae¹:',
+'servertime'               => 'Hora moderatri:',
 'guesstimezone'            => 'Hora ex navigatro scribere',
 'allowemail'               => 'Sinere litteras electronicas inscriptioni electronicae meae mittere',
 'prefs-namespaces'         => 'Spatia nominalia',
@@ -798,30 +910,37 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 'files'                    => 'Fasciculi',
 
 # User rights
-'userrights'               => 'Usorum potestas', # Not used as normal message but as header for the special page itself
+'userrights'               => 'Usorum potestates', # Not used as normal message but as header for the special page itself
 'userrights-user-editname' => 'Nomen usoris inscribe:',
 'editusergroup'            => 'Greges usorum recensere',
-'editinguser'              => "Modificare iura usoris '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "Modificare potestates usoris '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'Greges usorum recensere',
+'userrights-groupsmember'  => 'In grege aut in gregibus:',
 'userrights-reason'        => 'Causa modificationis:',
 
 # Groups
-'group'            => 'Grex:',
-'group-user'       => 'Usores',
-'group-bot'        => 'Automata',
-'group-sysop'      => 'Magistratus',
-'group-bureaucrat' => 'Grapheocrates',
-'group-all'        => '(omnes)',
-
-'group-user-member'       => 'Usor',
-'group-bot-member'        => 'Automaton',
-'group-sysop-member'      => 'Magistratus',
-'group-bureaucrat-member' => 'Grapheocrates',
-
-'grouppage-user'       => '{{ns:project}}:Usores',
-'grouppage-bot'        => '{{ns:project}}:Automata',
-'grouppage-sysop'      => '{{ns:project}}:Magistratus',
-'grouppage-bureaucrat' => '{{ns:project}}:Grapheocrates',
+'group'               => 'Grex:',
+'group-user'          => 'Usores',
+'group-autoconfirmed' => 'Usores adfirmati automaticale',
+'group-bot'           => 'Automata',
+'group-sysop'         => 'Magistratus',
+'group-bureaucrat'    => 'Grapheocrates',
+'group-suppress'      => 'Censurae',
+'group-all'           => '(omnes)',
+
+'group-user-member'          => 'Usor',
+'group-autoconfirmed-member' => 'Usor adfirmatus automaticale',
+'group-bot-member'           => 'Automaton',
+'group-sysop-member'         => 'Magistratus',
+'group-bureaucrat-member'    => 'Grapheocrates',
+'group-suppress-member'      => 'Censura',
+
+'grouppage-user'          => '{{ns:project}}:Usores',
+'grouppage-autoconfirmed' => '{{ns:project}}:Usores adfirmati automaticale',
+'grouppage-bot'           => '{{ns:project}}:Automata',
+'grouppage-sysop'         => '{{ns:project}}:Magistratus',
+'grouppage-bureaucrat'    => '{{ns:project}}:Grapheocrates',
+'grouppage-suppress'      => '{{ns:project}}:Observator',
 
 # Rights
 'right-read'                 => 'Paginas legere',
@@ -832,6 +951,8 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 'right-minoredit'            => 'Recensiones minores designare',
 'right-move'                 => 'Paginas movere',
 'right-move-subpages'        => 'Paginas una cum subpaginis movere',
+'right-move-rootuserpages'   => 'Paginas usorum movere',
+'right-movefile'             => 'Fasciculos movere',
 'right-suppressredirect'     => 'Non creare redirectionem ex titulo vetere paginam movendo',
 'right-upload'               => 'Fasciculos imponere',
 'right-upload_by_url'        => 'Fasciculum imponere ex inscriptione URL',
@@ -861,6 +982,37 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 # User rights log
 'rightslog'     => 'Index mutationum iuribus usorum',
 'rightslogtext' => 'Haec est index mutationum iuribus usorum.',
+'rightsnone'    => '(nullus)',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'hanc paginam legere',
+'action-edit'                 => 'hanc paginam recensere',
+'action-createpage'           => 'paginas creare',
+'action-createtalk'           => 'paginas disputationis creare',
+'action-createaccount'        => 'hanc rationem usoris creare',
+'action-minoredit'            => 'hanc recensionem minorem designare',
+'action-move'                 => 'hanc paginam movere',
+'action-move-subpages'        => 'hanc paginam una cum subpaginis movere',
+'action-move-rootuserpages'   => 'paginas usorum movere',
+'action-movefile'             => 'hunc fasciculum movere',
+'action-upload'               => 'hunc fasciculum imponere',
+'action-upload_by_url'        => 'hunc fasciculum imponere ex inscriptione URL',
+'action-delete'               => 'hanc paginam delere',
+'action-deleterevision'       => 'hanc emendationem delere',
+'action-browsearchive'        => 'paginas deletas quaerere',
+'action-undelete'             => 'hanc paginam restituere',
+'action-suppressrevision'     => 'hanc emendationem magistratus celatam inspicere vel restituere',
+'action-suppressionlog'       => 'haec acta privata inspicere',
+'action-block'                => 'hunc usorem obstruere ne recensere potest',
+'action-protect'              => 'protectionem huius paginae mutare',
+'action-import'               => 'paginam ex vico alio importare',
+'action-importupload'         => 'paginam ex fasciculo imponendo importare',
+'action-unwatchedpages'       => 'indicem paginarum non custoditarum inspicere',
+'action-trackback'            => 'praebere retronexum',
+'action-mergehistory'         => 'historiam huius paginae confundere',
+'action-userrights'           => 'omnes potestates usorum recensere',
+'action-userrights-interwiki' => 'potestates usorum aliis in vicis recensere',
+'action-siteadmin'            => 'basem datorum obstruere vel deobstruere',
 
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|mutatio|mutationes}}',
@@ -889,7 +1041,7 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 # Recent changes linked
 'recentchangeslinked'         => 'Nuper mutata annexorum',
 'recentchangeslinked-title'   => 'Nuper mutata in paginis quibus pagina "$1" nectit',
-'recentchangeslinked-summary' => "Subter sunt nuperrime mutata paginis annexis. Paginae a te custoditae '''litteris pinguis''' monstrantur.",
+'recentchangeslinked-summary' => "Subter sunt nuperrime mutata paginis annexis. Paginae a [[Special:Watchlist|te custoditae]] '''litteris pinguis''' monstrantur.",
 'recentchangeslinked-page'    => 'Titulus paginae:',
 
 # Upload
@@ -901,18 +1053,19 @@ Titulus: (nov) = dissimilis ab forma novissima, (prox) = dissimilis ab forma pro
 'uploadnologintext'  => 'Oportet [[Special:UserLogin|aperire conventum]] ut fasciculos imponas.',
 'uploaderror'        => 'Imponendi erratum',
 'uploadtext'         => "Utere formam subter ad fasciculos imponendos.
-Ut fasciculos antea impositos videas aut quaeras, adi ad [[Special:ImageList|indicem fasciculorum impositorum]]. Fasciculi impositi et deleti quoque in [[Special:Log/upload|notatione fasciculorum impositorum]] notantur.
+Ut fasciculos antea impositos videas aut quaeras, adi ad [[Special:FileList|indicem fasciculorum impositorum]]. Fasciculi impositi et deleti quoque in [[Special:Log/upload|notatione fasciculorum impositorum]] notantur.
 
-Ad fasciculum in pagina includendum, utere nexu
-'''<nowiki>[[</nowiki>{{ns:image}}:Fasciculus.jpg]]''' aut
-'''<nowiki>[[</nowiki>{{ns:image}}:Fasciculus.png|verba alia]]''' aut
-'''<nowiki>[[</nowiki>{{ns:media}}:Fasciculus.ogg]]''' pro nexum ad fasciculum directum.",
+Ad fasciculum in pagina includendum, utere nexu:
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fasciculus.jpg]]''' aut
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fasciculus.png|verba alia]]''' aut
+*'''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fasciculus.ogg]]''' pro nexum ad fasciculum directum.",
 'upload-permitted'   => 'Genera fasciculorum licita: $1.',
 'upload-preferred'   => 'Genera fasciculorum suasa: $1.',
+'upload-prohibited'  => 'Typi fasciculorum vetiti: $1.',
 'uploadlog'          => 'notatio fasciculorum impositorum',
 'uploadlogpage'      => 'Notatio fasciculorum impositorum',
 'uploadlogpagetext'  => 'Subter est index fasciculorum recentissimorum impositorum.
-Vide etiam [[Special:NewImages|pinacothecam fasciculorum recentissimorum impositorum]].',
+Vide etiam [[Special:NewFiles|pinacothecam fasciculorum recentissimorum impositorum]].',
 'filename'           => 'Nomen fasciculi',
 'filedesc'           => 'Summarium',
 'fileuploadsummary'  => 'Summarium:',
@@ -923,6 +1076,7 @@ Vide etiam [[Special:NewImages|pinacothecam fasciculorum recentissimorum imposit
 'ignorewarnings'     => 'Ignorare monita omnia',
 'minlength1'         => 'Nomina fasciculorum saltem unam litteram habere debent.',
 'badfilename'        => 'Nomen fasciculi ad "$1" mutatum est.',
+'filetype-missing'   => 'Fasciculus extensionem non habet (sicut e.&nbsp;g. ".jpg").',
 'large-file'         => 'Suasum est ut fasciculi $1 magnitudine non excedant; magnitudo huius fasciculi est $2.',
 'fileexists-thumb'   => "<center>'''Imago quae iam est'''</center>",
 'successfulupload'   => 'Impositum est perfectum',
@@ -941,38 +1095,48 @@ Vide etiam [[Special:NewImages|pinacothecam fasciculorum recentissimorum imposit
 Tibi oportet meditari utrum hunc fasciculum iterum imponere tamen convenit.
 Commodule notatio fasciculorum deletorum hic datur:",
 
-'upload-file-error' => 'Erratum internum',
+'upload-proto-error' => 'Protocollum incorrectum',
+'upload-file-error'  => 'Erratum internum',
 
+'license'           => 'Typus permissionis:',
+'nolicense'         => 'Nulla selecta',
 'license-nopreview' => '(Praevisum monstrari non potest)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => 'fasciculus',
-'imagelist'             => 'Fasciculorum index',
-'imagelist_name'        => 'Nomen',
-'imagelist_user'        => 'Usor',
-'imagelist_size'        => 'Magnitudo',
-'imagelist_description' => 'Descriptio',
-
-# Image description page
-'filehist'                  => 'Historia fasciculi',
-'filehist-help'             => 'Ad emendationem fasciculi inspiciendum, preme in diem/tempus.',
-'filehist-deleteall'        => 'delere omnes emendationes',
-'filehist-deleteone'        => 'delere',
-'filehist-revert'           => 'revertere',
-'filehist-current'          => 'recentissima',
-'filehist-datetime'         => 'Dies/Tempus',
-'filehist-user'             => 'Usor',
-'filehist-dimensions'       => 'Dimensiones',
-'filehist-filesize'         => 'Magnitudo fasciculi',
-'filehist-comment'          => 'Sententia',
-'imagelinks'                => 'Nexus',
-'linkstoimage'              => '{{PLURAL:$1|Haec pagina ad hunc fasciculum nectit:|Paginae sequentes ad hunc fasciculum nectunt:}}',
-'nolinkstoimage'            => 'Nullae paginae ad hunc fasciculum nectunt.',
-'morelinkstoimage'          => 'Videre [[Special:WhatLinksHere/$1|plures nexus]] ad hunc fasciculum.',
-'redirectstofile'           => '{{PLURAL:$1|Fasciculus sequens ad hunc fasciculum redirigit:|Hae $1 fasciculi sequentes ad hunc fasciculum redirigunt:}}',
-'noimage'                   => 'Fasciculus huius nominis non est, sed $1 potes.',
-'noimage-linktext'          => 'fasciculum imponere',
-'uploadnewversion-linktext' => 'Emendationem novam huius fasciculi imponere',
+'listfiles'             => 'Fasciculorum index',
+'listfiles_date'        => 'Dies',
+'listfiles_name'        => 'Nomen',
+'listfiles_user'        => 'Usor',
+'listfiles_size'        => 'Magnitudo',
+'listfiles_description' => 'Descriptio',
+'listfiles_count'       => 'Emendationes',
+
+# File description page
+'filehist'                       => 'Historia fasciculi',
+'filehist-help'                  => 'Ad emendationem fasciculi inspiciendum, preme in diem/tempus.',
+'filehist-deleteall'             => 'delere omnes emendationes',
+'filehist-deleteone'             => 'delere',
+'filehist-revert'                => 'revertere',
+'filehist-current'               => 'recentissima',
+'filehist-datetime'              => 'Dies/Tempus',
+'filehist-thumb'                 => 'Pollicisunguis',
+'filehist-thumbtext'             => 'Pollicisunguis emendationis ex $1',
+'filehist-nothumb'               => 'Nullus pollicisunguis',
+'filehist-user'                  => 'Usor',
+'filehist-dimensions'            => 'Dimensiones',
+'filehist-filesize'              => 'Magnitudo fasciculi',
+'filehist-comment'               => 'Sententia',
+'imagelinks'                     => 'Nexus ad fasciculum',
+'linkstoimage'                   => '{{PLURAL:$1|Haec pagina ad hunc fasciculum nectit:|Paginae sequentes ad hunc fasciculum nectunt:}}',
+'nolinkstoimage'                 => 'Nullae paginae ad hunc fasciculum nectunt.',
+'morelinkstoimage'               => 'Videre [[Special:WhatLinksHere/$1|plures nexus]] ad hunc fasciculum.',
+'redirectstofile'                => '{{PLURAL:$1|Fasciculus sequens ad hunc fasciculum redirigit:|Hae $1 fasciculi sequentes ad hunc fasciculum redirigunt:}}',
+'shareduploadduplicate-linktext' => 'fasciculus alius',
+'shareduploadconflict-linktext'  => 'fasciculus alius',
+'noimage'                        => 'Fasciculus huius nominis non est, sed $1 potes.',
+'noimage-linktext'               => 'fasciculum imponere',
+'uploadnewversion-linktext'      => 'Emendationem novam huius fasciculi imponere',
 
 # File reversion
 'filerevert'                => 'Revertere $1',
@@ -986,19 +1150,21 @@ Commodule notatio fasciculorum deletorum hic datur:",
 # File deletion
 'filedelete'                  => 'Delere $1',
 'filedelete-legend'           => 'Fasciculum delere',
-'filedelete-intro'            => "Deles '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Deles fasciculum '''[[Media:$1|$1]]''' una cum tota eius historia.",
 'filedelete-intro-old'        => "Deles fasciculi '''[[Media:$1|$1]]''' emendationem [$4 ex $3, $2].",
 'filedelete-comment'          => 'Causa deletionis:',
 'filedelete-submit'           => 'Delere',
 'filedelete-success'          => "'''$1''' deletum est.",
 'filedelete-success-old'      => "Emendatio fasciculi '''[[Media:$1|$1]]''' ex $3, $2 deletum est.",
-'filedelete-iscurrent'        => 'Emendationem recentissimam huius fasciculi delere conaris. Necesse est antea ad aliam emendationem reverti.',
+'filedelete-nofile'           => "'''$1''' non existit.",
 'filedelete-otherreason'      => 'Causa alia vel explicatio:',
 'filedelete-reason-otherlist' => 'Causa alia',
 'filedelete-edit-reasonlist'  => 'Causas deletionum fasciculorum recensere',
 
 # MIME search
 'mimesearch' => 'Quaerere per MIME',
+'mimetype'   => 'Typus MIME:',
+'download'   => 'depromere',
 
 # Unwatched pages
 'unwatchedpages' => 'Paginae incustoditae',
@@ -1007,33 +1173,36 @@ Commodule notatio fasciculorum deletorum hic datur:",
 'listredirects' => 'Redirectiones',
 
 # Unused templates
-'unusedtemplates' => 'Formulae non in usu',
+'unusedtemplates'    => 'Formulae non in usu',
+'unusedtemplateswlh' => 'nexus alii',
 
 # Random page
 'randompage'         => 'Pagina fortuita',
-'randompage-nopages' => 'Non est ulla pagina hoc in spatio nominali.',
+'randompage-nopages' => 'Non est ulla pagina in spatio nominali "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redirectio fortuita',
-'randomredirect-nopages' => 'Non est ulla redirectio hoc in spatio nominali.',
+'randomredirect-nopages' => 'Non est ulla redirectio in spatio nominali "$1".',
 
 # Statistics
-'statistics'             => 'Census',
-'sitestats'              => 'Census {{grammar:genitive|{{SITENAME}}}}',
-'userstats'              => 'Census usorum',
-'sitestatstext'          => "Basis datorum '''$1''' {{PLURAL:$1|paginam|paginas}} habet.
-Hic numerus paginas disputationum includit, paginas de {{grammar:ablative|{{SITENAME}}}}, stipulas, paginas redirectionum, et paginas alias quae probabiliter non sunt paginae contenta habentes legitimae.
-His exclusis, {{PLURAL:$2|est '''1''' pagina|sunt '''$2''' paginae}} quae contenta recta habere {{PLURAL:$2|putatur|putantur}}.
-
-'''$8''' {{PLURAL:$8|fasciculus impositus est.|fasciculi impositi sunt.}}
-
-{{PLURAL:$3|Pagina '''1''' visa est|Paginae '''$3''' visae sunt}}, et '''$4''' {{PLURAL:$4|recensio paginae facta est|recensiones paginarum factae sunt}}
-ab initio {{grammar:genitive|{{SITENAME}}}}.
-Hoc aequat fere '''$5''' mutationes per paginam, et '''$6''' visae per mutationem.
-
-'''$7''' [http://www.mediawiki.org/wiki/Manual:Job_queue operationes etiam exspectant perfacier].",
-'userstatstext'          => "'''$1''' {{PLURAL:$1|[[Special:ListUsers|usor]] relatus est|[[Special:ListUsers|usores]] relati sunt}}, quorum '''$2''' (vel '''$4%''') {{PLURAL:$2|est|sunt}} $5.",
-'statistics-mostpopular' => 'Paginae plurimum visae',
+'statistics'                   => 'Census',
+'statistics-header-pages'      => 'Census paginarum',
+'statistics-header-edits'      => 'Census recensionum',
+'statistics-header-views'      => 'Census visuum',
+'statistics-header-users'      => 'Census usorum',
+'statistics-articles'          => 'Paginae in spatio nominali principali',
+'statistics-pages'             => 'Paginae',
+'statistics-pages-desc'        => 'Omnes paginae. Hic numerus includit paginas disputationum, redirectiones, etc.',
+'statistics-files'             => 'Fasciculi impositi',
+'statistics-edits'             => 'Recensiones paginarum factae ab initio {{grammar:genitive|{{SITENAME}}}}',
+'statistics-edits-average'     => 'Recensiones per paginam',
+'statistics-views-total'       => 'Visus',
+'statistics-views-peredit'     => 'Visus per recensionem',
+'statistics-jobqueue'          => 'Numerus [http://www.mediawiki.org/wiki/Manual:Job_queue operationum qui etiam exspectant perfacier]',
+'statistics-users'             => '[[Special:ListUsers|Usores]] relati',
+'statistics-users-active'      => 'Usores activi',
+'statistics-users-active-desc' => 'Usores qui {{PLURAL:$1|proxima die|proximis $1 diebus}} actionem perfecerunt',
+'statistics-mostpopular'       => 'Paginae plurimum visae',
 
 'disambiguations'      => 'Paginae disambiguationis',
 'disambiguationspage'  => 'Template:Discretiva',
@@ -1046,7 +1215,7 @@ Pagina discretivam esse putatur si formulam adhibet ad quem [[MediaWiki:Disambig
 'double-redirect-fixer'      => 'Rectificator redirectionum',
 
 'brokenredirects'        => 'Redirectiones fractae',
-'brokenredirectstext'    => 'Hae redirectiones ad paginas inexistentes nectunt.',
+'brokenredirectstext'    => 'Hae redirectiones ad paginas inexistentes nectunt:',
 'brokenredirects-edit'   => '(recensere)',
 'brokenredirects-delete' => '(delere)',
 
@@ -1073,24 +1242,28 @@ Pagina discretivam esse putatur si formulam adhibet ad quem [[MediaWiki:Disambig
 'popularpages'            => 'Paginae saepe monstratae',
 'wantedcategories'        => 'Categoriae desideratae',
 'wantedpages'             => 'Paginae desideratae',
-'missingfiles'            => 'Fasciculi desiderati',
+'wantedfiles'             => 'Fasciculi desiderati',
+'wantedtemplates'         => 'Formulae desideratae',
 'mostlinked'              => 'Paginae maxime annexae',
 'mostlinkedcategories'    => 'Categoriae maxime annexae',
 'mostlinkedtemplates'     => 'Formulae maxime annexae',
 'mostcategories'          => 'Paginae plurimis categoriis',
 'mostimages'              => 'Fasciculi maxime annexi',
 'mostrevisions'           => 'Paginae plurimum mutatae',
-'prefixindex'             => 'Quaerere per praefixa',
+'prefixindex'             => 'Paginae omnes cum praefixo',
 'shortpages'              => 'Paginae breves',
 'longpages'               => 'Paginae longae',
 'deadendpages'            => 'Paginae sine nexu',
 'deadendpagestext'        => 'Paginae subter non nectunt ad alias paginas ullas in {{grammar:ablative|{{SITENAME}}}}.',
 'protectedpages'          => 'Paginae protectae',
 'protectedpages-indef'    => 'Solum protectiones infinitas',
+'protectedpages-cascade'  => 'Solum protectiones defluentes quasi cataracta',
 'protectedpagestext'      => 'Paginae sequentes protectae sunt a movendo ac recensendo',
 'protectedtitles'         => 'Tituli protecti',
 'protectedtitlestext'     => 'Hi tituli protecti sunt ne creentur paginae',
 'listusers'               => 'Usores',
+'listusers-editsonly'     => 'Monstrare solum usores qui recensuerunt',
+'usereditcount'           => '$1 {{PLURAL:$1|recensio|recensiones}}',
 'newpages'                => 'Paginae novae',
 'newpages-username'       => 'Nomen usoris:',
 'ancientpages'            => 'Paginae veterrimae',
@@ -1100,6 +1273,7 @@ Pagina discretivam esse putatur si formulam adhibet ad quem [[MediaWiki:Disambig
 'notargettext'            => 'Paginam aut usorem non notavisti.',
 'pager-newer-n'           => '{{PLURAL:$1|novior 1|noviores $1}}',
 'pager-older-n'           => '{{PLURAL:$1|senior 1|seniores $1}}',
+'suppress'                => 'Censura',
 
 # Book sources
 'booksources'    => 'Librorum fontes',
@@ -1110,8 +1284,6 @@ Pagina discretivam esse putatur si formulam adhibet ad quem [[MediaWiki:Disambig
 'speciallogtitlelabel' => 'Titulus:',
 'log'                  => 'Acta',
 'all-logs-page'        => 'Acta omnia',
-'log-search-legend'    => 'In actis quaerere',
-'log-search-submit'    => 'Ire',
 'alllogstext'          => 'Ostentantur omnia acta {{grammar:genitive|{{SITENAME}}}}.
 Adspectum graciliorem potes facere modum indicum, nomen usoris (cave litteras maiusculas minusculasque), vel titulum paginae (cave etiam litteras maiusculas minusculasque) seligendo.',
 'log-title-wildcard'   => 'Quaerere titulos qui incipiunt litteris',
@@ -1122,6 +1294,7 @@ Adspectum graciliorem potes facere modum indicum, nomen usoris (cave litteras ma
 'nextpage'          => 'Pagina proxima ($1)',
 'prevpage'          => 'Pagina superior ($1)',
 'allpagesfrom'      => 'Monstrare paginas ab:',
+'allpagesto'        => 'Monstrare paginas usque ad:',
 'allarticles'       => 'Omnes paginae',
 'allinnamespace'    => 'Omnes paginae (in spatio nominali $1)',
 'allnotinnamespace' => 'Omnes paginae (quibus in spatio nominali $1 exclusis)',
@@ -1140,129 +1313,191 @@ Vide etiam [[Special:WantedCategories|categorias desideratas]].',
 'special-categories-sort-count' => 'ordinare secundum numerum',
 'special-categories-sort-abc'   => 'ordinare secundum abecedarium',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Conlationes usoris deletae',
+
+# Special:LinkSearch
+'linksearch'    => 'Quaerere nexus externos',
+'linksearch-ns' => 'Spatium nominale:',
+'linksearch-ok' => 'Quaerere',
+
 # Special:ListUsers
 'listusers-submit' => 'Monstrare',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Index rationum novarum creatarum',
+'newuserlogpagetext'          => 'Hic est index rationum novarum creatarum.',
+'newuserlog-byemail'          => 'tessera missa litteris electronicis',
+'newuserlog-create-entry'     => 'Usor novus',
+'newuserlog-create2-entry'    => 'creavit novam rationem $1',
+'newuserlog-autocreate-entry' => 'Ratio automatice creata',
+
 # Special:ListGroupRights
-'listgrouprights-group'   => 'Grex',
-'listgrouprights-rights'  => 'Iura',
-'listgrouprights-members' => '(index rationum)',
+'listgrouprights'                 => 'Gregum usorum potestates',
+'listgrouprights-group'           => 'Grex',
+'listgrouprights-rights'          => 'Potestates',
+'listgrouprights-helppage'        => 'Help:Gregum potestates',
+'listgrouprights-members'         => '(index rationum)',
+'listgrouprights-addgroup'        => 'Potest usores addere ad {{PLURAL:$2|gregem|greges}}: $1',
+'listgrouprights-removegroup'     => 'Potest usores removere ex {{PLURAL:$2|grege|gregibus}}: $1',
+'listgrouprights-addgroup-all'    => 'Potest usores addere ad omnes greges',
+'listgrouprights-removegroup-all' => 'Potest usores removere ex omnibus gregibus',
 
 # E-mail user
-'emailuser'       => 'Litteras electronicas usori mittere',
-'emailpage'       => 'Mittere litteras electronicas huic usori',
-'emailpagetext'   => 'Forma subter nuntium ad usorem mittet.
+'emailuser'        => 'Litteras electronicas usori mittere',
+'emailpage'        => 'Mittere litteras electronicas huic usori',
+'emailpagetext'    => 'Forma subter nuntium ad usorem mittet.
 Inscriptio electronica quam in [[Special:Preferences|praeferentiis tuis]] dedis ut "Ab" inscriptione apparebit. Hoc modo usor tibi directe respondere poterit.',
-'defemailsubject' => '{{SITENAME}} - Litterae electronicae',
-'noemailtitle'    => 'Nulla inscriptio electronica',
-'noemailtext'     => 'Hic usor inscriptionem electronicam ratam non dedit, aut nuntia ab aliis usoribus non vult.',
-'emailfrom'       => 'Ab:',
-'emailto'         => 'Ad:',
-'emailsubject'    => 'Res:',
-'emailmessage'    => 'Nuntium:',
-'emailsend'       => 'Mittere',
-'emailsent'       => 'Litterae electronicae missae sunt',
-'emailsenttext'   => 'Nuntium tuum missum est.',
-'emailuserfooter' => 'Has litteras electronicas $1 ad $2 misit per "Litteras electronicas usori mittere" in {{grammar:ablative|{{SITENAME}}}}.',
+'defemailsubject'  => '{{SITENAME}} - Litterae electronicae',
+'noemailtitle'     => 'Nulla inscriptio electronica',
+'noemailtext'      => 'Hic usor inscriptionem electronicam ratam non dedit.',
+'nowikiemailtitle' => 'Litterae electronicae non permissae',
+'nowikiemailtext'  => 'Hic usor litteras electronicas ab aliis usoribus non vult.',
+'email-legend'     => 'Litteras electronicas usori {{grammar:genitive|{{SITENAME}}}} mittere',
+'emailfrom'        => 'Ab:',
+'emailto'          => 'Ad:',
+'emailsubject'     => 'Res:',
+'emailmessage'     => 'Nuntium:',
+'emailsend'        => 'Mittere',
+'emailsent'        => 'Litterae electronicae missae sunt',
+'emailsenttext'    => 'Nuntium tuum missum est.',
+'emailuserfooter'  => 'Has litteras electronicas $1 ad $2 misit per "Litteras electronicas usori mittere" in {{grammar:ablative|{{SITENAME}}}}.',
 
 # Watchlist
-'watchlist'            => 'Paginae custoditae',
-'mywatchlist'          => 'Paginae custoditae',
-'watchlistfor'         => "(pro usore '''$1''')",
-'nowatchlist'          => 'Nullas paginas custodis.',
-'watchlistanontext'    => 'Necesse est $1 ad indicem paginarum custoditarum inspiciendum vel recensendum.',
-'watchnologin'         => 'Conventum non est apertum',
-'watchnologintext'     => '[[Special:UserLogin|Conventum aperire]] debes ut indicem paginarum custoditarum mutes.',
-'addedwatch'           => 'Pagina custodita',
-'addedwatchtext'       => "Pagina \"[[:\$1]]\" in [[Special:Watchlist|paginas tuas custoditas]] addita est. Mutationes posthac huic paginae et paginae disputationis ibi notabuntur, et pagina '''litteris pinguibus''' apparebit in [[Special:RecentChanges|nuper mutatorum]] indice, ut sit facilius electu.
+'watchlist'          => 'Paginae custoditae',
+'mywatchlist'        => 'Paginae custoditae',
+'watchlistfor'       => "(pro usore '''$1''')",
+'nowatchlist'        => 'Nullas paginas custodis.',
+'watchlistanontext'  => 'Necesse est $1 ad indicem paginarum custoditarum inspiciendum vel recensendum.',
+'watchnologin'       => 'Conventum non est apertum',
+'watchnologintext'   => '[[Special:UserLogin|Conventum aperire]] debes ut indicem paginarum custoditarum mutes.',
+'addedwatch'         => 'Pagina custodita',
+'addedwatchtext'     => "Pagina \"[[:\$1]]\" in [[Special:Watchlist|paginas tuas custoditas]] addita est. Mutationes posthac huic paginae et paginae disputationis ibi notabuntur, et pagina '''litteris pinguibus''' apparebit in [[Special:RecentChanges|nuper mutatorum]] indice, ut sit facilius electu.
 
 Si paginam ex indice paginarum custoditarum removere vis, imprime \"decustodire\" ab summa pagina.",
-'removedwatch'         => 'Non iam custodita',
-'removedwatchtext'     => 'Pagina "[[:$1]]" ex [[Special:Watchlist|indice paginarum custoditarum]] remota est.',
-'watch'                => 'Custodire',
-'watchthispage'        => 'Custodire hanc paginam',
-'unwatch'              => 'Decustodire',
-'unwatchthispage'      => 'Abrogare custoditum',
-'notanarticle'         => 'Res non est',
-'notvisiblerev'        => 'Emendatio deleta est',
-'watchnochange'        => 'Nullae paginarum custoditarum tuarum recensitae sunt in hoc tempore.',
-'watchlist-details'    => '{{PLURAL:$1|$1 pagina|$1 paginae}} in indice paginarum custoditarum tuarum, sine paginis disputationis.',
-'watchmethod-recent'   => 'recensita recenta quaerens pro pagina custodita',
-'watchmethod-list'     => 'paginas custoditas quaerens pro recensitis recentibus',
-'watchlistcontains'    => 'Index paginarum custoditarum tuus $1 {{PLURAL:$1|paginam|paginas}} habet.',
-'iteminvalidname'      => "Aerumna cum pagina '$1', nomen non est rectum...",
-'wlnote'               => "Subter {{PLURAL:$1|est mutatio proxima|sunt '''$1''' mutationes proximae}} in {{PLURAL:$2|proxima hora|proximis '''$2''' horis}}.",
-'wlshowlast'           => 'Monstrare proximas $1 horas $2 dies $3',
-'watchlist-show-bots'  => 'Monstrare recensiones automatarias',
-'watchlist-hide-bots'  => 'Celare recensiones automatarias',
-'watchlist-show-own'   => 'Monstrare recensiones meas',
-'watchlist-hide-own'   => 'Celare recensiones meas',
-'watchlist-show-minor' => 'Monstrare recensiones minores',
-'watchlist-hide-minor' => 'Celare recensiones minores',
+'removedwatch'       => 'Non iam custodita',
+'removedwatchtext'   => 'Pagina "[[:$1]]" ex [[Special:Watchlist|indice paginarum custoditarum]] remota est.',
+'watch'              => 'Custodire',
+'watchthispage'      => 'Custodire hanc paginam',
+'unwatch'            => 'Decustodire',
+'unwatchthispage'    => 'Abrogare custoditum',
+'notanarticle'       => 'Res non est',
+'notvisiblerev'      => 'Emendatio deleta est',
+'watchnochange'      => 'Nullae paginarum custoditarum tuarum recensitae sunt in hoc tempore.',
+'watchlist-details'  => '{{PLURAL:$1|$1 pagina|$1 paginae}} in indice paginarum custoditarum tuarum, sine paginis disputationis.',
+'watchmethod-recent' => 'recensita recenta quaerens pro pagina custodita',
+'watchmethod-list'   => 'paginas custoditas quaerens pro recensitis recentibus',
+'watchlistcontains'  => 'Index paginarum custoditarum tuus $1 {{PLURAL:$1|paginam|paginas}} habet.',
+'iteminvalidname'    => "Aerumna cum pagina '$1', nomen non est rectum...",
+'wlnote'             => "Subter {{PLURAL:$1|est mutatio proxima|sunt '''$1''' mutationes proximae}} in {{PLURAL:$2|proxima hora|proximis '''$2''' horis}}.",
+'wlshowlast'         => 'Monstrare proximas $1 horas $2 dies $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Custodiens...',
 'unwatching' => 'Decustodiens...',
 
+'enotif_newpagetext'           => 'Haec pagina nova est.',
 'enotif_impersonal_salutation' => 'Usor {{grammar:genitive|{{SITENAME}}}}',
 'changed'                      => 'mutata',
 'created'                      => 'creata',
+'enotif_subject'               => 'Pagina {{grammar:genitive|{{SITENAME}}}} $PAGETITLE ab $PAGEEDITOR $CHANGEDORCREATED est',
 'enotif_lastdiff'              => 'Vide $1 ad hanc recensionem inspiciendum.',
 'enotif_anon_editor'           => 'usor ignotus $1',
+'enotif_body'                  => '
+Salve $WATCHINGUSERNAME,
+
+Pagina {{grammar:genitive|{{SITENAME}}}} $PAGETITLE ab $PAGEEDITOR die $PAGEEDITDATE $CHANGEDORCREATED est, vide emendationem currentem apud $PAGETITLE_URL
+
+$NEWPAGE
+
+Auctor hunc summarium dedit: $PAGESUMMARY $PAGEMINOREDIT
 
-# Delete/protect/revert
-'deletepage'                => 'Delere paginam',
-'confirm'                   => 'Adfirmare',
-'excontent'                 => "contenta erant: '$1'",
-'excontentauthor'           => "contenta erant: '$1' (et contributor unicus erat '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'             => "contenta priusquam pagina facta vacua erant: '$1'",
-'exblank'                   => 'pagina erat vacua',
-'delete-confirm'            => 'Delere "$1"',
-'delete-legend'             => 'Delere',
-'historywarning'            => 'Monitio: Pagina quam delere vis historiam habet:',
-'confirmdeletetext'         => 'Paginam cum tota historia eius delebis.
+Contact the editor:
+litterae electronicae: $PAGEEDITOR_EMAIL
+vici: $PAGEEDITOR_WIKI
+
+There will be no other notifications in case of further changes unless you visit this page.
+You could also reset the notification flags for all your watched pages on your watchlist.
+
+             Your friendly {{SITENAME}} notification system
+
+--
+To change your watchlist settings, visit
+{{fullurl:{{ns:special}}:Watchlist/edit}}
+
+Feedback and further assistance:
+{{fullurl:{{MediaWiki:Helppage}}}}',
+
+# Delete
+'deletepage'             => 'Delere paginam',
+'confirm'                => 'Adfirmare',
+'excontent'              => "contenta erant: '$1'",
+'excontentauthor'        => "contenta erant: '$1' (et contributor unicus erat '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "contenta priusquam pagina facta vacua erant: '$1'",
+'exblank'                => 'pagina erat vacua',
+'delete-confirm'         => 'Delere "$1"',
+'delete-legend'          => 'Delere',
+'historywarning'         => 'Monitio: Pagina quam delere vis historiam habet:',
+'confirmdeletetext'      => 'Paginam cum tota historia eius delebis.
 Adfirma quaesumus te paginam re vera delere velle, te consequentias intellere, et actionem tuam [[{{MediaWiki:Policy-url}}|consilio]] congruere.',
-'actioncomplete'            => 'Actum perfectum',
-'deletedtext'               => '"<nowiki>$1</nowiki>" deletum est. Vide $2 pro indice deletionum recentum.',
-'deletedarticle'            => 'delevit "[[$1]]"',
-'dellogpage'                => 'Index deletionum',
-'dellogpagetext'            => 'Subter est index deletionum recentissimarum.',
-'deletionlog'               => 'index deletionum',
-'reverted'                  => 'Reversum ad emendationem proximam',
-'deletecomment'             => 'Causa deletionis:',
-'deleteotherreason'         => 'Causa alia vel explicatio:',
-'deletereasonotherlist'     => 'Causa alia',
-'delete-edit-reasonlist'    => 'Causas deletionum recensere',
-'rollback'                  => 'Reverti mutationes',
-'rollback_short'            => 'Reverti',
-'rollbacklink'              => 'reverti',
-'rollbackfailed'            => 'Reversum defecit',
-'cantrollback'              => 'Haec non potest reverti; conlator proximus solus auctor huius rei est.',
-'alreadyrolled'             => 'Ad emendationem proximam paginae [[:$1]] ab usore [[User:$2|$2]] ([[User talk:$2|Disputatio]] | [[Special:Contributions/$2|{{int:contribslink}}]]) reverti non potest; alius paginam iam recensuit vel revertit.
-
-Emendatio proxima ab usore [[User:$3|$3]] ([[User talk:$3|Disputatio]] | [[Special:Contributions/$3|{{int:contribslink}}]]) effecta est.',
-'editcomment'               => 'Dictum recensiti erat: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                => 'Reverti recensiones ab usore [[Special:Contributions/$2|$2]] ([[User talk:$2|Disputatio]]) ad emendationem proximam ab [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'          => 'Reverti recensiones ab usore $1
+'actioncomplete'         => 'Actum perfectum',
+'deletedtext'            => '"<nowiki>$1</nowiki>" deletum est. Vide $2 pro indice deletionum recentum.',
+'deletedarticle'         => 'delevit "[[$1]]"',
+'suppressedarticle'      => 'supprimit "[[$1]]"',
+'dellogpage'             => 'Index deletionum',
+'dellogpagetext'         => 'Subter est index deletionum recentissimarum.',
+'deletionlog'            => 'index deletionum',
+'reverted'               => 'Reversum ad emendationem proximam',
+'deletecomment'          => 'Causa deletionis:',
+'deleteotherreason'      => 'Causa alia vel explicatio:',
+'deletereasonotherlist'  => 'Causa alia',
+'delete-edit-reasonlist' => 'Causas deletionum recensere',
+
+# Rollback
+'rollback'         => 'Reverti mutationes',
+'rollback_short'   => 'Reverti',
+'rollbacklink'     => 'reverti',
+'rollbackfailed'   => 'Reversum defecit',
+'cantrollback'     => 'Haec non potest reverti; conlator proximus solus auctor huius rei est.',
+'alreadyrolled'    => 'Ad emendationem proximam paginae [[:$1]] ab usore [[User:$2|$2]] ([[User talk:$2|Disputatio]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) reverti non potest; alius paginam iam recensuit vel revertit.
+
+Emendatio proxima ab usore [[User:$3|$3]] ([[User talk:$3|Disputatio]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) effecta est.',
+'editcomment'      => "Summarium erat: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Reverti recensiones ab usore [[Special:Contributions/$2|$2]] ([[User talk:$2|Disputatio]]) ad emendationem proximam ab [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Reverti recensiones ab usore $1
 ad emendationem proximam ab $2.',
+
+# Protect
 'protectlogpage'            => 'Index protectionum',
 'protectlogtext'            => 'Subter est index protectionum et deprotectionum paginarum. Vide [[Special:ProtectedPages|indicem paginarum nunc protectarum]].',
 'protectedarticle'          => 'protegit "[[$1]]"',
 'modifiedarticleprotection' => 'mutavit protectionem paginae "[[$1]]"',
 'unprotectedarticle'        => 'deprotegit "[[$1]]"',
 'protect-title'             => 'Mutare protectionem paginae "$1"',
+'prot_1movedto2'            => 'movit [[$1]] ad [[$2]]',
 'protect-legend'            => 'Protectionem adfirmare',
 'protectcomment'            => 'Sententia:',
 'protectexpiry'             => 'Exitus:',
 'protect_expiry_invalid'    => 'Tempus post quod res exitur est invalidum.',
 'protect_expiry_old'        => 'Tempus est praeteritus.',
+'protect-default'           => 'Usoribus omnibus licet',
 'protect-fallback'          => 'Postulat permissum "$1"',
 'protect-level-sysop'       => 'Magistratus soli',
 'protect-summary-cascade'   => 'defluens',
-'protect-expiring'          => 'exit $1',
+'protect-expiring'          => 'exit $1 (UTC)',
+'protect-expiry-indefinite' => 'infinita',
 'protect-cascade'           => 'Formulas aliasque paginas hac in pagina adhibitas protegere (protectio defluens quasi cataracta)',
+'protect-othertime'         => 'Exitus alius:',
+'protect-othertime-op'      => 'exitus alius',
+'protect-existing-expiry'   => 'Exitus: $3, $2',
+'protect-otherreason'       => 'Causa alia vel explicatio:',
+'protect-otherreason-op'    => 'causa alia',
+'protect-edit-reasonlist'   => 'Causas protectionum recensere',
+'protect-expiry-options'    => '1 horam:1 hour,1 diem:1 day,1 hebdomadem:1 week,2 hebdomades:2 weeks,1 mensem:1 month,3 menses:3 months,6 menses:6 months,1 annum:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'restriction-type'          => 'Permissus:',
 'restriction-level'         => 'Gradus cohibitionis:',
+'minimum-size'              => 'Magnitudo minima',
+'maximum-size'              => 'Magnitudo maxima:',
 'pagesize'                  => '(octeti)',
 
 # Restrictions (nouns)
@@ -1274,27 +1509,35 @@ ad emendationem proximam ab $2.',
 # Restriction levels
 'restriction-level-sysop'         => 'protecta',
 'restriction-level-autoconfirmed' => 'semi-protecta',
+'restriction-level-all'           => 'quislibet scala',
 
 # Undelete
-'undelete'                => 'Paginas deletas inspicere',
-'undeletepage'            => 'Videre et restituere paginas deletas',
-'viewdeletedpage'         => 'Paginas deletas inspicere',
-'undeletepagetext'        => 'Paginae sequentes deletae sunt sed tabulis manentes restitui possunt. Tabulae nonnumquam deletae sunt.',
-'undelete-fieldset-title' => 'Emendationes restituere',
-'undeleterevisions'       => '$1 {{PLURAL:$1|emendatio servata|emendationes servatae}}',
-'undeletehistory'         => 'Si paginam restituis, omnes emendationes restituentur ad historiam.
+'undelete'                  => 'Paginas deletas inspicere',
+'undeletepage'              => 'Videre et restituere paginas deletas',
+'viewdeletedpage'           => 'Paginas deletas inspicere',
+'undeletepagetext'          => '{{PLURAL:$1|Pagina sequens deleta est sed tabulis manens restitui potest.|Paginae $1 sequentes deletae sunt sed tabulis manentes restitui possunt.}}
+Tabulae nonnumquam deletae sunt.',
+'undelete-fieldset-title'   => 'Emendationes restituere',
+'undeleterevisions'         => '$1 {{PLURAL:$1|emendatio servata|emendationes servatae}}',
+'undeletehistory'           => 'Si paginam restituis, omnes emendationes restituentur ad historiam.
 Si pagina nova cum ipso nomine post deletionem creata est, emendationes restitutae in historia priori apparebunt.',
-'undelete-revision'       => 'Emendatio deleta paginae $1 (ex $2) ab usore $3:',
-'undeletebtn'             => 'Restituere',
-'undeletelink'            => 'restituere',
-'undeletecomment'         => 'Sententia:',
-'undeletedarticle'        => 'restituit "[[$1]]"',
-'cannotundelete'          => 'Abrogatio deletionis fefellit; fortasse aliquis iam paginam restituit.',
-'undelete-header'         => 'Pro paginis nuper deletis, vide [[Special:Log/delete|indicem deletionum]].',
-'undelete-search-box'     => 'Quaerere inter paginas iam deletas',
-'undelete-search-prefix'  => 'Monstrare paginas quibus est praeverbium:',
-'undelete-search-submit'  => 'Quaerere',
-'undelete-no-results'     => 'Nullae paginae inventae sunt ex his indicibus deletionum.',
+'undelete-revision'         => 'Emendatio deleta paginae $1 (ex $5, $4) ab usore $3:',
+'undeletebtn'               => 'Restituere',
+'undeletelink'              => 'restituere',
+'undeletereset'             => 'Reperscriptare',
+'undeleteinvert'            => 'Selectionem invertere',
+'undeletecomment'           => 'Sententia:',
+'undeletedarticle'          => 'restituit "[[$1]]"',
+'undeletedrevisions'        => '{{PLURAL:$1|1 emendatio recuperata|$1 emendationes recuperatae}}',
+'undeletedrevisions-files'  => '{{PLURAL:$1|1 emendatio recuperata|$1 emendationes recuperatae}} et {{PLURAL:1 fasciculus recuperatus|$2 fasciculi recuperati}}',
+'undeletedfiles'            => '{{PLURAL:$1|1 fasciculus recuperatus|$1 fasciculi recuperati}}',
+'cannotundelete'            => 'Abrogatio deletionis fefellit; fortasse aliquis iam paginam restituit.',
+'undelete-header'           => 'Pro paginis nuper deletis, vide [[Special:Log/delete|indicem deletionum]].',
+'undelete-search-box'       => 'Quaerere inter paginas iam deletas',
+'undelete-search-prefix'    => 'Monstrare paginas quibus est praeverbium:',
+'undelete-search-submit'    => 'Quaerere',
+'undelete-no-results'       => 'Nullae paginae inventae sunt ex his indicibus deletionum.',
+'undelete-show-file-submit' => 'Sic',
 
 # Namespace form on various pages
 'namespace'      => 'Spatium nominale:',
@@ -1302,90 +1545,112 @@ Si pagina nova cum ipso nomine post deletionem creata est, emendationes restitut
 'blanknamespace' => '(principale)',
 
 # Contributions
-'contributions' => 'Conlationes usoris',
-'mycontris'     => 'Conlationes meae',
-'contribsub2'   => 'Pro $1 ($2)',
-'nocontribs'    => 'Nullae mutationes inventae sunt ex his indiciis.',
-'uctop'         => ' (vertex)',
-'month'         => 'Ab mense (et prior):',
-'year'          => 'Ab anno (et prior):',
-
-'sp-contributions-newbies'     => 'Monstrare solum conlationes rationum novarum',
-'sp-contributions-newbies-sub' => 'Conlationes rationum novarum',
-'sp-contributions-blocklog'    => 'Acta obstructionum',
-'sp-contributions-search'      => 'Conlationes usoris quaerere',
-'sp-contributions-username'    => 'Locus IP aut nomen usoris:',
-'sp-contributions-submit'      => 'Quaerere',
+'contributions'       => 'Conlationes usoris',
+'contributions-title' => 'Conlationes usoris $1',
+'mycontris'           => 'Conlationes meae',
+'contribsub2'         => 'Pro $1 ($2)',
+'nocontribs'          => 'Nullae mutationes inventae sunt ex his indiciis.',
+'uctop'               => ' (vertex)',
+'month'               => 'Ab mense (et prior):',
+'year'                => 'Ab anno (et prior):',
+
+'sp-contributions-newbies'       => 'Monstrare solum conlationes rationum novarum',
+'sp-contributions-newbies-sub'   => 'Conlationes rationum novarum',
+'sp-contributions-newbies-title' => 'Conlationes rationum novarum',
+'sp-contributions-blocklog'      => 'Acta obstructionum',
+'sp-contributions-search'        => 'Conlationes usoris quaerere',
+'sp-contributions-username'      => 'Locus IP aut nomen usoris:',
+'sp-contributions-submit'        => 'Quaerere',
 
 # What links here
 'whatlinkshere'            => 'Nexus ad paginam',
 'whatlinkshere-title'      => 'Paginae quae ad "$1" nectunt',
 'whatlinkshere-page'       => 'Pagina:',
-'linklistsub'              => '(Index nexuum)',
 'linkshere'                => "Paginae sequentes ad '''[[:$1]]''' nectunt:",
 'nolinkshere'              => "Nullae paginae ad '''[[:$1]]''' nectunt.",
 'nolinkshere-ns'           => "Nullae paginae spatii nominalis selecti ad '''[[:$1]]''' nectunt.",
 'isredirect'               => 'pagina redirectionis',
 'istemplate'               => 'inclusio',
+'isimage'                  => 'nexus fasciculi',
 'whatlinkshere-prev'       => '{{PLURAL:$1|superior|$1 superiores}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|proxima|proxima $1}}',
 'whatlinkshere-links'      => '� nexus',
 'whatlinkshere-hideredirs' => '$1 redirectiones',
 'whatlinkshere-hidetrans'  => '$1 inclusiones alia in pagina',
 'whatlinkshere-hidelinks'  => '$1 nexus',
+'whatlinkshere-hideimages' => '$1 nexus fasciculi',
+'whatlinkshere-filters'    => 'Filtra',
 
 # Block/unblock
-'blockip'                  => 'Usorem obstruere',
-'blockip-legend'           => 'Usorem vel locum IP obstruere',
-'blockiptext'              => 'Forma infera utere ut quendam usorem vel locum IP obstruas ne plus scribere potest. Hoc non nisi secundum [[{{MediaWiki:Policy-url}}|consilium]] fieri potest. Rationem certam subscribe (exempli gratia titulos paginarum quas iste usor modo vandalorum recensuit).',
-'ipaddress'                => 'Locus IP:',
-'ipadressorusername'       => 'Locus IP aut nomen usoris:',
-'ipbexpiry'                => 'Exitus:',
-'ipbreason'                => 'Causa:',
-'ipbreasonotherlist'       => 'Causa alia',
-'ipbcreateaccount'         => 'Creationem rationum obstruere',
-'ipbemailban'              => 'Litteras electronicas vetare',
-'ipbsubmit'                => 'Obstruere hunc locum',
-'ipbother'                 => 'Exitus alius:',
-'ipboptions'               => '2 horas:2 hours,1 diem:1 day,3 dies:3 days,1 hebdomadem:1 week,2 hebdomades:2 weeks,1 mensem:1 month,3 menses:3 months,6 menses:6 months,1 annum:1 year,infinite:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'           => 'alius',
-'ipbotherreason'           => 'Causa alia vel explicatio:',
-'ipbwatchuser'             => 'Paginam usoris disputationisque huius usoris custodire',
-'badipaddress'             => 'Locus IP male formatus',
-'blockipsuccesssub'        => 'Locus prospere obstructus est',
-'blockipsuccesstext'       => '[[Special:Contributions/$1|$1]] obstructus est.
+'blockip'                      => 'Usorem obstruere',
+'blockip-legend'               => 'Usorem vel locum IP obstruere',
+'blockiptext'                  => 'Forma infera utere ut quendam usorem vel locum IP obstruas ne plus scribere potest. Hoc non nisi secundum [[{{MediaWiki:Policy-url}}|consilium]] fieri potest. Rationem certam subscribe (exempli gratia titulos paginarum quas iste usor modo vandalorum recensuit).',
+'ipaddress'                    => 'Locus IP:',
+'ipadressorusername'           => 'Locus IP aut nomen usoris:',
+'ipbexpiry'                    => 'Exitus:',
+'ipbreason'                    => 'Causa:',
+'ipbreasonotherlist'           => 'Causa alia',
+'ipbcreateaccount'             => 'Creationem rationum obstruere',
+'ipbemailban'                  => 'Litteras electronicas vetare',
+'ipbsubmit'                    => 'Obstruere hunc locum',
+'ipbother'                     => 'Exitus alius:',
+'ipboptions'                   => '2 horas:2 hours,1 diem:1 day,3 dies:3 days,1 hebdomadem:1 week,2 hebdomades:2 weeks,1 mensem:1 month,3 menses:3 months,6 menses:6 months,1 annum:1 year,infinite:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'               => 'alius',
+'ipbotherreason'               => 'Causa alia vel explicatio:',
+'ipbwatchuser'                 => 'Paginam usoris disputationisque huius usoris custodire',
+'ipballowusertalk'             => 'Sinere hunc usorem, quamquam obstructus est, suam disputationis paginam recensere',
+'ipb-change-block'             => 'Obstructionem usoris modificare',
+'badipaddress'                 => 'Locus IP male formatus',
+'blockipsuccesssub'            => 'Locus prospere obstructus est',
+'blockipsuccesstext'           => '[[Special:Contributions/$1|$1]] obstructus est.
 <br />Vide [[Special:IPBlockList|indicem usorum obstructorum]] ut obstructos revideas.',
-'ipb-edit-dropdown'        => 'Causas obstructionum recensere',
-'ipb-unblock-addr'         => 'Deobstruere $1',
-'ipb-unblock'              => 'Deobstruere nomen usoris vel locum IP',
-'unblockip'                => 'Deobstruere locum IP',
-'unblockiptext'            => 'Formam inferam usere ut locum IP deobstruere.',
-'ipusubmit'                => 'Deobstruere hanc locum',
-'unblocked'                => '[[User:$1|$1]] deobstructus est',
-'unblocked-id'             => 'Obstructio numeri $1 abrogata est',
-'ipblocklist'              => 'Usores locique IP obstructi',
-'ipblocklist-legend'       => 'Usorem obstructum quaerere',
-'ipblocklist-username'     => 'Nomen usoris vel locus IP:',
-'ipblocklist-submit'       => 'Quaerere',
-'blocklistline'            => '$1, $2 obstruxit $3 (exire $4)',
-'infiniteblock'            => 'infinita',
-'expiringblock'            => 'exit $1',
-'anononlyblock'            => 'solum usores ignoti',
-'createaccountblock'       => 'Creatio rationum obstructa',
-'emailblock'               => 'Litterae electronicae obstructae',
-'blocklink'                => 'obstruere',
-'unblocklink'              => 'deobstruere',
-'contribslink'             => 'conlationes',
-'autoblocker'              => 'Obstructus es automatice quia "[[User:$1|$1]]" nuper tuum locum IP adhibuit. Ratio data ob obstructionem usoris $1 est: "$2"',
-'blocklogpage'             => 'Index obstructionum',
-'blocklogentry'            => 'obstruxit [[$1]], exire $2 $3',
-'blocklogtext'             => 'Hic est index actorum obstructionis deobstructionisque. Loci IP qui automatice obstructi sunt non enumerantur. Vide [[Special:IPBlockList|indicem usorum locorumque IP obstructorum]] pro indice toto.',
-'unblocklogentry'          => 'deobstruxit $1',
-'block-log-flags-nocreate' => 'creatio rationum obstructa',
-'block-log-flags-noemail'  => 'Litterae electronicae obstructae',
-'ipb_expiry_invalid'       => 'Tempus exeundo invalidum fuit.',
-'ipb_already_blocked'      => '"$1" iam obstructus est',
-'proxyblocksuccess'        => 'Factum.',
+'ipb-edit-dropdown'            => 'Causas obstructionum recensere',
+'ipb-unblock-addr'             => 'Deobstruere $1',
+'ipb-unblock'                  => 'Deobstruere nomen usoris vel locum IP',
+'ipb-blocklist-contribs'       => 'Conlationes usoris $1',
+'unblockip'                    => 'Deobstruere locum IP',
+'unblockiptext'                => 'Formam inferam usere ut locum IP deobstruere.',
+'ipusubmit'                    => 'Hanc obstructionem removere',
+'unblocked'                    => '[[User:$1|$1]] deobstructus est',
+'unblocked-id'                 => 'Obstructio numeri $1 abrogata est',
+'ipblocklist'                  => 'Usores locique IP obstructi',
+'ipblocklist-legend'           => 'Usorem obstructum quaerere',
+'ipblocklist-username'         => 'Nomen usoris vel locus IP:',
+'ipblocklist-sh-userblocks'    => '$1 obstructiones rationum',
+'ipblocklist-sh-tempblocks'    => '$1 obstructiones temporarias',
+'ipblocklist-sh-addressblocks' => '$1 obstructiones locorum IP singulorum',
+'ipblocklist-submit'           => 'Quaerere',
+'blocklistline'                => '$1, $2 obstruxit $3 (exire $4)',
+'infiniteblock'                => 'infinita',
+'expiringblock'                => 'exit $1',
+'anononlyblock'                => 'solum usores ignoti',
+'createaccountblock'           => 'Creatio rationum obstructa',
+'emailblock'                   => 'Litterae electronicae obstructae',
+'blocklist-nousertalk'         => 'non potest paginam disputationis suam recensere',
+'blocklink'                    => 'obstruere',
+'unblocklink'                  => 'deobstruere',
+'change-blocklink'             => 'protectionem mutare',
+'contribslink'                 => 'conlationes',
+'autoblocker'                  => 'Obstructus es automatice quia "[[User:$1|$1]]" nuper tuum locum IP adhibuit. Ratio data ob obstructionem usoris $1 est: "$2"',
+'blocklogpage'                 => 'Index obstructionum',
+'blocklog-fulllog'             => 'Index plenissimus obstructionum',
+'blocklogentry'                => 'obstruxit [[$1]], exire $2 $3',
+'reblock-logentry'             => 'modificavit obstructionem usoris [[$1]], exire $2 $3',
+'blocklogtext'                 => 'Hic est index actorum obstructionis deobstructionisque. Loci IP qui automatice obstructi sunt non enumerantur. Vide [[Special:IPBlockList|indicem usorum locorumque IP obstructorum]] pro indice toto.',
+'unblocklogentry'              => 'deobstruxit $1',
+'block-log-flags-anononly'     => 'solum usores anonymi',
+'block-log-flags-nocreate'     => 'creatio rationum obstructa',
+'block-log-flags-noemail'      => 'Litterae electronicae obstructae',
+'block-log-flags-nousertalk'   => 'non potest paginam disputationis suam recensere',
+'ipb_expiry_invalid'           => 'Tempus exeundo invalidum fuit.',
+'ipb_already_blocked'          => '"$1" iam obstructus est',
+'ipb-needreblock'              => '== Iam obstructus ==
+$1 iam obstructus est. Visne obstructionem modificare?',
+'ip_range_invalid'             => 'Latitudo IP irrita.',
+'blockme'                      => 'Usor obstructus',
+'proxyblocker'                 => 'Instrumentum obstructionis moderatorum',
+'proxyblocksuccess'            => 'Factum.',
+'cant-block-while-blocked'     => 'Dum obstructus es, non potes usores alios obstruere.',
 
 # Developer tools
 'lockdb'              => 'Basem datorum obstruere',
@@ -1405,50 +1670,67 @@ Adfirma te basem datorum obstruere velle, et te dein basem datorum deobstruendum
 'databasenotlocked'   => 'Basis datorum non obstructa est.',
 
 # Move page
-'move-page-legend'        => 'Paginam movere',
-'movepagetext'            => "Formam inferam utere ad paginam renominandum et ad historiam eius ad nomen novum movendum.
+'move-page'                 => 'Movere $1',
+'move-page-legend'          => 'Paginam movere',
+'movepagetext'              => "Formam inferam utere ad paginam renominandum et ad historiam eius ad nomen novum movendum.
 Titulus vetus paginam redirectionis ad titulum novum fiet.
 Nexus ad paginam veterem non mutabuntur;
 redirectiones duplices aut fractas quaerere et figere debebis.
 
+redirectiones [[Special:DoubleRedirects|duplices]] vel [[Special:BrokenRedirects|fractas]].
+
 Pagina '''non''' movebitur si pagina sub titulo novo iam est, nisi est vacua aut pagina redirectionis et nullam historiam habet.
 
 '''MONITUM!'''
 Haec mutatio vehemens et improvisa potest esse pro pagina populare;
 adfirma te consequentias intellegere antequam procedis.",
-'movepagetalktext'        => "Pagina disputationis huius paginae, si est, etiam necessario motabitur '''nisi''':
+'movepagetalktext'          => "Pagina disputationis huius paginae, si est, etiam necessario motabitur '''nisi''':
 
 *Disputatio sub paginae novae nomine contenta habet, aut
 *Capsam subter non nota.
 
 Ergo manu necesse disputationes motare vel contribuere erit, si vis.",
-'movearticle'             => 'Paginam movere:',
-'movenotallowed'          => 'Tibi non licet paginas movere.',
-'newtitle'                => 'Ad titulum novum:',
-'move-watch'              => 'Hanc paginam custodire',
-'movepagebtn'             => 'Paginam movere',
-'pagemovedsub'            => 'Pagina mota est',
-'movepage-moved'          => '<big>\'\'\'"$1" mota est ad "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Pagina huius tituli iam est, aut invalidum est nomen electum.
+'movearticle'               => 'Paginam movere:',
+'movenologin'               => 'Conventum non apertum',
+'movenologintext'           => 'Rationem usoris habere et [[Special:UserLogin|conventum aperire]] debes ad movendum paginam.',
+'movenotallowed'            => 'Tibi non licet paginas movere.',
+'movenotallowedfile'        => 'Tibi non licet fasciculos movere.',
+'cant-move-user-page'       => 'Tibi non licet paginas usorum movere (solum eorum subpaginas).',
+'cant-move-to-user-page'    => 'Tibi non licet paginam ad paginam usoris movere (solum ad paginae usoris subpaginam).',
+'newtitle'                  => 'Ad titulum novum:',
+'move-watch'                => 'Hanc paginam custodire',
+'movepagebtn'               => 'Paginam movere',
+'pagemovedsub'              => 'Pagina mota est',
+'movepage-moved'            => '<big>\'\'\'"$1" mota est ad "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'   => 'Redirectio creata est.',
+'movepage-moved-noredirect' => 'Redirectio non creata est.',
+'articleexists'             => 'Pagina huius tituli iam est, aut invalidum est nomen electum.
 Quaesumus, titulum alterum elige.',
-'cantmove-titleprotected' => 'Tibi non licet paginam ad hunc titulum movere, quia hic titulus protectus est ne creetur',
-'talkexists'              => "'''Pagina prospere mota est, sed pagina disputationis not moveri potuit quia iam est pagina disputationis sub titulo novo. Disputationes recensendo iunge.'''",
-'movedto'                 => 'mota ad',
-'movetalk'                => 'Movere etiam paginam disputationis',
-'move-subpages'           => 'Movere etiam omnes subpaginas, si sunt',
-'move-talk-subpages'      => 'Movere etiam omnes subpaginas paginae disputationis, si sunt',
-'movepage-page-moved'     => 'Pagina $1 mota est ad $2.',
-'movepage-page-unmoved'   => 'Pagina $1 ad $2 moveri non potuit.',
-'1movedto2'               => 'movit [[$1]] ad [[$2]]',
-'1movedto2_redir'         => 'movit [[$1]] ad [[$2]] praeter redirectionem',
-'movereason'              => 'Causa:',
-'revertmove'              => 'reverti',
-'delete_and_move'         => 'Delere et movere',
-'delete_and_move_text'    => '==Deletio necesse est==
+'cantmove-titleprotected'   => 'Tibi non licet paginam ad hunc titulum movere, quia hic titulus protectus est ne creetur',
+'talkexists'                => "'''Pagina prospere mota est, sed pagina disputationis not moveri potuit quia iam est pagina disputationis sub titulo novo. Disputationes recensendo iunge.'''",
+'movedto'                   => 'mota ad',
+'movetalk'                  => 'Movere etiam paginam disputationis',
+'move-subpages'             => 'Movere etiam omnes subpaginas, si sunt',
+'move-talk-subpages'        => 'Movere etiam omnes subpaginas paginae disputationis, si sunt',
+'movepage-page-moved'       => 'Pagina $1 mota est ad $2.',
+'movepage-page-unmoved'     => 'Pagina $1 ad $2 moveri non potuit.',
+'1movedto2'                 => 'movit [[$1]] ad [[$2]]',
+'1movedto2_redir'           => 'movit [[$1]] ad [[$2]] praeter redirectionem',
+'move-redirect-suppressed'  => 'sine redirectione',
+'movelogpage'               => 'Acta motionum',
+'movereason'                => 'Causa:',
+'revertmove'                => 'reverti',
+'delete_and_move'           => 'Delere et movere',
+'delete_and_move_text'      => '==Deletio necesse est==
 Paginae nomen petitum "[[:$1]]" iam existit. Vin tu eam delere ut pagina illic moveatur?',
-'delete_and_move_confirm' => 'Ita, paginam delere',
-'delete_and_move_reason'  => 'Deleta ut moveatur',
-'fix-double-redirects'    => 'Rectificare redirectiones ad titulum veterem',
+'delete_and_move_confirm'   => 'Ita, paginam delere',
+'delete_and_move_reason'    => 'Deleta ut moveatur',
+'immobile-source-namespace' => 'Paginae spatii nominalis "$1" moveri non possunt.',
+'immobile-target-namespace' => 'Paginae in spatium nominale "$1" moveri non possunt.',
+'immobile-source-page'      => 'Haec pagina moveri non potest.',
+'immobile-target-page'      => 'Ad hunc titulum moveri non potest.',
+'fix-double-redirects'      => 'Rectificare redirectiones ad titulum veterem',
+'move-leave-redirect'       => 'Redirectionem creare ab titulo vetere ad titulum novum',
 
 # Export
 'export'            => 'Paginas exportare',
@@ -1466,25 +1748,43 @@ Paginae nomen petitum "[[:$1]]" iam existit. Vin tu eam delere ut pagina illic m
 'allmessagesfilter'         => 'Colum nominibus nuntiorum:',
 'allmessagesmodified'       => 'Ea modificata sola monstrare',
 
+# Thumbnails
+'thumbnail-more' => 'Augere',
+'filemissing'    => 'Fasciculus absens',
+
 # Special:Import
 'import'                     => 'Paginas importare',
+'importinterwiki'            => 'Adportatio transvici',
+'import-interwiki-source'    => 'Vici et pagina fons:',
 'import-interwiki-submit'    => 'Importare',
-'import-interwiki-namespace' => 'Transferre paginas in spatium nominale:',
-'importbadinterwiki'         => 'Nexus intervicus malus',
+'import-interwiki-namespace' => 'Spatium nominale destinatum:',
+'import-upload-filename'     => 'Nomen fasciculi:',
+'import-comment'             => 'Sententia:',
+'importstart'                => 'Adportare paginas...',
+'import-revision-count'      => '$1 {{PLURAL:$1|emendatio|emendationes}}',
+'importbadinterwiki'         => 'Nexus intervicius malus',
+'importsuccess'              => 'Adportatio finita!',
+'xml-error-string'           => '$1 in linea $2 et columna $3 (octetus $4): $5',
 'import-upload'              => 'XML imponere et importare',
 
+# Import log
+'importlogpage'                    => 'Acta adportationum',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|emendatio|emendationes}}',
+'import-logentry-interwiki'        => 'adportavit transvici $1',
+'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|emendatio|emendationes}} ex $2',
+
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Pagina usoris mea',
-'tooltip-pt-mytalk'               => 'Pagina disputationis mea',
+'tooltip-pt-userpage'             => 'Pagina usoris tua',
+'tooltip-pt-mytalk'               => 'Pagina disputationis tua',
 'tooltip-pt-preferences'          => 'Praeferentiae meae',
 'tooltip-pt-watchlist'            => 'Paginae quae custodis ut eorum mutationes facilius vides',
-'tooltip-pt-mycontris'            => 'Index conlationum mearum',
+'tooltip-pt-mycontris'            => 'Index conlationum tuarum',
 'tooltip-pt-login'                => 'Te conventum aperire hortamur, non autem requisitum',
 'tooltip-pt-anonlogin'            => 'Te conventum aperire hortamur, non autem requisitum',
 'tooltip-pt-logout'               => 'Conventum concludere',
 'tooltip-ca-talk'                 => 'Disputatio de hac pagina',
 'tooltip-ca-edit'                 => 'Hanc paginam recensere potes. Quaesumus praevisum inspice antequam servas.',
-'tooltip-ca-addsection'           => 'Huic disputationi adnotare.',
+'tooltip-ca-addsection'           => 'Novam partem creare',
 'tooltip-ca-viewsource'           => 'Haec pagina protecta est. Fontem inspicere potes.',
 'tooltip-ca-history'              => 'Emendationes huius paginae veteres.',
 'tooltip-ca-protect'              => 'Protegere hanc paginam',
@@ -1505,7 +1805,7 @@ Paginae nomen petitum "[[:$1]]" iam existit. Vin tu eam delere ut pagina illic m
 'tooltip-n-help'                  => 'Adiutatum de hoc vici',
 'tooltip-t-whatlinkshere'         => 'Index paginarum quae hic nectunt',
 'tooltip-t-recentchangeslinked'   => 'Nuper mutata in paginis quibus haec pagina nectit',
-'tooltip-feed-rss'                => 'RSS feed',
+'tooltip-feed-rss'                => 'Fluxus RSS huius paginae',
 'tooltip-feed-atom'               => 'Atom feed',
 'tooltip-t-contributions'         => 'Videre conlationes huius usoris',
 'tooltip-t-emailuser'             => 'Mittere litteras electronicas huic usori',
@@ -1529,15 +1829,24 @@ Paginae nomen petitum "[[:$1]]" iam existit. Vin tu eam delere ut pagina illic m
 'tooltip-compareselectedversions' => 'Videre dissimilitudinem inter ambas emendationes selectas huius paginae',
 'tooltip-watch'                   => 'Addere hanc paginam tuis paginis custoditis',
 'tooltip-recreate'                => 'Recreare hanc paginam etiamsi deleta est',
+'tooltip-upload'                  => 'Incipere imponere',
 
 # Attribution
-'anonymous'        => 'Usor ignotus {{grammar:genitive|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|Usor ignotus|Usores ignoti}} {{grammar:genitive|{{SITENAME}}}}',
 'siteuser'         => '{{SITENAME}} usor $1',
 'lastmodifiedatby' => 'Ultima mutatio: $2, $1 ab $3.', # $1 date, $2 time, $3 user
+'others'           => 'alii',
+'siteusers'        => '{{PLURAL:$2|usor|usores}} {{grammar:genitive|{{SITENAME}}}} $1',
 
 # Info page
-'numedits'     => 'Numerus recensionum (pagina): $1',
-'numtalkedits' => 'Numerus recensionum (pagina disputationis): $1',
+'numedits'       => 'Numerus recensionum (pagina): $1',
+'numtalkedits'   => 'Numerus recensionum (pagina disputationis): $1',
+'numauthors'     => 'Numerus auctorum discretorum (pagina): $1',
+'numtalkauthors' => 'Numerus auctorum discretorum (pagina disputationis): $1',
+
+# Skin names
+'skinname-standard'    => 'Norma',
+'skinname-cologneblue' => 'Caerulus Colonia',
 
 # Math options
 'mw_math_png'    => 'Semper vertere PNG',
@@ -1547,6 +1856,12 @@ Paginae nomen petitum "[[:$1]]" iam existit. Vin tu eam delere ut pagina illic m
 'mw_math_modern' => 'Commendatum pro navigatri recentes',
 'mw_math_mathml' => 'MathML',
 
+# Patrol log
+'patrol-log-page'      => 'Acta emendationum circumitarum',
+'patrol-log-auto'      => '(automatica)',
+'patrol-log-diff'      => 'emendatio $1',
+'log-show-hide-patrol' => '$1 acta emendationum circumitarum',
+
 # Image deletion
 'deletedrevision' => 'Delevit emendationem $1 veterem',
 
@@ -1554,29 +1869,174 @@ Paginae nomen petitum "[[:$1]]" iam existit. Vin tu eam delere ut pagina illic m
 'previousdiff' => '� Dissimilitudo senior',
 'nextdiff'     => 'Dissimilitudo novior →',
 
+# Visual comparison
+'visual-comparison' => 'Comparatio visualis',
+
 # Media information
 'imagemaxsize'    => 'Terminare imagines in paginis imaginum ad:',
 'thumbsize'       => 'Magnitudo pollicisunguis:',
 'widthheightpage' => '$1×$2, $3 {{PLURAL:$3|pagina|paginae}}',
+'file-info'       => '(magnitudo fasciculi: $1, typus MIME: $2)',
+'file-info-size'  => '($1 × $2 elementa imaginalia, magnitudo fasciculi: $3, typus MIME: $4)',
 'file-nohires'    => '<small>Nulla maior resolutio exstat.</small>',
+'svg-long-desc'   => '(fasciculus SVG, nominale $1 × $2 elementa imaginalia, magnitudo fasciculi: $3)',
 'show-big-image'  => 'Resolutio completa',
 
-# Special:NewImages
-'newimages'     => 'Fasciculi novi',
-'imagelisttext' => "Subter est index {{PLURAL:$1|'''unius''' fasciculi|'''$1''' fasciculorum}} digestus $2.",
-'showhidebots'  => '($1 automata)',
-'noimages'      => 'Nullum videndum.',
-'ilsubmit'      => 'Quaerere',
-'bydate'        => 'ex die',
+# Special:NewFiles
+'newimages'        => 'Fasciculi novi',
+'imagelisttext'    => "Subter est index {{PLURAL:$1|'''unius''' fasciculi|'''$1''' fasciculorum}} digestus $2.",
+'newimages-legend' => 'Filtrum',
+'newimages-label'  => 'Nomen fasciculi (vel pars eius):',
+'showhidebots'     => '($1 automata)',
+'noimages'         => 'Nullum videndum.',
+'ilsubmit'         => 'Quaerere',
+'bydate'           => 'ex die',
 
 # Metadata
+'metadata'          => 'Metadata',
 'metadata-expand'   => 'Plura ostende',
 'metadata-collapse' => 'Partim celare',
 
-'exif-meteringmode-1' => 'Media',
+# EXIF tags
+'exif-imagewidth'                => 'Amplitudo',
+'exif-imagelength'               => 'Altitudo',
+'exif-bitspersample'             => 'Biti per componentem',
+'exif-photometricinterpretation' => 'Compositio elementorum imaginalium',
+'exif-orientation'               => 'Orientatio',
+'exif-samplesperpixel'           => 'Numerus componentum',
+'exif-xresolution'               => 'Resolutio horizontalis',
+'exif-yresolution'               => 'Resolutio verticalis',
+'exif-transferfunction'          => 'Functio transferentiae',
+'exif-whitepoint'                => 'Chromaticitas puncti albi',
+'exif-primarychromaticities'     => 'Chromaticitates primariae',
+'exif-imagedescription'          => 'Descriptio imaginis',
+'exif-model'                     => 'Typus photomachinae',
+'exif-artist'                    => 'Auctor',
+'exif-exifversion'               => 'Emendatio Exif',
+'exif-colorspace'                => 'Spatium colorimetricum',
+'exif-pixelydimension'           => 'Bona amplitudo imaginis',
+'exif-pixelxdimension'           => 'Bona altitudo imaginis',
+'exif-usercomment'               => 'Adnota usoris',
+'exif-exposuretime'              => 'Tempus expositionis',
+'exif-exposuretime-format'       => '$1 sec ($2)',
+'exif-fnumber'                   => 'Numerus F',
+'exif-exposureprogram'           => 'Programma expositionis',
+'exif-oecf'                      => 'Factor conversionis optico-electronicae',
+'exif-shutterspeedvalue'         => 'Celeritas foriculae',
+'exif-aperturevalue'             => 'Apertura',
+'exif-brightnessvalue'           => 'Luminositas',
+'exif-meteringmode'              => 'Modus mensurae',
+'exif-lightsource'               => 'Fons lucis',
+'exif-flash'                     => 'Organum fulminescens',
+'exif-subjectarea'               => 'Area subiecti',
+'exif-flashenergy'               => 'Energia organi fulminescentis',
+'exif-focalplanexresolution'     => 'Resolutio horizontalis plani focalis',
+'exif-focalplaneyresolution'     => 'Resolutio verticalis plani focalis',
+'exif-exposureindex'             => 'Index expositionis',
+'exif-sensingmethod'             => 'Methodus sensationis',
+'exif-filesource'                => 'Fons fasciculi',
+'exif-scenetype'                 => 'Typus scaenae',
+'exif-cfapattern'                => 'exemplum CFA',
+'exif-exposuremode'              => 'Modus expositionis',
+'exif-contrast'                  => 'Contentio',
+'exif-saturation'                => 'Saturatio',
+'exif-gpslatitude'               => 'Latitudo',
+'exif-gpslongitude'              => 'Longitudo',
+'exif-gpsaltitude'               => 'Altitudo',
+'exif-gpstimestamp'              => 'Tempus GPS (horologium atomicum)',
+'exif-gpsstatus'                 => 'Status receptoris',
+'exif-gpsmeasuremode'            => 'Modus mensurae',
+'exif-gpsspeedref'               => 'Unitum celeritatis',
+'exif-gpsspeed'                  => 'Celeritas receptoris GPS',
+'exif-gpstrack'                  => 'Directio motus',
+'exif-gpsimgdirection'           => 'Directio imaginis',
+'exif-gpsmapdatum'               => 'Data percensionis geodaeticae adhibita',
+'exif-gpsdestlatitude'           => 'Latitudo destinationis',
+'exif-gpsdestlongitude'          => 'Longitudo destinationis',
+'exif-gpsdatestamp'              => 'Dies GPS',
+'exif-gpsdifferential'           => 'Correctio differentialis GPS',
+
+# EXIF attributes
+'exif-compression-1' => 'Incompressus',
+
+'exif-unknowndate' => 'Dies ignota',
+
+'exif-orientation-1' => 'Normalis', # 0th row: top; 0th column: left
+'exif-orientation-3' => 'Converta 180°', # 0th row: bottom; 0th column: right
+
+'exif-planarconfiguration-1' => 'formatio dilatata',
+'exif-planarconfiguration-2' => 'formatio planaris',
+
+'exif-componentsconfiguration-0' => 'non existit',
+
+'exif-exposureprogram-0' => 'Infinita',
+
+'exif-subjectdistance-value' => '$1 metra',
+
+'exif-meteringmode-0'   => 'Ignotus',
+'exif-meteringmode-1'   => 'Media',
+'exif-meteringmode-2'   => 'Centrogravata mediocre',
+'exif-meteringmode-3'   => 'Unipunctualis',
+'exif-meteringmode-4'   => 'Multipunctualis',
+'exif-meteringmode-6'   => 'Partialis',
+'exif-meteringmode-255' => 'Alia',
+
+'exif-lightsource-0'   => 'Ignota',
+'exif-lightsource-1'   => 'Lumen diei',
+'exif-lightsource-2'   => 'Fluorescens',
+'exif-lightsource-4'   => 'Organum fulminescens',
+'exif-lightsource-11'  => 'Umbra',
+'exif-lightsource-24'  => 'Wolframium studiorii normalizatum per ISO',
+'exif-lightsource-255' => 'Alius fons luminis',
+
+# Flash modes
+'exif-flash-fired-0'    => 'Organum fulminescens non accendit',
+'exif-flash-fired-1'    => 'Organum fulminescens accendit',
+'exif-flash-return-0'   => 'nullum stroboscopium functionem detectionis reddat',
+'exif-flash-return-2'   => 'stroboscopium lumen detectum non reddat',
+'exif-flash-return-3'   => 'stroboscopium lumen detectum reddat',
+'exif-flash-mode-1'     => 'lumen organi fulminescentis necessarium',
+'exif-flash-mode-2'     => 'suppressio organi fulminescentis necessaria',
+'exif-flash-mode-3'     => 'Modus automaticus',
+'exif-flash-function-1' => 'Nulla functio fulminescens',
+
+'exif-focalplaneresolutionunit-2' => 'unciae',
+
+'exif-sensingmethod-1' => 'Infinitus',
+
+'exif-exposuremode-0' => 'Expositio automatica',
+
+'exif-gaincontrol-0' => 'Nullum',
+'exif-gaincontrol-1' => 'Augmentum demisse positivum',
+'exif-gaincontrol-2' => 'Augmentum alte positivum',
+'exif-gaincontrol-3' => 'Augmentum demisse negativum',
+'exif-gaincontrol-4' => 'Augmentum alte negativum',
+
+'exif-contrast-0' => 'Normalis',
+
+'exif-saturation-0' => 'Normalis',
+'exif-saturation-1' => 'Saturatio demissa',
+'exif-saturation-2' => 'Saturatio alta',
+
+'exif-sharpness-0' => 'Normalis',
+
+'exif-subjectdistancerange-0' => 'Ignota',
+'exif-subjectdistancerange-1' => 'Macro',
+
+'exif-gpsstatus-a' => 'Mensura in progressu',
+'exif-gpsstatus-v' => 'Interoperabilitas mensurae',
+
+'exif-gpsmeasuremode-2' => 'Mensura 2-dimensionalis',
+'exif-gpsmeasuremode-3' => 'Mensura 3-dimensionalis',
 
 # Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
 'exif-gpsspeed-k' => 'Chiliometra per horam',
+'exif-gpsspeed-m' => 'Milia per horam',
+'exif-gpsspeed-n' => 'Nodi',
+
+# Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => 'Directio vera',
+'exif-gpsdirection-m' => 'Directio magnetica',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'omnes',
@@ -1620,6 +2080,7 @@ Hic codex adfirmationis exibit $4.',
 
 # Trackbacks
 'trackbackremove' => ' ([$1 Delere])',
+'trackbacklink'   => 'Retronexus',
 
 # Delete conflict
 'deletedwhileediting' => "'''Monitio:''' Haec pagina deleta est postquam inceperis eam recensere!",
@@ -1631,9 +2092,6 @@ Quaesumus, adfirma ut iterum hanc paginam crees.",
 # action=purge
 'confirm_purge_button' => 'Licet',
 
-# AJAX search
-'articletitles' => "Paginae ab ''$1''",
-
 # Multipage image navigation
 'imgmultipageprev' => '� pagina superior',
 'imgmultipagenext' => 'pagina proxima →',
@@ -1641,17 +2099,20 @@ Quaesumus, adfirma ut iterum hanc paginam crees.",
 'imgmultigoto'     => 'Ire ad paginam $1',
 
 # Table pager
+'ascending_abbrev'         => 'asc',
+'descending_abbrev'        => 'desc',
 'table_pager_next'         => 'Pagina proxima',
 'table_pager_prev'         => 'Pagina superior',
 'table_pager_first'        => 'Prima pagina',
 'table_pager_last'         => 'Ultima pagina',
 'table_pager_limit_submit' => 'Ire',
+'table_pager_empty'        => 'Nullum eventum',
 
 # Auto-summaries
-'autosumm-blank'   => 'paginam vacuavit',
+'autosumm-blank'   => 'Paginam vacuavit',
 'autosumm-replace' => "multa contenta ex pagina removit, contenta nova: '$1'",
 'autoredircomment' => 'Redirigens ad [[$1]]',
-'autosumm-new'     => 'Nova pagina: $1',
+'autosumm-new'     => "Creavit paginam scribendo '$1'",
 
 # Size units
 'size-bytes'     => '$1 octeti',
@@ -1678,25 +2139,41 @@ Quaesumus, adfirma ut iterum hanc paginam crees.",
 'watchlisttools-raw'  => 'Indicem paginarum custoditarum quasi textum recensere',
 
 # Special:Version
-'version'                  => 'Versio', # Not used as normal message but as header for the special page itself
-'version-specialpages'     => 'Paginae speciales',
-'version-variables'        => 'Variabilia',
-'version-other'            => 'Alia',
-'version-version'          => 'Versio',
-'version-software-product' => 'Productum',
-'version-software-version' => 'Versio',
+'version'                          => 'Versio', # Not used as normal message but as header for the special page itself
+'version-specialpages'             => 'Paginae speciales',
+'version-parserhooks'              => 'Extensiones programmatis analysis lexicalis',
+'version-variables'                => 'Variabilia',
+'version-other'                    => 'Alia',
+'version-hooks'                    => 'Extensiones',
+'version-extension-functions'      => 'Functiones extensionum',
+'version-parser-function-hooks'    => 'Extensiones functionum programmatis analysis lexicalis',
+'version-skin-extension-functions' => 'Functiones extensionis cutis',
+'version-hook-name'                => 'Nomen extensionis',
+'version-version'                  => 'Versio',
+'version-license'                  => 'Permissio',
+'version-software-product'         => 'Productum',
+'version-software-version'         => 'Versio',
 
 # Special:FilePath
-'filepath'      => 'Fasciculorum inscriptio',
-'filepath-page' => 'Fasciculus:',
+'filepath'        => 'Fasciculorum inscriptio',
+'filepath-page'   => 'Fasciculus:',
+'filepath-submit' => 'Via',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch-filename' => 'Fasciculi nomen:',
 'fileduplicatesearch-submit'   => 'Quaerere',
+'fileduplicatesearch-info'     => '$1 × $2 elementa imaginalia<br />Magnitudo fasciculi: $3<br />Typus MIME: $4',
 
 # Special:SpecialPages
-'specialpages'             => 'Paginae speciales',
-'specialpages-group-users' => 'Usores eorumque potestates',
+'specialpages'                 => 'Paginae speciales',
+'specialpages-group-other'     => 'Aliae paginae speciales',
+'specialpages-group-login'     => 'Conventum aperire / conventum creare',
+'specialpages-group-users'     => 'Usores eorumque potestates',
+'specialpages-group-pages'     => 'Index paginarum',
+'specialpages-group-pagetools' => 'Instrumenta paginarum',
+'specialpages-group-wiki'      => 'Vici-data et instrumenta',
+'specialpages-group-redirects' => 'Paginae speciales redirigentes',
+'specialpages-group-spam'      => 'Instrumenta contra praeconia incommoda',
 
 # Special:BlankPage
 'blankpage' => 'Pagina vacua',
diff --git a/languages/messages/MessagesLad.php b/languages/messages/MessagesLad.php
index 4df9bed6..dbac791c 100644
--- a/languages/messages/MessagesLad.php
+++ b/languages/messages/MessagesLad.php
@@ -106,7 +106,7 @@ $messages = array(
 'mypage'         => 'Mi pajina',
 'mytalk'         => 'Mi diścuśión',
 'anontalk'       => 'Diskusion para esta IP',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 'errorpagetitle'   => 'Yerro',
 'tagline'          => 'De {{SITENAME}}',
@@ -221,8 +221,8 @@ $messages = array(
 'media_tip'      => 'Link al arxivo multimedia',
 
 # Edit pages
-'summary'          => 'Resumen',
-'subject'          => 'Tema/título',
+'summary'          => 'Resumen:',
+'subject'          => 'Tema/título:',
 'minoredit'        => 'Esta es una edición chiquitica',
 'watchthis'        => 'Vigilar este artículo',
 'savearticle'      => 'Registrar la página',
@@ -230,7 +230,7 @@ $messages = array(
 'showdiff'         => 'Amostrar trocamientos',
 'accmailtitle'     => 'La kontrasenya ha sido embiada.',
 'accmailtext'      => 'La kontrasenya para "$1" se ha embiado a $2.',
-'copyrightwarning' => 'Si puede ser, que observe que todas las contribuciones a {{SITENAME}} se consideran hechas públicas abaxo la $2 (ver detayes en $1). Si no quere que la gente endereche tus texhtos escritos sin piedad y los distribuya libbremente, alora no los meta aquí. También él/ella nos está asegurando ansí que escribió este texhto su mismo y es dueño de los derechos de autor, o lo copió desde el dominio público u otra fuente libbero.<strong>¡QUE N0 USE TEXHTOS ESCRITOS CON COPYRIGHT SIN PERMIŚIÓN!</strong><br />',
+'copyrightwarning' => "Si puede ser, que observe que todas las contribuciones a {{SITENAME}} se consideran hechas públicas abaxo la $2 (ver detayes en $1). Si no quere que la gente endereche tus texhtos escritos sin piedad y los distribuya libbremente, alora no los meta aquí. También él/ella nos está asegurando ansí que escribió este texhto su mismo y es dueño de los derechos de autor, o lo copió desde el dominio público u otra fuente libbero.'''¡QUE N0 USE TEXHTOS ESCRITOS CON COPYRIGHT SIN PERMIŚIÓN!'''<br />",
 
 # History pages
 'revisionasof'     => 'Rêvizión de $1',
@@ -243,7 +243,8 @@ $messages = array(
 'editundo' => 'deshazer',
 
 # Search results
-'powersearch' => 'Búsqueda adelantado',
+'searchhelp-url' => 'Help:Ayudo',
+'powersearch'    => 'Búsqueda adelantado',
 
 # Preferences page
 'preferences'   => 'Preferensias',
@@ -271,7 +272,7 @@ $messages = array(
 # Upload
 'upload' => 'Cargar un dosyé',
 
-# Image description page
+# File description page
 'filehist'          => 'Istoria del dosyé',
 'filehist-datetime' => 'Data/Hora',
 'imagelinks'        => 'Linkes',
@@ -298,19 +299,21 @@ $messages = array(
 'special-categories-sort-abc'   => 'ordenar alefbeticamente',
 
 # Watchlist
-'watchlist'            => 'Mi lista de vigilancia',
-'mywatchlist'          => 'Mi lista de vigilancia',
-'watch'                => 'Vigilar',
-'unwatch'              => 'Dexar de vigilar',
-'watchlist-hide-minor' => 'Esconder ediciones chiquiticas',
+'watchlist'   => 'Mi lista de vigilancia',
+'mywatchlist' => 'Mi lista de vigilancia',
+'watch'       => 'Vigilar',
+'unwatch'     => 'Dexar de vigilar',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vigilando...',
 'unwatching' => 'Dexando de vigilar...',
 
-# Delete/protect/revert
+# Delete
 'actioncomplete' => 'Aksion kompleta',
 
+# Protect
+'prot_1movedto2' => '[[$1]] trasladado a [[$2]]',
+
 # Namespace form on various pages
 'blanknamespace' => '(Principal)',
 
@@ -408,15 +411,9 @@ El resto de los linkes del mismo satir se juzgan como eccepciones (por enxemplo,
 # Delete conflict
 'recreate' => 'Krear de muevo',
 
-# HTML dump
-'redirectingto' => 'Redirijiendo a [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'Akseptár',
 
-# AJAX search
-'hideresults' => 'Eskonder resultados',
-
 # Multipage image navigation
 'imgmultipageprev' => '� pajina anterior',
 'imgmultipagenext' => 'siguiente pajina →',
diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index 89ffdee3..432f1c85 100644
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -13,120 +13,117 @@
 $fallback = 'de';
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Spezial',
-	NS_TALK           => 'Diskussioun',
-	NS_USER           => 'Benotzer',
-	NS_USER_TALK      => 'Benotzer_Diskussioun',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_Diskussioun',
-	NS_IMAGE          => 'Bild',
-	NS_IMAGE_TALK     => 'Bild_Diskussioun',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_Diskussioun',
-	NS_TEMPLATE       => 'Schabloun',
-	NS_TEMPLATE_TALK  => 'Schabloun_Diskussioun',
-	NS_HELP           => 'Hëllef',
-	NS_HELP_TALK      => 'Hëllef_Diskussioun',
-	NS_CATEGORY       => 'Kategorie',
-	NS_CATEGORY_TALK  => 'Kategorie_Diskussioun',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Spezial',
+	NS_TALK             => 'Diskussioun',
+	NS_USER             => 'Benotzer',
+	NS_USER_TALK        => 'Benotzer_Diskussioun',
+	NS_PROJECT_TALK     => '$1 Diskussioun',
+	NS_FILE             => 'Fichier',
+	NS_FILE_TALK        => 'Fichier_Diskussioun',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskussioun',
+	NS_TEMPLATE         => 'Schabloun',
+	NS_TEMPLATE_TALK    => 'Schabloun_Diskussioun',
+	NS_HELP             => 'Hëllef',
+	NS_HELP_TALK        => 'Hëllef_Diskussioun',
+	NS_CATEGORY         => 'Kategorie',
+	NS_CATEGORY_TALK    => 'Kategorie_Diskussioun',
 );
 
-$skinNames = array(
-	'standard'    => 'Klassesch',
-	'nostalgia'   => 'Nostalgie',
-	'cologneblue' => 'Köln Blo',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Chick',
-	'simple'      => 'Einfach',
-	'modern'      => 'Modern',
+$namespaceAliases = array(
+	'Bild' => NS_FILE,
+	'Bild_Diskussioun' => NS_FILE_TALK,
 );
 
+
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Duebel Viruleedungen' ),
-	'BrokenRedirects'         => array( 'Futtis Viruleedungen' ),
-	'Disambiguations'         => array( 'Homonymie' ),
-	'Userlogin'               => array( 'Umellen' ),
-	'Userlogout'              => array( 'Ofmellen' ),
-	'CreateAccount'           => array( 'Benotzerkont opmaachen' ),
-	'Preferences'             => array( 'Astellungen' ),
-	'Watchlist'               => array( 'Iwwerwaachungslëscht' ),
-	'Recentchanges'           => array( 'Rezent Ännerungen' ),
-	'Upload'                  => array( 'Eroplueden' ),
-	'Imagelist'               => array( 'Billerlëscht' ),
-	'Newimages'               => array( 'Nei Biller' ),
-	'Listusers'               => array( 'Benotzer' ),
-	'Listgrouprights'         => array( 'Grupperechter' ),
-	'Statistics'              => array( 'Statistik' ),
-	'Randompage'              => array( 'Zoufälleg Säit' ),
-	'Lonelypages'             => array( 'Weesesäiten' ),
-	'Uncategorizedpages'      => array( 'Säiten ouni Kategorie' ),
-	'Uncategorizedcategories' => array( 'Kategorien ouni Kategorie' ),
-	'Uncategorizedimages'     => array( 'Biller ouni Kategorie' ),
-	'Uncategorizedtemplates'  => array( 'Schablounen ouni Kategorie' ),
-	'Unusedcategories'        => array( 'Onbenotze Kategorien' ),
-	'Unusedimages'            => array( 'Onbenotzte Biller' ),
-	'Wantedpages'             => array( 'Gewënschte Säiten' ),
-	'Wantedcategories'        => array( 'Gewënschte Kategorien' ),
-	'Missingfiles'            => array( 'Fichieren déi feelen' ),
-	'Mostlinked'              => array( 'Dacks verlinkte Säiten' ),
-	'Mostlinkedcategories'    => array( 'Dacks benotzte Kategorien' ),
-	'Mostlinkedtemplates'     => array( 'Dacks benotzte Schablounen' ),
-	'Mostcategories'          => array( 'Säite mat de meeschte Kategorien' ),
-	'Mostimages'              => array( 'Dacks benotzte Biller' ),
-	'Mostrevisions'           => array( 'Säite mat de meeschten Ännerungen' ),
-	'Fewestrevisions'         => array( 'Säite mat de mannsten Ännerungen' ),
-	'Shortpages'              => array( 'Kuerz Säiten' ),
-	'Longpages'               => array( 'Laang Säiten' ),
-	'Newpages'                => array( 'Nei Säiten' ),
-	'Ancientpages'            => array( 'Al Säiten' ),
-	'Deadendpages'            => array( 'Saackgaassesäiten' ),
-	'Protectedpages'          => array( 'Protegéiert Säiten' ),
-	'Protectedtitles'         => array( 'Gespaarte Säiten' ),
-	'Allpages'                => array( 'All Säiten' ),
-	'Prefixindex'             => array( 'Indexsich' ),
-	'Ipblocklist'             => array( 'Lëscht vu gespaarten IPen a Benotzer' ),
-	'Specialpages'            => array( 'Spezialsäiten' ),
-	'Contributions'           => array( 'Kontributiounen' ),
-	'Emailuser'               => array( 'Dësem Benotzer eng E-Mail schécken' ),
-	'Confirmemail'            => array( 'E-Mail confirméieren' ),
-	'Whatlinkshere'           => array( 'Linken op dës Säit' ),
-	'Recentchangeslinked'     => array( 'Ännerungen op verlinkte Säiten' ),
-	'Movepage'                => array( 'Säit réckelen' ),
-	'Blockme'                 => array( 'Mech spären' ),
-	'Booksources'             => array( 'Bicher mat hirer ISBN sichen' ),
-	'Categories'              => array( 'Kategorien' ),
-	'Export'                  => array( 'Exportéieren' ),
-	'Version'                 => array( 'Versioun' ),
-	'Allmessages'             => array( 'All Systemmessagen' ),
-	'Log'                     => array( 'Logbicher' ),
-	'Blockip'                 => array( 'Spären' ),
-	'Undelete'                => array( 'Restauréieren' ),
-	'Import'                  => array( 'Importéieren' ),
-	'Lockdb'                  => array( 'Datebank spären' ),
-	'Unlockdb'                => array( 'Spär vun der Datebank ophiewen' ),
-	'Userrights'              => array( 'Benotzerrechter' ),
-	'MIMEsearch'              => array( 'Sich no MIME-Zorten' ),
-	'FileDuplicateSearch'     => array( 'Sich no duebele Fichieren' ),
-	'Unwatchedpages'          => array( 'Säiten déi net iwwerwaacht ginn' ),
-	'Listredirects'           => array( 'Viruleedungen' ),
-	'Revisiondelete'          => array( 'Versioun läschen' ),
-	'Unusedtemplates'         => array( 'Onbenotzte Schablounen' ),
-	'Randomredirect'          => array( 'Zoufälleg Viruleedung' ),
-	'Mypage'                  => array( 'Meng Benotzersäit' ),
-	'Mytalk'                  => array( 'Meng Diskussiounssäit' ),
-	'Mycontributions'         => array( 'Meng Kontributiounen' ),
-	'Listadmins'              => array( 'Lëscht vun den Administrateuren' ),
-	'Listbots'                => array( 'Botten' ),
-	'Popularpages'            => array( 'Beléiwste Säiten' ),
-	'Search'                  => array( 'Sichen' ),
-	'Resetpass'               => array( 'Passwuert zrécksetzen' ),
-	'Withoutinterwiki'        => array( 'Säiten ouni Interwiki-Linken' ),
-	'MergeHistory'            => array( 'Versiounen zesummeleeën' ),
-	'Filepath'                => array( 'Pad bäi de Fichier' ),
-	'Invalidateemail'         => array( 'E-Mailadress net confirméieren' ),
-	'Blankpage'               => array( 'Eidel Säit' ),
+	'DoubleRedirects'           => array( 'Duebel Viruleedungen' ),
+	'BrokenRedirects'           => array( 'Futtis Viruleedungen' ),
+	'Disambiguations'           => array( 'Homonymie' ),
+	'Userlogin'                 => array( 'Umellen' ),
+	'Userlogout'                => array( 'Ofmellen' ),
+	'CreateAccount'             => array( 'Benotzerkont opmaachen' ),
+	'Preferences'               => array( 'Astellungen' ),
+	'Watchlist'                 => array( 'Iwwerwaachungslëscht' ),
+	'Recentchanges'             => array( 'Rezent Ännerungen' ),
+	'Upload'                    => array( 'Eroplueden' ),
+	'Listfiles'                 => array( 'Billerlëscht' ),
+	'Newimages'                 => array( 'Nei Biller' ),
+	'Listusers'                 => array( 'Lëscht vun de Benotzer' ),
+	'Listgrouprights'           => array( 'Lëscht vun de Grupperechter' ),
+	'Statistics'                => array( 'Statistik' ),
+	'Randompage'                => array( 'Zoufälleg Säit' ),
+	'Lonelypages'               => array( 'Weesesäiten' ),
+	'Uncategorizedpages'        => array( 'Säiten ouni Kategorie' ),
+	'Uncategorizedcategories'   => array( 'Kategorien ouni Kategorie' ),
+	'Uncategorizedimages'       => array( 'Biller ouni Kategorie' ),
+	'Uncategorizedtemplates'    => array( 'Schablounen ouni Kategorie' ),
+	'Unusedcategories'          => array( 'Onbenotze Kategorien' ),
+	'Unusedimages'              => array( 'Onbenotzte Biller' ),
+	'Wantedpages'               => array( 'Gewënschte Säiten' ),
+	'Wantedcategories'          => array( 'Gewënschte Kategorien' ),
+	'Wantedfiles'               => array( 'Gewënschte Fichieren' ),
+	'Wantedtemplates'           => array( 'Gewënschte Schablounen' ),
+	'Mostlinked'                => array( 'Dacks verlinkte Säiten' ),
+	'Mostlinkedcategories'      => array( 'Dacks benotzte Kategorien' ),
+	'Mostlinkedtemplates'       => array( 'Dacks benotzte Schablounen' ),
+	'Mostimages'                => array( 'Dacks benotzte Biller' ),
+	'Mostcategories'            => array( 'Säite mat de meeschte Kategorien' ),
+	'Mostrevisions'             => array( 'Säite mat de meeschten Ännerungen' ),
+	'Fewestrevisions'           => array( 'Säite mat de mannsten Ännerungen' ),
+	'Shortpages'                => array( 'Kuerz Säiten' ),
+	'Longpages'                 => array( 'Laang Säiten' ),
+	'Newpages'                  => array( 'Nei Säiten' ),
+	'Ancientpages'              => array( 'Al Säiten' ),
+	'Deadendpages'              => array( 'Saackgaassesäiten' ),
+	'Protectedpages'            => array( 'Protegéiert Säiten' ),
+	'Protectedtitles'           => array( 'Gespaarte Säiten' ),
+	'Allpages'                  => array( 'All Säiten' ),
+	'Prefixindex'               => array( 'Indexsich' ),
+	'Ipblocklist'               => array( 'Lëscht vu gespaarten IPen a Benotzer' ),
+	'Specialpages'              => array( 'Spezialsäiten' ),
+	'Contributions'             => array( 'Kontributiounen' ),
+	'Emailuser'                 => array( 'Dësem Benotzer eng E-Mail schécken' ),
+	'Confirmemail'              => array( 'E-Mail confirméieren' ),
+	'Whatlinkshere'             => array( 'Linken op dës Säit' ),
+	'Recentchangeslinked'       => array( 'Ännerungen op verlinkte Säiten' ),
+	'Movepage'                  => array( 'Säit réckelen' ),
+	'Blockme'                   => array( 'Mech spären' ),
+	'Booksources'               => array( 'Bicher mat hirer ISBN sichen' ),
+	'Categories'                => array( 'Kategorien' ),
+	'Export'                    => array( 'Exportéieren' ),
+	'Version'                   => array( 'Versioun' ),
+	'Allmessages'               => array( 'All Systemmessagen' ),
+	'Log'                       => array( 'Logbicher' ),
+	'Blockip'                   => array( 'Spären' ),
+	'Undelete'                  => array( 'Restauréieren' ),
+	'Import'                    => array( 'Importéieren' ),
+	'Lockdb'                    => array( 'Datebank spären' ),
+	'Unlockdb'                  => array( 'Spär vun der Datebank ophiewen' ),
+	'Userrights'                => array( 'Benotzerrechter' ),
+	'MIMEsearch'                => array( 'Sich no MIME-Zorten' ),
+	'FileDuplicateSearch'       => array( 'Sich no duebele Fichieren' ),
+	'Unwatchedpages'            => array( 'Säiten déi net iwwerwaacht ginn' ),
+	'Listredirects'             => array( 'Viruleedungen' ),
+	'Revisiondelete'            => array( 'Versioun läschen' ),
+	'Unusedtemplates'           => array( 'Onbenotzte Schablounen' ),
+	'Randomredirect'            => array( 'Zoufälleg Viruleedung' ),
+	'Mypage'                    => array( 'Meng Benotzersäit' ),
+	'Mytalk'                    => array( 'Meng Diskussiounssäit' ),
+	'Mycontributions'           => array( 'Meng Kontributiounen' ),
+	'Listadmins'                => array( 'Lëscht vun den Administrateuren' ),
+	'Listbots'                  => array( 'Botten' ),
+	'Popularpages'              => array( 'Beléiwste Säiten' ),
+	'Search'                    => array( 'Sichen' ),
+	'Resetpass'                 => array( 'Passwuert zrécksetzen' ),
+	'Withoutinterwiki'          => array( 'Säiten ouni Interwiki-Linken' ),
+	'MergeHistory'              => array( 'Versiounen zesummeleeën' ),
+	'Filepath'                  => array( 'Pad bäi de Fichier' ),
+	'Invalidateemail'           => array( 'E-Mailadress net confirméieren' ),
+	'Blankpage'                 => array( 'Eidel Säit' ),
+	'LinkSearch'                => array( 'Weblink-Sich' ),
+	'DeletedContributions'      => array( 'Geläschte Kontributiounen' ),
 );
 
 $messages = array(
@@ -167,17 +164,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Meng Ännerungen op menger Iwwerwaachungslëscht verstoppen',
 'tog-watchlisthidebots'       => 'Ännerunge vu Botten op menger Iwwerwaachungslëscht verstoppen',
 'tog-watchlisthideminor'      => 'Kleng Ännerungen op menger Iwwerwaachungslëscht verstoppen',
+'tog-watchlisthideliu'        => 'Ännerunge vun ugemellte Benotzer verstoppen',
+'tog-watchlisthideanons'      => 'Ännerunge vun anonyme Benotzer (IP-Adressen) verstoppen',
 'tog-nolangconversion'        => 'Ëmwandlung vu Sproochvarianten ausschalten',
 'tog-ccmeonemails'            => 'Schéck mir eng Kopie vun de Mailen, déi ech anere Benotzer schécken.',
 'tog-diffonly'                => "Weis bei Versiounevergläicher just d'Ënnerscheeder an net déi ganz Säit",
 'tog-showhiddencats'          => 'Verstoppte Kategorie weisen',
+'tog-noconvertlink'           => 'Ëmwandlung vum Titel desaktivéieren',
+'tog-norollbackdiff'          => 'Ënnerscheed nom Zrécksetzen ënnerdrécken',
 
 'underline-always'  => 'ëmmer',
 'underline-never'   => 'Ni',
 'underline-default' => 'vun der Browserastellung ofhängeg',
 
-'skinpreview' => '(Kucken)',
-
 # Dates
 'sunday'        => 'Sonndeg',
 'monday'        => 'Méindeg',
@@ -270,7 +269,7 @@ $messages = array(
 'mytalk'         => 'Meng Diskussioun',
 'anontalk'       => 'Diskussioun fir dës IP Adress',
 'navigation'     => 'Navigatioun',
-'and'            => 'an',
+'and'            => '&#32;an',
 
 # Metadata in edit box
 'metadata_help' => 'Metadaten:',
@@ -307,7 +306,7 @@ $messages = array(
 'talkpagelinktext'  => 'Diskussioun',
 'specialpage'       => 'Spezialsäit',
 'personaltools'     => 'Perséinlech Tools',
-'postcomment'       => 'Bemierkung derbäisetzen',
+'postcomment'       => 'Neien Abschnitt',
 'articlepage'       => 'Säit',
 'talk'              => 'Diskussioun',
 'views'             => 'Offroen',
@@ -333,8 +332,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Iwwer {{SITENAME}}',
 'aboutpage'            => 'Project: Iwwer {{SITENAME}}',
-'bugreports'           => 'Feelermeldungen',
-'bugreportspage'       => 'Project:Feelermeldungen',
 'copyright'            => 'Inhalt ass zur Verfügung gestallt ënnert der $1.<br />',
 'copyrightpagename'    => '{{SITENAME}} Copyright',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -357,9 +354,7 @@ $messages = array(
 
 'badaccess'        => 'Net genuch Rechter',
 'badaccess-group0' => 'Dir hutt net déi néideg Rechter fir dës Aktioun duerchzeféieren.',
-'badaccess-group1' => "D'Aktioun déi dir gewielt hutt, kann nëmme vu Benotzer aus de Gruppen $1 duerchgefouert ginn.",
-'badaccess-group2' => "D'Aktioun déi dir gewielt hutt, kann nëmme vu Benotzer aus enger vun den $1 Gruppen duerchgefouert ginn.",
-'badaccess-groups' => "D'Aktioun déi dir gewielt hutt, kann nëmme vu Benotzer aus de Gruppen $1 duerchgefouert ginn.",
+'badaccess-groups' => "D'Aktioun déi dir gewielt hutt, kann nëmme vu Benotzer aus {{PLURAL:$2|der Grupp|enger vun de Gruppen}} $1 duerchgefouert ginn.",
 
 'versionrequired'     => 'Versioun $1 vu MediaWiki gëtt gebraucht',
 'versionrequiredtext' => "D'Versioun $1 vu MediaWiki ass néideg, fir dës Säit ze notzen. Kuckt d'[[Special:Version|Versiounssäit]]",
@@ -373,8 +368,10 @@ $messages = array(
 'editsection'             => 'änneren',
 'editold'                 => 'änneren',
 'viewsourceold'           => 'Quellcode kucken',
+'editlink'                => 'änneren',
+'viewsourcelink'          => 'Quelltext weisen',
 'editsectionhint'         => 'Abschnitt: $1 änneren',
-'toc'                     => 'Inhaltsverzeechnis',
+'toc'                     => 'Inhaltsverzeechnes',
 'showtoc'                 => 'weisen',
 'hidetoc'                 => 'verstoppen',
 'thisisdeleted'           => '$1 kucken oder zrécksetzen?',
@@ -386,14 +383,14 @@ $messages = array(
 'site-atom-feed'          => 'Atom-Feed fir $1',
 'page-rss-feed'           => 'RSS-Feed fir "$1"',
 'page-atom-feed'          => 'Atom-Feed fir "$1"',
-'red-link-title'          => '$1 (Säit gëtt et (nach) net)',
+'red-link-title'          => '$1 (Säit gëtt et net)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Säit',
 'nstab-user'      => 'Benotzersäit',
 'nstab-media'     => 'Media Säit',
 'nstab-special'   => 'Spezialsäit',
-'nstab-project'   => 'Porject:',
+'nstab-project'   => 'Projetssäit:',
 'nstab-image'     => 'Fichier',
 'nstab-mediawiki' => 'Systemmessage',
 'nstab-template'  => 'Schabloun',
@@ -402,7 +399,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Dës Aktioun gëtt et net',
-'nosuchactiontext'  => 'Déi Aktioun, déi an der URL ugi war, gëtt vun dëser Wiki net ënnerstetzt.',
+'nosuchactiontext'  => 'Déi Aktioun, déi an der URL ugi war ass net valabel.
+Méiglecherweis hutt dir Iech bei der URL vertippt oder Dir hutt op en net korrekte Link geklickt.
+Et kann awer och sinn datt et e Bug a(n) {{SITENAME}} gëtt.',
 'nosuchspecialpage' => 'Spezialsäit gëtt et net',
 'nospecialpagetext' => "<big>'''Dir hutt eng Spezialsäit ofgefrot déi et net gëtt.'''</big>
 
@@ -423,6 +422,12 @@ $1',
 'readonlytext'         => 'Datebank ass elo fir all Ännerunge gespaart, wahrscheinlech wéinst Maintenance vun der Datebank, duerno ass erëm alles beim alen.
 
 Den Administrateur huet dës Erklärung uginn: $1',
+'missing-article'      => "Den Text „$1“ $2 gouf net an der Datebank fonnt.
+
+Dës geschitt normalerweis duerch e Link op eng Säite déi geläscht oder geréckelt gouf.
+
+Wann dat net de Fall ass, hutt Dir eventuell e Feeler an der Software fonnt.
+Mellt dëst w.e.g. bäi engem [[Special:ListUsers/sysop|Administrateur]] a vergiesst net d'URL unzeginn.",
 'missingarticle-rev'   => '(Versiounsnummer: $1)',
 'missingarticle-diff'  => '(Ënnerscheed tësche Versiounen: $1, $2)',
 'readonly_lag'         => "D'Datebank gouf automatesch gespaart fir datt d'Zweetserveren (slaves) nees mat dem Haaptserver (master) synchron geschalt kënne ginn.",
@@ -440,7 +445,6 @@ Den Administrateur huet dës Erklärung uginn: $1',
 'cannotdelete'         => "D'Bild oder d'Säit kann net geläscht ginn (ass waarscheinlech schonns vun engem Anere geläscht ginn).",
 'badtitle'             => 'Schlechten Titel',
 'badtitletext'         => 'De gewënschten Titel ass invalid, eidel, oder een net korrekten Interwiki Link.',
-'perfdisabled'         => "'''Pardon!''' Dës Fonktioun gouf wéint Iwwerlaaschtung vum Server temporaire ausgeschalt.",
 'perfcached'           => 'Dës Date kommen aus dem Cache a si méiglecherweis net aktuell:',
 'perfcachedts'         => 'Dës Donneeë kommen aus dem Cache, lescht Aktualisatioun: $1',
 'querypage-no-updates' => "D'Aktualiséierung vun dëser Säit ass zur Zäit ausgeschalt. D'Date gi bis op weideres net aktualiséiert.'''",
@@ -454,27 +458,27 @@ Ufro: $2',
 'protectedpagetext'    => 'Dës Säit ass fir Ännerunge gespaart.',
 'viewsourcetext'       => 'Dir kënnt de Quelltext vun dëser Säit kucken a kopéieren:',
 'protectedinterface'   => 'Op dëser Säit fannt Dir Text fir de Sprooch-Interface vun der Software an dofir ass si gespaart fir Mëssbrauch ze verhenneren.',
-'editinginterface'     => "'''Opgepasst:''' Dir sidd am Gaang, eng Säit z'änneren, déi do ass, fir Interface-Text fir d'Software ze liwweren. Ännerungen op dëser Säit änneren den Interface-Text, je no Kontext, op allen oder verschiddene Säiten, déi vun alle Benotzer gesi ginn. Fir d'Iwwersetzungen z'änneren onvitéiere mir iech de  [http://translatewiki.net/wiki/Main_Page?setlang=lb Projet Betawiki] vun den internationale Messagen ze benotzen.",
+'editinginterface'     => "'''Opgepasst:''' Dir sidd am Gaang, eng Säit z'änneren, déi do ass, fir Interface-Text fir d'Software ze liwweren. Ännerungen op dëser Säit änneren den Interface-Text, je no Kontext, op allen oder verschiddene Säiten, déi vun alle Benotzer gesi ginn. Fir d'Iwwersetzungen z'änneren invitéiere mir iech de [http://translatewiki.net/wiki/Main_Page?setlang=lb Projet translatewiki.net] vun den internationale Messagen ze benotzen.",
 'sqlhidden'            => '(SQL-Offro verstoppt)',
 'cascadeprotected'     => 'Dës Säit gouf fir Ännerunge gespaart, well se duerch Cascadeprotectioun vun {{PLURAL:$1|dëser Säit|dëse Säite}} gespaart ass mat der Cascadenoptioun:
 $2',
 'namespaceprotected'   => "Dir hutt net déi néideg Rechter fir d'Säiten am Nummraum '''$1''' ze änneren.",
-'customcssjsprotected' => 'Dir hutt net déi néideg Rechter fir dës Säit ze änneren, wëll si zu de perséinlechen Astellungen vun engem anere Benotzer gehéiert.',
+'customcssjsprotected' => "Dir hutt net déi néideg Rechter fir dës Säit z'änneren, wëll si zu de perséinlechen Astellunge vun engem anere Benotzer gehéiert.",
 'ns-specialprotected'  => 'Spezialsäite kënnen net verännert ginn.',
 'titleprotected'       => "Eng Säit mat dësem Numm kann net ugeluecht ginn. Dës Spär gouf vum [[User:$1|$1]] gemaach deen als Grond ''$2'' uginn huet.",
 
 # Virus scanner
-'virus-badscanner'     => 'Schlecht Configuratioun: onbekannte  Virescanner: <i>$1</i>',
+'virus-badscanner'     => "Schlecht Configuratioun: onbekannte  Virescanner: ''$1''",
 'virus-scanfailed'     => 'De Scan huet net fonctionnéiert (Code $1)',
 'virus-unknownscanner' => 'onbekannten Antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Benotzer-Ofmeldung',
-'logouttext'                 => '<strong>Dir sidd elo ofgemellt.</strong>
+'logouttext'                 => "'''Dir sidd elo ofgemellt.'''
 
 Dir kënnt {{SITENAME}} elo anonym benotzen, oder Iech [[Special:UserLogin|nach eemol umellen]].
 
-Opgepasst: Op verschiddene Säite gesäit et nach esou aus, wéi wann Dir nach ugemellt wiert, bis Dir ärem Browser seng Cache eidel maacht.',
+Opgepasst: Op verschiddene Säite gesäit et nach esou aus, wéi wann Dir nach ugemellt wiert, bis Dir ärem Browser seng Cache eidel maacht.",
 'welcomecreation'            => '== Wëllkomm, $1! ==
 Äre Kont gouf kreéiert. 
 Denkt drun, Är [[Special:Preferences|{{SITENAME}}-Astellungen]] unzepassen.',
@@ -485,9 +489,6 @@ Denkt drun, Är [[Special:Preferences|{{SITENAME}}-Astellungen]] unzepassen.',
 'remembermypassword'         => 'Meng Umeldung op dësem Computer verhalen',
 'yourdomainname'             => 'Ären Domain',
 'externaldberror'            => 'Entweder ass e Feeler bäi der externer Authentifizéierung geschitt, oder Dir däerft ären externe Benotzerkont net aktualiséieren.',
-'loginproblem'               => "'''Et gouf e Problem bäi ärer Umeldung.'''<br />
-
-Probéiert et w.e.g. nach eng Kéier!",
 'login'                      => 'Umellen',
 'nav-login-createaccount'    => 'Aloggen',
 'loginprompt'                => "Fir sech op {{SITENAME}} umellen ze kënnen, mussen d'Cookien aktivéiert sinn.",
@@ -498,7 +499,7 @@ Probéiert et w.e.g. nach eng Kéier!",
 'nologin'                    => 'Hutt Dir kee Benotzerkont? $1.',
 'nologinlink'                => 'Neie Benotzerkont maachen',
 'createaccount'              => 'Neie Kont opmaachen',
-'gotaccount'                 => 'Dier hutt schonn e Kont? $1.',
+'gotaccount'                 => 'Dier hutt schonn e Benotzerkont? $1.',
 'gotaccountlink'             => 'Umellen',
 'createaccountmail'          => 'Via E-Mail',
 'badretype'                  => 'Är Passwierder stëmmen net iwwerdeneen.',
@@ -513,8 +514,8 @@ Sicht iech een anere Benotzernumm.',
 'yourvariant'                => 'Sproochvariant:',
 'yournick'                   => 'Ënnerschrëft:',
 'badsig'                     => "D'Syntax vun ärer Ënnerschëft ass net korrekt; iwwerpréift w.e.g. ären HTML Code.",
-'badsiglength'               => "D'Ënnerschrëft ass ze laang.
-Si muss manner wéi $1 {{PLURAL:$1|Zeechen|Zeechen}} hunn.",
+'badsiglength'               => 'Är Ënnerschrëft ass ze laang.
+Si muss manner wéi $1 {{PLURAL:$1|Zeechen|Zeechen}} hunn.',
 'email'                      => 'E-Mail',
 'prefs-help-realname'        => 'Äre richtege Numm ass fakultativ. Wann Dir en ugitt gëtt e benotzt fir iech är Kontributiounen zouzeuerdnen.',
 'loginerror'                 => 'Feeler bäi der Umeldung',
@@ -529,8 +530,9 @@ Aktivéiert déi w.e.g. a loggt Iech da matt ärem neie Benotzernomm an dem resp
 'noname'                     => 'Dir hutt kee gëltege Benotzernumm uginn.',
 'loginsuccesstitle'          => 'Umeldung huet geklappt',
 'loginsuccess'               => "'''Dir sidd elo als \"\$1\" op {{SITENAME}} ugemellt.'''",
-'nosuchuser'                 => 'De Benotzernumm "$1" gëtt et net.
-Kuckt w.e.g. op d\'Schreifweis richteg ass, oder [[Special:UserLogin/signup|meld iech als neie Benotzer un]].',
+'nosuchuser'                 => 'Et gëtt kee Benotzernumm mam Numm "$1".
+Beim Benotzernumm gëtt tëschent groussen a klenge Buchstawen ënnerscheed (casesensitive). 
+Kuckt w.e.g. op d\'Schreifweis richteg ass, oder [[Special:UserLogin/signup|maache en neie Benotzerkont op]].',
 'nosuchusershort'            => 'De Benotzernumm "<nowiki>$1</nowiki>" gëtt et net. Kuckt w.e.g. op d\'Schreifweis richteg ass.',
 'nouserspecified'            => 'Gitt w.e.g. e Benotzernumm un.',
 'wrongpassword'              => 'Dir hutt e falscht (oder kee) Passwuert aginn. Probéiert w.e.g. nach eng Kéier.',
@@ -550,11 +552,12 @@ Ier iergend eng E-Mail vun anere Benotzer op dee Kont geschéckt ka ginn, muss d
 'throttled-mailpassword'     => "An {{PLURAL:$1|der läschter Stonn|de läschte(n) $1 Stonnen}} gouf eng Erënenrung un d'Passwuert verschéckt.
 Fir de Mëssbrauch vun dëser Funktioun ze verhënneren kann nëmmen all {{PLURAL:$1|Stonn|$1 Stonnen}} esou eng Erënnerung verschéckt ginn.",
 'mailerror'                  => 'Feeler beim Schécke vun der E-Mail: $1',
-'acct_creation_throttle_hit' => 'Dir hutt scho(nn) $1 Konten. Dir kënnt keen Neie méi derbäikréien.',
-'emailauthenticated'         => 'Är E-Mailadress gouf bestätegt: $1..',
+'acct_creation_throttle_hit' => 'Visiteuren vun dëser Wiki déi Är IP-Adress hu {{PLURAL:$1|schonn $1 Benotzerkont|scho(nn) $1 Benotzerkonten}} an de leschten Deeg opgemaach, dëst ass déi maximal Zuel déi an dësem Zäitraum erlaabt ass. 
+Dofir kënne Visiteure déi dës IP-Adress benotzen den Ament keng Benotzerkonten opmaachen.',
+'emailauthenticated'         => 'Är E-Mailadress gouf den $2 ëm $3 Auer bestätegt.',
 'emailnotauthenticated'      => 'Är E-Mail Adress gouf <strong>nach net confirméiert</strong>.<br/ >
 Dowéinst ass et bis ewell net méiglech, fir déi folgend Funktiounen E-Mailen ze schécken oder ze kréien.',
-'noemailprefs'               => 'Gitt eng E-Mailadress un, fir datt dës Funktioune funktionéieren.',
+'noemailprefs'               => 'Gitt eng E-Mailadress bäi ären Astellungen un, fir datt dës Funktioune funktionéieren.',
 'emailconfirmlink'           => 'Confirméiert är E-Mailadress w.e.g..',
 'invalidemailaddress'        => 'Dës E-Mailadress gëtt net akzeptéiert well se en ongëltegt Format (z.B. ongëlteg Zeechen) ze hu schéngt.
 Gitt eng valabel E-Mailadress an oder loosst dëst Feld eidel.',
@@ -565,20 +568,28 @@ Gitt eng valabel E-Mailadress an oder loosst dëst Feld eidel.',
 Dir sollt iech aloggen an ärt Passwuert elo änneren.
 
 Falls dëse Benotzerkont ongewollt ugeluecht ginn ass kënnt Dir dës Noriicht einfach ignoréieren.',
+'login-throttled'            => "dir hutt zevill dacks versicht d'Passwuert vun dësem Benotzerkont anzeginn. Waart w.e.g. ier Dir et nach eng Kéier versicht.",
 'loginlanguagelabel'         => 'Sprooch: $1',
 
 # Password reset dialog
-'resetpass'               => 'Passwuert fir Benotzerkont zrécksetzen',
-'resetpass_announce'      => 'Dir sidd mat engem temporären , per E-Mail geschéckte Code ageloggt.
+'resetpass'                 => 'Passwuert änneren',
+'resetpass_announce'        => 'Dir sidd mat engem temporären , per E-Mail geschéckte Code ageloggt.
 Fir är Umeldung ofzeschléissen, musst Dir elo hei een neit Passwuert uginn:',
-'resetpass_text'          => '<!-- Schreiwt ären Text heihin-->',
-'resetpass_header'        => 'Passwuert vum Benotzerkont änneren',
-'resetpass_submit'        => 'Passwuert aginn an umellen',
-'resetpass_success'       => 'Ärt Passwuert gouf geännert. Logged iech elo an ...',
-'resetpass_bad_temporary' => 'Ongültegt temporairt Passwuert. 
+'resetpass_text'            => '<!-- Schreiwt ären Text heihin-->',
+'resetpass_header'          => 'Passwuert vum Benotzerkont änneren',
+'oldpassword'               => 'Aalt Passwuert:',
+'newpassword'               => 'Neit Passwuert:',
+'retypenew'                 => 'Neit Passwuert nach eemol antippen:',
+'resetpass_submit'          => 'Passwuert aginn an umellen',
+'resetpass_success'         => 'Ärt Passwuert gouf geännert. Logged iech elo an ...',
+'resetpass_bad_temporary'   => 'Ongültegt temporairt Passwuert. 
 Dir hutt ärt Passwuert scho geännert oder een  neit temporairt Passwuert ugefrot.',
-'resetpass_forbidden'     => 'Passwierder kënnen net geännert ginn.',
-'resetpass_missing'       => 'Eidelt Formular',
+'resetpass_forbidden'       => 'Passwierder kënnen net geännert ginn.',
+'resetpass-no-info'         => 'Dir musst ageloggt sinn, fir direkt op dës Säit ze kommen.',
+'resetpass-submit-loggedin' => 'Passwuert änneren',
+'resetpass-wrong-oldpass'   => 'Net valabelt temporärt oder aktuellt Passwuert.
+Vläicht hutt Dir Ärt Passwuert scho geännert oder en neit temporärt Passwuert ugefrot.',
+'resetpass-temp-password'   => 'Temporärt Passwuert:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fettgedréckten Text',
@@ -603,8 +614,8 @@ Dir hutt ärt Passwuert scho geännert oder een  neit temporairt Passwuert ugefr
 'hr_tip'          => 'Horizontal Linn (mat Moosse gebrauchen)',
 
 # Edit pages
-'summary'                          => 'Resumé',
-'subject'                          => 'Sujet/Iwwerschrëft',
+'summary'                          => 'Resumé:',
+'subject'                          => 'Sujet/Iwwerschrëft:',
 'minoredit'                        => 'Kleng Ännerung',
 'watchthis'                        => 'Dës Säit iwwerwaachen',
 'savearticle'                      => 'Säit späicheren',
@@ -616,8 +627,8 @@ Dir hutt ärt Passwuert scho geännert oder een  neit temporairt Passwuert ugefr
 'missingsummary'                   => "'''Erënnerung:''' Dir hutt kee Resumé aginn. Wann Dir nachemol op \"Säit ofspäicheren\" klickt, gëtt är Ännerung ouni Resumé ofgespäichert.",
 'missingcommenttext'               => 'Gitt w.e.g. eng Bemierkung an.',
 'missingcommentheader'             => "'''OPGEPASST:''' Dir hutt keen Titel/Sujet fir dës Bemierkung aginn. Wann Dir nach en Kéier op \"Späicheren\" klickt da gëtt àr Ännerung ouni Titel ofgespäichert.",
-'summary-preview'                  => 'Resumé kucken ouni ofzespäicheren',
-'subject-preview'                  => 'Sujet/Iwwerschrëft kucken',
+'summary-preview'                  => 'Resumé kucken ouni ofzespäicheren:',
+'subject-preview'                  => 'Sujet/Iwwerschrëft kucken:',
 'blockedtitle'                     => 'Benotzer ass gespaart',
 'blockedtext'                      => "<big>Äre Benotzernumm oder är IP Adress gouf gespaart.</big>
 
@@ -656,9 +667,9 @@ Gitt dës Donnéeë w.e.g bei allen Ufroen zu dëser Spär un.',
 'blockededitsource'                => "Den Text vun '''ären Ännerungen''' op '''$1''' steet hei ënnendrënner:",
 'whitelistedittitle'               => "Login noutwännesch fir z'änneren",
 'whitelistedittext'                => 'Dir musst iech $1, fir Säiten änneren ze kënnen.',
-'confirmedittitle'                 => "Konfirmatioun vun ärer E-Mailadress ass erfuederlech fir z'änneren.",
-'confirmedittext'                  => 'Dir musst är E-Mail-Adress conirméieren, ier Dir ännerunge maache kënnt.
-Gitt w.e.g. Eng E-Mailadrss a validéiert se op äre [[Special:Preferences|Benotzerastellungen]].',
+'confirmedittitle'                 => "D'Confirmatioun vun ärer E-Mailadress ass erfuederlech fir z'änneren.",
+'confirmedittext'                  => 'Dir musst är E-Mail-Adress confirméieren, ier Dir Ännerunge maache kënnt.
+Gitt w.e.g. eng E-Mailadrss a validéiert se op äre [[Special:Preferences|Benotzerastellungen]].',
 'nosuchsectiontitle'               => 'Et gëtt keen Abschnitt mat dem Numm',
 'nosuchsectiontext'                => "Dir hutt versicht een Abschnitt z'änneren den et net gëtt. Well et den Abschnitt $1 net gëtt, gëtt et keng Plaz fir är Ännerung ze späicheren.",
 'loginreqtitle'                    => 'Umeldung néideg',
@@ -669,32 +680,34 @@ Gitt w.e.g. Eng E-Mailadrss a validéiert se op äre [[Special:Preferences|Benot
 'newarticle'                       => '(Nei)',
 'newarticletext'                   => "Dir hutt op e Link vun enger Säit geklickt, déi et nach net gëtt. Fir dës Säit unzeleeën, gitt w.e.g. ären Text an déi Këscht hei ënnendrënner an (kuckt d'[[{{MediaWiki:Helppage}}|Hëllef Säit]] fir méi Informatiounen). Wann Dir duerch een Iertum heihi komm sidd, da klickt einfach op de Knäppchen '''Zréck''' vun ärem Browser.",
 'anontalkpagetext'                 => "---- ''Dëst ass d'Diskussiounssäit fir en anonyme Benotzer deen nach kee Kont opgemaach huet oder en net benotzt.
-Dowéinster musse mir d'IP Adress benotzen fir hien/hatt z'identifizéieren. 
+Dowéinster musse mir d'IP Adress benotzen fir de Benotzer z'identifizéieren. 
 Sou eng IP Adress ka vun e puer Benotzer gedeelt ginn. 
-Wann Dir en anonyme Benotzer sidd an dir irrelevant Kommentäre krut,  [[Special:UserLogin|maacht w.e.g. e Kont op]] oder [[Special:UserLogin|loggt Iech an]] fir weider Verwiesselungen mat anonyme Benotzer ze verhënneren.''",
-'noarticletext'                    => 'Dës Säit huet momentan nach keen Text, Dir kënnt op anere Säiten no [[Special:Search/{{PAGENAME}}|dësem Säitentitel sichen]] oder [{{fullurl:{{FULLPAGENAME}}|action=edit}} esou eng Säit uleeën].',
+Wann Dir en anonyme Benotzer sidd an dir irrelevant Kommentäre krut, [[Special:UserLogin|maacht w.e.g. e Kont op]] oder [[Special:UserLogin|loggt Iech an]] fir weider Verwiesselungen mat anonyme Benotzer ze verhënneren.''",
+'noarticletext'                    => 'Dës Säit huet momentan keen Text.
+Dir kënnt op anere Säiten no [[Special:Search/{{PAGENAME}}|dësem Säitentitel sichen]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} an den entspriechende Logbicher nokucken] oder [{{fullurl:{{FULLPAGENAME}}|action=edit}} esou eng Säit uleeën]</span>.',
 'userpage-userdoesnotexist'        => 'De Benotzerkont "$1" gëtt et net. Iwwerpréift w.e.g. op Dir dës Säit erschafe/ännere wëllt.',
 'clearyourcache'                   => "'''Opgepasst - Nom Späichere muss der Ärem Browser seng Cache eidel maachen, fir d'Ännerungen ze gesinn.''' '''Mozilla / Firefox / Safari: ''' dréckt op ''Shift'' während Dir ''reload'' klickt oder dréckt ''Ctrl-F5'' oder ''Ctrl-R''(''Command-R'' op engem Macintosh);'''Konqueror: ''' klickt  ''Reload'' oder dréckt ''F5'' '''Opera:''' maacht de Cache eidel an ''Tools → Preferences;'' '''Internet Explorer:''' dréckt ''Ctrl'' während Dir op ''Refresh'' klickt oder dréckt ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Tipp:</strong> Benotzt de ''Kucken ouni ze späichere''-Button, fir äre neien CSS/JS virum Späicheren ze testen.",
+'usercssjsyoucanpreview'           => "'''Tipp:''' Benotzt de ''Kucken ouni ze späichere''-Button, fir äre neien CSS/JS virum Späicheren ze testen.",
 'usercsspreview'                   => "'''Bedenkt: Dir kuckt just är Benotzer CSS.
 Si gouf nach net gepäichert!'''",
 'userjspreview'                    => "'''Denkt drun datt Dir äre Javascript nëmmen test, nach ass näischt gespäichert!'''",
 'updated'                          => '(Geännert)',
-'note'                             => '<strong>Notiz:</strong>',
-'previewnote'                      => "<strong>Dëst ass nëmmen eng nach net gespäichert Versioun; d'Ännerunge sinn nach net gespäichert!</strong>",
+'note'                             => "'''Notiz:'''",
+'previewnote'                      => "'''Dëst ass nëmmen eng net gespäichert Versioun; d'Ännerunge sinn nach net gespäichert!'''",
 'previewconflict'                  => 'Dir gesitt an dem ieweschten Textfeld wéi den Text ausgesi wäert, wann Dir späichert.',
-'session_fail_preview'             => "<strong>Är Ännerung konnt net gespäichert gi well d'Date vun ärer Sessioun verluergaange sinn.
+'session_fail_preview'             => "'''Är Ännerung konnt net gespäichert gi well d'Date vun ärer Sessioun verluergaange sinn.
 Versicht et w.e.g. nach eng Kéier.
-Wann de Problem dann ëmmer nach bestoe sollt, da versicht iech [[Special:UserLogout|auszeloggen]] an dann erëm anzeloggen.</strong>",
-'session_fail_preview_html'        => "<strong>Är Ännerung konnt net gespäichert gi well d'Date vun ärer Sessioun verluergaange sinn.</strong>
+Wann de Problem dann ëmmer nach bestoe sollt, da versicht iech [[Special:UserLogout|auszeloggen]] an dann erëm anzeloggen.'''",
+'session_fail_preview_html'        => "'''Är Ännerung konnt net gespäichert gi well d'Date vun ärer Sessioun verluergaange sinn.'''
 
 ''Well op {{SITENAME}} ''raw HTML'' aktivéiert ass, gouf d'Uweise vun der nach-net gespäicherter Versioun ausgeblend fir JavaScript-Attacken ze vermeiden.''
 
-<strong>Wann dir eng berechtigt Ännerung maache wëllt, da versicht et w.e.g. nach eng Kéier. 
-Wann de Problem dann ëmmer nach bestoe sollt, versicht iech [[Special:UserLogout|auszeloggen]] an dann erëm anzeloggen.</strong>",
+'''Wann dir eng berechtigt Ännerung maache wëllt, da versicht et w.e.g. nach eng Kéier. 
+Wann de Problem dann ëmmer nach bestoe sollt, versicht iech [[Special:UserLogout|auszeloggen]] an dann erëm anzeloggen.'''",
 'editing'                          => 'Ännere vun $1',
 'editingsection'                   => 'Ännere vun $1 (Abschnitt)',
-'editingcomment'                   => 'Ännere vun $1 (Bemierkung)',
+'editingcomment'                   => 'Ännere vun $1 (neien Abschnitt)',
 'editconflict'                     => 'Ännerungskonflikt: $1',
 'explainconflict'                  => "Een anere Benotzer huet un dëser Säit geschafft, während Dir amgaange waart, se ze änneren.
 Dat iewegt Textfeld weist Iech den aktuellen Text.
@@ -703,24 +716,26 @@ Dir musst Är Ännerungen an dat iewegt Textfeld androen.
 '''Nëmmen''' den Text aus dem iewegten Textfeld gëtt gehale wann Dir op \"Säit späicheren\" klickt.",
 'yourtext'                         => 'Ären Text',
 'storedversion'                    => 'Gespäichert Versioun',
-'nonunicodebrowser'                => '<strong>OPGEPASST:</strong> Äre Browser ass net Unicode kompatibel. Ännert dat w.e.g. éier Dir eng Säit ännert.',
-'editingold'                       => '<strong>OPGEPASST: Dir ännert eng al Versioun vun dëser Säit. Wann Dir späichert, sinn all rezent Versioune vun dëser Säit verluer.</strong>',
+'nonunicodebrowser'                => "'''OPGEPASST:''' Äre Browser ass net Unicode kompatibel. Ännert dat w.e.g. éier Dir eng Säit ännert.",
+'editingold'                       => "'''OPGEPASST: Dir ännert eng al Versioun vun dëser Säit. Wann Dir späichert, sinn all rezent Versioune vun dëser Säit verluer.'''",
 'yourdiff'                         => 'Ënnerscheeder',
-'copyrightwarning'                 => 'W.e.g. notéiert datt all Kontributiounen op {{SITENAME}} automatesch ënner der $2 (kuckt $1 fir méi Informatiounen) verëffentlecht sinn.
+'copyrightwarning'                 => "W.e.g. notéiert datt all Kontributiounen op {{SITENAME}} automatesch ënner der $2 (kuckt $1 fir méi Informatiounen) verëffentlecht sinn.
 Wann Dir net wëllt datt är Texter vun anere Mataarbechter verännert, geläscht a weiderverdeelt kënne ginn, da setzt näischt heihinner.<br />
 Dir verspriecht ausserdeem datt dir dësen Text selwer verfaasst hutt, oder aus dem Domaine public oder ähnleche Ressource kopéiert hutt.
-<strong>DROT KEE COPYRECHTLECH GESCHÃœTZTE CONTENU OUNI ERLAABNISS AN!</strong>',
-'copyrightwarning2'                => 'W.e.g. notéiert datt all Kontributiounen op {{SITENAME}} vun anere Benotzer verännert oder geläscht kënne ginn. Wann dir dat net wëllt, da setzt näischt heihinner.<br />
-Dir verspriecht ausserdeem datt dir dësen Text selwer verfaasst hutt, oder aus dem Domaine public oder anere fräie Quelle kopéiert hutt. (cf. $1 fir méi Detailler). <strong>DROT KEE COPYRECHTLECH GESCHÜTZTE CONTENU AN!</strong>',
-'longpagewarning'                  => '<strong>WARNUNG: Dës Säit ass $1 kB grouss; verschidde Browser kéinte Problemer hunn, Säiten ze verschaffen, déi méi grouss wéi 32 kB sinn.
-
-Iwwerleet w.e.g., ob eng Opdeelung vun der Säit a méi kleng Abschnitter méiglich ass.</strong>',
-'longpageerror'                    => '<strong>FEELER: Den Text, den Dir Versicht ze späicheren, huet $1 KB. Dëst ass méi wéi den erlaabte Maximum vun $2 KB – dofir kann den Text net gespäichert ginn.</strong>',
-'readonlywarning'                  => "<strong>OPGEPASST: D'Datebank gouf wéinst Maintenanceaarbechte fir Säitenànnerunge gespaart, dofir kënnt Dir déi Säit den Ament net ofspäicheren. Versuergt den Text a versicht d'Ännerunge méi spéit nach emol ze maachen.</strong>",
-'protectedpagewarning'             => '<strong>OPGEPASST: Dës Säit gouf gespaart a kann nëmme vun engem Administrateur geännert ginn.</strong>',
+'''DROT KEE COPYRECHTLECH GESCHÃœTZTE CONTENU OUNI ERLAABNISS AN!'''",
+'copyrightwarning2'                => "W.e.g. notéiert datt all Kontributiounen op {{SITENAME}} vun anere Benotzer verännert oder geläscht kënne ginn. Wann dir dat net wëllt, da setzt näischt heihinner.<br />
+Dir verspriecht ausserdeem datt dir dësen Text selwer verfaasst hutt, oder aus dem Domaine public oder anere fräie Quelle kopéiert hutt. (cf. $1 fir méi Detailler). '''DROT KEE COPYRECHTLECH GESCHÜTZTE CONTENU AN!'''",
+'longpagewarning'                  => "'''WARNUNG: Dës Säit ass $1 kB grouss; verschidde Browser kéinte Problemer hunn, Säiten ze verschaffen, déi méi grouss wéi 32 kB sinn.
+
+Iwwerleet w.e.g., ob eng Opdeelung vun der Säit a méi kleng Abschnitter méiglich ass.'''",
+'longpageerror'                    => "'''FEELER: Den Text, den Dir Versicht ze späicheren, huet $1 KB. Dëst ass méi wéi den erlaabte Maximum vun $2 KB – dofir kann den Text net gespäichert ginn.'''",
+'readonlywarning'                  => "'''OPGEPASST: D'Datebank gouf wéinst Maintenanceaarbechte fir Säitenànnerunge gespaart, dofir kënnt Dir déi Säit den Ament net ofspäicheren. Versuergt den Text a versicht d'Ännerunge méi spéit nach emol ze maachen.'''
+
+Den Administrateur den D'Datebank gespaart huet, huet dës Erklärung ginn: $1",
+'protectedpagewarning'             => "'''OPGEPASST: Dës Säit gouf gespaart a kann nëmme vun engem Administrateur geännert ginn.'''",
 'semiprotectedpagewarning'         => "'''Bemierkung:''' Dës Säit gouf esou gespaart, datt nëmme ugemellte Benotzer s'ännere kënnen.",
-'cascadeprotectedwarning'          => "'''Passt op:''' Dës Säit gouf gespaart a kann nëmme vu Benotzer mat Administreursrechter geännert ginn. Si ass an dës {{PLURAL:$1|Säit|Säiten}} agebonnen, déi duerch Kaskadespäroptioun protegéiert {{PLURAL:$1|ass|sinn}}:'''",
-'titleprotectedwarning'            => '<strong>OPGEPASST: Dës Säit gouf gespaart sou datt nëmme verschidde Benotzer se uleeë kënnen.</strong>',
+'cascadeprotectedwarning'          => "'''Passt op:''' Dës Säit gouf gespaart a kann nëmme vu Benotzer mat Administreursrechter geännert ginn. Si ass an dës {{PLURAL:$1|Säit|Säiten}} agebonnen, déi duerch Kaskadespäroptioun gespaart{{PLURAL:$1|ass|sinn}}:'''",
+'titleprotectedwarning'            => "'''OPGEPASST: Dës Säit gouf gespaart sou datt [[Special:ListGroupRights|spezifesch Rechter]] gebraucht gi fir se uleeën ze kënnen.'''",
 'templatesused'                    => 'Schablounen déi op dëser Säit am Gebrauch sinn:',
 'templatesusedpreview'             => 'Schablounen déi an dëser nach net gespäicherter Versioun benotzt ginn:',
 'templatesusedsection'             => 'Schablounen déi an dësem Abschnitt am Gebrauch sinn:',
@@ -738,19 +753,29 @@ Iwwerleet w.e.g., ob eng Opdeelung vun der Säit a méi kleng Abschnitter méigl
 
 Frot iech ob et wierklech sënnvoll ass dës Säit nees nei ze schafen.
 Fir iech z'informéieren fannt Dir hei d'Läschlescht mat dem Grond:",
+'deleted-notice'                   => 'Dës Seite gouf geläscht.
+Hei ass den Extrait aus der Läschlëscht fir déi Säit.',
+'deletelog-fulllog'                => 'Déi ganz Lëscht weisen',
+'edit-hook-aborted'                => "D'Ännerung gouf ouni Erklärung vun enger Schnëttstell (hook) ofgebrach.",
+'edit-gone-missing'                => "D'Säit konnt net aktualiséiert ginn.
+Si gouf anscheinend geläscht.",
+'edit-conflict'                    => 'Ännerungskonflikt.',
+'edit-no-change'                   => 'Är ännerung gouf ignoréiert, well Dir näischt um Text geännert hutt.',
+'edit-already-exists'              => 'Déi nei Säit konnt net ugeluecht ginn, well et se scho gëtt.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Opgepasst: Dës Säit huet zevill Ufroe vu komplexe Parserfunktiounen.
  
-Et däerfen net méi wéi $2 ufroe sinn, aktuell sinn et $1 Ufroen.',
+Et däerfen net méi wéi $2 {{PLURAL:$2|Ufro|Ufroe}} sinn, aktuell {{PLURAL:$2|ass et $1 Ufro|sinn et $1 Ufroe}}.',
 'expensive-parserfunction-category'       => 'Säiten, déi komplex Parserfunktiounen ze dacks opruffen',
 'post-expand-template-inclusion-warning'  => "Opgepasst: D'Gréisst vun den agebonnene Schablounen ass ze grouss, e puer Schabloune kënnen net agebonne ginn.",
 'post-expand-template-inclusion-category' => "Säiten, op denen d'maximal Gréist vun agebonnene Schablounen iwwerschratt ass",
 'post-expand-template-argument-category'  => 'Säiten, op dene mindestens e Parameter vun enger Schabloun vergiess ginn ass',
+'parser-template-loop-warning'            => 'Endlos Schleef an der Schabloun: [[$1]] entdeckt',
 
 # "Undo" feature
 'undo-success' => "D'Ännerung gëtt réckgängeg gemaach. Iwwerpréift w.e.g. de Verglach ënnedrënner fir nozekuckeen ob et esou richteg ass, duerno späichert w.e.g d'Ännerungen of fir dës Aktioun ofzeschléissen.",
-'undo-failure' => '<span class="error">D\'Ännerung konnt net réckgängeg gemaach ginn, wëll de betraffenen Abschnitt an der Tëschenzäit geännert gouf.</span>',
+'undo-failure' => "D'Ännerung konnt net réckgängeg gemaach ginn, wëll de betraffenen Abschnitt an der Tëschenzäit geännert gouf.",
 'undo-norev'   => "D'Ännerung kann net zréckgesat ginn, well et se net gëtt oder well se scho geläscht ass.",
 'undo-summary' => 'Ännerung $1 vu(n) [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussioun]] | [[Special:Contributions/$2|{{MediaWiki:Contribslink}}]]) annulléieren.',
 
@@ -759,30 +784,30 @@ Et däerfen net méi wéi $2 ufroe sinn, aktuell sinn et $1 Ufroen.',
 'cantcreateaccount-text' => 'Dës IP Adress (\'\'\'$1\'\'\') gouf vum [[User:$3|$3]] blokéiert fir Benotzer-Konten op der lëtzebuergescher Wikipedia opzemaachen. De Benotzer $3 huet "$2" als Ursaach uginn.',
 
 # History pages
-'viewpagelogs'        => 'Logbicher fir dës Säit weisen',
-'nohistory'           => 'Et gëtt keng al Versioune vun dëser Säit.',
-'revnotfound'         => 'Dës Versioun gouf net fonnt.',
-'revnotfoundtext'     => "Déi Versioun vun der Säit déi Dir gefrot hutt konnt net fonnt ginn. Kuckt d'URL no, déi Dir benotzt hutt fir op dës Säit ze kommen.",
-'currentrev'          => 'Aktuell Versioun',
-'revisionasof'        => 'Versioun vum $1',
-'revision-info'       => 'Versioun vum $1 vum $2.',
-'previousrevision'    => '� Méi al Versioun',
-'nextrevision'        => 'Méi rezent Ännerung→',
-'currentrevisionlink' => 'Aktuell Versioun',
-'cur'                 => 'aktuell',
-'next'                => 'nächst',
-'last'                => 'lescht',
-'page_first'          => 'éischt',
-'page_last'           => 'lescht',
-'histlegend'          => "Fir d'Ännerungen unzeweisen: Klickt déi zwou Versiounen un, déi solle verglach ginn.<br />
+'viewpagelogs'           => 'Logbicher fir dës Säit weisen',
+'nohistory'              => 'Et gëtt keng al Versioune vun dëser Säit.',
+'currentrev'             => 'Aktuell Versioun',
+'currentrev-asof'        => 'Aktuell Versioun vum $1',
+'revisionasof'           => 'Versioun vum $1',
+'revision-info'          => 'Versioun vum $1 vum $2.', # Additionally available: $3: revision id
+'previousrevision'       => '� Méi al Versioun',
+'nextrevision'           => 'Méi rezent Ännerung→',
+'currentrevisionlink'    => 'Aktuell Versioun',
+'cur'                    => 'aktuell',
+'next'                   => 'nächst',
+'last'                   => 'lescht',
+'page_first'             => 'éischt',
+'page_last'              => 'lescht',
+'histlegend'             => "Fir d'Ännerungen unzeweisen: Klickt déi zwou Versiounen un, déi solle verglach ginn.<br />
 *(aktuell) = Ënnerscheed mat der aktueller Versioun,
 *(lescht) = Ënnerscheed mat der aler Versioun,
 *k = Kleng Ännerung.",
-'deletedrev'          => '[geläscht]',
-'histfirst'           => 'Eelsten',
-'histlast'            => 'Neitsten',
-'historysize'         => '({{PLURAL:$1|1 Byte|$1 Byten}})',
-'historyempty'        => '(eidel)',
+'history-fieldset-title' => 'An de Versioune sichen',
+'deletedrev'             => '[geläscht]',
+'histfirst'              => 'Eelsten',
+'histlast'               => 'Neitsten',
+'historysize'            => '({{PLURAL:$1|1 Byte|$1 Byten}})',
+'historyempty'           => '(eidel)',
 
 # Revision feed
 'history-feed-title'          => 'Historique vun de Versiounen',
@@ -861,133 +886,215 @@ Passt op, datt d'Versiounsgeschicht der Säit historesch korrekt ass.
 'mergehistory-invalid-destination' => 'Zilsäit muss e gültege Säitennumm sinn.',
 'mergehistory-autocomment'         => '[[:$1]] zesummegeluecht an [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] zesummegeluecht an [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Ausgangs- an Zilsäit däerfen net déi selwescht sinn',
 
 # Merge log
 'mergelog'           => 'Fusiouns-Logbuch',
 'pagemerge-logentry' => '[[$1]] zesummegeluecht an [[$2]] (Versioune bis $3)',
 'revertmerge'        => 'Zesummeféieren ophiewen',
-'mergelogpagetext'   => 'Lëscht vun de rezenten Zesummeféierungen vu Versiounsgeschichten.',
+'mergelogpagetext'   => 'Lëscht vun de rezenten Zesummeféierunge vu Versiounsgeschichten.',
 
 # Diffs
 'history-title'           => 'Versiounshistorique vun „$1“',
 'difference'              => '(Ennerscheed tëscht Versiounen)',
 'lineno'                  => 'Linn $1:',
 'compareselectedversions' => 'Ausgewielte Versioune vergläichen',
+'visualcomparison'        => 'Visuelle Vergläich',
+'wikicodecomparison'      => 'Wikitext vergläichen',
 'editundo'                => 'zréck',
 'diff-multi'              => '({{PLURAL:$1|Eng Tëscheversioun gëtt net|$1 Tëscheversioune ginn net}} gewisen)',
+'diff-movedto'            => 'op $1 geréckelt',
+'diff-styleadded'         => '$1 Style derbäigesat',
+'diff-added'              => '$1 derbäigesat',
+'diff-changedto'          => 'geännert op $1',
+'diff-movedoutof'         => 'aus $1 geréckelt',
+'diff-styleremoved'       => '$1 Style ewechgeholl',
+'diff-removed'            => '$1 ewechgeholl',
+'diff-changedfrom'        => 'geännert vu(n) $1',
+'diff-src'                => 'Quell',
+'diff-withdestination'    => 'mit dem Zil $1',
+'diff-with'               => '&#32;mat $1 $2',
+'diff-with-final'         => '&#32;a(n) $1 $2',
+'diff-width'              => 'Breet',
+'diff-height'             => 'Héicht',
+'diff-p'                  => "een '''Abschnitt'''",
+'diff-blockquote'         => "e '''Block'''",
+'diff-h1'                 => "eng '''Iwwerschrëft (1. Niveau)'''",
+'diff-h2'                 => "eng '''Iwwerschrëft (2. Niveau)'''",
+'diff-h3'                 => "eng '''Iwwerschrëft (3. Niveau)'''",
+'diff-h4'                 => "eng '''Iwwerschrëft (4. Niveau)'''",
+'diff-h5'                 => "eng '''Iwwerschrëft (5. Niveau)'''",
+'diff-pre'                => "e '''formatéierte Block'''",
+'diff-div'                => "e '''Blockelement'''",
+'diff-ul'                 => "eng '''Lëscht'''",
+'diff-ol'                 => "eng '''numeréiert Lëscht'''",
+'diff-li'                 => "en '''Objet an enger Lëscht'''",
+'diff-table'              => "eng '''Tabell'''",
+'diff-tbody'              => "en '''Inhalt vun enger Tabell'''",
+'diff-tr'                 => "eine '''Reih'''",
+'diff-td'                 => "eng '''Zell'''",
+'diff-th'                 => "eng '''Iwwerschrëft'''",
+'diff-br'                 => "een '''Zeilenëmbroch'''",
+'diff-hr'                 => "eng '''horizontal Linn'''",
+'diff-code'               => "e '''Beräich Computercode'''",
+'diff-dl'                 => "eng '''Definitiounslëscht'''",
+'diff-dt'                 => "e '''Begrëff als Definitioun'''",
+'diff-dd'                 => "eng '''Definitioun'''",
+'diff-input'              => "eng '''Entrée'''",
+'diff-form'               => "ein '''Formulair'''",
+'diff-img'                => "e '''Bild'''",
+'diff-span'               => "e '''Span'''",
+'diff-a'                  => "e '''Link'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''fett'''",
+'diff-strong'             => "'''staark'''",
+'diff-em'                 => "'''betount'''",
+'diff-font'               => "'''Schrëft'''",
+'diff-big'                => "'''grouss'''",
+'diff-del'                => "'''geläscht'''",
+'diff-tt'                 => "'''fest Breet'''",
+'diff-sub'                => "'''déifgestallt'''",
+'diff-sup'                => "'''héichgestallt'''",
+'diff-strike'             => "'''duerchgestrach'''",
 
 # Search results
-'searchresults'             => 'Resultat vun der Sich',
-'searchresulttext'          => "Fir méi Informatiounen iwwert d'Sichfunktiounen op {{SITENAME}}, kuckt w.e.g op [[{{MediaWiki:Helppage}}|{{int:help}}]].",
-'searchsubtitle'            => 'Dir hutt no "[[:$1]]" gesicht ([[Special:Prefixindex/$1|all Säiten déi mat "$1" ufänken]] | [[Special:WhatLinksHere/$1|all Säiten déi op "$1" linken]])',
-'searchsubtitleinvalid'     => 'Dir hutt no "$1" gesicht.',
-'noexactmatch'              => "'''Et gëtt keng Säite mam Titel \"\$1\".'''
+'searchresults'                    => 'Resultat vun der Sich',
+'searchresults-title'              => 'Resultater vun der Sich no "$1"',
+'searchresulttext'                 => "Fir méi Informatiounen iwwert d'Sichfunktiounen op {{SITENAME}}, kuckt w.e.g op [[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchsubtitle'                   => 'Dir hutt no "[[:$1]]" gesicht ([[Special:Prefixindex/$1|all Säiten déi mat "$1" ufänken]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|all Säiten déi op "$1" linken]])',
+'searchsubtitleinvalid'            => 'Dir hutt no "$1" gesicht.',
+'noexactmatch'                     => "'''Et gëtt keng Säite mam Titel \"\$1\".'''
 
 Dir kënnt [[:\$1|déi Säit uleeën]].",
-'noexactmatch-nocreate'     => "'''Et gëtt keng Säit mam Titel \"\$1\".'''",
-'toomanymatches'            => 'Zevill Resultater goufe fonnt, versicht w.e.g. eng aner Ufro',
-'titlematches'              => 'Säitentitel Iwwerdeneestëmmungen',
-'notitlematches'            => 'Keng Iwwereneestëmmunge mat Säitentitelen',
-'textmatches'               => 'Säitentext Iwwerdeneestëmmungen',
-'notextmatches'             => 'Keng Iwwereneestëmmungen',
-'prevn'                     => 'vireg $1',
-'nextn'                     => 'nächst $1',
-'viewprevnext'              => 'Weis ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 Wuert|$2 Wierder}})',
-'search-result-score'       => 'Relevanz: $1 %',
-'search-redirect'           => '(Viruleedung $1)',
-'search-section'            => '(Abschnitt $1)',
-'search-suggest'            => 'Méngt Dir: $1',
-'search-interwiki-caption'  => 'Schwesterprojeten',
-'search-interwiki-default'  => '$1 Resultater:',
-'search-interwiki-more'     => '(méi)',
-'search-mwsuggest-enabled'  => 'matt Virschléi',
-'search-mwsuggest-disabled' => 'keng Virschléi',
-'search-relatedarticle'     => 'A Verbindung',
-'mwsuggest-disable'         => 'Ajax-Virschléi ausschalten',
-'searchrelated'             => 'a Verbindng',
-'searchall'                 => 'all',
-'showingresults'            => "Hei gesitt der  {{PLURAL:$1| '''1''' Resultat|'''$1''' Resultater}}, ugefaang mat #'''$2'''.",
-'showingresultsnum'         => "Hei gesitt der  {{PLURAL:$3|'''1''' Resultat|'''$3''' Resultater}}, ugefaange mat #'''$2'''.",
-'showingresultstotal'       => "Weis ënnendrënner d'{{PLURAL:$3|Resultat|Resultater}} '''$1 - $2''' vu(n) '''$3'''",
-'nonefound'                 => "'''Opgepasst''': Nëmmen e puer Nummraim gi ''par default'' duerchsicht. Versicht an ärer Ufro ''all:'' anzestellen fir de gesamten Inhalt (inklusiv Diskussiounssäiten, Schablonen, ...), oder benotzt déi gwënschten Nummraim als Virastellung.",
-'powersearch'               => 'Erweidert Sich',
-'powersearch-legend'        => 'Erweidert Sich',
-'powersearch-ns'            => 'Sich an den Nummraim:',
-'powersearch-redir'         => 'Viruleedunge weisen',
-'powersearch-field'         => 'Sich no:',
-'search-external'           => 'Extern Sich',
-'searchdisabled'            => "D'Sichfunktioun op {{SITENAME}} ass ausgeschalt. Dir kënnt iwwerdeems mat Hëllef vu Google sichen. Bedenkt awer, datt deenen hire  Sichindex fir {{SITENAME}} eventuell net dem aktuellste Stand entsprecht.",
+'noexactmatch-nocreate'            => "'''Et gëtt keng Säit mam Titel \"\$1\".'''",
+'toomanymatches'                   => 'Zevill Resultater goufe fonnt, versicht w.e.g. eng aner Ufro',
+'titlematches'                     => 'Säitentitel Iwwerdeneestëmmungen',
+'notitlematches'                   => 'Keng Iwwereneestëmmunge mat Säitentitelen',
+'textmatches'                      => 'Säitentext Iwwerdeneestëmmungen',
+'notextmatches'                    => 'Keng Iwwereneestëmmungen',
+'prevn'                            => 'vireg $1',
+'nextn'                            => 'nächst $1',
+'viewprevnext'                     => 'Weis ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Optioune vun der Sich',
+'searchmenu-exists'                => "* Säit '''[[$1]]'''",
+'searchmenu-new'                   => "'''Opmaache vun der Säit ''[[:$1|$1]]'' op dëser Wiki!'''",
+'searchhelp-url'                   => 'Help:Hëllef',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|All Säite weisen, déi matt dem Begrëff ufänken nodeem Dir sicht]]',
+'searchprofile-articles'           => 'Säite mat Inhalt',
+'searchprofile-articles-and-proj'  => 'Inhalts- a Projetssäiten',
+'searchprofile-project'            => 'Säite vum Projet',
+'searchprofile-images'             => 'Fichieren',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Erweidert',
+'searchprofile-articles-tooltip'   => 'Sichen a(n) $1',
+'searchprofile-project-tooltip'    => 'Sichen a(n) $1',
+'searchprofile-images-tooltip'     => 'No Fichiere sichen',
+'searchprofile-everything-tooltip' => 'Op alle Säiten nom Inhalt sichen  (inclusiv Diskussiounssäiten)',
+'searchprofile-advanced-tooltip'   => 'Sich an den Nummraim déi an de perséinlichen Astellungen festgeluecht sinn',
+'prefs-search-nsdefault'           => 'Sich mat de Standard-Astellungen:',
+'prefs-search-nscustom'            => 'Sich an den agestallten Nummraim:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 Wuert|$2 Wierder}})',
+'search-result-score'              => 'Relevanz: $1 %',
+'search-redirect'                  => '(Viruleedung $1)',
+'search-section'                   => '(Abschnitt $1)',
+'search-suggest'                   => 'Méngt Dir: $1',
+'search-interwiki-caption'         => 'Schwesterprojeten',
+'search-interwiki-default'         => '$1 Resultater:',
+'search-interwiki-more'            => '(méi)',
+'search-mwsuggest-enabled'         => 'matt Virschléi',
+'search-mwsuggest-disabled'        => 'keng Virschléi',
+'search-relatedarticle'            => 'A Verbindung',
+'mwsuggest-disable'                => 'Ajax-Virschléi ausschalten',
+'searchrelated'                    => 'a Verbindng',
+'searchall'                        => 'all',
+'showingresults'                   => "Hei gesitt der  {{PLURAL:$1| '''1''' Resultat|'''$1''' Resultater}}, ugefaang mat #'''$2'''.",
+'showingresultsnum'                => "Hei gesitt der  {{PLURAL:$3|'''1''' Resultat|'''$3''' Resultater}}, ugefaange mat #'''$2'''.",
+'showingresultstotal'              => "Weis ënnendrënner d'{{PLURAL:$4|Resultat '''$1'''|Resultater '''$1 - $2'''}} vu(n) '''$3'''",
+'nonefound'                        => "'''Opgepasst''': Nëmmen e puer Nummraim gi ''par default'' duerchsicht. Versicht an ärer Ufro ''all:'' anzestellen fir de gesamten Inhalt (inklusiv Diskussiounssäiten, Schablonen, ...), oder benotzt déi gwënschten Nummraim als Virastellung.",
+'search-nonefound'                 => 'Fir är Ufro gouf näischt fonnt.',
+'powersearch'                      => 'Erweidert Sich',
+'powersearch-legend'               => 'Erweidert Sich',
+'powersearch-ns'                   => 'Sich an den Nummraim:',
+'powersearch-redir'                => 'Viruleedunge weisen',
+'powersearch-field'                => 'Sich no:',
+'search-external'                  => 'Extern Sich',
+'searchdisabled'                   => "D'Sichfunktioun op {{SITENAME}} ass ausgeschalt. Dir kënnt iwwerdeems mat Hëllef vu Google sichen. Bedenkt awer, datt deenen hire  Sichindex fir {{SITENAME}} eventuell net dem aktuellste Stand entsprecht.",
 
 # Preferences page
-'preferences'              => 'Astellungen',
-'mypreferences'            => 'Meng Astellungen',
-'prefs-edits'              => 'Zuel vun den Ännerungen:',
-'prefsnologin'             => 'Net ageloggt',
-'prefsnologintext'         => 'Dir musst <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}}agelogged]</span> sinn, fir är Astellungen änneren ze kënnen.',
-'prefsreset'               => "D'Astellungen goufen zréckgesat esou wéi se ofgespäichert waren.",
-'qbsettings'               => 'Geschirläischt',
-'qbsettings-none'          => 'Keen',
-'qbsettings-fixedleft'     => 'Lénks, fest',
-'qbsettings-fixedright'    => 'Riets, fest',
-'qbsettings-floatingleft'  => 'schwiewt lenks',
-'qbsettings-floatingright' => 'Schwiewt riets',
-'changepassword'           => 'Passwuert änneren',
-'skin'                     => 'Skin',
-'math'                     => 'Math/TeX',
-'dateformat'               => 'Datumsformat',
-'datedefault'              => 'Egal (Standard)',
-'datetime'                 => 'Datum an Auerzäit',
-'math_failure'             => 'Parser-Feeler',
-'math_unknown_error'       => 'Onbekannte Feeler',
-'math_unknown_function'    => 'Onbekannte Funktioun',
-'math_lexing_error'        => "'Lexing'-Feeler",
-'math_syntax_error'        => 'Syntaxfeeler',
-'math_image_error'         => "d'PNG-Konvertéierung huet net fonctionnéiert;
+'preferences'               => 'Astellungen',
+'mypreferences'             => 'Meng Astellungen',
+'prefs-edits'               => 'Zuel vun den Ännerungen:',
+'prefsnologin'              => 'Net ageloggt',
+'prefsnologintext'          => 'Dir musst <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}}agelogged]</span> sinn, fir är Astellungen änneren ze kënnen.',
+'prefsreset'                => "D'Astellungen goufen zréckgesat esou wéi se ofgespäichert waren.",
+'qbsettings'                => 'Geschirläischt',
+'qbsettings-none'           => 'Keen',
+'qbsettings-fixedleft'      => 'Lénks, fest',
+'qbsettings-fixedright'     => 'Riets, fest',
+'qbsettings-floatingleft'   => 'schwiewt lenks',
+'qbsettings-floatingright'  => 'Schwiewt riets',
+'changepassword'            => 'Passwuert änneren',
+'skin'                      => 'Skin',
+'skin-preview'              => 'Kucken',
+'math'                      => 'Math/TeX',
+'dateformat'                => 'Datumsformat',
+'datedefault'               => 'Egal (Standard)',
+'datetime'                  => 'Datum an Auerzäit',
+'math_failure'              => 'Parser-Feeler',
+'math_unknown_error'        => 'Onbekannte Feeler',
+'math_unknown_function'     => 'Onbekannte Funktioun',
+'math_lexing_error'         => "'Lexing'-Feeler",
+'math_syntax_error'         => 'Syntaxfeeler',
+'math_image_error'          => "d'PNG-Konvertéierung huet net fonctionnéiert;
 iwwerpréift déi korrekt Installatioun vu LaTeX, dvips, gs a convert",
-'math_bad_tmpdir'          => 'Den temporäre Repertire fir mathematesch Formele kann net ugeluecht ginn oder et kann näischt do gespäichert ginn.',
-'math_bad_output'          => 'Den Zilrepertoire fir mathematesch Formele kann net ugeluecht ginn oder et kann näischt do gespäichert ginn.',
-'prefs-personal'           => 'Benotzerprofil',
-'prefs-rc'                 => 'Rezent Ännerungen',
-'prefs-watchlist'          => 'Iwwerwaachungslëscht',
-'prefs-watchlist-days'     => 'Zuel vun den Deeg, déi an der Iwwerwaachungslëscht ugewise solle ginn:',
-'prefs-watchlist-edits'    => 'Maximal Zuel vun den Ännerungen déi an der erweiderter Iwwerwaachungslëscht ugewise solle ginn:',
-'prefs-misc'               => 'Verschiddenes',
-'saveprefs'                => 'Späicheren',
-'resetprefs'               => 'Net gespäichert Ännerungen zrécksetzen',
-'oldpassword'              => 'Aalt Passwuert:',
-'newpassword'              => 'Neit Passwuert:',
-'retypenew'                => 'Neit Passwuert nach eemol antippen:',
-'textboxsize'              => 'Änneren',
-'rows'                     => 'Zeilen',
-'columns'                  => 'Kolonnen',
-'searchresultshead'        => 'Sich',
-'resultsperpage'           => 'Zuel vun de Resultater pro Säit:',
-'contextlines'             => 'Zuel vun de Linnen:',
-'contextchars'             => 'Kontextcharactère pro Linn:',
-'stub-threshold'           => 'Maximum (a Byte) bei deem e Link nach ëmmer am <a href="#" class="stub">Skizze-Format</a> gewise gëtt:',
-'recentchangesdays'        => 'Deeg déi an de Rezenten Ännerungen ugewise ginn:',
-'recentchangescount'       => 'Zuel vun Den Ännerungen déi bei de rezenten Ännerungen de Versiounen an den Log-Säite gewise ginn:',
-'savedprefs'               => 'Är Astellunge goufe gespäichert.',
-'timezonelegend'           => 'Zäitzon',
-'timezonetext'             => "¹Gitt d'Zuel vun de Stonnen an, déi tëscht ärer Zäitzon an der Serverzäit (UTC) leien .",
-'localtime'                => 'Lokalzäit:',
-'timezoneoffset'           => 'Ënnerscheed¹:',
-'servertime'               => 'Serverzäit:',
-'guesstimezone'            => 'Vum Browser iwwerhuelen',
-'allowemail'               => 'E-Maile vun anere Benotzer kréien.',
-'prefs-searchoptions'      => 'Sichoptiounen',
-'prefs-namespaces'         => 'Nummraim',
-'defaultns'                => 'Dës Nummraim duerchsichen:',
-'default'                  => 'Standard',
-'files'                    => 'Fichieren',
+'math_bad_tmpdir'           => 'Den temporäre Repertire fir mathematesch Formele kann net ugeluecht ginn oder et kann näischt do gespäichert ginn.',
+'math_bad_output'           => 'Den Zilrepertoire fir mathematesch Formele kann net ugeluecht ginn oder et kann näischt do gespäichert ginn.',
+'prefs-personal'            => 'Benotzerprofil',
+'prefs-rc'                  => 'Rezent Ännerungen',
+'prefs-watchlist'           => 'Iwwerwaachungslëscht',
+'prefs-watchlist-days'      => 'Zuel vun den Deeg, déi an der Iwwerwaachungslëscht ugewise solle ginn:',
+'prefs-watchlist-days-max'  => '(Maximal 7 Deeg)',
+'prefs-watchlist-edits'     => 'Maximal Zuel vun den Ännerungen déi an der erweiderter Iwwerwaachungslëscht ugewise solle ginn:',
+'prefs-watchlist-edits-max' => '(Maximal Zuel: 1000)',
+'prefs-misc'                => 'Verschiddenes',
+'prefs-resetpass'           => 'Passwuert änneren',
+'saveprefs'                 => 'Späicheren',
+'resetprefs'                => 'Net gespäichert Ännerungen zrécksetzen',
+'textboxsize'               => 'Änneren',
+'prefs-edit-boxsize'        => 'Gréisst vun der Ännerungsfënster:',
+'rows'                      => 'Zeilen',
+'columns'                   => 'Kolonnen',
+'searchresultshead'         => 'Sich',
+'resultsperpage'            => 'Zuel vun de Resultater pro Säit:',
+'contextlines'              => 'Zuel vun de Linnen:',
+'contextchars'              => 'Kontextcharactère pro Linn:',
+'stub-threshold'            => 'Maximum (a Byte) bei deem e Link nach ëmmer am <a href="#" class="stub">Skizze-Format</a> gewise gëtt:',
+'recentchangesdays'         => 'Deeg déi an de Rezenten Ännerungen ugewise ginn:',
+'recentchangesdays-max'     => '(Maximal $1 {{PLURAL:$1|Dag|Deeg}})',
+'recentchangescount'        => 'Zuel vun den Ännerungen déi bei de rezenten Ännerungen de Versiounen an den Log-Säite, als Standard gewise ginn:',
+'savedprefs'                => 'Är Astellunge goufe gespäichert.',
+'timezonelegend'            => 'Zäitzon',
+'timezonetext'              => "¹Gitt d'Zuel vun de Stonnen an, déi tëscht ärer Zäitzon an der Serverzäit (UTC) leien .",
+'localtime'                 => 'Lokalzäit:',
+'timezoneselect'            => 'Zäitzon:',
+'timezoneuseserverdefault'  => 'De Standardwert vum Server benotzen',
+'timezoneuseoffset'         => 'Aner (Differenz uginn)',
+'timezoneoffset'            => 'Zäit-Differenz¹:',
+'servertime'                => 'Serverzäit:',
+'guesstimezone'             => 'Vum Browser iwwerhuelen',
+'allowemail'                => 'E-Maile vun anere Benotzer kréien.',
+'prefs-searchoptions'       => 'Sichoptiounen',
+'prefs-namespaces'          => 'Nummraim',
+'defaultns'                 => 'Dës Nummraim duerchsichen:',
+'default'                   => 'Standard',
+'files'                     => 'Fichieren',
 
 # User rights
 'userrights'                  => 'Benotzerrechterverwaltung', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Benotzergrupp verwalten',
 'userrights-user-editname'    => 'Benotzernumm uginn:',
 'editusergroup'               => 'Benotzergruppen änneren',
-'editinguser'                 => "Ännere vun de Rechter vum Benotzer '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ännere vun de Rechter vum Benotzer '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Benotzergruppen änneren',
 'saveusergroups'              => 'Benotzergruppe späicheren',
 'userrights-groupsmember'     => 'Member vun:',
@@ -1036,10 +1143,13 @@ iwwerpréift déi korrekt Installatioun vu LaTeX, dvips, gs a convert",
 'right-minoredit'            => 'Ännerungen als kleng markéieren',
 'right-move'                 => 'Säite réckelen',
 'right-move-subpages'        => 'Säiten zesumme mat hiren Ënnersäite réckelen',
+'right-move-rootuserpages'   => 'Haapt-Benotzersäite réckelen',
+'right-movefile'             => 'Fichiere réckelen',
 'right-suppressredirect'     => 'Kee Redirect vum ale Numm aus uleeë wann eng Säit eréckelt gëtt',
 'right-upload'               => 'Fichieren eroplueden',
 'right-reupload'             => 'E Fichier iwwerschreiwen',
 'right-reupload-own'         => 'E Fichier iwwerschreiwen dee vum selweschte Benotzer eropgeluede gouf',
+'right-reupload-shared'      => 'Lokalt Iwwerschreiwen vun engem Fichier deen an engem gemeinsam genotzte Repertoire steet',
 'right-upload_by_url'        => 'E Fichier vun enger URL-Adress eroplueden',
 'right-purge'                => 'De Säitecache eidel maachen ouni nozefroen',
 'right-autoconfirmed'        => 'Hallef-gespaarte Säiten änneren',
@@ -1071,6 +1181,7 @@ iwwerpréift déi korrekt Installatioun vu LaTeX, dvips, gs a convert",
 'right-importupload'         => 'Säite vun engem eropgeluedene Ficher importéieren',
 'right-patrol'               => 'Aneren hir Ännerungen als kontrolléiert markéieren',
 'right-unwatchedpages'       => 'Lëscht vun den net iwwerwaachte Säite weisen',
+'right-trackback'            => 'En Trackback matdeelen',
 'right-mergehistory'         => 'Zesummeféierung vum Historique vun de Versioune vu Säiten',
 'right-userrights'           => 'All Benotzerrechter änneren',
 'right-userrights-interwiki' => 'Benotzerrechter vu Benotzer op anere Wiki-Siten änneren',
@@ -1082,9 +1193,43 @@ iwwerpréift déi korrekt Installatioun vu LaTeX, dvips, gs a convert",
 'rightslogentry' => "huet d'Benotzerrechter vum $1 vun $2 op $3 geännert.",
 'rightsnone'     => '(keen)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'dës Säit ze liesen',
+'action-edit'                 => "dës Säit z'änneren",
+'action-createpage'           => 'Säiten unzelleeën',
+'action-createtalk'           => 'Diskussiounssäiten unzeleeën',
+'action-createaccount'        => 'dëse Benotzerkont unzeleeën',
+'action-minoredit'            => 'dës Ännerung als kleng ännerung ze markéieren',
+'action-move'                 => 'dës Säit ze réckelen',
+'action-move-subpages'        => 'dës Säit an déi Ënnersäiten déi dozou gehéieren ze réckelen',
+'action-move-rootuserpages'   => 'Haapt-Benotzersäite réckelen',
+'action-movefile'             => 'Dëse Fichier réckelen',
+'action-upload'               => 'dëse Fichier eropzelueden',
+'action-reupload'             => "dëse Fichier (den et scho gëtt) z'iwwerschreiwen",
+'action-reupload-shared'      => "dëse Fichier op dem gemeinsam genotzte Repertoire z'iwwerschreiwen",
+'action-upload_by_url'        => 'Fichiere vun enger Internetadress (URL) eropzelueden',
+'action-delete'               => 'dës Säit ze läschen',
+'action-deleterevision'       => 'dës Versioun ze läschen',
+'action-deletedhistory'       => "d'Lëscht vun de geläschte Versiounen ze gesinn",
+'action-browsearchive'        => 'no geläschte Säiten zu sichen',
+'action-undelete'             => 'dës Säit ze restauréieren',
+'action-suppressrevision'     => 'déi verstoppte Versioun kucken a restauréieren',
+'action-suppressionlog'       => 'dës privat Lëscht ze kucken',
+'action-block'                => 'dëse Benotzer fir Ännerungen ze spären',
+'action-protect'              => 'de Protectiounsstatus vun dëser Säit änneren',
+'action-import'               => "dës Säit aus enger anerer Wiki z'importéieren",
+'action-importupload'         => "dës Säit duerch d'Eropluede vun engem Fichier importéieren",
+'action-unwatchedpages'       => "d'Lëscht vun den net iwwerwaachte Säiten ze kucken",
+'action-trackback'            => "en ''Trackback'' matzedeelen",
+'action-mergehistory'         => "d'Versiounsgeschicht vun dëser Säiten zesummenze féieren",
+'action-userrights'           => "all Benotzerrechter z'änneren",
+'action-userrights-interwiki' => "d'Rechter vu Benotzer vun anere Wikien z'änneren",
+'action-siteadmin'            => "d'Datebank zu spären oder d'Spär opzehiewen",
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|Ännerung|Ännerungen}}',
 'recentchanges'                     => 'Rezent Ännerungen',
+'recentchanges-legend'              => 'Optioune vun de rezenten Ännerungen',
 'recentchangestext'                 => "Op dëser Säit kënnt Dir déi rezent Ännerungen op '''{{SITENAME}}''' gesinn.",
 'recentchanges-feed-description'    => 'Verfollegt mat dësem Feed déi rezent Ännerungen op {{SITENAME}}.',
 'rcnote'                            => "Hei {{PLURAL:$1|ass déi lescht Ännerung|sinn déi lescht '''$1''' Ännerungen}} {{PLURAL:$2|vum leschten Dag|vun de leschten '''$2''' Deeg}}, Stand: $4 ëm $5 Auer.",
@@ -1096,7 +1241,7 @@ iwwerpréift déi korrekt Installatioun vu LaTeX, dvips, gs a convert",
 'rcshowhideanons'                   => 'Anonym Benotzer $1',
 'rcshowhidepatr'                    => 'iwwerwaacht Ännerunge $1',
 'rcshowhidemine'                    => 'Meng Ännerunge $1',
-'rclinks'                           => 'Weis déi lescht $1 Ännerungen vun de leschten $2 Deeg.<br />$3',
+'rclinks'                           => 'Weis déi lescht $1 Ännerunge vun de leschten $2 Deeg.<br />$3',
 'diff'                              => 'Ënnerscheed',
 'hist'                              => 'Versiounen',
 'hide'                              => 'verstoppen',
@@ -1109,6 +1254,8 @@ iwwerpréift déi korrekt Installatioun vu LaTeX, dvips, gs a convert",
 'rc_categories_any'                 => 'All',
 'rc-change-size'                    => '$1 {{PLURAL:$1|Byte|Bytes}}',
 'newsectionsummary'                 => 'Neien Abschnitt /* $1 */',
+'rc-enhanced-expand'                => 'Detailer weisen (erfuedert JavaScript)',
+'rc-enhanced-hide'                  => 'Detailer verstoppen',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Ännerungen op verlinkte Säiten',
@@ -1130,11 +1277,11 @@ Säite vun [[Special:Watchlist|ärer Iwwerwaachungslëscht]] si '''fett''' gesch
 'upload_directory_read_only'  => 'De Webserver kann net an den Upload-Repertoire ($1) schreiwen.',
 'uploaderror'                 => 'Feeler bäim Eroplueden',
 'uploadtext'                  => "Benotzt dëse Formulair, fir nei Fichieren eropzelueden.
-Gitt op d'[[Special:ImageList|Lëscht vun den eropgeluedene Fichieren]], fir no Fichieren ze sichen déi virdrun eropgeluede goufen, Eropgeluedungen fannt dir an der [[Special:Log/upload|Lëscht vun den eropgeluedene Fichieren]], geläschte Fichieren am [[Special:Log/delete|Läschlog]].
+Gitt op d'[[Special:FileList|Lëscht vun den eropgeluedene Fichieren]], fir no Fichieren ze sichen déi virdrun eropgeluede goufen, Eropgeluedungen fannt dir an der [[Special:Log/upload|Lëscht vun den eropgeluedene Fichieren]], geläschte Fichieren am [[Special:Log/delete|Läschlog]].
 
 Fir e '''Bild''' op enger Säit zu benotzen, schreiwt aplaz vum Bild eng vun dëse Formelen:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fichier.jpg]]</nowiki></tt>''' fir déi ganz Versioun vum Fichier ze benotzen
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fichier.png|200px|thumb|left|alt text]]</nowiki></tt>''' fir eng 200 Pixel breed Versioun an enger Këscht am lenke Rand mat 'alt text' als Beschreiwung
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fichier.jpg]]</nowiki></tt>''' fir déi ganz Versioun vum Fichier ze benotzen
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fichier.png|200px|thumb|left|alt text]]</nowiki></tt>''' fir eng 200 Pixel breed Versioun an enger Këscht am lenke Rand mat 'alt text' als Beschreiwung
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fichier.ogg]]</nowiki></tt>''' fir e Fichier direk ze verlinken ouni de Fichier ze weisen",
 'upload-permitted'            => 'Erlaabte Formater vun de Fichieren: $1.',
 'upload-preferred'            => 'Fichierszorten déi am beschte funktionéieren: $1.',
@@ -1142,19 +1289,20 @@ Fir e '''Bild''' op enger Säit zu benotzen, schreiwt aplaz vum Bild eng vun dë
 'uploadlog'                   => 'Lëscht vun den eropgeluedene Fichieren',
 'uploadlogpage'               => 'Logbuch vum Eroplueden',
 'uploadlogpagetext'           => "Dëst ass d'Lëscht vun de rezente Fichieren déi eropgeluede goufen.
-Kuckt [[Special:NewImages|d'Gallerie vun de neie Fichieren]] wann Dir méi e visuellen Iwwerbléck wëllt",
+Kuckt [[Special:NewFiles|d'Gallerie vun de neie Fichieren]] wann Dir méi e visuellen Iwwerbléck wëllt",
 'filename'                    => 'Numm vum Fichier',
 'filedesc'                    => 'Resumé',
 'fileuploadsummary'           => 'Resumé/Quell:',
 'filestatus'                  => 'Copyright Status:',
 'filesource'                  => 'Quell:',
-'uploadedfiles'               => 'Eropgeluede Fichierën',
+'uploadedfiles'               => 'Eropgeluede Fichieren',
 'ignorewarning'               => 'Warnung ignoréieren an de Fichier nawell späicheren',
 'ignorewarnings'              => 'Ignoréier all Iwwerschreiwungswarnungen',
 'minlength1'                  => "D'Nimm vu Fichiere musse mindestens e Buschtaf am Numm hunn.",
 'illegalfilename'             => 'Am Fichiernumm "$1" sti Schrëftzeechen, déi net am Numm vun enger Säit erlaabt sinn. W.e.g. nennt de Fichier anescht, a probéiert dann nach eng Kéier.',
 'badfilename'                 => 'Den Numm vum Fichier gouf an "$1" ëmgeännert.',
 'filetype-badmime'            => 'Fichieren vum MIME-Typ "$1" kënnen net eropgeluede ginn.',
+'filetype-bad-ie-mime'        => 'Dëse Fichier kann net eropgeluede ginn, well den Internet Explorer en als „$1“ erkennt, deen net erlaabt ass well et e potentiell geféierleche Fichierstyp ass.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' ass een onerwënschte Fichiersformat. 
 Erwënschte {{PLURAL:\$3|Format ass|Formater sinn}}: \$2.",
 'filetype-banned-type'        => "'''.$1''' ass ee Fichersformat deen net erlaabt ass. 
@@ -1163,32 +1311,34 @@ Erlaabt {{PLURAL:$3|ass|sinn}}: $2.",
 'large-file'                  => "D'Fichieren sollte no Méiglechkeet net méi grouss wéi $1 sinn. Dëse Fhihier huet $2.",
 'largefileserver'             => 'Dëse Fichier ass méi grouss wéi déi um Server agestallte Maximalgréisst.',
 'emptyfile'                   => 'De Fichier deen Dir eropgelueden hutt, schéngt eidel ze sinn. Dëst kann duerch en Tippfeeler am Numm vum Fichier kommen. Préift w.e.g. no, op Dir dëse Fichier wierklech eropluede wëllt.',
-'fileexists'                  => 'Et gëtt schonn e Fichier mat dësem Numm, kuckt w.e.g. <strong><tt>$1</tt></strong> wann Dir net sécher sidd, op Dir den Numm ännere wëllt.',
-'filepageexists'              => "Eng Beschreiwungssäit gouf schonns als <strong><tt>$1</tt></strong> geschriwwen, et gëtt awer kee Fichier mat deem Numm.
+'fileexists'                  => "Et gëtt schonn e Fichier mat dësem Numm, kuckt w.e.g. '''<tt>$1</tt>''' wann Dir net sécher sidd, op Dir den Numm ännere wëllt.",
+'filepageexists'              => "Eng Beschreiwungssäit gouf schonns als '''<tt>$1</tt>''' geschriwwen, et gëtt awer kee Fichier mat deem Numm.
 
 Dir kënnt also äre Fichier eroplueden, mee déi Beschreiwung déi dir aginn hutt gëtt net op d'Beschreiwungssäit iwwerholl. D'Beschreiwungssäit musst der nom Eropluede vum Fichier nach manuell änneren.",
-'fileexists-extension'        => 'E Fichier mat engem ähnlechen Namen gëtt et schonn:<br />
-Numm vum Fichier den Dir versicht eropzelueden: <strong><tt>$1</tt></strong><br />
-Numm vum Fichier den et scho gëtt: <strong><tt>$2</tt></strong><br />
-Wielt w.e.g. en anere Numm.',
+'fileexists-extension'        => "E Fichier mat engem ähnlechen Namen gëtt et schonn:<br />
+Numm vum Fichier den Dir versicht eropzelueden: '''<tt>$1</tt>'''<br />
+Numm vum Fichier den et scho gëtt: '''<tt>$2</tt>'''<br />
+Wielt w.e.g. en anere Numm.",
 'fileexists-thumb'            => "<center>'''Dëse Fichier gëtt et'''</center>",
-'fileexists-thumbnail-yes'    => "Beim Fichier schéngt et sech ëm e klengt Bild <i>(Miniaturbild)</i> eu handelen.
-Kuckt de Fichier <strong><tt>$1</tt></strong> w.e.g. no.<br />
+'fileexists-thumbnail-yes'    => "Beim Fichier schéngt et sech ëm e klengt Bild ''(Miniaturbild)'' eu handelen.
+Kuckt de Fichier '''<tt>$1</tt>''' w.e.g. no.<br />
 Wann et sech ëm d'Bild an de Originalgréisst handelt, da brauch kee separat Bild vinn.",
-'file-thumbnail-no'           => 'Den Numm vum Fichier fänkt mat <strong><tt>$1</tt></strong> unn.
-Da däit drop hin dat et e Bild vu reduzéierter Gréisst <i>(thumbnail)</i> ass.
-Wann Dir dat Bild a méi enger grousser Opléisung hutt, da lued dëst erop, soss ännert den Numm vum Fichier w.e.g.',
-'fileexists-forbidden'        => "Et gëtt schonn e Fichier mat ësem Nummm. Gitt w.e.g. z'réck a lued dëse Fichier ënntert engem aner Numm erop. [[Image:$1|thumb|center|$1]]",
+'file-thumbnail-no'           => "Den Numm vum Fichier fänkt mat '''<tt>$1</tt>''' unn.
+Da däit drop hin dat et e Bild vu reduzéierter Gréisst ''(thumbnail)'' ass.
+Wann Dir dat Bild a méi enger grousser Opléisung hutt, da lued dëst erop, soss ännert den Numm vum Fichier w.e.g.",
+'fileexists-forbidden'        => "Et gëtt schonn e Fichier mat ësem Nummm an dee kann net iwwerschriwwe ginn.
+Wann Dir de fichier nach ëmmer eroplued ,da gitt w.e.g. z'réck a benotzt en neien Numm. [[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => 'E Fichier mat dësem Numm gëtt et schonn an dem gedeelte Repertoire.
-Wann Dir dëse Fichier trotzdem eroplued wellt da gitt w.e.g. zréck a lued dëse Fichier ënner engem anere Numm erop. [[Image:$1|thumb|center|$1]]',
+Wann Dir dëse Fichier trotzdem eroplued wellt da gitt w.e.g. zréck a lued dëse Fichier ënner engem anere Numm erop. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Dëse Fichier schéngt een Doublon vun {{PLURAL:$1|dësem Fichier|dëse Fichieren}} ze sinn:',
+'file-deleted-duplicate'      => 'En identesche Fichier ([[$1]]) gouf virdru geläscht. Kuckt w.e.g. an der Lëscht vum Läsche no, Ier Dir en nach emol eroplued.',
 'successfulupload'            => 'Eroplueden erfollegräich',
 'uploadwarning'               => 'Opgepasst',
 'savefile'                    => 'Fichier späicheren',
 'uploadedimage'               => 'huet "[[$1]]" eropgelueden',
 'overwroteimage'              => 'huet eng nei Versioun vun "[[$1]]" eropgelueden',
 'uploaddisabled'              => "Pardon, d'Eroplueden vu Fichieren ass ausgeschalt.",
-'uploaddisabledtext'          => "D'Eroplueden vu Fichieren ass ausgeschalt.",
+'uploaddisabledtext'          => "D'Eropluede vu Fichieren ass ausgeschalt.",
 'uploadscripted'              => 'An dësem Fichier ass HTML- oder Scriptcode, de vun engem Webbrowser falsch interpretéiert kéint ginn.',
 'uploadcorrupt'               => 'De Fichier ass futti oder en huet eng falsch Fichiers-Erweiderung. Kuckt de Fichier weg no a lued de Fichier nach eng Kéier erop.',
 'uploadvirus'                 => 'An dësem Fichier ass ee Virus! Detailer: $1',
@@ -1201,7 +1351,7 @@ Wann Dir dëse Fichier trotzdem eroplued wellt da gitt w.e.g. zréck a lued dës
 
 Kuckt w.e.g. genee no, ob d'dat erneit Eroplueden de Richtlinnen entsprecht.
 Zu ärer Informatioun steet hei Läsch-Lëscht mat dem Grond vum viregte Läschen:",
-'filename-bad-prefix'         => 'Den Numm vum Fichier fänkt mat <strong>„$1“</strong> un. Dësen Numm ass automatesch vun der Kamera gi ginn a seet näischt iwwert dat aus, wat drop ass. Gitt dem Fichier w.e.gl. en Numm, deen den Inhalt besser beschreift, an deen net verwiesselt ka ginn.',
+'filename-bad-prefix'         => "Den Numm vum Fichier fänkt mat '''„$1“''' un. Dësen Numm ass automatesch vun der Kamera gi ginn a seet näischt iwwert dat aus, wat drop ass. Gitt dem Fichier w.e.gl. en Numm, deen den Inhalt besser beschreift, an deen net verwiesselt ka ginn.",
 
 'upload-proto-error'      => 'Falsche Protokoll',
 'upload-proto-error-text' => "D'URL muss matt <code>http://</code> oder <code>ftp://</code> ufänken.",
@@ -1226,18 +1376,19 @@ Kuckt w.e.g. no op kee Feeler an der URL ass an op de Site och online ass.',
 'upload_source_url'  => ' (gülteg, ëffentlech zougänglech URL)',
 'upload_source_file' => ' (e Fichier op Ärem Computer)',
 
-# Special:ImageList
-'imagelist-summary'     => "Op dëser Spezialsäit stinn all déi eropgeluede Fichieren. Déi als läscht eropgeluede Fichieren ginn als éischt ugewisen. Duerch e Klick op d'Iwwerschrëfte vun de Kolonnen kënnt Dir d'Sortéierung ëmdréinen an Dir kënnt esou och no enger anerer Kolonn sortéieren.",
-'imagelist_search_for'  => 'Sicht nom Fichier:',
+# Special:ListFiles
+'listfiles-summary'     => "Op dëser Spezialsäit stinn all déi eropgeluede Fichieren. Déi als läscht eropgeluede Fichieren ginn als éischt ugewisen. Duerch e Klick op d'Iwwerschrëfte vun de Kolonnen kënnt Dir d'Sortéierung ëmdréinen an Dir kënnt esou och no enger anerer Kolonn sortéieren.",
+'listfiles_search_for'  => 'Sicht nom Fichier:',
 'imgfile'               => 'Fichier',
-'imagelist'             => 'Lëscht vun de Fichieren',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Numm',
-'imagelist_user'        => 'Benotzer',
-'imagelist_size'        => 'Gréisst',
-'imagelist_description' => 'Beschreiwung',
-
-# Image description page
+'listfiles'             => 'Lëscht vun de Fichieren',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Numm',
+'listfiles_user'        => 'Benotzer',
+'listfiles_size'        => 'Gréisst',
+'listfiles_description' => 'Beschreiwung',
+'listfiles_count'       => 'Versiounen',
+
+# File description page
 'filehist'                       => 'Versiounen',
 'filehist-help'                  => 'Klickt op e bestëmmten Zäitpunkt fir déi respektiv Versioun vum Fichier ze kucken.',
 'filehist-deleteall'             => 'All Versioune läschen',
@@ -1245,19 +1396,25 @@ Kuckt w.e.g. no op kee Feeler an der URL ass an op de Site och online ass.',
 'filehist-revert'                => 'zrécksetzen',
 'filehist-current'               => 'aktuell',
 'filehist-datetime'              => 'Versioun vum',
+'filehist-thumb'                 => 'Miniaturbild',
+'filehist-thumbtext'             => "Miniaturbild fir d'Versioun vum $1",
+'filehist-nothumb'               => 'Kee Miniaturbild do',
 'filehist-user'                  => 'Benotzer',
 'filehist-dimensions'            => 'Dimensiounen',
 'filehist-filesize'              => 'Gréisst vum Fichier',
 'filehist-comment'               => 'Bemierkung',
-'imagelinks'                     => 'Biller Linken',
+'imagelinks'                     => 'Linken op Fichieren',
 'linkstoimage'                   => 'Dës {{PLURAL:$1|Säit benotzt|Säite benotzen}} dëse Fichier:',
+'linkstoimage-more'              => 'Méi wéi {{PLURAL:$1|eng Säit ass|$1 Säite si}} d¨sem Fichier verlinkt.
+Dës Lëscht weist nëmmen {{PLURAL:$1|den éischte Link|déi éischt $1 Linken}} op dëse Fichier.
+Eng [[Special:WhatLinksHere/$2|komplett Lëscht]] ass disponibel.',
 'nolinkstoimage'                 => 'Keng Säit benotzt dëse Fichier.',
 'morelinkstoimage'               => 'Weis [[Special:WhatLinksHere/$1|méi Linken]] op dëse Fichier.',
 'redirectstofile'                => '{{PLURAL:$1|De Fichier leed|Dës Fichiere leede}} virun op de Fichier:',
-'duplicatesoffile'               => '{{PLURAL:$1|De Fichier ass een Doublon|Dës Fichiere sinn Doublonen}} vum Fichier:',
+'duplicatesoffile'               => '{{PLURAL:$1|De Fichier ass een Doublon|Dës Fichiere sinn Doublone}} vum Fichier ([[Special:FileDuplicateSearch/$2|méi Detailer]]):',
 'sharedupload'                   => 'Dës Fichier ass ee gemeinsam genotzten Upload a ka vun anere Projeten benotzt ginn.',
 'shareduploadwiki'               => 'Kuckt w.e.g. $1 fir méi Informatiounen.',
-'shareduploadwiki-desc'          => "D'Beschreiwung op sénger $1 op dem gedeelte Repertoire steet ënnendrënner.",
+'shareduploadwiki-desc'          => "D'Beschreiwung op sénger $1, steet ënnendrënner.",
 'shareduploadwiki-linktext'      => 'Datei-Beschreiwungssäit',
 'shareduploadduplicate'          => 'Dëse Fichier ass een Doublon vun $1 aus dem gemeinsam genotzte Repertoire.',
 'shareduploadduplicate-linktext' => 'engem anere Fichier',
@@ -1281,7 +1438,7 @@ Kuckt w.e.g. no op kee Feeler an der URL ass an op de Site och online ass.',
 # File deletion
 'filedelete'                  => 'Läsch "$1"',
 'filedelete-legend'           => 'Fichier läschen',
-'filedelete-intro'            => "Dir läscht de Fichier '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Dir läscht de Fichier '''[[Media:$1|$1]]''' matt all senge Versioune (Historique).",
 'filedelete-intro-old'        => "Dir läscht  d'Versioun $4  vum $2, $3 Auer vum Fichier '''„[[Media:$1|$1]]“'''.",
 'filedelete-comment'          => 'Grond:',
 'filedelete-submit'           => 'Läschen',
@@ -1289,8 +1446,6 @@ Kuckt w.e.g. no op kee Feeler an der URL ass an op de Site och online ass.',
 'filedelete-success-old'      => "D'Versioun vu(n) '''[[Media:$1|$1]]''' vum $2, $3 Auer gouf geläscht.",
 'filedelete-nofile'           => "'''$1''' gëtt et net.",
 'filedelete-nofile-old'       => "Et gëtt vun '''$1''' keng archivéiert Versioun mat den Attributer déi dir uginn hutt.",
-'filedelete-iscurrent'        => "Dir versicht déi aktuell Versioun vun dësem Fichier ze läschen.
-Setzt dëse w.e.g. vir d'éischt op méi eng al Versioun zréck.",
 'filedelete-otherreason'      => 'Aneren/zousätzleche Grond:',
 'filedelete-reason-otherlist' => 'Anere Grond',
 'filedelete-reason-dropdown'  => "* Allgemeng Läschgrënn
@@ -1318,30 +1473,31 @@ Dir musst ëmmer de Medien- a Subtyp aginn: z. Bsp. <tt>image/jpeg</tt>.",
 
 # Random page
 'randompage'         => 'Zoufallssäit',
-'randompage-nopages' => 'Et gëtt keng Säiten an dësem Nummraum.',
+'randompage-nopages' => 'Et gëtt keng Säiten am Nummraum $1.',
 
 # Random redirect
 'randomredirect'         => 'Zoufälleg Viruleedung',
-'randomredirect-nopages' => 'An dësem Nummraum gëtt et keng Viruleedungen.',
+'randomredirect-nopages' => 'Am Nummraum $1 gëtt et keng Viruleedungen.',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => '{{SITENAME}}-Statistik',
-'userstats'              => 'Benotzerstatistik',
-'sitestatstext'          => "Et sinn am Ganzen '''\$1''' {{PLURAL:\$1|Säit|Säiten}} an der Datebank.
-Dozou zielen d'\"Diskussiounssäiten\", Säiten iwwert {{SITENAME}}, kuerz Säiten, Viruleedungen an anerer déi eventuell net als Säite gezielt kënne ginn.
-
-Déi ausgeschloss ginn et {{PLURAL:\$2|Säit|Säiten}} déi als Säite betruecht {{PLURAL:\$2|ka|kënne}} ginn.
-
-Am ganzen {{PLURAL:\$8|gouf '''1''' Fichier|goufen '''\$8''' Fichieren}} eropgelueden.
-
-Am ganze gouf '''\$3''' {{PLURAL:\$3|Säitenoffro|Säitenoffroen}} ann '''\$4''' {{PLURAL:\$4|Ännerung|Ännerunge}} zënter datt {{SITENAME}} ageriicht gouf.
-
-Doraus ergi sech '''\$5''' Ännerunge pro Säit an '''\$6''' Säitenoffroen pro Ännerung.
-
-Längt vun der [http://www.mediawiki.org/wiki/Manual:Job_queue „Job queue“]: '''\$7'''",
-'userstatstext'          => "'''$1''' [[Special:ListUsers|Benotzer]] {{PLURAL:$1|ass|sinn}} ageschriwwen.  '''$2''' (oder '''$4%''') vun dëse {{PLURAL:$2|ass|sinn}} $5.",
-'statistics-mostpopular' => 'Am meeschte gekuckte Säiten',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Säitestatistiken',
+'statistics-header-edits'      => 'Statistik vun den Ännerungen',
+'statistics-header-views'      => "Sttistiken iwwert d'Visiten",
+'statistics-header-users'      => 'Benotzerstatistik',
+'statistics-articles'          => 'Säite mat Inhalt',
+'statistics-pages'             => 'Säiten',
+'statistics-pages-desc'        => 'All Säiten an der Wiki, inklusiv Diskussiounssäiten, Viruleedungen, asw.',
+'statistics-files'             => 'Eropgeluede Fichieren',
+'statistics-edits'             => 'Säitenännerungen zënter datt et {{SITENAME}} gëtt',
+'statistics-edits-average'     => 'Duerchschnëttlech Zuel vun Ännerunge pro Säit',
+'statistics-views-total'       => 'Total vun den Oprif',
+'statistics-views-peredit'     => 'Oprif pro Ännerung',
+'statistics-jobqueue'          => 'Längt vun der [http://www.mediawiki.org/wiki/Manual:Job_queue Job queue]',
+'statistics-users'             => 'Registréiert [[Special:ListUsers|Benotzer]]',
+'statistics-users-active'      => 'Aktiv Benotzer',
+'statistics-users-active-desc' => 'Benotzer déi während {{PLURAL:$1|dem leschten Dag|de leschten $1 Deeg}} eppes gemaach hunn',
+'statistics-mostpopular'       => 'Am meeschte gekuckte Säiten',
 
 'disambiguations'      => 'Homonymie Säiten',
 'disambiguationspage'  => 'Schabloun:Homonymie',
@@ -1352,11 +1508,11 @@ Eng Säite gëtt als Homonymiesäit behandelt, wa si eng Schabloun benotzt déi
 'doubleredirects'            => 'Duebel Viruleedungen',
 'doubleredirectstext'        => '<b>Opgepasst:</b> An dëser Lëscht kënne falsch Positiver stoen. Dat heescht meeschtens datt et nach Text zu de Linke vun der éischter Viruleedung gëtt.<br /> 
 An all Rei sti Linken zur éischter an zweeter Viruleedung, souwéi déi éischt Zeil vum Text vun der zweeter Viruleedung, wou normalerweis déi "richteg" Zilsäit drasteet, op déi déi éischt Viruleedung hilinke soll.',
-'double-redirect-fixed-move' => '[[$1]] gouf geréckelt, et ass elo en Viruleedung op [[$2]]',
+'double-redirect-fixed-move' => '[[$1]] gouf geréckelt, et ass elo eng Viruleedung op [[$2]]',
 'double-redirect-fixer'      => 'Verbesserung vu Viruleedungen',
 
 'brokenredirects'        => 'Futtis Viruleedungen',
-'brokenredirectstext'    => 'Viruleedungen op Säiten déi et net gëtt.',
+'brokenredirectstext'    => 'Dës Viruleedungen linken op Säiten déi et net gëtt.',
 'brokenredirects-edit'   => '(änneren)',
 'brokenredirects-delete' => '(läschen)',
 
@@ -1381,31 +1537,35 @@ An all Rei sti Linken zur éischter an zweeter Viruleedung, souwéi déi éischt
 'uncategorizedcategories' => 'Kategorien déi selwer nach keng Kategorie hunn',
 'uncategorizedimages'     => 'Biller ouni Kategorie',
 'uncategorizedtemplates'  => 'Schablounen ouni Kategorie',
-'unusedcategories'        => 'Onbenotzt Kategorien',
+'unusedcategories'        => 'Onbenotzte Kategorien',
 'unusedimages'            => 'Onbenotzte Biller',
 'popularpages'            => 'Populär Säiten',
 'wantedcategories'        => 'Gewënschte Kategorien',
 'wantedpages'             => 'Gewënschte Säiten',
-'missingfiles'            => 'Fichieren déi feelen',
+'wantedfiles'             => 'Gewënschte Fichieren',
+'wantedtemplates'         => 'Gewënschte Schablounen',
 'mostlinked'              => 'Dacks verlinkte Säiten',
 'mostlinkedcategories'    => 'Dacks benotzte Kategorien',
 'mostlinkedtemplates'     => 'Dacks benotzte Schablounen',
 'mostcategories'          => 'Säite mat de meeschte Kategorien',
 'mostimages'              => 'Dacks benotzte Biller',
 'mostrevisions'           => 'Säite mat de meeschte Versiounen',
-'prefixindex'             => 'All Säiten (no hiren Ufanksbuchstawen)',
+'prefixindex'             => 'All Säiten matt Prefix',
 'shortpages'              => 'Kuerz Säiten',
 'longpages'               => 'Laang Säiten',
 'deadendpages'            => 'Sakgaasse-Säiten',
 'deadendpagestext'        => 'Dës Säite si mat kenger anerer Säit op {{SITENAME}} verlinkt.',
 'protectedpages'          => 'Gespaarte Säiten',
 'protectedpages-indef'    => 'Nëmme onbegrenzt-gespaarte Säite weisen',
+'protectedpages-cascade'  => 'Nëmme Säiten déi duerch Kaskade gespaart sinn',
 'protectedpagestext'      => 'Dës Säite si gespaart esou datt si weder geännert nach geréckelt kënne ginn',
 'protectedpagesempty'     => 'Elo si keng Säite mat dëse Parameteren gespaart.',
 'protectedtitles'         => 'Gespaarten Titel',
 'protectedtitlestext'     => 'Dës Titele si gespaart an et ka keng Säit mat deenen Titelen ugeluecht ginn',
 'protectedtitlesempty'    => 'Zur Zäit si mat de Parameteren déi Dir uginn huet keng Säite gespaart esou datt si net ugeluecht kënne ginn.',
 'listusers'               => 'Benotzerlëscht',
+'listusers-editsonly'     => 'Nëmme Benotzer mat Ännerunge weisen',
+'usereditcount'           => '$1 {{PLURAL:$1|Ännerung|Ännerungen}}',
 'newpages'                => 'Nei Säiten',
 'newpages-username'       => 'Benotzernumm:',
 'ancientpages'            => 'Al Säiten',
@@ -1426,14 +1586,13 @@ An all Rei sti Linken zur éischter an zweeter Viruleedung, souwéi déi éischt
 'booksources-search-legend' => 'No Bicherreferenze sichen',
 'booksources-go'            => 'Sichen',
 'booksources-text'          => 'Hei ass eng Lescht mat Linken op Internetsäiten, déi nei a gebraucht Bicher verkafen. Do kann et sinn datt Dir méi Informatiounen iwwer déi Bicher fannt déi Dir sicht.',
+'booksources-invalid-isbn'  => "D'ISBN-Nummer déi Dir uginn hutt schéngt net gëlteg ze sinn. Kuckt w.e.g. no ob bäim Kopéiere kee Feeler geschitt ass.",
 
 # Special:Log
 'specialloguserlabel'  => 'Benotzer:',
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Logbicher',
 'all-logs-page'        => "All d'Logbicher",
-'log-search-legend'    => 'Logbicher duerchsichen',
-'log-search-submit'    => 'Sichen',
 'alllogstext'          => "Dëst ass eng kombinéiert Lëscht vu Logbicher op {{SITENAME}}.
 Dir kënnt d'Sich limitéieren wann dir e Log-Typ, e Benotzernumm (case-senisitive) oder déi gefrote Säit  (och case-senisitive) agitt.",
 'logempty'             => 'Näischt fonnt.',
@@ -1445,6 +1604,7 @@ Dir kënnt d'Sich limitéieren wann dir e Log-Typ, e Benotzernumm (case-senisiti
 'nextpage'          => 'Nächst Säit ($1)',
 'prevpage'          => 'Säit viru(n) ($1)',
 'allpagesfrom'      => 'Säite weisen, ugefaange mat:',
+'allpagesto'        => 'Weis Säite bis:',
 'allarticles'       => "All d'Säiten",
 'allinnamespace'    => "All d'Säiten ($1 Nummraum)",
 'allnotinnamespace' => "All d'Säiten (net am $1 Nummraum)",
@@ -1464,41 +1624,68 @@ Kuckt och [[Special:WantedCategories|Gewënschte Kategorien]].',
 'special-categories-sort-count' => 'No der Zuel sortéieren',
 'special-categories-sort-abc'   => 'alphabetesch sortéieren',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Geläschte Kontributiounen',
+
+# Special:LinkSearch
+'linksearch'      => 'Extern Linken',
+'linksearch-pat'  => 'Sich-Critère:',
+'linksearch-ns'   => 'Nummraum:',
+'linksearch-ok'   => 'Sichen',
+'linksearch-text' => 'Sougennante "Wildcards" wéi zum Beispill <tt>*.example.com</tt> kënne benotzt ginn.<br />
+Ënnerstetzte Protokollen: <tt>$1</tt>',
+'linksearch-line' => '$1 verlinkt vun $2',
+
 # Special:ListUsers
 'listusersfrom'      => "D'Benotzer uweisen, ugefaange bei:",
 'listusers-submit'   => 'Weis',
 'listusers-noresult' => 'Kee Benotzer fonnt.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logbuch vun den neien Umeldungen',
+'newuserlogpagetext'          => "Dëst ass d'Lescht vun de Benotzernimm déi ugeluecht goufen.",
+'newuserlog-byemail'          => "d'Passwuert gouf per E-Mail geschéckt",
+'newuserlog-create-entry'     => 'Neie Benotzer',
+'newuserlog-create2-entry'    => 'huet den neie Benotzerkont $1 opgemaach',
+'newuserlog-autocreate-entry' => 'Benotzerkont gouf automatesch gemaach',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Rechter vun de Benotzergruppen',
-'listgrouprights-summary'  => 'Dëst ass eng Lëscht vun den op dëser Wiki definéierte Benotzergruppen an den domatt verbonnene Rechter.
+'listgrouprights'                 => 'Rechter vun de Benotzergruppen',
+'listgrouprights-summary'         => 'Dëst ass eng Lëscht vun den op dëser Wiki definéierte Benotzergruppen an den domatt verbonnene Rechter.
 Et ginn [[{{MediaWiki:Listgrouprights-helppage}}|zousätzlech Informatiounen]] iwwer individuell Benotzerrechter.',
-'listgrouprights-group'    => 'Grupp',
-'listgrouprights-rights'   => 'Rechter',
-'listgrouprights-helppage' => 'Help:Grupperechter',
-'listgrouprights-members'  => '(Lëscht vun de Memberen)',
+'listgrouprights-group'           => 'Grupp',
+'listgrouprights-rights'          => 'Rechter',
+'listgrouprights-helppage'        => 'Help:Grupperechter',
+'listgrouprights-members'         => '(Lëscht vun de Memberen)',
+'listgrouprights-addgroup'        => 'Kann {{PLURAL:$2|dëse Grupp|dës Gruppen}} derbäisetzen: $1',
+'listgrouprights-removegroup'     => 'Kann {{PLURAL:$2|dëse Gruppe|dës Gruppen}} ewechhuelen: $1',
+'listgrouprights-addgroup-all'    => 'Kann all Gruppen derbäisetzen',
+'listgrouprights-removegroup-all' => 'Ka Benotzer aus alle Gruppen eraushuelen',
 
 # E-mail user
-'mailnologin'     => 'Keng E-Mailadress',
-'mailnologintext' => 'Dir musst [[Special:UserLogin|ugemellt]] sinn an eng gülteg E-Mail Adress an äre [[Special:Preferences|Astellungen]] aginn hunn, fir engem anere Benotzer eng E-Mail ze schécken.',
-'emailuser'       => 'Dësem Benotzer eng E-Mail schécken',
-'emailpage'       => 'Dem Benotzer eng E-Mail schécken',
-'emailpagetext'   => 'Dir kënnt mat dësem Formulaire dësem Benotzer en E-Mail-Message schécken.
+'mailnologin'      => 'Keng E-Mailadress',
+'mailnologintext'  => 'Dir musst [[Special:UserLogin|ugemellt]] sinn an eng gülteg E-Mail Adress an äre [[Special:Preferences|Astellungen]] aginn hunn, fir engem anere Benotzer eng E-Mail ze schécken.',
+'emailuser'        => 'Dësem Benotzer eng E-Mail schécken',
+'emailpage'        => 'Dem Benotzer eng E-Mail schécken',
+'emailpagetext'    => 'Dir kënnt mat dësem Formulaire dësem Benotzer en E-Mail-Message schécken.
 D\'E-Mailadress, déi Dir an [[Special:Preferences|Ären Astellungen]] aginn hutt, steet an der "From" Adress vun der Mail, sou datt den Destinataire Iech direkt äntwerte kann.',
-'usermailererror' => 'E-Mail-Objet mellt deen heite Feeler:',
-'defemailsubject' => 'E-Mail vu(n) {{SITENAME}}',
-'noemailtitle'    => 'Keng E-Mailadress',
-'noemailtext'     => 'Dëse Benotzer huet keng gëlteg E-Mailadress uginn, oder well keng E-Mail vun anere Wikipedianer kréien.',
-'emailfrom'       => 'Vum:',
-'emailto'         => 'Fir:',
-'emailsubject'    => 'Sujet:',
-'emailmessage'    => 'Message:',
-'emailsend'       => 'Schécken',
-'emailccme'       => 'Eng E-Mailkopie vun der Noriicht fir mech',
-'emailccsubject'  => 'Kopie vun denger Noriicht un $1: $2',
-'emailsent'       => 'E-Mail geschéckt',
-'emailsenttext'   => 'Är E-Mail gouf fortgeschéckt.',
-'emailuserfooter' => 'Dës E-Mail gouf vum $1 dem $2 geschéckt dobäi gouf d\'Funktioun "Benotzer E-Mail" op {{SITENAME}} benotzt.',
+'usermailererror'  => 'E-Mail-Objet mellt deen heite Feeler:',
+'defemailsubject'  => 'E-Mail vu(n) {{SITENAME}}',
+'noemailtitle'     => 'Keng E-Mailadress',
+'noemailtext'      => 'Dëse Benotzer huet keng valabel E-Mailadress uginn.',
+'nowikiemailtitle' => 'Keng E-Mail erlaabt',
+'nowikiemailtext'  => 'Dëse Benotzer wëllt keng E-Maile vun anere Benotzer kréien.',
+'email-legend'     => 'Engem anere(n) {{SITENAME}}-Benotzer eng E-Mail schécken',
+'emailfrom'        => 'Vum:',
+'emailto'          => 'Fir:',
+'emailsubject'     => 'Sujet:',
+'emailmessage'     => 'Message:',
+'emailsend'        => 'Schécken',
+'emailccme'        => 'Eng E-Mailkopie vun der Noriicht fir mech',
+'emailccsubject'   => 'Kopie vun denger Noriicht un $1: $2',
+'emailsent'        => 'E-Mail geschéckt',
+'emailsenttext'    => 'Är E-Mail gouf fortgeschéckt.',
+'emailuserfooter'  => 'Dës E-Mail gouf vum $1 dem $2 geschéckt dobäi gouf d\'Funktioun "Benotzer E-Mail" op {{SITENAME}} benotzt.',
 
 # Watchlist
 'watchlist'            => 'Meng Iwwerwaachungslëscht',
@@ -1520,22 +1707,17 @@ Wann dir dës Säit net iwwerwaache wëllt, klickt op \"Net méi iwwerwaachen\"
 'unwatchthispage'      => 'Net méi iwwerwaachen',
 'notanarticle'         => 'Keng Säit',
 'notvisiblerev'        => 'Versioun gouf geläscht',
-'watchnochange'        => 'Keng vun Äre verfollegte Säite gouf während der ugewisener Zäitperiod verännert.',
+'watchnochange'        => 'Keng vun Ären iwwerwaachte Säite gouf während der ugewisener Zäit verännert.',
 'watchlist-details'    => "{{PLURAL:$1|1 Säit|$1 Säiten}} sinn op ärer Iwwerwaachungsklëscht (d'Diskussiounssäite net matgezielt).",
 'wlheader-enotif'      => '* E-Mail-Bescheed ass aktivéiert.',
 'wlheader-showupdated' => "* Säiten déi zënter ärer leschter Visite geännert goufen, si '''fett''' geschriwwen",
 'watchmethod-recent'   => 'Rezent Ännerunge ginn op iwwerwaacht Säiten iwwerpréift',
-'watchmethod-list'     => 'Verfollegt Säite ginn op rezent Ännerungen iwwerpréift',
+'watchmethod-list'     => 'Iwwerwaachte Säite ginn op rezent Ännerungen iwwerpréift',
 'watchlistcontains'    => 'Op ärer Iwwerwaachungslëscht $1 {{PLURAL:$1|steet $1 Säit|stinn $1 Säiten}}.',
 'iteminvalidname'      => "Problem mat dem Objet '$1', ongültege Numm ...",
 'wlnote'               => "Hei {{PLURAL:$1|ass déi lescht Ännerung|sinn déi lescht '''$1''' Ännerunge}} vun {{PLURAL:$2|der leschter Stonn|de leschte(n) '''$2''' Stonnen}}.",
 'wlshowlast'           => "Weis d'Ännerunge vun de leschte(n) $1 Stonnen, $2 Deeg oder $3 (an de leschten 30 Deeg).",
-'watchlist-show-bots'  => 'Bot-Ännerunge weisen',
-'watchlist-hide-bots'  => 'Bot-Ännerunge verstoppen',
-'watchlist-show-own'   => 'Meng Ännerunge weisen',
-'watchlist-hide-own'   => 'Meng Ännerunge verstoppen',
-'watchlist-show-minor' => 'Kleng Ännerunge weisen',
-'watchlist-hide-minor' => 'kleng Ännerunge verstoppen',
+'watchlist-options'    => 'Optioune vun der Iwwerwaachungslëscht',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Iwwerwaachen …',
@@ -1573,54 +1755,58 @@ Et gi soulaang keng weider Maile geschéckt, bis Dir d\'Säit nees emol besicht
 --
 Fir d\'Astellungen op ärer Iwwerwaachungslëscht unzupassen, besicht w.e.g.: {{fullurl:Special:Watchlist/edit}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Säit läschen',
-'confirm'                     => 'Konfirméieren',
-'excontent'                   => "Inhalt war: '$1'",
-'excontentauthor'             => "Op der Säit stoung: '$1' (An als eenzegen dru geschriwwen hat de Benotzer '[[Special:Contributions/$2|$2]]').",
-'exbeforeblank'               => "Den Inhalt virum Läsche war: '$1'",
-'exblank'                     => "D'Säit war eidel",
-'delete-confirm'              => 'Läsche vu(n) "$1"',
-'delete-legend'               => 'Läschen',
-'historywarning'              => 'Opgepasst: Déi Säit déi dir läsche wëllt huet en Historique.',
-'confirmdeletetext'           => "Dir sidd am Gaang, eng Säit mat hirem kompletten Historique vollstänneg aus der Datebank ze läschen.
-W.e.g. konfirméiert, datt Dir dëst wierklech wëllt, datt Dir d'Konsequenze verstitt, an datt dat Ganzt en accordance mat de [[{{MediaWiki:Policy-url}}|Richtlinien]] geschitt.",
-'actioncomplete'              => 'Aktioun ofgeschloss',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" gouf geläscht. Kuckt $2 fir eng Lëscht vun de Säiten déi viru Kuerzem geläscht goufen.',
-'deletedarticle'              => '"$1" gouf geläscht',
-'suppressedarticle'           => 'geläscht "$1"',
-'dellogpage'                  => 'Läschlëscht',
-'dellogpagetext'              => 'Hei fannt dir eng Lëscht mat rezent geläschte Säiten. All Auerzäiten sinn déi vum Server.',
-'deletionlog'                 => 'Läschlëscht',
-'reverted'                    => 'Op déi Versioun virdrun zréckgesat',
-'deletecomment'               => "Grond fir d'Läschen:",
-'deleteotherreason'           => 'Aneren/ergänzende Grond:',
-'deletereasonotherlist'       => 'Anere Grond',
-'deletereason-dropdown'       => '* Heefegst Grënn fir eng Säit ze läschen
+# Delete
+'deletepage'             => 'Säit läschen',
+'confirm'                => 'Confirméieren',
+'excontent'              => "Inhalt war: '$1'",
+'excontentauthor'        => "Op der Säit stoung: '$1' (An als eenzegen dru geschriwwen hat de Benotzer '[[Special:Contributions/$2|$2]]').",
+'exbeforeblank'          => "Den Inhalt virum Läsche war: '$1'",
+'exblank'                => "D'Säit war eidel",
+'delete-confirm'         => 'Läsche vu(n) "$1"',
+'delete-legend'          => 'Läschen',
+'historywarning'         => 'Opgepasst: Déi Säit déi dir läsche wëllt huet en Historique.',
+'confirmdeletetext'      => "Dir sidd am Gaang, eng Säit mat hirem kompletten Historique vollstänneg aus der Datebank ze läschen.
+W.e.g. confirméiert, datt Dir dëst wierklech wëllt, datt Dir d'Konsequenze verstitt, an datt dat Ganzt am Aklang mat de [[{{MediaWiki:Policy-url}}|Richtlinne]] geschitt.",
+'actioncomplete'         => 'Aktioun ofgeschloss',
+'deletedtext'            => '"<nowiki>$1</nowiki>" gouf geläscht. Kuckt $2 fir eng Lëscht vun de Säiten déi viru Kuerzem geläscht goufen.',
+'deletedarticle'         => '"$1" gouf geläscht',
+'suppressedarticle'      => 'geläscht "$1"',
+'dellogpage'             => 'Läschlëscht',
+'dellogpagetext'         => 'Hei fannt dir eng Lëscht mat rezent geläschte Säiten. All Auerzäiten sinn déi vum Server.',
+'deletionlog'            => 'Läschlëscht',
+'reverted'               => 'Op déi Versioun virdrun zréckgesat',
+'deletecomment'          => "Grond fir d'Läschen:",
+'deleteotherreason'      => 'Aneren/ergänzende Grond:',
+'deletereasonotherlist'  => 'Anere Grond',
+'deletereason-dropdown'  => '* Heefegst Grënn fir eng Säit ze läschen
 ** Wonsch vum Auteur
 ** Verletzung vun engem Copyright
 ** Vandalismus',
-'delete-edit-reasonlist'      => 'Läschgrënn änneren',
-'delete-toobig'               => "Dës Säit huet e laangen Historique, méi wéi $1 {{PLURAL:$1|Versioun|Versiounen}}.
+'delete-edit-reasonlist' => 'Läschgrënn änneren',
+'delete-toobig'          => "Dës Säit huet e laangen Historique, méi wéi $1 {{PLURAL:$1|Versioun|Versiounen}}.
 D'Läsche vun esou Säite gouf limitéiert fir ongewollte Stéierungen op {{SITENAME}} ze verhënneren.",
-'delete-warning-toobig'       => "Dës Säit huet eng laang Versiounsgeschicht, méi wéi $1 {{PLURAL:$1|Versioun|Versiounen}}.
+'delete-warning-toobig'  => "Dës Säit huet eng laang Versiounsgeschicht, méi wéi $1 {{PLURAL:$1|Versioun|Versiounen}}.
 D'Läschen dovun kann zu Stéierungen am Funktionnement vun {{SITENAME}} féieren;
 dës Aktioun soll mat Vierssiicht gemaach ginn.",
-'rollback'                    => 'Ännerungen zrécksetzen',
-'rollback_short'              => 'Zrécksetzen',
-'rollbacklink'                => 'Zrécksetzen',
-'rollbackfailed'              => 'Zrécksetzen huet net geklappt',
-'cantrollback'                => 'Lescht Ännerung kann net zréckgesat ginn. De leschten Auteur ass deen eenzegen Auteur vun dëser Säit.',
-'alreadyrolled'               => 'Déi lescht Ännerung vun der Säit [[$1]] vum [[User:$2|$2]] ([[User talk:$2|Diskussioun]] | [[Special:Contributions/$2|{{int:contribslink}}]]); kann net zréckgesat ginn; 
+
+# Rollback
+'rollback'         => 'Ännerungen zrécksetzen',
+'rollback_short'   => 'Zrécksetzen',
+'rollbacklink'     => 'Zrécksetzen',
+'rollbackfailed'   => 'Zrécksetzen huet net geklappt',
+'cantrollback'     => 'Lescht Ännerung kann net zréckgesat ginn. De leschten Auteur ass deen eenzegen Auteur vun dëser Säit.',
+'alreadyrolled'    => 'Déi lescht Ännerung vun der Säit [[$1]] vum [[User:$2|$2]] ([[User talk:$2|Diskussioun]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); kann net zréckgesat ginn; 
 een Aneren huet dëst entweder scho gemaach oder nei Ännerungen agedroen.
 
-Déi lescht Ännerung vun der Säit ass vum [[User:$3|$3]] ([[User talk:$3|Diskussioun]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Ännerungskommentar: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Ännerunge vum [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussioun]]) zréckgesat op déi lescht Versioun vum [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "D'Ännerunge vum $1 goufen zréckgesat op déi lescht Versioun vum $2.",
-'sessionfailure'              => 'Et schéngt e Problem mat ärer Loginséance ze ginn;
+Déi lescht Ännerung vun der Säit ass vum [[User:$3|$3]] ([[User talk:$3|Diskussioun]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "De Resumé vun der Ännerung war: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Ännerunge vum [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussioun]]) zréckgesat op déi lescht Versioun vum [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "D'Ännerunge vum $1 goufen zréckgesat op déi lescht Versioun vum $2.",
+'sessionfailure'   => 'Et schéngt e Problem mat ärer Loginséance ze ginn;
 Dës Aktioun gouf aus Sécherheetsgrënn ofgebrach, fir ze verhënneren datt är Séance piratéiert ka ginn.
 KLickt w.e.g. op "Zréck" a lued déi Säit vun däer Dir komm sidd nei, a versicht et dann nach eng Kéier.',
+
+# Protect
 'protectlogpage'              => 'Protectiouns-Logbuch',
 'protectlogtext'              => "Dëst ass d'Lëscht vun de Säitespären.
 Kuckt d'[[Special:ProtectedPages|Lëscht vun de gespaarte Säite]] fir eng Lëscht vun den aktuelle Säitespären.",
@@ -1628,28 +1814,42 @@ Kuckt d'[[Special:ProtectedPages|Lëscht vun de gespaarte Säite]] fir eng Lësc
 'modifiedarticleprotection'   => 'huet d\'Protectioun vun "[[$1]]" geännert',
 'unprotectedarticle'          => "huet d'Spär vu(n) [[$1]] opgehuewen",
 'protect-title'               => 'Ännerung vun der Protectioun vu(n) „$1“',
-'protect-legend'              => "Konfirméiert d'Protectioun",
+'prot_1movedto2'              => '[[$1]] gouf op [[$2]] geréckelt',
+'protect-legend'              => "Confirméiert d'Protectioun",
 'protectcomment'              => 'Grond:',
 'protectexpiry'               => 'Dauer vun der Spär:',
 'protect_expiry_invalid'      => "D'Dauer déi Dir uginn hutt ass ongültig.",
 'protect_expiry_old'          => "D'Spärzäit läit an der Vergaangenheet.",
 'protect-unchain'             => 'Réckel-Protectioun änneren',
-'protect-text'                => "Hei kënnt Dir de Protectiounsstatus fir d'Säit <strong>$1</strong> kucken an änneren.",
+'protect-text'                => "Hei kënnt Dir de Protectiounsstatus fir d'Säit '''$1''' kucken an änneren.",
 'protect-locked-blocked'      => "Dir kënnt den Niveau vun der Säite-Protectioun net änneren, well äre Benotzerkont gespaart ass.
-Hei sinn déi aktuell Säite-Protectiouns-Astellungen fir d'Säit <strong>$1</strong>:",
+Hei sinn déi aktuell Säite-Protectiouns-Astellungen fir d'Säit '''$1''':",
 'protect-locked-dblock'       => "Den Niveau vun der Proectioun vun der Säit kann net geänenert ginn, well d'Datebank gespaart ass.
-Hei sinn déi aktuell Astellungen fir d'Säit <strong>$1</strong>:",
+Hei sinn déi aktuell Astellungen fir d'Säit '''$1''':",
 'protect-locked-access'       => "Dir hutt net déi néideg Rechter fir de Protectiouns-Niveau vun dëser Säit z'änneren.
-Hei sinn déi aktuell Astellunge fir d'Säit <strong>$1</strong>:",
+Hei sinn déi aktuell Astellunge fir d'Säit '''$1''':",
 'protect-cascadeon'           => "Dës Säit ass elo gespaart well si an déi folgend {{PLURAL:$1|Säit|Säiten}} agebonn ass déi duerch eng Kaskadespär gespaart {{PLURAL:$1|ass|sinn}}. De Protectiounsniveau ka fir dës Seite geännert ginn, dëst huet awer keen Afloss op d'Kaskadespär.",
-'protect-default'             => 'Alleguer (Standard)',
+'protect-default'             => 'All Benotzer erlaben',
 'protect-fallback'            => 'Eng "$1"-Autorisatioun gëtt gebraucht.',
-'protect-level-autoconfirmed' => 'Spär fir net ugemellte Benotzer',
+'protect-level-autoconfirmed' => 'Spär fir nei an net ugemellte Benotzer',
 'protect-level-sysop'         => 'Nëmmen Administrateuren',
 'protect-summary-cascade'     => 'Protectioun a Kaskaden',
 'protect-expiring'            => 'bis $1 (UTC)',
+'protect-expiry-indefinite'   => 'net definéiert',
 'protect-cascade'             => "Kaskade-Spär – alleguerten d'Schablounen déi an dës Säit agebonne si ginn och gespaart.",
 'protect-cantedit'            => "Dir kënnt d'Spär vun dëser Seite net änneren, well Dir net déi néideg Rechter hutt fir déi Säit z'änneren.",
+'protect-othertime'           => 'Aner Zäit:',
+'protect-othertime-op'        => 'aner Zäit',
+'protect-existing-expiry'     => 'Ënn vun der Säitespär: $2 ëm $3 Auer',
+'protect-otherreason'         => 'Aneren/zousätzleche Grond:',
+'protect-otherreason-op'      => 'aneren/zousätzleche Grond',
+'protect-dropdown'            => '*Déi heefegst Grënn fir eng Säit ze spären
+** Weblink-Spam
+** Permanenten Ännerungskonflikt
+** Dacks benotzte Schablounen
+** Säit déi dacks besicht gëtt',
+'protect-edit-reasonlist'     => 'Grënn vun der Protectioun änneren',
+'protect-expiry-options'      => '1 Stonn:1 hour,1 Dag:1 day,1 Woch:1 week,2 Wochen:2 weeks,1 Mount:1 month,3 Méint:3 months,6 Méint:6 months,1 Joer:1 year,onbegrenzt:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Berechtigung:',
 'restriction-level'           => 'NIveau vun de Limitatiounen:',
 'minimum-size'                => 'Mindestgréisst',
@@ -1672,7 +1872,7 @@ Hei sinn déi aktuell Astellunge fir d'Säit <strong>$1</strong>:",
 'undeletepage'                 => 'Geläschte Säite kucken a restauréieren',
 'undeletepagetitle'            => "'''Op dëser Lëscht sti geläschte Versioune vun [[:$1]]'''.",
 'viewdeletedpage'              => 'Geläschte Säite weisen',
-'undeletepagetext'             => "Dës Säite goufe geläscht mee sinn nach ëmmer am Archiv a kënne vun Administrateure restauréiert ginn. D'Archiv gëtt periodesch eidel gemaach.",
+'undeletepagetext'             => "Dës {{PLURAL:$1|Säit gouf |Säite goufe}} geläscht mee sinn nach ëmmer am Archiv a kënne vun Administrateure restauréiert ginn. D'Archiv gëtt periodesch eidel gemaach.",
 'undelete-fieldset-title'      => 'Versioune restauréieren',
 'undeleteextrahelp'            => "Fir d'Säit komplett mat alle Versiounen ze retabléieren, markéiert keng vun den eenzelne Casë mat engem Krop a klickt op '''''Restauréieren'''''. 
 Fir nëmmen eng bestëmmte Versioun vun der Säit ze restauréieren, markéiert d'Case vun der gewënschter Versioun mat engem Krop, a klickt duerno op '''''Restauréieren'''''. 
@@ -1681,12 +1881,13 @@ Klickt op '''''Reset''''' fir d'Kommentarfeld eidel ze maachen an d'Kreep aus al
 'undeletehistory'              => 'Wann Dir dës Säit restauréiert, ginn och all déi al Versioune restauréiert.
 Wann zënter dem Läschen eng nei Säit mat dem selweschte Numm ugeluecht gouf, ginn déi restauréiert Versioune chronologesch an den Historique agedro.',
 'undeletehistorynoadmin'       => "Dës Säit gouf geläscht. De Grond fir d'Läsche gesitt der ënnen, zesumme mat der Iwwersiicht vun den eenzele Versioune vun der Säit an hiren Auteuren. Déi verschidden Textversioune kënnen awer just vun Administrateure gekuckt a restauréiert ginn.",
-'undelete-revision'            => 'Geläschte Versioun vun $1 (Versioun  vum $2) vum $3:',
+'undelete-revision'            => 'Geläschte Versioun vun $1 (Versioun  vum $4 um $5 Auer) vum $3:',
 'undeleterevision-missing'     => "Ongëlteg oder Versioun déi feelt. Entweder ass de Link falsch oder d'Versioun gouf aus dem Archiv restauréiert oder geläscht.",
 'undelete-nodiff'              => 'Et si keng méi al Versiounen do.',
 'undeletebtn'                  => 'Restauréieren',
 'undeletelink'                 => 'restauréieren',
 'undeletereset'                => 'Ofbriechen',
+'undeleteinvert'               => 'Auswiel ëmdréinen',
 'undeletecomment'              => 'Grond:',
 'undeletedarticle'             => 'huet "[[$1]]" restauréiert',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|Versioun gouf|$1 Versioune goufe}} restauréiert',
@@ -1705,7 +1906,7 @@ Am [[Special:Log/delete|Läsch-Logbuch]] fannt Dir déi geläscht a restauréier
 'undelete-bad-store-key'       => "D'Versioun vum Fichier mat dem Zäitstempel $1 konnt net restauréiert ginn: De Fichier war scho virum Läschen net méi do.",
 'undelete-cleanup-error'       => 'Feeler beim Läsche vun der onbenotzter Archiv-Versioun $1.',
 'undelete-missing-filearchive' => 'De Fichier mat der Archiv-ID $1 kann net restauréiert ginn, well e net an der Datebank ass. Méiglecherweis gouf e scho restauréiert.',
-'undelete-error-short'         => 'Feeler bäim Restauréieren vum Fichier: $1',
+'undelete-error-short'         => 'Feeler bäim Restauréiere vum Fichier: $1',
 'undelete-error-long'          => 'Beim Restauréiere vun engem Fichier goufe Feeler fonnt:
 
 $1',
@@ -1718,26 +1919,27 @@ $1',
 'blanknamespace' => '(Haapt)',
 
 # Contributions
-'contributions' => 'Kontributioune vum Benotzer',
-'mycontris'     => 'Meng Kontributiounen',
-'contribsub2'   => 'Fir $1 ($2)',
-'nocontribs'    => 'Et goufe keng Ännerunge fonnt, déi dëse Kritèren entspriechen.',
-'uctop'         => '(aktuell)',
-'month'         => 'Vum Mount (a virdrun):',
-'year'          => 'Vum Joer (a virdrun):',
-
-'sp-contributions-newbies'     => 'Nëmme Kontributioune vun neie Mataarbechter weisen',
-'sp-contributions-newbies-sub' => 'Fir déi Nei',
-'sp-contributions-blocklog'    => 'Spärlescht',
-'sp-contributions-search'      => 'No Kontributioune sichen',
-'sp-contributions-username'    => 'IP-Adress oder Benotzernumm:',
-'sp-contributions-submit'      => 'Sichen',
+'contributions'       => 'Kontributioune vum Benotzer',
+'contributions-title' => 'Kontributioune vum $1',
+'mycontris'           => 'Meng Kontributiounen',
+'contribsub2'         => 'Fir $1 ($2)',
+'nocontribs'          => 'Et goufe keng Ännerunge fonnt, déi dëse Kritèren entspriechen.',
+'uctop'               => '(aktuell)',
+'month'               => 'Vum Mount (a virdrun):',
+'year'                => 'Vum Joer (a virdrun):',
+
+'sp-contributions-newbies'       => 'Nëmme Kontributioune vun neie Mataarbechter weisen',
+'sp-contributions-newbies-sub'   => 'Fir déi Nei',
+'sp-contributions-newbies-title' => 'Kontributioune vun neie Benotzer',
+'sp-contributions-blocklog'      => 'Spärlescht',
+'sp-contributions-search'        => 'No Kontributioune sichen',
+'sp-contributions-username'      => 'IP-Adress oder Benotzernumm:',
+'sp-contributions-submit'        => 'Sichen',
 
 # What links here
 'whatlinkshere'            => 'Linken op dës Säit',
 'whatlinkshere-title'      => 'Säiten, déi mat "$1" verlinkt sinn',
 'whatlinkshere-page'       => 'Säit:',
-'linklistsub'              => '(Lëscht vun de Linken)',
 'linkshere'                => "Déi folgend Säite linken op '''[[:$1]]''':",
 'nolinkshere'              => "Keng Säit ass mat '''[[:$1]]''' verlinkt.",
 'nolinkshere-ns'           => "Keng Säite linken op '''[[:$1]]''' am gewielten Nummraum.",
@@ -1773,14 +1975,16 @@ $1',
 'ipbanononly'                     => 'Nëmmen anonym Benotzer spären',
 'ipbcreateaccount'                => 'Opmaache vun engem Benotzerkont verhënneren',
 'ipbemailban'                     => 'Verhënneren datt de Benotzer E-Maile verschéckt',
-'ipbenableautoblock'              => 'Automatesch déi lescht IP-Adress spären déi vun dësem Benotzer benotzt gouf, an all IP-Adressen vun denen dëse Benotzer versicht Ännerunge virzehuelen',
+'ipbenableautoblock'              => 'Automatesch déi lescht IP-Adress spären déi vun dësem Benotzer benotzt gouf, an all IP-Adresse vun denen dëse Benotzer versicht Ännerunge virzehuelen',
 'ipbsubmit'                       => 'Dës IP-Adress resp dëse Benotzer spären',
 'ipbother'                        => 'Aner Dauer:',
-'ipboptions'                      => '1 Stonn:1 hour,2 Stonen:2 hours,6 Stonnen:6 hours,1 Dag:1 day,3 Deeg:3 days,1 Woch:1 week,2 Wochen:2 weeks,1 Mount:1 month,3 Méint:3 months,1 Joer:1 year,Onbegrenzt:infinite', # display1:time1,display2:time2,...
+'ipboptions'                      => '2 Stonen:2 hours,1 Dag:1 day,3 Deeg:3 days,1 Woch:1 week,2 Wochen:2 weeks,1 Mount:1 month,3 Méint:3 months,6 Méint:6 months,1 Joer:1 year,onbegrenzt:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'Aner Dauer',
 'ipbotherreason'                  => 'Aneren oder zousätzleche Grond:',
 'ipbhidename'                     => 'Benotzernumm an der Spärlëscht, der Lëscht vun den aktive Spären an der Lëscht vun de Benotzer verstoppen',
 'ipbwatchuser'                    => 'Dësem Benotzer seng Benotzer- an Diskussiouns-Säit iwwerwaachen',
+'ipballowusertalk'                => 'Benotzer däerf seng Diskussiounssäiten änneren esouguer wann e gespaart ass',
+'ipb-change-block'                => 'De Benotzer mat dese Parameteren nees spären',
 'badipaddress'                    => "D'IP-Adress huet dat falscht Format.",
 'blockipsuccesssub'               => 'Gouf gespaart',
 'blockipsuccesstext'              => "[[Special:Contributions/$1|$1]] gouf gespaart. <br />
@@ -1791,14 +1995,18 @@ Kuckt d'[[Special:IPBlockList|IP Spär-Lëscht]] fir all Spären ze gesin.",
 'ipb-unblock'                     => 'Spär vun enger IP-Adress oder engem Benotzer ophiewen',
 'ipb-blocklist-addr'              => 'Aktuell Späre fir $1',
 'ipb-blocklist'                   => 'Kuckt aktuell Spären',
-'unblockip'                       => 'Spär annuléieren',
+'ipb-blocklist-contribs'          => 'Kontributioune fir $1',
+'unblockip'                       => 'Spär vum Benotzer ophiewen',
 'unblockiptext'                   => 'Matt dësem Formulaire kënnt Dir enger IP-Adress oder engen Benotzer seng Spär ohiewen.',
-'ipusubmit'                       => "D'Spär vun dëser Adress ophiewen",
+'ipusubmit'                       => 'Des Spär ophiewen',
 'unblocked'                       => "D'Spär fir de [[User:$1|Benotzer $1]] gouf opgehuewen",
-'unblocked-id'                    => "D'Spär $1 gouf annulléiert",
+'unblocked-id'                    => "D'Spär $1 gouf opgehuewen",
 'ipblocklist'                     => 'Lëscht vu gespaarten IP-Adressen a Benotzernimm',
 'ipblocklist-legend'              => 'No engem gespaarte Benotzer sichen',
 'ipblocklist-username'            => 'Benotzernumm oder IP-Adress:',
+'ipblocklist-sh-userblocks'       => 'Benotzerspäre $1',
+'ipblocklist-sh-tempblocks'       => 'temporär Späre $1',
+'ipblocklist-sh-addressblocks'    => 'eenzel IP-Adressen déi gespaart si $1',
 'ipblocklist-submit'              => 'Sichen',
 'blocklistline'                   => '$1, $2 gespaart $3 (gülteg bis $4)',
 'infiniteblock'                   => 'onbegrenzt',
@@ -1807,25 +2015,34 @@ Kuckt d'[[Special:IPBlockList|IP Spär-Lëscht]] fir all Spären ze gesin.",
 'noautoblockblock'                => 'déi automatesch Spär ass deaktivéiert',
 'createaccountblock'              => 'Opmaache vu Benotzerkonte gespaart',
 'emailblock'                      => 'E-Maile schécke gespaart',
+'blocklist-nousertalk'            => 'däerf seng eegen Diskussiounssäit net ännereen',
 'ipblocklist-empty'               => "D'Spärlëscht ass eidel.",
 'ipblocklist-no-results'          => 'Déi gesichten IP-Adress respektiv de gesichte Benotzer ass net gespaart.',
 'blocklink'                       => 'spären',
 'unblocklink'                     => 'Spär ophiewen',
+'change-blocklink'                => 'Spär änneren',
 'contribslink'                    => 'Kontributiounen',
 'autoblocker'                     => 'Dir sidd automatesch gespaart well dir eng IP Adress mam "$1" deelt. Grond "$2".',
 'blocklogpage'                    => 'Spärlëscht',
+'blocklog-fulllog'                => 'Komplett Lëscht vun de Spären',
 'blocklogentry'                   => '"[[$1]]" gespaart, gülteg bis $2 $3',
-'blocklogtext'                    => "Dëst ass eng Lëscht vu Spären an den Annulatioune vun de Spären. Automatesch gespaarten IP Adresse sinn hei net opgelëscht. Kuckt d'[[Special:IPBlockList|IP Spärlëschtt]] fir déi aktuell Spären.",
+'reblock-logentry'                => "huet d'Spär vum [[$1]] bis den $2 $3 geännert",
+'blocklogtext'                    => "Dëst ass eng Lëscht vu Spären an de Spären déi opgehuewe goufen.
+Automatesch gespaarten IP-Adresse sinn hei net opgelëscht.
+Kuckt d'[[Special:IPBlockList|IP Spärlëschtt]] fir déi aktuell Spären.",
 'unblocklogentry'                 => "huet d'Spär vum [[$1]] opgehuewen",
 'block-log-flags-anononly'        => 'Nëmmen anonym Benotzer',
 'block-log-flags-nocreate'        => 'Schafe vu Benotzerkonte gespaart',
 'block-log-flags-noautoblock'     => 'Autoblock deaktivéiert',
 'block-log-flags-noemail'         => 'E-Mail gespaart',
+'block-log-flags-nousertalk'      => 'däerf seng Diskussiounssäite net änneren',
 'block-log-flags-angry-autoblock' => 'erweidert automatesch Spär aktivéiert',
 'range_block_disabled'            => 'Dem Administrateur seng Fähegkeet fir ganz Adressberäicher ze spären ass ausser Kraaft.',
 'ipb_expiry_invalid'              => "D'Dauer déi Dir uginn hutt ass ongülteg.",
 'ipb_expiry_temp'                 => 'Verstoppte Späre vu Benotzernimm solle permanent sinn.',
 'ipb_already_blocked'             => '"$1" ass scho gespaart.',
+'ipb-needreblock'                 => "== Scho gespaart ==
+„$1“ ass scho gespaart. Wëllt dir d'Parametere vun der Spär änneren?",
 'ipb_cant_unblock'                => "Feeler: D'Nummer vun der Spär $1 gouf net fonnt. D'Spär gouf waarscheinlech schonn opgehuewen.",
 'ipb_blocked_as_range'            => "Feeler: D'IP-Adress $1 gouf net direkt gespaart an déi Spär kann dofir och net opghuewe ginn.
 Si ass awer als Deel vun der Rei $2 gespaart, an dës Spär kann opgehuewe ginn.",
@@ -1837,12 +2054,13 @@ Si ass awer als Deel vun der Rei $2 gespaart, an dës Spär kann opgehuewe ginn.
 'proxyblocksuccess'               => 'Gemaach.',
 'sorbsreason'                     => 'Är IP Adress steet als oppene Proxy an der schwaarzer Lëscht (DNSBL) déi vu {{SITENAME}} benotzt gëtt.',
 'sorbs_create_account_reason'     => 'Är IP-Adress steet als oppene Proxy an der schwaarzer Lëscht déi op {{SITENAME}} benotzt gëtt. DIr kënnt keen neie Benotzerkont opmaachen.',
+'cant-block-while-blocked'        => 'Dir däerft keng aner Benotzer spären, esou lang wéi dir selwer gespaart sidd.',
 
 # Developer tools
 'lockdb'              => 'Datebank spären',
 'unlockdb'            => 'Spär vun der Datebank ophiewen',
 'lockdbtext'          => "Wann d'Datebank gespaart ass, ka kee Benotzer Säiten änneren, seng Astellungen änneren, seng Iwwerwaachungslëscht änneren, an all aner Aarbecht, déi op d'Datebank zréckgräift.
-W.e.g. konfirméiert, datt dir dëst wierklech maache wëllt, an datt dir d'Spär ewechhuelt soubal d'Maintenance-Aarbechten eriwwer sinn.",
+W.e.g. confirméiert, datt dir dëst wierklech maache wëllt, an datt dir d'Spär ewechhuelt soubal d'Maintenance-Aarbechten eriwwer sinn.",
 'unlockdbtext'        => "D'Ophiewe vun der Spär vun der Datebank léisst et erëm zou datt all Benotzer Säiten änneren, hir Astellungen an hir Iwwerwaachungslëscht veränneren an all aner Operatiounen déi Ännerungen an der Datebank erfuederen.
 
 Confirméiert w.e.g datt et dat ass wat Dir maache wëllt.",
@@ -1850,7 +2068,7 @@ Confirméiert w.e.g datt et dat ass wat Dir maache wëllt.",
 'unlockconfirm'       => "Jo, ech well d'Spär vun der Datebank wirklech ophiewen.",
 'lockbtn'             => 'Datebank spären',
 'unlockbtn'           => 'Spär vun der Datebank ophiewen',
-'locknoconfirm'       => "Dir hutt d'Konfirmatiounsbox net ugeklickt.",
+'locknoconfirm'       => "Dir hutt d'Confirmatiounskëscht net ugeklickt.",
 'lockdbsuccesssub'    => "D'Datebank ass elo gespaart",
 'unlockdbsuccesssub'  => "D'Spär vun der Datebank gouf opgehuewen",
 'lockdbsuccesstext'   => "D'{{SITENAME}}-Datebank gouf gespaart. <br />
@@ -1859,9 +2077,9 @@ Denkt drun [[Special:UnlockDB|d'Spär erëm ewechzehuele]] soubaal d'Maintenance
 'databasenotlocked'   => "D'Datebank ass net gespaart.",
 
 # Move page
-'move-page'               => 'Réckel $1',
-'move-page-legend'        => 'Säit réckelen',
-'movepagetext'            => "Wann dir dëse Formulaire benotzt, réckelt dir eng komplett Säit mat hirem Historique op en neien Numm.
+'move-page'                    => 'Réckel $1',
+'move-page-legend'             => 'Säit réckelen',
+'movepagetext'                 => "Wann dir dëse Formulaire benotzt, réckelt dir eng komplett Säit mat hirem Historique op en neien Numm.
 Den alen Titel déngt als Viruleedung op déi nei Säit.
 Dir kënnt Viruleedungen op déi al Säit ginn automatesch aktualiséieren.
 Wann Dir dat net maacht, da vergewëssert iech datt keng [[Special:DoubleRedirects|duebel]] oder [[Special:BrokenRedirects|futtis Viruleedungen]] am Spill sinn.
@@ -1873,54 +2091,68 @@ Dëst bedeit datt dir eng Säit ëmbenenne kënnt an datt dir keng Säit iwwersc
 '''OPGEPASST!'''
 Dëst kann en drastesche Changement fir eng populär Säit bedeiten;
 verstitt w.e.g. d'Konsequenze vun ärer Handlung éier Dir d'Säit réckelt.",
-'movepagetalktext'        => "D'assoziéiert Diskussiounssäit, falls eng do ass, gëtt automatesch matgeréckelt, '''ausser:'''
+'movepagetalktext'             => "D'assoziéiert Diskussiounssäit, falls eng do ass, gëtt automatesch matgeréckelt, '''ausser:'''
 *D'Säit gëtt an een anere Nummraum geréckelt.
 *Et gëtt schonn eng Diskussiounssäit mat dësem Numm, oder
 *Dir klickt d'Këschtchen ënnedrënner net un.
 
 An deene Fäll musst Dir d'Diskussiounssäit manuell réckelen oder fusionéieren.",
-'movearticle'             => 'Säit réckelen:',
-'movenotallowed'          => 'Dir hutt net déi néideg Rechter fir Säiten ze réckelen.',
-'newtitle'                => 'Op den neien Titel:',
-'move-watch'              => 'Dës Säit iwwerwaachen',
-'movepagebtn'             => 'Säit réckelen',
-'pagemovedsub'            => 'Gouf geréckelt',
-'movepage-moved'          => "<big>'''D'Säit \"\$1\" gouf op \"\$2\" geréckelt.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Eng Säit mat dësem Numm gëtt et schonns, oder den Numm deen Dir gewielt hutt gëtt net akzeptéiert. Wielt w.e.g. en aneren Numm.',
-'cantmove-titleprotected' => "Dir kënnt keng Säit op dës Plaz réckelen, well dee neien Titel fir d'Uleeë gespaart ass",
-'talkexists'              => "D'Säit selwer gouf erfollegräich geréckelt, mee d'Diskussiounssäit konnt net mat eriwwergeholl gi well et schonns eng ënnert deem neien Titel gëtt. W.e.g. setzt dës manuell zesummen.",
-'movedto'                 => 'geréckelt op',
-'movetalk'                => "D'Diskussiounssäit matréckelen, wa méiglich.",
-'move-subpages'           => 'All Ënnersäite, wann et der gëtt, mattréckelen',
-'move-talk-subpages'      => 'All Ënnersäite vun Diskussiounssäiten, wann et der gëtt, matréckelen',
-'movepage-page-exists'    => "D'Säit $1 gëtt et schonn a kann net automatesch iwwerschriwwe ginn.",
-'movepage-page-moved'     => "D'Säit $1 gouf schonn op $2 geréckelt.",
-'movepage-page-unmoved'   => "D'Säit $1 konnt nett op $2 geréckelt ginn.",
-'movepage-max-pages'      => 'Déi Maximalzuel vun $1 {{PLURAL:$1|Säit gouf|Säite goufe}} gouf geréckelt. All déi aner Säite kënnen net automatesch geréckelt ginn.',
-'1movedto2'               => '[[$1]] gouf op [[$2]] geréckelt',
-'1movedto2_redir'         => '[[$1]] gouf op [[$2]] geréckelt, dobäi gouf eng Viruleedung iwwerschriwwen.',
-'movelogpage'             => 'Réckellëscht',
-'movelogpagetext'         => 'Dëst ass eng Lëscht vun alle geréckelte Säiten.',
-'movereason'              => 'Grond:',
-'revertmove'              => 'zréck réckelen',
-'delete_and_move'         => 'Läschen a réckelen',
-'delete_and_move_text'    => '== Läsche vun der Destinatiounssäit néideg == D\'Säit "[[:$1]]" existéiert schonn. Wëll der se läsche fir d\'Réckelen ze erméiglechen?',
-'delete_and_move_confirm' => "Jo, läsch d'Destinatiounssäit",
-'delete_and_move_reason'  => 'Geläscht fir Plaz ze maache fir eng Säit heihin ze réckelen',
-'selfmove'                => 'Source- an Destinatiounsnumm sinn dselwecht; eng Säit kann net op sech selwer geréckelt ginn.',
-'imagenocrossnamespace'   => 'Fichiere kënnen net an aner Nummraim geréckelt ginn',
-'imagetypemismatch'       => 'Déi nei Dateierweiderung ass net mat dem Fichier kompatibel',
-'imageinvalidfilename'    => 'Den Numm vum Zil-Fichier ass ongëlteg',
-'fix-double-redirects'    => 'All Viruleedungen déi op den Originaltitel weisen aktualiséieren',
+'movearticle'                  => 'Säit réckelen:',
+'movenologin'                  => 'Net ageloggt',
+'movenologintext'              => 'Dir musst e registréierte Benotzer an [[Special:UserLogin|ageloggt]] sinn, fir eng Säit ze réckelen.',
+'movenotallowed'               => 'Dir hutt net déi néideg Rechter fir Säiten ze réckelen.',
+'movenotallowedfile'           => "Dir hutt net d'Recht fir Fichieren ze réckelen.",
+'cant-move-user-page'          => 'Dir hutt net déi néideg Rechter fir Benotzerhaaptsäiten ze réckelen.',
+'cant-move-to-user-page'       => "Dir hutt net d'Recht fir eng Säit op rng Benotzersäit (ausser op eng Ënnersäit vun enger Benotzersäit) ze réckelen.",
+'newtitle'                     => 'Op den neien Titel:',
+'move-watch'                   => 'Dës Säit iwwerwaachen',
+'movepagebtn'                  => 'Säit réckelen',
+'pagemovedsub'                 => 'Gouf geréckelt',
+'movepage-moved'               => "<big>'''D'Säit \"\$1\" gouf op \"\$2\" geréckelt.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Et gouf eng Viruleedung ugeluecht.',
+'movepage-moved-noredirect'    => "D'Uleeë vun enger Viruleedung gouf ënnerdréckt.",
+'articleexists'                => 'Eng Säit mat dësem Numm gëtt et schonns, oder den Numm deen Dir gewielt hutt gëtt net akzeptéiert. Wielt w.e.g. en aneren Numm.',
+'cantmove-titleprotected'      => "Dir kënnt keng Säit op dës Plaz réckelen, well dee neien Titel fir d'Uleeë gespaart ass",
+'talkexists'                   => "D'Säit selwer gouf erfollegräich geréckelt, mee d'Diskussiounssäit konnt net mat eriwwergeholl gi well et schonns eng ënnert deem neien Titel gëtt. W.e.g. setzt dës manuell zesummen.",
+'movedto'                      => 'geréckelt op',
+'movetalk'                     => "D'Diskussiounssäit matréckelen, wa méiglich.",
+'move-subpages'                => 'All Ënnersäite, wann et der gëtt, mattréckelen',
+'move-talk-subpages'           => 'All Ënnersäite vun Diskussiounssäiten, wann et der gëtt, matréckelen',
+'movepage-page-exists'         => "D'Säit $1 gëtt et schonn a kann net automatesch iwwerschriwwe ginn.",
+'movepage-page-moved'          => "D'Säit $1 gouf schonn op $2 geréckelt.",
+'movepage-page-unmoved'        => "D'Säit $1 konnt nett op $2 geréckelt ginn.",
+'movepage-max-pages'           => 'Déi Maximalzuel vun $1 {{PLURAL:$1|Säit gouf|Säite goufe}} gouf geréckelt. All déi aner Säite kënnen net automatesch geréckelt ginn.',
+'1movedto2'                    => '[[$1]] gouf op [[$2]] geréckelt',
+'1movedto2_redir'              => '[[$1]] gouf op [[$2]] geréckelt, dobäi gouf eng Viruleedung iwwerschriwwen.',
+'move-redirect-suppressed'     => 'Viruleedung ewechgehol',
+'movelogpage'                  => 'Réckellëscht',
+'movelogpagetext'              => 'Dëst ass eng Lëscht vun alle geréckelte Säiten.',
+'movereason'                   => 'Grond:',
+'revertmove'                   => 'zréck réckelen',
+'delete_and_move'              => 'Läschen a réckelen',
+'delete_and_move_text'         => '== Läsche vun der Destinatiounssäit néideg == D\'Säit "[[:$1]]" existéiert schonn. Wëll der se läsche fir d\'Réckelen ze erméiglechen?',
+'delete_and_move_confirm'      => "Jo, läsch d'Destinatiounssäit",
+'delete_and_move_reason'       => 'Geläscht fir Plaz ze maache fir eng Säit heihin ze réckelen',
+'selfmove'                     => 'Source- an Destinatiounsnumm sinn dselwecht; eng Säit kann net op sech selwer geréckelt ginn.',
+'immobile-source-namespace'    => 'Säite am Nummraum: $1 kënnen net geréckelt ginn',
+'immobile-target-namespace'    => 'Säite kënnen net an den Nummraum: $1 geréckelt ginn',
+'immobile-target-namespace-iw' => 'En Interwiki-Link ass kee gëltegt Zil beim Réckele vun enger Säit.',
+'immobile-source-page'         => 'Dës Säit kann net geréckelt ginn.',
+'immobile-target-page'         => 'Kann net op de Bestëmmungs-titel geréckelt ginn.',
+'imagenocrossnamespace'        => 'Fichiere kënnen net an aner Nummraim geréckelt ginn',
+'imagetypemismatch'            => 'Déi nei Dateierweiderung ass net mat dem Fichier kompatibel',
+'imageinvalidfilename'         => 'Den Numm vum Zil-Fichier ass ongëlteg',
+'fix-double-redirects'         => 'All Viruleedungen déi op den Originaltitel weisen aktualiséieren',
+'move-leave-redirect'          => 'Viruleedung uleeën',
 
 # Export
 'export'            => 'Säiten exportéieren',
-'exporttext'        => "Dir kënnt den Text exportéieren an den Historique änneren vun enger bestëmmter Säit, oder engem Set vu Säiten, an XML agepakt.
+'exporttext'        => "Dir kënnt den Text exportéieren an den Historique ännere vun enger bestëmmter Säit, oder engem Set vu Säiten, an XML agepakt.
 Dat dann an eng aner Wiki mat MediaWiki Software impotéiert gi mat Hellef vun der [[Special:Import|Import-Säit]].
 
 Fir eng Säit z'exportéieren, gitt den Titel an d'Textkëscht heidrënner an, een Titel pro Linn, a wielt aus op Dir nëmmen déi aktuell Versioun oder all Versioune mam ganzen Historique exportéiere wëllt.
 
-Wann nëmmen déi aktuell Versioun exportéiert soll ginn, kënnt Dir och e Link benotze wéi z.B [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] fir d'\"[[{{MediaWiki:Mainpage}}]]\".",
+Wann nëmmen déi aktuell Versioun exportéiert soll ginn, kënnt Dir och e Link benotze wéi z.B [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] fir d'\"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Nëmmen déi aktuell Versioun exportéieren an net de ganzen Historique',
 'exportnohistory'   => "----
 '''Hiwäis:''' Den Export vu komplette Versiounshistoriquen ass aus Performancegrënn bis op weideres net méiglech.",
@@ -1936,7 +2168,7 @@ Wann nëmmen déi aktuell Versioun exportéiert soll ginn, kënnt Dir och e Link
 'allmessagesdefault'        => 'Standardtext',
 'allmessagescurrent'        => 'Aktuellen Text',
 'allmessagestext'           => "Dëst ass eng Lëscht vun alle '''Messagen am MediaWiki:Nummraum, déi vun der MediaWiki-Software benotzt ginn.
-Besicht w.e.g. [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisatioun] a [http://translatewiki.net Betawiki] wann Dir wëllt bei de MediaWiki Iwwersetzunge matschaffen.",
+Besicht w.e.g. [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisatioun] a [http://translatewiki.net translatewiki.net] wann Dir wëllt bei de MediaWiki Iwwersetzunge matschaffen.",
 'allmessagesnotsupportedDB' => "Dës Säit kann net benotzt gi well '''\$wgUseDatabaseMessages''' ausgeschalt ass.",
 'allmessagesfilter'         => 'Noriichtennummfilter:',
 'allmessagesmodified'       => 'Nëmme geännerter weisen',
@@ -1944,16 +2176,19 @@ Besicht w.e.g. [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisatio
 # Thumbnails
 'thumbnail-more'           => 'vergréisseren',
 'filemissing'              => 'Fichier feelt',
-'thumbnail_error'          => 'Feeler beim Erstellen vum Thumbnail vun: $1',
+'thumbnail_error'          => 'Feeler beim Erstelle vum Thumbnail vun: $1',
 'djvu_page_error'          => 'DjVu-Säit baussent dem Säiteberäich',
 'thumbnail_invalid_params' => 'Ongëlteg Thumbnail-Parameter',
 
 # Special:Import
 'import'                     => 'Säiten importéieren',
 'importinterwiki'            => 'Transwiki-Import',
+'import-interwiki-source'    => 'Quelle Wiki/Säit:',
 'import-interwiki-history'   => "Importéier all d'Versioune vun dëser Säit",
 'import-interwiki-submit'    => 'Import',
 'import-interwiki-namespace' => 'Zil-Nummraum:',
+'import-upload-filename'     => 'Numm vum Fichier:',
+'import-comment'             => 'Bemierkung:',
 'importtext'                 => 'Exportéiert de Fichier w.e.g vun der Source-Wiki mat der [[Special:Export|Funktioun Export]].
 Späichert en op ärem Computer of a lued en hei nees erop.',
 'importstart'                => 'Importéier Säiten …',
@@ -1988,19 +2223,19 @@ Späichert en op ärem Computer of a lued en hei nees erop.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|Versioun|Versioune}} vum $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Meng Benotzersäit',
+'tooltip-pt-userpage'             => 'Är Benotzersäit',
 'tooltip-pt-anonuserpage'         => 'Benotzersäit vun der IP-Adress vun där aus Dir den Ament Ännerunge maachtt',
-'tooltip-pt-mytalk'               => 'Meng Diskussioun',
+'tooltip-pt-mytalk'               => 'Är Diskussiounssäit',
 'tooltip-pt-anontalk'             => "Diskussioun iwwer d'Ännerungen déi vun dëser IP-Adress aus gemaach gi sinn",
 'tooltip-pt-preferences'          => 'Meng Astellungen',
 'tooltip-pt-watchlist'            => 'Lëscht vu Säiten, bei deenen Der op Ännerungen oppasst',
-'tooltip-pt-mycontris'            => 'Lëscht vu menge Kontributiounen',
+'tooltip-pt-mycontris'            => 'Lëscht vun äre Kontributiounen',
 'tooltip-pt-login'                => 'Sech unzemellen gëtt gäre gesinn, Dir musst et awer net maachen.',
 'tooltip-pt-anonlogin'            => 'Et wier gutt, Dir géift Iech aloggen, och wann et keng Musse-Saach ass.',
 'tooltip-pt-logout'               => 'Ofmellen',
 'tooltip-ca-talk'                 => 'Diskussioun iwwert de Säiteninhalt',
 'tooltip-ca-edit'                 => 'Dës Säit ka geännert ginn. Maacht vun der Méiglechkeet Gebrauch fir ze "kucken ouni ofzespäicheren" a kuckt ob alles an der Rei ass ier der ofspäichert.',
-'tooltip-ca-addsection'           => 'Eng Bemierkung bäi dës Diskussioun derbäisetzen.',
+'tooltip-ca-addsection'           => 'En neien Abschnitt ufänken.',
 'tooltip-ca-viewsource'           => 'Dës Säit ass gespaart. Nëmmen de Quelltext ka gewise ginn.',
 'tooltip-ca-history'              => 'Vireg Versioune vun dëser Säit',
 'tooltip-ca-protect'              => 'Dës Säit spären',
@@ -2041,12 +2276,15 @@ Späichert en op ärem Computer of a lued en hei nees erop.',
 'tooltip-ca-nstab-category'       => 'Kategoriesäit weisen',
 'tooltip-minoredit'               => 'Dës Ännerung als kleng markéieren.',
 'tooltip-save'                    => 'Ännerungen späicheren',
-'tooltip-preview'                 => 'Kuckt är Ännerunge ouni ofzespäicheren, Benotzt dëst w.e.g. virum späicheren!',
+'tooltip-preview'                 => 'Kuckt är Ännerungen ouni ofzespäicheren, Benotzt dëst w.e.g. virum späicheren!',
 'tooltip-diff'                    => 'Weis wéi eng Ännerungen der beim Text gemaach hutt.',
 'tooltip-compareselectedversions' => "D'Ennerscheeder op dëser Säit tëscht den zwou gewielte Versioune weisen.",
 'tooltip-watch'                   => 'Dës Säit op är Iwwerwaachungslëscht bäisetzen',
 'tooltip-recreate'                => "D'Säit nees maachen, obwuel se geläscht gi war.",
 'tooltip-upload'                  => 'Mam eroplueden ufänken',
+'tooltip-rollback'                => '"Zrécksetzen" mécht alle Ännerunge vum läschten "Auteur" an engem Klick nees réckgängeg.',
+'tooltip-undo'                    => '"Zréck" setzt dës Ännerung zréck a mécht den Ännerungsformulaire am Modus "kucken ouni ofzespäicheren" op.
+Erlaabt et e Grond an de Resumé derbäizesetzen.',
 
 # Stylesheets
 'common.css'      => "/* Dës CSS huet nëmmen Afloss op de Skin ''Chick''  */",
@@ -2065,12 +2303,12 @@ Späichert en op ärem Computer of a lued en hei nees erop.',
 'notacceptable'     => "De Wiki-Server kann d'Donnéeë net an engem Format liwweren déi vun ärem Apparat geliest kënne ginn.",
 
 # Attribution
-'anonymous'        => 'Anonym(e) Benotzer op {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonyme Benotzer|Anonym Benotzer}} op {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Benotzer $1',
 'lastmodifiedatby' => "Dës Säit gouf den $1 ëm $2 Auer voum $3 fir d'lescht geännert.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Op der Basis vun der Aarbecht vum $1',
 'others'           => 'anerer',
-'siteusers'        => '{{SITENAME}}-Benotzer $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|Benotzer|Benotzer}} $1',
 'creditspage'      => 'Quellen',
 'nocredits'        => "Fir dës Säit si keng Informatiounen iwwert d'Mataarbechter vun der Säit disponibel.",
 
@@ -2091,6 +2329,16 @@ Dëst warscheinlech duerch en externe Link den op der schwaarzer Lëscht (blackl
 'numauthors'     => 'Zuel vu verschiddenen Auteuren: $1',
 'numtalkauthors' => 'Zuel vun den Auteuren (Diskussiounssäit): $1',
 
+# Skin names
+'skinname-standard'    => 'Klassesch',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Köln Blo',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Einfach',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Ëmmer als PNG duerstellen',
 'mw_math_simple' => 'Einfachen TeX als HTML duerstellen, soss PNG',
@@ -2105,14 +2353,15 @@ Dëst warscheinlech duerch en externe Link den op der schwaarzer Lëscht (blackl
 'markedaspatrolled'          => 'ass als kontrolléiert markéiert',
 'markedaspatrolledtext'      => 'Déi gewielte Versioun gouf als kontrolléiert markéiert.',
 'rcpatroldisabled'           => 'Rezent Ännerungskontroll ausgeschalt.',
-'rcpatroldisabledtext'       => "D'Kontrolle vun de leschten Ännerungen ass elo ausgeschalt.",
+'rcpatroldisabledtext'       => "D'Kontroll vun de leschten Ännerungen ass elo ausgeschalt.",
 'markedaspatrollederror'     => 'Kann net als "kontrolléiert" markéiert ginn.',
 'markedaspatrollederrortext' => 'Dir musst eng Säitenännerung auswielen.',
 
 # Patrol log
-'patrol-log-page' => 'Kontroll-Logbuch',
-'patrol-log-auto' => '(automatesch)',
-'patrol-log-diff' => 'Versioun $1',
+'patrol-log-page'      => 'Kontroll-Logbuch',
+'patrol-log-auto'      => '(automatesch)',
+'patrol-log-diff'      => 'Versioun $1',
+'log-show-hide-patrol' => 'Kontroll-Logbuch $1',
 
 # Image deletion
 'deletedrevision'                 => 'Al, geläschte Versioun $1',
@@ -2128,7 +2377,11 @@ $1',
 'previousdiff' => '� Méi al Ännerung',
 'nextdiff'     => 'Méi nei Ännerung →',
 
+# Visual comparison
+'visual-comparison' => 'Visuelle Vergläich',
+
 # Media information
+'mediawarning'         => "'''Warnung:''' Dës Zort vu Fichier ka béiswëllegen Programmcode enthalen. Duerch d'Erolueden an Opmaache vum Fichier kann Äre Computer beschiedegt ginn.<hr />",
 'imagemaxsize'         => 'Biller op de Billerbeschreiwungssäite limitéieren op:',
 'thumbsize'            => 'Gréisst vun de Thumbnails:',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|Säit|Säiten}}',
@@ -2139,10 +2392,12 @@ $1',
 'show-big-image'       => 'Versioun an enger méi héijer Opléisung',
 'show-big-image-thumb' => '<small>Gréisst vun dem Thumbnail: $1 × $2 Pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Gallerie vun den neie Biller',
 'imagelisttext'         => "Hei ass eng Lëscht vu(n) '''$1''' {{PLURAL:$1|Fichier|Fichieren}}, sortéiert $2.",
 'newimages-summary'     => 'Dës Spezialsäit weist eng Lëscht mat de Biller a Fichieren déi als läscht eropgeluede goufen.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Numm vum Fichier (oder en Deel dovun):',
 'showhidebots'          => '($1 Botten)',
 'noimages'              => 'Keng Biller fonnt.',
 'ilsubmit'              => 'Sichen',
@@ -2182,12 +2437,13 @@ Duerno sti Linken déi Ausnamen definéieren, a deenen hirem Kontext dat Bild aw
 'exif-yresolution'                 => 'Vertikal Opléisung',
 'exif-resolutionunit'              => 'Moosseenheet vun der Opléisung',
 'exif-stripoffsets'                => 'Plaz wou de Fichier vum Bild gespäichert ass',
-'exif-rowsperstrip'                => 'Zuel vun den Zeile pro Stréif',
+'exif-rowsperstrip'                => 'Zuel vun den Zeile pro Strëpp',
 'exif-stripbytecounts'             => 'Byte pro kompriméiert Strëpp',
 'exif-jpeginterchangeformatlength' => 'Gréisst vun de JPEG-Daten a Byten',
 'exif-transferfunction'            => 'Transferfunktioun',
 'exif-whitepoint'                  => 'Manuell mat Miessung',
-'exif-referenceblackwhite'         => 'Schwoarz/Wäiss-Referenzpunkten',
+'exif-ycbcrcoefficients'           => 'YCbCr-Koeffizienten',
+'exif-referenceblackwhite'         => 'Schwaarz/Wäiss-Referenzpunkten',
 'exif-datetime'                    => 'Späicherzäitpunkt',
 'exif-imagedescription'            => 'Numm vum Bild',
 'exif-make'                        => 'Fabrikant',
@@ -2214,6 +2470,7 @@ Duerno sti Linken déi Ausnamen definéieren, a deenen hirem Kontext dat Bild aw
 'exif-exposuretime-format'         => '$1 Sekonnen ($2)',
 'exif-fnumber'                     => 'Blend',
 'exif-exposureprogram'             => 'Beliichtungsprogramm',
+'exif-spectralsensitivity'         => 'Spectral Sensitivitéit',
 'exif-isospeedratings'             => 'Film- oder Sensorempfindlechkeet (ISO)',
 'exif-oecf'                        => 'Optoelektroneschen Ëmrechnungsfakteur',
 'exif-shutterspeedvalue'           => 'Beliichtungszäitwäert',
@@ -2321,6 +2578,18 @@ Duerno sti Linken déi Ausnamen definéieren, a deenen hirem Kontext dat Bild aw
 'exif-lightsource-19'  => 'Standardluucht C',
 'exif-lightsource-255' => 'Aner Liichtquell',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Ouni Blëtz',
+'exif-flash-fired-1'    => 'mat Blëtz',
+'exif-flash-return-0'   => "keng Fonctioun fir d'Reflexioun vum Blëtz festzestellen",
+'exif-flash-return-2'   => 'keng Reflexioun vum Blëtz festgestallt',
+'exif-flash-return-3'   => 'Reflexioun vum Blëtz festgestallt',
+'exif-flash-mode-1'     => 'erzwongene Blëtz',
+'exif-flash-mode-2'     => 'De Blëtz war ausgeschalt',
+'exif-flash-mode-3'     => 'Automatik',
+'exif-flash-function-1' => 'Ouni Blëtzfonctioun',
+'exif-flash-redeye-1'   => 'Reduktioun vun de rouden Aen',
+
 'exif-focalplaneresolutionunit-2' => 'Zoll/Inchen',
 
 'exif-sensingmethod-1' => 'Ondefinéiert',
@@ -2353,6 +2622,7 @@ Duerno sti Linken déi Ausnamen definéieren, a deenen hirem Kontext dat Bild aw
 'exif-contrast-2' => 'Staark',
 
 'exif-saturation-0' => 'Normal',
+'exif-saturation-1' => 'Niddreg Saturatioun',
 'exif-saturation-2' => 'Héich',
 
 'exif-sharpness-0' => 'Normal',
@@ -2373,6 +2643,7 @@ Duerno sti Linken déi Ausnamen definéieren, a deenen hirem Kontext dat Bild aw
 'exif-gpslongitude-w' => 'westlech Längt',
 
 'exif-gpsstatus-a' => 'Miessung am gaang',
+'exif-gpsstatus-v' => 'Interoperabilitéit vu der Miessung',
 
 'exif-gpsmeasuremode-2' => '2-dimensional Miessung',
 'exif-gpsmeasuremode-3' => '3-dimensional Miessung',
@@ -2435,29 +2706,23 @@ Sollt et sech net ëm äre Benotzerkont handelen, da maacht de Link *net* op. De
 'scarytranscludetoolong'  => "[D'URL ass ze laang]",
 
 # Trackbacks
-'trackbackremove' => '([$1 läschen])',
-'trackbacklink'   => 'Zréckverfollegen',
+'trackbackbox'      => "<div id=\"mw_trackbacks\">
+''Trackbacke'' fir dës Säit:<br />
+\$1
+</div>",
+'trackbackremove'   => '([$1 läschen])',
+'trackbacklink'     => 'Zréckverfollegen',
+'trackbackdeleteok' => "Den ''Trackback'' gouf geläscht.",
 
 # Delete conflict
 'deletedwhileediting' => "'''Opgepasst''': Dës Säit gouf geläscht nodeems datt dir ugefaangen hutt se z'änneren!",
 'confirmrecreate'     => "De Benotzer [[User:$1|$1]] ([[User talk:$1|Diskussioun]]) huet dës Säit geläscht, nodeems datt där ugefaangen hutt drun ze schaffen. D'Begrënnung war: ''$2'' Bestätegt w.e.g., datt Dir dës Säit wierklich erëm nei opmaache wëllt.",
 'recreate'            => 'Erëm uleeën',
 
-# HTML dump
-'redirectingto' => 'Virugeleed op [[:$1]]',
-
 # action=purge
-'confirm_purge'        => 'Dës Säit aus dem Server-Cache läschen?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "No Säite siche mat ''$1''.",
-'searchnamed'      => "Sich no Säiten, an deenen hirem Numm ''$1'' virkënnt.",
-'articletitles'    => "Säiten déi mat ''$1'' ufänken",
-'hideresults'      => 'Verstopp',
-'useajaxsearch'    => 'AJAX-ënnerstetzt Sich benotzen',
+'confirm-purge-top'    => 'Dës Säit aus dem Server-Cache läschen?',
+'confirm-purge-bottom' => "Mécht de Cache vun enger Säit eidel a forcéiert d'Uweise vun der aktueller Versioun.",
 
 # Multipage image navigation
 'imgmultipageprev' => '� Säit virdrun',
@@ -2477,10 +2742,10 @@ $1',
 'table_pager_empty'        => 'Keng Resultater',
 
 # Auto-summaries
-'autosumm-blank'   => 'All Inhalt vun der Säit gëtt geläscht',
+'autosumm-blank'   => "D'Säit gouf eidel gemaach",
 'autosumm-replace' => "Säit gëtt ersat duerch '$1'",
 'autoredircomment' => 'Virugeleet op [[$1]]',
-'autosumm-new'     => 'Nei Säit: $1',
+'autosumm-new'     => "Säit ugeluecht matt: '$1'",
 
 # Live preview
 'livepreview-loading' => 'Lueden …',
@@ -2519,6 +2784,7 @@ Dir kënnt och [[Special:Watchlist/raw|déi net formatéiert Iwwerwaachungslësc
 
 # Core parser functions
 'unknown_extension_tag' => 'Onbekannten Erweiderungs-Tag "$1"',
+'duplicate-defaultsort' => 'Opgepasst: De Sortéierschlëssel "$2" iwwerschreiwt de virege Sortéierschlëssel "$1".',
 
 # Special:Version
 'version'                          => 'Versioun', # Not used as normal message but as header for the special page itself
@@ -2547,13 +2813,13 @@ Dir kënnt och [[Special:Watchlist/raw|déi net formatéiert Iwwerwaachungslësc
 'filepath-submit'  => 'Pad',
 'filepath-summary' => 'Matt dëser Spezialsäit kënnt Dir de komplette Pad vun der aktueller Versioun vun engem engem Fichier direkt offroen. Den ugefrote Fichier gëtt direkt gewisen respektiv mat enger verbonner Applikatioun gestart.
 
-D\'Ufro muss ouni den Zousaz "{{ns:image}}": gemaach ginn.',
+D\'Ufro muss ouni den Zousaz "{{ns:file}}": gemaach ginn.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Sich no duebele Fichieren',
-'fileduplicatesearch-summary'  => "Sich no Doublonen vu Fichieren op der Basis vun hirem ''Hash-Wert''.
+'fileduplicatesearch-summary'  => "Sich no Doublone vu Fichieren op der Basis vun hirem ''Hash-Wert''.
 
-Gitt den Numm vum Fichier ouni de Prefix \"{{ns:image}}:\" an.",
+Gitt den Numm vum Fichier ouni de Prefix \"{{ns:file}}:\" an.",
 'fileduplicatesearch-legend'   => 'Sich no engem Doublon',
 'fileduplicatesearch-filename' => 'Numm vum Fichier:',
 'fileduplicatesearch-submit'   => 'Sichen',
@@ -2583,4 +2849,13 @@ Gitt den Numm vum Fichier ouni de Prefix \"{{ns:image}}:\" an.",
 'blankpage'              => 'Eidel Säit',
 'intentionallyblankpage' => 'Dës Säit ass absichtlech eidel. Si gëtt fir Benchmarking an Ähnleches benotzt.',
 
+# External image whitelist
+'external_image_whitelist' => " #Dës Zeil genee esou loosse wéi se ass<pre>
+#Schreiwt hei ënnendrënner Fragmenter vu regulären Ausdréck (just den Deel zwëschen den // aginn)
+#Dës gi mat den URLe vu Biller aus externe Quelle verglach
+#Wann d'Resultat positiv gëtt d'Bilde gewisen, soss gëtt d'Bild just als Link gewisen
+#Zeilen, déi mat engem # ufänken, ginn als Bemierkung behandelt
+
+#All regulär Ausdréck ënnen un dëser Zeil androen. Dës Zeil genee esou loosse wéi se ass</pre>",
+
 );
diff --git a/languages/messages/MessagesLbe.php b/languages/messages/MessagesLbe.php
index af5f3aeb..c584e75e 100644
--- a/languages/messages/MessagesLbe.php
+++ b/languages/messages/MessagesLbe.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Гьуртту_хьуминнал_ихтилат', 
 	#NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1ли���а_ихтилат',
-	NS_IMAGE            => 'Сурат',
-	NS_IMAGE_TALK       => 'Суратра���а_ихтилат',
+	NS_FILE             => 'Сурат',
+	NS_FILE_TALK        => 'Суратра���а_ихтилат',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWikiли���а_ихтилат',
 	NS_TEMPLATE         => 'Шаблон',
@@ -69,7 +69,7 @@ $messages = array(
 # Recent changes
 'recentchanges' => 'Махъ��а дахханашивурту',
 
-# Image description page
+# File description page
 'filehist-user' => 'Гьурттучув',
 
 # Miscellaneous special pages
diff --git a/languages/messages/MessagesLez.php b/languages/messages/MessagesLez.php
new file mode 100644
index 00000000..828e4f6e
--- /dev/null
+++ b/languages/messages/MessagesLez.php
@@ -0,0 +1,209 @@
+<?php
+/** Lezghian (Лезги)
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$messages = array(
+# Dates
+'monday'        => 'И�лен',
+'sun'           => 'Гь�',
+'mon'           => 'И�л',
+'tue'           => 'Сал',
+'wed'           => 'Aрб',
+'thu'           => 'Xем',
+'fri'           => 'Жум',
+'sat'           => 'Киш',
+'january'       => 'Гьер',
+'february'      => 'Эхем',
+'march'         => 'Ибне',
+'april'         => '�ава',
+'may_long'      => 'ТӀул',
+'june'          => 'Къамуг',
+'july'          => 'Чиле',
+'august'        => 'Пахун',
+'september'     => 'Мара',
+'october'       => 'Ба�кӀум',
+'november'      => 'ЦӀехуьл',
+'december'      => 'ФaндукӀ',
+'january-gen'   => 'Гьер',
+'february-gen'  => 'Эхем',
+'march-gen'     => 'Ибне',
+'april-gen'     => '�ава',
+'may-gen'       => 'ТӀул',
+'june-gen'      => 'Къамуг',
+'july-gen'      => 'Чиле',
+'august-gen'    => 'Пахун',
+'september-gen' => 'Мара',
+'october-gen'   => 'Ба�кӀум',
+'november-gen'  => 'ЦӀехуьл',
+'december-gen'  => 'ФaндукӀ',
+'jan'           => 'Гье',
+'feb'           => 'Эхе',
+'mar'           => 'Ибн',
+'apr'           => '�ав',
+'may'           => 'ТӀу',
+'jun'           => 'Къа',
+'jul'           => 'Чил',
+'aug'           => 'Пахун',
+'sep'           => 'Мар',
+'oct'           => 'Ба�',
+'nov'           => 'ЦӀе',
+'dec'           => 'Фaн',
+
+'about'  => 'Хакъиндай',
+'qbfind' => 'Жугъун',
+'qbedit' => 'Дегишарун',
+
+'errorpagetitle'   => 'ГъалатI',
+'returnto'         => 'Хкун $1.',
+'help'             => 'Чара',
+'search'           => '�хтармишун',
+'searchbutton'     => '�хтармишун',
+'searcharticle'    => 'Фин',
+'history'          => 'Хъувун тарих',
+'history_short'    => 'Тарих',
+'edit'             => 'Дегишарун',
+'delete'           => 'Къакъудун',
+'deletethispage'   => 'Къакъудун и хъувун',
+'protect'          => 'Xуьн',
+'protectthispage'  => 'Xуьн и хъувун',
+'newpage'          => 'ЦIийи хъувун',
+'talkpagelinktext' => 'Рахун',
+'personaltools'    => 'Ин�ан aлат',
+'talk'             => 'Рахун',
+'toolbox'          => 'Aлаткъаб',
+'jumpto'           => 'Къудгъунун:',
+'jumptosearch'     => 'ахтармишун',
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite'    => 'Хакъиндай {{SITENAME}}',
+'aboutpage'    => 'Project:Хакъиндай',
+'edithelp'     => 'Дегишарун чара',
+'edithelppage' => 'Help:Дегишарун',
+'mainpage'     => '��ул хъувун',
+
+'youhavenewmessages' => 'Вунз ава $1 ($2).',
+'editsection'        => 'дегишарун',
+'editold'            => 'дегишарун',
+'editsectionhint'    => 'Дегишарун пай: $1',
+'showtoc'            => 'къаларун',
+'hidetoc'            => 'чуьнуьхун',
+'site-rss-feed'      => '$1 РСС Xуьрек',
+'site-atom-feed'     => '$1 �том Xуьрек',
+'page-rss-feed'      => '"$1" РСС Xуьрек',
+'page-atom-feed'     => '"$1" �том Xуьрек',
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-main'      => 'Хъувун',
+'nstab-special'   => 'КьетIен',
+'nstab-image'     => 'Шикил',
+'nstab-mediawiki' => 'Ме�л�т',
+
+# General errors
+'viewsource' => 'Къаларун булах',
+
+# Login and logout pages
+'yourrealname' => 'Xали� тIвар:',
+
+# Edit pages
+'minoredit'      => 'И гъвечIи дегишарун',
+'watchthis'      => 'Гелкъуьн и хъувун',
+'showdiff'       => 'Къаларун дегишарун',
+'newarticle'     => '(ЦIийи)',
+'editing'        => 'Дегишарун $1',
+'editingsection' => 'Дегишарун $1 (пай)',
+
+# History pages
+'last'       => '�хиримжи',
+'page_first' => '�ифте',
+'page_last'  => '�хиримжи',
+
+# Diffs
+'lineno' => 'ЦIар $1:',
+
+# Search results
+'viewprevnext' => 'Къаларун ($1) ($2) ($3)',
+'powersearch'  => '�хтармишун',
+
+# Recent changes
+'diff'            => 'тафават',
+'hist'            => 'тари',
+'hide'            => 'Чуьнуьхун',
+'show'            => 'Къаларун',
+'minoreditletter' => 'г',
+'newpageletter'   => 'ЦI',
+
+# Upload
+'upload' => 'Парвиниз шикил',
+
+# File description page
+'filehist'          => 'Шикил тарих',
+'filehist-datetime' => 'Югъ/Заман',
+
+# MIME search
+'mimesearch' => 'MIME ахтармишун',
+
+# Miscellaneous special pages
+'lonelypages'  => 'Eтим xъувун',
+'shortpages'   => 'Куьруь хъувун',
+'longpages'    => 'Яргъи хъувун',
+'newpages'     => 'ЦIийи хъувун',
+'move'         => 'Юзун',
+'movethispage' => 'Юзун и хъувун',
+
+# Book sources
+'booksources' => 'Ктаб булах',
+
+# Special:AllPages
+'allpages'       => 'Вири хъувун',
+'allarticles'    => 'Вири хъувун',
+'allpagessubmit' => 'Фин',
+
+# Watchlist
+'watch'         => 'Гелкъуьн',
+'watchthispage' => 'Гелкъуьн и хъувун',
+
+# Delete
+'deletepage'            => 'Къакъудун хъувун',
+'deletereasonotherlist' => 'Ма�а фагьум',
+
+# Rollback
+'rollbacklink' => 'авахьун далу',
+
+# Protect
+'restriction-type' => 'Ихти�р:',
+
+# Namespace form on various pages
+'blanknamespace' => '(��ул)',
+
+# Contributions
+'uctop' => '(кIукI)',
+
+# Block/unblock
+'blocklink' => 'тIаб',
+
+# Move page
+'movearticle' => 'Юзун хъувун:',
+'move-watch'  => 'Гелкъуьн и хъувун',
+'movepagebtn' => 'Юзун хъувун',
+'movereason'  => 'Фагьум:',
+
+# Tooltip help for the actions
+'tooltip-ca-protect' => 'Xуьн и хъувун',
+'tooltip-ca-delete'  => 'Къакъудун и хъувун',
+'tooltip-ca-move'    => 'Юзун и хъувун',
+'tooltip-search'     => '�хтармишун {{SITENAME}}',
+'tooltip-t-upload'   => 'Парвиниз шикил',
+
+# 'all' in various places, this might be different for inflected languages
+'watchlistall2' => 'вири',
+'namespacesall' => 'вири',
+'monthsall'     => 'вири',
+
+# Special:SpecialPages
+'specialpages' => 'КьетIен хъувун',
+
+);
diff --git a/languages/messages/MessagesLfn.php b/languages/messages/MessagesLfn.php
index 6d26bf2f..fa6a5609 100644
--- a/languages/messages/MessagesLfn.php
+++ b/languages/messages/MessagesLfn.php
@@ -9,6 +9,22 @@
  * @author Urhixidur
  */
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Spesial',
+	NS_TALK             => 'Discute',
+	NS_USER             => 'Usor',
+	NS_USER_TALK        => 'Usor_Discute',
+	NS_PROJECT_TALK     => '$1_Discute',
+	NS_FILE             => 'Fix',
+	NS_FILE_TALK        => 'Fix_Discute',
+	NS_TEMPLATE         => 'Model',
+	NS_TEMPLATE_TALK    => 'Model_Discute',
+	NS_HELP             => 'Aida',
+	NS_HELP_TALK        => 'Aida_Discute',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Categoria_Discute',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Sulinia lias:',
@@ -50,8 +66,6 @@ $messages = array(
 'underline-never'   => 'A no tempo',
 'underline-default' => 'Surfador costumal',
 
-'skinpreview' => '(Previde)',
-
 # Dates
 'sunday'        => 'soldi',
 'monday'        => 'lundi',
@@ -139,7 +153,7 @@ $messages = array(
 'mytalk'         => 'Me discutes',
 'anontalk'       => 'Discutes per esta IP',
 'navigation'     => 'Naviga',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -176,14 +190,14 @@ $messages = array(
 'talkpagelinktext'  => 'Parla',
 'specialpage'       => 'Paje spesial',
 'personaltools'     => 'Utiles personal',
-'postcomment'       => 'Junta un comenta',
+'postcomment'       => 'Sesion nova',
 'articlepage'       => 'Vide la paje de contenis',
 'talk'              => 'Discutes',
 'views'             => 'Vides',
 'toolbox'           => 'Utiles',
 'userpage'          => 'Vide paje de usor',
 'projectpage'       => 'Vide la paje de projeta',
-'imagepage'         => 'Vide paje de medio',
+'imagepage'         => 'Vide paje de fix',
 'mediawikipage'     => 'Vide la paje de mesaje',
 'templatepage'      => 'Vide la paje de model',
 'viewhelppage'      => 'vide la paje de aida',
@@ -201,8 +215,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Supra {{SITENAME}}',
 'aboutpage'            => 'Project:Supra',
-'bugreports'           => 'Reportas de defetos',
-'bugreportspage'       => 'Project:Reportas de defetos',
 'copyrightpage'        => '{{ns:project}}:Diretos de autor',
 'currentevents'        => 'Avenis presente',
 'currentevents-url'    => 'Project:Avenis presente',
@@ -213,6 +225,7 @@ $messages = array(
 'helppage'             => 'Help:Contenis',
 'mainpage'             => 'Paje Prima',
 'mainpage-description' => 'Paje Prima',
+'policy-url'           => 'Project:Politica',
 'portal'               => 'Porta comunial',
 'portal-url'           => 'Project:Porta comunial',
 'privacy'              => 'Promete de privadia',
@@ -226,19 +239,25 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Tu ave mesajes nova en $1',
 'editsection'             => 'cambia',
 'editold'                 => 'edita',
+'viewsourceold'           => 'vide orijin',
+'editlink'                => 'cambia',
+'viewsourcelink'          => 'vide orijin',
 'editsectionhint'         => 'Edita sesion: $1',
 'toc'                     => 'Contenida',
 'showtoc'                 => 'mostra',
 'hidetoc'                 => 'asconde',
 'viewdeleted'             => 'Vide $1?',
+'feedlinks'               => 'Flue:',
 'site-rss-feed'           => '$1 RSS Flue',
 'site-atom-feed'          => '$1 Atom Flue',
 'page-rss-feed'           => '"$1" RSS Flue',
+'red-link-title'          => '$1 (paje no esiste)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Paje',
 'nstab-user'      => 'Paje de usor',
-'nstab-special'   => 'Spesial',
+'nstab-media'     => 'Paje de medio',
+'nstab-special'   => 'Paje spesial',
 'nstab-project'   => 'Paje de projeta',
 'nstab-image'     => 'Fix',
 'nstab-mediawiki' => 'Mesaje',
@@ -265,11 +284,11 @@ $messages = array(
 'yourpasswordagain'       => 'Retape la sinia:',
 'remembermypassword'      => 'Memora me sinia de entra a esta computador',
 'yourdomainname'          => 'Tu domina:',
-'login'                   => 'Sinia per entra',
+'login'                   => 'Identifia',
 'nav-login-createaccount' => 'Sinia per entra',
 'loginprompt'             => 'Tu debe engrana "tortetas" per entra {{SITENAME}}.',
 'userlogin'               => 'Sinia per entra',
-'logout'                  => 'Sinia per retira',
+'logout'                  => 'Retira',
 'userlogout'              => 'Sinia per retira',
 'nologin'                 => 'Tu no ave un conta? $1.',
 'nologinlink'             => 'Crea  un conta',
@@ -282,10 +301,13 @@ $messages = array(
 'yourrealname'            => 'Nom vera:',
 'yourlanguage'            => 'Lingua:',
 'yournick'                => 'Suscrive:',
+'email'                   => 'Eposta',
 'prefs-help-realname'     => 'Tu nom vera no es obligada, ma si tu vole dona tu nom vera, el va es usada per onora tu per tu labora.',
+'loginerror'              => 'Era de entra',
 'loginsuccesstitle'       => 'Entra susedente',
 'loginsuccess'            => "'''Tu ia entrada aora a {{SITENAME}} como \"\$1\".'''",
-'nosuchuser'              => 'Es no usor con la nom "$1". Esamina la spele, o crea un conta nova.',
+'nosuchuser'              => 'Es no usor con la nom "$1".
+Esamina la spele, o [[Special:UserLogin/signup|crea un conta nova]].',
 'nosuchusershort'         => 'Es no usor con esta nom "<nowiki>$1</nowiki>". Esamina la spele.',
 'nouserspecified'         => 'Tu debe indica un nom de usor.',
 'wrongpassword'           => 'La sinia de entra no es coreta. Per favore, atenta ancora.',
@@ -308,6 +330,13 @@ Ante alga otra eposta es enviada a la conta, tu va nesesa segue la instruis en l
 'emailconfirmlink'        => 'Aproba tu adirije de eposta',
 'loginlanguagelabel'      => 'Lingua: $1',
 
+# Password reset dialog
+'oldpassword'               => 'Sinia secreta vea:',
+'newpassword'               => 'Sinia secreta nova:',
+'retypenew'                 => 'Re-entra tu sinia secreta nova:',
+'resetpass-submit-loggedin' => 'Cambia la sinia secreta',
+'resetpass-temp-password'   => 'Sinia secreta tempora:',
+
 # Edit page toolbar
 'bold_sample'     => 'Testo en leteras forte',
 'bold_tip'        => 'Testo en leteras forte',
@@ -329,8 +358,8 @@ Ante alga otra eposta es enviada a la conta, tu va nesesa segue la instruis en l
 'hr_tip'          => 'Linia orizonal (usa nonfrecuente)',
 
 # Edit pages
-'summary'                => 'Soma',
-'subject'                => 'Sujeto/titulo',
+'summary'                => 'Soma:',
+'subject'                => 'Sujeto/titulo:',
 'minoredit'              => 'Esta es un cambia minor',
 'watchthis'              => 'Oserva esta paje',
 'savearticle'            => 'Fisa paje',
@@ -339,7 +368,7 @@ Ante alga otra eposta es enviada a la conta, tu va nesesa segue la instruis en l
 'showdiff'               => 'Mostra diferes',
 'anoneditwarning'        => "'''Avisa:''' Tu no ia sinia per entra.
 Tu adirije de IP va es memorada en la istoria de revisas de esta paje.",
-'summary-preview'        => 'Previde soma',
+'summary-preview'        => 'Previde soma:',
 'blockedtitle'           => 'Usor es impedida',
 'blockedtext'            => "<big>'''Tu nom de usor o adirije de IP ia es impedida.'''</big>
 
@@ -360,17 +389,20 @@ Per favore inclui tota esta detales en tu demandas.",
 Per crea la paje, comensa scrive en la caxa a su
 (vide la [[{{MediaWiki:Helppage}}|paje de aida]] per plu).
 Si tu es asi par era, clica a la boton '''retro''' de tu surfador.",
-'noarticletext'          => 'Es aora no testo a esta paje; tu pote [[Special:Search/{{PAGENAME}}|xerca per la nom de esta paje]] en otra pajes o [{{fullurl:{{FULLPAGENAME}}|action=edit}} edita esta paje].',
-'previewnote'            => '<strong>Esta sola un previde; cambias no es fisada ja</strong>',
+'noarticletext'          => 'Es aora no testo a esta paje.
+Tu pote [[Special:Search/{{PAGENAME}}|xerca per la titulo de esta paje]] en otra pajes,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} xerca la arcivos relatada],
+o [{{fullurl:{{FULLPAGENAME}}|action=edit}} edita esta paje].',
+'previewnote'            => "'''Esta sola un previde; cambias no es fisada ja'''",
 'editing'                => 'En la prosede de edita $1',
 'editingsection'         => 'Edita $1 (sesion)',
-'editingcomment'         => 'Edita $1 (comenta)',
+'editingcomment'         => 'Edita $1 (sesion nova)',
 'yourdiff'               => 'Diferes',
-'copyrightwarning'       => 'Per favore nota ce tota labora a {{SITENAME}} es judida ce el es relasada su la $2 (vide $1 per detalias). Si tu no desira ce tu scrives ta es editada sin compati e redistribui sin tu permite, no sumita el asi!<br />
+'copyrightwarning'       => "Per favore nota ce tota labora a {{SITENAME}} es judida ce el es relasada su la $2 (vide $1 per detalias). Si tu no desira ce tu scrives ta es editada sin compati e redistribui sin tu permite, no sumita el asi!<br />
 Tu ance promete a nos ce tu ia scriveda esta par tu mesma, o copiada esta de un domina publica o otra orijin libre.
-<strong>NO SUMITA LABORA SU DIRETOS DE AUTOR SIN PERMITE!!</strong>',
-'longpagewarning'        => '<strong>AVISA: Esta paje usa $1 kilotetas; alga surfadores pote ave problemes con la edita de pajes plu grande ce 32 ko.
-Per favore, considera parti la paje en pesos plu poca.</strong>',
+'''NO SUMITA LABORA SU DIRETOS DE AUTOR SIN PERMITE!!'''",
+'longpagewarning'        => "'''AVISA: Esta paje usa $1 kilotetas; alga surfadores pote ave problemes con la edita de pajes plu grande ce 32 ko.
+Per favore, considera parti la paje en pesos plu poca.'''",
 'templatesused'          => 'Modeles usada a esta paje:',
 'templatesusedpreview'   => 'Modeles usada en esta previde:',
 'template-protected'     => '(protejeda)',
@@ -382,25 +414,27 @@ Tu debe pensa ce es bon continua edita esta paje.
 La arcivo de sutraes per esta paje es asi per conveni:",
 
 # History pages
-'viewpagelogs'        => 'Vide la arcivo de esta paje',
-'currentrev'          => 'Cambia presente',
-'revisionasof'        => 'Revisa de $1',
-'revision-info'       => 'Revisa de $1 par $2',
-'previousrevision'    => '� Altera presedente',
-'nextrevision'        => 'Revisa plu nova→',
-'currentrevisionlink' => 'Revisa presente',
-'cur'                 => 'aora',
-'next'                => 'seguente',
-'last'                => 'dife',
-'page_first'          => 'prima',
-'page_last'           => 'final',
-'histlegend'          => 'Diferente eleje: Marca la caxas de radio de esta varias per compare e clica entra o la boton a la funda.<br />
+'viewpagelogs'           => 'Vide la arcivo de esta paje',
+'currentrev'             => 'Cambia presente',
+'currentrev-asof'        => 'Cambia presente a departi di $1',
+'revisionasof'           => 'Revisa de $1',
+'revision-info'          => 'Revisa de $1 par $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Altera presedente',
+'nextrevision'           => 'Revisa plu nova→',
+'currentrevisionlink'    => 'Revisa presente',
+'cur'                    => 'aora',
+'next'                   => 'seguente',
+'last'                   => 'dife',
+'page_first'             => 'prima',
+'page_last'              => 'final',
+'histlegend'             => 'Diferente eleje: Marca la caxas de radio de esta varias per compare e clica entra o la boton a la funda.<br />
 (presente) = difere de la varia presente,
 (presedente) = difere con varia presedente, M = edita minor.',
-'histfirst'           => 'Prima',
-'histlast'            => 'Ultima',
-'historysize'         => '({{PLURAL:$1|1 otuple|$1 otuples}})',
-'historyempty'        => '(vacua)',
+'history-fieldset-title' => 'Surfa istoria',
+'histfirst'              => 'Prima',
+'histlast'               => 'Ultima',
+'historysize'            => '({{PLURAL:$1|1 otuple|$1 otuples}})',
+'historyempty'           => '(vacua)',
 
 # Revision feed
 'history-feed-title'          => 'Istoria de revises',
@@ -416,23 +450,31 @@ La arcivo de sutraes per esta paje es asi per conveni:",
 'compareselectedversions' => 'Compare varias elejeda',
 'editundo'                => 'desfa',
 'diff-multi'              => '({{PLURAL:$1|$1 revise|$1 revises}} medial no mostrada.)',
+'diff-with'               => '&#32;con $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
 
 # Search results
-'searchresults'            => 'Resultas de xerca',
-'noexactmatch'             => "'''Es no paje clamada \"\$1\".''' Tu pote [[:\$1|crea esta paje]].",
-'prevn'                    => '$1 presedente',
-'nextn'                    => '$1 seguente',
-'viewprevnext'             => 'Vide ($1) ($2) ($3)',
-'search-interwiki-default' => 'Resultas de $1:',
-'searchall'                => 'tota',
-'powersearch'              => 'Xerca avansada',
+'searchresults'             => 'Resultas de xerca',
+'noexactmatch'              => "'''Es no paje clamada \"\$1\".''' Tu pote [[:\$1|crea esta paje]].",
+'prevn'                     => '$1 presedente',
+'nextn'                     => '$1 seguente',
+'viewprevnext'              => 'Vide ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:Contenis',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 parola|$2 parolas}})',
+'search-section'            => '(sesion $1)',
+'search-interwiki-default'  => 'Resultas de $1:',
+'search-interwiki-more'     => '(plu)',
+'search-mwsuggest-enabled'  => 'con sujestes',
+'search-mwsuggest-disabled' => 'zero sujestes',
+'searchall'                 => 'tota',
+'powersearch'               => 'Xerca avansada',
 
 # Preferences page
 'preferences'       => 'Preferis',
 'mypreferences'     => 'Me preferis',
+'skin-preview'      => 'Previde',
 'math'              => 'Matematica',
 'saveprefs'         => 'Fisa',
-'retypenew'         => 'Re-entra tu sinia secreta nova:',
 'rows'              => 'Linias:',
 'columns'           => 'Colonas:',
 'searchresultshead' => 'Xerca',
@@ -444,9 +486,10 @@ La arcivo de sutraes per esta paje es asi per conveni:",
 'saveusergroups' => 'Fisa la grupo de usores',
 
 # Groups
-'group'      => 'Grupo:',
-'group-user' => 'Usores',
-'group-all'  => '(tota)',
+'group'       => 'Grupo:',
+'group-user'  => 'Usores',
+'group-sysop' => 'Dirijores',
+'group-all'   => '(tota)',
 
 'group-user-member' => 'Usor',
 
@@ -456,6 +499,9 @@ La arcivo de sutraes per esta paje es asi per conveni:",
 # User rights log
 'rightslog' => 'Catalogo de diretos de usor',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'edita esta paje',
+
 # Recent changes
 'nchanges'                       => '$1 {{PLURAL:$1|cambia|cambias}}',
 'recentchanges'                  => 'Cambias resente',
@@ -479,6 +525,8 @@ La arcivo de sutraes per esta paje es asi per conveni:",
 'newpageletter'                  => 'N',
 'boteditletter'                  => 'b',
 'rc_categories_any'              => 'Cualce',
+'rc-enhanced-expand'             => 'Mostra detalias (JavaScript es nesesada)',
+'rc-enhanced-hide'               => 'Asconde detalias',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cambias relateda',
@@ -497,12 +545,12 @@ Pajes a [[Special:Watchlist|tu lista de pajes oservada]] es en leteras '''forte'
 
 'upload-file-error' => 'Era interna',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'fix',
-'imagelist'      => 'Lista de imajes',
-'imagelist_name' => 'Nom',
+'listfiles'      => 'Lista de imajes',
+'listfiles_name' => 'Nom',
 
-# Image description page
+# File description page
 'filehist'                  => 'Istoria de fix',
 'filehist-help'             => 'Clica a un data/tempo per vide la fix como el ia aperi alora.',
 'filehist-current'          => 'aora',
@@ -511,7 +559,7 @@ Pajes a [[Special:Watchlist|tu lista de pajes oservada]] es en leteras '''forte'
 'filehist-dimensions'       => 'Mesuras',
 'filehist-filesize'         => 'Grandia de fix',
 'filehist-comment'          => 'Comenta',
-'imagelinks'                => 'Lias',
+'imagelinks'                => 'Lias de fix',
 'linkstoimage'              => 'Esta {{PLURAL:$1|paje|pajes}} lia a esta fix:',
 'nolinkstoimage'            => 'Es no pajes ce lia a esta fix.',
 'sharedupload'              => 'Esta fix es parti es pote es usada par otra projetas.',
@@ -579,6 +627,8 @@ Pajes a [[Special:Watchlist|tu lista de pajes oservada]] es en leteras '''forte'
 'movethispage'            => 'Move esta paje',
 'unusedimagestext'        => '<p>Nota ce otra locas de rede pote lia a un imaje con un URL direta, e donce el pote continua es listada asi contra ce el es usada ativa.</p>',
 'unusedcategoriestext'    => 'La categorias seguente esiste sin es usada par otra articles o categorias.',
+'pager-newer-n'           => '{{PLURAL:$1|1 plu resente|$1 plu resentes}}',
+'pager-older-n'           => '{{PLURAL:$1|1 plu vea|$1 plu veas}}',
 
 # Book sources
 'booksources'    => 'Orijines de libros',
@@ -589,7 +639,6 @@ Pajes a [[Special:Watchlist|tu lista de pajes oservada]] es en leteras '''forte'
 'speciallogtitlelabel' => 'Titulo:',
 'log'                  => 'Lista de atas',
 'all-logs-page'        => 'Tota catalogos',
-'log-search-submit'    => 'Vade',
 
 # Special:AllPages
 'allpages'       => 'Tota pajes',
@@ -607,8 +656,12 @@ Pajes a [[Special:Watchlist|tu lista de pajes oservada]] es en leteras '''forte'
 'categories'         => 'Categorias',
 'categoriespagetext' => 'Es la categorias seguente en la vici.',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Xerca',
+
 # Special:ListGroupRights
-'listgrouprights-group' => 'Grupo',
+'listgrouprights-group'   => 'Grupo',
+'listgrouprights-members' => '(lista de membros)',
 
 # E-mail user
 'emailuser' => 'Envia un eposta a esta usor',
@@ -616,26 +669,23 @@ Pajes a [[Special:Watchlist|tu lista de pajes oservada]] es en leteras '''forte'
 'emailto'   => 'Per',
 
 # Watchlist
-'watchlist'            => 'Pajes oservada',
-'mywatchlist'          => 'Me lista de pajes oservada',
-'watchlistfor'         => "(per '''$1''')",
-'nowatchlist'          => 'Tu ave no cosas en tu lista oservada',
-'addedwatch'           => 'Juntada a la lista de pajes oservada',
-'addedwatchtext'       => "La paje \"[[:\$1]]\" ia es juntada a tu [[Special:Watchlist|lista de pajes oservada]].
+'watchlist'         => 'Pajes oservada',
+'mywatchlist'       => 'Me lista de pajes oservada',
+'watchlistfor'      => "(per '''$1''')",
+'nowatchlist'       => 'Tu ave no cosas en tu lista oservada',
+'addedwatch'        => 'Juntada a la lista de pajes oservada',
+'addedwatchtext'    => "La paje \"[[:\$1]]\" ia es juntada a tu [[Special:Watchlist|lista de pajes oservada]].
 Cambias future a esta paje e se paje de discutes va es listada ala, e la paje va apera en leteras '''forte''' en la [[Special:RecentChanges|lista de cambias resente]] per es plu fasil oservada.
 
 Si tu vole sutrae la paje de tu lista de pajes oservada en la futur, clica a \"no oserva\" en la bara a la lado.",
-'removedwatch'         => 'Sutraeda de la lista de pajes oservada',
-'removedwatchtext'     => 'La paje "[[:$1]]" ia es sutraeda de tu lista de pajes oservada.',
-'watch'                => 'Oserva',
-'watchthispage'        => 'Oserva esta paje',
-'unwatch'              => 'Nonoserva',
-'watchlist-details'    => '{{PLURAL:$1|$1 paje|$1 pajes}} osservada, sin pajes de discutes.',
-'watchlistcontains'    => 'Tu lista oservada teni $1 {{PLURAL:$1|paje|pajes}}.',
-'wlshowlast'           => 'Mostra la $1 oras e $2 dias presedente $3',
-'watchlist-hide-bots'  => 'Asconde editas de bot',
-'watchlist-hide-own'   => 'Asconde me editas',
-'watchlist-hide-minor' => 'Asconde editas minor',
+'removedwatch'      => 'Sutraeda de la lista de pajes oservada',
+'removedwatchtext'  => 'La paje "[[:$1]]" ia es sutraeda de tu lista de pajes oservada.',
+'watch'             => 'Oserva',
+'watchthispage'     => 'Oserva esta paje',
+'unwatch'           => 'Nonoserva',
+'watchlist-details' => '{{PLURAL:$1|$1 paje|$1 pajes}} osservada, sin pajes de discutes.',
+'watchlistcontains' => 'Tu lista oservada teni $1 {{PLURAL:$1|paje|pajes}}.',
+'wlshowlast'        => 'Mostra la $1 oras e $2 dias presedente $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Oserva...',
@@ -644,42 +694,48 @@ Si tu vole sutrae la paje de tu lista de pajes oservada en la futur, clica a \"n
 'enotif_newpagetext' => 'Esta es un paje nova',
 'created'            => 'Creada',
 
-# Delete/protect/revert
-'deletepage'                  => 'Sutrae la paje',
-'confirm'                     => 'Aproba',
-'historywarning'              => 'Avisa! La paje ce tu intende sutrae, el ave un istoria:',
-'confirmdeletetext'           => 'Tu va pronto sutrae un paje con tota se istoria. Per favore, afirma ce tu intende esta, ce tu comprende la resultas, e ce tu fa esta en acorda con [[{{MediaWiki:Policy-url}}|la prometes]].',
-'actioncomplete'              => 'Ata completada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ia es sutraeda.
+# Delete
+'deletepage'            => 'Sutrae la paje',
+'confirm'               => 'Aproba',
+'historywarning'        => 'Avisa! La paje ce tu intende sutrae, el ave un istoria:',
+'confirmdeletetext'     => 'Tu va pronto sutrae un paje con tota se istoria. Per favore, afirma ce tu intende esta, ce tu comprende la resultas, e ce tu fa esta en acorda con [[{{MediaWiki:Policy-url}}|la prometes]].',
+'actioncomplete'        => 'Ata completada',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ia es sutraeda.
 Vide $2 per un catalogo de sutraes resente.',
-'deletedarticle'              => 'sutraeda "[[$1]]"',
-'dellogpage'                  => 'catalogo de sutraes',
-'deletecomment'               => 'Razona per esta sutrae:',
-'deleteotherreason'           => 'Otra/plu razona:',
-'deletereasonotherlist'       => 'Otra razona',
-'rollbacklink'                => 'retro',
+'deletedarticle'        => 'sutraeda "[[$1]]"',
+'dellogpage'            => 'catalogo de sutraes',
+'deletecomment'         => 'Razona per esta sutrae:',
+'deleteotherreason'     => 'Otra/plu razona:',
+'deletereasonotherlist' => 'Otra razona',
+
+# Rollback
+'rollbacklink' => 'retro',
+
+# Protect
 'protectlogpage'              => 'Catalogo de protejes',
 'protectedarticle'            => '"[[$1]]" protejeda',
 'unprotectedarticle'          => "''[[$1]]'' desprotejeda",
 'protect-title'               => 'Fisa nivel de proteje a "$1"',
+'prot_1movedto2'              => '[[$1]] es moveda a [[$2]]',
 'protect-legend'              => 'Aproba la proteje',
 'protectcomment'              => 'Razona per proteje',
 'protectexpiry'               => 'Fini:',
 'protect_expiry_invalid'      => 'Ora de fini no es legal.',
 'protect_expiry_old'          => 'Ora de fini es en la pasada.',
 'protect-unchain'             => 'Desecura la permetes de move',
-'protect-text'                => 'Tu pote vide e cambia la nivel de proteje asi per la paje <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Tu conta no ave permite per cambia niveles de proteje.
-Asi es la ajustas presente per la paje <strong>$1</strong>:',
+'protect-text'                => "Tu pote vide e cambia la nivel de proteje asi per la paje '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Tu conta no ave permite per cambia niveles de proteje.
+Asi es la ajustas presente per la paje '''$1''':",
 'protect-cascadeon'           => 'Esta paje es aora protejeda per ce el es incluida en esta {{PLURAL:$1|paje|pajes}} ce ave proteje cascadente ativa. Tu pote cambia la nivel de proteje per esta paje, ma esta no va influense la proteje cascadente.',
 'protect-default'             => '(costumal)',
 'protect-fallback'            => 'Nesesa permite "$1"',
-'protect-level-autoconfirmed' => 'Impedi usores nonenscriveda',
+'protect-level-autoconfirmed' => 'Impedi usores nova e nonenscriveda',
 'protect-level-sysop'         => 'Sola sysopes',
 'protect-summary-cascade'     => 'cascadente',
 'protect-expiring'            => 'fini $1 (UTC)',
 'protect-cascade'             => 'Proteje pajes ce es incluida en esta paje (proteje cascadente)',
 'protect-cantedit'            => 'Tu no pote cambia la nivel de proteje de esta paje, per ce tu no ave la permite per edita el.',
+'protect-expiry-options'      => '1 ora:1 hour,1 dia:1 day,1 semana:1 week,2 semanas:2 weeks,1 mensa:1 month,3 mensas:3 months,6 mensas:6 months,1 anio:1 year,nonlimitada:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permete:',
 'restriction-level'           => 'Nivel de restrinje:',
 
@@ -701,22 +757,27 @@ Asi es la ajustas presente per la paje <strong>$1</strong>:',
 'month'         => 'De mensa (e plu vea):',
 'year'          => 'De anio (e plu vea):',
 
+'sp-contributions-newbies'     => 'Sola mostra contribuis de contas nova',
 'sp-contributions-newbies-sub' => 'Per contas nova',
 'sp-contributions-blocklog'    => 'Impedi arcivo',
+'sp-contributions-search'      => 'Xerca per contribuis',
+'sp-contributions-username'    => 'Adirije de IP o nom de usor:',
 'sp-contributions-submit'      => 'Xerca',
 
 # What links here
-'whatlinkshere'       => 'Ce es liada a asi',
-'whatlinkshere-title' => 'Pajes ci lia a "$1"',
-'whatlinkshere-page'  => 'Paje:',
-'linklistsub'         => '(Lista de lias)',
-'linkshere'           => "Esta pajes lia a '''[[:$1]]''':",
-'nolinkshere'         => "No pajes lia a '''[[:$1]]'''.",
-'isredirect'          => 'redirije paje',
-'istemplate'          => 'inclui',
-'whatlinkshere-prev'  => '{{PLURAL:$1|presesdente|$1 presedente}}',
-'whatlinkshere-next'  => '{{PLURAL:$1|seguente|$1 seguente}}',
-'whatlinkshere-links' => '� lias',
+'whatlinkshere'           => 'Ce es liada a asi',
+'whatlinkshere-title'     => 'Pajes ci lia a "$1"',
+'whatlinkshere-page'      => 'Paje:',
+'linkshere'               => "Esta pajes lia a '''[[:$1]]''':",
+'nolinkshere'             => "No pajes lia a '''[[:$1]]'''.",
+'isredirect'              => 'redirije paje',
+'istemplate'              => 'inclui',
+'isimage'                 => 'lia de imaje',
+'whatlinkshere-prev'      => '{{PLURAL:$1|presesdente|$1 presedente}}',
+'whatlinkshere-next'      => '{{PLURAL:$1|seguente|$1 seguente}}',
+'whatlinkshere-links'     => '� lias',
+'whatlinkshere-hidelinks' => '$1 lias',
+'whatlinkshere-filters'   => 'Filtros',
 
 # Block/unblock
 'blockip'            => 'Impedi usor',
@@ -786,16 +847,16 @@ En esta casos, tu va nesesa move o fusa la paje per mano, si desirada.",
 'importlogpage' => 'Importa arcivo',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Me paje de usor',
-'tooltip-pt-mytalk'               => 'Me paje de discutes',
+'tooltip-pt-userpage'             => 'Tu paje de usor',
+'tooltip-pt-mytalk'               => 'Tu paje de discutes',
 'tooltip-pt-preferences'          => 'Me preferis',
 'tooltip-pt-watchlist'            => 'La lista de pajes ce tu oserva per cambias',
-'tooltip-pt-mycontris'            => 'Lista de me contribuis',
+'tooltip-pt-mycontris'            => 'Lista de tu contribuis',
 'tooltip-pt-login'                => 'Nos preferi si tu sinia per entra, ma tu es no obligada.',
 'tooltip-pt-logout'               => 'Sinia per retira',
 'tooltip-ca-talk'                 => 'Discute de la paje de contenis',
 'tooltip-ca-edit'                 => 'Tu pote edita esta paje. Per favore, usa la boton de previde ante fisa.',
-'tooltip-ca-addsection'           => 'Junta un comenta a esta discute.',
+'tooltip-ca-addsection'           => 'Inisia un sesion nova',
 'tooltip-ca-viewsource'           => 'Esta paje es protejeda. Tu pote vide se orijin.',
 'tooltip-ca-protect'              => 'Proteje esta paje',
 'tooltip-ca-delete'               => 'Sutrae esta paje',
@@ -831,8 +892,8 @@ En esta casos, tu va nesesa move o fusa la paje per mano, si desirada.",
 'others' => 'otras',
 
 # Browsing diffs
-'previousdiff' => '� Difere presedente',
-'nextdiff'     => 'Difere seguente →',
+'previousdiff' => '� Difere plu vea',
+'nextdiff'     => 'Difere plu nova →',
 
 # Media information
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|paje|pajes}}',
@@ -842,7 +903,7 @@ En esta casos, tu va nesesa move o fusa la paje per mano, si desirada.",
 'show-big-image'       => 'Densia masima',
 'show-big-image-thumb' => '<small>Grandia de eesta previde: $1 × $2 pixeles</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Imajes nova',
 'ilsubmit'  => 'Xerca',
 
@@ -872,7 +933,7 @@ Si la fix ia es cambiada de se stato orijinal, alga detalias pote no es clara en
 
 # External editor support
 'edit-externally'      => 'Edita esta fix con un programa esterna',
-'edit-externally-help' => 'Vide la [http://www.mediawiki.org/wiki/Manual:External_editors instruis per comensa] per plu instruis.',
+'edit-externally-help' => '(Vide la [http://www.mediawiki.org/wiki/Manual:External_editors instruis per comensa] per plu instruis)',
 
 # 'all' in various places, this might be different for inflected languages
 'watchlistall2' => 'tota',
@@ -888,7 +949,11 @@ Si la fix ia es cambiada de se stato orijinal, alga detalias pote no es clara en
 'watchlisttools-raw'  => 'Edita la lista rua de pajes oservada',
 
 # Special:Version
-'version' => 'Varia', # Not used as normal message but as header for the special page itself
+'version'         => 'Varia', # Not used as normal message but as header for the special page itself
+'version-version' => 'Varia',
+
+# Special:FilePath
+'filepath-page' => 'Fix:',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch-submit' => 'Xerca',
diff --git a/languages/messages/MessagesLg.php b/languages/messages/MessagesLg.php
index 039122b8..5fd8ec30 100644
--- a/languages/messages/MessagesLg.php
+++ b/languages/messages/MessagesLg.php
@@ -170,7 +170,7 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => 'Kuvaamu',
-'logouttext'                 => "<strong>Kati ovuddemu.</strong><br />
+'logouttext'                 => "'''Kati ovuddemu.'''<br />
 Osobola okusigala nga okozesa {{SITENAME}} nga atamanyise, ate osobola
 n'okuddamu okuyingira nga bw'obadde oba nga okozesezza ery'obwa memba
 eddala. Wekkaanye, empapula ezimu ziyinza okukweyolekera nga bwe
@@ -204,6 +204,11 @@ olwa 'yogera nange' nga ggwe tewetaaze kulaga bikufaako.",
 'accountcreated'             => 'Akawunti ekoleddwa',
 'accountcreatedtext'         => "Akawunti ey'obwa memba eya $1 ekoleddwa.",
 
+# Password reset dialog
+'oldpassword' => 'Ekigambo ekikuumi ekikadde:',
+'newpassword' => 'Ekigambo ekikuumi ekipya:',
+'retypenew'   => 'Ddamu ekikagambo ekikuumi ekipya ekyo:',
+
 # Edit page toolbar
 'bold_sample'     => "Ennukuta z'owandiika wano zonna ziba nziggumivu",
 'bold_tip'        => "Bw'onyiga kano, ofuna w'oyinza okuwandiikira ennukuta ezo ne zivaamu nga nziggumivu",
@@ -225,7 +230,7 @@ olwa 'yogera nange' nga ggwe tewetaaze kulaga bikufaako.",
 'hr_tip'          => "Bw'onyiga ku kano ofuna olusaze olwawula mu by'owandiika. (Gezaako butakozesa nyingi)",
 
 # Edit pages
-'summary'                => "Wandika wano ebinyonyola enkyukakyuka z'okoze",
+'summary'                => "Wandika wano ebinyonyola enkyukakyuka z'okoze:",
 'minoredit'              => 'Eno nkyukakyuka ntono',
 'watchthis'              => 'Goberera olupapula luno',
 'savearticle'            => 'Kaza olupapula',
@@ -254,7 +259,7 @@ Oba gwe oyagala okulukolawo, wandiika mu kabokisi wammanga.
 Bw'obanga tewagenderedde kutuuka wano, nyigabunyizi eppeesa ery'omu kalambula-neti yo
 erya '''ddayo'''.",
 'noarticletext'          => "Wano tewali kyawandiikidwawo, ky'obadde onoonya osobola [[Special:Search/{{PAGENAME}}| okukinoonyeza]] ku mpapula endala oba oyinza [{{fullurl:{{FULLPAGENAME}}|action=edit}} gwe okukiwandiikako] wano.",
-'previewnote'            => "<strong>Kuno kugezaamubugeza; by'okoze tebinnakazibwa!</strong>",
+'previewnote'            => "'''Kuno kugezaamubugeza; by'okoze tebinnakazibwa!'''",
 'editing'                => 'Kati okyuusa $1',
 'editingsection'         => 'Okyuusa $1 (kitundu)',
 'editingcomment'         => 'Kukyuusa $1 (obubaka)',
@@ -262,10 +267,10 @@ erya '''ddayo'''.",
 'copyrightwarning'       => "Genderera nti buli kyowandiika muno mu {{SITENAME}} kibalibwa ng'ekifugibwa $2 (okuyiga ebisingawo, laba $1).
 Obanga tewetegese okulaba by'owandiise nga babikyusakyusa n'okubisaasaanya nga bwe balaba, tobiwandiika muno.<br />
 Tukwesiga nti by'owandiika muno bibyo oba wabigya mu kya bonna oba awalala gye batalina bikugizo eby'obwa nannyini.
-<strong>TOTEEKAMU EBIRIKO EBIKUGIZO EBY'OBWA NANNYINI NGA BA NYINI BYO TEBAKUWADDE LUKUSA!</strong>",
+'''TOTEEKAMU EBIRIKO EBIKUGIZO EBY'OBWA NANNYINI NGA BA NYINI BYO TEBAKUWADDE LUKUSA!'''",
 'copyrightwarning2'      => "Genderera nti buli kyowandiika muno mu {{SITENAME}} abalala bayinza okubikyusa oba n'okubigiramu ddala. Obanga tewetegese okulaba by'owandiise nga babikyusakyusa n'okubisaasaanya nga bwe balaba, tobiwandiika muno.<br />
 Tukwesiga nti by'owandiika muno bibyo oba wabigya mu kya bonna oba awalala gye batalina bikugizo eby'obwa nannyini. (okuyiga ebisingawo, laba $1).
-<strong>TOTEEKAMU EBIRIKO EBIKUGIZO EBY'OBWA NANNYINI NGA BA NYINI BYO TEBAKUWADDE LUKUSA!</strong>",
+'''TOTEEKAMU EBIRIKO EBIKUGIZO EBY'OBWA NANNYINI NGA BA NYINI BYO TEBAKUWADDE LUKUSA!'''",
 'templatesused'          => 'Olupapula luno entiba ze lukozesa ze:',
 'template-protected'     => '(luno lusibidwa)',
 'template-semiprotected' => '(ebimu ku lupapula luno bisibidwa)',
@@ -298,20 +303,18 @@ oba ku gano agali ku lupapula luno.<br />
 'editundo'                => 'julula enkyukakyuka',
 
 # Search results
-'noexactmatch' => "'''Tewali lupapula lwa \"\$1\".''' Ob'oyagala, [[:\$1|olupapula olwo gwe osobola okulukolawo]].",
-'prevn'        => '$1 ezikulembedde zino',
-'nextn'        => '$1 eziddako',
-'viewprevnext' => 'Laga ($1) ($2) ($3).',
-'powersearch'  => 'Noonya',
+'noexactmatch'   => "'''Tewali lupapula lwa \"\$1\".''' Ob'oyagala, [[:\$1|olupapula olwo gwe osobola okulukolawo]].",
+'prevn'          => '$1 ezikulembedde zino',
+'nextn'          => '$1 eziddako',
+'viewprevnext'   => 'Laga ($1) ($2) ($3).',
+'searchhelp-url' => 'Help:Endagiriro',
+'powersearch'    => 'Noonya',
 
 # Preferences page
 'mypreferences'     => 'Enteekateeka yange',
 'prefs-personal'    => 'Ebikufaako',
 'saveprefs'         => 'Bino bikaze',
 'resetprefs'        => 'Gyawo enkyukakyuka ze sinnakaza',
-'oldpassword'       => 'Ekigambo ekikuumi ekikadde:',
-'newpassword'       => 'Ekigambo ekikuumi ekipya:',
-'retypenew'         => 'Ddamu ekikagambo ekikuumi ekipya ekyo:',
 'searchresultshead' => 'Noonya',
 'savedprefs'        => 'Enteekateeka yo ekazidwa.',
 'allowemail'        => 'Kkiriza bamemba abalala okukusindikira e-mail',
@@ -346,10 +349,10 @@ oba ku gano agali ku lupapula luno.<br />
 'upload'        => 'Teekayo fayiro',
 'uploadlogpage' => 'Likooda eya fayiro eziteekedwa ku wiki',
 
-# Special:ImageList
-'imagelist_user' => 'Memba',
+# Special:ListFiles
+'listfiles_user' => 'Memba',
 
-# Image description page
+# File description page
 'filehist'            => 'Ebyafaayo ebya fayiro eno',
 'filehist-help'       => "Bw'onyiga ku nnaku n'essaawa, ojjakulaba fayiro nga bwe yali efaanana ku kiseera ekyo.",
 'filehist-datetime'   => "Ennaku n'obudde",
@@ -411,12 +414,15 @@ Bw\'oba oyagala okulekerawo okulugoberera, nyiga ku kigambo "Suula" awo ku bbali
 'watching'   => 'Kikolebwako...',
 'unwatching' => 'Kikolebwako...',
 
-# Delete/protect/revert
+# Delete
 'confirm'        => 'Kakasa',
 'actioncomplete' => 'Kiwedde',
 'deletedarticle' => 'olupapula olwa "[[$1]]" lugyidwawo',
 'dellogpage'     => 'Ebigyidwawo',
 
+# Protect
+'protect-expiry-options' => 'saawa 2:2 hours,lunaku 1:1 day,nnaku 3:3 days,sande 1:1 week,sande 2:2 weeks,mwezi 1:1 month,myezi 3:3 months,myezi 6:6 months,mwaka 1:1 year,okutali kkomo:infinite', # display1:time1,display2:time2,...
+
 # Restrictions (nouns)
 'restriction-edit' => 'Kyuusa',
 
@@ -439,7 +445,6 @@ Bw\'oba oyagala okulekerawo okulugoberera, nyiga ku kigambo "Suula" awo ku bbali
 # What links here
 'whatlinkshere'       => 'Empapula ezikuggusa ku luno',
 'whatlinkshere-title' => 'Empapula eziriko enyunzi ezigguka ku $1',
-'linklistsub'         => "(Olukalala olw'empapula eziriko enyunzi ezigguka wano)",
 'linkshere'           => "Zino z'empapula eziriko enyunzi ezigguka ku '''[[:$1]]''':",
 'nolinkshere'         => "Tewali mpapula eziriko enyunzi ezigguka ku '''[[:$1]]'''.",
 'whatlinkshere-prev'  => '{{PLURAL:$1|olukulembera|$1 ezikulembera}}',
diff --git a/languages/messages/MessagesLi.php b/languages/messages/MessagesLi.php
index d55e2c64..d99791b2 100644
--- a/languages/messages/MessagesLi.php
+++ b/languages/messages/MessagesLi.php
@@ -15,11 +15,6 @@
 
 $fallback = 'nl';
 
-$skinNames = array(
-	'standard' => 'Standaard',
-	'nostalgia' => 'Nostalgie',
-	'cologneblue' => 'Keuls blauw',
-);
 
 $namespaceNames = array(
 	NS_MEDIA          => 'Media',
@@ -30,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Euverlèk_gebroeker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Euverlèk_$1',
-	NS_IMAGE          => 'Plaetje',
-	NS_IMAGE_TALK     => 'Euverlèk_plaetje',
+	NS_FILE           => 'Plaetje',
+	NS_FILE_TALK      => 'Euverlèk_plaetje',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Euverlèk_MediaWiki',
 	NS_TEMPLATE       => 'Sjabloon',
@@ -45,8 +40,83 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'Kategorie'           => NS_CATEGORY,
 	'Euverlèk_kategorie'  => NS_CATEGORY_TALK,
-	'Aafbeilding'         => NS_IMAGE,
-	'Euverlèk_afbeelding' => NS_IMAGE_TALK,
+	'Aafbeilding'         => NS_FILE,
+	'Euverlèk_afbeelding' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Dobbel doorverwiezinge' ),
+	'BrokenRedirects'           => array( 'Gebraoke doorverwiezinge' ),
+	'Disambiguations'           => array( 'Verdudelikingspazjena\'s' ),
+	'Userlogin'                 => array( 'Aanmelje' ),
+	'Userlogout'                => array( 'Aafmelje' ),
+	'Preferences'               => array( 'Veurkäöre' ),
+	'Watchlist'                 => array( 'Volglies' ),
+	'Recentchanges'             => array( 'Lètste verangeringe' ),
+	'Upload'                    => array( 'Uploade' ),
+	'Listfiles'                 => array( 'Plaetjes' ),
+	'Newimages'                 => array( 'Nuuj plaetjes' ),
+	'Listusers'                 => array( 'Gebroekers' ),
+	'Statistics'                => array( 'Sjtatistieke' ),
+	'Randompage'                => array( 'Willekäörig artikkel' ),
+	'Lonelypages'               => array( 'Weispazjena\'s' ),
+	'Uncategorizedpages'        => array( 'Óngecategoriseerde pazjena\'s' ),
+	'Uncategorizedcategories'   => array( 'Óngecategoriseerde categorieë' ),
+	'Uncategorizedimages'       => array( 'Óngecategoriseerde plaetjes' ),
+	'Uncategorizedtemplates'    => array( 'Óngecategorisserde sjablone' ),
+	'Unusedcategories'          => array( 'Óngebroekde categorieë' ),
+	'Unusedimages'              => array( 'Óngebroekde plaetjes' ),
+	'Wantedpages'               => array( 'Gewunsjde pazjena\'s' ),
+	'Wantedcategories'          => array( 'Gewunsjde categorieë' ),
+	'Mostlinked'                => array( 'Meis gelinkde pazjena\'s' ),
+	'Mostlinkedcategories'      => array( 'Meis gelinkde categorieë' ),
+	'Mostlinkedtemplates'       => array( 'Meis gebroekde sjablone' ),
+	'Mostcategories'            => array( 'Meiste categorieë' ),
+	'Mostimages'                => array( 'Meis gebroekde plaetjes' ),
+	'Mostrevisions'             => array( 'Meis bewirkde pazjena\'s' ),
+	'Fewestrevisions'           => array( 'Winnigs bewirkde pazjena\'s' ),
+	'Shortpages'                => array( 'Kórte pazjena\'s' ),
+	'Longpages'                 => array( 'Lang pazjena\'s' ),
+	'Newpages'                  => array( 'Nuuj pazjena\'s' ),
+	'Ancientpages'              => array( 'Audste pazjena\'s' ),
+	'Deadendpages'              => array( 'Doedloupende pazjena\'s' ),
+	'Protectedpages'            => array( 'Beveiligde pazjena\'s' ),
+	'Allpages'                  => array( 'Alle pazjena\'s' ),
+	'Prefixindex'               => array( 'Alle artikele' ),
+	'Ipblocklist'               => array( 'Geblokkeerde IP\'s' ),
+	'Specialpages'              => array( 'Sjpeciaal pazjena\'s' ),
+	'Contributions'             => array( 'Biedrage' ),
+	'Emailuser'                 => array( 'E-maile' ),
+	'Whatlinkshere'             => array( 'Verwiezinge nao hie' ),
+	'Recentchangeslinked'       => array( 'Verwantje wiezinge' ),
+	'Movepage'                  => array( 'Versjuve' ),
+	'Blockme'                   => array( 'Blokkeer mich' ),
+	'Booksources'               => array( 'Bookwinkele' ),
+	'Categories'                => array( 'Categorieë' ),
+	'Export'                    => array( 'Exportere' ),
+	'Version'                   => array( 'Versie' ),
+	'Allmessages'               => array( 'Alle berichte' ),
+	'Log'                       => array( 'Logbeuk', 'Logbook' ),
+	'Blockip'                   => array( 'Blokkere' ),
+	'Undelete'                  => array( 'Hersjtèlle' ),
+	'Import'                    => array( 'Importere' ),
+	'Lockdb'                    => array( 'DB blokkere' ),
+	'Unlockdb'                  => array( 'DB vriegaeve' ),
+	'Userrights'                => array( 'Gebroekersrechte' ),
+	'MIMEsearch'                => array( 'MIME zeuke' ),
+	'Unwatchedpages'            => array( 'Neet-gevolgde pazjena\'s' ),
+	'Listredirects'             => array( 'Doorverwiezinge' ),
+	'Revisiondelete'            => array( 'Versie eweghaole' ),
+	'Unusedtemplates'           => array( 'Óngebroekde sjablone' ),
+	'Randomredirect'            => array( 'Willekäörige doorverwiezing' ),
+	'Mypage'                    => array( 'Mien pazjena\'s' ),
+	'Mytalk'                    => array( 'Mien euverlèk' ),
+	'Mycontributions'           => array( 'Mien biedrage' ),
+	'Listadmins'                => array( 'Administrators' ),
+	'Popularpages'              => array( 'Populair pazjena\'s' ),
+	'Search'                    => array( 'Zeuke' ),
+	'Resetpass'                 => array( 'Wachwaord opnuuj insjtèlle' ),
+	'Withoutinterwiki'          => array( 'Gein interwiki' ),
 );
 
 $dateFormats = array(
@@ -101,17 +171,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Eige bewèrkinge verberge op mien volglies',
 'tog-watchlisthidebots'       => 'Botbewèrkinge op mien volglies verberge',
 'tog-watchlisthideminor'      => 'Kleine bewèrkinge op mien volglies verberge',
+'tog-watchlisthideliu'        => 'Bewirkinge van aangemelde gebroekers op mien volglies versjtaeke',
+'tog-watchlisthideanons'      => 'Bewirkinge van anonieme gebroekers op mien volglies versjtaeke',
 'tog-nolangconversion'        => 'Variantconversie oetsjakele',
 'tog-ccmeonemails'            => "'ne Kopie nao mich verzende van de e-mail dae ich nao anger gebroekers sjtuur",
 'tog-diffonly'                => 'Pazjena-inhaud zónger verangeringe neet tuine',
 'tog-showhiddencats'          => 'Verbórge categorië toeane',
+'tog-norollbackdiff'          => 'Wieziginge eweglaote nao trökdrieje',
 
 'underline-always'  => 'Altied',
 'underline-never'   => 'Noets',
 'underline-default' => 'Standaard van de browser',
 
-'skinpreview' => '(Veurbesjouwing)',
-
 # Dates
 'sunday'        => 'zóndig',
 'monday'        => 'maondig',
@@ -204,8 +275,8 @@ $messages = array(
 'mypage'         => 'Mien gebroekerspazjena',
 'mytalk'         => 'Mien euverlèkpazjena',
 'anontalk'       => 'Euverlèk veur dit IP adres',
-'navigation'     => 'Navegatie',
-'and'            => 'en',
+'navigation'     => 'Navigatie',
+'and'            => '&#32;en',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -217,12 +288,12 @@ $messages = array(
 'search'            => 'Zeuke',
 'searchbutton'      => 'Zeuke',
 'go'                => 'OK',
-'searcharticle'     => 'Gao',
+'searcharticle'     => 'Gank',
 'history'           => 'Historie',
 'history_short'     => 'Historie',
 'updatedmarker'     => 'bewirk sins mien lètste bezeuk',
 'info_short'        => 'Infermasie',
-'printableversion'  => 'Printer-vruntelike versie',
+'printableversion'  => 'Printervruntelike versie',
 'permalink'         => 'Permanente link',
 'print'             => 'Aafdrukke',
 'edit'              => 'Bewirk',
@@ -241,15 +312,15 @@ $messages = array(
 'talkpage'          => 'euverlèkpazjena',
 'talkpagelinktext'  => 'Euverlèk',
 'specialpage'       => 'Speciaal Pazjena',
-'personaltools'     => 'Persoenlike hulpmiddele',
-'postcomment'       => 'Opmèrking toevoge',
+'personaltools'     => 'Persuunlike hulpmiddele',
+'postcomment'       => 'Nuuj sectie',
 'articlepage'       => 'Artikel',
 'talk'              => 'Euverlèk',
 'views'             => 'Aspecte/acties',
 'toolbox'           => 'Gereidsjapskis',
 'userpage'          => 'gebroekerspazjena',
 'projectpage'       => 'Projekpazjena tuine',
-'imagepage'         => 'Besjrievingspazjena',
+'imagepage'         => 'Besjtandjspagina betrachte',
 'mediawikipage'     => 'Berichpazjena tuine',
 'templatepage'      => 'Sjabloonblaad',
 'viewhelppage'      => 'Hölppazjena tuine',
@@ -258,7 +329,7 @@ $messages = array(
 'otherlanguages'    => 'Anger tale',
 'redirectedfrom'    => '(Doorverweze van $1)',
 'redirectpagesub'   => 'Redirectpazjena',
-'lastmodifiedat'    => "Dees pazjena is 't litst verangert op $2, $1.", # $1 date, $2 time
+'lastmodifiedat'    => "Dees pagina is 't lèts verangert op $2, $1.", # $1 date, $2 time
 'viewcount'         => 'Dees pazjena is {{PLURAL:$1|1 kier|$1 kier}} bekeke.',
 'protectedpage'     => 'Beveiligde pazjena',
 'jumpto'            => 'Gank nao:',
@@ -268,8 +339,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Euver {{SITENAME}}',
 'aboutpage'            => 'Project:Info',
-'bugreports'           => 'Fouterapportaasj',
-'bugreportspage'       => 'Project:Fouterapportaasj',
 'copyright'            => 'De inhawd is besjikbaar ónger de $1.',
 'copyrightpagename'    => '{{SITENAME}} auteursrechte',
 'copyrightpage'        => '{{ns:project}}:Auteursrechte',
@@ -288,13 +357,11 @@ $messages = array(
 'portal'               => 'Gebroekersportaol',
 'portal-url'           => 'Project:Gebroekersportaol',
 'privacy'              => 'Privacybeleid',
-'privacypage'          => 'Project:Privacy_policy',
+'privacypage'          => 'Project:Privacybeleid',
 
 'badaccess'        => 'Toeganksfout',
 'badaccess-group0' => 'Doe höbs gén rechte om de gevräögde hanjeling oet te veure.',
-'badaccess-group1' => 'De gevräögde hanjeling is veurbehaoje aan gebroekers in de groep $1.',
-'badaccess-group2' => 'De gevraogde hanjeling is veurbehauwe aan gebroekers in ein van de gróppe $1.',
-'badaccess-groups' => 'De gevraogde hanjeling is veurbehauwe aan gebroekers in ein van de gróppe $1.',
+'badaccess-groups' => 'De gevraogde hanjeling is veurbehauwe aan gebroekers in {{PLURAL:$2|de gróp|ein van de gróppe}}: $1.',
 
 'versionrequired'     => 'Versie $1 van MediaWiki is vereis',
 'versionrequiredtext' => 'Versie $1 van MediaWiki is vereis om deze pazjena te gebroeke. Zee [[Special:Version|Softwareversie]]',
@@ -308,6 +375,8 @@ $messages = array(
 'editsection'             => 'bewirk',
 'editold'                 => 'bewirke',
 'viewsourceold'           => 'brónteks bekieke',
+'editlink'                => 'bewirk',
+'viewsourcelink'          => 'brónteks betrachte',
 'editsectionhint'         => 'Deilpazjena bewèrke: $1',
 'toc'                     => 'Inhawd',
 'showtoc'                 => 'tuine',
@@ -322,13 +391,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom-feed',
 'page-rss-feed'           => '“$1� RSS-feed',
 'page-atom-feed'          => '“$1� Atom-feed',
-'red-link-title'          => '$1 (nag neet aangemaak)',
+'red-link-title'          => '$1 (pagina besteit neet)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
-'nstab-main'      => 'Pazjena',
+'nstab-main'      => 'Pagina',
 'nstab-user'      => 'Gebroeker',
 'nstab-media'     => 'Mediapazjena',
-'nstab-special'   => 'Speciaal',
+'nstab-special'   => 'Speciaal pagina',
 'nstab-project'   => 'Projekpazjena',
 'nstab-image'     => 'Besjtandj',
 'nstab-mediawiki' => 'Berich',
@@ -389,7 +458,6 @@ Maak hievan melding bie 'ne systeembeheerder van {{SITENAME}} en vermeld daobie
 'cannotdelete'         => 'Kós de pazjena of aafbeilding neet wisse.',
 'badtitle'             => 'Óngeljige pazjenatitel',
 'badtitletext'         => 'De opgevraogde pazjena is neet besjikbaar of laeg.',
-'perfdisabled'         => 'Om te veurkomme dat de database weurd euverbelast is dees pazjena allein tusje 03:00 en 15:00 (Wes-Europiese zoemertied) besjikbaar.',
 'perfcached'           => 'De volgende data is gecachet en is mesjien neet gans up to date:',
 'perfcachedts'         => "De getuunde gegaeves komme oet 'n cache en zeen veur 't letst biejgewèrk op $1.",
 'querypage-no-updates' => "Deze pazjena kin op 't memènt neet biejgewèrk waere. Deze gegaeves waere neet vervèrs.",
@@ -403,7 +471,7 @@ Query: $2',
 'protectedpagetext'    => 'Dees pazjena is beveilig. Bewirke is neet meugelik.',
 'viewsourcetext'       => 'De kèns de brónteks van dees pazjena bekieke en kopiëre:',
 'protectedinterface'   => 'Deze pazjena bevat teks veur berichte van de software en is beveilig om misbroek te veurkomme.',
-'editinginterface'     => "'''Waarsjoewing:''' Doe bewirks 'n pazjena die gebroek waert door de software. Bewirkinge op dees pazjena beïnvlode de gebroekersinterface van ederein. Euverwaeg veur vertalinge óm [http://translatewiki.net/wiki/Main_Page?setlang=nl Betawiki] te gebroeke, 't vertalingsprojek veur MediaWiki.",
+'editinginterface'     => "'''Waarsjoewing:''' Doe bewirks 'n pazjena die gebroek waert door de software. Bewirkinge op dees pazjena beïnvlode de gebroekersinterface van ederein. Euverwaeg veur vertalinge óm [http://translatewiki.net/wiki/Main_Page?setlang=nl translatewiki.net] te gebroeke, 't vertalingsprojek veur MediaWiki.",
 'sqlhidden'            => '(SQL query verborge)',
 'cascadeprotected'     => "Deze pazjena kin neet bewèrk waere, omdet dae is opgenaome in de volgende {{PLURAL:$1|pazjena|pazjena's}} die beveilig {{PLURAL:$1|is|zeen}} mèt de kaskaad-optie:
 $2",
@@ -414,7 +482,7 @@ $2",
 De gegaeve ree is ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Slechte configuratie: onbekenge virusscanner: <i>$1</i>',
+'virus-badscanner'     => "Slechte configuratie: onbekenge virusscanner: ''$1''",
 'virus-scanfailed'     => 'scanne is mislukt (code $1)',
 'virus-unknownscanner' => 'onbekeng antivirus:',
 
@@ -429,7 +497,6 @@ De gegaeve ree is ''$2''.",
 'remembermypassword'         => 'Mien wachwaord onthouwe veur later sessies.',
 'yourdomainname'             => 'Die domein',
 'externaldberror'            => "d'r Is 'n fout opgetraoje biej 't aanmelje biej de database of doe höbs gén toesjtömming diene externe gebroeker biej te wèrke.",
-'loginproblem'               => "<b>D'r is 'n prebleim mèt 't aanmèlde.</b><br />Probeer estebleef nog es.",
 'login'                      => 'Aanmèlde',
 'nav-login-createaccount'    => 'Aanmèlde',
 'loginprompt'                => "Diene browser mót ''cookies'' acceptere óm in te logge op {{SITENAME}}.",
@@ -487,7 +554,7 @@ Iedat anger mail nao dat account versjik kan weure, mós te de insjtructies in d
 'throttled-mailpassword'     => "'n Wachwaordherinnering wörd gedurende de letste {{PLURAL:$1|1 oer|$1 oer}} verzönje. Om misbroek te veurkomme, wörd d'r sjlechs éin herinnering per {{PLURAL:$1|oer|$1 oer}} verzönje.",
 'mailerror'                  => "Fout bie 't versjture van mail: $1",
 'acct_creation_throttle_hit' => "Sorry, de höbs al $1 accounts aangemak. De kins d'r gein mië aanmake.",
-'emailauthenticated'         => 'Dien e-mailadres is op $1 geauthentiserd.',
+'emailauthenticated'         => 'Dien e-mailadres is op $2 um $3 bevestig.',
 'emailnotauthenticated'      => 'Dien e-mailadres is nog neet geauthentiseerd. De zals gein
 e-mail óntvange veur alle volgende toepassinge.',
 'noemailprefs'               => "Gaef 'n e-mailadres op om deze functies te gebroeke.",
@@ -500,17 +567,26 @@ e-mail óntvange veur alle volgende toepassinge.',
 ($4) mit \'t wachwaord "$3". Meld dich aan en wiezig dien wachwaord.
 
 Negeer dit berich as deze gebroeker zonger dien medewete is aangemaak.',
+'login-throttled'            => "Doe höbs te huifig geperbeerd aan te melje mèt 'n verkierd wachwaord.
+Doe mós effe wachte ierdets te 't obbenuuts kens perbere.",
 'loginlanguagelabel'         => 'Taol: $1',
 
 # Password reset dialog
-'resetpass'               => 'Wachwaord oppernuuj instelle',
-'resetpass_announce'      => "Doe bös aangemeld mèt 'ne tiejdelikke code dae per e-mail is toegezönje. Veur 'n nuuj wachwaord in om 't aanmelje te voltooie:",
-'resetpass_header'        => 'Wachwaord obbenuuts insjtèlle',
-'resetpass_submit'        => 'Wachwaord instelle en aanmelje',
-'resetpass_success'       => 'Dien wachwaord is verangerd. Bezig mèt aanmelje...',
-'resetpass_bad_temporary' => "Ongeldig tiejdelik wachwaord. Doe höbs dien wachwaord al verangerd of 'n nuuj tiejdelik wachwaord aangevräög.",
-'resetpass_forbidden'     => 'Wachwäörd kónne neet verangerd waere op {{SITENAME}}',
-'resetpass_missing'       => 'Doe höbs gén wachwaord ingegaeve.',
+'resetpass'                 => 'Wachwaord obbenuuts insjtèlle',
+'resetpass_announce'        => "Doe bös aangemeld mèt 'ne tiejdelikke code dae per e-mail is toegezönje. Veur 'n nuuj wachwaord in om 't aanmelje te voltooie:",
+'resetpass_header'          => 'Wachwaord obbenuuts insjtèlle',
+'oldpassword'               => 'Hujig wachwaord',
+'newpassword'               => 'Nuuj wachwaord',
+'retypenew'                 => "Veur 't nuuj wachwaord nogins in",
+'resetpass_submit'          => 'Wachwaord instelle en aanmelje',
+'resetpass_success'         => 'Dien wachwaord is verangerd. Bezig mèt aanmelje...',
+'resetpass_bad_temporary'   => "Ongeldig tiejdelik wachwaord. Doe höbs dien wachwaord al verangerd of 'n nuuj tiejdelik wachwaord aangevräög.",
+'resetpass_forbidden'       => 'Wachwäörd kónne neet verangerd waere op {{SITENAME}}',
+'resetpass-no-info'         => 'Doe moos aangemeld zien ierdets doe dees pagina gebroeke kens.',
+'resetpass-submit-loggedin' => 'Wachwaord wiezige',
+'resetpass-wrong-oldpass'   => "'t Hujig of tiedelik wachwaord is ongeljig.
+Meugelik höbs doe dien wachwaord al gewiezig of 'n nuuj tiedelik wachwaord aangevraog.",
+'resetpass-temp-password'   => 'Tiedelik wachwaord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Vètten teks',
@@ -533,8 +609,8 @@ Negeer dit berich as deze gebroeker zonger dien medewete is aangemaak.',
 'hr_tip'          => 'Horizontaal lien (gebroek spaarzaam)',
 
 # Edit pages
-'summary'                          => 'Samevatting',
-'subject'                          => 'Ongerwerp/kop',
+'summary'                          => 'Samevatting:',
+'subject'                          => 'Ongerwerp/kop:',
 'minoredit'                        => "Dit is 'n klein verangering",
 'watchthis'                        => 'Volg dees pazjena',
 'savearticle'                      => 'Pazjena opsjlaon',
@@ -546,8 +622,8 @@ Negeer dit berich as deze gebroeker zonger dien medewete is aangemaak.',
 'missingsummary'                   => "'''Herinnering:''' Doe höbs gén samevatting opgegaeve veur dien bewèrking. Esse nogmaals op ''Pazjena opslaon'' kliks wörd de bewèrking zonger samevatting opgeslage.",
 'missingcommenttext'               => 'Plaats dien opmèrking hiej onger, a.u.b.',
 'missingcommentheader'             => "'''Let op:''' Doe höbs gén ongerwerp/kop veur deze opmèrking opgegaeve. Esse oppernuuj op \"opslaon\" kliks, wörd dien verangering zonger ongerwerp/kop opgeslage.",
-'summary-preview'                  => 'Naokieke samevatting',
-'subject-preview'                  => 'Naokieke ongerwerp/kop',
+'summary-preview'                  => 'Naokieke samevatting:',
+'subject-preview'                  => 'Naokieke ongerwerp/kop:',
 'blockedtitle'                     => 'Gebroeker is geblokkeerd',
 'blockedtext'                      => "<big>'''Dien gebroekersaccount of IP-adres is geblokkeerd.'''</big>
 
@@ -592,26 +668,26 @@ Veur dien e-mailadres in en bevestig 'm bie [[Special:Preferences|dien veurkäö
 Type in de box hiejónger óm de pazjena te beginne (zuug de [[{{MediaWiki:Helppage}}|helppazjena]] veur mie informatie).
 Es te hie per óngelök terech bis gekómme, klik dan op de '''trök'''-knóp van diene browser.",
 'anontalkpagetext'                 => "----''Dit is de euverlèkpazjena veur 'ne anonieme gebroeker dae nog gein account haet aangemaak of dae 't neet gebroek. Daoveur gebroeke v'r 't IP-adres óm de gebroeker te identificere. Dat adres kan waere gedeild doer mierdere gebroekers. Es te 'ne anonieme gebroeker bis en de höbs 't geveul dat 'r ónrelevante commentare aan dich gerich zeen, kèns te 't bèste [[Special:UserLogin|'n account crëere of inlogge]] óm toekomstige verwarring mit anger anoniem gebroekers te veurkomme.''",
-'noarticletext'                    => 'Dees pazjena bevat gein teks.
-De kèns [[Special:Search/{{PAGENAME}}|nao deze term zeuke]] in anger pazjena\'s of <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} dees pazjena bewirke]</span>.',
+'noarticletext'                    => 'Dees pagina bevat gein teks.
+De kèns [[Speciaal:Zeuke/{{PAGENAME}}|nao deze term zeuke]] in anger pagina\'s of <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} dees pagina bewirke]</span>.',
 'userpage-userdoesnotexist'        => 'Doe bewirks \'n gebroekerspazjena van \'ne gebroeker dae neet besjteit (gebroeker "$1"). Controlere ofs doe dees pazjena waal wils aanmake/bewirke.',
 'clearyourcache'                   => "'''Lèt op:''' Nao 't opsjlaon mós te diene browserbuffer wisse óm de verangeringe te zeen: '''Mozilla:''' klik ''Reload'' (of ''Ctrl-R''), '''Firefox / IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Gebroek de knóp 'Bekiek dees bewirking' om dien nuuj CSS/JS te teste veurdets te opsjleis.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Gebroek de knóp 'Bekiek dees bewirking' om dien nuuj CSS/JS te teste veurdets te opsjleis.",
 'usercsspreview'                   => "'''Dit is allein 'n veurvertuun van dien perseunlike css, deze is neet opgeslage!'''",
 'userjspreview'                    => "'''Let op: doe tes noe dien perseunlik JavaScript. De pazjena is neet opgeslage!'''",
 'userinvalidcssjstitle'            => "'''Waorsjuwing:''' d'r is geine skin \"\$1\". Let op: dien eige .css- en .js-pazjena's beginne mèt  'ne kleine letter, bijveurbeeld {{ns:user}}:Naam/monobook.css in plaats van {{ns:user}}:Naam/Monobook.css.",
 'updated'                          => '(Biegewèrk)',
-'note'                             => '<strong>Opmirking:</strong>',
-'previewnote'                      => "<strong>Lèt op: dit is 'n controlepazjena; dien tèks is nog neet opgesjlage!</strong>",
+'note'                             => "'''Opmirking:'''",
+'previewnote'                      => "'''Lèt op: dit is 'n controlepazjena; dien tèks is nog neet opgesjlage!'''",
 'previewconflict'                  => "Dees versie toent wie de tèks in 't bôvesjte vèld oet git zeen es e zouws opsjlaon.",
-'session_fail_preview'             => "<strong>Sorry! Dien bewerking is neet verwerkt omdat sessiegegevens verlaore zeen gegaon.
-Probeer 't opnieuw. Als 't dan nog neet lukt, meldt dich dan aaf en weer aan.</strong>",
-'session_fail_preview_html'        => "<strong>Sorry! Dien bewerking is neet verwerk omdat sessiegegevens verlaore zeen gegaon.</strong>
+'session_fail_preview'             => "'''Sorry! Dien bewerking is neet verwerkt omdat sessiegegevens verlaore zeen gegaon.
+Probeer 't opnieuw. Als 't dan nog neet lukt, meldt dich dan aaf en weer aan.'''",
+'session_fail_preview_html'        => "'''Sorry! Dien bewerking is neet verwerk omdat sessiegegevens verlaore zeen gegaon.'''
 
 ''Omdat in deze wiki ruwe HTML is ingesjakeld, is 'n voorvertoning neet meugelik als bescherming taege aanvalle met JavaScript.''
 
-<strong>Als dit een legitieme bewerking is, probeer 't dan opnieuw. Als 't dan nog neet lukt, meldt dich dan aaf en weer aan.</strong>",
-'token_suffix_mismatch'            => "<strong>Dien bewerking is geweigerd omdat dien client de laesteikes in 't bewerkingstoken onjuist haet behandeld. De bewerking is geweigerd om verminking van de paginateks te veurkomme. Dit gebeurt soms es d'r een webgebaseerde proxydienst wurt gebroek die foute bevat.</strong>",
+'''Als dit een legitieme bewerking is, probeer 't dan opnieuw. Als 't dan nog neet lukt, meldt dich dan aaf en weer aan.'''",
+'token_suffix_mismatch'            => "'''Dien bewerking is geweigerd omdat dien client de laesteikes in 't bewerkingstoken onjuist haet behandeld. De bewerking is geweigerd om verminking van de paginateks te veurkomme. Dit gebeurt soms es d'r een webgebaseerde proxydienst wurt gebroek die foute bevat.'''",
 'editing'                          => 'Bewirkingspazjena: $1',
 'editingsection'                   => 'Bewirke van sectie van $1',
 'editingcomment'                   => 'Bewirk $1 (commentair)',
@@ -622,21 +698,21 @@ De mós dien eige verangeringe dao-in inpasse.
 '''Allein''' d'n tèks in 't ierste teksveld weurt opgesjlage wens te noe op \"Pazjena opsjlaon\" duujs.",
 'yourtext'                         => 'Euren teks',
 'storedversion'                    => 'Opgesjlage versie',
-'nonunicodebrowser'                => '<strong>WAARSJUWING: Diene browser is voldit neet aan de unicode sjtandaarde, gebroek estebleef inne angere browser veurdas e artikele gis bewirke.</strong>',
-'editingold'                       => "<strong>WAARSJUWING: De bis 'n aw versie van dees pazjena aan 't bewirke. Es e dees bewirking opjsleis, gaon alle verangeringe die na dees versie zien aangebrach verlore.</strong>",
+'nonunicodebrowser'                => "'''WAARSJUWING: Diene browser is voldit neet aan de unicode sjtandaarde, gebroek estebleef inne angere browser veurdas e artikele gis bewirke.'''",
+'editingold'                       => "'''WAARSJUWING: De bis 'n aw versie van dees pazjena aan 't bewirke. Es e dees bewirking opjsleis, gaon alle verangeringe die na dees versie zien aangebrach verlore.'''",
 'yourdiff'                         => 'Verangeringe',
-'copyrightwarning'                 => "Opgelèt: Alle biedrage aan {{SITENAME}} weure geach te zeen vriegegaeve ónger de $2 (zuug $1 veur details). Wens te neet wils dat dienen teks door angere bewirk en versjpreid weurt, kees dan neet veur 'Pazjena opsjlaon'.<br /> Hiebie belaofs te ós ouch dats te dees teks zelf höbs gesjreve, of höbs euvergenómme oet 'n vriej, openbaar brón.<br /> <strong>GEBROEK GEI MATERIAAL DAT BESJIRMP WEURT DOOR AUTEURSRECH, BEHAUVE WENS TE DAO TOESJTÖMMING VEUR HÖBS!</strong>",
+'copyrightwarning'                 => "Opgelèt: Alle biedrage aan {{SITENAME}} weure geach te zeen vriegegaeve ónger de $2 (zuug $1 veur details). Wens te neet wils dat dienen teks door angere bewirk en versjpreid weurt, kees dan neet veur 'Pazjena opsjlaon'.<br /> Hiebie belaofs te ós ouch dats te dees teks zelf höbs gesjreve, of höbs euvergenómme oet 'n vriej, openbaar brón.<br /> '''GEBROEK GEI MATERIAAL DAT BESJIRMP WEURT DOOR AUTEURSRECH, BEHAUVE WENS TE DAO TOESJTÖMMING VEUR HÖBS!'''",
 'copyrightwarning2'                => "Mèrk op dat alle biedrages aan {{SITENAME}} kinne weure verangerd, aangepas of weggehaold door anger luuj. As te neet wils dat dienen tèks zoemer kint weure aangepas mós te 't hie neet plaatsje.<br />
 De beluifs ós ouch dats te dezen tèks zelf höbs gesjreve, of gekopieerd van 'n brón in 't publiek domein of get vergliekbaars (zuug $1 veur details).
-<strong>HIE GEIN AUTEURSRECHTELIK BESJIRMP WERK ZÓNGER TOESJTUMMING!</strong>",
+'''HIE GEIN AUTEURSRECHTELIK BESJIRMP WERK ZÓNGER TOESJTUMMING!'''",
 'longpagewarning'                  => "WAARSJOEWING: Dees pazjena is $1 kilobytes lank; 'n aantal browsers kint probleme höbbe mit 't verangere van pazjena's in de buurt van of groeter es 32 kB. Kiek ofs te sjtökker van de pazjena mesjiens kins verplaatse nao 'n nuuj pazjena.",
-'longpageerror'                    => "<strong>ERROR: De teks diese höbs toegevoegd haet is $1 kilobyte
-groot, wat groter is dan 't maximum van $2 kilobyte. Opslaon is neet meugelik.</strong>",
+'longpageerror'                    => "'''ERROR: De teks diese höbs toegevoegd haet is $1 kilobyte
+groot, wat groter is dan 't maximum van $2 kilobyte. Opslaon is neet meugelik.'''",
 'readonlywarning'                  => "WAARSJUWING: De database is vasgezèt veur ongerhoud, dus op 't mement kins e dien verangeringe neet opsjlaon. De kins dien tèks 't biste opsjlaon in 'n tèksbesjtand om 't later hie nog es te prebere.",
 'protectedpagewarning'             => 'WAARSJUWING:  Dees pazjena is besjermd zoedat ze allein doer gebroekers mit administratorrechte kint weure verangerd.',
 'semiprotectedpagewarning'         => "'''Let op:''' Deze pagina is beveilig en kin allein door geregistreerde gebroekers bewerk waere.",
 'cascadeprotectedwarning'          => "'''Waarschuwing:''' Deze pagina is beveilig en kin allein door beheerders bewerk waere, omdat deze is opgenaome in de volgende {{PLURAL:$1|pagina|pagina's}} {{PLURAL:$1|dae|die}} beveilig {{PLURAL:$1|is|zeen}} met de cascade-optie:",
-'titleprotectedwarning'            => "<strong>WAORSJUWING: Deze pagina is beveilig zodet allein inkele gebroekers 'm kinne aanmake.</strong>",
+'titleprotectedwarning'            => "'''WAORSJUWING: Deze pagina is beveilig zodet allein inkele gebroekers 'm kinne aanmake.'''",
 'templatesused'                    => 'Sjablone gebroek in dees pazjena:',
 'templatesusedpreview'             => 'Sjablone gebroek in deze veurvertuning:',
 'templatesusedsection'             => 'Sjablone die gebroek waere in deze subkop:',
@@ -653,6 +729,17 @@ De kèns al besjtaonde pazjena's verangere, of de kèns [[Special:UserLogin|dich
 'recreate-deleted-warn'            => "'''Waorsjuwing: Doe bis bezig mit 't aanmake van 'n pazjena die in 't verleje gewis is.'''
 
 Euverwaeg of 't terech is dets te wiejer wèrks aan dees pazjena. Veur dien gemaak stuit hiejónger 't logbook eweggesjafde pazjena's veur dees pazjena:",
+'deleted-notice'                   => "Dees pazjena is eweggesjaf.
+Ter informatie weurt 't verwijderingslogbook van dees pazjena hiejónger weergegeve.",
+'deletelog-fulllog'                => 'Gans logbook betrachte',
+'edit-hook-aborted'                => "De bewèrking is aafgebroke door 'ne 'hook'.
+D'r is gein toelichting besjikbaar.",
+'edit-gone-missing'                => 'De pazjena is neet biegewirk.
+Ze liek eweggesjaf te zien.',
+'edit-conflict'                    => 'Bewirkingsconflik.',
+'edit-no-change'                   => "Dien bewirking is genegeerd, ómdet d'r gein verangering in de teks is gemaak.",
+'edit-already-exists'              => 'De pagina is neet aangemaak.
+Zie besteit al.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Waarschuwing: dees pazjena gebroek te väöl kosbare parserfuncties.
@@ -665,6 +752,8 @@ Sommige sjablone waere neet getranscludeerd.',
 'post-expand-template-argument-warning'   => "Waorsjuwing: dees pazjena bevat teminste eine sjabloonparamaeter mit 'n te groeate transclusiegruudje.
 Dees paramaetere zeen eweggelaote.",
 'post-expand-template-argument-category'  => "Pazjena's die missendje sjabloonillemènter bevatte",
+'parser-template-loop-warning'            => "D'r is 'ne krinkloup in sjablone geconstateerd: [[$1]]",
+'parser-template-recursion-depth-warning' => 'De recursiedeepte veur sjablone is euversjrede ($1)',
 
 # "Undo" feature
 'undo-success' => "Hiej onger stuit de teks wo in de verangering ongedaon gemaak is. Controleer veur 't opslaon of 't resultaot gewins is.",
@@ -679,27 +768,27 @@ Dees paramaetere zeen eweggelaote.",
 De door $3 opgegaeve reje is ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Logbeuk veur dees pazjena tuine',
-'nohistory'           => 'Dees pazjena is nog neet bewirk.',
-'revnotfound'         => 'Wieziging neet gevonge',
-'revnotfoundtext'     => 'De opgevraogde aw versie van dees pazjena is verzjwónde. Kontroleer estebleef de URL dieste gebroek höbs óm nao dees pazjena te gaon.',
-'currentrev'          => 'Hujige versie',
-'revisionasof'        => 'Versie op $1',
-'revision-info'       => 'Versie op $1 door $2',
-'previousrevision'    => '� Awwer versie',
-'nextrevision'        => 'Nuujere versie→',
-'currentrevisionlink' => 'zuug hujige versie',
-'cur'                 => 'hujig',
-'next'                => 'volgende',
-'last'                => 'veurige',
-'page_first'          => 'ierste',
-'page_last'           => 'lèste',
-'histlegend'          => 'Verklaoring aafkortinge: (wijz) = versjil mit actueile versie, (vörrige) = versjil mit vörrige versie, K = kleine verangering',
-'deletedrev'          => '[gewis]',
-'histfirst'           => 'Aajste',
-'histlast'            => 'Nuujste',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(laeg)',
+'viewpagelogs'           => 'Logbeuk veur dees pazjena tuine',
+'nohistory'              => 'Dees pazjena is nog neet bewirk.',
+'currentrev'             => 'Hujige versie',
+'currentrev-asof'        => 'Hujige versie per $1',
+'revisionasof'           => 'Versie op $1',
+'revision-info'          => 'Versie op $1 door $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Awwer versie',
+'nextrevision'           => 'Nuujere versie→',
+'currentrevisionlink'    => 'zuug hujige versie',
+'cur'                    => 'hujig',
+'next'                   => 'volgende',
+'last'                   => 'veurige',
+'page_first'             => 'ierste',
+'page_last'              => 'lèste',
+'histlegend'             => 'Verklaoring aafkortinge: (wijz) = versjil mit actueile versie, (vörrige) = versjil mit vörrige versie, K = kleine verangering',
+'history-fieldset-title' => 'Door de historie blajere',
+'deletedrev'             => '[gewis]',
+'histfirst'              => 'Aajste',
+'histlast'               => 'Nuujste',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(laeg)',
 
 # Revision feed
 'history-feed-title'          => 'Bewerkingseuverzich',
@@ -784,6 +873,7 @@ Wees zeker det deze wieziging de gesjiedenisdoorloupendheid van de pagina zal be
 'mergehistory-invalid-destination' => "De bestömmingspagina mot 'ne geldige titel zeen.",
 'mergehistory-autocomment'         => '[[:$1]] samegevoeg nao [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] samegevoeg nao [[:$2]]: $3',
+'mergehistory-same-destination'    => 'De bronpazjena en doelpazjena kinne neet dezelfde zien',
 
 # Merge log
 'mergelog'           => 'Samevoegingslogbook',
@@ -796,121 +886,204 @@ Wees zeker det deze wieziging de gesjiedenisdoorloupendheid van de pagina zal be
 'difference'              => '(Versjil tösje bewirkinge)',
 'lineno'                  => 'Tekslien $1:',
 'compareselectedversions' => 'Vergeliek geselecteerde versies',
+'visualcomparison'        => 'Visueel vergelieking',
+'wikicodecomparison'      => 'Wikiteksvergelieking',
 'editundo'                => 'ongedaon make',
 'diff-multi'              => '({{PLURAL:$1|éin tusseligkede versie wörd|$1 tusseligkede versies waere}} neet getuund)',
+'diff-movedto'            => 'Verplaats nao $1',
+'diff-styleadded'         => 'stijl $1 biegedoon',
+'diff-added'              => '$1 biegedoon',
+'diff-changedto'          => 'verangerd in $1',
+'diff-movedoutof'         => 'verplaats boete $1',
+'diff-styleremoved'       => 'stijl $1 eweggesjaf',
+'diff-removed'            => '$1 eweggesjaf',
+'diff-changedfrom'        => 'verangerd van $1',
+'diff-src'                => 'brón',
+'diff-withdestination'    => 'mit besjtömming $1',
+'diff-with'               => '&#32;mit $1 $2',
+'diff-with-final'         => '&#32;en $1 $2',
+'diff-width'              => 'breidte',
+'diff-height'             => 'huugde',
+'diff-p'                  => "'n '''paragraaf'''",
+'diff-blockquote'         => "'n '''häökske'''",
+'diff-h1'                 => "'n '''köpke (niveau 1)'''",
+'diff-h2'                 => "'n '''köpke (niveau 2)'''",
+'diff-h3'                 => "'n '''köpke (niveau 3)'''",
+'diff-h4'                 => "'n '''köpke (niveau 4)'''",
+'diff-h5'                 => "'n '''köpke (niveau 5)'''",
+'diff-pre'                => "'n '''veurgeformatteerd teksblok'''",
+'diff-div'                => "'n '''deiling'''",
+'diff-ul'                 => "'n '''óngenómmerde lies'''",
+'diff-ol'                 => "'n '''genómmerde lies'''",
+'diff-li'                 => "'n '''liesóngerdeil'''",
+'diff-table'              => "'n '''tabel'''",
+'diff-tbody'              => "'''tabelinhaud'''",
+'diff-tr'                 => "'n '''riej'''",
+'diff-td'                 => "'n '''cel'''",
+'diff-th'                 => "'ne '''kolomkop'''",
+'diff-br'                 => "'ne '''nuje regel'''",
+'diff-hr'                 => "'n '''horizontaal lien'''",
+'diff-code'               => "'n '''teksblok mit programmacode'''",
+'diff-dl'                 => "'n '''definitielies'''",
+'diff-dt'                 => "'n '''definitieterm'''",
+'diff-dd'                 => "'n '''definitie'''",
+'diff-input'              => "'ne '''input'''",
+'diff-form'               => "'n '''formulier'''",
+'diff-img'                => "n '''plaetje'''",
+'diff-span'               => "'ne '''span'''",
+'diff-a'                  => "'n '''verwiezing'''",
+'diff-i'                  => "'''cursief'''",
+'diff-b'                  => "'''vèt'''",
+'diff-strong'             => "'''sjterk'''",
+'diff-em'                 => "'''naodrök'''",
+'diff-font'               => "'''lèttertype'''",
+'diff-big'                => "'''groet'''",
+'diff-del'                => "'''eweggesjaf'''",
+'diff-tt'                 => "'''vaste breidte'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''doorhaoling'''",
 
 # Search results
-'searchresults'             => 'Zeukresultate',
-'searchresulttext'          => 'Veur mier informatie euver zeuke op {{SITENAME}}, zuug [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Doe zòchs veur '''[[:$1]]'''",
-'searchsubtitleinvalid'     => 'Voor zoekopdracht "$1"',
-'noexactmatch'              => "'''Dao besjteit gein pazjena mit de naam $1.''' De kèns 'm [[:$1|aanmake]].",
-'noexactmatch-nocreate'     => "'''Er besteit gein pagina genaamp \"\$1\".'''",
-'toomanymatches'            => "d'r Wore te väöl resultate. Probeer estebleef  'n anger zeukopdrach.",
-'titlematches'              => 'Overeinkoms mèt volgende titels',
-'notitlematches'            => 'Geen enkele paginatitel gevonden met de opgegeven zoekterm',
-'textmatches'               => 'Euvereinkoms mèt artikelinhoud',
-'notextmatches'             => 'Geen artikel gevonden met opgegeven zoekterm',
-'prevn'                     => 'vörrige $1',
-'nextn'                     => 'volgende $1',
-'viewprevnext'              => '($1) ($2) ($3) bekieke.',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 waord|$2 wäörd}})',
-'search-result-score'       => 'Relevantie: $1%',
-'search-redirect'           => '(doorverwiezing $1)',
-'search-section'            => '(subkop $1)',
-'search-suggest'            => 'Bedoeldese: $1',
-'search-interwiki-caption'  => 'Zösterprojecte',
-'search-interwiki-default'  => '$1 resultate:',
-'search-interwiki-more'     => '(meer)',
-'search-mwsuggest-enabled'  => 'mit suggesties',
-'search-mwsuggest-disabled' => 'gein suggesties',
-'search-relatedarticle'     => 'Gerelateerd',
-'mwsuggest-disable'         => 'Suggesties via AJAX oetsjakele',
-'searchrelated'             => 'gerelateerd',
-'searchall'                 => 'alle',
-'showingresults'            => 'Hieonger staon de <b>$1</b> {{PLURAL:$1|resultaat|resultaat}}, vanaaf #<b>$2</b>.',
-'showingresultsnum'         => "Hieonger {{PLURAL:$3|steit '''1''' resultaat|staon '''$3''' resultate}} vanaaf #<b>$2</b>.",
-'showingresultstotal'       => "Hie onger {{PLURAL:$3|wordt resultaat '''$1'''|waere de resultate '''$1 toet $2''' van '''$3'''}} weergegaeve",
-'nonefound'                 => '<strong>Lèt op:</strong> \'n zeukopdrach kan mislökke door \'t gebroek van (in \'t Ingelsj) väöl veurkómmende wäörd wie "of" en "be", die neet geïndexeerd zint, of door versjillende zeukterme tegeliek op te gaeve (de kries dan allein pazjena\'s te zeen woerin alle opgegaeve terme veurkómme).',
-'powersearch'               => 'Zeuke',
-'powersearch-legend'        => 'Oetgebrèd zeuke',
-'powersearch-ns'            => 'Zeuke in naamruumdes:',
-'powersearch-redir'         => 'Doorverwiezinge waergaeve',
-'powersearch-field'         => 'Zeuk nao',
-'search-external'           => 'Extern zeuke',
-'searchdisabled'            => 'Zeuke op {{SITENAME}} is oetgesjakeld vanweige gebrek aan servercapaciteit.
+'searchresults'                    => 'Zeukresultate',
+'searchresults-title'              => 'Zeukresultate veur "$1"',
+'searchresulttext'                 => 'Veur mier informatie euver zeuke op {{SITENAME}}, zuug [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Doe zeukdes veur \'\'\'[[:$1]]\'\'\' ([[Speciaal:Prefixindex/$1|pagina\'s die beginne mit "$1"]] {{int:pipe-separator}}[[Speciaal:Verwiezinge nao hie/$1|pagina\'s die verwieze nao "$1"]])',
+'searchsubtitleinvalid'            => 'Voor zoekopdracht "$1"',
+'noexactmatch'                     => "'''Dao besjteit gein pazjena mit de naam $1.''' De kèns 'm [[:$1|aanmake]].",
+'noexactmatch-nocreate'            => "'''Er besteit gein pagina genaamp \"\$1\".'''",
+'toomanymatches'                   => "d'r Wore te väöl resultate. Probeer estebleef  'n anger zeukopdrach.",
+'titlematches'                     => 'Overeinkoms mèt volgende titels',
+'notitlematches'                   => 'Geen enkele paginatitel gevonden met de opgegeven zoekterm',
+'textmatches'                      => 'Euvereinkoms mèt artikelinhoud',
+'notextmatches'                    => 'Geen artikel gevonden met opgegeven zoekterm',
+'prevn'                            => 'vörrige $1',
+'nextn'                            => 'volgende $1',
+'viewprevnext'                     => '($1) ($2) ($3) bekieke.',
+'searchmenu-legend'                => 'Zeukopties',
+'searchmenu-exists'                => "* Pagina '''[[$1]]'''",
+'searchmenu-new'                   => "'''De pagina \"[[:\$1]]\" aanmake op deze wiki'''",
+'searchhelp-url'                   => 'Help:Help',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Paginanaome mit dit veurveugsel weergaeve]]',
+'searchprofile-articles'           => "Pazjena's",
+'searchprofile-articles-and-proj'  => "Inhaudelike en projekpagina's",
+'searchprofile-project'            => "Projekpagina's",
+'searchprofile-images'             => 'Besjtandje',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Oetgebreid',
+'searchprofile-articles-tooltip'   => 'Zeuke in $1',
+'searchprofile-project-tooltip'    => 'Zeuke in $1',
+'searchprofile-images-tooltip'     => 'Zeuke naor besjtandje',
+'searchprofile-everything-tooltip' => "Alle inhaud doorzeuke (inklusief euverlèkpagina's)",
+'searchprofile-advanced-tooltip'   => 'Zeuke in aongegeve naamruumdes',
+'prefs-search-nsdefault'           => 'Zeuke mit sjtandaardinsjtèllinge:',
+'prefs-search-nscustom'            => 'Zeuke in aangegaeve naamruumdes:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 waord|$2 wäörd}})',
+'search-result-score'              => 'Relevantie: $1%',
+'search-redirect'                  => '(doorverwiezing $1)',
+'search-section'                   => '(subkop $1)',
+'search-suggest'                   => 'Bedoeldese: $1',
+'search-interwiki-caption'         => 'Zösterprojecte',
+'search-interwiki-default'         => '$1 resultate:',
+'search-interwiki-more'            => '(meer)',
+'search-mwsuggest-enabled'         => 'mit suggesties',
+'search-mwsuggest-disabled'        => 'gein suggesties',
+'search-relatedarticle'            => 'Gerelateerd',
+'mwsuggest-disable'                => 'Suggesties via AJAX oetsjakele',
+'searchrelated'                    => 'gerelateerd',
+'searchall'                        => 'alle',
+'showingresults'                   => 'Hieonger staon de <b>$1</b> {{PLURAL:$1|resultaat|resultaat}}, vanaaf #<b>$2</b>.',
+'showingresultsnum'                => "Hieonger {{PLURAL:$3|steit '''1''' resultaat|staon '''$3''' resultate}} vanaaf #<b>$2</b>.",
+'showingresultstotal'              => "Hiejónger {{PLURAL:$4|waert resultaat '''$1'''|waere de resultate '''$1 tót $2''' van '''$3'''}} weergegaeve",
+'nonefound'                        => "'''Lèt op:''' sjtandaard waere neet alle naamruumdes naogezeuk.
+Wens doe in dien zeukopdrach es veurvoegsel \"''all:''\" gebroeks waere alle pagina's naogezeuk (inclusief euverlèkpagina's, sjablone, enzoewiejer).
+Doe kèns ouch 'n naamruumde es veurvoegsel gebroeke.",
+'search-nonefound'                 => "D'r zien gein resultate veur diene zeukopdrach.",
+'powersearch'                      => 'Zeuke',
+'powersearch-legend'               => 'Oetgebrèd zeuke',
+'powersearch-ns'                   => 'Zeuke in naamruumdes:',
+'powersearch-redir'                => 'Doorverwiezinge waergaeve',
+'powersearch-field'                => 'Zeuk nao',
+'search-external'                  => 'Extern zeuke',
+'searchdisabled'                   => 'Zeuke op {{SITENAME}} is oetgesjakeld vanweige gebrek aan servercapaciteit.
 Zoelang as de servers nog neet sjterk genog zunt kins e zeuke bie Google.
 Mèrk op dat hun indexe van {{SITENAME}} content e bietje gedatierd kint zien.',
 
 # Preferences page
-'preferences'              => 'Veurkäöre',
-'mypreferences'            => 'Mien veurkäöre',
-'prefs-edits'              => 'Aantal bewèrkinge:',
-'prefsnologin'             => 'Neet aangemèld',
-'prefsnologintext'         => 'De mós zeen [[Special:UserLogin|aangemeld]] óm dien veurkäöre te kónne insjtèlle.',
-'prefsreset'               => 'Sjtandaardveurkäöre hersjtèld.',
-'qbsettings'               => 'Menubalkinsjtèllinge',
-'qbsettings-none'          => 'Oetgesjakeld',
-'qbsettings-fixedleft'     => 'Links vas',
-'qbsettings-fixedright'    => 'Rechts vas',
-'qbsettings-floatingleft'  => 'Links zjwevend',
-'qbsettings-floatingright' => 'Rechs zjwevend',
-'changepassword'           => 'Wachwaord verangere',
-'skin'                     => '{{SITENAME}}-uterlik',
-'math'                     => 'Mattemetik rendere',
-'dateformat'               => 'Datumformaat',
-'datedefault'              => 'Gein veurkäör',
-'datetime'                 => 'Datum en tied',
-'math_failure'             => 'Parse misluk',
-'math_unknown_error'       => 'onbekènde fout',
-'math_unknown_function'    => 'onbekènde functie',
-'math_lexing_error'        => 'lexicografische fout',
-'math_syntax_error'        => 'fout vanne syntax',
-'math_image_error'         => 'PNG-conversie is misluk. Gao nao of latex, dvips en gs correc geïnstalleerd zeen en converteer nogmaols',
-'math_bad_tmpdir'          => 'De map veur tiedelike bestenj veur wiskóndige formules bestuit neet of kin neet gemaak waere',
-'math_bad_output'          => 'Kin neet sjrieve nao de output directory veur mattematik',
-'math_notexvc'             => "Kin 't programma texvc neet vinje; stel alles in volges de besjrieving in math/README.",
-'prefs-personal'           => 'Gebroekersinfo',
-'prefs-rc'                 => 'Recènte verangeringe en weergaaf van sjtumpkes',
-'prefs-watchlist'          => 'Volglies',
-'prefs-watchlist-days'     => 'Te tuine daag in de volglies:',
-'prefs-watchlist-edits'    => 'Maximaal aantal bewirkinge in de oetgebreide volglies:',
-'prefs-misc'               => 'Anger insjtèllinge',
-'saveprefs'                => 'Veurkäöre opsjlaon',
-'resetprefs'               => 'Sjtandaardveurkäöre hersjtèlle',
-'oldpassword'              => 'Hujig wachwaord',
-'newpassword'              => 'Nuuj wachwaord',
-'retypenew'                => "Veur 't nuuj wachwaord nogins in",
-'textboxsize'              => 'Aafmeitinge tèksveld',
-'rows'                     => 'Regels',
-'columns'                  => 'Kolomme',
-'searchresultshead'        => 'Insjtèllinge veur zeukresultate',
-'resultsperpage'           => 'Aantal te toene zeukresultate per pazjena',
-'contextlines'             => 'Aantal reigels per gevónje pazjena',
-'contextchars'             => 'Aantal teikes van de conteks per reigel',
-'stub-threshold'           => 'Drempel veur markering <a href="#" class="stub">begske</a>:',
-'recentchangesdays'        => 'Aantal daag te tuine in de recènte verangeringe:',
-'recentchangescount'       => 'Aantal titels in lies recènte verangeringe',
-'savedprefs'               => 'Dien veurkäöre zint opgesjlage.',
-'timezonelegend'           => 'Tiedzone',
-'timezonetext'             => "¹'t Aantal oere dat diene lokale tied versjilt van de servertied (UTC).",
-'localtime'                => 'Plaotsjelike tied',
-'timezoneoffset'           => 'tiedsverschil',
-'servertime'               => 'Server tied is noe',
-'guesstimezone'            => 'Invulle van browser',
-'allowemail'               => 'E-mail van anger gebroekers toesjtaon',
-'prefs-searchoptions'      => 'Zeukinstellinge',
-'prefs-namespaces'         => 'Naamruimte',
-'defaultns'                => 'Zeuk sjtandaard in dees naomruumdes:',
-'default'                  => 'sjtandaard',
-'files'                    => 'Bestenj',
+'preferences'               => 'Veurkäöre',
+'mypreferences'             => 'Mien veurkäöre',
+'prefs-edits'               => 'Aantal bewèrkinge:',
+'prefsnologin'              => 'Neet aangemèld',
+'prefsnologintext'          => 'De mós zeen [[Special:UserLogin|aangemeld]] óm dien veurkäöre te kónne insjtèlle.',
+'prefsreset'                => 'Sjtandaardveurkäöre hersjtèld.',
+'qbsettings'                => 'Menubalkinsjtèllinge',
+'qbsettings-none'           => 'Oetgesjakeld',
+'qbsettings-fixedleft'      => 'Links vas',
+'qbsettings-fixedright'     => 'Rechts vas',
+'qbsettings-floatingleft'   => 'Links zjwevend',
+'qbsettings-floatingright'  => 'Rechs zjwevend',
+'changepassword'            => 'Wachwaord verangere',
+'skin'                      => '{{SITENAME}}-uterlik',
+'skin-preview'              => 'Veurbesjouwing',
+'math'                      => 'Mattemetik rendere',
+'dateformat'                => 'Datumformaat',
+'datedefault'               => 'Gein veurkäör',
+'datetime'                  => 'Datum en tied',
+'math_failure'              => 'Parse misluk',
+'math_unknown_error'        => 'onbekènde fout',
+'math_unknown_function'     => 'onbekènde functie',
+'math_lexing_error'         => 'lexicografische fout',
+'math_syntax_error'         => 'fout vanne syntax',
+'math_image_error'          => 'PNG-conversie is misluk. Gao nao of latex, dvips en gs correc geïnstalleerd zeen en converteer nogmaols',
+'math_bad_tmpdir'           => 'De map veur tiedelike bestenj veur wiskóndige formules bestuit neet of kin neet gemaak waere',
+'math_bad_output'           => 'Kin neet sjrieve nao de output directory veur mattematik',
+'math_notexvc'              => "Kin 't programma texvc neet vinje; stel alles in volges de besjrieving in math/README.",
+'prefs-personal'            => 'Gebroekersinfo',
+'prefs-rc'                  => 'Recènte verangeringe en weergaaf van sjtumpkes',
+'prefs-watchlist'           => 'Volglies',
+'prefs-watchlist-days'      => 'Te tuine daag in de volglies:',
+'prefs-watchlist-days-max'  => '(maximaal 7 daag)',
+'prefs-watchlist-edits'     => 'Maximaal aantal bewirkinge in de oetgebreide volglies:',
+'prefs-watchlist-edits-max' => '(maximaal aantal: 1000)',
+'prefs-misc'                => 'Anger insjtèllinge',
+'prefs-resetpass'           => 'Wachwaord wiezige',
+'saveprefs'                 => 'Veurkäöre opsjlaon',
+'resetprefs'                => 'Sjtandaardveurkäöre hersjtèlle',
+'textboxsize'               => 'Aafmeitinge tèksveld',
+'prefs-edit-boxsize'        => "Aafmetinge van 't bewirkingsvinster.",
+'rows'                      => 'Regels',
+'columns'                   => 'Kolomme',
+'searchresultshead'         => 'Insjtèllinge veur zeukresultate',
+'resultsperpage'            => 'Aantal te toene zeukresultate per pazjena',
+'contextlines'              => 'Aantal reigels per gevónje pazjena',
+'contextchars'              => 'Aantal teikes van de conteks per reigel',
+'stub-threshold'            => 'Drempel veur markering <a href="#" class="stub">begske</a>:',
+'recentchangesdays'         => 'Aantal daag te tuine in de recènte verangeringe:',
+'recentchangesdays-max'     => '(maximaal $1 {{PLURAL:$1|daag|daag}})',
+'recentchangescount'        => 'Aantal titels in lies recènte verangeringe',
+'savedprefs'                => 'Dien veurkäöre zint opgesjlage.',
+'timezonelegend'            => 'Tiedzone',
+'timezonetext'              => "¹'t Aantal oere dat diene lokale tied versjilt van de servertied (UTC).",
+'localtime'                 => 'Plaatselike tied',
+'timezoneselect'            => 'Tiedzone:',
+'timezoneuseserverdefault'  => 'Gebroek servertied',
+'timezoneuseoffset'         => 'Angers (gaef tiedversjil)',
+'timezoneoffset'            => 'Tiedsversjil¹:',
+'servertime'                => 'Server tied:',
+'guesstimezone'             => 'Invulle van browser',
+'allowemail'                => 'E-mail van anger gebroekers toesjtaon',
+'prefs-searchoptions'       => 'Zeukinstellinge',
+'prefs-namespaces'          => 'Naamruimte',
+'defaultns'                 => 'Zeuk sjtandaard in dees naomruumdes:',
+'default'                   => 'sjtandaard',
+'files'                     => 'Bestenj',
 
 # User rights
 'userrights'                  => 'Gebroekersrechtebeheer', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Beheer gebroekersgróppe',
 'userrights-user-editname'    => "Veur 'ne gebroekersnaam in:",
 'editusergroup'               => 'Bewirk gebroekersgróppe',
-'editinguser'                 => "Bezig mit bewèrke van 't gebroekersrech van '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Bezig mit bewèrke van 't gebroekersrech van '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Bewirk gebroekersgróppe',
 'saveusergroups'              => 'Gebroekersgróppe opsjlaon',
 'userrights-groupsmember'     => 'Leed van:',
@@ -959,6 +1132,7 @@ Mèrk op dat hun indexe van {{SITENAME}} content e bietje gedatierd kint zien.',
 'right-minoredit'            => 'Bewerkinge markere as klein',
 'right-move'                 => "Pagina's hernaome",
 'right-move-subpages'        => "Pagina's inclusief subpagina's verplaatse",
+'right-move-rootuserpages'   => "Gebroekerspazjena's van 't hoegste niveau herneume",
 'right-suppressredirect'     => "Een doorverwijzing op de doelpagina verwijdere bie 't hernaome van 'n pagina",
 'right-upload'               => 'Bestande uploade',
 'right-reupload'             => "'n bestaond bestand euversjrieve",
@@ -1009,9 +1183,37 @@ Mèrk op dat hun indexe van {{SITENAME}} content e bietje gedatierd kint zien.',
 'rightslogentry' => 'wiezigde de gebroekersrechte veur $1 van $2 nao $3',
 'rightsnone'     => '(gein)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'               => 'dees pazjena te bekieke',
+'action-edit'               => 'dees pazjena te bewirke',
+'action-createpage'         => "pazjena's aan te make",
+'action-createtalk'         => "euverlèkpazjena's aan te make",
+'action-createaccount'      => 'deze gebroeker aan te make',
+'action-minoredit'          => 'deze bewirking es klein te markere',
+'action-move'               => 'deze pazjena te herneume',
+'action-move-subpages'      => "deze pazjena en biebehurende subpazjena's te herneume",
+'action-move-rootuserpages' => "gebroekerspazjena's van 't hoegste niveau te herneume",
+'action-upload'             => 'dit besjtandj te uploade',
+'action-reupload'           => 'dit besjtaond besjtandj te euversjrieve',
+'action-reupload-shared'    => "dit besjtandj te uploade, terwiel d'r al 'n besjtandj mèt dezelfde naam in de gedeilde repository sjteit",
+'action-upload_by_url'      => "dit besjtandj vanaaf 'ne URL te uploade",
+'action-writeapi'           => 'via de API te bewirke',
+'action-delete'             => 'dees pazjena eweg te sjaffe',
+'action-deleterevision'     => 'dees versie eweg te sjaffe',
+'action-deletedhistory'     => 'de eweggesjafte versies van dees pazjena te betrachte',
+'action-browsearchive'      => "eweggesjafte pazjena's te zeuke",
+'action-undelete'           => 'dees pagina trökplaatse',
+'action-suppressrevision'   => 'dees verborge versie betrachte en trök plaatse',
+'action-suppressionlog'     => 'dit besjirmp logbook betrachte',
+'action-block'              => "deze gebroeker 'n bewirkingsblokkaad op lèkge",
+'action-protect'            => "'t beveiligingsniveau van dees pagina aan passe",
+'action-import'             => "dees pagina van 'n angere wiki importere",
+'action-importupload'       => "dees pagina van 'n besjtandsupload importere",
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|bewerking|bewerkinge}}',
 'recentchanges'                     => 'Lètste verangeringe',
+'recentchanges-legend'              => 'Opties veur recènte verangeringe',
 'recentchangestext'                 => 'op dees pazjena kins doe de recènte verangeringe in deze wiki betrachte.',
 'recentchanges-feed-description'    => 'Volg de meis recente bewerkinge in deze wiki via deze feed.',
 'rcnote'                            => "Hiejónger {{PLURAL:$1|steit de lètste bewirking|staon de lètste '''$1''' bewirkinge}} van de aafgeloupe {{PLURAL:$2|daag|'''$2''' daag}}, op $4, um $5.",
@@ -1025,7 +1227,7 @@ Mèrk op dat hun indexe van {{SITENAME}} content e bietje gedatierd kint zien.',
 'rcshowhidemine'                    => '$1 mien bewirkinge',
 'rclinks'                           => 'Bekiek de $1 lètste verangeringe van de aafgeloupe $2 daag.<br />$3',
 'diff'                              => 'vers',
-'hist'                              => 'gesj',
+'hist'                              => 'hist',
 'hide'                              => 'Versjtaek',
 'show'                              => 'Tuin',
 'minoreditletter'                   => 'K',
@@ -1035,6 +1237,8 @@ Mèrk op dat hun indexe van {{SITENAME}} content e bietje gedatierd kint zien.',
 'rc_categories'                     => 'Tuun allein categorië (sjèt mit \'ne "|")',
 'rc_categories_any'                 => 'Iddere',
 'newsectionsummary'                 => '/* $1 */ nuje subkop',
+'rc-enhanced-expand'                => 'Details weergaeve (JavaScript verplich)',
+'rc-enhanced-hide'                  => 'Details verberge',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Volg links',
@@ -1054,12 +1258,12 @@ Mèrk op dat hun indexe van {{SITENAME}} content e bietje gedatierd kint zien.',
 'upload_directory_read_only'  => 'De webserver kin neet sjrieve in de uploadmap ($1).',
 'uploaderror'                 => "fout in 't uploade",
 'uploadtext'                  => "Gebroek 't óngersjtaonde formuleer óm besjtande op te laje.
-Óm ierder opgelaje besjtande te bekieke of te zeuke, gank nao de [[Special:ImageList|lies van opgelaje besjtande]].
+Óm ierder opgelaje besjtande te bekieke of te zeuke, gank nao de [[Special:FileList|lies van opgelaje besjtande]].
 Uploads en verwiederinge waere ouch biegehauwte in 't [[Special:Log/upload|uploadlogbook]].
 
 Gebroek óm 'n plaetje of 'n besjtand in 'n pazjena op te numme 'ne link in de vörm:
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Besjtand.jpg]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Besjtand.png|alternatief teks]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Besjtand.jpg]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Besjtand.png|alternatief teks]]</nowiki>'''
 of veur mediabesjtande:
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Besjtand.ogg]]</nowiki>'''
 
@@ -1088,19 +1292,19 @@ De letste link is bedoeld veur mediabestenj die gein aafbeilding zeen.",
 'large-file'                  => 'Aanbeveling: maak bestenj neet groter dan $1, dit bestand is $2.',
 'largefileserver'             => "'t Bestandj is groter dan de instelling van de server toestuit.",
 'emptyfile'                   => "'t Besjtand wats re höbs geupload is laeg. Dit kump waorsjienliek door 'n typfout in de besjtandsnaom. Kiek estebleef ofs te dit besjtand wirkelik wils uploade.",
-'fileexists'                  => "D'r is al e besjtand mit dees naam, bekiek <strong><tt>$1</tt></strong> of se dat besjtand mesjien wils vervange.",
-'filepageexists'              => "De besjrievingspazjena veur dit bestandj besjteit al op <strong><tt>$1</tt></strong>, meh d'r besjteit gein bestandj mit deze naam. De samevatting dies te höbs opgegaeve zal neet op de besjrievingspazjena versjiene. Bewirk de pazjena handjmaotig óm dien besjrieving dao te tuine.",
+'fileexists'                  => "D'r is al e besjtand mit dees naam, bekiek '''<tt>$1</tt>''' of se dat besjtand mesjien wils vervange.",
+'filepageexists'              => "De besjrievingspazjena veur dit bestandj besjteit al op '''<tt>$1</tt>''', meh d'r besjteit gein bestandj mit deze naam. De samevatting dies te höbs opgegaeve zal neet op de besjrievingspazjena versjiene. Bewirk de pazjena handjmaotig óm dien besjrieving dao te tuine.",
 'fileexists-extension'        => "'n bestand met dezelfde naam bestuit al:<br />
-Naam van 't geüploade bestand: <strong><tt>$1</tt></strong><br />
-Naam van 't bestaonde bestand: <strong><tt>$2</tt></strong><br />
+Naam van 't geüploade bestand: '''<tt>$1</tt>'''<br />
+Naam van 't bestaonde bestand: '''<tt>$2</tt>'''<br />
 Lèver 'ne angere naam te keze.",
 'fileexists-thumb'            => "<center>'''Bestaonde afbeilding'''</center>",
-'fileexists-thumbnail-yes'    => "'t Liek 'n afbeilding van 'n verkleinde grootte te zeen <i>(thumbnail)</i>. Lèver 't bestand <strong><tt>$1</tt></strong> te controlere.<br />
+'fileexists-thumbnail-yes'    => "'t Liek 'n afbeilding van 'n verkleinde grootte te zeen ''(thumbnail)''. Lèver 't bestand '''<tt>$1</tt>''' te controlere.<br />
 Es 't gecontroleerde bestand dezelfde afbeilding van oorspronkelike grootte is, is 't neet noodzakelik 'ne extra thumbnail te uploade.",
-'file-thumbnail-no'           => "De bestandsnaam begint met <strong><tt>$1</tt></strong>. 't Liek 'n verkleinde afbeelding te zeen <i>(thumbnail)</i>. Esse deze afbeelding in volledige resolutie höbs, upload dae afbeelding dan. Wiezig anges estebleef de bestandsnaam.",
+'file-thumbnail-no'           => "De bestandsnaam begint met '''<tt>$1</tt>'''. 't Liek 'n verkleinde afbeelding te zeen ''(thumbnail)''. Esse deze afbeelding in volledige resolutie höbs, upload dae afbeelding dan. Wiezig anges estebleef de bestandsnaam.",
 'fileexists-forbidden'        => "d'r Bestuit al 'n bestand met deze naam. Upload dien bestand onger 'ne angere naam.
-[[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => "d'r Bestuit al 'n bestand met deze naam bie de gedeilde bestenj. Upload 't bestand onger  'ne angere naam. [[Image:$1|thumb|center|$1]]",
+[[File:$1|thumb|center|$1]]",
+'fileexists-shared-forbidden' => "d'r Bestuit al 'n bestand met deze naam bie de gedeilde bestenj. Upload 't bestand onger  'ne angere naam. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => "Dit besjtandj is identiek aon {{PLURAL:$1|'t volgende besjtandj|de volgende besjtande}}:",
 'successfulupload'            => 'De upload is geluk',
 'uploadwarning'               => 'Upload waarsjuwing',
@@ -1121,7 +1325,7 @@ Es 't gecontroleerde bestand dezelfde afbeilding van oorspronkelike grootte is,
 
 Lèver zeker te zeen detse gesjik bös om door te gaon met 't uploade van dit bestand.
 't verwiederingslogbook van dit bestand kinse hiej zeen:",
-'filename-bad-prefix'         => "De naam van 't bestand detse aan 't uploade bös begint met <strong>\"\$1\"</strong>, wat 'ne neet-besjrievende naam is dae meestal automatisch door 'ne digitale camera wörd gegaeve. Kees estebleef 'ne dudelike naam veur dien bestand.",
+'filename-bad-prefix'         => "De naam van 't bestand detse aan 't uploade bös begint met '''\"\$1\"''', wat 'ne neet-besjrievende naam is dae meestal automatisch door 'ne digitale camera wörd gegaeve. Kees estebleef 'ne dudelike naam veur dien bestand.",
 
 'upload-proto-error'      => 'Verkeerd protocol',
 'upload-proto-error-text' => "Uploads via deze methode vereise URL's die beginne met <code>http://</code> of <code>ftp://</code>.",
@@ -1142,20 +1346,20 @@ Lèver zeker te zeen detse gesjik bös om door te gaon met 't uploade van dit be
 'upload_source_url'  => " ('ne geldige, publiek toegankelike URL)",
 'upload_source_file' => " ('n bestand op diene computer)",
 
-# Special:ImageList
-'imagelist-summary'     => "Op dees speciaal pazjena zeen alle toegevoogde bestenj te bekieke.
+# Special:ListFiles
+'listfiles-summary'     => "Op dees speciaal pazjena zeen alle toegevoogde bestenj te bekieke.
 Standerd waere de lets toegevoogde bestenj baovenaan de lies weergegaeve.
 Klikke op 'ne kolomkop verangert de sortering.",
-'imagelist_search_for'  => 'Zeuk nao bestandj:',
+'listfiles_search_for'  => 'Zeuk nao bestandj:',
 'imgfile'               => 'bestandj',
-'imagelist'             => 'Lies van aafbeildinge',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Naom',
-'imagelist_user'        => 'Gebroeker',
-'imagelist_size'        => 'Gruutde (bytes)',
-'imagelist_description' => 'Besjrieving',
-
-# Image description page
+'listfiles'             => 'Lies van aafbeildinge',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Naom',
+'listfiles_user'        => 'Gebroeker',
+'listfiles_size'        => 'Gruutde (bytes)',
+'listfiles_description' => 'Besjrieving',
+
+# File description page
 'filehist'                       => 'Bestandsgesjiedenis',
 'filehist-help'                  => "Klik op 'ne datum/tied om 't besjtandj te zeen wie 't destieds waor.",
 'filehist-deleteall'             => 'wis alles',
@@ -1163,11 +1367,13 @@ Klikke op 'ne kolomkop verangert de sortering.",
 'filehist-revert'                => 'trökdrèjje',
 'filehist-current'               => 'hujig',
 'filehist-datetime'              => 'Datum/tiejd',
+'filehist-thumb'                 => 'Miniatuurplaetje',
+'filehist-thumbtext'             => 'Miniatuurplaetje veur versie per $1',
 'filehist-user'                  => 'Gebroeker',
 'filehist-dimensions'            => 'Aafmaetinge',
 'filehist-filesize'              => 'Besjtandjgruutde',
 'filehist-comment'               => 'Opmirking',
-'imagelinks'                     => 'Aafbeildingsverwiezinge',
+'imagelinks'                     => 'Besjtandjsverwiezinge',
 'linkstoimage'                   => "Dit besjtandj weurt op de volgende {{PLURAL:$1|pazjena|pazjena's}} gebroek:",
 'nolinkstoimage'                 => 'Gein enkele pazjena gebroek dees aafbeilding.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Mier verwijzinge]] naor dit bestaand bekèèke.',
@@ -1207,7 +1413,6 @@ Klikke op 'ne kolomkop verangert de sortering.",
 'filedelete-success-old'      => '<span class="plainlinks">De versie van \'\'\'[[Media:$1|$1]]\'\'\' van $3, $2 is gewis.</span>',
 'filedelete-nofile'           => "'''$1''' bestuit neet op {{SITENAME}}.",
 'filedelete-nofile-old'       => "d'r is geine versie van '''$1''' in 't archief met de aangegaeve eigensjappe.",
-'filedelete-iscurrent'        => "Doe probeers de nuujste versie van dit bestand te wisse. Plaats aub 'n aajere versie truuk.",
 'filedelete-otherreason'      => 'Angere/additionele ree:',
 'filedelete-reason-otherlist' => 'Angere ree',
 'filedelete-reason-dropdown'  => '*Väölveurkómmende ree veur wisse
@@ -1241,19 +1446,10 @@ Klikke op 'ne kolomkop verangert de sortering.",
 'randomredirect-nopages' => "d'r zeen gein redirects in deze naamruumde.",
 
 # Statistics
-'statistics'             => 'Sjtattestieke',
-'sitestats'              => 'Sjtatistieke euver {{SITENAME}}',
-'userstats'              => 'Stattestieke euver gebroekers',
-'sitestatstext'          => "D'r {{PLURAL:\$1|is|zeen}} in totaal '''\$1''' {{PLURAL:\$1|pazjena|pazjena's}} in de database.
-Dit is inclusief \"euverlik\"-pazjena's, pazjena's euver {{SITENAME}}, extreem korte \"sjtumpkes\", redirects, en anger pazjena's die waarsjienlik neet as inhoud mote waere getèld. {{PLURAL:\$2|d'r Is waorsjienlik meh ein pazjena mit echte content|'t Aantal pazjena's mit content weurt gesjat op '''\$2'''}}.
-
-D'r {{PLURAL:\$8|is|zeen}} '''\$8''' {{PLURAL:\$8|bestandj|bestenj}} opgelaje.
-
-D'r is in totaal '''\$3''' {{PLURAL:\$3|kieër|kieër}} 'n pazjena bekeke en '''\$4''' {{PLURAL:\$4|kieër|kieër}} 'n pazjena bewirk sins de wiki is opgezat. Dat geuf e gemiddelde van '''\$5''' bewirkinge per pazjena en '''\$6''' getuinde pazjena's per bewirking.
-
-De lengde van de [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] is '''\$7'''.",
-'userstatstext'          => "D'r {{PLURAL:$1|is eine geregistreerde gebroeker|zeen '''$1''' geregistreerde gebroekers}}; '''$2''' (of '''$4''') hievan {{PLURAL:$2|is syteemwèrker|zeen systeemwèrkers}} ($5rech).",
-'statistics-mostpopular' => "Meisbekeke pazjena's",
+'statistics'              => 'Sjtattestieke',
+'statistics-header-users' => 'Stattestieke euver gebroekers',
+'statistics-pages-desc'   => "Alle pagina's in de wiki, inclusief euverlèkpagina's, doorverwiezinge, enz.",
+'statistics-mostpopular'  => "Meisbekeke pazjena's",
 
 'disambiguations'      => "Verdudelikingspazjena's",
 'disambiguationspage'  => 'Template:Verdudeliking',
@@ -1298,14 +1494,13 @@ Op eder raegel vings te de ierste redirectpazjena, de twiede redirectpazjena en
 'popularpages'            => 'Populaire artikels',
 'wantedcategories'        => 'Gewunsjde categorieë',
 'wantedpages'             => "Gewunsjde pazjena's",
-'missingfiles'            => 'Neet-bestaonde bestenj mit verwiezinge',
 'mostlinked'              => "Meis gelinkde pazjena's",
 'mostlinkedcategories'    => 'Meis-gelinkde categorië',
 'mostlinkedtemplates'     => 'Meis-gebroekde sjablone',
 'mostcategories'          => 'Artikele mit de meiste kategorieë',
 'mostimages'              => 'Meis gelinkde aafbeildinge',
 'mostrevisions'           => 'Artikele mit de meiste bewirkinge',
-'prefixindex'             => 'Prefixindex',
+'prefixindex'             => "Alle pagina's op veurvoegsel",
 'shortpages'              => 'Korte artikele',
 'longpages'               => 'Lang artikele',
 'deadendpages'            => "Doedloupende pazjena's",
@@ -1344,8 +1539,6 @@ Op eder raegel vings te de ierste redirectpazjena, de twiede redirectpazjena en
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Logbeuk',
 'all-logs-page'        => 'Alle logbeuk',
-'log-search-legend'    => 'Zeuk logbeuk',
-'log-search-submit'    => "Zeuk d'rs door",
 'alllogstext'          => "Dit is 't gecombineerd logbook. De kins ouch 'n bepaald logbook keze, of filtere op gebroekersnaam of  pazjena.",
 'logempty'             => "d'r Zeen gein regels in 't logbook die voldaon aan deze criteria.",
 'log-title-wildcard'   => "Zeuk pagina's die met deze naam beginne",
@@ -1356,6 +1549,7 @@ Op eder raegel vings te de ierste redirectpazjena, de twiede redirectpazjena en
 'nextpage'          => 'Volgende pazjena ($1)',
 'prevpage'          => 'Vörge pazjena ($1)',
 'allpagesfrom'      => "Tuin pazjena's vanaaf:",
+'allpagesto'        => "Pagina's betrachte tot:",
 'allarticles'       => 'Alle artikele',
 'allinnamespace'    => "Alle pazjena's (naamruumde $1)",
 'allnotinnamespace' => "Alle pazjena's (neet in naamruumde $1)",
@@ -1373,11 +1567,31 @@ Op eder raegel vings te de ierste redirectpazjena, de twiede redirectpazjena en
 'special-categories-sort-count' => 'op aantal sortere',
 'special-categories-sort-abc'   => 'alfabetisch sortere',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Gewisde gebroekersbiedrage',
+
+# Special:LinkSearch
+'linksearch'       => 'Extern verwiezinge',
+'linksearch-pat'   => 'Zeukpatroon:',
+'linksearch-ns'    => 'Naamruumde:',
+'linksearch-ok'    => 'Zeuk',
+'linksearch-text'  => 'Wildcards wie "*.wikipedia.org" of "*.org" zeen toegestaon.<br />Supported protocols: <tt>$1</tt>',
+'linksearch-line'  => '$1 gelink vanaaf $2',
+'linksearch-error' => 'Wildcards zijn alleen toegestaan aan het begin van een hostnaam.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Tuun gebroekers vanaaf:',
 'listusers-submit'   => 'Tuun',
 'listusers-noresult' => 'Gein(e) gebroeker(s) gevonje.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logbook nuuj gebroekers',
+'newuserlogpagetext'          => 'Hiej ónger saton de nuuj ingesjreve gebroekers.',
+'newuserlog-byemail'          => 'wachwaord is versjik per e-mail',
+'newuserlog-create-entry'     => "is 'ne nuje gebroeker",
+'newuserlog-create2-entry'    => 'haet de gebroeker [[$1]] aangemaak',
+'newuserlog-autocreate-entry' => 'Gebroeker automatisch aangemaak',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Rechte van gebroekersgróppe',
 'listgrouprights-summary'  => 'Op dees pazjena sjtaon de gebroekersgróppe in deze wiki besjreve, mit zien biebehurende rechte.
@@ -1440,12 +1654,7 @@ Ouch versjiene gevolgde pazjena\'s in \'t <b>vèt</b> in de [[Special:RecentChan
 'iteminvalidname'      => "Probleem mit object '$1', ongeljige naam...",
 'wlnote'               => "Hieonger {{PLURAL:$1|steit de lètste verangering|staon de lètste $1 verangeringe}} van {{PLURAL:$2|'t lètse oer|de lètste <b>$2</b> oer}}.",
 'wlshowlast'           => 'Tuin lètste $1 ore $2 daag $3',
-'watchlist-show-bots'  => 'Tuun bots',
-'watchlist-hide-bots'  => 'Verberg bots',
-'watchlist-show-own'   => 'Tuun mien bewerkinge',
-'watchlist-hide-own'   => 'Verberg mien bewerkinge',
-'watchlist-show-minor' => 'Tuun kleine bewerkinge',
-'watchlist-hide-minor' => 'Verberg kleine bewerkinge',
+'watchlist-options'    => 'Opties veur volglies',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Bezig mit plaatse op de volglies...',
@@ -1484,48 +1693,52 @@ Dao zalle bie volgende verangeringe gein nuuj berichte kómme tenzies te dees pa
 Commentaar en wiejer assistentie:
 {{fullurl:Help:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Pazjena wisse',
-'confirm'                     => 'Bevèstig',
-'excontent'                   => "inhawd waor: '$1'",
-'excontentauthor'             => "inhawd waor: '$1' (aangemaak door [[Special:Contributions/$2|$2]])",
-'exbeforeblank'               => "inhawd veur 't wisse waor: '$1'",
-'exblank'                     => 'pazjena waor laeg',
-'delete-confirm'              => '"$1" wisse',
-'delete-legend'               => 'Wisse',
-'historywarning'              => 'Waorsjuwing: de pazjena daese wils wisse haet meerdere versies:',
-'confirmdeletetext'           => "De sjteis op 't punt 'n pazjena of e plaetje veur ummer te wisse. Dit haolt allen inhawd en historie oet de database eweg. Bevèstig hieónger dat dit welzeker dien bedoeling is, dats te de gevolge begrieps.",
-'actioncomplete'              => 'Actie voltoeid',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" is gewis. Zuug $2 vuur \'n euverzich van recèntelik gewisde pazjena\'s.',
-'deletedarticle'              => '"[[$1]]" is eweggesjaf',
-'suppressedarticle'           => 'haet "[[$1]]" verborge',
-'dellogpage'                  => 'Wislogbook',
-'dellogpagetext'              => "Hie volg 'n lies van de meis recèntelik gewisde pazjena's en plaetjes.",
-'deletionlog'                 => 'Wislogbook',
-'reverted'                    => 'Iedere versie hersjtèld',
-'deletecomment'               => 'Rae veur wisactie',
-'deleteotherreason'           => 'Angere/eventuele ree:',
-'deletereasonotherlist'       => 'Angere ree',
-'deletereason-dropdown'       => '*Väölveurkommende wisree
+# Delete
+'deletepage'             => 'Pazjena wisse',
+'confirm'                => 'Bevèstig',
+'excontent'              => "inhawd waor: '$1'",
+'excontentauthor'        => "inhawd waor: '$1' (aangemaak door [[Special:Contributions/$2|$2]])",
+'exbeforeblank'          => "inhawd veur 't wisse waor: '$1'",
+'exblank'                => 'pazjena waor laeg',
+'delete-confirm'         => '"$1" wisse',
+'delete-legend'          => 'Wisse',
+'historywarning'         => 'Waorsjuwing: de pazjena daese wils wisse haet meerdere versies:',
+'confirmdeletetext'      => "De sjteis op 't punt 'n pazjena of e plaetje veur ummer te wisse. Dit haolt allen inhawd en historie oet de database eweg. Bevèstig hieónger dat dit welzeker dien bedoeling is, dats te de gevolge begrieps.",
+'actioncomplete'         => 'Actie voltoeid',
+'deletedtext'            => '"<nowiki>$1</nowiki>" is gewis. Zuug $2 vuur \'n euverzich van recèntelik gewisde pazjena\'s.',
+'deletedarticle'         => '"[[$1]]" is eweggesjaf',
+'suppressedarticle'      => 'haet "[[$1]]" verborge',
+'dellogpage'             => 'Wislogbook',
+'dellogpagetext'         => "Hie volg 'n lies van de meis recèntelik gewisde pazjena's en plaetjes.",
+'deletionlog'            => 'Wislogbook',
+'reverted'               => 'Iedere versie hersjtèld',
+'deletecomment'          => 'Rae veur wisactie',
+'deleteotherreason'      => 'Angere/eventuele ree:',
+'deletereasonotherlist'  => 'Angere ree',
+'deletereason-dropdown'  => '*Väölveurkommende wisree
 ** Op aanvraog van auteur
 ** Sjending van auteursrech
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Reeje veur verwiedering bewèrke',
-'delete-toobig'               => "Dees pazjena haet 'ne lange bewerkingsgesjiedenis, mieë es $1 versies. 't Wisse van dit saort pazjena's is mit rech beperk óm 't próngelök versteure van de werking van {{SITENAME}} te veurkómme.",
-'delete-warning-toobig'       => "Dees pazjena haet 'ne lange bewerkingsgesjiedenis, mieë es $1 versies. 't Wisse van dees pazjena kan de werking van de database van {{SITENAME}} versteure. Bön veurzichtig.",
-'rollback'                    => 'Verangering ongedaon gemaak',
-'rollback_short'              => 'Trökdrèjje',
-'rollbacklink'                => 'Trökdrieje',
-'rollbackfailed'              => 'Ongedaon make van wieziginge mislùk.',
-'cantrollback'                => 'Trökdrejje van verangeringe neet meugelik: Dit artikel haet mer einen auteur.',
-'alreadyrolled'               => "'t Is neet meugelik óm de lèste verangering van [[$1]] door [[User:$2|$2]] ([[User talk:$2|euverlik]]) óngedaon te make.
+'delete-edit-reasonlist' => 'Reeje veur verwiedering bewèrke',
+'delete-toobig'          => "Dees pazjena haet 'ne lange bewerkingsgesjiedenis, mieë es $1 versies. 't Wisse van dit saort pazjena's is mit rech beperk óm 't próngelök versteure van de werking van {{SITENAME}} te veurkómme.",
+'delete-warning-toobig'  => "Dees pazjena haet 'ne lange bewerkingsgesjiedenis, mieë es $1 versies. 't Wisse van dees pazjena kan de werking van de database van {{SITENAME}} versteure. Bön veurzichtig.",
+
+# Rollback
+'rollback'         => 'Verangering ongedaon gemaak',
+'rollback_short'   => 'Trökdrèjje',
+'rollbacklink'     => 'Trökdrieje',
+'rollbackfailed'   => 'Ongedaon make van wieziginge mislùk.',
+'cantrollback'     => 'Trökdrejje van verangeringe neet meugelik: Dit artikel haet mer einen auteur.',
+'alreadyrolled'    => "'t Is neet meugelik óm de lèste verangering van [[$1]] door [[User:$2|$2]] ([[User talk:$2|euverlik]]) óngedaon te make.
 Emes angers haet de pazjena al hersjtèld of haet 'n anger bewèrking gedaon.
 
 De lèste bewèrking is gedaon door [[User:$3|$3]] ([[User talk:$3|euverlik]]).",
-'editcomment'                 => '\'t Bewirkingscommentair waor: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Wieziginge door [[Special:Contributions/$2|$2]] ([[User_talk:$2|Euverlik]]) trukgedriejd tot de lètste versie door [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Wieziginge door $1 trökgedrèjd; letste versie van $2 hersteld.',
-'sessionfailure'              => "d'r Liek 'n probleem te zeen mit dien aanmelsessie. Diene hanjeling is gestop oet veurzorg taenge 'n beveiligingsrisico (det bestuit oet meugelik \"hijacking\"(euverkape) van deze sessie). Gao 'n pazjena trök, laaj die pazjena opnuuj en probeer 't nog ins.",
+'editcomment'      => "'t Bewirkingscommentair waor: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Wieziginge door [[Special:Contributions/$2|$2]] ([[User_talk:$2|Euverlik]]) trukgedriejd tot de lètste versie door [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Wieziginge door $1 trökgedrèjd; letste versie van $2 hersteld.',
+'sessionfailure'   => "d'r Liek 'n probleem te zeen mit dien aanmelsessie. Diene hanjeling is gestop oet veurzorg taenge 'n beveiligingsrisico (det bestuit oet meugelik \"hijacking\"(euverkape) van deze sessie). Gao 'n pazjena trök, laaj die pazjena opnuuj en probeer 't nog ins.",
+
+# Protect
 'protectlogpage'              => "Logbook besjermde pazjena's",
 'protectlogtext'              => "Hiej onger staon pazjena's die recèntelik beveilig zeen, of wo van de beveiliging is opgeheve.
 Zuug de [[Special:ProtectedPages|lies mit beveiligde pazjena's]] veur alle hujige beveiligde pazjena's.",
@@ -1533,28 +1746,30 @@ Zuug de [[Special:ProtectedPages|lies mit beveiligde pazjena's]] veur alle hujig
 'modifiedarticleprotection'   => 'verangerde beveiligingsniveau van "[[$1]]"',
 'unprotectedarticle'          => 'besjerming van $1 opgeheve',
 'protect-title'               => 'Besjerme van "$1"',
+'prot_1movedto2'              => '[[$1]] verplaats nao [[$2]]',
 'protect-legend'              => 'Bevèstig besjerme',
 'protectcomment'              => 'Rede veur besjerming',
 'protectexpiry'               => 'Verlöp:',
 'protect_expiry_invalid'      => "De pazjena's aangegaeve verloup is ongeldig.",
 'protect_expiry_old'          => "De pazjena verlöp in 't verleje.",
 'protect-unchain'             => 'Maak verplaatse meugelik',
-'protect-text'                => "Hiej kinse 't beveiligingsniveau veur de pazjena <strong><nowiki>$1</nowiki></strong> bekieke en wiezige.",
+'protect-text'                => "Hiej kinse 't beveiligingsniveau veur de pazjena '''<nowiki>$1</nowiki>''' bekieke en wiezige.",
 'protect-locked-blocked'      => "De kèns 't beveiligingsniveau neet verangere terwiels te geblokkeerd bis.
-Hie zeen de hujige insjtèllinge veur de pazjena <strong>[[$1]]</strong>:",
+Hie zeen de hujige insjtèllinge veur de pazjena '''[[$1]]''':",
 'protect-locked-dblock'       => "'t Beveiligingsniveau kin neet waere gewiezig ómdet de database geslaote is.
-Hiej zeen de hujige instellinge veur de pazjena <strong>[[$1]]</strong>:",
+Hiej zeen de hujige instellinge veur de pazjena '''[[$1]]''':",
 'protect-locked-access'       => "'''Diene gebroeker haet gein rechte om 't beveiligingsniveau te wiezige.'''
-Dit zeen de hujige instellinge veur de pazjena <strong>[[$1]]</strong>:",
+Dit zeen de hujige instellinge veur de pazjena '''[[$1]]''':",
 'protect-cascadeon'           => "Deze pazjena is beveilig ómdet d'r in de volgende {{PLURAL:$1|pazjena|pazjena's}} is opgenaome, {{PLURAL:$1|dae|die}} beveilig {{PLURAL:$1|is|zeen}} mit de kaskaad-opsie. 't Beveiligingsniveau wiezige haet gein inkel effèk.",
-'protect-default'             => '(sjtandaard)',
+'protect-default'             => 'Toesjtoon veur alle gebroekers',
 'protect-fallback'            => 'Rech "$1" is neudig',
-'protect-level-autoconfirmed' => 'Allein geregistreerde gebroekers',
+'protect-level-autoconfirmed' => 'Blokkere veur nuuj en anoniem gebroekers',
 'protect-level-sysop'         => 'Allein systeemwèrkers',
 'protect-summary-cascade'     => 'kaskaad',
 'protect-expiring'            => 'verlöp op $1',
 'protect-cascade'             => "Kaskaadbeveiliging - beveilig alle pazjena's en sjablone die in deze pazjena opgenaome zeen (let op; dit kin grote gevolge höbbe).",
 'protect-cantedit'            => "De kèns 't beveiligingsniveau van dees pazjena neet verangere, ómdets te gein rech höbs det te bewirke.",
+'protect-expiry-options'      => '2 oer:2 hours,1 daag:1 day,3 daag:3 days,1 waek:1 week,2 waek:2 weeks,1 maondj:1 month,3 maondj:3 months,6 maondj:6 months,1 jaor:1 year,veur iwweg:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Rech:',
 'restriction-level'           => 'Bepèrkingsniveau:',
 'minimum-size'                => 'Min. gruutde',
@@ -1620,13 +1835,14 @@ $1",
 'blanknamespace' => '(huidnaamruumde)',
 
 # Contributions
-'contributions' => 'Biedrages per gebroeker',
-'mycontris'     => 'Mien biedrages',
-'contribsub2'   => 'Veur $1 ($2)',
-'nocontribs'    => 'Gein wijzigingen gevonden die aan de gestelde criteria voldoen.',
-'uctop'         => '(lèste verangering)',
-'month'         => 'Van maond (en ierder):',
-'year'          => 'Van jaor (en ierder):',
+'contributions'       => 'Biedrages per gebroeker',
+'contributions-title' => 'Biedrage van $1',
+'mycontris'           => 'Mien biedrages',
+'contribsub2'         => 'Veur $1 ($2)',
+'nocontribs'          => 'Gein wijzigingen gevonden die aan de gestelde criteria voldoen.',
+'uctop'               => '(lèste verangering)',
+'month'               => 'Van maond (en ierder):',
+'year'                => 'Van jaor (en ierder):',
 
 'sp-contributions-newbies'     => 'Tuun allein de bijdrages van nuuje gebroekers',
 'sp-contributions-newbies-sub' => 'Veur nuujelinge',
@@ -1636,10 +1852,9 @@ $1",
 'sp-contributions-submit'      => 'Zeuk/tuun',
 
 # What links here
-'whatlinkshere'            => 'Links nao dees pazjena',
+'whatlinkshere'            => 'Links nao dees pagina',
 'whatlinkshere-title'      => 'Pazjena\'s die verwieze nao "$1"',
 'whatlinkshere-page'       => 'Pazjena:',
-'linklistsub'              => '(lies van verwiezinge)',
 'linkshere'                => "De volgende pazjena's verwieze nao '''[[:$1]]''':",
 'nolinkshere'              => "D'r zint gein pazjena's mit links nao '''[[:$1]]''' haer.",
 'nolinkshere-ns'           => "Geine inkele pazjena link nao '''[[:$1]]''' in de gekaoze naamruumde.",
@@ -1712,6 +1927,7 @@ Zuug de [[Special:IPBlockList|lies van geblokkeerde IP-adresse]].',
 'ipblocklist-no-results'          => 'Dit IP-adres of deze gebroekersnaam is neet geblokkeerd.',
 'blocklink'                       => 'Blokkeer',
 'unblocklink'                     => 'deblokkere',
+'change-blocklink'                => 'blokkaasj verangere',
 'contribslink'                    => 'biedrages',
 'autoblocker'                     => 'Ómdets te \'n IP-adres deils mit "$1" (geblokkeerd mit raeje "$2") bis te automatisch geblokkeerd.',
 'blocklogpage'                    => 'Blokkeerlogbook',
@@ -1764,6 +1980,8 @@ Vergaet neet de database opnuuj te [[Special:UnlockDB|deblokkere]] wens te klaor
 * es al 'n euverlèkpazjena besjteit ónger de angere naam
 * es doe 't óngersjtaond vekske neet aanvinks",
 'movearticle'             => 'Verplaats pazjena',
+'movenologin'             => 'Neet aangemèld',
+'movenologintext'         => "Veur 't verplaatsje van 'n pazjena mos e zien [[Special:UserLogin|aangemèld]].",
 'movenotallowed'          => "De kèns gein pazjena's verplaatse.",
 'newtitle'                => 'Nao de nuje titel',
 'move-watch'              => 'Volg deze pazjena',
@@ -1794,11 +2012,11 @@ De doeltitel "[[:$1]]" besjteit al. Wils te dit artikel wisse óm ruumde te make
 'delete_and_move_confirm' => 'Jao, wis de pazjena',
 'delete_and_move_reason'  => 'Gewis óm artikel te kónne verplaatse',
 'selfmove'                => "De kèns 'n pazjena neet verplaatse nao dezelfde paginanaam.",
-'immobile_namespace'      => "De gewinsde paginanaam is van 'n speciaal type. 'ne Pazjena kin neet hernömp waere nao die naamruumde.",
 'imagenocrossnamespace'   => "'n Mediabestand kin neet nao 'n anger naamruumde verplaats waere",
 'imagetypemismatch'       => "De nuje bestandjsextensie is neet gliek aan 't bestandjstype.",
 'imageinvalidfilename'    => 'De nuje bestandsnaam is ongeldig',
 'fix-double-redirects'    => 'Alle doorverwiezinge biewerke die verwieze nao de originele paginanaam',
+'move-leave-redirect'     => "'n Doorverwiezing achterlaote",
 
 # Export
 'export'            => "Exporteer pazjena's",
@@ -1806,7 +2024,7 @@ De doeltitel "[[:$1]]" besjteit al. Wils te dit artikel wisse óm ruumde te make
 
 Gaef in 't óngersjtaonde veldj de name van de te exportere pazjena's op, ein pazjena per regel, en gaef aan ofs te alle versies mit de bewerkingssamevatting of allein de hujige versies mit de bewirkingssamevatting wils exportere.
 
-In 't letste geval kèns te ouch 'ne link gebroeken, bieveurbild [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] veur de pazjena \"[[{{MediaWiki:Mainpage}}]]\".",
+In 't letste geval kèns te ouch 'ne link gebroeken, bieveurbild [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] veur de pazjena \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Allein de letste versie, neet de volledige gesjiedenis',
 'exportnohistory'   => "----
 '''Let op:''' 't exportere van de ganse gesjiedenis is oetgezat waeges prestatieree.",
@@ -1844,6 +2062,7 @@ Alle transwiki-importhanjelinge waere opgeslage in 't [[Special:Log/import|impor
 'import-interwiki-history'   => 'Volledige gesjiedenis van deze pazjena ouch kopiëre',
 'import-interwiki-submit'    => 'Importere',
 'import-interwiki-namespace' => 'Pazjena in de volgende naamruumde plaatse:',
+'import-comment'             => 'Opmèrking:',
 'importtext'                 => 'Gebroek de functie Special:Export in de wiki wo de informatie vanaaf kömp, slao de oetveur op dien eige systeem op, en voeg dae dao nao hiej toe.',
 'importstart'                => "Pazjena's aan 't importere ...",
 'import-revision-count'      => '$1 {{PLURAL:$1|versie|versies}}',
@@ -1876,21 +2095,21 @@ Alle transwiki-importhanjelinge waere opgeslage in 't [[Special:Log/import|impor
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|versie|versies}} van $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mien gebroekerspazjena',
+'tooltip-pt-userpage'             => 'Dien gebroekerspagina',
 'tooltip-pt-anonuserpage'         => 'De gebroekerspazjena veur dit IP adres',
-'tooltip-pt-mytalk'               => 'Mien euverlèkpazjena',
+'tooltip-pt-mytalk'               => 'Dien euverlèkpagina',
 'tooltip-pt-anontalk'             => 'Euverlèk euver verangeringe doer dit IP addres',
 'tooltip-pt-preferences'          => 'Mien veurkäöre',
 'tooltip-pt-watchlist'            => "De lies van gevolgde pazjena's.",
-'tooltip-pt-mycontris'            => 'Liest van mien biedraag',
-'tooltip-pt-login'                => "De weurs aangemodigd om in te logge, meh 't is neet verplich.",
+'tooltip-pt-mycontris'            => 'Lies van dien biedraag',
+'tooltip-pt-login'                => "De weurs aangemeudig om in te logge, meh 't is neet verplich.",
 'tooltip-pt-anonlogin'            => 'De weurs aangemodigd om in te logge, meh t is neet verplich.',
 'tooltip-pt-logout'               => 'Aafmèlde',
 'tooltip-ca-talk'                 => 'Euverlèk euver dit artikel',
-'tooltip-ca-edit'                 => 'De kins dees pazjena verangere.',
-'tooltip-ca-addsection'           => 'Opmirking toevoge aan dees discussie.',
+'tooltip-ca-edit'                 => 'De kins dees pagina verangere.',
+'tooltip-ca-addsection'           => "Begin 'n nuuj sectie",
 'tooltip-ca-viewsource'           => 'Dees pazjena is besjirmp. De kins häör brontèks bekieke.',
-'tooltip-ca-history'              => 'Auw versies van dees pazjena.',
+'tooltip-ca-history'              => 'Auw versies van dees pagina.',
 'tooltip-ca-protect'              => 'Besjirm dees pazjena',
 'tooltip-ca-delete'               => 'Sjaf dees pazjena eweg',
 'tooltip-ca-undelete'             => 'Hersjtèl de verangeringe van dees pazjena van veurdat ze gewist woerd',
@@ -1898,29 +2117,29 @@ Alle transwiki-importhanjelinge waere opgeslage in 't [[Special:Log/import|impor
 'tooltip-ca-watch'                => 'Dees pazjena toeveuge aan volgliest',
 'tooltip-ca-unwatch'              => 'Dees pazjena van volgliest aafhaole',
 'tooltip-search'                  => 'Doorzeuk {{SITENAME}}',
-'tooltip-search-go'               => "Gao nao 'ne pazjena mit dezelfde naam es d'r bestuit",
-'tooltip-search-fulltext'         => "Zeuk de pazjena's veur dees teks",
+'tooltip-search-go'               => "Gank nao 'n pagina mit dezelfde naam es die besteit",
+'tooltip-search-fulltext'         => "Zeuk de pagina's veur dees teks",
 'tooltip-p-logo'                  => 'Veurblaad',
 'tooltip-n-mainpage'              => "Bezeuk 't veurblaad",
-'tooltip-n-portal'                => "Euver 't projèk, was e kins doon, woe se dinger kins vinge",
+'tooltip-n-portal'                => "Euver 't projèk, waat se kins doon, woe se dinger kins vinge",
 'tooltip-n-currentevents'         => "Achtergrondinfo van 't nuuis",
 'tooltip-n-recentchanges'         => 'De lies van recènte verangeringe in de wiki.',
-'tooltip-n-randompage'            => "Laaj 'n willekäörige pazjena",
+'tooltip-n-randompage'            => "Laaj 'n willekäörige pagina",
 'tooltip-n-help'                  => 'De plek om informatie euver dit projèk te vinge.',
-'tooltip-t-whatlinkshere'         => "Lies van alle wikipazjena's die hieheen linke",
-'tooltip-t-recentchangeslinked'   => "Recènte verangeringe in pazjena's woeheen gelink weurd",
+'tooltip-t-whatlinkshere'         => "Lies van alle wikipagina's die hiehaer linke",
+'tooltip-t-recentchangeslinked'   => "Recènte verangeringe in pagina's woehaer dees pagina verwis",
 'tooltip-feed-rss'                => 'RSS feed veur dees pazjena',
 'tooltip-feed-atom'               => 'Atom feed veur dees pazjena',
 'tooltip-t-contributions'         => 'Bekiek de lies van contributies van dizze gebroeker',
 'tooltip-t-emailuser'             => 'Sjtuur inne mail noa dizze gebroeker',
 'tooltip-t-upload'                => 'Upload plaetsjes of media besjtande',
-'tooltip-t-specialpages'          => "Lies van alle speciaal pazjena's",
-'tooltip-t-print'                 => 'Printvruntjelike versie van deze pagina',
-'tooltip-t-permalink'             => 'Permanente link nao deze versie van de pagina',
-'tooltip-ca-nstab-main'           => 'Bekiek de pazjena',
+'tooltip-t-specialpages'          => "Lies van alle speciaal pagina's",
+'tooltip-t-print'                 => 'Printvruntelike versie van deze pagina',
+'tooltip-t-permalink'             => 'Permanente link nao dees versie van de pagina',
+'tooltip-ca-nstab-main'           => 'Betrach de pagina',
 'tooltip-ca-nstab-user'           => 'Bekiek de gebroekerspazjena',
 'tooltip-ca-nstab-media'          => 'Bekiek de mediapazjena',
-'tooltip-ca-nstab-special'        => 'Dit is n speciaal pazjena, de kins dees pazjena neet zelf editte.',
+'tooltip-ca-nstab-special'        => "Dit is 'n speciaal pagina, de kins dees pagina zelf neet bewirke",
 'tooltip-ca-nstab-project'        => 'Bekiek de projèkpazjena',
 'tooltip-ca-nstab-image'          => 'Bekiek de besjtandjspazjena',
 'tooltip-ca-nstab-mediawiki'      => 'Bekiek t systeimberich',
@@ -1935,6 +2154,9 @@ Alle transwiki-importhanjelinge waere opgeslage in 't [[Special:Log/import|impor
 'tooltip-watch'                   => 'Voog dees pazjena toe aan dien volglies',
 'tooltip-recreate'                => 'Maak deze pagina opnuuj aan ondanks irdere verwiedering',
 'tooltip-upload'                  => 'Uploade',
+'tooltip-rollback'                => 'Mit "trökdrieje" drejs doe mit ein klik de bewirking(e) trök van de lètste gebroeker dee dees pagina haet bewirk.',
+'tooltip-undo'                    => 'Mit "óngedaon make" drejs te dees bewirking trök en koms te in \'t bewirkingsvinster.
+Doe kens in de bewirkingssamevatting \'n reej opgaeve.',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF metadata is oetgesjakeld op deze server.',
@@ -1967,6 +2189,11 @@ Alle transwiki-importhanjelinge waere opgeslage in 't [[Special:Log/import|impor
 'numauthors'     => 'Aantal sjrievers (pagina): $1',
 'numtalkauthors' => 'Aantal versjilende auteurs (euverlikpagina): $1',
 
+# Skin names
+'skinname-standard'    => 'Standaard',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Keuls blauw',
+
 # Math options
 'mw_math_png'    => 'Ummer PNG rendere',
 'mw_math_simple' => 'HTML in erg simpele gevalle en angesj PNG',
@@ -2018,7 +2245,7 @@ $1",
 'show-big-image'       => 'Vol resolutie',
 'show-big-image-thumb' => '<small>Gruutde van deze afbeilding: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Nuuj plaetjes',
 'imagelisttext'         => "Hie volg 'n lies mit $1 {{PLURAL:$1|aafbeilding|aafbeildinge}} geordend $2.",
 'newimages-summary'     => 'Op dees speciaal pazjena waere de meis recènt toegevoogde bestenj weergegaeve.',
@@ -2366,21 +2593,9 @@ $1
 Bevèsteg estebleef dats te dees pazjena ech obbenuujts wils make.",
 'recreate'            => 'Pazjena obbenuujts make',
 
-# HTML dump
-'redirectingto' => "Aan 't doorverwieze nao [[:$1]]...",
-
 # action=purge
-'confirm_purge'        => 'Wils te de buffer vaan dees paas wisse?
-
-$1',
 'confirm_purge_button' => 'ok',
-
-# AJAX search
-'searchcontaining' => "Zeuk nao pazjena's die ''$1'' bevatte.",
-'searchnamed'      => "Zeuk nao pazjena's mit de naam ''$1''.",
-'articletitles'    => "Pazjena's die mit ''$1'' beginne",
-'hideresults'      => 'Versjtaek resultate',
-'useajaxsearch'    => 'AJAX-zeuke gebroeke',
+'confirm-purge-top'    => 'Wils te de buffer vaan dees paas wisse?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� veurige pazjena',
@@ -2473,13 +2688,13 @@ De kèns ouch [[Special:Watchlist/edit|'t sjtanderd bewirkingssjirm gebroeke]]."
 'filepath-submit'  => 'Zeuk',
 'filepath-summary' => "Dees speciaal pazjena guf 't vollejig paad veur 'n bestandj. Aafbeildinge waere in häör vollejige resolutie getoeandj. Anger bestandjstypes waere drèk in 't mit 't MIME-type verbónje programma geäöpendj.
 
-Veur de bestandjsnaam in zónger 't veurvoegsel \"{{ns:image}}:\".",
+Veur de bestandjsnaam in zónger 't veurvoegsel \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Zeuk veur döbbelbestaondje bestenj',
 'fileduplicatesearch-summary'  => 'Zeuk veur döbbel bestaondje bestenj op basis van zien hashwaarde.
 
-Gaef de bestandjsnaam zónger \'t "{{ns:image}}:" veurvoogsel.',
+Gaef de bestandjsnaam zónger \'t "{{ns:file}}:" veurvoogsel.',
 'fileduplicatesearch-legend'   => "Zeuk veur 'ne döbbele",
 'fileduplicatesearch-filename' => 'Bestandjsnaam:',
 'fileduplicatesearch-submit'   => 'Zeuk',
@@ -2488,7 +2703,7 @@ Gaef de bestandjsnaam zónger \'t "{{ns:image}}:" veurvoogsel.',
 'fileduplicatesearch-result-n' => '\'t Bestandj "$1" haet {{PLURAL:$2|1 identieke döbbelversie|$2 identiek döbbelversies}}.',
 
 # Special:SpecialPages
-'specialpages'                   => "Speciaal pazjena's",
+'specialpages'                   => "Speciaal pagina's",
 'specialpages-note'              => '----
 * Normale speciale pagina\'s
 * <span class="mw-specialpagerestricted">Beperk toegankelijke speciale pagina\'s</span>',
diff --git a/languages/messages/MessagesLij.php b/languages/messages/MessagesLij.php
index 7ce23006..2a488926 100644
--- a/languages/messages/MessagesLij.php
+++ b/languages/messages/MessagesLij.php
@@ -13,6 +13,112 @@
 
 $fallback = 'it';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Speçiale',
+	NS_TALK             => 'Discûscion',
+	NS_USER             => 'Utente',
+	NS_USER_TALK        => 'Discûscioîn_ûtente',
+	NS_PROJECT_TALK     => 'Discûscioîn_$1',
+	NS_FILE             => 'Immaggine',
+	NS_FILE_TALK        => 'Discûscioîn_immaggine',
+	NS_MEDIAWIKI_TALK   => 'Discûscioîn_MediaWiki',
+	NS_TEMPLATE_TALK    => 'Discûscioîn_template',
+	NS_HELP             => 'Agiûtto',
+	NS_HELP_TALK        => 'Discûscioîn_agiûtto',
+	NS_CATEGORY         => 'Categorîa',
+	NS_CATEGORY_TALK    => 'Discûscioîn_categorîa',
+);
+
+$namespaceAliases = array(
+	'Speciale' => NS_SPECIAL,
+	'Discussione' => NS_TALK,
+	'Discussioni_utente' => NS_USER_TALK,
+	'Discussioni_$1' => NS_PROJECT_TALK,
+	'Immagine' => NS_FILE,
+	'Discussioni_immagine' => NS_FILE_TALK,
+	'Discussioni_MediaWiki' => NS_MEDIAWIKI_TALK,
+	'Discussioni_template' => NS_TEMPLATE_TALK,
+	'Aiuto' => NS_HELP,
+	'Discussioni_aiuto' => NS_HELP_TALK,
+	'Categoria' => NS_CATEGORY,
+	'Discussioni_categoria' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'Intra', 'Registrate' ),
+	'Userlogout'                => array( 'Sciorti' ),
+	'Preferences'               => array( 'Preferense' ),
+	'Watchlist'                 => array( 'Osservæ speçiali' ),
+	'Recentchanges'             => array( 'Ûrtime modiffiche' ),
+	'Upload'                    => array( 'Carrega' ),
+	'Listfiles'                 => array( 'Immaggini' ),
+	'Newimages'                 => array( 'Immaggini reçenti' ),
+	'Listusers'                 => array( 'Utenti' ),
+	'Statistics'                => array( 'Statistighe' ),
+	'Randompage'                => array( 'Paggina a brettio' ),
+	'Lonelypages'               => array( 'Paggine orfane' ),
+	'Uncategorizedpages'        => array( 'Paggine sensa categorîa' ),
+	'Uncategorizedcategories'   => array( 'Categorîe sensa categorîa' ),
+	'Uncategorizedimages'       => array( 'Immaggini sensa categorîa' ),
+	'Uncategorizedtemplates'    => array( 'Template sensa categorîa' ),
+	'Unusedcategories'          => array( 'Categorîe sensa ûso' ),
+	'Unusedimages'              => array( 'Immaggini sensa ûso' ),
+	'Wantedpages'               => array( 'Paggine domandæ' ),
+	'Wantedcategories'          => array( 'Categorîe domandæ' ),
+	'Mostlinked'                => array( 'Paggine ciû domandæ' ),
+	'Mostlinkedcategories'      => array( 'Categorîe ciû domandæ' ),
+	'Mostlinkedtemplates'       => array( 'Template ciû domandæ' ),
+	'Mostcategories'            => array( 'Paggine con ciû categorîe' ),
+	'Mostimages'                => array( 'Immaggini ciû domandæ' ),
+	'Mostrevisions'             => array( 'Paggine con ciû revixoîn' ),
+	'Fewestrevisions'           => array( 'Paggine con meno revixoîn' ),
+	'Shortpages'                => array( 'Paggine ciû cûrte' ),
+	'Longpages'                 => array( 'Paggine ciû longhe' ),
+	'Newpages'                  => array( 'Paggine ciû reçenti' ),
+	'Ancientpages'              => array( 'Paggine meno reçenti' ),
+	'Deadendpages'              => array( 'Paggine sensa sciortîa' ),
+	'Protectedpages'            => array( 'Paggine protezûe' ),
+	'Protectedtitles'           => array( 'Tittoli protezûi' ),
+	'Allpages'                  => array( 'Tûtte e paggine' ),
+	'Prefixindex'               => array( 'Prefisci' ),
+	'Ipblocklist'               => array( 'IP bloccæ' ),
+	'Specialpages'              => array( 'Paggine speçiali' ),
+	'Contributions'             => array( 'Contribûti' ),
+	'Emailuser'                 => array( 'Mandighe \'n\'e-mail' ),
+	'Confirmemail'              => array( 'Comferma l\'e-mail' ),
+	'Whatlinkshere'             => array( 'Cose appunta chì' ),
+	'Recentchangeslinked'       => array( 'Modiffiche correlæ' ),
+	'Movepage'                  => array( 'Sposta' ),
+	'Blockme'                   => array( 'BloccaProxy' ),
+	'Booksources'               => array( 'RiçercaISBN' ),
+	'Categories'                => array( 'Categorîe' ),
+	'Export'                    => array( 'Esporta' ),
+	'Version'                   => array( 'Verscion' ),
+	'Allmessages'               => array( 'Messaggi' ),
+	'Log'                       => array( 'Registri', 'Registro' ),
+	'Blockip'                   => array( 'Blocca' ),
+	'Import'                    => array( 'Importa' ),
+	'Lockdb'                    => array( 'BloccaDB' ),
+	'Unlockdb'                  => array( 'SbloccaDB' ),
+	'Userrights'                => array( 'Permissi utente' ),
+	'MIMEsearch'                => array( 'RiçercaMIME' ),
+	'Unwatchedpages'            => array( 'Paggine no osservæ' ),
+	'Listredirects'             => array( 'Rediression' ),
+	'Revisiondelete'            => array( 'Scassa revixon' ),
+	'Unusedtemplates'           => array( 'Template sensa ûso' ),
+	'Randomredirect'            => array( 'Rediression a brettio' ),
+	'Mypage'                    => array( 'Mæ Paggina Utente' ),
+	'Mytalk'                    => array( 'Mæ Discûscioîn' ),
+	'Mycontributions'           => array( 'Mæ Contribûti' ),
+	'Listadmins'                => array( 'Amministratoî' ),
+	'Listbots'                  => array( 'Bot' ),
+	'Popularpages'              => array( 'Paggine ciû viscitæ' ),
+	'Search'                    => array( 'Riçerca', 'Çerca' ),
+	'Resetpass'                 => array( 'Rimposta paròlla d\'ordine' ),
+	'Withoutinterwiki'          => array( 'Sensa Interwiki' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'            => 'Sottolineâ i collegamenti',
@@ -29,8 +135,6 @@ $messages = array(
 'underline-always' => 'Sempre',
 'underline-never'  => 'Mâi',
 
-'skinpreview' => '(Anteprimma)',
-
 # Dates
 'sunday'        => 'Domenega',
 'monday'        => 'Lunedì',
@@ -109,7 +213,7 @@ $messages = array(
 'mytalk'         => 'Mæ discuscioin',
 'anontalk'       => 'Discuscion pe questo indirisso IP',
 'navigation'     => 'Navegaçion',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 'errorpagetitle'    => 'Errô',
 'returnto'          => 'Tornâ a $1.',
@@ -159,8 +263,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Informaçioin in scia {{SITENAME}}',
 'aboutpage'            => 'Project:Informassioîn',
-'bugreports'           => 'Danni',
-'bugreportspage'       => 'Project:Danni',
 'copyright'            => 'O contegnûo o se peu trovâ a $1.',
 'copyrightpagename'    => "Diritti d'autô de {{SITENAME}}",
 'copyrightpage'        => "{{ns:project}}:Diritti d'autô",
@@ -181,8 +283,6 @@ $messages = array(
 
 'badaccess'        => "No ti g'hæ o permisso",
 'badaccess-group0' => "No ti g'hæ o permisso pe fâ quest'assion.",
-'badaccess-group1' => "L'assion che ti vêu fâ a l'è permissa solo a i ûtenti de ûn di grûppi $1.",
-'badaccess-group2' => "L'assion che ti vêu fâ a l'è permissa solo a i ûtenti de ûn di grûppi $1.",
 'badaccess-groups' => "L'assion che ti vêu fâ a l'è permissa solo a i ûtenti de ûn di grûppi $1.",
 
 'ok'                      => "D'accòrdio",
@@ -301,6 +401,7 @@ Pe abilitâ l'invîo de messaggi e-mail pe quest'accesso, o se deive seguî l'is
 # Password reset dialog
 'resetpass'           => 'Reverti a pòula segretta',
 'resetpass_header'    => 'Reverti a pòula segretta',
+'retypenew'           => "Ripette a nêuva paròlla d'ordine:",
 'resetpass_forbidden' => "E paròlle d'ordine no se pêuan cangiâ in {{SITENAME}}",
 
 # Edit page toolbar
@@ -326,8 +427,8 @@ Pe abilitâ l'invîo de messaggi e-mail pe quest'accesso, o se deive seguî l'is
 'hr_tip'          => 'Linnia orissontâ',
 
 # Edit pages
-'summary'                => 'Oggetto',
-'subject'                => 'Argomento (tittolo)',
+'summary'                => 'Oggetto:',
+'subject'                => 'Argomento (tittolo):',
 'minoredit'              => 'Cangiamento minô (m)',
 'watchthis'              => 'Azzonze a-i osservæ speçiâli',
 'savearticle'            => 'Sârva a pagina',
@@ -335,7 +436,7 @@ Pe abilitâ l'invîo de messaggi e-mail pe quest'accesso, o se deive seguî l'is
 'showpreview'            => "Veddi l'anteprimma",
 'showdiff'               => 'Veddi i cangiamenti',
 'anoneditwarning'        => "'''Attension:''' No ti t'hæ registròu. O têu indirisso IP o sajà misso inta stöja di cangiamenti da paggina.",
-'summary-preview'        => 'Anteprimma oggetto',
+'summary-preview'        => 'Anteprimma oggetto:',
 'blockedtitle'           => "L'utente o l'é bloccòu",
 'blockedtext'            => "<big>''''Sto nomme d'ûtente ou indirisso IP o l'è stæto bloccòu.'''</big>
 
@@ -378,7 +479,7 @@ Se o se vêu creâ a paggina òua, o se pêu comensâ a scrive o testo into spas
 
 Se o s'ha intròu inte 'sto collegamento pe sbàllio, o basta sciaccâ '''Inderrê''' (Indietro) into navigatô.",
 'noarticletext'          => "Inte 'sto momento a paggina çercâa a l'è vêua. O l'è poscibbile [[Special:Search/{{PAGENAME}}|çercâ 'sto tittolo]] inte âtre paggine do scîto oppûre [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificâ a paggina òua].",
-'previewnote'            => "<strong>Questa chì a l'è solo 'n'anteprimma; i cangiamenti no son ancon stæti sarvæ!</strong>",
+'previewnote'            => "'''Questa chì a l'è solo 'n'anteprimma; i cangiamenti no son ancon stæti sarvæ!'''",
 'editing'                => 'Modiffica de $1',
 'editingsection'         => 'Modiffica de $1 (session)',
 'yourtext'               => 'O teu testo',
@@ -386,9 +487,9 @@ Se o s'ha intròu inte 'sto collegamento pe sbàllio, o basta sciaccâ '''Inderr
 'copyrightwarning'       => "Nota: Tùtte e contribuçioìn a {{SITENAME}} van conscideræ comme rilasciæ drento a-i termini da licensa d'ûso $2 (veddi $1 pe savéine de ciù).
 Se no ti veu che i testi teu pêuan esse modificæ da quarchedùn sensa limitaçioìn, no mandâli a {{SITENAME}}.<br />
 Inviando o testo ti diciâri, sott'a teu responsabilitæ, ch'o l'é stæto scrîto da ti personalmente oppure ch'o l'é stæto piggiòu da 'na fonte de pùbrico domìnio òu anàlogamente lìbea.<br />
-<strong>NO INVIÂ MATERIÂLE COVERTO DA DRÎTI D'AUTÔ SENSA OUTORIZAÇION!</strong>",
-'longpagewarning'        => "<strong>ATTENSION: 'Sta paggina chì a g'ha $1 kilobyte; çerti browser porieivan avei di problemmi inta modiffica de-e paggine che s'avvixinn-an o che ecceddan i 32 kB.
-Pe piaxei conscidera l'opportûnitæ de soddividde a paggina in sessioîn ciû piccinn-e.</strong>",
+'''NO INVIÂ MATERIÂLE COVERTO DA DRÎTI D'AUTÔ SENSA OUTORIZAÇION!'''",
+'longpagewarning'        => "'''ATTENSION: 'Sta paggina chì a g'ha $1 kilobyte; çerti browser porieivan avei di problemmi inta modiffica de-e paggine che s'avvixinn-an o che ecceddan i 32 kB.
+Pe piaxei conscidera l'opportûnitæ de soddividde a paggina in sessioîn ciû piccinn-e.'''",
 'templatesused'          => "Template dêuviæ inte 'sta paggina:",
 'templatesusedpreview'   => "Template dêuviæ inte 'st'anteprimma:",
 'template-protected'     => '(protezûo)',
@@ -410,7 +511,7 @@ A razon dæta a l'è ''$2''",
 'viewpagelogs'        => "Veddi i log relativi a 'sta paggina.",
 'currentrev'          => 'Verscion attuâle',
 'revisionasof'        => 'Verscion do $1',
-'revision-info'       => 'Verscion do $1, outô: $2',
+'revision-info'       => 'Verscion do $1, outô: $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Verscion meno reçente',
 'nextrevision'        => 'Revixon ciû nêuva →',
 'currentrevisionlink' => 'Ûrtima revixon',
@@ -446,16 +547,17 @@ Leggenda: (corr) = differense co-a verscion corrente, (prec) = differense co-a v
 'prevn'                 => 'Preçedenti $1',
 'nextn'                 => 'Proscima $1',
 'viewprevnext'          => 'Veddi ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Contegnûi',
 'powersearch'           => 'Çerca',
 
 # Preferences page
 'preferences'       => 'Preferençe',
 'mypreferences'     => 'Mæ preferense',
 'changepassword'    => 'Cangiâ a pòula segretta',
+'skin-preview'      => 'Anteprimma',
 'dateformat'        => 'Formato da a data',
 'datetime'          => 'Data e oùa',
 'saveprefs'         => 'Sarva',
-'retypenew'         => "Ripette a nêuva paròlla d'ordine:",
 'textboxsize'       => 'Cangia',
 'searchresultshead' => 'Çerca',
 'timezonelegend'    => 'Oùa',
@@ -509,8 +611,8 @@ E paggine in osservassion son dipinte in '''grascietto'''.",
 'filesource'           => 'Reixe:',
 'uploadedfiles'        => 'Papê caregæ',
 'badfilename'          => 'O nomme do papê o l\'è stæto cangioö in "$1".',
-'fileexists'           => "Un papê co sto nomme o existe de zà, pe piaxei da unn'euggiâ a <strong><tt>$1</tt></strong> se non ti tei seguo de voleilo cangiâ.",
-'fileexists-forbidden' => 'Un papê co sto nomme o existe de zà, pe piaxei vanni in derrê e carega sto papê co un ätro nomme. [[Image:$1|thumb|center|$1]]',
+'fileexists'           => "Un papê co sto nomme o existe de zà, pe piaxei da unn'euggiâ a '''<tt>$1</tt>''' se non ti tei seguo de voleilo cangiâ.",
+'fileexists-forbidden' => 'Un papê co sto nomme o existe de zà, pe piaxei vanni in derrê e carega sto papê co un ätro nomme. [[File:$1|thumb|center|$1]]',
 'savefile'             => 'Sarva o papê',
 'uploadedimage'        => 'O s\'ha caregòu "[[$1]]"',
 'uploaddisabledtext'   => 'In {{SITENAME}} non se peu caregâ de papê.',
@@ -524,13 +626,13 @@ E paggine in osservassion son dipinte in '''grascietto'''.",
 'license'   => 'Permisso:',
 'nolicense' => 'Nisciûnn-a liçensa indicâa',
 
-# Special:ImageList
-'imagelist_search_for' => "Çerca pe nomme de l'imàgine:",
+# Special:ListFiles
+'listfiles_search_for' => "Çerca pe nomme de l'imàgine:",
 'imgfile'              => 'papê',
-'imagelist'            => "Lista d'archivvi",
-'imagelist_date'       => 'Dæta',
+'listfiles'            => "Lista d'archivvi",
+'listfiles_date'       => 'Dæta',
 
-# Image description page
+# File description page
 'filehist'                  => "Cronologîa de l'archivvio",
 'filehist-help'             => "Sciacca inscie 'n grûppo data/ôa pe vedde l'archivvio comme o se presentâva into momento indicòu.",
 'filehist-current'          => 'Corrente',
@@ -626,7 +728,6 @@ E paggine in osservassion son dipinte in '''grascietto'''.",
 'speciallogtitlelabel' => 'Tittolo:',
 'log'                  => 'Log',
 'all-logs-page'        => 'Tûtti i registri',
-'log-search-submit'    => 'Vanni',
 'alllogstext'          => 'Presentaçion unega de tutti i registri do scito {{SITENAME}}.
 Ti te peu strinza a vista se ti te çerni un tipo de registro, un nomme de un utente o de pagina.',
 
@@ -670,27 +771,21 @@ Ti te peu strinza a vista se ti te çerni un tipo de registro, un nomme de un ut
 'emailsenttext'   => "A teua lettìa elettronega a l'è stæta spèdïa.",
 
 # Watchlist
-'watchlist'            => 'A mæ lista in osservassion',
-'mywatchlist'          => 'Lista in osservaçion',
-'watchlistfor'         => "(pe '''$1''')",
-'watchnologin'         => "Non ti t'æ entroö",
-'watchnologintext'     => 'Devvi [[Special:UserLogin|entrâ]] pe cangiâ a toa lista in osservaçion.',
-'addedwatch'           => 'Azzonto a a lista in osservaçion',
-'addedwatchtext'       => "A paggina \"[[:\$1]]\" a l'è stæta azzonta a-a pròpia [[Special:Watchlist|lista in osservaçion]]. De chì in avanti, i cangiamenti fæti a-a paggina e a-a sêu discûxon sajàn missi in lista lì; o tittolo da paggina o sajà scrîo in '''grascietto''' inta paggina di [[Special:RecentChanges|ûrtimi cangiamenti]] coscì ti o veddi megio. Se ti vêu eliminâla da-a lista in osservaçion ciû târdi, sciacca \"no seguî\" inscia barra de d'âto.",
-'removedwatch'         => 'Scassæ da a lista in osservaçion',
-'removedwatchtext'     => 'A paggina "[[:$1]]" a l\'è stæta scassâa da-a têu lista in osservaçion.',
-'watch'                => 'Inta lista in osservaçion',
-'watchthispage'        => "Vigilâ 'sta paggina",
-'unwatch'              => 'No seguî',
-'watchlist-details'    => "A lista d'osservassion speçiâ a contegne {{PLURAL:$1|ûnn-a paggina (e a sêu paggina de discûxon)|$1 paggine (e e rispettive paggine de discûxon)}}.",
-'watchlistcontains'    => "A lista in osservaçion g'ha $1 {{PLURAL:$1|pagine|pagina}}.",
-'wlshowlast'           => 'Famme vedde e ûrtime $1 ôe $2 giorni $3',
-'watchlist-show-bots'  => 'Fanni vedde i cangiamenti de i bot',
-'watchlist-hide-bots'  => 'Ascondi i cangiamenti di bot',
-'watchlist-show-own'   => 'Fanni vedde i mæ cangiamenti',
-'watchlist-hide-own'   => 'Ascondi i mæ cangiamenti',
-'watchlist-show-minor' => 'Fanni vedde i cangiamenti minô',
-'watchlist-hide-minor' => 'Ascondi i cangiamenti minoî',
+'watchlist'         => 'A mæ lista in osservassion',
+'mywatchlist'       => 'Lista in osservaçion',
+'watchlistfor'      => "(pe '''$1''')",
+'watchnologin'      => "Non ti t'æ entroö",
+'watchnologintext'  => 'Devvi [[Special:UserLogin|entrâ]] pe cangiâ a toa lista in osservaçion.',
+'addedwatch'        => 'Azzonto a a lista in osservaçion',
+'addedwatchtext'    => "A paggina \"[[:\$1]]\" a l'è stæta azzonta a-a pròpia [[Special:Watchlist|lista in osservaçion]]. De chì in avanti, i cangiamenti fæti a-a paggina e a-a sêu discûxon sajàn missi in lista lì; o tittolo da paggina o sajà scrîo in '''grascietto''' inta paggina di [[Special:RecentChanges|ûrtimi cangiamenti]] coscì ti o veddi megio. Se ti vêu eliminâla da-a lista in osservaçion ciû târdi, sciacca \"no seguî\" inscia barra de d'âto.",
+'removedwatch'      => 'Scassæ da a lista in osservaçion',
+'removedwatchtext'  => 'A paggina "[[:$1]]" a l\'è stæta scassâa da-a têu lista in osservaçion.',
+'watch'             => 'Inta lista in osservaçion',
+'watchthispage'     => "Vigilâ 'sta paggina",
+'unwatch'           => 'No seguî',
+'watchlist-details' => "A lista d'osservassion speçiâ a contegne {{PLURAL:$1|ûnn-a paggina (e a sêu paggina de discûxon)|$1 paggine (e e rispettive paggine de discûxon)}}.",
+'watchlistcontains' => "A lista in osservaçion g'ha $1 {{PLURAL:$1|pagine|pagina}}.",
+'wlshowlast'        => 'Famme vedde e ûrtime $1 ôe $2 giorni $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Inti osservæ speçiâli...',
@@ -699,38 +794,43 @@ Ti te peu strinza a vista se ti te çerni un tipo de registro, un nomme de un ut
 'changed'            => 'cangiâ',
 'enotif_anon_editor' => 'ûtente anònnimo $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'Scassa a paggina',
-'exblank'                     => "a paggina a l'ea vêua",
-'delete-confirm'              => 'Scassa "$1"',
-'delete-legend'               => 'Scassa',
-'historywarning'              => "Attension: A paggina c'a se sta pe scassâ a g'ha 'na cronologîa:",
-'confirmdeletetext'           => "Ti stæ pe scassâ pe sempre da-o database 'na paggina ò 'n'immaggine, assemme a tûtta a sêu cronologîa. Pe cortexia, conferma che davvei ti vêu andâ avanti con quella cancellassion, che ti capisci perfettamente e conseguense de 'st'assion e che a s'adatta a-e linnie guidda stabilîe in [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Açion finïa',
-'deletedtext'                 => 'A paggina "<nowiki>$1</nowiki>" a l\'è stæta scassâa. Consûltâ o $2 pe \'na lista de-e paggine scassæ de reçente.',
-'deletedarticle'              => 'O s\'ha scassòu "[[$1]]"',
-'dellogpage'                  => 'Registro de-e cose scassæ',
-'deletecomment'               => 'Raxon pe scassâ',
-'deleteotherreason'           => 'Ûn âtro motivo',
-'deletereasonotherlist'       => "Ûnn'âtra raxon",
-'rollbacklink'                => 'rollback',
-'cantrollback'                => "O no se pêu tornâ inderê; l'ûtente ch'à fæto quelle modiffiche o l'è stæto l'ûnico contribûente.",
-'alreadyrolled'               => "O no se peû tornâ inderê a-i ûrtimi cangiamenti da pagina [[:$1]]
+# Delete
+'deletepage'            => 'Scassa a paggina',
+'exblank'               => "a paggina a l'ea vêua",
+'delete-confirm'        => 'Scassa "$1"',
+'delete-legend'         => 'Scassa',
+'historywarning'        => "Attension: A paggina c'a se sta pe scassâ a g'ha 'na cronologîa:",
+'confirmdeletetext'     => "Ti stæ pe scassâ pe sempre da-o database 'na paggina ò 'n'immaggine, assemme a tûtta a sêu cronologîa. Pe cortexia, conferma che davvei ti vêu andâ avanti con quella cancellassion, che ti capisci perfettamente e conseguense de 'st'assion e che a s'adatta a-e linnie guidda stabilîe in [[{{MediaWiki:Policy-url}}]].",
+'actioncomplete'        => 'Açion finïa',
+'deletedtext'           => 'A paggina "<nowiki>$1</nowiki>" a l\'è stæta scassâa. Consûltâ o $2 pe \'na lista de-e paggine scassæ de reçente.',
+'deletedarticle'        => 'O s\'ha scassòu "[[$1]]"',
+'dellogpage'            => 'Registro de-e cose scassæ',
+'deletecomment'         => 'Raxon pe scassâ',
+'deleteotherreason'     => 'Ûn âtro motivo',
+'deletereasonotherlist' => "Ûnn'âtra raxon",
+
+# Rollback
+'rollbacklink'  => 'rollback',
+'cantrollback'  => "O no se pêu tornâ inderê; l'ûtente ch'à fæto quelle modiffiche o l'è stæto l'ûnico contribûente.",
+'alreadyrolled' => "O no se peû tornâ inderê a-i ûrtimi cangiamenti da pagina [[:$1]]
 da [[User:$2|$2]] ([[User talk:$2|Ciæti]]); quarche âtro 
 o l'à cangiâ ò o l'è zà tornòu inderê.
 L'ûrtimo cangiamento o ghe l'à fæto [[User:$3|$3]] ([[User talk:$3|Ciæti]]).",
-'revertpage'                  => 'E modificaçioin de [[Special:Contributions/$2|$2]] ([[User talk:$2|Ciæti]]) son stæte eliminæ; riportæ a verscion de primma de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'revertpage'    => 'E modificaçioin de [[Special:Contributions/$2|$2]] ([[User talk:$2|Ciæti]]) son stæte eliminæ; riportæ a verscion de primma de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'Protessioîn',
 'protectedarticle'            => 'o s\'ha protezûo "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] mesciòu a [[$2]]',
 'protect-legend'              => 'Confermâ protession',
 'protectcomment'              => 'Motivo da protession:',
 'protectexpiry'               => 'Scadensa:',
 'protect_expiry_invalid'      => 'Scadensa invalida.',
 'protect_expiry_old'          => 'Data de scadensa into passòu.',
 'protect-unchain'             => 'Scollegâ i permissi de stramûo',
-'protect-text'                => "Chì o l'è poscibbile vedde e modificâ o livello de protession pe-a paggina <strong><nowiki>$1</nowiki></strong>.",
+'protect-text'                => "Chì o l'è poscibbile vedde e modificâ o livello de protession pe-a paggina '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "No ti g'hæ permisso pe modificâ i livelli de protession da paggina.
-Queste son e impostassioîn correnti pe 'sta paggina (<strong>$1</strong>):",
+Queste son e impostassioîn correnti pe 'sta paggina ('''$1'''):",
 'protect-cascadeon'           => "Pe-o momento 'sta paggina chì a l'è bloccâa perché a l'è inclûsa {{PLURAL:$1|inta paggina indicâa apprêuvo, pe-a quæ|inte paggine indicæ apprêuvo, pe-e quæ}} a l'è attiva a protession recorsciva. O se pêu modificâ o livello de protession individuâle da paggina, ma l'impostassioîn derivanti da-a protession recorsciva no sajàn modificæ.",
 'protect-default'             => '(predefinîo)',
 'protect-fallback'            => 'Besêugna avei permisso "$1"',
@@ -740,6 +840,7 @@ Queste son e impostassioîn correnti pe 'sta paggina (<strong>$1</strong>):",
 'protect-expiring'            => 'scadensa: $1 (UTC)',
 'protect-cascade'             => 'Protession recorsciva (estende a protession a tûtte e paggine inclûse in questa chì).',
 'protect-cantedit'            => "Ti no ti pêu modificâ i livelli de protession pe-a paggina se no ti g'hæ i permissi pe modificâ a paggina mæxima.",
+'protect-expiry-options'      => '2 ôe:2 hours,1 giorno:1 day,3 giorni:3 days,1 settemann-a:1 week,2 settemann-e:2 weeks,1 meise:1 month,3 meixi:3 months,6 meixi:6 months,1 anno:1 year,infinîo:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permisso',
 'restriction-level'           => 'Livello de restrission',
 
@@ -781,7 +882,6 @@ $1',
 # What links here
 'whatlinkshere'       => 'Cose appunta chì',
 'whatlinkshere-title' => "Paggine c'appuntan a $1",
-'linklistsub'         => "(Lista de l'ingançi)",
 'linkshere'           => "E paggine seguenti appontan a '''[[:$1]]''':",
 'nolinkshere'         => "Nisciûnn-a paggina a se collega con '''[[:$1]]'''.",
 'isredirect'          => 'Rindirissâ',
@@ -942,7 +1042,7 @@ Inte 'sti câxi, se o se vêu fâ coscì, o se deive stramûâ ò azzonze manual
 'show-big-image'       => "Verscion d'ærta resolûxon",
 'show-big-image-thumb' => "<small>Dimensioîn de 'st'anteprimma: $1 × $2 pixel</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Gallerîa de nêuvi archivvi',
 'ilsubmit'  => 'Çerca',
 'bydate'    => 'pe dâta',
@@ -981,10 +1081,6 @@ L'ingançi succescivi, inscia mæxima riga, van conscideræ comme eccescioîn (p
 'namespacesall' => 'Tûtti',
 'monthsall'     => 'Tûtti',
 
-# AJAX search
-'articletitles' => "Pagine che comensan con ''$1''",
-'hideresults'   => 'Ascondi i resultæ',
-
 # Multipage image navigation
 'imgmultipageprev' => '� Pagina de primma',
 'imgmultipagenext' => 'Proscima pagina →',
diff --git a/languages/messages/MessagesLld.php b/languages/messages/MessagesLld.php
index c377ad43..f79a4419 100644
--- a/languages/messages/MessagesLld.php
+++ b/languages/messages/MessagesLld.php
@@ -3,6 +3,7 @@
  *
  * @ingroup Language
  * @file
+ *
  */
 
 $fallback = 'it';
diff --git a/languages/messages/MessagesLmo.php b/languages/messages/MessagesLmo.php
index dc11f6b2..8668ab3e 100644
--- a/languages/messages/MessagesLmo.php
+++ b/languages/messages/MessagesLmo.php
@@ -170,7 +170,7 @@ süi titul dai sezziún (JavaScript)',
 'editinginterface'  => "'''Attenzion''': el testo de quella pagina chì el fà part de l'interfacia utent del sitt. Tutt i modifigh che te fet se vedaran subit su i messagg visualizzaa per tutt i utent.",
 
 # Login and logout pages
-'logouttext'              => "<strong>Adess a seis descunetacc.</strong><br />
+'logouttext'              => "'''Adess a seis descunetacc.'''<br />
 A podé tirar innanz a dovrar la {{SITENAME}} in manera anònima, a podé
 sa cunèta amò cont l'istess o un olt nomm. Tegné cunt che di
 pagini i podressa vess fadi vider compagn che a saressov amò conetacc, fin coura che
@@ -216,8 +216,13 @@ Per piasè, ve drent anmò dop che te l'ricevüü.",
 'emailnotauthenticated'   => 'Ul tò adrèss da pòsta letronica l è mia staa gnamò verificaa. Nissün mesacc al saraa mandaa par i servizzi che segütan.',
 'accountcreated'          => 'Cunt bell-e-cread',
 
+# Password reset dialog
+'oldpassword' => "Paròla d'urdin végja:",
+'newpassword' => "Paròla d'urdin növa:",
+'retypenew'   => "Scriif ancamò la paròla d'urdin növa:",
+
 # Edit pages
-'summary'              => 'Argument de la mudifica',
+'summary'              => 'Argument de la mudifica:',
 'minoredit'            => "Chesta chi l'è una mudifica da impurtanza minuur",
 'watchthis'            => "Tegn d'öcc quela pagina chì",
 'savearticle'          => 'Salva',
@@ -229,12 +234,12 @@ Per piasè, ve drent anmò dop che te l'ricevüü.",
 'anontalkpagetext'     => "----''Questa chì l'è la pagina de discüssiun de un ütent che l'ha minga ammò registraa un cünt, upür che el vör minga duperàll; dunca, el pò vess identificaa dumà cunt el sò IP, ch'el pò vess spartii tra tanti ütent diferent. Se ti te set un ütent anonim e t'hee vist un quai messacc ch'el te par ch'el gh'entra nagott cun tì, pröva a [[Special:UserLogin|creà el tò cünt]] per fà pü casott.''",
 'noarticletext'        => "Gh'è minga del test in quella pagina chì. Te pòdet [[Special:Search/{{PAGENAME}}|cercà in d'on'altra pagina]] oppur [{{fullurl:{{FULLPAGENAME}}|action=edit}} creàla tì].",
 'clearyourcache'       => "'''Nòta:''' dòpu che avii salvaa, pudaría véss neçessari de scancelá la memòria \"cache\" dal vòst prugráma də navigazziún in reet par vidé i mudifich faa. '''Mozilla / Firefox / Safari:''' tegní schiscjaa al butún ''Shift'' intaant che sə clica ''Reload'', upüür schiscjá ''Ctrl-Shift-R'' (''Cmd-Shift-R'' sül Apple Mac); '''IE:''' schiscjá ''Ctrl'' intaant che sə clica ''Refresh'', upüür schiscjá ''Ctrl-F5''; '''Konqueror:''': semplicemeent clicá al butún ''Reload'', upüür schiscjá ''F5''; '''Opera''' i üteent pudarían vech büsögn da scancelá cumpletameent la memòria \"cache\" in ''Tools&rarr;Preferences''.",
-'previewnote'          => "<strong>'''Atenziun'''! Questa pagina la serviss dumà de vardà. I cambiament hinn minga staa salvaa.</strong>",
+'previewnote'          => "''''''Atenziun'''! Questa pagina la serviss dumà de vardà. I cambiament hinn minga staa salvaa.'''",
 'editing'              => 'Mudifica de $1',
 'editingcomment'       => 'Redataant $1 (cumentari)',
 'yourtext'             => 'El tò test',
 'yourdiff'             => 'Diferenzi',
-'protectedpagewarning' => '<strong>ATENZIÚN: chésta pagina l è staja blucava in manéra che dumá i üteent cunt i privilegi də sysop a pòdan mudificala.</strong>',
+'protectedpagewarning' => "'''ATENZIÚN: chésta pagina l è staja blucava in manéra che dumá i üteent cunt i privilegi də sysop a pòdan mudificala.'''",
 'templatesused'        => 'Buete duvrade in chesta pàgina - Buett duvraat in chesta pàgina:',
 
 # History pages
@@ -255,6 +260,7 @@ Spiegazziún di símbui: (cur) = difərenza cun la versiún curénta, (ültima)
 'prevn'                 => 'preçedeent $1',
 'nextn'                 => 'pròssim $1',
 'viewprevnext'          => 'Vidé ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Contegnüü',
 'powersearch'           => 'Truvá',
 
 # Preferences page
@@ -271,9 +277,6 @@ Spiegazziún di símbui: (cur) = difərenza cun la versiún curénta, (ültima)
 'prefs-misc'         => 'Vari',
 'saveprefs'          => 'Tegn i mudifech',
 'resetprefs'         => 'Trá via i mudifech',
-'oldpassword'        => "Paròla d'urdin végja:",
-'newpassword'        => "Paròla d'urdin növa:",
-'retypenew'          => "Scriif ancamò la paròla d'urdin növa:",
 'textboxsize'        => 'Mudifich',
 'rows'               => 'Riich:',
 'columns'            => 'Culònn:',
@@ -345,14 +348,14 @@ Spiegazziún di símbui: (cur) = difərenza cun la versiún curénta, (ültima)
 'sourcefilename'    => "Nomm da l'archivi surgeent:",
 'destfilename'      => "Nomm da l'archivi da destinazziun:",
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'archivi',
-'imagelist'      => 'Listá i imàgin',
-'imagelist_date' => 'Dada',
-'imagelist_name' => 'Nomm',
-'imagelist_user' => 'Dovratt',
+'listfiles'      => 'Listá i imàgin',
+'listfiles_date' => 'Dada',
+'listfiles_name' => 'Nomm',
+'listfiles_user' => 'Dovratt',
 
-# Image description page
+# File description page
 'filehist-revert' => "Butar torna 'me ch'al era",
 'imagelinks'      => 'Ligámm',
 
@@ -372,8 +375,8 @@ Spiegazziún di símbui: (cur) = difərenza cun la versiún curénta, (ültima)
 'randompage' => 'Página a caas',
 
 # Statistics
-'statistics' => 'Statistich',
-'userstats'  => 'Statistich di utent',
+'statistics'              => 'Statistich',
+'statistics-header-users' => 'Statistich di utent',
 
 'disambiguations' => 'Pagin da disambiguazziún',
 
@@ -421,6 +424,9 @@ Spiegazziún di símbui: (cur) = difərenza cun la versiún curénta, (ültima)
 # Special:Categories
 'categories' => 'Categurii',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Cuntribüziun scancelaa',
+
 # E-mail user
 'emailuser' => 'Manda un email al duvrátt',
 
@@ -448,7 +454,7 @@ al butún \"tegn piü d'öcc\".",
 'enotif_newpagetext' => "Chesta-chí l'è una pàgina növa.",
 'changed'            => 'cambiaa',
 
-# Delete/protect/revert
+# Delete
 'deletepage'            => 'Scancela la pagina',
 'historywarning'        => "Atenziún: La pagina che a sii dré a scancelá la gh'a una stòria:",
 'actioncomplete'        => 'Aziun cumpletada',
@@ -460,15 +466,20 @@ al butún \"tegn piü d'öcc\".",
 ** Richiesta de l'aütur
 ** Viulaziun del copyright
 ** Vandalism",
-'rollback'              => 'Rollback',
-'rollbacklink'          => 'Rollback',
-'rollbackfailed'        => 'L è mia staa pussibil purtá indré',
-'alreadyrolled'         => "L è mia pussibil turná indré al'ültima versiún da [[:$1]] dal [[User:$2|$2]] ([[User talk:$2|Discüssiún]]); un quaivün l á gjamò redataa o giraa indré la pagina.
+
+# Rollback
+'rollback'       => 'Rollback',
+'rollbacklink'   => 'Rollback',
+'rollbackfailed' => 'L è mia staa pussibil purtá indré',
+'alreadyrolled'  => "L è mia pussibil turná indré al'ültima versiún da [[:$1]] dal [[User:$2|$2]] ([[User talk:$2|Discüssiún]]); un quaivün l á gjamò redataa o giraa indré la pagina.
 L'ültima redatazziún l eva da [[User:$3|$3]] ([[User talk:$3|Discüssiún]]).",
-'unprotectedarticle'    => 'l\'ha sblucaa "[[$1]]"',
-'protect-title'         => 'Prutezziún da "$1"',
-'protect-legend'        => 'Cunferma de blocch',
-'protectcomment'        => 'Spiega parchè ti vörat blucá la pagina',
+
+# Protect
+'unprotectedarticle' => 'l\'ha sblucaa "[[$1]]"',
+'protect-title'      => 'Prutezziún da "$1"',
+'prot_1movedto2'     => '[[$1]] spustaa in [[$2]]',
+'protect-legend'     => 'Cunferma de blocch',
+'protectcomment'     => 'Spiega parchè ti vörat blucá la pagina',
 
 # Undelete
 'undelete'           => 'Varda i pagin scancelaa',
@@ -564,7 +575,7 @@ Cheest-chí al pöö vess un canbi dràstegh e inaspetaa par una pàgina pupüla
 'imagemaxsize' => 'Limitá i imagin süi pagin da descrizziún dii imagin a:',
 'thumbsize'    => 'Dimensiún diapusitiif:',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Espusizziun di imàgin nööf',
 'ilsubmit'  => 'Truvá',
 
diff --git a/languages/messages/MessagesLn.php b/languages/messages/MessagesLn.php
index 973218d2..3336d4bc 100644
--- a/languages/messages/MessagesLn.php
+++ b/languages/messages/MessagesLn.php
@@ -78,7 +78,7 @@ $messages = array(
 'qbspecialpages' => 'Nkásá ya ndéngé isúsu',
 'mytalk'         => 'Ntembe na ngáí',
 'navigation'     => 'Botamboli',
-'and'            => 'mpé',
+'and'            => '&#32;mpé',
 
 'errorpagetitle'   => 'Mbéba',
 'tagline'          => 'Artíclɛ ya {{SITENAME}}.',
@@ -108,10 +108,12 @@ $messages = array(
 'otherlanguages'   => 'Na nkótá isúsu',
 'redirectedfrom'   => '(Eyendísí útá $1)',
 'redirectpagesub'  => 'Lokásá la boyendisi',
+'jumpto'           => 'Kokɛndɛ na:',
 'jumptosearch'     => 'boluki',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'elɔ�kɔ elobí {{SITENAME}}',
+'copyrightpage'        => '{{ns:project}}:Mikokisi',
 'currentevents'        => 'Elɔ�kɔ ya sika',
 'edithelp'             => 'Kobimisela bosálisi',
 'mainpage'             => 'Lokásá ya libosó',
@@ -127,6 +129,9 @@ $messages = array(
 'toc'                => 'Etápe',
 'showtoc'            => 'komɔ�nisa',
 'hidetoc'            => 'kobomba',
+'site-rss-feed'      => 'Ebale RSS ya $1',
+'site-atom-feed'     => 'Ebale Atom ya $1',
+'page-rss-feed'      => 'Ebale RSS ya « $1 »',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'     => 'ekakoli',
@@ -136,17 +141,19 @@ $messages = array(
 'nstab-category' => 'loléngé',
 
 # General errors
-'error' => 'Mbéba',
+'error'         => 'Mbéba',
+'viewsourcefor' => 'na $1',
 
 # Login and logout pages
 'yourname'                => 'Nkómbó ya ekitoli :',
+'yourpassword'            => 'Banda nayó:',
 'yourpasswordagain'       => 'Banda naíno :',
 'login'                   => 'komíkitola (log in)',
 'nav-login-createaccount' => 'Komíkomisa tǒ kokɔtɔ',
 'userlogin'               => 'Komíkomisa tǒ kokɔtɔ',
 'logout'                  => 'kolongwa',
 'userlogout'              => 'kolongwa (log out)',
-'nologin'                 => 'Omíkomísí naíno tɛ̂ ? $1.',
+'nologin'                 => 'Omíkomísí naíno tɛ̂? $1.',
 'nologinlink'             => 'Míkomísá yɔ̌-mɛ�i',
 'gotaccount'              => 'Omíkomísí naíno ? $1.',
 'createaccountmail'       => 'na mokánda',
@@ -161,16 +168,18 @@ $messages = array(
 'bold_tip'        => 'Nkomá ya mbinga',
 'italic_sample'   => 'Nkomá ya kotɛ�ngama',
 'italic_tip'      => 'Nkomá ya kotɛ�ngama',
+'extlink_sample'  => 'http://www.example.com Litɛ�mɛ ya ekangisi',
 'headline_sample' => 'Nkomá ya litɛ�mɛ',
 'headline_tip'    => 'Litɛ�mɛ ya emeko 2',
 
 # Edit pages
-'summary'                => 'Likwé ya mokusé',
-'subject'                => 'Mokonza/litɛ�mɛ',
+'summary'                => 'Likwé ya mokusé:',
+'subject'                => 'Mokonza/litɛ�mɛ:',
 'minoredit'              => 'Ezalí mbóngwana ya mokɛ�',
 'watchthis'              => 'Kolanda lokásá loye',
 'savearticle'            => 'kobómbisa ekakoli',
 'preview'                => 'Botáli',
+'newarticle'             => '(Sika)',
 'editing'                => 'Kobimisela « $1 »',
 'editingcomment'         => 'Kokoma « $1 » (ndimbola)',
 'yourtext'               => 'Nkomá na yɔ̌',
@@ -223,6 +232,7 @@ $messages = array(
 'recentchanges'   => 'Mbóngwana ya nsúka',
 'rcnote'          => "�wa o nsé {{PLURAL:$1|ezalí mbóngwana '''1'''|izalí mbóngwana '''$1'''}} o {{PLURAL:$2|mokɔlɔ|mikɔlɔ '''$2'''}} ya nsúka, {{PLURAL:$1|etángámí|itángámí}} o $3.",
 'rcshowhideminor' => '$1 mbóngwana ya mokɛ�',
+'rcshowhidebots'  => '$1 barobot',
 'rcshowhidemine'  => '$1 mbóngwana ya ngáí',
 'rclinks'         => 'Komɔ�nisa mbóngwana $1 ya nsúka o mikɔ�lɔ $2<br />$3',
 'diff'            => 'mbó.',
@@ -241,8 +251,11 @@ $messages = array(
 'uploadbtn' => 'kokumbisa',
 'savefile'  => 'kobómbisa kásá-kásá',
 
-# Special:ImageList
-'imagelist_date' => 'Mokɔlɔ',
+# Special:ListFiles
+'listfiles_date' => 'Mokɔlɔ',
+
+# File description page
+'filehist' => 'Mokóló ya kásá',
 
 # File deletion
 'filedelete-submit' => 'Kolímwisa',
@@ -255,13 +268,13 @@ $messages = array(
 
 # Statistics
 'statistics' => 'Mitúya',
-'sitestats'  => 'Mitúya mya {{SITENAME}}',
 
 'disambiguations' => 'Bokokani',
 
 'doubleredirects' => 'Boyendisi mbala míbalé',
 
 # Miscellaneous special pages
+'nbytes'                  => '$1 {{PLURAL:$1|okté|baokté}}',
 'nmembers'                => '{{PLURAL:$1|ekakoli|bikakoli}} $1',
 'uncategorizedpages'      => 'Nkásá izángí loléngé',
 'uncategorizedcategories' => 'Ndéngé izángí loléngé',
@@ -277,6 +290,9 @@ $messages = array(
 # Book sources
 'booksources-go' => 'Kɛndɛ�',
 
+# Special:Log
+'log' => 'Bapasɔ�',
+
 # Special:AllPages
 'allpages'       => 'Nkásá ínsɔ',
 'alphaindexline' => '$1 kina $2',
@@ -299,28 +315,22 @@ $messages = array(
 'emailsenttext'   => 'Nkandá ya yɔ̌ etíndámá',
 
 # Watchlist
-'watchlist'            => 'Nkásá nalandí',
-'mywatchlist'          => 'Nkásá nalandí',
-'watchlistfor'         => "(mpɔ̂ na moto '''$1''')",
-'watch'                => 'Kolanda',
-'watchthispage'        => 'Kolanda lokásá loye',
-'unwatch'              => 'Kolanda tɛ�',
-'watchlist-details'    => '{{PLURAL:$1|lokásá $1 lolandámí|nkásá $1 ilandámí}}, longola nkásá ya ntembe.',
-'wlnote'               => "�wa o nsé {{PLURAL:$1|ezalí mbóngwana ya nsúka|izalí mbóngwana '''$1''' ya nsúka}} o {{PLURAL:$2|ngonga|ngonga '''$2'''}} ya nsúka.",
-'wlshowlast'           => 'Komɔ�nisa ngónga $1 ya nsúka, mikɔ�lɔ $2 mya nsúka tǒ $3',
-'watchlist-show-bots'  => 'Komɔ�nisa mbóngwana ya bot',
-'watchlist-hide-bots'  => 'Kobomba mbóngwana ya bot',
-'watchlist-show-own'   => 'Komɔ�nisa mbóngwana ya ngáí',
-'watchlist-hide-own'   => 'Kobomba mbóngwana ya ngáí',
-'watchlist-show-minor' => 'Komɔ�nisa mbóngwana ya mokɛ�',
-'watchlist-hide-minor' => 'Kobomba mbóngwana ya mokɛ�',
+'watchlist'         => 'Nkásá nalandí',
+'mywatchlist'       => 'Nkásá nalandí',
+'watchlistfor'      => "(mpɔ̂ na moto '''$1''')",
+'watch'             => 'Kolanda',
+'watchthispage'     => 'Kolanda lokásá loye',
+'unwatch'           => 'Kolanda tɛ�',
+'watchlist-details' => '{{PLURAL:$1|Lokásá $1 lolandámí|Nkásá $1 ilandámí}}, longola nkásá ya ntembe.',
+'wlnote'            => "�wa o nsé {{PLURAL:$1|ezalí mbóngwana ya nsúka|izalí mbóngwana '''$1''' ya nsúka}} o {{PLURAL:$2|ngonga|ngonga '''$2'''}} ya nsúka.",
+'wlshowlast'        => 'Komɔ�nisa ngónga $1 ya nsúka, mikɔ�lɔ $2 mya nsúka tǒ $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching' => 'Bonɔ�ngi...',
 
 'created' => 'ekomákí',
 
-# Delete/protect/revert
+# Delete
 'deletedarticle' => 'elímwísí "[[$1]]"',
 'dellogpage'     => 'Zonálɛ ya bolímwisi',
 'deletionlog'    => 'zonálɛ ya bolímwisi',
@@ -335,8 +345,9 @@ $messages = array(
 'blanknamespace' => '(Ya libosó)',
 
 # Contributions
-'contributions' => 'Mosálá ya moto óyo',
-'mycontris'     => 'Nkásá nakomí',
+'contributions'       => 'Mosálá ya moto óyo',
+'contributions-title' => 'Mosálá ya moto mpɔ̂ na $1',
+'mycontris'           => 'Nkásá nakomí',
 
 # What links here
 'whatlinkshere'       => 'Ekangísí áwa',
@@ -348,6 +359,7 @@ $messages = array(
 'move-watch'              => 'Kolánda lokásá loye',
 'movepagebtn'             => 'Kobóngola lokásá',
 'movedto'                 => 'nkómbó ya sika',
+'revertmove'              => 'kozóngela',
 'delete_and_move'         => 'Kolímwisa mpé kobóngola nkómbó',
 'delete_and_move_confirm' => 'Boye, kolímwisa lokásá',
 'delete_and_move_reason'  => 'Ntína ya bolímwisi mpé bobóngoli bwa nkómbó',
@@ -368,16 +380,18 @@ $messages = array(
 'tooltip-pt-preferences'    => 'Malúli ma ngáí',
 'tooltip-pt-watchlist'      => 'Nkásá nalandí mpɔ̂ na mbóngwana',
 'tooltip-pt-mycontris'      => 'Nkásá nakomí',
+'tooltip-pt-logout'         => 'Ombémbóí',
 'tooltip-search'            => 'Boluki {{SITENAME}}',
 'tooltip-p-logo'            => 'Lokásá ya libosó',
 'tooltip-n-mainpage'        => 'Kokɛndɛ na Lokásá ya libosó',
+'tooltip-n-help'            => 'Lisálisi',
 'tooltip-ca-nstab-template' => 'Komɔ�nisela emekoli',
 'tooltip-ca-nstab-category' => 'Komɔ�nisela lokásá ya loléngé',
 
 # Browsing diffs
 'previousdiff' => '� diff ya libosó',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Boluki',
 
 # EXIF tags
@@ -389,9 +403,6 @@ $messages = array(
 'watchlistall2' => 'nyɔ�nsɔ',
 'namespacesall' => 'Nyɔ�nsɔ',
 
-# HTML dump
-'redirectingto' => 'Eyendísí na [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'Nandimi',
 
diff --git a/languages/messages/MessagesLo.php b/languages/messages/MessagesLo.php
index ef67dde0..c8611570 100644
--- a/languages/messages/MessagesLo.php
+++ b/languages/messages/MessagesLo.php
@@ -9,24 +9,73 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'ສື່ອ',
-	NS_SPECIAL        => 'ພິເສດ',
-	NS_MAIN           => '',
-	NS_TALK           => 'ສົນທະນາ',
-	NS_USER           => 'ຜູ້ໃຊ້',
-	NS_USER_TALK      => 'ສົນທະນາຂອງຜູ້ໃຊ້',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'ສົນທະນາ�່ຽວ�ັບ$1',
-	NS_IMAGE          => 'ຮູບ',
-	NS_IMAGE_TALK     => 'ສົນທະນາ�່ຽວ�ັບຮູບ',
-	NS_MEDIAWIKI      => 'ມີເດ�ວິ�ິ',
-	NS_MEDIAWIKI_TALK => 'ສົນທະນາ�່ຽວ�ັບມີເດ�ວິ�ິ',
-	NS_TEMPLATE       => '�ມ່�ບບ',
-	NS_TEMPLATE_TALK  => 'ສົນທະນາ�່ຽວ�ັບ�ມ່�ບບ',
-	NS_HELP           => 'ຊ່ວ�ເຫຼືອ',
-	NS_HELP_TALK      => 'ສົນທະນາ�່ຽວ�ັບຊ່ວ�ເຫຼືອ',
-	NS_CATEGORY       => '�ວດ',
-	NS_CATEGORY_TALK  => 'ສົນທະນາ�່ຽວ�ັບ�ວດ',
+	NS_MEDIA            => 'ສື່',
+	NS_SPECIAL          => 'ພິເສດ',
+	NS_TALK             => 'ສົນທະນາ',
+	NS_USER             => 'ຜູ້ໃຊ້',
+	NS_USER_TALK        => 'ສົນທະນາຂອງຜູ້ໃຊ້',
+	NS_PROJECT_TALK     => 'ສົນທະນາ�່ຽວ�ັບ$1',
+	NS_FILE             => 'ຮູບ',
+	NS_FILE_TALK        => 'ສົນທະນາ�່ຽວ�ັບຮູບ',
+	NS_MEDIAWIKI        => 'ມີເດ�ວິ�ິ',
+	NS_MEDIAWIKI_TALK   => 'ສົນທະນາ�່ຽວ�ັບມີເດ�ວິ�ິ',
+	NS_TEMPLATE         => '�ມ່�ບບ',
+	NS_TEMPLATE_TALK    => 'ສົນທະນາ�່ຽວ�ັບ�ມ່�ບບ',
+	NS_HELP             => 'ຊ່ວ�ເຫຼືອ',
+	NS_HELP_TALK        => 'ສົນທະນາ�່ຽວ�ັບຊ່ວ�ເຫຼືອ',
+	NS_CATEGORY         => '�ວດ',
+	NS_CATEGORY_TALK    => 'ສົນທະນາ�່ຽວ�ັບ�ວດ',
+);
+
+$namespaceAliases = array(
+	'ສື່ອ' => NS_MEDIA,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'ໂອນຊ້ອນ' ),
+	'BrokenRedirects'           => array( 'ໂອນເສ�' ),
+	'Disambiguations'           => array( '��້ຄວາມ�ຳ�ວມ' ),
+	'Userlogin'                 => array( 'ເຊັນເຂົ້າ' ),
+	'Userlogout'                => array( 'ເຊັນອອ�' ),
+	'CreateAccount'             => array( 'ສ້າງບັນຊີ' ),
+	'Preferences'               => array( 'ຕັ້ງຄ່າ' ),
+	'Watchlist'                 => array( 'ຕິດຕາມ' ),
+	'Recentchanges'             => array( '�ານດັດ��້ຫຼ້າສຸດ' ),
+	'Upload'                    => array( 'ອັປໂຫຼດໄຟລ໌' ),
+	'Listfiles'                 => array( 'ລາ�ຊື່ຮູບ' ),
+	'Newimages'                 => array( 'ຮູບໃ�່' ),
+	'Listusers'                 => array( 'ລາ�ຊື່ຜູ້ໃຊ້' ),
+	'Statistics'                => array( 'ສະຖິຕິ' ),
+	'Randompage'                => array( 'ບົດຄວາມໃດໜຶ່ງ' ),
+	'Uncategorizedpages'        => array( 'ໜ້າທີ່ບ�່ມີ�ວດ' ),
+	'Uncategorizedcategories'   => array( '�ວດທີ່ບ�່ມີ�ວດ' ),
+	'Uncategorizedimages'       => array( 'ຮູບທີ່ບ�່ມີ�ວດ' ),
+	'Uncategorizedtemplates'    => array( '�ມ່�ບບທີ່ບ�່ມີ�ວດ' ),
+	'Unusedcategories'          => array( '�ວດທີ່ບ�່ໄດ້ໃຊ້' ),
+	'Unusedimages'              => array( 'ຮູບທີ່ບ�່ໄດ້ໃຊ້' ),
+	'Wantedpages'               => array( 'ໜ້າທີ່ຕ້ອງ�ານ', 'ລິງ�໌ທີ່້ເສ�' ),
+	'Wantedcategories'          => array( '�ວດທີ່ຕ້ອງ�ານ' ),
+	'Shortpages'                => array( 'ໜ້າທີ່ສັ້ນ' ),
+	'Longpages'                 => array( 'ໜ້າ�າວ' ),
+	'Newpages'                  => array( 'ໜ້າໃ�່' ),
+	'Deadendpages'              => array( 'ໜ້າທີ່ບ�່ມີໜ້າໃດໂ�ງມາ' ),
+	'Protectedpages'            => array( 'ໜ້າທີ່ຖຶ�ປົ�ປ້ອງ' ),
+	'Protectedtitles'           => array( 'ຊື່ທີ່ຖຶ�ປົ�ປ້ອງ' ),
+	'Allpages'                  => array( 'ໜ້າທັງ�ົດ' ),
+	'Specialpages'              => array( 'ໜ້າພິເສດ' ),
+	'Contributions'             => array( '�ານປະ�ອບສ່ວນ' ),
+	'Whatlinkshere'             => array( 'ໜ້າທີ່ເຊື່ອມຕ�່ມາ' ),
+	'Movepage'                  => array( '�້າ�' ),
+	'Categories'                => array( '�ວດ' ),
+	'Unusedtemplates'           => array( '�ມ່�ບບທີ່ບ�່ໄດ້ໃຊ້' ),
+	'Randomredirect'            => array( 'ໜ້າໂອນໃດໜຶ່ງ' ),
+	'Mypage'                    => array( 'ໜ້າຂອງຂ້ອ�' ),
+	'Mytalk'                    => array( 'ສົນທະນາຂອງຂ້ອ�' ),
+	'Mycontributions'           => array( 'ປະ�ອບສ່ວນຂອງຂ້ອ�' ),
+	'Listadmins'                => array( 'ລາ�ຊື່ຜູ້ບ�ລິຫານລະບົບ' ),
+	'Listbots'                  => array( 'ລາ�ຊື່ບອຕ' ),
+	'Search'                    => array( 'ຊອ�ຫາ' ),
+	'Resetpass'                 => array( 'ປ່ຽນລະຫັດຜ່ານ' ),
 );
 
 $digitTransformTable = array(
@@ -48,10 +97,12 @@ $messages = array(
 'tog-hideminor'               => 'ເຊື່ອງ�ານດັດ��້ເລັ�ນ້ອ� ໃນ �ານປ່ຽນ�ປງຫຼ້າສຸດ',
 'tog-extendwatchlist'         => 'ຂະຫ�າ� ລາ��ານຕິດຕາມ ເພື່ອ ສະ�ດງທຸ�ໆ�ານປ່ຽນ�ປງ',
 'tog-usenewrc'                => 'ສະ�ດງ �ານປ່ຽນ�ປງຫຼ້າສຸດ ເປັນສີເຂັ້ມ (JavaScript)',
+'tog-numberheadings'          => 'ໜາ�ເລ�ຫົວຂ�້�ບບອັດຕະໂນມັດ',
 'tog-showtoolbar'             => 'ສະ�ດງ ທູລບາດັດ��້ (JavaScript)',
 'tog-editondblclick'          => 'ໃຫ້ສາມາດດັດ��້ ໂດ� ດັບເບິລ໌ ຄລິ� (JavaScript)',
 'tog-editsection'             => 'ໃຫ້ສາມາດ ດັດ��້ເປັນພາ� ໂດ� �ົດລິ້ງຄ໌ [ດັດ��້]',
 'tog-editsectiononrightclick' => 'ໃຫ້ສາມາດ ດັດ��້ ໂດ��ົດປຸ່ມຂວາ ຂອງເມົາສ໌ ຢູ່ <br /> ຫົວຂ�້ຂອງພາ� (JavaScript)',
+'tog-showtoc'                 => 'ສະ�ດງເນື້ອໃນ (ຂອງ �້າທີ່ມີຫຼາ��ວ່າ 3 ໜາ�ເລ�ຫົວຂ�້)',
 'tog-rememberpassword'        => 'ຈົດຈ�າ�ານເຊັນເຂົ້າຂອງຂ້ອ� ຢູ່ ຄອມພິວເຕີໜ່ວ�ນີ້',
 'tog-editwidth'               => 'ໃຫ້ ຊ່ອງດັດ��້ �້ວາງທີ່ສຸດ',
 'tog-watchcreations'          => 'ເພີ່ມ ໜ້າທີ່ຂ້ອ�ສ້າງ ເຂົ້າໃນ ລາ��ານຕິດຕາມ ຂອງ ຂ້ອ�',
@@ -61,14 +112,20 @@ $messages = array(
 'tog-minordefault'            => 'ຖ້າບ�່ມີ�ານຕັ້ງ �ຳໜົດໃຫ້ທຸ�ໆ�ານດັດ��້ ເປັນ �ານດັດ��້ເລັ�ນ້ອ�',
 'tog-previewontop'            => 'ສະ�ດງ ຜົນ�ານດັດ��້ ເທິງ ຊ່ອງດັດ��້',
 'tog-previewonfirst'          => 'ສະ�ດງ ຜົນ�ານດັດ��້ ໃນ ເວລາດັດ��້ເທື່ອທຳອິດ',
+'tog-nocache'                 => 'ບ�່ບັນທຶ� ຂ�້ມູນບົດຄວາມ ໄວ້ໃນຄອມພິວເຕີ',
 'tog-enotifwatchlistpages'    => 'ສົ່ງອີເມລມາໃຫ້ຂ້ອ� ເມື່ອ ໜ້າທີ່ຂ້ອ�ຕິດຕາມໄດ້ຖື�ປ່ຽນ�ປງ',
 'tog-enotifusertalkpages'     => 'ສົ່ງ ອີເມລ ມາໃຫ້ ຂ້ອ� ເວລາ ໜ້າສົນທະນາຂ້ອ� ມີ�ານປ່ຽນ�ປງ',
+'tog-enotifminoredits'        => 'ສົ່ງ ອີເມລ ໃຫ້ຂ້ອ� ເວລາມີ�ານດັດ��້ເລັ�ນ້ອ�ນຳ',
+'tog-enotifrevealaddr'        => 'ສະ�ດງ ອີເມລ ຂອງຂ້ອ� ໃນ �ານ�ຈ້ງວ່າມີຂ�້ຄວາມອີເມລ',
+'tog-shownumberswatching'     => 'ສະ�ດງ ຈຳນວນຜູ້ໃຊ້ ຕິດຕາມ�້ານີ້',
 'tog-externaleditor'          => 'ໃຊ້ ເອດິດເຕີທາງນອ� ຖ້າບ�່ມີ�ານຕັ້ງ',
 'tog-externaldiff'            => 'ໃຊ້ ສ່ວນຕ່າງທາງນອ� ຖ້າບ�່ມີ �ານ�ຳໜົດ',
 'tog-forceeditsummary'        => 'ເຕື່ອນຂ້ອ� ຖ້າບ�່ໄດ້ຂຽນຫ�ັງໃສ່ ຊ່ອງ ສະຫຼຸບ�ານດັດ��້',
 'tog-watchlisthideown'        => 'ເຊື່ອງ �ານດັດ��້ໂດ�ຂ້ອ� ໃນ ລາ��ານຕິດຕາມຂອງຂ້ອ�',
 'tog-watchlisthidebots'       => 'ເຊື່ອງ �ານດັດ��້ ໂດ� ບອທ໌ ໃນລາ��ານຕິດຕາມຂອງຂ້ອ�',
 'tog-watchlisthideminor'      => 'ເຊື່ອງ �ານດັດ��້ເລັ�ນ້ອ� ໃນ ລາ��ານຕິດຕາມຂອງຂ້ອ�',
+'tog-watchlisthideliu'        => 'ເຊື່ອງ�ານດັດ��້ ໂດ� ຜູ້ໃຊ້ໄດ້ເຊັນເຂົາ ໃນ ລາ��ານຕິດຕາມ',
+'tog-watchlisthideanons'      => 'ເຊື່ອງ �ານດັດ��້ໂດ�ຜູ້ໃຊ້ ບ�່ສະ�ດງຊື່ ຈາ� ລາ��ານຕິດຕາມ',
 'tog-ccmeonemails'            => 'ສົ່ງສຳເນົາ ອີເມລ ທີ່ ຂ້ອ�ສົ່ງຫາຜູ້ອື່ນ ໃຫ້ ຂ້ອ�',
 'tog-diffonly'                => 'ບ�່ສະ�ດງເນື້ອໃນຂອງບົດຄວາມ ຢູ່ທາງລຸ່ມ ສ່ວນຕ່າງ',
 'tog-showhiddencats'          => 'ສະ�ດງ�ວດເຊື່ອງ',
@@ -76,9 +133,14 @@ $messages = array(
 'underline-always' => 'ທຸ�ຄັ້ງ',
 'underline-never'  => 'ບ�່ຂີດ',
 
-'skinpreview' => '(ລອງເບິ່ງ)',
-
 # Dates
+'sunday'        => 'ວັນອາທິດ',
+'monday'        => 'ວັນຈັນ',
+'tuesday'       => 'ວັນອັງຄານ',
+'wednesday'     => 'ວັນພຸດ',
+'thursday'      => 'ວັນພະຫັດ',
+'friday'        => 'ວັນສຸ�',
+'saturday'      => 'ວັນເສົາ',
 'sun'           => 'ອາທິດ',
 'mon'           => 'ຈັນ',
 'tue'           => 'ອັງຄານ',
@@ -141,12 +203,13 @@ $messages = array(
 'qbfind'         => 'ຊອ�ຫາ',
 'qbedit'         => 'ດັດ��້',
 'qbpageoptions'  => 'ໜ້ານີ້',
+'qbmyoptions'    => '�້າຂ້ອ�',
 'qbspecialpages' => 'ໜ້າພິເສດ',
 'mypage'         => 'ໜ້າຂ້ອ�',
 'mytalk'         => 'ສົນທະນາ',
 'anontalk'       => 'ສົນທະນາ ສຳຫຼັບ IP ນີ້',
 'navigation'     => 'ນຳທິດ',
-'and'            => '�ລະ',
+'and'            => '&#32;�ລະ',
 
 'returnto'         => '�ັບໄປ  $1.',
 'tagline'          => 'ຈາ� {{SITENAME}}',
@@ -173,6 +236,7 @@ $messages = array(
 'newpage'          => 'ໜ້າໃ�່',
 'talkpage'         => 'ປຶ�ສາຫາລືໜ້ານີ້',
 'talkpagelinktext' => 'ສົນທະນາ',
+'specialpage'      => '�້າພິເສດ',
 'personaltools'    => 'ເຄື່ອງມືສ່ວນຕົວ',
 'articlepage'      => 'ເບິ່ງໜ້າເນື້ອໃນ',
 'talk'             => 'ສົນທະນາ',
@@ -193,8 +257,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '�່ຽວ�ັບ{{SITENAME}}',
 'aboutpage'            => 'Project:�່ຽວ�ັບ',
-'bugreports'           => 'ລາ�ງານ ບັນຫາທາງໂປ��ມ',
-'bugreportspage'       => 'Project:ລາ�ງານບັນຫາທາງໂປ��ມ',
 'copyright'            => 'ເນື້ອໃນ ສະໜອງໃຫ້ ພາ�ໃຕ້ $1.',
 'copyrightpage'        => '{{ns:project}}:ລິຂະສິດ',
 'currentevents'        => '�ິດຈະ�ຳພວມດຳເນີນ',
@@ -258,11 +320,11 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => 'ຜູ້ໃຊ້ ເຊັນອອ�',
-'logouttext'                 => '<strong>ທ່່ານ ໄດ້ ເຊັນອອ��ລ້ວ.</strong><br />
+'logouttext'                 => "'''ທ່່ານ ໄດ້ ເຊັນອອ��ລ້ວ.'''<br />
 ທ່ານ ສາມາດສືບຕ�່ໃຊ້ {{SITENAME}} �ບບບ�່ສະ�ດງຊື່, ຫຼື ທ່ານ ສາມາດ ເຊັນເຂົ້າ
 ອີ� ໂດ� ຊື່ຜູ້ໃຊ້ ເ�ົ່າ ຫຼື ໃ�່ ��່ໄດ້. �ະລຸນາ ຮັບຊາບວ່າ ບາງໜ້າ ອາດຈະສືບຕ�່ ສະ�ດງ
 ຄືວ່າ ທ່ານ �ັງເຊັນເຂົ້າຢູ່ ຈົນ�ວ່າ ທ່ານ ຂ�້ມູນບັນທຶ�ຊົ່ວຄາວ ໃນ ໂປຣ��ຣມທ່ອງເວັບ
-ຂອງ ທ່ານ ຈະຖື�ລຶບ.',
+ຂອງ ທ່ານ ຈະຖື�ລຶບ.",
 'welcomecreation'            => '== �ິນດີຕ້ອນຮັບ, $1! ==
 
 ບັນຊີ ຂອງທ່ານ ຖື�ສ້າງຂຶ້ນ�ລ້ວ. ຢ່າລືມ ຕັ້ງຄ່າ ທ່ານ ຢູ່ {{SITENAME}}.',
@@ -306,6 +368,9 @@ $messages = array(
 'accountcreatedtext'         => 'ບັນຊີ ຂອງ  $1 ໄດ້ ຖື�ສ້າງ�ລ້ວ.',
 
 # Password reset dialog
+'oldpassword'       => 'ລະຫັດຜ່ານເ�ົ່າ:',
+'newpassword'       => 'ລະຫັດຜ່ານໃ�່:',
+'retypenew'         => 'ພິມລະຫັດຜ່ານໃ�່ອີ�:',
 'resetpass_submit'  => 'ຕັ້ງລະຫັດຜ່ານ �ລະ ເຊັນເຂົ້າ',
 'resetpass_success' => 'ສຳເລັດ�ານປ່ຽນ�ປງ ລະຫັດຜ່ານຂອງທ່ານ�ລ້ວ! ດຽວນີ້ ທ່ານ ເຊັ່ນເຂົ້າ ໃນ ...',
 
@@ -325,8 +390,8 @@ $messages = array(
 'media_tip'       => 'ລິ້ງຄ໌ຫາໄຟລ໌',
 
 # Edit pages
-'summary'                  => 'ຄຳອະທິບາ�ໂດ�ຫ��້',
-'subject'                  => 'ຫົວຂ�້',
+'summary'                  => 'ຄຳອະທິບາ�ໂດ�ຫ��້:',
+'subject'                  => 'ຫົວຂ�້:',
 'minoredit'                => 'ນີ້�ມ່ນ�ານດັດ��້ເລັ�ນ້ອ�',
 'watchthis'                => 'ຕິດຕາມໜ້ານີ້',
 'savearticle'              => 'ບັນທຶ�',
@@ -347,18 +412,18 @@ $messages = array(
 'newarticletext'           => "ທ່ານ ໄດ້ມາຮອດ ໜ້າທີ່�ັງບ�່ໄດ້ຖື�ສ້າງຂຶ້ນເທື່ອ. ທ່ານ ສາມາດເລີ່ມ ສ້າງໜ້າ ໂດ� ພິມໃສ່ �ັບ ຂ້າງລຸ່ມ.(ເບິ່ງລາ�ລະອຽດຕື່ມ ທີ່ [[{{MediaWiki:Helppage}}|ໜ້າຊ່ວ�ເຫຼືອ]]).
 ຖ້າ ທ່ານ ມາຮອດນີ້ ໂດ�ຄວາມຜິດພາດ, �ະລຸນາ �ົດ ປຸ່ມ '''�ັບຄືນ''', ຢູ່ ໂປຣ��ຣມ ທ່ອງເວັບ ຂອງທ່ານ.",
 'noarticletext'            => '�ັງບ�່ມີເນື້ອໃນ ຢູ່ ໜ້ານີ້, ທ່ານສາມາດ [[Special:Search/{{PAGENAME}}|ຄົ້ນຫາໜ້າຫົວຂ�້ນີ້]] ຫຼື [{{fullurl:{{FULLPAGENAME}}|action=edit}} ດັດ��້ໜ້ານີ້].',
-'previewnote'              => '<strong>ນີ້ �ມ່ນ �ານລອງເບິ່ງຜົນເທົ່ານັ້ນ; �ານດັດ��້�ັງບ�່ທັນຖື�ບັນທຶ�!</strong>',
+'previewnote'              => "'''ນີ້ �ມ່ນ �ານລອງເບິ່ງຜົນເທົ່ານັ້ນ; �ານດັດ��້�ັງບ�່ທັນຖື�ບັນທຶ�!'''",
 'editing'                  => 'ພວມດັດ��້ $1',
 'editingsection'           => 'ພວມດັດ��້ $1 (ພາ�)',
 'yourtext'                 => 'ເນື້ອໃນ',
 'yourdiff'                 => 'ສ່ວນຕ່າງ',
-'copyrightwarning'         => '�ະລຸນາ ເຂົ້າໃຈວ່າ ທຸ�ໆ �ານປະ�ອບສ່ວນຕ�່�ັບ {{SITENAME}} ຈະຖື� ເປີດເຜີ� ພາ�ໃຕ້  $2 (ເບິ່ງ ລາ�ລະອຽດ ທີ່ $1). ຖ້າ ທ່ານ ບ�່ປະສົງ ໃຫ້ ສິ່ງທີ່ ທ່ານ ຂຽນ ຖື�ດັດ��້ ຫຼື �ຈ�ຢາ� ອີ� ຕາມຊອບໃຈ, ທ່ານ ບ�່ຄວນ ຂຽນຢູ່ນີ້. <br />
+'copyrightwarning'         => "�ະລຸນາ ເຂົ້າໃຈວ່າ ທຸ�ໆ �ານປະ�ອບສ່ວນຕ�່�ັບ {{SITENAME}} ຈະຖື� ເປີດເຜີ� ພາ�ໃຕ້  $2 (ເບິ່ງ ລາ�ລະອຽດ ທີ່ $1). ຖ້າ ທ່ານ ບ�່ປະສົງ ໃຫ້ ສິ່ງທີ່ ທ່ານ ຂຽນ ຖື�ດັດ��້ ຫຼື �ຈ�ຢາ� ອີ� ຕາມຊອບໃຈ, ທ່ານ ບ�່ຄວນ ຂຽນຢູ່ນີ້. <br />
 ທ່ານ ຈະຕ້ອງ ສັນ�າອີ�ວ່າ, ທ່ານ ຂຽນມັນຂຶ້ນມາເອງ ຫຼື �່າ�ມັນມາຈາ� ໂດເມນ ສາທາລະນະ ຫຼື ສິ່ງບ�່ເສ�ຄ່າ ຄ້າ�ຄື�ັນ.
-<strong>�ະລຸນາ ຢ່າ ສົ່ງສິ່ງທີ່ ຖື�ສະຫງວນ ລິຂະສິດ ໂດ� ບ�່ໄດ້ຮັບອະນຸ�າດ!</strong>',
-'copyrightwarning2'        => '�ະລຸນາ ເຂົ້າໃຈວ່າ ທຸ�ໆ �ານປະ�ອນສ່ວນ ຕ�່ {{SITENAME}} ອາດຖື� ດັດ��້, ປ່ຽນ�ປງ, ຫຼື ລຶບ ໂດ� ຜູ້ປະ�ອບສ່ວນອື່ນ. ຖ້າ ທ່ານ ບ�່ປະສົງ ໃຫ້ ສິ່ງທີ່ ທ່ານ ຂຽນ ຖື�ດັດ��້ ຫຼື �ຈ�ຢາ� ອີ� ຕາມຊອບໃຈ, ທ່ານ ບ�່ຄວນ ຂຽນຢູ່ນີ້. <br />
+'''�ະລຸນາ ຢ່າ ສົ່ງສິ່ງທີ່ ຖື�ສະຫງວນ ລິຂະສິດ ໂດ� ບ�່ໄດ້ຮັບອະນຸ�າດ!'''",
+'copyrightwarning2'        => "�ະລຸນາ ເຂົ້າໃຈວ່າ ທຸ�ໆ �ານປະ�ອນສ່ວນ ຕ�່ {{SITENAME}} ອາດຖື� ດັດ��້, ປ່ຽນ�ປງ, ຫຼື ລຶບ ໂດ� ຜູ້ປະ�ອບສ່ວນອື່ນ. ຖ້າ ທ່ານ ບ�່ປະສົງ ໃຫ້ ສິ່ງທີ່ ທ່ານ ຂຽນ ຖື�ດັດ��້ ຫຼື �ຈ�ຢາ� ອີ� ຕາມຊອບໃຈ, ທ່ານ ບ�່ຄວນ ຂຽນຢູ່ນີ້. <br />
 ທ່ານ ຈະຕ້ອງ ສັນ�າອີ�ວ່າ, ທ່ານ ຂຽນມັນຂຶ້ນມາເອງ ຫຼື �່າ�ມັນມາຈາ� ໂດເມນ ສາທາລະນະ ຫຼື ສິ່ງບ�່ເສ�ຄ່າ ຄ້າ�ຄື�ັນ.  (ເບິ່ງ ລາ�ລະອຽດ ທີ່ $1).
-<strong>�ະລຸນາ ຢ່າ ສົ່ງສິ່ງທີ່່ ຖື�ສະຫງວນ ລິຂະສິດ ໂດ� ບ�່ໄດ້ຮັບອະນຸ�າດ!</strong>',
-'protectedpagewarning'     => '<strong>ເອົາໃຈໃສ່ : ໜ້ານີ້ໄດ້ຖຶ�ປົ�ປ້ອງ ສະເພາະຜູ້ບ�ລິຫານລະບົບເທົ່ານັ້ນທີ່ສາມາດດັດ��້ໜ້ານີ້ໄດ້ ຫາ��ະລຸນາອ�າ�ປ່ຽນໜ້ານີ້ ຕິດຕ�່ຜູ້ບ�ລິຫານລະບົບ</strong>',
+'''�ະລຸນາ ຢ່າ ສົ່ງສິ່ງທີ່່ ຖື�ສະຫງວນ ລິຂະສິດ ໂດ� ບ�່ໄດ້ຮັບອະນຸ�າດ!'''",
+'protectedpagewarning'     => "'''ເອົາໃຈໃສ່ : ໜ້ານີ້ໄດ້ຖຶ�ປົ�ປ້ອງ ສະເພາະຜູ້ບ�ລິຫານລະບົບເທົ່ານັ້ນທີ່ສາມາດດັດ��້ໜ້ານີ້ໄດ້ ຫາ��ະລຸນາອ�າ�ປ່ຽນໜ້ານີ້ ຕິດຕ�່ຜູ້ບ�ລິຫານລະບົບ'''",
 'semiprotectedpagewarning' => "'''�າ�ເຫດ:''' ໜ້ານີ້ໄດ້ຖື�ປົ�ປ້ອງ �ລະ ມີ�ຕ່ຜູ້ໃຊ້ທີ່ສ້າງບັນຊີ�ລ້ວເທົ່ານັ້ນ ສາມາດດັດ��້ໄດ້.",
 'templatesused'            => '�ມ່�ບບໄດ້ໃຊ້ໃນໜ້ານີ້:',
 'templatesusedpreview'     => '�ມ່�ບບໃຊ້ໃນ�ານລອງເບິ່ງຜົນນີ້:',
@@ -404,13 +469,17 @@ $messages = array(
 'editundo'                => '�ັບຄືນ',
 
 # Search results
-'searchresulttext' => 'ສຳຫຼັບ ຂ�້ມູນເພີ່ມເຕີມ �່ຽວ�ັບ �ານຊອ�ຫາ ຢູ່ {{SITENAME}}, �ະລຸນາເບິ່ງ [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'   => "ທ່ານ ຊອ�ຫາ '''[[:$1]]'''",
-'noexactmatch'     => "'''�ັງບ�່ມີໜ້າ ຊື່ວ່າ  \"\$1\".''' ທ່ານ ສາມາດ [[:\$1|ສ້າງໜ້ານີ້ໄດ້]].",
-'prevn'            => '$1 �່ອນໜ້າ',
-'nextn'            => '$1 ຕ�່ໄປ',
-'viewprevnext'     => 'ເບິ່ງ ($1) ($2) ($3).',
-'powersearch'      => 'ຊອ�ຫາ',
+'searchresulttext'    => 'ສຳຫຼັບ ຂ�້ມູນເພີ່ມເຕີມ �່ຽວ�ັບ �ານຊອ�ຫາ ຢູ່ {{SITENAME}}, �ະລຸນາເບິ່ງ [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'      => "ທ່ານ ຊອ�ຫາ '''[[:$1]]'''",
+'noexactmatch'        => "'''�ັງບ�່ມີໜ້າ ຊື່ວ່າ  \"\$1\".''' ທ່ານ ສາມາດ [[:\$1|ສ້າງໜ້ານີ້ໄດ້]].",
+'prevn'               => '$1 �່ອນໜ້າ',
+'nextn'               => '$1 ຕ�່ໄປ',
+'viewprevnext'        => 'ເບິ່ງ ($1) ($2) ($3).',
+'searchhelp-url'      => 'Help:ເນື້ອໃນ',
+'search-result-size'  => '$1 ({{PLURAL:$2|1 ຄຳ|$2 ຄຳ}})',
+'search-result-score' => 'ຄວາມ�່ຽວຂ້ອງ: $1%',
+'search-redirect'     => '(ໂອນ $1)',
+'powersearch'         => 'ຊອ�ຫາ',
 
 # Preferences page
 'preferences'           => '�ານຕັ້ງຄ່າ',
@@ -418,6 +487,7 @@ $messages = array(
 'prefs-edits'           => 'ຈຳນວນ�ານດັດ��້:',
 'changepassword'        => 'ປ່ຽນລະຫັດຜ່ານ',
 'skin'                  => 'ລວດລາ�',
+'skin-preview'          => 'ລອງເບິ່ງ',
 'math'                  => 'ຄະນິດສາດ',
 'dateformat'            => '�ບບວັນເດືອນປີ',
 'datedefault'           => '�ນວໃດ��່ໄດ້',
@@ -431,9 +501,6 @@ $messages = array(
 'prefs-misc'            => '�ລະອື່ນໆ',
 'saveprefs'             => 'ບັນທຶ�',
 'resetprefs'            => 'ເລີ່ມຄືນໃ�່',
-'oldpassword'           => 'ລະຫັດຜ່ານເ�ົ່າ:',
-'newpassword'           => 'ລະຫັດຜ່ານໃ�່:',
-'retypenew'             => 'ພິມລະຫັດຜ່ານໃ�່ອີ�:',
 'textboxsize'           => '�ານດັດ��້',
 'rows'                  => '�ຖວ:',
 'columns'               => 'ຖັນ:',
@@ -488,14 +555,14 @@ $messages = array(
 'badfilename'       => 'ຊື່ໄຟລ໌ ໄດ້ຖື�ປ່ຽນເປັນ  "$1".',
 'large-file'        => 'ໄຟລ໌ບ�່ຄວນມີຂະໜາດໃຫ�່�ວ່າ $1 �ຕ່ໄຟລ໌ນີ້ມີຂະໜາດ  $2',
 'largefileserver'   => 'ໄຟລ໌ມີຂະໜາດໃຫ�່�ວ່າຄ່າທີ່ໃຊ້ໄດ້',
-'filepageexists'    => 'ມີໜ້າສຳຫຼັບຫັວເຮື່ອງນີ້ອ�ູ່�ລ້ວ (ບ�່ໃຊ່ໄຟລ໌) �ະລຸນາຕວດສອບ <strong>$1</strong> ຫາ�ຄຸນບ�່�ນ່ໃຈວ່າຕ້ອງ�ານຈະປ່ຽນໜ້ານີ້',
+'filepageexists'    => "ມີໜ້າສຳຫຼັບຫັວເຮື່ອງນີ້ອ�ູ່�ລ້ວ (ບ�່ໃຊ່ໄຟລ໌) �ະລຸນາຕວດສອບ '''$1''' ຫາ�ຄຸນບ�່�ນ່ໃຈວ່າຕ້ອງ�ານຈະປ່ຽນໜ້ານີ້",
 'savefile'          => 'ບັນທຶ�ໄຟລ໌',
 'watchthisupload'   => 'ຕິດຕາມໜ້ານີ້',
 
-# Special:ImageList
-'imagelist' => 'ລາ�ຊື່ໄຟລ໌',
+# Special:ListFiles
+'listfiles' => 'ລາ�ຊື່ໄຟລ໌',
 
-# Image description page
+# File description page
 'filehist'            => 'ປະຫວັດໄຟລ໌',
 'filehist-current'    => 'ປະຈຸບັນ',
 'filehist-datetime'   => 'ວັນເວລາ',
@@ -575,11 +642,9 @@ $messages = array(
 'booksources-go' => 'ໄປ',
 
 # Special:Log
-'log'               => 'ບັນທຶ�',
-'all-logs-page'     => 'ທຸ�ໆຂ�້ມູນບັນທຶ��ານນຳໃຊ້',
-'log-search-legend' => 'ຊອ�ຫາ ໃນ ບັນທຶ��ານນຳໃຊ້',
-'log-search-submit' => 'ໄປ',
-'logempty'          => '�ັງບ�່ພົບເນື້ອໃນບັນທຶ�.',
+'log'           => 'ບັນທຶ�',
+'all-logs-page' => 'ທຸ�ໆຂ�້ມູນບັນທຶ��ານນຳໃຊ້',
+'logempty'      => '�ັງບ�່ພົບເນື້ອໃນບັນທຶ�.',
 
 # Special:AllPages
 'allpages'       => 'ທຸ�ໆໜ້າ',
@@ -597,9 +662,18 @@ $messages = array(
 'categories'         => '�ວດ',
 'categoriespagetext' => 'ມີ ບັນດາ �ວດ ຕ�່ໄປນີ້ ຢູ່ ວິ�ີ.',
 
+# Special:LinkSearch
+'linksearch' => 'ຄົ້ນຫາ�ານເຊື່ອມຕ�່ຫາເວັບ',
+
 # Special:ListUsers
 'listusers-submit' => 'ສະ�ດງ',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'ບັນທຶ��ານສ້າງບັນຊີຜູ້ໃຊ້',
+'newuserlogpagetext'       => 'ນີ້�ມ່ນ ບັນທຶ��ານສ້າງ ບັນຊີຜູ້ໃຊ້ໃ�່',
+'newuserlog-create-entry'  => 'ຜູ້ໃຊ້ໃ�່',
+'newuserlog-create2-entry' => 'ໄດ້ສ້າງບັນຊີ ໃຫ້ $1',
+
 # E-mail user
 'emailuser'      => 'ສົ່ງອີເມລ ຫາ ຜູ້ໃຊ້ນີ້',
 'emailpage'      => 'ສົ່ງອີເມລ ຫາ ຜູ້ໃຊ້',
@@ -632,12 +706,6 @@ $messages = array(
 'watchnochange'        => 'ບ�່ມີໜ້າທີ່ທ່ານຕິດຕາມໃດໆ ຖື�ດັດ�ປງໃນໄລ�ະສະ�ດງຂ້າງເທິງນີ້.',
 'wlheader-showupdated' => "* ບັນດາ ໜ້າ ທີ່ມີ�ານປ່ຽນ�ປງ ຫຼັງຈາ�ທີ່ທ່ານ ເຂົ້າຊົມຫຼ້າສຸດ ຈະຖື�ສະ�ດງເປັນ ໂຕໜັງສື  '''ເຂັ້ມ'''",
 'wlshowlast'           => 'ສະ�ດງ $1 ຊົ່ວໂມງຫຼ້າສຸດ $2 ມື້ຫຼ້າສຸດ $3',
-'watchlist-show-bots'  => 'ສະ�ດງ�ານດັດ��້ ໂດ� ບອທ໌',
-'watchlist-hide-bots'  => 'ເຊື່ອງ�ານດັດ��້ ໂດ� ບອທ໌',
-'watchlist-show-own'   => 'ສະ�ດງ�ານດັດ��້ໂດ�ຂ້ອ�',
-'watchlist-hide-own'   => 'ເຊື່ອງ�ານດັດ��້ ໂດ� ຂ້ອ�',
-'watchlist-show-minor' => 'ສະ�ດງ�ານດັດ��້ເລັ�ນ້ອ�',
-'watchlist-hide-minor' => 'ເຊື່ອງ�ານດັດ��້ເລັ�ນ້ອ�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ພວມຕິດຕາມ...',
@@ -648,23 +716,28 @@ $messages = array(
 'created'            => 'ສ້າງ�ລ້ວ',
 'enotif_lastvisited' => 'ເບິ່ງ $1 ເພື່ອ ທຸ�ໆ�ານປ່ຽນ�ປງ ຕັ້ງ�ຕ່ເທື່ອສຸດທ້າ� ທີ່ ທ່ານເຂົ້າຫາ.',
 
-# Delete/protect/revert
-'confirm'                     => 'ຢືນຢັນ',
-'actioncomplete'              => 'ສຳເລັດ',
-'deletedarticle'              => 'ໄດ້ລຶບ "[[$1]]"',
-'dellogpage'                  => 'ບັນທຶ� �ານລຶບ',
-'dellogpagetext'              => 'ຂ້າງລຸ່ມ �ມ່ນ ລາ��ານ �ານລຶບຫຼ້າສຸດ.',
-'deletionlog'                 => 'ບັນທຶ� �ານລຶບ',
-'deletecomment'               => 'ເຫດຜົນໃນ�ານລຶບ',
-'rollbacklink'                => '�ັບຄືນ',
-'cantrollback'                => 'ບ�່ສາມາດ ປ່ຽນ�ານດັດ��້�ັບຄືນໄດ້; ຜູ້ປະ�ອບສ່ວນຫຼ້າສຸດ �ມ່ນ ຜູ້ຂຽນພຽງຜູ້ດຽວ ຂອງ ໜ້ານີ້.',
+# Delete
+'confirm'        => 'ຢືນຢັນ',
+'actioncomplete' => 'ສຳເລັດ',
+'deletedarticle' => 'ໄດ້ລຶບ "[[$1]]"',
+'dellogpage'     => 'ບັນທຶ� �ານລຶບ',
+'dellogpagetext' => 'ຂ້າງລຸ່ມ �ມ່ນ ລາ��ານ �ານລຶບຫຼ້າສຸດ.',
+'deletionlog'    => 'ບັນທຶ� �ານລຶບ',
+'deletecomment'  => 'ເຫດຜົນໃນ�ານລຶບ',
+
+# Rollback
+'rollbacklink' => '�ັບຄືນ',
+'cantrollback' => 'ບ�່ສາມາດ ປ່ຽນ�ານດັດ��້�ັບຄືນໄດ້; ຜູ້ປະ�ອບສ່ວນຫຼ້າສຸດ �ມ່ນ ຜູ້ຂຽນພຽງຜູ້ດຽວ ຂອງ ໜ້ານີ້.',
+
+# Protect
 'protectlogpage'              => 'ບັນທຶ��ານປົ�ປ້ອງ',
 'protectedarticle'            => 'ໄດ້ປົ�ປ້ອງ "[[$1]]"',
 'unprotectedarticle'          => 'ໄດ້ເຊົາປົ�ປ້ອງ "[[$1]]"',
 'protect-title'               => '�ຳລັງປົ�ປ້ອງໜ້າ "$1"',
+'prot_1movedto2'              => '[[$1]] �້າ�ໄປ [[$2]]',
 'protect-legend'              => 'ຢືນຢັນ �ານປົ�ປ້ອງ',
 'protectexpiry'               => '�ົດ�ຳນົດ:',
-'protect-text'                => 'ທ່ານສາມາດເບິ່ງ �ລະ ປ່ຽນ�ປງ ລະດັບ�ານປົ�ປ້ອງ ສຳຫຼັບ ໜ້າ  <strong><nowiki>$1</nowiki> ຢູ່ນີ້</strong>.',
+'protect-text'                => "ທ່ານສາມາດເບິ່ງ �ລະ ປ່ຽນ�ປງ ລະດັບ�ານປົ�ປ້ອງ ສຳຫຼັບ ໜ້າ  '''<nowiki>$1</nowiki> ຢູ່ນີ້'''.",
 'protect-level-autoconfirmed' => 'ຫ້າມຜູ້ໃຊ້ບ�່ໄດ້ເຊັນເຂົ້າ',
 'protect-level-sysop'         => 'ສະເພາະຜູ້ບ�ລິຫານລະບົບ',
 'protect-expiring'            => '�ົດອາ�ຸ $1 (UTC)',
@@ -705,7 +778,6 @@ $messages = array(
 # What links here
 'whatlinkshere'       => 'ໜ້າທີ່ເຊື່ອມຕ�່ມາ',
 'whatlinkshere-title' => 'ໜ້າທີ່ເຊື່ອມຕ�່ຫາ $1',
-'linklistsub'         => '(ລາ��ານລິ້ງຄ໌)',
 'linkshere'           => "ບັນດາໜ້າຕ�່ໄປ ລິ້ງຄ໌ ຫາ ''[[:$1]]''':",
 'nolinkshere'         => "ບ�່ມີໜ້າລິ້ງຄ໌ ຫາ '''[[:$1]]'''.",
 'nolinkshere-ns'      => "ບ�່ມີໜ້າລິ້ງຄ໌ ຫາ '''[[:$1]]''' ໃນ ຂອບເຂດຊື່ ທີ່ ທ່ານເລືອ�.",
@@ -733,6 +805,7 @@ $messages = array(
 'movepagetext'            => 'ທ່ານສາມາດ ປ່ຽນຊື່ໜ້າ �ລະ �້າ�ປະຫວັດ�ານດັດ��້ ຂອງໜ້າໃດໜຶ່ງ ໄປ ໜ້າໃ�',
 'movepagetalktext'        => "ໜ້າສົນທະນາຈະຖື��້າ�ໄປພ້ອມ�ັນ '''ເວັ້ນເສ��ຕ່:''",
 'movearticle'             => '�້າ�ໜ້າ:',
+'movenologin'             => '�ັງບ�່ໄດ້ເຊັນເຂົ້າເທື່ອ',
 'newtitle'                => 'ຫາ ຫົວຂ�້ໃ�່',
 'move-watch'              => 'ຕິດຕາມໜ້ານີ້',
 'movepagebtn'             => '�້າ�ໜ້າ',
@@ -817,7 +890,7 @@ $messages = array(
 'show-big-image'       => 'ເຕັມຂະໜາດ',
 'show-big-image-thumb' => '<small>ຂະໜາດລອງເບິ່ງ: $1 × $2 ປິ�ເຊລ</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'         => 'ໄຟລ໌ຮູບໃ�່',
 'newimages-summary' => 'ໜ້າພິເສດນີ້ສະ�ດງໄຟລ໌ທີ່ຖຶ�ອັປໂຫຼດຫຼ້າສຸດ',
 'noimages'          => 'ບ�່ມີຫ�ັງເບິ່ງ.',
@@ -870,17 +943,9 @@ $messages = array(
 # Delete conflict
 'recreate' => 'ສ້າງຄືນ',
 
-# HTML dump
-'redirectingto' => 'ພວມໂອນໄປ ຫາ [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'ຕົ�ລົງ',
 
-# AJAX search
-'searchcontaining' => "ຊອ�ຫາ ບົດຄວາມ ທີ່ປະ�ອບມີ  ''$1''.",
-'searchnamed'      => "ຊອ�ຫາ ບົດຄວາມ ຊື່ ''$1''.",
-'articletitles'    => "ບົດຄວາມ ເລີ່ມດ້ວ� ''$1''",
-
 # Multipage image navigation
 'imgmultigo' => 'ໄປ!',
 
diff --git a/languages/messages/MessagesLoz.php b/languages/messages/MessagesLoz.php
index e6eca5b0..b7129ab5 100644
--- a/languages/messages/MessagesLoz.php
+++ b/languages/messages/MessagesLoz.php
@@ -47,8 +47,6 @@ $messages = array(
 'underline-never'   => 'Yexet',
 'underline-default' => 'Pokuhe',
 
-'skinpreview' => '(PendiBe)',
-
 # Dates
 'sunday'        => 'La Pumulo',
 'monday'        => 'La Mubulo',
@@ -125,7 +123,7 @@ $messages = array(
 'mytalk'         => 'Zwa bulelezi',
 'anontalk'       => 'Bulelezi di bye IP',
 'navigation'     => 'Muya',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Meta ngesi:',
@@ -186,8 +184,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => "Ngesi ye ng'i atulile {{SITENAME}}",
 'aboutpage'            => "Project:Ngesi ye ng'i atulile",
-'bugreports'           => 'Filubani di bug',
-'bugreportspage'       => 'Project:Filubani di bug',
 'copyright'            => 'Bye sa ilonungi di $1.',
 'copyrightpagename'    => "{{SITENAME}} copyright ng'i",
 'copyrightpage'        => "{{ns:project}}:Copyright ng'i",
@@ -210,8 +206,6 @@ $messages = array(
 
 'badaccess'        => 'Bufosi pemiko',
 'badaccess-group0' => 'Zwa eksyon ni sa di sebelu kwa zwa kattegorina. Kyon ni sa vanu.',
-'badaccess-group1' => 'Zwa eksyon sa di sebelu kwa kattegori $1.',
-'badaccess-group2' => 'Zwa eksyon sa di sebelu kwa 1 di kattegorina $1.',
 'badaccess-groups' => 'Zwa eksyon sa di sebelu kwa 1 di kattegorina $1.',
 
 'versionrequired'     => 'Pane $1 di MediaWiki sa nidyisize',
@@ -343,10 +337,10 @@ Sa ku bye fatukile zwa sebu dafi e a ni petuho, ni petuho e mulumiwasibukirisize
 'loginlanguagelabel'        => 'Zwa Siselect: $1',
 
 # Password reset dialog
-'resetpass'         => 'Lisetize sebelu sebu dafi',
-'resetpass_header'  => 'Lisetize sebu dafi',
-'resetpass_submit'  => 'Setize sebu dafi e menuhile',
-'resetpass_missing' => 'Ni form datani.',
+'resetpass'        => 'Lisetize sebelu sebu dafi',
+'resetpass_header' => 'Lisetize sebu dafi',
+'retypenew'        => 'Sebu dafi:',
+'resetpass_submit' => 'Setize sebu dafi e menuhile',
 
 # Edit page toolbar
 'bold_sample'     => 'Selt ombelu',
@@ -371,8 +365,8 @@ Sa ku bye fatukile zwa sebu dafi e a ni petuho, ni petuho e mulumiwasibukirisize
 'hr_tip'          => 'Lani - (sepalati)',
 
 # Edit pages
-'summary'                => 'Lyangutukezi',
-'subject'                => 'Lyangutukezi selt',
+'summary'                => 'Lyangutukezi:',
+'subject'                => 'Lyangutukezi selt:',
 'minoredit'              => 'A sa pili kenki',
 'watchthis'              => 'Kantezi bye petulo',
 'savearticle'            => 'Bulukezi',
@@ -382,7 +376,7 @@ Sa ku bye fatukile zwa sebu dafi e a ni petuho, ni petuho e mulumiwasibukirisize
 'showdiff'               => 'Kamukile nca petuho',
 'anoneditwarning'        => "'''!:''' A ni sa menuhile.
 Zwa adresi di IP sa bulukezi kwa kenki bundau di petulo.",
-'summary-preview'        => 'Lyangutukezi pendiBe',
+'summary-preview'        => 'Lyangutukezi pendiBe:',
 'blockedtitle'           => 'Sebelu sa bolok',
 'blockedtext'            => "<big>'''Zwa sebelu/IP sa bolok.'''</big>
 
@@ -407,19 +401,19 @@ Di hloli, seltisize kwa sisebelisoni (kamukile [[{{MediaWiki:Helppage}}|likitisi
 A sa nca di bufosi, tampi '''back'''.",
 'noarticletext'          => 'Sa no selt kwa petulo, a sa [[Special:Search/{{PAGENAME}}|fatukile di petulonom]] kwa xete petulo/[{{fullurl:{{FULLPAGENAME}}|action=edit}} petulo kenki].',
 'updated'                => '(sa updeti)',
-'note'                   => '<strong>Lyangutukezi:</strong>',
-'previewnote'            => '<strong>A sa in kamukile PendiBe; petuho ni sa bulukezi!</strong>',
+'note'                   => "'''Lyangutukezi:'''",
+'previewnote'            => "'''A sa in kamukile PendiBe; petuho ni sa bulukezi!'''",
 'editing'                => "Hloli ye ng'i $1",
 'editingsection'         => "Hloli ye ng'i $1 (lyangutukezi)",
 'editingcomment'         => "Hloli ye ng'i $1 (lyangutukezi)",
 'yourtext'               => 'Zwa selt',
 'storedversion'          => 'Selt bulukezi',
 'yourdiff'               => 'Petuhoni',
-'copyrightwarning'       => 'Xete kenki di {{SITENAME}} sa rilisi kwa $2 (fatukile $1 di pagu). A ni tokwezi zwa selt sa kenki a ridistributi kwa tokwi, ni bulukezi.<br />
+'copyrightwarning'       => "Xete kenki di {{SITENAME}} sa rilisi kwa $2 (fatukile $1 di pagu). A ni tokwezi zwa selt sa kenki a ridistributi kwa tokwi, ni bulukezi.<br />
 A sumekezi zwa selt sa dya, a kopisize di publiki domeni, a ike risorsi.
-<strong>NI BULUKEZI SELT KOPINITUMELELO E NI TUMELELO!</strong>',
-'longpagewarning'        => "<strong>AGTU: Bye petulo sa $1 kilobytes; browser sa di bufosikaku hloli ye ng'i petulo plusu di 32 kilobytes.
-Konsidisize takubikinalisize.</strong>",
+'''NI BULUKEZI SELT KOPINITUMELELO E NI TUMELELO!'''",
+'longpagewarning'        => "'''AGTU: Bye petulo sa $1 kilobytes; browser sa di bufosikaku hloli ye ng'i petulo plusu di 32 kilobytes.
+Konsidisize takubikinalisize.'''",
 'templatesused'          => 'Yegani sebelize di bye petulo:',
 'templatesusedpreview'   => 'Yegani sebelize kwa bye PendiBe:',
 'template-protected'     => '(sa bukelezi)',
@@ -438,7 +432,7 @@ Desu dafi kulobala di petulo sa gi di informasi:",
 'viewpagelogs'        => 'Kamukile desu di petulo',
 'currentrev'          => 'Selt nca',
 'revisionasof'        => 'Selt di $1',
-'revision-info'       => 'Selt di $1 di $2',
+'revision-info'       => 'Selt di $1 di $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Kona selt',
 'nextrevision'        => 'Lila selt→',
 'currentrevisionlink' => 'Selt nca',
@@ -487,6 +481,7 @@ Informasi: (bye) = petuho a nca selt,
 'prevn'                 => 'kona $1',
 'nextn'                 => 'lila $1',
 'viewprevnext'          => 'Kamukile ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:Buinaneli di petulo',
 'searchall'             => 'xete',
 'showingresults'        => "Kamukile opi {{PLURAL:$1|'''1''' ekali|'''$1''' ekalina}} di #'''$2'''.",
 'showingresultsnum'     => "Kamukile {{PLURAL:$3|'''1''' ekali|'''$3''' ekalina}} di #'''$2'''.",
@@ -499,6 +494,7 @@ Informasi: (bye) = petuho a nca selt,
 'prefsnologin'      => 'Ni menuhile',
 'qbsettings-none'   => 'Ni',
 'skin'              => 'PendiBe',
+'skin-preview'      => 'PendiBe',
 'math'              => 'Mat',
 'dateformat'        => 'Data apukisize',
 'datedefault'       => 'Ni di petohoni di sebelu',
@@ -507,7 +503,6 @@ Informasi: (bye) = petuho a nca selt,
 'prefs-watchlist'   => 'Mukoloko di kentezi',
 'saveprefs'         => 'Bulukezi',
 'resetprefs'        => 'Lisetize',
-'retypenew'         => 'Sebu dafi:',
 'textboxsize'       => "Hloli ye ng'i",
 'rows'              => 'Roo:',
 'columns'           => 'Kalom:',
@@ -581,12 +576,12 @@ di uplodezi media.',
 
 'license-nopreview' => '(PendiBe di nupdeti)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'imegi',
-'imagelist'      => 'Mukoloko di imegina',
-'imagelist_user' => 'Sebelu',
+'listfiles'      => 'Mukoloko di imegina',
+'listfiles_user' => 'Sebelu',
 
-# Image description page
+# File description page
 'filehist'                  => 'Imegi bundau',
 'filehist-help'             => 'Tampa datum/taimi di kamukile imegi a sa kwa bye datum.',
 'filehist-current'          => 'bye',
@@ -631,9 +626,8 @@ di uplodezi media.',
 'randomredirect' => 'Petulo abezi fona',
 
 # Statistics
-'statistics' => 'Mukoloko di kamukile',
-'sitestats'  => 'Mukoloko di kamukile di {{SITENAME}}',
-'userstats'  => 'Mukoloko di kamukile di sebelu',
+'statistics'              => 'Mukoloko di kamukile',
+'statistics-header-users' => 'Mukoloko di kamukile di sebelu',
 
 'disambiguations' => 'Disamebigasina',
 
@@ -694,7 +688,6 @@ di uplodezi media.',
 'speciallogtitlelabel' => 'Sebu:',
 'log'                  => 'Desuni',
 'all-logs-page'        => 'Xete desu',
-'log-search-submit'    => 'Afi',
 
 # Special:AllPages
 'allpages'       => 'Mukoloko di petulo',
@@ -711,6 +704,9 @@ di uplodezi media.',
 # Special:Categories
 'categories' => 'Kattegori',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Afina di sebelu bye sa afi kulobala',
+
 # Special:ListUsers
 'listusersfrom'      => 'Kamukile sebelu di:',
 'listusers-submit'   => 'Kamukile',
@@ -732,28 +728,25 @@ dicon sa sosize ni sa meli di kupo sebelu.',
 'emailsenttext'   => 'Zwa meli sa afi.',
 
 # Watchlist
-'watchlist'            => 'Zwa mukoloko di kentezi',
-'mywatchlist'          => 'Zwa mukoloko di kentezi',
-'watchlistfor'         => "(di '''$1''')",
-'watchnologin'         => 'A ni sa menuhile',
-'watchnologintext'     => "A sa [[Special:UserLogin|menuhile]] di hloli ye ng'i zwa mukoloko di kentezi.",
-'addedwatch'           => 'Tumbelize a mukoloko di kentezi',
-'addedwatchtext'       => "Petulo \"[[:\$1]]\" sa vugisize di zwa [[Special:Watchlist|mukoloko di kentezi]].
+'watchlist'         => 'Zwa mukoloko di kentezi',
+'mywatchlist'       => 'Zwa mukoloko di kentezi',
+'watchlistfor'      => "(di '''$1''')",
+'watchnologin'      => 'A ni sa menuhile',
+'watchnologintext'  => "A sa [[Special:UserLogin|menuhile]] di hloli ye ng'i zwa mukoloko di kentezi.",
+'addedwatch'        => 'Tumbelize a mukoloko di kentezi',
+'addedwatchtext'    => "Petulo \"[[:\$1]]\" sa vugisize di zwa [[Special:Watchlist|mukoloko di kentezi]].
 Petuhoni di bye petulo e sa bulelezi sa mukolokosize ta, e '''ombelu''' kwa [[Special:RecentChanges|petuho nca]] di kwazidisize akusize.
 
 A sa afi kulobala di zwa mukoloko di kentezi, tampi \"ngambu kentezi\".",
-'removedwatch'         => 'Sa afi kulobala di zwa mukoloko di kentezi',
-'removedwatchtext'     => 'Petulo "[[:$1]]" sa afi kulobala di zwa mukoloko di kentezi.',
-'watch'                => 'Kentezi',
-'watchthispage'        => 'Kentezi bye petulo',
-'unwatch'              => 'Ngambu kentezi',
-'unwatchthispage'      => 'Ngambu kentezi',
-'notanarticle'         => 'Ni di petulo infomelo',
-'watchlist-details'    => '{{PLURAL:$1|$1 petulo|$1 petulo}} sa kentezi e no bulelezi.',
-'wlshowlast'           => 'Kamukile lapu-lila $1 holani $2 dia $3',
-'watchlist-hide-bots'  => 'Cwankekile roboti',
-'watchlist-hide-own'   => 'Cwankekile zwa afina',
-'watchlist-hide-minor' => 'Cwankekile pili kenki',
+'removedwatch'      => 'Sa afi kulobala di zwa mukoloko di kentezi',
+'removedwatchtext'  => 'Petulo "[[:$1]]" sa afi kulobala di zwa mukoloko di kentezi.',
+'watch'             => 'Kentezi',
+'watchthispage'     => 'Kentezi bye petulo',
+'unwatch'           => 'Ngambu kentezi',
+'unwatchthispage'   => 'Ngambu kentezi',
+'notanarticle'      => 'Ni di petulo infomelo',
+'watchlist-details' => '{{PLURAL:$1|$1 petulo|$1 petulo}} sa kentezi e no bulelezi.',
+'wlshowlast'        => 'Kamukile lapu-lila $1 holani $2 dia $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Kentezi...',
@@ -764,38 +757,43 @@ A sa afi kulobala di zwa mukoloko di kentezi, tampi \"ngambu kentezi\".",
 'changed'                      => 'petuhoni',
 'created'                      => 'hlolini',
 
-# Delete/protect/revert
-'deletepage'                  => 'Afi kulobala petulo',
-'confirm'                     => 'Afi pe',
-'excontent'                   => "Petulo sa ng'i: '$1'",
-'excontentauthor'             => "Petulo sa ng'i: '$1' (sebelu sa ng'i '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Petulo sa ng'i blanco: '$1'",
-'exblank'                     => 'petulo sa blanco',
-'historywarning'              => 'Petulo, sa afi kulobala, sa bundau di sebelu:',
-'confirmdeletetext'           => 'A sa afi kulobala petulo e bundau. A sa ukisize a sa ni bufosi e a sa iki di  [[{{MediaWiki:Policy-url}}|polisi]].',
-'actioncomplete'              => 'Sa afi',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" sa afi kulobala. Fatukile $2 di desu di afi kulobala nca.',
-'deletedarticle'              => 'sa afi kulobala "[[$1]]"',
-'dellogpage'                  => 'Desu di afi kulobala',
-'deletecomment'               => 'Lyangutukezi:',
-'deleteotherreason'           => 'Xetewi/ewi lyangutukezi:',
-'deletereasonotherlist'       => 'Xetewi lyangutukezi',
-'rollback'                    => "Afi hlolina ye ng'i lila",
-'rollback_short'              => "Afi hloli ye ng'i lila",
-'rollbacklink'                => "afi hloli ye ng'i lila",
-'rollbackfailed'              => "Bufosi dafi hloli ye ng'i lila",
+# Delete
+'deletepage'            => 'Afi kulobala petulo',
+'confirm'               => 'Afi pe',
+'excontent'             => "Petulo sa ng'i: '$1'",
+'excontentauthor'       => "Petulo sa ng'i: '$1' (sebelu sa ng'i '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'         => "Petulo sa ng'i blanco: '$1'",
+'exblank'               => 'petulo sa blanco',
+'historywarning'        => 'Petulo, sa afi kulobala, sa bundau di sebelu:',
+'confirmdeletetext'     => 'A sa afi kulobala petulo e bundau. A sa ukisize a sa ni bufosi e a sa iki di  [[{{MediaWiki:Policy-url}}|polisi]].',
+'actioncomplete'        => 'Sa afi',
+'deletedtext'           => '"<nowiki>$1</nowiki>" sa afi kulobala. Fatukile $2 di desu di afi kulobala nca.',
+'deletedarticle'        => 'sa afi kulobala "[[$1]]"',
+'dellogpage'            => 'Desu di afi kulobala',
+'deletecomment'         => 'Lyangutukezi:',
+'deleteotherreason'     => 'Xetewi/ewi lyangutukezi:',
+'deletereasonotherlist' => 'Xetewi lyangutukezi',
+
+# Rollback
+'rollback'       => "Afi hlolina ye ng'i lila",
+'rollback_short' => "Afi hloli ye ng'i lila",
+'rollbacklink'   => "afi hloli ye ng'i lila",
+'rollbackfailed' => "Bufosi dafi hloli ye ng'i lila",
+
+# Protect
 'protectlogpage'              => 'Desu di bukelize',
 'protectedarticle'            => 'sa bukelelize "[[$1]]"',
 'unprotectedarticle'          => 'sa ati-bukelelize "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] nyanganyisize di [[$2]]',
 'protect-legend'              => 'Bukelezi',
 'protectcomment'              => 'Lyangutukezi:',
 'protectexpiry'               => 'Simpekile:',
 'protect_expiry_invalid'      => 'Bufosi di simpekile.',
 'protect_expiry_old'          => 'Simpekile sa kwa bundau.',
 'protect-unchain'             => 'Petuho nyanganyisize tumelelo',
-'protect-text'                => 'A sa kamukile e hloli bukelezi di petulo <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Zwa sebelu ni sa hloli bukelezi.
-Petohoni di petulo <strong>$1</strong> sa:',
+'protect-text'                => "A sa kamukile e hloli bukelezi di petulo '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Zwa sebelu ni sa hloli bukelezi.
+Petohoni di petulo '''$1''' sa:",
 'protect-cascadeon'           => 'Bye petulo sa bukelezi a sa kwa bye {{PLURAL:$1|petulo|petulo}}, asa kaskedi. A sa hloli bukelezi, a ni sa afakize kaskedi.',
 'protect-default'             => '(auto)',
 'protect-fallback'            => 'No "$1" tumelelo',
@@ -805,6 +803,7 @@ Petohoni di petulo <strong>$1</strong> sa:',
 'protect-expiring'            => 'simpekile $1 (UTC)',
 'protect-cascade'             => 'Bukelezi petulo kwa bye petulo (kaskedi)',
 'protect-cantedit'            => "A ni ku hloli a bukelezi di bye petulo, a ni sa tumelelo di hloli ye ng'i.",
+'protect-expiry-options'      => '2 ora:2 hours,1 dia:1 day,3 dia:3 days,1 wiki:1 week,2 wiki:2 weeks,1 muna:1 month,3 muna:3 months,6 muna:6 months,1 anu:1 year,di simuluzi:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Tumelelo:',
 'restriction-level'           => 'Bolok tumelelo:',
 
@@ -851,7 +850,6 @@ Petohoni di petulo <strong>$1</strong> sa:',
 'whatlinkshere'       => "Ling'ki di bye petulo",
 'whatlinkshere-title' => "Petulo bye ling'ki di $1",
 'whatlinkshere-page'  => 'Petulo:',
-'linklistsub'         => "(Mukoloko di ling'kina)",
 'linkshere'           => "Bye petulo ling'ki di '''[[:$1]]''':",
 'nolinkshere'         => "0 petulo ling'ki di '''[[:$1]]'''.",
 'nolinkshere-ns'      => "0 petulo ling'ki di '''[[:$1]]''' bye sa di bye fatukile efro.",
@@ -894,6 +892,7 @@ a sa gukilize di nyanganyisize.",
 
 Teri yaki, a nyanganyisize.",
 'movearticle'      => 'Nyanganyisize petulo:',
+'movenologin'      => 'A ni sa menuhile',
 'newtitle'         => 'Di nca petulo:',
 'move-watch'       => 'Kentezi bye petulo',
 'movepagebtn'      => 'Nyanganyisize petulo',
@@ -920,7 +919,7 @@ Teri yaki, a nyanganyisize.",
 'allmessagesdefault' => 'Selt orge',
 'allmessagescurrent' => 'Selt nca',
 'allmessagestext'    => 'Bye mukoloko sa mukoloko di mulumiwani di MediaWiki poo.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 
 # Thumbnails
 'thumbnail-more'  => 'Pusize',
@@ -929,6 +928,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 # Special:Import
 'import'                  => 'Petulo import',
 'import-interwiki-submit' => 'Petulo import',
+'import-comment'          => 'Lyangutukezi:',
 
 # Import log
 'importlogpage' => 'Desu di import',
@@ -1017,7 +1017,7 @@ $1',
 'show-big-image'       => 'Risolusi bakisize',
 'show-big-image-thumb' => '<small>PendiBe: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Imegina nca',
 'ilsubmit'              => 'Fatukile',
 'sp-newimages-showfrom' => 'Kamukile nca imegi di $1',
@@ -1058,17 +1058,9 @@ Xete ling'ki kwa lina sa konsidisize desepo. Petulo dimedi inlinenikusize.",
 # Trackbacks
 'trackbackremove' => ' ([$1 afi kulobala])',
 
-# HTML dump
-'redirectingto' => 'Abezi di [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'Afi',
 
-# AJAX search
-'searchcontaining' => "Fatukile di petulo con selt ''$1''.",
-'searchnamed'      => "Fatukile di petulo di sebu ''$1''.",
-'articletitles'    => "Petulo di ''$1''",
-
 # Multipage image navigation
 'imgmultipageprev' => '� kona petulo',
 'imgmultipagenext' => 'lila petulo →',
diff --git a/languages/messages/MessagesLt.php b/languages/messages/MessagesLt.php
index c0fb3002..ae18e928 100644
--- a/languages/messages/MessagesLt.php
+++ b/languages/messages/MessagesLt.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author Garas
+ * @author Homo
  * @author Hugo.arg
  * @author Matasg
  * @author Meno25
@@ -25,8 +26,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Naudotojo_aptarimas',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_aptarimas',
-	NS_IMAGE            => 'Vaizdas',
-	NS_IMAGE_TALK       => 'Vaizdo_aptarimas',
+	NS_FILE             => 'Vaizdas',
+	NS_FILE_TALK        => 'Vaizdo_aptarimas',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_aptarimas',
 	NS_TEMPLATE         => 'Å ablonas',
@@ -37,15 +38,87 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Kategorijos_aptarimas',
 );
 
-$skinNames = array(
-	'standard'    => 'KlasikinÄ—',
-	'nostalgia'   => 'Nostalgija',
-	'cologneblue' => 'Kelno mÄ—lyna',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'Mano išvaizda',
-	'chick'       => 'Chick',
-	'simple'      => 'Paprasta',
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Dvigubi peradesavimai' ),
+	'BrokenRedirects'           => array( 'Peradresavimai į niekur' ),
+	'Disambiguations'           => array( 'Nukreipiamieji' ),
+	'Userlogin'                 => array( 'Prisijungimas' ),
+	'Userlogout'                => array( 'Atsijungimas' ),
+	'CreateAccount'             => array( 'Sukurti paskyrÄ…' ),
+	'Preferences'               => array( 'Nustatymai' ),
+	'Watchlist'                 => array( 'Stebimieji' ),
+	'Recentchanges'             => array( 'Naujausi keitimai' ),
+	'Upload'                    => array( 'Įkėlimas' ),
+	'Listfiles'                 => array( 'Paveikslėlių sąrašas' ),
+	'Newimages'                 => array( 'Nauji paveikslÄ—liai' ),
+	'Listusers'                 => array( 'Naudotojų sąrašas' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Atsitiktinis puslapis' ),
+	'Lonelypages'               => array( 'Vieniši puslapiai' ),
+	'Uncategorizedpages'        => array( 'Puslapiai be kategorijų' ),
+	'Uncategorizedcategories'   => array( 'Kategorijos be subkategorijų' ),
+	'Uncategorizedimages'       => array( 'Paveikslėliai be kategorijų' ),
+	'Uncategorizedtemplates'    => array( 'Šablonai be kategorijų' ),
+	'Unusedcategories'          => array( 'Nenaudojamos kategorijos' ),
+	'Unusedimages'              => array( 'Nenaudojami paveikslÄ—liai' ),
+	'Wantedpages'               => array( 'Trokštamiausi puslapiai', 'Blogos nuorodos' ),
+	'Wantedcategories'          => array( 'Trokštamiausios kategorijos' ),
+	'Mostlinked'                => array( 'Turintys daugiausiai nuorodų' ),
+	'Mostlinkedcategories'      => array( 'Kategorijos turin�ios daugiausiai nuorodų' ),
+	'Mostlinkedtemplates'       => array( 'Šablonai', 'turintys daugiausiai nuorodų' ),
+	'Mostcategories'            => array( 'Daugiausiai naudojamos kategorijos' ),
+	'Mostimages'                => array( 'Daugiausiai naudojami paveikslÄ—liai' ),
+	'Mostrevisions'             => array( 'Daugiausiai kei�iami' ),
+	'Fewestrevisions'           => array( 'Mažiausiai kei�iami' ),
+	'Shortpages'                => array( 'Trumpiausi puslapiai' ),
+	'Longpages'                 => array( 'Ilgiausi puslapiai' ),
+	'Newpages'                  => array( 'Naujausi puslapiai' ),
+	'Ancientpages'              => array( 'Seniausi puslapiai' ),
+	'Deadendpages'              => array( 'Puslapiai-aklavietÄ—s' ),
+	'Protectedpages'            => array( 'Užrakinti puslapiai' ),
+	'Protectedtitles'           => array( 'Apsaugoti pavadinimai' ),
+	'Allpages'                  => array( 'Visi puslapiai' ),
+	'Prefixindex'               => array( 'Prasidedantys' ),
+	'Ipblocklist'               => array( 'IP blokavimų sąrašas' ),
+	'Specialpages'              => array( 'Specialieji puslapiai' ),
+	'Contributions'             => array( 'IndÄ—lis' ),
+	'Emailuser'                 => array( 'Rašyti laišką' ),
+	'Confirmemail'              => array( 'Elektroninio pašto patvirtinimas' ),
+	'Whatlinkshere'             => array( 'Kas į �ia rodo' ),
+	'Recentchangeslinked'       => array( 'Pakeitimai susijusiuose puslapiuose' ),
+	'Movepage'                  => array( 'Puslapio pervadinimas' ),
+	'Blockme'                   => array( 'Užblokuoti mane' ),
+	'Booksources'               => array( 'Knygų šaltiniai' ),
+	'Categories'                => array( 'Kategorijos' ),
+	'Export'                    => array( 'Eksportas' ),
+	'Version'                   => array( 'Versija' ),
+	'Allmessages'               => array( 'Visi pranešimai' ),
+	'Log'                       => array( 'Sąrašas', 'Sąrašai' ),
+	'Blockip'                   => array( 'Blokuoti IP' ),
+	'Undelete'                  => array( 'Netrinti' ),
+	'Import'                    => array( 'Importas' ),
+	'Lockdb'                    => array( 'Užrakinti duomenų bazę' ),
+	'Unlockdb'                  => array( 'Atrakinti duomenų bazę' ),
+	'Userrights'                => array( 'Naudotojo teisÄ—s' ),
+	'MIMEsearch'                => array( 'MIME paieška' ),
+	'Unwatchedpages'            => array( 'Nestebimi puslapiai' ),
+	'Listredirects'             => array( 'Peradresavimų sąrašas' ),
+	'Revisiondelete'            => array( 'Redagavimo ištrynimas' ),
+	'Unusedtemplates'           => array( 'Nenaudojami Å¡ablonai' ),
+	'Randomredirect'            => array( 'Atsitiktinis peradresavimas' ),
+	'Mypage'                    => array( 'Mano puslapis' ),
+	'Mytalk'                    => array( 'Mano aptarimas' ),
+	'Mycontributions'           => array( 'Mano indÄ—lis' ),
+	'Listadmins'                => array( 'Administratorių sąrašas' ),
+	'Listbots'                  => array( 'Botų sąrašas' ),
+	'Popularpages'              => array( 'Populiarūs puslapiai' ),
+	'Search'                    => array( 'Paieška' ),
+	'Resetpass'                 => array( 'Slaptažodžio atstatymas' ),
+	'Withoutinterwiki'          => array( 'Be interwiki' ),
+	'MergeHistory'              => array( 'Sujungti istorijÄ…' ),
 );
+
 $fallback8bitEncoding = 'windows-1257';
 $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
 
@@ -105,17 +178,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Slėpti mano keitimus stebimų sąraše',
 'tog-watchlisthidebots'       => 'Slėpti robotų keitimus stebimų sąraše',
 'tog-watchlisthideminor'      => 'Slėpti smulkius keitimus stebimų sąraše',
+'tog-watchlisthideliu'        => 'Slėpti prisijungusių naudotojų keitimus stebimųjų sąraše',
+'tog-watchlisthideanons'      => 'Slėpti anoniminių naudotojų keitimus stebimųjų sąraše',
 'tog-nolangconversion'        => 'Išjungti variantų keitimą',
-'tog-ccmeonemails'            => 'Siųsti man laiškų kopijas, kuriuos siun�iu kitiems naudotojams',
+'tog-ccmeonemails'            => 'Siųsti man laiškų, kuriuos siun�iu kitiems naudotojams, kopijas',
 'tog-diffonly'                => 'Nerodyti puslapio turinio po skirtumais',
 'tog-showhiddencats'          => 'Rodyti paslÄ—ptas kategorijas',
+'tog-norollbackdiff'          => 'Nepaisyti skirtumo atlikus atmetimÄ…',
 
 'underline-always'  => 'Visada',
 'underline-never'   => 'Niekada',
 'underline-default' => 'Pagal naršyklės nustatymus',
 
-'skinpreview' => '(Peržiūra)',
-
 # Dates
 'sunday'        => 'sekmadienis',
 'monday'        => 'pirmadienis',
@@ -172,7 +246,7 @@ $messages = array(
 'pagecategories'                 => '{{PLURAL:$1|Kategorija|Kategorijos}}',
 'category_header'                => 'Puslapiai kategorijoje „$1“',
 'subcategories'                  => 'Subkategorijos',
-'category-media-header'          => 'Media kategorijoje „$1“',
+'category-media-header'          => 'Daugialypės terpės failai kategorijoje „$1“',
 'category-empty'                 => "''Šiuo metu ši kategorija neturi jokių puslapių ar failų.''",
 'hidden-categories'              => '{{PLURAL:$1|PaslÄ—pta kategorija|PaslÄ—ptos kategorijos}}',
 'hidden-category-category'       => 'PaslÄ—ptos kategorijos', # Name of the category where hidden categories will be listed
@@ -199,7 +273,7 @@ $messages = array(
 'cancel'         => 'Atšaukti',
 'qbfind'         => 'Paieška',
 'qbbrowse'       => 'Naršymas',
-'qbedit'         => 'Redagavimas',
+'qbedit'         => 'Taisyti',
 'qbpageoptions'  => 'Å is puslapis',
 'qbpageinfo'     => 'Kontekstas',
 'qbmyoptions'    => 'Mano puslapiai',
@@ -209,7 +283,7 @@ $messages = array(
 'mytalk'         => 'Mano aptarimas',
 'anontalk'       => 'Å io IP aptarimas',
 'navigation'     => 'Naršymas',
-'and'            => 'ir',
+'and'            => '&#32;ir',
 
 # Metadata in edit box
 'metadata_help' => 'Metaduomenys:',
@@ -272,8 +346,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Apie {{SITENAME}}',
 'aboutpage'            => 'Project:Apie',
-'bugreports'           => 'Pranešti apie klaidą',
-'bugreportspage'       => 'Project:Klaidų pranešimai',
 'copyright'            => 'Turinys pateikiamas pagal $1 licencijÄ….',
 'copyrightpagename'    => '{{SITENAME}} autorystÄ—s teisÄ—s',
 'copyrightpage'        => '{{ns:project}}:AutorystÄ—s teisÄ—s',
@@ -296,9 +368,7 @@ $messages = array(
 
 'badaccess'        => 'Teisių klaida',
 'badaccess-group0' => 'Jums neleidžiama įvykdyti veiksmo, kurio prašėte.',
-'badaccess-group1' => 'Veiksmas, kurio prašėte, galimas tik $1 grupės naudotojams.',
-'badaccess-group2' => 'Veiksmas, kurio prašėte, galimas tik naudotojams, esantiems vienoje iš šių grupių $1.',
-'badaccess-groups' => 'Veiksmas, kurio prašėte, galimas tik naudotojams, esantiems vienoje iš šių grupių $1.',
+'badaccess-groups' => 'Veiksmas, kurio prašėte, galimas tik naudotojams, esantiems {{PLURAL:$2|šioje grupėje|vienoje iš šių grupių}} $1.',
 
 'versionrequired'     => 'Reikalinga $1 MediaWiki versija',
 'versionrequiredtext' => 'Reikalinga $1 MediaWiki versija, kad pamatytumėte šį puslapį. Žiūrėkite [[Special:Version|versijos puslapį]].',
@@ -312,6 +382,8 @@ $messages = array(
 'editsection'             => 'redaguoti',
 'editold'                 => 'taisyti',
 'viewsourceold'           => 'žiūrėti šaltinį',
+'editlink'                => 'keisti',
+'viewsourcelink'          => 'žiūrėti kodą',
 'editsectionhint'         => 'Redaguoti skyrelį: $1',
 'toc'                     => 'Turinys',
 'showtoc'                 => 'rodyti',
@@ -324,15 +396,15 @@ $messages = array(
 'feed-unavailable'        => 'Keitimų prenumeratos negalimos',
 'site-rss-feed'           => '$1 RSS prenumerata',
 'site-atom-feed'          => '$1 Atom prenumerata',
-'page-rss-feed'           => '„$1“ RSS šaltinis',
-'page-atom-feed'          => '„$1“ Atom šaltinis',
-'red-link-title'          => '$1 (dar nesukurtas)',
+'page-rss-feed'           => '„$1“ RSS prenumerata',
+'page-atom-feed'          => '„$1“ Atom prenumerata',
+'red-link-title'          => '$1 (puslapis neegzistuoja)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Puslapis',
 'nstab-user'      => 'Naudotojo puslapis',
 'nstab-media'     => 'Media puslapis',
-'nstab-special'   => 'Specialus',
+'nstab-special'   => 'Specialusis puslapis',
 'nstab-project'   => 'Projekto puslapis',
 'nstab-image'     => 'Failas',
 'nstab-mediawiki' => 'Pranešimas',
@@ -342,7 +414,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'NÄ—ra tokio veiksmo',
-'nosuchactiontext'  => 'Veiksmas, nurodytas adrese, neatpažintas',
+'nosuchactiontext'  => 'Veiksmas, nurodytas adrese, neatpažintas.
+Galbūt Jūs padarėte klaidą adrese ar paspaudėte ant neteisingos nuorodos.
+Šios problemos priežastis taip pat gali būti klaida programinėje įrangoje, kurią naudoja {{SITENAME}}.',
 'nosuchspecialpage' => 'NÄ—ra tokio specialiojo puslapio',
 'nospecialpagetext' => "<big>'''Jūs prašėte neleistino specialiojo puslapio'''</big>
 
@@ -374,7 +448,7 @@ turbūt duomenų bazės techninei profilaktikai,
 po to viskas vėl veiks kaip įprasta.
 
 Užrakinusiojo administratoriaus pateiktas rakinimo paaiškinimas: $1',
-'missing-article'      => 'Duomenų bazė nerado puslapio teksto, kurį jis turėtų rasti, pavadinto „$1“ $2.
+'missing-article'      => 'Duomenų bazė nerado puslapio teksto, kurį ji turėtų rasti, pavadinto „$1“ $2.
 
 Paprastai tai būna dėl pasenusios skirtumo ar istorijos nuorodos į puslapį, kuris buvo ištrintas.
 
@@ -398,7 +472,6 @@ Prašome apie tai pranešti [[Special:ListUsers/sysop|administratoriui]], nepami
 Galbūt jį jau kažkas kitas ištrynė.',
 'badtitle'             => 'Blogas pavadinimas',
 'badtitletext'         => 'Nurodytas puslapio pavadinimas buvo neleistinas, tuš�ias arba neteisingai sujungtas tarpkalbinis arba tarpprojektinis pavadinimas. Jame gali būti vienas ar daugiau simbolių, neleistinų pavadinimuose',
-'perfdisabled'         => 'Atsiprašome, bet ši funkcija yra laikinai išjungta, nes tai ypa� sulėtina duomenų bazę taip, kad daugiau niekas negali naudotis projektu.',
 'perfcached'           => 'Rodoma išsaugota duomenų kopija, todėl duomenys gali būti ne patys naujausi.',
 'perfcachedts'         => 'Rodoma išsaugota duomenų kopija, kuri buvo atnaujinta $1.',
 'querypage-no-updates' => 'Atnaujinimai šiam puslapiui dabar yra išjungti. Duomenys �ia dabar nebus atnaujinti.',
@@ -408,11 +481,11 @@ Užklausa: $2',
 'viewsource'           => 'Žiūrėti kodą',
 'viewsourcefor'        => 'puslapiui $1',
 'actionthrottled'      => 'Veiksmas apribotas',
-'actionthrottledtext'  => 'Kaip apsauga nuo reklamų, jums neleidžiama atlikti šį veiksmą daug kartų per trumpą laiko tarpą, bet jūs pasiekėte šį limitą. Prašome pamėginti vėl po kelių minu�ių.',
+'actionthrottledtext'  => 'Kad būtų apsisaugota nuo reklamų, jums neleidžiama daug kartų atlikti šį veiksmą per trumpą laiko tarpą, bet jūs pasiekėte šį limitą. Prašome vėl pamėginti po kelių minu�ių.',
 'protectedpagetext'    => 'Šis puslapis yra užrakintas, saugant jį nuo redagavimo.',
 'viewsourcetext'       => 'Jūs galite žiūrėti ir kopijuoti puslapio kodą:',
 'protectedinterface'   => 'Šiame puslapyje yra programinės įrangos sąsajos tekstas ir yra apsaugotas, kad būtų apsisaugota nuo piktnaudžiavimo.',
-'editinginterface'     => "'''Dėmesio:''' Jūs redaguojate puslapį, kuris yra naudojamas programinės įrangos sąsajos tekste. Pakeitimai šiame puslapyje taip pat pakeis naudotojo sąsajos išvaizdą ir kitiems naudojams. Jei norite išversti, siūlome pasinaudoti [http://translatewiki.net/wiki/Main_Page?setlang=lt „Betawiki“], „MediaWiki“ lokalizacijos projektu.",
+'editinginterface'     => "'''Dėmesio:''' Jūs redaguojate puslapį, kuris yra naudojamas programinės įrangos sąsajos tekste. Pakeitimai šiame puslapyje taip pat pakeis naudotojo sąsajos išvaizdą ir kitiems naudojams. Jei norite išversti, siūlome pasinaudoti [http://translatewiki.net/wiki/Main_Page?setlang=lt „translatewiki.net“], „MediaWiki“ lokalizacijos projektu.",
 'sqlhidden'            => '(SQL užklausa paslėpta)',
 'cascadeprotected'     => 'Šis puslapis buvo apsaugotas nuo redagavimo, kadangi jis yra įtrauktas į {{PLURAL:$1|šį puslapį, apsaugotą|šiuos puslapius, apsaugotus}} „pakopinės apsaugos“ pasirinktimi:
 $2',
@@ -420,19 +493,19 @@ $2',
 'customcssjsprotected' => 'Jūs neturite teisės redaguoti šio puslapio, nes jame yra kito nautotojo asmeninių nustatymų.',
 'ns-specialprotected'  => 'Specialieji puslapiai negali būti redaguojami.',
 'titleprotected'       => "[[User:$1|$1]] apsaugojo šį pavadinimą nuo sukūrimo.
-Duota priežastis yra ''$2''.",
+Nurodyta priežastis yra ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Neteisinga konfiguracija: nežinomas viruso skaneris: <i>$1</i>',
+'virus-badscanner'     => "Neleistina konfigūracija: nežinomas virusų skeneris: ''$1''",
 'virus-scanfailed'     => 'skanavimas nepavyko (kodas $1)',
 'virus-unknownscanner' => 'nežinomas antivirusas:',
 
 # Login and logout pages
 'logouttitle'                => 'Naudotojo atsijungimas',
-'logouttext'                 => '<strong>Dabar jūs esate atsijungęs.</strong>
+'logouttext'                 => "'''Dabar jūs esate atsijungęs.'''
 
 Galite toliau naudoti {{SITENAME}} anonimiškai arba [[Special:UserLogin|prisijunkite]] iš naujo tuo pa�iu ar kitu naudotoju.
-Pastaba: kai kuriuose puslapiuose ir toliau gali rodyti, kad esate prisijungęs iki tol, kol išvalysite savo naršyklės podėlį.',
+Pastaba: kai kuriuose puslapiuose ir toliau gali rodyti, kad esate prisijungęs iki tol, kol išvalysite savo naršyklės podėlį.",
 'welcomecreation'            => '== Sveiki, $1! ==
 
 Jūsų paskyra buvo sukurta. Nepamirškite pakeisti savo {{SITENAME}} nustatymų.',
@@ -443,7 +516,6 @@ Jūsų paskyra buvo sukurta. Nepamirškite pakeisti savo {{SITENAME}} nustatymų
 'remembermypassword'         => 'Prisiminti Å¡iÄ… informacijÄ… Å¡iame kompiuteryje',
 'yourdomainname'             => 'Jūsų domenas:',
 'externaldberror'            => 'Yra arba išorinė autorizacijos duomenų bazės klaida arba jums neleidžiama atnaujinti jūsų išorinės paskyros.',
-'loginproblem'               => '<b>Problemos su jūsų prisijungimu.</b><br />Pabandykite iš naujo!',
 'login'                      => 'Prisijungti',
 'nav-login-createaccount'    => 'Prisijungti / sukurti paskyrÄ…',
 'loginprompt'                => 'Įjunkite slapukus, jei norite prisijungti prie {{SITENAME}}.',
@@ -469,7 +541,7 @@ Prašome pasirinkti kitą vardą.',
 'yourvariant'                => 'Variantas:',
 'yournick'                   => 'Parašas:',
 'badsig'                     => 'Neteisingas parašas; patikrinkite HTML žymes.',
-'badsiglength'               => 'Parašas per ilgas.
+'badsiglength'               => 'Jūsų parašas per ilgas.
 Jį turi sudaryti ne daugiau kaip $1 {{PLURAL:$1|simbolis|simboliai|simbolių}}.',
 'email'                      => 'El. paštas',
 'prefs-help-realname'        => 'Tikrasis vardas yra neprivalomas.
@@ -482,7 +554,9 @@ Jei jūs jį įvesite, jis bus naudojamas pažymėti jūsų darbą.',
 'noname'                     => 'Jūs nesate nurodęs teisingo naudotojo vardo.',
 'loginsuccesstitle'          => 'SÄ—kmingai prisijungÄ—te',
 'loginsuccess'               => "'''Dabar jūs prisijungęs prie {{SITENAME}} kaip „$1“.'''",
-'nosuchuser'                 => 'Nėra jokio naudotojo turin�io vardą „$1“. Patikrinkite rašybą, arba [[Special:UserLogin/signup|sukurkite naują paskyrą]].',
+'nosuchuser'                 => 'Nėra jokio naudotojo, turin�io vardą „$1“. 
+Naudotojų varduose skiriamos didžiosios ir mažosios raidės.
+Patikrinkite rašybą, arba [[Special:UserLogin/signup|sukurkite naują paskyrą]].',
 'nosuchusershort'            => 'Nėra jokio naudotojo, pavadinto „<nowiki>$1</nowiki>“. Patikrinkite rašybą.',
 'nouserspecified'            => 'Jums reikia nurodyti naudotojo vardÄ….',
 'wrongpassword'              => 'Įvestas neteisingas slaptažodis. Pamėginkite dar kartą.',
@@ -505,11 +579,12 @@ Prašome prisijungti vėl, kai jūs jį gausite.',
 'blocked-mailpassword'       => 'Jūsų IP adresas yra užblokuotas nuo redagavimo, taigi neleidžiama naudoti slaptažodžio priminimo funkcijos, kad apsisaugotume nuo piktnaudžiavimo.',
 'eauthentsent'               => 'Patvirtinimo laiškas buvo nusiųstas į paskirtąjį el. pašto adresą.
 Prieš išsiun�iant kitą laišką į jūsų dėžutę, jūs turite vykdyti nurodymus laiške, kad patvirtintumėte, kad dėžutė tikrai yra jūsų.',
-'throttled-mailpassword'     => 'Slaptažodžio priminimas jau buvo išsiųstas, per {{PLURAL:$1|pasuktinę valandą|$1 paskutines valandas|$1 paskutinių valandų}}.
-Norint apsisaugoti nuo piktnaudžiavimo, slaptažodžio priminimas gali būti išsiųstas tik kas {{PLURAL:$1|valandą|$1 valandas|$1 valandų}}.',
+'throttled-mailpassword'     => 'Slaptažodžio priminimas jau buvo išsiųstas, per {{PLURAL:$1|$1 paskutinę valandą|$1 paskutines valandas|$1 paskutinių valandų}}.
+Norint apsisaugoti nuo piktnaudžiavimo, slaptažodžio priminimas gali būti išsiųstas tik kas {{PLURAL:$1|$1 valandą|$1 valandas|$1 valandų}}.',
 'mailerror'                  => 'Klaida siun�iant paštą: $1',
-'acct_creation_throttle_hit' => 'Atleiskite, bet jūs jau sukūrėte $1 paskyras. Daugiau nebegalima.',
-'emailauthenticated'         => 'Jūsų el. pašto adresas buvo patvirtintas $1.',
+'acct_creation_throttle_hit' => 'Šio projekto lankytojai, naudojantys jūsų IP adresą, sukūrė {{PLURAL:$1|$1 paskyrą|$1 paskyras|$1 paskyrų}} per paskutiniąją dieną, o tai yra didžiausias leidžiamas kiekis per šį laiko tarpą.
+Todėl šiuo metu lankytojai, naudojantys šį IP adresą, daugiau negali kurti paskyrų.',
+'emailauthenticated'         => 'Jūsų el. pašto adresas buvo patvirtintas $2 d. $3.',
 'emailnotauthenticated'      => 'Jūsų el. pašto adresas dar nėra patvirtintas. Jokie laiškai
 nebus siun�iami nei vienai žemiau išvardintai paslaugai.',
 'noemailprefs'               => 'Nurodykite el. pašto adresą, kad šios funkcijos veiktų.',
@@ -523,18 +598,26 @@ Prašome įvesti gerai suformuotą adresą arba palikite tą laukelį tuš�ią.
 Jūs turėtumėte prisijungti ir pasikeisti savo slaptažodį.
 
 Jūs galite nekreipti dėmesio į laišką, jei ši paskyra buvo sukurta per klaidą.',
+'login-throttled'            => 'Jūs padarėte pernelyg daug bandymų parašyti šios paskyros slaptažodį. Palaukite prieš bandant vėl.',
 'loginlanguagelabel'         => 'Kalba: $1',
 
 # Password reset dialog
-'resetpass'               => 'Paskyros slaptažodžio atstatymas',
-'resetpass_announce'      => 'Jūs prisijungėte su atsiųstu laikinuoju kodu. Norėdami užbaigti prisijungimą, �ia jums reikia nustatyti naująjį slaptažodį:',
-'resetpass_text'          => '<!-- Įterpkite �ia tekstą -->',
-'resetpass_header'        => 'Keisti paskyros slaptažodį',
-'resetpass_submit'        => 'Nustatyti slaptažodį ir prisijungti',
-'resetpass_success'       => 'Jūsų slaptažodis pakeistas sėkmingai! Dabar prisijungiama...',
-'resetpass_bad_temporary' => 'Neteisingas laikinasis slaptažodis. Galbūt jūs jau sėkmingai pakeitėte savo slaptažodį arba paprašėte naujo laikino slaptažodžio.',
-'resetpass_forbidden'     => 'Slaptažodžiai negali būti pakeisti',
-'resetpass_missing'       => 'Nėra formos duomenų.',
+'resetpass'                 => 'Keisti slaptažodį',
+'resetpass_announce'        => 'Jūs prisijungėte su atsiųstu laikinuoju kodu. Norėdami užbaigti prisijungimą, �ia jums reikia nustatyti naująjį slaptažodį:',
+'resetpass_text'            => '<!-- Įterpkite �ia tekstą -->',
+'resetpass_header'          => 'Keisti paskyros slaptažodį',
+'oldpassword'               => 'Senas slaptažodis:',
+'newpassword'               => 'Naujas slaptažodis:',
+'retypenew'                 => 'Pakartokite naują slaptažodį:',
+'resetpass_submit'          => 'Nustatyti slaptažodį ir prisijungti',
+'resetpass_success'         => 'Jūsų slaptažodis pakeistas sėkmingai! Dabar prisijungiama...',
+'resetpass_bad_temporary'   => 'Neteisingas laikinasis slaptažodis. Galbūt jūs jau sėkmingai pakeitėte savo slaptažodį arba paprašėte naujo laikino slaptažodžio.',
+'resetpass_forbidden'       => 'Slaptažodžiai negali būti pakeisti',
+'resetpass-no-info'         => 'Jūs turite būti prisijugęs, kad pasiektumėte puslapį tiesiogiai.',
+'resetpass-submit-loggedin' => 'Keisti slaptažodį',
+'resetpass-wrong-oldpass'   => 'Klaidingas laikinas ar esamas slaptažodis.
+Jūs galbūt jau sėkmingai pakeitėte savo slaptažodį ar gavote naują laikiną slaptažodį.',
+'resetpass-temp-password'   => 'Laikinas slaptažodis:',
 
 # Edit page toolbar
 'bold_sample'     => 'Paryškintas tekstas',
@@ -559,8 +642,8 @@ Jūs galite nekreipti dėmesio į laišką, jei ši paskyra buvo sukurta per kla
 'hr_tip'          => 'Horizontali linija (naudokite taupiai)',
 
 # Edit pages
-'summary'                          => 'Komentaras',
-'subject'                          => 'Tema/antraštė',
+'summary'                          => 'Komentaras:',
+'subject'                          => 'Tema/antraštė:',
 'minoredit'                        => 'Tai smulkus pataisymas',
 'watchthis'                        => 'Stebėti šį puslapį',
 'savearticle'                      => 'Įrašyti puslapį',
@@ -572,8 +655,8 @@ Jūs galite nekreipti dėmesio į laišką, jei ši paskyra buvo sukurta per kla
 'missingsummary'                   => "'''Priminimas:''' Jūs nenurodėte keitimo komentaro. Jei vėl paspausite Įrašyti, jūsų keitimas bus įrašytas be jo.",
 'missingcommenttext'               => 'Prašome įvesti komentarą.',
 'missingcommentheader'             => "'''Priminimas:''' Jūs nenurodėte skyrelio/antraštės šiam komentarui. Jei vėl paspausite Įrašyti, jūsų keitimas bus įrašytas be jo.",
-'summary-preview'                  => 'Komentaro peržiūra',
-'subject-preview'                  => 'Skyrelio/antraštės peržiūra',
+'summary-preview'                  => 'Komentaro peržiūra:',
+'subject-preview'                  => 'Skyrelio/antraštės peržiūra:',
 'blockedtitle'                     => 'Naudotojas yra užblokuotas',
 'blockedtext'                      => "<big>'''Jūsų naudotojo vardas arba IP adresas yra užblokuotas.'''</big>
 
@@ -583,10 +666,10 @@ Užblokavo $1. Nurodyta priežastis yra ''$2''.
 * Blokavimo pabaiga: $6
 * Numatytas blokuojamasis: $7
 
-Jūs galite susisiekti su $1 arba kitu [[{{MediaWiki:Grouppage-sysop}}|administratoriumi]], kad aptartumėte užblokavimą.
-Jūs negalite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate pateikę tikro savo el. pašto adreso savo [[Special:Preferences|paskyros nustatymuose]] ir nesate užblokuotas nuo jos naudojimo.
-Jūsų dabartinis IP adresas yra $3, o blokavimo ID yra #$5.
-Prašome nurodyti vieną ar abu juos, kai kreipiatės dėl blokavimo.",
+Jūs galite susisiekti su $1 arba kuriuo nors kitu [[{{MediaWiki:Grouppage-sysop}}|administratoriumi]] ir aptarti neaiškumus dėl blokavimo.
+Atkreipkite dėmesį, kad negalėsite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate užsiregistravę ir pateikę realaus savo el. pašto adreso naudotojo [[Special:Preferences|nustatymuose]], arba, jei jums užblokuotas šios funkcijos naudojimas.
+Jūsų IP adresas yra $3, o blokavimo ID yra #$5.
+Prašome nurodyti vieną iš jų ar abu, kai kreipiatės dėl blokavimo.",
 'autoblockedtext'                  => "Jūsų IP adresas buvo automatiškai užblokuotas, nes jį naudojo kitas naudotojas, kurį užblokavo $1.
 Nurodyta priežastis yra ši:
 
@@ -596,18 +679,18 @@ Nurodyta priežastis yra ši:
 * Blokavimo pabaiga: $6
 * Numatomas blokavimo laikas: $7
 
-Jūs galite susisiekti su $1 arba kitu [[{{MediaWiki:Grouppage-sysop}}|administratoriumi]], kad aptartumėte užblokavimą.
+Jūs galite susisiekti su $1 arba kitu [[{{MediaWiki:Grouppage-sysop}}|administratoriumi]], kad aptartumėte neaiškumus dėl blokavimo.
 
-Jūs negalite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate užregistravę tikro el. pašto adreso savo [[Special:Preferences|naudotojo nustatymuose]] ir nesate užblokuotas nuo jos naudojimo.
+Jūs negalite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate nurodę tikro el. pašto adreso savo [[Special:Preferences|naudotojo nustatymuose]]. Taip pat Jūs negalite naudotis šia funkcija, jei Jums užblokuotas jos naudojimas.
 
-Jūsų esamas IP adresas yra $3, blokavimo ID yra $5.
-Prašome nurodyti šiuos duomenis visuose prašymuose, kuriuos darote.",
+Jūsų IP adresas yra $3, blokavimo ID yra $5.
+Prašome nurodyti šiuos duomenis visais atvejais, kai kreipiatės dėl blokavimo.",
 'blockednoreason'                  => 'priežastis nenurodyta',
 'blockedoriginalsource'            => "Žemiau yra rodomas '''$1''' turinys:",
 'blockededitsource'                => "''Jūsų keitimų''' tekstas puslapiui '''$1''' yra rodomas žemiau:",
 'whitelistedittitle'               => 'Norint redaguoti reikia prisijungti',
 'whitelistedittext'                => 'JÅ«s turite $1, kad redaguotumÄ—te puslapius.',
-'confirmedittitle'                 => 'Reikalingas el. pašto patvirtinimas, kad redaguotumėte',
+'confirmedittitle'                 => 'Kad galėtumėte redaguoti, reikalingas el. pašto patvirtinimas',
 'confirmedittext'                  => 'Jums reikia patvirtinti el. pašto adresą, prieš redaguojant puslapius.
 Prašome nurodyti ir patvirtinti jūsų el. pašto adresą per jūsų [[Special:Preferences|naudotojo nustatymus]].',
 'nosuchsectiontitle'               => 'NÄ—ra tokio skyriaus',
@@ -626,25 +709,28 @@ Jei patekote �ia per klaidą, papras�iausiai spustelkite  naršyklės mygtuką
 DÄ—l to naudojamas IP adresas jo identifikavimui.
 Šis IP adresas gali būti dalinamas keliems naudotojams.
 Jeigu Jūs esate anoniminis naudotojas ir atrodo, kad komentarai nėra skirti Jums, [[Special:UserLogin/signup|sukurkite paskyrą]] arba [[Special:UserLogin|prisijunkite]], ir nebūsite tapatinamas su kitais anoniminiais naudotojais.''",
-'noarticletext'                    => 'Šiuo metu šiame puslapyje nėra jokio teksto, jūs galite [[Special:Search/{{PAGENAME}}|ieškoti šio puslapio pavadinimo]] kituose puslapiuose arba [{{fullurl:{{FULLPAGENAME}}|action=edit}} redaguoti šį puslapį].',
+'noarticletext'                    => 'Å iuo metu Å¡iame puslapyje nÄ—ra jokio teksto.
+Jūs galite [[Special:Search/{{PAGENAME}}|ieškoti šio puslapio pavadinimo]] kituose puslapiuose,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ieškoti susijusių įrašų],
+arba [{{fullurl:{{FULLPAGENAME}}|action=edit}} redaguoti šį puslapį]</span>.',
 'userpage-userdoesnotexist'        => 'Naudotojo paskyra „$1“ yra neužregistruota. Prašom patikrinti, ar jūs norite kurti/redaguoti šį puslapį.',
 'clearyourcache'                   => "'''Dėmesio:''' Išsaugoję jums gali prireikti išvalyti jūsų naršyklės podėlį, kad pamatytumėte poky�ius. '''Mozilla / Safari / Konqueror:''' laikydami ''Shift'' pasirinkite ''Atsiųsti iš naujo'', arba paspauskite ''Ctrl-Shift-R'' (sistemoje Apple Mac ''Cmd-Shift-R''); '''IE:''' laikydami ''Ctrl'' paspauskite ''Atnaujinti'', arba paspauskite ''Ctrl-F5''; '''Konqueror:''' tiesiog paspauskite ''Perkrauti'' mygtuką, arba paspauskite ''F5''; '''Opera''' naudotojams gali prireikti pilnai išvalyti jų podėlį ''Priemonės→Nuostatos''.",
-'usercssjsyoucanpreview'           => '<strong>Patarimas:</strong> Naudokite „Rodyti peržiūrą“ mygtuką, kad išmėgintumėte savo naująjį CSS/JS prieš išsaugant.',
+'usercssjsyoucanpreview'           => "'''Patarimas:''' Naudokite „Rodyti peržiūrą“ mygtuką, kad išmėgintumėte savo naująjį CSS/JS prieš išsaugant.",
 'usercsspreview'                   => "'''Nepamirškite, kad jūs tik peržiūrit savo naudotojo CSS, jis dar nebuvo išsaugotas!'''",
 'userjspreview'                    => "'''Nepamirškite, kad jūs tik testuojat/peržiūrit savo naudotojo JavaScript, jis dar nebuvo išsaugotas!'''",
 'userinvalidcssjstitle'            => "'''Dėmesio:''' Nėra jokios išvaizdos „$1“. Nepamirškite, kad savo .css ir .js puslapiai naudoja pavadinimą mažosiomis raidėmis, pvz., {{ns:user}}:Foo/monobook.css, o ne {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Atnaujinta)',
-'note'                             => '<strong>Pastaba:</strong>',
-'previewnote'                      => '<strong>Nepamirškite, kad tai tik peržiūra, pakeitimai dar nėra išsaugoti!</strong>',
+'note'                             => "'''Pastaba:'''",
+'previewnote'                      => "'''Nepamirškite, kad tai tik peržiūra, pakeitimai dar nėra išsaugoti!'''",
 'previewconflict'                  => 'Ši peržiūra parodo tekstą iš viršutiniojo teksto redagavimo lauko taip, kaip jis bus rodomas, jei pasirinksite išsaugoti.',
-'session_fail_preview'             => '<strong>Atsiprašome! Mes negalime vykdyti jūsų keitimo dėl sesijos duomenų praradimo.
-Prašome pamėginti vėl. Jei tai nepadeda, pamėginkite atsijungti ir prisijungti atgal.</strong>',
-'session_fail_preview_html'        => "<strong>Atsiprašome! Mes negalime apdoroti jūsų keitimo dėl sesijos duomenų praradimo.</strong>
+'session_fail_preview'             => "'''Atsiprašome! Mes negalime vykdyti jūsų keitimo dėl sesijos duomenų praradimo.
+Prašome pamėginti vėl. Jei tai nepadeda, pamėginkite atsijungti ir prisijungti atgal.'''",
+'session_fail_preview_html'        => "'''Atsiprašome! Mes negalime apdoroti jūsų keitimo dėl sesijos duomenų praradimo.'''
 
 ''Kadangi {{SITENAME}} grynasis HTML yra įjungtas, peržiūra yra paslėpta kaip atsargumo priemonė prieš JavaScript atakas.''
 
-<strong>Jei tai teisėtas keitimo bandymas, prašome pamėginti vėl. Jei tai nepadeda, pamėginkite [[Special:UserLogout|atsijungti]] ir prisijungti atgal.</strong>",
-'token_suffix_mismatch'            => '<strong>Jūsų pakeitimas buvo atmestas, nes jūsų naršyklė iškraipė skyrybos ženklus keitimo žymėje. Keitimas buvo atmestas norint apsaugoti puslapio tekstą nuo sugadinimo. Taip kartais būna, kai jūs naudojate anoniminį tarpinio serverio paslaugą.</strong>',
+'''Jei tai teisėtas keitimo bandymas, prašome pamėginti vėl. Jei tai nepadeda, pamėginkite [[Special:UserLogout|atsijungti]] ir prisijungti atgal.'''",
+'token_suffix_mismatch'            => "'''Jūsų pakeitimas buvo atmestas, nes jūsų naršyklė iškraipė skyrybos ženklus keitimo žymėje. Keitimas buvo atmestas norint apsaugoti puslapio tekstą nuo sugadinimo. Taip kartais būna, kai jūs naudojate anoniminį tarpinio serverio paslaugą.'''",
 'editing'                          => 'Taisomas $1',
 'editingsection'                   => 'Taisomas $1 (skyrelis)',
 'editingcomment'                   => 'Taisomas $1 (komentaras)',
@@ -656,29 +742,29 @@ Jums reikia sujungti jūsų pakeitimus su esan�ia versija.
 Kai paspausite „Įrašyti“, bus įrašytas '''tik''' tekstas viršutiniame tekstiniame lauke.",
 'yourtext'                         => 'Jūsų tekstas',
 'storedversion'                    => 'IÅ¡saugota versija',
-'nonunicodebrowser'                => '<strong>ĮSPĖJIMAS: Jūsų naršyklė nepalaiko unikodo. Kad būtų saugu redaguoti puslapį, ne ASCII simboliai redagavimo lauke bus rodomi kaip šešioliktainiai kodai.</strong>',
-'editingold'                       => '<strong>ĮSPĖJIMAS: Jūs kei�iate ne naujausią puslapio versiją.
-Jei išsaugosite savo keitimus, po to daryti pakeitimai pradings.</strong>',
+'nonunicodebrowser'                => "'''ĮSPĖJIMAS: Jūsų naršyklė nepalaiko unikodo. Kad būtų saugu redaguoti puslapį, ne ASCII simboliai redagavimo lauke bus rodomi kaip šešioliktainiai kodai.'''",
+'editingold'                       => "'''ĮSPĖJIMAS: Jūs kei�iate ne naujausią puslapio versiją.
+Jei išsaugosite savo keitimus, po to daryti pakeitimai pradings.'''",
 'yourdiff'                         => 'Skirtumai',
-'copyrightwarning'                 => 'Primename, kad viskas, kas patenka į {{SITENAME}}, yra laikoma paskelbtu pagal $2 (detaliau - $1). Jei nenorite, kad jūsų indėlis būtų be gailes�io redaguojamas ir platinamas, �ia nerašykite.<br />
+'copyrightwarning'                 => "Primename, kad viskas, kas patenka į {{SITENAME}}, yra laikoma paskelbtu pagal $2 (detaliau - $1). Jei nenorite, kad jūsų indėlis būtų be gailes�io redaguojamas ir platinamas, �ia nerašykite.<br />
 Jūs taip pat pasižadate, kad tai jūsų pa�ių rašytas turinys arba kopijuotas iš viešų ar panašių nemokamų šaltinių.
-<strong>NEKOPIJUOKITE AUTORINĖMIS TEISĖMIS APSAUGOTŲ DARBŲ BE LEIDIMO!</strong>',
-'copyrightwarning2'                => 'Primename, kad viskas, kas patenka į {{SITENAME}} gali būti redaguojama, perdaroma, ar pašalinama kitų naudotojų. Jei nenorite, kad jūsų indėlis būtų be gailes�io redaguojamas, �ia nerašykite.<br />
+'''NEKOPIJUOKITE AUTORINĖMIS TEISĖMIS APSAUGOTŲ DARBŲ BE LEIDIMO!'''",
+'copyrightwarning2'                => "Primename, kad viskas, kas patenka į {{SITENAME}} gali būti redaguojama, perdaroma, ar pašalinama kitų naudotojų. Jei nenorite, kad jūsų indėlis būtų be gailes�io redaguojamas, �ia nerašykite.<br />
 Taip pat jūs pasižadate, kad tai jūsų pa�ių rašytas tekstas arba kopijuotas
 iš viešų ar panašių nemokamų šaltinių (detaliau - $1).
-<strong>NEKOPIJUOKITE AUTORINĖMIS TEISĖMIS APSAUGOTŲ DARBŲ BE LEIDIMO!</strong>',
-'longpagewarning'                  => '<strong>DĖMESIO: Šis puslapis yra $1 kilobaitų ilgio; kai kurios
+'''NEKOPIJUOKITE AUTORINĖMIS TEISĖMIS APSAUGOTŲ DARBŲ BE LEIDIMO!'''",
+'longpagewarning'                  => "'''DĖMESIO: Šis puslapis yra $1 kilobaitų ilgio; kai kurios
 naršyklės gali turėti problemų redaguojant puslapius beveik ar virš 32 kB.
-Prašome pamėginti puslapį padalinti į keletą smulkesnių dalių.</strong>',
-'longpageerror'                    => '<strong>KLAIDA: Tekstas, kurį pateikėte, yra $1 kilobaitų ilgio,
-kuris yra didesnis nei daugiausiai leistini $2 kilobaitai. Jis nebus išsaugotas.</strong>',
-'readonlywarning'                  => '<strong>DĖMESIO: Duomenų bazė buvo užrakinta techninei profilaktikai,
-taigi negalėsite išsaugoti savo pakeitimų dabar. Jūs gali nusikopijuoti tekstą į tekstinį failą
-ir vėliau įkelti jį �ia.</strong>',
-'protectedpagewarning'             => '<strong>DĖMESIO:  Šis puslapis yra užrakintas ir jį redaguoti gali tik administratoriaus teises turintys naudotojai.</strong>',
-'semiprotectedpagewarning'         => "'''Pastaba:''' Šis puslapis buvo užrakintas ir jį gali redaguoti tik registruoti naudotojai.",
+Prašome pamėginti puslapį padalinti į keletą smulkesnių dalių.'''",
+'longpageerror'                    => "'''KLAIDA: Tekstas, kurį pateikėte, yra $1 kilobaitų ilgio,
+kuris yra didesnis nei daugiausiai leistini $2 kilobaitai. Jis nebus išsaugotas.'''",
+'readonlywarning'                  => "'''DĖMESIO: Duomenų bazė buvo užrakinta techninei profilaktikai, todėl šiuo metu negalėsite išsaugoti savo pakeitimų. Siūlome nusikopijuoti tekstą į tekstinį failą ir vėliau jį �ia išsaugoti.'''
+
+Ją užrakinusio administratoriaus paaiškinimas: $1",
+'protectedpagewarning'             => "'''DĖMESIO:  Šis puslapis yra užrakintas taip, kad jį redaguoti gali tik administratoriaus teises turintys naudotojai.'''",
+'semiprotectedpagewarning'         => "'''Pastaba:''' Šis puslapis buvo užrakintas, jį gali redaguoti tik registruoti naudotojai.",
 'cascadeprotectedwarning'          => "'''Dėmesio''': Šis puslapis buvo užrakintas taip, kad tik naudotojai su administratoriaus teisėmis galėtų jį redaguoti, nes jis yra įtrauktas į {{PLURAL:$1|šį puslapį, apsaugotą|šiuos puslapius, apsaugotus}} „pakopinės apsaugos“ pasirinktimi:",
-'titleprotectedwarning'            => '<strong>ĮSPĖJIMAS: Šis puslapis buvo užrakintas taip, kad tik kai kurie naudotojai galėtų jį sukurti.</strong>',
+'titleprotectedwarning'            => "'''ĮSPĖJIMAS: Šis puslapis buvo užrakintas taip, kad tik [[Special:ListGroupRights|kai kurie naudotojai]] galėtų jį sukurti.'''",
 'templatesused'                    => 'Puslapyje naudojami Å¡ablonai:',
 'templatesusedpreview'             => 'Šablonai, naudoti šioje peržiūroje:',
 'templatesusedsection'             => 'Å ablonai, naudoti Å¡iame skyrelyje:',
@@ -696,12 +782,23 @@ Jūs galite grįžti ir redaguoti jau esantį puslapį, arba [[Special:UserLogin
 'recreate-deleted-warn'            => "'''Dėmesio: Jūs atkuriate puslapį, kuris anks�iau buvo ištrintas.'''
 
 Jūs turite nuspręsti, ar tinka toliau redaguoti šį puslapį.
-Šio puslapio šalinimų istorija yra pateikta �ia dėl patogumo:",
+Dėl patogumo �ia pateikta šio puslapio šalinimų istorija:",
+'deleted-notice'                   => 'Å is puslapis buvo panaikintas.
+Panaikinto puslapio versijų sąrašas pateiktas žemiau peržiūrėjimui.',
+'deletelog-fulllog'                => 'Peržiūrėti visą protokolą',
+'edit-hook-aborted'                => 'Keitimas nutrauktas užlūžimo.
+Tam nėra paaiškinimo.',
+'edit-gone-missing'                => 'Negalima atnaujinti puslapio.
+Grei�iausiai jis yra ištrintas.',
+'edit-conflict'                    => 'Redagavimo konfliktas.',
+'edit-no-change'                   => 'Jūsų keitimas buvo ignoruotas kadangi nebuvo atlikta jokių teksto pakeitimų.',
+'edit-already-exists'              => 'Negalima sukurti naujo puslapio.
+Jis jau egzistuoja.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Įspėjimas: Šiame puslapyje yra per daug brangių kodo analizuoklio funkcijų šaukinių.
+'expensive-parserfunction-warning'        => 'Įspėjimas: Šiame puslapyje yra per daug užtrunkan�ių analizatoriaus funkcijų šaukinių.
 
-Tai turėtų būti mažiau nei $2, ta�iau dabar yra $1.',
+Tai turėtų būti mažiau nei $2 {{PLURAL:$2|šaukinys|šaukiniai|šaukinių}}, ta�iau dabar yra $1 {{PLURAL:$1|šaukinys|šaukiniai|šaukinių}}.',
 'expensive-parserfunction-category'       => 'Puslapiai su per daug brangių kodo analizuoklio funkcijų šaukinių',
 'post-expand-template-inclusion-warning'  => 'Įspėjimas: Šablonų įterpimo dydis per didelis.
 Kai kurie šablonai nebus įtraukti.',
@@ -709,6 +806,8 @@ Kai kurie šablonai nebus įtraukti.',
 'post-expand-template-argument-warning'   => 'Įspėjimas: Šis puslapis turi bent vieną šablono argumentą, kuris turi per didelį išplėtimo dydį.
 Å ie argumentai buvo praleisti.',
 'post-expand-template-argument-category'  => 'Puslapiai, turintys praleistų šablono argumentų',
+'parser-template-loop-warning'            => 'Aptiktas Å¡ablono ciklas: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Šablono rekursinio gylio riba viršyta ($1)',
 
 # "Undo" feature
 'undo-success' => 'Keitimas gali būti atšauktas. Prašome patikrinti palyginimą, esantį žemiau, kad patvirtintumėte, kad jūs tai ir norite padaryti, ir tada išsaugokite pakeitimus, esan�ius žemiau, kad užbaigtumėte keitimo atšaukimą.',
@@ -723,29 +822,29 @@ Kai kurie šablonai nebus įtraukti.',
 $3 nurodyta priežastis yra ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Rodyti Å¡io puslapio specialiuosius veiksmus',
-'nohistory'           => 'Šis puslapis neturi keitimų istorijos.',
-'revnotfound'         => 'Versija nerasta',
-'revnotfoundtext'     => 'Norima puslapio versija nerasta. Patikrinkite URL, kuriuo patekote į šį puslapį.',
-'currentrev'          => 'DabartinÄ— versija',
-'revisionasof'        => '$1 versija',
-'revision-info'       => '$1 versija naudotojo $2',
-'previousrevision'    => '�Ankstesnė versija',
-'nextrevision'        => 'Vėlesnė versija→',
-'currentrevisionlink' => 'DabartinÄ— versija',
-'cur'                 => 'dab',
-'next'                => 'kitas',
-'last'                => 'pask',
-'page_first'          => 'pirm',
-'page_last'           => 'pask',
-'histlegend'          => "Skirtumai tarp versijų: pažymėkite lyginamas versijas ir spustelkite ''Enter'' klavišą arba mygtuką apa�ioje.<br />
+'viewpagelogs'           => 'Rodyti Å¡io puslapio specialiuosius veiksmus',
+'nohistory'              => 'Šis puslapis neturi keitimų istorijos.',
+'currentrev'             => 'DabartinÄ— versija',
+'currentrev-asof'        => 'DabartinÄ— $1 versija',
+'revisionasof'           => '$1 versija',
+'revision-info'          => '$1 versija naudotojo $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Ankstesnė versija',
+'nextrevision'           => 'Vėlesnė versija→',
+'currentrevisionlink'    => 'DabartinÄ— versija',
+'cur'                    => 'dab',
+'next'                   => 'kitas',
+'last'                   => 'pask',
+'page_first'             => 'pirm',
+'page_last'              => 'pask',
+'histlegend'             => "Skirtumai tarp versijų: pažymėkite lyginamas versijas ir spustelkite ''Enter'' klavišą arba mygtuką apa�ioje.<br />
 Žymėjimai: (dab) = palyginimas su naujausia versija,
 (pask) = palyginimas su prieš tai buvusia versija, S = smulkus keitimas.",
-'deletedrev'          => '[ištrinta]',
-'histfirst'           => 'Seniausi',
-'histlast'            => 'Paskutiniai',
-'historysize'         => '($1 {{PLURAL:$1|baitas|baitai|baitų}})',
-'historyempty'        => '(tuš�ia)',
+'history-fieldset-title' => 'Ieškoti istorijoje',
+'deletedrev'             => '[ištrinta]',
+'histfirst'              => 'Seniausi',
+'histlast'               => 'Paskutiniai',
+'historysize'            => '($1 {{PLURAL:$1|baitas|baitai|baitų}})',
+'historyempty'           => '(tuš�ia)',
 
 # Revision feed
 'history-feed-title'          => 'Versijų istorija',
@@ -829,6 +928,7 @@ Kiti administratoriai šiame projekte vis dar galės pasiekti paslėptą turinį
 'mergehistory-invalid-destination' => 'Rezultato puslapis turi turÄ—ti leistinÄ… pavadinimÄ….',
 'mergehistory-autocomment'         => '[[:$1]] prijungtas prie [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] prijungtas prie [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Šaltinio ir tikslo puslapiai negali būti vienodi',
 
 # Merge log
 'mergelog'           => 'Sujungimų istorija',
@@ -841,119 +941,200 @@ Kiti administratoriai šiame projekte vis dar galės pasiekti paslėptą turinį
 'difference'              => '(Skirtumai tarp versijų)',
 'lineno'                  => 'EilutÄ— $1:',
 'compareselectedversions' => 'Palyginti pasirinktas versijas',
+'visualcomparison'        => 'Vizualinis palyginimas',
+'wikicodecomparison'      => 'Vikiteksto palyginimas',
 'editundo'                => 'atšaukti',
 'diff-multi'              => '($1 {{PLURAL:$1|tarpinis keitimas nėra rodomas|tarpiniai keitimai nėra rodomi|tarpinių keitimų nėra rodoma}}.)',
+'diff-movedto'            => 'perkelta į $1',
+'diff-styleadded'         => '$1 stilius pridÄ—tas',
+'diff-added'              => 'pridÄ—ta $1',
+'diff-changedto'          => 'pakeista į $1',
+'diff-movedoutof'         => 'iškelta iš $1',
+'diff-styleremoved'       => '$1 stilius pašalintas',
+'diff-removed'            => '$1 pašalinta',
+'diff-changedfrom'        => 'pakeista iš $1',
+'diff-src'                => 'Å¡altinis',
+'diff-withdestination'    => 'su tikslu $1',
+'diff-with'               => '&#32;su $1 $2',
+'diff-with-final'         => '&#32;ir $1 $2',
+'diff-width'              => 'plotis',
+'diff-height'             => 'aukštis',
+'diff-p'                  => "'''paragrafas'''",
+'diff-blockquote'         => "'''citata'''",
+'diff-h1'                 => "'''antraštė (I lygis)'''",
+'diff-h2'                 => "'''antraštė (II lygis)'''",
+'diff-h3'                 => "'''antraštė (III lygis)'''",
+'diff-h4'                 => "'''antraštė (IV lygis)'''",
+'diff-h5'                 => "'''antraštė (V lygis)'''",
+'diff-pre'                => "'''išankstinis blokavimas'''",
+'diff-div'                => "'''dalijimas'''",
+'diff-ul'                 => "'''nesutvarkytas sąrašas'''",
+'diff-ol'                 => "'''sutvarkytas sąrašas'''",
+'diff-li'                 => "'''punktų sąrašas'''",
+'diff-table'              => "'''lentelÄ—'''",
+'diff-tbody'              => "'''lentelÄ—s turinys'''",
+'diff-tr'                 => "'''eilutÄ—'''",
+'diff-td'                 => "'''langelis'''",
+'diff-th'                 => "'''antraštė'''",
+'diff-br'                 => "'''lūžis'''",
+'diff-hr'                 => "'''horizontali linija'''",
+'diff-code'               => "'''kompiuterio kodo blokavimas'''",
+'diff-dl'                 => "'''reikšmių sąrašas'''",
+'diff-dt'                 => "'''apibrėžtas terminas'''",
+'diff-dd'                 => "'''reikšmė'''",
+'diff-input'              => "'''įvadas'''",
+'diff-form'               => "'''forma'''",
+'diff-img'                => "'''paveikslÄ—lis'''",
+'diff-span'               => "'''trukmÄ—'''",
+'diff-a'                  => "'''nuoroda'''",
+'diff-i'                  => "'''kursyvas'''",
+'diff-b'                  => "'''paryškinimas'''",
+'diff-strong'             => "'''„strong“ įvedimas'''",
+'diff-em'                 => "'''„em“ įvedimas'''",
+'diff-font'               => "'''„font“ įvedimas'''",
+'diff-big'                => "'''didelis'''",
+'diff-del'                => "'''ištrintas'''",
+'diff-tt'                 => "'''fiksuotas plotis'''",
+'diff-sub'                => "'''subskriptas'''",
+'diff-sup'                => "'''superskriptas'''",
+'diff-strike'             => "'''perbraukimas'''",
 
 # Search results
-'searchresults'             => 'Paieškos rezultatai',
-'searchresulttext'          => 'Daugiau informacijos apie paiešką projekte {{SITENAME}} rasite [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Ieškoma „[[:$1]]“',
-'searchsubtitleinvalid'     => "Ieškoma '''$1'''",
-'noexactmatch'              => "'''Nėra jokio puslapio, pavadinto „$1“.''' Jūs galite [[:$1|sukurti šį puslapį]].",
-'noexactmatch-nocreate'     => "'''Nėra puslapio su pavadinimu „$1“.'''",
-'toomanymatches'            => 'Perdaug atitikmenų buvo grąžinta. Prašome pabandyti kitokią užklausą',
-'titlematches'              => 'Puslapių pavadinimų atitikmenys',
-'notitlematches'            => 'Jokių pavadinimo atitikmenų',
-'textmatches'               => 'Puslapio turinio atitikmenys',
-'notextmatches'             => 'Jokių puslapių teksto atitikmenų',
-'prevn'                     => 'ankstesnius $1',
-'nextn'                     => 'tolimesnius $1',
-'viewprevnext'              => 'Žiūrėti ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 žodis|$2 žodžiai|$2 žodžių}})',
-'search-result-score'       => 'Tinkamumas: $1%',
-'search-redirect'           => '(peradresavimas $1)',
-'search-section'            => '(skyrius $1)',
-'search-suggest'            => 'Galbūt norėjote $1',
-'search-interwiki-caption'  => 'Dukteriniai projektai',
-'search-interwiki-default'  => '$1 rezultatai:',
-'search-interwiki-more'     => '(daugiau)',
-'search-mwsuggest-enabled'  => 'su pasiūlymais',
-'search-mwsuggest-disabled' => 'nėra pasiūlymų',
-'search-relatedarticle'     => 'SusijÄ™',
-'mwsuggest-disable'         => 'Slėpti AJAX pasiūlymus',
-'searchrelated'             => 'susijÄ™',
-'searchall'                 => 'visi',
-'showingresults'            => "Žemiau rodoma iki '''$1''' {{PLURAL:$1|rezultato|rezultatų|rezultatų}} pradedant #'''$2'''.",
-'showingresultsnum'         => "Žemiau rodoma '''$3''' {{PLURAL:$3|rezultato|rezultatų|rezultatų}}rezultatų pradedant #'''$2'''.",
-'showingresultstotal'       => "Žemiau rodom{{PLURAL:$3|as rezultatas '''$1''' iš '''$3'''|i rezultatai '''$1 - $2''' iš '''$3'''}}",
-'nonefound'                 => "'''Pastaba''': Pagal nutylėjimą ieškoma tik kai kuriose vardų srityse. Pamėginkite prirašyti priešdėlį ''all:'', jei norite ieškoti viso turinio (įskaitant aptarimo puslapius, šablonus ir t. t.), arba naudokite norimą vardų sritį kaip priešdėlį.",
-'powersearch'               => 'Išplėstinė paieška',
-'powersearch-legend'        => 'Išplėstinė paieška',
-'powersearch-ns'            => 'Ieškoti vardų srityse:',
-'powersearch-redir'         => 'Įtraukti peradresavimus',
-'powersearch-field'         => 'Ieškoti',
-'search-external'           => 'Išorinė paieška',
-'searchdisabled'            => 'Projekto {{SITENAME}} paieška yra uždrausta. Galite pamėginti ieškoti Google paieškos sistemoje. Paieškos sistemoje projekto {{SITENAME}} duomenys gali būti pasenę.',
+'searchresults'                    => 'Paieškos rezultatai',
+'searchresults-title'              => 'Paieškos rezultatai "$1"',
+'searchresulttext'                 => 'Daugiau informacijos apie paiešką projekte {{SITENAME}} rasite [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Jūs ieškote \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|visi puslapiai, prasidedantys "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|visi puslapiai, rodantys į "$1"]])',
+'searchsubtitleinvalid'            => "Ieškoma '''$1'''",
+'noexactmatch'                     => "'''Nėra jokio puslapio, pavadinto „$1“.''' Jūs galite [[:$1|sukurti šį puslapį]].",
+'noexactmatch-nocreate'            => "'''Nėra puslapio su pavadinimu „$1“.'''",
+'toomanymatches'                   => 'Perdaug atitikmenų buvo grąžinta. Prašome pabandyti kitokią užklausą',
+'titlematches'                     => 'Puslapių pavadinimų atitikmenys',
+'notitlematches'                   => 'Jokių pavadinimo atitikmenų',
+'textmatches'                      => 'Puslapio turinio atitikmenys',
+'notextmatches'                    => 'Jokių puslapių teksto atitikmenų',
+'prevn'                            => 'ankstesnius $1',
+'nextn'                            => 'tolimesnius $1',
+'viewprevnext'                     => 'Žiūrėti ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Paieškos nustatymai',
+'searchmenu-exists'                => "'''Puslapis pavadinimu „[[$1]]“ šioje wiki'''",
+'searchmenu-new'                   => "'''Sukurti puslapį „[[:$1]]“ šioje wiki!'''",
+'searchhelp-url'                   => 'Help:Turinys',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Ieškoti puslapių su šiuo priešdėliu]]',
+'searchprofile-articles'           => 'Turinio puslapiai',
+'searchprofile-articles-and-proj'  => 'Turinys ir projekto puslapiai',
+'searchprofile-project'            => 'Projekto puslapiai',
+'searchprofile-images'             => 'Failai',
+'searchprofile-everything'         => 'Viskas',
+'searchprofile-advanced'           => 'IÅ¡plÄ—stinÄ—',
+'searchprofile-articles-tooltip'   => 'Ieškoti �ia: $1',
+'searchprofile-project-tooltip'    => 'Ieškoti �ia: $1',
+'searchprofile-images-tooltip'     => 'Ieškoti failų',
+'searchprofile-everything-tooltip' => 'Ieškoti viso turinio (tame tarpe aptarimų puslapių)',
+'searchprofile-advanced-tooltip'   => 'Ieškoti skirtingose vardų srityse',
+'prefs-search-nsdefault'           => 'Ieškoti naudojantis išankstiniais nustatymais:',
+'prefs-search-nscustom'            => 'Ieškoti įprastų vardų sri�ių:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 žodis|$2 žodžiai|$2 žodžių}})',
+'search-result-score'              => 'Tinkamumas: $1%',
+'search-redirect'                  => '(peradresavimas $1)',
+'search-section'                   => '(skyrius $1)',
+'search-suggest'                   => 'Galbūt norėjote $1',
+'search-interwiki-caption'         => 'Dukteriniai projektai',
+'search-interwiki-default'         => '$1 rezultatai:',
+'search-interwiki-more'            => '(daugiau)',
+'search-mwsuggest-enabled'         => 'su pasiūlymais',
+'search-mwsuggest-disabled'        => 'nėra pasiūlymų',
+'search-relatedarticle'            => 'SusijÄ™',
+'mwsuggest-disable'                => 'Slėpti AJAX pasiūlymus',
+'searchrelated'                    => 'susijÄ™',
+'searchall'                        => 'visi',
+'showingresults'                   => "Žemiau rodoma iki '''$1''' {{PLURAL:$1|rezultato|rezultatų|rezultatų}} pradedant #'''$2'''.",
+'showingresultsnum'                => "Žemiau rodoma '''$3''' {{PLURAL:$3|rezultato|rezultatų|rezultatų}}rezultatų pradedant #'''$2'''.",
+'showingresultstotal'              => "Žemiau rodom{{PLURAL:$4|as rezultatas '''$1''' iš '''$3'''|i rezultatai '''$1 - $2''' iš '''$3'''}}",
+'nonefound'                        => "'''Pastaba''': Pagal nutylėjimą ieškoma tik kai kuriose vardų srityse. Pamėginkite prirašyti priešdėlį ''all:'', jei norite ieškoti viso turinio (įskaitant aptarimo puslapius, šablonus ir t. t.), arba naudokite norimą vardų sritį kaip priešdėlį.",
+'search-nonefound'                 => 'Nėra rezultatų, atitinkan�ių užklausą.',
+'powersearch'                      => 'Išplėstinė paieška',
+'powersearch-legend'               => 'Išplėstinė paieška',
+'powersearch-ns'                   => 'Ieškoti vardų srityse:',
+'powersearch-redir'                => 'Įtraukti peradresavimus',
+'powersearch-field'                => 'Ieškoti',
+'search-external'                  => 'Išorinė paieška',
+'searchdisabled'                   => 'Projekto {{SITENAME}} paieška yra uždrausta. Galite pamėginti ieškoti Google paieškos sistemoje. Paieškos sistemoje projekto {{SITENAME}} duomenys gali būti pasenę.',
 
 # Preferences page
-'preferences'              => 'Nustatymai',
-'mypreferences'            => 'Mano nustatymai',
-'prefs-edits'              => 'Keitimų skai�ius:',
-'prefsnologin'             => 'Neprisijungęs',
-'prefsnologintext'         => 'Jums reikia būti <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} prisijungusiam]</span>, kad galėtumėte keisti savo nustatymus.',
-'prefsreset'               => 'Nustatymai buvo atstatyti iš saugyklos.',
-'qbsettings'               => 'Greitasis pasirinkimas',
-'qbsettings-none'          => 'Nerodyti',
-'qbsettings-fixedleft'     => 'Fiksuoti kairÄ—je',
-'qbsettings-fixedright'    => 'Fiksuoti dešinėje',
-'qbsettings-floatingleft'  => 'Plaukiojantis kairÄ—je',
-'qbsettings-floatingright' => 'Plaukiojantis dešinėje',
-'changepassword'           => 'Pakeisti slaptažodį',
-'skin'                     => 'IÅ¡vaizda',
-'math'                     => 'Matematika',
-'dateformat'               => 'Datos formatas',
-'datedefault'              => 'Jokio pasirinkimo',
-'datetime'                 => 'Data ir laikas',
-'math_failure'             => 'Nepavyko apdoroti',
-'math_unknown_error'       => 'nežinoma klaida',
-'math_unknown_function'    => 'nežinoma funkcija',
-'math_lexing_error'        => 'leksikos klaida',
-'math_syntax_error'        => 'sintaksÄ—s klaida',
-'math_image_error'         => 'PNG konvertavimas nepavyko; patikrinkite, ar teisingai įdiegta latex, dvips, gs, ir convert',
-'math_bad_tmpdir'          => 'Nepavyksta sukurti arba rašyti į matematikos laikinąjį aplanką',
-'math_bad_output'          => 'Nepavyksta sukurti arba rašyti į matematikos išvesties aplanką',
-'math_notexvc'             => 'Trūksta texvc vykdomojo failo; pažiūrėkite math/README kaip konfigūruoti.',
-'prefs-personal'           => 'Naudotojo profilis',
-'prefs-rc'                 => 'Paskutiniai keitimai',
-'prefs-watchlist'          => 'Stebimų sąrašas',
-'prefs-watchlist-days'     => 'Dienos rodomos stebimųjų sąraše:',
-'prefs-watchlist-edits'    => 'Kiek daugiausia keitimų rodyti išplėstiniame stebimųjų sąraše:',
-'prefs-misc'               => 'Įvairūs nustatymai',
-'saveprefs'                => 'IÅ¡saugoti',
-'resetprefs'               => 'Išvalyti neišsaugotus pakeitimus',
-'oldpassword'              => 'Senas slaptažodis:',
-'newpassword'              => 'Naujas slaptažodis:',
-'retypenew'                => 'Pakartokite naują slaptažodį:',
-'textboxsize'              => 'Redagavimas',
-'rows'                     => 'EilutÄ—s:',
-'columns'                  => 'Stulpeliai:',
-'searchresultshead'        => 'Paieškos nustatymai',
-'resultsperpage'           => 'Rezultatų puslapyje:',
-'contextlines'             => 'Eilu�ių rezultate:',
-'contextchars'             => 'Konteksto simbolių eilutėje:',
-'stub-threshold'           => 'Puslapį žymėti <a href="#" class="stub">nebaigtu</a>, jei mažesnis nei:',
-'recentchangesdays'        => 'Rodomos dienos paskutinių keitimų sąraše:',
-'recentchangescount'       => 'Keitimų skai�ius rodomas naujausių keitimų sąraše:',
-'savedprefs'               => 'Nustatymai sėkmingai išsaugoti.',
-'timezonelegend'           => 'Laiko juosta',
-'timezonetext'             => '¹Įveskite, kiek valandų jūsų vietinis laikas skiriasi nuo serverio laiko (UTC).',
-'localtime'                => 'Vietinis laikas',
-'timezoneoffset'           => 'Skirtumas¹',
-'servertime'               => 'Serverio laikas',
-'guesstimezone'            => 'Paimti iš naršyklės',
-'allowemail'               => 'Leisti siųsti el. laiškus iš kitų naudotojų',
-'prefs-searchoptions'      => 'Paieškos nuostatos',
-'prefs-namespaces'         => 'Vardų sritys',
-'defaultns'                => 'Pagal nutylėjimą ieškoti šiose vardų srityse:',
-'default'                  => 'pagal nutylÄ—jimÄ…',
-'files'                    => 'Failai',
+'preferences'               => 'Nustatymai',
+'mypreferences'             => 'Mano nustatymai',
+'prefs-edits'               => 'Keitimų skai�ius:',
+'prefsnologin'              => 'Neprisijungęs',
+'prefsnologintext'          => 'Jums reikia būti <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} prisijungusiam]</span>, kad galėtumėte keisti savo nustatymus.',
+'prefsreset'                => 'Nustatymai buvo atstatyti iš saugyklos.',
+'qbsettings'                => 'Greitasis pasirinkimas',
+'qbsettings-none'           => 'Nerodyti',
+'qbsettings-fixedleft'      => 'Fiksuoti kairÄ—je',
+'qbsettings-fixedright'     => 'Fiksuoti dešinėje',
+'qbsettings-floatingleft'   => 'Plaukiojantis kairÄ—je',
+'qbsettings-floatingright'  => 'Plaukiojantis dešinėje',
+'changepassword'            => 'Pakeisti slaptažodį',
+'skin'                      => 'IÅ¡vaizda',
+'skin-preview'              => 'Peržiūra',
+'math'                      => 'Matematika',
+'dateformat'                => 'Datos formatas',
+'datedefault'               => 'Jokio pasirinkimo',
+'datetime'                  => 'Data ir laikas',
+'math_failure'              => 'Nepavyko apdoroti',
+'math_unknown_error'        => 'nežinoma klaida',
+'math_unknown_function'     => 'nežinoma funkcija',
+'math_lexing_error'         => 'leksikos klaida',
+'math_syntax_error'         => 'sintaksÄ—s klaida',
+'math_image_error'          => 'PNG konvertavimas nepavyko; patikrinkite, ar teisingai įdiegta latex, dvips, gs, ir convert',
+'math_bad_tmpdir'           => 'Nepavyksta sukurti arba rašyti į matematikos laikinąjį aplanką',
+'math_bad_output'           => 'Nepavyksta sukurti arba rašyti į matematikos išvesties aplanką',
+'math_notexvc'              => 'Trūksta texvc vykdomojo failo; pažiūrėkite math/README kaip konfigūruoti.',
+'prefs-personal'            => 'Naudotojo profilis',
+'prefs-rc'                  => 'Paskutiniai keitimai',
+'prefs-watchlist'           => 'Stebimų sąrašas',
+'prefs-watchlist-days'      => 'Dienos rodomos stebimųjų sąraše:',
+'prefs-watchlist-days-max'  => '(daugiausiai 7 dienos)',
+'prefs-watchlist-edits'     => 'Kiek daugiausia keitimų rodyti išplėstiniame stebimųjų sąraše:',
+'prefs-watchlist-edits-max' => '(didžiausias skai�ius: 1000)',
+'prefs-misc'                => 'Įvairūs nustatymai',
+'prefs-resetpass'           => 'Keisti slaptažodį',
+'saveprefs'                 => 'IÅ¡saugoti',
+'resetprefs'                => 'Išvalyti neišsaugotus pakeitimus',
+'textboxsize'               => 'Redagavimas',
+'prefs-edit-boxsize'        => 'Redagavimo lango dydis.',
+'rows'                      => 'EilutÄ—s:',
+'columns'                   => 'Stulpeliai:',
+'searchresultshead'         => 'Paieškos nustatymai',
+'resultsperpage'            => 'Rezultatų puslapyje:',
+'contextlines'              => 'Eilu�ių rezultate:',
+'contextchars'              => 'Konteksto simbolių eilutėje:',
+'stub-threshold'            => 'Puslapį žymėti <a href="#" class="stub">nebaigtu</a>, jei mažesnis nei:',
+'recentchangesdays'         => 'Rodomos dienos paskutinių keitimų sąraše:',
+'recentchangesdays-max'     => '(daugiausiai $1 {{PLURAL:$1|diena|dienų|dienos}})',
+'recentchangescount'        => 'Numatytasis keitimų skai�ius, rodomas naujausių keitimų, puslapių istorijose ir įvykių sąrašuose:',
+'savedprefs'                => 'Nustatymai sėkmingai išsaugoti.',
+'timezonelegend'            => 'Laiko juosta',
+'timezonetext'              => '¹Įveskite, kiek valandų jūsų vietinis laikas skiriasi nuo serverio laiko (UTC).',
+'localtime'                 => 'Vietinis laikas:',
+'timezoneselect'            => 'Laiko juosta:',
+'timezoneuseserverdefault'  => 'Naudoti pagal nutylėjimą iš serverio',
+'timezoneuseoffset'         => 'Kita (patikslinti skirtumÄ…)',
+'timezoneoffset'            => 'Skirtumas¹:',
+'servertime'                => 'Serverio laikas:',
+'guesstimezone'             => 'Paimti iš naršyklės',
+'allowemail'                => 'Leisti siųsti el. laiškus iš kitų naudotojų',
+'prefs-searchoptions'       => 'Paieškos nuostatos',
+'prefs-namespaces'          => 'Vardų sritys',
+'defaultns'                 => 'Pagal nutylėjimą ieškoti šiose vardų srityse:',
+'default'                   => 'pagal nutylÄ—jimÄ…',
+'files'                     => 'Failai',
 
 # User rights
 'userrights'                  => 'Naudotojų teisių valdymas', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Tvarkyti naudotojo grupes',
 'userrights-user-editname'    => 'Įveskite naudotojo vardą:',
 'editusergroup'               => 'Redaguoti naudotojo grupes',
-'editinguser'                 => "Taisomos naudotojo '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])
+'editinguser'                 => "Taisomos naudotojo '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])
 teisÄ—s",
 'userrights-editusergroup'    => 'Redaguoti naudotojų grupes',
 'saveusergroups'              => 'Saugoti naudotojų grupes',
@@ -1000,21 +1181,23 @@ teisÄ—s",
 'right-createpage'           => 'Kurti puslapius (kurie nėra aptarimų puslapiai)',
 'right-createtalk'           => 'Kurti aptarimų puslapius',
 'right-createaccount'        => 'Kurti naujas naudotojų paskyras',
-'right-minoredit'            => 'Žymeti keitimus kaip smulkius',
+'right-minoredit'            => 'Žymėti keitimus kaip smulkius',
 'right-move'                 => 'Pervadinti puslapius',
 'right-move-subpages'        => 'Perkelti puslapius su jų subpuslapiais',
+'right-move-rootuserpages'   => 'Perkelti Å¡akninius naudotojo puslapius',
+'right-movefile'             => 'Perkelti failus',
 'right-suppressredirect'     => 'Nekurti peradresavimo iš seno pavadinimo kuomet puslapis pervadinamas',
 'right-upload'               => 'Įkelti failus',
 'right-reupload'             => 'Perrašyti egzistuojantį failą',
 'right-reupload-own'         => 'Perrašyti paties įkeltą egzistuojantį failą',
 'right-reupload-shared'      => 'Perrašyti failus bendrojoje failų saugykloje lokaliai',
 'right-upload_by_url'        => 'Įkelti failą iš URL adreso',
-'right-purge'                => "IÅ¡valyti svetainÄ—s kaupyklÄ™ (''cache'') puslapiui be patvirtinimo",
+'right-purge'                => 'Išvalyti svetainės podėlį puslapiui be patvirtinimo',
 'right-autoconfirmed'        => 'Redaguoti pusiau užrakintus puslapius',
 'right-bot'                  => 'Laikyti automatiniu procesu',
-'right-nominornewtalk'       => 'Smulkių keitimų nebuvimas aptarimų puslapiuose įjungia naujų pranešimų rėžimą',
-'right-apihighlimits'        => 'Mažesni apribojimai įgyvedinant API užklausas',
-'right-writeapi'             => 'Naudoti API užrašymui',
+'right-nominornewtalk'       => 'Atlikus smulkių keitimų aptarimų puslapiuose įjungia pranešimą apie naujas žinutes',
+'right-apihighlimits'        => 'Mažesni apribojimai API užklausoms',
+'right-writeapi'             => 'Naudoti rašymo API',
 'right-delete'               => 'Trinti puslapius',
 'right-bigdelete'            => 'IÅ¡trinti puslapius su ilga istorija',
 'right-deleterevision'       => 'Ištrinti ir atstatyti specifines puslapių revizijas',
@@ -1022,7 +1205,7 @@ teisÄ—s",
 'right-browsearchive'        => 'Ieškoti ištrintų puslapių',
 'right-undelete'             => 'Atstatyti puslapį',
 'right-suppressrevision'     => 'Peržiūrėti ir atstatyti revizijas, paslėptas nuo administratorių',
-'right-suppressionlog'       => 'Žiūrėti priva�ius logus',
+'right-suppressionlog'       => 'Žiūrėti priva�ius įvykių sąrašus',
 'right-block'                => 'Blokuoti redagavimo galimybÄ™ kitiems naudotojams',
 'right-blockemail'           => 'Blokuoti elektroninio pašto siuntimo galimybę naudotojui',
 'right-hideuser'             => 'Blokuoti naudotojo vardą, paslėpiant jį nuo viešinimo',
@@ -1053,9 +1236,46 @@ teisÄ—s",
 'rightslogentry' => 'pakeista $1 grupės narystė iš $2 į $3',
 'rightsnone'     => '(jokių)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'skaityti šį puslapį',
+'action-edit'                 => 'redaguoti šį puslapį',
+'action-createpage'           => 'kurti puslapius',
+'action-createtalk'           => 'kurti aptarimų puslapius',
+'action-createaccount'        => 'kurti Å¡iÄ… naudotojo paskyrÄ…',
+'action-minoredit'            => 'žymėti keitimą kaip smulkų',
+'action-move'                 => 'pervadinti šį puslapį',
+'action-move-subpages'        => 'pervadinti šį puslapį ir jo subpuslapius',
+'action-move-rootuserpages'   => 'perkelti pagrindinius naudotojų puslapius',
+'action-movefile'             => 'perkelti šį failą',
+'action-upload'               => 'įkelti šį failą',
+'action-reupload'             => 'perrašyti šį esamą failą',
+'action-reupload-shared'      => 'perrašyti šį failą bendrojoje saugykloje',
+'action-upload_by_url'        => 'įkelti šį failą iš URL adreso',
+'action-writeapi'             => 'naudotis rašymo API',
+'action-delete'               => 'ištrinti šį puslapį',
+'action-deleterevision'       => 'ištrinti šią reviziją',
+'action-deletedhistory'       => 'žiūrėti šio ištrinto puslapio istoriją',
+'action-browsearchive'        => 'ieškoti ištrintų puslapių',
+'action-undelete'             => 'atkurti šį puslapį',
+'action-suppressrevision'     => 'peržiūrėti ir atstatyti šią paslėptą reviziją',
+'action-suppressionlog'       => 'peržiūrėti šį privatų registrą',
+'action-block'                => 'neleisti Å¡iam naudotojui redaguoti',
+'action-protect'              => 'pakeisti apsaugos lygius Å¡iam puslapiui',
+'action-import'               => 'importuoti šį puslapį iš kitos wiki',
+'action-importupload'         => 'importuoti šį puslapį iš įkelto failo',
+'action-patrol'               => 'pažymėti kitų keitimus kaip patikrintus',
+'action-autopatrol'           => 'savo keitimų pažymėjimas patikrintais',
+'action-unwatchedpages'       => 'žiūrėti nestebimų puslapių sąrašą',
+'action-trackback'            => "priimti trackback'Ä…",
+'action-mergehistory'         => 'sulieti Å¡io puslapio istorijÄ…',
+'action-userrights'           => 'keisti visų naudotojų teises',
+'action-userrights-interwiki' => 'keisti naudotojų teises kitose wiki svetainėse',
+'action-siteadmin'            => 'užrakinti ar atrakinti duomenų bazę',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|pakeitimas|pakeitimai|pakeitimų}}',
 'recentchanges'                     => 'Paskutiniai keitimai',
+'recentchanges-legend'              => 'Naujausių keitimų parinktys',
 'recentchangestext'                 => 'Å iame puslapyje yra patys naujausi pakeitimai Å¡iame projekte.',
 'recentchanges-feed-description'    => 'Sekite pa�ius naujausius projekto keitimus šiame šaltinyje.',
 'rcnote'                            => "Žemiau yra {{PLURAL:$1|'''1''' pakeitimas|paskutiniai '''$1''' pakeitimai|paskutinių '''$1''' pakeitimų}} per {{PLURAL:$2|dieną|paskutiniąsias '''$2''' dienas|paskutiniųjų '''$2''' dienų}} skai�iuojant nuo $5, $4.",
@@ -1079,6 +1299,8 @@ teisÄ—s",
 'rc_categories'                     => 'Rodyti tik šias kategorijas (atskirkite naudodami „|“)',
 'rc_categories_any'                 => 'Bet kokia',
 'newsectionsummary'                 => '/* $1 */ naujas skyrius',
+'rc-enhanced-expand'                => 'Rodyti detales (reikia JavaScript)',
+'rc-enhanced-hide'                  => 'SlÄ—pti detales',
 
 # Recent changes linked
 'recentchangeslinked'          => 'SusijÄ™ keitimai',
@@ -1096,15 +1318,15 @@ Puslapiai iš jūsų [[Special:Watchlist|stebimųjų sąrašo]] yra '''paryškin
 'reuploaddesc'                => 'Atšaukti įkėlimą ir grįžti į įkėlimo formą.',
 'uploadnologin'               => 'Neprisijungęs',
 'uploadnologintext'           => 'Norėdami įkelti failą, turite būti [[Special:UserLogin|prisijungęs]].',
-'upload_directory_missing'    => 'Įkėlimo direktorija ($1) praleista ir negali būti sukurta tinklo serverio.',
+'upload_directory_missing'    => 'Nėra įkėlimo aplanko ($1) ir negali būti sukurtas tinklo serverio.',
 'upload_directory_read_only'  => 'Tinklapio serveris negali rašyti į įkėlimo aplanką ($1).',
 'uploaderror'                 => 'Įkėlimo klaida',
 'uploadtext'                  => "Naudokitės žemiau pateikta forma failų įkėlimui.
-Norėdami peržiūrėti ar ieškoti anks�iau įkeltų paveikslėlių, eikite į [[Special:ImageList|įkeltų failų sąrašą]], įkėlimai ir trynimai yra registruojami [[Special:Log/upload|įkėlimų istorijoje]], trynimai - [[Special:Log/delete|trynimų istorijoje]].
+Norėdami peržiūrėti ar ieškoti anks�iau įkeltų paveikslėlių, eikite į [[Special:FileList|įkeltų failų sąrašą]], įkėlimai ir trynimai yra registruojami [[Special:Log/upload|įkėlimų istorijoje]], trynimai - [[Special:Log/delete|trynimų istorijoje]].
 
 Norėdami panaudoti įkeltą failą puslapyje, naudokite tokias nuorodas:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>'''
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' arba
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' arba
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' tiesioginei nuorodai į failą.",
 'upload-permitted'            => 'Leidžiami failų tipai: $1.',
 'upload-preferred'            => 'Pageidautini failų tipai: $1.',
@@ -1124,30 +1346,31 @@ Norėdami panaudoti įkeltą failą puslapyje, naudokite tokias nuorodas:
 'illegalfilename'             => 'Failo varde „$1“ yra simbolių, neleidžiamų puslapio pavadinimuose. Prašome pervadint failą ir mėginkite įkelti jį iš naujo.',
 'badfilename'                 => 'Failo pavadinimas pakeistas į „$1“.',
 'filetype-badmime'            => 'Neleidžiama įkelti „$1“ MIME tipo failų.',
-'filetype-bad-ie-mime'        => 'Negalima įkelti šio failo kadangi Internet Explorer ji pažymėtų kaip "$1". Tai yra neleistinas ir potencialiai pavojingas failo tipas.',
+'filetype-bad-ie-mime'        => 'Negalima įkelti šio failo, kadangi Internet Explorer jį pažymėtų kaip „$1“. Tai yra neleistinas ir potencialiai pavojingas failo tipas.',
 'filetype-unwanted-type'      => "„.$1“''' yra nepageidautinas failo tipas. {{PLURAL:$3|Pageidautinas failų tipas|pageidautini failų tipai}} yra $2.",
 'filetype-banned-type'        => "„.$1“''' nėra leistinas failo tipas. {{PLURAL:$3|Leistinas failų tipas|Leistini failų tipai}} yra $2.",
 'filetype-missing'            => 'Failas neturi galūnės (pavyzdžiui „.jpg“).',
 'large-file'                  => 'Rekomenduojama, kad failų dydis būtų nedidesnis nei $1; šio failo dydis yra $2.',
 'largefileserver'             => 'Šis failas yra didesnis nei serveris yra sukonfigūruotas leisti.',
 'emptyfile'                   => 'Panašu, kad failas, kurį įkėlėte yra tuš�ias. Tai gali būti dėl klaidos failo pavadinime. Pasitikrinkite ar tikrai norite įkelti šitą failą.',
-'fileexists'                  => 'Failas tuo pa�iu vardu jau egzistuoja, prašome pažiūrėti <strong><tt>$1</tt></strong>, jei nesate tikras, ar norite perrašyti šį failą.',
-'filepageexists'              => 'Šio failo aprašymo puslapis jau buvo sukurtas <strong><tt>$1</tt></strong>, bet šiuo metu nėra jokio failo šiuo pavadinimu. Jūsų įvestas komentaras neatsiras aprašymo puslapyje. Jei norite, kad jūsų komentaras ten atsirastų, jums reikia jį pakeisti pa�iam.',
-'fileexists-extension'        => 'Failas su panašiu pavadinimu jau yra:<br />
-Įkeliamo failo pavadinimas: <strong><tt>$1</tt></strong><br />
-Jau esan�io failo pavadinimas: <strong><tt>$2</tt></strong><br />
-Prašome pasirinkti kitą vardą.',
+'fileexists'                  => "Failas tuo pa�iu vardu jau egzistuoja, prašome pažiūrėti '''<tt>$1</tt>''', jei nesate tikras, ar norite perrašyti šį failą.",
+'filepageexists'              => "Šio failo aprašymo puslapis jau buvo sukurtas '''<tt>$1</tt>''', bet šiuo metu nėra jokio failo šiuo pavadinimu. Jūsų įvestas komentaras neatsiras aprašymo puslapyje. Jei norite, kad jūsų komentaras ten atsirastų, jums reikia jį pakeisti pa�iam.",
+'fileexists-extension'        => "Failas su panašiu pavadinimu jau yra:<br />
+Įkeliamo failo pavadinimas: '''<tt>$1</tt>'''<br />
+Jau esan�io failo pavadinimas: '''<tt>$2</tt>'''<br />
+Prašome pasirinkti kitą vardą.",
 'fileexists-thumb'            => "<center>'''Egzistuojantis failas'''</center>",
-'fileexists-thumbnail-yes'    => 'Failas turbūt yra sumažinto dydžio failas <i>(miniatiūra)</i>. Prašome peržiūrėti failą  <strong><tt>$1</tt></strong>.<br />
-Jeigu tai yra toks pats pradinio dydžio paveikslėlis, tai įkelti papildomos miniatūros nereikia.',
-'file-thumbnail-no'           => 'Failo pavadinimas prasideda  <strong><tt>$1</tt></strong>. 
-Atrodo, kad yra sumažinto dydžio paveikslėlis <i>(miniatiūra)</i>.
-Jei jūs turite šį paveisklėlį pilna raiška, įkelkite šitą, priešingu atveju prašome pakeisti failo pavadinimą.',
-'fileexists-forbidden'        => 'Failas tokiu pa�iu vardu jau egzistuoja;
-prašome eiti atgal ir įkelti šį failą kitu vardu. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Failas turbūt yra sumažinto dydžio failas ''(miniatiūra)''. Prašome peržiūrėti failą  '''<tt>$1</tt>'''.<br />
+Jeigu tai yra toks pats pradinio dydžio paveikslėlis, tai įkelti papildomos miniatūros nereikia.",
+'file-thumbnail-no'           => "Failo pavadinimas prasideda  '''<tt>$1</tt>'''. 
+Atrodo, kad yra sumažinto dydžio paveikslėlis ''(miniatiūra)''.
+Jei jūs turite šį paveisklėlį pilna raiška, įkelkite šitą, priešingu atveju prašome pakeisti failo pavadinimą.",
+'fileexists-forbidden'        => 'Failas tokiu pa�iu vardu jau egzistuoja ir negali būti perrašytas;
+prašome eiti atgal ir įkelti šį failą kitu vardu. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Failas tokiu vardu jau egzistuoja bendrojoje failų saugykloje;
-prašome eiti atgal ir įkelti šį failą kitu vardu. [[Image:$1|thumb|center|$1]]',
+Jei visvien norite įkelti savo failą, prašome eiti atgal ir įkelti šį failą kitu vardu. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Šis failas yra {{PLURAL:$1|šio failo|šių failų}} dublikatas:',
+'file-deleted-duplicate'      => 'Failas, identiškas šiam failui ([[$1]]), seniau buvo ištrintas. Prieš įkeldami jį vėl patikrinkite šio failo ištrynimo istoriją.',
 'successfulupload'            => 'Įkelta sėkmingai',
 'uploadwarning'               => 'DÄ—mesio',
 'savefile'                    => 'IÅ¡saugoti failÄ…',
@@ -1167,7 +1390,7 @@ prašome eiti atgal ir įkelti šį failą kitu vardu. [[Image:$1|thumb|center|$
 
 Jūs turėtumėte nuspręsti, ar verta toliau įkeldinėti šį failą.
 Šio failo šalinimų istorija yra pateikta dėl patogumo:",
-'filename-bad-prefix'         => 'Jūsų įkeliamas failas prasideda su <strong>„$1“</strong>, bet tai yra neapibūdinantis pavadinimas, dažniausiai priskirtas skaitmeninių kamerų. Prašome suteikti labiau apibūdinantį pavadinimą savo failui.',
+'filename-bad-prefix'         => "Jūsų įkeliamas failas prasideda su '''„$1“''', bet tai yra neapibūdinantis pavadinimas, dažniausiai priskirtas skaitmeninių kamerų. Prašome suteikti labiau apibūdinantį pavadinimą savo failui.",
 
 'upload-proto-error'      => 'Neteisingas protokolas',
 'upload-proto-error-text' => 'Nuotoliniai įkėlimas reikalauja, kad URL prasidėtų <code>http://</code> arba <code>ftp://</code>.',
@@ -1188,20 +1411,21 @@ Jūs turėtumėte nuspręsti, ar verta toliau įkeldinėti šį failą.
 'upload_source_url'  => ' (tikras, viešai prieinamas URL)',
 'upload_source_file' => ' (failas jūsų kompiuteryje)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Šis specialus puslapis rodo visus įkeltus failus.
+# Special:ListFiles
+'listfiles-summary'     => 'Šis specialus puslapis rodo visus įkeltus failus.
 Pagal numatymą paskutiniai įkelti failai rodomi sąrašo viršuje.
 Paspaudę ant stulpelio antraštės pakeiste išrikiavimą.',
-'imagelist_search_for'  => 'Ieškoti failo pavadinimo:',
+'listfiles_search_for'  => 'Ieškoti failo pavadinimo:',
 'imgfile'               => 'failas',
-'imagelist'             => 'Failų sąrašas',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Pavadinimas',
-'imagelist_user'        => 'Naudotojas',
-'imagelist_size'        => 'Dydis',
-'imagelist_description' => 'Aprašymas',
-
-# Image description page
+'listfiles'             => 'Failų sąrašas',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Pavadinimas',
+'listfiles_user'        => 'Naudotojas',
+'listfiles_size'        => 'Dydis',
+'listfiles_description' => 'Aprašymas',
+'listfiles_count'       => 'Versijos',
+
+# File description page
 'filehist'                       => 'PaveikslÄ—lio istorija',
 'filehist-help'                  => 'Paspauskite ant datos/laiko, kad pamatytumėte failą tokį, koks jis buvo tuo metu.',
 'filehist-deleteall'             => 'trinti visus',
@@ -1209,19 +1433,25 @@ Paspaudę ant stulpelio antraštės pakeiste išrikiavimą.',
 'filehist-revert'                => 'grąžinti',
 'filehist-current'               => 'dabartinis',
 'filehist-datetime'              => 'Data/Laikas',
+'filehist-thumb'                 => 'Miniatiūra',
+'filehist-thumbtext'             => 'Versijos $1 miniatiūra',
+'filehist-nothumb'               => 'Nėra miniatiūros',
 'filehist-user'                  => 'Naudotojas',
 'filehist-dimensions'            => 'Matmenys',
 'filehist-filesize'              => 'Failo dydis',
 'filehist-comment'               => 'Komentaras',
-'imagelinks'                     => 'Nuorodos',
+'imagelinks'                     => 'Failų nuorodos',
 'linkstoimage'                   => '{{PLURAL:$1|Šis puslapis|Šie puslapiai}} nurodo į šį failą:',
+'linkstoimage-more'              => 'Daugiau nei $1 {{PLURAL:$1|puslapis|puslapiai}} rodo į šį failą.
+Žemiau esantis sąrašas rodo tik {{PLURAL:$1|pirmo puslapio|pirmų $1 puslapių}} nuorodas į šį failą.
+Pilnas sąrašas pasiekiamas [[Special:WhatLinksHere/$2|�ia]].',
 'nolinkstoimage'                 => 'Ä® failÄ… nenurodo joks puslapis.',
 'morelinkstoimage'               => 'Žiūrėti [[Special:WhatLinksHere/$1|daugiau nuorodų]] į šį failą.',
 'redirectstofile'                => '{{PLURAL:$1|Šis failas|$1 failai}} peradresuoja į šį failą:',
-'duplicatesoffile'               => '{{PLURAL:$1|failas yra dublikatas|$1 failai yra dublikatai}} Å¡io failo:',
+'duplicatesoffile'               => 'Šis failas turi {{PLURAL:$1|$1 dublikatą|$1 dublikatus|$1 dublikatų}} ([[Special:FileDuplicateSearch/$2|daugiau informacijos]]):',
 'sharedupload'                   => 'Šis failas yra įkeltas bendram naudojimui ir gali būti naudojamas kituose projektuose.',
 'shareduploadwiki'               => 'Žiūrėkite $1 tolimesnei informacijai.',
-'shareduploadwiki-desc'          => 'Aprašymas iš jo $1 bendrojoje saugykloje yra rodomas žemiau.',
+'shareduploadwiki-desc'          => 'Aprašymas iš jo $1 yra rodomas žemiau.',
 'shareduploadwiki-linktext'      => 'failo aprašymo puslapio',
 'shareduploadduplicate'          => 'Šis failas yra $1, esan�io bendroje saugykloje, dublikatas.',
 'shareduploadduplicate-linktext' => 'kitas failas',
@@ -1245,7 +1475,7 @@ Paspaudę ant stulpelio antraštės pakeiste išrikiavimą.',
 # File deletion
 'filedelete'                  => 'Trinti $1',
 'filedelete-legend'           => 'Trinti failÄ…',
-'filedelete-intro'            => "JÅ«s trinate '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Jūs ketinate ištrinti failą '''[[Media:$1|$1]]''' su visa istorija.",
 'filedelete-intro-old'        => '<span class="plainlinks">JÅ«s trinate \'\'\'[[Media:$1|$1]]\'\'\' [$4 $3, $2] versijÄ….</span>',
 'filedelete-comment'          => 'Trynimo priežastis:',
 'filedelete-submit'           => 'Trinti',
@@ -1253,7 +1483,6 @@ Paspaudę ant stulpelio antraštės pakeiste išrikiavimą.',
 'filedelete-success-old'      => "'''[[Media:$1|$1]]''' $3, $2 versija buvo ištrinta.",
 'filedelete-nofile'           => "'''$1''' neegzistuoja.",
 'filedelete-nofile-old'       => "NÄ—ra jokios '''$1''' suarchyvuotos versijos su nurodytais atributais.",
-'filedelete-iscurrent'        => 'Jūs bandote ištrinti pa�ią naujiausią šio failo versiją. Pirmiausia prašome grąžinti į senesnę versiją.',
 'filedelete-otherreason'      => 'Kita/papildoma priežastis:',
 'filedelete-reason-otherlist' => 'Kita priežastis',
 'filedelete-reason-dropdown'  => '*Dažnos trynimo priežastys
@@ -1280,29 +1509,31 @@ Paspaudę ant stulpelio antraštės pakeiste išrikiavimą.',
 
 # Random page
 'randompage'         => 'Atsitiktinis puslapis',
-'randompage-nopages' => 'Šioje vardų srityje nėra jokių puslapių.',
+'randompage-nopages' => 'Vardų srityje "$1" nėra jokių puslapių.',
 
 # Random redirect
 'randomredirect'         => 'Atsitiktinis peradresavimas',
-'randomredirect-nopages' => 'Šioje vardų srityje nėra jokių peradresavimų.',
+'randomredirect-nopages' => 'Vardų srityje "$1" nėra jokių peradresavimų.',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => '{{SITENAME}} statistika',
-'userstats'              => 'Naudotojų statistika',
-'sitestatstext'          => "Duomenų bazėje yra '''$1''' {{PLURAL:$1|puslapis|puslapiai|puslapių}}.
-Į šį skai�ių įeina aptarimų puslapiai, puslapiai apie {{SITENAME}}, peradresavimo puslapiai ir kiti, nelaikomi puslapiais.
-Be šių puslapių, yra '''$2''' {{PLURAL:$2|puslapis|puslapiai|puslapių}} pripažįstami kaip turinio puslapiai.
-
-Buvo įkelta '''$8''' {{PLURAL:$8|failas|failai|failų}}.
-
-Nuo {{SITENAME}} pradžios iš viso buvo parodyta '''$3''' {{PLURAL:$3|puslapis|puslapiai|puslapių}} ir atlikta '''$4''' puslapių {{PLURAL:$4|keitimas|keitimai|keitimų}}.
-Iš to išeina, kad vidutiniškai kiekvienas puslapis keistas '''$5''' karto, bei parodytas '''$6''' karto per pakeitimą.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Užduo�ių eilės] ilgis yra '''$7'''.",
-'userstatstext'          => "Šiuo metu yra '''$1''' [[Special:ListUsers|{{PLURAL:$1|registruotas naudotojas|registruoti naudotojai|registruotų naudotojų}}]], iš jų
-'''$2''' (arba '''$4%''') yra $5.",
-'statistics-mostpopular' => 'Daugiausiai rodyti puslapiai',
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Puslapių statistika',
+'statistics-header-edits'      => 'Redagavimų statistika',
+'statistics-header-views'      => 'Peržiūrų statistika',
+'statistics-header-users'      => 'Naudotojų statistika',
+'statistics-articles'          => 'Turinio puslapiai',
+'statistics-pages'             => 'Puslapiai',
+'statistics-pages-desc'        => 'Visi puslapiai, tarp jų aptarimo, nukreipimų, ir kiti puslapiai.',
+'statistics-files'             => 'Įkelti failai',
+'statistics-edits'             => 'Puslapių redagavimų skai�ius nuo {{SITENAME}} sukūrimo',
+'statistics-edits-average'     => 'Vidutinis redakcijų kiekis puslapiui',
+'statistics-views-total'       => 'Iš viso peržiūrų',
+'statistics-views-peredit'     => 'Peržiūrų skai�ius redakcijai',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Užduo�ių eilės] ilgis',
+'statistics-users'             => 'Registruotų [[Special:ListUsers|naudotojų]]',
+'statistics-users-active'      => 'Aktyvių naudotojų',
+'statistics-users-active-desc' => 'Naudotojai, kurie per {{PLURAL:$1|paskutinę dieną|paskutines $1 dienų}} padarė keitimų',
+'statistics-mostpopular'       => 'Daugiausiai rodyti puslapiai',
 
 'disambiguations'      => 'Daugiaprasmių žodžių puslapiai',
 'disambiguationspage'  => 'Template:Daugiareikšmis',
@@ -1316,7 +1547,7 @@ Puslapis laikomas daugiaprasmiu puslapiu, jei jis naudoja Å¡ablonÄ…, kuris yra n
 'double-redirect-fixer'      => 'Peradresavimų tvarkyklė',
 
 'brokenredirects'        => 'Peradresavimai į niekur',
-'brokenredirectstext'    => 'Žemiau išvardinti peradresavimo puslapiai rodo į neegzistuojan�ius puslapius:',
+'brokenredirectstext'    => 'Šie peradresavimo puslapiai nurodo į neegzistuojan�ius puslapius:',
 'brokenredirects-edit'   => '(redaguoti)',
 'brokenredirects-delete' => '(trinti)',
 
@@ -1346,26 +1577,30 @@ Puslapis laikomas daugiaprasmiu puslapiu, jei jis naudoja Å¡ablonÄ…, kuris yra n
 'popularpages'            => 'Populiarūs puslapiai',
 'wantedcategories'        => 'Geidžiamiausios kategorijos',
 'wantedpages'             => 'Geidžiamiausi puslapiai',
-'missingfiles'            => 'Praleisti failai',
+'wantedfiles'             => 'Trokštami failai',
+'wantedtemplates'         => 'Trokštami šablonai',
 'mostlinked'              => 'Daugiausiai nurodomi puslapiai',
 'mostlinkedcategories'    => 'Daugiausiai nurodomos kategorijos',
 'mostlinkedtemplates'     => 'Daugiausiai nurodomi Å¡ablonai',
 'mostcategories'          => 'Puslapiai su daugiausiai kategorijų',
 'mostimages'              => 'Daugiausiai nurodomi failai',
 'mostrevisions'           => 'Puslapiai su daugiausiai keitimų',
-'prefixindex'             => 'Rodyklė pagal pavadinimo pradžią',
+'prefixindex'             => 'Visi puslapiai pagal pavadinimo pradžią',
 'shortpages'              => 'Trumpiausi puslapiai',
 'longpages'               => 'Ilgiausi puslapiai',
 'deadendpages'            => 'Puslapiai-aklavietÄ—s',
 'deadendpagestext'        => 'Šie puslapiai neturi nuorodų į kitus puslapius šiame projekte.',
 'protectedpages'          => 'Užrakinti puslapiai',
 'protectedpages-indef'    => 'Tik neapibrėžtos apsaugos',
+'protectedpages-cascade'  => 'Tik pakopinÄ— apsauga',
 'protectedpagestext'      => 'Å ie puslapiai yra apsaugoti nuo perkÄ—limo ar redagavimo',
 'protectedpagesempty'     => 'Å iuo metu nÄ—ra apsaugotas joks failas su Å¡iais parametrais.',
 'protectedtitles'         => 'Apsaugoti pavadinimai',
 'protectedtitlestext'     => 'Šie pavadinimai yra apsaugoti nuo sukūrimo',
 'protectedtitlesempty'    => 'Šiuo metu nėra jokių pavadinimų apsaugotų šiais parametrais.',
 'listusers'               => 'Naudotojų sąrašas',
+'listusers-editsonly'     => 'Rodyti tik keitimus atlikusius naudotojus',
+'usereditcount'           => '$1 {{PLURAL:$1|keitimas|keitimai|keitimų}}',
 'newpages'                => 'Naujausi puslapiai',
 'newpages-username'       => 'Naudotojo vardas:',
 'ancientpages'            => 'Seniausi puslapiai',
@@ -1386,14 +1621,13 @@ Puslapis laikomas daugiaprasmiu puslapiu, jei jis naudoja Å¡ablonÄ…, kuris yra n
 'booksources-search-legend' => 'Knygų šaltinių paieška',
 'booksources-go'            => 'Rodyti',
 'booksources-text'          => 'Žemiau yra nuorodų sąrašas į kitas svetaines, kurios parduoda naujas ar naudotas knygas, bei galbūt turin�ias daugiau informacijos apie knygas, kurių ieškote:',
+'booksources-invalid-isbn'  => 'Duotas ISBN atrodo neteisingas; patikrinkite, ar nepadarėte kopijavimo klaidų.',
 
 # Special:Log
 'specialloguserlabel'  => 'Naudotojas:',
 'speciallogtitlelabel' => 'Pavadinimas:',
 'log'                  => 'Specialiųjų veiksmų istorija',
 'all-logs-page'        => 'Visos istorijos',
-'log-search-legend'    => 'Ieškoti istorijose',
-'log-search-submit'    => 'Rodyti',
 'alllogstext'          => 'Bendras visų galimų „{{SITENAME}}“ specialiųjų veiksmų istorijų rodinys.
 Galima sumažinti rezultatų skai�ių patikslinant veiksmo rūšį, naudotoją ar susijusį puslapį.',
 'logempty'             => 'Istorijoje nėra jokių atitinkan�ių įvykių.',
@@ -1405,6 +1639,7 @@ Galima sumažinti rezultatų skai�ių patikslinant veiksmo rūšį, naudotoją
 'nextpage'          => 'Kitas puslapis ($1)',
 'prevpage'          => 'Ankstesnis puslapis ($1)',
 'allpagesfrom'      => 'Rodyti puslapius pradedant nuo:',
+'allpagesto'        => 'Rodyti puslapius, besibaigian�ius su:',
 'allarticles'       => 'Visi puslapiai',
 'allinnamespace'    => 'Visi puslapiai ($1 vardų sritis)',
 'allnotinnamespace' => 'Visi puslapiai (nesantys $1 vardų srityje)',
@@ -1424,41 +1659,69 @@ Taip pat žiūrėkite [[Special:WantedCategories|trokštamas kategorijas]].',
 'special-categories-sort-count' => 'rikiuoti pagal skai�ių',
 'special-categories-sort-abc'   => 'rikiuoti pagal abÄ—cÄ—lÄ™',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'IÅ¡trintas naudotojo indÄ—lis',
+
+# Special:LinkSearch
+'linksearch'       => 'Ieškoti išorinių nuorodų',
+'linksearch-pat'   => 'Ieškoti modulio:',
+'linksearch-ns'    => 'Vardų sritis:',
+'linksearch-ok'    => 'Ieškoti',
+'linksearch-text'  => 'Galima naudoti žvaigždutės, pvz., „*.wikipedia.org“.<br />
+Palaikomi protokolai: <tt>$1</tt>',
+'linksearch-line'  => '$1 yra susietas iš $2',
+'linksearch-error' => 'Žvaigždutės gali būti tik adreso pradžioje.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Rodyti naudotojus pradedant nuo:',
 'listusers-submit'   => 'Rodyti',
 'listusers-noresult' => 'Nerasta jokių naudotojų.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'PrisiregistravÄ™ naudotojai',
+'newuserlogpagetext'          => 'Tai naudotojų kūrimo sąrašas.',
+'newuserlog-byemail'          => 'slaptažodis nusiųstas elektroniniu paštu',
+'newuserlog-create-entry'     => 'Naujas naudotojas',
+'newuserlog-create2-entry'    => 'sukurta nauja paskyra $1',
+'newuserlog-autocreate-entry' => 'Paskyra sukurta automatiškai',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Naudotojų grupių teisės',
-'listgrouprights-summary'  => 'Žemiau pateiktas naudotojų grupių, apibrėžtų šioje wiki, ir su jomis susijusių teisių sąrašas.
+'listgrouprights'                 => 'Naudotojų grupių teisės',
+'listgrouprights-summary'         => 'Žemiau pateiktas naudotojų grupių, apibrėžtų šioje wiki, ir su jomis susijusių teisių sąrašas.
 Čia gali būti [[{{MediaWiki:Listgrouprights-helppage}}|papildoma informacija]] apie individualias teises.',
-'listgrouprights-group'    => 'GrupÄ—',
-'listgrouprights-rights'   => 'TeisÄ—s',
-'listgrouprights-helppage' => 'Help:GrupÄ—s teisÄ—s',
-'listgrouprights-members'  => '(narių sąrašas)',
+'listgrouprights-group'           => 'GrupÄ—',
+'listgrouprights-rights'          => 'TeisÄ—s',
+'listgrouprights-helppage'        => 'Help:GrupÄ—s teisÄ—s',
+'listgrouprights-members'         => '(narių sąrašas)',
+'listgrouprights-addgroup'        => 'Gali pridÄ—ti {{PLURAL:$2|grupÄ™|grupes}}: $1',
+'listgrouprights-removegroup'     => 'Gali pašalinti {{PLURAL:$2|grupę|grupes}}: $1',
+'listgrouprights-addgroup-all'    => 'Gali pridÄ—ti visas grupes',
+'listgrouprights-removegroup-all' => 'Gali pašalinti visas grupes',
 
 # E-mail user
-'mailnologin'     => 'NÄ—ra adreso',
-'mailnologintext' => 'Jums reikia būti [[Special:UserLogin|prisijungusiam]] ir turi būti įvestas teisingas el. pašto adresas jūsų [[Special:Preferences|nustatymuose]], kad siųstumėte el. laiškus kitiems nautotojams.',
-'emailuser'       => 'Rašyti laišką šiam naudotojui',
-'emailpage'       => 'Siųsti el. laišką naudotojui',
-'emailpagetext'   => 'Jūs gali pasinaudoti šia forma norėdami nusiųsti el. laišką šiam naudotojui.
+'mailnologin'      => 'NÄ—ra adreso',
+'mailnologintext'  => 'Jums reikia būti [[Special:UserLogin|prisijungusiam]] ir turi būti įvestas teisingas el. pašto adresas jūsų [[Special:Preferences|nustatymuose]], kad siųstumėte el. laiškus kitiems nautotojams.',
+'emailuser'        => 'Rašyti laišką šiam naudotojui',
+'emailpage'        => 'Siųsti el. laišką naudotojui',
+'emailpagetext'    => 'Jūs gali pasinaudoti šia forma norėdami nusiųsti el. laišką šiam naudotojui.
 El. pašto adresas, kurį įvedėte [[Special:Preferences|savo naudotojo nustatymuose]], bus rodomas kaip el. pašto siuntėjo adresas, tam, kad gavėjas galėtų jums iškart atsakyti.',
-'usermailererror' => 'Pašto objektas grąžino klaidą:',
-'defemailsubject' => '{{SITENAME}} el. paštas',
-'noemailtitle'    => 'Nėra el. pašto adreso',
-'noemailtext'     => 'Šis naudotojas nėra nurodęs teisingo el. pašto adreso, arba yra pasirinkęs negauti el. pašto iš kitų naudotojų.',
-'emailfrom'       => 'Nuo:',
-'emailto'         => 'Kam:',
-'emailsubject'    => 'Tema:',
-'emailmessage'    => 'Tekstas:',
-'emailsend'       => 'Siųsti',
-'emailccme'       => 'Siųsti man mano laiško kopiją.',
-'emailccsubject'  => 'Laiško kopija naudotojui $1: $2',
-'emailsent'       => 'El. laiškas išsiųstas',
-'emailsenttext'   => 'Jūsų el. pašto žinutė išsiųsta.',
-'emailuserfooter' => 'Šis elektroninis laiškas buvo išsiųstas naudotojo $1 naudotojui $2 naudojant „Rašyti elektroninį laišką“ funkciją projekte {{SITENAME}}.',
+'usermailererror'  => 'Pašto objektas grąžino klaidą:',
+'defemailsubject'  => '{{SITENAME}} el. paštas',
+'noemailtitle'     => 'Nėra el. pašto adreso',
+'noemailtext'      => 'Šis naudotojas nėra nurodęs teisingo el. pašto adreso, arba yra pasirinkęs negauti el. pašto iš kitų naudotojų.',
+'nowikiemailtitle' => 'El. laiškai neleidžiami',
+'nowikiemailtext'  => 'Šis naudotojas yra pasirinkęs negauti elektroninių laiškų iš kitų naudotojų.',
+'email-legend'     => 'Siųsti elektroninį laišką kitam {{SITENAME}} naudotojui',
+'emailfrom'        => 'Nuo:',
+'emailto'          => 'Kam:',
+'emailsubject'     => 'Tema:',
+'emailmessage'     => 'Tekstas:',
+'emailsend'        => 'Siųsti',
+'emailccme'        => 'Siųsti man mano laiško kopiją.',
+'emailccsubject'   => 'Laiško kopija naudotojui $1: $2',
+'emailsent'        => 'El. laiškas išsiųstas',
+'emailsenttext'    => 'Jūsų el. pašto žinutė išsiųsta.',
+'emailuserfooter'  => 'Šis elektroninis laiškas buvo išsiųstas naudotojo $1 naudotojui $2 naudojant „Rašyti elektroninį laišką“ funkciją projekte {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Stebimi puslapiai',
@@ -1490,12 +1753,7 @@ taip pat bus '''paryškinti''' [[Special:RecentChanges|naujausių keitimų sąra
 'iteminvalidname'      => 'Problema su elementu „$1“, neteisingas vardas...',
 'wlnote'               => "{{PLURAL:$1|Rodomas '''$1''' paskutinis pakeitimas, atliktas|Rodomi '''$1''' paskutiniai pakeitimai, atlikti|Rodoma '''$1''' paskutinių pakeitimų, atliktų}} per '''$2''' {{PLURAL:$2|paskutinę valandą|paskutines valandas|paskutinių valandų}}.",
 'wlshowlast'           => 'Rodyti paskutinių $1 valandų, $2 dienų ar $3 pakeitimus',
-'watchlist-show-bots'  => 'Rodyti botų keitimus',
-'watchlist-hide-bots'  => 'Slėpti botų keitimus',
-'watchlist-show-own'   => 'Rodyti mano keitimus',
-'watchlist-hide-own'   => 'SlÄ—pti mano keitimus',
-'watchlist-show-minor' => 'Rodyti smulkius keitimus',
-'watchlist-hide-minor' => 'SlÄ—pti smulkius keitimus',
+'watchlist-options'    => 'Stebimųjų sąrašo parinktys',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Įtraukiama į stebimųjų sąrašą...',
@@ -1535,81 +1793,100 @@ Norėdami pakeisti stebimų puslapių nustatymus, užeikite į
 Atsiliepimai ir pagalba:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Trinti puslapį',
-'confirm'                     => 'Tvirtinu',
-'excontent'                   => 'buvęs turinys: „$1“',
-'excontentauthor'             => 'buvęs turinys: „$1“ (redagavo tik „[[Special:Contributions/$2|$2]]“)',
-'exbeforeblank'               => 'prieš ištrinant turinys buvo: „$1“',
-'exblank'                     => 'puslapis buvo tuš�ias',
-'delete-confirm'              => 'IÅ¡trinta "$1"',
-'delete-legend'               => 'Trynimas',
-'historywarning'              => 'DÄ—mesio: Trinamas puslapis turi istorijÄ…:',
-'confirmdeletetext'           => 'Jūs pasirinkote ištrinti puslapį ar paveikslėlį kartu su visa jo istorija.
+# Delete
+'deletepage'             => 'Trinti puslapį',
+'confirm'                => 'Tvirtinu',
+'excontent'              => 'buvęs turinys: „$1“',
+'excontentauthor'        => 'buvęs turinys: „$1“ (redagavo tik „[[Special:Contributions/$2|$2]]“)',
+'exbeforeblank'          => 'prieš ištrinant turinys buvo: „$1“',
+'exblank'                => 'puslapis buvo tuš�ias',
+'delete-confirm'         => 'IÅ¡trinta "$1"',
+'delete-legend'          => 'Trynimas',
+'historywarning'         => 'DÄ—mesio: Trinamas puslapis turi istorijÄ…:',
+'confirmdeletetext'      => 'Jūs pasirinkote ištrinti puslapį ar paveikslėlį kartu su visa jo istorija.
 Prašome patvirtinti, kad jūs tikrai norite tai padaryti, žinote apie galimus padarinius, ir kad jūs tai darote atsižvelgdami į [[{{MediaWiki:Policy-url}}|politiką]].',
-'actioncomplete'              => 'Veiksmas atliktas',
-'deletedtext'                 => '„<nowiki>$1</nowiki>“ ištrintas.
+'actioncomplete'         => 'Veiksmas atliktas',
+'deletedtext'            => '„<nowiki>$1</nowiki>“ ištrintas.
 Paskutinių šalinimų istorija - $2.',
-'deletedarticle'              => 'ištrynė „[[$1]]“',
-'suppressedarticle'           => 'apribotas „[[$1]]“',
-'dellogpage'                  => 'Šalinimų istorija',
-'dellogpagetext'              => 'Žemiau pateikiamas paskutinių trynimų sąrašas.',
-'deletionlog'                 => 'šalinimų istorija',
-'reverted'                    => 'Atkurta į ankstesnę versiją',
-'deletecomment'               => 'Trynimo priežastis',
-'deleteotherreason'           => 'Kita/papildoma priežastis:',
-'deletereasonotherlist'       => 'Kita priežastis',
-'deletereason-dropdown'       => '
+'deletedarticle'         => 'ištrynė „[[$1]]“',
+'suppressedarticle'      => 'apribotas „[[$1]]“',
+'dellogpage'             => 'Šalinimų istorija',
+'dellogpagetext'         => 'Žemiau pateikiamas paskutinių trynimų sąrašas.',
+'deletionlog'            => 'šalinimų istorija',
+'reverted'               => 'Atkurta į ankstesnę versiją',
+'deletecomment'          => 'Trynimo priežastis',
+'deleteotherreason'      => 'Kita/papildoma priežastis:',
+'deletereasonotherlist'  => 'Kita priežastis',
+'deletereason-dropdown'  => '
 *Dažnos trynimo priežastys
 ** Autoriaus prašymas
 ** Autorystės teisių pažeidimas
 ** Vandalizmas',
-'delete-edit-reasonlist'      => 'Keisti trynimo priežastis',
-'delete-toobig'               => 'Šis puslapis turi ilgą keitimų istoriją, daugiau nei $1 {{PLURAL:$1|revizija|revizijos|revizijų}}. Tokių puslapių trynimas yra apribotas, kad būtų išvengta atsitiktinio {{SITENAME}} žlugdymo.',
-'delete-warning-toobig'       => 'Šis puslapis turi ilgą keitimų istoriją, daugiau nei $1 {{PLURAL:$1|revizija|revizijos|revizijų}}. Trinant jis gali sutrikdyti {{SITENAME}} duomenų bazės operacijas; būkite atsargūs.',
-'rollback'                    => 'Atmesti keitimus',
-'rollback_short'              => 'Atmesti',
-'rollbacklink'                => 'atmesti',
-'rollbackfailed'              => 'Atmetimas nepavyko',
-'cantrollback'                => 'Negalima atmesti redagavimo; paskutinis keitęs naudotojas yra šio puslapio autorius.',
-'alreadyrolled'               => 'Nepavyko atmesti paskutinio [[User:$2|$2]] ([[User talk:$2|Aptarimas]] | [[Special:Contributions/$2|{{int:contribslink}}]]) daryto puslapio [[:$1]] keitimo;
+'delete-edit-reasonlist' => 'Keisti trynimo priežastis',
+'delete-toobig'          => 'Šis puslapis turi ilgą keitimų istoriją, daugiau nei $1 {{PLURAL:$1|revizija|revizijos|revizijų}}. Tokių puslapių trynimas yra apribotas, kad būtų išvengta atsitiktinio {{SITENAME}} žlugdymo.',
+'delete-warning-toobig'  => 'Šis puslapis turi ilgą keitimų istoriją, daugiau nei $1 {{PLURAL:$1|revizija|revizijos|revizijų}}. Trinant jis gali sutrikdyti {{SITENAME}} duomenų bazės operacijas; būkite atsargūs.',
+
+# Rollback
+'rollback'         => 'Atmesti keitimus',
+'rollback_short'   => 'Atmesti',
+'rollbacklink'     => 'atmesti',
+'rollbackfailed'   => 'Atmetimas nepavyko',
+'cantrollback'     => 'Negalima atmesti redagavimo; paskutinis keitęs naudotojas yra šio puslapio autorius.',
+'alreadyrolled'    => 'Nepavyko atmesti paskutinio [[User:$2|$2]] ([[User talk:$2|Aptarimas]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) daryto puslapio [[:$1]] keitimo;
 kažkas jau pakeitė puslapį arba suspėjo pirmas atmesti keitimą.
 
-Paskutimas keitimas darytas naudotojo [[User:$3|$3]] ([[User talk:$3|Aptarimas]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Redagavimo komentaras: „<i>$1</i>“.', # only shown if there is an edit comment
-'revertpage'                  => 'Atmestas [[Special:Contributions/$2|$2]] ([[User talk:$2|Aptarimas]]) pakeitimas; sugrąžinta naudotojo [[User:$1|$1]] versija', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Atmesti $1 keitimai; grąžinta į paskutinę $2 versiją.',
-'sessionfailure'              => 'Atrodo yra problemų su jūsų prisijungimo sesija; šis veiksmas buvo atšauktas kaip atsargumo priemonė prieš sesijos vogimą.
+Paskutimas keitimas darytas naudotojo [[User:$3|$3]] ([[User talk:$3|Aptarimas]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Redagavimo komentaras: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Atmestas [[Special:Contributions/$2|$2]] ([[User talk:$2|Aptarimas]]) pakeitimas; sugrąžinta naudotojo [[User:$1|$1]] versija', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Atmesti $1 keitimai; grąžinta į paskutinę $2 versiją.',
+'sessionfailure'   => 'Atrodo yra problemų su jūsų prisijungimo sesija; šis veiksmas buvo atšauktas kaip atsargumo priemonė prieš sesijos vogimą.
 Prašome paspausti „atgal“ ir perkraukite puslapį iš kurio atėjote, ir pamėginkite vėl.',
+
+# Protect
 'protectlogpage'              => 'Rakinimų istorija',
 'protectlogtext'              => 'Žemiau yra puslapių užrakinimų bei atrakinimų istorija.
 Dabar veikian�ių puslapių apsaugų sąrašą rasite [[Special:ProtectedPages|apsaugotų puslapių sąraše]].',
 'protectedarticle'            => 'užrakino „[[$1]]“',
 'modifiedarticleprotection'   => 'pakeistas „[[$1]]“ apsaugos lygis',
 'unprotectedarticle'          => 'atrakino „[[$1]]“',
+'movedarticleprotection'      => 'perkelti apsaugos nustatymai iš „[[$2]]“ į „[[$1]]“',
 'protect-title'               => 'Nustatomas apsaugos lygis puslapiui „$1“',
+'prot_1movedto2'              => '[[$1]] pervadintas į [[$2]]',
 'protect-legend'              => 'Užrakinimo patvirtinimas',
 'protectcomment'              => 'Komentaras:',
 'protectexpiry'               => 'Baigia galioti:',
 'protect_expiry_invalid'      => 'Galiojimo laikas neteisingas.',
 'protect_expiry_old'          => 'Galiojimo laikas yra praeityje.',
 'protect-unchain'             => 'Atrakinti pervardinimo teises',
-'protect-text'                => 'Čia jūs gali matyti ir keisti apsaugos lygį puslapiui <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Jūs negalite keisti apsaugos lygių, kol esate užbluokuotas.
-ÄŒia yra dabartiniai nustatymai puslapiui <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Apsaugos lygiai negali būti pakeisti dėl duomenų bazės užrakinimo.
-ÄŒia yra dabartiniai nustatymai puslapiui <strong>$1</strong>:',
-'protect-locked-access'       => 'Jūsų paskyra neturi teisių keisti puslapių apsaugos lygių.
-ÄŒia yra dabartiniai nustatymai puslapiui <strong>$1</strong>:',
+'protect-text'                => "Čia jūs gali matyti ir keisti apsaugos lygį puslapiui '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Jūs negalite keisti apsaugos lygių, kol esate užbluokuotas.
+ÄŒia yra dabartiniai nustatymai puslapiui '''$1''':",
+'protect-locked-dblock'       => "Apsaugos lygiai negali būti pakeisti dėl duomenų bazės užrakinimo.
+ÄŒia yra dabartiniai nustatymai puslapiui '''$1''':",
+'protect-locked-access'       => "Jūsų paskyra neturi teisių keisti puslapių apsaugos lygių.
+ÄŒia yra dabartiniai nustatymai puslapiui '''$1''':",
 'protect-cascadeon'           => 'Šis puslapis dabar yra apsaugotas, nes jis yra įtrauktas į {{PLURAL:$1|šį puslapį, apsaugotą|šiuos puslapius, apsaugotus}} „pakopinės apsaugos“ pasirinktimi. Jūs galite pakeisti šio puslapio apsaugos lygį, bet tai nepaveiks pakopinės apsaugos.',
-'protect-default'             => '(pagal nutylÄ—jimÄ…)',
+'protect-default'             => 'Leisti visiems naudotojams',
 'protect-fallback'            => 'Reikalauti „$1“ teisės',
-'protect-level-autoconfirmed' => 'Blokuoti neregistruotus naudotojus',
+'protect-level-autoconfirmed' => 'Blokuoti naujai prisiregistravusius ir neregistruotus naudotojus',
 'protect-level-sysop'         => 'Tik administratoriai',
 'protect-summary-cascade'     => 'pakopinÄ— apsauga',
 'protect-expiring'            => 'baigia galioti $1 (UTC)',
+'protect-expiry-indefinite'   => 'neribotai',
 'protect-cascade'             => 'Apsaugoti puslapius, įtrauktus į šį puslapį (pakopinė apsauga).',
 'protect-cantedit'            => 'Jūs negalite keisti šio puslapio apsaugojimo lygių, nes neturite teisių jo redaguoti.',
+'protect-othertime'           => 'Kitas laikas:',
+'protect-othertime-op'        => 'kitas laikas',
+'protect-existing-expiry'     => 'Esamas galiojimo laikas: $3, $2',
+'protect-otherreason'         => 'Kita/papildoma priežastis:',
+'protect-otherreason-op'      => 'kita/papildoma priežastis',
+'protect-dropdown'            => '*Įprastos užrakinimo priežastys
+** Intensyvus vandalizmas
+** Intensyvus nuorodų reklamavimas
+** Neproduktyvus redagavimo karas
+** DidelÄ—s svarbos puslapis',
+'protect-edit-reasonlist'     => 'Keisti užrakinimo priežastis',
+'protect-expiry-options'      => '2 valandos:2 hours,1 diena:1 day,3 dienos:3 days,1 savaitÄ—:1 week,2 savaitÄ—s:2 weeks,1 mÄ—nesis:1 month,3 mÄ—nesiai:3 months,6 mÄ—nesiai:6 months,1 metai:1 year,neribotai:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Leidimas:',
 'restriction-level'           => 'Apribojimo lygis:',
 'minimum-size'                => 'Min. dydis',
@@ -1633,8 +1910,8 @@ Dabar veikian�ių puslapių apsaugų sąrašą rasite [[Special:ProtectedPages|
 'undeletepagetitle'            => "'''Tai sudaryta iš ištrintų [[:$1]] versijų'''.",
 'viewdeletedpage'              => 'Rodyti ištrintus puslapius',
 'undeletepagetext'             => 'Žemiau išvardinti puslapiai yra ištrinti, bet dar laikomi
-archyve, todėl jie gali būti atstatyti. Archyvas gali būti periodiškai valomas.',
-'undelete-fieldset-title'      => 'Atstatyti revizijas',
+archyve, todėl gali būti atstatyti. Archyvas gali būti periodiškai valomas.',
+'undelete-fieldset-title'      => 'Atstatyti versijas',
 'undeleteextrahelp'            => "Norėdami atkurti visą puslapį, palikite visas varneles nepažymėtas ir
 spauskite '''''Atkurti'''''. Norėdami atlikti pasirinktinį atstatymą, pažymėkite varneles tų versijų, kurias norėtumėte atstatyti, ir spauskite '''''Atkurti'''''. Paspaudus
 '''''Iš naujo''''' bus išvalytos visos varnelės bei komentaro laukas.",
@@ -1644,12 +1921,13 @@ Jei po ištrynimo buvo sukurtas puslapis tokiu pa�iu pavadinimu, atstatytos ver
 'undeleterevdel'               => 'Atkūrimas nebus įvykdytas, jei tai nulems paskutinės puslapio ar failo versijos dalinį ištrynimą.
 Tokiais atvejais, jums reikia atžymėti arba atslėpti naujausią ištrintą versiją.',
 'undeletehistorynoadmin'       => 'Šis puslapis buvo ištrintas. Žemiau rodoma trynimo priežastis bei kas redagavo puslapį iki ištrynimo. Ištrintų puslapių tekstas yra galimas tik administratoriams.',
-'undelete-revision'            => 'Ištrinta $1 versija, kurią $2 sukūrė $3:',
+'undelete-revision'            => 'Ištrinta $1 versija, kurią $4 d. $5 sukūrė $3:',
 'undeleterevision-missing'     => 'Neteisinga arba dingusi versija. Jūs turbūt turite blogą nuorodą, arba versija buvo atkurta arba pašalinta iš archyvo.',
 'undelete-nodiff'              => 'Nerasta jokių ankstesnių versijų.',
 'undeletebtn'                  => 'Atkurti',
 'undeletelink'                 => 'atstatyti',
 'undeletereset'                => 'IÅ¡ naujo',
+'undeleteinvert'               => 'Žymėti priešingai',
 'undeletecomment'              => 'Komentaras:',
 'undeletedarticle'             => 'atkurta „[[$1]]“',
 'undeletedrevisions'           => '{{PLURAL:$1|atkurta $1 versija|atkurtos $1 versijos|atkurta $1 versijų}}',
@@ -1672,7 +1950,7 @@ Peržiūrėkite [[Special:Log/delete|trynimų sąrašą]], norėdami rasti pasku
 'undelete-error-long'          => 'Įvyko klaidų atkuriant failą:
 
 $1',
-'undelete-show-file-confirm'   => 'Ar ištiesų norite peržiūrėti ištrintą failo "<nowiki>$1</nowiki>" reviziją nuo $2 iki $3?',
+'undelete-show-file-confirm'   => 'Ar tikrai norite peržiūrėti ištrintą failo „<nowiki>$1</nowiki>“ $2 $3 versiją?',
 'undelete-show-file-submit'    => 'Taip',
 
 # Namespace form on various pages
@@ -1681,26 +1959,27 @@ $1',
 'blanknamespace' => '(PagrindinÄ—)',
 
 # Contributions
-'contributions' => 'Naudotojo įnašas',
-'mycontris'     => 'Mano įnašas',
-'contribsub2'   => 'Naudotojo $1 ($2)',
-'nocontribs'    => 'Jokie keitimai neatitiko šių kriterijų.',
-'uctop'         => ' (paskutinis)',
-'month'         => 'Nuo mėnesio (ir anks�iau):',
-'year'          => 'Nuo metų (ir anks�iau):',
-
-'sp-contributions-newbies'     => 'Rodyti tik naujų paskyrų įnašus',
-'sp-contributions-newbies-sub' => 'Naujoms paskyroms',
-'sp-contributions-blocklog'    => 'Blokavimų istorija',
-'sp-contributions-search'      => 'Ieškoti įnašo',
-'sp-contributions-username'    => 'IP adresas arba naudotojo vardas:',
-'sp-contributions-submit'      => 'Ieškoti',
+'contributions'       => 'Naudotojo įnašas',
+'contributions-title' => 'Naudotojo $1 indÄ—lis',
+'mycontris'           => 'Mano įnašas',
+'contribsub2'         => 'Naudotojo $1 ($2)',
+'nocontribs'          => 'Jokie keitimai neatitiko šių kriterijų.',
+'uctop'               => ' (paskutinis)',
+'month'               => 'Nuo mėnesio (ir anks�iau):',
+'year'                => 'Nuo metų (ir anks�iau):',
+
+'sp-contributions-newbies'       => 'Rodyti tik naujų paskyrų įnašus',
+'sp-contributions-newbies-sub'   => 'Naujoms paskyroms',
+'sp-contributions-newbies-title' => 'Naudotojų keitimai naujoms paskyroms',
+'sp-contributions-blocklog'      => 'Blokavimų istorija',
+'sp-contributions-search'        => 'Ieškoti įnašo',
+'sp-contributions-username'      => 'IP adresas arba naudotojo vardas:',
+'sp-contributions-submit'        => 'Ieškoti',
 
 # What links here
 'whatlinkshere'            => 'SusijÄ™ puslapiai',
-'whatlinkshere-title'      => 'Puslapiai, kurie nurodo į "$1"',
+'whatlinkshere-title'      => 'Puslapiai, kurie nurodo į „$1“',
 'whatlinkshere-page'       => 'Puslapis:',
-'linklistsub'              => '(Nuorodų sąrašas)',
 'linkshere'                => "Šie puslapiai rodo į '''[[:$1]]''':",
 'nolinkshere'              => "Į '''[[:$1]]''' nuorodų nėra.",
 'nolinkshere-ns'           => "Nurodytoje vardų srityje nei vienas puslapis nenurodo į '''[[:$1]]'''.",
@@ -1717,16 +1996,16 @@ $1',
 'whatlinkshere-filters'    => 'Filtrai',
 
 # Block/unblock
-'blockip'                     => 'Blokuoti naudotojÄ…',
-'blockip-legend'              => 'Blokuoti naudotojÄ…',
-'blockiptext'                 => 'Naudokite šią formą norėdami uždrausti rašymo teises nurodytui IP adresui ar naudotojui. Tai turėtų būti atliekama tam, kad sustabdytumėte vandalizmą, ir pagal [[{{MediaWiki:Policy-url}}|politiką]].
+'blockip'                         => 'Blokuoti naudotojÄ…',
+'blockip-legend'                  => 'Blokuoti naudotojÄ…',
+'blockiptext'                     => 'Naudokite šią formą norėdami uždrausti rašymo teises nurodytui IP adresui ar naudotojui. Tai turėtų būti atliekama tam, kad sustabdytumėte vandalizmą, ir pagal [[{{MediaWiki:Policy-url}}|politiką]].
 Žemiau nurodykite tikslią priežastį (pavyzdžiui, nurodydami sugadintus puslapius).',
-'ipaddress'                   => 'IP adresas',
-'ipadressorusername'          => 'IP adresas arba naudotojo vardas',
-'ipbexpiry'                   => 'Galiojimo laikas',
-'ipbreason'                   => 'Priežastis',
-'ipbreasonotherlist'          => 'Kita priežastis',
-'ipbreason-dropdown'          => '
+'ipaddress'                       => 'IP adresas',
+'ipadressorusername'              => 'IP adresas arba naudotojo vardas',
+'ipbexpiry'                       => 'Galiojimo laikas',
+'ipbreason'                       => 'Priežastis',
+'ipbreasonotherlist'              => 'Kita priežastis',
+'ipbreason-dropdown'              => '
 *Bendrosios blokavimo priežastys
 ** Melagingos informacijos įterpimas
 ** Turinio šalinimas iš puslapių
@@ -1735,73 +2014,88 @@ $1',
 ** Gąsdinimai/Įžeidinėjimai
 ** Piktnaudžiavimas keliomis paskyromis
 ** Nepriimtinas naudotojo vardas',
-'ipbanononly'                 => 'Blokuoti tik anoniminius naudotojus',
-'ipbcreateaccount'            => 'Neleisti kurti paskyrų',
-'ipbemailban'                 => 'Neleisti naudotojui siųsti el. pašto',
-'ipbenableautoblock'          => 'Automatiškai blokuoti šio naudotojo paskiausiai naudotą IP adresą, bei bet kokius vėlesnius IP adresus, iš kurių jie mėgina redaguoti',
-'ipbsubmit'                   => 'Blokuoti šį naudotoją',
-'ipbother'                    => 'Kitoks laikas',
-'ipboptions'                  => '2 valandos:2 hours,1 diena:1 day,3 dienos:3 days,1 savaitÄ—:1 week,2 savaitÄ—s:2 weeks,1 mÄ—nesis:1 month,3 mÄ—nesiai:3 months,6 mÄ—nesiai:6 months,1 metai:1 year,neribotai:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'kita',
-'ipbotherreason'              => 'Kita/papildoma priežastis',
-'ipbhidename'                 => 'Slėpti naudotojo vardą adresą iš blokavimų istorijos, aktyvių blokavimų sąrašo ir naudotojų sąrašo',
-'ipbwatchuser'                => 'Stebėti šio naudotojo puslapį ir jo aptarimų puslapį',
-'badipaddress'                => 'Neleistinas IP adresas',
-'blockipsuccesssub'           => 'Užblokavimas pavyko',
-'blockipsuccesstext'          => '[[Special:Contributions/$1|$1]] buvo užblokuotas.<br />
+'ipbanononly'                     => 'Blokuoti tik anoniminius naudotojus',
+'ipbcreateaccount'                => 'Neleisti kurti paskyrų',
+'ipbemailban'                     => 'Neleisti naudotojui siųsti el. pašto',
+'ipbenableautoblock'              => 'Automatiškai blokuoti šio naudotojo paskiausiai naudotą IP adresą, bei bet kokius vėlesnius IP adresus, iš kurių jie mėgina redaguoti',
+'ipbsubmit'                       => 'Blokuoti šį naudotoją',
+'ipbother'                        => 'Kitoks laikas',
+'ipboptions'                      => '2 valandos:2 hours,1 diena:1 day,3 dienos:3 days,1 savaitÄ—:1 week,2 savaitÄ—s:2 weeks,1 mÄ—nesis:1 month,3 mÄ—nesiai:3 months,6 mÄ—nesiai:6 months,1 metai:1 year,neribotai:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'                  => 'kita',
+'ipbotherreason'                  => 'Kita/papildoma priežastis',
+'ipbhidename'                     => 'Slėpti naudotojo vardą adresą iš blokavimų istorijos, aktyvių blokavimų sąrašo ir naudotojų sąrašo',
+'ipbwatchuser'                    => 'Stebėti šio naudotojo puslapį ir jo aptarimų puslapį',
+'ipballowusertalk'                => 'Leisti šiam naudotojui, kol jis yra blokuotas, redaguoti savo aptarimų puslapį.',
+'ipb-change-block'                => 'Perblokuoti šį naudotoją su šiais nustatymais',
+'badipaddress'                    => 'Neleistinas IP adresas',
+'blockipsuccesssub'               => 'Užblokavimas pavyko',
+'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] buvo užblokuotas.<br />
 Aplankykite [[Special:IPBlockList|IP blokavimų istoriją]] norėdami jį peržiūrėti.',
-'ipb-edit-dropdown'           => 'Redaguoti blokavimų priežastis',
-'ipb-unblock-addr'            => 'Atblokuoti $1',
-'ipb-unblock'                 => 'Atblokuoti naudotojo vardÄ… arba IP adresÄ…',
-'ipb-blocklist-addr'          => 'Egzistuojantys $1 blokavimai',
-'ipb-blocklist'               => 'Rodyti egzistuon�ius blokavimus',
-'unblockip'                   => 'Atblokuoti naudotojÄ…',
-'unblockiptext'               => 'Naudokite šią formą, kad atkurtumėte rašymo teises
+'ipb-edit-dropdown'               => 'Redaguoti blokavimų priežastis',
+'ipb-unblock-addr'                => 'Atblokuoti $1',
+'ipb-unblock'                     => 'Atblokuoti naudotojo vardÄ… arba IP adresÄ…',
+'ipb-blocklist-addr'              => 'Egzistuojantys $1 blokavimai',
+'ipb-blocklist'                   => 'Rodyti egzistuon�ius blokavimus',
+'ipb-blocklist-contribs'          => '$1 indÄ—lis',
+'unblockip'                       => 'Atblokuoti naudotojÄ…',
+'unblockiptext'                   => 'Naudokite šią formą, kad atkurtumėte rašymo teises
 ankš�iau užblokuotam IP adresui ar naudotojui.',
-'ipusubmit'                   => 'Atblokuoti šį adresą',
-'unblocked'                   => '[[User:$1|$1]] buvo atblokuotas',
-'unblocked-id'                => 'Blokavimas $1 buvo pašalintas',
-'ipblocklist'                 => 'Blokuoti IP adresai bei naudotojų vardai',
-'ipblocklist-legend'          => 'Rasti užblokuotą naudotoją',
-'ipblocklist-username'        => 'Naudotojas arba IP adresas:',
-'ipblocklist-submit'          => 'Ieškoti',
-'blocklistline'               => '$1, $2 blokavo $3 ($4)',
-'infiniteblock'               => 'neribotai',
-'expiringblock'               => 'baigia galioti $1',
-'anononlyblock'               => 'tik anonimai',
-'noautoblockblock'            => 'automatinis blokavimas išjungtas',
-'createaccountblock'          => 'paskyrų kūrimas uždraustas',
-'emailblock'                  => 'el. paštas užblokuotas',
-'ipblocklist-empty'           => 'Blokavimų sąrašas tuš�ias.',
-'ipblocklist-no-results'      => 'Prašomas IP adresas ar naudotojo vardas nėra užblokuotas.',
-'blocklink'                   => 'blokuoti',
-'unblocklink'                 => 'atblokuoti',
-'contribslink'                => 'įnašas',
-'autoblocker'                 => 'Jūs buvote automatiškai užblokuotas, nes jūsų IP neseniai naudojo „[[User:$1|$1]]“. Duota priežastis naudotojo $1 užblokavimui: „$2“.',
-'blocklogpage'                => 'Blokavimų istorija',
-'blocklogentry'               => 'blokavo [[$1]], blokavimo laikas - $2 $3',
-'blocklogtext'                => 'Čia yra naudotojų blokavimo ir atblokavimo sąrašas.
-Automatiškai blokuoti IP adresai nėra išvardinti.
-Jei norite pamatyti dabar blokuojamus adresus, žiūrėkite [[Special:IPBlockList|IP blokavimų istoriją]].',
-'unblocklogentry'             => 'atblokavo $1',
-'block-log-flags-anononly'    => 'tik anoniminiai naudotojai',
-'block-log-flags-nocreate'    => 'paskyrų kūrimas išjungtas',
-'block-log-flags-noautoblock' => 'automatinis blokiklis išjungtas',
-'block-log-flags-noemail'     => 'el. paštas užblokuotas',
-'range_block_disabled'        => 'Administratoriaus galimybė kurti intevalinius blokus yra išjungta.',
-'ipb_expiry_invalid'          => 'Galiojimo laikas neleistinas.',
-'ipb_expiry_temp'             => 'Paslėptų naudotojų vardų blokavimas turi būti nuolatinis.',
-'ipb_already_blocked'         => '„$1“ jau užblokuotas',
-'ipb_cant_unblock'            => 'Klaida: Blokavimo ID $1 nerastas. Galbūt jis jau atblokuotas.',
-'ipb_blocked_as_range'        => 'Klaida: IP $1 nebuvo užblokuotas tiesiogiai, tad negali būti atblokuotas. Ta�iau jis buvo užblokuotas kaip srities $2 dalis, kuri gali būti atblokuota.',
-'ip_range_invalid'            => 'Neleistina IP sritis.',
-'blockme'                     => 'Užblokuoti mane',
-'proxyblocker'                => 'Tarpinių serverių blokuotojas',
-'proxyblocker-disabled'       => 'Ši funkcija yra išjungta.',
-'proxyblockreason'            => 'Jūsų IP adresas yra užblokuotas, nes jis yra atvirasis tarpinis serveris. Prašome susisiekti su savo interneto paslaugų tiekėju ar technine pagalba ir praneškite jiems apie šią svarbią saugumo problemą.',
-'proxyblocksuccess'           => 'Atlikta.',
-'sorbsreason'                 => 'Jūsų IP adresas yra įtrauktas į atvirųjų tarpinių serverių DNSBL sąrašą, naudojamą šios svetainės.',
-'sorbs_create_account_reason' => 'Jūsų IP adresas yra įtrauktas į atvirųjų tarpinių serverių DNSBL sąrašą, naudojamą šios svetainės. Jūs negalite sukurti paskyros',
+'ipusubmit'                       => 'Atblokuoti šį adresą',
+'unblocked'                       => '[[User:$1|$1]] buvo atblokuotas',
+'unblocked-id'                    => 'Blokavimas $1 buvo pašalintas',
+'ipblocklist'                     => 'Blokuoti IP adresai bei naudotojų vardai',
+'ipblocklist-legend'              => 'Rasti užblokuotą naudotoją',
+'ipblocklist-username'            => 'Naudotojas arba IP adresas:',
+'ipblocklist-sh-userblocks'       => '$1 paskyros blokavimus',
+'ipblocklist-sh-tempblocks'       => '$1 laikinus blokavimus',
+'ipblocklist-sh-addressblocks'    => '$1 pavienių IP blokavimus',
+'ipblocklist-submit'              => 'Ieškoti',
+'blocklistline'                   => '$1, $2 blokavo $3 ($4)',
+'infiniteblock'                   => 'neribotai',
+'expiringblock'                   => 'baigia galioti $1',
+'anononlyblock'                   => 'tik anonimai',
+'noautoblockblock'                => 'automatinis blokavimas išjungtas',
+'createaccountblock'              => 'paskyrų kūrimas uždraustas',
+'emailblock'                      => 'el. paštas užblokuotas',
+'blocklist-nousertalk'            => 'negali redaguoti savo aptarimų puslapio',
+'ipblocklist-empty'               => 'Blokavimų sąrašas tuš�ias.',
+'ipblocklist-no-results'          => 'Prašomas IP adresas ar naudotojo vardas nėra užblokuotas.',
+'blocklink'                       => 'blokuoti',
+'unblocklink'                     => 'atblokuoti',
+'change-blocklink'                => 'keisti blokavimo nustatymus',
+'contribslink'                    => 'įnašas',
+'autoblocker'                     => 'Jūs buvote automatiškai užblokuotas, nes jūsų IP adresą neseniai naudojo „[[User:$1|$1]]“. Nurodyta naudotojo $1 blokavimo priežastis: „$2“.',
+'blocklogpage'                    => 'Blokavimų istorija',
+'blocklog-fulllog'                => 'Visas blokavimų sąrašas',
+'blocklogentry'                   => 'blokavo [[$1]], blokavimo laikas - $2 $3',
+'reblock-logentry'                => 'pakeisti [[$1]] blokavimo nustatymai, naujas blokavimo laikas – $2 $3',
+'blocklogtext'                    => 'Čia yra naudotojų blokavimo ir atblokavimo sąrašas.
+Automatiškai blokuoti IP adresai neišvardinti.
+Jei norite pamatyti dabar blokuojamus adresus, žiūrėkite [[Special:IPBlockList|IP blokavimų sąrašą]].',
+'unblocklogentry'                 => 'atblokavo $1',
+'block-log-flags-anononly'        => 'tik anoniminiai naudotojai',
+'block-log-flags-nocreate'        => 'paskyrų kūrimas išjungtas',
+'block-log-flags-noautoblock'     => 'automatinis blokavimas išjungtas',
+'block-log-flags-noemail'         => 'el. paštas užblokuotas',
+'block-log-flags-nousertalk'      => 'negali redaguoti savo naudotojo aptarimo puslapio',
+'block-log-flags-angry-autoblock' => 'išplėstasis automatinis blokavimas įjungtas',
+'range_block_disabled'            => 'Administratoriaus galimybė kurti intevalinius blokus yra išjungta.',
+'ipb_expiry_invalid'              => 'Galiojimo laikas neleistinas.',
+'ipb_expiry_temp'                 => 'Paslėptų naudotojų vardų blokavimas turi būti nuolatinis.',
+'ipb_already_blocked'             => '„$1“ jau užblokuotas',
+'ipb-needreblock'                 => '== Jau užblokuotas ==
+$1 jau yra užblokuotas. Ar norite pakeisti nustatymus?',
+'ipb_cant_unblock'                => 'Klaida: Blokavimo ID $1 nerastas. Galbūt jis jau atblokuotas.',
+'ipb_blocked_as_range'            => 'Klaida: IP $1 nebuvo užblokuotas tiesiogiai, tad negali būti atblokuotas. Ta�iau jis buvo užblokuotas kaip srities $2 dalis, kuri gali būti atblokuota.',
+'ip_range_invalid'                => 'Neleistina IP sritis.',
+'blockme'                         => 'Užblokuoti mane',
+'proxyblocker'                    => 'Tarpinių serverių blokuotojas',
+'proxyblocker-disabled'           => 'Ši funkcija yra išjungta.',
+'proxyblockreason'                => 'Jūsų IP adresas yra užblokuotas, nes jis yra atvirasis tarpinis serveris. Prašome susisiekti su savo interneto paslaugų tiekėju ar technine pagalba ir praneškite jiems apie šią svarbią saugumo problemą.',
+'proxyblocksuccess'               => 'Atlikta.',
+'sorbsreason'                     => 'Jūsų IP adresas yra įtrauktas į atvirųjų tarpinių serverių DNSBL sąrašą, naudojamą šios svetainės.',
+'sorbs_create_account_reason'     => 'Jūsų IP adresas yra įtrauktas į atvirųjų tarpinių serverių DNSBL sąrašą, naudojamą šios svetainės. Jūs negalite sukurti paskyros',
+'cant-block-while-blocked'        => 'Jūs negalite blokuoti kitų naudotojų kuomet pats esate užblokuotas.',
 
 # Developer tools
 'lockdb'              => 'Užrakinti duomenų bazę',
@@ -1829,9 +2123,9 @@ Prašome patvirtinti tai, ką ketinate padaryti.',
 'databasenotlocked'   => 'Duomenų bazė neužrakinta.',
 
 # Move page
-'move-page'               => 'Pervadinti $1',
-'move-page-legend'        => 'Puslapio pervadinimas',
-'movepagetext'            => "Naudodamiesi žemiau pateikta forma, pervadinsite puslapį
+'move-page'                    => 'Pervadinti $1',
+'move-page-legend'             => 'Puslapio pervadinimas',
+'movepagetext'                 => "Naudodamiesi žemiau pateikta forma, pervadinsite puslapį
 neprarasdami jo istorijos.
 Senasis pavadinimas taps nukreipiamuoju - rodys į naująjį.
 Nuorodos į senąjį puslapį nebus automatiškai pakeistos, todėl būtinai
@@ -1849,50 +2143,64 @@ o egzistuojan�ių puslapių sugadinti negalite.
 Jei pervadinate populiarų puslapį, tai gali sukelti nepageidaujamų
 šalutinių efektų, dėl to šį veiksmą vykdykite tik įsitikinę,
 kad suprantate visas pasekmes.",
-'movepagetalktext'        => "Susietas aptarimo puslapis bus automatiškai perkeltas kartu su juo, '''išskyrus:''':
+'movepagetalktext'             => "Susietas aptarimo puslapis bus automatiškai perkeltas kartu su juo, '''išskyrus:''':
 *Puslapis nauju pavadinimu jau turi netuš�ią aptarimo puslapį, arba
 *Paliksite žemiau esan�ia varnelę nepažymėtą.
 
 Šiais atvejais jūs savo nuožiūra turite perkelti arba apjungti aptarimo puslapį.",
-'movearticle'             => 'Pervardinti puslapį:',
-'movenotallowed'          => 'Jūs neturite teisių pervadinti puslapių.',
-'newtitle'                => 'Naujas pavadinimas:',
-'move-watch'              => 'Stebėti šį puslapį',
-'movepagebtn'             => 'Pervadinti puslapį',
-'pagemovedsub'            => 'Pervadinta sÄ—kmingai',
-'movepage-moved'          => '<big>\'\'\'"$1" buvo pervadintas į "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Puslapis tokiu pavadinimu jau egzistuoja
+'movearticle'                  => 'Pervardinti puslapį:',
+'movenologin'                  => 'Neprisijungęs',
+'movenologintext'              => 'Norėdami pervadinti puslapį, turite būti užsiregistravęs naudotojas ir būti  [[Special:UserLogin|prisijungęs]].',
+'movenotallowed'               => 'Jūs neturite teisių pervadinti puslapių.',
+'movenotallowedfile'           => 'JÅ«s neturite teisÄ—s perkelti failus.',
+'cant-move-user-page'          => 'Jūs neturite teisės perkelti naudotojų puslapių (išskyrus popuslapius).',
+'cant-move-to-user-page'       => 'Jūs neturite teisių perkelti puslapį į naudotojo puslapį (išskyrus į naudotojo popuslapį).',
+'newtitle'                     => 'Naujas pavadinimas:',
+'move-watch'                   => 'Stebėti šį puslapį',
+'movepagebtn'                  => 'Pervadinti puslapį',
+'pagemovedsub'                 => 'Pervadinta sÄ—kmingai',
+'movepage-moved'               => '<big>\'\'\'"$1" buvo pervadintas į "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Nukreipimas sukurtas.',
+'movepage-moved-noredirect'    => 'Nukreipimo sukūrimas buvo atšauktas.',
+'articleexists'                => 'Puslapis tokiu pavadinimu jau egzistuoja
 arba pasirinktas vardas yra neteisingas.
 Pasirinkite kitÄ… pavadinimÄ….',
-'cantmove-titleprotected' => 'Jūs negalite pervadinti puslapio, nes naujasis pavadinimas buvo apsaugotas nuo sukūrimo',
-'talkexists'              => "'''Pats puslapis buvo sėkmingai pervadintas, bet aptarimų puslapis nebuvo perkeltas, kadangi naujo
+'cantmove-titleprotected'      => 'Jūs negalite pervadinti puslapio, nes naujasis pavadinimas buvo apsaugotas nuo sukūrimo',
+'talkexists'                   => "'''Pats puslapis buvo sėkmingai pervadintas, bet aptarimų puslapis nebuvo perkeltas, kadangi naujo
 pavadinimo puslapis jau turėjo aptarimų puslapį.
 Prašome sujungti šiuos puslapius.'''",
-'movedto'                 => 'pervardintas į',
-'movetalk'                => 'Perkelti susijusį aptarimo puslapį.',
-'move-subpages'           => 'Perkelti visus subpuslapius, jei tai įmanoma',
-'move-talk-subpages'      => 'Perkelti visus aptarimo subpuslapius, jei tai įmanoma',
-'movepage-page-exists'    => 'Puslapis $1 jau egzistuoja ir negali būti automatiškai perrašytas.',
-'movepage-page-moved'     => 'Puslapis $1 perkeltas į $2.',
-'movepage-page-unmoved'   => 'Puslapio $1 negalima perkelti į $2.',
-'1movedto2'               => '[[$1]] pervadintas į [[$2]]',
-'1movedto2_redir'         => '[[$1]] pervadintas į [[$2]] (anks�iau buvo nukreipiamasis)',
-'movelogpage'             => 'Pervardinimų istorija',
-'movelogpagetext'         => 'Pervardintų puslapių sąrašas.',
-'movereason'              => 'Priežastis:',
-'revertmove'              => 'atmesti',
-'delete_and_move'         => 'IÅ¡trinti ir perkelti',
-'delete_and_move_text'    => '==Reikalingas ištrynimas==
+'movedto'                      => 'pervardintas į',
+'movetalk'                     => 'Perkelti susijusį aptarimo puslapį.',
+'move-subpages'                => 'Perkelti visus subpuslapius, jei tai įmanoma',
+'move-talk-subpages'           => 'Perkelti visus aptarimo subpuslapius, jei tai įmanoma',
+'movepage-page-exists'         => 'Puslapis $1 jau egzistuoja ir negali būti automatiškai perrašytas.',
+'movepage-page-moved'          => 'Puslapis $1 perkeltas į $2.',
+'movepage-page-unmoved'        => 'Puslapio $1 negalima perkelti į $2.',
+'movepage-max-pages'           => 'Daugiausiai $1 {{PLURAL:$1|puslapis buvo perkeltas|puslapiai buvo perkelti|puslapių buvo perkelta}} ir daugiau nebus perkelta automatiškai.',
+'1movedto2'                    => '[[$1]] pervadintas į [[$2]]',
+'1movedto2_redir'              => '[[$1]] pervadintas į [[$2]] (anks�iau buvo nukreipiamasis)',
+'move-redirect-suppressed'     => 'nukreipimas nesukurtas',
+'movelogpage'                  => 'Pervardinimų istorija',
+'movelogpagetext'              => 'Pervardintų puslapių sąrašas.',
+'movereason'                   => 'Priežastis:',
+'revertmove'                   => 'atmesti',
+'delete_and_move'              => 'IÅ¡trinti ir perkelti',
+'delete_and_move_text'         => '==Reikalingas ištrynimas==
 
 Paskirties puslapis „[[:$1]]“ jau yra. Ar norite jį ištrinti, kad galėtumėte pervardinti?',
-'delete_and_move_confirm' => 'Taip, trinti puslapį',
-'delete_and_move_reason'  => 'IÅ¡trinta dÄ—l perkÄ—limo',
-'selfmove'                => 'Šaltinio ir paskirties pavadinimai yra tokie patys; negalima pervardinti puslapio į save.',
-'immobile_namespace'      => 'Šaltinio arba paskirties pavadinimas yra specialiojo tipo; negalima pervadinti iš ir į tą vardų sritį.',
-'imagenocrossnamespace'   => 'Negalima pervadinti failo į ne failo vardų sritį',
-'imagetypemismatch'       => 'Naujas failo plÄ—tinys neatitinka jo tipo',
-'imageinvalidfilename'    => 'Failo adreso pavadinimas yra klaidingas',
-'fix-double-redirects'    => 'Atnaujinti peradresavimus, kad šie rodytų į originalų straipsnio pavadinimą',
+'delete_and_move_confirm'      => 'Taip, trinti puslapį',
+'delete_and_move_reason'       => 'IÅ¡trinta dÄ—l perkÄ—limo',
+'selfmove'                     => 'Šaltinio ir paskirties pavadinimai yra tokie patys; negalima pervardinti puslapio į save.',
+'immobile-source-namespace'    => 'Negalima perkelti puslapių vardų srityje „$1“',
+'immobile-target-namespace'    => 'Perkelti puslapius į „$1“ vardų sritį negalima',
+'immobile-target-namespace-iw' => 'Tarprojektinė nuoroda yra neleistina paskirtis perkelti puslapį.',
+'immobile-source-page'         => 'Å io puslapio perkelti negalima.',
+'immobile-target-page'         => 'Negalima perkelti į paskirtąją vietą.',
+'imagenocrossnamespace'        => 'Negalima pervadinti failo į ne failo vardų sritį',
+'imagetypemismatch'            => 'Naujas failo plÄ—tinys neatitinka jo tipo',
+'imageinvalidfilename'         => 'Failo pavadinimas yra klaidingas',
+'fix-double-redirects'         => 'Atnaujinti peradresavimus, kad šie rodytų į originalų straipsnio pavadinimą',
+'move-leave-redirect'          => 'Pervadinant palikti nukreipimÄ…',
 
 # Export
 'export'            => 'Eksportuoti puslapius',
@@ -1901,7 +2209,7 @@ Paskirties puslapis „[[:$1]]“ jau yra. Ar norite jį ištrinti, kad galėtum
 
 Norėdami eksportuoti puslapius, įveskite pavadinimus žemiau esan�iame tekstiniame lauke po vieną pavadinimą eilutėje, taip pat pasirinkite ar norite eksportuoti ir istoriją ar tik dabartinę versiją su paskutinio redagavimo informacija.
 
-Pastaruoju atveju, jūs taip pat galite naudoti nuorodą, pvz. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] puslapiui „[[{{MediaWiki:Mainpage}}]]“.',
+Pastaruoju atveju, jūs taip pat galite naudoti nuorodą, pvz. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] puslapiui „[[{{MediaWiki:Mainpage}}]]“.',
 'exportcuronly'     => 'Eksportuoti tik dabartinę versiją, neįtraukiant istorijos',
 'exportnohistory'   => "----
 '''Pastaba:''' Pilnos puslapių istorijos eksportavimas naudojantis šia forma yra išjungtas dėl spartos.",
@@ -1917,7 +2225,7 @@ Pastaruoju atveju, jūs taip pat galite naudoti nuorodą, pvz. [[{{ns:special}}:
 'allmessagesdefault'        => 'Pradinis tekstas',
 'allmessagescurrent'        => 'Dabartinis tekstas',
 'allmessagestext'           => 'Čia pateikiamas sisteminių pranešimų sąrašas, esan�ių MediaWiki vardų srityje.
-Aplankykite [http://www.mediawiki.org/wiki/Localisation „MediaWiki“ lokaliziciją] ir [http://translatewiki.net „Betawiki“], jei norite prisidėti prie bendrojo „MediaWiki“ lokalizavimo.',
+Aplankykite [http://www.mediawiki.org/wiki/Localisation „MediaWiki“ lokaliziciją] ir [http://translatewiki.net „translatewiki.net“], jei norite prisidėti prie bendrojo „MediaWiki“ lokalizavimo.',
 'allmessagesnotsupportedDB' => "Šis puslapis nepalaikomas, nes nuostata '''\$wgUseDatabaseMessages''' yra išjungtas.",
 'allmessagesfilter'         => 'Tekstų pavadinimo filtras:',
 'allmessagesmodified'       => 'Rodyti tik pakeistus',
@@ -1937,9 +2245,12 @@ Aplankykite [http://www.mediawiki.org/wiki/Localisation „MediaWiki“ lokalizi
 'import-interwiki-text'      => 'Pasirinkite projektÄ… ir puslapio pavadinimÄ… importavimui.
 Versijų datos ir redaktorių vardai bus išlaikyti.
 Visi tarpprojektiniai importo veiksmai yra registruojami  [[Special:Log/import|importo istorijoje]].',
+'import-interwiki-source'    => 'Å altinio wiki projektas/puslapis:',
 'import-interwiki-history'   => 'Kopijuoti visas istorijos versijas Å¡iam puslapiui',
 'import-interwiki-submit'    => 'Importuoti',
-'import-interwiki-namespace' => 'Perkelti puslapius į vardų sritį:',
+'import-interwiki-namespace' => 'Paskirties vardų sritis:',
+'import-upload-filename'     => 'Failo pavadinimas:',
+'import-comment'             => 'Komentaras:',
 'importtext'                 => 'Prašome eksportuoti failą iš projekto-šaltinio naudojantis {{ns:special}}:Export priemone, išsaugokite jį savo diske ir įkelkite jį �ia.',
 'importstart'                => 'Imporuojami puslapiai...',
 'import-revision-count'      => '$1 {{PLURAL:$1|versija|versijos|versijų}}',
@@ -1961,29 +2272,31 @@ Visi tarpprojektiniai importo veiksmai yra registruojami  [[Special:Log/import|i
 'import-nonewrevisions'      => 'Visos versijos buvo importuotos anks�iau.',
 'xml-error-string'           => '$1 $2 eilutÄ—je, $3 stulpelyje ($4 baitas): $5',
 'import-upload'              => 'Įkelti XML duomenis',
+'import-token-mismatch'      => 'Sesijos duomenys prarasti. Bandykite iš naujo.',
+'import-invalid-interwiki'   => 'Nepavyko importuoti iš nurodyto wiki projekto.',
 
 # Import log
 'importlogpage'                    => 'Importo istorija',
 'importlogpagetext'                => 'Administraciniai puslapių importai su keitimų istorija iš kitų wiki projektų.',
-'import-logentry-upload'           => 'importuota $1 įkėliant failą',
+'import-logentry-upload'           => 'importuota $1 įkeliant failą',
 'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|keitimas|keitimai|keitimų}}',
 'import-logentry-interwiki'        => 'tarpprojektinis $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|keitimas|keitimai|keitimų}} iš $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mano naudotojo puslapis',
+'tooltip-pt-userpage'             => 'Jūsų naudotojo puslapis',
 'tooltip-pt-anonuserpage'         => 'Naudotojo puslapis jūsų IP adresui',
-'tooltip-pt-mytalk'               => 'Mano aptarimo puslapis',
+'tooltip-pt-mytalk'               => 'Jūsų aptarimo puslapis',
 'tooltip-pt-anontalk'             => 'Pakeitimų aptarimas, darytus naudojant šį IP adresą',
 'tooltip-pt-preferences'          => 'Mano nustatymai',
 'tooltip-pt-watchlist'            => 'Puslapių sąrašas, kuriuos jūs pasirinkote stebėti.',
-'tooltip-pt-mycontris'            => 'Mano darytų keitimų sąrašas',
+'tooltip-pt-mycontris'            => 'Jūsų darytų keitimų sąrašas',
 'tooltip-pt-login'                => 'Rekomenduojame prisijungti, nors tai nÄ—ra privaloma.',
 'tooltip-pt-anonlogin'            => 'Rekomenduojame prisijungti, nors tai nÄ—ra privaloma.',
 'tooltip-pt-logout'               => 'Atsijungti',
 'tooltip-ca-talk'                 => 'Puslapio turinio aptarimas',
 'tooltip-ca-edit'                 => 'Jūs galite redaguoti šį puslapį. Nepamirškite paspausti peržiūros mygtuką prieš išsaugodami.',
-'tooltip-ca-addsection'           => 'Pridėti komentarą į aptarimą.',
+'tooltip-ca-addsection'           => 'PradÄ—ti naujÄ… aptariamÄ… temÄ…',
 'tooltip-ca-viewsource'           => 'Puslapis yra užrakintas. Galite pažiūrėti turinį.',
 'tooltip-ca-history'              => 'AnkstesnÄ—s puslapio versijos.',
 'tooltip-ca-protect'              => 'Užrakinti šį puslapį',
@@ -2030,6 +2343,9 @@ Visi tarpprojektiniai importo veiksmai yra registruojami  [[Special:Log/import|i
 'tooltip-watch'                   => 'Pridėti šį puslapį į stebimųjų sąrašą',
 'tooltip-recreate'                => 'Atkurti puslapį nepaisant to, kad jis buvo ištrintas',
 'tooltip-upload'                  => 'Pradėti įkėlimą',
+'tooltip-rollback'                => 'Atšaukti atmestus šio puslapio pakeitimus į paskutinę versiją vienu spustelėjimu',
+'tooltip-undo'                    => '„Anuliuoti“ atmeta šį keitimą ir atveria ankstesnės versijos redagavimo formą.
+Leidžia pridėti atmetimo priežastį komentaruose',
 
 # Stylesheets
 'common.css'   => '/** Čia įdėtas CSS bus taikomas visoms išvaizdoms */',
@@ -2045,12 +2361,12 @@ Visi tarpprojektiniai importo veiksmai yra registruojami  [[Special:Log/import|i
 'notacceptable'     => 'Projekto serveris negali pateikti duomenų formatu, kurį jūsų klientas galėtų skaityti.',
 
 # Attribution
-'anonymous'        => 'neregistruotų {{SITENAME}} naudotojų',
+'anonymous'        => 'Neregistruotų {{SITENAME}} naudotojų',
 'siteuser'         => '{{SITENAME}} naudotojas $1',
 'lastmodifiedatby' => 'Šį puslapį paskutinį kartą redagavo $3 $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Paremta $1 darbu.',
 'others'           => 'kiti',
-'siteusers'        => '{{SITENAME}} naudotojas(-ai) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|naudotojas|naudotojai}} $1',
 'creditspage'      => 'Puslapio kūrėjai',
 'nocredits'        => 'Kūrėjų informacija negalima šiam puslapiui.',
 
@@ -2070,6 +2386,15 @@ Visi tarpprojektiniai importo veiksmai yra registruojami  [[Special:Log/import|i
 'numauthors'     => 'Skirtingų autorių skai�ius (puslapis): $1',
 'numtalkauthors' => 'Skirtingų autorių skai�ius (aptarimo puslapis): $1',
 
+# Skin names
+'skinname-standard'    => 'KlasikinÄ—',
+'skinname-nostalgia'   => 'Nostalgija',
+'skinname-cologneblue' => 'Kelno mÄ—lyna',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'Mano išvaizda',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Paprasta',
+
 # Math options
 'mw_math_png'    => 'Visada formuoti PNG',
 'mw_math_simple' => 'HTML paprastais atvejais, kitaip - PNG',
@@ -2090,10 +2415,12 @@ Visi tarpprojektiniai importo veiksmai yra registruojami  [[Special:Log/import|i
 'markedaspatrollederror-noautopatrol' => 'Jums neleidžiama pažymėti savo paties keitimų kaip patikrintų.',
 
 # Patrol log
-'patrol-log-page' => 'Patikrinimo istorija',
-'patrol-log-line' => 'Puslapio „$2“ $1 pažymėta kaip patikrinta $3',
-'patrol-log-auto' => '(automatiškai)',
-'patrol-log-diff' => 'versija $1',
+'patrol-log-page'      => 'Patikrinimo istorija',
+'patrol-log-header'    => 'Tai patvirtintų versijų sąrašas.',
+'patrol-log-line'      => 'Puslapio „$2“ $1 pažymėta kaip patikrinta $3',
+'patrol-log-auto'      => '(automatiškai)',
+'patrol-log-diff'      => 'versija $1',
+'log-show-hide-patrol' => '$1 patvirtinimų sąrašą',
 
 # Image deletion
 'deletedrevision'                 => 'IÅ¡trinta sena versija $1',
@@ -2110,6 +2437,9 @@ $1',
 'previousdiff' => '� Ankstesnis keitimas',
 'nextdiff'     => 'Vėlesnis pakeitimas →',
 
+# Visual comparison
+'visual-comparison' => 'Vizualinis palyginimas',
+
 # Media information
 'mediawarning'         => "'''Dėmesio''': Šis failas gali turėti kenksmingą kodą, jį paleidus jūsų sistema gali būti pažeista.<hr />",
 'imagemaxsize'         => 'Riboti paveikslėlių dydį jų aprašymo puslapyje iki:',
@@ -2122,10 +2452,12 @@ $1',
 'show-big-image'       => 'Pilna raiška',
 'show-big-image-thumb' => '<small>Šios peržiūros dydis: $1 × $2 taškų</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Naujausių failų galerija',
 'imagelisttext'         => "Žemiau yra '''$1''' {{PLURAL:$1|failo|failų|failų}} sąrašas, surūšiuotas $2.",
 'newimages-summary'     => 'Šis specialus puslapis rodo paskiausiai įkeltus failus.',
+'newimages-legend'      => 'Filtras',
+'newimages-label'       => 'Failo vardas (ar jo dalis):',
 'showhidebots'          => '($1 robotus)',
 'noimages'              => 'NÄ—ra kÄ… parodyti.',
 'ilsubmit'              => 'Ieškoti',
@@ -2333,6 +2665,18 @@ Visos kitos nuorodos toje pa�ioje eilutėje yra laikomos išimtimis, t. y. pusl
 'exif-lightsource-24'  => 'ISO studijos volframas',
 'exif-lightsource-255' => 'Kitas Å¡viesos Å¡altinis',
 
+# Flash modes
+'exif-flash-fired-0'    => 'BlykstÄ— nemirktelÄ—jo',
+'exif-flash-fired-1'    => 'BlykstÄ— mirktelÄ—jo',
+'exif-flash-return-0'   => 'jokios blyks�ių grįžties aptikimo funkcijos',
+'exif-flash-return-2'   => 'blykstės grįžtamoji šviesa neaptikta',
+'exif-flash-return-3'   => 'blykstės grįžtamoji šviesa aptikta',
+'exif-flash-mode-1'     => 'priverstinÄ— blykstÄ—',
+'exif-flash-mode-2'     => 'priverstinis blykstÄ—s sulaikymas',
+'exif-flash-mode-3'     => 'automatinis režimas',
+'exif-flash-function-1' => 'Be blykstÄ—s funkcijos',
+'exif-flash-redeye-1'   => 'raudonų akių šalinimo režimas',
+
 'exif-focalplaneresolutionunit-2' => 'coliai',
 
 'exif-sensingmethod-1' => 'Nenurodytas',
@@ -2476,21 +2820,10 @@ $1
 Prašome patvirtinti, kad tikrai norite iš naujo sukurti puslapį.",
 'recreate'            => 'Atkurti',
 
-# HTML dump
-'redirectingto' => 'Peradresuojama į [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Išvalyti šio puslapio podėlį?
-
-$1',
 'confirm_purge_button' => 'Gerai',
-
-# AJAX search
-'searchcontaining' => "Ieškoti puslapių, prasidedan�ių ''$1''.",
-'searchnamed'      => "Ieškoti puslapių, pavadintų ''$1''.",
-'articletitles'    => "Puslapiai, pradedant nuo ''$1''",
-'hideresults'      => 'SlÄ—pti rezultatus',
-'useajaxsearch'    => 'Naudoti AJAX paiešką',
+'confirm-purge-top'    => 'Išvalyti šio puslapio podėlį?',
+'confirm-purge-bottom' => 'Puslapio perkūrimas išvalo podėlį ir priver�ia sugeneruoti pa�ią naujausią puslapio versiją.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� ankstesnis puslapis',
@@ -2557,20 +2890,26 @@ Jūs taip pat galite [[Special:Watchlist/edit|naudoti standartinį redaktorių]]
 
 # Core parser functions
 'unknown_extension_tag' => 'Nežinoma priedo žymė „$1“',
+'duplicate-defaultsort' => 'Įspėjimas: Numatytasis rikiavimo raktas „$2“ pakei�ia ankstesnį numatytąjį rikiavimo raktą „$1“.',
 
 # Special:Version
 'version'                          => 'Versija', # Not used as normal message but as header for the special page itself
-'version-extensions'               => 'Instaliuoti priedai',
+'version-extensions'               => 'Įdiegti priedai',
 'version-specialpages'             => 'Specialieji puslapiai',
+'version-parserhooks'              => 'Analizatoriaus gaudliai',
 'version-variables'                => 'Kintamieji',
 'version-other'                    => 'Kita',
-'version-mediahandlers'            => 'Media dresiruotojai',
+'version-mediahandlers'            => 'DaugialypÄ—s terpÄ—s grotuvai',
+'version-hooks'                    => 'Gaudliai',
 'version-extension-functions'      => 'Papildomos funkcijos',
+'version-parser-extensiontags'     => 'Analizatoriaus papildomosios gairÄ—s',
+'version-parser-function-hooks'    => 'Analizatoriaus funkciniai gaudliai',
 'version-skin-extension-functions' => 'Išvaizdos papildinių funkcijos',
+'version-hook-name'                => 'Gaudlio pavadinimas',
 'version-hook-subscribedby'        => 'Užsakyta',
-'version-version'                  => 'versija',
-'version-license'                  => 'Licenzija',
-'version-software'                 => 'Instaliuota programinė įranga',
+'version-version'                  => 'Versija',
+'version-license'                  => 'Licencija',
+'version-software'                 => 'Įdiegta programinė įranga',
 'version-software-product'         => 'Produktas',
 'version-software-version'         => 'Versija',
 
@@ -2580,13 +2919,13 @@ Jūs taip pat galite [[Special:Watchlist/edit|naudoti standartinį redaktorių]]
 'filepath-submit'  => 'Kelias',
 'filepath-summary' => 'Šis specialusis puslapis parašo pilną kelią iki failo. Paveikslėliai yra rodomi pilna raiška, kiti failų tipai paleidžiami tiesiogiai su jų susietąja programa.
 
-Įveskite failo pavadinimą be „{{ns:image}}:“ priedėlio.',
+Įveskite failo pavadinimą be „{{ns:file}}:“ priedėlio.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Ieškoti dublikuotų failų',
 'fileduplicatesearch-summary'  => 'Pasikartojan�ių failų paieška pagal jų kontrolinę sumą.
 
-Įveskite failo pavadinimą be „{{ns:image}}:“ priešdėlio.',
+Įveskite failo pavadinimą be „{{ns:file}}:“ priešdėlio.',
 'fileduplicatesearch-legend'   => 'Ieškoti dublikatų',
 'fileduplicatesearch-filename' => 'Failo vardas:',
 'fileduplicatesearch-submit'   => 'Ieškoti',
@@ -2616,4 +2955,13 @@ Jūs taip pat galite [[Special:Watchlist/edit|naudoti standartinį redaktorių]]
 'blankpage'              => 'Tuš�ias puslapis',
 'intentionallyblankpage' => 'Šis puslapis specialiai paliktas tuš�ias',
 
+# External image whitelist
+'external_image_whitelist' => ' #Palikite Å¡iÄ… eilutÄ™, tokiÄ… kokia yra <pre>
+#Įrašykite standartinių išraiškų fragmentus (tik dalį tarp //)
+#Juos bus bandoma sutapdinti su išorinių paveikslėlių adresais
+#Tie, kurie sutaps, bus rodomi kaip paveikslÄ—liai, o kiti bus rodomi tik kaip nuorodos
+#Eilutės, prasidedan�ios # yra komentarai
+
+#Įterpkite visus standartinių išraiškų fragmentus prieš šią eilutę. Palikite šią eilutę, tokią kokia yra </pre>',
+
 );
diff --git a/languages/messages/MessagesLv.php b/languages/messages/MessagesLv.php
index c331b1c7..fe4e3e6a 100644
--- a/languages/messages/MessagesLv.php
+++ b/languages/messages/MessagesLv.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Lietot�ja_diskusija',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '{{grammar:ģenitīvs|$1}}_diskusija',
-	NS_IMAGE            => 'Attēls',
-	NS_IMAGE_TALK       => 'Attēla_diskusija',
+	NS_FILE             => 'Attēls',
+	NS_FILE_TALK        => 'Attēla_diskusija',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskusija',
 	NS_TEMPLATE         => 'Veidne',
@@ -76,6 +76,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Paslēpt manus labojumus man� uzraug�mo sarakst�.',
 'tog-watchlisthidebots'       => 'Paslēpt botu labojumus man� uzraug�mo sarakst�.',
 'tog-watchlisthideminor'      => 'Paslēpt maznozīmīgos labojumus man� uzraug�mo sarakst�',
+'tog-watchlisthideliu'        => 'Uzraug�mo rakstu sarakst� paslēpt reģistrēto lietot�ju izmaiņas',
+'tog-watchlisthideanons'      => 'Uzraug�mo rakstu sarakst� paslēpt anonīmo lietot�ju izmaiņas',
 'tog-ccmeonemails'            => 'Sūtīt sev, citiem lietot�jiem nosūtīto epastu, kopijas',
 'tog-diffonly'                => 'Ner�dīt lapu saturu zem izmaiņ�m',
 'tog-showhiddencats'          => 'R�dīt slēpt�s kategorijas',
@@ -84,8 +86,6 @@ $messages = array(
 'underline-never'   => 'nekad',
 'underline-default' => 'K� p�rlūk�',
 
-'skinpreview' => '(Priekšskats)',
-
 # Dates
 'sunday'        => 'svētdiena',
 'monday'        => 'Pirmdiena',
@@ -178,7 +178,10 @@ $messages = array(
 'mytalk'         => 'Mana diskusija',
 'anontalk'       => 'Å Ä«s IP adreses diskusija',
 'navigation'     => 'Navig�cija',
-'and'            => 'un',
+'and'            => '&#32;un',
+
+# Metadata in edit box
+'metadata_help' => 'Metadati:',
 
 'errorpagetitle'    => 'Kļūda',
 'returnto'          => 'Atgriezties: $1.',
@@ -219,7 +222,8 @@ $messages = array(
 'toolbox'           => 'RÄ«ki',
 'userpage'          => 'Skatīt lietot�ja lapu',
 'projectpage'       => 'Skatīt projekta lapu',
-'imagepage'         => 'Aplūkot attēla lapu',
+'imagepage'         => 'Aplūkot faila lapu',
+'viewhelppage'      => 'Atvērt palīdzību',
 'viewtalkpage'      => 'Skatīt diskusiju',
 'otherlanguages'    => 'Cit�s valod�s',
 'redirectedfrom'    => '(P�radresēts no $1)',
@@ -234,7 +238,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Par {{grammar:akuzatīvs|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Par',
-'bugreports'           => 'Kļūdu paziņojumi',
 'copyright'            => 'Saturs ir pieejams saskaņ� ar $1.',
 'copyrightpagename'    => '{{grammar:ģenitīvs|{{SITENAME}}}} autortiesības',
 'copyrightpage'        => '{{ns:project}}:Autortiesības',
@@ -243,9 +246,12 @@ $messages = array(
 'disclaimers'          => 'Saistību atrunas',
 'edithelp'             => 'Palīdzība izmaiņ�m',
 'edithelppage'         => 'Help:Rediģēšana',
+'faq'                  => 'BUJ',
+'faqpage'              => 'Project:BUJ',
 'helppage'             => 'Help:Saturs',
 'mainpage'             => 'S�kumlapa',
 'mainpage-description' => 'S�kumlapa',
+'policy-url'           => 'Project:Politika',
 'portal'               => 'Kopienas port�ls',
 'portal-url'           => 'Project:Kopienas port�ls',
 'privacy'              => 'Priv�tuma politika',
@@ -265,6 +271,8 @@ $messages = array(
 'editsection'         => 'izmainīt šo sadaļu',
 'editold'             => 'rediģēt',
 'viewsourceold'       => 'aplūkot kodu',
+'editlink'            => 'labot',
+'viewsourcelink'      => 'Skatīt pirmkodu',
 'editsectionhint'     => 'Rediģēt sadaļu: $1',
 'toc'                 => 'Satura r�dīt�js',
 'showtoc'             => 'par�dīt',
@@ -277,7 +285,7 @@ $messages = array(
 'site-atom-feed'      => '$1 Atom padeve',
 'page-rss-feed'       => '"$1" RSS barotne',
 'page-atom-feed'      => '"$1" Atom barotne',
-'red-link-title'      => '$1 (vēl nav uzrakstīts)',
+'red-link-title'      => '$1 (lapa neeksistē)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Raksts',
@@ -293,32 +301,43 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Š�das darbības nav.',
-'nosuchactiontext'  => 'Wiki neatpazīst URL nor�dīto darbību',
+'nosuchactiontext'  => 'Iekš URL nor�dīt� darbība ir nederīga.
+Tas var būt no drukas kļūdas URL, vai arī no kļūdainas saites.
+Tas arī var būt saistīts ar ((grammar:ģenitīvs{{SITENAME}}}} programmatūras kļūdu.',
 'nosuchspecialpage' => 'Nav t�das īpaš�s lapas',
 'nospecialpagetext' => 'Tu esi pieprasījis īpašo lapu, ko wiki neatpazīst.',
 
 # General errors
 'error'                => 'Kļūda',
 'databaseerror'        => 'Datu b�zes kļūda',
+'dberrortextcl'        => 'Datub�zes vaic�jum� pieļauta sintakses kļūda.
+Pēdējais priekšraksts:
+"$1"
+palaists funkcij� "$2".
+Izdot� MySQL kļūda: "$3: $4"',
 'noconnect'            => 'Šaj� wiki ir raduš�s tehniskas grūtības un nav iespējams savienoties ar datub�žu serveri. <br />
 $1',
+'nodb'                 => 'Kļūda, pieslēdzoties datub�zei $1',
 'cachederror'          => 'Šī ir lapas saglab�t� versija, iespējams, ka t� nav atjaunin�ta.',
 'laggedslavemode'      => 'Uzmanību: Iespējams, šaj� lap� nav redzami nesen izdarītie papildin�jumi.',
 'readonly'             => 'Datub�ze bloķēta',
 'readonlytext'         => 'Datub�ze šobrīd ir bloķēta pret jauniem ierakstiem un cit�m izmaiņ�m. Visdrīz�k iemesls ir parasts datub�zes uzturēšanas pas�kums, pēc kura t� tiks atjaunota norm�l� st�voklī. Administrators, kurš nobloķēja datub�zi, nor�dīja š�du iemeslu:
 <p>$1',
-'missing-article'      => 'Datub�ze neatrada lapas, ar nosaukumu "$1" $2, tekstu.
+'missing-article'      => 'Teksts lapai ar nosaukumu "$1" $2 datub�zē nav atrodams.
 
-To parasti izraisa novecojusi izmaiņu vai hronoloģijas saite uz izdzēstu lapu.
+Tas parasti notiek novecojušu saišu gadījum�: pieprasot izmaiņas vai hronoloģiju lapai, kas ir izdzēsta.
 
-Ja tajai lapai tur bija j�būt, t� iespējams ir kļūda programm�.
-Par šo var paziņot [[Special:ListUsers/sysop|k�dam administratoram]], nor�dot arī URL.',
+Ja lapai ir j�būt, tad, iespējams, ir kļūda programm�.
+Par to varat ziņot [[Special:ListUsers/sysop|k�dam administratoram]], nor�dot arī URL.',
+'missingarticle-diff'  => '(Salīdz.: $1, $2)',
 'internalerror'        => 'Iekšēja kļūda',
 'internalerror_info'   => 'Iekšēj� kļūda: $1',
 'filecopyerror'        => 'Nav iespējams nokopēt failu "$1" uz "$2"',
 'filerenameerror'      => 'Neizdev�s p�rdēvēt failu "$1" par "$2".',
 'filedeleteerror'      => 'Nevar izdzēst failu "$1".',
+'directorycreateerror' => 'Nevar izveidot mapi "$1".',
 'filenotfound'         => 'Neizdev�s atrast failu "$1".',
+'fileexistserror'      => 'Nevar saglab�t fail� "$1": fails jau past�v',
 'formerror'            => 'Kļūda: neizdev�s nosūtīt saturu',
 'badarticleerror'      => 'Šo darbību nevar veikt šaj� lap�.',
 'cannotdelete'         => 'Nevar izdzēst nor�dīto lapu vai failu. (Iespējams, to jau ir izdzēsis k�ds cits)',
@@ -331,7 +350,7 @@ Par šo var paziņot [[Special:ListUsers/sysop|k�dam administratoram]], nor�do
 'protectedpagetext'    => 'Šī lapa ir aizsarg�ta lai novērstu t�s izmainīšanu.',
 'viewsourcetext'       => 'Tu vari apskatīties un nokopēt šīs lapas wikitekstu:',
 'protectedinterface'   => 'Šī lapa satur programmatūras interfeis� lietotu tekstu un ir bloķēta pret izmaiņ�m, lai pasarg�tu no boj�jumiem.',
-'editinginterface'     => "'''Brīdin�jums:''' Tu izmaini lapu, kuras saturu izmanto wiki programmatūras lietot�ja saskarnē (''interfeis�''). Šīs lapas izmaiņas ietekmēs lietot�ja saskarni citiem lietot�jiem. Pēc modificēšanas, šīs izmaiņas būtu lietderīgi pievienot arī [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], kas ir MediaWiki lokalizēšanas projekts.",
+'editinginterface'     => "'''Brīdin�jums:''' Tu izmaini lapu, kuras saturu izmanto wiki programmatūras lietot�ja saskarnē (''interfeis�''). Šīs lapas izmaiņas ietekmēs lietot�ja saskarni citiem lietot�jiem. Pēc modificēšanas, šīs izmaiņas būtu lietderīgi pievienot arī [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], kas ir MediaWiki lokalizēšanas projekts.",
 'sqlhidden'            => '(SQL vaic�jums paslēpts)',
 'namespaceprotected'   => "Tev nav tiesību izmainīt lapas, kas atrodas '''$1''' ''namespacē''.",
 'customcssjsprotected' => "Tev nav tiesību izmainīt šo lapu, t�pēc, ka t� satur cita lietot�ja personīgos uzst�dījumus (''settings'').",
@@ -355,7 +374,6 @@ Tavs lietot�ja konts ir izveidots. Neaizmirsti, ka ir iespējams mainīt [[Spec
 'remembermypassword'         => 'Atcerēties manu paroli pēc p�rlūka aizvēršanas.',
 'yourdomainname'             => 'Tavs domēns',
 'externaldberror'            => 'Notikusi vai nu �rēj�s autentifik�cijas datub�zes kļūda, vai arī tev nav atļauts izmainīt savu �rējo kontu.',
-'loginproblem'               => '<b>Rad�s problēma ar ieiešanu.</b><br />Mēģini vēlreiz!',
 'login'                      => 'Ieiet',
 'nav-login-createaccount'    => 'Izveidot jaunu lietot�ju vai doties iekš�',
 'loginprompt'                => 'Lai ieietu {{grammar:lokatīvs|{{SITENAME}}}}, tavam datoram ir j�pieņem sīkdatnes (<i>cookies</i>).',
@@ -391,7 +409,7 @@ Ja tu izvēlies to nor�dīt, šo lietos lai identificētu tavu darbu (ieguldīj
 'noname'                     => 'Tu neesi nor�dījis derīgu lietot�ja v�rdu.',
 'loginsuccesstitle'          => 'Ieiešana veiksmīga',
 'loginsuccess'               => 'Tu esi ien�cis {{grammar:lokatīvs|{{SITENAME}}}} k� "$1".',
-'nosuchuser'                 => 'Šeit nav lietot�ja ar v�rdu "$1". P�rbaudi, vai pareizi uzrakstīts, vai arī [[Special:UserLogin/signup|izveido jaunu kontu]].',
+'nosuchuser'                 => 'Šeit nav lietot�ja ar v�rdu "$1". Lietot�jv�rdi ir reģistrjutīgi (lielie un mazie burti nav viens un tas pats) P�rbaudi, vai pareizi uzrakstīts, vai arī [[Special:UserLogin/signup|izveido jaunu kontu]].',
 'nosuchusershort'            => 'Šeit nav lietot�ja ar v�rdu "<nowiki>$1</nowiki>". P�rbaudi, vai nav drukas kļūda.',
 'nouserspecified'            => 'Tev j�nor�da lietot�jv�rds.',
 'wrongpassword'              => 'Tu ievadīji nepareizu paroli. Lūdzu, mēģini vēlreiz.',
@@ -412,10 +430,11 @@ Ja paroles pieprasījumu bija nosūtījis k�ds cits, vai arī tu atcerējies sa
 'throttled-mailpassword'     => 'Paroles atg�din�jums jau ir ticis nosūtīts {{PLURAL:$1|pēdēj�s stundas|pēdējo $1 stundu}} laik�.
 Lai novērstu šīs funkcijas ļaunpr�tīgu izmantošanu, iespējams nosūtīt tikai vienu paroles atg�din�jumu, {{PLURAL:$1|katru stundu|katras $1 stundas}}.',
 'mailerror'                  => 'E-pasta sūtīšanas kļūda: $1',
-'acct_creation_throttle_hit' => 'Tu jau esi izveidojis $1 kontus. Vair�k nevar.',
-'emailauthenticated'         => 'Tava e-pasta adrese tika apstiprin�ta $1.',
+'acct_creation_throttle_hit' => 'Lietot�ji no tavas IP adreses šaj� viki pēdējo 24 stundu laik� jau ir izveidojuši {{PLURAL:$1|1 kontu|$1 kontus}}, kas ir maksim�lais atļautais skaits, šaj� laika period�.
+Šī iemesla dēļ, šobrīd no šīs IP adreses vairs nevar izveidot jaunus kontus.',
+'emailauthenticated'         => 'Tava e-pasta adrese tika apstiprin�ta $2, $3.',
 'emailnotauthenticated'      => 'Tava e-pasta adrese <strong>vēl nav apstiprin�ta</strong> un zem�k nor�dīt�s iespējas nav pieejamas.',
-'noemailprefs'               => '<strong>Nor�di e-pasta adresi, lai lietotu šīs iespējas.</strong>',
+'noemailprefs'               => 'Nor�di e-pasta adresi, lai lietotu šīs iespējas.',
 'emailconfirmlink'           => 'Apstiprin�t tavu e-pasta adresi',
 'invalidemailaddress'        => 'E-pasta adrese nevar tikt apstiprin�ta, jo izskat�s nederīga. Lūdzu ievadi korekti noformētu e-pasta adresi, vai arī atst�j to lauku tukšu.',
 'accountcreated'             => 'Konts izveidots',
@@ -423,6 +442,13 @@ Lai novērstu šīs funkcijas ļaunpr�tīgu izmantošanu, iespējams nosūtīt
 'createaccount-title'        => 'Lietot�ja konta izveidošana {{grammar:lokatīvs|{{SITENAME}}}}',
 'loginlanguagelabel'         => 'Valoda: $1',
 
+# Password reset dialog
+'oldpassword'               => 'Vec� parole',
+'newpassword'               => 'Jaun� parole',
+'retypenew'                 => 'Atk�rto jauno paroli',
+'resetpass-submit-loggedin' => 'Mainīt paroli',
+'resetpass-temp-password'   => 'Pagaidu parole:',
+
 # Edit page toolbar
 'bold_sample'     => 'Teksts bold�',
 'bold_tip'        => 'Teksts bold�',
@@ -446,8 +472,8 @@ Lai novērstu šīs funkcijas ļaunpr�tīgu izmantošanu, iespējams nosūtīt
 'hr_tip'          => 'Horizont�la līnija (neizmanto lieki)',
 
 # Edit pages
-'summary'                   => 'Kopsavilkums',
-'subject'                   => 'TÄ“ma/virsraksts',
+'summary'                   => 'Kopsavilkums:',
+'subject'                   => 'TÄ“ma/virsraksts:',
 'minoredit'                 => 'maznozīmīgs labojums',
 'watchthis'                 => 'uzraudzīt',
 'savearticle'               => 'Saglab�t lapu',
@@ -460,7 +486,7 @@ Lai novērstu šīs funkcijas ļaunpr�tīgu izmantošanu, iespējams nosūtīt
 'missingcommenttext'        => 'Lūdzu, ievadi tekstu zem�k redzamaj� log�!',
 'missingcommentheader'      => "'''Atg�din�jums:''' Tu šim koment�ram neesi nor�dījis virsrakstu/tematu.
 Ja tu vēlreiz uzspiedīsi uz Saglab�t, tavas izmaiņas tiks saglab�tas bez t� virsraksta.",
-'summary-preview'           => 'Kopsavilkuma pirmskats',
+'summary-preview'           => 'Kopsavilkuma pirmskats:',
 'blockedtitle'              => 'Lietot�js ir bloķēts.',
 'blockedtext'               => "<big>'''Tavs lietot�ja v�rds vai IP adrese ir nobloķēta.'''</big>
 
@@ -504,28 +530,28 @@ Ja tu šeit non�ci kļūdas pēc, vienk�rši uzspied '''back''' pogu p�rlūkp
 'anontalkpagetext'          => "----''Šī ir diskusiju lapa anonīmam lietot�jam, kurš vēl nav kļuvis par reģistrētu lietot�ju vai arī neizmanto savu lietot�jv�rdu. T�dēļ mums ir j�izmanto skaitlisk� IP adrese, lai viņu identificētu.
 Š�da IP adrese var būt vair�kiem lietot�jiem.
 Ja tu esi anonīms lietot�js un uzskati, ka tev ir adresēti neatbilstoši koment�ri, lūdzu, [[Special:UserLogin/signup|kļūsti par lietot�ju]] vai arī [[Special:UserLogin|izmanto jau izveidotu lietot�jv�rdu]], lai izvairītos no turpm�k�m neskaidrīb�m un tu netiktu sajaukts ar citiem anonīmiem lietot�jiem.''",
-'noarticletext'             => 'Šaj� lap� šobrīd nav nek�da teksta, tu vari [[Special:Search/{{PAGENAME}}|meklēt cit�s lap�s pēc šīs lapas nosaukuma]], vai arī [{{fullurl:{{FULLPAGENAME}}|action=edit}} s�kt rediģēt šo lapu].',
+'noarticletext'             => 'Šaj� lap� šobrīd nav nek�da teksta, tu vari [[Special:Search/{{PAGENAME}}|meklēt cit�s lap�s pēc šīs lapas nosaukuma]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} meklēt saistītos reģistru ierakstos] vai arī [{{fullurl:{{FULLPAGENAME}}|action=edit}} s�kt rediģēt šo lapu].',
 'userpage-userdoesnotexist' => 'Lietot�js "$1" nav reģistrēts.
 Lūdzu, p�rliecinies vai vēlies izveidot/izmainīt šo lapu.',
 'clearyourcache'            => "'''Piezīme - Pēc saglab�šanas, lai būtu redzamas izmaiņas, var būt nepieciešamas iztīrīt p�rlūka kešatmiņu.''' '''Mozilla / Firefox / Safari:''' turi nospiestu ''Shift'' un klikšķini ''Reload,'' vai arī spied ''Ctrl-F5'' vai ''Ctrl-R'' (''Command-R'' uz Macintosh); '''Konqueror: '''klikšķini ''Reload'' vai spied uz ''F5;'' '''Opera:''' kešu var iztīrīt ''Tools → Preferences;'' '''Internet Explorer:''' turi nospiestu ''Ctrl'' un klikšķini ''Refresh,'' vai spied ''Ctrl-F5.''",
-'usercssjsyoucanpreview'    => '<strong>Ieteikums:</strong> Lieto pirmsskata pogu, lai p�rbaudītu savu jauno CSS/JS pirms saglab�šanas.',
+'usercssjsyoucanpreview'    => "'''Ieteikums:''' Lieto pirmsskata pogu, lai p�rbaudītu savu jauno CSS/JS pirms saglab�šanas.",
 'usercsspreview'            => "'''Atceries, ka šis ir tikai tava lietot�ja CSS pirmskats, lapa vēl nav saglab�ta!'''",
 'userjspreview'             => "'''Atceries, ka šis ir tikai tava lietot�ja JavaScript pirmskats/tests, lapa vēl nav saglab�ta!'''",
 'updated'                   => '(Atjaunots)',
-'note'                      => '<strong>Piezīme: </strong>',
-'previewnote'               => '<strong>Atceries, ka šis ir tikai pirmskats un vēl nav saglab�ts!</strong>',
-'session_fail_preview'      => '<strong>Neizdev�s apstr�d�t tavas izmaiņas, jo tika pazaudēti sesijas dati.
+'note'                      => "'''Piezīme: '''",
+'previewnote'               => "'''Atceries, ka šis ir tikai pirmskats un vēl nav saglab�ts!'''",
+'session_fail_preview'      => "'''Neizdev�s apstr�d�t tavas izmaiņas, jo tika pazaudēti sesijas dati.
 Lūdzu mēģini vēlreiz.
-Ja tas joproj�m nedarbojas, mēģini [[Special:UserLogout|izlogoties �r�]] un ielogoties no jauna.</strong>',
-'session_fail_preview_html' => "<strong>Neizdev�s apstr�d�t tavas izmaiņas, jo tika pazaudēti sesijas dati.</strong>
+Ja tas joproj�m nedarbojas, mēģini [[Special:UserLogout|izlogoties �r�]] un ielogoties no jauna.'''",
+'session_fail_preview_html' => "'''Neizdev�s apstr�d�t tavas izmaiņas, jo tika pazaudēti sesijas dati.'''
 
 ''T�, k� {{grammar:ģenitīvs|{{SITENAME}}}} darbojas neapstr�d�ts HTML, pirmskats ir paslēpts, lai aizsarg�tos no JavaScripta  uzbrukumiem.''
 
-<strong>Ja šis bija parasts rediģēšanas mēģin�jums, mēģini vēlreiz.
-Ja tas joproj�m nedarbojas, mēģini [[Special:UserLogout|izlogoties �r�]] un ielogoties no jauna.</strong>",
+'''Ja šis bija parasts rediģēšanas mēģin�jums, mēģini vēlreiz.
+Ja tas joproj�m nedarbojas, mēģini [[Special:UserLogout|izlogoties �r�]] un ielogoties no jauna.'''",
 'editing'                   => 'Izmainīt $1',
 'editingsection'            => 'Izmainīt $1 (sadaļa)',
-'editingcomment'            => 'Izmainīt $1 (koment�rs)',
+'editingcomment'            => 'Izmainīt $1 (jauna sadaļa)',
 'editconflict'              => 'Izmaiņu konflikts: $1',
 'explainconflict'           => "K�ds cits ir izmainījis šo lapu pēc tam, kad tu s�ki to mainīt.
 Augšēj� teksta log� ir lapas teksts t� pašreizēj� versij�.
@@ -534,28 +560,30 @@ Lai saglab�tu savas izmaiņas, tev ir j�apvieno savs teksts ar saglab�to paš
 Kad spiedīsi pogu \"Saglab�t lapu\", tiks saglab�ts '''tikai''' teksts, kas ir augšēj� teksta log�.",
 'yourtext'                  => 'Tavs teksts',
 'storedversion'             => 'Saglab�t� versija',
-'nonunicodebrowser'         => '<strong>Brīdin�jums: Tavs p�rlūks neatbalsta unikodu.
-Ir pieejams risin�jums, kas ļaus tev droši rediģēt lapas: zīmes, kas nav ASCII, par�dīsies izmaiņu log� k� heksadecim�li kodi.</strong>',
-'editingold'                => '<strong>BRĪDINĀJUMS: Saglab�jot šo lapu, tu izmainīsi šīs lapas novecojušu versiju, un ar to tiks dzēstas visas izmaiņas, kas izdarītas pēc šīs versijas.</strong>',
+'nonunicodebrowser'         => "'''Brīdin�jums: Tavs p�rlūks neatbalsta unikodu.
+Ir pieejams risin�jums, kas ļaus tev droši rediģēt lapas: zīmes, kas nav ASCII, par�dīsies izmaiņu log� k� heksadecim�li kodi.'''",
+'editingold'                => "'''BRĪDINĀJUMS: Saglab�jot šo lapu, tu izmainīsi šīs lapas novecojušu versiju, un ar to tiks dzēstas visas izmaiņas, kas izdarītas pēc šīs versijas.'''",
 'yourdiff'                  => 'Atšķirības',
-'copyrightwarning'          => 'Lūdzu, ņem vēr�, ka viss ieguldījums, kas veikts {{grammar:lokatīvs|{{SITENAME}}}}, ir uzskat�ms par publiskotu saskaņ� ar $2 (vair�k info skat. $1).
+'copyrightwarning'          => "Lūdzu, ņem vēr�, ka viss ieguldījums, kas veikts {{grammar:lokatīvs|{{SITENAME}}}}, ir uzskat�ms par publiskotu saskaņ� ar \$2 (vair�k info skat. \$1).
 Ja nevēlies, lai Tevis rakstīto k�ds rediģē un izplata t�l�k, tad, lūdzu, nepievieno to šeit!<br />
 
-Izvēloties "Saglab�t lapu", Tu apliecini, ka šo rakstu esi rakstījis vai papildin�jis pats vai izmantojis inform�ciju no darba, ko neaizsarg� autortiesības, vai tamlīdzīga brīvi pieejama resursa.
-<strong>BEZ ATĻAUJAS NEPIEVIENO DARBU, KO AIZSARGĀ AUTORTIESĪBAS!</strong>',
+Izvēloties \"Saglab�t lapu\", Tu apliecini, ka šo rakstu esi rakstījis vai papildin�jis pats vai izmantojis inform�ciju no darba, ko neaizsarg� autortiesības, vai tamlīdzīga brīvi pieejama resursa.
+'''BEZ ATĻAUJAS NEPIEVIENO DARBU, KO AIZSARGĀ AUTORTIESĪBAS!'''",
 'copyrightwarning2'         => "Lūdz ņem vēr�, ka visu ieguldījumu {{grammar:lokatīvs|{{SITENAME}}}} var rediģēt, mainīt vai izdzēst citi lietot�ji. Ja negribi lai ar tavu rakstīto t� izrīkojas, nepievieno to šeit.
 
 Tu apliecini, ka šo rakstu esi rakstījis vai papildin�jis pats vai izmantojis inform�ciju no darba, ko neaizsarg� autortiesības, vai tamlīdzīga brīvi pieejama resursa (sīk�k skatīt $1).
 
 '''BEZ ATĻAUJAS NEPIEVIENO DARBU, KO AIZSARGĀ AUTORTIESĪBAS!'''",
-'longpagewarning'           => '<strong>Šī lapa ir $1 kilobaitus liela. Tas var būt vair�k par lapas optim�lo izmēru. Lūdzu apsver iespēju sašķelt to maz�k�s sekcij�s.</strong>',
-'longpageerror'             => '<strong>Kļūda: Teksts, kuru tu mēģin�ji saglab�t, ir $1 kilobaitus garš, kas ir vair�k nek� pieļaujamie $2 kilobaiti.
-Tas nevar tikt saglab�ts.</strong>',
-'readonlywarning'           => '<strong>Brīdin�jums: Datub�ze ir slēgta apkopei, t�pēc tu tagad nevarēsi saglab�t veikt�s izmaiņas.
-Tu varētu nokopēt tekstu un saglab�t k� teksta failu vēl�kam laikam.</strong>',
+'longpagewarning'           => "'''Šī lapa ir $1 kilobaitus liela. Tas var būt vair�k par lapas optim�lo izmēru. Lūdzu apsver iespēju sašķelt to maz�k�s sekcij�s.'''",
+'longpageerror'             => "'''Kļūda: Teksts, kuru tu mēģin�ji saglab�t, ir $1 kilobaitus garš, kas ir vair�k nek� pieļaujamie $2 kilobaiti.
+Tas nevar tikt saglab�ts.'''",
+'readonlywarning'           => "'''Brīdin�jums: Datub�ze ir slēgta apkopei, t�pēc tu tagad nevarēsi saglab�t veikt�s izmaiņas.
+Tu vari nokopēt tekstu un saglab�t k� teksta failu vēl�kam laikam.'''
+
+Admins, kas slēdza datub�zi, nor�dīja š�du paskaidrojumu: $1",
 'protectedpagewarning'      => "'''BRĪDINĀJUMS: Šī lapa ir bloķēta pret izmaiņ�m, tikai lietot�ji ar admina privilēģij�m var to izmainīt. To darot, noteikti ievēro [[Project:Nor�dījumi par aizsarg�taj�m lap�m|nor�dījumus par aizsarg�taj�m lap�m]].'''",
 'semiprotectedpagewarning'  => "'''Piezīme:''' Izmaiņu veikšana šaj� lap� ir atļauta tikai reģistrētiem lietot�jiem.",
-'titleprotectedwarning'     => '<strong>Brīdin�jums: Šī lapa ir slēgta un to var izveidot tikai noteikti lietot�ji.</strong>',
+'titleprotectedwarning'     => "'''Brīdin�jums: Šī lapa ir slēgta un to var izveidot tikai noteikti lietot�ji.'''",
 'templatesused'             => '<br />Šaj� lap� izmantot�s veidnes:',
 'templatesusedpreview'      => 'Šaj� pirmskat� izmantot�s veidnes:',
 'templatesusedsection'      => 'Šaj� sadaļ� izmantot�s veidnes:',
@@ -568,6 +596,11 @@ Tu vari atgriezties atpakaļ un izmainīt esošu lapu, vai arī [[Special:UserLo
 
 Tev vajadzētu p�rliecin�ties, vai ir lietderīgi turpin�t izmainīt šo lapu.
 Te var apskatīties dzēšanas reģistru, kur� j�būt datiem par to kas, kad un k�pēc šo lapu izdzēsa.",
+'deleted-notice'            => 'Šī lapa ir tikusi izdzēsta.
+Te var apskatīties dzēšanas reģistra fragmentu, lai noskaidrotu kurš, k�pēc un kad to izdzēsa.',
+'deletelog-fulllog'         => 'Skatīt pilnu žurn�lu',
+'edit-already-exists'       => 'Nevar izveidot jaunu lapu.
+T� jau eksistē.',
 
 # "Undo" feature
 'undo-success' => 'Šo izmaiņu var atcellt.
@@ -582,36 +615,39 @@ Lūdzu, p�rbaudi zem�k redzamaj� salīdzin�jum� vai tu to tieš�m vēlies
 $3 nor�dītais iemesls ir ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Apskatīties ar šo lapu saistītos reģistru ierakstus',
-'nohistory'           => 'Šai lapai nav pieejama versiju hronoloģija.',
-'revnotfound'         => 'Versija nav atrasta',
-'revnotfoundtext'     => 'Meklēt� vec� lapas versija netika atrasta. Lūdzu p�rbaudi lietoto URL.',
-'currentrev'          => 'Pašreizēj� versija',
-'revisionasof'        => 'Versija, kas saglab�ta $1',
-'revision-info'       => 'Versija $1 laik�, k�du to atst�ja $2',
-'previousrevision'    => '�Sen�ka versija',
-'nextrevision'        => 'Jaun�ka versija→',
-'currentrevisionlink' => 'skatīt pašreizējo versiju',
-'cur'                 => 'ar pašreizējo',
-'next'                => 'n�kamais',
-'last'                => 'ar iepriekšējo',
-'page_first'          => 'pirm�',
-'page_last'           => 'pēdēj�',
-'histlegend'          => 'Atšķirību izvēle: atzīmē vajadzīgo versiju apaļ�s pogas un spied "Salīdzin�t izvēlēt�s versijas".<br />
+'viewpagelogs'           => 'Apskatīties ar šo lapu saistītos reģistru ierakstus',
+'nohistory'              => 'Šai lapai nav pieejama versiju hronoloģija.',
+'currentrev'             => 'Pašreizēj� versija',
+'currentrev-asof'        => 'Pašreizēj� versija, $1',
+'revisionasof'           => 'Versija, kas saglab�ta $1',
+'revision-info'          => 'Versija $1 laik�, k�du to atst�ja $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Sen�ka versija',
+'nextrevision'           => 'Jaun�ka versija→',
+'currentrevisionlink'    => 'skatīt pašreizējo versiju',
+'cur'                    => 'ar pašreizējo',
+'next'                   => 'n�kamais',
+'last'                   => 'ar iepriekšējo',
+'page_first'             => 'pirm�',
+'page_last'              => 'pēdēj�',
+'histlegend'             => 'Atšķirību izvēle: atzīmē vajadzīgo versiju apaļ�s pogas un spied "Salīdzin�t izvēlēt�s versijas".<br />
 Apzīmējumi:
 "ar pašreizējo" = salīdzin�t ar pašreizējo versiju,
 "ar iepriekšējo" = salīdzin�t ar iepriekšējo versiju,
 m = maznozīmīgs labojums.',
-'deletedrev'          => '[izdzēsta]',
-'histfirst'           => 'Sen�k�s',
-'histlast'            => 'Jaun�k�s',
-'historysize'         => '({{PLURAL:$1|1 baits|$1 baiti}})',
-'historyempty'        => '(tukša)',
+'history-fieldset-title' => 'Meklēt hronoloģij�',
+'deletedrev'             => '[izdzēsta]',
+'histfirst'              => 'Sen�k�s',
+'histlast'               => 'Jaun�k�s',
+'historysize'            => '({{PLURAL:$1|1 baits|$1 baiti}})',
+'historyempty'           => '(tukša)',
 
 # Revision feed
 'history-feed-title'          => 'Versiju hronoloģija',
 'history-feed-description'    => 'Šīs wiki lapas versiju hronoloģija',
 'history-feed-item-nocomment' => '$1 : $2', # user at time
+'history-feed-empty'          => 'Pieprasīt� lapa nepast�v.
+Iespējams, t� ir izdzēsta vai p�rdēvēta.
+Mēģiniet [[Special:Search|meklēt]], lai atrastu saistītas lapas!',
 
 # Revision deletion
 'rev-deleted-comment' => '(koment�rs nodzēsts)',
@@ -629,7 +665,7 @@ m = maznozīmīgs labojums.',
 # Search results
 'searchresults'         => 'Meklēšanas rezult�ti',
 'searchresulttext'      => 'Lai iegūtu vair�k inform�cijas par meklēšanu {{grammar:akuzatīvs|{{SITENAME}}}}, skat. [[{{MediaWiki:Helppage}}|{{grammar:ģenitīvs|{{SITENAME}}}} meklēšana]].',
-'searchsubtitle'        => 'Pieprasījums: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|visas lapas, kas s�kas ar "$1"]] | [[Special:WhatLinksHere/$1|visas lapas, kur�s ir saite uz "$1"]])',
+'searchsubtitle'        => 'Pieprasījums: \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|visas lapas, kas s�kas ar "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|visas lapas, kur�s ir saite uz "$1"]])',
 'searchsubtitleinvalid' => 'Pieprasījums: $1',
 'noexactmatch'          => "'''Lapas ar nosaukumu \"\$1\" Å¡eit nav.''' Tu vari to [[:\$1|izveidot]].",
 'noexactmatch-nocreate' => "'''Å eit nav lapas ar nosaukumu \"\$1\".'''",
@@ -641,9 +677,10 @@ m = maznozīmīgs labojums.',
 'prevn'                 => 'iepriekšēj�s $1',
 'nextn'                 => 'n�kam�s $1',
 'viewprevnext'          => 'Skatīt ($1) ($2) ($3 vien� lap�).',
+'searchhelp-url'        => 'Help:Saturs',
 'showingresults'        => 'Šobrīd ir redzamas <b>$1</b> {{PLURAL:$1|lapa|lapas}}, s�kot ar #<b>$2</b>.',
 'showingresultsnum'     => "Šobrīd ir redzamas '''$3''' {{PLURAL:$3|lapa|lapas}}, s�kot ar #'''$2'''>.",
-'showingresultstotal'   => "R�da {{PLURAL:$3|rezult�tu '''$1''' no '''$3'''|rezult�tus '''$1 - $2''' no '''$3'''}}",
+'showingresultstotal'   => "R�da {{PLURAL:$4|rezult�tu '''$1''' no '''$3'''|rezult�tus '''$1 - $2''' no '''$3'''}}",
 'nonefound'             => "'''Piezīme:''' bieži vien meklēšana ir neveiksmīga, meklējot plaši izplatītus v�rdus, piemēram, \"un\" vai \"ir\", jo tie netiek iekļauti meklēšanas datub�zē, vai arī meklējot vair�k par vienu v�rdu (jo rezult�tos par�dīsies tikai lapas, kur�s ir visi meklētie v�rdi). Vēl, pēc noklusējuma, p�rmeklē tikai dažas ''namespaces''. Lai meklētu vis�s, meklēšanas pieprasījumam priekš� j�ieliek ''all:'', vai arī analog� veid� j�nor�da p�rmeklējamo ''namespaci''.",
 'powersearch'           => 'Izvērst� meklēšana',
 'powersearch-legend'    => 'Izvērst� meklēšana',
@@ -661,6 +698,7 @@ Pagaid�m vari meklēt, izmantojot Google vai Yahoo.
 'qbsettings'            => 'Rīku joslas st�voklis',
 'changepassword'        => 'Mainīt paroli',
 'skin'                  => 'Apdare',
+'skin-preview'          => 'Priekšskats',
 'math'                  => 'Formulas',
 'dateformat'            => 'Datuma form�ts',
 'datedefault'           => 'Vienalga',
@@ -676,9 +714,6 @@ Pagaid�m vari meklēt, izmantojot Google vai Yahoo.
 'prefs-misc'            => 'Daž�di',
 'saveprefs'             => 'Saglab�t izvēles',
 'resetprefs'            => 'Atcelt nesaglab�t�s izmaiņas',
-'oldpassword'           => 'Vec� parole',
-'newpassword'           => 'Jaun� parole',
-'retypenew'             => 'Atk�rto jauno paroli',
 'textboxsize'           => 'Rediģēšana',
 'rows'                  => 'Rindiņas',
 'columns'               => 'Simbolu skaits rindiņ�',
@@ -687,7 +722,7 @@ Pagaid�m vari meklēt, izmantojot Google vai Yahoo.
 'contextlines'          => 'Cik rindiņas par�dīt katram atrastajam rezult�tam',
 'contextchars'          => 'Konteksta simbolu skaits vien� rindiņ�',
 'recentchangesdays'     => 'Dienu skaits, kuru r�dīt pēdējaj�s izmaiņ�s:',
-'recentchangescount'    => 'Virsrakstu skaits pēdējo izmaiņu, hronoloģiju un reģistru lap�s:',
+'recentchangescount'    => 'Virsrakstu skaits pēdējo izmaiņu, hronoloģiju un reģistru lap�s, pēc noklusējuma:',
 'savedprefs'            => 'Tavas izvēles ir saglab�tas.',
 'timezonelegend'        => 'Laika josla',
 'timezonetext'          => '¹Ieraksti, par cik stund�m tavs vietējais laiks atšķiras no servera laika (UTC).',
@@ -706,7 +741,7 @@ Pagaid�m vari meklēt, izmantojot Google vai Yahoo.
 'userrights-lookup-user'      => 'P�rvaldīt lietot�ja grupas',
 'userrights-user-editname'    => 'Ievadi lietot�jv�rdu:',
 'editusergroup'               => 'Izmainīt lietot�ja grupas',
-'editinguser'                 => "Izmainīt lietot�ja '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) statusu",
+'editinguser'                 => "Izmainīt lietot�ja '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) statusu",
 'userrights-editusergroup'    => 'Izmainīt lietot�ja grupas',
 'saveusergroups'              => 'Saglab�t lietot�ja grupas',
 'userrights-groupsmember'     => 'Šobrīd ietilpst grup�s:',
@@ -734,6 +769,8 @@ Pagaid�m vari meklēt, izmantojot Google vai Yahoo.
 'group-sysop-member'      => 'Administrators',
 'group-bureaucrat-member' => 'Birokr�ts',
 
+'grouppage-sysop' => '{{ns:project}}:Administratori',
+
 # Rights
 'right-read'             => 'Lasīt lapas',
 'right-edit'             => 'Izmainīt lapas',
@@ -773,6 +810,7 @@ Pagaid�m vari meklēt, izmantojot Google vai Yahoo.
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|izmaiņa|izmaiņas}}',
 'recentchanges'                     => 'Pēdēj�s izmaiņas',
+'recentchanges-legend'              => 'Pēdējo izmaiņu opcijas',
 'recentchangestext'                 => 'Šaj� lap� ir šitaj� viki izdarīt�s pēdēj�s izmaiņas.',
 'rcnote'                            => 'Šobrīd ir {{PLURAL:$1|redzama pēdēj� <strong>$1</strong> izmaiņa, kas izdarīta|redzamas pēdēj�s <strong>$1</strong> izmaiņas, kas izdarītas}} {{PLURAL:$2|pēdēj�|pēdēj�s}} <strong>$2</strong> {{PLURAL:$2|dien�|dien�s}} (līdz $4, $5).',
 'rcnotefrom'                        => "Šobrīd redzamas izmaiņas kopš '''$2''' (par�dītas ne vair�k par '''$1''').",
@@ -813,7 +851,7 @@ Lapas, kas ir tav� [[Special:Watchlist|uzraug�mo rakstu sarakst�]] ir '''trek
 'uploadtext'             => "'''STOP!''' Pirms tu kaut ko augšupiel�dē, noteikti izlasi un ievēro [[Project:Attēlu izmantošanas noteikumi|attēlu izmantošanas noteikumus]].
 
 Lai aplūkotu vai meklētu agr�k augšupl�dētus attēlus,
-dodies uz [[Special:ImageList|augšupiel�dēto attēlu sarakstu]].
+dodies uz [[Special:FileList|augšupiel�dēto attēlu sarakstu]].
 Augšupiel�des un dzēšanas tiek reģistrētas [[Special:Log/upload|augšupiel�des reģistr�]].
 
 Izmanto šo veidni, lai augšupiel�dētu jaunus attēlu failus, ar kuriem ilustrēt tevis izmainīt�s lapas.
@@ -829,8 +867,8 @@ Ieteicamie form�ti ir:
 * OGG - ja tas ir skaņas fails.
 
 Lūdzu, p�rliecinies, ka faila nosaukums ir pietiekami aprakstošs, lai izvairītos no neskaidrīb�m. Lai attēlu pēc tam ievietotu k�d� lap�, izmanto š�di noformētu linkus:
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fails.jpg|paskaidrojošs teksts]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fails.png|paskaidrojošs teksts]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fails.jpg|paskaidrojošs teksts]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fails.png|paskaidrojošs teksts]]</nowiki>'''
 vai skaņ�m
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fails.ogg]]</nowiki>'''
 
@@ -860,11 +898,12 @@ Lūdzu, ņem vēr�, ka t�pat k� citas wiki lapas arī tevis augšupl�dētos
 šī faila izmērs ir $2.',
 'largefileserver'        => 'Šis fails ir liel�ks nek� serveris ņem pretī.',
 'emptyfile'              => 'Šķiet, ka tu esi augšupl�dējis tukšu failu. Iespējams, faila nosaukum� esi pieļ�vis kļūdu. Lūdzu, p�rbaudi, vai tieš�m tu vēlies augšupl�dēt tieši šo failu.',
-'fileexists'             => 'Fails ar š�du nosaukumu jau past�v, lūdzu, p�rbaudi <strong><tt>$1</tt></strong>, ja neesi drošs, ka vēlies to mainīt.',
-'file-thumbnail-no'      => 'Faila v�rds s�kas ar <strong><tt>$1</tt></strong>.
-Izskat�s, ka šis ir samazin�ts attēls <i>(thumbnail)</i>.
-Ja tev ir šis pats attēls piln� izmēr�, augšupl�dē to, ja nav, tad nomaini faila v�rdu.',
-'fileexists-forbidden'   => 'Fails ar š�du nosaukumu jau eksistē, mēģini k�du citu nosaukumu. [[Image:$1|thumb|center|$1]]',
+'fileexists'             => "Fails ar š�du nosaukumu jau past�v, lūdzu, p�rbaudi '''<tt>$1</tt>''', ja neesi drošs, ka vēlies to mainīt.",
+'file-thumbnail-no'      => "Faila v�rds s�kas ar '''<tt>$1</tt>'''.
+Izskat�s, ka šis ir samazin�ts attēls ''(thumbnail)''.
+Ja tev ir šis pats attēls piln� izmēr�, augšupl�dē to, ja nav, tad nomaini faila v�rdu.",
+'fileexists-forbidden'   => 'Fails ar š�du nosaukumu jau eksistē un to nevar aizvietot ar jaunu.
+Ja tu joproj�m gribi augšupl�dēt šo failu, tad mēģini vēlreiz, ar citu faila v�rdu. [[File:$1|thumb|center|$1]]',
 'successfulupload'       => 'Augšupiel�de veiksmīga',
 'uploadwarning'          => 'Augšupiel�des brīdin�jums',
 'savefile'               => 'Saglab�t failu',
@@ -885,25 +924,25 @@ Apskaties $1 pirms turpini šo failu augšupl�dēt atk�rtoti.',
 
 Apdom� labi, vai tieš�m ir lietderīgi turpin�t šī faila augšupl�di.
 Te var apskatīties dzēšanas reģistru, lai noskaidrotu k�pēc šo failu toreiz izdzēsa:",
-'filename-bad-prefix'    => 'Faila v�rds failam, kuru tu mēģini augšpul�dēt, s�kas ar <strong>"$1"</strong>, kas ir neaprakstošs v�rds, k�du parasti uzģenerē digit�lais fotoapar�ts.
-Lūdzu izvēlies aprakstoš�ku v�rdu šim failam.',
+'filename-bad-prefix'    => "Faila v�rds failam, kuru tu mēģini augšpul�dēt, s�kas ar '''\"\$1\"''', kas ir neaprakstošs v�rds, k�du parasti uzģenerē digit�lais fotoapar�ts.
+Lūdzu izvēlies aprakstoš�ku v�rdu šim failam.",
 
 'license' => 'Licence:',
 
-# Special:ImageList
-'imagelist-summary'     => 'Šaj� lap� ir redzami visi augšupl�dētie faili.
+# Special:ListFiles
+'listfiles-summary'     => 'Šaj� lap� ir redzami visi augšupl�dētie faili.
 Pēc noklusējuma, pēdējie iel�dētie faili atrodas saraksta augš�.
 Uzklikšķinot uz k�das kolonnas virsraksta, var sak�rtot pēc k�da cita parametra.',
-'imagelist_search_for'  => 'Meklēt failu pēc v�rda:',
+'listfiles_search_for'  => 'Meklēt failu pēc v�rda:',
 'imgfile'               => 'fails',
-'imagelist'             => 'Attēlu uzskaitījums',
-'imagelist_date'        => 'Datums',
-'imagelist_name'        => 'Nosaukums',
-'imagelist_user'        => 'Lietot�js',
-'imagelist_size'        => 'Izmērs',
-'imagelist_description' => 'Apraksts',
-
-# Image description page
+'listfiles'             => 'Attēlu uzskaitījums',
+'listfiles_date'        => 'Datums',
+'listfiles_name'        => 'Nosaukums',
+'listfiles_user'        => 'Lietot�js',
+'listfiles_size'        => 'Izmērs',
+'listfiles_description' => 'Apraksts',
+
+# File description page
 'filehist'                  => 'Faila hronoloģija',
 'filehist-help'             => 'Uzklikšķini uz datums/laiks kolonn� esoš�s saites, lai apskatītos, k� šis fails izskatīj�s tad.',
 'filehist-deleteall'        => 'dzēst visus',
@@ -915,10 +954,10 @@ Uzklikšķinot uz k�das kolonnas virsraksta, var sak�rtot pēc k�da cita para
 'filehist-dimensions'       => 'Izmēri',
 'filehist-filesize'         => 'Faila izmērs',
 'filehist-comment'          => 'Koment�rs',
-'imagelinks'                => 'Attēlu saites',
+'imagelinks'                => 'Failu saites',
 'linkstoimage'              => '{{PLURAL:$1|Šaj� lap� ir saite|Šaj�s $1 lap�s ir saites}} uz šo failu:',
 'nolinkstoimage'            => 'Nevien� lap� nav nor�žu uz šo attēlu.',
-'sharedupload'              => 'Å is fails ir no *** [[literal]] translation',
+'sharedupload'              => 'Šis fails ir augšupiel�dēts koplietojams citos projektos.',
 'noimage'                   => 'Ar š�du nosaukumu nav neviena faila, bet tu vari [$1].',
 'noimage-linktext'          => 'augšupl�dēt to',
 'uploadnewversion-linktext' => 'Augšupiel�dēt jaunu šī faila versiju',
@@ -937,7 +976,7 @@ Uzklikšķinot uz k�das kolonnas virsraksta, var sak�rtot pēc k�da cita para
 # File deletion
 'filedelete'                  => 'Dzēst $1',
 'filedelete-legend'           => 'Dzēst failu',
-'filedelete-intro'            => "Tu taisies izdzēst '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Tu taisies izdzēst '''[[Media:$1|$1]]''', kop� ar visu t� hronoloģiju.",
 'filedelete-intro-old'        => "Tu tagad taisies izdzēst faila '''[[Media:$1|$1]]''' versiju, kas tika augšupl�dēta [$4 $3, $2].",
 'filedelete-comment'          => 'Dzēšanas iemesls:',
 'filedelete-submit'           => 'Izdzēst',
@@ -945,8 +984,6 @@ Uzklikšķinot uz k�das kolonnas virsraksta, var sak�rtot pēc k�da cita para
 'filedelete-success-old'      => "Faila '''[[Media:$1|$1]]''' versija $3, $2 tika izdzēsta.",
 'filedelete-nofile'           => "'''$1''' nav atrodams.",
 'filedelete-nofile-old'       => "Failam '''$1''' nav vecas versijas ar nor�dītajiem parametriem.",
-'filedelete-iscurrent'        => 'Tu mēģini izdzēst šī faila vissvaig�ko versiju.
-Lūdzu, vispirms atjauno vec�ku versiju.',
 'filedelete-otherreason'      => 'Cits/papildu iemesls:',
 'filedelete-reason-otherlist' => 'Cits iemesls',
 'filedelete-reason-dropdown'  => '*Izplatīti dzēšanas iemesli
@@ -975,18 +1012,19 @@ Lūdzu, vispirms atjauno vec�ku versiju.',
 'randomredirect' => 'Nejauša p�radres�cijas lapa',
 
 # Statistics
-'statistics'    => 'Statistika',
-'sitestats'     => '{{grammar:ģenitīvs|{{SITENAME}}}} statistika',
-'userstats'     => 'Statistika par lietot�jiem',
-'sitestatstext' => "Datub�zē kop� ir '''\$1''' {{PLURAL:\$1|lapa|lapas}}, ieskaitot diskusiju lapas, lapas par {{GRAMMAR:akuzatīvs|{{SITENAME}}}}, nelielas \"aizmetņu\" lapas (''stubs''), p�radres�cijas lapas, k� arī citas lapas, kuras, iespējams, nevar nosaukt par pilnvērtīg�m satura lap�m. Neskaitot iepriekš minēt�s, {{grammar:lokatīvs|{{SITENAME}}}} ir '''\$2''' {{PLURAL:\$2|lapa|lapas}}, {{PLURAL:\$2|kuru|kuras}} var uzskatīt par pamatsatura {{PLURAL:\$2|lapu|lap�m}}.
-
-Augšupiel�dēti '''\$8''' faili.
-
-Kopš {{grammar:ģenitīvs|{{SITENAME}}}} izveidošanas lapas ir tikušas apskatītas '''\$3''' reizes un lietot�ji ir izdarījuši '''\$4''' {{PLURAL:\$4|labojumu|labojumus}} (katra lapa ir labota vidēji '''\$5''' reizes).
-Vidēji tas ir '''\$5''' labojumi uz lapu un apskatīšanas/labojumu attiecība ir '''\$6'''.
-
-The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'''.",
-'userstatstext' => "Reģistrēto [[Special:ListUsers|lietot�ju]] skaits ir '''$1'''. No tiem '''$2''' (jeb '''$4%''') ir {{PLURAL:$2|administrators|administratori}} (skat. $5).",
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Lapu statistika',
+'statistics-header-edits'      => 'Izmaiņu statistika',
+'statistics-header-users'      => 'Statistika par lietot�jiem',
+'statistics-articles'          => 'Satura lapas',
+'statistics-pages'             => 'Lapas',
+'statistics-pages-desc'        => 'Visas šaj� wiki esoš�s lapas, ieskaitot diskusiju lapas, p�radres�cijas, utt.',
+'statistics-files'             => 'Augšupl�dētie faili',
+'statistics-edits'             => 'Lapu izmaiņas kopš {{grammar:ģenitīvs{{SITENAME}}}} izveidošanas',
+'statistics-edits-average'     => 'Vidējais izmaiņu skaits uz lapu',
+'statistics-users'             => 'Reģistrēti lietot�ji',
+'statistics-users-active'      => 'Aktīvi lietot�ji',
+'statistics-users-active-desc' => 'Lietot�ji, kas ir veikuši jebk�du darbību {{PLURAL:$1|iepriekšēj� dien�|iepriekšēj�s $1 dien�s}}',
 
 'disambiguations'      => 'Nozīmju atdalīšanas lapas',
 'disambiguationspage'  => 'Template:Disambig',
@@ -999,7 +1037,7 @@ Lapu uzskata par nozīmju atdalīšanas lapu, ja t� satur veidni, uz kuru ir sa
 'double-redirect-fixed-move' => '[[$1]] bija ticis p�rvietots, tas tagad ir p�radres�cija uz [[$2]]',
 
 'brokenredirects'     => 'Kļūdainas p�radres�cijas',
-'brokenredirectstext' => 'Šīs ir p�radres�cijas lapas uz neesoš�m lap�m.',
+'brokenredirectstext' => 'Šīs ir p�radres�cijas lapas uz neesoš�m lap�m:',
 
 'withoutinterwiki'         => 'Lapas bez interwiki',
 'withoutinterwiki-summary' => "Šaj�s lap�s nav saišu uz citu valodu projektiem (''interwiki''):",
@@ -1037,6 +1075,7 @@ Lapu uzskata par nozīmju atdalīšanas lapu, ja t� satur veidni, uz kuru ir sa
 'protectedtitlestext'     => 'Lapas ar š�diem nosaukumiem ir aizsarg�tas pret lapas izveidošanu',
 'protectedtitlesempty'    => 'Pagaid�m nevienas lapas nosaukums nav aizsarg�ts ar šiem paraametriem.',
 'listusers'               => 'Lietot�ju uzskaitījums',
+'listusers-editsonly'     => 'R�dīt tikai lietot�jus, kas ir izdarījuši k�das izmaiņas',
 'newpages'                => 'Jaunas lapas',
 'newpages-username'       => 'Lietot�js:',
 'ancientpages'            => 'Sen�k�s lapas',
@@ -1075,13 +1114,21 @@ Tu vari saÅ¡aurinÄ�t aplÅ«kojamo reÄ£istru, izvÄ“loties reÄ£istra veidu, lietotÄ
 Skatīt arī [[Special:WantedCategories|''sarkan�s'' kategorijas]].",
 'categoriesfrom'     => 'Par�dīt kategorijas s�kot ar:',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Izdzēstais lietot�ju devums',
+
 # Special:ListUsers
 'listusersfrom' => 'Par�dīt lietot�jus s�kot ar:',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Jauno lietot�ju reģistrs',
+'newuserlogpagetext'      => 'Jauno lietot�jv�rdu reģistrs.',
+'newuserlog-create-entry' => 'Reģistrēts lietot�jv�rds',
+
 # Special:ListGroupRights
 'listgrouprights'         => 'Lietot�ju grupu tiesības',
 'listgrouprights-summary' => 'Šis ir šaj� wiki definēto lietot�ju grupu uskaitījums, kop� ar t�m atbilstošaj�m piekļuves tiesīb�m.
-Papildu inform�ciju par katru individu�lu piekļuves tiesību veidu, iespējams, var atrast [[{{MediaWiki:Listgrouprights-helppage}}]].',
+Papildu inform�ciju par katru individu�lu piekļuves tiesību veidu, iespējams, var atrast [[{{MediaWiki:Listgrouprights-helppage}}|šeit]].',
 'listgrouprights-group'   => 'Grupa',
 'listgrouprights-rights'  => 'Tiesības',
 
@@ -1094,7 +1141,7 @@ Papildu inform�ciju par katru individu�lu piekļuves tiesību veidu, iespējam
 T� e-pasta adrese, kuru tu esi nor�dījis [[Special:Preferences|sav� izvēļu lap�]], par�dīsies e-pasta "From" lauciņ�, t�dej�di saņēmējs varēs tev atbildēt.',
 'defemailsubject' => 'E-pasts par {{grammar:akuzatīvs|{{SITENAME}}}}',
 'noemailtitle'    => 'Nav e-pasta adreses',
-'noemailtext'     => 'Šis lietot�js nav nor�dījis derīgu e-pasta adresi vai arī ir izvēlējies nesaņemt e-pastu no citiem lietot�jiem.',
+'noemailtext'     => 'Šis lietot�js nav nor�dījis derīgu e-pasta adresi.',
 'emailfrom'       => 'No:',
 'emailto'         => 'Kam:',
 'emailsubject'    => 'Temats:',
@@ -1125,12 +1172,7 @@ Ja vēl�k p�rdom�si un nevēlēsies vairs uzraudzīt šo lapu, klikšķini uz
 'wlheader-showupdated' => "* Lapas, kuras ir tikušas izmainītas, kopš tu t�s pēdējoreiz apskatījies, te r�d�s ar '''pustrekniem''' burtiem",
 'watchlistcontains'    => 'Tav� uzraug�mo lapu sarakst� ir $1 {{PLURAL:$1|lapa|lapas}}.',
 'wlshowlast'           => 'Par�dīt izmaiņas pēdējo $1 stundu laik� vai $2 dienu laik�, vai arī $3.',
-'watchlist-show-bots'  => 'Par�dīt botu izmaiņas',
-'watchlist-hide-bots'  => 'Paslēpt botu izmaiņas',
-'watchlist-show-own'   => 'Par�dīt manas izmaiņas',
-'watchlist-hide-own'   => 'Paslēpt manas izmaiņas',
-'watchlist-show-minor' => 'Par�dīt maznozīmīg�s izmaiņas',
-'watchlist-hide-minor' => 'Paslēpt maznozīmīg�s izmaiņas',
+'watchlist-options'    => 'Uzraug�mo rakstu saraksta opcijas',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Uzrauga...',
@@ -1168,64 +1210,74 @@ Lai izmainītu uzraug�mo lapu saraksta uzst�dījumus:
 Papildus inform�cija:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Dzēst lapu',
-'confirm'                     => 'Apstiprin�t',
-'excontent'                   => "lapas saturs bija: '$1'",
-'excontentauthor'             => 'saturs bija: "$1" (vienīgais autors: [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => "lapas saturs pirms satura dzēšanas bija š�ds: '$1'",
-'exblank'                     => 'lapa bija tukša',
-'delete-confirm'              => 'Dzēst "$1"',
-'delete-legend'               => 'Dzēšana',
-'historywarning'              => 'Brīdin�jums: Tu dzēsīsi lapu, kurai ir saglab�tas iepriekšējas versijas.',
-'confirmdeletetext'           => 'Tu tūlīt no datub�zes dzēsīsi lapu vai attēlu, k� arī to iepriekšēj�s versijas. Lūdzu, apstiprini, ka tu tieš�m to vēlies darīt, ka tu apzinies sekas un ka tu to dari saskaņ� ar [[Project:Vadlīnijas|vadlīnij�m]].',
-'actioncomplete'              => 'Darbība pabeigta',
-'deletedtext'                 => 'Lapa "<nowiki>$1</nowiki>" ir izdzēsta.
+# Delete
+'deletepage'             => 'Dzēst lapu',
+'confirm'                => 'Apstiprin�t',
+'excontent'              => "lapas saturs bija: '$1'",
+'excontentauthor'        => 'saturs bija: "$1" (vienīgais autors: [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => "lapas saturs pirms satura dzēšanas bija š�ds: '$1'",
+'exblank'                => 'lapa bija tukša',
+'delete-confirm'         => 'Dzēst "$1"',
+'delete-legend'          => 'Dzēšana',
+'historywarning'         => 'Brīdin�jums: Tu dzēsīsi lapu, kurai ir saglab�tas iepriekšējas versijas.',
+'confirmdeletetext'      => 'Tu tūlīt no datub�zes dzēsīsi lapu vai attēlu, k� arī to iepriekšēj�s versijas. Lūdzu, apstiprini, ka tu tieš�m to vēlies darīt, ka tu apzinies sekas un ka tu to dari saskaņ� ar [[Project:Vadlīnijas|vadlīnij�m]].',
+'actioncomplete'         => 'Darbība pabeigta',
+'deletedtext'            => 'Lapa "<nowiki>$1</nowiki>" ir izdzēsta.
 Šeit var apskatīties pēdējos izdzēstos: "$2".',
-'deletedarticle'              => 'izdzēsu "$1"',
-'dellogpage'                  => 'Dzēšanas reģistrs',
-'dellogpagetext'              => 'Šaj� lap� ir pēdējo dzēsto lapu saraksts.',
-'deletionlog'                 => 'dzēšanas reģistrs',
-'reverted'                    => 'Atjaunots uz iepriekšējo versiju',
-'deletecomment'               => 'Dzēšanas iemesls',
-'deleteotherreason'           => 'Cits/papildu iemesls:',
-'deletereasonotherlist'       => 'Cits iemesls',
-'deletereason-dropdown'       => '*Izplatīti dzēšanas iemesli
+'deletedarticle'         => 'izdzēsu "$1"',
+'dellogpage'             => 'Dzēšanas reģistrs',
+'dellogpagetext'         => 'Šaj� lap� ir pēdējo dzēsto lapu saraksts.',
+'deletionlog'            => 'dzēšanas reģistrs',
+'reverted'               => 'Atjaunots uz iepriekšējo versiju',
+'deletecomment'          => 'Dzēšanas iemesls',
+'deleteotherreason'      => 'Cits/papildu iemesls:',
+'deletereasonotherlist'  => 'Cits iemesls',
+'deletereason-dropdown'  => '*Izplatīti dzēšanas iemesli
 ** Autora pieprsījums
 ** Autortiesību p�rk�pums
 ** Vand�lisms',
-'delete-edit-reasonlist'      => 'Izmainīt dzēšanas iemeslus',
-'delete-toobig'               => 'Šai lapai ir liela izmaiņu hronoloģija, vair�k nek� $1 {{PLURAL:$1|versija|versijas}}.
+'delete-edit-reasonlist' => 'Izmainīt dzēšanas iemeslus',
+'delete-toobig'          => 'Šai lapai ir liela izmaiņu hronoloģija, vair�k nek� $1 {{PLURAL:$1|versija|versijas}}.
 Š�du lapu dzēšana ir atslēgta, lai novērstu nejaušus traucējumus {{grammar:lokatīvs|{{SITENAME}}}}.',
-'rollback'                    => 'Novērst labojumus',
-'rollback_short'              => 'Novērst',
-'rollbacklink'                => 'novērst',
-'rollbackfailed'              => 'Novēršana neizdev�s',
-'cantrollback'                => 'Nav iespējams novērst labojumu; iepriekšējais labot�js ir vienīgais lapas autors.',
-'alreadyrolled'               => 'Nav iespējams novērst pēdēj�s izmaiņas, ko lap� [[:$1]] saglab�ja [[User:$2|$2]] ([[User talk:$2|Diskusija]] | [[Special:Contributions/$2|{{int:contribslink}}]]). K�ds cits jau ir rediģējis šo lapu vai novērsis izmaiņas.
-
-Pēdēj�s izmaiņas saglab�ja [[User:$3|$3]] ([[User talk:$3|diskusija]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Attiecīg�s izmaiņas kopsavilkums bija: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Novērsu izmaiņas, ko izdarīja [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]), atjaunoju versiju, ko saglab�ja [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Tika novērstas $1 izdarīt�s izmaiņas;
+
+# Rollback
+'rollback'         => 'Novērst labojumus',
+'rollback_short'   => 'Novērst',
+'rollbacklink'     => 'novērst',
+'rollbackfailed'   => 'Novēršana neizdev�s',
+'cantrollback'     => 'Nav iespējams novērst labojumu; iepriekšējais labot�js ir vienīgais lapas autors.',
+'alreadyrolled'    => 'Nav iespējams novērst pēdēj�s izmaiņas, ko lap� [[:$1]] saglab�ja [[User:$2|$2]] ([[User talk:$2|Diskusija]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]). K�ds cits jau ir rediģējis šo lapu vai novērsis izmaiņas.
+
+Pēdēj�s izmaiņas saglab�ja [[User:$3|$3]] ([[User talk:$3|diskusija]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Attiecīg�s izmaiņas kopsavilkums bija: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Novērsu izmaiņas, ko izdarīja [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]), atjaunoju versiju, ko saglab�ja [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Tika novērstas $1 izdarīt�s izmaiņas;
 un tika atjaunota iepriekšēj� versija, kuru bija izveidojis $2.',
-'sessionfailure'              => "Ir radusies problēma ar sesijas autentifik�ciju;
+'sessionfailure'   => "Ir radusies problēma ar sesijas autentifik�ciju;
 šī darbība ir atcelta, lai novērstu lietot�jv�rda iespējami ļaunpr�tīgu izmantošanu.
 Lūdzu, spied \"''back''\" un atjaunini iepriekšējo lapu. Tad mēģini vēlreiz.",
+
+# Protect
 'protectlogpage'              => 'Aizsarg�šanas reģistrs',
 'protectedarticle'            => 'aizsarg�ja $1',
 'unprotectedarticle'          => 'atcēla aizsardzību: $1',
 'protect-title'               => 'Izmainīt "$1" aizsarg�šanas līmeni?',
+'prot_1movedto2'              => '"[[$1]]" p�rdēvēju par "[[$2]]"',
 'protect-legend'              => 'Apstiprin�t aizsarg�šanu',
 'protectcomment'              => 'Aizsarg�šanas iemesls',
 'protectexpiry'               => 'Beidzas:',
 'protect_expiry_invalid'      => 'Beigu termiņš ir nederīgs.',
 'protect_expiry_old'          => 'Beigu termiņs ir pag�tnē.',
-'protect-text'                => 'Šeit var apskatīties un izmainīt lapas <strong><nowiki>$1</nowiki></strong> aizsardzības līmeni.',
-'protect-level-autoconfirmed' => 'Bloķēt nereģistētos lietot�jus',
+'protect-text'                => "Šeit var apskatīties un izmainīt lapas '''<nowiki>$1</nowiki>''' aizsardzības līmeni.",
+'protect-locked-access'       => "Jūsu kontam nav tiesību mainīt lapas aizsardzības pak�pi.
+Pašreizējie lapas '''$1''' iestatījumi ir:",
+'protect-default'             => 'Atļaut visiem lietot�jiem',
+'protect-fallback'            => 'Nepieciešama atļauja "$1"',
+'protect-level-autoconfirmed' => 'Bloķēt jauniem un nereģistrētiem lietot�jiem',
 'protect-level-sysop'         => 'Tikai adminiem',
 'protect-cascade'             => "Aizsarg�t šaj� lap� iekļaut�s lapas (veidnes) ''(cascading protection)''",
 'protect-cantedit'            => 'Tu nevari izmainīt šīs lapas aizsardzības līmeņus, t�pēc, ka tur nevari izmainīt šo lapu.',
+'protect-expiry-options'      => '2 stundas:2 hours,1 diena:1 day,3 dienas:3 days,1 nedēļa:1 week,2 nedēļas:2 weeks,1 mēnesis:1 month,3 mēneši:3 months,6 mēneši:6 months,1 gads:1 year,uz nenoteiktu laiku:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Atļauja:',
 'restriction-level'           => 'Aizsardzības līmenis:',
 
@@ -1244,7 +1296,7 @@ Lūdzu, spied \"''back''\" un atjaunini iepriekšējo lapu. Tad mēģini vēlrei
 'undeletepage'             => 'Skatīt un atjaunot dzēst�s lapas',
 'undeletepagetitle'        => "'''Šeit ir [[:$1|$1]] izdzēst�s versijas'''.",
 'viewdeletedpage'          => 'Skatīt izdzēst�s lapas',
-'undeletepagetext'         => 'Šīs lapas ir dzēstas, bet ir saglab�tas arhīv�. T�s ir iespējams atjaunot, bet ņemiet vēr�, ka arhīvs reizēm tiek tīrīts.',
+'undeletepagetext'         => '{{PLURAL:$1|Šī lapa ir dzēsta, bet ir saglab�ta arhīv�. To ir iespējams atjaunot|Šīs $1 lapas ir dzēstas, bet ir saglab�tas arhīv�. T�s ir iespējams atjaunot}}, bet ņemiet vēr�, ka arhīvs reizēm tiek tīrīts.',
 'undeleteextrahelp'        => "Lai atjaunotu visu lapu, atst�j visus ķekšus (pie \"Lapas hronoloģija\") neieķeksētus uz uzspied uz '''''Atjaunot!'''''.
 Lai atjaunotu tikai noteiktas versijas, ieķeksē vajadzīg�s versijas un spied uz '''''Atjaunot!'''''. Uzspiešana uz '''''Notīrīt''''' notīrīs koment�ru lauku un visus keķšus.",
 'undeleterevisions'        => '$1 {{PLURAL:$1|versija|versijas}} {{PLURAL:$1|arhivēta|arhivētas}}',
@@ -1255,7 +1307,7 @@ Ja pēc dzēšanas ir izveidota jauna lapa ar t�du pašu nosaukumu, atjaunot�s
 'undeletehistorynoadmin'   => 'Šī lapa ir tikusi izdzēsta. 
 Dzēšanas iemesls ir redzams apakš�, kopsavilkum�, kop� ar inform�ciju par lietot�jiem, kas bija rediģējuši šo lapu pirs t�s izdzēšanas. 
 Šo izdzēsto versiju teksts ir pieejams tikai administratoriem.',
-'undelete-revision'        => 'Lapas $1 izdzēst� versija (k�da t� bija $2) (autors $3):',
+'undelete-revision'        => 'Lapas $1 izdzēst� versija (k�da t� bija $4, $5) (autors $3):',
 'undeleterevision-missing' => 'Nederīga vai neeksistējoša versija.
 Vai nu tu šeit esi non�cis lietojot kļūdainu saiti, vai arī šī versija jau ir tikusi atjaunota, vai arī t� ir izdzēsta pavisam.',
 'undelete-nodiff'          => 'Netika atrastas iepriekšēj�s versijas.',
@@ -1279,13 +1331,14 @@ k�ds cits iespējams to ir atjaunojis �tr�k.',
 'blanknamespace' => '(Pamatlapa)',
 
 # Contributions
-'contributions' => 'Lietot�ja devums',
-'mycontris'     => 'Mans devums',
-'contribsub2'   => 'Lietot�js: $1 ($2)',
-'nocontribs'    => 'Netika atrastas izmaiņas, kas atbilstu šiem kritērijiem.',
-'uctop'         => '(pēdēj� izmaiņa)',
-'month'         => 'No mēneša (un sen�ki):',
-'year'          => 'No gada (un sen�ki):',
+'contributions'       => 'Lietot�ja devums',
+'contributions-title' => 'Lietot�ja $1 devums',
+'mycontris'           => 'Mans devums',
+'contribsub2'         => 'Lietot�js: $1 ($2)',
+'nocontribs'          => 'Netika atrastas izmaiņas, kas atbilstu šiem kritērijiem.',
+'uctop'               => '(pēdēj� izmaiņa)',
+'month'               => 'No mēneša (un sen�ki):',
+'year'                => 'No gada (un sen�ki):',
 
 'sp-contributions-newbies'     => 'R�dīt jauno lietot�ju devumu',
 'sp-contributions-newbies-sub' => 'Jaunie lietot�ji',
@@ -1298,7 +1351,6 @@ k�ds cits iespējams to ir atjaunojis �tr�k.',
 'whatlinkshere'            => 'Nor�des uz šo rakstu',
 'whatlinkshere-title'      => 'Lapas, kur�s ir saites uz lapu "$1"',
 'whatlinkshere-page'       => 'Lapa:',
-'linklistsub'              => '(Saišu uzskaitījums)',
 'linkshere'                => "Šaj�s lap�s ir nor�des uz lapu '''[[:$1]]''':",
 'nolinkshere'              => "Nevien� lap� nav nor�žu uz lapu '''[[:$1]]'''.",
 'isredirect'               => 'p�radres�cijas lapa',
@@ -1311,61 +1363,62 @@ k�ds cits iespējams to ir atjaunojis �tr�k.',
 'whatlinkshere-filters'    => 'Filtri',
 
 # Block/unblock
-'blockip'              => 'Bloķēt lietot�ju',
-'blockip-legend'       => 'Bloķēt lietot�ju',
-'blockiptext'          => 'Šo veidni izmanto, lai bloķētu k�das IP adreses vai lietot�jv�rda piekļuvi wiki lapu saglab�šanai. Dari to tikai, lai novērstu vand�lismu atbilstoši [[Project:Vadlīnijas|noteikumiem]].
+'blockip'                => 'Bloķēt lietot�ju',
+'blockip-legend'         => 'Bloķēt lietot�ju',
+'blockiptext'            => 'Šo veidni izmanto, lai bloķētu k�das IP adreses vai lietot�jv�rda piekļuvi wiki lapu saglab�šanai. Dari to tikai, lai novērstu vand�lismu atbilstoši [[Project:Vadlīnijas|noteikumiem]].
 Nor�di konkrētu iemeslu (piemēram, linkus uz vandalizētaj�m lap�m).',
-'ipaddress'            => 'IP adrese/lietot�jv�rds',
-'ipadressorusername'   => 'IP adrese vai lietot�jv�rds',
-'ipbexpiry'            => 'Termiņš',
-'ipbreason'            => 'Iemesls',
-'ipbreasonotherlist'   => 'Cits iemesls',
-'ipbreason-dropdown'   => '*Biež�kie bloķēšanas iemesli
+'ipaddress'              => 'IP adrese/lietot�jv�rds',
+'ipadressorusername'     => 'IP adrese vai lietot�jv�rds',
+'ipbexpiry'              => 'Termiņš',
+'ipbreason'              => 'Iemesls',
+'ipbreasonotherlist'     => 'Cits iemesls',
+'ipbreason-dropdown'     => '*Biež�kie bloķēšanas iemesli
 ** Ievieto nepatiesu inform�ciju
 ** Dzēš lapu saturu
 ** Spamo �rēj�s saitēs
 ** Ievieto nesakarīgus simbolus sakopojumus',
-'ipbanononly'          => 'Bloķēt tikai anonīmos lietot�jus',
-'ipbcreateaccount'     => 'Neļaut izveidot lietot�jv�rdu',
-'ipbemailban'          => 'Neļaut lietot�jam sūtīt e-pastu',
-'ipbenableautoblock'   => 'Autom�tiski bloķēt lietot�ja pēdējo IP adresi un jebkuru IP adresi, no kuras šis lietot�js piekļūst šim wiki',
-'ipbsubmit'            => 'Bloķēt šo lietot�ju',
-'ipbother'             => 'Cits laiks',
-'ipboptions'           => '2 stundas:2 hours,1 diena:1 day,3 dienas:3 days,1 nedēļa:1 week,2 nedēļas:2 weeks,1 mēnesis:1 month,3 mēneši:3 months,6 mēneši:6 months,1 gads:1 year,uz nenoteiktu laiku:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'       => 'cits',
-'ipbotherreason'       => 'Cits/papildu iemesls:',
-'ipbwatchuser'         => 'Uzraudzīt šī lietot�ja lietot�ja un lietot�ja diskusijas lapas',
-'badipaddress'         => 'Nederīga IP adrese',
-'blockipsuccesssub'    => 'Nobloķēts veiksmīgi',
-'blockipsuccesstext'   => '[[Special:Contributions/$1|$1]] tika nobloÄ·Ä“ts.<br />
+'ipbanononly'            => 'Bloķēt tikai anonīmos lietot�jus',
+'ipbcreateaccount'       => 'Neļaut izveidot lietot�jv�rdu',
+'ipbemailban'            => 'Neļaut lietot�jam sūtīt e-pastu',
+'ipbenableautoblock'     => 'Autom�tiski bloķēt lietot�ja pēdējo IP adresi un jebkuru IP adresi, no kuras šis lietot�js piekļūst šim wiki',
+'ipbsubmit'              => 'Bloķēt šo lietot�ju',
+'ipbother'               => 'Cits laiks',
+'ipboptions'             => '2 stundas:2 hours,1 diena:1 day,3 dienas:3 days,1 nedēļa:1 week,2 nedēļas:2 weeks,1 mēnesis:1 month,3 mēneši:3 months,6 mēneši:6 months,1 gads:1 year,uz nenoteiktu laiku:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'         => 'cits',
+'ipbotherreason'         => 'Cits/papildu iemesls:',
+'ipbwatchuser'           => 'Uzraudzīt šī lietot�ja lietot�ja un lietot�ja diskusijas lapas',
+'badipaddress'           => 'Nederīga IP adrese',
+'blockipsuccesssub'      => 'Nobloķēts veiksmīgi',
+'blockipsuccesstext'     => '[[Special:Contributions/$1|$1]] tika nobloÄ·Ä“ts.<br />
 Visus blokus var apskatīties [[Special:IPBlockList|IP bloku sarakst�]].',
-'ipb-edit-dropdown'    => 'Izmainīt bloķēšanas iemeslus',
-'ipb-unblock-addr'     => 'AtbloÄ·Ä“t $1',
-'ipb-unblock'          => 'Atbloķēt lietot�ju vai IP adresi',
-'ipb-blocklist-addr'   => 'Skatīt $1 uzliktos, esošos blokus',
-'ipb-blocklist'        => 'Apskatīties esošos blokus',
-'unblockip'            => 'Atbloķēt lietot�ju',
-'unblockiptext'        => 'Šeit var atbloķēt iepriekš nobloķētu IP adresi vai lietot�ja v�rdu (atjaunot viņiem rakstīšanas piekļuvi).',
-'ipusubmit'            => 'AtbloÄ·Ä“t Å¡o adresi',
-'unblocked'            => '[[Lietot�js:$1|$1]] tika atbloķēts',
-'unblocked-id'         => 'Bloks $1 tika noņemts',
-'ipblocklist'          => 'Bloķēt�s IP adreses un lietot�jv�rdi',
-'ipblocklist-username' => 'Lietot�ja v�rds vai IP adrese:',
-'blocklistline'        => '$1 $2 bloķēja $3 (termiņš $4)',
-'expiringblock'        => 'beidzas $1',
-'blocklink'            => 'bloÄ·Ä“t',
-'unblocklink'          => 'atbloÄ·Ä“t',
-'contribslink'         => 'devums',
-'autoblocker'          => 'Tava IP ir nobloķēta autom�tiski, t�pēc, ka to nesen lietojis "[[User:$1|$1]]".
+'ipb-edit-dropdown'      => 'Izmainīt bloķēšanas iemeslus',
+'ipb-unblock-addr'       => 'AtbloÄ·Ä“t $1',
+'ipb-unblock'            => 'Atbloķēt lietot�ju vai IP adresi',
+'ipb-blocklist-addr'     => 'Skatīt $1 uzliktos, esošos blokus',
+'ipb-blocklist'          => 'Apskatīties esošos blokus',
+'ipb-blocklist-contribs' => '$1 devums',
+'unblockip'              => 'Atbloķēt lietot�ju',
+'unblockiptext'          => 'Šeit var atbloķēt iepriekš nobloķētu IP adresi vai lietot�ja v�rdu (atjaunot viņiem rakstīšanas piekļuvi).',
+'ipusubmit'              => 'Noņemt šo bloku',
+'unblocked'              => '[[Lietot�js:$1|$1]] tika atbloķēts',
+'unblocked-id'           => 'Bloks $1 tika noņemts',
+'ipblocklist'            => 'Bloķēt�s IP adreses un lietot�jv�rdi',
+'ipblocklist-username'   => 'Lietot�ja v�rds vai IP adrese:',
+'blocklistline'          => '$1 $2 bloķēja $3 (termiņš $4)',
+'expiringblock'          => 'beidzas $1',
+'blocklink'              => 'bloÄ·Ä“t',
+'unblocklink'            => 'atbloÄ·Ä“t',
+'contribslink'           => 'devums',
+'autoblocker'            => 'Tava IP ir nobloķēta autom�tiski, t�pēc, ka to nesen lietojis "[[User:$1|$1]]".
 Viņa bloķēšanas iemesls bija: "$2"',
-'blocklogpage'         => 'Bloķēšanas reģistrs',
-'blocklogentry'        => 'nobloÄ·Ä“ja [[$1]] uz $2 $3',
-'blocklogtext'         => 'Šaj� lap� ir pēdējo nobloķēto un atbloķēto lietot�ju un IP adrešu saraksts. Te nepar�d�s autom�tiski nobloķēt�s IP adreses.
+'blocklogpage'           => 'Bloķēšanas reģistrs',
+'blocklogentry'          => 'nobloÄ·Ä“ja [[$1]] uz $2 $3',
+'blocklogtext'           => 'Šaj� lap� ir pēdējo nobloķēto un atbloķēto lietot�ju un IP adrešu saraksts. Te nepar�d�s autom�tiski nobloķēt�s IP adreses.
 Šobrīd aktīvos blokus var apskatīties [[Special:IPBlockList|bloķēto lietot�ju un IP adrešu sarakst�]].',
-'ipb_expiry_invalid'   => 'Nederīgs beigu termiņš',
-'ip_range_invalid'     => 'Nederīgs IP diapazons',
-'proxyblocker'         => 'Starpniekservera bloķēt�js',
-'proxyblocksuccess'    => 'Darīts.',
+'ipb_expiry_invalid'     => 'Nederīgs beigu termiņš',
+'ip_range_invalid'       => 'Nederīgs IP diapazons',
+'proxyblocker'           => 'Starpniekservera bloķēt�js',
+'proxyblocksuccess'      => 'Darīts.',
 
 # Move page
 'move-page'               => 'P�rvietot $1',
@@ -1389,6 +1442,8 @@ pirms turpin�šanas vēlreiz p�rdom�, vai tu izproti visas iespējam�s sekas
 
 Ja tomēr vēlēsies, tad tev šī diskusiju lapa būs j�p�rvieto vai j�apvieno pašam.",
 'movearticle'             => 'P�rvietot lapu',
+'movenologin'             => 'Neesi ieg�jis k� reģistrēts lietot�js',
+'movenologintext'         => 'Tev ir j�būt reģistrētam lietot�jam un j�būt [[Special:UserLogin|ieg�jušam]] {{grammar:lokatīvs|{{SITENAME}}}}, lai p�rvietotu lapu.',
 'movenotallowed'          => 'Tev nav tiesību p�rvietot lapas.',
 'newtitle'                => 'Uz š�du lapu',
 'move-watch'              => 'Uzraudzīt šo lapu',
@@ -1419,8 +1474,6 @@ Vai tu to gribi izdzēst, lai atbrīvotu vietu p�rvietošanai?',
 'delete_and_move_reason'  => 'Izdzēsts, lai atbrīvotu vietu parvietošanai',
 'selfmove'                => 'Izejas un mērķa lapu nosaukumi ir vien�di;
 nevar p�rvietot lapu uz sevi.',
-'immobile_namespace'      => "Izejas vai mērķa lapa ir īpaš� lapa;
-nevar p�rvietot lapas no un lapas uz to ''namespaci''.",
 'fix-double-redirects'    => 'Autom�tiski izmainīt visas p�radres�cijas, kas ved uz s�kotnējo nosaukumu',
 
 # Export
@@ -1430,7 +1483,7 @@ nevar p�rvietot lapas no un lapas uz to ''namespaci''.",
 
 Lai eksportētu lapas, šaj� lauk� ievadi to nosaukumus, katr� rindiņ� pa vienam, un izvēlies vai gribi tikai pašreizējo versiju ar inform�ciju par pēdējo izmaiņu, vai arī pašreizējo versiju kop� ar vis�m vecaj�m versij�m un hronoloģiju
 
-Pirmaj� gadījum� var arī lietot š�du metodi, piem., [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] lapai "[[{{MediaWiki:Mainpage}}]]".',
+Pirmaj� gadījum� var arī lietot š�du metodi, piem., [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] lapai "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Iekļaut tikai esošo versiju (bez piln�s hronoloģijas)',
 'exportnohistory'   => "----
 '''Piezīme:''' Lapu eksportēšana kop� ar visu hronoloģiju šobrīd ir atslēgta, jo tas bremzē serveri.",
@@ -1446,36 +1499,38 @@ Pirmaj� gadījum� var arī lietot š�du metodi, piem., [[{{ns:special}}:Expor
 'allmessagesdefault'        => 'S�kotnējais teksts',
 'allmessagescurrent'        => 'Pašreizējais teksts',
 'allmessagestext'           => "Šaj� lap� ir visu \"'''MediaWiki:'''\" lap�s atrodamo sistēmas paziņojumu uzskaitījums.
-Šos paziņojumus var izmainīt tikai admini. Izmainot tos šeit, tie tiks izmainīti tikai šaj� mediawiki instal�cij�. Lai tos izmainītu vis�m p�rēj�m, apskatieties [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] un [http://translatewiki.net Betawiki].",
+Šos paziņojumus var izmainīt tikai admini. Izmainot tos šeit, tie tiks izmainīti tikai šaj� mediawiki instal�cij�. Lai tos izmainītu vis�m p�rēj�m, apskatieties [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] un [http://translatewiki.net translatewiki.net].",
 'allmessagesnotsupportedDB' => "Šī lapa nedarbojas, t�pēc, ka '''wgUseDatabaseMessages''' nedarbojas.",
 'allmessagesfilter'         => 'Paziņojumu nosaukuma filtrs:',
 'allmessagesmodified'       => 'R�dīt tikai izmainītos',
 
 # Thumbnails
-'thumbnail-more' => 'Palielin�t',
-'filemissing'    => 'Trūkst faila',
+'thumbnail-more'  => 'Palielin�t',
+'filemissing'     => 'Trūkst faila',
+'thumbnail_error' => 'Kļūda, veidojot sīktēlu: $1',
 
 # Special:Import
 'import'          => 'Importēt lapas',
+'import-comment'  => 'Koment�rs:',
 'importnosources' => "Tieš� hronoloģijas augšupl�de ir atslēgta. Nav definēts neviens ''Transwiki'' importa avots (''source'').",
 
 # Import log
 'importlogpage' => 'Importēšanas reģistrs',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mana lietot�ja lapa',
+'tooltip-pt-userpage'             => 'Tava lietot�ja lapa',
 'tooltip-pt-anonuserpage'         => 'Manas IP adreses lietot�ja lapa',
-'tooltip-pt-mytalk'               => 'Mana diskusiju lapa',
+'tooltip-pt-mytalk'               => 'Tava diskusiju lapa',
 'tooltip-pt-anontalk'             => 'Diskusija par labojumiem, kas izdarīti no šīs IP adreses',
 'tooltip-pt-preferences'          => 'Manas izvēles',
 'tooltip-pt-watchlist'            => 'Manis uzraudzīt�s lapas.',
-'tooltip-pt-mycontris'            => 'Mani ieguldījumi',
+'tooltip-pt-mycontris'            => 'Tavi ieguldījumi',
 'tooltip-pt-login'                => 'Aicin�m tevi ieiet {{grammar:lokatīvs|{{SITENAME}}}}, tomēr tas nav oblig�ti.',
 'tooltip-pt-anonlogin'            => 'Aicin�m tevi ieiet {{grammar:lokatīvs|{{SITENAME}}}}, tomēr tas nav oblig�ti.',
 'tooltip-pt-logout'               => 'Iziet',
 'tooltip-ca-talk'                 => 'Diskusija par Å¡Ä« raksta lapu',
 'tooltip-ca-edit'                 => 'Izmainīt šo lapu. Lūdzam izmantot pirmskatu pirms lapas saglab�šanas.',
-'tooltip-ca-addsection'           => 'Pievienot koment�ru šai diskusijai.',
+'tooltip-ca-addsection'           => 'S�kt jaunu sadaļu',
 'tooltip-ca-viewsource'           => 'Šī lapa ir aizsarg�ta. Tu vari apskatīties t�s izejas kodu.',
 'tooltip-ca-history'              => 'Šīs lapas iepriekšēj�s versijas.',
 'tooltip-ca-protect'              => 'Aizsarg�t šo lapu',
@@ -1520,7 +1575,7 @@ Pirmaj� gadījum� var arī lietot š�du metodi, piem., [[{{ns:special}}:Expor
 'tooltip-upload'                  => 'S�kt augšupl�di',
 
 # Attribution
-'anonymous'        => 'Anonīmie {{grammar:ģenitīvs|{{SITENAME}}}} lietot�ji(s)',
+'anonymous'        => '{{PLURAL:$1|Anonīmais {{grammar:ģenitīvs|{{SITENAME}}}} lietot�js|Anonīmie {{grammar:ģenitīvs|{{SITENAME}}}} lietot�ji}}',
 'siteuser'         => '{{grammar:ģenitīvs|{{SITENAME}}}} lietot�js $1',
 'lastmodifiedatby' => 'Šo lapu pēdējoreiz izmainīja $3, $2, $1.', # $1 date, $2 time, $3 user
 
@@ -1560,7 +1615,7 @@ To visticam�k izraisīja �rēja saite uz melnaj� sarakst� esošu interneta v
 'show-big-image'       => 'Piln� izmēr�',
 'show-big-image-thumb' => '<small>Šī priekšskata izmērs: $1 × $2 pikseļi</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Jauno attēlu galerija',
 'imagelisttext'         => 'Šobrīd redzams $1 {{PLURAL:$1|attēla|attēlu}} uzskaitījums, kas sak�rtots $2.',
 'newimages-summary'     => 'Šeit var apskatīties pēdējos šeit augšupl�dētos failus.',
@@ -1682,20 +1737,9 @@ Si apstiprinajuma koda deriguma termins ir $4.',
 Lūdzu apstiprini, ka tieš�m gribi izveidot šo lapu no jauna.",
 'recreate'            => 'Izveidot no jauna',
 
-# HTML dump
-'redirectingto' => 'P�radresē uz [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Iztīrīt šīs lapas kešu (''cache'')?
-
-$1",
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Meklēt rakstus, kas satur ''$1''.",
-'searchnamed'      => "Meklēt rakstus ar nosaukumu ''$1''.",
-'articletitles'    => "Raksti, kas s�kas ar ''$1''",
-'hideresults'      => 'Paslēpt rezult�tus',
+'confirm-purge-top'    => "Iztīrīt šīs lapas kešu (''cache'')?",
 
 # Multipage image navigation
 'imgmultipageprev' => '� iepriekšēj� lapa',
diff --git a/languages/messages/MessagesLzz.php b/languages/messages/MessagesLzz.php
new file mode 100644
index 00000000..757afc34
--- /dev/null
+++ b/languages/messages/MessagesLzz.php
@@ -0,0 +1,55 @@
+<?php
+/** Lazuri Nena (Lazuri Nena)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Dato deutschland
+ * @author Ibero-kolxi
+ */
+
+$messages = array(
+# Dates
+'sun'       => 'Mja',
+'mon'       => 'Tut',
+'tue'       => "Ä°k'i",
+'wed'       => 'Cum',
+'thu'       => '3aç',
+'fri'       => 'Obi',
+'sat'       => 'Sab',
+'january'   => "3'anaÄŸani",
+'february'  => "K'undura",
+'march'     => "Mart'i",
+'april'     => "Ap'rili",
+'may_long'  => 'Maisi',
+'june'      => 'MbuliÅŸtuta',
+'july'      => 'X3ala',
+'august'    => 'MaraÅŸina',
+'september' => "St'aroÅŸina",
+'october'   => 'Gumatuta',
+'november'  => 'Çxalva',
+'december'  => "Xrist'ana",
+'jan'       => "3'an",
+'feb'       => "K'un",
+'mar'       => 'Mar',
+'apr'       => "Ap'r",
+'may'       => 'Mai',
+'jun'       => 'Mbul',
+'jul'       => 'X3al',
+'aug'       => 'Mara',
+'sep'       => "St'a",
+'oct'       => 'Gum',
+'nov'       => 'Çxa',
+'dec'       => 'Xri',
+
+'talkpagelinktext' => "disk'uzia",
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite'            => '{{SITENAME}}ÅŸeni',
+'aboutpage'            => 'Project:Ambarepe',
+'copyright'            => 'Content is available under $1.',
+'copyrightpagename'    => '{{SITENAME}} copyright',
+'mainpage'             => "Dudbut'k'a",
+'mainpage-description' => "Dudbut'k'a",
+
+);
diff --git a/languages/messages/MessagesMai.php b/languages/messages/MessagesMai.php
index afd463a6..eed1a12d 100644
--- a/languages/messages/MessagesMai.php
+++ b/languages/messages/MessagesMai.php
@@ -152,8 +152,8 @@ $messages = array(
 'hr_tip'          => 'अक�षांशीय पंक�ति (अल�प उपयोग)',
 
 # Edit pages
-'summary'              => 'सारांश',
-'subject'              => 'विषय/म�ख�यपंक�ति',
+'summary'              => 'सारांश:',
+'subject'              => 'विषय/म�ख�यपंक�ति:',
 'minoredit'            => 'अल�प संपादन',
 'watchthis'            => '�हि पृष�ठके� देखू',
 'showpreview'          => 'पूर�वप�रदर�शन',
@@ -203,7 +203,7 @@ $messages = array(
 'uploadbtn'     => 'फाइल अपलोड',
 'uploadedimage' => 'अपलोड भेल "[[$1]]"',
 
-# Image description page
+# File description page
 'filehist'   => 'फाइल इतिहास',
 'imagelinks' => 'लिंक�स',
 
@@ -221,17 +221,17 @@ $messages = array(
 'alphaindexline' => '$1 to $2',
 
 # Watchlist
-'mywatchlist'         => 'हमर साकांक�ष-सूची',
-'watch'               => 'ताकिमे',
-'unwatch'             => 'छोड़ू',
-'watchlist-hide-bots' => 'न�काऊ संपादित बॉट-नमगर',
+'mywatchlist' => 'हमर साकांक�ष-सूची',
+'watch'       => 'ताकिमे',
+'unwatch'     => 'छोड़ू',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ताकिमे...',
 'unwatching' => 'छोड़ल ...',
 
-# Delete/protect/revert
+# Protect
 'protectlogpage' => 'स�रक�षा लॉग',
+'prot_1movedto2' => '[[$1]] गेल �तय [[$2]]',
 
 # Namespace form on various pages
 'blanknamespace' => '(म�ख�य)',
diff --git a/languages/messages/MessagesMdf.php b/languages/messages/MessagesMdf.php
index 64819ea0..a8bfe421 100644
--- a/languages/messages/MessagesMdf.php
+++ b/languages/messages/MessagesMdf.php
@@ -11,6 +11,72 @@
 
 $fallbak = 'ru';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Медиа',
+	NS_SPECIAL          => 'Башка',
+	NS_TALK             => 'Корхнема',
+	NS_USER             => 'Тии�ь',
+	NS_USER_TALK        => 'Тии�ь_корхнема',
+	NS_PROJECT_TALK     => '$1_корхнема',
+	NS_FILE             => '��йф',
+	NS_FILE_TALK        => '��йф_корхнема',
+	NS_MEDIAWIKI        => 'МедиаВики',
+	NS_MEDIAWIKI_TALK   => 'МедиаВики_корхнема',
+	NS_TEMPLATE         => 'Шаблон',
+	NS_TEMPLATE_TALK    => 'Шаблон_корхнема',
+	NS_HELP             => 'Лезк�',
+	NS_HELP_TALK        => 'Лезк�_корхнема',
+	NS_CATEGORY         => 'Категорие',
+	NS_CATEGORY_TALK    => 'Категорие_корхнема',
+);
+
+$namespaceAliases = array(
+	'Служебна�' => NS_SPECIAL,
+	'Об�уждение' => NS_TALK,
+	'Уча�тник' => NS_USER,
+	'Об�уждение_уча�тника' => NS_USER_TALK,
+	'Об�уждение_{{GRAMMAR:genitive|$1}}' => NS_PROJECT_TALK,
+	'Изображение' => NS_FILE,
+	'Об�уждение_изображени�' => NS_FILE_TALK,
+	'MediaWiki' => NS_MEDIAWIKI,
+	'Об�уждение_MediaWiki' => NS_MEDIAWIKI_TALK,
+	'Шаблон' => NS_TEMPLATE,
+	'Об�уждение_шаблона' => NS_TEMPLATE_TALK,
+	'Справка' => NS_HELP,
+	'Об�уждение_�правки' => NS_HELP_TALK,
+	'Категори�' => NS_CATEGORY,
+	'Об�уждение_категории' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Кафонзаф�тафтфк�не' ),
+	'BrokenRedirects'           => array( 'Синьтьф�тафтфк�не' ),
+	'Watchlist'                 => array( 'Мельгеванома' ),
+	'Recentchanges'             => array( 'УлхкомбаньПолафнематне' ),
+	'Upload'                    => array( 'Тонгома' ),
+	'Listfiles'                 => array( '��йфК�рьк�' ),
+	'Newimages'                 => array( 'Од��йфне' ),
+	'Listusers'                 => array( 'ЛувомТиихне' ),
+	'Statistics'                => array( 'Стати�тик' ),
+	'Randompage'                => array( 'Кодама пов�ь', 'Кодама пов�ь лопа' ),
+	'Lonelypages'               => array( 'СькамоньЛопат', 'УрозЛопат' ),
+	'Uncategorizedpages'        => array( '�пак категори�фттЛопат' ),
+	'Uncategorizedcategories'   => array( '�пак категори�фттКатегориет' ),
+	'Uncategorizedimages'       => array( '�пак категори�фтт��йфт' ),
+	'Uncategorizedtemplates'    => array( '�пак категори�фттШаблотт' ),
+	'Unusedcategories'          => array( '�пак нолдак тев�Категориет' ),
+	'Unusedimages'              => array( '�пак нолдак тев���йфне' ),
+	'Wantedpages'               => array( 'ВешевиЛопат', 'СиньтьфСюлмафк�т' ),
+	'Wantedcategories'          => array( 'ВешевиКатегориет' ),
+	'Newpages'                  => array( 'ОдЛопат' ),
+	'Ancientpages'              => array( 'КунардоньЛопат' ),
+	'Protectedpages'            => array( '�ралафЛопат' ),
+	'Protectedtitles'           => array( '�ралафКон�к�т' ),
+	'Allpages'                  => array( 'СембеЛопат' ),
+	'Prefixindex'               => array( 'Валынгольк�Индек�' ),
+	'Specialpages'              => array( 'БашкаЛопат' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Сюлмафк�нень алга китьк�там�:',
@@ -49,16 +115,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'К�шем� монь петнематне ванома лопа�та',
 'tog-watchlisthidebots'       => 'К�шем� bot петнематне ванома лопа�та.',
 'tog-watchlisthideminor'      => 'К�шем� петнема анц�йн�тне ванома лопа�та',
+'tog-watchlisthideliu'        => 'К�шем� �ёрматфтф тиихнень петнема�нон мельгеванома�а',
+'tog-watchlisthideanons'      => 'К�шем� лемфтома тиихнень петнема�нон мельгеванома�а',
 'tog-ccmeonemails'            => 'Кучт тейне копи� �лектрононь �ермане конатнень куч�айне ил� тиихненди.',
 'tog-diffonly'                => 'Т�т н�фте лопань потмоц кафта верзи�тнень вак�� путомать ала',
 'tog-showhiddencats'          => '��фтем� к�шф категориет',
+'tog-norollbackdiff'          => 'М�ндем� верзиеть потафтомать меле',
 
 'underline-always'  => 'Фалу',
 'underline-never'   => 'Мъз�рдонга',
 'underline-default' => 'Интернет полатк�ть кадом� апак полафтт',
 
-'skinpreview' => '(Ва�ень н�фтема)',
-
 # Dates
 'sunday'        => 'Таргжи (�едл�ши)',
 'monday'        => 'Видеши (Панедельник)',
@@ -152,14 +219,14 @@ $messages = array(
 'mytalk'         => 'Монь корхтамазе',
 'anontalk'       => 'Корхтам� т� IP-ть мархта',
 'navigation'     => '�авигацие',
-'and'            => '�ди',
+'and'            => '&#32;�ди',
 
 # Metadata in edit box
 'metadata_help' => 'Метадата:',
 
 'errorpagetitle'    => 'Эльб�тьк�',
 'returnto'          => 'Мърдам� $1-�.',
-'tagline'           => '{{SITENAME}}-�та',
+'tagline'           => '{{SITENAME}}�та',
 'help'              => 'Лезк�',
 'search'            => 'Вешендем�',
 'searchbutton'      => 'Вешентьк',
@@ -189,14 +256,14 @@ $messages = array(
 'talkpagelinktext'  => 'Корхтама',
 'specialpage'       => 'Башка тевонь лопа',
 'personaltools'     => 'Э�ь к�дьёнк�т',
-'postcomment'       => 'Кучем� арь�емат',
+'postcomment'       => 'Од пакш',
 'articlepage'       => 'Ваном� потмак�лопать',
 'talk'              => 'Корхнема',
 'views'             => 'Ванфт',
 'toolbox'           => 'К�дьёнк� к�рьк�',
 'userpage'          => 'Ваном� тиить лопанц',
 'projectpage'       => 'Ваном� проектть лопанц',
-'imagepage'         => 'Ваном� медиа лопать',
+'imagepage'         => 'Ваном� файлонь лопать',
 'mediawikipage'     => 'Ваном� �ёрма лопать',
 'templatepage'      => 'Ваном� кепотьк� лопать',
 'viewhelppage'      => 'Ваном� лезк� лопать',
@@ -215,8 +282,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} колга',
 'aboutpage'            => 'Project:Колга',
-'bugreports'           => 'Эльб�тьк� колга пачфтемат',
-'bugreportspage'       => 'Project:Эльб�тьк� колга пачфтемат',
 'copyright'            => 'Сёрматф�ь ули кода мум� $1-�а.',
 'copyrightpagename'    => '{{SITENAME}} копи�ма видек�',
 'copyrightpage'        => '{{ns:project}}:Копи�ма видек�т',
@@ -239,15 +304,13 @@ $messages = array(
 
 'badaccess'        => 'М�рьговома �льб�тьк�',
 'badaccess-group0' => 'Тондейть аф м�рьгови тием� �� мезе тон вешеть.',
-'badaccess-group1' => 'Тев�ь тон вешеть м�рьгови тием� аньцек полга $1-ть тиихненди.',
-'badaccess-group2' => 'Тев�ь тон вешить м�рьгови тием� аньцек фк� полгань тиихненди $1ть полгатнень ётк�а.',
-'badaccess-groups' => 'Тев�ь тон вешеть м�рьгови тием� аньцек фк� полгань тиихненди  $1-ть полгатнень йотк�а.',
+'badaccess-groups' => 'Тев�ь тон вешеть м�рьгови тием� аньцек {{PLURAL:$2|полгань|фк� полга�та}} тиихненди: $1.',
 
 'versionrequired'     => 'Эр�ви МедиаВикить верзиенц $1',
 'versionrequiredtext' => 'Т� лопать панжеманцты �р�вк�ты МедиаВикить верзие $1. Ванк [[Special:Version|верзиень лопа�ь]].',
 
 'ok'                      => 'OK',
-'retrievedfrom'           => '"$1"-�та ��вф',
+'retrievedfrom'           => '"$1"�та ��вф',
 'youhavenewmessages'      => 'Тонь ули $1 ($2).',
 'newmessageslink'         => 'Од �ёрмат',
 'newmessagesdifflink'     => 'мекольце полафтома',
@@ -255,6 +318,8 @@ $messages = array(
 'editsection'             => 'петнем�',
 'editold'                 => 'петнем�',
 'viewsourceold'           => 'ли�ьма ваном�',
+'editlink'                => 'петнем�',
+'viewsourcelink'          => 'ваном� ли�ьмоть',
 'editsectionhint'         => 'Петем� п�льк�: $1',
 'toc'                     => 'Лопань потмоц',
 'showtoc'                 => 'н�фтем�',
@@ -269,7 +334,7 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom лини�',
 'page-rss-feed'           => '"$1" RSS лини�',
 'page-atom-feed'          => '"$1" Atom лини�',
-'red-link-title'          => '$1 (нинге аф �ёрматф)',
+'red-link-title'          => '$1 (�тама лопа�ь аш)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Лопа',
@@ -285,7 +350,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Т�нь тием� аш кода',
-'nosuchactiontext'  => '�ш кода морафтом� т� URL-�а �ёрматф кошардоматне Викить програматнень вельде.',
+'nosuchactiontext'  => 'Т� URL адре��ь аф конд��ти.
+Улема, тон �льб�деть URL адре�ть �ёрмадом�та, �ли кочкать аф конд��ти �юлмафк�.
+Ш�тьта ули �льб�тк� {{SITENAME}}ть програм�а.',
 'nosuchspecialpage' => 'Стама башка лопа аш',
 'nospecialpagetext' => "<big>'''�ш �тама башка лопа.'''</big>
 
@@ -338,7 +405,6 @@ $1',
 'cannotdelete'         => 'Лопа�ь �ли кочкаф файл�ь аф нардави. (Сон, улема, нардафоль инголе.)',
 'badtitle'             => '�ф конд��ти лем',
 'badtitletext'         => 'Вешф лопань лемоц аф т�фтама �ли шава, ш�тьта к�лень-ётка �ли викинь-ётка лем�на аф лац �юлмафт. Сонь ��а, улема ащи фк� �ли ��да лама башка т�штьк�тт конат кон�к�онди аф конд��тихть.',
-'perfdisabled'         => 'Уж�льк�! Т� тев�ь аф тиеви мъз�рошка пинг� ��� ме� �он лоткафни датабазать �ди киндиге аш кода �онь мархта �отнем�.',
 'perfcached'           => 'Вешф програмонь информацие�ь �ёрматфоль ��лек ванфневи файлхнень ��а ди, улема, �ирелгод�ь.',
 'perfcachedts'         => 'Т� програмонь информацие�ь �ёрматфоль ��лек ванфневи файлхнень ��а ди мекольцеда одонзаф $1.',
 'querypage-no-updates' => 'Т� лопать одонзапне т�ни аф тиевихть. Информацие�ь т��а т�ни аф одонзави.',
@@ -352,7 +418,7 @@ $1',
 'protectedpagetext'    => 'Т� лопа� �увама п�к�таф лопань петнема кардамать �юнеда.',
 'viewsourcetext'       => 'Тейть ули кода ваном� �ди копи�м� т� лопать ли�ьмоц:',
 'protectedinterface'   => 'Т� лопа�а ащи лопать ванфонц програмонь тек�тоц, �он п�к�таф кальд�в тевда араламать �юнеда.',
-'editinginterface'     => "'''Инголе кардама:''' Тон петне�ак лопать конань ��а ащи лопать ванфонц програмонь тек�тоц. Петнематне полафт�азь �онь ванфоц кода �он н�еви ил� тиихненди. �тафтома тиеманк�а �н�льтт�ма ваном� [http://translatewiki.net/wiki/Main_Page?setlang=mdf Betawiki] МедиаВикить локализациеть проектть.",
+'editinginterface'     => "'''Инголе кардама:''' Тон петне�ак лопать конань ��а ащи лопать ванфонц програмонь тек�тоц. Петнематне полафт�азь �онь ванфоц кода �он н�еви ил� тиихненди. �тафтома тиеманк�а �н�льтт�ма ваном� [http://translatewiki.net/wiki/Main_Page?setlang=mdf translatewiki.net] МедиаВикить локализациеть проектть.",
 'sqlhidden'            => '(SQL вешфк� к�шф)',
 'cascadeprotected'     => 'Т� лопать аралазь петнемада ��� ме� �он �увафни {{PLURAL:$1|�ай лопа�, кона путфоль|�ай лопа�, конат путфольхть}} ка�кад аралама�:
 $2',
@@ -363,14 +429,14 @@ $2',
 Туфтал�ь ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => '�ф конд��ти конфигурацие�ь: аф �одаф виру�онь вешендема програм�ь: <i>$1</i>',
+'virus-badscanner'     => "�ф конд��ти конфигурацие�ь: аф �одаф виру�онь вешендема програм�ь: ''$1''",
 'virus-scanfailed'     => 'програмонь вешендема�ь изь ли�е (code $1)',
 'virus-unknownscanner' => 'аф �одаф антивиру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Тиить ли�ема',
-'logouttext'                 => '<strong>Тон ли�еть.</strong><br />
-Тондейть ули кода ащем� {{SITENAME}}�а апак �одак �ли [[Special:UserLogin|�увак тага ве�ть]] кода ��ка �ли ил� тии�ь. Кой-кона лопатне ил�д�ть �тамк� кодамк� �инь уль�ть тонь ли�емада инголе мъз�р� тонь интернет полатк�це изь ару�фтов ��ь ванфневи файлхнень �зда.',
+'logouttext'                 => "'''Тон ли�еть.'''<br />
+Тондейть ули кода ащем� {{SITENAME}}�а апак �одак �ли [[Special:UserLogin|�увак тага ве�ть]] кода ��ка �ли ил� тии�ь. Кой-кона лопатне ил�д�ть �тамк� кодамк� �инь уль�ть тонь ли�емада инголе мъз�р� тонь интернет полатк�це изь ару�фтов ��ь ванфневи файлхнень �зда.",
 'welcomecreation'            => '== Сувак, $1! ==
 
 Тонь �ёрматфтомаце анок. Т�т юк�та полафнем� ��ь [[Special:Preferences|{{SITENAME}} латцематне]].',
@@ -381,7 +447,6 @@ $2',
 'remembermypassword'         => 'Ванфтом� монь �увама лемозе т� �одама машина�а',
 'yourdomainname'             => 'Тонь доменце:',
 'externaldberror'            => 'Ли��ь �льб�тьк� ушеширень датабазонь вельде кемок�такшнембачк �ли тондейть аф м�рьгови полафнем� тонь ушеширень �ёрматфтомацень.',
-'loginproblem'               => '<b>Тии�ь аф �одаф.</b><br />',
 'login'                      => 'Сувама',
 'nav-login-createaccount'    => 'Сувама / �ёрматфтома',
 'loginprompt'                => 'Тондейть �р�ви нолдам� тев� cookies {{SITENAME}}� �уваманди.',
@@ -405,7 +470,8 @@ $2',
 'yourlanguage'               => 'К�ль:',
 'yournick'                   => 'Э�ь т�шк�тама:',
 'badsig'                     => '�ф конд��ти каз�ма к�дьт�шк�оце; ванк HTML т�штьк�не.',
-'badsiglength'               => 'Т�шк�тама�ь п�к кувака; аф �р�ви путом� $1 {{PLURAL:$1|т�шк�та|т�шк�та}} лама.',
+'badsiglength'               => 'Тонь т�шк�тамаце п�к кувака.
+�ф �р�ви путом� $1 {{PLURAL:$1|т�шк�та|т�шк�та}} лама.',
 'email'                      => 'Электрононь адре�це',
 'prefs-help-realname'        => '�фкук�онь лемце путома�ь аф лувови �р�вик�. �фкук�онь лемцень т�зк путомада меле тонь лемце кармай �вондама лопа�а тонь петнемацень ала.',
 'loginerror'                 => 'Сувама �льб�тьк�',
@@ -416,7 +482,9 @@ $2',
 'noname'                     => 'Тон изеть пута кемок�таф тиить лемоц.',
 'loginsuccesstitle'          => 'Сувама�ь ёта�ь лац',
 'loginsuccess'               => "'''Тон �увать {{SITENAME}}-� кода \"\$1\".'''",
-'nosuchuser'                 => 'Тии�ь "$1" лем�а аш. Ванк, улема, тон �ёрмадыть лемть аф лац ил�к� тондейть �р�ви [[Special:UserLogin/signup|�ёрматфтом� одук�]].',
+'nosuchuser'                 => 'Тии�ь "$1" лем�а аш.
+Ванк, улема, тон �ёрмадыть лемть аф лац.
+Ил�к� тондейть �р�ви [[Special:UserLogin/signup|�ёрматфтом� одук�]].',
 'nosuchusershort'            => 'Тии�ь "<nowiki>$1</nowiki>" лем�а аш. Ванк, улема, тон �ёрмадыть лемть аф лац.',
 'nouserspecified'            => 'Тиить лем�ь �р�ви.',
 'wrongpassword'              => 'Сувама вал�ь �ёрматф аф лац. Варжак тага ве�ть.',
@@ -438,8 +506,9 @@ $2',
 'throttled-mailpassword'     => 'Сувама вал�ь кучфоль ни ётай {{PLURAL:$1|ой�та (ча��та)|$1 ой�та (ча��та)}}.
 Куч�еви аньцек фк� �увама вал�ь {{PLURAL:$1|ой� (ча��)|$1 ой� (ча��)}} кальд�в тиемада аралама туфталонк�а.',
 'mailerror'                  => 'Электрононь �ёрма кучема �льб�тьк�: $1',
-'acct_creation_throttle_hit' => 'Уж�льк�, тон тиеть ни $1 �ёрматфтомат. �ф маштови тием� ��да лама.',
-'emailauthenticated'         => 'Тонь �лектрононь адре�це кемок�таф $1-�а.',
+'acct_creation_throttle_hit' => 'Т� Вики�а тонь IP адре��та �афне ти�ть {{PLURAL:$1|1 �ёрматфтома|$1 �ёрматфтомат}} ётай шин�, т� мак�имум мъз�ра м�рьгови тием� т� пингеётк�та. 
+С��, т� IP адре��та �афненди т�ни аш кода тием� фк�вок �ёрматфтома.',
+'emailauthenticated'         => 'Тонь �лектрононь адре�це кемок�таф $2-�та $3-�та.',
 'emailnotauthenticated'      => 'Тонь �лектрононь адре�це нинге изь кемок�та. Викить �ёрматнень кор�� програмти кодамога �ёрмат аф кучевихть.',
 'noemailprefs'               => 'Мъз�р� тон ашеть пута тонь �лектрононь адре�це Викить �ёрматнень кор�� програм�ь кодамога �ёрмат аф куч�ыне.',
 'emailconfirmlink'           => 'Кемок�так тонь �лектрононь адре�це',
@@ -450,17 +519,25 @@ $2',
 'createaccount-text'         => 'Кати-кие тизе �ёрматфтома�ь $2 {{SITENAME}} ($4)-�а. "$2" -ть �увама вал�ь "$3". Тондейть �р�ви �увам� тозк �ди арафтом� од �увама валть.
 
 Уленд�р�ль т� �ёрматфтома�ь �льб�тьк�ок� мезеге т�т тие.',
+'login-throttled'            => 'Тон вельф ламо� т�р�фн�т �увам� т� �увама валть вельде. Эн�льтт�ма, учт аф ламо� �ди т�р�фтт тага ве�ть.',
 'loginlanguagelabel'         => 'К�ль: $1',
 
 # Password reset dialog
-'resetpass'               => 'Сёрматфтомать �увама вал�ь полафнема',
-'resetpass_announce'      => 'Тон �увать ёткопингонь �увама валть вельде кона �а�ь �лектрононь адре�озот. Сувама аделаманди тондейть �р�ви путом� т�зк од �увама вал:',
-'resetpass_header'        => 'Полафтом� �увама валцень',
-'resetpass_submit'        => '�рафтк �увама валть �ди �увак',
-'resetpass_success'       => 'Тонь �увама валцень полафнема�ь ёта�ь лац! Тонь �увафтт�д�зь �и�тем�...',
-'resetpass_bad_temporary' => '�ф конд��ти ётконь �увама вал�ь. Ш�тьта �онь полафтыть ни �ли кучить тага фк� вешфк� од �увама валть кундаманк�а.',
-'resetpass_forbidden'     => 'Сувама валхнень полафтом� аш кода',
-'resetpass_missing'       => 'Форм�а дата аш.',
+'resetpass'                 => 'Полафтом� �увама валцень',
+'resetpass_announce'        => 'Тон �увать ёткопингонь �увама валть вельде кона �а�ь �лектрононь адре�озот. Сувама аделаманди тондейть �р�ви путом� т�зк од �увама вал:',
+'resetpass_header'          => 'Полафтом� �увама валцень',
+'oldpassword'               => 'Сире �увама вал:',
+'newpassword'               => 'Од �увама вал:',
+'retypenew'                 => 'Сёрматк од �увама вал омбоцек�:',
+'resetpass_submit'          => '�рафтк �увама валть �ди �увак',
+'resetpass_success'         => 'Тонь �увама валцень полафнема�ь ёта�ь лац! Тонь �увафтт�д�зь �и�тем�...',
+'resetpass_bad_temporary'   => '�ф конд��ти ёткопингонь �увама вал�ь. Ш�тьта �онь полафтыть ни �ли кучить тага фк� вешфк� од �увама валть кундаманк�а.',
+'resetpass_forbidden'       => 'Сувама валхнень полафтом� аш кода',
+'resetpass-no-info'         => 'Тондейть �р�ви �ёрматфтом� т� лопа� виде�та �уваманди.',
+'resetpass-submit-loggedin' => 'Полафтом� �увама валцень',
+'resetpass-wrong-oldpass'   => '�ф виде ёткопингонь �ли т�ниень �увама вал�ь. 
+Улема тон полафтыть �увама валце ни �ли кучеть вешфк� од ёткопингонь �увама вал кундаманк�а.',
+'resetpass-temp-password'   => 'Пингонь �увама вал�ь:',
 
 # Edit page toolbar
 'bold_sample'     => 'Эчке �ёрмадома',
@@ -483,8 +560,8 @@ $2',
 'hr_tip'          => 'Турк� китьк� (тев� нолдам� ванфтозь)',
 
 # Edit pages
-'summary'                          => '�юрьхк�н� лихтема',
-'subject'                          => 'Тема/кон�к�',
+'summary'                          => '�юрьхк�н� лихтема:',
+'subject'                          => 'Тема/кон�к�:',
 'minoredit'                        => 'Т� ёмлан� видептема',
 'watchthis'                        => 'Ваном� т� лопать мельге',
 'savearticle'                      => 'Ванфтом� лопать',
@@ -496,8 +573,8 @@ $2',
 'missingsummary'                   => "'''Л�тфтама:''' Тон изеть мак�а петнемацень колга нюрьхк�н� лихтема�ь. Люпштанд�р�т \"Ванфтом� лопать\" тага ве�ть, тонь полафнематне кармайхть ванфтфт м�льполатк�фтома.",
 'missingcommenttext'               => 'Путт тонь арь�ематне (м�льполатк�оце) алу.',
 'missingcommentheader'             => "'''Л�тфтама:''' Тон изеть мак�а тема/кон�к� т� м�льполатк�ти. Люпштанд�р�т \"Ванфтом� лопать\" тага ве�ть, тонь полафнематне кармайхть ванфтфт м�льполатк�фтома.",
-'summary-preview'                  => '�юрьхк�н� лихтемать ��дынголень  н�фтема',
-'subject-preview'                  => 'Тема/кон�к� ��дынгольдень н�фтема',
+'summary-preview'                  => '�юрьхк�н� лихтемать ��дынголень  н�фтема:',
+'subject-preview'                  => 'Тема/кон�к� ��дынгольдень н�фтема:',
 'blockedtitle'                     => 'Тиить �ёлгозь',
 'blockedtext'                      => '\'\'\'Тонь тиить лемцень �ли IP адре�цень �ёлгозь.\'\'\'</big>
 
@@ -550,30 +627,33 @@ $2',
 'anontalkpagetext'                 => "----''Т� корхтама лопать тизе лемфтома тии�ь кона нинге аф �ёрматфтф �ли кона ��ь �ёрматфтома� аф кунци. Т��а минь нолдам� �онь лувомт�шк�нень IP адре�онц тиить �одафтоманк�а. 
 Т� IP адре�ть вельде ули кода �ашендом� ил� тиихненди. 
 Ул�нд�р�йхть ил� тиинь м�льполатк�онза конатнень аф видек�та лувозь тоннек�, тондейть пароль �ай пинг�та [[Special:UserLogin/signup|�ёрматфтом�/�увам�]] ил� лемфтома тиихнень мар� аф шовореманк�а.''",
-'noarticletext'                    => 'Т�ни аш тек�т т� лопа�а, тондейть ули кода [[Special:Search/{{PAGENAME}}|вешендем� т� лопать кон�к�онц]] ил� лопава �ли [{{fullurl:{{FULLPAGENAME}}|action=edit}} кармам� т� лопать тиема].',
+'noarticletext'                    => 'Т�ни аш тек�т т� лопа�а. 
+Тондейть ули кода [[Special:Search/{{PAGENAME}}|вешендем� т� лопать кон�к�онц]] ил� лопава,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} вешендем� малады лувомава],
+�ли [{{fullurl:{{FULLPAGENAME}}|action=edit}} петнем� т� лопать]</span>.',
 'userpage-userdoesnotexist'        => 'Сёрматфтома�ь «$1» лем�а аш. �рь�ек лацка�та, афкук� тонь уленд�р�й м�льце тием� �ли полафтом� т� лопать.',
 'clearyourcache'                   => "'''Шарфтк м�льце:''' Ванфтомада меле од полафнематнень ваноманк�а тондейть �р�ви нардам� ��лек ванфневи файлхнень тонь интернет полатк�онь вальма�тонза. '''Mozilla / Firefox / Safari:''' ''Shift'' кирдезь, люпштак ''Reload'', �ли люпштак ''Ctrl-Shift-F5'' �ли ''Ctrl-R'' (''Command-Shift-R'' Macintosh машина�а); '''Konqueror: '''люпштак ''Reload'' �ли люпштак ''F5;'' '''Opera:''' програм�а тондейть �р�вк�ты нардам� �ембе ��лек ванфневи файлхт  ''Tools→Preferences'' вельде; '' '''Internet Explorer:''' ''Ctrl'' кирдезь люпштакшнек ''Refresh'' �ли люпштак ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>М�лень мак�ома:</strong> Ванфтомада инголе нолдак тев� 'Ва�ень н�фтема' пун�ть тонь од CSS �ли JS файлть варжаманк�а.",
+'usercssjsyoucanpreview'           => "'''М�лень мак�ома:''' Ванфтомада инголе нолдак тев� 'Ва�ень н�фтема' пун�ть тонь од CSS �ли JS файлть варжаманк�а.",
 'usercsspreview'                   => "Киртть м�ль�от т� аньцек тонь CSS файлцень ва�ень н�фтемац. Сон нинге изь ванфтов!'''",
 'userjspreview'                    => "'''Киртть м�ль�от т� аньцек тонь JavaScript файлть варжама�ь/ва�ень н�фтема�ь, �он нинге изь ванфтов!'''",
 'userinvalidcssjstitle'            => "'''Инголе м�рьгома:''' �ш тема файл \"\$1\" мазопнеманк�а. Киртть м�ль�от .css �ди .js лопа� путови аньцек ёмла т�шк�а кон�к�не, кепотьк�онди {{ns:user}}:Foo/лем.css афи {{ns:user}}:Foo/Лем.css.",
 'updated'                          => '(Одонзаф)',
-'note'                             => '<strong>Шарфтк м�льце:</strong>',
-'previewnote'                      => '<strong>Т� аньцек ва�ень н�фтема�ь; полафнематне нинге и�ть ванфтов!</strong>',
+'note'                             => "'''Шарфтк м�льце:'''",
+'previewnote'                      => "'''Т� аньцек ва�ень н�фтема�ь; полафнематне нинге и�ть ванфтов!'''",
 'previewconflict'                  => 'Тек�т�ь т� ва�ень н�фтема�а н�фтеви в�рдень петнема пак���а �тамк� кодамк� �он н�еволь ванфтомада меле.',
-'session_fail_preview'             => '<strong>�ш кода тонь петнемаце �увафтом� мекольце информациень юмафтомать �юнеда.
+'session_fail_preview'             => "'''�ш кода тонь петнемаце �увафтом� мекольце информациень юмафтомать �юнеда.
 Тик одук�. 
-Тага ли�ентьфт�р�й - [[Special:UserLogout|ли�ть]] лопа�та ди �увак тага ве�ть.</strong>',
-'session_fail_preview_html'        => "<strong>Уж�льк�! �ш кода тонь петнемацень �увафтом� мекольце информациень юмафтомать �юнеда.</strong>
+Тага ли�ентьфт�р�й - [[Special:UserLogout|ли�ть]] лопа�та ди �увак тага ве�ть.'''",
+'session_fail_preview_html'        => "'''Уж�льк�! �ш кода тонь петнемацень �увафтом� мекольце информациень юмафтомать �юнеда.'''
 
 ''{{SITENAME}}�а м�рьгови каз�ма HTML формат�ь, ва�ень н�фтема�ь к�шф JavaScript програпть зи�нда аралама туфталонк�а.''
 
-<strong>Уленд�р�ль т� петнема�ь м�рьговик�, �н�льтт�ма т�нь тием� одук�. 
-Тага ли�ентьфт�р�й - [[Special:UserLogout|ли�ть]] лопа�та ди �увак тага ве�ть.</strong>",
-'token_suffix_mismatch'            => '<strong>Тонь петнемацень кардазь ��� ме� тонь програмце аф лац н�фне�ы китьк�к� т�шк�не петнема пак��ть ��а. Петнемаце кардазь тек�тть араламанк�а. Стама колавома ли�еви интернет лемфтома ётка �кай �ерверонь �зда конань �кама�а уль�ть �льб�тьк�т.</strong>',
+'''Уленд�р�ль т� петнема�ь м�рьговик�, �н�льтт�ма т�нь тием� одук�. 
+Тага ли�ентьфт�р�й - [[Special:UserLogout|ли�ть]] лопа�та ди �увак тага ве�ть.'''",
+'token_suffix_mismatch'            => "'''Тонь петнемацень кардазь ��� ме� тонь програмце аф лац н�фне�ы китьк�к� т�шк�не петнема пак��ть ��а. Петнемаце кардазь тек�тть араламанк�а. Стама колавома ли�еви интернет лемфтома ётка �кай �ерверонь �зда конань �кама�а уль�ть �льб�тьк�т.'''",
 'editing'                          => 'Петнем� $1',
 'editingsection'                   => 'Петнем� $1 (п�льк�)',
-'editingcomment'                   => 'Петнем� $1 (м�льполатк�)',
+'editingcomment'                   => 'Петнем� $1 (од пакш)',
 'editconflict'                     => 'Петнема �льб�тьк�: $1',
 'explainconflict'                  => "Кати-кие т� лопать полафтозе мъз�р� тон �онь петнить.
 В�рдень пак���а тон н�й�ак тек�тть �тамк� конак� �он кармай н�еви «Ванфтом� лопа» пун�ть люпштамда меле.
@@ -582,25 +662,27 @@ $2',
 '''�ньцек''' в�рдень пак���тонь тек�тть ванфтови \"Ванфтом� лопа\" пун�ть люпштамда меле\".",
 'yourtext'                         => 'Тонь тек�тце',
 'storedversion'                    => 'Ванфтф верзие',
-'nonunicodebrowser'                => '<strong>И�ГОЛЕ К�РД�М�: Тонь интернет полатк�це аф кирдь�ы Unicode. Лопань петем�та �ембе аф-ASCII т�штьк�не кармайхть арама �инь кемготувонькърда луфк�ок�.</strong>',
-'editingold'                       => '<strong>И�ГОЛЕ К�РД�М�: Тон петне�ак лопать �ирелготф верзиенц.
-Сембе полафнематне тифт т� верзиеда меле кармайхть юмафтома.</strong>',
+'nonunicodebrowser'                => "'''И�ГОЛЕ К�РД�М�: Тонь интернет полатк�це аф кирдь�ы Unicode. Лопань петем�та �ембе аф-ASCII т�штьк�не кармайхть арама �инь кемготувонькърда луфк�ок�.'''",
+'editingold'                       => "'''И�ГОЛЕ К�РД�М�: Тон петне�ак лопать �ирелготф верзиенц.
+Сембе полафнематне тифт т� верзиеда меле кармайхть юмафтома.'''",
 'yourdiff'                         => 'Мезь�а �вовихть',
-'copyrightwarning'                 => 'Эн�льтт�ма, шарфтк м�льце ��нь ланг�, ме� �ембе поладоматне ди полафтоматне {{SITENAME}}-� лувовихть нолдафок� $2 кор�� (ванк $1). Улефт�р�й м�льце тонь �ёрмадоматнень петнелезь �еди апак мар�к �ди �радолезь �рь кодама ва�това, т�за �инь т�т путне.<br />
+'copyrightwarning'                 => "Эн�льтт�ма, шарфтк м�льце ��нь ланг�, ме� �ембе поладоматне ди полафтоматне {{SITENAME}}-� лувовихть нолдафок� $2 кор�� (ванк $1). Улефт�р�й м�льце тонь �ёрмадоматнень петнелезь �еди апак мар�к �ди �радолезь �рь кодама ва�това, т�за �инь т�т путне.<br />
 Тон �тане ина мак�ат вал ��нь колга ме� �ембе тонь �ёрмадоматне тиить тонць �ли �инь ��вить мар�тонь �ли ил� панжада ли�ьма�та.
-<strong>ТЯТ СУВ�Ф�Е КОПИЯМ� ВИДЕКСС� �Р�Л�Ф М�ТЕРИ�ЛХТ МЯРЬГОМ�ФТОМ�!</strong>',
-'copyrightwarning2'                => 'Эн�льтт�ма, шарфтк м�льце ��нь ланг�, ме� �ембе поладоматне {{SITENAME}} лопа�а улихть кода петем� �ли нардам� ил� тиихненди.
+'''ТЯТ СУВ�Ф�Е КОПИЯМ� ВИДЕКСС� �Р�Л�Ф М�ТЕРИ�ЛХТ МЯРЬГОМ�ФТОМ�!'''",
+'copyrightwarning2'                => "Эн�льтт�ма, шарфтк м�льце ��нь ланг�, ме� �ембе поладоматне {{SITENAME}} лопа�а улихть кода петем� �ли нардам� ил� тиихненди.
 Улефт�р�й м�льце тонь �ёрмадоматнень петнелезь, т�за �инь т�т путне.<br />
 Тон �тане ина мак�ат вал ��нь колга ме� �ембе тонь �ёрмадоматне тиить тонць �ли �инь ��вить мар�тонь �ли ил� панжада ли�ьма�та. (ванк $1).<br />
-<strong>ТЯТ СУВ�Ф�Е КОПИЯМ� ВИДЕКСС� �Р�Л�Ф М�ТЕРИ�ЛХТ МЯРЬГОМ�ФТОМ�!</strong>',
-'longpagewarning'                  => '<strong>И�ГОЛЕ К�РД�М�: Т� лопать кувалмоц $1 килобайтт; кодамога интернет полатк�онь вальмава �така�та петнем� лопат 32 килобайтти мала �ли ��да кувака.
-Эн�льтт�ма, арь�ек уленд�р�й кода лопать �вфтом� ��да ёмла п�льк�ова.</strong>',
-'longpageerror'                    => '<strong>ЭЛЬБЯТЬКС: Тонь тек�тцень кувалмоц $1 килобайтт, т� мак�имупть $2 килобайтта лама. Сонь аш кода ванфтом�.</strong>',
-'readonlywarning'                  => '<strong>И�ГОЛЕ К�РД�М�: датабаза�ь п�к�таф петема покаматнень �юнеда, т� пинг�та тондейть аш кода ванфтом� тонь петнематнень. Ш�тьта тондейть пароль �инь ванфтом� тек�т файл� ди путом� т�за меле.</strong>',
-'protectedpagewarning'             => '<strong>И�ГОЛЕ К�РД�М�:  Т� лопать п�к�таф петнемада, �онь петнема м�рьгови аньцек �и�темонь вийк�ненди.</strong>',
+'''ТЯТ СУВ�Ф�Е КОПИЯМ� ВИДЕКСС� �Р�Л�Ф М�ТЕРИ�ЛХТ МЯРЬГОМ�ФТОМ�!'''",
+'longpagewarning'                  => "'''И�ГОЛЕ К�РД�М�: Т� лопать кувалмоц $1 килобайтт; кодамога интернет полатк�онь вальмава �така�та петнем� лопат 32 килобайтти мала �ли ��да кувака.
+Эн�льтт�ма, арь�ек уленд�р�й кода лопать �вфтом� ��да ёмла п�льк�ова.'''",
+'longpageerror'                    => "'''ЭЛЬБЯТЬКС: Тонь тек�тцень кувалмоц $1 килобайтт, т� мак�имупть $2 килобайтта лама. Сонь аш кода ванфтом�.'''",
+'readonlywarning'                  => "'''И�ГОЛЕ К�РД�М�: Датабаза�ь п�к�таф петема покаматнень �юнеда, т� пинг�та тондейть аш кода ванфтом� тонь петнематнень. Ш�тьта тондейть пароль �инь ванфтом� тек�т файл� ди путом� т�за меле.'''
+
+Си�темонь в�тик��ь, кона�ь тонь �ёлгозе пут�ь т�фтама туфтал�ь: $1",
+'protectedpagewarning'             => "'''И�ГОЛЕ К�РД�М�:  Т� лопать п�к�таф петнемада, �онь петнема м�рьгови аньцек �и�темонь вийк�ненди.'''",
 'semiprotectedpagewarning'         => "'''Шарфтк м�льце:''' Т� лопа�ь п�к�таф, �онь петнемац м�рьгови аньцек �ёрматфтф тиихненди.",
 'cascadeprotectedwarning'          => "'''И�ГОЛЕ К�РД�М�:''' Т� лопа�ь п�к�таф, �онь петнема м�рьгови аньцек �и�темонь вийк�ненди, ��� ме� �онь �увафнезь ка�кад араламать ала {{PLURAL:$1|лопа|лопа�}}:",
-'titleprotectedwarning'            => '<strong>И�ГОЛЕ К�РД�М�:  Т� лопа�ь п�к�таф, �онь тиемац м�рьгови аньцек аф лама тиихненди.</strong>',
+'titleprotectedwarning'            => "'''И�ГОЛЕ К�РД�М�:  Т� лопа�ь п�к�таф, �р�вихть [[Special:ListGroupRights|башка видек�т]] �онь тиеманди.'''",
 'templatesused'                    => 'Т� лопа�а тев� нолдаф кепотьк�не:',
 'templatesusedpreview'             => 'Т� ва�ень н�фтема вальма�а тев� нолдаф кепотьк�не:',
 'templatesusedsection'             => 'Т� п�льк��а тев� нолдаф кепотьк�не:',
@@ -618,17 +700,30 @@ $2',
 
 Ва�енда арь�ек �р�ви т� лопать вельмомац �ли аф.
 Ванк т� лопать нардама лувомац ала:",
+'deleted-notice'                   => 'Т� лопа�ь нардаф.
+�ардама лувома�ь т� лопать кор�� вага ала.',
+'deletelog-fulllog'                => 'Ваном� п�кш�е лувома�ь',
+'edit-hook-aborted'                => 'Туворк� програм петнемать лоткафтозе.
+Пачфтематнень т�нь кор�� ашет.',
+'edit-gone-missing'                => '�ш кода лопать одонзам�.
+Лопа�ь улема нардафоль.',
+'edit-conflict'                    => 'Петнема �льб�тьк��ь.',
+'edit-no-change'                   => 'Тонь петнемацень тев� изь нолда, ��� ме� тон тек�тть ашеть полафта.',
+'edit-already-exists'              => '�ш кода од лопа ушедом�.
+Т� лопа�ь уль�ь ни.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Инголе кардама: Т� лопа�а п�к лама питни �интак�онь анализаторхнень т�шк�та.
 
-Т��а �р�ви кирдем� $2-да кържа, т�ни $1.',
+Т��а �р�ви кирдем� $2-да кържа {{PLURAL:$2|т�шк�|т�шк�т}}, {{PLURAL:$1|т�ни $1 т�шк�|т�ни $1 т�шк�та}}.',
 'expensive-parserfunction-category'       => 'Лопат п�к лама питни �интак�онь анализаторхнень т�шк�нень мархта',
 'post-expand-template-inclusion-warning'  => 'Инголе кардама: Шаблононь кувалмоц вельф оцю.
 Мъз�рошка шаблотт кармайхть ил�дома апак �увафтт.',
 'post-expand-template-inclusion-category' => 'Лопатне конатнень ��а шаблононь кувалмо�ь вельф оцю',
 'post-expand-template-argument-warning'   => 'Инголе кардама: Т� лопать ��а ули аф фкада кържа шаблононь параметра, конань кувалмоц вельф оцю. �� параметратне нолдафольхть.',
 'post-expand-template-argument-category'  => 'Лопат конатнень ��а улихть нолдаф шаблоттнень параметра�на',
+'parser-template-loop-warning'            => 'Шаблононь кильгокш пензаф: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Шаблононь потафтома кърхкалманц отороц ($1)да лама',
 
 # "Undo" feature
 'undo-success' => 'Петнемать ули кода валхтом�. Ватт верзиетне ала, мук полафнематне конат тондейть �р�вихть, ванфтк лопать н� �р�ви полафнематнень мархта.',
@@ -643,29 +738,29 @@ $2',
 $3 мак��ь туфтал�ь - ''$2''",
 
 # History pages
-'viewpagelogs'        => '��фтем� т� лопать и�тори�нц',
-'nohistory'           => 'Т� лопать петнемань и�тори�ц аш.',
-'revnotfound'         => 'Верзие�ь аф муви',
-'revnotfoundtext'     => 'Т� лопать �ире верзиец аф муви. Ватт URL конань вельде тон �увать т� лопа�.',
-'currentrev'          => 'Т�ниень верзие',
-'revisionasof'        => '$1-нь верзие�ь',
-'revision-info'       => '$1-нь и�л�к�топтома�ь конань тизе $2',
-'previousrevision'    => 'С�дынгольдень ил�к�топтома',
-'nextrevision'        => 'С�да од ил�к�топтома',
-'currentrevisionlink' => 'Т�ниень ил�к�топтома',
-'cur'                 => 'т�н.',
-'next'                => '�ай',
-'last'                => '��д.',
-'page_first'          => 'ва�енце',
-'page_last'           => 'мекольце',
-'histlegend'          => 'Верзиень кочкама: путт т�шк�кат верзиетнень кон�к�к��нон �ди люпштак алудонь пун�ть �ли Enter пун�ть.<br />
+'viewpagelogs'           => '��фтем� т� лопать и�тори�нц',
+'nohistory'              => 'Т� лопать петнемань и�тори�ц аш.',
+'currentrev'             => 'Т�ниень верзие',
+'currentrev-asof'        => 'Т�ниень $1нь верзиец',
+'revisionasof'           => '$1-нь верзие�ь',
+'revision-info'          => '$1-нь и�л�к�топтома�ь конань тизе $2', # Additionally available: $3: revision id
+'previousrevision'       => 'С�дынгольдень ил�к�топтома',
+'nextrevision'           => 'С�да од ил�к�топтома',
+'currentrevisionlink'    => 'Т�ниень ил�к�топтома',
+'cur'                    => 'т�н.',
+'next'                   => '�ай',
+'last'                   => '��д.',
+'page_first'             => 'ва�енце',
+'page_last'              => 'мекольце',
+'histlegend'             => 'Верзиень кочкама: путт т�шк�кат верзиетнень кон�к�к��нон �ди люпштак алудонь пун�ть �ли Enter пун�ть.<br />
 Шарьхкотьфтема: (т�н.) = т�ниень верзиеда �вома�ь,
 (��д.) = ��дынгольдень верзи�да �вома�ь, � = ёмла петнема.',
-'deletedrev'          => '[нардаф]',
-'histfirst'           => 'Кунардонь',
-'histlast'            => 'Улхкомбань',
-'historysize'         => '({{PLURAL:$1|1 байт|$1 байтт}})',
-'historyempty'        => '(шава)',
+'history-fieldset-title' => 'Вешентть и�тори�',
+'deletedrev'             => '[нардаф]',
+'histfirst'              => 'Кунардонь',
+'histlast'               => 'Мекольце',
+'historysize'            => '({{PLURAL:$1|1 байт|$1 байтт}})',
+'historyempty'           => '(шава)',
 
 # Revision feed
 'history-feed-title'          => 'Верзиетнень и�тори��на',
@@ -730,7 +825,7 @@ $3 мак��ь туфтал�ь - ''$2''",
 # Suppression log
 'suppressionlog'     => 'К�шемань лувома�ь',
 'suppressionlogtext' => '�ла нардаматнень ди �ёлгоматнень лувома�ь �и�темонь в�тик�та к�шф потмоть мархта.
-Ванк [[Special:IPBlockList|IP �ёлгоматнень лувома�ь]] улхкомбань �кафнемань кардафк�нень ди �ёлгоматнень мархта.',
+Ванк [[Special:IPBlockList|IP �ёлгоматнень лувома�ь]] мекольце �кафнемань кардафк�нень ди �ёлгоматнень мархта.',
 
 # History merging
 'mergehistory'                     => 'Шоворем� лопатнень и�тори��нон',
@@ -754,131 +849,213 @@ $3 мак��ь туфтал�ь - ''$2''",
 'mergehistory-invalid-destination' => 'Эр�ви �увафтома лопать конд��ти лемоц.',
 'mergehistory-autocomment'         => 'Шоворьфтезь [[:$1]] [[:$2]]-�',
 'mergehistory-comment'             => 'Шоворьфтезь [[:$1]] [[:$2]]-�: $3',
+'mergehistory-same-destination'    => 'С�дынгольде ди од лопатненди аш кода улем� фкат',
 
 # Merge log
 'mergelog'           => 'Шоворематнень лувома',
 'pagemerge-logentry' => '[[$1]] шоворев�ь [[$2]]-ть мархта ($3-ть верзиети �ам�)',
 'revertmerge'        => 'Валхтом� шоворемать',
-'mergelogpagetext'   => 'Ванк ала улхкомбань лопатнень фк� фк�нь мархта шоворема�нон и�тори��на.',
+'mergelogpagetext'   => 'Ванк ала ��да мекольце лопатнень фк� фк�нь мархта шоворема�нон и�тори��на.',
 
 # Diffs
 'history-title'           => '"$1"-нь верзиетнень и�тори��на',
 'difference'              => '(Явома�ь верзиетнень ёткова)',
 'lineno'                  => 'Кик��ь $1:',
 'compareselectedversions' => 'Путом� кочкаф верзиетнень вак��',
+'visualcomparison'        => 'Ваномань вак�� путома�ь',
+'wikicodecomparison'      => 'Викитек�т вак�� путома�ь',
 'editundo'                => 'валхтом�',
 'diff-multi'              => '({{PLURAL:$1|$1-нь ётконь верзиец изь н�фтев|$1-нь ётконь верзиенза и�ть н�фтев}}.)',
+'diff-movedto'            => 'шашфтф $1�',
+'diff-styleadded'         => '$1 �тиль�ь полатф',
+'diff-added'              => '$1 полатф',
+'diff-changedto'          => 'полафтф $1�',
+'diff-movedoutof'         => 'шашфтф $1�та',
+'diff-styleremoved'       => '$1 �тиль�ь валхтф',
+'diff-removed'            => '$1 валхтф',
+'diff-changedfrom'        => 'полафтф $1�та',
+'diff-src'                => 'ли�ьма',
+'diff-withdestination'    => '�ай лопа�ь $1�ь',
+'diff-with'               => '&#32;$1 $2 мархта',
+'diff-with-final'         => '&#32;$1 $2 мархта',
+'diff-width'              => 'келец',
+'diff-height'             => '�ерец',
+'diff-p'                  => "'''параграф'''",
+'diff-blockquote'         => "'''валл�тфнема'''",
+'diff-h1'                 => "'''кон�к� (лув 1)'''",
+'diff-h2'                 => "'''кон�к� (лув 2)'''",
+'diff-h3'                 => "'''кон�к� (лув 3)'''",
+'diff-h4'                 => "'''кон�к� (лув 4)'''",
+'diff-h5'                 => "'''кон�к� (лув 5)'''",
+'diff-pre'                => "'''форматы�фтф пакш'''",
+'diff-div'                => "'''�вк�'''",
+'diff-ul'                 => "'''апак арафтт лувома'''",
+'diff-ol'                 => "'''арафтф лувома'''",
+'diff-li'                 => "'''лувома� �ув�и'''",
+'diff-table'              => "'''таблица'''",
+'diff-tbody'              => "'''таблицань потмоц'''",
+'diff-tr'                 => "'''лув'''",
+'diff-td'                 => "'''�арк�'''",
+'diff-th'                 => "'''кон�к�'''",
+'diff-br'                 => "'''ётка'''",
+'diff-hr'                 => "'''горизонтонь латцема'''",
+'diff-code'               => "'''�одама машинань кодонц �ёлгомац'''",
+'diff-dl'                 => "'''шарьхкотьфтемань лувома'''",
+'diff-dt'                 => "'''шарьхкотьфтема вал'''",
+'diff-dd'                 => "'''шарьхкотьфтема'''",
+'diff-input'              => "'''путф'''",
+'diff-form'               => "'''форм'''",
+'diff-img'                => "'''н�йф'''",
+'diff-span'               => "'''вак�'''",
+'diff-a'                  => "'''�юлмафк�'''",
+'diff-i'                  => "'''комафтф'''",
+'diff-b'                  => "'''�чке'''",
+'diff-strong'             => "'''кемо�та'''",
+'diff-em'                 => "'''т�шк�тама мархта'''",
+'diff-font'               => "'''�ёрма'''",
+'diff-big'                => "'''оцю�та'''",
+'diff-del'                => "'''нардаф'''",
+'diff-tt'                 => "'''арафтф келец'''",
+'diff-sub'                => "'''алга т�шк�тафк�'''",
+'diff-sup'                => "'''в�рьге т�шк�тафк�'''",
+'diff-strike'             => "'''турк� кик�т'''",
 
 # Search results
-'searchresults'             => 'Мезе мув�ь',
-'searchresulttext'          => '{{SITENAME}}-�а вешендемань колга лама �одаманк�а ватт [[{{MediaWiki:Helppage}}|кизефтемань п�льк��ь]].',
-'searchsubtitle'            => 'Тон вешить \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�ембе лопат "$1"�та ушедом�]] | [[Special:WhatLinksHere/$1|�ембе лопат �юлмафт "$1" мархта]])',
-'searchsubtitleinvalid'     => "Тон вешить '''$1'''",
-'noexactmatch'              => "'''\"\$1\" кон�к� мархта лопа аш.''' Тондейть ули кода [[:\$1|тием� лопать]].",
-'noexactmatch-nocreate'     => "'''\"\$1\" кон�к� мархта лопа аш.'''",
-'toomanymatches'            => 'П�к лама вешфонди малады муфк�т, �н�льтт�ма вешентть тага ве�ть',
-'titlematches'              => 'Лопать кон�к�оц мув�ь',
-'notitlematches'            => 'Лопать кон�к�оц изь мув',
-'textmatches'               => 'Лопа�а �ёрматф�ь мув�ь',
-'notextmatches'             => 'Лопа�а �ёрматф�ь изь мув',
-'prevn'                     => '��дынголень $1',
-'nextn'                     => '�ай $1',
-'viewprevnext'              => 'Ваном� ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 вал|$2 валхт}})',
-'search-result-score'       => 'Малавик�ши: $1%',
-'search-redirect'           => '(шашфтт $1�)',
-'search-section'            => '(п�льк� $1)',
-'search-suggest'            => '�фкук� тонь м�ль�от: $1',
-'search-interwiki-caption'  => 'Сазоронь проекттне',
-'search-interwiki-default'  => '$1 муфк�т:',
-'search-interwiki-more'     => '(��да лама)',
-'search-mwsuggest-enabled'  => 'м�ль мак�оматнень мархта',
-'search-mwsuggest-disabled' => 'м�ль мак�оматнень ашет',
-'search-relatedarticle'     => 'Мала',
-'mwsuggest-disable'         => 'Лоткак AJAX м�ль мак�оматне тев� нолдама',
-'searchrelated'             => 'мала',
-'searchall'                 => '�ембе',
-'showingresults'            => "�ла н�фтеви {{PLURAL:$1|мув�ь '''1'''|мув�ть '''$1'''}} '''$2'''-�та ушедом�.",
-'showingresultsnum'         => "�ла н�фтеви {{PLURAL:$3|мув�ь '''1'''|мув�ть '''$3'''}} '''$2'''-�та ушедом�.",
-'showingresultstotal'       => "��фтем� ала {{PLURAL:$3|муф '''$1''' '''$3'''-�та|муф '''$1 - $2''' '''$3'''-�та}}",
-'nonefound'                 => "'''Шарфтк м�льце''': �ньцек мъз�рошка лемботма кърданнек� вешендеви. Т�р�фтт вешендема валда инголе путом� \"�ембе\" �ембе потмонь вешендеманди (корхнема лопат ди шаблотт ��вомок, ди �. т) �ли кундак �р�ви лемботма� кода валынгольк��.",
-'powersearch'               => 'С�донга вешендем�',
-'powersearch-legend'        => '�нц�йн�ньбе� вешендема',
-'powersearch-ns'            => 'Вешендем� лемботмо�а:',
-'powersearch-redir'         => 'Шашфтфк�нень лувома�ь',
-'powersearch-field'         => 'Вешендем�',
-'search-external'           => 'Ушеширень вешендема',
-'searchdisabled'            => '{{SITENAME}}-�а т�ни вешендема�ь аш. Ули кода вешендем� Google �ли ил� вешендемань интернет програпнень вельде. Шарфтк м�льце то�тонь {{SITENAME}}-нь потмонц верзиец, улема, �ирелгод�ь.',
+'searchresults'                    => 'Мезе мув�ь',
+'searchresults-title'              => 'Мезе мув�ь "$1" лем�',
+'searchresulttext'                 => '{{SITENAME}}-�а вешендемань колга лама �одаманк�а ватт [[{{MediaWiki:Helppage}}|кизефтемань п�льк��ь]].',
+'searchsubtitle'                   => 'Тон вешить \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�ембе лопат "$1"�та ушедом�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|�ембе лопат �юлмафт "$1" мархта]])',
+'searchsubtitleinvalid'            => "Тон вешить '''$1'''",
+'noexactmatch'                     => "'''\"\$1\" кон�к� мархта лопа аш.''' Тондейть ули кода [[:\$1|тием� лопать]].",
+'noexactmatch-nocreate'            => "'''\"\$1\" кон�к� мархта лопа аш.'''",
+'toomanymatches'                   => 'П�к лама вешфонди малады муфк�т, �н�льтт�ма вешентть тага ве�ть',
+'titlematches'                     => 'Лопать кон�к�оц мув�ь',
+'notitlematches'                   => 'Лопать кон�к�оц изь мув',
+'textmatches'                      => 'Лопа�а �ёрматф�ь мув�ь',
+'notextmatches'                    => 'Лопа�а �ёрматф�ь изь мув',
+'prevn'                            => '��дынголень $1',
+'nextn'                            => '�ай $1',
+'viewprevnext'                     => 'Ваном� ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Вешендема арафнематне',
+'searchmenu-exists'                => "'''Т� Вики�а ули лопа�ь \"[[:\$1]]\" лем мархта'''",
+'searchmenu-new'                   => "'''Ушедом� лопа�ь \"[[:\$1]]\" т� Вики�а!'''",
+'searchhelp-url'                   => 'Help:Лопань потмоц',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Мум� лопат т� валынгольк��ь мархта]]',
+'searchprofile-articles'           => 'Потмонь лопат',
+'searchprofile-articles-and-proj'  => 'Потмонь ди проектонь лопат',
+'searchprofile-project'            => 'Проектонь лопат',
+'searchprofile-images'             => 'Файлхт',
+'searchprofile-everything'         => 'Сембе',
+'searchprofile-advanced'           => 'Келептьф',
+'searchprofile-articles-tooltip'   => 'Вешендем� $1�а',
+'searchprofile-project-tooltip'    => 'Вешендем� $1�а',
+'searchprofile-images-tooltip'     => 'Вешендем� файлхт',
+'searchprofile-everything-tooltip' => 'Вешендем� �ембе лопа�а (корхнема лопат ��вомок)',
+'searchprofile-advanced-tooltip'   => 'Вешендем� кърдань лемботмова',
+'prefs-search-nsdefault'           => 'Вешендем� мезеге апак полафтт:',
+'prefs-search-nscustom'            => 'Вешендем� кърдань лемботмова:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 вал|$2 валхт}})',
+'search-result-score'              => 'Малавик�ши: $1%',
+'search-redirect'                  => '(шашфтт $1�)',
+'search-section'                   => '(п�льк� $1)',
+'search-suggest'                   => '�фкук� тонь м�ль�от: $1',
+'search-interwiki-caption'         => 'Сазоронь проекттне',
+'search-interwiki-default'         => '$1 муфк�т:',
+'search-interwiki-more'            => '(��да лама)',
+'search-mwsuggest-enabled'         => 'м�ль мак�оматнень мархта',
+'search-mwsuggest-disabled'        => 'м�ль мак�оматнень ашет',
+'search-relatedarticle'            => 'Мала',
+'mwsuggest-disable'                => 'Лоткак AJAX м�ль мак�оматне тев� нолдама',
+'searchrelated'                    => 'мала',
+'searchall'                        => '�ембе',
+'showingresults'                   => "�ла н�фтеви {{PLURAL:$1|мув�ь '''1'''|мув�ть '''$1'''}} '''$2'''-�та ушедом�.",
+'showingresultsnum'                => "�ла н�фтеви {{PLURAL:$3|мув�ь '''1'''|мув�ть '''$3'''}} '''$2'''-�та ушедом�.",
+'showingresultstotal'              => "��фтем� ала {{PLURAL:$4|муфоль '''$1''' '''$3'''-�та|муфольхть '''$1 - $2''' '''$3'''-�та}}",
+'nonefound'                        => "'''Шарфтк м�льце''': �ньцек мъз�рошка лемботмат вешендевихть инголе апак полафтт. Т�р�фтт вешендема валда инголе путом� ''all:'' �ембе потмонь вешендеманди (корхнема лопат ди шаблотт ��вомок, ди �. т) �ли кундак �р�вик� лемботмо� кода валынгольк��.",
+'search-nonefound'                 => '�ш вешфк�онди малады муфк�т.',
+'powersearch'                      => 'С�донга вешендем�',
+'powersearch-legend'               => '�нц�йн�ньбе� вешендема',
+'powersearch-ns'                   => 'Вешендем� лемботмо�а:',
+'powersearch-redir'                => 'Шашфтфк�нень лувома�ь',
+'powersearch-field'                => 'Вешендем�',
+'search-external'                  => 'Ушеширень вешендема',
+'searchdisabled'                   => '{{SITENAME}}-�а т�ни вешендема�ь аш. Ули кода вешендем� Google �ли ил� вешендемань интернет програпнень вельде. Шарфтк м�льце то�тонь {{SITENAME}}-нь потмонц верзиец, улема, �ирелгод�ь.',
 
 # Preferences page
-'preferences'              => '�рафнематне',
-'mypreferences'            => 'Монь латцемане',
-'prefs-edits'              => 'Петнематнень лув�на:',
-'prefsnologin'             => '�пак �увак',
-'prefsnologintext'         => 'Тондейть �р�ви <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} �увам�]</span> тонь арафнематнень латцеманк�а.',
-'prefsreset'               => 'Ингольдень арафнематне мърда�ть меки.',
-'qbsettings'               => '�авигациень �ед�фк�',
-'qbsettings-none'          => '�ф н�фтем�',
-'qbsettings-fixedleft'     => 'Кержи шири киртьф',
-'qbsettings-fixedright'    => 'Види шири киртьф',
-'qbsettings-floatingleft'  => 'Кержи шире�а уенди',
-'qbsettings-floatingright' => 'Виде шире�а уенди',
-'changepassword'           => 'Сувама валть полафтом�',
-'skin'                     => 'Ванфонь латцема',
-'math'                     => '��фтем� формулат',
-'dateformat'               => 'Шинь форматоц',
-'datedefault'              => '�пак полафтт',
-'datetime'                 => 'Ши ди пинге',
-'math_failure'             => '�ф морафтови',
-'math_unknown_error'       => 'аф �одаф �льб�тьк�',
-'math_unknown_function'    => 'аф �одаф функцие',
-'math_lexing_error'        => 'лек�иконь �льб�тьк�',
-'math_syntax_error'        => '�интак�онь �льб�тьк�',
-'math_image_error'         => 'PNG формат� �ёрматфтома�ь изь ли�ев; ватт лац �ли аф арафтов�ть latex, dvips, gs �ди convert',
-'math_bad_tmpdir'          => '�ф �ёрматфтови ётконь математик директорие� �ди директорие�ь аф тиеви',
-'math_bad_output'          => '�ф �ёрматфтови нолдамань математик директорие� �ди директорие�ь аф тиеви',
-'math_notexvc'             => '�олдамань файл texvc изь мув; Ванк math/README лад�мать колга.',
-'prefs-personal'           => 'Тиить колга',
-'prefs-rc'                 => 'Улхкомбань полафнемат',
-'prefs-watchlist'          => 'Мельгеванома',
-'prefs-watchlist-days'     => 'Мъз�ра шит н�фтем� мельгеванома�а:',
-'prefs-watchlist-edits'    => 'Иньоцю полафнематнень лувк��ь н�фтеви келептьф мельгеванома�а:',
-'prefs-misc'               => 'Калмоча',
-'saveprefs'                => 'Ванфтом�',
-'resetprefs'               => 'Валхтом� апак ванфтт полафнематнень',
-'oldpassword'              => 'Сире �увама вал:',
-'newpassword'              => 'Од �увама вал:',
-'retypenew'                => 'Сёрматк од �увама вал омбоцек�:',
-'textboxsize'              => 'Петнема',
-'rows'                     => 'Луфт (�трокат):',
-'columns'                  => 'Орват (�толбан�т):',
-'searchresultshead'        => 'Вешендема',
-'resultsperpage'           => 'Муфк�т фк� лопа�а:',
-'contextlines'             => 'Кик�т (�трочкат) фк� муфк��а:',
-'contextchars'             => 'Контек�т т�штьк�т фк� кик�а:',
-'stub-threshold'           => 'Отор�ь (лимит�ь) <a href="#" class="stub">-нь керф �юлмафк�нень</a> латцема�нонды (байтт):',
-'recentchangesdays'        => 'Мъз�ра шит н�фтем� улхкомбань полафнема�а:',
-'recentchangescount'       => 'Мъз�ра петнемат н�фтем� улхкомбань полафнема�а, и�тори� ди �увама лувома лопа�а:',
-'savedprefs'               => 'Тонь латцематне ванфт�ть.',
-'timezonelegend'           => 'Ойень (ча�онь) карк�',
-'timezonetext'             => '¹Мъз�ра ойда (ча�та) т��тонь пинге �ви �ерверонь пингта (UTC - Гринвич пинге).',
-'localtime'                => 'Т��тонь пинге',
-'timezoneoffset'           => 'Явома',
-'servertime'               => 'Серверонь пинге',
-'guesstimezone'            => 'Сёрмадом� интернет полатк��та',
-'allowemail'               => 'Электрононь �ёрматнень ил� тиихнень �зда тием� м�рьговик�',
-'prefs-searchoptions'      => 'Вешендема арафнемат',
-'prefs-namespaces'         => 'Лемботмот',
-'defaultns'                => 'Вешендем� н� лепнень потмова мъз�р� ил�к� изь м�рьгов:',
-'default'                  => 'апак полафтт',
-'files'                    => 'Файлхт',
+'preferences'               => '�рафнематне',
+'mypreferences'             => 'Монь латцемане',
+'prefs-edits'               => 'Петнематнень лув�на:',
+'prefsnologin'              => '�пак �увак',
+'prefsnologintext'          => 'Тондейть �р�ви <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} �увам�]</span> тонь арафнематнень латцеманк�а.',
+'prefsreset'                => 'Ингольдень арафнематне мърда�ть меки.',
+'qbsettings'                => '�авигациень �ед�фк�',
+'qbsettings-none'           => '�ф н�фтем�',
+'qbsettings-fixedleft'      => 'Кержи шири киртьф',
+'qbsettings-fixedright'     => 'Види шири киртьф',
+'qbsettings-floatingleft'   => 'Кержи шире�а уенди',
+'qbsettings-floatingright'  => 'Виде шире�а уенди',
+'changepassword'            => 'Сувама валть полафтом�',
+'skin'                      => 'Ванфонь латцема',
+'skin-preview'              => 'Ва�ень н�фтема',
+'math'                      => '��фтем� формулат',
+'dateformat'                => 'Шинь форматоц',
+'datedefault'               => '�пак полафтт',
+'datetime'                  => 'Ши ди пинге',
+'math_failure'              => '�ф морафтови',
+'math_unknown_error'        => 'аф �одаф �льб�тьк�',
+'math_unknown_function'     => 'аф �одаф функцие',
+'math_lexing_error'         => 'лек�иконь �льб�тьк�',
+'math_syntax_error'         => '�интак�онь �льб�тьк�',
+'math_image_error'          => 'PNG формат� �ёрматфтома�ь изь ли�ев; ватт лац �ли аф арафтов�ть latex, dvips, gs �ди convert',
+'math_bad_tmpdir'           => '�ф �ёрматфтови ётконь математик директорие� �ди директорие�ь аф тиеви',
+'math_bad_output'           => '�ф �ёрматфтови нолдамань математик директорие� �ди директорие�ь аф тиеви',
+'math_notexvc'              => '�олдамань файл texvc изь мув; Ванк math/README лад�мать колга.',
+'prefs-personal'            => 'Тиить колга',
+'prefs-rc'                  => 'Мекольце полафнемат',
+'prefs-watchlist'           => 'Мельгеванома',
+'prefs-watchlist-days'      => 'Мъз�ра шит н�фтем� мельгеванома�а:',
+'prefs-watchlist-days-max'  => '(мак�имум 7 шит)',
+'prefs-watchlist-edits'     => 'Иньоцю полафнематнень лувк��ь н�фтеви келептьф мельгеванома�а:',
+'prefs-watchlist-edits-max' => '(мак�имум луфк�: 1000)',
+'prefs-misc'                => 'Калмоча',
+'prefs-resetpass'           => 'Полафтом� �увама валцень',
+'saveprefs'                 => 'Ванфтом�',
+'resetprefs'                => 'Валхтом� апак ванфтт полафнематнень',
+'textboxsize'               => 'Петнема',
+'prefs-edit-boxsize'        => 'Петнема вальмоть келец.',
+'rows'                      => 'Луфт (�трокат):',
+'columns'                   => 'Орват (�толбан�т):',
+'searchresultshead'         => 'Вешендема',
+'resultsperpage'            => 'Муфк�т фк� лопа�а:',
+'contextlines'              => 'Кик�т (�трочкат) фк� муфк��а:',
+'contextchars'              => 'Контек�т т�штьк�т фк� кик�а:',
+'stub-threshold'            => 'Отор�ь (лимит�ь) <a href="#" class="stub">-нь керф �юлмафк�нень</a> латцема�нонды (байтт):',
+'recentchangesdays'         => 'Мъз�ра шит н�фтем� мекольце полафнема�а:',
+'recentchangesdays-max'     => '(мак�имум $1 {{PLURAL:$1|ши|шит}})',
+'recentchangescount'        => 'Мъз�ра петнемат н�фтем� апак полафтт мекольце полафнема�а, и�тори� ди �увама лувома лопа�а:',
+'savedprefs'                => 'Тонь латцематне ванфт�ть.',
+'timezonelegend'            => 'Ойень (ча�онь) карк�',
+'timezonetext'              => '¹Мъз�ра ойда (ча�та) т��тонь пинге �ви �ерверонь пингта (UTC - Гринвич пинге).',
+'localtime'                 => 'Т��токонь пинге:',
+'timezoneselect'            => 'Пингонь зона�ь:',
+'timezoneuseserverdefault'  => '�олдак апак полафтт �ерверть тев�',
+'timezoneuseoffset'         => 'Ил� (путт �вома�ь)',
+'timezoneoffset'            => 'Явома¹:',
+'servertime'                => 'Серверонь пинге:',
+'guesstimezone'             => 'Сёрмадом� интернет полатк��та',
+'allowemail'                => 'Электрононь �ёрматнень ил� тиихнень �зда тием� м�рьговик�',
+'prefs-searchoptions'       => 'Вешендема арафнемат',
+'prefs-namespaces'          => 'Лемботмот',
+'defaultns'                 => 'Вешендем� н� лепнень потмова мъз�р� ил�к� изь м�рьгов:',
+'default'                   => 'апак полафтт',
+'files'                     => 'Файлхт',
 
 # User rights
 'userrights'                  => 'Тиинь видек�нень в�тема', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Тиихнень полга�нон в�тема�на',
 'userrights-user-editname'    => 'Путт тиить лемонц:',
 'editusergroup'               => 'Полафтом� тиить полганзон',
-'editinguser'                 => "'''[[User:$1|$1]]'''-нь тиить видек�онзон полафнема ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "'''[[User:$1|$1]]'''-нь тиить видек�онзон полафнема ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Полафтом� тиить полганзон',
 'saveusergroups'              => 'Ванфтом� тиить полганзон',
 'userrights-groupsmember'     => 'Сув�и полга�:',
@@ -927,6 +1104,8 @@ $3 мак��ь туфтал�ь - ''$2''",
 'right-minoredit'            => 'Т�штем� петнемат кода йомлан� видептемат',
 'right-move'                 => 'Шашфтом� лопатнень',
 'right-move-subpages'        => 'Шашфтом� лопатнень �инь �ублопа�нон мархта',
+'right-move-rootuserpages'   => 'Шашфтом� юронь тиинь лопатне',
+'right-movefile'             => 'Шашфтом� файлхт',
 'right-suppressredirect'     => 'Лопань шашфтом�та аф тием� шашфтфк� �онь ингольдень лем�тонза',
 'right-upload'               => 'Тонгом� файлхт',
 'right-reupload'             => 'Тием� т�ниень файлть одук�',
@@ -963,7 +1142,7 @@ $3 мак��ь туфтал�ь - ''$2''",
 'right-importupload'         => 'Таргам� лопат файлонь тонгома�та',
 'right-patrol'               => 'Т�штем� ил�тнень петнема�нон патрули�фок�',
 'right-autopatrol'           => 'Э�ь петнематнень кармафтом� т�штевом� патрули�фок�',
-'right-patrolmarks'          => '��фтем� улхкомбань полафнематнень патрули�фок� т�штефнень ётк�а',
+'right-patrolmarks'          => '��фтем� мекольце полафнематнень патрули�фок� т�штефнень ётк�а',
 'right-unwatchedpages'       => 'Ваном� аф мельгеванома�а лопатнень лувомать',
 'right-trackback'            => 'Кемок�там� меки кеворемать нолдамац',
 'right-mergehistory'         => 'Шоворьфтем� и�тори�нь лопатне',
@@ -977,11 +1156,48 @@ $3 мак��ь туфтал�ь - ''$2''",
 'rightslogentry' => '$1-нь полгац полафт�ь $2-�та $3-�',
 'rightsnone'     => '(аш)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'т� лопать морафтома',
+'action-edit'                 => 'петнем� т� лопать',
+'action-createpage'           => 'тием� лопат',
+'action-createtalk'           => 'тием� корхнема лопат',
+'action-createaccount'        => 'тием� т� тиить �ёрматфтоманц',
+'action-minoredit'            => 'т�шк�там� т� петнемать анц�йн�к�',
+'action-move'                 => 'Шашфтом� т� лопать',
+'action-move-subpages'        => 'шашфтом� т� лопать �ди �онь �ублопанзон',
+'action-move-rootuserpages'   => 'шашфтом� юронь тиинь лопатне',
+'action-movefile'             => 'шашфтом� т� файлть',
+'action-upload'               => 'тонгом� т� файлть',
+'action-reupload'             => '�ёрмадом� одук� т� файлть аф ваномок �он уль�ь ни',
+'action-reupload-shared'      => 'нулгодем� т� файлть мар�тонь репозитори�а',
+'action-upload_by_url'        => 'тонгом� т� файлть URL адре��та',
+'action-writeapi'             => 'нолдам� тев� �ёрмадома API�ь',
+'action-delete'               => 'нардам� т� лопать',
+'action-deleterevision'       => 'нардам� т� верзиеть',
+'action-deletedhistory'       => 'ваном� т� лопать нардаф и�тори�нц',
+'action-browsearchive'        => 'вешендем� нардаф лопава',
+'action-undelete'             => 'мърдафтом� т� лопать',
+'action-suppressrevision'     => 'ванондом� �ди мърдафтом� т� к�шф верзиеть',
+'action-suppressionlog'       => 'ваном� т� тиить лувоманц',
+'action-block'                => '�ёлгом� т� тиить петнемада',
+'action-protect'              => 'полафтом� т� лопать араламань арафнеманзон',
+'action-import'               => 'таргам� т� лопать ил� Вики�та',
+'action-importupload'         => 'таргам� т� лопать файлонь тонгома�та',
+'action-patrol'               => 'т�штем� ил�тнень петнема�на патрули�фок�',
+'action-autopatrol'           => 'т�штть тонь петнемацень патрули�фок�',
+'action-unwatchedpages'       => 'н�фтем� мельгеваномафтома лопатнень лувома�нон',
+'action-trackback'            => 'нолдам� меки кеворема',
+'action-mergehistory'         => 'шоворем� т� лопать и�тори�нц',
+'action-userrights'           => 'петнем� �ембе тиихнень видек��нон',
+'action-userrights-interwiki' => 'петнем� тиихнень ил� вики�тонь тиинь видек��нон',
+'action-siteadmin'            => 'п�к�там� �ли панжем� датабазать',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|полафнема|полафнемат}}',
-'recentchanges'                     => 'Улхкомбань полафнемат',
-'recentchangestext'                 => 'Ваном� улхкомбань Вики�а полафнематнень мельге т� лопа�а.',
-'recentchanges-feed-description'    => 'Ваном� улхкомбань Вики�а полафнематнень мельге т� шудема�а.',
+'recentchanges'                     => 'Мекольце полафнемат',
+'recentchanges-legend'              => 'Мекольце полафнематнень арафнема�на',
+'recentchangestext'                 => 'Ваном� ��да мекольце Вики�а полафнематнень мельге т� лопа�а.',
+'recentchanges-feed-description'    => 'Ваном� ��да мекольце Вики�а полафнематнень мельге т� шудема�а.',
 'rcnote'                            => "�ла {{PLURAL:$1|мекольце '''1''' полафнема|мекольце '''$1''' полафнемат}} '''$2''' ётай  {{PLURAL:$2|ши�|ши�}}, $5, $4�та.",
 'rcnotefrom'                        => "�ла н�фтезь полафнематне '''$2'''-�та ('''$1'''-�).",
 'rclistfrom'                        => '��фтем� од полафнематне $1-�та ушедом�',
@@ -1003,6 +1219,8 @@ $3 мак��ь туфтал�ь - ''$2''",
 'rc_categories'                     => '�ньцек категорие�та (�вфтом� "|" вельде)',
 'rc_categories_any'                 => 'Эрь кодама',
 'newsectionsummary'                 => '/* $1 */ од п�льк�',
+'rc-enhanced-expand'                => '��фтем� анц�йн�тне (�р�ви JavaScript)',
+'rc-enhanced-hide'                  => 'К�шем� анц�йн�тне',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Сюлмаф полафнематне',
@@ -1023,19 +1241,19 @@ $3 мак��ь туфтал�ь - ''$2''",
 'upload_directory_read_only'  => '�ш кода �ёрмадом� ($1) директорие� web-�ервер вельде.',
 'uploaderror'                 => 'Тонгодема �льб�тьк�',
 'uploadtext'                  => "Форм ала тондейть �р�вк�ты файлонь тонгоманди ди ваноманди. 
-Инголе тонкф файлхнень н�фтеманк�а ванк [[Special:ImageList|тонкф архтофк�нень лувома�ь]], файлонь одук� тонгома�на т�штевихть [[Special:Log/upload|тонгома лувома�]], файлонь нардама�на т�штевихть [[Special:Log/upload|нардама лувома�]].
+Инголе тонкф файлхнень н�фтеманк�а ванк [[Special:FileList|тонкф архтофк�нень лувома�ь]], файлонь одук� тонгома�на т�штевихть [[Special:Log/upload|тонгома лувома�]], файлонь нардама�на т�штевихть [[Special:Log/upload|нардама лувома�]].
 
 �рхтофк� �ёрматфк�� �увафтоманк�а �р�ви путом� ки:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' п�шк�е файлонь верзинц тев� нолдаманди
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' 200 пик�ель кели верзие ёмла кудн��а лопань кержи шире�а тев� нолдаманди, 'alt text' ва�т� путозь архтофк� колга т�штема�ь
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' п�шк�е файлонь верзинц тев� нолдаманди
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' 200 пик�ель кели верзие ёмла кудн��а лопань кержи шире�а тев� нолдаманди, 'alt text' ва�т� путозь архтофк� колга т�штема�ь
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' файлть мархта виде�та �юлмамонди �� файлть апак н�фнек.",
 'upload-permitted'            => 'М�рьговик� файл форматт: $1.',
 'upload-preferred'            => 'Сембода пара файл форматт: $1.',
 'upload-prohibited'           => 'Кардама файл форматт: $1.',
 'uploadlog'                   => 'файлонь тонгома лувома',
 'uploadlogpage'               => 'Файлонь тонгома лувома�',
-'uploadlogpagetext'           => 'Ватт ала улхкомбань файлонь тонгома лувома�ь.
-Ватт [[Special:NewImages|од файлхнень н�фтема]] �одам� кодапт �инь.',
+'uploadlogpagetext'           => 'Ватт ала мекольце файлонь тонгома лувома�ь.
+Ватт [[Special:NewFiles|од файлхнень н�фтема]] �одам� кодапт �инь.',
 'filename'                    => 'Файлонь лем',
 'filedesc'                    => '�юрьхк�н��та файлть колга',
 'fileuploadsummary'           => '�юрьхк�н��та файлть колга:',
@@ -1048,27 +1266,30 @@ $3 мак��ь туфтал�ь - ''$2''",
 'illegalfilename'             => 'Файлонь лем�а "$1" улихть т�штьк�т конат лувовихть аф м�рьговик� лопань кон�к�нонды. Тик ил� файлонь лем, меле тонк �онь тага ве�ть.',
 'badfilename'                 => 'Файлонь лемонц полафтозь "$1"-�.',
 'filetype-badmime'            => 'MIME формат файлхт "$1" аф м�рьговихть тонгоманди.',
+'filetype-bad-ie-mime'        => '�ш кода тогом� т� файлть ��� ме� Internet Explorer кармай �онь ваномонза кода "$1", а т� аф м�рьгови ди потенциал кор�� пельк� файлонь тип�ь.',
 'filetype-unwanted-type'      => "'''\".\$1\"'''-ть аф �рашты файл форматоц. С�да {{PLURAL:\$3|пароль файл формат|парольхть файл форматт}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"'''-ть файл форматоц аф м�рьгови. М�рьговихть {{PLURAL:\$3|файл формат|файл форматт}} \$2.",
 'filetype-missing'            => 'Файлть аш формат т�шк�оц (кепотьк�онди ".jpg").',
 'large-file'                  => 'С�да пароль файлхт улельхть аф $1-да кувака; т� файл�ь $2.',
 'largefileserver'             => 'Т� файл�ь �ерверонь м�рьгови кувалмода лама.',
 'emptyfile'                   => 'Файл�ь, кона�ь тон тонгодеть шаволь. Т� ли��ь, улема, аф лац файллем �ерматкшнеманц �юнеда.  Ванк ди арь�ек улель �ли аф тонь м�лец т� файлть тонгомонза.',
-'fileexists'                  => 'Т� лем�а файл ул�ь ни. Ванк <strong><tt>$1</tt></strong> улель �ли аф тонь м�льце �онь полафнемонза.',
-'filepageexists'              => 'Т� лем�а лопа уль�ь ни, ванк <strong><tt>$1</tt></strong> улель тонь м�льце �ли аф т�нь полафтом�.',
-'fileexists-extension'        => 'Файл т� файлть лемонцты малады уль�ь ни:<br />
-Тонгодеви файлть лемоц: <strong><tt>$1</tt></strong><br />
-Файллем, кона уль�ь ни: <strong><tt>$2</tt></strong><br />
-Эн�льтт�ма, арь�ек ил� лем.',
+'fileexists'                  => "Т� лем�а файл ул�ь ни. Ванк '''<tt>$1</tt>''' улель �ли аф тонь м�льце �онь полафнемонза.",
+'filepageexists'              => "Т� лем�а лопа уль�ь ни, ванк '''<tt>$1</tt>''' улель тонь м�льце �ли аф т�нь полафтом�.",
+'fileexists-extension'        => "Файл т� файлть лемонцты малады уль�ь ни:<br />
+Тонгодеви файлть лемоц: '''<tt>$1</tt>'''<br />
+Файллем, кона уль�ь ни: '''<tt>$2</tt>'''<br />
+Эн�льтт�ма, арь�ек ил� лем.",
 'fileexists-thumb'            => "<center>'''Т�ниень файл'''</center>",
-'fileexists-thumbnail-yes'    => 'Файл�ь, улема, архтофк�онь кирьфтаф верзие�ь <i>(thumbnail)</i>. Ванк файл <strong><tt>$1</tt></strong> ланг�.<br />
-Д�р�й файл�ь конань ланг� тон ваноть ��ка п�шк�е кувалмо�а архтофк��ь, то�а тага фк� миниатюр тонгом� аф �р�ви.',
-'file-thumbnail-no'           => 'Файллем�ь ушед�ь <strong><tt>$1</tt></strong>. 
-�рхтофк�ть кувалмоц, улема, п�к кирьфтафоль <i>(thumbnail)</i>.
-Уленд�р�й тонь т� файлть ��да кувака верзиец - тонк �онь, ил�к� полафтт файллемть.',
-'fileexists-forbidden'        => 'Файл т� лем�а ул�ь ни; мърдак меки ди тонк т� файлть ил� лем мархта. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Файл�ь т� лемть мархта уль�ь ни мар�тонь файл пърдафк��а. Сембе ��ка уленд�р�ть м�льце т� файлть тонгом�, мърдак меки ди тонк т� файлть ил� лем мархта. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Файл�ь, улема, архтофк�онь кирьфтаф верзие�ь ''(thumbnail)''. Ванк файл '''<tt>$1</tt>''' ланг�.<br />
+Д�р�й файл�ь конань ланг� тон ваноть ��ка п�шк�е кувалмо�а архтофк��ь, то�а тага фк� миниатюр тонгом� аф �р�ви.",
+'file-thumbnail-no'           => "Файллем�ь ушед�ь '''<tt>$1</tt>'''. 
+�рхтофк�ть кувалмоц, улема, п�к кирьфтафоль ''(thumbnail)''.
+Уленд�р�й тонь т� файлть ��да кувака верзиец - тонк �онь, ил�к� полафтт файллемть.",
+'fileexists-forbidden'        => 'Файл т� лем мархта уль�ь ни, аш кода �онь тием� одук�.
+М�льце тонгом� т� файл�ь - мърдак меки ди тонк т� файлть ил� лем мархта. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Файл�ь т� лемть мархта уль�ь ни мар�тонь файл пърдафк��а. Сембе ��ка уленд�р�ть м�льце т� файлть тонгом�, мърдак меки ди тонк т� файлть ил� лем мархта. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Т� файл�ь кафонзафоль {{PLURAL:$1|файл|файлхт}}:',
+'file-deleted-duplicate'      => 'Файл�ь ��ка кода файл ([[$1]]) нардафоль. Ванк файлонь нардама и�тори�нц �онь одук� тонгоманза инголе.',
 'successfulupload'            => 'Тонгодема�ь ёта�ь лац',
 'uploadwarning'               => 'Тонгодемань инголе кардама',
 'savefile'                    => 'Ванфтом� файл',
@@ -1087,7 +1308,7 @@ $3 мак��ь туфтал�ь - ''$2''",
 'upload-wasdeleted'           => "'''Инголе кардама: Файл, кона тон тонгодь�а нардафоль ни.'''
 
 Лацка�та арь�ек афкук� тонь ули м�льце �онь тонгомонза �ли аф. �ардама лувома информацие�ь т��а:",
-'filename-bad-prefix'         => 'Тон тонгодь�ак файл конань лемоц ушеды <strong>"$1"</strong>-�а. Стапт лепне лувовихть мезеньге аф колга азондовик� ��� ме� �инь ��ь мак��евихть т�шк�камера�а тиф фотоархтофк�ненди (цифра камера�а). �рь�ек ил� лем, кона�а ащель информациеда лама.',
+'filename-bad-prefix'         => "Тон тонгодь�ак файл конань лемоц ушеды '''\"\$1\"'''-�а. Стапт лепне лувовихть мезеньге аф колга азондовик� ��� ме� �инь ��ь мак��евихть т�шк�камера�а тиф фотоархтофк�ненди (цифра камера�а). �рь�ек ил� лем, кона�а ащель информациеда лама.",
 
 'upload-proto-error'      => '�ф конд��ти протокол',
 'upload-proto-error-text' => 'Ичкоздень тонгодеманди �р�ви URL-т ушедыхть <code>http://</code>-�а �ли <code>ftp://</code>-�а.',
@@ -1108,20 +1329,21 @@ $3 мак��ь туфтал�ь - ''$2''",
 'upload_source_url'  => ' (конд��ти, �ембонди панжада URL)',
 'upload_source_file' => ' (файл�ь тонь �одама машина�от)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Т� башка тевонь лопа�а н�фневихть �ембе тонкф файлхне.
+# Special:ListFiles
+'listfiles-summary'     => 'Т� башка тевонь лопа�а н�фневихть �ембе тонкф файлхне.
 Мъз�р� апак полафтт мекольце тонкф файлхне лувома�а н�фневихть в�ре.
 Палмань кон�к�онцты люпштама�ь полафне�ы кик�нень арафнемать.',
-'imagelist_search_for'  => 'Вешендем� медиа лем:',
+'listfiles_search_for'  => 'Вешендем� медиа лем:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Файлхт',
-'imagelist_date'        => 'Ши',
-'imagelist_name'        => 'Лем',
-'imagelist_user'        => 'Тии',
-'imagelist_size'        => 'Кувалма',
-'imagelist_description' => 'Информацие',
-
-# Image description page
+'listfiles'             => 'Файлхт',
+'listfiles_date'        => 'Ши',
+'listfiles_name'        => 'Лем',
+'listfiles_user'        => 'Тии',
+'listfiles_size'        => 'Кувалма',
+'listfiles_description' => 'Информацие',
+'listfiles_count'       => 'Верзиет',
+
+# File description page
 'filehist'                       => 'Файлонь и�тори��ь',
 'filehist-help'                  => 'Люпштак шить/пингть ланг� �� пингонь файлть верзинц н�фтеманк�а.',
 'filehist-deleteall'             => 'нардам� �ембе',
@@ -1129,12 +1351,18 @@ $3 мак��ь туфтал�ь - ''$2''",
 'filehist-revert'                => 'мърдафтом�',
 'filehist-current'               => 'т� пингонь',
 'filehist-datetime'              => 'Ши/Пинге',
+'filehist-thumb'                 => 'Миниатюр',
+'filehist-thumbtext'             => 'Миниатюронь верзиец тиф $1',
+'filehist-nothumb'               => 'Миниатюр аш',
 'filehist-user'                  => 'Тии',
 'filehist-dimensions'            => 'Кувалма',
 'filehist-filesize'              => 'Файлонь кувалмоц',
 'filehist-comment'               => 'М�льполатк�',
-'imagelinks'                     => 'Сюлмафк�т',
+'imagelinks'                     => 'Файл �юлмафк�т',
 'linkstoimage'                   => 'Сай {{PLURAL:$1|лопа�ь �юлмаф|$1 лопатне �юлмафт}} вага т� файлть мархта:',
+'linkstoimage-more'              => '$1-да лама {{PLURAL:$1|лопа �юлмаф|лопат �юлмафт}} т� файлть мархта.
+Т� лувома�а н�фневихть {{PLURAL:$1|ва�енце лопань �юлмафк�оц|ва�енце $1 лопань �юлмафк��на}} аньцек т� файлть мархта.
+Вага т��а [[Special:WhatLinksHere/$2|п�шк�е лувома�ь]].',
 'nolinkstoimage'                 => 'Лопат �юлмафт т� файлть мархта ашет.',
 'morelinkstoimage'               => 'Ванк [[Special:WhatLinksHere/$1|��да лама �юлмафк�т]] т� файлонди.',
 'redirectstofile'                => 'Сай {{PLURAL:$1|файл�ь шашфтфоль|$1 файлхне шашфтфольхть}} т� файлонди:',
@@ -1165,7 +1393,7 @@ $3 мак��ь туфтал�ь - ''$2''",
 # File deletion
 'filedelete'                  => '�ардам� $1',
 'filedelete-legend'           => '�ардам� файлть',
-'filedelete-intro'            => "Тон нарда�ак '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Тон т�р�фн�т нардам� файл '''[[Media:$1|$1]]''' �ембе �онь и�торинц мархта.",
 'filedelete-intro-old'        => "Тон нарда�ак   '''[[Media:$1|$1]]'''-ть верзиенза [$4 $3, $2].",
 'filedelete-comment'          => '�ардама туфтал:',
 'filedelete-submit'           => '�ардам�',
@@ -1173,7 +1401,6 @@ $3 мак��ь туфтал�ь - ''$2''",
 'filedelete-success-old'      => "'''[[Media:$1|$1]]'''-ть верзиенза нардафольхть $3, $2.",
 'filedelete-nofile'           => "'''$1''' аш.",
 'filedelete-nofile-old'       => "'''$1'''-ть пърдафтф верзиенц �тама т�шк�т мархта аш.",
-'filedelete-iscurrent'        => 'Тон т�р�фн�т нардам� т� файлть ��да од верзиенц. Эн�льтт�ма, мърдак ва�енда �онь ��дынгольдень верзиезонза.',
 'filedelete-otherreason'      => 'Ил�/поладомань туфтал:',
 'filedelete-reason-otherlist' => 'Ил� туфтал',
 'filedelete-reason-dropdown'  => '*Мар�тонь нардама туфтал
@@ -1200,29 +1427,31 @@ $3 мак��ь туфтал�ь - ''$2''",
 
 # Random page
 'randompage'         => 'Кона пов�ь лопа',
-'randompage-nopages' => 'Т� лем потмо�а лопат ашет.',
+'randompage-nopages' => '"$1" лемботмо�а лопат ашет.',
 
 # Random redirect
 'randomredirect'         => 'Коза пов�ь шашфтфк�',
-'randomredirect-nopages' => 'Т� лемботмо�а шашфтфк�т ашет.',
+'randomredirect-nopages' => '"$1" лемботмо�а умборондафтфк�т ашет.',
 
 # Statistics
-'statistics'             => 'Стати�тик',
-'sitestats'              => '{{SITENAME}} �тати�тик',
-'userstats'              => 'Тиить �тати�тик�ь',
-'sitestatstext'          => "Сембоц {{PLURAL:\$1|'''1''' лопа|'''\$1''' лопат}} датабаза�а.
-Т�за �ув�ихть \"корхнема\" лопат,  {{SITENAME}} колга лопат, аф шумордаф \"керф\"
-лопат, ётафтф лопат �ди мъз�рошка ил� лопат конатнень аф �увафнезь мар�тонь лопань лувк��.
-С�тнень башка {{PLURAL:\$2|'''1''' лопа, кона лувови|'''\$2''' лопат, конат лувовихть}} лацка�та�та тифок�.
-
-'''\$8''' {{PLURAL:\$8|файл тонкф|файлхт тонкфт}}.
-
-Сембоц '''\$3'''-�а {{PLURAL:\$3|лопа ванозь|лопат ванозь}} �ди '''\$4''' {{PLURAL:\$4|лопа петнезь|лопат петнезь}}  {{SITENAME}}-нь ушедом�та.
-С�коба�ом т� малады кучкалувк�а '''\$5''' петнемати фк� лопа� �ди '''\$6''' ваномати фк� петнема�.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue тефнень пуло�нон] кувалмоц '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|'''1''' �ёрматфтф [[Special:ListUsers|тии]]| '''$1''' �ёрматфтфт [[Special:ListUsers|тиихть]]}}, '''$2'''-нь (�ли '''$4%''') {{PLURAL:$2|ули|улихть}} $5-нь видек�онза.",
-'statistics-mostpopular' => 'Сиде�та �ув�еви лопат',
+'statistics'                   => 'Стати�тик',
+'statistics-header-pages'      => 'Лопань �тати�тик',
+'statistics-header-edits'      => 'Петнем� �тати�тикть',
+'statistics-header-views'      => '��фтем� �тати�тикть',
+'statistics-header-users'      => 'Тиить �тати�тик�ь',
+'statistics-articles'          => 'Потма мархта лопатне',
+'statistics-pages'             => 'Лопатне',
+'statistics-pages-desc'        => 'Сембе Викинь лопа�на, корхнема лопатне, шафтфк�не ди �.т.',
+'statistics-files'             => 'Тонкф файлхне',
+'statistics-edits'             => 'Лопань петнема�на {{SITENAME}}ть ушедом�та',
+'statistics-edits-average'     => 'Петнемат фк� лопа� ётк�талувк��та',
+'statistics-views-total'       => 'Ванондомада �ембоц',
+'statistics-views-peredit'     => 'Фк� петнема� ванондомада',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Покаматнень пулонь] кувалмоц',
+'statistics-users'             => 'Сёрматфтф [[Special:ListUsers|тиихне]]',
+'statistics-users-active'      => 'Покай тиихне',
+'statistics-users-active-desc' => 'Тиихне конатне ти�ть мезеге ётай {{PLURAL:$1|шин�|$1 ши�та}}',
+'statistics-mostpopular'       => 'Сиде�та �ув�еви лопат',
 
 'disambiguations'      => 'Лама �музь�а лопат',
 'disambiguationspage'  => 'Template:лама �му�ть',
@@ -1264,7 +1493,8 @@ $3 мак��ь туфтал�ь - ''$2''",
 'popularpages'            => 'Сиде�та �ув�еви лопат',
 'wantedcategories'        => 'Вешф категориет',
 'wantedpages'             => 'Вешф лопат',
-'missingfiles'            => 'Йумай файлхне',
+'wantedfiles'             => 'Вешеви файлхт',
+'wantedtemplates'         => 'Вешеви шаблотт',
 'mostlinked'              => 'Сембода ламок�ть �юлмаф лопатнень мархта',
 'mostlinkedcategories'    => 'Сембода ламок�ть �юлмаф категориетнень мархта',
 'mostlinkedtemplates'     => 'Сембода ламок�ть �юлмаф кепотьк�нень
@@ -1272,19 +1502,22 @@ $3 мак��ь туфтал�ь - ''$2''",
 'mostcategories'          => 'Сембода лама категорие мархта лопат',
 'mostimages'              => 'Сембода ламок�ть �юлмаф файлхнень мархта',
 'mostrevisions'           => 'Сембода лама верзиетнень мархта лопат',
-'prefixindex'             => 'Ингольк� индек�',
+'prefixindex'             => 'Сембе лопат ингольк� мархта',
 'shortpages'              => '�юрьхк�н� лопат',
 'longpages'               => 'Кувака лопат',
 'deadendpages'            => 'Полатк�фтома лопат',
 'deadendpagestext'        => 'С� лопат аф �юлмафт ил� лопатнень мархта {{SITENAME}}-�а.',
 'protectedpages'          => '�ралаф лопат',
 'protectedpages-indef'    => '�ньцек апак кемок�так араламат',
+'protectedpages-cascade'  => '�ньцек ка�кад аралама�ь',
 'protectedpagestext'      => 'С� лопатне шашфтомада �ли петнемада аралафт',
 'protectedpagesempty'     => 'Т� пинг�та аралаф лопат �� арафнематнень мархта ашет.',
 'protectedtitles'         => '�ралаф кон�к�не',
 'protectedtitlestext'     => 'С� лопа кон�к�не тиемада аралафт',
 'protectedtitlesempty'    => 'Т� пинг�та аралаф лопа кон�к�т �� арафнематнень мархта ашет.',
 'listusers'               => 'Тиихне',
+'listusers-editsonly'     => '��фтем� аньцек петнематнень мархта тиихнень',
+'usereditcount'           => '$1 {{PLURAL:$1|петнема|петнемат}}',
 'newpages'                => 'Од лопат',
 'newpages-username'       => 'Тиить лемоц:',
 'ancientpages'            => 'Сембода �ире лопат',
@@ -1305,14 +1538,13 @@ $3 мак��ь туфтал�ь - ''$2''",
 'booksources-search-legend' => 'Вешендем� кинигань кучфтемат',
 'booksources-go'            => '�ре',
 'booksources-text'          => 'Сюлмафк�т ала �отфт ил� интернет лопатнень мархта, конат мишендихть од �ди �ире кинигат, ди то�а, улема, тон му�ак поладомань информацие �� кинигатнень колга, конатнень тон вешендить:',
+'booksources-invalid-isbn'  => 'Путф ISBN аф виде �ли аф конд��ти; ванк кодамк� �он уль�ь ли�ема�а.',
 
 # Special:Log
 'specialloguserlabel'  => 'Тии�ь:',
 'speciallogtitlelabel' => 'Кон�к�:',
 'log'                  => 'Сувама лувомат',
 'all-logs-page'        => 'Сембе �увама лувомат',
-'log-search-legend'    => 'Вешендем� �увама лувомат',
-'log-search-submit'    => 'Мум�',
 'alllogstext'          => 'Сембе �увама лувомат {{SITENAME}}-�а.
 Тондейть ули кода �инь кочкафтом� �увама лувомань кор��, тиить �ли �уваф лопань кор��.',
 'logempty'             => 'Стапт �увамот лувома�а ашет.',
@@ -1324,6 +1556,7 @@ $3 мак��ь туфтал�ь - ''$2''",
 'nextpage'          => 'Сай лопа ($1)',
 'prevpage'          => 'С�дынголень лопа ($1)',
 'allpagesfrom'      => '��фтем� лопат ушедом�:',
+'allpagesto'        => '��фтем� лопат аделам�:',
 'allarticles'       => 'Сембе лопат',
 'allinnamespace'    => 'Сембе лопат ($1 лемботмо�а)',
 'allnotinnamespace' => 'Сембе лопат (аф $1 лемботмо�а)',
@@ -1343,42 +1576,70 @@ $3 мак��ь туфтал�ь - ''$2''",
 'special-categories-sort-count' => 'арафтом� луфть кор��',
 'special-categories-sort-abc'   => 'арафтом� алфавитонь кор��',
 
+# Special:DeletedContributions
+'deletedcontributions' => '�ардаф тиихнень путк��на',
+
+# Special:LinkSearch
+'linksearch'       => 'Ушеширень �юлмафк�не',
+'linksearch-pat'   => 'Вешендема кепотьк�:',
+'linksearch-ns'    => 'Лемботмоц:',
+'linksearch-ok'    => 'Вешендем�',
+'linksearch-text'  => 'Сембеконд��ти лепне "*.wikipedia.org" конд�ма ули кода нолдам� тев�.<br />
+Кирдеви протоколхне: <tt>$1</tt>',
+'linksearch-line'  => '$1 �юлмаф $2�та',
+'linksearch-error' => 'Сембеконд��ти лепненди ули кода тихтедем� аньцек интернет �юлма лемть ушетк�онза.',
+
 # Special:ListUsers
 'listusersfrom'      => '��фтем� тиихть ушедом�:',
 'listusers-submit'   => '��фтем�',
 'listusers-noresult' => 'Тиихть и�ть мув.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Тиинь ушедоманзон лувома�на',
+'newuserlogpagetext'          => 'Т� тиинь ушедоманзон лувома�на.',
+'newuserlog-byemail'          => '�увама валце кучф �лектрононь �ёрма�а',
+'newuserlog-create-entry'     => 'Од тии',
+'newuserlog-create2-entry'    => '�ёрматфтома�ь $1нди тиф',
+'newuserlog-autocreate-entry' => 'Сёрматфтома�ь ��лек тиф',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Тиихнень полга�нон видек�онза',
-'listgrouprights-summary'  => 'Т��а тиихнень полга�на конатне �ув�ихть т� Вики� �инь �увама видек��нон мархта.
+'listgrouprights'                 => 'Тиихнень полга�нон видек�онза',
+'listgrouprights-summary'         => 'Т��а тиихнень полга�на конатне �ув�ихть т� Вики� �инь �увама видек��нон мархта.
 Т��а ули кода мум� [[{{MediaWiki:Listgrouprights-helppage}}|поладомань информацие�ь]] ��ь башка видек�нень колга.',
-'listgrouprights-group'    => 'Полга',
-'listgrouprights-rights'   => 'Видек�не',
-'listgrouprights-helppage' => 'Help:Полгань видек�онза',
-'listgrouprights-members'  => '(полайафнень лувома�ь)',
+'listgrouprights-group'           => 'Полга',
+'listgrouprights-rights'          => 'Видек�не',
+'listgrouprights-helppage'        => 'Help:Полгань видек�онза',
+'listgrouprights-members'         => '(полайафнень лувома�ь)',
+'listgrouprights-addgroup'        => 'Ули кода поладом� {{PLURAL:$2|полга|полгат}}: $1',
+'listgrouprights-removegroup'     => 'Ули кода валхтом� {{PLURAL:$2|полга|полгат}}: $1',
+'listgrouprights-addgroup-all'    => 'Ули кода поладом� �ембе полгатне',
+'listgrouprights-removegroup-all' => 'Ули кода �ембе полгатне валхтом�',
 
 # E-mail user
-'mailnologin'     => '�ш кучема адре�',
-'mailnologintext' => 'Тондейть �р�ви [[Special:UserLogin|�увам�]]
+'mailnologin'      => '�ш кучема адре�',
+'mailnologintext'  => 'Тондейть �р�ви [[Special:UserLogin|�увам�]]
 ди �р�ви конд��ти �лектрононь адре�це тонь [[Special:Preferences|арафнема�от]] ил� тиихненди �лектрононь �ёрмат кучема�нонды.',
-'emailuser'       => 'Кучем� �лектрононь �ёрма т� тиинди',
-'emailpage'       => 'Кучем� �лектрононь �ёрма тиинди',
-'emailpagetext'   => 'Тондейть ули кода нолдам� тев� формть ала т� тиинди пачфтема кучеманди.
+'emailuser'        => 'Кучем� �лектрононь �ёрма т� тиинди',
+'emailpage'        => 'Кучем� �лектрононь �ёрма тиинди',
+'emailpagetext'    => 'Тондейть ули кода нолдам� тев� формть ала т� тиинди пачфтема кучеманди.
 Электрононь адре��ь тон путыть [[Special:Preferences|тонь тиинь латцемазонза]] кармай �вондама тонь �ёрма�от "Ки�та" пак��ва, ди �ёрмань кундаенди ули кода кучем� �онць �ёрманц т� адре��.',
-'usermailererror' => 'Электрононь адре� �льб�тьк��ь:',
-'defemailsubject' => '{{SITENAME}}-нь �лектрононь �ёрма',
-'noemailtitle'    => '�ш �лектрононь адре�',
-'noemailtext'     => 'Т� тии�ь изь мак�а конд��ти �лектрононь адре�онц �ли �онь аш м�лец кунцем� ил� тиихнень ��та �ёрма�на.',
-'emailfrom'       => 'Ки�та:',
-'emailto'         => 'Кинди:',
-'emailsubject'    => 'Ки�та',
-'emailmessage'    => 'Пачфтема:',
-'emailsend'       => 'Кучем�',
-'emailccme'       => 'Кучт мондине монь �ёрмазень копи�нц.',
-'emailccsubject'  => 'Тонь $1-ти �ёрмацень копи�ц: $2',
-'emailsent'       => 'Электрононь �ёрма кучф',
-'emailsenttext'   => 'Тонь �лектрононь �ёрмаце кучф.',
-'emailuserfooter' => 'Т� �лектрононь �ёрма�ь $1 кучезе $2-� "Email user" функциеть вельде {{SITENAME}}-�а.',
+'usermailererror'  => 'Электрононь адре� �льб�тьк��ь:',
+'defemailsubject'  => '{{SITENAME}}-нь �лектрононь �ёрма',
+'noemailtitle'     => '�ш �лектрононь адре�',
+'noemailtext'      => 'Т� тии�ь изь мак�а конд��ти �лектрононь адре�онц.',
+'nowikiemailtitle' => 'Электрононь �ёрмат кардафт',
+'nowikiemailtext'  => 'Т� тиить аш м�лец кундам� �лектрононь �ёрматне ил� тиихнень к�дь�та.',
+'email-legend'     => 'Кучем� �лектрононь �ёрма ил� {{SITENAME}}нь тиинди',
+'emailfrom'        => 'Ки�та:',
+'emailto'          => 'Кинди:',
+'emailsubject'     => 'Ки�та',
+'emailmessage'     => 'Пачфтема:',
+'emailsend'        => 'Кучем�',
+'emailccme'        => 'Кучт мондине монь �ёрмазень копи�нц.',
+'emailccsubject'   => 'Тонь $1-ти �ёрмацень копи�ц: $2',
+'emailsent'        => 'Электрононь �ёрма кучф',
+'emailsenttext'    => 'Тонь �лектрононь �ёрмаце кучф.',
+'emailuserfooter'  => 'Т� �лектрононь �ёрма�ь $1 кучезе $2-� "Email user" функциеть вельде {{SITENAME}}-�а.',
 
 # Watchlist
 'watchlist'            => 'Монь мельгеваномазе',
@@ -1390,7 +1651,7 @@ $3 мак��ь туфтал�ь - ''$2''",
 'watchnologintext'     => 'Тондейть �р�ви [[Special:UserLogin|�увам�]] тонь мельгеваномацень петнеманк�а.',
 'addedwatch'           => 'Полатфоль ванома мельгеваномазот',
 'addedwatchtext'       => "Лопа�ь \"[[:\$1]]\" �увафнезь тонь [[Special:Watchlist|Мельгеванома�от]].
-С�да тов т� лопать ди мархтонза �юлмаф Корхнема лопать полафнематне кармайхть т�кш�тафтовома   т� лувома�, ��да тёжд�ень н�евома�нонды �инь тага кармайхть �ёрмадовома  [[Special:RecentChanges|улхкомбань полафнематнень лувома�]] '''�чке т�шк��а'''.
+С�да тов т� лопать ди мархтонза �юлмаф Корхнема лопать полафнематне кармайхть т�кш�тафтовома   т� лувома�, ��да тёжд�ень н�евома�нонды �инь тага кармайхть �ёрмадовома  [[Special:RecentChanges|мекольце полафнематнень лувома�]] '''�чке т�шк��а'''.
 
 Уленд�р�й тонь м�льце т� лопать нардам� тонь мельгеванома�тот, люпштак \"аф ваном� мельге\" лопань в�рдень виде уже�а.",
 'removedwatch'         => '�ардаф мельгеванома�та',
@@ -1405,18 +1666,13 @@ $3 мак��ь туфтал�ь - ''$2''",
 'watchlist-details'    => '{{PLURAL:$1|$1 лопа|$1 лопат}} мельгеваномацень ала корхнема лопат аф лувомок.',
 'wlheader-enotif'      => '* Электрононь �ёрма вельде пачфнема нолдаф тев�.',
 'wlheader-showupdated' => "* Лопат конань полафтозь тонь мекольце �ув�емадот меле н�фтев�ть '''�чке т�шк�а'''.",
-'watchmethod-recent'   => 'мельге ванома ала лопатнень кор�� улхкомбань петнематнень ванондома',
-'watchmethod-list'     => 'улхкомбань петнематнень кор�� мельге ванома ала лопат ванондома',
+'watchmethod-recent'   => 'мельге ванома ала лопатнень кор�� мекольце петнематнень ванондома',
+'watchmethod-list'     => 'мекольце петнематнень кор�� мельге ванома ала лопат ванондома',
 'watchlistcontains'    => 'Тонь мельгеванома�от $1 {{PLURAL:$1|лопа|лопат}}.',
 'iteminvalidname'      => "Пр�бала '$1'-ть мархть, лемоц аф конд��ти...",
 'wlnote'               => "�ла {{PLURAL:$1|мекольце полафнема|'''$1''' мекольце полафнемат}} ётай {{PLURAL:$2| ой�та (ча��та)|'''$2''' ой�та (ча��та)}}.",
 'wlshowlast'           => '��фтем� мекольце $1 ойхть (ча�т) $2 шит $3',
-'watchlist-show-bots'  => '��фтем� робот програмонь петнематне',
-'watchlist-hide-bots'  => 'К�шем� робот програмонь петнематне',
-'watchlist-show-own'   => '��фтем� монь петнемане',
-'watchlist-hide-own'   => 'К�шем� монь петнемане',
-'watchlist-show-minor' => '��фтем� ёмла видептематне',
-'watchlist-hide-minor' => 'К�шем� ёмла видептематне',
+'watchlist-options'    => 'Мельгеваномать латцема�на',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ванома...',
@@ -1456,77 +1712,96 @@ $NEWPAGE
 �зома мекп�ли ди лезк�:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '�ардам� лопать',
-'confirm'                     => 'Кемок�там�',
-'excontent'                   => "потмо�оль: '$1'",
-'excontentauthor'             => "потмоц уль�ь: '$1' (аньцек фк� путы�ь уль�ь'[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "шамдомада инголе потмоц уль�ь: '$1'",
-'exblank'                     => 'лопа�ь шаволь',
-'delete-confirm'              => '�ардам� "$1"',
-'delete-legend'               => '�ардам�',
-'historywarning'              => 'Инголе м�рьгома: Тон ёрат нардам� лопать, конань уль�ь и�ториец:',
-'confirmdeletetext'           => 'Тон �ърхкать нардам� лопать �ембе �онь и�тори�нц мархта.
+# Delete
+'deletepage'             => '�ардам� лопать',
+'confirm'                => 'Кемок�там�',
+'excontent'              => "потмо�оль: '$1'",
+'excontentauthor'        => "потмоц уль�ь: '$1' (аньцек фк� путы�ь уль�ь'[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "шамдомада инголе потмоц уль�ь: '$1'",
+'exblank'                => 'лопа�ь шаволь',
+'delete-confirm'         => '�ардам� "$1"',
+'delete-legend'          => '�ардам�',
+'historywarning'         => 'Инголе м�рьгома: Тон ёрат нардам� лопать, конань уль�ь и�ториец:',
+'confirmdeletetext'      => 'Тон �ърхкать нардам� лопать �ембе �онь и�тори�нц мархта.
 Эн�льтт�ма, кемок�так тон афкук� ёрат т�нь тием�, �ди тон шарьхкодь�ак мезе ли�и т�да меле, ди тон �ембе т�нь ти�ак [[{{MediaWiki:Policy-url}}|политик]] кор��.',
-'actioncomplete'              => 'Тевонь тиема�ь анок',
-'deletedtext'                 => 'Лопа�ь "<nowiki>$1</nowiki>" нардафоль. Ванк $2 мекольце нардаматнень н�фтеманк�а.',
-'deletedarticle'              => 'нардаф "[[$1]]"',
-'suppressedarticle'           => 'к�шф "[[$1]]"',
-'dellogpage'                  => '�ардамань лувома',
-'dellogpagetext'              => 'Улхкомбань нардаматнень лувома�ь ала.',
-'deletionlog'                 => 'нардамань лувома',
-'reverted'                    => 'Мърдаф ��дынголень верзие�',
-'deletecomment'               => '�ардамань туфтал:',
-'deleteotherreason'           => 'Ли�/поладомань туфтал:',
-'deletereasonotherlist'       => 'Ил� туфтал',
-'deletereason-dropdown'       => '*Мар�тонь нардама туфталхт
+'actioncomplete'         => 'Тевонь тиема�ь анок',
+'deletedtext'            => 'Лопа�ь "<nowiki>$1</nowiki>" нардафоль. Ванк $2 мекольце нардаматнень н�фтеманк�а.',
+'deletedarticle'         => 'нардаф "[[$1]]"',
+'suppressedarticle'      => 'к�шф "[[$1]]"',
+'dellogpage'             => '�ардамань лувома',
+'dellogpagetext'         => 'Ватт ��да мекольце нардаматнень лувома�ь ала.',
+'deletionlog'            => 'нардамань лувома',
+'reverted'               => 'Мърдаф ��дынголень верзие�',
+'deletecomment'          => '�ардамань туфтал:',
+'deleteotherreason'      => 'Ли�/поладомань туфтал:',
+'deletereasonotherlist'  => 'Ил� туфтал',
+'deletereason-dropdown'  => '*Мар�тонь нардама туфталхт
 ** Тиить вешфк��ь
 ** Копи�ма видек�ть �ърафтома
 ** Колендема�ь',
-'delete-edit-reasonlist'      => 'Петнем� нардамань туфталхне',
-'delete-toobig'               => 'Т� лопать кувака петнемань и�тори��ь, $1 {{PLURAL:$1|верзиеда|верзиеда}} лама. Т�фтама лопатнень нардама�ь кардаф {{SITENAME}}-нь уф уч�еви колавомада араламать туфталонк�а.',
-'delete-warning-toobig'       => 'Т� лопать кувака петнемань и�тори��ь, $1 {{PLURAL:$1|верзиеда|верзиеда}} лама. Сонь нардама�та, улема, ли�и {{SITENAME}}-нь датабаза �каманц колавома�ь; тик т�нь инголе арь�езь.',
-'rollback'                    => 'Потафтом� петнематне',
-'rollback_short'              => 'Потафтома',
-'rollbacklink'                => 'потафтом�',
-'rollbackfailed'              => 'Потафтома�ь изь ли�е',
-'cantrollback'                => '�ш кода петнемать потафтом�; мекольце путы�ь уль�ь т� лопать анцек фк� тиик�.',
-'alreadyrolled'               => '�ш кода меки кевордам� [[:$1]]нь мекольце петнемать, конань ти�ь [[User:$2|$2]] ([[User talk:$2|Корхнема]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+'delete-edit-reasonlist' => 'Петнем� нардамань туфталхне',
+'delete-toobig'          => 'Т� лопать кувака петнемань и�тори��ь, $1 {{PLURAL:$1|верзиеда|верзиеда}} лама. Т�фтама лопатнень нардама�ь кардаф {{SITENAME}}-нь уф уч�еви колавомада араламать туфталонк�а.',
+'delete-warning-toobig'  => 'Т� лопать кувака петнемань и�тори��ь, $1 {{PLURAL:$1|верзиеда|верзиеда}} лама. Сонь нардама�та, улема, ли�и {{SITENAME}}-нь датабаза �каманц колавома�ь; тик т�нь инголе арь�езь.',
+
+# Rollback
+'rollback'         => 'Потафтом� петнематне',
+'rollback_short'   => 'Потафтома',
+'rollbacklink'     => 'потафтом�',
+'rollbackfailed'   => 'Потафтома�ь изь ли�е',
+'cantrollback'     => '�ш кода петнемать потафтом�; мекольце путы�ь уль�ь т� лопать анцек фк� тиик�.',
+'alreadyrolled'    => '�ш кода меки кевордам� [[:$1]]нь мекольце петнемать, конань ти�ь [[User:$2|$2]] ([[User talk:$2|Корхнема]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 ил� тии�ь �онь петезе �ли кевордазе ни.
 
-Мекольце петнема  тизе [[User:$3|$3]] ([[User talk:$3|Корхнема]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Петнема м�льполатк� уль�ь: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Петнематнень мърдафтозь [[Special:Contributions/$2|$2]] ([[User talk:$2|Корхнема]]) ��дынгольдень верзие� мърдафтозе [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Петнематнень мърдафтозе $1; ��дынгольдень верзие� мърдафтозе $2.',
-'sessionfailure'              => 'Улема, ли��ь пр�бала тонь �увама пинг�та; програмонь �кама�ь лотказев�ь �увамать върьг�темада аралама туфталонк�а. Эн�льтт�ма, люпштак "меки" ди одонзафтт лопать, кона�та тон �ать, меле тик �ембе одук�.',
+Мекольце петнема  тизе [[User:$3|$3]] ([[User talk:$3|Корхнема]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Петнема м�льполатк� уль�ь: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Петнематнень мърдафтозь [[Special:Contributions/$2|$2]] ([[User talk:$2|Корхнема]]) ��дынгольдень верзие� мърдафтозе [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Петнематнень мърдафтозе $1; ��дынгольдень верзие� мърдафтозе $2.',
+'sessionfailure'   => 'Улема, ли��ь пр�бала тонь �увама пинг�та; програмонь �кама�ь лотказев�ь �увамать върьг�темада аралама туфталонк�а. Эн�льтт�ма, люпштак "меки" ди одонзафтт лопать, кона�та тон �ать, меле тик �ембе одук�.',
+
+# Protect
 'protectlogpage'              => '�ралама лувома',
 'protectlogtext'              => '�ла лопань п�к�тама-панжема лувома�ь. Ванк [[Special:ProtectedPages|аралаф лопатнень лувома�ь]] т� пингонь �и�темонь лопать араламанк�а.',
 'protectedarticle'            => 'аралаф "[[$1]]"',
 'modifiedarticleprotection'   => '"[[$1]]"-нь араламань виенц полафт�ь',
 'unprotectedarticle'          => '"[[$1]]" аф аралаф',
+'movedarticleprotection'      => 'шашфтозень аралама латцематне "[[$2]]"�та "[[$1]]"�',
 'protect-title'               => '"$1"-нь араламань виец арафнема',
+'prot_1movedto2'              => '[[$1]] шашфтфоль [[$2]]�',
 'protect-legend'              => '�раламать кемок�так',
 'protectcomment'              => 'М�льполатк�:',
 'protectexpiry'               => 'Шумордави:',
 'protect_expiry_invalid'      => 'Шумордама пинге аф конд��ти.',
 'protect_expiry_old'          => 'Шумордама пинг�ь ёта�ь.',
 'protect-unchain'             => 'Панжем� ётафтомань м�рьговома�ь',
-'protect-text'                => 'Тондейть ули кода т��а ваном� �ди полафтом� аралама виенц <strong><nowiki>$1</nowiki></strong> лопанди.',
-'protect-locked-blocked'      => '�ш кода полафтом� араламать виенц �ёлгома пинг�та. Лопать т�ниень латцеманза т��от <strong>$1</strong>:',
-'protect-locked-dblock'       => '�ш кода полафтом� араламать виенц  датабазонь п�к�тамать �юнеда.
-Лопать т�ниень латцеманза т��от <strong>$1</strong>:',
-'protect-locked-access'       => 'Тонь �ёрматфтома�от аф м�рьгови лопать аралама виенц полафтома.
-Т��а ащихть т� пингонь арафнематне <strong>$1</strong> лопанди:',
+'protect-text'                => "Тондейть ули кода т��а ваном� �ди полафтом� аралама виенц '''<nowiki>$1</nowiki>''' лопанди.",
+'protect-locked-blocked'      => "�ш кода полафтом� араламать виенц �ёлгома пинг�та. Лопать т�ниень латцеманза т��от '''$1''':",
+'protect-locked-dblock'       => "�ш кода полафтом� араламать виенц  датабазонь п�к�тамать �юнеда.
+Лопать т�ниень латцеманза т��от '''$1''':",
+'protect-locked-access'       => "Тонь �ёрматфтома�от аф м�рьгови лопать аралама виенц полафтома.
+Т��а ащихть т� пингонь арафнематне '''$1''' лопанди:",
 'protect-cascadeon'           => 'Т� лопа�ь т� пинг�та аралаф ��� ме� �онь �увафнезь {{PLURAL:$1|ка�кад аралама ала лопань лувома�|как�кад аралама лопатнень к�рьк��}}. Тондейть ули кода т� лопать аралама виенц полафтом�, аньцек как�кад аралама�ь ��кок� ил�ды.',
-'protect-default'             => '(апак полафтт)',
+'protect-default'             => 'М�рьгови �ембе тиихненди',
 'protect-fallback'            => 'Эр�ви "$1"-ть м�рьговомац',
-'protect-level-autoconfirmed' => 'Сёлгом� аф �ёрматф тиихнень',
+'protect-level-autoconfirmed' => 'Сёлгом� од �ди аф �ёрматф тиихнень',
 'protect-level-sysop'         => '�ньцек �и�темонь в�тик�не',
 'protect-summary-cascade'     => 'ка�кад лаца',
 'protect-expiring'            => 'шумордави $1 (UTC)',
+'protect-expiry-indefinite'   => 'аф кеме',
 'protect-cascade'             => '�ралам� лопатнень, конатнень �увафтозь т� лувома� (ка�кад араламать алу)',
 'protect-cantedit'            => 'Тондейть аш кода лопать аралама виензон полафтом�, ��� ме� тонь
 аш петнемань м�рьговома�ь.',
+'protect-othertime'           => 'Ил� пинге:',
+'protect-othertime-op'        => 'ил� пинге',
+'protect-existing-expiry'     => 'Т�ниень �ирелгодома пинге: $3, $2',
+'protect-otherreason'         => 'Ил�/поладомань туфтал:',
+'protect-otherreason-op'      => 'ил�/поладомань туфтал',
+'protect-dropdown'            => '*Мар�тонь аралама туфталхне
+** Вельф лама колендема�ь
+** Вельф лама лудна�ь (spam)
+** Потафнема петнематнень мархта тюрема�ь
+** Вельф лама ли�емат-�увамот лопа�а',
+'protect-edit-reasonlist'     => 'Петнем� аралама туфталхне',
+'protect-expiry-options'      => '2 ойхть (ча�т):2 hours,1 ши:1 day,3 шит:3 days,1 тарга (недл�):1 week,2 таргат (недл�т):2 weeks,1 ков:1 month,3 кофт:3 months,6 кофт:6 months,1 киза:1 year,пефтома:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'М�рьговома:',
 'restriction-level'           => 'П�к�тама вий�ь:',
 'minimum-size'                => 'Минимум кувалмоц',
@@ -1549,7 +1824,8 @@ $NEWPAGE
 'undeletepage'                 => '��фтем� �ди мърдафтом� нардаф лопатне',
 'undeletepagetitle'            => "'''То�а кирдевихть [[:$1|$1]]-нь нардаф верзиенза'''.",
 'viewdeletedpage'              => '��фтетем� нардаф лопатне',
-'undeletepagetext'             => 'С� лопатнень нардазь, интай �инь т� пинг�а пърдафк��ат �ди ули кода �инь мърдафтом�. Пърдафк��ь ару�фтови пинг�та пинг�.',
+'undeletepagetext'             => 'Т� {{PLURAL:$1|лопать нардазь интай �он|$1 лопатнень нардазь интай �инь}} т�нем� аркив�а. Ули кода мърдафтом� лопат аркив�та. 
+�ркив�ь ару�фтови пинг�та пинг�.',
 'undelete-fieldset-title'      => 'Мърдафтом� верзиетне',
 'undeleteextrahelp'            => "Сембонь лопать и�тори�нц мърдафтоманди �р�ви кадом� �ембе нилюжет т�штьк�фтома ди люпштам� '''''Мърдафтом�'''''. Пакшень-пакшень мърдафтоманди путт т�шк�т �ембе нилюжева �отфт �р�ви верзиетнень мархта ди люпштак '''''Мърдафтом�'''''.'''''Валхтом�''''' пун�ть люпштамада меле м�льполатк�онь пак�� ди �ембе нилюжетне шамдомихть.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|верзие аркив�а|верзиет аркив�а}}',
@@ -1557,12 +1833,13 @@ $NEWPAGE
 Эвонд�р��ь ил� лопа т�ка лем�а �онь нардамада меле, мърдафтф верзиетне повихть ��дынголень и�тори��.',
 'undeleterevdel'               => 'Мърдафтома аф тиеви мъз�рда �он в�ти в�ре лопать �ли файлонь верзи�ть пакшень-пакшень нардаманди. Т� тев�а тондейть аф �р�ви улхкомба нардаф верзиетнень ваном� �ли панжем�.',
 'undeletehistorynoadmin'       => 'Т� лопа�ь нардафоль. �ла т�штьф нардамань туфтал лихтема�ь �ди лувома�ь, ко�а �ёрматфт �ембе кит т� лопать петнезь �онь нардамада инголе. �ардаф верзиеть тек�тонза м�рьгови ваном� аньцек оцюн�тненди.',
-'undelete-revision'            => '�ардаф $1-нь верзиец ($2 нардазе $3):',
+'undelete-revision'            => '�ардаф $1нь верзиец ($4, $5) $3 нардазе:',
 'undeleterevision-missing'     => 'Стама верзиеть аш �ли �он аф конд��ти. Улема, тон ётать аф виде �юлмафк�ова, ил�к� т� верзие�ь мърдафтфоль �ли аркив�та нардафоль.',
 'undelete-nodiff'              => 'С�дынгольдень верзиет и�ть мув.',
 'undeletebtn'                  => 'Мърдафтом�',
 'undeletelink'                 => 'мърдафтома',
 'undeletereset'                => 'Валхтом�',
+'undeleteinvert'               => 'Валхтом� кочкама',
 'undeletecomment'              => 'М�льполатк�:',
 'undeletedarticle'             => 'мърдафтф "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|1 верзие|$1 верзиет}} мърдафтфт',
@@ -1571,7 +1848,7 @@ $NEWPAGE
 'cannotundelete'               => 'Мърдафтома изь ли�ев; ил� тии�ь, улема, уль�ь ва�енцек� кие �онь мърдафтозе.',
 'undeletedpage'                => "<big>'''$1 мърдафтфоль'''</big>
 
-Ванк [[Special:Log/delete|нардамань лувома�ь]] улхкомбань нардаматнень �ди мърдафтоматнень н�фтеманк�а.",
+Ванк [[Special:Log/delete|нардамань лувома�ь]] мекольце нардаматнень �ди мърдафтоматнень н�фтеманк�а.",
 'undelete-header'              => 'Ванк [[Special:Log/delete|нардамань лувома�ь]] улхкомба нардаф лопатнень н�фтеманк�а.',
 'undelete-search-box'          => 'Ваном� нардаф лопатне',
 'undelete-search-prefix'       => '��фтем� лопат т��та ушедом�:',
@@ -1585,6 +1862,7 @@ $NEWPAGE
 'undelete-error-long'          => 'Ли�ть �льб�тьк�т мърдафтома файл:
 
 $1',
+'undelete-show-file-confirm'   => 'Тонь афкук� м�льце ваном� файлть нардаф ревизиенц "<nowiki>$1</nowiki>" $2�та $3�а?',
 'undelete-show-file-submit'    => 'Ина',
 
 # Namespace form on various pages
@@ -1593,26 +1871,27 @@ $1',
 'blanknamespace' => '(Пр�)',
 
 # Contributions
-'contributions' => 'Тиить путк�онза',
-'mycontris'     => 'Монь путк�не',
-'contribsub2'   => '$1 ($2)-нди',
-'nocontribs'    => 'Т� вешфк�ть кор�� кодамога полафтомат и�ть мув.',
-'uctop'         => '(пр�нь)',
-'month'         => 'Ков�та (ди ��дынголе):',
-'year'          => 'Кизо�та (ди ��дынголе):',
-
-'sp-contributions-newbies'     => '��фтем� аньцек од �ёрматфтоматнень путк��на',
-'sp-contributions-newbies-sub' => 'Од �ёрматфтома�та',
-'sp-contributions-blocklog'    => 'Сёлгомань лувома�ь',
-'sp-contributions-search'      => 'Вешендем� путк�т',
-'sp-contributions-username'    => 'IP адре� �ли тиить лемоц:',
-'sp-contributions-submit'      => 'Вешендема',
+'contributions'       => 'Тиить путк�онза',
+'contributions-title' => 'Тиить путк�онза $1нди',
+'mycontris'           => 'Монь путк�не',
+'contribsub2'         => '$1 ($2)-нди',
+'nocontribs'          => 'Т� вешфк�ть кор�� кодамога полафтомат и�ть мув.',
+'uctop'               => '(пр�нь)',
+'month'               => 'Ков�та (ди ��дынголе):',
+'year'                => 'Кизо�та (ди ��дынголе):',
+
+'sp-contributions-newbies'       => '��фтем� аньцек од �ёрматфтоматнень путк��на',
+'sp-contributions-newbies-sub'   => 'Од �ёрматфтома�та',
+'sp-contributions-newbies-title' => 'Тиить путк�онза од �ёрматфтоматненди',
+'sp-contributions-blocklog'      => 'Сёлгомань лувома�ь',
+'sp-contributions-search'        => 'Вешендем� путк�т',
+'sp-contributions-username'      => 'IP адре� �ли тиить лемоц:',
+'sp-contributions-submit'        => 'Вешендема',
 
 # What links here
 'whatlinkshere'            => 'Сюлмафк�т т�за',
 'whatlinkshere-title'      => 'Лопат конат �юлмафт "$1" мархта',
 'whatlinkshere-page'       => 'Лопа:',
-'linklistsub'              => '(Сюлмафк�нень лувома�ь)',
 'linkshere'                => "С� лопатне �юлмафт '''[[:$1]]''' мархта:",
 'nolinkshere'              => "Лопат, конат �юлмафт '''[[:$1]]''' мархта ашет.",
 'nolinkshere-ns'           => "�ш лопат �юлмафт '''[[:$1]]''' мархта  кочкаф лемботмо�та.",
@@ -1658,6 +1937,8 @@ $1',
 'ipbotherreason'                  => 'Ил�/поладомань туфтал:',
 'ipbhidename'                     => 'К�шем� тиить лемоц �ёлгома лувома�та, т�ниень �ёлгома лувомать ди тиинь лувомать',
 'ipbwatchuser'                    => 'Ваном� т� тиить лопанц ди �онь корхнема лопанц мельге.',
+'ipballowusertalk'                => 'М�рьгом� т� тиинди петнем� ��ь корнема лопанц мъз�р� �он ащи �ёлкфок�',
+'ipb-change-block'                => 'Сёлгом� одук� т� тиить н� латцематнень кор��',
 'badipaddress'                    => '�ф конд��ти IP адре�',
 'blockipsuccesssub'               => 'Сёлгома ёта�ь лац',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] �ёлгозь.<br />
@@ -1667,6 +1948,7 @@ $1',
 'ipb-unblock'                     => 'Тиинь �ли IP адре�онь �ёлгома валхтом�',
 'ipb-blocklist-addr'              => '$1нь т�ниень �ёлгоманза',
 'ipb-blocklist'                   => 'Ваном� т�ниень �ёлгомат',
+'ipb-blocklist-contribs'          => 'Путк�не $1 лопанди',
 'unblockip'                       => 'Валхтом� �ёлгома тии�та',
 'unblockiptext'                   => '�олдак тев� форм ала инголе �ёлкф тиить �уваманц �ёлкф IP адре� �ли тиинь лемоц вельде мърдафтоманк�а.',
 'ipusubmit'                       => 'Валхтом� �ёлгома т� адре��та',
@@ -1675,6 +1957,9 @@ $1',
 'ipblocklist'                     => 'Сёлкф IP адре�нень �ди тиинь лепнень лувома�ь',
 'ipblocklist-legend'              => 'Мум� �ёлкф тиить',
 'ipblocklist-username'            => 'Тиить лемоц �ли IP адре�:',
+'ipblocklist-sh-userblocks'       => '$1 �ёрматфтома �ёлгоматнень',
+'ipblocklist-sh-tempblocks'       => '$1 пингеётконь �ёлгоматнень',
+'ipblocklist-sh-addressblocks'    => '$1 �ькамонь IP �ёлгоматнень',
 'ipblocklist-submit'              => 'Вешендема',
 'blocklistline'                   => '$1, $2 �ёлгозь $3 ($4)',
 'infiniteblock'                   => 'пефтома',
@@ -1683,14 +1968,18 @@ $1',
 'noautoblockblock'                => '��лек �ёлгома лоткаф',
 'createaccountblock'              => '�ёрматфтома�ь тиема �ёлкф',
 'emailblock'                      => '�лектрононь адре� �ёлкф',
+'blocklist-nousertalk'            => 'аш кода петнем� ��ь корхнема лопанц',
 'ipblocklist-empty'               => 'Сёлгома лувома�ь шава.',
 'ipblocklist-no-results'          => 'Вешф IP адре� �ли тиить лемоц аф �ёлкф.',
 'blocklink'                       => '�ёлгома',
 'unblocklink'                     => 'панжем�',
+'change-blocklink'                => 'полафтом� �ёлгома',
 'contribslink'                    => 'путк�.',
 'autoblocker'                     => 'Э�лек �ёлкф ��� ме� тонь IP адре�цень нолда�ь тев� "[[User:$1|$1]]". $1-нь �ёлгомац туфтал: "$2"',
 'blocklogpage'                    => 'Сёлгомань лувома',
+'blocklog-fulllog'                => 'П�шк�е �ёлгомань лувома�ь',
 'blocklogentry'                   => '[[$1]] �ёлкф $2 $3 пинг�',
+'reblock-logentry'                => 'полафт�ь �ёлгома латцематне [[$1]]нди �ёлгомать �ирелгодома пинге ули $2 $3',
 'blocklogtext'                    => 'Т� лувома� �ув�ихть тиихнень �ембе п�к�тамань ди панжемань тефне.
 Э�ь �ёлгови IP адре�не т�зк аф �ув�ихть.
 Ванк [[Special:IPBlockList|IP п�к�таматнень лувомать]] т�ниень �камань кардафк�нень ди п�к�таматнень мархта.',
@@ -1699,11 +1988,14 @@ $1',
 'block-log-flags-nocreate'        => 'од �ёрматфтома�ь аф тиеви',
 'block-log-flags-noautoblock'     => '��ь тиеви п�к�тама аф тиеви',
 'block-log-flags-noemail'         => '�лектрононь адре��ь п�к�тазь',
+'block-log-flags-nousertalk'      => 'аш кода петнем� ��ь корхнема лопанц',
 'block-log-flags-angry-autoblock' => 'келептьф авто-п�к�тафтома�ь нолдафоль',
 'range_block_disabled'            => 'Т�ни оцю п�к�тафк�не аф тиевихть �и�темонь в�тик�нень ��а.',
 'ipb_expiry_invalid'              => '�ф конд��ти �ирелгодома пинге.',
 'ipb_expiry_temp'                 => 'К�шф тиинь лемть �ёлгоматне мъз�рдонга аф полафтовихть.',
 'ipb_already_blocked'             => '"$1" �ёлкфоль ни',
+'ipb-needreblock'                 => '== Сёлкф ни ==
+$1 �ёлкф ни. М�льце полафтом� латцематнень?',
 'ipb_cant_unblock'                => 'Эльб�тьк�: ID $1-нь кардафк�оц аф муви. Улема, т� кардафк��ь валхтфоль ни.',
 'ipb_blocked_as_range'            => 'Эльб�тьк�: IP $1 аф кардаф виде�та ди �оннеда аш кода кардафк��ь валхтом�.
 Сон, интай улема, кардафоль кода  $2-нь потмонц пакшец, конань �зда ули кода кардафк�онь валхтом�.',
@@ -1717,6 +2009,7 @@ $1',
 'sorbsreason'                     => 'Тонь IP адре�це лувови панжада ётка �кай �ервероннек� DNSBL-�а, кона�ь нолдаф тев� {{SITENAME}}�а.',
 'sorbs_create_account_reason'     => 'Тонь IP адре�це лувови панжада ётка �кань �ервероннек� DNSBL-�а кона�ь нолнезь тев� {{SITENAME}}�а.
 Тондейть аш кода �ёрматфтомать тием�',
+'cant-block-while-blocked'        => 'Тондейть аш кода �ёлгом� ил� тиихнень мъз�р� тон тонць �ёлкф.',
 
 # Developer tools
 'lockdb'              => 'П�к�там� датабазать',
@@ -1740,9 +2033,9 @@ $1',
 'databasenotlocked'   => 'Датабаза�ь аф п�к�таф.',
 
 # Move page
-'move-page'               => 'Шашфтом� $1 од ва�т�',
-'move-page-legend'        => 'Шашафтом� лопать ил� ва�т�',
-'movepagetext'            => "Форм ала тев� нолдам�та тон лопать од� лемде�ак, �ембе �онь и�тори�ц ули шашфтф мархтонза од лем лопа�.
+'move-page'                    => 'Шашфтом� $1 од ва�т�',
+'move-page-legend'             => 'Шашафтом� лопать ил� ва�т�',
+'movepagetext'                 => "Форм ала тев� нолдам�та тон лопать од� лемде�ак, �ембе �онь и�тори�ц ули шашфтф мархтонза од лем лопа�.
 Сире лемоц арай од лем лопа� умборондафтфк�ок�.
 Лемть мархта умборондафтфк�не улихть кода ��лек одонзам�. Улефт�р�й м�льце �инь ��лек одонзальхть, �р�ви нама варжам�[[Special:DoubleRedirects|кафонзаф]] �ли [[Special:BrokenRedirects|�интьф умборондафтфк�не]].
 Тондейть �ави лацка�та варжам� �юлмафк�не ил�д�ть арафнефок� виде ёну.
@@ -1752,50 +2045,62 @@ $1',
 '''И�ГОЛЕ МЯРЬГОМ�!'''
 Од� лемдема�ь канни �одаф лопанди апак учт �ди вак�ка аф ётави полафтома�ь;
 �н�льтт�ма арь�ек тевда инголе ме� тон шарьхкод�т мезе ли�и тонь тиемада меле.",
-'movepagetalktext'        => "Сотф корхнема лопа�ь ули ��лек шашфтф мархтонза '''кафта тевда башка:'''
+'movepagetalktext'             => "Сотф корхнема лопа�ь ули ��лек шашфтф мархтонза '''кафта тевда башка:'''
 *�ф шава корхнема лопа�ь уль�ь ни ил� лем�а, �ли
 *Тон изеть пута т�шк�к� пак��� ала.
 
 С� тефнень �юнеда тондейть �ави к�дьвельде лопать шашфтом� �ли шоворем� кода �р�ви.",
-'movearticle'             => 'Шашфтом� лопать ил� ва�т�:',
-'movenotallowed'          => 'Тон аф м�рьговат шашфтом� лопат од ва�т�.',
-'newtitle'                => 'Од лем�:',
-'move-watch'              => 'Ваном� т� лопать мельге',
-'movepagebtn'             => 'Шашфтом� лопать ил� ва�т�',
-'pagemovedsub'            => 'Шашфтома�ь ёта�ь лац',
-'movepage-moved'          => '<big>\'\'\'"$1"�ь шашфтфоль "$2"�\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Т� лем мархта лопа�ь уль�ь ни �ли лем�ь, кона тон кочкать аф конд��ти.
+'movearticle'                  => 'Шашфтом� лопать ил� ва�т�:',
+'movenologin'                  => '�пак �увак',
+'movenologintext'              => 'Эр�ви улем� �ёрматфтф тиик� ди ва�енда [[Special:UserLogin|�увам�]] од ва�т� лопатнень шашфтоманди.',
+'movenotallowed'               => 'Тон аф м�рьговат шашфтом� лопат од ва�т�.',
+'movenotallowedfile'           => 'Тон аф м�рьговат шашфтом� файлхт.',
+'cant-move-user-page'          => 'Тон аф м�рговат шашфтом� тиинь лопа�нон (�инь �ублопафтомо�т).',
+'cant-move-to-user-page'       => 'Тон аф м�рьговат шашфтом� лопат тиинь лопа� (тиинь �ублопаданза башка).',
+'newtitle'                     => 'Од лем�:',
+'move-watch'                   => 'Ваном� т� лопать мельге',
+'movepagebtn'                  => 'Шашфтом� лопать ил� ва�т�',
+'pagemovedsub'                 => 'Шашфтома�ь ёта�ь лац',
+'movepage-moved'               => '<big>\'\'\'"$1"�ь шашфтфоль "$2"�\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Умборондафтфк� тифоль.',
+'movepage-moved-noredirect'    => 'Умборондафтфк�онь тиема�ь лоткафоль.',
+'articleexists'                => 'Т� лем мархта лопа�ь уль�ь ни �ли лем�ь, кона тон кочкать аф конд��ти.
 �рь�ек ил� лем.',
-'cantmove-titleprotected' => '�ш кода шашфтом� лопать т� ва�т� ��� ме� т� од кон�к��ь тиемада аралаф',
-'talkexists'              => "'''Т� лопать шашфтомац анок, аньцек �онь корхнема лопац аф шашфтови, ��� ме� од лем�а фк� лопа уль�ь ни. Эн�льтт�ма, шоворьфтть �инь к�дьвельде.'''",
-'movedto'                 => 'шашфтфоль',
-'movetalk'                => 'Шашфтт �отф мархтонза корхнема лопать',
-'move-subpages'           => 'Шашфтт �ембе �ублопатне кда �р�вихть',
-'move-talk-subpages'      => 'Шашфтт �ембе корхнема лопатнень �ублопа�на кда �р�вихть',
-'movepage-page-exists'    => 'Лопа�ь $1 уль�ь ни и �он ��лек одук� аф �ёрмадови.',
-'movepage-page-moved'     => 'Лопа�ь $1 шашфтфоль $2-�.',
-'movepage-page-unmoved'   => 'Лопать $1 аш кода шашфтом� $2-�.',
-'movepage-max-pages'      => 'Сембода лама $1 {{PLURAL:$1|лопа|лопат}} шашфтфольхть ил� ва�т� и фк�вок ��да тов аф кармай ��лек шашфтовома.',
-'1movedto2'               => '[[$1]] шашфтфоль [[$2]]�',
-'1movedto2_redir'         => '[[$1]] шашфтфоль [[$2]]� ил� ва�т� умборондафтома вельде',
-'movelogpage'             => 'Ил� ва�т� шашфтомань лувома�ь',
-'movelogpagetext'         => '�ла од ва�т� шашфтф лопатнень лувома�ь.',
-'movereason'              => 'Туфтал:',
-'revertmove'              => 'вел�фтом�',
-'delete_and_move'         => '�ардам� �ди од ва�т� шашфтом�',
-'delete_and_move_text'    => '==�ардама�ь вешф==
+'cantmove-titleprotected'      => '�ш кода шашфтом� лопать т� ва�т� ��� ме� т� од кон�к��ь тиемада аралаф',
+'talkexists'                   => "'''Т� лопать шашфтомац анок, аньцек �онь корхнема лопац аф шашфтови, ��� ме� од лем�а фк� лопа уль�ь ни. Эн�льтт�ма, шоворьфтть �инь к�дьвельде.'''",
+'movedto'                      => 'шашфтфоль',
+'movetalk'                     => 'Шашфтт �отф мархтонза корхнема лопать',
+'move-subpages'                => 'Шашфтт �ембе �ублопатне кда �р�вихть',
+'move-talk-subpages'           => 'Шашфтт �ембе корхнема лопатнень �ублопа�на кда �р�вихть',
+'movepage-page-exists'         => 'Лопа�ь $1 уль�ь ни и �он ��лек одук� аф �ёрмадови.',
+'movepage-page-moved'          => 'Лопа�ь $1 шашфтфоль $2-�.',
+'movepage-page-unmoved'        => 'Лопать $1 аш кода шашфтом� $2-�.',
+'movepage-max-pages'           => 'Сембода лама $1 {{PLURAL:$1|лопа|лопат}} шашфтфольхть ил� ва�т� и фк�вок ��да тов аф кармай ��лек шашфтовома.',
+'1movedto2'                    => '[[$1]] шашфтфоль [[$2]]�',
+'1movedto2_redir'              => '[[$1]] шашфтфоль [[$2]]� ил� ва�т� умборондафтома вельде',
+'move-redirect-suppressed'     => 'умборондафтфтк� лоткафтфоль',
+'movelogpage'                  => 'Ил� ва�т� шашфтомань лувома�ь',
+'movelogpagetext'              => '�ла од ва�т� шашфтф лопатнень лувома�ь.',
+'movereason'                   => 'Туфтал:',
+'revertmove'                   => 'вел�фтом�',
+'delete_and_move'              => '�ардам� �ди од ва�т� шашфтом�',
+'delete_and_move_text'         => '==�ардама�ь вешф==
 Эр�вк�тов�ь лопа "[[:$1]]" уль�ь ни.
 М�льце нардамонза од ва�т� шашфтомань шумордаманк�а?',
-'delete_and_move_confirm' => 'Ина, нардак лопать',
-'delete_and_move_reason'  => '�ардаф од ва�т� шашфтомань шумордамонк�а',
-'selfmove'                => 'Ли�ема ва�тонь ди од ва�тонь кон�к�не фкат;
+'delete_and_move_confirm'      => 'Ина, нардак лопать',
+'delete_and_move_reason'       => '�ардаф од ва�т� шашфтомань шумордамонк�а',
+'selfmove'                     => 'Ли�ема ва�тонь ди од ва�тонь кон�к�не фкат;
 аш кода шашфтом� лопать т�ка ва�т� кона �он ащи ни.',
-'immobile_namespace'      => 'Ли�ема �ли од ва�тонь кон�к��ь �вови ил� кон�к�та;
-аш кода ётафтом� лопат инголень ва�т�та од ва�т� т� лемботмо�а.',
-'imagenocrossnamespace'   => '�ш кода шашфтом� архтофк��ь аф архтофк�онь лемботмо�',
-'imagetypemismatch'       => 'Файлть од келептемац �вови �онь �ортодонза',
-'imageinvalidfilename'    => 'Вешеви файллем�ь аф конд��ти',
-'fix-double-redirects'    => 'Одонзам� �ембе умборондафтфк�не конатне �юлмафт ушедомань лемть мархта',
+'immobile-source-namespace'    => '�ш кода шашфтом� лопатнень "$1" лемботмо�а',
+'immobile-target-namespace'    => '�ш кода шашфтом� лопатнень "$1" лемботмо�',
+'immobile-target-namespace-iw' => 'Интерфикинь �юлмафк��ь аф конд��ти лопать шашфтоманди.',
+'immobile-source-page'         => 'Т� лопа�ь аф шашфтови.',
+'immobile-target-page'         => '�ш кода шашфтом� �� кон�к��.',
+'imagenocrossnamespace'        => '�ш кода шашфтом� архтофк��ь аф архтофк�онь лемботмо�',
+'imagetypemismatch'            => 'Файлть од келептемац �вови �онь �ортодонза',
+'imageinvalidfilename'         => 'Вешеви файллем�ь аф конд��ти',
+'fix-double-redirects'         => 'Одонзам� �ембе умборондафтфк�не конатне �юлмафт ушедомань лемть мархта',
+'move-leave-redirect'          => 'Кадом� умборондафтфк�не фтала',
 
 # Export
 'export'            => 'Вим� лопатнень файл�',
@@ -1804,7 +2109,7 @@ $1',
 
 Лопатнень вимонди путт кон�к��нон тек�тонь кудн�� ала, фк� кон�к� фк� кик��, ди кочкак кда м�льце т�ниень верзиеть, �тане ина �ембе �ире верзиет лопань и�тори�ть кик�онзон мархта �ли аньцек т�ниень верзиеть мекольце петнемань информациенц мархта.
 
-Мекольце вариант�а тондейть ули кода кундам� �юлмафк�ть, кепотьк�онди [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] "[[{{MediaWiki:Mainpage}}]]" лопанди.',
+Мекольце вариант�а тондейть ули кода кундам� �юлмафк�ть, кепотьк�онди [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] "[[{{MediaWiki:Mainpage}}]]" лопанди.',
 'exportcuronly'     => 'Сувафтом� аньцек т�ниень верзиеть, аф �ембе и�тори�нзон',
 'exportnohistory'   => "----
 '''Шарфтт м�льце:''' П�шк�е и�тори�нь лопатнень вима�ь т� формть вельде кардаф �и�темонь �кафтомань туфталонц инк�а.",
@@ -1820,7 +2125,7 @@ $1',
 'allmessagesdefault'        => '�пак полафтт тек�т',
 'allmessagescurrent'        => 'Т�ниень тек�т',
 'allmessagestext'           => 'Т� MediaWiki-�а ва�ьфневи �и�темонь пачфтематнень лувома�ь.
-Эн�льтт�ма, �увак [http://www.mediawiki.org/wiki/Localisation MediaWiki Локализацие�] ди [http://translatewiki.net Betawiki-�] кда тонь м�льце тием� ��ь путк�це мар�тонь MediaWiki локализацие�.',
+Эн�льтт�ма, �увак [http://www.mediawiki.org/wiki/Localisation MediaWiki Локализацие�] ди [http://translatewiki.net translatewiki.net-�] кда тонь м�льце тием� ��ь путк�це мар�тонь MediaWiki локализацие�.',
 'allmessagesnotsupportedDB' => "Т� лопа� аш кода кунцем� ��� ме� '''\$wgUseDatabaseMessages'''лоткафоль.",
 'allmessagesfilter'         => 'Пачфтемань лепнень фильтра�ь:',
 'allmessagesmodified'       => '��фтем� аньцек полафтф',
@@ -1840,9 +2145,12 @@ $1',
 'import-interwiki-text'      => 'Кочкак Вики ди лопань кон�к�онц �р�вихть таргаманди.
 Верзиень ши�на ди петнихнень лем�на улихть ванфтфт.
 Сембе ётковикинь таргама тефне т�шневихть [[Special:Log/import|таргамань лувома�]].',
+'import-interwiki-source'    => 'Вики ли�ьма/лопа:',
 'import-interwiki-history'   => 'Копи�фтом� т� лопать �ембе и�тори�нь верзиенза',
 'import-interwiki-submit'    => 'Таргам�',
 'import-interwiki-namespace' => 'Пачфтема лемботма:',
+'import-upload-filename'     => 'Файллем:',
+'import-comment'             => 'М�льполатк�:',
 'importtext'                 => 'Эн�льтт�ма таргак файлть Вики ли�ьмо�тонза [[Special:Export|вима лезк��ь]] тев� нолдазь, ванфтт т�нь тонь �одама машина�а ди тонк т�зк.',
 'importstart'                => 'Лопатне тарк�евихть...',
 'import-revision-count'      => '$1 {{PLURAL:$1|ил�к�топтома|ил�к�топтомат}}',
@@ -1858,12 +2166,14 @@ $1',
 'importnofile'               => 'Фк�вок таргама файл изь тонгов.',
 'importuploaderrorsize'      => 'Таргама файлть тонгома�ь изь ли�ев. Файл�ь м�рьгови тонгома кувалмода лама.',
 'importuploaderrorpartial'   => 'Таргама файлонь тонгома�ь изь ли�ев. �ньцек файлть пакшец тонкфоль.',
-'importuploaderrortemp'      => 'Таргама файлть тонгома�ь изь ли�ев. Пингонь паргон� изь мув.',
+'importuploaderrortemp'      => 'Таргама файлть тонгома�ь изь ли�ев. �ткопингонь паргон� изь мув.',
 'import-parse-failure'       => 'XML таргама анализонь �льб�тьк��ь',
 'import-noarticle'           => '�шет лопат таргаманди!',
 'import-nonewrevisions'      => 'Сембе ил�к�топтоматне таркфольхть ��дынголе.',
 'xml-error-string'           => '$1 $2-це кик��а, палмань $3 ($4 байтт): $5',
 'import-upload'              => 'Тонгом� XML информацие�ь',
+'import-token-mismatch'      => 'Се��и�нь нформацие�ь юма�ь. Т�р�фтт тага ве�ть.',
+'import-invalid-interwiki'   => '�ш кода таргам� кочкаф Викить.',
 
 # Import log
 'importlogpage'                    => 'Таргамань лувома',
@@ -1874,19 +2184,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|ил�к�топтома|ил�к�топтомат}} $2-�та',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Монь тиинь лопазе',
+'tooltip-pt-userpage'             => 'Тонь тиинь лопаце',
 'tooltip-pt-anonuserpage'         => 'Тиить лопанц IP потмо�а, конань ��а тон петне�ак кода',
-'tooltip-pt-mytalk'               => 'Монь корхтама лопазе',
+'tooltip-pt-mytalk'               => 'Тонь корхтама лопаце',
 'tooltip-pt-anontalk'             => 'Корхнема�ь т� IP адре��та тиф петнематнень колга',
 'tooltip-pt-preferences'          => 'Монь латцемане',
 'tooltip-pt-watchlist'            => 'Лопатне конатнень мельге тон ванат полафнематнень кор��',
-'tooltip-pt-mycontris'            => 'Монь путк�нень лувома�ь',
+'tooltip-pt-mycontris'            => 'Тонь путк�тнень лувома�на',
 'tooltip-pt-login'                => 'Т��а ули кода �ёрматфтом� аньцек т� аф �р�вик�.',
 'tooltip-pt-anonlogin'            => 'Тонь анайхть �увам� лопа�, интай т� аф кошардома�ь.',
 'tooltip-pt-logout'               => 'Ли�ем�',
 'tooltip-ca-talk'                 => 'Лопапотмонь колга корхнема',
 'tooltip-ca-edit'                 => 'Т� лопать петневи. Эн�льтт�ма, нолдак тев� ва�ень н�фтема пун� лопать ванфтомада инголе.',
-'tooltip-ca-addsection'           => 'Путт м�льполатк�це т� корхнеманди.',
+'tooltip-ca-addsection'           => 'Ушедом� од пакш',
 'tooltip-ca-viewsource'           => 'Т� лопа�ь аралаф. Ули кода ваном� ли�ьмонц ланг�.',
 'tooltip-ca-history'              => 'Т� лопать ётай верзиенза.',
 'tooltip-ca-protect'              => '�ралак т� лопать',
@@ -1902,11 +2212,11 @@ $1',
 'tooltip-n-mainpage'              => 'Сувак Пр� лопа�',
 'tooltip-n-portal'                => 'Проектть колга, мезь�а лездом�, ко�та мум� мезь',
 'tooltip-n-currentevents'         => 'Ванк мезе молихть т� пинг�та',
-'tooltip-n-recentchanges'         => 'Улхкомбань Вики�а полафнематнень лувома�ь.',
+'tooltip-n-recentchanges'         => 'Мекольце Вики�а полафнематнень лувома�ь.',
 'tooltip-n-randompage'            => 'Мак�т кодама пов�ь лопа',
 'tooltip-n-help'                  => 'Ко�та вешендем�.',
 'tooltip-t-whatlinkshere'         => 'Сембе Викинь лопатне конат �юлмафт т� лопать мархта',
-'tooltip-t-recentchangeslinked'   => 'Улхкомбань полафнемат лопатнень ��а �юлмафт т� лопать мархта',
+'tooltip-t-recentchangeslinked'   => 'Мекольце полафнемат лопатнень ��а �юлмафт т� лопать мархта',
 'tooltip-feed-rss'                => 'RSS лезк� т� лопанди',
 'tooltip-feed-atom'               => 'Atom лезк� т� лопанди',
 'tooltip-t-contributions'         => '��фтем� т� тиить путк�онзон лувома�ь',
@@ -1933,6 +2243,9 @@ $1',
 'tooltip-watch'                   => 'Сувафтом� т� лопать тонь мельгеваномазот',
 'tooltip-recreate'                => 'Мърдафтом� лопать �онь нардаманц ланг� аф ваномок',
 'tooltip-upload'                  => 'Ушедом� тонгомать',
+'tooltip-rollback'                => '"Потафтфк�" мърдафт�ыне петнематне мекольце тиинь путк�онц лопазонза фк� люпштама�.',
+'tooltip-undo'                    => '"Кар�ньфтема" мърдафт�ыне т� петнемать �ди панже�ы петнема форм ва�ень н�фтема�а.
+Лезни поладом� туфталхт лихтемать ��.',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF метадата�ь аф нолдави тев� т� �ерверонди.',
@@ -1940,12 +2253,12 @@ $1',
 'notacceptable'     => 'Вики �ерверонди аш кода мак�ом� информацие�ь �тама формат�а конань ��а тонь клиентти ули кода �онь морафтом�.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}-нь лемфтома тии(хть)',
+'anonymous'        => 'Лемфтома {{SITENAME}}-нь {{PLURAL:$1|тии�ь|тиихне}}',
 'siteuser'         => '{{SITENAME}}-нь тии�ь $1',
 'lastmodifiedatby' => 'Т� лопать мекольцеда петнезь $3 $2, $1', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Тиф $1-нь покаманц кор��.',
 'others'           => 'ил�т',
-'siteusers'        => '{{SITENAME}}-нь тии(хть) $1',
+'siteusers'        => '{{SITENAME}}-нь {{PLURAL:$2|тии�ь|тиихне}} $1',
 'creditspage'      => 'Лопань полайаманза',
 'nocredits'        => '�ш полайамань информацие�ь т� лопанди.',
 
@@ -1979,17 +2292,18 @@ $1',
 'markaspatrolledtext'                 => 'Т�штем� т� лопать кода патрулень варжаф',
 'markedaspatrolled'                   => 'Т�штьф кода патрулень варжаф',
 'markedaspatrolledtext'               => 'Кочкаф ил�к�топтома�ь т�штьфоль кода патрулень варжаф.',
-'rcpatroldisabled'                    => 'Улхкомбань полафнематненди патруль�ь тев� аф нолдави',
-'rcpatroldisabledtext'                => 'Улхкомбань полафнематнень патрульть функцие�ь т�ни тев� аф нолдави.',
+'rcpatroldisabled'                    => 'Мекольце полафнематненди патруль�ь тев� аф нолдави',
+'rcpatroldisabledtext'                => 'Мекольце полафнематнень патрульть функцие�ь т�ни тев� аф нолдави.',
 'markedaspatrollederror'              => '�ш кода т�штем� кода патрулень варжаф',
 'markedaspatrollederrortext'          => 'Тондейть �р�ви ва�енда кочкам� ил�к�топтома�ь патрулень варжафк�ок� т�штеманди.',
 'markedaspatrollederror-noautopatrol' => 'Тондейть аф м�рьгови т�штем� ��ь полфнемацень кода патрулень варжафт.',
 
 # Patrol log
-'patrol-log-page'   => 'Патрулень лувома�ь',
-'patrol-log-header' => 'Патруль ала верзиетнень лувома�ь.',
-'patrol-log-line'   => 'т�штьфольхть $2-�та $1 патрулень варжафк�ок� $3',
-'patrol-log-auto'   => '(��ь тиеви)',
+'patrol-log-page'      => 'Патрулень лувома�ь',
+'patrol-log-header'    => 'Патруль ала верзиетнень лувома�ь.',
+'patrol-log-line'      => 'т�штьфольхть $2-�та $1 патрулень варжафк�ок� $3',
+'patrol-log-auto'      => '(��ь тиеви)',
+'log-show-hide-patrol' => '$1 патрулень лувома�ь',
 
 # Image deletion
 'deletedrevision'                 => '�ардаф �ире ил�к�топтома $1',
@@ -2006,6 +2320,9 @@ $1',
 'previousdiff' => 'С�дынгольдень верзиец',
 'nextdiff'     => 'Од верзиец →',
 
+# Visual comparison
+'visual-comparison' => '��ем�та вак�� путома',
+
 # Media information
 'mediawarning'         => "'''Инголе кардама''': Т� файлть, улема, пельк� код, �онь нолдаманза  тон кола�ак тонь �и�темацень.<hr />",
 'imagemaxsize'         => 'Оторонзам� архтофк�нень лувк�онц файл информациень лопава:',
@@ -2018,10 +2335,12 @@ $1',
 'show-big-image'       => '��фтем� п�шк�е кувалмонц',
 'show-big-image-thumb' => '<small>С�дынголе ваномать кувалмоц: $1 × $2 пик�елхть</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Од файлхнень пърдафк�',
 'imagelisttext'         => "�ла'''$1''' {{PLURAL:$1|файлонь|файлхнень}} лувома�ь кочкаф $2.",
 'newimages-summary'     => 'Т� башка тевонь лопа�ь н�фне�ыне мекольце тонкф файлхт.',
+'newimages-legend'      => 'Пед�ма',
+'newimages-label'       => 'Файллем (�ли �онь пакшец):',
 'showhidebots'          => '($1 робот програпт)',
 'noimages'              => 'Мезеге аш.',
 'ilsubmit'              => 'Вешендем�',
@@ -2225,6 +2544,18 @@ $1',
 'exif-lightsource-24'  => '�туди�нь толвалда ISO',
 'exif-lightsource-255' => 'Ил� валдонь ли�ьма',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Кьфчадефк��ь изь вандолдозев',
+'exif-flash-fired-1'    => 'Кьфчадефк��ь вандолдозев�ь',
+'exif-flash-return-0'   => '�тробо�копу цильф мушендомат ашет',
+'exif-flash-return-2'   => '�тробо�копу цильф валда изь мув',
+'exif-flash-return-3'   => '�тробо�копу цильф валда муфоль',
+'exif-flash-mode-1'     => 'аф ётави кьфчадефк�онь вандолдозевома',
+'exif-flash-mode-2'     => 'аф ётави кьфчадефк�онь пандомац',
+'exif-flash-mode-3'     => '��лек лини�',
+'exif-flash-function-1' => 'Кьфчадефк� аш',
+'exif-flash-redeye-1'   => '"�к�терь �ельмот" кирьфнема',
+
 'exif-focalplaneresolutionunit-2' => 'вак�пет',
 
 'exif-sensingmethod-1' => '�пак н�фтть',
@@ -2368,21 +2699,10 @@ $1
 Кемок�так тонь афкук� м�льце т� лопать мърдафтом�.",
 'recreate'            => 'Тием� одук�',
 
-# HTML dump
-'redirectingto' => '�тафневи [[:$1]]-�...',
-
 # action=purge
-'confirm_purge'        => '�ардам� т� лопать копи�фтома пингонь файл�нон?
-
-$1',
 'confirm_purge_button' => 'ОК',
-
-# AJAX search
-'searchcontaining' => "Вешендем� лопатне конатнень ули ''$1''.",
-'searchnamed'      => "Вешендем� лопат ''$1'' лем�а.",
-'articletitles'    => "Лопатне ''$1''-�та ушедом�",
-'hideresults'      => 'К�шем� муфк�т',
-'useajaxsearch'    => '�олдак тев� AJAX вешендема',
+'confirm-purge-top'    => '�ардам� т� лопать ёткопингонь файл�нон?',
+'confirm-purge-bottom' => 'Лопань ару�фтома�ь ёрда�ыне �ембе ��ь ванфтовик�не ди кад�ы �ембода од верзие�ь.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� ��дынгольдень лопа�ь',
@@ -2405,7 +2725,7 @@ $1',
 'autosumm-blank'   => '�ардакшневи �ембе лопа�та',
 'autosumm-replace' => "�ардакшневи лопать '$1' мархта",
 'autoredircomment' => 'Умборондафневи [[$1]]�',
-'autosumm-new'     => 'Од лопа: $1',
+'autosumm-new'     => 'Тиев�ь лопа $1 мархта',
 
 # Live preview
 'livepreview-loading' => '�ноклакшни…',
@@ -2446,6 +2766,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '�ф �одаф келептема т�штьк��ь "$1"',
+'duplicate-defaultsort' => 'Инголе м�рьгома: �пак полафтт �ортонь панжема "$2" апак полафтт �ортонь панжема "$1"да в�ре.',
 
 # Special:Version
 'version'                          => 'MediaWiki-ть верзиец', # Not used as normal message but as header for the special page itself
@@ -2475,13 +2796,13 @@ $1',
 'filepath-summary' => 'Т� башка тевонь лопа�ь н�фне�ы �ембе �нць файлти.
 �рхтофк�не н�фневихть �ембе �инь кувалмо�о�т, ил� файлонь �орт�на нолдавихть виде�та програпнень вельде конат �отфт мархто�т.
 
-Путт файллемть "{{ns:image}}:" валынгольк�фтома',
+Путт файллемть "{{ns:file}}:" валынгольк�фтома',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Вешендем� кафонзаф файлхне',
 'fileduplicatesearch-summary'  => 'Вешендем� кафонзаф файлхнень х�ш-кодонь лувк� кор��.
 
-Сёрматт файллем "{{ns:image}}:" валынгольк�фтома.',
+Сёрматт файллем "{{ns:file}}:" валынгольк�фтома.',
 'fileduplicatesearch-legend'   => 'Вешендем� кафонзафк�',
 'fileduplicatesearch-filename' => 'Файллем:',
 'fileduplicatesearch-submit'   => 'Вешендем�',
@@ -2497,7 +2818,7 @@ $1',
 'specialpages-group-maintenance' => 'Латцема лувоматне',
 'specialpages-group-other'       => 'Ил� башка тевонь лопатне',
 'specialpages-group-login'       => 'Сувам� / �ёрматфтом�',
-'specialpages-group-changes'     => 'Улхкомбань полафнематне ди лувоматне',
+'specialpages-group-changes'     => 'Мекольце полафнематне ди лувоматне',
 'specialpages-group-media'       => 'Медиа пачфтематне ди тонгоматне',
 'specialpages-group-users'       => 'Тиихне ди видек�не',
 'specialpages-group-highuse'     => 'П�к �р�вик� лопат',
@@ -2511,4 +2832,13 @@ $1',
 'blankpage'              => 'Шава лопа',
 'intentionallyblankpage' => 'Т� лопать арь�езефоль кадом� шавак�',
 
+# External image whitelist
+'external_image_whitelist' => ' #Катт т� луфть (�трокать) апак полафтт �тамк� кодамк� �он уль�ь<pre>
+#Путт ва�у валзюлмафк�онь пакшензон (аньцек пакш�ь моли // ёткова) алу
+#��т улихть конд�мк� ушеширень (п�и лини�в) н�йфнень URL адре�ненди
+#Тонатне конатне конд�пт кармахть н�фтевома кода н�йфне, ил�к� аньцек н�йфонди �юлмафк��ь ули н�евик�
+#Луфне (�трокатне) конатне ушедовихть # - т�шк��ь мархта лувовихть м�льполатк�ок�
+
+#Путт �ембе ва�у валзюлмафк�онь пакшензон т� луфть (�трокать) вельфке. Катт т� луфть (�трокать) �тамк� кодамк� �он уль�ь</pre>',
+
 );
diff --git a/languages/messages/MessagesMg.php b/languages/messages/MessagesMg.php
index 488e7dc8..6905ea9a 100644
--- a/languages/messages/MessagesMg.php
+++ b/languages/messages/MessagesMg.php
@@ -5,18 +5,53 @@
  * @file
  *
  * @author Alno
+ * @author Jagwar
  * @author Urhixidur
  * @author לערי ריינה�רט
  */
 
 $fallback = 'fr';
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Manokana',
+	NS_TALK             => 'Dinika',
+	NS_USER             => 'Mpikambana',
+	NS_USER_TALK        => 'Dinika_amin\'ny_mpikambana',
+	NS_PROJECT_TALK     => 'Dinika_amin\'ny_$1',
+	NS_FILE             => 'Sary',
+	NS_FILE_TALK        => 'Dinika_amin\'ny_sary',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Dinika_amin\'ny_MediaWiki',
+	NS_TEMPLATE         => 'Endrika',
+	NS_TEMPLATE_TALK    => 'Dinika_amin\'ny_endrika',
+	NS_HELP             => 'Fanampiana',
+	NS_HELP_TALK        => 'Dinika_amin\'ny_fanampiana',
+	NS_CATEGORY         => 'Sokajy',
+	NS_CATEGORY_TALK    => 'Dinika_amin\'ny_sokajy',
+);
+
+$namespaceAliases = array(
+	'Discuter' => NS_TALK,
+	'Utilisateur' => NS_USER,
+	'Discussion_Utilisateur' => NS_USER_TALK,
+	'Discussion_$1' => NS_PROJECT_TALK,
+	'Discussion_Image' => NS_IMAGE_TALK,
+	'Discussion_MediaWiki' => NS_MEDIAWIKI_TALK,
+	'Modèle' => NS_TEMPLATE,
+	'Discussion_Modèle' => NS_TEMPLATE_TALK,
+	'Aide' => NS_HELP,
+	'Discussion_Aide' => NS_HELP_TALK,
+	'Catégorie' => NS_CATEGORY,
+	'Discussion_Catégorie' => NS_CATEGORY_TALK,
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Tsipiho ny rohy:',
 'tog-highlightbroken'         => 'Aseho <a href="" class="new">toy izao</a> ny rohy tapaka (na koa: toy izao<a href="" class="internal">?</a>).',
 'tog-justify'                 => 'Ahitsio ny paragrafy',
 'tog-hideminor'               => "Aza aseho amin'ny lisitry ny vao niova ny fanovana madinika",
+'tog-extendwatchlist'         => 'Ampiasa ny fanaram-pejy tsaratsara',
 'tog-usenewrc'                => 'Lisitry ny vao niova nohatsaraina (mila JavaScript)',
 'tog-numberheadings'          => 'Asio laharany ny lohateny',
 'tog-showtoolbar'             => 'Asehoy ny edit toolbar (mila JavaScript)',
@@ -26,7 +61,10 @@ $messages = array(
 'tog-showtoc'                 => "Asehoy ny fanoroan-takila (ho an'ny pejy misy lohateny mihoatra ny 3)",
 'tog-rememberpassword'        => 'Tadidio ny tenimiafiko',
 'tog-editwidth'               => "Farany lehibe ny velaran'ny boaty fanovana",
+'tog-watchcreations'          => "Ampina ao anarin'ny pejy fanaraha-maso ny pejy amboariko",
 'tog-watchdefault'            => "Atsofohy ao amin'ny lisitry ny pejy arahinao maso ny pejy izay ovainao na foroninao",
+'tog-watchmoves'              => "Ampina ao anatin'ny pejiko fanaraha-maso ny pejy soloiko anarana",
+'tog-watchdeletion'           => "Ampina anatin'ny pejy fanaraha-maso ny pejy nofafako",
 'tog-minordefault'            => 'Mariho ho madinika foana aloha ny fanovana rehetra',
 'tog-previewontop'            => "Asehoy alohan'ny boaty fanovana ny tsipalotra",
 'tog-previewonfirst'          => "Asehoy ny tsipalotra amin'ny fanovana voalohany",
@@ -40,45 +78,64 @@ $messages = array(
 'tog-externaleditor'          => 'Fitaovana hafa no hanaovana ny fanovana pejy',
 'tog-externaldiff'            => 'Fitaovana hafa no hanaovana ny fampitahana',
 'tog-showjumplinks'           => 'Ampiasao ny rohy "handeha eto"',
+'tog-watchlisthideown'        => "Tsy ampiseho anatin'ny pejy fanaraha-maso ny zavatra nosoratako",
+'tog-watchlisthideminor'      => "Tsy aseho ny fisoloina kely anatin'ny pejy fanaraha-maso",
+'tog-ccmeonemails'            => "Andefaso tahaka ny imailaka alefako amin'ny mpikambana afa",
+'tog-diffonly'                => "Aza ampiseo ny voatonin'ny pejy eo amban'ny diff",
 
 'underline-always'  => 'Foana foana',
 'underline-never'   => 'Tsy tsipihina mihitsy',
 'underline-default' => "Izay itiavan'ny navigateur azy",
 
-'skinpreview' => '(Tsipalotra)',
-
 # Dates
-'sunday'    => 'Alahady',
-'monday'    => 'Alatsinainy',
-'tuesday'   => 'Talata',
-'wednesday' => 'Alarobia',
-'thursday'  => 'Alakamisy',
-'friday'    => 'Zoma',
-'saturday'  => 'Sabotsy',
-'january'   => 'Janoary',
-'february'  => 'Febroary',
-'march'     => 'Martsa',
-'april'     => 'Aprily',
-'may_long'  => 'Mey',
-'june'      => 'Jiona',
-'july'      => 'Jolay',
-'august'    => 'Aogositra',
-'september' => 'Septambra',
-'october'   => 'Oktobra',
-'november'  => 'Novambra',
-'december'  => 'Desambra',
-'may'       => 'Mey',
-'jun'       => 'Jiona',
-'jul'       => 'Jol',
-'aug'       => 'Aog',
-'oct'       => 'Okt',
-'dec'       => 'Des',
+'sunday'        => 'Alahady',
+'monday'        => 'Alatsinainy',
+'tuesday'       => 'Talata',
+'wednesday'     => 'Alarobia',
+'thursday'      => 'Alakamisy',
+'friday'        => 'Zoma',
+'saturday'      => 'Sabotsy',
+'january'       => 'Janoary',
+'february'      => 'Febroary',
+'march'         => 'Martsa',
+'april'         => 'Aprily',
+'may_long'      => 'Mey',
+'june'          => 'Jiona',
+'july'          => 'Jolay',
+'august'        => 'Aogositra',
+'september'     => 'Septambra',
+'october'       => 'Oktobra',
+'november'      => 'Novambra',
+'december'      => 'Desambra',
+'january-gen'   => 'janoary',
+'february-gen'  => 'Febroary',
+'march-gen'     => 'Martsa',
+'april-gen'     => 'Aprily',
+'may-gen'       => 'Mey',
+'june-gen'      => 'Jiona',
+'july-gen'      => 'Jolay',
+'august-gen'    => 'Aogositra',
+'september-gen' => 'Septambra',
+'october-gen'   => 'Oktobra',
+'november-gen'  => 'Novambra',
+'december-gen'  => 'Desambra',
+'may'           => 'Mey',
+'jun'           => 'Jiona',
+'jul'           => 'Jol',
+'aug'           => 'Aog',
+'oct'           => 'Okt',
+'dec'           => 'Des',
 
 # Categories related messages
-'pagecategories'         => '{{PLURAL:$1|Sokajy|Sokajy}}',
-'category_header'        => 'Ireo lahatsoratra ao amin\'ny sokajy "$1"',
-'subcategories'          => 'Zana-tsokajy',
-'listingcontinuesabbrev' => ' manaraka.',
+'pagecategories'           => '{{PLURAL:$1|Sokajy|Sokajy}}',
+'category_header'          => 'Ireo lahatsoratra ao amin\'ny sokajy "$1"',
+'subcategories'            => 'Zana-tsokajy',
+'category-media-header'    => "Fisy multimedia anatin'ny sokajy « $1 »",
+'category-empty'           => "''Tsy misy pejy, sokajy ambany na sary ao anatin'io sokajy io''",
+'hidden-categories'        => 'Sokajy misitrika',
+'hidden-category-category' => 'Sokajy misitrika', # Name of the category where hidden categories will be listed
+'category-subcat-count'    => 'Ity sokajy manana $1 sokajy ambany. Ny taotaliny dia $2',
+'listingcontinuesabbrev'   => ' manaraka.',
 
 'mainpagetext' => "<big>'''Tafajoro soa aman-tsara ny rindrankajy Wiki.'''</big>",
 
@@ -95,7 +152,7 @@ $messages = array(
 'moredotdotdot'  => 'Tohiny...',
 'mypage'         => 'Pejiko',
 'mytalk'         => 'Ny diniko',
-'and'            => 'sy',
+'and'            => '&#32;sy',
 
 'errorpagetitle'    => 'Tsy fetezana',
 'returnto'          => "Hiverina any amin'ny $1.",
@@ -111,7 +168,9 @@ $messages = array(
 'info_short'        => 'Fampahalalana',
 'permalink'         => 'Rohy maharitra',
 'edit'              => 'Ovao',
+'create'            => 'Amboary',
 'editthispage'      => 'Ovay ity pejy ity',
+'create-this-page'  => 'Amboary ity pejy ity',
 'delete'            => 'Fafao',
 'deletethispage'    => 'Fafao ity pejy ity',
 'undelete_short'    => 'Avereno ny fanovana {{PLURAL:$1|$1|$1}}',
@@ -143,7 +202,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Mombamomba ny {{SITENAME}}',
 'aboutpage'            => 'Project:Mombamomba',
-'bugreports'           => 'Fitaterana tsi-fahatomombanana',
 'copyright'            => '$1 no mifehy ny fampiasana ny votoatin-kevitra eto.',
 'currentevents'        => 'Ny vaovao',
 'disclaimerpage'       => 'Project:General disclaimer',
@@ -166,6 +224,7 @@ Mitaky version $1-n'i MediaWiki",
 'youhavenewmessages' => 'Manana $1 ($2).',
 'newmessageslink'    => 'hafatra vaovao',
 'editsection'        => 'ovay',
+'viewsourceold'      => 'hijery fango',
 'toc'                => 'Votoatiny',
 'showtoc'            => 'aseho',
 'hidetoc'            => 'afeno',
@@ -191,51 +250,61 @@ Ny asa voafaritra tao amin'ny URL dia tsy fantatr'ity wiki ity",
 'nospecialpagetext' => 'Nangataka pejy manokana tsy misy ianao, azonao jerena eto [[Special:SpecialPages|{{int:specialpages}}]] ny lisitry ny pejy manokana.',
 
 # General errors
-'error'           => 'Tsy mety',
-'databaseerror'   => "Tsy fetezana eo amin'ny toby",
-'dberrortext'     => 'Nisy tsi-fetezana teo amin\'ny requête base de données
+'error'            => 'Tsy mety',
+'databaseerror'    => "Tsy fetezana eo amin'ny toby",
+'dberrortext'      => 'Nisy tsi-fetezana teo amin\'ny requête base de données
 Inoana fa ny rindrankajy no misy olana (bug).
 Ny requête farany dia:
 <blockquote><tt>$1</tt></blockquote>
 tao amin\'ny fonction "<tt>$2</tt>".
 Toy izao no navalin\'ny MySQL "<tt>$3: $4</tt>".',
-'dberrortextcl'   => 'Nisy tsi-fetezana teo amin\'ny requête base de données
+'dberrortextcl'    => 'Nisy tsi-fetezana teo amin\'ny requête base de données
 Ny requête farany dia:
 "$1"
 tao amin\'ny fonction "$2".
 Toy izao no navalin\'ny MySQL "$3: $4"',
-'noconnect'       => "
+'noconnect'        => "
 	Miala tsiny! Misedra olana kely ny wiki ankehitriny, ary tsy afaka mifandray amin'ny serveur banky angona <br />
 $1",
-'cachederror'     => "Ity manaraka ity no dika caché an'io pejy ilainao io, nefa mety ho efa mialin'andro.",
-'laggedslavemode' => 'Fampitandremana: Mety ho tsy nisy fanovana vao haingana angamba io pejy io',
-'readonly'        => 'Mihidy ny banky angona',
-'enterlockreason' => 'Manomeza antony hanidiana ny pejy, ahitana ny fotoana tokony hamahana izay fihidiana izay',
-'readonlytext'    => "
+'cachederror'      => "Ity manaraka ity no dika caché an'io pejy ilainao io, nefa mety ho efa mialin'andro.",
+'laggedslavemode'  => 'Fampitandremana: Mety ho tsy nisy fanovana vao haingana angamba io pejy io',
+'readonly'         => 'Mihidy ny banky angona',
+'enterlockreason'  => 'Manomeza antony hanidiana ny pejy, ahitana ny fotoana tokony hamahana izay fihidiana izay',
+'readonlytext'     => "
 Mihidy vonjimaika aloha ny banky angona ka tsy afaka anaovana fanovana na fanampiana vaovao. Azo inoana fa asa fikolokoloana mahazatra ihany io ka rehefa vita izay asa izay dia hverina amin'ny laoniny izy.
 
 Ny mpitantana nanidy azy dia nametraka ito fanazavana ito: $1",
-'readonly_lag'    => "
+'readonly_lag'     => "
 Mihidy ho azy aloha ny banky angona mandra-pahatratran'ny serveur andevo ny tompony",
-'internalerror'   => "Tsy fetezana anatin'ny rindrankajy",
-'filecopyerror'   => 'Tsy voadika ho "$2" ilay rakitra"$1".',
-'filerenameerror' => 'Tsy voaova ho "$2" ny anaran\'ilay rakitra "$1".',
-'filedeleteerror' => 'Tsy voafafa ilay rakitra "$1".',
-'filenotfound'    => 'Tsy hita ilay rakitra "$1".',
-'unexpected'      => 'Tsy nandrasana: "$1"="$2".',
-'formerror'       => 'Tsy mety: tsy lasa ny fisy',
-'badarticleerror' => "Tsy azo atao eto amin'ity pejy ity io asa io.",
-'cannotdelete'    => 'Tsy voafafa ny pejy na rakitra nomenao. (Angamba efa nisy olon-kafa namafa ilay izy.)',
-'badtitle'        => 'Tsy mety ny lohateny',
-'badtitletext'    => "Tsy mety io anaram-pejy nangatahinao io na tsy misy n'inon'inona na rohy dikan-teny vahiny misy diso tsipelina.",
-'perfcached'      => 'Ireto angona ireto dia nalaina tao anaty cache koa mety ho efa lany daty.:',
-'viewsource'      => 'Hijery fango',
-'sqlhidden'       => '(nafenina ny requête SQL)',
+'internalerror'    => "Tsy fetezana anatin'ny rindrankajy",
+'filecopyerror'    => 'Tsy voadika ho "$2" ilay rakitra"$1".',
+'filerenameerror'  => 'Tsy voaova ho "$2" ny anaran\'ilay rakitra "$1".',
+'filedeleteerror'  => 'Tsy voafafa ilay rakitra "$1".',
+'filenotfound'     => 'Tsy hita ilay rakitra "$1".',
+'fileexistserror'  => "Tsy afaka manoratra ao anatin'ilay dossier « $1 » : efa misy ilay fisy",
+'unexpected'       => 'Tsy nandrasana: "$1"="$2".',
+'formerror'        => 'Tsy mety: tsy lasa ny fisy',
+'badarticleerror'  => "Tsy azo atao eto amin'ity pejy ity io asa io.",
+'cannotdelete'     => 'Tsy voafafa ny pejy na rakitra nomenao. (Angamba efa nisy olon-kafa namafa ilay izy.)',
+'badtitle'         => 'Tsy mety ny lohateny',
+'badtitletext'     => "Tsy mety io anaram-pejy nangatahinao io na tsy misy n'inon'inona na rohy dikan-teny vahiny misy diso tsipelina.",
+'perfcached'       => 'Ireto angona ireto dia nalaina tao anaty cache koa mety ho efa lany daty.:',
+'viewsource'       => 'Hijery fango',
+'viewsourcefor'    => "ho an'ny $1",
+'editinginterface' => "'''Tandremo :''' manova pejy ampiasan'ny lôjisialy wiki ianao. Mety hita ny mpikambana sàsany izy io. Rehefa tia mandika teny ianao, jereo ny volavola MediaWiki ho an'ny internationalisation ny hafatra [http://translatewiki.net/wiki/Main_Page?setlang=fr translatewiki.net].",
+'sqlhidden'        => '(nafenina ny requête SQL)',
+'titleprotected'   => "Voaaro mba tsy ho amboarina ilay lohateny, i [[User:$1|$1]] no nanao an'io.
+Io ny antony : « ''$2'' ».",
+
+# Virus scanner
+'virus-badscanner'     => "Diso : Tsy fantatray ny mpitady virus ''$1''",
+'virus-scanfailed'     => 'Tsy mety alefa ny fitadiavana (kaody $1)',
+'virus-unknownscanner' => 'Tsy fantatra io Antivirus io :',
 
 # Login and logout pages
 'logouttitle'                => 'Fivoahana',
 'logouttext'                 => "
-<strong>Tafavoaka ianao ankehitriny.</strong><br />
+'''Tafavoaka ianao ankehitriny.'''<br />
 Afaka manohy ny fampiasana ny {{SITENAME}} ianao ka tsy mitonona anarana, ary afaka
 miditra amin'ny alalan'ilay solonanarana teo na solonanarana hafa koa. 
 Mariho fa misy pejy sasantsasany mety mbola hiseho foana mandra-pamafanao ny 
@@ -250,7 +319,6 @@ Voaforona ny kaontinao. Aza adinoina ny manova ny mombamomba anao ao amin'ny {{S
 'remembermypassword'         => 'Tadidio ny tenimiafiko',
 'yourdomainname'             => 'faritra (domaine) misy anao',
 'externaldberror'            => "Nisy tsy fetezana angamba teo amin'ny fanamarinana anao tamin'ny sehatra ivelan'ity wiki ity, na tsy manana alalana hanova ny kaontinao ivelany ianao.",
-'loginproblem'               => "<b>Nisy olana tamin'ny fidiranao.</b><br />Andramo indray hoe!",
 'login'                      => 'Midira',
 'nav-login-createaccount'    => 'Ampidiro ny solonanarana',
 'loginprompt'                => "
@@ -274,6 +342,8 @@ Mila manaiky cookies ianao raha te hiditra amin'ny {{SITENAME}}.",
 'yourlanguage'               => 'Tenim-pirenena:',
 'yournick'                   => 'Anaram-bositra:',
 'badsig'                     => 'Tsy mety io sonia io; hamarino ny kialo HTML.',
+'badsiglength'               => "Lava laotra ny sonianao.
+Tokony mba manana lohavy ambanimbany kokoa non'ny $1",
 'email'                      => 'Imailaka',
 'prefs-help-realname'        => "Anarana marina (afaka tsy fenoina): raha fenoinao ity dia hampiasaina hanomezana anao tambin'ny asa izay efainao eto.",
 'loginerror'                 => "Tsy fetezana teo amin'ny fidirana",
@@ -315,6 +385,11 @@ mba hanaporofoana fa anao io kaonty io.",
 'invalidemailaddress'        => 'Tsy mety io imailaka nalefanao io satria tsy manaraka ny firafitra tokony ho izy.
 Azafady manomeza adiresy voasoratra tsara na avelao ho banga io toerana io.',
 
+# Password reset dialog
+'oldpassword' => 'Tenimiafina taloha:',
+'newpassword' => 'Tenimiafina vaovao:',
+'retypenew'   => 'Avereno ampidirina ny tenimiafina vaovao:',
+
 # Edit page toolbar
 'bold_sample'     => 'Soratra matavy',
 'bold_tip'        => 'Soratra matavy',
@@ -338,8 +413,8 @@ Azafady manomeza adiresy voasoratra tsara na avelao ho banga io toerana io.',
 'hr_tip'          => 'Tsipika mitsivalana (aza anaranam-po loatra)',
 
 # Edit pages
-'summary'                => 'Ambangovangony',
-'subject'                => 'Lohateny',
+'summary'                => 'Ambangovangony:',
+'subject'                => 'Lohateny:',
 'watchthis'              => 'Araho maso ity pejy ity',
 'savearticle'            => 'Tehirizo',
 'preview'                => 'Topi-maso',
@@ -363,18 +438,18 @@ Raha toa moa ka tsy nieritreritra ny hamorona ity takelaka ity ianao dia miveren
 * [[{{ns:special}}:Search/{{PAGENAME}}|Tadiavo ny momba ny {{PAGENAME}}]] ato.",
 'clearyourcache'         => "'''Fanamarihana:''' Aorian'ny fanovana, dia mila mamafa ny cache ianao vao mahita ny fiovana.
 '''Mozilla / Firefox / Safari:''' Tsindrio ny ''Shift'' rehefa manindry ''Reload'', na tsindrio ''Ctrl-Shift-R'' (''Cmd-Shift-R'' ho an'ny Apple Mac); '''IE:''' tsindrio ''Ctrl'' rehefa manindry ''Refresh'', na tsindrio ''Ctrl-F5''; '''Konqueror:''': tsindrio fotsiny ny bokotra ''Reload'' na ''F5''; ny mpampiasa '''Opera''' angamba dia tokony hamafa ny cache-ny ao amin'ny ''Tools&rarr;Preferences''.",
-'usercssjsyoucanpreview' => "<strong>Fika:</strong> Ampiasao ny bokotra 'Tsipalotra' mialoha ny hitehirizanao ny CSS/JS-nao vaovao.",
+'usercssjsyoucanpreview' => "'''Fika:''' Ampiasao ny bokotra 'Tsipalotra' mialoha ny hitehirizanao ny CSS/JS-nao vaovao.",
 'usercsspreview'         => "
 '''Tadidio fa mijery tsipalotra ny fivoakan'ny takilan'angalinao (CSS) vaovao fotsiny ihany ianao fa tsy mbola voatahiry akory izy io!'''",
 'userjspreview'          => "
 '''Tadidio fa manandrana/mijery tsipalotra ny fivoakan'ny JavaScript-nao fotsiny ihany ianao fa tsy mbola voatahiry akory izy io!'''",
 'updated'                => '(Voaova)',
-'note'                   => '<strong>Fanamarihana:</strong>',
-'previewnote'            => '<strong>Topi-maso ihany ity hitanao ity, tsy mbola voatahiry ny fanovana nataonao!</strong>',
+'note'                   => "'''Fanamarihana:'''",
+'previewnote'            => "'''Topi-maso ihany ity hitanao ity, tsy mbola voatahiry ny fanovana nataonao!'''",
 'previewconflict'        => "
 Ity topi-maso ity no mifanaraka amin'ny lahatsoratra ao amin'ny faritra eo ambony,
 ary toy izao no ho fisehon'ny pejy raha misafidy ny hitahiry azy ianao.",
-'session_fail_preview'   => '<strong>Miala tsiny. Tsy afaka atao ny asa ilainao satria misy very ny fampahalalana ilaina momba ny session. Azafady mba andramo fanindroany. Raha tena mbola tsy mety dia manandrama mivoaka mihitsy aloha dia miditra indray avy eo!</strong>',
+'session_fail_preview'   => "'''Miala tsiny. Tsy afaka atao ny asa ilainao satria misy very ny fampahalalana ilaina momba ny session. Azafady mba andramo fanindroany. Raha tena mbola tsy mety dia manandrama mivoaka mihitsy aloha dia miditra indray avy eo!'''",
 'editing'                => 'Manova ny $1',
 'editingsection'         => 'Fanovana $1 (fizaràna)',
 'editingcomment'         => 'Fanovana $1 (fanamarihana)',
@@ -388,27 +463,24 @@ Ny lahatsoratra ao amin'ilay faritra ambony <b>ihany</b> no ho voatahiry rehefa
 ilay bokotra \"Tehirizo\" ianao. <br />",
 'yourtext'               => 'Lahatsoratrao',
 'storedversion'          => 'Votoatiny voatahiry',
-'nonunicodebrowser'      => "<strong>FAMPITANDREMANA: Tsy mifanaraka tanteraka amin'ny unicode ny navigateur-nao. Misy ihany anefa fika napetraka hahafahanao manova ny lahatsoratra: Ny litera tsy ASCII dia hiseho amin'ny fango isa ta-enina ambin'ny folo.</strong>",
-'editingold'             => "<strong>FAMPITANDREMANA: Ity pejy ity dia efa lany daty io votoatiny ovainao io.
-Raha io no tahirizinao, dia ho very ny fanovana ity pejy ity rehetra taorian'io fanovana io.</strong>",
+'nonunicodebrowser'      => "'''FAMPITANDREMANA: Tsy mifanaraka tanteraka amin'ny unicode ny navigateur-nao. Misy ihany anefa fika napetraka hahafahanao manova ny lahatsoratra: Ny litera tsy ASCII dia hiseho amin'ny fango isa ta-enina ambin'ny folo.'''",
+'editingold'             => "'''FAMPITANDREMANA: Ity pejy ity dia efa lany daty io votoatiny ovainao io.
+Raha io no tahirizinao, dia ho very ny fanovana ity pejy ity rehetra taorian'io fanovana io.'''",
 'yourdiff'               => 'Fampitahana',
-'longpagewarning'        => "<strong>FAMPITANDREMANA: Mahatratra $1 kilooktety ny hangezan'ity pejy ity; 
+'longpagewarning'        => "'''FAMPITANDREMANA: Mahatratra $1 kilooktety ny hangezan'ity pejy ity; 
 Ny navigateur sasantsasany dia mety hanana olana
 amin'ny fanovana ny pejy manakaiky na mihoatra ny 32 ko.
-Tsara raha saratsarahinao ho fizarana maromaro ity pejy ity.</strong>",
-'readonlywarning'        => '<strong>FAMPITANDREMANA: Nohidiana noho ny antony fikolokoloana aloha ny banky angona,
+Tsara raha saratsarahinao ho fizarana maromaro ity pejy ity.'''",
+'readonlywarning'        => "'''FAMPITANDREMANA: Nohidiana noho ny antony fikolokoloana aloha ny banky angona,
 koa tsy afaka mitahiry ny fanovana nataonao aloha ianao izao. Angamba tokony hanao Couper coller aloha 
-ianao dia tehirizo anaty rakitra ny fanovanao mandra-paha.</strong>',
-'protectedpagewarning'   => '<strong>FAMPITANDREMANA:  Voaaro ity pejy ity ka ny mpikambana manana ny fahazoan-dàlana sysop ihany no afaka manova azy.</strong>',
+ianao dia tehirizo anaty rakitra ny fanovanao mandra-paha.'''",
+'protectedpagewarning'   => "'''FAMPITANDREMANA:  Voaaro ity pejy ity ka ny mpikambana manana ny fahazoan-dàlana sysop ihany no afaka manova azy.'''",
+'template-protected'     => '(voaaro)',
 'nocreatetitle'          => 'Voafetra ny famoronana pejy',
 'nocreatetext'           => " Voafetra ihany ny fahafahana mamorona pejy eto amin'ity sehatra ity.  Ny pejy efa misy no azonao ovaina, na [[Special:UserLogin|midira na mamoròna kaonty]].",
 
 # History pages
 'nohistory'        => 'Tsy manana tantaram-panovana io pejy io.',
-'revnotfound'      => 'Tsy hita io fanovana io',
-'revnotfoundtext'  => "
-Tsy hita ny votoatin'ny pejy taloha nangatahinao.
-Hamarino azafady ny URL nampiasainao hahatongavana eto amin'ity pejy ity.",
 'previousrevision' => '�Votoatiny antitra kokoa',
 'nextrevision'     => 'Fanovana vao haingana→',
 'cur'              => 'ank',
@@ -437,6 +509,7 @@ Tadidio: (ank) = fampitahana amin'ny votoatin'ny pejy ankehitriny,
 'prevn'             => '$1 taloha',
 'nextn'             => '$1 manaraka',
 'viewprevnext'      => 'Hijery ($1) ($2) ($3).',
+'searchhelp-url'    => 'Help:Fanoroana',
 'showingresults'    => "Omeo ny valiny miisa hatramin'ny <b>$1</b> manomboka ny #<b>$2</b>.",
 'showingresultsnum' => 'Omeo ny valiny miisa <b>$3</b> manomboka ny #<b>$2</b>.',
 'nonefound'         => "
@@ -453,6 +526,7 @@ ihany no miseho amin'ny vokatry ny karoka).",
 'prefsnologintext'      => '[[Special:UserLogin|Midira]] aloha izay vao manova ny mombamomba anao.',
 'changepassword'        => 'Hanova tenimiafina',
 'skin'                  => 'Endrika',
+'skin-preview'          => 'Tsipalotra',
 'dateformat'            => 'endriky ny daty',
 'datetime'              => 'Daty sy ora',
 'math_failure'          => 'Tsy nety ny fanodinana ny raikipohy',
@@ -468,9 +542,6 @@ ihany no miseho amin'ny vokatry ny karoka).",
 'prefs-misc'            => 'Hafa',
 'saveprefs'             => 'Tehirizo',
 'resetprefs'            => 'Avereno',
-'oldpassword'           => 'Tenimiafina taloha:',
-'newpassword'           => 'Tenimiafina vaovao:',
-'retypenew'             => 'Avereno ampidirina ny tenimiafina vaovao:',
 'textboxsize'           => 'Fanovana',
 'searchresultshead'     => 'Fikarohana',
 'recentchangescount'    => "Lohateny amin'ny vao niova:",
@@ -491,6 +562,19 @@ Fenoy araka ny datin'ny solosainan'ny mpitsidika",
 'saveusergroups'           => 'Tehirizo ny vondrom-pikambana',
 'userrights-groupsmember'  => "Mpikambana amin'ny vondrona:",
 
+# Groups
+'group-autoconfirmed' => 'Mpikambana voasoratra',
+'group-bot'           => 'Mpikambana rôbô',
+'group-sysop'         => 'Mpandrindra',
+'group-bureaucrat'    => 'Bor�kraty',
+'group-all'           => '(izy rehetra)',
+
+'group-user-member' => 'Mpikambana',
+
+'grouppage-user'       => '{{ns:project}}:Mpikambana',
+'grouppage-sysop'      => '{{ns:project}}:Mpandrindra',
+'grouppage-bureaucrat' => '{{ns:project}}:Bor�kraty',
+
 # User rights log
 'rightslogtext' => "Tantaran'asa momba ny fahazoan-dàlan'ny mpikambana.",
 
@@ -522,11 +606,11 @@ Fenoy araka ny datin'ny solosainan'ny mpitsidika",
 'uploadnologintext'           => 'Mila [[Special:UserLogin|misoratra anarana]] aloha vao afaka mandefa rakitra.',
 'upload_directory_read_only'  => "Ny répertoire ($1) handraisana ny rakitra alefan'ny mpikambana dia tsy afaka anoratana.",
 'uploaderror'                 => 'Nisy tsy fetezana ny fandefasana rakitra',
-'uploadtext'                  => "Ampiasao ity fisy ity handefasana rakitra. Jereo eto ny [[Special:ImageList|lisitry ny rakitra]] nalefan'ny mpikambana, na koa azonao ampiasaina ny [[Special:Log/upload|tantaran'asan'ny fandefasana sy famonoana rakitra]].
+'uploadtext'                  => "Ampiasao ity fisy ity handefasana rakitra. Jereo eto ny [[Special:FileList|lisitry ny rakitra]] nalefan'ny mpikambana, na koa azonao ampiasaina ny [[Special:Log/upload|tantaran'asan'ny fandefasana sy famonoana rakitra]].
 
 Raha hanisy sary ao anaty pejy, dia mampiasà rohy toy ny iray amin'ireto
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.jpg]]</nowiki>''', na
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.png|alt text]]</nowiki>''' na
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki>''', na
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png|alt text]]</nowiki>''' na
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki>''' raha hirohy mivantana amin'ny rakitra.",
 'uploadlog'                   => "Tantaran'asan'ny fandefasana rakitra",
 'uploadlogpagetext'           => "Ity ny lisitr'ireo rakitra nalefa farany indrindra.",
@@ -543,10 +627,10 @@ Raha hanisy sary ao anaty pejy, dia mampiasà rohy toy ny iray amin'ireto
 Ngeza noho izay zakan'ny serveur io rakitra io.",
 'emptyfile'                   => "Ohatry ny tsy misy na inona na inona ilay rakitra nalefanao teo.
 Sao dia misy diso tsipelina ny anaran'ny rakitra? Azafady mba hamarino fa tena naniry handefa io rakitra io tokoa ianao.",
-'fileexists'                  => "Efa misy rakitra iray mitondra an'io anarana io, azafady jereo aloha <strong><tt>$1</tt></strong> raha tsy matoky tanteraka ianao fa te-hanova io rakitra io.",
-'fileexists-forbidden'        => "Efa misy rakitra iray mitondra an'io anarana io, azafady miverena amin'ny pejy teo aloha dia avereno alefa ilay rakitra ary omeo anarana hafa. [[Image:$1|thumb|center|$1]]",
+'fileexists'                  => "Efa misy rakitra iray mitondra an'io anarana io, azafady jereo aloha '''<tt>$1</tt>''' raha tsy matoky tanteraka ianao fa te-hanova io rakitra io.",
+'fileexists-forbidden'        => "Efa misy rakitra iray mitondra an'io anarana io, azafady miverena amin'ny pejy teo aloha dia avereno alefa ilay rakitra ary omeo anarana hafa. [[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => "
-Efa misy rakitra iray mitondra an'io anarana io ao amin'ny file repository, azafady miverena amin'ny pejy teo aloha dia avereno alefa ilay rakitra ary omeo anarana hafa. [[Image:$1|thumb|center|$1]]",
+Efa misy rakitra iray mitondra an'io anarana io ao amin'ny file repository, azafady miverena amin'ny pejy teo aloha dia avereno alefa ilay rakitra ary omeo anarana hafa. [[File:$1|thumb|center|$1]]",
 'successfulupload'            => 'Voaray soa aman-tsara ny rakitra',
 'uploadwarning'               => 'Fampitandremana',
 'savefile'                    => 'Tehirizo ny rakitra',
@@ -563,10 +647,10 @@ Hamarino tsara aloha dia avereno alefa indray.',
 
 'nolicense' => 'Tsy misy safidy',
 
-# Special:ImageList
-'imagelist' => 'Lisitry ny rakitra',
+# Special:ListFiles
+'listfiles' => 'Lisitry ny rakitra',
 
-# Image description page
+# File description page
 'imagelinks'                => 'Rohy',
 'linkstoimage'              => "Ireto avy no pejy mirohy amin'io rakitra io:",
 'nolinkstoimage'            => "Tsy misy pejy mirohy amin'ity sary ity.",
@@ -586,9 +670,8 @@ Hamarino tsara aloha dia avereno alefa indray.',
 'randompage' => 'Takelaka kisendra',
 
 # Statistics
-'statistics' => 'Fanao pejy',
-'sitestats'  => "statistikan'ny {{SITENAME}}",
-'userstats'  => "Statistikan'ny mpikambana",
+'statistics'              => 'Fanao pejy',
+'statistics-header-users' => "Statistikan'ny mpikambana",
 
 'brokenredirects'        => 'Tapaka ny redirection',
 'brokenredirectstext'    => "Mirohy any amin'ny pejy tsy misy ireto redirection manaraka ireto",
@@ -736,44 +819,66 @@ Raha hanova ny fandehan\'ny momba ny lisitry ny pejy arahi-maso, jereo
 Hevitrao sy fanampiana:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Fafao ny pejy',
-'confirm'                     => 'Antero',
-'excontent'                   => "votoatiny: '$1'",
-'excontentauthor'             => "votoatiny: '$1' (ary i '[[Special:Contributions/$2|$2]]' irery ihany no nikitika azy)",
-'historywarning'              => 'Fampitandremana: Manana tantara io pejy hofafanao io (izany hoe farafaharatsiny indray mandeha niova):',
-'confirmdeletetext'           => "Handeha hamafa tanteraka ny pejy na sary miaraka amin'ny tantarany rehetra 
+# Delete
+'deletepage'        => 'Fafao ny pejy',
+'confirm'           => 'Antero',
+'excontent'         => "votoatiny: '$1'",
+'excontentauthor'   => "votoatiny: '$1' (ary i '[[Special:Contributions/$2|$2]]' irery ihany no nikitika azy)",
+'historywarning'    => 'Fampitandremana: Manana tantara io pejy hofafanao io (izany hoe farafaharatsiny indray mandeha niova):',
+'confirmdeletetext' => "Handeha hamafa tanteraka ny pejy na sary miaraka amin'ny tantarany rehetra 
 ao anatin'ny toby ianao. Azafady mba hamafiso fa irinao tokoa izany, 
 fantatrao ny vokany ary mahalala ianao fa tsy mifanipaka amin'ny 
 [[{{MediaWiki:Policy-url}}|fepetra]] izao ataonao izany.",
-'actioncomplete'              => 'Vita ny asa',
-'deletedtext'                 => 'Voafafa i "<nowiki>$1</nowiki>".
+'actioncomplete'    => 'Vita ny asa',
+'deletedtext'       => 'Voafafa i "<nowiki>$1</nowiki>".
 Jereo amin\'ny $2 ny lisitry ny famafana pejy faramparany.',
-'deletedarticle'              => 'voafafa "[[$1]]"',
-'dellogpagetext'              => 'Eto ambany eto ny lisitry ny famafana pejy/sary faramparany.',
-'deletionlog'                 => "famafana tatitr'asa",
-'reverted'                    => "Voaverina amin'ny votoatiny teo aloha",
-'deletecomment'               => 'Antony hamonoana pejy',
-'rollback'                    => 'Foano indray ilay fanovana',
-'rollback_short'              => 'Aza ovaina indray',
-'rollbacklink'                => 'foano',
-'rollbackfailed'              => "Tsy voaverina amin'ny teo aloha",
-'cantrollback'                => "Tsy afaka iverenana ny fanovana; ny mpanova farany ihany no tompon'ny pejy.",
-'alreadyrolled'               => "Tsy mety foanana ny fanovana farany ny pejy [[:$1]]
+'deletedarticle'    => 'voafafa "[[$1]]"',
+'dellogpagetext'    => 'Eto ambany eto ny lisitry ny famafana pejy/sary faramparany.',
+'deletionlog'       => "famafana tatitr'asa",
+'reverted'          => "Voaverina amin'ny votoatiny teo aloha",
+'deletecomment'     => 'Antony hamonoana pejy',
+
+# Rollback
+'rollback'       => 'Foano indray ilay fanovana',
+'rollback_short' => 'Aza ovaina indray',
+'rollbacklink'   => 'foano',
+'rollbackfailed' => "Tsy voaverina amin'ny teo aloha",
+'cantrollback'   => "Tsy afaka iverenana ny fanovana; ny mpanova farany ihany no tompon'ny pejy.",
+'alreadyrolled'  => "Tsy mety foanana ny fanovana farany ny pejy [[:$1]]
 nataon'i [[User:$2|$2]] ([[User talk:$2|Dinika]]); satria efa nisy nanova ny pejy na nisy nanafoana io fanovana io.
 
 Ny fanovana farany dia nataon'i [[User:$3|$3]] ([[User talk:$3|Dinika]]).",
-'editcomment'                 => 'Toy izao no fanamarihana momba io fanovana io: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "Voafafa ny fanovana ny [[Special:Contributions/$2|$2]] ([[User talk:$2|Dinika]]); voaverina amin'ny votoatiny teo aloha nataon'i [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'editcomment'    => "Toy izao no fanamarihana momba io fanovana io: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => "Voafafa ny fanovana ny [[Special:Contributions/$2|$2]] ([[User talk:$2|Dinika]]); voaverina amin'ny votoatiny teo aloha nataon'i [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogtext'              => 'Eto ambany ny lisitry ny fiarovana/fanalana hidy ny pejy. Fanazavana fanampiny: jereo [[Special:ProtectedPages]].',
 'protectedarticle'            => 'voaaro ny pejy "[[$1]]"',
 'unprotectedarticle'          => 'voaala ny fiarovana an\'i "[[$1]]"',
 'protect-title'               => 'Fiarovana an\'i "$1"',
+'prot_1movedto2'              => 'Novana ho [[$2]] ilay takelaka [[$1]]',
 'protect-legend'              => 'Fanekena ny fiarovana pejy',
 'protectcomment'              => "Anton'ny fiarovana ny pejy",
-'protect-text'                => 'Afaka jerenao na ovainao eto ny politikam-piarovana ny pejy <strong><nowiki>$1</nowiki></strong>.',
+'protect-text'                => "Afaka jerenao na ovainao eto ny politikam-piarovana ny pejy '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Tsy afaka ovanao ny sokajy ny fiarovana raha tsy mahazo manoratra ianao.
+Ity ny sokajy ny pejy '''$1''' :",
+'protect-locked-dblock'       => "Tsy afaka solona ny sokajy ny fiarovana satria ny voatohana ny fotom-pandraisana.
+Ity ny reglajy ny pejy  '''$1'''",
+'protect-cascadeon'           => "Voaaro ity pejy ity satria ao anatin'ny ireto pejy izy, voaaro izy io miarak'amin'ny « fiarovana an-driana ». Afaka solonao ny sokaji-piarovana an'ity pejy fa tsy ho voakitika ny fiarovana an-driana.",
+'protect-default'             => 'Tsy misy fiarovana',
 'protect-level-autoconfirmed' => 'Sakano ny mpikambana tsy misoratra anarana',
 'protect-level-sysop'         => 'Sysops ihany',
+'protect-summary-cascade'     => 'Fiarovana an-driana',
+'protect-expiring'            => "Miala amin'ny $1",
+'protect-expiry-indefinite'   => 'tsiefa',
+'protect-cantedit'            => "Tsy afaka manolo ny sokaji-piarovan'ity pejy ity ianao satria tsy manana ny sata ilaina",
+'protect-otherreason'         => 'Antony afa miampy :',
+'protect-dropdown'            => "*Anton'ny fiarovana
+** Misy be mpanimba
+** Misy be mpametraka spam
+** Misy adim-panontana
+** Misy olona maro no mandalo eo",
+'protect-expiry-options'      => '2 ora:2 hours,1 andro:1 day,3 andro:3 days,1 herinandro:1 week,2 herinandro:2 weeks,1 volana:1 month,3 volana:3 months,6 volana:6 months,1 taona:1 year,mandrakizay:infinite', # display1:time1,display2:time2,...
 
 # Undelete
 'undelete'               => 'Jereo ny pejy voafafa',
@@ -804,7 +909,6 @@ pejy vaovao io ny tantaran'ity pejy voafafa ity, fa tsy ho voafafa akory.",
 
 # What links here
 'whatlinkshere' => 'Iza avy no mirohy eto',
-'linklistsub'   => '(Lisitry ny rohy)',
 'linkshere'     => 'Ireto avy no pejy mirohy eto:',
 'nolinkshere'   => 'Tsy misy pejy mirohy eto.',
 
@@ -882,6 +986,8 @@ Azafady mba antero fa izay tokoa no tena irinao.",
 # Move page
 'move-page-legend'        => 'Afindrao toerana ny pejy',
 'movearticle'             => 'Afindrao toerana ny pejy',
+'movenologin'             => 'Tsy mbola tafiditra ianao',
+'movenologintext'         => 'Ny mpikambana nisoratra anarana sy [[Special:UserLogin|tafiditra]] ihany no afaka mamindra toerana takelaka.',
 'newtitle'                => 'Lohateny vaovao',
 'movepagebtn'             => 'Afindrao',
 'pagemovedsub'            => 'Voafindra ny pejy',
@@ -918,7 +1024,7 @@ Ny fomba fanondranana pejy dia, manomeza lohateny izay na maromaro eto amin'ny b
 ary safidio na ny votoatiny ankehitriny ihany no ilainao na miaraka amin'ny endriky ny pejy rehetra taloha, sy hoe ny votoatiny ankehitriny
 miampy fampahalalana momba ny fanovana farany fotsiny ve sa miaraka amin'ny tantaran'ny fanovana rehetra.
 
-Etsy amin'ny toerana farany dia afaka mampiasa rohy ihany koa ianao, ohatra [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] ho an'ny [[{{MediaWiki:Mainpage}}]].",
+Etsy amin'ny toerana farany dia afaka mampiasa rohy ihany koa ianao, ohatra [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] ho an'ny [[{{MediaWiki:Mainpage}}]].",
 'exportcuronly'   => "Ny votoatiny ankehitriny ihany no haondrana fa tsy miaraka amin'ny tantarany iray manontolo",
 'exportnohistory' => "
 ----
@@ -937,6 +1043,7 @@ Etsy amin'ny toerana farany dia afaka mampiasa rohy ihany koa ianao, ohatra [[{{
 'filemissing'    => 'Tsy hita ny rakitra',
 
 # Tooltip help for the actions
+'tooltip-ca-viewsource'           => 'Voaaro ilay pejy. Fa afaka itanao ny voatotiny.',
 'tooltip-search'                  => "Karoka amin'ny {{SITENAME}}",
 'tooltip-n-mainpage'              => 'Jereo ny renipejy',
 'tooltip-t-specialpages'          => 'Listry ny pejy manokana rehetra',
@@ -990,7 +1097,7 @@ Amporisihina ho an'ny navigateur moderna",
 'imagemaxsize' => "Ferana ny haben'ny sary ao amin'ny pejy famaritana ho:",
 'thumbsize'    => "Haben'ny thumbnail",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'     => 'Tahala misy ny rakitra vaovao',
 'imagelisttext' => 'Eto ambany ny lisitry ny rakitra $1 milahatra araka ny $2.',
 'showhidebots'  => '(rôbô $1)',
@@ -1048,14 +1155,8 @@ Azafady hamafiso fa tena irinao averina hoforonina tokoa ity lahatsoratra ity.",
 'recreate'            => 'Jereo indray',
 
 # action=purge
-'confirm_purge'        => "
-Fafana ve ny cache-n'ity pejy ity?
-
-$1",
 'confirm_purge_button' => 'Eka',
-
-# AJAX search
-'articletitles' => "Lahatsoratra manomboka amin'ny ''$1''",
+'confirm-purge-top'    => "Fafana ve ny cache-n'ity pejy ity?",
 
 # Special:SpecialPages
 'specialpages' => 'Pejy manokana',
diff --git a/languages/messages/MessagesMhr.php b/languages/messages/MessagesMhr.php
index 7cf470e6..6ace3a28 100644
--- a/languages/messages/MessagesMhr.php
+++ b/languages/messages/MessagesMhr.php
@@ -197,8 +197,14 @@ $messages = array(
 'noemail'                 => '"$1" пайдаланыше �лектрон адре�ым палемден огыл.',
 'passwordsent'            => 'У шолыпмутым "$1" пайдаланышын �лектрон адре�ышкыже колтымо. Шолыпмутым налмеке �и�темыш угыч пуро.',
 'eauthentsent'            => 'Пеҥгыдемдымаш дене �ерышым темлыме �лектрон адре�ыш колтымо. Электрон почто адре�ын тыйын улмым пеҥгыдемдаш, �ерышыште улшо ин�трукцийым шукто.',
+'emailauthenticated'      => 'Тыйын почто адре�етым пеҥгыдемдыме $1.',
 'loginlanguagelabel'      => 'Йылме: $1',
 
+# Password reset dialog
+'oldpassword' => 'Тошто шолыпмут:',
+'newpassword' => 'У шолыпмут:',
+'retypenew'   => 'Пеҥгыдемдыза у шолыпмутым:',
+
 # Edit page toolbar
 'bold_sample'     => 'Кӱжгӧ тек�т',
 'bold_tip'        => 'Кӱжгӧ тек�т',
@@ -220,6 +226,7 @@ $messages = array(
 'hr_tip'          => 'Тореш (шу�н кучылт)',
 
 # Edit pages
+'summary'            => 'Тӧрлатымаш нерген:',
 'minoredit'          => 'Тиде изирак тӧрлатыме',
 'watchthis'          => 'Тиде лаштыкым ��кераш',
 'savearticle'        => 'Лаштыкым аралаш',
@@ -227,8 +234,8 @@ $messages = array(
 'showpreview'        => 'Ончылгоч ончымаш',
 'showdiff'           => 'Тӧрлатымашым ончыкташ',
 'clearyourcache'     => "'''Ешартыш''': �ралыме деч вара вашталтышым ужаш браузеретын кешыжым �рыкташ логалын кертеш. '''Mozilla / Firefox / Safari:''' ''Shift''-ым темдал кучен ''Reload''-ым темдал але ''Ctrl-F5'' але ''Ctrl-R'' темдал (Macintosh-влак ''Command-R''); '''Konqueror:''' темдал ''Reload'' кнопкым але ''F5'' темдал; '''Opera:''' ''Tools→Preferences''-ыште кешым �рыкте; '''Internet Explorer:''' ''Ctrl''-ым темдал кучен ''Refresh''-ым темдал але ''Ctrl-F5'' темдал.",
-'previewnote'        => '<strong>Тиде ончылгоч ончымаш гына;
-вашталтыш-влакым �ше аралыме огыл!</strong>',
+'previewnote'        => "'''Тиде ончылгоч ончымаш гына;
+вашталтыш-влакым �ше аралыме огыл!'''",
 'editing'            => 'Тӧрлаталтеш $1',
 'template-protected' => '(тӧрлаташ чарыме)',
 
@@ -268,6 +275,7 @@ $messages = array(
 'prefs-edits'           => 'Мын�р тӧрлатымашым ыштен?:',
 'changepassword'        => 'Шолыпмутым вашталташ',
 'skin'                  => 'Сӧра�тарыме йӧн',
+'skin-preview'          => 'Ончылгоч ончымаш',
 'math'                  => 'Формуло-влак',
 'prefs-personal'        => 'Пайдаланышын профильже',
 'prefs-rc'              => 'Шукерт�е огыл тӧрлымаш-влак',
@@ -277,9 +285,6 @@ $messages = array(
 'prefs-misc'            => 'Тӱрлӧ',
 'saveprefs'             => '�ралаш',
 'resetprefs'            => 'Тӧрлатымым шотыш налаш огыл',
-'oldpassword'           => 'Тошто шолыпмут:',
-'newpassword'           => 'У шолыпмут:',
-'retypenew'             => 'Пеҥгыдемдыза у шолыпмутым:',
 'searchresultshead'     => 'Кычалме',
 'savedprefs'            => 'Тыйын на�тройке-влакетым аралыме.',
 'allowemail'            => 'Ве� ушнышо-влак деч �лектрон почтым налаш кӧнаш',
@@ -323,11 +328,11 @@ $messages = array(
 'fileuploadsummary' => 'Тидын нерген кӱчыкын:',
 'watchthisupload'   => 'Тиде лаштыкым ��кераш',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'файл',
-'imagelist_user' => 'Пайдаланыше',
+'listfiles_user' => 'Пайдаланыше',
 
-# Image description page
+# File description page
 'filehist-deleteone' => 'шӧраш',
 'filehist-current'   => 'кызыт',
 'filehist-user'      => 'Пайдаланыше',
@@ -367,6 +372,9 @@ $messages = array(
 'allarticles'    => 'Чыла лаштык-влак',
 'allpagessubmit' => 'Кайе',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Кучал',
+
 # Special:ListUsers
 'listusers-submit' => 'ончыкташ',
 
@@ -374,39 +382,38 @@ $messages = array(
 'emailuser' => 'Пайдаланыше дек �ерыш',
 
 # Watchlist
-'watchlist'            => 'Мыйын ��керымаш �пи�ке',
-'mywatchlist'          => 'Мыйын ��керымаш �пи�ке',
-'watchlistfor'         => "('''$1''' лан)",
-'addedwatch'           => 'Э�керымаш �пи�кыш ешарыме',
-'removedwatch'         => 'Э�керымаш �пи�ке гыч шӧрымӧ',
-'removedwatchtext'     => '«[[:$1]]» лаштыкым [[Special:Watchlist|тыйын ��керыме лӱмер]] гыч кораҥдыме.',
-'watch'                => 'Э�кераш',
-'watchthispage'        => 'Тиде лаштыкым ��кераш',
-'unwatch'              => 'Э�керыман огыл',
-'unwatchthispage'      => 'Э�керымым чарнаш',
-'watchlistcontains'    => 'Тыйын �пи�кыште $1 {{PLURAL:$1|лаштык|лаштык}}.',
-'wlshowlast'           => 'Пытартыш $1 шагат $2 кечылан $3 ончыкташ',
-'watchlist-hide-bots'  => 'Ботын тӧрлымым шылташ',
-'watchlist-hide-own'   => 'Мыйын тӧрлымым шылташ',
-'watchlist-hide-minor' => 'Изирак тӧрлымым шылташ',
+'watchlist'         => 'Мыйын ��керымаш �пи�ке',
+'mywatchlist'       => 'Мыйын ��керымаш �пи�ке',
+'watchlistfor'      => "('''$1''' лан)",
+'addedwatch'        => 'Э�керымаш �пи�кыш ешарыме',
+'removedwatch'      => 'Э�керымаш �пи�ке гыч шӧрымӧ',
+'removedwatchtext'  => '«[[:$1]]» лаштыкым [[Special:Watchlist|тыйын ��керыме лӱмер]] гыч кораҥдыме.',
+'watch'             => 'Э�кераш',
+'watchthispage'     => 'Тиде лаштыкым ��кераш',
+'unwatch'           => 'Э�керыман огыл',
+'unwatchthispage'   => 'Э�керымым чарнаш',
+'watchlistcontains' => 'Тыйын �пи�кыште $1 {{PLURAL:$1|лаштык|лаштык}}.',
+'wlshowlast'        => 'Пытартыш $1 шагат $2 кечылан $3 ончыкташ',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Э�керымаш �пи�кыш ешарымаш...',
 'unwatching' => 'Э�керымаш �пи�ке гыч шӧрымаш...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Лаштыкым шӧраш',
-'delete-confirm'              => 'Шӧраш "$1"',
-'delete-legend'               => 'Шӧраш',
-'historywarning'              => 'Тӱтко лий: шӧраш шонымо лаштыкет вашталтыш-влак нерген и�торийым нумалеш:',
-'actioncomplete'              => 'Дей�твийым ыштыме',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» шӧрымӧ.
+# Delete
+'deletepage'            => 'Лаштыкым шӧраш',
+'delete-confirm'        => 'Шӧраш "$1"',
+'delete-legend'         => 'Шӧраш',
+'historywarning'        => 'Тӱтко лий: шӧраш шонымо лаштыкет вашталтыш-влак нерген и�торийым нумалеш:',
+'actioncomplete'        => 'Дей�твийым ыштыме',
+'deletedtext'           => '«<nowiki>$1</nowiki>» шӧрымӧ.
 Ончо $2 пытартыш шӧрымӧ-влак лӱмер гыч.',
-'dellogpage'                  => 'Шӧрымӧ нерген журнал',
-'deletionlog'                 => 'шӧрымӧ нерген журнал',
-'deletecomment'               => 'Шӧрымын амалже:',
-'deleteotherreason'           => 'Ве�/ешартыш амал:',
-'deletereasonotherlist'       => 'Ве� амал',
+'dellogpage'            => 'Шӧрымӧ нерген журнал',
+'deletionlog'           => 'шӧрымӧ нерген журнал',
+'deletecomment'         => 'Шӧрымын амалже:',
+'deleteotherreason'     => 'Ве�/ешартыш амал:',
+'deletereasonotherlist' => 'Ве� амал',
+
+# Protect
 'protectcomment'              => '�ралыме нерген:',
 'protectexpiry'               => 'Мучашлалтеш:',
 'protect_expiry_invalid'      => 'Йоҥылыш мучашлалтше жап.',
@@ -414,6 +421,8 @@ $messages = array(
 'protect-default'             => '(ойлыде)',
 'protect-level-autoconfirmed' => 'Реги�трацийым �ртыдыме да у пайдаланыше-влак деч петырыме',
 'protect-level-sysop'         => 'Сайтвиктарыше-влак гына',
+'protect-otherreason'         => 'Ве�/ешартыш амал:',
+'protect-otherreason-op'      => 'ве�/ешартыш амал',
 
 # Undelete
 'undelete-search-submit' => 'Кычал',
@@ -516,7 +525,7 @@ $messages = array(
 # Media information
 'widthheightpage' => '$1×$2, $3 {{PLURAL:$3|лаштык|лаштык}}',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '(Бот-влакым $1 )',
 'ilsubmit'     => 'Кычал',
 
diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index fc2806d6..38ffcd1f 100644
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -15,71 +15,240 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Кла�ика',
-	'nostalgia'   => '�о�талгија',
-	'cologneblue' => 'Келн�ко �ино',
-	'monobook'    => 'Monobook',
-	'myskin'      => 'Моја ма�ка',
-	'chick'       => 'Шик'
+$namespaceNames = array(
+	NS_MEDIA            => 'Медија',
+	NS_SPECIAL          => 'Специјални',
+	NS_TALK             => 'Разговор',
+	NS_USER             => 'Кори�ник',
+	NS_USER_TALK        => 'Разговор_�о_кори�ник',
+	NS_PROJECT_TALK     => 'Разговор_за_$1',
+	NS_FILE             => 'Податотека',
+	NS_FILE_TALK        => 'Разговор_за_податотека',
+	NS_MEDIAWIKI        => 'МедијаВики',
+	NS_MEDIAWIKI_TALK   => 'Разговор_за_МедијаВики',
+	NS_TEMPLATE         => 'Шаблон',
+	NS_TEMPLATE_TALK    => 'Разговор_за_шаблон',
+	NS_HELP             => 'Помош',
+	NS_HELP_TALK        => 'Разговор_за_помош',
+	NS_CATEGORY         => 'Категорија',
+	NS_CATEGORY_TALK    => 'Разговор_за_категорија',
 );
 
-$magicWords = array(
-	'redirect'              => array( 0, '#redirect', '#прена�очување', '#види' ),
-	'notoc'                 => array( 0, '__NOTOC__', '__БЕЗСОДРЖИ��__' ),
-	'forcetoc'              => array( 0, '__FORCETOC__', '__СОСОДРЖИ��__' ),
-	'toc'                   => array( 0, '__TOC__', '__СОДРЖИ��__' ),
-	'noeditsection'         => array( 0, '__NOEDITSECTION__' , '__БЕЗ_УРЕДУВ�ЊЕ_��_СЕКЦИИ__'),
-	'currentmonth'          => array( 1, 'CURRENTMONTH', 'СЕГ�ШЕ�МЕСЕЦ' ),
-	'currentmonthname'      => array( 1, 'CURRENTMONTHNAME', 'СЕГ�ШЕ�МЕСЕЦИМЕ' ),
-	'currentmonthnamegen'   => array( 1, 'CURRENTMONTHNAMEGEN', 'СЕГ�ШЕ�МЕСЕЦИМЕРОД' ),
-	'currentmonthabbrev'    => array( 1, 'CURRENTMONTHABBREV', 'СЕГ�ШЕ�МЕСЕЦСКР' ),
-	'currentday'            => array( 1, 'CURRENTDAY', 'СЕГ�ШЕ�ДЕ�' ),
-	'currentdayname'        => array( 1, 'CURRENTDAYNAME', 'СЕГ�ШЕ�ДЕ�ИМЕ' ),
-	'currentyear'           => array( 1, 'CURRENTYEAR', 'СЕГ�Ш��ГОДИ��' ),
-	'currenttime'           => array( 1, 'CURRENTTIME', 'СЕГ�Ш�ОВРЕМЕ' ),
-	'numberofarticles'      => array( 1, 'NUMBEROFARTICLES', 'БРОЈСТ�ТИИ' ),
-	'pagename'              => array( 1, 'PAGENAME', 'СТР��ИЦ�' ),
-	'pagenamee'             => array( 1, 'PAGENAMEE', 'СТР��ИЦ�И' ),
-	'namespace'             => array( 1, 'NAMESPACE', 'ИМЕПРОСТОР' ),
-	'subst'                 => array( 0, 'SUBST:', 'З�МЕСТ:' ),
-	'msgnw'                 => array( 0, 'MSGNW:', 'ИЗВЕШТNW:' ),
-	'img_thumbnail'         => array( 1, 'thumbnail', 'thumb', 'мини' ),
-	'img_right'             => array( 1, 'right', 'де�но', 'д' ),
-	'img_left'              => array( 1, 'left', 'лево', 'л' ),
-	'img_none'              => array( 1, 'none', 'н' ),
-	'img_width'             => array( 1, '$1px', '$1пк�' , '$1п' ),
-	'img_center'            => array( 1, 'center', 'centre', 'центар', 'ц' ),
-	'img_framed'            => array( 1, 'framed', 'enframed', 'frame', 'рамка', 'ворамка' ),
-	'sitename'              => array( 1, 'SITENAME', 'ИМЕ��С�ЈТ' ),
-	'localurl'              => array( 0, 'LOCALURL:', 'ЛОК�Л���ДРЕС�:' ),
-	'localurle'             => array( 0, 'LOCALURLE:', 'ЛОК�Л���ДРЕС�И:' ),
-	'server'                => array( 0, 'SERVER', 'СЕРВЕР' ),
-	'grammar'               => array( 0, 'GRAMMAR:', 'ГР�М�ТИК�:' ),
-	'notitleconvert'        => array( 0, '__NOTITLECONVERT__', '__NOTC__'),
-	'nocontentconvert'      => array( 0, '__NOCONTENTCONVERT__', '__NOCC__'),
-	'currentweek'           => array( 1, 'CURRENTWEEK', 'СЕГ�Ш��СЕДМИЦ�'),
+$namespaceAliases = array(
+	'Слика' => NS_FILE,
+	'Разговор_за_�лика' => NS_FILE_TALK,
 );
 
-$namespaceNames = array(
-	NS_MEDIA          => 'Медија',
-	NS_SPECIAL        => 'Специјални',
-	NS_MAIN           => '',
-	NS_TALK           => 'Разговор',
-	NS_USER           => 'Кори�ник',
-	NS_USER_TALK      => 'Разговор_�о_кори�ник',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Разговор_за_$1',
-	NS_IMAGE          => 'Слика',
-	NS_IMAGE_TALK     => 'Разговор_за_�лика',
-	NS_MEDIAWIKI      => 'МедијаВики',
-	NS_MEDIAWIKI_TALK => 'Разговор_за_МедијаВики',
-	NS_TEMPLATE       => 'Шаблон',
-	NS_TEMPLATE_TALK  => 'Разговор_за_шаблон',
-	NS_HELP           => 'Помош',
-	NS_HELP_TALK      => 'Разговор_за_помош',
-	NS_CATEGORY       => 'Категорија',
-	NS_CATEGORY_TALK  => 'Разговор_за_категорија',
+
+$datePreferences = array(
+	'default',
+	'dmy mk',
+	'ymd mk',
+	'ymdt mk',
+	'mdy',
+	'dmy',
+	'ymd',
+	'ISO 8601',
+);
+
+$defaultDateFormat = 'dmy or mdy';
+
+$dateFormats = array(
+	'dmy mk time' => 'H:i',
+	'dmy mk date' => 'j.m.Y',
+	'dmy mk both' => 'H:i, j.m.Y',
+
+	'ymd mk time' => 'H:i',
+	'ymd mk date' => 'Y.m.j',
+	'ymd mk both' => 'H:i, Y.m.j',
+
+	'ymdt mk time' => 'H:i:s',
+	'ymdt mk date' => 'Y.m.j',
+	'ymdt mk both' => 'Y.m.j, H:i:s',
+
+	'mdy time' => 'H:i',
+	'mdy date' => 'F j, Y',
+	'mdy both' => 'H:i, F j, Y',
+
+	'dmy time' => 'H:i',
+	'dmy date' => 'j F Y',
+	'dmy both' => 'H:i, j F Y',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y F j',
+	'ymd both' => 'H:i, Y F j',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'ДвојниПрена�очувања' ),
+	'BrokenRedirects'           => array( 'ПрекинатиПрена�очувања' ),
+	'Disambiguations'           => array( 'Поја�нувања' ),
+	'Userlogin'                 => array( '�ајавување' ),
+	'Userlogout'                => array( 'Одјавување' ),
+	'CreateAccount'             => array( 'КреирајКири�ничкаСметка' ),
+	'Preferences'               => array( '�агодувања' ),
+	'Watchlist'                 => array( 'Ли�та�а�абљудувања' ),
+	'Recentchanges'             => array( 'СкорешниПромени' ),
+	'Upload'                    => array( 'Подигнување', 'Подигнувања' ),
+	'Listfiles'                 => array( 'Ли�та�аСлики', 'Ли�та�аПодатотеки' ),
+	'Newimages'                 => array( '�овиСлики', '�овиПодатотеки' ),
+	'Listusers'                 => array( 'Ли�та�аКори�ници', 'Ли�таКори�ници' ),
+	'Listgrouprights'           => array( 'Ли�та�аГрупниПрава' ),
+	'Statistics'                => array( 'Стати�тики' ),
+	'Randompage'                => array( 'Случајна', 'СлучајнаСтраница' ),
+	'Lonelypages'               => array( 'О�амениСтраници', 'СтранциСирачиња' ),
+	'Uncategorizedpages'        => array( '�екатегоризираниСтраници' ),
+	'Uncategorizedcategories'   => array( '�екатегоризираниКатегории' ),
+	'Uncategorizedimages'       => array( '�екатегоризираниСлики' ),
+	'Uncategorizedtemplates'    => array( '�екатегоризираниШаблони' ),
+	'Unusedcategories'          => array( '�еи�кори�тениКатегории' ),
+	'Unusedimages'              => array( '�еи�кори�тениСлики', '�еи�кори�тениПодатотеки' ),
+	'Wantedpages'               => array( 'ПрекинатиВр�ки' ),
+	'Wantedcategories'          => array( 'БараниКатегории' ),
+	'Wantedfiles'               => array( 'БараниПодатотеки' ),
+	'Wantedtemplates'           => array( 'БараниШаблони' ),
+	'Mostlinked'                => array( 'Со�ајмногуВр�ки', 'СтранициСо�ајмногуВр�ки' ),
+	'Mostlinkedcategories'      => array( '�ајупотребуваниКатегории' ),
+	'Mostlinkedtemplates'       => array( '�ајупотребуваниШаблони' ),
+	'Mostimages'                => array( '�ајмногуСлики', '�ајмногуПодатотеки', 'ПодатотекиСо�ајмногуВр�ки' ),
+	'Mostcategories'            => array( '�ајмногуКатегории' ),
+	'Mostrevisions'             => array( '�ајмногуРевизии' ),
+	'Fewestrevisions'           => array( '�ајмалкуРевизии' ),
+	'Shortpages'                => array( 'КраткиСтраници' ),
+	'Longpages'                 => array( 'ДолгиСтраници' ),
+	'Newpages'                  => array( '�овиСтраници' ),
+	'Ancientpages'              => array( '�ај�тариСтраници' ),
+	'Deadendpages'              => array( 'Ќор�окакСтраници' ),
+	'Protectedpages'            => array( 'ЗаштитениСтраници' ),
+	'Protectedtitles'           => array( 'Заштитени�а�лови' ),
+	'Allpages'                  => array( 'СитеСтраници' ),
+	'Prefixindex'               => array( 'Индек��аПрефик�и' ),
+	'Ipblocklist'               => array( 'Ли�та�аБлокираниIP' ),
+	'Specialpages'              => array( 'СпецијалниСтраници' ),
+	'Contributions'             => array( 'Придоне�и' ),
+	'Whatlinkshere'             => array( 'ШтоВодиОвде' ),
+	'Recentchangeslinked'       => array( 'ПоврзаниПромени' ),
+	'Movepage'                  => array( 'Преме�тиСтраница' ),
+	'Blockme'                   => array( 'БлокирајМе' ),
+	'Booksources'               => array( 'ПечатенИзвор' ),
+	'Categories'                => array( 'Категории' ),
+	'Export'                    => array( 'Извоз' ),
+	'Version'                   => array( 'Верзија' ),
+	'Allmessages'               => array( 'СитеПораки' ),
+	'Log'                       => array( 'Дневник', 'Дневници' ),
+	'Blockip'                   => array( 'Блокирање', 'БлокIP', 'БлокирајКори�ник' ),
+	'Undelete'                  => array( 'Врати' ),
+	'Import'                    => array( 'Увоз' ),
+	'Lockdb'                    => array( 'ЗаклучиБаза' ),
+	'Unlockdb'                  => array( 'ОтклучиБаза' ),
+	'Userrights'                => array( 'Кори�ничкиПрава' ),
+	'MIMEsearch'                => array( 'MIMEПребарување' ),
+	'FileDuplicateSearch'       => array( 'ПребарувањеДупликатПодатотека' ),
+	'Unwatchedpages'            => array( '�енабљудуваниСтраници' ),
+	'Listredirects'             => array( 'Ли�та�аПрена�очувања' ),
+	'Revisiondelete'            => array( 'БришењеРевизија' ),
+	'Unusedtemplates'           => array( '�еи�кори�тениШаблони' ),
+	'Randomredirect'            => array( 'СлучајноПрена�очување' ),
+	'Mypage'                    => array( 'МојаСтраница' ),
+	'Mytalk'                    => array( 'МојРазговор', 'МоиРазговори' ),
+	'Mycontributions'           => array( 'МоиПридоне�и' ),
+	'Listadmins'                => array( 'Ли�та�а�дмини�тратори' ),
+	'Listbots'                  => array( 'Ли�та�аБотови' ),
+	'Popularpages'              => array( 'ПопуларниСтраници' ),
+	'Search'                    => array( 'Барај' ),
+	'Resetpass'                 => array( 'Ре�етирајЛозинка' ),
+	'Withoutinterwiki'          => array( 'БезИнтервики' ),
+	'MergeHistory'              => array( 'СпојувањеИ�торија' ),
+	'Filepath'                  => array( 'ПатДоПодатотека' ),
+	'Invalidateemail'           => array( 'ПогрешнаЕпошта' ),
+	'Blankpage'                 => array( 'ПразнаСтраница' ),
+	'LinkSearch'                => array( 'ПребарајВр�ка' ),
+	'DeletedContributions'      => array( 'ИзбришаниПридоне�и' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#redirect', '#прена�очување', '#види' ),
+	'notoc'                 => array( '0', '__БЕЗСОДРЖИ��__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__БЕЗГ�ЛЕРИЈ�__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__СОСОДРЖИ��__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__СОДРЖИ��__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__БЕЗ_УРЕДУВ�ЊЕ_��_СЕКЦИИ__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__БЕЗ��СЛОВ__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', 'СЕГ�ШЕ�МЕСЕЦ', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'СЕГ�ШЕ�МЕСЕЦИМЕ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'СЕГ�ШЕ�МЕСЕЦИМЕРОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'СЕГ�ШЕ�МЕСЕЦСКР', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'СЕГ�ШЕ�ДЕ�', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'СЕГ�ШЕ�ДЕ�2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'СЕГ�ШЕ�ДЕ�ИМЕ', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'СЕГ�Ш��ГОДИ��', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'СЕГ�Ш�ОВРЕМЕ', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'СЕГ�ШЕ�Ч�С', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'МЕСЕЦ_ЛОК�Л�О', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'МЕСЕЦИМЕ_ЛОК�Л�О', 'LOCALMONTHNAME' ),
+	'localday'              => array( '1', 'ДЕ�_ЛОК�Л�О', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'ДЕ�2_ЛОК�Л�О', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'ИМЕ��ДЕ�_ЛОК�Л�О', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'ГОДИ��_ЛОК�Л�О', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'ВРЕМЕ_ЛОК�Л�О', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'Ч�С_ЛОК�Л�О', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'БРОЈ��СТР��ИЦИ', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'БРОЈСТ�ТИИ', 'БРОЈ��СТ�ТИИ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'БРОЈ��ПОД�ТОТЕКИ', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'БРОЈ��КОРИС�ИЦИ', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'БРОЈ��УРЕДУВ�Њ�', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'БРОЈ��ПРЕГЛЕДУВ�Њ�', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', 'СТР��ИЦ�', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'СТР��ИЦ�И', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'ИМЕПРОСТОР', 'ИМЕ�СКИПРОСТОР', 'NAMESPACE' ),
+	'talkspace'             => array( '1', 'Р�ЗГОВОРПРОСТОР', 'TALKSPACE' ),
+	'fullpagename'          => array( '1', 'ЦЕЛОС�ОИМЕ��СТР��ИЦ�', 'FULLPAGENAME' ),
+	'subpagename'           => array( '1', 'ИМЕ��ПОДСТР��ИЦ�', 'SUBPAGENAME' ),
+	'basepagename'          => array( '1', 'ИМЕ��ОС�ОВ��СТР��ИЦ�', 'BASEPAGENAME' ),
+	'talkpagename'          => array( '1', 'СТР��ИЦ�З�Р�ЗГОВОР', 'TALKPAGENAME' ),
+	'subst'                 => array( '0', 'З�МЕСТ:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'ИЗВЕШТNW:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'мини', 'мини-�лика', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'мини-�лика=$1', 'мини=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'де�но', 'д', 'right' ),
+	'img_left'              => array( '1', 'лево', 'л', 'left' ),
+	'img_none'              => array( '1', 'н', 'нема', 'none' ),
+	'img_width'             => array( '1', '$1пк�', '$1п', '$1px' ),
+	'img_center'            => array( '1', 'центар', 'ц', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'рамка', 'ворамка', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'безрамка', 'frameless' ),
+	'img_page'              => array( '1', '�траница=$1', '�траница $1', 'page=$1', 'page $1' ),
+	'img_top'               => array( '1', 'врв', 'top' ),
+	'img_middle'            => array( '1', '�редина', 'middle' ),
+	'img_bottom'            => array( '1', 'дно', 'bottom' ),
+	'img_link'              => array( '1', 'вр�ка=$1', 'link=$1' ),
+	'sitename'              => array( '1', 'ИМЕ��С�ЈТ', 'SITENAME' ),
+	'localurl'              => array( '0', 'ЛОК�Л���ДРЕС�:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'ЛОК�Л���ДРЕС�И:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'СЕРВЕР', 'SERVER' ),
+	'servername'            => array( '0', 'ИМЕ��СЕРВЕР', 'SERVERNAME' ),
+	'grammar'               => array( '0', 'ГР�М�ТИК�:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__БЕЗСОДРЖИ��__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'currentweek'           => array( '1', 'СЕГ�Ш��СЕДМИЦ�', 'CURRENTWEEK' ),
+	'localweek'             => array( '1', 'СЕДМИЦ�_ЛОК�Л�О', 'LOCALWEEK' ),
+	'plural'                => array( '0', 'М�ОЖИ��:', 'PLURAL:' ),
+	'raw'                   => array( '0', 'РЕД:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'ПРИК�ЖИ��СЛОВ', 'DISPLAYTITLE' ),
+	'currentversion'        => array( '1', 'ТЕКОВ��ВЕРЗИЈ�', 'CURRENTVERSION' ),
+	'language'              => array( '0', '#Ј�ЗИК:', '#LANGUAGE:' ),
+	'numberofadmins'        => array( '1', 'БРОЈ���ДМИ�ИСТР�ТОРИ', 'NUMBEROFADMINS' ),
+	'defaultsort'           => array( '1', 'ОС�ОВ�ОПОДРЕДУВ�ЊЕ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'tag'                   => array( '0', 'приврзок', 'tag' ),
+	'hiddencat'             => array( '1', '__СКРИЕ��_К�ТЕГОРИЈ�__', '__СКРИЕ��К�ТЕГОРИЈ�__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'СТР��ИЦИВОК�ТЕГОРИЈ�', 'СТР��ИЦИВОК�Т', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'ГОЛЕМИ��_��_СТР��ИЦ�', 'PAGESIZE' ),
+	'index'                 => array( '1', '__И�ДЕКС__', '__INDEX__' ),
+	'noindex'               => array( '1', '__БЕЗИ�ДЕКС__', '__NOINDEX__' ),
+	'staticredirect'        => array( '1', '__СТ�ТИЧ�ОПРЕ��СОЧУВ�ЊЕ__', '__STATICREDIRECT__' ),
 );
 
 $linkTrail = '/^([a-zабвгдѓежзѕијклљмнњопр�тќуфхцчџш]+)(.*)$/sDu';
@@ -123,17 +292,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Сокриј мои уредувања од ли�тата на набљудувања',
 'tog-watchlisthidebots'       => 'Сокриј бот уредувања во ли�тата на набљудувања',
 'tog-watchlisthideminor'      => 'Сокриј �итни уредувања во ли�тата на набљудувања',
+'tog-watchlisthideliu'        => 'Сокриј уредувања на најавени кори�ници во мојата ли�та на набљудувања',
+'tog-watchlisthideanons'      => 'Сокриј уредувања од анонимни кори�ници во мојата ли�та на набљудувања',
 'tog-nolangconversion'        => 'Оневозможи различни конверзии',
 'tog-ccmeonemails'            => 'Праќај ми копии од е-пораките што ги праќам до други кори�ници',
 'tog-diffonly'                => '�е ја покажувај �одржината на �траницата под разликите',
 'tog-showhiddencats'          => 'Прикажи �криени категории',
+'tog-noconvertlink'           => 'Оневозможи конверзија на на�лов на вр�ка',
+'tog-norollbackdiff'          => 'Изо�тави разлика по�ле употребата на враќање',
 
 'underline-always'  => 'Секогаш',
 'underline-never'   => '�икогаш',
 'underline-default' => 'Според нагодувањата на прели�тувачот',
 
-'skinpreview' => '(Прегледај)',
-
 # Dates
 'sunday'        => '�едела',
 'monday'        => 'Понеделник',
@@ -194,11 +365,11 @@ $messages = array(
 'category-empty'                 => "''Оваа категорија моментално не �одржи �траници или медија.''",
 'hidden-categories'              => '{{PLURAL:$1|Скриена категорија|Скриени категории}}',
 'hidden-category-category'       => 'Скриени категории', # Name of the category where hidden categories will be listed
-'category-subcat-count'          => '{{PLURAL:$2|Оваа категорија ја �одржи �амо �леднава поткатегорија.|Оваа категорија {{PLURAL:$1|ја �одржи �леднава поткатегорија|ги �одржи �ледниве $1 поткатегории}}, од вкупно $2.}}',
-'category-subcat-count-limited'  => 'Оваа категорија {{PLURAL:$1|ја �одржи �леднава поткатегорија|ги �одржи �ледниве $1 поткатегории}}.',
-'category-article-count'         => '{{PLURAL:$2|Оваа категорија ја �одржи �амо �леднава �траница.|{{PLURAL:$1|Следнава �траница е|Следниве $1 �траници �е}} во оваа категорија, од вкупно $2.}}',
-'category-article-count-limited' => '{{PLURAL:$1|Следнава �траница е|Следниве $1 �траници �е}} во оваа категорија.',
-'category-file-count'            => '{{PLURAL:$2|Оваа категорија ја �одржи �амо �леднава податотека.|{{PLURAL:$1|Следнава податотека е|Следниве $1 податотеки �е}} во оваа категорија, од вкупно $2.}}',
+'category-subcat-count'          => '{{PLURAL:$2|Оваа категорија ја �одржи �амо �ледната подкатегорија.|Оваа категорија {{PLURAL:$1|ја �одржи �ледната подкатегорија|ги �одржи �ледните $1 подкатегории}}, од вкупно $2.}}',
+'category-subcat-count-limited'  => 'Оваа категорија {{PLURAL:$1|ја �одржи �ледната подкатегорија|ги �одржи �ледните $1 подкатегории}}.',
+'category-article-count'         => '{{PLURAL:$2|Оваа категорија ја �одржи �амо �ледната �траница.|{{PLURAL:$1|Следната �траница е|Следните $1 �траници �е}} во оваа категорија, од вкупно $2.}}',
+'category-article-count-limited' => '{{PLURAL:$1|Следната �траница е|Следните $1 �траници �е}} во оваа категорија.',
+'category-file-count'            => '{{PLURAL:$2|Оваа категорија ја �одржи �амо �ледната податотека.|{{PLURAL:$1|Следната податотека е|Следните $1 податотеки �е}} во оваа категорија, од вкупно $2.}}',
 'category-file-count-limited'    => '{{PLURAL:$1|Следнава податотека е|Следниве $1 податотеки �е}} во оваа категорија.',
 'listingcontinuesabbrev'         => 'продолжува',
 
@@ -227,7 +398,7 @@ $messages = array(
 'mytalk'         => 'Мои разговори',
 'anontalk'       => 'Разговор за оваа IP адре�а',
 'navigation'     => '�авигација',
-'and'            => 'и',
+'and'            => '&#32;и',
 
 # Metadata in edit box
 'metadata_help' => 'Метаподатоци:',
@@ -248,9 +419,9 @@ $messages = array(
 'permalink'         => 'Перманентна вр�ка',
 'print'             => 'Печати',
 'edit'              => 'Уреди',
-'create'            => 'Креирај',
+'create'            => 'Создади',
 'editthispage'      => 'Уреди ја оваа �траница',
-'create-this-page'  => 'Креирај ја оваа �траница',
+'create-this-page'  => 'Создади ја оваа �траница',
 'delete'            => 'Избриши',
 'deletethispage'    => 'Избриши ја оваа �траница',
 'undelete_short'    => 'Враќање на {{PLURAL:$1|едно избришано уредување|$1 избришани уредувања}}',
@@ -264,14 +435,14 @@ $messages = array(
 'talkpagelinktext'  => 'Разговор',
 'specialpage'       => 'Специјална �траница',
 'personaltools'     => 'Лични алатки',
-'postcomment'       => 'И�прати коментар',
+'postcomment'       => '�ова �екција',
 'articlepage'       => 'Поглед на �одржина',
 'talk'              => 'Разговор',
 'views'             => 'Погледи',
 'toolbox'           => '�латник',
 'userpage'          => 'Поглед на кори�ничка �траница',
 'projectpage'       => 'Поглед на проект',
-'imagepage'         => 'Поглед на медија',
+'imagepage'         => 'Поглед на �траница на податотека',
 'mediawikipage'     => 'Поглед на порака',
 'templatepage'      => 'Поглед на шаблон',
 'viewhelppage'      => 'Види ја �траницата за помош',
@@ -290,8 +461,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'За {{SITENAME}}',
 'aboutpage'            => 'Project:За {{SITENAME}}',
-'bugreports'           => 'Извештаи за грешки',
-'bugreportspage'       => 'Project:Извештаи за грешки',
 'copyright'            => 'Сите тек�тови �е до�тапни под у�ловите на $1.',
 'copyrightpagename'    => '{{SITENAME}} автор�ки права',
 'copyrightpage'        => '{{ns:project}}:�втор�ки права',
@@ -310,13 +479,11 @@ $messages = array(
 'portal'               => 'Портал',
 'portal-url'           => 'Project:Портал на заедницата',
 'privacy'              => 'Заштита на личните податоци',
-'privacypage'          => 'Project:Заштита на личните податоци',
+'privacypage'          => 'Project:Политика на приватно�т',
 
-'badaccess'        => 'Грешка во перми�ии',
+'badaccess'        => '�емате овла�тување',
 'badaccess-group0' => '�емате дозвола да ја извршите бараната акција.',
-'badaccess-group1' => '�кцијата што ја баравте е ограничена �амо на кори�ниците во групата $1.',
-'badaccess-group2' => '�кцијата што ја баравте е ограничена �амо на кори�ниците во една од групите $1.',
-'badaccess-groups' => '�кцијата што ја баравте е ограничена �амо на кори�ниците во една од групите $1.',
+'badaccess-groups' => '�кцијата што ја баравте е ограничена �амо на кори�ници во {{PLURAL:$2|групата|една од групите}}: $1.',
 
 'versionrequired'     => 'Верзијата $1 од МедијаВики е задолжителна',
 'versionrequiredtext' => 'Мора да имате верзија $1 на МедијаВики за да ја кори�тите оваа �траница. 
@@ -333,6 +500,8 @@ $messages = array(
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'уреди',
 'viewsourceold'           => 'види код',
+'editlink'                => 'уреди',
+'viewsourcelink'          => 'види код',
 'editsectionhint'         => 'Уреди �екција: $1',
 'toc'                     => 'Содржина',
 'showtoc'                 => 'прикажи',
@@ -349,13 +518,13 @@ $messages = array(
 'page-atom-feed'          => '„$1“ Atom фид',
 'feed-atom'               => 'Atom',
 'feed-rss'                => 'RSS',
-'red-link-title'          => '$1 (�еуште не е напишано)',
+'red-link-title'          => '$1 (�траницата не по�тои)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Страница',
 'nstab-user'      => 'Страница на кори�ник',
 'nstab-media'     => 'Страница на медија',
-'nstab-special'   => 'Специјална',
+'nstab-special'   => 'Специјална �траница',
 'nstab-project'   => 'Страница на проект',
 'nstab-image'     => 'Податотека',
 'nstab-mediawiki' => 'Порака',
@@ -365,7 +534,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '�е по�тои таа функција',
-'nosuchactiontext'  => '�кцијата наведена во URL низата не е препозната од викито',
+'nosuchactiontext'  => '�кцијата наведена во URL низата е грешна.
+Можеби има грешка во пишувањето на URL или �те �леделе погрешна вр�ка.
+Ова може и�то така да биде и грешка во �офтверот на {{SITENAME}}.',
 'nosuchspecialpage' => '�е по�тои таква �пецијална �траница',
 'nospecialpagetext' => 'Баравте невалидна [[Special:SpecialPages|�пецијална �траница]].
 За ли�та на валидни �пецијални �траници погледни: [[Special:SpecialPages|{{int:specialpages}}]].',
@@ -403,19 +574,18 @@ $1',
 'readonly_lag'         => 'Базата е автомат�ки заклучена додека помошните �ервери не �е �инхронизираат',
 'internalerror'        => 'Внатрешна грешка',
 'internalerror_info'   => 'Внатрешна грешка: $1',
-'filecopyerror'        => '�е можам да ја копирам датотеката "$1" во "$2".',
-'filerenameerror'      => '�е можам да ја преименувам датотеката "$1" во "$2".',
-'filedeleteerror'      => '�е можам да ја избришам датотеката "$1".',
+'filecopyerror'        => '�е можe да �е копира податотеката "$1" во "$2".',
+'filerenameerror'      => '�е може да �е преименува податотеката "$1" во "$2".',
+'filedeleteerror'      => '�е може да �е избрише податотеката "$1".',
 'directorycreateerror' => '�е можеше да �е креира директориумот „$1“.',
-'filenotfound'         => '�е можам да ја најдам датотеката "$1".',
-'fileexistserror'      => '�е може да �е направи запи� во „$1“: датотеката по�тои',
+'filenotfound'         => '�е може да �е најде податотеката "$1".',
+'fileexistserror'      => '�е може да �е запишува во податотеката „$1“: податотеката по�тои',
 'unexpected'           => '�еочекувана вредно�т: "$1"="$2".',
 'formerror'            => 'Грешка: не можам да го и�пратам формуларот',
 'badarticleerror'      => 'Ова деј�тво не може да �е �проведе на наведената �траница.',
 'cannotdelete'         => '�е можам да ја избришам �траницата или �ликата. (Можеби е веќе избришана од некој друг.)',
 'badtitle'             => 'Лош на�лов',
 'badtitletext'         => 'Бараниот на�лов е грешен, празен или погрешно поврзан меѓујазичен или интер-вики на�лов. Може да �одржи еден или повеќе знаци што не можат да �е кори�тат во на�лови.',
-'perfdisabled'         => 'Извинете! Оваа можно�т е привремено и�клучена бидејќи ја у�порува базата до ниво на кое никој не може да го кори�ти викито.',
 'perfcached'           => 'Следните податоци �е кеширани и може да не бидат цело�но ажурирани:',
 'perfcachedts'         => 'Следните податоци �е кеширани, и по�леден пат ажурирани на $1.',
 'querypage-no-updates' => '�журирања на оваа �траница �е оневозможени. Податоците овде нема по�тојано да �е обновуваат.',
@@ -430,7 +600,7 @@ $1',
 'protectedinterface'   => 'Оваа �траница �одржи тек�т од интерфеј�от на �офтверот и е заклучена заради можна злоупотреба.',
 'editinginterface'     => "'''Предупредување:''' Уредувате �траница која е дел од кори�ничкиот интерфеј� на MediaWiki �офтверот. 
 Промените на оваа �траница ќе предизвикаат промена на кори�ничкиот интерфеј� кај о�танатите кори�ници.
-За превод, имајте го во предвид проектот [http://translatewiki.net/wiki/Main_Page?setlang=mk Betawiki], MediaWiki проект за локализација.",
+За превод, имајте го во предвид проектот [http://translatewiki.net/wiki/Main_Page?setlang=mk translatewiki.net], MediaWiki проект за локализација.",
 'sqlhidden'            => '(Скриен SQL прашалник)',
 'cascadeprotected'     => 'Оваа �траница е заштитена, не може да �е уредува, бидејќи е дел од {{PLURAL:$1|�леднава �траница, којашто е заштитена|�ледниве �траници, коишто �е заштитени}} бидејќи опцијата „ка�кадна заштита“ е вклучена:
 $2',
@@ -441,15 +611,15 @@ $2',
 Даденото образложение е ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Лоша конфигурација: непознат �кенер за виру�и: <i>$1</i>',
+'virus-badscanner'     => "Лоша конфигурација: непознат �кенер за виру�и: ''$1''",
 'virus-scanfailed'     => 'неу�пешно �кенирање (код $1)',
 'virus-unknownscanner' => 'непознат антивиру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Одјавување на кори�ник',
-'logouttext'                 => '<strong>Сега �те одјавени.</strong>
+'logouttext'                 => "'''Сега �те одјавени.'''
 
-Можете да продолжите �о кори�тење на {{SITENAME}} анонимно или можете [[Special:UserLogin|повторно да �е најавите]] под и�то или различно кори�ничко име. Да напоменеме дека некои �траници може да продолжат да �е прикажуваат како да �те најавени, �е додека не го и�чи�тите кешот на вашиот веб прели�тувач.',
+Можете да продолжите �о кори�тење на {{SITENAME}} анонимно или можете [[Special:UserLogin|повторно да �е најавите]] под и�то или различно кори�ничко име. Да напоменеме дека некои �траници може да продолжат да �е прикажуваат како да �те најавени, �е додека не го и�чи�тите кешот на вашиот веб прели�тувач.",
 'welcomecreation'            => '== Добредојдовте, $1! ==
 Вашата кори�ничка �метка е креирана.
 �е заборавајте да ги промените вашите [[Special:Preferences|{{SITENAME}} нагодувања]].',
@@ -460,16 +630,15 @@ $2',
 'remembermypassword'         => 'Запомни го моето најавување на овој компјутер',
 'yourdomainname'             => 'Вашиот домен:',
 'externaldberror'            => '�а�тана грешка при надворешното најавување на базата или немате дозвола да ја ажурирате вашата надворешна �метка.',
-'loginproblem'               => '<b>Има проблем �о вашето најавување.</b><br />Обидете �е повторно!',
 'login'                      => '�ајавување',
 'nav-login-createaccount'    => '�ајавување / креирање на кори�ничка �метка',
 'loginprompt'                => 'Морате да кори�тите колачиња за да �е најавите на {{SITENAME}}.',
-'userlogin'                  => '�ајавување / креирање на кори�ничка �метка',
+'userlogin'                  => '�ајавување / �оздавање на кори�ничка �метка',
 'logout'                     => 'Одјавување',
 'userlogout'                 => 'Одјавување',
 'notloggedin'                => '�е �те најавени',
 'nologin'                    => '�емате кори�ничка �метка? $1.',
-'nologinlink'                => 'Креирање нова кори�ничка �метка',
+'nologinlink'                => 'Создавање нова кори�ничка �метка',
 'createaccount'              => 'Креирање кори�ничка �метка',
 'gotaccount'                 => 'Веќе имате кори�ничка �метка? $1.',
 'gotaccountlink'             => '�ајавување',
@@ -479,7 +648,7 @@ $2',
 Ве молиме изберете друго име.',
 'youremail'                  => 'Е-пошта:',
 'username'                   => 'Кори�ничко име:',
-'uid'                        => 'Кори�нички ID:',
+'uid'                        => 'ID на кори�ник:',
 'prefs-memberingroups'       => 'Член на {{PLURAL:$1|групата|групите}}:',
 'yourrealname'               => 'Ви�тин�ко име:',
 'yourlanguage'               => 'Јазик:',
@@ -487,8 +656,8 @@ $2',
 'yournick'                   => 'Потпи�:',
 'badsig'                     => 'Грешка во потпи�от.
 Проверете ги HTML таговите.',
-'badsiglength'               => 'Потпи�от е предолг.
-Мора да биде под $1 {{PLURAL:$1|знак|знаци}}.',
+'badsiglength'               => 'Вашиот потпи� е премногу долг.
+Мора да биде �о помалку од $1 {{PLURAL:$1|знак|знаци}}.',
 'email'                      => 'Е-пошта',
 'prefs-help-realname'        => "'''Ви�тин�кото име''' е опционо. 
 Доколку изберете да го впишете вашето име, тоа може да �е и�кори�ти за давање на за�луги за вашата работа.",
@@ -507,7 +676,8 @@ $2',
 'loginsuccesstitle'          => 'У�пешно најавување',
 'loginsuccess'               => 'Сега �те најавени на {{SITENAME}} како "$1".',
 'nosuchuser'                 => '�ема кори�ник �о името "$1". 
-Проверете да не �те направиле грешка во пишувањето, или [[Special:UserLogin/signup|креирајте нова кори�ничка �метка]].',
+Кори�ничките имиња разликуваат мали и големи букви.
+Проверете да не �те направиле грешка во пишувањето, или [[Special:UserLogin/signup|�оздајте нова кори�ничка �метка]].',
 'nosuchusershort'            => '�ема кори�ник �о името "<nowiki>$1</nowiki>".
 Проверете дали правилно �те напишале.',
 'nouserspecified'            => 'Мора да назначите кори�ничко име.',
@@ -531,8 +701,9 @@ $2',
 'throttled-mailpassword'     => 'Пот�етување за лозинката е веќе пратено во {{PLURAL:$1|изминатиов ча�|изминативе $1 ча�а}}.
 За да �е �пречи злоупотреба, �амо едно пот�етување може да �е праќа на {{PLURAL:$1|�екој ча�|�екои $1 ча�а}}.',
 'mailerror'                  => 'Грешка при и�праќање на е-поштата: $1',
-'acct_creation_throttle_hit' => 'Извинете, веќе имате �оздадено $1 �метки. �е можете да �оздавате повеќе.',
-'emailauthenticated'         => '�втентично�та на вашата е-поштен�ка адре�а е проверена на $1.',
+'acct_creation_throttle_hit' => 'Кори�ници на ова вики кори�тејќи ја вашата IP адре�а креирале {{PLURAL:$1|1 кори�ничка �метка|$1 кори�нички �метки}} по�ледниве денови, при што е до�тигнат мак�ималниот број на кори�нички �метки предвиден и овозможен за овој период.
+Како резултат на ова, по�етителите кои ја кори�тат оваа IP адре�а нема да можат да креират нови �метки во овој момент.',
+'emailauthenticated'         => 'Вашата е-поштен�ка адре�а е автентицирана на $2 во $3.',
 'emailnotauthenticated'      => 'Вашата е-поштен�ка адре�а �еуште не е автентицирана. 
 �ема да биде и�пратена е-пошта во ниту еден од �ледниве �лучаи.',
 'noemailprefs'               => '�аведете е-поштен�ка адре�а за да функционираат �ледниве �вој�тва.',
@@ -546,20 +717,29 @@ $2',
 Би требало �ега да �е пријавите и да ја промените вашата лозинка.
 
 Можете да ја занемарите оваа порака ако �метката била направена по грешка.',
+'login-throttled'            => 'Скоро имате направено обид за најавување �о оваа лозинка.
+Почекајте малку пред да �е обидете повторно.',
 'loginlanguagelabel'         => 'Јазик: $1',
 
 # Password reset dialog
-'resetpass'               => 'Смени ја лозинката',
-'resetpass_announce'      => '�ајавени �те �о привремена лозинка пратена по е-пошта.
+'resetpass'                 => 'Промена на лозинка',
+'resetpass_announce'        => '�ајавени �те �о привремена лозинка пратена по е-пошта.
 За да го завршите пријавувањето, мора да по�тавите нова лозинка овде:',
-'resetpass_text'          => '<!-- Додадете тек�т тука -->',
-'resetpass_header'        => 'Промена на кори�ничка лозинка',
-'resetpass_submit'        => 'По�тавете лозинка и најавете �е',
-'resetpass_success'       => 'Вашата лозинка беше у�пешно променета! �ајавувањето е во тек...',
-'resetpass_bad_temporary' => '�еважечка привремена лозинка.
+'resetpass_text'            => '<!-- Додадете тек�т тука -->',
+'resetpass_header'          => 'Промена на кори�ничка лозинка',
+'oldpassword'               => 'Стара лозинка:',
+'newpassword'               => '�ова лозинка:',
+'retypenew'                 => 'Повторно вне�и нова лозинка:',
+'resetpass_submit'          => 'По�тавете лозинка и најавете �е',
+'resetpass_success'         => 'Вашата лозинка беше у�пешно променета! �ајавувањето е во тек...',
+'resetpass_bad_temporary'   => '�еважечка привремена лозинка.
 Можно е веќе да �те ја промениле вашата лозинка или да �те побарале нова привремена лозинка.',
-'resetpass_forbidden'     => 'Лозинките не може да �е менуваат',
-'resetpass_missing'       => 'Формуларот не �одржи податоци.',
+'resetpass_forbidden'       => 'Лозинките не може да �е менуваат',
+'resetpass-no-info'         => 'Мора да бидете најавени ако �акате да имате директен при�тап до оваа �траница.',
+'resetpass-submit-loggedin' => 'Промени лозинка',
+'resetpass-wrong-oldpass'   => 'Погрешна привремена или тековна лозинка.
+Можеби веќе ја имате у�пешно променето вашата лизинка или �те побарале нова привремена лозинка.',
+'resetpass-temp-password'   => 'Привремена лозинка:',
 
 # Edit page toolbar
 'bold_sample'     => 'Задебелен тек�т',
@@ -584,8 +764,8 @@ $2',
 'hr_tip'          => 'Хоризонтална линија',
 
 # Edit pages
-'summary'                          => 'Опи�',
-'subject'                          => '�а�лов',
+'summary'                          => 'Опи�:',
+'subject'                          => '�а�лов:',
 'minoredit'                        => 'Ова е �итна промена',
 'watchthis'                        => '�абљудувај ја оваа �траница',
 'savearticle'                      => 'Зачувај �траница',
@@ -597,8 +777,8 @@ $2',
 'missingsummary'                   => "'''Пот�етник:''' �е вне�овте опи� на измените. �ко прити�нете Зачувај повторно, вашите измени ќе �е зачуваат без опи�.",
 'missingcommenttext'               => 'Ве молиме вне�ете коментар подолу.',
 'missingcommentheader'             => "'''Пот�етување:''' �е вне�овте на�лов за овој коментар. �ко повторно кликнете на Зачувај, вашето уредување ќе биде запамтено без на�лов.",
-'summary-preview'                  => 'Изглед на опи�от',
-'subject-preview'                  => 'Преглед на предметот/на�ловот',
+'summary-preview'                  => 'Изглед на опи�от:',
+'subject-preview'                  => 'Преглед на предметот/на�ловот:',
 'blockedtitle'                     => 'Кори�никот е блокиран',
 'blockedtext'                      => "<big>'''Вашето кори�ничко име или IP адре�а �е блокирани.'''</big>
 
@@ -646,8 +826,11 @@ $2',
 'newarticle'                       => '(нова)',
 'newarticletext'                   => "Следевте вр�ка која води до �траница која �è уште не по�тои. 
 За да ја креирате �траницата, почнете �о пишување во долното прозорче (видете ја [[{{MediaWiki:Helppage}}|�траницата за помош]] за повеќе информации). �ко �те овде по грешка, �амо прити�нете го копчето '''назад''' во вашиот веб прели�тувач.",
-'anontalkpagetext'                 => "''Ова е �траница за разговор �о анонимен кори�ник кој �еуште не реги�трирал кори�ничка �метка или не ја кори�ти. Затоа мораме да ја кори�тиме неговата нумеричка [[IP адре�а]] за негова идентификација. Една IP адре�а може да биде делена од повеќе кори�ници. �ко �те анонимен кори�ник и �метате дека кон ва� �е упатени ирелевантни коментари, ве молиме [[Special:UserLogin|креирајте кори�ничка �метка]] или [[Special:UserLogin|најавете �е]] за да избегнете пои�товетување �о други анонимни кори�ници.''",
-'noarticletext'                    => 'Моментално нема тек�т на оваа �траница, можете да направите [[Special:Search/{{PAGENAME}}|пребарување]] на овој на�лов во други �траници или да ја [{{fullurl:{{FULLPAGENAME}}|action=edit}} креирате оваа �траница].',
+'anontalkpagetext'                 => "''Ова е �траница за разговор �о анонимен кори�ник кој �еуште не реги�трирал кори�ничка �метка или не ја кори�ти. Затоа мораме да ја кори�тиме неговата нумеричка [[IP адре�а]] за негова идентификација. Една IP адре�а може да биде делена од повеќе кори�ници. �ко �те анонимен кори�ник и �метате дека кон ва� �е упатени ирелевантни коментари, ве молиме [[Special:UserLogin|�оздадете кори�ничка �метка]] или [[Special:UserLogin|најавете �е]] за да избегнете пои�товетување �о други анонимни кори�ници.''",
+'noarticletext'                    => 'Моментално нема тек�т на оваа �траница.
+Можете да направите [[Special:Search/{{PAGENAME}}|пребарување за овој на�лов на �траница]] во други �траници, 
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} пребарување во дневниците],
+или [{{fullurl:{{FULLPAGENAME}}|action=edit}} да ја уредите оваа �траница]</span>.',
 'userpage-userdoesnotexist'        => 'Кори�ничката �метка „$1“ не е реги�трирана. 
 Ве молиме разми�лете дали нави�тина �акате да ја �оздадете/уредите оваа �траница.',
 'clearyourcache'                   => "'''Забелешка - По �екое зачувување морате да го и�чи�тите кешот на вашиот веб прели�тувач за да ги видите промените.'''
@@ -655,28 +838,28 @@ $2',
 '''Konqueror:''' кликнете на ''Reload'' или прити�нете ''F5'';
 '''Opera:''' избришете го кешот во ''Tools → Preferences'';
 '''Internet Explorer:''' држете ''Ctrl'' додека прити�кате на ''Refresh'' или прити�нете ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>Совет:</strong> Кори�тете го копчето '''Прегледај''' за да го и�пробате новиот CSS/JS код пред зачувувањето.",
+'usercssjsyoucanpreview'           => "'''Совет:''' Кори�тете го копчето '''Прегледај''' за да го и�пробате новиот CSS/JS код пред зачувувањето.",
 'usercsspreview'                   => "'''Запомнете дека ова е �амо преглед на вашиот кори�нички CSS код, �траницата �еуште не е зачувана!'''",
 'userjspreview'                    => "'''Запомнете дека ова е �амо преглед на вашиот JavaScript код, �траницата �еуште не е зачувана!'''",
 'userinvalidcssjstitle'            => "'''Предупредување:''' �ема ма�ка \"\$1\". 
 Запамтете дека �оп�твените .css и .js �траници имаат имиња �о мали букви, пр. {{ns:user}}:�екој/monobook.css наме�то {{ns:user}}:�екој/Monobook.css.",
 'updated'                          => '(�журирано)',
-'note'                             => '<strong>Забелешка:</strong>',
-'previewnote'                      => '<strong>Ова е �амо преглед, �траницата �еуште не е зачувана!</strong>',
+'note'                             => "'''Забелешка:'''",
+'previewnote'                      => "'''Ова е �амо преглед, �траницата �еуште не е зачувана!'''",
 'previewconflict'                  => 'Овој преглед прикажува како ќе изгледа тек�тот вне�ен во горниот дел откако ќе �е зачува �траницата.',
-'session_fail_preview'             => '<strong>Извинете! �е можевме да го проце�ираме вашето уредување заради губење на �е�и�ки податоци.
-Обидете �е повторно. �ко �еуште не функционира, пробајте да �е одјавите и повторно да �е најавите.</strong>',
-'session_fail_preview_html'        => "<strong>Извинете! �е можеше да �е проце�ира вашето уредување заради губење на �е�и�ките податоци.</strong>
+'session_fail_preview'             => "'''Извинете! �е можевме да го проце�ираме вашето уредување заради губење на �е�и�ки податоци.
+Обидете �е повторно. �ко �еуште не функционира, пробајте да �е одјавите и повторно да �е најавите.'''",
+'session_fail_preview_html'        => "'''Извинете! �е можеше да �е проце�ира вашето уредување заради губење на �е�и�ките податоци.'''
 
 ''Поради тоа што {{SITENAME}} има овозможено HTML, прегледот е �криен од причини на безбедно�т од �трана на JavaScript напади.''
 
-<strong>�ко е ова е дозволен обид за уредување, ве молиме обидете �е повторно. �ко �еуште не работи, пробајте да �е [[Special:UserLogout|одјавите]] и повторно да �е најавите.</strong>",
-'token_suffix_mismatch'            => '<strong>Вашето уредување е одбиено затоа што вашиот веб-пребарувач направил проблеми �о интерпукци�ките знаци во токенот за уредување.
+'''�ко е ова е дозволен обид за уредување, ве молиме обидете �е повторно. �ко �еуште не работи, пробајте да �е [[Special:UserLogout|одјавите]] и повторно да �е најавите.'''",
+'token_suffix_mismatch'            => "'''Вашето уредување е одбиено затоа што вашиот веб-пребарувач направил проблеми �о интерпукци�ките знаци во токенот за уредување.
 Уредувањето не е прифатено за да �е �пречи не�акана промена на тек�тот на �траницата.
-Ова понекогаш �е �лучува кога кори�тите неи�правен веб-базиран анонимен прок�и-�ерви�.</strong>',
+Ова понекогаш �е �лучува кога кори�тите неи�правен веб-базиран анонимен прок�и-�ерви�.'''",
 'editing'                          => 'Уредување на $1',
 'editingsection'                   => 'Уредување на $1 (�екција)',
-'editingcomment'                   => 'Уредување на $1 (коментар)',
+'editingcomment'                   => 'Уредување на $1 (нова �екција)',
 'editconflict'                     => 'Конфликтни уредувања: $1',
 'explainconflict'                  => "�екој друг ја променил �траницата откако почнавте да ја уредувате.
 Горниот дел за тек�т ја �одржи �траницата како што �ега по�тои.
@@ -685,27 +868,29 @@ $2',
 '''Само''' тек�тот во горниот дел ќе биде зачуван кога ќе прити�нете на \"Зачувај �траница\".",
 'yourtext'                         => 'Вашиот тек�т',
 'storedversion'                    => 'Зачувана верзија',
-'nonunicodebrowser'                => '<strong>ПРЕДУПРЕДУВ�ЊЕ: Вашиот прели�тувач не е Уникод компатибилен, ве молиме променете го пред да уредувате �татија.</strong>',
-'editingold'                       => '<strong>ПРЕДУПРЕДУВ�ЊЕ: Менувате за�тарена верзија на оваа �траница.
-�ко ја зачувате, �ите промени по оваа верзија ќе бидат изгубени.</strong>',
+'nonunicodebrowser'                => "'''ПРЕДУПРЕДУВ�ЊЕ: Вашиот прели�тувач не е Уникод компатибилен, ве молиме променете го пред да уредувате �татија.'''",
+'editingold'                       => "'''ПРЕДУПРЕДУВ�ЊЕ: Менувате за�тарена верзија на оваа �траница.
+�ко ја зачувате, �ите промени по оваа верзија ќе бидат изгубени.'''",
 'yourdiff'                         => 'Разлики',
-'copyrightwarning'                 => 'Имајте во предвид дека �ите придоне�и кон {{SITENAME}} �е �мета дека �е издадени под $2 (видете $1 за детали). 
+'copyrightwarning'                 => "Имајте во предвид дека �ите придоне�и кон {{SITENAME}} �е �мета дека �е издадени под $2 (видете $1 за детали). 
 �ко не �акате вашите тек�тови да бидат �лободно уредувани и разменувани, не ги праќајте овде.<br />
 И�то така потврдувате дека вие �те автор на тек�тот, или �те го копирале од некој јавен домен или �личен �лободен извор.
-<strong>�Е ПР�Ќ�ЈТЕ ТЕКСТОВИ З�ШТИТЕ�И СО �ВТОРСКИ ПР�В� БЕЗ ДОЗВОЛ�!</strong>',
-'copyrightwarning2'                => 'Ве молиме, имајте во предвид дека �ите придоне�и кон {{SITENAME}} можат да бидат уредувани, менувани или от�транети од други кори�ници. �ко не �акате вашиот тек�т да биде менуван и реди�трибуиран �лободно, не го и�праќајте овде.<br />
+'''�Е ПР�Ќ�ЈТЕ ТЕКСТОВИ З�ШТИТЕ�И СО �ВТОРСКИ ПР�В� БЕЗ ДОЗВОЛ�!'''",
+'copyrightwarning2'                => "Ве молиме, имајте во предвид дека �ите придоне�и кон {{SITENAME}} можат да бидат уредувани, менувани или от�транети од други кори�ници. �ко не �акате вашиот тек�т да биде менуван и реди�трибуиран �лободно, не го и�праќајте овде.<br />
 И�то така потврдувате дека тек�тот �те го напишале �ами, или �те го копирале од јавен домен или �личен �лободен извор (видетe $1 за детали).<br />
-<strong>�Е ПР�Ќ�ЈТЕ ТЕКСТОВИ З�ШТИТЕ�И СО �ВТОРСКИ ПР�В� БЕЗ ДОЗВОЛ�!</strong>',
-'longpagewarning'                  => '<strong>ПРЕДУПРЕДУВ�ЊЕ: Оваа �траница има $1 kB;
+'''�Е ПР�Ќ�ЈТЕ ТЕКСТОВИ З�ШТИТЕ�И СО �ВТОРСКИ ПР�В� БЕЗ ДОЗВОЛ�!'''",
+'longpagewarning'                  => "'''ПРЕДУПРЕДУВ�ЊЕ: Оваа �траница има $1 kB;
 некои прели�тувачи може да имаат проблеми �о уредување на �траниците поголеми од 32 kB.
-Разми�лете за разделување на �траницата на помали делови.</strong>',
-'longpageerror'                    => '<strong>ГРЕШК�: Тек�тот што го вне�овте е голем $1 килобајти, што е повеќе од мак�ималните $2 килобајти. �е може да �е зачува.</strong>',
-'readonlywarning'                  => '<strong>ПРЕДУПРЕДУВ�ЊЕ: Базата е заклучена заради одржување, па нема да можете да ги зачувате вашите промени �ега.
-Пробајте да го зачувате тек�тот локално и да го пратите подоцна.</strong>',
-'protectedpagewarning'             => '<strong>ПРЕДУПРЕДУВ�ЊЕ:  Оваа �траница е заклучена, така што �амо кори�ници �о админи�тратор�ки привилегии можат да ја менуваат.</strong>',
+Разми�лете за разделување на �траницата на помали делови.'''",
+'longpageerror'                    => "'''ГРЕШК�: Тек�тот што го вне�овте е голем $1 килобајти, што е повеќе од мак�ималните $2 килобајти. �е може да �е зачува.'''",
+'readonlywarning'                  => "'''ПРЕДУПРЕДУВ�ЊЕ: Базата на податоци е заклучена заради одржување, па нема да можете да ги зачувате вашите промени �ега.
+Пробајте да го зачувате тек�тот локално (cut & paste) во некоја податотека и да го пратите подоцна.'''
+
+�дмини�траторот кој ја заклучил базата на податоци го дал �ледново обја�нување: $1",
+'protectedpagewarning'             => "'''ПРЕДУПРЕДУВ�ЊЕ:  Оваа �траница е заклучена, така што �амо кори�ници �о админи�тратор�ки привилегии можат да ја менуваат.'''",
 'semiprotectedpagewarning'         => "'''Забелешка:''' Оваа �траница е заклучена и �амо реги�трирани кори�ници може да ја уредуваат.",
 'cascadeprotectedwarning'          => "'''Предупредување:''' Оваа �траница е заклучена, така што можат да ја уредуваат �амо кори�ници �о админи�тратор�ки привилегии, бидејќи е вклучена во {{PLURAL:$1|�леднава „прено�но-заштитена“ �траница|�ледниве „прено�но-заштитени“ �траници}}:",
-'titleprotectedwarning'            => '<strong>ПРЕДУПРЕДУВ�ЊЕ:  Оваа �траница е заклучена и �амо некои кори�ници можат да ја �оздадат.</strong>',
+'titleprotectedwarning'            => "'''ПРЕДУПРЕДУВ�ЊЕ:  Оваа �траница е заклучена, потребни [[Special:ListGroupRights|�пецифични права]] за да �е креира.'''",
 'templatesused'                    => 'Шаблони кори�тени на оваа �траница:',
 'templatesusedpreview'             => 'Шаблони кори�тени во овој преглед:',
 'templatesusedsection'             => 'Шаблони кори�тени во оваа �екција:',
@@ -714,8 +899,8 @@ $2',
 'hiddencategories'                 => 'Оваа �траница припаѓа на {{PLURAL:$1|1 �криена категорија|$1 �криени категории}}:',
 'edittools'                        => '<!-- Овој тек�т ќе �е прикаже под формите за уредување и подигнување. -->',
 'nocreatetitle'                    => 'Креирањето на нови �траници е ограничено',
-'nocreatetext'                     => '{{SITENAME}} ја има ограничена можно�та за креирање нови �траници.
-Можете да �е вратите назад и да уредувате по�тоечка �траница или [[Special:UserLogin|најавете �е или креирајте нова кори�ничка �метка]].',
+'nocreatetext'                     => '{{SITENAME}} ја има ограничена можно�та за �оздавање нови �траници.
+Можете да �е вратите назад и да уредувате по�тоечка �траница или [[Special:UserLogin|најавете �е или �оздадете нова кори�ничка �метка]].',
 'nocreate-loggedin'                => '�емате дозвола да �оздавате нови �траници.',
 'permissionserrors'                => 'Грешки во правата',
 'permissionserrorstext'            => '�емате дозвола да го направите тоа, заради {{PLURAL:$1|�леднава причина|�ледниве причини}}:',
@@ -724,8 +909,22 @@ $2',
 
 Разми�лете дали е правилно да продолжите �о уредување на оваа �траница.
 Погледнете го дневникот на бришења за оваа �траница заради преглед:",
+'deleted-notice'                   => 'Оваа �траница била претходно бришена.
+За ваша информација подолу може да го погледнете дневникот на бришења за оваа �траница.',
+'deletelog-fulllog'                => 'Погледни комплетен дневник',
+'edit-hook-aborted'                => 'Уредувањето прекинато �о кука.
+�е е дадено никакво обја�нување.',
+'edit-gone-missing'                => '�е е возможно да �е ажурира �траницата.
+Изгледа дека во меѓувреме е избришана од некого.',
+'edit-conflict'                    => 'Конфликтно уредување.',
+'edit-no-change'                   => 'Вашите уредувања беа игнорирани, бидејќи не �е направени промени врз тек�тот.',
+'edit-already-exists'              => '�е може да �е креира нова �раница.
+Таа веќе по�тои.',
 
 # Parser/template warnings
+'expensive-parserfunction-warning'        => 'Предупредување: Оваа �траница кори�ти премногу повикувања на parser функции.
+
+Треба да има помалку од $2 {{PLURAL:$2|повикување|повикувања}} а �ега има {{PLURAL:$1|$1 повикување|$1 повикувања}}.',
 'expensive-parserfunction-category'       => 'Страници �о премногу повикувања на parser функции',
 'post-expand-template-inclusion-warning'  => 'Предупредување: Големината на вклучените шаблони е преголема.
 �екои шаблони нема да бидат вклучени.',
@@ -733,6 +932,8 @@ $2',
 'post-expand-template-argument-warning'   => 'Предупредување: Оваа �траница �одржи најмалку еден аргумент на шаблон кој е �о преголема должина.
 Таквите аргументи ќе бидат изземени при пар�ирањето.',
 'post-expand-template-argument-category'  => 'Страници кои �одржат изземени аргументи на шаблони',
+'parser-template-loop-warning'            => 'Детектиран циклу� во шаблонот: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Ограничувањето на рекурзивната длабочина надмината во шаблонот ($1)',
 
 # "Undo" feature
 'undo-success' => 'Уредувањето може да �е откаже. 
@@ -748,29 +949,28 @@ $2',
 Образложението дадено од �трана на $3 е ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Преглед на дневници за оваа �траница',
-'nohistory'           => '�е по�тои и�торија на уредување за оваа �траница.',
-'revnotfound'         => 'Верзијата не е пронајдена',
-'revnotfoundtext'     => 'Старата верзија на оваа �траница не може да �е пронајде.
-Проверете ја URL адре�ата што ја кори�тевте за при�тап до оваа �траница.',
-'currentrev'          => 'Тековна ревизија',
-'revisionasof'        => 'Ревизија од $1',
-'revision-info'       => 'Ревизија од $1; направена од $2',
-'previousrevision'    => '� Претходна ревизија',
-'nextrevision'        => 'Следна ревизија →',
-'currentrevisionlink' => 'По�ледна ревизија',
-'cur'                 => 'мом',
-'next'                => '�лед',
-'last'                => 'по�л',
-'page_first'          => 'прв',
-'page_last'           => 'по�леден',
-'histlegend'          => 'Diff �елекција: �електирајте ги ревизиите кои �акате да ги �поредите и прити�нете ентер или копчето на дното од �траницата.<br />
+'viewpagelogs'           => 'Преглед на дневници за оваа �траница',
+'nohistory'              => '�е по�тои и�торија на уредување за оваа �траница.',
+'currentrev'             => 'Тековна ревизија',
+'currentrev-asof'        => 'По�ледна ревизија од $1',
+'revisionasof'           => 'Ревизија од $1',
+'revision-info'          => 'Ревизија од $1; направена од $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Претходна ревизија',
+'nextrevision'           => 'Следна ревизија →',
+'currentrevisionlink'    => 'По�ледна ревизија',
+'cur'                    => 'мом',
+'next'                   => '�лед',
+'last'                   => 'по�л',
+'page_first'             => 'прв',
+'page_last'              => 'по�леден',
+'histlegend'             => 'Diff �елекција: �електирајте ги ревизиите кои �акате да ги �поредите и прити�нете ентер или копчето на дното од �траницата.<br />
 Легенда: (мом) = разлика �о по�ледната ревизија,(по�л) = разлика �о претходната верзија, С = �итна промена.',
-'deletedrev'          => '[избришано]',
-'histfirst'           => 'Први',
-'histlast'            => 'По�ледни',
-'historysize'         => '({{PLURAL:$1|1 бајт|$1 бајти}})',
-'historyempty'        => '(празно)',
+'history-fieldset-title' => 'Прели�тување на и�торија',
+'deletedrev'             => '[избришано]',
+'histfirst'              => 'Први',
+'histlast'               => 'По�ледни',
+'historysize'            => '({{PLURAL:$1|1 бајт|$1 бајти}})',
+'historyempty'           => '(празно)',
 
 # Revision feed
 'history-feed-title'          => 'И�торија на ревидирање',
@@ -803,7 +1003,7 @@ $2',
 
 Други админи�тратори на {{SITENAME}} �� уште ќе имаат при�тап до �криената �одржина и ќе можат да ја вратат преку и�тиот интерфеј�, о�вен ако не �е по�тавени дополнителни ограничувања.",
 'revdelete-legend'            => 'По�тави ограничувања за видливо�т',
-'revdelete-hide-text'         => 'Сокриј тек�т на реввизија',
+'revdelete-hide-text'         => 'Сокриј тек�т на ревизија',
 'revdelete-hide-name'         => 'Сокриј акција и нејзина цел',
 'revdelete-hide-comment'      => 'Сокриј опи� на уредување',
 'revdelete-hide-user'         => 'Сокриј кори�ничко име/IP на уредувачи',
@@ -831,10 +1031,14 @@ $2',
 'logdelete-log-message'       => '$1 од $2 {{PLURAL:$2|на�тан|на�тани}}',
 
 # Suppression log
-'suppressionlog' => 'Дневник на �окривања',
+'suppressionlog'     => 'Дневник на �окривања',
+'suppressionlogtext' => 'Подолу е ли�тата на бришења и блокирања каде има и �одржини �криени и за админи�траторите.<br />
+Види [[Special:IPBlockList|Ли�та на блокирани IP адре�и]] за ли�та на моментални банирања и блокирања.',
 
 # History merging
 'mergehistory'                     => 'Спојување на и�тории на �траница',
+'mergehistory-header'              => 'Оваа �траница овозможува �појување на ревизии на изворна �траница во нова (друга) �траница.
+Претходно проверете дека таа промена ќе го �очува и�тори�киот континуитетот на �траницата.',
 'mergehistory-box'                 => 'Спојување на ревизии на две �траници:',
 'mergehistory-from'                => 'Изворна �траница:',
 'mergehistory-into'                => 'Целна �траница:',
@@ -853,6 +1057,7 @@ $2',
 'mergehistory-invalid-destination' => 'Целната �траница мора да има валиден на�лов.',
 'mergehistory-autocomment'         => 'Споено [[:$1]] во [[:$2]]',
 'mergehistory-comment'             => 'Споено [[:$1]] во [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Изворната и целната �траница треба да �е различни',
 
 # Merge log
 'mergelog'           => 'Дневник на �појувања на �траници',
@@ -865,123 +1070,206 @@ $2',
 'difference'              => '(Разлика меѓу ревизии)',
 'lineno'                  => 'Линија $1:',
 'compareselectedversions' => 'Споредба на избрани верзии',
+'visualcomparison'        => 'Визуелна �поредба',
+'wikicodecomparison'      => 'Викитек�т �поредба',
 'editundo'                => 'откажи',
 'diff-multi'              => '({{PLURAL:$1|�е е прикажана една меѓуревзија|�е �е прикажани $1 меѓуревизии}})',
+'diff-movedto'            => 'преме�тено во $1',
+'diff-styleadded'         => '$1 додаден �тил',
+'diff-added'              => '$1 додадено',
+'diff-changedto'          => 'променето во $1',
+'diff-movedoutof'         => 'и�фрлено надвор од $1',
+'diff-styleremoved'       => '$1 избришано �тил',
+'diff-removed'            => '$1 избришано',
+'diff-changedfrom'        => 'променето од $1',
+'diff-src'                => 'извор',
+'diff-withdestination'    => '�о де�тинација $1',
+'diff-with'               => '&#32;�о $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;и $1 $2',
+'diff-width'              => 'ширина',
+'diff-height'             => 'ви�ина',
+'diff-p'                  => "'''параграф'''",
+'diff-blockquote'         => "'''цитат'''",
+'diff-h1'                 => "'''на�лов (ниво 1)'''",
+'diff-h2'                 => "'''на�лов (ниво 2)'''",
+'diff-h3'                 => "'''на�лов (ниво 3)'''",
+'diff-h4'                 => "'''на�лов (ниво 4)'''",
+'diff-h5'                 => "'''на�лов (ниво 5)'''",
+'diff-pre'                => "'''префроматиран тек�т'''",
+'diff-div'                => "'''дел од тек�т'''",
+'diff-ul'                 => "'''неподредена ли�та'''",
+'diff-ol'                 => "'''подредена ли�та'''",
+'diff-li'                 => "'''член на ли�та'''",
+'diff-table'              => "'''табела'''",
+'diff-tbody'              => "'''�одржина'''",
+'diff-tr'                 => "'''редица'''",
+'diff-td'                 => "'''клетка'''",
+'diff-th'                 => "'''заглавје'''",
+'diff-br'                 => "'''прекршување на ред'''",
+'diff-hr'                 => "'''хоризонтална линија'''",
+'diff-code'               => "'''компјутер�ки код'''",
+'diff-dl'                 => "'''дефинициона ли�та'''",
+'diff-dt'                 => "'''дефиниционен поим'''",
+'diff-dd'                 => "'''дефиниција'''",
+'diff-input'              => "'''влез'''",
+'diff-form'               => "'''формулар'''",
+'diff-img'                => "'''�лика'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''вр�ка'''",
+'diff-i'                  => "'''италик'''",
+'diff-b'                  => "'''задебелено'''",
+'diff-strong'             => "'''задебелено'''",
+'diff-em'                 => "'''зголемено'''",
+'diff-font'               => "'''фонт'''",
+'diff-big'                => "'''големо'''",
+'diff-del'                => "'''избришано'''",
+'diff-tt'                 => "'''фик�на ширина'''",
+'diff-sub'                => "'''подпи�'''",
+'diff-sup'                => "'''надпи�'''",
+'diff-strike'             => "'''прецртано'''",
 
 # Search results
-'searchresults'             => 'Резултати од пребарувањето',
-'searchresulttext'          => 'За повеќе информации во вр�ка �о пребарување на {{SITENAME}}, погледнете [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Пребарувате \'\'\'[[:$1]]\'\'\' на ([[Special:Prefixindex/$1|�ите �траници кои започнуваат �о "$1"]] | [[Special:WhatLinksHere/$1|�ите �траници кои водат до "$1"]])',
-'searchsubtitleinvalid'     => "Пребарувавте '''$1'''",
-'noexactmatch'              => "'''�ема �траница на�ловена како „$1“.''' 
+'searchresults'                    => 'Резултати од пребарувањето',
+'searchresults-title'              => 'Резултати од пребарувањето за "$1"',
+'searchresulttext'                 => 'За повеќе информации во вр�ка �о пребарување на {{SITENAME}}, погледнете [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Пребарувате \'\'\'[[:$1]]\'\'\' на ([[Special:Prefixindex/$1|�ите �траници кои започнуваат �о "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|�ите �траници кои водат до "$1"]])',
+'searchsubtitleinvalid'            => "Пребарувавте '''$1'''",
+'noexactmatch'                     => "'''�ема �траница на�ловена како „$1“.''' 
 Можете да ја [[:$1|креирате оваа �траница]].",
-'noexactmatch-nocreate'     => "'''�е по�тои �траница на�ловена како \"\$1\".'''",
-'toomanymatches'            => 'Премногу резултати од пребарувањето, ве молиме обидете �е �о различен упит',
-'titlematches'              => '�а�ловот на �татијата одговара',
-'notitlematches'            => '�иеден на�лов на �траница не одговара',
-'textmatches'               => 'Тек�тот на �татијата одговара',
-'notextmatches'             => '�иеден тек�т во �татиите не одговара',
-'prevn'                     => 'претходни $1',
-'nextn'                     => '�ледни $1',
-'viewprevnext'              => 'Види ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 збор|$2 збора}})',
-'search-result-score'       => 'Релевантно�т: $1%',
-'search-redirect'           => '(прена�очување $1)',
-'search-section'            => '(�екција $1)',
-'search-suggest'            => 'Дали ми�левте на: $1',
-'search-interwiki-caption'  => 'Се�трин�ки проекти',
-'search-interwiki-default'  => '$1 резултати:',
-'search-interwiki-more'     => '(уште)',
-'search-mwsuggest-enabled'  => '�о �уге�тии',
-'search-mwsuggest-disabled' => 'без �уге�тии',
-'search-relatedarticle'     => 'Поврзано',
-'mwsuggest-disable'         => 'Оневозможи AJAX �уге�тии',
-'searchrelated'             => 'поврзано',
-'searchall'                 => '�е',
-'showingresults'            => "Подолу {{PLURAL:$1|е прикажан '''1''' резултат|�е прикажани '''$1''' резултати}} почнувајќи од #'''$2'''.",
-'showingresultsnum'         => "Подолу {{PLURAL:$3|е прикажан '''1''' резултат|�е прикажани '''$3''' резултати}} почнувајќи од '''$2'''.",
-'nonefound'                 => "'''�апомена''': По о�новно, пребарувањето �е врши �амо низ некои имен�ки про�тори. 
-Обидете �е �о додавање на префик�от ''�е:'' за да пребарувате низ �ите �одржини (вклучувајќи �траници за разговор, шаблони, итн) или кори�тете го бараниот имен�ки про�тор како префик�.",
-'powersearch'               => '�апредно пребарување',
-'powersearch-legend'        => '�апредно пребарување',
-'powersearch-ns'            => 'Пребарување во имен�ки про�тори:',
-'powersearch-redir'         => 'Ли�та на прена�очувања',
-'powersearch-field'         => 'Пребарување на',
-'search-external'           => '�адворешно пребарување',
-'searchdisabled'            => '{{SITENAME}} пребарувањето е оневозможено. 
+'noexactmatch-nocreate'            => "'''�е по�тои �траница на�ловена како \"\$1\".'''",
+'toomanymatches'                   => 'Премногу резултати од пребарувањето, ве молиме обидете �е �о различен упит',
+'titlematches'                     => '�а�ловот на �татијата одговара',
+'notitlematches'                   => '�иеден на�лов на �траница не одговара',
+'textmatches'                      => 'Тек�тот на �татијата одговара',
+'notextmatches'                    => '�иеден тек�т во �татиите не одговара',
+'prevn'                            => 'претходни $1',
+'nextn'                            => '�ледни $1',
+'viewprevnext'                     => 'Види ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Опции за пребарување',
+'searchmenu-exists'                => "'''По�тои �траница именувана како \"[[\$1]]\" на ова вики'''",
+'searchmenu-new'                   => "Создади ја �траницата ''[[:$1]]'' на ова вики!'''",
+'searchhelp-url'                   => 'Help:Содржина',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Прели�тување на �траници �о овој префик�]]',
+'searchprofile-articles'           => 'Статии',
+'searchprofile-articles-and-proj'  => 'Статии & проектни �траници',
+'searchprofile-project'            => 'Проектни �траници',
+'searchprofile-images'             => 'Податотеки',
+'searchprofile-everything'         => 'Се',
+'searchprofile-advanced'           => '�апредно',
+'searchprofile-articles-tooltip'   => 'Пребарај во $1',
+'searchprofile-project-tooltip'    => 'Пребарај во $1',
+'searchprofile-images-tooltip'     => 'Пребарај податотеки',
+'searchprofile-everything-tooltip' => 'Пребарај низ �ета �одржина (вклучително и �траници за разговор)',
+'searchprofile-advanced-tooltip'   => 'Пребарај во по�ебни имен�ки про�тори',
+'prefs-search-nsdefault'           => 'Пребарување по о�новно:',
+'prefs-search-nscustom'            => 'Пребарај по�ебни имен�ки про�тори:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 збор|$2 збора}})',
+'search-result-score'              => 'Релевантно�т: $1%',
+'search-redirect'                  => '(прена�очување $1)',
+'search-section'                   => '(�екција $1)',
+'search-suggest'                   => 'Дали ми�левте на: $1',
+'search-interwiki-caption'         => 'Се�трин�ки проекти',
+'search-interwiki-default'         => '$1 резултати:',
+'search-interwiki-more'            => '(уште)',
+'search-mwsuggest-enabled'         => '�о �уге�тии',
+'search-mwsuggest-disabled'        => 'без �уге�тии',
+'search-relatedarticle'            => 'Поврзано',
+'mwsuggest-disable'                => 'Оневозможи AJAX �уге�тии',
+'searchrelated'                    => 'поврзано',
+'searchall'                        => '�е',
+'showingresults'                   => "Подолу {{PLURAL:$1|е прикажан '''1''' резултат|�е прикажани '''$1''' резултати}} почнувајќи од #'''$2'''.",
+'showingresultsnum'                => "Подолу {{PLURAL:$3|е прикажан '''1''' резултат|�е прикажани '''$3''' резултати}} почнувајќи од '''$2'''.",
+'showingresultstotal'              => "Подолу {{PLURAL:$4|е прикажан '''$1''' резултат|�е прикажани '''$1 - $2''' од '''$3''' резултати}}",
+'nonefound'                        => "'''�апомена''': Само некои имен�ки про�тори �е пребаруваат по о�новно. 
+Обидете �е �о додавање на префик�от ''all:'' за да пребарувате низ �ите �одржини (вклучувајќи �траници за разговор, шаблони, итн) или кори�тете го бараниот имен�ки про�тор како префик�.",
+'search-nonefound'                 => '�ема резултати кои го задоволуваат упитот.',
+'powersearch'                      => '�апредно пребарување',
+'powersearch-legend'               => '�апредно пребарување',
+'powersearch-ns'                   => 'Пребарување во имен�ки про�тори:',
+'powersearch-redir'                => 'Ли�та на прена�очувања',
+'powersearch-field'                => 'Пребарување на',
+'search-external'                  => '�адворешно пребарување',
+'searchdisabled'                   => '{{SITENAME}} пребарувањето е оневозможено. 
 Во меѓувреме, можете да пребарувате преку Google.
 Да напоменеме дека нивното индек�ирање на {{SITENAME}} �одржините може да биде за�тарено.',
 
 # Preferences page
-'preferences'              => '�агодувања',
-'mypreferences'            => 'мои нагодувања',
-'prefs-edits'              => 'Број на уредувања:',
-'prefsnologin'             => '�е �те најавени',
-'prefsnologintext'         => 'Мора да бидете <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} најавени]</span> за промена на вашите кори�нички нагодувања.',
-'prefsreset'               => 'Во�по�тавени �е �тандардните нагодувања.',
-'qbsettings'               => 'Лента за брз избор',
-'qbsettings-none'          => 'Без мени',
-'qbsettings-fixedleft'     => 'Фик�ирано лево',
-'qbsettings-fixedright'    => 'Фик�ирано де�но',
-'qbsettings-floatingleft'  => 'Пловечко лево',
-'qbsettings-floatingright' => 'Пловечки де�но',
-'changepassword'           => 'Промени лозинка',
-'skin'                     => 'Ма�ка',
-'math'                     => 'Математика',
-'dateformat'               => 'Формат на датум',
-'datedefault'              => '�ебитно',
-'datetime'                 => 'Датум и време',
-'math_failure'             => '�еможам да пар�ирам',
-'math_unknown_error'       => 'непозната грешка',
-'math_unknown_function'    => 'непозната функција',
-'math_lexing_error'        => 'лек�ичка грешка',
-'math_syntax_error'        => '�интак�на грешка',
-'math_image_error'         => 'неу�пешна PNG конверзија',
-'math_bad_tmpdir'          => '�евозможно е �оздавањето на привремен директориум за математичките операции',
-'math_bad_output'          => '�евозможно е �оздавањето на аутпут директориум за математичките операции',
-'math_notexvc'             => '�едо�та�ува извршната податотека texvc; 
-погледнете math/README за поде�увања.',
-'prefs-personal'           => 'Кори�нички профил',
-'prefs-rc'                 => 'Скорешни промени',
-'prefs-watchlist'          => 'Ли�та на набљудувања',
-'prefs-watchlist-days'     => 'Број на денови прикажани во ли�тата на набљудувања:',
-'prefs-watchlist-edits'    => 'Мак�имален број на промени прикажани во проширената ли�та на набљудувања:',
-'prefs-misc'               => 'Разно',
-'saveprefs'                => 'Зачувај нагодувања',
-'resetprefs'               => 'Избриши незачувани измени',
-'oldpassword'              => 'Стара лозинка:',
-'newpassword'              => '�ова лозинка:',
-'retypenew'                => 'Повторно вне�и нова лозинка:',
-'textboxsize'              => 'Уредување',
-'rows'                     => 'Редови:',
-'columns'                  => 'Колони:',
-'searchresultshead'        => 'Пребарување',
-'resultsperpage'           => 'Резултати по �траница:',
-'contextlines'             => 'Линии по резултат:',
-'contextchars'             => 'Карактери од �одржината по линија',
-'stub-threshold'           => 'Минимална големина за <a href="#" class="stub">никулци</a> (бајти):',
-'recentchangesdays'        => 'Денови за прикажување во �корешни промени:',
-'recentchangescount'       => 'Број на уредувања кои ќе �е прикажуват во �корешни промени, и�торија и дневници:',
-'savedprefs'               => 'Вашите нагодувања �е зачувани.',
-'timezonelegend'           => 'Времен�ка зона',
-'timezonetext'             => '¹Број на ча�ови за колку �е разликува вашето локално време од �ервер�кото време (UTC).',
-'localtime'                => 'Локално време',
-'timezoneoffset'           => 'От�тапка¹',
-'servertime'               => 'Сервер�ко време',
-'guesstimezone'            => 'Пополни од веб прели�тувачот',
-'allowemail'               => 'Дозволи е-пошта од други кори�ници',
-'prefs-searchoptions'      => 'Опции за пребарување',
-'prefs-namespaces'         => 'Имен�ки про�тори',
-'defaultns'                => 'Пребарувај во овие имен�ки про�тори по о�новно:',
-'default'                  => 'по о�новно',
-'files'                    => 'Податотеки',
+'preferences'               => '�агодувања',
+'mypreferences'             => 'Мои нагодувања',
+'prefs-edits'               => 'Број на уредувања:',
+'prefsnologin'              => '�е �те најавени',
+'prefsnologintext'          => 'Мора да бидете <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} најавени]</span> за промена на вашите кори�нички нагодувања.',
+'prefsreset'                => 'Во�по�тавени �е �тандардните нагодувања.',
+'qbsettings'                => 'Лента за брз избор',
+'qbsettings-none'           => 'Без мени',
+'qbsettings-fixedleft'      => 'Фик�ирано лево',
+'qbsettings-fixedright'     => 'Фик�ирано де�но',
+'qbsettings-floatingleft'   => 'Пловечко лево',
+'qbsettings-floatingright'  => 'Пловечки де�но',
+'changepassword'            => 'Промени лозинка',
+'skin'                      => 'Ма�ка',
+'skin-preview'              => 'Прегледај',
+'math'                      => 'Математика',
+'dateformat'                => 'Формат на датум',
+'datedefault'               => '�ебитно',
+'datetime'                  => 'Датум и време',
+'math_failure'              => '�еможам да пар�ирам',
+'math_unknown_error'        => 'непозната грешка',
+'math_unknown_function'     => 'непозната функција',
+'math_lexing_error'         => 'лек�ичка грешка',
+'math_syntax_error'         => '�интак�на грешка',
+'math_image_error'          => 'неу�пешна PNG конверзија',
+'math_bad_tmpdir'           => '�евозможно е �оздавањето на привремен директориум за математичките операции',
+'math_bad_output'           => '�евозможно е �оздавањето на аутпут директориум за математичките операции',
+'math_notexvc'              => '�едо�та�ува извршната податотека texvc; 
+погледнете math/README за нејзино нагодување.',
+'prefs-personal'            => 'Кори�нички профил',
+'prefs-rc'                  => 'Скорешни промени',
+'prefs-watchlist'           => 'Ли�та на набљудувања',
+'prefs-watchlist-days'      => 'Број на денови прикажани во ли�тата на набљудувања:',
+'prefs-watchlist-days-max'  => '(мак�имум 7 дена)',
+'prefs-watchlist-edits'     => 'Мак�имален број на промени прикажани во проширената ли�та на набљудувања:',
+'prefs-watchlist-edits-max' => '(мак�имален број: 1000)',
+'prefs-misc'                => 'Разно',
+'prefs-resetpass'           => 'Промени лозинка',
+'saveprefs'                 => 'Зачувај нагодувања',
+'resetprefs'                => 'Избриши незачувани измени',
+'textboxsize'               => 'Уредување',
+'prefs-edit-boxsize'        => 'Големина на прозорецот за уредување.',
+'rows'                      => 'Редови:',
+'columns'                   => 'Колони:',
+'searchresultshead'         => 'Пребарување',
+'resultsperpage'            => 'Резултати по �траница:',
+'contextlines'              => 'Линии по резултат:',
+'contextchars'              => 'Карактери од �одржината по линија',
+'stub-threshold'            => 'Минимална големина за <a href="#" class="stub">никулци</a> (бајти):',
+'recentchangesdays'         => 'Денови за прикажување во �корешни промени:',
+'recentchangesdays-max'     => '(мак�имум $1 {{PLURAL:$1|ден|денови}})',
+'recentchangescount'        => 'Број на уредувања кои ќе �е прикажуват во �корешни промени, и�торија на �траница и во дневници, по о�новно:',
+'savedprefs'                => 'Вашите нагодувања �е зачувани.',
+'timezonelegend'            => 'Времен�ка зона',
+'timezonetext'              => '¹Број на ча�ови за колку �е разликува вашето локално време од �ервер�кото време (UTC).',
+'localtime'                 => 'Локално време:',
+'timezoneselect'            => 'Времен�ка зона:',
+'timezoneuseserverdefault'  => 'Кори�ти �ервер�ко време',
+'timezoneuseoffset'         => 'Друго (наведи от�тапување)',
+'timezoneoffset'            => 'От�тапка¹:',
+'servertime'                => 'Сервер�ко време:',
+'guesstimezone'             => 'Пополни од веб прели�тувачот',
+'allowemail'                => 'Дозволи е-пошта од други кори�ници',
+'prefs-searchoptions'       => 'Опции за пребарување',
+'prefs-namespaces'          => 'Имен�ки про�тори',
+'defaultns'                 => 'Пребарувај во овие имен�ки про�тори по о�новно:',
+'default'                   => 'по о�новно',
+'files'                     => 'Податотеки',
 
 # User rights
 'userrights'                     => 'Управување �о кори�нички права', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'         => 'Управување �о кори�нички групи',
 'userrights-user-editname'       => 'Вне�и кори�ничко име:',
 'editusergroup'                  => 'Уреди кори�нички групи',
-'editinguser'                    => "Менување на кори�ничките права на кори�никот '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                    => "Менување на кори�ничките права на кори�никот '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'       => 'Уреди ги кори�ничките групи',
 'saveusergroups'                 => 'Зачувај ги кори�ничките групи',
 'userrights-groupsmember'        => 'Член на:',
@@ -1027,8 +1315,12 @@ $2',
 'right-minoredit'            => 'Означување на уредувањата како �итни',
 'right-move'                 => 'Преме�тување �траници',
 'right-move-subpages'        => 'Преме�тување �траници �о нивните под�траници',
+'right-move-rootuserpages'   => 'Преме�тување на о�новна кори�ничка �траница',
+'right-movefile'             => 'Преме�тување на податотеки',
+'right-suppressredirect'     => '�е прави прена�очување од �тарото име при преме�тување на �траница',
 'right-upload'               => 'Подигнување податотеки',
 'right-reupload'             => 'Пребришување по�тоечка податотека',
+'right-reupload-own'         => 'Пре�нимување на по�тоечка податотека подигната од ва�',
 'right-upload_by_url'        => 'Подигнување податотека од URL адре�а',
 'right-purge'                => 'Избриши �ервер�ки кеш за �траницата без барање потврда за тоа',
 'right-autoconfirmed'        => 'Уредување на делумно заштитени �траници',
@@ -1051,7 +1343,7 @@ $2',
 'right-editusercssjs'        => 'Уредување на CSS и JS податотеки на други кори�ници',
 'right-import'               => 'Увезување �траници од други викија',
 'right-importupload'         => 'Увезување �траници од подигната податотека',
-'right-patrol'               => 'Означи ги уредувањата на другите како проверени',
+'right-patrol'               => 'Означување на уредувањата на другите како патролирани',
 'right-unwatchedpages'       => 'Прегледување на ли�та на ненабљудувани �траници',
 'right-trackback'            => 'Потврдување на враќање',
 'right-mergehistory'         => 'Спојување на и�ториите на �траниците',
@@ -1065,9 +1357,44 @@ $2',
 'rightslogentry' => 'Променето член�тво во група за $1 од $2 во $3',
 'rightsnone'     => '(нема)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'читање на оваа �траница',
+'action-edit'                 => 'уредување на оваа �траница',
+'action-createpage'           => 'креирање �траници',
+'action-createtalk'           => 'креирање �траници за разговор',
+'action-createaccount'        => 'креирање на оваа кори�ничка �метка',
+'action-minoredit'            => 'означување на ова уредување како �итно',
+'action-move'                 => 'преме�тување на оваа �траница',
+'action-move-subpages'        => 'преме�тување на оваа �траница и нејзините под�траници',
+'action-move-rootuserpages'   => 'преме�тување на о�новна кори�ничка �траница',
+'action-movefile'             => 'преме�ти ја оваа податотека',
+'action-upload'               => 'подигнување на оваа податотека',
+'action-reupload'             => 'пребришување на оваа по�тоечка податотека',
+'action-reupload-shared'      => 'пребришување на оваа податотека на заедничката ризница',
+'action-upload_by_url'        => 'подигнување на оваа податотека од URL адре�а',
+'action-delete'               => 'бриши ја оваа �траница',
+'action-deleterevision'       => 'бриши ја оваа ревизија',
+'action-deletedhistory'       => 'прегледај ја и�торијата на бришења за оваа �траница',
+'action-browsearchive'        => 'барање на избришани �траници',
+'action-undelete'             => 'обнови ја оваа �траница',
+'action-suppressrevision'     => 'прегледај ја и обновија оваа �криена ревизија',
+'action-suppressionlog'       => 'погледни го овој приватен дневник',
+'action-block'                => 'оневозможи го овој кори�ник да уредува',
+'action-protect'              => 'промени го нивото на заштита на оваа �траница',
+'action-import'               => 'увези ја оваа �траница од друго вики',
+'action-importupload'         => 'увези ја оваа �траница од подигната податотека',
+'action-patrol'               => 'означи ги уредувањата на другите како проверени',
+'action-unwatchedpages'       => 'преглед на ли�та на ненабљудувани �траници',
+'action-trackback'            => 'потврда на враќање',
+'action-mergehistory'         => '�појување на и�торијата на оваа �траница',
+'action-userrights'           => 'уредување на �ите кори�нички права',
+'action-userrights-interwiki' => 'уредување на кори�нички права на кори�ници на други викија',
+'action-siteadmin'            => 'заклучување или отклучување на базата на податоци',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|промена|промени}}',
 'recentchanges'                     => 'Скорешни промени',
+'recentchanges-legend'              => 'Опции за �корешни промени',
 'recentchangestext'                 => 'Следење на по�ледните промени на викито на оваа �траница.',
 'recentchanges-feed-description'    => 'Следење на �корешните промени на викито во овој фид.',
 'rcnote'                            => "Долу {{PLURAL:$1|е прикажана '''1''' промена|�е прикажани �корешните '''$1''' промени}} {{PLURAL:$2|дене�|во по�ледниве '''$2''' дена}}, почнувајќи од $5, $4.",
@@ -1093,10 +1420,13 @@ $2',
 'rc_categories_any'                 => 'Било кои',
 'rc-change-size'                    => '$1',
 'newsectionsummary'                 => '/* $1 */ нова �екција',
+'rc-enhanced-expand'                => 'Прикажување на детали (потребно JavaScript)',
+'rc-enhanced-hide'                  => 'Сокривање на детали',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Поврзани промени',
 'recentchangeslinked-title'    => 'Промени поврзани �о "$1"',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => '�ема промени на поврзаните �траници во зададениот период.',
 'recentchangeslinked-summary'  => "Ова е ли�та на промени направени на �траниците поврзани преку �пецифицираната �траница (или до членови на �пецифицираната категорија).
 Страниците во [[Special:Watchlist|вашата ли�та на набљудувања]] �е прикажани '''болдирано'''.",
@@ -1114,11 +1444,11 @@ $2',
 'upload_directory_read_only'  => 'Веб �ерверот не може да запишува во именикот за подигнување ($1).',
 'uploaderror'                 => 'Грешка во подигнувањето',
 'uploadtext'                  => "Кори�тете го долниот формулар за подигнување на податотеки.
-За преглед или пребарување на претходно подигнати податотеки погледнете ја [[Special:ImageList|ли�тата на подигнати податотеки]], повторните подигнувања �е ажурирани во [[Special:Log|дневникот на подигнувања]], бришењата �е ажурирани во [[Special:Log/delete|дневникот на бришења]].
+За преглед или пребарување на претходно подигнати податотеки погледнете ја [[Special:FileList|ли�тата на подигнати податотеки]], повторните подигнувања �е ажурирани во [[Special:Log|дневникот на подигнувања]], бришењата �е ажурирани во [[Special:Log/delete|дневникот на бришења]].
 
 За да вклучите �лика во �траница, кори�тете вр�ка во некој од �ледниве формати:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' за верзија на �ликата во цело�на големина
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki><tt>''' за верзија на �ликата �о големина од 200 пик�ели рендерирана во �оодветна кутија, �о опи� како што е наведено во '''alt text'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' за верзија на �ликата во цело�на големина
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki><tt>''' за верзија на �ликата �о големина од 200 пик�ели рендерирана во �оодветна кутија, �о опи� како што е наведено во '''alt text'''
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki><tt>''' за директно поврзување �о податотеката без нејзино прикажување",
 'upload-permitted'            => 'Дозволени типови на податотеки: $1.',
 'upload-preferred'            => 'Преферирани типови на податотеки: $1.',
@@ -1126,7 +1456,7 @@ $2',
 'uploadlog'                   => 'дневник на подигнувања',
 'uploadlogpage'               => 'Дневник на подигнувања',
 'uploadlogpagetext'           => 'Подолу е ли�та на најновите подигнувања на податотеки.
-Погледнете ја [[Special:NewImages|галеријата на нови податотеки]] за визуелен преглед.',
+Погледнете ја [[Special:NewFiles|галеријата на нови податотеки]] за визуелен преглед.',
 'filename'                    => 'Име на податотека',
 'filedesc'                    => 'Опи�',
 'fileuploadsummary'           => 'Опи�:',
@@ -1150,27 +1480,27 @@ $2',
 'emptyfile'                   => 'Податотеката што ја подигнавте изгледа дека е празна. 
 Ова може да е поради грешка во името на податотеката. 
 Ве молиме проверете дали нави�тина �акате да ја подигнете оваа податотека.',
-'fileexists'                  => 'Податотека �о ова име веќе по�тои, проверете <strong><tt>$1</tt></strong> ако не �те �игурни дали �акате да го промените.',
-'filepageexists'              => 'Страницата за опи� на оваа податотека веќе е креирана на <strong><tt>$1</tt></strong>, но не по�тои податотека �о тоа име.
+'fileexists'                  => "Податотека �о ова име веќе по�тои, проверете '''<tt>$1</tt>''' ако не �те �игурни дали �акате да го промените.",
+'filepageexists'              => "Страницата за опи� на оваа податотека веќе е креирана на '''<tt>$1</tt>''', но не по�тои податотека �о тоа име.
 Опи�от кој го вне�овте нема да �е појави на �траницата за опи�.
-Доколку �акате опи�от да �е појаву тука, мора мануелно да извршите уредување.',
-'fileexists-extension'        => 'Податотека �о �лично име веќе по�тои:<br />
-Име на податотека која �е подигнува: <strong><tt>$1</tt></strong><br />
-Име на по�тоечка податотека: <strong><tt>$2</tt></strong><br />
-Ве молиме изберете друго име за податотеката.',
+Доколку �акате опи�от да �е појаву тука, мора мануелно да извршите уредување.",
+'fileexists-extension'        => "Податотека �о �лично име веќе по�тои:<br />
+Име на податотека која �е подигнува: '''<tt>$1</tt>'''<br />
+Име на по�тоечка податотека: '''<tt>$2</tt>'''<br />
+Ве молиме изберете друго име за податотеката.",
 'fileexists-thumb'            => "'''<center>По�тоечка податотека</center>'''",
-'fileexists-thumbnail-yes'    => 'Податотеката изгледа дека е �лика �о намалена големина <i>(thumbnail)</i>.
-Ве молиме проверете ја податотеката <strong><tt>$1</tt></strong>.<br />
-�ко податотеката која ја проверувате е и�тата �лика во �војата оригинална големина тогаш не мора да ја подигнувате дополнително.',
-'file-thumbnail-no'           => 'Името на податотеката почнува �о <strong><tt>$1</tt></strong>. 
-Изгледа дека е �о намалена големина <i>(мини, thumbnail)</i>.
-�ко ја имате оваа �лика во оригинална големина, подигнете ја неа, во �противно �менете го името на податотеката.',
-'fileexists-forbidden'        => 'Податотека �о тоа име веќе по�тои.
-�ко и понатаму �акате да ја подигнете податотеката, ве молиме вратете �е назад и подигнете ја оваа податотека под друго име.
-[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Податотеката изгледа дека е �лика �о намалена големина ''(thumbnail)''.
+Ве молиме проверете ја податотеката '''<tt>$1</tt>'''.<br />
+�ко податотеката која ја проверувате е и�тата �лика во �војата оригинална големина тогаш не мора да ја подигнувате дополнително.",
+'file-thumbnail-no'           => "Името на податотеката почнува �о '''<tt>$1</tt>'''. 
+Изгледа дека е �о намалена големина ''(мини, thumbnail)''.
+�ко ја имате оваа �лика во оригинална големина, подигнете ја неа, во �противно �менете го името на податотеката.",
+'fileexists-forbidden'        => 'Податотека �о тоа име веќе по�тои и не може да биде заменета.
+�ко и понатаму �акате да ја подигнете вашата податотеката, ве молиме вратете �е назад и подигнете ја под друго име. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Податотека �о ова име веќе по�тои во заедничката ризница.
-�ко и понатаму �акате да ја подигнете податотеката, ве молиме вратете �е и повторно подигнете ја податотеката �о ново име. [[Image:$1|thumb|center|$1]]',
+�ко и понатаму �акате да ја подигнете податотеката, ве молиме вратете �е и повторно подигнете ја податотеката �о ново име. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Оваа податотека е дупликат �о {{PLURAL:$1|�леднава податотека|�ледниве податотеки}}:',
+'file-deleted-duplicate'      => 'Податотека индентична �о податотеката ([[$1]]) претходно била избришана. Треба да проверите во дневникот на бришења за оваа податотека пред повторно да ја подигнете.',
 'successfulupload'            => 'У�пешно подигнување',
 'uploadwarning'               => 'Предупредување при подигнување',
 'savefile'                    => 'Зачувај податотека',
@@ -1192,8 +1522,8 @@ $2',
 
 Разми�лете дали е правилно да продолжите �о подигнување на оваа податотека.
 Дневникот на бришење за оваа податотека може да го прегледате овде заради ваша информација:",
-'filename-bad-prefix'         => 'Името на податотеката која ја подигнувате започнува �о <strong>"$1"</strong>, типично за имиња автомат�ки креирани од �трана на дигиталните камери, што не е доволно опи�но име .
-Ве молиме одберете подобро опи�но име за вашата податотека.',
+'filename-bad-prefix'         => "Името на податотеката која ја подигнувате започнува �о '''\"\$1\"''', типично за имиња автомат�ки креирани од �трана на дигиталните камери, што не е доволно опи�но име .
+Ве молиме одберете подобро опи�но име за вашата податотека.",
 'filename-prefix-blacklist'   => ' #<!-- �е менувај ја �одржината на оваа редица, о�тави ја како што е --> <pre>
 # Опи� на �итнак�ата:
 #   * Било што по�ле знакот "#" па до крајот на линијата прет�тавува коментар
@@ -1234,40 +1564,47 @@ PICT # misc.
 'upload_source_url'  => ' (валидна, јавно до�тапна адре�а (URL))',
 'upload_source_file' => '(податотека на вашиот компјутер)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Оваа �пецијална �траница ги покажува �ите подигнати податотеки.
+# Special:ListFiles
+'listfiles-summary'     => 'Оваа �пецијална �траница ги покажува �ите подигнати податотеки.
 По о�новно по�ледно подигнатите �траници �е прикажани на почеток од ли�тата.
 Со клик на на�ловот на колоната може да �е промени подредувањето.',
-'imagelist_search_for'  => 'Побарај име на медија:',
+'listfiles_search_for'  => 'Побарај име на медија:',
 'imgfile'               => 'податотека',
-'imagelist'             => 'Ли�та на �лики',
-'imagelist_date'        => 'Датум',
-'imagelist_name'        => 'Име',
-'imagelist_user'        => 'Кори�ник',
-'imagelist_size'        => 'Големина (бајти)',
-'imagelist_description' => 'Опи�',
-
-# Image description page
-'filehist'                       => 'И�торија на податотеката',
+'listfiles'             => 'Ли�та на �лики',
+'listfiles_date'        => 'Датум',
+'listfiles_name'        => 'Име',
+'listfiles_user'        => 'Кори�ник',
+'listfiles_size'        => 'Големина (бајти)',
+'listfiles_description' => 'Опи�',
+'listfiles_count'       => 'Верзии',
+
+# File description page
+'filehist'                       => 'И�торија на податотека',
 'filehist-help'                  => 'Кликнете на датум/време за да ја видите податотеката како изгледала тогаш.',
 'filehist-deleteall'             => 'бриши �е',
 'filehist-deleteone'             => 'бриши',
 'filehist-revert'                => 'врати',
 'filehist-current'               => 'моментална',
 'filehist-datetime'              => 'Датум/Време',
+'filehist-thumb'                 => 'Мини-�лика',
+'filehist-thumbtext'             => 'Мини-�лика за верзија од $1',
+'filehist-nothumb'               => '�ема мини-�лика',
 'filehist-user'                  => 'Кори�ник',
 'filehist-dimensions'            => 'Димензии',
 'filehist-filesize'              => 'Големина',
 'filehist-comment'               => 'Коментар',
-'imagelinks'                     => 'Вр�ки',
+'imagelinks'                     => 'Вр�ки до податотека',
 'linkstoimage'                   => 'До оваа податотека има {{PLURAL:$1|вр�ка од �леднава �траница|вр�ки од �ледниве $1 �траници}}:',
+'linkstoimage-more'              => 'Повеќе од {{PLURAL:$1|една �траница е поврзана|$1 �траници �е поврзани}} �о оваа податотека.
+Следнава ли�та {{PLURAL:$1|ја прикажува �амо првата поврзана �траница|ги прикажува �амо првите $1 поврзани �траници}} до оваа податотека.
+Цело�на ли�та може да добиете [[Special:WhatLinksHere/$2|тука]].',
 'nolinkstoimage'                 => '�ема �траници кои ја кори�тат оваа податотека.',
 'morelinkstoimage'               => 'Погледни [[Special:WhatLinksHere/$1|други вр�ки]] кон оваа податотека.',
-'redirectstofile'                => '{{PLURAL:$1|Следната податотека прена�очува|$1 Следните податотеки прена�оуваат}} кон оваа податотека:',
-'duplicatesoffile'               => '{{PLURAL:$1|Следната податотека е дупликат|$1 Следните податотеки �е дупликати}} на оваа податотека:',
+'redirectstofile'                => '{{PLURAL:$1|Следната податотека прена�очува|$1 Следните податотеки прена�очуваат}} кон оваа податотека:',
+'duplicatesoffile'               => '{{PLURAL:$1|Следната податотека е дупликат|$1 Следните податотеки �е дупликати}} на оваа податотека ([[Special:FileDuplicateSearch/$2|повеќе информации]]):',
 'sharedupload'                   => 'Оваа податотека е во заедничката ризница и може да �е кори�ти во други проекти.',
 'shareduploadwiki'               => 'Ве молиме видете $1 за понатамошна информација.',
-'shareduploadwiki-desc'          => 'Опи�от на нејзината $1 на заедничката ризница е прикажан подолу.',
+'shareduploadwiki-desc'          => 'Опи�от на нејзината $1 е прикажан подолу.',
 'shareduploadwiki-linktext'      => '�траница за опи� на податотека',
 'shareduploadduplicate'          => 'Оваа податотека е дупликат на $1 од заедничката ризница.',
 'shareduploadduplicate-linktext' => 'друга податотека',
@@ -1293,7 +1630,7 @@ PICT # misc.
 'filedelete'                  => 'Бриши $1',
 'filedelete-backlink'         => '� $1',
 'filedelete-legend'           => 'Бриши податотека',
-'filedelete-intro'            => "Вие ја бришете '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Ја бришете податотеката '''[[Media:$1|$1]]''' заедно �о нејзината и�торија.",
 'filedelete-intro-old'        => "Вие ја бришете верзијата на '''[[Media:$1|$1]]''' од [$4 $3, $2].",
 'filedelete-comment'          => 'Причина за бришењето:',
 'filedelete-submit'           => 'Бриши',
@@ -1327,28 +1664,31 @@ PICT # misc.
 
 # Random page
 'randompage'         => 'Случајна �траница',
-'randompage-nopages' => '�ема �траници во овој имен�ки про�тор.',
+'randompage-nopages' => '�ема �траници во имен�киот про�тор "$1".',
 
 # Random redirect
 'randomredirect'         => 'Случајно прена�очување',
-'randomredirect-nopages' => '�ема прена�очувања во овој имен�ки про�тор.',
+'randomredirect-nopages' => '�ема прена�очувања во имен�киот про�тор "$1".',
 
 # Statistics
-'statistics'             => 'Стати�тики',
-'sitestats'              => 'Стати�тики за {{SITENAME}}',
-'userstats'              => 'Стати�тики за кори�ници',
-'sitestatstext'          => "Има {{PLURAL:$1|'''1''' �траница|вкупно '''$1''' �траници}} во базата на податоци.
-Вброени �е и „�траници за разговор“, �траници за {{SITENAME}}, минимални „никулци“, прена�очувања и други коишто веројатно не може да �е �метаат за важечки �татии.
-Без нив, има {{PLURAL:$2|'''1''' �траница што веројатно е важечка �татија|'''$2''' �траници што веројатно �е важечки �татии}}.
-
-'''$8''' {{PLURAL:$8|податотека е подигната|податотеки �е подигнати}}.
-
-Има вкупно '''$3''' {{PLURAL:$3|преглед|прегледи}} и '''$4''' {{PLURAL:$4|уредување на �траниците|уредувања на �траниците}}, откако {{SITENAME}} е активна.
-Со тоа, во про�ек има '''$5''' уредувања по �траница и '''$6''' прегледи по уредување.
-
-Должината на [http://www.mediawiki.org/wiki/Manual:Job_queue редицата за работи] изне�ува '''$7'''.",
-'userstatstext'          => "Има вкупно {{PLURAL:$1|'''1''' реги�триран [[Special:ListUsers|кори�ник]]|'''$1''' реги�трирани [[Special:ListUsers|кори�ници]]}}, од кои '''$2''' (или '''$4%''') {{PLURAL:$2|има|имаат}} кори�нички права на „$5“.",
-'statistics-mostpopular' => '�ајпо�етувани �траници',
+'statistics'                   => 'Стати�тики',
+'statistics-header-pages'      => 'Стати�тики за �траници',
+'statistics-header-edits'      => 'Стати�тики на уредувања',
+'statistics-header-views'      => 'Стати�тики на по�ети',
+'statistics-header-users'      => 'Стати�тики за кори�ници',
+'statistics-articles'          => 'Статии',
+'statistics-pages'             => 'Страници',
+'statistics-pages-desc'        => 'Сите �траници на викито, вклучувајќи и �траници за разговор, прена�очувања, и.т.н.',
+'statistics-files'             => 'Подигнати податотеки',
+'statistics-edits'             => 'Број на уредувања од започнувањето на {{SITENAME}}',
+'statistics-edits-average'     => 'Про�ечен број на уредувања по �траница',
+'statistics-views-total'       => 'Вкупно по�ети',
+'statistics-views-peredit'     => 'По�ети по уредување',
+'statistics-jobqueue'          => 'Должина на [http://www.mediawiki.org/wiki/Manual:Job_queue редица на чекање]',
+'statistics-users'             => 'Реги�трирани [[Special:ListUsers|кори�ници]]',
+'statistics-users-active'      => '�ктивни кори�ници',
+'statistics-users-active-desc' => 'Кори�ници кои имаат извршено некоја акција во {{PLURAL:$1|претходниот ден|претходните $1 дена}}',
+'statistics-mostpopular'       => '�ајпо�етувани �траници',
 
 'disambiguations'      => 'Страници за поја�нување',
 'disambiguationspage'  => 'Template:Поја�нување',
@@ -1362,13 +1702,14 @@ PICT # misc.
 'double-redirect-fixer'      => 'И�правувач на прена�очувања',
 
 'brokenredirects'        => 'Прекинати прена�очувања',
-'brokenredirectstext'    => 'Следните прена�очувања покажуваат кон непо�тоечка �татија.',
+'brokenredirectstext'    => 'Следните прена�очувања водат до непо�тоечки �траници.',
 'brokenredirects-edit'   => '(уреди)',
 'brokenredirects-delete' => '(бриши)',
 
-'withoutinterwiki'        => 'Страници без интервики (јазични) вр�ки',
-'withoutinterwiki-legend' => 'Префик�',
-'withoutinterwiki-submit' => 'Прикажи',
+'withoutinterwiki'         => 'Страници без интервики (јазични) вр�ки',
+'withoutinterwiki-summary' => 'Следните �траници немаат вр�ки до други јазични верзии.',
+'withoutinterwiki-legend'  => 'Префик�',
+'withoutinterwiki-submit'  => 'Прикажи',
 
 'fewestrevisions' => 'Статии �о најмалку ревизии',
 
@@ -1391,26 +1732,30 @@ PICT # misc.
 'popularpages'            => 'Популарни �траници',
 'wantedcategories'        => 'Барани категории',
 'wantedpages'             => 'Барани �траници',
-'missingfiles'            => 'Податотеки кои недо�та�уваат',
+'wantedfiles'             => 'Барани податотеки',
+'wantedtemplates'         => 'Барани шаблони',
 'mostlinked'              => '�ајмногу вр�ки до �траници',
 'mostlinkedcategories'    => '�ајмногу вр�ки до категории',
 'mostlinkedtemplates'     => '�ајмногу вр�ки кон шаблони',
 'mostcategories'          => 'Статии �о најмногу категории',
 'mostimages'              => '�ајмногу вр�ки до податотеки',
 'mostrevisions'           => 'Статии �о најмногу верзии',
-'prefixindex'             => 'Спи�ок на �траници по префик�',
+'prefixindex'             => 'Страници �о префик�',
 'shortpages'              => 'Кратки �траници',
 'longpages'               => 'Долги �траници',
 'deadendpages'            => 'Ќор�окак �траници',
 'deadendpagestext'        => 'Следните �траници немаат вр�ки кон ниту една друга �траница на ова вики.',
 'protectedpages'          => 'Заштитени �траници',
 'protectedpages-indef'    => 'Само бе�конечни заштити',
+'protectedpages-cascade'  => 'Само ка�кадни заштити',
 'protectedpagestext'      => 'Следните �траници �е заштитени во поглед на преме�тување и уредување',
 'protectedpagesempty'     => 'Во моментов нема заштитени �траници �о параметрите кои ги зададовте.',
 'protectedtitles'         => 'Заштитени на�лови',
 'protectedtitlestext'     => 'Следните на�лови �е забранети за �оздавање',
 'protectedtitlesempty'    => 'Во овој момент нема заштитени на�лови кои ги задоволуваат наведените критериуми.',
 'listusers'               => 'Ли�та на кори�ници',
+'listusers-editsonly'     => 'Прикажи �амо кори�ници кои уредувале',
+'usereditcount'           => '$1 {{PLURAL:$1|уредување|уредувања}}',
 'newpages'                => '�ови �траници',
 'newpages-username'       => 'Кори�ничко име:',
 'ancientpages'            => '�ај�тари �татии',
@@ -1432,14 +1777,13 @@ PICT # misc.
 'booksources-go'            => 'Оди',
 'booksources-text'          => 'Ова е ли�та на вр�ки кон други �ајтови кои продаваат нови и кори�тени книги, и кои може
 да имаат повеќе информации за книгите кои ги баравте:',
+'booksources-invalid-isbn'  => '�аведениот ISBN код изгледа не е валидно запишан; проверете да не на�танала некоја грешка при копирање од оригиналниот извор.',
 
 # Special:Log
 'specialloguserlabel'  => 'Кори�ник:',
 'speciallogtitlelabel' => '�а�лов:',
 'log'                  => 'Дневници',
 'all-logs-page'        => 'Сите дневници',
-'log-search-legend'    => 'Пребарување на log запи�и',
-'log-search-submit'    => 'Оди',
 'alllogstext'          => 'Комбиниран приказ на �ите ра�положиви дневници на {{SITENAME}}.
 Изберете �оодветен дневник од предложената ли�та, кори�ничко име или �траница (�е прави разлика помеѓу големи и мали букви).',
 'logempty'             => '�ема �оодветни запи�и во дневникот.',
@@ -1451,6 +1795,7 @@ PICT # misc.
 'nextpage'          => 'Следна �траница ($1)',
 'prevpage'          => 'Претходна �траница ($1)',
 'allpagesfrom'      => 'Прикажи �траници кои започнуваат �о:',
+'allpagesto'        => 'Прикажи �траници кои завршуваат �о:',
 'allarticles'       => 'Сите �траници',
 'allinnamespace'    => 'Сите �траници (имен�ки про�тор $1)',
 'allnotinnamespace' => 'Сите �траници (кои не �е во имен�киот про�тор $1)',
@@ -1470,42 +1815,70 @@ PICT # misc.
 'special-categories-sort-count' => 'нумеричко подредување',
 'special-categories-sort-abc'   => 'алфанумеричко подредување по',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Избришани кори�нички придоне�и',
+
+# Special:LinkSearch
+'linksearch'       => '�адворешни вр�ки',
+'linksearch-pat'   => 'У�лов за пребарување:',
+'linksearch-ns'    => 'Имен�ки про�тор:',
+'linksearch-ok'    => 'Барај',
+'linksearch-text'  => 'Може да �е кори�тат џокер знаци, пример "*.wikipedia.org".<br />
+Подржани протоколи: <tt>$1</tt>',
+'linksearch-line'  => '$1 поврзано од $2',
+'linksearch-error' => '�окер знаци може да �е кори�тат �амо на почетокот во името на хо�тот.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Прикажни кори�ници почнувајќи од:',
 'listusers-submit'   => 'Прикажи',
 'listusers-noresult' => '�е е пронајден кори�ник.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Дневник на реги�трирања на кори�ници',
+'newuserlogpagetext'          => 'Ова е дневник на реги�трирани кори�ници.',
+'newuserlog-byemail'          => 'и�пратена лозинка по е-пошта',
+'newuserlog-create-entry'     => '�ов кори�ник',
+'newuserlog-create2-entry'    => '�оздадено нова кори�ничка �метка $1',
+'newuserlog-autocreate-entry' => '�втомат�ки креирана кори�ничка �метка',
+
 # Special:ListGroupRights
-'listgrouprights'               => 'Права на кори�нички групи',
-'listgrouprights-summary'       => 'Следната ли�та е ли�та на кори�нички групи дефинирани на ова вики, заедно �о нивните придружени права на при�тап.
+'listgrouprights'                 => 'Права на кори�нички групи',
+'listgrouprights-summary'         => 'Следната ли�та е ли�та на кори�нички групи дефинирани на ова вики, заедно �о нивните придружени права на при�тап.
 Можно е да има [[{{MediaWiki:Listgrouprights-helppage}}|дополнителни информации]] за некои права.',
-'listgrouprights-group'         => 'Група',
-'listgrouprights-rights'        => 'Права',
-'listgrouprights-helppage'      => 'Help:Права на групи',
-'listgrouprights-members'       => '(ли�та на членови)',
-'listgrouprights-right-display' => '$1 ($2)',
+'listgrouprights-group'           => 'Група',
+'listgrouprights-rights'          => 'Права',
+'listgrouprights-helppage'        => 'Help:Права на групи',
+'listgrouprights-members'         => '(ли�та на членови)',
+'listgrouprights-right-display'   => '$1 ($2)',
+'listgrouprights-addgroup'        => 'Може да додава {{PLURAL:$2|група|групи}}: $1',
+'listgrouprights-removegroup'     => 'Може да брише {{PLURAL:$2|група|групи}}: $1',
+'listgrouprights-addgroup-all'    => 'Може да ги додава �ите групи',
+'listgrouprights-removegroup-all' => 'Може да ги брише �ите групи',
 
 # E-mail user
-'mailnologin'     => '�ема адре�а за праќање',
-'mailnologintext' => 'Мора да бидете [[Special:UserLogin|најавени]] и да имате валидна е-поштен�ка адре�а во вашите [[Special:Preferences|нагодувања]] за да може да праќате е-пошта до други кори�ници.',
-'emailuser'       => 'Прати е-пошта до овој кори�ник',
-'emailpage'       => 'Е-пошта до кори�ник',
-'emailpagetext'   => 'Можете да го кори�тите �ледниов формулар за праќање на е-поштен�ка порака до овој кори�ник.
+'mailnologin'      => '�ема адре�а за праќање',
+'mailnologintext'  => 'Мора да бидете [[Special:UserLogin|најавени]] и да имате валидна е-поштен�ка адре�а во вашите [[Special:Preferences|нагодувања]] за да може да праќате е-пошта до други кори�ници.',
+'emailuser'        => 'Прати е-пошта до овој кори�ник',
+'emailpage'        => 'Е-пошта до кори�ник',
+'emailpagetext'    => 'Можете да го кори�тите �ледниов формулар за праќање на е-поштен�ка порака до овој кори�ник.
 Е-поштен�ката адре�а која ја имате наведено во [[Special:Preferences|вашите нагодувања]] ќе �е прикаже во "Од" полето на е-пораката, �о што примачот ќе може да ви одговори директно вам.',
-'usermailererror' => '�а�тана �ледната грешка при праќање е-пошта:',
-'defemailsubject' => '{{SITENAME}} е-пошта',
-'noemailtitle'    => '�ема е-поштен�ка адре�а',
-'noemailtext'     => 'Овој кори�ник нема наведено валидна е-поштен�ка адре�а, или избрал да не прима е-пошта од други кори�ници.',
-'emailfrom'       => 'Од:',
-'emailto'         => 'До:',
-'emailsubject'    => 'Предмет:',
-'emailmessage'    => 'Порака:',
-'emailsend'       => 'Прати',
-'emailccme'       => 'Прати ми копија од пораката по е-пошта.',
-'emailccsubject'  => 'Копија од вашата порака до $1: $2',
-'emailsent'       => 'Е-поштата е пратена',
-'emailsenttext'   => 'Вашата е-пошта е пратена.',
-'emailuserfooter' => 'Оваа е-порака беше пратена од $1 до $2 �о помош на функцијата Е-пошта на {{SITENAME}}.',
+'usermailererror'  => '�а�тана �ледната грешка при праќање е-пошта:',
+'defemailsubject'  => '{{SITENAME}} е-пошта',
+'noemailtitle'     => '�ема е-поштен�ка адре�а',
+'noemailtext'      => 'Овој кори�ник нема наведено валидна е-поштен�ка адре�а.',
+'nowikiemailtitle' => '�е е допуштено кори�тење на е-пошта',
+'nowikiemailtext'  => 'Овој кори�ник избрал да не прима е-пошта од други кори�ници.',
+'email-legend'     => 'Праќање на е-пошта до друг {{SITENAME}} кори�ник',
+'emailfrom'        => 'Од:',
+'emailto'          => 'До:',
+'emailsubject'     => 'Предмет:',
+'emailmessage'     => 'Порака:',
+'emailsend'        => 'Прати',
+'emailccme'        => 'Прати ми копија од пораката по е-пошта.',
+'emailccsubject'   => 'Копија од вашата порака до $1: $2',
+'emailsent'        => 'Е-поштата е пратена',
+'emailsenttext'    => 'Вашата е-пошта е пратена.',
+'emailuserfooter'  => 'Оваа е-порака беше пратена од $1 до $2 �о помош на функцијата Е-пошта на {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Мои набљудувања',
@@ -1535,12 +1908,7 @@ PICT # misc.
 'iteminvalidname'      => "Проблем �о елементот '$1', неважечко име...",
 'wlnote'               => "Подолу {{PLURAL:$1|е прикажана по�ледната промена|�е прикажани по�ледните '''$1''' промени}} во {{PLURAL:$2|по�ледниов ча�|по�ледниве '''$2''' ча�а}}.",
 'wlshowlast'           => 'Прикажи ги по�ледните $1 ча�а, $2 денови, $3',
-'watchlist-show-bots'  => 'Прикажи бот уредувања',
-'watchlist-hide-bots'  => 'Сокриј бот уредувања',
-'watchlist-show-own'   => 'Прикажи мои уредувања',
-'watchlist-hide-own'   => 'Сокриј мои уредувања',
-'watchlist-show-minor' => 'Прикажи мали уредувања',
-'watchlist-hide-minor' => 'Сокриј мали измени',
+'watchlist-options'    => 'Опции на ли�та на набљудувања',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '�абљудување...',
@@ -1556,9 +1924,9 @@ PICT # misc.
 'enotif_lastvisited'           => 'Видете $1 за �ите промени од вашата по�ледна по�ета.',
 'enotif_lastdiff'              => 'Видете $1 за да ја видите оваа промена.',
 'enotif_anon_editor'           => 'анонимен кори�ник $1',
-'enotif_body'                  => 'Драги $WATCHINGUSERNAME,
+'enotif_body'                  => '$WATCHINGUSERNAME,
 
-Страницата $PAGETITLE на {{SITENAME}} беше $CHANGEDORCREATED на $PAGEEDITDATE од �трана на $PAGEEDITOR, видете $PAGETITLE_URL за �егашната верзија.
+Страницата за разговор на {{SITENAME}} беше променета на $PAGEEDITDATE од \'\'\'$PAGEEDITOR\'\'\', види $PAGETITLE_URL.
 
 $NEWPAGE
 
@@ -1568,42 +1936,40 @@ $NEWPAGE
 е-пошта: $PAGEEDITOR_EMAIL
 вики: $PAGEEDITOR_WIKI
 
-Веќе нема да има изве�тувања за �ледните промени о�вен ако не ја по�етите оваа �траница. И�то така треба да ги ре�етирате знаменцата за изве�тување за �ите ваши набљудувани �трани во вашата ли�та на набљудувања.
+Веќе нема да има изве�тувања за �ледните промени о�вен ако не ја по�етите оваа �траница. И�то така треба да ги ре�етирате знаменцата за изве�тување за �ите ваши набљудувани �траници во вашата ли�та на набљудувања.
 
-             Вашиот пријател�ки {{SITENAME}} �и�тем за изве�тување
+{{SITENAME}} �и�тем за изве�тување
 
 --
-За да ги промените нагодувањата на вашата ли�та на набљудувања, по�етете
-{{fullurl:Special:Watchlist/edit}}
-
-Фидбек и помош:
-{{fullurl:Help:Содржина}}',
-
-# Delete/protect/revert
-'deletepage'                  => 'Избриши �траница',
-'confirm'                     => 'Потврди',
-'excontent'                   => "�одржината беше: '$1'",
-'excontentauthor'             => "�одржината беше: '$1' (и един�твениот автор беше '$2')",
-'exbeforeblank'               => "�одржината пред бришењето беше: '$1'",
-'exblank'                     => '�траницата беше празна',
-'delete-confirm'              => 'Бриши "$1"',
-'delete-backlink'             => '� $1',
-'delete-legend'               => 'Бриши',
-'historywarning'              => 'Предупредување: Страницата која �акате да ја избришете има и�торија:',
-'confirmdeletetext'           => '�а пат �те трајно да избришете �траница заедно �о нејзината и�торија. 
+За промена на нагодувањата на вашата ли�та на набљудувања, види {{fullurl:Special:Watchlist/edit}}
+
+Дополнителна помош: {{fullurl:Help:Содржина}}',
+
+# Delete
+'deletepage'             => 'Избриши �траница',
+'confirm'                => 'Потврди',
+'excontent'              => "�одржината беше: '$1'",
+'excontentauthor'        => "�одржината беше: '$1' (и един�твениот автор беше '$2')",
+'exbeforeblank'          => "�одржината пред бришењето беше: '$1'",
+'exblank'                => '�траницата беше празна',
+'delete-confirm'         => 'Бриши "$1"',
+'delete-backlink'        => '� $1',
+'delete-legend'          => 'Бриши',
+'historywarning'         => 'Предупредување: Страницата која �акате да ја избришете има и�торија:',
+'confirmdeletetext'      => '�а пат �те трајно да избришете �траница заедно �о нејзината и�торија. 
 Потврдете дека имате намера да го направите ова, дека ги разбирате по�ледиците од тоа, дека го правите ова во �огла�но�т �о [[{{MediaWiki:Policy-url}}|политиката]].',
-'actioncomplete'              => 'Деј�твото беше извршено',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" беше избришана. Видете $2 за до�ие на �корешните бришења.',
-'deletedarticle'              => 'избришано "[[$1]]"',
-'suppressedarticle'           => 'suppressed "[[$1]]"',
-'dellogpage'                  => 'Дневник на бришења',
-'dellogpagetext'              => 'Подолу е ли�тата на по�ледните бришења.',
-'deletionlog'                 => 'дневник на бришењата',
-'reverted'                    => 'Вратено на претходната ревизија',
-'deletecomment'               => 'Причина за бришење:',
-'deleteotherreason'           => 'Друга/дополнителна причина:',
-'deletereasonotherlist'       => 'Друга причина',
-'deletereason-dropdown'       => '*Вообичаени причини
+'actioncomplete'         => 'Деј�твото беше извршено',
+'deletedtext'            => '"<nowiki>$1</nowiki>" беше избришана. Видете $2 за до�ие на �корешните бришења.',
+'deletedarticle'         => 'избришано "[[$1]]"',
+'suppressedarticle'      => 'suppressed "[[$1]]"',
+'dellogpage'             => 'Дневник на бришења',
+'dellogpagetext'         => 'Подолу е ли�тата на по�ледните бришења.',
+'deletionlog'            => 'дневник на бришењата',
+'reverted'               => 'Вратено на претходната ревизија',
+'deletecomment'          => 'Причина за бришење:',
+'deleteotherreason'      => 'Друга/дополнителна причина:',
+'deletereasonotherlist'  => 'Друга причина',
+'deletereason-dropdown'  => '*Вообичаени причини
 ** �а барање на авторот
 ** Прекршување на автор�ки права
 ** Страница �оздадена по грешка
@@ -1611,56 +1977,75 @@ $NEWPAGE
 
 *Спам
 **Спам',
-'delete-edit-reasonlist'      => 'Уредување на причини за бришење',
-'delete-toobig'               => 'Оваа �траница има долга и�торија на уредување, преку $1 {{PLURAL:$1|ревизија|ревизии}}.
+'delete-edit-reasonlist' => 'Уредување на причини за бришење',
+'delete-toobig'          => 'Оваа �траница има долга и�торија на уредување, преку $1 {{PLURAL:$1|ревизија|ревизии}}.
 Бришењето на ваквии �траници е забрането �о цел да �е заштити {{SITENAME}} од оштетувања.',
-'delete-warning-toobig'       => 'Оваа �траница има долга и�торија на уредување, преку $1 {{PLURAL:$1|ревизија|ревизии}}.
+'delete-warning-toobig'  => 'Оваа �траница има долга и�торија на уредување, преку $1 {{PLURAL:$1|ревизија|ревизии}}.
 Бришењето може да предизвика проблеми при �о базата на податоци на {{SITENAME}};
 продолжете доколку �те �игруни дека треба тоа да го �торите.',
-'rollback'                    => 'Врати промени',
-'rollback_short'              => 'Врати',
-'rollbacklink'                => 'Врати',
-'rollbackfailed'              => '�еу�пешно враќање',
-'cantrollback'                => '�е може да �е врати по�ледната промена, по�ледниот автор е и�товремено и един�твен.',
-'alreadyrolled'               => '�е може да �е врати по�ледната верзија [[:$1]] на [[User:$2|$2]] ([[User talk:$2|Разговор]]); некој веќе ја уредил или ги вратил промените на �траницата.
-
-По�ледното уредување беше на [[User:$3|$3]] ([[User talk:$3|Разговор]]).',
-'editcomment'                 => 'Коментарот на уредувањето беше: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'От�трането уредувањето на [[Special:Contributions/$2|$2]] ([[User talk:$2|разговор]]), вратено на по�ледната верзија на [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Откажани уредувањата на $1; вратено на по�ледната верзија на $2.',
-'sessionfailure'              => 'Има проблем �о вашата �е�ија;
+
+# Rollback
+'rollback'         => 'Врати промени',
+'rollback_short'   => 'Врати',
+'rollbacklink'     => 'Врати',
+'rollbackfailed'   => '�еу�пешно враќање',
+'cantrollback'     => '�е може да �е врати по�ледната промена, по�ледниот автор е и�товремено и един�твен.',
+'alreadyrolled'    => '�е може да �е врати по�ледното уредување од [[:$1]] на [[User:$2|$2]] ([[User talk:$2|Разговор]])]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); некој друг веќе ја уредил или ги вратил промените на �траницата.
+
+По�ледното уредување беше на [[User:$3|$3]] ([[User talk:$3|Разговор]])]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Коментарот на уредувањето беше: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'От�трането уредувањето на [[Special:Contributions/$2|$2]] ([[User talk:$2|разговор]]), вратено на по�ледната верзија на [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Откажани уредувањата на $1; вратено на по�ледната верзија на $2.',
+'sessionfailure'   => 'Има проблем �о вашата �е�ија;
 оваа акција е откажана како превентива против преземање �е�ии.
 Прити�нете го копчето „назад“ и повторно вчитајте ја �траницата од која дојдовте и обидете �е повторно.',
+
+# Protect
 'protectlogpage'              => 'Дневник на заштитувања',
 'protectlogtext'              => 'Подолу е ли�та на отклучувања/заклучувања на �траницата. 
 Погледни [[Special:ProtectedPages|ли�та на заштитени �траници]] за ли�та на тековни заштити на �траници.',
 'protectedarticle'            => 'заштитена "[[$1]]"',
 'modifiedarticleprotection'   => '�менето ниво на заштита за „[[$1]]“',
 'unprotectedarticle'          => 'от�транета заштита на "[[$1]]"',
+'movedarticleprotection'      => 'преме�тени нагодувања за заштита од "[[$2]]" во "[[$1]]"',
 'protect-title'               => 'Заштитување "$1"',
+'prot_1movedto2'              => '[[$1]] преме�тена како [[$2]]',
 'protect-legend'              => 'Потврдете ја заштитата',
 'protectcomment'              => 'Причина за заштитување',
 'protectexpiry'               => 'И�текува:',
 'protect_expiry_invalid'      => 'Времето на и�текување не е добро дефинирано.',
 'protect_expiry_old'          => 'Времето на и�текување е по�таро од тековното време.',
 'protect-unchain'             => 'Отклучи ја можно�та за преме�тување',
-'protect-text'                => 'Овде можете да го погледнете или �мените нивото на заштита за �траницата <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => '�е можете да ја менувате заштитата додека �те блокирани. Овде �е
-дадени актуелните нагодувања за �траницата <strong>$1</strong>:',
-'protect-locked-dblock'       => '�ивото на заштита не може да биде променето, бидејќи базата на податоци е заклучена.
-Овде �е дадени тековните нагодувања на �траницата <strong>$1</strong>:',
-'protect-locked-access'       => 'Вашата кори�ничка �метка нема дозвола за менување на нивото на заштита.
-Овде �е дадени тековните нагодувања за оваа �траница <strong>$1</strong>:',
+'protect-text'                => "Овде можете да го погледнете или �мените нивото на заштита за �траницата '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "�е можете да ја менувате заштитата додека �те блокирани. Овде �е
+дадени актуелните нагодувања за �траницата '''$1''':",
+'protect-locked-dblock'       => "�ивото на заштита не може да биде променето, бидејќи базата на податоци е заклучена.
+Овде �е дадени тековните нагодувања на �траницата '''$1''':",
+'protect-locked-access'       => "Вашата кори�ничка �метка нема дозвола за менување на нивото на заштита.
+Овде �е дадени тековните нагодувања за оваа �траница '''$1''':",
 'protect-cascadeon'           => 'Оваа �траница во овој момент е заштитена бидејќи е вклучена во {{PLURAL:$1|�леднава �траница, за која е|�ледниве �траници, за кои е}} вклучена ка�кадна заштита.
 Можете да го промените нивото на заштита, но тоа нема да влијае на ка�кадната заштита.',
-'protect-default'             => '(по о�новно)',
+'protect-default'             => 'Допуштено за �ите кори�ници',
 'protect-fallback'            => 'Бара "$1" перми�ија',
-'protect-level-autoconfirmed' => 'Блокирај нереги�трирани кори�ници',
+'protect-level-autoconfirmed' => 'Блокирај нови и нереги�трирани кори�ници',
 'protect-level-sysop'         => 'Само админи�тратори',
 'protect-summary-cascade'     => 'ка�када',
 'protect-expiring'            => 'и�текува на $1 (UTC)',
+'protect-expiry-indefinite'   => 'бе�конечно',
 'protect-cascade'             => 'Заштитени �траници вклучени во оваа �траница (ка�кадна заштита)',
 'protect-cantedit'            => '�е можете да го промените нивото на заштита на оваа �траница, бидејќи немате перми�ии за тоа.',
+'protect-othertime'           => 'Друго време:',
+'protect-othertime-op'        => 'друго време',
+'protect-existing-expiry'     => 'По�тоечки рок на и�текување: $3, $2',
+'protect-otherreason'         => 'Друга/дополнителна причини:',
+'protect-otherreason-op'      => 'друга/дополнителна причина',
+'protect-dropdown'            => '*Вообичаени причини за заштита
+** Заче�тен вандализам
+** Заче�тен �пем
+** Бе�кори�на уредувачка војна
+** Страница �о заче�тена по�ета',
+'protect-edit-reasonlist'     => 'Уреди причини за заштита',
+'protect-expiry-options'      => '1 ча�: 1 hour,1 ден:1 day,1 недела:1 week,2 недели:2 weeks,1 ме�ец:1 month,3 ме�еци:3 months,6 ме�еци:6 months,1 година:1 year,бе�конечно:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Перми�ии:',
 'restriction-level'           => '�иво на заштита:',
 'minimum-size'                => 'Минимална големина',
@@ -1682,7 +2067,8 @@ $NEWPAGE
 'undelete'                   => 'Врати избришани �траници',
 'undeletepage'               => 'Погледај и врати избришани �траници',
 'viewdeletedpage'            => 'Прегледај ги избришаните �траници',
-'undeletepagetext'           => 'Следните �траници �е избришани, но �еуште �е во архивата и можат да бидат обновени. �рхивата може периодично да �е чи�ти.',
+'undeletepagetext'           => '{{PLURAL:$1|Следната �траница била избришана но �еуште е во архивата и може да биде вратена.|Следните $1 �траници биле избришани но �еуште �е во архивата и можат да бидат вратени.}}
+�рхивата може периодично да �е чи�ти.',
 'undelete-fieldset-title'    => 'Обнови ревизии',
 'undeleteextrahelp'          => "За да вратите цело�на и�торија на �траница, од�електирајте ги �ите полиња и прити�нете на '''''Врати'''''.
 За да извршите �елективно враќање, �електирајте ги полињата до �оодветните ревизии за враќање и прити�нете на '''''Врати'''''.
@@ -1693,12 +2079,14 @@ $NEWPAGE
 'undeletehistorynoadmin'     => 'Оваа �татија беше избришана. Причината за бришењето е наведена подолу,
 заедно �о информации за кори�никот кој ја уредувал �траницата пред бришењето. Целиот тек�т
 од избришаните верзии е до�тапен �амо за админи�траторите.',
+'undelete-revision'          => 'Избришана ревизија на $1 (од $4, во $5) уредувач $3:',
 'undeleterevision-missing'   => 'Грешна или непо�тоечка ревизија.
 Можеби имате лоша вр�ка, ревизијата била обновена или избришана од архивата.',
 'undelete-nodiff'            => '�е по�тои по�тара ревизија.',
 'undeletebtn'                => 'Обнови',
 'undeletelink'               => 'врати',
 'undeletereset'              => 'Ре�етирај',
+'undeleteinvert'             => 'Инверзна �елекција',
 'undeletecomment'            => 'Коментар:',
 'undeletedarticle'           => 'обновена "[[$1]]"',
 'undeletedrevisions'         => '{{PLURAL:$1|1 измена е обновена|$1 измени �е обновени}}',
@@ -1729,26 +2117,28 @@ $1',
 'blanknamespace' => '(Главен)',
 
 # Contributions
-'contributions' => 'Кори�нички придоне�и',
-'mycontris'     => 'Мои придоне�и',
-'contribsub2'   => 'За $1 ($2)',
-'nocontribs'    => '�е �е пронајдени промени што одговараат на овој критериум.',
-'uctop'         => ' (врв)',
-'month'         => 'Од ме�ец (и порано):',
-'year'          => 'Од година (и порано):',
-
-'sp-contributions-newbies'     => 'Прикажи придоне�и �амо на нови кори�ници',
-'sp-contributions-newbies-sub' => 'За нови кори�нички �метки',
-'sp-contributions-blocklog'    => 'Дневник на блокирања',
-'sp-contributions-search'      => 'Пребарување на придоне�и',
-'sp-contributions-username'    => 'IP адре�а или кори�ничко име:',
-'sp-contributions-submit'      => 'Пребарај',
+'contributions'       => 'Кори�нички придоне�и',
+'contributions-title' => 'Кори�нички придоне�и за $1',
+'mycontris'           => 'Мои придоне�и',
+'contribsub2'         => 'За $1 ($2)',
+'nocontribs'          => '�е �е пронајдени промени што одговараат на овој критериум.',
+'uctop'               => ' (врв)',
+'month'               => 'Од ме�ец (и порано):',
+'year'                => 'Од година (и порано):',
+
+'sp-contributions-newbies'       => 'Прикажи придоне�и �амо на нови кори�ници',
+'sp-contributions-newbies-sub'   => 'За нови кори�нички �метки',
+'sp-contributions-newbies-title' => 'Придоне�и на нови кори�ници',
+'sp-contributions-blocklog'      => 'Дневник на блокирања',
+'sp-contributions-search'        => 'Пребарување на придоне�и',
+'sp-contributions-username'      => 'IP адре�а или кори�ничко име:',
+'sp-contributions-submit'        => 'Пребарај',
 
 # What links here
 'whatlinkshere'            => 'Што води овде',
 'whatlinkshere-title'      => 'Страници �о вр�ки што водат до "$1"',
 'whatlinkshere-page'       => 'Страница:',
-'linklistsub'              => '(Ли�та на вр�ки)',
+'whatlinkshere-backlink'   => '� $1',
 'linkshere'                => "Следните �траници имаат вр�ка до '''[[:$1]]''':",
 'nolinkshere'              => "�ема �траници �о вр�ка кон '''[[:$1]]'''.",
 'nolinkshere-ns'           => "�ема �траници �о вр�ка кон '''[[:$1]]''' во избраниот имен�ки про�тор.",
@@ -1784,7 +2174,7 @@ $1',
 ** �авредување на други кори�ници
 ** �еприфатливо кори�ничко име',
 'ipbanononly'                     => 'Блокирај �амо анонимни кори�ници',
-'ipbcreateaccount'                => 'Оневозможи креирање кори�нички �метки',
+'ipbcreateaccount'                => 'Оневозможи �оздавање кори�нички �метки',
 'ipbemailban'                     => 'Оневозможи го кори�никот да праќа е-пошта',
 'ipbenableautoblock'              => '�втомат�ки блокирај ја по�ледната IP адре�а што ја кори�тел кори�никот и �ите понатамошни адре�и од кои ќе �е обиде да уредува',
 'ipbsubmit'                       => 'Блокирај го овој кори�ник',
@@ -1794,6 +2184,8 @@ $1',
 'ipbotherreason'                  => 'Друга, дополнителна причина:',
 'ipbhidename'                     => 'Сокриј го кори�ничкото име во дневникот на блокирања, активната ли�та на блокирања и ли�тата на кори�ници',
 'ipbwatchuser'                    => '�абљудувај ја кори�ничката �траница и �траницата за разговор на овој кори�ник',
+'ipballowusertalk'                => 'Овозможи овој кори�ник да ја уредува �војата �траница за разговор додека е блокиран',
+'ipb-change-block'                => 'Повторно блокирај го кори�никот �о овие нагодувања',
 'badipaddress'                    => '�евалидна IP адре�а',
 'blockipsuccesssub'               => 'У�пешно блокирање',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] беше блокиран.<br />
@@ -1803,14 +2195,18 @@ $1',
 'ipb-unblock'                     => 'Одблокирај кори�ник или  IP адре�а',
 'ipb-blocklist-addr'              => '�ктивни блокирања за $1',
 'ipb-blocklist'                   => 'Преглед на активни блокирања',
+'ipb-blocklist-contribs'          => 'Придоне�и на $1',
 'unblockip'                       => 'Деблокирај кори�ник',
 'unblockiptext'                   => 'Кори�тете го долниот формулар да го обновите правото на пишување на претходно блокирана IP адре�а или кори�ничко име.',
-'ipusubmit'                       => 'Деблокирај ја оваа адре�а',
+'ipusubmit'                       => 'Избриши го ова блокирање',
 'unblocked'                       => '[[User:$1|$1]] беше деблокиран',
 'unblocked-id'                    => 'Блокирањето $1 беше от�трането',
 'ipblocklist'                     => 'Блокирани IP адре�и и кори�нички имиња',
 'ipblocklist-legend'              => '�ајди блокиран кори�ник',
 'ipblocklist-username'            => 'Кори�ничко име или IP адре�а:',
+'ipblocklist-sh-userblocks'       => '$1 блокирани кори�нички �метки',
+'ipblocklist-sh-tempblocks'       => '$1 привремени блокирања',
+'ipblocklist-sh-addressblocks'    => '$1 блокирани поединечни IP адре�и',
 'ipblocklist-submit'              => 'Пребарај',
 'blocklistline'                   => '$1, $2 го блокираше $3 ($4)',
 'infiniteblock'                   => 'бе�конечно',
@@ -1819,15 +2215,19 @@ $1',
 'noautoblockblock'                => 'оневозможено автоблокирање',
 'createaccountblock'              => 'блокирано креирање �метки',
 'emailblock'                      => 'блокирана е-пошта',
+'blocklist-nousertalk'            => 'без можно�т за уредување на �војата �траница за разговор',
 'ipblocklist-empty'               => 'Ли�тата на блокирања е празна.',
 'ipblocklist-no-results'          => 'Бараната IP адре�а или кори�ничка �метка не е блокирана.',
 'blocklink'                       => 'блокирај',
 'unblocklink'                     => 'деблокирај',
+'change-blocklink'                => 'промена на блок',
 'contribslink'                    => 'придоне�и',
 'autoblocker'                     => '�втомат�ки �те блокирани бидејќи вашата IP адре�а била �коро кори�тена од "[[User:$1|$1]]".
 Причината за блокирање на $1 била: "$2"',
 'blocklogpage'                    => 'Дневник на блокирања',
+'blocklog-fulllog'                => 'Комплетен дневник на блокирања',
 'blocklogentry'                   => 'блокирано [[$1]] �о рок на и�текување до $2, $3',
+'reblock-logentry'                => 'променети нагодувања за блокирање на [[$1]] �о рок на и�текување од $2 $3',
 'blocklogtext'                    => 'Ова е дневник на акции за блокирање и деблокирање, на овој кори�ник.
 �втомат�ки блокираните IP адре�и не �е наведени.
 Видете [[Special:IPBlockList|ли�тата на блокирани IP адре�и]] за ли�та на тековни забрани и блокирања.',
@@ -1836,11 +2236,14 @@ $1',
 'block-log-flags-nocreate'        => 'оневозможено креирање на кори�нички �метки',
 'block-log-flags-noautoblock'     => 'автоблокирање и�клучено',
 'block-log-flags-noemail'         => 'блокирана е-поштен�ка адре�а',
+'block-log-flags-nousertalk'      => 'без можно�т за уредување на �војата �траница за разговор',
 'block-log-flags-angry-autoblock' => 'овозможено проширено автоблокирање',
 'range_block_disabled'            => '�дмини�тратор�ката можно�т да блокираат IP групи е и�клучена.',
 'ipb_expiry_invalid'              => 'Погрешен рок на и�текување.',
 'ipb_expiry_temp'                 => 'Скриените блокирања на кори�никот мора да бидат перманентни.',
 'ipb_already_blocked'             => '„$1“ е веќе блокиран',
+'ipb-needreblock'                 => '== Веќе блокиран ==
+$1 е веќе блокиран. Дали �акате да направите промена?',
 'ipb_cant_unblock'                => 'Грешка: Блокирањето $1 не по�тои. 
 Можеби веќе е одблокиран.',
 'ipb_blocked_as_range'            => 'Грешка: IP адре�ата $1 не е директно блокирана и не може да �е деблокира.
@@ -1856,6 +2259,7 @@ $1',
 'sorbsreason'                     => 'Вашата IP адре�а е запишана како отворен прок�и во DNSBL кој го кори�ти {{SITENAME}}..',
 'sorbs_create_account_reason'     => 'Вашата IP адре�а е наведена како отворен прок�и во DNSBL кори�тена од {{SITENAME}}.
 �е можете да креирате кори�ничка �метка.',
+'cant-block-while-blocked'        => '�е можете да блокирате други кори�ници додека и вие �амите �те блокирани.',
 
 # Developer tools
 'lockdb'              => 'Заклучи база на податоци',
@@ -1879,10 +2283,10 @@ $1',
 'databasenotlocked'   => 'Базата не е заклучена.',
 
 # Move page
-'move-page'               => 'Преме�ти $1',
-'move-page-backlink'      => '� $1',
-'move-page-legend'        => 'Преме�ти �траница',
-'movepagetext'            => "Со кори�тењето на овој формулар можете да преименувате �траница, преме�тувајќи ја целата нејзина и�торија под ново име. 
+'move-page'                    => 'Преме�ти $1',
+'move-page-backlink'           => '� $1',
+'move-page-legend'             => 'Преме�ти �траница',
+'movepagetext'                 => "Со кори�тењето на овој формулар можете да преименувате �траница, преме�тувајќи ја целата нејзина и�торија под ново име. 
 Стариот на�лов ќе �тане �траница за прена�очување кон новиот на�лов.
 �втомат�ки можете да ги ажурирате прена�очувањата кои покажуваат кон првобитниот на�лов.
 �ко не изберете автомат�ко ажурирање, проверете на [[Special:DoubleRedirects|двојни]] или [[Special:BrokenRedirects|прекинати прена�очувања]].
@@ -1893,51 +2297,63 @@ $1',
 '''ПРЕДУПРЕДУВ�ЊЕ!'''
 Ова може да биде дра�тична и неочекувана промена за популарна �траница;
 о�игурајте �е дека �те ги разбрале по�ледиците од ова пред да продолжите.",
-'movepagetalktext'        => 'Соодветната �траница за разговор, доколку по�тои, ќе биде автомат�ки преме�тена заедно �о неа, о�вен ако:
+'movepagetalktext'             => 'Соодветната �траница за разговор, доколку по�тои, ќе биде автомат�ки преме�тена заедно �о неа, о�вен ако:
 *�епразна �траница за разговор веќе по�тои за новиот на�лов, или
 *�е �те го одштиклирале долното поле. 
 
 Во тие �лучаи, вие ќе треба да ја преме�тите или �поите �траницата рачно, доколку �акате.',
-'movearticle'             => 'Преме�ти �траница:',
-'movenotallowed'          => '�емате доволно привилегии за преме�тување на �траници.',
-'newtitle'                => 'Кон новиот на�лов:',
-'move-watch'              => '�абљудувај ја оваа �траница',
-'movepagebtn'             => 'Преме�ти �траница',
-'pagemovedsub'            => 'У�пешно преме�тување',
-'movepage-moved'          => '<big>\'\'\'"$1" беше преме�тена во "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Страница �о тоа име веќе по�тои или името што го избравте не е валидно.
-Ве молиме изберете друго име.',
-'cantmove-titleprotected' => '�е може да ја преме�тите �траницата на таа локација бидејќи има забрана за креирање на �траница �о нов на�лов како што наведовте.',
-'talkexists'              => "'''Самата �траница беше преме�тена у�пешно, но �траницата за разговор не можеше да биде преме�тена бидејќи веќе по�тои таква на новиот на�лов. 
+'movearticle'                  => 'Преме�ти �траница:',
+'movenologin'                  => '�е �те најавени',
+'movenologintext'              => 'Мора да бидете реги�триран кори�ник и [[Special:UserLogin|најавен]] за да преме�тите �траница.',
+'movenotallowed'               => '�емате доволно привилегии за преме�тување на �траници.',
+'movenotallowedfile'           => '�емате перми�ии за преме�тување податотеки.',
+'cant-move-user-page'          => '�емате перми�ии за преме�тување на о�новни кори�нички �траници (одделно од под�траници).',
+'cant-move-to-user-page'       => '�емате перми�ии за преме�тување на �траница во ваша кори�ничка �траница (о�вен во кори�ничка под�траница)',
+'newtitle'                     => 'Кон новиот на�лов:',
+'move-watch'                   => '�абљудувај ја оваа �траница',
+'movepagebtn'                  => 'Преме�ти �траница',
+'pagemovedsub'                 => 'У�пешно преме�тување',
+'movepage-moved'               => '<big>\'\'\'"$1" беше преме�тена во "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Беше креирано прена�очување.',
+'movepage-moved-noredirect'    => 'Креирањето на прена�очување е и�клучено.',
+'articleexists'                => 'Страница �о тоа име веќе по�тои или името што го избравте не е валидно.
+Изберете друго име.',
+'cantmove-titleprotected'      => '�е може да ја преме�тите �траницата на таа локација бидејќи има забрана за креирање на �траница �о нов на�лов како што наведовте.',
+'talkexists'                   => "'''Самата �траница беше преме�тена у�пешно, но �траницата за разговор не можеше да биде преме�тена бидејќи веќе по�тои таква на новиот на�лов. 
 Ве молиме �појте ги рачно.'''",
-'movedto'                 => 'преме�тена како',
-'movetalk'                => 'Преме�ти ја и �траницата за разговор, ако е возможно.',
-'move-subpages'           => 'Преме�ти ги �ите под�траници, ако е можно',
-'move-talk-subpages'      => 'Преме�ти ги �ите под�траници и �траници за разговор, ако е можно',
-'movepage-page-exists'    => 'Страницата $1 веќе по�тои и не може автомат�ки да биде заменета.',
-'movepage-page-moved'     => 'Страницата $1 беше преме�тена како $2.',
-'movepage-page-unmoved'   => 'Страницата $1 не може да биде преме�тена во $2.',
-'movepage-max-pages'      => 'Мак�имално $1 {{PLURAL:$1|�траница|�траници}} беа преме�тени, повеќе не може да бидат автомат�ки преме�тени.',
-'1movedto2'               => '[[$1]] преме�тена како [[$2]]',
-'1movedto2_redir'         => '[[$1]] преме�тена како [[$2]] преку прена�очување',
-'movelogpage'             => 'Дневник на преме�тувања',
-'movelogpagetext'         => 'Подолу е ли�та на преме�тени �траници.',
-'movereason'              => 'Причина:',
-'revertmove'              => 'врати',
-'delete_and_move'         => 'Избриши и преме�ти',
-'delete_and_move_text'    => '==Потребно бришење== 
+'movedto'                      => 'преме�тена како',
+'movetalk'                     => 'Преме�ти ја и �траницата за разговор, ако е возможно.',
+'move-subpages'                => 'Преме�ти ги �ите под�траници, ако е можно',
+'move-talk-subpages'           => 'Преме�ти ги �ите под�траници и �траници за разговор, ако е можно',
+'movepage-page-exists'         => 'Страницата $1 веќе по�тои и не може автомат�ки да биде заменета.',
+'movepage-page-moved'          => 'Страницата $1 беше преме�тена како $2.',
+'movepage-page-unmoved'        => 'Страницата $1 не може да биде преме�тена во $2.',
+'movepage-max-pages'           => 'Мак�имално $1 {{PLURAL:$1|�траница|�траници}} беа преме�тени, повеќе не може да бидат автомат�ки преме�тени.',
+'1movedto2'                    => '[[$1]] преме�тена како [[$2]]',
+'1movedto2_redir'              => '[[$1]] преме�тена како [[$2]] преку прена�очување',
+'move-redirect-suppressed'     => 'и�клучено прена�очување',
+'movelogpage'                  => 'Дневник на преме�тувања',
+'movelogpagetext'              => 'Подолу е ли�та на преме�тени �траници.',
+'movereason'                   => 'Причина:',
+'revertmove'                   => 'врати',
+'delete_and_move'              => 'Избриши и преме�ти',
+'delete_and_move_text'         => '==Потребно бришење== 
 Целната �татија "[[:$1]]" веќе по�тои. 
 Дали �акате да ја избришете за да о�лободите ме�то за преме�тувањето?',
-'delete_and_move_confirm' => 'Да, избриши ја �траницата',
-'delete_and_move_reason'  => 'Избришано за да �е о�лободи ме�то за преме�тувањето',
-'selfmove'                => 'Страницата не може да биде преме�тена бидејќи целниот на�лов �е �овпаѓа �о првобитниот на�лов;
+'delete_and_move_confirm'      => 'Да, избриши ја �траницата',
+'delete_and_move_reason'       => 'Избришано за да �е о�лободи ме�то за преме�тувањето',
+'selfmove'                     => 'Страницата не може да биде преме�тена бидејќи целниот на�лов �е �овпаѓа �о првобитниот на�лов;
 не може да �е преме�ти �траница во �амата �ебе.',
-'immobile_namespace'      => 'Изворниот или целниот на�лов е од �пецијален тип; 
-не може да �е преме�туваат �траници во тој имен�ки про�тор.',
-'imagenocrossnamespace'   => '�е може да �е преме�ти податотека во неподатотечен имен�ки про�тор',
-'imagetypemismatch'       => '�овата на�тавка на податотеката не �оодвет�твува на нејзиниот тип',
-'imageinvalidfilename'    => 'Целниот на�лов на податотеката е невалиден',
-'fix-double-redirects'    => '�журирајте ги �ите прена�очувања кои покажуваат на првобитниот на�лов',
+'immobile-source-namespace'    => '�е може да �е преме�туваат �траници во имен�киот про�тор "$1"',
+'immobile-target-namespace'    => '�е може да �е преме�туваат �траници во имен�киот про�тор "$1"',
+'immobile-target-namespace-iw' => 'Интервики вр�ка не е валидна цел за преме�тување на �траница.',
+'immobile-source-page'         => 'Оваа �траница не може да �е преме�тува.',
+'immobile-target-page'         => '�е може да �е преме�ти под бараниот на�лов.',
+'imagenocrossnamespace'        => '�е може да �е преме�ти податотека во неподатотечен имен�ки про�тор',
+'imagetypemismatch'            => '�овата на�тавка на податотеката не �оодвет�твува на нејзиниот тип',
+'imageinvalidfilename'         => 'Целниот на�лов на податотеката е невалиден',
+'fix-double-redirects'         => '�журирајте ги �ите прена�очувања кои покажуваат на првобитниот на�лов',
+'move-leave-redirect'          => '�аправи прена�очување',
 
 # Export
 'export'            => 'Извезување на �траници',
@@ -1946,7 +2362,7 @@ $1',
 
 За извезување на �траници, вне�ете ги на�ловите во полето прикажано подолу, еден на�лов на �татија во ред, потоа изберете дали �акате да ја извезете �амо по�ледната ревизија или и �ите по�тари ревизии.
 
-�ко ја �акате �амо тековната верзија, би можеле да и�кори�тите вр�ка од видот [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] за �траницата "[[{{MediaWiki:Mainpage}}]]".',
+�ко ја �акате �амо тековната верзија, би можеле да и�кори�тите вр�ка од видот [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] за �траницата "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Вклучи ја �амо тековната верзија, не цело�ната и�торија',
 'exportnohistory'   => "----
 '''Забелешка:''' извезувањето на целата и�торија на �траниците преку овој формулар е оневозможено заради подобри перформан�и.",
@@ -1969,7 +2385,7 @@ $1',
 
 # Thumbnails
 'thumbnail-more'           => 'Зголеми',
-'filemissing'              => 'Датотеката недо�та�ува',
+'filemissing'              => '�едо�та�ува податотека',
 'thumbnail_error'          => 'Грешка во креирањето на мини-�лика: $1',
 'djvu_page_error'          => '�едо�тапна DjVu �траница',
 'djvu_no_xml'              => '�е е можно да �е излачи XML за DjVu податотеки',
@@ -1982,9 +2398,12 @@ $1',
 'import-interwiki-text'      => 'Избери вики и на�лов на �траница за увоз.
 Датумите и имињата на уредувачите ќе бидат зачувани.
 Сите тран�вики акции за увоз �е запишуваат во [[Special:Log/import|дневникот на увезувања]].',
+'import-interwiki-source'    => 'Извор вики/�траница:',
 'import-interwiki-history'   => 'Копирај ги �ите по�тари верзии за оваа �траница',
 'import-interwiki-submit'    => 'Увези',
 'import-interwiki-namespace' => 'Целен имен�ки про�тор:',
+'import-upload-filename'     => 'Име на податотека:',
+'import-comment'             => 'Коментар:',
 'importtext'                 => 'Извезете ја податотеката од изворното вики �о кори�тење на [[Special:Export|алатката за извоз]].
 Зачувајте ја на вашиот ди�к и подигнете ја овде.',
 'importstart'                => 'Увоз на �траници...',
@@ -1992,14 +2411,14 @@ $1',
 'importnopages'              => '�ема �траници за увоз.',
 'importfailed'               => '�еу�пешно вне�ување: $1',
 'importunknownsource'        => '�епознат тип за вне�ување',
-'importcantopen'             => '�е можеше да �е отвори датотеката за вне�ување',
+'importcantopen'             => '�е може да �е отвори увезената податотека',
 'importbadinterwiki'         => 'Лоша интервики вр�ка',
 'importnotext'               => 'Празно или без тек�т',
 'importsuccess'              => 'Увозот у�пеа!',
 'importhistoryconflict'      => 'По�тои конфликтна и�торија на верзиите (можно е �траницата веќе да била вне�ена)',
 'importnosources'            => '�ема дефинирано тран�вики извори за увезување и директните подигнувања на и�торија �е оневозможени.',
 'importnofile'               => '�ема подигнато увозна податотека.',
-'importuploaderrorsize'      => '�еу�пешно подигнување на увозна податотека .
+'importuploaderrorsize'      => '�еу�пешно подигнување на увозна податотека.
 Големината на податотеката е поголема од допуштената големина.',
 'importuploaderrorpartial'   => '�еу�пешно подигнувањето на увозна податотека.
 Податотеката  е парцијално подигната.',
@@ -2009,7 +2428,7 @@ $1',
 'import-noarticle'           => '�ема �траница за увоз!',
 'import-nonewrevisions'      => 'Сите ревизии �е претходно увезени.',
 'xml-error-string'           => '$1 на линија $2, колона $3 (бајт $4): $5',
-'import-upload'              => 'Подигнување на XML податок',
+'import-upload'              => 'Подигнување на XML податоци',
 'import-token-mismatch'      => 'Губење на �е�и�ките податоци. Обидете �е повторно.',
 'import-invalid-interwiki'   => '�е може да �е увезува од �пецифицираното вики.',
 
@@ -2022,19 +2441,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|ревизија|ревизии}} од $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Мојата кори�ничка �траница',
+'tooltip-pt-userpage'             => 'Вашата кори�ничка �траница',
 'tooltip-pt-anonuserpage'         => 'Кори�ничка �траница за IP адре�ата од која уредувате',
-'tooltip-pt-mytalk'               => 'Мојата �траница за разговор',
+'tooltip-pt-mytalk'               => 'Вашата �траница за разговор',
 'tooltip-pt-anontalk'             => 'Разговор за уредувањата од оваа IP адре�а',
 'tooltip-pt-preferences'          => 'Мои нагодувања',
 'tooltip-pt-watchlist'            => 'Ли�та на �траници кои �те избрале да ги набљудувате.',
-'tooltip-pt-mycontris'            => 'Ли�та на моите придоне�и',
+'tooltip-pt-mycontris'            => 'Ли�та на ваши придоне�и',
 'tooltip-pt-login'                => 'Ве охрабруваме да �е најавите, иако тоа не е задолжително.',
 'tooltip-pt-anonlogin'            => 'Ве охрабруваме да �е најавите, иако тоа не е задолжително.',
 'tooltip-pt-logout'               => 'Одјавете �е',
 'tooltip-ca-talk'                 => 'Разговор за �траницата',
 'tooltip-ca-edit'                 => 'Можете да ја уредите оваа �траница. Ве молиме кори�тете го копчето за преглед пред зачувување.',
-'tooltip-ca-addsection'           => 'Додадете коментар во овој разговор.',
+'tooltip-ca-addsection'           => 'Започни нова �екција',
 'tooltip-ca-viewsource'           => 'Оваа �траница е заштитена. Можете да го видите изворниот код.',
 'tooltip-ca-history'              => 'Претходни верзии на оваа �траница.',
 'tooltip-ca-protect'              => 'Заштитете ја оваа �траница',
@@ -2079,8 +2498,11 @@ $1',
 'tooltip-diff'                    => 'Покажи кои промени ги направи во тек�тот.',
 'tooltip-compareselectedversions' => 'Види разлика помеѓу двете избрани верзии на оваа �траница.',
 'tooltip-watch'                   => 'Додади ја оваа �траница во �војата ли�та на набљудувања',
-'tooltip-recreate'                => 'Повторно креирај ја �траницата иако беше избришана',
+'tooltip-recreate'                => 'Повторно �оздади ја �траницата иако беше избришана',
 'tooltip-upload'                  => 'Започни �о подигнување',
+'tooltip-rollback'                => '„Врати“ ги поништува по�ледните уредувања на оваа �траница �о еден клик до уредувањата на претпо�ледниот придоне�увач',
+'tooltip-undo'                    => '„Откажи“ го поништува ова уредување и отвора прозорец за уредување.
+Дозволува додавање на причина во опи�от',
 
 # Stylesheets
 'common.css'      => '/** CSS кодот на оваа �траница ќе �е примени на �ите ма�ки */',
@@ -2092,6 +2514,8 @@ $1',
 'chick.css'       => '/* CSS кодот по�тавен тука ќе �е рефлектира врз кори�ниците кои одбрале Chick ма�ка */',
 'simple.css'      => '/* CSS кодот по�тавен тука ќе �е рефлектира врз кори�ниците кои одбрале Simple ма�ка */',
 'modern.css'      => '/* CSS кодот по�тавен тука ќе �е рефлектира врз кори�ниците кои одбрале Modern ма�ка */',
+'print.css'       => '/* CSS кодот по�тавен тука ќе �е рефлектира врз �траниците за печатење */',
+'handheld.css'    => '/* CSS кодот по�тавен тука ќе �е рефлектира врз рачните уреди за�новани на ма�ката по�тавена во $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => '/* Било која Јава �крипта пи�тавена овде ќе �е вчита кај �ите кори�ници при �екое вчитување на било која �траница. */',
@@ -2110,12 +2534,12 @@ $1',
 'notacceptable'     => 'Вики �ерверот не може да генерира податоци во формат погоден за вашиот клиент.',
 
 # Attribution
-'anonymous'        => '�нонимен кори�ник од {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|�нонимен кори�ник|�нонимни кори�ници}} на {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} кори�ник $1',
 'lastmodifiedatby' => 'Оваа �траница по�леден пат била модифицирана на $2, $1 од $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'За�новано на придоне�от на $1.',
 'others'           => 'други',
-'siteusers'        => 'кори�ници на {{SITENAME}} $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|кори�ник|кори�ници}} $1',
 'creditspage'      => '�втори на �траницата',
 'nocredits'        => '�е по�тојат податоци за авторите на оваа �траница.',
 
@@ -2136,6 +2560,14 @@ $1',
 'numauthors'     => 'Број на различни автори (�траница): $1',
 'numtalkauthors' => 'Број на различни автори (�траница за разговор): $1',
 
+# Skin names
+'skinname-standard'    => 'Кла�ика',
+'skinname-nostalgia'   => '�о�талгија',
+'skinname-cologneblue' => 'Келн�ко �ино',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'Моја ма�ка',
+'skinname-chick'       => 'Шик',
+
 # Math options
 'mw_math_png'    => 'Секогаш и�цртувај во PNG',
 'mw_math_simple' => 'HTML ако е многу едно�тавно ако не во PNG',
@@ -2156,10 +2588,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '�е можете да ги означите �воите промени како проверени.',
 
 # Patrol log
-'patrol-log-page'   => 'Дневник на патролирања',
-'patrol-log-header' => 'Ова е дневник на патролирани ревизии.',
-'patrol-log-line'   => 'означено $1 од $2 како патролирано $3',
-'patrol-log-auto'   => '(автомат�ки)',
+'patrol-log-page'      => 'Дневник на патролирања',
+'patrol-log-header'    => 'Ова е дневник на патролирани ревизии.',
+'patrol-log-line'      => 'означено $1 од $2 како патролирано $3',
+'patrol-log-auto'      => '(автомат�ки)',
+'patrol-log-diff'      => 'ревизија $1',
+'log-show-hide-patrol' => '$1 дневник на патролирање',
 
 # Image deletion
 'deletedrevision'                 => 'Избришана �тара ревизија $1.',
@@ -2176,6 +2610,9 @@ $1',
 'previousdiff' => '� По�таро уредување',
 'nextdiff'     => 'Поново уредување →',
 
+# Visual comparison
+'visual-comparison' => 'Визуелна �поредба',
+
 # Media information
 'mediawarning'         => "'''Предупредување''': Оваа податотека може да �одржи штетен код, нејзиното извршување може да му наштети на вашиот �и�тем<hr />",
 'imagemaxsize'         => 'Ограничи ги �ликите на нивните опи�ни �траници до:',
@@ -2185,14 +2622,16 @@ $1',
 'file-info'            => '(големина: $1, MIME тип: $2)',
 'file-info-size'       => '($1 × $2 пик�ели, големина: $3, MIME тип: $4)',
 'file-nohires'         => '<small>�е е до�тапна поголема резолуција.</small>',
-'svg-long-desc'        => '(SVG податотека, номинално $1 × $2 пи�ели, големина: $3)',
+'svg-long-desc'        => '(SVG податотека, номинално $1 × $2 пик�ели, големина: $3)',
 'show-big-image'       => 'Ви�тин�ка големина',
 'show-big-image-thumb' => '<small>Големина на овој приказ: $1 × $2 пик�ели</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Галерија на нови податотеки',
 'imagelisttext'         => "Следи ли�та на '''$1''' {{PLURAL:$1|податотека|податотеки}} подредени $2.",
 'newimages-summary'     => 'Оваа �пецијална �траница ги покажува �коро подигнатите податотеки.',
+'newimages-legend'      => 'Филтрирај',
+'newimages-label'       => 'Име на податотека (или дел од името):',
 'showhidebots'          => '($1 ботови)',
 'noimages'              => '�ема ништо.',
 'ilsubmit'              => 'Барај',
@@ -2209,8 +2648,8 @@ $1',
 'bad_image_list' => 'Форматот е �ледниот:
 
 Само набројувањата (редици кои започнуваат �о *) �е земаат во предвид.
-Првата вр�ка во редицата мора да биде вр�ка кон погрешна податотека.
-Сите �ледни вр�ки во и�тата редица �е претпо�тавува дека �е и�клучоци, т.е. �траници каде податотеката може да �е појави inline.',
+Првата вр�ка во редот мора да биде вр�ка кон погрешна податотека.
+Сите �ледни вр�ки во и�тата редица �е претпо�тавува дека �е и�клучоци, т.е. �траници каде податотеката може да �е појави во редицата.',
 
 /*
 Short names for language variants used for language conversion links.
@@ -2253,7 +2692,7 @@ Variants for Chinese language
 
 # Metadata
 'metadata'          => 'Метаподатоци',
-'metadata-help'     => 'Оваа податотека �одржи дополнителни информации, најверојатно додадени од дигитална камера или �кенер кори�тени за нејзино креирање или дигитализација. �ко при тоа податотеката претрпела промени, некои детали може да не �оодвет�твуваат во цело�т по�ле промената на податотеката.',
+'metadata-help'     => 'Оваа податотека �одржи дополнителни информации, најверојатно додадени од дигитална камера или �кенер кори�тени за нејзино �оздавање или дигитализација. �ко при тоа податотеката претрпела промени, некои детали може да не �оодвет�твуваат во цело�т по�ле промената на податотеката.',
 'metadata-expand'   => 'Прикажи проширени информации',
 'metadata-collapse' => 'Сокриј проширени информации',
 'metadata-fields'   => 'EXIF мета полињата прикажани во оваа порака ќе бидат вклучени на �траницата на �ликата кога мета табелата ќе биде затворена.
@@ -2338,7 +2777,7 @@ Variants for Chinese language
 'exif-subjectlocation'             => 'Положба на �убјектот',
 'exif-exposureindex'               => 'Индек� на ек�позицијата',
 'exif-sensingmethod'               => 'Тип на �ензори',
-'exif-filesource'                  => 'Извор на датотеката',
+'exif-filesource'                  => 'Изворна податотека',
 'exif-scenetype'                   => 'Тип на �цена',
 'exif-cfapattern'                  => 'CFA шаблон',
 'exif-customrendered'              => 'Дополнитела обработка на �ликата',
@@ -2456,6 +2895,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ISO �туди�ки волфрам',
 'exif-lightsource-255' => 'Друг �ветло�ен извор',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Блицот не за�ветил',
+'exif-flash-fired-1'    => 'Блицот за�ветил',
+'exif-flash-return-0'   => 'без употреба на функција на �тробо�коп',
+'exif-flash-return-2'   => 'не е детектирано повратно �ветло од �тробо�копот',
+'exif-flash-return-3'   => 'детектирано повратно �ветло од �тробо�коп',
+'exif-flash-mode-1'     => 'активиран е блиц',
+'exif-flash-mode-2'     => 'и�клучен блиц',
+'exif-flash-mode-3'     => 'автомат�ки начин',
+'exif-flash-function-1' => '�ема функција за блиц',
+'exif-flash-redeye-1'   => 'режим на редукција на црвено-око',
+
 'exif-focalplaneresolutionunit-2' => 'инчи',
 
 'exif-sensingmethod-1' => '�едефинирано',
@@ -2602,25 +3053,14 @@ $1
 'confirmrecreate'     => "Кори�никот [[User:$1|$1]] ([[User talk:$1|разговор]]) ја избриша оваа �траница откако вие почнавте �о уредување заради:
 : ''$2''
 Потврдете дека нави�тина �акате повторно да ја креирате оваа �траница.",
-'recreate'            => 'Повторно креирај',
+'recreate'            => 'Повторно �оздади',
 
 'unit-pixel' => 'px',
 
-# HTML dump
-'redirectingto' => 'Прена�очувам на [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Да �е и�чи�ти кешот на оваа �траница?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Барам �татии што �одржат ''$1''.",
-'searchnamed'      => "Статии �о име: ''$1''.",
-'articletitles'    => "Статии кои почнуваат �о ''$1''",
-'hideresults'      => 'Сокриј резултати',
-'useajaxsearch'    => 'Кори�ти AJAX пребарување',
+'confirm-purge-top'    => 'И�чи�ти го кешот на оваа �траница?',
+'confirm-purge-bottom' => 'Со оваа операција �е чи�ти �ервер�киот кеш и �е прикажува најновата верзија.',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; претходна �траница',
@@ -2640,10 +3080,10 @@ $1',
 'table_pager_empty'        => '�ема резултати',
 
 # Auto-summaries
-'autosumm-blank'   => 'Ја бришам целата �одржина на �траницата',
+'autosumm-blank'   => 'Цело�но избришана �траница',
 'autosumm-replace' => "Ја заменувам �траницата �о '$1'",
 'autoredircomment' => 'Прена�очување кон [[$1]]',
-'autosumm-new'     => '�ова �траница: $1',
+'autosumm-new'     => 'Креирана �траница �о: $1',
 
 # Size units
 'size-bytes'     => '$1 B',
@@ -2694,6 +3134,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '�епознат приврзок на проширување "$1"',
+'duplicate-defaultsort' => 'Предупредување: О�новниот клуч за подредување "$2" го поништува претходниот о�новен клуч за подредување "$1".',
 
 # Special:Version
 'version'                          => 'Верзија', # Not used as normal message but as header for the special page itself
@@ -2704,7 +3145,7 @@ $1',
 'version-other'                    => 'Друго',
 'version-mediahandlers'            => 'Медија ракувачи',
 'version-hooks'                    => 'Куки',
-'version-extension-functions'      => 'Функции на проширувањето',
+'version-extension-functions'      => 'Функции на проширувања',
 'version-parser-extensiontags'     => 'Приврзоци на пар�ер проширување',
 'version-parser-function-hooks'    => 'Куки на пар�ер функција',
 'version-skin-extension-functions' => 'Функции на проширување на изглед',
@@ -2723,13 +3164,13 @@ $1',
 'filepath-summary' => 'Оваа �пецијална �траница го враќа цело�ниот пат на податотеката.
 Сликите �е прикажани во оригинална големина, другите типови на податотеки �е отвораат �о �оодветно а�оцираните програми, директно.
 
-Вне�ете го името на податотеката без префик�от "{{ns:image}}:".',
+Вне�ете го името на податотеката без префик�от "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Барање на дупликат податотеки',
 'fileduplicatesearch-summary'  => 'Пребарување на дуплирани податотеки врз база на нивната hash вредно�т.
 
-Вне�ете име на податотека без префик�от "{{ns:image}}:".',
+Вне�ете име на податотека без префик�от "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Барање на дупликат',
 'fileduplicatesearch-filename' => 'Име на податотека:',
 'fileduplicatesearch-submit'   => 'Барај',
@@ -2759,4 +3200,13 @@ $1',
 'blankpage'              => 'Празна �траница',
 'intentionallyblankpage' => 'Оваа �траница намерно е о�тавена празна',
 
+# External image whitelist
+'external_image_whitelist' => ' #О�тави го овој ред точно каков што е<pre>
+#Put regular expression fragments (just the part that goes between the //) below
+#These will be matched with the URLs of external (hotlinked) images
+#Those that match will be displayed as images, otherwise only a link to the image will be shown
+#Lines beginning with # are treated as comments
+
+#Put all regex fragments above this line. Leave this line exactly as it is</pre>',
+
 );
diff --git a/languages/messages/MessagesMl.php b/languages/messages/MessagesMl.php
index 2de0b25a..91bbac2e 100644
--- a/languages/messages/MessagesMl.php
+++ b/languages/messages/MessagesMl.php
@@ -16,6 +16,7 @@
  * @author Sadik Khalid <sadik.khalid@gmail.com>
  * @author Shiju Alex <shijualexonline@gmail.com>
  * @author Shijualex
+ * @author Vssun
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @author לערי ריינה�רט
  */
@@ -29,8 +30,8 @@ $namespaceNames = array(
 	NS_USER_TALK => 'ഉപയോക�താവിന�റെ_സംവാദം',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK => '$1_സംവാദം',
-	NS_IMAGE => 'ചിത�രം',
-	NS_IMAGE_TALK => 'ചിത�രത�തിന�റെ_സംവാദം',
+	NS_FILE => 'ചിത�രം',
+	NS_FILE_TALK => 'ചിത�രത�തിന�റെ_സംവാദം',
 	NS_MEDIAWIKI => 'മീഡിയവിക�കി',
 	NS_MEDIAWIKI_TALK => 'മീഡിയവിക�കി_സംവാദം',
 	NS_TEMPLATE => 'ഫലകം',
@@ -42,18 +43,20 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	"à´…à´‚à´—à´‚" 			=> NS_USER,
-	"അംഗങ�ങള�ടെ സംവാദം" 		=> NS_USER_TALK,
+	'à´…à´‚à´—à´‚' => NS_USER,
+	'à´‰' => NS_USER,
+	'അംഗങ�ങള�ടെ സംവാദം' => NS_USER_TALK,
+	'ഉസം' => NS_USER_TALK,
+	'à´šà´¿' => NS_FILE,
+	'ചിസം' => NS_FILE_TALK,
+	'à´«' => NS_TEMPLATE,
+	'ഫസം' => NS_TEMPLATE_TALK,
+	'വി' => NS_CATEGORY,
+	'വിസം' => NS_CATEGORY_TALK,
+	'à´¸' => NS_HELP,
+	'സസം' => NS_HELP_TALK,
 );
 
-$skinNames = array(
-	'standard'      => 'സാര��വത�രികം',
-	'simple'        => 'ലളിതം',
-	'nostalgia'     => 'ഗൃഹാത�രത�വം',
-	'cologneblue'   => 'ക�ലോണ�� നീല',
-	'monobook'      => 'മോണോബ�ക�ക�',
-	'chick'         => 'സ�ന�ദരി',
-);
 
 /**
  * Magic words
@@ -212,16 +215,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'ഞാന�� ശ�രദ�ധിക�ക�ന�ന താള�കള�ടെ പട�ടികയില��നിന�ന� എന�റെ തിര�ത�തല�കള�� മറയ�ക�ക�ക',
 'tog-watchlisthidebots'       => 'ഞാന�� ശ�രദ�ധിക�ക�ന�ന താള�കള�ടെ പട�ടികയില��നിന�ന� യന�ത�രങ�ങള�� വര�ത�തിയ തിര�ത�തല�കള�� മറയ�ക�ക�ക',
 'tog-watchlisthideminor'      => 'ഞാന�� ശ�രദ�ധിക�ക�ന�ന താള�കള�ടെ പട�ടികയില��നിന�ന� ചെറ�തിര�ത�തല�കള�� മറയ�ക�ക�ക',
+'tog-watchlisthideliu'        => 'ഞാന�� ശ�രദ�ധിക�ക�ന�ന താള�കളിലെ മാറ�റങ�ങളില�� നിന�ന�ം ലോഗിന�� ചെയ�തിട�ട�ള�ളവര�ടെ തിര�ത�തല�കള�� മറയ�ക�ക�ക',
+'tog-watchlisthideanons'      => 'ഞാന�� ശ�രദ�ധിക�ക�ന�ന താള�കളിലെ മാറ�റങ�ങളില�� നിന�ന�ം അജ�ഞാത ഉപയോക�താക�കള�ടെ തിര�ത�ത�കള�� മറയ�ക�ക�ക',
 'tog-ccmeonemails'            => 'ഞാന�� മറ�റ�ള�ളവര��ക�കയക�ക�ന�ന ഈമെയില�കള�ടെ ഒര� പകര��പ�പ� എനിക�ക�ം അയക�ക�ക',
 'tog-diffonly'                => 'രണ�ട� പതിപ�പ�കള�� തമ�മില�ള�ള വ�യത�യാസത�തിന� താഴെ താളിന�റെ ഉള�ളടക�കം കാണിക�കര�ത�.',
 'tog-showhiddencats'          => 'മറഞ�ഞിരിക�ക�ന�ന വിഭാഗങ�ങളെ കാണിക�ക�ക',
+'tog-norollbackdiff'          => 'റോള��ബാക�കിന� ശേഷം വ�യത�യാസം കാണിക�കാതിരിക�ക�ക',
 
 'underline-always'  => 'എല�ലായ�പ�പോഴ�ം',
 'underline-never'   => 'ഒരിക�കല�ം അര�ത�',
 'underline-default' => 'ബ�രൗസറിലേത� പോലെ',
 
-'skinpreview' => '(പ�രിവ�യൂ)',
-
 # Dates
 'sunday'        => 'ഞായര��',
 'monday'        => 'തിങ�കള��',
@@ -275,12 +279,12 @@ $messages = array(
 'dec'           => 'ഡിസം.',
 
 # Categories related messages
-'pagecategories'                 => '{{PLURAL:$1|വിഭാഗം|വിഭാഗങ�ങള��}}',
+'pagecategories'                 => '{{PLURAL:$1|വര��ഗ�ഗം|വര��ഗ�ഗങ�ങള��}}',
 'category_header'                => '"$1" എന�ന വിഭാഗത�തിലെ താള�കള��',
 'subcategories'                  => 'ഉപവിഭാഗങ�ങള��',
 'category-media-header'          => '"$1" എന�ന വിഭാഗത�തിലെ പ�രമാണങ�ങള��',
 'category-empty'                 => "''ഈ വിഭാഗത�തില�� താള�കളോ പ�രമാണങ�ങളോ ഇല�ല.''",
-'hidden-categories'              => '{{PLURAL:$1|മറഞ�ഞിരിക�ക�ന�ന വിഭാഗം|മറഞ�ഞിരിക�ക�ന�ന വിഭാഗങ�ങള��}}',
+'hidden-categories'              => '{{PLURAL:$1|മറഞ�ഞിരിക�ക�ന�ന വര��ഗ�ഗം|മറഞ�ഞിരിക�ക�ന�ന വര��ഗ�ഗങ�ങള��}}',
 'hidden-category-category'       => 'മറഞ�ഞിരിക�ക�ന�ന വിഭാഗങ�ങള��', # Name of the category where hidden categories will be listed
 'category-subcat-count'          => '{{PLURAL:$2|ഈ വിഭാഗത�തില�� താഴെ പ�രദര��ശിപ�പിച�ചിരിക�ക�ന�ന ഒര� ഉപവിഭാഗം മാത�രമേ ഉള�ളൂ.|മൊത�തം $2 ഉപവിഭാഗങ�ങള�� ഉള�ളതില��  ഈ വിഭാഗത�തില�� താഴെ പ�രദര��ശിപ�പിച�ചിരിക�ക�ന�ന {{PLURAL:$1|ഉപവിഭാഗം|$1 ഉപവിഭാഗങ�ങള��}} ആണ�‌ ഉള�ളത�.}}',
 'category-subcat-count-limited'  => 'ഈ വിഭാഗത�തിന� താഴെ കാണ�ന�ന {{PLURAL:$1|ഉപവിഭാഗമ�ണ�ട�|$1 ഉപവിഭാഗങ�ങള�ണ�ട�}}.',
@@ -314,7 +318,7 @@ $messages = array(
 'mytalk'         => 'എന�റെ സംവാദവേദി',
 'anontalk'       => 'ഈ �പിയ�ടെ സം‌വാദം താള��',
 'navigation'     => 'ഉള�ളടക�കം',
-'and'            => 'ഉം',
+'and'            => '&#32;ഉം',
 
 # Metadata in edit box
 'metadata_help' => 'മെറ�റാഡാറ�റ:',
@@ -362,7 +366,7 @@ $messages = array(
 'mediawikipage'     => 'സന�ദേശങ�ങള�ടെ താള�� കാണ�ക',
 'templatepage'      => 'ഫലകം താള�� കാണ�ക',
 'viewhelppage'      => 'സഹായം താള�� കാണ�ക',
-'categorypage'      => 'വിഭാഗം താള�� കാണ�ക',
+'categorypage'      => 'വര��ഗ�ഗം താള�� കാണ�ക',
 'viewtalkpage'      => 'സം‌വാദം കാണ�ക',
 'otherlanguages'    => 'ഇതര ഭാഷകളില��',
 'redirectedfrom'    => '($1-ല�� നിന�ന�ം തിരിച�ച� വിട�ടത� പ�രകാരം)',
@@ -377,8 +381,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} സം‌രംഭത�തെക�ക�റിച�ച�',
 'aboutpage'            => 'Project:വിവരണം',
-'bugreports'           => 'ബഗ� റിപ�പോര��ട�ട�കള��',
-'bugreportspage'       => 'Project:ബഗ� റിപ�പോര��ട�ട�കള��',
 'copyright'            => 'ഉള�ളടക�കം $1 പ�രകാരം ലഭ�യം.',
 'copyrightpagename'    => '{{SITENAME}} പകര��പ�പവകാശം',
 'copyrightpage'        => '{{ns:project}}:പകര��പ�പവകാശം',
@@ -401,9 +403,7 @@ $messages = array(
 
 'badaccess'        => 'അന�മതിപ�രശ�നം',
 'badaccess-group0' => 'താങ�കള�� ആവശ�യപ�പെട�ട കാര�യം ചെയ�യാന�ള�ള അന�മതി താങ�കള��ക�കില�ല',
-'badaccess-group1' => 'താങ�കള�� ആവശ�യപ�പെട�ട കാര�യം ചെയ�യാന�� $1 ഗ�രൂപ�പില�� പെട�ടവര��ക�ക� മാതമേ സാധിക�കൂ',
-'badaccess-group2' => 'താങ�കള�� ആവശ�യപ�പെട�ട കാര�യം ചെയ�യാന�� $1 ഗ�രൂപ�പ�കളില�� �തെങ�കില�ം ഒന�നിലെ അംഗങ�ങള��ക�ക� മാത�രമേ സാധിക�കൂ',
-'badaccess-groups' => 'താങ�കള�� ആവശ�യപ�പെട�ട കാര�യം ചെയ�യാന�� $1 ഗ�രൂപ�പ�കളില�� �തെങ�കില�ം ഒന�നിലെ അംഗങ�ങള��ക�ക� മാത�രമേ സാധിക�കൂ',
+'badaccess-groups' => 'താങ�കള�� ആവശ�യപ�പെട�ട കാര�യം ചെയ�യാന�� {{PLURAL:$2|$1 ഗ�രൂപ�പിലെ|$1 എന�നീ ഗ�രൂപ�പ�കളില�� �തെങ�കില�ം ഒന�നിലെ}} അംഗങ�ങള��ക�ക� മാത�രമേ സാധിക�കൂ',
 
 'versionrequired'     => 'മീഡിയാവിക�കിയ�ടെ $1-ആം പതിപ�പ� ആവശ�യമാണ�',
 'versionrequiredtext' => 'ഈ താള�� ഉപയോഗിക�കാന�� മീഡിയവിക�കി പതിപ�പ� $1 ആവശ�യമാണ�. കൂട�തല�� വിവരങ�ങള��ക�ക� [[Special:Version|മീഡിയാവിക�കി പതിപ�പ� താള��]] കാണ�ക.',
@@ -417,8 +417,10 @@ $messages = array(
 'editsection'             => 'തിര�ത�ത�ക',
 'editold'                 => 'തിര�ത�ത�ക',
 'viewsourceold'           => 'മൂലരൂപം കാണ�ക',
+'editlink'                => 'തിര�ത�ത�ക',
+'viewsourcelink'          => 'മൂലരൂപം കാണ�ക',
 'editsectionhint'         => 'ഉപവിഭാഗം തിര�ത�ത�ക: $1',
-'toc'                     => 'പൊര�ളടക�കം',
+'toc'                     => 'ഉള�ളടക�കം',
 'showtoc'                 => 'പ�രദര��ശിപ�പിക�ക�ക',
 'hidetoc'                 => 'മറയ�ക�ക�ക',
 'thisisdeleted'           => '$1 കാണ�കയോ പ�നഃസ�ഥാപിക�ക�കയോ ചെയ�യേണ�ടത�ണ�ടോ?',
@@ -443,11 +445,12 @@ $messages = array(
 'nstab-mediawiki' => 'സന�ദേശം',
 'nstab-template'  => 'ഫലകം',
 'nstab-help'      => 'സഹായ താള��',
-'nstab-category'  => 'വിഭാഗം',
+'nstab-category'  => 'വര��ഗ�ഗം',
 
 # Main script and global functions
 'nosuchaction'      => 'ഈ പ�രവര��ത�തനം അസാധ�വാണ�‌',
-'nosuchactiontext'  => 'യ�ആര��‌എല�� വഴി നിര��‌വചിച�ച പ�രവര��ത�തനം വിക�കി തിരിച�ചറിഞ�ഞില�ല.',
+'nosuchactiontext'  => 'യ�ആര��‌എല�� വഴി നിര��‌വചിച�ച പ�രവര��ത�തനം വിക�കി തിരിച�ചറിഞ�ഞില�ല. താങ�കള�� യ�ആര��‌എല�� തെറ�റായി നല��കിയിരിക�കാം അല�ലെങ�കില�� ഒര� തെറ�റായ ലിങ�ക�വഴി വന�നിരിക�കാം.  
+ഒര�പക�ഷേ, ഇത� {{SITENAME}} ഉപയോഗിക�ക�ന�ന സോഫ�റ�റ�‌വെയറിലെ ബഗ�ഗ�ം ആകാം.',
 'nosuchspecialpage' => 'അത�തരമൊര� പ�രത�യേകതാള�� നിലവിലില�ല',
 'nospecialpagetext' => "<big>'''താങ�കള�� നിലവിലില�ലാത�ത ഒര� പ�രത�യേകതാള�� ആണ� ആവശ�യപ�പെട�ടത�.'''</big>
 
@@ -456,7 +459,13 @@ $messages = array(
 # General errors
 'error'                => 'ക�ഴപ�പം',
 'databaseerror'        => 'ഡാറ�റാബേസ� പിശക�',
-'noconnect'            => 'ക�ഷമിക�കണം! ചില സാങ�കേതികപ�രശ�നങ�ങള�� മൂലം വിക�കിക�ക� ഡാറ�റാബേസ� സെര��വറ�മായി ബന�ധപ�പെടാന�� സാധിക�കാത�തതില�� ഞങ�ങള�� അതിയായി ഖേദിക�ക�ന�ന�! <br />
+'dberrortext'          => 'ഡാറ�റാബേസ� ക�വെറി സിന�റാക�സ� എറര�� സംഭവിച�ചിരിക�ക�ന�ന�.
+ഒര�പക�ഷേ ഇത� സോഫ�റ�റ�‌വെയറിലെ ഒര� ബഗ�ഗ� ആകാം.
+അവസാനം ശ�രമിച�ച ക�വെറി ഇതാണ�:
+<blockquote><tt>$1</tt></blockquote>
+"<tt>$2</tt> എന�ന ഫങ�‌ഷനില��".
+MySQL "<tt>$3: $4</tt>" എന�ന എററാണ� നല��കിയത�.',
+'noconnect'            => 'ക�ഷമിക�കണം! ചില സാങ�കേതികപ�രശ�നങ�ങള�� മൂലം വിക�കിക�ക� ഡാറ�റാബേസ� സെര��വറ�മായി ബന�ധപ�പെടാന�� സാധിച�ചില�ല. <br />
 $1',
 'nodb'                 => '$1 എന�ന ഡാറ�റാബേസ� തിരഞ�ഞെട�ക�കാന�� പറ�റിയില�ല.',
 'cachederror'          => 'താങ�കള�� ആവശ�യപ�പെട�ട താളിന�റെ തദ�ദേശീയമായി സംഭരിച�ച�വയ�ക�കപ�പെട�ടിട�ട�ള�ള ഒര� പതിപ�പാണ� താഴെക�കാണ�ന�നത�. ഇത� �റ�റവ�ം പ�തിയ പതിപ�പാവണമെന�നില�ല.',
@@ -480,8 +489,7 @@ $1',
 'badarticleerror'      => 'താങ�കള�� ചെയ�യാന�ദ�ദേശിക�ക�ന�നത� ഈ താളില�� സാദ�ധ�യമല�ല',
 'cannotdelete'         => 'സൂചിപ�പിച�ച താളോ പ�രമാണമോ നീക�കം ചെയ�യാന�� സാധിച�ചില�ല. (അത� മറ�റാരെങ�കില�ം മ�മ�പേ നീക�കം ചെയ�തിട�ട�ണ�ടാവാം.)',
 'badtitle'             => 'അസാധ�വായ തലക�കെട�ട�',
-'badtitletext'         => 'നിങ�ങള�� ആവശ�യപ�പെട�ട തലക�കെട�ട�ള�ള ഒര� താള�� നിലവിലില�ല. ഇത� തെറ�റായി അന�തര��ഭാഷാ/അന�തര��വിക�കി കണ�ണി ചെയ�യപ�പെട�ടത� മൂലമോ, തലക�കെട�ടില�� ഉപയോഗിക�കര�താത�ത അക�ഷരരൂപങ�ങള�� ഉപയോഗിച�ചത� മൂലം സംഭവിച�ചതോ ആയിരിക�കാം.',
-'perfdisabled'         => 'ക�ഷമിക�കണം! മറ�റ�ള�ളവര��ക�ക� വിക�കി ഉപയോഗിക�കാനാവാത�ത വിധം ഡാറ�റാബേസിന�റെ പ�രവര��ത�തനത�തെ ബാധിക�ക�ന�നത� കൊണ�ട� ഈ സം‌വിധാനം തല��ക�കാലികമായി സജ�ജമല�ല.',
+'badtitletext'         => 'നിങ�ങള�� ആവശ�യപ�പെട�ട തലക�കെട�ട�ള�ള ഒര� താള�� നിലവിലില�ല. ഇത� തെറ�റായി അന�തര��ഭാഷാ/അന�തര��വിക�കി കണ�ണി ചെയ�യപ�പെട�ടത� മൂലമോ, തലക�കെട�ടില�� ഉപയോഗിക�കര�താത�ത അക�ഷരരൂപങ�ങള�� ഉപയോഗിച�ചത� മൂലമോ സംഭവിച�ചതായിരിക�കാം.',
 'perfcachedts'         => 'താഴെയ�ള�ള വിവരങ�ങള�� ശേഖരിച�ച� വെച�ചവയില�� പെട�ന�ന�, അവസാനം പ�ത�ക�കിയത� $1-ന� ആണ�‌.',
 'querypage-no-updates' => 'ഈ താളിന�റെ പ�ത�ക�കല�� തല��ക�കാലം നിര��ത�തി വച�ചിരിക�ക�ന�ന�. ഇവിട�ള�ള വിവരങ�ങള�� �റ�റവ�ം പ�തിയതാവണമെന�നില�ല.',
 'viewsource'           => 'മൂലരൂപം കാണ�ക',
@@ -504,14 +512,14 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'യൂസര�� ലോഗൗട�ട�',
-'logouttext'                 => '<strong>താങ�കള�� ഇപ�പോള�� {{SITENAME}} സംരംഭത�തില��നിന�ന�ം ലോഗൗട�ട� ചെയ�തിരിക�ക�ന�ന�</strong>
+'logouttext'                 => "'''താങ�കള�� ഇപ�പോള�� {{SITENAME}} സംരംഭത�തില��നിന�ന�ം ലോഗൗട�ട� ചെയ�തിരിക�ക�ന�ന�'''
 
 അജ�ഞാതമായിര�ന�ന� കൊണ�ട� {{SITENAME}} സം‌രംഭം താങ�കള��ക�ക� ത�ടര��ന�ന�ം ഉപയോഗിക�കാവ�ന�നതാണ�. അല�ലെങ�കില��  [[Special:UserLogin|ലോഗിന�� സൗകര�യം ഉപയോഗിച�ച�]] വീണ�ട�ം ലോഗിന�� ചെയ�യാവ�ന�നത�ം ആണ�.
 
-താങ�കള�� വെബ� ബ�രൌസറിന�റെ ക�യാഷെ ശൂന�യമാക�കിയിട�ടില�ലെങ�കില�� ചില താള�കളില�� താങ�കള�� ലോഗിന�� ചെയ�തിരിക�ക�ന�നതായി കാണിക�കാന�� സാധ�യതയ�ണ�ട�.',
-'welcomecreation'            => '== {{SITENAME}} സംരംഭത�തിലേയ�ക�ക� സ�വാഗതം  Welcome, $1! ==
+താങ�കള�� വെബ� ബ�രൌസറിന�റെ ക�യാഷെ ശൂന�യമാക�കിയിട�ടില�ലെങ�കില�� ചില താള�കളില�� താങ�കള�� ലോഗിന�� ചെയ�തിരിക�ക�ന�നതായി കാണിക�കാന�� സാധ�യതയ�ണ�ട�.",
+'welcomecreation'            => '== {{SITENAME}} സംരംഭത�തിലേയ�ക�ക� സ�വാഗതം , $1! ==
 
-താങ�കള�ടെ അക�കൗണ�ട� സൃഷ�ടിക�കപ�പെട�ടിരിക�ക�ന�ന�. താങ�കള�ടെ {{SITENAME}} ക�രമീകരണങ�ങള�� മാറ�റാന�� മറക�കര�തേ.
+താങ�കള�ടെ അക�കൗണ�ട� സൃഷ�ടിക�കപ�പെട�ടിരിക�ക�ന�ന�. താങ�കള�ടെ [[Special:Preferences|{{SITENAME}} preferences]] ക�രമീകരണങ�ങള�� മാറ�റാന�� മറക�കര�തേ.
 
 ==പ�രത�യേകം ശ�രദ�ധിക�ക�ക==
 {{SITENAME}} സംരംഭത�തിലേയ�ക�ക� [[{{SITENAME}}:സ�വാഗതം, നവാഗതരെ|സ�വാഗതം]].. !
@@ -528,7 +536,6 @@ $2',
 'yourpasswordagain'          => 'രഹസ�യവാക�ക� ഒരിക�കല��ക�കൂടി:',
 'remembermypassword'         => 'എന�റെ പ�രവേശനം ഈ കമ�പ�യൂട�ടറില�� ഓര��ത�ത�വെക�ക�ക.',
 'yourdomainname'             => 'താങ�കള�ടെ ഡൊമെയിന��:',
-'loginproblem'               => '<b>താങ�കള�� ലോഗിന�� ചെയ�തപ�പോള�� എന�തോ പ�രശ�നം ഉണ�ടായി.</b><br />ദയവായി ഒന�ന�കൂടി ശ�രമിക�കൂ!',
 'login'                      => 'ലോഗിന�� ചെയ�യ�ക',
 'nav-login-createaccount'    => 'ലോഗിന�� ചെയ�യ�ക / അംഗത�വമെട�ക�ക�ക',
 'loginprompt'                => '{{SITENAME}} സംരംഭത�തില�� ലോഗിന�� ചെയ�യാന�� താങ�കള�� ക�ക�കികള�� (Cookies) സജ�ജമാക�കിയിരിക�കണം.',
@@ -580,8 +587,8 @@ $2',
 'eauthentsent'               => 'നിങ�ങള�� വിക�കിയില�� ക�രമീകരിച�ചിട�ട�ള�ള ഇമെയില�� വിലാസത�തിലേക�ക� സ�ഥിരീകരണത�തിനായി ഒര� മെയില�� അയച�ചിട�ട�ണ�ട�. ഇവിടെ നിന�ന� ആ ഇമെയില�� വിലാസത�തിലേക�ക� മറ�റൊര� മെയില�� കൂടി അയക�ക�ന�നതിന� മ�ന��പായി, അക�കൗണ�ട� നിങ�ങള�ടേത� തന�നെ എന�ന� ഉറപ�പ� വര�ത�ത�ന�നതിനായി, ഇപ�പോള�� അയച�ചിട�ട�ള�ള മെയിലിലെ നിര��ദ�ദേശങ�ങള�� നിങ�ങള�� പാലിക�കേണ�ടതാണ�.',
 'throttled-mailpassword'     => 'കഴിഞ�ഞ {{PLURAL:$1|$1 മണിക�കൂറിന�ള�ളില�� |$1 മണിക�കൂറ�കള��ക�ക�ള�ളില��}} ഒര� രഹസ�യവാക�ക� ഓര��മ�മപ�പെട�ത�താന�ള�ള മെയില�� അയച�ചിട�ട�ണ�ട�. ദ�ര��വിനിയോഗം ഒഴിവാക�കാന�� {{PLURAL:$1|$1 മണിക�കൂറിന�ള�ളില�� |$1 മണിക�കൂറ�കള��ക�ക�ള�ളില��}} ഒര� രഹസ�യവാക�ക� ഓര��മ�മപ�പെട�ത�താന�ള�ള മെയില�� മാത�രമേ അന�വദിക�കൂ.',
 'mailerror'                  => 'മെയില�� അയയ�ക�ക�ന�നതില�� ക�ഴപ�പം: $1',
-'acct_creation_throttle_hit' => 'ക�ഷമിക�ക�ക, താങ�കള�� ഇപ�പോള��ത�തന�നെ $1 അക�കൗണ�ട�കള�� സൃഷ�ടിച�ചിട�ട�ണ�ട�. ഇനിയ�ം സൃഷ�ടിക�ക�ക സാധ�യമല�ല.',
-'emailauthenticated'         => 'താങ�കള�ടെ ഇമെയില�� വിലാസം $1-ന� സാധ�ത തെളിയിച�ചതാണ�.',
+'acct_creation_throttle_hit' => 'ക�ഷമിക�ക�ക, താങ�കള�� ഇപ�പോള��ത�തന�നെ {{PLURAL:$1|1 അക�കൌണ�ട�|$1 അക�കൗണ�ട�കള��}} സൃഷ�ടിച�ചിട�ട�ണ�ട�. ഇനിയ�ം സൃഷ�ടിക�ക�ക സാധ�യമല�ല.',
+'emailauthenticated'         => 'താങ�കള�ടെ ഇമെയില�� വിലാസം $2, $3-ന� സാധ�ത തെളിയിച�ചതാണ�.',
 'emailnotauthenticated'      => 'താങ�കള�ടെ ഇമെയില�� വിലാസത�തിന�റെ സാധ�ത ഇത�വരെ സ�ഥിരീകരിക�കപ�പെട�ടിട�ടില�ല. സാധ�ത തെളിയിക�ക�ന�നത�വരെ താഴെപ�പറയ�ന�നവയ�ക�കൊന�ന�ം താങ�കള��ക�ക� ഇമെയില�� അയക�ക�വാന�� സാദ�ധ�യമല�ല.',
 'noemailprefs'               => 'ഈ ക�രമീകരണങ�ങള�� പ�രവര��ത�തിക�ക�വാന�� സാധ�വായ ഒര� ഇമെയില�� വിലാസം ഉള��പ�പെട�ത�ത�ക.',
 'emailconfirmlink'           => 'താങ�കള�ടെ ഇമെയില�� വിലാസം സ�ഥിരീകരിക�ക�ക',
@@ -595,14 +602,19 @@ $2',
 'loginlanguagelabel'         => 'ഭാഷ: $1',
 
 # Password reset dialog
-'resetpass'               => 'അക�കൗണ�ട� രഹസ�യവാക�ക� പ�നഃക�രമീകരിക�ക�ക',
-'resetpass_announce'      => 'താങ�കള��ക�ക� ഇമെയില�� ആയി കിട�ടിയ താല��ക�കാലിക കോഡ� ഉപയോഗിച�ചാണ�‌ ഇപ�പോള�� ലോഗിന�� ചെയ�തിരിക�ക�ന�നത��‌. ലോഗിന�� പ�രക�രിയ പൂര��ത�തിയാക�വാന�� പ�തിയൊര� രഹസ�യവാക�ക� ഇവിടെ കൊട�ക�ക�ക:',
-'resetpass_header'        => 'രഹസ�യവാക�ക� പ�നഃക�രമീകരിക�ക�ക',
-'resetpass_submit'        => 'രഹസ�യവാക�ക� സജ�ജീകരിച�ചശേഷം ലോഗിന�� ചെയ�യ�ക',
-'resetpass_success'       => 'താങ�കള�ടെ രഹസ�യവാക�ക� വിജയകരമായി മാറ�റിയിരിക�ക�ന�ന�! ഇപ�പോള�� നിങ�ങളെ സംരംഭത�തിലേക�ക� ആനയിക�ക�ന�ന�...',
-'resetpass_bad_temporary' => 'അസാധ�വായ താല��ക�കാലിക രഹസ�യവാക�ക�. ഒന�ന�കില�� ഇതിനകം നിങ�ങള�� രഹസ�യവാക�ക� മാറ�റിയിരിക�കാം. അല�ലെങ�കില�� പ�തിയ ഒര� താല��ക�കാലിക രഹസ�യവാക�ക� ആവശ�യപ�പെട�ടിട�ട�ണ�ടായിരിക�കാം.',
-'resetpass_forbidden'     => '{{SITENAME}} സംരംഭത�തില�� രഹസ�യവാക�ക�കള�� മാറ�റ�ന�നത� അന�വദനീയമല�ല',
-'resetpass_missing'       => 'ഫോം ഡാറ�റ ശൂന�യമാണ�.',
+'resetpass'                 => 'അക�കൗണ�ട� രഹസ�യവാക�ക� പ�നഃക�രമീകരിക�ക�ക',
+'resetpass_announce'        => 'താങ�കള��ക�ക� ഇമെയില�� ആയി കിട�ടിയ താല��ക�കാലിക കോഡ� ഉപയോഗിച�ചാണ�‌ ഇപ�പോള�� ലോഗിന�� ചെയ�തിരിക�ക�ന�നത��‌. ലോഗിന�� പ�രക�രിയ പൂര��ത�തിയാക�വാന�� പ�തിയൊര� രഹസ�യവാക�ക� ഇവിടെ കൊട�ക�ക�ക:',
+'resetpass_header'          => 'രഹസ�യവാക�ക� പ�നഃക�രമീകരിക�ക�ക',
+'oldpassword'               => 'പഴയ രഹസ�യവാക�ക�:',
+'newpassword'               => 'പ�തിയ രഹസ�യവാക�ക�:',
+'retypenew'                 => 'പ�തിയ പാസ�‌വേഡ� ഉറപ�പിക�ക�ക:',
+'resetpass_submit'          => 'രഹസ�യവാക�ക� സജ�ജീകരിച�ചശേഷം ലോഗിന�� ചെയ�യ�ക',
+'resetpass_success'         => 'താങ�കള�ടെ രഹസ�യവാക�ക� വിജയകരമായി മാറ�റിയിരിക�ക�ന�ന�! ഇപ�പോള�� നിങ�ങളെ സംരംഭത�തിലേക�ക� ആനയിക�ക�ന�ന�...',
+'resetpass_bad_temporary'   => 'അസാധ�വായ താല��ക�കാലിക രഹസ�യവാക�ക�. ഒന�ന�കില�� ഇതിനകം നിങ�ങള�� രഹസ�യവാക�ക� മാറ�റിയിരിക�കാം. അല�ലെങ�കില�� പ�തിയ ഒര� താല��ക�കാലിക രഹസ�യവാക�ക� ആവശ�യപ�പെട�ടിട�ട�ണ�ടായിരിക�കാം.',
+'resetpass_forbidden'       => '{{SITENAME}} സംരംഭത�തില�� രഹസ�യവാക�ക�കള�� മാറ�റ�ന�നത� അന�വദനീയമല�ല',
+'resetpass-no-info'         => 'ഈ താള�� നേരിട�ട� കാണ�ന�നതിന� താങ�കള�� ലോഗിന�� ചെയ�തിരിക�കണം.',
+'resetpass-submit-loggedin' => 'രഹസ�യവാക�ക� മാറ�റ�ക',
+'resetpass-temp-password'   => 'താത�കാലിക രഹസ�യവാക�ക�:',
 
 # Edit page toolbar
 'bold_sample'     => 'കട�പ�പിച�ച എഴ�ത�ത�',
@@ -625,8 +637,8 @@ $2',
 'hr_tip'          => 'തിരശ�ചീനരേഖ (മിതമായി മാത�രം ഉപയോഗിക�ക�ക)',
 
 # Edit pages
-'summary'                   => 'ച�ര�ക�കം',
-'subject'                   => 'വിഷയം/തലക�കെട�ട�',
+'summary'                   => 'ച�ര�ക�കം:',
+'subject'                   => 'വിഷയം/തലക�കെട�ട�:',
 'minoredit'                 => 'ഇതൊര� ചെറിയ തിര�ത�തലാണ�',
 'watchthis'                 => 'ഈ താളിലെ മാറ�റങ�ങള�� ശ�രദ�ധിക�ക�ക',
 'savearticle'               => 'സേവ� ചെയ�യ�ക',
@@ -638,8 +650,8 @@ $2',
 'missingsummary'            => "'''ഓര��മ�മക�ക�റിപ�പ�:''' താങ�കള�� തിര�ത�തലിന�റെ ച�ര�ക�കരൂപം നല��കിയിട�ടില�ല. ''സേവ� ചെയ�യ�ക'' ബട�ടണ�� ഒര�വട�ടം കൂടി അമര��ത�തിയാല�� താങ�കള�� വര�ത�തിയ മാറ�റം കാത�ത�സൂക�ഷിക�ക�ന�നതാണ�.",
 'missingcommenttext'        => 'താങ�കള�ടെ അഭിപ�രായം ദയവായി താഴെ രേഖപ�പെട�ത�ത�ക.',
 'missingcommentheader'      => "'''ഓര��മ�മക�ക�റിപ�പ�:''' ഈ ക�റിപ�പിന� താങ�കള�� വിഷയം/തലക�കെട�ട� നല��കിയിട�ടില�ല. ''സേവ� ചെയ�യ�ക'' എന�ന ബട�ടണ�� ഒര�വട�ടം കൂടി അമര��ത�തിയാല�� വിഷയം/തലക�കെട�ട� ഇല�ലാതെ തന�നെ കാത�ത�സൂക�ഷിക�ക�ന�നതാവ�ം.",
-'summary-preview'           => 'ച�ര�ക�കരൂപത�തിന�റെ പ�രിവ�യൂ',
-'subject-preview'           => 'വിഷയത�തിന�റെ/തലക�കെട�ടിന�റെ പ�രിവ�യൂ',
+'summary-preview'           => 'ച�ര�ക�കരൂപത�തിന�റെ പ�രിവ�യൂ:',
+'subject-preview'           => 'വിഷയത�തിന�റെ/തലക�കെട�ടിന�റെ പ�രിവ�യൂ:',
 'blockedtitle'              => 'ഉപയോക�താവിനെ തടഞ�ഞിരിക�ക�ന�ന�',
 'blockedtext'               => "<big>'''നിങ�ങള�ടെ ഉപയോക�തൃനാമത�തേയോ നിങ�ങള�� ഇപ�പോള�� ലോഗിന�� ചെയ�തിട�ട�ള�ള �പി വിലാസത�തേയോ ഈ വിക�കി തിര�ത�ത�ന�നതില�� നിന�ന� തടഞ�ഞിരിക�ക�ന�ന�'''</big>
 
@@ -690,19 +702,19 @@ $1 ആണàµ� à´ˆ തടയലàµ�â€� നടതàµ�തിയതàµ�. ''$2'' à´Žà´¨àµ
 *'''ഇന�റര��നെറ�റ� എക�സ�പ�ലോറര�� (IE):''Refresh'' ബട�ടണ�� അമര��ത�ത�മ�പോള�� ''Ctrl'' കീ അമര��ത�തിപിടിക�ക�ക. അല�ലെങ�കില�� ''Ctrl-F5'' അമര��ത�ത�ക;
 *'''ഓപ�പറ (Opera)''':  ''Tools→Preferences'' ഉപയോഗിച�ച� കാഷെ പൂര��ണ�ണമായ�ം ക�ലിയര�� ചെയ�യ�ക;
 *'''Konqueror:''': ''Reload'' ബട�ടണ�� അമര��ത�ത�കയോ ''F5'' കീ അമര��ത�ത�കയോ ചെയ�യ�ക.",
-'usercssjsyoucanpreview'    => "<strong>വഴികാട�ടി:</strong> താങ�കള�ടെ പ�തിയ CSS/JS സേവ� ചെയ�യ�ന�നതിന� മ�മ�പ� 'പ�രിവ�യൂ കാണ�ക' എന�ന ബട�ടന�� ഉപയോഗിച�ച� പരിശോധിക�ക�ക.",
+'usercssjsyoucanpreview'    => "'''വഴികാട�ടി:''' താങ�കള�ടെ പ�തിയ CSS/JS സേവ� ചെയ�യ�ന�നതിന� മ�മ�പ� 'പ�രിവ�യൂ കാണ�ക' എന�ന ബട�ടന�� ഉപയോഗിച�ച� പരിശോധിക�ക�ക.",
 'usercsspreview'            => "'''താങ�കള�� താങ�കള�ടെ സ�വന�തം CSS പ�രിവ�യൂ ചെയ�യ�ക മാത�രമേ ചെയ�യ�ന�ന�ള�ളൂ എന�ന കാര�യം ഓര��മ�മിക�ക�ക. ഇത� സേവ� ചെയ�തിട�ടില�ല!'''",
 'userjspreview'             => "'''താങ�കള�� താങ�കള�ടെ സ�വന�തം ജാവസ�ക�രിപ�റ�റ� പ�രിവ�യൂ ചെയ�യ�ക മാത�രമേ ചെയ�യ�ന�ന�ള�ളൂ എന�ന കാര�യം ഓര��മ�മിക�ക�ക. ഇത� സേവ� ചെയ�തിട�ടില�ല!'''",
 'userinvalidcssjstitle'     => "'''മ�ന�നറിപ�പ�:''' \"\$1\" എന�ന പേരില�� ഒര� സ�കിന�� ഇല�ല. '''.css''' ഉം '''.js''' ഉം താള�കള�� ഇംഗ�ലീഷ� ചെറിയക�ഷര തലക�കെട�ട� ആണ�‌ ഉപയോഗിക�ക�ന�നതെന�ന� ദയവായി ഓര��ക�ക�ക. ഉദാ: {{ns:user}}:Foo/Monobook.css എന�നതിന� പകരം {{ns:user}}:Foo/monobook.css എന�നാണ� ഉപയോഗിക�കേണ�ടത�.",
 'updated'                   => '(പ�ത�ക�കിയിരിക�ക�ന�ന�)',
-'note'                      => '<strong>പ�രത�യേക ശ�രദ�ധയ�ക�ക�:</strong>',
-'previewnote'               => '<strong>ഇതൊര� പ�രിവ�യൂ മാത�രമാണ�, താങ�കള�� നടത�തിയ മാറ�റങ�ങള�� സേവ� ചെയ�തിട�ടില�ല!</strong>',
-'session_fail_preview'      => '<strong>ക�ഷമിക�കണം! സെഷന�� ഡാറ�റ നഷ�ടപ�പെട�ടതിനാല�� താങ�കള�ടെ തിര�ത�തലിന�റെ ത�ടര��പ�രക�രിയ നടത�ത�വാന�� സാധിച�ചില�ല. ഒര� പ�രാവശ�യം കൂടി ദയവായി ശ�രമിക�കൂ. എന�നിട�ട�ം ശരിയാവ�ന�നില�ലെങ�കില�� ലോഗൗട�ട� ചെയ�തതിന� ശേഷം പിന�നേയ�ം ലോഗിന�� ചെയ�യൂ.</strong>',
-'session_fail_preview_html' => "<strong>ക�ഷമിക�കണം. സെഷന�� ഡാറ�റ നഷ�ടപ�പെട�ടതിനാല�� താങ�കള�ടെ തിര�ത�തലിന�റെ ത�ടര��പ�രക�രിയ നടത�ത�വാന�� സാധിച�ചില�ല.</strong>
+'note'                      => "'''പ�രത�യേക ശ�രദ�ധയ�ക�ക�:'''",
+'previewnote'               => "'''ഇതൊര� പ�രിവ�യൂ മാത�രമാണ�, താങ�കള�� നടത�തിയ മാറ�റങ�ങള�� സേവ� ചെയ�തിട�ടില�ല!'''",
+'session_fail_preview'      => "'''ക�ഷമിക�കണം! സെഷന�� ഡാറ�റ നഷ�ടപ�പെട�ടതിനാല�� താങ�കള�ടെ തിര�ത�തലിന�റെ ത�ടര��പ�രക�രിയ നടത�ത�വാന�� സാധിച�ചില�ല. ഒര� പ�രാവശ�യം കൂടി ദയവായി ശ�രമിക�കൂ. എന�നിട�ട�ം ശരിയാവ�ന�നില�ലെങ�കില�� ലോഗൗട�ട� ചെയ�തതിന� ശേഷം പിന�നേയ�ം ലോഗിന�� ചെയ�യൂ.'''",
+'session_fail_preview_html' => "'''ക�ഷമിക�കണം. സെഷന�� ഡാറ�റ നഷ�ടപ�പെട�ടതിനാല�� താങ�കള�ടെ തിര�ത�തലിന�റെ ത�ടര��പ�രക�രിയ നടത�ത�വാന�� സാധിച�ചില�ല.'''
 
 ''{{SITENAME}} സം‌രംഭത�തില�� raw HTML എനേബിള�� ചെയ�തിട�ട�ള�ളതിനാല��, ജാവാസ�ക�രിപ� ആക�രമണത�തിനെതിരെ ഒര� മ�ന��‌കര�തല�� എന�ന നിലയില�� പ�രിവ�യൂ മറച�ചിരിക�ക�ന�ന�.''
 
-<strong>നിങ�ങള�ടേത� നല�ല വിശ�വാസത�തില�ള�ള തിര�ത�തലാണെങ�കില�� ഒര� പ�രാവശ�യം കൂടി പരിശ�രമിക�കൂ. എന�നിട�ട�ം ശരിയാവ�ന�നില�ലെങ�കില�� ലോഗൗട�ട� ചെയ�തതിന� ശേഷം പിന�നേയ�ം ലോഗിന�� ചെയ�യൂ.</strong>",
+'''നിങ�ങള�ടേത� നല�ല വിശ�വാസത�തില�ള�ള തിര�ത�തലാണെങ�കില�� ഒര� പ�രാവശ�യം കൂടി പരിശ�രമിക�കൂ. എന�നിട�ട�ം ശരിയാവ�ന�നില�ലെങ�കില�� ലോഗൗട�ട� ചെയ�തതിന� ശേഷം പിന�നേയ�ം ലോഗിന�� ചെയ�യൂ.'''",
 'editing'                   => 'തിര�ത�ത�ന�ന താള��:- $1',
 'editingsection'            => 'തിര�ത�ത�ന�ന താള��:- $1 (ഉപവിഭാഗം)',
 'editingcomment'            => 'തിര�ത�ത�ന�ന താള��:- $1 (ക�റിപ�പ�)',
@@ -714,30 +726,30 @@ $1 ആണàµ� à´ˆ തടയലàµ�â€� നടതàµ�തിയതàµ�. ''$2'' à´Žà´¨àµ
 താങ�കള�� '''സേവ� ചെയ�യ�ക''' എന�ന ബട�ടണ�� അമര��ത�ത�മ�പോള�� '''മ�കളിലെ ടെക�സ�റ�റ� �രിയയില�ള�ള ടെക�സ�റ�റ� മാത�രമേ''' സേവ� ആവ�കയ�ള�ളൂ.",
 'yourtext'                  => 'താങ�കള�� എഴ�തി ചേര��ത�തത�',
 'storedversion'             => 'സംഭരിക�കപ�പെട�ടിരിക�ക�ന�ന പതിപ�പ�',
-'nonunicodebrowser'         => '<strong>WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>',
-'editingold'                => '<strong>മ�ന�നറിയിപ�പ�: താങ�കള�� ഈ താളിന�റെ ഒര� പഴയ പതിപ�പാണ�‌ തിര�ത�ത�ന�നത�. ഇപ�പോള�� താങ�കള�� വര�ത�തിയ മാറ�റങ�ങള�� സേവ� ചെയ�താല�� ഈ പതിപ�പിന� ശേഷം വന�ന മാറ�റങ�ങളെല�ലാം നഷ�ടമാക�ം.</strong>',
+'nonunicodebrowser'         => "'''WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.'''",
+'editingold'                => "'''മ�ന�നറിയിപ�പ�: താങ�കള�� ഈ താളിന�റെ ഒര� പഴയ പതിപ�പാണ�‌ തിര�ത�ത�ന�നത�. ഇപ�പോള�� താങ�കള�� വര�ത�തിയ മാറ�റങ�ങള�� സേവ� ചെയ�താല�� ഈ പതിപ�പിന� ശേഷം വന�ന മാറ�റങ�ങളെല�ലാം നഷ�ടമാക�ം.'''",
 'yourdiff'                  => 'വ�യത�യാസങ�ങള��',
-'copyrightwarning'          => '{{SITENAME}} സംരംഭത�തില�� എഴ�തപ�പെട�ന�ന ലേഖനങ�ങളെല�ലാം $2 പ�രകാരം സ�വതന�ത�രമാണ� (വിശദാംശങ�ങള��ക�ക� $1 കാണ�ക). താങ�കള�� എഴ�ത�ന�ന ലേഖനം തിര�ത�തപ�പെട�ന�നതിലോ ഒഴിവാക�കപ�പെട�ന�നതിലോ എതിര��പ�പ�ണ�ടെങ�കില�� ദയവായി ലേഖനമെഴ�താതിരിക�ക�ക.
+'copyrightwarning'          => "{{SITENAME}} സംരംഭത�തില�� എഴ�തപ�പെട�ന�ന ലേഖനങ�ങളെല�ലാം $2 പ�രകാരം സ�വതന�ത�രമാണ� (വിശദാംശങ�ങള��ക�ക� $1 കാണ�ക). താങ�കള�� എഴ�ത�ന�ന ലേഖനം തിര�ത�തപ�പെട�ന�നതിലോ ഒഴിവാക�കപ�പെട�ന�നതിലോ എതിര��പ�പ�ണ�ടെങ�കില�� ദയവായി ലേഖനമെഴ�താതിരിക�ക�ക.
 
 ഈ ലേഖനം താങ�കള��ത�തന�നെ എഴ�തിയതാണെന�ന�ം അതല�ലെങ�കില�� പകര��പ�പവകാശനിയമങ�ങള�ടെ പരിധിയിലില�ലാത�ത ഉറവിടങ�ങളില��നിന�ന� പകര��ത�തിയതാണെന�ന�ം ഉറപ�പാക�ക�ക.
 
-<strong>പകര��പ�പവകാശ സംരക�ഷണമ�ള�ള സൃഷ�ടികള�� ഒര� കാരണവശാല�ം ഇവിടെ പ�രസിദ�ധീകരിക�കര�ത�.</strong>',
-'copyrightwarning2'         => '{{SITENAME}} സംരംഭത�തില�� താങ�കള�� എഴ�തി ചേര��ക�ക�ന�നതെല�ലാം മറ�റ�പയോക�താക�കള�� തിര�ത�ത�കയോ, മാറ�റം വര�ത�ത�കയോ, ഒഴിവാക�ക�കയോ ചെയ�തേക�കാം. താങ�കള�� എഴ�തി ചേര��ക�ക�ന�നത� മറ�റ� ഉപയോക�താക�കള�� തിര�ത�ത�ന�നതിലോ ഒഴിവാക�ക�ന�നതിലോ താങ�കള��ക�ക� എതിര��പ�പ�ണ�ടെങ�കില�� ദയവായി ലേഖനമെഴ�താതിരിക�ക�ക.
+'''പകര��പ�പവകാശ സംരക�ഷണമ�ള�ള സൃഷ�ടികള�� ഒര� കാരണവശാല�ം ഇവിടെ പ�രസിദ�ധീകരിക�കര�ത�.'''",
+'copyrightwarning2'         => "{{SITENAME}} സംരംഭത�തില�� താങ�കള�� എഴ�തി ചേര��ക�ക�ന�നതെല�ലാം മറ�റ�പയോക�താക�കള�� തിര�ത�ത�കയോ, മാറ�റം വര�ത�ത�കയോ, ഒഴിവാക�ക�കയോ ചെയ�തേക�കാം. താങ�കള�� എഴ�തി ചേര��ക�ക�ന�നത� മറ�റ� ഉപയോക�താക�കള�� തിര�ത�ത�ന�നതിലോ ഒഴിവാക�ക�ന�നതിലോ താങ�കള��ക�ക� എതിര��പ�പ�ണ�ടെങ�കില�� ദയവായി ലേഖനമെഴ�താതിരിക�ക�ക.
 ഇത� താങ�കള��ത�തന�നെ എഴ�തിയതാണെന�ന�ം, അതല�ലെങ�കില�� പകര��പ�പവകാശ നിയമങ�ങള�ടെ പരിധിയിലില�ലാത�ത ഉറവിടങ�ങളില��നിന�ന�ം പകര��ത�തിയതാണെന�ന�ം ഉറപ�പാക�ക�ക (ക�ട�തല�� വിവരത�തിന� $1 കാണ�ക).
-<strong>പകര��പ�പവകാശ സംരക�ഷണമ�ള�ള സൃഷ�ടികള�� ഒര� കാരണവശാല�ം ഇവിടെ പ�രസിദ�ധീകരിക�കര�ത�!</strong>',
-'longpagewarning'           => '<strong>മ�ന�നറിയിപ�പ�: ഈ താളിന� $1 കിലോബൈറ�റ�സ� നീളമ�ണ�ട�; ചില ബ�രൗസറ�കള��ക�ക� 32 കിലോബൈറ�റ�സില�� കൂട�തല�� വലിയ താള�കള�� തിര�ത�ത�മ�പോള�� പ�രശ�നമ�ണ�ടാകാറ�ണ�ട�. താള�കള�ടെ ഉപവിഭാഗങ�ങള�� തിരഞ�ഞെട�ത�ത� തിര�ത�ത�ന�നത� പരിഗണിക�ക�ക.</strong>',
-'longpageerror'             => '<strong>പിശക�: താങ�കള�� സമര��പ�പിച�ച ടെക�സ�റ�റിന� $1 കിലോബൈറ�റ�സ� വലിപ�പമ�ണ�ട�. പരമാവധി അന�വദനീയമായ വലിപ�പം $2 കിലോബൈറ�റ�സ� ആണ�‌. അതിനാലിത� സേവ� ചെയ�യാന�� സാദ�ധ�യമല�ല.</strong>',
-'readonlywarning'           => '<strong>മ�ന�നറിയിപ�പ�: ഡാറ�റാബേസ� അതിന�റെ പരിപാലനത�തിന� വേണ�ടി ബന�ധിച�ചിരിക�ക�ന�ന�. അതിനാല�� താങ�കള�� ഇപ�പോള�� വര�ത�തിയ മാറ�റങ�ങള�� സേവ� ചെയ�യാന�� സാദ�ധ�യമല�ല. താങ�കള�� വര�ത�തിയ മാറ�റങ�ങള�� ഒര� ടെക�സ�റ�റ� ഫയലിലേക�ക� (ഉദാ: നോട�ട� പാഡ�) പിന�നീട�ള�ള ഉപയോഗത�തിനായി സേവ� ചെയ�യണമെന�ന� താല�പര�യപ�പെട�ന�ന�.</strong>',
-'protectedpagewarning'      => '<strong>മ�ന�നറിയിപ�പ�:  ഈ താള�� സിസോപ�പ� അധികാരമ�ള�ളവര��ക�ക� മാത�രം തിര�ത�താന�� സാധിക�കാവ�ന�ന തരത�തില�� സം‌രക�ഷിക�കപ�പെട�ടിരിക�ക�ന�ന� </strong>',
+'''പകര��പ�പവകാശ സംരക�ഷണമ�ള�ള സൃഷ�ടികള�� ഒര� കാരണവശാല�ം ഇവിടെ പ�രസിദ�ധീകരിക�കര�ത�!'''",
+'longpagewarning'           => "'''മ�ന�നറിയിപ�പ�: ഈ താളിന� $1 കിലോബൈറ�റ�സ� നീളമ�ണ�ട�; ചില ബ�രൗസറ�കള��ക�ക� 32 കിലോബൈറ�റ�സില�� കൂട�തല�� വലിയ താള�കള�� തിര�ത�ത�മ�പോള�� പ�രശ�നമ�ണ�ടാകാറ�ണ�ട�. താള�കള�ടെ ഉപവിഭാഗങ�ങള�� തിരഞ�ഞെട�ത�ത� തിര�ത�ത�ന�നത� പരിഗണിക�ക�ക.'''",
+'longpageerror'             => "'''പിശക�: താങ�കള�� സമര��പ�പിച�ച ടെക�സ�റ�റിന� $1 കിലോബൈറ�റ�സ� വലിപ�പമ�ണ�ട�. പരമാവധി അന�വദനീയമായ വലിപ�പം $2 കിലോബൈറ�റ�സ� ആണ�‌. അതിനാലിത� സേവ� ചെയ�യാന�� സാദ�ധ�യമല�ല.'''",
+'readonlywarning'           => "'''മ�ന�നറിയിപ�പ�: ഡാറ�റാബേസ� അതിന�റെ പരിപാലനത�തിന� വേണ�ടി ബന�ധിച�ചിരിക�ക�ന�ന�. അതിനാല�� താങ�കള�� ഇപ�പോള�� വര�ത�തിയ മാറ�റങ�ങള�� സേവ� ചെയ�യാന�� സാദ�ധ�യമല�ല. താങ�കള�� വര�ത�തിയ മാറ�റങ�ങള�� ഒര� ടെക�സ�റ�റ� ഫയലിലേക�ക� (ഉദാ: നോട�ട� പാഡ�) പിന�നീട�ള�ള ഉപയോഗത�തിനായി സേവ� ചെയ�യണമെന�ന� താല�പര�യപ�പെട�ന�ന�. ബന�ധിച�ച അഡ�മിനിസ�ട�രേറ�റര�� നല��കിയ വിശദീകരണം:- $1'''",
+'protectedpagewarning'      => "'''മ�ന�നറിയിപ�പ�:  ഈ താള�� സിസോപ�പ� അധികാരമ�ള�ളവര��ക�ക� മാത�രം തിര�ത�താന�� സാധിക�കാവ�ന�ന തരത�തില�� സം‌രക�ഷിക�കപ�പെട�ടിരിക�ക�ന�ന� '''",
 'semiprotectedpagewarning'  => "'''ശ�രദ�ധിക�ക�ക:''' ഈ താള�� സംരക�ഷിക�കപ�പെട�ടിട�ട�ള�ളതാണ�; {{SITENAME}} സംരംഭത�തില�� അംഗത�വമെട�ത�തിട�ട�ള�ളവര��ക�കേ ഈ താള�� തിര�ത�താന�� സാധിക�കൂ.",
 'cascadeprotectedwarning'   => "'''മ�ന�നറിയിപ�പ�:''' ഈ താള�� കാര�യനിര��‌വാഹക അവകാശമ�ള�ളവര��ക�ക� മാത�രം തിര�ത�ത�വാന�� സാധിക�ക�ന�ന വിധത�തില�� സം‌രക�ഷിക�കപ�പെട�ടിട�ട�ള�ളതാണ�‌. {{PLURAL:$1|താള��|താള�കള��}} കാസ�കേഡ� സം‌രക�ഷണം ചെയ�തപ�പോള�� അതിന�റെ ഭാഗമായി സംരക�ഷിക�കപ�പെട�ടിട�ട�ള�ളതാണ�‌ ഈ താള��.",
-'titleprotectedwarning'     => '<strong>മ�ന�നറിയിപ�പ�: ചില പ�രത�യേക ഉപയോക�താക�കള��ക�ക� മാത�രം സൃഷ�ടിക�കാവ�ന�ന തരത�തില�� ഈ താള�� സംരക�ഷിക�കപ�പെട�ടിരിക�ക�ന�ന�.</strong>',
+'titleprotectedwarning'     => "'''മ�ന�നറിയിപ�പ�: ചില പ�രത�യേക ഉപയോക�താക�കള��ക�ക� മാത�രം സൃഷ�ടിക�കാവ�ന�ന തരത�തില�� ഈ താള�� സംരക�ഷിക�കപ�പെട�ടിരിക�ക�ന�ന�.'''",
 'templatesused'             => 'ഈ താളില�� ഉപയോഗിച�ചിരിക�ക�ന�ന ഫലകങ�ങള��:',
 'templatesusedpreview'      => 'ഈ താളില�� ഇപ�പോള�� ഉപയോഗിച�ചിരിക�ക�ന�ന ഫലകങ�ങള��:',
 'templatesusedsection'      => 'ഈ ഉപവിഭാഗത�തില�� ഉപയോഗിച�ചിരിക�ക�ന�ന ഫലകങ�ങള��:',
 'template-protected'        => '(സം‌രക�ഷിക�കപ�പെട�ടിരിക�ക�ന�ന�)',
 'template-semiprotected'    => '(അര��‌ദ�ധസം‌രക�ഷിതം)',
-'hiddencategories'          => 'ഈ താള�� അംഗമായ {{PLURAL:$1|മറഞ�ഞിരിക�ക�ന�ന വിഭാഗം|മറഞ�ഞിരിക�ക�ന�ന വിഭാഗങ�ങള��}}:',
+'hiddencategories'          => 'ഈ താള�� അംഗമായ {{PLURAL:$1|മറഞ�ഞിരിക�ക�ന�ന വര��ഗ�ഗം|മറഞ�ഞിരിക�ക�ന�ന വര��ഗ�ഗങ�ങള��}}:',
 'nocreatetitle'             => 'താള�കള�� സൃഷ�ടിക�ക�ന�നത� പരിമിതപ�പെട�ത�തിയിരിക�ക�ന�ന�',
 'nocreatetext'              => '{{SITENAME}} സംരംഭത�തില�� പ�തിയ താള�കള�� സൃഷ�ടിക�ക�വാന�ള�ള അവകാശം നിയന�ത�രിതമാണ�‌.
 താങ�കള�� ദയവായി തിരിച�ച�ചെന�ന� നിലവില�ള�ള ഒര� താള�� തിര�ത�ത�കയോ, അഥവാ [[Special:UserLogin|ലോഗിന�� ചെയ�യ�കയോ ഒര� അക�കൗണ�ട� സൃഷ�ടിക�ക�കയോ]] ചെയ�യാന�� അഭ�യര��ത�ഥിക�ക�ന�ന�.',
@@ -748,6 +760,17 @@ $1 ആണàµ� à´ˆ തടയലàµ�â€� നടതàµ�തിയതàµ�. ''$2'' à´Žà´¨àµ
 '''മ�ന�നറിയിപ�പ�: മ�മ�പ� മായ�ച�ച�കളഞ�ഞ താളാണ�‌ താങ�കള�� വീണ�ട�ം ചേര��ക�കാന�� ശ�രമിക�ക�ന�നത�'''
 
 താങ�കള�� ചെയ�യ�ന�നത� ശരിയായ നടപടിയാണോ എന�ന� പരിശോധിക�ക�ക. ഉറപ�പിനായി ഈ താളിന�റെ മായ�ക�കല�� രേഖ കൂടെ ചേര��ത�തിരിക�ക�ന�ന�.",
+'edit-gone-missing'         => 'ഈ താൾ പ�ത�ക�ക�വാൻ സാധിക�ക�കയില�ല.
+ഇത� മായ�ക�കപ�പെട�ടതായി കാണ�ന�ന�.',
+'edit-conflict'             => 'തിര�ത�തല�� കോണ��ഫ�ലിക�റ�റ�',
+'edit-no-change'            => 'ഇപ�പോഴ�ള�ള സ�ഥിതിയില�� നിന�ന� യാതൊര� മാറ�റവ�ം ഇല�ലാത�തതിനാല�� താങ�കള�ടെ തിര�ത�തല�കള�� തിരസ�കരിക�കപ�പെട�ടിരിക�ക�ന�ന�.',
+'edit-already-exists'       => 'പ�തിയ താള�� സൃഷ�ടിക�കാന�� കഴിഞ�ഞില�ല.
+താള�� ഇപ�പോള�� തന�നെ നിലവില�ണ�ട�.',
+
+# Parser/template warnings
+'expensive-parserfunction-warning' => 'Warning: This page contains too many expensive parser function calls.
+
+It should have less than $2 {{PLURAL:$2|call|calls}}, there {{PLURAL:$1|is now $1 call|are now $1 calls}}.',
 
 # "Undo" feature
 'undo-success' => 'ഈ തിര�ത�തല�� താങ�കള��ക�ക� തിരസ�ക�കരിക�കാവ�ന�നതാണ�‌. താഴെ കൊട�ത�തിരിക�ക�ന�ന പതിപ�പ�കള�� തമ�മില�ള�ള താരതമ�യം ഒന�ന�കൂടി പരിശോധിച�ച� ഈ പ�രവൃത�തി ചെയ�യണോ എന�ന� ഒന�ന�കൂടി ഉറപ�പാക�ക�ക. ഉറപ�പാണെങ�കില�� തിര�ത�തല�� തിരസ�ക�കരിക�ക�വാന�� താള�� സേവ� ചെയ�യ�ക.',
@@ -762,29 +785,28 @@ $1 ആണàµ� à´ˆ തടയലàµ�â€� നടതàµ�തിയതàµ�. ''$2'' à´Žà´¨àµ
 $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാരണം ''$2'' ആണ�‌.",
 
 # History pages
-'viewpagelogs'        => 'ഈ താള�മായി ബന�ധപ�പെട�ട രേഖകള�� കാണ�ക',
-'nohistory'           => 'ഈ താളിന� തിര�ത�തല�� ചരിത�രം ആയിട�ടില�ല.',
-'revnotfound'         => 'പ�രസ�ത�ത പതിപ�പ� കണ�ടെത�താനായില�ല',
-'revnotfoundtext'     => 'ഈ താളിന�റെ താങ�കള�� ആവശ�യപ�പെട�ട പഴയ പതിപ�പ� കാണ�മാനില�ല. ഈ താളിലെത�താന�� താങ�കള�പയോഗിച�ച URL ഒരിക�കല��ക�കൂടി പരിശോധിക�ക�ക.',
-'currentrev'          => 'ഇപ�പോഴ�ള�ള രൂപം',
-'revisionasof'        => '$1-ന� നിലവില�ണ�ടായിര�ന�ന രൂപം',
-'revision-info'       => '$1-ന� ഉണ�ടായിര�ന�ന രൂപം സൃഷ�ടിച�ചത�:- $2',
-'previousrevision'    => '�പഴയ രൂപം',
-'nextrevision'        => 'പ�തിയ രൂപം→',
-'currentrevisionlink' => 'ഇപ�പോഴ�ള�ള രൂപം',
-'cur'                 => 'ഇപ�പോള��',
-'next'                => 'അട�ത�തത�',
-'last'                => 'മ�മ�പ�',
-'page_first'          => 'ആദി',
-'page_last'           => 'അന�ത�യം',
-'histlegend'          => "വ�യത�യാസങ�ങള�� ഒത�ത�നോക�കാന��: ഒത�ത�നോക�കേണ�ട പതിപ�പ�കള��ക�കൊപ�പമ�ള�ള റേഡിയോ ബട�ടണ�� തിരഞ�ഞെട�ത�ത� ''\"തിരഞ�ഞെട�ത�ത പതിപ�പ�കള�� തമ�മില�ള�ള വ�യത�യാസം കാണ�ക\"'' എന�ന ബട�ടണ�� ഞെക�ക�കയോ ENTER കീ അമര��ത�ത�കയോ ചെയ�യ�ക.<br />
+'viewpagelogs'           => 'ഈ താള�മായി ബന�ധപ�പെട�ട രേഖകള�� കാണ�ക',
+'nohistory'              => 'ഈ താളിന� തിര�ത�തല�� ചരിത�രം ആയിട�ടില�ല.',
+'currentrev'             => 'ഇപ�പോഴ�ള�ള രൂപം',
+'revisionasof'           => '$1-ന� നിലവില�ണ�ടായിര�ന�ന രൂപം',
+'revision-info'          => '$1-ന� ഉണ�ടായിര�ന�ന രൂപം സൃഷ�ടിച�ചത�:- $2', # Additionally available: $3: revision id
+'previousrevision'       => '�പഴയ രൂപം',
+'nextrevision'           => 'പ�തിയ രൂപം→',
+'currentrevisionlink'    => 'ഇപ�പോഴ�ള�ള രൂപം',
+'cur'                    => 'ഇപ�പോള��',
+'next'                   => 'അട�ത�തത�',
+'last'                   => 'മ�മ�പ�',
+'page_first'             => 'ആദി',
+'page_last'              => 'അന�ത�യം',
+'histlegend'             => "വ�യത�യാസങ�ങള�� ഒത�ത�നോക�കാന��: ഒത�ത�നോക�കേണ�ട പതിപ�പ�കള��ക�കൊപ�പമ�ള�ള റേഡിയോ ബട�ടണ�� തിരഞ�ഞെട�ത�ത� ''\"തിരഞ�ഞെട�ത�ത പതിപ�പ�കള�� തമ�മില�ള�ള വ�യത�യാസം കാണ�ക\"'' എന�ന ബട�ടണ�� ഞെക�ക�കയോ ENTER കീ അമര��ത�ത�കയോ ചെയ�യ�ക.<br />
 
 സൂചന: (ഇപ�പോള��) = നിലവില�ള�ള പതിപ�പ�മായ�ള�ള വ�യത�യാസം, (മ�മ�പ�) = തൊട�ട�മ�ന��പത�തെ പതിപ�പ�മായ�ള�ള വ�യത�യാസം, (ചെ.) = ചെറിയ തിര�ത�തല��.",
-'deletedrev'          => '[മായ�ച�ച�]',
-'histfirst'           => 'പഴയവ',
-'histlast'            => 'പ�തിയവ',
-'historysize'         => '({{PLURAL:$1|1 ബൈറ�റ�|$1 ബൈറ�റ�കള��}})',
-'historyempty'        => '(ശൂന�യം)',
+'history-fieldset-title' => 'മേച�ചില�� ചരിത�രം',
+'deletedrev'             => '[മായ�ച�ച�]',
+'histfirst'              => 'പഴയവ',
+'histlast'               => 'പ�തിയവ',
+'historysize'            => '({{PLURAL:$1|1 ബൈറ�റ�|$1 ബൈറ�റ�കള��}})',
+'historyempty'           => '(ശൂന�യം)',
 
 # Revision feed
 'history-feed-title'          => 'നാള��വഴി',
@@ -846,7 +868,7 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'mergehistory-no-source'           => 'സ�രോതസ�സ� താളായ $1 നിലവിലില�ല.',
 'mergehistory-no-destination'      => 'ലക�ഷ�യ താളായ $1 നിലവിലില�ല.',
 'mergehistory-invalid-source'      => 'സ�രോതസ�സ� താളിന� നിര��ബന�ധമായ�ം സാധ�വായ ഒര� തലക�കെട�ട�ണ�ടായിരിക�കണം.',
-'mergehistory-invalid-destination' => 'ലക�ഷ�യമായി നല��ക�ന�ന താളിന� നിര��ബന�ധമായ�ം ഒര� സാധ�വായാ തലക�കെട�ട�ണ�ടായിരിക�കണം.',
+'mergehistory-invalid-destination' => 'ലക�ഷ�യമായി നല��ക�ന�ന താളിന� നിര��ബന�ധമായ�ം സാധ�വായ തലക�കെട�ട�ണ�ടായിരിക�കണം.',
 'mergehistory-autocomment'         => '[[:$1]]നെ [[:$2]]ലേക�ക� സം‌യോജിപ�പിച�ചിരിക�ക�ന�ന�',
 'mergehistory-comment'             => '[[:$1]]നെ [[:$2]]ലേക�ക� സം‌യോജിപ�പിച�ചിരിക�ക�ന�ന�: $3',
 
@@ -863,11 +885,25 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'compareselectedversions' => 'തിരഞ�ഞെട�ത�ത പതിപ�പ�കള�� തമ�മില�ള�ള വ�യത�യാസം കാണ�ക',
 'editundo'                => 'മാറ�റം തിരസ�ക�കരിക�ക�ക',
 'diff-multi'              => '(ഇടക�ക�ള�ള {{PLURAL:$1|ഒര� പതിപ�പിലെ മാറ�റം|$1 പതിപ�പ�കളിലെ മാറ�റങ�ങള��}} ഇവിടെ കാണിക�ക�ന�നില�ല.)',
+'diff-src'                => 'ഉറവിടം',
+'diff-width'              => 'വീതി',
+'diff-height'             => 'നീളം',
+'diff-p'                  => "ഒര� '''ഖണ�ഡിക'''",
+'diff-blockquote'         => "ഒര� '''ഉദ�ധരണി'''",
+'diff-h1'                 => "ഒര� '''തലക�കെട�ട� (നില 1)'''",
+'diff-h2'                 => "ഒര� '''തലക�കെട�ട� (നില 2)'''",
+'diff-h3'                 => "ഒര� '''തലക�കെട�ട� (നില 3)'''",
+'diff-h4'                 => "ഒര� '''തലക�കെട�ട� (നില 4)'''",
+'diff-h5'                 => "ഒര� '''തലക�കെട�ട� (നില 5)'''",
+'diff-table'              => "ഒര� '''പട�ടിക'''",
+'diff-dd'                 => "ഒര� '''നിര��വചനം'''",
+'diff-a'                  => "ഒര� '''കണ�ണി'''",
+'diff-big'                => "'''വല�ത�'''",
 
 # Search results
 'searchresults'            => 'തിരച�ചിലിന�റെ ഫലം',
 'searchresulttext'         => '{{SITENAME}} സംരംഭത�തില�� വിവരങ�ങള�� എങ�ങിനെ അന�വേഷിച�ച� കണ�ടെത�താമെന�നറിയാന��, [[{{MediaWiki:Helppage}}|{{int:help}}]] എന�ന താള�� കാണ�ക.',
-'searchsubtitle'           => 'താങ�കള�� അന�വേഷിച�ച വാക�ക� \'\'\'[[:$1]]\'\'\' ആണ�‌. ([[Special:Prefixindex/$1|"$1" എന�ന വാക�കില�� ത�ടങ�ങ�ന�ന എല�ലാ താള�കള�ം]] | [[Special:WhatLinksHere/$1|"$1"എന�ന വാക�കിലേക�ക� കണ�ണി ചേര��ത�തിരിക�ക�ന�ന എല�ലാ താള�കള�ം]])',
+'searchsubtitle'           => 'താങ�കള�� അന�വേഷിച�ച വാക�ക� \'\'\'[[:$1]]\'\'\' ആണ�‌. ([[Special:Prefixindex/$1|"$1" എന�ന വാക�കില�� ത�ടങ�ങ�ന�ന എല�ലാ താള�കള�ം]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1"എന�ന വാക�കിലേക�ക� കണ�ണി ചേര��ത�തിരിക�ക�ന�ന എല�ലാ താള�കള�ം]])',
 'searchsubtitleinvalid'    => "താങ�കള�� തിരഞ�ഞത� '''$1'''",
 'noexactmatch'             => "'''\"[[\$1]]\" എന�ന താള�� ഈ വിക�കിയില�� നിലവിലില�ല.''' താങ�കള��ക�ക� [[:\$1|പ�രസ�ത�ത ശീര��ഷകത�തോട� കൂടിയ ഒര� താള��]] ത�ടങ�ങാവ�ന�നതാണ�.",
 'noexactmatch-nocreate'    => "'''\"\$1\" എന�ന താള�� നിലവിലില�ല.'''",
@@ -879,6 +915,8 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'prevn'                    => 'മ�മ�പത�തെ $1',
 'nextn'                    => 'അട�ത�ത $1',
 'viewprevnext'             => '($1 | $2 | $3 മാറ�റങ�ങള�� കാണ�ക)',
+'searchhelp-url'           => 'Help:ഉള�ളടക�കം',
+'searchprofile-images'     => 'പ�രമാണങ�ങള��',
 'search-result-size'       => '$1 ({{PLURAL:$2|ഒര� വാക�ക�|$2 വാക�ക�കള��}})',
 'search-redirect'          => '(തിരിച�ച�വിടല�� താള�� $1)',
 'search-section'           => '(വിഭാഗം $1)',
@@ -890,7 +928,7 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'searchall'                => 'എല�ലാം',
 'showingresults'           => "താഴെ #'''$2''' മ�തല�ള�ള {{PLURAL:$1|'''1''' ഫലം|'''$1''' ഫലങ�ങള��}} കാട�ട�ന�ന�",
 'showingresultsnum'        => "താഴെ #'''$2''' കൊണ�ട� ത�ടങ�ങ�ന�ന {{PLURAL:$3|'''1''' ഫലം|'''$3''' ഫലങ�ങള��}} കാണിച�ചിരിക�ക�ന�ന�.",
-'showingresultstotal'      => "{{PLURAL:$3|'''$1''' മ�തല�� '''$3''' വരെയ�ള�ള ഫലം|മൊത�തം '''$3''' ഫലങ�ങളില�� '''$1''' മ�തല�� '''$2''' വരെയ�ള�ളവ}} താഴെ കൊട�ത�തിരിക�ക�ന�ന�",
+'showingresultstotal'      => "{{PLURAL:$4|'''$1''' മ�തല�� '''$3''' വരെയ�ള�ള ഫലം|'''$3''' ഫലങ�ങളില�� '''$1''' മ�തല�� '''$2''' വരെയ�ള�ളവ}} താഴെ കൊട�ത�തിരിക�ക�ന�ന�",
 'nonefound'                => "'''ശ�രദ�ധിക�ക�ക''': ചില നാമമേഖലകള�� മാത�രമേ സ�വതവേ തിരയാറ�ള�ളൂ. എല�ലാ വിവരങ�ങളില�ം തിരയാന�� '''തിരയേണ�ട നാമമേഖലകള��''' ''എല�ലാം'' എന�നതോ ആവശ�യമായ നാമമേഖലമാത�രം തിരയ�വാന�� (സംവാദം, ഫലകം, ത�ടങ�ങിയവ) അത� മാത�രമായോ ടിക�ക� ചെയ�യേണ�ടതാണ�.",
 'powersearch'              => 'തിരയൂ',
 'powersearch-legend'       => 'വികസിതമായ തിരച�ചില��',
@@ -910,6 +948,7 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'qbsettings-fixedright' => 'സ�ഥിരമായ വലത�',
 'changepassword'        => 'രഹസ�യവാക�ക� മാറ�റ�ക',
 'skin'                  => 'രൂപം',
+'skin-preview'          => 'പ�രിവ�യൂ',
 'math'                  => 'സമവാക�യം',
 'dateformat'            => 'തീയതി പ�രദര��ശിപ�പിക�ക�ന�ന രീതി',
 'datedefault'           => 'ക�രമീകരണങ�ങള�� വേണ�ട',
@@ -926,11 +965,9 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'prefs-watchlist-days'  => 'ശ�രദ�ധിക�ക�ന�ന താള�കള�ടെ പട�ടികയില�� പ�രദര��ശിപ�പിക�കേണ�ട പരമാവധി ദിവസങ�ങള��:',
 'prefs-watchlist-edits' => 'ശ�രദ�ധിക�ക�ന�ന താള�കള�ടെ പട�ടികയ�ടെ വികസിത രൂപത�തില�� പ�രദര��ശിപ�പിക�കേണ�ട പരമാവധി മാറ�റങ�ങള��:',
 'prefs-misc'            => 'പലവക',
+'prefs-resetpass'       => 'രഹസ�യവാക�ക� മാറ�റ�ക',
 'saveprefs'             => 'സേവ� ചെയ�യ�ക',
 'resetprefs'            => 'സേവ� ചെയ�തിട�ടില�ലാത�ത മാറ�റങ�ങള�� പ�നഃക�രമീകരിക�ക�ക',
-'oldpassword'           => 'പഴയ രഹസ�യവാക�ക�:',
-'newpassword'           => 'പ�തിയ രഹസ�യവാക�ക�:',
-'retypenew'             => 'പ�തിയ പാസ�‌വേഡ� ഉറപ�പിക�ക�ക:',
 'textboxsize'           => 'തിര�ത�തല��',
 'rows'                  => 'വരി:',
 'columns'               => 'നിര:',
@@ -957,7 +994,7 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'userrights-lookup-user'   => 'ഉപയോക�തൃഗ�രൂപ�പ�കളെ പരിപാലിക�ക�ക',
 'userrights-user-editname' => 'ഒര� ഉപയോക�തൃനാമം ടൈപ�പ� ചെയ�യ�ക:',
 'editusergroup'            => 'ഉപയോക�തൃഗ�രൂപ�പ�കള�� തിര�ത�ത�ക',
-'editinguser'              => "'''[[User:$1|$1]]''' ന�റെ ഉപയോക�തൃ അവകാശങ�ങള�� തിര�ത�ത�ന�ന� ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "'''[[User:$1|$1]]''' ന�റെ ഉപയോക�തൃ അവകാശങ�ങള�� തിര�ത�ത�ന�ന� ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'ഉപയോക�തൃസമൂഹത�തിലെ അംഗത�വം തിര�ത�ത�ക',
 'saveusergroups'           => 'ഉപയോക�തൃഗ�രൂപ�പ�കള�� സേവ� ചെയ�യ�ക',
 'userrights-groupsmember'  => 'അംഗത�വമ�ള�ളത�:',
@@ -999,9 +1036,17 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'rightslogentry' => '$1ന�റെ ഗ�രൂപ�പ� അംഗത�വം $2ല�� നിന�ന� $3ലേക�ക� മാറ�റിയിരിക�ക�ന�ന�',
 'rightsnone'     => '(ഒന�ന�മില�ല)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'          => 'ഈ താൾ വായിക�ക�ക',
+'action-edit'          => 'ഈ താള�� തിര�ത�ത�ക',
+'action-createpage'    => 'താള�കള�� നിര��മിക�ക�ക',
+'action-createtalk'    => 'സംവാദ താള�കള�� നിര��മിക�ക�ക',
+'action-createaccount' => 'ഈ ഉപയോക�തൃനാമം സൃഷ�ടിക�ക�ക',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|മാറ�റം|മാറ�റങ�ങള��}}',
 'recentchanges'                     => 'പ�തിയ മാറ�റങ�ങള��',
+'recentchanges-legend'              => 'പ�തിയമാറ�റങ�ങള�ടെ ക�രമീകരണം',
 'recentchangestext'                 => '{{SITENAME}} സംരംഭത�തിലെ �റ�റവ�ം പ�തിയ മാറ�റങ�ങള�� ഇവിടെ കാണാം.',
 'recentchanges-feed-description'    => 'ഈ ഫീഡ� ഉപയോഗിച�ച� വിക�കിയിലെ പ�തിയ മാറ�റങ�ങള�� നിരീക�ഷിക�ക�ക.',
 'rcnote'                            => "കഴിഞ�ഞ {{PLURAL:$2|ദിവസം|'''$2''' ദിവസങ�ങള��ക�ക�ള�ളില��}} സംഭവിച�ച, {{PLURAL:$1|'''1''' തിര�ത�തല��|'''$1''' തിര�ത�തല�കള��}} താഴെക�കാണാം. ശേഖരിച�ച സമയം: $4, $5.",
@@ -1031,6 +1076,7 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'recentchangeslinked-title'    => '$1 എന�ന താള�മായി ബന�ധപ�പെട�ട മാറ�റങ�ങള��',
 'recentchangeslinked-noresult' => 'ഈ താളിലേയ�ക�ക� കണ�ണികള�ള�ള മറ�റ� താള�കള��ക�ക� ഇവിടെ സൂചിപ�പിക�കപ�പെട�ട സമയത�ത� മാറ�റങ�ങളൊന�ന�ം സം‌ഭവിച�ചിട�ടില�ല.',
 'recentchangeslinked-summary'  => "ഒര� പ�രത�യേക താളില�� നിന�ന� കണ�ണി ചേര��ക�കപ�പെട�ടിട�ട�ള�ള താള�കളില�� അവസാനമായി വര�ത�തിയ മാറ�റങ�ങള�ടെ പട�ടിക താഴെ പ�രദര��ശിപ�പിച�ചിരിക�ക�ന�ന�. ഈ പട�ടികയില�� പെട�ന�ന [[Special:Watchlist|നിങ�ങള�� ശ�രദ�ധിക�ക�ന�ന താള�കള��]] '''കട�പ�പിച�ച�''' കാണിച�ചിരിക�ക�ന�ന�.",
+'recentchangeslinked-page'     => 'താളിന�റെ പേര�:',
 
 # Upload
 'upload'                      => 'അപ�‌ലോഡ�‌',
@@ -1042,13 +1088,13 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'upload_directory_read_only'  => 'വെബ�ബ� സെര��‌വറിന� അപ�‌ലോഡ� ഡയറക�ടറിയിലേക�ക� ($1) എഴ�താന�� കഴിഞ�ഞില�ല.',
 'uploaderror'                 => 'അപ�‌ലോഡ� പിശക�',
 'uploadtext'                  => "താഴെ കാണ�ന�ന ഫോം പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�വാന�� വേണ�ടി ഉപയോഗിക�ക�ക.
-നിലവില�� അപ�‌ലോഡ� ചെയ�തിരിക�ക�ന�ന പ�രമാണങ�ങള�� കാണ�വാന�� [[Special:ImageList|അപ�‌ലോഡ� ചെയ�ത പ�രമാണങ�ങള�ടെ പട�ടിക]] സന�ദര��ശിക�ക�ക. [[Special:Log/upload|അപ�‌ലോഡ� ലോഗില�ം]] അപ�‌ലോഡിന�റേയ�ം മായ�ക�കലിന�റേയ�ം വിവരങ�ങള�� കാണാവ�ന�നതാണ�‌.
+നിലവില�� അപ�‌ലോഡ� ചെയ�തിരിക�ക�ന�ന പ�രമാണങ�ങള�� കാണ�വാന�� [[Special:FileList|അപ�‌ലോഡ� ചെയ�ത പ�രമാണങ�ങള�ടെ പട�ടിക]] സന�ദര��ശിക�ക�ക. [[Special:Log/upload|അപ�‌ലോഡ� ലോഗില�ം]] അപ�‌ലോഡിന�റേയ�ം മായ�ക�കലിന�റേയ�ം വിവരങ�ങള�� കാണാവ�ന�നതാണ�‌.
 
 പ�രമാണം താളില�� പ�രദര��ശിപ�പിക�ക�വാന�� താഴെ കാണ�ന�ന ഒര� വഴി സ�വീകരിക�ക�ക
 
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
 
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|പ�രമാണത�തിന�റെ അടിക�ക�റിപ�പ�]]</nowiki>''' അല�ലെങ�കില��
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|പ�രമാണത�തിന�റെ അടിക�ക�റിപ�പ�]]</nowiki>''' അല�ലെങ�കില��
 
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' പ�രമാണത�തെ നേരിട�ട� കണ�ണി ചേര��ക�കാന�� .",
 'upload-permitted'            => 'അന�വദനീയമായ ഫയല�� തരങ�ങള��: $1.',
@@ -1075,18 +1121,18 @@ $3 അതിന� കാണിച�ചിരിക�ക�ന�ന കാര
 'large-file'                  => 'പ�രമാണങ�ങള�ടെ വലിപ�പം $1-ല�� കൂടര�തെന�നാണ�‌ നിഷ�ക�കര��ഷിക�കപ�പെട�ടിരിക�ക�ന�നത�. ഈ പ�രമാണത�തിന�റെ വലിപ�പം $2 ആണ�‌.',
 'largefileserver'             => 'സെര��‌വറില�� ചിട�ടപ�പെട�ത�തിയത�പ�രകാരം ഈ പ�രമാണത�തിന�റെ വലിപ�പം അന�വദനീയമായതില�ം കൂട�തലാണ�‌.',
 'emptyfile'                   => 'താങ�കള�� അപ�‌ലോഡ� ചെയ�ത പ�രമാണം ശൂന�യമാണെന�ന� കാണ�ന�ന�. പ�രമാണത�തിന�റെ പേരില�ള�ള അക�ഷരത�തെറ�റായിരിക�കാം ഇതിന� കാരണം. ഈ പ�രമാണം അപ�‌ലോഡ� ചെയ�യണമോ എന�നത� ഒരിക�കല�� കൂടി പരിശോധിക�ക�ക.',
-'fileexists'                  => 'ഇതേ പേരില�� വേറെ ഒര� പ�രമാണം നിലവില�ണ�ട�. ദയവായി <strong><tt>$1</tt></strong> പരിശോധിച�ച� പ�രസ�ത�ത പ�രമാണം മാറ�റണമോ എന�ന� തീര�മാനിക�ക�ക.',
-'filepageexists'              => 'ഇതേ പേരില�� ഒര� താള�� (<strong><tt>$1</tt></strong>) (പ�രമാണം അല�ല) നിലവില�ണ�ട�. നിങ�ങള�� ഇവിടെ ചേര��ക�ക�ന�ന പ�രമാണത�തിന�റെ ലഘ�ക�റിപ�പ� പ�രസ�ത�ത താളില�� യാന�ത�രികമായി വരില�ല. അതിന� നിങ�ങള�� പ�രസ�ത�ത താളില�� കായികമായി തിര�ത�തല�� നടത�തണം.',
-'fileexists-extension'        => 'ഇതേ പേരില�� വേറെ ഒര� പ�രമാണം നിലവില�ണ�ട�:<br />
-ഇപ�പോള�� അപ�‌ലോഡ� ചെയ�ത പ�രമാണത�തിന�റെ പേര�‌: <strong><tt>$1</tt></strong><br />
-നിലവില�ള�ള പ�രമാണത�തിന�റെ പേര�‌: <strong><tt>$2</tt></strong><br />
-വേറെ ഒര� പേര� തിരഞ�ഞെട�ക�ക�ക.',
+'fileexists'                  => "ഇതേ പേരില�� വേറെ ഒര� പ�രമാണം നിലവില�ണ�ട�. ദയവായി '''<tt>$1</tt>''' പരിശോധിച�ച� പ�രസ�ത�ത പ�രമാണം മാറ�റണമോ എന�ന� തീര�മാനിക�ക�ക.",
+'filepageexists'              => "ഇതേ പേരില�� ഒര� താള�� ('''<tt>$1</tt>''') (പ�രമാണം അല�ല) നിലവില�ണ�ട�. നിങ�ങള�� ഇവിടെ ചേര��ക�ക�ന�ന പ�രമാണത�തിന�റെ ലഘ�ക�റിപ�പ� പ�രസ�ത�ത താളില�� യാന�ത�രികമായി വരില�ല. അതിന� നിങ�ങള�� പ�രസ�ത�ത താളില�� കായികമായി തിര�ത�തല�� നടത�തണം.",
+'fileexists-extension'        => "ഇതേ പേരില�� വേറെ ഒര� പ�രമാണം നിലവില�ണ�ട�:<br />
+ഇപ�പോള�� അപ�‌ലോഡ� ചെയ�ത പ�രമാണത�തിന�റെ പേര�‌: '''<tt>$1</tt>'''<br />
+നിലവില�ള�ള പ�രമാണത�തിന�റെ പേര�‌: '''<tt>$2</tt>'''<br />
+വേറെ ഒര� പേര� തിരഞ�ഞെട�ക�ക�ക.",
 'fileexists-thumb'            => "<center>'''നിലവില�ള�ള പ�രമാണം'''</center>",
-'fileexists-thumbnail-yes'    => 'ഈ ചിത�രം വലിപ�പം ക�റച�ച ഒന�നാണെന�ന� <i>(നഖചിത�രം)</i> കാണ�ന�ന�. ദയവായി <strong><tt>$1</tt></strong> എന�ന ചിത�രം പരിശോധിക�ക�ക. <br />
-$1 ഉം ഈ ചിത�രവ�ം ഒന�നാണെങ�കില�� നഖചിത�രത�തിന� വേണ�ടി മാത�രമായി ചിത�രം അപ�‌ലോഡ� ചെയ�യേണ�ടതില�ല.',
-'file-thumbnail-no'           => 'പ�രമാണത�തിന�റെ പേര�‌  <strong><tt>$1</tt></strong> ലാണ�‌ ത�ടങ�ങ�ന�നത�. ഇത� വലിപ�പം ക�റച�ച ഒര� ചിത�രം <i>(നഖചിത�രം)</i> ആണെന�ന� കാണ�ന�ന�. പൂര��ണ�ണ റെസലൂഷന�� ഉള�ള ചിത�രം ഉണ�ടെങ�കില�� അത� അപ�‌ലോഡ� ചെയ�യ�വാന�� താല�പര�യപ�പെട�ന�ന�. അല�ലെങ�കില�� പ�രമാണത�തിന�റെ പേര� മാറ�റ�വാന�� അഭ�യര��ത�ഥിക�ക�ന�ന�.',
-'fileexists-forbidden'        => 'ഈ പേരില�� ഒര� പ�രമാണം നിലവില�ണ�ട�. ദയവ� ചെയ�ത� വേറൊര� പേരില�� ഈ പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�ക. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'ഈ പേരില�� ഒര� പ�രമാണം നിലവില�ണ�ട�. ദയവായി തിരിച�ച� പോയി പ�തിയ ഒര� പേരില�� ഈ പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�ക.[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "ഈ ചിത�രം വലിപ�പം ക�റച�ച ഒന�നാണെന�ന� ''(നഖചിത�രം)'' കാണ�ന�ന�. ദയവായി '''<tt>$1</tt>''' എന�ന ചിത�രം പരിശോധിക�ക�ക. <br />
+$1 ഉം ഈ ചിത�രവ�ം ഒന�നാണെങ�കില�� നഖചിത�രത�തിന� വേണ�ടി മാത�രമായി ചിത�രം അപ�‌ലോഡ� ചെയ�യേണ�ടതില�ല.",
+'file-thumbnail-no'           => "പ�രമാണത�തിന�റെ പേര�‌  '''<tt>$1</tt>''' ലാണ�‌ ത�ടങ�ങ�ന�നത�. ഇത� വലിപ�പം ക�റച�ച ഒര� ചിത�രം ''(നഖചിത�രം)'' ആണെന�ന� കാണ�ന�ന�. പൂര��ണ�ണ റെസലൂഷന�� ഉള�ള ചിത�രം ഉണ�ടെങ�കില�� അത� അപ�‌ലോഡ� ചെയ�യ�വാന�� താല�പര�യപ�പെട�ന�ന�. അല�ലെങ�കില�� പ�രമാണത�തിന�റെ പേര� മാറ�റ�വാന�� അഭ�യര��ത�ഥിക�ക�ന�ന�.",
+'fileexists-forbidden'        => 'ഈ പേരില�� ഒര� പ�രമാണം നിലവില�ണ�ട�. ദയവ� ചെയ�ത� വേറൊര� പേരില�� ഈ പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�ക. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'ഈ പേരില�� ഒര� പ�രമാണം നിലവില�ണ�ട�. ദയവായി തിരിച�ച� പോയി പ�തിയ ഒര� പേരില�� ഈ പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�ക.[[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'അപ�‌ലോഡ� വിജയിച�ചിരിക�ക�ന�ന�',
 'uploadwarning'               => 'അപ�‌ലോഡ� മ�ന�നറിയിപ�പ�',
 'savefile'                    => 'ഫയല�� കാത�ത� സൂക�ഷിക�ക�ക',
@@ -1105,7 +1151,7 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 
 ഈ പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�ന�നത� ത�ടരണമോ എന�നത� പരിശോധിക�ക�ന�നത� നന�നായിരിക�ക�ം.
 നിങ�ങള�ടെ പരിശോധനയ�ക�കായി പ�രമാണത�തിന�റെ മായ�ക�കല�� ലോഗ� ഇവിടെ കൊട�ത�തിരിക�ക�ന�ന�:",
-'filename-bad-prefix'         => 'താങ�കള�� അപ�‌ലോഡ� ചെയ�യ�വാന�� ശ�രമിക�ക�ന�ന പ�രമാണത�തിന�റെ പേര�‌ <strong>"$1"</strong> എന�നാണ�‌ ത�ടങ�ങ�ന�നത�. ഇത� ഡിജിറ�റല�� ക�യാമറയില�� പടങ�ങള��ക�ക� യാന�ത�രികമായി ചേര��ക�ക�ന�ന പേരാണ�‌. ദയവ� ചെയ�ത� താങ�കള�� അപ�‌ലോഡ� ചെയ�യ�ന�ന പ�രമാണത�തെ വിശദീകരിക�ക�ന�ന അന�യോജ�യമായ ഒര� പേര� തിരഞ�ഞെട�ക�ക�ക.',
+'filename-bad-prefix'         => "താങ�കള�� അപ�‌ലോഡ� ചെയ�യ�വാന�� ശ�രമിക�ക�ന�ന പ�രമാണത�തിന�റെ പേര�‌ '''\"\$1\"''' എന�നാണ�‌ ത�ടങ�ങ�ന�നത�. ഇത� ഡിജിറ�റല�� ക�യാമറയില�� പടങ�ങള��ക�ക� യാന�ത�രികമായി ചേര��ക�ക�ന�ന പേരാണ�‌. ദയവ� ചെയ�ത� താങ�കള�� അപ�‌ലോഡ� ചെയ�യ�ന�ന പ�രമാണത�തെ വിശദീകരിക�ക�ന�ന അന�യോജ�യമായ ഒര� പേര� തിരഞ�ഞെട�ക�ക�ക.",
 
 'upload-proto-error'      => 'തെറ�റായ പ�രോട�ടോക�കോള��',
 'upload-proto-error-text' => 'റിമോട�ട� അപ�‌ലോഡിന� <code>http://</code> അല�ലെങ�കില�� <code>ftp://</code> യില�� ത�ടങ�ങ�ന�ന URL വേണം.',
@@ -1126,18 +1172,18 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'upload_source_url'  => '(സാധ�വായ, ആര��ക�ക�ം ഉപയോഗിക�കാവ�ന�ന URL)',
 'upload_source_file' => '(താങ�കള�ടെ കമ�പ�യൂട�ടറില�ള�ള ഒര� പ�രമാണം)',
 
-# Special:ImageList
-'imagelist-summary'     => 'ച�ര�ക�കം',
-'imagelist_search_for'  => 'മീഡിയ പ�രമാണം തിരയ�ക:',
+# Special:ListFiles
+'listfiles-summary'     => 'ച�ര�ക�കം',
+'listfiles_search_for'  => 'മീഡിയ പ�രമാണം തിരയ�ക:',
 'imgfile'               => 'പ�രമാണം',
-'imagelist'             => 'പ�രമാണങ�ങള�ടെ പട�ടിക',
-'imagelist_date'        => 'തിയതി',
-'imagelist_name'        => 'പേര�',
-'imagelist_user'        => 'ഉപയോക�താവ�',
-'imagelist_size'        => 'വല�പ�പം',
-'imagelist_description' => 'വിവരണം',
-
-# Image description page
+'listfiles'             => 'പ�രമാണങ�ങള�ടെ പട�ടിക',
+'listfiles_date'        => 'തിയതി',
+'listfiles_name'        => 'പേര�',
+'listfiles_user'        => 'ഉപയോക�താവ�',
+'listfiles_size'        => 'വല�പ�പം',
+'listfiles_description' => 'വിവരണം',
+
+# File description page
 'filehist'                  => 'പ�രമാണ നാള��‌വഴി',
 'filehist-help'             => '�തെങ�കില�ം തീയതി/സമയ കണ�ണിയില�� ഞെക�കിയാല�� പ�രസ�ത�തസമയത�ത� ഈ പ�രമാണം എങ�ങിനെയായിര�ന�ന� എന�ന� കാണാം.',
 'filehist-deleteall'        => 'എല�ലാം മായ�ക�ക�ക',
@@ -1181,7 +1227,6 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'filedelete-success'          => "'''$1''' മായ�ച�ച� കഴിഞ�ഞ�.",
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' യയ�ടെ [$3, $2 ഉണ�ടായിര�ന�ന] പതിപ�പ� മായ�ച�ചിരിക�ക�ന�ന�.</span>',
 'filedelete-nofile'           => "{{SITENAME}} സം‌രംഭത�തില�� '''$1''' എന�ന പ�രമാണം നിലവിലില�ല.",
-'filedelete-iscurrent'        => 'നിങ�ങള�� ഈ പ�രമാണത�തിന�റെ �റ�റവ�ം പ�തിയ പതിപ�പാണ� മായ�ക�ക�വാന�� ശ�രമിക�ക�ന�നത�. ആദ�യം പഴയൊര� പതിപ�പിലേക�ക� തിരിച�ച� പോവ�ക.',
 'filedelete-otherreason'      => 'മറ�റ�/കൂട�തല�� കാരണങ�ങള��:',
 'filedelete-reason-otherlist' => 'മറ�റ� കാരണങ�ങള��',
 'filedelete-reason-dropdown'  => '*നീക�കം ചെയ�യാന�ള�ള സാധാരണ കാരണങ�ങള��
@@ -1208,27 +1253,24 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 
 # Random page
 'randompage'         => '�തെങ�കില�ം താള��',
-'randompage-nopages' => 'ഈ നെയിംസ�പേസില�� താള�കളൊന�ന�മില�ല.',
+'randompage-nopages' => '$1 എന�ന നെയിംസ�പേസില�� താള�കളൊന�ന�മില�ല.',
 
 # Random redirect
 'randomredirect'         => 'ക�രമരഹിതമായ തിരിച�ച�വിടല��',
-'randomredirect-nopages' => 'ഈ നെയിംസ�പേസില�� തിരിച�ച�വിടല�� താള�കളൊന�ന�മില�ല.',
+'randomredirect-nopages' => '$1 എന�ന നെയിംസ�പേസില�� തിരിച�ച�വിടല�� താള�കളൊന�ന�മില�ല.',
 
 # Statistics
-'statistics'             => 'സ�ഥിതിവിവരക�കണക�ക�കള��',
-'sitestats'              => '{{SITENAME}} സം‌രംഭത�തിന�റെ സ�ഥിതിവിവരക�കണക�ക�കള��',
-'userstats'              => 'ഉപയോക�താക�കള�ടെ സ�ഥിതിവിവരക�കണക�ക�കള��',
-'sitestatstext'          => "ഡാറ�റാബേസില�� {{PLURAL:$1|ഒര� താള�ണ�ട�|മൊത�തം '''$1''' താള�കള�ണ�ട�}}.
-
-ഇത� സം‌വാദം താള�കള�ം, {{SITENAME}} സം‌രംഭത�തെക�ക�റിച�ച�ള�ള താള�കള�ം, വളരെ ക�റച�ച� ഉള�ളടക�കം ഉള�ള അപൂര��ണ�ണ താള�കള�ം. തിരിച�ച�വിടല�� താള�കള�ം, ലേഖന താള�കളായി പരിഗണിക�കാന�� പറ�റാത�ത ബാക�കി എല�ലാ താള�കള�ം ഉള��പ�പെട�ന�ന�. അവയെല�ലാം ഒഴിവാക�കിയാല��,  ഇപ�പോള��  {{PLURAL:$2|ഒര� താള�� |'''$2''' താള�കള�� }} വിവരദാതാക�കളായി നിലവില�ണ�ട�.
-
-'''$8''' {{PLURAL:$8|പ�രമാണം|പ�രമാണങ�ങള��}} അപ�‌ലോഡ� ചെയ�യപ�പെട�ടിട�ട�ണ�ട�.
-
-{{SITENAME}} സം‌രംഭം സ�ഥാപിക�കപ�പെട�ടതില�� പിന�നെ '''$3''' {{PLURAL:$3|page view|page views}} ഉണ�ടായിട�ട�ണ�ട�. മാത�രമല�ല '''$4''' {{PLURAL:$4|തിര�ത�തല��|തിര�ത�തല�കള��}} നടന�നിട�ട�ണ�ട�. ഇത� പ�രകാരം ശരാശരി ഒര� താള�� '''$5''' പ�രാവശ�യം തിര�ത�തപ�പെട�കയ�ം, ഓരോ എഡിറ�റിന�ം '''$6''' പ�രാവശ�യം കാണ�കയ�ം ചെയ�തിട�ട�ണ�ട�.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue ജോബ� ക�യൂവിന�റെ] നീളം '''$7''' ആണ�‌.",
-'userstatstext'          => "{{SITENAME}} സം‌രംഭത�തില�� {{PLURAL:$1|'''1''' രജിസ�റ�റേര��ഡ� [[Special:ListUsers|ഉപയോക�താവ�]]| '''$1''' രെജിസ�റ�റേര��ഡ� [[Special:ListUsers|ഉപയോക�താക�കള�� ഉണ�ട�.]]}}. അതില�� '''$2'''  (or '''$4%''') {{PLURAL:$2|ഉപയോക�താവിന�|ഉപയോക�താക�കള��ക�ക�}} $5 അവകാശം ഉണ�ട�.",
-'statistics-mostpopular' => '�റ�റവ�മധികം സന�ദര��ശിക�കപ�പെട�ട താള�കള��',
+'statistics'               => 'സ�ഥിതിവിവരക�കണക�ക�കള��',
+'statistics-header-pages'  => 'താള�� സ�ഥിതിവിവരക�കണക�ക�കള��',
+'statistics-header-edits'  => 'തിര�ത�തല�� സ�ഥിതിവിവരക�കണക�ക�കള��',
+'statistics-header-users'  => 'ഉപയോക�താക�കള�ടെ സ�ഥിതിവിവരക�കണക�ക�കള��',
+'statistics-articles'      => 'ലേഖനങ�ങള��',
+'statistics-pages'         => 'താള�കള��',
+'statistics-edits'         => '{{SITENAME}}യ�ടെ ത�ടക�കം മ�തലേയ�ള�ള തിര�ത�തല�കള��',
+'statistics-edits-average' => 'ഒര� താളില�� ശരാശരി തിര�ത�തല�കള��',
+'statistics-users'         => 'രജിസ�റ�റര�� ചെയ�തിട�ട�ള�ള [[Special:ListUsers|ഉപയോക�താക�കള��]]',
+'statistics-users-active'  => 'സജീവ ഉപയോക�താക�കള��',
+'statistics-mostpopular'   => '�റ�റവ�മധികം സന�ദര��ശിക�കപ�പെട�ട താള�കള��',
 
 'disambiguations'      => 'നാനാര��ത�ഥ താള�കള��',
 'disambiguationspage'  => 'Template:നാനാര��ത�ഥം',
@@ -1250,7 +1292,7 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 
 # Miscellaneous special pages
 'nbytes'                  => '$1 {{PLURAL:$1|ബൈറ�റ�|ബൈറ�റ�കള��}}',
-'ncategories'             => '$1 {{PLURAL:$1|വിഭാഗം|വിഭാഗങ�ങള��}}',
+'ncategories'             => '$1 {{PLURAL:$1|വര��ഗ�ഗം|വര��ഗ�ഗങ�ങള��}}',
 'nlinks'                  => '$1 {{PLURAL:$1|കണ�ണി|കണ�ണികള��}}',
 'nmembers'                => '$1 {{PLURAL:$1|അംഗം|അംഗങ�ങള��}}',
 'nrevisions'              => '$1 {{PLURAL:$1|പതിപ�പ�|പതിപ�പ�കള��}}',
@@ -1258,7 +1300,7 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'specialpage-empty'       => 'ഈ താള�� ശൂന�യമാണ�.',
 'lonelypages'             => 'അനാഥ താള�കള��',
 'lonelypagestext'         => 'താഴെക�കാണ�ന�ന താള�കളിലേക�ക� {{SITENAME}} സം‌രംഭത�തിലെ മറ�റ� താള�കളില��നിന�ന�ം കണ�ണികള�� നിലവിലില�ല.',
-'uncategorizedpages'      => 'വിഭാഗം ചേര��ത�തിട�ടില�ലാത�ത താള�കള��',
+'uncategorizedpages'      => 'വര��ഗ�ഗം ചേര��ത�തിട�ടില�ലാത�ത താള�കള��',
 'uncategorizedcategories' => 'വിഭാഗീകരിക�കപ�പെടാത�ത വിഭാഗങ�ങള��',
 'uncategorizedimages'     => 'വിഭാഗീകരിക�കപ�പെടാത�ത ചിത�രങ�ങള��',
 'uncategorizedtemplates'  => 'വിഭാഗീകരിക�കാത�ത ഫലകങ�ങള��',
@@ -1267,6 +1309,8 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'popularpages'            => 'ജനപ�രീതിയ�ള�ള താള�കള��',
 'wantedcategories'        => 'അവശ�യ വിഭാഗങ�ങള��',
 'wantedpages'             => 'അവശ�യ താള�കള��',
+'wantedfiles'             => 'ആവശ�യമ�ള�ള ഫയല�കള��',
+'wantedtemplates'         => 'ആവശ�യമ�ള�ള ഫലകങ�ങള��',
 'mostlinked'              => '�റ�റവ�മധികം കണ�ണികളാല�� ബന�ധിപ�പിക�കപ�പെട�ട താള�കള��',
 'mostlinkedcategories'    => 'വിഭാഗങ�ങളിലേക�ക� �റ�റവ�മധികം കണ�ണിയ�ള�ള താള�കള��',
 'mostlinkedtemplates'     => 'ഫലകങ�ങളിലേക�ക� �റ�റവ�മധികം കണ�ണിയ�ള�ള താള�കള��',
@@ -1308,8 +1352,6 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'speciallogtitlelabel' => 'ശീര��ഷകം:',
 'log'                  => 'പ�രവര��ത�തന രേഖകള��',
 'all-logs-page'        => 'എല�ലാ പ�രവര��ത�തനരേഖകള�ം',
-'log-search-legend'    => 'പ�രവര��ത�തനരേഖകള��ക�കായി തിരയ�ക',
-'log-search-submit'    => 'പോകൂ',
 'alllogstext'          => '{{SITENAME}} സംരംഭത�തില�� ലഭ�യമായ പ�രവര��ത�തന രേഖകള�� സംയ�ക�തമായി ഈ താളില�� കാണാം. താങ�കള��ക�ക� രേഖകള�ടെ സ�വഭാവം, ഉപയോക�തൃനാമം, ബന�ധപ�പെട�ട താള�� മ�തലായവ തിരഞ�ഞെട�ത�ത� അന�വേഷണം കൂട�തല�� ക�ഌപ�തപ�പെട�ത�താവ�ന�നതാണ�.',
 'logempty'             => 'താള�മായി ബന�ധപ�പെട�ട രേഖകള�� ഒന�ന�ം തന�നെയില�ല.',
 'log-title-wildcard'   => 'ഈ വാക�കില�� ത�ടങ�ങ�ന�ന തിരച�ചില�� ഫലങ�ങള��',
@@ -1327,21 +1369,43 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'allpagesnext'      => 'അട�ത�തത�',
 'allpagessubmit'    => 'പോകൂ',
 'allpagesprefix'    => 'പൂര��‌വ�വപ�രത�യയമ�ള�ള താള�കള�� പ�രദര��ശിപ�പിക�ക�ക:',
-'allpages-bad-ns'   => '{{SITENAME}} സംരംഭത�തില�� "$1" എന�ന നെയിംസ�പേസ� നിലവിലില�ല.',
+'allpages-bad-ns'   => '{{SITENAME}} സംരംഭത�തില�� "$1" എന�ന നാമമേഖല നിലവിലില�ല.',
 
 # Special:Categories
 'categories'                  => 'വിഭാഗങ�ങള��',
 'categoriespagetext'          => 'താഴെ കൊട�ത�തിരിക�ക�ന�ന വിഭാഗങ�ങളില�� താള�കള�ം പ�രമാണങ�ങള�മ�ണ�ട�. [[Special:UnusedCategories|ഉപയോഗിക�കപ�പെടാത�ത വിഭാഗങ�ങള��]] ഇവിടെ കാണിക�ക�ന�നില�ല. [[Special:WantedCategories|അവശ�യവിഭാഗങ�ങള��]] കൂടി കാണ�ക.',
 'special-categories-sort-abc' => 'അക�ഷരമാലാക�രമത�തില�� ക�രമീകരിക�ക�ക',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'മായ�ക�കപ�പെട�ട ഉപയോക�തൃസംഭാവനകള��',
+
+# Special:LinkSearch
+'linksearch'       => 'വെബ�ബ� കണ�ണികള�� തിരയ�ക',
+'linksearch-pat'   => 'തിരച�ചിലിന�റെ മാതൃക:',
+'linksearch-ns'    => 'നെയിംസ�പേസ�:',
+'linksearch-ok'    => 'തിരയൂ',
+'linksearch-text'  => '"*.wikipedia.org" പോല�ള�ള വൈല��ഡ� കാര��ഡ�കള�� ഉപയോഗിക�കാവ�ന�നതാണ�‌.<br />
+പിന�താങ�ങ�ന�ന പ�രോട�ടോക�കോള�കള��: <tt>$1</tt>',
+'linksearch-line'  => '$1,  $2ല�� നിന�ന� കണ�ണി ചേര��ക�കപ�പെട�ടിരിക�ക�ന�ന�.',
+'linksearch-error' => 'ഹോസ�റ�റ�നെയിമിന�റെ ത�ടക�കത�തില�� മാത�രമേ വൈല��ഡ� കാര��ഡ�കള�� വരാവൂ.',
+
 # Special:ListUsers
 'listusersfrom'      => 'ഇതില�� ത�ടങ�ങ�ന�ന ഉപയോക�താക�കളെ പ�രദര��ശിപ�പിക�ക�ക:',
 'listusers-submit'   => 'പ�രദര��ശിപ�പിക�ക�ക',
 'listusers-noresult' => 'ഈ ഗ�രൂപ�പില�� ഉള��പ�പെട�ന�ന ഉപയോക�താക�കള�� ആര�ം ഇല�ല.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'പ�തിയ ഉപയോക�താക�കള�ടെ പട�ടിക',
+'newuserlogpagetext'          => 'പ�തിയതായി അംഗത�വമെട�ത�ത ഉപയോക�താക�കള�ടെ പട�ടിക താഴെ കാണാം.',
+'newuserlog-byemail'          => 'രഹസ�യവാക�ക� ഇ-മെയില�� വഴി അയച�ചിരിക�ക�ന�ന�',
+'newuserlog-create-entry'     => 'പ�തിയ ഉപയോക�താവ�',
+'newuserlog-create2-entry'    => '$1 എന�ന ഉപയോക�താവിന�വേണ�ടി അക�കൗണ�ട� സൃഷ�ടിച�ചിരിക�ക�ന�ന�',
+'newuserlog-autocreate-entry' => 'അക�കൗണ�ട� യാന�ത�രികമായി ഉണ�ടാക�കിയിരിക�ക�ന�ന�',
+
 # Special:ListGroupRights
-'listgrouprights'       => 'ഉപയോക�തൃവിഭാഗത�തിന�റെ അവകാശങ�ങള��',
-'listgrouprights-group' => 'ഗ�രൂപ�പ�',
+'listgrouprights'         => 'ഉപയോക�തൃവിഭാഗത�തിന�റെ അവകാശങ�ങള��',
+'listgrouprights-group'   => 'ഗ�രൂപ�പ�',
+'listgrouprights-members' => '(അംഗങ�ങള�ടെ പട�ടിക)',
 
 # E-mail user
 'mailnologin'     => 'അയയ�ക�കാന�ള�ള വിലാസം ലഭ�യമല�ല',
@@ -1391,12 +1455,7 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'iteminvalidname'      => "ഇനം '$1' ല�� പിഴവ�, അസാധ�വായ പേര�‌�...",
 'wlnote'               => "കഴിഞ�ഞ {{PLURAL:$2|മണിക�കൂറില��|'''$2''' മണിക�കൂറില��}} നടന�ന {{PLURAL:$1|ഒര� പ�തിയ മാറ�റം|'''$1''' പ�തിയ മാറ�റങ�ങള��}} താഴെ പ�രദര��ശിപ�പിച�ചിരിക�ക�ന�ന�.",
 'wlshowlast'           => 'ഒട�വിലത�തെ $1 മണിക�കൂറ�കള�� $2 ദിനങ�ങള��, $3 കാട�ട�ക',
-'watchlist-show-bots'  => 'ബോട�ട�കള�ടെ തിര�ത�തല�കള�� കാട�ട�ക',
-'watchlist-hide-bots'  => 'ബോട�ട�കള�ടെ തിര�ത�തല�കള�� മറയ�ക�ക�ക',
-'watchlist-show-own'   => 'എന�റെ തിര�ത�തല�കള�� കാട�ട�ക',
-'watchlist-hide-own'   => 'എന�റെ തിര�ത�തല�കള�� മറയ�ക�ക�ക',
-'watchlist-show-minor' => 'ചെറ�തിര�ത�തല�കള�� കാട�ട�ക',
-'watchlist-hide-minor' => 'ചെറ�തിര�ത�തല�കള�� മറയ�ക�ക�ക',
+'watchlist-options'    => 'ശ�രദ�ധിക�ക�ന�ന താള�കള�ടെ സജ�ജീകരണങ�ങള��',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ശ�രദ�ധിക�ക�ന�ന�...',
@@ -1413,28 +1472,28 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'enotif_lastdiff'              => 'ഈ മാറ�റം ദര��ശിക�കാന�� $1 കാണ�ക.',
 'enotif_anon_editor'           => 'അജ�ഞാത ഉപയോക�താവ� $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'താള�� മായ�ക�ക�ക',
-'confirm'                     => 'സ�ഥിരീകരിക�ക�ക',
-'excontent'                   => "ഉള�ളടക�കം: '$1'",
-'excontentauthor'             => "ഉള�ളടക�കം: '$1' ('[[Special:Contributions/$2|$2]]' മാത�രമേ ഈ താളില�� തിര�ത�തല�� നടത�തിയിട�ട�ള�ളൂ�‌)",
-'exbeforeblank'               => "ശൂന�യമാക�കപ�പെട�ന�നതിന� മ�മ�പ�ള�ള ഉള�ളടക�കം: '$1'",
-'exblank'                     => 'താള�� ശൂന�യമായിര�ന�ന�',
-'delete-confirm'              => '"$1" മായ�ക�ക�ക',
-'delete-legend'               => 'മായ�ക�ക�ക',
-'historywarning'              => 'മ�ന�നറിയിപ�പ�: നിങ�ങള�� മായ�ക�ക�വാന�� പോക�ന�ന താള�� തിര�ത�തല�� ചരിത�രം ഉള�ള ഒര� താളാണ�.',
-'confirmdeletetext'           => 'നിങ�ങള�� ഒര� താള�� അതിന�റെ തിര�ത�തല�� ചരിത�രമടക�കം മായ�ക�ക�വാന�� പോവ�കയാണ�. നിങ�ങള�� ചെയ�യ�ന�നതിന�റെ പരിണതഫലം നിങ�ങള��ക�കറിയാമെന�ന�ം, നിങ�ങള�ടെ ഈ മായ�ക�കല�� [[{{MediaWiki:Policy-url}}|വിക�കിയ�ടെ നയം]] അന�സരിച�ചാണ� ചെയ�യ�ന�നതെന�ന�ം ഉറപ�പാക�ക�ക.',
-'actioncomplete'              => 'പ�രവൃത�തി പൂര��ത�തിയായിരിക�ക�ന�ന�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" മായ�ച�ചിരിക�ക�ന�ന�. പ�തിയതായി നടന�ന മായ�ക�കല�കള�ടെ വിവരങ�ങള�� $2 ഉപയോഗിച�ച� കാണാം.',
-'deletedarticle'              => '"[[$1]]" മായ�ച�ചിരിക�ക�ന�ന�',
-'dellogpage'                  => 'മായ�ക�കല�� പട�ടിക',
-'dellogpagetext'              => 'സമീപകാലത�ത� മായ�ച�ച�കളഞ�ഞ താള�കള�ടെ പട�ടിക താഴെ കാണാം.',
-'deletionlog'                 => 'മായ�ക�കല�� പട�ടിക',
-'reverted'                    => 'പൂര��‌വ�വസ�ഥിതിയിലേക�കാക�കിയിരിക�ക�ന�ന�.',
-'deletecomment'               => 'നീക�കം ചെയ�യാന�ള�ള കാരണം',
-'deleteotherreason'           => 'മറ�റ�/കൂട�തല�� കാരണങ�ങള��:',
-'deletereasonotherlist'       => 'മറ�റ� കാരണങ�ങള��',
-'deletereason-dropdown'       => '*താള�� മായ�ക�ക�ന�നതിന� സാധാരണ വരാറ�ള�ള കാരണങ�ങള��
+# Delete
+'deletepage'             => 'താള�� മായ�ക�ക�ക',
+'confirm'                => 'സ�ഥിരീകരിക�ക�ക',
+'excontent'              => "ഉള�ളടക�കം: '$1'",
+'excontentauthor'        => "ഉള�ളടക�കം: '$1' ('[[Special:Contributions/$2|$2]]' മാത�രമേ ഈ താളില�� തിര�ത�തല�� നടത�തിയിട�ട�ള�ളൂ�‌)",
+'exbeforeblank'          => "ശൂന�യമാക�കപ�പെട�ന�നതിന� മ�മ�പ�ള�ള ഉള�ളടക�കം: '$1'",
+'exblank'                => 'താള�� ശൂന�യമായിര�ന�ന�',
+'delete-confirm'         => '"$1" മായ�ക�ക�ക',
+'delete-legend'          => 'മായ�ക�ക�ക',
+'historywarning'         => 'മ�ന�നറിയിപ�പ�: നിങ�ങള�� മായ�ക�ക�വാന�� പോക�ന�ന താള�� തിര�ത�തല�� ചരിത�രം ഉള�ള ഒര� താളാണ�.',
+'confirmdeletetext'      => 'നിങ�ങള�� ഒര� താള�� അതിന�റെ തിര�ത�തല�� ചരിത�രമടക�കം മായ�ക�ക�വാന�� പോവ�കയാണ�. നിങ�ങള�� ചെയ�യ�ന�നതിന�റെ പരിണതഫലം നിങ�ങള��ക�കറിയാമെന�ന�ം, നിങ�ങള�ടെ ഈ മായ�ക�കല�� [[{{MediaWiki:Policy-url}}|വിക�കിയ�ടെ നയം]] അന�സരിച�ചാണ� ചെയ�യ�ന�നതെന�ന�ം ഉറപ�പാക�ക�ക.',
+'actioncomplete'         => 'പ�രവൃത�തി പൂര��ത�തിയായിരിക�ക�ന�ന�',
+'deletedtext'            => '"<nowiki>$1</nowiki>" മായ�ച�ചിരിക�ക�ന�ന�. പ�തിയതായി നടന�ന മായ�ക�കല�കള�ടെ വിവരങ�ങള�� $2 ഉപയോഗിച�ച� കാണാം.',
+'deletedarticle'         => '"[[$1]]" മായ�ച�ചിരിക�ക�ന�ന�',
+'dellogpage'             => 'മായ�ക�കല�� പട�ടിക',
+'dellogpagetext'         => 'സമീപകാലത�ത� മായ�ച�ച�കളഞ�ഞ താള�കള�ടെ പട�ടിക താഴെ കാണാം.',
+'deletionlog'            => 'മായ�ക�കല�� പട�ടിക',
+'reverted'               => 'പൂര��‌വ�വസ�ഥിതിയിലേക�കാക�കിയിരിക�ക�ന�ന�.',
+'deletecomment'          => 'നീക�കം ചെയ�യാന�ള�ള കാരണം',
+'deleteotherreason'      => 'മറ�റ�/കൂട�തല�� കാരണങ�ങള��:',
+'deletereasonotherlist'  => 'മറ�റ� കാരണങ�ങള��',
+'deletereason-dropdown'  => '*താള�� മായ�ക�ക�ന�നതിന� സാധാരണ വരാറ�ള�ള കാരണങ�ങള��
 ** പ�തിയ ഉപയോക�താവിന�റെ പരീക�ഷണം
 ** യാതൊര� അര��ത�ഥവ�മില�ലാത�തത�
 ** നേരത�തേ നീക�കം ചെയ�ത താളിന�റെ സം‌വാദം താള��
@@ -1443,35 +1502,40 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 ** നശീകരണപ�രവര��ത�തനം
 ** ഉള�ളടക�കം മലയാളമല�ല
 ** ഉള�ളടക�കം യ�ണികോഡല�ല',
-'delete-edit-reasonlist'      => 'മായ�ക�കലിന�റെ കാരണം തിര�ത�ത�ക',
-'delete-toobig'               => 'ഈ താളിന� വളരെ വിപ�ലമായ തിര�ത�തല�� ചരിത�രമ�ണ�ട�. $1 മേല�� {{PLURAL:$1|പതിപ�പ�ണ�ട�|പതിപ�പ�കള�ണ�ട�}}. ഇത�തരം താള�കള�� മായ�ക�ക�ന�നത� {{SITENAME}} സം‌രംഭത�തിന�റെ നിലനില�പ�പിനെ തന�നെ ബാധിക�ക�മെന�നതിനാല�� ഈ താള�� മായ�ക�ക�ന�നതിന�ള�ള അവകാശം പരിമിതപ�പെട�ത�തിയിരിക�ക�ന�ന�.',
-'delete-warning-toobig'       => 'ഈ താളിന� വളരെ വിപ�ലമായ തിര�ത�തല�� ചരിത�രമ�ണ�ട�. അതായത�, ഇതിന�� $1 മേല�� {{PLURAL:$1|പതിപ�പ�ണ�ട�|പതിപ�പ�കള�ണ�ട�}}. ഇത�തരം താള�കള�� മായ�ക�ക�ന�നത� {{SITENAME}} സം‌രംഭത�തിന�റെ ഡാറ�റാബേസ� ഓപ�പറേഷനെ ബാധിച�ചേക�കാം. അതിനാല�� വളരെ ശ�രദ�ധാപൂര��വ�വം ത�ടര��നടപടികളിലേക�ക� നീങ�ങ�ക.',
-'rollback'                    => 'തിര�ത�തല�കള�� റോള��ബാക�ക� ചെയ�യ�ക',
-'rollback_short'              => 'റോള��ബാക�ക�',
-'rollbacklink'                => 'റോള��ബാക�ക�',
-'rollbackfailed'              => 'റോള��ബാക�ക� പരാജയപ�പെട�ട�',
-'cantrollback'                => 'റോള�� ബാക�ക� ചെയ�യ�വാന�� സാദ�ധ�യമല�ല. ഒര� ഉപയോക�താവ� മാത�രമാണ� ഈ താളില�� സം‌ഭാവന ചെയ�തിരിക�ക�ന�നത�.',
-'editcomment'                 => 'തിര�ത�തലിന�റെ ച�ര�ക�കം: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|സന�ദേശങ�ങള��]]) നടത�തിയ തിര�ത�തല�കള�� നീക�കം ചെയ�തിരിക�ക�ന�ന�; നിലവില�ള�ള അവസ�ഥ [[User:$1|$1]] സൃഷ�ടിച�ചതാ�ണ�', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 ന�റെ തിര�ത�തല�� തിരസ�ക�കരിച�ചിരിക�ക�ന�ന�. $2 ചെയ�ത തൊട�ട� മ�ന��പത�തെ പതിപ�പിലേക�ക� സേവ� ചെയ�യ�ന�ന�.',
+'delete-edit-reasonlist' => 'മായ�ക�കലിന�റെ കാരണം തിര�ത�ത�ക',
+'delete-toobig'          => 'ഈ താളിന� വളരെ വിപ�ലമായ തിര�ത�തല�� ചരിത�രമ�ണ�ട�. $1 മേല�� {{PLURAL:$1|പതിപ�പ�ണ�ട�|പതിപ�പ�കള�ണ�ട�}}. ഇത�തരം താള�കള�� മായ�ക�ക�ന�നത� {{SITENAME}} സം‌രംഭത�തിന�റെ നിലനില�പ�പിനെ തന�നെ ബാധിക�ക�മെന�നതിനാല�� ഈ താള�� മായ�ക�ക�ന�നതിന�ള�ള അവകാശം പരിമിതപ�പെട�ത�തിയിരിക�ക�ന�ന�.',
+'delete-warning-toobig'  => 'ഈ താളിന� വളരെ വിപ�ലമായ തിര�ത�തല�� ചരിത�രമ�ണ�ട�. അതായത�, ഇതിന�� $1 മേല�� {{PLURAL:$1|പതിപ�പ�ണ�ട�|പതിപ�പ�കള�ണ�ട�}}. ഇത�തരം താള�കള�� മായ�ക�ക�ന�നത� {{SITENAME}} സം‌രംഭത�തിന�റെ ഡാറ�റാബേസ� ഓപ�പറേഷനെ ബാധിച�ചേക�കാം. അതിനാല�� വളരെ ശ�രദ�ധാപൂര��വ�വം ത�ടര��നടപടികളിലേക�ക� നീങ�ങ�ക.',
+
+# Rollback
+'rollback'         => 'തിര�ത�തല�കള�� റോള��ബാക�ക� ചെയ�യ�ക',
+'rollback_short'   => 'റോള��ബാക�ക�',
+'rollbacklink'     => 'റോള��ബാക�ക�',
+'rollbackfailed'   => 'റോള��ബാക�ക� പരാജയപ�പെട�ട�',
+'cantrollback'     => 'റോള�� ബാക�ക� ചെയ�യ�വാന�� സാദ�ധ�യമല�ല. ഒര� ഉപയോക�താവ� മാത�രമാണ� ഈ താളില�� സം‌ഭാവന ചെയ�തിരിക�ക�ന�നത�.',
+'editcomment'      => "തിര�ത�തലിന�റെ ച�ര�ക�കം: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|സന�ദേശങ�ങള��]]) നടത�തിയ തിര�ത�തല�കള�� നീക�കം ചെയ�തിരിക�ക�ന�ന�; നിലവില�ള�ള അവസ�ഥ [[User:$1|$1]] സൃഷ�ടിച�ചതാ�ണ�', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 ന�റെ തിര�ത�തല�� തിരസ�ക�കരിച�ചിരിക�ക�ന�ന�. $2 ചെയ�ത തൊട�ട� മ�ന��പത�തെ പതിപ�പിലേക�ക� സേവ� ചെയ�യ�ന�ന�.',
+
+# Protect
 'protectlogpage'              => 'സംരക�ഷണ പ�രവര��ത�തനരേഖ',
 'protectedarticle'            => '"[[$1]]" സം‌രക�ഷിച�ചിരിക�ക�ന�ന�',
-'modifiedarticleprotection'   => '"[[$1]]" ന�ള�ള സം‌രക�ഷണമാനം മാറ�റിയിരിക�ക�ന�ന�',
+'modifiedarticleprotection'   => '"[[$1]]" എന�ന താളിന�ള�ള സം‌രക�ഷണമാനം മാറ�റിയിരിക�ക�ന�ന�',
 'unprotectedarticle'          => '"[[$1]]" സ�വതന�ത�രമാക�കി',
 'protect-title'               => '"$1" ന� സം‌രക�ഷണമാനം സജ�ജീകരിക�ക�ന�ന�',
+'prot_1movedto2'              => '[[$1]] എന�ന താളിന�റെ പേര�� [[$2]] എന�നാക�കിയിരിക�ക�ന�ന�',
 'protect-legend'              => 'സം‌രക�ഷണം സ�ഥിരീകരിക�ക�ക',
 'protectcomment'              => 'അഭിപ�രായം:',
 'protectexpiry'               => 'സംരക�ഷണ കാലാവധി:',
 'protect_expiry_invalid'      => 'കാലാവധി തീര�ന�ന സമയം അസാധ�വാണ�.',
 'protect_expiry_old'          => 'കാലവധി തീര�ന�ന സമയം ഭൂതകാലത�തിലാണ�.',
 'protect-unchain'             => 'തലക�കെട�ട�മാറ�റാന�ള�ള അന�മതികള�� പ�നഃസ�ഥാപിക�ക�ക',
-'protect-text'                => 'താങ�കള��ക�ക� ഇവിടെ <strong><nowiki>$1</nowiki></strong> എന�ന താളിന�റെ നിലവില�ള�ള സംരക�ഷണമാനം ദര��ശിക�ക�കയ�ം അതില�� മാറ�റംവര�ത�ത�കയ�ം ചെയ�യാം.',
-'protect-locked-blocked'      => 'തടയപ�പെട�ടിരിക�ക�ന�ന സമയത�ത� താങ�കള��ക�ക� സം‌രക�ഷണ പരിധി മാറ�റ�വാന�� സാധിക�കില�ല. <strong>$1</strong> എന�ന താളിന�റെ നിലവില�ള�ള ക�രമീകരണം ഇതാണ�‌:',
-'protect-locked-dblock'       => 'ഡാറ�റാബേസ� ബന�ധിച�ചിരിക�ക�ന�നത� കാരണം താങ�കള��ക�ക� സം‌രക�ഷണമാനം മാറ�റ�വാന�� സാധിക�കില�ല.
+'protect-text'                => "താങ�കള��ക�ക� ഇവിടെ '''<nowiki>$1</nowiki>''' എന�ന താളിന�റെ നിലവില�ള�ള സംരക�ഷണമാനം ദര��ശിക�ക�കയ�ം അതില�� മാറ�റംവര�ത�ത�കയ�ം ചെയ�യാം.",
+'protect-locked-blocked'      => "തടയപ�പെട�ടിരിക�ക�ന�ന സമയത�ത� താങ�കള��ക�ക� സം‌രക�ഷണ പരിധി മാറ�റ�വാന�� സാധിക�കില�ല. '''$1''' എന�ന താളിന�റെ നിലവില�ള�ള ക�രമീകരണം ഇതാണ�‌:",
+'protect-locked-dblock'       => "ഡാറ�റാബേസ� ബന�ധിച�ചിരിക�ക�ന�നത� കാരണം താങ�കള��ക�ക� സം‌രക�ഷണമാനം മാറ�റ�വാന�� സാധിക�കില�ല.
 
-<strong>$1</strong> എന�ന താളിന�റെ നിലവില�ള�ള ക�രമീകരണം ഇതാണ�‌:',
-'protect-locked-access'       => 'താള�കള�ടെ സംരക�ഷണമാനത�തില�� വ�യതിയാനംവര�ത�ത�വാന�ള�ള അന�മതി താങ�കള�ടെ അക�കൗണ�ടിനില�ല.
-<strong>$1</strong> എന�ന താളിന�റെ നിലവില�ള�ള ക�രമീകരണങ�ങള�� ഇതാ:',
+'''$1''' എന�ന താളിന�റെ നിലവില�ള�ള ക�രമീകരണം ഇതാണ�‌:",
+'protect-locked-access'       => "താള�കള�ടെ സംരക�ഷണമാനത�തില�� വ�യതിയാനംവര�ത�ത�വാന�ള�ള അന�മതി താങ�കള�ടെ അക�കൗണ�ടിനില�ല.
+'''$1''' എന�ന താളിന�റെ നിലവില�ള�ള ക�രമീകരണങ�ങള�� ഇതാ:",
 'protect-cascadeon'           => 'ഈ താള�� നിര���രിതസംരക�ഷിതമായ (cascading protection) {{PLURAL:$1|ഒര� താളില��|പല താള�കളില��}} ഉള��പ�പെട�ത�തപ�പെട�ത�തപ�പെട�ടിരിക�ക�ന�നതിനാല�� ഇത� സംരക�ഷിത താളാണ�. എന�നാല�� താങ�കള��ക�ക� ഈ താളിന�റെ സംരക�ഷണമാനം മാറ�റ�വാന�� കഴിയ�ം, അങ�ങനെ ചെയ�താല�� നിര���രിതസംരക�ഷണത�തിന� മാറ�റം വരികയില�ല.',
 'protect-default'             => '(സ�വതവെ)',
 'protect-fallback'            => '"$1" അന�വാദം ആവശ�യമാണ�‌',
@@ -1481,6 +1545,12 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'protect-expiring'            => '$1 (UTC) ന� കാലാവധി തീര�ന�ന�',
 'protect-cascade'             => 'ഈ താളില�� ഉള��പ�പെട�ടിരിക�ക�ന�ന താള�കളെല�ലാം സംരക�ഷിക�ക�ക (നിര���രിത സംരക�ഷണം)',
 'protect-cantedit'            => 'ഈ താള�� തിര�ത�ത�വാന�ള�ള അധികാരമില�ലാത�തതിനാല�� ഈ താളിന�റെ സംരക�ഷണമാനം മാറ�റ�വാന�� താങ�കള��ക�ക� സാധിക�ക�കയില�ല.',
+'protect-dropdown'            => '*സംരക�ഷിക�കാന�ള�ള കാരണങ�ങള��
+** അമിതമായ നശീകരണപ�രവര��ത�തനങ�ങള��
+** അമിതമായ സ�പാമിങ�ങ�
+** Counter-productive edit warring
+** High traffic page',
+'protect-expiry-options'      => '2 മണിക�കൂര�� നേരത�തേയ�ക�ക�:2 hours,1 ദിവസത�തേയ�ക�ക�:1 day,3 ദിവസത�തേയ�ക�ക�:3 days,1 ആഴ�ചത�തേയ�ക�ക�:1 week,2 ആഴ�ചത�തേയ�ക�ക�:2 weeks,1 മാസത�തേയ�ക�ക�:1 month,3 മാസത�തേയ�ക�ക�:3 months,6 മാസത�തേയ�ക�ക�:6 months,1 വര��ഷത�തേയ�ക�ക�:1 year,അനന�തകാലത�തേയ�ക�ക�:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'അന�മതി:',
 'restriction-level'           => 'പരിമിതിയ�ടേ മാനം:',
 'minimum-size'                => 'ക�റഞ�ഞ വല�പ�പം',
@@ -1505,7 +1575,7 @@ $1 ഉം à´ˆ à´šà´¿à´¤àµ�à´°à´µàµ�à´‚ à´’à´¨àµ�നാണെങàµ�à´•à´¿à´²àµ�â€
 'undeletepagetext'           => 'താഴെ കാണിച�ചിരിക�ക�ന�ന താള�കള�� മായ�ക�കപ�പെട�ടതാണെങ�കില�ം പത�തായത�തില�ള�ളതിനാല�� പ�നഃസ�ഥാപിക�കാവ�ന�നതാണ�‌. പത�തായം സമയാസമയങ�ങളില�� വൃത�തിയാക�ക�ന�നതാണ�‌.',
 'undeleterevisions'          => '$1 {{PLURAL:$1|പതിപ�പ�|പതിപ�പ�കള��}} പത�തായത�തിലാക�കി',
 'undeletehistorynoadmin'     => 'ഈ താള�� മായ�ക�കപ�പെട�ടിരിക�ക�ന�ന�. ഈ താള�� മായ�കാന�ള�ള കാരണവ�ം താള�� മായ�ക�ക�ന�നതിന� മ�ന��പ� തിര�ത�തിയവരെ ക�റിച�ച�ള�ള വിവരങ�ങള�ം, താഴെ കൊട�ത�തിരിക�ക�ന�ന�. മായ�ക�കപ�പെട�ട ഈ പതിപ�പ�കള�ടെ ഉള�ളടക�കം അഡ�മിനിസ�റ�റ�രേറ�ററ�മാര��ക�ക� മാത�രമേ പ�രാപ�യമാകൂ.',
-'undelete-revision'          => '$1 എന�ന താളില�� $3, $2ല�� സൃഷ�ടിച�ച പതിപ�പ� മായ�ച�ചിരിക�ക�ന�ന�:',
+'undelete-revision'          => '$1 എന�ന താളില�� $3, $4, $5-ല�� സൃഷ�ടിച�ച പതിപ�പ� മായ�ച�ചിരിക�ക�ന�ന�:',
 'undeleterevision-missing'   => 'അസാധ�വായ അല�ലെങ�കില�� നഷ�ടപ�പെട�ട പതിപ�പ�. നിങ�ങള�ടെ കണ�ണി ഒന�ന�കില�� തെറ�റായായിരിക�കാം അല�ലെങ�കില�� ഒഴിവാക�കപ�പെട�ട ഒര� പതിപ�പായിരിക�ക�ം താങ�കള�� തിരയ�ന�നത�.',
 'undelete-nodiff'            => 'പഴയ പതിപ�പ�കള�� ഒന�ന�ം കണ�ടില�ല.',
 'undeletebtn'                => 'പ�നഃസ�ഥാപിക�ക�ക',
@@ -1538,13 +1608,14 @@ $1',
 'blanknamespace' => '(മ�ഖ�യം)',
 
 # Contributions
-'contributions' => 'ഉപയോക�താവിന�റെ സംഭാവനകള��',
-'mycontris'     => 'എന�റെ സംഭാവനകള��',
-'contribsub2'   => '$1 എന�ന ഉപയോക�താവിന�റെ $2.',
-'nocontribs'    => 'ഈ ക�രൈറ�റീരിയകള�മായി യോജിക�ക�ന�ന മാറ�റങ�ങള�� ഒന�ന�ം കണ�ടില�ല.',
-'uctop'         => '(അവസാനത�തെ തിര�ത�തല��)',
-'month'         => 'മാസം:',
-'year'          => 'വര��ഷം:',
+'contributions'       => 'ഉപയോക�താവിന�റെ സംഭാവനകള��',
+'contributions-title' => '$1 എന�ന ഉപയോക�താവിന�റെ സംഭാവനകള��',
+'mycontris'           => 'എന�റെ സംഭാവനകള��',
+'contribsub2'         => '$1 എന�ന ഉപയോക�താവിന�റെ $2.',
+'nocontribs'          => 'ഈ ക�രൈറ�റീരിയകള�മായി യോജിക�ക�ന�ന മാറ�റങ�ങള�� ഒന�ന�ം കണ�ടില�ല.',
+'uctop'               => '(അവസാനത�തെ തിര�ത�തല��)',
+'month'               => 'മാസം:',
+'year'                => 'വര��ഷം:',
 
 'sp-contributions-newbies'     => 'പ�തിയ അംഗങ�ങള�� നടത�തിയ തിര�ത�തല�കള�� മാത�രം',
 'sp-contributions-newbies-sub' => 'പ�തിയ അക�കൗണ�ട�കള��ക�ക�',
@@ -1554,10 +1625,9 @@ $1',
 'sp-contributions-submit'      => 'തിരയൂ',
 
 # What links here
-'whatlinkshere'       => 'കണ�ണികള��',
+'whatlinkshere'       => 'അന�ബന�ധകണ�ണികള��',
 'whatlinkshere-title' => '"$1" എന�ന താളിലേക�ക�ള�ള കണ�ണികള��',
 'whatlinkshere-page'  => 'താള��:',
-'linklistsub'         => '(കണ�ണികള�ടെ പട�ടിക)',
 'linkshere'           => "താഴെക�കൊട�ത�തിരിക�ക�ന�ന താള�കളില�� നിന�ന�ം '''[[:$1]]''' എന�ന താളിലേക�ക� കണ�ണികള�ണ�ട�:",
 'nolinkshere'         => "'''[[:$1]]''' എന�ന താളിലേക�ക� കണ�ണികളൊന�ന�ം നിലവിലില�ല.",
 'nolinkshere-ns'      => "തിരഞ�ഞെട�ത�ത നെയിംസ�പേസില�� '''[[:$1]]''' എന�ന താളിലേക�ക� മറ�റൊര� താള�കളില��നിന�ന�ം കണ�ണികളില�ല.",
@@ -1570,8 +1640,8 @@ $1',
 # Block/unblock
 'blockip'                     => 'ഉപയോക�താവിനെ വിലക�ക�ക',
 'blockiptext'                 => '�തെങ�കില�ം �പി വിലാസത�തേയോ ഉപയോക�താവിനേയോ തടയ�വാന�� താഴെയ�ള�ള ഫോം ഉപയോഗിക�ക�ക.
-[[{{MediaWiki:Policy-url}}|വിക�കിയ�ടെ നയം]] അന�സരിച�ച� വാന��ഡലിസം തടയാന�� മാത�രമേ ഇത� ചെയ�യാവൂ.
-തടയാന�ള�ള വ�യക�തമായ കാരണം (�ത� താളിലാണ� വാന��ഡലിസം കാണിച�ചത� എന�നതടക�കം) താഴെ രേഖപ�പെട�ത�തിയിരിക�കണം.',
+[[{{MediaWiki:Policy-url}}|വിക�കിയ�ടെ നയം]] അന�സരിച�ച� നശീകരണപ�രവര��ത�തനം തടയാന�� മാത�രമേ ഇത� ചെയ�യാവൂ.
+തടയാന�ള�ള വ�യക�തമായ കാരണം (�ത� താളിലാണ� നശീകരണപ�രവര��ത�തനം നടന�നത� എന�നതടക�കം) താഴെ രേഖപ�പെട�ത�തിയിരിക�കണം.',
 'ipaddress'                   => '�പി വിലാസം:',
 'ipadressorusername'          => '�പി വിലാസം അല�ലെങ�കില�� ഉപയോക�തൃനാമം:',
 'ipbexpiry'                   => 'കാലാവധി:',
@@ -1627,7 +1697,7 @@ $1',
 'autoblocker'                 => 'താങ�കള�ടെ �പി വിലാസം "[[User:$1|$1]]" എന�ന ഉപയോക�താവ� ഈ അട�ത�ത� ഉപയോഗിക�ക�കയ�ം പ�രസ�ത�ത ഉപയോക�താവിനെ വിക�കിയില�� നിന�ന� തടയ�കയ�ം ചെയ�തിട�ട�ള�ളതാണ�‌. അതിനാല�� താങ�കള�ം യാന�ത�രികമായി തടയപ�പെട�ടിരിക�ക�ന�ന�. $1ന�റെ തടയലിന� സൂചിപ�പിക�കപ�പെട�ട കാരണം "$2" ആണ�‌.',
 'blocklogpage'                => 'തടയല�� പട�ടിക',
 'blocklogentry'               => '[[$1]]-നെ $2 കാലത�തേക�ക� വിലക�കിയിരിക�ക�ന�ന� $3',
-'blocklogtext'                => '{{SITENAME}} സംരംഭത�തില�� പ�രവര��ത�തിക�ക�ന�നതില�� നിന�ന� ഉപയോക�താക�കെളെ തടഞ�ഞതിന�റേയ�ം, പ�നഃപ�രവര��ത�തനാന�മതി നല��കിയതിന�റേയ�ം രേഖകള�� താഴെ കാണാം. {{SITENAME}} സംരംഭം സ�വയം  തടയ�ന�ന �പി വിലാസങ�ങള�� ഈ പട�ടികയില�� ഇല�ല. [[Special:IPBlockList|തടയപ�പെട�ടിട�ട�ള�ള �പി വിലാസങ�ങള�ടെ പട�ടിക]] എന�നതാളില�� നിലവില�ള�ള നിരോധനങ�ങളേയ�ം തടയല�കളേയ�ം കാണാവ�ന�നതാണ�.',
+'blocklogtext'                => '{{SITENAME}} സംരംഭത�തില�� പ�രവര��ത�തിക�ക�ന�നതില�� നിന�ന� ഉപയോക�താക�കളെ തടഞ�ഞതിന�റേയ�ം, പ�നഃപ�രവര��ത�തനാന�മതി നല��കിയതിന�റേയ�ം രേഖകള�� താഴെ കാണാം. {{SITENAME}} സംരംഭം സ�വയം  തടയ�ന�ന �പി വിലാസങ�ങള�� ഈ പട�ടികയില�� ഇല�ല. [[Special:IPBlockList|തടയപ�പെട�ടിട�ട�ള�ള �പി വിലാസങ�ങള�ടെ പട�ടിക]] എന�നതാളില�� നിലവില�ള�ള നിരോധനങ�ങളേയ�ം തടയല�കളേയ�ം കാണാവ�ന�നതാണ�.',
 'unblocklogentry'             => '$1 എന�ന ഉപയോക�താവിനെ പ�നഃസ�ഥാപിച�ചിരിക�ക�ന�ന�',
 'block-log-flags-anononly'    => 'അജ�ഞാത ഉപയോക�താക�കളെ മാത�രം',
 'block-log-flags-nocreate'    => 'അക�കൗണ�ട� സൃഷ�ടിക�ക�ന�നത�ം തടഞ�ഞിരിക�ക�ന�ന�',
@@ -1685,6 +1755,8 @@ $1',
 
 അത�തരം സന�ദര��ഭങ�ങളില�� സം‌വാദം താള�കള�� താങ�കള�� സ�വയം കൂട�ടിച�ചേര��ക�കേണ�ടതാണ�.",
 'movearticle'             => 'മാറ�റേണ�ട താള��',
+'movenologin'             => 'ലോഗിന�� ചെയ�തിട�ടില�ല',
+'movenologintext'         => 'തലക�കെട�ട� മാറ�റാന�ള�ള അന�മതി കൈവരിക�കാന�� താങ�കള�� ഒര� രജിസ�റ�റേര��ഡ� ഉപയോക�താവായിരിക�ക�കയ�ം [[Special:UserLogin|ലോഗിന�� ചെയ�തിരിക�ക�കയ�ം]] ചെയ�യേണ�ടത� അത�യന�താപേക�ഷിതമാണ�‌.',
 'movenotallowed'          => '{{SITENAME}} സം‌രംഭത�തിലെ താള�കള�ടെ തലക�കെട�ട� മാറ�റാന�� താങ�കള��ക�ക� അന�വാദമില�ല.',
 'newtitle'                => 'പ�തിയ തലക�കെട�ട�',
 'move-watch'              => 'ഈ താളിലെ മാറ�റങ�ങള�� ശ�രദ�ധിക�ക�ക',
@@ -1696,7 +1768,7 @@ $1',
 'talkexists'              => "'''താളിന�റെ തലക�കെട�ട� വിജയകരമായി മാറ�റിയിരിക�ക�ന�ന�. പക�ഷെ താളിന�റെ സംവാദത�തിന� അതേ പേരില�� മറ�റൊര� സംവാദംതാള�� നിലവില�ള�ളതിനാല�� മാറ�റം സാധിച�ചില�ല. അതിനാല�� സംവാദംതാള�� താങ�കള�� തന�നെ സംയോജിപ�പിക�ക�ക.'''",
 'movedto'                 => 'ഇവിടേക�ക� മാറ�റിയിരിക�ക�ന�ന�',
 'movetalk'                => 'ബന�ധപ�പെട�ട സം‌വാദംതാള�ം കൂടെ നീക�ക�ക',
-'1movedto2'               => '[[$1]] എന�ന താളിന�റെ പേര� [[$2]] എന�നാക�കിയിരിക�ക�ന�ന�',
+'1movedto2'               => 'തലക�കെട�ട� മാറ�റം:  [[$1]]  >>> [[$2]]',
 '1movedto2_redir'         => 'നിലവില�ണ�ടായിര�ന�ന തിരിച�ച�വിടല�� താളിലേക�ക� തലക�കെട�ട� മാറ�റം: [[$1]] >>>  [[$2]]',
 'movelogpage'             => 'മാറ�റ പട�ടിക',
 'movelogpagetext'         => 'തലക�കെട�ട� മാറ�റിയ താള�കള�ടെ പട�ടിക താഴെ കാണാം.',
@@ -1709,7 +1781,6 @@ $1',
 'delete_and_move_confirm' => 'ശരി, താള�� നീക�കം ചെയ�യ�ക',
 'delete_and_move_reason'  => 'താള�� മാറ�റാനായി മായ�ച�ച�',
 'selfmove'                => 'സ�രോതസ�സിന�റെ തലക�കെട�ട�ം ലക�ഷ�യത�തിന�റെ തലക�കെട�ട�ം ഒന�നാണ�‌. അതിനാല�� തലക�കെട�ട�മാറ�റം സാദ�ധ�യമല�ല.',
-'immobile_namespace'      => 'സ�രോതസ�സിന�റെ തലക�കെട�ട�ം ലക�ഷ�യത�തിന�റെ തലക�കെട�ട�ം പ�രതേക തരം തലക�കെട�ടാണ�. ഈ നേംസ�പേസിലേക�ക� താള�� നീക�ക�വാന�� സാദ�ധ�യമല�ല.',
 'fix-double-redirects'    => 'പഴയ തലക�കെട�ടിലേക�ക�ള�ള തിരിച�ച�വിടല�� താള�കള�ം ഇതോടൊപ�പം പ�ത�ക�ക�ക',
 
 # Export
@@ -1734,7 +1805,7 @@ $1',
 # Thumbnails
 'thumbnail-more'           => 'വല�താക�കി കാണിക�ക�ക',
 'filemissing'              => 'പ�രമാണം നഷ�ടമായിരിക�ക�ന�ന�',
-'thumbnail_error'          => 'നഖച�ചിത�രം സൃഷ�ടിക�ക�ന�നതില�� പിഴവ�: $1',
+'thumbnail_error'          => 'ലഘ�ചിത�രം സൃഷ�ടിക�ക�ന�നതില�� പിഴവ�: $1',
 'djvu_no_xml'              => 'DjVu പ�രമാണത�തിന� വേണ�ടി XML ശേഖരിക�ക�വാന�� പറ�റിയില�ല',
 'thumbnail_dest_directory' => 'ലക�ഷ�യ ഡയറക�ടറി സൃഷ�ടിക�ക�വാന�� സാധിച�ചില�ല',
 
@@ -1747,6 +1818,7 @@ $1',
 'import-interwiki-history'   => 'ഈ താളിന�റെ എല�ലാ പൂര��വ�വചരിത�രവ�ം പകര��ത�ത�ക',
 'import-interwiki-submit'    => 'ഇറക�ക�മതി',
 'import-interwiki-namespace' => 'താള�കള�� ഈ നാമമേഖലയിലേക�ക� മാറ�റ�ക:',
+'import-comment'             => 'ക�റിപ�പ�:',
 'importstart'                => 'താള�കള�� ഇറക�ക�മതി ചെയ�യ�ന�ന�...',
 'import-revision-count'      => '$1 {{PLURAL:$1|പതിപ�പ�|പതിപ�പ�കള��}}',
 'importnopages'              => 'ഇറക�ക�മതി ചെയ�യാന�� പറ�റിയ താള�കള�� ഇല�ല.',
@@ -1814,7 +1886,7 @@ $1',
 'tooltip-ca-nstab-mediawiki'      => 'വ�യവസ�ഥാസന�ദേശം കാണ�ക',
 'tooltip-ca-nstab-template'       => 'ഫലകം കാണ�ക',
 'tooltip-ca-nstab-help'           => 'സഹായം താള�� കാണ�ക',
-'tooltip-ca-nstab-category'       => 'വിഭാഗം താള�� കാണ�ക',
+'tooltip-ca-nstab-category'       => 'വര��ഗ�ഗം താള�� കാണ�ക',
 'tooltip-minoredit'               => 'ഇത� ഒര� ചെറ�തിര�ത�തലായി അടയാളപ�പെട�ത�ത�ക',
 'tooltip-save'                    => 'മാറ�റങ�ങള�� സംരക�ഷിക�ക�ന�ന�',
 'tooltip-preview'                 => 'താങ�കള�� വര�ത�തിയ മാറ�റത�തിന�റെ പരിണതഫലം കാണ�ന�നതിന� താള�� സംരക�ഷിക�ക�ന�നതിന� മ�ന��പ� ഈ ബട�ടണ�� ഉപയോഗിക�ക�ക!',
@@ -1825,12 +1897,12 @@ $1',
 'tooltip-upload'                  => 'അപ�‌ലോഡ� ത�ടങ�ങ�ക',
 
 # Attribution
-'anonymous'        => '{{SITENAME}} സംരംഭത�തിലെ അജ�ഞാത ഉപയോക�താക�കള��',
+'anonymous'        => '{{SITENAME}} സംരംഭത�തിലെ അജ�ഞാത {{PLURAL:$1|ഉപയോക�താവ�|ഉപയോക�താക�കള��}}',
 'siteuser'         => '{{SITENAME}} ഉപയോക�താവ� $1',
 'lastmodifiedatby' => '$2, $1 ന� $3 ആണ�‌ ഈ താള�� അവസാനം പ�ത�ക�കിയത�.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 ന�റെ സൃഷ�ടിയെ അധികരിച�ച�.',
 'others'           => 'മറ�റ�ള�ളവര��',
-'siteusers'        => '{{SITENAME}} സം‌രംഭത�തില�� ഉപയോക�താക�കള�ടെ എണ�ണം $1',
+'siteusers'        => '{{SITENAME}} സം‌രംഭത�തിലെ {{PLURAL:$2|ഉപയോക�താവ�‌|ഉപയോക�താക�കള��}} $1',
 'creditspage'      => 'താളിന�ള�ള കടപ�പാട�',
 'nocredits'        => 'ഈ താളിന�റെ കടപ�പാട� വിവരങ�ങള�� ലഭ�യമല�ല.',
 
@@ -1846,6 +1918,14 @@ $1',
 'numauthors'     => 'വ�യത�യസ�തരായ രചയിതാക�കള�ടെ എണ�ണം (താളിന�റെ): $1',
 'numtalkauthors' => 'വ�യത�യസ�തരായ രചയിതാക�കള�ടെ എണ�ണം (സം‌വാദം താളിന�റെ): $1',
 
+# Skin names
+'skinname-standard'    => 'സാര��വത�രികം',
+'skinname-nostalgia'   => 'ഗൃഹാത�രത�വം',
+'skinname-cologneblue' => 'ക�ലോണ�� നീല',
+'skinname-monobook'    => 'മോണോബ�ക�ക�',
+'skinname-chick'       => 'സ�ന�ദരി',
+'skinname-simple'      => 'ലളിതം',
+
 # Math options
 'mw_math_png'    => 'എപ�പോഴ�ം PNG ആയി പ�രദര��ശിപ�പിക�ക�ക',
 'mw_math_simple' => 'വളരെ ലളിതമാണെങ�കില�� HTML അല�ലെങ�കില�� PNG',
@@ -1856,9 +1936,9 @@ $1',
 
 # Patrolling
 'markaspatrolleddiff'                 => 'റോന�ത�ച�റ�റിയതായി അടയാളപ�പെട�ത�ത�ക',
-'markaspatrolledtext'                 => 'ഈ താളില�� റോന�ത� ച�റ�റിയതായി അടയാളപ�പെട�ത�ത�ക',
-'markedaspatrolled'                   => 'റോന�ത�ച�റ�റിയതായി അടയാളപ�പെട�ത�തിയിരിക�ക�ന�ന�',
-'markedaspatrolledtext'               => 'തിരഞ�ഞെട�ത�ത പതിപ�പില�� റോന�ത�ച�റ�റിയതായി അടയാളപ�പെട�ത�തിക�കഴിഞ�ഞ�.',
+'markaspatrolledtext'                 => 'ഈ താളില�� റോന�ത�ച�റ�റിയതായി രേഖപ�പെട�ത�ത�ക',
+'markedaspatrolled'                   => 'റോന�ത�ച�റ�റിയതായി രേഖപ�പെട�ത�തിയിരിക�ക�ന�ന�',
+'markedaspatrolledtext'               => "\"'''{{PAGENAME}}'''\" എന�ന താളില�� റോന�ത�ച�റ�റിയതായി രേഖപ�പെട�ത�തിയിരിക�ക�ന�ന�",
 'rcpatroldisabled'                    => 'പ�തിയ മാറ�റങ�ങള�ടെ റോന�ത�ച�റ�റല�� ദ�ര��ബലപ�പെട�ത�തിയിരിക�ക�ന�ന�',
 'rcpatroldisabledtext'                => 'പ�തിയ മാറ�റങ�ങള�ടെ റോന�ത�ച�റ�റല�� സം‌വിധാനം ദ�ര��ബലപ�പെട�ത�തിയിരിക�ക�കയാണ�‌.',
 'markedaspatrollederror'              => 'റോന�ത�ച�റ�റിയതായി അടയാളപ�പെട�ത�ത�ക സാധ�യമല�ല',
@@ -1894,7 +1974,7 @@ $1',
 'show-big-image'       => 'പൂര��ണ�ണ റെസലൂഷന��',
 'show-big-image-thumb' => '<small>ഈ പ�രിവ�യൂവിന�റെ വലിപ�പം: $1 × $2 പിക�സല�കള��</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'പ�തിയ പ�രമാണങ�ങള�ടെ ഗാലറി',
 'imagelisttext'         => "$2 പ�രകാരം സോര��ട�ട� ചെയ�ത '''$1''' {{PLURAL:$1|പ�രമാണത�തിന�റെ|പ�രമാണങ�ങള�ടെ}} പട�ടിക താഴെ കാണാം.",
 'newimages-summary'     => 'ച�ര�ക�കം',
@@ -2143,21 +2223,9 @@ $5
 ദയവായി താള�� പ�നഃസൃഷ�ടിക�കേണ�ടത�ണ�ടോ എന�ന� സ�ഥിരീകരിക�ക�ക.",
 'recreate'            => 'പ�നഃസൃഷ�ടിക�ക�ക',
 
-# HTML dump
-'redirectingto' => '[[:$1]] എന�ന താളിലേയ�ക�ക� തിരിച�ച�വിട�ന�ന�...',
-
 # action=purge
-'confirm_purge'        => 'ഈ താളിന�റെ കാഷെ ക�ലീയര�� ചെയ�യട�ടെ?
-
-$1',
 'confirm_purge_button' => 'ശരി',
-
-# AJAX search
-'searchcontaining' => "''$1'' എന�ന വാക�ക�ള�ള താള�കള�� തിരയ�ക.",
-'searchnamed'      => "''$1'' എന�ന പേര�ള�ള താള�കള�� തിരയ�ക.",
-'articletitles'    => "''$1'' എന�ന� ത�ടങ�ങ�ന�ന താള�കള��",
-'hideresults'      => 'ഫലങ�ങള�� മറയ�ക�ക�ക',
-'useajaxsearch'    => 'AJAX തിരച�ചില�� സം‌വിധാനം ഉപയോഗിക�ക�ക',
+'confirm-purge-top'    => 'ഈ താളിന�റെ കാഷെ ക�ലീയര�� ചെയ�യട�ടെ?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� മ�ന��പത�തെ താള��',
@@ -2232,13 +2300,13 @@ $1',
 'filepath-summary' => 'ഈ പ�രത�യേക താള�� ഒര� പ�രമാണത�തിന�റെ പൂര��ണ�ണ വിലാസം പ�രദര��ശിപ�പിക�ക�ന�ന�.
 ചിത�രങ�ങള�� പൂര��ണ�ണ റെസലൂഷനോട� കൂടി പ�രദര��ശിപ�പിച�ചിരിക�ക�ന�ന�. മറ�റ�ള�ള ഫയല�� തരങ�ങള�� അതത� പ�രോഗ�രാമില�� നേരിട�ട� ത�റക�കാവ�ന�നതാണ�‌.
 
-"{{ns:image}}:" എന�ന മ�ന��‌ക�റി ഇല�ലാതെ പ�രമാണത�തിന�റെ പേര� ടൈപ�പ� ചെയൂക.',
+"{{ns:file}}:" എന�ന മ�ന��‌ക�റി ഇല�ലാതെ പ�രമാണത�തിന�റെ പേര� ടൈപ�പ� ചെയൂക.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'ഒരേ പ�രമാണത�തിന�റെ പലപകര��പ�പ�കള�ണ�ടോയെന�ന� തിരയ�ക',
 'fileduplicatesearch-summary'  => 'ഒരേ പ�രമാണം തന�നെ വിവിധപേരില�ണ�ടോയെന�ന� ഹാഷ� വാല�യൂവധിഷ�ഠിതമായി തിരയ�ക.
 
-പ�രമാണത�തിന�റെ പേര�‌ "{{ns:image}}:" എന�ന മ�ന��ക�റിയില�ലാതെ നല��ക�ക.',
+പ�രമാണത�തിന�റെ പേര�‌ "{{ns:file}}:" എന�ന മ�ന��ക�റിയില�ലാതെ നല��ക�ക.',
 'fileduplicatesearch-legend'   => 'അപരനെ തിരയ�ക',
 'fileduplicatesearch-filename' => 'പ�രമാണത�തിന�റെ പേര�:',
 'fileduplicatesearch-submit'   => 'തിരയൂ',
diff --git a/languages/messages/MessagesMn.php b/languages/messages/MessagesMn.php
index b807c075..3485671d 100644
--- a/languages/messages/MessagesMn.php
+++ b/languages/messages/MessagesMn.php
@@ -9,6 +9,25 @@
  * @author לערי ריינה�רט
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Медиа',
+	NS_SPECIAL          => 'Ту�гай',
+	NS_TALK             => 'Х�л�лцүүл�г',
+	NS_USER             => 'Х�р�гл�гч',
+	NS_USER_TALK        => 'Х�р�гл�гчийн_�риа',
+	NS_PROJECT_TALK     => '$1-н_х�л�лцүүл�г',
+	NS_FILE             => 'Зураг',
+	NS_FILE_TALK        => 'Зургийн_х�л�лцүүл�г',
+	NS_MEDIAWIKI        => 'МедиаВики',
+	NS_MEDIAWIKI_TALK   => 'МедиаВикигийн_х�л�лцүүл�г',
+	NS_TEMPLATE         => 'Загвар',
+	NS_TEMPLATE_TALK    => 'Загварын_х�л�лцүүл�г',
+	NS_HELP             => 'Ту�ламж',
+	NS_HELP_TALK        => 'Ту�ламжийн_х�л�лцүүл�г',
+	NS_CATEGORY         => '�нгилал',
+	NS_CATEGORY_TALK    => '�нгиллын_х�л�лцүүл�г',
+);
+
 $linkTrail = '/^([a-zабвгдеёжзийклмнопр�туфхцчшщъыь�ю�“»]+)(.*)$/sDu';
 
 $messages = array(
@@ -49,6 +68,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Х�нах жаг�аалтаа� миний за�варуудыг нуух',
 'tog-watchlisthidebots'       => 'Х�нах жаг�аалтаа� роботуудын за�варуудыг нуух',
 'tog-watchlisthideminor'      => 'Х�нах жаг�аалтаа� бага з�ргийн за�варуудыг нуух',
+'tog-watchlisthideliu'        => 'Холбогд�он х�р�гл�гчд��� х�налтын жаг�аалт дахь за�варыг нууцлах',
+'tog-watchlisthideanons'      => 'Зочин х�р�гл�гчд��� х�налтын жаг�аалт дахь за�варуудыг нуух',
 'tog-ccmeonemails'            => 'Бу�ад х�р�гл�гчд�д �вуул�ан м�йлүүдыг над руу давхар илг��х',
 'tog-diffonly'                => 'Өөрчлөлтөө� доогуурх хууд�ын агуулгыг үзүүл�хгүй байх',
 'tog-showhiddencats'          => '�уугд�ан ангиллуудыг үзүүл�х',
@@ -57,8 +78,6 @@ $messages = array(
 'underline-never'   => 'Х�з�� ч үгүй',
 'underline-default' => 'Броузерын тохиргоотой адил',
 
-'skinpreview' => '(Урьдчилж харах)',
-
 # Dates
 'sunday'        => '��м',
 'monday'        => 'Даваа',
@@ -151,7 +170,7 @@ $messages = array(
 'mytalk'         => 'Миний �риа',
 'anontalk'       => 'Эн� IP-н �риа',
 'navigation'     => 'Залуурдлага',
-'and'            => 'ба',
+'and'            => '&#32;ба',
 
 # Metadata in edit box
 'metadata_help' => 'Зургийн тухай м�д��л�л:',
@@ -214,8 +233,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}-н тухай',
 'aboutpage'            => 'Project:Тухай',
-'bugreports'           => '�лдааны м�дүүлгүүд',
-'bugreportspage'       => 'Project:�лдааны м�дүүлгүүд',
 'copyright'            => '�гуулгыг $1-н хувьд х�р�гл�х боломжтой.',
 'copyrightpagename'    => '{{SITENAME}}-н зохиогчийн �рх',
 'copyrightpage'        => '{{ns:project}}:Зохиогчийн �рх',
@@ -238,9 +255,7 @@ $messages = array(
 
 'badaccess'        => 'Зөвшөөрлийн алдаа',
 'badaccess-group0' => 'Таньд �н� үйлдлийг гүйц�тг�х зөвшөөрөл байхгүй байна.',
-'badaccess-group1' => 'Эн� үйлдлийг $1 группын х�р�гл�гчд�д х�згаарла�ан байна.',
-'badaccess-group2' => 'Эн� үйлдлийг $1 группуудын аль н�гнийх нь х�р�гл�гчд�д х�згаарла�ан байна.',
-'badaccess-groups' => 'Эн� үйлдлийг $1 группуудын аль н�гнийх нь х�р�гл�гчд�д х�згаарла�ан байна.',
+'badaccess-groups' => 'Таны хү���н �н� үйлд�л {{PLURAL:$2|группийн|группүүдийн}}: $1 х�р�гл�гчд�д х�згаарлалттай байна.',
 
 'versionrequired'     => 'МедиаВикигийн $1 хувилбар шаардлагатай',
 'versionrequiredtext' => 'Эн� хууд�ыг ашиглахын тулд МедиаВикигйин $1 хувилбар шаардлагатай. [[Special:Version|Эн� хувилбарын тухай]] үзн� үү.',
@@ -254,6 +269,8 @@ $messages = array(
 'editsection'             => 'за�варлах',
 'editold'                 => 'за�варлах',
 'viewsourceold'           => 'кодыг харах',
+'editlink'                => 'загварыг за�ах',
+'viewsourcelink'          => 'кодыг харах',
 'editsectionhint'         => 'Х��гийг за�варлах: $1',
 'toc'                     => '�гуулга',
 'showtoc'                 => 'үзүүл�х',
@@ -335,7 +352,6 @@ $1',
 Өөр х�р�гл�гч өр�өж у�тга�ан байж магадгүй.',
 'badtitle'             => 'Болохгүй гарчиг',
 'badtitletext'         => 'Оруул�ан хууда�ны н�р тань хүчингүй, хоо�он, ��в�л буруу холбо�он интер-х�л буюу интер-викигийн н�р байна. ��р�нд х�р�гл�гд�ж болохгүй т�мд�гт ор�он байж болзошгүй.',
-'perfdisabled'         => 'Уучлаарай! Эн� үйлд�л м�д��ллийн �анг маш удаашруулж, викиг х�н ч х�р�гл�ж болохгүй �вдалд хүрг�д�г тул түр хаагд�ан байна.',
 'perfcached'           => 'Дараах тоо баримт нь нөөц хуулбар учраа� хуучир�ан м�д��л�лт�й байж магадгүй.',
 'perfcachedts'         => 'Дараах тоо баримт нөөц хуулбар бөгөөд хамгийн �үүлд $1-д шин�чл�гд��н.',
 'querypage-no-updates' => 'Одоогийн байдлаар �н� хууд�анд шин�чл�лүүд хаагд�ан байна. Энд байгаа тоо баримт одоохондоо ��рг��гд�хгүй.',
@@ -363,10 +379,10 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'Гарах',
-'logouttext'                 => '<strong>Та одоо гарлаа.</strong>
+'logouttext'                 => "'''Та одоо гарлаа.'''
 
 Та �мар н�г х�р�гл�гчийн бүртг�лгүйг��р {{SITENAME}}-г ашиглах боломжтой, ��в�л �а�ынхаа болон өөр х�р�гл�гчийн бүртг�л�� ашиглан дахин холбогдож болно. 
-Броузерийнхаа хий�в�р �анах ойг ц�в�рл�х хүрт�л зарим н�г хууд�ууд нь таны холбогд�он байдлаар харагдаж болзошгүйг анхааруулъ�.',
+Броузерийнхаа хий�в�р �анах ойг ц�в�рл�х хүрт�л зарим н�г хууд�ууд нь таны холбогд�он байдлаар харагдаж болзошгүйг анхааруулъ�.",
 'welcomecreation'            => '== $1, тавтай морилно уу! ==
 Та амжилттай бүртг�гдл��. 
 {{SITENAME}}-н тохиргоогоо өөрчлөхөө мартуузай.',
@@ -377,7 +393,6 @@ $2',
 'remembermypassword'         => 'Эн� компьютер д��рх миний н�втр�лийг �ана',
 'yourdomainname'             => 'Таны дом�йн:',
 'externaldberror'            => '��г бол гадны баталгаажуулах м�д��ллийн �ангийн алдаа гар�ан, ��в�л та өөрийн гадны бүртг�л�� шин�чл�х �рхгүй байна.',
-'loginproblem'               => '<b>��втр�х�д тань алдаа гарлаа.</b><br />Дахин оролдоно уу!',
 'login'                      => '��втр�х',
 'nav-login-createaccount'    => '��втр�х / Бүртгүүл�х',
 'loginprompt'                => 'Та {{SITENAME}}-д н�втр�хийн тулд күүкинүүд ашигладах х�р�гт�й.',
@@ -445,7 +460,7 @@ $1 ү�г��� богино байх ё�той.',
 'mailerror'                  => 'М�йл илг��х�д алдаа гарлаа: $1',
 'acct_creation_throttle_hit' => 'Уучлаарай, та аль х�дийн�� $1 тооны х�р�гл�гчийн бүртг�л үү�г���н байна.
 Та дахин үү�г�ж болохгүй.',
-'emailauthenticated'         => 'Таны м�йл ха�г $1-нд баталгаажлаа.',
+'emailauthenticated'         => 'Таны м�йл ха�г $2-нд $3 цагт баталгаажлаа.',
 'emailnotauthenticated'      => 'Таны м�йл ха�г баталгаажаагүй байна.
 Иймд доорх функцуудын алинд нь ч м�йл илг��гд�хгүй.',
 'noemailprefs'               => 'Эдг��р функцуудыг ашиглахад м�йл ха�гаа өгөх х�р�гт�й.',
@@ -462,16 +477,19 @@ $1 ү�г��� богино байх ё�той.',
 'loginlanguagelabel'         => 'Х�л: $1',
 
 # Password reset dialog
-'resetpass'               => '�ууц үг�� дахин тогтоох',
-'resetpass_announce'      => 'Та м�йл��р илг��гд��н түр зуурын нууц үг��р н�вт�рч ор�он байна
+'resetpass'                 => '�ууц үг�� дахин тогтоох',
+'resetpass_announce'        => 'Та м�йл��р илг��гд��н түр зуурын нууц үг��р н�вт�рч ор�он байна
 Бүр�н н�вт�р�х�д та �нд шин� нууц үг�� оруулах х�р�гт�й:',
-'resetpass_header'        => '�ууц үг�� дахин тогтоох',
-'resetpass_submit'        => '�ууц үг�� тогтоож н�втр�х',
-'resetpass_success'       => 'Таны нууц үг амжилттай �олигдлоо! Та одоо н�вт�рч байна...',
-'resetpass_bad_temporary' => 'Хүчингүй түр зуурын нууц үг байна.
+'resetpass_header'          => '�ууц үг�� дахин тогтоох',
+'oldpassword'               => 'Хуучин нууц үг:',
+'newpassword'               => 'Шин� нууц үг:',
+'retypenew'                 => 'Шин� нууц үг�� дахин оруулах:',
+'resetpass_submit'          => '�ууц үг�� тогтоож н�втр�х',
+'resetpass_success'         => 'Таны нууц үг амжилттай �олигдлоо! Та одоо н�вт�рч байна...',
+'resetpass_bad_temporary'   => 'Хүчингүй түр зуурын нууц үг байна.
 Та аль х�дийн�� нууц үг�� �оль�он, ��в�л шин� түр зуурын нууц үг авах хү��лтийг тавь�ан байж магадгүй.',
-'resetpass_forbidden'     => '{{SITENAME}}-д нууц үгийг �олих боломжгүй',
-'resetpass_missing'       => 'Формын тоо баримт алга.',
+'resetpass_forbidden'       => '{{SITENAME}}-д нууц үгийг �олих боломжгүй',
+'resetpass-submit-loggedin' => '�ууц үг�� �олих',
 
 # Edit page toolbar
 'bold_sample'     => 'Тодруул�ан тек�т',
@@ -495,8 +513,8 @@ $1 ү�г��� богино байх ё�той.',
 'hr_tip'          => 'Хөндлөн шугам (бага х�р�гл��р�й)',
 
 # Edit pages
-'summary'                   => 'Товч агуулга',
-'subject'                   => 'С�д�в/гарчиг',
+'summary'                   => 'Товч агуулга:',
+'subject'                   => 'С�д�в/гарчиг:',
 'minoredit'                 => 'Эн� бол бага з�ргийн за�вар',
 'watchthis'                 => 'Эн� хууд�ыг х�на',
 'savearticle'               => 'Хууд�ыг хадгалах',
@@ -511,8 +529,8 @@ $1 ү�г��� богино байх ё�той.',
 'missingcommenttext'        => 'Доор �анал бодлоо оруулна уу.',
 'missingcommentheader'      => "'''Сануулга:''' Та �н� �анал бодлынхоо гарчигийг бич��гүй байна.
 Х�р�в та Хадгалах товчийг дахин дарвал таны за�вар гарчиггүй хадгалагдах болно.",
-'summary-preview'           => 'Товч агуулгын урьдчилж хар�ан байдал',
-'subject-preview'           => 'С�д�в/гарчигийн урьдчилж хар�ан байдал',
+'summary-preview'           => 'Товч агуулгын урьдчилж хар�ан байдал:',
+'subject-preview'           => 'С�д�в/гарчигийн урьдчилж хар�ан байдал:',
 'blockedtitle'              => 'Х�р�гл�гч түгжигдл��.',
 'blockedtext'               => "<big>'''Таны х�р�гл�гчийн н�р ��в�л IP ха�г түгжигд��н байна.'''</big>
 
@@ -564,24 +582,24 @@ $1 г���н х���г байхгүй учраа�, таны за�варыг
 'noarticletext'             => 'Одоогийн байдлаар �н� хууд�анд тек�т алга. Та н�г бол �н� хууда�ны н�р��р бу�ад хууд�уудад [[Special:Search/{{PAGENAME}}|хайлт хийх]], ��в�л �н� хууд�ыг [{{fullurl:{{FULLPAGENAME}}|action=edit}} за�варлаж] болно.',
 'userpage-userdoesnotexist' => '"$1" х�р�гл�гчийн бүртг�л бүртг�гд��гүй байна. Та �н� хууд�ыг үү�г�х/за�варлах тухайгаа дахин тунгааж бодно уу.',
 'clearyourcache'            => "'''Санамж:''' Хадгал�ныхаа дараа шин� тохиргоогоо харахын тулд броузерынхаа кешийг орхих х�р�гт�й болж магадгүй. '''Мозилла / Файрфок� / Сафари:''' ''Shift''-г дарж байхдаа ''Reload'' д��р дар, ��в�л ''Ctrl-Shift-R'' г�ж дар (Макинтош д��р ''Cmd-Shift-R''); '''Интерн�т Эк�плорер:''' ''Ctrl'' -г дарж байхдаа ''Refresh'' д��р дар, ��в�л ''Ctrl-F5'' г�ж дар; '''Конкерор:''' ''Reload'' товч д��р л дар, ��в�л ''F5''-г дар; '''Опера'''-гийн х�р�гл�гчид кешийг ''Tools→Preferences'' д��р бүр�н арилгах шаардлагатай болж магадгүй.",
-'usercssjsyoucanpreview'    => "<strong>Зөвлөгөө:</strong> 'Урьдчилан харах' товчийг ашиглан та өөрийн шин� CSS/ЖаваСкриптийг хадгалахаа�аа өмнө шалгах боломжтой.",
+'usercssjsyoucanpreview'    => "'''Зөвлөгөө:''' 'Урьдчилан харах' товчийг ашиглан та өөрийн шин� CSS/ЖаваСкриптийг хадгалахаа�аа өмнө шалгах боломжтой.",
 'usercsspreview'            => "'''Та өөрийн х�р�гл�гчийн CSS-г зөвхөн урьдчилан харж байгаа бөгөөд �н� нь хараахан хадгалагдаагүй байгаа г�дгийг анхаарна уу!'''",
 'userjspreview'             => "'''Та өөрийн х�р�гл�гчийн ЖаваСкриптийг зөвхөн урьдчилан харж байгаа бөгөөд �н� нь хараахан хадгалагдаагүй байгаа г�дгийг анхаарна уу!'''",
 'userinvalidcssjstitle'     => "'''�нхаар:''' \"\$1\" г���н арь� байхгүй байна.
 Өөр�дийн .css болон .js хууд�уудыг н�рл�х�д жижиг ү��г х�р�гл�д�г болохыг �ануулж байна. Жиш�� нь: {{ns:user}}:Foo/monobook.css г�ж л х�р�гл�х бөгөөд {{ns:user}}:Foo/Monobook.css г�хгүй.",
 'updated'                   => '(Шин�чл�гд��н)',
-'note'                      => '<strong>�нхааруулга:</strong>',
-'previewnote'               => '<strong>Эн� бол зөвхөн урьдчилж хар�ан байдал; за�варууд одоохондоо хадгалагдаагүй байна!</strong>',
+'note'                      => "'''�нхааруулга:'''",
+'previewnote'               => "'''Эн� бол зөвхөн урьдчилж хар�ан байдал; за�варууд одоохондоо хадгалагдаагүй байна!'''",
 'previewconflict'           => 'Эн� урьдчилж хар�ан байдал нь д��д талын за�варлах талбарын тек�тийг хадгалахад харагдах байдлыг харуулна.',
-'session_fail_preview'      => '<strong>Уучлаарай! М�д��л�л алдагд�наа� болж таны за�варыг болов�руулж чад�ангүй. Дахин оролдож үзн� үү. Инг��д ч болохгүй байвал �айтаа� гарч дахин н�вт�рч орж үзн� үү.</strong>',
-'session_fail_preview_html' => '<strong>Уучлаарай! М�д��л�л алдагд�наа� болж таны за�варыг болов�руулж чад�ангүй.</strong>
+'session_fail_preview'      => "'''Уучлаарай! М�д��л�л алдагд�наа� болж таны за�варыг болов�руулж чад�ангүй. Дахин оролдож үзн� үү. Инг��д ч болохгүй байвал �айтаа� гарч дахин н�вт�рч орж үзн� үү.'''",
+'session_fail_preview_html' => "'''Уучлаарай! М�д��л�л алдагд�наа� болж таны за�варыг болов�руулж чад�ангүй.'''
 
 {{SITENAME}} нь түүхий HTML-г х�р�гл�ж байгаа тул урьдчилж хар�ан байдал нь ЖаваСкриптийн довтолгооноо� ��ргийлж нуугд�ан байдалтай байна.
 
-<strong>Х�р�в �н� нь жинх�н� за�варлах оролдлого бол дахин оролдож үзн� үү. Инг��д ч болохгүй бол �айтаа� гарч дахин н�вт�рч үзн� үү.</strong>',
-'token_suffix_mismatch'     => '<strong>Таны в�б түнш за�варын т�мд�гл�г��г гажуудуул�ан тул таны за�варыг хүл��ж ав�ангүй.
+'''Х�р�в �н� нь жинх�н� за�варлах оролдлого бол дахин оролдож үзн� үү. Инг��д ч болохгүй бол �айтаа� гарч дахин н�вт�рч үзн� үү.'''",
+'token_suffix_mismatch'     => "'''Таны в�б түнш за�варын т�мд�гл�г��г гажуудуул�ан тул таны за�варыг хүл��ж ав�ангүй.
 Хууда�ны тек�тийг бүр�н бүт�н байлгах үүдн��� за�варыг хүл��ж ав�ангүй.
-Эн� нь алдаа ихт�й в�бийн н�ргүй прок�и х�р�гл�х үед заримдаа гардаг.</strong>',
+Эн� нь алдаа ихт�й в�бийн н�ргүй прок�и х�р�гл�х үед заримдаа гардаг.'''",
 'editing'                   => '$1-г за�варлаж байна',
 'editingsection'            => '$1-г за�варлаж байна (х���г)',
 'editingcomment'            => '$1-г за�варлаж байна (товч агуулга)',
@@ -593,27 +611,29 @@ $1 г���н х���г байхгүй учраа�, таны за�варыг
 \"Хууд�ыг хадгалах\" товчийг дарахад '''зөвхөн''' д��д талын тек�тийн талбарт буй тек�т л хадгалагдана.",
 'yourtext'                  => 'Таны тек�т',
 'storedversion'             => 'Хадгалагд�ан хувилбар',
-'nonunicodebrowser'         => '<strong>��Х��Р: Таны броузер юникод �тандартыг дагадаггүй юм байна. ASCII-биш ү�гүүд за�варлах талбарт код байдалтай харагдана. Ийм��� броузераа тохируулах, ��в�л өөрчилнө үү.</strong>',
-'editingold'                => '<strong>��Х��Р: Та �н� хууда�ны хуучир�ан хувилбарт за�вар хийж байна.
-Х�р�в та хадгалавал �н� хувилбараа� хойш хийгд��н за�варууд алдагдах болно.</strong>',
+'nonunicodebrowser'         => "'''��Х��Р: Таны броузер юникод �тандартыг дагадаггүй юм байна. ASCII-биш ү�гүүд за�варлах талбарт код байдалтай харагдана. Ийм��� броузераа тохируулах, ��в�л өөрчилнө үү.'''",
+'editingold'                => "'''��Х��Р: Та �н� хууда�ны хуучир�ан хувилбарт за�вар хийж байна.
+Х�р�в та хадгалавал �н� хувилбараа� хойш хийгд��н за�варууд алдагдах болно.'''",
 'yourdiff'                  => 'Өөрчлөлтүүд',
-'copyrightwarning'          => '{{SITENAME}}-д оруул�ан бүх хувь н�м�р $2-н хувьд (д�лг�р�нгүй м�д��ллийг $1-��� авна уу) тавигддаг болохыг анхаарна уу. Х�р�в та өөрийн бичл�г�� бу�дад за�варлуулах, тараагдуулахыг хү��хгүй байгаа бол �нд битгий оруулаарай.<br />
+'copyrightwarning'          => "{{SITENAME}}-д оруул�ан бүх хувь н�м�р $2-н хувьд (д�лг�р�нгүй м�д��ллийг $1-��� авна уу) тавигддаг болохыг анхаарна уу. Х�р�в та өөрийн бичл�г�� бу�дад за�варлуулах, тараагдуулахыг хү��хгүй байгаа бол �нд битгий оруулаарай.<br />
 Та мөн үүнийг өөрөө бич��н, ��в�л нийтийн өмчид тавигд�ан бүт��лийг хуулж тавь�ан г�дг�� амла�ан байгаа.
-<strong>ЗОХИОГЧИЙ� ЭРХ БҮХИЙ БҮТЭЭЛИЙГ ЗӨВШӨӨРӨЛГҮЙГЭЭР Т�ВИХИЙГ ХОРИГЛО�О!</strong>',
-'copyrightwarning2'         => '{{SITENAME}}-д оруул�ан бүх хувь н�мрийг бу�ад х�р�гл�гчид за�варлаж, өөрчилж, у�тгаж болдгийг анхаарна уу.
+'''ЗОХИОГЧИЙ� ЭРХ БҮХИЙ БҮТЭЭЛИЙГ ЗӨВШӨӨРӨЛГҮЙГЭЭР Т�ВИХИЙГ ХОРИГЛО�О!'''",
+'copyrightwarning2'         => "{{SITENAME}}-д оруул�ан бүх хувь н�мрийг бу�ад х�р�гл�гчид за�варлаж, өөрчилж, у�тгаж болдгийг анхаарна уу.
 Х�р�в та өөрийн үйлд��н бичл�г�� бу�дад за�варлуулахыг хү��хгүй байгаа бол �нд бүү оруулна уу.
 Та мөн үүнийг өөрөө бич��н, ��в�л нийтийн өмчид тавигд�ан (д�лг�р�нгүй м�д��ллийг $1-��� авна уу) бүт��лийг хуулж тавь�ан г�дг�� амла�ан байгааг анхаараарай.
-<strong>ЗОХИОГЧИЙ� ЭРХ БҮХИЙ БҮТЭЭЛИЙГ ЗӨВШӨӨРӨЛГҮЙГЭЭР Т�ВИХИЙГ ХОРИГЛО�О!</strong>',
-'longpagewarning'           => '<strong>��Х��Р: Эн� хууда� $1 килобайт урттай байна; зарим броузеруудад 32 килобайт орчим буюу түүн��� урт хууд�ыг за�варлахад хүндр�лт�й байж магадгүй.
-Хууд�ыг жижиг х��гүүд�д хувааж за�варлахыг �анал болгоё.</strong>',
-'longpageerror'             => '<strong>�ЛД��: Таны оруул�ан тек�т нь $1 килобайт урттай байгаа бөгөөд �н� нь д��д х�мж�� болох $2 килобайтаа� илүү урт байна.
-Хадгалах боломгүй байна.</strong>',
-'readonlywarning'           => '<strong>��Х��Р: М�д��ллийн �ан нь техникийн үзл�г хийх��р түр зуур түгжигд��н байгаа тул та одоохондоо за�варуудаа хадгалах боломжгүй байна.
-Та тек�т�� компьютертаа хадгалж дараа нь �нд хадгалахыг �анал болгоё.</strong>',
-'protectedpagewarning'      => '<strong>��Х��Р:  Эн� хууда� нь зөвхөн �и�темийн операторууд л за�варлаж болохоор түгжигд��н байна.</strong>',
+'''ЗОХИОГЧИЙ� ЭРХ БҮХИЙ БҮТЭЭЛИЙГ ЗӨВШӨӨРӨЛГҮЙГЭЭР Т�ВИХИЙГ ХОРИГЛО�О!'''",
+'longpagewarning'           => "'''��Х��Р: Эн� хууда� $1 килобайт урттай байна; зарим броузеруудад 32 килобайт орчим буюу түүн��� урт хууд�ыг за�варлахад хүндр�лт�й байж магадгүй.
+Хууд�ыг жижиг х��гүүд�д хувааж за�варлахыг �анал болгоё.'''",
+'longpageerror'             => "'''�ЛД��: Таны оруул�ан тек�т нь $1 килобайт урттай байгаа бөгөөд �н� нь д��д х�мж�� болох $2 килобайтаа� илүү урт байна.
+Хадгалах боломгүй байна.'''",
+'readonlywarning'           => "'''��Х��Р: М�д��ллийн �ан нь техникийн үзл�г хийх��р түр зуур түгжигд��н байгаа тул та одоохондоо за�варуудаа хадгалах боломжгүй байна.
+Та тек�т�� өөрийн компьютертаа �ануулж дараа нь �нд хадгалахыг �анал болгоё.'''
+
+Үүнийг түгж��н админи�тратор дараах тайлбарыг �анал болгож байна: $1",
+'protectedpagewarning'      => "'''��Х��Р:  Эн� хууда� нь зөвхөн �и�темийн операторууд л за�варлаж болохоор түгжигд��н байна.'''",
 'semiprotectedpagewarning'  => "'''�нхаар''': Эн� хууда� нь зөвхөн бүртг�гд��н х�р�гл�гчид л за�варлаж болохоор түгжигд��н байна.",
 'cascadeprotectedwarning'   => "'''�нхаар''': Эн� хууда� нь зөвхөн �и�темийн операторууд л за�варлаж болохоор түгжигд��н байна. Учир нь �н� хууда� дараах давхар хамгаалалттай {{PLURAL:$1|хууда�т|хууд�уудад}} орж��:",
-'titleprotectedwarning'     => '<strong>��Х��Р:  Эн� хууда� нь зарим х�р�гл�гчид л үү�г�ж болохоор түгжигд��н байна.</strong>',
+'titleprotectedwarning'     => "'''��Х��Р:  Эн� хууда� нь зарим х�р�гл�гчид л үү�г�ж болохоор түгжигд��н байна.'''",
 'templatesused'             => 'Эн� хууд�анд ашиглагдаж буй загварууд:',
 'templatesusedpreview'      => 'Эн� урьдчилж хар�ан байдалд ашиглагдаж буй загварууд:',
 'templatesusedsection'      => 'Эн� х���гт ашиглагдаж буй загварууд:',
@@ -649,29 +669,28 @@ $2-� доош байх ё�той, харин одоо $1 байна.',
 $3-н тодорхойл�он шалтгаан нь ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Эн� хууда�ны логийг үз�х',
-'nohistory'           => 'Хууд�анд за�вар хий��н түүх байхгүй байна.',
-'revnotfound'         => 'За�вар олд�онгүй',
-'revnotfoundtext'     => 'Таны орохыг хү���н хууда�ны хуучин за�вар олд�онгүй. Эн� хууда� руу �вахад х�р�гл���н URL-�� шалгана уу.',
-'currentrev'          => 'Одоогийн за�вар',
-'revisionasof'        => '$1-ий байдлаарх за�вар',
-'revision-info'       => '$1-ий байдлаарх $2 х�р�гл�гчийн хий��н за�вар',
-'previousrevision'    => '�Хуучны за�вар',
-'nextrevision'        => 'Дараагийн за�вар→',
-'currentrevisionlink' => 'Одоогийн за�вар',
-'cur'                 => 'одоогийн',
-'next'                => 'дараагийн',
-'last'                => '�үүлийн',
-'page_first'          => '�хний',
-'page_last'           => '�үүлийн',
-'histlegend'          => 'Өөрчлөлтүүдийг �онгох: харьцуулж үз�хийн тулд хувилбаруудын өмнөх хайрцагыг �онгож н�г бол "enter" товчлуурыг, ��в�л доорх товчлуурыг дараарай.<br />
+'viewpagelogs'           => 'Эн� хууда�ны логийг үз�х',
+'nohistory'              => 'Хууд�анд за�вар хий��н түүх байхгүй байна.',
+'currentrev'             => 'Одоогийн за�вар',
+'revisionasof'           => '$1-ий байдлаарх за�вар',
+'revision-info'          => '$1-ий байдлаарх $2 х�р�гл�гчийн хий��н за�вар', # Additionally available: $3: revision id
+'previousrevision'       => '�Хуучны за�вар',
+'nextrevision'           => 'Дараагийн за�вар→',
+'currentrevisionlink'    => 'Одоогийн за�вар',
+'cur'                    => 'одоогийн',
+'next'                   => 'дараагийн',
+'last'                   => '�үүлийн',
+'page_first'             => '�хний',
+'page_last'              => '�үүлийн',
+'histlegend'             => 'Өөрчлөлтүүдийг �онгох: харьцуулж үз�хийн тулд хувилбаруудын өмнөх хайрцагыг �онгож н�г бол "enter" товчлуурыг, ��в�л доорх товчлуурыг дараарай.<br />
 Т�мд�г: (одоогийн) = одоогийн за�вартай харьцуулах
 (�үүлчийн) = өмнөх за�вартай харьцуулах, Б = бага з�ргийн за�вар',
-'deletedrev'          => '[у�тгагд�ан]',
-'histfirst'           => 'Эхний',
-'histlast'            => 'Сүүлийн',
-'historysize'         => '($1 байт)',
-'historyempty'        => '(хоо�он байна)',
+'history-fieldset-title' => 'Түүх �өхөе',
+'deletedrev'             => '[у�тгагд�ан]',
+'histfirst'              => 'Эхний',
+'histlast'               => 'Сүүлийн',
+'historysize'            => '($1 байт)',
+'historyempty'           => '(хоо�он байна)',
 
 # Revision feed
 'history-feed-title'          => 'За�варын түүх',
@@ -785,6 +804,7 @@ $3-н тодорхойл�он шалтгаан нь ''$2''",
 'prevn'                     => 'өмнөх $1',
 'nextn'                     => 'дараагийн $1',
 'viewprevnext'              => 'Үз�х: ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:�гуулга',
 'search-result-size'        => '$1 ($2 үг)',
 'search-result-score'       => 'Холбоо хамаарал: $1%',
 'search-redirect'           => '($1-г шууд холбох)',
@@ -801,7 +821,7 @@ $3-н тодорхойл�он шалтгаан нь ''$2''",
 'searchall'                 => 'бүгд',
 'showingresults'            => "Доор #'''$2'''-� �хл���н '''$1''' ил�рцийг үзүүлж байна.",
 'showingresultsnum'         => "Доор #'''$2'''-� �хл���н '''$3''' ил�рцийг үзүүлж байна.",
-'showingresultstotal'       => "Доор '''$3'''-н '''$1 - $2''' хүрт�лх ил�рцийг үзүүлж байна.",
+'showingresultstotal'       => "Доор {{PLURAL:$4|ширх�г ил�рц (нийт '''$3''')|ширх�г '''$1 - $2''' дугаартай (нийт '''$3''') ил�рцүүдийг }} үзүүлж байна.",
 'nonefound'                 => "'''�нхаар''': �мжилтгүй хайлтууд нь голдуу \"байх\" з�р�г байнгын х�р�гл�д�г үгнүүд оролцуул�наа� болдог. Э�в�л н�г��� илүү үг��р хай�наа� болдог. Бүх оролцуул�ан үг ор�он хууд�ууд л ил�рц�нд багтаж байдаг.",
 'powersearch'               => 'Сонгож хайх',
 'powersearch-legend'        => 'Сонго�он хайлт',
@@ -825,6 +845,7 @@ $3-н тодорхойл�он шалтгаан нь ''$2''",
 'qbsettings-floatingright' => 'Баруун талд хөв�өн',
 'changepassword'           => '�ууц үг�� өөрчлөх',
 'skin'                     => '�рь�',
+'skin-preview'             => 'Урьдчилж харах',
 'math'                     => 'Томъёонууд',
 'dateformat'               => 'Огнооний х�лб�р',
 'datedefault'              => '�нхны байдал',
@@ -848,9 +869,6 @@ math/README-г уншиж тохируулна уу.',
 'prefs-misc'               => 'Бу�ад',
 'saveprefs'                => 'Хадгалах',
 'resetprefs'               => 'Хадгалаагүй өөрчлөлтүүдийг арилгах',
-'oldpassword'              => 'Хуучин нууц үг:',
-'newpassword'              => 'Шин� нууц үг:',
-'retypenew'                => 'Шин� нууц үг�� дахин оруулах:',
 'textboxsize'              => 'За�варлаж байна',
 'rows'                     => 'Мөр:',
 'columns'                  => 'Багана:',
@@ -878,7 +896,7 @@ math/README-г уншиж тохируулна уу.',
 'userrights-lookup-user'      => 'Х�р�гл�гчдийн бүлгүүдийг удирдах',
 'userrights-user-editname'    => 'Х�р�гл�гчийн н�р�� оруулна уу:',
 'editusergroup'               => 'Х�р�гл�гчийн бүлгийг за�варлах',
-'editinguser'                 => "Дараах х�р�гл�гчийн �рхийг за�варлаж байна: '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Дараах х�р�гл�гчийн �рхийг за�варлаж байна: '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Х�р�гл�гчийн бүлгүүдийг за�варлах',
 'saveusergroups'              => 'Х�р�гл�гчийн бүлгүүдийг хадгалах',
 'userrights-groupsmember'     => 'Үүний гишүүн:',
@@ -918,18 +936,19 @@ math/README-г уншиж тохируулна уу.',
 'grouppage-suppress'      => '{{ns:project}}:Х�нан зохицуулагчид',
 
 # Rights
-'right-read'             => 'Хууд�уудыг унших',
-'right-edit'             => 'Хууд�уудыг за�ах',
-'right-createpage'       => 'Хууд�ууд үү�г�х (х�л�лцүүлгийн хууда� биш)',
-'right-createtalk'       => 'Х�л�лцүүлгийн хууда� үү�г�х',
-'right-createaccount'    => 'Шин� х�р�гл�гчийн дан� н��х',
-'right-minoredit'        => 'Жижиг за�вар г�ж т�мд�гл�х',
-'right-move'             => 'Хууд�уудыг зөөх',
-'right-move-subpages'    => 'Хууд�уудыг д�д хууд�уудын хамт зөөх',
-'right-suppressredirect' => 'Хууд�уудыг зөөхдөө хуучин н�рн��� залгагч холбоо� үү�г�хгүй',
-'right-upload'           => 'Файл гадагш хуулах',
-'right-reupload'         => 'Байгаа файлыг дарж хуулах',
-'right-reupload-own'     => 'Өөрийн �нд хуул�ан байгаа файлаа дарж хуулах',
+'right-read'               => 'Хууд�уудыг унших',
+'right-edit'               => 'Хууд�уудыг за�ах',
+'right-createpage'         => 'Хууд�ууд үү�г�х (х�л�лцүүлгийн хууда� биш)',
+'right-createtalk'         => 'Х�л�лцүүлгийн хууда� үү�г�х',
+'right-createaccount'      => 'Шин� х�р�гл�гчийн дан� н��х',
+'right-minoredit'          => 'Жижиг за�вар г�ж т�мд�гл�х',
+'right-move'               => 'Хууд�уудыг зөөх',
+'right-move-subpages'      => 'Хууд�уудыг д�д хууд�уудын хамт зөөх',
+'right-move-rootuserpages' => 'Х�р�гл�гийн үнд��н хууд�уудыг зөөх',
+'right-suppressredirect'   => 'Хууд�уудыг зөөхдөө хуучин н�рн��� залгагч холбоо� үү�г�хгүй',
+'right-upload'             => 'Файл гадагш хуулах',
+'right-reupload'           => 'Байгаа файлыг дарж хуулах',
+'right-reupload-own'       => 'Өөрийн �нд хуул�ан байгаа файлаа дарж хуулах',
 
 # User rights log
 'rightslog'      => 'Х�р�гл�гчдийн �рхийн лог',
@@ -983,11 +1002,11 @@ math/README-г уншиж тохируулна уу.',
 'upload_directory_read_only'  => 'Файл оруулах каталог ($1) нь в�б�ерверт бичигд�х боломгүй байна.',
 'uploaderror'                 => 'Файл оруулахад алдаа гарлаа',
 'uploadtext'                  => "Доорх ма�гтыг х�р�гл�ж файлыг оруулна уу.
-Өмнө нь оруул�ан файлуудыг [[Special:ImageList|оруул�ан файлуудын жаг�аалтаа�]] харна уу. Оруул�ан ба у�тга�ан файлуудын жаг�аалт нь мөн [[Special:Log/upload|файл оруулалтын логт]] бий.
+Өмнө нь оруул�ан файлуудыг [[Special:FileList|оруул�ан файлуудын жаг�аалтаа�]] харна уу. Оруул�ан ба у�тга�ан файлуудын жаг�аалт нь мөн [[Special:Log/upload|файл оруулалтын логт]] бий.
 
 Хууд�анд файл оруулахад дараахийг х�р�гл�н� үү:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Файл.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Файл.png|alt text]]</nowiki>''', ��в�л шууд холбоход
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Файл.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Файл.png|alt text]]</nowiki>''', ��в�л шууд холбоход
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Файл.ogg]]</nowiki>'''",
 'upload-permitted'            => 'Оруулж болох файлын төрлүүд: $1.',
 'upload-preferred'            => 'Х�р�гл�хийг зөвлөж буй файлын төрлүүд: $1.',
@@ -1015,26 +1034,26 @@ math/README-г уншиж тохируулна уу.',
 'largefileserver'             => 'Эн� файл �ерверийн зөвшөөр�өн х�мж��н��� том байна.',
 'emptyfile'                   => 'Таны оруул�ан файл хоо�он байх шиг байна. Эн� нь файлын н�рийг алдаатай оруул�наа� бол�он байж магадгүй.
 Эн� файлыг үн�х��р оруулахыг хү��ж байгаа ���х�� шалгана уу.',
-'fileexists'                  => 'Ийм н�рт�й файл байна. Та үн�х��р үүнийг өөрчлөхийг хү��ж байгаадаа итг�лгүй байвал <strong><tt>$1</tt></strong>-г шалгаж үзн� үү.',
-'filepageexists'              => 'Эн� файлын тайлбар хууда� <strong><tt>$1</tt></strong>-д аль х�дийн�� үү�г�гд��н байна. Харин �н� н�рт�й файл байхгүй байна.
+'fileexists'                  => "Ийм н�рт�й файл байна. Та үн�х��р үүнийг өөрчлөхийг хү��ж байгаадаа итг�лгүй байвал '''<tt>$1</tt>'''-г шалгаж үзн� үү.",
+'filepageexists'              => "Эн� файлын тайлбар хууда� '''<tt>$1</tt>'''-д аль х�дийн�� үү�г�гд��н байна. Харин �н� н�рт�й файл байхгүй байна.
 Таны оруул�ан файлын тухай товч агуулга нь тайлбарын хууд�анд гарахгүй.
-Өөрийн оруул�ан файлын тухай товч агуулгыг т�нд тавихын тулд та гар аргаар за�варлах х�р�гт�й',
-'fileexists-extension'        => 'Ойролцоо н�рт�й файл байна:<br />
-Оруулж байгаа файлын н�р: <strong><tt>$1</tt></strong><br />
-Ойролцоо файлын н�р: <strong><tt>$2</tt></strong><br />
-Өөр н�рийг �онгоно уу.',
+Өөрийн оруул�ан файлын тухай товч агуулгыг т�нд тавихын тулд та гар аргаар за�варлах х�р�гт�й",
+'fileexists-extension'        => "Ойролцоо н�рт�й файл байна:<br />
+Оруулж байгаа файлын н�р: '''<tt>$1</tt>'''<br />
+Ойролцоо файлын н�р: '''<tt>$2</tt>'''<br />
+Өөр н�рийг �онгоно уу.",
 'fileexists-thumb'            => "<center>'''Байгаа файл'''</center>",
-'fileexists-thumbnail-yes'    => 'Эн� файл х�мж��г нь бага�га�ан зураг юм шиг байна <i>(thumbnail)</i>. <strong><tt>$1</tt></strong> файлыг шалгана уу.<br />
-Х�р�в шалгагд�ан файл анхны х�мж��ний зурагтай адил бол дахин жижиг зургыг оруулах х�р�ггүй.',
-'file-thumbnail-no'           => 'Файлын н�р <strong><tt>$1</tt></strong>-р �х�лж байна.
-Х�мж��г нь бага�га�ан зураг юм шиг байна <i>(thumbnail)</i>.
-Таньд �н� зурагны чанар �айтай хувилбар байвал түүнийг�� оруулж, байхгүй бол файлын н�рийг өөрчлөнө үү.',
+'fileexists-thumbnail-yes'    => "Эн� файл х�мж��г нь бага�га�ан зураг юм шиг байна ''(thumbnail)''. '''<tt>$1</tt>''' файлыг шалгана уу.<br />
+Х�р�в шалгагд�ан файл анхны х�мж��ний зурагтай адил бол дахин жижиг зургыг оруулах х�р�ггүй.",
+'file-thumbnail-no'           => "Файлын н�р '''<tt>$1</tt>'''-р �х�лж байна.
+Х�мж��г нь бага�га�ан зураг юм шиг байна ''(thumbnail)''.
+Таньд �н� зурагны чанар �айтай хувилбар байвал түүнийг�� оруулж, байхгүй бол файлын н�рийг өөрчлөнө үү.",
 'fileexists-forbidden'        => 'Ийм н�рт�й файл байна;
 файландаа шин� н�р өгөөд дахин оруулна уу.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Ийм н�рт�й файл нь хамтран �з�мших файлын �анд байна.
 Файландаа шин� н�р өгөөд дахин оруулна уу.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Файлыг амжилттай орууллаа',
 'uploadwarning'               => 'Хуулах үеийн анхааруулга',
 'savefile'                    => 'Файлыг хадгалах',
@@ -1056,8 +1075,8 @@ math/README-г уншиж тохируулна уу.',
 
 Эн� файлыг дахин оруулах нь зүйт�й ���хийг та бодож үзн� үү.
 Файлын у�тгалын лог �нд байна:",
-'filename-bad-prefix'         => 'Таны оруулж байгаа файлын н�р <strong>"$1"</strong>-р �х�лж байна. Эн� нь файлыг тодорхойлойлоогүй, голдуу дижитал аппаратын автоматаар гаргадаг н�р болно.
-Файланд түүнийг илүү �айн тодорхойл�он н�р өгнө үү.',
+'filename-bad-prefix'         => "Таны оруулж байгаа файлын н�р '''\"\$1\"'''-р �х�лж байна. Эн� нь файлыг тодорхойлойлоогүй, голдуу дижитал аппаратын автоматаар гаргадаг н�р болно.
+Файланд түүнийг илүү �айн тодорхойл�он н�р өгнө үү.",
 
 'upload-proto-error'      => 'Буруу протокол',
 'upload-proto-error-text' => 'Файл оруулахад х�р�гт�й URL-үүд нь <code>http://</code> ��в�л <code>ftp://</code>-р �хл���н байх шаардлагатай.',
@@ -1084,20 +1103,20 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'upload_source_url'  => ' (хүчинт�й, нийт�д н��лтт�й URL)',
 'upload_source_file' => '(таны компьютер доторх файл)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Эн� ту�гай хууд�анд бүх оруулагд�ан файлыг харуул�ан байгаа.
+# Special:ListFiles
+'listfiles-summary'     => 'Эн� ту�гай хууд�анд бүх оруулагд�ан файлыг харуул�ан байгаа.
 Хамгийн �үүлд оруул�ан файлууд жаг�аалтын хамгийн д��р байгаа.
 Баганын гарчиг д��р дарвал жаг�аалт өөрчлөгдөнө.',
-'imagelist_search_for'  => 'Зургийн н�р��р хайх:',
+'listfiles_search_for'  => 'Зургийн н�р��р хайх:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Файлын жаг�аалт',
-'imagelist_date'        => 'Огноо',
-'imagelist_name'        => '��р',
-'imagelist_user'        => 'Х�р�гл�гч',
-'imagelist_size'        => 'Х�мж�� (bytes)',
-'imagelist_description' => 'Тодорхойлолт/Дүр�л�л',
-
-# Image description page
+'listfiles'             => 'Файлын жаг�аалт',
+'listfiles_date'        => 'Огноо',
+'listfiles_name'        => '��р',
+'listfiles_user'        => 'Х�р�гл�гч',
+'listfiles_size'        => 'Х�мж�� (bytes)',
+'listfiles_description' => 'Тодорхойлолт/Дүр�л�л',
+
+# File description page
 'filehist'                  => 'Файлын түүх',
 'filehist-help'             => 'Огноо/цаг д��р нь дарж тухайн үед файл �мар бай�ныг харна уу.',
 'filehist-deleteall'        => 'бүгдийг арилга',
@@ -1142,7 +1161,6 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\'-н $3, $2-ий байдлаарх хувилбар у�тгагдлаа.</span>',
 'filedelete-nofile'           => "{{SITENAME}} д��р '''$1''' байхгүй байна.",
 'filedelete-nofile-old'       => "'''$1''' файлын өгөгд�өн өгөгдөлт�й архивлагд�ан хувилбар байхгүй байна.",
-'filedelete-iscurrent'        => 'Та �н� файлын хамгийн �үүлийн хувилбарыг у�тгах г�ж байна. Эхл��д хуучин хувилбар руу буцаана уу.',
 'filedelete-otherreason'      => 'Өөр/н�м�лт шалтгаан:',
 'filedelete-reason-otherlist' => 'Өөр шалтгаан',
 'filedelete-reason-dropdown'  => '*Ерөнхий у�тгах шалтгаанууд
@@ -1177,21 +1195,22 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'randomredirect-nopages' => 'Эн� н�рний зайд шууд холбогч байхгүй байна.',
 
 # Statistics
-'statistics'             => 'Стати�тик м�д��л�л',
-'sitestats'              => '{{SITENAME}} �тати�тик',
-'userstats'              => 'Х�р�гл�гчийн �тати�тик',
-'sitestatstext'          => "М�д��ллийн �анд {{PLURAL:\$1|'''1''' хууда�|нийт '''\$1''' хууда�}} байна.
-Эн� тоонд \"х�л�лцүүлгийн\" хууд�ууд, {{SITENAME}}-н тухай хууд�ууд, жижиг буюу \"түүхий\" хууд�удд, шууд холбогчууд, болон агуулгын хууда� г�ж тооцогдохгүй бу�ад хууд�уудыг оруул�ан тоо болно.
-Эдг��рийг тооцолгүйг��р агуулгын хууда� {{PLURAL:\$2|'''1'''|нийт '''\$2'''}} байна.
-
-'''\$8''' файл оруулагд�ан байна.
-
-{{SITENAME}} гар�наа� хойш нийт '''\$3''' удаа ханд�ан бөгөөд '''\$4''' за�вар хийгд��н байна.
-Эдг��рийг тооцвол дунджаар хууда� тутмыг '''\$5''' удаа за�варлаж, за�вар ту� бүрт '''\$6''' удаа ханд�ан байна.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue �жлын цувааны урт] одоогийн байдлаар '''\$7''' байна.",
-'userstatstext'          => "�ийт {{PLURAL:$1|'''1''' бүртг�гд��н [[Special:ListUsers|х�р�гл�гч]]|'''$1''' х�р�гл�гч [[Special:ListUsers|х�р�гл�гч]]}} байгаа бөгөөд үүн��� '''$2''' буюу '''$4%''' нь $5 г���н �рхт�й.",
-'statistics-mostpopular' => 'Хамгийн олон удаа үз��н хууд�ууд',
+'statistics'               => 'Стати�тик м�д��л�л',
+'statistics-header-pages'  => 'Хууда�ны �тати�тик',
+'statistics-header-edits'  => 'За�варын �тати�тик',
+'statistics-header-views'  => 'Стати�тикийг үз�х',
+'statistics-header-users'  => 'Х�р�гл�гчийн �тати�тик',
+'statistics-articles'      => '�гуулгын хууда�',
+'statistics-pages'         => '�ийт хууда�',
+'statistics-files'         => 'Оруул�ан файл',
+'statistics-edits'         => '{{SITENAME}} ашиглаланд ор�оноо� хойших хууда�ны за�варын тоо',
+'statistics-edits-average' => 'Хууда� тутмын дундаж за�варын тоо',
+'statistics-views-total'   => '�ийт үз��н тоо',
+'statistics-views-peredit' => 'За�вар тутмыг үз��н тоо',
+'statistics-jobqueue'      => '[http://www.mediawiki.org/wiki/Manual:Job_queue �жлын цувааны] урт',
+'statistics-users'         => 'Бүртг�гд��н [[Special:ListUsers|х�р�гл�гч]]',
+'statistics-users-active'  => 'Байнгын оролцоотой х�р�гл�гч',
+'statistics-mostpopular'   => 'Хамгийн олон удаа үз��н хууд�ууд',
 
 'disambiguations'      => 'Салаа утгатай үгнүүд',
 'disambiguationspage'  => 'Template:Салаа утгатай',
@@ -1278,8 +1297,6 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'speciallogtitlelabel' => 'Гарчиг:',
 'log'                  => 'Логууд',
 'all-logs-page'        => 'Бүх лог',
-'log-search-legend'    => 'Логуудаа� хайх',
-'log-search-submit'    => 'Явах',
 'alllogstext'          => 'Эн� нь аплоуд, у�тгал, хамгаалалт, түгжигд��н х�р�гл�гч, зөөлт, шин� х�р�гл�гчийн үү�г�л, х�р�гл�гчийн н�рний өөрчлөл, х�р�гл�гчийн �рхний логуудыг багтаа�ан хууда� юм. Та логийн төрөл, х�р�гл�гчийн н�р, нөлөөлөгд�өн хууда�ны н�рийг оруул�наар хайж буй зүйл тань илүү амар олдогдоно. Оруул�ан үгнийх�� том ба жижиг ү�гийг �г зөв оруулахгүй бол болохгүй.',
 'logempty'             => 'Логт тохирох зүйл алга.',
 'log-title-wildcard'   => 'Эн� тек�т��р �хл���н гарчигуудыг хайх',
@@ -1367,12 +1384,6 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'iteminvalidname'      => "'$1' зүйлд а�уудал гарлаа, хүчингүй н�р...",
 'wlnote'               => "Доорх нь �үүлийн {{PLURAL:$2|цагт|'''$2''' цагт}} хийгд��н {{PLURAL:$1|�үүлийн|�үүлийн '''$1'''}} өөрчлөлт юм.",
 'wlshowlast'           => 'Сүүлийн $1 цагийн $2 өдрийн $3-г харуул',
-'watchlist-show-bots'  => '�втоматаар хийгд��н за�варуудыг харуул',
-'watchlist-hide-bots'  => 'Роботуудын хий��н за�варуудыг нуух',
-'watchlist-show-own'   => 'Миний хий��н за�варуудыг харуул',
-'watchlist-hide-own'   => 'Миний хий��н за�варуудыг нуух',
-'watchlist-show-minor' => 'Жижиг за�варуудыг харуул',
-'watchlist-hide-minor' => 'Бага з�ргийн за�варуудыг нуух',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Х�наж байна...',
@@ -1389,71 +1400,76 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'enotif_lastdiff'              => '$1-г харж �н� өөрчлөлтийг үзн� үү.',
 'enotif_anon_editor'           => '$1 бүртг�лгүй х�р�гл�гч',
 
-# Delete/protect/revert
-'deletepage'                  => 'Хууд�ыг у�тга',
-'confirm'                     => 'Баталгаажуулах',
-'excontent'                   => "агуулга нь ийм бай�ан: '$1'",
-'excontentauthor'             => "агуулга нь ийм бай�ан: '$1' （зөвхөн '$2' нь л бичл�г үйлд�гч）",
-'exbeforeblank'               => "хоо�он болохын өмнөх үеийн агуулга: '$1'",
-'exblank'                     => 'хууда� нь хоо�он бай�ан',
-'delete-confirm'              => '"$1"-г у�тгах',
-'delete-legend'               => 'У�тгах',
-'historywarning'              => '�нхаар: Таны у�тгах г�ж байгаа хууда� түүхт�й байна:',
-'confirmdeletetext'           => 'Та �н� хууд�ыг түүхт�й нь бүхл��р нь у�тгах г�ж байна.
+# Delete
+'deletepage'             => 'Хууд�ыг у�тга',
+'confirm'                => 'Баталгаажуулах',
+'excontent'              => "агуулга нь ийм бай�ан: '$1'",
+'excontentauthor'        => "агуулга нь ийм бай�ан: '$1' （зөвхөн '$2' нь л бичл�г үйлд�гч）",
+'exbeforeblank'          => "хоо�он болохын өмнөх үеийн агуулга: '$1'",
+'exblank'                => 'хууда� нь хоо�он бай�ан',
+'delete-confirm'         => '"$1"-г у�тгах',
+'delete-legend'          => 'У�тгах',
+'historywarning'         => '�нхаар: Таны у�тгах г�ж байгаа хууда� түүхт�й байна:',
+'confirmdeletetext'      => 'Та �н� хууд�ыг түүхт�й нь бүхл��р нь у�тгах г�ж байна.
 Эн�хүү үйлдлийг хий�н��р �мар үр дүнд хүр�хийг бүр�н гүйц�д ойлгож хийж байгаа г�дг��, мөн [[{{MediaWiki:Policy-url}}|дүр�м журмынх нь дагуу]] хийж байнаагаа илтг�н� үү.',
-'actioncomplete'              => 'Үйлдлийг гүйц�тг�л��.',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" нь у�тгагдлаа.
+'actioncomplete'         => 'Үйлдлийг гүйц�тг�л��.',
+'deletedtext'            => '"<nowiki>$1</nowiki>" нь у�тгагдлаа.
 Сүүлд у�тгагд�ан зүйл�ийг $2-� харна уу.',
-'deletedarticle'              => '"[[$1]]" нь у�тгагдлаа',
-'suppressedarticle'           => '"[[$1]]"-г далдаллаа',
-'dellogpage'                  => 'У�тгагд�ан өгүүллүүдийн лог',
-'dellogpagetext'              => 'Доорх нь хамгийн �үүлийн үед хийгд��н у�тга�ан зүйл�ийн ли�т.',
-'deletionlog'                 => 'у�тгагд�ан өгүүллүүдийн лог',
-'reverted'                    => 'Хуучны за�вар руу буцаах',
-'deletecomment'               => 'У�тга�ан шалтгаан:',
-'deleteotherreason'           => 'Өөр/н�м�лт шалтгаан:',
-'deletereasonotherlist'       => 'Өөр шалтгаан',
-'deletereason-dropdown'       => '*Ерөнхий у�тгах шалтгаанууд
+'deletedarticle'         => '"[[$1]]" нь у�тгагдлаа',
+'suppressedarticle'      => '"[[$1]]"-г далдаллаа',
+'dellogpage'             => 'У�тгагд�ан өгүүллүүдийн лог',
+'dellogpagetext'         => 'Доорх нь хамгийн �үүлийн үед хийгд��н у�тга�ан зүйл�ийн ли�т.',
+'deletionlog'            => 'у�тгагд�ан өгүүллүүдийн лог',
+'reverted'               => 'Хуучны за�вар руу буцаах',
+'deletecomment'          => 'У�тга�ан шалтгаан:',
+'deleteotherreason'      => 'Өөр/н�м�лт шалтгаан:',
+'deletereasonotherlist'  => 'Өөр шалтгаан',
+'deletereason-dropdown'  => '*Ерөнхий у�тгах шалтгаанууд
 ** Бичл�г үйлд�гчийн хү��лт��р
 ** Зохиогчийн �рх�д халд�ан
 ** Вандализм',
-'delete-edit-reasonlist'      => 'У�тгах шалтгаануудыг за�варлах',
-'delete-toobig'               => 'Эн� хууда�ны за�варын түүх маш том байгаа бөгөөд $1 гаруй за�вартай байна.
+'delete-edit-reasonlist' => 'У�тгах шалтгаануудыг за�варлах',
+'delete-toobig'          => 'Эн� хууда�ны за�варын түүх маш том байгаа бөгөөд $1 гаруй за�вартай байна.
 {{SITENAME}}-д �анам�аргүй байдлаар муугаар нөлөөлж болзошгүй тул �дг��р хууд�уудыг у�тгах �вдлыг хорь�он байна.',
-'delete-warning-toobig'       => 'Эн� хууда�ны за�варын түүх маш том байгаа бөгөөд $1 гаруй за�вартай байна.
+'delete-warning-toobig'  => 'Эн� хууда�ны за�варын түүх маш том байгаа бөгөөд $1 гаруй за�вартай байна.
 У�тгавал {{SITENAME}}-н м�д��ллийн �ангийн үйл ажиллагаанд нөлөөлж магадгүй тул та анхаар ��р�мжт�йг��р дараах үйлдл�� гүйц�тг�н� үү.',
-'rollback'                    => 'За�варуудыг буцаах',
-'rollback_short'              => 'Буцаах',
-'rollbacklink'                => 'буцаах',
-'rollbackfailed'              => 'Буцааж чад�ангүй',
-'cantrollback'                => 'За�варла�ан х��гийг буцааж чад�ангүй. Сүүлчийн за�варыг хийгч нь �н� хууда�ны цорын ганц бичигч юм.',
-'alreadyrolled'               => '[[User:$2|$2]] ([[User talk:$2|Яриа]])-ын хий��н [[$1]] д�х �үүлчийн за�варыг буцааж чадахгүй байна; х�н н�г нь аль х�дийн уг хууд�ыг за�варла�ан буюу буцаа�ан байж болзошгүй. Сүүлчийн за�варыг [[User:$3|$3]] ([[User talk:$3|Яриа]]) хий��н.',
-'editcomment'                 => 'За�варлаж байгаа �анал хү��лт нь: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Яриа]]) х�р�гл�гчийн за�варуудыг;
-[[User:$1|$1]] х�р�гл�гчийн үйлд��н хамгийн �үүлийн хувилбар руу буцаалаа', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1-н өөрчлөлтүүдийг $2-н үйлд��н �үүлийн хувилбар руу буцаалаа.',
-'sessionfailure'              => 'Таны н�втр�лд алдаа гар�ан бололтой;
+
+# Rollback
+'rollback'         => 'За�варуудыг буцаах',
+'rollback_short'   => 'Буцаах',
+'rollbacklink'     => 'буцаах',
+'rollbackfailed'   => 'Буцааж чад�ангүй',
+'cantrollback'     => 'За�варла�ан х��гийг буцааж чад�ангүй. Сүүлчийн за�варыг хийгч нь �н� хууда�ны цорын ганц бичигч юм.',
+'alreadyrolled'    => '[[User:$2|$2]] ([[User talk:$2|Яриа]])-ын хий��н [[$1]] д�х �үүлчийн за�варыг буцааж чадахгүй байна; х�н н�г нь аль х�дийн уг хууд�ыг за�варла�ан буюу буцаа�ан байж болзошгүй. Сүүлчийн за�варыг [[User:$3|$3]] ([[User talk:$3|Яриа]]) хий��н.',
+'editcomment'      => "За�варлаж байгаа �анал хү��лт нь: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Яриа]]) х�р�гл�гчийн за�варуудыг;
+[[User:$1|$1]] х�р�гл�гчийн үйлд��н хамгийн �үүлийн хувилбар руу буцаалаа', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1-н өөрчлөлтүүдийг $2-н үйлд��н �үүлийн хувилбар руу буцаалаа.',
+'sessionfailure'   => 'Таны н�втр�лд алдаа гар�ан бололтой;
 компьютерийн �и�тем д�х м�д��ллийг хууль бу�аар авах �вдлаа� хамгаалах г�ж үйлд�л цуцлагд�ан байна
 "Back" товч д��р дарж өмнөх хууда� руугаа буцаж, дараа нь дахин оролдоно уу.',
+
+# Protect
 'protectlogpage'              => 'Хамгаалалтын лог',
 'protectlogtext'              => 'доорх нь түгжигд��н ба түгжигд��гүй хууда�ны ли�т.',
 'protectedarticle'            => '"[[$1]]"-г хамгааллаа',
 'modifiedarticleprotection'   => '"[[$1]]"-н хамгаалалтын түвшинг өөрчиллөө',
 'unprotectedarticle'          => '"[[$1]]"-г хамгаалахаа боль�он',
 'protect-title'               => '"[[$1]]"-н хамгаалалтын түвшинг өөрчлөх',
+'prot_1movedto2'              => '[[$1]] нь [[$2]] руу зөөгдлөө',
 'protect-legend'              => 'Хамгаалалтыг баталгаажуулах',
 'protectcomment'              => 'Тайлбар:',
 'protectexpiry'               => 'Дуу�ах:',
 'protect_expiry_invalid'      => 'Дуу�ах хугацаа хүчингүй байна.',
 'protect_expiry_old'          => 'Дуу�ах хугацаа өнгөр�өн цагт байна.',
 'protect-unchain'             => 'Зөөх зөвшөөрлүүдийг тайлах',
-'protect-text'                => 'Та <strong><nowiki>$1</nowiki></strong> хууда�ны хамгаалалтын түвшинг харж, өөрчлөх боломжтой.',
-'protect-locked-blocked'      => 'Түгжигд��н байхад хамгаалалтын түвшинг өөрчилж болохгүй.
-<strong>$1</strong> хууда�ны одоогийн тохиргоо �нд байна:',
-'protect-locked-dblock'       => 'М�д��ллийн �анг түгж��н байгаа тул хамгаалалтын түвшинг өөрчилж болохгүй. 
-<strong>$1</strong> хууда�ны одоогийн тохиргоо �нд байна:',
-'protect-locked-access'       => 'Таны бүртг�л хамгаалалтын түвшинг өөрчлөх зөвшөөрөлгүй байна.
-<strong>$1</strong> хууд�аны одоогийн тохиргоо �нд байна:',
+'protect-text'                => "Та '''<nowiki>$1</nowiki>''' хууда�ны хамгаалалтын түвшинг харж, өөрчлөх боломжтой.",
+'protect-locked-blocked'      => "Түгжигд��н байхад хамгаалалтын түвшинг өөрчилж болохгүй.
+'''$1''' хууда�ны одоогийн тохиргоо �нд байна:",
+'protect-locked-dblock'       => "М�д��ллийн �анг түгж��н байгаа тул хамгаалалтын түвшинг өөрчилж болохгүй. 
+'''$1''' хууда�ны одоогийн тохиргоо �нд байна:",
+'protect-locked-access'       => "Таны бүртг�л хамгаалалтын түвшинг өөрчлөх зөвшөөрөлгүй байна.
+'''$1''' хууд�аны одоогийн тохиргоо �нд байна:",
 'protect-cascadeon'           => 'Эн� хууда� давхар хамгаалалттай $1 хууд�анд ор�он тул одоогийн байдлаар түгжигд��н байна.
 Та �н� хууда�ны хамгаалалтын түвшинг өөрчилж болох боловч давхар хамгаалалтанд нөлөөлөхгүй.',
 'protect-default'             => '(анхны байдал)',
@@ -1464,6 +1480,7 @@ URL нь зөв болон �айт ажиллагаатай байгаа ���
 'protect-expiring'            => 'Дуу�ах хугацаа: $1 (UTC)',
 'protect-cascade'             => 'Эн� хууд�анд ор�он хууд�уудыг хамгаалах (давхар хамгаалалт)',
 'protect-cantedit'            => 'Таньд �н� хууд�ыг за�варлах �рх байхгүй тул хамгаалалтын түвшинг өөрчилж болохгүй.',
+'protect-expiry-options'      => '15 минут:15 minutes,30 минут:30 minutes,2 цаг:2 hours,1 өдөр:1 өдөр,3 days:3 өдөр,1 долоо хоног:1 week,2 долоо хоног:2 weeks,1 �ар:1 month,3 �ар:3 months,6 �ар:6 months,1 жил:1 year,хугацаагүй:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Зөвшөөрөл:',
 'restriction-level'           => 'Хамгаалалтын түвшин:',
 'minimum-size'                => 'Доод х�мж��',
@@ -1548,7 +1565,6 @@ $1',
 'whatlinkshere'            => 'Энд холбогд�он хууд�ууд',
 'whatlinkshere-title'      => '"$1"-д холбоо�той хууда�нууд',
 'whatlinkshere-page'       => 'Хууда�:',
-'linklistsub'              => '(Холбоо�уудын жаг�аалт)',
 'linkshere'                => "Дараах хууд�ууд '''[[:$1]]'''-тай холбогд�он байна:",
 'nolinkshere'              => "'''[[:$1]]'''-тай холбогд�он хууда� байхгүй байна.",
 'nolinkshere-ns'           => "Сонго�он н�рний зайд '''[[:$1]]''' руу холбогд�он хууда� байхгүй байна.",
@@ -1683,6 +1699,8 @@ $1',
 
 Эдг��р тохиолдлуудад уг хууд�ыг гар аргаар зөөх ��в�л н�гтг�х шаардлагатай болно.",
 'movearticle'             => 'Хууд�ыг зөөх:',
+'movenologin'             => 'н�втр��гүй байна',
+'movenologintext'         => 'Та хууд�ыг зөөхийн тулд бүртг�лт�й бөгөөд [[Special:UserLogin|холбогд�он]] байх ё�той.',
 'movenotallowed'          => 'Таньд {{SITENAME}} д��рх хууд�уудыг зөөх зөвшөөрөл байхгүй байна.',
 'newtitle'                => 'Шин��р н�рл�х:',
 'move-watch'              => 'Эн� хууд�ыг х�нах',
@@ -1708,7 +1726,6 @@ $1',
 'delete_and_move_reason'  => 'зөөвөрлөлтөнд зам үү�г�хийн тулд у�тгагд�ан.',
 'selfmove'                => 'Зөөгдөх г�ж байгаа хууда� болон шин��р н�рл�х г�ж байгаа хууда�ны н�рүүд ижил байна;
 хууд�ыг өөр рүү нь зөөж болохгүй.',
-'immobile_namespace'      => 'Ту�гай төрлийн байршилын ��в�л �х үү�в�рийн н�ршил; н�р���� зөөх ба оруулах нь боломжгүй.',
 
 # Export
 'export'            => 'Хууд�ыг �к�портлох',
@@ -1750,6 +1767,7 @@ $1',
 'import-interwiki-history'   => 'Эн� хууд�ын бүх хувилбаруудын түүхийг хуулах',
 'import-interwiki-submit'    => 'Импортлох',
 'import-interwiki-namespace' => 'Дараах н�рний зай руу хууд�уудыг зөөх:',
+'import-comment'             => 'Тайлбар:',
 'importtext'                 => 'Special:Export багажийг ашиглан файлыг �х үү�в�р викиг��� татаад, өөрийн ди�к�нд хадгалаж, �нд оруулна уу.',
 'importstart'                => 'Хууд�ыг импортлож байна...',
 'import-revision-count'      => '$1 за�вар',
@@ -1844,7 +1862,7 @@ $1',
 'lastmodifiedatby' => 'Эн� хууд�ыг  $3 нь хамгийн �үүлд өөрчил�өн ба өөрчил�өн нь $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1-ий бүт��л д��р тулгуурла�ан.',
 'others'           => 'Бу�ад',
-'siteusers'        => '$1 {{SITENAME}}-н х�р�гл�гч',
+'siteusers'        => '{{SITENAME}}-н {{PLURAL:$2|х�р�гл�гч|х�р�гл�гчид}} $1',
 'creditspage'      => 'Хууда�ны кредит',
 
 # Spam protection
@@ -1902,6 +1920,9 @@ $1',
 'previousdiff' => '� Өмнөх за�вар',
 'nextdiff'     => 'Удаах за�вар →',
 
+# Visual comparison
+'visual-comparison' => 'З�р�гцүүлж харах',
+
 # Media information
 'mediawarning'         => "'''�нхаар''':Эн� файл нь хор нөлөөт�й код агуул�ан байж болзошгүй, х�рв�� ачааллавал таны �и�темийн аюулгүй байдал доройтож болзошгүй.<hr />",
 'imagemaxsize'         => 'Доорх шаардлагын дагуу зургын хууд�анд х�згаарлалт хийл��:',
@@ -1914,7 +1935,7 @@ $1',
 'show-big-image'       => 'Хамгийн �айн чанартай хувилбар',
 'show-big-image-thumb' => '<small>Файлын одоогоор харагдаж буй х�мж��: $1 × $2 пик�ел</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Шин� файлуудын галер�й',
 'imagelisttext'         => "Доорх нь $2-р ангил�ан '''$1''' файлын жаг�аалт юм.",
 'newimages-summary'     => 'Эн� ту�гай хууд�анд хамгийн �үүлд оруулагд�ан файлуудыг үзүүлн�.',
@@ -2126,20 +2147,9 @@ $5
 Та үн�х��р �н� хууд�ыг дахин бий болгомоор байна уу?",
 'recreate'            => 'Дахин үү�г�х',
 
-# HTML dump
-'redirectingto' => '[[:$1]]-т�й шууд холбогд�он',
-
 # action=purge
-'confirm_purge'        => '�н� хууда�ны нөөц хувилбарыг у�тгах уу?
-
-$1',
 'confirm_purge_button' => 'T�г',
-
-# AJAX search
-'searchcontaining' => "''$1''-г агуул�ан хууд�уудыг хайх.",
-'articletitles'    => "''$1''-��р �х�л��н бичл�г",
-'hideresults'      => 'Үр дүнг нуух',
-'useajaxsearch'    => 'AJAX хайлт ашиглах',
+'confirm-purge-top'    => '�н� хууда�ны нөөц хувилбарыг у�тгах уу?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� өмнөх хууда�',
diff --git a/languages/messages/MessagesMo.php b/languages/messages/MessagesMo.php
index 05783bdc..d1f87869 100644
--- a/languages/messages/MessagesMo.php
+++ b/languages/messages/MessagesMo.php
@@ -10,6 +10,12 @@
 
 $fallback = 'ro';
 
+$specialPageAliases = array(
+	'CreateAccount'             => array( 'КреареКонт' ),
+	'Preferences'               => array( 'Преферинце' ),
+	'Recentchanges'             => array( 'Модифик�рьреченте' ),
+);
+
 $messages = array(
 # Dates
 'sun'       => 'Дум',
@@ -83,7 +89,7 @@ $messages = array(
 'userlogout' => 'Ынкиде �е�иун�',
 
 # Edit pages
-'summary'     => 'Резумат',
+'summary'     => 'Резумат:',
 'watchthis'   => 'Привеште ача�т� паӂин�',
 'showpreview' => '�рат� превизуализаре',
 
@@ -112,7 +118,7 @@ $messages = array(
 # Upload
 'upload' => 'Тримите фишиер',
 
-# Image description page
+# File description page
 'filehist'      => 'И�торикул фишиерулуй',
 'filehist-user' => 'Утилизатор',
 'imagelinks'    => 'Лег�турь',
diff --git a/languages/messages/MessagesMr.php b/languages/messages/MessagesMr.php
index 139dbe4a..8d6c7adc 100644
--- a/languages/messages/MessagesMr.php
+++ b/languages/messages/MessagesMr.php
@@ -16,72 +16,87 @@
  * @author शࣿरीहरि
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'मिडिया',
+	NS_SPECIAL          => 'विशेष',
+	NS_TALK             => 'चर�चा',
+	NS_USER             => 'सदस�य',
+	NS_USER_TALK        => 'सदस�य चर�चा',
+	NS_PROJECT_TALK     => '$1_चर�चा',
+	NS_FILE             => 'चित�र',
+	NS_FILE_TALK        => 'चित�र_चर�चा',
+	NS_MEDIAWIKI        => 'मिडियाविकी',
+	NS_MEDIAWIKI_TALK   => 'मिडियाविकी_चर�चा',
+	NS_TEMPLATE         => 'साचा',
+	NS_TEMPLATE_TALK    => 'साचा_चर�चा',
+	NS_HELP             => 'सहाय�य',
+	NS_HELP_TALK        => 'सहाय�य_चर�चा',
+	NS_CATEGORY         => 'वर�ग',
+	NS_CATEGORY_TALK    => 'वर�ग_चर�चा',
+);
+
+$namespaceAliases = array(
+	'साहाय�य' => NS_HELP,
+	'साहाय�य_चर�चा' => NS_HELP_TALK,
+);
+
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'द�हेरी_प�नर�निर�देशने' ),
-	'BrokenRedirects'           => array( 'च�कीची_प�नर�निर�देशने' ),
+	'DoubleRedirects'           => array( 'द�हेरी प�नर�निर�देशने' ),
+	'BrokenRedirects'           => array( 'च�कीची प�नर�निर�देशने' ),
 	'Disambiguations'           => array( 'नि:संदिग�धीकरण' ),
+	'Userlogin'                 => array( 'सदस�यप�रवेश' ),
+	'CreateAccount'             => array( 'सदस�यनोंद' ),
 	'Preferences'               => array( 'पसंती' ),
-	'Watchlist'                 => array( 'पहार��याची_सूची' ),
-	'Recentchanges'             => array( 'अलीकडील_बदल' ),
+	'Watchlist'                 => array( 'पहार��याची सूची' ),
+	'Recentchanges'             => array( 'अलीकडील बदल' ),
 	'Upload'                    => array( 'चढवा' ),
-	'Imagelist'                 => array( 'चित�रयादी' ),
-	'Newimages'                 => array( 'नवीन_चित�रे' ),
-	'Listusers'                 => array( 'सदस�यांची_यादी' ),
+	'Listfiles'                 => array( 'चित�रयादी' ),
+	'Newimages'                 => array( 'नवीन चित�रे' ),
+	'Listusers'                 => array( 'सदस�यांची यादी' ),
+	'Listgrouprights'           => array( 'गट अधिकार यादी' ),
 	'Statistics'                => array( 'सांख�यिकी' ),
-	'Randompage'                => array( 'अविशिष�ट', 'अविशिष�ट_पृष�ठ' ),
-	'Uncategorizedpages'        => array( 'अवर�गीकृत_पाने' ),
-	'Uncategorizedcategories'   => array( 'अवर�गीकृत_वर�ग' ),
-	'Uncategorizedimages'       => array( 'अवर�गीकृत_चित�रे' ),
-	'Uncategorizedtemplates'    => array( 'अवर�गीकृत_साचे' ),
-	'Unusedcategories'          => array( 'न_वापरलेले_वर�ग' ),
-	'Unusedimages'              => array( 'न_वापरलेली_चित�रे' ),
-	'Wantedpages'               => array( 'हवे_असलेले_लेख' ),
-	'Wantedcategories'          => array( 'हवे_असलेले_वर�ग' ),
-	'Shortpages'                => array( 'छोटी_पाने' ),
-	'Longpages'                 => array( 'मोठी_पाने' ),
-	'Newpages'                  => array( 'नवीन_पाने' ),
-	'Ancientpages'              => array( 'ज�नी_पाने' ),
-	'Deadendpages'              => array( 'टोकाची_पाने' ),
-	'Protectedpages'            => array( 'स�रक�षित_पाने' ),
-	'Allpages'                  => array( 'सर�व_पाने' ),
-	'Whatlinkshere'             => array( 'येथे_काय_जोडले_आहे' ),
+	'Randompage'                => array( 'अविशिष�ट', 'अविशिष�ट पृष�ठ' ),
+	'Uncategorizedpages'        => array( 'अवर�गीकृत पाने' ),
+	'Uncategorizedcategories'   => array( 'अवर�गीकृत वर�ग' ),
+	'Uncategorizedimages'       => array( 'अवर�गीकृत चित�रे' ),
+	'Uncategorizedtemplates'    => array( 'अवर�गीकृत साचे' ),
+	'Unusedcategories'          => array( 'न वापरलेले वर�ग' ),
+	'Unusedimages'              => array( 'न वापरलेली चित�रे' ),
+	'Wantedpages'               => array( 'हवे असलेले लेख' ),
+	'Wantedcategories'          => array( 'हवे असलेले वर�ग' ),
+	'Mostlinked'                => array( 'सर�वात जास�त जोडलेली' ),
+	'Mostlinkedcategories'      => array( 'सर�वात जास�त जोडलेले वर�ग', 'सर�वात जास�त वापरलेले वर�ग' ),
+	'Mostlinkedtemplates'       => array( 'सर�वात जास�त जोडलेले साचे', 'सर�वात जास�त वापरलेले साचे' ),
+	'Mostcategories'            => array( 'सर�वात जास�त वर�ग' ),
+	'Shortpages'                => array( 'छोटी पाने' ),
+	'Longpages'                 => array( 'मोठी पाने' ),
+	'Newpages'                  => array( 'नवीन पाने' ),
+	'Ancientpages'              => array( 'ज�नी पाने' ),
+	'Deadendpages'              => array( 'टोकाची पाने' ),
+	'Protectedpages'            => array( 'स�रक�षित पाने' ),
+	'Protectedtitles'           => array( 'स�रक�षित शीर�षके' ),
+	'Allpages'                  => array( 'सर�व पाने' ),
+	'Specialpages'              => array( 'विशेष पाने' ),
+	'Contributions'             => array( 'योगदान' ),
+	'Whatlinkshere'             => array( 'येथे काय जोडले आहे' ),
+	'Movepage'                  => array( 'पान हलवा' ),
 	'Categories'                => array( 'वर�ग' ),
-	'Listadmins'                => array( 'प�रबंधकांची_यादी' ),
-	'Listbots'                  => array( 'सांगकाम�यांची_यादी' ),
+	'Export'                    => array( 'निर�यात' ),
+	'Version'                   => array( 'आवृत�ती' ),
+	'Allmessages'               => array( 'सर�व निरोप' ),
+	'Undelete'                  => array( 'काढणे रद�द करा' ),
+	'Import'                    => array( 'आयात' ),
+	'Lockdb'                    => array( 'क�ल�पबंद करा (डेटाबेस)' ),
+	'Userrights'                => array( 'खातेदाराचे अधिकार' ),
+	'Mypage'                    => array( 'मा�े पान' ),
+	'Mytalk'                    => array( 'मा��या चर�चा' ),
+	'Mycontributions'           => array( 'मा�े योगदान' ),
+	'Listadmins'                => array( 'प�रबंधकांची यादी' ),
+	'Listbots'                  => array( 'सांगकाम�यांची यादी' ),
+	'Popularpages'              => array( 'प�रसिद�ध पाने' ),
 	'Search'                    => array( 'शोधा' ),
-	'Filepath'                  => array( 'संचिकेचा_पत�ता_(पाथ)' ),
-);
-
-$skinNames = array(
-	'standard'    => 'अभिजात',
-	'nostalgia'   => 'रम�य',
-	'cologneblue' => 'स�रेखनीळी',
-	'monobook'    => 'मोनोब�क',
-	'myskin'      => 'मा�ीकांती',
-	'chick'       => 'मस�त',
-	'simple'      => 'साधी',
-	'modern'      => 'आध�निक',
-);
-
-$namespaceNames = array(
-	NS_MEDIA          => 'मिडिया',
-	NS_SPECIAL        => 'विशेष',
-	NS_MAIN           => '',
-	NS_TALK           => 'चर�चा',
-	NS_USER           => 'सदस�य',
-	NS_USER_TALK      => 'सदस�य_चर�चा',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_चर�चा',
-	NS_IMAGE          => 'चित�र',
-	NS_IMAGE_TALK     => 'चित�र_चर�चा',
-	NS_MEDIAWIKI      => 'मिडियाविकी',
-	NS_MEDIAWIKI_TALK => 'मिडियाविकी_चर�चा',
-	NS_TEMPLATE       => 'साचा',
-	NS_TEMPLATE_TALK  => 'साचा_चर�चा',
-	NS_HELP           => 'साहाय�य',
-	NS_HELP_TALK      => 'साहाय�य_चर�चा',
-	NS_CATEGORY       => 'वर�ग',
-	NS_CATEGORY_TALK  => 'वर�ग_चर�चा',
+	'MergeHistory'              => array( 'इतिहास �कत�र करा' ),
+	'Filepath'                  => array( 'संचिकेचा पत�ता (पाथ)' ),
 );
 
 $magicWords = array(
@@ -198,8 +213,6 @@ $messages = array(
 'underline-never'   => 'कधीच नाही',
 'underline-default' => 'न�याहाळक अविचल (browser default)',
 
-'skinpreview' => '(�लक)',
-
 # Dates
 'sunday'        => 'रविवार',
 'monday'        => 'सोमवार',
@@ -293,7 +306,7 @@ $messages = array(
 'mytalk'         => 'मा��या चर�चा',
 'anontalk'       => 'या अंकपत�त�याचे चर�चा पान उघडा',
 'navigation'     => 'स�चालन',
-'and'            => 'आणि',
+'and'            => '&#32;आणि',
 
 # Metadata in edit box
 'metadata_help' => 'मेटाडाटा:',
@@ -356,8 +369,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} बद�दल',
 'aboutpage'            => 'Project:माहितीपृष�ठ',
-'bugreports'           => 'दोष अहवाल',
-'bugreportspage'       => 'Project:दोष अहवाल',
 'copyright'            => 'येथील मजकूर $1च�या अंतर�गत उपलब�ध आहे.',
 'copyrightpagename'    => '{{SITENAME}} प�रताधिकार',
 'copyrightpage'        => '{{ns:project}}:प�रताधिकार',
@@ -380,8 +391,6 @@ $messages = array(
 
 'badaccess'        => 'परवानगी नाकारण�यात आली आहे',
 'badaccess-group0' => 'त�म�ही करत असलेल�या क�रियेचे त�म�हाला अधिकार नाहीत.',
-'badaccess-group1' => 'फक�त $1 प�रकारचे सदस�य हे काम करू शकतात.',
-'badaccess-group2' => 'आपण विनीत केलेली कृती समूहां $1 पैकी सदस�याकरिता मर�यादीत आहे.',
 'badaccess-groups' => 'आपण विनीत केलेली कृती समूहां $1 पैकी सदस�याकरिता मर�यादीत आहे.',
 
 'versionrequired'     => 'मीडियाविकीच�या $1 आवृत�तीची गरज आहे.',
@@ -479,7 +488,6 @@ MySQL returned error "$3: $4".',
 'cannotdelete'         => 'पान किंवा संचिका वगळता आलेली नाही. (आधीच इतर क�णी वगळले असण�याची शक�यता आहे.)',
 'badtitle'             => 'च�कीचे शीर�षक',
 'badtitletext'         => 'आपण मागितलेले शीर�षक पान अयोग�य, रिकामे अथवा चूकीने जोडलेले आंतर-भाषिय किंवा आंतर-विकि शीर�षक आहे. त�यात �क किंवा अधिक शीर�षकअयोग�य चिन�हे आहेत.',
-'perfdisabled'         => 'क�षमस�व!ही स�विधा तात�प�रती अन�पलब�ध आहे कारण तिच�याम�ळे क�णीही विकि वापरू शकणार नाही इतपत विदागार (database) मंदगती होतो.',
 'perfcached'           => 'खालील माहिती सयीमध�ये(कॅशे) ठेवली आहे त�याम�ळे ती नवीनतम नसावी.',
 'perfcachedts'         => 'खालील माहिती सयीमध�ये(कॅशे) ठेवली आहे आणि शेवटी $1 ला बदलली होती.',
 'querypage-no-updates' => 'सध�या या पाना करिता नवीसंस�करणे अन�पलब�ध केली आहेत.आत�ताच येथील विदा ताजा होणार नाही.',
@@ -504,14 +512,14 @@ $2',
 ''$2'' हे कारण नमूद केलेले आहे.",
 
 # Virus scanner
-'virus-badscanner'     => 'च�कीचे कॉन�फिगरेशन: व�हायरस स�कॅनर अनोळखी: <i>$1</i>',
+'virus-badscanner'     => "च�कीचे कॉन�फिगरेशन: व�हायरस स�कॅनर अनोळखी: ''$1''",
 'virus-scanfailed'     => 'स�कॅन पूर�ण �ाले नाही (कोड $1)',
 'virus-unknownscanner' => 'अनोळखी �न�टीव�हायरस:',
 
 # Login and logout pages
 'logouttitle'                => 'बाहेर पडा',
-'logouttext'                 => '<strong>त�म�ही आता अदाखल �ाला(logout)आहात.</strong><br />
-त�म�ही अनामिकपणे {{SITENAME}}चा उपयोग करत राहू शकता, किंवा त�याच अथवा वेगळ�या सदस�य नावाने प�न�हा दाखल होऊ शकता. आपण स�वत:च�या न�याहाळकाची सय (cache) रिकामी करत नाही तो पर�यंत काही पाने आपण अजून दाखल आहात, असे न�सतेच दाखवत राहू शकतील.',
+'logouttext'                 => "'''त�म�ही आता अदाखल �ाला(logout)आहात.'''<br />
+त�म�ही अनामिकपणे {{SITENAME}}चा उपयोग करत राहू शकता, किंवा त�याच अथवा वेगळ�या सदस�य नावाने प�न�हा दाखल होऊ शकता. आपण स�वत:च�या न�याहाळकाची सय (cache) रिकामी करत नाही तो पर�यंत काही पाने आपण अजून दाखल आहात, असे न�सतेच दाखवत राहू शकतील.",
 'welcomecreation'            => '== स�स�वागतम, $1! ==
 
 त�मचे खाते उघडण�यात आले आहे. आपल�या {{SITENAME}} पसंती बदलण�यास विसरू नका.',
@@ -522,7 +530,6 @@ $2',
 'remembermypassword'         => 'मा�ा परवलीचा शब�द प�ढील खेपेसाठी लक�षात ठेवा.',
 'yourdomainname'             => 'त�मचे क�षेत�र (डॉमेन) :',
 'externaldberror'            => 'बाह�य प�रमाणितीकरण विदागार त�रूटी होती किंवा त�म�हाला त�मचे बाह�य खाते अपडेट करण�याची परवानगी नाही.',
-'loginproblem'               => '<b>त�मच�या प�रवेशप�रक�रियेमध�ये च�क �ाली आहे.</b><br />कृपया प�न�हा प�रयत�न करा!',
 'login'                      => 'प�रवेश करा',
 'nav-login-createaccount'    => 'सदस�य प�रवेश',
 'loginprompt'                => '{{SITENAME}}मध�ये दाखल होण�याकरिता  स�मृतिशेष ऊपलब�ध (Cookie enable)असणे आवश�यक आहे.',
@@ -598,11 +605,13 @@ $2',
 'resetpass_announce'      => 'त�म�ही इमेलमधून दिलेल�या तात�प�रत�या शब�दांकाने प�रवेश केलेला आहे. आपली सदस�य नोंदणी पूर�ण करण�यासाठी कृपया इथे नवीन परवलीचा शब�द द�या:',
 'resetpass_text'          => '<!-- मजकूर इथे लिहा -->',
 'resetpass_header'        => 'परवलीचे प�र�नयोजन करा',
+'oldpassword'             => 'ज�ना परवलीचा शब�दः',
+'newpassword'             => 'नवीन परवलीचा शब�द:',
+'retypenew'               => 'प�न�हा �कदा परवलीचा शब�द',
 'resetpass_submit'        => 'परवलीचा शब�द टाका आणि प�रवेश करा',
 'resetpass_success'       => 'त�मचा परवलीचा शब�द बदललेला आहे! आता त�मचा प�रवेश करीत आहोत...',
 'resetpass_bad_temporary' => 'तात�प�रता परवलीचा शब�द च�कीचा आहे. त�म�ही कदाचित पूर�वीच परवलीचा शब�द बदललेला असेल किंवा नवीन तात�प�रता परवलीचा शब�द मागितलेला असेल.',
 'resetpass_forbidden'     => '{{SITENAME}} वर परवलीचा शब�द बदलता येत नाही.',
-'resetpass_missing'       => 'सारणी विदा नाही.',
 
 # Edit page toolbar
 'bold_sample'     => 'ठळक मजकूर',
@@ -625,8 +634,8 @@ $2',
 'hr_tip'          => 'आडवी रेषा (कमी वापरा)',
 
 # Edit pages
-'summary'                          => 'सारांश',
-'subject'                          => 'विषय',
+'summary'                          => 'सारांश:',
+'subject'                          => 'विषय:',
 'minoredit'                        => 'हा �क छोटा बदल आहे',
 'watchthis'                        => 'या लेखावर लक�ष ठेवा',
 'savearticle'                      => 'हा लेख साठवून ठेवा',
@@ -638,8 +647,8 @@ $2',
 'missingsummary'                   => "'''आठवण:''' तूम�ही संपादन सारांश प�रवलेला नाही.आपण जतन करा वर प�न�हा टीचकी मारली तर तेत�या शिवाय जतन होईल.",
 'missingcommenttext'               => 'कृपया खाली प�रतिक�रीया भरा.',
 'missingcommentheader'             => "'''आठवण:'''आपण या लेखनाकरिता विषय किंवा अधोरेषा दिलेली नाही .आपण प�न�ह जतन करा अशी स�चना केली तर, त�मचे संपादन त�याशिवायच जतन होईल.",
-'summary-preview'                  => 'आढाव�याची �लक',
-'subject-preview'                  => 'विषय/मथळा �लक',
+'summary-preview'                  => 'आढाव�याची �लक:',
+'subject-preview'                  => 'विषय/मथळा �लक:',
 'blockedtitle'                     => 'या सदस�यासाठी प�रवेश नाकारण�यात आलेला आहे.',
 'blockedtext'                      => "<big>'''त�मचे सदस�यनाव अथवा IP पत�ता ब�लॉक केलेला आहे.'''</big>
 
@@ -690,23 +699,23 @@ $2',
 'clearyourcache'                   => "'''सूचना:''' जतन केल�यानंतर, बदल पहाण�याकरिता त�म�हाला त�मच�या विचरकाची सय टाळायला लागू शकते. '''मो�ील�ला/फायरफॉक�स /सफारी:''' ''Reload''करताना ''Shift''दाबून ठेवा किंवा ''Ctrl-Shift-R'' दाबा
 
 (�पल मॅक वर ''Cmd-shift-R'');'''IE:''' ''Refresh'' टिचकताना ''Ctrl'' दाबा,किंवा ''Ctrl-F5'' दाबा ; '''Konqueror:''': केवळ '''Reload''' टिचकवा,किवा ''F5'' दाबा; '''Opera'''उपयोगकर�त�यांना  ''Tools→Preferences'' मधील सय पूर�ण रिकामी करायला लागेल.",
-'usercssjsyoucanpreview'           => "<strong>टीप:</strong>त�मचे नवे CSS/JS जतन करण�यापूर�वी '�लक पहा' कळ वापरा.",
+'usercssjsyoucanpreview'           => "'''टीप:'''त�मचे नवे CSS/JS जतन करण�यापूर�वी '�लक पहा' कळ वापरा.",
 'usercsspreview'                   => "'''त�म�ही त�मच�या सी.�स.�स.ची केवळ �लक पहात आहात, ती अजून जतन केलेली नाही हे लक�षात घ�या.'''",
 'userjspreview'                    => "'''त�म�ही त�मची सदस�य जावास�क�रिप�ट तपासत आहात किंवा �लक पहात आहात ,ती अजून जतन केलेली नाही हे लक�षात घ�या!'''",
 'userinvalidcssjstitle'            => "'''सावधान:''' \"\$1\" अशी त�वचा नाही.custom .css आणि .js पाने lowercase title वापरतात हे लक�षात घ�या, उदा. {{ns:user}}:Foo/monobook.css या विरूद�ध {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(बदल �ाला आहे.)',
-'note'                             => '<strong>सूचना:</strong>',
-'previewnote'                      => '<strong>लक�षात ठेवा की ही फक�त �लक आहे, बदल अजून स�रक�षित केलेले नाहीत.</strong>',
+'note'                             => "'''सूचना:'''",
+'previewnote'                      => "'''लक�षात ठेवा की ही फक�त �लक आहे, बदल अजून स�रक�षित केलेले नाहीत.'''",
 'previewconflict'                  => 'वरील संपादन क�षेत�रातील मजकूर जतन केल�यावर या �लकेप�रमाणे दिसेल.',
-'session_fail_preview'             => '<strong>क�षमस�व! सत�र विदेच�या क�षयाम�ळे आम�ही त�मची संपादन प�रक�रीया पार पाडू शकलो नाही.कृपया प�न�हा प�रयत�न करा.जर �वढ�याने काम �ाले नाही तर सदस�य खात�यातून बाहेर पडून प�न�हा प�रवेश करून पहा.</strong>',
-'session_fail_preview_html'        => "<strong>क�षमस�व! सत�र विदेच�या क�षयाम�ळे आम�ही त�मची संपादन प�रक�रीया पार पाडू शकलो नाही.</strong>
+'session_fail_preview'             => "'''क�षमस�व! सत�र विदेच�या क�षयाम�ळे आम�ही त�मची संपादन प�रक�रीया पार पाडू शकलो नाही.कृपया प�न�हा प�रयत�न करा.जर �वढ�याने काम �ाले नाही तर सदस�य खात�यातून बाहेर पडून प�न�हा प�रवेश करून पहा.'''",
+'session_fail_preview_html'        => "'''क�षमस�व! सत�र विदेच�या क�षयाम�ळे आम�ही त�मची संपादन प�रक�रीया पार पाडू शकलो नाही.'''
 
 ''कारण {{SITENAME}}चे कच�चे HTML चालू ठेवले आहे, जावास�क�रिप�ट हल�ल�यांपासून बचाव व�हावा म�हणून �लक लपवली आहे.''
 
-<strong>जर संपादनाचा हा स�योग�य प�रयत�न असेल तर ,कॄपया प�न�हा प�रयत�न करा. जर �वढ�याने काम �ाले नाही तर सदस�य खात�यातून बाहेर पडून प�न�हा प�रवेश करून पहा.</strong>",
-'token_suffix_mismatch'            => '<strong>त�मचे संपादन रद�द करण�यात आलेले आहे कारण त�मच�या क�लायंटनी त�मच�या संपादनातील उद�गारवाचक चिन�हांमध�ये (punctuation) बदल केलेले आहेत.
+'''जर संपादनाचा हा स�योग�य प�रयत�न असेल तर ,कॄपया प�न�हा प�रयत�न करा. जर �वढ�याने काम �ाले नाही तर सदस�य खात�यातून बाहेर पडून प�न�हा प�रवेश करून पहा.'''",
+'token_suffix_mismatch'            => "'''त�मचे संपादन रद�द करण�यात आलेले आहे कारण त�मच�या क�लायंटनी त�मच�या संपादनातील उद�गारवाचक चिन�हांमध�ये (punctuation) बदल केलेले आहेत.
 पानातील मजकूर खराब होऊ नये यासाठी संपादन रद�द करण�यात आलेले आहे.
-असे कदाचित त�म�ही अनामिक proxy वापरत असल�याने होऊ शकते.</strong>',
+असे कदाचित त�म�ही अनामिक proxy वापरत असल�याने होऊ शकते.'''",
 'editing'                          => '$1 चे संपादन होत आहे.',
 'editingsection'                   => '$1 (विभाग) संपादन',
 'editingcomment'                   => '$1 संपादन (प�रतिक�रीया)',
@@ -717,22 +726,22 @@ $2',
 '''केवळ''' वरील पाठ�यभागामध�ये असलेले पाठ�य साठविण�यात येईल जर त�म�ही \"साठवून ठेवा\" ही कळ दाबली.",
 'yourtext'                         => 'त�मचे पाठ�य',
 'storedversion'                    => 'साठविलेली आवृत�ती',
-'nonunicodebrowser'                => '<strong>सावधान: त�मचा विचरक यूनिकोड आधारीत नाही. ASCII नसलेली  अक�षरचिन�हे संपादन खिडकीत सोळाअंकी कूटसंकेत (हेक��ाडेसीमल कोड) स�वरूपात दिसण�याची, स�रक�षीतपणे संपादन करू देणारी,  पळवाट उपलब�ध आहे.</strong>',
-'editingold'                       => '<strong>इशारा: त�म�ही मूळ पृष�ठाची �क कालबाह�य आवृत�ती संपादित करीत आहात.
-जर आपण बदल साठवून ठेवण�यात आले तर या नंतरच�या सर�व आवृत�त�यांमधील साठविण�यात आलेले बदल नष�ठ होतील.</strong>',
+'nonunicodebrowser'                => "'''सावधान: त�मचा विचरक यूनिकोड आधारीत नाही. ASCII नसलेली  अक�षरचिन�हे संपादन खिडकीत सोळाअंकी कूटसंकेत (हेक��ाडेसीमल कोड) स�वरूपात दिसण�याची, स�रक�षीतपणे संपादन करू देणारी,  पळवाट उपलब�ध आहे.'''",
+'editingold'                       => "'''इशारा: त�म�ही मूळ पृष�ठाची �क कालबाह�य आवृत�ती संपादित करीत आहात.
+जर आपण बदल साठवून ठेवण�यात आले तर या नंतरच�या सर�व आवृत�त�यांमधील साठविण�यात आलेले बदल नष�ठ होतील.'''",
 'yourdiff'                         => 'फरक',
-'copyrightwarning'                 => '{{SITENAME}} येथे केलेले कोणतेही लेखन $2 (अधिक माहितीसाठी $1 पहा) अंतर�गत म�क�त उद�घोषित केले आहे असे गृहित धरले जाईल याची कृपया नोंद घ�यावी. आपणास आपल�या लेखनाचे म�क�त संपादन आणि म�क�त वितरण होणे पसंत नसेल तर येथे संपादन करू नये.<br />
-त�म�ही येथे लेखन करताना हे स�द�धा गृहित धरलेले असते की येथे केलेले लेखन त�मचे स�वतःचे आणि केवळ स�वतःच�या प�रताधिकार (कॉपीराईट) मालकीचे आहे किंवा प�रताधिकाराने गठीत न होणार��या सार�वजनिक ज�ञानक�षेत�रातून घेतले आहे किंवा तत�सम म�क�त स�रोतातून घेतले आहे. त�म�ही संपादन करताना तसे वचन देत आहात. <strong>प�रताधिकारय�क�त लेखन स�योग�य परवानगीशिवाय म�ळीच चढवू/भरू नये!</strong>',
-'copyrightwarning2'                => '{{SITENAME}} येथे केलेले कोणतेही लेखन हे इतर संपादकांकरवी बदलले अथवा काढले जाऊ शकते. जर आपणास आपल�या लेखनाचे म�क�त संपादन होणे पसंत नसेल तर येथे संपादन करू नये.<br />
-त�म�ही येथे लेखन करताना हे स�द�धा गृहित धरलेले असते की येथे केलेले लेखन त�मचे स�वतःचे आणि केवळ स�वतःच�या प�रताधिकार (कॉपीराईट) मालकीचे आहे किंवा प�रताधिकाराने गठीत न होणार��या सार�वजनिक ज�ञानक�षेत�रातून घेतले आहे किंवा तत�सम म�क�त स�रोतातून घेतले आहे. त�म�ही संपादन करताना तसे वचन देत आहात (अधिक माहितीसाठी $1 पहा). <strong>प�रताधिकारय�क�त लेखन स�योग�य परवानगीशिवाय म�ळीच चढवू/भरू नये!</strong>',
-'longpagewarning'                  => '<strong>इशारा: हे पृष�ठ $1 kilobytes लांबीचे आहे; काही विचरकांना स�मारे ३२ किलोबाईट�स� आणि त�यापेक�षा जास�त लांबीच�या पृष�ठांना संपादित करण�यास अडचण येऊ शकते.
-कृपया या पृष�ठाचे त�याहून छोट�या भागात र�पांतर करावे.</strong>',
-'longpageerror'                    => '<strong>त�रूटी:आपण दिलेला मजक�र जास�तीत जास�त शक�य $2  किलोबाईट पेक�षा अधिक लांबीचा $1 किलोबाईट आहे.तो जतन केला जाऊ शकत नाही.</strong>',
-'readonlywarning'                  => '<strong>सावधान:विदागारास भरण-पोषणाकरिता ताळे ठोकले आहे,त�याम�ळे सध�या त�म�ही त�मचे संपादन जतन करू शकत नाही.जर त�म�हाला हवे असेल तर नंतर उपयोग करण�याच�या दृष�टीने, त�म�ही मजक�र ’मजक�र संचिकेत’(टेक�स�ट फाईल मध�ये) कापून-चिटकवू शकता.</strong>',
-'protectedpagewarning'             => '<strong>सूचना:  हे स�रक�षीत पान आहे. फक�त प�रबंधक याच�यात बदल कर� शकतात.</strong>',
+'copyrightwarning'                 => "{{SITENAME}} येथे केलेले कोणतेही लेखन $2 (अधिक माहितीसाठी $1 पहा) अंतर�गत म�क�त उद�घोषित केले आहे असे गृहित धरले जाईल याची कृपया नोंद घ�यावी. आपणास आपल�या लेखनाचे म�क�त संपादन आणि म�क�त वितरण होणे पसंत नसेल तर येथे संपादन करू नये.<br />
+त�म�ही येथे लेखन करताना हे स�द�धा गृहित धरलेले असते की येथे केलेले लेखन त�मचे स�वतःचे आणि केवळ स�वतःच�या प�रताधिकार (कॉपीराईट) मालकीचे आहे किंवा प�रताधिकाराने गठीत न होणार��या सार�वजनिक ज�ञानक�षेत�रातून घेतले आहे किंवा तत�सम म�क�त स�रोतातून घेतले आहे. त�म�ही संपादन करताना तसे वचन देत आहात. '''प�रताधिकारय�क�त लेखन स�योग�य परवानगीशिवाय म�ळीच चढवू/भरू नये!'''",
+'copyrightwarning2'                => "{{SITENAME}} येथे केलेले कोणतेही लेखन हे इतर संपादकांकरवी बदलले अथवा काढले जाऊ शकते. जर आपणास आपल�या लेखनाचे म�क�त संपादन होणे पसंत नसेल तर येथे संपादन करू नये.<br />
+त�म�ही येथे लेखन करताना हे स�द�धा गृहित धरलेले असते की येथे केलेले लेखन त�मचे स�वतःचे आणि केवळ स�वतःच�या प�रताधिकार (कॉपीराईट) मालकीचे आहे किंवा प�रताधिकाराने गठीत न होणार��या सार�वजनिक ज�ञानक�षेत�रातून घेतले आहे किंवा तत�सम म�क�त स�रोतातून घेतले आहे. त�म�ही संपादन करताना तसे वचन देत आहात (अधिक माहितीसाठी $1 पहा). '''प�रताधिकारय�क�त लेखन स�योग�य परवानगीशिवाय म�ळीच चढवू/भरू नये!'''",
+'longpagewarning'                  => "'''इशारा: हे पृष�ठ $1 kilobytes लांबीचे आहे; काही विचरकांना स�मारे ३२ किलोबाईट�स� आणि त�यापेक�षा जास�त लांबीच�या पृष�ठांना संपादित करण�यास अडचण येऊ शकते.
+कृपया या पृष�ठाचे त�याहून छोट�या भागात र�पांतर करावे.'''",
+'longpageerror'                    => "'''त�रूटी:आपण दिलेला मजक�र जास�तीत जास�त शक�य $2  किलोबाईट पेक�षा अधिक लांबीचा $1 किलोबाईट आहे.तो जतन केला जाऊ शकत नाही.'''",
+'readonlywarning'                  => "'''सावधान:विदागारास भरण-पोषणाकरिता ताळे ठोकले आहे,त�याम�ळे सध�या त�म�ही त�मचे संपादन जतन करू शकत नाही.जर त�म�हाला हवे असेल तर नंतर उपयोग करण�याच�या दृष�टीने, त�म�ही मजक�र ’मजक�र संचिकेत’(टेक�स�ट फाईल मध�ये) कापून-चिटकवू शकता.'''",
+'protectedpagewarning'             => "'''सूचना:  हे स�रक�षीत पान आहे. फक�त प�रबंधक याच�यात बदल कर� शकतात.'''",
 'semiprotectedpagewarning'         => "'''सूचना:''' हे पान स�रक�षीत आहे. फक�त सदस�य याच�यात बदल करू शकतात.",
 'cascadeprotectedwarning'          => "'''सावधान:''' हे पान निम�न-लिखीत शिडी-प�रतिबंधीत {{PLURAL:$1|पानात|पानात}} आंतरभूत असल�याम�ळे,केवळ प�रबंधक स�विधाप�राप�त सदस�यांनाच संपादन करता यावे असे ताळे त�यास ठोकलेले आहे :",
-'titleprotectedwarning'            => '<strong>सावधान:फक�त काही सदस�यानांच तयार करता यावे म�हणून ह�या पानास ताळे आहे.</strong>',
+'titleprotectedwarning'            => "'''सावधान:फक�त काही सदस�यानांच तयार करता यावे म�हणून ह�या पानास ताळे आहे.'''",
 'templatesused'                    => 'या पानावर खालील साचे वापरण�यात आलेले आहेत:',
 'templatesusedpreview'             => 'या �लकेमध�ये वापरलेले साचे:',
 'templatesusedsection'             => 'या विभागात वापरलेले साचे:',
@@ -775,30 +784,28 @@ $2',
 $3ने ''$2'' कारण दिले आहे.",
 
 # History pages
-'viewpagelogs'        => 'या पानाच�या नोंदी पहा',
-'nohistory'           => 'या पृष�ठासाठी आवृत�ती इतिहास अस�तित�वात नाही.',
-'revnotfound'         => 'आवृत�ती सापडली नाही',
-'revnotfoundtext'     => 'या पृष�ठाची त�म�ही मागविलेली ज�नी आवृत�ती सापडली नाही.
-कृपया URL तपासून पहा.',
-'currentrev'          => 'चालू आवृत�ती',
-'revisionasof'        => '$1 न�सारची आवृत�ती',
-'revision-info'       => '$2ने $1चे आवर�तन',
-'previousrevision'    => '�मागील आवृत�ती',
-'nextrevision'        => 'प�ढील आवृत�ती→',
-'currentrevisionlink' => 'आताची आवृत�ती',
-'cur'                 => 'चालू',
-'next'                => 'प�ढील',
-'last'                => 'मागील',
-'page_first'          => 'प�रथम',
-'page_last'           => 'अंतिम',
-'histlegend'          => 'बदल निवडणे: ज�न�या आवृत�तींमधील फरक पाहण�यासाठी रेडियो बॉक�स निवडा व �न�टर कळ दाबा अथवा खाली दिलेल�या कळीवर टिचकी द�या.<br />
+'viewpagelogs'           => 'या पानाच�या नोंदी पहा',
+'nohistory'              => 'या पृष�ठासाठी आवृत�ती इतिहास अस�तित�वात नाही.',
+'currentrev'             => 'चालू आवृत�ती',
+'revisionasof'           => '$1 न�सारची आवृत�ती',
+'revision-info'          => '$2ने $1चे आवर�तन', # Additionally available: $3: revision id
+'previousrevision'       => '�मागील आवृत�ती',
+'nextrevision'           => 'प�ढील आवृत�ती→',
+'currentrevisionlink'    => 'आताची आवृत�ती',
+'cur'                    => 'चालू',
+'next'                   => 'प�ढील',
+'last'                   => 'मागील',
+'page_first'             => 'प�रथम',
+'page_last'              => 'अंतिम',
+'histlegend'             => 'बदल निवडणे: ज�न�या आवृत�तींमधील फरक पाहण�यासाठी रेडियो बॉक�स निवडा व �न�टर कळ दाबा अथवा खाली दिलेल�या कळीवर टिचकी द�या.<br />
 लिजेंड: (चालू) = चालू आवृत�तीशी फरक,
 (मागील) = पूर�वीच�या आवृत�तीशी फरक, छो = छोटा बदल',
-'deletedrev'          => '[वगळले]',
-'histfirst'           => 'सर�वात ज�ने',
-'histlast'            => 'सर�वात नवीन',
-'historysize'         => '({{PLURAL:$1|1 बाइट|$1 बाइट}})',
-'historyempty'        => '(रिकामे)',
+'history-fieldset-title' => 'इतिहास विंचरण करा',
+'deletedrev'             => '[वगळले]',
+'histfirst'              => 'सर�वात ज�ने',
+'histlast'               => 'सर�वात नवीन',
+'historysize'            => '({{PLURAL:$1|1 बाइट|$1 बाइट}})',
+'historyempty'           => '(रिकामे)',
 
 # Revision feed
 'history-feed-title'          => 'आवृत�ती इतिहास',
@@ -914,6 +921,7 @@ $3ने ''$2'' कारण दिले आहे.",
 'prevn'                     => 'मागील $1',
 'nextn'                     => 'प�ढील $1',
 'viewprevnext'              => 'पहा ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:साहाय�य पृष�ठ',
 'search-result-size'        => '$1 ({{PLURAL:$2|१ शब�द|$2 शब�द}})',
 'search-result-score'       => 'ज�ळणी: $1%',
 'search-redirect'           => '(प�नर�निर�देशन $1)',
@@ -955,6 +963,7 @@ $3ने ''$2'' कारण दिले आहे.",
 'qbsettings-floatingright' => 'तरंगते ऊजवे',
 'changepassword'           => 'परवलीचा शब�द बदला',
 'skin'                     => 'त�वचा',
+'skin-preview'             => '�लक',
 'math'                     => 'गणित',
 'dateformat'               => 'दिनांक लेखनशैली',
 'datedefault'              => 'प�राथमिकता नाही',
@@ -976,9 +985,6 @@ $3ने ''$2'' कारण दिले आहे.",
 'prefs-misc'               => 'इतर',
 'saveprefs'                => 'जतन करा',
 'resetprefs'               => 'न जतन केलेले बदल रद�द करा',
-'oldpassword'              => 'ज�ना परवलीचा शब�दः',
-'newpassword'              => 'नवीन परवलीचा शब�द:',
-'retypenew'                => 'प�न�हा �कदा परवलीचा शब�द',
 'textboxsize'              => 'संपादन',
 'rows'                     => 'ओळी:',
 'columns'                  => 'स�तंभ:',
@@ -1008,7 +1014,7 @@ $3ने ''$2'' कारण दिले आहे.",
 'userrights-lookup-user'      => 'सदस�य गटांचे(ग�रूप�स) व�यवस�थापन करा.',
 'userrights-user-editname'    => 'सदस�य नाव टाका:',
 'editusergroup'               => 'सदस�य गट (ग�रूप�स) संपादीत करा',
-'editinguser'                 => "सदस�य '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])चे सदस�य अधिकारात बदल केला जात आहे.",
+'editinguser'                 => "सदस�य '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])चे सदस�य अधिकारात बदल केला जात आहे.",
 'userrights-editusergroup'    => 'सदस�य मंडळे संपादीत करा',
 'saveusergroups'              => 'सदस�य गट जतन करा',
 'userrights-groupsmember'     => '(चा) सभासद:',
@@ -1154,11 +1160,11 @@ $3ने ''$2'' कारण दिले आहे.",
 'upload_directory_read_only'  => '$1 या डिरेक�टरी मध�ये सर�व�हर लिहू शकत नाही.',
 'uploaderror'                 => 'चढवण�यात च�क',
 'uploadtext'                  => "खालील अर�ज नवीन संचिका चढविण�यासाठी वापरा.
-पूर�वी चढविलेल�या संचिका पाहण�यासाठी अथवा शोधण�यासाठी [[Special:ImageList|चढविलेल�या संचिकांची यादी]] पहा. चढविलेल�या तसेच वगळलेल�या संचिकांची यादी पहाण�यासाठी [[Special:Log/upload|सूची]] पहा.
+पूर�वी चढविलेल�या संचिका पाहण�यासाठी अथवा शोधण�यासाठी [[Special:FileList|चढविलेल�या संचिकांची यादी]] पहा. चढविलेल�या तसेच वगळलेल�या संचिकांची यादी पहाण�यासाठी [[Special:Log/upload|सूची]] पहा.
 
 �खाद�या लेखात ही संचिका वापरण�यासाठी खालीलप�रमाणे द�वा द�या
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' किंवा
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' किंवा
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' संचिकेला थेट द�वा देण�यासाठी वापरा.",
 'upload-permitted'            => 'अन�मतीत संचिका वर�ग: $1.',
 'upload-preferred'            => 'श�रेयस�कर संचिका प�रकार:$1.',
@@ -1184,20 +1190,20 @@ $3ने ''$2'' कारण दिले आहे.",
 'large-file'                  => 'संचिका $1 पेक�षा कमी आकाराची असण�याची अपेक�षा आहे, ही संचिका $2 �वढी आहे.',
 'largefileserver'             => 'सेवा संगणकावर (सर�वर) निर�धारित केलेल�या आकारापेक�षा या संचिकेचा आकार मोठा आहे.',
 'emptyfile'                   => 'चढवलेली संचिका रिकामी आहे. हे संचिकानाम च�कीचे लिहिल�याने असू शकते. कृपया त�म�हाला हीच संचिका चढवायची आहे का ते तपासा.',
-'fileexists'                  => 'या नावाची संचिका आधीच अस�तित�वात आहे, कृपया ही संचिका बदलण�याबद�दल त�म�ही साशंक असाल तर <strong><tt>$1</tt></strong> तपासा.',
-'filepageexists'              => 'या नावाचे �क माहितीपृष�ठ (संचिका नव�हे) अगोदरच अस�तित�त�वात आहे. कृपया जर आपणांस त�यात बदल करायचा नसेल तर <strong><tt>$1</tt></strong> तपासा.',
-'fileexists-extension'        => 'या नावाची संचिका अस�तित�वात आहे:<br />
-चढवित असलेल�या संचिकेचे नाव: <strong><tt>$1</tt></strong><br />
-अस�तित�वात असलेल�या संचिकेचे नाव: <strong><tt>$2</tt></strong><br />
-कृपया द�सरे नाव निवडा.',
+'fileexists'                  => "या नावाची संचिका आधीच अस�तित�वात आहे, कृपया ही संचिका बदलण�याबद�दल त�म�ही साशंक असाल तर '''<tt>$1</tt>''' तपासा.",
+'filepageexists'              => "या नावाचे �क माहितीपृष�ठ (संचिका नव�हे) अगोदरच अस�तित�त�वात आहे. कृपया जर आपणांस त�यात बदल करायचा नसेल तर '''<tt>$1</tt>''' तपासा.",
+'fileexists-extension'        => "या नावाची संचिका अस�तित�वात आहे:<br />
+चढवित असलेल�या संचिकेचे नाव: '''<tt>$1</tt>'''<br />
+अस�तित�वात असलेल�या संचिकेचे नाव: '''<tt>$2</tt>'''<br />
+कृपया द�सरे नाव निवडा.",
 'fileexists-thumb'            => "<center>'''सध�याची संचिका'''</center>",
-'fileexists-thumbnail-yes'    => 'आपण चढवित असलेली संचिका ही मोठ�या चित�राची �लक <i>(thumbnail)</i> असण�याची शक�यता आहे. कृपया <strong><tt>$1</tt></strong> ही संचिका तपासा.<br />
-जर तपासलेली संचिका ही याच आकाराची असेल तर नवीन �लक चढविण�याची गरज नाही.',
-'file-thumbnail-no'           => 'या संचिकेचे नाव <strong><tt>$1</tt></strong> पासून स�रू होत आहे. ही कदाचित �लक <i>(thumbnail)</i> असू शकते.
-जर त�मच�या कडे पूर�ण रि�ोल�यूशनची संचिका असेल तर चढवा अथवा संचिकेचे नाव बदला.',
+'fileexists-thumbnail-yes'    => "आपण चढवित असलेली संचिका ही मोठ�या चित�राची �लक ''(thumbnail)'' असण�याची शक�यता आहे. कृपया '''<tt>$1</tt>''' ही संचिका तपासा.<br />
+जर तपासलेली संचिका ही याच आकाराची असेल तर नवीन �लक चढविण�याची गरज नाही.",
+'file-thumbnail-no'           => "या संचिकेचे नाव '''<tt>$1</tt>''' पासून स�रू होत आहे. ही कदाचित �लक ''(thumbnail)'' असू शकते.
+जर त�मच�या कडे पूर�ण रि�ोल�यूशनची संचिका असेल तर चढवा अथवा संचिकेचे नाव बदला.",
 'fileexists-forbidden'        => 'या नावाची संचिका अगोदरच अस�तित�त�वात आहे; कृपया प�न�हा मागे जाऊन ही संचिका नवीन नावाने चढवा.
-[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'हे नाव असलेली �क संचिका शेअर�ड संचिका कोशात आधी पासून आहे; कृपया परत फिरा आणि नविन(वेगळ�या) नावाने ही संचिका प�न�हा चढवा.[[Image:$1|इवले|मध�य|$1]]',
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'हे नाव असलेली �क संचिका शेअर�ड संचिका कोशात आधी पासून आहे; कृपया परत फिरा आणि नविन(वेगळ�या) नावाने ही संचिका प�न�हा चढवा.[[File:$1|इवले|मध�य|$1]]',
 'file-exists-duplicate'       => 'ही संचिका खालील {{PLURAL:$1|संचिकेची|संचिकांची}} प�रत आहे:',
 'successfulupload'            => 'यशस�वीरीत�या चढवले',
 'uploadwarning'               => 'चढवताना सूचना',
@@ -1218,7 +1224,7 @@ $3ने ''$2'' कारण दिले आहे.",
 
 कृपया त�म�ही करत असलेली कृती योग�य असल�याची खात�री करून घ�या.
 त�मच�या सोयीसाठी वगळल�याची नोंद प�ढीलप�रमाणे:",
-'filename-bad-prefix'         => 'त�म�ही चढवत असलेल�या संचिकेचे नाव <strong>"$1"</strong> पासून स�रू होते, जे की अंकीय छाउ (कॅमेरा) ने दिलेले अवर�णनात�मक नाव आहे.कृपया त�मच�या संचिकेकरिता अधिक वर�णनात�मक नाव निवडा.',
+'filename-bad-prefix'         => "त�म�ही चढवत असलेल�या संचिकेचे नाव '''\"\$1\"''' पासून स�रू होते, जे की अंकीय छाउ (कॅमेरा) ने दिलेले अवर�णनात�मक नाव आहे.कृपया त�मच�या संचिकेकरिता अधिक वर�णनात�मक नाव निवडा.",
 
 'upload-proto-error'      => 'चूकीचा संकेत',
 'upload-proto-error-text' => 'दूरस�थ चढवण�याच�या क�रियेत <code>http://</code>पासून किंवा <code>ftp://</code>पासून सूरू होणारी URL लागतात.',
@@ -1239,20 +1245,20 @@ $3ने ''$2'' कारण दिले आहे.",
 'upload_source_url'  => '(�क स�योग�य,सार�वजनिकरित�या उपलब�ध URL)',
 'upload_source_file' => '(त�मच�या संगणकावरील �क संचिका)',
 
-# Special:ImageList
-'imagelist-summary'     => 'हे विशेष पान सर�व चढविलेल�या संचिका दर�शिविते.
+# Special:ListFiles
+'listfiles-summary'     => 'हे विशेष पान सर�व चढविलेल�या संचिका दर�शिविते.
 सर�वसाधारणपणे सगळ�यात शेवटी बदल �ालेल�या संचिका सर�वात वर दिसतात.
 रकान�याच�या नावाप�ढे टिचकी देऊन संचिकांचा अन�क�रम बदलता येतो.',
-'imagelist_search_for'  => 'चित�र नावाने शोध:',
+'listfiles_search_for'  => 'चित�र नावाने शोध:',
 'imgfile'               => 'संचिका',
-'imagelist'             => 'चित�र यादी',
-'imagelist_date'        => 'दिनांक',
-'imagelist_name'        => 'नाव',
-'imagelist_user'        => 'सदस�य',
-'imagelist_size'        => 'आकार (बाईट�स)',
-'imagelist_description' => 'वर�णन',
-
-# Image description page
+'listfiles'             => 'चित�र यादी',
+'listfiles_date'        => 'दिनांक',
+'listfiles_name'        => 'नाव',
+'listfiles_user'        => 'सदस�य',
+'listfiles_size'        => 'आकार (बाईट�स)',
+'listfiles_description' => 'वर�णन',
+
+# File description page
 'filehist'                       => 'संचिकेचा इतिहास',
 'filehist-help'                  => 'संचिकेची पूर�वीची आवृत�ती बघण�यासाठी दिनांक/वेळ वर टिचकी द�या.',
 'filehist-deleteall'             => 'सर�व वगळा',
@@ -1304,7 +1310,6 @@ $3ने ''$2'' कारण दिले आहे.",
 'filedelete-success-old'      => '<span class="plainlinks">$3, $2 वेळी \'\'\'[[Media:$1|$1]]\'\'\' चे आवर�तन वगळण�यात आले आहे .</span>',
 'filedelete-nofile'           => "'''$1''' {{SITENAME}}वर अस�तित�वात नाही.",
 'filedelete-nofile-old'       => "सांगितलेल�या ग�णधर�मान�सार  '''$1'''चे कोणतेही विदा आवर�तन संचित नाही.",
-'filedelete-iscurrent'        => 'संचिकचे सर�वात अलिकडील आवर�तन वगळण�याचा त�म�ही प�रयत�न करत आहात.कृपया आधी ज�ने आवर�तन उलटवा.',
 'filedelete-otherreason'      => 'इतर/शिवाय अधिक कारण:',
 'filedelete-reason-otherlist' => 'इतर कारण',
 'filedelete-reason-dropdown'  => '*वगळण�याची सामान�य कारणे
@@ -1339,21 +1344,9 @@ Input:contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
 'randomredirect-nopages' => 'या नामविश�वात कोणतीही प�र�ननिर�देशने नाहीत.',
 
 # Statistics
-'statistics'             => 'सांख�यिकी',
-'sitestats'              => 'स�थळ सांख�यिकी',
-'userstats'              => 'सदस�य सांख�यिकी',
-'sitestatstext'          => "{{PLURAL:$1|'''1'''पान|'''$1'''�क�ण पाने}}विदागारात आहेत.
-यात {{SITENAME}}चर�चा पाने, सदस�यांबद�दलची पाने, प�नर�निर�देशने, नावाप�रती तयार केलेली पाने,आणि अशी पाने की जी मजक�र लेख नाहीत अशांचा समावेश होतो .
-तशी पाने सोडून,{{PLURAL:$2|'''1''' पान आहे जे की|'''$2'''पाने आहेत जी की}} बह�धा योग�य मजक�र असलेले {{PLURAL:$2|पान|पाने}}आहेत.
-
-'''$8''' {{PLURAL:$8|संचिका|संचिका}}चढवल�या आहेत.
-
-{{SITENAME}}स�थापनेपासून '''$3''' {{PLURAL:$3|पानास भेट|पानास भेटी}},आणि '''$4''' {{PLURAL:$4|संपादनपान |संपादन पान}}.
-त�याची सरासरी संपादने  '''$5'''प�रतिपान,आणि '''$6''' भेटी प�रति संपादन.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue]लांबी'''$7'''आहे.",
-'userstatstext'          => "सध�या {{PLURAL:$1|is '''1''' registered [[Special:ListUsers|user]]| '''$1''' नोंदीकृत  [[Special:ListUsers|सदस�य]]}} आहेत, पैकी'''$2''' (किंवा '''$4%''')सदस�यांना $5 अधिकार {{PLURAL:$2|आहे|आहेत }} .",
-'statistics-mostpopular' => 'सर�वाधिक बघितली जाणारी पाने',
+'statistics'              => 'सांख�यिकी',
+'statistics-header-users' => 'सदस�य सांख�यिकी',
+'statistics-mostpopular'  => 'सर�वाधिक बघितली जाणारी पाने',
 
 'disambiguations'      => 'नि:संदिग�धकरण पृष�ठे',
 'disambiguationspage'  => 'Template:नि:संदिग�धीकरण',
@@ -1393,7 +1386,6 @@ Input:contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
 'popularpages'            => 'प�रसिद�ध पाने',
 'wantedcategories'        => 'पाहिजे असलेले वर�ग',
 'wantedpages'             => 'पाहिजे असलेले लेख',
-'missingfiles'            => 'हरवलेल�या संचिका',
 'mostlinked'              => 'सर�वाधिक जोडलेली पाने',
 'mostlinkedcategories'    => 'सर�वाधिक जोडलेले वर�ग',
 'mostlinkedtemplates'     => 'सर�वाधिक जोडलेले साचे',
@@ -1439,8 +1431,6 @@ Input:contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
 'speciallogtitlelabel' => 'शीर�षक:',
 'log'                  => 'नोंदी',
 'all-logs-page'        => 'सर�व नोंदी',
-'log-search-legend'    => 'नोंदी शोधा',
-'log-search-submit'    => 'चला',
 'alllogstext'          => '{{SITENAME}}च�या सर�व नोंदीचे �कत�र दर�शन.नोंद प�रकार, सदस�यनाव किंवा बाधीत पान निवडून त�म�ही त�मचे दृश�यपान मर�यादीत करू शकता.',
 'logempty'             => 'नोंदीत अशी बाब नाही.',
 'log-title-wildcard'   => 'या मजक�रापासून स�रू होणारी शिर�षके शोधा.',
@@ -1468,11 +1458,31 @@ Input:contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
 'special-categories-sort-count' => 'क�रमान�सार लावा',
 'special-categories-sort-abc'   => 'अक�षरांप�रमाणे लावा',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'वगळलेली सदस�य संपादने',
+
+# Special:LinkSearch
+'linksearch'       => 'आंतरजाल द�वे शोधा',
+'linksearch-pat'   => 'शोधण�याचा मजकूर:',
+'linksearch-ns'    => 'नामविश�व:',
+'linksearch-ok'    => 'शोध',
+'linksearch-text'  => '"*.wikipedia.org" सारखी वाईल�डकार�ड�स वापरायला परवानगी आहे.<br />प�ढील प�रोटोकॉल�समध�ये चालेल: <tt>$1</tt>',
+'linksearch-line'  => '$2 मधून $1 जोडलेले आहे',
+'linksearch-error' => 'वाईल�डकार�ड�स होस�ट नावाच�या फक�त स�रवातीलाच येऊ शकतात.',
+
 # Special:ListUsers
 'listusersfrom'      => 'प�ढील शब�दापास�न स�रू होणारे सदस�य दाखवा:',
 'listusers-submit'   => 'दाखवा',
 'listusers-noresult' => '�कही सदस�य सापडला नाही.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'नवीन सदस�यांची नोंद',
+'newuserlogpagetext'          => 'ही नवीन सदस�यांची नोंद यादी आहे.',
+'newuserlog-byemail'          => 'परवलीचा शब�द इमेलमार�फत पाठविलेला आहे',
+'newuserlog-create-entry'     => 'नवीन सदस�य',
+'newuserlog-create2-entry'    => '$1 साठी सदस�यत�व घेतले.',
+'newuserlog-autocreate-entry' => 'खाते आपोआप तयार �ाले',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'सदस�य गट अधिकार',
 'listgrouprights-summary'  => 'खाली या विकिवर दिलेली सदस�य गटांची यादी त�यांच�या अधिकारांसकट दर�शविलेली आहे. प�रत�येकाच�या अधिकारांची अधिक माहिती [[{{MediaWiki:Listgrouprights-helppage}}|इथे]] दिलेली आहे.',
@@ -1531,12 +1541,6 @@ Input:contenttype/subtype, e.g. <tt>image/jpeg</tt>.',
 'iteminvalidname'      => "'$1'बाबीस समस�या, अमान�य नाव...",
 'wlnote'               => "खाली  गेल�या {{PLURAL:$2|तासातील|'''$2''' तासातील}} {{PLURAL:$1|शेवटचा बदल आहे|शेवटाचे '''$1'''बदल आहेत }}.",
 'wlshowlast'           => 'मागील $1 तास $2 दिवस $3 पहा',
-'watchlist-show-bots'  => 'सांगकाम�यांची संपादने पहा',
-'watchlist-hide-bots'  => 'सांगकाम�यांची संपादने लपवा',
-'watchlist-show-own'   => 'मा�ी संपादने पहा',
-'watchlist-hide-own'   => 'मा�ी संपादने लपवा',
-'watchlist-show-minor' => 'छोटी संपादने पहा',
-'watchlist-hide-minor' => 'छोटी संपादने लपवा',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'पाहताहे...',
@@ -1576,66 +1580,71 @@ $NEWPAGE
 प�ढील सहाय�य आणि प�रतिक�रीया:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'पान वगळा',
-'confirm'                     => 'निश�चीत',
-'excontent'                   => "मजकूर होता: '$1'",
-'excontentauthor'             => "मजकूर होता: '$1' (आणि फक�त '[[Special:Contributions/$2|$2]]' यांचे योगदान होते.)",
-'exbeforeblank'               => "वगळण�यापूर�वीचा मजकूर प�ढीलप�रमाणे: '$1'",
-'exblank'                     => 'पान रिकामे होते',
-'delete-confirm'              => '"$1" वगळा',
-'delete-legend'               => 'वगळा',
-'historywarning'              => 'स�चना: त�म�ही वगळत असलेल�या पानाला इतिहास आहे:',
-'confirmdeletetext'           => 'त�म�ही �क लेख त�याच�या सर�व इतिहासासोबत वगळण�याच�या तयारीत आहात.
+# Delete
+'deletepage'             => 'पान वगळा',
+'confirm'                => 'निश�चीत',
+'excontent'              => "मजकूर होता: '$1'",
+'excontentauthor'        => "मजकूर होता: '$1' (आणि फक�त '[[Special:Contributions/$2|$2]]' यांचे योगदान होते.)",
+'exbeforeblank'          => "वगळण�यापूर�वीचा मजकूर प�ढीलप�रमाणे: '$1'",
+'exblank'                => 'पान रिकामे होते',
+'delete-confirm'         => '"$1" वगळा',
+'delete-legend'          => 'वगळा',
+'historywarning'         => 'स�चना: त�म�ही वगळत असलेल�या पानाला इतिहास आहे:',
+'confirmdeletetext'      => 'त�म�ही �क लेख त�याच�या सर�व इतिहासासोबत वगळण�याच�या तयारीत आहात.
 कृपया त�म�ही करत असलेली कृती ही मीडियाविकीच�या [[{{MediaWiki:Policy-url}}|नीतीन�सार]] आहे ह�याची खात�री करा. तसेच त�म�ही करीत असलेल�या कृतीचे परीणाम कृती करण�यापूर�वी जाणून घ�या.',
-'actioncomplete'              => 'काम पूर�ण',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" हा लेख वगळला. अलीकडे वगळलेले लेख पाहण�यासाठी $2 पहा.',
-'deletedarticle'              => '"[[$1]]" लेख वगळला.',
-'suppressedarticle'           => '"[[$1]]" ला दाबले (सप�रेस)',
-'dellogpage'                  => 'वगळल�याची नोंद',
-'dellogpagetext'              => 'न�कत�याच वगळलेल�या पानांची यादी खाली आहे.',
-'deletionlog'                 => 'वगळल�याची नोंद',
-'reverted'                    => 'ज�न�या आवृत�तीकडे पूर�वपदास नेले',
-'deletecomment'               => 'वगळण�याचे कारण',
-'deleteotherreason'           => 'द�सरे/अतिरिक�त कारण:',
-'deletereasonotherlist'       => 'द�सरे कारण',
-'deletereason-dropdown'       => '* वगळण�याची सामान�य कारणे
+'actioncomplete'         => 'काम पूर�ण',
+'deletedtext'            => '"<nowiki>$1</nowiki>" हा लेख वगळला. अलीकडे वगळलेले लेख पाहण�यासाठी $2 पहा.',
+'deletedarticle'         => '"[[$1]]" लेख वगळला.',
+'suppressedarticle'      => '"[[$1]]" ला दाबले (सप�रेस)',
+'dellogpage'             => 'वगळल�याची नोंद',
+'dellogpagetext'         => 'न�कत�याच वगळलेल�या पानांची यादी खाली आहे.',
+'deletionlog'            => 'वगळल�याची नोंद',
+'reverted'               => 'ज�न�या आवृत�तीकडे पूर�वपदास नेले',
+'deletecomment'          => 'वगळण�याचे कारण',
+'deleteotherreason'      => 'द�सरे/अतिरिक�त कारण:',
+'deletereasonotherlist'  => 'द�सरे कारण',
+'deletereason-dropdown'  => '* वगळण�याची सामान�य कारणे
 ** लेखकाची(लेखिकेची) विनंती
 ** प�रताधिकार उल�लंघन
 ** उत�पात',
-'delete-edit-reasonlist'      => 'वगळण�याची कारणे संपादीत करा',
-'delete-toobig'               => 'या पानाला खूप मोठी इतिहास यादी आहे, तसेच हे पान $1 पेक�षा जास�त वेळा बदलण�यात आलेले आहे. अशी पाने वगळणे हे {{SITENAME}} ला धोकादायक ठरू नये म�हणून शक�य केलेले नाही.',
-'delete-warning-toobig'       => '
+'delete-edit-reasonlist' => 'वगळण�याची कारणे संपादीत करा',
+'delete-toobig'          => 'या पानाला खूप मोठी इतिहास यादी आहे, तसेच हे पान $1 पेक�षा जास�त वेळा बदलण�यात आलेले आहे. अशी पाने वगळणे हे {{SITENAME}} ला धोकादायक ठरू नये म�हणून शक�य केलेले नाही.',
+'delete-warning-toobig'  => '
 या पानाला खूप मोठी इतिहास यादी आहे, तसेच हे पान $1 पेक�षा जास�त वेळा बदलण�यात आलेले आहे. अशी पाने वगळणे हे Betawiki ला धोकादायक ठरू शकते; कृपया काळजीपूर�वक हे पान वगळा.',
-'rollback'                    => 'बदल वेगात माघारी न�या',
-'rollback_short'              => 'द�रूतमाघार',
-'rollbacklink'                => 'द�रूतमाघार',
-'rollbackfailed'              => 'द�रूतमाघार फसली',
-'cantrollback'                => 'ज�न�या आवृत�तीकडे परतवता येत नाही; शेवटचा संपादक या पानाचा �कमात�र लेखक आहे.',
-'alreadyrolled'               => 'Cannot rollback last edit of by [[User:$2|$2]] ([[User talk:$2|Talk]])चे शेवटाचे [[:$1]]वे संपादन माघारी परतवता येतनाही; पान आधीच क�णी माघारी परतवले आहे किंवा संपादीत केले आहे.
+
+# Rollback
+'rollback'         => 'बदल वेगात माघारी न�या',
+'rollback_short'   => 'द�रूतमाघार',
+'rollbacklink'     => 'द�रूतमाघार',
+'rollbackfailed'   => 'द�रूतमाघार फसली',
+'cantrollback'     => 'ज�न�या आवृत�तीकडे परतवता येत नाही; शेवटचा संपादक या पानाचा �कमात�र लेखक आहे.',
+'alreadyrolled'    => 'Cannot rollback last edit of by [[User:$2|$2]] ([[User talk:$2|Talk]])चे शेवटाचे [[:$1]]वे संपादन माघारी परतवता येतनाही; पान आधीच क�णी माघारी परतवले आहे किंवा संपादीत केले आहे.
 
 शेवटचे संपादन [[User:$3|$3]] ([[User talk:$3|Talk]])-चे होते.',
-'editcomment'                 => 'बदलासोबतची नोंद होती : "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|चर�चा]]) यांनी केलेले बदल [[User:$1|$1]] यांच�या आवृत�तीकडे पूर�वपदास नेले.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 ने उलटवलेली संपादने;$2 च�या आवृत�तीस परत नेली.',
-'sessionfailure'              => 'त�मच�या दाखल सत�रात काही समस�या दिसते;सत�र अपहारणा पासून काळजी घेण�याच�या दृष�टीने ही कृती रद�द केली गेली आहे.कपया आपल�या विचरकाच�या "back" कळीवर टिचकी मारा आणि त�म�ही ज�या पानावरून आला ते प�न�हा चढवा,आणि प�रत प�रयत�न करा.',
+'editcomment'      => "बदलासोबतची नोंद होती : \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|चर�चा]]) यांनी केलेले बदल [[User:$1|$1]] यांच�या आवृत�तीकडे पूर�वपदास नेले.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 ने उलटवलेली संपादने;$2 च�या आवृत�तीस परत नेली.',
+'sessionfailure'   => 'त�मच�या दाखल सत�रात काही समस�या दिसते;सत�र अपहारणा पासून काळजी घेण�याच�या दृष�टीने ही कृती रद�द केली गेली आहे.कपया आपल�या विचरकाच�या "back" कळीवर टिचकी मारा आणि त�म�ही ज�या पानावरून आला ते प�न�हा चढवा,आणि प�रत प�रयत�न करा.',
+
+# Protect
 'protectlogpage'              => 'स�रक�षा नोंदी',
 'protectlogtext'              => 'पानांना लावलेल�या ताळ�यांची आणि ताळे उघडण�याबद�दलच�या पानाची खाली सूची दिली आहे.सध�याच�या स�रक�षीत पानांबद�दलच�या माहितीकरिता [[Special:ProtectedPages|स�रक�षीत पानांची सूची]] पहा.',
 'protectedarticle'            => '"[[$1]]" स�रक�षित केला',
 'modifiedarticleprotection'   => '"[[$1]]"करिता स�रक�षापातळी बदलली',
 'unprotectedarticle'          => '"[[$1]]" अस�रक�षित केला.',
 'protect-title'               => '"$1" स�रक�षित करत आहे',
+'prot_1movedto2'              => '"[[$1]]" हे पान "[[$2]]" मथळ�याखाली स�थानांतरित केले.',
 'protect-legend'              => 'स�रक�षापातळीतील बदल निर�धारित करा',
 'protectcomment'              => 'स�रक�षित करण�यामागचे कारण',
 'protectexpiry'               => 'संपण�याचा कालावधी:',
 'protect_expiry_invalid'      => 'संपण�याचा कालावधी च�कीचा आहे.',
 'protect_expiry_old'          => 'संपण�याचा कालावधी उलटून गेलेला आहे.',
 'protect-unchain'             => 'स�थानांतरणाची परवानगी द�या',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> या पानाची स�रक�षापातळी त�म�ही इथे पाहू शकता अथवा बदलू शकता.',
-'protect-locked-blocked'      => 'त�म�ही प�रतिबंधीत असताना स�रक�षा पातळी बदलू शकत नाही.येथे <strong>$1</strong> पानाकरिता सध�याची मांडणावळ आहे:',
-'protect-locked-dblock'       => 'विदागारास ताळे लागलेले असताना स�रक�षा पातळी बदलता येत नाही.येथे <strong>$1</strong> पानाकरिता सध�याची मांडणावळ आहे:',
-'protect-locked-access'       => 'त�म�हाला या पानाची स�रक�षा पातळी बदलण�याचे अधिकार नाहीत.
-<strong>$1</strong> या पानाची स�रक�षा पातळी प�ढीलप�रमाणे:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' या पानाची स�रक�षापातळी त�म�ही इथे पाहू शकता अथवा बदलू शकता.",
+'protect-locked-blocked'      => "त�म�ही प�रतिबंधीत असताना स�रक�षा पातळी बदलू शकत नाही.येथे '''$1''' पानाकरिता सध�याची मांडणावळ आहे:",
+'protect-locked-dblock'       => "विदागारास ताळे लागलेले असताना स�रक�षा पातळी बदलता येत नाही.येथे '''$1''' पानाकरिता सध�याची मांडणावळ आहे:",
+'protect-locked-access'       => "त�म�हाला या पानाची स�रक�षा पातळी बदलण�याचे अधिकार नाहीत.
+'''$1''' या पानाची स�रक�षा पातळी प�ढीलप�रमाणे:",
 'protect-cascadeon'           => 'हे पान सध�या स�रक�षित आहे कारण ते {{PLURAL:$1|या पानाच�या|या पानांच�या}} स�रक�षा शिडीवर आहे. त�म�ही या पानाची स�रक�षा पातळी बदलू शकता, पण त�याने स�रक�षाशिडी मध�ये बदल होणार नाहीत.',
 'protect-default'             => '(मूळ)',
 'protect-fallback'            => '"$1" परवानगीची गरज',
@@ -1645,6 +1654,7 @@ $NEWPAGE
 'protect-expiring'            => '$1 (UTC) ला संपेल',
 'protect-cascade'             => 'या पानात असलेली पाने स�रक�षित करा (स�रक�षा शिडी)',
 'protect-cantedit'            => 'त�म�ही या पानाची स�रक�षा पातळी बदलू शकत नाही कारण त�म�हाला तसे करण�याची परवानगी नाही.',
+'protect-expiry-options'      => '२ तास:2 hours,१ दिवस:1 day,३ दिवस:3 days,१ आठवडा:1 week,२ आठवडे:2 weeks,१ महिना:1 month,३ महिने:3 months,६ महिने:6 months,१ वर�ष:1 year,अनंत:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'परवानगी:',
 'restriction-level'           => 'स�रक�षापातळी:',
 'minimum-size'                => 'किमान आकार',
@@ -1729,7 +1739,6 @@ $1',
 'whatlinkshere'            => 'येथे काय जोडले आहे',
 'whatlinkshere-title'      => '"$1" ला जोडलेली पाने',
 'whatlinkshere-page'       => 'पान:',
-'linklistsub'              => '(द�व�यांची यादी)',
 'linkshere'                => "खालील लेख '''[[:$1]]''' या निर�देशित पानाशी जोडले आहेत:",
 'nolinkshere'              => "'''[[:$1]]''' इथे काहीही जोडलेले नाही.",
 'nolinkshere-ns'           => "निवडलेल�या नामविश�वातील कोणतीही पाने '''[[:$1]]'''ला द�वा देत नाहीत .",
@@ -1873,6 +1882,8 @@ $1',
 
 या बाबतीत त�म�हाला स�वतःला ही पाने �कत�र करावी लागतील.",
 'movearticle'             => 'पृष�ठाचे स�थानांतरण',
+'movenologin'             => 'प�रवेश केलेला नाही',
+'movenologintext'         => 'पान स�थानांतरित करण�यासाठी त�म�हाला [[Special:UserLogin|प�रवेश]] करावा लागेल.',
 'movenotallowed'          => '{{SITENAME}}वरील पाने स�थानांतरीत करण�याची आपल�यापाशी परवानगी नाही.',
 'newtitle'                => 'नवीन शीर�षकाकडे:',
 'move-watch'              => 'या पानावर लक�ष ठेवा',
@@ -1906,7 +1917,6 @@ $1',
 'delete_and_move_confirm' => 'होय, पान वगळा',
 'delete_and_move_reason'  => 'आधीचे पान वगळून स�थानांतर केले',
 'selfmove'                => 'स�रोत आणि लक�ष�य पाने समान आहेत; �खादे पान स�वत:च�याच जागी स�थानांतरीत करता येत नाही.',
-'immobile_namespace'      => 'स�रोत किंवा लक�ष�य शीर�षक विशेष प�रकारचे आहे;त�या नामविशवात किंवा त�यातून बाहेर पानांचे स�थानांतरण करता येत नाही.',
 'imagenocrossnamespace'   => 'ज�या नामविश�वात संचिका साठविता येत नाहीत, त�या नामविश�वात संचिकांचे स�थानांतरण करता येत नाही',
 'imagetypemismatch'       => 'दिलेले संचिकेचे �क�सटेंशन त�या संचिकेच�या प�रकाराशी ज�ळत नाही',
 
@@ -1916,7 +1926,7 @@ $1',
 
 पाने निर�यात करण�या करिता,�का ओळीत �क मथळा असे, खालील मजक�र रकान�यात मथळे भरा आणि त�म�हाला ’सध�याची आवृत�ती तसेच सर�व ज�न�या आवृत�ती ,पानाच�या इतिहास ओळी सोबत’, किंवा ’केवळ सध�याची आवृत�ती शेवटच�या संपादनाच�या माहिती सोबत’ हवी आहे का ते निवडा.
 
-त�म�ही नंतरच�या बाबतीत �खादा द�वा स�द�धा वापरू शकता, उदाहरणार�थ "[[{{MediaWiki:Mainpage}}]]" पाना करिता [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] .',
+त�म�ही नंतरच�या बाबतीत �खादा द�वा स�द�धा वापरू शकता, उदाहरणार�थ "[[{{MediaWiki:Mainpage}}]]" पाना करिता [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] .',
 'exportcuronly'     => 'संपूर�ण इतिहास नको,केवळ आताचे आवर�तन आंर�तभूत करा',
 'exportnohistory'   => "----
 '''सूचना:''' या फॉर�मचा वापर करून पानाचा पूर�ण इतिहास निर�यात करण�याची स�विधा कार�यक�शलतेच�या कारणंनी अन�पल�ब�ढ ठेवली आहे.",
@@ -1954,6 +1964,7 @@ $1',
 'import-interwiki-history'   => 'या पानाकरिताची सार��या इतिहास आवर�तनांची नक�कल करा',
 'import-interwiki-submit'    => 'आयात',
 'import-interwiki-namespace' => 'पाने नामविश�वात स�थानांतरीत करा:',
+'import-comment'             => 'प�रतिक�रीया:',
 'importtext'                 => 'कृपया Special:Export स�विधा वापरून स�रोत विकिकडून संचिका निर�यात करा,ती त�मच�या तबकडीवर जतन करा आणि येथे चढवा.',
 'importstart'                => 'पाने आयात करत आहे...',
 'import-revision-count'      => '$1 {{PLURAL:$1|आवर�तन|आवर�तने}}',
@@ -2076,6 +2087,16 @@ $1',
 'numauthors'     => 'स�पष�ट पणे वेगळ�या लेखकांची संख�या (पान): $1',
 'numtalkauthors' => 'स�पष�टपणे वेग-वेगळ�या लेखकांची संख�या(चर�चा पान): $1',
 
+# Skin names
+'skinname-standard'    => 'अभिजात',
+'skinname-nostalgia'   => 'रम�य',
+'skinname-cologneblue' => 'स�रेखनीळी',
+'skinname-monobook'    => 'मोनोब�क',
+'skinname-myskin'      => 'मा�ीकांती',
+'skinname-chick'       => 'मस�त',
+'skinname-simple'      => 'साधी',
+'skinname-modern'      => 'आध�निक',
+
 # Math options
 'mw_math_png'    => 'नेहमीच पी�नजी (PNG) रेखाटा',
 'mw_math_simple' => 'स�लभ असल�यास �चटी�म�ल (HTML); अन�यथा पी�नजी (PNG)',
@@ -2127,7 +2148,7 @@ $1',
 'show-big-image'       => 'संपूर�ण रिजोल�यूशन',
 'show-big-image-thumb' => '<small>या �लकेचा आकार: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'नवीन संचिकांची यादी',
 'imagelisttext'         => "खाली '''$1''' संचिका {{PLURAL:$1|दिली आहे.|$2 क�रमाने दिल�या आहेत.}}",
 'newimages-summary'     => 'हे विशेष पान शेवटी चढविलेल�या संचिका दर�शविते',
@@ -2468,21 +2489,9 @@ $5
 कृपया हे पान खरेच प�न�हा निर�मीत करून हवे आहे का हे निश�चित करा.",
 'recreate'            => 'प�नर�निर�माण',
 
-# HTML dump
-'redirectingto' => '[[:$1]]कडे प�नर�निर�देशीत...',
-
 # action=purge
-'confirm_purge'        => 'यापानाची सय रिकामी करावयाची आहे?
-
-$1',
 'confirm_purge_button' => 'ठीक',
-
-# AJAX search
-'searchcontaining' => "''$1'' शब�द असलेले लेख शोधा.",
-'searchnamed'      => "''$1'' या नावाचे लेख शोधा.",
-'articletitles'    => "''$1'' पासून स�रू होणारे लेख",
-'hideresults'      => 'निकाल लपवा',
-'useajaxsearch'    => 'AJAX शोध वापरा',
+'confirm-purge-top'    => 'यापानाची सय रिकामी करावयाची आहे?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� मागील पान',
@@ -2572,13 +2581,13 @@ $1',
 'filepath-summary' => 'हे विशेष पान संचिकेचा संपूर�ण मार�ग कळवते.
 चित�रे संपूर�ण रि�ोल�यूशन मध�ये दाखवली आहेत,इतर संचिका प�रकार त�यांच�या संबधीत प�रोग�रामने प�रत�यक�ष स�रू होतात.
 
-"{{ns:image}}:" पूर�वपदा शिवाय संचिकेचे नाव भरा.',
+"{{ns:file}}:" पूर�वपदा शिवाय संचिकेचे नाव भरा.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'ज�ळ�या संचिका शोधा',
 'fileduplicatesearch-summary'  => 'हॅश किंमतीप�रमाणे ज�ळ�या संचिका शोधा.
 
-"{{ns:image}}:" न लिहिता फक�त संचिकेचे नाव लिहा.',
+"{{ns:file}}:" न लिहिता फक�त संचिकेचे नाव लिहा.',
 'fileduplicatesearch-legend'   => 'ज�ळी संचिका शोधा',
 'fileduplicatesearch-filename' => 'संचिकानाव:',
 'fileduplicatesearch-submit'   => 'शोधा',
diff --git a/languages/messages/MessagesMs.php b/languages/messages/MessagesMs.php
index 5497e839..7a94ddd6 100644
--- a/languages/messages/MessagesMs.php
+++ b/languages/messages/MessagesMs.php
@@ -8,6 +8,7 @@
  * @author Aviator
  * @author Izzudin
  * @author Kurniasan
+ * @author Meno25
  * @author Putera Luqman Tunku Andre
  * @author Urhixidur
  * @author לערי ריינה�רט
@@ -24,128 +25,124 @@
 $defaultDateFormat = 'dmy';
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Khas',
-	NS_MAIN           => '',
-	NS_TALK           => 'Perbincangan',
-	NS_USER           => 'Pengguna',
-	NS_USER_TALK      => 'Perbincangan_Pengguna',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Perbincangan_$1',
-	NS_IMAGE          => 'Imej',
-	NS_IMAGE_TALK     => 'Perbincangan_Imej',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Perbincangan_MediaWiki',
-	NS_TEMPLATE       => 'Templat',
-	NS_TEMPLATE_TALK  => 'Perbincangan_Templat',
-	NS_HELP           => 'Bantuan',
-	NS_HELP_TALK      => 'Perbincangan_Bantuan',
-	NS_CATEGORY       => 'Kategori',
-	NS_CATEGORY_TALK  => 'Perbincangan_Kategori',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Khas',
+	NS_TALK             => 'Perbincangan',
+	NS_USER             => 'Pengguna',
+	NS_USER_TALK        => 'Perbincangan_Pengguna',
+	NS_PROJECT_TALK     => 'Perbincangan_$1',
+	NS_FILE             => 'Fail',
+	NS_FILE_TALK        => 'Perbincangan_Fail',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Perbincangan_MediaWiki',
+	NS_TEMPLATE         => 'Templat',
+	NS_TEMPLATE_TALK    => 'Perbincangan_Templat',
+	NS_HELP             => 'Bantuan',
+	NS_HELP_TALK        => 'Perbincangan_Bantuan',
+	NS_CATEGORY         => 'Kategori',
+	NS_CATEGORY_TALK    => 'Perbincangan_Kategori',
 );
 
 $namespaceAliases = array(
+	'Imej' => NS_FILE,
+	'Perbincangan_Imej' => NS_FILE_TALK,
 	'Istimewa'            => NS_SPECIAL,
 	'Perbualan'           => NS_TALK,
 	'Perbualan_Pengguna'  => NS_USER_TALK,
 	'Perbualan_$1'        => NS_PROJECT_TALK,
-	'Imej_Perbualan'      => NS_IMAGE_TALK,
+	'Imej_Perbualan'      => NS_FILE_TALK,
 	'MediaWiki_Perbualan' => NS_MEDIAWIKI_TALK,
 	'Perbualan_Templat'   => NS_TEMPLATE_TALK,
 	'Perbualan_Kategori'  => NS_CATEGORY_TALK,
 	'Perbualan_Bantuan'   => NS_HELP_TALK,
 );
 
-$skinNames = array(
-	'standard' => 'Klasik',
-	'simple'   => 'Ringkas',
-	'modern'   => 'Moden',
-);
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Lencongan_berganda', 'Pelencongan_berganda' ),
-	'BrokenRedirects'         => array( 'Lencongan_rosak', 'Pelencongan_rosak' ),
-	'Disambiguations'         => array( 'Penyahtaksaan' ),
-	'Userlogin'               => array( 'Log_masuk' ),
-	'Userlogout'              => array( 'Log_keluar' ),
-	'CreateAccount'           => array( 'Buka_akaun' ),
-	'Preferences'             => array( 'Keutamaan' ),
-	'Watchlist'               => array( 'Senarai_pantau' ),
-	'Recentchanges'           => array( 'Perubahan_terkini' ),
-	'Upload'                  => array( 'Muat_naik' ),
-	'Imagelist'               => array( 'Senarai_imej' ),
-	'Newimages'               => array( 'Imej_baru' ),
-	'Listusers'               => array( 'Senarai_pengguna' ),
-	'Listgrouprights'         => array( 'Senarai_hak_kumpulan' ),
-	'Statistics'              => array( 'Statistik' ),
-	'Randompage'              => array( 'Laman_rawak' ),
-	'Lonelypages'             => array( 'Laman_yatim' ),
-	'Uncategorizedpages'      => array( 'Laman_tanpa_kategori' ),
-	'Uncategorizedcategories' => array( 'Kategori_tanpa_kategori' ),
-	'Uncategorizedimages'     => array( 'Imej_tanpa_kategori' ),
-	'Uncategorizedtemplates'  => array( 'Templat_tanpa_kategori' ),
-	'Unusedcategories'        => array( 'Kategori_tak_digunakan' ),
-	'Unusedimages'            => array( 'Imej_tak_digunakan' ),
-	'Wantedpages'             => array( 'Laman_dikehendaki' ),
-	'Wantedcategories'        => array( 'Kategori_dikehendaki' ),
-	'Missingfiles'            => array( 'Laman_hilang' ),
-	'Mostlinked'              => array( 'Laman_dipaut_terbanyak' ),
-	'Mostlinkedcategories'    => array( 'Kategori_dipaut_terbanyak' ),
-	'Mostlinkedtemplates'     => array( 'Templat_dipaut_terbanyak' ),
-	'Mostcategories'          => array( 'Kategori_terbanyak' ),
-	'Mostimages'              => array( 'Imej_terbanyak' ),
-	'Mostrevisions'           => array( 'Semakan_terbanyak' ),
-	'Fewestrevisions'         => array( 'Semakan_tersikit' ),
-	'Shortpages'              => array( 'Laman_pendek' ),
-	'Longpages'               => array( 'Laman_panjang' ),
-	'Newpages'                => array( 'Laman_baru' ),
-	'Ancientpages'            => array( 'Laman_lapuk' ),
-	'Deadendpages'            => array( 'Laman_buntu' ),
-	'Protectedpages'          => array( 'Laman_dilindungi' ),
-	'Protectedtitles'         => array( 'Tajuk_dilindungi' ),
-	'Allpages'                => array( 'Semua_laman' ),
-	'Prefixindex'             => array( 'Indeks_awalan' ),
-	'Ipblocklist'             => array( 'Sekatan_IP' ),
-	'Specialpages'            => array( 'Laman_khas' ),
-	'Contributions'           => array( 'Sumbangan' ),
-	'Emailuser'               => array( 'E-mel_pengguna' ),
-	'Confirmemail'            => array( 'Sahkan_e-mel' ),
-	'Whatlinkshere'           => array( 'Pautan_ke' ),
-	'Recentchangeslinked'     => array( 'Perubahan_berkaitan' ),
-	'Movepage'                => array( 'Pindah_laman' ),
-	'Blockme'                 => array( 'Sekat_saya' ),
-	'Booksources'             => array( 'Sumber_buku' ),
-	'Categories'              => array( 'Kategori' ),
-	'Export'                  => array( 'Eksport' ),
-	'Version'                 => array( 'Versi' ),
-	'Allmessages'             => array( 'Semua_pesanan', 'Semua_mesej' ),
-	'Log'                     => array( 'Log' ),
-	'Blockip'                 => array( 'Sekat_IP' ),
-	'Undelete'                => array( 'Nyahhapus' ),
-	'Import'                  => array( 'Import' ),
-	'Lockdb'                  => array( 'Kunci_pangkalan_data' ),
-	'Unlockdb'                => array( 'Buka_kunci_pangkalan_data' ),
-	'Userrights'              => array( 'Hak_pengguna' ),
-	'MIMEsearch'              => array( 'Gelintar_MIME' ),
-	'FileDuplicateSearch'     => array( 'Cari_fail_berganda' ),
-	'Unwatchedpages'          => array( 'Laman_tak_dipantau' ),
-	'Listredirects'           => array( 'Senarai_lencongan', 'Senarai_pelencongan' ),
-	'Revisiondelete'          => array( 'Hapus_semakan' ),
-	'Unusedtemplates'         => array( 'Templat_tak_digunakan' ),
-	'Randomredirect'          => array( 'Lencongan_rawak', 'Pelencongan_rawak' ),
-	'Mypage'                  => array( 'Laman_saya' ),
-	'Mytalk'                  => array( 'Perbincangan_saya' ),
-	'Mycontributions'         => array( 'Sumbangan_saya' ),
-	'Listadmins'              => array( 'Senarai_pentadbir' ),
-	'Listbots'                => array( 'Senarai_bot' ),
-	'Popularpages'            => array( 'Laman_popular' ),
-	'Search'                  => array( 'Gelintar' ),
-	'Resetpass'               => array( 'Lupa_kata_laluan' ),
-	'Withoutinterwiki'        => array( 'Laman_tanpa_pautan_bahasa' ),
-	'MergeHistory'            => array( 'Gabung_sejarah' ),
-	'Filepath'                => array( 'Laluan_fail' ),
-	'Invalidateemail'         => array( 'Alamat_surat_elektronik_tidak_sah' ),
-	'Blankpage'               => array( 'Laman_kosong' ),
+	'DoubleRedirects'           => array( 'Lencongan berganda', 'Pelencongan berganda' ),
+	'BrokenRedirects'           => array( 'Lencongan rosak', 'Pelencongan rosak' ),
+	'Disambiguations'           => array( 'Penyahtaksaan' ),
+	'Userlogin'                 => array( 'Log masuk' ),
+	'Userlogout'                => array( 'Log keluar' ),
+	'CreateAccount'             => array( 'Buka akaun' ),
+	'Preferences'               => array( 'Keutamaan' ),
+	'Watchlist'                 => array( 'Senarai pantau' ),
+	'Recentchanges'             => array( 'Perubahan terkini' ),
+	'Upload'                    => array( 'Muat naik' ),
+	'Listfiles'                 => array( 'Senarai imej' ),
+	'Newimages'                 => array( 'Imej baru' ),
+	'Listusers'                 => array( 'Senarai pengguna' ),
+	'Listgrouprights'           => array( 'Senarai hak kumpulan' ),
+	'Statistics'                => array( 'Statistik' ),
+	'Randompage'                => array( 'Laman rawak' ),
+	'Lonelypages'               => array( 'Laman yatim' ),
+	'Uncategorizedpages'        => array( 'Laman tanpa kategori' ),
+	'Uncategorizedcategories'   => array( 'Kategori tanpa kategori' ),
+	'Uncategorizedimages'       => array( 'Imej tanpa kategori' ),
+	'Uncategorizedtemplates'    => array( 'Templat tanpa kategori' ),
+	'Unusedcategories'          => array( 'Kategori tak digunakan' ),
+	'Unusedimages'              => array( 'Imej tak digunakan' ),
+	'Wantedpages'               => array( 'Laman dikehendaki' ),
+	'Wantedcategories'          => array( 'Kategori dikehendaki' ),
+	'Wantedfiles'               => array( 'Fail dikehendaki' ),
+	'Wantedtemplates'           => array( 'Templat dikehendaki' ),
+	'Mostlinked'                => array( 'Laman dipaut terbanyak' ),
+	'Mostlinkedcategories'      => array( 'Kategori dipaut terbanyak' ),
+	'Mostlinkedtemplates'       => array( 'Templat dipaut terbanyak' ),
+	'Mostcategories'            => array( 'Kategori terbanyak' ),
+	'Mostimages'                => array( 'Imej terbanyak' ),
+	'Mostrevisions'             => array( 'Semakan terbanyak' ),
+	'Fewestrevisions'           => array( 'Semakan tersikit' ),
+	'Shortpages'                => array( 'Laman pendek' ),
+	'Longpages'                 => array( 'Laman panjang' ),
+	'Newpages'                  => array( 'Laman baru' ),
+	'Ancientpages'              => array( 'Laman lapuk' ),
+	'Deadendpages'              => array( 'Laman buntu' ),
+	'Protectedpages'            => array( 'Laman dilindungi' ),
+	'Protectedtitles'           => array( 'Tajuk dilindungi' ),
+	'Allpages'                  => array( 'Semua laman' ),
+	'Prefixindex'               => array( 'Indeks awalan' ),
+	'Ipblocklist'               => array( 'Sekatan IP' ),
+	'Specialpages'              => array( 'Laman khas' ),
+	'Contributions'             => array( 'Sumbangan' ),
+	'Emailuser'                 => array( 'E-mel pengguna' ),
+	'Confirmemail'              => array( 'Sahkan e-mel' ),
+	'Whatlinkshere'             => array( 'Pautan ke' ),
+	'Recentchangeslinked'       => array( 'Perubahan berkaitan' ),
+	'Movepage'                  => array( 'Pindah laman' ),
+	'Blockme'                   => array( 'Sekat saya' ),
+	'Booksources'               => array( 'Sumber buku' ),
+	'Categories'                => array( 'Kategori' ),
+	'Export'                    => array( 'Eksport' ),
+	'Version'                   => array( 'Versi' ),
+	'Allmessages'               => array( 'Semua pesanan', 'Semua mesej' ),
+	'Blockip'                   => array( 'Sekat IP' ),
+	'Undelete'                  => array( 'Nyahhapus' ),
+	'Lockdb'                    => array( 'Kunci pangkalan data' ),
+	'Unlockdb'                  => array( 'Buka kunci pangkalan data' ),
+	'Userrights'                => array( 'Hak pengguna' ),
+	'MIMEsearch'                => array( 'Gelintar MIME' ),
+	'FileDuplicateSearch'       => array( 'Cari fail berganda' ),
+	'Unwatchedpages'            => array( 'Laman tak dipantau' ),
+	'Listredirects'             => array( 'Senarai lencongan', 'Senarai pelencongan' ),
+	'Revisiondelete'            => array( 'Hapus semakan' ),
+	'Unusedtemplates'           => array( 'Templat tak digunakan' ),
+	'Randomredirect'            => array( 'Lencongan rawak', 'Pelencongan rawak' ),
+	'Mypage'                    => array( 'Laman saya' ),
+	'Mytalk'                    => array( 'Perbincangan saya' ),
+	'Mycontributions'           => array( 'Sumbangan saya' ),
+	'Listadmins'                => array( 'Senarai pentadbir' ),
+	'Listbots'                  => array( 'Senarai bot' ),
+	'Popularpages'              => array( 'Laman popular' ),
+	'Search'                    => array( 'Gelintar' ),
+	'Resetpass'                 => array( 'Lupa kata laluan' ),
+	'Withoutinterwiki'          => array( 'Laman tanpa pautan bahasa' ),
+	'MergeHistory'              => array( 'Gabung sejarah' ),
+	'Filepath'                  => array( 'Laluan fail' ),
+	'Invalidateemail'           => array( 'Batalkan pengesahan e-mel' ),
+	'Blankpage'                 => array( 'Laman kosong' ),
+	'LinkSearch'                => array( 'Cari pautan' ),
+	'DeletedContributions'      => array( 'Sumbangan dihapuskan' ),
 );
 
 $messages = array(
@@ -186,17 +183,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Sembunyikan suntingan saya daripada senarai pantau',
 'tog-watchlisthidebots'       => 'Sembunyikan suntingan bot daripada senarai pantau',
 'tog-watchlisthideminor'      => 'Sembunyikan suntingan kecil daripada senarai pantau',
+'tog-watchlisthideliu'        => 'Sembunyikan suntingan oleh pengguna log masuk daripada senarai pantau',
+'tog-watchlisthideanons'      => 'Sembunyikan suntingan oleh pengguna tanpa nama daripada senarai pantau',
 'tog-nolangconversion'        => 'Lumpuhkan penukaran kelainan',
 'tog-ccmeonemails'            => 'Kirimkan saya salinan e-mel yang saya hantar kepada pengguna lain',
 'tog-diffonly'                => 'Jangan tunjukkan kandungan laman di bawah perbezaan',
 'tog-showhiddencats'          => 'Tunjukkan kategori tersembunyi',
+'tog-noconvertlink'           => 'Lumpuhkan penukaran tajuk pautan',
+'tog-norollbackdiff'          => 'Abaikan perbezaan selepas melakukan pengunduran suntingan.',
 
 'underline-always'  => 'Sentiasa',
 'underline-never'   => 'Jangan',
 'underline-default' => 'Ikut tetapan pelayar',
 
-'skinpreview' => '(Pratonton)',
-
 # Dates
 'sunday'        => 'Ahad',
 'monday'        => 'Isnin',
@@ -290,7 +289,7 @@ $messages = array(
 'mytalk'         => 'Perbualan saya',
 'anontalk'       => 'Perbualan bagi IP ini',
 'navigation'     => 'Pandu arah',
-'and'            => 'dan',
+'and'            => '&#32;dan',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -327,14 +326,14 @@ $messages = array(
 'talkpagelinktext'  => 'Perbualan',
 'specialpage'       => 'Laman Khas',
 'personaltools'     => 'Alatan peribadi',
-'postcomment'       => 'Kirim komen',
+'postcomment'       => 'Bahagian baru',
 'articlepage'       => 'Lihat laman kandungan',
 'talk'              => 'Perbincangan',
 'views'             => 'Pandangan',
 'toolbox'           => 'Alatan',
 'userpage'          => 'Lihat laman pengguna',
 'projectpage'       => 'Lihat laman projek',
-'imagepage'         => 'Lihat laman media',
+'imagepage'         => 'Lihat laman fail',
 'mediawikipage'     => 'Lihat laman pesanan',
 'templatepage'      => 'Lihat laman templat',
 'viewhelppage'      => 'Lihat laman bantuan',
@@ -353,8 +352,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Perihal {{SITENAME}}',
 'aboutpage'            => 'Project:Perihal',
-'bugreports'           => 'Laporan pepijat',
-'bugreportspage'       => 'Project:Laporan pepijat',
 'copyright'            => 'Kandungan disediakan dengan $1.',
 'copyrightpagename'    => 'Hak cipta {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Hak cipta',
@@ -377,9 +374,7 @@ $messages = array(
 
 'badaccess'        => 'Tidak dibenarkan',
 'badaccess-group0' => 'Anda tidak dibenarkan melaksanakan tindakan ini.',
-'badaccess-group1' => 'Tindakan ini hanya boleh dilakukan oleh pengguna dalam kumpulan $1.',
-'badaccess-group2' => 'Tindakan ini hanya boleh dilakukan oleh pengguna dalam kumpulan $1.',
-'badaccess-groups' => 'Tindakan ini hanya boleh dilakukan oleh pengguna dalam kumpulan $1.',
+'badaccess-groups' => 'Tindakan ini hanya boleh dilakukan oleh pengguna dari {{PLURAL:$2|kumpulan|kumpulan-kumpulan}} berikut: $1.',
 
 'versionrequired'     => 'MediaWiki versi $1 diperlukan',
 'versionrequiredtext' => 'MediaWiki versi $1 diperlukan untuk menggunakan laman ini. Sila lihat [[Special:Version|laman versi]].',
@@ -393,6 +388,8 @@ $messages = array(
 'editsection'             => 'sunting',
 'editold'                 => 'sunting',
 'viewsourceold'           => 'lihat sumber',
+'editlink'                => 'sunting',
+'viewsourcelink'          => 'lihat sumber',
 'editsectionhint'         => 'Sunting bahagian: $1',
 'toc'                     => 'Isi kandungan',
 'showtoc'                 => 'tunjuk',
@@ -407,13 +404,13 @@ $messages = array(
 'site-atom-feed'          => 'Suapan Atom $1',
 'page-rss-feed'           => 'Suapan RSS "$1"',
 'page-atom-feed'          => 'Suapan Atom "$1"',
-'red-link-title'          => '$1 (belum ditulis)',
+'red-link-title'          => '$1 (tidak wujud)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Laman',
 'nstab-user'      => 'Laman pengguna',
 'nstab-media'     => 'Laman media',
-'nstab-special'   => 'Khas',
+'nstab-special'   => 'Laman khas',
 'nstab-project'   => 'Laman projek',
 'nstab-image'     => 'Imej',
 'nstab-mediawiki' => 'Pesanan',
@@ -423,8 +420,7 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Tindakan tidak dikenali',
-'nosuchactiontext'  => 'Tindakan yang dinyatakan dalam URL
-ini tidak dikenali oleh wiki ini',
+'nosuchactiontext'  => 'Tindakan yang dinyatakan dalam URL ini tidak sah. Anda mungkin telah menaip URL yang salah atau mengikuti pautan yang tidak sah. Ini juga mungkin bererti terdapat pepijat dalam perisian yang digunakan oleh {{SITENAME}}.',
 'nosuchspecialpage' => 'Laman khas tidak wujud',
 'nospecialpagetext' => "<big>'''Anda telah meminta laman khas yang tidak sah.'''</big>
 
@@ -473,7 +469,6 @@ Sila catat URL bagi laman ini dan laporkan perkara ini kepada seorang [[Special:
 'cannotdelete'         => 'Laman atau imej yang dinyatakan tidak dapat dihapuskan. Ia mungkin telah pun dihapuskan oleh orang yang lain.',
 'badtitle'             => 'Tajuk tidak sah',
 'badtitletext'         => 'Tajuk laman yang diminta tidak sah, kosong, ataupun tajuk antara bahasa atau tajuk antara wiki yang salah dipaut. Ia mungkin mengandungi aksara yang tidak dibenarkan.',
-'perfdisabled'         => 'Harap maaf! Ciri ini telah dipadamkan buat sementara kerana ia melambatkan pangkalan data sehingga wiki ini tidak dapat digunakan.',
 'perfcached'           => 'Data berikut adalah teragregat dan mungkin bukan yang terkini.',
 'perfcachedts'         => 'Data berikut adalah teragregat dan dikemaskinikan buat kali terakhir pada $1.',
 'querypage-no-updates' => 'Buat masa ini, pengkemaskinian laman ini telah dilumpuhkan.
@@ -488,24 +483,24 @@ Pertanyaan: $2',
 'protectedpagetext'    => 'Laman ini telah dikunci untuk menghalang penyuntingan.',
 'viewsourcetext'       => 'Anda boleh melihat dan menyalin sumber bagi laman ini:',
 'protectedinterface'   => 'Laman ini menyediakan teks antara muka bagi perisian ini, akan tetapi dikunci untuk menghalang penyalahgunaan.',
-'editinginterface'     => "'''Amaran:''' Anda sedang menyunting laman yang digunakan untuk menghasilkan teks antara muka bagi perisian ini. Sebarang perubahan terhadap laman ini akan menjejaskan rupa antara muka bagi pengguna-pengguna lain. Untuk melakukan penterjemahan, anda boleh menggunakan [http://translatewiki.net/wiki/Main_Page?setlang=ms Betawiki], sebuah projek penyetempatan MediaWiki.",
+'editinginterface'     => "'''Amaran:''' Anda sedang menyunting laman yang digunakan untuk menghasilkan teks antara muka bagi perisian ini. Sebarang perubahan terhadap laman ini akan menjejaskan rupa antara muka bagi pengguna-pengguna lain. Untuk melakukan penterjemahan, anda boleh menggunakan [http://translatewiki.net/wiki/Main_Page?setlang=ms translatewiki.net], sebuah projek penyetempatan MediaWiki.",
 'sqlhidden'            => '(Pertanyaan SQL disorokkan)',
 'cascadeprotected'     => 'Laman ini telah dilindungi daripada penyuntingan oleh pengguna selain penyelia, kerana ia termasuk dalam {{PLURAL:$1|laman|laman-laman}} berikut, yang dilindungi dengan secara "melata": $2',
 'namespaceprotected'   => "Anda tidak mempunyai keizinan untuk menyunting laman dalam ruang nama '''$1'''.",
 'customcssjsprotected' => 'Anda tidak mempunyai keizinan untuk menyunting laman ini kerana ia mengandungi tetapan peribadi pengguna lain.',
 'ns-specialprotected'  => 'Laman khas tidak boleh disunting.',
-'titleprotected'       => 'Tajuk ini telah dilindungi oleh [[User:$1|$1]] daripada dicipta. Sebab yang diberikan ialah <i>$2</i>.',
+'titleprotected'       => "Tajuk ini telah dilindungi oleh [[User:$1|$1]] daripada dicipta. Sebab yang diberikan ialah ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Konfigurasi rosak: pengimbas virus yang tidak diketahui: <i>$1</i>',
+'virus-badscanner'     => "Konfigurasi rosak: pengimbas virus yang tidak diketahui: ''$1''",
 'virus-scanfailed'     => 'pengimbasan gagal (kod $1)',
 'virus-unknownscanner' => 'antivirus tidak dikenali:',
 
 # Login and logout pages
 'logouttitle'                => 'Log keluar',
-'logouttext'                 => '<strong>Anda telah log keluar.</strong>
+'logouttext'                 => "'''Anda telah log keluar.'''
 
-Anda boleh terus menggunakan {{SITENAME}} sebagai pengguna tanpa nama, atau anda boleh [[Special:UserLogin|log masuk sekali lagi]] sebagai pengguna lain. Anda boleh membersihkan cache pelayar web anda sekiranya terdapat laman yang memaparkan seolah-olah anda masih log masuk.',
+Anda boleh terus menggunakan {{SITENAME}} sebagai pengguna tanpa nama, atau anda boleh [[Special:UserLogin|log masuk sekali lagi]] sebagai pengguna lain. Anda boleh membersihkan cache pelayar web anda sekiranya terdapat laman yang memaparkan seolah-olah anda masih log masuk.",
 'welcomecreation'            => '== Selamat datang, $1! ==
 
 Akaun anda telah dibuka. Jangan lupa untuk mengubah [[Special:Preferences|keutamaan {{SITENAME}}]] anda.',
@@ -516,7 +511,6 @@ Akaun anda telah dibuka. Jangan lupa untuk mengubah [[Special:Preferences|keutam
 'remembermypassword'         => 'Ingat log masuk saya di komputer ini',
 'yourdomainname'             => 'Domain anda:',
 'externaldberror'            => 'Berlaku ralat pangkalan data bagi pengesahan luar atau anda tidak dibenarkan mengemaskinikan akaun luar anda.',
-'loginproblem'               => '<b>Berlaku sedikit masalah ketika log masuk.</b><br />Sila cuba lagi!',
 'login'                      => 'Log masuk',
 'nav-login-createaccount'    => 'Log masuk / buka akaun',
 'loginprompt'                => 'Anda mesti membenarkan kuki untuk log masuk ke dalam {{SITENAME}}.',
@@ -541,7 +535,7 @@ Akaun anda telah dibuka. Jangan lupa untuk mengubah [[Special:Preferences|keutam
 'yourvariant'                => 'Varian',
 'yournick'                   => 'Nama samaran:',
 'badsig'                     => 'Tandatangan mentah tidak sah; sila semak tag HTML.',
-'badsiglength'               => 'Nama samaran terlalu panjang; ia mestilah tidak melebihi $1 aksara.',
+'badsiglength'               => 'Tandatangan anda tidak boleh melebihi $1 aksara.',
 'email'                      => 'E-mel',
 'prefs-help-realname'        => 'Nama sebenar adalah tidak wajib. Jika dinyatakan, ia akan digunakan untuk mengiktiraf karya anda.',
 'loginerror'                 => 'Ralat log masuk',
@@ -552,7 +546,7 @@ Akaun anda telah dibuka. Jangan lupa untuk mengubah [[Special:Preferences|keutam
 'noname'                     => 'Nama pengguna tidak sah.',
 'loginsuccesstitle'          => 'Berjaya log masuk',
 'loginsuccess'               => "'''Anda telah log masuk ke dalam {{SITENAME}} sebagai \"\$1\".'''",
-'nosuchuser'                 => 'Pengguna "$1" tidak wujud. Sila semak ejaan anda atau [[Special:UserLogin/signup|buka akaun baru]].',
+'nosuchuser'                 => 'Pengguna "$1" tidak wujud. Nama pengguna adalah peka huruf besar. Sila semak ejaan anda, atau anda boleh [[Special:UserLogin/signup|membuka akaun baru]].',
 'nosuchusershort'            => 'Pengguna "<nowiki>$1</nowiki>" tidak wujud. Sila semak ejaan anda.',
 'nouserspecified'            => 'Sila nyatakan nama pengguna.',
 'wrongpassword'              => 'Kata laluan yang dimasukkan adalah salah. Sila cuba lagi.',
@@ -576,8 +570,9 @@ untuk membuktikan bahawa alamat tersebut memang milik anda.',
 dikirim dalam $1 jam yang lalu. Untuk mengelak penyalahgunaan, hanya satu
 pengingat kata laluan akan dikirim pada setiap $1 jam.',
 'mailerror'                  => 'Ralat ketika mengirim e-mel: $1',
-'acct_creation_throttle_hit' => 'Harap maaf, anda telah pun membuka sebanyak $1 akaun. Anda tidak boleh membuka akaun lagi.',
-'emailauthenticated'         => 'Alamat e-mel anda telah disahkan pada $1.',
+'acct_creation_throttle_hit' => 'Pengunjung wiki ini yang menggunakan alamat IP anda telah membuka sebanyak $1 akaun semenjak sehari lepas, iaitu merupakan had maksimum yang dibenarkan dalam tempoh tersebut.
+Akibatknya, pengunjung dari alamat IP ini tidak boleh membuka akaun lagi pada masa sekarang.',
+'emailauthenticated'         => 'Alamat e-mel anda telah disahkan pada $2, $3.',
 'emailnotauthenticated'      => 'Alamat e-mel anda belum disahkan. Oleh itu,
 e-mel bagi ciri-ciri berikut tidak boleh dikirim.',
 'noemailprefs'               => 'Anda perlu menetapkan alamat e-mel terlebih dahulu untuk menggunakan ciri-ciri ini.',
@@ -591,18 +586,26 @@ alamat e-mel anda di {{SITENAME}} ($4) dengan nama "$2" dan kata laluan "$3".
 Anda boleh log masuk dan tukar kata laluan anda sekarang.
 
 Sila abaikan mesej ini jika anda tidak meminta untuk membuka akaun tersebut.',
+'login-throttled'            => 'Anda memasukkan kata laluan yang salah berulang kali. Sila tunggu sebentar dan cuba lagi.',
 'loginlanguagelabel'         => 'Bahasa: $1',
 
 # Password reset dialog
-'resetpass'               => 'Set semula kata laluan',
-'resetpass_announce'      => 'Anda sedang log masuk dengan kata laluan sementara. Untuk log masuk dengan sempurna, sila tetapkan kata laluan baru di sini:',
-'resetpass_text'          => '<!-- Tambah teks di sini -->',
-'resetpass_header'        => 'Tukar kata laluan',
-'resetpass_submit'        => 'Tetapkan kata laluan dan log masuk',
-'resetpass_success'       => 'Kata laluan anda ditukar dengan jayanya! Sila tunggu...',
-'resetpass_bad_temporary' => 'Kata laluan sementara tidak sah. Anda mungkin telah pun menukar kata laluan atau meminta kata laluan sementara yang baru.',
-'resetpass_forbidden'     => 'Kata laluan tidak boleh ditukar',
-'resetpass_missing'       => 'Tiada data borang.',
+'resetpass'                 => 'Tukar kata laluan',
+'resetpass_announce'        => 'Anda sedang log masuk dengan kata laluan sementara. Untuk log masuk dengan sempurna, sila tetapkan kata laluan baru di sini:',
+'resetpass_text'            => '<!-- Tambah teks di sini -->',
+'resetpass_header'          => 'Tukar kata laluan',
+'oldpassword'               => 'Kata laluan lama:',
+'newpassword'               => 'Kata laluan baru:',
+'retypenew'                 => 'Ulangi kata laluan baru:',
+'resetpass_submit'          => 'Tetapkan kata laluan dan log masuk',
+'resetpass_success'         => 'Kata laluan anda ditukar dengan jayanya! Sila tunggu...',
+'resetpass_bad_temporary'   => 'Kata laluan sementara tidak sah. Anda mungkin telah pun menukar kata laluan atau meminta kata laluan sementara yang baru.',
+'resetpass_forbidden'       => 'Kata laluan tidak boleh ditukar',
+'resetpass-no-info'         => 'Anda hendaklah log masuk terlebih dahulu untuk mencapai laman ini secara terus.',
+'resetpass-submit-loggedin' => 'Tukar kata laluan',
+'resetpass-wrong-oldpass'   => 'Kata laluan sementara atau semasa tidak sah.
+Anda mungkin telah pun berjaya menukar kata laluan anda atau meminta kata laluan sementara yang baru.',
+'resetpass-temp-password'   => 'Kata laluan sementara:',
 
 # Edit page toolbar
 'bold_sample'     => 'Teks tebal',
@@ -627,8 +630,8 @@ Sila abaikan mesej ini jika anda tidak meminta untuk membuka akaun tersebut.',
 'hr_tip'          => 'Garis melintang (gunakan dengan hemat)',
 
 # Edit pages
-'summary'                          => 'Ringkasan',
-'subject'                          => 'Tajuk',
+'summary'                          => 'Ringkasan:',
+'subject'                          => 'Tajuk:',
 'minoredit'                        => 'Ini adalah suntingan kecil',
 'watchthis'                        => 'Pantau laman ini',
 'savearticle'                      => 'Simpan',
@@ -640,8 +643,8 @@ Sila abaikan mesej ini jika anda tidak meminta untuk membuka akaun tersebut.',
 'missingsummary'                   => "'''Peringatan:''' Anda tidak menyatakan ringkasan suntingan. Klik '''Simpan''' sekali lagi untuk menyimpan suntingan ini tanpa ringkasan.",
 'missingcommenttext'               => 'Sila masukkan komen dalam ruangan di bawah.',
 'missingcommentheader'             => "'''Peringatan:''' Anda tidak menyatakan tajuk bagi komen ini. Klik '''Simpan''' sekali lagi untuk menyimpan suntingan ini tanpa tajuk.",
-'summary-preview'                  => 'Pratonton ringkasan',
-'subject-preview'                  => 'Pratonton tajuk',
+'summary-preview'                  => 'Pratonton ringkasan:',
+'subject-preview'                  => 'Pratonton tajuk:',
 'blockedtitle'                     => 'Pengguna disekat',
 'blockedtext'                      => '<big>\'\'\'Nama pengguna atau alamat IP anda telah disekat.\'\'\'</big>
 
@@ -691,33 +694,33 @@ Untuk mencipta laman ini, sila taip dalam kotak di bawah
 (lihat [[{{MediaWiki:Helppage}}|laman bantuan]] untuk maklumat lanjut).
 Jika anda tiba di sini secara tak sengaja, hanya klik butang '''back''' pada pelayar anda.",
 'anontalkpagetext'                 => "----''Ini ialah laman perbincangan bagi pengguna tanpa nama yang belum membuka akaun atau tidak log masuk. Kami terpaksa menggunakan alamat IP untuk mengenal pasti pengguna tersebut. Alamat IP ini boleh dikongsi oleh ramai pengguna. Sekiranya anda adalah seorang pengguna tanpa nama dan berasa bahawa komen yang tidak kena mengena telah ditujui kepada anda, sila [[Special:UserLogin|buka akaun baru atau log masuk]] untuk mengelakkan sebarang kekeliruan dengan pengguna tanpa nama yang lain.''",
-'noarticletext'                    => 'Tiada teks dalam laman ini pada masa sekarang. Anda boleh [[Special:Search/{{PAGENAME}}|mencari tajuk bagi laman ini]] dalam laman-laman lain atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} menyunting laman ini].',
+'noarticletext'                    => 'Tiada teks dalam laman ini pada masa sekarang. Anda boleh [[Special:Search/{{PAGENAME}}|mencari tajuk bagi laman ini]] dalam laman-laman lain, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} menggelintar log-log yang berkaitan], atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} menyunting laman ini].',
 'userpage-userdoesnotexist'        => 'Akaun pengguna "$1" tidak berdaftar. Sila pastikan sama ada anda mahu mencipta/menyunting laman ini.',
 'clearyourcache'                   => "'''Catatan: Selepas menyimpan laman ini, anda mungkin perlu membersihkan cache pelayar web anda terlebih dahulu untuk mengenakan perubahan.'''
 '''Mozilla/Firefox/Safari:''' tahan ''Shift'' ketika mengklik ''Reload'' atau tekan ''Ctrl+F5'' atau tekan ''Ctrl+R'' (''Command+R'' dalam komputer Macintosh).
 '''Konqueror:''' klik butang ''Reload'' atau tekan ''F5''.
 '''Opera:''' bersihkan cache melalui menu ''Tools → Preferences''.
 '''Internet Explorer:''' tahan ''Ctrl'' ketika mengklik ''Refresh'' atau tekan ''Ctrl+F5''.",
-'usercssjsyoucanpreview'           => "<strong>Petua:</strong> Gunakan butang 'Pratonton' untuk menguji CSS/JS baru anda sebelum menyimpan.",
+'usercssjsyoucanpreview'           => "'''Petua:''' Gunakan butang 'Pratonton' untuk menguji CSS/JS baru anda sebelum menyimpan.",
 'usercsspreview'                   => "'''Ingat bahawa anda hanya sedang melihat pratonton CSS peribadi anda. Laman ini belum lagi disimpan!'''",
 'userjspreview'                    => "'''Ingat bahawa anda hanya menguji/melihat pratonton JavaScript anda, ia belum lagi disimpan!'''",
 'userinvalidcssjstitle'            => "'''Amaran:''' Rupa \"\$1\" tidak wujud. Ingat bahawa laman tempahan .css dan .js menggunakan tajuk berhuruf kecil, contohnya {{ns:user}}:Anu/monobook.css tidak sama dengan {{ns:user}}:Anu/Monobook.css.",
 'updated'                          => '(Dikemaskinikan)',
-'note'                             => '<strong>Catatan:</strong>',
-'previewnote'                      => '<strong>Ini hanyalah pratonton. Perubahan masih belum disimpan!</strong>',
+'note'                             => "'''Catatan:'''",
+'previewnote'                      => "'''Ini hanyalah pratonton. Perubahan masih belum disimpan!'''",
 'previewconflict'                  => 'Paparan ini merupakan teks di bahagian atas dalam kotak sunting teks. Teks ini akan disimpan sekiranya anda memilih berbuat demikian.',
-'session_fail_preview'             => '<strong>Kami tidak dapat memproses suntingan anda kerana kehilangan data sesi. Sila cuba lagi. Jika masalah ini berlanjutan, [[Special:UserLogout|log keluar]] dahulu, kemudian log masuk sekali lagi.</strong>',
-'session_fail_preview_html'        => "<strong>Kami tidak dapat memproses suntingan anda kerana kehilangan data sesi.</strong>
+'session_fail_preview'             => "'''Kami tidak dapat memproses suntingan anda kerana kehilangan data sesi. Sila cuba lagi. Jika masalah ini berlanjutan, [[Special:UserLogout|log keluar]] dahulu, kemudian log masuk sekali lagi.'''",
+'session_fail_preview_html'        => "'''Kami tidak dapat memproses suntingan anda kerana kehilangan data sesi.'''
 
 ''Kerana {{SITENAME}} membenarkan HTML mentah, pratonton dimatikan sebagai perlindungan daripada serangan JavaScript.''
 
-<strong>Jika ini adalah penyuntingan yang sah, sila cuba lagi. Jika masalah ini berlanjutan, [[Special:UserLogout|log keluar]] dahulu, kemudian log masuk sekali lagi.</strong>",
-'token_suffix_mismatch'            => '<strong>Suntingan anda telah ditolak kerana pelanggan anda memusnahkan aksara tanda baca
+'''Jika ini adalah penyuntingan yang sah, sila cuba lagi. Jika masalah ini berlanjutan, [[Special:UserLogout|log keluar]] dahulu, kemudian log masuk sekali lagi.'''",
+'token_suffix_mismatch'            => "'''Suntingan anda telah ditolak kerana pelanggan anda memusnahkan aksara tanda baca
 dalam token suntingan. Suntingan tersebut telah ditolak untuk menghalang kerosakan teks laman.
-Hal ini kadangkala berlaku apabila anda menggunakan khidmat proksi tanpa nama berdasarkan web yang bermasalah.</strong>',
+Hal ini kadangkala berlaku apabila anda menggunakan khidmat proksi tanpa nama berdasarkan web yang bermasalah.'''",
 'editing'                          => 'Menyunting $1',
 'editingsection'                   => 'Menyunting $1 (bahagian)',
-'editingcomment'                   => 'Menyunting $1 (komen)',
+'editingcomment'                   => 'Menyunting $1 (bahagian baru)',
 'editconflict'                     => 'Percanggahan penyuntingan: $1',
 'explainconflict'                  => 'Pengguna lain telah menyunting laman ini ketika anda sedang menyuntingnya.
 Kawasan teks di atas mengandungi teks semasa.
@@ -727,30 +730,31 @@ Anda perlu menggabungkan perubahan anda dengan teks semasa.
 "Simpan laman".<br />',
 'yourtext'                         => 'Teks anda',
 'storedversion'                    => 'Versi yang disimpan',
-'nonunicodebrowser'                => '<strong>AMARAN: Pelayar anda tidak mematuhi Unicode. Aksara-aksara bukan ASCII akan dipaparkan dalam kotak sunting sebagai kod perenambelasan.</strong>',
-'editingold'                       => '<strong>AMARAN: Anda sedang
+'nonunicodebrowser'                => "'''AMARAN: Pelayar anda tidak mematuhi Unicode. Aksara-aksara bukan ASCII akan dipaparkan dalam kotak sunting sebagai kod perenambelasan.'''",
+'editingold'                       => "'''AMARAN: Anda sedang
 menyunting sebuah semakan yang sudah ketinggalan zaman.
-Jika anda menyimpannya, sebarang perubahan yang dibuat selepas tarikh semakan ini akan hilang.</strong>',
+Jika anda menyimpannya, sebarang perubahan yang dibuat selepas tarikh semakan ini akan hilang.'''",
 'yourdiff'                         => 'Perbezaan',
-'copyrightwarning'                 => 'Sila ambil perhatian bahawa semua sumbangan kepada {{SITENAME}} akan dikeluarkan di bawah $2 (lihat $1 untuk butiran lanjut). Jika anda tidak mahu tulisan anda disunting sewenang-wenangnya oleh orang lain dan diedarkan secara bebas, maka jangan kirim di sini.<br />
+'copyrightwarning'                 => "Sila ambil perhatian bahawa semua sumbangan kepada {{SITENAME}} akan dikeluarkan di bawah $2 (lihat $1 untuk butiran lanjut). Jika anda tidak mahu tulisan anda disunting sewenang-wenangnya oleh orang lain dan diedarkan secara bebas, maka jangan kirim di sini.<br />
 Anda juga berjanji bahawa ini adalah hasil kerja tangan anda sendiri, atau disalin daripada domain awam atau mana-mana sumber bebas lain.
-<strong>JANGAN KIRIM KARYA HAK CIPTA ORANG LAIN TANPA KEBENARAN!</strong>',
-'copyrightwarning2'                => 'Sila ambil perhatian bahawa semua sumbangan terhadap {{SITENAME}} boleh disunting, diubah, atau dipadam oleh penyumbang lain. Jika anda tidak mahu tulisan anda disunting sewenang-wenangnya, maka jangan kirim di sini.<br />
+'''JANGAN KIRIM KARYA HAK CIPTA ORANG LAIN TANPA KEBENARAN!'''",
+'copyrightwarning2'                => "Sila ambil perhatian bahawa semua sumbangan terhadap {{SITENAME}} boleh disunting, diubah, atau dipadam oleh penyumbang lain. Jika anda tidak mahu tulisan anda disunting sewenang-wenangnya, maka jangan kirim di sini.<br />
 Anda juga berjanji bahawa ini adalah hasil kerja tangan anda sendiri, atau
 disalin daripada domain awam atau mana-mana sumber bebas lain (lihat $1 untuk butiran lanjut).
-<strong>JANGAN KIRIM KARYA HAK CIPTA ORANG LAIN TANPA KEBENARAN!</strong>',
-'longpagewarning'                  => '<strong>AMARAN: Panjang laman ini ialah $1 kilobait.
+'''JANGAN KIRIM KARYA HAK CIPTA ORANG LAIN TANPA KEBENARAN!'''",
+'longpagewarning'                  => "'''AMARAN: Panjang laman ini ialah $1 kilobait.
 Terdapat beberapa pelayar web yang mempunyai masalah jika digunakan untuk menyunting laman yang menghampiri ataupun melebihi 32 kB.
-Sila bahagikan rencana ini, jika boleh.</strong>',
-'longpageerror'                    => '<strong>RALAT: Panjang teks yang dikirim ialah $1 kilobait,
-melebihi had maksimum $2 kilobait. Ia tidak boleh disimpan.</strong>',
-'readonlywarning'                  => '<strong>AMARAN: Pangkalan data telah dikunci untuk penyenggaraan.
-Justeru, anda tidak boleh menyimpan suntingan anda pada masa sekarang.
-Anda boleh menyalin teks anda ke dalam komputer anda terlebih dahulu dan simpan teks tersebut di sini pada masa akan datang.</strong>',
-'protectedpagewarning'             => '<strong>AMARAN: Laman ini telah dikunci supaya hanya penyelia boleh menyuntingnya.</strong>',
+Sila bahagikan rencana ini, jika boleh.'''",
+'longpageerror'                    => "'''RALAT: Panjang teks yang dikirim ialah $1 kilobait,
+melebihi had maksimum $2 kilobait. Ia tidak boleh disimpan.'''",
+'readonlywarning'                  => "'''AMARAN: Pangkalan data telah dikunci untuk penyenggaraan. Justeru, anda tidak boleh menyimpan suntingan anda pada masa sekarang.
+Anda boleh menyalin teks anda ke dalam komputer anda terlebih dahulu dan simpan teks tersebut di sini pada masa akan datang.'''
+
+Yang berikut ialah penjelasan yang diberikan: $1",
+'protectedpagewarning'             => "'''AMARAN: Laman ini telah dikunci supaya hanya penyelia boleh menyuntingnya.'''",
 'semiprotectedpagewarning'         => "'''Catatan:''' Laman ini telah dikunci supaya hanya pengguna berdaftar sahaja yang boleh menyuntingnya.",
 'cascadeprotectedwarning'          => "'''Amaran:''' Laman ini telah dikunci, oleh itu hanya penyelia boleh menyuntingnya. Ini kerana ia termasuk dalam {{PLURAL:$1|laman|laman-laman}} berikut yang dilindungi secara melata:",
-'titleprotectedwarning'            => '<strong>AMARAN: Laman ini telah dikunci supaya sesetengah pengguna sahaja boleh menciptanya.</strong>',
+'titleprotectedwarning'            => "'''AMARAN: Laman ini telah dikunci supaya hanya pengguna dengan [[Special:ListGroupRights|hak-hak tertentu]] sahaja boleh menciptanya.'''",
 'templatesused'                    => 'Templat yang digunakan dalam laman ini:',
 'templatesusedpreview'             => 'Templat yang digunakan dalam pratonton ini:',
 'templatesusedsection'             => 'Templat yang digunakan dalam bahagian ini:',
@@ -769,11 +773,18 @@ Anda boleh berundur dan menyunting laman yang sedia ada, atau [[Special:UserLogi
 
 Anda harus mempertimbangkan perlunya menyunting laman ini.
 Untuk rujukan, yang berikut ialah log penghapusan bagi laman ini:",
+'deleted-notice'                   => 'Laman ini telah dihapuskan. Log penghapusan bagi laman ini dilampirkan di bawah untuk rujukan.',
+'deletelog-fulllog'                => 'Lihat log penuh',
+'edit-hook-aborted'                => 'Suntingan anda telah dibatalkan oleh penyangkuk. Tiada sebab diberikan.',
+'edit-gone-missing'                => 'Laman tersebut telah dihapuskan dan tidak dapat dikemaskinikan.',
+'edit-conflict'                    => 'Percanggahan penyuntingan.',
+'edit-no-change'                   => 'Suntingan anda diabaikan kerana tiada perubahan dibuat pada teks tersebut.',
+'edit-already-exists'              => 'Tidak dapat mencipta laman baru kerana ia telah wujud.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Amaran: Laman ini mengandungi terlalu banyak panggilan fungsi penghurai yang intensif.
 
-Had panggilan ialah $2, sedangkan yang digunakan berjumlah $1.',
+Had panggilan ialah $2, sekarang terdapat $1 panggilan.',
 'expensive-parserfunction-category'       => 'Laman yang mengandungi terlalu banyak panggilan fungsi penghurai yang intensif',
 'post-expand-template-inclusion-warning'  => 'Amaran: Saiz penyertaan templat terlalu besar.
 Sesetengah templat tidak akan disertakan.',
@@ -781,6 +792,8 @@ Sesetengah templat tidak akan disertakan.',
 'post-expand-template-argument-warning'   => 'Amaran: Laman ini mengandungi sekurang-kurangnya satu argumen templat yang mempunyai saiz pengembangan yang terlalu besar.
 Argumen-argumen ini telah ditinggalkan.',
 'post-expand-template-argument-category'  => 'Laman yang mengandungi templat dengan argumen yang tidak lengkap',
+'parser-template-loop-warning'            => 'Gelung templat dikesan: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Had pengulangan templat dilebihi ($1)',
 
 # "Undo" feature
 'undo-success' => 'Suntingan ini boleh dibatalkan. Sila semak perbandingan di bawah untuk mengesahkan bahawa anda betul-betul mahu melakukan tindakan ini, kemudian simpan perubahan tersebut.',
@@ -795,29 +808,29 @@ Argumen-argumen ini telah ditinggalkan.',
 Sebab yang diberikan oleh $3 ialah ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Lihat log bagi laman ini',
-'nohistory'           => 'Tiada sejarah suntingan bagi laman ini.',
-'revnotfound'         => 'Semakan tidak dijumpai.',
-'revnotfoundtext'     => 'Semakan lama untuk laman yang anda minta tidak dapat dijumpai. Sila semak URL yang anda gunakan untuk mencapai laman ini.',
-'currentrev'          => 'Semakan semasa',
-'revisionasof'        => 'Semakan pada $1',
-'revision-info'       => 'Semakan pada $1 oleh $2',
-'previousrevision'    => '�Semakan sebelumnya',
-'nextrevision'        => 'Semakan berikutnya→',
-'currentrevisionlink' => 'Semakan semasa',
-'cur'                 => 'kini',
-'next'                => 'berikutnya',
-'last'                => 'akhir',
-'page_first'          => 'awal',
-'page_last'           => 'akhir',
-'histlegend'          => "Pemilihan perbezaan: tandakan butang radio bagi versi-versi yang ingin dibandingkan dan tekan butang ''enter'' atau butang di bawah.<br />
+'viewpagelogs'           => 'Lihat log bagi laman ini',
+'nohistory'              => 'Tiada sejarah suntingan bagi laman ini.',
+'currentrev'             => 'Semakan semasa',
+'currentrev-asof'        => 'Semakan semasa pada $1',
+'revisionasof'           => 'Semakan pada $1',
+'revision-info'          => 'Semakan pada $1 oleh $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Semakan sebelumnya',
+'nextrevision'           => 'Semakan berikutnya→',
+'currentrevisionlink'    => 'Semakan semasa',
+'cur'                    => 'kini',
+'next'                   => 'berikutnya',
+'last'                   => 'akhir',
+'page_first'             => 'awal',
+'page_last'              => 'akhir',
+'histlegend'             => "Pemilihan perbezaan: tandakan butang radio bagi versi-versi yang ingin dibandingkan dan tekan butang ''enter'' atau butang di bawah.<br />
 Petunjuk: (kini) = perbezaan dengan versi terkini,
 (akhir) = perbezaan dengan versi sebelumnya, K = suntingan kecil.",
-'deletedrev'          => '[dihapuskan]',
-'histfirst'           => 'Terawal',
-'histlast'            => 'Terkini',
-'historysize'         => '($1 bait)',
-'historyempty'        => '(kosong)',
+'history-fieldset-title' => 'Lihat sejarah',
+'deletedrev'             => '[dihapuskan]',
+'histfirst'              => 'Terawal',
+'histlast'               => 'Terkini',
+'historysize'            => '($1 bait)',
+'historyempty'           => '(kosong)',
 
 # Revision feed
 'history-feed-title'          => 'Sejarah semakan',
@@ -906,6 +919,7 @@ Sila pastikan bahawa perubahan ini akan mengekalkan kesinambungan sejarah laman.
 'mergehistory-invalid-destination' => 'Laman destinasi mestilah merupakan tajuk yang sah.',
 'mergehistory-autocomment'         => 'Menggabungkan [[:$1]] dengan [[:$2]]',
 'mergehistory-comment'             => 'Menggabungkan [[:$1]] dengan [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Laman sasaran tidak boleh sama dengan laman sumber',
 
 # Merge log
 'mergelog'           => 'Log penggabungan',
@@ -918,122 +932,201 @@ Sila pastikan bahawa perubahan ini akan mengekalkan kesinambungan sejarah laman.
 'difference'              => '(Perbezaan antara semakan)',
 'lineno'                  => 'Baris $1:',
 'compareselectedversions' => 'Bandingkan versi-versi yang dipilih',
+'visualcomparison'        => 'Perbandingan visual',
+'wikicodecomparison'      => 'Perbandingan wikitext',
 'editundo'                => 'batal',
 'diff-multi'              => '({{PLURAL:$1|Satu|$1}} semakan pertengahan tidak ditunjukkan.)',
+'diff-movedto'            => 'dipindahkan ke $1',
+'diff-styleadded'         => '$1 gaya ditambah',
+'diff-added'              => '$1 ditambah',
+'diff-changedto'          => '$1 ditukar menjadi',
+'diff-movedoutof'         => 'dipindah keluar daripada $1',
+'diff-styleremoved'       => '$1 gaya dibuang',
+'diff-removed'            => '$1 dibuang',
+'diff-changedfrom'        => 'ditukar daripada $1',
+'diff-src'                => 'sumber',
+'diff-withdestination'    => 'dengan sasaran $1',
+'diff-with'               => '&#32;dengan $1 $2',
+'diff-with-final'         => '&#32;dan $1 $2',
+'diff-width'              => 'lebar',
+'diff-height'             => 'tinggi',
+'diff-p'                  => "'''perenggan'''",
+'diff-blockquote'         => "'''blok petikan'''",
+'diff-h1'                 => "'''tajuk (aras 1)'''",
+'diff-h2'                 => "'''tajuk (aras 2)'''",
+'diff-h3'                 => "'''tajuk (aras 3)'''",
+'diff-h4'                 => "'''tajuk (aras 4)'''",
+'diff-h5'                 => "'''tajuk (aras 5)'''",
+'diff-pre'                => "'''blok praformat'''",
+'diff-div'                => "'''bahagian'''",
+'diff-ul'                 => "'''senarai tak bertertib'''",
+'diff-ol'                 => "'''senarai bertertib'''",
+'diff-li'                 => "'''unsur senarai'''",
+'diff-table'              => "'''jadual'''",
+'diff-tbody'              => "'''isi jadual'''",
+'diff-tr'                 => "'''baris'''",
+'diff-td'                 => "'''sel'''",
+'diff-th'                 => "'''pengatas'''",
+'diff-br'                 => "'''hentian'''",
+'diff-hr'                 => "'''garis mengufuk'''",
+'diff-code'               => "'''blok kod komputer'''",
+'diff-dl'                 => "'''senarai takrif'''",
+'diff-dt'                 => "'''istilah takrif'''",
+'diff-dd'                 => "'''takrif'''",
+'diff-input'              => "'''input'''",
+'diff-form'               => "'''borang'''",
+'diff-img'                => "'''imej'''",
+'diff-span'               => "'''bidang'''",
+'diff-a'                  => "'''pautan'''",
+'diff-i'                  => "'''condong'''",
+'diff-b'                  => "'''tebal'''",
+'diff-strong'             => "'''kuat'''",
+'diff-em'                 => "'''tegas'''",
+'diff-font'               => "'''fon'''",
+'diff-big'                => "'''besar'''",
+'diff-del'                => "'''potong'''",
+'diff-tt'                 => "'''lebar tetap'''",
+'diff-sub'                => "'''subskrip'''",
+'diff-sup'                => "'''superskrip'''",
+'diff-strike'             => "'''potong'''",
 
 # Search results
-'searchresults'             => 'Keputusan carian',
-'searchresulttext'          => 'Untuk maklumat lanjut tentang carian dalam {{SITENAME}}, sila lihat [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Anda mencari "[[$1]]"',
-'searchsubtitleinvalid'     => 'Untuk pertanyaan "$1"',
-'noexactmatch'              => "'''Tiada laman bertajuk \"\$1\".''' Anda boleh [[:\$1|menciptanya]].",
-'noexactmatch-nocreate'     => "'''Tiada laman bertajuk \"\$1\".'''",
-'toomanymatches'            => 'Terlalu banyak padanan dipulangkan, sila cuba pertanyaan lain',
-'titlematches'              => 'Padanan tajuk laman',
-'notitlematches'            => 'Tiada tajuk laman yang sepadan',
-'textmatches'               => 'Padanan teks laman',
-'notextmatches'             => 'Tiada teks laman yang sepadan',
-'prevn'                     => '$1 sebelumnya',
-'nextn'                     => '$1 berikutnya',
-'viewprevnext'              => 'Lihat ($1) ($2) ($3)',
-'search-result-size'        => '$1 ($2 patah perkataan)',
-'search-result-score'       => 'Kaitan: $1%',
-'search-redirect'           => '(pelencongan $1)',
-'search-section'            => '(bahagian $1)',
-'search-suggest'            => 'Maksud anda, $1?',
-'search-interwiki-caption'  => 'Projek-projek lain',
-'search-interwiki-default'  => 'Keputusan daripada $1:',
-'search-interwiki-more'     => '(lagi)',
-'search-mwsuggest-enabled'  => 'berserta cadangan',
-'search-mwsuggest-disabled' => 'tiada cadangan',
-'search-relatedarticle'     => 'Berkaitan',
-'mwsuggest-disable'         => 'Matikan ciri cadangan AJAX',
-'searchrelated'             => 'berkaitan',
-'searchall'                 => 'semua',
-'showingresults'            => "Yang berikut ialah '''$1''' hasil bermula daripada yang {{PLURAL:$2|pertama|ke-'''$2'''}}.",
-'showingresultsnum'         => "Yang berikut ialah '''$3''' hasil bermula daripada yang {{PLURAL:$2|pertama|ke-'''$2'''}}.",
-'showingresultstotal'       => "Berikut ialah {{PLURAL:$3|hasil '''$1'''|hasil '''$1 - $2'''}} daripada '''$3'''",
-'nonefound'                 => "'''Catatan''': Kegagalan pencarian biasanya
-disebabkan oleh pencarian perkataan-perkataan yang terlalu umum, seperti \"ada\"
-dan \"dari\" yang tidak diindekskan, atau disebabkan oleh pencarian lebih
-daripada satu kata kunci (hanya laman yang mengandungi kesemua kata kunci akan ditunjukkan).",
-'powersearch'               => 'Cari',
-'powersearch-legend'        => 'Gelintar maju',
-'powersearch-ns'            => 'Gelintar ruang nama:',
-'powersearch-redir'         => 'Termasuk lencongan',
-'powersearch-field'         => 'Cari',
-'search-external'           => 'Carian luar',
-'searchdisabled'            => 'Ciri pencarian dalam {{SITENAME}} dimatikan. Anda boleh mencari melalui Google. Sila ambil perhatian bahawa indeks dalam Google mungkin bukan yang terkini.',
+'searchresults'                    => 'Keputusan carian',
+'searchresults-title'              => 'Keputusan carian "$1"',
+'searchresulttext'                 => 'Untuk maklumat lanjut tentang carian dalam {{SITENAME}}, sila lihat [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Anda mencari \'\'\'[[$1]]\'\'\' ([[Special:Prefixindex/$1|semua laman dengan awalan "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|semua laman yang mengandungi pautan ke "$1"]])',
+'searchsubtitleinvalid'            => 'Untuk pertanyaan "$1"',
+'noexactmatch'                     => "'''Tiada laman bertajuk \"\$1\".''' Anda boleh [[:\$1|menciptanya]].",
+'noexactmatch-nocreate'            => "'''Tiada laman bertajuk \"\$1\".'''",
+'toomanymatches'                   => 'Terlalu banyak padanan dipulangkan, sila cuba pertanyaan lain',
+'titlematches'                     => 'Padanan tajuk laman',
+'notitlematches'                   => 'Tiada tajuk laman yang sepadan',
+'textmatches'                      => 'Padanan teks laman',
+'notextmatches'                    => 'Tiada teks laman yang sepadan',
+'prevn'                            => '$1 sebelumnya',
+'nextn'                            => '$1 berikutnya',
+'viewprevnext'                     => 'Lihat ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Pilihan gelintar',
+'searchmenu-exists'                => "* Laman '''[[$1]]'''",
+'searchmenu-new'                   => "'''Cipta laman \"[[:\$1]]\" di wiki ini!'''",
+'searchhelp-url'                   => 'Help:Kandungan',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Senarai laman dengan awalan ini]]',
+'searchprofile-articles'           => 'Laman kandungan',
+'searchprofile-articles-and-proj'  => 'Laman kandungan & projek',
+'searchprofile-project'            => 'Laman projek',
+'searchprofile-images'             => 'Fail',
+'searchprofile-everything'         => 'Semua',
+'searchprofile-advanced'           => 'Maju',
+'searchprofile-articles-tooltip'   => 'Cari dalam $1',
+'searchprofile-project-tooltip'    => 'Cari dalam $1',
+'searchprofile-images-tooltip'     => 'Cari fail',
+'searchprofile-everything-tooltip' => 'Gelintar semua kandungan (termasuk laman perbincangan)',
+'searchprofile-advanced-tooltip'   => 'Gelintar ruang nama tempahan',
+'prefs-search-nsdefault'           => 'Gelintar menggunakan tetapan lalai:',
+'prefs-search-nscustom'            => 'Gelintar ruang nama tempahan:',
+'search-result-size'               => '$1 ($2 patah perkataan)',
+'search-result-score'              => 'Kaitan: $1%',
+'search-redirect'                  => '(pelencongan $1)',
+'search-section'                   => '(bahagian $1)',
+'search-suggest'                   => 'Maksud anda, $1?',
+'search-interwiki-caption'         => 'Projek-projek lain',
+'search-interwiki-default'         => 'Keputusan daripada $1:',
+'search-interwiki-more'            => '(lagi)',
+'search-mwsuggest-enabled'         => 'berserta cadangan',
+'search-mwsuggest-disabled'        => 'tiada cadangan',
+'search-relatedarticle'            => 'Berkaitan',
+'mwsuggest-disable'                => 'Matikan ciri cadangan AJAX',
+'searchrelated'                    => 'berkaitan',
+'searchall'                        => 'semua',
+'showingresults'                   => "Yang berikut ialah '''$1''' hasil bermula daripada yang {{PLURAL:$2|pertama|ke-'''$2'''}}.",
+'showingresultsnum'                => "Yang berikut ialah '''$3''' hasil bermula daripada yang {{PLURAL:$2|pertama|ke-'''$2'''}}.",
+'showingresultstotal'              => "Yang berikut ialah {{PLURAL:$4|hasil '''$1'''|hasil '''$1 - $2'''}} daripada '''$3'''",
+'nonefound'                        => "'''Catatan''': Ketika lalai, hanya sesetengah ruang nama digelintar.
+Cuba berikan awalan ''all:'' untuk menggelintar semua kandungan (termasuk laman perbincangan, templat, dan lain-lain), atau gunakan ruang nama yang dikehendaki sebagai awalan.",
+'search-nonefound'                 => 'Tiada hasil yang sepadan dengan pertanyaan tersebut.',
+'powersearch'                      => 'Cari',
+'powersearch-legend'               => 'Gelintar maju',
+'powersearch-ns'                   => 'Gelintar ruang nama:',
+'powersearch-redir'                => 'Termasuk lencongan',
+'powersearch-field'                => 'Cari',
+'search-external'                  => 'Carian luar',
+'searchdisabled'                   => 'Ciri pencarian dalam {{SITENAME}} dimatikan. Anda boleh mencari melalui Google. Sila ambil perhatian bahawa indeks dalam Google mungkin bukan yang terkini.',
 
 # Preferences page
-'preferences'              => 'Keutamaan',
-'mypreferences'            => 'Keutamaan saya',
-'prefs-edits'              => 'Jumlah suntingan:',
-'prefsnologin'             => 'Belum log masuk',
-'prefsnologintext'         => 'Anda hendaklah <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} log masuk]</span> terlebih dahulu untuk menetapkan keutamaan.',
-'prefsreset'               => 'Keutamaan anda telah diset semula dari storan.',
-'qbsettings'               => 'Bar pantas',
-'qbsettings-none'          => 'Tiada',
-'qbsettings-fixedleft'     => 'Tetap sebelah kiri',
-'qbsettings-fixedright'    => 'Tetap sebelah kanan',
-'qbsettings-floatingleft'  => 'Berubah-ubah sebelah kiri',
-'qbsettings-floatingright' => 'Berubah-ubah sebelah kanan',
-'changepassword'           => 'Tukar kata laluan',
-'skin'                     => 'Rupa',
-'math'                     => 'Matematik',
-'dateformat'               => 'Format tarikh',
-'datedefault'              => 'Tiada keutamaan',
-'datetime'                 => 'Tarikh dan waktu',
-'math_failure'             => 'Gagal menghurai',
-'math_unknown_error'       => 'ralat yang tidak dikenali',
-'math_unknown_function'    => 'fungsi yang tidak dikenali',
-'math_lexing_error'        => "ralat ''lexing''",
-'math_syntax_error'        => 'ralat sintaks',
-'math_image_error'         => 'penukaran PNG gagal; sila pastikan bahawa latex, dvips, gs dan convert dipasang dengan betul',
-'math_bad_tmpdir'          => 'Direktori temp matematik tidak boleh ditulis atau dicipta',
-'math_bad_output'          => 'Direktori output matematik tidak boleh ditulis atau dicipta',
-'math_notexvc'             => 'Atur cara texvc hilang; sila lihat fail math/README untuk maklumat konfigurasi.',
-'prefs-personal'           => 'Profil',
-'prefs-rc'                 => 'Perubahan terkini',
-'prefs-watchlist'          => 'Senarai pantau',
-'prefs-watchlist-days'     => 'Had bilangan hari dalam senarai pantau:',
-'prefs-watchlist-edits'    => 'Had maksimum perubahan untuk ditunjukkan dalam senarai pantau penuh:',
-'prefs-misc'               => 'Pelbagai',
-'saveprefs'                => 'Simpan',
-'resetprefs'               => 'Set semula',
-'oldpassword'              => 'Kata laluan lama:',
-'newpassword'              => 'Kata laluan baru:',
-'retypenew'                => 'Ulangi kata laluan baru:',
-'textboxsize'              => 'Menyunting',
-'rows'                     => 'Baris:',
-'columns'                  => 'Lajur:',
-'searchresultshead'        => 'Cari',
-'resultsperpage'           => 'Jumlah padanan bagi setiap halaman:',
-'contextlines'             => 'Bilangan baris untuk dipaparkan bagi setiap capaian:',
-'contextchars'             => 'Bilangan askara konteks bagi setiap baris:',
-'stub-threshold'           => 'Ambang bagi pemformatan <a href="#" class="stub">pautan ke rencana ringkas</a> (bait):',
-'recentchangesdays'        => 'Bilangan hari dalam perubahan terkini:',
-'recentchangescount'       => 'Bilangan suntingan dalam perubahan terkini:',
-'savedprefs'               => 'Keutamaan anda disimpan.',
-'timezonelegend'           => 'Zon waktu',
-'timezonetext'             => 'Beza waktu dalam jam antara waktu tempatan anda dengan waktu UTC (8 untuk Kuala Lumpur).',
-'localtime'                => 'Waktu tempatan',
-'timezoneoffset'           => 'Imbangan¹',
-'servertime'               => 'Waktu pelayan',
-'guesstimezone'            => 'Gunakan tetapan pelayar saya',
-'allowemail'               => 'Benarkan e-mel daripada pengguna lain',
-'prefs-searchoptions'      => 'Pilihan gelintar',
-'prefs-namespaces'         => 'Ruang nama',
-'defaultns'                => 'Cari dalam ruang nama ini secara lalai:',
-'default'                  => 'lalai',
-'files'                    => 'Fail',
+'preferences'               => 'Keutamaan',
+'mypreferences'             => 'Keutamaan saya',
+'prefs-edits'               => 'Jumlah suntingan:',
+'prefsnologin'              => 'Belum log masuk',
+'prefsnologintext'          => 'Anda hendaklah <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} log masuk]</span> terlebih dahulu untuk menetapkan keutamaan.',
+'prefsreset'                => 'Keutamaan anda telah diset semula dari storan.',
+'qbsettings'                => 'Bar pantas',
+'qbsettings-none'           => 'Tiada',
+'qbsettings-fixedleft'      => 'Tetap sebelah kiri',
+'qbsettings-fixedright'     => 'Tetap sebelah kanan',
+'qbsettings-floatingleft'   => 'Berubah-ubah sebelah kiri',
+'qbsettings-floatingright'  => 'Berubah-ubah sebelah kanan',
+'changepassword'            => 'Tukar kata laluan',
+'skin'                      => 'Rupa',
+'skin-preview'              => 'Pratonton',
+'math'                      => 'Matematik',
+'dateformat'                => 'Format tarikh',
+'datedefault'               => 'Tiada keutamaan',
+'datetime'                  => 'Tarikh dan waktu',
+'math_failure'              => 'Gagal menghurai',
+'math_unknown_error'        => 'ralat yang tidak dikenali',
+'math_unknown_function'     => 'fungsi yang tidak dikenali',
+'math_lexing_error'         => "ralat ''lexing''",
+'math_syntax_error'         => 'ralat sintaks',
+'math_image_error'          => 'penukaran PNG gagal; sila pastikan bahawa latex, dvips, gs dan convert dipasang dengan betul',
+'math_bad_tmpdir'           => 'Direktori temp matematik tidak boleh ditulis atau dicipta',
+'math_bad_output'           => 'Direktori output matematik tidak boleh ditulis atau dicipta',
+'math_notexvc'              => 'Atur cara texvc hilang; sila lihat fail math/README untuk maklumat konfigurasi.',
+'prefs-personal'            => 'Profil',
+'prefs-rc'                  => 'Perubahan terkini',
+'prefs-watchlist'           => 'Senarai pantau',
+'prefs-watchlist-days'      => 'Had bilangan hari dalam senarai pantau:',
+'prefs-watchlist-days-max'  => '(had 7 hari)',
+'prefs-watchlist-edits'     => 'Had maksimum perubahan untuk ditunjukkan dalam senarai pantau penuh:',
+'prefs-watchlist-edits-max' => '(had: 1000)',
+'prefs-misc'                => 'Pelbagai',
+'prefs-resetpass'           => 'Tukar kata laluan',
+'saveprefs'                 => 'Simpan',
+'resetprefs'                => 'Set semula',
+'textboxsize'               => 'Menyunting',
+'prefs-edit-boxsize'        => 'Saiz kotak sunting.',
+'rows'                      => 'Baris:',
+'columns'                   => 'Lajur:',
+'searchresultshead'         => 'Cari',
+'resultsperpage'            => 'Jumlah padanan bagi setiap halaman:',
+'contextlines'              => 'Bilangan baris untuk dipaparkan bagi setiap capaian:',
+'contextchars'              => 'Bilangan askara konteks bagi setiap baris:',
+'stub-threshold'            => 'Ambang bagi pemformatan <a href="#" class="stub">pautan ke rencana ringkas</a> (bait):',
+'recentchangesdays'         => 'Bilangan hari dalam perubahan terkini:',
+'recentchangesdays-max'     => '(had $1 hari)',
+'recentchangescount'        => 'Bilangan suntingan yang dipaparkan dalam perubahan terkini, sejarah laman, dan log, ketika lalai:',
+'savedprefs'                => 'Keutamaan anda disimpan.',
+'timezonelegend'            => 'Zon waktu',
+'timezonetext'              => 'Beza waktu dalam jam antara waktu tempatan anda dengan waktu UTC (8 untuk Kuala Lumpur).',
+'localtime'                 => 'Waktu tempatan:',
+'timezoneselect'            => 'Zon waktu:',
+'timezoneuseserverdefault'  => 'Gunakan nilai pelayan',
+'timezoneuseoffset'         => 'Lain-lain (nyatakan imbangan)',
+'timezoneoffset'            => 'Imbangan¹:',
+'servertime'                => 'Waktu pelayan:',
+'guesstimezone'             => 'Gunakan tetapan pelayar saya',
+'allowemail'                => 'Benarkan e-mel daripada pengguna lain',
+'prefs-searchoptions'       => 'Pilihan gelintar',
+'prefs-namespaces'          => 'Ruang nama',
+'defaultns'                 => 'Cari dalam ruang nama ini secara lalai:',
+'default'                   => 'lalai',
+'files'                     => 'Fail',
 
 # User rights
 'userrights'                  => 'Pengurusan hak pengguna', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Urus kumpulan pengguna',
 'userrights-user-editname'    => 'Masukkan nama pengguna:',
 'editusergroup'               => 'Sunting Kumpulan Pengguna',
-'editinguser'                 => "Mengubah hak pengguna '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Mengubah hak pengguna '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Ubah kumpulan pengguna',
 'saveusergroups'              => 'Simpan Kumpulan Pengguna',
 'userrights-groupsmember'     => 'Ahli bagi:',
@@ -1082,6 +1175,8 @@ daripada satu kata kunci (hanya laman yang mengandungi kesemua kata kunci akan d
 'right-minoredit'            => 'Menanda suntingan kecil',
 'right-move'                 => 'Memindah laman',
 'right-move-subpages'        => 'Memindahkan laman berserta sublaman',
+'right-move-rootuserpages'   => 'Memindahkan laman induk pengguna',
+'right-movefile'             => 'Memindahkan fail',
 'right-suppressredirect'     => 'Memindahkan sesebuah laman tanpa mencipta lencongan',
 'right-upload'               => 'Memuat naik fail',
 'right-reupload'             => 'Menulis ganti fail sedia ada',
@@ -1132,9 +1227,46 @@ daripada satu kata kunci (hanya laman yang mengandungi kesemua kata kunci akan d
 'rightslogentry' => 'menukar keahlian kumpulan bagi $1 daripada $2 kepada $3',
 'rightsnone'     => '(tiada)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'membaca laman ini',
+'action-edit'                 => 'menyunting laman ini',
+'action-createpage'           => 'mencipta laman',
+'action-createtalk'           => 'mencipta laman perbincangan',
+'action-createaccount'        => 'mencipta akaun pengguna ini',
+'action-minoredit'            => 'menanda suntingan ini sebagai suntingan kecil',
+'action-move'                 => 'memindahkan laman ini',
+'action-move-subpages'        => 'memindahkan laman ini dan sublaman-sublamannya',
+'action-move-rootuserpages'   => 'memindahkan laman induk pengguna',
+'action-movefile'             => 'pindah fail ini',
+'action-upload'               => 'memuat naik fail ini',
+'action-reupload'             => 'menulis ganti fail ini',
+'action-reupload-shared'      => 'mengatasi fail dari gedung kongsi ini',
+'action-upload_by_url'        => 'memuat naik fail ini dari alamat URL',
+'action-writeapi'             => 'menggunakan API tulis',
+'action-delete'               => 'menghapuskan laman ini',
+'action-deleterevision'       => 'menghapuskan semakan ini',
+'action-deletedhistory'       => 'melihat sejarah yang telah dihapuskan bagi laman ini',
+'action-browsearchive'        => 'menggelintar laman-laman yang telah dihapuskan',
+'action-undelete'             => 'menyahhapuskan laman ini',
+'action-suppressrevision'     => 'menyemak semula dan memulihkan semakan tersembunyi ini',
+'action-suppressionlog'       => 'melihat log sulit ini',
+'action-block'                => 'menyekat pengguna ini daripada menyunting',
+'action-protect'              => 'mengubah aras perlindungan bagi laman ini',
+'action-import'               => 'mengimport laman ini dari wiki lain',
+'action-importupload'         => 'mengimport laman ini dengan memuat naik fail',
+'action-patrol'               => 'menanda ronda suntingan orang lain',
+'action-autopatrol'           => 'menanda ronda suntingan anda sendiri',
+'action-unwatchedpages'       => 'melihat senarai laman tidak dipantau',
+'action-trackback'            => 'mengirim jejak balik',
+'action-mergehistory'         => 'menggabungkan sejarah laman ini',
+'action-userrights'           => 'mengubah semua hak pengguna',
+'action-userrights-interwiki' => 'mengubah hak pengguna dari wiki lain',
+'action-siteadmin'            => 'mengunci atau membuka kunci pangkalan data wiki ini',
+
 # Recent changes
 'nchanges'                          => '$1 perubahan',
 'recentchanges'                     => 'Perubahan terkini',
+'recentchanges-legend'              => 'Pilihan perubahan terkini',
 'recentchangestext'                 => 'Jejaki perubahan terkini dalam {{SITENAME}} pada laman ini.',
 'recentchanges-feed-description'    => 'Jejaki perubahan terkini dalam {{SITENAME}} pada suapan ini.',
 'rcnote'                            => "Yang berikut ialah '''$1''' perubahan terakhir sejak '''$2''' hari yang lalu sehingga $5, $4.",
@@ -1158,6 +1290,8 @@ daripada satu kata kunci (hanya laman yang mengandungi kesemua kata kunci akan d
 'rc_categories'                     => 'Hadkan kepada kategori (asingkan dengan "|")',
 'rc_categories_any'                 => 'Semua',
 'newsectionsummary'                 => '/* $1 */ bahagian baru',
+'rc-enhanced-expand'                => 'Papar butiran (JavaScript diperlukan)',
+'rc-enhanced-hide'                  => 'Sembunyi butiran',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Perubahan berkaitan',
@@ -1178,18 +1312,18 @@ terlebih dahulu untuk memuat naik fail.',
 'upload_directory_missing'    => 'Direktori muat naik ($1) hilang dan tidak dapat dicipta oleh pelayan web.',
 'upload_directory_read_only'  => 'Direktori muat naik ($1) tidak boleh ditulis oleh pelayan web.',
 'uploaderror'                 => 'Ralat muat naik',
-'uploadtext'                  => "Gunakan borang di bawah untuk memuat naik fail. Untuk melihat atau mencari imej yang sudah dimuat naik, sila ke [[Special:ImageList|senarai fail yang dimuat naik]]. Muat naik dan penghapusan akan direkodkan dalam [[Special:Log/upload|log muat naik]].
+'uploadtext'                  => "Gunakan borang di bawah untuk memuat naik fail. Untuk melihat atau mencari imej yang sudah dimuat naik, sila ke [[Special:FileList|senarai fail yang dimuat naik]]. Muat naik dan penghapusan akan direkodkan dalam [[Special:Log/upload|log muat naik]].
 
 Untuk menyertakan imej tersebut dalam sesebuah laman, sila masukkan teks
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fail.jpg]]</nowiki>''' atau
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fail.png|teks alternatif]]</nowiki>'''. Anda juga boleh menggunakan
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fail.jpg]]</nowiki>''' atau
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fail.png|teks alternatif]]</nowiki>'''. Anda juga boleh menggunakan
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fail.ogg]]</nowiki>''' untuk memaut secara terus.",
 'upload-permitted'            => 'Jenis fail yang dibenarkan: $1.',
 'upload-preferred'            => 'Jenis fail yang diutamakan: $1.',
 'upload-prohibited'           => 'Jenis fail yang dilarang: $1.',
 'uploadlog'                   => 'log muat naik',
 'uploadlogpage'               => 'Log muat naik',
-'uploadlogpagetext'           => 'Berikut ialah senarai terkini bagi fail yang dimuat naik.',
+'uploadlogpagetext'           => 'Yang berikut ialah senarai terkini bagi fail yang dimuat naik.',
 'filename'                    => 'Nama fail',
 'filedesc'                    => 'Ringkasan',
 'fileuploadsummary'           => 'Ringkasan:',
@@ -1209,20 +1343,21 @@ Untuk menyertakan imej tersebut dalam sesebuah laman, sila masukkan teks
 'large-file'                  => 'Saiz fail ini ialah $2. Anda dinasihati supaya memuat naik fail yang tidak melebihi $1.',
 'largefileserver'             => 'Fail ini telah melebihi had muat naik pelayan web.',
 'emptyfile'                   => 'Fail yang dimuat naik adalah kosong. Ini mungkin disebabkan oleh kesilapan menaip nama fail. Sila pastikan bahawa anda betul-betul mahu memuat naik fail ini.',
-'fileexists'                  => 'Sebuah fail dengan nama ini telah pun wujud. Sila semak <strong><tt>$1</tt></strong> sekiranya anda tidak pasti bahawa anda mahu menukarnya atau tidak.',
-'filepageexists'              => 'Sebuah lama (bukan imej) dengan nama ini telah pun wujud. Sila semak <strong><tt>$1</tt></strong> sekiranya anda tidak pasti bahawa anda mahu menukarnya atau tidak.',
-'fileexists-extension'        => 'Sebuah fail dengan nama yang sama telah pun wujud:<br />
-Nama fail yang dimuat naik: <strong><tt>$1</tt></strong><br />
-Nama fail yang sedia ada: <strong><tt>$2</tt></strong><br />
-Sila pilih nama lain.',
+'fileexists'                  => "Sebuah fail dengan nama ini telah pun wujud. Sila semak '''<tt>$1</tt>''' sekiranya anda tidak pasti bahawa anda mahu menukarnya atau tidak.",
+'filepageexists'              => "Sebuah lama (bukan imej) dengan nama ini telah pun wujud. Sila semak '''<tt>$1</tt>''' sekiranya anda tidak pasti bahawa anda mahu menukarnya atau tidak.",
+'fileexists-extension'        => "Sebuah fail dengan nama yang sama telah pun wujud:<br />
+Nama fail yang dimuat naik: '''<tt>$1</tt>'''<br />
+Nama fail yang sedia ada: '''<tt>$2</tt>'''<br />
+Sila pilih nama lain.",
 'fileexists-thumb'            => "<center>'''Imej sedia ada'''</center>",
-'fileexists-thumbnail-yes'    => 'Fail ini kelihatan seperti sebuah imej yang telah dikecilkan <i>(imej ringkas)</i>. Sila semak fail <strong><tt>$1</tt></strong>.<br />
-Jika fail yang disemak itu adalah sama dengan yang saiz asal, maka anda tidak perlu memuat naik imej ringkas tambahan.',
-'file-thumbnail-no'           => 'Nama fail ini bermula dengan <strong><tt>$1</tt></strong>. Barangkali ia adalah sebuah imej yang telah dikecilkan <i>(imej ringkas)</i>.
-Jika anda memiliki imej ini dalam leraian penuh, sila muat naik fail tersebut. Sebaliknya, sila tukar nama fail ini.',
-'fileexists-forbidden'        => 'Sebuah fail dengan nama ini telah pun wujud. Sila berundur dan muat naik fail ini dengan nama lain. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Sebuah fail dengan nama ini telah pun wujud dalam gedung fail kongsi. Jika anda masih mahu memuat naik fail ini, sila kembali ke borang muat naik dan gunakan nama lain. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Fail ini kelihatan seperti sebuah imej yang telah dikecilkan ''(imej ringkas)''. Sila semak fail '''<tt>$1</tt>'''.<br />
+Jika fail yang disemak itu adalah sama dengan yang saiz asal, maka anda tidak perlu memuat naik imej ringkas tambahan.",
+'file-thumbnail-no'           => "Nama fail ini bermula dengan '''<tt>$1</tt>'''. Barangkali ia adalah sebuah imej yang telah dikecilkan ''(imej ringkas)''.
+Jika anda memiliki imej ini dalam leraian penuh, sila muat naik fail tersebut. Sebaliknya, sila tukar nama fail ini.",
+'fileexists-forbidden'        => 'Sebuah fail dengan nama ini telah pun wujud, dan tidak boleh ditulis ganti. Jika anda masih mahu memuat naik fail ini, sila berundur dan muat naik fail ini dengan nama lain. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Sebuah fail dengan nama ini telah pun wujud dalam gedung fail kongsi. Jika anda masih mahu memuat naik fail ini, sila kembali ke borang muat naik dan gunakan nama lain. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Fail ini adalah salinan bagi {{PLURAL:$1|fail|fail-fail}} berikut:',
+'file-deleted-duplicate'      => 'Sebuah fail yang serupa dengan fail ini ([[$1]]) telah pun dihapuskan sebelum ini. Anda seharusnya memeriksa sejarah penghapusan fail itu terlebih dahulu sebelum memuat naiknya sekali lagi.',
 'successfulupload'            => 'Muat naik berjaya',
 'uploadwarning'               => 'Amaran muat naik',
 'savefile'                    => 'Simpan fail',
@@ -1242,7 +1377,7 @@ Jika anda memiliki imej ini dalam leraian penuh, sila muat naik fail tersebut. S
 
 Anda harus mempertimbangkan perlunya memuat naik fail ini.
 Untuk rujukan, yang berikut ialah log penghapusan bagi fail ini:",
-'filename-bad-prefix'         => 'Nama bagi fail yang dimuat naik bermula dengan <strong>"$1"</strong>, yang mana merupakan nama yang tidak deskriptif yang biasanya ditetapkan oleh kamera digital secara automatik. Sila berikan nama yang lebih deskriptif bagi fail tersebut.',
+'filename-bad-prefix'         => "Nama bagi fail yang dimuat naik bermula dengan '''\"\$1\"''', yang mana merupakan nama yang tidak deskriptif yang biasanya ditetapkan oleh kamera digital secara automatik. Sila berikan nama yang lebih deskriptif bagi fail tersebut.",
 
 'upload-proto-error'      => 'Protokol salah',
 'upload-proto-error-text' => 'Muat naik jauh memerlukan URL yang dimulakan dengan <code>http://</code> atau <code>ftp://</code>.',
@@ -1263,19 +1398,20 @@ Untuk rujukan, yang berikut ialah log penghapusan bagi fail ini:",
 'upload_source_url'  => ' (URL yang boleh diakses oleh orang awam)',
 'upload_source_file' => ' (fail dalam komputer anda)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Laman khas ini memaparkan senarai fail yang telah dimuat naik.
+# Special:ListFiles
+'listfiles-summary'     => 'Laman khas ini memaparkan senarai fail yang telah dimuat naik.
 Klik di atas mana-mana lajur yang berkenaan untuk menukar tertib susunan.',
-'imagelist_search_for'  => 'Cari nama imej:',
+'listfiles_search_for'  => 'Cari nama imej:',
 'imgfile'               => 'fail',
-'imagelist'             => 'Senarai fail',
-'imagelist_date'        => 'Tarikh',
-'imagelist_name'        => 'Nama',
-'imagelist_user'        => 'Pengguna',
-'imagelist_size'        => 'Saiz',
-'imagelist_description' => 'Huraian',
-
-# Image description page
+'listfiles'             => 'Senarai fail',
+'listfiles_date'        => 'Tarikh',
+'listfiles_name'        => 'Nama',
+'listfiles_user'        => 'Pengguna',
+'listfiles_size'        => 'Saiz',
+'listfiles_description' => 'Huraian',
+'listfiles_count'       => 'Versi',
+
+# File description page
 'filehist'                       => 'Sejarah fail',
 'filehist-help'                  => 'Klik pada tarikh/waktu untuk melihat rupa fail tersebut pada waktu silam.',
 'filehist-deleteall'             => 'hapuskan semua',
@@ -1283,19 +1419,25 @@ Klik di atas mana-mana lajur yang berkenaan untuk menukar tertib susunan.',
 'filehist-revert'                => 'balik',
 'filehist-current'               => 'semasa',
 'filehist-datetime'              => 'Tarikh/Waktu',
+'filehist-thumb'                 => 'Imej ringkas',
+'filehist-thumbtext'             => 'Imej ringkas bagi versi pada $1',
+'filehist-nothumb'               => 'Tiada imej ringkas',
 'filehist-user'                  => 'Pengguna',
 'filehist-dimensions'            => 'Ukuran',
 'filehist-filesize'              => 'Saiz fail',
 'filehist-comment'               => 'Komen',
-'imagelinks'                     => 'Pautan',
+'imagelinks'                     => 'Pautan fail',
 'linkstoimage'                   => '{{PLURAL:$1|Laman|$1 buah laman}} berikut mengandungi pautan ke fail ini:',
+'linkstoimage-more'              => 'Lebih daripada $1 laman mengandungi pautan ke fail ini.
+Yang berikut ialah {{PLURAL:$1||$1}} pautan pertama ke fail ini.
+Anda boleh melihat [[Special:WhatLinksHere/$2|senarai penuh]].',
 'nolinkstoimage'                 => 'Tiada laman yang mengandungi pautan ke fail ini.',
 'morelinkstoimage'               => 'Lihat [[Special:WhatLinksHere/$1|semua pautan]] ke fail ini.',
 'redirectstofile'                => '{{PLURAL:$1|Fail|$1 buah fail}} berikut melencong ke fail ini:',
-'duplicatesoffile'               => '{{PLURAL:$1|Fail|$1 buah fail}} berikut adalah salinan bagi fail ini:',
+'duplicatesoffile'               => '{{PLURAL:$1|Fail|$1 buah fail}} berikut adalah salinan bagi fail ini ([[Special:FileDuplicateSearch/$2|butiran lanjut]]):',
 'sharedupload'                   => 'Fail ini adalah fail muat naik kongsi dan boleh digunakan oleh projek lain.',
 'shareduploadwiki'               => 'Sila lihat $1 untuk maklumat lanjut.',
-'shareduploadwiki-desc'          => 'Yang berikut ialah keterangan yang diambil daripada $1nya di gedung kongsi.',
+'shareduploadwiki-desc'          => 'Yang berikut ialah keterangan yang diambil daripada $1nya.',
 'shareduploadwiki-linktext'      => 'laman keterangan fail',
 'shareduploadduplicate'          => 'Fail ini adalah salinan bagi $1 di gedung kongsi.',
 'shareduploadduplicate-linktext' => 'fail lain',
@@ -1319,7 +1461,7 @@ Klik di atas mana-mana lajur yang berkenaan untuk menukar tertib susunan.',
 # File deletion
 'filedelete'                  => 'Hapuskan $1',
 'filedelete-legend'           => 'Hapuskan fail',
-'filedelete-intro'            => "Anda sedang menghapuskan '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Anda sudah hendak menghapuskan fail '''[[Media:$1|$1]]''' berserta semua sejarahnya.",
 'filedelete-intro-old'        => '<span class="plainlinks">Anda sedang menghapuskan versi \'\'\'[[Media:$1|$1]]\'\'\' pada [$4 $3, $2].</span>',
 'filedelete-comment'          => 'Sebab hapus:',
 'filedelete-submit'           => 'Hapus',
@@ -1327,7 +1469,6 @@ Klik di atas mana-mana lajur yang berkenaan untuk menukar tertib susunan.',
 'filedelete-success-old'      => "Versi '''[[Media:$1|$1]]''' pada $3, $2 telah dihapuskan.",
 'filedelete-nofile'           => "'''$1''' tidak wujud.",
 'filedelete-nofile-old'       => "Tiada versi arkib bagi '''$1''' dengan sifat-sifat yang dinyatakan.",
-'filedelete-iscurrent'        => 'Anda telah mencuba untuk menghapuskan versi terkini bagi fail ini. Sila balikkannya kepada versi yang lama terlebih dahulu.',
 'filedelete-otherreason'      => 'Sebab lain/tambahan:',
 'filedelete-reason-otherlist' => 'Sebab lain',
 'filedelete-reason-dropdown'  => '
@@ -1355,26 +1496,31 @@ Klik di atas mana-mana lajur yang berkenaan untuk menukar tertib susunan.',
 
 # Random page
 'randompage'         => 'Laman rawak',
-'randompage-nopages' => 'Tiada laman dalam ruang nama ini.',
+'randompage-nopages' => 'Tiada laman dalam ruang nama "$1".',
 
 # Random redirect
 'randomredirect'         => 'Lencongan rawak',
-'randomredirect-nopages' => 'Tiada lencongan dalam ruang nama ini.',
+'randomredirect-nopages' => 'Tiada lencongan dalam ruang nama "$1".',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Statistik {{SITENAME}}',
-'userstats'              => 'Statistik pengguna',
-'sitestatstext'          => "Terdapat sejumlah '''\$1''' laman dalam pangkalan data kami. Jumlah ini termasuklah laman \"perbincangan\", laman mengenai {{SITENAME}}, laman ringkas,
-lencongan, dan lain-lain yang tidak dikira sebagai laman kandungan. Dengan mengecualikan laman-laman ini, terdapat sejumlah '''\$2''' laman yang barangkali dianggap sah.
-
-'''\$8''' buah fail telah dimuat naik.
-
-Terdapat sejumlah '''\$3''' paparan laman dan '''\$4''' penyuntingan dilakukan sejak {{SITENAME}} dibuka. Secara purata, terdapat '''\$5''' suntingan bagi setiap laman, dan '''\$6''' paparan bagi setiap suntingan.
-
-Jumlah [http://www.mediawiki.org/wiki/Manual:Job_queue tugas yang tertunggak] ialah '''\$7'''.",
-'userstatstext'          => "Terdapat '''$1''' pengguna berdaftar. '''$2''' (atau '''$4''') daripadanya mempunyai hak $5.",
-'statistics-mostpopular' => 'Laman dilihat terbanyak',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Statistik laman',
+'statistics-header-edits'      => 'Statistik suntingan',
+'statistics-header-views'      => 'Statistics pandangan',
+'statistics-header-users'      => 'Statistik pengguna',
+'statistics-articles'          => 'Laman kandungan',
+'statistics-pages'             => 'Laman',
+'statistics-pages-desc'        => 'Semua laman di wiki ini, termasuk laman perbincangan, lencongan, dan lain-lain.',
+'statistics-files'             => 'Fail dimuat naik',
+'statistics-edits'             => 'Suntingan laman sejak {{SITENAME}} dibuka',
+'statistics-edits-average'     => 'Purata suntingan bagi setiap laman',
+'statistics-views-total'       => 'Jumlah pandangan',
+'statistics-views-peredit'     => 'Pandangan setiap suntingan',
+'statistics-jobqueue'          => 'Jumlah [http://www.mediawiki.org/wiki/Manual:Job_queue tugas yang tertunggak]',
+'statistics-users'             => '[[Special:ListUsers|Pengguna]] berdaftar',
+'statistics-users-active'      => 'Pengguna aktif',
+'statistics-users-active-desc' => 'Pengguna yang aktif sejak {{PLURAL:$1|semalam|$1 hari lalu}}',
+'statistics-mostpopular'       => 'Laman dilihat terbanyak',
 
 'disambiguations'      => 'Laman penyahtaksaan',
 'disambiguationspage'  => 'Template:disambig',
@@ -1416,7 +1562,8 @@ Jumlah [http://www.mediawiki.org/wiki/Manual:Job_queue tugas yang tertunggak] ia
 'popularpages'            => 'Laman popular',
 'wantedcategories'        => 'Kategori dikehendaki',
 'wantedpages'             => 'Laman dikehendaki',
-'missingfiles'            => 'Fail hilang',
+'wantedfiles'             => 'Fail dikehendaki',
+'wantedtemplates'         => 'Templat dikehendaki',
 'mostlinked'              => 'Laman dipaut terbanyak',
 'mostlinkedcategories'    => 'Kategori dipaut terbanyak',
 'mostlinkedtemplates'     => 'Templat dipaut terbanyak',
@@ -1430,12 +1577,15 @@ Jumlah [http://www.mediawiki.org/wiki/Manual:Job_queue tugas yang tertunggak] ia
 'deadendpagestext'        => 'Laman-laman berikut tidak mengandungi pautan ke laman lain di {{SITENAME}}.',
 'protectedpages'          => 'Laman dilindungi',
 'protectedpages-indef'    => 'Perlindungan tanpa had sahaja',
+'protectedpages-cascade'  => 'Perlindungan separa sahaja',
 'protectedpagestext'      => 'Laman-laman berikut dilindungi daripada pemindahan dan penyuntingan',
 'protectedpagesempty'     => 'Tiada laman yang dilindungi dengan kriteria ini.',
 'protectedtitles'         => 'Tajuk dilindungi',
 'protectedtitlestext'     => 'Tajuk-tajuk berikut dilindungi daripada dicipta',
 'protectedtitlesempty'    => 'Tiada tajuk yang dilindungi yang sepadan dengan kriteria yang diberikan.',
 'listusers'               => 'Senarai pengguna',
+'listusers-editsonly'     => 'Hanya papar pengguna yang telah membuat suntingan',
+'usereditcount'           => '$1 suntingan',
 'newpages'                => 'Laman baru',
 'newpages-username'       => 'Nama pengguna:',
 'ancientpages'            => 'Laman lapuk',
@@ -1459,14 +1609,13 @@ menggunakan URL langsung walaupun ia disenaraikan di sini.</p>',
 'booksources-go'            => 'Pergi',
 'booksources-text'          => 'Yang berikut ialah senarai pautan ke tapak web lain yang menjual buku baru dan terpakai,
 serta mungkin mempunyai maklumat lanjut mengenai buku yang anda cari:',
+'booksources-invalid-isbn'  => 'ISBN yang dinyatakan tidak sah. Sila semak sekali lagi.',
 
 # Special:Log
 'specialloguserlabel'  => 'Pengguna:',
 'speciallogtitlelabel' => 'Tajuk:',
 'log'                  => 'Log',
 'all-logs-page'        => 'Semua log',
-'log-search-legend'    => 'Cari log',
-'log-search-submit'    => 'Pergi',
 'alllogstext'          => 'Yang berikut ialah gabungan bagi semua log yang ada bagi {{SITENAME}}. Anda boleh menapis senarai ini dengan memilih jenis log, nama pengguna (peka huruf besar), atau nama laman yang terjejas (juga peka huruf besar).',
 'logempty'             => 'Tiada item yang sepadan dalam log.',
 'log-title-wildcard'   => 'Cari semua tajuk yang bermula dengan teks ini',
@@ -1477,6 +1626,7 @@ serta mungkin mempunyai maklumat lanjut mengenai buku yang anda cari:',
 'nextpage'          => 'Halaman berikutnya ($1)',
 'prevpage'          => 'Halaman sebelumnya ($1)',
 'allpagesfrom'      => 'Tunjukkan laman bermula pada:',
+'allpagesto'        => 'Tunjukkan laman berakhir pada:',
 'allarticles'       => 'Semua laman',
 'allinnamespace'    => 'Semua laman (ruang nama $1)',
 'allnotinnamespace' => 'Semua laman (bukan dalam ruang nama $1)',
@@ -1496,45 +1646,72 @@ Lihat juga [[Special:WantedCategories|senarai kategori dikehendaki]].',
 'special-categories-sort-count' => 'susun mengikut tertib bilangan',
 'special-categories-sort-abc'   => 'susun mengikut tertib abjad',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Sumbangan dihapuskan',
+
+# Special:LinkSearch
+'linksearch'       => 'Pautan luar',
+'linksearch-pat'   => 'Corak carian:',
+'linksearch-ns'    => 'Ruang nama:',
+'linksearch-ok'    => 'Cari',
+'linksearch-text'  => 'Kad bebas seperti "*.wikipedia.org" dibenarkan.<br />
+Protokol yang disokong: <tt>$1</tt>',
+'linksearch-line'  => '$1 dipaut dari $2',
+'linksearch-error' => 'Kad bebas hanya boleh digunakan pada permulaan nama hos.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Tunjukkan pengguna bermula pada:',
 'listusers-submit'   => 'Tunjuk',
 'listusers-noresult' => 'Tiada pengguna dijumpai.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Log akaun baru',
+'newuserlogpagetext'          => 'Yang berikut ialah log penciptaan pengguna.',
+'newuserlog-byemail'          => 'kata laluan dihantar melalui e-mel',
+'newuserlog-create-entry'     => 'Pengguna baru',
+'newuserlog-create2-entry'    => 'membuka akaun $1',
+'newuserlog-autocreate-entry' => 'Akaun dibuka secara automatik',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Hak kumpulan pengguna',
-'listgrouprights-summary'  => 'Yang berikut ialah senarai kumpulan pengguna yang ditubuhkan di wiki ini dengan hak-hak masing-masing.
+'listgrouprights'                 => 'Hak kumpulan pengguna',
+'listgrouprights-summary'         => 'Yang berikut ialah senarai kumpulan pengguna yang ditubuhkan di wiki ini dengan hak-hak masing-masing.
 Anda boleh mengetahui [[{{MediaWiki:Listgrouprights-helppage}}|maklumat tambahan]] mengenai setiap hak.',
-'listgrouprights-group'    => 'Kumpulan',
-'listgrouprights-rights'   => 'Hak',
-'listgrouprights-helppage' => 'Help:Hak kumpulan',
-'listgrouprights-members'  => '(senarai ahli)',
+'listgrouprights-group'           => 'Kumpulan',
+'listgrouprights-rights'          => 'Hak',
+'listgrouprights-helppage'        => 'Help:Hak kumpulan',
+'listgrouprights-members'         => '(senarai ahli)',
+'listgrouprights-addgroup'        => 'Boleh menambah kumpulan: $1',
+'listgrouprights-removegroup'     => 'Boleh membuang kumpulan: $1',
+'listgrouprights-addgroup-all'    => 'Boleh menambah semua kumpulan',
+'listgrouprights-removegroup-all' => 'Boleh membuang semua kumpulan',
 
 # E-mail user
-'mailnologin'     => 'Tiada alamat e-mel',
-'mailnologintext' => 'Anda perlu [[Special:UserLogin|log masuk]]
+'mailnologin'      => 'Tiada alamat e-mel',
+'mailnologintext'  => 'Anda perlu [[Special:UserLogin|log masuk]]
 terlebih dahulu dan mempunyai alamat e-mel yang sah dalam
 [[Special:Preferences|laman keutamaan]] untuk mengirim e-mel kepada pengguna lain.',
-'emailuser'       => 'Kirim e-mel kepada pengguna ini',
-'emailpage'       => 'E-mel pengguna',
-'emailpagetext'   => 'Gunakan borang berikut untuk mengirim pesanan e-mel kepada pengguna ini.
+'emailuser'        => 'Kirim e-mel kepada pengguna ini',
+'emailpage'        => 'E-mel pengguna',
+'emailpagetext'    => 'Gunakan borang berikut untuk mengirim pesanan e-mel kepada pengguna ini.
 
 Alamat e-mel yang ditetapkan dalam [[Special:Preferences|keutamaan anda]] akan digunakan sebagai alamat "Daripada" dalam e-mel tersebut supaya si penerima boleh membalasnya.',
-'usermailererror' => 'Objek Mail memulangkan ralat:',
-'defemailsubject' => 'E-mel {{SITENAME}}',
-'noemailtitle'    => 'Tiada alamat e-mel',
-'noemailtext'     => 'Pengguna ini tidak menetapkan alamat e-mel yang sah,
-atau telah memilih untuk tidak menerima e-mel daripada pengguna lain.',
-'emailfrom'       => 'Daripada:',
-'emailto'         => 'Kepada:',
-'emailsubject'    => 'Perkara:',
-'emailmessage'    => 'Pesanan:',
-'emailsend'       => 'Kirim',
-'emailccme'       => 'Kirim salinan mesej ini kepada saya.',
-'emailccsubject'  => 'Salinan bagi mesej anda kepada $1: $2',
-'emailsent'       => 'E-mel dikirim',
-'emailsenttext'   => 'E-mel anda telah dikirim.',
-'emailuserfooter' => 'E-mel ini telah dikirim oleh $1 kepada $2 menggunakan alat "E-mel pengguna" di {{SITENAME}}.',
+'usermailererror'  => 'Objek Mail memulangkan ralat:',
+'defemailsubject'  => 'E-mel {{SITENAME}}',
+'noemailtitle'     => 'Tiada alamat e-mel',
+'noemailtext'      => 'Pengguna ini tidak menetapkan alamat e-mel yang sah.',
+'nowikiemailtitle' => 'E-mel tidak dibenarkan',
+'nowikiemailtext'  => 'Pengguna ini tidak mahu menerima e-mel daripada pengguna lain.',
+'email-legend'     => 'Kirim e-mel kepada pengguna {{SITENAME}} lain',
+'emailfrom'        => 'Daripada:',
+'emailto'          => 'Kepada:',
+'emailsubject'     => 'Perkara:',
+'emailmessage'     => 'Pesanan:',
+'emailsend'        => 'Kirim',
+'emailccme'        => 'Kirim salinan mesej ini kepada saya.',
+'emailccsubject'   => 'Salinan bagi mesej anda kepada $1: $2',
+'emailsent'        => 'E-mel dikirim',
+'emailsenttext'    => 'E-mel anda telah dikirim.',
+'emailuserfooter'  => 'E-mel ini telah dikirim oleh $1 kepada $2 menggunakan alat "E-mel pengguna" di {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Senarai pantau',
@@ -1569,12 +1746,7 @@ Jika anda mahu membuang laman tersebut daripada senarai pantau, klik \"Nyahpanta
 'iteminvalidname'      => "Terdapat masalah dengan item '$1', nama tidak sah...",
 'wlnote'               => "Yang berikut ialah '''$1''' perubahan terakhir sejak '''$2''' jam yang lalu.",
 'wlshowlast'           => 'Tunjukkan $1 jam / $2 hari yang lalu / $3.',
-'watchlist-show-bots'  => 'Papar suntingan bot',
-'watchlist-hide-bots'  => 'Sembunyi suntingan bot',
-'watchlist-show-own'   => 'Papar suntingan saya',
-'watchlist-hide-own'   => 'Sembunyi suntingan saya',
-'watchlist-show-minor' => 'Papar suntingan kecil',
-'watchlist-hide-minor' => 'Sembunyi suntingan kecil',
+'watchlist-options'    => 'Pilihan senarai pantau',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Memantau...',
@@ -1614,82 +1786,100 @@ Untuk mengubah tetapan senarai pantau anda, sila kunjungi
 Maklum balas dan bantuan:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Hapus laman',
-'confirm'                     => 'Sahkan',
-'excontent'                   => "kandungan: '$1'",
-'excontentauthor'             => "Kandungan: '$1' (dan satu-satunya penyumbang ialah '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "kandungan sebelum pengosongan ialah: '$1'",
-'exblank'                     => 'laman tersebut kosong',
-'delete-confirm'              => 'Hapus "$1"',
-'delete-legend'               => 'Hapus',
-'historywarning'              => '<b>Amaran</b>: Laman yang ingin anda hapuskan mengandungi sejarah:',
-'confirmdeletetext'           => 'Anda sudah hendak menghapuskan sebuah laman berserta semua sejarahnya.
+# Delete
+'deletepage'             => 'Hapus laman',
+'confirm'                => 'Sahkan',
+'excontent'              => "kandungan: '$1'",
+'excontentauthor'        => "Kandungan: '$1' (dan satu-satunya penyumbang ialah '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "kandungan sebelum pengosongan ialah: '$1'",
+'exblank'                => 'laman tersebut kosong',
+'delete-confirm'         => 'Hapus "$1"',
+'delete-legend'          => 'Hapus',
+'historywarning'         => '<b>Amaran</b>: Laman yang ingin anda hapuskan mengandungi sejarah:',
+'confirmdeletetext'      => 'Anda sudah hendak menghapuskan sebuah laman berserta semua sejarahnya.
 Sila sahkan bahawa anda memang hendak berbuat demikian, anda faham akan
 akibatnya, dan perbuatan anda mematuhi [[{{MediaWiki:Policy-url}}|dasar kami]].',
-'actioncomplete'              => 'Tindakan berjaya',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" telah dihapuskan.
+'actioncomplete'         => 'Tindakan berjaya',
+'deletedtext'            => '"<nowiki>$1</nowiki>" telah dihapuskan.
 Sila lihat $2 untuk rekod penghapusan terkini.',
-'deletedarticle'              => 'menghapuskan "[[$1]]"',
-'suppressedarticle'           => 'menahan "[[$1]]"',
-'dellogpage'                  => 'Log penghapusan',
-'dellogpagetext'              => 'Yang berikut ialah senarai penghapusan terkini.',
-'deletionlog'                 => 'log penghapusan',
-'reverted'                    => 'Dibalikkan kepada semakan sebelumnya',
-'deletecomment'               => 'Sebab penghapusan:',
-'deleteotherreason'           => 'Sebab lain/tambahan:',
-'deletereasonotherlist'       => 'Sebab lain',
-'deletereason-dropdown'       => '
+'deletedarticle'         => 'menghapuskan "[[$1]]"',
+'suppressedarticle'      => 'menahan "[[$1]]"',
+'dellogpage'             => 'Log penghapusan',
+'dellogpagetext'         => 'Yang berikut ialah senarai penghapusan terkini.',
+'deletionlog'            => 'log penghapusan',
+'reverted'               => 'Dibalikkan kepada semakan sebelumnya',
+'deletecomment'          => 'Sebab penghapusan:',
+'deleteotherreason'      => 'Sebab lain/tambahan:',
+'deletereasonotherlist'  => 'Sebab lain',
+'deletereason-dropdown'  => '
 * Sebab-sebab lazim
 ** Permintaan pengarang
 ** Melanggar hak cipta
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Ubah sebab-sebab hapus',
-'delete-toobig'               => 'Laman ini mempunyai sejarah yang besar, iaitu melebihi $1 jumlah semakan. Oleh itu, laman ini dilindungi daripada dihapuskan untuk mengelak kerosakan di {{SITENAME}} yang tidak disengajakan.',
-'delete-warning-toobig'       => 'Laman ini mempunyai sejarah yang besar, iaitu melebihi $1 jumlah semakan. Menghapuskannya boleh mengganggu perjalanan pangkalan data {{SITENAME}}. Sila berhati-hati.',
-'rollback'                    => 'Undurkan suntingan.',
-'rollback_short'              => 'Undur',
-'rollbacklink'                => 'undur',
-'rollbackfailed'              => 'Pengunduran gagal',
-'cantrollback'                => 'Suntingan tersebut tidak dapat dibalikkan: penyumbang terakhir adalah satu-satunya pengarang bagi rencana ini.',
-'alreadyrolled'               => 'Tidak dapat membalikkan suntingan terakhir bagi [[:$1]]
-oleh [[User:$2|$2]] ([[User talk:$2|Perbincangan]]); terdapat pengguna yang telah berbuat demikian.
-
-Suntingan terakhir telah dibuat oleh [[User:$3|$3]] ([[User talk:$3|Perbincangan]]).',
-'editcomment'                 => 'Komen suntingan: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Membalikkan suntingan oleh [[Special:Contributions/$2|$2]] ([[User talk:$2|Perbincangan]]) kepada versi terakhir oleh [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Membalikkan suntingan oleh $1 kepada versi terakhir oleh $2.',
-'sessionfailure'              => 'Terdapat sedikit masalah pada sesi log masuk anda.
+'delete-edit-reasonlist' => 'Ubah sebab-sebab hapus',
+'delete-toobig'          => 'Laman ini mempunyai sejarah yang besar, iaitu melebihi $1 jumlah semakan. Oleh itu, laman ini dilindungi daripada dihapuskan untuk mengelak kerosakan di {{SITENAME}} yang tidak disengajakan.',
+'delete-warning-toobig'  => 'Laman ini mempunyai sejarah yang besar, iaitu melebihi $1 jumlah semakan. Menghapuskannya boleh mengganggu perjalanan pangkalan data {{SITENAME}}. Sila berhati-hati.',
+
+# Rollback
+'rollback'         => 'Undurkan suntingan.',
+'rollback_short'   => 'Undur',
+'rollbacklink'     => 'undur',
+'rollbackfailed'   => 'Pengunduran gagal',
+'cantrollback'     => 'Suntingan tersebut tidak dapat dibalikkan: penyumbang terakhir adalah satu-satunya pengarang bagi rencana ini.',
+'alreadyrolled'    => 'Suntingan terakhir bagi [[:$1]] oleh [[User:$2|$2]] ([[User talk:$2|Perbualan]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) tidak dapat dibalikkan; terdapat pengguna lain yang telah menyunting atau membalikkan laman itu.
+
+Suntingan terakhir telah dibuat oleh [[User:$3|$3]] ([[User talk:$3|Perbualan]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Ringkasan sutingan: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Membalikkan suntingan oleh [[Special:Contributions/$2|$2]] ([[User talk:$2|Perbincangan]]) kepada versi terakhir oleh [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Membalikkan suntingan oleh $1 kepada versi terakhir oleh $2.',
+'sessionfailure'   => 'Terdapat sedikit masalah pada sesi log masuk anda.
 Tindakan ini telah dibatalkan untuk mencegah perampasan sesi.
 Sila tekan butang "back" dan muatkan semula laman yang telah anda kunjungi sebelum ini, kemudian cuba lagi.',
+
+# Protect
 'protectlogpage'              => 'Log perlindungan',
 'protectlogtext'              => 'Yang berikut ialah senarai bagi tindakan penguncian/pembukaan laman. Sila lihat [[Special:ProtectedPages|senarai laman dilindungi]] untuk rujukan lanjut.',
 'protectedarticle'            => 'melindungi "[[$1]]"',
 'modifiedarticleprotection'   => 'menukar peringkat perlindungan bagi "[[$1]]"',
 'unprotectedarticle'          => 'menyahlindung "[[$1]]"',
+'movedarticleprotection'      => 'memindahkan tetapan perlindungan dari "[[$2]]" ke "[[$1]]"',
 'protect-title'               => 'Menetapkan peringkat perlindungan bagi "$1"',
+'prot_1movedto2'              => '[[$1]] dipindahkan ke [[$2]]',
 'protect-legend'              => 'Sahkan perlindungan',
 'protectcomment'              => 'Komen:',
 'protectexpiry'               => 'Sehingga:',
 'protect_expiry_invalid'      => 'Waktu tamat tidak sah.',
 'protect_expiry_old'          => 'Waktu tamat telah berlalu.',
 'protect-unchain'             => 'Buka kunci keizinan pemindahan',
-'protect-text'                => 'Anda boleh melihat dan menukar peringkat perlindungan bagi laman <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Anda telah disekat, justeru tidak boleh menukar peringkat perlindungan.
-Ini adalah tetapan semasa bagi laman <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Anda tidak boleh menukar peringkat perlindungan kerana pangkalan data sedang dikunci.
-Ini adalah tetapan semasa bagi laman <strong>$1</strong>:',
-'protect-locked-access'       => 'Anda tidak mempunyai keizinan untuk menukar peringkat perlindungan.
-Ini adalah tetapan semasa bagi laman <strong>$1</strong>:',
+'protect-text'                => "Anda boleh melihat dan menukar peringkat perlindungan bagi laman '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Anda telah disekat, justeru tidak boleh menukar peringkat perlindungan.
+Ini adalah tetapan semasa bagi laman '''$1''':",
+'protect-locked-dblock'       => "Anda tidak boleh menukar peringkat perlindungan kerana pangkalan data sedang dikunci.
+Ini adalah tetapan semasa bagi laman '''$1''':",
+'protect-locked-access'       => "Anda tidak mempunyai keizinan untuk menukar peringkat perlindungan.
+Ini adalah tetapan semasa bagi laman '''$1''':",
 'protect-cascadeon'           => 'Laman ini dilindungi kerana ia terkandung dalam {{PLURAL:$1|laman|laman-laman}} berikut, yang dilindungi secara melata. Anda boleh menukar peringkat perlindunan laman ini, akan tetapi ia tidak akan menjejaskan perlindungan melata tersebut.',
-'protect-default'             => '(lalai)',
+'protect-default'             => 'Benarkan semua pengguna',
 'protect-fallback'            => 'Perlukan keizinan "$1"',
-'protect-level-autoconfirmed' => 'Sekat pengguna-pengguna tidak berdaftar',
+'protect-level-autoconfirmed' => 'Sekat pengguna baru dan pengguna tidak berdaftar',
 'protect-level-sysop'         => 'Penyelia sahaja',
 'protect-summary-cascade'     => 'melata',
 'protect-expiring'            => 'sehingga $1 (UTC)',
+'protect-expiry-indefinite'   => 'tak terbatas',
 'protect-cascade'             => 'Lindungi semua laman yang terkandung dalam laman ini (perlindungan melata)',
 'protect-cantedit'            => 'Anda tidak dibenarkan menukar peringkat perlindungan bagi laman ini.',
+'protect-othertime'           => 'Waktu lain:',
+'protect-othertime-op'        => 'waktu lain',
+'protect-existing-expiry'     => 'Waktu tamat yang telah ditetapkan: $2, $3',
+'protect-otherreason'         => 'Sebab lain/tambahan:',
+'protect-otherreason-op'      => 'sebab lain/tambahan',
+'protect-dropdown'            => '*Sebab lazim
+** Vandalisme
+** Spam
+** Perang sunting
+** Laman popular',
+'protect-edit-reasonlist'     => 'Ubah sebab-sebab perlindungan',
+'protect-expiry-options'      => '2 jam:2 hours,1 hari:1 day,3 hari:3 days,1 minggu:1 week,2 minggu:2 weeks,1 bulan:1 month,3 bulan:3 months,6 bulan:6 months,1 tahun:1 year,selama-lamanya:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Keizinan:',
 'restriction-level'           => 'Peringkat pembatasan:',
 'minimum-size'                => 'Saiz minimum',
@@ -1712,8 +1902,7 @@ Ini adalah tetapan semasa bagi laman <strong>$1</strong>:',
 'undeletepage'                 => 'Lihat dan pulihkan laman yang dihapuskan',
 'undeletepagetitle'            => "'''Yang berikut ialah semakan-semakan [[:$1|$1]] yang telah dihapuskan'''.",
 'viewdeletedpage'              => 'Lihat laman-laman yang dihapuskan',
-'undeletepagetext'             => 'Laman-laman berikut telah dihapuskan tetapi masih disimpan dalam arkib dan
-masih boleh dipulihkan. Arkib tersebut akan dibersihkan dari semasa ke semasa.',
+'undeletepagetext'             => '{{PLURAL:$1|Laman|$1 laman}} berikut telah dihapuskan tetapi masih disimpan dalam arkib dan masih boleh dipulihkan. Arkib tersebut akan dibersihkan dari semasa ke semasa.',
 'undelete-fieldset-title'      => 'Pulihkan semakan',
 'undeleteextrahelp'            => "Untuk memulihkan keseluruhan laman, biarkan semua kotak semak dan klik '''''Pulih'''''. Untuk melaksanakan pemulihan tertentu, tanda di setiap kotak yang bersebelahan dengan semakan untuk dipulihkan dan klik '''''Pulih'''''. Klik '''''Set semula''''' untuk mengosongkan ruangan komen dan membuang tanda semua kotak.",
 'undeleterevisions'            => '$1 semakan telah diarkibkan.',
@@ -1724,13 +1913,14 @@ yang anda tidak dibenarkan melihatnya tidak akan dipulihkan.',
 'undeletehistorynoadmin'       => 'Rencana ini telah dihapuskan. Sebab penghapusan
 ditunjukkan dalam ringkasan di bawah, berserta butiran bagi pengguna-pengguna yang telah menyunting laman ini
 sebelum penghapusan. Teks sebenar bagi semua semakan yang dihapuskan hanya boleh dilihat oleh para pentadbir.',
-'undelete-revision'            => 'Menghapuskan semakan bagi $1 (pada $2) oleh $3:',
+'undelete-revision'            => 'Menghapuskan semakan bagi $1 (pada $4, $5) oleh $3:',
 'undeleterevision-missing'     => 'Semakan tersebut tidak sah atau tidak dijumpai. Mungkin anda telah mengikuti pautan yang rosak
 atau semakan tersebut telah dipulihkan atau dibuang daripada arkib.',
 'undelete-nodiff'              => 'Tiada semakan sebelumnya.',
 'undeletebtn'                  => 'Pulihkan',
 'undeletelink'                 => 'pulih',
 'undeletereset'                => 'set semula',
+'undeleteinvert'               => 'Kecualikan pilihan',
 'undeletecomment'              => 'Komen:',
 'undeletedarticle'             => '"[[$1]]" telah dipulihkan',
 'undeletedrevisions'           => '$1 semakan dipulihkan',
@@ -1762,26 +1952,27 @@ $1',
 'blanknamespace' => '(Utama)',
 
 # Contributions
-'contributions' => 'Sumbangan',
-'mycontris'     => 'Sumbangan saya',
-'contribsub2'   => 'Oleh $1 ($2)',
-'nocontribs'    => 'Tiada sebarang perubahan yang sepadan dengan kriteria-kriteria ini.',
-'uctop'         => ' (puncak)',
-'month'         => 'Sebelum bulan:',
-'year'          => 'Sebelum tahun:',
-
-'sp-contributions-newbies'     => 'Tunjuk sumbangan daripada akaun baru sahaja',
-'sp-contributions-newbies-sub' => 'Bagi akaun-akaun baru',
-'sp-contributions-blocklog'    => 'Log sekatan',
-'sp-contributions-search'      => 'Cari sumbangan',
-'sp-contributions-username'    => 'Alamat IP atau nama pengguna:',
-'sp-contributions-submit'      => 'Cari',
+'contributions'       => 'Sumbangan',
+'contributions-title' => 'Sumbangan oleh $1',
+'mycontris'           => 'Sumbangan saya',
+'contribsub2'         => 'Oleh $1 ($2)',
+'nocontribs'          => 'Tiada sebarang perubahan yang sepadan dengan kriteria-kriteria ini.',
+'uctop'               => ' (puncak)',
+'month'               => 'Sebelum bulan:',
+'year'                => 'Sebelum tahun:',
+
+'sp-contributions-newbies'       => 'Tunjuk sumbangan daripada akaun baru sahaja',
+'sp-contributions-newbies-sub'   => 'Bagi akaun-akaun baru',
+'sp-contributions-newbies-title' => 'Sumbangan oleh pengguna baru',
+'sp-contributions-blocklog'      => 'Log sekatan',
+'sp-contributions-search'        => 'Cari sumbangan',
+'sp-contributions-username'      => 'Alamat IP atau nama pengguna:',
+'sp-contributions-submit'        => 'Cari',
 
 # What links here
 'whatlinkshere'            => 'Pautan ke laman ini',
 'whatlinkshere-title'      => 'Laman yang mengandungi pautan ke "$1"',
 'whatlinkshere-page'       => 'Laman:',
-'linklistsub'              => '(Senarai pautan masuk)',
 'linkshere'                => "Laman-laman berikut mengandungi pautan ke '''[[:$1]]''':",
 'nolinkshere'              => "Tiada laman yang mengandungi pautan ke '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Tiada laman yang mengandungi pautan ke '''[[:$1]]''' dalam ruang nama yang dinyatakan.",
@@ -1831,6 +2022,8 @@ dirosakkan).',
 'ipbotherreason'                  => 'Sebab tambahan/lain:',
 'ipbhidename'                     => 'Sembunyikan nama pengguna/alamat IP daripada log sekatan, senarai sekatan aktif, dan senarai pengguna',
 'ipbwatchuser'                    => 'Pantau laman pengguna dan laman perbincangan bagi pengguna ini',
+'ipballowusertalk'                => 'Benarkan pengguna ini menyunting laman perbincangannya sendiri ketika disekat',
+'ipb-change-block'                => 'Sekat semula pengguna tersebut dengan tetapan ini',
 'badipaddress'                    => 'Alamat IP tidak sah',
 'blockipsuccesssub'               => 'Sekatan berjaya',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] telah disekat.
@@ -1840,14 +2033,18 @@ dirosakkan).',
 'ipb-unblock'                     => 'Nyahsekat nama pengguna atau alamat IP',
 'ipb-blocklist-addr'              => 'Sekatan sedia ada bagi $1',
 'ipb-blocklist'                   => 'Lihat sekatan sedia ada',
+'ipb-blocklist-contribs'          => 'Sumbangan oleh $1',
 'unblockip'                       => 'Nyahsekat pengguna',
 'unblockiptext'                   => 'Gunakan borang di bawah untuk membuang sekatan bagialamat IP atau nama pengguna yang telah disekat.',
-'ipusubmit'                       => 'Nyahsekat alamat ini.',
+'ipusubmit'                       => 'Tarik sekatan ini',
 'unblocked'                       => '[[User:$1|$1]] telah dinyahsekat',
 'unblocked-id'                    => 'Sekatan $1 telah dibuang',
 'ipblocklist'                     => 'Alamat IP dan nama pengguna yang disekat',
 'ipblocklist-legend'              => 'Cari pengguna yang disekat',
 'ipblocklist-username'            => 'Nama pengguna atau alamat IP:',
+'ipblocklist-sh-userblocks'       => '$1 sekatan akaun',
+'ipblocklist-sh-tempblocks'       => '$1 sekatan sementara',
+'ipblocklist-sh-addressblocks'    => '$1 sekatan IP tunggal',
 'ipblocklist-submit'              => 'Cari',
 'blocklistline'                   => '$1, $2 menyekat $3 ($4)',
 'infiniteblock'                   => 'selama-lamanya',
@@ -1856,14 +2053,18 @@ dirosakkan).',
 'noautoblockblock'                => 'sekatan automatik dipadamkan',
 'createaccountblock'              => 'pembukaan akaun baru disekat',
 'emailblock'                      => 'e-mail disekat',
+'blocklist-nousertalk'            => 'tidak boleh menyunting laman perbincangan sendiri',
 'ipblocklist-empty'               => 'Senarai sekatan adalah kosong.',
 'ipblocklist-no-results'          => 'Alamat IP atau nama pengguna tersebut tidak disekat.',
 'blocklink'                       => 'sekat',
 'unblocklink'                     => 'nyahsekat',
+'change-blocklink'                => 'ubah sekatan',
 'contribslink'                    => 'sumb.',
 'autoblocker'                     => 'Disekat secara automatik kerana baru-baru ini alamat IP anda digunakan oleh "[[User:$1|$1]]". Sebab sekatan $1 ialah: "$2"',
 'blocklogpage'                    => 'Log sekatan',
+'blocklog-fulllog'                => 'Log sekatan penuh',
 'blocklogentry'                   => 'menyekat [[$1]] sehingga $2 $3',
+'reblock-logentry'                => 'menukar tetapan sekatan [[$1]] yang tamat pada $2 $3',
 'blocklogtext'                    => 'Ini adalah log bagi sekatan dan penyahsekatan.
 Alamat IP yang disekat secara automatik tidak disenaraikan di sini.
 Sila lihat juga [[Special:IPBlockList|senarai sekatan IP]] yang sedang berkuatkuasa.',
@@ -1872,11 +2073,14 @@ Sila lihat juga [[Special:IPBlockList|senarai sekatan IP]] yang sedang berkuatku
 'block-log-flags-nocreate'        => 'pembukaan akaun dimatikan',
 'block-log-flags-noautoblock'     => 'sekatan automatik dimatikan',
 'block-log-flags-noemail'         => 'e-mail disekat',
+'block-log-flags-nousertalk'      => 'tidak boleh menyunting laman perbincangan sendiri',
 'block-log-flags-angry-autoblock' => 'sekatan automatik tambahan diaktifkan',
 'range_block_disabled'            => 'Kebolehan penyelia untuk membuat sekatan julat dimatikan.',
 'ipb_expiry_invalid'              => 'Waktu tamat tidak sah.',
 'ipb_expiry_temp'                 => 'Sekatan nama pengguna terselindung sepatutnya kekal.',
 'ipb_already_blocked'             => '"$1" telah pun disekat',
+'ipb-needreblock'                 => '== Telah pun disekat ==
+$1 telah pun disekat Adakah anda mahu menukar tetapan sekatan pengguna ini?',
 'ipb_cant_unblock'                => 'Ralat: ID sekatan $1 tidak dijumpai. Barangkali ia telah pun dinyahsekat.',
 'ipb_blocked_as_range'            => 'Ralat: IP $1 tidak boleh dinyahsekat kerana ia tidak disekat secara langsung. Sebaliknya, ia disekat kerana merupakan sebahagian daripada sekatan julat $2, yang mana boleh dinyahsekat.',
 'ip_range_invalid'                => 'Julat IP tidak sah.',
@@ -1887,6 +2091,7 @@ Sila lihat juga [[Special:IPBlockList|senarai sekatan IP]] yang sedang berkuatku
 'proxyblocksuccess'               => 'Berjaya.',
 'sorbsreason'                     => 'Alamat IP anda telah disenaraikan sebagai proksi terbuka dalam DNSBL yang digunakan oleh {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Alamat IP anda telah disenaraikan sebagai proksi terbuka dalam DNSBL yang digunakan oleh {{SITENAME}}. Oleh itu, anda tidak dibenarkan membuka akaun baru.',
+'cant-block-while-blocked'        => 'Anda tidak boleh menyekat orang lain sedangkan anda disekat.',
 
 # Developer tools
 'lockdb'              => 'Kunci pangkalan data',
@@ -1914,58 +2119,71 @@ sahkan bahawa anda betul-betul mahu melakukan tindakan ini.',
 'databasenotlocked'   => 'Pangkalan data tidak dikunci.',
 
 # Move page
-'move-page'               => 'Pindah $1',
-'move-page-legend'        => 'Pindah laman',
-'movepagetext'            => "Gunakan borang di bawah untuk menukar nama laman dan memindahkan semua maklumat sejarahnya ke nama baru. Tajuk yang lama akan dijadikan lencongan ke tajuk yang baru. Anda juga boleh mengemaskinikan semua lencongan yang menuju ke tajuk asal supaya menuju ke tajuk baru. Sebaliknya, anda boleh menyemak sekiranya terdapat [[Special:DoubleRedirects|lencongan berganda]] atau [[Special:BrokenRedirects|lencongan rosak]]. Anda bertanggungjawab memastikan semua pautan bersambung ke laman yang sepatutnya.
+'move-page'                    => 'Pindah $1',
+'move-page-legend'             => 'Pindah laman',
+'movepagetext'                 => "Gunakan borang di bawah untuk menukar nama laman dan memindahkan semua maklumat sejarahnya ke nama baru. Tajuk yang lama akan dijadikan lencongan ke tajuk yang baru. Anda juga boleh mengemaskinikan semua lencongan yang menuju ke tajuk asal supaya menuju ke tajuk baru. Sebaliknya, anda boleh menyemak sekiranya terdapat [[Special:DoubleRedirects|lencongan berganda]] atau [[Special:BrokenRedirects|lencongan rosak]]. Anda bertanggungjawab memastikan semua pautan bersambung ke laman yang sepatutnya.
 
 Sila ambil perhatian bahawa laman tersebut '''tidak''' akan dipindahkan sekiranya laman dengan tajuk yang baru tadi telah wujud, melainkan apabila
 laman tersebut kosong atau merupakan laman lencongan dan tidak mempunyai sejarah penyuntingan. Ini bermakna anda boleh menukar semula nama sesebuah
 laman kepada nama yang asal jika anda telah melakukan kesilapan, dan anda tidak boleh menulis ganti laman yang telah wujud.
 
 '''AMARAN!''' Tindakan ini boleh menjadi perubahan yang tidak dijangka dan drastik bagi laman popular. Oleh itu, sila pastikan anda faham akibat yang mungkin timbul sebelum meneruskannya.",
-'movepagetalktext'        => "Laman perbincangan yang berkaitan, jika ada, akan dipindahkan bersama-sama laman ini secara automatik '''kecuali''':
+'movepagetalktext'             => "Laman perbincangan yang berkaitan, jika ada, akan dipindahkan bersama-sama laman ini secara automatik '''kecuali''':
 * Sebuah laman perbincangan dengan nama baru telah pun wujud, atau
 * Anda membuang tanda kotak di bawah.
 
 Dalam kes tersebut, anda terpaksa melencongkan atau menggabungkan laman secara manual, jika perlu.",
-'movearticle'             => 'Pindah laman:',
-'movenotallowed'          => 'Anda tidak mempunyai keizinan untuk memindahkan laman.',
-'newtitle'                => 'Kepada tajuk baru:',
-'move-watch'              => 'Pantau laman ini',
-'movepagebtn'             => 'Pindah laman',
-'pagemovedsub'            => 'Pemindahan berjaya',
-'movepage-moved'          => '<big>\'\'\'"$1" telah dipindahkan ke "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Laman dengan nama tersebut telah pun wujud,
+'movearticle'                  => 'Pindah laman:',
+'movenologin'                  => 'Belum log masuk.',
+'movenologintext'              => 'Anda mesti [[Special:UserLogin|log masuk]] terlebih dahulu untuk memindahkan laman.',
+'movenotallowed'               => 'Anda tidak mempunyai keizinan untuk memindahkan laman.',
+'movenotallowedfile'           => 'Anda tidak mempunyai keizinan untuk memindahkan fail.',
+'cant-move-user-page'          => 'Anda tidak mempunyai keizinan untuk memindahkan laman pengguna (tidak termasuk sublaman-sublamannya).',
+'cant-move-to-user-page'       => 'Anda tidak mempunyai keizinan untuk memindahkan sesebuah laman ke mana-mana laman pengguna (kecuali sebagai sublamannya sahaja).',
+'newtitle'                     => 'Kepada tajuk baru:',
+'move-watch'                   => 'Pantau laman ini',
+'movepagebtn'                  => 'Pindah laman',
+'pagemovedsub'                 => 'Pemindahan berjaya',
+'movepage-moved'               => '<big>\'\'\'"$1" telah dipindahkan ke "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Sebuah lencongan telah dicipta.',
+'movepage-moved-noredirect'    => 'Penciptaan lencongan telah dihalang.',
+'articleexists'                => 'Laman dengan nama tersebut telah pun wujud,
 atau nama yang anda pilih tidak sah.
 Sila pilih nama lain.',
-'cantmove-titleprotected' => 'Anda tidak boleh memindah sebarang laman ke sini kerana tajuk ini telah dilindungi daripada dicipta',
-'talkexists'              => "'''Laman tersebut berjaya dipindahkan, akan tetapi laman perbincangannya tidak dapat dipindahkan kerana laman dengan tajuk baru tersebut telah pun wujud. Anda perlu menggabungkannya secara manual.'''",
-'movedto'                 => 'dipindahkan ke',
-'movetalk'                => 'Pindahkan laman perbincangan yang berkaitan',
-'move-subpages'           => 'Pindahkan semua sublaman sekali, jika boleh',
-'move-talk-subpages'      => 'Pindahkan semua sublaman bagi laman perbincangan sekali, jika boleh',
-'movepage-page-exists'    => 'Laman $1 telah pun wujud dan tidak boleh ditulis ganti secara automatik.',
-'movepage-page-moved'     => 'Laman $1 telah dipindahkan ke $2.',
-'movepage-page-unmoved'   => 'Laman $1 tidak dapat dipindahkan ke $2.',
-'movepage-max-pages'      => 'Jumlah maksimum $1 laman telah dipindahkan secara automatik.',
-'1movedto2'               => '[[$1]] dipindahkan ke [[$2]]',
-'1movedto2_redir'         => '[[$1]] dipindahkan ke [[$2]] menerusi pelencongan',
-'movelogpage'             => 'Log pemindahan',
-'movelogpagetext'         => 'Yang berikut ialah senarai pemindahan laman.',
-'movereason'              => 'Sebab:',
-'revertmove'              => 'balik',
-'delete_and_move'         => 'Hapus dan pindah',
-'delete_and_move_text'    => '==Penghapusan diperlukan==
+'cantmove-titleprotected'      => 'Anda tidak boleh memindah sebarang laman ke sini kerana tajuk ini telah dilindungi daripada dicipta',
+'talkexists'                   => "'''Laman tersebut berjaya dipindahkan, akan tetapi laman perbincangannya tidak dapat dipindahkan kerana laman dengan tajuk baru tersebut telah pun wujud. Anda perlu menggabungkannya secara manual.'''",
+'movedto'                      => 'dipindahkan ke',
+'movetalk'                     => 'Pindahkan laman perbincangan yang berkaitan',
+'move-subpages'                => 'Pindahkan semua sublaman sekali, jika boleh',
+'move-talk-subpages'           => 'Pindahkan semua sublaman bagi laman perbincangan sekali, jika boleh',
+'movepage-page-exists'         => 'Laman $1 telah pun wujud dan tidak boleh ditulis ganti secara automatik.',
+'movepage-page-moved'          => 'Laman $1 telah dipindahkan ke $2.',
+'movepage-page-unmoved'        => 'Laman $1 tidak dapat dipindahkan ke $2.',
+'movepage-max-pages'           => 'Jumlah maksimum $1 laman telah dipindahkan secara automatik.',
+'1movedto2'                    => '[[$1]] dipindahkan ke [[$2]]',
+'1movedto2_redir'              => '[[$1]] dipindahkan ke [[$2]] menerusi pelencongan',
+'move-redirect-suppressed'     => 'halang pelencongan',
+'movelogpage'                  => 'Log pemindahan',
+'movelogpagetext'              => 'Yang berikut ialah senarai pemindahan laman.',
+'movereason'                   => 'Sebab:',
+'revertmove'                   => 'balik',
+'delete_and_move'              => 'Hapus dan pindah',
+'delete_and_move_text'         => '==Penghapusan diperlukan==
 
 Laman destinasi "[[:$1]]" telah pun wujud. Adakah anda mahu menghapuskannya supaya laman ini dapat dipindahkan?',
-'delete_and_move_confirm' => 'Ya, hapuskan laman ini',
-'delete_and_move_reason'  => 'Dihapuskan supaya laman lain dapat dipindahkan',
-'selfmove'                => 'Tajuk sumber dan tajuk destinasi tidak boleh sama.',
-'immobile_namespace'      => 'Tajuk sumber atau destinasi adalah jenis khas. Anda tidak memindahkan laman ke luar atau dalam ruang nama tersebut.',
-'imagenocrossnamespace'   => 'Tidak boleh memindah fail ke ruang nama lain',
-'imagetypemismatch'       => 'Sambungan baru fail tersebut tidak sepadan dengan jenisnya',
-'imageinvalidfilename'    => 'Nama fail imej sasaran tidak sah',
-'fix-double-redirects'    => 'Kemas kinikan semua lencongan yang menuju ke tajuk asal',
+'delete_and_move_confirm'      => 'Ya, hapuskan laman ini',
+'delete_and_move_reason'       => 'Dihapuskan supaya laman lain dapat dipindahkan',
+'selfmove'                     => 'Tajuk sumber dan tajuk destinasi tidak boleh sama.',
+'immobile-source-namespace'    => 'Anda tidak boleh memindahkan laman dari ruang nama "$1"',
+'immobile-target-namespace'    => 'Anda tidak boleh memindahkan mana-mana laman ke dalam ruang nama "$1"',
+'immobile-target-namespace-iw' => 'Pautan interwiki tidak boleh dijadikan sasaran untuk pemindahan laman.',
+'immobile-source-page'         => 'Anda tidak boleh memindahkan laman ini.',
+'immobile-target-page'         => 'Anda tidak boleh memindahkan laman ke tajuk itu.',
+'imagenocrossnamespace'        => 'Tidak boleh memindah fail ke ruang nama lain',
+'imagetypemismatch'            => 'Sambungan baru fail tersebut tidak sepadan dengan jenisnya',
+'imageinvalidfilename'         => 'Nama fail imej sasaran tidak sah',
+'fix-double-redirects'         => 'Kemas kinikan semua lencongan yang menuju ke tajuk asal',
+'move-leave-redirect'          => 'Meninggalkan lencongan',
 
 # Export
 'export'            => 'Eksport laman',
@@ -1974,7 +2192,7 @@ Fail ini boleh diimport ke dalam wiki lain yang menggunakan perisian MediaWiki m
 
 Untuk mengeksport laman, masukkan tajuk dalam kotak teks di bawah (satu tajuk bagi setiap baris) dan pilih sama ada anda mahukan semua versi dan catatan sejarah atau hanya versi semasa berserta maklumat mengenai suntingan terakhir.
 
-Dalam pilihan kedua tadi, anda juga boleh menggunakan pautan, umpamanya [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] untuk laman "[[{{MediaWiki:Mainpage}}]]".',
+Dalam pilihan kedua tadi, anda juga boleh menggunakan pautan, umpamanya [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] untuk laman "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Hanya eksport semakan semasa, bukan keseluruhan sejarah.',
 'exportnohistory'   => "----
 '''Catatan:''' Ciri eksport sejarah penuh laman melalui borang ini telah dimatikan atas sebab-sebab prestasi.",
@@ -1990,7 +2208,7 @@ Dalam pilihan kedua tadi, anda juga boleh menggunakan pautan, umpamanya [[{{ns:s
 'allmessagesdefault'        => 'Teks lalai',
 'allmessagescurrent'        => 'Teks semasa',
 'allmessagestext'           => 'Ini ialah senarai pesanan sistem yang terdapat dalam ruang nama MediaWiki.
-Sila lawat [http://www.mediawiki.org/wiki/Localisation Penyetempatan MediaWiki] dan [http://translatewiki.net Betawiki] sekiranya anda mahu menyumbang dalam menyetempatkan dan menterjemah perisian MediaWiki.',
+Sila lawat [http://www.mediawiki.org/wiki/Localisation Penyetempatan MediaWiki] dan [http://translatewiki.net translatewiki.net] sekiranya anda mahu menyumbang dalam menyetempatkan dan menterjemah perisian MediaWiki.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' tidak boleh digunakan kerana '''\$wgUseDatabaseMessages''' dipadamkan.",
 'allmessagesfilter'         => 'Tapis nama mesej:',
 'allmessagesmodified'       => 'Hanya tunjukkan yang telah diubah',
@@ -2010,9 +2228,12 @@ Sila lawat [http://www.mediawiki.org/wiki/Localisation Penyetempatan MediaWiki]
 'import-interwiki-text'      => 'Sila pilih wiki dan tajuk laman yang ingin diimport.
 Semua tarikh semakan dan nama penyunting akan dikekalkan.
 Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import]].',
+'import-interwiki-source'    => 'Sumber wiki/halaman:',
 'import-interwiki-history'   => 'Salin semua versi sejarah bagi laman ini',
 'import-interwiki-submit'    => 'Import',
 'import-interwiki-namespace' => 'Ruang nama destinasi:',
+'import-upload-filename'     => 'Nama fail:',
+'import-comment'             => 'Komen:',
 'importtext'                 => 'Sila eksport fail daripada sumber wiki menggunakan kemudahan Special:Export, simpan dalam komputer anda dan muat naik di sini.',
 'importstart'                => 'Mengimport laman...',
 'import-revision-count'      => '$1 semakan',
@@ -2046,19 +2267,19 @@ Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import
 'import-logentry-interwiki-detail' => '$1 semakan daripada $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Laman pengguna saya',
+'tooltip-pt-userpage'             => 'Laman pengguna anda',
 'tooltip-pt-anonuserpage'         => 'Laman pengguna bagi alamat IP anda',
-'tooltip-pt-mytalk'               => 'Laman perbualan saya',
+'tooltip-pt-mytalk'               => 'Laman perbualan anda',
 'tooltip-pt-anontalk'             => 'Perbincangan mengenai penyuntingan daripada alamat IP anda',
 'tooltip-pt-preferences'          => 'Keutamaan saya',
 'tooltip-pt-watchlist'            => 'Senarai laman yang anda pantau',
-'tooltip-pt-mycontris'            => 'Senarai sumbangan saya',
+'tooltip-pt-mycontris'            => 'Senarai sumbangan anda',
 'tooltip-pt-login'                => 'Walaupun tidak wajib, anda digalakkan supaya log masuk.',
 'tooltip-pt-anonlogin'            => 'Walaupun tidak wajib, anda digalakkan supaya log masuk.',
 'tooltip-pt-logout'               => 'Log keluar',
 'tooltip-ca-talk'                 => 'Perbincangan mengenai laman kandungan',
 'tooltip-ca-edit'                 => 'Anda boleh menyunting laman ini. Sila lihat pratonton terlebih dahulu sebelum menyimpan.',
-'tooltip-ca-addsection'           => 'Tambah komen bagi perbincangan ini.',
+'tooltip-ca-addsection'           => 'Buka bahagian baru',
 'tooltip-ca-viewsource'           => 'Laman ini dilindungi. Anda boleh melihat sumbernya.',
 'tooltip-ca-history'              => 'Versi-versi terdahulu bagi laman ini.',
 'tooltip-ca-protect'              => 'Lindungi laman ini',
@@ -2105,6 +2326,8 @@ Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import
 'tooltip-watch'                   => 'Tambahkan laman ini ke dalam senarai pantau anda',
 'tooltip-recreate'                => 'Cipta semula laman ini walaupun ia telah dihapuskan',
 'tooltip-upload'                  => 'Muat naik',
+'tooltip-rollback'                => 'Balikkan semua suntingan oleh penyumbang terakhir pada laman ini dengan satu klik.',
+'tooltip-undo'                    => 'Balikkan suntingan ini dan buka borang sunting dalam mod pratonton. Sebab boleh dinyatakan dalam ruangan ringkasan.',
 
 # Metadata
 'nodublincore'      => 'Metadata RDF Dublin Core dipadamkan bagi pelayan ini.',
@@ -2112,12 +2335,12 @@ Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import
 'notacceptable'     => 'Pelayan wiki ini tidak mampu menyediakan data dalam format yang boleh dibaca oleh pelanggan anda.',
 
 # Attribution
-'anonymous'        => 'Penguna {{SITENAME}} tanpa nama',
+'anonymous'        => '{{PLURAL:$1|Pengguna|Pengguna-pengguna}} {{SITENAME}} tanpa nama',
 'siteuser'         => 'Pengguna {{SITENAME}}, $1',
 'lastmodifiedatby' => 'Laman ini diubah buat kali terakhir pada $2, $1 oleh $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Berdasarkan karya $1.',
 'others'           => 'lain-lain',
-'siteusers'        => 'Pengguna-pengguna {{SITENAME}}, $1',
+'siteusers'        => '{{PLURAL:$2|Pengguna|Pengguna-pengguna}} {{SITENAME}}, $1',
 'creditspage'      => 'Penghargaan',
 'nocredits'        => 'Tiada maklumat penghargaan bagi laman ini.',
 
@@ -2137,6 +2360,11 @@ Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import
 'numauthors'     => 'Bilangan pengarang (page): $1',
 'numtalkauthors' => 'Bilangan pengarang (laman perbincangan): $1',
 
+# Skin names
+'skinname-standard' => 'Klasik',
+'skinname-simple'   => 'Ringkas',
+'skinname-modern'   => 'Moden',
+
 # Math options
 'mw_math_png'    => 'Sentiasa lakar PNG',
 'mw_math_simple' => 'HTML jika ringkas, sebaliknya PNG',
@@ -2157,11 +2385,12 @@ Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import
 'markedaspatrollederror-noautopatrol' => 'Anda tidak dibenarkan menanda ronda perubahan anda sendiri.',
 
 # Patrol log
-'patrol-log-page'   => 'Log pemeriksaan',
-'patrol-log-header' => 'Yang berikut ialah log rondaan bagi semakan.',
-'patrol-log-line'   => 'menandakan $1 bagi $2 sebagai telah diperiksa $3',
-'patrol-log-auto'   => '(automatik)',
-'patrol-log-diff'   => 's$1',
+'patrol-log-page'      => 'Log pemeriksaan',
+'patrol-log-header'    => 'Yang berikut ialah log rondaan bagi semakan.',
+'patrol-log-line'      => 'menandakan $1 bagi $2 sebagai telah diperiksa $3',
+'patrol-log-auto'      => '(automatik)',
+'patrol-log-diff'      => 's$1',
+'log-show-hide-patrol' => '$1 log rondaan',
 
 # Image deletion
 'deletedrevision'                 => 'Menghapuskan semakan lama $1.',
@@ -2178,6 +2407,9 @@ $1',
 'previousdiff' => '� Suntingan sebelumnya',
 'nextdiff'     => 'Suntingan berikutnya →',
 
+# Visual comparison
+'visual-comparison' => 'Perbandingan visual',
+
 # Media information
 'mediawarning'         => "'''Amaran''': Fail ini boleh mengandungi kod yang berbahaya dan merosakkan komputer anda.<hr />",
 'imagemaxsize'         => 'Had saiz imej di laman keterangannya:',
@@ -2190,10 +2422,12 @@ $1',
 'show-big-image'       => 'Leraian penuh',
 'show-big-image-thumb' => '<small>Saiz pratonton ini: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeri fail baru',
 'imagelisttext'         => "Yang berikut ialah senarai bagi '''$1''' fail yang disusun secara $2.",
 'newimages-summary'     => 'Laman khas ini memaparkan senarai fail muat naik terakhir.',
+'newimages-legend'      => 'Nama fail',
+'newimages-label'       => 'Nama fail (atau sebahagian daripadanya):',
 'showhidebots'          => '($1 bot)',
 'noimages'              => 'Tiada imej.',
 'ilsubmit'              => 'Cari',
@@ -2402,6 +2636,18 @@ Ruangan lain akan disembunyikan.
 'exif-lightsource-24'  => 'Tungsten studio ISO',
 'exif-lightsource-255' => 'Sumber cahaya lain',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Denyar tidak bernyala',
+'exif-flash-fired-1'    => 'Denyar dinyalakan',
+'exif-flash-return-0'   => 'tiada pengesan pulangan strob',
+'exif-flash-return-2'   => 'cahaya pulang strob tidak dikesan',
+'exif-flash-return-3'   => 'cahaya pulang strob dikesan',
+'exif-flash-mode-1'     => 'nyalaan denyar wajib',
+'exif-flash-mode-2'     => 'tindasan denyar wajib',
+'exif-flash-mode-3'     => 'mod automatik',
+'exif-flash-function-1' => 'Tiada fungsi denyar',
+'exif-flash-redeye-1'   => 'mod penurunan mata merah',
+
 'exif-focalplaneresolutionunit-2' => 'inci',
 
 'exif-sensingmethod-1' => 'Tidak ditentukan',
@@ -2547,21 +2793,10 @@ $1
 Sila sahkan bahawa anda mahu mencipta semula laman ini.",
 'recreate'            => 'Cipta semula',
 
-# HTML dump
-'redirectingto' => 'Melencong ke [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Kosongkan fail simpanan bagi laman ini?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Cari laman mengandungi ''$1''.",
-'searchnamed'      => "Cari laman bernama ''$1''.",
-'articletitles'    => "Laman bermula dengan ''$1''",
-'hideresults'      => 'Sembunyikan keputusan',
-'useajaxsearch'    => 'Gunakan carian AJAX',
+'confirm-purge-top'    => 'Kosongkan fail simpanan bagi laman ini?',
+'confirm-purge-bottom' => 'Kosongkan cache dan papar versi semasa.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� halaman sebelumnya',
@@ -2581,10 +2816,10 @@ $1',
 'table_pager_empty'        => 'Tiada keputusan',
 
 # Auto-summaries
-'autosumm-blank'   => 'Membuang semua kandungan daripada laman',
+'autosumm-blank'   => 'Mengosongkan laman',
 'autosumm-replace' => "Menggantikan laman dengan '$1'",
 'autoredircomment' => 'Melencong ke [[$1]]',
-'autosumm-new'     => 'Laman baru: $1',
+'autosumm-new'     => "Mencipta laman baru dengan kandungan '$1'",
 
 # Live preview
 'livepreview-loading' => 'Memuat …',
@@ -2637,6 +2872,7 @@ Anda juga boleh [[Special:Watchlist/edit|menggunakan penyunting standard]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag penyambung "$1" tidak dikenali',
+'duplicate-defaultsort' => 'Amaran: Kunci susunan lalai "$2" mengatasi kunci susunan lalai "$1" sebelumnya.',
 
 # Special:Version
 'version'                          => 'Versi', # Not used as normal message but as header for the special page itself
@@ -2666,13 +2902,13 @@ Anda juga boleh [[Special:Watchlist/edit|menggunakan penyunting standard]].',
 'filepath-summary' => 'Laman khas ini mengembalikan laluan penuh bagi sesebuah fail.
 Imej ditunjuk dalam leraian penuh, jenis fail yang lain dibuka dengan atur cara yang berkenaan secara terus.
 
-Sila masukkan nama fail tanpa awalan "{{ns:image}}:".',
+Sila masukkan nama fail tanpa awalan "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Cari fail serupa',
 'fileduplicatesearch-summary'  => 'Anda boleh mencari fail serupa berdasarkan nilai cincangannya.
 
-Sila masukkan nama fail tanpa awalan "{{ns:image}}:".',
+Sila masukkan nama fail tanpa awalan "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Cari fail serupa',
 'fileduplicatesearch-filename' => 'Nama fail:',
 'fileduplicatesearch-submit'   => 'Gelintar',
@@ -2702,4 +2938,13 @@ Sila masukkan nama fail tanpa awalan "{{ns:image}}:".',
 'blankpage'              => 'Laman kosong',
 'intentionallyblankpage' => 'Laman ini sengaja dibiarkan kosong dan digunakan untuk kerja-kerja ujian dan sebagainya.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Jangan ubah baris ini<pre>
+#Letakkan senarai ungkapan nalar (tidak termasuk apitan //) di baris kosong di bawah
+#Setiap ungkapan akan dipadankan dengan pautan imej luar
+#Pautan yang sepadan sahaja akan dijadikan imej
+#Baris yang bermula dengan aksara # diabaikan
+
+#Jangan letak ungkapan nalar di bawah baris ini dan jangan ubah baris ini</pre>',
+
 );
diff --git a/languages/messages/MessagesMt.php b/languages/messages/MessagesMt.php
index 755fd1b1..ae03f14f 100644
--- a/languages/messages/MessagesMt.php
+++ b/languages/messages/MessagesMt.php
@@ -6,10 +6,252 @@
  *
  * @author Chrisportelli
  * @author Giangian15
+ * @author Malafaya
  * @author Roderick Mallia
  * @author Urhixidur
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Midja',
+	NS_SPECIAL          => 'Speċjali',
+	NS_TALK             => 'Diskussjoni',
+	NS_USER             => 'Utent',
+	NS_USER_TALK        => 'Diskussjoni_utent',
+	NS_PROJECT_TALK     => '$1_diskussjoni',
+	NS_FILE             => 'Stampa',
+	NS_FILE_TALK        => 'Diskussjoni_stampa',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Diskussjoni_MediaWiki',
+	NS_TEMPLATE         => 'Mudell',
+	NS_TEMPLATE_TALK    => 'Diskussjoni_mudell',
+	NS_HELP             => 'Għajnuna',
+	NS_HELP_TALK        => 'Diskussjoni_għajnuna',
+	NS_CATEGORY         => 'Kategorija',
+	NS_CATEGORY_TALK    => 'Diskussjoni_kategorija',
+);
+
+$namespaceAliases = array(
+	'Medja' => NS_MEDIA,
+	'Diskuti' => NS_TALK,
+	'Diskuti_utent' => NS_USER_TALK,
+	'$1_diskuti' => NS_PROJECT_TALK,
+	'Diskuti_stampa' => NS_FILE_TALK,
+	'MedjaWiki' => NS_MEDIAWIKI,
+	'Diskuti_MedjaWiki' => NS_MEDIAWIKI_TALK,
+	'Diskuti_template' => NS_TEMPLATE_TALK,
+	'Diskuti_għajnuna' => NS_HELP_TALK,
+	'Diskuti_kategorija' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'RiindirizziDoppji' ),
+	'BrokenRedirects'           => array( 'RiindirizziMiksura' ),
+	'Disambiguations'           => array( 'Diżambigwazzjoni' ),
+	'Userlogin'                 => array( 'UtentDħul' ),
+	'Userlogout'                => array( 'UtentĦruġ' ),
+	'CreateAccount'             => array( 'OħloqKont' ),
+	'Preferences'               => array( 'Preferenzi' ),
+	'Watchlist'                 => array( 'ListaOsservazzjoni' ),
+	'Recentchanges'             => array( 'TibdilRiċenti' ),
+	'Upload'                    => array( 'Tella\'' ),
+	'Listfiles'                 => array( 'ListaStampi' ),
+	'Newimages'                 => array( 'StampiÄ odda' ),
+	'Listusers'                 => array( 'Utenti' ),
+	'Listgrouprights'           => array( 'ListaDrittijietGruppijiet' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'PaġnaKwalunkwe' ),
+	'Lonelypages'               => array( 'PaġniOrfni' ),
+	'Uncategorizedpages'        => array( 'PaġniMhuxKategorizzati' ),
+	'Uncategorizedcategories'   => array( 'KategorijiMhuxKategorizzati' ),
+	'Uncategorizedimages'       => array( 'StampiMhuxKategorizzati' ),
+	'Uncategorizedtemplates'    => array( 'MudelliMhuxKategorizzati' ),
+	'Unusedcategories'          => array( 'KategorijiMhuxUżati' ),
+	'Unusedimages'              => array( 'StampiMhuxUżati' ),
+	'Wantedpages'               => array( 'PaġniRikjesti', 'ĦoloqMiksura' ),
+	'Wantedcategories'          => array( 'KategorijiRikjesti' ),
+	'Wantedfiles'               => array( 'FajlsRikjesti' ),
+	'Wantedtemplates'           => array( 'MudelliRikjesti' ),
+	'Mostlinked'                => array( 'L-AktarMarbuta' ),
+	'Mostlinkedcategories'      => array( 'Kategoriji' ),
+	'Mostlinkedtemplates'       => array( 'L-AktarMudelliMarbuta' ),
+	'Mostimages'                => array( 'L-AktarStampi' ),
+	'Mostcategories'            => array( 'L-AktarKategoriji' ),
+	'Mostrevisions'             => array( 'L-AktarReviżjonijiet' ),
+	'Fewestrevisions'           => array( 'L-InqasReviżjonijiet' ),
+	'Shortpages'                => array( 'PaġniQosra' ),
+	'Longpages'                 => array( 'PaġniTwal' ),
+	'Newpages'                  => array( 'PaġniĠodda' ),
+	'Ancientpages'              => array( 'PaġniAntiki' ),
+	'Deadendpages'              => array( 'PaġniWieqfa' ),
+	'Protectedpages'            => array( 'PaġniProtetti' ),
+	'Protectedtitles'           => array( 'TitliProtetti' ),
+	'Allpages'                  => array( 'PaġniKollha' ),
+	'Prefixindex'               => array( 'IndiċiPrefiss' ),
+	'Ipblocklist'               => array( 'ListaIPImblukkati' ),
+	'Specialpages'              => array( 'PaġniSpeċjali' ),
+	'Contributions'             => array( 'Kontribuzzjonijiet' ),
+	'Emailuser'                 => array( 'IbgħatUtent' ),
+	'Confirmemail'              => array( 'KonfermaPostaElettronika' ),
+	'Whatlinkshere'             => array( 'XiJwassalHawn' ),
+	'Recentchangeslinked'       => array( 'ModifikiRelatati' ),
+	'Movepage'                  => array( 'MexxiPaġna' ),
+	'Blockme'                   => array( 'Imblukkani' ),
+	'Booksources'               => array( 'SorsiKotba' ),
+	'Categories'                => array( 'Kategoriji' ),
+	'Export'                    => array( 'Esporta' ),
+	'Version'                   => array( 'Verżjoni' ),
+	'Allmessages'               => array( 'MessaġġiKollha' ),
+	'Blockip'                   => array( 'BlokkaIP' ),
+	'Undelete'                  => array( 'Irkupra' ),
+	'Import'                    => array( 'Importa' ),
+	'Lockdb'                    => array( 'AgħlaqDB' ),
+	'Unlockdb'                  => array( 'IftaħDB' ),
+	'Userrights'                => array( 'DrittijietUtent' ),
+	'MIMEsearch'                => array( 'FittexMIME' ),
+	'FileDuplicateSearch'       => array( 'FittexFajlDuplikat' ),
+	'Unwatchedpages'            => array( 'PaġniMhuxOsservati' ),
+	'Listredirects'             => array( 'ListaRiindirizz' ),
+	'Revisiondelete'            => array( 'ĦassarReviżjoni' ),
+	'Unusedtemplates'           => array( 'MudelliMhuxUżati' ),
+	'Randomredirect'            => array( 'RiindirizzKwalunkwe' ),
+	'Mypage'                    => array( 'PaġniTiegħi' ),
+	'Mytalk'                    => array( 'DiskussjonijietTiegħi' ),
+	'Mycontributions'           => array( 'KontribuzzjonijietTiegħi' ),
+	'Listadmins'                => array( 'ListaAmmin' ),
+	'Listbots'                  => array( 'ListaBots' ),
+	'Popularpages'              => array( 'PaġniPopolari' ),
+	'Search'                    => array( 'Fittex' ),
+	'Resetpass'                 => array( 'BiddelPassword' ),
+	'Withoutinterwiki'          => array( 'BlaInterwiki' ),
+	'MergeHistory'              => array( 'WaħħadKronoloġija' ),
+	'Filepath'                  => array( 'PostFajl' ),
+	'Invalidateemail'           => array( 'PostaElettronikaInvalida' ),
+	'Blankpage'                 => array( 'PaġnaVojta' ),
+	'LinkSearch'                => array( 'FittexĦolqa' ),
+	'DeletedContributions'      => array( 'KontribuzzjonijietImħassra' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#RINDIRIZZA', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__EBDAWERREJ__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__EBDAGALLERIJA__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__SFORZAWERREJ__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__WERREJ__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__EBDASEZZJONIMODIFIKA__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'XAHARKURRENTI', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'ISEMXAHARKURRENTI', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'Ä ENISEMXAHARKURRENTI', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'ABBREVXAHARKURRENTI', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'Ä URNATAKURRENTI', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'Ä URNATAKURRENTI2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'ISEMÄ URNATAKURRENTI', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'SENAKURRENTI', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'ĦINKURRENTI', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'SIEGĦAKURRENTI', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'XAHARLOKALI', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'ISEMXAHARLOKALI', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'Ä ENISEMXAHARLOKALI', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'ABBREVXAHARLOKALI', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'Ä URNATALOKALI', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'Ä URNATALOKALI2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'ISEMTAL-Ä URNATALOKALI', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'SENALOKALI', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'ĦINLOKALI', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'SIEGĦALOKALI', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'NUMRUTA\'PAÄ NI', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'NUMRUTA\'ARTIKLI', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'NUMRUTA\'FAJLS', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'NUMRUTA\'UTENTI', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'NUMBRUTA\'MODIFIKI', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'ISEMTAL-PAÄ NA', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'ISEMTAL-PAÄ NAE', 'PAGENAMEE' ),
+	'talkspace'             => array( '1', 'SPAZJUTA\'DISKUSSJONI', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'SPAZJUTA\'DISKUSSJONIE', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'SPAZJUTAS-SUÄ Ä ETT', 'SPAZJUTAL-ARTIKLU', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'SPAZJUTAS-SUÄ Ä ETTE', 'SPAZJUTAL-ARTILKUE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'ISEMTAL-PAĠNASĦIĦA', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'ISEMTAL-PAĠNASĦIĦAE', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'ISEMTAS-SUBPAÄ NA', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'ISEMTAS-SUBPAÄ NAE', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'ISEMTAL-PAĠNATAL-BAŻI', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'ISEMTAL-PAĠNATAL-BAŻIE', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'ISEMTAL-PAÄ NATAD-DISKUSSJONI', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'ISEMTAL-PAÄ NATAD-DISKUSSJONIE', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'ISEMTAS-SUÄ Ä ETTTAL-PAÄ NA', 'ISEMTAL-ARTIKLUTAL-PAÄ NA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'ISEMTAS-SUÄ Ä ETTTAL-PAÄ NAE', 'ISEMTAL-ARTIKLUTAL-PAÄ NAE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'MSÄ :', 'MSG:' ),
+	'subst'                 => array( '0', 'BIDDEL:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'MSÄ EW:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'daqsminuri', 'minuri', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'daqsminuri=$1', 'minuri=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'lemin', 'right' ),
+	'img_left'              => array( '1', 'xellug', 'left' ),
+	'img_none'              => array( '1', 'xejn', 'none' ),
+	'img_center'            => array( '1', 'nofs', 'Ä‹entrali', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'tilat', 'b\'tilar', 'tilar', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'bla tilar', 'frameless' ),
+	'img_page'              => array( '1', 'paġna=$1', 'paġna $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'wieqaf', 'wieqaf=$1', 'wieqaf $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'bordura', 'border' ),
+	'img_baseline'          => array( '1', 'bażi tal-linja', 'baseline' ),
+	'img_sub'               => array( '1', 'bid', 'sub' ),
+	'img_super'             => array( '1', 'tajjeb', 'taj', 'super', 'sup' ),
+	'img_top'               => array( '1', 'fuq', 'top' ),
+	'img_text_top'          => array( '1', 'test-fuq', 'text-top' ),
+	'img_middle'            => array( '1', 'nofs', 'middle' ),
+	'img_bottom'            => array( '1', 'taħt', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'test-taħt', 'text-bottom' ),
+	'img_link'              => array( '1', 'ħolqa=$1', 'link=$1' ),
+	'sitename'              => array( '1', 'ISEMTAS-SIT', 'SITENAME' ),
+	'ns'                    => array( '0', 'IS:', 'NS:' ),
+	'localurl'              => array( '0', 'URLLOKALI:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'URLLOKALIE:', 'LOCALURLE:' ),
+	'servername'            => array( '0', 'ISEMTAS-SERVER', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'DESTINAZZJONITA\'SKRITT', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'GRAMMATIKA:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__EBDAKONVERTURTITLU__', '__EBDAKT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__EBDAKONVERTURKONTENUT__', '__EBDAKK__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'ĠIMGĦAKURRENTI', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'Ä TÄ KURRENTI', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'ĠIMGĦALOKALI', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'Ä TÄ LOKALI', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'IDTAR-REVIŻJONI', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'ĠURNATATAR-REVIŻJONI', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'ĠURNATATAR-REVIŻJONI2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'XAHARTAR-REVIŻJONI', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'SENATAR-REVIŻJONI', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'TIMBRUTAR-REVIŻJONI', 'REVISIONTIMESTAMP' ),
+	'fullurl'               => array( '0', 'URLSĦIĦA:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'URLSĦIĦAE:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'IBDAKÅ»:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'IBDAKK:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'KÅ»:', 'LC:' ),
+	'uc'                    => array( '0', 'KK:', 'UC:' ),
+	'displaytitle'          => array( '1', 'URITITLU', 'DISPLAYTITLE' ),
+	'newsectionlink'        => array( '1', '__LINKSEZZJONIÄ DIDA__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'VERŻJONIKURRENTI', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'URLKODIÄŠI:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'ANKRAKODIÄŠI', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'TIMBRUTAL-ĦINKURRENTI', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'TIMBRUTAL-ĦINLOKALI', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'MARKATAD-DIREZZJONI', 'MARKADIRE', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#LINGWA:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'LINGWATAL-KONTENUT', 'LINGKONTENUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'PAÄ NIFINNAMESPACE:', 'PAÄ NIFN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'NUMRUTA\'AMMIN', 'NUMBEROFADMINS' ),
+	'padleft'               => array( '0', 'PADXELLUG', 'PADLEFT' ),
+	'padright'              => array( '0', 'PADLEMIN', 'PADRIGHT' ),
+	'special'               => array( '0', 'speċjali', 'special' ),
+	'defaultsort'           => array( '1', 'DEFAULTSORTJA:', 'DEFAULTSORTJAÄŠAVETTA:', 'DEFAULTKATEGORIJISORTJA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'DESTINAZZJONITAL-FAJL:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'tabella', 'tag' ),
+	'hiddencat'             => array( '1', '__KATMOĦBIJA__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'PAÄ NIFIL-KATEGORIJI', 'PAÄ NIFILK', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'DAQSTAL-PAÄ NI', 'PAGESIZE' ),
+	'index'                 => array( '1', '__INDIÄŠI__', '__INDEX__' ),
+	'noindex'               => array( '1', '__EBDAINDIÄŠI__', '__NOINDEX__' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Links Sottolinjati:',
@@ -57,8 +299,6 @@ $messages = array(
 'underline-never'   => 'Qatt',
 'underline-default' => 'Żomm l-issettjar tal-browser',
 
-'skinpreview' => '(Previżjoni)',
-
 # Dates
 'sunday'        => 'Il-Ħadd',
 'monday'        => 'It-Tnejn',
@@ -152,7 +392,7 @@ $messages = array(
 'mytalk'         => 'Id-Diskussjonijiet tiegħi',
 'anontalk'       => 'Diskussjoni għal dan l-IP',
 'navigation'     => 'Navigazzjoni',
-'and'            => 'u',
+'and'            => '&#32;u',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -189,14 +429,14 @@ $messages = array(
 'talkpagelinktext'  => 'Diskussjoni',
 'specialpage'       => 'Paġna speċjali',
 'personaltools'     => 'Għodda personali',
-'postcomment'       => 'Ħalli kumment',
+'postcomment'       => 'Sezzjoni Ä¡dida',
 'articlepage'       => 'Ara l-artiklu',
 'talk'              => 'Diskussjoni',
 'views'             => 'Veduti',
 'toolbox'           => 'Għodda',
 'userpage'          => 'Ara l-paġna tal-utent',
 'projectpage'       => 'Ara l-paġna tal-proġett',
-'imagepage'         => 'Ara l-paġna tal-medja',
+'imagepage'         => 'Ara l-paġna tal-fajl',
 'mediawikipage'     => 'Ara l-paġna tal-messaġġ',
 'templatepage'      => 'Ara l-paġna tat-template',
 'viewhelppage'      => 'Ara l-paġna tal-għajnuna',
@@ -215,8 +455,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Dwar {{SITENAME}}',
 'aboutpage'            => 'Project:Dwar',
-'bugreports'           => 'Rapporti dwar żballji',
-'bugreportspage'       => 'Project:Rapporti dwar żballji',
 'copyright'            => 'Kontenut aċċessibli taħt $1.',
 'copyrightpagename'    => 'Copyright {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -239,9 +477,7 @@ $messages = array(
 
 'badaccess'        => 'Problema bil-permess',
 'badaccess-group0' => "M'għandekx permess twettaq din l-azzjoni.",
-'badaccess-group1' => 'L-azzjoni li rrikjedejt hija riservata għall-utenti membri tal-grupp $1.',
-'badaccess-group2' => 'L-azzjoni li rrikjedejt hija riservata għal utenti membri tal-gruppi $1.',
-'badaccess-groups' => "L-Azzjoni li għamilt rikjesta għal hija restretta għal utenti minn wieħed mill-gruppijiet ta' $1.",
+'badaccess-groups' => "L-azzjoni li rrikjedejt hija riservata għall-utenti membri {{PLURAL:$2|tal-grupp|ta' wieħed minn dawn il-gruppi}}: $1.",
 
 'versionrequired'     => "Hija meħtieġa l-verżjoni $1 ta' MedjaWiki",
 'versionrequiredtext' => "Hija meħtieġa l-verżjoni $1 ta' MedjaWiki biex tuża din il-paġna. Ara [[Special:Version|paġna tal-verżjoni]].",
@@ -255,6 +491,8 @@ $messages = array(
 'editsection'             => 'modifika',
 'editold'                 => 'modifika',
 'viewsourceold'           => 'ara l-fonti',
+'editlink'                => 'editja',
+'viewsourcelink'          => 'ara l-fonti',
 'editsectionhint'         => 'Modifika s-sezzjoni: $1',
 'toc'                     => 'Kontenut',
 'showtoc'                 => 'uri',
@@ -269,13 +507,13 @@ $messages = array(
 'site-atom-feed'          => "Feed Atom ta' $1",
 'page-rss-feed'           => 'Feed RSS għal "$1"',
 'page-atom-feed'          => 'Feed Atom għal "$1"',
-'red-link-title'          => '$1 (għadu jrid jinkiteb)',
+'red-link-title'          => '$1 (il-paġna ma teżistix)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Paġna',
 'nstab-user'      => 'Paġna tal-utent',
 'nstab-media'     => 'Paġna tal-medja',
-'nstab-special'   => 'Speċjali',
+'nstab-special'   => 'Paġna speċjali',
 'nstab-project'   => 'Paġna tal-proġett',
 'nstab-image'     => 'Fajl',
 'nstab-mediawiki' => 'Messaġġ',
@@ -285,7 +523,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Ma teżistix din l-azzjoni',
-'nosuchactiontext'  => "L-Azzjoni speċifikata mill-URL m'ijiex rikonixxuta mill-wiki",
+'nosuchactiontext'  => "L-azzjoni speċifikata mill-URL mhijiex valida.<br />
+Jista' jkun li tkun ktibt ħażin il-URL, jew ġejt imwassal għal ħolqa ħażina.<br />
+Dan jista' jindika wkoll bug fis-software użat fil-{{SITENAME}}.",
 'nosuchspecialpage' => 'L-Ebda paġna speċjali',
 'nospecialpagetext' => "<big>'''Inti għamilt rikjesta għal paġna speċjali invalida.'''</big>
 
@@ -338,7 +578,6 @@ Jekk din mhix ir-raġuni, inti wisq probabli sibt problema fis-software. Jekk jo
 Jista' jkun li diġà tħassru minn xi ħaddieħor.",
 'badtitle'             => 'Titlu ħażin',
 'badtitletext'         => "It-Titlu tal-paġna rikjesta huwa invalidu, vojt, jew linjat ma' inter-lingwi jew titlu ta' inter-wiki żballjat.",
-'perfdisabled'         => "Skuzana! Din il-faċċilitá ġiet imneħija temporalment minħabba li qegħda jġiegħel id-database jmur aktar bil-mod sal-punt fejn ħadd ma jista' juża l-wiki.",
 'perfcached'           => "L-informazzjoni li jmiss huwa kopja ''cache'' u jista' ma jkunx aġġornat.",
 'perfcachedts'         => "Id-dati segwenti huma estratt ta' kopja cache tad-database. L-aħħar aġġornament: $1.",
 'querypage-no-updates' => 'Aġġornamenti għal din il-paġna huma temporalment sospesi. L-Informazzjoni hawnhekk preżentament mhux qiegħed jiġi aġġornat.',
@@ -353,7 +592,7 @@ Jekk jogħġbok erġa' prova fi ftit minuti oħra.",
 'protectedpagetext'    => "Din il-paġna ġiet magħluqa sabiex twaqqaf kull tip ta' modifika.",
 'viewsourcetext'       => "Inti tista' tara jew tikopja l-kodiċi sorġenti ta' din il-paġna:",
 'protectedinterface'   => "Din il-paġna għanda element li tagħmel parti ''mill-interface'' ta' software, u għaldaqstant ġiet protetta sabiex ma jkunx hemm abbuż.",
-'editinginterface'     => "'''Avviż:''' Qiegħed tagħmel modifiki lejn paġna li qegħdha tintuża biex tipprovdi interfaċċa għall-messaġġi tas-software. Kull modifika f'din il-paġna se taffetwa l-apparenza tal-faċċata tal-utenti kollha. Għat-traduzzjonijiet, ikkunsidra l-possibilità li tuża'  [http://translatewiki.net/wiki/Main_Page?setlang=mt Betawiki], il-proġett MediaWiki għal-lokalizzazzjoni.",
+'editinginterface'     => "'''Avviż:''' Qiegħed tagħmel modifiki lejn paġna li qegħdha tintuża biex tipprovdi interfaċċa għall-messaġġi tas-software. Kull modifika f'din il-paġna se taffetwa l-apparenza tal-faċċata tal-utenti kollha. Għat-traduzzjonijiet, ikkunsidra l-possibilità li tuża'  [http://translatewiki.net/wiki/Main_Page?setlang=mt translatewiki.net], il-proġett MediaWiki għal-lokalizzazzjoni.",
 'sqlhidden'            => '(SQL rikjesta moħbija)',
 'cascadeprotected'     => 'Din il-paġna ġiet protetta mill-modifiki, minħabba li tinkludi {{PLURAL:$1|paġni, li huwa|paġni, li huma}} protetti bil-preferenza tal-"kaskata" mixewla:
 $2',
@@ -364,13 +603,13 @@ $2',
 Ir-raġuni li ġiet mogħtija kienet ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Problema fil-konfigurazzjoni: antivirus mhux magħruf: <i>$1</i>',
+'virus-badscanner'     => "Problema fil-konfigurazzjoni: antivirus mhux magħruf: ''$1''",
 'virus-scanfailed'     => 'Tfittxija falliet (kodiċi $1)',
 'virus-unknownscanner' => 'antivirus mhux magħruf:',
 
 # Login and logout pages
 'logouttitle'                => 'Oħroġ utent',
-'logouttext'                 => "<strong>Int issa illogjajt barra.</strong>
+'logouttext'                 => "'''Int issa illogjajt barra.'''
 
 Tista' tkompli tuża' {{SITENAME}} bħala utent anonimu, jew tista' terġa tidħol bħala l-istess utent jew wieħed differenti.
 
@@ -385,7 +624,6 @@ Tinsiex tippersonalizza l-[[Special:Preferences|preferenzi]] ta' {{SITENAME}}.",
 'remembermypassword'         => 'Ftakar il-login tiegħi fuq dan il-kompjuter',
 'yourdomainname'             => 'Id-dominju tiegħek:',
 'externaldberror'            => "Kien hemm problema esterna ta' awtentiċitá jew m'għandhekx permess neċċessarju sabiex tagħmel aġġornamenti fuq l-aċċess estern.",
-'loginproblem'               => "<b>Kien hemm problema bil-login tiegħek.</b><br />Erġa' prova!",
 'login'                      => 'Idħol',
 'nav-login-createaccount'    => 'Idħol / Oħloq kont',
 'loginprompt'                => "Irid ikollok il-cookies mixgħula biex tkun tista' tidħol fuq {{SITENAME}}.",
@@ -411,8 +649,7 @@ Jekk jogħġbok, agħżel isem differenti.',
 'yourvariant'                => 'Varjant:',
 'yournick'                   => 'Firma:',
 'badsig'                     => 'Il-firma mhux standard, hija invalida; iċċekkja t-tags tal-HTML.',
-'badsiglength'               => 'Il-firma hija twila wisq.
-Trid tkun inqas minn $1 {{PLURAL:$1|karratru|karratri}}.',
+'badsiglength'               => 'Il-firma hija twila wisq. Trid tkun inqas minn $1 karratru.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => "L-Isem reali mhux ta' bilfors.
 Jekk tagħżel li tiprovdih, dan jintuża biss biex jagħtik attribuzzjoni għax-xogħol tiegħek.",
@@ -424,8 +661,9 @@ Jekk tagħżel li tiprovdih, dan jintuża biss biex jagħtik attribuzzjoni għax
 'noname'                     => "Inti ma speċifikajtx isem ta' utent validu.",
 'loginsuccesstitle'          => "Dħalt b'suċċess",
 'loginsuccess'               => "'''Irnexxielek taqbad mas-server ta' {{SITENAME}} b'isem l-utent \"\$1\".'''",
-'nosuchuser'                 => 'M\'hemm l-ebda utent bl-isem ta\' "$1".
-Jekk jogħġbok kun żġur li ktibtu sew, jew inkella [[Special:UserLogin/signup|oħloq kont ġdid]].',
+'nosuchuser'                 => 'M\'hemm l-ebda utent bl-isem ta\' "$1".<br />
+L-ismijiet tal-utenti huma sensittivi fuq kif jinkitbu.<br />
+Jekk jogħġbok kun żġur li ktibtu sew, jew minflok [[Special:UserLogin/signup|oħloq kont ġdid]].',
 'nosuchusershort'            => 'M\'hemm l-ebda utent bl-isem "<nowiki>$1</nowiki>".
 Agħmel żġur li ktibta sew.',
 'nouserspecified'            => 'Trid tispeċifika isem l-utent.',
@@ -450,9 +688,9 @@ Jekk jogħġbok, għamel aċċess wara li tasallek.',
 'throttled-mailpassword'     => "Posta elettronika sabiex tfakrek il-password ġiet postjata, fl-aħħar {{PLURAL:$1|siegħa|$1 siegħat}}.
 Sabiex jitnaqqas l-abbuż, waħda biss tista' tiġi postjata f'kull {{PLURAL:$1|siegħa|$1 siegħat}}.",
 'mailerror'                  => 'Problema bil-postar tal-messaġġ: $1',
-'acct_creation_throttle_hit' => 'Jiddispjaċina, imma diġà ħloqt $1 kontijiet.
-Ma tistax toħloq aktar.',
-'emailauthenticated'         => 'L-Indirizz tal-posta elettronika tiegħek kien awtentikat fuq $1.',
+'acct_creation_throttle_hit' => "L-utenti ta' din il-wiki li jużaw l-indirizz IP tiegħek ħolqu {{PLURAL:$1|kont|$1 kontijiet}} fl-aħħar ġurnata, li hu n-numru massimu permess f'dan il-perjodu ta' żmien.
+Bħala riżultat, il-viżitaturi li jużaw dan l-IP ma jistgħux għall-mument, joħoloqu aktar kontijiet.",
+'emailauthenticated'         => 'L-indirizz tal-posta elettronika tiegħek ġiet konfermat nhar il-$1, fil-$3.',
 'emailnotauthenticated'      => "L-Indirizz tal-posta elettronika tiegħek ma ġiex awtentikat s'issa.
 L-ebda posta elettronika se tiġi postjata għal dawn il-faċċilitajiet segwenti.",
 'noemailprefs'               => "Speċifika indirizz ta' posta elettronika sabiex dawn il-faċċilitajiet jaħdmu.",
@@ -469,16 +707,19 @@ Jekk trid tista\' ma tagħtix każ dan il-messaġġ, jekk dan il-kont ġie maħl
 'loginlanguagelabel'         => 'Lingwa: $1',
 
 # Password reset dialog
-'resetpass'               => 'Irrisettja l-password tal-kont',
+'resetpass'               => 'Biddel il-password',
 'resetpass_announce'      => 'L-Aċċess bil-kodiċi temporanju ġie nseħħ, u ġie postjat bil-posta elettronika. Biex tlesti l-aċċess huwa neċessarju toħloq password ġdid hawnhekk:',
 'resetpass_text'          => '<!-- Żied il-kliem hawnhekk -->',
-'resetpass_header'        => 'Irrisettja l-password',
+'resetpass_header'        => 'Biddel il-password tal-kont',
+'oldpassword'             => 'Password antika:',
+'newpassword'             => 'Password Ä¡dida:',
+'retypenew'               => "Erġa' ikteb il-password il-ġdida:",
 'resetpass_submit'        => 'Issettja l-password u idħol fis-sit',
 'resetpass_success'       => 'Il-password ġie modifikat. Aċċess fil-proċess...',
 'resetpass_bad_temporary' => "Password temporanja invalidu.
 Jista jkun li diġa b'suċċess bidilt il-password jew għamilt rikjesta għal password temporanju ġdid.",
 'resetpass_forbidden'     => 'Mhuwiex possibbli li timmodifika l-passwords',
-'resetpass_missing'       => "L-Ebda data ta' forma.",
+'resetpass-temp-password' => 'Password temporanja:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tipa ħoxna',
@@ -503,8 +744,8 @@ Jista jkun li diġa b'suċċess bidilt il-password jew għamilt rikjesta għal p
 'hr_tip'          => 'Linja mimduda (uża bil-qies)',
 
 # Edit pages
-'summary'                          => 'Taqsira',
-'subject'                          => 'Suġġett/Titlu',
+'summary'                          => 'Taqsira:',
+'subject'                          => 'Suġġett/Titlu:',
 'minoredit'                        => 'Din hija modifika żgħira',
 'watchthis'                        => 'Segwi din il-paġna',
 'savearticle'                      => 'Modifika',
@@ -519,8 +760,8 @@ Jekk terġa' tagħfas Modifika, l-modifika se tiġi salvata mingħajr waħda.",
 'missingcommenttext'               => 'Jekk jogħġbok, ħalli kumment hawn taħt.',
 'missingcommentheader'             => "'''Twissija:''' Ma pprovdejtx suġġett/titlu għal dan il-kumment.
 Jekk terġa' tagħfas Modifika, l-modifika tiegħek se tiġi salvata mingħajr waħda.",
-'summary-preview'                  => "Previżjoni ta' taqsira",
-'subject-preview'                  => 'Previżjoni dwar suġġett/titlu',
+'summary-preview'                  => "Previżjoni ta' taqsira:",
+'subject-preview'                  => 'Previżjoni dwar suġġett/titlu:',
 'blockedtitle'                     => 'L-utent Ä¡ie bblokkjat',
 'blockedtext'                      => "<big>'''L-isem ta' l-utent jew l-indirizz IP tiegħek ġew imblukkati.'''</big>
 
@@ -574,61 +815,63 @@ Jekk wasalt hawn biż-żball, agħfas il-buttuna '''lura''' (''back'') fuq il-br
 Għaldaqstant biex nidentifikawh ikollna nużaw l-indirizz tal-IP tiegħu.
 L-istess indirizz tal-IP jista' jkun użat minn bosta utenti differenti.
 Jekk int utent anonimu u tħoss li qiegħed tirċievi kummenti irrelevanti jew li ma jagħmlux sens, jekk jogħġbok [[Special:UserLogin|oħloq kont ġdid jew idħol]] sabiex tevita li fil-futur tiġi konfuż ma' utenti anonimi oħrajn.''",
-'noarticletext'                    => "Bħalissa m'hemmx test f'din il-paġna, inti tista' [[Special:Search/{{PAGENAME}}|tfittex it-titlu ta' din il-paġna]] f'paġni oħrajn jew [{{fullurl:{{FULLPAGENAME}}|action=edit}} tista' ukoll tagħmel modifiki lil din il-paġna].",
+'noarticletext'                    => "Bħalissa m'hemmx test f'din il-paġna. Inti tista' [[Special:Search/{{PAGENAME}}|tfittex it-titlu ta' din il-paġna]] f'paġni oħra, jew <span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} tfittex ir-reġistri relatati], jew [{{fullurl:{{FULLPAGENAME}}|action=edit}} timmodifika din il-paġna]</span>.",
 'userpage-userdoesnotexist'        => 'Il-kont tal-utent "$1" mhux reġistrat. 
 Jekk jogħġbok, ara jekk verament tridx toħloq/timodifika din il-paġna.',
 'clearyourcache'                   => "'''Nota - Wara li tagħmel il-modifiki, xi drabi jkollok bżonn tħassar ''il-cache'' sabiex tkun tista' tara t-tibdil li sar.'''  '''Mozilla / Firefox / Safari:''' żomm ''Shift'' waqt li tkun qiegħed tagħfas ''Reload,'' jew agħfas ''Ctrl-F5'' jew ''Ctrl-R'' (''Command-R'' fuq \"Macintosh\"); '''Konqueror: '''agħfas ''Reload'' jew agħfas ''F5;''  '''Opera:''' ħassar il-cache fl-''Għodda → Preferenzi;'' '''Internet Explorer:''' żomm ''Ctrl'' waqt li tagħfas ''Refresh,'' jew agħfas ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Avviż:</strong> Uża l-buttuna 'Uri previżjoni' sabiex tittestja s-CSS/JS il-ġodda qabel ma tagħmel il-modifiki.",
+'usercssjsyoucanpreview'           => "'''Avviż:''' Uża l-buttuna 'Uri previżjoni' sabiex tittestja s-CSS/JS il-ġodda qabel ma tagħmel il-modifiki.",
 'usercsspreview'                   => "'''Din hi biss previżjoni tas-CSS personali. Il-modifiki għadhom ma ġewx salbati!'''",
 'userjspreview'                    => "'''Ftakar li int qiegħed tara biss previżjoni tal-utent tiegħek tal-JavaScript, għad trid tiġi salvata!'''",
 'userinvalidcssjstitle'            => "'''Twissija:''' M'hemm l-ebda skin bl-isem \"\$1\".
 Ftakar li l-paġni .css u .js personalizzati għandhom l-ewwel ittra tat-titlu żgħira, eż. {{ns:user}}:Foo/monobook.css u mhux {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(AÄ¡Ä¡ornata)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Din hija previżjoni biss; il-modifiki li saru fil-paġna għadhom ma ġewx salvati!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Din hija previżjoni biss; il-modifiki li saru fil-paġna għadhom ma ġewx salvati!'''",
 'previewconflict'                  => "Din il-previżjoni turi l-kliem li jinsab fiż-żona ta' modifika superjuri u turi kif tidher kieku l-paġna kella tiġi modifikata.",
-'session_fail_preview'             => "<strong>Jiddispjaċina imma l-modifika tiegħek ma setgħetx tiġi pproċessata minħabba li ntilfet l-informazzjoni tas-sessjoni.
-Jekk jogħġbok, erġa' pprova. Jekk xorta tibqa' ma taħdimx, ipprova oħroġ u erġa' idħol.</strong>",
-'session_fail_preview_html'        => "<strong>Jiddispjaċina imma l-modifika tiegħek ma setgħetx tiġi pproċessata minħabba li ntilfet l-informazzjoni tas-sessjoni.</strong>
+'session_fail_preview'             => "'''Jiddispjaċina imma l-modifika tiegħek ma setgħetx tiġi pproċessata minħabba li ntilfet l-informazzjoni tas-sessjoni.
+Jekk jogħġbok, erġa' pprova. Jekk xorta tibqa' ma taħdimx, ipprova oħroġ u erġa' idħol.'''",
+'session_fail_preview_html'        => "'''Jiddispjaċina imma l-modifika tiegħek ma setgħetx tiġi pproċessata minħabba li ntilfet l-informazzjoni tas-sessjoni.'''
 
 ''Peress li f'{{SITENAME}} huwa possibbli l-użu ta' l-HTML mingħajr limitazzjonijiet (''raw HTML''), il-previżjoni tiġi moħbija bħala prekawzjoni kontra l-attakki tal-JavaScript.''
 
-<strong>Jekk dan huwa attentat leġittmu ta' modifika, jekk jogħġbok erġa' pprova. Jekk tibqa' ma taħdimx, ipprova oħroġ u erġa' idħol.</strong>",
-'token_suffix_mismatch'            => "<strong>Il-modifika tiegħek ma ġietx aċċettata minħabba li klijent tiegħek tertaq l-karratri tal-ortografija fit-token tal-modifika.
-Din il-modifika ma ġietx aċċettata sabiex ma jkunx hemm żballji fit-test tal-paġna. Dan xi kultant jiġri minħabba li qiegħed tuża servizz difettuż anonimu li huwa bbażat fuq il-web ta' prokura.</strong>",
+'''Jekk dan huwa attentat leġittmu ta' modifika, jekk jogħġbok erġa' pprova. Jekk tibqa' ma taħdimx, ipprova oħroġ u erġa' idħol.'''",
+'token_suffix_mismatch'            => "'''Il-modifika tiegħek ma ġietx aċċettata minħabba li klijent tiegħek tertaq l-karratri tal-ortografija fit-token tal-modifika.
+Din il-modifika ma ġietx aċċettata sabiex ma jkunx hemm żballji fit-test tal-paġna. Dan xi kultant jiġri minħabba li qiegħed tuża servizz difettuż anonimu li huwa bbażat fuq il-web ta' prokura.'''",
 'editing'                          => 'Qiegħed jiġi modifikat l-artiklu $1',
 'editingsection'                   => "Modifikar ta' $1 (sezzjoni)",
-'editingcomment'                   => 'Modifika $1 (kumment)',
+'editingcomment'                   => 'Qed jiġi editjat $1 (sezzjoni ġdida)',
 'editconflict'                     => "Kunflitt ta' modifika: $1",
 'explainconflict'                  => "Xi ħadd modifika din il-paġna sakemm int kont qiegħed tagħmel il-modifiki. <br />
 Fiż-Żona tal-modifika superjuri jinsab il-kliem tal-paġna kif teżisti bħalissa, kif ġiet modifikata mill-utent l-ieħor. Il-Verżjoni bil-modifiki tiegħek jinsab fiż-żona ta' modifika inferjuri. Jekk trid il-modifiki tiegħek jiġu salvati, inti trid tgħaqqad il-modifiki tiegħek mat-test kif jeżisti bħalissa fiż-żona superjuri.
 Meta tagħfas ''Modifika'', se jiġi salvat '''biss''' it-test li jinsab fiż-żona superjuri.",
 'yourtext'                         => 'It-test tiegħek',
 'storedversion'                    => 'Il-verżjoni maħżuna',
-'nonunicodebrowser'                => "<strong>TWISSIJA: Il-Browser tiegħek m'għandux sapport għal unicode.
-Hemm xogħol sabiex iħallik tagħmel modifiki lil paġni mingħajr periklu ta' xejn: karratri li m'humiex ASCII se jidhru fil-kaxxa tal-modifika bħala kodiċi hexadeċimali.</strong>",
-'editingold'                       => "<strong>TWISSIJA: Qiegħed tagħmel modifika ta' reviżjoni antika ta' din il-paġna.
-Jekk isalva dawn il-modifiki, kull bidla li saret mir-reviżjonijiet ta' wara din ir-reviżjoni se jiġu mitlufa.</strong>",
+'nonunicodebrowser'                => "'''TWISSIJA: Il-Browser tiegħek m'għandux sapport għal unicode.
+Hemm xogħol sabiex iħallik tagħmel modifiki lil paġni mingħajr periklu ta' xejn: karratri li m'humiex ASCII se jidhru fil-kaxxa tal-modifika bħala kodiċi hexadeċimali.'''",
+'editingold'                       => "'''TWISSIJA: Qiegħed tagħmel modifika ta' reviżjoni antika ta' din il-paġna.
+Jekk isalva dawn il-modifiki, kull bidla li saret mir-reviżjonijiet ta' wara din ir-reviżjoni se jiġu mitlufa.'''",
 'yourdiff'                         => 'Differenzi',
 'copyrightwarning'                 => "Jekk jogħġbok innota li kull kontribuzzjoni li tagħmel lil {{SITENAME}} hija konsidrata li ġiet postjata taħt l-$2 (ara $1 għal aktar informazzjoni).
 Jekk inti tixtieq li l-kitba tiegħek ma tiġiex modifikata jew mqassma, jekk jogħġbok tagħmilx modifiki hawnhekk.<br />
 Inti qiegħed ukoll qiegħed twiegħed li ktibt dan ix-xogħol int, jew ġibtu minn dominazzjoni pubblika jew resorsi b'xejn simili. <br />
 <br />
-<strong>TAGĦMILX MODIFIKI LI JINKLUDU XOGĦOL TA' ĦADDIEĦOR BLA PERMESS!</strong>",
+'''TAGĦMILX MODIFIKI LI JINKLUDU XOGĦOL TA' ĦADDIEĦOR BLA PERMESS!'''",
 'copyrightwarning2'                => "Jekk jogħġbok innota li kull kontribuzzjoni li tagħmel lil {{SITENAME}} tista' tiġi modifikata, inbidla, jew imħassra minn kontributuri oħrajn. 
 Jekk inti tixtieq li l-kitba tiegħek ma tiġiex modifikata jew mqassma, jekk jogħġbok tagħmilx modifiki hawnhekk.<br />
 Inti qiegħed ukoll qiegħed twiegħed li ktibt dan ix-xogħol int, jew ġibtu minn dominazzjoni pubblika jew resorsi b'xejn simili. (ara  $1 għal aktar informazzjoni) <br />
 <br />
-<strong>TAGĦMILX MODIFIKI LI JINKLUDU XOGĦOL TA' ĦADDIEĦOR BLA PERMESS!</strong>",
-'longpagewarning'                  => "<strong>TWISSIJA: Din il-paġna hija $1 kb twila;
+'''TAGĦMILX MODIFIKI LI JINKLUDU XOGĦOL TA' ĦADDIEĦOR BLA PERMESS!'''",
+'longpagewarning'                  => "'''TWISSIJA: Din il-paġna hija $1 kb twila;
 ċerta browsers jista' jkollhom problemi biex jagħmlu modifiki lil paġni li qegħdin lejn jew aktar minn 32 kb.
-Jekk jogħġbok konsidra taqsam din il-paġna f'sezzjonijiet iż-żgħar.</strong>",
-'longpageerror'                    => "<strong>PROBLEMA: Il-Modifika li għamilt hija twila $1 ''kilobyte'', li hija aktar mill-massimu ta' $2 ''kilobyte''. Il-Modifiki ma jistgħux jiġu salvati.</strong>",
-'readonlywarning'                  => "<strong>TWISSIJA: Id-''Database'' huwa magħluq bħalissa għal manteniment, għalhekk int mhux se tkun tista' tagħmel modifiki bħalissa. Jekk jogħġbok salva x-xogħol tiegħek ġo fajl għalissa sakemm id-''database'' jerġa jinfetaħ. Grazzi</strong>",
-'protectedpagewarning'             => "<strong>TWISSIJA:  Din il-paġna ġiet magħluqa sabiex utenti bi privileġi ta' amministratur biss ikunu jistgħu jagħmel modifiki.</strong>",
+Jekk jogħġbok konsidra taqsam din il-paġna f'sezzjonijiet iż-żgħar.'''",
+'longpageerror'                    => "'''PROBLEMA: Il-Modifika li għamilt hija twila $1 ''kilobyte'', li hija aktar mill-massimu ta' $2 ''kilobyte''. Il-Modifiki ma jistgħux jiġu salvati.'''",
+'readonlywarning'                  => "'''TWISSIJA: Id-database ġiet imblukkata għall-manutenzjoni, u għaldaqstant m'huwiex possibbli ssalva l-modifiki f'dal-ħin. Biex ma titlifhomx, għalissa salva xogħlok ġo fajl u ladarba terġa' tinfetaħ id-database, ikkopja kollox. Grazzi.'''
+
+L-amministratur li bblokkja d-database offra din ir-raġuni: $1",
+'protectedpagewarning'             => "'''TWISSIJA:  Din il-paġna ġiet magħluqa sabiex utenti bi privileġi ta' amministratur biss ikunu jistgħu jagħmel modifiki.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Din il-paġna ġiet magħluqa sabiex utenti reġistrati biss ikunu jistgħu jagħmlu modifiki.",
 'cascadeprotectedwarning'          => "'''Twissija:''' Din il-paġna ġiet magħluqa biex utenti bi privileġi ta' amministratur biss ikunu jistgħu jagħmlu modifiki, minħabba li hija inkluża fil-{{PLURAL:$1|paġna|paġni}} li huma protetti-kaskata:",
-'titleprotectedwarning'            => '<strong>TWISSIJA:  Din il-paġna ġiet magħluqa sabiex ftit utenti jkunu jistgħu jagħmlu modifiki.</strong>',
+'titleprotectedwarning'            => "'''TWISSIJA:  Din il-paġna ġiet imblukkata sabiex dawk l-utenti li għandhom [[Special:ListGroupRights|drittijiet speċifiċi]] jkunu jistgħu joħolquha.'''",
 'templatesused'                    => 'Templates użati fuq din il-paġna:',
 'templatesusedpreview'             => 'Templates użati fil-previżjoni:',
 'templatesusedsection'             => "Templates użati f'din is-sezzjoni:",
@@ -642,16 +885,17 @@ Tista' tmur lura u tagħmel modifiki ta' paġni eżistenti, inkella [[Special:Us
 'nocreate-loggedin'                => "M'għandekx permess li toħloq paġni ġodda.",
 'permissionserrors'                => 'Problemi bil-permessi',
 'permissionserrorstext'            => "Inti m'għandhekx dritt li tagħmel hekk, għar-{{PLURAL:$1|raġuni|raġunijiet}} segwenti:",
-'permissionserrorstext-withaction' => "Inti m'għandhekx permess għal $2, għal {{PLURAL:$1|reason|raġunijiet}} segwenti:",
+'permissionserrorstext-withaction' => "Inti m'għandekx permess għal $2, għar-{{PLURAL:$1|raġuni|raġunijiet}} segwenti:",
 'recreate-deleted-warn'            => "'''Twissija: Inti qiegħed toħloq paġna li kienet imħassra.'''
 
 Aċċerta ruħek jekk mhux opportun li tkompli timodifika din il-paġna.
 Il-Link għar-reġistru ta' tħassir għal din il-paġna hija provduta għal konvenjenza:",
+'edit-conflict'                    => 'Kunflitt tal-editjar.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => "Twissija: Din il-paġna għanda ħafna sejħiet ta' funżjonijiet ta' analiżi għoljien.
+'expensive-parserfunction-warning'        => 'Attenzjoni: Din il-paġna għandha ħafna sejħiet għall-funzjonijiet parser.
 
-Trid ikollha inqas minn $2, bħalissa hemm $1.",
+Suppost irid ikollha inqas minn $2, bħalissa hemm $1.',
 'expensive-parserfunction-category'       => "Paġni b'ħafna sejħiet ta' funżjonijiet ta' analiżi għoljien.",
 'post-expand-template-inclusion-warning'  => "Twissija: Id-Daqs tal-kontenut ta' template hija wisq kbira.
 Ftit templates mhux se jiġu inkluża.",
@@ -673,29 +917,28 @@ Dawn l-argumenti tħallew barra.",
 Ir-raġuni li ġiet mogħtija mingħand $3 kienet ''$2''",
 
 # History pages
-'viewpagelogs'        => "Ara r-reġistri ta' din il-paġna",
-'nohistory'           => "M'hemm l-ebda kronoloġija ta' modifika f'din il-paġna.",
-'revnotfound'         => 'Ir-reviżjoni ma nstabitx',
-'revnotfoundtext'     => "Ir-reviżjoni l-antika tal-paġna li staqsejt dwar ma setgħatx tiġi minsuba. Jekk jogħġbok verifika l-URL li użajt sabiex tidħol f'din il-paġna.",
-'currentrev'          => 'Reviżjoni kurrenti',
-'revisionasof'        => "Reviżjoni ta' $1",
-'revision-info'       => "Reviżjoni ta' $1 minn $2",
-'previousrevision'    => '�Reviżjoni eqdem',
-'nextrevision'        => 'Reviżjoni iġded→',
-'currentrevisionlink' => 'Reviżjoni kurrenti',
-'cur'                 => 'kur',
-'next'                => 'li jmiss',
-'last'                => 'l-aħħar',
-'page_first'          => 'l-ewwel',
-'page_last'           => 'l-aħħar',
-'histlegend'          => "Selezzjoni diff: marka l-kaxxi tar-radju tal-verżjonijiet sabiex tagħmel paragun u agħfas enter jew il-buttuna fin-naħħa t'isfel.<br />
+'viewpagelogs'           => "Ara r-reġistri ta' din il-paġna",
+'nohistory'              => "M'hemm l-ebda kronoloġija ta' modifika f'din il-paġna.",
+'currentrev'             => 'Reviżjoni kurrenti',
+'revisionasof'           => "Reviżjoni ta' $1",
+'revision-info'          => "Reviżjoni ta' $1 minn $2", # Additionally available: $3: revision id
+'previousrevision'       => '�Reviżjoni eqdem',
+'nextrevision'           => 'Reviżjoni iġded→',
+'currentrevisionlink'    => 'Reviżjoni kurrenti',
+'cur'                    => 'kur',
+'next'                   => 'li jmiss',
+'last'                   => 'l-aħħar',
+'page_first'             => 'l-ewwel',
+'page_last'              => 'l-aħħar',
+'histlegend'             => "Selezzjoni diff: marka l-kaxxi tar-radju tal-verżjonijiet sabiex tagħmel paragun u agħfas enter jew il-buttuna fin-naħħa t'isfel.<br />
 Leġġenda: (kur) = differenzi bil-verżjoni kurrenti,
 (l-aħħar) = differenzi bil-verżjoni preċedenti, M = modifiki żgħar.",
-'deletedrev'          => '[imħassra]',
-'histfirst'           => 'L-Aktar kmieni',
-'histlast'            => 'L-Aktar tard',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vojta)',
+'history-fieldset-title' => 'Fittex fil-kronoloġija',
+'deletedrev'             => '[imħassra]',
+'histfirst'              => 'L-Aktar kmieni',
+'histlast'               => 'L-Aktar tard',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vojta)',
 
 # Revision feed
 'history-feed-title'          => 'Kronoloġija',
@@ -780,6 +1023,7 @@ Nota li l-użu tal-links tan-navigazzjoni jagħmel reset tal-kolonna.",
 'mergehistory-invalid-destination' => 'Paġna tad-destinazzjoni għandu jkollu titlu validu.',
 'mergehistory-autocomment'         => "[[:$1]] twaħħad ma' [[:$2]]",
 'mergehistory-comment'             => "[[:$1]] twaħħad ma' [[:$2]]: $3",
+'mergehistory-same-destination'    => 'Il-paġni tas-sors u tad-destinazzjoni ma jistgħux ikunu l-istess',
 
 # Merge log
 'mergelog'           => "Reġistru ta' twaħħid",
@@ -792,122 +1036,152 @@ Nota li l-użu tal-links tan-navigazzjoni jagħmel reset tal-kolonna.",
 'difference'              => '(Differenzi bejn ir-reviżjonijiet)',
 'lineno'                  => 'Linja $1:',
 'compareselectedversions' => 'Qabbel il-verżjonijiet magħżula',
+'visualcomparison'        => 'Konfront viżwali',
+'wikicodecomparison'      => 'Konfront tal-wikitext',
 'editundo'                => 'ħassar',
 'diff-multi'              => '({{PLURAL:$1|One intermediate revision|$1 reviżjonijiet intermedji}} mhux qegħdin jidhru.)',
+'diff-movedto'            => 'immexxi għal $1',
+'diff-changedto'          => 'imbiddel għal $1',
+'diff-removed'            => 'Tneħħa $1',
+'diff-src'                => 'sors',
+'diff-withdestination'    => "b'destinazzjoni $1",
+'diff-width'              => "wisa'",
+'diff-height'             => 'tul',
+'diff-p'                  => "'''paragrafu'''",
+'diff-blockquote'         => "'''kwotazzjoni'''",
 
 # Search results
-'searchresults'             => 'Riżultat tat-tfittxija',
-'searchresulttext'          => "Aktar informazzjoni dwar ir-riċerka ta' {{SITENAME}}, ara [[{{MediaWiki:Helppage}}|{{int:help}}]].",
-'searchsubtitle'            => "Int fittixt għal '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "Int fittixt għal '''$1'''",
-'noexactmatch'              => "'''M'hemmx paġna li jisimha \"\$1\".''' Inti tista' [[:\$1|toħloq din il-paġna]].",
-'noexactmatch-nocreate'     => "'''M'hemmx paġna li jisimha \"\$1\".'''",
-'toomanymatches'            => 'Ħafna tqabbil ġew ritornati, jekk jogħġbok prova inkjesta differenti',
-'titlematches'              => 'Titlu tal-paġna taqbel',
-'notitlematches'            => "L-ebda titlu ta' paġna ma jaqbel",
-'textmatches'               => 'It-test tal-paġni, jaqbel',
-'notextmatches'             => "L-ebda test ta' paġna ma jaqbel",
-'prevn'                     => "$1 ta' qabel",
-'nextn'                     => '$1 li jmiss',
-'viewprevnext'              => 'Ara ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 word|$2 kliem}})',
-'search-result-score'       => 'Relevanza: $1%',
-'search-redirect'           => '(rindirizza $1)',
-'search-section'            => '(sezzjoni $1)',
-'search-suggest'            => 'Trid tfisser: $1',
-'search-interwiki-caption'  => 'Proġetti kuġini',
-'search-interwiki-default'  => "Riżultati ta' $1:",
-'search-interwiki-more'     => '(aktar)',
-'search-mwsuggest-enabled'  => 'bis-suġġerimenti',
-'search-mwsuggest-disabled' => 'l-ebda suġġeriment',
-'search-relatedarticle'     => 'Relatati',
-'mwsuggest-disable'         => 'Neħħi suġġeriment tal-AJAX',
-'searchrelated'             => 'relatati',
-'searchall'                 => 'kollha',
-'showingresults'            => "Hawnhekk {{PLURAL:$1|instab riżultat għal massimu ta' '''1'''|instab '''$1''' riżultati għal massimu}} li jibda' bin-numru '''$2'''.",
-'showingresultsnum'         => "Hawnhekk jinstabu {{PLURAL:$3|riżultat '''1'''|'''$3''' riżultati}} li jibdew bin-numru '''$2'''.",
-'showingresultstotal'       => "{{PLURAL:$3|Riżultati minn '''$1''' sa '''$3'''|Riżultati '''$1 - $2''' ta' '''$3'''}} jinstabu hawn taħt",
-'nonefound'                 => "'''Nota''': Awtomatikament, huma ftit spazji tal-isem imfittxija.
-Ipprova għamel prefiss għall-inkjesta tiegħek ma' ''kollha:'' sabiex tfittex il-kontenut kollu (inkluż paġni ta' diskussjoni, mudelli, etċ), jew uża l-ispazju tal-isem mixtieq bħala prefiss.",
-'powersearch'               => 'Tfittxija avvanzata',
-'powersearch-legend'        => 'Tfittxija avvanzata',
-'powersearch-ns'            => "Fittex fin-''namespace'':",
-'powersearch-redir'         => "Lista ta' rindirizzi",
-'powersearch-field'         => 'Fittex',
-'search-external'           => 'Tfittxija esterna',
-'searchdisabled'            => "It-Tfittxija fil-{{SITENAME}} mhux attiva.
+'searchresults'                  => 'Riżultat tat-tfittxija',
+'searchresults-title'            => 'Riżultati tat-tfittxija għal "$1"',
+'searchresulttext'               => "Aktar informazzjoni dwar ir-riċerka ta' {{SITENAME}}, ara [[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchsubtitle'                 => "Int fittixt għal '''[[:$1]]'''",
+'searchsubtitleinvalid'          => "Int fittixt għal '''$1'''",
+'noexactmatch'                   => "'''M'hemmx paġna li jisimha \"\$1\".''' Inti tista' [[:\$1|toħloq din il-paġna]].",
+'noexactmatch-nocreate'          => "'''M'hemmx paġna li jisimha \"\$1\".'''",
+'toomanymatches'                 => 'Ħafna tqabbil ġew ritornati, jekk jogħġbok prova inkjesta differenti',
+'titlematches'                   => 'Titlu tal-paġna taqbel',
+'notitlematches'                 => "L-ebda titlu ta' paġna ma jaqbel",
+'textmatches'                    => 'It-test tal-paġni, jaqbel',
+'notextmatches'                  => "L-ebda test ta' paġna ma jaqbel",
+'prevn'                          => "$1 ta' qabel",
+'nextn'                          => '$1 li jmiss',
+'viewprevnext'                   => 'Ara ($1) ($2) ($3)',
+'searchhelp-url'                 => 'Help:Kontenut',
+'searchmenu-prefix'              => "[[Special:PrefixIndex/$1|Uri l-paġni b'dan il-prefiss]]",
+'searchprofile-articles'         => "Paġni ta' kontenut",
+'searchprofile-project'          => "Paġni ta' proġetti",
+'searchprofile-images'           => 'Fajls',
+'searchprofile-everything'       => 'Kollox',
+'searchprofile-advanced'         => 'Avvanzata',
+'searchprofile-articles-tooltip' => "Fittex f'$1",
+'searchprofile-project-tooltip'  => "Fittex f'$1",
+'searchprofile-images-tooltip'   => 'Fittex għal fajls',
+'prefs-search-nscustom'          => 'Fittex fl-ispazji tal-isem personalizzati:',
+'search-result-size'             => '$1 ({{PLURAL:$2|1 word|$2 kliem}})',
+'search-result-score'            => 'Relevanza: $1%',
+'search-redirect'                => '(rindirizza $1)',
+'search-section'                 => '(sezzjoni $1)',
+'search-suggest'                 => 'Trid tfisser: $1',
+'search-interwiki-caption'       => 'Proġetti kuġini',
+'search-interwiki-default'       => "Riżultati ta' $1:",
+'search-interwiki-more'          => '(aktar)',
+'search-mwsuggest-enabled'       => 'bis-suġġerimenti',
+'search-mwsuggest-disabled'      => 'l-ebda suġġeriment',
+'search-relatedarticle'          => 'Relatati',
+'mwsuggest-disable'              => 'Neħħi suġġeriment tal-AJAX',
+'searchrelated'                  => 'relatati',
+'searchall'                      => 'kollha',
+'showingresults'                 => "Hawnhekk {{PLURAL:$1|instab riżultat għal massimu ta' '''1'''|instab '''$1''' riżultati għal massimu}} li jibda' bin-numru '''$2'''.",
+'showingresultsnum'              => "Hawnhekk jinstabu {{PLURAL:$3|riżultat '''1'''|'''$3''' riżultati}} li jibdew bin-numru '''$2'''.",
+'showingresultstotal'            => "{{PLURAL:$3|Riżultati minn '''$1''' sa '''$3'''|Riżultati '''$1 - $2''' ta' '''$3'''}} jinstabu hawn taħt",
+'nonefound'                      => "'''Nota''': Awtomatikament, huma ftit spazji tal-isem imfittxija.
+Ipprova għamel prefiss għall-inkjesta tiegħek ma' ''all:'' sabiex tfittex il-kontenut kollu (inkluż paġni ta' diskussjoni, mudelli, etċ), jew uża l-ispazju tal-isem mixtieq bħala prefiss.",
+'search-nonefound'               => 'Ir-riċerka ma tat l-ebda riżultat.',
+'powersearch'                    => 'Tfittxija avvanzata',
+'powersearch-legend'             => 'Tfittxija avvanzata',
+'powersearch-ns'                 => "Fittex fin-''namespace'':",
+'powersearch-redir'              => "Lista ta' rindirizzi",
+'powersearch-field'              => 'Fittex',
+'search-external'                => 'Tfittxija esterna',
+'searchdisabled'                 => "It-Tfittxija fil-{{SITENAME}} mhux attiva.
 Sadanittant, tista' tipprova tfittex bil-Google.
 Innota però li l-werreja tal-kontenut ta' {{SITENAME}} f'dawn is-siti, jistgħu ma jkunux aġġornati.",
 
 # Preferences page
-'preferences'              => 'Preferenzi',
-'mypreferences'            => 'Il-Preferenzi tiegħi',
-'prefs-edits'              => "Numru ta' modifiki:",
-'prefsnologin'             => 'Għadek ma dħaltx ġewwa',
-'prefsnologintext'         => 'Sabiex tkun tista\' tippersonalizza l-preferenzi huwa neċessarju li tidħol fil-<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} kont]</span>.',
-'prefsreset'               => 'Il-preferenzi ġew irrisettjati għall-valuri predefiniti.',
-'qbsettings'               => "''Quickbar''",
-'qbsettings-none'          => 'Xejn',
-'qbsettings-fixedleft'     => 'Mehmuż fix-xellug',
-'qbsettings-fixedright'    => 'Mehmuż fil-lemin',
-'qbsettings-floatingleft'  => "''Floating'' lejn ix-xellug",
-'qbsettings-floatingright' => "''Floating'' lejn il-lemin",
-'changepassword'           => 'Ibdel il-password',
-'skin'                     => 'Aspett grafiku (skin)',
-'math'                     => 'Formuli matematiċi',
-'dateformat'               => 'Format tad-data',
-'datedefault'              => 'L-ebda preferenza',
-'datetime'                 => 'Data u ħin',
-'math_failure'             => "Problema fil-''parser''",
-'math_unknown_error'       => 'Problema mhux magħrufa',
-'math_unknown_function'    => 'funżjoni mhux magħrufa',
-'math_lexing_error'        => 'żball lessikali',
-'math_syntax_error'        => 'żball fis-sintassi',
-'math_image_error'         => "Konverżjoni għal PNG bla suċċess; verifika li huma installati tajjeb il-programmi segwenti: ''latex, dvips, gs, u convert''",
-'math_bad_tmpdir'          => "Impossibli tikteb jew toħloq direttorju temporanju għal ''math''",
-'math_bad_output'          => "Impossibli tikteb jew toħloq direttorju tal-''output'' tal-''math''",
-'math_notexvc'             => "Esekuzzjoni ''texvc'' nieqes; jekk jogħġbok konsultà ''math/README'' għal konfigurazzjoni.",
-'prefs-personal'           => 'Profil tal-utent',
-'prefs-rc'                 => 'Modifiki riċenti',
-'prefs-watchlist'          => 'Osservazzjoni speċjali',
-'prefs-watchlist-days'     => "Numru ta' ġranet li għandu jintwera fil-osservazzjoni speċjali:",
-'prefs-watchlist-edits'    => "Numru ta' modifiki li tista' turi bil-funżjoni avvanzata:",
-'prefs-misc'               => 'Varji',
-'saveprefs'                => 'Żomm il-preferenzi',
-'resetprefs'               => 'Neħħi modifiki mhux salvati',
-'oldpassword'              => 'Password antika:',
-'newpassword'              => 'Password Ä¡dida:',
-'retypenew'                => "Erġa' ikteb il-password il-ġdida:",
-'textboxsize'              => 'Modifika',
-'rows'                     => 'Filieri:',
-'columns'                  => 'Kolonni:',
-'searchresultshead'        => 'Fittex',
-'resultsperpage'           => "Numru ta' riżultati għal kull paġna:",
-'contextlines'             => 'Filieri għal kull riżultat:',
-'contextchars'             => "Numru ta' karratri tal-kliem",
-'stub-threshold'           => 'Valur minimu għal <a href="#" class="stub">link għas-stub</a>:',
-'recentchangesdays'        => "Numru ta' ġranet li jidher fl-aħħar modifiki:",
-'recentchangescount'       => "Numru ta' filieri fil-modifiki riċenti:",
-'savedprefs'               => 'Il-Preferenzi tiegħek ġew salvati.',
-'timezonelegend'           => 'Żona tal-ħin',
-'timezonetext'             => "¹Numru ta' siegħat li hemm differenza bejn il-ħin lokali u il-ħin tas-server (UTC).",
-'localtime'                => 'Ħin lokali',
-'timezoneoffset'           => 'Differenza¹',
-'servertime'               => 'Ħin tas-server',
-'guesstimezone'            => "Uża l-ħin tal-''browser'' tiegħek",
-'allowemail'               => 'Ħalli li jaslulek emails mingħand utenti oħrajn',
-'prefs-searchoptions'      => 'Preferenzi għat-tfittxija',
-'prefs-namespaces'         => 'Namespace',
-'defaultns'                => 'Namespace predefinit għat-tfittxija:',
-'default'                  => 'predefinit',
-'files'                    => 'Fajls',
+'preferences'               => 'Preferenzi',
+'mypreferences'             => 'Il-Preferenzi tiegħi',
+'prefs-edits'               => "Numru ta' modifiki:",
+'prefsnologin'              => 'Għadek ma dħaltx ġewwa',
+'prefsnologintext'          => 'Sabiex tkun tista\' tippersonalizza l-preferenzi huwa neċessarju li tidħol fil-<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} kont]</span>.',
+'prefsreset'                => 'Il-preferenzi ġew irrisettjati għall-valuri predefiniti.',
+'qbsettings'                => "''Quickbar''",
+'qbsettings-none'           => 'Xejn',
+'qbsettings-fixedleft'      => 'Mehmuż fix-xellug',
+'qbsettings-fixedright'     => 'Mehmuż fil-lemin',
+'qbsettings-floatingleft'   => "''Floating'' lejn ix-xellug",
+'qbsettings-floatingright'  => "''Floating'' lejn il-lemin",
+'changepassword'            => 'Ibdel il-password',
+'skin'                      => 'Aspett grafiku (skin)',
+'skin-preview'              => 'Previżjoni',
+'math'                      => 'Formuli matematiċi',
+'dateformat'                => 'Format tad-data',
+'datedefault'               => 'L-ebda preferenza',
+'datetime'                  => 'Data u ħin',
+'math_failure'              => "Problema fil-''parser''",
+'math_unknown_error'        => 'Problema mhux magħrufa',
+'math_unknown_function'     => 'funżjoni mhux magħrufa',
+'math_lexing_error'         => 'żball lessikali',
+'math_syntax_error'         => 'żball fis-sintassi',
+'math_image_error'          => "Konverżjoni għal PNG bla suċċess; verifika li huma installati tajjeb il-programmi segwenti: ''latex, dvips, gs, u convert''",
+'math_bad_tmpdir'           => "Impossibli tikteb jew toħloq direttorju temporanju għal ''math''",
+'math_bad_output'           => "Impossibli tikteb jew toħloq direttorju tal-''output'' tal-''math''",
+'math_notexvc'              => "Esekuzzjoni ''texvc'' nieqes; jekk jogħġbok konsultà ''math/README'' għal konfigurazzjoni.",
+'prefs-personal'            => 'Profil tal-utent',
+'prefs-rc'                  => 'Modifiki riċenti',
+'prefs-watchlist'           => 'Osservazzjoni speċjali',
+'prefs-watchlist-days'      => "Numru ta' ġranet li għandu jintwera fil-osservazzjoni speċjali:",
+'prefs-watchlist-days-max'  => '(massimu 7 ijiem)',
+'prefs-watchlist-edits'     => "Numru ta' modifiki li tista' turi bil-funżjoni avvanzata:",
+'prefs-watchlist-edits-max' => '(numru massimu: 1000)',
+'prefs-misc'                => 'Varji',
+'prefs-resetpass'           => 'Biddel il-password',
+'saveprefs'                 => 'Żomm il-preferenzi',
+'resetprefs'                => 'Neħħi modifiki mhux salvati',
+'textboxsize'               => 'Modifika',
+'prefs-edit-boxsize'        => 'Daqs tat-tieqa tal-immodifikar.',
+'rows'                      => 'Filieri:',
+'columns'                   => 'Kolonni:',
+'searchresultshead'         => 'Fittex',
+'resultsperpage'            => "Numru ta' riżultati għal kull paġna:",
+'contextlines'              => 'Filieri għal kull riżultat:',
+'contextchars'              => "Numru ta' karratri tal-kliem",
+'stub-threshold'            => 'Valur minimu għal <a href="#" class="stub">link għas-stub</a>:',
+'recentchangesdays'         => "Numru ta' ġranet li jidher fl-aħħar modifiki:",
+'recentchangesdays-max'     => '(massimu $1 Ä¡urnata)',
+'recentchangescount'        => "Numru ta' fillieri fit-tibdil riċenti, kronoloġiji, u fir-reġistri:",
+'savedprefs'                => 'Il-Preferenzi tiegħek ġew salvati.',
+'timezonelegend'            => 'Żona tal-ħin',
+'timezonetext'              => "¹Numru ta' siegħat li hemm differenza bejn il-ħin lokali u il-ħin tas-server (UTC).",
+'localtime'                 => 'Ħin lokali:',
+'timezoneselect'            => 'Żona tal-ħin:',
+'timezoneuseserverdefault'  => 'Uża l-ħin tas-server',
+'timezoneuseoffset'         => 'Ieħor (ispeċifika d-differenza)',
+'timezoneoffset'            => 'Differenza¹:',
+'servertime'                => 'Ħin tas-server:',
+'guesstimezone'             => "Uża l-ħin tal-''browser'' tiegħek",
+'allowemail'                => 'Ħalli li jaslulek emails mingħand utenti oħrajn',
+'prefs-searchoptions'       => 'Preferenzi għat-tfittxija',
+'prefs-namespaces'          => 'Namespace',
+'defaultns'                 => 'Namespace predefinit għat-tfittxija:',
+'default'                   => 'predefinit',
+'files'                     => 'Fajls',
 
 # User rights
 'userrights'                  => "Treġija tal-permessi relativi 'l utenti", # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Immaniġġja l-gruppi tal-utenti',
 'userrights-user-editname'    => 'Daħħal isem l-utent:',
 'editusergroup'               => "Modifika l-gruppijiet ta' l-utenti",
-'editinguser'                 => "Modifika tad-drittijiet tal-utent '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Modifika tad-drittijiet tal-utent '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Modifika tal-gruppijiet ta' l-utenti",
 'saveusergroups'              => 'Modifika Gruppijiet tal-Utenti',
 'userrights-groupsmember'     => "Membru ta':",
@@ -956,6 +1230,7 @@ Innota però li l-werreja tal-kontenut ta' {{SITENAME}} f'dawn is-siti, jistgħu
 'right-minoredit'            => 'Marka l-modifiki bħalha modifiki żgħar',
 'right-move'                 => 'Mexxi l-paġni',
 'right-move-subpages'        => 'Mexxi l-paġni flimkien mal-paġni relatati',
+'right-movefile'             => 'Mexxi l-fajls',
 'right-suppressredirect'     => 'Evita li toħloq rindirizz mill-paġna l-antika meta tmexxi l-paġna',
 'right-upload'               => "Tella' fajls",
 'right-reupload'             => 'Ikteb fuq fajl ġa eżistenti',
@@ -1006,6 +1281,26 @@ Innota però li l-werreja tal-kontenut ta' {{SITENAME}} f'dawn is-siti, jistgħu
 'rightslogentry' => "ġie modifikat is-sħubija tal-grupp ta' $1 mill-grupp $2 għal grupp $3",
 'rightsnone'     => '(xejn)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'           => 'aqra din il-paġna',
+'action-edit'           => 'immodifika din il-paġna',
+'action-createpage'     => 'oħloq paġni',
+'action-createtalk'     => "oħloq paġni ta' diskussjoni",
+'action-createaccount'  => 'oħloq dan il-kont tal-utent',
+'action-minoredit'      => 'immarka din il-modifika bħala waħda minuri',
+'action-move'           => 'mexxi din il-paġna',
+'action-move-subpages'  => 'mexxi din il-paġna, u s-sottopaġni',
+'action-movefile'       => 'mexxi dan il-fajl',
+'action-upload'         => "tella' dan il-fajl",
+'action-delete'         => 'ħassar din il-paġna',
+'action-deleterevision' => 'ħassar din ir-reviżjoni',
+'action-deletedhistory' => "ara l-kronoloġija mħassar ta' din il-paġna",
+'action-browsearchive'  => 'fittex paġni mħassra',
+'action-undelete'       => 'irkupra din il-paġna',
+'action-suppressionlog' => 'ara dan il-log privat',
+'action-block'          => 'imblokka lil dan l-utent milli jimmodifika',
+'action-protect'        => "biddel il-livelli ta' protezzjoni għal din il-paġna",
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|modifika $1 |$1 modifiki}}',
 'recentchanges'                     => 'Modifiki riċenti',
@@ -1052,11 +1347,11 @@ Innota però li l-werreja tal-kontenut ta' {{SITENAME}} f'dawn is-siti, jistgħu
 'upload_directory_read_only'  => "Il-''Webserver'' m'għandux il-mezzi sabiex jikteb fil-direttorju tal-''upload'' ($1).",
 'uploaderror'                 => "Problema fl-''upload''",
 'uploadtext'                  => "Uża l-formula t'hawn taħt sabiex ittella' fajl.
-Biex tara jew tfittex fajls li ġew mtellgħin mur fil-[[Special:ImageList|lista ta' fajls mtellgħin]]. Fajls imtellgħin u verżjonijiet ġodda tal-fajls huma reġistrati fir-[[Special:Log/upload|reġistru ta' l-''uploads'']], u dawk li tħassru huma fir-[[Special:Log/upload|reġistru tat-tħassir]].
+Biex tara jew tfittex fajls li ġew mtellgħin mur fil-[[Special:FileList|lista ta' fajls mtellgħin]]. Fajls imtellgħin u verżjonijiet ġodda tal-fajls huma reġistrati fir-[[Special:Log/upload|reġistru ta' l-''uploads'']], u dawk li tħassru huma fir-[[Special:Log/upload|reġistru tat-tħassir]].
 
 Biex tinkludi fajl f'paġna, uża l-link fil-forma
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fajl.jpg]]</nowiki>''',
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' jew
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fajl.jpg]]</nowiki>''',
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' jew
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' biex toħloq link dirett għal fajl.",
 'upload-permitted'            => "Tipi ta' fajls permessi: $1.",
 'upload-preferred'            => "Tipi ta' fajls preferuti: $1.",
@@ -1064,7 +1359,7 @@ Biex tinkludi fajl f'paġna, uża l-link fil-forma
 'uploadlog'                   => 'Reġistru tal-uploads',
 'uploadlogpage'               => "Reġistru tal-fajls li ġew imtella'",
 'uploadlogpagetext'           => "Ħawn taħt tinsab il-lista ta' l-aktar fajls imtellgħin riċenti.<br />
-Ara l-[[Special:NewImages|gallerija ta' fajls ġodda]] għal ħarsa viżiva.",
+Ara l-[[Special:NewFiles|gallerija ta' fajls ġodda]] għal ħarsa viżiva.",
 'filename'                    => 'Isem il-fajl',
 'filedesc'                    => 'Taqsira',
 'fileuploadsummary'           => 'Taqsira:',
@@ -1087,22 +1382,22 @@ dan il-fajl huwa $2 kbir.',
 'largefileserver'             => 'Il-Fajl għandu dimenżjoni akbar minn dak konsentit mill-konfigurazzjoni tas-server.',
 'emptyfile'                   => "Il-Fajl li ġie ''uploaded'' jidher li huwa vojt. Dan jista' jkun minħabba żball fl-isem tal-fajl.
 Jekk jogħġbok verifika jekk xorta waħda trid itella' dan il-fajl.",
-'fileexists'                  => "Fajl b'dan l-isem ġa jeżisti, jekk jogħġbok verifika l-ewwel <strong><tt>$1</tt></strong> jekk ma tridx tikteb fuqu.",
-'filepageexists'              => "Il-paġna ta' deskrizzjoni għal dan il-fajl ġie ġa maħluq f'<strong><tt>$1</tt></strong>, iżda l-ebda fajl b'dan l-isem jeżisti bħalissa. It-Taqsira li daħħalt mhux se tidher fuq il-paġna tad-deskrizzjoni.
+'fileexists'                  => "Fajl b'dan l-isem ġa jeżisti, jekk jogħġbok verifika l-ewwel '''<tt>$1</tt>''' jekk ma tridx tikteb fuqu.",
+'filepageexists'              => "Il-paġna ta' deskrizzjoni għal dan il-fajl ġie ġa maħluq f''''<tt>$1</tt>''', iżda l-ebda fajl b'dan l-isem jeżisti bħalissa. It-Taqsira li daħħalt mhux se tidher fuq il-paġna tad-deskrizzjoni.
 Sabiex it-taqsira tidher hemm, huwa neċessarju li tagħmel il-modifiki manwalment.",
 'fileexists-extension'        => "Diġà jeżisti fajl b'isem simili:<br />
-L-isem tal-fajl imtella': <strong><tt>$1</tt></strong><br />
-L-isem tal-fajl eżistenti: <strong><tt>$2</tt></strong><br />
+L-isem tal-fajl imtella': '''<tt>$1</tt>'''<br />
+L-isem tal-fajl eżistenti: '''<tt>$2</tt>'''<br />
 Jekk jogħġbok, agħżel isem differenti.",
 'fileexists-thumb'            => "<center>'''Fajl eżistenti'''</center>",
-'fileexists-thumbnail-yes'    => "Il-fajl li ttella' jidher li huwa stampa żgħira <i>(minjatura)</i>. 
-Jekk jogħġbok, iċċekkja dan il-fajl <strong><tt>$1</tt></strong>.<br /> 
+'fileexists-thumbnail-yes'    => "Il-fajl li ttella' jidher li huwa stampa żgħira ''(minjatura)''. 
+Jekk jogħġbok, iċċekkja dan il-fajl '''<tt>$1</tt>'''.<br /> 
 Jekk il-fajl li ċċekkjajt huwa l-istess stampa fid-daqs oriġinali, m'hemmx bżonn li ttella' minjatura oħra.",
-'file-thumbnail-no'           => "L-isem tal-fajl jibda' b'<strong><tt>$1</tt></strong>. Jidher ukoll li din hija stampa tad-daqs imnaqqas <i>(thumbnail)</i>.<br />
+'file-thumbnail-no'           => "L-isem tal-fajl jibda' b''''<tt>$1</tt>'''. Jidher ukoll li din hija stampa tad-daqs imnaqqas ''(thumbnail)''.<br />
 Jekk għandek din l-istampa ta' riżoluzzjoni sħiħa, jekk jogħġbok, tella' dan il-fajl jew inkella immodifika l-isem tal-fajl.",
 'fileexists-forbidden'        => "Fajl b'dan l-isem ġa jeżisti;
-jekk jogħġbok mur u tella' dan il-fajl b'isem ġdid. [[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => "Fajl b'dan l-isem diġà jeżisti fl-arkivju tar-riżorsi multimedjali maqsuma. Jekk tixtieq xorta waħda li ttella' l-fajl, mur lura u tella' fajl b'isem ġdid. [[Image:$1|thumb|center|$1]]",
+jekk jogħġbok mur u tella' dan il-fajl b'isem ġdid. [[File:$1|thumb|center|$1]]",
+'fileexists-shared-forbidden' => "Fajl b'dan l-isem diġà jeżisti fl-arkivju tar-riżorsi multimedjali maqsuma. Jekk tixtieq xorta waħda li ttella' l-fajl, mur lura u tella' fajl b'isem ġdid. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => "Dan il-fajl huwa duplikat ta' {{PLURAL:$1|dan il-fajl|dawn il-fajls}} segwenti:",
 'successfulupload'            => "Mtella' b'suċċess",
 'uploadwarning'               => 'Twissija dwar it-tlugħ tal-fajls',
@@ -1124,8 +1419,8 @@ Inti għandek tiverifika ir-$1 qabel ma tkompli bl-''upload'' mill-ġdid.",
 'upload-wasdeleted'           => "'''Twissija: Il-Fajl li qiegħed itella' kien imħassar.'''
 
 Verifika jekk jogħġbok jekk m'għandhekx tkompli itella' dan il-fajl. Ir-Reġistru ta' tħassir għal dan il-fajl huwa provdut għal konvenjenza:",
-'filename-bad-prefix'         => 'L-Isem tal-fajl li qiegħed itella\' jibda\' b\'<strong>"$1"</strong>, 
-li huma isem mhux deskrittiv u huwa tipikament mogħti awtomatikament minn kameras diġitali. Jekk jogħġbok agħżel isem għal fajl tiegħek aktar deskrittiv.',
+'filename-bad-prefix'         => "L-Isem tal-fajl li qiegħed itella' jibda' b''''\"\$1\"''', 
+li huma isem mhux deskrittiv u huwa tipikament mogħti awtomatikament minn kameras diġitali. Jekk jogħġbok agħżel isem għal fajl tiegħek aktar deskrittiv.",
 'filename-prefix-blacklist'   => ' #<!-- ħalli din il-linja eżattament kif inhi --> <pre>
 # Is-Sintassi huwa dan segwenti:
 #   * Kollox mill-karattru "#" sa l-aħħar tal-linja tal-kumment
@@ -1165,20 +1460,20 @@ Jekk jogħġbok verifika li s-sit huwa attiv, stenna għal ftit u erġa' prova m
 'upload_source_url'  => ' (URL validu u aċċessibli)',
 'upload_source_file' => ' (fajl fuq il-komputer tiegħek)',
 
-# Special:ImageList
-'imagelist-summary'     => "Din il-paġna speċjali turi l-fajls kollha mtella'.
+# Special:ListFiles
+'listfiles-summary'     => "Din il-paġna speċjali turi l-fajls kollha mtella'.
 L-aktar ''uploads'' riċenti jiġu fuq in-naħa ta' fuq tal-lista.
 Biex tagħmel modifika fl-ordni tal-kolonna, klikkja fuq it-titlu tal-kolonna stess.",
-'imagelist_search_for'  => 'Fittex stampi skont l-isem:',
+'listfiles_search_for'  => 'Fittex stampi skont l-isem:',
 'imgfile'               => 'fajl',
-'imagelist'             => 'Lista tal-fajl',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Isem',
-'imagelist_user'        => 'Utent',
-'imagelist_size'        => 'Daqs',
-'imagelist_description' => 'Deskrizzjoni',
-
-# Image description page
+'listfiles'             => 'Lista tal-fajl',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Isem',
+'listfiles_user'        => 'Utent',
+'listfiles_size'        => 'Daqs',
+'listfiles_description' => 'Deskrizzjoni',
+
+# File description page
 'filehist'                       => 'Kronoloġija tal-fajl',
 'filehist-help'                  => 'Agħfas fuq il-grupp data/ħin biex tara l-fajl biex tara kif jidher dak il-ħin.',
 'filehist-deleteall'             => 'ħassar kollox',
@@ -1230,7 +1525,6 @@ Biex tagħmel modifika fl-ordni tal-kolonna, klikkja fuq it-titlu tal-kolonna st
 'filedelete-success-old'      => "Il-verżjoni tal-fajl '''[[Media:$1|$1]]''' tal-$2, $3 ġiet mħassra.",
 'filedelete-nofile'           => "Fuq {{SITENAME}} il-fajl '''$1''' ma jeżistiex.",
 'filedelete-nofile-old'       => "Fl-Arkivju m'hemmx verżjoni ta' '''$1''' bil-karrateristiċi indikati.",
-'filedelete-iscurrent'        => 'Qiegħed tipprova tħassar verżjoni aktar riċenti minn dan il-fajl. Jekk jogħġbok, l-ewwel mur lura għal verżjoni aktar antika.',
 'filedelete-otherreason'      => 'Oħrajn/aktar raġunijiet:',
 'filedelete-reason-otherlist' => 'Raġuni oħra',
 'filedelete-reason-dropdown'  => "*Raġunijiet aktar komuni dwar tħassir
@@ -1265,19 +1559,9 @@ Daħħal: tip/subtip, e.ż. <tt>image/jpeg</tt>.",
 'randomredirect-nopages' => "M'hawnx rindirizzi f'dan in-namespace.",
 
 # Statistics
-'statistics'             => 'Statistiċi',
-'sitestats'              => "Statistiċi relativi ta' {{SITENAME}}",
-'userstats'              => 'Statistika tal-utent',
-'sitestatstext'          => "B'kollox hemm '''$1''' paġna fil-bankadati.
-Dan in-numru jinkludi wkoll il-paġni ta' diskussjoni, paġni dwar il-{{SITENAME}}, paġni b'informazzjoni minima (''stubs''), riindirizzamenti u paġni oħrajn li probabilment ma jikkwalifikawx bħala paġni b'kontenut. Jekk tneħħi dawk, b'kollox hemm '''$2''' paġni li probabilment huma paġni b'kontenut leġittimu.
-
-'''$8''' fajl Ä¡ew imtella'.
-
-Minn meta ġie installat is-sit s'issa, inżaru '''$3''' paġna u kien hemm '''$4''' modifika. Din hija ekwivalenti għal medja ta' '''$5''' modifiki għal kull paġna, u medja ta' '''$6''' qarrejja għa' kull modifika. 
-
-Il-kju ta' xogħolijiet fih '''$7''' elementi.",
-'userstatstext'          => "F'dan il-mument {{PLURAL:$1|[[Special:ListUsers|utent]] wieħed biss reġistrat|'''$1''' [[Special:ListUsers|utenti]] reġistrati}}. Il-grupp $5  huwa kompost minn '''$2''' {{PLURAL:$2|utent|utenti}}, jew '''$4%''' tar-reġistrati.",
-'statistics-mostpopular' => 'Il-paġni l-aktar miżjura',
+'statistics'              => 'Statistiċi',
+'statistics-header-users' => 'Statistika tal-utent',
+'statistics-mostpopular'  => 'Il-paġni l-aktar miżjura',
 
 'disambiguations'      => "Paġni ta' diżambigwazzjoni",
 'disambiguationspage'  => 'Template:diżambig',
@@ -1319,7 +1603,6 @@ Paġna tiġi stimata paġna ta' diżambigwazzjoni dawk kollha li jagħmlu użu m
 'popularpages'            => 'L-iktar paġni popolari',
 'wantedcategories'        => 'Kategoriji rikjesti',
 'wantedpages'             => 'Paġni rikjesti',
-'missingfiles'            => 'Fajls neqsin',
 'mostlinked'              => "Paġni bl-ikbar numru ta' links li jwasslu għalihom",
 'mostlinkedcategories'    => "Kategoriji bl-ikbar numru ta' links li jwasslu għalihom",
 'mostlinkedtemplates'     => 'L-iktar mudelli wżati',
@@ -1366,9 +1649,8 @@ Paġna tiġi stimata paġna ta' diżambigwazzjoni dawk kollha li jagħmlu użu m
 'speciallogtitlelabel' => 'Titlu:',
 'log'                  => 'Logs',
 'all-logs-page'        => 'Ir-reġistri kollha',
-'log-search-legend'    => 'Fittex logs',
-'log-search-submit'    => 'Mur',
-'alllogstext'          => "Preżentazzjoni unifikata tar-reġistri relattivi għall-operazzjonijiet tal-upload, tħassir, protezzjoni, blokki u amministrazzjoni tas-sit. Tista' ddejjaq il-kriterji ta' riċerka billi tagħżel it-tip ta' reġistru, isem l-utent jew il-paġna affetwata.",
+'alllogstext'          => "Preżentazzjoni unifikata tar-reġistri kollha ta' {{SITENAME}}.<br />
+Tista' tqassar il-kriterji ta' tfittxija billi tagħżel it-tip ta' log, l-isem tal-utent, jew il-paġna affetwata (it-tnejn tal-aħħar huma sensittivi għal kif jinkitbu l-karattri).",
 'logempty'             => "Il-log m'għandu ebda element korrispondenti mat-tfittxija tiegħek.",
 'log-title-wildcard'   => "Tfittxija ta' titli li jibdew b'dan it-test",
 
@@ -1401,6 +1683,14 @@ Il-[[Special:UnusedCategories|kategoriji vojta]] u dawk [[Special:WantedCategori
 'listusers-submit'   => 'Uri',
 'listusers-noresult' => 'l-Ebda utent insab għal din il-kriterja.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Utenti Ä¡odda',
+'newuserlogpagetext'          => "Dan hu reġistru tal-kreazzjoni ta' kontijiet ġodda.",
+'newuserlog-byemail'          => "il-password intbagħtet permezz ta' posta elettronika",
+'newuserlog-create-entry'     => 'Utent Ä¡did',
+'newuserlog-create2-entry'    => 'irreġistra l-isem tal-utent ġdid $1',
+'newuserlog-autocreate-entry' => 'Kont maħluq awtomatikament',
+
 # Special:ListGroupRights
 'listgrouprights'          => "Drittijiet tal-grupp ta' l-utenti",
 'listgrouprights-summary'  => "Il-lista segwenti hija dwar gruppi ta' l-utenti għal din il-wiki, bl-aċċess tad-drittijiet assoċjati.<br />
@@ -1415,16 +1705,15 @@ Aktar informazzjoni dwar drittijiet tal-individwi tista' tinstab fuq [[{{MediaWi
 'mailnologintext' => "Sabiex tkun tista' tibgħat posta elettronika 'l utenti oħrajn huwa neċessarju li [[Special:UserLogin|tidħol fis-sit]] bħalha utent reġistrat u jkollhok indirizz validu fil-[[Special:Preferences|preferenzi]] tiegħek.",
 'emailuser'       => 'Ikteb lil dan l-utent',
 'emailpage'       => 'Ibgħat messaġġ lil dan l-utent bil-posta elettronika',
-'emailpagetext'   => "Jekk dan l-utent daħħal indirizz tal-posta elettronika validu fil-preferenzi ta' l-utent tiegħu, l-formula t'hawn se tintbgħat bħala messaġġ waħdu.<br />
-L-indirizz tal-posta elettronika li daħħalt fil-preferenzi ta' l-utent se jidher fl-ispazju \"Minn:\" tal-messaġġ, biex dak li jirċievi l-messaġġ ikun jista'jagħtik risposta.",
+'emailpagetext'   => "Huwa possibbli li tuża' l-formola t'hawn taħt biex tibgħat posta elettronika għal dan l-utent. L-indirizz li daħħalt fil-[[Special:Preferences|preferenzi]] jidher fl-ispazju \"Minn:\" tal-messaġġ, biex dak li jirċievi l-messaġġ ikun jista' jagħtik risposta.",
 'usermailererror' => 'L-oġġett tal-posta ta l-problema:',
 'defemailsubject' => 'Messaġġ minn {{SITENAME}}',
 'noemailtitle'    => 'L-Ebda indirizz tal-posta elettronika',
-'noemailtext'     => 'Dan l-utent ma daħħalx indirizz tal-posta elettronika valida, jew għażel li ma jirċievix posta elettronika mingħand utenti oħrajn.',
-'emailfrom'       => 'Minn',
-'emailto'         => 'Lil',
-'emailsubject'    => 'Suġġett',
-'emailmessage'    => 'Messaġġ',
+'noemailtext'     => 'Dan l-utent ma daħħalx indirizz tal-posta elettronika valida.',
+'emailfrom'       => 'Minn:',
+'emailto'         => 'Lil:',
+'emailsubject'    => 'Suġġett:',
+'emailmessage'    => 'Messaġġ:',
 'emailsend'       => 'Ibgħat',
 'emailccme'       => 'Ibgħatli kopja tal-messaġġ tiegħi.',
 'emailccsubject'  => 'Kopja tal-messaġġ tiegħek lil $1: $2',
@@ -1463,12 +1752,6 @@ Jekk f'xi ħin tkun tixtieq tneħħi l-paġna mil-lista ta' osservazzjoni tiegħ
 'iteminvalidname'      => "Problema bil-paġna'$1', l-isem mhux validu...",
 'wlnote'               => "Hawn taħt hawn {{PLURAL:$1|l-aħħar modifika|l-aħħar '''$1''' modifiki}} fl-aħħar {{PLURAL:$2|siegħa|'''$2''' siegħat}}.",
 'wlshowlast'           => 'Uri l-aħħar $1 siegħat $2 ġranet $3',
-'watchlist-show-bots'  => 'Uri l-modifiki tal-bots',
-'watchlist-hide-bots'  => 'Aħbi l-modifiki tal-bots',
-'watchlist-show-own'   => 'Uri l-modifiki tiegħi',
-'watchlist-hide-own'   => 'Aħbi l-modifiki tiegħi',
-'watchlist-show-minor' => 'Uri l-modifiki żgħar',
-'watchlist-hide-minor' => 'Aħbi l-modifiki żgħar',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Imsegwi...',
@@ -1507,51 +1790,55 @@ Biex tagħmel modifiki fil-lista t\'osservazzjoni tiegħek:
 Biex tagħti l-kumment tiegħek u għal aktar għajnuna:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Ħassar il-paġna',
-'confirm'                     => 'Ikkonferma',
-'excontent'                   => "kontenut kien: '$1'",
-'excontentauthor'             => "kontenut kien: '$1' (u l-unika kontributur kien '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "kontenut qabel ma ġie żvojtjat kien: '$1'",
-'exblank'                     => 'paġna kienet vojta',
-'delete-confirm'              => 'Ħassar "$1"',
-'delete-legend'               => 'Ħassar',
-'historywarning'              => 'Twissija: Il-paġna li se tħassar għanda kronoloġija:',
-'confirmdeletetext'           => "Int se tħassar għal kollox mid-database paġna jew stampa, flimkien mal-kronoloġija kollha tagħha. Jekk jogħġbok, ikkonferma li hija x-xewqa tiegħek li tkompli bit-tħassir ta' din il-paġna, u tifhem il-konsegwenzi ta' li qiegħed tagħmel, u li qiegħed tagħmilhom skont il- [[{{MediaWiki:Policy-url}}|politika]] stabbilita.",
-'actioncomplete'              => 'Azzjoni mwettqa',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ġiet imħassra.
+# Delete
+'deletepage'             => 'Ħassar il-paġna',
+'confirm'                => 'Ikkonferma',
+'excontent'              => "kontenut kien: '$1'",
+'excontentauthor'        => "kontenut kien: '$1' (u l-unika kontributur kien '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "kontenut qabel ma ġie żvojtjat kien: '$1'",
+'exblank'                => 'paġna kienet vojta',
+'delete-confirm'         => 'Ħassar "$1"',
+'delete-legend'          => 'Ħassar',
+'historywarning'         => 'Twissija: Il-paġna li se tħassar għanda kronoloġija:',
+'confirmdeletetext'      => "Int se tħassar għal kollox mid-database paġna jew stampa, flimkien mal-kronoloġija kollha tagħha. Jekk jogħġbok, ikkonferma li hija x-xewqa tiegħek li tkompli bit-tħassir ta' din il-paġna, u tifhem il-konsegwenzi ta' li qiegħed tagħmel, u li qiegħed tagħmilhom skont il- [[{{MediaWiki:Policy-url}}|politika]] stabbilita.",
+'actioncomplete'         => 'Azzjoni mwettqa',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ġiet imħassra.
 Ara $2 biex tara paġni mħassra riċentament.',
-'deletedarticle'              => 'ħassar "[[$1]]"',
-'suppressedarticle'           => 'Neħħi "[[$1]]"',
-'dellogpage'                  => 'Tħassir',
-'dellogpagetext'              => "Hawn taħt hawn lista ta' l-aktar tħassir riċenti.",
-'deletionlog'                 => "Log ta' tħassir",
-'reverted'                    => 'Mort lura għal verżjoni preċedenti',
-'deletecomment'               => 'Raġuni dwar it-tħassir:',
-'deleteotherreason'           => 'Raġuni oħrajn:',
-'deletereasonotherlist'       => 'Raġuni oħra',
-'deletereason-dropdown'       => "*Raġunijiet ta' tħassir komuni
+'deletedarticle'         => 'ħassar "[[$1]]"',
+'suppressedarticle'      => 'Neħħi "[[$1]]"',
+'dellogpage'             => 'Tħassir',
+'dellogpagetext'         => "Hawn taħt hawn lista ta' l-aktar tħassir riċenti.",
+'deletionlog'            => "Log ta' tħassir",
+'reverted'               => 'Mort lura għal verżjoni preċedenti',
+'deletecomment'          => 'Raġuni dwar it-tħassir:',
+'deleteotherreason'      => 'Raġuni oħrajn:',
+'deletereasonotherlist'  => 'Raġuni oħra',
+'deletereason-dropdown'  => "*Raġunijiet ta' tħassir komuni
 ** Rikjesta tal-awtur
 ** Vjolazzjoni tal-copyright
 ** Vandaliżmu",
-'delete-edit-reasonlist'      => "Modifika raġunijiet ta' tħassir",
-'delete-toobig'               => "Din il-paġna għandha kronoloġija ta' modifikar kbira, l-fuq minn $1 {{PLURAL:$1|reviżjoni|reviżjonijiet}}.
+'delete-edit-reasonlist' => "Modifika raġunijiet ta' tħassir",
+'delete-toobig'          => "Din il-paġna għandha kronoloġija ta' modifikar kbira, l-fuq minn $1 {{PLURAL:$1|reviżjoni|reviżjonijiet}}.
 Tħassir ta' dawn il-paġni huwa limitat sabiex tnaqqas il-ħolqien aċċidentalment ta' problemi fil-funżjoni tad-database ta' {{SITENAME}}.",
-'delete-warning-toobig'       => "Din il-paġna għandha kronoloġija ta' modifikar kbira, l-fuq minn $1 {{PLURAL:$1|reviżjoni|reviżjonijiet}}.
+'delete-warning-toobig'  => "Din il-paġna għandha kronoloġija ta' modifikar kbira, l-fuq minn $1 {{PLURAL:$1|reviżjoni|reviżjonijiet}}.
 Tħassara tista' toħloq problema ta' funżjoni fid-database ta' {{SITENAME}}; moħħok hemm.",
-'rollback'                    => 'Ħassar il-modifiki',
-'rollback_short'              => 'Rollback',
-'rollbacklink'                => 'rollback',
-'rollbackfailed'              => 'Rollback ma ħadmitx',
-'cantrollback'                => 'Impossibli tħassar il-modifiki; l-utent li wettaqhom huwa l-unika li għamel kontributi lil din il-paġna.',
-'alreadyrolled'               => "Mhux possibbli li tneħħi l-modifiki ta' [[User:$2|$2]] ([[User talk:$2|diskussjoni]]) fil-paġna [[:$1]]; utent ieħor diġà immodifika din il-paġna jew inkella reġġa' lura.
+
+# Rollback
+'rollback'         => 'Ħassar il-modifiki',
+'rollback_short'   => 'Rollback',
+'rollbacklink'     => 'rollback',
+'rollbackfailed'   => 'Rollback ma ħadmitx',
+'cantrollback'     => 'Impossibli tħassar il-modifiki; l-utent li wettaqhom huwa l-unika li għamel kontributi lil din il-paġna.',
+'alreadyrolled'    => "Mhuwiex possibbli li tneħħi l-modifiki ta' [[User:$2|$2]] ([[User talk:$2|diskussjoni]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) fil-paġna [[:$1]]; utent ieħor diġà immodifika din il-paġna jew inkella reġġa' lura.
 
 L-iktar modifika riċenti fuq dil-paġna saret minn [[User:$3|$3]] ([[User talk:$3|diskussjoni]]).",
-'editcomment'                 => 'Il-Kumment tal-modifika kienet: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "Modifiki mneħħa minn [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) għall-aħħar verżjoni ta' [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "Modifiki mneħħa ta' $1;
+'editcomment'      => "Il-Kumment tal-modifika kienet: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => "Modifiki mneħħa minn [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) għall-aħħar verżjoni ta' [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "Modifiki mneħħa ta' $1;
 Modifikata lura għall-aħħar verżjoni ta' $2.",
-'sessionfailure'              => "Ġie verifikat problema fis-sessjoni tal-aċċess; din l-azzjoni ġiet imħassra bħalha prekawzjoni. Mur lura fil-paġna preċedenti bl-użu tal-buttuna 'Lura' tal-browser, niżżel il-paġna mill-ġdid u erġa' prova.",
+'sessionfailure'   => "Ġie verifikat problema fis-sessjoni tal-aċċess; din l-azzjoni ġiet imħassra bħalha prekawzjoni. Mur lura fil-paġna preċedenti bl-użu tal-buttuna 'Lura' tal-browser, niżżel il-paġna mill-ġdid u erġa' prova.",
+
+# Protect
 'protectlogpage'              => 'Protezzjoni',
 'protectlogtext'              => "Hawn taħt hawn lista ta' l-azzjonijiet tal-protezzjoni u żblokki tal-paġna.
 Ara [[Special:ProtectedPages|l-lista ta' paġni protetti]] għal lista ta' paġni bħalissa protetti.",
@@ -1559,26 +1846,28 @@ Ara [[Special:ProtectedPages|l-lista ta' paġni protetti]] għal lista ta' paġn
 'modifiedarticleprotection'   => 'modifikajt il-livell ta\' protezzjoni għal "[[$1]]"',
 'unprotectedarticle'          => 'żblokkjajt "[[$1]]"',
 'protect-title'               => 'Modifika livell ta\' protezzjoni ta\' "$1"',
+'prot_1movedto2'              => '[[$1]] tmexxa lejn [[$2]]',
 'protect-legend'              => 'Ikkonferma l-protezzjoni',
 'protectcomment'              => 'Kumment:',
 'protectexpiry'               => 'Jiskadi:',
 'protect_expiry_invalid'      => 'Skadenza mhux valida.',
 'protect_expiry_old'          => 'Skadenza ġa inġarbet.',
 'protect-unchain'             => "Ħalli permessi ta' ċaqlieq",
-'protect-text'                => "Int tista' tara jew tagħmel modifiki fil-livell ta' protezzjoni hawnhekk għal paġna <strong><nowiki>$1</nowiki></strong>.",
-'protect-locked-blocked'      => "Ma tistax timodifika l-livell ta' protezzjoni waqt li jkun attiv blokk. Il-Preferenzi kurrenti għal din il-paġna huma <strong>$1</strong>:",
-'protect-locked-dblock'       => "Livelli ta' protezzjoni ma jistgħux jiġu modifikata minħabba li database attiv huwa magħluq. Il-Preferenzi kurrenti ta' din il-paġna huma <strong>$1</strong>:",
+'protect-text'                => "Int tista' tara jew tagħmel modifiki fil-livell ta' protezzjoni hawnhekk għal paġna '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Ma tistax timodifika l-livell ta' protezzjoni waqt li jkun attiv blokk. Il-Preferenzi kurrenti għal din il-paġna huma '''$1''':",
+'protect-locked-dblock'       => "Livelli ta' protezzjoni ma jistgħux jiġu modifikata minħabba li database attiv huwa magħluq. Il-Preferenzi kurrenti ta' din il-paġna huma '''$1''':",
 'protect-locked-access'       => "M'għandhekx il-permessi neċessarji biex tagħmel modifiki fil-livelli ta' protezzjoni ta' din il-paġna.
-Il-Preferenzi kurrenti ta' din il-paġni huma <strong>$1</strong>:",
+Il-Preferenzi kurrenti ta' din il-paġni huma '''$1''':",
 'protect-cascadeon'           => "Din il-paġna hija bħalissa protetta minħabba li hija inkluża fil-{{PLURAL:$1|paġna segwenti li għanda|paġni segwenti li għandhom}} protezzjoni rikorsiva attiva. Huwa possibli li tagħmel modifiki fil-livell ta' protezzjoni individwali tal-paġna, però mhux se taffetwa l-protezzjoni rikorsiva.",
-'protect-default'             => '(predefinit)',
+'protect-default'             => 'Awtorizza l-utenti kollha',
 'protect-fallback'            => 'Huwa rikjest il-permess "$1"',
-'protect-level-autoconfirmed' => 'Utenti reġistrati biss',
+'protect-level-autoconfirmed' => 'Imblokka l-utenti ġodda u dawk li mhumiex reġistrati',
 'protect-level-sysop'         => 'Amministraturi biss',
 'protect-summary-cascade'     => 'rikorsiv',
 'protect-expiring'            => 'jiskadi $1 (UTC)',
 'protect-cascade'             => "Protezzjoni rikorsiva (testendi l-protezzjoni 'l paġni kollha inklużi f'din il-paġna).",
 'protect-cantedit'            => "Ma tistax timodifika l-livelli ta' protezzjoni ta' din il-paġna, għax int m'għandhekx il-permessi neċessarji.",
+'protect-expiry-options'      => 'sagħtejn:2 hours,ġurnata 1:1 day,3 ġranet:3 days,ġimgħa 1:1 week,ġimgħatejn:2 weeks,xahar 1:1 month,3 xhur:3 months,6 xhur:6 months,sena 1:1 year,infinita:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permess:',
 'restriction-level'           => "Livell ta' limitazzjoni:",
 'minimum-size'                => 'Daqs minimu',
@@ -1601,13 +1890,12 @@ Il-Preferenzi kurrenti ta' din il-paġni huma <strong>$1</strong>:",
 'undeletepage'                 => 'Ara u rkupra l-paġni mħassra',
 'undeletepagetitle'            => "'''Hawn jinsabu reviżjonijiet imħassra ta' [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Ara l-paġni mħassra',
-'undeletepagetext'             => "Il-paġni segwenti ġew imħassra, però għadhom fl-arkivju u għalhekk jistgħu jiġu rkuprati.
-L-arkivju jista' jiġi mnaddaf perjodikament.",
+'undeletepagetext'             => "Il-{{PLURAL:$1|paġna segwenti ġiet mħassra, però xorta għadha fl-arkivju u għalhekk tista' tiġi rkuprata|paġni segwenti ġew imħassra, però xorta għadhom jistgħu jiġu rkuprati}}. L-arkivju jista' jiġi mnaddaf perjodikament.",
 'undelete-fieldset-title'      => 'Irkupra reviżjonijiet',
-'undeleteextrahelp'            => "Biex tirkupra l-paġna sħiħa, ħalli l-kaxxi kollha vojta u kklikkja fuq '''''Irkupra'''''.
-Biex tirkupra partijiet speċifiċi, agħżel il-kaxxi korrispondenti mar-reviżjonijiet li tixtieq tirkupra u agħfas '''''Irkupra'''''. Jekk tagħfas '''''Irrisettja''''', kemm il-kaxxi kif ukoll l-ispazju għall-kummenti jiżvujtjaw.",
+'undeleteextrahelp'            => "Biex tirkupra l-paġna sħiħa, ħalli l-kaxxi kollha vojta u agħfas fuq '''''Irkupra'''''.
+Biex tirkupra partijiet speċifiċi, agħżel il-kaxxi korrispondenti mar-reviżjonijiet li tixtieq tirkupra u agħfas '''''Irkupra'''''. Jekk tagħfas '''''Irrisettja''''', kemm il-kaxxi kif ukoll l-ispazju għall-kummenti jiżvojtjaw.",
 'undeleterevisions'            => '{{PLURAL:$1|reviżjoni|$1 reviżjonijiet}} fl-arkivju',
-'undeletehistory'              => 'Jekk tirkupra l-paġna, ir-reviżjonijiet kollha jiġu mdaħħla mill-ġdid fil-kronoloġija relativa. Jekk wara t-tħassir paġni ġodda jiġi maħluqa bl-istess titlu, r-reviżjonijiet irkuprati jiġu jidhru fil-kronoloġija preċedenti. Nota wkoll li limitazzjonijiet fuq reviżjonijiet tal-fajl huwa mitlufa waqt li jiġi rkuprati.',
+'undeletehistory'              => 'Jekk tirkupra l-paġna, ir-reviżjonijiet kollha jiġu mdaħħla mill-ġdid fil-kronoloġija relattiva. Jekk wara t-tħassir paġni ġodda jiġi maħluqa bl-istess titlu, r-reviżjonijiet irkuprati jiġu jidhru fil-kronoloġija preċedenti. Kun af wkoll li limitazzjonijiet fuq reviżjonijiet tal-fajl huwa mitlufa waqt li jiġi rkuprati.',
 'undeleterevdel'               => "Jekk il-parti ta' fuq tal-paġna jew ir-reviżjoni tal-fajl huma parzjalment imħassra, l-proċess ta' irkuprar ma ssirx. F'dawn il-każi, int trid ma taħbiex jew ma tagħżilx ir-reviżjoni mħassra l-aktar riċenti.",
 'undeletehistorynoadmin'       => "Din il-paġna ġiet imħassra.
 Ir-Raġuni għat-tħassir jinstab fit-taqsira hawn taħt, flimkien mal-informazzjoni tal-utenti li għamlu modifiki f'din il-paġna qabel ma ġiet imħassra. Il-Propja test ta' dawn ir-reviżjonijiet imħassra huwa biss jistgħu jiġu aċċessati mill-amministraturi biss.",
@@ -1649,27 +1937,27 @@ $1',
 'blanknamespace' => '(Prinċipali)',
 
 # Contributions
-'contributions' => 'Kontribuzzjonijiet tal-utent',
-'mycontris'     => 'Il-Kontribuzzjonijiet tiegħi',
-'contribsub2'   => 'Għal $1 ($2)',
-'nocontribs'    => 'L-Ebda modifiki li jisodisfa l-kriterji tat-tfittxija.',
-'uctop'         => '(l-aħħar għal paġna)',
-'month'         => 'Mix-xahar (u qabel):',
-'year'          => 'Mis-sena (u qabel):',
-
-'sp-contributions-newbies'     => 'Uri biss il-kontribuzzjonijiet tal-utenti l-Ä¡odda',
-'sp-contributions-newbies-sub' => 'Għall-utenti l-ġodda',
-'sp-contributions-blocklog'    => 'Blokki',
-'sp-contributions-search'      => 'Fittex għal kontribuzzjonijiet',
-'sp-contributions-username'    => 'Indirizz IP jew isem l-utent:',
-'sp-contributions-submit'      => 'Fittex',
+'contributions'       => 'Kontribuzzjonijiet tal-utent',
+'contributions-title' => 'Kontribuzzjonijiet tal-utent għal $1',
+'mycontris'           => 'Il-Kontribuzzjonijiet tiegħi',
+'contribsub2'         => 'Għal $1 ($2)',
+'nocontribs'          => 'L-Ebda modifiki li jisodisfa l-kriterji tat-tfittxija.',
+'uctop'               => '(l-aħħar għal paġna)',
+'month'               => 'Mix-xahar (u qabel):',
+'year'                => 'Mis-sena (u qabel):',
+
+'sp-contributions-newbies'       => 'Uri biss il-kontribuzzjonijiet tal-utenti l-Ä¡odda',
+'sp-contributions-newbies-sub'   => 'Għall-utenti l-ġodda',
+'sp-contributions-newbies-title' => 'Kontribuzzjonijiet tal-utent għal kontijiet ġodda',
+'sp-contributions-blocklog'      => 'Blokki',
+'sp-contributions-search'        => 'Fittex għal kontribuzzjonijiet',
+'sp-contributions-username'      => 'Indirizz IP jew isem l-utent:',
+'sp-contributions-submit'        => 'Fittex',
 
 # What links here
 'whatlinkshere'            => "Li jwasslu 'l hawn",
 'whatlinkshere-title'      => 'Paġni li jippuntaw lejn $1',
 'whatlinkshere-page'       => 'Paġna:',
-'whatlinkshere-barrow'     => '>',
-'linklistsub'              => "(Lista ta' links)",
 'linkshere'                => "Il-Paġni segwenti għandhom links għal '''[[:$1]]''':",
 'nolinkshere'              => "L-Ebda paġna għanda link għal '''[[:$1]]'''.",
 'nolinkshere-ns'           => "L-Ebda paġni li jippontaw għal '''[[:$1]]''' fin-namespace magħżula.",
@@ -1809,6 +2097,8 @@ Din tista' tkun bidla drastika u mhux mistenniha għal paġna popolari; jekk jog
 
 F'dawn il-każi, inti trid iċaqlaq jew tagħqad il-paġna manwalment jekk dan huwa mixtieq.",
 'movearticle'             => 'Ċaqlaq il-paġna:',
+'movenologin'             => 'AÄ‹Ä‹ess mhux imwettaq',
+'movenologintext'         => "Trid [[Special:UserLogin|tidħol]] bħalha utent reġistrat sabiex tkun tista' iċaqlaq din il-paġna.",
 'movenotallowed'          => "Inti m'għandekx il-permessi meħtieġa sabiex tmexxi l-paġni.",
 'newtitle'                => 'Titlu Ä¡did:',
 'move-watch'              => 'Segwi din il-paġna',
@@ -1842,8 +2132,6 @@ Trid tħassara sabiex tkun tista\' tagħmel triq għal ċaqlieqa?',
 'delete_and_move_reason'  => 'Imħassra sabiex tagħmel triq għal ċaqlieqa',
 'selfmove'                => 'It-Titli tas-sors u destinazzjoni huma l-istess;
 ma tistax iċaqlaq paġna fuqha nnifsa.',
-'immobile_namespace'      => "It-Titlu tas-sors u destinazzjoni huma ta' tip speċjali;
-il-paġna ma setgħux jiġi mċaqilqa minn jew fin-namespace.",
 'imagenocrossnamespace'   => "Ma tistax iċaqlaq fajl f'namespace mhux tal-fajls.",
 'imagetypemismatch'       => 'L-Estenżjoni l-ġdida tal-fajl ma taqbilx mat-tip tagħha.',
 'imageinvalidfilename'    => 'L-Isem tal-fajl destinat mhux validu',
@@ -1857,7 +2145,7 @@ Dan jista' jiġi importat f'wiki ieħor bl-użu ta' MedjaWiki bl-użu ta' [[Spec
 Biex tesporta paġni, daħħal titli fil-kaxxa tat-test hawn taħt, titlu għal kull linja, u agħżel jekk ma trid il-verżjoni kurrrenti wkoll kif ukoll mal-verżonijiet antiki, bil-linji tal-kronoloġija tal-paġna, jew il-verżjoni kurrenti biss bl-informazzjoni dwar l-aħħar modifika.
 
 Fl-Aħħar każ inti tista' tuża link, e.ż.
-[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] biex tesporta \"[[{{MediaWiki:Mainpage}}]]\".",
+[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] biex tesporta \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Inkludi biss reviżjonijiet kurrenti, mhux kronoloġiji sħaħ',
 'exportnohistory'   => "----
 '''Nota:''' L-Esportazzjoni tal-kronoloġija kollha tal-paġni min-naħa waħda għall-oħra din l-''interface'' ġiet disattivata għar-raġunijiet marbutin tal-għemil.",
@@ -1895,6 +2183,7 @@ Kull azzjonijiet ta' importazzjoni tal-transwiki jiġu reġistrati fil-[[Special
 'import-interwiki-history'   => 'Kopja l-verżjonijiet tal-kronoloġija kollha għal din il-paġna',
 'import-interwiki-submit'    => 'Importa',
 'import-interwiki-namespace' => 'Ittrasferixxi l-paġni fin-namespace:',
+'import-comment'             => 'Kumment:',
 'importtext'                 => 'Jekk jogħġbok, esporta l-fajl mis-sit wiki l-oriġini bil-funzjoni [[Special:Export]], salvah fuq id-diska tiegħek u tellgħu hawn.',
 'importstart'                => 'Paġni qegħdin jiġu importati...',
 'import-revision-count'      => '{{PLURAL:$1|reviżjoni|$1 reviżjonijiet}}',
@@ -2019,7 +2308,7 @@ Kull azzjonijiet ta' importazzjoni tal-transwiki jiġu reġistrati fil-[[Special
 'lastmodifiedatby' => 'Din il-paġna ġiet modifikata l-aħħar fil-$2, $1 minn $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => "Dan it-test ibbażat fuq ix-xogħol ta' $1.",
 'others'           => 'oħrajn',
-'siteusers'        => '$1, utent(i) tal-{{SITENAME}}',
+'siteusers'        => "$1, utenti ta' {{SITENAME}}",
 'creditspage'      => 'Kredenzjali tal-paġna',
 'nocredits'        => "M'hemmx informazzjoni dwar kredenzjali f'din il-paġna.",
 
@@ -2040,6 +2329,16 @@ Din hija wisq probabli kawża ta' link għal sit estern.",
 'numauthors'     => "Numru ta' awturi distinti (paġna): $1",
 'numtalkauthors' => "Numru ta' awturi distinti (paġna tad-diskussjoni): $1",
 
+# Skin names
+'skinname-standard'    => 'Klassika',
+'skinname-nostalgia'   => 'Nostalġija',
+'skinname-cologneblue' => 'Ikħal',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'L-Iskin tiegħi',
+'skinname-chick'       => 'Fellus',
+'skinname-simple'      => 'Sempliċi',
+'skinname-modern'      => 'Moderna',
+
 # Math options
 'mw_math_png'    => "Uri dejjem f'PNG",
 'mw_math_simple' => 'HTML jekk sempliċi ħafna, inkella PNG',
@@ -2092,7 +2391,7 @@ $1',
 'show-big-image'       => "Verżjoni b'risoluzzjoni sħiħa",
 'show-big-image-thumb' => '<small>Dimensjoni tal-previżjoni: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => "Gallerija ta' fajls Ä¡odda",
 'imagelisttext'         => "Il-Lista t'hawn taħt ta' '''$1''' {{PLURAL:$1|fajl|fajls}} irranġati $2.",
 'newimages-summary'     => "Din il-paġna speċjali turi l-aħħar fajls li ġew mtella' riċentament.",
@@ -2452,24 +2751,13 @@ $1
 Jekk jogħġbok konferma jekk vera trid terġa' toħloq din il-paġna.",
 'recreate'            => "Erġa' oħloq",
 
-# HTML dump
-'redirectingto' => 'Riindirizzat għal [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Ħassar il-''cache'' ta' din il-paġna?
-
-$1",
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Fittex paġna li għandhom ''$1''.",
-'searchnamed'      => "Fittex għal paġna bl-isem ''$1''.",
-'articletitles'    => "Fittex dawk il-paġni li jibdew b' ''$1''",
-'hideresults'      => 'Aħbi r-riżultati',
-'useajaxsearch'    => 'Uża tfittxija AJAX',
+'confirm-purge-top'    => "Ħassar il-''cache'' ta' din il-paġna?",
 
 # Separators for various lists, etc.
-'autocomment-prefix' => '-',
+'semicolon-separator' => ';',
+'autocomment-prefix'  => '-',
 
 # Multipage image navigation
 'imgmultipageprev' => "� il-paġna ta' qabel",
@@ -2581,13 +2869,13 @@ Int tista' ukoll tuża l-[[Special:Watchlist/edit|modifikatur standard]].",
 'filepath-summary' => 'Din il-paġna speċjali tagħti lura l-indirizz komplet tal-posta għal fajl.
 Stampi huwa mogħrija b\'risoluzzjoni sħiħa, tipi tal-fajl oħrajn jibdew bil-program assoċjat magħhom direttament.
 
-Daħħal l-isem tal-fajl bla l-prefiss "{{ns:image}}:".',
+Daħħal l-isem tal-fajl bla l-prefiss "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Fittex fajls duplikati',
 'fileduplicatesearch-summary'  => "Fittex fajls duplikati fil-bażi għal valur ''hash''.
 
-Daħħal l-isem tal-fajl mingħajr il-prefiss \"{{ns:image}}:\".",
+Daħħal l-isem tal-fajl mingħajr il-prefiss \"{{ns:file}}:\".",
 'fileduplicatesearch-legend'   => 'Fittex għal duplikat',
 'fileduplicatesearch-filename' => 'Isem il-fajl:',
 'fileduplicatesearch-submit'   => 'Fittex',
diff --git a/languages/messages/MessagesMwl.php b/languages/messages/MessagesMwl.php
index 5b1d38eb..2c5e9b7b 100644
--- a/languages/messages/MessagesMwl.php
+++ b/languages/messages/MessagesMwl.php
@@ -12,6 +12,67 @@
 
 $fallback = 'pt';
 
+
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Special',
+	NS_TALK             => 'Cumbersa',
+	NS_USER             => 'Outelizador',
+	NS_USER_TALK        => 'Cumbersa_outelizador',
+	NS_PROJECT_TALK     => '$1_cumbersa',
+	NS_FILE             => 'Fexeiro',
+	NS_FILE_TALK        => 'Cumbersa_fexeiro',
+	NS_MEDIAWIKI        => 'Biqui',
+	NS_MEDIAWIKI_TALK   => 'Cumbersa_Biqui',
+	NS_TEMPLATE         => 'Modelo',
+	NS_TEMPLATE_TALK    => 'Cumbersa_Modelo',
+	NS_HELP             => 'Ajuda',
+	NS_HELP_TALK        => 'Cumbersa_ajuda',
+	NS_CATEGORY         => 'Catadorie',
+	NS_CATEGORY_TALK    => 'Cumbersa_catadorie',
+);
+
+$namespaceAliases = array(
+	'Especial' => NS_SPECIAL,
+	'Discussão' => NS_TALK,
+	'Usuário' => NS_USER,
+	'Usuário_Discussão' => NS_USER_TALK,
+	'$1_Discussão' => NS_PROJECT_TALK,
+	'Ficheiro' => NS_FILE,
+	'Ficheiro_Discussão' => NS_FILE_TALK,
+	'Imagem_Discussão' => NS_FILE,
+	'Imagem_Discussão' => NS_FILE_TALK,
+	'MediaWiki_Discussão' => NS_MEDIAWIKI_TALK,
+	'Predefinição' => NS_TEMPLATE,
+	'Predefinição_Discussão' => NS_TEMPLATE_TALK,
+	'Ajuda_Discussão' => NS_HELP_TALK,
+	'Categoria' => NS_CATEGORY,
+	'Categoria_Discussão' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'Antrar' ),
+	'Userlogout'                => array( 'Salir' ),
+	'CreateAccount'             => array( 'Criar Cuonta' ),
+	'Lonelypages'               => array( 'Páiginas Uorfanas' ),
+	'Uncategorizedcategories'   => array( 'Catadories sien catadories' ),
+	'Uncategorizedimages'       => array( 'Eimaiges sien catadories' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#ANCAMINAR', '#REDIRECT' ),
+	'img_right'             => array( '1', 'dreita', 'right' ),
+	'img_left'              => array( '1', 'squierda', 'left' ),
+	'img_none'              => array( '1', 'nanhun', 'none' ),
+	'img_center'            => array( '1', 'centro', 'center', 'centre' ),
+	'img_middle'            => array( '1', 'meio', 'middle' ),
+	'language'              => array( '0', '#LHENGUA:', '#LANGUAGE:' ),
+	'filepath'              => array( '0', 'CAMINOFEXEIRO:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'eitiqueta', 'tag' ),
+	'pagesize'              => array( '1', 'TAMANHOFEXEIRO', 'PAGESIZE' ),
+	'staticredirect'        => array( '1', '_ANCAMINARSTATICO_', '__STATICREDIRECT__' ),
+);
+
 $messages = array(
 'underline-always' => 'Siempre',
 'underline-never'  => 'Nunca',
@@ -113,8 +174,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Subre {{SITENAME}}',
 'aboutpage'            => 'Project:Subre',
-'bugreports'           => 'Acusar erros',
-'bugreportspage'       => 'Project:Acusar_erros',
 'copyrightpage'        => '{{ns:project}}:Dreitos de outor',
 'currentevents'        => 'Amboras atuales',
 'currentevents-url'    => 'Project:Amboras atuales',
@@ -203,6 +262,9 @@ Por fabor, bolta a fazer la outenticaçon al recebir-la.',
 Antes de qualquier outra carta eiletrónica seia ambiada pa la cuonta, terás de seguir las anstruçones na carta eiletrónica,
 de modo a cunfirmar que la cuonta ye mesmo la tue.',
 
+# Password reset dialog
+'retypenew' => 'Pon outra beç la nuoba palabra chabe:',
+
 # Edit page toolbar
 'bold_sample'     => 'Testo carregado',
 'bold_tip'        => 'Testo a negrito',
@@ -224,8 +286,8 @@ de modo a cunfirmar que la cuonta ye mesmo la tue.',
 'hr_tip'          => 'Lhinha hourizontal (outeliza cun regra)',
 
 # Edit pages
-'summary'                => 'Sumário',
-'subject'                => 'Assunto/cabeçailho',
+'summary'                => 'Sumário:',
+'subject'                => 'Assunto/cabeçailho:',
 'minoredit'              => 'Marcar cumo eidiçon pequerrixa',
 'watchthis'              => 'Ber esta páigina',
 'savearticle'            => 'Grabar páigina',
@@ -233,7 +295,7 @@ de modo a cunfirmar que la cuonta ye mesmo la tue.',
 'showpreview'            => 'Amostrar prebison',
 'showdiff'               => 'Amostrar alteraçones',
 'anoneditwarning'        => "'''Abiso''': Tu nun stás outenticado. L tou IP será registrado ne l stórico de las eidiçones desta páigina.",
-'summary-preview'        => 'Amostra de l sumário',
+'summary-preview'        => 'Amostra de l sumário:',
 'blockedtext'            => '<big>L tou nome d\'outelizador ó morada de IP foi bloquiada</big>
 
 L bloqueio fui feito por $1. La rezon fui \'\'$2\'\'.
@@ -252,16 +314,16 @@ La tue morada de IP atual ye $3 i l ID de l bloqueio ye $5. Por fabor, anclui un
 Para criar la páigina, ampeça a screbir an la caixa ambaixo(bei la [[{{MediaWiki:Helppage}}|páigina de ajuda]] pa mais detailhes).
 Se stás eiqui por anganho, carrega ne l boton '''retornar'''de l tou nabegador de la Anternete.",
 'noarticletext'          => 'Nun eisiste atualmente testo nesta páigina; tu puodes [[Special:Search/{{PAGENAME}}|percurar pul títalo desta páigina noutras páiginas]] ó [{{fullurl:{{FULLPAGENAME}}|action=edit}} eiditar esta páigina].',
-'previewnote'            => '<strong>Esto ye solo ua amostra; las alteraçones inda nun fúrun grabadas!</strong>',
+'previewnote'            => "'''Esto ye solo ua amostra; las alteraçones inda nun fúrun grabadas!'''",
 'editing'                => 'A eiditar $1',
 'editingsection'         => 'A eiditar $1 (cacho)',
 'copyrightwarning'       => "Por fabor, bei que todas las tues cuntribuiçones an {{SITENAME}} son cunsideradas cumo feitas ne ls termos de la lhicença $2 (bei $1 pa detailhes). Se nun quieres que l tou testo seia eiditado sin piedade i reçtribuído cunsante la gana, nun l ambies.<br 
 />
 Tu stás, al mesmo tiempo, a garantir-mos qu'esto ye algo screbido por ti, ó algo copiado d'ua fuonte de testos an domínio público ó parecido de teor lhibre.
-<strong>NUN AMBIES TRABALHO PORTEGIDO POR DREITOS DE OUTOR SIEN LA DEBIDA PERMISSON!</strong>",
-'longpagewarning'        => '<strong>Abiso: Esta páigina ten$1 kilobytes; alguns
+'''NUN AMBIES TRABALHO PORTEGIDO POR DREITOS DE OUTOR SIEN LA DEBIDA PERMISSON!'''",
+'longpagewarning'        => "'''Abiso: Esta páigina ten$1 kilobytes; alguns
 nabegadores de la anternete ténen porblemas al eiditar páiginas cun mais de 32 kb.
-Por fabor, pensa an scachar la páigina an cachos mais pequeinhos.</strong>',
+Por fabor, pensa an scachar la páigina an cachos mais pequeinhos.'''",
 'templatesused'          => 'Predefiniçons utilizadas nesta página:',
 'templatesusedpreview'   => 'Modelos outelizados neste amostra:',
 'template-protected'     => '(portegida)',
@@ -274,22 +336,23 @@ Bei bien se ye aprópiado cuntinar a eiditar esta páigina.
 L registro de quando esta páigina fui botada fuora ye amostrado a seguir, por quemodidade:",
 
 # History pages
-'viewpagelogs'        => 'Ber registros pa esta páigina',
-'currentrev'          => 'Rebison atual',
-'revisionasof'        => 'Eidiçon cumo la de $1',
-'revision-info'       => 'Rebison de $1 por $2',
-'previousrevision'    => "� Berson d'atrás",
-'nextrevision'        => 'Berçon mais nuoba→',
-'currentrevisionlink' => 'Ber berson atual',
-'cur'                 => 'atu',
-'last'                => 'redadeiro',
-'page_first'          => 'purmeira',
-'page_last'           => 'redadeira',
-'histlegend'          => "Scuolha de defrénça: marca las caixas an ua de las bersones que queiras cumparar i carrega ne l botpn.<br />
+'viewpagelogs'           => 'Ber registros pa esta páigina',
+'currentrev'             => 'Rebison atual',
+'revisionasof'           => 'Eidiçon cumo la de $1',
+'revision-info'          => 'Rebison de $1 por $2', # Additionally available: $3: revision id
+'previousrevision'       => "� Berson d'atrás",
+'nextrevision'           => 'Berçon mais nuoba→',
+'currentrevisionlink'    => 'Ber berson atual',
+'cur'                    => 'atu',
+'last'                   => 'redadeiro',
+'page_first'             => 'purmeira',
+'page_last'              => 'redadeira',
+'histlegend'             => "Scuolha de defrénça: marca las caixas an ua de las bersones que queiras cumparar i carrega ne l botpn.<br />
 Legenda: (atu) = defrénças de la berson atual,
 (ult) = defrénça de la berson d'atrás, m = eidiçon pequerrixa",
-'histfirst'           => 'Mais antigas',
-'histlast'            => 'Redadeiras',
+'history-fieldset-title' => 'Nabegar pul stórico',
+'histfirst'              => 'Mais antigas',
+'histlast'               => 'Redadeiras',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 a $2', # user at time
@@ -303,16 +366,16 @@ Legenda: (atu) = defrénças de la berson atual,
 'diff-multi'              => '({{PLURAL:$1|ua eidiçon antermédia nun stá a ser amostrada|$1 eidiçones antermédias nun stan a ser amostradas}}.)',
 
 # Search results
-'noexactmatch' => "'''Num eisiste ua página com l títalo \"\$1\".''' Você puode [[:\$1|criar tal página]].",
-'prevn'        => 'anteriores $1',
-'nextn'        => 'próssimos $1',
-'viewprevnext' => 'Ber ($1) ($2) ($3)',
-'powersearch'  => 'Percura Abançada',
+'noexactmatch'   => "'''Num eisiste ua página com l títalo \"\$1\".''' Você puode [[:\$1|criar tal página]].",
+'prevn'          => 'anteriores $1',
+'nextn'          => 'próssimos $1',
+'viewprevnext'   => 'Ber ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Conteúdos',
+'powersearch'    => 'Percura Abançada',
 
 # Preferences page
 'preferences'   => 'Perfréncias',
 'mypreferences' => 'Las mies preferencias',
-'retypenew'     => 'Pon outra beç la nuoba palabra chabe:',
 
 'grouppage-sysop' => '{{ns:project}}:Administradores',
 
@@ -354,10 +417,10 @@ Páiginas que steian an ls [[Special:Watchlist|tous begiados]] son amostradas an
 'uploadlogpage' => 'Registro de carregamiento',
 'uploadedimage' => 'cargou "[[$1]]"',
 
-# Special:ImageList
-'imagelist' => 'Fexeiros',
+# Special:ListFiles
+'listfiles' => 'Fexeiros',
 
-# Image description page
+# File description page
 'filehist'                  => 'Stórico de l fexeiro',
 'filehist-help'             => 'Clique an ua data/hora para ber l fexeiro tal cumo el staba naquel sfergante.',
 'filehist-current'          => 'atual',
@@ -460,51 +523,53 @@ Páiginas que steian an ls [[Special:Watchlist|tous begiados]] son amostradas an
 'emailuser' => 'Ambiar carta eiletrónica a este outelizador',
 
 # Watchlist
-'watchlist'            => 'Ls mius begiados',
-'mywatchlist'          => 'Las mies páiginas begiadas',
-'watchlistfor'         => "(para '''$1''')",
-'addedwatch'           => 'Ajuntada a las páiginas begiadas',
-'addedwatchtext'       => "La páigina \"[[:\$1]]\" fui ajuntada a la tue [[Special:Watchlist|lista de páiginas begiadas]].
+'watchlist'         => 'Ls mius begiados',
+'mywatchlist'       => 'Las mies páiginas begiadas',
+'watchlistfor'      => "(para '''$1''')",
+'addedwatch'        => 'Ajuntada a las páiginas begiadas',
+'addedwatchtext'    => "La páigina \"[[:\$1]]\" fui ajuntada a la tue [[Special:Watchlist|lista de páiginas begiadas]].
 Alteraçones feturas na tal páigina i páiginas de çcusson a eilha associadas seran listadas alhá, cun la páigina aparecendo a '''negrito''' na [[Special:RecentChanges|lista de redadeiras alteraçones]], para que se pouda ancuntrar cun maior facelidade.",
-'removedwatch'         => 'Botada fuora de las páiginas begiados',
-'removedwatchtext'     => 'La páigina "[[:$1]]" fui botada fuora de la [[Special:Watchlist|tue lista de páiginas begiadas]].',
-'watch'                => 'Begiar',
-'watchthispage'        => 'Begiar esta páigina',
-'unwatch'              => 'Zantressar-se',
-'watchlist-details'    => '{{PLURAL:$1|$1 páigina begiada|$1 páiginas begiadas}}, fuora las páiginas de çcuçon.',
-'wlshowlast'           => 'Ber redadeiras $1 horas $2 dies $3',
-'watchlist-hide-bots'  => 'Çcuonder ediçons de robôs',
-'watchlist-hide-own'   => 'çconder mies ediçons',
-'watchlist-hide-minor' => 'sconder ediçons menores',
+'removedwatch'      => 'Botada fuora de las páiginas begiados',
+'removedwatchtext'  => 'La páigina "[[:$1]]" fui botada fuora de la [[Special:Watchlist|tue lista de páiginas begiadas]].',
+'watch'             => 'Begiar',
+'watchthispage'     => 'Begiar esta páigina',
+'unwatch'           => 'Zantressar-se',
+'watchlist-details' => '{{PLURAL:$1|$1 páigina begiada|$1 páiginas begiadas}}, fuora las páiginas de çcuçon.',
+'wlshowlast'        => 'Ber redadeiras $1 horas $2 dies $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'A begiar...',
 'unwatching' => 'A deixar de begiar...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Botar fuora páigina',
-'historywarning'              => 'Abiso: La páigina que stás quaije a botar fuora ten un stórico:',
-'confirmdeletetext'           => "Stás quaije a botar fuora para siempre ua páigina ó ua eimaige i to ls sou stórico.
+# Delete
+'deletepage'            => 'Botar fuora páigina',
+'historywarning'        => 'Abiso: La páigina que stás quaije a botar fuora ten un stórico:',
+'confirmdeletetext'     => "Stás quaije a botar fuora para siempre ua páigina ó ua eimaige i to ls sou stórico.
 Por fabor, bei se ye esso que quieres fazer, que antendes las cunsequéncias i se esso stá d'acordo culas [[{{MediaWiki:Policy-url}}|políticas]].",
-'actioncomplete'              => 'Acion acabada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" fue elhiminada.
+'actioncomplete'        => 'Acion acabada',
+'deletedtext'           => '"<nowiki>$1</nowiki>" fue elhiminada.
 Consulte $2 para um registo de eliminações recentes.',
-'deletedarticle'              => 'botado pa la rue "[[$1]]"',
-'dellogpage'                  => 'Registro de botado fuora',
-'deletecomment'               => 'Rezon pa botar pa fuora:',
-'deleteotherreason'           => 'Rezon adicional:',
-'deletereasonotherlist'       => 'Outra rezon',
-'rollbacklink'                => 'retornar',
+'deletedarticle'        => 'botado pa la rue "[[$1]]"',
+'dellogpage'            => 'Registro de botado fuora',
+'deletecomment'         => 'Rezon pa botar pa fuora:',
+'deleteotherreason'     => 'Rezon adicional:',
+'deletereasonotherlist' => 'Outra rezon',
+
+# Rollback
+'rollbacklink' => 'retornar',
+
+# Protect
 'protectlogpage'              => 'Registo de protecção',
+'prot_1movedto2'              => '[[$1]] foi movido para [[$2]]',
 'protect-legend'              => 'Confirmar protecçon',
 'protectcomment'              => 'Comentairo:',
 'protectexpiry'               => 'Data de balidade:',
 'protect_expiry_invalid'      => 'La data de balidade ye ambálido.',
 'protect_expiry_old'          => 'La data de balidade stá ne l passado.',
 'protect-unchain'             => 'Zbloguiar permissones pa arrastrar',
-'protect-text'                => 'Tu eiqui puodes ber i demudar ls níbles de proteçon pa esta páigina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'La tue cuonta nun ten permissones pa demudar ls níbles de proteçon de ua páigina.
-Esta ye la configuraçon atual pa la páigina <strong>$1</strong>:',
+'protect-text'                => "Tu eiqui puodes ber i demudar ls níbles de proteçon pa esta páigina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "La tue cuonta nun ten permissones pa demudar ls níbles de proteçon de ua páigina.
+Esta ye la configuraçon atual pa la páigina '''$1''':",
 'protect-cascadeon'           => 'Esta páigina ancontra-se portegida, ua beç que se ancontra ancluída {{PLURAL:$1|na páigina listada que se segue, portegida|nas páiginas listadas que se seguen, portegidas}} cun la "porteçon porgressiba" atibada. Tu puodes demudar l níble de porteçon desta páigina, mas esso nun terá eifeito na "porteçon porgressiba".',
 'protect-default'             => '(oumisson)',
 'protect-fallback'            => 'Ye perciso la outorizaçon "$1"',
@@ -514,6 +579,7 @@ Esta ye la configuraçon atual pa la páigina <strong>$1</strong>:',
 'protect-expiring'            => 'termina an $1 (UTC)',
 'protect-cascade'             => 'Portege qualquier páigina que steia ancluída nesta (porteçon porgressiba)',
 'protect-cantedit'            => 'Tu nun puodes demudar l níble de proteçon desta páigina, porque tu nun tener outorizaçon pa la eiditar.',
+'protect-expiry-options'      => '2 horas:2 hours,1 dia:1 day,3 dias:3 days,1 semana:1 week,2 semanas:2 weeks,1 mês:1 month,3 meses:3 months,6 meses:6 months,1 anho:1 year,indefinido:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permisson:',
 'restriction-level'           => 'Níble de restriçon:',
 
@@ -542,7 +608,6 @@ Esta ye la configuraçon atual pa la páigina <strong>$1</strong>:',
 # What links here
 'whatlinkshere'       => 'L que lhiga eiqui',
 'whatlinkshere-title' => 'Páiginas que lhigan a "$1"',
-'linklistsub'         => '(Lista de ligações)',
 'linkshere'           => "Estas páiginas ténen lhigaçones pa '''[[:$1]]''':",
 'nolinkshere'         => "Nun eisisten lhigaçones pa '''[[:$1]]'''.",
 'isredirect'          => 'páigina de ancaminamiento',
@@ -648,6 +713,16 @@ Por fabor, scuolhe outro nome.',
 'tooltip-compareselectedversions' => 'Ber las defréncias antre las dues berçones marcadas desta páigina.',
 'tooltip-watch'                   => 'Ajuntar esta páigina als tous begiados',
 
+# Skin names
+'skinname-standard'    => 'Clássico',
+'skinname-nostalgia'   => 'Suidade',
+'skinname-cologneblue' => 'Azul',
+'skinname-monobook'    => 'Lhibro',
+'skinname-myskin'      => 'Piel',
+'skinname-chick'       => 'Cipe-Çape',
+'skinname-simple'      => 'Simpre',
+'skinname-modern'      => 'Moderno',
+
 # Browsing diffs
 'previousdiff' => "� Eidiçon d'atrás",
 'nextdiff'     => 'Redadeira eidiçon →',
@@ -659,7 +734,7 @@ Por fabor, scuolhe outro nome.',
 'show-big-image'       => 'Resoluçon cumpleta',
 'show-big-image-thumb' => '<small>Tamanho desta prebison: $1 × $2 pixeles</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Galerie de nuobos fexeiros',
 
 # Bad image list
diff --git a/languages/messages/MessagesMy.php b/languages/messages/MessagesMy.php
index 232e9a23..18b88f7f 100644
--- a/languages/messages/MessagesMy.php
+++ b/languages/messages/MessagesMy.php
@@ -46,8 +46,6 @@ $messages = array(
 
 'underline-always' => 'အမြဲ',
 
-'skinpreview' => '(နမူနာ)',
-
 # Dates
 'sunday'        => '�​နင်္ဂ​နွေ​',
 'monday'        => '�​နင်္လာ​',
@@ -166,6 +164,11 @@ $messages = array(
 'loginsuccesstitle'       => 'မှ�်​ပုံ​�င်​ဖြင့်​�င်​�ြင်းအောင်မြင်သည်�',
 'loginlanguagelabel'      => 'ဘာသာ: $1',
 
+# Password reset dialog
+'oldpassword' => '�ှက်​စ​ကား​လုံးအဟောင်း:',
+'newpassword' => '�ှက်​စ​ကား​လုံးအသစ်:',
+'retypenew'   => '�ှက်​စ​ကား​လုံးပအသစ်ကိုထပ်ရိုက်ပါ:',
+
 # Edit page toolbar
 'italic_sample' => 'စာသားဆောင်း',
 'italic_tip'    => 'စာသားဆောင်း',
@@ -174,7 +177,7 @@ $messages = array(
 'hr_tip'        => 'မျဉ်းလဲ',
 
 # Edit pages
-'summary'            => 'အ​ကျဉ်း​�ျုပ်​',
+'summary'            => 'အ​ကျဉ်း​�ျုပ်​:',
 'minoredit'          => 'သာ​မန်​ပြင်​ဆင်​မှု​ဖြစ်​ပါ​သည်​',
 'watchthis'          => 'ဤ​စာ​မျက်​နှာ​အား​စောင့်​ကြည့်​ပါ​',
 'savearticle'        => 'သိမ်း​ပါ​',
@@ -182,7 +185,7 @@ $messages = array(
 'showpreview'        => 'န​မူ​နာ​ပြ​ပါ​',
 'showlivepreview'    => 'နမူနာအရှင်',
 'showdiff'           => 'ပြင်​ဆင်​ထား​သည်​များ​ကို​ပြ​ပါ​',
-'summary-preview'    => 'အ​ကျဉ်း​�ျုပ်​န​မူ​နာ',
+'summary-preview'    => 'အ​ကျဉ်း​�ျုပ်​န​မူ​နာ:',
 'whitelistedittitle' => 'ပြင်​ဆင်​�ြင်း​သည်​မှ�်​ပုံ​�င်​ရန်​လို​သည်​',
 'loginreqtitle'      => 'မှ�်​ပုံ​�င်​ဖြင့်​�င်​ဖို့လိုပါ�ယ်',
 'loginreqlink'       => 'မှ�်​ပုံ​�င်​ဖြင့်​�င်​ပါ​',
@@ -204,11 +207,9 @@ $messages = array(
 'mypreferences'     => 'ကျွန်​�ော့​ရွေး​�ျယ်​စ​ရာ​များ​',
 'prefsnologin'      => 'မှ�်​ပုံ​�င်​ဖြင့်​မ​�င်​ရ​သေး​ပါ​',
 'changepassword'    => '�ှက်​စ​ကား​လုံးကိုပြောင်းပါ',
+'skin-preview'      => 'နမူနာ',
 'math'              => 'သင်္�ျာ',
 'datetime'          => 'နေ့စွဲနှင့် အ�ျိန်',
-'oldpassword'       => '�ှက်​စ​ကား​လုံးအဟောင်း:',
-'newpassword'       => '�ှက်​စ​ကား​လုံးအသစ်:',
-'retypenew'         => '�ှက်​စ​ကား​လုံးပအသစ်ကိုထပ်ရိုက်ပါ:',
 'searchresultshead' => 'ရှာ​ဖွေ​ရန်​',
 
 # Groups
@@ -235,12 +236,12 @@ $messages = array(
 'fileuploadsummary' => 'အ​ကျဉ်း​�ျုပ်:',
 'watchthisupload'   => 'ဤ​စာ​မျက်​နှာ​အား​စောင့်​ကြည့်​ပါ​',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'ဖိုင်',
-'imagelist'      => 'ဖိုင်စာရင်း',
-'imagelist_date' => 'နေ့စွဲ',
+'listfiles'      => 'ဖိုင်စာရင်း',
+'listfiles_date' => 'နေ့စွဲ',
 
-# Image description page
+# File description page
 'filehist'           => 'ဖိုင်မှ�်�မ်း',
 'filehist-deleteall' => 'အားလုံးဖျက်',
 'filehist-deleteone' => 'ဖျက်',
@@ -261,7 +262,6 @@ $messages = array(
 
 # Statistics
 'statistics' => 'စာရင်းအင်း',
-'sitestats'  => '{{SITENAME}} စာရင်းအင်းများ',
 
 'brokenredirects-edit'   => '(ပြင်​ဆင်​ရန်)',
 'brokenredirects-delete' => '(ဖျက်​ပါ)',
@@ -279,9 +279,6 @@ $messages = array(
 # Book sources
 'booksources-go' => 'သွား​ပါ​',
 
-# Special:Log
-'log-search-submit' => 'သွား​ပါ​',
-
 # Special:AllPages
 'allpages'       => 'စာမျက်နှာအားလုံး',
 'allarticles'    => 'စာမျက်နှာအားလုံး',
@@ -300,12 +297,16 @@ $messages = array(
 'watch'         => 'စောင့်​ကြည့်​ပါ​',
 'watchthispage' => 'ဤ​စာ​မျက်​နှာ​အား​စောင့်​ကြည့်​ပါ​',
 
-# Delete/protect/revert
-'deletepage'       => 'စာမျက်နှာကိုဖျက်ပါ',
-'confirm'          => 'အ�ည်ပြု',
-'delete-confirm'   => '"$1"ကို ဖျက်ပါ',
-'delete-legend'    => 'ဖျက်',
-'restriction-type' => 'အ�ွင့်:',
+# Delete
+'deletepage'     => 'စာမျက်နှာကိုဖျက်ပါ',
+'confirm'        => 'အ�ည်ပြု',
+'delete-confirm' => '"$1"ကို ဖျက်ပါ',
+'delete-legend'  => 'ဖျက်',
+
+# Protect
+'prot_1movedto2'         => '[[$1]]  မှ​ [[$2]] သို့​',
+'protect-expiry-options' => '� နာရီ:2 hours,� နေ့:1 day,� နေ့:3 days,� ပ�်:1 week,� ပ�်:2 weeks,� လ:1 month,� လ:3 months,� လ:6 months,� နှစ်:1 year,အနန္�:infinite', # display1:time1,display2:time2,...
+'restriction-type'       => 'အ�ွင့်:',
 
 # Restrictions (nouns)
 'restriction-edit'   => 'ပြင်​ဆင်​ရန်​',
@@ -337,6 +338,7 @@ $messages = array(
 # Move page
 'move-page-legend' => 'စာ​မျက်​နှာ​အား​ရွေ့​ပြောင်း​ပါ​',
 'movearticle'      => 'စာ​မျက်​နှာ​အား​ရွေ့​ပြောင်း​ပါ​',
+'movenologin'      => 'မှ�်​ပုံ​�င်​ဖြင့်​မ​�င်​ရ​သေး​ပါ​',
 'movepagebtn'      => 'စာ​မျက်​နှာ​အား​ရွေ့​ပြောင်း​ပါ​',
 'pagemovedsub'     => 'ပြောင်းရွှေ့�ြင်းအောင်မြင်သည်',
 'movedto'          => 'ရွေ့​ပြောင်း​ရန်​နေ​ရာ​',
@@ -361,7 +363,7 @@ $messages = array(
 'tooltip-t-upload'       => 'ဖိုင်�င်ပါ',
 'tooltip-save'           => 'ပြင်ဆင်ရန်သိမ်းပါ',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'ရှာ​ဖွေ​ရန်​',
 
 # EXIF tags
diff --git a/languages/messages/MessagesMyv.php b/languages/messages/MessagesMyv.php
index 87528181..b743a329 100644
--- a/languages/messages/MessagesMyv.php
+++ b/languages/messages/MessagesMyv.php
@@ -14,6 +14,155 @@
  * @author Urhixidur
  */
 
+$fallback = 'ru';
+
+$namespaceNames = array(
+	NS_MEDIA            => 'Меди�',
+	NS_SPECIAL          => 'Башка тевень',
+	NS_TALK             => 'Кортамо',
+	NS_USER             => 'Теиц�',
+	NS_USER_TALK        => 'Теиц�нь кортамо�ь',
+	NS_PROJECT_TALK     => '$1 кортамо�ь',
+	NS_FILE             => '�ртовк�',
+	NS_FILE_TALK        => '�ртовк�то кортамо�ь',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki-нь кортамо�ь',
+	NS_TEMPLATE         => 'ЛопаПарцун',
+	NS_TEMPLATE_TALK    => 'ЛопаПарцундо кортамо�ь',
+	NS_HELP             => 'Лезк�',
+	NS_HELP_TALK        => 'Лезк�т� кортамо�ь',
+	NS_CATEGORY         => 'Категори�',
+	NS_CATEGORY_TALK    => 'Категори�до кортамо�ь',
+);
+
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'КавтоньКирданьЛи�в�евтемат' ),
+	'BrokenRedirects'           => array( 'СинденьЛи�в�евтемат' ),
+	'Userlogin'                 => array( 'Теиц�Совамо' ),
+	'Userlogout'                => array( 'Теиц�Ли�ема' ),
+	'CreateAccount'             => array( 'Теем�Шкам�СовамоТарка' ),
+	'Watchlist'                 => array( 'Ван�тнемаКерьк�' ),
+	'Recentchanges'             => array( 'Чы�коньПолавтомат' ),
+	'Upload'                    => array( 'Йовк�тамо' ),
+	'Listfiles'                 => array( '�ртовк�Керьк�' ),
+	'Newimages'                 => array( 'Од�ртовк�т' ),
+	'Statistics'                => array( 'Стати�тика' ),
+	'Randompage'                => array( 'КодамоПонг�ьЛопа' ),
+	'Lonelypages'               => array( 'Ськамне�тЛопат', 'УрозЛопат' ),
+	'Uncategorizedpages'        => array( 'Категори�втомоЛопат' ),
+	'Uncategorizedcategories'   => array( 'Категори���пакСовавтоСатегори�т' ),
+	'Uncategorizedimages'       => array( 'Категори�втомо�ртовк�т' ),
+	'Uncategorizedtemplates'    => array( 'Категори�втомоЛопаПарцунт' ),
+	'Unusedcategories'          => array( 'Тев���олдавиц�Категори�т' ),
+	'Unusedimages'              => array( 'Тев���олдавиц��ртовк�т' ),
+	'Wantedpages'               => array( 'ВешемаЛопат' ),
+	'Wantedcategories'          => array( 'ВешемаКатегори�т' ),
+	'Mostlinked'                => array( 'СехтеЛамоСюлмавомаПеМартот' ),
+	'Mostlinkedcategories'      => array( 'СехтеЛамоСюлмавомаПеМартоКатегори�т' ),
+	'Mostlinkedtemplates'       => array( 'СехтеЛамоСюлмавомаПеМартоЛопаПарцунт' ),
+	'Mostcategories'            => array( 'Ве�емедеЛамоКатегори�Марто' ),
+	'Mostimages'                => array( 'Ве�емедеЛамо�ртовк�Марто' ),
+	'Mostrevisions'             => array( 'Ве�емедеЛамок�тьЛи�к�томтозь' ),
+	'Fewestrevisions'           => array( 'Ве�емеде�ламок�тьЛи�к�томтозь' ),
+	'Shortpages'                => array( '�урькинеЛопат' ),
+	'Longpages'                 => array( 'КувакаЛопат' ),
+	'Newpages'                  => array( 'ОдЛопат' ),
+	'Ancientpages'              => array( 'Тюшт�ПингеньЛопат' ),
+	'Deadendpages'              => array( 'Ли�емаСюлмавомаПевтемеЛопат' ),
+	'Protectedpages'            => array( 'Ван�тоньЛопат' ),
+	'Protectedtitles'           => array( 'Ван�тоньКон�к�т' ),
+	'Allpages'                  => array( 'Ве�еЛопат' ),
+	'Specialpages'              => array( 'БашкаТевеньЛопат' ),
+	'Contributions'             => array( 'Поладк�т' ),
+	'Whatlinkshere'             => array( 'Тез�ньКодамтСюлмавомаПеть' ),
+	'Recentchangeslinked'       => array( 'Малавик�Полавтомат' ),
+	'Movepage'                  => array( 'Печтевтем�Лопа' ),
+	'Blockme'                   => array( 'Сайма�Саемизь' ),
+	'Booksources'               => array( 'КинигаЛи�ьмапр�т' ),
+	'Categories'                => array( 'Категори�т' ),
+	'Export'                    => array( 'Эк�тпортировам�' ),
+	'Version'                   => array( 'Вер�и�' ),
+	'Allmessages'               => array( 'Ве�еПачт�мн�ть' ),
+	'Blockip'                   => array( 'Сайма�Саем�IP' ),
+	'Undelete'                  => array( 'Вельмевтем�' ),
+	'Import'                    => array( 'Импортировам�' ),
+	'Lockdb'                    => array( 'Сёлгом�ДБ' ),
+	'Unlockdb'                  => array( 'Панжом�ДБ' ),
+	'Userrights'                => array( 'Теиц�ньВидечыть' ),
+	'MIMEsearch'                => array( 'MIMEВешнема' ),
+	'Unwatchedpages'            => array( 'Ван�тнемавтомоЛопат' ),
+	'Revisiondelete'            => array( 'Ли�к�томтомань�ардамо' ),
+	'Unusedtemplates'           => array( 'Тев��пак�олдаЛопаПарцунт' ),
+	'Mypage'                    => array( 'МоньЛопам' ),
+	'Mytalk'                    => array( 'МоньКортамом' ),
+	'Mycontributions'           => array( 'МонМезеТеинь' ),
+	'Popularpages'              => array( 'Ли�ийСовийМартоЛопат' ),
+	'Search'                    => array( 'Вешнем�' ),
+	'Resetpass'                 => array( 'СовамоВалоньПолавтома' ),
+	'Filepath'                  => array( 'ФайланьКи' ),
+	'Blankpage'                 => array( 'ЧавоЛопа' ),
+);
+
+$magicWords = array(
+	'currentmonth'          => array( '1', 'МОЛИЦЯКОВ', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'МОЛИЦЯКОВЛЕМ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'МОЛИЦЯКОВЛЕМГЕ�', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'МОЛИЦЯКОВКИРЬТЯ�ЬХВОРМ�', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'МОЛИЦЯЧЫ', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'МОЛИЦЯЧЫ2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'МОЛИЦЯЧЫЛЕМ', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'МОЛИЦЯИЕ', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'МОЛИЦЯШК�', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'МОЛИЦЯЦЯС', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'ТЕСКЭ�ЬКОВ', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'ТЕСКЭ�ЬКОВЛЕМ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'ТЕСКЭ�ЬКОВЛЕМГЕ�', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'ТЕСКЭ�ЬКОВКИРЬТЯ�ЬХВОРМ�', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'ТЕСКЭ�ЬЧЫ', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'ТЕСКЭ�ЬЧЫ2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'ТЕСКЭ�ЬЧЫЛЕМ', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'ТЕСКЭ�ЬИЕ', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'ТЕСКЭ�ЬШК�', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'ТЕСКЭ�ЬЦЯС', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'ЗЯРОЛОП�Т', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'ЗЯРОС�РМ�ДОВКСТ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'ЗЯРОФ�ЙЛ�Т', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'ЗЯРОТЕИЦЯТ', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'ЗЯРОВИТ�ЕМ�ТПЕТ�ЕМ�Т', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'ЛОП�ЛЕМ', 'PAGENAME' ),
+	'namespace'             => array( '1', 'ЛЕМПОТМО', 'NAMESPACE' ),
+	'talkspace'             => array( '1', 'КОРТ�МОПОТМО', 'TALKSPACE' ),
+	'fullpagename'          => array( '1', 'ЛОП�ЛЕМКУВ�К�СТО', 'FULLPAGENAME' ),
+	'talkpagename'          => array( '1', 'КОРТ�МОЛОП�ЛЕМ', 'TALKPAGENAME' ),
+	'img_right'             => array( '1', 'вить кедь', 'right' ),
+	'img_left'              => array( '1', 'керш кедь', 'left' ),
+	'img_none'              => array( '1', 'вейке�к ара�ь', 'none' ),
+	'img_center'            => array( '1', 'куншка�о', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'кунд�о', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'кундовтомо', 'frameless' ),
+	'img_page'              => array( '1', 'лопа=$1', 'лопа $1', 'page=$1', 'page $1' ),
+	'img_top'               => array( '1', 'верьк�', 'top' ),
+	'img_text_top'          => array( '1', 'тек�т-верьк�', 'text-top' ),
+	'img_middle'            => array( '1', 'куншка', 'middle' ),
+	'img_bottom'            => array( '1', 'алк�', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'тек�т-алк�', 'text-bottom' ),
+	'localweek'             => array( '1', 'ТЕСКЭ�ЬТ�РГО', 'LOCALWEEK' ),
+	'revisionid'            => array( '1', 'ЛИЯКСТОМТОМ�ID', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'ЛИЯКСТОМТОМ�ЧЫ', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'ЛИЯКСТОМТОМ�ЧЫ2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'ЛИЯКСТОМТОМ�КОВ', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'ЛИЯКСТОМТОМ�ИЕ', 'REVISIONYEAR' ),
+	'plural'                => array( '0', 'Л�МО�ЬЧИСЛ�', 'PLURAL:' ),
+	'raw'                   => array( '0', 'ВЕРЕКСТЭ', 'RAW:' ),
+	'currentversion'        => array( '1', 'ТЕВ�ТЕВЕРСИЯ', 'CURRENTVERSION' ),
+	'language'              => array( '0', '#КЕЛЬ', '#LANGUAGE:' ),
+	'numberofadmins'        => array( '1', 'ЗЯРО�ДМИ�Т�ЭДЕ', 'NUMBEROFADMINS' ),
+	'special'               => array( '0', 'башка тевень', 'special' ),
+	'filepath'              => array( '0', 'Ф�ЙЛ��ЬКИ', 'FILEPATH:' ),
+	'pagesize'              => array( '1', 'ЛОП�КУВ�ЛМО', 'PAGESIZE' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Сюлмавома петнень алга черьк�там�:',
@@ -52,6 +201,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Кекшить монь теевть витневк�тн�нь ванома лемри�ьменть �й�т�',
 'tog-watchlisthidebots'       => 'Кекшить бот витневк�тн�нь-петневк�тн�нь ванома лемри�ь�енть �й�т�',
 'tog-watchlisthideminor'      => 'Кекшить апокшкыне витневк�тн�нь ванома лемри�ьменть �й�т�',
+'tog-watchlisthideliu'        => 'Кекшем� �овазь теиц�нь витнематнень-петнематнень, ил��т не�во ванома лемри�ьме��',
+'tog-watchlisthideanons'      => 'Кекшем� апак �ова теиц�нь витнематнень-петнематнень, ил��т не�во ванома лемри�ьме��',
 'tog-nolangconversion'        => '� мерем� вариантонь полавтома ли� ланг�',
 'tog-ccmeonemails'            => 'Кучт монень копи� е-�ёрматнеде, конатнень кучан ли� теиц�нень',
 'tog-diffonly'                => 'Ил�к невтне лопапотмок�онть diffs ало',
@@ -61,8 +212,6 @@ $messages = array(
 'underline-never'   => 'З�рдо�к',
 'underline-default' => 'Ва�н�нь браузер',
 
-'skinpreview' => '(Ва�н�нь невтевк�)',
-
 # Dates
 'sunday'        => 'Таргочи',
 'monday'        => '�т�ньчи',
@@ -149,7 +298,7 @@ $messages = array(
 'mytalk'         => 'Монь кортамом',
 'anontalk'       => 'Кортам� те IP-нть марто',
 'navigation'     => '�авигаци�',
-'and'            => 'ды',
+'and'            => '&#32;ды',
 
 # Metadata in edit box
 'metadata_help' => 'Метадата:',
@@ -186,14 +335,14 @@ $messages = array(
 'talkpagelinktext'  => 'Кортнеме',
 'specialpage'       => 'Башка тевень лопа',
 'personaltools'     => 'Э�ень кедьёнк�т',
-'postcomment'       => 'Кучом� ар�ема марто �ёрма',
+'postcomment'       => 'Од �вк�',
 'articlepage'       => 'Ваном� потмок�лопанть',
 'talk'              => 'Кортнеме',
 'views'             => 'Ваномкат',
 'toolbox'           => 'Кедьёнк� парго',
 'userpage'          => 'Ваномонзо кирдиц�нть лопанзо',
 'projectpage'       => 'Ваномонзо проектенть лопанть',
-'imagepage'         => 'Ваном� артовк�тн�нь-фотокувотнень лопанть',
+'imagepage'         => 'Ваном� файлань лопанть',
 'mediawikipage'     => '�евтемензе �ёрма паргонть лопанть',
 'templatepage'      => 'Ванном� лопапарцунонь лопанть',
 'viewhelppage'      => 'Ванном� лезк�лопанть',
@@ -212,8 +361,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} ланга',
 'aboutpage'            => 'Project:Э�т�денз�',
-'bugreports'           => 'Ильведьк�т� пачт�мн�',
-'bugreportspage'       => 'Project:Вишка �ёрмадовк� ильведьк�т�',
 'copyright'            => '$1-�то му�т мезе те��.',
 'copyrightpagename'    => '{{SITENAME}} копи�нь теемань прават',
 'copyrightpage'        => '{{ns:project}}:Ломанень видечинз�',
@@ -236,8 +383,6 @@ $messages = array(
 
 'badaccess'        => 'Меревемань а�атык�',
 'badaccess-group0' => 'Тонеть а мерить теем� мезе вешить.',
-'badaccess-group1' => 'Вешить теем�, мезе ан��к $1 куронь ломантненень тееви.',
-'badaccess-group2' => 'Вешить и�т�мо тев, конань мерить теем� ан��к $1 куронь ломантненень.',
 
 'versionrequired'     => 'Меди�Викинь $1 вер�и��ь �р�ви',
 'versionrequiredtext' => 'Меди�Викинь $1 вер�и��ь �р�ви те лопанть тев� нолдамга.
@@ -252,6 +397,8 @@ $messages = array(
 'editsection'             => 'витнеме-петнеме',
 'editold'                 => 'витнеме-петнеме',
 'viewsourceold'           => 'ваном� ли�ьмапр�нть',
+'editlink'                => 'витнеме-петнеме',
+'viewsourcelink'          => 'ваном� ли�ьмапр�нзо',
 'editsectionhint'         => '$1 �екци�нть-пельк��нть витнеме-петнеме',
 'toc'                     => 'Потмок�',
 'showtoc'                 => 'невтем�',
@@ -265,13 +412,13 @@ $messages = array(
 'site-atom-feed'          => 'Atom-нть мак�овк� $1-нть ки��',
 'page-rss-feed'           => '«$1» RSS мак�овк�',
 'page-atom-feed'          => '«$1» Atom мак�овк�',
-'red-link-title'          => '$1 (з�р� апак �ёрмадо)',
+'red-link-title'          => '$1 (и�т�мо лопа ара�ь)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Лопа',
 'nstab-user'      => 'Теиц�нь лопа�ь',
 'nstab-media'     => 'Кул�нь пачт�мо керьк�тн�нь лопа�ь',
-'nstab-special'   => 'Башка тев',
+'nstab-special'   => 'Башка лопа',
 'nstab-project'   => 'Проект�нь лопа',
 'nstab-image'     => 'Файла',
 'nstab-mediawiki' => 'Сёрмине',
@@ -310,6 +457,8 @@ $messages = array(
 'protectedpagetext'    => 'Те лопа�ь панжома �кш��, ил�зо понго витнем� - петнем� киненьгак.',
 'viewsourcetext'       => 'Те лопанть ли�ьмапр��ь маштови ваном�как, ланг�тонзо �аем� копи��к:',
 'ns-specialprotected'  => '{{ns:special}} лем марто лопатне а витневить-петневить.',
+'titleprotected'       => "Те кон�к�онть ван�тызе [[Теиц�:$1|$1]], ки�к ил���о тее.
+Тувтало�ь вана ''$2''.",
 
 # Virus scanner
 'virus-scanfailed'     => '�канно�ь �зь ли�е (код $1)',
@@ -326,7 +475,6 @@ $messages = array(
 'yourpasswordagain'          => 'Омбоцеде �ёрмадык кирдиц�нь леметь:',
 'remembermypassword'         => 'Лед�тем� монь �овамо валонть те ар�емашина�онть',
 'yourdomainname'             => 'Э�еть домен�ть:',
-'loginproblem'               => '<b>Совам�то мезе-бути аволь и�т� ли��ь.</b><br />Варчика одов!',
 'login'                      => 'Совамо',
 'nav-login-createaccount'    => 'Совамо / тейть �овамотарка',
 'loginprompt'                => '{{SITENAME}} �айт�нтень �овамга �р�ви нолдам� тев� cookies.',
@@ -348,7 +496,7 @@ $messages = array(
 'yourrealname'               => '�лкук�онь леметь:',
 'yourlanguage'               => 'Келе�ь:',
 'yournick'                   => 'Кедень путома:',
-'badsiglength'               => 'Кедень путомат пек кувака; ил��т уле �й��нз� $1 -до ламо тешк�т.',
+'badsiglength'               => 'Кедень путомат пек кувака; уле�т �й��нз� $1 -до аламо тешк�т.',
 'email'                      => 'Е-�ёрма',
 'prefs-help-realname'        => '�лкук�онь леметь (ара�ь мелеть, ил�к путо): пут�ак, ды �он карми не�вомо не таркатне��, ко�о тон тев те�т.',
 'loginerror'                 => 'Совам�то ильведьк�',
@@ -376,9 +524,9 @@ $messages = array(
 Ине�ькеть, кодак вало�ь пачкоди, �овака одов.',
 'eauthentsent'               => 'Электрононь адре��з�ть кучозь кемек�тамонь е-�ёрмине.<br /> Сонз� �й�� �ёрмадозь мезе кода теем�. �н��к �еде мейле, з�рдо невтик, адре���ь алкук� ��еть, карматано кучомо ли� �ёрмат.',
 'mailerror'                  => 'Е-�ёрма кучом�то ильведьк�: $1',
-'acct_creation_throttle_hit' => 'Ил�мизь чумондо, уш тейнекшныть $1 �овамотаркат.
+'acct_creation_throttle_hit' => 'Ил�мизь чумондо, уш тейнекшныть {{PLURAL:$1|1 �овамотарка|$1 �овамотаркат}}.
 Седе ламо теть теем� а мерить.',
-'emailauthenticated'         => 'Е-�ёрма паргот кемек�тазель $1 чы�т�.',
+'emailauthenticated'         => 'Е-�ёрма паргот кемек�тазель $2 чы�т� $3 ц���то.',
 'emailconfirmlink'           => 'Кемек�тык е-�ёрмапаргот',
 'accountcreated'             => 'Совамо тарка�ь теезь',
 'accountcreatedtext'         => '$1-нь �овиц�нь тарка�ь теев�ь-шкав�ь.',
@@ -386,11 +534,13 @@ $messages = array(
 
 # Password reset dialog
 'resetpass'           => 'Полавтом� �овамотаркань �овамо валот',
-'resetpass_header'    => '�равтом� од �овамо валот',
+'resetpass_header'    => 'Полавтом� �овамо валот',
+'oldpassword'         => 'Ташто �овамо валот:',
+'newpassword'         => 'Од �овамо валот:',
+'retypenew'           => 'Сёрмадык омбоцеде �овамо валот:',
 'resetpass_submit'    => 'Тештик �овамо валот ды �овак',
 'resetpass_success'   => 'Совамо валот полавтов�ь теть! Совавтыть �й��ть �и�тема�...',
 'resetpass_forbidden' => 'Совамо валтн� а полавтовить',
-'resetpass_missing'   => 'Формань дата ара�ь.',
 
 # Edit page toolbar
 'bold_sample'     => 'Эчке тек�т',
@@ -415,8 +565,8 @@ $messages = array(
 'hr_tip'          => 'Менель кирьк��нь кик� (тев� нолдыть ван�тозь)',
 
 # Edit pages
-'summary'                          => 'Вей��нд�зь',
-'subject'                          => 'Сёрмадовк�онть лемез�',
+'summary'                          => 'Вей��нд�зь:',
+'subject'                          => 'Сёрмадовк�онть лемез�:',
 'minoredit'                        => 'Те апокшк� витнема-петнема',
 'watchthis'                        => 'Ваном� те лопанть мельга',
 'savearticle'                      => 'Ван�том� лопанть',
@@ -426,8 +576,8 @@ $messages = array(
 'showdiff'                         => '�евтем� мезе полавтов�ь',
 'anoneditwarning'                  => "'''Ванок:''' З�р� �зить �ова. IP адре��ть �овавтови те лопанть витнема-петнема икельк� умантень.",
 'missingcommenttext'               => 'Ине�ькеть мелеть-арь�емат путта тез�нь алов.',
-'summary-preview'                  => 'Цётомань �едеикелев вановк�',
-'subject-preview'                  => 'Темань/кон�к�онь ва�н�нь невтема',
+'summary-preview'                  => 'Цётомань �едеикелев вановк�:',
+'subject-preview'                  => 'Темань/кон�к�онь ва�н�нь невтема:',
 'blockedtitle'                     => 'Совиц��ь кардазь',
 'blockedtext'                      => "<big>'''Тонть теиц�нь леметь �ли IP-тешк�т�ть �овавтозь �айма�.'''</big>
 
@@ -445,6 +595,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'blockedoriginalsource'            => "'''$1''' -нть ли�ьмапр��ь ало не�ви:",
 'whitelistedittitle'               => 'Витнемань-петнемань теемга �р�ви �овамо лем',
 'whitelistedittext'                => 'Лопанть витнем� - петнем� �р�ви $1.',
+'confirmedittitle'                 => 'Витнемга-петнемга �р�ви е-�ёрма паргонь кемек�тамо',
 'nosuchsectiontitle'               => 'И�т�мо �вк� ара�ь',
 'loginreqtitle'                    => 'Совам� �р�ви',
 'loginreqlink'                     => '�овам�',
@@ -457,20 +608,20 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 Ли�индер�й те�� ильведьк�, лепштик браузер�� '''back''' повн�нть.",
 'noarticletext'                    => "�еень шка�то те лопа�онть �ёрмадовк� ара�ь. Му�ак [[Special:Search/{{PAGENAME}}|лед�тнеманть те леменз�]] ли� �ёрмадовк�тн��� али '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} теем� лопа и�т�мо лем марто]'''.",
 'updated'                          => '(Одолгавтозь)',
-'note'                             => '<strong>Явт мель:</strong>',
-'previewnote'                      => '<strong>Те - ан��к ва�н�нь невтевк�; полавтоматне з�р� апак ван�то!</strong>',
+'note'                             => "'''Явт мель:'''",
+'previewnote'                      => "'''Те - ан��к ва�н�нь невтевк�; полавтоматне з�р� апак ван�то!'''",
 'editing'                          => 'Витн�т-петн�т $1',
 'editingsection'                   => 'Витнеме-петнеме $1 (�екци�нть)',
 'editingcomment'                   => 'Витн�т-петн�т $1 (мельть-арь�емат)',
 'yourtext'                         => 'Мезе �ёрмадыть',
 'storedversion'                    => 'Ван�тозь вер�и�',
 'yourdiff'                         => 'Мей�� �вовить',
-'copyrightwarning'                 => 'Ине�кеть кирдть мель�� {{SITENAME}}-�� ве�е путовк�тн�нь, лововить нолдазек� ало $2  конёвонть кор�� (вант $1 педе пе�). �ра�ь мелеть витневтем�-петневтем� �ёрмадовк�от педе пе�, ил�к �е�т� путо �онз� тез�нь.<br />
+'copyrightwarning'                 => "Ине�кеть кирдть мель�� {{SITENAME}}-�� ве�е путовк�тн�нь, лововить нолдазек� ало $2  конёвонть кор�� (вант $1 педе пе�). �ра�ь мелеть витневтем�-петневтем� �ёрмадовк�от педе пе�, ил�к �е�т� путо �онз� тез�нь.<br />
 И�т�жо тез�нь материалонь мак�ом�от, кемек�тат тон тон�ь �ёрмадык �онз�, али �аик �онз� вей��нь ёнк�то али ол�чинь портал�то. 
-<strong>ИЛЯ М�КСО В��СТО�Ь ВИДЕЧИСЭ ЛОМ��Е�Ь В�ЖОДЕМ��ТЬ �П�К КЕВКСТ�Е!</strong>',
-'longpagewarning'                  => '<strong>В��ОК: Те лопанть �талмозо $1 килобайтт; конат-конат интерчаматне��-браузертн��� �така�то витнем�-петнем� �ёрмадовк� 32-во kб �талмо�о али �еде �така.
-Ине�ькеть, паро улевель лопанть �вом� вишка пельк�ек�.</strong>',
-'titleprotectedwarning'            => '<strong>В��ОК:  Те лопа�ь �ёлгозь, �он ан��к койкона теиц�нень тееви-шкави.</strong>',
+'''ИЛЯ М�КСО В��СТО�Ь ВИДЕЧИСЭ ЛОМ��Е�Ь В�ЖОДЕМ��ТЬ �П�К КЕВКСТ�Е!'''",
+'longpagewarning'                  => "'''В��ОК: Те лопанть �талмозо $1 килобайтт; конат-конат интерчаматне��-браузертн��� �така�то витнем�-петнем� �ёрмадовк� 32-во kб �талмо�о али �еде �така.
+Ине�ькеть, паро улевель лопанть �вом� вишка пельк�ек�.'''",
+'titleprotectedwarning'            => "'''В��ОК:  Те лопа�ь �ёлгозь, �он ан��к койкона теиц�нень тееви-шкави.'''",
 'templatesused'                    => 'Те лопа�онть тев� нолдазь лопа парцунт:',
 'templatesusedpreview'             => 'Те икельк� вановк��онть тев� нолдазь лопа парцунт:',
 'templatesusedsection'             => 'Те пельк���нть тев� нолдазь лопа парцунт:',
@@ -485,6 +636,8 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
  
 Ва�н� арь�ек, �р�ви - а �р�ви полалем� ды витнем�-петнем� те лопанть.
 Вант те лопанть нардома лувонть ало:",
+'deletelog-fulllog'                => 'Ваном� ве�е журналонть',
+'edit-conflict'                    => 'Витнемань-петнемань алад�мо.',
 
 # Parser/template warnings
 'post-expand-template-argument-category' => 'Лопатне�� улить лопа парцунонь нардань аргументт',
@@ -493,27 +646,27 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'cantcreateaccounttitle' => 'Сёрмадома таркыне�ь а тееви',
 
 # History pages
-'viewpagelogs'        => 'Ванном� те лопа� �овамодо-ли�емадо тевть',
-'nohistory'           => 'Те лопанть витнемадо-петнемадо икельк� умазо ара�ь.',
-'revnotfound'         => 'Ли�к�томтома�ь а муеви',
-'currentrev'          => 'Тевате ли�к�томтома',
-'revisionasof'        => '$1-це вер�и��ь',
-'revision-info'       => '$1 -нь ли�к�томтома, конань теизе $2',
-'previousrevision'    => '�Седе икелень ли�к�томтома',
-'nextrevision'        => 'Седе од вановк�→',
-'currentrevisionlink' => 'Тевате ли�к�томтома',
-'cur'                 => 'неень',
-'next'                => '�ыц�',
-'last'                => 'меель�е',
-'page_first'          => 'ва�енце',
-'page_last'           => 'меель�е',
-'histlegend'          => "Вер�ин�ь кочкамо�ь: тешк�ты невтезь вери��тнень,  али лепштик Enter повн�нть.<br />
+'viewpagelogs'           => 'Ванном� те лопа� �овамодо-ли�емадо тевть',
+'nohistory'              => 'Те лопанть витнемадо-петнемадо икельк� умазо ара�ь.',
+'currentrev'             => 'Тевате ли�к�томтома',
+'revisionasof'           => '$1-це вер�и��ь',
+'revision-info'          => '$1 -нь ли�к�томтома, конань теизе $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Седе икелень ли�к�томтома',
+'nextrevision'           => 'Седе од вановк�→',
+'currentrevisionlink'    => 'Тевате ли�к�томтома',
+'cur'                    => 'неень',
+'next'                   => '�ыц�',
+'last'                   => 'меель�е',
+'page_first'             => 'ва�енце',
+'page_last'              => 'меель�е',
+'histlegend'             => "Вер�ин�ь кочкамо�ь: тешк�ты невтезь вери��тнень,  али лепштик Enter повн�нть.<br />
 Чарькодевтемат: (молиц.) = ред�мо�ь молиц� вер�и��тонть; (и. молиц.) = ред�мо�ь икеле молиц� вер�и��тонть; '''а''' = аволь �еде ламо ли�к�томтома.",
-'deletedrev'          => '[нардазь]',
-'histfirst'           => 'Ва�енце',
-'histlast'            => 'Меель�е',
-'historysize'         => '({{PLURAL:$1|1 байт|$1 байтт}})',
-'historyempty'        => '(чаво)',
+'history-fieldset-title' => 'Ваном� лопанть юронзо-путовк�онзо',
+'deletedrev'             => '[нардазь]',
+'histfirst'              => 'Ва�енце',
+'histlast'               => 'Меель�е',
+'historysize'            => '({{PLURAL:$1|1 байт|$1 байтт}})',
+'historyempty'           => '(чаво)',
 
 # Revision feed
 'history-feed-title'          => 'Ли�к�томтомань тевде',
@@ -550,6 +703,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'mergehistory-box'                 => 'Совавтом� кавто лопатнень ли�к�томтомадо �ёрмадовк�тн�нь ве лув�:',
 'mergehistory-from'                => 'Ли�ьмапр� лопа:',
 'mergehistory-into'                => 'Совавтома лопа:',
+'mergehistory-list'                => 'Вейть��нд�виц� юронзо-путовк�онзо',
 'mergehistory-go'                  => '�евтем� вейть� �овавтомк� витнемат-петнемат',
 'mergehistory-submit'              => 'Совавтом� ли�к�томтоматнень вейть�',
 'mergehistory-empty'               => 'Вейке�к ли�к�томтома а �овавтови вейть� ли� марто.',
@@ -570,36 +724,88 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'compareselectedversions' => 'Кочказь вер�и�тнень аравтом� карадо-каршо',
 'editundo'                => 'Вел�втом� мекев мезе витнинь-петнинь',
 'diff-multi'              => '({{PLURAL:$1|$1 юткине вер�и��ь апак невте|$1 юткине вер�и�тне апак невте|$1 юткине вер�и�тнеде апак невте.}})',
+'diff-movedto'            => 'печтевтезь $1-�',
+'diff-styleadded'         => '$1 �тиле�ь поладозь',
+'diff-added'              => '$1 поладозь',
+'diff-changedto'          => 'полавтозь и�т�мок� $1',
+'diff-removed'            => '$1 нардазь',
+'diff-src'                => 'ли�ьмапр�зо',
+'diff-width'              => 'келез�',
+'diff-height'             => '��рез�',
+'diff-p'                  => "'''ушодома-абзац'''",
+'diff-blockquote'         => "'''цитат'''",
+'diff-h1'                 => "'''кон�к� (лув 1)'''",
+'diff-h2'                 => "'''кон�к� (лув 2)'''",
+'diff-h3'                 => "'''кон�к� (лув 3)'''",
+'diff-h4'                 => "'''кон�к� (лув 4)'''",
+'diff-h5'                 => "'''кон�к� (лув 5)'''",
+'diff-div'                => "'''�вк�'''",
+'diff-ul'                 => "'''�пи�ка, апак йовта кона�ь з�роце'''",
+'diff-ol'                 => "'''з�роцень-з�роцень �пи�ка'''",
+'diff-li'                 => "'''�пи�ка� �овий'''",
+'diff-table'              => "'''таблица'''",
+'diff-tbody'              => "'''мезе таблица�онть'''",
+'diff-tr'                 => "'''чильк�'''",
+'diff-td'                 => "'''чакшк�'''",
+'diff-th'                 => "'''кон�к�'''",
+'diff-br'                 => "'''ютко'''",
+'diff-hr'                 => "'''горизонтонь кон�� кик�'''",
+'diff-dl'                 => "'''чарькодевтемань �пи�ка'''",
+'diff-dt'                 => "'''чарькодевтема вал'''",
+'diff-dd'                 => "'''чарькодевтема'''",
+'diff-input'              => "'''путомк�т'''",
+'diff-form'               => "'''хорма'''",
+'diff-img'                => "'''неевть'''",
+'diff-span'               => "'''вак�'''",
+'diff-a'                  => "'''�юлмавома пе'''",
+'diff-i'                  => "'''комавтозь'''",
+'diff-b'                  => "'''�чк�т�'''",
+'diff-strong'             => "'''кеме�т�'''",
+'diff-em'                 => "'''тешк�тамо марто'''",
+'diff-font'               => "'''�ёрма'''",
+'diff-big'                => "'''покш�то'''",
+'diff-del'                => "'''нардазь'''",
+'diff-tt'                 => "'''аравтонь келез�'''",
+'diff-sub'                => "'''алга тешк�тавк�'''",
+'diff-sup'                => "'''верьга тешк�тавк�'''",
+'diff-strike'             => "'''трок� черьк�тавк�'''",
 
 # Search results
-'searchresults'             => 'Мезе муев�ь',
-'searchsubtitle'            => 'Вешнить \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|ве�е лопатне "$1" лопа�то �аезь]] | [[Special:WhatLinksHere/$1|"$1" лопа марто �юлмазь ве�е лопатне]])',
-'searchsubtitleinvalid'     => "Вешнить '''$1'''",
-'noexactmatch'              => "'''\"\$1\" кон�к� марто лопа ара�ь.''' Мелеть ули, [[:\$1|теика те лопанть]].",
-'noexactmatch-nocreate'     => "'''\"\$1\" лем�� лопа ара�ь.'''",
-'titlematches'              => 'Лопанть кон�к�онзо марто вейть� пра�ь',
-'notitlematches'            => 'Лопанть кон�к�онзо марто вейть� прамот ара�ть',
-'textmatches'               => 'Лопанть �ёрмад�тк�нз� марто вейть� прамот',
-'notextmatches'             => 'Лопанть �ёрмад�тк�нз� марто вейть� прамот ара�ть',
-'prevn'                     => '�еде икелень $1',
-'nextn'                     => '�ы $1',
-'viewprevnext'              => 'Ванном� ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 вал|$2 валт}})',
-'search-redirect'           => '(йутавтт $1-�)',
-'search-section'            => '(пельк� $1)',
-'search-suggest'            => 'И�т� мерик�келить: $1',
-'search-interwiki-caption'  => 'Дугак� проектт',
-'search-interwiki-more'     => '(�еде ламо)',
-'search-mwsuggest-enabled'  => 'ушодк� марто',
-'search-mwsuggest-disabled' => 'ушодк�томо',
-'search-relatedarticle'     => 'Малавик�',
-'searchrelated'             => 'малавик�',
-'searchall'                 => 'ве�е',
-'powersearch'               => 'Седе�к вешнем�',
-'powersearch-ns'            => 'Вешнем� не лем потмотне�т�:',
-'powersearch-redir'         => 'Ли� таркав йутавтоматнень �ёрмалема',
-'powersearch-field'         => 'Вешнем�',
-'search-external'           => 'Ушо йондонь вешнема',
+'searchresults'                  => 'Мезе муев�ь',
+'searchresults-title'            => 'Мезе муев�ь "$1" вешнема�о',
+'searchsubtitle'                 => 'Вешнить \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|ве�е лопатне "$1" лопа�то �аезь]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" лопа марто �юлмазь ве�е лопатне]])',
+'searchsubtitleinvalid'          => "Вешнить '''$1'''",
+'noexactmatch'                   => "'''\"\$1\" кон�к� марто лопа ара�ь.''' Мелеть ули, [[:\$1|теика те лопанть]].",
+'noexactmatch-nocreate'          => "'''\"\$1\" лем�� лопа ара�ь.'''",
+'titlematches'                   => 'Лопанть кон�к�онзо марто вейть� пра�ь',
+'notitlematches'                 => 'Лопанть кон�к�онзо марто вейть� прамот ара�ть',
+'textmatches'                    => 'Лопанть �ёрмад�тк�нз� марто вейть� прамот',
+'notextmatches'                  => 'Лопанть �ёрмад�тк�нз� марто вейть� прамот ара�ть',
+'prevn'                          => '�еде икелень $1',
+'nextn'                          => '�ы $1',
+'viewprevnext'                   => 'Ванном� ($1) ($2) ($3)',
+'searchmenu-legend'              => 'Вешнемань аравтомкат',
+'searchhelp-url'                 => 'Help:Лопа�ь мезе кирди',
+'searchprofile-images'           => 'Файлат',
+'searchprofile-everything'       => 'Ве�е',
+'searchprofile-articles-tooltip' => 'Вешнем� вана те�т� $1',
+'searchprofile-project-tooltip'  => 'Вешнем� вана те�т� $1',
+'search-result-size'             => '$1 ({{PLURAL:$2|1 вал|$2 валт}})',
+'search-redirect'                => '(йутавтт $1-�)',
+'search-section'                 => '(пельк� $1)',
+'search-suggest'                 => 'И�т� мерик�келить: $1',
+'search-interwiki-caption'       => 'Дугак� проектт',
+'search-interwiki-more'          => '(�еде ламо)',
+'search-mwsuggest-enabled'       => 'ушодк� марто',
+'search-mwsuggest-disabled'      => 'ушодк�томо',
+'search-relatedarticle'          => 'Малавик�',
+'searchrelated'                  => 'малавик�',
+'searchall'                      => 'ве�е',
+'powersearch'                    => 'Седе�к вешнем�',
+'powersearch-ns'                 => 'Вешнем� не лем потмотне�т�:',
+'powersearch-redir'              => 'Ли� таркав йутавтоматнень �ёрмалема',
+'powersearch-field'              => 'Вешнем�',
+'search-external'                => 'Ушо йондонь вешнема',
 
 # Preferences page
 'preferences'              => 'Ли� ютк�то �вома',
@@ -614,6 +820,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'qbsettings-floatingright' => 'Вить ёнга уи',
 'changepassword'           => 'Салавань валонь полавтома',
 'skin'                     => '�еемань лад�ема',
+'skin-preview'             => 'Ва�н�нь неевтез�',
 'math'                     => 'Математика',
 'dateformat'               => 'Чынь хвормат',
 'datedefault'              => 'Икельк� вешема ара�ь',
@@ -621,23 +828,25 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'math_failure'             => '� ловнови',
 'math_unknown_error'       => 'апак �одань ильведьк�',
 'math_unknown_function'    => 'апак �одань функци�',
+'math_lexing_error'        => 'лек�иконь ман�вк�',
 'math_syntax_error'        => '�интак�онь ильведевк�',
 'prefs-personal'           => 'Теиц�до',
 'prefs-rc'                 => 'Чиень полавтнемат',
 'prefs-watchlist'          => 'Ванома лемри�ьме',
+'prefs-watchlist-days-max' => '(�ех ламо 7 чить)',
 'prefs-misc'               => 'Минеть-�юнот',
+'prefs-resetpass'          => 'Совамо валонь полавтомо',
 'saveprefs'                => 'Ван�том�',
 'resetprefs'               => '�ардам� апак ван�то полавтнемат',
-'oldpassword'              => 'Ташто �овамо валот:',
-'newpassword'              => 'Од �овамо валот:',
-'retypenew'                => 'Сёрмадык омбоцеде �овамо валот:',
 'textboxsize'              => 'Витнема-петнема',
+'prefs-edit-boxsize'       => 'Витнема-петнема вальманть ��ренз�-келенз�.',
 'columns'                  => 'Палманть:',
 'searchresultshead'        => 'Вешн�ма',
 'resultsperpage'           => 'З�рок�ть ва�тневи ве лопа�о:',
 'contextlines'             => 'З�ро ри�ьметь �рьва муевк���:',
 'timezonelegend'           => 'Ча�овойть карк�т',
-'localtime'                => 'Те�к�нь шка�ь',
+'localtime'                => 'Теиц�нь шка�ь:',
+'timezoneselect'           => 'Шкань зона�ь:',
 'servertime'               => 'Сервер�нь шка',
 'prefs-namespaces'         => 'Лем потмот',
 'default'                  => 'з�рдо ли�к� апак йовта',
@@ -682,7 +891,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'right-move'          => 'Ютавтом� лопат ли�в',
 'right-upload'        => '�вк�там� файлат',
 'right-reupload'      => 'Одонь �ёрмадомга улик� файланть нардам�',
-'right-upload_by_url' => 'Йовк�там� файла URL адре��т�',
+'right-upload_by_url' => '�вк�там� файлат URL адре��т�',
 'right-delete'        => '�ардам� лопатнень',
 'right-bigdelete'     => '�ардам� кувака икельк� ума марто лопатнень',
 'right-browsearchive' => 'Вешнем� нардань файлатне��',
@@ -691,13 +900,25 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'right-blockemail'    => 'Кардам� ли� ли�ийтнень-�овийтнень е-�ёрмань кучомадо',
 'right-editinterface' => 'Витнем�-петнем� теиц�нь интерчаманть (ва�одема йожонть)',
 'right-editusercssjs' => 'Витнем�-петнем� ли� теиц�тнень CSS ды JS файла�т',
-'right-import'        => 'Йовк�там� ли� Вики�т� лопат',
+'right-import'        => '�вк�там� ли� Вики�т� лопат',
+'right-mergehistory'  => 'Вейть��нд�м� лопатнень юро�т-путовк�о�т',
 'right-siteadmin'     => 'Датабазань �ёлгомо ды панжомо',
 
 # User rights log
 'rightslog'  => 'У�ькетеиц�нть видечинть кемек�тома',
 'rightsnone' => '(ара�ть)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'           => 'те лопань ловномо',
+'action-edit'           => 'те лопанть витнеме-петнеме',
+'action-createpage'     => 'лопань тееме-шкамо',
+'action-createtalk'     => 'кортнема лопань тееме-шкамо',
+'action-move'           => 'печтевтем� те лопанть',
+'action-move-subpages'  => 'печтевтем� те лопанть, ды алонзо ве�е лопатнень',
+'action-movefile'       => 'печтевтем� те файланть',
+'action-delete'         => 'нардам� те лопанть',
+'action-deleterevision' => 'нардам� те ли�к�томтоманть',
+
 # Recent changes
 'nchanges'                       => '$1 {{PLURAL:$1|полавтнема|полавтнемат}}',
 'recentchanges'                  => 'Чы�конь полавтнемат-ли�к�томтомат',
@@ -741,9 +962,10 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'filedesc'           => '�урькине�т�',
 'fileuploadsummary'  => '�урькине�т�:',
 'filesource'         => 'Ли�ьмапр�зо:',
-'uploadedfiles'      => 'Йовк�тань файлат',
+'uploadedfiles'      => '�вк�тань файлат',
 'minlength1'         => 'Файлалеме�ь аштез� вейке �ли �еде ламо тешк�ттн��т�.',
 'badfilename'        => 'Файланть леме�ь полавтозь "$1"-к�.',
+'filetype-missing'   => 'Файланть ара�ь поладк� пез� (�аемга «.jpg»).',
 'fileexists-thumb'   => "<center>'''Улик� файла'''</center>",
 'successfulupload'   => 'Совавтов�ь кода �р�ви',
 'uploadwarning'      => 'Совавтомадо кардамонь пачт�мо',
@@ -762,21 +984,23 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'upload-misc-error'  => 'Файлань ёвк�тамонь апак �одань ильведевк�',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
+'upload-curl-error6'  => 'URL-��ь а кундави',
 'upload-curl-error28' => '�вк�тамо шка�ь ве�и��ь',
 
 'license'            => 'Лицензи�нь теема:',
 'nolicense'          => 'Лицензи� ара�ь',
+'license-nopreview'  => '(Ва�н�нь невтевк� ара�ь)',
 'upload_source_file' => ' (ар�и машина�от файла)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'файл',
-'imagelist'      => 'Файлат-мезть',
-'imagelist_date' => 'Чи',
-'imagelist_name' => 'Лемез�',
-'imagelist_user' => 'Теиц�',
-'imagelist_size' => 'Покшолма',
+'listfiles'      => 'Файлат-мезть',
+'listfiles_date' => 'Чи',
+'listfiles_name' => 'Лемез�',
+'listfiles_user' => 'Теиц�',
+'listfiles_size' => 'Покшолма',
 
-# Image description page
+# File description page
 'filehist'                       => 'Файланть �р�мопингез�',
 'filehist-help'                  => 'Лепштинк чиннть/шканть ланк�, �е�т� ван�ынк коли файло�ь ульне�ь теезь.',
 'filehist-deleteall'             => 'нардам� ве�е',
@@ -798,6 +1022,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'noimage'                        => 'Кодамо�к файла и�т�мо лем марто ара�ь. Ули мелеть $1.',
 'noimage-linktext'               => 'йовк�тык тень',
 'uploadnewversion-linktext'      => 'Тонгодо од вер�и� те файланть',
+'imagepage-searchdupe'           => 'Вешнем� кавонзазь файлатнень',
 
 # File reversion
 'filerevert'         => 'Вел�втом� $1 мекев',
@@ -834,17 +1059,22 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 
 # Random page
 'randompage'         => 'Кодамо понг�ь лопа',
-'randompage-nopages' => 'Те лем тарка�онть лопат ара�ть.',
+'randompage-nopages' => '"$1"  лем потмо�онть лопат ара�ть.',
 
 # Random redirect
 'randomredirect'         => '�пак фат� ёнк�о�ь',
-'randomredirect-nopages' => 'Те лем тарка�онть ли�в ютавтомат ара�ть.',
+'randomredirect-nopages' => '"$1"  лем потмо�онть ли�в ютавтомат ара�ть.',
 
 # Statistics
-'statistics'             => 'Стати�тикат',
-'sitestats'              => '{{SITENAME}} �тати�тика',
-'userstats'              => 'Теиц�нь �тати�тика',
-'statistics-mostpopular' => 'Ве�емеде �еедь�т� ванозь лопат',
+'statistics'              => 'Стати�тикат',
+'statistics-header-pages' => 'Лопань �тати�тикат',
+'statistics-header-edits' => 'Стати�тикань витнеме-петнеме',
+'statistics-header-views' => 'Стати�тикань ваномо',
+'statistics-header-users' => 'Теиц�нь �тати�тика',
+'statistics-articles'     => 'Потмо марто лопат',
+'statistics-pages'        => 'Лопат',
+'statistics-files'        => 'Йовк�тань файлат',
+'statistics-mostpopular'  => 'Ве�емеде �еедь�т� ванозь лопат',
 
 'disambiguations'     => 'Лопат, конат �ёрмад�товтовить ламо�му�тев терминтт',
 'disambiguationspage' => 'Template:�му�тень кор�� �вома',
@@ -877,7 +1107,8 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'popularpages'            => 'Ра�ьке ютк�о вечкевик� лопат',
 'wantedcategories'        => 'Вешень категори�т',
 'wantedpages'             => 'Вешень лопат',
-'missingfiles'            => '�мазь файлат',
+'wantedfiles'             => 'Вешезь файлат',
+'wantedtemplates'         => 'Вешезь лопа парцунт',
 'mostlinked'              => 'Лопат конатне� �ехте ламо �юлмавома пенеть невтить',
 'mostlinkedcategories'    => 'Сехте �юлмавозь категори�тнень марто',
 'mostlinkedtemplates'     => 'Сехте ламо �юлмавома пе марто лопа парцунт',
@@ -893,6 +1124,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'protectedpagestext'      => '�е вана лопатне ван�тозь, ил��т понго печтевтем� �ли витнем�-петнем�',
 'protectedtitles'         => 'Ван�тонь кон�к�т',
 'listusers'               => 'Теиц�т-кить',
+'usereditcount'           => '$1 {{PLURAL:$1|витнема-петнема|витнемат-петнемат}}',
 'newpages'                => 'Од лопат',
 'newpages-username'       => 'Теиц�нь лем:',
 'ancientpages'            => 'Ве�емеде умонь лопат',
@@ -915,7 +1147,6 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'speciallogtitlelabel' => 'Кон�к�озо:',
 'log'                  => 'Совамо-ли�ема тевть (реги�траци��ь)',
 'all-logs-page'        => 'Ве�и �овамотне-кемек�тамотьне',
-'log-search-submit'    => '�д�',
 
 # Special:AllPages
 'allpages'        => 'Ве�е лопат',
@@ -939,17 +1170,27 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'special-categories-sort-count' => 'аравтом� цётонь кор��',
 'special-categories-sort-abc'   => 'аравтом� альфавит�нь кор��',
 
+# Special:LinkSearch
+'linksearch-pat' => 'Вешнемк� парцун:',
+'linksearch-ns'  => 'Лем потмозо:',
+'linksearch-ok'  => 'Вешн�м�',
+
 # Special:ListUsers
 'listusers-submit'   => '�евтем�',
 'listusers-noresult' => 'Совиц�зо а муеви',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Од �овиц�',
+
 # Special:ListGroupRights
+'listgrouprights'         => 'Теиц� куронть видечинз�',
 'listgrouprights-group'   => 'Куро',
 'listgrouprights-rights'  => 'Видечытне',
-'listgrouprights-members' => '(куронь ломаньть)',
+'listgrouprights-members' => '(куронь ломанть)',
 
 # E-mail user
 'emailuser'       => 'Кучом� е-�ёрма те теиц�нтень',
+'emailpage'       => 'Кучт �-�ёрма теиц�нтень',
 'defemailsubject' => '{{SITENAME}} е-�ёрма',
 'noemailtitle'    => 'Е-�ёрма парго ара�ь',
 'emailfrom'       => 'Кинь пельде:',
@@ -962,28 +1203,22 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'emailsenttext'   => 'Е-�ёрма�о пачт�мн�ть кучов�ь.',
 
 # Watchlist
-'watchlist'            => 'Мезе мельга мон ван�тн�н',
-'mywatchlist'          => 'Мезе мельга мон ван�тн�н',
-'watchlistfor'         => "('''$1'''-те)",
-'watchnologin'         => '�пак �ова',
-'addedwatch'           => 'Топавтозь ванома потмок�оньте',
-'addedwatchtext'       => 'Лопа�ь «[[:$1]]» �овавтозь [[Special:Watchlist|ванома потмозот]].
+'watchlist'         => 'Мезе мельга мон ван�тн�н',
+'mywatchlist'       => 'Мезе мельга мон ван�тн�н',
+'watchlistfor'      => "('''$1'''-те)",
+'watchnologin'      => '�пак �ова',
+'addedwatch'        => 'Топавтозь ванома потмок�оньте',
+'addedwatchtext'    => 'Лопа�ь «[[:$1]]» �овавтозь [[Special:Watchlist|ванома потмозот]].
 Седе тов те лопа�онть ды мартонзо �юлмавозь кортнема лопа�онть теезь витьнематне тешк�тавтовить те потмонтень, и�т�жо кармить кик�тазь те лопа�онть[[Special:RecentChanges|потмо од витнематне]], и�т� �еде шожда�то �ынь не�вить.',
-'removedwatch'         => '�ардазь ванома потмок�тонть',
-'removedwatchtext'     => 'Лопа�ь «[[:$1]]» ульне�ь нардазь тынк ванома потмок�тонть.',
-'watch'                => 'Ван�тнем�',
-'watchthispage'        => 'Ван�тнем� те лопа мельга',
-'unwatch'              => '� ван�тнем� тень мельга',
-'unwatchthispage'      => 'Лоткам� ван�томадонзо',
-'notvisiblerev'        => 'Ли�к�томтома�ь нардазь',
-'watchlist-details'    => 'Ванома лемри�ьме��ть {{PLURAL:$1|$1 лопа|$1 лопат}}, апак лово кортнема лопатнень.',
-'wlshowlast'           => '�евтем� мель�е $1 ц��т $2 чить $3',
-'watchlist-show-bots'  => '�евтем� ботонть витнеманзо-петнеманзо',
-'watchlist-hide-bots'  => 'Кекш�м� мезе бото�ь витне�ь-петне�ь',
-'watchlist-show-own'   => '�евтем� мезе мон витнинь-петнинь',
-'watchlist-hide-own'   => 'Кекш�м� мезе мон витнинь-петнинь',
-'watchlist-show-minor' => '�евтем� апокшк� витнематнень-петнематнень',
-'watchlist-hide-minor' => 'Кекш�м� апокшк� витнемат-петнемат',
+'removedwatch'      => '�ардазь ванома потмок�тонть',
+'removedwatchtext'  => 'Лопа�ь «[[:$1]]» ульне�ь нардазь тынк ванома потмок�тонть.',
+'watch'             => 'Ван�тнем�',
+'watchthispage'     => 'Ван�тнем� те лопа мельга',
+'unwatch'           => '� ван�тнем� тень мельга',
+'unwatchthispage'   => 'Лоткам� ван�томадонзо',
+'notvisiblerev'     => 'Ли�к�томтома�ь нардазь',
+'watchlist-details' => 'Ванома лемри�ьме��ть {{PLURAL:$1|$1 лопа|$1 лопат}}, апак лово кортнема лопатнень.',
+'wlshowlast'        => '�евтем� мель�е $1 ц��т $2 чить $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ванома...',
@@ -996,42 +1231,47 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'enotif_lastdiff'              => 'Те полавтоманть ваномга вант $1.',
 'enotif_anon_editor'           => 'лемтеме теиц� $1',
 
-# Delete/protect/revert
-'deletepage'                  => '�ардам� лопанть',
-'confirm'                     => 'Кемек�там�',
-'excontent'                   => "пот�онзоль: '$1'",
-'exbeforeblank'               => "чамдомадо икеле �й��нз� ульне�ь: '$1'",
-'exblank'                     => 'лопа�ь чаволь',
-'delete-confirm'              => '�ардам� "$1"',
-'delete-legend'               => '�ардам�',
-'historywarning'              => 'Ванок: Лопанть, конань пурнат нардамонзо улить ли�к�томтомань икельк� уманзо:',
-'confirmdeletetext'           => 'Кундыть нардамо лопа (�ли невтевк�-артовк�) вейть�� ли�к�томтоматнеде икельк� уманзо марто.<br />
+# Delete
+'deletepage'             => '�ардам� лопанть',
+'confirm'                => 'Кемек�там�',
+'excontent'              => "пот�онзоль: '$1'",
+'exbeforeblank'          => "чамдомадо икеле �й��нз� ульне�ь: '$1'",
+'exblank'                => 'лопа�ь чаволь',
+'delete-confirm'         => '�ардам� "$1"',
+'delete-legend'          => '�ардам�',
+'historywarning'         => 'Ванок: Лопанть, конань пурнат нардамонзо улить ли�к�томтомань икельк� уманзо:',
+'confirmdeletetext'      => 'Кундыть нардамо лопа (�ли невтевк�-артовк�) вейть�� ли�к�томтоматнеде икельк� уманзо марто.<br />
 Ине�ькеть,  кемек�тык, ��еть мелеть кор�� тень тей�ак, алкук� �одат, мезе ли�ды теде мейле, ды алкук� те�т тень видечинть (правилатьнень) кор��, конат �ёрмадозь [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Тевень теема�ь топавтов�ь',
-'deletedtext'                 => '"<nowiki>$1</nowiki>"-�ь ульне�ь нардазь.
+'actioncomplete'         => 'Тевень теема�ь топавтов�ь',
+'deletedtext'            => '"<nowiki>$1</nowiki>"-�ь ульне�ь нардазь.
 Вант $2 то�о ве�и уаль умоконь нардавк�не.',
-'deletedarticle'              => 'нардазь "[[$1]]"',
-'dellogpage'                  => '�ардомань �овама-кемек�тома',
-'deletionlog'                 => 'нардамонь �ёрмалема',
-'reverted'                    => 'Вельмевтезь лопань �еде икелень ли�к�томтома',
-'deletecomment'               => 'Тувтал печкеме:',
-'deleteotherreason'           => 'Ли�/топавтозь тувтал:',
-'deletereasonotherlist'       => 'Ли� тувтал',
-'delete-edit-reasonlist'      => 'Витнем�-петнем� нардамонь тувталтн�нь',
-'rollback'                    => 'Кевердем� витнематнень-петнематнень мекев',
-'rollback_short'              => 'Мекев кевердема',
-'rollbacklink'                => 'кевердем�',
-'rollbackfailed'              => 'Мекев кевердема�ь �зь ли�е',
+'deletedarticle'         => 'нардазь "[[$1]]"',
+'dellogpage'             => '�ардомань �овама-кемек�тома',
+'deletionlog'            => 'нардамонь �ёрмалема',
+'reverted'               => 'Вельмевтезь лопань �еде икелень ли�к�томтома',
+'deletecomment'          => 'Тувтал печкеме:',
+'deleteotherreason'      => 'Ли�/топавтозь тувтал:',
+'deletereasonotherlist'  => 'Ли� тувтал',
+'delete-edit-reasonlist' => 'Витнем�-петнем� нардамонь тувталтн�нь',
+
+# Rollback
+'rollback'       => 'Кевердем� витнематнень-петнематнень мекев',
+'rollback_short' => 'Мекев кевердема',
+'rollbacklink'   => 'кевердем�',
+'rollbackfailed' => 'Мекев кевердема�ь �зь ли�е',
+
+# Protect
 'protectlogpage'              => 'Ван�томань �овама-кемек�тома',
 'protectedarticle'            => 'ван�тозь "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] печтевтезь тей [[$2]]',
 'protect-legend'              => 'Кемек�тынк аравтоманть лопанть ван�томанзо',
 'protectcomment'              => 'Мельполадк�:',
 'protectexpiry'               => 'Пр�дови:',
 'protect_expiry_invalid'      => 'Пр�дома шка�ь ашти ютань шка�о.',
 'protect_expiry_old'          => 'Пр�дома  шка�ь амаштовик�.',
 'protect-unchain'             => 'Панжом� �ыргамонь нолдамонть',
-'protect-text'                => 'Те�� тынь ван�ынк ды ли�к�том�ынк ван�томанть покшолманзо лопаньте <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Кирдиц�нь �овамо таркат а мак�ы видечи ли�к�томтом� лопанть ван�тома лувонзо. Те�� вана лопанть улик� путовк�онзо-аравтоманзо <strong>$1</strong>:',
+'protect-text'                => "Те�� тынь ван�ынк ды ли�к�том�ынк ван�томанть покшолманзо лопаньте '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Кирдиц�нь �овамо таркат а мак�ы видечи ли�к�томтом� лопанть ван�тома лувонзо. Те�� вана лопанть улик� путовк�онзо-аравтоманзо '''$1''':",
 'protect-cascadeon'           => 'Те лопа�ь ван�тозь,  �он путозь {{PLURAL:$1|невтезезь ало лопаньте, конаньте|невтезезь ало лопатьнене конатьнене}}-те путозь ка�кадонь ван�тома�ь. Тынь ли�к�тав�ынк те ван�тома ��ренть, ан��к те кода�к а полав�ы ка�кадонь ван�томанть.',
 'protect-default'             => '(апандовк�)',
 'protect-fallback'            => 'Вешеви ве мель� прамо�ь «$1»-нть',
@@ -1041,6 +1281,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'protect-expiring'            => 'пр�дови $1 (UTC)',
 'protect-cascade'             => 'Ван�том� лопатьнень, конат �овавтозь те лопаньте(ка�кадонь ван�тома)',
 'protect-cantedit'            => 'Тынь али�к�тав�ынк ван�томань уровн�нть те лопанть, тынк ара�ть видечинк �онз� ли�к�томаньте.',
+'protect-expiry-options'      => '1 ча�:1 hour,1 чи:1 day,1 тарго:1 week,2 таргот:2 weeks,1 ков:1 month,3 ковт:3 months,6 ковт:6 months,1 ие:1 year,певтеме:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '�олдамо:',
 'restriction-level'           => '�олдавк�онь покшиз�:',
 'minimum-size'                => 'Минимум кувалмозо',
@@ -1086,8 +1327,10 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'month'         => 'Ков�тонть (ды �еде икеле):',
 'year'          => 'Ие�т�нть (ды �еде икеле):',
 
+'sp-contributions-newbies'     => '�евтем� ан��к од теиц�тнень путовк�о�т',
 'sp-contributions-newbies-sub' => 'Од акаунт�',
 'sp-contributions-blocklog'    => 'Пек�тамонь журнало�ь',
+'sp-contributions-search'      => 'Путовк�онь вешнеме',
 'sp-contributions-username'    => 'IP адре� �ли теиц�нь лем:',
 'sp-contributions-submit'      => 'Вешн�м�',
 
@@ -1095,7 +1338,6 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'whatlinkshere'            => 'Мезе тез�нь �юлмави',
 'whatlinkshere-title'      => '$1 марто �юлмазь лопатне',
 'whatlinkshere-page'       => 'Лопа�ь:',
-'linklistsub'              => '(�алткень потмок�)',
 'linkshere'                => "Сыц� лопатьне �юлмававить '''[[:$1]]''' марто:",
 'nolinkshere'              => "Кодаткак лопат а�ульмавить '''[[:$1]]''' марто.",
 'isredirect'               => 'Ли�к� витнинк-петнинк лопанть',
@@ -1130,6 +1372,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'unblockip'               => '�олдам� теиц�нть �айме�т�',
 'ipusubmit'               => '�олдам� те адре��нть �айма�то',
 'ipblocklist'             => 'Сайме� �аень IP адре��т ды теиц�т',
+'ipblocklist-legend'      => 'Вешнем� �айма� �аезь теиц�',
 'ipblocklist-submit'      => 'Вешн�ме',
 'infiniteblock'           => 'певтеме',
 'expiringblock'           => 'пр�дови $1',
@@ -1140,6 +1383,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'blocklogentry'           => 'пект�тамонзо [[$1]]  ютазь шканть марто $2 $3',
 'unblocklogentry'         => '�айме�т� нолдазь $1',
 'block-log-flags-noemail' => 'е-�ёрма озавтозь �айме�',
+'ipb_already_blocked'     => '"$1" уш �айма� �аезь',
 'blockme'                 => 'Озавтомак �айме�',
 'proxyblocksuccess'       => 'Озавтов�ь.',
 
@@ -1173,6 +1417,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 
 З�рдо и�т�т тевтне, �ави тон�теть лопатнень кучом�-�юлмам�, кедь��.",
 'movearticle'             => 'Одов лемдем� лопанть:',
+'movenologin'             => '�пак �ова',
 'newtitle'                => 'Од леменьт�:',
 'move-watch'              => 'Ваном� лопанть',
 'movepagebtn'             => 'Печтевтем� лопанть',
@@ -1183,6 +1428,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'movedto'                 => 'печтевтезь',
 'movetalk'                => 'Печтевтемань кортамо лопа',
 'movepage-page-moved'     => '"$1" лопа�ь печтевтезь "$2"-�.',
+'movepage-page-unmoved'   => 'Лопа $1 �зь печтевтеве $2 лопа�.',
 '1movedto2'               => '[[$1]] печтевтезь тей [[$2]]',
 'movelogpage'             => 'Печтевтемань журнал',
 'movereason'              => 'Тувтало�ь:',
@@ -1192,10 +1438,12 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'delete_and_move_reason'  => 'Печтевтемга нардазь',
 
 # Export
-'export'           => 'Эк�портировам� лопат',
-'export-addcat'    => 'Поладом�',
-'export-download'  => 'Таргам� файлак�',
-'export-templates' => 'Поладом� лопа парцунонтень',
+'export'            => 'Эк�портировам� лопат',
+'export-submit'     => 'Ливтем�',
+'export-addcattext' => 'Поладом� лопат, конань категори��т:',
+'export-addcat'     => 'Поладом�',
+'export-download'   => 'Таргам� файлак�',
+'export-templates'  => 'Поладом� лопа парцунонтень',
 
 # Namespace 8 related
 'allmessages'        => 'Си�т�мань вишка �ёрмадовк�',
@@ -1210,10 +1458,11 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 # Special:Import
 'import'                     => 'Таргам� лопатнень',
 'import-interwiki-submit'    => 'Таргам�',
-'import-interwiki-namespace' => 'Печтевтем� лопатнень те лемпотмонтень:',
+'import-interwiki-namespace' => '�оровазь лемпотмо�ь:',
+'import-comment'             => '�р�емат-мельть:',
 'importstart'                => 'Лопатне �овавтовить...',
 'import-revision-count'      => '$1 {{PLURAL:$1|ли�к�томтома|ли�к�томтомат}}',
-'importnopages'              => 'Йовк�там� лопат ара�ть',
+'importnopages'              => '�вк�там� лопат ара�ть',
 'importfailed'               => 'Совавтома теве�ь �зь ли�е: <nowiki>$1</nowiki>',
 'importbadinterwiki'         => '�маштовик� интервики �юлмавома пе',
 'importnotext'               => 'Чаво �ли тек�т ара�ь',
@@ -1230,7 +1479,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'tooltip-pt-mytalk'               => 'Кортнемалопам',
 'tooltip-pt-preferences'          => 'Мей�� �вован ли�тнень �й�т�',
 'tooltip-pt-watchlist'            => 'Лопатне, конатнень мельга ван�тн�т: ли�к�томтовить а ли�к�томтовить',
-'tooltip-pt-mycontris'            => 'Мезе�� мон лездынь',
+'tooltip-pt-mycontris'            => 'Мезе�� лездынь мезе путынь',
 'tooltip-pt-login'                => 'Совавтовлить ��ь пр�т тез�нь, ара�ь мелеть, ил�.',
 'tooltip-pt-logout'               => 'Ли�ем�',
 'tooltip-ca-talk'                 => 'Кортавтома пек паро лопадонть',
@@ -1244,6 +1493,8 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'tooltip-ca-watch'                => 'Топавтом� те лопанть тынк ваномалопаньте',
 'tooltip-ca-unwatch'              => 'Панемензе (нардамонзо) те лопанть тынк ваномалопа�тонть',
 'tooltip-search'                  => 'Вешнем� вана те�т� {{SITENAME}}',
+'tooltip-search-go'               => 'И�т�мо лем марто лопа улиндер�й, молем� �ез�нь',
+'tooltip-search-fulltext'         => 'Лопатне�т� вешнем� и�т�мо тек�т',
 'tooltip-p-logo'                  => 'Пр�к� лопа',
 'tooltip-n-mainpage'              => 'Совака пр�к�лопантень',
 'tooltip-n-portal'                => 'Проект�нть �й�т�,  мей�� лездам�, ко�то мезе муем�',
@@ -1257,6 +1508,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'tooltip-t-upload'                => '�к�там� файлат',
 'tooltip-t-specialpages'          => 'Башка тевень лопатне мельга-мельцек',
 'tooltip-t-print'                 => 'Лопанть конёв ланг� нолдавома вер�и�зо',
+'tooltip-t-permalink'             => 'Свал шкань �юлмавома пе лопань те верзи�нтень',
 'tooltip-ca-nstab-main'           => 'Ваном� потмо лопанзо',
 'tooltip-ca-nstab-user'           => 'Ваном� теиц�нь лопанть',
 'tooltip-ca-nstab-media'          => 'Ваном� медиа лопанть',
@@ -1275,11 +1527,12 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'tooltip-upload'                  => 'Ушодом� йовк�тамонть',
 
 # Attribution
-'anonymous'   => '{{SITENAME}}-нь лемтеме теиц�(т)',
-'siteuser'    => '{{SITENAME}}-нь теиц� $1',
-'others'      => 'ли�т',
-'siteusers'   => '{{SITENAME}}-нь теиц�(т) $1',
-'creditspage' => 'Лопа�онть кинь путовк�онзо',
+'anonymous'     => '{{SITENAME}} �айт�нть лемтеме {{PLURAL:$1|теиц�зо|теиц�нзо}}',
+'siteuser'      => '{{SITENAME}}-нь теиц� $1',
+'othercontribs' => '$1-нь важодеманзо ланг� нежедезь.',
+'others'        => 'ли�т',
+'siteusers'     => '{{SITENAME}} �айт�нть {{PLURAL:$2|теиц�зо|теиц�нзо}} $1',
+'creditspage'   => 'Лопа�онть кинь путовк�онзо',
 
 # Spam protection
 'spamprotectiontitle' => 'Шукшто ван�тома филтра',
@@ -1290,6 +1543,13 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'numtalkedits' => 'З�рок�ть витнезь-петнезь (кортнема лопа): $1',
 'numwatchers'  => 'З�ро ван�тнить тень мельга: $1',
 
+# Skin names
+'skinname-standard'  => 'Кла��икань',
+'skinname-nostalgia' => 'ОдПингеньМазы',
+'skinname-myskin'    => 'Э�ьМелемКор��',
+'skinname-simple'    => 'Шожда',
+'skinname-modern'    => '�ееньШкань',
+
 # Patrol log
 'patrol-log-auto' => '(�он�ь теи)',
 
@@ -1309,12 +1569,14 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'show-big-image'       => 'Пешк�е теевк�е�ь',
 'show-big-image-thumb' => '<small>Ва�н�нь невтевк��нть покшолмазо: $1 × $2 пик��лт</small>',
 
-# Special:NewImages
-'newimages'    => 'Од файлатьнень галлере��ь',
-'showhidebots' => '($1 ботт)',
-'noimages'     => '�ра�ь мезе ваном�.',
-'ilsubmit'     => 'Вешн�м�',
-'bydate'       => 'чинь кор��',
+# Special:NewFiles
+'newimages'        => 'Од файлатьнень галлере��ь',
+'newimages-legend' => 'Сувтеме',
+'newimages-label'  => 'Файлалем (�ли пельк��з�):',
+'showhidebots'     => '($1 ботт)',
+'noimages'         => '�ра�ь мезе ваном�.',
+'ilsubmit'         => 'Вешн�м�',
+'bydate'           => 'чинь кор��',
 
 # Bad image list
 'bad_image_list' => 'Луво�ь-формато�ь вана и�т�мо:
@@ -1349,6 +1611,8 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'exif-lightsource'     => 'Валдонь ли�ьмапр�зо',
 'exif-flash'           => 'Кивчкадема',
 'exif-filesource'      => 'Файланть �аемазо',
+'exif-cfapattern'      => 'CFA парцун',
+'exif-contrast'        => 'Контра�то�ь',
 'exif-gpslatituderef'  => 'Йакшамо йононь �ли лембе ма�тор йононь келез�',
 'exif-gpslatitude'     => 'Келез�',
 'exif-gpslongituderef' => 'Чили�емань �ли чивалгомань кувалмо',
@@ -1443,7 +1707,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 
 # External editor support
 'edit-externally'      => 'Витнем�-петнем� те файланть, тев� нолдазь ушо ёнк�онь программанть',
-'edit-externally-help' => 'Вант [http://www.mediawiki.org/wiki/Manual:External_editors аравтома ин�трукци�тнень ] �еде ламо информаци�нть ки�.',
+'edit-externally-help' => '(Вант [http://www.mediawiki.org/wiki/Manual:External_editors аравтома ин�трукци�тнень] �еде ламо информаци�нть ки�.)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'ве�е',
@@ -1460,6 +1724,7 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 
 # Trackbacks
 'trackbackremove' => ' ([$1 �ардам�])',
+'trackbacklink'   => 'Мекев потамо ��кельк��нь-��кельк��нь',
 
 # Delete conflict
 'recreate' => 'Шкак-тейть одов',
@@ -1467,26 +1732,24 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 # action=purge
 'confirm_purge_button' => 'ОК',
 
-# AJAX search
-'searchcontaining' => "Вешнем� лопат конатне�� ''$1''.",
-'searchnamed'      => "Вешнем� лопат конань леме�т ''$1''.",
-'articletitles'    => "Лопатне конат ушодовить ''$1''",
-
 # Multipage image navigation
 'imgmultipageprev' => '� �едикелень лопа�ь',
 'imgmultipagenext' => '�еде мейлень лопа�ь →',
 'imgmultigo'       => '�д�!',
+'imgmultigoto'     => 'Молем� $1 лопантень',
 
 # Table pager
 'table_pager_next'         => 'Седе тов ве лопа',
 'table_pager_prev'         => 'Седе икелень лопа',
 'table_pager_first'        => 'Ва�ень лопа�ь',
 'table_pager_last'         => 'Меель�е лопа�ь',
+'table_pager_limit'        => '�евтем� ве лопа� $1 тевть',
 'table_pager_limit_submit' => '�д�',
 'table_pager_empty'        => 'Ре�ултатт ара�ть',
 
 # Auto-summaries
-'autosumm-new' => 'Од лопа: $1',
+'autosumm-replace' => "Лопа�ь полавтови '$1' марто",
+'autosumm-new'     => 'Од лопа: $1',
 
 # Live preview
 'livepreview-loading' => 'Йоракшны…',
@@ -1496,12 +1759,15 @@ IP-тешк�т�ть — $3, �айма� �овавтоманть ID-�ь —
 'watchlistedit-normal-title'  => 'Витнем�-петнем� ван�тома лопанть',
 'watchlistedit-normal-submit' => '�ардам� кон�к�тн�нь',
 'watchlistedit-normal-done'   => '{{PLURAL:$1|1 кон�к�|$1 кон�к�т}} нардазь ваномань лопа�тот:',
+'watchlistedit-raw-title'     => 'Витнеме-петнеме верек ваномалопанть',
+'watchlistedit-raw-legend'    => 'Витнеме-петнеме верек ваномалопанть',
 'watchlistedit-raw-titles'    => 'Кон�к�т:',
+'watchlistedit-raw-added'     => 'Поладозь {{PLURAL:$1|1 кон�к�|$1 кон�к�т}}:',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Ли�к�томатьне лопатне�� потмок��тонть',
 'watchlisttools-edit' => 'Ваном� ды витнем�-петнем� мезе мельга ван�тн�т',
-'watchlisttools-raw'  => 'Витнед� начко ваномалопанть',
+'watchlisttools-raw'  => 'Витнеме-петнеме верек ваномалопанть',
 
 # Special:Version
 'version'                  => 'Вер�и�', # Not used as normal message but as header for the special page itself
diff --git a/languages/messages/MessagesMzn.php b/languages/messages/MessagesMzn.php
index 626a2044..087f24e6 100644
--- a/languages/messages/MessagesMzn.php
+++ b/languages/messages/MessagesMzn.php
@@ -100,8 +100,8 @@ $2، $1', # $1 date, $2 time
 # Upload
 'upload' => '�ایل بار بی یلدن',
 
-# Special:ImageList
-'imagelist' => 'هارشی ئون ره لیست',
+# Special:ListFiles
+'listfiles' => 'هارشی ئون ره لیست',
 
 'disambiguations' => 'گجگجی بایری ولگ ئون',
 
@@ -152,7 +152,7 @@ $2، $1', # $1 date, $2 time
 # Special:Import
 'import-interwiki-submit' => 'بیاردن',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'سرک بنک',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesNa.php b/languages/messages/MessagesNa.php
index b60bb616..1d126fa2 100644
--- a/languages/messages/MessagesNa.php
+++ b/languages/messages/MessagesNa.php
@@ -21,7 +21,7 @@ $messages = array(
 
 'qbedit'        => 'Kiwiwid',
 'moredotdotdot' => 'Iyuw...',
-'and'           => 'me',
+'and'           => '&#32;me',
 
 'errorpagetitle' => 'Dairinaiya',
 'help'           => 'Ipuok',
@@ -70,7 +70,8 @@ $messages = array(
 'editingsection' => 'Oomo/edar $1 (itubwang)',
 
 # Search results
-'powersearch' => 'Anani ko',
+'searchhelp-url' => 'Help:Oangan',
+'powersearch'    => 'Anani ko',
 
 # Preferences page
 'skin'              => 'Witsin',
@@ -101,14 +102,14 @@ $messages = array(
 'watch'   => 'Aea',
 'unwatch' => 'Eab krak',
 
-# Delete/protect/revert
+# Delete
 'confirm'        => 'Oebwigaga',
 'deletedarticle' => 'iyababa "[[$1]]"',
 
 # Contributions
 'contributions' => 'Mana engame totow inne',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Anani ko',
 
 );
diff --git a/languages/messages/MessagesNah.php b/languages/messages/MessagesNah.php
index 81bde26a..806e8163 100644
--- a/languages/messages/MessagesNah.php
+++ b/languages/messages/MessagesNah.php
@@ -9,26 +9,62 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-# Per conversation with a user in IRC, we inherit from Spanish and work from there
-# Nahuatl was the language of the Aztecs, and a modern speaker is most likely to
-# understand Spanish if a Nah translation is not available
 $fallback = 'es';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'MÄ“diatl',
+	NS_SPECIAL          => 'N�ncuahquīzqui',
+	NS_TALK             => 'Tēixn�miquiliztli',
+	NS_USER             => 'Tlatequitiltilīlli',
+	NS_USER_TALK        => 'Tlatequitiltilīlli_tēixn�miquiliztli',
+	NS_PROJECT_TALK     => '$1_tēixn�miquiliztli',
+	NS_FILE             => 'Īxiptli',
+	NS_FILE_TALK        => 'Īxiptli_tēixn�miquiliztli',
+	NS_MEDIAWIKI        => 'Huiquimedia',
+	NS_MEDIAWIKI_TALK   => 'Huiquimedia_tēixn�miquiliztli',
+	NS_TEMPLATE         => 'Nemachiy�tīlli',
+	NS_TEMPLATE_TALK    => 'Nemachiy�tīlli_tēixn�miquiliztli',
+	NS_HELP             => 'Tēpalēhuiliztli',
+	NS_HELP_TALK        => 'Tēpalēhuiliztli_tēixn�miquiliztli',
+	NS_CATEGORY         => 'Neneuhc�y�tl',
+	NS_CATEGORY_TALK    => 'Neneuhc�y�tl_tēixn�miquiliztli',
+);
+
+$namespaceAliases = array(
+	'Media'		=> NS_MEDIA,
+	'Especial'	=> NS_SPECIAL,
+	'Discusión'	=> NS_TALK,
+	'Usuario'	=> NS_USER,
+	'Usuario_Discusión'	=> NS_USER_TALK,
+	'Wikipedia'	=> NS_PROJECT,
+	'Wikipedia_Discusión'	=> NS_PROJECT_TALK,
+	'Imagen'	=> NS_FILE,
+	'Imagen_Discusión'	=> NS_FILE_TALK,
+	'MediaWiki'	=> NS_MEDIAWIKI,
+	'MediaWiki_Discusión'	=> NS_MEDIAWIKI_TALK,
+	'Plantilla'	=> NS_TEMPLATE,
+	'Plantilla_Discusión'	=> NS_TEMPLATE_TALK,
+	'Ayuda'		=> NS_HELP,
+	'Ayuda_Discusión'	=> NS_HELP_TALK,
+	'Categoría'	=> NS_CATEGORY,
+	'Categoría_Discusión'	=> NS_CATEGORY_TALK,
+);
+
 $specialPageAliases = array(
-	'Userlogin'               => array( 'Tlacalaquiliztli', 'Registrarse' ),
-	'Upload'                  => array( 'Quetza', 'Subir' ),
-	'Shortpages'              => array( 'Z�zanilt�n', 'PáginasCortas' ),
-	'Longpages'               => array( 'HuēiyacZ�zaniltin', 'PáginasLargas' ),
-	'Newpages'                => array( 'YancuīcZ�zaniltin', 'PáginasNuevas' ),
-	'Ancientpages'            => array( 'HuēhuehZ�zaniltin', 'PáginasViejas' ),
-	'Allpages'                => array( 'MochīntīnZ�zaniltin', 'TodasPáginas' ),
-	'Specialpages'            => array( 'N�ncuahquīzquiĀmatl', 'PáginasEspeciales' ),
-	'Emailuser'               => array( 'EmailTl�catl', 'CorreoUsuario' ),
-	'Categories'              => array( 'Neneuhc�y�tl', 'Categorías' ),
-	'Mypage'                  => array( 'Noz�zanil', 'MiPágina' ),
-	'Mytalk'                  => array( 'Notēixn�miquiliz', 'MiDiscusión' ),
-	'Mycontributions'         => array( 'Notlahcuil�l', 'MisContribuciones' ),
-	'Search'                  => array( 'Tlatēm�z', 'Buscar' ),
+	'Userlogin'                 => array( 'Tlacalaquiliztli', 'Registrarse' ),
+	'Upload'                    => array( 'Quetza', 'Subir' ),
+	'Shortpages'                => array( 'Z�zanilt�n', 'PáginasCortas' ),
+	'Longpages'                 => array( 'HuēiyacZ�zaniltin', 'PáginasLargas' ),
+	'Newpages'                  => array( 'YancuīcZ�zaniltin', 'PáginasNuevas' ),
+	'Ancientpages'              => array( 'HuēhuehZ�zaniltin', 'PáginasViejas' ),
+	'Allpages'                  => array( 'MochīntīnZ�zaniltin', 'TodasPáginas' ),
+	'Specialpages'              => array( 'N�ncuahquīzquiĀmatl', 'PáginasEspeciales' ),
+	'Emailuser'                 => array( 'EmailTl�catl', 'CorreoUsuario' ),
+	'Categories'                => array( 'Neneuhc�y�tl', 'Categorías' ),
+	'Mypage'                    => array( 'Noz�zanil', 'MiPágina' ),
+	'Mytalk'                    => array( 'Notēixn�miquiliz', 'MiDiscusión' ),
+	'Mycontributions'           => array( 'Notlahcuil�l', 'MisContribuciones' ),
+	'Search'                    => array( 'Tlatēm�z', 'Buscar' ),
 );
 
 $messages = array(
@@ -58,6 +94,8 @@ $messages = array(
 'tog-watchlisthideown'     => 'Tiquintl�tīz mopatlaliz motlachiyalizpan',
 'tog-watchlisthidebots'    => 'Tiquintl�tīz tepozpatlaliztli motlachiyalizpan',
 'tog-watchlisthideminor'   => 'Tiquintl�tīz tlapatlalitzintli motlachiyalizpan',
+'tog-watchlisthideliu'     => 'Tiquintl�tīz tl�cah �mocalacqueh īntlapatlaliz motlachiyalizpan',
+'tog-watchlisthideanons'   => 'Tiquintl�tīz tl�cah aht�c�itl īntlapatlaliz motlachiyalizpan',
 'tog-nolangconversion'     => 'Ahmo tictēquitiltia tlaht�lcuepaliztli',
 'tog-ccmeonemails'         => 'N� xinēch-mailīz ihcu�c nitē-mailīz tlatequitiltilīlli',
 'tog-diffonly'             => 'Ahmo tiquitt�z z�zanilli ītlapiyaliz ahneneuhquilitzīntlan',
@@ -66,8 +104,6 @@ $messages = array(
 'underline-always' => 'Mochipa',
 'underline-never'  => 'AÄ«cmah',
 
-'skinpreview' => '(Xiquitta quemeh yez)',
-
 # Dates
 'sunday'        => 'T�natiuht�nal',
 'monday'        => 'Mētztlit�nal',
@@ -154,7 +190,7 @@ $messages = array(
 'mytalk'         => 'Notēixn�miquiliz',
 'anontalk'       => 'Inīn IP ītēixn�miquiliz',
 'navigation'     => 'Ācalpapan�liztli',
-'and'            => 'īhu�n',
+'and'            => '&#32;īhu�n',
 
 # Metadata in edit box
 'metadata_help' => 'Metatlahcuil�lli:',
@@ -238,9 +274,7 @@ $messages = array(
 
 'badaccess'        => 'Tlahuelītiliztechcopa ahcuall�tl',
 'badaccess-group0' => 'Tehhu�tl ahmo tiquichīhua in�n tiquiēlēhuia.',
-'badaccess-group1' => 'In�n tiquiēlēhuia zan quichīhuah tlatequitiltilīlli onc�n: $1.',
-'badaccess-group2' => 'In�n tiquiēlēhuia zan quichīhuah tlatequitiltilīlli onc�n: $1.',
-'badaccess-groups' => 'In�n tiquiēlēhuia zan quichīhuah tlatequitiltilīlli onc�n: $1.',
+'badaccess-groups' => 'In�n tiquiēlēhuia zan quichīhuah tlatequitiltilīlli {{PLURAL:$2|onc�n|onc�n}}: $1.',
 
 'ok'                      => 'Cualli',
 'retrievedfrom'           => 'Īhuīcpa "$1"',
@@ -251,6 +285,8 @@ $messages = array(
 'editsection'             => 'ticpatl�z',
 'editold'                 => 'ticpatl�z',
 'viewsourceold'           => 'xiquitta tlaht�lcaquiliztil�ni',
+'editlink'                => 'ticpatl�z',
+'viewsourcelink'          => 'tiquitt�z tlaht�lcaquiliztil�ni',
 'editsectionhint'         => 'Ticpatlacah: $1',
 'toc'                     => 'Inīn tlahcuil�lco',
 'showtoc'                 => 'xiquitta',
@@ -382,10 +418,15 @@ Occeppa xicalaqui niman ticmatīz.',
 'loginlanguagelabel'        => 'Tlaht�lli: $1',
 
 # Password reset dialog
-'resetpass_header'    => 'Xicpatl�z motlaht�lichtac�yo',
-'resetpass_submit'    => 'Xicpatl�z motlaht�lichtac�yo auh xicalaquīz',
-'resetpass_success'   => '¡Cualli �mopatlac motlaht�lichtac�yo! Āxc�n ticalaquicah...',
-'resetpass_forbidden' => 'Tlaht�lichtacay�tl ahmo mohuelītih mopatlah',
+'resetpass'                 => 'Ticpatl�z motlaht�lichtac�yo',
+'resetpass_header'          => 'Xicpatl�z motlaht�lichtac�yo',
+'oldpassword'               => 'Huēhueh motlaht�lichtacayo:',
+'newpassword'               => 'Yancuīc motlaht�lichtacayo:',
+'retypenew'                 => 'Occeppa xiquihcuiloa yancuīc motlaht�lichtacayo:',
+'resetpass_submit'          => 'Xicpatl�z motlaht�lichtac�yo auh xicalaquīz',
+'resetpass_success'         => '¡Cualli �mopatlac motlaht�lichtac�yo! Āxc�n ticalaquicah...',
+'resetpass_forbidden'       => 'Tlaht�lichtacay�tl ahmo mohuelītih mopatlah',
+'resetpass-submit-loggedin' => 'Ticpatl�z motlaht�lichtac�yo',
 
 # Edit page toolbar
 'bold_sample'     => 'Tlīltic tlahcuil�lli',
@@ -405,7 +446,7 @@ Occeppa xicalaqui niman ticmatīz.',
 'hr_tip'          => 'P�ntli',
 
 # Edit pages
-'summary'                          => 'Mopatlaliz',
+'summary'                          => 'Mopatlaliz:',
 'minoredit'                        => 'Inīn cah tlapatlalitzintli',
 'watchthis'                        => 'Tictlachiy�z inīn z�zanilli',
 'savearticle'                      => 'Ticpiy�z',
@@ -414,7 +455,7 @@ Occeppa xicalaqui niman ticmatīz.',
 'showlivepreview'                  => 'Niman achtochīhualiztli',
 'showdiff'                         => 'Tiquintt�z tlapatlaliztli',
 'missingcommenttext'               => 'Timitztl�tlauhtiah xitlanitlahcuiloa.',
-'summary-preview'                  => 'Tlahcuil�lt�n achtochīhualiztli',
+'summary-preview'                  => 'Tlahcuil�lt�n achtochīhualiztli:',
 'blockedtitle'                     => 'Ōmotzacuili tlatequitiltilīlli',
 'blockednoreason'                  => 'ahmo cah Ä«xtlamatiliztli',
 'blockedoriginalsource'            => "Nic�n motta '''$1''' ītlaht�lcaquiliztil�ni:",
@@ -437,17 +478,17 @@ Occeppa xicalaqui niman ticmatīz.',
 'userjspreview'                    => "'''Ca inīn moachtochīhualiz ītechcopa moJavaScript.'''
 '''¡Ahmo �mochīuh nozan!'''",
 'updated'                          => '(Ōmoyancuīli)',
-'note'                             => '<strong>Tlaht�lcaquiliztil�ni:</strong>',
-'previewnote'                      => '<strong>¡Ca inīn moachtochīhualiz, auh mopatlaliz ahm� cateh �mochīhuah nozan!</strong>',
+'note'                             => "'''Tlaht�lcaquiliztil�ni:'''",
+'previewnote'                      => "'''¡Ca inīn moachtochīhualiz, auh mopatlaliz ahm� cateh �mochīhuah nozan!'''",
 'editing'                          => 'Ticpatlacah $1',
 'editingsection'                   => 'Ticpatlacah $1 (tlaht�ltzintli)',
 'editingcomment'                   => 'Ticpatlacah $1 (tlaht�ltzintli)',
 'editconflict'                     => 'Tlapatlaliztli y��y�t�n: $1',
 'yourtext'                         => 'Motlahcuil�l',
 'yourdiff'                         => 'Ahneneuhquiliztli',
-'copyrightwarning'                 => '<small>Timitztl�tlauhtiah xiquitta mochi mopatlaliz cana {{SITENAME}} tlatzay�na īpan $2 (huēhca �mpa xiquitta $1). Āqueh tl�cah quipatlazqueh in motlahcuil�l auh tlatzay�na occeppa; intl� ahm� ticnequi, z�tēpan ahm� titlahcuil�z nic�n. N� mitzihtoah in �titlahcuiloh ahm� quipiya in copyright nozo in y�ll�xoxouhqui tlahcuil�lli. <strong>¡AHMŌ XITĒQUITILTIA AHYŌLLŌXOXOUHQUI TLAHCUILŌLLI!</strong></small>',
-'copyrightwarning2'                => '<small>Āqueh tl�cah quipatlazqueh in motlahcuil�l auh tlatzay�na occeppa; intl� ahm� ticnequi, z�tēpan ahm� titlahcuil�z nic�n {{SITENAME}}. N� mitzihtoah in �titlahcuiloh ahm� quipiya in copyright nozo in y�ll�xoxouhqui tlahcuil�lli (huēhca �mpa xiquitta $1). <strong>¡AHMŌ TIQUINTEQUITILTIA AHYŌLLŌXOXOUHQUI TLAHCUILŌLLI!</strong></small>',
-'longpageerror'                    => '<strong>AHCUALLŌTL: Motlahcuil�l cah huēiyac $1 KB, huehca �mpa $2 KB. Ahmo mopiy�z.</strong>',
+'copyrightwarning'                 => "<small>Timitztl�tlauhtiah xiquitta mochi mopatlaliz cana {{SITENAME}} tlatzay�na īpan $2 (huēhca �mpa xiquitta $1). Āqueh tl�cah quipatlazqueh in motlahcuil�l auh tlatzay�na occeppa; intl� ahm� ticnequi, z�tēpan ahm� titlahcuil�z nic�n. N� mitzihtoah in �titlahcuiloh ahm� quipiya in copyright nozo in y�ll�xoxouhqui tlahcuil�lli. '''¡AHMŌ XITĒQUITILTIA AHYŌLLŌXOXOUHQUI TLAHCUILŌLLI!'''</small>",
+'copyrightwarning2'                => "<small>Āqueh tl�cah quipatlazqueh in motlahcuil�l auh tlatzay�na occeppa; intl� ahm� ticnequi, z�tēpan ahm� titlahcuil�z nic�n {{SITENAME}}. N� mitzihtoah in �titlahcuiloh ahm� quipiya in copyright nozo in y�ll�xoxouhqui tlahcuil�lli (huēhca �mpa xiquitta $1). '''¡AHMŌ TIQUINTEQUITILTIA AHYŌLLŌXOXOUHQUI TLAHCUILŌLLI!'''</small>",
+'longpageerror'                    => "'''AHCUALLŌTL: Motlahcuil�l cah huēiyac $1 KB, huehca �mpa $2 KB. Ahmo mopiy�z.'''",
 'templatesused'                    => 'Nemachiy�tīlli inīn z�zanilpan:',
 'templatesusedpreview'             => 'Nemachiy�tīlli motequitiltia inīn achtochīhualizpan:',
 'templatesusedsection'             => 'Nemachiy�tīlli motequitiltia nic�n:',
@@ -458,6 +499,14 @@ Occeppa xicalaqui niman ticmatīz.',
 'permissionserrors'                => 'Huelītiliztechcopa ahcuall�tl',
 'permissionserrorstext'            => 'Ahmo tihuelīti quichīhua in�n, inīn {{PLURAL:$1|īxtlamatilizpampa|īxtlamatilizpampa}}:',
 'permissionserrorstext-withaction' => 'Ahmo tiquihuelīti $2 inīn {{PLURAL:$1|īxtlamatilizpampa|īxtlamatilizpampa}}:',
+'deleted-notice'                   => 'Inīn z�zanilli �mopolo.
+Tlapololiztli tlahcuil�lloh cah tlani.',
+'deletelog-fulllog'                => 'Xiquitt�z mochi',
+'edit-gone-missing'                => 'Ahmo huelīti yancuīya z�zanilli.
+Hueliz �mopolo.',
+'edit-conflict'                    => 'Tlapatlaliztli y��y�t�n',
+'edit-already-exists'              => 'Ahmo mohuelīti mochīhua yancuīc z�zanilli.
+Ye ia.',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Ahmo huelītih mochīhua cuentah',
@@ -466,25 +515,26 @@ Occeppa xicalaqui niman ticmatīz.',
 Īxtlamatiliztli īpal $3 cah ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Tiquintt�z tlahcuil�lloh inīn z�zaniltechcopa',
-'nohistory'           => 'Ahmo cah tlapatlaliztechcopa tlahcuil�lloh inīn z�zaniltechcopa.',
-'revnotfound'         => 'Ahmo �monēxti tlachiyaliztli',
-'currentrev'          => 'Āxc�n tlapatlaliztli',
-'revisionasof'        => 'Tlachiyaliztli Ä«pan $1',
-'revision-info'       => 'Tlachiyaliztli Ä«pan $1; $2',
-'previousrevision'    => '� Huēhueh tlapatlaliztli',
-'nextrevision'        => 'Yancuīc tlapatlaliztli →',
-'currentrevisionlink' => 'Āxc�n tlapatlaliztli',
-'cur'                 => '�xc�n',
-'next'                => 'niman',
-'last'                => 'x�coy�c',
-'page_first'          => 'achto',
-'page_last'           => 'x�coy�c',
-'deletedrev'          => '[�mopolo]',
-'histfirst'           => 'Achto',
-'histlast'            => 'Yancuīc',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(izt�c)',
+'viewpagelogs'           => 'Tiquintt�z tlahcuil�lloh inīn z�zaniltechcopa',
+'nohistory'              => 'Ahmo cah tlapatlaliztechcopa tlahcuil�lloh inīn z�zaniltechcopa.',
+'currentrev'             => 'Āxc�n tlapatlaliztli',
+'currentrev-asof'        => 'Āxc�n tlachiyaliztli īpan $1',
+'revisionasof'           => 'Tlachiyaliztli Ä«pan $1',
+'revision-info'          => 'Tlachiyaliztli Ä«pan $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Huēhueh tlapatlaliztli',
+'nextrevision'           => 'Yancuīc tlapatlaliztli →',
+'currentrevisionlink'    => 'Āxc�n tlapatlaliztli',
+'cur'                    => '�xc�n',
+'next'                   => 'niman',
+'last'                   => 'x�coy�c',
+'page_first'             => 'achto',
+'page_last'              => 'x�coy�c',
+'history-fieldset-title' => 'Tictēm�z īpan tlahcuil�lloh',
+'deletedrev'             => '[�mopolo]',
+'histfirst'              => 'Achto',
+'histlast'               => 'Yancuīc',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(izt�c)',
 
 # Revision feed
 'history-feed-title'          => 'Tlachiyaliztli tlahcuil�lloh',
@@ -520,36 +570,68 @@ Hueliz �mopolo huiqui nozo �mozacac.
 'mergehistory-comment'        => 'Ōmocēntili [[:$1]] īpan [[:$2]]: $3',
 
 # Diffs
-'history-title' => '"$1" ītlachiyaliz tlahcuil�lloh',
-'difference'    => '(Ahneneuhquiliztli tlapatlaliznepantlah)',
-'lineno'        => 'P�ntli $1:',
-'editundo'      => 'ahticchīhu�z',
-'diff-multi'    => '({{PLURAL:$1|CÄ“ tlapatlaliztli nepantlah ahmo motta|$1 tlapatlaliztli nepantlah ahmo mottah}}.)',
+'history-title'   => '"$1" ītlachiyaliz tlahcuil�lloh',
+'difference'      => '(Ahneneuhquiliztli tlapatlaliznepantlah)',
+'lineno'          => 'P�ntli $1:',
+'editundo'        => 'ahticchīhu�z',
+'diff-multi'      => '({{PLURAL:$1|CÄ“ tlapatlaliztli nepantlah ahmo motta|$1 tlapatlaliztli nepantlah ahmo mottah}}.)',
+'diff-movedto'    => '�mozacac īhuīc $1',
+'diff-added'      => '�cēntili $1',
+'diff-changedto'  => '�mopatlac īhuīc $1',
+'diff-src'        => 'tlaht�lcaquiliztil�ni',
+'diff-with'       => '&#32;Ä«ca $1 $2',
+'diff-with-final' => '&#32;īhu�n $1 $2',
+'diff-h1'         => "cē '''cu�y�tl (iuhc�y�tl 1)'''",
+'diff-h2'         => "cē '''cu�y�tl (iuhc�y�tl 2)'''",
+'diff-h3'         => "cē '''cu�y�tl (iuhc�y�tl 3)'''",
+'diff-h4'         => "cē '''cu�y�tl (iuhc�y�tl 4)'''",
+'diff-h5'         => "cē '''cu�y�tl (iuhc�y�tl 5)'''",
+'diff-tr'         => "cē '''p�ntli'''",
+'diff-th'         => "cē '''cu�y�tzintli'''",
+'diff-img'        => "cē '''īxiptli'''",
+'diff-a'          => "cē '''tzonhuiliztli'''",
+'diff-b'          => "'''tlīltic'''",
+'diff-strong'     => "'''chic�huac'''",
+'diff-em'         => "'''tlachic�hualiztli'''",
+'diff-big'        => "'''huēyi'''",
+'diff-del'        => "'''tlapoloc'''",
 
 # Search results
-'searchresults'            => 'Tlatēmoliztli',
-'searchsubtitle'           => 'Ōtictēm�z \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|mochīntīn z�zaniltin mopēhua īca "$1"]] | [[Special:WhatLinksHere/$1|mochīntīn z�zaniltin tzonhuilia "$1" īhuīc]])',
-'searchsubtitleinvalid'    => "Ōtictēm�z '''$1'''",
-'noexactmatch'             => "'''Ahmo ia z�zanilli īt�c� \"\$1\".''' Tihuelīti [[:\$1|ticchīhua]].",
-'noexactmatch-nocreate'    => "'''Ahmo ia \"\$1\" z�zanilli.'''",
-'prevn'                    => '$1 achtopa',
-'nextn'                    => 'niman $1',
-'viewprevnext'             => 'Xiquintta ($1) ($2) ($3).',
-'search-result-size'       => '$1 ({{PLURAL:$2|1 tlaht�l|$2 tlaht�ltin}})',
-'search-redirect'          => '(tlacuepaliztli $1)',
-'search-section'           => '(tlaht�ltzintli $1)',
-'search-suggest'           => 'Mohtoa ahnozo: $1',
-'search-interwiki-caption' => 'Tlachīhualiztli īcnīhu�n',
-'search-interwiki-more'    => '(huehca �mpa)',
-'search-relatedarticle'    => 'Ītechcopa',
-'searchrelated'            => 'Ä«techcopa',
-'searchall'                => 'mochīntīn',
-'powersearch'              => 'Chic�huac tlatēmoliztli',
-'powersearch-legend'       => 'Chic�huac tlatēmoliztli',
-'powersearch-ns'           => 'Tlatēm�z t�c�tzimpan:',
-'powersearch-redir'        => 'Quimpiya tlacuepaliztli',
-'powersearch-field'        => 'Tlatēm�z',
-'search-external'          => 'Tlatēmotiliztli cal�mpa',
+'searchresults'                    => 'Tlatēmoliztli',
+'searchsubtitle'                   => 'Ōtictēm�z \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|mochīntīn z�zaniltin mopēhua īca "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|mochīntīn z�zaniltin tzonhuilia "$1" īhuīc]])',
+'searchsubtitleinvalid'            => "Ōtictēm�z '''$1'''",
+'noexactmatch'                     => "'''Ahmo ia z�zanilli īt�c� \"\$1\".''' Tihuelīti [[:\$1|ticchīhua]].",
+'noexactmatch-nocreate'            => "'''Ahmo ia \"\$1\" z�zanilli.'''",
+'prevn'                            => '$1 achtopa',
+'nextn'                            => 'niman $1',
+'viewprevnext'                     => 'Xiquintta ($1) ($2) ($3).',
+'searchmenu-exists'                => "'''Ye ia z�zanilli īt�ca \"[[\$1]]\" inīn huiquipan'''",
+'searchmenu-new'                   => "'''Tihuelīti ticchīhu�z z�zanilli īt�ca \"[[:\$1]]\" inīn huiquipan'''",
+'searchhelp-url'                   => 'Help:Tlapiyaliztli',
+'searchprofile-articles'           => 'Tlapiyaliztli z�zanilli',
+'searchprofile-project'            => 'Tlachīhualiztli z�zanilli',
+'searchprofile-images'             => 'Tlahcuil�lli',
+'searchprofile-everything'         => 'Mochi',
+'searchprofile-advanced'           => 'Huehca �mpa',
+'searchprofile-articles-tooltip'   => 'Tictēm�z īpan $1',
+'searchprofile-project-tooltip'    => 'Tictēm�z īpan $1',
+'searchprofile-images-tooltip'     => 'Tiquintēm�z tlahcuil�lli',
+'searchprofile-everything-tooltip' => 'Tictēm�z mochi tlapiyalizpan (mopiyah tēixn�miquiliztli z�zanilli)',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 tlaht�l|$2 tlaht�ltin}})',
+'search-redirect'                  => '(tlacuepaliztli $1)',
+'search-section'                   => '(tlaht�ltzintli $1)',
+'search-suggest'                   => 'Mohtoa ahnozo: $1',
+'search-interwiki-caption'         => 'Tlachīhualiztli īcnīhu�n',
+'search-interwiki-more'            => '(huehca �mpa)',
+'search-relatedarticle'            => 'Ītechcopa',
+'searchrelated'                    => 'Ä«techcopa',
+'searchall'                        => 'mochīntīn',
+'powersearch'                      => 'Chic�huac tlatēmoliztli',
+'powersearch-legend'               => 'Chic�huac tlatēmoliztli',
+'powersearch-ns'                   => 'Tlatēm�z t�c�tzimpan:',
+'powersearch-redir'                => 'Quimpiya tlacuepaliztli',
+'powersearch-field'                => 'Tlatēm�z',
+'search-external'                  => 'Tlatēmotiliztli cal�mpa',
 
 # Preferences page
 'preferences'           => 'Tlaēlēhuiliztli',
@@ -558,6 +640,7 @@ Hueliz �mopolo huiqui nozo �mozacac.
 'prefsnologin'          => 'Ahmo �timocalac',
 'qbsettings-none'       => 'Ahtlein',
 'changepassword'        => 'Ticpatl�z motlaht�lichtac�yo',
+'skin-preview'          => 'Xiquitta quemeh yez',
 'math'                  => 'Tlap�hualmatiliztli',
 'dateformat'            => 'C�uhtiliztli iuhc�y�tl',
 'datedefault'           => 'Ay�c tlanequiliztli',
@@ -568,17 +651,15 @@ Hueliz �mopolo huiqui nozo �mozacac.
 'prefs-watchlist-days'  => 'T�naltin tiquintt�z tlachiyalizpan:',
 'prefs-watchlist-edits' => 'Tlapatlaliztli tiquintta tlachiyalizpan:',
 'prefs-misc'            => 'Z�zo',
+'prefs-resetpass'       => 'Ticpatl�z motlaht�lichtac�yo',
 'saveprefs'             => 'Ticpiy�z',
-'oldpassword'           => 'Huēhueh motlaht�lichtacayo:',
-'newpassword'           => 'Yancuīc motlaht�lichtacayo:',
-'retypenew'             => 'Occeppa xiquihcuiloa yancuīc motlaht�lichtacayo:',
 'textboxsize'           => 'Tlapatlaliztli',
 'rows'                  => 'P�ntli:',
 'searchresultshead'     => 'Tlatēmoliztli',
 'contextlines'          => 'P�ntli tlaht�ltechcopa:',
 'contextchars'          => 'Tlaht�ltechcopa ic p�ntli:',
 'recentchangesdays'     => 'T�naltin tiquintt�z yancuīc tlapatlalizpan:',
-'localtime'             => 'C�huitl nic�n',
+'localtime'             => 'C�huitl nic�n:',
 'prefs-searchoptions'   => 'Tlatēmoliztli tlaēlēhuiliztli',
 'prefs-namespaces'      => 'T�c�tzin',
 'defaultns'             => 'Tlatēm�z inīn t�c�tzimpan ic default:',
@@ -640,9 +721,29 @@ Hueliz �mopolo huiqui nozo �mozacac.
 'rightslog'  => 'Tlatequitiltilīlli huelītiliztli tlahcuil�lloh',
 'rightsnone' => 'ahtlein',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'           => 'ticp�hu�z inīn z�zanilli',
+'action-edit'           => 'ticpatl�z inīn z�zanilli',
+'action-createpage'     => 'tiquinchīhu�z z�zaniltin',
+'action-createtalk'     => 'tiquinchīhu�z tēixn�miquiliztli z�zaniltin',
+'action-createaccount'  => 'ticchīhuaz inīn tlatequitiltilīlli īcuentah',
+'action-move'           => 'ticpatl�z inīn z�zanilli',
+'action-move-subpages'  => 'tiquimpatl�z inīn z�zanilli īhu�n z�zanilt�n',
+'action-upload'         => 'ticquetz�z inīn tlahcuil�lli',
+'action-writeapi'       => 'tictequitiltīz API tlahcuil�liztli',
+'action-delete'         => 'ticpol�z inīn z�zanilli',
+'action-deleterevision' => 'ticpol�z inīn tlachiyaliztli',
+'action-deletedhistory' => 'tiquitt�z inīn z�zanilli ītlahcuil�lloh tlein �mopolo',
+'action-browsearchive'  => 'tiquintēm�z z�zanilli tlein �mopoloh',
+'action-undelete'       => 'ahticpol�z inīn z�zanilli',
+'action-suppressionlog' => 'tiquitt�z inīn ichtac tlahcuil�lloh',
+'action-block'          => 'tiquitzacuilīz inīn tlatequitiltilīlli',
+'action-userrights'     => 'tiquimpatl�z mochi tlatequitiltilīlli huelītiliztli',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|tlapatlaliztli|tlapatlaliztli}}',
 'recentchanges'                     => 'Yancuīc tlapatlaliztli',
+'recentchanges-legend'              => 'Yancuīc tlapatlaliztechcopa tlanequiliztli',
 'recentchangestext'                 => 'Xiquintt�z in achi yancuīc ahmo occequīntīn tlapatlaliztli huiquipan inīn z�zanilpan.',
 'rcnote'                            => "Nic�n {{PLURAL:$1|cah '''1''' tlapatlaliaztli|cateh in x�coy�c '''$1''' tlapatlaliztli}} īpan x�coy�c {{PLURAL:$2|t�nalli|'''$2''' t�naltin}} īhuīcpa $5, $4.",
 'rclistfrom'                        => 'Xiquintt�z yancuīc tlapatlaliztli īhuīcpa $1',
@@ -689,10 +790,10 @@ Hueliz �mopolo huiqui nozo �mozacac.
 Tlahcuil�lli iuhc�y�tl {{PLURAL:\$3|moēlēhuia cah|moēlēhuiah cateh}} \$2.",
 'filetype-missing'       => 'Tlahcuil�lli ahmo quipiya huēiyaquiliztli (quemeh ".jpg").',
 'large-file'             => 'M� tlahcuil�lli ahmo achi huēiyac $1; inīn cah $2.',
-'fileexists-extension'   => 'Tlahcuil�lli zan iuh t�c�tica ia:<br />
-Tlahcuil�lli moquetzacah: <strong><tt>$1</tt></strong><br />
-Tlahcuil�lli tlein ia īt�ca: <strong><tt>$2</tt></strong><br />
-Timitztl�tlauhtiah, xitlahcuiloa occē t�c�itl.',
+'fileexists-extension'   => "Tlahcuil�lli zan iuh t�c�tica ia:<br />
+Tlahcuil�lli moquetzacah: '''<tt>$1</tt>'''<br />
+Tlahcuil�lli tlein ia īt�ca: '''<tt>$2</tt>'''<br />
+Timitztl�tlauhtiah, xitlahcuiloa occē t�c�itl.",
 'fileexists-thumb'       => "<center>'''Tlahcuil�lli ia'''</center>",
 'successfulupload'       => 'Cualli quetzaliztli',
 'savefile'               => 'Quipiy�z tlahcuil�lli',
@@ -706,14 +807,14 @@ Timitztl�tlauhtiah, xitlahcuiloa occē t�c�itl.',
 
 'upload_source_file' => ' (cē tlahcuil�lli mochīuhp�hualhuazco)',
 
-# Special:ImageList
-'imagelist_search_for' => 'Tlatēm�z mēdiatl t�c�copa:',
+# Special:ListFiles
+'listfiles_search_for' => 'Tlatēm�z mēdiatl t�c�copa:',
 'imgfile'              => 'Ä«xiptli',
-'imagelist'            => 'Mochīntīn īxiptli',
-'imagelist_name'       => 'T�c�itl',
-'imagelist_user'       => 'Tlatequitiltilīlli',
+'listfiles'            => 'Mochīntīn īxiptli',
+'listfiles_name'       => 'T�c�itl',
+'listfiles_user'       => 'Tlatequitiltilīlli',
 
-# Image description page
+# File description page
 'filehist'                       => 'Tlahcuil�lli tlahcuil�lloh',
 'filehist-deleteall'             => 'tiquimpol�z mochīntīn',
 'filehist-deleteone'             => 'ticpol�z',
@@ -766,25 +867,22 @@ Timitztl�tlauhtiah, xitlahcuiloa occē t�c�itl.',
 
 # Random page
 'randompage'         => 'Z�zoz�zanilli',
-'randompage-nopages' => 'Ahmo cateh z�zaniltin īpan inīn t�c�tzin.',
+'randompage-nopages' => 'Ahmo cateh z�zaniltin īpan t�c�tzin "$1".',
 
 # Random redirect
 'randomredirect' => 'Z�zotlacuepaliztli',
 
 # Statistics
-'statistics'    => 'Tlap�hualiztli',
-'sitestats'     => '{{SITENAME}} ītlap�hualiz',
-'userstats'     => 'Tlatequitiltilīlli ītlap�hualiz',
-'sitestatstext' => "{{PLURAL:$1|Cah '''1''' z�zanilli|Cateh '''$1''' z�zaniltin}} nic�n.
-Inīn quimpiya tēixn�miquiliztli z�zanilli, {{SITENAME}} ītechcopa z�zanilli, machiy�t�n, tlacuepaliztli auh occequīntīn hueliz ahmo cualli.
-Ahtle, in {{PLURAL:$2|cah '''1''' cualli z�zanilli|cateh '''$2''' cualli z�zaniltin}}.
-
-{{PLURAL:$8|N� cah '''$8''' tlahcuil�lli|N� cateh '''$8''' tlahcuil�lli}} inīn huēychīuhp�hualhuazco.
-
-In īhuīcpa huiqui īpēhualiz {{PLURAL:$3|�catca|�catcah}} '''$3''' tlahpaloliztli auh '''$4''' tlapatlaliztli.
-Inīn quicētilia huehca '''$5''' tlapatlaliztli cēcem z�zanilli auh '''$6''' tlahpaloliztli cēcem tlapatlaliztli.
-
-Huēiyacaliztli [http://www.mediawiki.org/wiki/Manual:Job_queue tequilc�n] cah '''$7'''.",
+'statistics'               => 'Tlap�hualiztli',
+'statistics-header-pages'  => 'Z�zaniltin tlap�hualli',
+'statistics-header-edits'  => 'Tlapatlaliztli tlap�hualli',
+'statistics-header-views'  => 'Tlahpololiztli tlap�hualli',
+'statistics-header-users'  => 'Tlatequitiltilīlli ītlap�hualiz',
+'statistics-articles'      => 'Tlapiyaliztli z�zanilli',
+'statistics-pages'         => 'Z�zaniltin',
+'statistics-pages-desc'    => 'Mochīntīn z�zaniltin huiquipan, mopiyah tēixn�miquiliztli, tlacuepaliztli, etz.',
+'statistics-files'         => 'Tlahcuil�lli �moquetz',
+'statistics-views-peredit' => 'Tlahpololiztli ic tlapatlaliztli',
 
 'disambiguations' => 'Ōmet�c�itl z�zaniltin',
 
@@ -840,8 +938,6 @@ Huēiyacaliztli [http://www.mediawiki.org/wiki/Manual:Job_queue tequilc�n] cah
 'speciallogtitlelabel' => 'T�c�itl:',
 'log'                  => 'Tlahcuil�lloh',
 'all-logs-page'        => 'Mochīntīn tlahcuil�lloh',
-'log-search-legend'    => 'Tiquintēm�z tlahcuil�lloh',
-'log-search-submit'    => 'Y�uh',
 
 # Special:AllPages
 'allpages'          => 'Mochīntīn z�zanilli',
@@ -864,9 +960,18 @@ N� xiquitta [[Special:WantedCategories|neneuhc�y�tl monequi]].',
 'special-categories-sort-count' => 'tlap�hualcopa',
 'special-categories-sort-abc'   => 'tlaht�lcopa',
 
+# Special:LinkSearch
+'linksearch'    => 'Tiquintēm�z tzonhuiliztli m�tlatz�lan',
+'linksearch-ns' => 'T�c�tzin:',
+'linksearch-ok' => 'Tictēm�z',
+
 # Special:ListUsers
 'listusers-submit' => 'Tiquitt�z',
 
+# Special:Log/newusers
+'newuserlog-create-entry'  => 'Yancuīc tlatequitiltilīlli',
+'newuserlog-create2-entry' => '�mochīuh cuentah ic $1',
+
 # Special:ListGroupRights
 'listgrouprights-group'  => 'Ol�lli',
 'listgrouprights-rights' => 'Huelītiliztli',
@@ -881,21 +986,18 @@ N� xiquitta [[Special:WantedCategories|neneuhc�y�tl monequi]].',
 'emailsent'       => 'E-mail �moihuah',
 
 # Watchlist
-'watchlist'            => 'Notlachiyaliz',
-'mywatchlist'          => 'Notlachiyaliz',
-'watchlistfor'         => "('''$1''' Ä«techcopa)",
-'watchnologin'         => 'Ahmo �timocalac',
-'addedwatch'           => 'Ōmocētili tlachiyalizpan',
-'removedwatch'         => 'ÅŒmopolo Ä«pan motlachiyaliz',
-'removedwatchtext'     => 'Z�zanilli "[[:$1]]" �mopolo [[Special:Watchlist|motlachiyalizco]].',
-'watch'                => 'Tictlachiy�z',
-'watchthispage'        => 'Tictlachiy�z inīn z�zanilli',
-'unwatch'              => 'Ahtictlachiy�z',
-'watchlist-details'    => '{{PLURAL:$1|$1 z�zanilli|$1 z�zaniltin}} motlachiyaliz, ahmo mop�hua tēixn�miquiliztli.',
-'wlshowlast'           => 'Tiquintt�z tlapatlaliztli īhuīcpa achto $1 yēmpohualminuhtli, $2 t�naltin $3',
-'watchlist-hide-bots'  => 'Tiquintl�tīz tepoztl�cah īntlapatlaliz',
-'watchlist-hide-own'   => 'Tiquintl�tīz notlahcuil�l',
-'watchlist-hide-minor' => 'Tiquintl�tīz tlapatlalitzintli',
+'watchlist'         => 'Notlachiyaliz',
+'mywatchlist'       => 'Notlachiyaliz',
+'watchlistfor'      => "('''$1''' Ä«techcopa)",
+'watchnologin'      => 'Ahmo �timocalac',
+'addedwatch'        => 'Ōmocētili tlachiyalizpan',
+'removedwatch'      => 'ÅŒmopolo Ä«pan motlachiyaliz',
+'removedwatchtext'  => 'Z�zanilli "[[:$1]]" �mopolo [[Special:Watchlist|motlachiyalizco]].',
+'watch'             => 'Tictlachiy�z',
+'watchthispage'     => 'Tictlachiy�z inīn z�zanilli',
+'unwatch'           => 'Ahtictlachiy�z',
+'watchlist-details' => '{{PLURAL:$1|$1 z�zanilli|$1 z�zaniltin}} motlachiyaliz, ahmo mop�hua tēixn�miquiliztli.',
+'wlshowlast'        => 'Tiquintt�z tlapatlaliztli īhuīcpa achto $1 yēmpohualminuhtli, $2 t�naltin $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Tlachiyacah...',
@@ -928,34 +1030,40 @@ N� tihuelīti, motlachiyalizpan, ticpatl�z motlanequiliz tlan�n�tzaliztechco
 Ticpatl�z motlanequiliz:
 {{fullurl:Special:Watchlist|edit=yes}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Ticpol�z inīn z�zanilli',
-'excontent'                   => "Tlapiyaliztli �catca: '$1'",
-'excontentauthor'             => "Tlapiyaliztli �catca: '$1' (auh zancē �quipatlac �catca '[[Special:Contributions/$2|$2]]')",
-'exblank'                     => 'z�zanilli �catca izt�c',
-'delete-confirm'              => 'Ticpol�z "$1"',
-'delete-legend'               => 'Ticpol�z',
-'actioncomplete'              => 'CÄ“ntetl',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" �mopolo.
+# Delete
+'deletepage'             => 'Ticpol�z inīn z�zanilli',
+'excontent'              => "Tlapiyaliztli �catca: '$1'",
+'excontentauthor'        => "Tlapiyaliztli �catca: '$1' (auh zancē �quipatlac �catca '[[Special:Contributions/$2|$2]]')",
+'exblank'                => 'z�zanilli �catca izt�c',
+'delete-confirm'         => 'Ticpol�z "$1"',
+'delete-legend'          => 'Ticpol�z',
+'actioncomplete'         => 'CÄ“ntetl',
+'deletedtext'            => '"<nowiki>$1</nowiki>" �mopolo.
 Xiquitta $2 ic yancuīc tlapololiztli.',
-'deletedarticle'              => '�mopolo "$1"',
-'dellogpage'                  => 'Tlapololiztli tlahcuil�lloh',
-'deletionlog'                 => 'tlapololiztli tlahcuil�lloh',
-'deletecomment'               => 'Tlapololiztli Ä«xtlamatiliztli:',
-'deleteotherreason'           => 'Occē īxtlamatiliztli:',
-'deletereasonotherlist'       => 'Occē īxtlamatiliztli',
-'delete-edit-reasonlist'      => 'Tiquimpatl�z īxtlamatiliztli tlapoloaliztechcopa',
-'rollback_short'              => 'Tlacuep�z',
-'rollbacklink'                => 'tlacuep�z',
-'rollback-success'            => 'Ōmotlacuep $1 ītlahcuil�l; �xc�n achto $2 ītlahcuil�l.',
+'deletedarticle'         => '�mopolo "$1"',
+'dellogpage'             => 'Tlapololiztli tlahcuil�lloh',
+'deletionlog'            => 'tlapololiztli tlahcuil�lloh',
+'deletecomment'          => 'Tlapololiztli Ä«xtlamatiliztli:',
+'deleteotherreason'      => 'Occē īxtlamatiliztli:',
+'deletereasonotherlist'  => 'Occē īxtlamatiliztli',
+'delete-edit-reasonlist' => 'Tiquimpatl�z īxtlamatiliztli tlapoloaliztechcopa',
+
+# Rollback
+'rollback_short'   => 'Tlacuep�z',
+'rollbacklink'     => 'tlacuep�z',
+'rollback-success' => 'Ōmotlacuep $1 ītlahcuil�l; �xc�n achto $2 ītlahcuil�l.',
+
+# Protect
 'protectedarticle'            => '�moquīxti "[[$1]]"',
 'unprotectedarticle'          => '�ahmoquīxti "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] �mozacac īhuīc [[$2]]',
 'protectexpiry'               => 'Tlamiliztli:',
 'protect_expiry_invalid'      => 'Ahcualli tlamiliztli c�huitl.',
 'protect-default'             => '(ic default)',
 'protect-fallback'            => 'Tiquihuīquilia tlahuelītiliztli "$1"',
 'protect-level-autoconfirmed' => 'Tiquinquīxtīz tlatequitiltilīlli tlein ahmo �mocalac',
 'protect-expiring'            => 'motlamīz $1 (UTC)',
+'protect-expiry-options'      => '2 yēmp�hualminutl:2 hours,1 t�nalli:1 day,2 t�naltin:2 days,3 t�naltin:3 days,1 mētztli:1 month,3 mētztli:3 months,6 mētztli:6 months,1 xihuitl:1 year,Mochipa:infinite', # display1:time1,display2:time2,...
 
 # Restrictions (nouns)
 'restriction-edit'   => 'Ticpatl�z',
@@ -966,6 +1074,7 @@ Xiquitta $2 ic yancuīc tlapololiztli.',
 # Undelete
 'undelete'                  => 'Tiquintt�z z�zaniltin �mopol�zqueh',
 'viewdeletedpage'           => 'Tiquintt�z z�zaniltin �mopol�zqueh',
+'undelete-revision'         => 'Tlapoloc $1 Ä«tlachiyaliz (Ä«pan $4, $5) Ä«pal $3:',
 'undeletebtn'               => 'Ahticpol�z',
 'undeletelink'              => 'ahticpol�z',
 'undelete-search-box'       => 'Tiquintlatēm�z z�zaniltin �mopol�z',
@@ -980,25 +1089,26 @@ Xiquitta $2 ic yancuīc tlapololiztli.',
 'blanknamespace' => '(Huēyi)',
 
 # Contributions
-'contributions' => 'Ītlahcuil�l',
-'mycontris'     => 'Notlahcuil�l',
-'contribsub2'   => '$1 ($2)',
-'uctop'         => ' (ahco)',
-'month'         => 'Īhuīcpa mētztli (auh achtopa):',
-'year'          => 'Xiuhhuīcpa (auh achtopa):',
-
-'sp-contributions-newbies'     => 'Tiquintt�z zan yancuīc tlatequitiltilīlli īntlapatlaliz',
-'sp-contributions-newbies-sub' => 'Ic yancuīc',
-'sp-contributions-blocklog'    => 'Tlatzacuiliztli tlahcuil�lloh',
-'sp-contributions-search'      => 'Tiquintlatēm�z tlapatlaliztli',
-'sp-contributions-username'    => 'IP nozo tlatequitiltilīlli īt�c�:',
-'sp-contributions-submit'      => 'Tlatēm�z',
+'contributions'       => 'Ītlahcuil�l',
+'contributions-title' => 'Tlatequitiltilīlli $1 ītlahcuil�l',
+'mycontris'           => 'Notlahcuil�l',
+'contribsub2'         => '$1 ($2)',
+'uctop'               => ' (ahco)',
+'month'               => 'Īhuīcpa mētztli (auh achtopa):',
+'year'                => 'Xiuhhuīcpa (auh achtopa):',
+
+'sp-contributions-newbies'       => 'Tiquintt�z zan yancuīc tlatequitiltilīlli īntlapatlaliz',
+'sp-contributions-newbies-sub'   => 'Ic yancuīc',
+'sp-contributions-newbies-title' => 'Yancuīc tlatequitiltilīlli ītlahcuil�l',
+'sp-contributions-blocklog'      => 'Tlatzacuiliztli tlahcuil�lloh',
+'sp-contributions-search'        => 'Tiquintlatēm�z tlapatlaliztli',
+'sp-contributions-username'      => 'IP nozo tlatequitiltilīlli īt�c�:',
+'sp-contributions-submit'        => 'Tlatēm�z',
 
 # What links here
 'whatlinkshere'            => 'In tlein quitzonhuilia nic�n',
 'whatlinkshere-title'      => 'Z�zaniltin quitzonhuiliah $1',
 'whatlinkshere-page'       => 'Z�zanilli:',
-'linklistsub'              => '(Tzonhuiliztli)',
 'linkshere'                => "Inīn z�zaniltin quitzonhuiliah '''[[:$1]]''' īhuīc:",
 'nolinkshere'              => "Ahtle quitzonhuilia '''[[:$1]]''' īhuīc.",
 'isredirect'               => '�motlacuep z�zanilli',
@@ -1042,9 +1152,9 @@ Xiquitta $2 ic yancuīc tlapololiztli.',
 'proxyblocksuccess'  => 'Ōmochīuh.',
 
 # Move page
-'move-page'               => 'Ticzac�z $1',
-'move-page-legend'        => 'Ticzac�z z�zanilli',
-'movepagetext'            => "Nic�n mohcuiloa quemeh ticzac�z cē z�zanilli auh mochi in ītlahcuill�loh īhuīc occē yancuīc īt�ca.
+'move-page'                 => 'Ticzac�z $1',
+'move-page-legend'          => 'Ticzac�z z�zanilli',
+'movepagetext'              => "Nic�n mohcuiloa quemeh ticzac�z cē z�zanilli auh mochi in ītlahcuill�loh īhuīc occē yancuīc īt�ca.
 Huēhueht�c�itl yez tlacuepaliztli yancuīc t�c�huīc.
 Tzonhuiliztli huēhuehz�zanilhuīc ahmo mopatl�z.
 Xiquitta ic m�ca xicchīhua [[Special:DoubleRedirects|�ntlacuepaliztli]] ahnozo [[Special:BrokenRedirects|tzomoc]].
@@ -1055,24 +1165,29 @@ Quiht�znequi tihuelītīz ticuep�z cē z�zanilli īhuīc ītl�cat�ca intl�
 
 '''¡XICPŌHUA!'''
 Hueliz cah inīn huēyi tlapatlaliztli. Timitztl�tlauhtia ticmatīz cuall�tl auh ahcuall�tl achtopa ticzac�z.",
-'movearticle'             => 'Ticzac�z tlahcuil�lli',
-'movenotallowed'          => 'Ahmo tihuelīti tiquinzaca z�zaniltin.',
-'newtitle'                => 'Yancuīc t�c�huīc',
-'move-watch'              => 'Tictlachiy�z inīn z�zanilli',
-'movepagebtn'             => 'Ticzac�z z�zanilli',
-'pagemovedsub'            => 'Cualli �mozacac',
-'movepage-moved'          => '<big>\'\'\'"$1" �motlacuep īhuīc "$2".\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'movedto'                 => '�mozacac īhuīc',
-'movetalk'                => 'Ticzac�z n� tēixn�miquiliztli tlahcuil�ltechcopa.',
-'movepage-page-moved'     => 'Z�zanilli $1 �mozacac īhuīc $2.',
-'movepage-page-unmoved'   => 'Ahmo huelīti $1 mozaca īhuīc $2.',
-'1movedto2'               => '[[$1]] �mozacac īhuīc [[$2]]',
-'1movedto2_redir'         => '[[$1]] �mozacac īhuīc [[$2]] tlacuepalpampa',
-'movelogpage'             => 'Tlazacaliztli tlahcuil�lloh',
-'movereason'              => 'Īxtlamatiliztli:',
-'revertmove'              => 'tlacuep�z',
-'delete_and_move'         => 'Ticpol�z auh ticzac�z',
-'delete_and_move_confirm' => 'Quēmah, ticpol�z in z�zanilli',
+'movearticle'               => 'Ticzac�z tlahcuil�lli',
+'movenologin'               => 'Ahmo �timocalac',
+'movenotallowed'            => 'Ahmo tihuelīti tiquinzaca z�zaniltin.',
+'newtitle'                  => 'Yancuīc t�c�huīc',
+'move-watch'                => 'Tictlachiy�z inīn z�zanilli',
+'movepagebtn'               => 'Ticzac�z z�zanilli',
+'pagemovedsub'              => 'Cualli �mozacac',
+'movepage-moved'            => '<big>\'\'\'"$1" �motlacuep īhuīc "$2".\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movedto'                   => '�mozacac īhuīc',
+'movetalk'                  => 'Ticzac�z n� tēixn�miquiliztli tlahcuil�ltechcopa.',
+'movepage-page-moved'       => 'Z�zanilli $1 �mozacac īhuīc $2.',
+'movepage-page-unmoved'     => 'Ahmo huelīti $1 mozaca īhuīc $2.',
+'1movedto2'                 => '[[$1]] �mozacac īhuīc [[$2]]',
+'1movedto2_redir'           => '[[$1]] �mozacac īhuīc [[$2]] tlacuepalpampa',
+'movelogpage'               => 'Tlazacaliztli tlahcuil�lloh',
+'movereason'                => 'Īxtlamatiliztli:',
+'revertmove'                => 'tlacuep�z',
+'delete_and_move'           => 'Ticpol�z auh ticzac�z',
+'delete_and_move_confirm'   => 'Quēmah, ticpol�z in z�zanilli',
+'immobile-source-namespace' => 'Ahmo huelīti mozaca z�zanilli t�c�tzimpan "$1"',
+'immobile-target-namespace' => 'Ahmo huelīti mozaca z�zanilli t�c�tzinhuīc "$1"',
+'immobile-source-page'      => 'Ahmo huelīti mozac�z z�zanilli.',
+'move-leave-redirect'       => 'Ticc�hu�z cē tlacuepaliztli',
 
 # Export
 'export'            => 'Tiquinnamac�z z�zaniltin',
@@ -1095,6 +1210,7 @@ Hueliz cah inīn huēyi tlapatlaliztli. Timitztl�tlauhtia ticmatīz cuall�tl a
 # Special:Import
 'import'                  => 'Tiquinc�hu�z z�zaniltin',
 'import-interwiki-submit' => 'Tiquic�hu�z',
+'import-upload-filename'  => 'Tlahcuil�lt�c�itl:',
 'importstart'             => 'Motlac�hua z�zaniltin...',
 'import-revision-count'   => '$1 {{PLURAL:$1|tlachiyaliztli|tlachiyaliztli}}',
 'importbadinterwiki'      => 'Ahcualli interhuiqui tzonhuiliztli',
@@ -1157,11 +1273,11 @@ Hueliz cah inīn huēyi tlapatlaliztli. Timitztl�tlauhtia ticmatīz cuall�tl a
 'tooltip-upload'                  => 'Ticpēhua quetzaliztli',
 
 # Attribution
-'anonymous'        => 'Aht�c�itl tlatequitiltilīlli īpan {{SITENAME}}',
+'anonymous'        => 'Aht�c�itl {{PLURAL:$1|tlatequitiltilīlli|tlatequitiltilīlli}} īpan {{SITENAME}}',
 'siteuser'         => '$1 tlatequitiltilīlli īpan {{SITENAME}}',
 'lastmodifiedatby' => 'Inīn z�zanilli �tlapatlac catca īpan $2, $1 īpal $3.', # $1 date, $2 time, $3 user
 'others'           => 'occequīntīn',
-'siteusers'        => '$1 tlatequitiltilīlli īpan {{SITENAME}}',
+'siteusers'        => '$1 {{PLURAL:$2|tlatequitiltilīlli|tlatequitiltilīlli}} īpan {{SITENAME}}',
 
 # Spam protection
 'spam_reverting' => 'Mocuepacah īhuīc x�coy�c tlapatlaliztli ahmo tzonhuilizca īhuīc $1',
@@ -1184,7 +1300,7 @@ Hueliz cah inīn huēyi tlapatlaliztli. Timitztl�tlauhtia ticmatīz cuall�tl a
 'file-nohires'    => '<small>Ahmo ia achi cualli ahmo occē īxiptli.</small>',
 'show-big-image'  => 'Mochi cuall�tl',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'     => 'Yancuīc īxipc�n',
 'imagelisttext' => "Nic�n {{PLURAL:$1|mopiya|mopiyah}} '''$1''' īxiptli $2 iuhcopa.",
 'showhidebots'  => '($1 tepoztl�cah)',
@@ -1275,11 +1391,6 @@ Niman tihuelīti timocalaqui auh quiy�lēhua huiqui.',
 # action=purge
 'confirm_purge_button' => 'Cualli',
 
-# AJAX search
-'searchcontaining' => "Tiquintēm�z z�zaniltin quipiyah ''$1''.",
-'searchnamed'      => "Tiquintēm�z z�zaniltin īnt�c� ''$1''.",
-'articletitles'    => "Tlahcuil�lli mopēhuah īca ''$1''",
-
 # Multipage image navigation
 'imgmultipageprev' => '� achto z�zanilli',
 'imgmultipagenext' => 'niman z�zanilli →',
diff --git a/languages/messages/MessagesNan.php b/languages/messages/MessagesNan.php
index 7396d8f7..18469f77 100644
--- a/languages/messages/MessagesNan.php
+++ b/languages/messages/MessagesNan.php
@@ -54,8 +54,6 @@ $messages = array(
 'underline-never'   => 'Ti��-tio�h mài',
 'underline-default' => 'Tòe liû-lám-khì ê default',
 
-'skinpreview' => '(Chhì khoà�)',
-
 # Dates
 'sunday'        => 'Lé-pài',
 'monday'        => 'Pài-it',
@@ -122,7 +120,7 @@ $messages = array(
 'mytalk'     => 'Góa ê thó-lūn',
 'anontalk'   => 'Chit ê IP ê thó-lūn-ia�h',
 'navigation' => 'Se�h ch�m',
-'and'        => 'kap',
+'and'        => '&#32;kap',
 
 'errorpagetitle'    => 'Chhò-g�·',
 'returnto'          => 'Tò-tńg khì $1.',
@@ -163,7 +161,6 @@ $messages = array(
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'hían-sī',
-'bugreports'           => 'Sa�-pò bug',
 'currentevents'        => 'Sin-bûn sū-ki��',
 'currentevents-url'    => 'Project:Sin-bûn sū-ki��',
 'disclaimers'          => 'Bô-hū-chek seng-bêng',
@@ -218,7 +215,6 @@ $messages = array(
 'cannotdelete'       => 'Bô-hoat-t�· k� hit ê ia�h a�h-sī iá�-si�ng thâi ti�u. (Khó-lêng pa�t-lâng í-keng k� thâi ti�u ah.)',
 'badtitle'           => 'M̄-chiâ� piau-tê',
 'badtitletext'       => 'Iau-kiû ê piau-tê sī bô-h�u ê, khang ê, a�h-sī liân-kiat chhò-g�· ê inter-language/inter-wiki piau-tê.',
-'perfdisabled'       => 'Phái�-sè! Chit ê kong-lêng chi�m-sî bô khui in-ūi ē ch�-sêng chu-li�u-khò· siu� kòe-thâu b�n, tì-sú wiki bē i�ng tit.',
 'perfcached'         => 'Ē-kha ê chu-li�u tùi lâi--ê, só·-í bī-pit oân-choân hoán-èng si�ng sin ê ch�ng-hóng.',
 'perfcachedts'       => 'Ē-kha ê chu-li�u tùi lâi--ê, tī $1 keng-sin--koè.',
 'viewsource'         => 'Khoà� goân-sú l�e-iông',
@@ -229,14 +225,13 @@ $messages = array(
 'editinginterface'   => "'''Sè-jī:''' Lí tng teh siu-kái 1 bīn thê-kiong nńg-thé kài-bīn bûn-jī ê ia�h. Jīn-hô kái-piàn to ē éng-hióng tio�h kî-tha� i�ng-chiá ê sú-i�ng kài-bīn.",
 
 # Login and logout pages
-'logouttext'                 => '<strong>Lí í-keng teng-chhut.</strong><br />Lí ē-sái mài kì-miâ kè-siok sú-i�ng {{SITENAME}}, m� ē-sái i�ng k�ng-ê a�h-sī pa�t-ê sin-hūn têng teng-ji�p. Chhia� chù-ì: ū-kóa ia�h ū khó-lêng khoà�-tio�h bē-su lí iû-goân teng-ji�p tiong; che chi-iàu pià� ti�u lí ê browser ê cache chiū ē chèng-siông.',
+'logouttext'                 => "'''Lí í-keng teng-chhut.'''<br />Lí ē-sái mài kì-miâ kè-siok sú-i�ng {{SITENAME}}, m� ē-sái i�ng k�ng-ê a�h-sī pa�t-ê sin-hūn têng teng-ji�p. Chhia� chù-ì: ū-kóa ia�h ū khó-lêng khoà�-tio�h bē-su lí iû-goân teng-ji�p tiong; che chi-iàu pià� ti�u lí ê browser ê cache chiū ē chèng-siông.",
 'welcomecreation'            => '==Hoan-gêng $1!==
 �-keng khui hó lí ê kháu-ch�.  M̄-hó bē-kì-tit chhiâu lí ê i�ng-chiá siat-tēng.',
 'yourname'                   => 'Lí ê i�ng-chiá miâ-chheng:',
 'yourpassword'               => 'Lí ê bi�t-bé:',
 'yourpasswordagain'          => 'Têng phah bi�t-bé:',
 'remembermypassword'         => 'Kì tiâu góa ê bi�t-bé (�u-chhiú teng-ji�p i�ng).',
-'loginproblem'               => '<b>Teng-ji�p tú tio�h būn-tê.</b><br />Chhiá� têng chhì!',
 'login'                      => 'Teng-ji�p',
 'loginprompt'                => 'Thi� ē-kha ê chu-li�u thang khui sin h�·-thâu a�h-sī teng-ji�p {{SITENAME}}.',
 'userlogin'                  => 'Teng-ji�p / khui sin kháu-ch�',
@@ -270,6 +265,11 @@ $messages = array(
 'emailnotauthenticated'      => 'Lí ê e-mail chū-chí iáu-b�e khak-jīn ū-h�u, só·-í ē--kha ê e-mail kong-lêng bē-ēng-tit.',
 'emailconfirmlink'           => 'Chhiá� khak-jīn lí ê e-mail chū-chí ū-h�u',
 
+# Password reset dialog
+'oldpassword' => 'Kū bi�t-bé:',
+'newpassword' => 'Sin bi�t-bé:',
+'retypenew'   => 'Têng phah sin bi�t-bé:',
+
 # Edit page toolbar
 'bold_sample'     => 'Chho·-thé bûn-jī',
 'bold_tip'        => 'Chho·-thé jī',
@@ -288,8 +288,8 @@ $messages = array(
 'sig_tip'         => 'Lí ê chhiam-miâ kap sî-kan ìn-á',
 
 # Edit pages
-'summary'                => 'Khài-iàu',
-'subject'                => 'Tê-bo�k/piau-tê',
+'summary'                => 'Khài-iàu:',
+'subject'                => 'Tê-bo�k/piau-tê:',
 'minoredit'              => 'Che sī sió siu-kái',
 'watchthis'              => 'Kàm-sī chit ia�h',
 'savearticle'            => 'Pó-chûn chit ia�h',
@@ -297,8 +297,8 @@ $messages = array(
 'showpreview'            => 'Seng khoà�-m�i',
 'showdiff'               => 'Khòa� kái-piàn ê p�·-hūn',
 'anoneditwarning'        => "'''Kéng-kò:''' Lí bô teng-ji�p. Lí ê IP chū-chí ē kì tī pún ia�h ê pian-chi�p le�k-sú l�i-bīn.",
-'summary-preview'        => 'Khài-iàu ê preview',
-'subject-preview'        => 'Ū-lám tê-bo�k/piau-tê',
+'summary-preview'        => 'Khài-iàu ê preview:',
+'subject-preview'        => 'Ū-lám tê-bo�k/piau-tê:',
 'whitelistedittitle'     => 'Su-iàu teng-ji�p chiah ē-sái siu-kái',
 'whitelistedittext'      => 'Lí ài $1 chiah ē-sái siu-kái.',
 'confirmedittitle'       => 'Su-iàu khak-jīn e-mail chū-chí chiah ē-tit pian-chi�p',
@@ -309,12 +309,12 @@ $messages = array(
 'newarticletext'         => "Lí tòe 1 ê liân-kiat lâi kàu 1 bīn iáu-b�e chûn-ch�i ê ia�h. Beh khai-sí pian-chi�p chit ia�h, chhiá� tī ē-kha ê bûn-jī keh-á l�i-té phah-jī. ([[{{MediaWiki:Helppage}}|Bo�k-lio�k]] kà lí án-choá� chìn-hêng.) Ká-sú lí bô-tiu�-tî lâi kàu chia, ē-sai chhi�h liû-lám-khì ê '''téng-1-ia�h''' tńg--khì.",
 'anontalkpagetext'       => "----''Pún thó-lūn-ia�h bô kò·-tēng ê kháu-ch�/h�·-thâu, kan-na ū 1 ê IP chū-chí (chhin-chhiū� 123.456.789.123). In-ūi bô k�ng lâng tī bô k�ng sî-chūn ū khó-lêng tú-hó kong-ke k�ng-ê IP, lâu tī chia ê oē ū khó-lêng h�· bô k�ng lâng ê! Beh pī-bián chit khoán būn-tê, ē-sái khì [[Special:UserLogin|khui 1 ê h�·-thâu a�h-sī teng-ji�p]].''",
 'clearyourcache'         => "'''Chù-ì:''' Pó-chûn liáu-�u, tio�h ē-kì leh k� liû-lám-khì ê cache pià� ti�u chiah khoà�-ē-tio�h kái-piàn: '''Mozilla:''' chhi�h ''reload/têng-sin chài-ji�p'' (a�h-sī ''Ctrl-R''), '''Internet Explorer kap Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
-'usercssjsyoucanpreview' => "<strong>Phiat-p�·</strong>: Pó-chûn chìn-chêng ē-sái chhi�h 'Seng khoà�-m�i' kiám-cha sin ê CSS a�h-sī JavaScript.",
+'usercssjsyoucanpreview' => "'''Phiat-p�·''': Pó-chûn chìn-chêng ē-sái chhi�h 'Seng khoà�-m�i' kiám-cha sin ê CSS a�h-sī JavaScript.",
 'usercsspreview'         => "'''Sè-jī! Lí hi�n-chú-sî khoà�--ê sī lí ê su-jîn css ê preview; che iáu-b�e pó-chûn--khí-lâi!'''",
 'userjspreview'          => "'''Sè-jī! Lí hi�n-chú-sî chhì khoà�--ê sī lí ka-kī ê javascript; che iáu-b�e pó-chûn--khí-lâi!'''",
-'note'                   => '<strong>Chù-ì:</strong>',
-'previewnote'            => '<strong>Thê-chhé� lí che sī 1 bīn kiám-cha chho͘-phe ēng--ê "seng-khoà�-ia�h", iáu-b�e pó-chûn--khí-lâi!</strong>',
-'session_fail_preview'   => '<strong>Phái�-sè! Gún chi�m-sî bô hoat-t�͘ chhú-lí lí ê pian-chi�p (goân-in: "phàng-kiàn sú-i�ng kî-kan ê chu-li�u"). Lô-hoân têng chhì khoà�-m�i. Ká-sú iû-goân bô-h�u, ē-sái teng-chhut koh-chài teng-ji�p ho�n-sè t� ē-tit kái-koat.</strong>',
+'note'                   => "'''Chù-ì:'''",
+'previewnote'            => "'''Thê-chhé� lí che sī 1 bīn kiám-cha chho͘-phe ēng--ê \"seng-khoà�-ia�h\", iáu-b�e pó-chûn--khí-lâi!'''",
+'session_fail_preview'   => "'''Phái�-sè! Gún chi�m-sî bô hoat-t�͘ chhú-lí lí ê pian-chi�p (goân-in: \"phàng-kiàn sú-i�ng kî-kan ê chu-li�u\"). Lô-hoân têng chhì khoà�-m�i. Ká-sú iû-goân bô-h�u, ē-sái teng-chhut koh-chài teng-ji�p ho�n-sè t� ē-tit kái-koat.'''",
 'editing'                => 'Siu-kái $1',
 'editingsection'         => 'Pian-chi�p $1 (section)',
 'editingcomment'         => 'Teh pian-chi�p $1 (lâu-oē)',
@@ -322,11 +322,11 @@ $messages = array(
 'explainconflict'        => 'Ū lâng tī lí tng teh siu-kái pún-ia�h ê sî-chūn oân-sêng kî-tha ê siu-kái. Téng-koân ê bûn-jī-keh hián-sī hi�n-chhú-sî si�ng sin ê l�e-iông. Lí ê kái-piàn tī ē-kha ê bûn-jī-keh. Lí su-iàu chi�ng lí chò ê kái-piàn kap si�ng sin ê l�e-iông chéng-ha�p. <b>Kan-na</b> téng-koân keh-á ê bûn-jī ē tī lí chhi�h "Pó-chûn" liáu-�u pó-chûn khí lâi.<br />',
 'yourtext'               => 'Lí ê bûn-jī',
 'storedversion'          => 'Chu-li�u-khò· ê pán-pún',
-'editingold'             => '<strong>KÉNG-KÒ: Lí tng teh siu-kái chit ia�h ê 1 ê kū siu-tēng-pún. Lí n� k� pó-chûn khí lâi, chit ê siu-tēng-pún sòa-�u ê jīm-hô kái-piàn ē bô khì.</strong>',
+'editingold'             => "'''KÉNG-KÒ: Lí tng teh siu-kái chit ia�h ê 1 ê kū siu-tēng-pún. Lí n� k� pó-chûn khí lâi, chit ê siu-tēng-pún sòa-�u ê jīm-hô kái-piàn ē bô khì.'''",
 'yourdiff'               => 'Chha-pia�t',
-'longpagewarning'        => '<strong>SÈ-JĪ: Pún ia�h $1 kilobyte tn̂g; ū-ê liû-lám-khì bô-hoat-t�· pian-chi�p 32 kb chó-iū ia�h-sī koh khah tn̂g ê ia�h. Chhiá� khó-lū k� chit ia�h thiah chò khah sè ê to��-lo�h.</strong>',
-'readonlywarning'        => '<strong>CHÙ-Ì: Chu-li�u-khò· ta� só tiâu leh thang p�n î-siu khang-khòe, só·-í lí hi�n-chú-sî bô thang pó-chûn jīn-hô phian-chi�p h�ng-bo�k. Lí ē-sái k� siong-koan p�·-hūn tah--ji�p-khì 1-ê bûn-jī tóng-àn pó-chûn, �u-chhiú chiah koh kè-sio�k.</strong>',
-'protectedpagewarning'   => '<strong>KÉNG-KÒ: Pún ia�h só tiâu leh. Kan-ta� ū hêng-chèng te�k-koân ê i�ng-chiá (sysop) ē-sái siu-kái.</strong>',
+'longpagewarning'        => "'''SÈ-JĪ: Pún ia�h $1 kilobyte tn̂g; ū-ê liû-lám-khì bô-hoat-t�· pian-chi�p 32 kb chó-iū ia�h-sī koh khah tn̂g ê ia�h. Chhiá� khó-lū k� chit ia�h thiah chò khah sè ê to��-lo�h.'''",
+'readonlywarning'        => "'''CHÙ-Ì: Chu-li�u-khò· ta� só tiâu leh thang p�n î-siu khang-khòe, só·-í lí hi�n-chú-sî bô thang pó-chûn jīn-hô phian-chi�p h�ng-bo�k. Lí ē-sái k� siong-koan p�·-hūn tah--ji�p-khì 1-ê bûn-jī tóng-àn pó-chûn, �u-chhiú chiah koh kè-sio�k.'''",
+'protectedpagewarning'   => "'''KÉNG-KÒ: Pún ia�h só tiâu leh. Kan-ta� ū hêng-chèng te�k-koân ê i�ng-chiá (sysop) ē-sái siu-kái.'''",
 'templatesused'          => 'Chit ia�h i�ng chia ê pang-bô·:',
 'templatesusedpreview'   => 'Chit ê preview i�ng chia ê pang-bô͘:',
 'templatesusedsection'   => 'Chit ê section i�ng chia ê pang-bô͘:',
@@ -342,7 +342,6 @@ $messages = array(
 # History pages
 'viewpagelogs'        => 'Khoà� chit ia�h ê logs',
 'nohistory'           => 'Chit ia�h bô pian-chi�p-sú.',
-'revnotfound'         => 'Chh�e bô siu-tēng-pún',
 'currentrev'          => 'Hi�n-chú-sî ê siu-tēng-pún',
 'revisionasof'        => '$1 ê siu-tēng-pún',
 'previousrevision'    => '�Khah kū ê siu-tēng-pún',
@@ -372,6 +371,7 @@ $messages = array(
 'prevn'             => 'chêng $1 h�ng',
 'nextn'             => '�u $1 h�ng',
 'viewprevnext'      => 'Khoà� ($1) ($2) ($3)',
+'searchhelp-url'    => 'Help:Bo�k-lio�k',
 'showingresults'    => 'Ē-kha tùi #<b>$2</b> khai-sí hián-sī <b>$1</b> h�ng kiat-kó.',
 'showingresultsnum' => 'Ē-kha tùi #<b>$2</b> khai-sí hián-sī <b>$3</b> h�ng kiat-kó.',
 'powersearch'       => 'Kiám-sek',
@@ -385,6 +385,7 @@ $messages = array(
 'qbsettings'            => 'Quickbar ê siat-tēng',
 'changepassword'        => 'O�� bi�t-bé',
 'skin'                  => 'Phôe',
+'skin-preview'          => 'Chhì khoà�',
 'math'                  => 'Sò·-ha�k ê rendering',
 'dateformat'            => 'Ji�t-kî keh-sek',
 'datedefault'           => 'Chhìn-chhái',
@@ -397,9 +398,6 @@ $messages = array(
 'prefs-misc'            => 'Kî-tha� ê siat-tēng',
 'saveprefs'             => 'Pó-chûn siat-tēng',
 'resetprefs'            => 'Têng siat-tēng',
-'oldpassword'           => 'Kū bi�t-bé:',
-'newpassword'           => 'Sin bi�t-bé:',
-'retypenew'             => 'Têng phah sin bi�t-bé:',
 'textboxsize'           => 'Pian-chi�p',
 'rows'                  => 'Ch�a:',
 'columns'               => 'Nôa',
@@ -470,15 +468,15 @@ $messages = array(
 'destfilename'      => 'Tóng-àn sin miâ:',
 'watchthisupload'   => 'Kàm-sī chit ia�h',
 
-# Special:ImageList
-'imagelist'             => 'Iá�-si�ng lia�t-toa�',
-'imagelist_date'        => 'Ji�t-kî',
-'imagelist_name'        => 'Miâ',
-'imagelist_user'        => 'I�ng-chiá',
-'imagelist_size'        => 'To�-sè',
-'imagelist_description' => 'Soat-bêng',
+# Special:ListFiles
+'listfiles'             => 'Iá�-si�ng lia�t-toa�',
+'listfiles_date'        => 'Ji�t-kî',
+'listfiles_name'        => 'Miâ',
+'listfiles_user'        => 'I�ng-chiá',
+'listfiles_size'        => 'To�-sè',
+'listfiles_description' => 'Soat-bêng',
 
-# Image description page
+# File description page
 'imagelinks'       => 'Iá�-si�ng liân-kiat',
 'linkstoimage'     => '�-h� ê ia�h liân kàu chit ê iá�-si�ng:',
 'nolinkstoimage'   => 'Bô poà� ia�h liân kàu chit tiu� iá�-si�ng.',
@@ -504,10 +502,8 @@ $messages = array(
 'randomredirect' => 'Sûi-ch�i choán-ia�h',
 
 # Statistics
-'statistics'    => 'Thóng-kè',
-'sitestats'     => '{{SITENAME}} ch�m ê thóng-kè sò·-ba�k',
-'userstats'     => 'I�ng-chiá thóng-kè sò·-ba�k',
-'userstatstext' => "Ū '''$1''' ê i�ng-chiá chù-chheh. Kî-tiong '''$2''' ê ($4%) sī $5.",
+'statistics'              => 'Thóng-kè',
+'statistics-header-users' => 'I�ng-chiá thóng-kè sò·-ba�k',
 
 'disambiguations'     => 'Khu-pia�t-ia�h',
 'disambiguationspage' => 'Template:disambig
@@ -585,6 +581,12 @@ Template:Khu-pia�t-ia�h',
 'categories'         => 'Lūi-pia�t',
 'categoriespagetext' => 'Chit ê wiki ū ē-kha chia ê lūi-pia�t.',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'H�͘ lâng thâi ti�u ê kòng-hiàn',
+
+# Special:LinkSearch
+'linksearch' => 'Chhiau-chhoē ch�m-go� liân-kiat',
+
 # E-mail user
 'mailnologin'     => 'Bô siu-phoe ê chū-chí',
 'mailnologintext' => 'Lí it-tēng ài [[Special:UserLogin|teng-ji�p]] jī-chhiá� ū 1 ê ū-h�u ê e-mail chū-chí tī lí ê [[Special:Preferences|i�ng-chiá siat-tēng]] chiah ē-tàng kià e-mail h�· pa�t-ūi i�ng-chiá.',
@@ -602,35 +604,29 @@ Template:Khu-pia�t-ia�h',
 'emailsenttext'   => 'Lí ê e-mail í-keng sàng chhut-khì ah.',
 
 # Watchlist
-'watchlist'            => 'Kàm-sī-toa�',
-'mywatchlist'          => 'Góa ê kàm-sī-toa�',
-'watchlistfor'         => "('''$1''' ê)",
-'nowatchlist'          => 'Lí ê kàm-sī-toa� bô pòa� h�ng.',
-'watchnologin'         => 'Bô teng-ji�p',
-'watchnologintext'     => 'Lí it-tēng ài [[Special:UserLogin|teng-ji�p]] chiah ē-tàng siu-kái lí ê kàm-sī-toa�.',
-'addedwatch'           => '�-keng ka-ji�p kàm-sī-toa�',
-'addedwatchtext'       => "\"[[:\$1]]\" chit ia�h í-keng ka-ji�p lí ê [[Special:Watchlist|kàm-sī-toa�]]. Bī-lâi chit ia�h a�h-sī siong-koan ê thó-lūn-ia�h n� ū kái-piàn, ē lia�t tī hia. Tông-sî tī [[Special:RecentChanges|Chòe-kīn ê kái-piàn]] ē i�ng '''chho·-thé''' hián-sī ia�h ê piau-tê, án-ne khah bêng-hián. Ká-sú lí beh chi�ng chit ia�h tùi lí ê kàm-sī-toa� tû ti�u, khì khòng-chè-tiâu chhi�h \"Mài kàm-sī\" chiū ē-sái-tit.",
-'removedwatch'         => '�-keng tùi kàm-sī-toa� tû ti�u',
-'removedwatchtext'     => '"[[:$1]]" chit ia�h í-keng tùi lí ê kàm-sī-toa� tû ti�u.',
-'watch'                => 'kàm-sī',
-'watchthispage'        => 'Kàm-sī chit ia�h',
-'unwatch'              => 'Mài kàm-sī',
-'unwatchthispage'      => 'Mài koh kàm-sī',
-'watchnochange'        => 'Lí kàm-sī ê h�ng-bo�k tī hián-sī ê sî-kî í-l�i lóng bô siu-kái kòe.',
-'watchlist-details'    => 'Kàm-sī-toa� ū {{PLURAL:$1|$1 ia�h|$1 ia�h}}, thó-lūn-ia�h bô sǹg ch�i-l�i.',
-'watchmethod-recent'   => 'tng teh kíam-cha choè-kīn ê siu-kái, khoà� ū kàm-sī ê ia�h bô',
-'watchmethod-list'     => 'tng teh kiám-cha kàm-sī ê ia�h khoà� chòe-kīn ū siu-kái bô',
-'watchlistcontains'    => 'Lí ê kàm-sī-toa� siu $1 ia�h.',
-'wlnote'               => "Ē-kha sī '''$2''' tiám-cheng í-l�i si�ng sin ê $1 ê kái-piàn.",
-'wlshowlast'           => 'Hián-sī chêng $1 tiám-cheng $2 ji�t $3',
-'watchlist-show-bots'  => 'Hián-sī bot ê pian-chi�p',
-'watchlist-hide-bots'  => 'Am-khàm bot ê pian-chi�p',
-'watchlist-show-own'   => 'Hián-sī góa ê pian-chi�p',
-'watchlist-hide-own'   => 'Am-khàm góa ê pian-chi�p',
-'watchlist-show-minor' => 'Hián-sī sió siu-kái',
-'watchlist-hide-minor' => 'Am-khàm sió siu-kái',
-
-# Delete/protect/revert
+'watchlist'          => 'Kàm-sī-toa�',
+'mywatchlist'        => 'Góa ê kàm-sī-toa�',
+'watchlistfor'       => "('''$1''' ê)",
+'nowatchlist'        => 'Lí ê kàm-sī-toa� bô pòa� h�ng.',
+'watchnologin'       => 'Bô teng-ji�p',
+'watchnologintext'   => 'Lí it-tēng ài [[Special:UserLogin|teng-ji�p]] chiah ē-tàng siu-kái lí ê kàm-sī-toa�.',
+'addedwatch'         => '�-keng ka-ji�p kàm-sī-toa�',
+'addedwatchtext'     => "\"[[:\$1]]\" chit ia�h í-keng ka-ji�p lí ê [[Special:Watchlist|kàm-sī-toa�]]. Bī-lâi chit ia�h a�h-sī siong-koan ê thó-lūn-ia�h n� ū kái-piàn, ē lia�t tī hia. Tông-sî tī [[Special:RecentChanges|Chòe-kīn ê kái-piàn]] ē i�ng '''chho·-thé''' hián-sī ia�h ê piau-tê, án-ne khah bêng-hián. Ká-sú lí beh chi�ng chit ia�h tùi lí ê kàm-sī-toa� tû ti�u, khì khòng-chè-tiâu chhi�h \"Mài kàm-sī\" chiū ē-sái-tit.",
+'removedwatch'       => '�-keng tùi kàm-sī-toa� tû ti�u',
+'removedwatchtext'   => '"[[:$1]]" chit ia�h í-keng tùi lí ê kàm-sī-toa� tû ti�u.',
+'watch'              => 'kàm-sī',
+'watchthispage'      => 'Kàm-sī chit ia�h',
+'unwatch'            => 'Mài kàm-sī',
+'unwatchthispage'    => 'Mài koh kàm-sī',
+'watchnochange'      => 'Lí kàm-sī ê h�ng-bo�k tī hián-sī ê sî-kî í-l�i lóng bô siu-kái kòe.',
+'watchlist-details'  => 'Kàm-sī-toa� ū {{PLURAL:$1|$1 ia�h|$1 ia�h}}, thó-lūn-ia�h bô sǹg ch�i-l�i.',
+'watchmethod-recent' => 'tng teh kíam-cha choè-kīn ê siu-kái, khoà� ū kàm-sī ê ia�h bô',
+'watchmethod-list'   => 'tng teh kiám-cha kàm-sī ê ia�h khoà� chòe-kīn ū siu-kái bô',
+'watchlistcontains'  => 'Lí ê kàm-sī-toa� siu $1 ia�h.',
+'wlnote'             => "Ē-kha sī '''$2''' tiám-cheng í-l�i si�ng sin ê $1 ê kái-piàn.",
+'wlshowlast'         => 'Hián-sī chêng $1 tiám-cheng $2 ji�t $3',
+
+# Delete
 'deletepage'        => 'Thâi ia�h',
 'confirm'           => 'Khak-tēng',
 'excontent'         => "l�e-iông sī: '$1'",
@@ -644,18 +640,23 @@ Template:Khu-pia�t-ia�h',
 'deletedarticle'    => 'Thâi ti�u "[[$1]]"',
 'dellogpagetext'    => '�-h� lia�t chhut chòe-kīn thâi ti�u ê h�ng-bo�k.',
 'deletecomment'     => 'Thâi ê lí-iû',
-'rollback'          => 'K� siu-kái ká tńg khì',
-'rollback_short'    => 'Ká tńg khì',
-'rollbacklink'      => 'ká tńg khì',
-'rollbackfailed'    => 'Ká bē tńg khì',
-'cantrollback'      => 'Bô-hoat-t�· k� siu-kái ká-tńg--khì; téng ūi kòng-hiàn-chiá sī chit ia�h î-it ê chok-chiá.',
-'alreadyrolled'     => 'Bô-hoat-t�· k� [[User:$2|$2]] ([[User talk:$2|Thó-lūn]]) tùi [[:$1]] ê siu-kái ká-tńg-khì; í-keng ū lâng siu-kái a�h-sī ká-tńg chit ia�h. Téng 1 ūi siu-kái-chiá sī [[User:$3|$3]] ([[User talk:$3|Thó-lūn]]).',
-'editcomment'       => 'Siu-kái phêng-lūn sī: "<i>$1</i>".', # only shown if there is an edit comment
-'protectedarticle'  => 'pó-h�͘ "[[$1]]"',
-'protect-title'     => 'Pó-h�· "$1"',
-'protect-legend'    => 'Khak-tēng beh pó-h�·',
-'protectcomment'    => 'Pó-h�· ê lí-iû:',
-'protect-cascade'   => 'Cascading protection - pó-h�͘ jīm-hô pau-hâm tī chit ia�h ê ia�h.',
+
+# Rollback
+'rollback'       => 'K� siu-kái ká tńg khì',
+'rollback_short' => 'Ká tńg khì',
+'rollbacklink'   => 'ká tńg khì',
+'rollbackfailed' => 'Ká bē tńg khì',
+'cantrollback'   => 'Bô-hoat-t�· k� siu-kái ká-tńg--khì; téng ūi kòng-hiàn-chiá sī chit ia�h î-it ê chok-chiá.',
+'alreadyrolled'  => 'Bô-hoat-t�· k� [[User:$2|$2]] ([[User talk:$2|Thó-lūn]]) tùi [[:$1]] ê siu-kái ká-tńg-khì; í-keng ū lâng siu-kái a�h-sī ká-tńg chit ia�h. Téng 1 ūi siu-kái-chiá sī [[User:$3|$3]] ([[User talk:$3|Thó-lūn]]).',
+'editcomment'    => "Siu-kái phêng-lūn sī: \"''\$1''\".", # only shown if there is an edit comment
+
+# Protect
+'protectedarticle' => 'pó-h�͘ "[[$1]]"',
+'protect-title'    => 'Pó-h�· "$1"',
+'prot_1movedto2'   => '[[$1]] sóa khì tī [[$2]]',
+'protect-legend'   => 'Khak-tēng beh pó-h�·',
+'protectcomment'   => 'Pó-h�· ê lí-iû:',
+'protect-cascade'  => 'Cascading protection - pó-h�͘ jīm-hô pau-hâm tī chit ia�h ê ia�h.',
 
 # Restrictions (nouns)
 'restriction-edit' => 'Siu-kái',
@@ -686,7 +687,6 @@ Template:Khu-pia�t-ia�h',
 
 # What links here
 'whatlinkshere'       => 'Tó-ūi liân kàu chia',
-'linklistsub'         => '(Liân-kiat lia�t-toa�)',
 'linkshere'           => "�-h� '''[[:$1]]''' liân kàu chia:",
 'nolinkshere'         => "Bô poà� ia�h liân kàu '''[[:$1]]'''.",
 'isredirect'          => 'choán-ia�h',
@@ -727,6 +727,8 @@ Tùi chē lâng tha�k ê ia�h lâi kóng, soá-ūi sī to� tiâu t�i-chì.
 Liâu--lo�h-khì chìn-chêng, chhiá� seng khak-tēng lí ū liáu-kái chiah-ê hi�-kó.",
 'movepagetalktext' => "Siong-koan ê thó-lūn-ia�h (chún ū) oân-nâ ē chū-t�ng tòe leh sóa-ūi. �-h� ê chêng-hêng '''bô chún-sǹg''': *Beh k� chit ia�h tùi 1 ê miâ-khong-kan (namespace) soá khì lēng-g�a 1 ê miâ-khong-kan, *Sin piau-tê í-keng ū i�ng--kòe ê thó-lūn-ia�h, he�k-chiá *Ē-kha ê sió-keh-á bô phah-kau. �-si�ng ê chêng-hêng n�-chún tī leh, lí chí-hó i�ng jîn-kang ê hong-sek sóa ia�h a�h-sī k� ha�p-pèng (n� ū su-iàu).",
 'movearticle'      => 'Sóa ia�h:',
+'movenologin'      => 'Bô teng-ji�p',
+'movenologintext'  => 'Lí it-tēng ài sī chù-chheh ê i�ng-chiá jī-chhiá� ū [[Special:UserLogin|teng-ji�p]] chiah ē-tàng sóa ia�h.',
 'newtitle'         => 'Khì sin piau-tê:',
 'move-watch'       => 'Kàm-sī chit ia�h',
 'movepagebtn'      => 'Sóa ia�h',
@@ -792,7 +794,7 @@ Liâu--lo�h-khì chìn-chêng, chhiá� seng khak-tēng lí ū liáu-kái chia
 'file-nohires'         => '<small>Bô khah koân ê kái-sek-t�͘.</small>',
 'show-big-image-thumb' => '<small>Chit tiu� ū-lám tô͘ (preview) ê to�-sè: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'     => 'Sin iá�-si�ng oē-lóng',
 'imagelisttext' => "�-h� sī '''$1''' tiu� iá�-si�ng ê lia�t-toa�, $2 pâi-lia�t.",
 'ilsubmit'      => 'Kiám-sek',
@@ -831,7 +833,7 @@ $3
 N�-chún *m̄-sī* lí, chhiá� mài tòe liân-kiat khì.  Chit tiu� phoe ê khak-jīn-bé ē chū-t�ng tī $4 kòe-kî.',
 
 # action=purge
-'confirm_purge' => 'K� chit ia�h ê cache pià� ti�u? $1',
+'confirm-purge-top' => 'K� chit ia�h ê cache pià� ti�u?',
 
 # Table pager
 'table_pager_next'         => 'Aū-chi�t-ia�h',
diff --git a/languages/messages/MessagesNap.php b/languages/messages/MessagesNap.php
index 3ebf5684..da1ad8db 100644
--- a/languages/messages/MessagesNap.php
+++ b/languages/messages/MessagesNap.php
@@ -13,6 +13,42 @@
 
 $fallback = 'it';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Speciàle',
+	NS_TALK             => 'Chiàcchiera',
+	NS_USER             => 'Utente',
+	NS_USER_TALK        => 'Utente_chiàcchiera',
+	NS_PROJECT_TALK     => '$1_chiàcchiera',
+	NS_FILE             => 'Fiùra',
+	NS_FILE_TALK        => 'Fiùra_chiàcchiera',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_chiàcchiera',
+	NS_TEMPLATE         => 'Modello',
+	NS_TEMPLATE_TALK    => 'Modello_chiàcchiera',
+	NS_HELP             => 'Ajùto',
+	NS_HELP_TALK        => 'Ajùto_chiàcchiera',
+	NS_CATEGORY         => 'Categurìa',
+	NS_CATEGORY_TALK    => 'Categurìa_chiàcchiera',
+);
+
+$namespaceAliases = array(
+	'Speciale' => NS_SPECIAL,
+	'Discussione' => NS_TALK,
+	'Utente' => NS_USER,
+	'Discussioni_utente' => NS_USER_TALK,
+	'Discussioni_$1' => NS_PROJECT_TALK,
+	'Immagine' => NS_FILE,
+	'Discussioni_immagine' => NS_FILE_TALK,
+	'MediaWiki' => NS_MEDIAWIKI,
+	'Discussioni_MediaWiki' => NS_MEDIAWIKI_TALK,
+	'Discussioni_template' => NS_TEMPLATE_TALK,
+	'Aiuto' => NS_HELP,
+	'Discussioni_aiuto' => NS_HELP_TALK,
+	'Categoria' => NS_CATEGORY,
+	'Discussioni_categoria' => NS_CATEGORY_TALK,
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => "Sottolinia 'e jonte:",
@@ -179,14 +215,13 @@ $messages = array(
 'badtitle'        => "'O nnomme nun è jùsto",
 
 # Login and logout pages
-'logouttext'                 => "<strong>Site asciùte.</strong><br />
+'logouttext'                 => "'''Site asciùte.'''<br />
 Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putite trasì n'ata vota, cu 'o stesso nomme o cu n'ato nomme.",
 'welcomecreation'            => "== Bemmenuto, $1! ==
 
 'O cunto è stato criato currettamente.  Nun scurdà 'e perzonalizzà 'e ppreferenze 'e {{SITENAME}}.",
 'remembermypassword'         => 'Allicuordate d"a password',
 'yourdomainname'             => "Spiecà 'o dumminio",
-'loginproblem'               => "<b>È capetato nu sbaglio a ll'acciesso.</b><br />Pruvate n'ata vota.",
 'login'                      => 'Tràse',
 'userlogin'                  => "Tràse o cria n'acciesso nuovo",
 'logout'                     => 'Jèsce',
@@ -224,7 +259,7 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'loginreqpagetext'  => "Pe' veré ate ppaggene abbesognate $1.",
 'accmailtitle'      => "'O password è stato mannato.",
 'accmailtext'       => '\'A password pe ll\'utente "$1" fuje mannata ô nnerizzo $2.',
-'previewnote'       => "<strong>Chesta è sola n'anteprimma; 'e cagnamiénte â paggena NUN songo ancora sarvate!</strong>",
+'previewnote'       => "'''Chesta è sola n'anteprimma; 'e cagnamiénte â paggena NUN songo ancora sarvate!'''",
 'editing'           => "Cagnamiento 'e $1",
 'templatesused'     => "Template ausate 'a chesta paggena:",
 
@@ -244,6 +279,7 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'noexactmatch'     => "''''A paggena \"\$1\" nun asiste.''' Se pô [[:\$1|criala mmo]].",
 'notitlematches'   => "Voce addemannata nun truvata dint' 'e titule 'e articulo",
 'notextmatches'    => "Voce addemannata nun truvata dint' 'e teste 'e articulo",
+'searchhelp-url'   => 'Help:Ajùto',
 'powersearch'      => 'Truova',
 
 # Preferences page
@@ -279,10 +315,10 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'fileexists-thumb' => "<center>'''Immagine esistente'''</center>",
 'uploadedimage'    => 'ha carecato "[[$1]]"',
 
-# Special:ImageList
-'imagelist_name' => 'Nomme',
+# Special:ListFiles
+'listfiles_name' => 'Nomme',
 
-# Image description page
+# File description page
 'filehist-user'    => 'Utente',
 'imagelinks'       => 'Jonte ê ffiure',
 'noimage-linktext' => 'carrecarlo mmo',
@@ -316,6 +352,9 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'categories'         => 'Categurìe',
 'categoriespagetext' => "Lista cumpleta d\"e categurie presente ncopp' 'o sito.",
 
+# Special:LinkSearch
+'linksearch-ok' => 'Truova',
+
 # Watchlist
 'addedwatch'   => 'Aggiunto ai Osservate Speciale tue',
 'watch'        => 'Secuta',
@@ -324,7 +363,7 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'enotif_newpagetext' => 'Chesta è na paggena nòva.',
 'changed'            => 'cagnata',
 
-# Delete/protect/revert
+# Delete
 'deletepage'      => 'Scancella paggena',
 'excontent'       => "'o cuntenuto era: '$1'",
 'excontentauthor' => "'o cuntenuto era: '$1' (e ll'unneco cuntribbutore era '[[Special:Contributions/$2|$2]]')",
@@ -336,8 +375,14 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'dellogpage'      => 'Scancellazione',
 'deletionlog'     => 'Log d"e scancellazione',
 'deletecomment'   => 'Mutivo d"a scancellazione',
-'rollback'        => "Ausa na revizione 'e primma",
-'revertpage'      => "Cangiaje 'e cagnamiénte 'e [[Special:Contributions/$2|$2]] ([[User talk:$2|discussione]]), cu â verzione 'e pprimma 'e  [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Rollback
+'rollback'   => "Ausa na revizione 'e primma",
+'revertpage' => "Cangiaje 'e cagnamiénte 'e [[Special:Contributions/$2|$2]] ([[User talk:$2|discussione]]), cu â verzione 'e pprimma 'e  [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
+'prot_1movedto2'         => 'ha spustato [[$1]] a [[$2]]',
+'protect-expiry-options' => '2 ore:2 hours,1 juorno:1 day,3 juorne:3 days,1 semmana:1 week,2 semmane:2 weeks,1 mise:1 month,3 mese:3 months,6 mese:6 months,1 anno:1 year,infinito:infinite', # display1:time1,display2:time2,...
 
 # Undelete
 'viewdeletedpage' => "Vìre 'e ppàggine scancellate",
@@ -407,7 +452,7 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 'numedits'    => "Nummero 'e cagnamiente (articulo): $1",
 'numwatchers' => "Nummero 'e asservature: $1",
 
-# Special:NewImages
+# Special:NewFiles
 'noimages' => "Nun nc'è nind' 'a veré.",
 'ilsubmit' => 'Truova',
 
@@ -440,9 +485,6 @@ Putite cuntinuà a ausà {{SITENAME}} comme n'utente senza nomme, o si nò putit
 # Delete conflict
 'deletedwhileediting' => 'Attenziòne: quaccherùno have scancellàto chesta pàggena prìmma ca tu accuminciàste â scrìvere!',
 
-# AJAX search
-'hideresults' => "Annasconne 'e risultate",
-
 # Auto-summaries
 'autoredircomment' => 'Redirect â paggena [[$1]]',
 'autosumm-new'     => 'Paggena nuova: $1',
diff --git a/languages/messages/MessagesNb.php b/languages/messages/MessagesNb.php
index 53f4b6e1..949e8c43 100644
--- a/languages/messages/MessagesNb.php
+++ b/languages/messages/MessagesNb.php
@@ -1,5 +1,5 @@
 <?php
-/** Norwegian (‪Norsk (bokmål)‬)
+/** Norwegian Bokmål (‪Norsk (bokmål)‬)
  *
  * @ingroup Language
  * @file
diff --git a/languages/messages/MessagesNds.php b/languages/messages/MessagesNds.php
index 5a34f9f5..c8770099 100644
--- a/languages/messages/MessagesNds.php
+++ b/languages/messages/MessagesNds.php
@@ -11,6 +11,41 @@
 
 $fallback = 'de';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Spezial',
+	NS_TALK             => 'Diskuschoon',
+	NS_USER             => 'Bruker',
+	NS_USER_TALK        => 'Bruker_Diskuschoon',
+	NS_PROJECT_TALK     => '$1_Diskuschoon',
+	NS_FILE             => 'Datei',
+	NS_FILE_TALK        => 'Datei_Diskuschoon',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskuschoon',
+	NS_TEMPLATE         => 'Vörlaag',
+	NS_TEMPLATE_TALK    => 'Vörlaag_Diskuschoon',
+	NS_HELP             => 'Hülp',
+	NS_HELP_TALK        => 'Hülp_Diskuschoon',
+	NS_CATEGORY         => 'Kategorie',
+	NS_CATEGORY_TALK    => 'Kategorie_Diskuschoon',
+);
+
+$namespaceAliases = array(
+	'Diskussion' => NS_TALK,
+	'Benutzer' => NS_USER,
+	'Benutzer_Diskussion' => NS_USER_TALK,
+	'$1_Diskussion' => NS_PROJECT_TALK,
+	'Bild' => NS_FILE,
+	'Bild_Diskussion' => NS_FILE_TALK,
+	'MediaWiki_Diskussion' => NS_MEDIAWIKI_TALK,
+	'Vorlage' => NS_TEMPLATE,
+	'Vorlage_Diskussion' => NS_TEMPLATE_TALK,
+	'Hilfe' => NS_HELP,
+	'Hilfe_Diskussion' => NS_HELP_TALK,
+	'Kategorie' => NS_CATEGORY,
+	'Kategorie_Diskussion' => NS_CATEGORY_TALK,
+);
+
 $magicWords = array(
 	'redirect'            => array( '0', '#redirect', '#wiederleiden' ),
 	'notoc'               => array( '0', '__NOTOC__', '__KEENINHOLTVERTEKEN__' ),
@@ -43,12 +78,6 @@ $magicWords = array(
 	'grammar'             => array( '0', 'GRAMMAR:', 'GRAMMATIK:' ),
 );
 
-$skinNames = array(
-	'standard'    => 'Klassik',
-	'nostalgia'   => 'Nostalgie',
-	'cologneblue' => 'Kölsch Blau',
-	'chick'       => 'Küken',
-);
 
 $bookstoreList = array(
 	'Verteken vun leverbore Böker'  => 'http://www.buchhandel.de/sixcms/list.php?page=buchhandel_profisuche_frameset&suchfeld=isbn&suchwert=$1=0&y=0',
@@ -66,8 +95,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Bruker_Diskuschoon',
 	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_Diskuschoon',
-	NS_IMAGE          => 'Bild',
-	NS_IMAGE_TALK     => 'Bild_Diskuschoon',
+	NS_FILE           => 'Bild',
+	NS_FILE_TALK      => 'Bild_Diskuschoon',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Diskuschoon',
 	NS_TEMPLATE       => 'Vörlaag',
@@ -96,81 +125,86 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Dubbelte_Redirects' ),
-	'BrokenRedirects'           => array( 'Kaputte_Redirects' ),
-	'Disambiguations'           => array( 'Mehrdüdige_Begrepen' ),
+	'DoubleRedirects'           => array( 'Dubbelte Redirects' ),
+	'BrokenRedirects'           => array( 'Kaputte Redirects' ),
+	'Disambiguations'           => array( 'Mehrdüdige Begrepen' ),
 	'Userlogin'                 => array( 'Anmellen' ),
 	'Userlogout'                => array( 'Afmellen' ),
+	'CreateAccount'             => array( 'Brukerkonto anleggen' ),
 	'Preferences'               => array( 'Instellungen' ),
 	'Watchlist'                 => array( 'Oppasslist' ),
-	'Recentchanges'             => array( 'Neeste_Ännern' ),
+	'Recentchanges'             => array( 'Toletzt ännert', 'Neeste Ännern' ),
 	'Upload'                    => array( 'Hoochladen' ),
-	'Imagelist'                 => array( 'Dateilist' ),
-	'Newimages'                 => array( 'Nee_Datein' ),
+	'Listfiles'                 => array( 'Dateilist' ),
+	'Newimages'                 => array( 'Nee Datein' ),
 	'Listusers'                 => array( 'Brukers' ),
+	'Listgrouprights'           => array( 'Gruppenrechten' ),
 	'Statistics'                => array( 'Statistik' ),
-	'Randompage'                => array( 'Tofällige_Siet' ),
+	'Randompage'                => array( 'Tofällige Siet' ),
 	'Lonelypages'               => array( 'Weetsieden' ),
-	'Uncategorizedpages'        => array( 'Sieden_ahn_Kategorie' ),
-	'Uncategorizedcategories'   => array( 'Kategorien_ahn_Kategorie' ),
-	'Uncategorizedimages'       => array( 'Datein_ahn_Kategorie' ),
-	'Uncategorizedtemplates'    => array( 'Vörlagen_ahn_Kategorie' ),
-	'Unusedcategories'          => array( 'Nich_bruukte_Kategorien' ),
-	'Unusedimages'              => array( 'Nich_bruukte_Datein' ),
-	'Wantedpages'               => array( 'Wünschte_Sieden' ),
-	'Wantedcategories'          => array( 'Wünschte_Kategorien' ),
-	'Mostlinked'                => array( 'Veel_lenkte_Sieden' ),
-	'Mostlinkedcategories'      => array( 'Veel_bruukte_Kategorien' ),
-	'Mostlinkedtemplates'       => array( 'Veel_bruukte_Vörlagen' ),
-	'Mostcategories'            => array( 'Sieden_mit_vele_Kategorien' ),
-	'Mostimages'                => array( 'Veel_bruukte_Datein' ),
-	'Mostrevisions'             => array( 'Faken_ännerte_Sieden' ),
-	'Fewestrevisions'           => array( 'Kuum_ännerte_Sieden' ),
-	'Shortpages'                => array( 'Korte_Sieden' ),
-	'Longpages'                 => array( 'Lange_Sieden' ),
-	'Newpages'                  => array( 'Nee_Sieden' ),
-	'Ancientpages'              => array( 'Ole_Sieden' ),
+	'Uncategorizedpages'        => array( 'Sieden ahn Kategorie' ),
+	'Uncategorizedcategories'   => array( 'Kategorien ahn Kategorie' ),
+	'Uncategorizedimages'       => array( 'Datein ahn Kategorie' ),
+	'Uncategorizedtemplates'    => array( 'Vörlagen ahn Kategorie' ),
+	'Unusedcategories'          => array( 'Nich bruukte Kategorien' ),
+	'Unusedimages'              => array( 'Nich bruukte Datein' ),
+	'Wantedpages'               => array( 'Wünschte Sieden' ),
+	'Wantedcategories'          => array( 'Wünschte Kategorien' ),
+	'Mostlinked'                => array( 'Veel lenkte Sieden' ),
+	'Mostlinkedcategories'      => array( 'Veel bruukte Kategorien' ),
+	'Mostlinkedtemplates'       => array( 'Veel bruukte Vörlagen' ),
+	'Mostcategories'            => array( 'Sieden mit vele Kategorien' ),
+	'Mostimages'                => array( 'Veel bruukte Datein' ),
+	'Mostrevisions'             => array( 'Faken ännerte Sieden' ),
+	'Fewestrevisions'           => array( 'Kuum ännerte Sieden' ),
+	'Shortpages'                => array( 'Korte Sieden' ),
+	'Longpages'                 => array( 'Lange Sieden' ),
+	'Newpages'                  => array( 'Nee Sieden' ),
+	'Ancientpages'              => array( 'Ole Sieden' ),
 	'Deadendpages'              => array( 'Sackstraatsieden' ),
-	'Protectedpages'            => array( 'Schuulte_Sieden' ),
-	'Allpages'                  => array( 'Alle_Sieden' ),
-	'Prefixindex'               => array( 'Sieden_de_anfangt_mit' ),
-	'Ipblocklist'               => array( 'List_vun_blockte_IPs' ),
+	'Protectedpages'            => array( 'Schuulte Sieden' ),
+	'Protectedtitles'           => array( 'Sperrte Titels' ),
+	'Allpages'                  => array( 'Alle Sieden' ),
+	'Prefixindex'               => array( 'Sieden de anfangt mit' ),
+	'Ipblocklist'               => array( 'List vun blockte IPs' ),
 	'Specialpages'              => array( 'Spezialsieden' ),
 	'Contributions'             => array( 'Bidrääg' ),
-	'Emailuser'                 => array( 'E-Mail_an_Bruker' ),
-	'Confirmemail'              => array( 'E-Mail_bestätigen' ),
-	'Whatlinkshere'             => array( 'Wat_wiest_hier_hen' ),
-	'Recentchangeslinked'       => array( 'Ännern_an_lenkte_Sieden' ),
+	'Emailuser'                 => array( 'E-Mail an Bruker' ),
+	'Confirmemail'              => array( 'E-Mail bestätigen' ),
+	'Whatlinkshere'             => array( 'Wat wiest hier hen' ),
+	'Recentchangeslinked'       => array( 'Ännern an lenkte Sieden' ),
 	'Movepage'                  => array( 'Schuven' ),
 	'Blockme'                   => array( 'Proxy-Sparr' ),
 	'Booksources'               => array( 'ISBN-Söök' ),
 	'Categories'                => array( 'Kategorien' ),
 	'Export'                    => array( 'Exporteren' ),
-	'Version'                   => array( 'Version' ),
 	'Allmessages'               => array( 'Systemnarichten' ),
 	'Log'                       => array( 'Logbook' ),
 	'Blockip'                   => array( 'Blocken' ),
 	'Undelete'                  => array( 'Wedderhalen' ),
 	'Import'                    => array( 'Importeren' ),
-	'Lockdb'                    => array( 'Datenbank_sparren' ),
-	'Unlockdb'                  => array( 'Datenbank_freegeven' ),
+	'Lockdb'                    => array( 'Datenbank sparren' ),
+	'Unlockdb'                  => array( 'Datenbank freegeven' ),
 	'Userrights'                => array( 'Brukerrechten' ),
 	'MIMEsearch'                => array( 'MIME-Typ-Söök' ),
-	'Unwatchedpages'            => array( 'Sieden_op_keen_Oppasslist' ),
-	'Listredirects'             => array( 'List_vun_Redirects' ),
-	'Revisiondelete'            => array( 'Versionen_wegsmieten' ),
-	'Unusedtemplates'           => array( 'Nich_bruukte_Vörlagen' ),
-	'Randomredirect'            => array( 'Tofällig_Redirect' ),
-	'Mypage'                    => array( 'Miene_Brukersiet' ),
-	'Mytalk'                    => array( 'Miene_Diskuschoonssiet' ),
-	'Mycontributions'           => array( 'Miene_Bidrääg' ),
+	'FileDuplicateSearch'       => array( 'Dubbelte-Datein-Söök' ),
+	'Unwatchedpages'            => array( 'Sieden op keen Oppasslist' ),
+	'Listredirects'             => array( 'List vun Redirects' ),
+	'Revisiondelete'            => array( 'Versionen wegsmieten' ),
+	'Unusedtemplates'           => array( 'Nich bruukte Vörlagen' ),
+	'Randomredirect'            => array( 'Tofällig Redirect' ),
+	'Mypage'                    => array( 'Miene Brukersiet' ),
+	'Mytalk'                    => array( 'Miene Diskuschoonssiet' ),
+	'Mycontributions'           => array( 'Miene Bidrääg' ),
 	'Listadmins'                => array( 'Administraters' ),
 	'Listbots'                  => array( 'Bots' ),
-	'Popularpages'              => array( 'Veel_besöchte_Sieden' ),
+	'Popularpages'              => array( 'Veel besöchte Sieden' ),
 	'Search'                    => array( 'Söök' ),
-	'Resetpass'                 => array( 'Passwoort_trüchsetten' ),
-	'Withoutinterwiki'          => array( 'Sieden_ahn_Spraaklenken' ),
-	'MergeHistory'              => array( 'Versionshistorie_tohoopbringen' ),
+	'Resetpass'                 => array( 'Passwoort trüchsetten' ),
+	'Withoutinterwiki'          => array( 'Sieden ahn Spraaklenken' ),
+	'MergeHistory'              => array( 'Versionshistorie tohoopbringen' ),
+	'Filepath'                  => array( 'Dateipadd' ),
+	'Blankpage'                 => array( 'Leddige Sied' ),
 );
 
 $messages = array(
@@ -211,17 +245,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ännern vun mi sülvs op de Oppasslist nich wiesen',
 'tog-watchlisthidebots'       => 'Ännern vun Bots op de Oppasslist nich wiesen',
 'tog-watchlisthideminor'      => 'Lütte Ännern op de Oppasslist nich wiesen',
+'tog-watchlisthideliu'        => 'Ännern vun anmellt Brukers nich wiesen',
+'tog-watchlisthideanons'      => 'Ännern vun anonyme Brukers nich wiesen',
 'tog-nolangconversion'        => 'Variantenkonverschoon utschalten',
 'tog-ccmeonemails'            => 'vun Nettbreven, de ik wegschick, mi sülvst Kopien tostüren',
 'tog-diffonly'                => "Na ''{{int:showdiff}}'' nich de kumplette Sied wiesen",
 'tog-showhiddencats'          => 'Wies verstekene Kategorien',
+'tog-norollbackdiff'          => 'Ünnerscheed na’t Trüchsetten nich wiesen',
 
 'underline-always'  => 'Jümmer',
 'underline-never'   => 'Nienich',
 'underline-default' => 'so as in’n Nettkieker instellt',
 
-'skinpreview' => '(Vörschau)',
-
 # Dates
 'sunday'        => 'Sünndag',
 'monday'        => 'Maandag',
@@ -310,7 +345,7 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 'mytalk'         => 'Mien Diskuschoon',
 'anontalk'       => 'Diskuschoonssiet vun disse IP',
 'navigation'     => 'Navigatschoon',
-'and'            => 'un',
+'and'            => '&#32;un',
 
 # Metadata in edit box
 'metadata_help' => 'Metadaten:',
@@ -347,14 +382,14 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 'talkpagelinktext'  => 'Diskuschoon',
 'specialpage'       => 'Spezialsiet',
 'personaltools'     => 'Persönliche Warktüüch',
-'postcomment'       => 'Kommentar hentofögen',
+'postcomment'       => 'Afsnidd tofögen',
 'articlepage'       => 'Artikel',
 'talk'              => 'Diskuschoon',
 'views'             => 'Ansichten',
 'toolbox'           => 'Warktüüch',
 'userpage'          => 'Brukersiet ankieken',
 'projectpage'       => 'Meta-Text',
-'imagepage'         => 'Bildsiet',
+'imagepage'         => 'Dateisied',
 'mediawikipage'     => 'Systemnaricht ankieken',
 'templatepage'      => 'Vörlaag ankieken',
 'viewhelppage'      => 'Helpsiet ankieken',
@@ -373,8 +408,6 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Över {{SITENAME}}',
 'aboutpage'            => 'Project:Över_{{SITENAME}}',
-'bugreports'           => 'Kontakt',
-'bugreportspage'       => 'Project:Kontakt',
 'copyright'            => 'Inholt is verfögbor ünner de $1.',
 'copyrightpagename'    => '{{SITENAME}} Copyright',
 'copyrightpage'        => '{{ns:project}}:Lizenz',
@@ -397,9 +430,7 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 
 'badaccess'        => 'Fehler bi de Rechten',
 'badaccess-group0' => 'Du hest keen Verlööf för disse Akschoon.',
-'badaccess-group1' => 'Disse Akschoon is blots för Brukers ut de Brukergrupp $1.',
-'badaccess-group2' => 'Disse Akschoon is blots för Brukers ut een vun de Brukergruppen $1.',
-'badaccess-groups' => 'Disse Akschoon is blots för Brukers ut een vun de Brukergruppen $1.',
+'badaccess-groups' => 'Disse Akschoon is blots för Brukers ut {{PLURAL:$2|de Brukergrupp|een vun de Brukergruppen}} $1.',
 
 'versionrequired'     => 'Version $1 vun MediaWiki nödig',
 'versionrequiredtext' => 'Version $1 vun MediaWiki is nödig, disse Siet to bruken. Kiek op de Siet [[Special:Version|Version]].',
@@ -413,6 +444,8 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 'editsection'             => 'ännern',
 'editold'                 => 'bearbeiden',
 'viewsourceold'           => 'Borntext wiesen',
+'editlink'                => 'ännern',
+'viewsourcelink'          => 'Borntext ankieken',
 'editsectionhint'         => 'Ännere Afsnitt: $1',
 'toc'                     => 'Inholtsverteken',
 'showtoc'                 => 'wiesen',
@@ -433,7 +466,7 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 'nstab-main'      => 'Artikel',
 'nstab-user'      => 'Brukersied',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Spezial',
+'nstab-special'   => 'Spezialsied',
 'nstab-project'   => 'Över',
 'nstab-image'     => 'Bild',
 'nstab-mediawiki' => 'Naricht',
@@ -443,7 +476,9 @@ un dat [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 
 # Main script and global functions
 'nosuchaction'      => 'Disse Aktschoon gifft dat nich',
-'nosuchactiontext'  => 'Disse Aktschoon warrt vun de MediaWiki-Software nich ünnerstütt',
+'nosuchactiontext'  => 'De in de URL angeven Akschoon warrt nich ünnerstütt.
+Villicht hest du in de URL en Tippfehler oder büst en verkehrten Lenk nagahn.
+Dat kann aver ok op en Bug in de Software henwiesen, de op {{SITENAME}} bruukt warrt.',
 'nosuchspecialpage' => 'Disse Spezialsiet gifft dat nich',
 'nospecialpagetext' => 'Disse Spezialsiet warrt vun de MediaWiki-Software nich ünnerstütt',
 
@@ -492,7 +527,6 @@ Wenn dat nich de Fall is, denn hest du villicht en Fehler in de Software funnen.
 'cannotdelete'         => 'De Software kunn de angevene Siet nich wegsmieten. (Mööglicherwies is de al vun en annern wegsmeten worrn.)',
 'badtitle'             => 'Ungülligen Titel',
 'badtitletext'         => 'De Titel vun de opropene Siet weer ungüllig, leddig, oder en ungülligen Spraaklink vun en annern Wiki.',
-'perfdisabled'         => 'Disse Funkschoon is wegen Överlast op de Servers för en Tied deaktiveert.',
 'perfcached'           => 'Disse Daten kamen ut den Cache un sünd mööglicherwies nich aktuell:',
 'perfcachedts'         => 'Disse Daten sünd ut’n Cache, tolest aktuell maakt worrn sünd se $1.',
 'querypage-no-updates' => "'''Dat aktuell Maken vun disse Siet is opstunns utstellt. De Daten warrt för’t Eerste veröllert blieven.'''",
@@ -508,7 +542,7 @@ Query: $2',
 'protectedinterface'   => 'Op disse Siet staht Narichtentexte för dat System un de Siet is dorüm sparrt.',
 'editinginterface'     => "'''Wohrschau:''' Disse Siet bargt Text, de vun de MediaWiki-Software för ehr Böverflach bruukt warrt.
 Wat du hier ännerst, warkt sik op dat kumplette Wiki ut.
-Wenn du Text översetten wist, de betherto noch gornich översett is, denn maak dat opbest op [http://translatewiki.net/wiki/Main_Page?setlang=nds Betawiki], dat Översett-Projekt vun MediaWiki.",
+Wenn du Text översetten wist, de betherto noch gornich översett is, denn maak dat opbest op [http://translatewiki.net/wiki/Main_Page?setlang=nds translatewiki.net], dat Översett-Projekt vun MediaWiki.",
 'sqlhidden'            => '(SQL-Affraag versteken)',
 'cascadeprotected'     => 'Disse Siet is sperrt un kann nich ännert warrn. Dat kummt dorvun dat se in disse {{PLURAL:$1|Siet|Sieden}} inbunnen is, de över Kaskadensperr schuult {{PLURAL:$1|is|sünd}}:
 $2',
@@ -519,16 +553,16 @@ $2',
 As Grund is angeven: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Slechte Konfiguratschoon: unbekannten Virenscanner: <i>$1</i>',
+'virus-badscanner'     => "Slechte Konfiguratschoon: unbekannten Virenscanner: ''$1''",
 'virus-scanfailed'     => 'Scan hett nich klappt (Code $1)',
 'virus-unknownscanner' => 'Unbekannten Virenscanner:',
 
 # Login and logout pages
 'logouttitle'                => 'Bruker-Afmellen',
-'logouttext'                 => '<strong>Du büst nu afmellt.</strong>
+'logouttext'                 => "'''Du büst nu afmellt.'''
 
 Du kannst {{SITENAME}} nu anonym wiederbruken oder di ünner dissen oder en annern Brukernaam wedder [[Special:UserLogin|anmellen]].
-Denk dor an, dat welk Sieden ünner Ümstänn noch jümmer so wiest warrn köönt, as wenn du anmellt weerst. Dat ännert sik, wenn du den Cache vun dien Browser leddig maakst.',
+Denk dor an, dat welk Sieden ünner Ümstänn noch jümmer so wiest warrn köönt, as wenn du anmellt weerst. Dat ännert sik, wenn du den Cache vun dien Browser leddig maakst.",
 'welcomecreation'            => '== Willkamen, $1! ==
 Dien Brukerkonto is nu inricht.
 Vergeet nich, de Sied för di persönlich [[Special:Preferences|intostellen]].',
@@ -539,7 +573,6 @@ Vergeet nich, de Sied för di persönlich [[Special:Preferences|intostellen]].',
 'remembermypassword'         => 'Duersam inloggen',
 'yourdomainname'             => 'Diene Domään:',
 'externaldberror'            => 'Dat geev en Fehler bi de externe Authentifizerungsdatenbank oder du dröffst dien extern Brukerkonto nich ännern.',
-'loginproblem'               => '<b>Dor weer en Problem mit dien Anmellen.</b><br />Versöök dat noch eenmal!',
 'login'                      => 'Anmellen',
 'nav-login-createaccount'    => 'Nee Konto anleggen oder anmellen',
 'loginprompt'                => 'Dat du di bi {{SITENAME}} anmellen kannst, musst du Cookies anstellt hebben.',
@@ -564,7 +597,7 @@ Vergeet nich, de Sied för di persönlich [[Special:Preferences|intostellen]].',
 'yourvariant'                => 'Dien Spraak',
 'yournick'                   => 'Dien Ökelnaam (för dat Ünnerschrieven)',
 'badsig'                     => 'De Signatur is nich korrekt, kiek nochmal na de HTML-Tags.',
-'badsiglength'               => 'De Ãœnnerschrift is to lang; de schall weniger as $1 {{PLURAL:$1|Teken|Tekens}} hebben.',
+'badsiglength'               => 'Diene Ãœnnerschrift is to lang; de schall weniger as $1 {{PLURAL:$1|Teken|Tekens}} hebben.',
 'email'                      => 'Nettbreef',
 'prefs-help-realname'        => 'De echte Naam mutt nich angeven warrn. Wenn du em angiffst, warrt de Naam bruukt, dat diene Arbeit di torekent warrn kann.',
 'loginerror'                 => 'Fehler bi dat Anmellen',
@@ -576,6 +609,7 @@ Vergeet nich, de Sied för di persönlich [[Special:Preferences|intostellen]].',
 'loginsuccesstitle'          => 'Anmellen hett Spood',
 'loginsuccess'               => 'Du büst nu as „$1“ bi {{SITENAME}} anmellt.',
 'nosuchuser'                 => 'Den Brukernaam „$1“ gifft dat nich.
+Brukernaams maakt en Ünnerscheed twischen groot un lütt schrevene Bookstaven.
 Kiek de Schrievwies na oder [[Special:UserLogin/signup|mell di as ne’en Bruker an]].',
 'nosuchusershort'            => 'De Brukernaam „<nowiki>$1</nowiki>“ existeert nich. Prööv de Schrievwies.',
 'nouserspecified'            => 'Du musst en Brukernaam angeven',
@@ -585,7 +619,7 @@ Kiek de Schrievwies na oder [[Special:UserLogin/signup|mell di as ne’en Bruker
 'mailmypassword'             => 'En nee Passwoord tostüren',
 'passwordremindertitle'      => 'Nee Passwoort för {{SITENAME}}',
 'passwordremindertext'       => 'Een (IP-Adress $1) hett för en nee Passwoord to’n Anmellen bi {{SITENAME}} beden ($4).
-Dat Passwoord för Bruker „$2“ is nu „$3“. Mell di nu an un änner dien Passwoord.
+En temporär Passwoord för Bruker „$2“ is opstellt worrn un heet „$3“. Wenn du dat wullt hest, denn musst du di nu anmellen un en nee Passwoord wählen. 
 
 Wenn du nich sülvst för en nee Passwoord beden hest, denn bruukst di wegen disse Naricht nich to kümmern un kannst dien oold Passwoord wiederbruken.',
 'noemail'                    => 'Bruker „$1“ hett kene E-Mail-Adress angeven.',
@@ -596,8 +630,8 @@ Ehrdat E-Mails vun annere Brukers över de E-Mail-Funkschoon kamen köönt, mutt
 In de E-Mail steiht, wat du doon musst.',
 'throttled-mailpassword'     => 'Binnen de {{PLURAL:$1|letzte Stünn|letzten $1 Stünnen}} is al mal en neet Passwoort toschickt worrn. Dat disse Funkschoon nich missbruukt warrt, kann blot {{PLURAL:$1|jede Stünn|alle $1 Stünnen}} een Maal en neet Passwoort toschickt warrn.',
 'mailerror'                  => 'Fehler bi dat Sennen vun de E-Mail: $1',
-'acct_creation_throttle_hit' => 'Du hest al $1 Brukerkontos anleggt. Du kannst nich noch mehr anleggen.',
-'emailauthenticated'         => 'Diene E-Mail-Adress is bestätigt worrn: $1.',
+'acct_creation_throttle_hit' => 'Ünner disse IP-Adress hebbt Lüüd in de lesten 24 Stünnen al {{PLURAL:$1|een Brukerkonto|$1 Brukerkontos}} anleggt. Mehr is nich verlöövt in disse Tied. Dorüm köönt Brukers ünner disse IP-Adress eerstmal keen Brukerkonten mehr opstellen.',
+'emailauthenticated'         => 'Diene E-Mail-Adress is bestätigt worrn: $2, $3.',
 'emailnotauthenticated'      => 'Dien E-Mail-Adress is noch nich bestätigt. Disse E-Mail-Funkschonen kannst du eerst bruken, wenn de Adress bestätigt is.',
 'noemailprefs'               => 'Geev en E-Mail-Adress an, dat du disse Funkschonen bruken kannst.',
 'emailconfirmlink'           => 'Nettbreef-Adress bestätigen',
@@ -608,17 +642,25 @@ In de E-Mail steiht, wat du doon musst.',
 'createaccount-text'         => 'Een hett för di op {{SITENAME}} ($4) en Brukerkonto "$2" nee opstellt. Dat automaatsch instellte Passwoort för "$2" is "$3". Du schullst di nu man anmellen un dat Passwoort ännern.
 
 Wenn du dat Brukerkonto gor nich hebben wullst, denn is disse Naricht egaal för di. Kannst ehr eenfach ignoreren.',
+'login-throttled'            => 'Du hest to faken versöcht, di ünner dissen Brukernaam antomellen. Tööv en Stoot, ehrdat du dat noch wedder versöchst.',
 'loginlanguagelabel'         => 'Spraak: $1',
 
 # Password reset dialog
-'resetpass'               => 'Passwoort vun dat Brukerkonto trüchsetten',
-'resetpass_announce'      => 'Du hest di mit en Kood anmellt, de di över E-Mail toschickt worrn is. Dat anmellen aftosluten, söök di nu en neet Passwoord ut:',
-'resetpass_header'        => 'Passwoord trüchsetten',
-'resetpass_submit'        => 'Passwoort instellen un inloggen',
-'resetpass_success'       => 'Dien Passwoort is mit Spood ännert worrn. Warrst nu anmellt …',
-'resetpass_bad_temporary' => 'Passwoort op Tiet gellt nich mehr. Du hest al mit Spood dien Passwoort ännert oder en neet Passwoort op Tiet kregen.',
-'resetpass_forbidden'     => 'Passwöör köönt nich ännert warrn.',
-'resetpass_missing'       => 'Formular leddig',
+'resetpass'                 => 'Passwoord ännern',
+'resetpass_announce'        => 'Du hest di mit en Kood anmellt, de di över E-Mail toschickt worrn is. Dat anmellen aftosluten, söök di nu en neet Passwoord ut:',
+'resetpass_header'          => 'Passwoord trüchsetten',
+'oldpassword'               => 'Oolt Passwoort:',
+'newpassword'               => 'Nee Passwoort',
+'retypenew'                 => 'Nee Passwoort (nochmal)',
+'resetpass_submit'          => 'Passwoort instellen un inloggen',
+'resetpass_success'         => 'Dien Passwoort is mit Spood ännert worrn. Warrst nu anmellt …',
+'resetpass_bad_temporary'   => 'Passwoort op Tiet gellt nich mehr. Du hest al mit Spood dien Passwoort ännert oder en neet Passwoort op Tiet kregen.',
+'resetpass_forbidden'       => 'Passwöör köönt nich ännert warrn.',
+'resetpass-no-info'         => 'Du musst anmellt wesen, dat du disse Sied direkt opropen kannst.',
+'resetpass-submit-loggedin' => 'Passwoord ännern',
+'resetpass-wrong-oldpass'   => 'Dat Passwoord (temporär oder aktuell) gellt nich.
+Villicht hest du dien Passwoord al ännert oder noch wedder en nee temporär Passwoord anfeddert.',
+'resetpass-temp-password'   => 'Temporär Passwoord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fetten Text',
@@ -637,14 +679,14 @@ Wenn du dat Brukerkonto gor nich hebben wullst, denn is disse Naricht egaal för
 'nowiki_tip'      => 'Unformateerten Text',
 'image_sample'    => 'Bispeel.jpg',
 'image_tip'       => 'Bild-Verwies',
-'media_sample'    => 'Bispeel.mp3',
+'media_sample'    => 'Bispeel.ogg',
 'media_tip'       => 'Mediendatei-Verwies',
 'sig_tip'         => 'Diene Signatur mit Tietstempel',
 'hr_tip'          => 'Waagrechte Lien (sporsam bruken)',
 
 # Edit pages
-'summary'                          => 'Grund för’t Ännern',
-'subject'                          => 'Bedrap',
+'summary'                          => 'Grund för’t Ännern:',
+'subject'                          => 'Bedrap:',
 'minoredit'                        => 'Blots lütte Ännern',
 'watchthis'                        => 'Op disse Siet oppassen',
 'savearticle'                      => 'Siet spiekern',
@@ -656,8 +698,8 @@ Wenn du dat Brukerkonto gor nich hebben wullst, denn is disse Naricht egaal för
 'missingsummary'                   => "'''Wohrschau:''' Du hest keen Tosamenfaten angeven, wat du ännert hest. Wenn du nu Spiekern klickst, warrt de Siet ahn Tosamenfaten spiekert.",
 'missingcommenttext'               => 'Geev ünnen en Tosamenfaten in.',
 'missingcommentheader'             => "'''WOHRSCHAU:''' Du hest keen Överschrift in dat Feld „{{MediaWiki:Subject/nds}}“ ingeven. Wenn du noch wedder op „{{MediaWiki:Savearticle/nds}}“ klickst, denn warrt dien Ännern ahn Överschrift spiekert.",
-'summary-preview'                  => 'Vörschau vun’t Tosamenfaten',
-'subject-preview'                  => "Vörschau vun de Reeg ''Tosamenfaten''",
+'summary-preview'                  => 'Vörschau vun’t Tosamenfaten:',
+'subject-preview'                  => "Vörschau vun de Reeg ''Tosamenfaten'':",
 'blockedtitle'                     => 'Bruker is blockt',
 'blockedtext'                      => 'Dien Brukernaam oder diene IP-Adress is vun $1 blockt worrn.
 As Grund is angeven: \'\'$2\'\' (<span class="plainlinks">[{{fullurl:Special:IPBlockList|&action=search&limit=&ip=%23}}$5 Logbookindrag]</span>, de Block-ID is $5).
@@ -706,30 +748,31 @@ Wenn du över de Sperr snacken wist, denn mell di bi $1 oder een vun de [[{{Medi
 Wi mööt hier de numerische IP-Adress verwennen, üm den Bruker to identifizeern.
 So en Adress kann vun verscheden Brukern bruukt warrn.
 Wenn du en anonymen Bruker büst un meenst, dat disse Kommentaren nich an di richt sünd, denn [[Special:UserLogin/signup|legg di en Brukerkonto an]] oder [[Special:UserLogin|mell di an]], dat dat Problem nich mehr dor is.''",
-'noarticletext'                    => 'Dor is opstunns keen Text op disse Siet. Du kannst [[Special:Search/{{PAGENAME}}|na dissen Utdruck in annere Sieden söken]] oder [{{fullurl:{{FULLPAGENAME}}|action=edit}} disse Siet ännern].',
+'noarticletext'                    => 'Dor is opstunns keen Text op disse Sied. Du kannst [[Special:Search/{{PAGENAME}}|na dissen Utdruck in annere Sieden söken]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} in de Logböker söken],
+oder [{{fullurl:{{FULLPAGENAME}}|action=edit}} disse Sied ännern]</span>.',
 'userpage-userdoesnotexist'        => 'Dat Brukerkonto „$1“ gifft dat noch nich. Överlegg, wat du disse Siet würklich nee opstellen/ännern wullt.',
 'clearyourcache'                   => "'''Denk doran:''' No den Spiekern muttst du dien Browser noch seggen, de niege Version to laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''IE:''' ''Strg-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
-'usercssjsyoucanpreview'           => '<strong>Tipp:</strong> Bruuk den Vörschau-Knoop, üm dien nieg CSS/JS vör dat Spiekern to testen.',
+'usercssjsyoucanpreview'           => "'''Tipp:''' Bruuk den Vörschau-Knoop, üm dien nieg CSS/JS vör dat Spiekern to testen.",
 'usercsspreview'                   => "'''Denk doran, dat du blots en Vörschau vun dien CSS ankickst, dat is noch nich spiekert!'''",
 'userjspreview'                    => "'''Denk doran, dat du blots en Vörschau vun dien JS ankiekst, dat is noch nich spiekert!'''",
 'userinvalidcssjstitle'            => "'''Wohrschau:''' Dat gifft keen Skin „$1“. Denk dor an, dat .css- un .js-Sieden  för Brukers mit en lütten Bookstaven anfangen mööt, to’n Bispeel ''{{ns:user}}:Brukernaam/monobook.css'' un nich ''{{ns:user}}:Brukernaam/Monobook.css''.",
 'updated'                          => '(Ännert)',
-'note'                             => '<strong>Wohrschau:</strong>',
-'previewnote'                      => '<strong>Dit is blots en Vörschau, de Siet is noch nich spiekert!</strong>',
+'note'                             => "'''Wohrschau:'''",
+'previewnote'                      => "'''Dit is blots en Vörschau, de Siet is noch nich spiekert!'''",
 'previewconflict'                  => 'Disse Vörschau wiest den Inholt vun dat Textfeld baven; so warrt de Siet utseihn, wenn du nu spiekerst.',
-'session_fail_preview'             => '<strong>Deit uns leed! Wi kunnen dien Ännern nich spiekern. Diene Sitzungsdaten weren weg.
-Versöök dat noch wedder. Wenn dat noch jümmer nich geiht, denn versöök di [[Special:UserLogout|aftomellen]] un denn wedder antomellen.</strong>',
-'session_fail_preview_html'        => "<strong>Deit uns leed! Wi kunnen dien Ännern nich spiekern, de Sitzungsdaten sünd verloren gahn.</strong>
+'session_fail_preview'             => "'''Deit uns leed! Wi kunnen dien Ännern nich spiekern. Diene Sitzungsdaten weren weg.
+Versöök dat noch wedder. Wenn dat noch jümmer nich geiht, denn versöök di [[Special:UserLogout|aftomellen]] un denn wedder antomellen.'''",
+'session_fail_preview_html'        => "'''Deit uns leed! Wi kunnen dien Ännern nich spiekern, de Sitzungsdaten sünd verloren gahn.'''
 
 ''In {{SITENAME}} is dat Spiekern vun rein HTML verlöövt, dorvun is de Vörschau utblennt, dat JavaScript-Angrepen nich mööglich sünd.''
 
-<strong>Versöök dat noch wedder un klick noch wedder op „Siet spiekern“. Wenn dat Problem noch jümmer dor is, [[Special:UserLogout|mell di af]] un denn wedder an.</strong>",
-'token_suffix_mismatch'            => '<strong>Dien Ännern sünd afwiest worrn. Dien Browser hett welk Teken in de Kuntrull-Tekenreeg kaputt maakt.
+'''Versöök dat noch wedder un klick noch wedder op „Siet spiekern“. Wenn dat Problem noch jümmer dor is, [[Special:UserLogout|mell di af]] un denn wedder an.'''",
+'token_suffix_mismatch'            => "'''Dien Ännern sünd afwiest worrn. Dien Browser hett welk Teken in de Kuntrull-Tekenreeg kaputt maakt.
 Wenn dat so spiekert warrt, kann dat angahn, dat noch mehr Teken in de Sied kaputt gaht.
-Dat kann to’n Bispeel dor vun kamen, dat du en anonymen Proxy-Deenst bruukst, de wat verkehrt maakt.</strong>',
+Dat kann to’n Bispeel dor vun kamen, dat du en anonymen Proxy-Deenst bruukst, de wat verkehrt maakt.'''",
 'editing'                          => 'Ännern vun $1',
 'editingsection'                   => 'Ännern vun $1 (Afsatz)',
-'editingcomment'                   => 'Ännern vun $1 (Kommentar)',
+'editingcomment'                   => 'Ännern vun $1 (nee Afsnidd)',
 'editconflict'                     => 'Konflikt bi dat Bearbeiden: $1',
 'explainconflict'                  => 'En anner Bruker hett disse Siet ännert, no de Tied dat du anfungen hest, de Siet to bearbeiden.
 Dat Textfeld baven wiest de aktuelle Siet.
@@ -740,27 +783,28 @@ Föög diene Ännern in dat Textfeld baven in.
 'yourtext'                         => 'Dien Text',
 'storedversion'                    => 'Spiekerte Version',
 'nonunicodebrowser'                => "'''Wohrschau: Dien Browser kann keen Unicode, bruuk en annern Browser, wenn du en Siet ännern wist.'''",
-'editingold'                       => '<strong>Wohrscho: Du bearbeidst en ole Version vun disse Siet.
-Wenn du spiekerst, warrn alle niegeren Versionen överschrieven.</strong>',
+'editingold'                       => "'''Wohrscho: Du bearbeidst en ole Version vun disse Siet.
+Wenn du spiekerst, warrn alle niegeren Versionen överschrieven.'''",
 'yourdiff'                         => 'Ãœnnerscheed',
-'copyrightwarning'                 => 'Bitte pass op, dat all diene Bidrääg to {{SITENAME}} so ansehn warrt, dat se ünner de $2 staht (kiek op $1 för de Details). Wenn du nich willst, dat diene Bidrääg ännert un verdeelt warrt, denn schallst du hier man nix bidragen. Du seggst ok to, dat du dat hier sülvst schreven hest, oder dat du dat ut en fre’e Born (to’n Bispeel gemeenfree oder so wat in disse Oort) kopeert hest.
-<strong>Stell hier nix rin, wat ünner Oorheverrecht steiht, wenn de, de dat Oorheverrecht hett, di dorto keen Verlööf geven hett!</strong>',
+'copyrightwarning'                 => "Bitte pass op, dat all diene Bidrääg to {{SITENAME}} so ansehn warrt, dat se ünner de $2 staht (kiek op $1 för de Details). Wenn du nich willst, dat diene Bidrääg ännert un verdeelt warrt, denn schallst du hier man nix bidragen. Du seggst ok to, dat du dat hier sülvst schreven hest, oder dat du dat ut en fre’e Born (to’n Bispeel gemeenfree oder so wat in disse Oort) kopeert hest.
+'''Stell hier nix rin, wat ünner Oorheverrecht steiht, wenn de, de dat Oorheverrecht hett, di dorto keen Verlööf geven hett!'''",
 'copyrightwarning2'                => "Dien Text, de du op {{SITENAME}} stellen wullst, könnt vun elkeen ännert oder wegmaakt warrn.
 Wenn du dat nich wullst, dröffst du dien Text hier nich apentlich maken.<br />
 
 Du bestätigst ok, dat du den Text sülvst schreven hest oder ut en „Public Domain“-Born oder en annere fre'e Born kopeert hest (Kiek ok $1 för Details).
-<strong>Kopeer kene Warken, de enen Oorheverrecht ünnerliggt, ahn Verlööv vun de Copyright-Inhebbers!</strong>",
-'longpagewarning'                  => '<strong>Wohrscho: Disse Siet is $1 kB groot; en poor Browser köönt Probleme hebben, Sieten to bearbeiden, de grötter as 32 kB sünd.
-Bedenk of disse Siet vilicht in lüttere Afsnitten opdeelt warrn kann.</strong>',
+'''Kopeer kene Warken, de enen Oorheverrecht ünnerliggt, ahn Verlööv vun de Copyright-Inhebbers!'''",
+'longpagewarning'                  => "'''Wohrscho: Disse Siet is $1 kB groot; en poor Browser köönt Probleme hebben, Sieten to bearbeiden, de grötter as 32 kB sünd.
+Bedenk of disse Siet vilicht in lüttere Afsnitten opdeelt warrn kann.'''",
 'longpageerror'                    => "'''Fehler: Dien Text is $1 Kilobytes lang. Dat is länger as dat Maximum vun $2 Kilobytes. Kann den Text nich spiekern.'''",
-'readonlywarning'                  => '<strong>Wohrscho: De Datenbank is wiel dat Ännern vun de
-Siet för Pleegarbeiden sparrt worrn, so dat du de Siet en Stoot nich
-spiekern kannst. Seker di den Text un versöök later weer de Ännern to spiekern.</strong>',
-'protectedpagewarning'             => '<strong>Wohrscho: Disse Siet is sparrt worrn, so dat blots
-Bruker mit Sysop-Rechten doran arbeiden könnt.</strong>',
+'readonlywarning'                  => "'''Wohrscho: De Datenbank is för Pleegarbeiden sparrt worrn, so dat du de Sied en Stoot nich
+spiekern kannst. Seker di den Text un versöök dat later noch wedder.'''
+
+As Grund is angeven: $1",
+'protectedpagewarning'             => "'''Wohrscho: Disse Siet is sparrt worrn, so dat blots
+Bruker mit Sysop-Rechten doran arbeiden könnt.'''",
 'semiprotectedpagewarning'         => "'''Henwies:''' Disse Siet is sparrt. Blots anmellt Brukers köönt de Siet ännern.",
 'cascadeprotectedwarning'          => "'''Wohrschau:''' Disse Siet is so sparrt, dat blot Brukers mit Admin-Status ehr ännern köönt. Dat liggt dor an, dat se in disse {{PLURAL:$1|kaskadensparrte Siet|kaskadensparrten Sieden}} inbunnen is:",
-'titleprotectedwarning'            => '<strong>WOHRSCHAU: Disse Siet is schuult, dat blot welk Brukergruppen ehr anleggen köönt.</strong>',
+'titleprotectedwarning'            => "'''WOHRSCHAU: Disse Sied is schuult, dat blot welk [[Special:ListGroupRights|Brukergruppen]] ehr anleggen köönt.'''",
 'templatesused'                    => 'Vörlagen de in disse Siet bruukt warrt:',
 'templatesusedpreview'             => 'Vörlagen de in disse Vörschau bruukt warrt:',
 'templatesusedsection'             => 'Vörlagen de in dissen Afsnitt bruukt warrt:',
@@ -778,20 +822,30 @@ Bruker mit Sysop-Rechten doran arbeiden könnt.</strong>',
 
 Överlegg genau, wat du würklich de Siet nee opstellen wist.
 Dat du bescheed weetst, worüm de Siet vörher wegsmeten worrn is, hier nu de Uttog ut dat Lösch-Logbook:",
+'deleted-notice'                   => 'De Sied is wegdaan worrn. Wat nu kummt, is en Deel ut dat Lösch-Logbook för disse Sied.',
+'deletelog-fulllog'                => 'Kumplett Logbook ankieken',
+'edit-hook-aborted'                => 'Ännern is ahn angeven Grund vun en Hook afbraken worrn.',
+'edit-gone-missing'                => 'De Sied kunn nich aktuell maakt warrn.
+Schient so, as wenn se wegdaan worrn is.',
+'edit-conflict'                    => 'Konflikt bi’t Bearbeiden.',
+'edit-no-change'                   => 'Dien Ännern is nich afspiekert worrn, denn dor hett sik nix an’n Text ännert.',
+'edit-already-exists'              => 'Kunn keen ne’e Sied opstellen, dat gifft ehr al.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Wohrschau: Disse Sied bruukt to veel opwännige Parserfunkschonen.
 
-Nu sünd dor $1, wesen dröfft dat blot $2.',
+Nu {{PLURAL:$1|is dor een|sünd dor $1}}, wesen {{PLURAL:$2|dröff dat blot een|dröfft dat blot $2}}.',
 'expensive-parserfunction-category'       => 'Sieden, de toveel opwännige Parserfunkschonen bruukt',
 'post-expand-template-inclusion-warning'  => 'Wohrschau: De Grött vun inföögte Vörlagen is to groot, welk Vörlagen köönt nich inföögt warrn.',
 'post-expand-template-inclusion-category' => 'Sieden, de över de Maximumgrött för inbunnene Sieden rövergaht',
 'post-expand-template-argument-warning'   => 'Wohrschau: Disse Sied bruukt opminnst een Parameter in ene Vörlaag, de to groot is, wenn’t wiest warrt. Disse Parameters warrt weglaten.',
 'post-expand-template-argument-category'  => 'Sieden mit utlaten Vörlaagargmenten',
+'parser-template-loop-warning'            => 'Vörlagenslööf funnen: [[$1]]',
+'parser-template-recursion-depth-warning' => 'över de Rekursionsdeepdengrenz för Vörlagen rövergahn ($1)',
 
 # "Undo" feature
 'undo-success' => 'De Ännern kann trüchdreiht warrn. Vergliek ünnen de Versionen, dat ok allens richtig is, un spieker de Sied denn af.',
-'undo-failure' => '<span class="error">Kunn de Siet nich op de vörige Version trüchdreihn. De Afsnitt is twischendör al wedder ännert worrn.</span>',
+'undo-failure' => 'Kunn de Siet nich op de vörige Version trüchdreihn. De Afsnitt is twischendör al wedder ännert worrn.',
 'undo-norev'   => 'De Ännern kunn nich trüchdreiht warrn, de gifft dat nich oder is wegsmeten worrn.',
 'undo-summary' => 'Ännern $1 vun [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskuschoon]]) trüchdreiht.',
 
@@ -802,34 +856,34 @@ Nu sünd dor $1, wesen dröfft dat blot $2.',
 De Grund weer: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Logbook för disse Siet',
-'nohistory'           => 'Disse Siet hett keen Vörgeschicht.',
-'revnotfound'         => 'Kene fröheren Versionen funnen',
-'revnotfoundtext'     => 'De Version vun disse Siet, no de du söökst, kunn nich funnen warrn. Prööv de URL vun disse Siet.',
-'currentrev'          => 'Aktuelle Version',
-'revisionasof'        => 'Version vun’n $1',
-'revision-info'       => '<div id="viewingold-warning" style="background: #ffbdbd; border: 1px solid #BB7979; font-weight: bold; padding: .5em 1em;">
+'viewpagelogs'           => 'Logbook för disse Siet',
+'nohistory'              => 'Disse Siet hett keen Vörgeschicht.',
+'currentrev'             => 'Aktuelle Version',
+'currentrev-asof'        => 'Aktuelle Version vun’n $1',
+'revisionasof'           => 'Version vun’n $1',
+'revision-info'          => '<div id="viewingold-warning" style="background: #ffbdbd; border: 1px solid #BB7979; font-weight: bold; padding: .5em 1em;">
 Dit is en ole Version vun disse Siet, so as $2 de $1 ännert hett. De Version kann temlich stark vun de <a href="{{FULLURL:{{FULLPAGENAME}}}}" title="{{FULLPAGENAME}}">aktuelle Version</a> afwieken.
-</div>',
-'previousrevision'    => 'Nächstöllere Version→',
-'nextrevision'        => 'Ne’ere Version →',
-'currentrevisionlink' => 'aktuelle Version',
-'cur'                 => 'Aktuell',
-'next'                => 'tokamen',
-'last'                => 'vörige',
-'page_first'          => 'Anfang',
-'page_last'           => 'Enn',
-'histlegend'          => "Ünnerscheed-Utwahl: De Boxen vun de wünschten
+</div>', # Additionally available: $3: revision id
+'previousrevision'       => 'Nächstöllere Version→',
+'nextrevision'           => 'Ne’ere Version →',
+'currentrevisionlink'    => 'aktuelle Version',
+'cur'                    => 'Aktuell',
+'next'                   => 'tokamen',
+'last'                   => 'vörige',
+'page_first'             => 'Anfang',
+'page_last'              => 'Enn',
+'histlegend'             => "Ünnerscheed-Utwahl: De Boxen vun de wünschten
 Versionen markeern un 'Enter' drücken oder den Knoop nerrn klicken/alt-v.<br />
 Legende:
 (Aktuell) = Ãœnnerscheed to de aktuelle Version,
 (Letzte) = Ünnerscheed to de vörige Version,
 L = Lütte Ännern",
-'deletedrev'          => '[wegsmeten]',
-'histfirst'           => 'Öllste',
-'histlast'            => 'Ne’este',
-'historysize'         => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
-'historyempty'        => '(leddig)',
+'history-fieldset-title' => 'Versionsgeschicht dörkieken',
+'deletedrev'             => '[wegsmeten]',
+'histfirst'              => 'Öllste',
+'histlast'               => 'Ne’este',
+'historysize'            => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
+'historyempty'           => '(leddig)',
 
 # Revision feed
 'history-feed-title'          => 'Versionsgeschicht',
@@ -912,6 +966,7 @@ Seh to, dat de Versionsgeschicht vun’n Artikel vun de Historie her bi de Reeg
 'mergehistory-invalid-destination' => 'Zielsiet mutt en gülligen Siedennaam wesen.',
 'mergehistory-autocomment'         => '„[[:$1]]“ tohoopföhrt mit „[[:$2]]“',
 'mergehistory-comment'             => '„[[:$1]]“ tohoopföhrt mit „[[:$2]]“: $3',
+'mergehistory-same-destination'    => 'De Sied, vun de schaven warrt un op de schaven warrt, dröfft nich desülve wesen',
 
 # Merge log
 'mergelog'           => 'Tohoopföhr-Logbook',
@@ -924,121 +979,202 @@ Seh to, dat de Versionsgeschicht vun’n Artikel vun de Historie her bi de Reeg
 'difference'              => '(Ãœnnerscheed twischen de Versionen)',
 'lineno'                  => 'Reeg $1:',
 'compareselectedversions' => 'Ünnerscheed twischen den utwählten Versionen wiesen',
+'visualcomparison'        => 'Visuell Vergliek',
+'wikicodecomparison'      => 'Wikitext-Vergliek',
 'editundo'                => 'rutnehmen',
 'diff-multi'              => '(Twischen de beiden Versionen {{PLURAL:$1|liggt noch ene Twischenversion|doot noch $1 Twischenversionen liggen}}.)',
+'diff-movedto'            => 'schaven na $1',
+'diff-styleadded'         => '$1-Stil toföögt',
+'diff-added'              => '$1 toföögt',
+'diff-changedto'          => 'ännert na $1',
+'diff-movedoutof'         => 'schaven ut $1',
+'diff-styleremoved'       => '$1-Stil rutnahmen',
+'diff-removed'            => '$1 rutnahmen',
+'diff-changedfrom'        => 'ännert vun $1',
+'diff-src'                => 'Born',
+'diff-withdestination'    => 'mit Teel $1',
+'diff-with'               => '&#32;mit $1 $2',
+'diff-with-final'         => '&#32;un $1 $2',
+'diff-width'              => 'Breed',
+'diff-height'             => 'Hööchd',
+'diff-p'                  => "en '''Afsatz'''",
+'diff-blockquote'         => "en '''Block'''",
+'diff-h1'                 => "en '''Överschrift (Level 1)'''",
+'diff-h2'                 => "en '''Överschrift (Level 2)'''",
+'diff-h3'                 => "en '''Överschrift (Level 3)'''",
+'diff-h4'                 => "en '''Överschrift (Level 4)'''",
+'diff-h5'                 => "en '''Överschrift (Level 5)'''",
+'diff-pre'                => "en '''vörformateerten Block'''",
+'diff-div'                => "en '''Blockelement'''",
+'diff-ul'                 => "en '''List ahn Nummern'''",
+'diff-ol'                 => "en '''List mit Nummern'''",
+'diff-li'                 => "en '''Listenindrag'''",
+'diff-table'              => "en '''Tabell'''",
+'diff-tbody'              => "en '''Tabelleninholt'''",
+'diff-tr'                 => "en '''Reeg'''",
+'diff-td'                 => "en '''Zell'''",
+'diff-th'                 => "en '''Kopp-Indrag'''",
+'diff-br'                 => "en '''ne’e Reeg'''",
+'diff-hr'                 => "en '''waagrecht Lien'''",
+'diff-code'               => "en '''Koodblock'''",
+'diff-dl'                 => "en '''List vun Definitschonen'''",
+'diff-dt'                 => "en '''Utdruck, de defineert warrt'''",
+'diff-dd'                 => "en '''Definitschoon'''",
+'diff-input'              => "en '''Formularfeld'''",
+'diff-form'               => "en '''Formular'''",
+'diff-img'                => "en '''Bild'''",
+'diff-span'               => "en '''Span'''",
+'diff-a'                  => "en '''Lenk'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''fett'''",
+'diff-strong'             => "'''ruthoven'''",
+'diff-em'                 => "'''Nadruck'''",
+'diff-font'               => "'''Schriftoort'''",
+'diff-big'                => "'''groot'''",
+'diff-del'                => "'''wegdaan'''",
+'diff-tt'                 => "'''faste Breed'''",
+'diff-sub'                => "'''deepstellt'''",
+'diff-sup'                => "'''hoochstellt'''",
+'diff-strike'             => "'''dörstreken'''",
 
 # Search results
-'searchresults'             => 'Söökresultaten',
-'searchresulttext'          => 'För mehr Informatschonen över {{SITENAME}}, kiek [[{{MediaWiki:Helppage}}|{{SITENAME}} dörsöken]].',
-'searchsubtitle'            => 'För de Söökanfraag „[[:$1]]“',
-'searchsubtitleinvalid'     => 'För de Söökanfraag „$1“',
-'noexactmatch'              => 'Gifft kene Siet mit dissen Naam. Bruuk de Vulltextsöök oder legg de Siet [[:$1|nee]] an.',
-'noexactmatch-nocreate'     => "'''Gifft kene Siet mit’n Titel „$1“.'''",
-'toomanymatches'            => 'To veel Sieden funnen för de Söök, versöök en annere Affraag.',
-'titlematches'              => 'Övereenstimmen mit Överschriften',
-'notitlematches'            => 'Kene Övereenstimmen',
-'textmatches'               => 'Övereenstimmen mit Texten',
-'notextmatches'             => 'Kene Övereenstimmen',
-'prevn'                     => 'vörige $1',
-'nextn'                     => 'tokamen $1',
-'viewprevnext'              => 'Wies ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|een Woort|$2 Wöör}})',
-'search-result-score'       => 'Relevanz: $1 %',
-'search-redirect'           => '(Redirect $1)',
-'search-section'            => '(Afsnitt $1)',
-'search-suggest'            => 'Hest du „$1“ meent?',
-'search-interwiki-caption'  => 'Süsterprojekten',
-'search-interwiki-default'  => '$1 Resultaten:',
-'search-interwiki-more'     => '(mehr)',
-'search-mwsuggest-enabled'  => 'mit Vörslääg',
-'search-mwsuggest-disabled' => 'kene Vörslääg',
-'search-relatedarticle'     => 'Verwandt',
-'mwsuggest-disable'         => 'Vörslääg per Ajax utstellen',
-'searchrelated'             => 'verwandt',
-'searchall'                 => 'all',
-'showingresults'            => "Hier {{PLURAL:$1|is een Resultat|sünd '''$1''' Resultaten}}, anfungen mit #'''$2'''.",
-'showingresultsnum'         => "Hier {{PLURAL:$3|is een Resultat|sünd '''$3''' Resultaten}}, anfungen mit #'''$2'''.",
-'showingresultstotal'       => "Dit {{PLURAL:$3|is de Fundstell '''$1''' vun '''$3'''|sünd de Fundstellen '''$1–$2''' vun '''$3'''}}",
-'nonefound'                 => '<strong>Henwies</strong>:
-Söökanfragen ahn Spood hebbt faken de Oorsaak, dat no kotte oder gemeene Wöör söökt warrt, de nich indizeert sünd.',
-'powersearch'               => 'Betere Söök',
-'powersearch-legend'        => 'Betere Söök',
-'powersearch-ns'            => 'Söök in Naamrüüm:',
-'powersearch-redir'         => 'Redirects wiesen',
-'powersearch-field'         => 'Söök na:',
-'search-external'           => 'Externe Söök',
-'searchdisabled'            => '<p>De Vulltextsöök is wegen Överlast en Stoot deaktiveert. In disse Tied kannst du disse Google-Söök verwennen,
+'searchresults'                    => 'Söökresultaten',
+'searchresults-title'              => 'Söökresultaten för „$1“',
+'searchresulttext'                 => 'För mehr Informatschonen över {{SITENAME}}, kiek [[{{MediaWiki:Helppage}}|{{SITENAME}} dörsöken]].',
+'searchsubtitle'                   => 'Du hest na „[[:$1]]“ söcht ([[Special:Prefixindex/$1|all Sieden, de mit „$1“ anfangt]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|all Sieden, de na „$1“ wiest]])',
+'searchsubtitleinvalid'            => 'För de Söökanfraag „$1“',
+'noexactmatch'                     => 'Gifft kene Siet mit dissen Naam. Bruuk de Vulltextsöök oder legg de Siet [[:$1|nee]] an.',
+'noexactmatch-nocreate'            => "'''Gifft kene Siet mit’n Titel „$1“.'''",
+'toomanymatches'                   => 'To veel Sieden funnen för de Söök, versöök en annere Affraag.',
+'titlematches'                     => 'Övereenstimmen mit Överschriften',
+'notitlematches'                   => 'Kene Övereenstimmen',
+'textmatches'                      => 'Övereenstimmen mit Texten',
+'notextmatches'                    => 'Kene Övereenstimmen',
+'prevn'                            => 'vörige $1',
+'nextn'                            => 'tokamen $1',
+'viewprevnext'                     => 'Wies ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Söökoptionen',
+'searchmenu-exists'                => "* Sied '''[[$1]]'''",
+'searchmenu-new'                   => "'''Stell de Sied „[[:$1]]“ in dit Wiki nee op!'''",
+'searchhelp-url'                   => 'Help:Hülp',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Wies Sieden, de mit disse Bookstaven anfangt]]',
+'searchprofile-articles'           => 'Inholtsieden',
+'searchprofile-articles-and-proj'  => 'Inholt- un Projektsieden',
+'searchprofile-project'            => 'Projektsieden',
+'searchprofile-images'             => 'Datein',
+'searchprofile-everything'         => 'Allens',
+'searchprofile-advanced'           => 'Verwiedert',
+'searchprofile-articles-tooltip'   => 'Söken in $1',
+'searchprofile-project-tooltip'    => 'Söken in $1',
+'searchprofile-images-tooltip'     => 'Na Datein söken',
+'searchprofile-everything-tooltip' => 'Allen Inholt dörsöken (inklusiv Diskuschoonssieden)',
+'searchprofile-advanced-tooltip'   => 'Söök in angevene Naamrüüm',
+'prefs-search-nsdefault'           => 'Standard-Naamrüüm:',
+'prefs-search-nscustom'            => 'Söök in angevene Naamrüüm:',
+'search-result-size'               => '$1 ({{PLURAL:$2|een Woort|$2 Wöör}})',
+'search-result-score'              => 'Relevanz: $1 %',
+'search-redirect'                  => '(Redirect $1)',
+'search-section'                   => '(Afsnitt $1)',
+'search-suggest'                   => 'Hest du „$1“ meent?',
+'search-interwiki-caption'         => 'Süsterprojekten',
+'search-interwiki-default'         => '$1 Resultaten:',
+'search-interwiki-more'            => '(mehr)',
+'search-mwsuggest-enabled'         => 'mit Vörslääg',
+'search-mwsuggest-disabled'        => 'kene Vörslääg',
+'search-relatedarticle'            => 'Verwandt',
+'mwsuggest-disable'                => 'Vörslääg per Ajax utstellen',
+'searchrelated'                    => 'verwandt',
+'searchall'                        => 'all',
+'showingresults'                   => "Hier {{PLURAL:$1|is een Resultat|sünd '''$1''' Resultaten}}, anfungen mit #'''$2'''.",
+'showingresultsnum'                => "Hier {{PLURAL:$3|is een Resultat|sünd '''$3''' Resultaten}}, anfungen mit #'''$2'''.",
+'showingresultstotal'              => "Dit {{PLURAL:$4|is de Fundstell '''$1''' vun '''$3'''|sünd de Fundstellen '''$1–$2''' vun '''$3'''}}",
+'nonefound'                        => "'''Henwies''': Na de Standardinstellung warrt blot en poor Naamrüüm dörsöcht.
+Du kannst dat Woord ''all:'' vör dien Söökwoord setten, dat all Naamrüüm (ok Diskuschoonssieden, Vörlagen usw.) dörsöcht warrt. Dat sülve geit mit de Naams vun de enkelten Naamrüüm.",
+'search-nonefound'                 => 'För de Söökanfraag geev dat keen Resultaten.',
+'powersearch'                      => 'Betere Söök',
+'powersearch-legend'               => 'Betere Söök',
+'powersearch-ns'                   => 'Söök in Naamrüüm:',
+'powersearch-redir'                => 'Redirects wiesen',
+'powersearch-field'                => 'Söök na:',
+'search-external'                  => 'Externe Söök',
+'searchdisabled'                   => '<p>De Vulltextsöök is wegen Överlast en Stoot deaktiveert. In disse Tied kannst du disse Google-Söök verwennen,
 de aver nich jümmer den aktuellsten Stand weerspegelt.<p>',
 
 # Preferences page
-'preferences'              => 'Instellen',
-'mypreferences'            => 'För mi Instellen',
-'prefs-edits'              => 'Wo faken du in dit Wiki Sieden ännert hest:',
-'prefsnologin'             => 'Nich anmellt',
-'prefsnologintext'         => 'Du musst <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} anmellt]</span> wesen, dat du dien Instellen ännern kannst.',
-'prefsreset'               => 'Instellen sünd op Standard trüchsett.',
-'qbsettings'               => 'Siedenliest',
-'qbsettings-none'          => 'Keen',
-'qbsettings-fixedleft'     => 'Links, fast',
-'qbsettings-fixedright'    => 'Rechts, fast',
-'qbsettings-floatingleft'  => 'Links, sweven',
-'qbsettings-floatingright' => 'Rechts, sweven',
-'changepassword'           => 'Passwoort ännern',
-'skin'                     => 'Utsehn vun de Steed',
-'math'                     => 'TeX',
-'dateformat'               => 'Datumsformat',
-'datedefault'              => 'Standard',
-'datetime'                 => 'Datum un Tiet',
-'math_failure'             => 'Parser-Fehler',
-'math_unknown_error'       => 'Unbekannten Fehler',
-'math_unknown_function'    => 'Unbekannte Funktschoon',
-'math_lexing_error'        => "'Lexing'-Fehler",
-'math_syntax_error'        => 'Syntaxfehler',
-'math_image_error'         => 'dat Konverteren na PNG harr keen Spood.',
-'math_bad_tmpdir'          => 'Kann dat Temporärverteken för mathematsche Formeln nich anleggen oder beschrieven.',
-'math_bad_output'          => 'Kann dat Teelverteken för mathematsche Formeln nich anleggen oder beschrieven.',
-'math_notexvc'             => 'Dat texvc-Programm kann nich funnen warrn. Kiek ok math/README.',
-'prefs-personal'           => 'Brukerdaten',
-'prefs-rc'                 => 'Letzte Ännern un Wiesen vun kotte Sieten',
-'prefs-watchlist'          => 'Oppasslist',
-'prefs-watchlist-days'     => 'Maximumtall Daag, de in de Oppasslist wiest warrt:',
-'prefs-watchlist-edits'    => 'Maximumtall Daag, de in de verwiederte Oppasslist wiest warrt:',
-'prefs-misc'               => 'Verscheden Kraam',
-'saveprefs'                => 'Spiekern',
-'resetprefs'               => 'Trüchsetten',
-'oldpassword'              => 'Oolt Passwoort:',
-'newpassword'              => 'Nee Passwoort',
-'retypenew'                => 'Nee Passwoort (nochmal)',
-'textboxsize'              => 'Grött vun’t Textfeld',
-'rows'                     => 'Regen',
-'columns'                  => 'Spalten',
-'searchresultshead'        => 'Söökresultaten',
-'resultsperpage'           => 'Treffer pro Siet',
-'contextlines'             => 'Lienen pro Treffer',
-'contextchars'             => 'Teken je Reeg',
-'stub-threshold'           => 'Grött ünner de Lenken op <a href="#" class="stub">Stubbens un lütte Sieden</a> farvlich kenntekent warrn schöölt (in Bytes):',
-'recentchangesdays'        => 'Daag, de de List vun de „Ne’esten Ännern“ wiesen schall:',
-'recentchangescount'       => 'Antall „Letzte Ännern“',
-'savedprefs'               => 'Allens spiekert.',
-'timezonelegend'           => 'Tietrebeet',
-'timezonetext'             => 'Giff de Antall vun de Stünnen an, de twüschen dien Tiedrebeet un UTC liggen.',
-'localtime'                => 'Oortstied',
-'timezoneoffset'           => 'Ãœnnerscheed',
-'servertime'               => 'Tiet op den Server',
-'guesstimezone'            => 'Ut den Browser övernehmen',
-'allowemail'               => 'Nettbreven vun annere Brukers annehmen',
-'prefs-searchoptions'      => 'Söökopschonen',
-'prefs-namespaces'         => 'Naamrüüm',
-'defaultns'                => 'In disse Naamrüüm schall standardmatig söökt warrn:',
-'default'                  => 'Standard',
-'files'                    => 'Datein',
+'preferences'               => 'Instellen',
+'mypreferences'             => 'För mi Instellen',
+'prefs-edits'               => 'Wo faken du in dit Wiki Sieden ännert hest:',
+'prefsnologin'              => 'Nich anmellt',
+'prefsnologintext'          => 'Du musst <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} anmellt]</span> wesen, dat du dien Instellen ännern kannst.',
+'prefsreset'                => 'Instellen sünd op Standard trüchsett.',
+'qbsettings'                => 'Siedenliest',
+'qbsettings-none'           => 'Keen',
+'qbsettings-fixedleft'      => 'Links, fast',
+'qbsettings-fixedright'     => 'Rechts, fast',
+'qbsettings-floatingleft'   => 'Links, sweven',
+'qbsettings-floatingright'  => 'Rechts, sweven',
+'changepassword'            => 'Passwoort ännern',
+'skin'                      => 'Utsehn vun de Steed',
+'skin-preview'              => 'Vörschau',
+'math'                      => 'TeX',
+'dateformat'                => 'Datumsformat',
+'datedefault'               => 'Standard',
+'datetime'                  => 'Datum un Tiet',
+'math_failure'              => 'Parser-Fehler',
+'math_unknown_error'        => 'Unbekannten Fehler',
+'math_unknown_function'     => 'Unbekannte Funktschoon',
+'math_lexing_error'         => "'Lexing'-Fehler",
+'math_syntax_error'         => 'Syntaxfehler',
+'math_image_error'          => 'dat Konverteren na PNG harr keen Spood.',
+'math_bad_tmpdir'           => 'Kann dat Temporärverteken för mathematsche Formeln nich anleggen oder beschrieven.',
+'math_bad_output'           => 'Kann dat Teelverteken för mathematsche Formeln nich anleggen oder beschrieven.',
+'math_notexvc'              => 'Dat texvc-Programm kann nich funnen warrn. Kiek ok math/README.',
+'prefs-personal'            => 'Brukerdaten',
+'prefs-rc'                  => 'Letzte Ännern un Wiesen vun kotte Sieten',
+'prefs-watchlist'           => 'Oppasslist',
+'prefs-watchlist-days'      => 'Maximumtall Daag, de in de Oppasslist wiest warrt:',
+'prefs-watchlist-days-max'  => '(Maximal 7 Daag)',
+'prefs-watchlist-edits'     => 'Maximumtall Daag, de in de verwiederte Oppasslist wiest warrt:',
+'prefs-watchlist-edits-max' => '(Maximaltall: 1000)',
+'prefs-misc'                => 'Verscheden Kraam',
+'prefs-resetpass'           => 'Passwoord ännern',
+'saveprefs'                 => 'Spiekern',
+'resetprefs'                => 'Trüchsetten',
+'textboxsize'               => 'Grött vun’t Textfeld',
+'prefs-edit-boxsize'        => 'Grött vun dat Finster för Ännern.',
+'rows'                      => 'Regen',
+'columns'                   => 'Spalten',
+'searchresultshead'         => 'Söökresultaten',
+'resultsperpage'            => 'Treffer pro Siet',
+'contextlines'              => 'Lienen pro Treffer',
+'contextchars'              => 'Teken je Reeg',
+'stub-threshold'            => 'Grött ünner de Lenken op <a href="#" class="stub">Stubbens un lütte Sieden</a> farvlich kenntekent warrn schöölt (in Bytes):',
+'recentchangesdays'         => 'Daag, de de List vun de „Ne’esten Ännern“ wiesen schall:',
+'recentchangesdays-max'     => '(Maximal $1 {{PLURAL:$1|Dag|Daag}})',
+'recentchangescount'        => 'Antall Ännern, de bi Letzte Ännern, in Versionsgeschichten un in Logböker wiest warrt:',
+'savedprefs'                => 'Allens spiekert.',
+'timezonelegend'            => 'Tietrebeet',
+'timezonetext'              => 'Giff de Antall vun de Stünnen an, de twüschen dien Tiedrebeet un UTC liggen.',
+'localtime'                 => 'Oortstied:',
+'timezoneselect'            => 'Tiedzoon:',
+'timezoneuseserverdefault'  => 'Tied op’n Server bruken',
+'timezoneuseoffset'         => 'Anners (Ãœnnerscheed angeven)',
+'timezoneoffset'            => 'Ünnerscheed¹:',
+'servertime'                => 'Tied op den Server:',
+'guesstimezone'             => 'Ut den Browser övernehmen',
+'allowemail'                => 'Nettbreven vun annere Brukers annehmen',
+'prefs-searchoptions'       => 'Söökopschonen',
+'prefs-namespaces'          => 'Naamrüüm',
+'defaultns'                 => 'In disse Naamrüüm schall standardmatig söökt warrn:',
+'default'                   => 'Standard',
+'files'                     => 'Datein',
 
 # User rights
 'userrights'                  => 'Brukerrechten inrichten', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Brukergruppen verwalten',
 'userrights-user-editname'    => 'Brukernaam ingeven:',
 'editusergroup'               => 'Brukergruppen bearbeiden',
-'editinguser'                 => "Ännern vun Brukerrechten vun '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ännern vun Brukerrechten vun '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Brukergruppen ännern',
 'saveusergroups'              => 'Brukergruppen spiekern',
 'userrights-groupsmember'     => 'Liddmaat vun:',
@@ -1086,6 +1222,8 @@ de aver nich jümmer den aktuellsten Stand weerspegelt.<p>',
 'right-minoredit'            => 'Ännern as lütt marken',
 'right-move'                 => 'Sieden schuven',
 'right-move-subpages'        => 'Sieden tohoop mit Ãœnnersieden schuven',
+'right-move-rootuserpages'   => 'Hööft-Brukersieden schuven',
+'right-movefile'             => 'Datein schuven',
 'right-suppressredirect'     => 'Bi dat Schuven keen Redirect maken',
 'right-upload'               => 'Datein hoochladen',
 'right-reupload'             => 'Datein Överschrieven',
@@ -1136,9 +1274,46 @@ de aver nich jümmer den aktuellsten Stand weerspegelt.<p>',
 'rightslogentry' => 'Grupp bi $1 vun $2 op $3 ännert.',
 'rightsnone'     => '(kene)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'de Sied to lesen',
+'action-edit'                 => 'de Sied to ännern',
+'action-createpage'           => 'Sieden optostellen',
+'action-createtalk'           => 'Diskuschoonssieden optostellen',
+'action-createaccount'        => 'dit Brukerkonto optostellen',
+'action-minoredit'            => 'dit Ännern as lütt to marken',
+'action-move'                 => 'de Sied to schuven',
+'action-move-subpages'        => 'de Sied un ehr Ãœnnersieden to schuven',
+'action-move-rootuserpages'   => 'Hööft-Brukersieden to schuven',
+'action-movefile'             => 'Disse Datei schuven',
+'action-upload'               => 'disse Datei hoochtoladen',
+'action-reupload'             => 'disse Datei to överschrieven',
+'action-reupload-shared'      => 'över disse Datei vun’n gemeensam bruukten Bildspiekerplatz en anner Bild rövertosetten',
+'action-upload_by_url'        => 'disse Datei vun en Webadress (URL) hoochtoladen',
+'action-writeapi'             => 'de Schriev-API to bruken',
+'action-delete'               => 'de Sied wegtodoon',
+'action-deleterevision'       => 'disse Version wegtodoon',
+'action-deletedhistory'       => 'disse Sied ehr wegdaan Versionen antokieken',
+'action-browsearchive'        => 'na wegdaan Sieden to söken',
+'action-undelete'             => 'de Sied weddertohalen',
+'action-suppressrevision'     => 'disse verstekene Version antokieken un weddertohalen',
+'action-suppressionlog'       => 'dit private Logbook antokieken',
+'action-block'                => 'dissen Bruker to sperren',
+'action-protect'              => 'den Schuulstatus vun disse Sied to ännern',
+'action-import'               => 'disse Sied ut en anner Wiki to importeren',
+'action-importupload'         => 'disse Sied över dat Hoochladen vun ene Datei to importeren',
+'action-patrol'               => 'anner Brukers jemehr Ännern as nakeken to marken',
+'action-autopatrol'           => 'egen Ännern as nakeken to marken',
+'action-unwatchedpages'       => 'de List mit Sieden, de op kene Oppasslist staht, antokieken',
+'action-trackback'            => 'en Trackback to överdragen',
+'action-mergehistory'         => 'de Versionengeschichten vun disse Sied tohooptoföhren',
+'action-userrights'           => 'all Brukerrechten to ännern',
+'action-userrights-interwiki' => 'de Rechten vun Brukers op annere Wikis to ännern',
+'action-siteadmin'            => 'de Datenbank to sperren oder freetogeven',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|Een Ännern|$1 Ännern}}',
 'recentchanges'                     => 'Toletzt ännert',
+'recentchanges-legend'              => 'Optionen för toletzt ännert',
 'recentchangestext'                 => 'Op disse Sied warrt de Sieden wiest, de toletzt ännert worrn sünd.',
 'recentchanges-feed-description'    => 'Behool mit dissen Feed de ne’esten Ännern op dit Wiki in’t Oog.',
 'rcnote'                            => "Hier sünd de letzten '''$1''' Ännern vun {{PLURAL:$2|den letzten Dag|de letzten '''$2''' Daag}} (Stand $5, $4). ('''N''' - Ne’e Sieden; '''L''' - Lütte Ännern)",
@@ -1162,6 +1337,8 @@ de aver nich jümmer den aktuellsten Stand weerspegelt.<p>',
 'rc_categories'                     => 'Blot Sieden ut de Kategorien (trennt mit „|“):',
 'rc_categories_any'                 => 'All',
 'newsectionsummary'                 => '/* $1 */ nee Afsnitt',
+'rc-enhanced-expand'                => 'Details wiesen (bruukt JavaScript)',
+'rc-enhanced-hide'                  => 'Details versteken',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Ännern an lenkte Sieden',
@@ -1182,11 +1359,11 @@ de aver nich jümmer den aktuellsten Stand weerspegelt.<p>',
 'upload_directory_read_only'  => 'De Server kann nich in’n Orner för dat Hoochladen vun Datein ($1) schrieven.',
 'uploaderror'                 => 'Fehler bi dat Hoochladen',
 'uploadtext'                  => "Bruuk dit Formular, ne’e Datein hoochtoladen.
-Dat du hoochladene Datein söken un ankieken kannst, gah na de [[Special:ImageList|List vun hoochladene Datein]]. Dat Hoochladen un nee Hoochladen vun Datein warrt ok in dat [[Special:Log/upload|Hoochlade-Logbook]] fasthollen. Dat Wegsmieten in dat [[Special:Log/delete|Wegsmiet-Logbook]].
+Dat du hoochladene Datein söken un ankieken kannst, gah na de [[Special:FileList|List vun hoochladene Datein]]. Dat Hoochladen un nee Hoochladen vun Datein warrt ok in dat [[Special:Log/upload|Hoochlade-Logbook]] fasthollen. Dat Wegsmieten in dat [[Special:Log/delete|Wegsmiet-Logbook]].
 
 Ãœm en Datei in en Sied to bruken, schriev dat hier in de Sied rin:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:datei.jpg]]</nowiki></tt>''' för de Datei in vulle Grött
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:datei.jpg|200px|thumb|left|Beschrieven]]</nowiki></tt>''' för dat Bild in en Breed vun 200 Pixels in en lütt Kassen op de linke Sied mit ''Beschrieven'' as Text ünner dat Bild
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:datei.jpg]]</nowiki></tt>''' för de Datei in vulle Grött
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:datei.jpg|200px|thumb|left|Beschrieven]]</nowiki></tt>''' för dat Bild in en Breed vun 200 Pixels in en lütt Kassen op de linke Sied mit ''Beschrieven'' as Text ünner dat Bild
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' för en direkten Lenk op de Datei, ahn dat se wiest warrt.",
 'upload-permitted'            => 'Verlöövte Dateitypen: $1.',
 'upload-preferred'            => 'Vörtagene Dateitypen: $1.',
@@ -1194,7 +1371,7 @@ Dat du hoochladene Datein söken un ankieken kannst, gah na de [[Special:ImageLi
 'uploadlog'                   => 'Hoochlade-Logbook',
 'uploadlogpage'               => 'Hoochlade-Logbook',
 'uploadlogpagetext'           => 'Ünnen steiht de List vun de ne’esten hoochladenen Datein.
-Kiek bi de [[Special:NewImages|Galerie vun ne’e Datein]] för en Översicht mit Duumnagel-Biller.',
+Kiek bi de [[Special:NewFiles|Galerie vun ne’e Datein]] för en Översicht mit Duumnagel-Biller.',
 'filename'                    => 'Dateinaam',
 'filedesc'                    => 'Beschrieven',
 'fileuploadsummary'           => 'Tosamenfaten:',
@@ -1214,20 +1391,22 @@ Kiek bi de [[Special:NewImages|Galerie vun ne’e Datein]] för en Översicht mi
 'large-file'                  => 'Datein schöölt opbest nich grötter wesen as $1. Disse Datei is $2 groot.',
 'largefileserver'             => 'De Datei is grötter as de vun’n Server verlöövte Bövergrenz för de Grött.',
 'emptyfile'                   => 'De hoochladene Datei is leddig. De Grund kann en Tippfehler in de Dateinaam ween. Kontrolleer, of du de Datei redig hoochladen wullst.',
-'fileexists'                  => 'En Datei mit dissen Naam existeert al, prööv <strong><tt>$1</tt></strong>, wenn du di nich seker büst of du dat ännern wullst.',
-'filepageexists'              => 'En Sied, de dat Bild beschrifft, gifft dat al as <strong><tt>$1</tt></strong>, dat gifft aver keen Datei mit dissen Naam. De Text, den du hier ingiffst, warrt nich op de Sied övernahmen. Du musst de Sied na dat Hoochladen noch wedder extra ännern.',
-'fileexists-extension'        => 'Dat gifft al en Datei mit en ähnlichen Naam:<br />
-Naam vun diene Datei: <strong><tt>$1</tt></strong><br />
-Naam vun de Datei, de al dor is: <strong><tt>$2</tt></strong><br />
-Blot dat Ennen vun de Datei is bi dat Groot-/Lütt-Schrieven anners. Kiek na, wat de Datein villicht desülven sünd.',
+'fileexists'                  => "En Datei mit dissen Naam existeert al, prööv '''<tt>$1</tt>''', wenn du di nich seker büst of du dat ännern wullst.",
+'filepageexists'              => "En Sied, de dat Bild beschrifft, gifft dat al as '''<tt>$1</tt>''', dat gifft aver keen Datei mit dissen Naam. De Text, den du hier ingiffst, warrt nich op de Sied övernahmen. Du musst de Sied na dat Hoochladen noch wedder extra ännern.",
+'fileexists-extension'        => "Dat gifft al en Datei mit en ähnlichen Naam:<br />
+Naam vun diene Datei: '''<tt>$1</tt>'''<br />
+Naam vun de Datei, de al dor is: '''<tt>$2</tt>'''<br />
+Blot dat Ennen vun de Datei is bi dat Groot-/Lütt-Schrieven anners. Kiek na, wat de Datein villicht desülven sünd.",
 'fileexists-thumb'            => "<center>'''Vörhannene Datei'''</center>",
-'fileexists-thumbnail-yes'    => 'De Datei schient en Bild to wesen, dat lütter maakt is <i>(thumbnail)</i>. Kiek di de Datei <strong><tt>$1</tt></strong> an.<br />
-Wenn dat dat Bild in vulle Grött is, denn bruukst du keen extra Vörschaubild hoochladen.',
-'file-thumbnail-no'           => 'De Dateinaam fangt an mit <strong><tt>$1</tt></strong>. Dat düüdt dor op hen, dat dat en lütter maakt Bild <i>(thumbnail, Duumnagel-Bild)</i> is.
-Kiek na, wat du dat Bild nich ok in vulle Grött hest un laad dat ünner’n Originalnaam hooch oder änner den Dateinaam.',
-'fileexists-forbidden'        => 'En Datei mit dissen Naam gifft dat al; gah trüch un laad de Datei ünner en annern Naam hooch. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Dat gifft al en Datei mit dissen Naam. Gah trüch un laad de Datei ünner en annern Naam hooch. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "De Datei schient en Bild to wesen, dat lütter maakt is ''(thumbnail)''. Kiek di de Datei '''<tt>$1</tt>''' an.<br />
+Wenn dat dat Bild in vulle Grött is, denn bruukst du keen extra Vörschaubild hoochladen.",
+'file-thumbnail-no'           => "De Dateinaam fangt an mit '''<tt>$1</tt>'''. Dat düüdt dor op hen, dat dat en lütter maakt Bild ''(thumbnail, Duumnagel-Bild)'' is.
+Kiek na, wat du dat Bild nich ok in vulle Grött hest un laad dat ünner’n Originalnaam hooch oder änner den Dateinaam.",
+'fileexists-forbidden'        => 'En Datei mit dissen Naam gifft dat al un kann nich överschreven warrn.
+Wenn du ehr liekers hoochladen wullt, gah trüch un laad de Datei ünner en annern Naam hooch. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Dat gifft al en Datei mit dissen Naam. Gah trüch un laad de Datei ünner en annern Naam hooch. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'De Datei is desülve as disse {{PLURAL:$1|Datei|$1 Datein}}:',
+'file-deleted-duplicate'      => 'Jüst disse Datei ([[$1]]) is al mal löscht worrn. Kiek man eerst, wat in dat Löschlogbook steiht, ehrdat du ehr noch wedder hoochlaadst.',
 'successfulupload'            => 'Datei hoochladen hett Spood',
 'uploadwarning'               => 'Wohrschau',
 'savefile'                    => 'Datei spiekern',
@@ -1247,7 +1426,7 @@ Kiek na, wat du dat Bild nich ok in vulle Grött hest un laad dat ünner’n Ori
 
 Bedenk di eerst, wat dat ok passt, dat du de Datei noch wedder hoochladen deist.
 Hier dat Logbook, wo insteiht, worüm de Sied wegsmeten worrn is:",
-'filename-bad-prefix'         => 'De Naam vun de Datei fangt mit <strong>„$1“</strong> an. Dat is normalerwies en Naam, den de Datei automaatsch vun de Digitalkamera kriggt. De Naam beschrievt de Datei nich un seggt dor ok nix över ut. Söök di doch en Naam för de Datei ut, de ok wat över den Inholt seggt.',
+'filename-bad-prefix'         => "De Naam vun de Datei fangt mit '''„$1“''' an. Dat is normalerwies en Naam, den de Datei automaatsch vun de Digitalkamera kriggt. De Naam beschrievt de Datei nich un seggt dor ok nix över ut. Söök di doch en Naam för de Datei ut, de ok wat över den Inholt seggt.",
 
 'upload-proto-error'      => 'Verkehrt Protokoll',
 'upload-proto-error-text' => 'De URL mutt mit <code>http://</code> oder <code>ftp://</code> anfangen.',
@@ -1270,18 +1449,19 @@ Kann angahn, dat dat beter geiht, wenn du dat to en Tiet versöchst, to de op de
 'upload_source_url'  => ' (gellen, apen togängliche URL)',
 'upload_source_file' => ' (en Datei op dien Reekner)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Disse Spezialsied wiest all Datein. As Standard warrt de ne’esten Datein toeerst wiest. Wenn du op de enkelten Överschriften klickst, kannst du de Sortreeg ümdreihn oder na en anner Kriterium sorteren.',
-'imagelist_search_for'  => 'Söök na Datei:',
+# Special:ListFiles
+'listfiles-summary'     => 'Disse Spezialsied wiest all Datein. As Standard warrt de ne’esten Datein toeerst wiest. Wenn du op de enkelten Överschriften klickst, kannst du de Sortreeg ümdreihn oder na en anner Kriterium sorteren.',
+'listfiles_search_for'  => 'Söök na Datei:',
 'imgfile'               => 'Datei',
-'imagelist'             => 'Billerlist',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Naam',
-'imagelist_user'        => 'Bruker',
-'imagelist_size'        => 'Grött (Bytes)',
-'imagelist_description' => 'Beschrieven',
-
-# Image description page
+'listfiles'             => 'Billerlist',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Naam',
+'listfiles_user'        => 'Bruker',
+'listfiles_size'        => 'Grött (Bytes)',
+'listfiles_description' => 'Beschrieven',
+'listfiles_count'       => 'Versionen',
+
+# File description page
 'filehist'                       => 'Datei-Historie',
 'filehist-help'                  => 'Klick op de Tiet, dat du de Datei ankieken kannst, so as se do utseeg.',
 'filehist-deleteall'             => 'all wegsmieten',
@@ -1289,19 +1469,25 @@ Kann angahn, dat dat beter geiht, wenn du dat to en Tiet versöchst, to de op de
 'filehist-revert'                => 'Trüchsetten',
 'filehist-current'               => 'aktuell',
 'filehist-datetime'              => 'Datum/Tiet',
+'filehist-thumb'                 => 'Duumnagelbild',
+'filehist-thumbtext'             => 'Duumnagelbild för Version vun’n $1',
+'filehist-nothumb'               => 'Keen Duumnagelbild',
 'filehist-user'                  => 'Bruker',
 'filehist-dimensions'            => 'Grött',
 'filehist-filesize'              => 'Dateigrött',
 'filehist-comment'               => 'Kommentar',
-'imagelinks'                     => 'Bildverwiesen',
+'imagelinks'                     => 'Dateiverwiesen',
 'linkstoimage'                   => 'Disse {{PLURAL:$1|Sied|Sieden}} bruukt dit Bild:',
+'linkstoimage-more'              => 'Mehr as {{PLURAL:$1|ene Sied|$1 Sieden}} wiest na disse Datei.
+Disse List wiest blot {{PLURAL:$1|den eersten Lenk|de eersten $1 Lenken}} op disse Datei.
+En [[Special:WhatLinksHere/$2|kumplette List]] gifft dat ok.',
 'nolinkstoimage'                 => 'Kene Siet bruukt dat Bild.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Mehr Verwiesen]] för disse Datei.',
 'redirectstofile'                => 'Disse {{PLURAL:$1|Datei is|Datein sünd}} en Redirect op disse Datei:',
-'duplicatesoffile'               => 'Disse {{PLURAL:$1|Datei is|Datein sünd}} jüst de {{PLURAL:$1|glieke|glieken}} as disse Datei:',
+'duplicatesoffile'               => 'Disse {{PLURAL:$1|Datei is|Datein sünd}} jüst de {{PLURAL:$1|glieke|glieken}} as disse Datei hier ([[Special:FileDuplicateSearch/$2|mehr Infos]]):',
 'sharedupload'                   => 'Disse Datei is as gemeensam bruukte Datei hoochlaadt un warrt mööglicherwies ok vun annere Wikis bruukt.',
 'shareduploadwiki'               => 'Kiek bi $1 för mehr Informatschoon.',
-'shareduploadwiki-desc'          => 'Wat nu kummt is de Text vun de $1 op den gemeensamen Datei-Spiekerplatz.',
+'shareduploadwiki-desc'          => 'Wat nu kummt is de Text vun de $1 dor.',
 'shareduploadwiki-linktext'      => 'Siet mit de Datei-Beschrievung',
 'shareduploadduplicate'          => 'Disse Datei is desülve as $1 vun’n gemeensam bruukten Datei-Spiekerplatz.',
 'shareduploadduplicate-linktext' => 'disse annere Datei',
@@ -1325,7 +1511,7 @@ Kann angahn, dat dat beter geiht, wenn du dat to en Tiet versöchst, to de op de
 # File deletion
 'filedelete'                  => '$1 wegsmieten',
 'filedelete-legend'           => 'Datei wegsmieten',
-'filedelete-intro'            => "Du smittst '''[[Media:$1|$1]]''' weg.",
+'filedelete-intro'            => "Du smittst de Datei '''[[Media:$1|$1]]''' tohoop mit de ganze Versionsgeschicht weg.",
 'filedelete-intro-old'        => "Du smittst vun de Datei '''„[[Media:$1|$1]]“''' de [$4 Version vun $2, $3] weg.",
 'filedelete-comment'          => 'Kommentar:',
 'filedelete-submit'           => 'Wegsmieten',
@@ -1333,7 +1519,6 @@ Kann angahn, dat dat beter geiht, wenn du dat to en Tiet versöchst, to de op de
 'filedelete-success-old'      => "De Version vun de Datei '''„[[Media:$1|$1]]“''' vun $2, $3 is wegsmeten worrn.",
 'filedelete-nofile'           => "'''$1''' gifft dat nich.",
 'filedelete-nofile-old'       => "Gifft keen Version vun '''„$1“''' in’t Archiv mit disse Egenschoppen.",
-'filedelete-iscurrent'        => 'Du versöchst de aktuelle Version vun disse Datei wegtosmieten. Sett de Datei vörher eerst op en öllere Version trüch.',
 'filedelete-otherreason'      => 'Annern/tosätzlichen Grund:',
 'filedelete-reason-otherlist' => 'Annern Grund',
 'filedelete-reason-dropdown'  => '* Faken bruukte Grünn
@@ -1361,29 +1546,31 @@ Denk dor an, natokieken, wat nich noch annere Sieden na de Vörlagen wiest, ehrd
 
 # Random page
 'randompage'         => 'Tofällige Siet',
-'randompage-nopages' => 'Gifft kene Sieden in dissen Naamruum.',
+'randompage-nopages' => 'Gifft kene Sieden in’n Naamruum „$1“.',
 
 # Random redirect
 'randomredirect'         => 'Tofällig Redirect',
-'randomredirect-nopages' => 'Gifft kene Redirects in dissen Naamruum.',
+'randomredirect-nopages' => 'Gifft kene Redirects in’n Naamruum „$1“.',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Sietenstatistik',
-'userstats'              => 'Brukerstatistik',
-'sitestatstext'          => "Dat gifft allens tosamen {{PLURAL:$1|ene Siet|'''$1''' Sieden}} in de Datenbank.
-Dat slött Diskuschoonsieden, Sieden över {{SITENAME}}, bannig korte Sieden, Wiederleiden un annere Sieden in, de nich as richtige Sieden gellen köönt.
-Disse utnahmen, gifft dat {{PLURAL:$2|ene Siet, de as Artikel gellen kann|'''$2''' Sieden, de as Artikels gellen köönt}}.
-
-'''$8''' hoochladene {{PLURAL:$8|Datei|Datein}} gifft dat.
-
-De Lüüd hebbt {{PLURAL:$3|ene Siet|'''$3'''× Sieden}} opropen, un {{PLURAL:$4|ene Siet ännert|'''$4'''× Sieden ännert}}.
-Dat heet, jede Siet is '''$5''' Maal ännert un '''$6''' maal ankeken worrn.
-
-De List, mit de Opgaven, de de Software noch maken mutt, hett {{PLURAL:$7|een Indrag|'''$7''' Indrääg}}.",
-'userstatstext'          => "Dat gifft {{PLURAL:$1|'''een''' anmellt Bruker|'''$1''' anmellt Brukers}}.
-Dorvun {{PLURAL:$2|hett '''een'''|hebbt '''$2'''}} {{PLURAL:$1||($4 %)}} $5-Rechten.",
-'statistics-mostpopular' => 'opmehrst ankekene Sieden',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Siedenstatistik',
+'statistics-header-edits'      => 'Änner-Statistik',
+'statistics-header-views'      => 'Siedenweddergaav-Statistik',
+'statistics-header-users'      => 'Brukerstatistik',
+'statistics-articles'          => 'Inholtssieden',
+'statistics-pages'             => 'Sieden',
+'statistics-pages-desc'        => 'All Sieden in dit Wiki, tohoop mit all Diskuschoonssieden, Redirects usw.',
+'statistics-files'             => 'Hoochlaadt Datein',
+'statistics-edits'             => 'Ännern, siet dat {{SITENAME}} gifft',
+'statistics-edits-average'     => 'Dörsnittlich Ännern je Sied',
+'statistics-views-total'       => 'Weddergeven Sieden alltohoop',
+'statistics-views-peredit'     => 'Weddergeven Sieden je Ännern',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job-Queue-Längd]',
+'statistics-users'             => 'Anmellt [[Special:ListUsers|Brukers]]',
+'statistics-users-active'      => 'Aktive Brukers',
+'statistics-users-active-desc' => 'Brukers, de {{PLURAL:$1|in de vergahn 24 Stünnen|in de vergahn $1 Daag}} wat daan hebbt',
+'statistics-mostpopular'       => 'opmehrst ankekene Sieden',
 
 'disambiguations'      => 'Mehrdüdige Begrepen',
 'disambiguationspage'  => 'Template:Mehrdüdig_Begreep',
@@ -1398,7 +1585,7 @@ to den vun den tweeten Wiederleiden wiest warrt, un to den de eerste Wiederleide
 'double-redirect-fixer'      => 'Redirect-Utbeterer',
 
 'brokenredirects'        => 'Kaputte Wiederleiden',
-'brokenredirectstext'    => 'Disse Wiederleiden wiest na en Siet, de dat nich gifft.',
+'brokenredirectstext'    => 'Disse Redirects wiest na Sieden, de dat nich gifft.',
 'brokenredirects-edit'   => '(ännern)',
 'brokenredirects-delete' => '(wegsmieten)',
 
@@ -1428,26 +1615,30 @@ to den vun den tweeten Wiederleiden wiest warrt, un to den de eerste Wiederleide
 'popularpages'            => 'Faken opropene Sieden',
 'wantedcategories'        => 'Kategorien, de veel bruukt warrt, aver noch keen Text hebbt (nich anleggt sünd)',
 'wantedpages'             => 'Sieden, de noch fehlt',
-'missingfiles'            => 'Datein, de fehlt',
+'wantedfiles'             => 'Wünschte Datein',
+'wantedtemplates'         => 'Vörlagen, de noch fehlt',
 'mostlinked'              => 'Sieden, op de vele Lenken wiest',
 'mostlinkedcategories'    => 'Kategorien, op de vele Lenken wiest',
 'mostlinkedtemplates'     => 'Vörlagen, op de vele Lenken wiest',
 'mostcategories'          => 'Artikels mit vele Kategorien',
 'mostimages'              => 'Datein, de veel bruukt warrt',
 'mostrevisions'           => 'Sieden mit de mehrsten Versionen',
-'prefixindex'             => 'All Sieden (mit Präfix)',
+'prefixindex'             => 'All Sieden mit Präfix',
 'shortpages'              => 'Korte Sieden',
 'longpages'               => 'Lange Sieden',
 'deadendpages'            => 'Sackstraatsieden',
 'deadendpagestext'        => 'Disse Sieden wiest op kene annern Sieden vun {{SITENAME}}.',
 'protectedpages'          => 'Schuulte Sieden',
 'protectedpages-indef'    => 'Blot unbeschränkt schuulte Sieden wiesen',
+'protectedpages-cascade'  => 'Blot Sieden mit Kaskadenschutz',
 'protectedpagestext'      => 'Disse Sieden sünd vör dat Schuven oder Ännern schuult',
 'protectedpagesempty'     => 'Opstunns sünd kene Sieden schuult',
 'protectedtitles'         => 'Sparrte Sieden',
 'protectedtitlestext'     => 'Disse Sieden sünd för dat nee Opstellen sperrt',
 'protectedtitlesempty'    => 'Opstunns sünd mit disse Parameters kene Sieden sperrt.',
 'listusers'               => 'Brukerlist',
+'listusers-editsonly'     => 'Blot Brukers mit Bidrääg wiesen',
+'usereditcount'           => '$1 {{PLURAL:$1|Ännern|Ännern}}',
 'newpages'                => 'Ne’e Sieden',
 'newpages-username'       => 'Brukernaam:',
 'ancientpages'            => 'Öllste Sieden',
@@ -1468,14 +1659,13 @@ to den vun den tweeten Wiederleiden wiest warrt, un to den de eerste Wiederleide
 'booksources-search-legend' => 'Na Böker bi Bookhökers söken',
 'booksources-go'            => 'Los',
 'booksources-text'          => 'Hier staht Lenken na Websteden, woneem dat Böker to köpen gifft, de mitünner ok mehr Informatschonen to dat Book anbeden doot:',
+'booksources-invalid-isbn'  => 'Süht ut, as wenn de angeven ISBN ungüllig is. Villicht hett dat en Fehler bi’t Afschrieven oder Koperen geven.',
 
 # Special:Log
 'specialloguserlabel'  => 'Bruker:',
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Logböker',
 'all-logs-page'        => 'All Logböker',
-'log-search-legend'    => 'Na Logbook-Indrääg söken',
-'log-search-submit'    => 'Los',
 'alllogstext'          => 'Kombineerte Ansicht vun all Logböker bi {{SITENAME}}.
 Du kannst de List körter maken, wenn du den Logbook-Typ, den Brukernaam (grote un lütte Bookstaven maakt en Ünnerscheed) oder de Sied angiffst (ok mit Ünnerscheed vun grote un lütte Bookstaven).',
 'logempty'             => 'In’e Logböker nix funnen, wat passt.',
@@ -1487,6 +1677,7 @@ Du kannst de List körter maken, wenn du den Logbook-Typ, den Brukernaam (grote
 'nextpage'          => 'tokamen Siet ($1)',
 'prevpage'          => 'Vörige Siet ($1)',
 'allpagesfrom'      => 'Sieden wiesen, de mit disse Bookstaven anfangt:',
+'allpagesto'        => 'Sieden wiesen bet:',
 'allarticles'       => 'Alle Artikels',
 'allinnamespace'    => 'Alle Sieden (Naamruum $1)',
 'allnotinnamespace' => 'Alle Sieden (nich in Naamruum $1)',
@@ -1506,40 +1697,68 @@ Kiek ok bi de [[Special:WantedCategories|wünschten Kategorien]].',
 'special-categories-sort-count' => 'na Tall sorteren',
 'special-categories-sort-abc'   => 'alphabeetsch sorteren',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Wegsmetene Bidrääg vun’n Bruker',
+
+# Special:LinkSearch
+'linksearch'       => 'Weblenken söken',
+'linksearch-pat'   => 'Söökmunster:',
+'linksearch-ns'    => 'Naamruum:',
+'linksearch-ok'    => 'Söken',
+'linksearch-text'  => 'Wildcards as to’n Bispeel <tt>*.wikipedia.org</tt> köönt bruukt warrn.<br />
+Ünnerstütt Protokollen: <tt>$1</tt>',
+'linksearch-line'  => '$1 hett en Lenk vun $2',
+'linksearch-error' => 'Wildcards dröfft blot an’n Anfang vun de URL stahn.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Wies de Brukers, de anfangt mit:',
 'listusers-submit'   => 'Wiesen',
 'listusers-noresult' => 'Keen Bruker funnen.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Ne’e-Bruker-Logbook',
+'newuserlogpagetext'          => 'Dit is dat Logbook för nee opstellte Brukerkonten.',
+'newuserlog-byemail'          => 'Passwoord per E-Mail toschickt',
+'newuserlog-create-entry'     => 'Nee Bruker',
+'newuserlog-create2-entry'    => 'hett nee Brukerkonto „$1“ opstellt',
+'newuserlog-autocreate-entry' => 'Brukerkonto automaatsch opstellt',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Brukergruppen-Rechten',
-'listgrouprights-summary'  => 'Dit is en List vun de Brukergruppen, de in dit Wiki defineert sünd, un de Rechten, de dor mit verbunnen sünd.
+'listgrouprights'                 => 'Brukergruppen-Rechten',
+'listgrouprights-summary'         => 'Dit is en List vun de Brukergruppen, de in dit Wiki defineert sünd, un de Rechten, de dor mit verbunnen sünd.
 Mehr Informatschonen över enkelte Rechten staht ünner [[{{MediaWiki:Listgrouprights-helppage}}]].',
-'listgrouprights-group'    => 'Grupp',
-'listgrouprights-rights'   => 'Rechten',
-'listgrouprights-helppage' => 'Help:Gruppenrechten',
-'listgrouprights-members'  => '(Matenlist)',
+'listgrouprights-group'           => 'Grupp',
+'listgrouprights-rights'          => 'Rechten',
+'listgrouprights-helppage'        => 'Help:Gruppenrechten',
+'listgrouprights-members'         => '(Matenlist)',
+'listgrouprights-addgroup'        => 'Kann Brukers to {{PLURAL:$2|disse Grupp|disse Gruppen}} tofögen: $1',
+'listgrouprights-removegroup'     => 'Kann Brukers ut {{PLURAL:$2|disse Grupp|disse Gruppen}} rutnehmen: $1',
+'listgrouprights-addgroup-all'    => 'Kann all Gruppen tofögen',
+'listgrouprights-removegroup-all' => 'Kann all Gruppen wegnehmen',
 
 # E-mail user
-'mailnologin'     => 'Du büst nich anmellt.',
-'mailnologintext' => 'Du musst [[Special:UserLogin|anmellt wesen]] un in diene [[Special:Preferences|Instellungen]] en güllige E-Mail-Adress hebben, dat du annere Brukers E-Mails tostüren kannst.',
-'emailuser'       => 'E-Mail an dissen Bruker',
-'emailpage'       => 'E-Mail an Bruker',
-'emailpagetext'   => 'Du kannst dissen Bruker mit dit Formular en E-Mail tostüren. As Afsenner warrt de E-Mail-Adress ut dien [[Special:Preferences|Instellen]] indragen, dat de Bruker di antern kann.',
-'usermailererror' => 'Dat Mail-Objekt hett en Fehler trüchgeven:',
-'defemailsubject' => '{{SITENAME}} E-Mail',
-'noemailtitle'    => 'Kene E-Mail-Adress',
-'noemailtext'     => 'Disse Bruker hett kene güllige E-Mail-Adress angeven, oder will kene E-Mail vun annere Bruker tostüürt kriegen.',
-'emailfrom'       => 'Vun:',
-'emailto'         => 'An:',
-'emailsubject'    => 'Bedrap:',
-'emailmessage'    => 'Naricht:',
-'emailsend'       => 'Sennen',
-'emailccme'       => 'Ik will en Kopie vun mien Naricht an mien egen E-Mail-Adress hebben.',
-'emailccsubject'  => 'Kopie vun diene Naricht an $1: $2',
-'emailsent'       => 'E-Mail afsennt',
-'emailsenttext'   => 'Dien E-Mail is afsennt worrn.',
-'emailuserfooter' => 'Disse E-Mail hett $1 över de Funkschoon „{{int:emailuser}}“ vun {{SITENAME}} $2 tostüürt.',
+'mailnologin'      => 'Du büst nich anmellt.',
+'mailnologintext'  => 'Du musst [[Special:UserLogin|anmellt wesen]] un in diene [[Special:Preferences|Instellungen]] en güllige E-Mail-Adress hebben, dat du annere Brukers E-Mails tostüren kannst.',
+'emailuser'        => 'E-Mail an dissen Bruker',
+'emailpage'        => 'E-Mail an Bruker',
+'emailpagetext'    => 'Du kannst dissen Bruker mit dit Formular en E-Mail tostüren. As Afsenner warrt de E-Mail-Adress ut dien [[Special:Preferences|Instellen]] indragen, dat de Bruker di antern kann.',
+'usermailererror'  => 'Dat Mail-Objekt hett en Fehler trüchgeven:',
+'defemailsubject'  => '{{SITENAME}} E-Mail',
+'noemailtitle'     => 'Kene E-Mail-Adress',
+'noemailtext'      => 'Disse Bruker hett kene güllige E-Mail-Adress angeven.',
+'nowikiemailtitle' => 'E-Mails sünd nich verlöövt',
+'nowikiemailtext'  => 'Disse Bruker will vun annere Brukers keen E-Mails tostüürt kriegen.',
+'email-legend'     => 'en annern Bruker op {{SITENAME}} en E-Mail tostüren',
+'emailfrom'        => 'Vun:',
+'emailto'          => 'An:',
+'emailsubject'     => 'Bedrap:',
+'emailmessage'     => 'Naricht:',
+'emailsend'        => 'Sennen',
+'emailccme'        => 'Ik will en Kopie vun mien Naricht an mien egen E-Mail-Adress hebben.',
+'emailccsubject'   => 'Kopie vun diene Naricht an $1: $2',
+'emailsent'        => 'E-Mail afsennt',
+'emailsenttext'    => 'Dien E-Mail is afsennt worrn.',
+'emailuserfooter'  => 'Disse E-Mail hett $1 över de Funkschoon „{{int:emailuser}}“ vun {{SITENAME}} $2 tostüürt.',
 
 # Watchlist
 'watchlist'            => 'Mien Oppasslist',
@@ -1570,12 +1789,7 @@ Mehr Informatschonen över enkelte Rechten staht ünner [[{{MediaWiki:Listgroupr
 'iteminvalidname'      => "Problem mit den Indrag '$1', ungülligen Naam...",
 'wlnote'               => "Ünnen {{PLURAL:$1|steiht de letzte Ännern|staht de letzten $1 Ännern}} vun de {{PLURAL:$2|letzte Stünn|letzten '''$2''' Stünnen}}.",
 'wlshowlast'           => 'Wies de letzten $1 Stünnen $2 Daag $3',
-'watchlist-show-bots'  => 'Ännern vun Bots wiesen',
-'watchlist-hide-bots'  => 'Ännern vun Bots versteken',
-'watchlist-show-own'   => 'Miene Ännern wiesen',
-'watchlist-hide-own'   => 'Miene Ännern versteken',
-'watchlist-show-minor' => 'Lütte Ännern wiesen',
-'watchlist-hide-minor' => 'Lütte Ännern versteken',
+'watchlist-options'    => 'Optionen för de Oppasslist',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'warrt op de Oppasslist ropsett...',
@@ -1612,56 +1826,62 @@ Du kriggst solang keen Bescheedgeev-E-Mails mehr, bet dat du de Siet wedder besÃ
 --
 De Instellungen vun dien Oppasslist to ännern, gah na: {{fullurl:Special:Watchlist/edit}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Siet wegsmieten',
-'confirm'                     => 'Bestätigen',
-'excontent'                   => 'Olen Inholt: ‚$1‘',
-'excontentauthor'             => 'Inholt weer: ‚$1‘ (un de eenzige Autor weer ‚[[Special:Contributions/$2|$2]]‘)',
-'exbeforeblank'               => 'Inholt vör dat Leddigmaken vun de Siet: ‚$1‘',
-'exblank'                     => 'Siet weer leddig',
-'delete-confirm'              => '„$1“ wegsmieten',
-'delete-legend'               => 'Wegsmieten',
-'historywarning'              => 'Wohrschau: De Siet, de du bi büst to löschen, hett en Versionshistorie:',
-'confirmdeletetext'           => 'Du büst dorbi, en Siet oder en Bild un alle ölleren Versionen duersam ut de Datenbank to löschen.
+# Delete
+'deletepage'             => 'Siet wegsmieten',
+'confirm'                => 'Bestätigen',
+'excontent'              => 'Olen Inholt: ‚$1‘',
+'excontentauthor'        => 'Inholt weer: ‚$1‘ (un de eenzige Autor weer ‚[[Special:Contributions/$2|$2]]‘)',
+'exbeforeblank'          => 'Inholt vör dat Leddigmaken vun de Siet: ‚$1‘',
+'exblank'                => 'Siet weer leddig',
+'delete-confirm'         => '„$1“ wegsmieten',
+'delete-legend'          => 'Wegsmieten',
+'historywarning'         => 'Wohrschau: De Siet, de du bi büst to löschen, hett en Versionshistorie:',
+'confirmdeletetext'      => 'Du büst dorbi, en Siet oder en Bild un alle ölleren Versionen duersam ut de Datenbank to löschen.
 Segg to, dat du över de Folgen Bescheed weetst un dat du in Övereenstimmen mit uns [[{{MediaWiki:Policy-url}}|Leidlienen]] hannelst.',
-'actioncomplete'              => 'Akschoon trech',
-'deletedtext'                 => 'De Artikel „<nowiki>$1</nowiki>“ is nu wegsmeten. Op $2 gifft dat en Logbook vun de letzten Löschakschonen.',
-'deletedarticle'              => '„$1“ wegsmeten',
-'suppressedarticle'           => 'hett „[[$1]]“ versteken',
-'dellogpage'                  => 'Lösch-Logbook',
-'dellogpagetext'              => 'Hier is en List vun de letzten Löschen.',
-'deletionlog'                 => 'Lösch-Logbook',
-'reverted'                    => 'Op en ole Version trüchsett',
-'deletecomment'               => 'Grund för dat Wegsmieten:',
-'deleteotherreason'           => 'Annere/tosätzliche Grünn:',
-'deletereasonotherlist'       => 'Annern Grund',
-'deletereason-dropdown'       => '* Grünn för dat Wegsmieten
+'actioncomplete'         => 'Akschoon trech',
+'deletedtext'            => 'De Artikel „<nowiki>$1</nowiki>“ is nu wegsmeten. Op $2 gifft dat en Logbook vun de letzten Löschakschonen.',
+'deletedarticle'         => '„$1“ wegsmeten',
+'suppressedarticle'      => 'hett „[[$1]]“ versteken',
+'dellogpage'             => 'Lösch-Logbook',
+'dellogpagetext'         => 'Hier is en List vun de letzten Löschen.',
+'deletionlog'            => 'Lösch-Logbook',
+'reverted'               => 'Op en ole Version trüchsett',
+'deletecomment'          => 'Grund för dat Wegsmieten:',
+'deleteotherreason'      => 'Annere/tosätzliche Grünn:',
+'deletereasonotherlist'  => 'Annern Grund',
+'deletereason-dropdown'  => '* Grünn för dat Wegsmieten
 ** op Wunsch vun’n Schriever
 ** gegen dat Oorheverrecht
 ** Vandalismus',
-'delete-edit-reasonlist'      => 'Grünn för’t Wegsmieten ännern',
-'delete-toobig'               => 'Disse Siet hett en temlich lange Versionsgeschicht vun mehr as {{PLURAL:$1|ene Version|$1 Versionen}}. Dat Wegsmieten kann de Datenbank vun {{SITENAME}} för längere Tied utlasten un den Bedriev vun dat Wiki stöörn.',
-'delete-warning-toobig'       => 'Disse Siet hett en temlich lange Versionsgeschicht vun mehr as {{PLURAL:$1|ene Version|$1 Versionen}}. Dat Wegsmieten kann de Datenbank vun {{SITENAME}} för längere Tied utlasten un den Bedriev vun dat Wiki stöörn.',
-'rollback'                    => 'Trüchnahm vun de Ännern',
-'rollback_short'              => 'Trüchnehmen',
-'rollbacklink'                => 'Trüchnehmen',
-'rollbackfailed'              => 'Trüchnahm hett kenen Spood',
-'cantrollback'                => 'De Ännern kann nich trüchnahmen warrn; de letzte Autor is de eenzige.',
-'alreadyrolled'               => 'Dat Trüchnehmen vun de Ännern an de Siet [[:$1]] vun [[User:$2|$2]] ([[User talk:$2|Diskuschoonssiet]] | [[Special:Contributions/$2|Bidrääg]]) is nich mööglich, vun wegen dat dor en annere Ännern oder Trüchnahm wesen is.
-
-De letzte Ännern is vun [[User:$3|$3]] ([[User talk:$3|Diskuschoon]] | [[Special:Contributions/$3|Bidrääg]]).',
-'editcomment'                 => "De Ännerkommentar weer: ''$1''.", # only shown if there is an edit comment
-'revertpage'                  => 'Ännern vun [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskuschoon]]) rut un de Version vun [[User:$1]] wedderhaalt', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Ännern vun $1 trüchsett op letzte Version vun $2.',
-'sessionfailure'              => 'Dor weer en Problem mit diene Brukersitzung.
+'delete-edit-reasonlist' => 'Grünn för’t Wegsmieten ännern',
+'delete-toobig'          => 'Disse Siet hett en temlich lange Versionsgeschicht vun mehr as {{PLURAL:$1|ene Version|$1 Versionen}}. Dat Wegsmieten kann de Datenbank vun {{SITENAME}} för längere Tied utlasten un den Bedriev vun dat Wiki stöörn.',
+'delete-warning-toobig'  => 'Disse Siet hett en temlich lange Versionsgeschicht vun mehr as {{PLURAL:$1|ene Version|$1 Versionen}}. Dat Wegsmieten kann de Datenbank vun {{SITENAME}} för längere Tied utlasten un den Bedriev vun dat Wiki stöörn.',
+
+# Rollback
+'rollback'         => 'Trüchnahm vun de Ännern',
+'rollback_short'   => 'Trüchnehmen',
+'rollbacklink'     => 'Trüchnehmen',
+'rollbackfailed'   => 'Trüchnahm hett kenen Spood',
+'cantrollback'     => 'De Ännern kann nich trüchnahmen warrn; de letzte Autor is de eenzige.',
+'alreadyrolled'    => 'Dat Trüchnehmen vun de Ännern an de Siet [[:$1]] vun [[User:$2|$2]] ([[User talk:$2|Diskuschoonssiet]]{{int:pipe-separator}}[[Special:Contributions/$2|Bidrääg]]) is nich mööglich, vun wegen dat dor en annere Ännern oder Trüchnahm wesen is.
+
+De letzte Ännern is vun [[User:$3|$3]] ([[User talk:$3|Diskuschoon]]{{int:pipe-separator}}[[Special:Contributions/$3|Bidrääg]]).',
+'editcomment'      => "De Ännerkommentar weer: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Ännern vun [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskuschoon]]) rut un de Version vun [[User:$1]] wedderhaalt', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Ännern vun $1 trüchsett op letzte Version vun $2.',
+'sessionfailure'   => 'Dor weer en Problem mit diene Brukersitzung.
 Disse Akschoon is nu ut Sekerheitsgrünn afbraken, dat de Ännern nich verkehrt en annern Bruker toornt warrt.
 Gah een Sied trüch un versöök dat noch wedder.',
+
+# Protect
 'protectlogpage'              => 'Sietenschuul-Logbook',
 'protectlogtext'              => 'Dit is en List vun de blockten Sieten. Kiek [[Special:ProtectedPages|Schulte Sieten]] för mehr Informatschonen.',
 'protectedarticle'            => 'Siet $1 schuult',
 'modifiedarticleprotection'   => 'Schuul op „[[$1]]“ sett',
 'unprotectedarticle'          => 'Siet $1 freegeven',
+'movedarticleprotection'      => 'hett de Schuulinstellungen vun „[[$2]]“ na „[[$1]]“ verschaven',
 'protect-title'               => 'Sparren vun „$1“',
+'prot_1movedto2'              => '[[$1]] is nu na [[$2]] verschaven.',
 'protect-legend'              => 'Sparr bestätigen',
 'protectcomment'              => 'Grund för de Sparr',
 'protectexpiry'               => 'Löppt ut:',
@@ -1669,18 +1889,32 @@ Gah een Sied trüch un versöök dat noch wedder.',
 'protect_expiry_old'          => 'Utlooptiet al vörbi.',
 'protect-unchain'             => 'Schuul vör dat Schuven ännern',
 'protect-text'                => "Hier kannst du den Schuulstatus för de Siet '''<nowiki>$1</nowiki>''' ankieken un ännern.",
-'protect-locked-blocked'      => 'Du kannst den Schuulstatus vun de Sied nich ännern, du büst sperrt. Hier sünd de aktuellen Schuulstatus-Instellungen för de Siet <strong>„$1“:</strong>',
-'protect-locked-dblock'       => 'De Datenbank is sperrt un de Schuulstatus vun de Sied kann nich ännert warrn. Dit sünd de aktuellen Schuul-Instellungen för de Sied <strong>„$1“:</strong>',
-'protect-locked-access'       => 'Du hest nich de nödigen Rechten, den Schuulstatus vun de Siet to ännern. Dit sünd de aktuellen Instellungen för de Siet <strong>„$1“:</strong>',
+'protect-locked-blocked'      => "Du kannst den Schuulstatus vun de Sied nich ännern, du büst sperrt. Hier sünd de aktuellen Schuulstatus-Instellungen för de Siet '''„$1“:'''",
+'protect-locked-dblock'       => "De Datenbank is sperrt un de Schuulstatus vun de Sied kann nich ännert warrn. Dit sünd de aktuellen Schuul-Instellungen för de Sied '''„$1“:'''",
+'protect-locked-access'       => "Du hest nich de nödigen Rechten, den Schuulstatus vun de Siet to ännern. Dit sünd de aktuellen Instellungen för de Siet '''„$1“:'''",
 'protect-cascadeon'           => 'Disse Siet is aktuell dör ene Kaskadensparr schuult. Se is in de nakamen {{PLURAL:$1|Siet|Sieden}} inbunnen, de dör Kaskadensparr schuult {{PLURAL:$1|is|sünd}}. De Schuulstatus kann för disse Siet ännert warrn, dat hett aver keen Effekt op de Kaskadensparr:',
-'protect-default'             => '(normal)',
+'protect-default'             => 'all Brukers',
 'protect-fallback'            => '„$1“-Rechten nödig.',
-'protect-level-autoconfirmed' => 'nich registreerte Brukers blocken',
+'protect-level-autoconfirmed' => 'Ne’e un nich registreerte Brukers blocken',
 'protect-level-sysop'         => 'Blots Admins',
 'protect-summary-cascade'     => 'Kaskadensparr',
 'protect-expiring'            => 'bet $1 (UTC)',
+'protect-expiry-indefinite'   => 'ahn Enn',
 'protect-cascade'             => 'Kaskadensparr – in disse Siet inbunnene Vörlagen warrt ok schuult.',
 'protect-cantedit'            => 'Du kannst de Sparr vun disse Siet nich ännern, du hest dor nich de nödigen Rechten för.',
+'protect-othertime'           => 'Annere Tied:',
+'protect-othertime-op'        => 'annere Tied',
+'protect-existing-expiry'     => 'Aktuell Enn för de Sperr: $2, $3',
+'protect-otherreason'         => 'Annern Grund:',
+'protect-otherreason-op'      => 'annern Grund',
+'protect-dropdown'            => '*Faken bruukt Schuulgrünn
+** toveel Vandalismus
+** toveel Spam
+** Rin’e-Tuffeln/Rut’e-Tuffeln-Geänner
+** veel bruukt Vörlaag
+** Sied mit temlich veel Besökers',
+'protect-edit-reasonlist'     => 'Grünn för de Sperr ännern',
+'protect-expiry-options'      => '1 Stünn:1 hour,1 Dag:1 day,1 Week:1 week,2 Weken:2 weeks,1 Maand:1 month,3 Maand:3 months,6 Maand:6 months,1 Johr:1 year,ahn Enn:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Schuulstatus',
 'restriction-level'           => 'Schuulhööchd',
 'minimum-size'                => 'Minimumgrött',
@@ -1703,7 +1937,8 @@ Gah een Sied trüch un versöök dat noch wedder.',
 'undeletepage'                 => 'Wegsmetene Sieden wedderhalen',
 'undeletepagetitle'            => "'''Dit sünd de wegsmetenen Versionen vun [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Wegsmetene Sieden ankieken',
-'undeletepagetext'             => 'Disse Sieden sünd wegsmeten worrn, aver jümmer noch spiekert un köönt wedderhaalt warrn.',
+'undeletepagetext'             => 'Disse {{PLURAL:$1|Sied is wegsmeten worrn, aver jümmer noch spiekert un kann|$1 Sieden sünd wegsmeten worrn, aver jümmer noch spiekert un köönt}} wedderhaalt warrn.
+De Spieker mit wegsmeten Sieden warrt mööglicherwies aver vun Tied to Tied leddig maakt.',
 'undelete-fieldset-title'      => 'Versionen wedderhalen',
 'undeleteextrahelp'            => '* De Sied kumplett mit all Versionen weddertohalen, geev en Grund an, laat all Ankrüüzfeller leddig un klick op „{{int:Undeletebtn}}“.
 * Wenn du blot welk Versionen wedderhalen wullt, denn wähl jem enkelt mit de Ankrüüzfeller ut, geev en Grund an un klick denn op „{{int:Undeletebtn}}“.
@@ -1716,12 +1951,13 @@ In den Fall mutt de ne’este Version op sichtbor stellt warrn.',
 'undeletehistorynoadmin'       => 'Disse Sied is wegsmeten worrn.
 De Grund för dat Wegsmieten steiht hier ünner, jüst so as Details to’n letzten Bruker, de disse Sied vör dat Wegsmieten ännert hett.
 Den Text vun de wegsmetene Sied köönt blot Administraters sehn.',
-'undelete-revision'            => 'Wegsmetene Version vun $1 - $2, $3:',
+'undelete-revision'            => 'Wegsmetene Version vun $1 - $4, $5, vun $3:',
 'undeleterevision-missing'     => 'Version is ungüllig oder fehlt. Villicht weer de Lenk verkehrt oder de Version is wedderhaalt oder ut dat Archiv rutnahmen worrn.',
 'undelete-nodiff'              => 'Gifft kene öllere Version.',
 'undeletebtn'                  => 'Wedderhalen!',
 'undeletelink'                 => 'wedderhalen',
 'undeletereset'                => 'Afbreken',
+'undeleteinvert'               => 'Utwahl ümkehrn',
 'undeletecomment'              => 'Grund:',
 'undeletedarticle'             => '„$1“ wedderhaalt',
 'undeletedrevisions'           => '{{PLURAL:$1|ene Version|$1 Versionen}} wedderhaalt',
@@ -1753,26 +1989,27 @@ $1',
 'blanknamespace' => '(Hööft-)',
 
 # Contributions
-'contributions' => 'Bidrääg vun den Bruker',
-'mycontris'     => 'Mien Arbeid',
-'contribsub2'   => 'För $1 ($2)',
-'nocontribs'    => 'Kene Ännern för disse Kriterien funnen.',
-'uctop'         => ' (aktuell)',
-'month'         => 'bet Maand:',
-'year'          => 'Bet Johr:',
-
-'sp-contributions-newbies'     => 'Wies blot Bidrääg vun ne’e Brukers',
-'sp-contributions-newbies-sub' => 'För ne’e Kontos',
-'sp-contributions-blocklog'    => 'Sparr-Logbook',
-'sp-contributions-search'      => 'Na Brukerbidrääg söken',
-'sp-contributions-username'    => 'IP-Adress oder Brukernaam:',
-'sp-contributions-submit'      => 'Söken',
+'contributions'       => 'Bidrääg vun den Bruker',
+'contributions-title' => 'Brukerbidrääg vun „$1“',
+'mycontris'           => 'Mien Arbeid',
+'contribsub2'         => 'För $1 ($2)',
+'nocontribs'          => 'Kene Ännern för disse Kriterien funnen.',
+'uctop'               => ' (aktuell)',
+'month'               => 'bet Maand:',
+'year'                => 'Bet Johr:',
+
+'sp-contributions-newbies'       => 'Wies blot Bidrääg vun ne’e Brukers',
+'sp-contributions-newbies-sub'   => 'För ne’e Kontos',
+'sp-contributions-newbies-title' => 'Brukerbidrääg vun ne’e Brukers',
+'sp-contributions-blocklog'      => 'Sparr-Logbook',
+'sp-contributions-search'        => 'Na Brukerbidrääg söken',
+'sp-contributions-username'      => 'IP-Adress oder Brukernaam:',
+'sp-contributions-submit'        => 'Söken',
 
 # What links here
 'whatlinkshere'            => 'Wat wiest na disse Siet hen',
 'whatlinkshere-title'      => 'Sieden, de na „$1“ wiest',
 'whatlinkshere-page'       => 'Siet:',
-'linklistsub'              => '(List vun de Verwiesen)',
 'linkshere'                => "Disse Sieden wiest na '''„[[:$1]]“''':",
 'nolinkshere'              => "Kene Siet wiest na '''„[[:$1]]“'''.",
 'nolinkshere-ns'           => "Kene Sieden wiest na '''[[:$1]]''' in’n utwählten Naamruum.",
@@ -1811,11 +2048,13 @@ Ok den Grund för dat Blocken indregen.',
 'ipbenableautoblock'              => 'Sperr de aktuell vun dissen Bruker bruukte IP-Adress un automaatsch all de annern, vun de ut he Sieden ännern oder Brukers anleggen will',
 'ipbsubmit'                       => 'Adress blocken',
 'ipbother'                        => 'Annere Tiet:',
-'ipboptions'                      => '1 Stünn:1 hour,2 Stünnen:2 hours,6 Stünnen:6 hours,1 Dag:1 day,3 Daag:3 days,1 Week:1 week,2 Weken:2 weeks,1 Maand:1 month,3 Maand:3 months,1 Johr:1 year,ahn Enn:infinite', # display1:time1,display2:time2,...
+'ipboptions'                      => '2 Stünnen:2 hours,1 Dag:1 day,3 Daag:3 days,1 Week:1 week,2 Weken:2 weeks,1 Maand:1 month,3 Maand:3 months,6 Maand:6 months,1 Johr:1 year,ahn Enn:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'Annere Duer',
 'ipbotherreason'                  => 'Annern Grund:',
 'ipbhidename'                     => 'Brukernaam in dat Sperr-Logbook, de List vun de aktiven Sperren un de Brukerlist versteken.',
 'ipbwatchuser'                    => 'Op Brukersiet un Brukerdiskuschoon oppassen',
+'ipballowusertalk'                => 'Den sperrten Bruker verlöven de egene Diskuschoonssied to ännern',
+'ipb-change-block'                => 'Mit disse Sperrparameters noch wedder nee sperren',
 'badipaddress'                    => 'De IP-Adress hett en falsch Format.',
 'blockipsuccesssub'               => 'Blocken hett Spood',
 'blockipsuccesstext'              => 'De IP-Adress „$1“ is nu blockt.
@@ -1826,14 +2065,18 @@ Ok den Grund för dat Blocken indregen.',
 'ipb-unblock'                     => 'IP-Adress/Bruker freegeven',
 'ipb-blocklist-addr'              => 'Aktuelle Sperren för „$1“',
 'ipb-blocklist'                   => 'Aktuelle Sperren wiesen',
+'ipb-blocklist-contribs'          => 'Brukerbidrääg för „$1“',
 'unblockip'                       => 'IP-Adress freegeven',
 'unblockiptext'                   => 'Bruuk dat Formular, üm en blockte IP-Adress freetogeven.',
-'ipusubmit'                       => 'Disse Adress freegeven',
+'ipusubmit'                       => 'Disse Sperr opheven',
 'unblocked'                       => '[[User:$1|$1]] freegeven',
 'unblocked-id'                    => 'Sperr $1 freegeven',
 'ipblocklist'                     => 'List vun blockte IP-Adressen un Brukernaams',
 'ipblocklist-legend'              => 'Blockten Bruker finnen',
 'ipblocklist-username'            => 'Brukernaam oder IP-Adress:',
+'ipblocklist-sh-userblocks'       => 'Brukersperren $1',
+'ipblocklist-sh-tempblocks'       => 'tiedwies Sperren $1',
+'ipblocklist-sh-addressblocks'    => 'enkelt IP-Sperren $1',
 'ipblocklist-submit'              => 'Söken',
 'blocklistline'                   => '$1, $2 hett $3 blockt ($4)',
 'infiniteblock'                   => 'unbegrenzt',
@@ -1842,14 +2085,18 @@ Ok den Grund för dat Blocken indregen.',
 'noautoblockblock'                => 'Autoblock afstellt',
 'createaccountblock'              => 'Brukerkonten opstellen sperrt',
 'emailblock'                      => 'E-Mail schrieven sperrt',
+'blocklist-nousertalk'            => 'kann de egene Diskuschoonssied nich ännern',
 'ipblocklist-empty'               => 'De List is leddig.',
 'ipblocklist-no-results'          => 'De söchte IP-Adress/Brukernaam is nich sperrt.',
 'blocklink'                       => 'blocken',
 'unblocklink'                     => 'freegeven',
+'change-blocklink'                => 'Sperr ännern',
 'contribslink'                    => 'Bidrääg',
 'autoblocker'                     => 'Automatisch Block, vun wegen dat du en IP-Adress bruukst mit „$1“. Grund: „$2“.',
 'blocklogpage'                    => 'Brukerblock-Logbook',
+'blocklog-fulllog'                => 'Kumplett Sperr-Logbook',
 'blocklogentry'                   => 'block [[$1]] för en Tiedruum vun: $2 $3',
+'reblock-logentry'                => 'hett de Sperr för „[[$1]]“ op de Tied $2 $3 ännert',
 'blocklogtext'                    => 'Dit is en Logbook över Blocks un Freegaven vun Brukern. Automatisch blockte IP-Adressen sünd nich opföhrt.
 Kiek [[Special:IPBlockList|IP-Blocklist]] för en List vun den blockten Brukern.',
 'unblocklogentry'                 => 'Block vun [[$1]] ophoven',
@@ -1857,11 +2104,14 @@ Kiek [[Special:IPBlockList|IP-Blocklist]] för en List vun den blockten Brukern.
 'block-log-flags-nocreate'        => 'Brukerkonten opstellen sperrt',
 'block-log-flags-noautoblock'     => 'Autoblock utschalt',
 'block-log-flags-noemail'         => 'E-Mail schrieven sperrt',
+'block-log-flags-nousertalk'      => 'kann de egene Diskuschoonssied nich ännern',
 'block-log-flags-angry-autoblock' => 'utwiedt Autoblock aktiv',
 'range_block_disabled'            => 'De Mööglichkeit, ganze Adressrüüm to sparren, is nich aktiveert.',
 'ipb_expiry_invalid'              => 'De angeven Aflooptiet is nich güllig.',
 'ipb_expiry_temp'                 => 'Versteken Brukernaam-Sperren schöölt duurhaft wesen.',
 'ipb_already_blocked'             => '„$1“ is al blockt.',
+'ipb-needreblock'                 => '== Is al sperrt ==
+„$1“ is al sperrt. Wullt du de Sperrparameters ännern?',
 'ipb_cant_unblock'                => 'Fehler: Block-ID $1 nich funnen. De Sperr is villicht al wedder ophoven.',
 'ipb_blocked_as_range'            => 'Fehler: De IP-Adress $1 is as Deel vun de IP-Reeg $2 indirekt sperrt worrn. De Sperr trüchnehmen för $1 alleen geiht nich.',
 'ip_range_invalid'                => 'Ungüllig IP-Addressrebeet.',
@@ -1873,6 +2123,7 @@ Kontakteer dien Provider oder diene Systemtechnik un informeer se över dat möÃ
 'proxyblocksuccess'               => 'Trech.',
 'sorbsreason'                     => 'Diene IP-Adress steiht in de DNSBL vun {{SITENAME}} as apen PROXY.',
 'sorbs_create_account_reason'     => 'Diene IP-Adress steiht in de DNSBL vun {{SITENAME}} as apen PROXY. Du kannst keen Brukerkonto nee opstellen.',
+'cant-block-while-blocked'        => 'Du kannst kene annern Brukers sperren, wenn du sülvst sperrt büst.',
 
 # Developer tools
 'lockdb'              => 'Datenbank sparren',
@@ -1895,9 +2146,9 @@ Schall de Datenbank-Sparr redig beennt warrn?',
 'databasenotlocked'   => 'De Datenbank is nich sparrt.',
 
 # Move page
-'move-page'               => 'Schuuv „$1“',
-'move-page-legend'        => 'Siet schuven',
-'movepagetext'            => "Mit dit Formular kannst du en Siet en ne’en Naam geven, tohoop mit all Versionen.
+'move-page'                    => 'Schuuv „$1“',
+'move-page-legend'             => 'Siet schuven',
+'movepagetext'                 => "Mit dit Formular kannst du en Siet en ne’en Naam geven, tohoop mit all Versionen.
 De ole Titel wiest denn achterna na den ne’en.
 Verwiesen op den olen Titel köönt automaatsch ännert warrn.
 Wenn du dat automaatsche Utbetern vun de Redirects nich utwählst, denn kiek na, wat dor kene [[Special:DoubleRedirects|dubbelten]] un [[Special:BrokenRedirects|kaputten Redirects]] nablifft.
@@ -1908,50 +2159,65 @@ Dat bedüüdt, dat du ene jüst verschavene Siet na’n olen Titel trüchschuven
 
 '''WOHRSCHAU!'''
 Dit kann sik temlich dull utwarken bi veel bruukte Sieden. Stell seker, dat du weetst, wie sik dat utwarkt, ehrdat du wiedermaakst.",
-'movepagetalktext'        => "De tohören Diskuschoonssiet warrt, wenn een dor is, mitverschaven, ''mit disse Utnahmen:''
+'movepagetalktext'             => "De tohören Diskuschoonssiet warrt, wenn een dor is, mitverschaven, ''mit disse Utnahmen:''
 * Du schuffst de Siet in en annern Naamruum oder
 * dat gifft al en Diskuschoonssiet mit dissen Naam, oder
 * du wählst de nerrn stahn Opschoon af
 
 In disse Fäll musst du de Siet, wenn du dat willst, vun Hand schuven.",
-'movearticle'             => 'Siet schuven',
-'movenotallowed'          => 'Du hest nich de Rechten, Sieden to schuven.',
-'newtitle'                => 'To ne’en Titel',
-'move-watch'              => 'Op disse Siet oppassen',
-'movepagebtn'             => 'Siet schuven',
-'pagemovedsub'            => 'Schuven hett Spood',
-'movepage-moved'          => "<big>'''De Sied „$1“ is na „$2“ schaven worrn.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Ãœnner dissen Naam gifft dat al ene Siet.
+'movearticle'                  => 'Siet schuven',
+'movenologin'                  => 'Du büst nich anmellt',
+'movenologintext'              => 'Du muttst en registreert Bruker un
+[[Special:UserLogin|anmellt]] ween,
+üm en Siet to schuven.',
+'movenotallowed'               => 'Du hest nich de Rechten, Sieden to schuven.',
+'movenotallowedfile'           => 'Du hest nich de Rechten, Datein to schuven.',
+'cant-move-user-page'          => 'Du hest nich de Rechten, Brukersieden to schuven.',
+'cant-move-to-user-page'       => 'Du hest nich de Rechten, Sieden op en Brukersied to schuven (mit Utnahm vun Brukerünnersieden).',
+'newtitle'                     => 'To ne’en Titel',
+'move-watch'                   => 'Op disse Siet oppassen',
+'movepagebtn'                  => 'Siet schuven',
+'pagemovedsub'                 => 'Schuven hett Spood',
+'movepage-moved'               => "<big>'''De Sied „$1“ is na „$2“ schaven worrn.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Redirect opstellt.',
+'movepage-moved-noredirect'    => 'Dat Opstellen vun en Redirect is ünnerdrückt worrn.',
+'articleexists'                => 'Ãœnner dissen Naam gifft dat al ene Siet.
 Bitte söök en annern Naam ut.',
-'cantmove-titleprotected' => 'Du kannst de Siet nich na dissen ne’en Naam schuven. De Naam is gegen dat nee Opstellen schuult.',
-'talkexists'              => 'Dat Schuven vun de Siet sülvst hett Spood, aver dat Schuven vun de
+'cantmove-titleprotected'      => 'Du kannst de Siet nich na dissen ne’en Naam schuven. De Naam is gegen dat nee Opstellen schuult.',
+'talkexists'                   => 'Dat Schuven vun de Siet sülvst hett Spood, aver dat Schuven vun de
 Diskuschoonssiet nich, vun wegen dat dat dor al ene Siet mit dissen Titel gifft. De Inholt mutt vun Hand anpasst warrn.',
-'movedto'                 => 'schaven na',
-'movetalk'                => 'De Diskuschoonssiet ok schuven, wenn mööglich.',
-'move-subpages'           => 'All Ünnersieden, wenn welk dor sünd, mit schuven',
-'move-talk-subpages'      => 'All Ünnersieden vun Diskuschoonssieden, wenn welk dor sünd, mit schuven',
-'movepage-page-exists'    => 'De Sied „$1“ gifft dat al un kann nich automaatsch överschreven warrn.',
-'movepage-page-moved'     => 'De Siet „$1“ is nu schaven na „$2“.',
-'movepage-page-unmoved'   => 'De Siet „$1“ kunn nich na „$2“ schaven warrn.',
-'movepage-max-pages'      => 'De Maximaltall vun $1 {{PLURAL:$1|Siet|Sieden}} is schaven. All de annern Sieden warrt nich automaatsch schaven.',
-'1movedto2'               => '[[$1]] is nu na [[$2]] verschaven.',
-'1movedto2_redir'         => '[[$1]] is nu na [[$2]] verschaven un hett den olen Redirect överschreven.',
-'movelogpage'             => 'Schuuv-Logbook',
-'movelogpagetext'         => 'Dit is ene List vun all schavene Sieden.',
-'movereason'              => 'Grund',
-'revertmove'              => 'trüchschuven',
-'delete_and_move'         => 'Wegsmieten un Schuven',
-'delete_and_move_text'    => '== Siet gifft dat al, wegsmieten? ==
+'movedto'                      => 'schaven na',
+'movetalk'                     => 'De Diskuschoonssiet ok schuven, wenn mööglich.',
+'move-subpages'                => 'All Ünnersieden, wenn welk dor sünd, mit schuven',
+'move-talk-subpages'           => 'All Ünnersieden vun Diskuschoonssieden, wenn welk dor sünd, mit schuven',
+'movepage-page-exists'         => 'De Sied „$1“ gifft dat al un kann nich automaatsch överschreven warrn.',
+'movepage-page-moved'          => 'De Siet „$1“ is nu schaven na „$2“.',
+'movepage-page-unmoved'        => 'De Siet „$1“ kunn nich na „$2“ schaven warrn.',
+'movepage-max-pages'           => 'De Maximaltall vun $1 {{PLURAL:$1|Siet|Sieden}} is schaven. All de annern Sieden warrt nich automaatsch schaven.',
+'1movedto2'                    => '[[$1]] is nu na [[$2]] verschaven.',
+'1movedto2_redir'              => '[[$1]] is nu na [[$2]] verschaven un hett den olen Redirect överschreven.',
+'move-redirect-suppressed'     => 'Redirect ünnerdrückt',
+'movelogpage'                  => 'Schuuv-Logbook',
+'movelogpagetext'              => 'Dit is ene List vun all schavene Sieden.',
+'movereason'                   => 'Grund',
+'revertmove'                   => 'trüchschuven',
+'delete_and_move'              => 'Wegsmieten un Schuven',
+'delete_and_move_text'         => '== Siet gifft dat al, wegsmieten? ==
 
 De Siet „[[:$1]]“ gifft dat al. Wullt du ehr wegsmieten, dat disse Siet schaven warrn kann?',
-'delete_and_move_confirm' => 'Jo, de Siet wegsmieten',
-'delete_and_move_reason'  => 'wegsmeten, Platz to maken för Schuven',
-'selfmove'                => 'Utgangs- un Teelnaam sünd desülve; en Siet kann nich över sik sülvst röver schaven warrn.',
-'immobile_namespace'      => 'De Utgangs- oder Teelnaamruum is schuult; Schuven na oder ut dissen Naamruum geiht nich.',
-'imagenocrossnamespace'   => 'Datein köönt nich na buten den Datei-Naamruum schaven warrn',
-'imagetypemismatch'       => 'De ne’e Dateiennen passt nich to de ole',
-'imageinvalidfilename'    => 'De ne’e Dateinaam is ungüllig',
-'fix-double-redirects'    => 'All Redirects, de na den olen Titel wiest, op den ne’en ännern',
+'delete_and_move_confirm'      => 'Jo, de Siet wegsmieten',
+'delete_and_move_reason'       => 'wegsmeten, Platz to maken för Schuven',
+'selfmove'                     => 'Utgangs- un Teelnaam sünd desülve; en Siet kann nich över sik sülvst röver schaven warrn.',
+'immobile-source-namespace'    => 'Sieden in’n „$1“-Naamruum köönt nich schaven warrn',
+'immobile-target-namespace'    => 'Sieden köönt nich in’n „$1“-Naamruum schaven warrn',
+'immobile-target-namespace-iw' => 'Sieden köönt nich op en Interwiki-Lenk schaven warrn.',
+'immobile-source-page'         => 'Disse Sied kann nich schaven warrn.',
+'immobile-target-page'         => 'Na disse Sied kann nich schaven warrn.',
+'imagenocrossnamespace'        => 'Datein köönt nich na buten den Datei-Naamruum schaven warrn',
+'imagetypemismatch'            => 'De ne’e Dateiennen passt nich to de ole',
+'imageinvalidfilename'         => 'De ne’e Dateinaam is ungüllig',
+'fix-double-redirects'         => 'All Redirects, de na den olen Titel wiest, op den ne’en ännern',
+'move-leave-redirect'          => 'Redirect opstellen',
 
 # Export
 'export'            => 'Sieden exporteren',
@@ -1970,7 +2236,7 @@ De Siet „[[:$1]]“ gifft dat al. Wullt du ehr wegsmieten, dat disse Siet scha
 'allmessagesname'           => 'Naam',
 'allmessagesdefault'        => 'Standardtext',
 'allmessagescurrent'        => 'Text nu',
-'allmessagestext'           => 'Dit is de List vun all de Systemnarichten, de dat in den MediaWiki-Naamruum gifft.',
+'allmessagestext'           => 'Dit is de List vun de Systemnarichten, de dat in den MediaWiki-Naamruum gifft.',
 'allmessagesnotsupportedDB' => '{{ns:special}}:Allmessages is nich ünnerstütt, vun wegen dat wgUseDatabaseMessages utstellt is.',
 'allmessagesfilter'         => 'Narichtennaamfilter:',
 'allmessagesmodified'       => 'Blot ännerte wiesen',
@@ -1990,9 +2256,12 @@ De Siet „[[:$1]]“ gifft dat al. Wullt du ehr wegsmieten, dat disse Siet scha
 'import-interwiki-text'      => 'Wähl en Wiki un en Siet för dat Importeren ut.
 De Versionsdaten un Brukernaams blievt dor bi vörhannen.
 All Transwiki-Import-Akschonen staht later ok in dat [[Special:Log/import|Import-Logbook]].',
+'import-interwiki-source'    => 'Bornwiki/sied:',
 'import-interwiki-history'   => 'Importeer all Versionen vun disse Siet',
 'import-interwiki-submit'    => 'Rinhalen',
 'import-interwiki-namespace' => 'Sied in dissen Naamruum halen:',
+'import-upload-filename'     => 'Dateinaam:',
+'import-comment'             => 'Kommentar:',
 'importtext'                 => 'Exporteer de Siet vun dat Utgangswiki mit Special:Export un laad de Datei denn över disse Siet weer hooch.',
 'importstart'                => 'Sieden warrt rinhaalt...',
 'import-revision-count'      => '$1 {{PLURAL:$1|Version|Versionen}}',
@@ -2026,19 +2295,19 @@ All Transwiki-Import-Akschonen staht later ok in dat [[Special:Log/import|Import
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|ene Version|$1 Versionen}} vun $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mien Brukersiet',
+'tooltip-pt-userpage'             => 'Dien Brukersied',
 'tooltip-pt-anonuserpage'         => 'De Brukersiet för de IP-Adress ünner de du schriffst',
-'tooltip-pt-mytalk'               => 'Mien Diskuschoonssiet',
+'tooltip-pt-mytalk'               => 'Dien Diskuschoonssied',
 'tooltip-pt-anontalk'             => 'Diskuschoon över Ännern vun disse IP-Adress',
 'tooltip-pt-preferences'          => 'Mien Instellen',
 'tooltip-pt-watchlist'            => 'Mien Oppasslist',
-'tooltip-pt-mycontris'            => 'List vun mien Bidreeg',
+'tooltip-pt-mycontris'            => 'List vun dien Bidrääg',
 'tooltip-pt-login'                => 'Du kannst di geern anmellen, dat is aver nich neudig, üm Sieten to bearbeiden.',
 'tooltip-pt-anonlogin'            => 'Du kannst di geern anmellen, dat is aver nich neudig, üm Sieten to bearbeiden.',
 'tooltip-pt-logout'               => 'Afmellen',
 'tooltip-ca-talk'                 => 'Diskuschoon över disse Siet',
 'tooltip-ca-edit'                 => 'Du kannst disse Siet ännern. Bruuk dat vör dat Spiekern.',
-'tooltip-ca-addsection'           => 'En Kommentar to disse Diskuschoonssiet hentofögen.',
+'tooltip-ca-addsection'           => 'En Afsnidd tofögen',
 'tooltip-ca-viewsource'           => 'Disse Siet is schuult. Du kannst den Borntext ankieken.',
 'tooltip-ca-history'              => 'Historie vun disse Siet.',
 'tooltip-ca-protect'              => 'Disse Siet schulen',
@@ -2085,6 +2354,8 @@ All Transwiki-Import-Akschonen staht later ok in dat [[Special:Log/import|Import
 'tooltip-watch'                   => 'Op disse Siet oppassen.',
 'tooltip-recreate'                => 'Siet wedder nee anleggen, ok wenn se wegsmeten worrn is',
 'tooltip-upload'                  => 'Hoochladen',
+'tooltip-rollback'                => 'Rullt all Ännern vun’n letzten Bruker an disse Sied mit een Klick trüch.',
+'tooltip-undo'                    => 'Rullt dit een Ännern trüch un wiest den Text in de Vörschau, dat en Grund för’t Ännern angeven warrn kann.',
 
 # Stylesheets
 'common.css'   => '/** CSS-Kood hier binnen warrt för all Stilvörlagen (Skins) inbunnen */',
@@ -2096,12 +2367,12 @@ All Transwiki-Import-Akschonen staht later ok in dat [[Special:Log/import|Import
 'notacceptable'     => 'Dat Wiki-Server kann kene Daten in enen Format levern, dat dien Klient lesen kann.',
 
 # Attribution
-'anonymous'        => 'Anonyme Bruker vun {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonym Bruker|Anonyme Brukers}} vun {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Bruker $1',
 'lastmodifiedatby' => 'Disse Siet weer dat letzte Maal $2, $1 vun $3 ännert.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Grünnt op Arbeid vun $1.',
 'others'           => 'annere',
-'siteusers'        => '{{SITENAME}}-Bruker $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|Bruker|Brukers}} $1',
 'creditspage'      => 'Sieten-Autoren',
 'nocredits'        => 'Dor is keen Autorenlist för disse Siet verfögbor.',
 
@@ -2121,6 +2392,12 @@ All Transwiki-Import-Akschonen staht later ok in dat [[Special:Log/import|Import
 'numauthors'     => 'Antall vun verschedene Autoren (Siet): $1',
 'numtalkauthors' => 'Antall vun verschedene Autoren (Diskuschoonssiet): $1',
 
+# Skin names
+'skinname-standard'    => 'Klassik',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Kölsch Blau',
+'skinname-chick'       => 'Küken',
+
 # Math options
 'mw_math_png'    => 'Jümmer as PNG dorstellen',
 'mw_math_simple' => 'Eenfach TeX as HTML dorstellen, sünst PNG',
@@ -2141,10 +2418,12 @@ All Transwiki-Import-Akschonen staht later ok in dat [[Special:Log/import|Import
 'markedaspatrollederror-noautopatrol' => 'Du kannst de Saken, de du sülvst ännert hest, nich as nakeken marken.',
 
 # Patrol log
-'patrol-log-page'   => 'Nakiek-Logbook',
-'patrol-log-header' => 'Dit is dat Patrolleer-Logbook.',
-'patrol-log-line'   => '$1 vun $2 as nakeken markt $3',
-'patrol-log-auto'   => '(automaatsch)',
+'patrol-log-page'      => 'Nakiek-Logbook',
+'patrol-log-header'    => 'Dit is dat Patrolleer-Logbook.',
+'patrol-log-line'      => '$1 vun $2 as nakeken markt $3',
+'patrol-log-auto'      => '(automaatsch)',
+'patrol-log-diff'      => 'Version $1',
+'log-show-hide-patrol' => 'Nakiek-Logbook $1',
 
 # Image deletion
 'deletedrevision'                 => 'Löschte ole Version $1',
@@ -2161,6 +2440,9 @@ $1',
 'previousdiff' => '� Gah to den vörigen Ünnerscheed',
 'nextdiff'     => 'Gah to den tokamen Ünnerscheed →',
 
+# Visual comparison
+'visual-comparison' => 'Visuell Vergliek',
+
 # Media information
 'mediawarning'         => "'''Wohrschau:''' Disse Soort Datein kann bööswilligen Programmkood bargen. Dör dat Rünnerladen un Opmaken vun de Datei kann dien Reekner Schaden nehmen.<hr />",
 'imagemaxsize'         => 'Biller op de Bildbeschrievensiet begrenzen op:',
@@ -2173,10 +2455,12 @@ $1',
 'show-big-image'       => 'Dat Bild wat grötter',
 'show-big-image-thumb' => '<small>Grött vun disse Vörschau: $1 × $2 Pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Ne’e Biller',
 'imagelisttext'         => 'Hier is en List vun {{PLURAL:$1|een Bild|$1 Biller}}, sorteert $2.',
 'newimages-summary'     => 'Disse Spezialsiet wiest de Datein, de toletzt hoochladen worrn sünd.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Dateinaam (oder Deel dorvun):',
 'showhidebots'          => '($1 Bots)',
 'noimages'              => 'Kene Biller.',
 'ilsubmit'              => 'Söken',
@@ -2380,6 +2664,18 @@ Wat denn noch an Lenken kummt in de Reeg, dat sünd Utnahmen, bi de dat Bild lie
 'exif-lightsource-24'  => 'ISO Studio Kunstlicht',
 'exif-lightsource-255' => 'Annern Lichtborn',
 
+# Flash modes
+'exif-flash-fired-0'    => 'keen Blitz',
+'exif-flash-fired-1'    => 'Blitz utlööst',
+'exif-flash-return-0'   => 'Blitz mellt nix trüch',
+'exif-flash-return-2'   => 'keen Reflexion vun’n Blitz faststellt',
+'exif-flash-return-3'   => 'Reflexion vun’n Blitz faststellt',
+'exif-flash-mode-1'     => 'twungen Blitz',
+'exif-flash-mode-2'     => 'Blitz utschalt',
+'exif-flash-mode-3'     => 'Auto',
+'exif-flash-function-1' => 'Keen Blitzfunkschoon',
+'exif-flash-redeye-1'   => 'Rode-Ogen-Filter',
+
 'exif-focalplaneresolutionunit-2' => 'Toll',
 
 'exif-sensingmethod-1' => 'Undefineert',
@@ -2516,21 +2812,10 @@ $1
 Wist du de Siet würklich nee anleggen?",
 'recreate'            => 'wedder nee anleggen',
 
-# HTML dump
-'redirectingto' => 'Redirect sett na [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Den Cache vun disse Siet leddig maken?
-
-$1',
 'confirm_purge_button' => 'Jo',
-
-# AJAX search
-'searchcontaining' => "Na Artikels söken, in de ''$1'' binnen is.",
-'searchnamed'      => "Na Artikels söken, de ''$1'' heten doot.",
-'articletitles'    => 'Artikels, de mit „$1“ anfangt',
-'hideresults'      => 'Resultaten verstecken',
-'useajaxsearch'    => 'Bruuk de AJAX-Söök',
+'confirm-purge-top'    => 'Den Cache vun disse Siet leddig maken?',
+'confirm-purge-bottom' => 'Maakt den Cache vun en Sied leddig un sorgt dor för dat de aktuelle Version wiest warrt.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� vörige Siet',
@@ -2550,10 +2835,10 @@ $1',
 'table_pager_empty'        => 'nix funnen',
 
 # Auto-summaries
-'autosumm-blank'   => 'Siet leddig maakt',
+'autosumm-blank'   => 'Sied leddig maakt',
 'autosumm-replace' => 'Siet leddig maakt un ‚$1‘ rinschreven',
 'autoredircomment' => 'Redirect sett na [[$1]]',
-'autosumm-new'     => 'Ne’e Siet: ‚$1‘',
+'autosumm-new'     => 'Ne’e Sied anleggt: ‚$1‘',
 
 # Live preview
 'livepreview-loading' => 'Läädt…',
@@ -2593,6 +2878,7 @@ Du kannst ok de [[Special:Watchlist/edit|normale Sied to’n Ännern]] bruken.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Unbekannt Extension-Tag „$1“',
+'duplicate-defaultsort' => 'Wohrschau: De DEFAULTSORTKEY „$2“ överschrifft den vörher bruukten Slötel „$1“.',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2621,13 +2907,13 @@ Du kannst ok de [[Special:Watchlist/edit|normale Sied to’n Ännern]] bruken.',
 'filepath-submit'  => 'Padd',
 'filepath-summary' => 'Disse Spezialsiet gifft den kumpletten Padd för ene Datei trüch. Biller warrt in vull Oplösen wiest, annere Datein warrt glieks mit dat Programm opropen, dat för de Soort Datein instellt is.
 
-Geev den Dateinaam ahn den Tosatz „{{ns:image}}:“ an.',
+Geev den Dateinaam ahn den Tosatz „{{ns:file}}:“ an.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Söök na Datein, de jüst gliek sünd',
 'fileduplicatesearch-summary'  => 'Söök na Datein, de na jemehr Hash-Tallen jüst gliek sünd.
 
-Geev den Dateinaam ahn dat Präfix „{{ns:image}}:“ in.',
+Geev den Dateinaam ahn dat Präfix „{{ns:file}}:“ in.',
 'fileduplicatesearch-legend'   => 'Söök na Datein, de jüst gliek sünd',
 'fileduplicatesearch-filename' => 'Dateinaam:',
 'fileduplicatesearch-submit'   => 'Söken',
@@ -2657,4 +2943,12 @@ Geev den Dateinaam ahn dat Präfix „{{ns:image}}:“ in.',
 'blankpage'              => 'Leddige Sied',
 'intentionallyblankpage' => 'Disse Sied is mit Afsicht leddig.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Disse Reeg nich ännern<pre>
+#Ünnen köönt Delen vun reguläre Utdrück (de Deel twischen de //) angeven warrn.
+#De warrt mit de URLs vun Biller ut externe Borns vergleken
+#En positiv Vergliek föhrt dorto, dat dat Bild wiest warrt, ans warrt dat Bild blot as Lenk wiest
+#Regen, de mit en # anfangt, warrt as Kommentar behannelt
+#Delen vun reguläre Utdrück na disse Reeg indragen. Disse Reeg nich ännern</pre>',
+
 );
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index e278e680..797e0375 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -15,13 +15,6 @@
 
 $fallback = 'nl';
 
-$skinNames = array(
-	'standard'      => 'Klassiek',
-	'nostalgia'     => 'Nostalgie',
-	'cologneblue'   => 'Keuls blauw',
-	'chick'         => 'Sjiek',
-	'myskin'        => 'MienSkin',
-);
 
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
@@ -32,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Overleg_gebruker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Overleg_$1',
-	NS_IMAGE            => 'Ofbeelding',
-	NS_IMAGE_TALK       => 'Overleg_ofbeelding',
+	NS_FILE             => 'Ofbeelding',
+	NS_FILE_TALK        => 'Overleg_ofbeelding',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
 	NS_TEMPLATE         => 'Sjabloon',
@@ -185,41 +178,49 @@ $specialPageAliases = array(
 	'Disambiguations'           => array( 'Deurverwiespagina\'s' ),
 	'Userlogin'                 => array( 'Anmelden' ),
 	'Userlogout'                => array( 'Ofmelden' ),
+	'CreateAccount'             => array( 'Gebruker_anmaken' ),
 	'Preferences'               => array( 'Veurkeuren' ),
 	'Watchlist'                 => array( 'Volglieste' ),
 	'Recentchanges'             => array( 'Leste_wiezigingen' ),
 	'Upload'                    => array( 'Bestanden_toevoegen' ),
-	'Imagelist'                 => array( 'Ofbeeldingenlieste' ),
+	'Listfiles'                 => array( 'Ofbeeldingenlieste' ),
 	'Newimages'                 => array( 'Nieje_ofbeeldingen' ),
 	'Listusers'                 => array( 'Gebrukerslieste' ),
+	'Listgrouprights'           => array( 'Groepsrechen bekieken' ),
 	'Statistics'                => array( 'Staotestieken' ),
-	'Randompage'                => array( 'Willekeurige_pagina' ),
+	'Randompage'                => array( 'Willekeurig_artikel' ),
 	'Lonelypages'               => array( 'Weespagina\'s' ),
 	'Uncategorizedpages'        => array( 'Pagina\'s_zonder_kattegerie' ),
 	'Uncategorizedcategories'   => array( 'Kattergieën_zonder_kattegerie' ),
 	'Uncategorizedimages'       => array( 'Ofbeeldingen_zonder_kattegerie' ),
+	'Uncategorizedtemplates'    => array( 'Sjablonen_zonder_kattegerie' ),
 	'Unusedcategories'          => array( 'Ongebruken_kattegerieën' ),
 	'Unusedimages'              => array( 'Ongebruken_ofbeeldingen' ),
 	'Wantedpages'               => array( 'Gewunste_pagina\'s' ),
 	'Wantedcategories'          => array( 'Gewunste_kattegerieën' ),
+	'Wantedfiles'               => array( 'Gewunste_bestanden' ),
+	'Wantedtemplates'           => array( 'Gewunste_sjablonen' ),
 	'Mostlinked'                => array( 'Meest_naor_verwezen_pagina\'s' ),
 	'Mostlinkedcategories'      => array( 'Meestgebruken_kattegerieën' ),
-	'Mostcategories'            => array( 'Meeste_kattegerieën' ),
+	'Mostlinkedtemplates'       => array( 'Meest_naor_verwezen_sjablonen' ),
 	'Mostimages'                => array( 'Meeste_ofbeeldingen' ),
+	'Mostcategories'            => array( 'Meeste_kattegerieën' ),
 	'Mostrevisions'             => array( 'Meeste_bewarkingen' ),
 	'Fewestrevisions'           => array( 'Minste_bewarkingen' ),
 	'Shortpages'                => array( 'Korte_artikels' ),
 	'Longpages'                 => array( 'Lange_artikels' ),
 	'Newpages'                  => array( 'Nieje_pagina\'s' ),
 	'Ancientpages'              => array( 'Oudste_pagina\'s' ),
-	'Deadendpages'              => array( 'Doodlopende_deurverwiezingen' ),
+	'Deadendpages'              => array( 'Gien_verwiezingen' ),
 	'Protectedpages'            => array( 'Beveiligen_pagina\'s' ),
+	'Protectedtitles'           => array( 'Beveiligen_titels' ),
 	'Allpages'                  => array( 'Alle_pagina\'s' ),
-	'Prefixindex'               => array( 'Prefixindex' ),
+	'Prefixindex'               => array( 'Veurvoegselindex' ),
 	'Ipblocklist'               => array( 'IP-blokkeerlieste' ),
 	'Specialpages'              => array( 'Speciale_pagina\'s' ),
 	'Contributions'             => array( 'Biedragen' ),
 	'Emailuser'                 => array( 'Berich_sturen' ),
+	'Confirmemail'              => array( 'E-mailbevestigen' ),
 	'Whatlinkshere'             => array( 'Verwiezingen_naor_disse_pagina' ),
 	'Recentchangeslinked'       => array( 'Volg_verwiezingen' ),
 	'Movepage'                  => array( 'Herneum_pagina' ),
@@ -229,7 +230,7 @@ $specialPageAliases = array(
 	'Export'                    => array( 'Uutvoeren' ),
 	'Version'                   => array( 'Versie' ),
 	'Allmessages'               => array( 'Alle_systeemteksen' ),
-	'Log'                       => array( 'Log', 'Logs' ),
+	'Log'                       => array( 'Logboeken' ),
 	'Blockip'                   => array( 'Blokkeer_IP' ),
 	'Undelete'                  => array( 'Weerummeplaosen' ),
 	'Import'                    => array( 'Invoeren' ),
@@ -237,6 +238,7 @@ $specialPageAliases = array(
 	'Unlockdb'                  => array( 'Databanke_vriegeven' ),
 	'Userrights'                => array( 'Gebrukersrechen' ),
 	'MIMEsearch'                => array( 'MIME-zeuken' ),
+	'FileDuplicateSearch'       => array( 'Dubbele_bestanden_zeuken' ),
 	'Unwatchedpages'            => array( 'Neet-evolgen_pagina\'s' ),
 	'Listredirects'             => array( 'Deurverwiezingslieste' ),
 	'Revisiondelete'            => array( 'Versie_vortdoon' ),
@@ -246,11 +248,18 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mien_overleg' ),
 	'Mycontributions'           => array( 'Mien_biedragen' ),
 	'Listadmins'                => array( 'Beheerderslieste' ),
+	'Listbots'                  => array( 'Botlieste' ),
 	'Popularpages'              => array( 'Populaire_artikels' ),
 	'Search'                    => array( 'Zeuken' ),
-	'Resetpass'                 => array( 'Wachwoord_opniej_instellen' ),
+	'Resetpass'                 => array( 'Wachwoord_wiezigen' ),
 	'Withoutinterwiki'          => array( 'Gien_interwiki' ),
-	);
+	'MergeHistory'              => array( 'Geschiedenisse_bie_mekaar_doon' ),
+	'Filepath'                  => array( 'Bestanslokasie' ),
+	'Invalidateemail'           => array( 'E-mail_annuleren' ),
+	'Blankpage'                 => array( 'Lege_pagina' ),
+	'LinkSearch'                => array( 'Verwiezingen_zeuken' ),
+	'DeletedContributions'      => array( 'Vort-ehaolen gebrukersbiedragen' ),
+);
 
 $linkTrail = '/^([a-zäöüïëéèà]+)(.*)$/sDu';
 
@@ -292,17 +301,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Verbarg mien eigen bewarkingen',
 'tog-watchlisthidebots'       => 'Verbarg botgebrukers',
 'tog-watchlisthideminor'      => 'Verbarg kleine wiezigingen in mien volglieste',
+'tog-watchlisthideliu'        => 'Bewarkingen van an-emelde gebrukers op mien volglieste verbargen',
+'tog-watchlisthideanons'      => 'Bewarkingen van annenieme gebrukers op mien volglieste verbargen',
 'tog-nolangconversion'        => 'Ummezetten van varianten uutschakelen',
 'tog-ccmeonemails'            => 'Stuur mien kopieën van berichen an aandere gebrukers',
 'tog-diffonly'                => 'Pagina-inhoud neet onder de an-egeven wiezigingen weergeven.',
 'tog-showhiddencats'          => 'Verbörgen kattegerieën weergeven',
+'tog-noconvertlink'           => 'Paginanaamconversie uutschakelen',
+'tog-norollbackdiff'          => "Wiezigingen vortlaoten nao 't weerummedreien",
 
 'underline-always'  => 'Altied',
 'underline-never'   => 'Nooit',
 'underline-default' => 'Standardinstelling',
 
-'skinpreview' => '(bekieken)',
-
 # Dates
 'sunday'        => 'zundag',
 'monday'        => 'maondag',
@@ -395,7 +406,7 @@ $messages = array(
 'mytalk'         => 'Mien overleg',
 'anontalk'       => 'Overlegpagina veur dit IP-adres',
 'navigation'     => 'Navigasie',
-'and'            => 'en',
+'and'            => '&#32;en',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -432,16 +443,16 @@ $messages = array(
 'talkpagelinktext'  => 'Overleeg',
 'specialpage'       => 'speciale pagina',
 'personaltools'     => 'Persoonlijke instellingen',
-'postcomment'       => 'Opmarking plaosen',
+'postcomment'       => 'Niej onderwarp',
 'articlepage'       => 'Artikel',
 'talk'              => 'Overleeg',
 'views'             => 'Aspekken/acties',
 'toolbox'           => 'Hulpmiddels',
 'userpage'          => 'gebrukerspagina',
 'projectpage'       => 'Bekiek prejekpagina',
-'imagepage'         => 'Beschrievingspagina',
+'imagepage'         => 'Bestanspagina bekieken',
 'mediawikipage'     => 'Berichpagina bekieken',
-'templatepage'      => 'Sjabloonpagina bekieken',
+'templatepage'      => 'Mal bekieken',
 'viewhelppage'      => 'Hulppagina bekieken',
 'categorypage'      => 'Kattegeriepagina bekieken',
 'viewtalkpage'      => 'Teun overlegpagina',
@@ -458,8 +469,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Over {{SITENAME}}',
 'aboutpage'            => 'Project:Info',
-'bugreports'           => 'Kontak',
-'bugreportspage'       => 'Project:Foutrepporten',
 'copyright'            => 'De inhold is beschikbaor onder de $1.',
 'copyrightpagename'    => '{{SITENAME}}-auteursrechen',
 'copyrightpage'        => '{{ns:project}}:Auteursrechen',
@@ -482,9 +491,7 @@ $messages = array(
 
 'badaccess'        => 'Gien toestemming',
 'badaccess-group0' => 'Je hemmen gien toestemming um disse actie uut te voeren.',
-'badaccess-group1' => 'Disse actie kan allinnig uut-evoerd wonnen deur gebrukers dee tot de groep $1 beheuren.',
-'badaccess-group2' => 'Disse actie kan allinnig uut-evoerd wonnen deur gebrukers dee tot een van groepen $1 beheuren.',
-'badaccess-groups' => 'Disse actie kan allinnig uut-evoerd wonnen deur gebrukers dee tot een van de groepen $1 beheuren.',
+'badaccess-groups' => 'Disse actie kan allinnig uut-evoerd wonnen deur gebrukers uut {{PLURAL:$2|de groep|een van de groepen}}: $1.',
 
 'versionrequired'     => 'Versie $1 van MediaWiki is neudig',
 'versionrequiredtext' => 'Versie $1 van MediaWiki is neudig um disse pagina te gebruken. Zie [[Special:Version|Versie]].',
@@ -498,6 +505,8 @@ $messages = array(
 'editsection'             => 'bewark',
 'editold'                 => 'bewark',
 'viewsourceold'           => 'brontekse bekieken',
+'editlink'                => 'bewark',
+'viewsourcelink'          => 'brontekse bekieken',
 'editsectionhint'         => 'Bewarkingsveld: $1',
 'toc'                     => 'Onderwarpen',
 'showtoc'                 => 'Teun',
@@ -512,23 +521,25 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom-feed',
 'page-rss-feed'           => '"$1" RSS-feed',
 'page-atom-feed'          => '"$1" Atom-feed',
-'red-link-title'          => '$1 (besteet nog neet)',
+'red-link-title'          => '$1 (pagina besteet nog neet)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikel',
 'nstab-user'      => 'Gebruker',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Speciaal',
+'nstab-special'   => 'Speciale pagina',
 'nstab-project'   => 'Prejekpagina',
 'nstab-image'     => 'Ofbeelding',
 'nstab-mediawiki' => 'Berich',
-'nstab-template'  => 'Sjabloon',
+'nstab-template'  => 'Mal',
 'nstab-help'      => 'Hulpe',
 'nstab-category'  => 'Kattegerie',
 
 # Main script and global functions
 'nosuchaction'      => 'De op-egeven haandeling besteet neet',
-'nosuchactiontext'  => 'De op-egeven haandeling wonnen neet herkend deur de MediaWiki-pregrammetuur.',
+'nosuchactiontext'  => "De opdrach in 't webadres in ongeldig.
+Je hemmen 't webadres meschien verkeerd in-etik of de verkeerde verwiezing evolg.
+Dit kan oek dujen op een fout in de pregrammetuur van {{SITENAME}}.",
 'nosuchspecialpage' => 'Der besteet gien speciale pagina mit disse naam',
 'nospecialpagetext' => "<big>'''Disse speciale pagina wonnen neet herkend deur de pregrammetuur.'''</big>
 
@@ -579,13 +590,12 @@ Meld \'t dan effen bie een [[Special:ListUsers/sysop|systeembeheerder]] van {{SI
 'cannotdelete'         => 'Kon de pagina of ofbeelding neet vort-edaon wonnen.',
 'badtitle'             => 'Ongeldige naam',
 'badtitletext'         => 'De naam van de op-evreugen pagina is neet geldig, leeg, of een interwiki-verwiezing naor een onbekende of ongeldige wiki.',
-'perfdisabled'         => "Um overbelasting van 't systeem te veurkoemen, ku-j disse optie noen neet gebruken.",
-'perfcached'           => 'Disse gegevens kwammen uut de kas en bin werschienlijk neet akteweel:',
+'perfcached'           => 'Disse gegevens kwammen uut de kas en bin werschienlijk neet actueel:',
 'perfcachedts'         => 'De infermasie dee hieronder steet, is op-esleugen, en is van $1.',
 'querypage-no-updates' => "Opwerderingen veur disse pagina bin op 't mement uut-eschakeld. Data zal noen neet verniejd wonnen.",
 'wrong_wfQuery_params' => 'Parremeters veur wfQuery() wanen verkeerd<br />
 Functie: $1<br />
-Query: $2',
+Zeukopdrachte: $2',
 'viewsource'           => 'Brontekse bekieken',
 'viewsourcefor'        => 'veur "$1"',
 'actionthrottled'      => 'Haandeling tegen-ehuilen',
@@ -593,7 +603,7 @@ Query: $2',
 'protectedpagetext'    => 'Disse pagina is beveilig um bewarkingen te veurkoemen.',
 'viewsourcetext'       => 'Je kunnen de brontekse van disse pagina bewarken en bekieken:',
 'protectedinterface'   => 'Disse pagina bevat een tekse dee gebruuk wonnen veur systeemteksen van de wiki. Allinnig beheerders kunnen disse pagina bewarken.',
-'editinginterface'     => "'''Waorschuwing:''' je bewarken een pagina dee gebruuk wonnen deur de pregrammetuur. Wiezigingen dee an-ebröch wonnen op disse pagina zullen 't uterlijk veur iederene beïnvleujen. Overweeg veur vertalingen um [http://translatewiki.net/wiki/Main_Page?setlang=nds-nl Betawiki] te gebruken, 't vertalingsprejek veur MediaWiki.",
+'editinginterface'     => "'''Waorschuwing:''' je bewarken een pagina dee gebruuk wonnen deur de pregrammetuur. Wiezigingen dee an-ebröch wonnen op disse pagina zullen 't uterlijk veur iederene beïnvleujen. Overweeg veur vertalingen um [http://translatewiki.net/wiki/Main_Page?setlang=nds-nl translatewiki.net] te gebruken, 't vertalingsprejek veur MediaWiki.",
 'sqlhidden'            => '(SQL-zeukopdrachte verbörgen)',
 'cascadeprotected'     => 'Disse pagina is beveilig umdat \'t veurkump in de volgende {{PLURAL:$1|pagina|pagina\'s}}, dee beveilig {{PLURAL:$1|is|bin}} mit de "cascade"-optie:
 $2',
@@ -604,13 +614,13 @@ $2',
 De op-egeven rejen is ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Slichte configurasie: onbekende virusscanner: <i>$1</i>',
+'virus-badscanner'     => "Slichte configurasie: onbekende virusscanner: ''$1''",
 'virus-scanfailed'     => 'scannen is mislok (code $1)',
 'virus-unknownscanner' => 'onbekende virusscanner:',
 
 # Login and logout pages
 'logouttitle'                => 'Ofmelden gebruker',
-'logouttext'                 => "<strong>Je bin noen of-emeld.</strong>
+'logouttext'                 => "'''Je bin noen of-emeld.'''
 
 Je kunnen {{SITENAME}} noen anneniem gebruken of onder disse of een aandere gebrukersnaam je eigen weer anmelden.
 't Kan ween dat der een antal pagina's weer-egeven wonnen asof je an-emeld bin totda-j de kas van joew webblaojeraar leegmaken.",
@@ -622,7 +632,6 @@ Je kunnen {{SITENAME}} noen anneniem gebruken of onder disse of een aandere gebr
 'remembermypassword'         => 'vanzelf anmelden',
 'yourdomainname'             => 'Joew domein',
 'externaldberror'            => 'Der gung iets fout bie de externe authenticering, of je maggen je gebrukersprefiel neet bewarken.',
-'loginproblem'               => "<b>Der was een prebleem mit 't anmelden.</b><br />Prebleem 't opniej!",
 'login'                      => 'Anmelden',
 'nav-login-createaccount'    => 'Anmelden',
 'loginprompt'                => 'Je mutten cookies an hemmen staon um an te kunnen melden bie {{SITENAME}}.',
@@ -633,7 +642,7 @@ Je kunnen {{SITENAME}} noen anneniem gebruken of onder disse of een aandere gebr
 'nologin'                    => 'He-j nog gien gebrukersnaam? $1.',
 'nologinlink'                => 'Maak een gebrukersprefiel an',
 'createaccount'              => 'Niej gebrukersprefiel anmaken',
-'gotaccount'                 => 'Bi-j al eregistreerd? $1.',
+'gotaccount'                 => 'Stao-j al in-eschreven? $1.',
 'gotaccountlink'             => 'Anmelden',
 'createaccountmail'          => 'per e-mail',
 'badretype'                  => 'De wachwoorden dee-j in-etik hemmen bin neet liekeleens.',
@@ -647,8 +656,9 @@ Kies een aandere naam.',
 'yourlanguage'               => 'Taal veur systeemteksen',
 'yourvariant'                => 'Gewunste taal:',
 'yournick'                   => 'Alias veur ondertekeningen',
-'badsig'                     => 'Ongeldige haandtekening; controleer HTML.',
-'badsiglength'               => "De naam is te lange; 't mut minder as {{PLURAL:$1|$1 letter|$1 letters}} hemmen.",
+'badsig'                     => 'Ongeldige haandtekening; HTML naokieken.',
+'badsiglength'               => "Joew haandtekening is te lang.
+'t Mut minder as {{PLURAL:$1|letter|letters}} hemmen.",
 'email'                      => 'Privéberichen',
 'prefs-help-realname'        => '* Echte naam (optioneel): a-j disse optie invullen zal joew echte naam gebruuk wonnen veur toekenningen veur joew warkzaamheen.',
 'loginerror'                 => 'Anmeldingsfout',
@@ -660,9 +670,10 @@ Je kunnen oek aanderen in staot stellen per e-mail kontak mit joe op te nemen vi
 'noname'                     => 'Je mutten een gebrukersnaam opgeven.',
 'loginsuccesstitle'          => 'Succesvol an-emeld',
 'loginsuccess'               => 'Je bin noen an-emeld bie {{SITENAME}} as "$1".',
-'nosuchuser'                 => 'De gebruker "$1" besteet neet.
-Contreleer de spelling of [[Special:UserLogin/signup|maak een nieje gebruker an]].',
-'nosuchusershort'            => 'Der is gien gebruker mit de naam "$1". Controleer de schriefwieze.',
+'nosuchuser'                 => 'Der is gien gebruker mit de naam "$1".
+Gebrukersnamen bin heuflettergeveulig.
+Kiek de schriefwieze effen nao of [[Special:UserLogin/signup|maak een nieje gebruker an]].',
+'nosuchusershort'            => 'Der is gien gebruker mit de naam "$1". Kiek de spelling nao.',
 'nouserspecified'            => 'Vul asjeblief een naam in',
 'wrongpassword'              => "verkeerd wachwoord, prebeer 't opniej.",
 'wrongpasswordempty'         => "Gien wachwoord in-evoerd. Prebeer 't opniej.",
@@ -686,10 +697,10 @@ en blief joew bestaonde wachwoord gebruken.',
 'throttled-mailpassword'     => 'In de leste {{PLURAL:$1|uur|$1 ure}} is der al een wachwoordherinnering estuurd.
 Um misbruuk te veurkoemen wonnen der mar één wachwoordherinnering per {{PLURAL:$1|uur|$1 ure}} verzunnen.',
 'mailerror'                  => "Fout bie 't versturen van berich: $1",
-'acct_creation_throttle_hit' => 'Je hemmen al $1 gebrukersnamen an-emaak. Je kunnen der neet nog meer anmaken.',
-'emailauthenticated'         => 'Joew e-mailadres is bevestig op $1.',
+'acct_creation_throttle_hit' => 'Onder dit IP-adres hemmen luui de veurbieje dag al {{PLURAL:$1|1 gebruker|$1 gebrukers}} an-emaak. Meer is neet toe-estaon in disse periode. Daorumme kunnen gebrukers mit dit IP-adres noen effen gien gebrukers meer anmaken.',
+'emailauthenticated'         => 'Joew e-mailadres is bevestig op $2 um $3.',
 'emailnotauthenticated'      => 'E-mailadres is <strong>nog neet bevestig</strong>. Je ontvangen gien berichen veur de onstaonde opties.',
-'noemailprefs'               => '<strong>Gien e-mailadres in-evoerd</strong>, waordeur de onderstaonde functies neet warken.',
+'noemailprefs'               => 'Gien e-mailadres in-evoerd, waordeur de onderstaonde functies neet warken.',
 'emailconfirmlink'           => 'Bevestig e-mailadres',
 'invalidemailaddress'        => "'t E-mailadres kon neet eaccepteerd wonnen umdat de opmaak ongeldig is. 
 Voer de juuste opmaak van 't adres in of laot 't veld leeg.",
@@ -700,18 +711,27 @@ Voer de juuste opmaak van 't adres in of laot 't veld leeg.",
 Meld je noen an en wiezig \'t wachwoord.
 
 Negeer dit berich as disse gebruker zonder joew toestemming an-emaak is.',
+'login-throttled'            => "Je hemmen leste paor keren te vake eprebeerd um an te melden mit een verkeerd wachwoord.
+Je mutten effen wachen veurda-j 't opniej preberen kunnen.",
 'loginlanguagelabel'         => 'Taal: $1',
 
 # Password reset dialog
-'resetpass'               => 'Wachwoord opniej instellen',
-'resetpass_announce'      => "Je bin an-emeld mit een veurlopige code dee per e-mail toe-estuurd wonnen. Um 't anmelden te voltooien, mu-j een niej wachwoord invoeren:",
-'resetpass_text'          => '<!-- Tekse hier invoegen -->',
-'resetpass_header'        => 'Wachwoord wiezigen',
-'resetpass_submit'        => "Voer 't wachwoord in en meld je an",
-'resetpass_success'       => 'Joew wachwoord is succesvol ewiezig. Je wonnen noen an-emeld...',
-'resetpass_bad_temporary' => 'Ongeldig tiejelijk wachwoord. Je hemmen joew wachwoord al ewiezig of een niej tiejelijk wachwoord an-evreugen.',
-'resetpass_forbidden'     => 'Wachwoorden kunnen neet ewiezig wonnen',
-'resetpass_missing'       => 'Je hemmen gien wachwoord op-egeven.',
+'resetpass'                 => 'Wachwoord wiezigen',
+'resetpass_announce'        => "Je bin an-emeld mit een veurlopige code dee per e-mail toe-estuurd wonnen. Um 't anmelden te voltooien, mu-j een niej wachwoord invoeren:",
+'resetpass_text'            => '<!-- Tekse hier invoegen -->',
+'resetpass_header'          => 'Wachwoord wiezigen',
+'oldpassword'               => 'Wachwoord da-j noen hemmen',
+'newpassword'               => 'Niej wachwoord',
+'retypenew'                 => 'Niej wachwoord (opniej)',
+'resetpass_submit'          => "Voer 't wachwoord in en meld je an",
+'resetpass_success'         => 'Joew wachwoord is succesvol ewiezig. Je wonnen noen an-emeld...',
+'resetpass_bad_temporary'   => 'Ongeldig tiejelijk wachwoord. Je hemmen joew wachwoord al ewiezig of een niej tiejelijk wachwoord an-evreugen.',
+'resetpass_forbidden'       => 'Wachwoorden kunnen neet ewiezig wonnen',
+'resetpass-no-info'         => 'Je mutten an-emeld ween veurda-j disse pagina gebruken kunnen.',
+'resetpass-submit-loggedin' => 'Wachwoord wiezigen',
+'resetpass-wrong-oldpass'   => "'t Veurlopige wachwoord of 't wachwoord da-j noen hemmen is ongeldig.
+Meschien he-j 't wachwoord al ewiezig of een niej veurlopig wachwoord an-evreugen.",
+'resetpass-temp-password'   => 'Veurlopig wachwoord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Vet-edrokken tekse',
@@ -736,8 +756,8 @@ Negeer dit berich as disse gebruker zonder joew toestemming an-emaak is.',
 'hr_tip'          => 'Horizontale liende',
 
 # Edit pages
-'summary'                          => 'Samenvatting',
-'subject'                          => 'Onderwarp',
+'summary'                          => 'Samenvatting:',
+'subject'                          => 'Onderwarp:',
 'minoredit'                        => 'kleine wieziging / spelling',
 'watchthis'                        => 'volg disse pagina',
 'savearticle'                      => 'Pagina opslaon',
@@ -750,8 +770,8 @@ As annenieme gebruker zal joew IP-adres bie elke bewarking veur iederene zichbao
 'missingsummary'                   => "'''Herinnering:''' je hemmen gien samenvatting op-egeven veur de bewarking. A-j noen weer op ''Pagina opslaon'' klikken wonnen de bewarking zonder samenvatting op-esleugen.",
 'missingcommenttext'               => 'Plaos joew opmarking hieronder.',
 'missingcommentheader'             => "'''Let wel:''' je hemmen gien onderwarptitel toe-evoeg. A-j opniej op Pagina opslaon klikken wonnen de bewarking op-esleugen zonder onderwarptitel.",
-'summary-preview'                  => 'Samenvatting naokieken',
-'subject-preview'                  => 'Onderwarp/kop naokieken',
+'summary-preview'                  => 'Samenvatting naokieken:',
+'subject-preview'                  => 'Onderwarp/kop naokieken:',
 'blockedtitle'                     => 'Gebruker is eblokkeerd',
 'blockedtext'                      => "<big>'''Joew gebrukersnaam of IP-adres is eblokkeerd.'''</big>
 
@@ -799,30 +819,32 @@ Geef disse nummers deur a-j kontak mit ene opnemen over de blokkering.',
 'newarticle'                       => '(Niej)',
 'newarticletext'                   => "Disse pagina besteet nog neet. Hieronder ku-j wat schrieven en naokieken of opslaon. A-j hier per ongelok terechtekeumen bin gebruuk dan de knoppe ''veurige'' um weerumme te gaon.",
 'anontalkpagetext'                 => "---- ''Disse overlegpagina heurt bie een annenieme gebruker dee: óf gien gebrukersnaam hef, óf 't neet gebruuk. We gebruken daorumme 't IP-adres ter herkenning, mar 't kan oek ween dat meerdere personen 'tzelfde IP-adres gebruken, en da-j hiermee berichen ontvangen dee neet veur joe bedoeld bin. A-j dit veurkoemen willen, dan ku-j 't bes [[Special:UserLogin|een gebrukersnaam anmaken of anmelden]].''",
-'noarticletext'                    => 'Disse pagina besteet nog neet.
-Je kunnen \'t woord [[Special:Search/{{PAGENAME}}|opzeuken]] in aandere pagina\'s of <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} disse pagina bewarken]</span>.',
+'noarticletext'                    => 'Der steet op hejen gien tekse op disse pagina.
+Je kunnen [[Special:Search/{{PAGENAME}}|de titel opzeuken]] in aandere pagina\'s,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} zeuken in de logboeken],
+of [{{fullurl:{{FULLPAGENAME}}|action=edit}} disse pagina bewarken]</span>.',
 'userpage-userdoesnotexist'        => 'Je bewarken een gebrukerspagina van een gebruker dee neet besteet (gebruker "$1"). Kiek effen nao o-j disse pagina wel anmaken/bewarken willen.',
 'clearyourcache'                   => "'''NB:''' naodat de wiezigingen op-esleugen bin, mut de kas van de webblaojeraar nog leeg-emaak wonnen um 't te kunnen zien. '''Mozilla / Firefox / Safari:''' drok op ''Shift'' + ''Pagina verniejen,'' of ''Ctrl-F5'' of ''Ctrl-R'' (''Command-R'' op een Macintosh-computer); '''Konqueror: '''klik op ''verniejen'' of drok op ''F5;'' '''Opera:''' leeg de kas in ''Extra → Voorkeuren;'' '''Internet Explorer:''' huil ''Ctrl'' in-edrok terwiel je op ''Pagina verniejen'' klikken of ''Ctrl-F5'' gebruken.",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> gebruuk de knoppe 'Pagina naokieken' um joew nieje css/js nao te kieken veurda-j 't opslaon.",
+'usercssjsyoucanpreview'           => "'''Tip:''' gebruuk de knoppe 'Pagina naokieken' um joew nieje css/js nao te kieken veurda-j 't opslaon.",
 'usercsspreview'                   => "'''Dit is allinnig een controle van joew persoonlijke CSS.'''
 ''''t Is nog neet op-esleugen!'''",
-'userjspreview'                    => "'''Denk deran da-j joew nieje gebrukersspecifieke JavaScript allinnig an 't tessen bin, 't is nog neet op-esleugen!'''",
+'userjspreview'                    => "'''Denk deran da-j joew persoonlijke JavaScript allinnig nog mar an 't bekieken bin, 't is nog neet op-esleugen!'''",
 'userinvalidcssjstitle'            => "'''Waorschuwing:''' der is gien uutvoering mit de naam \"\$1\". Vergeet neet dat joew eigen .css- en .js-pagina's beginnen mit een kleine letter, bv. \"{{ns:user}}:Naam/'''m'''onobook.css\" in plaose van \"{{ns:user}}:Naam/'''M'''onobook.css\".",
 'updated'                          => '(Bewark)',
-'note'                             => '<strong>Opmarking:</strong>',
-'previewnote'                      => "<strong>NB: je bin de pagina allinnig nog mar an 't naokieken; de tekse is nog neet op-esleugen!</strong>",
+'note'                             => "'''Opmarking:'''",
+'previewnote'                      => "'''NB: je bin de pagina allinnig nog mar an 't naokieken; de tekse is nog neet op-esleugen!'''",
 'previewconflict'                  => "Disse versie laot zien ho de tekse in 't bovenste veld deruut kump te zien a-j de tekse opslaon.",
-'session_fail_preview'             => "<strong>De bewarking kan neet verwark wonnen wegens een verlies an data. Prebeer 't laoter weer, as 't prebleem dan nog steeds veurkump, prebeer dan opniej an te melden.</strong>",
-'session_fail_preview_html'        => "<strong>Joew wieziging kon neet verwark wonnen umdat sessiegegevens verleuren egaon bin.</strong>
+'session_fail_preview'             => "'''De bewarking kan neet verwark wonnen wegens een verlies an data. Prebeer 't laoter weer, as 't prebleem dan nog steeds veurkump, prebeer dan opniej an te melden.'''",
+'session_fail_preview_html'        => "'''Joew wieziging kon neet verwark wonnen umdat sessiegegevens verleuren egaon bin.'''
 
 ''Umdat in {{SITENAME}} roewe HTML in-eschakeld is, is de weergave dervan verbörgen um te veurkoemen dat 't JavaScript an-evuilen wonnen.''
 
-<strong>As dit een legetieme wieziging is, prebeer 't dan opniej. 
-As 't dan nog preblemen geef, prebeer dan um [[Special:UserLogout|opniej an te melden]].</strong>",
-'token_suffix_mismatch'            => "<strong>De bewarking is eweigerd umdat joew webblaojeraar de leestekens in 't bewarkingstoken verkeerd behaandeld hef. De bewarking is eweigerd um verminking van de paginatekse te veurkoemen. Dit gebeurt soms as der een web-ebaseren proxydiens gebruuk wonnen dee fouten bevat.</strong>",
+'''As dit een legetieme wieziging is, prebeer 't dan opniej. 
+As 't dan nog preblemen geef, prebeer dan um [[Special:UserLogout|opniej an te melden]].'''",
+'token_suffix_mismatch'            => "'''De bewarking is eweigerd umdat joew webblaojeraar de leestekens in 't bewarkingstoken verkeerd behaandeld hef. De bewarking is eweigerd um verminking van de paginatekse te veurkoemen. Dit gebeurt soms as der een web-ebaseren proxydiens gebruuk wonnen dee fouten bevat.'''",
 'editing'                          => 'Bewark: $1',
 'editingsection'                   => 'Bewark: $1 (deelpagina)',
-'editingcomment'                   => 'Bewark: $1 (niej berich)',
+'editingcomment'                   => 'Bewark: $1 (niej onderwarp)',
 'editconflict'                     => 'Bewarkingskonflik: $1',
 'explainconflict'                  => "'''NB:''' een aander hef disse pagina ewiezig naoda-j an disse bewarking begunnen bin.
 
@@ -831,29 +853,33 @@ As 't dan nog preblemen geef, prebeer dan um [[Special:UserLogout|opniej an te m
 Je zullen je eigen wiezigingen in de nieje tekse in mutten passen. Allinnig de tekse in 't bovenste veld wonnen beweerd a-j noen kiezen veur \"Pagina opslaon\".",
 'yourtext'                         => 'Joew tekse',
 'storedversion'                    => 'Op-esleugen versie',
-'nonunicodebrowser'                => '<strong>Waorschuwing: joew webblaojeraar kan neet goed overweg mit unicode, schakel over op een aandere webblaojeraar um de wiezigingen an te brengen!</strong>',
-'editingold'                       => "<strong>Waorschuwing: je bin een ouwere versie van disse pagina an 't bewarken. A-j de veraandering opslaon, wonnen alle niejere versies over-eschreven.</strong>",
+'nonunicodebrowser'                => "'''Waorschuwing: joew webblaojeraar kan neet goed overweg mit unicode, schakel over op een aandere webblaojeraar um de wiezigingen an te brengen!'''",
+'editingold'                       => "'''Waorschuwing: je bin een ouwere versie van disse pagina an 't bewarken. A-j de veraandering opslaon, wonnen alle niejere versies over-eschreven.'''",
 'yourdiff'                         => 'Wiezigingen',
 'copyrightwarning'                 => "NB: Alle biedragen an {{SITENAME}} mutten vrie-egeven wonnen onder de $2 (zie $1 veur infermasie).
 A-j neet willen dat joew tekse deur aandere gebrukers an-epas en verspreid kan wonnen, kies dan neet veur 'Pagina opslaon'.<br />
 Deur op 'Pagina opslaon' te klikken beleuf je da-j disse tekse zelf eschreven hemmen, of over-eneumen hemmen uut een vrieje, openbaore bron.<br />
-<strong>GEBRUUK GIEN MATERIAAL DAT BESCHARMP WONNEN DEUR AUTEURSRECHEN, BEHALVEN A-J DAOR TOESTEMMING VEUR HEMMEN!</strong>",
+'''GEBRUUK GIEN MATERIAAL DAT BESCHARMP WONNEN DEUR AUTEURSRECHEN, BEHALVEN A-J DAOR TOESTEMMING VEUR HEMMEN!'''",
 'copyrightwarning2'                => "Let wel dat alle biedragen an {{SITENAME}} deur aandere gebrukers ewiezig of vort-edaon kunnen wonnen. A-j neet willen dat joew tekse veraanderd wonnen, plaos 't hier dan neet.<br />
 De tekse mut auteursrechvrie ween (zie $1 veur details).
-<strong>GIEN WARK VAN AANDERE LUUI TOEVOEGEN ZONDER TOESTEMMING VAN DE AUTEUR!</strong>",
+'''GIEN WARK VAN AANDERE LUUI TOEVOEGEN ZONDER TOESTEMMING VAN DE AUTEUR!'''",
 'longpagewarning'                  => "Disse pagina is $1 kB groot. 't Bewarken van grote pagina's kan veur preblemen zörgen bie iezelig ouwe webblaojeraars.",
-'longpageerror'                    => "<strong>Foutmelding: de tekse dee-j opslaon willen is $1 kilobytes. Dit is groter as 't toe-estaone maximum van $2 kilobytes. Joew tekse kan neet op-esleugen wonnen.</strong>",
-'readonlywarning'                  => "<strong>Waorschuwing! De databanke is op dit mement in onderhoud; 't is daorumme neet meugelijk um pagina's te wiezigen. Je kunnen de tekse 't beste op de computer opslaon en laoter opniej preberen de pagina te bewarken.</strong>",
-'protectedpagewarning'             => "<strong>Waorschuwing! Disse pagina is beveilig zodat allinnig beheerders 't kunnen wiezigen.</strong>",
-'semiprotectedpagewarning'         => "'''Let op:''' disse pagina is allinnig te bewarken deur gebrukers dee tenminsen 4 dagen in-eschreven bin.",
+'longpageerror'                    => "'''Foutmelding: de tekse dee-j opslaon willen is $1 kilobytes. Dit is groter as 't toe-estaone maximum van $2 kilobytes. Joew tekse kan neet op-esleugen wonnen.'''",
+'readonlywarning'                  => "'''Waorschuwing: De databanke is op dit mement in onderhoud; 't is daorumme neet meugelijk um pagina's te wiezigen.
+Je kunnen de tekse 't beste op de computer opslaon en laoter opniej preberen de pagina te bewarken.'''
+
+As grund is angeven: $1",
+'protectedpagewarning'             => "'''Waorschuwing! Disse pagina is beveilig zodat allinnig beheerders 't kunnen wiezigen.'''",
+'semiprotectedpagewarning'         => "'''Let op:''' disse pagina ku-j allinnig bewarken a-j tenminsen vier dagen in-eschreven staon.",
 'cascadeprotectedwarning'          => "'''Waorschuwing:''' disse pagina is beveilig zodat allinnig beheerders disse pagina kunnen bewarken, dit wonnen edaon umdat disse pagina veurkump in de volgende {{PLURAL:$1|cascade-beveilige pagina|cascade-beveiligen pagina's}}:",
-'titleprotectedwarning'            => "<strong>Waorschuwing: disse pagina is beveilig zodat allinnig bepaolde gebrukers 't an kunnen maken.</strong>",
-'templatesused'                    => 'Gebruken sjablonen op disse pagina:',
-'templatesusedpreview'             => 'Gebruken sjablonen in disse sectie:',
-'templatesusedsection'             => 'Gebruken sjablonen in disse sectie:',
+'titleprotectedwarning'            => "'''Waorschuwing: disse pagina is beveilig zodat allinnig bepaolde gebrukers 't an kunnen maken.'''",
+'templatesused'                    => 'Mallen dee op disse pagina gebruuk bin:',
+'templatesusedpreview'             => 'Mallen dee in disse bewarking gebruuk wonnen:',
+'templatesusedsection'             => 'Mallen dee in disse sectie gebruuk wonnen:',
 'template-protected'               => '(beveilig)',
 'template-semiprotected'           => '(semibeveilig)',
 'hiddencategories'                 => 'Disse pagina vuilt in de volgende verbörgen {{PLURAL:$1|kattegerie|kattegerieën}}:',
+'edittools'                        => '<!-- Disse tekse wonnen weer-egeven onder bewarkings- en bestanstoevoegingsformelieren. -->',
 'nocreatetitle'                    => "'t Anmaken van pagina's is beteund",
 'nocreatetext'                     => "Disse webstee hef de meugelijkheid um nieje pagina's an te maken beteund. Je kunnen pagina's dee al bestaon wiezigen of je kunnen je [[Special:UserLogin|anmelden of een gebrukerspagina anmaken]].",
 'nocreate-loggedin'                => "Je hemmen gien toestemming um nieje pagina's an te maken.",
@@ -864,21 +890,33 @@ De tekse mut auteursrechvrie ween (zie $1 veur details).
 
 Bedenk eers of 't neudig is um disse pagina veerder te bewarken.
 't Logboek mit de rejen(s) waorumme as disse pagina vort-edaon is, wonnen veur de dudelijkheid eteund:",
+'deleted-notice'                   => "Disse pagina is vort-edaon.
+Hieronder steet de infermasie uut 't logboek vort-edaone pagina's.",
+'deletelog-fulllog'                => "'t Hele logboek bekieken",
+'edit-hook-aborted'                => 'De bewarking is of-ebreuken deur een hook.
+Der is gien rejen op-egeven.',
+'edit-gone-missing'                => "De pagina kon neet bie-ewark wonnen.
+'t Schient dat 't vort-edaon is.",
+'edit-conflict'                    => 'Bewarkingskonflik.',
+'edit-no-change'                   => 'Joew bewarking is enegeerd, umdat der gien wieziging an de tekse edaon is.',
+'edit-already-exists'              => "De pagina kon neet an-emaak wonnen.
+'t Besteet à.",
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => "Waorschuwing: disse pagina gebruuk te veule kosbaore parserfuncties.
+'expensive-parserfunction-warning'        => "Waorschuwing: disse pagina gebruuk te veul kosbaore parserfuncties.
 
-Noen bin 't der $1, terwiel 't der minder as $2 mutten ween.",
+Noen {{PLURAL:$1|is|bin}} 't der $1, terwiel 't der minder as $2 {{PLURAL:$2|mut|mutten}} ween.",
 'expensive-parserfunction-category'       => "Pagina's dee te veule kosbaore parserfuncties gebruken",
-'post-expand-template-inclusion-warning'  => "Waorschuwing: de grootte van 't in-evoegen sjabloon is te groot.
-Sommigen sjablonen wonnen neet in-evoeg.",
-'post-expand-template-inclusion-category' => "Pagina's waoveur de grootte van de in-evoegen sjabloon overschrejen wonnen",
-'post-expand-template-argument-warning'   => "Waorschuwing: op disse pagina steet tenminsen één sjabloonparremeter dee te lange zol wonnen as 't uut-eklap wonnen.
-Disse parremeters bin vort-eleuten.",
-'post-expand-template-argument-category'  => "Pagina's mit ontbrekende sjabloonelementen",
+'post-expand-template-inclusion-warning'  => 'Waorschuwing: de grootte van de in-evoegen mal is te groot.
+Sommigen mallen wonnen neet in-evoeg.',
+'post-expand-template-inclusion-category' => "Pagina's dee over de maximumgrootte veur in-evoegen mallen hinne gaon",
+'post-expand-template-argument-warning'   => "Waorschuwing: disse pagina gebruuk tenminsen één parremeter in een mal, dee te groot is, as 't uut-eklap wonnen. Disse parremeters bin vort-eleuten.",
+'post-expand-template-argument-category'  => "Pagina's mit ontbrekende malelementen",
+'parser-template-loop-warning'            => 'Der is een kringloop in mallen waor-eneumen: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Der is over de recursiediepte veur mallen is hinne gaon ($1)',
 
 # "Undo" feature
-'undo-success' => 'De bewarking kan ongedaon-emaak wonnen. Controleer de vergelieking hieronder um vaste te stellen da-j disse haandeling uutvoeren willen, en slao vervolgens de pagina op um de bewarking ongedaon te maken.',
+'undo-success' => 'De bewarking kan ongedaon-emaak wonnen. Kiek de vergelieking hieronder nao um vas te stellen da-j disse haandeling uutvoeren willen, en slao vervolgens de pagina op um de bewarking ongedaon te maken.',
 'undo-failure' => 'De wieziging kon neet ongedaon emaak wonnen vanwegen aandere striejige wiezigingen.',
 'undo-norev'   => "De bewarking kon neet ongedaon-emaak wonnen, umdat 't neet besteet of vort-edaon is.",
 'undo-summary' => 'Versie $1 van [[Special:Contributions/$2|$2]] ([[User talk:$2|overleeg]]) ongedaon-emaak.',
@@ -890,27 +928,27 @@ Disse parremeters bin vort-eleuten.",
 De deur $3 op-egeven rejen is ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Bekiek logboeken veur disse pagina',
-'nohistory'           => 'Der bin gien eerdere versies van disse pagina.',
-'revnotfound'         => 'Wieziging neet evunnen',
-'revnotfoundtext'     => 'De op-evreugen ouwe versie van disse pagina is onvientbaor. Kiek de URL dee-j gebruken nao um naor disse pagina te gaon.',
-'currentrev'          => 'Leste versie',
-'revisionasof'        => 'Versie op $1',
-'revision-info'       => 'Versie op $1 van $2',
-'previousrevision'    => '&larr; eerdere versie',
-'nextrevision'        => 'niejere versie &rarr;',
-'currentrevisionlink' => "versie zoas 't noen is",
-'cur'                 => 'noen',
-'next'                => 'Volgende',
-'last'                => 'leste',
-'page_first'          => 'eerste',
-'page_last'           => 'leste',
-'histlegend'          => 'Verklaoring ofkortingen: (noen) = verschil mit de op-esleugen versie, (veurige) = verschil mit de veurige versie, K = kleine wieziging',
-'deletedrev'          => '[vort-edaon]',
-'histfirst'           => 'Eerste',
-'histlast'            => 'Leste',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(leeg)',
+'viewpagelogs'           => 'Bekiek logboeken veur disse pagina',
+'nohistory'              => 'Der bin gien eerdere versies van disse pagina.',
+'currentrev'             => 'Leste versie',
+'currentrev-asof'        => 'Leste versie van $1',
+'revisionasof'           => 'Versie op $1',
+'revision-info'          => 'Versie op $1 van $2', # Additionally available: $3: revision id
+'previousrevision'       => '&larr; eerdere versie',
+'nextrevision'           => 'niejere versie &rarr;',
+'currentrevisionlink'    => "versie zoas 't noen is",
+'cur'                    => 'noen',
+'next'                   => 'Volgende',
+'last'                   => 'leste',
+'page_first'             => 'eerste',
+'page_last'              => 'leste',
+'histlegend'             => 'Verklaoring ofkortingen: (noen) = verschil mit de op-esleugen versie, (veurige) = verschil mit de veurige versie, K = kleine wieziging',
+'history-fieldset-title' => 'Deur de geschiedenisse blaojen',
+'deletedrev'             => '[vort-edaon]',
+'histfirst'              => 'Eerste',
+'histlast'               => 'Leste',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(leeg)',
 
 # Revision feed
 'history-feed-title'          => 'Wiezigingsoverzichte',
@@ -984,13 +1022,14 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'mergehistory-submit'              => 'Versies bie mekaar doon',
 'mergehistory-empty'               => 'Der bin gien versies dee samen-evoeg kunnen wonnen.',
 'mergehistory-success'             => '$3 {{PLURAL:$3|versie|versies}} van [[:$1]] bin succesvol samen-evoeg naor [[:$2]].',
-'mergehistory-fail'                => 'Kan gien geschiedenisse samenvoegen, controleer opniej de pagina- en tiedparremeters.',
+'mergehistory-fail'                => 'Kan gien geschiedenisse samenvoegen, kiek opniej de pagina- en tiedparremeters nao.',
 'mergehistory-no-source'           => 'Bronpagina $1 besteet neet.',
 'mergehistory-no-destination'      => 'Bestemmingspagina $1 besteet neet.',
 'mergehistory-invalid-source'      => 'De bronpagina mut een geldige titel ween.',
 'mergehistory-invalid-destination' => 'De bestemmingspagina mut een geldige titel ween.',
 'mergehistory-autocomment'         => '[[:$1]] samen-evoeg naor [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] samen-evoeg naor [[:$2]]: $3',
+'mergehistory-same-destination'    => "De bronpagina en doelpagina kunnen neet 'tzelfde ween",
 
 # Merge log
 'mergelog'           => 'Samenvoegingslogboek',
@@ -1003,119 +1042,200 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'difference'              => '(Verschil tussen bewarkingen)',
 'lineno'                  => 'Regel $1:',
 'compareselectedversions' => 'Vergeliek de ekeuzen versies',
+'visualcomparison'        => 'Visuele vergelieking',
+'wikicodecomparison'      => 'Vergelieking wikitekse',
 'editundo'                => 'ongedaonmaken',
 'diff-multi'              => '({{PLURAL:$1|1 tussenliggende versie|$1 tussenliggende versies}} wonnen neet weer-egeven.)',
+'diff-movedto'            => 'herneumd naor $1',
+'diff-styleadded'         => 'stiel $1 derbie edaon',
+'diff-added'              => '$1 der edaon',
+'diff-changedto'          => 'ewiezig in $1',
+'diff-movedoutof'         => 'herneumd buten $1',
+'diff-styleremoved'       => 'stiel $1 vort-edaon',
+'diff-removed'            => '$1 vort-edaon',
+'diff-changedfrom'        => 'ewiezig van $1',
+'diff-src'                => 'bron',
+'diff-withdestination'    => 'mit bestemming $1',
+'diff-with'               => '&#32;mit $1 $2',
+'diff-with-final'         => '&#32;en $1 $2',
+'diff-width'              => 'breedte',
+'diff-height'             => 'heugte',
+'diff-p'                  => "een '''parregraaf'''",
+'diff-blockquote'         => "een '''haakjen'''",
+'diff-h1'                 => "een '''kopjen (nivo 1)'''",
+'diff-h2'                 => "een '''kopjen (nivo 2)'''",
+'diff-h3'                 => "een '''kopjen (nivo 3)'''",
+'diff-h4'                 => "een '''kopjen (nivo 4)'''",
+'diff-h5'                 => "een '''kopjen (nivo 5)'''",
+'diff-pre'                => "een '''veur-eformeteren teksblokke'''",
+'diff-div'                => "een '''deling'''",
+'diff-ul'                 => "een '''lieste zonder nummers'''",
+'diff-ol'                 => "een '''lieste mit nummers'''",
+'diff-li'                 => "een '''liestenonderwarp'''",
+'diff-table'              => "een '''tebel'''",
+'diff-tbody'              => "'''tebelinhoud'''",
+'diff-tr'                 => "een '''rie'''",
+'diff-td'                 => "een '''cel'''",
+'diff-th'                 => "een '''kelomkop'''",
+'diff-br'                 => "een '''nieje regel'''",
+'diff-hr'                 => "een '''horizontale liende'''",
+'diff-code'               => "een '''teksblokke mit pregrammacode'''",
+'diff-dl'                 => "een '''lieste van defenisies'''",
+'diff-dt'                 => "een '''uutdrokking, dee edefenieerd wonnen'''",
+'diff-dd'                 => "een '''defenisie'''",
+'diff-input'              => "een '''formelierveld'''",
+'diff-form'               => "een '''formelier'''",
+'diff-img'                => "een '''ofbeelding'''",
+'diff-span'               => "een '''span'''",
+'diff-a'                  => "een '''verwiezing'''",
+'diff-i'                  => "'''schunedrok'''",
+'diff-b'                  => "'''vet-edrok'''",
+'diff-strong'             => "'''stark'''",
+'diff-em'                 => "'''naodrok'''",
+'diff-font'               => "'''lettertype'''",
+'diff-big'                => "'''groot'''",
+'diff-del'                => "'''vort-edaon'''",
+'diff-tt'                 => "'''vaste breedte'''",
+'diff-sub'                => "'''lege tekse'''",
+'diff-sup'                => "'''hoge tekse'''",
+'diff-strike'             => "'''deurstrepen'''",
 
 # Search results
-'searchresults'             => 'Zeukrisseltaoten',
-'searchresulttext'          => "'''Opmarking:''' een pagina dee kortens an-emaak is ku-j meschien neet vienen via de zeukfunctie. 't Zeuken geet via een speciale zeukdatabanke dee ongeveer um de 30 tot 48 uur bie-ewörk wonnen.",
-'searchsubtitle'            => "Je zochen naor '''[[:$1]]'''",
-'searchsubtitleinvalid'     => 'Veur zeukopdrachte "$1"',
-'noexactmatch'              => "'''Der besteet gien artikel mit de naam $1.''' Je kunnen disse pagina [[:$1|anmaken]].",
-'noexactmatch-nocreate'     => "'''Der besteet gien pagina mit de naam \"\$1\".'''",
-'toomanymatches'            => 'Der wanen te veule risseltaoten. Prebeer asjeblief een aandere zeukopdrachte.',
-'titlematches'              => 'Overeenkoms mit volgende namen',
-'notitlematches'            => 'Gien overeenstemming',
-'textmatches'               => 'Overeenkoms mit teksen',
-'notextmatches'             => 'Gien overeenstemming',
-'prevn'                     => 'veurige $1',
-'nextn'                     => 'volgende $1',
-'viewprevnext'              => '($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 woord|$2 woorden}})',
-'search-result-score'       => 'Relevantie: $1%',
-'search-redirect'           => '(deurverwiezing $1)',
-'search-section'            => '(onderwarp $1)',
-'search-suggest'            => 'Bedoelen je: $1',
-'search-interwiki-caption'  => 'Zusterprejekken',
-'search-interwiki-default'  => '$1 risseltaoten:',
-'search-interwiki-more'     => '(meer)',
-'search-mwsuggest-enabled'  => 'mit anbevelingen',
-'search-mwsuggest-disabled' => 'gien anbevelingen',
-'search-relatedarticle'     => 'Verwant',
-'mwsuggest-disable'         => 'Anbevelingen via AJAX uutschakelen',
-'searchrelated'             => 'verwant',
-'searchall'                 => 'alles',
-'showingresults'            => "Hieronder {{PLURAL:$1|steet '''1''' risseltaot|staon '''$1''' risseltaoten}}  <b>$1</b> vanof nummer <b>$2</b>.",
-'showingresultsnum'         => "Hieronder {{PLURAL:$3|steet '''1''' risseltaot|staon '''$3''' risseltaoten}} vanof nummer '''$2'''.",
-'showingresultstotal'       => "Hieronder {{PLURAL:$3|wordt et risseltaot '''$1''' van '''$3''' weer-egeven|wonnen de risseltaoten '''$1 tot $2''' van '''$3''' weer-egeven}}",
-'nonefound'                 => '<strong>Let wel:</strong> as een zeukopdrachte mislok kump dat vake deur gebruuk van veulveurkoemmende woorden as "de" en "het", dee neet eïndexeerd bin.',
-'powersearch'               => 'Zeuk',
-'powersearch-legend'        => 'Uut-ebreid zeuken',
-'powersearch-ns'            => 'Zeuken in naamruumten:',
-'powersearch-redir'         => 'Deurverwiezingen weergeven',
-'powersearch-field'         => 'Zeuken naor',
-'search-external'           => 'Extern zeuken',
-'searchdisabled'            => 'Zeuken in {{SITENAME}} is neet meugelijk. Je kunnen gebruukmaken van Google. De gegevens over {{SITENAME}} bin meugelijk neet bie-ewörk.',
+'searchresults'                    => 'Zeukrisseltaoten',
+'searchresults-title'              => 'Zeukrisseltaoten veur "$1"',
+'searchresulttext'                 => "'''Opmarking:''' een pagina dee kortens an-emaak is ku-j meschien neet vienen via de zeukfunctie. 't Zeuken geet via een speciale zeukdatabanke dee ongeveer um de 30 tot 48 uur bie-ewörk wonnen.",
+'searchsubtitle'                   => 'Je zochen naor \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|alle pagina\'s dee beginnen mit "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alle pagina\'s dee verwiezen naor "$1"]])',
+'searchsubtitleinvalid'            => 'Veur zeukopdrachte "$1"',
+'noexactmatch'                     => "'''Der besteet gien artikel mit de naam $1.''' Je kunnen disse pagina [[:$1|anmaken]].",
+'noexactmatch-nocreate'            => "'''Der besteet gien pagina mit de naam \"\$1\".'''",
+'toomanymatches'                   => 'Der wanen te veule risseltaoten. Prebeer asjeblief een aandere zeukopdrachte.',
+'titlematches'                     => 'Overeenkoms mit volgende namen',
+'notitlematches'                   => 'Gien overeenstemming',
+'textmatches'                      => 'Overeenkoms mit teksen',
+'notextmatches'                    => 'Gien overeenstemming',
+'prevn'                            => 'veurige $1',
+'nextn'                            => 'volgende $1',
+'viewprevnext'                     => '($1) ($2) ($3)',
+'searchmenu-legend'                => 'Zeukopties',
+'searchmenu-exists'                => "* Pagina '''[[$1]]'''",
+'searchmenu-new'                   => "'''De pagina \"[[:\$1]]\" op disse wiki anmaken!'''",
+'searchhelp-url'                   => 'Help:Inhold',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Paginanamen mit dit veurvoegsel laoten zien]]',
+'searchprofile-articles'           => "Inhouwelijke pagina's",
+'searchprofile-articles-and-proj'  => "Inhouwelijke en prejekpagina's",
+'searchprofile-project'            => "Prejekpagina's",
+'searchprofile-images'             => 'Bestanden',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Uut-ebreid',
+'searchprofile-articles-tooltip'   => 'Zeuken in $1',
+'searchprofile-project-tooltip'    => 'Zeuken in $1',
+'searchprofile-images-tooltip'     => 'Zeuken naor bestanden',
+'searchprofile-everything-tooltip' => "Alle inhoud deurzeuken (oek overlegpagina's)",
+'searchprofile-advanced-tooltip'   => 'Zeuken in de an-egeven naamruumtes',
+'prefs-search-nsdefault'           => 'Zeuken mit standardinstellingen:',
+'prefs-search-nscustom'            => 'Zeuken in an-egeven naamruumtes:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 woord|$2 woorden}})',
+'search-result-score'              => 'Relevantie: $1%',
+'search-redirect'                  => '(deurverwiezing $1)',
+'search-section'                   => '(onderwarp $1)',
+'search-suggest'                   => 'Bedoelen je: $1',
+'search-interwiki-caption'         => 'Zusterprejekken',
+'search-interwiki-default'         => '$1 risseltaoten:',
+'search-interwiki-more'            => '(meer)',
+'search-mwsuggest-enabled'         => 'mit anbevelingen',
+'search-mwsuggest-disabled'        => 'gien anbevelingen',
+'search-relatedarticle'            => 'Verwant',
+'mwsuggest-disable'                => 'Anbevelingen via AJAX uutschakelen',
+'searchrelated'                    => 'verwant',
+'searchall'                        => 'alles',
+'showingresults'                   => "Hieronder {{PLURAL:$1|steet '''1''' risseltaot|staon '''$1''' risseltaoten}}  <b>$1</b> vanof nummer <b>$2</b>.",
+'showingresultsnum'                => "Hieronder {{PLURAL:$3|steet '''1''' risseltaot|staon '''$3''' risseltaoten}} vanof nummer '''$2'''.",
+'showingresultstotal'              => "Hieronder {{PLURAL:$4|wordt et risseltaot '''$1''' van '''$3''' weer-egeven|wonnen de risseltaoten '''$1 tot $2''' van '''$3''' weer-egeven}}",
+'nonefound'                        => "<strong>Let wel:</strong> standard wonnen neet alle naamruumtes deurzoch. A-j in zeukopdrach as veurvoegsel \"''all:'' gebruken wonnen alle pagina's deurzoch (oek overlegpagina's, mallen en gao zo mar deur). Je kunnen oek een naamruumte as veurvoegsel gebruken.",
+'search-nonefound'                 => 'Der bin gien risseltaoten veur de zeukopdrach.',
+'powersearch'                      => 'Zeuk',
+'powersearch-legend'               => 'Uut-ebreid zeuken',
+'powersearch-ns'                   => 'Zeuken in naamruumten:',
+'powersearch-redir'                => 'Deurverwiezingen weergeven',
+'powersearch-field'                => 'Zeuken naor',
+'search-external'                  => 'Extern zeuken',
+'searchdisabled'                   => 'Zeuken in {{SITENAME}} is neet meugelijk. Je kunnen gebruukmaken van Google. De gegevens over {{SITENAME}} bin meugelijk neet bie-ewörk.',
 
 # Preferences page
-'preferences'              => 'Veurkeuren',
-'mypreferences'            => 'Mien veurkeuren',
-'prefs-edits'              => 'Antal bewarkingen:',
-'prefsnologin'             => 'Neet an-meld',
-'prefsnologintext'         => 'Je mutten <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} an-emeld]</span> ween um joew veurkeuren in te kunnen stellen.',
-'prefsreset'               => 'Standardveurkeuren hersteld.',
-'qbsettings'               => 'Paginalieste',
-'qbsettings-none'          => 'Gien',
-'qbsettings-fixedleft'     => 'Links, vaste',
-'qbsettings-fixedright'    => 'Rechs, vaste',
-'qbsettings-floatingleft'  => 'Links, zweven',
-'qbsettings-floatingright' => 'Rechs, zweven',
-'changepassword'           => 'Wachwoord wiezigen',
-'skin'                     => '{{SITENAME}}-uterlijk',
-'math'                     => 'Wiskundige formules',
-'dateformat'               => 'Daotumweergave',
-'datedefault'              => 'Gien veurkeur',
-'datetime'                 => 'Daotum en tied',
-'math_failure'             => 'Wiskundige formule neet begriepelijk',
-'math_unknown_error'       => 'Onbekende fout in formule',
-'math_unknown_function'    => 'Onbekende functie in formule',
-'math_lexing_error'        => 'Lexicografische fout in formule',
-'math_syntax_error'        => 'Syntactische fout in formule',
-'math_image_error'         => "'t Overzetten naor PNG is mislok.",
-'math_bad_tmpdir'          => 'Map veur tiedelijke bestanden veur wiskundige formules besteet neet of is neet creëerbaar.',
-'math_bad_output'          => 'De map veur wiskundebestanden besteet neet of is neet te creëren.',
-'math_notexvc'             => "Kan 't pregramma texvc neet vienen; configureer volgens de beschrieving in math/README.",
-'prefs-personal'           => 'Gebrukersgegevens',
-'prefs-rc'                 => 'Leste wiezigingen',
-'prefs-watchlist'          => 'Volglieste',
-'prefs-watchlist-days'     => 'Antal dagen weergeven:',
-'prefs-watchlist-edits'    => 'Antal wiezigingen in de uut-ebreien volglieste:',
-'prefs-misc'               => 'Overig',
-'saveprefs'                => 'Veurkeuren opslaon',
-'resetprefs'               => 'Standardveurkeuren herstellen',
-'oldpassword'              => 'Wachwoord da-j noen hemmen',
-'newpassword'              => 'Niej wachwoord',
-'retypenew'                => 'Niej wachwoord (opniej)',
-'textboxsize'              => 'Bewarkingsveld',
-'rows'                     => 'Regels',
-'columns'                  => 'Kolommen',
-'searchresultshead'        => 'Zeukrisseltaoten',
-'resultsperpage'           => 'Antal zeukrisseltaoten per pagina',
-'contextlines'             => 'Antal regels per evunnen pagina',
-'contextchars'             => 'Antal tekens per pagina',
-'stub-threshold'           => 'Verwiezingsformettering van <a href="#" class="stub">beginnetjes</a>:',
-'recentchangesdays'        => 'Antal dagen dee eteund mutten wonnen in "leste wiezigingen":',
-'recentchangescount'       => 'Antal wiezigingen in de lieste "leste wiezigingen"',
-'savedprefs'               => 'Veurkeuren bin op-esleugen.',
-'timezonelegend'           => 'Tiedzone',
-'timezonetext'             => "Geef 't antal uren an, dee tussen joew tiedgebied en UTC liggen.",
-'localtime'                => 'Plaoselijke tied',
-'timezoneoffset'           => 'Tiedverschil',
-'servertime'               => 'Tied op de server',
-'guesstimezone'            => 'Vanuut webblaojeraar toevoegen',
-'allowemail'               => 'Berichen van aandere gebrukers toelaoten',
-'prefs-searchoptions'      => 'Zeukinstellingen',
-'prefs-namespaces'         => 'Naamruumtes',
-'defaultns'                => 'Naamruumtes um in te zeuken:',
-'default'                  => 'standard',
-'files'                    => 'Bestanden',
+'preferences'               => 'Veurkeuren',
+'mypreferences'             => 'Mien veurkeuren',
+'prefs-edits'               => 'Antal bewarkingen:',
+'prefsnologin'              => 'Neet an-meld',
+'prefsnologintext'          => 'Je mutten <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} an-emeld]</span> ween um joew veurkeuren in te kunnen stellen.',
+'prefsreset'                => 'Standardveurkeuren hersteld.',
+'qbsettings'                => 'Paginalieste',
+'qbsettings-none'           => 'Gien',
+'qbsettings-fixedleft'      => 'Links, vaste',
+'qbsettings-fixedright'     => 'Rechs, vaste',
+'qbsettings-floatingleft'   => 'Links, zweven',
+'qbsettings-floatingright'  => 'Rechs, zweven',
+'changepassword'            => 'Wachwoord wiezigen',
+'skin'                      => '{{SITENAME}}-uterlijk',
+'skin-preview'              => 'bekieken',
+'math'                      => 'Wiskundige formules',
+'dateformat'                => 'Daotumweergave',
+'datedefault'               => 'Gien veurkeur',
+'datetime'                  => 'Daotum en tied',
+'math_failure'              => 'Wiskundige formule neet begriepelijk',
+'math_unknown_error'        => 'Onbekende fout in formule',
+'math_unknown_function'     => 'Onbekende functie in formule',
+'math_lexing_error'         => 'Lexicografische fout in formule',
+'math_syntax_error'         => 'Syntactische fout in formule',
+'math_image_error'          => "'t Overzetten naor PNG is mislok.",
+'math_bad_tmpdir'           => 'Map veur tiedelijke bestanden veur wiskundige formules besteet neet of is neet creëerbaar.',
+'math_bad_output'           => 'De map veur wiskundebestanden besteet neet of is neet te creëren.',
+'math_notexvc'              => "Kan 't pregramma texvc neet vienen; configureer volgens de beschrieving in math/README.",
+'prefs-personal'            => 'Gebrukersgegevens',
+'prefs-rc'                  => 'Leste wiezigingen',
+'prefs-watchlist'           => 'Volglieste',
+'prefs-watchlist-days'      => 'Antal dagen weergeven:',
+'prefs-watchlist-days-max'  => '(maximaal 7 dagen)',
+'prefs-watchlist-edits'     => 'Antal wiezigingen in de uut-ebreien volglieste:',
+'prefs-watchlist-edits-max' => '(maximale antal: 1.000)',
+'prefs-misc'                => 'Overig',
+'prefs-resetpass'           => 'Wachwoord wiezigen',
+'saveprefs'                 => 'Veurkeuren opslaon',
+'resetprefs'                => 'Standardveurkeuren herstellen',
+'textboxsize'               => 'Bewarkingsveld',
+'prefs-edit-boxsize'        => "Ofmetingen van 't bewarkingsvienster.",
+'rows'                      => 'Regels',
+'columns'                   => 'Kolommen',
+'searchresultshead'         => 'Zeukrisseltaoten',
+'resultsperpage'            => 'Antal zeukrisseltaoten per pagina',
+'contextlines'              => 'Antal regels per evunnen pagina',
+'contextchars'              => 'Antal tekens per pagina',
+'stub-threshold'            => 'Verwiezingsformettering van <a href="#" class="stub">beginnetjes</a>:',
+'recentchangesdays'         => 'Antal dagen dee eteund mutten wonnen in "leste wiezigingen":',
+'recentchangesdays-max'     => '(maximaal $1 {{PLURAL:$1|dag|dagen}})',
+'recentchangescount'        => "Antal wiezigingen in leste wiezigingen, geschiedenisse en logboekpagina's:",
+'savedprefs'                => 'Veurkeuren bin op-esleugen.',
+'timezonelegend'            => 'Tiedzone',
+'timezonetext'              => "Geef 't antal uren an, dee tussen joew tiedgebied en UTC liggen.",
+'localtime'                 => 'Plaoselijke tied:',
+'timezoneselect'            => 'Tiedzone:',
+'timezoneuseserverdefault'  => 'Tied van de server gebruken',
+'timezoneuseoffset'         => 'Aanders (tiedverschil angeven)',
+'timezoneoffset'            => 'Tiedverschil¹:',
+'servertime'                => 'Tied op de server:',
+'guesstimezone'             => 'Vanuut webblaojeraar toevoegen',
+'allowemail'                => 'Berichen van aandere gebrukers toelaoten',
+'prefs-searchoptions'       => 'Zeukinstellingen',
+'prefs-namespaces'          => 'Naamruumtes',
+'defaultns'                 => 'Naamruumtes um in te zeuken:',
+'default'                   => 'standard',
+'files'                     => 'Bestanden',
 
 # User rights
 'userrights'                  => 'Gebrukersrechenbeheer', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Beheer gebrukersgroepen',
 'userrights-user-editname'    => 'Vul een gebrukersnaam in:',
 'editusergroup'               => 'Bewark gebrukersgroepen',
-'editinguser'                 => "Doonde mit 't wiezigen van de gebrukersrechen van '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Doonde mit 't wiezigen van de gebrukersrechen van '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Bewark gebrukersgroep',
 'saveusergroups'              => 'Gebrukergroepen opslaon',
 'userrights-groupsmember'     => 'Lid van:',
@@ -1133,12 +1253,12 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 
 # Groups
 'group'               => 'Groep:',
-'group-user'          => 'Gebrukers',
-'group-autoconfirmed' => 'An-emelde gebrukers',
+'group-user'          => 'gebrukers',
+'group-autoconfirmed' => 'an-emelde gebrukers',
 'group-bot'           => 'bots',
 'group-sysop'         => 'beheerders',
 'group-bureaucrat'    => 'burocraoten',
-'group-suppress'      => 'Toezichhouwers',
+'group-suppress'      => 'toezichhouwers',
 'group-all'           => '(alles)',
 
 'group-user-member'          => 'Gebruker',
@@ -1164,6 +1284,8 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'right-minoredit'            => 'Bewarkingen markeren as klein',
 'right-move'                 => "Pagina's herneumen",
 'right-move-subpages'        => "Pagina's samen mit subpagina's verplaosen",
+'right-move-rootuserpages'   => "Gebrukerspagina's van 't hoogste nivo herneumen",
+'right-movefile'             => 'Bestanden herneumen',
 'right-suppressredirect'     => 'Gien deurverwiezing anmaken op de ouwe naam as een pagina herneumd wonnen',
 'right-upload'               => 'Bestanden toevoegen',
 'right-reupload'             => 'Een bestaond bestand overschrieven',
@@ -1198,8 +1320,8 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'right-noratelimit'          => 'Hef gien tiedsofhankelijke beparkingen',
 'right-import'               => "Pagina's uut aandere wiki's invoeren",
 'right-importupload'         => "Pagina's vanuut een bestand invoeren",
-'right-patrol'               => 'Bewarkingen as econtroleerd markeren',
-'right-autopatrol'           => 'Bewarkingen wonnen autematisch as econtroleerd emarkeerd',
+'right-patrol'               => 'Bewarkingen as econtreleerd markeren',
+'right-autopatrol'           => 'Bewarkingen wonnen autematisch as econtreleerd emarkeerd',
 'right-patrolmarks'          => 'Controletekens in leste wiezigingen bekieken',
 'right-unwatchedpages'       => "Bekiek een lieste mit pagina's dee neet op een volglieste staon",
 'right-trackback'            => 'Een weerummespoor opgeven',
@@ -1214,9 +1336,46 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'rightslogentry' => 'Gebrukersrechen veur $1 ewiezig van $2 naor $3',
 'rightsnone'     => '(gien)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'disse pagina lezen',
+'action-edit'                 => 'disse pagina bewarken',
+'action-createpage'           => "pagina's schrieven",
+'action-createtalk'           => "overlegpagina's anmaken",
+'action-createaccount'        => 'disse gebruker anmaken',
+'action-minoredit'            => 'disse bewarking as klein markeren',
+'action-move'                 => 'disse pagina herneumen',
+'action-move-subpages'        => "disse pagina en de biebeheurende subpagina's herneumen",
+'action-move-rootuserpages'   => "gebrukerspagina's van 't hoogste nivo herneumen",
+'action-movefile'             => 'dit bestand herneumen',
+'action-upload'               => 'dit bestand toevoegen',
+'action-reupload'             => 'dit bestaonde bestand overschrieven',
+'action-reupload-shared'      => 'een aander bestand over dit bestand uut de edelen beweerstee hinne zetten.',
+'action-upload_by_url'        => 'dit bestand vanof een webadres toevoegen',
+'action-writeapi'             => 'de schrief-API bewarken',
+'action-delete'               => 'disse pagina vortdoon',
+'action-deleterevision'       => 'disse versie vortdoon',
+'action-deletedhistory'       => 'de vort-edaone versies van disse pagina bekieken',
+'action-browsearchive'        => "vort-edaone pagina's zeuken",
+'action-undelete'             => 'disse pagina weerummeplaosen',
+'action-suppressrevision'     => 'disse verbörgen versie bekieken en weerummeplaosen',
+'action-suppressionlog'       => 'dit bescharmde logboek bekieken',
+'action-block'                => 'disse gebruker blokkeren',
+'action-protect'              => "'t beveiligingsnivo van disse pagina anpassen",
+'action-import'               => 'disse pagina van een aandere wiki invoeren',
+'action-importupload'         => 'disse pagina invoeren vanof een toe-evoegen bestand',
+'action-patrol'               => 'bewarkingen van aander volk as econtreleerd markeren',
+'action-autopatrol'           => 'eigen bewarkingen as econtreleerd markeren',
+'action-unwatchedpages'       => "bekiek de liest mit pagina's dee neet evolg wonnen",
+'action-trackback'            => 'een trackback opgeven',
+'action-mergehistory'         => 'de geschiedenisse van disse pagina samenvoegen',
+'action-userrights'           => 'alle gebrukersrechen bewarken',
+'action-userrights-interwiki' => "de rechen van gebrukers op aandere wiki's bewarken",
+'action-siteadmin'            => 'de databanke blokkeren of vriegeven',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|wieziging|wiezigingen}}',
 'recentchanges'                     => 'Leste wiezigingen',
+'recentchanges-legend'              => 'Opties veur leste wiezigingen',
 'recentchangestext'                 => 'Op disse pagina ku-j de leste wiezigingen van disse wiki bekieken.',
 'recentchanges-feed-description'    => 'Zeuk naor de alderleste wiezingen op disse wiki in disse feed.',
 'rcnote'                            => "Hieronder {{PLURAL:$1|steet de leste bewarking|staon de leste '''$1''' bewarkingen}} van de of-eleupen {{PLURAL:$2|dag|'''$2''' dagen}} (stand: $5, $4).",
@@ -1240,6 +1399,8 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'rc_categories'                     => 'Kattegeriebeparking (scheiden mit "|")',
 'rc_categories_any'                 => 'alles',
 'newsectionsummary'                 => 'Niej onderwarp: /* $1 */',
+'rc-enhanced-expand'                => 'Details weergeven (hier he-j JavaScript veur neudig)',
+'rc-enhanced-hide'                  => 'Details verbargen',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Volg verwiezigingen',
@@ -1260,12 +1421,12 @@ Aandere beheerders van {{SITENAME}} kunnen de verbörgen inhoud bekieken en 't w
 'upload_directory_read_only'  => "Op 't mement ku-j gien bestanden toevoegen wegens technische rejens ($1).",
 'uploaderror'                 => "Fout bie 't toevoegen van 't bestand",
 'uploadtext'                  => "Gebruuk 't onderstaonde formelier um bestanden toe te voegen.
-Um eerder toe-evoegen bestanden te bekieken of te zeuken ku-j naor de [[Special:ImageList|bestanslieste]] gaon.
+Um eerder toe-evoegen bestanden te bekieken of te zeuken ku-j naor de [[Special:FileList|bestanslieste]] gaon.
 Toe-evoegen bestanden en media dee vort-edaon bin wonnen bie-ehuilen in 't [[Special:Log/upload|logboek mit toe-evoegen bestanden]] en 't [[Special:Log/delete|logboek mit vort-edaon bestanden]].
 
 Um 't bestand in te voegen in een pagina ku-j een van de volgende codes gebruken:
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bestand.jpg]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bestand.png|alternatieve tekst]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bestand.jpg]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bestand.png|alternatieve tekst]]</nowiki>'''
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Bestand.ogg]]</nowiki>''' drekte verwiezing naor een bestand.",
 'upload-permitted'            => 'Toe-estaone bestanstypes: $1.',
 'upload-preferred'            => 'An-ewezen bestanstypes: $1.',
@@ -1273,7 +1434,7 @@ Um 't bestand in te voegen in een pagina ku-j een van de volgende codes gebruken
 'uploadlog'                   => 'Toe-evoegen bestanden',
 'uploadlogpage'               => 'Toe-evoegen bestanden',
 'uploadlogpagetext'           => 'Hieronder steet een lieste mit bestanden dee net niej bin.
-Zie de [[Special:NewImages|gallerieje mit media]] veur een overzichte.',
+Zie de [[Special:NewFiles|gallerieje mit media]] veur een overzichte.',
 'filename'                    => 'Bestansnaam',
 'filedesc'                    => 'Beschrieving',
 'fileuploadsummary'           => 'Beschrieving:',
@@ -1294,26 +1455,29 @@ Toe-eleuten {{PLURAL:\$3|bestanstype is|bestanstypes bin}} \$2.",
 'large-file'                  => "'t Wonnen an-raojen dat bestanden neet groter bin as $1, dit bestand is $2.",
 'largefileserver'             => "'t Bestand is groter as dat de server toesteet.",
 'emptyfile'                   => "'t Bestand da-j toe-evoeg hemmen is leeg. Dit kan koemen deur een tikfout in de bestansnaam. Kiek effen nao of je dit bestand wel bedoelen.",
-'fileexists'                  => "Een ofbeelding mit disse naam besteet al; je wonnen verzoch 't bestand onder een aandere naam toe te voegen. <strong><tt>$1</tt></strong>",
-'filepageexists'              => 'De beschrievingspagina veur dit bestand bestung al op <strong><tt>$1</tt></strong>, mar der besteet nog gien bestand mit disse naam.
+'fileexists'                  => "Een ofbeelding mit disse naam besteet al; je wonnen verzoch 't bestand onder een aandere naam toe te voegen. '''<tt>$1</tt>'''",
+'filepageexists'              => "De beschrievingspagina veur dit bestand bestung al op '''<tt>$1</tt>''', mar der besteet nog gien bestand mit disse naam.
 De samenvatting dee-j op-egeven hemmen zal neet op de beschrievingspagina koemen.
-Bewark de pagina haandmaotig um joew beschrieving daor weer te geven.',
+Bewark de pagina haandmaotig um joew beschrieving daor weer te geven.",
 'fileexists-extension'        => "Een bestand mit een soortgelieke naam besteet al:<br />
-Naam van 't bestand da-j toevoegen wollen: <strong><tt>$1</tt></strong><br />
-Naam van 't bestaonde bestand: <strong><tt>$2</tt></strong><br />
+Naam van 't bestand da-j toevoegen wollen: '''<tt>$1</tt>'''<br />
+Naam van 't bestaonde bestand: '''<tt>$2</tt>'''<br />
 't Enigste verschil is de heufletters/kleine letters van de extensie. Kiek effen nao of de bestanden neet liekelleens bin.",
 'fileexists-thumb'            => "'''<center>Bestaonde ofbeelding</center>'''",
-'fileexists-thumbnail-yes'    => "Dit bestand is een ofbeelding waorvan de grootte verkleind is <i>(ofbeeldingsoverzichte)</i>. Controleer 't bestand <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Dit bestand is een ofbeelding waovan de grootte verkleind is <i>(ofbeeldingsoverzichte)</i>. Kiek 't bestand nao <strong><tt>$1</tt></strong>.<br />
 As de ofbeelding dee-j krek nao-ekeken hemmen dezelfde grootte hef, dan is 't neet neudig um 't opniej toe te voegen.",
-'file-thumbnail-no'           => "De bestansnaam begint mit <strong><tt>$1</tt></strong>. 
-Dit is werschienlijk een verkleinde ofbeelding <i>(overzichsofbeelding)</i>.
+'file-thumbnail-no'           => "De bestansnaam begint mit '''<tt>$1</tt>'''. 
+Dit is werschienlijk een verkleinde ofbeelding ''(overzichsofbeelding)''.
 A-j disse ofbeelding in volle grootte hemmen voeg 't dan toe, wiezig aanders de bestansnaam.",
-'fileexists-forbidden'        => "Een ofbeelding mit disse naam besteet al;
-je wonnen verzoch 't toe te voegen onder een aandere naam. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Een bestand mit disse naam besteet al, en kan neet overschreven wonnen.
+Voeg 't bestand toe onder een aandere naam. 
+[[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => "Der besteet al een bestand mit disse naam in de gezamelijke bestanslokasie.
 A-j 't bestand asnog toevoegen willen, gao dan weerumme en kies een aandere naam.
-[[Image:$1|thumb|center|$1]]",
+[[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => "Dit bestand is liekeleens as {{PLURAL:$1|'t volgende bestand|de volgende bestanden}}:",
+'file-deleted-duplicate'      => "Een bestand dat liekeleens is an dit bestand ([[$1]]) is veurher vort-edaon.
+Raodpleeg 't logboek mit vort-edaone pagina's veurda-j veurdan gaon.",
 'successfulupload'            => 'Bestanstoevoeging was succesvol',
 'uploadwarning'               => 'Waorschuwing',
 'savefile'                    => 'Bestand opslaon',
@@ -1322,7 +1486,8 @@ A-j 't bestand asnog toevoegen willen, gao dan weerumme en kies een aandere naam
 'uploaddisabled'              => 'Bestanden toevoegen is neet meugelijk.',
 'uploaddisabledtext'          => 'Bestandtoevoegingen bin uut-eschakeld.',
 'uploadscripted'              => 'Dit bestand bevat een HTML- of skripcode dat verkeerd deur je webblaojeraar weer-egeven kan wonnen.',
-'uploadcorrupt'               => "De inhoud van 't bestand kan neet in overeenstemming ebröch wonnen mit de extentie. Controleer 't bestand, en prebeer daornao 't bestand opniej toe te voegen.",
+'uploadcorrupt'               => "'t Bestand is kerrup of hef een verkeerde extensie. 
+Kiek 't bestand nao en voeg 't bestand opniej toe.",
 'uploadvirus'                 => "'t Bestand bevat een virus! Details: $1",
 'sourcefilename'              => 'Oorspronkelijk bestansnaam',
 'destfilename'                => 'Opslaon as (optioneel)',
@@ -1333,7 +1498,7 @@ A-j 't bestand asnog toevoegen willen, gao dan weerumme en kies een aandere naam
 
 Bedenk eers of 't inderdaod de bedoeling is dat dit bestand toe-evoeg wonnen.
 't Logboek mit vort-edaone pagina's ku-j hier vienen:",
-'filename-bad-prefix'         => 'De naam van \'t bestand da-j an \'t toevoegen bin begint mit <strong>"$1"</strong>, wat een neet-beschrievende naam is dee meestentieds autematisch deur een digitale camera egeven wonnen. Kies een dudelijke naam veur \'t bestand.',
+'filename-bad-prefix'         => "De naam van 't bestand da-j an 't toevoegen bin begint mit '''\"\$1\"''', wat een neet-beschrievende naam is dee meestentieds autematisch deur een digitale camera egeven wonnen. Kies een dudelijke naam veur 't bestand.",
 
 'upload-proto-error'      => 'Verkeerde protocol',
 'upload-proto-error-text' => 'Um op disse meniere bestanden toe te voegen mutten webadressen beginnen mit <code>http://</code> of <code>ftp://</code>.',
@@ -1354,20 +1519,21 @@ Bedenk eers of 't inderdaod de bedoeling is dat dit bestand toe-evoeg wonnen.
 'upload_source_url'  => ' (een geldig, pebliek toegankelijk webadres)',
 'upload_source_file' => ' (een bestand op joew computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Op disse speciale pagina ku-j alle toe-evoegen bestanden bekieken.
+# Special:ListFiles
+'listfiles-summary'     => 'Op disse speciale pagina ku-j alle toe-evoegen bestanden bekieken.
 Standard wonnen de les toe-evoegen bestanden bovenan de lieste ezet.
 Klikken op een kelomkop veraandert de sortering.',
-'imagelist_search_for'  => 'Zeuk op ofbeeldingnaam:',
+'listfiles_search_for'  => 'Zeuk op ofbeeldingnaam:',
 'imgfile'               => 'bestand',
-'imagelist'             => 'Ofbeeldingenlieste',
-'imagelist_date'        => 'Daotum',
-'imagelist_name'        => 'Naam',
-'imagelist_user'        => 'Gebruker',
-'imagelist_size'        => 'Grootte (bytes)',
-'imagelist_description' => 'Beschrieving',
-
-# Image description page
+'listfiles'             => 'Ofbeeldingenlieste',
+'listfiles_date'        => 'Daotum',
+'listfiles_name'        => 'Naam',
+'listfiles_user'        => 'Gebruker',
+'listfiles_size'        => 'Grootte (bytes)',
+'listfiles_description' => 'Beschrieving',
+'listfiles_count'       => 'Versies',
+
+# File description page
 'filehist'                       => 'Bestansgeschiedenisse',
 'filehist-help'                  => "Klik op een daotum/tied um 't bestand te zien zoas 't to was.",
 'filehist-deleteall'             => 'alles vortdoon',
@@ -1375,12 +1541,18 @@ Klikken op een kelomkop veraandert de sortering.',
 'filehist-revert'                => 'weerummedreien',
 'filehist-current'               => "zoas 't noen is",
 'filehist-datetime'              => 'Daotum/tied',
+'filehist-thumb'                 => 'Ofbeeldingsoverzichte',
+'filehist-thumbtext'             => 'Ofbeeldingsoverzichte veur versie van $1',
+'filehist-nothumb'               => 'Gien ofbeeldingsoverzichte',
 'filehist-user'                  => 'Gebruker',
 'filehist-dimensions'            => 'Ofmetingen',
 'filehist-filesize'              => 'Bestansgrootte',
 'filehist-comment'               => 'Opmarkingen',
-'imagelinks'                     => 'Gebruuk van dit bestand',
+'imagelinks'                     => 'Verwiezingen naor dit bestand',
 'linkstoimage'                   => "Disse ofbeelding wonnen gebruuk op de volgende {{PLURAL:$1|pagina|$1 pagina's}}:",
+'linkstoimage-more'              => 'Der {{PLURAL:$2|is|bin}} meer as $1 {{PLURAL:$1|verwiezing|verwiezingen}} naor dit bestand.
+De volgende lieste geef allinnig de eerste {{PLURAL:$1|verwiezing|$1 verwiezingen}} naor dit bestand weer.
+De [[Special:WhatLinksHere/$2|hele lieste]] is oek beschikbaor.',
 'nolinkstoimage'                 => 'Ofbeelding is neet in gebruuk.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Meer verwiezingen]] naor dit bestand bekieken.',
 'redirectstofile'                => "{{PLURAL:$1|'t Volgende bestand verwies|De volgende $1 bestanden verwiezen}} deur naor dit bestand:",
@@ -1411,7 +1583,7 @@ Klikken op een kelomkop veraandert de sortering.',
 # File deletion
 'filedelete'                  => '$1 vortdoon',
 'filedelete-legend'           => 'Bestand vortdoon',
-'filedelete-intro'            => "Je doon '''[[Media:$1|$1]]''' noen vort.",
+'filedelete-intro'            => "Je doon 't bestand '''[[Media:$1|$1]]''' noen vort samen mit de geschiedenisse dervan.",
 'filedelete-intro-old'        => "Je bin de versie van '''[[Media:$1|$1]]''' van [$4 $3, $2] vort an 't doon.",
 'filedelete-comment'          => 'Opmarking:',
 'filedelete-submit'           => 'Vortdoon',
@@ -1419,7 +1591,6 @@ Klikken op een kelomkop veraandert de sortering.',
 'filedelete-success-old'      => "De versie van '''[[Media:$1|$1]]''' van $3, $2 is vort-edaon.",
 'filedelete-nofile'           => "'''$1''' besteet neet.",
 'filedelete-nofile-old'       => "Der is gien versie van '''$1''' in 't archief mit de an-egeven eigenschappen.",
-'filedelete-iscurrent'        => 'Je preberen de niejste versie van dit bestand vort te doon. Zet eers een ouwere versie weerumme.',
 'filedelete-otherreason'      => 'Aandere rejen:',
 'filedelete-reason-otherlist' => 'Aandere rejen',
 'filedelete-reason-dropdown'  => '*Veulveurkoemende rejens
@@ -1440,38 +1611,44 @@ Klikken op een kelomkop veraandert de sortering.',
 'listredirects' => 'Lieste van deurverwiezingen',
 
 # Unused templates
-'unusedtemplates'     => 'Ongebruken sjablonen',
-'unusedtemplatestext' => "Hieronder staon alle pagina in de naamruumte {{ns:template}} dee op gien enkele pagina gebruuk wonnen.
-Vergeet neet de verwiezingen te contreleren veurda-j 't sjabloon vortdoon.",
+'unusedtemplates'     => 'Ongebruken mallen',
+'unusedtemplatestext' => "Hieronder staon alle pagina's in de naamruumte {{ns:template}} dee op gien enkele pagina gebruuk wonnen.
+Vergeet neet de verwiezingen nao te kieken veurda-j de mal vortdoon.",
 'unusedtemplateswlh'  => 'aandere verwiezingen',
 
 # Random page
 'randompage'         => 'Willekeurig artikel',
-'randompage-nopages' => "Der staon gien pagina's in disse naamruumte.",
+'randompage-nopages' => 'Der staon gien pagina\'s in de naamruumte "$1".',
 
 # Random redirect
 'randomredirect'         => 'Willekeurige deurverwiezing',
-'randomredirect-nopages' => 'Der staon gien deurverwiezingen in disse naamruumte.',
+'randomredirect-nopages' => 'Der staon gien deurverwiezingen in de naamruumte "$1".',
 
 # Statistics
-'statistics'             => 'Staotestieken',
-'sitestats'              => 'Staotestieken van {{SITENAME}}',
-'userstats'              => 'Gebrukerstaotestieken',
-'sitestatstext'          => "In totaal {{PLURAL:$1|steet der '''1''' pagina|staon der '''$1''' pagina's}} in de databanke van disse {{SITENAME}}. Hier zitten de overlegpagina's, pagina's over Wikipedie, iezelig korte artikels, deurstuurpagina's en een antal aandere pagina's dee neet as artikel mee-eteld wonnen bie in. Zonder disse pagina's {{PLURAL:$2|is der ongeveer '''1''' artikel|bin der ongeveer '''$2''' artikels}}.
-
-Der {{PLURAL:$8|is '''1''' bestand|bin '''$8''' bestanden}} toe-evoeg.
-
-Der {{PLURAL:$3|is '''1''' pagina|bin '''$3''' pagina's}} weer-egeven en '''$4''' {{PLURAL:$4|bewarking|bewarkingen}} edaon sins {{SITENAME}} op-ezet is. Dit geef een gemiddelde van '''$5''' bewarkingen per pagina en '''$6''' weer-egeven pagina's per bewarking.
-
-De lengte van de [http://www.mediawiki.org/wiki/Manual:Job_queue taakwachrie] is '''$7'''.",
-'userstatstext'          => "Der {{PLURAL:$1|is '''1''' an-emelde gebruker|bin '''$1''' an-emelde gebrukers}}. Daovan  {{PLURAL:$2|hef|hemmen}} der '''$2''' (van '''$4%''') $5rechen.",
-'statistics-mostpopular' => "Meestbekeken pagina's",
+'statistics'                   => 'Staotestieken',
+'statistics-header-pages'      => 'Paginastaotestieken',
+'statistics-header-edits'      => 'Bewarkingsstaotestieken',
+'statistics-header-views'      => 'Staotestieken bekieken',
+'statistics-header-users'      => 'Gebrukerstaotestieken',
+'statistics-articles'          => "Inhouwelijke pagina's",
+'statistics-pages'             => "Pagina's",
+'statistics-pages-desc'        => "Alle pagina's in de wiki, oek overlegpagina's, deurverwiezingen, en gao zo mar deur.",
+'statistics-files'             => 'Bestanden',
+'statistics-edits'             => "Paginabewarkingen vanof 't begin van {{SITENAME}}",
+'statistics-edits-average'     => 'Gemiddeld antal bewarkingen per pagina',
+'statistics-views-total'       => "Totaal antal weer-egeven pagina's",
+'statistics-views-peredit'     => "Weer-egeven pagina's per bewarking",
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Jobqueuelengte]',
+'statistics-users'             => 'In-eschreven [[Special:ListUsers|gebrukers]]',
+'statistics-users-active'      => 'Actieve gebrukers',
+'statistics-users-active-desc' => 'Gebrukers dee de veurbieje {{PLURAL:$1|dag|$1 dagen}} een haandeling uut-evoerd hemmen',
+'statistics-mostpopular'       => "Meestbekeken pagina's",
 
 'disambiguations'      => "Deurverwiespagina's",
 'disambiguationspage'  => 'Template:Dv',
 'disambiguations-text' => "De onderstaonde pagina's verwiezen naor een '''deurverwiespagina'''. Disse verwiezingen mutten eigenlijks rechstreeks verwiezen naor 't juuste onderwarp.
 
-Pagina's wonnen ezien as een deurverwiespagina, as 't sjabloon gebruuk wonnen dat vermeld steet op [[MediaWiki:Disambiguationspage]]",
+Pagina's wonnen ezien as een deurverwiespagina, as de mal gebruuk wonnen dee vermeld steet op [[MediaWiki:Disambiguationspage]]",
 
 'doubleredirects'            => 'Dubbele deurverwiezingen',
 'doubleredirectstext'        => "Op elke regel steet de eerste deurstuurpagina, de tweede deurstuurpagina en de eerste regel van de tweede deurverwiezing. Meestentieds is leste pagina 't eigenlijke doel.",
@@ -1479,7 +1656,7 @@ Pagina's wonnen ezien as een deurverwiespagina, as 't sjabloon gebruuk wonnen da
 'double-redirect-fixer'      => 'Deurverwiezingsverbeteraar',
 
 'brokenredirects'        => 'Doodlopende deurverwiezingen',
-'brokenredirectstext'    => "De onderstaonde pagina's bevatten een deurverwiezingen naor een neet-bestaonde pagina.",
+'brokenredirectstext'    => 'Disse deurverwiezingen verwiezen naor een neet-bestaonde pagina.',
 'brokenredirects-edit'   => '(bewark)',
 'brokenredirects-delete' => '(vortdoon)',
 
@@ -1499,36 +1676,40 @@ Pagina's wonnen ezien as een deurverwiespagina, as 't sjabloon gebruuk wonnen da
 'nviews'                  => '{{PLURAL:$1|1 keer|$1 keer}} bekeken',
 'specialpage-empty'       => 'Disse pagina is leeg.',
 'lonelypages'             => "Weespagina's",
-'lonelypagestext'         => "Naor de onderstaonde pagina's wonnen neet verwezen of is neet in-evoeg as sjabloon in aandere pagina van {{SITENAME}}.",
+'lonelypagestext'         => "Naor disse pagina's wonnen neet verwezen vanuut {{SITENAME}} en ze bin oek nargens in-evoeg.",
 'uncategorizedpages'      => "Pagina's zonder kattegerie",
 'uncategorizedcategories' => 'Kattegerieën zonder kattegerie',
 'uncategorizedimages'     => 'Ofbeeldingen zonder kattegerie',
-'uncategorizedtemplates'  => 'Sjablonen zonder kattegerie',
+'uncategorizedtemplates'  => 'Mallen zonder kattegerie',
 'unusedcategories'        => 'Ongebruken kattegerieën',
 'unusedimages'            => 'Ongebruken ofbeeldingen',
 'popularpages'            => 'Populaire artikels',
 'wantedcategories'        => 'Gewunste kattegerieën',
 'wantedpages'             => "Gewunste pagina's",
-'missingfiles'            => 'Ontbrekende bestanden',
+'wantedfiles'             => 'Gewunste bestanden',
+'wantedtemplates'         => 'Gewunste mallen',
 'mostlinked'              => "Pagina's waor 't meest naor verwezen wonnen",
 'mostlinkedcategories'    => 'Meestgebruken kattegerieën',
-'mostlinkedtemplates'     => "Sjablonen dee 't meest gebruuk wonnen",
+'mostlinkedtemplates'     => "Mallen dee 't meest gebruuk wonnen",
 'mostcategories'          => 'Artikels mit de meeste kattegerieën',
 'mostimages'              => 'Meestgebruken ofbeeldingen',
 'mostrevisions'           => 'Artikels mit de meeste bewarkingen',
-'prefixindex'             => 'Veurvoegselindex',
+'prefixindex'             => "Alle pagina's op veurvoegsel",
 'shortpages'              => 'Korte artikels',
 'longpages'               => 'Lange artikels',
 'deadendpages'            => "Pagina's zonder verwiezingen",
 'deadendpagestext'        => "De onderstaonde pagina's verwiezen neet naor aandere pagina's in disse wiki.",
 'protectedpages'          => "Pagina's dee beveilig bin",
 'protectedpages-indef'    => 'Allinnig blokkeringen zonder verloopdaotum',
+'protectedpages-cascade'  => 'Allinnig beveiligingen mit de cascade-optie',
 'protectedpagestext'      => "De volgende pagina's bin beveilig en kunnen neet herneumd of bewark wonnen.",
 'protectedpagesempty'     => "Der bin op 't mement gien beveiligen pagina's",
 'protectedtitles'         => 'Beveiligen titels',
 'protectedtitlestext'     => "De volgende pagina's bin beveilig zoda-ze neet opniej an-emaak kunnen wonnen",
 'protectedtitlesempty'    => 'Der bin noen gien titels beveilig dee an disse parremeters voldoon.',
 'listusers'               => 'Gebrukerslieste',
+'listusers-editsonly'     => 'Allinnig gebrukers mit bewarkingen weergeven',
+'usereditcount'           => '$1 {{PLURAL:$1|bewarking|bewarkingen}}',
 'newpages'                => 'Nieje artikels',
 'newpages-username'       => 'Gebrukersnaam:',
 'ancientpages'            => 'Artikels dee lange neet bewörk bin',
@@ -1549,14 +1730,13 @@ Pagina's wonnen ezien as een deurverwiespagina, as 't sjabloon gebruuk wonnen da
 'booksources-search-legend' => 'Zeuk infermasie over een boek',
 'booksources-go'            => 'Zeuk',
 'booksources-text'          => "Hieronder steet een lieste mit verwiezingen naor aandere websteeën dee nieje of gebruken boeken verkopen, en hemmen meschien meer infermasie over 't boek da-j zeuken:",
+'booksources-invalid-isbn'  => 'De op-egeven ISBN klop neet; kiek effen nao o-j gien fout emaak hemmen bie de invoer.',
 
 # Special:Log
 'specialloguserlabel'  => 'Gebruker:',
 'speciallogtitlelabel' => 'Naam:',
 'log'                  => 'Logboeken',
 'all-logs-page'        => 'Alle logboeken',
-'log-search-legend'    => 'Logboeken deurzeuken',
-'log-search-submit'    => 'Zeuk',
 'alllogstext'          => "Dit is 't combinasielogboek van {{SITENAME}}. 
 Je kunnen oek kiezen veur bepaolde logboeken en filteren op gebruker (heuflettergeveulig) en titel (heuflettergeveulig).",
 'logempty'             => "Der steet gien infermasie in 't logboek dee voldut an disse criteria.",
@@ -1568,6 +1748,7 @@ Je kunnen oek kiezen veur bepaolde logboeken en filteren op gebruker (heufletter
 'nextpage'          => 'Volgende pagina ($1)',
 'prevpage'          => 'Veurige pagina ($1)',
 'allpagesfrom'      => "Teun pagina's vanof:",
+'allpagesto'        => "Pagina's bekieken tot:",
 'allarticles'       => 'Alle artikels',
 'allinnamespace'    => "Alle pagina's (naamruumte $1)",
 'allnotinnamespace' => "Alle pagina's (neet in naamruumte $1)",
@@ -1589,42 +1770,70 @@ Zie oek [[Special:WantedCategories|gewunste kattegerieën]].",
 'special-categories-sort-count' => 'op antal sorteren',
 'special-categories-sort-abc'   => 'alfebetisch sorteren',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Vort-edaone gebrukersbiedragen',
+
+# Special:LinkSearch
+'linksearch'       => 'Uutgaonde verwiezingen',
+'linksearch-pat'   => 'Zeukpetroon:',
+'linksearch-ns'    => 'Naamruumte:',
+'linksearch-ok'    => 'Zeuken',
+'linksearch-text'  => 'Wildcards zoas "*.wikipedia.org" of "*.org" bin toe-estaon.<br />
+Ondersteunde protecollen: <tt>$1</tt>',
+'linksearch-line'  => '$1 hef een verwiezing in $2',
+'linksearch-error' => "Wildcards bin allinnig toe-estaon an 't begin van een webadres.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Teun vanof:',
 'listusers-submit'   => 'Teun',
 'listusers-noresult' => 'Gien gebrukers evunnen. Zeuk oek naor varianten mit kleine letters of heufletters.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logboek nieje gebrukers',
+'newuserlogpagetext'          => 'Hieronder staon de niej in-eschreven gebrukers',
+'newuserlog-byemail'          => 'wachwoord is verzunnen via de liendepos',
+'newuserlog-create-entry'     => 'Nieje gebruker',
+'newuserlog-create2-entry'    => 'hef nieje gebruker $1 eregistreerd',
+'newuserlog-autocreate-entry' => 'Gebruker autematisch an-emaak',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Rechen van gebrukersgroepen',
-'listgrouprights-summary'  => 'Op disse pagina staon de gebrukersgroepen van disse wiki beschreven, mit de biebeheurende rechen.
+'listgrouprights'                 => 'Rechen van gebrukersgroepen',
+'listgrouprights-summary'         => 'Op disse pagina staon de gebrukersgroepen van disse wiki beschreven, mit de biebeheurende rechen.
 Meer infermasie over de rechen ku-j [[{{MediaWiki:Listgrouprights-helppage}}|hier vienen]].',
-'listgrouprights-group'    => 'Groep',
-'listgrouprights-rights'   => 'Rechen',
-'listgrouprights-helppage' => 'Help:Gebrukersrechen',
-'listgrouprights-members'  => '(lejenlieste)',
+'listgrouprights-group'           => 'Groep',
+'listgrouprights-rights'          => 'Rechen',
+'listgrouprights-helppage'        => 'Help:Gebrukersrechen',
+'listgrouprights-members'         => '(lejenlieste)',
+'listgrouprights-addgroup'        => 'Kan gebrukers bie disse {{PLURAL:$2|groep|groepen}} zetten: $1',
+'listgrouprights-removegroup'     => 'Kan gebrukers uut disse {{PLURAL:$2|groep|groepen}} haolen: $1',
+'listgrouprights-addgroup-all'    => 'Kan gebrukers bie alle groepen zetten',
+'listgrouprights-removegroup-all' => 'Kan gebrukers uut alle groepen haolen',
 
 # E-mail user
-'mailnologin'     => 'Neet an-emeld.',
-'mailnologintext' => 'Je mutten [[Special:UserLogin|an-emeld]] ween en een geldig e-mailadres in "[[Special:Preferences|mien veurkeuren]]" invoeren um disse functie te kunnen gebruken.',
-'emailuser'       => 'Een berich sturen',
-'emailpage'       => 'Gebruker een berich sturen',
-'emailpagetext'   => "Deur middel van dit formelier ku-j een berich sturen naor disse gebruker. 
+'mailnologin'      => 'Neet an-emeld.',
+'mailnologintext'  => 'Je mutten [[Special:UserLogin|an-emeld]] ween en een geldig e-mailadres in "[[Special:Preferences|mien veurkeuren]]" invoeren um disse functie te kunnen gebruken.',
+'emailuser'        => 'Een berich sturen',
+'emailpage'        => 'Gebruker een berich sturen',
+'emailpagetext'    => "Deur middel van dit formelier ku-j een berich sturen naor disse gebruker. 
 't Adres da-j op-egeven hemmen bie [[Special:Preferences|joew veurkeuren]] zal as ofzender gebruuk wonnen.
 De ontvanger kan dus drek beantwoorden.",
-'usermailererror' => "Foutmelding bie 't versturen:",
-'defemailsubject' => 'Berich van {{SITENAME}}',
-'noemailtitle'    => 'Gebruker hef gien e-mailadres op-egeven',
-'noemailtext'     => 'Disse gebruker hef gien geldig e-mailadres in-evoerd, of wil gien berichen van aandere gebrukers ontvangen.',
-'emailfrom'       => 'Van:',
-'emailto'         => 'An:',
-'emailsubject'    => 'Onderwarp:',
-'emailmessage'    => 'Berich:',
-'emailsend'       => 'Versturen',
-'emailccme'       => 'Stuur mien een kopie van dit berich.',
-'emailccsubject'  => 'Kopie van joew berich an $1: $2',
-'emailsent'       => 'Berich verstuurd',
-'emailsenttext'   => 'Berich is verzunnen.',
-'emailuserfooter' => 'Dit berich is verstuurd deur $1 an $2 deur de functie "Een berich sturen" van {{SITENAME}} te gebruken.',
+'usermailererror'  => "Foutmelding bie 't versturen:",
+'defemailsubject'  => 'Berich van {{SITENAME}}',
+'noemailtitle'     => 'Gebruker hef gien e-mailadres op-egeven',
+'noemailtext'      => 'Disse gebruker hef gien geldig e-mailadres in-evoerd.',
+'nowikiemailtitle' => 'E-mails bin neet toe-estaon',
+'nowikiemailtext'  => 'Disse gebruker wil gien e-mails toe-estuurd kriegen van aandere gebrukers.',
+'email-legend'     => 'Een berich sturen naor een aandere gebruker van {{SITENAME}}',
+'emailfrom'        => 'Van:',
+'emailto'          => 'An:',
+'emailsubject'     => 'Onderwarp:',
+'emailmessage'     => 'Berich:',
+'emailsend'        => 'Versturen',
+'emailccme'        => 'Stuur mien een kopie van dit berich.',
+'emailccsubject'   => 'Kopie van joew berich an $1: $2',
+'emailsent'        => 'Berich verstuurd',
+'emailsenttext'    => 'Berich is verzunnen.',
+'emailuserfooter'  => 'Dit berich is verstuurd deur $1 an $2 deur de functie "Een berich sturen" van {{SITENAME}} te gebruken.',
 
 # Watchlist
 'watchlist'            => 'Volglieste',
@@ -1655,12 +1864,7 @@ Toekomstige wiezigingen op disse pagina en de overlegpagina zullen hier vermeld
 'iteminvalidname'      => "Verkeerde naam '$1'",
 'wlnote'               => "Hieronder {{PLURAL:$1|steet de leste wieziging|staon de leste $1 wiezigingen}} in {{PLURAL:$2|'t of-eleupen ure|de leste $2 uren}}.",
 'wlshowlast'           => 'Teun de leste $1 ure $2 dagen $3',
-'watchlist-show-bots'  => 'Teun botgebrukers',
-'watchlist-hide-bots'  => 'Verbarg botgebrukers',
-'watchlist-show-own'   => 'Teun mien bewarkingen',
-'watchlist-hide-own'   => 'Verbarg mien bewarkingen',
-'watchlist-show-minor' => 'Teun kleine wiezigingen',
-'watchlist-hide-minor' => 'Verbarg kleine wiezigingen',
+'watchlist-options'    => 'Opties veur de volglieste',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Volg...',
@@ -1699,80 +1903,97 @@ Je kunnen de instellingen van joew volglieste wiezigen op:
 Opmarkingen en veerdere hulpe:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Vortdoon',
-'confirm'                     => 'Bevestigen',
-'excontent'                   => "De tekse was: '$1'",
-'excontentauthor'             => "De tekse was: '$1' (pagina an-emaak deur: [[Special:Contributions/$2|$2]])",
-'exbeforeblank'               => "veurdat disse pagina leeg-emaak wönnen stung hier: '$1'",
-'exblank'                     => 'Pagina was leeg',
-'delete-confirm'              => '"$1" vortdoon',
-'delete-legend'               => 'Vortdoon',
-'historywarning'              => 'Waorschuwing: disse pagina hef een veurgeschiedenisse. Kiek effen nao of je neet een ouwere versie van disse pagina herstellen kunnen.',
-'confirmdeletetext'           => 'Disse actie wis alle inhoud en geschiedenisse uut de databanke. Bevestig hieronder dat dit de bedoeling is en da-j de gevolgen dervan begriepen.',
-'actioncomplete'              => 'Uut-evoerd',
-'deletedtext'                 => '\'t Artikel "$1" is vort-edaon. Zie de "$2" veur een lieste van pagina\'s dee as les vort-edaon bin.',
-'deletedarticle'              => '"$1" vort-edaon',
-'suppressedarticle'           => 'hef "[[$1]]" verbörgen',
-'dellogpage'                  => "Vort-edaone pagina's",
-'dellogpagetext'              => "Hieronder een lieste van pagina's en ofbeeldingen dee 't les vort-edaon bin.",
-'deletionlog'                 => "Vort-edaone pagina's",
-'reverted'                    => 'Eerdere versie hersteld',
-'deletecomment'               => 'Rejen',
-'deleteotherreason'           => 'Aandere/extra rejen:',
-'deletereasonotherlist'       => 'Aandere rejen',
-'deletereason-dropdown'       => '*Veulveurkoemende rejens
+# Delete
+'deletepage'             => 'Vortdoon',
+'confirm'                => 'Bevestigen',
+'excontent'              => "De tekse was: '$1'",
+'excontentauthor'        => "De tekse was: '$1' (pagina an-emaak deur: [[Special:Contributions/$2|$2]])",
+'exbeforeblank'          => "veurdat disse pagina leeg-emaak wönnen stung hier: '$1'",
+'exblank'                => 'Pagina was leeg',
+'delete-confirm'         => '"$1" vortdoon',
+'delete-legend'          => 'Vortdoon',
+'historywarning'         => 'Waorschuwing: disse pagina hef een veurgeschiedenisse. Kiek effen nao of je neet een ouwere versie van disse pagina herstellen kunnen.',
+'confirmdeletetext'      => 'Disse actie wis alle inhoud en geschiedenisse uut de databanke. Bevestig hieronder dat dit de bedoeling is en da-j de gevolgen dervan begriepen.',
+'actioncomplete'         => 'Uut-evoerd',
+'deletedtext'            => '\'t Artikel "$1" is vort-edaon. Zie de "$2" veur een lieste van pagina\'s dee as les vort-edaon bin.',
+'deletedarticle'         => '"$1" vort-edaon',
+'suppressedarticle'      => 'hef "[[$1]]" verbörgen',
+'dellogpage'             => "Vort-edaone pagina's",
+'dellogpagetext'         => "Hieronder een lieste van pagina's en ofbeeldingen dee 't les vort-edaon bin.",
+'deletionlog'            => "Vort-edaone pagina's",
+'reverted'               => 'Eerdere versie hersteld',
+'deletecomment'          => 'Rejen',
+'deleteotherreason'      => 'Aandere/extra rejen:',
+'deletereasonotherlist'  => 'Aandere rejen',
+'deletereason-dropdown'  => '*Veulveurkoemende rejens
 ** Op anvrage van de auteur
 ** Schending van de auteursrechen
 ** Vandelisme',
-'delete-edit-reasonlist'      => "Rejens veur 't vortdoon bewarken",
-'delete-toobig'               => "Disse pagina hef een lange bewarkingsgeschiedenisse, meer as $1 {{PLURAL:$1|versie|versies}}.
+'delete-edit-reasonlist' => "Rejens veur 't vortdoon bewarken",
+'delete-toobig'          => "Disse pagina hef een lange bewarkingsgeschiedenisse, meer as $1 {{PLURAL:$1|versie|versies}}.
 't Vortdoon van dit soort pagina's is mit rechen bepark um 't per ongelok versteuren van de warking van {{SITENAME}} te veurkoemen.",
-'delete-warning-toobig'       => "Disse pagina hef een lange bewarkingsgeschiedenisse, meer as $1 {{PLURAL:$1|versie|versies}}.
+'delete-warning-toobig'  => "Disse pagina hef een lange bewarkingsgeschiedenisse, meer as $1 {{PLURAL:$1|versie|versies}}.
 Woart je: 't vortdoon van disse pagina kan de warking van de databanke van {{SITENAME}} versteuren.
 Wees veurzichtig",
-'rollback'                    => 'Wiezigingen herstellen',
-'rollback_short'              => 'Weerummedreien',
-'rollbacklink'                => 'Weerummedreien',
-'rollbackfailed'              => 'Wieziging herstellen is mislok',
-'cantrollback'                => 'De wiezigingen konnen neet hersteld wonnen; der is mar 1 auteur.',
-'alreadyrolled'               => "'t Is neet meugelijk um de wieziging van de pagina [[$1]]
-deur [[User:$2|$2]] ([[User talk:$2|Overleeg]]) te herstellen.
-
-Een aander hef disse wieziging al hersteld tot een veurige versie van disse pagina of hef een aandere bewarking edaon.
-
-De leste bewarking is edaon deur [[User:$3|$3]] ([[User talk:$3|Overleeg]]).",
-'editcomment'                 => 'De samenvatting was: <i>$1</i>', # only shown if there is an edit comment
-'revertpage'                  => 'Wiezigingen deur [[Special:Contributions/$2|$2]] hersteld tot de versie nao de leste wieziging deur $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Wiezigingen van $1; weerummedreid naor de leste versie van $2.',
-'sessionfailure'              => 'Der is een prebleem mit joew anmeldsessie. De actie is stop-ezet uut veurzörg tegen een beveiligingsrisico (dat besteet uut \'t meugelijke "kraken" van disse sessie). Gao een pagina weerumme, laot disse pagina opniej en prebeer \'t nog es.',
+
+# Rollback
+'rollback'         => 'Wiezigingen herstellen',
+'rollback_short'   => 'Weerummedreien',
+'rollbacklink'     => 'Weerummedreien',
+'rollbackfailed'   => 'Wieziging herstellen is mislok',
+'cantrollback'     => 'De wiezigingen konnen neet hersteld wonnen; der is mar 1 auteur.',
+'alreadyrolled'    => 'Kan de leste wieziging van de pagina [[$1]] deur [[User:$2|$2]] ([[User talk:$2|Overleeg]]){{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); neet ongedaonmaken.
+Een aander hef disse pagina al bewark of hersteld naor een eerdere versie.
+
+De leste bewarking op disse pagina is edaon deur [[User:$3|$3]] ([[User talk:$3|Overleeg]]){{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "De bewarkingssamenvatting was: ''$1''.", # only shown if there is an edit comment
+'revertpage'       => 'Wiezigingen deur [[Special:Contributions/$2|$2]] hersteld tot de versie nao de leste wieziging deur $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Wiezigingen van $1; weerummedreid naor de leste versie van $2.',
+'sessionfailure'   => 'Der is een prebleem mit joew anmeldsessie. De actie is stop-ezet uut veurzörg tegen een beveiligingsrisico (dat besteet uut \'t meugelijke "kraken" van disse sessie). Gao een pagina weerumme, laot disse pagina opniej en prebeer \'t nog es.',
+
+# Protect
 'protectlogpage'              => 'Beveiligingslogboek',
 'protectlogtext'              => "Hieronder steet een lieste mit pagina's dee beveilig bin.",
 'protectedarticle'            => '[[$1]] is beveilig',
 'modifiedarticleprotection'   => 'beveiligingsnivo van "[[$1]]"  ewiezig',
 'unprotectedarticle'          => '[[$1]] vrie-egeven',
+'movedarticleprotection'      => 'hef de beveiligingsinstellingen over-ezet van "[[$2]]" naor "[[$1]]"',
 'protect-title'               => 'Instellen van beveiligingsnivo veur "$1"',
+'prot_1movedto2'              => '[[$1]] is ewiezig naor [[$2]]',
 'protect-legend'              => 'Beveiliging bevestigen',
 'protectcomment'              => 'Rejen',
 'protectexpiry'               => 'Duur',
 'protect_expiry_invalid'      => 'Verlooptied is ongeldig.',
 'protect_expiry_old'          => 'De verlooptied is al veurbie.',
 'protect-unchain'             => 'Ontkoppel de naamwiezigingsrechen',
-'protect-text'                => "Hier ku-j 't beveiligingsnivo veur de pagina <strong>$1</strong> instellen.",
-'protect-locked-blocked'      => "Je kunnen beveiligingsnivo's neet wiezigen terwiel je eblokkeerd bin. Hier bin de instellingen zoas ze noen bin veur de pagina <strong>$1</strong>:",
+'protect-text'                => "Hier ku-j 't beveiligingsnivo veur de pagina '''$1''' instellen.",
+'protect-locked-blocked'      => "Je kunnen beveiligingsnivo's neet wiezigen terwiel je eblokkeerd bin. Hier bin de instellingen zoas ze noen bin veur de pagina '''$1''':",
 'protect-locked-dblock'       => "Beveiligingsnivo's kunnen noen effen neet ewiezig wonnen umdat de databanke noen beveilig is.
-Hier staon de instellingen zoas ze noen bin veur de pagina <strong>$1</strong>:",
+Hier staon de instellingen zoas ze noen bin veur de pagina '''$1''':",
 'protect-locked-access'       => "Je hemmen gien rechen um 't beveilingsnivo van pagina's te wiezigen.
-Hier staon de instellingen zoas ze noen bin veur de pagina <strong>$1</strong>:",
+Hier staon de instellingen zoas ze noen bin veur de pagina '''$1''':",
 'protect-cascadeon'           => "Disse pagina wonnen beveilig umdat 't op-eneumen is in de volgende {{PLURAL:$1|pagina|pagina's}} dee beveilig {{PLURAL:$1|is|bin}} mit de cascade-optie. Je kunnen 't beveiligingsnivo van disse pagina anpassen, mar dat hef gien invleud op de cascadebeveiliging.",
-'protect-default'             => '(standard)',
+'protect-default'             => 'Veur alle gebrukers',
 'protect-fallback'            => 'Hierveur is \'t rech "$1" neudig',
-'protect-level-autoconfirmed' => 'Allinnig an-emelde gebrukers',
+'protect-level-autoconfirmed' => 'Blokkeer nieje en annenieme gebrukers',
 'protect-level-sysop'         => 'Allinnig beheerders',
 'protect-summary-cascade'     => 'cascade',
 'protect-expiring'            => 'verloop op $1 (UTC)',
-'protect-cascade'             => "Cascadebeveiliging (beveilig alle pagina's en sjablonen dee in disse pagina op-eneumen bin)",
+'protect-expiry-indefinite'   => 'onbepark',
+'protect-cascade'             => "Cascadebeveiliging (beveilig alle pagina's en mallen dee in disse pagina op-eneumen bin)",
 'protect-cantedit'            => "Je kunnen 't beveiligingsnivo van disse pagina neet wiezigen, umda-j gien rechen hemmen um 't te bewarken.",
+'protect-othertime'           => 'Aandere tiedsduur:',
+'protect-othertime-op'        => 'aandere tiedsduur',
+'protect-existing-expiry'     => 'Bestaonde verloopdaotum: $2 $3',
+'protect-otherreason'         => 'Aandere rejen:',
+'protect-otherreason-op'      => 'aandere rejen',
+'protect-dropdown'            => '*Veulveurkomende rejens veur beveiliging
+** Vandelisme
+** Spam
+** Bewarkingsoorlog
+** Preventieve beveiliging veulbezochen pagina',
+'protect-edit-reasonlist'     => 'Rejens veur beveiliging bewarken',
+'protect-expiry-options'      => '1 uur:1 hour,1 dag:1 day,1 weke:1 week,2 weken:2 weeks,1 maond:1 month,3 maonden:3 months,6 maonden:6 months,1 jaor:1 year,onbepark:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Toegang',
 'restriction-level'           => 'Beveiligingsnivo',
 'minimum-size'                => 'Minimumgrootte (bytes)',
@@ -1795,7 +2016,7 @@ Hier staon de instellingen zoas ze noen bin veur de pagina <strong>$1</strong>:"
 'undeletepage'                 => "Vort-edaone pagina's bekieken en weerummeplaosen",
 'undeletepagetitle'            => "'''Hieronder staon de vort-edaone bewarkingen van [[:$1]]'''.",
 'viewdeletedpage'              => "Bekiek vort-edaone pagina's",
-'undeletepagetext'             => 'Disse pagina is vort-edaon, mar steet in de kas en kan nog weerummeplaos wonnen.',
+'undeletepagetext'             => "Hieronder {{PLURAL:$1|steet de pagina dee vort-edaon is|staon pagina's dee vort-edaon bin}} en vanuut 't archief  weerummeplaos {{PLURAL:$1|kan|kunnen}} wonnen.",
 'undelete-fieldset-title'      => 'Versies weerummeplaosen',
 'undeleteextrahelp'            => "Um de pagina mit alle eerdere versies weerumme te plaosen lao-j alle hokjes leeg en klik op '''''Weerummeplaosen!'''''.
 Um een bepaolde versies weerumme te plaosen mu-j de versies dee-j weerummeplaosen willen anvinken en klik op '''''Weerummeplaosen!'''''.
@@ -1807,12 +2028,13 @@ As der al een nieje pagina mit dezelfde naam an-emaak is, zullen disse versies a
 'undeleterevdel'               => "Herstellen kan neet as daor de leste versie van de pagina of 't bestand gedeeltelijk mee vort-edaon wonnen.
 In dat geval mu-j de leste versie as zichbaor instellen.",
 'undeletehistorynoadmin'       => "Disse pagina is vort-edaon. De rejen hierveur steet hieronder, samen mit de infermasie van de gebrukers dee dit artikel ewiezig hemmen veurdat 't vort-edaon is. De tekse van 't artikel is allinnig zichbaor veur beheerders.",
-'undelete-revision'            => 'Vort-edaone versie van $1 (vanof $2) deur $3',
+'undelete-revision'            => 'Vort-edaone versies van $1 (per $4 um $5) deur $3:',
 'undeleterevision-missing'     => "Ongeldige of ontbrekende versie. 't Is meugelijk da-j een verkeerde verwiezing gebruken of dat disse pagina weerummeplaos is of dat 't uut archief ewis is.",
 'undelete-nodiff'              => 'Gien eerdere versie evunnen.',
 'undeletebtn'                  => 'Weerummeplaosen',
 'undeletelink'                 => 'weerummeplaosen',
 'undeletereset'                => 'Herstel',
+'undeleteinvert'               => 'Selectie ummekeren',
 'undeletecomment'              => 'Opmarking:',
 'undeletedarticle'             => '"$1" is weerummeplaos',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|versie|versies}} weerummeplaos',
@@ -1845,37 +2067,38 @@ $1",
 'blanknamespace' => '(encyclopedie)',
 
 # Contributions
-'contributions' => 'Biedragen van disse gebruker',
-'mycontris'     => 'Mien biedragen',
-'contribsub2'   => 'Veur $1 ($2)',
-'nocontribs'    => 'Gien wiezigingen evunnen dee an de estelde criteria voldoon.',
-'uctop'         => ' (leste wieziging)',
-'month'         => 'Maond:',
-'year'          => 'Jaor:',
-
-'sp-contributions-newbies'     => 'Teun allinnig de biedragen van nieje gebrukers',
-'sp-contributions-newbies-sub' => 'Veur niejelingen',
-'sp-contributions-blocklog'    => 'Blokkeerlogboek',
-'sp-contributions-search'      => 'Zeuken naor biedragen',
-'sp-contributions-username'    => 'IP-adres of gebrukersnaam:',
-'sp-contributions-submit'      => 'Zeuk',
+'contributions'       => 'Biedragen van disse gebruker',
+'contributions-title' => 'Biedragen van $1',
+'mycontris'           => 'Mien biedragen',
+'contribsub2'         => 'Veur $1 ($2)',
+'nocontribs'          => 'Gien wiezigingen evunnen dee an de estelde criteria voldoon.',
+'uctop'               => ' (leste wieziging)',
+'month'               => 'Maond:',
+'year'                => 'Jaor:',
+
+'sp-contributions-newbies'       => 'Teun allinnig de biedragen van nieje gebrukers',
+'sp-contributions-newbies-sub'   => 'Veur niejelingen',
+'sp-contributions-newbies-title' => 'Biedragen van nieje gebrukers',
+'sp-contributions-blocklog'      => 'Blokkeerlogboek',
+'sp-contributions-search'        => 'Zeuken naor biedragen',
+'sp-contributions-username'      => 'IP-adres of gebrukersnaam:',
+'sp-contributions-submit'        => 'Zeuk',
 
 # What links here
 'whatlinkshere'            => 'Verwiezingen naor disse pagina',
 'whatlinkshere-title'      => 'Pagina\'s dee verwiezen naor "$1"',
 'whatlinkshere-page'       => 'Pagina:',
-'linklistsub'              => '(lieste van verwiezingen)',
 'linkshere'                => "Disse pagina's verwiezen naor '''[[:$1]]''':",
 'nolinkshere'              => "Gien enkele pagina verwies naor '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Gien enkele pagina verwiest naor '''[[:$1]]''' in de ekeuzen naamruumte.",
 'isredirect'               => 'deurverwiezing',
-'istemplate'               => 'in-evoeg as sjabloon',
+'istemplate'               => 'in-evoeg as mal',
 'isimage'                  => 'bestansverwiezing',
 'whatlinkshere-prev'       => '{{PLURAL:$1|veurige|veurige $1}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|volgende|volgende $1}}',
 'whatlinkshere-links'      => '� verwiezingen',
 'whatlinkshere-hideredirs' => '$1 deurverwiezingen',
-'whatlinkshere-hidetrans'  => '$1 in-evoegen sjablonen',
+'whatlinkshere-hidetrans'  => '$1 in-evoegen mallen',
 'whatlinkshere-hidelinks'  => '$1 verwiezingen',
 'whatlinkshere-hideimages' => '$1 bestansverwiezingen',
 'whatlinkshere-filters'    => 'Filters',
@@ -1908,6 +2131,8 @@ $1",
 'ipbotherreason'                  => 'Aandere/extra rejen:',
 'ipbhidename'                     => "Verbarg de gebrukersnaam of 't IP-adres van 't blokkeerlogboek, de actieve blokkeerlieste en de gebrukerslieste",
 'ipbwatchuser'                    => 'Gebrukerspagina en overlegpagina op volglieste zetten',
+'ipballowusertalk'                => 'Disse gebruker toestaon tiejens de blokkering zien eigen overlegpagina te bewarken',
+'ipb-change-block'                => 'De gebruker opniej blokkeren mit disse instellingen',
 'badipaddress'                    => 'ongeldig IP-adres of onbestaonde gebrukersnaam',
 'blockipsuccesssub'               => 'Succesvol eblokkeerd',
 'blockipsuccesstext'              => 'IP-adres "$1" is noen eblokkeerd.
@@ -1918,14 +2143,18 @@ Op de [[Special:IPBlockList|IP-blokkeerlieste]] steet een lieste mit alle blokke
 'ipb-unblock'                     => 'Deblokkeer een gebruker of IP-adres',
 'ipb-blocklist-addr'              => 'Bestaonde blokkeringen veur $1',
 'ipb-blocklist'                   => 'Bekiek bestaonde blokkeringen',
+'ipb-blocklist-contribs'          => 'Biedragen van $1',
 'unblockip'                       => 'Deblokkeer gebruker',
 'unblockiptext'                   => "Gebruuk 't onderstaonde formelier um weerumme schrieftoegang te geven an een eblokkeren gebruker of IP-adres.",
-'ipusubmit'                       => 'Dit adres deblokkeren',
+'ipusubmit'                       => 'Blokkering derof haolen',
 'unblocked'                       => '[[User:$1|$1]] is edeblokeerd',
 'unblocked-id'                    => 'Blokkade $1 is derof ehaold',
 'ipblocklist'                     => 'Lieste van IP-adressen en gebrukers dee eblokkeerd bin',
 'ipblocklist-legend'              => 'Een eblokkeren gebruker zeuken',
 'ipblocklist-username'            => 'Gebrukersnaam of IP-adres:',
+'ipblocklist-sh-userblocks'       => 'gebrukersblokkeringen $1',
+'ipblocklist-sh-tempblocks'       => 'tiejelijke blokkeringen $1',
+'ipblocklist-sh-addressblocks'    => 'enkele IP-blokkeringen $1',
 'ipblocklist-submit'              => 'Zeuk',
 'blocklistline'                   => 'Op $1 (vervuilt op $4) blokkeren $2: $3',
 'infiniteblock'                   => 'onbepark',
@@ -1934,25 +2163,33 @@ Op de [[Special:IPBlockList|IP-blokkeerlieste]] steet een lieste mit alle blokke
 'noautoblockblock'                => 'autoblok neet actief',
 'createaccountblock'              => 'anmaken van een gebrukersprefiel is eblokkeerd',
 'emailblock'                      => "'t versturen van berichen is eblokkeerd",
+'blocklist-nousertalk'            => 'kan zien eigen overlegpagina neet bewarken',
 'ipblocklist-empty'               => 'De blokkeerlieste is leeg.',
 'ipblocklist-no-results'          => "'t Op-evreugen IP-adres of de gebrukersnaam is neet eblokkeerd.",
 'blocklink'                       => 'Blokkeer',
 'unblocklink'                     => 'deblokkeer',
+'change-blocklink'                => 'blokkering wiezigen',
 'contribslink'                    => 'Biedragen',
 'autoblocker'                     => 'Vanzelf eblokkeerd umdat \'t IP-adres overenekump mit \'t IP-adres van [[User:$1|$1]], dee eblokkeerd is mit as rejen: "$2"',
 'blocklogpage'                    => 'Blokkeerlogboek',
+'blocklog-fulllog'                => "'t Complete blokkeerlogboek",
 'blocklogentry'                   => 'blokkeren "[[$1]]" veur $2 $3',
+'reblock-logentry'                => "hef de instellingen veur de blokkering van [[$1]] ewiezig. 't Loop noen of op $2 um $3",
 'blocklogtext'                    => "Hier zie-j een lieste van de leste blokkeringen en deblokkeringen. Autematische blokkeringen en deblokkeringen koemen neet in 't logboek te staon. Zie de [[Special:IPBlockList|IP-blokkeerlieste]] veur de lieste van adressen dee noen eblokkeerd bin.",
 'unblocklogentry'                 => 'Blokkering van [[$1]] op-eheven',
 'block-log-flags-anononly'        => 'allinnig anneniemen',
 'block-log-flags-nocreate'        => 'anmaken van gebrukersprefielen uut-eschakeld',
 'block-log-flags-noautoblock'     => 'autoblokkeren uut-eschakeld',
 'block-log-flags-noemail'         => "'t versturen van berichen is eblokkeerd",
+'block-log-flags-nousertalk'      => 'kan zien eigen overlegpagina neet bewarken',
 'block-log-flags-angry-autoblock' => 'uut-ebreide autematische blokkering in-eschakeld',
 'range_block_disabled'            => 'De meugelijkheid veur beheerders um een groep adressen te blokkeren is uut-eschakeld.',
 'ipb_expiry_invalid'              => 'De op-egeven verlooptied is ongeldig.',
 'ipb_expiry_temp'                 => 'Blokkeringen veur verbörgen gebrukers mutten permenent ween.',
 'ipb_already_blocked'             => '"$1" is al eblokkeerd',
+'ipb-needreblock'                 => '== Disse gebruker is al eblokkeerd ==
+$1 is al eblokkeerd.
+Wi-j de instellingen wiezigen?',
 'ipb_cant_unblock'                => "Foutmelding: blokkade ID $1 neet evunnen, 't is meschien al edeblokkeerd.",
 'ipb_blocked_as_range'            => "Fout: 't IP-adres $1 is neet drek eblokkeerd en de blokkering kan neet op-eheven wonnen.
 De blokkering is onderdeel van de reeks $2, waovan de blokkering wè op-eheven kan wonnen.",
@@ -1965,6 +2202,7 @@ De blokkering is onderdeel van de reeks $2, waovan de blokkering wè op-eheven k
 'sorbsreason'                     => 'Joew IP-adres is op-eneumen as open proxyserver in de DNS-blacklist de {{SITENAME}} ebruukt.',
 'sorbs_create_account_reason'     => 'Joew IP-adres is op-eneumen as open proxyserver in de DNS-blacklist de {{SITENAME}} ebruukt.
 Je kunnen gien gebrukerspagina anmaken.',
+'cant-block-while-blocked'        => 'Je kunnen aandere gebrukers neet blokkeren a-j zelf oek eblokkeerd bin.',
 
 # Developer tools
 'lockdb'              => 'Databanke blokkeren',
@@ -1986,49 +2224,62 @@ Vergeet neet de [[Special:UnlockDB|databanke vrie te geven]] a-j klaor bin mit '
 'databasenotlocked'   => 'De databanke is neet eblokkeerd.',
 
 # Move page
-'move-page'               => 'Herneum "$1"',
-'move-page-legend'        => 'Pagina herneumen',
-'movepagetext'            => "Deur 't formelier da-j hieronder zien in te vullen ku-j de naam wiezigen, zo geet de veurgeschiedenisse neet verleuren. De ouwe paginanaam zal autematisch een deurverwiezing wonnen naor de nieje pagina (disse pagina kan, zoas op alle artikels mit een deurverwiezing, an-epas wonnen). Deurverwiezingen wonnen neet meeveraanderd en mutten mit de haand ewiezig wonnen.",
-'movepagetalktext'        => "De biebeheurende overlegpagina krieg oek een nieje titel, mar '''neet''' in de volgende gevallen:
+'move-page'                    => 'Herneum "$1"',
+'move-page-legend'             => 'Pagina herneumen',
+'movepagetext'                 => "Deur 't formelier da-j hieronder zien in te vullen ku-j de naam wiezigen, zo geet de veurgeschiedenisse neet verleuren. De ouwe paginanaam zal autematisch een deurverwiezing wonnen naor de nieje pagina (disse pagina kan, zoas op alle artikels mit een deurverwiezing, an-epas wonnen). Deurverwiezingen wonnen neet meeveraanderd en mutten mit de haand ewiezig wonnen.",
+'movepagetalktext'             => "De biebeheurende overlegpagina krieg oek een nieje titel, mar '''neet''' in de volgende gevallen:
 * As de pagina in een aandere naamruumte eplaos wonnen
 * As der al een neet-lege overlegpagina besteet onder de aandere naam
 * A-j 't onderstaonde vinkjen vorthaolen",
-'movearticle'             => 'Herneum',
-'movenotallowed'          => "Je hemmen gien rechen um pagina's te herneumen.",
-'newtitle'                => 'Nieje naam',
-'move-watch'              => 'volg disse pagina',
-'movepagebtn'             => 'Herneum',
-'pagemovedsub'            => 'Naamwieziging succesvol',
-'movepage-moved'          => '<big>\'\'\'"$1" is ewiezig naor "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Onder disse naam besteet al een pagina. Kies een aandere naam.',
-'cantmove-titleprotected' => "Je kunnen gien pagina naor disse titel herneumen, umdat de nieje titel beveilig is tegen 't anmaken dervan.",
-'talkexists'              => "De pagina zelf is verplaos, mar de overlegpagina kon neet verplaos wonnen, umdat de doelnaam al een neet-lege overlegpagina had. Combineer de overlegpagina's haandmaotig.",
-'movedto'                 => 'wiezigen naor',
-'movetalk'                => "De overlegpagina oek wiezigen, as 't meuglijk is.",
-'move-subpages'           => "Alle subpagina's herneumen",
-'move-talk-subpages'      => "Alle subpagina's van overlegpagina's herneumen",
-'movepage-page-exists'    => 'De pagina $1 besteet al en kan neet autematisch vort-edaon wonnen.',
-'movepage-page-moved'     => 'De pagina $1 is herneumd naor $2.',
-'movepage-page-unmoved'   => 'De pagina $1 kon neet herneumd wonnen naor $2.',
-'movepage-max-pages'      => "'t Maximale antal autematisch te herneumen pagina's is bereik ({{PLURAL:$1|$1|$1}}).
+'movearticle'                  => 'Herneum',
+'movenologin'                  => 'Neet an-emeld.',
+'movenologintext'              => 'Je mutten [[Special:UserLogin|an-emeld]] ween um de naam van een pagina te wiezigen.',
+'movenotallowed'               => "Je hemmen gien rechen um pagina's te herneumen.",
+'movenotallowedfile'           => 'Je hemmen gien rechen um bestanden te herneumen.',
+'cant-move-user-page'          => "Je hemmen gien rechen um gebrukerspagina's te herneumen.",
+'cant-move-to-user-page'       => 'Je hemmen gien rechen um een pagina naor een gebrukerspagina te herneumen. Herneumen naor een subpagina ma-j wè doon.',
+'newtitle'                     => 'Nieje naam',
+'move-watch'                   => 'volg disse pagina',
+'movepagebtn'                  => 'Herneum',
+'pagemovedsub'                 => 'Naamwieziging succesvol',
+'movepage-moved'               => '<big>\'\'\'"$1" is ewiezig naor "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Der is een deurverwiezing an-emaak.',
+'movepage-moved-noredirect'    => 'Der is gien deurverwiezing an-emaak.',
+'articleexists'                => 'Onder disse naam besteet al een pagina. Kies een aandere naam.',
+'cantmove-titleprotected'      => "Je kunnen gien pagina naor disse titel herneumen, umdat de nieje titel beveilig is tegen 't anmaken dervan.",
+'talkexists'                   => "De pagina zelf is verplaos, mar de overlegpagina kon neet verplaos wonnen, umdat de doelnaam al een neet-lege overlegpagina had. Combineer de overlegpagina's haandmaotig.",
+'movedto'                      => 'wiezigen naor',
+'movetalk'                     => "De overlegpagina oek wiezigen, as 't meuglijk is.",
+'move-subpages'                => "Alle subpagina's herneumen",
+'move-talk-subpages'           => "Alle subpagina's van overlegpagina's herneumen",
+'movepage-page-exists'         => 'De pagina $1 besteet al en kan neet autematisch vort-edaon wonnen.',
+'movepage-page-moved'          => 'De pagina $1 is herneumd naor $2.',
+'movepage-page-unmoved'        => 'De pagina $1 kon neet herneumd wonnen naor $2.',
+'movepage-max-pages'           => "'t Maximale antal autematisch te herneumen pagina's is bereik ({{PLURAL:$1|$1|$1}}).
 De overige pagina's wonnen neet autematisch herneumd.",
-'1movedto2'               => '[[$1]] is ewiezig naor [[$2]]',
-'1movedto2_redir'         => '[[$1]] is ewiezig over de deurverwiezing [[$2]] hinne',
-'movelogpage'             => 'Titelwiezigingen',
-'movelogpagetext'         => "Hieronder steet een lieste mit pagina's dee herneumd bin.",
-'movereason'              => 'Rejen:',
-'revertmove'              => 'Weerummedreien',
-'delete_and_move'         => 'Vortdoon en herneumen',
-'delete_and_move_text'    => '==Mut vort-edaon wonnen==
+'1movedto2'                    => '[[$1]] is ewiezig naor [[$2]]',
+'1movedto2_redir'              => '[[$1]] is ewiezig over de deurverwiezing [[$2]] hinne',
+'move-redirect-suppressed'     => 'deurverwiezing onderdrokken',
+'movelogpage'                  => 'Titelwiezigingen',
+'movelogpagetext'              => "Hieronder steet een lieste mit pagina's dee herneumd bin.",
+'movereason'                   => 'Rejen:',
+'revertmove'                   => 'Weerummedreien',
+'delete_and_move'              => 'Vortdoon en herneumen',
+'delete_and_move_text'         => '==Mut vort-edaon wonnen==
 <div style="color: red"> Onder de nieje naam "[[:$1]]" besteet al een artikel. Wi-j \'t vortdoon um plaose te maken veur \'t herneumen?</div>',
-'delete_and_move_confirm' => 'Ja, disse pagina vortdoon',
-'delete_and_move_reason'  => 'Vort-edaon vanwegen naamwieziging',
-'selfmove'                => "De naam kan neet ewiezig wonnen naor de naam dee 't al hef.",
-'immobile_namespace'      => "De nieje naam is een speciaal type; der kunnen gien pagina's in disse naamruumte eplaos wonnen.",
-'imagenocrossnamespace'   => 'Een mediabestand kan neet naor een aandere naamruumte verplaos wonnen',
-'imagetypemismatch'       => "De nieje bestansextensie is neet gelieke an 't bestanstype",
-'imageinvalidfilename'    => 'De nieje bestansnaam is ongeldig',
-'fix-double-redirects'    => 'Alle deurverwiezingen dee naor de ouwe titel verwiezen, herneumen naor de nieje titel',
+'delete_and_move_confirm'      => 'Ja, disse pagina vortdoon',
+'delete_and_move_reason'       => 'Vort-edaon vanwegen naamwieziging',
+'selfmove'                     => "De naam kan neet ewiezig wonnen naor de naam dee 't al hef.",
+'immobile-source-namespace'    => 'Pagina\'s in de naamruumte "$1" kunnen neet herneumd wonnen',
+'immobile-target-namespace'    => 'Pagina\'s kunnen neet herneumd wonnen naor de naamruumte "$1"',
+'immobile-target-namespace-iw' => "Een interwikiverwiezing is gien geldige bestemming veur 't herneumen van een pagina.",
+'immobile-source-page'         => 'Disse pagina kan neet herneumd wonnen.',
+'immobile-target-page'         => 'Kan neet herneumd wonnen naor disse paginanaam.',
+'imagenocrossnamespace'        => 'Een mediabestand kan neet naor een aandere naamruumte verplaos wonnen',
+'imagetypemismatch'            => "De nieje bestansextensie is neet gelieke an 't bestanstype",
+'imageinvalidfilename'         => 'De nieje bestansnaam is ongeldig',
+'fix-double-redirects'         => 'Alle deurverwiezingen dee naor de ouwe titel verwiezen, herneumen naor de nieje titel',
+'move-leave-redirect'          => 'Een deurverwiezing achterlaoten',
 
 # Export
 'export'            => "Pagina's uutvoeren",
@@ -2040,7 +2291,7 @@ De overige pagina's wonnen neet autematisch herneumd.",
 'export-addcattext' => "Pagina's toevoegen uut kattegerie:",
 'export-addcat'     => 'Toevoegen',
 'export-download'   => 'As bestand opslaon',
-'export-templates'  => 'Mit sjablonen derbie',
+'export-templates'  => 'Mit mallen derbie',
 
 # Namespace 8 related
 'allmessages'               => 'Alle systeemteksten',
@@ -2067,9 +2318,12 @@ De overige pagina's wonnen neet autematisch herneumd.",
 'import-interwiki-text'      => "Kies een wiki en paginanaam um in te voeren.
 Versie- en auteursgegevens blieven hierbie beweerd.
 Alle transwiki-invoerhaandelingen wonnen op-esleugen in 't [[Special:Log/import|invoerlogboek]].",
+'import-interwiki-source'    => 'Bronwiki/pagina:',
 'import-interwiki-history'   => 'Kopieer de hele geschiedenisse veur disse pagina',
 'import-interwiki-submit'    => 'Invoeren',
 'import-interwiki-namespace' => 'Doelnaamruumte:',
+'import-upload-filename'     => 'Bestansnaam:',
+'import-comment'             => 'Opmarkingen:',
 'importtext'                 => "Gebruuk de Special:Export-optie in de wiki waor de infermasie vandaonkump, slao 't op joew eigen systeem op, en stuur 't daornao hier op.",
 'importstart'                => "Pagina's an 't invoeren...",
 'import-revision-count'      => '$1 {{PLURAL:$1|versie|versies}}',
@@ -2106,19 +2360,19 @@ De tiejelijke map is neet anwezig.",
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|versie|versies}} van $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Miene gebroekersbladziede',
+'tooltip-pt-userpage'             => 'Oew gebroekersbladziede',
 'tooltip-pt-anonuserpage'         => "Gebroekersbladziede vuur t IP-adres da'j broekt",
-'tooltip-pt-mytalk'               => 'Miene oaverlegbladziede',
+'tooltip-pt-mytalk'               => 'Oew oaverlegbladziede',
 'tooltip-pt-anontalk'             => 'Oaverlegbladziede van n naamloosn gebroeker van dit IP-adres',
 'tooltip-pt-preferences'          => 'Miene vuurkeurn',
 'tooltip-pt-watchlist'            => 'Lieste van bladziedn dee op miene voalglieste stoan',
-'tooltip-pt-mycontris'            => 'Miene biejdreagn',
+'tooltip-pt-mycontris'            => 'Liest van oew biejdreagn',
 'tooltip-pt-login'                => 'Iej wördt van harte oetneugd um oe an te mealdn as gebroeker, mer t is nich verplicht',
 'tooltip-pt-anonlogin'            => 'Iej wördt van harte oetneugd um oe an te mealdn as gebroeker, mer t is nich verplicht',
 'tooltip-pt-logout'               => 'Ofmealdn',
 'tooltip-ca-talk'                 => 'Loat n oaverlegtekst oaver disse bladziede zeen',
 'tooltip-ca-edit'                 => 'Beweark disse bladziede',
-'tooltip-ca-addsection'           => 'Voog oew kommentoar too an de oaverlegbladziede',
+'tooltip-ca-addsection'           => 'Niej oonderwearp toovoogen',
 'tooltip-ca-viewsource'           => 'Disse bladziede is beveiligd teagn veraandern. Iej könt wal kiekn noar de bladziede',
 'tooltip-ca-history'              => 'Oaldere versies van disse bladziede',
 'tooltip-ca-protect'              => 'Beveilig disse bladziede teagn veraandern',
@@ -2154,7 +2408,7 @@ De tiejelijke map is neet anwezig.",
 'tooltip-ca-nstab-project'        => 'Loat de projektbladziede zeen',
 'tooltip-ca-nstab-image'          => 'Loat de ofbeeldingnbladziede zeen',
 'tooltip-ca-nstab-mediawiki'      => 'Loat de systeemtekstbladziede zeen',
-'tooltip-ca-nstab-template'       => 'Loat de sjabloonbladziede zeen',
+'tooltip-ca-nstab-template'       => 'Loat de malbladziede zeen',
 'tooltip-ca-nstab-help'           => 'Loat de hölpbladziede zeen',
 'tooltip-ca-nstab-category'       => 'Loat de rubriekbladziede zeen',
 'tooltip-minoredit'               => 'Markeer as een kleine wieziging',
@@ -2165,6 +2419,9 @@ De tiejelijke map is neet anwezig.",
 'tooltip-watch'                   => 'Voeg disse pagina toe an joew volglieste',
 'tooltip-recreate'                => "Disse pagina opniej anmaken, ondanks 't feit dat 't vort-edaon is.",
 'tooltip-upload'                  => 'Bestaandn toovoogn',
+'tooltip-rollback'                => 'Mit "weerummedreien" ku-j mit één klik de bewarking(en) van de leste gebruker dee disse pagina bewark hef weerummezetten.',
+'tooltip-undo'                    => 'Mit "ongedaonmaken" ku-j disse bewarking weerummedreien en \'t bewarkingsvienster geet los.
+Je kunnen in de bewarkingssamenvatting een rejen opgeven.',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF-metadata is uut-eschakeld op disse server.',
@@ -2172,12 +2429,12 @@ De tiejelijke map is neet anwezig.",
 'notacceptable'     => 'De wikiserver kan de gegevens neet leveren in een vorm dee joew cliënt kan lezen.',
 
 # Attribution
-'anonymous'        => 'Annenieme gebruker(s) van {{SITENAME}}',
+'anonymous'        => 'Annenieme {{PLURAL:$1|gebruker|gebrukers}} van {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-gebruker $1',
 'lastmodifiedatby' => "Disse pagina is 't les ewiezig op $2, $1 deur $3.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Ebaseerd op wark van $1.',
 'others'           => 'aandere',
-'siteusers'        => '{{SITENAME}}-gebruker(s) $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|gebruker|gebrukers}}  $1',
 'creditspage'      => 'Pagina-auteurs',
 'nocredits'        => 'Der is gien auteursinfermasie beschikbaor veur disse pagina.',
 
@@ -2198,6 +2455,16 @@ Meestentieds wonnen dit veroorzaak deur een uutgaonde verwiezing dee op de zwart
 'numauthors'     => 'Antal verschillende auteurs (artikel): $1',
 'numtalkauthors' => 'Antal verschillende auteurs (overlegpagina): $1',
 
+# Skin names
+'skinname-standard'    => 'Klassiek',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Keuls blauw',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'MienSkin',
+'skinname-chick'       => 'Deftig',
+'skinname-simple'      => 'Eenvoudig',
+'skinname-modern'      => 'Medern',
+
 # Math options
 'mw_math_png'    => 'Altied as PNG weergeven',
 'mw_math_simple' => 'HTML veur eenvoudige formules, aanders PNG',
@@ -2207,21 +2474,23 @@ Meestentieds wonnen dit veroorzaak deur een uutgaonde verwiezing dee op de zwart
 'mw_math_mathml' => 'MathML',
 
 # Patrolling
-'markaspatrolleddiff'                 => 'Markeer as econtroleerd',
-'markaspatrolledtext'                 => 'Disse pagina is emarkeerd as econtroleerd',
-'markedaspatrolled'                   => 'As econtroleerd emarkeerd',
-'markedaspatrolledtext'               => 'De ekeuzen versie is emarkeerd as econtroleerd.',
+'markaspatrolleddiff'                 => 'Markeer as econtreleerd',
+'markaspatrolledtext'                 => 'Disse pagina is emarkeerd as econtreleerd',
+'markedaspatrolled'                   => 'Emarkeerd as econtreleerd',
+'markedaspatrolledtext'               => 'De ekeuzen versie is emarkeerd as econtreleerd.',
 'rcpatroldisabled'                    => 'De controlemeugelijkheid op leste wiezigingen is uut-eschakeld.',
-'rcpatroldisabledtext'                => 'De meugelijkheid um recente wiezigingen as econtroleerd an te marken is op dit ogenblik uut-eschakeld.',
+'rcpatroldisabledtext'                => 'De meugelijkheid um de leste wiezigingen as econtreleerd te markeren is op hejen uut-eschakeld.',
 'markedaspatrollederror'              => 'De bewarking kon neet of-evink wonnen.',
 'markedaspatrollederrortext'          => "Je mutten een wieziging sillecteren um 't as nao-ekeken te markeren.",
-'markedaspatrollederror-noautopatrol' => 'Je maggen joew eigen bewarkingen neet as econtroleerd markeren.',
+'markedaspatrollederror-noautopatrol' => 'Je maggen joew eigen bewarkingen neet as econtreleerd markeren.',
 
 # Patrol log
-'patrol-log-page'   => 'Markeerlogboek',
-'patrol-log-header' => 'In dit logboek staon de versies dee emarkeerd bin as econtreleerd.',
-'patrol-log-line'   => '$1 van $2 emarkeerd as econtroleerd $3',
-'patrol-log-auto'   => '(autematisch)',
+'patrol-log-page'      => 'Markeerlogboek',
+'patrol-log-header'    => 'In dit logboek staon de versies dee emarkeerd bin as econtreleerd.',
+'patrol-log-line'      => '$1 van $2 emarkeerd as econtreleerd $3',
+'patrol-log-auto'      => '(autematisch)',
+'patrol-log-diff'      => 'versie $1',
+'log-show-hide-patrol' => 'Markeerlogboek $1',
 
 # Image deletion
 'deletedrevision'                 => 'Vort-edaone ouwe versie $1.',
@@ -2238,6 +2507,9 @@ $1",
 'previousdiff' => '� veurige wieziging',
 'nextdiff'     => 'volgende wieziging →',
 
+# Visual comparison
+'visual-comparison' => 'Visuele vergelieking',
+
 # Media information
 'mediawarning'         => "'''Waorschuwing:''' dit bestand bevat meschien codering dee slich is veur 't systeem. <hr />",
 'imagemaxsize'         => 'Maximumgrootte van ofbeeldingen op de beschrievingspagina:',
@@ -2250,10 +2522,12 @@ $1",
 'show-big-image'       => 'Ofbeelding in hogere resolusie',
 'show-big-image-thumb' => '<small>Grootte van disse weergave: $1 × $2 beeldpunten</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Nieje ofbeeldingen',
 'imagelisttext'         => "Hier volg een lieste mit '''$1''' {{PLURAL:$1|bestand|bestanden}} esorteerd $2.",
 'newimages-summary'     => 'Op disse speciale pagina staon de bestanden dee der as les bie ekeumen bin.',
+'newimages-legend'      => 'Bestansnaam',
+'newimages-label'       => 'Bestansnaam (of deel dervan):',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'Niks te zien.',
 'ilsubmit'              => 'Zeuk',
@@ -2457,6 +2731,18 @@ Alle volgende verwiezingen dee op dezelfde regel staon, wonnen behaandeld as uut
 'exif-lightsource-24'  => 'ISO-studiokunsloch',
 'exif-lightsource-255' => 'Aanders',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flits is neet of-egaon',
+'exif-flash-fired-1'    => 'Mit flitser',
+'exif-flash-return-0'   => 'flits zend gien gegevens',
+'exif-flash-return-2'   => 'gien weerkaotsing van de flits vastesteld',
+'exif-flash-return-3'   => 'weerkaotsing van de flits vastesteld',
+'exif-flash-mode-1'     => 'verplich mit flitser',
+'exif-flash-mode-2'     => 'flitser verplich onderdrok',
+'exif-flash-mode-3'     => 'autematische modus',
+'exif-flash-function-1' => 'Gien flitserfunctie',
+'exif-flash-redeye-1'   => 'Rooie ogen-filter',
+
 'exif-focalplaneresolutionunit-2' => 'duum',
 
 'exif-sensingmethod-1' => 'Neet vastesteld',
@@ -2556,7 +2842,7 @@ Contreleer joew e-mailadres op ongeldige tekens.
 
 Fout bie 't versturen: $1",
 'confirmemail_invalid'     => 'Ongeldige bevestigingscode. De code kan verlopen ween.',
-'confirmemail_needlogin'   => 'Je muttnen $1 um joew e-mailadres te bevestigen.',
+'confirmemail_needlogin'   => 'Je mutten $1 um joew e-mailadres te bevestigen.',
 'confirmemail_success'     => 'Joew e-mailadres is bevestig. Je kunnen noen anmelden en {{SITENAME}} gebruken.',
 'confirmemail_loggedin'    => 'Joew e-mailadres is noen bevestig.',
 'confirmemail_error'       => "Der is iets fout egaon bie 't opslaon van joew bevestiging.",
@@ -2577,7 +2863,7 @@ De bevestigingscode zal verlopen op $4.',
 
 # Scary transclusion
 'scarytranscludedisabled' => '[Interwiki-intergrasie is edeactiveerd]',
-'scarytranscludefailed'   => "['t Sjabloon $1 kon neet op-ehaold wonnen]",
+'scarytranscludefailed'   => '[De mal $1 kon neet op-ehaold wonnen]',
 'scarytranscludetoolong'  => '[URL is te lang]',
 
 # Trackbacks
@@ -2594,21 +2880,10 @@ $1
 'confirmrecreate'     => "Gebruker [[User:$1|$1]] ([[User talk:$1|Overleeg]]) hef disse pagina vort-edaon naoda-j  begunnen bin mit joew wieziging, mit opgave van de volgende rejen: ''$2''. Bevestig da-j 't artikel herschrieven willen.",
 'recreate'            => 'Herschrieven',
 
-# HTML dump
-'redirectingto' => 'Bezig mit deursturen naor [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Klik op 'bevestig' um de kas van disse pagina te legen.
-
-$1",
 'confirm_purge_button' => 'Bevestig',
-
-# AJAX search
-'searchcontaining' => "Zeuk naor artikels dee ''$1'' bevatten.",
-'searchnamed'      => "Zeuk naor artikels mit de naam ''$1''.",
-'articletitles'    => "Artikels dee beginnen mit ''$1''",
-'hideresults'      => 'Verbarg risseltaoten',
-'useajaxsearch'    => 'Gebruuk de AJAX-zeukfuntie',
+'confirm-purge-top'    => "Klik op 'bevestig' um de kas van disse pagina te legen.",
+'confirm-purge-bottom' => "'t Leegmaken van de kas zörg derveur da-j de leste versie van een pagina zien.",
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; veurige',
@@ -2631,7 +2906,7 @@ $1",
 'autosumm-blank'   => 'Pagina leeg-emaak',
 'autosumm-replace' => "Tekse vervungen deur '$1'",
 'autoredircomment' => 'deurverwiezing naor [[$1]]',
-'autosumm-new'     => 'Nieje pagina: $1',
+'autosumm-new'     => "Nieje pagina: '$1'",
 
 # Live preview
 'livepreview-loading' => "An 't laojen…",
@@ -2674,6 +2949,7 @@ Je kunnen oek [[Special:Watchlist/edit|'t standard bewarkingsscharm gebruken]]."
 
 # Core parser functions
 'unknown_extension_tag' => 'Onbekende tag "$1"',
+'duplicate-defaultsort' => 'Waorschuwing: De standardsortering "$2" krieg veurrang veur de sortering "$1".',
 
 # Special:Version
 'version'                          => 'Versie', # Not used as normal message but as header for the special page itself
@@ -2702,13 +2978,13 @@ Je kunnen oek [[Special:Watchlist/edit|'t standard bewarkingsscharm gebruken]]."
 'filepath-submit'  => 'Zeuken',
 'filepath-summary' => "Disse speciale pagina geef 't hele pad veur een bestand. Ofbeeldingen wonnen in resolusie helemaole weer-egeven. Aandere bestanstypen wonnen gelieke in 't mit 't MIME-type verbunnen pregramma los edaon.
 
-Voer de bestansnaam in zonder 't veurvoegsel \"{{ns:image}}:\".",
+Voer de bestansnaam in zonder 't veurvoegsel \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Dubbele bestanden zeuken',
 'fileduplicatesearch-summary'  => 'Dubbele bestanden zeuken op baosis van de hashweerde.
 
-Voer de bestansnaam in zonder \'t veurvoegsel "{{ns:image}}:".',
+Voer de bestansnaam in zonder \'t veurvoegsel "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Dubbele bestanden zeuken',
 'fileduplicatesearch-filename' => 'Bestansnaam:',
 'fileduplicatesearch-submit'   => 'Zeuken',
@@ -2738,4 +3014,13 @@ Voer de bestansnaam in zonder \'t veurvoegsel "{{ns:image}}:".',
 'blankpage'              => 'Lege pagina',
 'intentionallyblankpage' => 'Disse pagina is bewus leeg eleuten.',
 
+# External image whitelist
+'external_image_whitelist' => " #Laot disse regel onveraanderd<pre>
+#Hieronder kunnen delen van regeliere uutdrokkingen ('t deel tussen //) an-egeven wonnen.
+#'t Wonnen mit de webadressen van ofbeeldingen uut bronnen van butenof vergeleken
+#Een positief vergeliekingsrisseltaot zörg dertoe dat de ofbeelding weer-egeven wonnen, aanders wonnen de ofbeelding allinnig as verwiezing weer-egeven
+#Regels dee mit een # beginnen, wonnen as commetaar behaandeld
+
+#Delen van regeliere uutdrokkingen boven disse regel plaosen. Laot disse regel onveraanderd</pre>",
+
 );
diff --git a/languages/messages/MessagesNe.php b/languages/messages/MessagesNe.php
index 47de7715..b2b79d29 100644
--- a/languages/messages/MessagesNe.php
+++ b/languages/messages/MessagesNe.php
@@ -21,8 +21,6 @@ $digitTransformTable = array(
 );
 
 $messages = array(
-'skinpreview' => '(पूर�वालोकन)',
-
 # Dates
 'sunday'        => 'आईतबार',
 'monday'        => 'सोमबार',
@@ -77,7 +75,7 @@ $messages = array(
 'mytalk'        => 'मेरो क�रा',
 'anontalk'      => 'यस� IP को वारेमा वार�तालाप गर�न�होस�',
 'navigation'    => 'अन�वेषण',
-'and'           => 'र',
+'and'           => '&#32;र',
 
 'help'             => 'सहयोग',
 'search'           => 'खोज',
@@ -110,7 +108,6 @@ $messages = array(
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutpage'            => 'Project:बारेमा',
-'bugreports'           => 'त�र�टी बिवरण',
 'copyright'            => 'लेखका सामाग�री $1 अन�सार उपलब�ध छ।',
 'currentevents'        => 'हालैका घटनाहर�',
 'currentevents-url'    => 'Project:हालैका घटनाहर�',
@@ -123,7 +120,6 @@ $messages = array(
 
 'badaccess'        => 'आज�ञा त�र�टी',
 'badaccess-group0' => 'तपाईले अन�रोध गर�न�भ�को कार�य गर�न तपाईलाई अन�मति दिइ�को छैन।',
-'badaccess-group1' => 'तपाईले अन�रोध गर�न�भ�को कार�य गर�ने अन�मति $1 समूहमा पर�ने प�रयोगकर�ताहर�मा सिमीत छ।',
 
 'ok'                      => 'ह�न�छ',
 'youhavenewmessages'      => 'तपाइको लागि ($2) मा  $1 छ ।',
@@ -156,7 +152,6 @@ $messages = array(
 # General errors
 'badarticleerror' => 'यो कार�य यस पृष�ठमा गर�न मिल�दैन।',
 'badtitle'        => 'गलत शिर�षक',
-'perfdisabled'    => 'माफ गर�न�होला! यो स�विधा हाल केही समयको लागी हटाइ�को छ, किनभने यसले डेटाबेसलाई यस�तरी स�स�त गराउछ कि कसैले पनि विकिपीडिया प�रयोग नै गर�न पाउदैनन�।',
 'perfcached'      => 'तलको डाटाहर� क�याचमा रहेका क�राहर� ह�न�। अपट�डेट नह�नपनि सक�छन�।',
 'perfcachedts'    => 'तलको डाटाहर� क�याचमा रहेका क�राहर� ह�न� र यो पछिल�लो पल�ट $1 मा अपडेट गरी�को थियो ।',
 
@@ -194,6 +189,10 @@ $messages = array(
 'accountcreatedtext'         => '$1 को लागी प�रयोगकर�ता खाता खोलियो ।',
 'loginlanguagelabel'         => 'भाषा: $1',
 
+# Password reset dialog
+'oldpassword' => 'प�रानो पासवर�ड:',
+'newpassword' => 'नया� पासवर�ड:',
+
 # Edit page toolbar
 'bold_sample'     => 'गाढा अक�षर',
 'bold_tip'        => 'गाढा अक�षर',
@@ -206,8 +205,8 @@ $messages = array(
 'media_sample'    => 'उदाहरण.ogg',
 
 # Edit pages
-'summary'                => 'सारांश',
-'subject'                => 'विषय/शिर�षक',
+'summary'                => 'सारांश:',
+'subject'                => 'विषय/शिर�षक:',
 'minoredit'              => 'यो सानो सम�पादन हो',
 'watchthis'              => 'यो पृष�ठ अवलोकन गर�न�होस�',
 'savearticle'            => 'संग�रह गर�न�होस�',
@@ -215,7 +214,7 @@ $messages = array(
 'showpreview'            => 'पूर�वालोकन देखाउन�होस�',
 'showlivepreview'        => 'प�रत�यक�ष पूर�वालोकन',
 'showdiff'               => 'परिवर�तन देखाउन�होस�',
-'summary-preview'        => 'सारांश पूर�वालोकन',
+'summary-preview'        => 'सारांश पूर�वालोकन:',
 'blockedoriginalsource'  => "'''$1''' को स�रोत तल देखाइ�को छ:",
 'whitelistedittitle'     => 'सम�पादन गर�नको लागि प�रवेश (लग इन) आवश�यक छ',
 'whitelistedittext'      => 'पाना सम�पादन गर�न तपा�ईले $1 गर�न� पर�दछ।',
@@ -224,8 +223,8 @@ $messages = array(
 'accmailtitle'           => 'पासवर�ड पठाइयो',
 'accmailtext'            => '"$1" को पासवर�ड $2मा पठाइ�को छ ।',
 'newarticle'             => '(नया�)',
-'note'                   => '<strong>स��ाव:</strong>',
-'previewnote'            => '<strong>यो केवल पूर�वालोकन मात�र हो; परिवर�तनहरू संग�रह गरिसकि�को छैन!</strong>',
+'note'                   => "'''स��ाव:'''",
+'previewnote'            => "'''यो केवल पूर�वालोकन मात�र हो; परिवर�तनहरू संग�रह गरिसकि�को छैन!'''",
 'editing'                => '$1 सम�पादन गरि�दै',
 'editingsection'         => '$1 (खण�ड) सम�पादन गरि�दै',
 'editconflict'           => 'सम�पादन बा��ियो: $1',
@@ -259,6 +258,7 @@ $messages = array(
 'mypreferences'         => 'मेरा अभिर�चिहरू',
 'prefsnologin'          => 'प�रवेश (लग ईन) नगरि�को',
 'changepassword'        => 'पासवर�ड परिवर�तन गर�न�होस�',
+'skin-preview'          => 'पूर�वालोकन',
 'math'                  => 'गणित',
 'datetime'              => 'मिति र समय',
 'math_unknown_error'    => 'अज�ञात समस�या',
@@ -266,8 +266,6 @@ $messages = array(
 'prefs-personal'        => 'प�रयोगकर�ताको विवरण',
 'prefs-rc'              => 'नया� परिवर�तनहर�',
 'prefs-watchlist'       => 'अवलोकन पृष�ठ',
-'oldpassword'           => 'प�रानो पासवर�ड:',
-'newpassword'           => 'नया� पासवर�ड:',
 'recentchangescount'    => 'नया� परिवर�तित शिर�षकहर�',
 'savedprefs'            => 'तपा�ईका अभिर�चिहरू सङ�ग�रहित भयो।',
 'localtime'             => 'स�थानीय समय',
@@ -304,13 +302,13 @@ $messages = array(
 
 'nolicense' => 'केहिपनि छानि�न',
 
-# Special:ImageList
-'imagelist_date'        => 'मिति',
-'imagelist_name'        => 'नाम',
-'imagelist_user'        => 'प�रयोगकर�ता',
-'imagelist_description' => 'वर�णन',
+# Special:ListFiles
+'listfiles_date'        => 'मिति',
+'listfiles_name'        => 'नाम',
+'listfiles_user'        => 'प�रयोगकर�ता',
+'listfiles_description' => 'वर�णन',
 
-# Image description page
+# File description page
 'nolinkstoimage'   => 'यो फाईलसंग लिंकभ�को क�नै पृष�ठ छैन.',
 'noimage-linktext' => 'अपलोड गर�न�होस�',
 
@@ -369,9 +367,17 @@ $messages = array(
 # Special:Categories
 'categories' => 'श�रेणीहरू',
 
+# Special:LinkSearch
+'linksearch-ns' => 'नेमस�पेस:',
+'linksearch-ok' => 'खोज�न�होस�',
+
 # Special:ListUsers
 'listusers-submit' => 'देखाउन�होस�',
 
+# Special:Log/newusers
+'newuserlog-create-entry'  => 'नया� प�रयोगकर�ता',
+'newuserlog-create2-entry' => '$1 का लागी खाता खोलियो',
+
 # E-mail user
 'mailnologin'     => 'ईमेल पठाउने ठेगाना नै भ�न ।',
 'mailnologintext' => 'तपाईले अर� प�रयोगकर�ताहर�लाई ईमेल पठाउनको लागी आफ� पहिले [[Special:UserLogin|प�रवेश(लगइन)गरेको]] ह�न�पर�छ र [[Special:Preferences|आफ�नो रोजाइहर�मा]] यौटा वैध ईमेल ठेगाना भ�को ह�न�पर�छ।',
@@ -396,23 +402,20 @@ $messages = array(
 'wlheader-enotif'      => '* ईमेलद�वारा जानकारी गराउने तरिका enable गरियो ।',
 'wlheader-showupdated' => "* तपाइले पछिल�लो पल�ट भ�रमण गरेपछि परिवर�तन भ�का पृष�ठहरूलाई '''गाढा''' गरेर देखाइ�को छ ।",
 'wlshowlast'           => 'पछिल�ला $2 दिनहरूका $3 $1 घण�टाहरूका देखाउन�होस�',
-'watchlist-show-bots'  => 'बोट सम�पादन देखाउन�होस�',
-'watchlist-hide-bots'  => 'बोट सम�पादन ल�काउन�होस�',
-'watchlist-show-own'   => 'मेरा सम�पादनहर� देखाउन�होस�',
-'watchlist-hide-own'   => 'मेरा सम�पादनहर� ल�काउन�होस�',
-'watchlist-show-minor' => 'सानो सम�पादन देखाउन�होस�',
-'watchlist-hide-minor' => 'सानो सम�पादन ल�काउन�होस�',
 
 'enotif_newpagetext' => 'यो नया� पृष�ठ हो।',
 'changed'            => 'परिवर�तन भइसकेको',
 
-# Delete/protect/revert
-'excontent'                   => "लेख थियो: '$1'",
-'historywarning'              => 'खबरदारी: तपाईंले मेटाउन लाग�न�भ�को पृष�ठको इतिहास छ:',
-'actioncomplete'              => 'काम सकियो',
-'reverted'                    => 'अघिल�लो संशोधनको स�थितिमा फर�काइयो',
+# Delete
+'excontent'      => "लेख थियो: '$1'",
+'historywarning' => 'खबरदारी: तपाईंले मेटाउन लाग�न�भ�को पृष�ठको इतिहास छ:',
+'actioncomplete' => 'काम सकियो',
+'reverted'       => 'अघिल�लो संशोधनको स�थितिमा फर�काइयो',
+
+# Protect
 'protectlogpage'              => 'स�रक�षण लग',
 'protectedarticle'            => '"[[$1]]" लाई स�रक�षित गरियो',
+'prot_1movedto2'              => '[[$1]] लाई [[$2]]मा सारियो',
 'protectcomment'              => 'बचाउको कारण',
 'protect-default'             => '(स�वतह)',
 'protect-level-autoconfirmed' => 'दर�ता नभ�का प�रयोगकर�ताहरूलाई रोक',
@@ -456,6 +459,7 @@ $messages = array(
 # Move page
 'move-page-legend'        => 'पृष�ठ सार�न�होस�',
 'movearticle'             => 'पृष�ठ सार�न�होस�',
+'movenologin'             => 'प�रवेश (लग ईन) नगरि�को',
 'movepagebtn'             => 'पृष�ठ सार�न�होस�',
 'pagemovedsub'            => 'सार�ने काम सफल भयो',
 'movedto'                 => 'मा सारियो',
@@ -516,7 +520,7 @@ $messages = array(
 'previousdiff' => '� अधिल�लो भिन�नता',
 'nextdiff'     => 'पछिल�लो भिन�नता →',
 
-# Special:NewImages
+# Special:NewFiles
 'noimages' => 'हेर�नको लागि केही छैन.',
 'ilsubmit' => 'खोज�न�होस�',
 'bydate'   => 'मिति अन�सार',
@@ -589,9 +593,6 @@ $messages = array(
 # action=purge
 'confirm_purge_button' => 'ह�न�छ',
 
-# AJAX search
-'hideresults' => 'नतिजा ल�काउन�होस�',
-
 # Multipage image navigation
 'imgmultipageprev' => '� अघिल�लो पृष�ठ',
 'imgmultipagenext' => 'पछिल�लो पृष�ठ →',
diff --git a/languages/messages/MessagesNew.php b/languages/messages/MessagesNew.php
index c2c181eb..03430766 100644
--- a/languages/messages/MessagesNew.php
+++ b/languages/messages/MessagesNew.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'छ�येलेमि_ख�लाब�ला',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_ख�लाब�ला',
-	NS_IMAGE            => 'किपा',
-	NS_IMAGE_TALK       => 'किपा_ख�लाब�ला',
+	NS_FILE             => 'किपा',
+	NS_FILE_TALK        => 'किपा_ख�लाब�ला',
 	NS_MEDIAWIKI        => 'मिडियाविकि',
 	NS_MEDIAWIKI_TALK   => 'मिडियाविकि_ख�लाब�ला',
 	NS_HELP             => 'ग�वाहालि',
@@ -77,10 +77,13 @@ $messages = array(
 'tog-watchlisthideown'        => 'जिग� सम�पादन वाचलिस�टय� स�च�कादिस�',
 'tog-watchlisthidebots'       => 'वाचलिस�टं बोत सम�पादन स�च�कादिस�',
 'tog-watchlisthideminor'      => 'वाचलिस�टं चीधंग� सम�पादन स�च�कादिस�',
+'tog-watchlisthideliu'        => 'वाचलिस�टं लग�ड इन छ�यलामितेग� सम�पादन स�च�कादिस�',
+'tog-watchlisthideanons'      => 'वाचलिस�टं अज�ञात छ�यलामिया सम�पादन स�च�कादिस�',
 'tog-nolangconversion'        => 'भेरियन�ट (variant) कन�भर�जन डिसेबल यानादिस�',
 'tog-ccmeonemails'            => 'जिं मेपिं छ�यलामितेग� छ�वइग� इ-मेलतेग� कपि जित नं छ�वयादिस�',
 'tog-diffonly'                => 'पाःग� (diffs) स�वया क�वेया पौया कण�टेण�ट क�यनादिमते',
 'tog-showhiddencats'          => 'स�च�कातग� प�चःत क�यनादिस�',
+'tog-noconvertlink'           => 'लिङ�क शिर�षक हिलेज�या डिजेबल यानादिस�',
 
 'underline-always'  => 'न�ह�याबिलें',
 'underline-never'   => 'नेभर',
@@ -159,16 +162,23 @@ $messages = array(
 'moredotdotdot' => 'अप�व॰॰॰',
 'mypage'        => 'जिग� पौ',
 'mytalk'        => 'जिग� खं',
+'anontalk'      => 'थ�व IPया निंतिं ख�ल�हाबल�हा',
 'navigation'    => 'परिवहन',
-'and'           => 'व',
+'and'           => '&#32;व',
 
+# Metadata in edit box
+'metadata_help' => 'मेटाडेटा:',
+
+'returnto'         => '$1य� लिहा��ास�।',
+'tagline'          => '{{SITENAME}}नं',
 'help'             => 'ग�वहालि',
-'search'           => 'मालादिसं',
+'search'           => 'मालादिस�',
 'searchbutton'     => 'मालादिस�',
 'go'               => '�ास�',
 'searcharticle'    => '�ास�',
 'history'          => 'पौया इतिहास',
 'history_short'    => 'इतिहास',
+'updatedmarker'    => 'जिं दक�ले लिपा पौ स�वे ध�ंकाया अपडेट',
 'info_short'       => 'जानकारी',
 'printableversion' => 'ध�वायेज�य�ग� संस�करण',
 'permalink'        => 'स�थायी लिङ�क',
@@ -188,8 +198,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}या बारेय�',
 'aboutpage'            => 'Project:बारेय�',
-'bugreports'           => 'बग रिपोर�ट',
-'bugreportspage'       => 'Project:बग रिपोर�ट',
 'copyright'            => 'कण�टेण�ट $1 कथं उपलब�ध द�।',
 'copyrightpagename'    => '{{SITENAME}} लेखाधिकार',
 'copyrightpage'        => '{{ns:project}}:लेखाधिकार',
@@ -212,6 +220,7 @@ $messages = array(
 
 'badaccess'        => 'पर�मिसन इरर',
 'badaccess-group0' => 'छिं अन�रोध यानादिग� ज�या छिं याये मछिं।',
+'badaccess-groups' => 'छिं अन�रोध यानादिग� ज�या {{PLURAL:$2|प�चः|प�चःतः}}: $1या छ�यलामिं जक�क याये द�।',
 
 'versionrequired'     => 'मिडियाविकिया $1 संस�करण माःग�',
 'versionrequiredtext' => 'थ�व पौ छ�यले यात मिडियाविकिया $1 संस�करण माः।
@@ -240,11 +249,31 @@ $messages = array(
 'nstab-category'  => 'प�चः',
 
 # Main script and global functions
-'nosuchaction' => 'थन�याग� ज�या मद�',
+'nosuchaction'      => 'थन�याग� ज�या मद�',
+'nosuchactiontext'  => 'URLनं या धाःग� ज�या विकिं मस�य�',
+'nosuchspecialpage' => 'थन�याग� विशेष पौ मद�',
+'nospecialpagetext' => "<big>'''छिं मद�ग� विशेष पौया माग तयादिल।'''</big>
+
+अस�थित�वय� द�ग� विशेष पौया धलः [[विशेष:विशेषपौ|{{int:specialpages}}]]य� द�।",
 
 # General errors
+'databaseerror'   => 'डेटाबेस इरर',
+'dberrortext'     => 'छगू डेटाबेस क�वेरी सिन�ट�याक�स इरर जूग� द�।
+थ�व इररं सफ�टवेयरय� bug दूग� इंगीत यायेफ�।
+थ�व स�वया न�हः कोशिस जूग� डेटाबेस क�वेरी 
+"<tt>$2</tt>" फंक�सनया 
+<blockquote><tt>$1</tt></blockquote> ख। 
+MySQL नं इरर "<tt>$3: $4</tt>" क�यंग� द�।',
+'noconnect'       => 'माफ यानादिस�! थ�व विकिइ छ�ं प�राविधिक कठिनाइ वयाच�व�ग� द� व डेटाबेस सर�भरयात स�वापू तये मफयाच�व�ग� द�।<br />
+$1',
+'nodb'            => 'डेटाबेस $1यात ल�यये मफ�त।',
+'cachederror'     => 'थ�व पौ अन�रोधित पौया क�यासे कपि ख व अप-ट�-डेट मज�इफ�।',
 'laggedslavemode' => 'चेतावनी: पतिइ न�ह�ग� अपदेत मदेफ� ।',
 'readonly'        => 'देताबेस संरक�षित',
+'enterlockreason' => 'पौ क�नातयेग�या निंतिं कारण बियादिस�, नापं पौ गब�ले चायेकिग� ज�इफ� उकिया अन�मान नं बियादिस�',
+'readonlytext'    => 'थ�व डेटाबेस आःया ईले, सम�भवतः नियमित डेटाबेस मेन�टेनेन�सया निंतिं, न�हूग� �न�ट�रि व मेमेग� हिलेज�याया यायेमछिंकः क�नातःग� द�। थ�व ध�ंका हानं डेटाबेस साधारण ज�इ।
+
+थ�व डेटाबेस क�नाःतम�ह प�रबन�धकं थ�व वर�णन ब�यूग� द�: $1',
 'internalerror'   => 'इन�तरनल इरर',
 'viewsource'      => 'स�रोत स�वयादिस�',
 
@@ -275,12 +304,12 @@ $messages = array(
 'loginlanguagelabel'      => 'भाषा: $1',
 
 # Edit pages
-'summary'       => 'सारांश',
+'summary'       => 'सारांश:',
 'savearticle'   => 'पौ म�ंकादिसं',
 'preview'       => 'स�वयादिसं',
 'newarticle'    => '(न�ह�)',
-'note'          => '<strong>होस यानादिस�:</strong>',
-'previewnote'   => '<strong>थ�व पूर�वालोकन जक�क ख। छिं यानादिग� सम�पादन स�वथंग� मद�नि!</strong>',
+'note'          => "'''होस यानादिस�:'''",
+'previewnote'   => "'''थ�व पूर�वालोकन जक�क ख। छिं यानादिग� सम�पादन स�वथंग� मद�नि!'''",
 'editing'       => '$1 सम�पादन ज�याच�व�ग� द�',
 'editconflict'  => 'सम�पादन द�वंग� द�: $1',
 'yourtext'      => 'छिग� आखः',
@@ -290,10 +319,16 @@ $messages = array(
 'revisionasof'     => '$1 तक�कया संस�करण',
 'previousrevision' => '�प�लांग� संस�करण',
 
+# Diffs
+'diff-i'      => "'''ब�यक�वःग�'''",
+'diff-b'      => "'''गाढा'''",
+'diff-strong' => "'''कडा'''",
+
 # Search results
-'searchrelated' => 'स�वापू द�ःग�',
-'searchall'     => 'सकल',
-'powersearch'   => 'मालादिस�',
+'searchhelp-url' => 'Help:धलःपौ',
+'searchrelated'  => 'स�वापू द�ःग�',
+'searchall'      => 'सकल',
+'powersearch'    => 'मालादिस�',
 
 # Preferences page
 'mypreferences'  => 'जिग� प�राथमिकता',
@@ -318,7 +353,7 @@ $messages = array(
 # Upload
 'upload' => 'फाइल अपलोड',
 
-# Image description page
+# File description page
 'filehist-user' => 'छ�य�‌लामि',
 
 # Random page
@@ -341,6 +376,9 @@ $messages = array(
 # Special:Categories
 'categories' => 'प�चःत',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'न�ह�म�ह छ�येलेमि',
+
 # Restrictions (nouns)
 'restriction-edit' => 'सम�पादन',
 
@@ -392,6 +430,9 @@ $messages = array(
 'tooltip-watch'                   => 'थ�व पौयात छिग� वाचलिस�टय� तनादिस�',
 'tooltip-recreate'                => 'थ�व पौ ह�याछ�वेध�ंक�ग� ज�सां प�नर�निर�माण यानादिस�',
 'tooltip-upload'                  => 'अपलोड न�ह�यथनादिस�',
+'tooltip-rollback'                => '"रोलब�याकं" छगू क�लिकय� थ�व पौयात न�हापाया छ�य�‌लामिं याःग� परिवर�तनय� हिलाछ�वइ।',
+'tooltip-undo'                    => '"Undo" नं थ�व सम�पादनयात खारेज याना सम�पादन फर�म यात प�रिभ�य� मोडय� चायेकी।
+थ�किलिं सारांशय� कारण तनेछिंकी।',
 
 # Stylesheets
 'common.css'      => '/* थन तःग� CSS सकल स�किनय� छ�य�‌लिग� ज�इ */',
@@ -403,6 +444,8 @@ $messages = array(
 'chick.css'       => '/* थन तःग� CSS नं चिक स�किनया छ�य�‌लामितेत असर याइ */',
 'simple.css'      => '/* थन तःग� CSS नं सिम�पल स�किनया छ�य�‌लामितेत असर याइ */',
 'modern.css'      => '/* थन तःग� CSS नं मोडर�न स�किनया छ�य�‌लामितेत असर याइ */',
+'print.css'       => '/* थन तःग� CSS नं प�रिन�ट आउटप�टयात असर याइ */',
+'handheld.css'    => '/* थन तःग� CSS नं $wgHandheldStyle आधारित ह�याण�डहेल�ड यन�त�रयात असर याइ */',
 
 # Attribution
 'others' => 'मेमेग�',
diff --git a/languages/messages/MessagesNiu.php b/languages/messages/MessagesNiu.php
new file mode 100644
index 00000000..436d9935
--- /dev/null
+++ b/languages/messages/MessagesNiu.php
@@ -0,0 +1,236 @@
+<?php
+/** Niuean (ko e vagahau Niuē)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Jose77
+ * @author Rotemliss
+ * @author Sioneholof
+ */
+
+$messages = array(
+# Dates
+'sunday'        => 'Aho Tapu',
+'monday'        => 'Aho Gofua',
+'tuesday'       => 'Aho Ua',
+'wednesday'     => 'Aho Lotu',
+'thursday'      => 'Aho Tuloto',
+'friday'        => 'Aho Falaile',
+'saturday'      => 'Aho Faiumu',
+'january'       => 'Ianuali',
+'february'      => 'Fepuali',
+'march'         => 'Masi',
+'april'         => 'Apelila',
+'may_long'      => 'Me',
+'june'          => 'Iuni',
+'july'          => 'Iulai',
+'august'        => 'Aokuso',
+'september'     => 'Sepetema',
+'october'       => 'Oketopa',
+'november'      => 'Novema',
+'december'      => 'Tesemo',
+'january-gen'   => 'Ianuali',
+'february-gen'  => 'Fepuali',
+'march-gen'     => 'Masi',
+'april-gen'     => 'Apelila',
+'may-gen'       => 'Me',
+'june-gen'      => 'Iuni',
+'july-gen'      => 'Iulai',
+'august-gen'    => 'Aokuso',
+'september-gen' => 'Sepetema',
+'october-gen'   => 'Oketopa',
+'november-gen'  => 'Novema',
+'december-gen'  => 'Tesemo',
+'may'           => 'Me',
+
+'article'        => 'Tohi Tala',
+'cancel'         => 'Tiaki',
+'qbedit'         => 'Fakahakohako',
+'qbspecialpages' => 'Tau Lau Mahuiga',
+'mytalk'         => 'Haaku tutala',
+'navigation'     => 'Navikati',
+
+'help'             => 'Lagomatai',
+'search'           => 'Kumi',
+'searchbutton'     => 'Kumi',
+'go'               => 'Fano',
+'searcharticle'    => 'Fano',
+'history_short'    => 'Liu onoono atu ki tua',
+'printableversion' => 'Mitaki lolomi',
+'permalink'        => 'Matutakiaga mautumau',
+'edit'             => 'Fakahakohako',
+'delete'           => 'Tamate',
+'protect'          => 'Puipui',
+'talk'             => 'Fakatutala',
+'toolbox'          => 'Puha Mena Gahua',
+'otherlanguages'   => 'Ke he falu vagahau',
+'jumptonavigation' => 'navikati',
+'jumptosearch'     => 'kumi',
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite'            => 'Hagaao ke he {{SITENAME}}',
+'currentevents'        => 'Tau Fakaholoaga Mogonei',
+'edithelp'             => 'Lagomatai ke he Fakahakohako',
+'mainpage'             => 'Matapatu Lau',
+'mainpage-description' => 'Matapatu Lau',
+'portal'               => 'Maaga ke Matutaki',
+'privacy'              => 'Ko e puipuiaga ke he tau talahauaga mo e talahauaga fakatagata',
+
+'youhavenewmessages'      => 'Fai $1 ($2).',
+'newmessageslink'         => 'tau tohi foou',
+'youhavenewmessagesmulti' => 'Fai tohi foou a koe he $1',
+'editsection'             => 'fakahakohako',
+'editold'                 => 'fakahakohako',
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-user' => 'Lau he tagata',
+
+# General errors
+'viewsource' => 'Kitekite ke mouaga',
+
+# Login and logout pages
+'welcomecreation'         => '== Fakalofa atu, kua fiafia ke hu mai ==
+Kua talaga e haau a poko.
+Ua nimo ke hiki e haau tau manako {{SITENAME}}.',
+'yourname'                => 'Matahigoa he tagata:',
+'yourpassword'            => 'Kupu fufu:',
+'yourpasswordagain'       => 'Liu lolomi e kupu fufu:',
+'remembermypassword'      => 'Manatu e haaku loko ini',
+'login'                   => 'Hu ki loto',
+'nav-login-createaccount' => 'Hu ki loto / talaga e poko',
+'userlogin'               => 'Hu ki loto / talaga e poko',
+'logout'                  => 'Hu mai ki tua',
+'userlogout'              => 'Hu mai ki tua',
+'notloggedin'             => 'Ai la hu ki loto',
+'createaccount'           => 'Talaga e poko',
+'gotaccountlink'          => 'Hu ki loto',
+'youremail'               => 'Meli hila:',
+'username'                => 'Matahigoa he tagata:',
+'email'                   => 'Meli hila',
+
+# Edit pages
+'summary'            => 'Fakakatoakatoa:',
+'minoredit'          => 'Ko e fakahakohako fakatote',
+'watchthis'          => 'Onoono e lau e',
+'savearticle'        => 'Taofi e lau',
+'showpreview'        => 'Fakakite e foliga',
+'showdiff'           => 'Fakakite e tau hikihiki',
+'whitelistedittitle' => 'Kua lata ke loko ini ke fakahakohako',
+'loginreqlink'       => 'hu ki loto',
+
+# History pages
+'currentrev'          => 'Kitekiteaga mogonei',
+'currentrevisionlink' => 'Kitekiteaga mogonei',
+
+# Preferences page
+'mypreferences'     => 'Haaku a tau manako',
+'prefsnologin'      => 'Ai la hu ki loto',
+'prefs-rc'          => 'Hikihikiaga mogoia',
+'searchresultshead' => 'Kumi',
+
+# Recent changes
+'recentchanges' => 'Hikihikiaga mogoia',
+'hist'          => 'Liu onoono atu ki tua',
+
+# Recent changes linked
+'recentchangeslinked' => 'Falu hikihiki',
+
+# Upload
+'upload'            => 'Fakafano e faila',
+'uploadbtn'         => 'Fakafano e faila',
+'uploadnologin'     => 'Ai la hu ki loto',
+'filedesc'          => 'Fakakatoakatoa',
+'fileuploadsummary' => 'Fakakatoakatoa:',
+'watchthisupload'   => 'Onoono e lau e',
+
+# File description page
+'filehist-deleteone' => 'tamate',
+
+# File deletion
+'filedelete-submit' => 'Tamate',
+
+# Random page
+'randompage' => 'Lau fifili',
+
+'brokenredirects-edit'   => '(fakahakohako)',
+'brokenredirects-delete' => '(tamate)',
+
+# Miscellaneous special pages
+'newpages-username' => 'Matahigoa he tagata:',
+'move'              => 'Une',
+'movethispage'      => 'Une e lau e',
+
+# Book sources
+'booksources-go' => 'Fano',
+
+# Special:LinkSearch
+'linksearch-ok' => 'Kumi',
+
+# Watchlist
+'watchlist'     => 'Ko e haaku lau kitekite',
+'mywatchlist'   => 'Ko e haaku lau kitekite',
+'watchnologin'  => 'Ai la hu ki loto',
+'watch'         => 'Kitekite',
+'watchthispage' => 'Onoono e lau e',
+
+# Delete
+'delete-legend' => 'Tamate',
+
+# Protect
+'prot_1movedto2' => '[[$1]] kua une ke he [[$2]]',
+
+# Restrictions (nouns)
+'restriction-edit' => 'Fakahakohako',
+'restriction-move' => 'Une',
+
+# Undelete
+'undelete-search-submit' => 'Kumi',
+
+# Contributions
+'contributions' => 'Tau lagomatai tagata',
+'mycontris'     => 'Haaku a tau lagomatai',
+
+'sp-contributions-submit' => 'Kumi',
+
+# What links here
+'whatlinkshere' => 'Ko e tau matutakiaga he mena e',
+
+# Block/unblock
+'ipbreason'          => 'Kakano:',
+'ipblocklist-submit' => 'Kumi',
+
+# Move page
+'movenologin' => 'Ai la hu ki loto',
+'move-watch'  => 'Onoono e lau e',
+'movedto'     => 'kua une ke he',
+'1movedto2'   => '[[$1]] kua une ke he [[$2]]',
+'movereason'  => 'Kakano:',
+
+# Namespace 8 related
+'allmessages' => 'Tau fakailoaga',
+
+# Tooltip help for the actions
+'tooltip-pt-preferences' => 'Haaku a tau manako',
+'tooltip-pt-logout'      => 'Hu mai ki tua',
+'tooltip-p-logo'         => 'Matapatu Lau',
+
+# Special:NewFiles
+'ilsubmit' => 'Kumi',
+
+# Multipage image navigation
+'imgmultigo' => 'Fano!',
+
+# Table pager
+'table_pager_limit_submit' => 'Fano',
+
+# Special:Version
+'version-specialpages' => 'Tau Lau Mahuiga',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch-submit' => 'Kumi',
+
+# Special:SpecialPages
+'specialpages' => 'Tau Lau Mahuiga',
+
+);
diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index 3f5aa069..aa63900f 100644
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -8,6 +8,7 @@
  * @author Effeietsanders
  * @author Erwin85
  * @author Extended by Hendrik Maryns <hendrik.maryns@uni-tuebingen.de>, March 2007.
+ * @author Fryed-peach
  * @author Galwaygirl
  * @author GerardM
  * @author Hamaryns
@@ -15,6 +16,7 @@
  * @author Niels
  * @author SPQRobin
  * @author Siebrand
+ * @author Slomox
  * @author Troefkaart
  * @author Tvdm
  * @author לערי ריינה�רט
@@ -23,36 +25,30 @@
 $separatorTransformTable = array(',' => '.', '.' => ',' );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Speciaal',
-	NS_MAIN           => '',
-	NS_TALK           => 'Overleg',
-	NS_USER           => 'Gebruiker',
-	NS_USER_TALK      => 'Overleg_gebruiker',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Overleg_$1',
-	NS_IMAGE          => 'Afbeelding',
-	NS_IMAGE_TALK     => 'Overleg_afbeelding',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Overleg_MediaWiki',
-	NS_TEMPLATE       => 'Sjabloon',
-	NS_TEMPLATE_TALK  => 'Overleg_sjabloon',
-	NS_HELP           => 'Help',
-	NS_HELP_TALK      => 'Overleg_help',
-	NS_CATEGORY       => 'Categorie',
-	NS_CATEGORY_TALK  => 'Overleg_categorie'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Speciaal',
+	NS_TALK             => 'Overleg',
+	NS_USER             => 'Gebruiker',
+	NS_USER_TALK        => 'Overleg_gebruiker',
+	NS_PROJECT_TALK     => 'Overleg_$1',
+	NS_FILE             => 'Bestand',
+	NS_FILE_TALK        => 'Overleg_bestand',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
+	NS_TEMPLATE         => 'Sjabloon',
+	NS_TEMPLATE_TALK    => 'Overleg_sjabloon',
+	NS_HELP             => 'Help',
+	NS_HELP_TALK        => 'Overleg_help',
+	NS_CATEGORY         => 'Categorie',
+	NS_CATEGORY_TALK    => 'Overleg_categorie',
 );
 
-$skinNames = array(
-	'standard'    => 'Klassiek',
-	'nostalgia'   => 'Nostalgie',
-	'cologneblue' => 'Keuls blauw',
-	'monobook'    => 'Monobook',
-	'myskin'      => 'MijnSkin',
-	'simple'      => 'Eenvoudig',
-	'modern'      => 'Modern',
+$namespaceAliases = array(
+	'Afbeelding' => NS_FILE,
+	'Overleg_afbeelding' => NS_FILE_TALK,
 );
 
+
 $dateFormats = array(
 	'mdy time' => 'H:i',
 	'mdy date' => 'M j, Y',
@@ -72,208 +68,214 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#REDIRECT', '#DOORVERWIJZING' ),
-	'notoc'               => array( '0', '__NOTOC__', '__GEENINHOUD__' ),
-	'nogallery'           => array( '0', '__NOGALLERY__', '__GEEN_GALERIJ__' ),
-	'forcetoc'            => array( '0', '__FORCETOC__', '__INHOUD_DWINGEN__', '__FORCEERINHOUD__' ),
-	'toc'                 => array( '0', '__TOC__', '__INHOUD__' ),
-	'noeditsection'       => array( '0', '__NOEDITSECTION__', '__NIETBEWERKBARESECTIE__' ),
-	'currentmonth'        => array( '1', 'CURRENTMONTH', 'HUIDIGEMAAND' ),
-	'currentmonthname'    => array( '1', 'CURRENTMONTHNAME', 'HUIDIGEMAANDNAAM' ),
-	'currentmonthnamegen' => array( '1', 'CURRENTMONTHNAMEGEN', 'HUIDIGEMAANDGEN' ),
-	'currentmonthabbrev'  => array( '1', 'CURRENTMONTHABBREV', 'HUIDIGEMAANDAFK' ),
-	'currentday'          => array( '1', 'CURRENTDAY', 'HUIDIGEDAG' ),
-	'currentday2'         => array( '1', 'CURRENTDAY2', 'HUIDIGEDAG2' ),
-	'currentdayname'      => array( '1', 'CURRENTDAYNAME', 'HUIDIGEDAGNAAM' ),
-	'currentyear'         => array( '1', 'CURRENTYEAR', 'HUIDIGJAAR' ),
-	'currenttime'         => array( '1', 'CURRENTTIME', 'HUIDIGETIJD' ),
-	'currenthour'         => array( '1', 'CURRENTHOUR', 'HUIDIGUUR' ),
-	'localmonth'          => array( '1', 'LOCALMONTH', 'PLAATSELIJKEMAAND', 'LOKALEMAAND' ),
-	'localmonthname'      => array( '1', 'LOCALMONTHNAME', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM' ),
-	'localmonthnamegen'   => array( '1', 'LOCALMONTHNAMEGEN', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN' ),
-	'localmonthabbrev'    => array( '1', 'LOCALMONTHABBREV', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK' ),
-	'localday'            => array( '1', 'LOCALDAY', 'PLAATSELIJKEDAG', 'LOKALEDAG' ),
-	'localday2'           => array( '1', 'LOCALDAY2', 'PLAATSELIJKEDAG2', 'LOKALEDAG2' ),
-	'localdayname'        => array( '1', 'LOCALDAYNAME', 'PLAATSELIJKEDAGNAAM', 'LOKALEDAGNAAM' ),
-	'localyear'           => array( '1', 'LOCALYEAR', 'PLAATSELIJKJAAR', 'LOKAALJAAR' ),
-	'localtime'           => array( '1', 'LOCALTIME', 'PLAATSELIJKETIJD', 'LOKALETIJD' ),
-	'localhour'           => array( '1', 'LOCALHOUR', 'PLAATSELIJKUUR', 'LOKAALUUR' ),
-	'numberofpages'       => array( '1', 'NUMBEROFPAGES', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S' ),
-	'numberofarticles'    => array( '1', 'NUMBEROFARTICLES', 'AANTALARTIKELEN' ),
-	'numberoffiles'       => array( '1', 'NUMBEROFFILES', 'AANTALBESTANDEN' ),
-	'numberofusers'       => array( '1', 'NUMBEROFUSERS', 'AANTALGEBRUIKERS' ),
-	'numberofedits'       => array( '1', 'NUMBEROFEDITS', 'AANTALBEWERKINGEN' ),
-	'pagename'            => array( '1', 'PAGENAME', 'PAGINANAAM' ),
-	'pagenamee'           => array( '1', 'PAGENAMEE', 'PAGINANAAME' ),
-	'namespace'           => array( '1', 'NAMESPACE', 'NAAMRUIMTE' ),
-	'namespacee'          => array( '1', 'NAMESPACEE', 'NAAMRUIMTEE' ),
-	'talkspace'           => array( '1', 'TALKSPACE', 'OVERLEGRUIMTE' ),
-	'talkspacee'          => array( '1', 'TALKSPACEE', 'OVERLEGRUIMTEE' ),
-	'subjectspace'        => array( '1', 'SUBJECTSPACE', 'ARTICLESPACE', 'ONDERWERPRUIMTE', 'ARTIKELRUIMTE' ),
-	'subjectspacee'       => array( '1', 'SUBJECTSPACEE', 'ARTICLESPACEE', 'ONDERWERPRUIMTEE', 'ARTIKELRUIMTEE' ),
-	'fullpagename'        => array( '1', 'FULLPAGENAME', 'VOLLEDIGEPAGINANAAM' ),
-	'fullpagenamee'       => array( '1', 'FULLPAGENAMEE', 'VOLLEDIGEPAGINANAAME' ),
-	'subpagename'         => array( '1', 'SUBPAGENAME', 'DEELPAGINANAAM' ),
-	'subpagenamee'        => array( '1', 'SUBPAGENAMEE', 'DEELPAGINANAAME' ),
-	'basepagename'        => array( '1', 'BASEPAGENAME', 'BASISPAGINANAAM' ),
-	'basepagenamee'       => array( '1', 'BASEPAGENAMEE', 'BASISPAGINANAAME' ),
-	'talkpagename'        => array( '1', 'TALKPAGENAME', 'OVERLEGPAGINANAAM' ),
-	'talkpagenamee'       => array( '1', 'TALKPAGENAMEE', 'OVERLEGPAGINANAAME' ),
-	'subjectpagename'     => array( '1', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME', 'ONDERWERPPAGINANAAM', 'ARTIKELPAGINANAAM' ),
-	'subjectpagenamee'    => array( '1', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE', 'ONDERWERPPAGINANAAME', 'ARTIKELPAGINANAAME' ),
-	'msg'                 => array( '0', 'MSG:', 'BERICHT:' ),
-	'subst'               => array( '0', 'SUBST:', 'VERV:' ),
-	'msgnw'               => array( '0', 'MSGNW:', 'BERICHTNW' ),
-	'img_right'           => array( '1', 'right', 'rechts' ),
-	'img_left'            => array( '1', 'left', 'links' ),
-	'img_none'            => array( '1', 'none', 'geen' ),
-	'img_center'          => array( '1', 'center', 'centre', 'gecentreerd' ),
-	'img_framed'          => array( '1', 'framed', 'enframed', 'frame', 'omkaderd' ),
-	'img_frameless'       => array( '1', 'frameless', 'kaderloos' ),
-	'img_page'            => array( '1', 'page=$1', 'page $1', 'pagina=$1', 'pagina $1' ),
-	'img_upright'         => array( '1', 'upright', 'upright=$1', 'upright $1', '1', 'rechtop', 'rechtop=$1', 'rechtop$1' ),
-	'img_border'          => array( '1', 'border', 'rand' ),
-	'img_baseline'        => array( '1', 'baseline', 'grondlijn' ),
-	'img_top'             => array( '1', 'top', 'boven' ),
-	'img_text_top'        => array( '1', 'text-top', 'tekst-boven' ),
-	'img_middle'          => array( '1', 'middle', 'midden' ),
-	'img_bottom'          => array( '1', 'bottom', 'beneden' ),
-	'img_text_bottom'     => array( '1', 'text-bottom', 'tekst-beneden' ),
-	'sitename'            => array( '1', 'SITENAME', 'SITENAAM' ),
-	'ns'                  => array( '0', 'NS:', 'NR:' ),
-	'localurl'            => array( '0', 'LOCALURL:', 'LOKALEURL' ),
-	'localurle'           => array( '0', 'LOCALURLE:', 'LOKALEURLE' ),
-	'servername'          => array( '0', 'SERVERNAME', 'SERVERNAAM' ),
-	'scriptpath'          => array( '0', 'SCRIPTPATH', 'SCRIPTPAD' ),
-	'grammar'             => array( '0', 'GRAMMAR:', 'GRAMMATICA:' ),
-	'notitleconvert'      => array( '0', '__NOTITLECONVERT__', '__NOTC__', '__GEENTITELCONVERSIE__', '__GEENTC__' ),
-	'nocontentconvert'    => array( '0', '__NOCONTENTCONVERT__', '__NOCC__', '__GEENINHOUDCONVERSIE__', '__GEENIC__' ),
-	'currentweek'         => array( '1', 'CURRENTWEEK', 'HUIDIGEWEEK' ),
-	'currentdow'          => array( '1', 'CURRENTDOW', 'HUIDIGEDVDW' ),
-	'localweek'           => array( '1', 'LOCALWEEK', 'PLAATSELIJKEWEEK', 'LOKALEWEEK' ),
-	'localdow'            => array( '1', 'LOCALDOW', 'PLAATSELIJKEDVDW', 'LOKALEDVDW' ),
-	'revisionid'          => array( '1', 'REVISIONID', 'VERSIEID' ),
-	'revisionday'         => array( '1', 'REVISIONDAY', 'VERSIEDAG' ),
-	'revisionday2'        => array( '1', 'REVISIONDAY2', 'VERSIEDAG2' ),
-	'revisionmonth'       => array( '1', 'REVISIONMONTH', 'VERSIEMAAND' ),
-	'revisionyear'        => array( '1', 'REVISIONYEAR', 'VERSIEJAAR' ),
-	'revisiontimestamp'   => array( '1', 'REVISIONTIMESTAMP', 'VERSIETIJD' ),
-	'plural'              => array( '0', 'PLURAL:', 'MEERVOUD:' ),
-	'fullurl'             => array( '0', 'FULLURL:', 'VOLLEDIGEURL' ),
-	'fullurle'            => array( '0', 'FULLURLE:', 'VOLLEDIGEURLE' ),
-	'lcfirst'             => array( '0', 'LCFIRST:', 'KLEERSTE:' ),
-	'ucfirst'             => array( '0', 'UCFIRST:', 'GLEERSTE:' ),
-	'lc'                  => array( '0', 'LC:', 'KL:' ),
-	'uc'                  => array( '0', 'UC:', 'HL:' ),
-	'raw'                 => array( '0', 'RAW:', 'RAUW:', 'RUW:' ),
-	'displaytitle'        => array( '1', 'DISPLAYTITLE', 'TOONTITEL', 'TITELTONEN' ),
-	'newsectionlink'      => array( '1', '__NEWSECTIONLINK__', '__NIEUWESECTIELINK__', '__NIEUWESECTIEKOPPELING__' ),
-	'currentversion'      => array( '1', 'CURRENTVERSION', 'HUIDIGEVERSIE' ),
-	'urlencode'           => array( '0', 'URLENCODE:', 'URLCODEREN', 'CODEERURL' ),
-	'anchorencode'        => array( '0', 'ANCHORENCODE', 'ANKERCODEREN', 'CODEERANKER' ),
-	'currenttimestamp'    => array( '1', 'CURRENTTIMESTAMP', 'HUIDIGETIJDSTEMPEL' ),
-	'localtimestamp'      => array( '1', 'LOCALTIMESTAMP', 'PLAATSELIJKETIJDSTEMPEL', 'LOKALETIJDSTEMPEL' ),
-	'directionmark'       => array( '1', 'DIRECTIONMARK', 'DIRMARK', 'RICHTINGMARKERING', 'RICHTINGSMARKERING' ),
-	'language'            => array( '0', '#LANGUAGE:', '#TAAL:' ),
-	'contentlanguage'     => array( '1', 'CONTENTLANGUAGE', 'CONTENTLANG', 'INHOUDSTAAL', 'INHOUDTAAL' ),
-	'pagesinnamespace'    => array( '1', 'PAGESINNAMESPACE:', 'PAGESINNS:', 'PAGINASINNAAMRUIMTE', 'PAGINA’SINNAAMRUIMTE', 'PAGINA\'SINNAAMRUIMTE' ),
-	'numberofadmins'      => array( '1', 'NUMBEROFADMINS', 'AANTALBEHEERDERS', 'AANTALADMINS' ),
-	'formatnum'           => array( '0', 'FORMATNUM', 'FORMATTEERNUM', 'NUMFORMATTEREN' ),
-	'padleft'             => array( '0', 'PADLEFT', 'LINKSOPVULLEN' ),
-	'padright'            => array( '0', 'PADRIGHT', 'RECHTSOPVULLEN' ),
-	'special'             => array( '0', 'special', 'speciaal' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'STANDAARDSORTERING:' ),
-	'filepath'            => array( '0', 'FILEPATH:', 'BESTANDSPAD:' ),
-	'hiddencat'           => array( '1', '__HIDDENCAT__', '__VERBORGENCAT__' ),
-	'pagesincategory'     => array( '1', 'PAGESINCATEGORY', 'PAGESINCAT', 'PAGINASINCATEGORIE', 'PAGINASINCAT' ),
-	'pagesize'            => array( '1', 'PAGESIZE', 'PAGINAGROOTTE' ),
-	'noindex'             => array( '1', '__NOINDEX__', '__GEENINDEX__' ),
+	'redirect'              => array( '0', '#DOORVERWIJZING', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__GEENINHOUD__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__INHOUD_DWINGEN__', '__FORCEERINHOUD__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__INHOUD__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__NIETBEWERKBARESECTIE__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__GEENKOP__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', 'HUIDIGEMAAND', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'HUIDIGEMAANDNAAM', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', 'HUIDIGEMAANDGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'HUIDIGEDAG', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'HUIDIGJAAR', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'HUIDIGETIJD', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'HUIDIGUUR', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'PLAATSELIJKEDAG', 'LOKALEDAG', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'PLAATSELIJKEDAG2', 'LOKALEDAG2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'PLAATSELIJKEDAGNAAM', 'LOKALEDAGNAAM', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', 'PAGINANAAM', 'PAGENAME' ),
+	'pagenamee'             => array( '1', 'PAGINANAAME', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'NAAMRUIMTE', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'NAAMRUIMTEE', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'OVERLEGRUIMTE', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'ONDERWERPRUIMTE', 'ARTIKELRUIMTE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'ONDERWERPRUIMTEE', 'ARTIKELRUIMTEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'VOLLEDIGEPAGINANAAM', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'VOLLEDIGEPAGINANAAME', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', 'DEELPAGINANAAM', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', 'DEELPAGINANAAME', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'BASISPAGINANAAM', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'BASISPAGINANAAME', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', 'OVERLEGPAGINANAAM', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', 'OVERLEGPAGINANAAME', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', 'ONDERWERPPAGINANAAM', 'ARTIKELPAGINANAAM', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', 'ONDERWERPPAGINANAAME', 'ARTIKELPAGINANAAME', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'BERICHT:', 'MSG:' ),
+	'subst'                 => array( '0', 'VERV:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'BERICHTNW', 'MSGNW:' ),
+	'img_right'             => array( '1', 'rechts', 'right' ),
+	'img_left'              => array( '1', 'links', 'left' ),
+	'img_none'              => array( '1', 'geen', 'none' ),
+	'img_center'            => array( '1', 'gecentreerd', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'omkaderd', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'kaderloos', 'frameless' ),
+	'img_page'              => array( '1', 'pagina=$1', 'pagina $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'rechtop', 'rechtop=$1', 'rechtop$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'rand', 'border' ),
+	'img_baseline'          => array( '1', 'grondlijn', 'baseline' ),
+	'img_top'               => array( '1', 'boven', 'top' ),
+	'img_text_top'          => array( '1', 'tekst-boven', 'text-top' ),
+	'img_middle'            => array( '1', 'midden', 'middle' ),
+	'img_bottom'            => array( '1', 'beneden', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'tekst-beneden', 'text-bottom' ),
+	'sitename'              => array( '1', 'SITENAAM', 'SITENAME' ),
+	'ns'                    => array( '0', 'NR:', 'NS:' ),
+	'localurl'              => array( '0', 'LOKALEURL', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'LOKALEURLE', 'LOCALURLE:' ),
+	'servername'            => array( '0', 'SERVERNAAM', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'SCRIPTPAD', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'GRAMMATICA:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__GEENTITELCONVERSIE__', '__GEENTC__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__GEENINHOUDCONVERSIE__', '__GEENIC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'HUIDIGEWEEK', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'HUIDIGEDVDW', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'PLAATSELIJKEWEEK', 'LOKALEWEEK', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'PLAATSELIJKEDVDW', 'LOKALEDVDW', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'VERSIEID', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'VERSIEDAG', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'VERSIEDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'VERSIEMAAND', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'VERSIEJAAR', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'VERSIETIJD', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'MEERVOUD:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'VOLLEDIGEURL', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'VOLLEDIGEURLE', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'KLEERSTE:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'GLEERSTE:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'KL:', 'LC:' ),
+	'uc'                    => array( '0', 'HL:', 'UC:' ),
+	'raw'                   => array( '0', 'RAUW:', 'RUW:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'TOONTITEL', 'TITELTONEN', 'DISPLAYTITLE' ),
+	'newsectionlink'        => array( '1', '__NIEUWESECTIELINK__', '__NIEUWESECTIEKOPPELING__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'HUIDIGEVERSIE', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'URLCODEREN', 'CODEERURL', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'ANKERCODEREN', 'CODEERANKER', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'HUIDIGETIJDSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'PLAATSELIJKETIJDSTEMPEL', 'LOKALETIJDSTEMPEL', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', 'RICHTINGMARKERING', 'RICHTINGSMARKERING', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#TAAL:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'INHOUDSTAAL', 'INHOUDTAAL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'PAGINASINNAAMRUIMTE', 'PAGINA’SINNAAMRUIMTE', 'PAGINA\'SINNAAMRUIMTE', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'AANTALBEHEERDERS', 'AANTALADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'FORMATTEERNUM', 'NUMFORMATTEREN', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'LINKSOPVULLEN', 'PADLEFT' ),
+	'padright'              => array( '0', 'RECHTSOPVULLEN', 'PADRIGHT' ),
+	'special'               => array( '0', 'speciaal', 'special' ),
+	'defaultsort'           => array( '1', 'STANDAARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'BESTANDSPAD:', 'FILEPATH:' ),
+	'hiddencat'             => array( '1', '__VERBORGENCAT__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'PAGINASINCATEGORIE', 'PAGINASINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'PAGINAGROOTTE', 'PAGESIZE' ),
+	'noindex'               => array( '1', '__GEENINDEX__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'AANTALINGROEP', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__STATISCHEDOORVERWIJZING__', '__STATISCHEREDIRECT__', '__STATICREDIRECT__' ),
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'DubbeleDoorverwijzingen' ),
-	'BrokenRedirects'         => array( 'GebrokenDoorverwijzingen' ),
-	'Disambiguations'         => array( 'Doorverwijspagina\'s', 'Doorverwijspaginas' ),
-	'Userlogin'               => array( 'Aanmelden', 'Inloggen' ),
-	'Userlogout'              => array( 'Afmelden', 'Uitloggen' ),
-	'CreateAccount'           => array( 'GebruikerAanmaken' ),
-	'Preferences'             => array( 'Voorkeuren' ),
-	'Watchlist'               => array( 'Volglijst' ),
-	'Recentchanges'           => array( 'RecenteWijzigingen' ),
-	'Upload'                  => array( 'Uploaden', 'Upload' ),
-	'Imagelist'               => array( 'Afbeeldingenlijst', 'Bestandenlijst' ),
-	'Newimages'               => array( 'NieuweAfbeeldingen' ),
-	'Listusers'               => array( 'Gebruikerslijst', 'Gebruikerlijst' ),
-	'Listgrouprights'         => array( 'Groepsrechten' ),
-	'Statistics'              => array( 'Statistieken' ),
-	'Randompage'              => array( 'Willekeurig', 'WillekeurigePagina' ),
-	'Lonelypages'             => array( 'Weespaginas', 'Weespagina\'s' ),
-	'Uncategorizedpages'      => array( 'NietGecategoriseerdePaginas', 'Niet-GecategoriseerdePagina’s', 'Niet-GecategoriseerdePagina\'s' ),
-	'Uncategorizedcategories' => array( 'NietGecategoriseerdeCategorieën', 'Niet-GecategoriseerdeCategorieën' ),
-	'Uncategorizedimages'     => array( 'NietGecategoriseerdeAfbeeldingen', 'Niet-GecategoriseerdeAfbeeldingen' ),
-	'Uncategorizedtemplates'  => array( 'NietGecategoriseerdeSjablonen' ),
-	'Unusedcategories'        => array( 'OngebruikteCategorieën' ),
-	'Unusedimages'            => array( 'OngebruikteAfbeeldingen' ),
-	'Wantedpages'             => array( 'GevraagdePaginas', 'GevraagdePagina\'s', 'GevraagdePagina’s' ),
-	'Wantedcategories'        => array( 'GevraagdeCategorieën' ),
-	'Missingfiles'            => array( 'MissendeBestanden' ),
-	'Mostlinked'              => array( 'MeestVerwezen' ),
-	'Mostlinkedcategories'    => array( 'MeestVerwezenCategorieën' ),
-	'Mostlinkedtemplates'     => array( 'MeestVerwezenSjablonen' ),
-	'Mostcategories'          => array( 'MeesteCategorieën' ),
-	'Mostimages'              => array( 'MeesteAfbeeldingen' ),
-	'Mostrevisions'           => array( 'MeesteVersies', 'MeesteHerzieningen', 'MeesteRevisies' ),
-	'Fewestrevisions'         => array( 'MinsteVersies', 'MinsteHerzieningen', 'MinsteRevisies' ),
-	'Shortpages'              => array( 'KortePaginas', 'KortePagina’s', 'KortePagina\'s' ),
-	'Longpages'               => array( 'LangePaginas', 'LangePagina’s', 'LangePagina\'s' ),
-	'Newpages'                => array( 'NieuwePaginas', 'NieuwePagina’s', 'NieuwePagina\'s' ),
-	'Ancientpages'            => array( 'OudstePaginas', 'OudstePagina’s', 'OudstePagina\'s' ),
-	'Deadendpages'            => array( 'VerwijslozePaginas', 'VerwijslozePagina’s', 'VerwijslozePagina\'s' ),
-	'Protectedpages'          => array( 'BeveiligdePaginas', 'BeveiligdePagina\'s', 'BeschermdePaginas', 'BeschermdePagina’s', 'BeschermdePagina\'s' ),
-	'Protectedtitles'         => array( 'BeveiligdeTitels', 'BeschermdeTitels' ),
-	'Allpages'                => array( 'AllePaginas', 'AllePagina’s', 'AllePagina\'s' ),
-	'Prefixindex'             => array( 'Voorvoegselindex', 'Prefixindex' ),
-	'Ipblocklist'             => array( 'IP-blokkeerlijst', 'IPblokkeerlijst', 'IpBlokkeerlijst' ),
-	'Specialpages'            => array( 'SpecialePaginas', 'SpecialePagina’s', 'SpecialePagina\'s' ),
-	'Contributions'           => array( 'Bijdragen' ),
-	'Emailuser'               => array( 'GebruikerE-mailen', 'E-mailGebruiker' ),
-	'Confirmemail'            => array( 'Emailbevestigen', 'E-mailbevestigen' ),
-	'Whatlinkshere'           => array( 'VerwijzingenNaarHier', 'Verwijzingen', 'LinksNaarHier' ),
-	'Recentchangeslinked'     => array( 'RecenteWijzigingenGelinkt', 'VerwanteWijzigingen' ),
-	'Movepage'                => array( 'PaginaHernoemen', 'PaginaVerplaatsen', 'TitelWijzigen', 'VerplaatsPagina' ),
-	'Blockme'                 => array( 'BlokkeerMij', 'MijBlokkeren' ),
-	'Booksources'             => array( 'Boekbronnen', 'Boekinformatie' ),
-	'Categories'              => array( 'Categorieën' ),
-	'Export'                  => array( 'Exporteren' ),
-	'Version'                 => array( 'Softwareversie', 'Versie' ),
-	'Allmessages'             => array( 'AlleBerichten', 'Systeemberichten' ),
-	'Log'                     => array( 'Logboeken', 'Logboek', 'Log', 'Logs' ),
-	'Blockip'                 => array( 'IPblokkeren', 'BlokkeerIP', 'BlokkeerIp' ),
-	'Undelete'                => array( 'Terugplaatsen', 'Herstellen', 'VerwijderenOngedaanMaken' ),
-	'Import'                  => array( 'Importeren' ),
-	'Lockdb'                  => array( 'DBblokkeren', 'DbBlokkeren', 'BlokkeerDB' ),
-	'Unlockdb'                => array( 'DBvrijgeven', 'DbVrijgeven', 'GeefDbVrij' ),
-	'Userrights'              => array( 'Gebruikersrechten', 'Gebruikerrechten' ),
-	'MIMEsearch'              => array( 'MIMEzoeken', 'MIME-zoeken' ),
-	'FileDuplicateSearch'     => array( 'BestandsduplicatenZoeken' ),
-	'Unwatchedpages'          => array( 'NietGevolgdePaginas', 'Niet-GevolgdePagina’s', 'Niet-GevolgdePagina\'s' ),
-	'Listredirects'           => array( 'Doorverwijzinglijst', 'Redirectlijst' ),
-	'Revisiondelete'          => array( 'VersieVerwijderen', 'HerzieningVerwijderen', 'RevisieVerwijderen' ),
-	'Unusedtemplates'         => array( 'OngebruikteSjablonen' ),
-	'Randomredirect'          => array( 'WillekeurigeDoorverwijzing' ),
-	'Mypage'                  => array( 'MijnPagina' ),
-	'Mytalk'                  => array( 'MijnOverleg' ),
-	'Mycontributions'         => array( 'MijnBijdragen' ),
-	'Listadmins'              => array( 'Beheerderlijst', 'Administratorlijst', 'Adminlijst', 'Beheerderslijst' ),
-	'Listbots'                => array( 'Botlijst', 'Lijstbots' ),
-	'Popularpages'            => array( 'PopulairePaginas', 'PopulairePagina’s', 'PopulairePagina\'s' ),
-	'Search'                  => array( 'Zoeken' ),
-	'Resetpass'               => array( 'WachtwoordHerinitialiseren' ),
-	'Withoutinterwiki'        => array( 'ZonderInterwiki' ),
-	'MergeHistory'            => array( 'GeschiedenisSamenvoegen' ),
-	'Filepath'                => array( 'Bestandspad' ),
-	'Invalidateemail'         => array( 'EmailAnnuleren' ),
-	'Blankpage'               => array( 'LegePagina' ),
+	'DoubleRedirects'           => array( 'DubbeleDoorverwijzingen' ),
+	'BrokenRedirects'           => array( 'GebrokenDoorverwijzingen' ),
+	'Disambiguations'           => array( 'Doorverwijspagina\'s', 'Doorverwijspaginas' ),
+	'Userlogin'                 => array( 'Aanmelden', 'Inloggen' ),
+	'Userlogout'                => array( 'Afmelden', 'Uitloggen' ),
+	'CreateAccount'             => array( 'GebruikerAanmaken' ),
+	'Preferences'               => array( 'Voorkeuren' ),
+	'Watchlist'                 => array( 'Volglijst' ),
+	'Recentchanges'             => array( 'RecenteWijzigingen' ),
+	'Upload'                    => array( 'Uploaden' ),
+	'Listfiles'                 => array( 'Bestandenlijst', 'Afbeeldingenlijst' ),
+	'Newimages'                 => array( 'NieuweBestanden', 'NieuweAfbeeldingen' ),
+	'Listusers'                 => array( 'Gebruikerslijst', 'Gebruikerlijst' ),
+	'Listgrouprights'           => array( 'GroepsrechtenWeergeven' ),
+	'Statistics'                => array( 'Statistieken' ),
+	'Randompage'                => array( 'Willekeurig', 'WillekeurigePagina' ),
+	'Lonelypages'               => array( 'Weespaginas', 'Weespagina\'s' ),
+	'Uncategorizedpages'        => array( 'NietGecategoriseerdePaginas', 'Niet-GecategoriseerdePagina’s', 'Niet-GecategoriseerdePagina\'s' ),
+	'Uncategorizedcategories'   => array( 'NietGecategoriseerdeCategorieën', 'Niet-GecategoriseerdeCategorieën' ),
+	'Uncategorizedimages'       => array( 'NietGecategoriseerdeBestanden', 'NietGecategoriseerdeAfbeeldingen', 'Niet-GecategoriseerdeAfbeeldingen' ),
+	'Uncategorizedtemplates'    => array( 'NietGecategoriseerdeSjablonen' ),
+	'Unusedcategories'          => array( 'OngebruikteCategorieën' ),
+	'Unusedimages'              => array( 'OngebruikteBestanden', 'OngebruikteAfbeeldingen' ),
+	'Wantedpages'               => array( 'GevraagdePaginas', 'GevraagdePagina\'s', 'GevraagdePagina’s' ),
+	'Wantedcategories'          => array( 'GevraagdeCategorieën' ),
+	'Wantedfiles'               => array( 'GevraagdeBestanden' ),
+	'Wantedtemplates'           => array( 'GevraagdeSjablonen' ),
+	'Mostlinked'                => array( 'MeestVerwezenPaginas', 'MeestVerwezenPagina\'s', 'MeestVerwezen' ),
+	'Mostlinkedcategories'      => array( 'MeestVerwezenCategorieën' ),
+	'Mostlinkedtemplates'       => array( 'MeestVerwezenSjablonen' ),
+	'Mostimages'                => array( 'MeesteVerwezenBestanden', 'MeesteBestanden', 'MeesteAfbeeldingen' ),
+	'Mostcategories'            => array( 'MeesteCategorieën' ),
+	'Mostrevisions'             => array( 'MeesteVersies', 'MeesteHerzieningen', 'MeesteRevisies' ),
+	'Fewestrevisions'           => array( 'MinsteVersies', 'MinsteHerzieningen', 'MinsteRevisies' ),
+	'Shortpages'                => array( 'KortePaginas', 'KortePagina’s', 'KortePagina\'s' ),
+	'Longpages'                 => array( 'LangePaginas', 'LangePagina’s', 'LangePagina\'s' ),
+	'Newpages'                  => array( 'NieuwePaginas', 'NieuwePagina’s', 'NieuwePagina\'s' ),
+	'Ancientpages'              => array( 'OudstePaginas', 'OudstePagina’s', 'OudstePagina\'s' ),
+	'Deadendpages'              => array( 'VerwijslozePaginas', 'VerwijslozePagina’s', 'VerwijslozePagina\'s' ),
+	'Protectedpages'            => array( 'BeveiligdePaginas', 'BeveiligdePagina\'s', 'BeschermdePaginas', 'BeschermdePagina’s', 'BeschermdePagina\'s' ),
+	'Protectedtitles'           => array( 'BeveiligdeTitels', 'BeschermdeTitels' ),
+	'Allpages'                  => array( 'AllePaginas', 'AllePagina’s', 'AllePagina\'s' ),
+	'Prefixindex'               => array( 'Voorvoegselindex', 'Prefixindex' ),
+	'Ipblocklist'               => array( 'IP-blokkeerlijst', 'IPblokkeerlijst', 'IpBlokkeerlijst' ),
+	'Specialpages'              => array( 'SpecialePaginas', 'SpecialePagina’s', 'SpecialePagina\'s' ),
+	'Contributions'             => array( 'Bijdragen' ),
+	'Emailuser'                 => array( 'GebruikerE-mailen', 'E-mailGebruiker' ),
+	'Confirmemail'              => array( 'Emailbevestigen', 'E-mailbevestigen' ),
+	'Whatlinkshere'             => array( 'VerwijzingenNaarHier', 'Verwijzingen', 'LinksNaarHier' ),
+	'Recentchangeslinked'       => array( 'RecenteWijzigingenGelinkt', 'VerwanteWijzigingen' ),
+	'Movepage'                  => array( 'PaginaHernoemen', 'PaginaVerplaatsen', 'TitelWijzigen', 'VerplaatsPagina' ),
+	'Blockme'                   => array( 'BlokkeerMij', 'MijBlokkeren' ),
+	'Booksources'               => array( 'Boekbronnen', 'Boekinformatie' ),
+	'Categories'                => array( 'Categorieën' ),
+	'Export'                    => array( 'Exporteren' ),
+	'Version'                   => array( 'Softwareversie', 'Versie' ),
+	'Allmessages'               => array( 'AlleBerichten', 'Systeemberichten' ),
+	'Log'                       => array( 'Logboeken', 'Logboek' ),
+	'Blockip'                   => array( 'Blokkeren', 'IPblokkeren', 'BlokkeerIP', 'BlokkeerIp' ),
+	'Undelete'                  => array( 'Terugplaatsen', 'Herstellen', 'VerwijderenOngedaanMaken' ),
+	'Import'                    => array( 'Importeren' ),
+	'Lockdb'                    => array( 'DBblokkeren', 'DbBlokkeren', 'BlokkeerDB' ),
+	'Unlockdb'                  => array( 'DBvrijgeven', 'DbVrijgeven', 'GeefDbVrij' ),
+	'Userrights'                => array( 'Gebruikersrechten', 'Gebruikerrechten' ),
+	'MIMEsearch'                => array( 'MIMEzoeken', 'MIME-zoeken' ),
+	'FileDuplicateSearch'       => array( 'BestandsduplicatenZoeken' ),
+	'Unwatchedpages'            => array( 'NietGevolgdePaginas', 'Niet-GevolgdePagina’s', 'Niet-GevolgdePagina\'s' ),
+	'Listredirects'             => array( 'Doorverwijzinglijst', 'Redirectlijst' ),
+	'Revisiondelete'            => array( 'VersieVerwijderen', 'HerzieningVerwijderen', 'RevisieVerwijderen' ),
+	'Unusedtemplates'           => array( 'OngebruikteSjablonen' ),
+	'Randomredirect'            => array( 'WillekeurigeDoorverwijzing' ),
+	'Mypage'                    => array( 'MijnPagina' ),
+	'Mytalk'                    => array( 'MijnOverleg' ),
+	'Mycontributions'           => array( 'MijnBijdragen' ),
+	'Listadmins'                => array( 'Beheerderlijst', 'Administratorlijst', 'Adminlijst', 'Beheerderslijst' ),
+	'Listbots'                  => array( 'Botlijst', 'Lijstbots' ),
+	'Popularpages'              => array( 'PopulairePaginas', 'PopulairePagina’s', 'PopulairePagina\'s' ),
+	'Search'                    => array( 'Zoeken' ),
+	'Resetpass'                 => array( 'WachtwoordWijzigen', 'WachtwoordHerinitialiseren' ),
+	'Withoutinterwiki'          => array( 'ZonderInterwiki' ),
+	'MergeHistory'              => array( 'GeschiedenisSamenvoegen' ),
+	'Filepath'                  => array( 'Bestandspad' ),
+	'Invalidateemail'           => array( 'EmailAnnuleren' ),
+	'Blankpage'                 => array( 'LegePagina' ),
+	'LinkSearch'                => array( 'VerwijzingenZoeken', 'LinksZoeken' ),
+	'DeletedContributions'      => array( 'VerwijderdeBijdragen' ),
 );
 
 $linkTrail = '/^([a-zäöüïëéèà]+)(.*)$/sDu';
@@ -316,17 +318,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Eigen bewerkingen op mijn volglijst verbergen',
 'tog-watchlisthidebots'       => 'Botbewerkingen op mijn volglijst verbergen',
 'tog-watchlisthideminor'      => 'Kleine bewerkingen op mijn volglijst verbergen',
+'tog-watchlisthideliu'        => 'Bewerkingen van aangemelde gebruikers op mijn volglijst verbergen',
+'tog-watchlisthideanons'      => 'Bewerkingen van anonieme gebruikers op mijn volglijst verbergen',
 'tog-nolangconversion'        => 'Variantomzetting uitschakelen',
 'tog-ccmeonemails'            => 'Mij een kopie zenden van e-mails die ik naar andere gebruikers stuur',
 'tog-diffonly'                => 'Pagina-inhoud onder wijzigingen niet weergeven',
 'tog-showhiddencats'          => 'Verborgen categorieën weergeven',
+'tog-noconvertlink'           => 'Paginanaamconversie uitschakelen',
+'tog-norollbackdiff'          => 'Wijzigingen weglaten na terugdraaien',
 
 'underline-always'  => 'Altijd',
 'underline-never'   => 'Nooit',
 'underline-default' => 'Webbrowser-standaard',
 
-'skinpreview' => '(Voorvertoning)',
-
 # Dates
 'sunday'        => 'zondag',
 'monday'        => 'maandag',
@@ -387,8 +391,8 @@ $messages = array(
 'category-empty'                 => "''Deze categorie bevat geen pagina’s of media.''",
 'hidden-categories'              => 'Verborgen {{PLURAL:$1|categorie|categorieën}}',
 'hidden-category-category'       => 'Verborgen categorieën', # Name of the category where hidden categories will be listed
-'category-subcat-count'          => '{{PLURAL:$2|Deze categorie heeft de volgende ondercategorie.|Deze categorie heeft de volgende {{PLURAL:$1|ondercategorie|$1 ondercategorieën}}, van een totaal van $2.}}',
-'category-subcat-count-limited'  => 'Deze categorie heeft de volgende {{PLURAL:$1|ondercategorie|$1 ondercategorieën}}.',
+'category-subcat-count'          => '{{PLURAL:$2|Deze categorie bevat de volgende ondercategorie.|Deze categorie bevat de volgende {{PLURAL:$1|ondercategorie|$1 ondercategorieën}}, van een totaal van $2.}}',
+'category-subcat-count-limited'  => 'Deze categorie bevat de volgende {{PLURAL:$1|ondercategorie|$1 ondercategorieën}}.',
 'category-article-count'         => '{{PLURAL:$2|Deze categorie bevat de volgende pagina.|Deze categorie bevat de volgende {{PLURAL:$1|pagina|$1 pagina’s}}, van in totaal $2.}}',
 'category-article-count-limited' => "Deze categorie bevat de volgende {{PLURAL:$1|pagina|$1 pagina's}}.",
 'category-file-count'            => '{{PLURAL:$2|Deze categorie bevat het volgende bestand.|Deze categorie bevat {{PLURAL:$1|het volgende bestand|de volgende $1 bestanden}}, van in totaal $2.}}',
@@ -420,7 +424,7 @@ $messages = array(
 'mytalk'         => 'Mijn overleg',
 'anontalk'       => 'Overlegpagina voor dit IP-adres',
 'navigation'     => 'Navigatie',
-'and'            => 'en',
+'and'            => '&#32;en',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -457,14 +461,14 @@ $messages = array(
 'talkpagelinktext'  => 'Overleg',
 'specialpage'       => 'Speciale pagina',
 'personaltools'     => 'Persoonlijke instellingen',
-'postcomment'       => 'Opmerking toevoegen',
+'postcomment'       => 'Nieuw kopje',
 'articlepage'       => 'Pagina bekijken',
 'talk'              => 'Overleg',
 'views'             => 'Aspecten/acties',
 'toolbox'           => 'Hulpmiddelen',
 'userpage'          => 'Gebruikerspagina bekijken',
 'projectpage'       => 'Projectpagina bekijken',
-'imagepage'         => 'Mediabestandspagina bekijken',
+'imagepage'         => 'Bestandspagina bekijken',
 'mediawikipage'     => 'Berichtpagina bekijken',
 'templatepage'      => 'Sjabloonpagina bekijken',
 'viewhelppage'      => 'Hulppagina bekijken',
@@ -483,8 +487,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Over {{SITENAME}}',
 'aboutpage'            => 'Project:Info',
-'bugreports'           => 'Foutrapporten',
-'bugreportspage'       => 'Project:Foutrapporten',
 'copyright'            => 'De inhoud is beschikbaar onder de $1.',
 'copyrightpagename'    => 'Auteursrechten {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Auteursrechten',
@@ -507,9 +509,7 @@ $messages = array(
 
 'badaccess'        => 'Geen toestemming',
 'badaccess-group0' => 'U hebt geen rechten om de gevraagde handeling uit te voeren.',
-'badaccess-group1' => 'De gevraagde handeling is voorbehouden aan gebruikers in de groep $1.',
-'badaccess-group2' => 'De gevraagde handeling is voorbehouden aan gebruikers in een van de groepen $1.',
-'badaccess-groups' => 'De gevraagde handeling is voorbehouden aan gebruikers in een van de groepen $1.',
+'badaccess-groups' => 'De gevraagde handeling is voorbehouden aan gebruikers in {{PLURAL:$2|de groep $1|een van de volgende groepen: $1}}.',
 
 'versionrequired'     => 'Versie $1 van MediaWiki is vereist',
 'versionrequiredtext' => 'Versie $1 van MediaWiki is vereist om deze pagina te gebruiken.
@@ -524,6 +524,8 @@ Meer informatie is beschikbaar op de pagina [[Special:Version|softwareversie]].'
 'editsection'             => 'bewerken',
 'editold'                 => 'bewerken',
 'viewsourceold'           => 'brontekst bekijken',
+'editlink'                => 'bewerken',
+'viewsourcelink'          => 'brontekst bekijken',
 'editsectionhint'         => 'Deelpagina bewerken: $1',
 'toc'                     => 'Inhoud',
 'showtoc'                 => 'bekijken',
@@ -538,13 +540,13 @@ Meer informatie is beschikbaar op de pagina [[Special:Version|softwareversie]].'
 'site-atom-feed'          => '$1 Atom-feed',
 'page-rss-feed'           => '“$1� RSS-feed',
 'page-atom-feed'          => '“$1� Atom-feed',
-'red-link-title'          => '$1 (bestaat nog niet)',
+'red-link-title'          => '$1 (de pagina bestaat niet)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pagina',
 'nstab-user'      => 'Gebruikerspagina',
 'nstab-media'     => 'Mediapagina',
-'nstab-special'   => 'Speciaal',
+'nstab-special'   => 'Speciale pagina',
 'nstab-project'   => 'Projectpagina',
 'nstab-image'     => 'Bestand',
 'nstab-mediawiki' => 'Bericht',
@@ -554,7 +556,9 @@ Meer informatie is beschikbaar op de pagina [[Special:Version|softwareversie]].'
 
 # Main script and global functions
 'nosuchaction'      => 'Opgegeven handeling bestaat niet',
-'nosuchactiontext'  => 'De opdracht in de URL werd niet herkend door de wiki',
+'nosuchactiontext'  => 'De opdracht in de URL is ongeldig.
+Mogelijk heeft u een typefout gemaakt in de URL, of een onjuiste verwijzing gevolgd.
+Het kan ook wijzen op een fout in de software van {{SITENAME}}.',
 'nosuchspecialpage' => 'Deze speciale pagina bestaat niet',
 'nospecialpagetext' => "<big>'''U hebt een onbestaande speciale pagina opgevraagd.'''</big>
 
@@ -610,7 +614,6 @@ Mogelijk is deze al door iemand anders verwijderd.',
 'badtitle'             => 'Ongeldige paginanaam',
 'badtitletext'         => 'De naam van de opgevraagde pagina was ongeldig, leeg of bevatte een verkeerde intertaal- of interwikinaamverwijzing.
 Wellicht bevat de paginanaam niet toegestane karakters.',
-'perfdisabled'         => 'Deze functionaliteit is tijdelijk uitgeschakeld, omdat deze de database zo langzaam maakt dat niemand de wiki kan gebruiken.',
 'perfcached'           => 'De gegevens komen uit een cache en zijn mogelijk niet actueel.',
 'perfcachedts'         => 'De gegevens komen uit een cache en zijn voor het laatst bijgewerkt op $1.',
 'querypage-no-updates' => 'Deze pagina kan niet bijgewerkt worden.
@@ -630,7 +633,7 @@ Bewerken is niet mogelijk.',
 'protectedinterface'   => 'Deze pagina bevat tekst voor berichten van de software en is beveiligd om misbruik te voorkomen.',
 'editinginterface'     => "'''Waarschuwing:''' U bewerkt een pagina die gebruikt wordt door de software.
 Bewerkingen op deze pagina beïnvloeden de gebruikersinterface van iedereen.
-Overweeg voor vertalingen om [http://translatewiki.net/wiki/Main_Page?setlang=nl Betawiki] te gebruiken, het vertalingsproject voor MediaWiki.",
+Overweeg voor vertalingen om [http://translatewiki.net/wiki/Main_Page?setlang=nl translatewiki.net] te gebruiken, het vertalingsproject voor MediaWiki.",
 'sqlhidden'            => '(SQL-zoekopdracht verborgen)',
 'cascadeprotected'     => "Deze pagina kan niet bewerkt worden, omdat die is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:
 $2",
@@ -641,13 +644,13 @@ $2",
 De gegeven reden is ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Slechte configuratie: onbekende virusscanner: <i>$1</i>',
+'virus-badscanner'     => "Slechte configuratie: onbekende virusscanner: ''$1''",
 'virus-scanfailed'     => 'scannen is mislukt (code $1)',
 'virus-unknownscanner' => 'onbekend antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'Gebruiker afmelden',
-'logouttext'                 => "<strong>U bent nu afgemeld.</strong><br />
+'logouttext'                 => "'''U bent nu afgemeld.'''<br />
 U kunt {{SITENAME}} nu anoniem gebruiken of weer [[Special:UserLogin|aanmelden]] als dezelfde of een andere gebruiker.
 Mogelijk worden nog een aantal pagina's weergegeven alsof u aangemeld bent totdat u de cache van uw browser leegt.",
 'welcomecreation'            => '== Welkom, $1! ==
@@ -660,8 +663,6 @@ Vergeet niet uw [[Special:Preferences|voorkeuren voor {{SITENAME}}]] aan te pass
 'remembermypassword'         => 'Aanmeldgegevens onthouden',
 'yourdomainname'             => 'Uw domein:',
 'externaldberror'            => 'Er is een fout opgetreden bij het aanmelden bij de database of u hebt geen toestemming uw externe gebruiker bij te werken.',
-'loginproblem'               => '<b>Er was een probleem bij het aanmelden.</b><br />
-Probeer het opnieuw.',
 'login'                      => 'Aanmelden',
 'nav-login-createaccount'    => 'Aanmelden / registreren',
 'loginprompt'                => 'U moet cookies ingeschakeld hebben om u te kunnen aanmelden bij {{SITENAME}}.',
@@ -687,12 +688,12 @@ Kies een andere naam.',
 'yourvariant'                => 'Taalvariant:',
 'yournick'                   => 'Tekst voor ondertekening:',
 'badsig'                     => 'Ongeldige ondertekening; controleer de HTML-tags.',
-'badsiglength'               => 'De ondertekening is te lang.
+'badsiglength'               => 'Uw ondertekening is te lang.
 Deze moet minder dan $1 {{PLURAL:$1|karakters|karakters}} bevatten.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Echte naam is optioneel, als u deze opgeeft kan deze naam gebruikt worden om u erkenning te geven voor uw werk.',
 'loginerror'                 => 'Aanmeldfout',
-'prefs-help-email'           => 'E-mailadres is optioneel, maar maakt het mogelijk om u uw wachtwoord te e-mail als u het bent vergeten.
+'prefs-help-email'           => 'E-mailadres is optioneel, maar maakt het mogelijk om u uw wachtwoord te e-mailen als u het bent vergeten.
 U kunt ook anderen in staat stellen per e-mail contact met u op te nemen via een verwijzing op uw gebruikers- en overlegpagina zonder dat u uw identiteit prijsgeeft.',
 'prefs-help-email-required'  => 'Hiervoor is een e-mailadres nodig.',
 'nocookiesnew'               => 'De gebruiker is geregistreerd, maar niet aangemeld.
@@ -705,6 +706,7 @@ Schakel deze optie aan en probeer het opnieuw.',
 'loginsuccesstitle'          => 'Aanmelden geslaagd',
 'loginsuccess'               => "'''U bent nu aangemeld bij {{SITENAME}} als \"\$1\".'''",
 'nosuchuser'                 => 'De gebruiker "$1" bestaat niet.
+Gebruikersnamen zijn hoofdlettergevoelig.
 Controleer de schrijfwijze of [[Special:UserLogin/signup|maak een nieuwe gebruiker aan]].',
 'nosuchusershort'            => 'De gebruiker "<nowiki>$1</nowiki>" bestaat niet.
 Controleer de schrijfwijze.',
@@ -714,7 +716,7 @@ Probeer het opnieuw.',
 'wrongpasswordempty'         => 'Het opgegeven wachtwoord was leeg.
 Probeer het opnieuw.',
 'passwordtooshort'           => 'Uw wachtwoord is te kort.
-Het moet minstens uit {{PLURAL:$1|1 teken|$1 tekens}} bestaan.',
+Het dient minstens uit {{PLURAL:$1|1 teken|$1 tekens}} bestaan.',
 'mailmypassword'             => 'Nieuw wachtwoord e-mailen',
 'passwordremindertitle'      => 'Nieuw tijdelijk wachtwoord voor {{SITENAME}}',
 'passwordremindertext'       => 'Iemand, waarschijnlijk u, heeft vanaf IP-adres $1 een verzoek
@@ -737,12 +739,12 @@ Tot die tijd kunnen er geen e-mails naar het e-mailadres gezonden worden.',
 'throttled-mailpassword'     => 'In {{PLURAL:$1|het laatste uur|de laatste $1 uur}} is er al een wachtwoordherinnering verzonden.
 Om misbruik te voorkomen wordt er slechts één wachtwoordherinnering per {{PLURAL:$1|uur|$1 uur}} verzonden.',
 'mailerror'                  => 'Fout bij het verzenden van e-mail: $1',
-'acct_creation_throttle_hit' => 'Er zijn al $1 gebruikers geregistreerd vanaf dit IP-adres.
-U kunt geen nieuwe gebruikers meer registreren.',
-'emailauthenticated'         => 'Uw e-mailadres is bevestigd op $1.',
+'acct_creation_throttle_hit' => 'Bezoekers van deze wiki met hetzelfde IP-adres als u hebben de afgelopen dag {{PLURAL:$1|al 1 gebruiker|al $1 gebruikers}} geregistreerd, wat het maximale aantal in deze periode is.
+Daarom kunt u als bezoeker van dit IP-adres op dit moment geen nieuwe gebruiker registreren.',
+'emailauthenticated'         => 'Uw e-mailadres is bevestigd op $2 om $3.',
 'emailnotauthenticated'      => 'Uw e-mailadres is <strong>niet bevestigd</strong>.
 U ontvangt geen e-mail voor de onderstaande functies.',
-'noemailprefs'               => 'Geef een e-mailadres op om deze functies te gebruiken.',
+'noemailprefs'               => 'Geef een e-mailadres op in uw voorkeuren om deze functies te gebruiken.',
 'emailconfirmlink'           => 'Bevestig uw e-mailadres',
 'invalidemailaddress'        => 'Het e-mailadres is niet aanvaard omdat het een ongeldige opmaak heeft.
 Geef een geldig e-mailadres op of laat het veld leeg.',
@@ -754,21 +756,30 @@ Het wachtwoord voor "$2" is "$3".
 Meld u aan en wijzig uw wachtwoord.
 
 Negeer dit bericht als deze gebruiker zonder uw medeweten is aangemaakt.',
+'login-throttled'            => 'U hebt recentelijk te vaak geprobeerd aan te melden met een onjuist wachtwoord.
+Wachten even voordat u het opnieuw probereert.',
 'loginlanguagelabel'         => 'Taal: $1',
 
 # Password reset dialog
-'resetpass'               => 'Wachtwoord opnieuw instellen',
-'resetpass_announce'      => 'U bent aangemeld met een tijdelijke code die u per e-mail is toegezonden.
+'resetpass'                 => 'Wachtwoord wijzigen',
+'resetpass_announce'        => 'U bent aangemeld met een tijdelijke code die u per e-mail is toegezonden.
 Voer een nieuw wachtwoord in om het aanmelden te voltooien:',
-'resetpass_text'          => '<!-- Voeg hier tekst toe -->',
-'resetpass_header'        => 'Wachtwoord wijzigen',
-'resetpass_submit'        => 'Wachtwoord instellen en aanmelden',
-'resetpass_success'       => 'Uw wachtwoord is gewijzigd.
+'resetpass_text'            => '<!-- Voeg hier tekst toe -->',
+'resetpass_header'          => 'Wachtwoord wijzigen',
+'oldpassword'               => 'Huidige wachtwoord:',
+'newpassword'               => 'Nieuwe wachtwoord:',
+'retypenew'                 => 'Herhaling nieuwe wachtwoord:',
+'resetpass_submit'          => 'Wachtwoord instellen en aanmelden',
+'resetpass_success'         => 'Uw wachtwoord is gewijzigd.
 Bezig met aanmelden ...',
-'resetpass_bad_temporary' => 'Ongeldig tijdelijk wachtwoord.
+'resetpass_bad_temporary'   => 'Ongeldig tijdelijk wachtwoord.
 U hebt uw wachtwoord al gewijzigd of een nieuw tijdelijk wachtwoord aangevraagd.',
-'resetpass_forbidden'     => 'Wachtwoorden kunnen niet gewijzigd worden',
-'resetpass_missing'       => 'U hebt geen wachtwoord ingegeven.',
+'resetpass_forbidden'       => 'Wachtwoorden kunnen niet gewijzigd worden',
+'resetpass-no-info'         => 'U dient aangemeld zijn voordat u deze pagina kunt gebruiken.',
+'resetpass-submit-loggedin' => 'Wachtwoord wijzigen',
+'resetpass-wrong-oldpass'   => 'Het huidige of tijdelijke wachtwoord is ongeldig.
+Mogelijk hebt u uw wachtwoord al gewijzigd of een nieuw tijdelijk wachtwoord aangevraagd.',
+'resetpass-temp-password'   => 'Tijdelijk wachtwoord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Vetgedrukte tekst',
@@ -793,8 +804,8 @@ U hebt uw wachtwoord al gewijzigd of een nieuw tijdelijk wachtwoord aangevraagd.
 'hr_tip'          => 'Horizontale lijn (gebruik spaarzaam)',
 
 # Edit pages
-'summary'                          => 'Samenvatting',
-'subject'                          => 'Onderwerp/kop',
+'summary'                          => 'Samenvatting:',
+'subject'                          => 'Onderwerp/kop:',
 'minoredit'                        => 'Dit is een kleine bewerking',
 'watchthis'                        => 'Deze pagina volgen',
 'savearticle'                      => 'Pagina opslaan',
@@ -809,8 +820,8 @@ Als u nogmaals op ''Pagina opslaan'' klikt wordt de bewerking zonder samenvattin
 'missingcommenttext'               => 'Plaats uw opmerking hieronder.',
 'missingcommentheader'             => "'''Let op:''' U hebt geen onderwerp/kop voor deze opmerking opgegeven.
 Als u opnieuw op \"opslaan\" klikt, wordt uw wijziging zonder een onderwerp/kop opgeslagen.",
-'summary-preview'                  => 'Samenvatting nakijken',
-'subject-preview'                  => 'Nakijken onderwerp/kop',
+'summary-preview'                  => 'Samenvatting nakijken:',
+'subject-preview'                  => 'Nakijken onderwerp/kop:',
 'blockedtitle'                     => 'Gebruiker is geblokkeerd',
 'blockedtext'                      => '<big>\'\'\'Uw gebruiker of IP-adres is geblokkeerd.\'\'\'</big>
 
@@ -866,13 +877,13 @@ Het is mogelijk dat meerdere personen hetzelfde IP-adres gebruiken.
 Mogelijk ontvangt u hier berichten die niet voor u bedoeld zijn.
 Als u dat wilt voorkomen, [[Special:UserLogin/signup|registreer u]] of [[Special:UserLogin|meld u aan]] om verwarring met andere anonieme gebruikers te voorkomen.''",
 'noarticletext'                    => 'Deze pagina bevat geen tekst.
-U kunt [[Special:Search/{{PAGENAME}}|naar deze term zoeken]] in andere pagina\'s of <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} deze pagina bewerken]</span>.',
+U kunt [[Special:Search/{{PAGENAME}}|naar deze term zoeken]] in andere pagina\'s, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} de logboeken doorzoeken] of [{{fullurl:{{FULLPAGENAME}}|action=edit}} deze pagina bewerken]</span>.',
 'userpage-userdoesnotexist'        => 'U bewerkt een gebruikerspagina van een gebruiker die niet bestaat (gebruiker "$1").
 Controleer of u deze pagina wel wilt aanmaken/bewerken.',
 'clearyourcache'                   => "'''Let op! Nadat u de wijzigingen hebt opgeslagen is het wellicht nodig uw browsercache te legen.'''
 
 '''Mozilla / Firefox / Safari:''' houd ''Shift'' ingedrukt terwijl u op ''Huidige pagina vernieuwen'' klikt, of typ ''Ctrl-F5'' of ''Ctrl-R'' (''Command-R'' op eenMacintosh); '''Konqueror: '''klik ''Reload'' of typ ''F5;'' '''Opera:''' leeg uw cache in ''Extra → Voorkeuren;'' '''Internet Explorer:''' houd ''Ctrl'' ingedrukt terwijl u op ''Vernieuwen'' klikt of type ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Gebruik de knop 'Bewerking ter controle bekijken' om uw nieuwe CSS/JS te testen alvorens op te slaan.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Gebruik de knop 'Bewerking ter controle bekijken' om uw nieuwe CSS/JS te testen alvorens op te slaan.",
 'usercsspreview'                   => "'''Dit is alleen een voorvertoning van uw persoonlijke CSS.
 Deze is nog niet opgeslagen!'''",
 'userjspreview'                    => "'''Let op: u test nu uw persoonlijke JavaScript.'''
@@ -880,24 +891,24 @@ Deze is nog niet opgeslagen!'''",
 'userinvalidcssjstitle'            => "'''Waarschuwing:''' er is geen skin \"\$1\".
 Let op: uw eigen .css- en .js-pagina's beginnen met een kleine letter, bijvoorbeeld {{ns:user}}:Naam/monobook.css in plaats van {{ns:user}}:Naam/Monobook.css.",
 'updated'                          => '(Bijgewerkt)',
-'note'                             => '<strong>Opmerking:</strong>',
-'previewnote'                      => '<strong>Let op: dit is een controlepagina; uw tekst is niet opgeslagen!</strong>',
+'note'                             => "'''Opmerking:'''",
+'previewnote'                      => "'''Let op: dit is een controlepagina; uw tekst is niet opgeslagen!'''",
 'previewconflict'                  => 'Deze voorvertoning geeft aan hoe de tekst in het bovenste veld eruit ziet als u deze opslaat.',
-'session_fail_preview'             => '<strong>Uw bewerking is niet verwerkt, omdat de sessiegegevens verloren zijn gegaan.
+'session_fail_preview'             => "'''Uw bewerking is niet verwerkt, omdat de sessiegegevens verloren zijn gegaan.
 Probeer het opnieuw.
-Als het dan nog niet lukt, [[Special:UserLogout|meld u zich dan af]] en weer aan.</strong>',
-'session_fail_preview_html'        => "<strong>Uw bewerking is niet verwerkt, omdat sessiegegevens verloren zijn gegaan.</strong>
+Als het dan nog niet lukt, [[Special:UserLogout|meld u zich dan af]] en weer aan.'''",
+'session_fail_preview_html'        => "'''Uw bewerking is niet verwerkt, omdat sessiegegevens verloren zijn gegaan.'''
 
 ''Omdat in {{SITENAME}} ruwe HTML is ingeschakeld, is een voorvertoning niet mogelijk als bescherming tegen aanvallen met JavaScript.''
 
-<strong>Als dit een legitieme bewerking is, probeer het dan opnieuw.
-Als het dan nog niet lukt, [[Special:UserLogout|meld u zich dan af]] en weer aan.</strong>",
-'token_suffix_mismatch'            => '<strong>Uw bewerking is geweigerd omdat uw browser de leestekens in het bewerkingstoken onjuist heeft behandeld.
+'''Als dit een legitieme bewerking is, probeer het dan opnieuw.
+Als het dan nog niet lukt, [[Special:UserLogout|meld u zich dan af]] en weer aan.'''",
+'token_suffix_mismatch'            => "'''Uw bewerking is geweigerd omdat uw browser de leestekens in het bewerkingstoken onjuist heeft behandeld.
 De bewerking is geweigerd om verminking van de paginatekst te voorkomen.
-Dit gebeurt soms als er een webgebaseerde proxydienst wordt gebruikt die fouten bevat.</strong>',
+Dit gebeurt soms als er een webgebaseerde proxydienst wordt gebruikt die fouten bevat.'''",
 'editing'                          => 'Bezig met bewerken van $1',
 'editingsection'                   => 'Bezig met bewerken van $1 (deelpagina)',
-'editingcomment'                   => 'Bezig met bewerken van $1 (opmerking)',
+'editingcomment'                   => 'Bezig met bewerken van $1 (nieuw kopje)',
 'editconflict'                     => 'Bewerkingsconflict: $1',
 'explainconflict'                  => "Een andere gebruiker heeft deze pagina bewerkt sinds u met uw bewerking bent begonnen.
 In het bovenste deel van het venster staat de tekst van de huidige pagina.
@@ -906,30 +917,32 @@ U dient uw bewerkingen in te voegen in de bestaande tekst.
 '''Alleen''' de tekst in het bovenste gedeelte wordt opgeslagen als u op \"Pagina opslaan\" klikt.",
 'yourtext'                         => 'Uw tekst',
 'storedversion'                    => 'Opgeslagen versie',
-'nonunicodebrowser'                => "<strong>WAARSCHUWING: Uw browser kan niet goed overweg met unicode.
-Hiermee wordt door de MediaWiki-software rekening gehouden zodat u toch zonder problemen pagina's kunt bewerken: niet-ASCII karakters worden in het bewerkingsveld weergegeven als hexadecimale codes.</strong>",
-'editingold'                       => '<strong>WAARSCHUWING!
+'nonunicodebrowser'                => "'''WAARSCHUWING: Uw browser kan niet goed overweg met unicode.
+Hiermee wordt door de MediaWiki-software rekening gehouden zodat u toch zonder problemen pagina's kunt bewerken: niet-ASCII karakters worden in het bewerkingsveld weergegeven als hexadecimale codes.'''",
+'editingold'                       => "'''WAARSCHUWING!
 U bewerkt een oude versie van deze pagina.
-Als u uw bewerking opslaat, gaan alle wijzigingen die na deze versie gemaakt zijn verloren.</strong>',
+Als u uw bewerking opslaat, gaan alle wijzigingen die na deze versie gemaakt zijn verloren.'''",
 'yourdiff'                         => 'Wijzigingen',
-'copyrightwarning'                 => 'Opgelet: alle bijdragen aan {{SITENAME}} worden geacht te zijn vrijgegeven onder de $2 (zie $1 voor details).
+'copyrightwarning'                 => "Opgelet: alle bijdragen aan {{SITENAME}} worden geacht te zijn vrijgegeven onder de $2 (zie $1 voor details).
 Als u niet wilt dat uw tekst door anderen naar believen bewerkt en verspreid kan worden, kies dan niet voor ‘Pagina opslaan’.<br />
 Hierbij belooft u ons tevens dat u deze tekst zelf hebt geschreven, of overgenomen uit een vrije, openbare bron.<br />
-<strong>GEBRUIK GEEN MATERIAAL DAT BESCHERMD WORDT DOOR AUTEURSRECHT, TENZIJ U DAAR TOESTEMMING VOOR HEBT!</strong>',
-'copyrightwarning2'                => 'Al uw bijdragen aan {{SITENAME}} kunnen bewerkt, gewijzigd of verwijderd worden door andere gebruikers.
+'''GEBRUIK GEEN MATERIAAL DAT BESCHERMD WORDT DOOR AUTEURSRECHT, TENZIJ U DAAR TOESTEMMING VOOR HEBT!'''",
+'copyrightwarning2'                => "Al uw bijdragen aan {{SITENAME}} kunnen bewerkt, gewijzigd of verwijderd worden door andere gebruikers.
 Als u niet wilt dat uw teksten rigoureus aangepast worden door anderen, plaats ze hier dan niet.<br />
-U belooft ook u dat u de oorspronkelijke auteur bent van dit materiaal, of dat u het hebt gekopieerd uit een bron in het publieke domein, of een soortgelijke vrije bron (zie $1 voor details).
-<strong>GEBRUIK GEEN MATERIAAL DAT BESCHERMD WORDT DOOR AUTEURSRECHT, TENZIJ U DAARVOOR TOESTEMMING HEBT!</strong>',
-'longpagewarning'                  => "<strong>WAARSCHUWING: Deze pagina is $1 kilobyte groot; sommige browsers hebben problemen met het bewerken van pagina's die groter zijn dan 32 kilobyte.
-Wellicht kan deze pagina gesplitst worden in kleinere delen.</strong>",
-'longpageerror'                    => '<strong>FOUT: de tekst die u hebt toegevoegd heeft is $1 kilobyte groot, wat groter is dan het maximum van $2 kilobyte.
-Opslaan is niet mogelijk.</strong>',
-'readonlywarning'                  => '<strong>WAARSCHUWING: de database is geblokkeerd voor onderhoud, dus u kunt deze nu niet opslaan.
-Het is misschien verstandig om uw tekst tijdelijk in een tekstbestand op te slaan om dit te bewaren voor wanneer de blokkering van de database opgeheven is.</strong>',
-'protectedpagewarning'             => '<strong>WAARSCHUWING! Deze beveiligde pagina kan alleen door gebruikers met beheerdersrechten bewerkt worden.</strong>',
+U belooft ook dat u de oorspronkelijke auteur bent van dit materiaal, of dat u het hebt gekopieerd uit een bron in het publieke domein, of een soortgelijke vrije bron (zie $1 voor details).
+'''GEBRUIK GEEN MATERIAAL DAT BESCHERMD WORDT DOOR AUTEURSRECHT, TENZIJ U DAARVOOR TOESTEMMING HEBT!'''",
+'longpagewarning'                  => "'''WAARSCHUWING: Deze pagina is $1 kilobyte groot; sommige browsers hebben problemen met het bewerken van pagina's die groter zijn dan 32 kilobyte.
+Wellicht kan deze pagina gesplitst worden in kleinere delen.'''",
+'longpageerror'                    => "'''FOUT: de tekst die u hebt toegevoegd is $1 kilobyte groot, wat groter is dan het maximum van $2 kilobyte.
+Opslaan is niet mogelijk.'''",
+'readonlywarning'                  => "'''WAARSCHUWING: De database is geblokkeerd voor bewerkingen, waarschijnlijk voor regulier databaseonderhoud, dus u kunt deze nu niet opslaan.
+Het is misschien verstandig om uw tekst tijdelijk in een tekstbestand op te slaan om dit te bewaren voor wanneer de blokkering van de database opgeheven is.'''
+
+Een beheerder heeft de database geblokkeerd om de volgende reden: $1",
+'protectedpagewarning'             => "'''WAARSCHUWING! Deze beveiligde pagina kan alleen door gebruikers met beheerdersrechten bewerkt worden.'''",
 'semiprotectedpagewarning'         => "'''Let op:''' deze pagina is beveiligd en kan alleen door geregistreerde gebruikers bewerkt worden.",
 'cascadeprotectedwarning'          => "'''Waarschuwing:''' Deze pagina is beveiligd en kan alleen door beheerders bewerkt worden, omdat deze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:",
-'titleprotectedwarning'            => '<strong>WAARSCHUWING: Deze pagina is beveiligd zodat alleen enkele gebruikers het kunnen aanmaken.</strong>',
+'titleprotectedwarning'            => "'''WAARSCHUWING: Deze pagina is beveiligd. Er zijn [[Special:ListGroupRights|speciale rechten]] nodig om de pagina aan te kunnen maken.'''",
 'templatesused'                    => 'Op deze pagina gebruikte sjablonen:',
 'templatesusedpreview'             => 'Sjablonen gebruikt in deze voorvertoning:',
 'templatesusedsection'             => 'Sjablonen die gebruikt worden in deze subkop:',
@@ -948,11 +961,22 @@ U kunt reeds bestaande pagina's wijzigen, of u kunt [[Special:UserLogin|zich aan
 
 Overweeg of het terecht is dat u verder werkt aan deze pagina.
 Voor uw gemak staat hieronder het verwijderingslogboek voor deze pagina:",
+'deleted-notice'                   => 'Deze pagina is verwijderd.
+Ter informatie wordt het verwijderingslogboek van deze pagina hieronder weergegeven.',
+'deletelog-fulllog'                => 'Volledige logboek bekijken',
+'edit-hook-aborted'                => 'De bewerking is afgebroken door een hook.
+Er is geen toelichting beschikbaar.',
+'edit-gone-missing'                => 'De pagina is niet bijgewerkt.
+Deze lijkt verwijderd te zijn.',
+'edit-conflict'                    => 'Bewerkingsconflict.',
+'edit-no-change'                   => 'Uw bewerking is genegeerd, omdat er geen wijziging aan de tekst is gemaakt.',
+'edit-already-exists'              => 'De pagina is niet aangemaakt.
+Deze bestaat al.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Waarschuwing: deze pagina gebruikt te veel kostbare parserfuncties.
 
-Nu zijn het er $1, terwijl het er minder dan $2 moeten zijn.',
+Nu {{PLURAL:$1|is|zijn}} het er $1, terwijl het er minder dan $2 {{PLURAL:$2|moet|moeten}} zijn.',
 'expensive-parserfunction-category'       => "Pagina's die te veel kostbare parserfuncties gebruiken",
 'post-expand-template-inclusion-warning'  => 'Waarschuwing: de maximale transclusiegrootte voor sjablonen is overschreden.
 Sommige sjablonen worden niet getranscludeerd.',
@@ -960,6 +984,8 @@ Sommige sjablonen worden niet getranscludeerd.',
 'post-expand-template-argument-warning'   => 'Waarschuwing: deze pagina bevat tenminste een sjabloonparameter met een te grote transclusiegrootte.
 Deze parameters zijn weggelaten.',
 'post-expand-template-argument-category'  => "Pagina's die missende sjabloonelementen bevatten",
+'parser-template-loop-warning'            => 'Er is een kringloop in sjablonen geconstateerd: [[$1]]',
+'parser-template-recursion-depth-warning' => 'De recursiediepte voor sjablonen is overschreden ($1)',
 
 # "Undo" feature
 'undo-success' => 'Hieronder staat de tekst waarin de wijziging ongedaan is gemaakt.
@@ -975,29 +1001,28 @@ Controleer voor het opslaan of het resultaat gewenst is.',
 De door $3 opgegeven reden is ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Logboek voor deze pagina bekijken',
-'nohistory'           => 'Deze pagina is niet bewerkt.',
-'revnotfound'         => 'Bewerking niet gevonden',
-'revnotfoundtext'     => 'De opgevraagde oude versie van deze pagina is onvindbaar.
-Controleer de URL die u gebruikte om naar deze pagina te gaan.',
-'currentrev'          => 'Huidige versie',
-'revisionasof'        => 'Versie op $1',
-'revision-info'       => 'Versie op $1 van $2',
-'previousrevision'    => '�Oudere versie',
-'nextrevision'        => 'Nieuwere versie→',
-'currentrevisionlink' => 'Huidige versie',
-'cur'                 => 'huidig',
-'next'                => 'volgende',
-'last'                => 'vorige',
-'page_first'          => 'eerste',
-'page_last'           => 'laatste',
-'histlegend'          => 'Selectie voor verschillen: selecteer de te vergelijken versies en toets ENTER of de knop onderaan.<br />
+'viewpagelogs'           => 'Logboek voor deze pagina bekijken',
+'nohistory'              => 'Deze pagina is niet bewerkt.',
+'currentrev'             => 'Huidige versie',
+'currentrev-asof'        => 'Huidige versie per $1',
+'revisionasof'           => 'Versie op $1',
+'revision-info'          => 'Versie op $1 van $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Oudere versie',
+'nextrevision'           => 'Nieuwere versie→',
+'currentrevisionlink'    => 'Huidige versie',
+'cur'                    => 'huidig',
+'next'                   => 'volgende',
+'last'                   => 'vorige',
+'page_first'             => 'eerste',
+'page_last'              => 'laatste',
+'histlegend'             => 'Selectie voor verschillen: selecteer de te vergelijken versies en toets ENTER of de knop onderaan.<br />
 Verklaring afkortingen: (huidig) = verschil met huidige versie, (vorige) = verschil met voorgaande versie, k = kleine wijziging',
-'deletedrev'          => '[verwijderd]',
-'histfirst'           => 'Oudste',
-'histlast'            => 'Nieuwste',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(leeg)',
+'history-fieldset-title' => 'Door geschiedenis bladeren',
+'deletedrev'             => '[verwijderd]',
+'histfirst'              => 'Oudste',
+'histlast'               => 'Nieuwste',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(leeg)',
 
 # Revision feed
 'history-feed-title'          => 'Bewerkingsoverzicht',
@@ -1078,10 +1103,11 @@ Let op dat het gebruiken van de navigatieverwijzingen deze kolom opnieuw instelt
 'mergehistory-fail'                => 'Kan geen geschiedenis samenvoegen, controleer opnieuw de pagina- en tijdinstellingen.',
 'mergehistory-no-source'           => 'Bronpagina $1 bestaat niet.',
 'mergehistory-no-destination'      => 'Bestemmingspagina $1 bestaat niet.',
-'mergehistory-invalid-source'      => 'De bronpagina moet een geldige titel zijn.',
-'mergehistory-invalid-destination' => 'De bestemmingspagina moet een geldige titel zijn.',
+'mergehistory-invalid-source'      => 'De bronpagina moet een geldige paginanaam zijn.',
+'mergehistory-invalid-destination' => 'De bestemmingspagina moet een geldige paginanaam zijn.',
 'mergehistory-autocomment'         => '[[:$1]] samengevoegd naar [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] samengevoegd naar [[:$2]]: $3',
+'mergehistory-same-destination'    => 'De bronpagina en doelpagina kunnen niet hetzelfde zijn',
 
 # Merge log
 'mergelog'           => 'Samenvoegingslogboek',
@@ -1094,125 +1120,206 @@ Let op dat het gebruiken van de navigatieverwijzingen deze kolom opnieuw instelt
 'difference'              => '(Verschil tussen bewerkingen)',
 'lineno'                  => 'Regel $1:',
 'compareselectedversions' => 'Aangevinkte versies vergelijken',
+'visualcomparison'        => 'Visuele vergelijking',
+'wikicodecomparison'      => 'Wikitekstvergelijking',
 'editundo'                => 'ongedaan maken',
 'diff-multi'              => '({{PLURAL:$1|Eén tussenliggende versie wordt|$1 tussenliggende versies worden}} niet weergegeven)',
+'diff-movedto'            => 'Verplaatst naar $1',
+'diff-styleadded'         => 'stijl $1 toegevoegd',
+'diff-added'              => '$1 toegevoegd',
+'diff-changedto'          => 'gewijzigd in $1',
+'diff-movedoutof'         => 'verplaatst buiten $1',
+'diff-styleremoved'       => 'stijl $1 verwijderd',
+'diff-removed'            => '$1 verwijderd',
+'diff-changedfrom'        => 'gewijzigd van $1',
+'diff-src'                => 'bron',
+'diff-withdestination'    => 'met bestemming $1',
+'diff-with'               => '&#32;met $1 $2',
+'diff-with-final'         => '&#32;en $1 $2',
+'diff-width'              => 'breedte',
+'diff-height'             => 'hoogte',
+'diff-p'                  => "een '''paragraaf'''",
+'diff-blockquote'         => "een '''haakje'''",
+'diff-h1'                 => "een '''kopje (niveau 1)'''",
+'diff-h2'                 => "een '''kopje (niveau 2)'''",
+'diff-h3'                 => "een '''kopje (niveau 3)'''",
+'diff-h4'                 => "een '''kopje (niveau 4)'''",
+'diff-h5'                 => "een '''kopje (niveau 5)'''",
+'diff-pre'                => "een '''voorgeformatteerd tekstblok'''",
+'diff-div'                => "een '''deling'''",
+'diff-ul'                 => "een '''ongenummerde lijst'''",
+'diff-ol'                 => "een '''genummerde lijst'''",
+'diff-li'                 => "een '''lijstitem'''",
+'diff-table'              => "een '''tabel'''",
+'diff-tbody'              => "'''tabelinhoud'''",
+'diff-tr'                 => "een '''rij'''",
+'diff-td'                 => "een '''cel'''",
+'diff-th'                 => "een '''kolomkop'''",
+'diff-br'                 => "een '''nieuwe regel'''",
+'diff-hr'                 => "een '''horizontale lijn'''",
+'diff-code'               => "een '''tekstblok met programmacode'''",
+'diff-dl'                 => "een '''definitie'''",
+'diff-dt'                 => "een '''te definiëren term'''",
+'diff-dd'                 => "een '''definitie'''",
+'diff-input'              => "een '''input'''",
+'diff-form'               => "een '''formulier'''",
+'diff-img'                => "een '''afbeelding'''",
+'diff-span'               => "een '''span'''",
+'diff-a'                  => "een '''verwijzing'''",
+'diff-i'                  => "'''cursief'''",
+'diff-b'                  => "'''vet'''",
+'diff-strong'             => "'''sterk'''",
+'diff-em'                 => "'''nadruk'''",
+'diff-font'               => "'''lettertype'''",
+'diff-big'                => "'''groot'''",
+'diff-del'                => "'''verwijderd'''",
+'diff-tt'                 => "'''vaste breedte'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''doorhaling'''",
 
 # Search results
-'searchresults'             => 'Zoekresultaten',
-'searchresulttext'          => 'Voor meer informatie over zoeken op {{SITENAME}}, zie [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'U zocht naar \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|pagina\'s die beginnen met "$1"]] | [[Special:WhatLinksHere/$1|pagina\'s die verwijzen naar "$1"]])',
-'searchsubtitleinvalid'     => 'Voor zoekopdracht "$1"',
-'noexactmatch'              => "'''Er bestaat geen pagina met de naam \"\$1\".''' U kunt deze [[:\$1|aanmaken]].",
-'noexactmatch-nocreate'     => "'''De pagina \"\$1\" bestaat niet.'''",
-'toomanymatches'            => 'Er waren te veel resultaten.
+'searchresults'                    => 'Zoekresultaten',
+'searchresults-title'              => 'Zoekresultaten voor "$1"',
+'searchresulttext'                 => 'Voor meer informatie over zoeken op {{SITENAME}}, zie [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'U zocht naar \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|pagina\'s die beginnen met "$1"]] {{int:pipe-separator}}[[Special:WhatLinksHere/$1|pagina\'s die verwijzen naar "$1"]])',
+'searchsubtitleinvalid'            => 'Voor zoekopdracht "$1"',
+'noexactmatch'                     => "'''Er bestaat geen pagina met de naam \"\$1\".''' U kunt deze [[:\$1|aanmaken]].",
+'noexactmatch-nocreate'            => "'''De pagina \"\$1\" bestaat niet.'''",
+'toomanymatches'                   => 'Er waren te veel resultaten.
 Probeer een andere zoekopdracht.',
-'titlematches'              => 'Overeenkomst met onderwerp',
-'notitlematches'            => 'Geen resultaten gevonden',
-'textmatches'               => 'Overeenkomst met inhoud',
-'notextmatches'             => "Geen pagina's gevonden",
-'prevn'                     => 'vorige $1',
-'nextn'                     => 'volgende $1',
-'viewprevnext'              => '($1) ($2) ($3) bekijken.',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 woord|$2 woorden}})',
-'search-result-score'       => 'Relevantie: $1%',
-'search-redirect'           => '(doorverwijzing $1)',
-'search-section'            => '(subkop $1)',
-'search-suggest'            => 'Bedoelde u: $1',
-'search-interwiki-caption'  => 'Zusterprojecten',
-'search-interwiki-default'  => '$1 resultaten:',
-'search-interwiki-more'     => '(meer)',
-'search-mwsuggest-enabled'  => 'met suggesties',
-'search-mwsuggest-disabled' => 'geen suggesties',
-'search-relatedarticle'     => 'Gerelateerd',
-'mwsuggest-disable'         => 'Suggesties via AJAX uitschakelen',
-'searchrelated'             => 'gerelateerd',
-'searchall'                 => 'alle',
-'showingresults'            => "Hieronder {{PLURAL:$1|staat '''1''' resultaat|staan '''$1''' resultaten}} vanaf #'''$2'''.",
-'showingresultsnum'         => "Hieronder {{PLURAL:$3|staat '''1''' resultaat|staan '''$3''' resultaten}} vanaf #'''$2'''.",
-'showingresultstotal'       => "Hieronder {{PLURAL:$3|wordt resultaat '''$1'''|worden resultaten '''$1 tot $2'''}} van '''$3''' weergegeven",
-'nonefound'                 => "'''Opmerking''': standaard worden niet alle naamruimten doorzocht.
+'titlematches'                     => 'Overeenkomst met onderwerp',
+'notitlematches'                   => 'Geen resultaten gevonden',
+'textmatches'                      => 'Overeenkomst met inhoud',
+'notextmatches'                    => "Geen pagina's gevonden",
+'prevn'                            => 'vorige $1',
+'nextn'                            => 'volgende $1',
+'viewprevnext'                     => '($1) ($2) ($3) bekijken.',
+'searchmenu-legend'                => 'Zoekopties',
+'searchmenu-exists'                => "* Pagina '''[[$1]]'''",
+'searchmenu-new'                   => "'''De pagina \"[[:\$1]]\" aanmaken op deze wiki'''",
+'searchhelp-url'                   => 'Help:Inhoud',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Paginanamen met dit voorvoegsel weergeven]]',
+'searchprofile-articles'           => "Inhoudelijke pagina's",
+'searchprofile-articles-and-proj'  => "Inhoudelijke en projectpagina's",
+'searchprofile-project'            => "Projectpagina's",
+'searchprofile-images'             => 'Bestanden',
+'searchprofile-everything'         => 'Alles',
+'searchprofile-advanced'           => 'Uitgebreid',
+'searchprofile-articles-tooltip'   => 'Zoeken in $1',
+'searchprofile-project-tooltip'    => 'Zoeken in $1',
+'searchprofile-images-tooltip'     => 'Zoeken naar bestanden',
+'searchprofile-everything-tooltip' => "Alle inhoud doorzoeken (inclusief overlegpagina's)",
+'searchprofile-advanced-tooltip'   => 'Zoeken in aangegeven naamruimten',
+'prefs-search-nsdefault'           => 'Zoeken met standaardinstellingen:',
+'prefs-search-nscustom'            => 'Zoeken in aangegeven naamruimten:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 woord|$2 woorden}})',
+'search-result-score'              => 'Relevantie: $1%',
+'search-redirect'                  => '(doorverwijzing $1)',
+'search-section'                   => '(subkop $1)',
+'search-suggest'                   => 'Bedoelde u: $1',
+'search-interwiki-caption'         => 'Zusterprojecten',
+'search-interwiki-default'         => '$1 resultaten:',
+'search-interwiki-more'            => '(meer)',
+'search-mwsuggest-enabled'         => 'met suggesties',
+'search-mwsuggest-disabled'        => 'geen suggesties',
+'search-relatedarticle'            => 'Gerelateerd',
+'mwsuggest-disable'                => 'Suggesties via AJAX uitschakelen',
+'searchrelated'                    => 'gerelateerd',
+'searchall'                        => 'alle',
+'showingresults'                   => "Hieronder {{PLURAL:$1|staat '''1''' resultaat|staan '''$1''' resultaten}} vanaf #'''$2'''.",
+'showingresultsnum'                => "Hieronder {{PLURAL:$3|staat '''1''' resultaat|staan '''$3''' resultaten}} vanaf #'''$2'''.",
+'showingresultstotal'              => "Hieronder {{PLURAL:$4|wordt resultaat '''$1'''|worden resultaten '''$1 tot $2'''}} van '''$3''' weergegeven",
+'nonefound'                        => "'''Opmerking''': standaard worden niet alle naamruimten doorzocht.
 Als u in uw zoekopdracht als voorvoegsel \"''all:''\" gebruikt worden alle pagina's doorzocht (inclusief overlegpagina's, sjablonen, enzovoort).
 U kunt ook een naamruimte als voorvoegsel gebruiken.",
-'powersearch'               => 'Uitgebreid zoeken',
-'powersearch-legend'        => 'Uitgebreid zoeken',
-'powersearch-ns'            => 'Zoeken in naamruimten:',
-'powersearch-redir'         => 'Doorverwijzingen weergeven',
-'powersearch-field'         => 'Zoeken naar',
-'search-external'           => 'Extern zoeken',
-'searchdisabled'            => 'Zoeken in {{SITENAME}} is niet mogelijk.
+'search-nonefound'                 => 'Er zijn geen resultaten voor uw zoekopdracht.',
+'powersearch'                      => 'Uitgebreid zoeken',
+'powersearch-legend'               => 'Uitgebreid zoeken',
+'powersearch-ns'                   => 'Zoeken in naamruimten:',
+'powersearch-redir'                => 'Doorverwijzingen weergeven',
+'powersearch-field'                => 'Zoeken naar',
+'search-external'                  => 'Extern zoeken',
+'searchdisabled'                   => 'Zoeken in {{SITENAME}} is niet mogelijk.
 U kunt gebruik maken van Google.
 De gegevens over {{SITENAME}} zijn mogelijk niet bijgewerkt.',
 
 # Preferences page
-'preferences'              => 'Voorkeuren',
-'mypreferences'            => 'Mijn voorkeuren',
-'prefs-edits'              => 'Aantal bewerkingen:',
-'prefsnologin'             => 'Niet aangemeld',
-'prefsnologintext'         => 'U moet <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} aangemeld]</span> zijn om uw voorkeuren te kunnen instellen.',
-'prefsreset'               => 'Standaardvoorkeuren zijn hersteld.',
-'qbsettings'               => 'Menubalk',
-'qbsettings-none'          => 'Uitgeschakeld',
-'qbsettings-fixedleft'     => 'Links vast',
-'qbsettings-fixedright'    => 'Rechts vast',
-'qbsettings-floatingleft'  => 'Links zwevend',
-'qbsettings-floatingright' => 'Rechts zwevend',
-'changepassword'           => 'Wachtwoord wijzigen',
-'skin'                     => 'Vormgeving',
-'math'                     => 'Formules',
-'dateformat'               => 'Datumopmaak',
-'datedefault'              => 'Geen voorkeur',
-'datetime'                 => 'Datum en tijd',
-'math_failure'             => 'Parsen mislukt',
-'math_unknown_error'       => 'onbekende fout',
-'math_unknown_function'    => 'onbekende functie',
-'math_lexing_error'        => 'lexicografische fout',
-'math_syntax_error'        => 'syntactische fout',
-'math_image_error'         => 'PNG-omzetting is mislukt.
+'preferences'               => 'Voorkeuren',
+'mypreferences'             => 'Mijn voorkeuren',
+'prefs-edits'               => 'Aantal bewerkingen:',
+'prefsnologin'              => 'Niet aangemeld',
+'prefsnologintext'          => 'U moet <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} aangemeld]</span> zijn om uw voorkeuren te kunnen instellen.',
+'prefsreset'                => 'Standaardvoorkeuren zijn hersteld.',
+'qbsettings'                => 'Menubalk',
+'qbsettings-none'           => 'Uitgeschakeld',
+'qbsettings-fixedleft'      => 'Links vast',
+'qbsettings-fixedright'     => 'Rechts vast',
+'qbsettings-floatingleft'   => 'Links zwevend',
+'qbsettings-floatingright'  => 'Rechts zwevend',
+'changepassword'            => 'Wachtwoord wijzigen',
+'skin'                      => 'Vormgeving',
+'skin-preview'              => 'Voorbeeld',
+'math'                      => 'Formules',
+'dateformat'                => 'Datumopmaak',
+'datedefault'               => 'Geen voorkeur',
+'datetime'                  => 'Datum en tijd',
+'math_failure'              => 'Parsen mislukt',
+'math_unknown_error'        => 'onbekende fout',
+'math_unknown_function'     => 'onbekende functie',
+'math_lexing_error'         => 'lexicografische fout',
+'math_syntax_error'         => 'syntactische fout',
+'math_image_error'          => 'PNG-omzetting is mislukt.
 Ga na of latex, dvips en gs correct geïnstalleerd zijn en zet om',
-'math_bad_tmpdir'          => 'De map voor tijdelijke bestanden voor wiskundige formules bestaat niet of kan niet gemaakt worden',
-'math_bad_output'          => 'De map voor bestanden met wiskundige formules bestaat niet of kan niet gemaakt worden.',
-'math_notexvc'             => 'Kan het programma texvc niet vinden; stel alles in volgens de beschrijving in math/README.',
-'prefs-personal'           => 'Gebruikersprofiel',
-'prefs-rc'                 => 'Recente wijzigingen',
-'prefs-watchlist'          => 'Volglijst',
-'prefs-watchlist-days'     => 'Dagen weer te geven in de volglijst:',
-'prefs-watchlist-edits'    => 'Maximaal aantal bewerkingen in de uitgebreide volglijst:',
-'prefs-misc'               => 'Diversen',
-'saveprefs'                => 'Opslaan',
-'resetprefs'               => 'Niet opgeslagen wijzigingen herstellen',
-'oldpassword'              => 'Huidige wachtwoord:',
-'newpassword'              => 'Nieuwe wachtwoord:',
-'retypenew'                => 'Herhaling nieuwe wachtwoord:',
-'textboxsize'              => 'Bewerken',
-'rows'                     => 'Regels:',
-'columns'                  => 'Kolommen:',
-'searchresultshead'        => 'Zoekresultaten',
-'resultsperpage'           => 'Resultaten per pagina:',
-'contextlines'             => 'Regels per resultaat:',
-'contextchars'             => 'Context per regel:',
-'stub-threshold'           => 'Drempel voor markering <a href="#" class="stub">beginnetje</a>:',
-'recentchangesdays'        => 'Aantal dagen weer te geven in de recente wijzigingen:',
-'recentchangescount'       => "Aantal bewerkingen in recente wijzigingen, geschiedenis en logboekpagina's:",
-'savedprefs'               => 'Uw voorkeuren zijn opgeslagen.',
-'timezonelegend'           => 'Tijdzone',
-'timezonetext'             => '¹Het aantal uren dat uw plaatselijke tijd afwijkt van de servertijd (UTC).',
-'localtime'                => 'Plaatselijke tijd',
-'timezoneoffset'           => 'Tijdsverschil¹',
-'servertime'               => 'Servertijd',
-'guesstimezone'            => 'Vanuit de browser toevoegen',
-'allowemail'               => 'E-mail van andere gebruikers toestaan',
-'prefs-searchoptions'      => 'Zoekinstellingen',
-'prefs-namespaces'         => 'Naamruimten',
-'defaultns'                => 'Standaard in deze naamruimten zoeken:',
-'default'                  => 'standaard',
-'files'                    => 'Bestanden',
+'math_bad_tmpdir'           => 'De map voor tijdelijke bestanden voor wiskundige formules bestaat niet of kan niet gemaakt worden',
+'math_bad_output'           => 'De map voor bestanden met wiskundige formules bestaat niet of kan niet gemaakt worden.',
+'math_notexvc'              => 'Kan het programma texvc niet vinden; stel alles in volgens de beschrijving in math/README.',
+'prefs-personal'            => 'Gebruikersprofiel',
+'prefs-rc'                  => 'Recente wijzigingen',
+'prefs-watchlist'           => 'Volglijst',
+'prefs-watchlist-days'      => 'Dagen weer te geven in de volglijst:',
+'prefs-watchlist-days-max'  => '(maximaal 7 dagen)',
+'prefs-watchlist-edits'     => 'Maximaal aantal bewerkingen in de uitgebreide volglijst:',
+'prefs-watchlist-edits-max' => '(maximale aantal: 1000)',
+'prefs-misc'                => 'Diversen',
+'prefs-resetpass'           => 'Wachtwoord wijzigen',
+'saveprefs'                 => 'Opslaan',
+'resetprefs'                => 'Niet opgeslagen wijzigingen herstellen',
+'textboxsize'               => 'Bewerken',
+'prefs-edit-boxsize'        => 'Afmetingen van het bewerkingsvenster.',
+'rows'                      => 'Regels:',
+'columns'                   => 'Kolommen:',
+'searchresultshead'         => 'Zoekresultaten',
+'resultsperpage'            => 'Resultaten per pagina:',
+'contextlines'              => 'Regels per resultaat:',
+'contextchars'              => 'Context per regel:',
+'stub-threshold'            => 'Drempel voor markering <a href="#" class="stub">beginnetje</a>:',
+'recentchangesdays'         => 'Aantal dagen weer te geven in de recente wijzigingen:',
+'recentchangesdays-max'     => '(maximaal $1 {{PLURAL:$1|dag|dagen}})',
+'recentchangescount'        => "Standaard aantal bewerkingen in recente wijzigingen, paginageschiedenis en logboekpagina's:",
+'savedprefs'                => 'Uw voorkeuren zijn opgeslagen.',
+'timezonelegend'            => 'Tijdzone',
+'timezonetext'              => '¹Het aantal uren dat uw plaatselijke tijd afwijkt van de servertijd (UTC).',
+'localtime'                 => 'Plaatselijke tijd:',
+'timezoneselect'            => 'Tijdzone',
+'timezoneuseserverdefault'  => 'Servertijd gebruiken',
+'timezoneuseoffset'         => 'Anders (tijdverschil aangeven)',
+'timezoneoffset'            => 'Tijdsverschil¹:',
+'servertime'                => 'Servertijd:',
+'guesstimezone'             => 'Vanuit de browser toevoegen',
+'allowemail'                => 'E-mail van andere gebruikers toestaan',
+'prefs-searchoptions'       => 'Zoekinstellingen',
+'prefs-namespaces'          => 'Naamruimten',
+'defaultns'                 => 'Standaard in deze naamruimten zoeken:',
+'default'                   => 'standaard',
+'files'                     => 'Bestanden',
 
 # User rights
 'userrights'                  => 'Gebruikersrechtenbeheer', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Gebruikersgroepen beheren',
 'userrights-user-editname'    => 'Voer een gebruikersnaam in:',
 'editusergroup'               => 'Gebruikersgroepen wijzigen',
-'editinguser'                 => "Bezig met wijzigen van de gebruikersrechten van gebruiker '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Bezig met wijzigen van de gebruikersrechten van gebruiker '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Gebruikersgroepen wijzigen',
 'saveusergroups'              => 'Gebruikersgroepen opslaan',
 'userrights-groupsmember'     => 'Lid van:',
@@ -1261,6 +1368,8 @@ Ga na of latex, dvips en gs correct geïnstalleerd zijn en zet om',
 'right-minoredit'            => 'Bewerkingen als klein markeren',
 'right-move'                 => "Pagina's hernoemen",
 'right-move-subpages'        => "Pagina's inclusief subpagina's verplaatsen",
+'right-move-rootuserpages'   => "Gebruikerspagina's van het hoogste niveau hernoemen",
+'right-movefile'             => 'Bestanden hernoemen',
 'right-suppressredirect'     => 'Een doorverwijzing op de doelpagina verwijderen bij het hernoemen van een pagina',
 'right-upload'               => 'Bestanden uploaden',
 'right-reupload'             => 'Een bestaand bestand overschrijven',
@@ -1311,9 +1420,46 @@ Ga na of latex, dvips en gs correct geïnstalleerd zijn en zet om',
 'rightslogentry' => 'wijzigde de gebruikersrechten voor $1 van $2 naar $3',
 'rightsnone'     => '(geen)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'deze pagina te bekijken',
+'action-edit'                 => 'deze pagina te bewerken',
+'action-createpage'           => "pagina's aan te maken",
+'action-createtalk'           => "overlegpagina's aan te maken",
+'action-createaccount'        => 'deze gebruiker aan te maken',
+'action-minoredit'            => 'deze bewerking als klein te markeren',
+'action-move'                 => 'deze pagina te hernoemen',
+'action-move-subpages'        => "deze pagina en bijbehorende subpagina's te hernoemen",
+'action-move-rootuserpages'   => "gebruikerspagina's van het hoogste niveau te hernoemen",
+'action-movefile'             => 'dit bestand te hernoemen',
+'action-upload'               => 'dit bestand te uploaden',
+'action-reupload'             => 'dit bestaande bestand te overschrijven',
+'action-reupload-shared'      => 'dit bestand te uploaden, terwijl er al een bestand met dezelfde naam in de gedeelde repository staat',
+'action-upload_by_url'        => 'dit bestand vanaf een URL te uploaden',
+'action-writeapi'             => 'de via de API te bewerken',
+'action-delete'               => 'deze pagina te verwijderen',
+'action-deleterevision'       => 'deze versie te verwijderen',
+'action-deletedhistory'       => 'de verwijderde versies van deze pagina te bekijken',
+'action-browsearchive'        => "verwijderde pagina's te zoeken",
+'action-undelete'             => 'deze pagina terug te plaatsen',
+'action-suppressrevision'     => 'deze verborgen versie te bekijken en terug te plaatsen',
+'action-suppressionlog'       => 'dit beschermde logboek te bekijken',
+'action-block'                => 'deze gebruiker een bewerkingsblokkade op te leggen',
+'action-protect'              => 'het beveiligingsniveau van deze pagina aan te passen',
+'action-import'               => 'deze pagina van een andere wiki te importeren',
+'action-importupload'         => 'deze pagina van een bestandsupload te importeren',
+'action-patrol'               => 'bewerkingen van anderen als gecontroleerd te markeren',
+'action-autopatrol'           => 'eigen bewerkingen als gecontroleerd te laten markeren',
+'action-unwatchedpages'       => "de lijst met pagina's die niet op een volglijst staan te bekijken",
+'action-trackback'            => 'een trackback op te geven',
+'action-mergehistory'         => 'de geschiedenis van deze pagina samen te voegen',
+'action-userrights'           => 'alle gebruikersrechten te bewerken',
+'action-userrights-interwiki' => "gebruikersrechten van gebruikers van andere wiki's te bewerken",
+'action-siteadmin'            => 'de database af te sluiten of open te stellen',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|bewerking|bewerkingen}}',
 'recentchanges'                     => 'Recente wijzigingen',
+'recentchanges-legend'              => 'Opties voor recente wijzigingen',
 'recentchangestext'                 => 'Op deze pagina kunt u de recentste wijzigingen in deze wiki bekijken.',
 'recentchanges-feed-description'    => 'Met deze feed kunt u de recentste wijzigingen in deze wiki bekijken.',
 'rcnote'                            => "Hieronder {{PLURAL:$1|staat de laatste bewerking|staan de laatste '''$1''' bewerkingen}} in de laatste {{PLURAL:$2|dag|'''$2''' dagen}}, op $4 om $5.",
@@ -1337,6 +1483,8 @@ Ga na of latex, dvips en gs correct geïnstalleerd zijn en zet om',
 'rc_categories'                     => 'Beperken tot categorieën (scheiden met een "|")',
 'rc_categories_any'                 => 'Elke',
 'newsectionsummary'                 => '/* $1 */ nieuwe subkop',
+'rc-enhanced-expand'                => 'Details weergeven (JavaScript verplicht)',
+'rc-enhanced-hide'                  => 'Details verbergen',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Verwante wijzigingen',
@@ -1359,13 +1507,13 @@ om bestanden te uploaden.',
 'upload_directory_read_only'  => 'De webserver kan niet schrijven in de uploadmap ($1).',
 'uploaderror'                 => 'Uploadfout',
 'uploadtext'                  => "Gebruik het onderstaande formulier om bestanden te uploaden.
-Om eerder toegevoegde bestanden te bekijken of te zoeken kunt u naar de [[Special:ImageList|bestandslijst]] gaan.
+Om eerder toegevoegde bestanden te bekijken of te zoeken kunt u naar de [[Special:FileList|bestandslijst]] gaan.
 Uploads en bestanden die na verwijdering opnieuw worden toegevoegd zijn na te zien in het [[Special:Log/upload|uploadlogboek]].
 Verwijderde bestanden worden bijgehouden in het [[Special:Log/delete|verwijderingslogboek]].
 
 Om het bestand in te voegen in een pagina kunt u een van de volgende vormen gebruiken, al naar gelang het bestandsformaat dat van toepassing is:
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bestand.jpg]]</nowiki>''' om de volledige versie van het bestand te gebruiken
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bestand.png|200px|thumb|left|alternatieve tekst]]</nowiki>''' om een 200-pixel brede afbeelding links weer te geven met een rand en met \"alternatieve tekst\" als beschrijving
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bestand.jpg]]</nowiki>''' om de volledige versie van het bestand te gebruiken
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bestand.png|200px|thumb|left|alternatieve tekst]]</nowiki>''' om een 200-pixel brede afbeelding links weer te geven met een rand en met \"alternatieve tekst\" als beschrijving
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Bestand.ogg]]</nowiki>''' om gewoon naar het bestand te verwijzen zonder het weer te geven
 
 De laatste verwijzing is bedoeld voor mediabestanden die geen afbeelding zijn.",
@@ -1375,7 +1523,7 @@ De laatste verwijzing is bedoeld voor mediabestanden die geen afbeelding zijn.",
 'uploadlog'                   => 'uploadlogboek',
 'uploadlogpage'               => 'Uploadlogboek',
 'uploadlogpagetext'           => 'Hieronder staan de nieuwste bestanden.
-Zie de [[Special:NewImages|galerij met nieuwe bestanden]] voor een visueler overzicht.',
+Zie de [[Special:NewFiles|galerij met nieuwe bestanden]] voor een visueler overzicht.',
 'filename'                    => 'Bestandsnaam',
 'filedesc'                    => 'Beschrijving',
 'fileuploadsummary'           => 'Samenvatting:',
@@ -1400,31 +1548,33 @@ Toegelaten {{PLURAL:\$3|bestandstype is|bestandstypes zijn}} \$2.",
 'emptyfile'                   => 'Het bestand dat u hebt geüpload lijkt leeg te zijn.
 Dit zou kunnen komen door een typefout in de bestandsnaam.
 Ga na of u dit bestand werkelijk bedoelde te uploaden.',
-'fileexists'                  => 'Er bestaat al een bestand met deze naam.
-Controleer <strong><tt>$1</tt></strong> als u niet zeker weet of u het huidige bestand wilt overschrijven.',
-'filepageexists'              => 'De beschrijvingspagina voor dit bestand bestaat al op <strong><tt>$1</tt></strong>, maar er bestaat geen bestand met deze naam.
+'fileexists'                  => "Er bestaat al een bestand met deze naam.
+Controleer '''<tt>$1</tt>''' als u niet zeker weet of u het huidige bestand wilt overschrijven.",
+'filepageexists'              => "De beschrijvingspagina voor dit bestand bestaat al op '''<tt>$1</tt>''', maar er bestaat geen bestand met deze naam.
 De samenvatting die u hebt opgegeven zal niet op de beschrijvingspagina verschijnen.
-Bewerk de pagina handmatig om uw beschrijving daar weer te geven.',
-'fileexists-extension'        => 'Een bestand met dezelfde naam bestaat al:<br />
-Naam van het geüploade bestand: <strong><tt>$1</tt></strong><br />
-Naam van het bestaande bestand: <strong><tt>$2</tt></strong><br />
-Kies een andere naam.',
+Bewerk de pagina handmatig om uw beschrijving daar weer te geven.",
+'fileexists-extension'        => "Een bestand met dezelfde naam bestaat al:<br />
+Naam van het geüploade bestand: '''<tt>$1</tt>'''<br />
+Naam van het bestaande bestand: '''<tt>$2</tt>'''<br />
+Kies een andere naam.",
 'fileexists-thumb'            => "<center>'''Bestaande afbeelding'''</center>",
-'fileexists-thumbnail-yes'    => 'Het bestand lijkt een verkleinde versie te zijn <i>(miniatuurafbeelding)</i>.
-Controleer het bestand <strong><tt>$1</tt></strong>.<br />
-Als het gecontroleerde bestand dezelfde afbeelding van oorspronkelijke grootte is, is het niet noodzakelijk een extra miniatuurafbeelding te uploaden.',
-'file-thumbnail-no'           => 'De bestandsnaam begint met <strong><tt>$1</tt></strong>.
-Het lijkt een verkleinde afbeelding te zijn <i>(miniatuurafbeelding)</i>.
+'fileexists-thumbnail-yes'    => "Het bestand lijkt een verkleinde versie te zijn ''(miniatuurafbeelding)''.
+Controleer het bestand '''<tt>$1</tt>'''.<br />
+Als het gecontroleerde bestand dezelfde afbeelding van oorspronkelijke grootte is, is het niet noodzakelijk een extra miniatuurafbeelding te uploaden.",
+'file-thumbnail-no'           => "De bestandsnaam begint met '''<tt>$1</tt>'''.
+Het lijkt een verkleinde afbeelding te zijn ''(miniatuurafbeelding)''.
 Als u deze afbeelding in volledige resolutie hebt, upload die afbeelding dan.
-Wijzig anders de bestandsnaam.',
-'fileexists-forbidden'        => 'Er bestaat al een bestand met deze naam.
+Wijzig anders de bestandsnaam.",
+'fileexists-forbidden'        => 'Er bestaat al een bestand met deze naam, en dat kan niet overschreven worden.
 Upload uw bestand onder een andere naam.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Er bestaat al een bestand met deze naam bij de gedeelte bestanden.
 Als u het bestand alsnog wilt uploaden, ga dan terug en kies een andere naam.
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Dit bestand is indentiek aan {{PLURAL:$1|het volgende bestand|de volgende bestanden}}:',
-'successfulupload'            => 'De upload is geslaagd',
+'file-deleted-duplicate'      => 'Een bestand dat identiek is aan dit bestand ([[$1]]) is voorheen verwijderd.
+Raadpleeg het verwijderingslogboek voordat u verder gaat.',
+'successfulupload'            => 'Het bestand is toegevoegd',
 'uploadwarning'               => 'Uploadwaarschuwing',
 'savefile'                    => 'Bestand opslaan',
 'uploadedimage'               => 'heeft "[[$1]]" geüpload',
@@ -1445,8 +1595,8 @@ Raadpleeg het $1 voordat u het opnieuw toevoegt.',
 
 Controleer of het inderdaad uw bedoeling is dit bestand te uploaden.
 Het verwijderingslogboek van dit bestand kunt u hier zien:",
-'filename-bad-prefix'         => 'De naam van het bestand dat u aan het uploaden bent begint met <strong>"$1"</strong>, wat een niet-beschrijvende naam is die meestal automatisch door een digitale camera wordt gegeven.
-Kies een duidelijke naam voor uw bestand.',
+'filename-bad-prefix'         => "De naam van het bestand dat u aan het uploaden bent begint met '''\"\$1\"''', wat een niet-beschrijvende naam is die meestal automatisch door een digitale camera wordt gegeven.
+Kies een duidelijke naam voor uw bestand.",
 'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
 # De syntaxis is als volgt:
 #   * Alle tekst vanaf het karakter "#" tot het einde van de regel wordt gezien als opmerking
@@ -1487,20 +1637,21 @@ U kunt het misschien proberen als het minder druk is.',
 'upload_source_url'  => ' (een geldige, publiek toegankelijke URL)',
 'upload_source_file' => ' (een bestand op uw computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Op deze speciale pagina zijn alle toegevoegde bestanden te bekijken.
+# Special:ListFiles
+'listfiles-summary'     => 'Op deze speciale pagina zijn alle toegevoegde bestanden te bekijken.
 Standaard worden de laatst toegevoegde bestanden bovenaan de lijst weergegeven.
 Klikken op een kolomkop verandert de sortering.',
-'imagelist_search_for'  => 'Zoeken naar bestand:',
+'listfiles_search_for'  => 'Zoeken naar bestand:',
 'imgfile'               => 'bestand',
-'imagelist'             => 'Bestandslijst',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Naam',
-'imagelist_user'        => 'Gebruiker',
-'imagelist_size'        => 'Grootte (bytes)',
-'imagelist_description' => 'Beschrijving',
-
-# Image description page
+'listfiles'             => 'Bestandslijst',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Naam',
+'listfiles_user'        => 'Gebruiker',
+'listfiles_size'        => 'Grootte (bytes)',
+'listfiles_description' => 'Beschrijving',
+'listfiles_count'       => 'Versies',
+
+# File description page
 'filehist'                       => 'Bestandsgeschiedenis',
 'filehist-help'                  => 'Klik op een datum/tijd om het bestand te zien zoals het destijds was.',
 'filehist-deleteall'             => 'alle versies verwijderen',
@@ -1508,19 +1659,25 @@ Klikken op een kolomkop verandert de sortering.',
 'filehist-revert'                => 'terugdraaien',
 'filehist-current'               => 'huidige versie',
 'filehist-datetime'              => 'Datum/tijd',
+'filehist-thumb'                 => 'Miniatuurafbeelding',
+'filehist-thumbtext'             => 'Miniatuurafbeelding voor versie per $1',
+'filehist-nothumb'               => 'Geen miniatuurafbeelding',
 'filehist-user'                  => 'Gebruiker',
 'filehist-dimensions'            => 'Afmetingen',
 'filehist-filesize'              => 'Bestandsgrootte',
 'filehist-comment'               => 'Opmerking',
 'imagelinks'                     => 'Bestandsverwijzingen',
 'linkstoimage'                   => "Dit bestand wordt op de volgende {{PLURAL:$1|pagina|$1 pagina's}} gebruikt:",
+'linkstoimage-more'              => 'Er {{PLURAL:$2|is|zijn}} meer dan $1 {{PLURAL:$1|verwijzing|verwijzingen}} naar dit bestand.
+De volgende lijst geeft alleen de eerste {{PLURAL:$1|verwijzing|$1 verwijzingen}} naar dit bestand weer.
+Er is ook een [[Special:WhatLinksHere/$2|volledige lijst]].',
 'nolinkstoimage'                 => 'Geen enkele pagina gebruikt dit bestand.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Meer verwijzingen]] naar dit bestand bekijken.',
 'redirectstofile'                => '{{PLURAL:$1|Het volgende bestand verwijst|De volgende $1 bestanden verwijzen}} door naar dit bestand:',
-'duplicatesoffile'               => '{{PLURAL:$1|Het volgende bestand is|De volgende $1 bestanden zijn}} identiek aan dit bestand:',
+'duplicatesoffile'               => '{{PLURAL:$1|Het volgende bestand is|De volgende $1 bestanden zijn}} identiek aan dit bestand ([[Special:FileDuplicateSearch/$2|meer details]]):',
 'sharedupload'                   => 'Dit bestand is een gedeelde upload en kan ook door andere projecten gebruikt worden.',
 'shareduploadwiki'               => 'Zie de $1 voor verdere informatie.',
-'shareduploadwiki-desc'          => 'De $1 in de gedeelde bestandsbank wordt hieronder weergegeven.',
+'shareduploadwiki-desc'          => 'De beschijving in de $1 wordt hieronder weergegeven.',
 'shareduploadwiki-linktext'      => 'bestandsbeschrijving',
 'shareduploadduplicate'          => 'Dit bestand is identiek aan $1 in de gedeelde mediabank.',
 'shareduploadduplicate-linktext' => 'een ander bestand',
@@ -1544,7 +1701,7 @@ Klikken op een kolomkop verandert de sortering.',
 # File deletion
 'filedelete'                  => '"$1" verwijderen',
 'filedelete-legend'           => 'Bestand verwijderen',
-'filedelete-intro'            => "U bent '''[[Media:$1|$1]]''' aan het verwijderen.",
+'filedelete-intro'            => "U staat op het punt om het bestand '''[[Media:$1|$1]]''' te verwijderen, inclusief alle eerdere versies.",
 'filedelete-intro-old'        => "U bent de versie van '''[[Media:$1|$1]]''' van [$4 $3, $2] aan het verwijderen.",
 'filedelete-comment'          => 'Opmerking:',
 'filedelete-submit'           => 'Verwijderen',
@@ -1552,7 +1709,6 @@ Klikken op een kolomkop verandert de sortering.',
 'filedelete-success-old'      => "De versie van '''[[Media:$1|$1]]''' van $3, $2 is verwijderd.",
 'filedelete-nofile'           => "'''$1''' bestaat niet.",
 'filedelete-nofile-old'       => "Er is geen versie van '''$1''' in het archief met de aangegeven eigenschappen.",
-'filedelete-iscurrent'        => 'U probeert de nieuwste versie van dit bestand te verwijderen. Plaats alstublieft een oudere versie terug.',
 'filedelete-otherreason'      => 'Andere reden:',
 'filedelete-reason-otherlist' => 'Andere reden',
 'filedelete-reason-dropdown'  => '*Veelvoorkomende redenen voor verwijdering
@@ -1571,7 +1727,7 @@ Invoer: contenttype/subtype, bijvoorbeeld <tt>image/jpeg</tt>.',
 'unwatchedpages' => "Pagina's die niet op een volglijst staan",
 
 # List redirects
-'listredirects' => 'Lijst van doorverwijzingen',
+'listredirects' => 'Doorverwijzingenlijst',
 
 # Unused templates
 'unusedtemplates'     => 'Ongebruikte sjablonen',
@@ -1581,28 +1737,31 @@ Vergeet niet de "Verwijzingen naar deze pagina" te controleren alvorens dit sjab
 
 # Random page
 'randompage'         => 'Willekeurige pagina',
-'randompage-nopages' => "Er zijn geen pagina's in deze naamruimte.",
+'randompage-nopages' => 'Er zijn geen pagina\'s in de naamruimte "$1".',
 
 # Random redirect
 'randomredirect'         => 'Willekeurige doorverwijzing',
-'randomredirect-nopages' => 'Er zijn geen doorverwijzingen in deze naamruimte.',
+'randomredirect-nopages' => 'Er zijn geen doorverwijzingen in de naamruimte "$1".',
 
 # Statistics
-'statistics'             => 'Statistieken',
-'sitestats'              => 'Statistieken van {{SITENAME}}',
-'userstats'              => 'Gebruikerstatistieken',
-'sitestatstext'          => "In de database {{PLURAL:$1|staat 1 pagina|staan '''$1''' pagina's}}, inclusief overlegpagina's, pagina's over {{SITENAME}}, beginnetjes, doorverwijzingen en andere pagina's die waarschijnlijk geen content zijn.
-Er {{PLURAL:$2|is waarschijnlijk 1 pagina|zijn waarschijnlijk '''$2''' pagina's}} met een echte inhoud.
-
-Er {{PLURAL:$8|is '''1''' bestand|zijn '''$8''' bestanden}} toegevoegd.
-
-Er {{PLURAL:$3|is '''1''' pagina|zijn '''$3''' pagina's}} weergegeven en '''$4''' {{PLURAL:$4|bewerking|bewerkingen}} gemaakt sinds {{SITENAME}} is opgezet.
-Dat komt uit op gemiddeld '''$5''' bewerkingen per pagina en '''$6''' weergegeven pagina's per bewerking.
-
-De lengte van de [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] is '''$7'''.",
-'userstatstext'          => "Er {{PLURAL:$1|is '''1''' geregistreerde gebruiker|zijn '''$1''' geregistreerde gebruikers}}, waarvan er
-'''$2''' (of '''$4%''') $5rechten {{PLURAL:$2|heeft|hebben}}.",
-'statistics-mostpopular' => "Meest bekeken pagina's",
+'statistics'                   => 'Statistieken',
+'statistics-header-pages'      => 'Paginastatistieken',
+'statistics-header-edits'      => 'Bewerkingsstatistieken',
+'statistics-header-views'      => 'Paginaweergavestatistieken',
+'statistics-header-users'      => 'Gebruikerstatistieken',
+'statistics-articles'          => "Inhoudelijke pagina's",
+'statistics-pages'             => "Pagina's",
+'statistics-pages-desc'        => "Alle pagina's in de wiki, inclusief overlegpagina's, doorverwijzingen, enzovoort.",
+'statistics-files'             => 'Bestanden',
+'statistics-edits'             => 'Paginabewerkingen sinds het begin van {{SITENAME}}',
+'statistics-edits-average'     => 'Gemiddeld aantal bewerkingen per pagina',
+'statistics-views-total'       => "Totaal aantal weergegeven pagina's",
+'statistics-views-peredit'     => "Weergegeven pagina's per bewerking",
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Jobqueuelengte]',
+'statistics-users'             => 'Geregistreerde [[Special:ListUsers|gebruikers]]',
+'statistics-users-active'      => 'Actieve gebruikers',
+'statistics-users-active-desc' => 'Gebruikers die in de afgelopen {{PLURAL:$1|dag|$1 dagen}} een handeling hebben uitgevoerd',
+'statistics-mostpopular'       => "Meest bekeken pagina's",
 
 'disambiguations'      => "Doorverwijspagina's",
 'disambiguationspage'  => 'Template:Doorverwijspagina',
@@ -1618,7 +1777,7 @@ Meestal is de laatste pagina het eigenlijke doel.",
 'double-redirect-fixer'      => 'Doorverwijzingen opschonen',
 
 'brokenredirects'        => 'Onjuiste doorverwijzingen',
-'brokenredirectstext'    => "Hieronder staan doorverwijspagina's die een doorverwijzing bevatten naar een niet-bestaande pagina.",
+'brokenredirectstext'    => "De onderstaande doorverwijzigingen verwijzen naar niet-bestaande pagina's.",
 'brokenredirects-edit'   => '(bewerken)',
 'brokenredirects-delete' => '(verwijderen)',
 
@@ -1649,7 +1808,8 @@ De pagina's zijn ook niet als sjabloon opgenomen.",
 'popularpages'            => "Veel bekeken pagina's",
 'wantedcategories'        => 'Niet-bestaande categorieën met de meeste verwijzingen',
 'wantedpages'             => "Niet-bestaande pagina's met verwijzingen",
-'missingfiles'            => 'Niet-bestaande bestanden met verwijzingen',
+'wantedfiles'             => 'Niet-bestaande bestanden met verwijzingen',
+'wantedtemplates'         => 'Niet-bestaande sjablonen met verwijzingen',
 'mostlinked'              => "Pagina's waar het meest naar verwezen wordt",
 'mostlinkedcategories'    => 'Categorieën waar het meest naar verwezen wordt',
 'mostlinkedtemplates'     => 'Meestgebruikte sjablonen',
@@ -1663,12 +1823,15 @@ De pagina's zijn ook niet als sjabloon opgenomen.",
 'deadendpagestext'        => "De onderstaande pagina's verwijzen niet naar andere pagina's in deze wiki.",
 'protectedpages'          => "Beveiligde pagina's",
 'protectedpages-indef'    => 'Alleen blokkades zonder verloopdatum',
+'protectedpages-cascade'  => 'Alleen beveiligingen met de cascade-optie',
 'protectedpagestext'      => "De volgende pagina's zijn beveiligd en kunnen niet bewerkt of hernoemd worden",
 'protectedpagesempty'     => "Er zijn momenteel geen pagina's beveiligd die aan deze voorwaarden voldoen.",
-'protectedtitles'         => 'Beveiligde titels',
-'protectedtitlestext'     => 'De volgende titels zijn beveiligd en kunnen niet aangemaakt worden',
+'protectedtitles'         => 'Beveiligde paginanamen',
+'protectedtitlestext'     => 'De volgende paginanamen zijn beveiligd en kunnen niet aangemaakt worden',
 'protectedtitlesempty'    => 'Er zijn momenteel geen paginannamen beveiligd die aan deze voorwaarden voldoen.',
 'listusers'               => 'Gebruikerslijst',
+'listusers-editsonly'     => 'Alleen gebruikers met bewerkingen weergeven',
+'usereditcount'           => '$1 {{PLURAL:$1|bewerking|bewerkingen}}',
 'newpages'                => "Nieuwe pagina's",
 'newpages-username'       => 'Gebruikersnaam:',
 'ancientpages'            => "Oudste pagina's",
@@ -1691,14 +1854,14 @@ Een bestand kan hier dus ten onrechte opgenomen zijn.',
 'booksources-search-legend' => 'Bronnen en informatie over een boek zoeken',
 'booksources-go'            => 'Zoeken',
 'booksources-text'          => 'Hieronder staat een lijst met koppelingen naar andere websites die nieuwe of gebruikte boeken verkopen, en die wellicht meer informatie over het boek dat u zoekt hebben:',
+'booksources-invalid-isbn'  => 'Het ingegeven ISBN lijkt niet geldig te zijn.
+Controleer of u wellicht een fout hebt gemaakt bij de invoer.',
 
 # Special:Log
 'specialloguserlabel'  => 'Gebruiker:',
 'speciallogtitlelabel' => 'Paginanaam:',
 'log'                  => 'Logboeken',
 'all-logs-page'        => 'Alle logboeken',
-'log-search-legend'    => 'Zoek logboeken',
-'log-search-submit'    => 'OK',
 'alllogstext'          => 'Dit is het gecombineerde logboek van {{SITENAME}}.
 U kunt ook kiezen voor specifieke logboeken en filteren op gebruiker (hoofdlettergevoelig) en paginanaam (hoofdlettergevoelig).',
 'logempty'             => 'Er zijn geen regels in het logboek die voldoen aan deze criteria.',
@@ -1710,6 +1873,7 @@ U kunt ook kiezen voor specifieke logboeken en filteren op gebruiker (hoofdlette
 'nextpage'          => 'Volgende pagina ($1)',
 'prevpage'          => 'Vorige pagina ($1)',
 'allpagesfrom'      => "Pagina's bekijken vanaf:",
+'allpagesto'        => "Pagina's bekijken tot:",
 'allarticles'       => "Alle pagina's",
 'allinnamespace'    => "Alle pagina's (naamruimte $1)",
 'allnotinnamespace' => "Alle pagina's (niet in naamruimte $1)",
@@ -1730,49 +1894,77 @@ Zie ook [[Special:WantedCategories|niet-bestaande categorieën met verwijzingen]
 'special-categories-sort-count' => 'op aantal sorteren',
 'special-categories-sort-abc'   => 'alfabetisch sorteren',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Verwijderde gebruikersbijdragen',
+
+# Special:LinkSearch
+'linksearch'       => 'Externe verwijzingen',
+'linksearch-pat'   => 'Zoekpatroon:',
+'linksearch-ns'    => 'Naamruimte:',
+'linksearch-ok'    => 'Zoeken',
+'linksearch-text'  => 'Wildcards zoals "*.wikipedia.org" of "*.org" zijn toegestaan.<br />
+Ondersteunde protocollen: <tt>$1</tt>',
+'linksearch-line'  => '$1 heeft een verwijzing in $2',
+'linksearch-error' => 'Wildcards zijn alleen toegestaan aan het begin van een hostnaam.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Gebruikers bekijken vanaf:',
 'listusers-submit'   => 'Weergeven',
 'listusers-noresult' => 'Geen gebruiker gevonden.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logboek nieuwe gebruikers',
+'newuserlogpagetext'          => 'Hieronder staan de nieuw ingeschreven gebruikers',
+'newuserlog-byemail'          => 'wachtwoord is verzonden per e-mail',
+'newuserlog-create-entry'     => 'Nieuwe gebruiker',
+'newuserlog-create2-entry'    => 'heeft gebruiker $1 ingeschreven',
+'newuserlog-autocreate-entry' => 'Gebruiker automatisch aangemaakt',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Rechten van gebruikersgroepen',
-'listgrouprights-summary'  => 'Op deze pagina staan de gebruikersgroepen in deze wiki beschreven, met hun bijbehorende rechten.
+'listgrouprights'                 => 'Rechten van gebruikersgroepen',
+'listgrouprights-summary'         => 'Op deze pagina staan de gebruikersgroepen in deze wiki beschreven, met hun bijbehorende rechten.
 Er kan [[{{MediaWiki:Listgrouprights-helppage}}|extra informatie]] over individuele rechten aanwezig zijn.',
-'listgrouprights-group'    => 'Groep',
-'listgrouprights-rights'   => 'Rechten',
-'listgrouprights-helppage' => 'Help:Gebruikersrechten',
-'listgrouprights-members'  => '(ledenlijst)',
+'listgrouprights-group'           => 'Groep',
+'listgrouprights-rights'          => 'Rechten',
+'listgrouprights-helppage'        => 'Help:Gebruikersrechten',
+'listgrouprights-members'         => '(ledenlijst)',
+'listgrouprights-addgroup'        => 'Kan gebruikers aan deze {{PLURAL:$2|groep|groepen}} toevoegen: $1',
+'listgrouprights-removegroup'     => 'Kan gebruikers uit deze {{PLURAL:$2|groep|groepen}} verwijderen: $1',
+'listgrouprights-addgroup-all'    => 'Kan gebruikers aan alle groepen toevoegen',
+'listgrouprights-removegroup-all' => 'Kan gebruikers uit alle groepen verwijderen',
 
 # E-mail user
-'mailnologin'     => 'Geen verzendadres beschikbaar',
-'mailnologintext' => 'U moet [[Special:UserLogin|aangemeld]] zijn en een geldig e-mailadres in uw [[Special:Preferences|voorkeuren]] vermelden om andere gebruikers te kunnen e-mailen.',
-'emailuser'       => 'Deze gebruiker e-mailen',
-'emailpage'       => 'Gebruiker e-mailen',
-'emailpagetext'   => 'Via dit formulier kunt u een e-mail aan deze gebruiker verzenden.
+'mailnologin'      => 'Geen verzendadres beschikbaar',
+'mailnologintext'  => 'U moet [[Special:UserLogin|aangemeld]] zijn en een geldig e-mailadres in uw [[Special:Preferences|voorkeuren]] vermelden om andere gebruikers te kunnen e-mailen.',
+'emailuser'        => 'Deze gebruiker e-mailen',
+'emailpage'        => 'Gebruiker e-mailen',
+'emailpagetext'    => 'Via dit formulier kunt u een e-mail aan deze gebruiker verzenden.
 Het e-mailadres dat u hebt opgegeven bij [[Special:Preferences|uw voorkeuren]] wordt als afzender gebruikt.
 De ontvanger kan dus direct naar u reageren.',
-'usermailererror' => 'Foutmelding bij het verzenden:',
-'defemailsubject' => 'E-mail van {{SITENAME}}',
-'noemailtitle'    => 'Van deze gebruiker is geen e-mailadres bekend',
-'noemailtext'     => 'Deze gebruiker heeft geen e-mailadres opgegeven of wil geen e-mail ontvangen van andere gebruikers.',
-'emailfrom'       => 'Van:',
-'emailto'         => 'Aan:',
-'emailsubject'    => 'Onderwerp:',
-'emailmessage'    => 'Bericht:',
-'emailsend'       => 'Versturen',
-'emailccme'       => 'Een kopie van dit bericht naar mijn e-mailadres sturen.',
-'emailccsubject'  => 'Kopie van uw bericht aan $1: $2',
-'emailsent'       => 'E-mail verzonden',
-'emailsenttext'   => 'Uw e-mail is verzonden.',
-'emailuserfooter' => 'Deze e-mail is verstuurd door $1 aan $2 door de functie "Deze gebruiker e-mailen" van {{SITENAME}}.',
+'usermailererror'  => 'Foutmelding bij het verzenden:',
+'defemailsubject'  => 'E-mail van {{SITENAME}}',
+'noemailtitle'     => 'Van deze gebruiker is geen e-mailadres bekend',
+'noemailtext'      => 'Deze gebruiker heeft geen geldig e-mailadres opgegeven.',
+'nowikiemailtitle' => 'E-mail is niet toegestaan',
+'nowikiemailtext'  => 'Deze gebruiker wil geen e-mail ontvangen van andere gebruikers.',
+'email-legend'     => 'Een e-mail versturen naar een andere gebruiker van {{SITENAME}}',
+'emailfrom'        => 'Van:',
+'emailto'          => 'Aan:',
+'emailsubject'     => 'Onderwerp:',
+'emailmessage'     => 'Bericht:',
+'emailsend'        => 'Versturen',
+'emailccme'        => 'Een kopie van dit bericht naar mijn e-mailadres sturen.',
+'emailccsubject'   => 'Kopie van uw bericht aan $1: $2',
+'emailsent'        => 'E-mail verzonden',
+'emailsenttext'    => 'Uw e-mail is verzonden.',
+'emailuserfooter'  => 'Deze e-mail is verstuurd door $1 aan $2 door de functie "Deze gebruiker e-mailen" van {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Volglijst',
 'mywatchlist'          => 'Volglijst',
 'watchlistfor'         => "(voor '''$1''')",
 'nowatchlist'          => 'Uw volglijst is leeg.',
-'watchlistanontext'    => '$1 is verplicht om uw volglijst in te zien of te wijzigen.',
+'watchlistanontext'    => '$1 is noodzakelijk om uw volglijst in te zien of te wijzigen.',
 'watchnologin'         => 'U bent niet aangemeld',
 'watchnologintext'     => 'U dient [[Special:UserLogin|aangemeld]] te zijn om uw volglijst te bewerken.',
 'addedwatch'           => 'Toegevoegd aan volglijst',
@@ -1796,12 +1988,7 @@ Toekomstige bewerkingen van deze pagina en de bijbehorende overlegpagina worden
 'iteminvalidname'      => "Probleem met object '$1', ongeldige naam ...",
 'wlnote'               => 'Hieronder {{PLURAL:$1|staat de laaste wijziging|staan de laatste $1 wijzigingen}} in {{PLURAL:$2|het laatste uur|de laatste $2 uur}}.',
 'wlshowlast'           => 'Laatste $1 uur, $2 dagen bekijken ($3)',
-'watchlist-show-bots'  => 'Botbewerkingen weergeven',
-'watchlist-hide-bots'  => 'Botbewerkingen verbergen',
-'watchlist-show-own'   => 'Mijn bewerkingen weergeven',
-'watchlist-hide-own'   => 'Mijn bewerkingen verbergen',
-'watchlist-show-minor' => 'Kleine bewerkingen weergeven',
-'watchlist-hide-minor' => 'Kleine bewerkingen verbergen',
+'watchlist-options'    => 'Opties voor volglijst',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Bezig met plaatsen op volglijst ...',
@@ -1840,85 +2027,104 @@ U kunt uw volglijstinstellingen wijzigen op:
 Feedback en andere assistentie:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Deze pagina verwijderen',
-'confirm'                     => 'Bevestig',
-'excontent'                   => "De inhoud was: '$1'",
-'excontentauthor'             => 'inhoud was: "$1" ([[Special:Contributions/$2|$2]] was de enige auteur)',
-'exbeforeblank'               => "De inhoud was: '$1'",
-'exblank'                     => 'pagina was leeg',
-'delete-confirm'              => '"$1" verwijderen',
-'delete-legend'               => 'Verwijderen',
-'historywarning'              => 'Waarschuwing: de pagina die u wilt verwijderen heeft meerdere versies:',
-'confirmdeletetext'           => 'U staat op het punt een pagina te verwijderen, inclusief de geschiedenis.
+# Delete
+'deletepage'             => 'Deze pagina verwijderen',
+'confirm'                => 'Bevestig',
+'excontent'              => "De inhoud was: '$1'",
+'excontentauthor'        => 'inhoud was: "$1" ([[Special:Contributions/$2|$2]] was de enige auteur)',
+'exbeforeblank'          => "De inhoud was: '$1'",
+'exblank'                => 'pagina was leeg',
+'delete-confirm'         => '"$1" verwijderen',
+'delete-legend'          => 'Verwijderen',
+'historywarning'         => 'Waarschuwing: de pagina die u wilt verwijderen heeft meerdere versies:',
+'confirmdeletetext'      => 'U staat op het punt een pagina te verwijderen, inclusief de geschiedenis.
 Bevestig hieronder dat dit inderdaad uw bedoeling is, dat u de gevolgen begrijpt en dat de verwijdering overeenstemt met het [[{{MediaWiki:Policy-url}}|beleid]].',
-'actioncomplete'              => 'Handeling voltooid',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" is verwijderd.
+'actioncomplete'         => 'Handeling voltooid',
+'deletedtext'            => '"<nowiki>$1</nowiki>" is verwijderd.
 Zie het $2 voor een overzicht van recente verwijderingen.',
-'deletedarticle'              => 'verwijderde "[[$1]]"',
-'suppressedarticle'           => 'heeft "[[$1]]" verborgen',
-'dellogpage'                  => 'Verwijderingslogboek',
-'dellogpagetext'              => "Hieronder is een lijst van recent verwijderde pagina's en bestanden weergegeven.",
-'deletionlog'                 => 'Verwijderingslogboek',
-'reverted'                    => 'Eerdere versie hersteld',
-'deletecomment'               => 'Reden voor verwijderen:',
-'deleteotherreason'           => 'Andere/eventuele reden:',
-'deletereasonotherlist'       => 'Andere reden',
-'deletereason-dropdown'       => '*Veelvoorkomende verwijderingsredenen
+'deletedarticle'         => 'verwijderde "[[$1]]"',
+'suppressedarticle'      => 'heeft "[[$1]]" verborgen',
+'dellogpage'             => 'Verwijderingslogboek',
+'dellogpagetext'         => "Hieronder is een lijst van recent verwijderde pagina's en bestanden weergegeven.",
+'deletionlog'            => 'Verwijderingslogboek',
+'reverted'               => 'Eerdere versie hersteld',
+'deletecomment'          => 'Reden voor verwijderen:',
+'deleteotherreason'      => 'Andere/eventuele reden:',
+'deletereasonotherlist'  => 'Andere reden',
+'deletereason-dropdown'  => '*Veelvoorkomende verwijderingsredenen
 ** Op aanvraag van auteur
 ** Schending van auteursrechten
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Redenen voor verwijdering bewerken',
-'delete-toobig'               => "Deze pagina heeft een lange bewerkingsgeschiedenis, meer dan $1 {{PLURAL:$1|versie|versies}}.
+'delete-edit-reasonlist' => 'Redenen voor verwijdering bewerken',
+'delete-toobig'          => "Deze pagina heeft een lange bewerkingsgeschiedenis, meer dan $1 {{PLURAL:$1|versie|versies}}.
 Het verwijderen van dit soort pagina's is met rechten beperkt om het per ongeluk verstoren van de werking van {{SITENAME}} te voorkomen.",
-'delete-warning-toobig'       => 'Deze pagina heeft een lange bewerkingsgeschiedenis, meer dan $1 {{PLURAL:$1|versie|versies}}.
+'delete-warning-toobig'  => 'Deze pagina heeft een lange bewerkingsgeschiedenis, meer dan $1 {{PLURAL:$1|versie|versies}}.
 Het verwijderen van deze pagina kan de werking van de database van {{SITENAME}} verstoren.
 Wees voorzichtig.',
-'rollback'                    => 'Wijzigingen ongedaan maken',
-'rollback_short'              => 'Terugdraaien',
-'rollbacklink'                => 'terugdraaien',
-'rollbackfailed'              => 'Ongedaan maken van wijzigingen mislukt.',
-'cantrollback'                => 'Ongedaan maken van wijzigingen onmogelijk: deze pagina heeft slechts 1 auteur.',
-'alreadyrolled'               => 'Het is niet mogelijk om de bewerking van de pagina [[:$1]] door [[User:$2|$2]] ([[User talk:$2|overleg]] | [[Special:Contributions/$2|bijdragen]]) ongedaan te maken.
+
+# Rollback
+'rollback'         => 'Wijzigingen ongedaan maken',
+'rollback_short'   => 'Terugdraaien',
+'rollbacklink'     => 'terugdraaien',
+'rollbackfailed'   => 'Ongedaan maken van wijzigingen mislukt.',
+'cantrollback'     => 'Ongedaan maken van wijzigingen onmogelijk: deze pagina heeft slechts 1 auteur.',
+'alreadyrolled'    => 'Het is niet mogelijk om de bewerking van de pagina [[:$1]] door [[User:$2|$2]] ([[User talk:$2|overleg]]{{int:pipe-separator}}[[Special:Contributions/$2|bijdragen]]) ongedaan te maken.
 Iemand anders heeft deze pagina al bewerkt of hersteld naar een eerdere versie.
 
-De meest recente bewerking is gemaakt door [[User:$3|$3]] ([[User talk:$3|overleg]]| [[Special:Contributions/$3|bijdragen]]).',
-'editcomment'                 => 'Bewerkingssamenvatting: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Wijzigingen door [[Special:Contributions/$2|$2]] ([[User talk:$2|Overleg]]) hersteld tot de laatste versie door [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Wijzigingen door $1 teruggedraaid; laatste versie van $2 hersteld.',
-'sessionfailure'              => 'Er lijkt een probleem te zijn met uw aanmeldsessie.
+De meest recente bewerking is gemaakt door [[User:$3|$3]] ([[User talk:$3|overleg]]{{int:pipe-separator}}[[Special:Contributions/$3|bijdragen]]).',
+'editcomment'      => "De bewerkingssamenvatting was: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Wijzigingen door [[Special:Contributions/$2|$2]] ([[User talk:$2|Overleg]]) hersteld tot de laatste versie door [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Wijzigingen door $1 teruggedraaid; laatste versie van $2 hersteld.',
+'sessionfailure'   => 'Er lijkt een probleem te zijn met uw aanmeldsessie.
 Uw handeling is gestopt uit voorzorg tegen een beveiligingsrisico (dat bestaat uit mogelijke "hijacking" van deze sessie).
 Ga een pagina terug, laad die pagina opnieuw en probeer het nog eens.',
+
+# Protect
 'protectlogpage'              => 'Beveiligingslogboek',
 'protectlogtext'              => "Hieronder staan pagina's die recentelijk beveiligd zijn, of waarvan de beveiliging is opgeheven.
 Zie de [[Special:ProtectedPages|lijst met beveiligde pagina's]] voor alle beveiligde pagina's.",
 'protectedarticle'            => 'beveiligde "[[$1]]"',
 'modifiedarticleprotection'   => 'wijzigde beveiligingsniveau voor "[[$1]]"',
 'unprotectedarticle'          => 'heeft de beveiliging van "[[$1]]" opgeheven',
+'movedarticleprotection'      => 'heeft beveiligingsinstellingen verplaatst van "[[$2]]" naar "[[$1]]"',
 'protect-title'               => 'Instellen van beveiligingsniveau voor "$1"',
+'prot_1movedto2'              => '[[$1]] hernoemd naar [[$2]]',
 'protect-legend'              => 'Beveiliging bevestigen',
 'protectcomment'              => 'Opmerkingen:',
 'protectexpiry'               => 'Duur:',
 'protect_expiry_invalid'      => 'De aangegeven duur is ongeldig.',
 'protect_expiry_old'          => 'Verloopsdatum is in het verleden.',
 'protect-unchain'             => 'Hernoemen mogelijk maken',
-'protect-text'                => 'Hier kunt u het beveiligingsniveau voor de pagina <strong><nowiki>$1</nowiki></strong> bekijken en wijzigen.',
-'protect-locked-blocked'      => 'U kunt het beveiligingsniveau niet wijzigen terwijl u geblokkeerd bent.
-Hier zijn de huidige instellingen voor de pagina <strong>[[$1]]</strong>:',
-'protect-locked-dblock'       => 'Het beveiligingsniveau kan niet worden gewijzigd omdat de database gesloten is.
-Hier zijn de huidige instellingen voor de pagina <strong>[[$1]]</strong>:',
+'protect-text'                => "Hier kunt u het beveiligingsniveau voor de pagina '''<nowiki>$1</nowiki>''' bekijken en wijzigen.",
+'protect-locked-blocked'      => "U kunt het beveiligingsniveau niet wijzigen terwijl u geblokkeerd bent.
+Hier zijn de huidige instellingen voor de pagina '''[[$1]]''':",
+'protect-locked-dblock'       => "Het beveiligingsniveau kan niet worden gewijzigd omdat de database gesloten is.
+Hier zijn de huidige instellingen voor de pagina '''[[$1]]''':",
 'protect-locked-access'       => "'''U hebt geen rechten om het beveiligingsniveau te wijzigen.'''
-Dit zijn de huidige instellingen voor de pagina <strong>[[$1]]</strong>:",
+Dit zijn de huidige instellingen voor de pagina '''[[$1]]''':",
 'protect-cascadeon'           => "Deze pagina is beveiligd omdat die in de volgende {{PLURAL:$1|pagina|pagina's}} is opgenomen, die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie.
 Het beveiligingsniveau wijzigen heeft geen enkel effect.",
-'protect-default'             => '(standaard)',
+'protect-default'             => 'Toestaan voor alle gebruikers',
 'protect-fallback'            => 'Hiervoor is het recht "$1" nodig',
-'protect-level-autoconfirmed' => 'Alleen geregistreerde gebruikers',
+'protect-level-autoconfirmed' => 'Blokkeren voor nieuwe en anonieme gebruikers',
 'protect-level-sysop'         => 'Alleen beheerders',
 'protect-summary-cascade'     => 'cascade',
 'protect-expiring'            => 'verloopt op $1',
+'protect-expiry-indefinite'   => 'verloopt niet',
 'protect-cascade'             => "Cascadebeveiliging: hiermee worden alle pagina's en sjablonen die in deze pagina opgenomen zijn beveiligd (let op: dit kan grote gevolgen hebben)",
 'protect-cantedit'            => 'U kunt het beveiligingsniveau van deze pagina niet wijzigen, omdat u geen rechten hebt om het te bewerken.',
+'protect-othertime'           => 'Andere duur:',
+'protect-othertime-op'        => 'andere duur',
+'protect-existing-expiry'     => 'Bestaande verloopdatum: $2 $3',
+'protect-otherreason'         => 'Overige/additionele reden:',
+'protect-otherreason-op'      => 'overige/additionele reden',
+'protect-dropdown'            => '*Veelvoorkomende redenen voor beveiliging
+** Vandalisme
+** Spam
+** Bewerkingsoorlog
+** Preventieve beveiliging veelbezochte pagina',
+'protect-edit-reasonlist'     => 'Redenen voor beveiliging bewerken',
+'protect-expiry-options'      => '1 uur:1 hour,1 dag:1 day,1 week:1 week,2 weken:2 weeks,1 maand:1 month,3 maanden:3 months,6 maanden:6 months,1 jaar:1 year,onbeperkt:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Rechten:',
 'restriction-level'           => 'Beperkingsniveau:',
 'minimum-size'                => 'Min. grootte',
@@ -1941,7 +2147,7 @@ Het beveiligingsniveau wijzigen heeft geen enkel effect.",
 'undeletepage'                 => "Verwijderde pagina's bekijken en terugplaatsen",
 'undeletepagetitle'            => "'''Hieronder staan de verwijderde bewerkingen van [[:$1]]'''.",
 'viewdeletedpage'              => "Verwijderde pagina's bekijken",
-'undeletepagetext'             => "Hieronder staan pagina's die zijn verwijderd en vanuit het archief teruggeplaatst kunnen worden.",
+'undeletepagetext'             => "Hieronder {{PLURAL:$1|staat de pagina die verwijderd is|staan pagina's die zijn verwijderd}} en vanuit het archief teruggeplaatst {{PLURAL:$1|kan|kunnen}} worden.",
 'undelete-fieldset-title'      => 'Versies terugplaatsen',
 'undeleteextrahelp'            => "Om de hele pagina inclusief alle eerdere versies terug te plaatsen: laat alle hokjes onafgevinkt en klik op '''''Terugplaatsen'''''.
 Om slechts bepaalde versies terug te zetten: vink de terug te plaatsen versies aan en klik op '''''Terugplaatsen'''''.
@@ -1954,20 +2160,21 @@ Verwijder in die gevallen de meest recent verwijderde versie uit de selectie.',
 'undeletehistorynoadmin'       => 'Deze pagina is verwijderd.
 De reden hiervoor staat hieronder, samen met de details van de gebruikers die deze pagina hebben bewerkt vóór de verwijdering.
 De verwijderde inhoud van de pagina is alleen zichtbaar voor beheerders.',
-'undelete-revision'            => 'Verwijderde versie van $1 (per $2) door $3:',
+'undelete-revision'            => 'Verwijderde versie van $1 (per $4 om $5) door $3:',
 'undeleterevision-missing'     => 'Ongeldige of missende versie.
 Mogelijk hebt u een verkeerde verwijzing of is de versie hersteld of verwijderd uit het archief.',
 'undelete-nodiff'              => 'Geen eerdere versie gevonden.',
 'undeletebtn'                  => 'Terugplaatsen',
 'undeletelink'                 => 'terugplaatsen',
 'undeletereset'                => 'Herinstellen',
+'undeleteinvert'               => 'Omgekeerde selectie',
 'undeletecomment'              => 'Toelichting:',
 'undeletedarticle'             => '"[[$1]]" is teruggeplaatst',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|versie|versies}} teruggeplaatst',
 'undeletedrevisions-files'     => '{{PLURAL:$1|1 versie|$1 versies}} en {{PLURAL:$2|1 bestand|$2 bestanden}} teruggeplaatst',
 'undeletedfiles'               => '{{PLURAL:$1|1 bestand|$1 bestanden}} teruggeplaatst',
-'cannotundelete'               => 'Verwijderen mislukt.
-Misschien heeft een andere gebruiker de pagina al verwijderd.',
+'cannotundelete'               => 'Het terugplaatsen is mislukt.
+Misschien heeft een andere gebruiker de pagina al teruggeplaatst.',
 'undeletedpage'                => "<big>'''$1 is teruggeplaatst'''</big>
 
 In het [[Special:Log/delete|verwijderingslogboek]] staan recente verwijderingen en herstelhandelingen.",
@@ -1994,26 +2201,27 @@ $1',
 'blanknamespace' => '(Hoofdnaamruimte)',
 
 # Contributions
-'contributions' => 'Gebruikersbijdragen',
-'mycontris'     => 'Mijn bijdragen',
-'contribsub2'   => 'Voor $1 ($2)',
-'nocontribs'    => 'Geen wijzigingen gevonden die aan de gestelde criteria voldoen.',
-'uctop'         => '(laatste wijziging)',
-'month'         => 'Van maand (en eerder):',
-'year'          => 'Van jaar (en eerder):',
-
-'sp-contributions-newbies'     => 'Alleen de bijdragen van nieuwe gebruikers bekijken',
-'sp-contributions-newbies-sub' => 'Voor nieuwelingen',
-'sp-contributions-blocklog'    => 'Blokkeerlogboek',
-'sp-contributions-search'      => 'Zoeken naar bijdragen',
-'sp-contributions-username'    => 'IP-adres of gebruikersnaam:',
-'sp-contributions-submit'      => 'Bekijken',
+'contributions'       => 'Gebruikersbijdragen',
+'contributions-title' => 'Bijdragen van $1',
+'mycontris'           => 'Mijn bijdragen',
+'contribsub2'         => 'Voor $1 ($2)',
+'nocontribs'          => 'Geen wijzigingen gevonden die aan de gestelde criteria voldoen.',
+'uctop'               => '(laatste wijziging)',
+'month'               => 'Van maand (en eerder):',
+'year'                => 'Van jaar (en eerder):',
+
+'sp-contributions-newbies'       => 'Alleen de bijdragen van nieuwe gebruikers bekijken',
+'sp-contributions-newbies-sub'   => 'Voor nieuwelingen',
+'sp-contributions-newbies-title' => 'Bijdragen van nieuwe gebruikers',
+'sp-contributions-blocklog'      => 'Blokkeerlogboek',
+'sp-contributions-search'        => 'Zoeken naar bijdragen',
+'sp-contributions-username'      => 'IP-adres of gebruikersnaam:',
+'sp-contributions-submit'        => 'Bekijken',
 
 # What links here
 'whatlinkshere'            => 'Verwijzingen naar deze pagina',
 'whatlinkshere-title'      => 'Pagina\'s die verwijzen naar "$1"',
 'whatlinkshere-page'       => 'Pagina:',
-'linklistsub'              => '(Lijst van verwijzingen)',
 'linkshere'                => "De volgende pagina's verwijzen naar '''[[:$1]]''':",
 'nolinkshere'              => "Geen enkele pagina verwijst naar '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Geen enkele pagina in de gekozen naamruimte verwijst naar '''[[:$1]]'''.",
@@ -2059,8 +2267,10 @@ Geef hieronder een reden op (bijvoorbeeld welke pagina's gevandaliseerd zijn).",
 'ipbotherreason'                  => 'Andere/extra reden:',
 'ipbhidename'                     => 'Gebruiker in het blokkeerlogboek, de actieve blokkeerlijst en de gebruikerslijst verbergen',
 'ipbwatchuser'                    => 'Gebruikerspagina en overlegpagina op volglijst plaatsen',
+'ipballowusertalk'                => 'Deze gebruiker toestaan tijdens de blokkade de eigen overlegpagina te bewerken',
+'ipb-change-block'                => 'De gebruiker opnieuw blokkeren met deze instellingen',
 'badipaddress'                    => 'Geen geldig IP-adres',
-'blockipsuccesssub'               => 'Blokkering geslaagd',
+'blockipsuccesssub'               => 'De blokkering is ingesteld',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] is geblokkeerd.<br />
 Zie de [[Special:IPBlockList|Lijst van geblokkeerde IP-adressen]] voor recente blokkades.',
 'ipb-edit-dropdown'               => 'Lijst van redenen bewerken',
@@ -2068,14 +2278,18 @@ Zie de [[Special:IPBlockList|Lijst van geblokkeerde IP-adressen]] voor recente b
 'ipb-unblock'                     => 'Een gebruiker of IP-adres deblokkeren',
 'ipb-blocklist-addr'              => 'Bestaande blokkades voor $1',
 'ipb-blocklist'                   => 'Bestaande blokkades bekijken',
+'ipb-blocklist-contribs'          => 'Bijdragen van $1',
 'unblockip'                       => 'Gebruiker deblokkeren',
 'unblockiptext'                   => 'Gebruik het onderstaande formulier om opnieuw schrijftoegang te geven aan een geblokkeerde gebruiker of IP-adres.',
-'ipusubmit'                       => 'Blokkade van dit adres opheffen.',
+'ipusubmit'                       => 'Blokkade opheffen',
 'unblocked'                       => 'Blokkade van [[User:$1|$1]] is opgeheven',
 'unblocked-id'                    => 'Blokkade $1 is opgeheven',
 'ipblocklist'                     => 'Geblokkeerde IP-adressen en gebruikers',
 'ipblocklist-legend'              => 'Een geblokkeerde gebruiker zoeken',
 'ipblocklist-username'            => 'Gebruikersnaam of IP-adres:',
+'ipblocklist-sh-userblocks'       => 'gebruikersblokkades $1',
+'ipblocklist-sh-tempblocks'       => 'tijdelijke blokkades $1',
+'ipblocklist-sh-addressblocks'    => 'enkele IP-blokkades $1',
 'ipblocklist-submit'              => 'Zoeken',
 'blocklistline'                   => 'Op $1 blokkeerde $2: $3 ($4)',
 'infiniteblock'                   => 'onbeperkt',
@@ -2084,27 +2298,35 @@ Zie de [[Special:IPBlockList|Lijst van geblokkeerde IP-adressen]] voor recente b
 'noautoblockblock'                => 'autoblok uitgeschakeld',
 'createaccountblock'              => 'registreren gebruikers geblokkeerd',
 'emailblock'                      => 'e-mail geblokkeerd',
+'blocklist-nousertalk'            => 'kan eigen overlegpagina niet bewerken',
 'ipblocklist-empty'               => 'De blokkeerlijst is leeg.',
 'ipblocklist-no-results'          => 'Dit IP-adres of deze gebruikersnaam is niet geblokkeerd.',
 'blocklink'                       => 'blokkeren',
 'unblocklink'                     => 'deblokkeren',
+'change-blocklink'                => 'blokkade wijzigen',
 'contribslink'                    => 'bijdragen',
 'autoblocker'                     => "Automatisch geblokkeerd omdat het IP-adres overeenkomt met dat van [[User:\$1|\$1]], die geblokkeerd is om de volgende reden: \"'''\$2'''\"",
 'blocklogpage'                    => 'Blokkeerlogboek',
+'blocklog-fulllog'                => 'Volledige blokkeerlogboek',
 'blocklogentry'                   => 'blokkeerde "[[$1]]" voor de duur van $2 $3',
+'reblock-logentry'                => 'heeft de instellingen voor de blokkade voor [[$1]] gewijzigd. Deze verloopt nu op $2 om $3',
 'blocklogtext'                    => 'Hier ziet u een lijst van de recente blokkeringen en deblokkeringen.
 Automatische blokkeringen en deblokkeringen komen niet in het logboek.
-Zie de [[Special:IPBlockList|Ipblocklist]] voor geblokkeerde adressen.',
+Zie ook [[Special:IPBlockList|Geblokkeerde IP-adressen en gebruikers]].',
 'unblocklogentry'                 => 'heeft de blokkade van $1 opgeheven',
 'block-log-flags-anononly'        => 'alleen anoniemen',
 'block-log-flags-nocreate'        => 'registreren gebruikers geblokkeerd',
 'block-log-flags-noautoblock'     => 'autoblokkeren is uitgeschakeld',
 'block-log-flags-noemail'         => 'e-mail geblokkeerd',
+'block-log-flags-nousertalk'      => 'kan eigen overlegpagina niet bewerken',
 'block-log-flags-angry-autoblock' => 'uitgebreide automatische blokkade ingeschakeld',
 'range_block_disabled'            => 'De mogelijkheid voor beheerders om een groep IP-addressen te blokkeren is uitgeschakeld.',
 'ipb_expiry_invalid'              => 'Ongeldige duur.',
 'ipb_expiry_temp'                 => 'Blokkades voor verborgen gebruikers moeten permanent zijn.',
 'ipb_already_blocked'             => '"$1" is al geblokkeerd',
+'ipb-needreblock'                 => '== Deze gebruiker is al geblokkeerd ==
+$1 is al geblokkeerd.
+Wilt u de instellingen wijzigen?',
 'ipb_cant_unblock'                => 'Fout: blokkadenummer $1 niet gevonden.
 Misschien is de blokkade al opgeheven.',
 'ipb_blocked_as_range'            => 'Fout: het IP-adres $1 is niet direct geblokkeerd en de blokkade kan niet opgeheven worden.
@@ -2115,10 +2337,11 @@ De blokkade is onderdeel van de reeks $2, waarvan de blokkade wel opgeheven kan
 'proxyblocker-disabled'           => 'Deze functie is uitgeschakeld.',
 'proxyblockreason'                => 'Dit is een automatische preventieve blokkade omdat u gebruik maakt van een open proxyserver.
 Neem contact op met uw Internet-provider of uw helpdesk en stel die op de hoogte van dit ernstige beveiligingsprobleem.',
-'proxyblocksuccess'               => 'Geslaagd.',
+'proxyblocksuccess'               => 'Uitgevoerd.',
 'sorbsreason'                     => 'Uw IP-adres staat bekend als open proxyserver in de DNS-blacklist die {{SITENAME}} gebruikt.',
 'sorbs_create_account_reason'     => 'Uw IP-adres staat bekend als open proxyserver in de DNS-blacklist die {{SITENAME}} gebruikt.
 U kunt geen gebruiker registreren.',
+'cant-block-while-blocked'        => 'U kunt andere gebruikers niet blokkeren terwijl u zelf geblokkeerd bent.',
 
 # Developer tools
 'lockdb'              => 'Database blokkeren',
@@ -2134,9 +2357,9 @@ Bevestig dat u deze handeling wilt uitvoeren.",
 'lockbtn'             => 'Database blokkeren',
 'unlockbtn'           => 'Database vrijgeven',
 'locknoconfirm'       => 'U hebt uw keuze niet bevestigd via het vinkvakje.',
-'lockdbsuccesssub'    => 'Blokkeren database geslaagd',
-'unlockdbsuccesssub'  => 'Database vrijgegeven.',
-'lockdbsuccesstext'   => 'De database is geblokkeerd.<br />
+'lockdbsuccesssub'    => 'De database is afgesloten',
+'unlockdbsuccesssub'  => 'De database is vrijgegeven',
+'lockdbsuccesstext'   => 'De database is afgesloten.<br />
 Vergeet niet de [[Special:UnlockDB|database vrij te geven]] zodra u klaar bent met uw onderhoud.',
 'unlockdbsuccesstext' => 'De database is vrijgegeven.',
 'lockfilenotwritable' => 'Geen schrijfrechten op het databaselockbestand.
@@ -2144,13 +2367,13 @@ Om de database te kunnen blokkeren of vrij te geven, dient de webserver schrijfr
 'databasenotlocked'   => 'De database is niet geblokkeerd.',
 
 # Move page
-'move-page'               => '"$1" hernoemen',
-'move-page-legend'        => 'Pagina hernoemen',
-'movepagetext'            => "Door middel van het onderstaande formulier kunt u een pagina hernoemen.
+'move-page'                    => '"$1" hernoemen',
+'move-page-legend'             => 'Pagina hernoemen',
+'movepagetext'                 => "Door middel van het onderstaande formulier kunt u een pagina hernoemen.
 De geschiedenis gaat mee naar de nieuwe pagina.
 * De oude naam wordt automatisch een doorverwijzing naar de nieuwe pagina.
 * Verwijzingen naar de oude pagina worden niet aangepast.
-* De pagina's die doorverwijzen naar de oorspronkelijke titel worden automatisch bijgewerkt.
+* De pagina's die doorverwijzen naar de oorspronkelijke paginanaam worden automatisch bijgewerkt.
 Als u dit niet wenst, controleer dan of er geen [[Special:DoubleRedirects|dubbele]] of [[Special:BrokenRedirects|onjuiste doorverwijzingen]] zijn ontstaan.
 
 Een pagina kan '''alleen''' hernoemd worden als de nieuwe paginanaam niet bestaat of een doorverwijspagina zonder verdere geschiedenis is.
@@ -2158,49 +2381,61 @@ Een pagina kan '''alleen''' hernoemd worden als de nieuwe paginanaam niet bestaa
 '''WAARSCHUWING!'''
 Voor veel bekeken pagina's kan het hernoemen drastische en onvoorziene gevolgen hebben.
 Zorg ervoor dat u die gevolgen overziet voordat u deze handeling uitvoert.",
-'movepagetalktext'        => "De bijbehorende overlegpagina krijgt automatisch een andere naam, '''tenzij''':
+'movepagetalktext'             => "De bijbehorende overlegpagina krijgt automatisch een andere naam, '''tenzij''':
 * De overlegpagina onder de nieuwe naam al bestaat;
 * U het onderstaande vinkje deselecteert.",
-'movearticle'             => 'Te hernoemen pagina:',
-'movenotallowed'          => "U hebt geen rechten om pagina's te hernoemen.",
-'newtitle'                => 'Naar de nieuwe paginanaam:',
-'move-watch'              => 'Deze pagina volgen',
-'movepagebtn'             => 'Pagina hernoemen',
-'pagemovedsub'            => 'Hernoemen pagina geslaagd',
-'movepage-moved'          => '<big>\'\'\'"$1" is hernoemd naar "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'De pagina bestaat al of de paginanaam is ongeldig.
+'movearticle'                  => 'Te hernoemen pagina:',
+'movenologin'                  => 'Niet aangemeld',
+'movenologintext'              => 'U moet [[Special:UserLogin|aangemeld]] zijn om een pagina te hernoemen.',
+'movenotallowed'               => "U hebt geen rechten om pagina's te hernoemen.",
+'movenotallowedfile'           => 'U hebt geen rechten om bestanden te hernoemen.',
+'cant-move-user-page'          => "U hebt geen rechten om gebruikerspagina's te hernoemen.",
+'cant-move-to-user-page'       => 'U hebt geen rechten om een pagina naar een gebruikerspagina te hernoemen. Hernoemen naar een subpagina is wel mogelijk.',
+'newtitle'                     => 'Naar de nieuwe paginanaam:',
+'move-watch'                   => 'Deze pagina volgen',
+'movepagebtn'                  => 'Pagina hernoemen',
+'pagemovedsub'                 => 'De pagina is hernoemd',
+'movepage-moved'               => '<big>\'\'\'"$1" is hernoemd naar "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Er is een doorverwijzing aangemaakt.',
+'movepage-moved-noredirect'    => 'Er is geen doorverwijzing aangemaakt.',
+'articleexists'                => 'De pagina bestaat al of de paginanaam is ongeldig.
 Kies een andere paginanaam.',
-'cantmove-titleprotected' => 'U kunt geen pagina naar deze titel hernoemen, omdat de nieuwe titel beveiligd is tegen het aanmaken ervan.',
-'talkexists'              => "'''De pagina is hernoemd, maar de overlegpagina kon niet hernoemd worden omdat er al een pagina met de nieuwe naam bestaat.
+'cantmove-titleprotected'      => 'U kunt geen pagina naar deze paginaam hernoemen, omdat deze paginaam beveiligd is tegen het aanmaken ervan.',
+'talkexists'                   => "'''De pagina is hernoemd, maar de overlegpagina kon niet hernoemd worden omdat er al een pagina met de nieuwe naam bestaat.
 Combineer de overlegpagina's handmatig.'''",
-'movedto'                 => 'hernoemd naar',
-'movetalk'                => 'Bijbehorende overlegpagina hernoemen',
-'move-subpages'           => "Alle subpagina's hernoemen",
-'move-talk-subpages'      => "Alle subpagina's van overlegpagina's hernoemen",
-'movepage-page-exists'    => 'De pagina $1 bestaat al en kan niet automatisch verwijderd worden.',
-'movepage-page-moved'     => 'De pagina $1 is hernoemd naar $2.',
-'movepage-page-unmoved'   => 'De pagina $1 kon niet hernoemd worden naar $2.',
-'movepage-max-pages'      => "Het maximale aantal automatisch te hernoemen pagina's is bereikt ({{PLURAL:$1|$1|$1}}).
+'movedto'                      => 'hernoemd naar',
+'movetalk'                     => 'Bijbehorende overlegpagina hernoemen',
+'move-subpages'                => "Alle subpagina's hernoemen",
+'move-talk-subpages'           => "Alle subpagina's van overlegpagina's hernoemen",
+'movepage-page-exists'         => 'De pagina $1 bestaat al en kan niet automatisch verwijderd worden.',
+'movepage-page-moved'          => 'De pagina $1 is hernoemd naar $2.',
+'movepage-page-unmoved'        => 'De pagina $1 kon niet hernoemd worden naar $2.',
+'movepage-max-pages'           => "Het maximale aantal automatisch te hernoemen pagina's is bereikt ({{PLURAL:$1|$1|$1}}).
 De overige pagina's worden niet automatisch hernoemd.",
-'1movedto2'               => '[[$1]] hernoemd naar [[$2]]',
-'1movedto2_redir'         => '[[$1]] hernoemd over de doorverwijzing [[$2]]',
-'movelogpage'             => 'Hernoemingslogboek',
-'movelogpagetext'         => "Hieronder staan hernoemde pagina's.",
-'movereason'              => 'Reden:',
-'revertmove'              => 'terugdraaien',
-'delete_and_move'         => 'Verwijderen en hernoemen',
-'delete_and_move_text'    => '==Verwijdering nodig==
+'1movedto2'                    => '[[$1]] hernoemd naar [[$2]]',
+'1movedto2_redir'              => '[[$1]] hernoemd over de doorverwijzing [[$2]]',
+'move-redirect-suppressed'     => 'doorverwijzing onderdrukken',
+'movelogpage'                  => 'Hernoemingslogboek',
+'movelogpagetext'              => "Hieronder staan hernoemde pagina's.",
+'movereason'                   => 'Reden:',
+'revertmove'                   => 'terugdraaien',
+'delete_and_move'              => 'Verwijderen en hernoemen',
+'delete_and_move_text'         => '==Verwijdering nodig==
 Onder de naam "[[:$1]]" bestaat al een pagina.
 Wilt u deze verwijderen om plaats te maken voor de te hernoemen pagina?',
-'delete_and_move_confirm' => 'Ja, de pagina verwijderen',
-'delete_and_move_reason'  => 'Verwijderd in verband met hernoeming',
-'selfmove'                => 'U kunt een pagina niet hernoemen naar dezelfde paginanaam.',
-'immobile_namespace'      => 'De gewenste paginanaam is van een speciaal type.
-Een pagina kan niet hernoemd worden naar die naamruimte.',
-'imagenocrossnamespace'   => 'Een mediabestand kan niet naar een andere naamruimte verplaatst worden',
-'imagetypemismatch'       => 'De nieuwe bestandsextensie is niet gelijk aan het bestandstype',
-'imageinvalidfilename'    => 'De nieuwe bestandsnaam is ongeldig',
-'fix-double-redirects'    => 'Alle doorverwijzingen bijwerken die verwijzen naar de originele paginanaam',
+'delete_and_move_confirm'      => 'Ja, de pagina verwijderen',
+'delete_and_move_reason'       => 'Verwijderd in verband met hernoeming',
+'selfmove'                     => 'U kunt een pagina niet hernoemen naar dezelfde paginanaam.',
+'immobile-source-namespace'    => 'Pagina\'s in de naamruimte "$1" kunnen niet hernoemd worden',
+'immobile-target-namespace'    => 'Pagina\'s kunnen niet hernoemd worden naar de naamruimte "$1"',
+'immobile-target-namespace-iw' => 'Een interwikiverwijzing is geen geldige bestemming voor het hernoemen van een pagina.',
+'immobile-source-page'         => 'Deze pagina kan niet hernoemd worden.',
+'immobile-target-page'         => 'Het is niet mogelijk te hernoemen naar die paginanaam.',
+'imagenocrossnamespace'        => 'Een mediabestand kan niet naar een andere naamruimte verplaatst worden',
+'imagetypemismatch'            => 'De nieuwe bestandsextensie is niet gelijk aan het bestandstype',
+'imageinvalidfilename'         => 'De nieuwe bestandsnaam is ongeldig',
+'fix-double-redirects'         => 'Alle doorverwijzingen bijwerken die verwijzen naar de originele paginanaam',
+'move-leave-redirect'          => 'Een doorverwijzing achterlaten',
 
 # Export
 'export'            => 'Exporteren',
@@ -2209,7 +2444,7 @@ Dit exportbestand is daarna te importeren in een andere MediaWiki via de [[Speci
 
 Geef in het onderstaande veld de namen van de te exporteren pagina\'s op, één pagina per regel, en geef aan of u alle versies met de bewerkingssamenvatting of alleen de huidige versies met de bewerkingssamenvatting wilt exporteren.
 
-In het laatste geval kunt u ook een verwijzing gebruiken, bijvoorbeeld [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] voor de pagina "{{MediaWiki:Mainpage}}".',
+In het laatste geval kunt u ook een verwijzing gebruiken, bijvoorbeeld [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] voor de pagina "{{MediaWiki:Mainpage}}".',
 'exportcuronly'     => 'Alleen de laatste versie, niet de volledige geschiedenis',
 'exportnohistory'   => "----
 '''Let op:''' het exporteren van de gehele geschiedenis is uitgeschakeld wegens prestatieredenen.",
@@ -2225,7 +2460,7 @@ In het laatste geval kunt u ook een verwijzing gebruiken, bijvoorbeeld [[{{ns:sp
 'allmessagesdefault'        => 'Standaardinhoud',
 'allmessagescurrent'        => 'Huidige inhoud',
 'allmessagestext'           => 'Hieronder staan de systeemberichten uit de MediaWiki-naamruimte.
-Ga naar [http://www.mediawiki.org/wiki/Localisation MediaWiki-localisatie] en [http://translatewiki.net Betawiki] als u wilt bijdragen aan de algemene vertaling voor MediaWiki.',
+Ga naar [http://www.mediawiki.org/wiki/Localisation MediaWiki-lokalisatie] en [http://translatewiki.net translatewiki.net] als u wilt bijdragen aan de algemene vertaling voor MediaWiki.',
 'allmessagesnotsupportedDB' => "Deze pagina kan niet gebruikt worden omdat '''\$wgUseDatabaseMessages''' is uitgeschakeld.",
 'allmessagesfilter'         => 'Bericht naamfilter:',
 'allmessagesmodified'       => 'Alleen gewijzigde systeemteksten bekijken',
@@ -2245,9 +2480,12 @@ Ga naar [http://www.mediawiki.org/wiki/Localisation MediaWiki-localisatie] en [h
 'import-interwiki-text'      => 'Selecteer een wiki en paginanaam om te importeren.
 Versie- en auteursgegevens blijven hierbij bewaard.
 Alle transwiki-importhandelingen worden opgeslagen in het [[Special:Log/import|importlogboek]].',
+'import-interwiki-source'    => 'Bronwiki/pagina:',
 'import-interwiki-history'   => 'Volledige geschiedenis van deze pagina ook kopiëren',
 'import-interwiki-submit'    => 'Importeren',
 'import-interwiki-namespace' => 'Doelnaamruimte:',
+'import-upload-filename'     => 'Bestandsnaam:',
+'import-comment'             => 'Opmerking:',
 'importtext'                 => 'Gebruik de [[Special:Export|exportfunctie]] in de wiki waar de informatie vandaan komt, sla de uitvoer op uw eigen systeem op, en voeg die daarna hier toe.',
 'importstart'                => "Pagina's aan het importeren ...",
 'import-revision-count'      => '$1 {{PLURAL:$1|versie|versies}}',
@@ -2284,20 +2522,20 @@ De tijdelijke map is niet aanwezig.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|versie|versies}} van $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mijn gebruikerspagina',
+'tooltip-pt-userpage'             => 'Uw gebruikerspagina',
 'tooltip-pt-anonuserpage'         => 'Gebruikerspagina voor uw IP-adres',
-'tooltip-pt-mytalk'               => 'Mijn overlegpagina',
+'tooltip-pt-mytalk'               => 'Uw overlegpagina',
 'tooltip-pt-anontalk'             => 'Overlegpagina van de anonieme gebruiker van dit IP-adres',
 'tooltip-pt-preferences'          => 'Mijn voorkeuren',
 'tooltip-pt-watchlist'            => 'Pagina',
-'tooltip-pt-mycontris'            => 'Mijn bijdragen',
+'tooltip-pt-mycontris'            => 'Overzicht van uw bijdragen',
 'tooltip-pt-login'                => 'U wordt van harte uitgenodigd om u aan te melden als gebruiker, maar dit is niet verplicht',
 'tooltip-pt-anonlogin'            => 'U wordt van harte uitgenodigd om u aan te melden als gebruiker, maar dit is niet verplicht',
 'tooltip-pt-logout'               => 'Afmelden',
 'tooltip-ca-talk'                 => 'Overleg over deze pagina',
 'tooltip-ca-edit'                 => 'U kunt deze pagina bewerken.
 Gebruik de voorbeeldweergaveknop alvorens te bewaren.',
-'tooltip-ca-addsection'           => 'Een opmerking aan de overlegpagina toevoegen',
+'tooltip-ca-addsection'           => 'Nieuw kopje toevoegen',
 'tooltip-ca-viewsource'           => 'Deze pagina is beveiligd.
 U kunt wel de broncode bekijken.',
 'tooltip-ca-history'              => 'Eerdere versies van deze pagina',
@@ -2346,6 +2584,9 @@ Gebruik dit!',
 'tooltip-watch'                   => 'Deze pagina aan uw volglijst toevoegen',
 'tooltip-recreate'                => 'Deze pagina opnieuw aanmaken ondanks eerdere verwijdering',
 'tooltip-upload'                  => 'Uploaden',
+'tooltip-rollback'                => 'Met "terugdraaien" draait u met één klik de bewerking(en) terug van de laatste gebruiker die deze pagina heeft bewerkt.',
+'tooltip-undo'                    => 'Met "ongedaan maken" draait u deze bewerking terug en komt in het bewerkingsvenster.
+U kunt in de bewerkingssamenvatting een reden opgeven.',
 
 # Stylesheets
 'common.css'      => '/** CSS die hier wordt geplaatst heeft invloed op alle skins */',
@@ -2357,6 +2598,8 @@ Gebruik dit!',
 'chick.css'       => '/* CSS die hier wordt geplaatst heeft alleen invloed op de skin Chick */',
 'simple.css'      => '/* CSS die hier wordt geplaatst heeft alleen invloed op de skin Eenvoudig */',
 'modern.css'      => '/* CSS die hier wordt geplaatst heeft alleen invloed op de skin Modern */',
+'print.css'       => '/* CSS die hier wordt geplaatst heeft alleen invloed op de printuitvoer */',
+'handheld.css'    => '/* CSS die hier wordt geplaatst heeft alleen invloed op handheldapparaten gebaseerd op de skin die is ingesteld in $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => "/* JavaScript die hier wordt geplaatst heeft invloed op alle pagina's voor alle gebruikers */",
@@ -2375,12 +2618,12 @@ Gebruik dit!',
 'notacceptable'     => 'De wikiserver kan de gegevens niet leveren in een vorm die uw browser kan lezen.',
 
 # Attribution
-'anonymous'        => 'Anonieme gebruiker(s) van {{SITENAME}}',
+'anonymous'        => 'Anonieme {{PLURAL:$1|gebruiker|gebruikers}} van {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-gebruiker $1',
 'lastmodifiedatby' => 'Deze pagina is het laatst bewerkt op $2, $1 door $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Gebaseerd op werk van $1.',
 'others'           => 'anderen',
-'siteusers'        => '{{SITENAME}}-gebruiker(s) $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|gebruikers|gebruikers}} $1',
 'creditspage'      => 'Auteurspagina',
 'nocredits'        => 'Er is geen auteursinformatie beschikbaar voor deze pagina.',
 
@@ -2401,6 +2644,16 @@ Meestal wordt dit door een externe verwijzing op een zwarte lijst veroorzaakt.',
 'numauthors'     => 'Aantal auteurs (pagina): $1',
 'numtalkauthors' => 'Aantal verschilende auteurs (overlegpagina): $1',
 
+# Skin names
+'skinname-standard'    => 'Klassiek',
+'skinname-nostalgia'   => 'Nostalgie',
+'skinname-cologneblue' => 'Keuls blauw',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'MijnSkin',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Eenvoudig',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Altijd als PNG weergeven',
 'mw_math_simple' => 'HTML voor eenvoudige formules, anders PNG',
@@ -2421,11 +2674,12 @@ Meestal wordt dit door een externe verwijzing op een zwarte lijst veroorzaakt.',
 'markedaspatrollederror-noautopatrol' => 'U kunt uw eigen wijzigingen niet als gecontroleerd markeren.',
 
 # Patrol log
-'patrol-log-page'   => 'Markeerlogboek',
-'patrol-log-header' => 'Dit logboek bevat versies die gemarkeerd zijn als gecontroleerd.',
-'patrol-log-line'   => 'markeerde versie $1 van $2 als gecontroleerd $3',
-'patrol-log-auto'   => '(automatisch)',
-'patrol-log-diff'   => '$1',
+'patrol-log-page'      => 'Markeerlogboek',
+'patrol-log-header'    => 'Dit logboek bevat versies die gemarkeerd zijn als gecontroleerd.',
+'patrol-log-line'      => 'markeerde versie $1 van $2 als gecontroleerd $3',
+'patrol-log-auto'      => '(automatisch)',
+'patrol-log-diff'      => 'versie $1',
+'log-show-hide-patrol' => 'Markeerlogboek $1',
 
 # Image deletion
 'deletedrevision'                 => 'Oude versie $1 verwijderd.',
@@ -2442,6 +2696,9 @@ $1',
 'previousdiff' => '� Oudere bewerking',
 'nextdiff'     => 'Nieuwere bewerking →',
 
+# Visual comparison
+'visual-comparison' => 'Visuele vergelijking',
+
 # Media information
 'mediawarning'         => "'''Waarschuwing''': dit bestand bevat mogelijk programmacode die uw systeem schade kan berokkenen.<hr />",
 'imagemaxsize'         => 'Maximale grootte van afbeeldingen op beschrijvingspagina:',
@@ -2455,10 +2712,12 @@ $1',
 'show-big-image'       => 'Volledige resolutie',
 'show-big-image-thumb' => '<small>Afmetingen van deze weergave: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Nieuwe bestanden',
 'imagelisttext'         => "Hier volgt een lijst met '''$1''' {{PLURAL:$1|bestand|bestanden}} gesorteerd $2.",
 'newimages-summary'     => 'Op deze speciale pagina worden de meest recent toegevoegde bestanden weergegeven.',
+'newimages-legend'      => 'Bestandsnaam',
+'newimages-label'       => 'Bestandsnaam (of deel daarvan):',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'Er is niets te zien.',
 'ilsubmit'              => 'Zoeken',
@@ -2563,7 +2822,7 @@ Andere velden worden verborgen.
 'exif-exposureindex'               => 'Belichtingsindex',
 'exif-sensingmethod'               => 'Meetmethode',
 'exif-filesource'                  => 'Bestandsbron',
-'exif-scenetype'                   => 'Soort scene',
+'exif-scenetype'                   => 'Scènetype',
 'exif-cfapattern'                  => 'CFA-patroon',
 'exif-customrendered'              => 'Aangepaste beeldverwerking',
 'exif-exposuremode'                => 'Belichtingsinstelling',
@@ -2670,6 +2929,18 @@ Andere velden worden verborgen.
 'exif-lightsource-24'  => 'ISO-studiotungsten',
 'exif-lightsource-255' => 'Andere lichtbron',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flits is niet afgegaan',
+'exif-flash-fired-1'    => 'Met flitser',
+'exif-flash-return-0'   => 'geen stroboscoopontvangstfunctie',
+'exif-flash-return-2'   => 'geen stroboscoopontvangst gedetecteerd',
+'exif-flash-return-3'   => 'stroboscoopontvangst gedetecteerd',
+'exif-flash-mode-1'     => 'verplicht met flitser',
+'exif-flash-mode-2'     => 'flitser verplicht onderdrukt',
+'exif-flash-mode-3'     => 'automatische modus',
+'exif-flash-function-1' => 'Geen flitserfunctie',
+'exif-flash-redeye-1'   => 'filter rode ogen verwijderen',
+
 'exif-focalplaneresolutionunit-2' => 'inch',
 
 'exif-sensingmethod-1' => 'Niet gedefiniëerd',
@@ -2765,7 +3036,7 @@ Open die verwijzing om uw e-mailadres te bevestigen.',
 Als u recentelijk uw gebruiker hebt aangemaakt, wacht dan een paar minuten totdat die aankomt voordat u opnieuw een e-mail laat sturen.</div>',
 'confirmemail_send'        => 'Een bevestigingscode verzenden',
 'confirmemail_sent'        => 'Bevestigingscode verzonden.',
-'confirmemail_oncreate'    => 'Er is een bevestigingscode is naar uw e-mailadres verzonden.
+'confirmemail_oncreate'    => 'Er is een bevestigingscode naar uw e-mailadres verzonden.
 Deze code is niet nodig om u aan te melden, maar u dient deze wel te bevestigen voordat u de e-mailmogelijkheden van deze wiki kunt gebruiken.',
 'confirmemail_sendfailed'  => '{{SITENAME}} kon uw bevestigingscode niet verzenden.
 Controleer uw e-mailadres op ongeldige tekens.
@@ -2813,21 +3084,10 @@ $1</div>",
 Bevestig dat u de pagina opnieuw wilt aanmaken.",
 'recreate'            => 'Opnieuw aanmaken',
 
-# HTML dump
-'redirectingto' => 'Aan het doorverwijzen naar [[:$1]] ...',
-
 # action=purge
-'confirm_purge'        => 'De cache van deze pagina legen?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Zoeken naar pagina's die ''$1'' bevatten.",
-'searchnamed'      => "Zoeken naar pagina's met de naam ''$1''.",
-'articletitles'    => "Pagina's die met ''$1'' beginnen",
-'hideresults'      => 'Resultaten verbergen',
-'useajaxsearch'    => 'AJAX-zoeken gebruiken',
+'confirm-purge-top'    => 'De cache van deze pagina legen?',
+'confirm-purge-bottom' => 'Het opschonen van de cache zorgt ervoor dat de meest recente versie van een pagina wordt weergegeven.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� vorige pagina',
@@ -2847,10 +3107,10 @@ $1',
 'table_pager_empty'        => 'Geen resultaten',
 
 # Auto-summaries
-'autosumm-blank'   => 'Pagina leeggehaald',
+'autosumm-blank'   => 'De pagina is leeggehaald',
 'autosumm-replace' => "Tekst vervangen door '$1'",
 'autoredircomment' => 'Verwijst door naar [[$1]]',
-'autosumm-new'     => 'Nieuwe pagina: $1',
+'autosumm-new'     => "Nieuwe pagina aangemaakt met '$1'",
 
 # Size units
 'size-kilobytes' => '$1 kB',
@@ -2911,6 +3171,7 @@ U kunt ook [[Special:Watchlist/edit|het standaard bewerkingsscherm gebruiken]].'
 
 # Core parser functions
 'unknown_extension_tag' => 'Onbekende tag "$1"',
+'duplicate-defaultsort' => 'Waarschuwing: De standaardsortering "$2" krijgt voorrang voor de sortering "$1".',
 
 # Special:Version
 'version'                          => 'Softwareversie', # Not used as normal message but as header for the special page itself
@@ -2941,13 +3202,13 @@ U kunt ook [[Special:Watchlist/edit|het standaard bewerkingsscherm gebruiken]].'
 Afbeeldingen worden in hun volledige resolutie weergegeven.
 Andere bestandstypen worden direct in het met het MIME-type verbonden programma geopend.
 
-Voer de bestandsnaam in zonder het voorvoegsel "{{ns:image}}:".',
+Voer de bestandsnaam in zonder het voorvoegsel "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Duplicaatbestanden zoeken',
 'fileduplicatesearch-summary'  => 'Duplicaatbestanden zoeken op basis van de hashwaarde.
 
-Voer de bestandsnaam in zonder het voorvoegsel "{{ns:image}}:".',
+Voer de bestandsnaam in zonder het voorvoegsel "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Duplicaatbestanden zoeken',
 'fileduplicatesearch-filename' => 'Bestandsnaam:',
 'fileduplicatesearch-submit'   => 'Zoeken',
@@ -2977,4 +3238,13 @@ Voer de bestandsnaam in zonder het voorvoegsel "{{ns:image}}:".',
 'blankpage'              => 'Lege pagina',
 'intentionallyblankpage' => 'Deze pagina is bewust leeg gelaten en wordt gebruikt voor benchmarks, enzovoort.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Laat deze regel onveranderd<pre>
+#Zet hieronder reguliere expressiefragmenten (alleen het deel dat tussen de // staat)
+#Deze worden gehouden tegen de URL\'s van externe (gehotlinkte) afbeeldingen
+#Als de reguliere expressie van toegang is, wordt een afbeelding weergegeven, anders wordt alleen een verwijzing weergegeven
+#Regels die beginnen met "#" worden als opmerking behandeld
+
+#Zet alle reguliere expressiefragmenten boven deze regel. Laat deze regel onveranderd</pre>',
+
 );
diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index 8c357054..ebf5ca5f 100644
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -9,12 +9,12 @@
  * @author Eirik
  * @author Finnrind
  * @author Frokor
+ * @author Gunnernett
  * @author Guttorm Flatabø
  * @author H92
  * @author Harald Khan
  * @author Jon Harald Søby
  * @author Jorunn
- * @author Max sonnelid
  * @author Najami
  * @author Olve Utne
  * @author Ranveig
@@ -31,14 +31,6 @@
   * @see http://nn.wikipedia.org/w/index.php?title=Brukar:Dittaeva/LanguageNn.php&action=history
   */
 
-$skinNames = array(
-	'standard'    => 'Klassisk',
-	'nostalgia'   => 'Nostalgi',
-	'cologneblue' => 'Kölnerblå',
-	'myskin'      => 'MiDrakt',
-	'simple'      => 'Enkel',
-	'modern'      => 'Moderne',
-);
 
 $datePreferences = array(
 	'default',
@@ -97,10 +89,6 @@ $bookstoreList = array(
 	'Amazon.com'   => 'http://www.amazon.com/exec/obidos/ISBN=$1'
 );
 
-# Note to translators:
-#   Please include the English words as synonyms.  This allows people
-#   from other wikis to contribute more easily.
-#
 $magicWords = array(
 	#   ID                                 CASE  SYNONYMS
 	'redirect'               => array( 0,    '#redirect', '#omdiriger'                                              ),
@@ -154,8 +142,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Brukardiskusjon',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1-diskusjon',
-	NS_IMAGE          => 'Fil',
-	NS_IMAGE_TALK     => 'Fildiskusjon',
+	NS_FILE           => 'Fil',
+	NS_FILE_TALK      => 'Fildiskusjon',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki-diskusjon',
 	NS_TEMPLATE       => 'Mal',
@@ -167,83 +155,83 @@ $namespaceNames = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Doble_omdirigeringar' ),
+	'DoubleRedirects'           => array( 'Doble omdirigeringar' ),
 	'BrokenRedirects'           => array( 'Blindvegsomdirigeringar' ),
 	'Disambiguations'           => array( 'Fleirtydingssider' ),
-	'Userlogin'                 => array( 'Logg_inn' ),
-	'Userlogout'                => array( 'Logg_ut' ),
-	'CreateAccount'             => array( 'Opprett_konto' ),
+	'Userlogin'                 => array( 'Logg inn' ),
+	'Userlogout'                => array( 'Logg ut' ),
+	'CreateAccount'             => array( 'Opprett konto' ),
 	'Preferences'               => array( 'Innstillingar' ),
 	'Watchlist'                 => array( 'Overvakingsliste' ),
-	'Recentchanges'             => array( 'Siste_endringar' ),
-	'Upload'                    => array( 'Last_opp' ),
-	'Imagelist'                 => array( 'Filliste' ),
-	'Newimages'                 => array( 'Nye_filer' ),
+	'Recentchanges'             => array( 'Siste endringar' ),
+	'Upload'                    => array( 'Last opp' ),
+	'Listfiles'                 => array( 'Filliste' ),
+	'Newimages'                 => array( 'Nye filer' ),
 	'Listusers'                 => array( 'Brukarliste' ),
 	'Statistics'                => array( 'Statistikk' ),
-	'Randompage'                => array( 'Tilfeldig_side' ),
-	'Lonelypages'               => array( 'Foreldrelause_sider' ),
-	'Uncategorizedpages'        => array( 'Ukategoriserte_sider' ),
-	'Uncategorizedcategories'   => array( 'Ukategoriserte_kategoriar' ),
-	'Uncategorizedimages'       => array( 'Ukategoriserte_filer' ),
-	'Uncategorizedtemplates'    => array( 'Ukategoriserte_malar' ),
-	'Unusedcategories'          => array( 'Ubrukte_kategoriar' ),
-	'Unusedimages'              => array( 'Ubrukte_filer' ),
-	'Wantedpages'               => array( 'Etterspurde_sider' ),
-	'Wantedcategories'          => array( 'Etterspurde_kategoriar' ),
-	'Mostlinked'                => array( 'Mest_lenka_sider' ),
-	'Mostlinkedcategories'      => array( 'Mest_brukte_kategoriar' ),
-	'Mostlinkedtemplates'       => array( 'Mest_brukte_malar' ),
-	'Mostcategories'            => array( 'Flest_kategoriar' ),
-	'Mostimages'                => array( 'Mest_brukte_filer' ),
-	'Mostrevisions'             => array( 'Flest_endringar' ),
-	'Fewestrevisions'           => array( 'Færrast_endringar' ),
-	'Shortpages'                => array( 'Korte_sider' ),
-	'Longpages'                 => array( 'Lange_sider' ),
-	'Newpages'                  => array( 'Nye_sider' ),
-	'Ancientpages'              => array( 'Gamle_sider' ),
+	'Randompage'                => array( 'Tilfeldig side' ),
+	'Lonelypages'               => array( 'Foreldrelause sider' ),
+	'Uncategorizedpages'        => array( 'Ukategoriserte sider' ),
+	'Uncategorizedcategories'   => array( 'Ukategoriserte kategoriar' ),
+	'Uncategorizedimages'       => array( 'Ukategoriserte filer' ),
+	'Uncategorizedtemplates'    => array( 'Ukategoriserte malar' ),
+	'Unusedcategories'          => array( 'Ubrukte kategoriar' ),
+	'Unusedimages'              => array( 'Ubrukte filer' ),
+	'Wantedpages'               => array( 'Etterspurde sider' ),
+	'Wantedcategories'          => array( 'Etterspurde kategoriar' ),
+	'Mostlinked'                => array( 'Mest lenka sider' ),
+	'Mostlinkedcategories'      => array( 'Mest brukte kategoriar' ),
+	'Mostlinkedtemplates'       => array( 'Mest brukte malar' ),
+	'Mostcategories'            => array( 'Flest kategoriar' ),
+	'Mostimages'                => array( 'Mest brukte filer' ),
+	'Mostrevisions'             => array( 'Flest endringar' ),
+	'Fewestrevisions'           => array( 'Færrast endringar' ),
+	'Shortpages'                => array( 'Korte sider' ),
+	'Longpages'                 => array( 'Lange sider' ),
+	'Newpages'                  => array( 'Nye sider' ),
+	'Ancientpages'              => array( 'Gamle sider' ),
 	'Deadendpages'              => array( 'Blindvegsider' ),
-	'Protectedpages'            => array( 'Verna_sider' ),
-	'Protectedtitles'           => array( 'Verna_sidenamn' ),
-	'Allpages'                  => array( 'Alle_sider' ),
+	'Protectedpages'            => array( 'Verna sider' ),
+	'Protectedtitles'           => array( 'Verna sidenamn' ),
+	'Allpages'                  => array( 'Alle sider' ),
 	'Prefixindex'               => array( 'Prefiksindeks' ),
 	'Ipblocklist'               => array( 'Blokkeringsliste' ),
 	'Specialpages'              => array( 'Spesialsider' ),
 	'Contributions'             => array( 'Bidrag' ),
 	'Emailuser'                 => array( 'E-post' ),
-	'Confirmemail'              => array( 'Stadfest_e-postadresse' ),
-	'Whatlinkshere'             => array( 'Lenkjer_hit' ),
-	'Recentchangeslinked'       => array( 'Relaterte_endringar' ),
-	'Movepage'                  => array( 'Flytt_side' ),
-	'Blockme'                   => array( 'Blokker_meg' ),
+	'Confirmemail'              => array( 'Stadfest e-postadresse' ),
+	'Whatlinkshere'             => array( 'Lenkjer hit' ),
+	'Recentchangeslinked'       => array( 'Relaterte endringar' ),
+	'Movepage'                  => array( 'Flytt side' ),
+	'Blockme'                   => array( 'Blokker meg' ),
 	'Booksources'               => array( 'Bokkjelder' ),
 	'Categories'                => array( 'Kategoriar' ),
 	'Export'                    => array( 'Eksport' ),
 	'Version'                   => array( 'Versjon' ),
-	'Allmessages'               => array( 'Alle_systemmeldingar' ),
+	'Allmessages'               => array( 'Alle systemmeldingar' ),
 	'Log'                       => array( 'Logg', 'Loggar' ),
 	'Blockip'                   => array( 'Blokker' ),
 	'Undelete'                  => array( 'Attopprett' ),
-	'Import'                    => array( 'Import' ),
-	'Lockdb'                    => array( 'LÃ¥s_database' ),
-	'Unlockdb'                  => array( 'Opne_database' ),
+	'Lockdb'                    => array( 'LÃ¥s database' ),
+	'Unlockdb'                  => array( 'Opne database' ),
 	'Userrights'                => array( 'Brukarrettar' ),
 	'MIMEsearch'                => array( 'MIME-søk' ),
-	'Unwatchedpages'            => array( 'Uovervaka_sider' ),
+	'Unwatchedpages'            => array( 'Uovervaka sider' ),
 	'Listredirects'             => array( 'Omdirigeringsliste' ),
 	'Revisiondelete'            => array( 'Versjonssletting' ),
-	'Unusedtemplates'           => array( 'Ubrukte_malar' ),
-	'Randomredirect'            => array( 'Tilfeldig_omdirigering' ),
-	'Mypage'                    => array( 'Sida_mi' ),
-	'Mytalk'                    => array( 'Diskusjonssida_mi' ),
-	'Mycontributions'           => array( 'Bidraga_mine' ),
+	'Unusedtemplates'           => array( 'Ubrukte malar' ),
+	'Randomredirect'            => array( 'Tilfeldig omdirigering' ),
+	'Mypage'                    => array( 'Sida mi' ),
+	'Mytalk'                    => array( 'Diskusjonssida mi' ),
+	'Mycontributions'           => array( 'Bidraga mine' ),
 	'Listadmins'                => array( 'Administratorliste', 'Administratorar' ),
 	'Listbots'                  => array( 'Bottliste', 'Bottar' ),
-	'Popularpages'              => array( 'Populære_sider' ),
+	'Popularpages'              => array( 'Populære sider' ),
 	'Search'                    => array( 'Søk' ),
-	'Resetpass'                 => array( 'Nullstill_passord' ),
-	'Withoutinterwiki'          => array( 'Utan_interwiki' ),
+	'Resetpass'                 => array( 'Nullstill passord' ),
+	'Withoutinterwiki'          => array( 'Utan interwiki' ),
 	'MergeHistory'              => array( 'Flettehistorie' ),
+	'Filepath'                  => array( 'Filsti' ),
 );
 
 $separatorTransformTable = array(
@@ -252,11 +240,6 @@ $separatorTransformTable = array(
 );
 $linkTrail = '/^([æøåa-z]+)(.*)$/sDu';
 
-
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Strek under lenkjer:',
@@ -295,17 +278,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Gøym endringane mine frå overvakingslista',
 'tog-watchlisthidebots'       => 'Gøym endringar gjort av robotar frå overvakingslista',
 'tog-watchlisthideminor'      => 'Gøym småplukk frå overvakingslista',
+'tog-watchlisthideliu'        => 'Gøym endringar av innlogga brukarar frå overvakingslista.',
+'tog-watchlisthideanons'      => 'Gøym endringar av anonyme brukarar frå overvakingslista.',
 'tog-nolangconversion'        => 'Slå av variantkonvertering',
 'tog-ccmeonemails'            => 'Send meg kopi av e-postane eg sender til andre brukarar',
 'tog-diffonly'                => 'Ikkje vis sideinnhaldet under skilnadene mellom versjonane',
 'tog-showhiddencats'          => 'Vis gøymde kategoriar',
+'tog-noconvertlink'           => 'Slå av konvertering av sidetitlar',
+'tog-norollbackdiff'          => 'Ikkje vis skilnad etter attenderulling',
 
 'underline-always'  => 'Alltid',
 'underline-never'   => 'Aldri',
 'underline-default' => 'Nettlesarstandard',
 
-'skinpreview' => '(førehandsvis)',
-
 # Dates
 'sunday'        => 'søndag',
 'monday'        => 'måndag',
@@ -399,7 +384,7 @@ $messages = array(
 'mytalk'         => 'Diskusjonssida mi',
 'anontalk'       => 'Diskusjonside for denne IP-adressa',
 'navigation'     => 'Navigering',
-'and'            => 'og',
+'and'            => '&#32;og',
 
 # Metadata in edit box
 'metadata_help' => 'Utvida informasjon:',
@@ -414,7 +399,7 @@ $messages = array(
 'searcharticle'     => 'Vis',
 'history'           => 'Sidehistorikk',
 'history_short'     => 'Historikk',
-'updatedmarker'     => 'oppdatert etter mitt siste besøk',
+'updatedmarker'     => 'oppdatert etter det siste besøket mitt',
 'info_short'        => 'Informasjon',
 'printableversion'  => 'Utskriftsversjon',
 'permalink'         => 'Fast lenkje',
@@ -436,7 +421,7 @@ $messages = array(
 'talkpagelinktext'  => 'Diskusjon',
 'specialpage'       => 'Spesialside',
 'personaltools'     => 'Personlege verktøy',
-'postcomment'       => 'Legg til kommentar',
+'postcomment'       => 'Ny bolk',
 'articlepage'       => 'Vis innhaldsside',
 'talk'              => 'Diskusjon',
 'views'             => 'Visningar',
@@ -462,8 +447,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Om {{SITENAME}}',
 'aboutpage'            => 'Project:Om',
-'bugreports'           => 'Feilmeldingar',
-'bugreportspage'       => 'Project:Feilmeldingar',
 'copyright'            => 'Innhaldet er utgjeve under $1.',
 'copyrightpagename'    => '{{SITENAME}} opphavsrett',
 'copyrightpage'        => '{{ns:project}}:Opphavsrett',
@@ -486,9 +469,7 @@ $messages = array(
 
 'badaccess'        => 'Tilgangsfeil',
 'badaccess-group0' => 'Du har ikkje lov til å utføre handlinga du ba om.',
-'badaccess-group1' => 'Handlinga du ba om kan berre utførast av brukarar i gruppa $1.',
-'badaccess-group2' => 'Handlinga du ba om kan berre utførast av brukarar i gruppene $1.',
-'badaccess-groups' => 'Handlinga du ba om kan berre utførast av brukarar i gruppene $1.',
+'badaccess-groups' => 'Handlinga du ba om kan berre utførast av brukarar i {{PLURAL:$2|gruppa|gruppene}} $1.',
 
 'versionrequired'     => 'MediaWiki versjon $1 trengst',
 'versionrequiredtext' => 'Ein må ha MediaWiki versjon $1 for å bruke denne sida. Sjå [[Special:Version|versjonssida]].',
@@ -502,6 +483,8 @@ $messages = array(
 'editsection'             => 'endre',
 'editold'                 => 'endre',
 'viewsourceold'           => 'vis kjeldetekst',
+'editlink'                => 'endre',
+'viewsourcelink'          => 'vis kjelde',
 'editsectionhint'         => 'Endre bolk: $1',
 'toc'                     => 'Innhaldsliste',
 'showtoc'                 => 'vis',
@@ -516,13 +499,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom-abonnement',
 'page-rss-feed'           => '«$1» RSS-abonnement',
 'page-atom-feed'          => '«$1» Atom-abonnement',
-'red-link-title'          => '$1 (ikkje oppretta endå)',
+'red-link-title'          => '$1 (sida finst ikkje)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Side',
 'nstab-user'      => 'Brukarside',
 'nstab-media'     => 'Filside',
-'nstab-special'   => 'Spesial',
+'nstab-special'   => 'Spesialsida',
 'nstab-project'   => 'Prosjektside',
 'nstab-image'     => 'Fil',
 'nstab-mediawiki' => 'Systemmelding',
@@ -532,7 +515,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Funksjonen finst ikkje',
-'nosuchactiontext'  => 'Wikiprogramvaren kjenner ikkje att funksjonen som er spesifisert i nettadressa',
+'nosuchactiontext'  => 'Handlinga oppgjeven i adressa er ugyldig.
+Du har kanskje stava adressa feil, eller følgt ei feil lenkja.
+Dette kan òg skuldast ein feil i programvara nytta av {{SITENAME}}.',
 'nosuchspecialpage' => 'Ei slik spesialside finst ikkje',
 'nospecialpagetext' => 'Du har bede om ei spesialside som ikkje finst, liste over spesialsider er [[Special:SpecialPages|her]].',
 
@@ -575,7 +560,6 @@ Meld gjerne problemet til ein [[Special:ListUsers/sysop|administrator]] og oppgj
 'cannotdelete'         => 'Kunne ikkje slette fila. (Ho kan vera sletta av andre.)',
 'badtitle'             => 'Feil i tittelen',
 'badtitletext'         => 'Den ønska tittelen var ulovleg, tom eller feil lenka frå ei anna wiki.',
-'perfdisabled'         => 'Beklagar! Denne funksjonen er mellombels deaktivert for å spara tenarkapasitet.',
 'perfcached'           => 'Det følgjande er frå mellomlageret åt tenaren og er ikkje nødvendigvis oppdatert.',
 'perfcachedts'         => 'Desse data er mellomlagra, og vart sist oppdaterte $1.',
 'querypage-no-updates' => 'Oppdatering av denne sida er slått av, og data her vil ikkje verte fornya.',
@@ -587,7 +571,7 @@ Meld gjerne problemet til ein [[Special:ListUsers/sysop|administrator]] og oppgj
 'protectedpagetext'    => 'Denne sida er verna for å hindre endring.',
 'viewsourcetext'       => 'Du kan sjå og kopiere kjeldekoden til denne sida:',
 'protectedinterface'   => 'Denne sida inneheld tekst som er brukt av brukargrensesnittet for programvaren, og er difor låst for å hindre hærverk.',
-'editinginterface'     => "'''Åtvaring:''' Du endrar på ei side som inneheld tekst som er brukt av brukargrensesnittet for programvaren. Endringar på denne sida påverkar utsjånaden til sida for dei andre brukarane. Dersom du ynskjer å setje om, ver venleg og vurder å bruke [http://translatewiki.net/wiki/Main_Page?setlang=nn Betawiki], prosjektet for omsetjing av MediaWiki.",
+'editinginterface'     => "'''Åtvaring:''' Du endrar på ei side som inneheld tekst som er brukt av brukargrensesnittet for programvaren. Endringar på denne sida påverkar utsjånaden til sida for dei andre brukarane. Dersom du ynskjer å setje om, ver venleg og vurder å bruke [http://translatewiki.net/wiki/Main_Page?setlang=nn translatewiki.net], prosjektet for omsetjing av MediaWiki.",
 'sqlhidden'            => '(SQL-førespurnaden er gøymd)',
 'cascadeprotected'     => 'Denne sida er verna mot endring fordi ho er inkludert i {{PLURAL:$1|den opplista sida|dei opplista sidene}} som har djupvern slått på:
 $2',
@@ -598,18 +582,18 @@ $2',
 Grunnen som er gjeven er: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'DÃ¥rleg konfigurasjon: ukjend virusskanner: <i>$1</i>',
+'virus-badscanner'     => "DÃ¥rleg konfigurasjon: ukjend virusskanner: ''$1''",
 'virus-scanfailed'     => 'skanning mislukkast (kode $1)',
 'virus-unknownscanner' => 'ukjend antivirusprogram:',
 
 # Login and logout pages
 'logouttitle'                => 'Logg ut',
-'logouttext'                 => '<strong>Du er no utlogga.</strong>
+'logouttext'                 => "'''Du er no utlogga.'''
 
 Du kan no halde fram og bruke {{SITENAME}} anonymt, eller du kan [[Special:UserLogin|logge inn att]]  med same kontoen eller ein annan brukar kan logge inn. 
-Ver merksam på at nokre sider kan halde fram med å verte viste som om du er innlogga fram til du slettar mellomlageret til nettlesaren din.',
+Ver merksam på at nokre sider kan halde fram med å verte viste som om du er innlogga fram til du slettar mellomlageret til nettlesaren din.",
 'welcomecreation'            => '== Hjarteleg velkommen til {{SITENAME}}, $1! ==
-Brukarkontoen din har vorte oppretta.
+Brukarkontoen din er vorten oppretta.
 Ikkje gløym å endre på [[Special:Preferences|innstillingane]] dine.',
 'loginpagetitle'             => 'Logg inn',
 'yourname'                   => 'Brukarnamn:',
@@ -618,7 +602,6 @@ Ikkje gløym å endre på [[Special:Preferences|innstillingane]] dine.',
 'remembermypassword'         => 'Hugs passordet.',
 'yourdomainname'             => 'Domenet ditt',
 'externaldberror'            => 'Det var anten ein ekstern databasefeil i tilgjengekontrollen, eller du har ikkje løyve til å oppdatere den eksterne kontoen din.',
-'loginproblem'               => '<b>Du vart ikkje innlogga.</b><br />Prøv om att!',
 'login'                      => 'Logg inn',
 'nav-login-createaccount'    => 'Lag brukarkonto / logg inn',
 'loginprompt'                => 'Nettlesaren din må godta informasjonskapslar for at du skal kunna logge inn.',
@@ -643,7 +626,7 @@ Ikkje gløym å endre på [[Special:Preferences|innstillingane]] dine.',
 'yourvariant'                => 'Språkvariant',
 'yournick'                   => 'Signatur:',
 'badsig'                     => 'Ugyldig råsignatur, sjekk HTML-kodinga.',
-'badsiglength'               => 'Signaturen er for lang, han må vere under $1 {{PLURAL:$1|teikn|teikn}}.',
+'badsiglength'               => 'Signaturen din er for lang. Han må vere under {{PLURAL:$1|eitt teikn|$1 teikn}}.',
 'email'                      => 'E-post',
 'prefs-help-realname'        => '* Namn (valfritt): Om du vel å fylle ut dette feltet, vil informasjonen bli brukt til å godskrive arbeid du har gjort.',
 'loginerror'                 => 'Innloggingsfeil',
@@ -657,14 +640,14 @@ Etter at du har endra innstillingane slik at nettlesaren godtek informasjonskaps
 'noname'                     => 'Du har ikkje oppgjeve gyldig brukarnamn.',
 'loginsuccesstitle'          => 'Du er no innlogga',
 'loginsuccess'               => 'Du er no innlogga som «$1».',
-'nosuchuser'                 => 'Det finst ingen med brukarnamnet «$1». Sjekk at du har skrive det rett eller 
-Sjekk stavemåten eller [[Special:UserLogin/signup|opprett ein ny konto]].',
+'nosuchuser'                 => 'Det finst ikkje nokon brukar med brukarnamnet «$1».
+Brukarnamn skil mellom stor og liten bokstav. Sjekk at du har skrive brukarnamet rett eller [[Special:UserLogin/signup|opprett ein ny konto]].',
 'nosuchusershort'            => 'Det finst ikkje nokon brukar med brukarnamnet «<nowiki>$1</nowiki>». Sjekk at du har skrive rett.',
 'nouserspecified'            => 'Du må oppgje eit brukarnamn.',
 'wrongpassword'              => 'Du har oppgjeve eit ugyldig passord. Prøv om att.',
 'wrongpasswordempty'         => 'Du oppgav ikkje noko passord. Ver venleg og prøv igjen.',
 'passwordtooshort'           => 'Passordet er ugyldig eller for kort.
-Det må vera minst {{PLURAL:$1|éitt teikn|$1 teikn}} langt og noko anna enn brukarnamnet ditt.',
+Det må vera minst {{PLURAL:$1|eitt teikn|$1 teikn}} langt og noko anna enn brukarnamnet ditt.',
 'mailmypassword'             => 'Send nytt passord',
 'passwordremindertitle'      => 'Nytt passord til {{SITENAME}}',
 'passwordremindertext'       => 'Noko (truleg du, frå IP-adressa $1) bad oss sende deg eit nytt passord til {{SITENAME}} ($4). Eit mellombels passord for «$2» er laga og sendt til «$3». Om det var det du ville, må du logge inn
@@ -677,10 +660,11 @@ Dersom denne førespurnaden blei utført av nokon andre, eller om du kom på pas
 'eauthentsent'               => 'Ein stadfestings-e-post er sendt til den oppgjevne e-postadressa. For at adressa skal kunna brukast, må du følgje instruksjonane i e-posten for å stadfeste at ho faktisk tilhøyrer deg.',
 'throttled-mailpassword'     => 'Ei passordpåminning er allereie sendt {{PLURAL:$1|den siste timen|dei siste $1 timane}}. For å hindre misbruk vert det berre sendt ut nytt passord ein gong kvar {{PLURAL:$1|time|$1. time}}.',
 'mailerror'                  => 'Ein feil oppstod ved sending av e-post: $1',
-'acct_creation_throttle_hit' => 'Beklagar, du har allereie laga $1 brukarkontoar. Du har ikkje høve til å laga fleire.',
-'emailauthenticated'         => 'E-postadressa di vart stadfest $1.',
+'acct_creation_throttle_hit' => 'Vitjande på denne wikien som nytta IP-adressa di har alt oppretta {{PLURAL:$1|éin konto|$1 kontoar}} den siste dagen, noko som er det høgaste tillate talet i denne tidsperioden.
+Grunna dette vil ikkje vitjande som nyttar denne IP-adressa kunna oppretta nye kontoar på noverande tidspunkt.',
+'emailauthenticated'         => 'E-postadressa di vart stadfesta $2 $3.',
 'emailnotauthenticated'      => 'E-postadressa di er enno ikkje stadfest. Dei følgjande funksjonane kan ikkje bruke ho.',
-'noemailprefs'               => '<strong>Du har ikkje oppgjeve noko e-postadresse</strong>, dei følgjande funksjonane vil ikkje verke.',
+'noemailprefs'               => 'Oppgje ei e-postadresse i innstillingane dine for at desse funksjonane skal verke.',
 'emailconfirmlink'           => 'Stadfest e-post-adressa di',
 'invalidemailaddress'        => 'E-postadressa kan ikkje nyttast sidan formatet truleg er feil. Skriv ei fungerande adresse eller tøm feltet.',
 'accountcreated'             => 'Brukarkonto oppretta',
@@ -689,18 +673,26 @@ Dersom denne førespurnaden blei utført av nokon andre, eller om du kom på pas
 'createaccount-text'         => 'Nokon oppretta ein brukarkonto for $2 på {{SITENAME}} ($4). Passordet til «$2» er «$3». Du bør logge inn og endre passordet ditt med ein gong.
 
 Du kan sjå bort frå denne meldinga dersom kontoen vart oppretta med eit uhell.',
+'login-throttled'            => 'Du har prøvd å logge inn med denne kontoen for mange gonger. Vent før du prøver igjen.',
 'loginlanguagelabel'         => 'Språk: $1',
 
 # Password reset dialog
-'resetpass'               => 'Nullstill passordet til brukarkontoen',
-'resetpass_announce'      => 'Du logga inn med eit mellombels passord du fekk på e-post. For å fullføre innlogginga må du lage eit nytt passord her:',
-'resetpass_text'          => '<!-- Legg til tekst her -->',
-'resetpass_header'        => 'Endra passord',
-'resetpass_submit'        => 'Oppgje passord og logg inn',
-'resetpass_success'       => 'Passordet ditt er no nullstilt! Loggar inn...',
-'resetpass_bad_temporary' => 'Ugyldig mellombels passord. Du kan allereie ha endra det, eller bede om eit nytt.',
-'resetpass_forbidden'     => 'Passord kan ikkje endrast',
-'resetpass_missing'       => 'Skjemaet er tomt.',
+'resetpass'                 => 'Endra passord',
+'resetpass_announce'        => 'Du logga inn med eit mellombels passord du fekk på e-post. For å fullføre innlogginga må du lage eit nytt passord her:',
+'resetpass_text'            => '<!-- Legg til tekst her -->',
+'resetpass_header'          => 'Endra passord',
+'oldpassword'               => 'Gammalt passord',
+'newpassword'               => 'Nytt passord',
+'retypenew'                 => 'Nytt passord om att',
+'resetpass_submit'          => 'Oppgje passord og logg inn',
+'resetpass_success'         => 'Passordet ditt er no nullstilt! Loggar inn...',
+'resetpass_bad_temporary'   => 'Ugyldig mellombels passord. Du kan allereie ha endra det, eller bede om eit nytt.',
+'resetpass_forbidden'       => 'Passord kan ikkje endrast',
+'resetpass-no-info'         => 'Du må vera innlogga for å få direktetilgang til denne sida.',
+'resetpass-submit-loggedin' => 'Endra passord',
+'resetpass-wrong-oldpass'   => 'Feil mellombels eller noverande passord.
+Du kan allereie ha byta passordet, eller ha bede om å få eit nytt mellombels passord.',
+'resetpass-temp-password'   => 'Mellombels passord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Halvfeit skrift',
@@ -725,8 +717,8 @@ Du kan sjå bort frå denne meldinga dersom kontoen vart oppretta med eit uhell.
 'hr_tip'          => 'Vassrett line',
 
 # Edit pages
-'summary'                          => 'Samandrag',
-'subject'                          => 'Emne/overskrift',
+'summary'                          => 'Samandrag:',
+'subject'                          => 'Emne/overskrift:',
 'minoredit'                        => 'Småplukk',
 'watchthis'                        => 'Overvak denne sida',
 'savearticle'                      => 'Lagre',
@@ -738,8 +730,8 @@ Du kan sjå bort frå denne meldinga dersom kontoen vart oppretta med eit uhell.
 'missingsummary'                   => "'''Påminning:''' Du har ikkje skrive noko endringssamandrag. Dersom du trykkjer «Lagre» ein gong til, vert endringa di lagra utan.",
 'missingcommenttext'               => 'Ver venleg og skriv ein kommentar nedanfor.',
 'missingcommentheader'             => "'''Påminning:''' Du har ikkje oppgjeve noko emne/overskrift for denne kommentaren. Dersom du trykkjer «Lagre» ein gong til, vert endringa di lagra utan.",
-'summary-preview'                  => 'Førehandsvising av endringssamandraget',
-'subject-preview'                  => 'Førehandsvising av emne/overskrift',
+'summary-preview'                  => 'Førehandsvising av endringssamandraget:',
+'subject-preview'                  => 'Førehandsvising av emne/overskrift:',
 'blockedtitle'                     => 'Brukaren er blokkert',
 'blockedtext'                      => "<big>'''Brukarnamnet ditt eller IP-adressa di er blokkert frå endring'''</big>
 
@@ -786,51 +778,55 @@ Ver venleg og opplyse dette ved eventuelle førespurnader.",
 * Dersom du ikkje ønskjer å endre sida, kan du utan risiko klikke på '''attende'''-knappen i nettlesaren din.",
 'anontalkpagetext'                 => "----''Dette er ei diskusjonsside for ein anonym brukar som ikkje har oppretta konto eller ikkje har logga inn.
 Vi er difor nøydde til å bruke den numeriske IP-adressa til å identifisere brukaren. Same IP-adresse kan vere knytt til fleire brukarar. Om du er ein anonym brukar og meiner at du har fått irrelevante kommentarar på ei slik side, [[Special:UserLogin|logg inn]] slik at vi unngår framtidige forvekslingar med andre anonyme brukarar.''",
-'noarticletext'                    => "Det er ikkje noko tekst på denne sida. Du kan [[Special:Search/{{PAGENAME}}|søke etter henne]] i andre sider, eller '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} opprette sida]'''.",
+'noarticletext'                    => 'Det finst på noverande tidspunkt ikkje noko tekst på denne sida.
+Du kan [[Special:Search/{{PAGENAME}}|søkja etter denne sidetittelen]] i andre sider, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} søkja i dei relaterte loggane]
+eller [{{fullurl:{{FULLPAGENAME}}|action=edit}} endra denne sida]</span>.',
 'userpage-userdoesnotexist'        => 'Brukarkontoen «$1» finst ikkje. Vil du verkeleg opprette/endre denne sida?',
 'clearyourcache'                   => "'''Merk: Etter lagring vil det kanskje vera naudsynt at nettlesaren slettar mellomlageret sitt for at endringane skal tre i kraft.''' '''Firefox og Safari:''' Hald ''Shift'' nede medan du trykkjer anten ''Ctrl-F5'' eller ''Ctrl-R'' (''Command-R'' på Mac). '''Konqueror:''' Trykk ''Oppdater'' eller på ''F5''. '''Opera:''' Tøm mellomlageret i ''Verktøy → Innstillingar''. '''Internet Explorer:''' Hald nede ''Ctrl'' medan du trykkjer ''Oppdater'', eler trykk ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => '<strong>Tips:</strong> Bruk «Førehandsvis»-knappen for å teste den nye CSS- eller JS-koden din før du lagrar.',
+'usercssjsyoucanpreview'           => "'''Tips:''' Bruk «Førehandsvis»-knappen for å teste den nye CSS- eller JS-koden din før du lagrar.",
 'usercsspreview'                   => "'''Hugs at dette berre er ei førehandsvising av din eigen CSS og at han ikkje er lagra enno!'''",
 'userjspreview'                    => "'''Hugs at du berre testar ditt eige JavaScript, det har ikkje vorte lagra enno!!'''",
 'userinvalidcssjstitle'            => "'''Åtvaring:''' Det finst ikkje noka sidedrakt som heiter «$1». Hugs på at vanlege .css- og .js-sider brukar titlar med små bokstavar, til dømes {{ns:user}}:Døme/monobook.css, og ikkje {{ns:user}}:Døme/Monobook.css.",
 'updated'                          => '(Oppdatert)',
-'note'                             => '<strong>Merk:</strong>',
-'previewnote'                      => '<strong>Hugs at dette berre er ei førehandsvising og at teksten ikkje er lagra!</strong>',
+'note'                             => "'''Merk:'''",
+'previewnote'                      => "'''Hugs at dette berre er ei førehandsvising og at teksten ikkje er lagra!'''",
 'previewconflict'                  => 'Dette er ei førehandsvising av teksten i endringsboksen over, slik han vil sjå ut om du lagrar han',
-'session_fail_preview'             => '<strong>Orsak! Endringa di kunne ikkje lagrast. Ver venleg og prøv ein gong til. Dersom det framleis ikkje går, prøv å logge deg ut og inn att.</strong>',
-'session_fail_preview_html'        => "<strong>Beklagar! Endringa di kunne ikkje lagrast.</strong>
+'session_fail_preview'             => "'''Orsak! Endringa di kunne ikkje lagrast. Ver venleg og prøv ein gong til. Dersom det framleis ikkje går, prøv å logge deg ut og inn att.'''",
+'session_fail_preview_html'        => "'''Beklagar! Endringa di kunne ikkje lagrast.'''
 
 ''Fordi {{SITENAME}} har rå HTML-kode slått på, er førehandsvisinga gøymd grunna fare for JavaScript-angrep.''
 
-<strong>Dersom dette er eit heilt vanleg forsøk på endring, prøv ein gong til. Dersom det framleis ikkje går, prøv å logge deg ut og inn att.</strong>",
-'token_suffix_mismatch'            => '<strong>Endringa di vart avvist fordi klienten/nettlesaren din lagar teiknfeil i teksten. Dette vart gjort for å hindre øydelegging av teksten på sida. Slikt kan av og til hende når ein brukar feilprogrammerte og vevbaserte anonyme proxytenester.</strong>',
+'''Dersom dette er eit heilt vanleg forsøk på endring, prøv ein gong til. Dersom det framleis ikkje går, prøv å logge deg ut og inn att.'''",
+'token_suffix_mismatch'            => "'''Endringa di vart avvist fordi klienten/nettlesaren din lagar teiknfeil i teksten. Dette vart gjort for å hindre øydelegging av teksten på sida. Slikt kan av og til hende når ein brukar feilprogrammerte og vevbaserte anonyme proxytenester.'''",
 'editing'                          => 'Endrar $1',
 'editingsection'                   => 'Endrar $1 (bolk)',
-'editingcomment'                   => 'Endrar $1 (kommentar)',
+'editingcomment'                   => 'Endrar $1 (ny bolk)',
 'editconflict'                     => 'Endringskonflikt: $1',
 'explainconflict'                  => 'Nokon annan har endra teksten sidan du byrja å skrive. Den øvste boksen inneheld den noverande teksten. Skilnaden mellom den lagra versjonen og din endra versjon er viste under. Versjonen som du har endra er i den nedste boksen. Du lyt flette endringane dine saman med den noverande teksten. <strong>Berre</strong> teksten i den øvste tekstboksen vil bli lagra når du klikkar på «Lagre».<br />',
 'yourtext'                         => 'Teksten din',
 'storedversion'                    => 'Den lagra versjonen',
-'nonunicodebrowser'                => '<strong>ÅTVARING: Nettlesaren din støttar ikkje «Unicode».
-For å omgå problemet blir teikn utanfor ASCII-standarden viste som heksadesimale kodar.</strong><br />',
-'editingold'                       => '<strong>ÅTVARING: Du endrar ein gammal versjon av denne sida. Om du lagrar ho, vil alle endringar gjorde etter denne versjonen bli overskrivne.</strong> (Men dei kan hentast fram att frå historikken.)<br />',
+'nonunicodebrowser'                => "'''ÅTVARING: Nettlesaren din støttar ikkje «Unicode».
+For å omgå problemet blir teikn utanfor ASCII-standarden viste som heksadesimale kodar.'''<br />",
+'editingold'                       => "'''ÅTVARING: Du endrar ein gammal versjon av denne sida. Om du lagrar ho, vil alle endringar gjorde etter denne versjonen bli overskrivne.''' (Men dei kan hentast fram att frå historikken.)<br />",
 'yourdiff'                         => 'Skilnader',
-'copyrightwarning'                 => 'Merk deg at alle bidrag til {{SITENAME}} er å rekne som utgjevne under $2 (sjå $1 for detaljar). Om du ikkje vil ha teksten endra og kopiert under desse vilkåra, kan du ikkje leggje han her.<br />
+'copyrightwarning'                 => "Merk deg at alle bidrag til {{SITENAME}} er å rekne som utgjevne under $2 (sjå $1 for detaljar). Om du ikkje vil ha teksten endra og kopiert under desse vilkåra, kan du ikkje leggje han her.<br />
 Teksten må du ha skrive sjølv, eller kopiert frå ein ressurs som er kompatibel med vilkåra eller ikkje verna av opphavsrett.
 
-<strong>LEGG ALDRI INN MATERIALE SOM ANDRE HAR OPPHAVSRETT TIL UTAN LØYVE FRÅ DEI!</strong>',
-'copyrightwarning2'                => 'Merk deg at alle bidrag til {{SITENAME}} kan bli endra, omskrive og fjerna av andre bidragsytarar. Om du ikkje vil ha teksten endra under desse vilkåra, kan du ikkje leggje han her.<br />
+'''LEGG ALDRI INN MATERIALE SOM ANDRE HAR OPPHAVSRETT TIL UTAN LØYVE FRÅ DEI!'''",
+'copyrightwarning2'                => "Merk deg at alle bidrag til {{SITENAME}} kan bli endra, omskrive og fjerna av andre bidragsytarar. Om du ikkje vil ha teksten endra under desse vilkåra, kan du ikkje leggje han her.<br />
 Teksten må du ha skrive sjølv eller ha kopiert frå ein ressurs som er kompatibel med vilkåra eller ikkje verna av opphavsrett (sjå $1 for detaljar).
 
-<strong>LEGG ALDRI INN MATERIALE SOM ANDRE HAR OPPHAVSRETT TIL UTAN LØYVE FRÅ DEI!</strong>',
-'longpagewarning'                  => '<strong>ÅTVARING: Denne sida er $1 kB lang; nokre nettlesarar kan ha problem med å handsama endringar av sider som nærmar seg eller er lengre enn 32 kB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><br />',
-'longpageerror'                    => '<strong>Feil: Teksten du har prøvd å lagre er $1 kilobyte
-lang, altså lenger enn $2 kilobyte som er maksimum. Han kan difor ikkje lagrast.</strong>',
-'readonlywarning'                  => '<strong>ÅTVARING: Databasen er skriveverna på grunn av vedlikehald, difor kan du ikkje lagre endringane dine akkurat no. Det kan vera lurt å  kopiere teksten din åt ei tekstfil, så du kan lagre han her seinare.</strong><br />',
-'protectedpagewarning'             => '<strong>Ã…TVARING: Denne sida er verna, slik at berre administratorar kan endre ho.</strong>',
+'''LEGG ALDRI INN MATERIALE SOM ANDRE HAR OPPHAVSRETT TIL UTAN LØYVE FRÅ DEI!'''",
+'longpagewarning'                  => "'''ÅTVARING: Denne sida er $1 kB lang; nokre nettlesarar kan ha problem med å handsama endringar av sider som nærmar seg eller er lengre enn 32 kB. Du bør vurdere å dele opp sida i mindre bolkar.'''<br />",
+'longpageerror'                    => "'''Feil: Teksten du har prøvd å lagre er $1 kilobyte
+lang, altså lenger enn $2 kilobyte som er maksimum. Han kan difor ikkje lagrast.'''",
+'readonlywarning'                  => "'''ÅTVARING: Databasen er skriveverna på grunn av vedlikehald, så du kan ikkje lagre endringane dine akkurat no. Det kan vera lurt å  kopiere teksten din til ei tekstfil, så du kan lagre han her seinare.'''
+
+Systemadministratoren som låste databasen gav følgjande årsak: $1",
+'protectedpagewarning'             => "'''Ã…TVARING: Denne sida er verna, slik at berre administratorar kan endre ho.'''",
 'semiprotectedpagewarning'         => "'''NB:''' Denne sida er verna slik at berre registrerte brukarar kan endre henne.",
 'cascadeprotectedwarning'          => "'''Åtvaring:''' Denne sida er verna så berre brukarar med administratortilgang kan endre henne. Dette er fordi ho er inkludert i {{PLURAL:$1|denne djupverna sida|desse djupverna sidene}}:",
-'titleprotectedwarning'            => '<strong>Åtvaring: Denne sida er verna, så berre nokre brukarar kan opprette henne.</strong>',
+'titleprotectedwarning'            => "'''Åtvaring: Denne sida er verna, så berre [[Special:ListGroupRights|nokre brukarar]] kan opprette henne.'''",
 'templatesused'                    => 'Malar som er brukte på denne sida:',
 'templatesusedpreview'             => 'Malar som er brukte i denne førehandsvisinga:',
 'templatesusedsection'             => 'Malar som er brukte i denne bolken:',
@@ -849,11 +845,19 @@ Du kan gå attende og endre ei eksisterande side, [[Special:UserLogin|logge inn
 
 Du bør tenkje over om det er lurt å halde fram med å endre denne sida.
 Sletteloggen for sida finn du her:",
+'deleted-notice'                   => 'Denne sida har blitt sletta. Sletteloggen er vist nedanfor.',
+'deletelog-fulllog'                => 'Vis full logg',
+'edit-hook-aborted'                => 'Endring avbroten av ein funksjon, utan forklaring.',
+'edit-gone-missing'                => 'Kunne ikkje oppdatere sida. 
+Det ser ut til at ho er sletta.',
+'edit-conflict'                    => 'Endringskonflikt.',
+'edit-no-change'                   => 'Redigeringa di vart ignorert fordi det ikkje vart gjort endringar i teksten.',
+'edit-already-exists'              => 'Kunne ikkje opprette ny side fordi ho alt eksisterer.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Ã…tvaring: Denne sida inneheld for mange prosesskrevande parsarfunksjonar.
+'expensive-parserfunction-warning'        => 'Ã…tvaring: Denne sida inneheld for mange prosesskrevande parserfunksjonar.
 
-Det burde vere færre enn $2, men er no $1.',
+Det burde vere færre enn {{PLURAL:$2|$2|$2}}, men er no {{PLURAL:$1|$1|$1}}.',
 'expensive-parserfunction-category'       => 'Sider med for mange prosesskrevande parserfunksjonar',
 'post-expand-template-inclusion-warning'  => 'Åtvaring: Storleiken på malar som er inkluderte er for stor.
 Nokre malar vert ikkje inkluderte.',
@@ -861,6 +865,8 @@ Nokre malar vert ikkje inkluderte.',
 'post-expand-template-argument-warning'   => 'Åtvaring: Sida inneheld ein eller fleire malparameterar som vert for lange når dei utvidast. 
 Desse parameterane har vorte utelatne.',
 'post-expand-template-argument-category'  => 'Sider med utelatne malparameterar',
+'parser-template-loop-warning'            => 'Malløkka oppdaga: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Malen er inkludert for mange gonger ($1)',
 
 # "Undo" feature
 'undo-success' => 'Endringa kan attenderullast. Ver venleg og sjå over skilnadene nedanfor for å vere sikker på at du vil attenderulle. Deretter kan du lagre attenderullinga.',
@@ -875,27 +881,27 @@ Desse parameterane har vorte utelatne.',
 Grunnen som vart gjeven av $3 er ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vis loggane for denne sida',
-'nohistory'           => 'Det finst ikkje nokon historikk for denne sida.',
-'revnotfound'         => 'Fann ikkje versjonen',
-'revnotfoundtext'     => 'Den gamle versjonen av sida du spurde etter finst ikkje. Sjekk nettadressa du brukte for å komma deg åt denne sida.',
-'currentrev'          => 'Noverande versjon',
-'revisionasof'        => 'Versjonen frå $1',
-'revision-info'       => 'Versjonen frå $1 av $2',
-'previousrevision'    => '�Eldre versjon',
-'nextrevision'        => 'Nyare versjon→',
-'currentrevisionlink' => 'Noverande versjon',
-'cur'                 => 'no',
-'next'                => 'neste',
-'last'                => 'førre',
-'page_first'          => 'fyrste',
-'page_last'           => 'siste',
-'histlegend'          => 'Merk av for dei versjonane du vil samanlikne og trykk [Enter] eller klikk på knappen nedst på sida.<br />Forklaring: (no) = skilnad frå den noverande versjonen, (førre) = skilnad frå den førre versjonen, <b>s</b> = småplukk',
-'deletedrev'          => '[sletta]',
-'histfirst'           => 'Første',
-'histlast'            => 'Siste',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(tom)',
+'viewpagelogs'           => 'Vis loggane for denne sida',
+'nohistory'              => 'Det finst ikkje nokon historikk for denne sida.',
+'currentrev'             => 'Noverande versjon',
+'currentrev-asof'        => 'Noverande versjon frå $1',
+'revisionasof'           => 'Versjonen frå $1',
+'revision-info'          => 'Versjonen frå $1 av $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Eldre versjon',
+'nextrevision'           => 'Nyare versjon→',
+'currentrevisionlink'    => 'Noverande versjon',
+'cur'                    => 'no',
+'next'                   => 'neste',
+'last'                   => 'førre',
+'page_first'             => 'fyrste',
+'page_last'              => 'siste',
+'histlegend'             => 'Merk av for dei versjonane du vil samanlikne og trykk [Enter] eller klikk på knappen nedst på sida.<br />Forklaring: (no) = skilnad frå den noverande versjonen, (førre) = skilnad frå den førre versjonen, <b>s</b> = småplukk',
+'history-fieldset-title' => 'Finn dato',
+'deletedrev'             => '[sletta]',
+'histfirst'              => 'Første',
+'histlast'               => 'Siste',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(tom)',
 
 # Revision feed
 'history-feed-title'          => 'Endringshistorikk',
@@ -944,7 +950,7 @@ Andre administratorar på {{SITENAME}} kan framleis sjå det gøymde innhaldet o
 'revdelete-hid'               => 'løynde $1',
 'revdelete-unhid'             => 'gjorde $1 synleg',
 'revdelete-log-message'       => '$1 for $2 {{PLURAL:$2|revisjon|revisjonar}}',
-'logdelete-log-message'       => '$1 for {{PLURAL:$2|éitt element|$2 element}}',
+'logdelete-log-message'       => '$1 for {{PLURAL:$2|eitt element|$2 element}}',
 
 # Suppression log
 'suppressionlog'     => 'Logg over historikkfjerningar',
@@ -971,6 +977,7 @@ Pass på at den nye sida også har innhald frå den innfletta sida.',
 'mergehistory-invalid-destination' => 'Målsida må ha ein gyldig tittel.',
 'mergehistory-autocomment'         => 'Fletta «[[:$1]]» inn i «[[:$2]]»',
 'mergehistory-comment'             => 'Fletta «[[:$1]]» inn i «[[:$2]]»: $3',
+'mergehistory-same-destination'    => 'Kjelde- og målside kan ikkje vere den same.',
 
 # Merge log
 'mergelog'           => 'Flettingslogg',
@@ -983,123 +990,205 @@ Pass på at den nye sida også har innhald frå den innfletta sida.',
 'difference'              => '(Skilnad mellom versjonar)',
 'lineno'                  => 'Line $1:',
 'compareselectedversions' => 'Samanlikn valde versjonar',
+'visualcomparison'        => 'Visuell samanlikning',
+'wikicodecomparison'      => 'Wikitekstsamanlikning',
 'editundo'                => 'angre',
 'diff-multi'              => '({{PLURAL:$1|Éin versjon mellom desse er ikkje vist|$1 versjonar mellom desse er ikkje viste}}.)',
+'diff-movedto'            => 'flytta til $1',
+'diff-styleadded'         => '$1 stil lagt til',
+'diff-added'              => '$1 lagt til',
+'diff-changedto'          => 'endra til $1',
+'diff-movedoutof'         => 'flytta ut av $1',
+'diff-styleremoved'       => '$1 stil fjerna',
+'diff-removed'            => '$1 fjerna',
+'diff-changedfrom'        => 'endra frå $1',
+'diff-src'                => 'kjelde',
+'diff-withdestination'    => 'med mål $1',
+'diff-with'               => '&#32;med $1 $2',
+'diff-with-final'         => '&#32;og $1 $2',
+'diff-width'              => 'breidde',
+'diff-height'             => 'høgd',
+'diff-p'                  => "eit '''avsnitt'''",
+'diff-blockquote'         => "eit '''sitat'''",
+'diff-h1'                 => "ei '''overskrift (nivå 1)'''",
+'diff-h2'                 => "ei '''overskrift (nivå 2)'''",
+'diff-h3'                 => "ei '''overskrift (nivå 3)'''",
+'diff-h4'                 => "ei '''overskrift (nivå 4)'''",
+'diff-h5'                 => "ei '''overskrift (nivå 5)'''",
+'diff-pre'                => "eit '''førhandsformatert avsnitt'''",
+'diff-div'                => "ei '''inndeling'''",
+'diff-ul'                 => "ei '''usortert liste'''",
+'diff-ol'                 => "ei '''sortert liste'''",
+'diff-li'                 => "eit '''listeelement'''",
+'diff-table'              => "ein '''tabell'''",
+'diff-tbody'              => "'''innhaldet i ein tabell'''",
+'diff-tr'                 => "ei '''rad'''",
+'diff-td'                 => "ei '''celle'''",
+'diff-th'                 => "ei '''overskrift'''",
+'diff-br'                 => "eit '''linjeskift'''",
+'diff-hr'                 => "ei '''horisontal linje'''",
+'diff-code'               => "eit '''kjeldekodeavsnitt'''",
+'diff-dl'                 => "ei '''definisjonsliste'''",
+'diff-dt'                 => "eit '''definisjonsuttrykk'''",
+'diff-dd'                 => "ein '''definisjon'''",
+'diff-input'              => "eit '''innlegg'''",
+'diff-form'               => "eit '''skjema'''",
+'diff-img'                => "eit '''bilete'''",
+'diff-span'               => "ei '''variasjonsbreidde'''",
+'diff-a'                  => "ei '''lenkje'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''halvfeit'''",
+'diff-strong'             => "'''feit'''",
+'diff-em'                 => "'''markering'''",
+'diff-font'               => "'''skrifttype'''",
+'diff-big'                => "'''stor'''",
+'diff-del'                => "'''sletta'''",
+'diff-tt'                 => "'''fast breidde'''",
+'diff-sub'                => "'''senka'''",
+'diff-sup'                => "'''opphøgd'''",
+'diff-strike'             => "'''gjennomstreka'''",
 
 # Search results
-'searchresults'             => 'Søkjeresultat',
-'searchresulttext'          => 'For meir info om søkjefunksjonen i {{SITENAME}}, sjå [[{{MediaWiki:Helppage}}|Hjelp]].',
-'searchsubtitle'            => 'Du søkte etter «[[:$1]]» ([[Special:Prefixindex/$1|alle sider som byrjar med «$1»]] | [[Special:WhatLinksHere/$1|alle sider som lenkjer til «$1»]])',
-'searchsubtitleinvalid'     => 'Du søkte etter «$1»',
-'noexactmatch'              => "* '''{{SITENAME}} har ikkje noka side med [[:$1|dette namnet]].'''
+'searchresults'                    => 'Søkjeresultat',
+'searchresults-title'              => 'Søkjeresultat for "$1"',
+'searchresulttext'                 => 'For meir info om søkjefunksjonen i {{SITENAME}}, sjå [[{{MediaWiki:Helppage}}|Hjelp]].',
+'searchsubtitle'                   => 'Du søkte etter «[[:$1]]» ([[Special:Prefixindex/$1|alle sider som byrjar med «$1»]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alle sider som lenkjer til «$1»]])',
+'searchsubtitleinvalid'            => 'Du søkte etter «$1»',
+'noexactmatch'                     => "* '''{{SITENAME}} har ikkje noka side med [[:$1|dette namnet]].'''
 * <big>'''Du kan [[:$1|opprette ho no]]'''</big>.<br />
 (Men du bør søkje etter andre namnevariasjonar først, slik at du ikkje lagar ei side som allereie finst under eit anna namn!)",
-'noexactmatch-nocreate'     => "'''Inga side har tittelen «$1».'''",
-'toomanymatches'            => 'Søket gav for mange treff, prøv ei anna spørjing',
-'titlematches'              => 'Sidetitlar med treff på førespurnaden',
-'notitlematches'            => 'Ingen sidetitlar hadde treff på førespurnaden',
-'textmatches'               => 'Sider med treff på førespurnaden',
-'notextmatches'             => 'Ingen sider hadde treff på førespurnaden',
-'prevn'                     => 'førre $1',
-'nextn'                     => 'neste $1',
-'viewprevnext'              => 'Vis ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|eitt|$2}} ord)',
-'search-result-score'       => 'Relevans: $1&nbsp;%',
-'search-redirect'           => '(omdirigering $1)',
-'search-section'            => '(bolk $1)',
-'search-suggest'            => 'Meinte du: «$1»',
-'search-interwiki-caption'  => 'Systerprosjekt',
-'search-interwiki-default'  => '$1 resultat:',
-'search-interwiki-more'     => '(meir)',
-'search-mwsuggest-enabled'  => 'med forslag',
-'search-mwsuggest-disabled' => 'ingen forslag',
-'search-relatedarticle'     => 'Relatert',
-'mwsuggest-disable'         => 'Slå av AJAX-forslag',
-'searchrelated'             => 'relatert',
-'searchall'                 => 'alle',
-'showingresults'            => "Nedanfor er opp til {{PLURAL:$1|'''éitt''' resultat|'''$1''' resultat}} som byrjar med nummer '''$2''' vist.",
-'showingresultsnum'         => "Nedanfor er {{PLURAL:$3|'''éitt''' resultat|'''$3''' resultat}} som byrjar med nummer '''$2''' vist.",
-'showingresultstotal'       => "Under er {{PLURAL:$3|resultat '''$1''' av '''$3'''|resultata '''$1 - $2''' av '''$3'''}} viste",
-'nonefound'                 => "'''Merk''': søk utan resultat kan komma av at du leitar etter alminnelege engelske ord som ikkje blir indekserte, eller det kan komma av at du har gjeve meir enn eitt søkjeord (berre sider som inneheld alle søkjeorda vil bli funne).",
-'powersearch'               => 'Søk',
-'powersearch-legend'        => 'Avansert søk',
-'powersearch-ns'            => 'Søk i namnerom:',
-'powersearch-redir'         => 'Vis omdirigeringar',
-'powersearch-field'         => 'Søk etter',
-'search-external'           => 'Eksternt søk',
-'searchdisabled'            => 'Søkjefunksjonen på {{SITENAME}} er slått av akkurat no.
+'noexactmatch-nocreate'            => "'''Inga side har tittelen «$1».'''",
+'toomanymatches'                   => 'Søket gav for mange treff, prøv ei anna spørjing',
+'titlematches'                     => 'Sidetitlar med treff på førespurnaden',
+'notitlematches'                   => 'Ingen sidetitlar hadde treff på førespurnaden',
+'textmatches'                      => 'Sider med treff på førespurnaden',
+'notextmatches'                    => 'Ingen sider hadde treff på førespurnaden',
+'prevn'                            => 'førre $1',
+'nextn'                            => 'neste $1',
+'viewprevnext'                     => 'Vis ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Søkjeval',
+'searchmenu-exists'                => "* Sida '''[[$1]]'''",
+'searchmenu-new'                   => "'''Opprett sida \"[[:\$1|\$1]]\" på denne wikien!'''",
+'searchhelp-url'                   => 'Help:Innhald',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Sjå gjennom alle sider med denne forstavinga]]',
+'searchprofile-articles'           => 'Innhaldssider',
+'searchprofile-articles-and-proj'  => 'Innhalds- og prosjektsider',
+'searchprofile-project'            => 'Prosjektsider',
+'searchprofile-images'             => 'Filer',
+'searchprofile-everything'         => 'Alt',
+'searchprofile-advanced'           => 'Avansert',
+'searchprofile-articles-tooltip'   => 'Søk i $1',
+'searchprofile-project-tooltip'    => 'Søk i $1',
+'searchprofile-images-tooltip'     => 'Søk etter filer',
+'searchprofile-everything-tooltip' => 'Søk i alt innhald (inkludert diskusjonssider)',
+'searchprofile-advanced-tooltip'   => 'Søk i visse namnerom',
+'prefs-search-nsdefault'           => 'Søk med standardverdiar:',
+'prefs-search-nscustom'            => 'Søk i valde namnerom:',
+'search-result-size'               => '$1 ({{PLURAL:$2|eitt|$2}} ord)',
+'search-result-score'              => 'Relevans: $1&nbsp;%',
+'search-redirect'                  => '(omdirigering $1)',
+'search-section'                   => '(bolk $1)',
+'search-suggest'                   => 'Meinte du: «$1»',
+'search-interwiki-caption'         => 'Systerprosjekt',
+'search-interwiki-default'         => '$1 resultat:',
+'search-interwiki-more'            => '(meir)',
+'search-mwsuggest-enabled'         => 'med forslag',
+'search-mwsuggest-disabled'        => 'ingen forslag',
+'search-relatedarticle'            => 'Relatert',
+'mwsuggest-disable'                => 'Slå av AJAX-forslag',
+'searchrelated'                    => 'relatert',
+'searchall'                        => 'alle',
+'showingresults'                   => "Nedanfor er opp til {{PLURAL:$1|'''eitt''' resultat|'''$1''' resultat}} som byrjar med nummer '''$2''' vist.",
+'showingresultsnum'                => "Nedanfor er {{PLURAL:$3|'''eitt''' resultat|'''$3''' resultat}} som byrjar med nummer '''$2''' vist.",
+'showingresultstotal'              => "Syner resultat {{PLURAL:$4|'''$1''' av '''$3'''|'''$1&ndash;$2''' av '''$3'''}} nedanfor",
+'nonefound'                        => "'''Merk:''' Som standard blir det berre søkt i enkelte namnerom. 
+For å søkja i alle, bruk prefikset ''all:'' (det inkluderer diskusjonssider, malar etc.), eller bruk det ønskte namnerommet som prefiks.",
+'search-nonefound'                 => 'Ingen resultat svarte til førespurnaden.',
+'powersearch'                      => 'Søk',
+'powersearch-legend'               => 'Avansert søk',
+'powersearch-ns'                   => 'Søk i namnerom:',
+'powersearch-redir'                => 'Vis omdirigeringar',
+'powersearch-field'                => 'Søk etter',
+'search-external'                  => 'Eksternt søk',
+'searchdisabled'                   => 'Søkjefunksjonen på {{SITENAME}} er slått av akkurat no.
 I mellomtida kan du søkje gjennom Google.
 Ver merksam på at registra deira kan vera utdaterte.',
 
 # Preferences page
-'preferences'              => 'Innstillingar',
-'mypreferences'            => 'Innstillingane mine',
-'prefs-edits'              => 'Tal på endringar:',
-'prefsnologin'             => 'Ikkje innlogga',
-'prefsnologintext'         => 'Du må vere <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logga inn]</span> for å endre brukarinnstillingane.',
-'prefsreset'               => 'Innstillingane er tilbakestilte til siste lagra versjon.',
-'qbsettings'               => 'Snøggmeny',
-'qbsettings-none'          => 'Ingen',
-'qbsettings-fixedleft'     => 'Venstre',
-'qbsettings-fixedright'    => 'Høgre',
-'qbsettings-floatingleft'  => 'Flytande venstre',
-'qbsettings-floatingright' => 'Flytande høgre',
-'changepassword'           => 'Skift passord',
-'skin'                     => 'Drakt',
-'math'                     => 'Matematiske formlar',
-'dateformat'               => 'Datoformat',
-'datedefault'              => 'Standard',
-'datetime'                 => 'Dato og klokkeslett',
-'math_failure'             => 'Klarte ikkje å tolke formelen',
-'math_unknown_error'       => 'ukjend feil',
-'math_unknown_function'    => 'ukjend funksjon',
-'math_lexing_error'        => 'lexerfeil',
-'math_syntax_error'        => 'syntaksfeil',
-'math_image_error'         => 'PNG-konverteringa var mislukka; sjekk at latex, dvips, gs, og convert er rett installerte',
-'math_bad_tmpdir'          => 'Kan ikkje skrive til eller laga mellombels mattemappe',
-'math_bad_output'          => 'Kan ikkje skrive til eller laga mattemappe',
-'math_notexvc'             => 'Manglar texvc-program; sjå math/README for konfigurasjon.',
-'prefs-personal'           => 'Brukaropplysningar',
-'prefs-rc'                 => 'Siste endringar',
-'prefs-watchlist'          => 'Overvakingsliste',
-'prefs-watchlist-days'     => 'Tal på dagar som skal visast i overvakingslista:',
-'prefs-watchlist-edits'    => 'Talet på endringar som vert viste i den utvida overvakingslista:',
-'prefs-misc'               => 'Andre',
-'saveprefs'                => 'Lagre',
-'resetprefs'               => 'Rull attende',
-'oldpassword'              => 'Gammalt passord',
-'newpassword'              => 'Nytt passord',
-'retypenew'                => 'Nytt passord om att',
-'textboxsize'              => 'Endring',
-'rows'                     => 'Rekkjer',
-'columns'                  => 'Kolonnar',
-'searchresultshead'        => 'Søk',
-'resultsperpage'           => 'Resultat per side',
-'contextlines'             => 'Liner per resultat',
-'contextchars'             => 'Teikn per line i resultatet',
-'stub-threshold'           => 'Grense (i byte) for at frø/spirer skal formaterast <a href="#" class="stub">slik</a>:',
-'recentchangesdays'        => 'Tal dagar som skal visast på siste endringar:',
-'recentchangescount'       => 'Tal titlar på «siste endringar»',
-'savedprefs'               => 'Brukarinnstillingane er lagra.',
-'timezonelegend'           => 'Tidssone',
-'timezonetext'             => 'Tal timar lokal tid skil seg frå tenaren si tid.',
-'localtime'                => 'Lokaltid',
-'timezoneoffset'           => 'Skilnad',
-'servertime'               => 'Tenartid',
-'guesstimezone'            => 'Hent tidssone frå nettlesaren',
-'allowemail'               => 'Tillat e-post frå andre brukarar',
-'prefs-searchoptions'      => 'Søkjealternativ',
-'prefs-namespaces'         => 'Namnerom',
-'defaultns'                => 'Søk som standard i desse namneromma:',
-'default'                  => 'standard',
-'files'                    => 'Filer',
+'preferences'               => 'Innstillingar',
+'mypreferences'             => 'Innstillingane mine',
+'prefs-edits'               => 'Tal på endringar:',
+'prefsnologin'              => 'Ikkje innlogga',
+'prefsnologintext'          => 'Du må vere <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logga inn]</span> for å endre brukarinnstillingane.',
+'prefsreset'                => 'Innstillingane er tilbakestilte til siste lagra versjon.',
+'qbsettings'                => 'Snøggmeny',
+'qbsettings-none'           => 'Ingen',
+'qbsettings-fixedleft'      => 'Venstre',
+'qbsettings-fixedright'     => 'Høgre',
+'qbsettings-floatingleft'   => 'Flytande venstre',
+'qbsettings-floatingright'  => 'Flytande høgre',
+'changepassword'            => 'Skift passord',
+'skin'                      => 'Drakt',
+'skin-preview'              => 'førehandsvis',
+'math'                      => 'Matematiske formlar',
+'dateformat'                => 'Datoformat',
+'datedefault'               => 'Standard',
+'datetime'                  => 'Dato og klokkeslett',
+'math_failure'              => 'Klarte ikkje å tolke formelen',
+'math_unknown_error'        => 'ukjend feil',
+'math_unknown_function'     => 'ukjend funksjon',
+'math_lexing_error'         => 'lexerfeil',
+'math_syntax_error'         => 'syntaksfeil',
+'math_image_error'          => 'PNG-konverteringa var mislukka; sjekk at latex, dvips, gs, og convert er rett installerte',
+'math_bad_tmpdir'           => 'Kan ikkje skrive til eller laga mellombels mattemappe',
+'math_bad_output'           => 'Kan ikkje skrive til eller laga mattemappe',
+'math_notexvc'              => 'Manglar texvc-program; sjå math/README for konfigurasjon.',
+'prefs-personal'            => 'Brukaropplysningar',
+'prefs-rc'                  => 'Siste endringar',
+'prefs-watchlist'           => 'Overvakingsliste',
+'prefs-watchlist-days'      => 'Tal på dagar som skal visast i overvakingslista:',
+'prefs-watchlist-days-max'  => '(høgst sju dagar)',
+'prefs-watchlist-edits'     => 'Talet på endringar som vert viste i den utvida overvakingslista:',
+'prefs-watchlist-edits-max' => '(høgst 1000)',
+'prefs-misc'                => 'Andre',
+'prefs-resetpass'           => 'Endra passord',
+'saveprefs'                 => 'Lagre',
+'resetprefs'                => 'Rull attende',
+'textboxsize'               => 'Endring',
+'prefs-edit-boxsize'        => 'Storleiken på redigeringsvindauget.',
+'rows'                      => 'Rekkjer',
+'columns'                   => 'Kolonnar',
+'searchresultshead'         => 'Søk',
+'resultsperpage'            => 'Resultat per side',
+'contextlines'              => 'Liner per resultat',
+'contextchars'              => 'Teikn per line i resultatet',
+'stub-threshold'            => 'Grense (i byte) for at frø/spirer skal formaterast <a href="#" class="stub">slik</a>:',
+'recentchangesdays'         => 'Tal dagar som skal visast på siste endringar:',
+'recentchangesdays-max'     => '(høgst $1 {{PLURAL:$1|dag|dagar}})',
+'recentchangescount'        => 'Tal på endringar som skal verta viste i «siste endringar», sidehistorikkar og i loggar som standard:',
+'savedprefs'                => 'Brukarinnstillingane er lagra.',
+'timezonelegend'            => 'Tidssone',
+'timezonetext'              => 'Tal timar lokal tid skil seg frå tenaren si tid.',
+'localtime'                 => 'Lokaltid:',
+'timezoneselect'            => 'Tidssona:',
+'timezoneuseserverdefault'  => 'Nytt standardinnstillinga til tenaren',
+'timezoneuseoffset'         => 'Anna (oppgje skilnad)',
+'timezoneoffset'            => 'Skilnad¹:',
+'servertime'                => 'Tenartid:',
+'guesstimezone'             => 'Hent tidssone frå nettlesaren',
+'allowemail'                => 'Tillat e-post frå andre brukarar',
+'prefs-searchoptions'       => 'Søkjealternativ',
+'prefs-namespaces'          => 'Namnerom',
+'defaultns'                 => 'Søk som standard i desse namneromma:',
+'default'                   => 'standard',
+'files'                     => 'Filer',
 
 # User rights
 'userrights'                  => 'Administrering av brukartilgang', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Administrer brukargrupper',
 'userrights-user-editname'    => 'Skriv inn brukarnamn:',
 'editusergroup'               => 'Endre brukargrupper',
-'editinguser'                 => "Endrar brukartilgangen til '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Endrar brukartilgangen til '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Endre brukargrupper',
 'saveusergroups'              => 'Lagre brukargrupper',
 'userrights-groupsmember'     => 'Medlem av:',
@@ -1148,6 +1237,8 @@ Ver merksam på at registra deira kan vera utdaterte.',
 'right-minoredit'            => 'Merke endringar som småplukk',
 'right-move'                 => 'Flytte sider',
 'right-move-subpages'        => 'Flytte sider med undersider',
+'right-move-rootuserpages'   => 'Flytte hovudbrukarsider',
+'right-movefile'             => 'Flytta filer',
 'right-suppressredirect'     => 'Treng ikkje lage omdirigering frå det gamle namnet når sida vert flytta',
 'right-upload'               => 'Laste opp filer',
 'right-reupload'             => 'Skrive over ei eksisterande fil',
@@ -1198,14 +1289,51 @@ Ver merksam på at registra deira kan vera utdaterte.',
 'rightslogentry' => 'endra brukartilgangen til $1 frå $2 til $3',
 'rightsnone'     => '(ingen)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'sjå denne sida',
+'action-edit'                 => 'endre denne sida',
+'action-createpage'           => 'opprette sider',
+'action-createtalk'           => 'opprette diskusjonssider',
+'action-createaccount'        => 'opprette denne brukarkontoen',
+'action-minoredit'            => 'merke denne endringa som småplukk',
+'action-move'                 => 'flytte denne sida',
+'action-move-subpages'        => 'flytte denne sida og undersidene hennar',
+'action-move-rootuserpages'   => 'flytte hovudbrukarsider',
+'action-movefile'             => 'flytta denne fila',
+'action-upload'               => 'laste opp denne fila',
+'action-reupload'             => 'skrive over den noverande fila',
+'action-reupload-shared'      => 'skrive over denne fila i fellesdatabasen',
+'action-upload_by_url'        => 'laste påå denne fila frå ein URL',
+'action-writeapi'             => 'bruke skrive-API',
+'action-delete'               => 'slette denne sida',
+'action-deleterevision'       => 'slette denne endringa',
+'action-deletedhistory'       => 'sjå slettehistorikken til denne sida',
+'action-browsearchive'        => 'søke i sletta sider',
+'action-undelete'             => 'attopprette denne sida',
+'action-suppressrevision'     => 'sjå og attopprette denne skjulte endringa',
+'action-suppressionlog'       => 'sjå denne private loggen',
+'action-block'                => 'blokkere denne brukaren frå å gjere endringar',
+'action-protect'              => 'endre vernenivået til denne sida',
+'action-import'               => 'importere denne sida frå ein annan wiki',
+'action-importupload'         => 'importere denne sida frå ei opplasta fil',
+'action-patrol'               => 'merke andre endringar av andre brukar som patruljert',
+'action-autopatrol'           => 'merke endringane dine som partuljert',
+'action-unwatchedpages'       => 'vise lista over uovervaka sider',
+'action-trackback'            => 'levere tilbakemelding',
+'action-mergehistory'         => 'flette historikken til denne sida',
+'action-userrights'           => 'endre alle brukarrettar',
+'action-userrights-interwiki' => 'endre brukarrettar for brukarar på andre wikiar',
+'action-siteadmin'            => 'låse eller låse opp databasen',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|Éi endring|$1 endringar}}',
 'recentchanges'                     => 'Siste endringar',
+'recentchanges-legend'              => 'Alternativ for siste endringar',
 'recentchangestext'                 => 'PÃ¥ denne sida ser du dei sist endra sidene i {{SITENAME}}.',
 'recentchanges-feed-description'    => 'Fylg med på dei siste endringane på denne wikien med dette abonnementet.',
 'rcnote'                            => "Nedanfor er {{PLURAL:$1|den siste endringa|dei siste '''$1''' endringane}} gjort {{PLURAL:$2|den siste dagen|dei siste '''$2''' dagane}}, sidan $4, kl. $5.",
-'rcnotefrom'                        => 'Nedanfor er endringane frå <b>$2</b> inntil <b>$1</b> viste.',
-'rclistfrom'                        => 'Vis nye endringar frå $1',
+'rcnotefrom'                        => "Nedanfor er endringane sidan  ''' $2''' (opp til '''$1''' er viste).",
+'rclistfrom'                        => 'Vis nye endringar sidan $1',
 'rcshowhideminor'                   => '$1 småplukk',
 'rcshowhidebots'                    => '$1 robotar',
 'rcshowhideliu'                     => '$1 innlogga brukarar',
@@ -1224,10 +1352,13 @@ Ver merksam på at registra deira kan vera utdaterte.',
 'rc_categories'                     => 'Avgrens til kategoriar (skilde med «|»)',
 'rc_categories_any'                 => 'Alle',
 'newsectionsummary'                 => '/* $1 */ ny seksjon',
+'rc-enhanced-expand'                => 'Vis detaljar (krev JavaScript)',
+'rc-enhanced-hide'                  => 'Skjul detaljar',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Relaterte endringar',
 'recentchangeslinked-title'    => 'Endringar relaterte til "$1"',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => 'Det er ikkje gjort endringar på sidene som var lenkja hit i den oppgjevne perioden.',
 'recentchangeslinked-summary'  => "Denne spesialsida inneheld alle endringane som er gjort på sider som vert ''lenkja til'' frå denne (eller på sider i ein viss kategori). Dei av sidene du har på [[Special:Watchlist|overvakingslista]] di er '''utheva'''.",
 'recentchangeslinked-page'     => 'Sidenamn:',
@@ -1244,11 +1375,11 @@ Ver merksam på at registra deira kan vera utdaterte.',
 'upload_directory_read_only'  => 'Opplastingsmappa ($1) er skriveverna.',
 'uploaderror'                 => 'Feil under opplasting av fil',
 'uploadtext'                  => "Bruk skjemaet under for å laste opp filer.
-For å sjå eller søkje i eksisterande filer, gå til [[Special:ImageList|fillista]]. Opplastingar vert òg lagra i [[Special:Log/upload|opplastingsloggen]].
+For å sjå eller søkje i eksisterande filer, gå til [[Special:FileList|fillista]]. Opplastingar vert òg lagra i [[Special:Log/upload|opplastingsloggen]].
 
 For å bruke ei fil på ei side, bruk ei slik lenkje:
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}:Filnavn.jpg<nowiki>]]</nowiki></tt>''' for å bruke biletet i opphavleg form
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}:Filnavn.png|200px|mini|venstre|Alternativ tekst<nowiki>]]</nowiki></tt>''' for å bruke bilete med ei breidde på 200&nbsp;pikslar, venstrestilt og med «Alternativ tekst» som bilettekst
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}:Filnavn.jpg<nowiki>]]</nowiki></tt>''' for å bruke biletet i opphavleg form
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}:Filnavn.png|200px|mini|venstre|Alternativ tekst<nowiki>]]</nowiki></tt>''' for å bruke bilete med ei breidde på 200&nbsp;pikslar, venstrestilt og med «Alternativ tekst» som bilettekst
 *'''<tt><nowiki>[[</nowiki>{{ns:media}}:Filnavn.ogg<nowiki>]]</nowiki></tt>''' for å lenkje direkte til fila utan å vise ho",
 'upload-permitted'            => 'Godtekne filtypar: $1.',
 'upload-preferred'            => 'Føretrekte filtypar: $1.',
@@ -1264,7 +1395,7 @@ For å bruke ei fil på ei side, bruk ei slik lenkje:
 'uploadedfiles'               => 'Filer som er opplasta',
 'ignorewarning'               => 'Oversjå åtvaringa og lagre fila',
 'ignorewarnings'              => 'Oversjå åtvaringar',
-'minlength1'                  => 'Filnamn må ha minst éitt teikn.',
+'minlength1'                  => 'Filnamn må ha minst eitt teikn.',
 'illegalfilename'             => 'Filnamnet «$1» inneheld teikn som ikkje er tillatne i sidetitlar. Skift namn på fila og prøv på nytt.',
 'badfilename'                 => 'Namnet på fila har vorte endra til «$1».',
 'filetype-badmime'            => 'Filer av MIME-typen «$1» kan ikkje lastast opp.',
@@ -1277,22 +1408,24 @@ For å bruke ei fil på ei side, bruk ei slik lenkje:
 'large-file'                  => 'Det er tilrådd at filene ikkje er større enn $1, denne fila er $2.',
 'largefileserver'             => 'Denne fila er større enn det tenaren tillèt.',
 'emptyfile'                   => 'Det ser ut til at fila du lasta opp er tom. Dette kan komma av ein skrivefeil i filnamnet. Sjekk og tenk etter om du verkeleg vil laste opp fila.',
-'fileexists'                  => 'Ei fil med dette namnet finst allereie, sjekk <strong><tt>$1</tt></strong> om du ikkje er sikker på om du vil endre namnet.',
-'filepageexists'              => 'Skildringssida for denne fila finst allereie på <strong><tt>$1</tt></strong>, men det finst ikkje noka fil med dette namnet. Endringssamandraget du skriv inn vert ikkje vist på skildringssida. For at det skal dukke opp der, må du skrive det inn på skildringssida manuelt etter å ha lasta opp fila.',
-'fileexists-extension'        => 'Ei fil med eit liknande namn finst allereie:<br />
-Namnet på fila du lastar opp: <strong><tt>$1</tt></strong><br />
-Namnet på den eksisterande fila: <strong><tt>$2</tt></strong><br />
-Ver venleg og vel eit anna namn.',
+'fileexists'                  => "Ei fil med dette namnet finst allereie, sjekk '''<tt>$1</tt>''' om du ikkje er sikker på om du vil endre namnet.",
+'filepageexists'              => "Skildringssida for denne fila finst allereie på '''<tt>$1</tt>''', men det finst ikkje noka fil med dette namnet. Endringssamandraget du skriv inn vert ikkje vist på skildringssida. For at det skal dukke opp der, må du skrive det inn på skildringssida manuelt etter å ha lasta opp fila.",
+'fileexists-extension'        => "Ei fil med eit liknande namn finst allereie:<br />
+Namnet på fila du lastar opp: '''<tt>$1</tt>'''<br />
+Namnet på den eksisterande fila: '''<tt>$2</tt>'''<br />
+Ver venleg og vel eit anna namn.",
 'fileexists-thumb'            => "<center>'''Den eksisterande fila'''</center>",
-'fileexists-thumbnail-yes'    => 'Fila ser ut til å vere eit bilete med redusert storleik. Ver venleg og sjekk fila <strong><tt>$1</tt></strong>.<br />
-Dersom denne er det same biletet i original storleik, er det ikkje nødvendig å laste opp ein mindre versjon.',
-'file-thumbnail-no'           => 'Filnamnet byrjar med <strong><tt>$1</tt></strong>.
-Det ser ut til å vere eit bilte med redusert storleik<i>(miniatyrbilete)</i>.
-Om du har dette bilete i stor utgåve, så last det opp eller endre filnamnet på denne fila.',
-'fileexists-forbidden'        => 'Ei fil med dette namnet finst allereie, ver venleg og gå tilbake og last opp denne fila med eit anna namn. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Fila ser ut til å vere eit bilete med redusert storleik. Ver venleg og sjekk fila '''<tt>$1</tt>'''.<br />
+Dersom denne er det same biletet i original storleik, er det ikkje nødvendig å laste opp ein mindre versjon.",
+'file-thumbnail-no'           => "Filnamnet byrjar med '''<tt>$1</tt>'''.
+Det ser ut til å vere eit bilte med redusert storleik''(miniatyrbilete)''.
+Om du har dette bilete i stor utgåve, så last det opp eller endre filnamnet på denne fila.",
+'fileexists-forbidden'        => 'Ei fil med dette namnet finst allereie, og ho kan ikkje verte skriven over.
+Om du framleis ynskjer å laste opp fila, lyt du gå attende og nytte eit anna namn. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Ei fil med dette namnet finst frå før i det delte fillageret.
-Om du framleis ønskjer å laste opp fila, gå tilbake og last ho opp med eit anna namn. [[Image:$1|thumb|center|$1]]',
+Om du framleis ønskjer å laste opp fila, gå tilbake og last ho opp med eit anna namn. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Denne fila er ein duplikat av følgjande {{PLURAL:$1|fil|filer}}:',
+'file-deleted-duplicate'      => 'Ei identisk fil ([[$1]]) har tidlegare blitt sletta. Du bør sjekka slettehistorikken til denne før du held fram med å lasta ho opp på nytt.',
 'successfulupload'            => 'Opplastinga er ferdig',
 'uploadwarning'               => 'Opplastingsåtvaring',
 'savefile'                    => 'Lagre fil',
@@ -1312,7 +1445,7 @@ Om du framleis ønskjer å laste opp fila, gå tilbake og last ho opp med eit an
 
 Du bør tenkje over om det er lurt å halde fram med å laste opp denne fila.
 Sletteloggen for fila finn du her:",
-'filename-bad-prefix'         => 'Namnet på fila du lastar opp byrjar med <strong>«$1»</strong>, som er eit inkjeseiande namn som vanlegvis vert gjeve til bilete automatisk av digitale kamera. Ver venleg og vel eit meir skildrande namn på fila di.',
+'filename-bad-prefix'         => "Namnet på fila du lastar opp byrjar med '''«$1»''', som er eit inkjeseiande namn som vanlegvis vert gjeve til bilete automatisk av digitale kamera. Ver venleg og vel eit meir skildrande namn på fila di.",
 'filename-prefix-blacklist'   => '  #<!-- leave this line exactly as it is --> <pre>
 # Syntaksen er som følgjer:
 #  * Alt frå teiknet «#» til slutten av linja er ein kommentar
@@ -1347,18 +1480,19 @@ PICT # div.
 'upload_source_url'  => ' (ei gyldig, offentleg tilgjengeleg nettadresse)',
 'upload_source_file' => ' (ei fil på datamaskina di)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Denne spesialsida viser alle opplasta filer. Dei sist opplasta filene vert viste på toppen som standard. Klikk på ei kolonneoverskrift for å byte sorteringsmetode.',
-'imagelist_search_for'  => 'Søk etter filnamn:',
+# Special:ListFiles
+'listfiles-summary'     => 'Denne spesialsida viser alle opplasta filer. Dei sist opplasta filene vert viste på toppen som standard. Klikk på ei kolonneoverskrift for å byte sorteringsmetode.',
+'listfiles_search_for'  => 'Søk etter filnamn:',
 'imgfile'               => 'fil',
-'imagelist'             => 'Filliste',
-'imagelist_date'        => 'Dato',
-'imagelist_name'        => 'Namn',
-'imagelist_user'        => 'Brukar',
-'imagelist_size'        => 'Storleik',
-'imagelist_description' => 'Beskriving',
-
-# Image description page
+'listfiles'             => 'Filliste',
+'listfiles_date'        => 'Dato',
+'listfiles_name'        => 'Namn',
+'listfiles_user'        => 'Brukar',
+'listfiles_size'        => 'Storleik',
+'listfiles_description' => 'Beskriving',
+'listfiles_count'       => 'Versjonar',
+
+# File description page
 'filehist'                       => 'Filhistorikk',
 'filehist-help'                  => 'Klikk på dato/klokkeslett for å sjå fila slik ho var på det tidspunktet.',
 'filehist-deleteall'             => 'slett alle',
@@ -1366,19 +1500,25 @@ PICT # div.
 'filehist-revert'                => 'rull attende',
 'filehist-current'               => 'noverande',
 'filehist-datetime'              => 'Dato/klokkeslett',
+'filehist-thumb'                 => 'Miniatyrbilete',
+'filehist-thumbtext'             => 'Miniatyrbilete av versjonen frå $1',
+'filehist-nothumb'               => 'Ingen miniatyrbilete',
 'filehist-user'                  => 'Brukar',
 'filehist-dimensions'            => 'Oppløysing',
 'filehist-filesize'              => 'Filstorleik',
 'filehist-comment'               => 'Kommentar',
 'imagelinks'                     => 'Fillenkjer',
 'linkstoimage'                   => '{{PLURAL:$1|Den følgjande sida|Dei følgjande $1 sidene}} har lenkjer til denne fila:',
+'linkstoimage-more'              => 'Meir enn $1 {{PLURAL:$1|side|sider}} lenkjer til denne fila.
+Følgjande liste viser {{PLURAL:$1|den første sida|dei $1 første sidene}}.
+Ei [[Special:WhatLinksHere/$2|fullstendig liste]] er tilgjengeleg.',
 'nolinkstoimage'                 => 'Det finst ikkje noka side med lenkje til denne fila.',
 'morelinkstoimage'               => 'Vis [[Special:WhatLinksHere/$1|fleire lenkjer]] til denne fila.',
 'redirectstofile'                => 'Følgjande {{PLURAL:$1|fil er ei omdirigering|filer er omdirigeringar}} til denne fila:',
-'duplicatesoffile'               => 'Følgjande {{PLURAL:$1|fil er ein dublett|filer er dublettar}} av denne fila:',
+'duplicatesoffile'               => 'Følgjande {{PLURAL:$1|fil er ein dublett|filer er dublettar}} av denne fila ([[Special:FileDuplicateSearch/$2|fleire detaljar]]):',
 'sharedupload'                   => 'Denne fila er ei delt opplasting og kan brukast av andre prosjekt.',
 'shareduploadwiki'               => 'Sjå $1 for meir informasjon.',
-'shareduploadwiki-desc'          => 'Skildringa til $1 i det delte lageret er vist nedanfor.',
+'shareduploadwiki-desc'          => 'Skildringa på $1 i det delte lageret er vist nedanfor.',
 'shareduploadwiki-linktext'      => 'filskildringssida',
 'shareduploadduplicate'          => 'Denne fila er ein kopi av $1 frå det delte fillageret.',
 'shareduploadduplicate-linktext' => 'ei anna fil',
@@ -1402,7 +1542,7 @@ PICT # div.
 # File deletion
 'filedelete'                  => 'Slett $1',
 'filedelete-legend'           => 'Slett fil',
-'filedelete-intro'            => "Du slettar '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Du er i ferd med å sletta fila '''[[Media:$1|$1]]''' i lag med heile historikken hennar.",
 'filedelete-intro-old'        => "Du slettar versjonen av '''[[Media:$1|$1]]''' frå [$4 $3, $2].",
 'filedelete-comment'          => 'Slettingsårsak:',
 'filedelete-submit'           => 'Slett',
@@ -1410,7 +1550,6 @@ PICT # div.
 'filedelete-success-old'      => "Versjonen av '''[[Media:$1|$1]]''' frå $3, $2 er sletta.",
 'filedelete-nofile'           => "'''$1''' finst ikkje.",
 'filedelete-nofile-old'       => "Det finst ingen arkivert versjon av '''$1''' med dei oppgjevne attributta.",
-'filedelete-iscurrent'        => 'Du prøver å slette den nyaste versjonen av denne fila. Ver venleg og rull attende til ein eldre versjon fyrst.',
 'filedelete-otherreason'      => 'Annan grunn/tilleggsgrunn:',
 'filedelete-reason-otherlist' => 'Annan grunn',
 'filedelete-reason-dropdown'  => '*Vanlege grunnar for sletting
@@ -1437,26 +1576,31 @@ PICT # div.
 
 # Random page
 'randompage'         => 'Tilfeldig side',
-'randompage-nopages' => 'Det er ingen sider i dette namnerommet.',
+'randompage-nopages' => 'Det finst ingen sider i namnerommet «$1».',
 
 # Random redirect
 'randomredirect'         => 'Tilfeldig omdirigering',
-'randomredirect-nopages' => 'Det er ingen omdirigeringar i dette namnerommet.',
+'randomredirect-nopages' => 'Det finst ingen omdirigeringar i namnerommet «$1».',
 
 # Statistics
-'statistics'             => 'Statistikk',
-'sitestats'              => '{{SITENAME}}-statistikk',
-'userstats'              => 'Brukarstatistikk',
-'sitestatstext'          => "Det er i alt {{PLURAL:$1|'''éi''' side|'''$1''' sider}} i databasen. Dette inkluderer diskusjonssider, sider om {{SITENAME}}, småsider,
-omdirigeringssider, og andre som truleg ikkje kan kallast innhaldssider. Om ein ser bort frå desse sidene, er det {{PLURAL:$2|'''éi''' side|'''$2''' sider}} som truleg er innhaldssider.
-
-'''$8''' {{PLURAL:$8|fil|filer}} har vorte lasta opp.
-
-Alle sidene er vortne viste {{PLURAL:$3|'''éin''' gong|'''$3''' gonger}} og endra {{PLURAL:$4|'''éin''' gong|'''$4''' gonger}} sidan programvaren vart installert. Det vil seie at kvar side gjennomsnittleg har vorte endra {{PLURAL:$5|'''éin''' gong|'''$5''' gonger}}, og vist {{PLURAL:$6|'''éin''' gong|'''$6''' gonger}} per endring.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Jobbkøen] er '''$7'''.",
-'userstatstext'          => "{{SITENAME}} har {{PLURAL:$1|'''éin''' registrert brukar|'''$1''' registrerte brukarar}}. '''$2''' (eller '''$4%''') av desse har $5rettar.",
-'statistics-mostpopular' => 'Mest viste sider',
+'statistics'                   => 'Statistikk',
+'statistics-header-pages'      => 'Sidestatistikk',
+'statistics-header-edits'      => 'Endringsstatistikk',
+'statistics-header-views'      => 'Visingsstatistikk',
+'statistics-header-users'      => 'Brukarstatistikk',
+'statistics-articles'          => 'Innhaldssider',
+'statistics-pages'             => 'Sider',
+'statistics-pages-desc'        => 'Alle sider på wikien, inkludert diskusjonssider, omdirigeringar o.l.',
+'statistics-files'             => 'Opplasta filer',
+'statistics-edits'             => 'Endringar sidan {{SITENAME}} vart oppretta',
+'statistics-edits-average'     => 'Gjennomsnittleg tal på endringar per side',
+'statistics-views-total'       => 'Totalt visningstal',
+'statistics-views-peredit'     => 'Visingar per endring',
+'statistics-jobqueue'          => 'Lengda på [http://www.mediawiki.org/wiki/Manual:Job_queue jobbkøen]',
+'statistics-users'             => 'Registrerte [[Special:ListUsers|brukarar]]',
+'statistics-users-active'      => 'Aktive brukarar',
+'statistics-users-active-desc' => 'Brukarar som har utført handlingar {{PLURAL:$1|i dag|dei siste $1 dagane}}',
+'statistics-mostpopular'       => 'Mest viste sider',
 
 'disambiguations'      => 'Fleirtydingssider',
 'disambiguationspage'  => 'Template:Fleirtyding',
@@ -1468,7 +1612,7 @@ Alle sidene er vortne viste {{PLURAL:$3|'''éin''' gong|'''$3''' gonger}} og end
 'double-redirect-fixer'      => 'Omdirigeringsfiksar',
 
 'brokenredirects'        => 'Blindvegsomdirigeringar',
-'brokenredirectstext'    => 'Dei følgjande omdirigeringane viser til ei side som ikkje finst.',
+'brokenredirectstext'    => 'Dei følgjande omdirigeringane viser til ei side som ikkje finst:',
 'brokenredirects-edit'   => '(endre)',
 'brokenredirects-delete' => '(slett)',
 
@@ -1489,8 +1633,8 @@ Alle sidene er vortne viste {{PLURAL:$3|'''éin''' gong|'''$3''' gonger}} og end
 'specialpage-empty'       => 'Denne sida er tom.',
 'lonelypages'             => 'Foreldrelause sider',
 'lonelypagestext'         => 'Følgjande sider er ikkje lenkja til på andre sider på {{SITENAME}}.',
-'uncategorizedpages'      => 'Ikkje kategoriserte sider',
-'uncategorizedcategories' => 'Ikkje kategoriserte kategoriar',
+'uncategorizedpages'      => 'Ikkje-kategoriserte sider',
+'uncategorizedcategories' => 'Ikkje-kategoriserte kategoriar',
 'uncategorizedimages'     => 'Ukategoriserte filer',
 'uncategorizedtemplates'  => 'Ukategoriserte malar',
 'unusedcategories'        => 'Ubrukte kategoriar',
@@ -1498,26 +1642,30 @@ Alle sidene er vortne viste {{PLURAL:$3|'''éin''' gong|'''$3''' gonger}} og end
 'popularpages'            => 'Populære sider',
 'wantedcategories'        => 'Etterspurde kategoriar',
 'wantedpages'             => 'Etterspurde sider',
-'missingfiles'            => 'Manglande filer',
+'wantedfiles'             => 'Etterspurde filer',
+'wantedtemplates'         => 'Etterspurde malar',
 'mostlinked'              => 'Sidene med flest lenkjer til seg',
 'mostlinkedcategories'    => 'Mest brukte kategoriar',
 'mostlinkedtemplates'     => 'Mest brukte malar',
 'mostcategories'          => 'Sidene med flest kategoriar',
 'mostimages'              => 'Mest brukte filer',
 'mostrevisions'           => 'Sidene med flest endringar',
-'prefixindex'             => 'Prefiksindeks',
+'prefixindex'             => 'Alle sider med forstaving',
 'shortpages'              => 'Korte sider',
 'longpages'               => 'Lange sider',
 'deadendpages'            => 'Blindvegsider',
 'deadendpagestext'        => 'Desse sidene har ikkje lenkjer til andre sider på {{SITENAME}}.',
 'protectedpages'          => 'Verna sider',
 'protectedpages-indef'    => 'Berre vern på ubestemt tid',
+'protectedpages-cascade'  => 'Berre djupvern',
 'protectedpagestext'      => 'Desse sidene er verna mot flytting og endring',
 'protectedpagesempty'     => 'Ingen sider er verna på den valde måten akkurat no.',
 'protectedtitles'         => 'Verna sidenamn',
 'protectedtitlestext'     => 'Desse sidene er verna mot oppretting',
 'protectedtitlesempty'    => 'Ingen sider er verna på den valde måten akkurat no.',
 'listusers'               => 'Brukarliste',
+'listusers-editsonly'     => 'Vis berre brukarar med endringar',
+'usereditcount'           => '{{PLURAL:$1|éi endring|$1 endringar}}',
 'newpages'                => 'Nye sider',
 'newpages-username'       => 'Brukarnamn:',
 'ancientpages'            => 'Eldste sider',
@@ -1538,14 +1686,13 @@ Alle sidene er vortne viste {{PLURAL:$3|'''éin''' gong|'''$3''' gonger}} og end
 'booksources-search-legend' => 'Søk etter bokkjelder',
 'booksources-go'            => 'GÃ¥',
 'booksources-text'          => 'Nedanfor finn du ei liste over lenkjer til andre nettstader som sel nye og brukte bøker, og desse kan ha meir informasjon om bøker du leitar etter:',
+'booksources-invalid-isbn'  => 'Det oppgjevne ISBN-nummeret er ugyldig; sjekk med kjelda di om du har oppgjeve det rett.',
 
 # Special:Log
 'specialloguserlabel'  => 'Brukar:',
 'speciallogtitlelabel' => 'Tittel:',
 'log'                  => 'Loggar',
 'all-logs-page'        => 'Alle loggane',
-'log-search-legend'    => 'Søk i loggane',
-'log-search-submit'    => 'GÃ¥',
 'alllogstext'          => 'Kombinert vising av alle loggane på {{SITENAME}}. Du kan avgrense resultatet ved å velje loggtype, brukarnamn eller den sida som er påverka (hugs å skilje mellom store og små bokstavar)',
 'logempty'             => 'Ingen treff i loggane.',
 'log-title-wildcard'   => 'Søk i titlar som byrjar med denne teksten',
@@ -1556,6 +1703,7 @@ Alle sidene er vortne viste {{PLURAL:$3|'''éin''' gong|'''$3''' gonger}} og end
 'nextpage'          => 'Neste side ($1)',
 'prevpage'          => 'Førre side ($1)',
 'allpagesfrom'      => 'Vis sider frå:',
+'allpagesto'        => 'Vis sider til og med:',
 'allarticles'       => 'Alle sider',
 'allinnamespace'    => 'Alle sider ($1 namnerom)',
 'allnotinnamespace' => 'Alle sider (ikkje i $1-namnerommet)',
@@ -1575,40 +1723,67 @@ Sjå òg [[Special:WantedCategories|ønska kategoriar]].',
 'special-categories-sort-count' => 'sorter etter storleik',
 'special-categories-sort-abc'   => 'sorter alfabetisk',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Sletta brukarbidrag',
+
+# Special:LinkSearch
+'linksearch'       => 'Eksterne lenkjer',
+'linksearch-pat'   => 'Søkemønster:',
+'linksearch-ns'    => 'Namnerom:',
+'linksearch-ok'    => 'Søk',
+'linksearch-text'  => 'Jokerteikn som «*.wikipedia.org» kan nyttast.<br />Støtta protokollar: <tt>$1</tt>',
+'linksearch-line'  => '$2 lenkjer til $1',
+'linksearch-error' => 'Jokerteikn kan berre nyttast føre tenarnamnet.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Vis brukarnamna frå og med:',
 'listusers-submit'   => 'Vis',
 'listusers-noresult' => 'Ingen brukarnamn vart funne.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Brukaropprettingslogg',
+'newuserlogpagetext'          => 'Dette er ein logg over oppretta brukarkontoar.',
+'newuserlog-byemail'          => 'passordet er sendt på e-post',
+'newuserlog-create-entry'     => 'Ny brukar',
+'newuserlog-create2-entry'    => 'oppretta kontoen $1',
+'newuserlog-autocreate-entry' => 'Konto oppretta automatisk',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Tilgangar for brukargrupper',
-'listgrouprights-summary'  => 'Følgjande liste viser brukargruppene som er definert på denne wikien, og kvar rettar dei har. Meir informasjon om dei ulike rettane ein kan ha finn ein [[{{MediaWiki:Listgrouprights-helppage}}|her]].',
-'listgrouprights-group'    => 'Gruppe',
-'listgrouprights-rights'   => 'Tilgangar',
-'listgrouprights-helppage' => 'Help:Gruppetilgangar',
-'listgrouprights-members'  => '(liste over medlemmer)',
+'listgrouprights'                 => 'Tilgangar for brukargrupper',
+'listgrouprights-summary'         => 'Følgjande liste viser brukargruppene som er definert på denne wikien, og kvar rettar dei har. Meir informasjon om dei ulike rettane ein kan ha finn ein [[{{MediaWiki:Listgrouprights-helppage}}|her]].',
+'listgrouprights-group'           => 'Gruppe',
+'listgrouprights-rights'          => 'Tilgangar',
+'listgrouprights-helppage'        => 'Help:Gruppetilgangar',
+'listgrouprights-members'         => '(liste over medlemmer)',
+'listgrouprights-addgroup'        => 'Kan leggje til {{PLURAL:$2|gruppa|gruppene}}: $1',
+'listgrouprights-removegroup'     => 'Kan fjerne {{PLURAL:$2|gruppa|gruppene}}: $1',
+'listgrouprights-addgroup-all'    => 'Kan leggje til alle grupper',
+'listgrouprights-removegroup-all' => 'Kan fjerne alle grupper',
 
 # E-mail user
-'mailnologin'     => 'Inga avsendaradresse',
-'mailnologintext' => 'Du lyt vera [[Special:UserLogin|innlogga]] og ha ei gyldig e-postadresse sett i [[Special:Preferences|brukarinnstillingane]] for å sende e-post åt andre brukarar.',
-'emailuser'       => 'Send e-post åt denne brukaren',
-'emailpage'       => 'Send e-post åt brukar',
-'emailpagetext'   => 'Du kan nytte skjemaet nedanfor til å sende ein e-post til denne brukaren.
+'mailnologin'      => 'Inga avsendaradresse',
+'mailnologintext'  => 'Du lyt vera [[Special:UserLogin|innlogga]] og ha ei gyldig e-postadresse sett i [[Special:Preferences|brukarinnstillingane]] for å sende e-post åt andre brukarar.',
+'emailuser'        => 'Send e-post åt denne brukaren',
+'emailpage'        => 'Send e-post åt brukar',
+'emailpagetext'    => 'Du kan nytte skjemaet nedanfor til å sende ein e-post til denne brukaren.
 E-postadressa du har sett i [[Special:Preferences|innstillingane dine]] vil dukke opp i «frå»-feltet på denne e-posten, så mottakaren er i stand til å svare.',
-'usermailererror' => 'E-post systemet gav feilmelding:',
-'defemailsubject' => '{{SITENAME}} e-post',
-'noemailtitle'    => 'Inga e-postadresse',
-'noemailtext'     => 'Denne brukaren har ikkje oppgjeve ei gyldig e-postadresse, eller har valt å ikkje opne for e-post frå andre brukarar.',
-'emailfrom'       => 'Frå:',
-'emailto'         => 'Ã…t:',
-'emailsubject'    => 'Emne:',
-'emailmessage'    => 'Melding:',
-'emailsend'       => 'Send',
-'emailccme'       => 'Send meg ein kopi av meldinga mi.',
-'emailccsubject'  => 'Kopi av meldinga di til $1: $2',
-'emailsent'       => 'E-posten er sendt',
-'emailsenttext'   => 'E-posten er sendt.',
-'emailuserfooter' => 'E-posten vart sendt av $1 til $2 via «Send e-post»-funksjonen på {{SITENAME}}.',
+'usermailererror'  => 'E-post systemet gav feilmelding:',
+'defemailsubject'  => '{{SITENAME}} e-post',
+'noemailtitle'     => 'Inga e-postadresse',
+'noemailtext'      => 'Denne brukaren har ikkje oppgjeve ei gyldig e-postadresse.',
+'nowikiemailtitle' => 'Ingen e-post tillaten',
+'nowikiemailtext'  => 'Denne brukaren har vald å ikkje motta e-postar frå andre brukarar.',
+'email-legend'     => 'Send ein e-post til ein annan {{SITENAME}}-brukar',
+'emailfrom'        => 'Frå:',
+'emailto'          => 'Ã…t:',
+'emailsubject'     => 'Emne:',
+'emailmessage'     => 'Melding:',
+'emailsend'        => 'Send',
+'emailccme'        => 'Send meg ein kopi av meldinga mi.',
+'emailccsubject'   => 'Kopi av meldinga di til $1: $2',
+'emailsent'        => 'E-posten er sendt',
+'emailsenttext'    => 'E-posten er sendt.',
+'emailuserfooter'  => 'E-posten vart sendt av $1 til $2 via «Send e-post»-funksjonen på {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Overvakingsliste',
@@ -1621,7 +1796,7 @@ E-postadressa du har sett i [[Special:Preferences|innstillingane dine]] vil dukk
 'addedwatch'           => 'Lagt til overvakingslista',
 'addedwatchtext'       => "Sida «[[:$1]]» er lagt til [[Special:Watchlist|overvakingslista]] di. Framtidige endringar av denne sida og den tilhøyrande diskusjonssida vil bli oppførde her, og sida vil vera '''utheva''' på «[[Special:RecentChanges|siste endringar]]» for å gjera deg merksam på henne.
 
-Om du seinere vil fjerne sida frå overvakingslista, klikk på «Fjern overvaking» på den aktuelle sida.",
+Om du seinare vil fjerne sida frå overvakingslista, klikk på «Fjern overvaking» på den aktuelle sida.",
 'removedwatch'         => 'Fjerna frå overvakingslista',
 'removedwatchtext'     => 'Sida «<nowiki>$1</nowiki>» er fjerna frå overvakingslista.',
 'watch'                => 'Overvak',
@@ -1640,12 +1815,7 @@ Om du seinere vil fjerne sida frå overvakingslista, klikk på «Fjern overvakin
 'iteminvalidname'      => 'Problem med «$1», ugyldig namn...',
 'wlnote'               => 'Nedanfor er {{PLURAL:$1|den siste endringa|dei siste $1 endringane}} {{PLURAL:$2|den siste timen|dei siste $2 timane}}.',
 'wlshowlast'           => 'Vis siste $1 timar $2 dagar $3',
-'watchlist-show-bots'  => 'Vis robotar',
-'watchlist-hide-bots'  => 'Gøym robotar',
-'watchlist-show-own'   => 'Vis endringane mine',
-'watchlist-hide-own'   => 'Gøym endringane mine',
-'watchlist-show-minor' => 'Vis småplukk',
-'watchlist-hide-minor' => 'Gøym småplukk',
+'watchlist-options'    => 'Alternativ for overvakingslista',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Overvakar...',
@@ -1684,73 +1854,92 @@ For å endre innstillingane for overvakingslista di, gå til
 For hjelp og meir informasjon:
 {{fullurl:Hjelp:Overvaking}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Slett side',
-'confirm'                     => 'Stadfest',
-'excontent'                   => 'innhaldet var: «$1»',
-'excontentauthor'             => 'innhaldet var: «$1» (og den einaste bidragsytaren var «$2»)',
-'exbeforeblank'               => 'innhaldet før sida vart tømd var: «$1»',
-'exblank'                     => 'sida var tom',
-'delete-confirm'              => 'Slett «$1»',
-'delete-legend'               => 'Slett',
-'historywarning'              => 'Åtvaring: Sida du held på å slette har ein historikk:',
-'confirmdeletetext'           => 'Du held på å varig slette ei side eller eit bilete saman med heile den tilhøyrande historikken frå databasen. Stadfest at du verkeleg vil gjere dette, at du skjønar konsekvensane, og at du gjer dette i tråd med [[{{MediaWiki:Policy-url}}|retningslinene]].',
-'actioncomplete'              => 'Ferdig',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» er sletta. Sjå $2 for eit oversyn over dei siste slettingane.',
-'deletedarticle'              => 'sletta «[[$1]]»',
-'suppressedarticle'           => 'gøymde «[[$1]]»',
-'dellogpage'                  => 'Slettelogg',
-'dellogpagetext'              => 'Her er ei liste over dei siste slettingane.',
-'deletionlog'                 => 'slettelogg',
-'reverted'                    => 'Attenderulla til ein tidlegare versjon',
-'deletecomment'               => 'Slettingsårsak:',
-'deleteotherreason'           => 'Anna grunn:',
-'deletereasonotherlist'       => 'Anna grunn',
-'deletereason-dropdown'       => '*Vanlege grunnar for sletting
-** På førespurnad frå forfattren
+# Delete
+'deletepage'             => 'Slett side',
+'confirm'                => 'Stadfest',
+'excontent'              => 'innhaldet var: «$1»',
+'excontentauthor'        => 'innhaldet var: «$1» (og den einaste bidragsytaren var «$2»)',
+'exbeforeblank'          => 'innhaldet før sida vart tømd var: «$1»',
+'exblank'                => 'sida var tom',
+'delete-confirm'         => 'Slett «$1»',
+'delete-legend'          => 'Slett',
+'historywarning'         => 'Åtvaring: Sida du held på å slette har ein historikk:',
+'confirmdeletetext'      => 'Du held på å varig slette ei side eller eit bilete saman med heile den tilhøyrande historikken frå databasen. Stadfest at du verkeleg vil gjere dette, at du skjønar konsekvensane, og at du gjer dette i tråd med [[{{MediaWiki:Policy-url}}|retningslinene]].',
+'actioncomplete'         => 'Ferdig',
+'deletedtext'            => '«<nowiki>$1</nowiki>» er sletta. Sjå $2 for eit oversyn over dei siste slettingane.',
+'deletedarticle'         => 'sletta «[[$1]]»',
+'suppressedarticle'      => 'gøymde «[[$1]]»',
+'dellogpage'             => 'Slettelogg',
+'dellogpagetext'         => 'Her er ei liste over dei siste slettingane.',
+'deletionlog'            => 'slettelogg',
+'reverted'               => 'Attenderulla til ein tidlegare versjon',
+'deletecomment'          => 'Slettingsårsak:',
+'deleteotherreason'      => 'Annan grunn:',
+'deletereasonotherlist'  => 'Annan grunn',
+'deletereason-dropdown'  => '*Vanlege grunnar for sletting
+** På førespurnad frå forfattaren
 ** Brot på opphavsretten
 ** Hærverk',
-'delete-edit-reasonlist'      => 'Endre grunnar til sletting',
-'delete-toobig'               => 'Denne sida har ein stor endringsshistorikk, med over {{PLURAL:$1|$1&nbsp;endring|$1&nbsp;endringar}}. Sletting av slike sider er avgrensa for å unngå utilsikta forstyrring av {{SITENAME}}.',
-'delete-warning-toobig'       => 'Denne sida har ein lang endringshistorikk, med meir enn {{PLURAL:$1|$1&nbsp;endring|$1&nbsp;endringar}}. Dersom du slettar henne kan det forstyrre handlingar i databasen til {{SITENAME}}, ver varsam.',
-'rollback'                    => 'Rull attende endringar',
-'rollback_short'              => 'Rull attende',
-'rollbacklink'                => 'rull attende',
-'rollbackfailed'              => 'Kunne ikkje rulle attende',
-'cantrollback'                => 'Kan ikkje rulle attende fordi den siste brukaren er den einaste forfattaren.',
-'alreadyrolled'               => 'Kan ikkje rulle attende den siste endringa av [[$1]] gjort av [[User:$2|$2]] ([[User talk:$2|diskusjon]] | [[Special:Contributions/$2|{{int:contribslink}}]]) fordi nokon andre alt har endra sida att eller fjerna endringa.
-
-Den siste endringa vart gjort av [[User:$3|$3]] ([[User talk:$3|brukardiskusjon]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Samandraget for endringa var: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Attenderulla endring gjort av [[Special:Contributions/$2|$2]] til tidlegare versjon endra av [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Rulla attende endringane av $1, tilbake til siste versjon av $2.',
-'sessionfailure'              => 'Det ser ut til å vera eit problem med innloggingsøkta di. Handlinga er vorten avbroten for å vera føre var mot kidnapping av økta. Bruk attendeknappen i nettlesaren din og prøv om att.',
+'delete-edit-reasonlist' => 'Endre grunnar til sletting',
+'delete-toobig'          => 'Denne sida har ein stor endringsshistorikk, med over {{PLURAL:$1|$1&nbsp;endring|$1&nbsp;endringar}}. Sletting av slike sider er avgrensa for å unngå utilsikta forstyrring av {{SITENAME}}.',
+'delete-warning-toobig'  => 'Denne sida har ein lang endringshistorikk, med meir enn {{PLURAL:$1|$1&nbsp;endring|$1&nbsp;endringar}}. Dersom du slettar henne kan det forstyrre handlingar i databasen til {{SITENAME}}, ver varsam.',
+
+# Rollback
+'rollback'         => 'Rull attende endringar',
+'rollback_short'   => 'Rull attende',
+'rollbacklink'     => 'rull attende',
+'rollbackfailed'   => 'Kunne ikkje rulle attende',
+'cantrollback'     => 'Kan ikkje rulle attende fordi den siste brukaren er den einaste forfattaren.',
+'alreadyrolled'    => 'Kan ikkje rulle attende den siste endringa av [[$1]] gjort av [[User:$2|$2]] ([[User talk:$2|diskusjon]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) fordi nokon andre alt har endra sida att eller fjerna endringa.
+
+Den siste endringa vart gjort av [[User:$3|$3]] ([[User talk:$3|brukardiskusjon]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Samandraget for endringa var: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => 'Attenderulla endring gjort av [[Special:Contributions/$2|$2]] til tidlegare versjon endra av [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Rulla attende endringane av $1, tilbake til siste versjon av $2.',
+'sessionfailure'   => 'Det ser ut til å vera eit problem med innloggingsøkta di. Handlinga er vorten avbroten for å vera føre var mot kidnapping av økta. Bruk attendeknappen i nettlesaren din og prøv om att.',
+
+# Protect
 'protectlogpage'              => 'Vernelogg',
 'protectlogtext'              => 'Dette er ei liste over sider som er vortne verna eller har fått fjerna vern. [[Special:ProtectedPages|Verna side]] for meir info.',
 'protectedarticle'            => 'verna «[[$1]]»',
 'modifiedarticleprotection'   => 'endra nivået på vernet av «[[$1]]»',
 'unprotectedarticle'          => 'fjerna vern av «[[$1]]»',
+'movedarticleprotection'      => 'flytta verneinnstillingar frå «[[$2]]» til «[[$1]]»',
 'protect-title'               => 'Vernar «$1»',
+'prot_1movedto2'              => '«[[$1]]» flytt til «[[$2]]»',
 'protect-legend'              => 'Stadfest vern',
 'protectcomment'              => 'Grunn til verning',
 'protectexpiry'               => 'Utgår:',
 'protect_expiry_invalid'      => 'Utløpstida er ugyldig.',
 'protect_expiry_old'          => 'Utløpstida har allereie vore.',
 'protect-unchain'             => 'Tillat flytting',
-'protect-text'                => 'Her kan du kan sjå og endre på graden av vern for sida <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Du kan ikkje endre nivå på vern medan du er blokkert. Dette er dei noverande innstillingane for sida <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Du kan ikkje endre nivå på vern fordi databasen er låst akkurat no. Dette er dei noverande innstillingane for sida <strong>$1</strong>:',
-'protect-locked-access'       => 'Brukarkontoen din har ikkje tilgang til endring av vern.
-Her er dei noverande innstillingane for sida <strong>$1</strong>:',
+'protect-text'                => "Her kan du kan sjå og endre på graden av vern for sida '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Du kan ikkje endre nivå på vern medan du er blokkert. Dette er dei noverande innstillingane for sida '''$1''':",
+'protect-locked-dblock'       => "Du kan ikkje endre nivå på vern fordi databasen er låst akkurat no. Dette er dei noverande innstillingane for sida '''$1''':",
+'protect-locked-access'       => "Brukarkontoen din har ikkje tilgang til endring av vern.
+Her er dei noverande innstillingane for sida '''$1''':",
 'protect-cascadeon'           => 'Denne sida er verna fordi ho er inkludert på {{PLURAL:$1|den opplista sida|dei opplista sidene}} som har djupvern slått på. Du kan endre på nivået til vernet av denne sida, men det vil ikkje ha innverknad på djupvernet.',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Tillat alle brukarar',
 'protect-fallback'            => 'Må ha «$1»-tilgang',
-'protect-level-autoconfirmed' => 'Blokker uregistrerte brukarar',
+'protect-level-autoconfirmed' => 'Blokker nye og uregistrerte brukarar',
 'protect-level-sysop'         => 'Berre administratorar',
 'protect-summary-cascade'     => 'djupvern',
 'protect-expiring'            => 'utgår $1 (UTC)',
+'protect-expiry-indefinite'   => 'ubestemt',
 'protect-cascade'             => 'Vern alle sidene som er inkludert på denne sida (djupvern)',
 'protect-cantedit'            => 'Du kan ikkje endre på nivået på vernet av denne sida, fordi du ikkje har tilgang til å endre henne.',
+'protect-othertime'           => 'Anna tid:',
+'protect-othertime-op'        => 'anna tid',
+'protect-existing-expiry'     => 'Gjeldande utløpstid: $3 $2',
+'protect-otherreason'         => 'Annan/ytterlegare årsak:',
+'protect-otherreason-op'      => 'annan/ytterlegare årsak',
+'protect-dropdown'            => '*Vanlege verneårsaker
+** Gjenteke hærverk
+** Gjenteke spam
+** Endringskrig
+** Side med mange vitjande',
+'protect-edit-reasonlist'     => 'Endrar verneårsaker',
+'protect-expiry-options'      => '2 timar:2 hours,1 dag:1 day,3 dagar:3 days,1 veke:1 week,2 veker:2 weeks,1 månad:1 month,3 månader:3 months,6 månader:6 months,1 år:1 year,endelaus:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Tilgang:',
 'restriction-level'           => 'Avgrensingsnivå:',
 'minimum-size'                => 'Minimumstorleik',
@@ -1773,7 +1962,7 @@ Her er dei noverande innstillingane for sida <strong>$1</strong>:',
 'undeletepage'                 => 'Sletta sider',
 'undeletepagetitle'            => "'''Følgjande innhald er sletta versjonar av [[:$1]]'''.",
 'viewdeletedpage'              => 'Sjå sletta sider',
-'undeletepagetext'             => 'Dei følgjande sidene er sletta, men dei finst enno i arkivet og kan attopprettast. Arkivet blir periodevis sletta.',
+'undeletepagetext'             => '{{PLURAL:$1|Den følgjande sida er sletta, men ho|Dei følgjande $1 sidene er sletta, men dei}} finst enno i arkivet og kan attopprettast. Arkivet blir periodevis sletta.',
 'undelete-fieldset-title'      => 'Attenderull endringar',
 'undeleteextrahelp'            => "For å attenderulle heile sida, la alle boksane vere som dei er, og klikk '''''Rull attende'''''.
 For å berre attenderulle delar, kryss av boksane til endringane, og klikk '''''Rull attende'''''.
@@ -1784,12 +1973,13 @@ For å berre attenderulle delar, kryss av boksane til endringane, og klikk '''''
 'undeletehistorynoadmin'       => 'Ein eller fleire versjonar av denne sida har blitt sletta.
 Grunnlaget for sletting er oppgjeve under, saman med informasjon om kven som sletta og når versjonane vart sletta.
 Innhaldet i dei sletta versjonane er berre tilgjengeleg for administratorar.',
-'undelete-revision'            => 'Sletta versjon av $1 av $3 (frå $2):',
+'undelete-revision'            => 'Sletta revisjon av $1 (per $4 $5) av $3:',
 'undeleterevision-missing'     => 'Ugyldig eller manglande versjon. Lenkja kan vere feil, eller han kan vere fjerna frå arkivet.',
 'undelete-nodiff'              => 'Fann ingen eldre versjonar.',
 'undeletebtn'                  => 'Attopprett',
 'undeletelink'                 => 'attopprett',
 'undeletereset'                => 'Nullstill',
+'undeleteinvert'               => 'Inverter val',
 'undeletecomment'              => 'Kommentar:',
 'undeletedarticle'             => 'attoppretta «[[$1]]»',
 'undeletedrevisions'           => '{{PLURAL:$1|Éin versjon|$1 versjonar}} attoppretta.',
@@ -1821,26 +2011,27 @@ $1',
 'blanknamespace' => '(Hovud)',
 
 # Contributions
-'contributions' => 'Brukarbidrag',
-'mycontris'     => 'Eigne bidrag',
-'contribsub2'   => 'For $1 ($2)',
-'nocontribs'    => 'Det vart ikkje funne nokon endringar gjorde av denne brukaren.',
-'uctop'         => ' (øvst)',
-'month'         => 'MÃ¥nad:',
-'year'          => 'Ã…r:',
-
-'sp-contributions-newbies'     => 'Vis berre bidrag frå nye brukarar',
-'sp-contributions-newbies-sub' => 'For nybyrjarar',
-'sp-contributions-blocklog'    => 'Blokkeringslogg',
-'sp-contributions-search'      => 'Søk etter bidrag',
-'sp-contributions-username'    => 'IP-adresse eller brukarnamn:',
-'sp-contributions-submit'      => 'Søk',
+'contributions'       => 'Brukarbidrag',
+'contributions-title' => 'Bidrag av $1',
+'mycontris'           => 'Eigne bidrag',
+'contribsub2'         => 'For $1 ($2)',
+'nocontribs'          => 'Det vart ikkje funne nokon endringar gjorde av denne brukaren.',
+'uctop'               => ' (øvst)',
+'month'               => 'MÃ¥nad:',
+'year'                => 'Ã…r:',
+
+'sp-contributions-newbies'       => 'Vis berre bidrag frå nye brukarar',
+'sp-contributions-newbies-sub'   => 'For nybyrjarar',
+'sp-contributions-newbies-title' => 'Brukarbidrag av nye brukarar',
+'sp-contributions-blocklog'      => 'Blokkeringslogg',
+'sp-contributions-search'        => 'Søk etter bidrag',
+'sp-contributions-username'      => 'IP-adresse eller brukarnamn:',
+'sp-contributions-submit'        => 'Søk',
 
 # What links here
 'whatlinkshere'            => 'Lenkjer hit',
 'whatlinkshere-title'      => 'Sider som har lenkje til «$1»',
 'whatlinkshere-page'       => 'Side:',
-'linklistsub'              => '(Liste over lenkjer)',
 'linkshere'                => "Desse sidene har lenkjer til '''[[:$1]]''':",
 'nolinkshere'              => "Inga side har lenkje '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Ingen sider har lenkje til '''[[:$1]]''' i det valde namnerommet.",
@@ -1883,6 +2074,8 @@ $1',
 'ipbotherreason'                  => 'Anna grunn/tilleggsgrunn:',
 'ipbhidename'                     => 'Gøym brukarnamnet frå blokkeringsloggen, lista over aktive blokkeringar og brukarlista',
 'ipbwatchuser'                    => 'Overvak brukarsida og diskusjonssida til brukaren',
+'ipballowusertalk'                => 'La brukaren endre si eiga diskusjonsside under blokkeringa',
+'ipb-change-block'                => 'Blokker brukaren på nytt med desse innstillingane',
 'badipaddress'                    => 'IP-adressa er ugyldig eller blokkering av brukarar er slått av på tenaren.',
 'blockipsuccesssub'               => 'Blokkering utført',
 'blockipsuccesstext'              => '«[[Special:Contributions/$1|$1]]» er blokkert.<br />
@@ -1892,6 +2085,7 @@ Sjå [[Special:IPBlockList|blokkeringslista]] for alle blokkeringar.',
 'ipb-unblock'                     => 'Opphev blokkeringa av eit brukarnamn eller ei IP-adresse',
 'ipb-blocklist-addr'              => 'Gjeldande blokkeringar av $1',
 'ipb-blocklist'                   => 'Vis gjeldande blokkeringar',
+'ipb-blocklist-contribs'          => 'Bidrag frå $1',
 'unblockip'                       => 'Opphev blokkering',
 'unblockiptext'                   => 'Bruk skjemaet nedanfor for å oppheve blokkeringa av ein tidlegare blokkert brukar.',
 'ipusubmit'                       => 'Opphev blokkering',
@@ -1900,6 +2094,9 @@ Sjå [[Special:IPBlockList|blokkeringslista]] for alle blokkeringar.',
 'ipblocklist'                     => 'Blokkerte IP-adresser og brukarnamn',
 'ipblocklist-legend'              => 'Finn ein blokkert brukar',
 'ipblocklist-username'            => 'Brukarnamn eller IP-adresse:',
+'ipblocklist-sh-userblocks'       => '$1 blokkeringar av kontoar',
+'ipblocklist-sh-tempblocks'       => '$1 mellombelse blokkeringar',
+'ipblocklist-sh-addressblocks'    => '$1 blokkeringar av individuelle IP-adresser',
 'ipblocklist-submit'              => 'Søk',
 'blocklistline'                   => '$1, $2 blokkerte $3 ($4)',
 'infiniteblock'                   => 'uendeleg opphøyrstid',
@@ -1908,14 +2105,18 @@ Sjå [[Special:IPBlockList|blokkeringslista]] for alle blokkeringar.',
 'noautoblockblock'                => 'automatisk blokkering slått av',
 'createaccountblock'              => 'kontooppretting blokkert',
 'emailblock'                      => 'sending av e-post blokkert',
+'blocklist-nousertalk'            => 'kan ikkje endre si eiga diskusjonsside',
 'ipblocklist-empty'               => 'Lista over blokkeringar er tom.',
 'ipblocklist-no-results'          => 'Det etterspurde brukarnamnet eller IP-adressa er ikkje blokkert.',
 'blocklink'                       => 'blokker',
 'unblocklink'                     => 'opphev blokkering',
+'change-blocklink'                => 'endra blokkering',
 'contribslink'                    => 'bidrag',
 'autoblocker'                     => 'Automatisk blokkert fordi du deler IP-adresse med [[User:$1|$1]]. Grunngjeving gjeve for blokkeringa av $1 var: «$2».',
 'blocklogpage'                    => 'Blokkeringslogg',
+'blocklog-fulllog'                => 'Fullstendig blokkeringslogg',
 'blocklogentry'                   => 'Blokkerte «[[$1]]» med opphøyrstid $2 $3',
+'reblock-logentry'                => 'endra blokkeringsinnstillingar for [[$1]] med tida $2 $3',
 'blocklogtext'                    => 'Dette er ein logg over blokkeringar og oppheving av blokkeringar gjorde.
 IP-adresser som blir automatisk blokkerte er ikkje lista her. Sjå [[Special:IPBlockList|blokkeringslista]] for alle aktive blokkeringar.',
 'unblocklogentry'                 => 'oppheva blokkering av «$1»',
@@ -1923,11 +2124,14 @@ IP-adresser som blir automatisk blokkerte er ikkje lista her. Sjå [[Special:IPB
 'block-log-flags-nocreate'        => 'kontooppretting slått av',
 'block-log-flags-noautoblock'     => 'automatisk blokkering slått av',
 'block-log-flags-noemail'         => 'sending av e-post blokkert',
+'block-log-flags-nousertalk'      => 'kan ikkje endre eiga diskusjonsside',
 'block-log-flags-angry-autoblock' => 'utvida autoblokkering aktivert',
 'range_block_disabled'            => 'Funksjonen for blokkering av IP-adresse-seriar er deaktivert på tenaren.',
 'ipb_expiry_invalid'              => 'Ugyldig opphørstid.',
 'ipb_expiry_temp'                 => 'For å skjule brukarnamnet må blokkeringa vere permanent.',
 'ipb_already_blocked'             => '«$1» er allereie blokkert',
+'ipb-needreblock'                 => '== Alt blokkert ==
+$1 er alt blokkert. Vil du endre innstillingane?',
 'ipb_cant_unblock'                => 'Feil: Fann ikkje blokkeringsnummeret $1. Blokkeringa kan vere oppheva allereie.',
 'ipb_blocked_as_range'            => 'Feil: IP-en $1 er ikkje direkte blokkert og kan ikkje opphevast. Adressa er blokkert som ein del av blokkeringa av IP-intervallet $2. Denne blokkeringa kan opphevast.',
 'ip_range_invalid'                => 'Ugyldig IP-adresseserie.',
@@ -1938,6 +2142,7 @@ IP-adresser som blir automatisk blokkerte er ikkje lista her. Sjå [[Special:IPB
 'proxyblocksuccess'               => 'Utført.',
 'sorbsreason'                     => 'IP-adressa di er lista som ein open mellomtenar i DNSBL.',
 'sorbs_create_account_reason'     => 'IP-adressa di er lista som ein open mellomtenar i DNSBL, og difor får du ikkje registrert deg.',
+'cant-block-while-blocked'        => 'Du kan ikkje blokkere andre medan du sjølv er blokkert.',
 
 # Developer tools
 'lockdb'              => 'Skrivevern (lock) database',
@@ -1957,54 +2162,67 @@ IP-adresser som blir automatisk blokkerte er ikkje lista her. Sjå [[Special:IPB
 'databasenotlocked'   => 'Databasen er ikkje låst.',
 
 # Move page
-'move-page'               => 'Flytt $1',
-'move-page-legend'        => 'Flytt side',
-'movepagetext'            => "Ved å bruke skjemaet nedanfor kan du få omdøypt ei side og flytt heile historikken til det nye namnet. Den gamle tittelen vil bli ei omdirigeringsside til den nye tittelen. Lenkjer til den gamle tittelen vil ikkje bli endra. Pass på å sjekke for doble eller dårlege omdirigeringar. Du er ansvarleg for at alle lenkjene stadig peiker dit det er meininga at dei skal peike.
+'move-page'                    => 'Flytt $1',
+'move-page-legend'             => 'Flytt side',
+'movepagetext'                 => "Ved å bruke skjemaet nedanfor kan du få omdøypt ei side og flytt heile historikken til det nye namnet. Den gamle tittelen vil bli ei omdirigeringsside til den nye tittelen. Lenkjer til den gamle tittelen vil ikkje bli endra. Pass på å sjekke for doble eller dårlege omdirigeringar. Du er ansvarleg for at alle lenkjene stadig peiker dit det er meininga at dei skal peike.
 
 Merk at sida '''ikkje''' kan flyttast dersom det allereie finst ei side med den nye tittelen. Du kan likevel flytte ei side attende dit ho vart flytt frå dersom du gjer ein feil, så lenge den sida du flytter attende til ikkje er vorten endra sidan flyttinga.
 
 <b>ÅTVARING!</b> Dette kan vera ei drastisk og uventa endring for ei populær side; ver sikker på at du skjønner konsekvensane av dette før du fortset.",
-'movepagetalktext'        => "Den tilhøyrande diskusjonssida, om ho finst, vil automatisk bli flytt med sida '''med mindre:'''
+'movepagetalktext'             => "Den tilhøyrande diskusjonssida, om ho finst, vil automatisk bli flytt med sida '''med mindre:'''
 *Du flytter sida til eit anna namnerom, eller
 *Du fjernar merkinga i boksen nedanfor.
 
 I desse falla lyt du flytte eller flette saman sida manuelt.",
-'movearticle'             => 'Flytt side:',
-'movenotallowed'          => 'Du har ikkje tilgang til å flytte sider.',
-'newtitle'                => 'Til ny tittel',
-'move-watch'              => 'Overvak denne sida',
-'movepagebtn'             => 'Flytt side',
-'pagemovedsub'            => 'Flyttinga er gjennomført',
-'movepage-moved'          => "<big>'''«$1» er flytt til «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Ei side med det namnet finst allereie, eller det namnet du har valt er ikkje gyldig. Vel eit anna namn.',
-'cantmove-titleprotected' => 'Du kan ikkje flytte sida hit, fordi det nye sidenamnet er verna mot oppretting.',
-'talkexists'              => "'''Innhaldssida vart flytt, men diskusjonssida som høyrer til kunne ikkje flyttast fordi det allereie finst ei side med den nye tittelen. Du lyt difor flette dei saman manuelt.'''",
-'movedto'                 => 'er flytt til',
-'movetalk'                => 'Flytt diskusjonssida òg om ho finst.',
-'move-subpages'           => 'Flytt alle undersider om det finst nokre',
-'move-talk-subpages'      => 'Flytt alle undersider av diskusjonssida, om det finst nokre',
-'movepage-page-exists'    => 'Sida $1 finst alt og kan ikkje skrivast over automatisk.',
-'movepage-page-moved'     => 'Sida $1 har blitt flytta til $2.',
-'movepage-page-unmoved'   => 'Sida $1 kunne ikkje flyttast til $2.',
-'movepage-max-pages'      => 'Grensa på {{PLURAL:$1|éi side|$1 sider}} er nådd; ingen fleire sider kjem til å verte flytta automatisk.',
-'1movedto2'               => '«[[$1]]» flytt til «[[$2]]»',
-'1movedto2_redir'         => '«[[$1]]» flytt over omdirigering til «[[$2]]»',
-'movelogpage'             => 'Flyttelogg',
-'movelogpagetext'         => 'Under er ei liste over sider som er flytte.',
-'movereason'              => 'Ã…rsak:',
-'revertmove'              => 'attende',
-'delete_and_move'         => 'Slett og flytt',
-'delete_and_move_text'    => '== Sletting påkrevd ==
+'movearticle'                  => 'Flytt side:',
+'movenologin'                  => 'Ikkje innlogga',
+'movenologintext'              => 'Du lyt vera registrert brukar og vera [[Special:UserLogin|innlogga]] for å flytte ei side.',
+'movenotallowed'               => 'Du har ikkje tilgang til å flytte sider.',
+'movenotallowedfile'           => 'Du har ikkje løyve til å flytta filer.',
+'cant-move-user-page'          => 'Du har ikkje løyve til å flytte brukarsider (bortsett frå undersider).',
+'cant-move-to-user-page'       => 'Du har ikkje løyve til å flytte brukarsider (bortsett frå undersider).',
+'newtitle'                     => 'Til ny tittel',
+'move-watch'                   => 'Overvak denne sida',
+'movepagebtn'                  => 'Flytt side',
+'pagemovedsub'                 => 'Flyttinga er gjennomført',
+'movepage-moved'               => "<big>'''«$1» er flytt til «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Ei omdirigering er vorten oppretta.',
+'movepage-moved-noredirect'    => 'Det vart ikkje oppretta ei omdirigering.',
+'articleexists'                => 'Ei side med det namnet finst allereie, eller det namnet du har valt er ikkje gyldig. Vel eit anna namn.',
+'cantmove-titleprotected'      => 'Du kan ikkje flytte sida hit, fordi det nye sidenamnet er verna mot oppretting.',
+'talkexists'                   => "'''Innhaldssida vart flytt, men diskusjonssida som høyrer til kunne ikkje flyttast fordi det allereie finst ei side med den nye tittelen. Du lyt difor flette dei saman manuelt.'''",
+'movedto'                      => 'er flytt til',
+'movetalk'                     => 'Flytt diskusjonssida òg om ho finst.',
+'move-subpages'                => 'Flytt alle undersider om det finst nokre',
+'move-talk-subpages'           => 'Flytt alle undersider av diskusjonssida, om det finst nokre',
+'movepage-page-exists'         => 'Sida $1 finst alt og kan ikkje skrivast over automatisk.',
+'movepage-page-moved'          => 'Sida $1 har blitt flytta til $2.',
+'movepage-page-unmoved'        => 'Sida $1 kunne ikkje flyttast til $2.',
+'movepage-max-pages'           => 'Grensa på {{PLURAL:$1|éi side|$1 sider}} er nådd; ingen fleire sider kjem til å verte flytta automatisk.',
+'1movedto2'                    => '«[[$1]]» flytt til «[[$2]]»',
+'1movedto2_redir'              => '«[[$1]]» flytt over omdirigering til «[[$2]]»',
+'move-redirect-suppressed'     => 'inga omdirigering',
+'movelogpage'                  => 'Flyttelogg',
+'movelogpagetext'              => 'Under er ei liste over sider som er flytte.',
+'movereason'                   => 'Ã…rsak:',
+'revertmove'                   => 'attende',
+'delete_and_move'              => 'Slett og flytt',
+'delete_and_move_text'         => '== Sletting påkrevd ==
 
 Målsida «[[:$1]]» finst allereie. Vil du slette ho for å gje rom for flytting?',
-'delete_and_move_confirm' => 'Ja, slett sida',
-'delete_and_move_reason'  => 'Sletta for å gje rom for flytting',
-'selfmove'                => 'Kjelde- og måltitlane er like; kan ikkje flytte sida over seg sjølv.',
-'immobile_namespace'      => 'Måltittelen høyrer til eit namnerom som gjer at sida ikkje kan flyttast dit.',
-'imagenocrossnamespace'   => 'Kan ikkje flytte bilete til andre namnerom enn biletnamnerommet',
-'imagetypemismatch'       => 'Den nye filendinga høver ikkje til filtypen',
-'imageinvalidfilename'    => 'MÃ¥lnamnet er ugyldig',
-'fix-double-redirects'    => 'Oppdater omdirigeringar som viser til den gamle tittelen',
+'delete_and_move_confirm'      => 'Ja, slett sida',
+'delete_and_move_reason'       => 'Sletta for å gje rom for flytting',
+'selfmove'                     => 'Kjelde- og måltitlane er like; kan ikkje flytte sida over seg sjølv.',
+'immobile-source-namespace'    => 'Kan ikkje flytte sider i namnerommet «$1»',
+'immobile-target-namespace'    => 'Kan ikkje flytte sider til namnerommet «$1»',
+'immobile-target-namespace-iw' => 'Interwikilenkja er ikkje eit gyldig mål for flytting av sider.',
+'immobile-source-page'         => 'Denne sida kan ikkje flyttast.',
+'immobile-target-page'         => 'Kan ikkje flytte til det målnamnet.',
+'imagenocrossnamespace'        => 'Kan ikkje flytte bilete til andre namnerom enn biletnamnerommet',
+'imagetypemismatch'            => 'Den nye filendinga høver ikkje til filtypen',
+'imageinvalidfilename'         => 'MÃ¥lnamnet er ugyldig',
+'fix-double-redirects'         => 'Oppdater omdirigeringar som viser til den gamle tittelen',
+'move-leave-redirect'          => 'La det vere att ei omdirigering',
 
 # Export
 'export'            => 'Eksporter sider',
@@ -2013,7 +2231,7 @@ Dette kan så importerast til ein annan wiki som brukar MediaWiki-programvaren g
 
 For å eksportere sider, skriv inn titlar i tekstboksen under, ein tittel per linje, og velg om du vil ha berre noverande versjon, eller alle versjonar i historikken.
 
-Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til dømes [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] for sida «[[{{MediaWiki:Mainpage}}]]».',
+Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til dømes [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] for sida «[[{{MediaWiki:Mainpage}}]]».',
 'exportcuronly'     => 'Berre eksporter siste versjonen, ikkje med heile historikken.',
 'exportnohistory'   => "----
 '''Merk:''' Å eksportere heile sidehistorikkar gjennom dette skjemaet er slått av grunna problem med ytinga.",
@@ -2028,7 +2246,8 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'allmessagesname'           => 'Namn',
 'allmessagesdefault'        => 'Standardtekst',
 'allmessagescurrent'        => 'Noverande tekst',
-'allmessagestext'           => 'Dette er ei liste over systemmeldingar i MediaWiki-namnerommet.',
+'allmessagestext'           => 'Dette er ei liste over systemmeldingar i MediaWiki-namnerommet.
+Vitja [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] og [http://translatewiki.net translatewiki.net] om du ynskjer å bidra til den generelle omsetjinga av MediaWiki.',
 'allmessagesnotsupportedDB' => "Denne sida er ikkje brukande fordi \"'''\$wgUseDatabaseMessages'''\" er slått av.",
 'allmessagesfilter'         => 'Meldingsfilter:',
 'allmessagesmodified'       => 'Vis berre endra',
@@ -2046,9 +2265,12 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'import'                     => 'Importer sider',
 'importinterwiki'            => 'Transwikiimport',
 'import-interwiki-text'      => 'Vel ei wiki og ei side å importere. Endringssdatoer og brukarar som har medverka vert bevart. Alle transwiki-importeringar vert vist i [[Special:Log/import|importloggen]].',
+'import-interwiki-source'    => 'Kjeldewiki/sida:',
 'import-interwiki-history'   => 'Kopier all historikken for denne sida',
 'import-interwiki-submit'    => 'Importer',
 'import-interwiki-namespace' => 'MÃ¥lnamnerom:',
+'import-upload-filename'     => 'Filnamn:',
+'import-comment'             => 'Kommentar:',
 'importtext'                 => 'Eksporter fila frå kjeldewikien med [[Special:Export|eksporteringsverktøyet]], lagre ho på di eiga datamaskin, og last henne opp her.',
 'importstart'                => 'Importerer sidene…',
 'import-revision-count'      => '$1 {{PLURAL:$1|versjon|versjonar}}',
@@ -2082,19 +2304,19 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|Éin versjon|$1 versjonar}} frå $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Brukarsida mi',
+'tooltip-pt-userpage'             => 'Brukarsida di',
 'tooltip-pt-anonuserpage'         => 'Brukarsida for ip-adressa du endrar under',
-'tooltip-pt-mytalk'               => 'Diskusjonssida mi',
+'tooltip-pt-mytalk'               => 'Diskusjonssida di',
 'tooltip-pt-anontalk'             => 'Diskusjon om endringar gjorde av denne ip-adressa',
 'tooltip-pt-preferences'          => 'Innstillingane mine',
 'tooltip-pt-watchlist'            => 'Liste over sidene du overvakar.',
-'tooltip-pt-mycontris'            => 'Liste over bidraga mine',
+'tooltip-pt-mycontris'            => 'Liste over bidraga dine',
 'tooltip-pt-login'                => 'Det er ikkje obligatorisk å logga inn, men medfører mange fordelar.',
 'tooltip-pt-anonlogin'            => 'Det er ikkje obligatorisk å logga inn, men medfører mange fordelar.',
 'tooltip-pt-logout'               => 'Logg ut',
 'tooltip-ca-talk'                 => 'Diskusjon om innhaldssida',
 'tooltip-ca-edit'                 => 'Du kan endre denne sida. Bruk førehandsvisings-knappen før du lagrar.',
-'tooltip-ca-addsection'           => 'Legg til ein bolk på denne diskusjonssida.',
+'tooltip-ca-addsection'           => 'Start ein ny bolk',
 'tooltip-ca-viewsource'           => 'Denne sida er verna, men du kan sjå kjeldeteksten.',
 'tooltip-ca-history'              => 'Eldre versjonar av denne sida.',
 'tooltip-ca-protect'              => 'Vern denne sida',
@@ -2141,6 +2363,8 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'tooltip-watch'                   => 'Legg denne sida til i overvakingslista di [alt-w]',
 'tooltip-recreate'                => 'Ved å trykkje på «Nyopprett» vert sida oppretta på nytt.',
 'tooltip-upload'                  => 'Start opplastinga',
+'tooltip-rollback'                => '«Attenderull»-knappen attenderullar endringar på denne sida med eitt klikk til den førre utgåva av ein annan brukar.',
+'tooltip-undo'                    => '«Gjer om» attenderullar endringar og opnar endringsvindauga med førehandsvising. Gjer at ein kan leggje til ei årsak samandragsboksen.',
 
 # Stylesheets
 'common.css'      => '/* CSS plassert i denne fila vil gjelde for alle utsjånader. */',
@@ -2152,6 +2376,8 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'chick.css'       => '/* CSS i denne fila vil gjelde alle som nyttar drakta Chick */',
 'simple.css'      => '/* CSS i denne fila vil gjelde alle som nyttar drakta Simple */',
 'modern.css'      => '/* CSS i denne fila vil gjelde alle som nyttar drakta Modern */',
+'print.css'       => '/* CSS i denne fila vil påverke utskriftsversjonen */',
+'handheld.css'    => '/* CSS i denne fila vil gjelde alle handheldte innretnigar konfigurert i $wgHandheldStyle */',
 
 # Scripts
 'common.js'      => '/* Javascript i denne fila vil gjelde for alle drakter. */',
@@ -2170,12 +2396,12 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'notacceptable'     => 'Wikitenaren kan ikkje gje data i noko format som programmet ditt kan lesa.',
 
 # Attribution
-'anonymous'        => 'Anonym(e) brukar(ar) av {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonym brukar|Anonyme brukarar}} av {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} brukar $1',
 'lastmodifiedatby' => 'Denne sida vart sist endra $2, $1 av $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basert på arbeid av $1.',
 'others'           => 'andre',
-'siteusers'        => '{{SITENAME}} brukar(ar) $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|brukar|brukarar}} $1',
 'creditspage'      => 'Sidegodskriving',
 'nocredits'        => 'Det finst ikkje ikkje nokon godskrivingsinformasjon for denne sida.',
 
@@ -2195,6 +2421,16 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'numauthors'     => 'Tal ulike bidragsytarar (innhaldsside): $1',
 'numtalkauthors' => 'Tal ulike bidragsytarar (diskusjonsside): $1',
 
+# Skin names
+'skinname-standard'    => 'Klassisk',
+'skinname-nostalgia'   => 'Nostalgi',
+'skinname-cologneblue' => 'Kölnerblå',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MiDrakt',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Enkel',
+'skinname-modern'      => 'Moderne',
+
 # Math options
 'mw_math_png'    => 'Vis alltid som PNG',
 'mw_math_simple' => 'HTML om svært enkel, elles PNG',
@@ -2215,10 +2451,12 @@ Dersom du berre vil ha noverande versjon, kan du også bruke ei lenkje, til døm
 'markedaspatrollederror-noautopatrol' => 'Ein har ikkje høve til å merkje sine eigne endringar som godkjende.',
 
 # Patrol log
-'patrol-log-page'   => 'Patruljeringslogg',
-'patrol-log-header' => 'Dette er ein logg over patruljerte sideversjonar.',
-'patrol-log-line'   => 'merka $1 av $2 godkjend $3',
-'patrol-log-auto'   => '(automatisk)',
+'patrol-log-page'      => 'Patruljeringslogg',
+'patrol-log-header'    => 'Dette er ein logg over patruljerte sideversjonar.',
+'patrol-log-line'      => 'merka $1 av $2 godkjend $3',
+'patrol-log-auto'      => '(automatisk)',
+'patrol-log-diff'      => 'versjon $1',
+'log-show-hide-patrol' => '$1 patruljeringslogg',
 
 # Image deletion
 'deletedrevision'                 => 'Slett gammal versjon $1',
@@ -2235,6 +2473,9 @@ $1',
 'previousdiff' => '� Eldre endring',
 'nextdiff'     => 'Nyare endring →',
 
+# Visual comparison
+'visual-comparison' => 'Visuell samanlikning',
+
 # Media information
 'mediawarning'         => "'''Åtvaring''': Denne fila kan innehalda skadelege program, ved å opna ho kan systemet ditt ta skade.<hr />",
 'imagemaxsize'         => 'Avgrens bilete på filsider til (pikslar):',
@@ -2247,10 +2488,12 @@ $1',
 'show-big-image'       => 'Full oppløysing',
 'show-big-image-thumb' => '<small>Storleiken på denne førehandsvisinga: $1 × $2 pikslar</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Filgalleri',
 'imagelisttext'         => 'Her er ei liste med {{PLURAL:$1|éi fil sortert|$1 filer sorterte}} $2.',
 'newimages-summary'     => 'Denne spesialsida syner dei sist opplasta filene.',
+'newimages-legend'      => 'Filnamn',
+'newimages-label'       => 'Filnamn (eller ein del av det):',
 'showhidebots'          => '($1 robotar)',
 'noimages'              => 'Her er ingen filer som kan visast.',
 'ilsubmit'              => 'Søk',
@@ -2457,6 +2700,18 @@ Dei andre felta er gøymde som standard.
 'exif-lightsource-24'  => 'ISO studio kunstljos',
 'exif-lightsource-255' => 'Anna lyskjelde',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Blitzen vart ikkje utløyst',
+'exif-flash-fired-1'    => 'Blitz utløyst',
+'exif-flash-return-0'   => 'ingen funksjon for å oppdage pulserande lys',
+'exif-flash-return-2'   => 'pulserande lys ikkje oppdaga',
+'exif-flash-return-3'   => 'pulserande lys oppdaga',
+'exif-flash-mode-1'     => 'tvungen blitzutløysing',
+'exif-flash-mode-2'     => 'tvungen blitz stengd',
+'exif-flash-mode-3'     => 'automatisk modus',
+'exif-flash-function-1' => 'Ingen blitzfunksjon',
+'exif-flash-redeye-1'   => 'redusering av raude auge',
+
 'exif-focalplaneresolutionunit-2' => 'tommar',
 
 'exif-sensingmethod-1' => 'Ikkje bestemt',
@@ -2600,24 +2855,10 @@ $1
 Du må stadfeste at du verkeleg vil nyopprette denne sida.",
 'recreate'            => 'Attopprett',
 
-# HTML dump
-'redirectingto' => 'Omdirigerer til [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Vil du slette tenarane sin mellomlagra versjon av denne sida?
-
-$1',
 'confirm_purge_button' => 'Ja',
-
-# AJAX search
-'searchcontaining' => "Søk etter sider som inneheld ''$1''.",
-'searchnamed'      => "Søk etter sider som heiter ''$1''.",
-'articletitles'    => "Sider som byrjar med ''$1''",
-'hideresults'      => 'Gøym resultatet',
-'useajaxsearch'    => 'Bruk AJAX-søk',
-
-# Separators for various lists, etc.
-'catseparator' => '|',
+'confirm-purge-top'    => 'Vil du slette tenarane sin mellomlagra versjon av denne sida?',
+'confirm-purge-bottom' => 'Reinsing av ei side slettar mellomlageret og tvinger fram den nyaste versjonen.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� førre side',
@@ -2637,10 +2878,10 @@ $1',
 'table_pager_empty'        => 'Ingen resultat',
 
 # Auto-summaries
-'autosumm-blank'   => 'Fjernar alt innhald på sida',
+'autosumm-blank'   => 'Tømde sida',
 'autosumm-replace' => 'Erstattar innhaldet på sida med «$1»',
 'autoredircomment' => 'Omdirigerer til [[$1]]',
-'autosumm-new'     => 'Ny side: $1',
+'autosumm-new'     => 'Oppretta sida med «$1»',
 
 # Live preview
 'livepreview-loading' => 'Lastar inn&nbsp;…',
@@ -2678,6 +2919,7 @@ Du kan òg [[Special:Watchlist/raw|endre overvakingslista i råformat]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Ukjend tilleggsmerking «$1»',
+'duplicate-defaultsort' => 'Åtvaring: Standarsorteringa «$2» tar over for den tidlegare sorteringa «$1».',
 
 # Special:Version
 'version'                          => 'Versjon', # Not used as normal message but as header for the special page itself
@@ -2706,13 +2948,13 @@ Du kan òg [[Special:Watchlist/raw|endre overvakingslista i råformat]].',
 'filepath-submit'  => 'Sti',
 'filepath-summary' => 'Denne spesialsida gjev den fullstendige stien for ei fil. Bilete vert vist i oppløysing; andre filtypar vert starta direkte i dei tilknytte programma sine.
 
-Skriv inn filnamnet utan «{{ns:image}}:»-prefikset.',
+Skriv inn filnamnet utan «{{ns:file}}:»-prefikset.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Søk etter duplikatfiler',
 'fileduplicatesearch-summary'  => 'Søk etter duplikatfiler basert på hash-verdiane deira.
 
-Skriv inn filnamn utan «{{ns:image}}:»-prefikset.',
+Skriv inn filnamn utan «{{ns:file}}:»-prefikset.',
 'fileduplicatesearch-legend'   => 'Søk etter ei duplikatfil',
 'fileduplicatesearch-filename' => 'Filnamn:',
 'fileduplicatesearch-submit'   => 'Søk',
@@ -2742,4 +2984,13 @@ Skriv inn filnamn utan «{{ns:image}}:»-prefikset.',
 'blankpage'              => 'Tom side',
 'intentionallyblankpage' => 'Denne sida er tom med vilje',
 
+# External image whitelist
+'external_image_whitelist' => '  #La denne linja vere som ho er<pre>
+#Skriv fragment av regulære uttrykk (delen som går mellom //) nedanfor
+#Desse vil verte sjekka mot adresser til bilete frå eksterne sider
+#Dei som vert godkjend vil visast, elles vil det verte gjeve ei lenkje til bilete
+#Linjer som byrjar med # vert rekna som kommentarar
+
+#Skriv alle fragment av regulære uttrykk over denne lina. La denne linja vere som ho er</pre>',
+
 );
diff --git a/languages/messages/MessagesNo.php b/languages/messages/MessagesNo.php
index 2614c8b7..0b56e49b 100644
--- a/languages/messages/MessagesNo.php
+++ b/languages/messages/MessagesNo.php
@@ -9,12 +9,12 @@
  * @author EivindJ
  * @author Finnrind
  * @author H92
+ * @author Harald Khan
  * @author Jon Harald Søby
  * @author Jóna Þórunn
  * @author Kph
  * @author Kph-no
  * @author Laaknor
- * @author Max sonnelid
  * @author Najami
  * @author Samuelsen
  * @author Stigmj
@@ -22,16 +22,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Standard',
-	'nostalgia'   => 'Nostalgi',
-	'cologneblue' => 'Kølnerblå',
-	'monobook'    => 'Monobook',
-	'myskin'      => 'Eget utseende',
-	'simple'      => 'Enkel',
-	'modern'      => 'Moderne',
-);
-
 $bookstoreList = array(
 	'Antikvariat.net' => 'http://www.antikvariat.net/',
 	'Frida' => 'http://wo.uio.no/as/WebObjects/frida.woa/wa/fres?action=sok&isbn=$1&visParametre=1&sort=alfabetisk&bs=50',
@@ -42,24 +32,27 @@ $bookstoreList = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Medium',
-	NS_SPECIAL        => 'Spesial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Diskusjon',
-	NS_USER           => 'Bruker',
-	NS_USER_TALK      => 'Brukerdiskusjon',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1-diskusjon',
-	NS_IMAGE          => 'Bilde',
-	NS_IMAGE_TALK     => 'Bildediskusjon',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki-diskusjon',
-	NS_TEMPLATE       => 'Mal',
-	NS_TEMPLATE_TALK  => 'Maldiskusjon',
-	NS_HELP           => 'Hjelp',
-	NS_HELP_TALK      => 'Hjelpdiskusjon',
-	NS_CATEGORY       => 'Kategori',
-	NS_CATEGORY_TALK  => 'Kategoridiskusjon',
+	NS_MEDIA            => 'Medium',
+	NS_SPECIAL          => 'Spesial',
+	NS_TALK             => 'Diskusjon',
+	NS_USER             => 'Bruker',
+	NS_USER_TALK        => 'Brukerdiskusjon',
+	NS_PROJECT_TALK     => '$1-diskusjon',
+	NS_FILE             => 'Fil',
+	NS_FILE_TALK        => 'Fildiskusjon',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki-diskusjon',
+	NS_TEMPLATE         => 'Mal',
+	NS_TEMPLATE_TALK    => 'Maldiskusjon',
+	NS_HELP             => 'Hjelp',
+	NS_HELP_TALK        => 'Hjelpdiskusjon',
+	NS_CATEGORY         => 'Kategori',
+	NS_CATEGORY_TALK    => 'Kategoridiskusjon',
+);
+
+$namespaceAliases = array(
+	'Bilde' => NS_FILE,
+	'Bildediskusjon' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
@@ -80,88 +73,91 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Doble_omdirigeringer' ),
-	'BrokenRedirects'           => array( 'Ødelagte_omdirigeringer' ),
+	'DoubleRedirects'           => array( 'Doble omdirigeringer' ),
+	'BrokenRedirects'           => array( 'Ødelagte omdirigeringer' ),
 	'Disambiguations'           => array( 'Pekere' ),
-	'Userlogin'                 => array( 'Logg_inn' ),
-	'Userlogout'                => array( 'Logg_ut' ),
-	'CreateAccount'             => array( 'Opprett_konto' ),
+	'Userlogin'                 => array( 'Logg inn' ),
+	'Userlogout'                => array( 'Logg ut' ),
+	'CreateAccount'             => array( 'Opprett konto' ),
 	'Preferences'               => array( 'Innstillinger' ),
 	'Watchlist'                 => array( 'Overvåkningsliste', 'Overvåkingsliste' ),
-	'Recentchanges'             => array( 'Siste_endringer' ),
-	'Upload'                    => array( 'Last_opp' ),
-	'Imagelist'                 => array( 'Filliste', 'Bildeliste', 'Billedliste' ),
-	'Newimages'                 => array( 'Nye_bilder' ),
+	'Recentchanges'             => array( 'Siste endringer' ),
+	'Upload'                    => array( 'Last opp' ),
+	'Listfiles'                 => array( 'Filliste', 'Bildeliste', 'Billedliste' ),
+	'Newimages'                 => array( 'Nye bilder' ),
 	'Listusers'                 => array( 'Brukerliste' ),
 	'Listgrouprights'           => array( 'Grupperettigheter' ),
 	'Statistics'                => array( 'Statistikk' ),
-	'Randompage'                => array( 'Tilfeldig_side', 'Tilfeldig' ),
-	'Lonelypages'               => array( 'Foreldreløse_sider' ),
-	'Uncategorizedpages'        => array( 'Ukategoriserte_sider' ),
-	'Uncategorizedcategories'   => array( 'Ukategoriserte_kategorier' ),
-	'Uncategorizedimages'       => array( 'Ukategoriserte_filer', 'Ukategoriserte_bilder' ),
-	'Uncategorizedtemplates'    => array( 'Ukategoriserte_maler' ),
-	'Unusedcategories'          => array( 'Ubrukte_kategorier' ),
-	'Unusedimages'              => array( 'Ubrukte_filer', 'Ubrukte_bilder' ),
-	'Wantedpages'               => array( 'Ønskede_sider' ),
-	'Wantedcategories'          => array( 'Ønskede_kategorier' ),
-	'Missingfiles'              => array( 'Manglende_filer', 'Manglende_bilder' ),
-	'Mostlinked'                => array( 'Mest_lenkede_sider', 'Mest_lenka_sider' ),
-	'Mostlinkedcategories'      => array( 'Største_kategorier' ),
-	'Mostlinkedtemplates'       => array( 'Mest_brukte_maler' ),
-	'Mostcategories'            => array( 'Flest_kategorier' ),
-	'Mostimages'                => array( 'Mest_brukte_bilder', 'Mest_brukte_filer' ),
-	'Mostrevisions'             => array( 'Flest_revisjoner' ),
-	'Fewestrevisions'           => array( 'Færrest_revisjoner' ),
-	'Shortpages'                => array( 'Korte_sider' ),
-	'Longpages'                 => array( 'Lange_sider' ),
-	'Newpages'                  => array( 'Nye_sider' ),
-	'Ancientpages'              => array( 'Gamle_sider' ),
+	'Randompage'                => array( 'Tilfeldig side', 'Tilfeldig' ),
+	'Lonelypages'               => array( 'Foreldreløse sider' ),
+	'Uncategorizedpages'        => array( 'Ukategoriserte sider' ),
+	'Uncategorizedcategories'   => array( 'Ukategoriserte kategorier' ),
+	'Uncategorizedimages'       => array( 'Ukategoriserte filer', 'Ukategoriserte bilder' ),
+	'Uncategorizedtemplates'    => array( 'Ukategoriserte maler' ),
+	'Unusedcategories'          => array( 'Ubrukte kategorier' ),
+	'Unusedimages'              => array( 'Ubrukte filer', 'Ubrukte bilder' ),
+	'Wantedpages'               => array( 'Ønskede sider' ),
+	'Wantedcategories'          => array( 'Ønskede kategorier' ),
+	'Wantedfiles'               => array( 'Ønskede filer' ),
+	'Mostlinked'                => array( 'Mest lenkede sider', 'Mest lenka sider' ),
+	'Mostlinkedcategories'      => array( 'Største kategorier' ),
+	'Mostlinkedtemplates'       => array( 'Mest brukte maler' ),
+	'Mostcategories'            => array( 'Flest kategorier' ),
+	'Mostimages'                => array( 'Mest brukte bilder', 'Mest brukte filer' ),
+	'Mostrevisions'             => array( 'Flest revisjoner' ),
+	'Fewestrevisions'           => array( 'Færrest revisjoner' ),
+	'Shortpages'                => array( 'Korte sider' ),
+	'Longpages'                 => array( 'Lange sider' ),
+	'Newpages'                  => array( 'Nye sider' ),
+	'Ancientpages'              => array( 'Gamle sider' ),
 	'Deadendpages'              => array( 'Blindveisider' ),
-	'Protectedpages'            => array( 'Beskyttede_sider' ),
-	'Protectedtitles'           => array( 'Beskyttede_titler' ),
-	'Allpages'                  => array( 'Alle_sider' ),
+	'Protectedpages'            => array( 'Beskyttede sider' ),
+	'Protectedtitles'           => array( 'Beskyttede titler' ),
+	'Allpages'                  => array( 'Alle sider' ),
 	'Prefixindex'               => array( 'Prefiksindeks' ),
 	'Ipblocklist'               => array( 'Blokkeringsliste' ),
 	'Specialpages'              => array( 'Spesialsider' ),
 	'Contributions'             => array( 'Bidrag' ),
 	'Emailuser'                 => array( 'E-post' ),
-	'Confirmemail'              => array( 'Bekreft_e-postadresse' ),
-	'Whatlinkshere'             => array( 'Lenker_hit' ),
-	'Recentchangeslinked'       => array( 'Relaterte_endringer' ),
-	'Movepage'                  => array( 'Flytt_side' ),
-	'Blockme'                   => array( 'Blokker_meg' ),
+	'Confirmemail'              => array( 'Bekreft e-postadresse' ),
+	'Whatlinkshere'             => array( 'Lenker hit' ),
+	'Recentchangeslinked'       => array( 'Relaterte endringer' ),
+	'Movepage'                  => array( 'Flytt side' ),
+	'Blockme'                   => array( 'Blokker meg' ),
 	'Booksources'               => array( 'Bokkilder' ),
 	'Categories'                => array( 'Kategorier' ),
 	'Export'                    => array( 'Eksporter' ),
 	'Version'                   => array( 'Versjon' ),
-	'Allmessages'               => array( 'Alle_systembeskjeder' ),
+	'Allmessages'               => array( 'Alle systembeskjeder' ),
 	'Log'                       => array( 'Logg', 'Logger' ),
 	'Blockip'                   => array( 'Blokker' ),
 	'Undelete'                  => array( 'Gjenopprett' ),
 	'Import'                    => array( 'Importer' ),
-	'Lockdb'                    => array( 'LÃ¥s_database' ),
-	'Unlockdb'                  => array( 'Ã…pne_database' ),
+	'Lockdb'                    => array( 'LÃ¥s database' ),
+	'Unlockdb'                  => array( 'Ã…pne database' ),
 	'Userrights'                => array( 'Brukerrettigheter' ),
 	'MIMEsearch'                => array( 'MIME-søk' ),
 	'FileDuplicateSearch'       => array( 'Filduplikatsøk' ),
-	'Unwatchedpages'            => array( 'Uovervåkede_sider' ),
+	'Unwatchedpages'            => array( 'Uovervåkede sider' ),
 	'Listredirects'             => array( 'Omdirigeringsliste' ),
 	'Revisiondelete'            => array( 'Revisjonssletting' ),
-	'Unusedtemplates'           => array( 'Ubrukte_maler' ),
-	'Randomredirect'            => array( 'Tilfeldig_omdirigering' ),
-	'Mypage'                    => array( 'Min_side' ),
-	'Mytalk'                    => array( 'Min_diskusjon' ),
-	'Mycontributions'           => array( 'Mine_bidrag' ),
+	'Unusedtemplates'           => array( 'Ubrukte maler' ),
+	'Randomredirect'            => array( 'Tilfeldig omdirigering' ),
+	'Mypage'                    => array( 'Min side' ),
+	'Mytalk'                    => array( 'Min diskusjon' ),
+	'Mycontributions'           => array( 'Mine bidrag' ),
 	'Listadmins'                => array( 'Administratorliste', 'Administratorer' ),
-	'Listbots'                  => array( 'Robotliste', 'Liste_over_roboter' ),
-	'Popularpages'              => array( 'Populære_sider' ),
+	'Listbots'                  => array( 'Robotliste', 'Liste over roboter' ),
+	'Popularpages'              => array( 'Populære sider' ),
 	'Search'                    => array( 'Søk' ),
-	'Resetpass'                 => array( 'Resett_passord' ),
-	'Withoutinterwiki'          => array( 'Uten_interwiki' ),
-	'MergeHistory'              => array( 'Flett_historikk' ),
+	'Resetpass'                 => array( 'Resett passord' ),
+	'Withoutinterwiki'          => array( 'Uten interwiki' ),
+	'MergeHistory'              => array( 'Flett historikk' ),
 	'Filepath'                  => array( 'Filsti' ),
-	'Invalidateemail'           => array( 'Ugyldiggjøre_e-post' ),
+	'Invalidateemail'           => array( 'Ugyldiggjøre e-post' ),
+	'Blankpage'                 => array( 'Blank side' ),
+	'LinkSearch'                => array( 'Lenkesøk' ),
+	'DeletedContributions'      => array( 'Slettede bidrag' ),
 );
 
 $messages = array(
@@ -202,17 +198,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Skjul egne endringer fra overvåkningslisten',
 'tog-watchlisthidebots'       => 'Skjul robotendringer fra overvåkningslisten',
 'tog-watchlisthideminor'      => 'Skjul mindre endringer fra overvåkningslisten',
+'tog-watchlisthideliu'        => 'Skjul endringer av innloggede brukere fra overvåkningslisten',
+'tog-watchlisthideanons'      => 'Skjul endringer av anonyme brukere fra overvåkningslisten',
 'tog-nolangconversion'        => 'Slå av variantkonvertering',
 'tog-ccmeonemails'            => 'Send meg kopier av e-poster jeg sender til andre brukere',
 'tog-diffonly'                => 'Ikke vis sideinnhold under differ',
 'tog-showhiddencats'          => 'Vis skjulte kategorier',
+'tog-norollbackdiff'          => 'Ikke vis diff etter tilbakestilling',
 
 'underline-always'  => 'Alltid',
 'underline-never'   => 'Aldri',
 'underline-default' => 'Bruk nettleserstandard',
 
-'skinpreview' => '(forhåndsvisning)',
-
 # Dates
 'sunday'        => 'søndag',
 'monday'        => 'mandag',
@@ -305,7 +302,7 @@ $messages = array(
 'mytalk'         => 'Min diskusjonsside',
 'anontalk'       => 'Brukerdiskusjon for denne IP-adressen',
 'navigation'     => 'Navigasjon',
-'and'            => 'og',
+'and'            => '&#32;og',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -342,14 +339,14 @@ $messages = array(
 'talkpagelinktext'  => 'Diskusjon',
 'specialpage'       => 'Spesialside',
 'personaltools'     => 'Personlige verktøy',
-'postcomment'       => 'Legg til en kommentar',
+'postcomment'       => 'Ny seksjon',
 'articlepage'       => 'Vis innholdsside',
 'talk'              => 'Diskusjon',
 'views'             => 'Visninger',
 'toolbox'           => 'Verktøy',
 'userpage'          => 'Vis brukerside',
 'projectpage'       => 'Vis prosjektside',
-'imagepage'         => 'Vis medieside',
+'imagepage'         => 'Vis filside',
 'mediawikipage'     => 'Vis beskjedside',
 'templatepage'      => 'Vis mal',
 'viewhelppage'      => 'Vis hjelpeside',
@@ -368,8 +365,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Om {{SITENAME}}',
 'aboutpage'            => 'Project:Om',
-'bugreports'           => 'Feilmeldinger',
-'bugreportspage'       => 'Project:Feilmeldinger',
 'copyright'            => 'Innholdet er tilgjengelig under $1.',
 'copyrightpagename'    => 'Opphavsrett',
 'copyrightpage'        => '{{ns:project}}:Opphavsrett',
@@ -392,9 +387,7 @@ $messages = array(
 
 'badaccess'        => 'Rettighetsfeil',
 'badaccess-group0' => 'Du har ikke tilgang til å utføre handlingen du prøvde på.',
-'badaccess-group1' => 'Handlingen du prøvde å utføre er begrenset til $1.',
-'badaccess-group2' => 'Handlingen du prøvde å utføre kan kun utføres av $1.',
-'badaccess-groups' => 'Handlingen du prøvde å utføre kan kun utføres av $1.',
+'badaccess-groups' => 'Handlingen du prøvde å utføre kan kun utføres av brukere i {{PLURAL:$2|gruppa|gruppene}} $1.',
 
 'versionrequired'     => 'Versjon $1 av MediaWiki påtrengt',
 'versionrequiredtext' => 'Versjon $1 av MediaWiki er nødvendig for å bruke denne siden. Se [[Special:Version|versjonsiden]]',
@@ -408,6 +401,8 @@ $messages = array(
 'editsection'             => 'rediger',
 'editold'                 => 'rediger',
 'viewsourceold'           => 'vis kilde',
+'editlink'                => 'rediger',
+'viewsourcelink'          => 'vis kilde',
 'editsectionhint'         => 'Rediger seksjon: $1',
 'toc'                     => 'Innhold',
 'showtoc'                 => 'vis',
@@ -422,13 +417,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom-kilde',
 'page-rss-feed'           => '«$1» RSS-kilde',
 'page-atom-feed'          => '«$1» Atom-kilde',
-'red-link-title'          => '$1 (finnes ikke ennå)',
+'red-link-title'          => '$1 (siden finnes ikke)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Side',
 'nstab-user'      => 'Brukerside',
 'nstab-media'     => 'Mediaside',
-'nstab-special'   => 'Spesial',
+'nstab-special'   => 'Spesialside',
 'nstab-project'   => 'Prosjektside',
 'nstab-image'     => 'Fil',
 'nstab-mediawiki' => 'Beskjed',
@@ -438,7 +433,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Funksjonen finnes ikke',
-'nosuchactiontext'  => 'MediaWiki-programvaren kjenner ikke igjen funksjonen som er spesifisert i URL-en.',
+'nosuchactiontext'  => 'Handlingen spesifisert i URLen er ugyldig.
+Du kan ha skrevet URLen feil, eller fulgt en link som var feil.
+Det kan også være en bug i {{SITENAME}}.',
 'nosuchspecialpage' => 'En slik spesialside finnes ikke',
 'nospecialpagetext' => 'Du ba om en ugyldig spesialside; en liste over gyldige spesialsider finnes på [[Special:SpecialPages|{{int:specialpages}}]].',
 
@@ -480,7 +477,6 @@ Rapporter gjerne problemet til en [[Special:ListUsers/sysop|administrator]], ang
 'cannotdelete'         => 'Kunne ikke slette filen (den kan være slettet av noen andre).',
 'badtitle'             => 'Ugyldig tittel',
 'badtitletext'         => 'Den ønskede tittelen var ugyldig, tom eller galt lenket fra et annet språk.',
-'perfdisabled'         => 'Denne funksjonen er midlertidig utilgjengelig av vedlikeholdsgrunner.',
 'perfcached'           => 'Følgende data er en lagret kopi, og ikke nødvendigvis den siste versjonen i databasen.',
 'perfcachedts'         => 'Følgende data er en lagret kopi, og ble sist oppdatert $1.',
 'querypage-no-updates' => 'Oppdateringer for denne siden er slått av. Data her blir ikke gjenoppfrisket.',
@@ -494,7 +490,7 @@ Spørring: $2',
 'protectedpagetext'    => 'Denne siden har blitt låst for redigeringer.',
 'viewsourcetext'       => 'Du kan se og kopiere kilden til denne siden:',
 'protectedinterface'   => 'Denne siden viser brukergrensesnittet for programvaren, og er låst for å hindre misbruk.',
-'editinginterface'     => "'''Advarsel:''' Du redigerer en side som brukes i grensesnittet for programvaren. Endringer på denne siden vil påvirke hvordan grensesnittet vil se ut. For oversettelser er det best om du bruker [http://translatewiki.net/wiki/Main_Page?setlang=no Betawiki], prosjektet for oversettelse av MediaWiki.",
+'editinginterface'     => "'''Advarsel:''' Du redigerer en side som brukes i grensesnittet for programvaren. Endringer på denne siden vil påvirke hvordan grensesnittet vil se ut. For oversettelser er det best om du bruker [http://translatewiki.net/wiki/Main_Page?setlang=no translatewiki.net], prosjektet for oversettelse av MediaWiki.",
 'sqlhidden'            => '(SQL-spørring skjult)',
 'cascadeprotected'     => 'Denne siden er låst for redigering fordi den inkluderes på følgende sider som har dypbeskyttelse slått på:<!--{{PLURAL:$1}}-->
 $2',
@@ -505,16 +501,16 @@ $2',
 Den angitte grunnen er ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'DÃ¥rlig konfigurasjon: ukjent virusskanner: <i>$1</i>',
+'virus-badscanner'     => "DÃ¥rlig konfigurasjon: ukjent virusskanner: ''$1''",
 'virus-scanfailed'     => 'skanning mislyktes (kode $1)',
 'virus-unknownscanner' => 'ukjent antivirusprogram:',
 
 # Login and logout pages
 'logouttitle'                => 'Logg ut',
-'logouttext'                 => '<strong>Du er nå logget ut.</strong>
+'logouttext'                 => "'''Du er nå logget ut.'''
 
 Du kan fortsette å bruke {{SITENAME}} anonymt, eller [[Special:UserLogin|logge inn igjen]] som samme eller annen bruker.
-Merk at noen sider kan vise at du fortsatt er logget inn fram til du tømmer mellomlageret i nettleseren.',
+Merk at noen sider kan vise at du fortsatt er logget inn fram til du tømmer mellomlageret i nettleseren.",
 'welcomecreation'            => '==Velkommen, $1!==
 Brukerkontoen din har blitt opprettet.
 Ikke glem å endre [[Special:Preferences|innstillingene]] dine.',
@@ -525,7 +521,6 @@ Ikke glem å endre [[Special:Preferences|innstillingene]] dine.',
 'remembermypassword'         => 'Husk passordet',
 'yourdomainname'             => 'Ditt domene',
 'externaldberror'            => 'Det var en ekstern autentifiseringsfeil, eller du kan ikke oppdatere din eksterne konto.',
-'loginproblem'               => '<strong>Du ble ikke logget inn.</strong><br />Prøv igjen!',
 'login'                      => 'Logg inn',
 'nav-login-createaccount'    => 'Logg inn eller registrer deg',
 'loginprompt'                => 'Du må ha slått på informasjonskapsler for å logge in på {{SITENAME}}.',
@@ -562,7 +557,8 @@ Du kan også la velge å la andre brukere kontakte deg via brukersiden din uten
 'noname'                     => 'Du har ikke oppgitt et gyldig brukernavn.',
 'loginsuccesstitle'          => 'Du er nå logget inn',
 'loginsuccess'               => 'Du er nå logget inn på {{SITENAME}} som «$1».',
-'nosuchuser'                 => '!Det eksisterer ingen bruker ved navn «$1».
+'nosuchuser'                 => 'Det eksisterer ingen bruker ved navn «$1».
+Husk at det er forskjell på store og små bokstaver.
 Sjekk stavemåten eller [[Special:UserLogin/signup|opprett en ny konto]].',
 'nosuchusershort'            => 'Det finnes ingen bruker ved navn «<nowiki>$1</nowiki>». Kontroller stavemåten.',
 'nouserspecified'            => 'Du må oppgi et brukernavn.',
@@ -587,8 +583,9 @@ og fortsette å bruke det gamle passordet.',
 'throttled-mailpassword'     => 'En passordpåminnelse ble sendt for mindre enn {{PLURAL:$1|en time|$1 timer}} siden.
 For å forhindre misbruk kan kun én passordpåminnelse sendes per {{PLURAL:$1|time|$1 timer}}.',
 'mailerror'                  => 'Feil under sending av e-post: $1',
-'acct_creation_throttle_hit' => 'Beklager, du har allerede opprettet {{PLURAL:$1|én konto|$1 kontoer}}. Du kan ikke opprette flere.',
-'emailauthenticated'         => 'Din e-postadresse ble bekreftet $1.',
+'acct_creation_throttle_hit' => 'Gjester med samme IP-adresse som deg har opprettet {{PLURAL:$1|én konto|$1 kontoer}} det siste døgnet, og det er ikke tillatt å opprette flere.
+Som et resultat kan det ikke opprettes flere kontoer fra denne IP-adressen.',
+'emailauthenticated'         => 'Din e-postadresse ble bekreftet $2 $3.',
 'emailnotauthenticated'      => 'Din e-postadresse er ikke bekreftet. Du vil ikke kunne motta e-post for noen av følgende egenskaper.',
 'noemailprefs'               => 'Oppgi en e-postadresse for at disse funksjonene skal fungere.',
 'emailconfirmlink'           => 'Bekreft e-postadressen din.',
@@ -600,18 +597,26 @@ Skriv inn en fungerende e-postadresse eller tøm feltet.',
 'createaccount-text'         => 'Noen opprettet en konto for din e-postadresse på {{SITENAME}} ($4) med navnet «$2», med «$3» som passord. Du burde logge inn og endre passordet nå.
 
 Du kan ignorere denne beskjeden dersom kontoen ble opprettet ved en feil.',
+'login-throttled'            => 'Du har prøvd å logge inn med denne kontoen for mange ganger. Vent før du prøver igjen.',
 'loginlanguagelabel'         => 'Språk: $1',
 
 # Password reset dialog
-'resetpass'               => 'Resett kontopassord',
-'resetpass_announce'      => 'Du logget inn med en midlertidig e-postkode. For å fullføre innloggingen må du oppgi et nytt passord her:',
-'resetpass_text'          => '<!-- Legg til tekst her -->',
-'resetpass_header'        => 'Endre passord',
-'resetpass_submit'        => 'Angi passord og logg inn',
-'resetpass_success'       => 'Passordet ditt ble endret! Logger inn&nbsp;…',
-'resetpass_bad_temporary' => 'Ugyldig midlertidig passord. Du kan allerede ha endret passordet, eller bedt om et nytt midlertidig passord.',
-'resetpass_forbidden'     => 'Passord kan ikke endres',
-'resetpass_missing'       => 'Ingen skjemadata.',
+'resetpass'                 => 'Endre passord',
+'resetpass_announce'        => 'Du logget inn med en midlertidig e-postkode. For å fullføre innloggingen må du oppgi et nytt passord her:',
+'resetpass_text'            => '<!-- Legg til tekst her -->',
+'resetpass_header'          => 'Endre passord',
+'oldpassword'               => 'Gammelt passord:',
+'newpassword'               => 'Nytt passord:',
+'retypenew'                 => 'Gjenta nytt passord:',
+'resetpass_submit'          => 'Angi passord og logg inn',
+'resetpass_success'         => 'Passordet ditt ble endret! Logger inn&nbsp;…',
+'resetpass_bad_temporary'   => 'Ugyldig midlertidig passord. Du kan allerede ha endret passordet, eller bedt om et nytt midlertidig passord.',
+'resetpass_forbidden'       => 'Passord kan ikke endres',
+'resetpass-no-info'         => 'Du må være logget inn for å gå til denne siden direkte',
+'resetpass-submit-loggedin' => 'Endre passord',
+'resetpass-wrong-oldpass'   => 'Feil midlertidig eller nåværende passord.
+Du kan ha allerede byttet passordet, eller bedt om et nytt midlertidig passord.',
+'resetpass-temp-password'   => 'Midlertidig passord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fet tekst',
@@ -636,8 +641,8 @@ Du kan ignorere denne beskjeden dersom kontoen ble opprettet ved en feil.',
 'hr_tip'          => 'Horisontal linje',
 
 # Edit pages
-'summary'                          => 'Redigeringsforklaring',
-'subject'                          => 'Overskrift',
+'summary'                          => 'Redigeringsforklaring:',
+'subject'                          => 'Overskrift:',
 'minoredit'                        => 'Mindre endring',
 'watchthis'                        => 'Overvåk denne siden',
 'savearticle'                      => 'Lagre siden',
@@ -650,8 +655,8 @@ Du kan ignorere denne beskjeden dersom kontoen ble opprettet ved en feil.',
 Velger du ''Lagre siden'' en gang til blir endringene lagret uten forklaring.",
 'missingcommenttext'               => 'Vennligst legg inn en kommentar under.',
 'missingcommentheader'             => "'''Merk:''' Du har ikke angitt et emne/overskrift for denne kommentaren. Om du trykker Lagre igjen, vil redigeringen din bli lagret uten en.",
-'summary-preview'                  => 'Forhåndsvisning av sammendrag',
-'subject-preview'                  => 'Forhåndsvisning av emne/overskrift',
+'summary-preview'                  => 'Forhåndsvisning av sammendrag:',
+'subject-preview'                  => 'Forhåndsvisning av emne/overskrift:',
 'blockedtitle'                     => 'Brukeren er blokkert',
 'blockedtext'                      => "<big>'''Ditt brukernavn eller din IP-adresse har blitt blokkert.'''</big>
 
@@ -700,28 +705,29 @@ Vennligst ta med all denne informasjonen ved henvendelser.",
 ''Dette er en diskusjonsside for en uregistrert bruker som ikke har opprettet konto eller ikke er logget inn.
 Vi er derfor nødt til å bruke den numeriske IP-adressen til å identifisere ham eller henne.
 En IP-adresse kan være delt mellom flere brukere.
-Hvis du er en uregistrert bruker og synes at du har fått irrelevante kommentarer på en slik side, [[Special:UserLogin/signup|opprett en konto]] eller [[Special:UserLogin|logg inn]] så vi unngår framtidige forvekslinger med andre uregistrerte brukere.''",
-'noarticletext'                    => 'Det er ikke noe tekst på denne siden. Du kan [[Special:Search/{{PAGENAME}}|søke etter siden]] i andre sider, eller [{{fullurl:{{FULLPAGENAME}}|action=edit}} opprette den].',
+Hvis du er en uregistrert bruker og synes at du har fått irrelevante kommentarer på en slik side, [[Special:UserLogin/signup|opprett en konto]] eller [[Special:UserLogin|logg inn]] så vi unngår fremtidige forvekslinger med andre uregistrerte brukere.''",
+'noarticletext'                    => 'Det er ikke noe tekst på denne siden.
+Du kan [[Special:Search/{{PAGENAME}}|søke etter siden]] i andre sider, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} søke i relaterte logger] eller [{{fullurl:{{FULLPAGENAME}}|action=edit}} opprette siden]</span>.',
 'userpage-userdoesnotexist'        => 'Brukerkontoen «$1» er ikke registrert. Sjekk om du ønsker å opprette/redigere denne siden.',
 'clearyourcache'                   => "'''Merk:''' Etter lagring vil det kanskje være nødvendig at nettleseren sletter mellomlageret sitt for at endringene skal tre i kraft. '''Mozilla og Firefox:''' trykk ''Ctrl-Shift-R'', '''Internet Explorer:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'' i engelskspråklig versjon, ''Cmd-Alt-E'' i norskspråklig versjon, '''Konqueror og Opera:''' ''F5''.",
-'usercssjsyoucanpreview'           => '<strong>Tips:</strong> Bruk «Forhåndsvisning»-knappen for å teste din nye CSS/JS før du lagrer.',
+'usercssjsyoucanpreview'           => "'''Tips:''' Bruk «Forhåndsvisning»-knappen for å teste din nye CSS/JS før du lagrer.",
 'usercsspreview'                   => "'''Husk at dette bare er en forhåndsvisning av din bruker-CSS og at den ikke er lagret!'''",
 'userjspreview'                    => "'''Husk at dette bare er en test eller forhåndsvisning av ditt bruker-JavaScript, og det ikke er lagret!'''",
 'userinvalidcssjstitle'            => "'''Advarsel:''' Det finnes ikke noe utseende ved navn «$1». Husk at .css- og .js-sider bruker titler i små bokstaver, for eksempel {{ns:user}}:Eksempel/monobook.css, ikke {{ns:user}}:Eksempel/Monobook.css",
 'updated'                          => '(Oppdatert)',
-'note'                             => '<strong>Merk:</strong>',
-'previewnote'                      => '<strong>Dette er bare en forhåndsvisning; endringer har ikke blitt lagret!</strong>',
+'note'                             => "'''Merk:'''",
+'previewnote'                      => "'''Dette er bare en forhåndsvisning; endringer har ikke blitt lagret!'''",
 'previewconflict'                  => 'Slik vil teksten i redigeringsvinduet se ut dersom du lagrer den.',
-'session_fail_preview'             => '<strong>Beklager! Klarte ikke å lagre redigeringen din. Prøv igjen. Om det fortsetter å gå galt, prøv å [[Special:UserLogout|logge ut]] og så inn igjen.</strong>',
-'session_fail_preview_html'        => "<strong>Beklager! Klarte ikke å lagre redigeringen din på grunn av tap av øktdata.</strong>
+'session_fail_preview'             => "'''Beklager! Klarte ikke å lagre redigeringen din. Prøv igjen. Om det fortsetter å gå galt, prøv å [[Special:UserLogout|logge ut]] og så inn igjen.'''",
+'session_fail_preview_html'        => "'''Beklager! Klarte ikke å lagre redigeringen din på grunn av tap av øktdata.'''
 
 ''Fordi {{SITENAME}} har rå HTML slått på, er forhåndsvisningen skjult for å forhindre JavaScript-angrep.''
 
-<strong>Om dette er et legitimt redigeringsforsøk, prøv igjen. Om det da ikke fungerer, prøv å [[Special:UserLogout|logge ut]] og logge inn igjen.</strong>",
-'token_suffix_mismatch'            => '<strong>Redigeringen din har blitt avvist fordi klienten din ikke hadde punktasjonstegn i redigeringsteksten. Redigeringen har blitt avvist for å hindre ødeleggelse av artikkelteksten. Dette forekommer av og til når man bruker vevbaserte anonyme proxytjenester.</strong>',
+'''Om dette er et legitimt redigeringsforsøk, prøv igjen. Om det da ikke fungerer, prøv å [[Special:UserLogout|logge ut]] og logge inn igjen.'''",
+'token_suffix_mismatch'            => "'''Redigeringen din har blitt avvist fordi klienten din ikke hadde punktasjonstegn i redigeringsteksten. Redigeringen har blitt avvist for å hindre ødeleggelse av artikkelteksten. Dette forekommer av og til når man bruker vevbaserte anonyme proxytjenester.'''",
 'editing'                          => 'Redigerer $1',
 'editingsection'                   => 'Redigerer $1 (seksjon)',
-'editingcomment'                   => 'Redigerer $1 (kommentar)',
+'editingcomment'                   => 'Redigerer $1 (ny seksjon)',
 'editconflict'                     => 'Redigeringskonflikt: $1',
 'explainconflict'                  => "Noen andre har endret teksten siden du begynte å redigere.
 Den øverste boksen inneholder den nåværende tekst.
@@ -730,24 +736,26 @@ Du er nødt til å flette dine endringer sammen med den nåværende teksten.
 '''Kun''' teksten i den øverste tekstboksen blir lagret når du trykker «Lagre siden».",
 'yourtext'                         => 'Din tekst',
 'storedversion'                    => 'Den lagrede versjonen',
-'nonunicodebrowser'                => '<strong>ADVARSEL: Nettleseren din har ikke støtte for Unicode. Skru det på før du begynner å redigere artikler.</strong>',
-'editingold'                       => '<strong>ADVARSEL:
+'nonunicodebrowser'                => "'''ADVARSEL: Nettleseren din har ikke støtte for Unicode. Skru det på før du begynner å redigere artikler.'''",
+'editingold'                       => "'''ADVARSEL:
 Du redigerer en gammel versjon av denne siden.
-Hvis du lagrer den, vil alle endringer foretatt siden denne versjonen bli overskrevet.</strong>',
+Hvis du lagrer den, vil alle endringer foretatt siden denne versjonen bli overskrevet.'''",
 'yourdiff'                         => 'Forskjeller',
-'copyrightwarning'                 => 'Vennligst merk at alle bidrag til {{SITENAME}} anses som utgitt under $2 (se $1 for detaljer). Om du ikke vil at dine bidrag skal kunne redigeres og distribuert fritt, ikke legg det til her.<br />
-Du lover også at du har skrevet dette selv, eller kopiert det fra en ressurs som er i public domain eller lignende. <strong>IKKE LEGG TIL OPPHAVSBESKYTTET MATERIALE UTEN TILLATELSE!</strong>',
-'copyrightwarning2'                => 'Vennligst merk at alle bidrag til {{SITENAME}} kan bli redigert, endret eller fjernet av andre bidragsytere. Om du ikke vil at dine bidrag skal kunne redigeres fritt, ikke legg det til her.<br />
-Du lover også at du har skrevet dette selv, eller kopiert det fra en ressurs som er i public domain eller lignende (se $1 for detaljer). <strong>IKKE LEGG TIL OPPHAVSBESKYTTET MATERIALE UTEN TILLATELSE!</strong>',
-'longpagewarning'                  => '<strong>ADVARSEL: Denne siden er $1&nbsp;kB lang; noen eldre nettlesere kan ha problemer med å redigere sider som nærmer seg eller er lengre enn 32&nbsp;kB. Overvei om ikke siden kan deles opp i mindre deler.</strong>',
-'longpageerror'                    => '<strong>FEIL: Teksten du prøvde å lagre er $1&nbsp;kB lang, dvs. lenger enn det maksimale $2&nbsp;kB. Den kan ikke lagres.</strong>',
-'readonlywarning'                  => '<strong>ADVARSEL: Databasen er låst på grunn av vedlikehold,
+'copyrightwarning'                 => "Vennligst merk at alle bidrag til {{SITENAME}} anses som utgitt under $2 (se $1 for detaljer). Om du ikke vil at dine bidrag skal kunne redigeres og distribuert fritt, ikke legg det til her.<br />
+Du lover også at du har skrevet dette selv, eller kopiert det fra en ressurs som er i public domain eller lignende. '''IKKE LEGG TIL OPPHAVSBESKYTTET MATERIALE UTEN TILLATELSE!'''",
+'copyrightwarning2'                => "Vennligst merk at alle bidrag til {{SITENAME}} kan bli redigert, endret eller fjernet av andre bidragsytere. Om du ikke vil at dine bidrag skal kunne redigeres fritt, ikke legg det til her.<br />
+Du lover også at du har skrevet dette selv, eller kopiert det fra en ressurs som er i public domain eller lignende (se $1 for detaljer). '''IKKE LEGG TIL OPPHAVSBESKYTTET MATERIALE UTEN TILLATELSE!'''",
+'longpagewarning'                  => "'''ADVARSEL: Denne siden er $1&nbsp;kB lang; noen eldre nettlesere kan ha problemer med å redigere sider som nærmer seg eller er lengre enn 32&nbsp;kB. Overvei om ikke siden kan deles opp i mindre deler.'''",
+'longpageerror'                    => "'''FEIL: Teksten du prøvde å lagre er $1&nbsp;kB lang, dvs. lenger enn det maksimale $2&nbsp;kB. Den kan ikke lagres.'''",
+'readonlywarning'                  => "'''ADVARSEL: Databasen er låst på grunn av vedlikehold,
 så du kan ikke lagre dine endringer akkurat nå. Det kan være en god idé å
-kopiere teksten din til en tekstfil, så du kan lagre den til senere.</strong>',
-'protectedpagewarning'             => '<strong>ADVARSEL: Denne siden er låst, slik at kun brukere med administratorrettigheter kan redigere den.</strong>',
+kopiere teksten din til en tekstfil, så du kan lagre den til senere.'''
+
+Systemadministratoren som låste databasen oppga følgende årsak: $1",
+'protectedpagewarning'             => "'''ADVARSEL: Denne siden er låst, slik at kun brukere med administratorrettigheter kan redigere den.'''",
 'semiprotectedpagewarning'         => "'''Merk:''' Denne siden har blitt låst slik at kun registrerte brukere kan endre den. Nyopprettede og uregistrerte brukere kan ikke redigere.",
 'cascadeprotectedwarning'          => "'''Advarsel:''' Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den, fordi den inkluderes på følgende dypbeskyttede sider:<!--{{PLURAL:$1}}-->",
-'titleprotectedwarning'            => '<strong>ADVARSEL: Denne siden har blitt låst slik at kun visse brukere kan opprette den.</strong>',
+'titleprotectedwarning'            => "'''ADVARSEL: Denne siden har blitt låst slik at kun [[Special:ListGroupRights|visse brukere]] kan opprette den.'''",
 'templatesused'                    => 'Maler i bruk på denne siden:',
 'templatesusedpreview'             => 'Maler som brukes i denne forhåndsvisningen:',
 'templatesusedsection'             => 'Maler brukt i denne seksjonen:',
@@ -764,11 +772,18 @@ kopiere teksten din til en tekstfil, så du kan lagre den til senere.</strong>',
 'recreate-deleted-warn'            => "'''Advarsel: Du gjenskaper en side som tidligere har blitt slettet.'''
 
 Du burde vurdere hvorvidt det er passende å fortsette å redigere denne siden. Slettingsloggen for denne siden gjengis her:",
+'deleted-notice'                   => 'Denne siden har blitt slettet. Slettingsloggen vises nedenfor.',
+'deletelog-fulllog'                => 'Vis full logg',
+'edit-hook-aborted'                => 'Redigering avbrutt av en funksjon, uten forklaring.',
+'edit-gone-missing'                => 'Kunne ikke oppdatere siden fordi den har blitt slettet.',
+'edit-conflict'                    => 'Redigeringskonflikt.',
+'edit-no-change'                   => 'Redigeringen din ble ignorert fordi det ikke var noen endringer.',
+'edit-already-exists'              => 'Kunne ikke opprette ny side fordi den finnes fra før.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Advarsel: Denne siden inneholder for mange prosesskrevende parserfunksjoner.
 
-Det burde være mindre enn $2, men er nå $1.',
+Det burde være mindre enn {{PLURAL:$2|$2|$2}}, men er nå {{PLURAL:$1|$1|$1}}..',
 'expensive-parserfunction-category'       => 'Sider med for mange prosesskrevende parserfunksjoner',
 'post-expand-template-inclusion-warning'  => 'Advarsel: Størrelsen på inkluderte maler er for stor.
 Noen maler vil ikke bli inkludert.',
@@ -776,12 +791,14 @@ Noen maler vil ikke bli inkludert.',
 'post-expand-template-argument-warning'   => 'Advarsel: Siden inneholder ett eller flere malparametere som blir for lange når de utvides.
 Disse parameterne har blitt utelatt.',
 'post-expand-template-argument-category'  => 'Sider med utelatte malparametere',
+'parser-template-loop-warning'            => 'Mal-loop oppdaget: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Mal er brukt for mange ganger ($1)',
 
 # "Undo" feature
 'undo-success' => 'Redigeringen kan omgjøres. Sjekk sammenligningen under for å bekrefte at du vil gjøre dette, og lagre endringene for å fullføre omgjøringen.',
 'undo-failure' => 'Redigeringen kunne ikke omgjøres på grunn av konflikterende etterfølgende redigeringer.',
 'undo-norev'   => 'Redigeringen kunne ikke fjernes fordi den ikke eksisterer eller ble slettet',
-'undo-summary' => 'Fjerner revisjon $1 av [[Special:Contributions/$2]] ([[User talk:$2|diskusjon]] | [[Special:Contributions/$2|{{int:contribsilnk}}]])',
+'undo-summary' => 'Fjerner revisjon $1 av [[Special:Contributions/$2]] ([[User talk:$2|diskusjon]] | [[Special:Contributions/$2|{{int:contribslink}}]])',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Kan ikke opprette konto',
@@ -790,27 +807,27 @@ Disse parameterne har blitt utelatt.',
 Grunnen som ble oppgitt av $3 er ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vis logger for denne siden',
-'nohistory'           => 'Denne siden har ingen historikk.',
-'revnotfound'         => 'Versjonen er ikke funnet',
-'revnotfoundtext'     => 'Den gamle versjon av siden du etterspurte finnes ikke. Kontroller adressen du brukte for å få adgang til denne siden.',
-'currentrev'          => 'Nåværende versjon',
-'revisionasof'        => 'Versjonen fra $1',
-'revision-info'       => 'Revisjon per $1 av $2',
-'previousrevision'    => '� Eldre versjon',
-'nextrevision'        => 'Nyere versjon →',
-'currentrevisionlink' => 'Nåværende versjon',
-'cur'                 => 'nå',
-'next'                => 'neste',
-'last'                => 'forrige',
-'page_first'          => 'første',
-'page_last'           => 'siste',
-'histlegend'          => "Forklaring: (nå) = forskjell fra nåværende versjon, (forrige) = forskjell fra forrige versjon, '''m''' = mindre endring.",
-'deletedrev'          => '[slettet]',
-'histfirst'           => 'Første',
-'histlast'            => 'Siste',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(tom)',
+'viewpagelogs'           => 'Vis logger for denne siden',
+'nohistory'              => 'Denne siden har ingen historikk.',
+'currentrev'             => 'Nåværende versjon',
+'currentrev-asof'        => 'Nåværende revisjon fra $1',
+'revisionasof'           => 'Versjonen fra $1',
+'revision-info'          => 'Revisjon per $1 av $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Eldre versjon',
+'nextrevision'           => 'Nyere versjon →',
+'currentrevisionlink'    => 'Nåværende versjon',
+'cur'                    => 'nå',
+'next'                   => 'neste',
+'last'                   => 'forrige',
+'page_first'             => 'første',
+'page_last'              => 'siste',
+'histlegend'             => "Forklaring: (nå) = forskjell fra nåværende versjon, (forrige) = forskjell fra forrige versjon, '''m''' = mindre endring.",
+'history-fieldset-title' => 'Søk i historikken',
+'deletedrev'             => '[slettet]',
+'histfirst'              => 'Første',
+'histlast'               => 'Siste',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(tom)',
 
 # Revision feed
 'history-feed-title'          => 'Revisjonshistorikk',
@@ -890,6 +907,7 @@ Forsikre deg om at denne endringen vil opprettholde historisk sidekontinuitet.',
 'mergehistory-invalid-destination' => 'Målsiden må ha en gyldig tittel.',
 'mergehistory-autocomment'         => 'Flettet [[:$1]] inn i [[:$2]]',
 'mergehistory-comment'             => 'Flettet [[:$1]] inn i [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Kilde- og målside kan ikke være den samme.',
 
 # Merge log
 'mergelog'           => 'Flettingslogg',
@@ -902,120 +920,201 @@ Forsikre deg om at denne endringen vil opprettholde historisk sidekontinuitet.',
 'difference'              => '(Forskjeller mellom versjoner)',
 'lineno'                  => 'Linje $1:',
 'compareselectedversions' => 'Sammenlign valgte versjoner',
+'visualcomparison'        => 'Visuell sammenligning',
+'wikicodecomparison'      => 'Wikitekstsammenligning',
 'editundo'                => 'omgjør',
 'diff-multi'              => '({{PLURAL:$1|Én mellomrevisjon|$1 mellomrevisjoner}} ikke vist.)',
+'diff-movedto'            => 'flyttet til $1',
+'diff-styleadded'         => '$1 stil lagt til',
+'diff-added'              => '$1 lagt til',
+'diff-changedto'          => 'endret til $1',
+'diff-movedoutof'         => 'flyttet ut av $1',
+'diff-styleremoved'       => '$1 stil fjernet',
+'diff-removed'            => '$1 fjernet',
+'diff-changedfrom'        => 'endret fra $1',
+'diff-src'                => 'kilde',
+'diff-withdestination'    => 'med mål $1',
+'diff-with'               => '&#32;med $1 $2',
+'diff-with-final'         => '&#32;og $1 $2',
+'diff-width'              => 'bredde',
+'diff-height'             => 'høyde',
+'diff-p'                  => "et '''avsnitt'''",
+'diff-blockquote'         => "et '''sitat'''",
+'diff-h1'                 => "en '''overskrift (nivå 1)'''",
+'diff-h2'                 => "en '''overskrift (nivå 2)'''",
+'diff-h3'                 => "en '''overskrift (nivå 3)'''",
+'diff-h4'                 => "en '''overskrift (nivå 4)'''",
+'diff-h5'                 => "en '''overskrift (nivå 5)'''",
+'diff-pre'                => "et '''forhåndsformatert avsnitt'''",
+'diff-div'                => "en '''inndeling'''",
+'diff-ul'                 => "en '''uordnet liste'''",
+'diff-ol'                 => "en '''ordet liste'''",
+'diff-li'                 => "et '''listeelement'''",
+'diff-table'              => "en '''tabell'''",
+'diff-tbody'              => "en '''tabells innhold'''",
+'diff-tr'                 => "en '''rad'''",
+'diff-td'                 => "en '''celle'''",
+'diff-th'                 => "en '''overskrift'''",
+'diff-br'                 => "et '''linjeskift'''",
+'diff-hr'                 => "en '''horisontal linje'''",
+'diff-code'               => "et '''kildekodeavsnitt'''",
+'diff-dl'                 => "en '''definisjonsliste'''",
+'diff-dt'                 => "en '''definisjonsterm'''",
+'diff-dd'                 => "en '''definisjon'''",
+'diff-input'              => "et '''innlegg'''",
+'diff-form'               => "et '''skjema'''",
+'diff-img'                => "et '''bilde'''",
+'diff-span'               => "en '''''span'''''",
+'diff-a'                  => "en '''lenke'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''halvfet'''",
+'diff-strong'             => "'''fet'''",
+'diff-em'                 => "'''markering'''",
+'diff-font'               => "'''skrifttype'''",
+'diff-big'                => "'''stor'''",
+'diff-del'                => "'''slettet'''",
+'diff-tt'                 => "'''fast bredde'''",
+'diff-sub'                => "'''senket'''",
+'diff-sup'                => "'''opphøyd'''",
+'diff-strike'             => "'''gjennomstreket'''",
 
 # Search results
-'searchresults'             => 'Søkeresultater',
-'searchresulttext'          => 'For mer informasjon om søking i {{SITENAME}}, se [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Du søkte på '''[[:$1]]''' ([[Special:Prefixindex/$1|alle sider som begynner med «$1»]] | [[Special:WhatLinksHere/$1|alle sider som lenker til «$1»]])",
-'searchsubtitleinvalid'     => 'For forespørsel "$1"',
-'noexactmatch'              => "'''Det er ingen side med tittelen «$1».''' Du kan [[:$1|opprette siden]].",
-'noexactmatch-nocreate'     => "'''Det er ingen side med tittelen «$1».'''",
-'toomanymatches'            => 'For mange mulige svar, prøv med en annen spørring',
-'titlematches'              => 'Artikkeltitler med treff på forespørselen',
-'notitlematches'            => 'Ingen artikkeltitler hadde treff på forespørselen',
-'textmatches'               => 'Artikkeltekster med treff på forespørselen',
-'notextmatches'             => 'Ingen artikkeltekster hadde treff på forespørselen',
-'prevn'                     => 'forrige $1',
-'nextn'                     => 'neste $1',
-'viewprevnext'              => 'Vis ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|ett|$2}} ord)',
-'search-result-score'       => 'Relevans: $1&nbsp;%',
-'search-redirect'           => '(omdirigering $1)',
-'search-section'            => '(seksjon $1)',
-'search-suggest'            => 'Mente du: $1',
-'search-interwiki-caption'  => 'Søsterprosjekter',
-'search-interwiki-default'  => '$1 resultater:',
-'search-interwiki-more'     => '(mer)',
-'search-mwsuggest-enabled'  => 'med forslag',
-'search-mwsuggest-disabled' => 'ingen forslag',
-'search-relatedarticle'     => 'Relatert',
-'mwsuggest-disable'         => 'Slå av AJAX-forslag',
-'searchrelated'             => 'relatert',
-'searchall'                 => 'alle',
-'showingresults'            => "Nedenfor vises opptil {{PLURAL:$1|'''ett''' resultat|'''$1''' resultater}} fra og med nummer <b>$2</b>.",
-'showingresultsnum'         => "Nedenfor vises {{PLURAL:$3|'''ett''' resultat|'''$3''' resultater}} fra og med nummer '''$2'''.",
-'showingresultstotal'       => "Viser resultat '''{{PLURAL:$3|$1|$1–$2}}''' av '''$3''' nedenfor",
-'nonefound'                 => "'''Merk:''' Som standard søkes det kun i enkelte navnerom. For å søke i alle, bruk prefikset ''all:'' (inkluderer diskusjonssider, maler etc.), eller bruk det ønskede navnerommet som prefiks.",
-'powersearch'               => 'Avansert søk',
-'powersearch-legend'        => 'Avansert søk',
-'powersearch-ns'            => 'Søk i navnerom:',
-'powersearch-redir'         => 'Vis omdirigeringer',
-'powersearch-field'         => 'Søk etter',
-'search-external'           => 'Eksternt søk',
-'searchdisabled'            => 'Søkefunksjonen er slått av. Du kan søke via Google i mellomtiden. Merk at Googles indeksering av {{SITENAME}} muligens er utdatert.',
+'searchresults'                    => 'Søkeresultater',
+'searchresults-title'              => 'Søkeresultater for "$1"',
+'searchresulttext'                 => 'For mer informasjon om søking i {{SITENAME}}, se [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Du søkte på '''[[:$1]]''' ([[Special:Prefixindex/$1|alle sider som begynner med «$1»]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alle sider som lenker til «$1»]])",
+'searchsubtitleinvalid'            => 'For forespørsel "$1"',
+'noexactmatch'                     => "'''Det er ingen side med tittelen «$1».''' Du kan [[:$1|opprette siden]].",
+'noexactmatch-nocreate'            => "'''Det er ingen side med tittelen «$1».'''",
+'toomanymatches'                   => 'For mange mulige svar, prøv med en annen spørring',
+'titlematches'                     => 'Artikkeltitler med treff på forespørselen',
+'notitlematches'                   => 'Ingen artikkeltitler hadde treff på forespørselen',
+'textmatches'                      => 'Artikkeltekster med treff på forespørselen',
+'notextmatches'                    => 'Ingen artikkeltekster hadde treff på forespørselen',
+'prevn'                            => 'forrige $1',
+'nextn'                            => 'neste $1',
+'viewprevnext'                     => 'Vis ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Søkeinnstillinger',
+'searchmenu-exists'                => "* Siden '''[[$1]]'''",
+'searchmenu-new'                   => "'''Opprett siden ''[[:$1]]'' på denne wikien.'''",
+'searchhelp-url'                   => 'Help:Hjelp',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Vis alle sider som begynner med dette]]',
+'searchprofile-articles'           => 'Innholdssider',
+'searchprofile-articles-and-proj'  => 'Innholds- og prosjektsider',
+'searchprofile-project'            => 'Prosjektsider',
+'searchprofile-images'             => 'Filer',
+'searchprofile-everything'         => 'Alt',
+'searchprofile-advanced'           => 'Avansert',
+'searchprofile-articles-tooltip'   => 'Søk i $1',
+'searchprofile-project-tooltip'    => 'Søk i $1',
+'searchprofile-images-tooltip'     => 'Søk etter filer',
+'searchprofile-everything-tooltip' => 'Søk i alt innhold (inkldert diskusjonssider)',
+'searchprofile-advanced-tooltip'   => 'Søk i visse navnerom',
+'prefs-search-nsdefault'           => 'Søk med standardverdier:',
+'prefs-search-nscustom'            => 'Søk i valgte navnerom:',
+'search-result-size'               => '$1 ({{PLURAL:$2|ett|$2}} ord)',
+'search-result-score'              => 'Relevans: $1&nbsp;%',
+'search-redirect'                  => '(omdirigering $1)',
+'search-section'                   => '(seksjon $1)',
+'search-suggest'                   => 'Mente du: $1',
+'search-interwiki-caption'         => 'Søsterprosjekter',
+'search-interwiki-default'         => '$1 resultater:',
+'search-interwiki-more'            => '(mer)',
+'search-mwsuggest-enabled'         => 'med forslag',
+'search-mwsuggest-disabled'        => 'ingen forslag',
+'search-relatedarticle'            => 'Relatert',
+'mwsuggest-disable'                => 'Slå av AJAX-forslag',
+'searchrelated'                    => 'relatert',
+'searchall'                        => 'alle',
+'showingresults'                   => "Nedenfor vises opptil {{PLURAL:$1|'''ett''' resultat|'''$1''' resultater}} fra og med nummer <b>$2</b>.",
+'showingresultsnum'                => "Nedenfor vises {{PLURAL:$3|'''ett''' resultat|'''$3''' resultater}} fra og med nummer '''$2'''.",
+'showingresultstotal'              => "Viser resultat {{PLURAL:$4|'''$1''' av '''$3'''|'''$1&ndash;$2''' av '''$3'''}} nedenfor",
+'nonefound'                        => "'''Merk:''' Som standard søkes det kun i enkelte navnerom. For å søke i alle, bruk prefikset ''all:'' (inkluderer diskusjonssider, maler etc.), eller bruk det ønskede navnerommet som prefiks.",
+'search-nonefound'                 => 'Det var ingen resultater som passet til søket.',
+'powersearch'                      => 'Avansert søk',
+'powersearch-legend'               => 'Avansert søk',
+'powersearch-ns'                   => 'Søk i navnerom:',
+'powersearch-redir'                => 'Vis omdirigeringer',
+'powersearch-field'                => 'Søk etter',
+'search-external'                  => 'Eksternt søk',
+'searchdisabled'                   => 'Søkefunksjonen er slått av. Du kan søke via Google i mellomtiden. Merk at Googles indeksering av {{SITENAME}} muligens er utdatert.',
 
 # Preferences page
-'preferences'              => 'Innstillinger',
-'mypreferences'            => 'Innstillinger',
-'prefs-edits'              => 'Antall redigeringer:',
-'prefsnologin'             => 'Ikke logget inn',
-'prefsnologintext'         => 'Du må være <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logget inn]</span> for å endre brukerinnstillingene.',
-'prefsreset'               => 'Brukerinnstillingene er tilbakestilt.',
-'qbsettings'               => 'Brukerinnstillinger for hurtigmeny.',
-'qbsettings-none'          => 'Ingen',
-'qbsettings-fixedleft'     => 'Fast venstre',
-'qbsettings-fixedright'    => 'Fast høyre',
-'qbsettings-floatingleft'  => 'Flytende venstre',
-'qbsettings-floatingright' => 'Flytende til høyre',
-'changepassword'           => 'Endre passord',
-'skin'                     => 'Utseende',
-'math'                     => 'Matteformler',
-'dateformat'               => 'Datoformat',
-'datedefault'              => 'Ingen foretrukket',
-'datetime'                 => 'Dato og tid',
-'math_failure'             => 'Feil i matematikken',
-'math_unknown_error'       => 'ukjent feil',
-'math_unknown_function'    => 'ukjent funksjon',
-'math_lexing_error'        => 'lexerfeil',
-'math_syntax_error'        => 'syntaksfeil',
-'math_image_error'         => 'PNG-konversjon mislyktes',
-'math_bad_tmpdir'          => 'Kan ikke skrive til eller opprette midlertidig mappe',
-'math_bad_output'          => 'Kan ikke skrive til eller opprette resultatmappe',
-'math_notexvc'             => 'Mangler kjørbar texvc;
+'preferences'               => 'Innstillinger',
+'mypreferences'             => 'Innstillinger',
+'prefs-edits'               => 'Antall redigeringer:',
+'prefsnologin'              => 'Ikke logget inn',
+'prefsnologintext'          => 'Du må være <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logget inn]</span> for å endre brukerinnstillingene.',
+'prefsreset'                => 'Brukerinnstillingene er tilbakestilt.',
+'qbsettings'                => 'Brukerinnstillinger for hurtigmeny.',
+'qbsettings-none'           => 'Ingen',
+'qbsettings-fixedleft'      => 'Fast venstre',
+'qbsettings-fixedright'     => 'Fast høyre',
+'qbsettings-floatingleft'   => 'Flytende venstre',
+'qbsettings-floatingright'  => 'Flytende til høyre',
+'changepassword'            => 'Endre passord',
+'skin'                      => 'Utseende',
+'skin-preview'              => 'forhåndsvisning',
+'math'                      => 'Matteformler',
+'dateformat'                => 'Datoformat',
+'datedefault'               => 'Ingen foretrukket',
+'datetime'                  => 'Dato og tid',
+'math_failure'              => 'Feil i matematikken',
+'math_unknown_error'        => 'ukjent feil',
+'math_unknown_function'     => 'ukjent funksjon',
+'math_lexing_error'         => 'lexerfeil',
+'math_syntax_error'         => 'syntaksfeil',
+'math_image_error'          => 'PNG-konversjon mislyktes',
+'math_bad_tmpdir'           => 'Kan ikke skrive til eller opprette midlertidig mappe',
+'math_bad_output'           => 'Kan ikke skrive til eller opprette resultatmappe',
+'math_notexvc'              => 'Mangler kjørbar texvc;
 se math/README for oppsett.',
-'prefs-personal'           => 'Brukerdata',
-'prefs-rc'                 => 'Siste endringer',
-'prefs-watchlist'          => 'Overvåkningsliste',
-'prefs-watchlist-days'     => 'Dager som skal vises i overvåkningslisten:',
-'prefs-watchlist-edits'    => 'Antall redigeringer som skal vises i utvidet overvåkningsliste:',
-'prefs-misc'               => 'Diverse',
-'saveprefs'                => 'Lagre',
-'resetprefs'               => 'Tilbakestill ulagrede endringer',
-'oldpassword'              => 'Gammelt passord:',
-'newpassword'              => 'Nytt passord:',
-'retypenew'                => 'Gjenta nytt passord:',
-'textboxsize'              => 'Redigering',
-'rows'                     => 'Rader:',
-'columns'                  => 'Kolonner',
-'searchresultshead'        => 'Søking',
-'resultsperpage'           => 'Resultater per side:',
-'contextlines'             => 'Linjer per resultat',
-'contextchars'             => 'Tegn per linje i resultatet',
-'stub-threshold'           => 'Grense for <span class="mw-stub-example">stubblenkeformatering</span>:',
-'recentchangesdays'        => 'Antall dager som skal vises i siste endringer:',
-'recentchangescount'       => 'Antall redigeringer som skal vises i «Siste endringer», historikker og logger.',
-'savedprefs'               => 'Innstillingene ble lagret.',
-'timezonelegend'           => 'Tidssone',
-'timezonetext'             => '¹Tast inn antall timer lokaltid differerer fra tjenertiden (UTC).',
-'localtime'                => 'Lokaltid',
-'timezoneoffset'           => 'Forskjell',
-'servertime'               => 'Tjenerens tid er nå',
-'guesstimezone'            => 'Hent tidssone fra nettleseren',
-'allowemail'               => 'Tillat andre å sende meg e-post',
-'prefs-searchoptions'      => 'Søkealternativ',
-'prefs-namespaces'         => 'Navnerom',
-'defaultns'                => 'Søk i disse navnerommene som standard:',
-'default'                  => 'standard',
-'files'                    => 'Filer',
+'prefs-personal'            => 'Brukerdata',
+'prefs-rc'                  => 'Siste endringer',
+'prefs-watchlist'           => 'Overvåkningsliste',
+'prefs-watchlist-days'      => 'Dager som skal vises i overvåkningslisten:',
+'prefs-watchlist-days-max'  => '(maskimum 7 dager)',
+'prefs-watchlist-edits'     => 'Antall redigeringer som skal vises i utvidet overvåkningsliste:',
+'prefs-watchlist-edits-max' => '(maksimum antall: 1000)',
+'prefs-misc'                => 'Diverse',
+'prefs-resetpass'           => 'Endre passord',
+'saveprefs'                 => 'Lagre',
+'resetprefs'                => 'Tilbakestill ulagrede endringer',
+'textboxsize'               => 'Redigering',
+'prefs-edit-boxsize'        => 'Størrelse på redigeringsvinduet.',
+'rows'                      => 'Rader:',
+'columns'                   => 'Kolonner',
+'searchresultshead'         => 'Søking',
+'resultsperpage'            => 'Resultater per side:',
+'contextlines'              => 'Linjer per resultat',
+'contextchars'              => 'Tegn per linje i resultatet',
+'stub-threshold'            => 'Grense for <span class="mw-stub-example">stubblenkeformatering</span>:',
+'recentchangesdays'         => 'Antall dager som skal vises i siste endringer:',
+'recentchangesdays-max'     => '(maksimum $1 {{PLURAL:$1|dag|dager}})',
+'recentchangescount'        => 'Antall redigeringer som skal vises i «Siste endringer», historikker og logger som standard:',
+'savedprefs'                => 'Innstillingene ble lagret.',
+'timezonelegend'            => 'Tidssone',
+'timezonetext'              => '¹Tast inn antall timer lokaltid differerer fra tjenertiden (UTC).',
+'localtime'                 => 'Lokaltid:',
+'timezoneselect'            => 'Tidssone:',
+'timezoneuseserverdefault'  => 'Bruk serverens standardinnstillinger',
+'timezoneuseoffset'         => 'Annet (spesifiser forskjell)',
+'timezoneoffset'            => 'Forskjell¹:',
+'servertime'                => 'Serverens tid er nå:',
+'guesstimezone'             => 'Hent tidssone fra nettleseren',
+'allowemail'                => 'Tillat andre å sende meg e-post',
+'prefs-searchoptions'       => 'Søkealternativ',
+'prefs-namespaces'          => 'Navnerom',
+'defaultns'                 => 'Søk i disse navnerommene som standard:',
+'default'                   => 'standard',
+'files'                     => 'Filer',
 
 # User rights
 'userrights'                     => 'Brukerrettighetskontroll', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'         => 'Ordne brukergrupper',
 'userrights-user-editname'       => 'Skriv inn et brukernavn:',
 'editusergroup'                  => 'Endre brukergrupper',
-'editinguser'                    => "Endrer brukerrettighetene til '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                    => "Endrer brukerrettighetene til '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'       => 'Rediger brukergrupper',
 'saveusergroups'                 => 'Lagre brukergrupper',
 'userrights-groupsmember'        => 'Medlem av:',
@@ -1065,6 +1164,8 @@ se math/README for oppsett.',
 'right-minoredit'            => 'Marker endringer som mindre',
 'right-move'                 => 'Flytte sider',
 'right-move-subpages'        => 'Flytte sider med undersider',
+'right-move-rootuserpages'   => 'Flytte hovedbrukersider',
+'right-movefile'             => 'Flytte filer',
 'right-suppressredirect'     => 'Behøver ikke å opprette omdirigeringer ved sideflytting',
 'right-upload'               => 'Laste opp filer',
 'right-reupload'             => 'Skrive over eksisterende filer',
@@ -1115,13 +1216,50 @@ se math/README for oppsett.',
 'rightslogentry' => 'endret gruppe for $1 fra $2 til $3',
 'rightsnone'     => '(ingen)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'se denne siden',
+'action-edit'                 => 'redigere denne siden',
+'action-createpage'           => 'opprette sider',
+'action-createtalk'           => 'opprette diskusjonssider',
+'action-createaccount'        => 'opprette denne kontoen',
+'action-minoredit'            => 'merke denne redigeringen som mindre',
+'action-move'                 => 'flytte denne siden',
+'action-move-subpages'        => 'flytte denne siden og dens undersider',
+'action-move-rootuserpages'   => 'flytte hovedbrukersider',
+'action-movefile'             => 'flytte denne filen',
+'action-upload'               => 'laste opp denne filen',
+'action-reupload'             => 'overskrive den nåværende filen',
+'action-reupload-shared'      => 'overskrive denne filen på fellesdatabasen',
+'action-upload_by_url'        => 'laste opp denne filen fra en URL',
+'action-writeapi'             => 'bruke skrive-API-en',
+'action-delete'               => 'slette denne siden',
+'action-deleterevision'       => 'slette denne revisjonen',
+'action-deletedhistory'       => 'se denne sidens slettede historikk',
+'action-browsearchive'        => 'søke i slettede sider',
+'action-undelete'             => 'gjenopprette denne siden',
+'action-suppressrevision'     => 'se og gjenopprette denne skjulte revisjonen',
+'action-suppressionlog'       => 'se denne private loggen',
+'action-block'                => 'blokkere denne brukeren fra å redigere',
+'action-protect'              => 'endre denne sidens beskyttelsesnivåer',
+'action-import'               => 'importere denne siden fra en annen wiki',
+'action-importupload'         => 'importere denne siden fra en opplastet fil',
+'action-patrol'               => 'merke andre brukeres redigeringer som patruljert',
+'action-autopatrol'           => 'merke redigeringene dine som patruljert',
+'action-unwatchedpages'       => 'vise listen over uovervåkede sider',
+'action-trackback'            => 'levere tilbakemelding',
+'action-mergehistory'         => 'flette sidens historikk',
+'action-userrights'           => 'redigere alle brukerrettigheter',
+'action-userrights-interwiki' => 'endre brukerrettigheter for brukere på andre wikier',
+'action-siteadmin'            => 'låse eller låse opp databasen',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|endring|endringer}}',
 'recentchanges'                     => 'Siste endringer',
+'recentchanges-legend'              => 'Alternativer for siste endringer',
 'recentchangestext'                 => 'Vis de siste endringene til denne siden',
 'recentchanges-feed-description'    => 'Følg med på siste endringer i denne wikien med denne feed-en.',
 'rcnote'                            => "Nedenfor vises {{PLURAL:$1|én endring|de siste '''$1''' endringene}} fra {{PLURAL:$2|det siste døgnet|de siste '''$2''' døgnene}} per $5 $4.",
-'rcnotefrom'                        => "Nedenfor er endringene fra '''$2''' til '''$1''' vist.",
+'rcnotefrom'                        => "Nedenfor er endringene fra '''$2''' (opp til '''$1''' vises).",
 'rclistfrom'                        => 'Vis nye endringer med start fra $1',
 'rcshowhideminor'                   => '$1 mindre endringer',
 'rcshowhidebots'                    => '$1 roboter',
@@ -1141,6 +1279,8 @@ se math/README for oppsett.',
 'rc_categories'                     => 'Begrens til kategorier (skilletegn: «|»)',
 'rc_categories_any'                 => 'Alle',
 'newsectionsummary'                 => '/* $1 */ ny seksjon',
+'rc-enhanced-expand'                => 'Vis detaljer (trenger JavaScript)',
+'rc-enhanced-hide'                  => 'Skjul detaljer',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Relaterte endringer',
@@ -1158,16 +1298,16 @@ Sider som også er på din [[Special:Watchlist|overvåkningsliste]] vises i '''f
 'reupload'                    => 'Last opp fil igjen',
 'reuploaddesc'                => 'Avbryt opplasting og gå tilbake til opplastingsskjemaet',
 'uploadnologin'               => 'Ikke logget inn',
-'uploadnologintext'           => 'Du må være [[Special:UserLogin|loggett inn]] for å kunne laste opp filer.',
+'uploadnologintext'           => 'Du må være [[Special:UserLogin|logget inn]] for å kunne laste opp filer.',
 'upload_directory_missing'    => 'Oppplastingsmappen ($1) mangler og kunne ikke opprettes av tjeneren.',
 'upload_directory_read_only'  => 'Opplastingsmappa ($1) er ikke skrivbar for tjeneren.',
 'uploaderror'                 => 'Feil under opplasting av fil',
 'uploadtext'                  => "Bruk skjemaet nedenfor for å laste opp filer.
-For å se eller søke i eksisterende filer, gå til [[Special:ImageList|listen over filer]]. Opplastinger lagres også i [[Special:Log/upload|opplastingsloggen]].
+For å se eller søke i eksisterende filer, gå til [[Special:FileList|listen over filer]]. Opplastinger lagres også i [[Special:Log/upload|opplastingsloggen]].
 
 For å inkludere en fil på en side, bruk en slik lenke:
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}:Filnavn.jpg<nowiki>]]</nowiki></tt>''' for å bruke bildet i opprinnelig form
-*'''<tt><nowiki>[[</nowiki>{{ns:image}}:Filnavn.png|200px|thumb|left|Alternativ tekst<nowiki>]]</nowiki></tt>''' for å bruke bildet med en bredde på 200&nbsp;piksler, venstrestilt og med «Alternativ tekst» som beskrivelse
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}:Filnavn.jpg<nowiki>]]</nowiki></tt>''' for å bruke bildet i opprinnelig form
+*'''<tt><nowiki>[[</nowiki>{{ns:file}}:Filnavn.png|200px|thumb|left|Alternativ tekst<nowiki>]]</nowiki></tt>''' for å bruke bildet med en bredde på 200&nbsp;piksler, venstrestilt og med «Alternativ tekst» som beskrivelse
 *'''<tt><nowiki>[[</nowiki>{{ns:media}}:Filnavn.ogg<nowiki>]]</nowiki></tt>''' for å lenke direkte til filen uten å vise den",
 'upload-permitted'            => 'Tillatte filtyper: $1.',
 'upload-preferred'            => 'Foretrukne filtyper: $1',
@@ -1175,7 +1315,7 @@ For å inkludere en fil på en side, bruk en slik lenke:
 'uploadlog'                   => 'opplastingslogg',
 'uploadlogpage'               => 'Opplastingslogg',
 'uploadlogpagetext'           => 'Her er en liste over de siste opplastede filene.
-Se [[Special:NewImages|galleriet over nye filer]] for en mer visuell visning',
+Se [[Special:NewFiles|galleriet over nye filer]] for en mer visuell visning',
 'filename'                    => 'Filnavn',
 'filedesc'                    => 'Beskrivelse',
 'fileuploadsummary'           => 'Beskrivelse:',
@@ -1197,22 +1337,24 @@ Se [[Special:NewImages|galleriet over nye filer]] for en mer visuell visning',
 'large-file'                  => 'Det er anbefalt at filen ikke er større enn $1; denne filen er $2.',
 'largefileserver'             => 'Denne fila er større enn det tjeneren er satt opp til å tillate.',
 'emptyfile'                   => 'Fila du lastet opp ser ut til å være tom. Dette kan komme av en skrivefeil i filnavnet. Sjekk om du virkelig vil laste opp denne fila.',
-'fileexists'                  => 'Ei fil med dette navnet finnes allerede. Sjekk <strong><tt>$1</tt></strong> hvis du ikke er sikker på at du vil forandre den.',
-'filepageexists'              => 'Beskrivelsessiden for denne filen finnes allerede på <strong><tt>$1</tt></strong>, men ingen filer med dette navnet finnes. Sammendragen du skriver iknn vil ikke vises på beskrivelsessiden. For at det skal dukke opp der må du skrive det inn manuelt etter å ha lastet opp filen.',
-'fileexists-extension'        => 'En fil med et lignende navn finnes:<br />
-Navnet på din fil: <strong><tt>$1</tt></strong><br />
-Navn på eksisterende fil: <strong><tt>$2</tt></strong><br />
-Den eneste forskjellen ligger i store/små bokstaver i filendelsen. Vennligst sjekk filene for likheter.',
+'fileexists'                  => "Ei fil med dette navnet finnes allerede. Sjekk '''<tt>$1</tt>''' hvis du ikke er sikker på at du vil forandre den.",
+'filepageexists'              => "Beskrivelsessiden for denne filen finnes allerede på '''<tt>$1</tt>''', men ingen filer med dette navnet finnes. Sammendragen du skriver iknn vil ikke vises på beskrivelsessiden. For at det skal dukke opp der må du skrive det inn manuelt etter å ha lastet opp filen.",
+'fileexists-extension'        => "En fil med et lignende navn finnes:<br />
+Navnet på din fil: '''<tt>$1</tt>'''<br />
+Navn på eksisterende fil: '''<tt>$2</tt>'''<br />
+Den eneste forskjellen ligger i store/små bokstaver i filendelsen. Vennligst sjekk filene for likheter.",
 'fileexists-thumb'            => "<center>'''Eksisterende fil'''</center>",
-'fileexists-thumbnail-yes'    => 'Filen ser ut til å være et bilde av redusert størrelse. Vennligst sjekk filen <strong><tt>$1</tt></strong>.<br />
-Om filen du sjekket er det samme bildet, men i opprinnelig størrelse, er det ikke nødvendig å laste opp en ekstra fil.',
-'file-thumbnail-no'           => 'Filnavnet begynner med <strong><tt>$1</tt></strong>.
-Det virker som om det er et bilde av redusert størrelse <i>(miniatyrbilde)</i>.
-Om du har dette bildet i stor utgave, last opp det, eller endre filnavnet på denne filen.',
-'fileexists-forbidden'        => 'En fil med dette navnet finnes fra før; gå tilbake og last opp filen under et nytt navn. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Filen ser ut til å være et bilde av redusert størrelse. Vennligst sjekk filen '''<tt>$1</tt>'''.<br />
+Om filen du sjekket er det samme bildet, men i opprinnelig størrelse, er det ikke nødvendig å laste opp en ekstra fil.",
+'file-thumbnail-no'           => "Filnavnet begynner med '''<tt>$1</tt>'''.
+Det virker som om det er et bilde av redusert størrelse ''(miniatyrbilde)''.
+Om du har dette bildet i stor utgave, last opp det, eller endre filnavnet på denne filen.",
+'fileexists-forbidden'        => 'En fil med dette navnet finnes fra før, og kan ikke erstattes.
+Om du fortsatt ønsker å laste opp fila, gå tilbake og last den opp under et nytt navn. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Ei fil med dette navnet finnes fra før i det delte fillageret.
-Om du fortsatt ønsker å laste opp fila, gå tilbake og last den opp under et nytt navn. [[Image:$1|thumb|center|$1]]',
+Om du fortsatt ønsker å laste opp fila, gå tilbake og last den opp under et nytt navn. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Denne filen er en dublett av følgende {{PLURAL:$1|fil|filer}}:',
+'file-deleted-duplicate'      => 'En fil identisk med denne filen ([[$1]]) har tidligere blitt slettet. Du bør sjekke denne filens slettehistorikk før du prøver å laste den opp på nytt.',
 'successfulupload'            => 'Opplastingen er gjennomført',
 'uploadwarning'               => 'Opplastingsadvarsel',
 'savefile'                    => 'Lagre fil',
@@ -1231,7 +1373,7 @@ Om du fortsatt ønsker å laste opp fila, gå tilbake og last den opp under et n
 'upload-wasdeleted'           => "'''Advarsel: Du laster opp en fil som tidligere har blitt slettet.'''
 
 Vurder om det er riktig å fortsette å laste opp denne filen. Slettingsloggen for filen gis nedenunder:",
-'filename-bad-prefix'         => 'Navnet på filen du laster opp begynner med <strong>«$1»</strong>, hvilket er et ikke-beksrivende navn som vanligvis brukes automatisk av digitalkameraer. Vennligst bruk et mer beskrivende navn på filen.',
+'filename-bad-prefix'         => "Navnet på filen du laster opp begynner med '''«$1»''', hvilket er et ikke-beksrivende navn som vanligvis brukes automatisk av digitalkameraer. Vennligst bruk et mer beskrivende navn på filen.",
 'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
 # Syntaksen er som følger:
 #   * Alt fra tegnet «#» til slutten av linja er en kommentar
@@ -1268,18 +1410,19 @@ Om problemet fortsetter, kontakt en [[Special:ListUsers/sysop|administrator]].',
 'upload_source_url'  => ' (en gyldig, offentlig tilgjengelig adresse)',
 'upload_source_file' => ' (en fil på din datamaskin)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Denne spesialsiden viser alle opplastede filer. De sist opplastede filene vises på toppen som standard. Klikk på en kolonneoverskrift for å endre sorteringsmetode.',
-'imagelist_search_for'  => 'Søk etter filnavn:',
+# Special:ListFiles
+'listfiles-summary'     => 'Denne spesialsiden viser alle opplastede filer. De sist opplastede filene vises på toppen som standard. Klikk på en kolonneoverskrift for å endre sorteringsmetode.',
+'listfiles_search_for'  => 'Søk etter filnavn:',
 'imgfile'               => 'fil',
-'imagelist'             => 'Filliste',
-'imagelist_date'        => 'Dato',
-'imagelist_name'        => 'Navn',
-'imagelist_user'        => 'Bruker',
-'imagelist_size'        => 'Størrelse (bytes)',
-'imagelist_description' => 'Beskrivelse',
-
-# Image description page
+'listfiles'             => 'Filliste',
+'listfiles_date'        => 'Dato',
+'listfiles_name'        => 'Navn',
+'listfiles_user'        => 'Bruker',
+'listfiles_size'        => 'Størrelse (bytes)',
+'listfiles_description' => 'Beskrivelse',
+'listfiles_count'       => 'Versjoner',
+
+# File description page
 'filehist'                       => 'Filhistorikk',
 'filehist-help'                  => 'Klikk på en dato/klokkeslett for å se filen slik den var på den tiden.',
 'filehist-deleteall'             => 'slett alt',
@@ -1287,16 +1430,22 @@ Om problemet fortsetter, kontakt en [[Special:ListUsers/sysop|administrator]].',
 'filehist-revert'                => 'tilbakestill',
 'filehist-current'               => 'nåværende',
 'filehist-datetime'              => 'Dato/tid',
+'filehist-thumb'                 => 'Miniatyrbilde',
+'filehist-thumbtext'             => 'Miniatyrbilde av versjonen fra $1',
+'filehist-nothumb'               => 'Intet miniatyrbilde',
 'filehist-user'                  => 'Bruker',
 'filehist-dimensions'            => 'Dimensjoner',
 'filehist-filesize'              => 'Filstørrelse',
 'filehist-comment'               => 'Kommentar',
-'imagelinks'                     => 'Lenker',
+'imagelinks'                     => 'Fillenker',
 'linkstoimage'                   => 'Følgende {{PLURAL:$1|side|$1 sider}} har lenker til denne fila:',
+'linkstoimage-more'              => 'Mer enn $1 {{PLURAL:$1|side|sider}} lenker til denne fila.
+Følgende liste viser {{PLURAL:$1|den første siden|de $1 første sidene}}.
+En [[Special:WhatLinksHere/$2|fullstendig liste]] er tilgjengelig.',
 'nolinkstoimage'                 => 'Det er ingen sider som bruker denne fila.',
 'morelinkstoimage'               => 'Vis [[Special:WhatLinksHere/$1|flere lenker]] til denne filen.',
 'redirectstofile'                => 'Følgende {{PLURAL:$1|fil er en omdirigering|filer er omdirigeringer}} til denne filen:',
-'duplicatesoffile'               => 'Følgende {{PLURAL:$1|fil er en dublett|filer er dubletter}} av denne filen:',
+'duplicatesoffile'               => 'Følgende {{PLURAL:$1|fil er en dublett|filer er dubletter}} av denne filen ([[Special:FileDupelicateSearch/$2|fler detaljer]]):',
 'sharedupload'                   => 'Denne filen er en delt opplasting og kan brukes av andre prosjekter.',
 'shareduploadwiki'               => 'Se $1 for mer informasjon.',
 'shareduploadwiki-desc'          => 'Beskrivelsen som vist på dens $1 vises nedenfor.',
@@ -1323,7 +1472,7 @@ Om problemet fortsetter, kontakt en [[Special:ListUsers/sysop|administrator]].',
 # File deletion
 'filedelete'                  => 'Slett $1',
 'filedelete-legend'           => 'Slett fil',
-'filedelete-intro'            => "Du sletter '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Du er i ferd med å slette fila '''[[Media:$1|$1]]''' sammen med hele dens historikk.",
 'filedelete-intro-old'        => "Du sletter versjonen av '''[[Media:$1|$1]]''' à [$4 $3, $2].",
 'filedelete-comment'          => 'Slettingsårsak:',
 'filedelete-submit'           => 'Slett',
@@ -1331,7 +1480,6 @@ Om problemet fortsetter, kontakt en [[Special:ListUsers/sysop|administrator]].',
 'filedelete-success-old'      => "Versjonen av '''[[Media:$1|$1]]''' à $3, $2 ble slettet.",
 'filedelete-nofile'           => "'''$1''' finnes ikke.",
 'filedelete-nofile-old'       => "Det er ingen arkivert versjon av '''$1''' med de gitte attributtene.",
-'filedelete-iscurrent'        => 'Du forsøker å slette den nyeste versjonen av denne filen. Vennligst tilbakestill til en eldre versjon først.',
 'filedelete-otherreason'      => 'Annen/utdypende grunn:',
 'filedelete-reason-otherlist' => 'Annen grunn',
 'filedelete-reason-dropdown'  => '*Vanlige slettingsgrunner
@@ -1358,25 +1506,31 @@ Om problemet fortsetter, kontakt en [[Special:ListUsers/sysop|administrator]].',
 
 # Random page
 'randompage'         => 'Tilfeldig side',
-'randompage-nopages' => 'Det er ingen sider i dette navnerommet.',
+'randompage-nopages' => 'Det er ingen sider i navnerommet $1.',
 
 # Random redirect
 'randomredirect'         => 'Tilfeldig omdirigering',
-'randomredirect-nopages' => 'Det er ingen omdirigeringer i dette navnerommet.',
+'randomredirect-nopages' => 'Det er ingen omdirigeringer i navnerommet $1.',
 
 # Statistics
-'statistics'             => 'Statistikk',
-'sitestats'              => '{{SITENAME}}-statistikk',
-'userstats'              => 'Brukerstatistikk',
-'sitestatstext'          => "Det er til sammen {{PLURAL:$1|'''én''' side|'''$1''' sider}} i databasen. Dette inkluderer diskusjonssider, sider om {{SITENAME}}, små stubbsider, omdirigeringer, og annet som antagligvis ikke gjelder som ordentlig innhold. Om man ikke regner med disse, er det {{PLURAL:$2|'''én''' side|'''$2''' sider}} som sannsynligvis er {{PLURAL:$2|en ordentlig innholdsside|ordentlige innholdssider}}.
-
-{{PLURAL:$8|'''Én''' fil|'''$8''' filer}} har blitt lastet opp.
-
-Det har vært totalt {{PLURAL:$3|'''én''' sidevisning|'''$3''' sidevisninger}}, og {{PLURAL:$4|'''én''' redigering|'''$4''' redigeringer}} siden wikien ble satt opp. Det blir i snitt {{PLURAL:$5|'''én''' redigering|'''$5''' redigeringer}} per side, og {{PLURAL:$6|'''én''' visning|'''$6''' visninger}} per redigering.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Arbeidskøen] er på '''$7'''.",
-'userstatstext'          => "Det er {{PLURAL:$1|'''én''' registrert bruker|'''$1''' registrerte brukere}}, hvorav '''$2''' (eller '''$4&nbsp;%''') har {{lc:$5rettigheter}}.",
-'statistics-mostpopular' => 'Mest viste sider',
+'statistics'                   => 'Statistikk',
+'statistics-header-pages'      => 'Sidestatistikk',
+'statistics-header-edits'      => 'Redigeringsstatistikk',
+'statistics-header-views'      => 'Visningsstatistikk',
+'statistics-header-users'      => 'Brukerstatistikk',
+'statistics-articles'          => 'Innholdssider',
+'statistics-pages'             => 'Sider',
+'statistics-pages-desc'        => 'Alle sider på wikien, inkludert diskusjonssider, omdirigeringer o.l.',
+'statistics-files'             => 'Opplastede filer',
+'statistics-edits'             => 'Redigeringer siden {{SITENAME}} ble opprettet',
+'statistics-edits-average'     => 'Gjennomsnittlig antall redigeringer per side',
+'statistics-views-total'       => 'Totalt antall visninger',
+'statistics-views-peredit'     => 'Visninger per redigering',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Jobbkøens] lengde',
+'statistics-users'             => 'Registrerte [[Special:ListUsers|brukere]]',
+'statistics-users-active'      => 'Aktive brukere',
+'statistics-users-active-desc' => 'Brukere som har utført handlinger {{PLURAL:$1|det siste døgnet|de siste $1 dagene}}',
+'statistics-mostpopular'       => 'Mest viste sider',
 
 'disambiguations'      => 'Artikler med flertydige titler',
 'disambiguationspage'  => 'Template:Peker',
@@ -1390,7 +1544,7 @@ En side anses om en pekerside om den inneholder en mal som det lenkes til fra [[
 'double-redirect-fixer'      => 'Omdirigeringsfikser',
 
 'brokenredirects'        => 'Brutte omdirigeringer',
-'brokenredirectstext'    => 'Følgende omdirigeringer peker til ikkeeksisterende sider.',
+'brokenredirectstext'    => 'Følgende omdirigeringer peker til ikkeeksisterende sider:',
 'brokenredirects-edit'   => '(rediger)',
 'brokenredirects-delete' => '(slett)',
 
@@ -1420,26 +1574,30 @@ En side anses om en pekerside om den inneholder en mal som det lenkes til fra [[
 'popularpages'            => 'Populære sider',
 'wantedcategories'        => 'Ønskede kategorier',
 'wantedpages'             => 'Etterspurte sider',
-'missingfiles'            => 'Manglende filer',
+'wantedfiles'             => 'Ønskede filer',
+'wantedtemplates'         => 'Etterspurte maler',
 'mostlinked'              => 'Sider med flest lenker til seg',
 'mostlinkedcategories'    => 'Kategorier med flest sider',
 'mostlinkedtemplates'     => 'Mest brukte maler',
 'mostcategories'          => 'Sider med flest kategorier',
 'mostimages'              => 'Mest brukte filer',
 'mostrevisions'           => 'Artikler med flest revisjoner',
-'prefixindex'             => 'Prefiksindeks',
+'prefixindex'             => 'Alle sider (etter prefiks)',
 'shortpages'              => 'Korte sider',
 'longpages'               => 'Lange sider',
 'deadendpages'            => 'Blindveisider',
 'deadendpagestext'        => 'Følgende sider lenker ikke til andre sider på {{SITENAME}}.',
 'protectedpages'          => 'LÃ¥ste sider',
 'protectedpages-indef'    => 'Kun beskyttelser på ubestemt tid',
+'protectedpages-cascade'  => 'Kun dypbeskyttelse',
 'protectedpagestext'      => 'Følgende sider er låst for flytting eller redigering',
 'protectedpagesempty'     => 'Ingen sider er for øyeblikket låst med disse paramterne.',
 'protectedtitles'         => 'Beskyttede titler',
 'protectedtitlestext'     => 'Følgende titler er beskyttet fra opprettelse',
 'protectedtitlesempty'    => 'Ingen titler beskyttes med disse parameterne for øyeblikket.',
 'listusers'               => 'Brukerliste',
+'listusers-editsonly'     => 'Vis bare brukere med redigeringer',
+'usereditcount'           => '{{PLURAL:$1|én redigering|$1 redigeringer}}',
 'newpages'                => 'Nye sider',
 'newpages-username'       => 'Brukernavn:',
 'ancientpages'            => 'Eldste sider',
@@ -1460,14 +1618,13 @@ En side anses om en pekerside om den inneholder en mal som det lenkes til fra [[
 'booksources-search-legend' => 'Søk etter bokkilder',
 'booksources-go'            => 'GÃ¥',
 'booksources-text'          => 'Under er en liste over lenker til andre sider som selger nye og brukte bøker, og kan også ha videre informasjon om bøker du leter etter:',
+'booksources-invalid-isbn'  => 'Det gitte ISBN-nummeret er ugyldig; sjekk om du har angitt det riktig.',
 
 # Special:Log
 'specialloguserlabel'  => 'Bruker:',
 'speciallogtitlelabel' => 'Tittel:',
 'log'                  => 'Logger',
 'all-logs-page'        => 'Alle logger',
-'log-search-legend'    => 'Søk i loggene.',
-'log-search-submit'    => 'GÃ¥',
 'alllogstext'          => 'Kombinert visning av alle loggene på {{SITENAME}}.
 Du kan minske antallet resultater ved å velge loggtype, brukernavn eller den siden som er påvirket (husk å skille mellom store og små boktaver).',
 'logempty'             => 'Ingen elementer i loggen.',
@@ -1479,6 +1636,7 @@ Du kan minske antallet resultater ved å velge loggtype, brukernavn eller den si
 'nextpage'          => 'Neste side ($1)',
 'prevpage'          => 'Forrige side ($1)',
 'allpagesfrom'      => 'Vis sider fra og med:',
+'allpagesto'        => 'Vis sider til og med:',
 'allarticles'       => 'Alle sider',
 'allinnamespace'    => 'Alle sider i $1-navnerommet',
 'allnotinnamespace' => 'Alle sider (ikke i $1-navnerommet)',
@@ -1498,41 +1656,68 @@ Se også [[Special:WantedCategories|ønskede kategorier]].',
 'special-categories-sort-count' => 'soter etter antall',
 'special-categories-sort-abc'   => 'sorter alfabetisk',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Slettede brukerbidrag',
+
+# Special:LinkSearch
+'linksearch'       => 'Eksterne lenker',
+'linksearch-pat'   => 'Søkemønster:',
+'linksearch-ns'    => 'Navnerom:',
+'linksearch-ok'    => 'Søk',
+'linksearch-text'  => 'Jokertegn som «*.wikipedia.org» kan brukes.<br />Støttede protokoller: <tt>$1</tt>',
+'linksearch-line'  => '$1 lenkes fra $2',
+'linksearch-error' => 'Jokertegn kan kun brukes foran tjenernavnet.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Vis brukere fra og med:',
 'listusers-submit'   => 'Vis',
 'listusers-noresult' => 'Ingen bruker funnet.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Brukeropprettelseslogg',
+'newuserlogpagetext'          => 'Dette er en logg over brukeropprettelser.',
+'newuserlog-byemail'          => 'passord sendt på e-post',
+'newuserlog-create-entry'     => 'Ny bruker',
+'newuserlog-create2-entry'    => 'opprettet kontoen $1',
+'newuserlog-autocreate-entry' => 'Konto opprettet automatisk',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Rettigheter for brukergrupper',
-'listgrouprights-summary'  => 'Følgende er en liste over brukergrupper som er definert på denne wikien, og hvilke rettigheter de har.
+'listgrouprights'                 => 'Rettigheter for brukergrupper',
+'listgrouprights-summary'         => 'Følgende er en liste over brukergrupper som er definert på denne wikien, og hvilke rettigheter de har.
 Mer informasjon om de enkelte rettighetstypene kan finnes [[{{MediaWiki:Listgrouprights-helppage}}|her]].',
-'listgrouprights-group'    => 'Gruppe',
-'listgrouprights-rights'   => 'Rettigheter',
-'listgrouprights-helppage' => 'Help:Grupperettigheter',
-'listgrouprights-members'  => '(liste over medlemmer)',
+'listgrouprights-group'           => 'Gruppe',
+'listgrouprights-rights'          => 'Rettigheter',
+'listgrouprights-helppage'        => 'Help:Grupperettigheter',
+'listgrouprights-members'         => '(liste over medlemmer)',
+'listgrouprights-addgroup'        => 'Kan legge til {{PLURAL:$2|gruppa|gruppene}}: $1',
+'listgrouprights-removegroup'     => 'Kan fjerne {{PLURAL:$2|gruppa|gruppene}}: $1',
+'listgrouprights-addgroup-all'    => 'Kan legge til alle grupper',
+'listgrouprights-removegroup-all' => 'Kan fjerne alle grupper',
 
 # E-mail user
-'mailnologin'     => 'Ingen avsenderadresse',
-'mailnologintext' => 'Du må være [[Special:UserLogin|logget inn]] og ha en gyldig e-postadresse satt i [[Special:Preferences|brukerinnstillingene]] for å sende e-post til andre brukere.',
-'emailuser'       => 'E-post til denne brukeren',
-'emailpage'       => 'E-post til bruker',
-'emailpagetext'   => 'Du kan bruke skjemaet nedenfor for å sende en e-post til denne brukeren.
+'mailnologin'      => 'Ingen avsenderadresse',
+'mailnologintext'  => 'Du må være [[Special:UserLogin|logget inn]] og ha en gyldig e-postadresse satt i [[Special:Preferences|brukerinnstillingene]] for å sende e-post til andre brukere.',
+'emailuser'        => 'E-post til denne brukeren',
+'emailpage'        => 'E-post til bruker',
+'emailpagetext'    => 'Du kan bruke skjemaet nedenfor for å sende en e-post til denne brukeren.
 Den e-postadressen du har satt i [[Special:Preferences|innstillingene dine]] vil dukke opp i «fra»-feltet på denne e-posten, så mottakeren er i stand til å svare.',
-'usermailererror' => 'E-postobjekt returnerte feilen:',
-'defemailsubject' => 'E-post fra {{SITENAME}}',
-'noemailtitle'    => 'Ingen e-postadresse',
-'noemailtext'     => 'Dene brukeren har ikke oppgitt en gyldig e-postadresse, eller har valgt å ikke motta e-post fra andre brukere.',
-'emailfrom'       => 'Fra:',
-'emailto'         => 'Til:',
-'emailsubject'    => 'Emne:',
-'emailmessage'    => 'Beskjed:',
-'emailsend'       => 'Send',
-'emailccme'       => 'Send meg en kopi av beskjeden min.',
-'emailccsubject'  => 'Kopi av din beskjed til $1: $2',
-'emailsent'       => 'E-post sendt',
-'emailsenttext'   => 'E-postbeskjeden er sendt',
-'emailuserfooter' => 'E-posten ble sendt av $1 til $2 via «Send e-post»-funksjonen på {{SITENAME}}.',
+'usermailererror'  => 'E-postobjekt returnerte feilen:',
+'defemailsubject'  => 'E-post fra {{SITENAME}}',
+'noemailtitle'     => 'Ingen e-postadresse',
+'noemailtext'      => 'Dene brukeren har ikke oppgitt en gyldig e-postadresse.',
+'nowikiemailtitle' => 'Ingen e-post tillatt',
+'nowikiemailtext'  => 'Denne brukeren har valgt å ikke motta e-post fra andre brukere.',
+'email-legend'     => 'Send en e-post til en annen {{SITENAME}}-bruker',
+'emailfrom'        => 'Fra:',
+'emailto'          => 'Til:',
+'emailsubject'     => 'Emne:',
+'emailmessage'     => 'Beskjed:',
+'emailsend'        => 'Send',
+'emailccme'        => 'Send meg en kopi av beskjeden min.',
+'emailccsubject'   => 'Kopi av din beskjed til $1: $2',
+'emailsent'        => 'E-post sendt',
+'emailsenttext'    => 'E-postbeskjeden er sendt',
+'emailuserfooter'  => 'E-posten ble sendt av $1 til $2 via «Send e-post»-funksjonen på {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Overvåkningsliste',
@@ -1564,12 +1749,7 @@ Hvis du senere vil fjerne siden fra overvåkningslisten, klikk «Avslutt overvå
 'iteminvalidname'      => 'Problem med «$1», ugyldig navn&nbsp;…',
 'wlnote'               => "Nedenfor er {{PLURAL:$1|den siste endringen|de siste $1 endringene}} {{PLURAL:$2|den siste timen|de siste '''$2''' timene}}.",
 'wlshowlast'           => 'Vis siste $1 timer $2 dager $3',
-'watchlist-show-bots'  => 'Vis robotredigeringer',
-'watchlist-hide-bots'  => 'Skjul robotredigeringer',
-'watchlist-show-own'   => 'Vis mine redigeringer',
-'watchlist-hide-own'   => 'Skjul mine redigeringer',
-'watchlist-show-minor' => 'Vis mindre redigeringer',
-'watchlist-hide-minor' => 'Skjul mindre redigeringer',
+'watchlist-options'    => 'Alternativer for overvåkningslisten',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Overvåker…',
@@ -1608,72 +1788,91 @@ For å endre innstillingene i overvåkningslisten din, besøk {{fullurl:Special:
 Tilbakemeldinger og videre assistanse:
 {{fullurl:Project:Hjelp}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Slett side',
-'confirm'                     => 'Bekreft',
-'excontent'                   => 'Innholdet var: «$1»',
-'excontentauthor'             => 'innholdet var «$1» (og eneste bidragsyter var [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => 'innholdet før siden ble tømt var: «$1»',
-'exblank'                     => 'siden var tom',
-'delete-confirm'              => 'Slett «$1»',
-'delete-legend'               => 'Slett',
-'historywarning'              => 'Advarsel: Siden du er i ferd med å slette har en historikk:',
-'confirmdeletetext'           => 'Du holder på å slette en side eller et bilde sammen med historikken. Bilder som slettes kan ikke gjenopprettes, men alle andre sider som slettes på denne måten kan gjenopprettes. Bekreft at du virkelig vil slette denne siden, og at du gjør det i samsvar med [[{{MediaWiki:Policy-url}}|retningslinjene]].',
-'actioncomplete'              => 'Gjennomført',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» er slettet. Se $2 for en oversikt over de siste slettingene.',
-'deletedarticle'              => 'slettet «[[$1]]»',
-'suppressedarticle'           => 'fjernet «[[$1]]»',
-'dellogpage'                  => 'Slettingslogg',
-'dellogpagetext'              => 'Under er ei liste over nylige slettinger.',
-'deletionlog'                 => 'slettingslogg',
-'reverted'                    => 'Gjenopprettet en tidligere versjon',
-'deletecomment'               => 'Slettingsårsak:',
-'deleteotherreason'           => 'Annen/utdypende grunn:',
-'deletereasonotherlist'       => 'Annen grunn',
-'deletereason-dropdown'       => '* Vanlige grunner for sletting
+# Delete
+'deletepage'             => 'Slett side',
+'confirm'                => 'Bekreft',
+'excontent'              => 'Innholdet var: «$1»',
+'excontentauthor'        => 'innholdet var «$1» (og eneste bidragsyter var [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'innholdet før siden ble tømt var: «$1»',
+'exblank'                => 'siden var tom',
+'delete-confirm'         => 'Slett «$1»',
+'delete-legend'          => 'Slett',
+'historywarning'         => 'Advarsel: Siden du er i ferd med å slette har en historikk:',
+'confirmdeletetext'      => 'Du holder på å slette en side eller et bilde sammen med historikken. Bilder som slettes kan ikke gjenopprettes, men alle andre sider som slettes på denne måten kan gjenopprettes. Bekreft at du virkelig vil slette denne siden, og at du gjør det i samsvar med [[{{MediaWiki:Policy-url}}|retningslinjene]].',
+'actioncomplete'         => 'Gjennomført',
+'deletedtext'            => '«<nowiki>$1</nowiki>» er slettet. Se $2 for en oversikt over de siste slettingene.',
+'deletedarticle'         => 'slettet «[[$1]]»',
+'suppressedarticle'      => 'fjernet «[[$1]]»',
+'dellogpage'             => 'Slettingslogg',
+'dellogpagetext'         => 'Under er ei liste over nylige slettinger.',
+'deletionlog'            => 'slettingslogg',
+'reverted'               => 'Gjenopprettet en tidligere versjon',
+'deletecomment'          => 'Slettingsårsak:',
+'deleteotherreason'      => 'Annen/utdypende grunn:',
+'deletereasonotherlist'  => 'Annen grunn',
+'deletereason-dropdown'  => '* Vanlige grunner for sletting
 ** På forfatters forespørsel
 ** Opphavsrettsbrudd
 ** Vandalisme',
-'delete-edit-reasonlist'      => 'Rediger begrunnelser for sletting',
-'delete-toobig'               => 'Denne siden har en stor redigeringshistorikk, med over {{PLURAL:$1|$1&nbsp;revisjon|$1&nbsp;revisjoner}}. Muligheten til å slette slike sider er begrenset for å unngå utilsiktet forstyrring av {{SITENAME}}.',
-'delete-warning-toobig'       => 'Denne siden har en stor redigeringshistorikk, med over {{PLURAL:$1|$1&nbsp;revisjon|$1&nbsp;revisjoner}}. Sletting av denne siden kan forstyrre databasen til {{SITENAME}}; vær varsom.',
-'rollback'                    => 'Fjern redigeringer',
-'rollback_short'              => 'Tilbakestill',
-'rollbacklink'                => 'tilbakestill',
-'rollbackfailed'              => 'Kunne ikke tilbakestille',
-'cantrollback'                => 'Kan ikke fjerne redigering; den siste brukeren er den eneste forfatteren.',
-'alreadyrolled'               => 'Kan ikke fjerne den siste redigeringen på [[$1]] av [[User:$2|$2]] ([[User talk:$2|diskusjon]] | [[Special:Contributions/$2|{{int:contribslink}}]]); en annen har allerede redigert siden eller fjernet redigeringen.
-
-Den siste redigeringen ble foretatt av [[User:$3|$3]] ([[User talk:$3|diskusjon]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => "Redigeringskommentaren var: «''$1''»", # only shown if there is an edit comment
-'revertpage'                  => 'Tilbakestilte endring av [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusjon]]) til siste versjon av [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Tilbakestilte endringer av $1; endret til siste versjon av $2.',
-'sessionfailure'              => "Det ser ut til å være et problem med innloggingen din, og den ble avbrutt av sikkerhetshensyn. Trykk ''Tilbake'' i nettleseren din, oppdater siden og prøv igjen.",
+'delete-edit-reasonlist' => 'Rediger begrunnelser for sletting',
+'delete-toobig'          => 'Denne siden har en stor redigeringshistorikk, med over {{PLURAL:$1|$1&nbsp;revisjon|$1&nbsp;revisjoner}}. Muligheten til å slette slike sider er begrenset for å unngå utilsiktet forstyrring av {{SITENAME}}.',
+'delete-warning-toobig'  => 'Denne siden har en stor redigeringshistorikk, med over {{PLURAL:$1|$1&nbsp;revisjon|$1&nbsp;revisjoner}}. Sletting av denne siden kan forstyrre databasen til {{SITENAME}}; vær varsom.',
+
+# Rollback
+'rollback'         => 'Fjern redigeringer',
+'rollback_short'   => 'Tilbakestill',
+'rollbacklink'     => 'tilbakestill',
+'rollbackfailed'   => 'Kunne ikke tilbakestille',
+'cantrollback'     => 'Kan ikke fjerne redigering; den siste brukeren er den eneste forfatteren.',
+'alreadyrolled'    => 'Kan ikke fjerne den siste redigeringen på [[$1]] av [[User:$2|$2]] ([[User talk:$2|diskusjon]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); en annen har allerede redigert siden eller fjernet redigeringen.
+
+Den siste redigeringen ble foretatt av [[User:$3|$3]] ([[User talk:$3|diskusjon]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Redigeringskommentaren var: «''$1''»", # only shown if there is an edit comment
+'revertpage'       => 'Tilbakestilte endring av [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusjon]]) til siste versjon av [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Tilbakestilte endringer av $1; endret til siste versjon av $2.',
+'sessionfailure'   => "Det ser ut til å være et problem med innloggingen din, og den ble avbrutt av sikkerhetshensyn. Trykk ''Tilbake'' i nettleseren din, oppdater siden og prøv igjen.",
+
+# Protect
 'protectlogpage'              => 'LÃ¥singslogg',
 'protectlogtext'              => 'Her er en liste over sider som er blitt beskyttet eller har fått fjernet beskyttelsen. Se [[Special:ProtectedPages|listen over låste sider]] for en liste over nåværende låste sider.',
 'protectedarticle'            => 'låste [[$1]]',
 'modifiedarticleprotection'   => 'endret beskyttelsesnivå for «[[$1]]»',
 'unprotectedarticle'          => 'Ã¥pnet [[$1]]',
+'movedarticleprotection'      => 'flyttet beskyttelsesinnstillinger fra «[[$2]]» til «[[$1]]»',
 'protect-title'               => 'Låser «$1»',
+'prot_1movedto2'              => '[[$1]] flyttet til [[$2]]',
 'protect-legend'              => 'Bekreft låsing',
 'protectcomment'              => 'Kommentar:',
 'protectexpiry'               => 'Utgår:',
 'protect_expiry_invalid'      => 'Utgangstiden er ugyldig.',
 'protect_expiry_old'          => 'Utgangstiden har allerede vært.',
 'protect-unchain'             => 'Spesielle flyttingstillatelser',
-'protect-text'                => 'Du kan se og forandre beskyttelsesnivået for siden <strong><nowiki>$1</nowiki></strong> her.',
-'protect-locked-blocked'      => 'Du kan ikke endre beskyttelsesnivåer mens du er blokkert. Dette er de nåværende innstillingene for siden <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Beskyttelsesnivåer kan ikke endres under en aktiv databasebeskyttelse. Dette er de nåværende innstillingene for siden <strong>$1</strong>:',
-'protect-locked-access'       => 'Kontoen din har ikke tillatelse til å endre beskyttelsesnivåer. Dette er de nåværende innstillingene for siden <strong>$1</strong>:',
+'protect-text'                => "Du kan se og forandre beskyttelsesnivået for siden '''<nowiki>$1</nowiki>''' her.",
+'protect-locked-blocked'      => "Du kan ikke endre beskyttelsesnivåer mens du er blokkert. Dette er de nåværende innstillingene for siden '''$1''':",
+'protect-locked-dblock'       => "Beskyttelsesnivåer kan ikke endres under en aktiv databasebeskyttelse. Dette er de nåværende innstillingene for siden '''$1''':",
+'protect-locked-access'       => "Kontoen din har ikke tillatelse til å endre beskyttelsesnivåer. Dette er de nåværende innstillingene for siden '''$1''':",
 'protect-cascadeon'           => 'Denne siden er låst fordi den er inkludert på følgende {{PLURAL:$1|side|sider}} som har dypbeskyttelse slått på. Du kan endre sidens låsingsnivå, men det vil ikke påvirke dypbeskyttelsen.',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Tillat alle brukere',
 'protect-fallback'            => 'Må ha «$1»-tillatelse',
-'protect-level-autoconfirmed' => 'Blokker uregistrerte brukere',
+'protect-level-autoconfirmed' => 'Blokker nye og uregistrerte brukere',
 'protect-level-sysop'         => 'Kun administratorer',
 'protect-summary-cascade'     => 'dypbeskyttelse',
 'protect-expiring'            => 'utgår $1 (UTC)',
+'protect-expiry-indefinite'   => 'ubestemt',
 'protect-cascade'             => 'Dypbeskyttelse – beskytter alle sider som er inkludert på denne siden.',
 'protect-cantedit'            => 'Du kan ikke endre beskyttelsesnivået til denne siden fordi du ikke har tillatelse til å redigere den.',
+'protect-othertime'           => 'Annen tid:',
+'protect-othertime-op'        => 'annen tid',
+'protect-existing-expiry'     => 'Gjeldende utløpstid: $3 $2',
+'protect-otherreason'         => 'Annen/utdypende grunn:',
+'protect-otherreason-op'      => 'annen/utdypende grunn',
+'protect-dropdown'            => '*Vanlige låsingsårsaker
+** Gjentatt hærverk
+** Gjentatt spam
+** Redigeringskrig
+** Side med mange besøkende',
+'protect-edit-reasonlist'     => 'Rediger låsingsgrunner',
+'protect-expiry-options'      => '2 timer:2 hours,1 dag:1 day,3 dager:3 days,1 uke:1 week,2 uker:2 weeks,1 måned:1 month,3 måneder:3 months,6 måneder:6 months,1 år:1 year,uendelig:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Tillatelse',
 'restriction-level'           => 'Restriksjonsnivå',
 'minimum-size'                => 'Minimumstørrelse',
@@ -1696,7 +1895,7 @@ Den siste redigeringen ble foretatt av [[User:$3|$3]] ([[User talk:$3|diskusjon]
 'undeletepage'                 => 'Se og gjenopprett slettede sider',
 'undeletepagetitle'            => "'''Følgende innhold er slettede revisjoner av [[:$1]].'''",
 'viewdeletedpage'              => 'Vis slettede sider',
-'undeletepagetext'             => 'Følgende sider er slettet, men finnes fortsatt i arkivet og kan gjenopprettes. Arkivet blir periodevis slettet.',
+'undeletepagetext'             => 'Følgende {{PLURAL:$1|side|sider}} er slettet, men finnes fortsatt i arkivet og kan gjenopprettes. Arkivet blir periodevis slettet.',
 'undelete-fieldset-title'      => 'Gjenopprett revisjoner',
 'undeleteextrahelp'            => "For å gjenopprette hele siden, la alle boksene være som de er, og klikk '''''Gjenopprett'''''.
 For å gjenopprette kun deler, kryss av revisjonenes bokser, og klikk '''''Gjenopprett'''''.
@@ -1706,12 +1905,13 @@ For å gjenopprette kun deler, kryss av revisjonenes bokser, og klikk '''''Gjeno
 Dersom en ny side ved samme navn har blitt oprettet etter slettingen, vil de gjenopprettede revisjonene dukke opp før denne i redigeringshistorikken.',
 'undeleterevdel'               => 'Gjenoppretting kan ikke utføres dersom det resulterer i at den øverste revisjonen blir delvis slettet. I slike tilfeller må du fjerne merkingen av den nyeste slettede revisjonen.',
 'undeletehistorynoadmin'       => 'Denne artikkelen har blitt slettet. Grunnen for slettingen vises i oppsummeringen nedenfor, sammen med detaljer om brukerne som redigerte siden før den ble slettet. Teksten i disse slettede revisjonene er kun tilgjengelig for administratorer.',
-'undelete-revision'            => 'Slettet revisjon av $1 av $3 (fra $2):',
+'undelete-revision'            => 'Slettet revisjon av $1 (per $4 $5) av $3:',
 'undeleterevision-missing'     => 'Ugyldig eller manglende revisjon. Du kan ha en ødelagt lenke, eller revisjonen har blitt fjernet fra arkivet.',
 'undelete-nodiff'              => 'Ingen tidligere revisjoner funnet.',
 'undeletebtn'                  => 'Gjenopprett',
 'undeletelink'                 => 'gjenopprett',
 'undeletereset'                => 'Nullstill',
+'undeleteinvert'               => 'Inverter valg',
 'undeletecomment'              => 'Kommentar:',
 'undeletedarticle'             => 'gjenopprettet «[[$1]]»',
 'undeletedrevisions'           => '{{PLURAL:$1|Én revisjon|$1 revisjoner}} gjenopprettet',
@@ -1743,26 +1943,27 @@ $1',
 'blanknamespace' => '(Hoved)',
 
 # Contributions
-'contributions' => 'Bidrag',
-'mycontris'     => 'Egne bidrag',
-'contribsub2'   => 'For $1 ($2)',
-'nocontribs'    => 'Ingen endringer er funnet som passer disse kriteriene.',
-'uctop'         => '(siste)',
-'month'         => 'MÃ¥ned:',
-'year'          => 'Ã…r:',
-
-'sp-contributions-newbies'     => 'Vis kun bidrag fra nye kontoer',
-'sp-contributions-newbies-sub' => 'For nybegynnere',
-'sp-contributions-blocklog'    => 'Blokkeringslogg',
-'sp-contributions-search'      => 'Søk etter bidrag',
-'sp-contributions-username'    => 'IP-adresse eller brukernavn:',
-'sp-contributions-submit'      => 'Søk',
+'contributions'       => 'Bidrag',
+'contributions-title' => 'Bidrag av $1',
+'mycontris'           => 'Egne bidrag',
+'contribsub2'         => 'For $1 ($2)',
+'nocontribs'          => 'Ingen endringer er funnet som passer disse kriteriene.',
+'uctop'               => '(siste)',
+'month'               => 'MÃ¥ned:',
+'year'                => 'Ã…r:',
+
+'sp-contributions-newbies'       => 'Vis kun bidrag fra nye kontoer',
+'sp-contributions-newbies-sub'   => 'For nybegynnere',
+'sp-contributions-newbies-title' => 'Bidrag av nye kontoer',
+'sp-contributions-blocklog'      => 'Blokkeringslogg',
+'sp-contributions-search'        => 'Søk etter bidrag',
+'sp-contributions-username'      => 'IP-adresse eller brukernavn:',
+'sp-contributions-submit'        => 'Søk',
 
 # What links here
 'whatlinkshere'            => 'Lenker hit',
 'whatlinkshere-title'      => 'Sider som lenker til «$1»',
 'whatlinkshere-page'       => 'Side:',
-'linklistsub'              => '(Liste over lenker)',
 'linkshere'                => "Følgende sider lenker til '''[[:$1]]''':",
 'nolinkshere'              => "Ingen sider lenker til '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Ingen sider lenker til '''[[:$1]]''' i valgte navnerom.",
@@ -1806,6 +2007,8 @@ $1',
 'ipbotherreason'                  => 'Annen/utdypende grunn:',
 'ipbhidename'                     => 'Skjul brukernavn i blokkeringsloggen, blokkeringslisten og brukerlisten',
 'ipbwatchuser'                    => 'Overvåk brukerens brukerside og diskusjonsside',
+'ipballowusertalk'                => 'La brukeren redigere sin egen diskusjonssiden under blokkeringen',
+'ipb-change-block'                => 'Blokker brukeren på nytt med disse innstillingene',
 'badipaddress'                    => 'Ugyldig IP-adresse.',
 'blockipsuccesssub'               => 'Blokkering utført',
 'blockipsuccesstext'              => 'IP-adressen «$1» er blokkert. Se [[Special:IPBlockList|blokkeringslisten]] for alle blokkeringer.',
@@ -1814,14 +2017,18 @@ $1',
 'ipb-unblock'                     => 'Avblokker et brukernavn eller en IP-adresse',
 'ipb-blocklist-addr'              => 'Gjeldende blokkeringer av $1',
 'ipb-blocklist'                   => 'Vis gjeldende blokkeringer',
+'ipb-blocklist-contribs'          => 'Bidrag fra $1',
 'unblockip'                       => 'Opphev blokkering',
 'unblockiptext'                   => 'Bruk skjemaet under for å gjenopprette skriveadgangen for en tidligere blokkert adresse eller bruker.',
-'ipusubmit'                       => 'Opphev blokkeringen av denne adressen',
+'ipusubmit'                       => 'Opphev blokkering',
 'unblocked'                       => '[[User:$1|$1]] ble avblokkert',
 'unblocked-id'                    => 'Blokkering $1 ble fjernet',
 'ipblocklist'                     => 'Blokkerte IP-adresser og brukere',
 'ipblocklist-legend'              => 'Finn en blokkert bruker',
 'ipblocklist-username'            => 'Brukernavn eller IP-adresse:',
+'ipblocklist-sh-userblocks'       => '$1 blokkeringer av kontoer',
+'ipblocklist-sh-tempblocks'       => '$1 midlertidige blokkeringer',
+'ipblocklist-sh-addressblocks'    => '$1 blokkeringer av individuelle IP-adresser',
 'ipblocklist-submit'              => 'Søk',
 'blocklistline'                   => '$1, $2 blokkerte $3 ($4)',
 'infiniteblock'                   => 'uendelig',
@@ -1830,25 +2037,32 @@ $1',
 'noautoblockblock'                => 'autoblokkering slått av',
 'createaccountblock'              => 'kontooppretting blokkert',
 'emailblock'                      => 'e-post blokkert',
+'blocklist-nousertalk'            => 'kan ikke redigere sin egen diskusjonsside',
 'ipblocklist-empty'               => 'Blokkeringslisten er tom.',
 'ipblocklist-no-results'          => 'Den angitte IP-adressen eller brukeren er ikke blokkert.',
 'blocklink'                       => 'blokker',
 'unblocklink'                     => 'opphev blokkering',
+'change-blocklink'                => 'endre blokkering',
 'contribslink'                    => 'bidrag',
 'autoblocker'                     => 'Du ble automatisk blokkert fordi du deler IP-adresse med «[[User:$1|$1]]». Grunnen som ble gitt til at «$1» ble blokkert var: «$2».',
 'blocklogpage'                    => 'Blokkeringslogg',
+'blocklog-fulllog'                => 'Fullstendig blokkeringslogg',
 'blocklogentry'                   => 'blokkerte «[[$1]]» med en varighet på $2 $3',
+'reblock-logentry'                => 'endret blokkeringsinnstillinger for [[$1]] med en varighet på $2 $3',
 'blocklogtext'                    => 'Dette er en logg som viser hvilke brukere som har blitt blokkert og avblokkert. Automatisk blokkerte IP-adresser vises ikke. Se [[Special:IPBlockList|blokkeringslisten]] for en liste over IP-adresser som er blokkert akkurat nå.',
 'unblocklogentry'                 => 'opphevet blokkeringen av $1',
 'block-log-flags-anononly'        => 'kun uregistrerte brukere',
 'block-log-flags-nocreate'        => 'kontooppretting slått av',
 'block-log-flags-noautoblock'     => 'autoblokkering slått av',
 'block-log-flags-noemail'         => 'e-post blokkert',
+'block-log-flags-nousertalk'      => 'kan ikke redigere egen diskusjonsside',
 'block-log-flags-angry-autoblock' => 'utvidet autoblokkering aktivert',
 'range_block_disabled'            => 'Muligheten til å blokkere flere IP-adresser om gangen er slått av.',
 'ipb_expiry_invalid'              => 'Ugyldig utløpstid.',
 'ipb_expiry_temp'                 => 'For å skjule brukernavnet må blokkeringen være permanent.',
 'ipb_already_blocked'             => '«$1» er allerede blokkert',
+'ipb-needreblock'                 => '== Allerede blokkert ==
+$1 er blokkert fra før. Vil du endre innstillingene?',
 'ipb_cant_unblock'                => 'Feil: Blokk-ID $1 ikke funnet. Kan ha blitt avblokkert allerede.',
 'ipb_blocked_as_range'            => 'Feil: IP-en $1 er ikke blokkert direkte, og kan ikke avblokkeres. Den er imidlertid blokkert som del av blokkeringa av IP-rangen $2, som kan avblokkeres.',
 'ip_range_invalid'                => 'Ugyldig IP-rad.',
@@ -1859,6 +2073,7 @@ $1',
 'proxyblocksuccess'               => 'Utført.',
 'sorbsreason'                     => 'Din IP-adresse angis som en åpen proxy i DNSBL-en brukt av {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Din IP-adresse angis som en åpen proxy i DNSBL-en brukt av {{SITENAME}}. Du kan ikke opprette en konto',
+'cant-block-while-blocked'        => 'Du kan ikke blokkere andre mens du selv er blokkert.',
 
 # Developer tools
 'lockdb'              => 'LÃ¥s database',
@@ -1885,9 +2100,9 @@ Bekreft at du har til hensikt å gjøre dette.',
 'databasenotlocked'   => 'Databasen er ikke låst.',
 
 # Move page
-'move-page'               => 'Flytt $1',
-'move-page-legend'        => 'Flytt side',
-'movepagetext'            => "Når du bruker skjemaet under, vil du få omdøpt en side og flyttet hele historikken til det nye navnet.
+'move-page'                    => 'Flytt $1',
+'move-page-legend'             => 'Flytt side',
+'movepagetext'                 => "Når du bruker skjemaet under, vil du få omdøpt en side og flyttet hele historikken til det nye navnet.
 Den gamle tittelen blir en omdirigeringsside til den nye tittelen.
 Du kan oppdatere omdirigeringer som peker til den originale tittelen automatisk.
 Om du velger å ikke gjøre det, sjekk at flyttingen ikke skaper noen [[Special:DoubleRedirects|doble]] eller [[Special:BrokenRedirects|ødelagte omdirigeringer]].
@@ -1899,46 +2114,59 @@ Det betyr at du kan flytte en side tilbake dit den kom fra hvis du gjør en feil
 '''ADVARSEL!'''
 Dette kan være en drastisk og uventet endring for en populær side;
 vær sikker på at du forstår konsekvensene av dette før du fortsetter.",
-'movepagetalktext'        => "Den tilhørende diskusjonssiden, hvis den finnes, vil automatisk bli flyttet med siden '''med mindre:'''
+'movepagetalktext'             => "Den tilhørende diskusjonssiden, hvis den finnes, vil automatisk bli flyttet med siden '''med mindre:'''
 *Det allerede finnes en diskusjonsside som ikke er tom med det nye navnet, eller
 *Du fjerner markeringen i boksen nedenunder.
 
 I disse tilfellene er du nødt til å flytte eller flette sammen siden manuelt.",
-'movearticle'             => 'Flytt side:',
-'movenotallowed'          => 'Du har ikke tillatelse til å flytte sider.',
-'newtitle'                => 'Ny tittel',
-'move-watch'              => 'Overvåk denne siden',
-'movepagebtn'             => 'Flytt side',
-'pagemovedsub'            => 'Flytting gjennomført',
-'movepage-moved'          => "<big>'''«$1» ble flyttet til «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'En side med det navnet finnes fra før, eller valgte navn er ugyldig. Velg et annet navn.',
-'cantmove-titleprotected' => 'Du kan ikke flytte en side til dette navnet, fordi den nye tittelen er beskyttet fra opprettelse.',
-'talkexists'              => "'''Siden ble flyttet korrekt, men den tilhørende diskusjonssiden kunne ikke flyttes, fordi det allerede finnes en med den nye tittelen. Du er nødt til å flette dem sammen manuelt.'''",
-'movedto'                 => 'flyttet til',
-'movetalk'                => 'Flytt også diskusjonssiden, hvis den finnes.',
-'move-subpages'           => 'Flytt alle undersider, om det finnes noen',
-'move-talk-subpages'      => 'Flytt alle undersider av diskusjonssiden, om det finnes noen',
-'movepage-page-exists'    => 'Siden $1 finnes allerede og kan ikke overskrives automatisk.',
-'movepage-page-moved'     => 'Siden $1 har blitt flyttet til $2.',
-'movepage-page-unmoved'   => 'Siden $1 kunne ikke flyttes til $2.',
-'movepage-max-pages'      => 'Grensen på {{PLURAL:$1|én side|$1 sider}} er nådd; ingen flere sider vil bli flyttet automatisk.',
-'1movedto2'               => '[[$1]] flyttet til [[$2]]',
-'1movedto2_redir'         => '[[$1]] flyttet til [[$2]] over omdirigeringsside',
-'movelogpage'             => 'Flyttelogg',
-'movelogpagetext'         => 'Her er ei liste over sider som har blitt flyttet.',
-'movereason'              => 'Ã…rsak:',
-'revertmove'              => 'tilbakestill',
-'delete_and_move'         => 'Slett og flytt',
-'delete_and_move_text'    => '==Sletting nødvendig==
+'movearticle'                  => 'Flytt side:',
+'movenologin'                  => 'Ikke logget inn',
+'movenologintext'              => 'Du må være registrert bruker og være [[Special:UserLogin|logget på]] for å flytte en side.',
+'movenotallowed'               => 'Du har ikke tillatelse til å flytte sider.',
+'movenotallowedfile'           => 'Du har ikke tillatelse til å flytte filer.',
+'cant-move-user-page'          => 'Du har ikke tillatelse til å flytte brukersider (bortsett fra undersider).',
+'cant-move-to-user-page'       => 'Du har ikke tillatelse til å flytte brukersider (bortsett fra undersider).',
+'newtitle'                     => 'Ny tittel',
+'move-watch'                   => 'Overvåk denne siden',
+'movepagebtn'                  => 'Flytt side',
+'pagemovedsub'                 => 'Flytting gjennomført',
+'movepage-moved'               => "<big>'''«$1» ble flyttet til «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'En omdirigering har blitt opprettet.',
+'movepage-moved-noredirect'    => 'Det ble ikke opprettet en omdirigering.',
+'articleexists'                => 'En side med det navnet finnes fra før, eller valgte navn er ugyldig. Velg et annet navn.',
+'cantmove-titleprotected'      => 'Du kan ikke flytte en side til dette navnet, fordi den nye tittelen er beskyttet fra opprettelse.',
+'talkexists'                   => "'''Siden ble flyttet korrekt, men den tilhørende diskusjonssiden kunne ikke flyttes, fordi det allerede finnes en med den nye tittelen. Du er nødt til å flette dem sammen manuelt.'''",
+'movedto'                      => 'flyttet til',
+'movetalk'                     => 'Flytt også diskusjonssiden, hvis den finnes.',
+'move-subpages'                => 'Flytt alle undersider, om det finnes noen',
+'move-talk-subpages'           => 'Flytt alle undersider av diskusjonssiden, om det finnes noen',
+'movepage-page-exists'         => 'Siden $1 finnes allerede og kan ikke overskrives automatisk.',
+'movepage-page-moved'          => 'Siden $1 har blitt flyttet til $2.',
+'movepage-page-unmoved'        => 'Siden $1 kunne ikke flyttes til $2.',
+'movepage-max-pages'           => 'Grensen på {{PLURAL:$1|én side|$1 sider}} er nådd; ingen flere sider vil bli flyttet automatisk.',
+'1movedto2'                    => '[[$1]] flyttet til [[$2]]',
+'1movedto2_redir'              => '[[$1]] flyttet til [[$2]] over omdirigeringsside',
+'move-redirect-suppressed'     => 'ingen omdirigering',
+'movelogpage'                  => 'Flyttelogg',
+'movelogpagetext'              => 'Her er ei liste over sider som har blitt flyttet.',
+'movereason'                   => 'Ã…rsak:',
+'revertmove'                   => 'tilbakestill',
+'delete_and_move'              => 'Slett og flytt',
+'delete_and_move_text'         => '==Sletting nødvendig==
 Målsiden «[[:$1]]» finnes allerede. Vil du slette den så denne siden kan flyttes dit?',
-'delete_and_move_confirm' => 'Ja, slett siden',
-'delete_and_move_reason'  => 'Slettet grunnet flytting',
-'selfmove'                => 'Kilde- og destinasjonstittel er den samme; kan ikke flytte siden.',
-'immobile_namespace'      => 'Sider kan ikke flyttes til dette navnerommet.',
-'imagenocrossnamespace'   => 'Kan ikke flytte bilder til andre navnerom enn bildenavnerommet',
-'imagetypemismatch'       => 'Den nye filendelsen tilsvarer ikke filtypen',
-'imageinvalidfilename'    => 'MÃ¥lnavnet er ugyldig',
-'fix-double-redirects'    => 'Oppdater omdirigeringer som fører til den gamle tittelen',
+'delete_and_move_confirm'      => 'Ja, slett siden',
+'delete_and_move_reason'       => 'Slettet grunnet flytting',
+'selfmove'                     => 'Kilde- og destinasjonstittel er den samme; kan ikke flytte siden.',
+'immobile-source-namespace'    => 'Kan ikke flytte sider i navnerommet «$1»',
+'immobile-target-namespace'    => 'Kan ikke flytte sider til navnerommet «$1»',
+'immobile-target-namespace-iw' => 'Du kan ikke flytte en side til et navn som er en interwikilenke.',
+'immobile-source-page'         => 'Denne siden kan ikke flyttes.',
+'immobile-target-page'         => 'Kan ikke flytte til det navnet.',
+'imagenocrossnamespace'        => 'Kan ikke flytte filer til andre navnerom enn filnavnerommet',
+'imagetypemismatch'            => 'Den nye filendelsen tilsvarer ikke filtypen',
+'imageinvalidfilename'         => 'MÃ¥lnavnet er ugyldig',
+'fix-double-redirects'         => 'Oppdater omdirigeringer som fører til den gamle tittelen',
+'move-leave-redirect'          => 'La det være igjen en omdirigering',
 
 # Export
 'export'            => 'Eksportsider',
@@ -1947,7 +2175,7 @@ Dette kan senere importeres til en annen wiki som bruker MediaWiki ved hjelp av
 
 For å eksportere sider, skriv inn titler i tekstboksen under, én tittel per linje, og velg om du vil ha kun nåværende versjon, eller alle versjoner i historikken.
 
-Dersom du bare vil ha nåværende versjon, kan du også bruke en lenke, for eksempel [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] for siden «[[{{MediaWiki:Mainpage}}]]».',
+Dersom du bare vil ha nåværende versjon, kan du også bruke en lenke, for eksempel [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] for siden «[[{{MediaWiki:Mainpage}}]]».',
 'exportcuronly'     => 'Ta bare med den nåværende versjonen, ikke hele historikken.',
 'exportnohistory'   => "----
 '''Merk:''' Eksportering av hele historikken gjennom dette skjemaet har blitt slått av av ytelsesgrunner.",
@@ -1963,7 +2191,7 @@ Dersom du bare vil ha nåværende versjon, kan du også bruke en lenke, for ekse
 'allmessagesdefault'        => 'Standardtekst',
 'allmessagescurrent'        => 'Nåværende tekst',
 'allmessagestext'           => 'Dette er en liste over tilgjengelige systemmeldinger i MediaWiki-navnerommet.
-Besøk [http://translatewiki.net Betawiki] om du ønsker å bidra med oversettelse av MediaWiki.',
+Besøk [http://translatewiki.net translatewiki.net] om du ønsker å bidra med oversettelse av MediaWiki.',
 'allmessagesnotsupportedDB' => "''{{ns:special}}:Allmessages'' kan ikke brukes fordi '''\$wgUseDatabaseMessages''' er slått av.",
 'allmessagesfilter'         => 'Filter:',
 'allmessagesmodified'       => 'Vis kun endrede',
@@ -1981,9 +2209,12 @@ Besøk [http://translatewiki.net Betawiki] om du ønsker å bidra med oversettel
 'import'                     => 'Importer sider',
 'importinterwiki'            => 'Transwiki-importering',
 'import-interwiki-text'      => 'Velg en wiki og en side å importere. Revisjonsdatoer og bidragsyteres navn blir bevart. Alle transwiki-importeringer listes i [[Special:Log/import|importloggen]].',
+'import-interwiki-source'    => 'Kildewiki/side:',
 'import-interwiki-history'   => 'Kopier all historikk for denne siden',
 'import-interwiki-submit'    => 'Importer',
 'import-interwiki-namespace' => 'MÃ¥lnavnerom:',
+'import-upload-filename'     => 'Filnavn:',
+'import-comment'             => 'Kommentar:',
 'importtext'                 => 'Importer fila fra kildewikien med [[Special:Export|eksporteringsverktøyet]], lagre den på den egen datamaskin, og last den opp hit.',
 'importstart'                => 'Importerer sider&nbsp;…',
 'import-revision-count'      => '({{PLURAL:$1|Én revisjon|$1 revisjoner}})',
@@ -2017,19 +2248,19 @@ Besøk [http://translatewiki.net Betawiki] om du ønsker å bidra med oversettel
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|Én revisjon|$1 revisjoner}} fra $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Min brukerside',
+'tooltip-pt-userpage'             => 'Din brukerside',
 'tooltip-pt-anonuserpage'         => 'Brukersiden for IP-adressen du redigerer fra',
-'tooltip-pt-mytalk'               => 'Min diskusjonsside',
+'tooltip-pt-mytalk'               => 'Din diskusjonsside',
 'tooltip-pt-anontalk'             => 'Diskusjon om redigeringer fra denne IP-adressen',
 'tooltip-pt-preferences'          => 'Mine innstillinger',
 'tooltip-pt-watchlist'            => 'Liste over sider du overvåker for endringer.',
-'tooltip-pt-mycontris'            => 'Liste over mine bidrag',
+'tooltip-pt-mycontris'            => 'Liste over dine bidrag',
 'tooltip-pt-login'                => 'Du oppfordres til å logge inn, men det er ikke obligatorisk.',
 'tooltip-pt-anonlogin'            => 'Du oppfordres til å logge inn, men det er ikke obligatorisk.',
 'tooltip-pt-logout'               => 'Logg ut',
 'tooltip-ca-talk'                 => 'Diskusjon om innholdssiden',
 'tooltip-ca-edit'                 => 'Du kan redigere denne siden. Vennligst bruk Forhåndsvis-knappen før du lagrer.',
-'tooltip-ca-addsection'           => 'Legg til et diskusjonsinnlegg.',
+'tooltip-ca-addsection'           => 'Start ny seksjon',
 'tooltip-ca-viewsource'           => 'Denne siden er beskyttet. Du kan se kildeteksten.',
 'tooltip-ca-history'              => 'Tidligere revisjoner av denne siden.',
 'tooltip-ca-protect'              => 'Beskytt denne siden',
@@ -2076,6 +2307,8 @@ Besøk [http://translatewiki.net Betawiki] om du ønsker å bidra med oversettel
 'tooltip-watch'                   => 'Legg denne siden til overvåkningslisten din',
 'tooltip-recreate'                => 'Gjenopprett siden til tross for at den har blitt slettet',
 'tooltip-upload'                  => 'Start opplasting',
+'tooltip-rollback'                => '«Tilbakestill»-knappen tilbakestiller redigeringer på denne siden til den forrige versjonen av en annen bidragsyter med ett klikk.',
+'tooltip-undo'                    => '«Omgjør» tilbakestiller redigeringer og åpner redigeringssiden med forhåndsvisning. Gjør at man kan legge til en begrunnelse i redigeringsforklaringen.',
 
 # Stylesheets
 'common.css'      => '/* CSS plassert i denne fila vil gjelde for alle utseender. */',
@@ -2105,12 +2338,12 @@ Besøk [http://translatewiki.net Betawiki] om du ønsker å bidra med oversettel
 'notacceptable'     => 'Tjeneren har ingen mulige måter å vise data i din nettleser.',
 
 # Attribution
-'anonymous'        => 'Anonym(e) bruker(e) av {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonym bruker|Anonyme brukere}} av {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-bruker $1',
 'lastmodifiedatby' => 'Denne siden ble sist redigert $1 kl. $2 av $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basert på arbeid av $1.',
 'others'           => 'andre',
-'siteusers'        => '{{SITENAME}}-bruker(e) $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|bruker|brukere}} $1',
 'creditspage'      => 'Sidekrediteringer',
 'nocredits'        => 'Ingen krediteringer er tilgjengelig for denne siden.',
 
@@ -2131,6 +2364,15 @@ Dette er sannsynligvis forårsaket av en lenke til et svartelistet eksternt nett
 'numauthors'     => 'Antall forskjellige bidragsytere (artikkel): $1',
 'numtalkauthors' => 'Antall forskjellige bidragsytere (diskusjonsside): $1',
 
+# Skin names
+'skinname-standard'    => 'Standard',
+'skinname-nostalgia'   => 'Nostalgi',
+'skinname-cologneblue' => 'Kølnerblå',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'Eget utseende',
+'skinname-simple'      => 'Enkel',
+'skinname-modern'      => 'Moderne',
+
 # Math options
 'mw_math_png'    => 'Vis alltid som PNG',
 'mw_math_simple' => 'HTML hvis veldig enkel, ellers PNG',
@@ -2151,10 +2393,12 @@ Dette er sannsynligvis forårsaket av en lenke til et svartelistet eksternt nett
 'markedaspatrollederror-noautopatrol' => 'Du kan ikke merke dine egne endringer som godkjente.',
 
 # Patrol log
-'patrol-log-page'   => 'Godkjenningslogg',
-'patrol-log-header' => 'Dette er en logg over patruljerte sideversjoner.',
-'patrol-log-line'   => 'merket $1 av $2 godkjent $3',
-'patrol-log-auto'   => '(automatisk)',
+'patrol-log-page'      => 'Godkjenningslogg',
+'patrol-log-header'    => 'Dette er en logg over patruljerte sideversjoner.',
+'patrol-log-line'      => 'merket $1 av $2 godkjent $3',
+'patrol-log-auto'      => '(automatisk)',
+'patrol-log-diff'      => 'versjon $1',
+'log-show-hide-patrol' => '$1 patruljeringslogg',
 
 # Image deletion
 'deletedrevision'                 => 'Slettet gammel revisjon $1.',
@@ -2171,6 +2415,9 @@ $1',
 'previousdiff' => '� Eldre redigering',
 'nextdiff'     => 'Nyere redigering →',
 
+# Visual comparison
+'visual-comparison' => 'Visuell sammenligning',
+
 # Media information
 'mediawarning'         => "'''Advarsel''': Denne fila kan inneholde farlig kode; ved å åpne den kan systemet ditt kompromitteres.<hr />",
 'imagemaxsize'         => 'Begrens bilder på filbeskrivelsessider til:',
@@ -2183,10 +2430,12 @@ $1',
 'show-big-image'       => 'Full oppløsning',
 'show-big-image-thumb' => '<small>Størrelse på denne forhåndsvisningen: $1 × $2 piksler</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galleri over nye filer',
 'imagelisttext'         => "Dete er en liste med '''$1''' {{PLURAL:$1|fil|filer}} sortert $2.",
 'newimages-summary'     => 'Denne spesialsiden viser de sist opplastede filene.',
+'newimages-legend'      => 'Filnavn',
+'newimages-label'       => 'Filnavn (helt eller delvis):',
 'showhidebots'          => '($1 roboter)',
 'noimages'              => 'Ingenting å se.',
 'ilsubmit'              => 'Søk',
@@ -2394,6 +2643,18 @@ Rotert 90° mot klokka og vridd vertikalt', # 0th row: left; 0th column: top
 'exif-lightsource-24'  => 'ISO studiobelysning',
 'exif-lightsource-255' => 'Annen lyskilde',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Blitz ikke utløst',
+'exif-flash-fired-1'    => 'Blitz utløst',
+'exif-flash-return-0'   => 'ingen funksjon for oppdaing av strobelys',
+'exif-flash-return-2'   => 'strobelys ikke oppdaget',
+'exif-flash-return-3'   => 'strobelys oppdaget',
+'exif-flash-mode-1'     => 'tvunget blitzutløsning',
+'exif-flash-mode-2'     => 'tvunget blitzløs',
+'exif-flash-mode-3'     => 'automatisk modus',
+'exif-flash-function-1' => 'Ingen blitzfunksjon',
+'exif-flash-redeye-1'   => 'røde-øyne-redusering',
+
 'exif-focalplaneresolutionunit-2' => 'tommer',
 
 'exif-sensingmethod-1' => 'Ikke angitt',
@@ -2531,19 +2792,10 @@ $1
 'confirmrecreate'     => '«[[User:$1|$1]]» ([[User talk:$1|diskusjon]]) slettet siden etter at du begynte å redigere den, med begrunnelsen «$2». Vennligst bekreft at du vil gjenopprette siden.',
 'recreate'            => 'Gjenopprett',
 
-# HTML dump
-'redirectingto' => 'Omdirigerer til [[:$1]]&nbsp;…',
-
 # action=purge
-'confirm_purge'        => "Vil du slette tjenerens mellomlagrede versjon (''cache'') av denne siden? $1",
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Søk etter artikler som inneholder ''$1''.",
-'searchnamed'      => "Søk for artikler ved navn ''$1''.",
-'articletitles'    => "Artikler som begynner med ''$1''",
-'hideresults'      => 'Skjul resultater',
-'useajaxsearch'    => 'Bruk AJAX-søk',
+'confirm-purge-top'    => "Vil du slette tjenerens mellomlagrede versjon (''cache'') av denne siden?",
+'confirm-purge-bottom' => 'Rensing av en side sletter mellomlageret og tvinger frem den nyeste versjonen.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� forrige side',
@@ -2633,6 +2885,7 @@ Prøv vanlig forhåndsvisning.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Ukjent tilleggsmerking «$1»',
+'duplicate-defaultsort' => 'Advarsel: Standardsorteringen «$2» tar over for den tidligere sorteringen «$1».',
 
 # Special:Version
 'version'                          => 'Versjon', # Not used as normal message but as header for the special page itself
@@ -2661,13 +2914,13 @@ Prøv vanlig forhåndsvisning.',
 'filepath-submit'  => 'Sti',
 'filepath-summary' => 'Denne spesialsiden gir den fullstendige stien for en fil. Bilder vises i full oppløsning; andre filtyper startes direkte i sine assosierte programmer.
 
-	Skriv inn filnavnet uten «{{ns:image}}:»-prefikset.',
+	Skriv inn filnavnet uten «{{ns:file}}:»-prefikset.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Søk etter duplikatfiler',
 'fileduplicatesearch-summary'  => 'Søk etter duplikatfiler basert på dets hash-verdi.
 
-Skriv inn filnavn uten «{{ns:image}}:»-prefikset.',
+Skriv inn filnavn uten «{{ns:file}}:»-prefikset.',
 'fileduplicatesearch-legend'   => 'Søk etter en duplikatfil',
 'fileduplicatesearch-filename' => 'Filnavn:',
 'fileduplicatesearch-submit'   => 'Søk',
@@ -2696,4 +2949,13 @@ Skriv inn filnavn uten «{{ns:image}}:»-prefikset.',
 'blankpage'              => 'Tom side',
 'intentionallyblankpage' => 'Denne siden er tom med vilje',
 
+# External image whitelist
+'external_image_whitelist' => ' #La denne linja være som den er<pre>
+#Skriv fragmenter av regulære uttrykk (delen som går mellom //) nedenfor
+#Disse vil sjekkes mot adresser til bilder fra eksterne sider
+#De som blir godkjent vil vises, ellers vil det gis en lenke til bildet
+#Linjer som begynner med # anses som kommentarer
+
+#Skriv alle fragmenter av regulære uttrykk over denne lina. La denne linja være som den er</pre>',
+
 );
diff --git a/languages/messages/MessagesNov.php b/languages/messages/MessagesNov.php
index 50d870a4..b3ef58b8 100644
--- a/languages/messages/MessagesNov.php
+++ b/languages/messages/MessagesNov.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author MF-Warburg
  * @author Malafaya
  * @author nov.wikipedia.org sysops
  */
@@ -63,7 +64,7 @@ $messages = array(
 'mytalk'         => 'Men parla-pagine',
 'anontalk'       => 'Parlo por disi IP',
 'navigation'     => 'Navigatione',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 'returnto'         => 'Rivada a $1.',
 'tagline'          => 'Fro {{SITENAME}}',
@@ -82,6 +83,7 @@ $messages = array(
 'deletethispage'   => 'Ekarta disi pagine',
 'protect'          => 'Protekte',
 'protectthispage'  => 'Protekte disi pagine',
+'newpage'          => 'Novi pagine',
 'talkpage'         => 'Diskuse disi pagine',
 'talkpagelinktext' => 'Diskusione',
 'specialpage'      => 'Spesial Pagine',
@@ -123,7 +125,7 @@ $messages = array(
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikle',
 'nstab-user'      => 'Useren pagine',
-'nstab-special'   => 'Spesial',
+'nstab-special'   => 'Spesial pagine',
 'nstab-project'   => 'Projetal pagine',
 'nstab-mediawiki' => 'Mesaje',
 'nstab-template'  => 'Shablone',
@@ -137,9 +139,9 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => 'Useren eksignato',
-'logouttext'                 => '<strong>Vu es nun eksignatat.</strong><br />
+'logouttext'                 => "'''Vu es nun eksignatat.'''<br />
 Vu pove kontinua usa {{SITENAME}} anonimim, o vu pove riensignata
-kom li sami o altri usere.',
+kom li sami o altri usere.",
 'loginpagetitle'             => 'Useren ensignato',
 'yourname'                   => 'Usere-nome:',
 'yourpassword'               => 'Pasa-vorde:',
@@ -166,7 +168,7 @@ kom li sami o altri usere.',
 'image_sample' => 'Exemple.jpg',
 
 # Edit pages
-'summary'               => 'Resume',
+'summary'               => 'Resume:',
 'minoredit'             => 'Dise es mikri modifiko',
 'watchthis'             => 'Observa disi pagine',
 'savearticle'           => 'Spara pagine',
@@ -193,6 +195,7 @@ Forsan lu ha bli ekarta fro li wiki, o rinomat.
 Proba [[Special:Search|sercho sur li wiki]] por relatet pagines.',
 
 # Diffs
+'lineno'                  => 'Linie $1:',
 'compareselectedversions' => 'Kompara selektet versiones',
 
 # Search results
@@ -203,6 +206,8 @@ Proba [[Special:Search|sercho sur li wiki]] por relatet pagines.',
 'prevn'                 => 'lasti $1',
 'nextn'                 => 'sekuenti $1',
 'viewprevnext'          => 'Vida ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Kontenaje',
+'search-result-size'    => '$1 ({{PLURAL:$2|1 vorde|$2 vordes}})',
 'showingresults'        => "Montrant subu {{PLURAL:$1|'''1''' resulte|'''$1''' resultes}} amaxim komensant fro #'''$2'''.",
 'showingresultsnum'     => "Montrant subu {{PLURAL:$3|'''1''' result|'''$3''' results}} komensant fro #'''$2'''.",
 'powersearch'           => 'Sercha',
@@ -216,6 +221,7 @@ Proba [[Special:Search|sercho sur li wiki]] por relatet pagines.',
 'searchresultshead' => 'Sercha',
 
 # Recent changes
+'nchanges'        => '$1 {{PLURAL:$1|chanjo|chanjos}}',
 'recentchanges'   => 'Resenti chanjos',
 'rcnote'          => "Subu es {{PLURAL:$1| '''1''' chanje|li lasti '''$1''' chanjes}} in li lasti {{PLURAL:$2|die|'''$2''' dies}}, fro $3.",
 'rcshowhideminor' => '$1 minori modifikos',
@@ -225,6 +231,8 @@ Proba [[Special:Search|sercho sur li wiki]] por relatet pagines.',
 'hist'            => 'hist',
 'hide'            => 'Kasha',
 'show'            => 'Montra',
+'minoreditletter' => 'm',
+'newpageletter'   => 'N',
 
 # Recent changes linked
 'recentchangeslinked' => 'Afini chanjos',
@@ -236,14 +244,14 @@ Proba [[Special:Search|sercho sur li wiki]] por relatet pagines.',
 'fileuploadsummary' => 'Resume:',
 'watchthisupload'   => 'Observa disi pagine',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Sercha imaje nome:',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Usere',
-'imagelist_size'        => 'Grandeso (bites)',
-'imagelist_description' => 'Deskriptione',
+# Special:ListFiles
+'listfiles_search_for'  => 'Sercha imaje nome:',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Usere',
+'listfiles_size'        => 'Grandeso (bites)',
+'listfiles_description' => 'Deskriptione',
 
-# Image description page
+# File description page
 'filehist-user' => 'Usere',
 'imagelinks'    => 'Linkes',
 
@@ -296,6 +304,9 @@ Proba [[Special:Search|sercho sur li wiki]] por relatet pagines.',
 'categories'         => 'Kategories',
 'categoriespagetext' => 'Li sekuenti kategories exista in li wiki.',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Sercha',
+
 # Watchlist
 'watchlist'       => 'Men liste de observos',
 'mywatchlist'     => 'Men liste de observos',
@@ -314,18 +325,23 @@ Si vu voli plu tardim ekarta li pagine fro vun observa-liste, klikta \"Desobserv
 'changed'            => 'chanjati',
 'enotif_lastvisited' => 'Regarda $1 por vida omni chanjes depos vun lasti visite.',
 
-# Delete/protect/revert
-'confirm'             => 'Konfirma',
-'excontent'           => "kontenaje esed: '$1'",
-'excontentauthor'     => "kontenaje esed: '$1' (e li soli kontribuere esed '[[Special:Contributions/$2|$2]]')",
-'exblank'             => 'pagine esed vakui',
-'actioncomplete'      => 'Akto kompleti',
-'deletedarticle'      => 'ekartad "[[$1]]"',
-'dellogpage'          => 'Loge de ekartos',
-'dellogpagetext'      => 'Subu es liste del maxim resenti ekartos.',
-'deletionlog'         => 'registre de ekartos',
-'deletecomment'       => 'Resone de ekarto',
-'revertpage'          => 'Riverted modifikos da [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]); restaurad lasti versione da [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+# Delete
+'confirm'         => 'Konfirma',
+'excontent'       => "kontenaje esed: '$1'",
+'excontentauthor' => "kontenaje esed: '$1' (e li soli kontribuere esed '[[Special:Contributions/$2|$2]]')",
+'exblank'         => 'pagine esed vakui',
+'actioncomplete'  => 'Akto kompleti',
+'deletedarticle'  => 'ekartad "[[$1]]"',
+'dellogpage'      => 'Loge de ekartos',
+'dellogpagetext'  => 'Subu es liste del maxim resenti ekartos.',
+'deletionlog'     => 'registre de ekartos',
+'deletecomment'   => 'Resone de ekarto',
+
+# Rollback
+'revertpage' => 'Riverted modifikos da [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]); restaurad lasti versione da [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
+'prot_1movedto2'      => '[[$1]] movat a [[$2]]',
 'protect-legend'      => 'Konfirma protektione',
 'protect-level-sysop' => 'Sisopes nur',
 
@@ -341,19 +357,23 @@ Si vu voli plu tardim ekarta li pagine fro vun observa-liste, klikta \"Desobserv
 'sp-contributions-submit'  => 'Sercha',
 
 # What links here
-'whatlinkshere'      => 'Tum kel kupla hir',
-'whatlinkshere-page' => 'Pagine:',
+'whatlinkshere'       => 'Tum kel kupla hir',
+'whatlinkshere-page'  => 'Pagine:',
+'whatlinkshere-links' => '� linkes',
 
 # Block/unblock
+'ipbreason'    => 'Resone:',
 'badipaddress' => 'Non-valid IP adrese',
 'contribslink' => 'Kontributiones',
 
 # Move page
 'movearticle'             => 'Mova pagine',
+'movenologin'             => 'Non ensignatat',
 'move-watch'              => 'Observa disi pagine',
 'movedto'                 => 'movat a',
 '1movedto2'               => '[[$1]] movat a [[$2]]',
 '1movedto2_redir'         => '[[$1]] movat a [[$2]] via ri-adreso',
+'movereason'              => 'Resone:',
 'delete_and_move'         => 'Ekarta e mova',
 'delete_and_move_confirm' => 'Yes, ekarta li pagine',
 'delete_and_move_reason'  => 'Ekartat por fa spatie por movo',
@@ -367,7 +387,7 @@ Si vu voli plu tardim ekarta li pagine fro vun observa-liste, klikta \"Desobserv
 'allmessagesmodified' => 'Montra nur modifikates',
 
 # Tooltip help for the actions
-'tooltip-pt-mytalk'      => 'Men parla-pagine',
+'tooltip-pt-mytalk'      => 'Vun parla-pagine',
 'tooltip-pt-preferences' => 'Men preferos',
 'tooltip-pt-logout'      => 'Eksignata',
 'tooltip-p-logo'         => 'Chefi pagine',
@@ -375,7 +395,7 @@ Si vu voli plu tardim ekarta li pagine fro vun observa-liste, klikta \"Desobserv
 # Info page
 'infosubtitle' => 'Informatione pri pagine',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Sercha',
 'bydate'   => 'segun date',
 
@@ -388,11 +408,6 @@ Si vu voli plu tardim ekarta li pagine fro vun observa-liste, klikta \"Desobserv
 # 'all' in various places, this might be different for inflected languages
 'imagelistall' => 'omnes',
 
-# AJAX search
-'searchcontaining' => "Sercha artikles kel kontena ''$1''.",
-'searchnamed'      => "Sercha artikles nomat ''$1''.",
-'articletitles'    => "Artikles kel starta kun ''$1''",
-
 # Auto-summaries
 'autosumm-replace' => "Remplasant pagine kun '$1'",
 'autoredircomment' => 'Ri-adresant a [[$1]]',
diff --git a/languages/messages/MessagesNso.php b/languages/messages/MessagesNso.php
index 170dcc0c..1124dffe 100644
--- a/languages/messages/MessagesNso.php
+++ b/languages/messages/MessagesNso.php
@@ -8,6 +8,25 @@
  * @author Urhixidur
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Special',
+	NS_TALK             => 'Bolediša',
+	NS_USER             => 'Mošomi',
+	NS_USER_TALK        => 'Boledišana_le_Mošomi',
+	NS_PROJECT_TALK     => '$1_Poledišano',
+	NS_FILE             => 'Seswantšho',
+	NS_FILE_TALK        => 'Poledišano_ya_Seswantšho',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Poledišano_ya_MediaWiki',
+	NS_TEMPLATE         => 'Template',
+	NS_TEMPLATE_TALK    => 'Poledišano_ya_Template',
+	NS_HELP             => 'Thušo',
+	NS_HELP_TALK        => 'Poledišano_ya_Thušo',
+	NS_CATEGORY         => 'Setensele',
+	NS_CATEGORY_TALK    => 'Poledišano_ya_Setensele',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Tsenya mothalafase go dihlomaganyo:',
@@ -43,8 +62,6 @@ $messages = array(
 'underline-always' => 'Kamehla',
 'underline-never'  => 'Le ga tee',
 
-'skinpreview' => '(Ponopele)',
-
 # Dates
 'sunday'        => 'Sontaga',
 'monday'        => 'Mošupologo',
@@ -119,7 +136,7 @@ $messages = array(
 'mytalk'         => 'Dipolelo tša ka',
 'anontalk'       => 'Poledišano ya IP ye',
 'navigation'     => 'Tšwelotšo',
-'and'            => 'le',
+'and'            => '&#32;le',
 
 'errorpagetitle'    => 'Phošo',
 'returnto'          => 'Boela go $1.',
@@ -177,8 +194,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Mabapi le {{SITENAME}}',
 'aboutpage'            => 'Project:Mabapi',
-'bugreports'           => 'Bega diphošo',
-'bugreportspage'       => 'Project:Bega diphoso',
 'copyright'            => 'Mateng a hwetšagala tlase ga $1.',
 'copyrightpagename'    => '{{SITENAME}} tumello ya bangwadi',
 'copyrightpage'        => '{{ns:project}}:Tomello ya Mongwadi',
@@ -199,8 +214,6 @@ $messages = array(
 
 'badaccess'        => 'Thušo ya tumello',
 'badaccess-group0' => 'Ga wa dumelwa go dira seo o lekago go se dira.',
-'badaccess-group1' => 'Seo o lekago go se dra se dumelwetše go bašomiši ba sehlopha sa $1.',
-'badaccess-group2' => 'Seo o lekago go se dra se dumelwetše go bašomiši bao balego  sehlopheng se tee sa  $1.',
 'badaccess-groups' => 'Seo o lekago go se dra se dumelwetše go bašomiši bao balego  sehlopheng se tee sa  $1.',
 
 'versionrequired'     => 'Version $1 ya MediaWiki ea hlokega',
@@ -325,14 +338,18 @@ Pele re romela melaetÅ¡a ye mengwe go atrese ye, o kgopelwa go latela ditaelo tÅ
 'throttled-mailpassword'     => 'Kgopotšo ya ditlhaka-tša-siphiri e rometšwe {{PLURAL:$1|iring|diiring tše $1}} tša gofeta. 
 Go thibela go hlapanya/kgobošo, kgopotšo e tee ka {{PLURAL:$1|iri|diiri tše $1}} e tla romellwa.',
 'mailerror'                  => 'Gobile le phošo go romeleng molaetša  : $1',
-'acct_creation_throttle_hit' => 'Ka maswabi, o tlhomile ditšhupaleloko  tše $1. Ga wa dumelwa go tlhoma tše dingwe',
-'emailauthenticated'         => 'E-mail atrese ya gago e kgonthišitšwe ka $1.',
+'acct_creation_throttle_hit' => 'Ka maswabi, o tlhomile {{PLURAL:$1|tšhupaleloko|$1 tša ditšhupaleloko}}.
+Ga wa dumelwa go tlhoma tše dingwe.',
+'emailauthenticated'         => 'E-mail atrese ya gago e kgonthišitšwe ka $2, $3.',
 'accountcreated'             => 'TÅ¡hupaleloko (Account) e tlhodilwe',
 'accountcreatedtext'         => 'TÅ¡hupaleloko (account) ya modiri $1 e tlhodilwe.',
 'loginlanguagelabel'         => 'Polelo: $1',
 
 # Password reset dialog
 'resetpass_text'    => '<!-- Tsenya ditlhaka mo -->',
+'oldpassword'       => 'Ditlhaka-tša-siphiri tša kgale:',
+'newpassword'       => 'Ditlhaka-tša-siphiri tše mpsha:',
+'retypenew'         => 'Tlanya ditlhaka tše mphsa tša siphiri gape:',
 'resetpass_success' => 'Ditlhaka tša siphiri di fetotšwe ka katlego! Bjale o kgona go tsena...',
 
 # Edit page toolbar
@@ -358,8 +375,8 @@ Go thibela go hlapanya/kgobošo, kgopotšo e tee ka {{PLURAL:$1|iri|diiri tše $
 'hr_tip'          => 'Mothalo wago ya faase/papamela (šomiša ka hloko)',
 
 # Edit pages
-'summary'                => 'Kakaretšo',
-'subject'                => 'Tabataba/Hlogo ya taba',
+'summary'                => 'Kakaretšo:',
+'subject'                => 'Tabataba/Hlogo ya taba:',
 'minoredit'              => 'Ye ke phetogo ye nnyenyane',
 'watchthis'              => 'Tlhapetša letlakala le',
 'savearticle'            => 'Boloka letlakala',
@@ -367,7 +384,7 @@ Go thibela go hlapanya/kgobošo, kgopotšo e tee ka {{PLURAL:$1|iri|diiri tše $
 'showpreview'            => 'Laetša sebopego sa letlaka',
 'showdiff'               => 'Laetša diphetogo',
 'anoneditwarning'        => "'''Temošo''' Gawa ''tsena'', IP ya gago e tla šumišwa go histori ya diphetogo tša letlakala",
-'summary-preview'        => 'Lebelela kakaretšo',
+'summary-preview'        => 'Lebelela kakaretšo:',
 'blockedtitle'           => 'Mošomiši o thibilwe',
 'blockedtext'            => "<big>'''Leina la gago la mošomiši goba IP atrese e thibilwe.'''</big>
 
@@ -400,8 +417,8 @@ Go tlhola letlakala, thoma go ngwalo lepokising le letelago
 (lebelela [[{{MediaWiki:Helppage}}|letlakala la thušo]] go hwetša šedi).
 Ga eba o le fa ka phošo, o ka boela morago ka go šumiša konopo ya '''back''' go ''browser'' ya gago.",
 'noarticletext'          => 'Ga gona ditlhaka letlakaleng le, oka [[Special:Search/{{PAGENAME}}|fetleka liena la letlakala]] matlakaleng a mangwe goba [{{fullurl:{{FULLPAGENAME}}|action=edit}} wa fetola letlakala le].',
-'note'                   => '<strong>Ela hloko:</strong>',
-'previewnote'            => '<strong>Ye ke Taetšo ya sebopego sa letlakala fela; diphetogo ga di ya bolokwa!</strong>',
+'note'                   => "'''Ela hloko:'''",
+'previewnote'            => "'''Ye ke Taetšo ya sebopego sa letlakala fela; diphetogo ga di ya bolokwa!'''",
 'editing'                => 'O fetola $1',
 'editingsection'         => 'Phetolo ya $1 (sekgoba)',
 'editingcomment'         => 'Fetola $1 (tshwayotshwayo)',
@@ -409,13 +426,13 @@ Ga eba o le fa ka phošo, o ka boela morago ka go šumiša konopo ya '''back'''
 'yourtext'               => 'Mongwalo wa gago',
 'storedversion'          => 'Version yeo e bolokilwego',
 'yourdiff'               => 'Diphapang',
-'copyrightwarning'       => 'Diabe kamoka go {{SITENAME}} di akanywa go ngwadiwa tlase ga $2 (lebelela $1 go hwetša taba ka bophara). Ge o sa nyake gore mengwalo ya gago e fetolwe ntle le kgaugelo goba e phatlalatšwe ntle le tumello ya gago, o seke wa fana ka mengwalo mo.<br />
+'copyrightwarning'       => "Diabe kamoka go {{SITENAME}} di akanywa go ngwadiwa tlase ga $2 (lebelela $1 go hwetša taba ka bophara). Ge o sa nyake gore mengwalo ya gago e fetolwe ntle le kgaugelo goba e phatlalatšwe ntle le tumello ya gago, o seke wa fana ka mengwalo mo.<br />
 Gape o re holofetša  gore mengwalo ye e ngwadile ke wena, goba o e kopiša mothapong wa pepeneneng goba  ke mahala.
-<strong>O SE TSENYE MEÅ OMO YA BATHO BA BANGWE NTLE LE TUMELLO YA BONA!</strong>',
-'longpagewarning'        => "<strong>TEMOÅ O: Letlakala le le $1 kilobytes ka botelele;
+'''O SE TSENYE MEÅ OMO YA BATHO BA BANGWE NTLE LE TUMELLO YA BONA!'''",
+'longpagewarning'        => "'''TEMOÅ O: Letlakala le le $1 kilobytes ka botelele;
 di-''browser'' tše dingwe dika ba le bothata go fetola matlakala a golena goba gofeta 32 kb.
 
-Ka kgopela akanya ka go roba letlakala le goba le dikgaoe tše nnyenyane.</strong>",
+Ka kgopela akanya ka go roba letlakala le goba le dikgaoe tše nnyenyane.'''",
 'templatesused'          => "''Templates'' tšeo di šomišitšwego letlakaleng le:",
 'templatesusedpreview'   => "''Templates'' tšeo di šomišitšwego go taetšo ya sebopego sa letlakala:",
 'template-protected'     => '(e lotilwe)',
@@ -432,10 +449,9 @@ Sedi ya phumulo ya letlakala e re:",
 
 # History pages
 'viewpagelogs'        => "Nyakoretša di-''log'' tša letlakala le",
-'revnotfound'         => 'Poeletšo ga e humanege',
 'currentrev'          => 'Poeletšo tša bjale',
 'revisionasof'        => 'Thumeletšo go tloga ka $1',
-'revision-info'       => 'Poeletšo go tloga $1 ka $2',
+'revision-info'       => 'Poeletšo go tloga $1 ka $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Poeletšo tša kgalenyana',
 'nextrevision'        => 'Peletšo tše dimphsanyana→',
 'currentrevisionlink' => 'Poeletšo ya bjale',
@@ -485,6 +501,7 @@ Leka [[Special:Search|go fetleka wikii]] go humana matlakala a mapsha.',
 'prevn'                 => 'gofeta $1',
 'nextn'                 => 'latela $1',
 'viewprevnext'          => 'Lebelela ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:Mateng',
 'searchall'             => 'tšohle',
 'powersearch'           => 'Fetleka ka tlhoko',
 
@@ -494,15 +511,13 @@ Leka [[Special:Search|go fetleka wikii]] go humana matlakala a mapsha.',
 'prefs-edits'        => 'Palo ya diphetogo:',
 'prefsnologin'       => 'Ga wa tsena',
 'changepassword'     => 'Fetola ditlhaka-tša-siphiri',
+'skin-preview'       => 'Ponopele',
 'datetime'           => 'Tšatšikgwedi le nako',
 'math_unknown_error' => 'Phošo ya gose tsebege',
 'math_syntax_error'  => 'phošo ya popafoko',
 'prefs-rc'           => 'Diphetogo tša bjale',
 'prefs-watchlist'    => 'Lenano la tlhapetšo',
 'saveprefs'          => 'Boloka',
-'oldpassword'        => 'Ditlhaka-tša-siphiri tša kgale:',
-'newpassword'        => 'Ditlhaka-tša-siphiri tše mpsha:',
-'retypenew'          => 'Tlanya ditlhaka tše mphsa tša siphiri gape:',
 'textboxsize'        => 'Fetola',
 'searchresultshead'  => 'Fetleka',
 'savedprefs'         => 'Dikgatlhegelo tša gago di bolokilwe.',
@@ -576,15 +591,15 @@ Matlakala ago ba [[Special:Watchlist|lenanong la gago la matlakala ditlhapetšo]
 'license-nopreview'  => '(Ponopele ga e gona)',
 'upload_source_file' => '(faele go khomphuthara ya gago)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'faele',
-'imagelist'      => 'Lenano la difaele',
-'imagelist_date' => 'Letšatšikgwedi',
-'imagelist_name' => 'Leina',
-'imagelist_user' => 'Mošumiši',
-'imagelist_size' => 'Bogolo',
+'listfiles'      => 'Lenano la difaele',
+'listfiles_date' => 'Letšatšikgwedi',
+'listfiles_name' => 'Leina',
+'listfiles_user' => 'Mošumiši',
+'listfiles_size' => 'Bogolo',
 
-# Image description page
+# File description page
 'filehist'                  => 'Histori ya faele',
 'filehist-help'             => 'Pinyeletša go letšatšikgwedi/nako go bona faela ka tsela yeo ebego e le ka gona nakong yeo.',
 'filehist-deleteall'        => 'phumula ka moka',
@@ -635,9 +650,8 @@ Matlakala ago ba [[Special:Watchlist|lenanong la gago la matlakala ditlhapetšo]
 'randomredirect' => "''redirect'' engwe le engwe",
 
 # Statistics
-'statistics' => 'Dipalopalo',
-'sitestats'  => '{{SITENAME}} dipalopalo',
-'userstats'  => 'Dipalopalo tša mošomiši',
+'statistics'              => 'Dipalopalo',
+'statistics-header-users' => 'Dipalopalo tša mošomiši',
 
 'disambiguations' => "Matlakala a ''Disambiguation''",
 
@@ -695,7 +709,6 @@ Matlakala ago ba [[Special:Watchlist|lenanong la gago la matlakala ditlhapetšo]
 'speciallogtitlelabel' => 'Thaetlele:',
 'log'                  => "Di-''log''",
 'all-logs-page'        => "Di-''log'' kamoka",
-'log-search-submit'    => 'Sepela',
 
 # Special:AllPages
 'allpages'       => 'Matlakala ka moka',
@@ -710,6 +723,12 @@ Matlakala ago ba [[Special:Watchlist|lenanong la gago la matlakala ditlhapetšo]
 # Special:Categories
 'categories' => 'Dihlopha',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Diabe tša mošomiši tšeo di phumutšwego',
+
+# Special:LinkSearch
+'linksearch-ok' => 'Fetleka',
+
 # Special:ListUsers
 'listusers-submit' => 'Botšha',
 
@@ -727,27 +746,21 @@ Matlakala ago ba [[Special:Watchlist|lenanong la gago la matlakala ditlhapetšo]
 'emailsenttext'  => 'Molaetša wa gago wa email gawa romelwa.',
 
 # Watchlist
-'watchlist'            => 'Lenano la ditlhapetšo tša ka',
-'mywatchlist'          => 'Lenano la ditlhapetšo tša ka',
-'watchlistfor'         => "(ya '''$1''')",
-'addedwatch'           => 'Loketšwe go lenano la ditlhapetšo',
-'addedwatchtext'       => "Letlakala \"[[:\$1]]\" le tsene go [[Special:Watchlist|watchlist]] ya gago.
+'watchlist'         => 'Lenano la ditlhapetšo tša ka',
+'mywatchlist'       => 'Lenano la ditlhapetšo tša ka',
+'watchlistfor'      => "(ya '''$1''')",
+'addedwatch'        => 'Loketšwe go lenano la ditlhapetšo',
+'addedwatchtext'    => "Letlakala \"[[:\$1]]\" le tsene go [[Special:Watchlist|watchlist]] ya gago.
 Go tloga bjale, diphetogo letlakaleng le, le letlakaleng la dipoledišano la gona, di tla bontšhwa ka mongalo wa '''bold''' gare ga [[Special:RecentChanges|list of recent changes]] gore go be bonolo gore oa bone.
 
 Ga eba o nyaka go hloša letlaka le go lenano la ditlhapetšo tša gago, šomiša \"Tloša tlhapetšo\" go sidebar.",
-'removedwatch'         => 'Tlošitšwe go lenano la ditlhapetšo',
-'removedwatchtext'     => 'Letlakala "[[:$1]]" letlošitšwe go lenano la gago la ditlhapetšo.',
-'watch'                => 'Tlhapetša',
-'watchthispage'        => 'Tlhapetša letlakala le',
-'unwatch'              => 'Tloša tlhapešo',
-'watchlist-details'    => '{{PLURAL:$1|$1 ya letlakala|$1 ya matlakala}} a lenano la ditlhapetšo tša gago, re sa bale matlakala a dipoledišano (dipolelo).',
-'wlshowlast'           => 'Laetša  $1 diiri $2 matšatši $3 tša gofeta',
-'watchlist-show-bots'  => "Laetša diphetogo tša ''bot''",
-'watchlist-hide-bots'  => "Fihla diphetogo tša ''bot''",
-'watchlist-show-own'   => 'Laetša diphetogo tša ka',
-'watchlist-hide-own'   => 'Fihla diphetogo tša ka',
-'watchlist-show-minor' => 'Bontšha diphetogo tše nnyenyane',
-'watchlist-hide-minor' => 'Fihla diphetogo tše nnyenyane',
+'removedwatch'      => 'Tlošitšwe go lenano la ditlhapetšo',
+'removedwatchtext'  => 'Letlakala "[[:$1]]" letlošitšwe go lenano la gago la ditlhapetšo.',
+'watch'             => 'Tlhapetša',
+'watchthispage'     => 'Tlhapetša letlakala le',
+'unwatch'           => 'Tloša tlhapešo',
+'watchlist-details' => '{{PLURAL:$1|$1 ya letlakala|$1 ya matlakala}} a lenano la ditlhapetšo tša gago, re sa bale matlakala a dipoledišano (dipolelo).',
+'wlshowlast'        => 'Laetša  $1 diiri $2 matšatši $3 tša gofeta',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Tlhapeditše...',
@@ -762,34 +775,39 @@ Ga eba o nyaka go hloša letlaka le go lenano la ditlhapetšo tša gago, šomiš
 'enotif_lastvisited'           => 'Lebelela  $1 go bona diphetogo ka moka gotloga ge go tsena la mafelelo.',
 'enotif_lastdiff'              => 'Bona $1 go nyakorela phetogo ye.',
 
-# Delete/protect/revert
-'deletepage'                  => 'Phumula letlakala',
-'excontent'                   => "mateng ebe e le: '$1'",
-'delete-legend'               => 'Phumula',
-'historywarning'              => 'Temošo: Letlakala leo o lekago go lephumula le nale histori:',
-'confirmdeletetext'           => 'O phumula letlakala le histori ka moka ya lona.
+# Delete
+'deletepage'            => 'Phumula letlakala',
+'excontent'             => "mateng ebe e le: '$1'",
+'delete-legend'         => 'Phumula',
+'historywarning'        => 'Temošo: Letlakala leo o lekago go lephumula le nale histori:',
+'confirmdeletetext'     => 'O phumula letlakala le histori ka moka ya lona.
 Ka kgopela sitlediša gore ke se o nyakago  go sedira, le gore o kwešiša ditla morago tša se, le gore seo o se dirago se latela melawana le ditaelo go ya ka [[{{MediaWiki:Policy-url}}|polisi]].',
-'actioncomplete'              => 'Kgopelo e phetilwe ka katlego',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" e phumutšwe.
+'actioncomplete'        => 'Kgopelo e phetilwe ka katlego',
+'deletedtext'           => '"<nowiki>$1</nowiki>" e phumutšwe.
 Lebelela $2 go hweetša sedi ka diphulo tša bjale.',
-'deletedarticle'              => 'E phumutšwe "[[$1]]"',
-'dellogpage'                  => "''Log'' yago phumula",
-'deletecomment'               => 'Lebaka la go phumula:',
-'deleteotherreason'           => 'Mabaka a mangwe:',
-'deletereasonotherlist'       => 'Mabaka a mangwe',
-'rollbacklink'                => 'bošetša morago',
-'editcomment'                 => 'Ahlaahlo ya phetogo ke : "<i>$1</i>".', # only shown if there is an edit comment
+'deletedarticle'        => 'E phumutšwe "[[$1]]"',
+'dellogpage'            => "''Log'' yago phumula",
+'deletecomment'         => 'Lebaka la go phumula:',
+'deleteotherreason'     => 'Mabaka a mangwe:',
+'deletereasonotherlist' => 'Mabaka a mangwe',
+
+# Rollback
+'rollbacklink' => 'bošetša morago',
+'editcomment'  => "Ahlaahlo ya phetogo ke : \"''\$1''\".", # only shown if there is an edit comment
+
+# Protect
 'protectlogpage'              => "''Log'' yago lota",
 'protectedarticle'            => 'lotilwe "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] e hudugile goya go [[$2]]',
 'protect-legend'              => 'Tiišetša go lota',
 'protectcomment'              => 'Ahlaahla:',
 'protectexpiry'               => 'Fetatšatši:',
 'protect_expiry_invalid'      => 'Fetatšatši, nako ye ga ya dumelwa.',
 'protect_expiry_old'          => 'Fetatšatši ke ya nako yeo e fetilego.',
 'protect-unchain'             => 'Dumella (tloša senotlolo) tumello ya go huduga',
-'protect-text'                => 'O ka lebelela lego fetola seemo sa go lota sa letlakala <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'TÅ¡hupaleloko ya gago ga ena tumello ya go fetola seemo sago lota ga letlakala. 
-Seemo sa go lota ga letlakala <strong>$1</strong>:',
+'protect-text'                => "O ka lebelela lego fetola seemo sa go lota sa letlakala '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "TÅ¡hupaleloko ya gago ga ena tumello ya go fetola seemo sago lota ga letlakala. 
+Seemo sa go lota ga letlakala '''$1''':",
 'protect-cascadeon'           => 'Letlakala le lotegile ka ge le akeretšwa ke {{PLURAL:$1|letlakala, leo lenalego|matlakala, analego}} golotega ga kakaretšo. O ka fetola go lotega ga letlakala le.',
 'protect-default'             => '(default)',
 'protect-fallback'            => 'Go nyakega tumello ya "$1"',
@@ -799,6 +817,7 @@ Seemo sa go lota ga letlakala <strong>$1</strong>:',
 'protect-expiring'            => 'fetatšatši ke $1 (UTC)',
 'protect-cascade'             => 'Lota matlakala, akaretša le letlakala le (go lota ka kakaretšo)',
 'protect-cantedit'            => 'Ga o kgone go fetola tekano ya bolotego letlakaleng le, ka ge o sena tumello yago bofetola.',
+'protect-expiry-options'      => '2 diiri:2 hours,1 letšatši:1 day,3 matšatši:3 days,1 beke:1 week,2 dibeke:2 weeks,1 kgwedi:1 month,3 digkwedi:3 months,6 dikgwedi:6 months,1 ngwaga:1 year,ga efele:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Tumello:',
 'restriction-level'           => 'Seemo sago Lota:',
 
@@ -838,7 +857,6 @@ Seemo sa go lota ga letlakala <strong>$1</strong>:',
 'whatlinkshere'       => 'Ke eng yeo e hlomaganyago mo',
 'whatlinkshere-title' => 'Matlakala a go hlomaganya go "$1"',
 'whatlinkshere-page'  => 'Letlakala:',
-'linklistsub'         => '(Lenano la dihlomaganyago)',
 'linkshere'           => "Matlaka a latelago a hlomaganya le '''[[:$1]]''':",
 'nolinkshere'         => "Ga go letlakala leo le hlomaganyago go '''[[:$1]]'''.",
 'isredirect'          => "''redirect'' letlakala",
@@ -919,6 +937,7 @@ Ka kgopelo, kgetha leina le lengwe.',
 'thumbnail_error' => "Phoso go tlhama ''thumbnail'': $1",
 
 # Special:Import
+'import-comment'        => 'Ahlaahla:',
 'import-revision-count' => '$1 {{PLURAL:$1|poeletšo|dipoeletšo}}',
 
 # Import log
@@ -997,7 +1016,7 @@ $1',
 'show-big-image'       => "''resolution'' ya gofella",
 'show-big-image-thumb' => '<small>Bogolo ba pono: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => "''Gallery'' ya difaele tše mpsha",
 'ilsubmit'  => 'Fetleka',
 'bydate'    => 'ka letšatšikgwedi',
@@ -1045,9 +1064,6 @@ letlakala la seswantšho ge tafola ya metadata e bulwa. Tše dingwe tša di ''fi
 'namespacesall'    => 'ka moka',
 'monthsall'        => 'ka moka',
 
-# AJAX search
-'articletitles' => "Matlakala a go thoma ka ''$1''",
-
 # Multipage image navigation
 'imgmultipageprev' => '� letlakala la go feta',
 'imgmultipagenext' => 'letlakala lago latela →',
diff --git a/languages/messages/MessagesNv.php b/languages/messages/MessagesNv.php
index 68787791..642e2503 100644
--- a/languages/messages/MessagesNv.php
+++ b/languages/messages/MessagesNv.php
@@ -7,10 +7,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'monobook' => 'Naaltsoos�áa\'ígíí'
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Special',
@@ -20,8 +16,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Choinish\'įįhí_baa_yinísht\'į�',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_baa_yinísht\'į�',
-	NS_IMAGE            => 'E\'elyaaígíí',
-	NS_IMAGE_TALK       => 'E\'elyaaígíí_baa_yinísht\'į�',
+	NS_FILE             => 'E\'elyaaígíí',
+	NS_FILE_TALK        => 'E\'elyaaígíí_baa_yinísht\'į�',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_baa_yinísht\'į�',
 	NS_TEMPLATE         => 'Template',
@@ -70,4 +66,7 @@ $messages = array(
 
 'edit' => '�ahgo áshłééh',
 
+# Skin names
+'skinname-monobook' => "Naaltsoos�áa'ígíí",
+
 );
diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index 05752b1c..0cec34ad 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -6,22 +6,12 @@
  *
  * @author Cedric31
  * @author ChrisPtDe
+ * @author Fryed-peach
  * @author Spacebirdy
  * @author Горан �нђелковић
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Estandard',
-	'nostalgia'   => 'Nostalgia',
-	'cologneblue' => 'Colonha Blau',
-	'monobook'    => 'Monobook',
-	'myskin'      => 'Mon interfàcia',
-	'chick'       => 'Poleton',
-	'simple'      => 'Simple',
-	'modern'      => 'Modèrn',
-);
-
 $bookstoreList = array(
 	'Amazon.fr' => 'http://www.amazon.fr/exec/obidos/ISBN=$1'
 );
@@ -29,14 +19,12 @@ $bookstoreList = array(
 $namespaceNames = array(
 	NS_MEDIA          => 'Mèdia',
 	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
 	NS_TALK           => 'Discutir',
 	NS_USER           => 'Utilizaire',
 	NS_USER_TALK      => 'Discussion_Utilizaire',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Imatge',
-	NS_IMAGE_TALK     => 'Discussion_Imatge',
+	NS_FILE           => 'Imatge',
+	NS_FILE_TALK      => 'Discussion_Imatge',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
 	NS_TEMPLATE       => 'Modèl',
@@ -51,7 +39,7 @@ $namespaceAliases = array(
 	'Utilisator'            => NS_USER,
 	'Discussion_Utilisator' => NS_USER_TALK,
 	'Discutida_Utilisator' => NS_USER_TALK,
-	'Discutida_Imatge'     => NS_IMAGE_TALK,
+	'Discutida_Imatge'     => NS_FILE_TALK,
 	'Mediaòiqui'           => NS_MEDIAWIKI,
 	'Discussion_Mediaòiqui' => NS_MEDIAWIKI_TALK,
 	'Discutida_Mediaòiqui' => NS_MEDIAWIKI_TALK,
@@ -61,87 +49,91 @@ $namespaceAliases = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Redireccions_doblas' ),
-	'BrokenRedirects'           => array( 'Redireccions_copadas' ),
-	'Disambiguations'           => array( 'Omonimia' ),
-	'Userlogin'                 => array( 'Nom_d\'utilizaire' ),
+	'DoubleRedirects'           => array( 'Redireccions doblas', 'RedireccionsDoblas' ),
+	'BrokenRedirects'           => array( 'Redireccions copadas', 'RedireccionsCopadas' ),
+	'Disambiguations'           => array( 'Omonimia', 'Omonimias', 'Paginas d\'omonimia' ),
+	'Userlogin'                 => array( 'Nom d\'utilizaire' ),
 	'Userlogout'                => array( 'Desconnexion' ),
-	'CreateAccount'             => array( 'Crear_un_compte', 'CrearUnCompte', 'CrearCompte' ),
+	'CreateAccount'             => array( 'Crear un compte', 'CrearUnCompte', 'CrearCompte' ),
 	'Preferences'               => array( 'Preferéncias' ),
-	'Watchlist'                 => array( 'Lista_de_seguit' ),
-	'Recentchanges'             => array( 'Darrièrs_cambiaments' ),
-	'Upload'                    => array( 'Telecargament' ),
-	'Imagelist'                 => array( 'Lista_dels_imatges' ),
-	'Newimages'                 => array( 'Imatges_novèls' ),
-	'Listusers'                 => array( 'Lista_dels_utilizaires' ),
-	'Listgrouprights'           => array( 'Lista_dels_gropes_utilizaire', 'ListadelsGropesUtilizaire', 'ListaGropesUtilizaire', 'Tièra_dels_gropes_utilizaire', 'TièradelsGropesUtilizaire', 'TièraGropesUtilizaire' ),
-	'Statistics'                => array( 'Estatisticas' ),
-	'Randompage'                => array( 'Pagina_a_l\'azard' ),
-	'Lonelypages'               => array( 'Paginas_orfanèlas' ),
-	'Uncategorizedpages'        => array( 'Paginas_sens_categoria' ),
-	'Uncategorizedcategories'   => array( 'Categorias_sens_categoria' ),
-	'Uncategorizedimages'       => array( 'Imatges_sens_categoria' ),
-	'Uncategorizedtemplates'    => array( 'Modèls_sens_categoria' ),
-	'Unusedcategories'          => array( 'Categorias_inutilizadas' ),
-	'Unusedimages'              => array( 'Imatges_inutilizats' ),
-	'Wantedpages'               => array( 'Paginas_demandadas' ),
-	'Wantedcategories'          => array( 'Categorias_demandadas' ),
-	'Mostlinked'                => array( 'Imatges_mai_utilizats' ),
-	'Mostlinkedcategories'      => array( 'Categorias__mai_utilizadas' ),
-	'Mostlinkedtemplates'       => array( 'Modèls__mai_utilizats' ),
-	'Mostcategories'            => array( 'Mai_de_categorias' ),
-	'Mostimages'                => array( 'Mai_d\'imatges' ),
-	'Mostrevisions'             => array( 'Mai_de_revisions' ),
-	'Fewestrevisions'           => array( 'Mens_de_revisions' ),
-	'Shortpages'                => array( 'Articles_brèus' ),
-	'Longpages'                 => array( 'Articles_longs' ),
-	'Newpages'                  => array( 'Paginas_novèlas' ),
-	'Ancientpages'              => array( 'Paginas_ancianas' ),
-	'Deadendpages'              => array( 'Paginas_sul_camin_d\'enlòc' ),
-	'Protectedpages'            => array( 'Paginas_protegidas' ),
-	'Protectedtitles'           => array( 'Títols_protegits', 'Títols_protegits', 'Títolsprotegits', 'Títolsprotegits' ),
-	'Allpages'                  => array( 'Totas_las_paginas' ),
+	'Watchlist'                 => array( 'Lista de seguit', 'ListraDe Seguit', 'Seguit' ),
+	'Recentchanges'             => array( 'Darrièrs cambiaments', 'DarrièrsCambiaments', 'Darrièras Modificacions' ),
+	'Upload'                    => array( 'Telecargament', 'Telecargaments' ),
+	'Listfiles'                 => array( 'Lista dels imatges', 'ListaDelsImatges' ),
+	'Newimages'                 => array( 'Imatges novèls', 'ImatgesNovèls' ),
+	'Listusers'                 => array( 'Lista dels utilizaires', 'ListaDelsUtilizaires' ),
+	'Listgrouprights'           => array( 'Lista dels gropes utilizaire', 'ListadelsGropesUtilizaire', 'ListaGropesUtilizaire', 'Tièra dels gropes utilizaire', 'TièradelsGropesUtilizaire', 'TièraGropesUtilizaire' ),
+	'Statistics'                => array( 'Estatisticas', 'Stats' ),
+	'Randompage'                => array( 'Pagina a l\'azard' ),
+	'Lonelypages'               => array( 'Paginas orfanèlas' ),
+	'Uncategorizedpages'        => array( 'Paginas sens categoria' ),
+	'Uncategorizedcategories'   => array( 'Categorias sens categoria' ),
+	'Uncategorizedimages'       => array( 'Imatges sens categoria' ),
+	'Uncategorizedtemplates'    => array( 'Modèls sens categoria' ),
+	'Unusedcategories'          => array( 'Categorias inutilizadas' ),
+	'Unusedimages'              => array( 'Imatges inutilizats' ),
+	'Wantedpages'               => array( 'Paginas demandadas' ),
+	'Wantedcategories'          => array( 'Categorias demandadas' ),
+	'Wantedfiles'               => array( 'Fichièrs demandats', 'FichièrsDemandats' ),
+	'Wantedtemplates'           => array( 'Modèls demandats', 'ModèlsDemandats' ),
+	'Mostlinked'                => array( 'Imatges mai utilizats' ),
+	'Mostlinkedcategories'      => array( 'Categorias mai utilizadas', 'CategoriasMaiUtilizadas' ),
+	'Mostlinkedtemplates'       => array( 'Modèls mai utilizats', 'ModèlsMaiUtilizats' ),
+	'Mostcategories'            => array( 'Mai de categorias' ),
+	'Mostimages'                => array( 'Mai d\'imatges' ),
+	'Mostrevisions'             => array( 'Mai de revisions' ),
+	'Fewestrevisions'           => array( 'Mens de revisions' ),
+	'Shortpages'                => array( 'Articles brèus' ),
+	'Longpages'                 => array( 'Articles longs' ),
+	'Newpages'                  => array( 'Paginas novèlas' ),
+	'Ancientpages'              => array( 'Paginas ancianas' ),
+	'Deadendpages'              => array( 'Paginas sul camin d\'enlòc' ),
+	'Protectedpages'            => array( 'Paginas protegidas' ),
+	'Protectedtitles'           => array( 'Títols protegits', 'TítolsProtegits' ),
+	'Allpages'                  => array( 'Totas las paginas' ),
 	'Prefixindex'               => array( 'Indèx' ),
-	'Ipblocklist'               => array( 'Utilizaires_blocats' ),
-	'Specialpages'              => array( 'Paginas_especialas' ),
+	'Ipblocklist'               => array( 'Utilizaires blocats' ),
+	'Specialpages'              => array( 'Paginas especialas' ),
 	'Contributions'             => array( 'Contribucions' ),
-	'Emailuser'                 => array( 'Corrièr_electronic', 'Email', 'Emèl', 'Emèil' ),
-	'Confirmemail'              => array( 'Confirmar_lo_corrièr_electronic', 'Confirmarlocorrièrelectronic', 'ConfirmarCorrièrElectronic' ),
-	'Whatlinkshere'             => array( 'Paginas_ligadas' ),
-	'Recentchangeslinked'       => array( 'Seguit_dels_ligams' ),
-	'Movepage'                  => array( 'Tornar_nomenar', 'Renomenatge' ),
-	'Blockme'                   => array( 'Blocatz_me', 'Blocatzme' ),
-	'Booksources'               => array( 'Obratge_de_referéncia', 'Obratges_de_referéncia' ),
+	'Emailuser'                 => array( 'Corrièr electronic', 'Email', 'Emèl', 'Emèil' ),
+	'Confirmemail'              => array( 'Confirmar lo corrièr electronic', 'Confirmarlocorrièrelectronic', 'ConfirmarCorrièrElectronic' ),
+	'Whatlinkshere'             => array( 'Paginas ligadas' ),
+	'Recentchangeslinked'       => array( 'Seguit dels ligams' ),
+	'Movepage'                  => array( 'Tornar nomenar', 'Cambiament de nom' ),
+	'Blockme'                   => array( 'Blocatz me', 'Blocatz-me' ),
+	'Booksources'               => array( 'Obratge de referéncia', 'Obratges de referéncia' ),
 	'Categories'                => array( 'Categorias' ),
 	'Export'                    => array( 'Exportar', 'Exportacion' ),
-	'Version'                   => array( 'Version' ),
-	'Allmessages'               => array( 'Messatge_sistèma', 'Messatge_del_sistèma' ),
+	'Allmessages'               => array( 'Messatge sistèma', 'Messatge del sistèma' ),
 	'Log'                       => array( 'Jornal', 'Jornals' ),
 	'Blockip'                   => array( 'Blocar', 'Blocatge' ),
 	'Undelete'                  => array( 'Restablir', 'Restabliment' ),
 	'Import'                    => array( 'Impòrt', 'Importacion' ),
-	'Lockdb'                    => array( 'Varrolhar_la_banca' ),
-	'Unlockdb'                  => array( 'Desvarrolhar_la_banca' ),
+	'Lockdb'                    => array( 'Varrolhar la banca' ),
+	'Unlockdb'                  => array( 'Desvarrolhar la banca' ),
 	'Userrights'                => array( 'Dreches', 'Permission' ),
-	'MIMEsearch'                => array( 'Recèrca_MIME' ),
-	'FileDuplicateSearch'       => array( 'Recèrca_fichièr_en_doble', 'RecèrcaFichièrEnDoble' ),
-	'Unwatchedpages'            => array( 'Paginas_pas_seguidas' ),
-	'Listredirects'             => array( 'Lista_de_las_redireccions', 'Listadelasredireccions', 'Lista_dels_redirects', 'Listadelsredirects', 'Lista_redireccions', 'Listaredireccions', 'Lista_redirects', 'Listaredirects' ),
-	'Revisiondelete'            => array( 'Versions_suprimidas' ),
-	'Unusedtemplates'           => array( 'Modèls_inutilizats', 'Modèlsinutilizats', 'Models_inutilizats', 'Modelsinutilizats', 'Modèls_pas_utilizats', 'Modèlspasutilizats', 'Models_pas_utilizats', 'Modelspasutilizats' ),
-	'Randomredirect'            => array( 'Redireccion_a_l\'azard', 'Redirect_a_l\'azard' ),
-	'Mypage'                    => array( 'Ma_pagina', 'Mapagina' ),
-	'Mytalk'                    => array( 'Mas_discussions', 'Masdiscussions' ),
-	'Mycontributions'           => array( 'Mas_contribucions', 'Mascontribucions' ),
-	'Listadmins'                => array( 'Lista_dels_administrators', 'Listadelsadministrators', 'Lista_dels_admins', 'Listadelsadmins', 'Lista_admins', 'Listaadmins' ),
-	'Listbots'                  => array( 'Lista_dels_Bòts', 'ListadelsBòts' ),
-	'Popularpages'              => array( 'Paginas_mai_visitadas', 'Paginas_las_mai_visitadas', 'Paginasmaivisitadas' ),
+	'MIMEsearch'                => array( 'Recèrca MIME' ),
+	'FileDuplicateSearch'       => array( 'Recèrca fichièr en doble', 'RecèrcaFichièrEnDoble' ),
+	'Unwatchedpages'            => array( 'Paginas pas seguidas' ),
+	'Listredirects'             => array( 'Lista de las redireccions', 'Listadelasredireccions', 'Lista dels redirects', 'Listadelsredirects', 'Lista redireccions', 'Listaredireccions', 'Lista redirects', 'Listaredirects' ),
+	'Revisiondelete'            => array( 'Versions suprimidas' ),
+	'Unusedtemplates'           => array( 'Modèls inutilizats', 'Modèlsinutilizats', 'Models inutilizats', 'Modelsinutilizats', 'Modèls pas utilizats', 'Modèlspasutilizats', 'Models pas utilizats', 'Modelspasutilizats' ),
+	'Randomredirect'            => array( 'Redireccion a l\'azard', 'Redirect a l\'azard' ),
+	'Mypage'                    => array( 'Ma pagina', 'Mapagina' ),
+	'Mytalk'                    => array( 'Mas discussions', 'Masdiscussions' ),
+	'Mycontributions'           => array( 'Mas contribucions', 'Mascontribucions' ),
+	'Listadmins'                => array( 'Lista dels administrators', 'Listadelsadministrators', 'Lista dels admins', 'Listadelsadmins', 'Lista admins', 'Listaadmins' ),
+	'Listbots'                  => array( 'Lista dels Bòts', 'ListadelsBòts', 'Lista dels Bots', 'ListadelsBots' ),
+	'Popularpages'              => array( 'Paginas mai visitadas', 'Paginas las mai visitadas', 'Paginasmaivisitadas' ),
 	'Search'                    => array( 'Recèrca', 'Recercar', 'Cercar' ),
-	'Resetpass'                 => array( 'Reïnicializacion_del_senhal', 'Reinicializaciondelsenhal' ),
-	'Withoutinterwiki'          => array( 'Sens_interwiki', 'Sensinterwiki', 'Sens_interwikis', 'Sensinterwikis' ),
-	'MergeHistory'              => array( 'Fusionar_l\'istoric', 'Fusionarlistoric' ),
-	'Filepath'                  => array( 'Camin_del_Fichièr', 'CamindelFichièr', 'CaminFichièr' ),
-	'Invalidateemail'           => array( 'Invalidar_Corrièr_electronic', 'InvalidarCorrièrElectronic' ),
+	'Resetpass'                 => array( 'Reïnicializacion del senhal', 'Reinicializaciondelsenhal' ),
+	'Withoutinterwiki'          => array( 'Sens interwiki', 'Sensinterwiki', 'Sens interwikis', 'Sensinterwikis' ),
+	'MergeHistory'              => array( 'Fusionar l\'istoric', 'Fusionarlistoric' ),
+	'Filepath'                  => array( 'Camin del Fichièr', 'CamindelFichièr', 'CaminFichièr' ),
+	'Invalidateemail'           => array( 'Invalidar Corrièr electronic', 'InvalidarCorrièrElectronic' ),
+	'Blankpage'                 => array( 'Pagina blanca', 'PaginaBlanca' ),
+	'LinkSearch'                => array( 'Recèrca de ligams', 'RecèrcaDeLigams' ),
+	'DeletedContributions'      => array( 'Contribucions escafadas', 'ContribucionsEscafadas' ),
 );
 
 $magicWords = array(
@@ -256,17 +248,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Amagar mas pròprias modificacions dins la lista de seguit',
 'tog-watchlisthidebots'       => 'Amagar los cambiaments faches pels bòts dins la lista de seguit',
 'tog-watchlisthideminor'      => 'Amagar las modificacions menoras dins la lista de seguit',
+'tog-watchlisthideliu'        => 'Amaga, de la tièra, las modificacions pels utilizaires connectats',
+'tog-watchlisthideanons'      => 'Amaga, de la tièra, las modificacions anonimas',
 'tog-nolangconversion'        => 'Desactivar la conversion de las variantas de lenga',
 'tog-ccmeonemails'            => 'Me mandar una còpia dels corrièrs electronics que mandi als autres utilizaires',
 'tog-diffonly'                => 'Mostrar pas lo contengut de las paginas jos las difs',
 'tog-showhiddencats'          => 'Afichar las categorias amagadas',
+'tog-norollbackdiff'          => 'Ometre lo diff aprèp l’utilizacion d’un revert',
 
 'underline-always'  => 'Totjorn',
 'underline-never'   => 'Pas jamai',
 'underline-default' => 'Segon lo navigador',
 
-'skinpreview' => '(Previsualizar)',
-
 # Dates
 'sunday'        => 'dimenge',
 'monday'        => 'diluns',
@@ -360,7 +353,7 @@ $messages = array(
 'mytalk'         => 'Ma pagina de discussion',
 'anontalk'       => 'Discussion amb aquesta adreça IP',
 'navigation'     => 'Navigacion',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadonadas :',
@@ -397,14 +390,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discussion',
 'specialpage'       => 'Pagina especiala',
 'personaltools'     => 'Espleches personals',
-'postcomment'       => 'Apondre un comentari',
+'postcomment'       => 'Seccion novèla',
 'articlepage'       => "Vejatz l'article",
 'talk'              => 'Discussion',
 'views'             => 'Afichatges',
 'toolbox'           => "Bóstia d'espleches",
 'userpage'          => "Pagina d'utilizaire",
 'projectpage'       => 'Pagina meta',
-'imagepage'         => 'Pagina del mèdia',
+'imagepage'         => 'Veire la pagina del fichièr',
 'mediawikipage'     => 'Vejatz la pagina dels messatges',
 'templatepage'      => 'Vejatz la pagina del modèl',
 'viewhelppage'      => "Vejatz la pagina d'ajuda",
@@ -423,8 +416,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'A prepaus de {{SITENAME}}',
 'aboutpage'            => 'Project:A prepaus',
-'bugreports'           => "Rapòrt d'errors",
-'bugreportspage'       => "Project:Rapòrt d'errors",
 'copyright'            => 'Lo contengut es disponible segon los tèrmes de la licéncia $1.',
 'copyrightpagename'    => '{{SITENAME}}, totes los dreches reservats',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -447,9 +438,7 @@ $messages = array(
 
 'badaccess'        => 'Error de permission',
 'badaccess-group0' => 'Avètz pas los dreches sufisents per realizar l’accion que demandatz.',
-'badaccess-group1' => "L’accion qu'ensajatz de realizar es pas accessibla qu’als utilizaires del grop $1.",
-'badaccess-group2' => "L’accion qu'ensajatz de realizar es pas accessibla qu’als utilizaires dels gropes $1.",
-'badaccess-groups' => "L’accion qu'ensajatz de realizar es pas accessibla qu’als utilizaires dels gropes $1.",
+'badaccess-groups' => "L’accion qu'ensajatz de realizar es pas accessibla qu’als utilizaires {{PLURAL:$2|del grop|d´un d´aquestes gropes}}: $1.",
 
 'versionrequired'     => 'Version $1 de MediaWiki necessària',
 'versionrequiredtext' => 'La version $1 de MediaWiki es necessària per utilizar aquesta pagina. Consultatz [[Special:Version|la pagina de las versions]]',
@@ -463,6 +452,8 @@ $messages = array(
 'editsection'             => 'modificar',
 'editold'                 => 'modificar',
 'viewsourceold'           => 'veire la font',
+'editlink'                => 'modificar',
+'viewsourcelink'          => 'veire la font',
 'editsectionhint'         => 'Modificar la seccion : $1',
 'toc'                     => 'Somari',
 'showtoc'                 => 'afichar',
@@ -477,13 +468,13 @@ $messages = array(
 'site-atom-feed'          => 'Flus Atom de $1',
 'page-rss-feed'           => 'Flus RSS de "$1"',
 'page-atom-feed'          => 'Flus Atom de "$1"',
-'red-link-title'          => '$1 (pagina pas encara redigida)',
+'red-link-title'          => '$1 (la pagina existís pas)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Article',
 'nstab-user'      => "Pagina d'utilizaire",
 'nstab-media'     => 'Pagina del mèdia',
-'nstab-special'   => 'Especial',
+'nstab-special'   => 'Pagina especiala',
 'nstab-project'   => 'A prepaus',
 'nstab-image'     => 'Fichièr',
 'nstab-mediawiki' => 'Messatge',
@@ -493,7 +484,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Accion desconeguda',
-'nosuchactiontext'  => "L'accion especificada dins l'Url es pas reconeguda pel logicial {{SITENAME}}.",
+'nosuchactiontext'  => "L'accion especificada dins l'Url es invalida.
+Benlèu avètz mal picat l’URL o seguit un ligam incorrècte.
+Aquò tanben pòt indicar un problèma dins lo logicial utilizat per {{SITENAME}}.",
 'nosuchspecialpage' => 'Pagina especiala inexistanta',
 'nospecialpagetext' => "<big>'''Avètz demandat una pagina especiala qu'es pas reconeguda pel logicial {{SITENAME}}.'''</big>
 
@@ -546,7 +539,6 @@ Informatz-ne un [[Special:ListUsers/sysop|administrator]] aprèp aver notada lâ€
 'cannotdelete'         => 'Impossible de suprimir la pagina o lo fichièr indicat. (Benlèu la supression ja es estada efectuada per qualqu’un d’autre.)',
 'badtitle'             => 'Títol marrit',
 'badtitletext'         => 'Lo títol de la pagina demandada es invalid, void o s’agís d’un títol interlenga o interprojècte mal ligat. Benlèu conten un o maites caractèrs que pòdon pas èsser utilizats dins los títols.',
-'perfdisabled'         => 'O planhèm ! Aquesta foncionalitat es temporàriament desactivada perque alentís la banca de donadas a un punt tal que degun pòt pas mai utilizar lo wiki.',
 'perfcached'           => 'Aquò es una version en amagatal e benlèu es pas a jorn.',
 'perfcachedts'         => 'Las donadas seguentas son en amagatal, son doncas pas obligatòriament a jorn. La darrièra actualizacion data del $1.',
 'querypage-no-updates' => 'Las mesas a jorn per aquesta pagina son actualamnt desactivadas. Las donadas çaijós son pas mesas a jorn.',
@@ -560,7 +552,7 @@ Requèsta : $2',
 'protectedpagetext'    => 'Aquesta pagina es estada protegida per empachar sa modificacion.',
 'viewsourcetext'       => 'Podètz veire e copiar lo contengut de l’article per poder trabalhar dessús :',
 'protectedinterface'   => 'Aquesta pagina fornís de tèxt d’interfàcia pel logicial e es protegida per evitar los abuses.',
-'editinginterface'     => "'''Atencion :''' sètz a editar una pagina utilizada per crear lo tèxt de l’interfàcia del logicial. Los cambiaments se repercutaràn, segon lo contèxt, sus totas o cèrtas paginas visiblas pels autres utilizaires. Per las traduccions, vos convidam a utilizar lo projècte MediaWiki d'internacionalizacion dels messatges [http://translatewiki.net/wiki/Main_Page?setlang=oc Betawiki].",
+'editinginterface'     => "'''Atencion :''' sètz a editar una pagina utilizada per crear lo tèxt de l’interfàcia del logicial. Los cambiaments se repercutaràn, segon lo contèxt, sus totas o cèrtas paginas visiblas pels autres utilizaires. Per las traduccions, vos convidam a utilizar lo projècte MediaWiki d'internacionalizacion dels messatges [http://translatewiki.net/wiki/Main_Page?setlang=oc translatewiki.net].",
 'sqlhidden'            => '(Requèsta SQL amagada)',
 'cascadeprotected'     => "Aquesta pagina es actualament protegida perque es inclusa dins {{PLURAL:$1|la pagina seguenta|las paginas seguentas}}, {{PLURAL:$1|qu'es estada protegida|que son estadas protegidas}} amb l’opcion « proteccion en cascada » activada :
 $2",
@@ -571,13 +563,13 @@ $2",
 Lo motiu avançat es « ''$2'' ».",
 
 # Virus scanner
-'virus-badscanner'     => 'Marrida configuracion : escaner de virús desconegut : <i>$1</i>',
+'virus-badscanner'     => "Marrida configuracion : escaner de virús desconegut : ''$1''",
 'virus-scanfailed'     => 'Fracàs de la recèrca (còde $1)',
 'virus-unknownscanner' => 'antivirús desconegut :',
 
 # Login and logout pages
 'logouttitle'                => 'Desconnexion',
-'logouttext'                 => "<strong>Ara, sètz desconnectat(ada).</strong>
+'logouttext'                 => "'''Ara, sètz desconnectat(ada).'''
 
 Podètz contunhar d'utilizar {{SITENAME}} anonimament, o vos podètz [[Special:UserLogin|tornar connectar]] jol meteis nom o amb un autre nom.",
 'welcomecreation'            => "== Benvenguda, $1 ! ==
@@ -590,7 +582,6 @@ Doblidetz pas de personalizar vòstras [[Special:Preferences|{{SITENAME}} prefer
 'remembermypassword'         => 'Se remembrar de mon senhal (cookie)',
 'yourdomainname'             => 'Vòstre domeni',
 'externaldberror'            => 'Siá una error s’es producha amb la banca de donadas d’autentificacion extèrna, siá sètz pas autorizat a metre a jorn vòstre compte extèrn.',
-'loginproblem'               => '<b>Problèma d’identificacion.</b><br />Ensajatz tornarmai !',
 'login'                      => 'Identificacion',
 'nav-login-createaccount'    => 'Crear un compte o se connectar',
 'loginprompt'                => 'Vos cal activar los cookies per vos connectar a {{SITENAME}}.',
@@ -617,7 +608,7 @@ Causissètz-ne un autre.",
 'yournick'                   => 'Signatura per las discussions :',
 'badsig'                     => 'Signatura bruta incorrècta, verificatz vòstras balisas HTML.',
 'badsiglength'               => 'Vòstra signatura es tròp longa.
-Sa talha maximala deu èsser de $1 {{PLURAL:$1|caractèr|caractèrs}}.',
+Deu aver, al maximum $1 caractèr{{PLURAL:$1||s}}.',
 'email'                      => 'Corrièr electronic',
 'prefs-help-realname'        => "(facultatiu) : se l'especificatz, serà utilizat per vos atribuir vòstras contribucions.",
 'loginerror'                 => "Error d'identificacion",
@@ -630,6 +621,7 @@ Tanben podètz causir de permetre a d’autres de vos contactar amb l'ajuda de v
 'loginsuccesstitle'          => 'Identificacion capitada.',
 'loginsuccess'               => 'Sètz actualament connectat(ada) sus {{SITENAME}} en tant que « $1 ».',
 'nosuchuser'                 => "L'utilizaire « $1 » existís pas.
+Lo nom d'utilizaire es sensible a la cassa.
 Verificatz qu'avètz plan ortografiat lo nom, o [[Special:UserLogin/signup|creatz-vos un compte novèl]].",
 'nosuchusershort'            => 'I a pas de contributor amb lo nom « <nowiki>$1</nowiki> ». Verificatz l’ortografia.',
 'nouserspecified'            => "Vos cal especificar vòstre nom d'utilizaire.",
@@ -654,10 +646,11 @@ Identificatz-vos tre que l'aurètz recebut.",
 Abans qu’un autre corrièr sià mandat a aqueste compte, deuretz seguir las instruccions donadas dins lo messatge per confirmar que sètz plan lo titular.',
 'throttled-mailpassword'     => 'Un corrièr electronic de rapèl de vòstre senhal ja es estat mandat durant {{PLURAL:$1|la darrièra ora|las $1 darrièras oras}}. Per evitar los abuses, un sol corrièr de rapèl serà mandat per {{PLURAL:$1|ora|interval de $1 oras}}.',
 'mailerror'                  => 'Error en mandant lo corrièr electronic : $1',
-'acct_creation_throttle_hit' => "O planhèm, ja avètz {{PLURAL:$1|$1 compte creat|$1 comptes creats}}. Ne podètz pas crear d'autres.",
-'emailauthenticated'         => 'Vòstra adreça de corrièr electronic es estada autentificada lo $1.',
+'acct_creation_throttle_hit' => "De visitors d'aqueste wiki qu'utilizan vòstra adreça IP an creat $1 {{PLURAL:$1|compte|comptes}} lo jorn darrièr, aquò es lo limit maximum autorizat pendent aqueste periòde.
+Atal los visitors qu'utilizan aquesta adreça IP pòdon pas crear mai de compte novèl pel moment.",
+'emailauthenticated'         => 'Vòstra adreça de corrièr electronic es estada autentificada lo $2 a $3.',
 'emailnotauthenticated'      => 'Vòstra adreça de corrièr electronic es <strong>pas encara autentificada</strong>. Cap corrièr serà pas mandat per caduna de las foncions seguentas.',
-'noemailprefs'               => "<strong>Cap d'adreça electronica es pas estada indicada,</strong> las foncions seguentas seràn pas disponiblas.",
+'noemailprefs'               => "Cap d'adreça electronica es pas estada indicada, las foncions seguentas seràn pas disponiblas.",
 'emailconfirmlink'           => 'Confirmatz vòstra adreça de corrièr electronic',
 'invalidemailaddress'        => "Aquesta adreça de corrièr electronic pòt pas èsser acceptada perque sembla qu'a un format incorrècte.
 Picatz una adreça plan formatada o daissatz aqueste camp void.",
@@ -667,18 +660,26 @@ Picatz una adreça plan formatada o daissatz aqueste camp void.",
 'createaccount-text'         => "Qualqu'un a creat un compte per vòstra adreça de corrièr electronic sus {{SITENAME}} ($4) intitolat « $2 », amb per senhal « $3 ». Deuriaz dobrir una sessilha e cambiar, tre ara, aqueste senhal.
 
 Ignoratz aqueste messatge se aqueste compte es estat creat per error.",
+'login-throttled'            => 'Avètz fach tròp de temptativas de senhal sus aqueste compte. Esperatz abans d’ensajar tornamai.',
 'loginlanguagelabel'         => 'Lenga: $1',
 
 # Password reset dialog
-'resetpass'               => 'Remesa a zèro del senhal',
-'resetpass_announce'      => 'Vos sètz enregistrat amb un senhal temporari mandat per corrièr electronic. Per acabar l’enregistrament, vos cal picar un senhal novèl aicí :',
-'resetpass_text'          => '<!-- Apondètz lo tèxt aicí -->',
-'resetpass_header'        => 'Modificar lo senhal del compte',
-'resetpass_submit'        => 'Cambiar lo senhal e s’enregistrar',
-'resetpass_success'       => 'Vòstre senhal es estat cambiat amb succès ! Enregistrament en cors...',
-'resetpass_bad_temporary' => 'Senhal temporari invalid. Benlèu que ja avètz cambiat vòstre senhal amb succès, o demandat un senhal temporari novèl.',
-'resetpass_forbidden'     => 'Los senhals pòdon pas èsser cambiats',
-'resetpass_missing'       => 'Cap de donada pas picada.',
+'resetpass'                 => 'Cambiar lo senhal del compte',
+'resetpass_announce'        => 'Vos sètz enregistrat amb un senhal temporari mandat per corrièr electronic. Per acabar l’enregistrament, vos cal picar un senhal novèl aicí :',
+'resetpass_text'            => '<!-- Apondètz lo tèxt aicí -->',
+'resetpass_header'          => 'Modificar lo senhal del compte',
+'oldpassword'               => 'Senhal ancian :',
+'newpassword'               => 'Senhal novèl :',
+'retypenew'                 => 'Confirmar lo senhal novèl :',
+'resetpass_submit'          => 'Cambiar lo senhal e s’enregistrar',
+'resetpass_success'         => 'Vòstre senhal es estat cambiat amb succès ! Enregistrament en cors...',
+'resetpass_bad_temporary'   => 'Senhal temporari invalid. Benlèu que ja avètz cambiat vòstre senhal amb succès, o demandat un senhal temporari novèl.',
+'resetpass_forbidden'       => 'Los senhals pòdon pas èsser cambiats',
+'resetpass-no-info'         => 'Vos cal èsser connectat per aver accès a aquesta pagina.',
+'resetpass-submit-loggedin' => 'Modificar lo senhal',
+'resetpass-wrong-oldpass'   => 'Senhal actual o temporari invalid.
+Benlèu ja avètz modificat vòstre senhal o demandat un senhal temporari novèl.',
+'resetpass-temp-password'   => 'Senhal temporari :',
 
 # Edit page toolbar
 'bold_sample'     => 'Tèxt en gras',
@@ -703,8 +704,8 @@ Ignoratz aqueste messatge se aqueste compte es estat creat per error.",
 'hr_tip'          => "Linha orizontala (n'abusetz pas)",
 
 # Edit pages
-'summary'                          => 'Resumit&nbsp;',
-'subject'                          => 'Subjècte/títol',
+'summary'                          => 'Resumit :',
+'subject'                          => 'Subjècte/títol :',
 'minoredit'                        => 'Aquò es un cambiament menor',
 'watchthis'                        => 'Seguir aquesta pagina',
 'savearticle'                      => 'Salvar',
@@ -717,8 +718,8 @@ Vòstra adreça IP serà enregistrada dins l’istoric d'aquesta pagina.",
 'missingsummary'                   => "'''Atencion :''' avètz pas modificat lo resumit de vòstra modificacion. Se clicatz tornarmai sul boton « Salvar », lo salvament serà facha sens avertiment novèl.",
 'missingcommenttext'               => 'Mercé de metre un comentari çaijós.',
 'missingcommentheader'             => "'''Rampèl :''' Avètz pas provesit de subjècte/títol per aqueste comentari. Se clicatz tornamai sus ''Salvar'', vòstra edicion serà enregistrada sens aquò.",
-'summary-preview'                  => 'Previsualizacion del resumit',
-'subject-preview'                  => 'Previsualizacion del subjècte/títol',
+'summary-preview'                  => 'Previsualizacion del resumit :',
+'subject-preview'                  => 'Previsualizacion del subjècte/títol :',
 'blockedtitle'                     => "L'utilizaire es blocat",
 'blockedtext'                      => "<big>'''Vòstre compte d'utilizaire o vòstra adreça IP es estat blocat'''</big>
 
@@ -768,31 +769,31 @@ Per crear aquesta pagina, picatz vòstre tèxt dins la bóstia çaijós (podètz
 Se sètz arribat(ada) aicí per error, clicatz sul boton '''retorn''' de vòstre navigador.",
 'anontalkpagetext'                 => "---- ''Sètz sus la pagina de discussion d'un utilizaire anonim qu'a pas encara creat un compte o que n'utiliza pas.
 Per aquesta rason, devèm utilizar son adreça IP per l'identificar. Una adreça d'aqueste tipe pòt èsser partejada entre mantuns utilizaires. Se sètz un utilizaire anonim e se constatatz que de comentaris que vos concernisson pas vos son estats adreçats, podètz [[Special:UserLogin/signup|crear un compte]] o [[Special:UserLogin|vos connectar]] per evitar tota confusion venenta amb d’autres contributors anonims.''",
-'noarticletext'                    => "Pel moment, i a pas cap de tèxt sus aquesta pagina ; podètz [[Special:Search/{{PAGENAME}}|aviar una recèrca sul títol d'aquesta pagina]], verificar qu’es pas estada [{{fullurl:Special:Log|type=delete&page={{FULLPAGENAMEE}}}} suprimida] o [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificar aquesta pagina].",
+'noarticletext'                    => 'Pel moment, i a pas cap de tèxt sus aquesta pagina ; podètz [[Special:Search/{{PAGENAME}}|aviar una recèrca sul títol d\'aqueste títol de pagina]] dins las autras pagina, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} recercar dins las operacions ligadas] o [{{fullurl:{{urlencode:{{FULLPAGENAME}}}}|action=edit}} crear aquesta pagina]</span>.',
 'userpage-userdoesnotexist'        => "Lo compte d'utilizaire « $1 » es pas enregistrat. Indicatz se volètz crear o editar aquesta pagina.",
 'clearyourcache'                   => "'''Nòta :''' Aprèp aver publicat la pagina, vos cal forçar son recargament complet tot ignorant lo contengut actual de l'amagatal de vòstre navigador per veire los cambiaments : '''Mozilla / Firefox / Konqueror / Safari :''' mantenètz la tòca ''Majuscula'' (''Shift'') en clicant lo boton ''Actualizar'' (''Reload,'') o quichatz ''Maj-Ctrl-R'' (''Maj-Cmd-R'' sus Apple Mac) ; '''Internet Explorer / Opera :''' mantenètz la tòca ''Ctrl'' en clicant lo boton ''Actualizar'' o quichatz ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => "<strong>Astúcia :</strong> Utilizatz lo boton 'Previsualizacion' per testar vòstre fuèlh novèl css/js abans de l'enregistrar.",
+'usercssjsyoucanpreview'           => "'''Astúcia :''' Utilizatz lo boton 'Previsualizacion' per testar vòstre fuèlh novèl css/js abans de l'enregistrar.",
 'usercsspreview'                   => "'''Remembratz-vos que sètz a previsualizar vòstre pròpri fuèlh CSS !'''
 '''Es pas estada encara enregistrada !'''",
 'userjspreview'                    => "'''Remembratz-vos que sètz a visualizar o testar vòstre còde JavaScript e qu’es pas encara estat enregistrat !'''",
 'userinvalidcssjstitle'            => "'''Atencion :''' existís pas d'estil « $1 ». Remembratz-vos que las paginas personalas amb extensions .css e .js utilizan de títols en minusculas, per exemple, {{ns:user}}:Foo/monobook.css e non pas {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Mes a jorn)',
-'note'                             => '<strong>Nòta :</strong>',
-'previewnote'                      => "<strong>Atencion, aqueste tèxt es pas qu'una previsualizacion e es pas encara estat salvat !</strong>",
+'note'                             => "'''Nòta :'''",
+'previewnote'                      => "'''Atencion, aqueste tèxt es pas qu'una previsualizacion e es pas encara estat salvat !'''",
 'previewconflict'                  => 'Aquesta previsualizacion mòstra lo tèxt de la bóstia de modificacion superiora coma apareisserà se causissètz de lo salvar.',
-'session_fail_preview'             => "<strong>Podèm pas enregistrar vòstra modificacion a causa d’una pèrda d’informacions concernent vòstra sesilha. 
+'session_fail_preview'             => "'''Podèm pas enregistrar vòstra modificacion a causa d’una pèrda d’informacions concernent vòstra sesilha. 
 Ensajatz tornarmai.
-S'aquò fracassa encara, desconnectatz-vos, puèi [[Special:UserLogout|connectatz-vos]] tornamai.</strong>",
-'session_fail_preview_html'        => "<strong>Podèm pas enregistrar vòstra modificacion a causa d’una pèrda d’informacions que concernís vòstra sesilha.</strong>
+S'aquò fracassa encara, desconnectatz-vos, puèi [[Special:UserLogout|connectatz-vos]] tornamai.'''",
+'session_fail_preview_html'        => "'''Podèm pas enregistrar vòstra modificacion a causa d’una pèrda d’informacions que concernís vòstra sesilha.'''
 
 ''Perque {{SITENAME}} a activat l’HTML brut, la previsualizacion es estada amagada per prevenir un atac per JavaScript.''
 
-<strong>Se la temptativa de modificacion èra legitima, ensajatz encara.
-S'aquò capita pas un còp de mai, [[Special:UserLogout|desconnectatz-vos]], puèi connectatz-vos tornamai.</strong>",
-'token_suffix_mismatch'            => '<strong>Vòstra modificacion es pas estada acceptada perque vòstre navigador a mesclat los caractèrs de ponctuacion dins l’identificant d’edicion. La modificacion es estada regetada per empachar la corrupcion del tèxt de l’article. Aqueste problèma se produtz quand utilizatz un mandatari (proxy) anonim problematic.</strong>',
+'''Se la temptativa de modificacion èra legitima, ensajatz encara.
+S'aquò capita pas un còp de mai, [[Special:UserLogout|desconnectatz-vos]], puèi connectatz-vos tornamai.'''",
+'token_suffix_mismatch'            => "'''Vòstra modificacion es pas estada acceptada perque vòstre navigador a mesclat los caractèrs de ponctuacion dins l’identificant d’edicion. La modificacion es estada regetada per empachar la corrupcion del tèxt de l’article. Aqueste problèma se produtz quand utilizatz un mandatari (proxy) anonim problematic.'''",
 'editing'                          => 'Modificacion de $1',
 'editingsection'                   => 'Modificacion de $1 (seccion)',
-'editingcomment'                   => 'Modificacion de $1 (comentari)',
+'editingcomment'                   => 'Modificacion de $1 (seccion novèla)',
 'editconflict'                     => 'Conflicte de modificacion : $1',
 'explainconflict'                  => "Aqueste pagina es estada salvada aprèp qu'avètz començat de la modificar.
 La zòna d'edicion superiora conten lo tèxt tal coma es enregistrat actualament dins la banca de donadas.
@@ -801,22 +802,24 @@ Anatz dever aportar vòstras modificacions al tèxt existent.
 '''Sol''' lo tèxt de la zòna superiora serà salvat.",
 'yourtext'                         => 'Vòstre tèxt',
 'storedversion'                    => 'Version enregistrada',
-'nonunicodebrowser'                => '<strong>Atencion : Vòstre navigador supòrta pas l’unicode. Una solucion temporària es estada trobada per vos permetre de modificar un article en tota seguretat : los caractèrs non-ASCII apareisseràn dins vòstra bóstia de modificacion en tant que còdes exadecimals. Deuriatz utilizar un navigador mai recent.</strong>',
-'editingold'                       => "<strong>Atencion : sètz a modificar una version obsolèta d'aquesta pagina. Se salvatz, totas las modificacions efectuadas dempuèi aquesta version seràn perdudas.</strong>",
+'nonunicodebrowser'                => "'''Atencion : Vòstre navigador supòrta pas l’unicode. Una solucion temporària es estada trobada per vos permetre de modificar un article en tota seguretat : los caractèrs non-ASCII apareisseràn dins vòstra bóstia de modificacion en tant que còdes exadecimals. Deuriatz utilizar un navigador mai recent.'''",
+'editingold'                       => "'''Atencion : sètz a modificar una version obsolèta d'aquesta pagina. Se salvatz, totas las modificacions efectuadas dempuèi aquesta version seràn perdudas.'''",
 'yourdiff'                         => 'Diferéncias',
-'copyrightwarning'                 => "Totas las contribucions a {{SITENAME}} son consideradas coma publicadas jols tèrmes de la $2 (vejatz $1 per mai de detalhs). Se desiratz pas que vòstres escriches sián modificats e distribuits a volontat, mercés de los sometre pas aicí.<br /> Nos prometètz tanben qu'avètz escrich aquò vos-meteis, o que l’avètz copiat d’una font provenent del domeni public, o d’una ressorsa liura.<strong>UTILIZETZ PAS DE TRABALHS JOS COPYRIGHT SENS AUTORIZACION EXPRÈSSA !</strong>",
-'copyrightwarning2'                => "Totas las contribucions a {{SITENAME}} pòdon èsser modificadas o suprimidas per d’autres utilizaires. Se desiratz pas que vòstres escriches sián modificats e distribuits a volontat, mercés de los sometre pas aicí.<br /> Tanben nos prometètz qu'avètz escrich aquò vos-meteis, o que l’avètz copiat d’una font provenent del domeni public, o d’una ressorsa liura. (vejatz $1 per mai de detalhs). <strong>UTILIZETZ PAS DE TRABALHS JOS COPYRIGHT SENS AUTORIZACION EXPRÈSSA !</strong>",
-'longpagewarning'                  => "<strong>AVERTIMENT : aquesta pagina a una longor de $1 ko.
-De delà de 32 ko, es preferible per d'unes navigadors de devesir aquesta pagina en seccions mai pichonas. Benlèu deuriatz devesir la pagina en seccions mai pichonas.</strong>",
-'longpageerror'                    => "<strong>ERROR: Lo tèxt qu'avètz mandat es de $1 Ko, e despassa doncas lo limit autorizat dels $2 Ko. Lo tèxt pòt pas èsser salvat.</strong>",
-'readonlywarning'                  => '<strong>AVERTIMENT : La banca de donadas es estada varrolhada per mantenença,
-doncas poiretz pas salvar vòstras modificacions ara. Podètz copiar lo tèxt dins un fichièr tèxt e lo salvar per mai tard.</strong>',
-'protectedpagewarning'             => "<strong>AVERTIMENT : Aquesta pagina es protegida.
-Sols los utilizaires amb l'estatut d'administrator la pòdon modificar. Asseguratz-vos que seguissètz las directivas concernent las paginas protegidas.</strong>",
+'copyrightwarning'                 => "Totas las contribucions a {{SITENAME}} son consideradas coma publicadas jols tèrmes de la $2 (vejatz $1 per mai de detalhs). Se desiratz pas que vòstres escriches sián modificats e distribuits a volontat, mercés de los sometre pas aicí.<br /> Nos prometètz tanben qu'avètz escrich aquò vos-meteis, o que l’avètz copiat d’una font provenent del domeni public, o d’una ressorsa liura.'''UTILIZETZ PAS DE TRABALHS JOS COPYRIGHT SENS AUTORIZACION EXPRÈSSA !'''",
+'copyrightwarning2'                => "Totas las contribucions a {{SITENAME}} pòdon èsser modificadas o suprimidas per d’autres utilizaires. Se desiratz pas que vòstres escriches sián modificats e distribuits a volontat, mercés de los sometre pas aicí.<br /> Tanben nos prometètz qu'avètz escrich aquò vos-meteis, o que l’avètz copiat d’una font provenent del domeni public, o d’una ressorsa liura. (vejatz $1 per mai de detalhs). '''UTILIZETZ PAS DE TRABALHS JOS COPYRIGHT SENS AUTORIZACION EXPRÈSSA !'''",
+'longpagewarning'                  => "'''AVERTIMENT : aquesta pagina a una longor de $1 ko.
+De delà de 32 ko, es preferible per d'unes navigadors de devesir aquesta pagina en seccions mai pichonas. Benlèu deuriatz devesir la pagina en seccions mai pichonas.'''",
+'longpageerror'                    => "'''ERROR: Lo tèxt qu'avètz mandat es de $1 Ko, e despassa doncas lo limit autorizat dels $2 Ko. Lo tèxt pòt pas èsser salvat.'''",
+'readonlywarning'                  => "'''AVERTIMENT : La banca de donadas es estada varrolhada per mantenença, doncas poiretz pas salvar vòstras modificacions ara.
+Podètz copiar lo tèxt dins un fichièr tèxt e lo salvar per mai tard.'''
+
+L’administrator qu'a varrolhat la banca de donadas a balhat l’explicacion seguenta : $1",
+'protectedpagewarning'             => "'''AVERTIMENT : Aquesta pagina es protegida.
+Sols los utilizaires amb l'estatut d'administrator la pòdon modificar. Asseguratz-vos que seguissètz las directivas concernent las paginas protegidas.'''",
 'semiprotectedpagewarning'         => "'''Nòta:''' Aquesta pagina es estada blocada, pòt pas èsser editada que pels utilizaires enregistats.",
 'cascadeprotectedwarning'          => "'''ATENCION :''' Aquesta pagina es estada protegida de biais que sols los administrators pòscan l’editar.
 Aquesta proteccion es estada facha perque aquesta pagina es inclusa dins {{PLURAL:$1|una pagina protegida|de paginas protegidas}} amb la « proteccion en cascada » activada.",
-'titleprotectedwarning'            => '<strong>ATENCION : Aquesta pagina es estada protegida de tal biais que sols cèrts utilizaires pòscan la crear.</strong>',
+'titleprotectedwarning'            => "'''ATENCION : Aquesta pagina es estada protegida de tal biais que sols cèrts utilizaires pòscan la crear.'''",
 'templatesused'                    => 'Modèls utilizats sus aquesta pagina :',
 'templatesusedpreview'             => 'Modèls utilizats dins aquesta previsualizacion :',
 'templatesusedsection'             => 'Modèls utilizats dins aquesta seccion :',
@@ -834,17 +837,30 @@ Podètz tonar en rèire e modificar una pagina existenta, [[Special:UserLogin|vo
 'recreate-deleted-warn'            => "'''Atencion : sètz a tornar crear una pagina qu'es estada suprimida precedentament.'''
 
 Demandatz-vos se es vertadièrament apropriat de la tornar crear en vos referissent al jornal de las supressions afichat çaijós :",
+'deleted-notice'                   => "Aquesta pagina es estat suprimida.
+L'istoric de las supressions es afichat çaijós coma referéncia.",
+'deletelog-fulllog'                => "Veire l'istoric complet",
+'edit-hook-aborted'                => "Modificacion fracassada per croquet.
+Cap d'explicacion pas balhada.",
+'edit-gone-missing'                => 'A pas pogut metre a jorn la pagina.
+Sembla que siá estada suprimida.',
+'edit-conflict'                    => 'Modificar lo conflicte.',
+'edit-no-change'                   => 'Vòstrq modificacion es estada ignorada perque cap de cambiament es pas estat fach dins lo tèxt.',
+'edit-already-exists'              => 'A pas pogut crea una pagina novèla.
+Existís ja.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Atencion : Aquesta pagina conten tròp d’apèls dispendioses de foncions parsaires.
+'expensive-parserfunction-warning'        => 'Atencion : Aquesta pagina conten tròp d’apèls dispendioses de foncions del parser.
 
-Ne deurià aver mens de $2 sul nombre actual $1.',
+I deurià aver mens de {{PLURAL:$2|ampèl|ampèls}}, e actualament {{PLURAL:$1|i a $1 ampèl|i a $1 ampèls}}..',
 'expensive-parserfunction-category'       => 'Paginas amb tròp d’apèls dispendioses de foncions parsaires',
 'post-expand-template-inclusion-warning'  => "Atencion : Aquesta pagina conten tròp d'inclusions de modèls.
 D'unas inclusions seràn pas efectuadas.",
 'post-expand-template-inclusion-category' => "Paginas que contenon tròp d'inclusions de modèls",
 'post-expand-template-argument-warning'   => "Atencion : Aquesta pagina conten al mens un paramètre de modèl que l'inclusion es renduda impossibla. Aprèp extension, aqueste auriá produch un resultat tròp long, doncas, es pas estat inclut.",
 'post-expand-template-argument-category'  => 'Paginas que contenon al mens un paramètre de modèl pas evaluat',
+'parser-template-loop-warning'            => 'Modèl en bocla detectat : [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limit de longor de la recursion del modèl despassat ($1)',
 
 # "Undo" feature
 'undo-success' => "Aquesta modificacion va èsser desfacha. Confirmatz los cambiaments (visibles en bas d'aquesta pagina), puèi salvatz se sètz d’acòrdi. Mercés de motivar l’anullacion dins la bóstia de resumit.",
@@ -859,28 +875,28 @@ D'unas inclusions seràn pas efectuadas.",
 La rason balhada per $3 èra ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Vejatz las operacions per aquesta pagina',
-'nohistory'           => "Existís pas d'istoric per aquesta pagina.",
-'revnotfound'         => 'Version introbabla',
-'revnotfoundtext'     => "La version precedenta d'aquesta pagina a pas pogut èsser retrobada. Verificatz l'URL qu'avètz utilizada per accedir a aquesta pagina.",
-'currentrev'          => 'Version actuala',
-'revisionasof'        => 'Version del $1',
-'revision-info'       => 'Version del $1 per $2',
-'previousrevision'    => '� Version precedenta',
-'nextrevision'        => 'Version seguenta →',
-'currentrevisionlink' => 'vejatz la version correnta',
-'cur'                 => 'actu',
-'next'                => 'seg',
-'last'                => 'darr',
-'page_first'          => 'primièra',
-'page_last'           => 'darrièra',
-'histlegend'          => 'Legenda : ({{MediaWiki:Cur}}) = diferéncia amb la version actuala ,
+'viewpagelogs'           => 'Vejatz las operacions per aquesta pagina',
+'nohistory'              => "Existís pas d'istoric per aquesta pagina.",
+'currentrev'             => 'Version actuala',
+'currentrev-asof'        => 'Version actuala en data del $1',
+'revisionasof'           => 'Version del $1',
+'revision-info'          => 'Version del $1 per $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Version precedenta',
+'nextrevision'           => 'Version seguenta →',
+'currentrevisionlink'    => 'vejatz la version correnta',
+'cur'                    => 'actu',
+'next'                   => 'seg',
+'last'                   => 'darr',
+'page_first'             => 'primièra',
+'page_last'              => 'darrièra',
+'histlegend'             => 'Legenda : ({{MediaWiki:Cur}}) = diferéncia amb la version actuala ,
 ({{MediaWiki:Last}}) = diferéncia amb la version precedenta, <b>m</b> = cambiament menor',
-'deletedrev'          => '[suprimit]',
-'histfirst'           => 'Primièras contribucions',
-'histlast'            => 'Darrièras contribucions',
-'historysize'         => '({{PLURAL:$1|1 octet|$1 octets}})',
-'historyempty'        => '(void)',
+'history-fieldset-title' => "Percórrer l'istoric",
+'deletedrev'             => '[suprimit]',
+'histfirst'              => 'Primièras contribucions',
+'histlast'               => 'Darrièras contribucions',
+'historysize'            => '({{PLURAL:$1|1 octet|$1 octets}})',
+'historyempty'           => '(void)',
 
 # Revision feed
 'history-feed-title'          => 'Istoric de las versions',
@@ -960,6 +976,7 @@ Asseguratz-vos qu'aqueste cambiament pòsca conservar la continuitat de l'istori
 'mergehistory-invalid-destination' => 'La pagina de destinacion deu aver un títol valid.',
 'mergehistory-autocomment'         => '[[:$1]] fusionat amb [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fusionat amb [[:$2]] : $3',
+'mergehistory-same-destination'    => "Las paginas d'origina e de destinacion pòdon pas èsser la meteissa",
 
 # Merge log
 'mergelog'           => 'Istoric de las fusions',
@@ -972,124 +989,204 @@ Asseguratz-vos qu'aqueste cambiament pòsca conservar la continuitat de l'istori
 'difference'              => '(Diferéncias entre las versions)',
 'lineno'                  => 'Linha $1 :',
 'compareselectedversions' => 'Comparar las versions seleccionadas',
+'visualcomparison'        => 'Comparason visuala',
+'wikicodecomparison'      => 'Comparason del wikitèxt',
 'editundo'                => 'desfar',
 'diff-multi'              => '({{PLURAL:$1|Una revision intermediària amagada|$1 revisions intermediàrias amagadas}})',
+'diff-movedto'            => 'desplaçat cap a $1',
+'diff-styleadded'         => 'estil $1 apondut',
+'diff-added'              => '$1 apondut',
+'diff-changedto'          => 'cambiat cap a $1',
+'diff-movedoutof'         => 'desplaçat en defòra de $1',
+'diff-styleremoved'       => 'estil $1 levat',
+'diff-removed'            => '$1 levat',
+'diff-changedfrom'        => 'cambiat dempuèi $1',
+'diff-src'                => 'font',
+'diff-withdestination'    => 'amb la destinacion $1',
+'diff-with'               => '&#32;amb $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'largor',
+'diff-height'             => 'nautor',
+'diff-p'                  => "un '''paragraf'''",
+'diff-blockquote'         => "una '''citacion'''",
+'diff-h1'                 => "una '''entèsta (nivèl 1)'''",
+'diff-h2'                 => "una '''entèsta (nivèl 2)'''",
+'diff-h3'                 => "una '''entèsta (nivèl 3)'''",
+'diff-h4'                 => "una '''entèsta (nivèl 4)'''",
+'diff-h5'                 => "una '''entèsta (nivèl 5)'''",
+'diff-pre'                => "un '''blòt preformatat'''",
+'diff-div'                => "una '''division'''",
+'diff-ul'                 => "una '''tièra pas ordenada'''",
+'diff-ol'                 => "una '''tièra ordenada'''",
+'diff-li'                 => "una '''tièra d’articles'''",
+'diff-table'              => "un '''tablèu'''",
+'diff-tbody'              => "un '''contengut d’un tablèu'''",
+'diff-tr'                 => "una '''linha'''",
+'diff-td'                 => "una '''cellula'''",
+'diff-th'                 => "una '''entèsta'''",
+'diff-br'                 => "una '''rompedura'''",
+'diff-hr'                 => "una '''règla orizontala'''",
+'diff-code'               => "un '''blòt de còde d’ordenador'''",
+'diff-dl'                 => "una '''tièra de definicion'''",
+'diff-dt'                 => "un '''tèrme de definicion'''",
+'diff-dd'                 => "una '''definicion'''",
+'diff-input'              => "una '''entrada'''",
+'diff-form'               => "un '''formulari'''",
+'diff-img'                => "un '''imatge'''",
+'diff-span'               => "una '''portada'''",
+'diff-a'                  => "un '''ligam'''",
+'diff-i'                  => "'''italica'''",
+'diff-b'                  => "'''gras'''",
+'diff-strong'             => "'''fòrt'''",
+'diff-em'                 => "'''emfasi'''",
+'diff-font'               => "'''poliça'''",
+'diff-big'                => "'''grand'''",
+'diff-del'                => "'''suprimit'''",
+'diff-tt'                 => "'''largor fixada'''",
+'diff-sub'                => "'''sosescript'''",
+'diff-sup'                => "'''susescript'''",
+'diff-strike'             => "'''barrat al travèrs'''",
 
 # Search results
-'searchresults'             => 'Resultats de la recèrca',
-'searchresulttext'          => "Per mai d'informacions sus la recèrca dins {{SITENAME}}, vejatz [[{{MediaWiki:Helppage}}|{{int:help}}]].",
-'searchsubtitle'            => "Avètz recercat « '''[[:$1]]''' » ([[Special:Prefixindex/$1|totas las paginas que començan per « $1 »]] | [[Special:WhatLinksHere/$1|totas las paginas qu'an un ligam cap a « $1 »]])",
-'searchsubtitleinvalid'     => 'Avètz recercat « $1 »',
-'noexactmatch'              => "'''Cap de pagina amb lo títol « $1 » existís pas.
+'searchresults'                    => 'Resultats de la recèrca',
+'searchresults-title'              => 'Resultats de la recèrca per « $1 »',
+'searchresulttext'                 => "Per mai d'informacions sus la recèrca dins {{SITENAME}}, vejatz [[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchsubtitle'                   => "Avètz recercat « '''[[:$1]]''' » ([[Special:Prefixindex/$1|totas las paginas que començan per « $1 »]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|totas las paginas qu'an un ligam cap a « $1 »]])",
+'searchsubtitleinvalid'            => 'Avètz recercat « $1 »',
+'noexactmatch'                     => "'''Cap de pagina amb lo títol « $1 » existís pas.
 ''' Podètz [[:$1|crear aqueste article]].",
-'noexactmatch-nocreate'     => "'''I a pas de pagina intitolada « $1 ».'''",
-'toomanymatches'            => 'Tròp d’ocuréncias son estadas trobadas, sètz pregat de sometre una requèsta diferenta.',
-'titlematches'              => "Correspondéncias dins los títols d'articles",
-'notitlematches'            => "Cap de títol d'article correspond pas a la recèrca.",
-'textmatches'               => "Correspondéncias dins los tèxtes d'articles",
-'notextmatches'             => "Cap de tèxt d'article correspond pas a la recèrca",
-'prevn'                     => '$1 precedents',
-'nextn'                     => '$1 seguents',
-'viewprevnext'              => 'Veire ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 mot|$2 mots}})',
-'search-result-score'       => 'Pertinéncia : $1%',
-'search-redirect'           => '(redireccion cap a $1)',
-'search-section'            => '(seccion $1)',
-'search-suggest'            => 'Avètz volgut dire : $1',
-'search-interwiki-caption'  => 'Projèctes fraires',
-'search-interwiki-default'  => '$1 resultats :',
-'search-interwiki-more'     => '(mai)',
-'search-mwsuggest-enabled'  => 'amb suggestions',
-'search-mwsuggest-disabled' => 'sens suggestion',
-'search-relatedarticle'     => 'Relatat',
-'mwsuggest-disable'         => 'Desactivar las suggestions AJAX',
-'searchrelated'             => 'relatat',
-'searchall'                 => 'Totes',
-'showingresults'            => "Afichatge {{PLURAL:$1|d''''1''' resultat|de '''$1''' resultats}} a partir del #'''$2'''.",
-'showingresultsnum'         => "Afichatge {{PLURAL:$3|d''''1''' resultat|de '''$3''' resultats}} a partir del #'''$2'''.",
-'showingresultstotal'       => "Visionament çaijós {{PLURAL:$3|del resultat '''$1''' de '''$3'''|dels resultats de '''$1 - $2''' de '''$3'''}}",
-'nonefound'                 => '<strong>Nòta</strong>: l\'abséncia de resultat es sovent deguda a l\'emplec de tèrmes de recèrca tròp corrents, coma "a" o "de",
-que son pas indexats, o a l\'emplec de mantun tèrme de recèrca (solas las paginas que
-contenon totes los tèrmes apareisson dins los resultats).',
-'powersearch'               => 'Recèrca avançada',
-'powersearch-legend'        => 'Recèrca avançada',
-'powersearch-ns'            => 'Recercar dins los espacis de nom :',
-'powersearch-redir'         => 'Lista de las redireccions',
-'powersearch-field'         => 'Recercar',
-'search-external'           => 'Recèrca extèrna',
-'searchdisabled'            => 'La recèrca sus {{SITENAME}} es desactivada.
+'noexactmatch-nocreate'            => "'''I a pas de pagina intitolada « $1 ».'''",
+'toomanymatches'                   => 'Tròp d’ocuréncias son estadas trobadas, sètz pregat de sometre una requèsta diferenta.',
+'titlematches'                     => "Correspondéncias dins los títols d'articles",
+'notitlematches'                   => "Cap de títol d'article correspond pas a la recèrca.",
+'textmatches'                      => "Correspondéncias dins los tèxtes d'articles",
+'notextmatches'                    => "Cap de tèxt d'article correspond pas a la recèrca",
+'prevn'                            => '$1 precedents',
+'nextn'                            => '$1 seguents',
+'viewprevnext'                     => 'Veire ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opcions de recèrca',
+'searchmenu-exists'                => "* Pagina '''[[$1]]'''",
+'searchmenu-new'                   => "'''Crear la pagina ''[[:$1|$1]]'' sus aqueste wiki !'''",
+'searchhelp-url'                   => 'Help:Acuèlh',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Recercar las paginas amb aqueste prefix]]',
+'searchprofile-articles'           => 'Paginas de contengut',
+'searchprofile-articles-and-proj'  => 'Paginas de contengut e projècte',
+'searchprofile-project'            => 'Paginas del projècte',
+'searchprofile-images'             => 'Fichièrs',
+'searchprofile-everything'         => 'Tot',
+'searchprofile-advanced'           => 'Avançat',
+'searchprofile-articles-tooltip'   => 'Recercar dins $1',
+'searchprofile-project-tooltip'    => 'Recercar dins $1',
+'searchprofile-images-tooltip'     => 'Recercar de fichièrs',
+'searchprofile-everything-tooltip' => 'Recercar dins tot lo contengut (tot incluissent las paginas de discussion)',
+'searchprofile-advanced-tooltip'   => "Recercar dins d'espacis de noms personalizats",
+'prefs-search-nsdefault'           => 'Recèrca en utilizant los espacis de noms per defaut :',
+'prefs-search-nscustom'            => 'Recercar en utilizant los espacis de noms personalizats :',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 mot|$2 mots}})',
+'search-result-score'              => 'Pertinéncia : $1%',
+'search-redirect'                  => '(redireccion cap a $1)',
+'search-section'                   => '(seccion $1)',
+'search-suggest'                   => 'Avètz volgut dire : $1',
+'search-interwiki-caption'         => 'Projèctes fraires',
+'search-interwiki-default'         => '$1 resultats :',
+'search-interwiki-more'            => '(mai)',
+'search-mwsuggest-enabled'         => 'amb suggestions',
+'search-mwsuggest-disabled'        => 'sens suggestion',
+'search-relatedarticle'            => 'Relatat',
+'mwsuggest-disable'                => 'Desactivar las suggestions AJAX',
+'searchrelated'                    => 'relatat',
+'searchall'                        => 'Totes',
+'showingresults'                   => "Afichatge {{PLURAL:$1|d''''1''' resultat|de '''$1''' resultats}} a partir del #'''$2'''.",
+'showingresultsnum'                => "Afichatge {{PLURAL:$3|d''''1''' resultat|de '''$3''' resultats}} a partir del #'''$2'''.",
+'showingresultstotal'              => "Visionament çaijós {{PLURAL:$4|del resultat '''$1''' de '''$3'''|dels resultats de '''$1 - $2''' de '''$3'''}}",
+'nonefound'                        => "<strong>Nòta</strong>: Sonque qualques espacis de noms son recercats per defaut
+Ensajatz en utilizant lo prefix ''all:'' per recercar tot lo contengut (tot incluent las paginas de discussion, los modèls, etc), o utilizatz l'espaci de nom coma prefix.",
+'search-nonefound'                 => 'I a pas cap de resultat correspondent a la requèsta.',
+'powersearch'                      => 'Recèrca avançada',
+'powersearch-legend'               => 'Recèrca avançada',
+'powersearch-ns'                   => 'Recercar dins los espacis de nom :',
+'powersearch-redir'                => 'Lista de las redireccions',
+'powersearch-field'                => 'Recercar',
+'search-external'                  => 'Recèrca extèrna',
+'searchdisabled'                   => 'La recèrca sus {{SITENAME}} es desactivada.
 En esperant la reactivacion, podètz efectuar una recèrca via Google.
 Atencion, lor indexacion de contengut {{SITENAME}} benlèu es pas a jorn.',
 
 # Preferences page
-'preferences'              => 'Preferéncias',
-'mypreferences'            => 'Mas preferéncias',
-'prefs-edits'              => 'Nombre d’edicions :',
-'prefsnologin'             => 'Vos sètz pas identificat(ada)',
-'prefsnologintext'         => 'Vos cal èsser <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} connectat(ada)]</span> per modificar vòstras preferéncias d’utilizaire.',
-'prefsreset'               => 'Las preferéncias son estadas restablidas a partir de la version enregistrada.',
-'qbsettings'               => "Barra d'espleches",
-'qbsettings-none'          => 'Cap',
-'qbsettings-fixedleft'     => 'Esquèrra',
-'qbsettings-fixedright'    => 'Drecha',
-'qbsettings-floatingleft'  => 'Flotanta a esquèrra',
-'qbsettings-floatingright' => 'Flotanta a drecha',
-'changepassword'           => 'Modificacion del senhal',
-'skin'                     => 'Aparéncia',
-'math'                     => 'Rendut de las matas',
-'dateformat'               => 'Format de data',
-'datedefault'              => 'Cap de preferéncia',
-'datetime'                 => 'Data e ora',
-'math_failure'             => 'Error matas',
-'math_unknown_error'       => 'error indeterminada',
-'math_unknown_function'    => 'foncion desconeguda',
-'math_lexing_error'        => 'error lexicala',
-'math_syntax_error'        => 'error de sintaxi',
-'math_image_error'         => 'La conversion en PNG a pas capitat ; verificatz l’installacion de Latex, dvips, gs e convert',
-'math_bad_tmpdir'          => 'Impossible de crear o d’escriure dins lo repertòri math temporari',
-'math_bad_output'          => 'Impossible de crear o d’escriure dins lo repertòri math de sortida',
-'math_notexvc'             => 'L’executable « texvc » es introbable. Legissètz math/README per lo configurar.',
-'prefs-personal'           => 'Entresenhas personalas',
-'prefs-rc'                 => 'Darrièrs cambiaments',
-'prefs-watchlist'          => 'Lista de seguit',
-'prefs-watchlist-days'     => "Nombre de jorns d'afichar dins la lista de seguit :",
-'prefs-watchlist-edits'    => "Nombre de modificacions d'afichar dins la lista de seguit espandida :",
-'prefs-misc'               => 'Preferéncias divèrsas',
-'saveprefs'                => 'Enregistrar las preferéncias',
-'resetprefs'               => 'Restablir las preferéncias',
-'oldpassword'              => 'Senhal ancian :',
-'newpassword'              => 'Senhal novèl :',
-'retypenew'                => 'Confirmar lo senhal novèl :',
-'textboxsize'              => 'Fenèstra de modificacion',
-'rows'                     => 'Rengadas :',
-'columns'                  => 'Colomnas :',
-'searchresultshead'        => 'Recèrca',
-'resultsperpage'           => 'Nombre de responsas per pagina :',
-'contextlines'             => 'Nombre de linhas per responsa :',
-'contextchars'             => 'Nombre de caractèrs de contèxt per linha :',
-'stub-threshold'           => 'Limita superiora pels <a href="#" class="stub">ligams cap als esbòsses</a> (octets) :',
-'recentchangesdays'        => "Nombre de jorns d'afichar dins los darrièrs cambiaments :",
-'recentchangescount'       => "Nombre de modificacions d'afichar dins los darrièrs cambiaments :",
-'savedprefs'               => 'Las preferéncias son estadas salvadas.',
-'timezonelegend'           => 'Zòna orària',
-'timezonetext'             => '¹Nombre d’oras de decalatge entre vòstra ora locala e l’ora del servidor (UTC).',
-'localtime'                => 'Ora locala',
-'timezoneoffset'           => 'Decalatge orari¹ :',
-'servertime'               => 'Ora del servidor',
-'guesstimezone'            => 'Utilizar la valor del navigador',
-'allowemail'               => 'Autorizar lo mandadís de corrièr electronic venent d’autres utilizaires',
-'prefs-searchoptions'      => 'Opcions de recèrca',
-'prefs-namespaces'         => 'Noms d’espacis',
-'defaultns'                => 'Per defaut, recercar dins aquestes espacis :',
-'default'                  => 'defaut',
-'files'                    => 'Fichièrs',
+'preferences'               => 'Preferéncias',
+'mypreferences'             => 'Mas preferéncias',
+'prefs-edits'               => 'Nombre d’edicions :',
+'prefsnologin'              => 'Vos sètz pas identificat(ada)',
+'prefsnologintext'          => 'Vos cal èsser <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} connectat(ada)]</span> per modificar vòstras preferéncias d’utilizaire.',
+'prefsreset'                => 'Las preferéncias son estadas restablidas a partir de la version enregistrada.',
+'qbsettings'                => "Barra d'espleches",
+'qbsettings-none'           => 'Cap',
+'qbsettings-fixedleft'      => 'Esquèrra',
+'qbsettings-fixedright'     => 'Drecha',
+'qbsettings-floatingleft'   => 'Flotanta a esquèrra',
+'qbsettings-floatingright'  => 'Flotanta a drecha',
+'changepassword'            => 'Modificacion del senhal',
+'skin'                      => 'Aparéncia',
+'skin-preview'              => 'Previsualizar',
+'math'                      => 'Rendut de las matas',
+'dateformat'                => 'Format de data',
+'datedefault'               => 'Cap de preferéncia',
+'datetime'                  => 'Data e ora',
+'math_failure'              => 'Error matas',
+'math_unknown_error'        => 'error indeterminada',
+'math_unknown_function'     => 'foncion desconeguda',
+'math_lexing_error'         => 'error lexicala',
+'math_syntax_error'         => 'error de sintaxi',
+'math_image_error'          => 'La conversion en PNG a pas capitat ; verificatz l’installacion de Latex, dvips, gs e convert',
+'math_bad_tmpdir'           => 'Impossible de crear o d’escriure dins lo repertòri math temporari',
+'math_bad_output'           => 'Impossible de crear o d’escriure dins lo repertòri math de sortida',
+'math_notexvc'              => 'L’executable « texvc » es introbable. Legissètz math/README per lo configurar.',
+'prefs-personal'            => 'Entresenhas personalas',
+'prefs-rc'                  => 'Darrièrs cambiaments',
+'prefs-watchlist'           => 'Lista de seguit',
+'prefs-watchlist-days'      => "Nombre de jorns d'afichar dins la lista de seguit :",
+'prefs-watchlist-days-max'  => '(maximum 7 jorns)',
+'prefs-watchlist-edits'     => "Nombre de modificacions d'afichar dins la lista de seguit espandida :",
+'prefs-watchlist-edits-max' => '(nombre maximum : 1000)',
+'prefs-misc'                => 'Preferéncias divèrsas',
+'prefs-resetpass'           => 'Modificar lo senhal',
+'saveprefs'                 => 'Enregistrar las preferéncias',
+'resetprefs'                => 'Restablir las preferéncias',
+'textboxsize'               => 'Fenèstra de modificacion',
+'prefs-edit-boxsize'        => 'Talha de la fenèstra de modificacion.',
+'rows'                      => 'Rengadas :',
+'columns'                   => 'Colomnas :',
+'searchresultshead'         => 'Recèrca',
+'resultsperpage'            => 'Nombre de responsas per pagina :',
+'contextlines'              => 'Nombre de linhas per responsa :',
+'contextchars'              => 'Nombre de caractèrs de contèxt per linha :',
+'stub-threshold'            => 'Limita superiora pels <a href="#" class="stub">ligams cap als esbòsses</a> (octets) :',
+'recentchangesdays'         => "Nombre de jorns d'afichar dins los darrièrs cambiaments :",
+'recentchangesdays-max'     => '(maximum $1 {{PLURAL:$1|jorn|jorns}})',
+'recentchangescount'        => "Nombre de modificacions d'afichar dins los darrièrs cambiaments, paginas d'istorics e d'operacions, per defaut :",
+'savedprefs'                => 'Las preferéncias son estadas salvadas.',
+'timezonelegend'            => 'Zòna orària',
+'timezonetext'              => '¹Nombre d’oras de decalatge entre vòstra ora locala e l’ora del servidor (UTC).',
+'localtime'                 => 'Ora locala :',
+'timezoneselect'            => 'Zòna orària :',
+'timezoneuseserverdefault'  => 'Utilizar la valor del servidor',
+'timezoneuseoffset'         => 'Autre (especificar lo descalatge)',
+'timezoneoffset'            => 'Decalatge orari¹ :',
+'servertime'                => 'Ora del servidor :',
+'guesstimezone'             => 'Utilizar la valor del navigador',
+'allowemail'                => 'Autorizar lo mandadís de corrièr electronic venent d’autres utilizaires',
+'prefs-searchoptions'       => 'Opcions de recèrca',
+'prefs-namespaces'          => 'Noms d’espacis',
+'defaultns'                 => 'Per defaut, recercar dins aquestes espacis :',
+'default'                   => 'defaut',
+'files'                     => 'Fichièrs',
 
 # User rights
 'userrights'                  => "Gestion dels dreches d'utilizaire", # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => "Gestion dels dreches d'utilizaire",
 'userrights-user-editname'    => 'Entrar un nom d’utilizaire :',
 'editusergroup'               => "Modificacion dels gropes d'utilizaires",
-'editinguser'                 => "Cambiament dels dreches de l'utilizaire '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Cambiament dels dreches de l'utilizaire '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modificar los gropes de l’utilizaire',
 'saveusergroups'              => "Salvar los gropes d'utilizaires",
 'userrights-groupsmember'     => 'Membre de :',
@@ -1138,6 +1235,8 @@ Atencion, lor indexacion de contengut {{SITENAME}} benlèu es pas a jorn.',
 'right-minoredit'            => 'Marcar de cambiaments coma menors',
 'right-move'                 => 'Tornar nomenar de paginas',
 'right-move-subpages'        => 'Desplaçar de paginas amb lor sospaginas',
+'right-move-rootuserpages'   => 'Tornar nomenar las paginas de l’utilizaire de banca.',
+'right-movefile'             => 'Desplaçar los fichièrs',
 'right-suppressredirect'     => 'Crear pas de redireccion dempuèi la pagina anciana en renomenant la pagina',
 'right-upload'               => 'Telecargar de fichièrs',
 'right-reupload'             => 'Espotir un fichièr existent',
@@ -1188,13 +1287,50 @@ Atencion, lor indexacion de contengut {{SITENAME}} benlèu es pas a jorn.',
 'rightslogentry' => 'a modificat los dreches de l’utilizaire « $1 » de $2 a $3',
 'rightsnone'     => '(cap)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'legir aquesta pagina',
+'action-edit'                 => 'modificar aquesta pagina',
+'action-createpage'           => 'crear de paginas',
+'action-createtalk'           => 'crear de pagina de discussion',
+'action-createaccount'        => "crear aqueste compte d'utilizaire",
+'action-minoredit'            => 'marcar aqueste cambiament coma menor',
+'action-move'                 => 'tornar nomenar aquesta pagina',
+'action-move-subpages'        => 'tornar nomenar aquesta pagina e sas sospaginas',
+'action-move-rootuserpages'   => 'tornar nomenar las paginas de l’utilizaire de banca.',
+'action-movefile'             => 'tornar nomenar aqueste fichièr',
+'action-upload'               => 'importar aqueste fichièr',
+'action-reupload'             => 'espotir aqueste fichièr existent',
+'action-reupload-shared'      => 'passar otra aqueste fichièr sus un depaus partejat',
+'action-upload_by_url'        => 'importar aqueste fichièr a partir d’una adreça internet',
+'action-writeapi'             => 'utilizar l‘API d’escritura',
+'action-delete'               => 'suprimir aquesta pagina',
+'action-deleterevision'       => 'suprimir aquesta version',
+'action-deletedhistory'       => "veire l’istoric suprimit d'aquesta pagina",
+'action-browsearchive'        => 'recercar de paginas suprimidas',
+'action-undelete'             => 'restablir aquesta pagina',
+'action-suppressrevision'     => 'tornar veire e restablir aquesta version suprimida',
+'action-suppressionlog'       => 'veire aqueste jornal privat',
+'action-block'                => 'blocar aqueste utilizaire a l’edicion',
+'action-protect'              => 'modificar los nivèls de proteccion per aquesta pagina',
+'action-import'               => 'importar aquesta pagina a partir d’un autre wiki',
+'action-importupload'         => 'importar aquesta pagina e partir de l’impòrt d’un fichièr',
+'action-patrol'               => 'marcar la modificacion dels autres coma patrolhada',
+'action-autopatrol'           => 'aver vòstra modificacion marcada coma patrolhada',
+'action-unwatchedpages'       => 'visionar la lista de las paginas pas susvelhadas',
+'action-trackback'            => 'sometre un extrach',
+'action-mergehistory'         => "fusionar l’istoric d'aquesta pagina",
+'action-userrights'           => 'modificar totes los dreches d’utilizaire',
+'action-userrights-interwiki' => 'modificar los dreches d’utilizaire e los sus d’autres wikis',
+'action-siteadmin'            => 'varrolhar o desvarrolhar la banca de donadas',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|cambiament|cambiaments}}',
 'recentchanges'                     => 'Darrièrs cambiaments',
+'recentchanges-legend'              => 'Opcions dels darrièrs cambiaments',
 'recentchangestext'                 => 'Vaquí sus aquesta pagina, los darrièrs cambiaments de {{SITENAME}}.',
 'recentchanges-feed-description'    => "Seguissètz los darrièrs cambiaments d'aqueste wiki dins un flus.",
 'rcnote'                            => 'Vaquí {{PLURAL:$1|lo darrièr cambiament|los $1 darrièrs cambiaments}} dempuèi {{PLURAL:$2|lo darrièr jorn|los <b>$2</b> darrièrs jorns}}, determinat{{PLURAL:$1||s}} lo $4, a $5.',
-'rcnotefrom'                        => "Vaquí los cambiaments efectuats dempuèi lo '''$2''' ('''$1''' al maximom).",
+'rcnotefrom'                        => "Vaquí los cambiaments efectuats dempuèi lo '''$2''' ('''$1''' al maximum).",
 'rclistfrom'                        => 'Afichar las modificacions novèlas dempuèi lo $1.',
 'rcshowhideminor'                   => '$1 cambiaments menors',
 'rcshowhidebots'                    => '$1 robòts',
@@ -1214,6 +1350,8 @@ Atencion, lor indexacion de contengut {{SITENAME}} benlèu es pas a jorn.',
 'rc_categories'                     => 'Limit de las categorias (separacion amb « | »)',
 'rc_categories_any'                 => 'Totas',
 'newsectionsummary'                 => '/* $1 */ seccion novèla',
+'rc-enhanced-expand'                => 'Vejatz los detalhs (necessita JavaScript)',
+'rc-enhanced-hide'                  => 'Amagar los detalhs',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Seguit dels ligams',
@@ -1235,11 +1373,11 @@ per copiar de fichièrs sul servidor.',
 'upload_directory_read_only'  => 'Lo servidor Web pòt escriure dins lo dorsièr cibla ($1).',
 'uploaderror'                 => 'Error',
 'uploadtext'                  => "Utilizatz lo formulari çaijós per importar de fichièrs sul servidor.
-Per veire o recercar d'imatges precedentament mandats, consultatz [[Special:ImageList|la tièra dels imatges]]. Las còpias e las supressions tanben son enregistradas dins l'[[Special:Log/upload|istoric dels impòrts]], les supressions dins l’[[Special:Log/delete|istoric de las supressions]].
+Per veire o recercar d'imatges precedentament mandats, consultatz [[Special:FileList|la tièra dels imatges]]. Las còpias e las supressions tanben son enregistradas dins l'[[Special:Log/upload|istoric dels impòrts]], les supressions dins l’[[Special:Log/delete|istoric de las supressions]].
 
 Per enclure un imatge dins una pagina, utilizatz un ligam de la forma
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:fichièr.jpg]]</nowiki></tt>''',
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:fichièr.png|200px|thumb|left|tèxt descriptiu]]</nowiki></tt>''' per utilizar una miniatura de 200 pixèls de larg dins una bóstia a esquèrra amb 'tèxt descriptiu' coma descripcion
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:fichièr.jpg]]</nowiki></tt>''',
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:fichièr.png|200px|thumb|left|tèxt descriptiu]]</nowiki></tt>''' per utilizar una miniatura de 200 pixèls de larg dins una bóstia a esquèrra amb 'tèxt descriptiu' coma descripcion
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:fichièr.ogg]]</nowiki></tt>''' per ligar dirèctament cap al fichièr sens l'afichar.",
 'upload-permitted'            => 'Formats de fichièrs autorizats : $1.',
 'upload-preferred'            => 'Formats de fichièrs preferits : $1.',
@@ -1247,7 +1385,7 @@ Per enclure un imatge dins una pagina, utilizatz un ligam de la forma
 'uploadlog'                   => 'Istoric de las importacions',
 'uploadlogpage'               => 'Istoric de las importacions de fichièrs multimèdia',
 'uploadlogpagetext'           => 'Vaquí la tièra dels darrièrs fichièrs copiats sul servidor.
-Vejatz la [[Special:NewImages|galariá dels imatges novèls]] per una presentacion mai visuala.',
+Vejatz la [[Special:NewFiles|galariá dels imatges novèls]] per una presentacion mai visuala.',
 'filename'                    => 'Nom del fichièr',
 'filedesc'                    => 'Descripcion',
 'fileuploadsummary'           => 'Resumit :',
@@ -1267,23 +1405,25 @@ Vejatz la [[Special:NewImages|galariá dels imatges novèls]] per una presentaci
 {{PLURAL:\$3|Lo qu'es acceptat es|Los que son acceptats son}} \$2.",
 'filetype-missing'            => "Lo fichièr a pas cap d'extension (coma « .jpg » per exemple).",
 'large-file'                  => 'Los fichièrs importats deurián pas èsser mai gros que $1 ; aqueste fichièr fa $2.',
-'largefileserver'             => "La talha d'aqueste fichièr es superiora al maximom autorizat.",
+'largefileserver'             => "La talha d'aqueste fichièr es superiora al maximum autorizat.",
 'emptyfile'                   => 'Lo fichièr que volètz importar sembla void. Aquò pòt èsser degut a una error dins lo nom del fichièr. Verificatz que desiratz vertadièrament copiar aqueste fichièr.',
-'fileexists'                  => 'Un fichièr amb aqueste nom existís ja. Mercé de verificar <strong><tt>$1</tt></strong>. Sètz segur de voler modificar aqueste fichièr ?',
-'filepageexists'              => "La pagina de descripcion per aqueste fichièr ja es estada creada aicí <strong><tt>$1</tt></strong>, mas cap de fichièr d'aqueste nom existís pas actualament. Lo resumit qu'anatz escriure remplaçarà pas lo tèxt precedent ; per aquò far, deuretz editar manualament la pagina.",
+'fileexists'                  => "Un fichièr amb aqueste nom existís ja. Mercé de verificar '''<tt>$1</tt>'''. Sètz segur de voler modificar aqueste fichièr ?",
+'filepageexists'              => "La pagina de descripcion per aqueste fichièr ja es estada creada aicí '''<tt>$1</tt>''', mas cap de fichièr d'aqueste nom existís pas actualament. Lo resumit qu'anatz escriure remplaçarà pas lo tèxt precedent ; per aquò far, deuretz editar manualament la pagina.",
 'fileexists-extension'        => "Un fichièr amb un nom similar existís ja :<br />
-Nom del fichièr d'importar : <strong><tt>$1</tt></strong><br />
-Nom del fichièr existent : <strong><tt>$2</tt></strong><br />
+Nom del fichièr d'importar : '''<tt>$1</tt>'''<br />
+Nom del fichièr existent : '''<tt>$2</tt>'''<br />
 la sola diferéncia es la cassa (majusculas / minusculas) de l’extension. Verificatz que lo fichièr es diferent e cambiatz son nom.",
 'fileexists-thumb'            => "<center>'''Imatge existent'''</center>",
-'fileexists-thumbnail-yes'    => 'Lo fichièr sembla èsser un imatge en talha reducha <i>(thumbnail)</i>. Verificatz lo fichièr <strong><tt>$1</tt></strong>.<br /> Se lo fichièr verificat es lo meteis imatge (dins una resolucion melhora), es pas de besonh d’importar una version reducha.',
-'file-thumbnail-no'           => 'Lo nom del fichièr comença per <strong><tt>$1</tt></strong>.
-Es possible que s’agisca d’una version reducha <i>(miniatura)</i>.
-Se dispausatz del fichièr en resolucion nauta, importatz-lo, si que non cambiatz lo nom del fichièr.',
-'fileexists-forbidden'        => 'Un fichièr amb aqueste nom existís ja ; mercé de tornar en arrièr e de copiar lo fichièr jos un nom novèl. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Lo fichièr sembla èsser un imatge en talha reducha ''(thumbnail)''. Verificatz lo fichièr '''<tt>$1</tt>'''.<br /> Se lo fichièr verificat es lo meteis imatge (dins una resolucion melhora), es pas de besonh d’importar una version reducha.",
+'file-thumbnail-no'           => "Lo nom del fichièr comença per '''<tt>$1</tt>'''.
+Es possible que s’agisca d’una version reducha ''(miniatura)''.
+Se dispausatz del fichièr en resolucion nauta, importatz-lo, si que non cambiatz lo nom del fichièr.",
+'fileexists-forbidden'        => "Un fichièr amb aqueste nom existís ja e pòt pas èsser espotit.
+Se volètz totjorn importar aquel fichièr, mercé de tornar en arrièr e d'utilizar un nom novèl. [[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => "Un fichièr amb lo meteis nom existís ja dins la banca de donadas comuna.
-S'o volètz importar tornamai, tornatz en rèire e importatz-lo jos un autre nom. [[Image:$1|thumb|center|$1]]",
+S'o volètz importar tornamai, tornatz en rèire e importatz-lo jos un autre nom. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Aqueste fichièr es un doble {{PLURAL:$1|del fichièr seguent|dels fichièrs seguents}} :',
+'file-deleted-duplicate'      => "Un fichièr identic a aqueste ([[$1]]) ja es estat suprimit. Vos caldriá verificar lo jornal de las supressions d'aqueste fichièr abans de la tornar telecargar.",
 'successfulupload'            => 'Importacion capitada',
 'uploadwarning'               => 'Atencion !',
 'savefile'                    => 'Salvar lo fichièr',
@@ -1302,7 +1442,7 @@ S'o volètz importar tornamai, tornatz en rèire e importatz-lo jos un autre nom
 'upload-wasdeleted'           => "'''Atencion : Sètz a importar un fichièr que ja es estat suprimit deperabans.'''
 
 Deuriatz considerar se es oportun de contunhar l'impòrt d'aqueste fichièr. Lo jornal de las supressions vos donarà los elements d'informacion.",
-'filename-bad-prefix'         => 'Lo nom del fichièr qu\'importatz comença per <strong>"$1"</strong> qu\'es un nom generalament donat pels aparelhs de fòto numerica e que decritz pas lo fichièr. Causissetz un nom de fichièr descrivent vòstre fichièr.',
+'filename-bad-prefix'         => "Lo nom del fichièr qu'importatz comença per '''\"\$1\"''' qu'es un nom generalament donat pels aparelhs de fòto numerica e que decritz pas lo fichièr. Causissetz un nom de fichièr descrivent vòstre fichièr.",
 'filename-prefix-blacklist'   => ' #<!-- daissatz aquesta linha coma es --> <pre>
 # La sintaxi es la seguenta :
 #   * Tot çò que seguís lo caractèr "#" fins a la fin de la linha es un comentari
@@ -1339,20 +1479,21 @@ Se lo problèma persistís, contactatz un [[Special:ListUsers/sysop|administrato
 'upload_source_url'  => ' (una URL valida e accessibla publicament)',
 'upload_source_file' => ' (un fichièr sus vòstre ordenador)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Aquesta pagina especiala mòstra totes los fichièrs importats.
+# Special:ListFiles
+'listfiles-summary'     => 'Aquesta pagina especiala mòstra totes los fichièrs importats.
 Per defaut, las darrièrs fichièrs importats son afichats en naut de la lista.
 Un clic en tèsta de colomna càmbia l’òrdre d’afichatge.',
-'imagelist_search_for'  => 'Recèrca del mèdia nomenat :',
+'listfiles_search_for'  => 'Recèrca del mèdia nomenat :',
 'imgfile'               => 'fichièr',
-'imagelist'             => 'Lista dels imatges',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nom',
-'imagelist_user'        => 'Utilizaire',
-'imagelist_size'        => 'Talha (en octets)',
-'imagelist_description' => 'Descripcion',
-
-# Image description page
+'listfiles'             => 'Lista dels imatges',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nom',
+'listfiles_user'        => 'Utilizaire',
+'listfiles_size'        => 'Talha (en octets)',
+'listfiles_description' => 'Descripcion',
+'listfiles_count'       => 'Versions',
+
+# File description page
 'filehist'                       => 'Istoric del fichièr',
 'filehist-help'                  => 'Clicar sus una data e una ora per veire lo fichièr tal coma èra a aqueste moment',
 'filehist-deleteall'             => 'suprimir tot',
@@ -1360,16 +1501,22 @@ Un clic en tèsta de colomna càmbia l’òrdre d’afichatge.',
 'filehist-revert'                => 'revocar',
 'filehist-current'               => 'actual',
 'filehist-datetime'              => 'Data e ora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura per la version del $1',
+'filehist-nothumb'               => 'Pas de miniatura',
 'filehist-user'                  => 'Utilizaire',
 'filehist-dimensions'            => 'Dimensions',
 'filehist-filesize'              => 'Talha del fichièr',
 'filehist-comment'               => 'Comentari',
-'imagelinks'                     => "Paginas que contenon l'imatge",
+'imagelinks'                     => 'Paginas que contenon lo fichièr',
 'linkstoimage'                   => '{{PLURAL:$1|La pagina çaijós compòrta|Las paginas çaijós compòrtan}} aqueste imatge :',
+'linkstoimage-more'              => 'Mai {{PLURAL:$1|d’un ligam de pagina|de $1 ligams de paginas}} cap a aqueste fichièr.
+La tièra seguenta aficha {{PLURAL:$1|lo primièr ligam de pagina|los $1 primièrs ligams de pagina}} unicament cap a aqueste fichièr.
+Una [[Special:WhatLinksHere/$2|tièra completa]] es disponibla.',
 'nolinkstoimage'                 => 'Cap de pagina compòrta pas de ligam cap a aqueste imatge.',
 'morelinkstoimage'               => 'Vejatz [[Special:WhatLinksHere/$1|mai de ligams]] cap a aqueste imatge.',
 'redirectstofile'                => '{{PLURAL:$1|Lo fichièr seguent redirigís|Los fichièrs seguents redirigisson}} cap a aqueste fichièr :',
-'duplicatesoffile'               => "{{PLURAL:$1|Lo fichièr seguent es un duplicata|Los fichièrs seguents son de duplicatas}} d'aqueste :",
+'duplicatesoffile'               => "{{PLURAL:$1|Lo fichièr seguent es un duplicata|Los fichièrs seguents son de duplicatas}} d'aqueste fichièr ([[Special:FileDuplicateSearch/$2|mai de detalhs]]):",
 'sharedupload'                   => 'Aqueste fichièr es partejat e pòt èsser utilizat per d’autres projèctes.',
 'shareduploadwiki'               => 'Reportatz-vos a la $1 per mai d’informacion.',
 'shareduploadwiki-desc'          => 'La descripcion de sa $1 dins lo repertòri partejat es afichada çaijós.',
@@ -1396,7 +1543,7 @@ Un clic en tèsta de colomna càmbia l’òrdre d’afichatge.',
 # File deletion
 'filedelete'                  => 'Suprimir $1',
 'filedelete-legend'           => 'Suprimir lo fichièr',
-'filedelete-intro'            => "Sètz a suprimir '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Sètz a suprimir '''[[Media:$1|$1]]''' amb tot son istoric.",
 'filedelete-intro-old'        => "Sètz a escafar la version de '''[[Media:$1|$1]]''' del [$4 $2 a $3].",
 'filedelete-comment'          => "Motiu de l'escafament :",
 'filedelete-submit'           => 'Suprimir',
@@ -1404,7 +1551,6 @@ Un clic en tèsta de colomna càmbia l’òrdre d’afichatge.',
 'filedelete-success-old'      => "La version de '''[[Media:$1|$1]]''' del $2 a $3 es estada suprimida.",
 'filedelete-nofile'           => "'''$1''' existís pas.",
 'filedelete-nofile-old'       => "Existís pas cap de version archivada de '''$1''' amb los atributs indicats.",
-'filedelete-iscurrent'        => "Sètz a ensajar de suprimir la version mai recenta d'aqueste fichièr. Vos cal, deperabans, restablir una version anciana d'aqueste.",
 'filedelete-otherreason'      => 'Rason diferenta/suplementària :',
 'filedelete-reason-otherlist' => 'Autra rason',
 'filedelete-reason-dropdown'  => '*Motius de supression costumièrs
@@ -1432,30 +1578,31 @@ Doblidetz pas de verificar se i a pas d’autre ligam cap als modèls abans de l
 
 # Random page
 'randompage'         => "Una pagina a l'azard",
-'randompage-nopages' => 'I a pas cap de pagina dins aqueste espaci de nom.',
+'randompage-nopages' => "I a pas cap de pagina dins l'espaci de nom « $1 ».",
 
 # Random redirect
 'randomredirect'         => "Una pagina de redireccion a l'azard",
-'randomredirect-nopages' => 'I a pas cap de redireccion dins aqueste espaci de nom.',
+'randomredirect-nopages' => "I a pas cap de redireccion dins l'espaci de nom « $1 ».",
 
 # Statistics
-'statistics'             => 'Estatisticas',
-'sitestats'              => 'Estatisticas de {{SITENAME}}',
-'userstats'              => "Estatisticas d'utilizaire",
-'sitestatstext'          => "La banca de donadas conten actualament <b>{{PLURAL:\$1|'''1''' pagina|'''\$1''' paginas}}</b>.
-
-Aquesta chifra inclutz las paginas \"discussion\", las paginas relativas a {{SITENAME}}, las paginas minimalas (\"esbòsses\"),  las paginas de redireccion, e mai d'autras paginas que pòdon sens dobte pas èsser consideradas coma d'articles.
-Se s'exclutz aquestes paginas,  <b>{{PLURAL:\$2|'''\$2''' pagina es probablament un article vertadièr|'''\$2''' paginas son probablament d'articles vertadièrs}}.
-
-{{PLURAL:\$8|'''\$8''' fichièr es estat telecargat|'''\$8''' fichièrs son estats telecargats}}.
-
-{{PLURAL:\$3|'''1''' pagina es estada consultada|'''\$3''' paginas son estadas consultadas}} e {{PLURAL:\$4| '''1''' pagina modificada|'''\$4''' paginas modificadas}}.
-
-Aquò representa una mejana de {{PLURAL:\$5|'''\$5''' modificacion|'''\$5''' modificacions}} per pagina e de {{PLURAL:\$6|'''\$6''' consultacion|'''\$6''' consultacions}} per una modificacion.
-
-I a {{PLURAL:\$7|'''\$7''' article|'''\$7''' articles}} dins [http://www.mediawiki.org/wiki/Manual:Job_queue la fila de prètzfaches].",
-'userstatstext'          => "I a {{PLURAL:$1|'''$1''' [[Special:ListUsers|utilizaire enregistrat]]. I a '''$2''' (o '''$4%''') que es|'''$1''' [[Special:ListUsers|utilizaires enregistrats]]. Demest eles, '''$2''' (o '''$4%''') son}} $5.",
-'statistics-mostpopular' => 'Paginas mai consultadas',
+'statistics'                   => 'Estatisticas',
+'statistics-header-pages'      => 'Estatisticas de las paginas',
+'statistics-header-edits'      => 'Estatisticas sus las edicions',
+'statistics-header-views'      => 'Estatisticas sus las visitas',
+'statistics-header-users'      => "Estatisticas d'utilizaire",
+'statistics-articles'          => 'Paginas de contengut',
+'statistics-pages'             => 'Paginas',
+'statistics-pages-desc'        => 'Totas las paginas del wiki, enclusas las paginas de discussion, las redireccions, ...',
+'statistics-files'             => 'Fichièrs importats',
+'statistics-edits'             => 'Modificacions de paginas dempuèi que {{SITENAME}} foguèt installat',
+'statistics-edits-average'     => 'Modificacions mejanas per pagina',
+'statistics-views-total'       => 'Visitas totalas',
+'statistics-views-peredit'     => 'Visitas per modificacions',
+'statistics-jobqueue'          => 'Longor de la [http://www.mediawiki.org/wiki/Manual:Job_queue lista d’espèra de tractament]',
+'statistics-users'             => '[[Special:ListUsers|Utilizaires]] enregistrats',
+'statistics-users-active'      => 'Utilizaires actius',
+'statistics-users-active-desc' => "Utilizaires qu'an fach al mens una accion durant {{PLURAL:$1|lo darrièr jorn|los $1 darrièrs jorns}}",
+'statistics-mostpopular'       => 'Paginas mai consultadas',
 
 'disambiguations'      => "Paginas d'omonimia",
 'disambiguationspage'  => 'Template:Omonimia',
@@ -1469,7 +1616,7 @@ Una pagina es tractada coma una pagina d’omonimia s'utiliza un modèl qu'es li
 'double-redirect-fixer'      => 'Corrector de redireccion',
 
 'brokenredirects'        => 'Redireccions copadas',
-'brokenredirectstext'    => "Aquestas redireccions mènan a una pagina qu'existís pas.",
+'brokenredirectstext'    => "Aquestas redireccions mènan cap a de paginas qu'existisson pas :",
 'brokenredirects-edit'   => '(modificar)',
 'brokenredirects-delete' => '(suprimir)',
 
@@ -1499,26 +1646,30 @@ Una pagina es tractada coma una pagina d’omonimia s'utiliza un modèl qu'es li
 'popularpages'            => 'Paginas mai consultadas',
 'wantedcategories'        => 'Categorias mai demandadas',
 'wantedpages'             => 'Paginas mai demandadas',
-'missingfiles'            => 'Fichièrs mancants',
+'wantedfiles'             => 'Fichièrs desirats',
+'wantedtemplates'         => 'Modèls demandats',
 'mostlinked'              => 'Paginas mai ligadas',
 'mostlinkedcategories'    => 'Categorias mai utilizadas',
 'mostlinkedtemplates'     => 'Modèls mai utilizats',
 'mostcategories'          => 'Articles utilizant mai de categorias',
 'mostimages'              => 'Fichièrs mai utilizats',
 'mostrevisions'           => 'Articles mai modificats',
-'prefixindex'             => 'Totas las paginas per primièras letras',
+'prefixindex'             => 'Totas las paginas que començan per…',
 'shortpages'              => 'Paginas brèvas',
 'longpages'               => 'Paginas longas',
 'deadendpages'            => "Paginas sul camin d'enlòc",
 'deadendpagestext'        => 'Las paginas seguentas contenon pas cap de ligam cap a d’autras paginas de {{SITENAME}}.',
 'protectedpages'          => 'Paginas protegidas',
 'protectedpages-indef'    => 'Unicament las proteccions permanentas',
+'protectedpages-cascade'  => 'Unicament las proteccions en cascada',
 'protectedpagestext'      => 'Las paginas seguentas son protegidas contra las modificacions e/o lo cambiament de nom :',
 'protectedpagesempty'     => 'Cap de pagina es pas protegida actualament.',
 'protectedtitles'         => 'Títols protegits',
 'protectedtitlestext'     => 'Los títols seguents son protegits a la creacion',
 'protectedtitlesempty'    => 'Cap de títol es pas actualament protegit amb aquestes paramètres.',
 'listusers'               => 'Lista dels participants',
+'listusers-editsonly'     => "Mostrar pas que los utilizaires qu'an al mens una contribucion",
+'usereditcount'           => '$1 {{PLURAL:$1|cambiament|cambiaments}}',
 'newpages'                => 'Paginas novèlas',
 'newpages-username'       => "Nom d'utilizaire :",
 'ancientpages'            => 'Articles mai ancians',
@@ -1540,14 +1691,13 @@ Una pagina es tractada coma una pagina d’omonimia s'utiliza un modèl qu'es li
 'booksources-isbn'          => 'ISBN :',
 'booksources-go'            => 'Validar',
 'booksources-text'          => "Vaquí una lista de ligams cap a d’autres sits que vendon de libres nous e d’occasion e sulsquals trobarètz benlèu d'entresenhas suls obratges que cercatz. {{SITENAME}} es pas ligada a cap d'aquestas societats, a pas l’intencion de ne far la promocion.",
+'booksources-invalid-isbn'  => "Lo numèro ISBN balhat sembla pas èsser valid ; verificatz s'avètz fach una error al moment de la còpia dempuèi la font.",
 
 # Special:Log
 'specialloguserlabel'  => 'Utilizaire :',
 'speciallogtitlelabel' => 'Títol :',
 'log'                  => 'Jornals',
 'all-logs-page'        => 'Totes los jornals',
-'log-search-legend'    => "Recèrca d'istorics",
-'log-search-submit'    => 'Anar',
 'alllogstext'          => 'Afichatge combinat de totes los jornals de {{SITENAME}}.
 Podètz restrénher la vista en seleccionant un tipe de jornal, un nom d’utilizaire (cassa sensibla) o una pagina ciblada (idem).',
 'logempty'             => 'I a pas res dins l’istoric per aquesta pagina.',
@@ -1559,6 +1709,7 @@ Podètz restrénher la vista en seleccionant un tipe de jornal, un nom d’utili
 'nextpage'          => 'Pagina seguenta ($1)',
 'prevpage'          => 'Pagina precedenta ($1)',
 'allpagesfrom'      => 'Afichar las paginas a partir de :',
+'allpagesto'        => 'Afichar las paginas fins a :',
 'allarticles'       => 'Totas las paginas',
 'allinnamespace'    => 'Totas las paginas (espaci de noms $1)',
 'allnotinnamespace' => 'Totas las paginas (que son pas dins l’espaci de noms $1)',
@@ -1578,50 +1729,77 @@ Vejatz tanben [[Special:WantedCategories|las categorias demandadas]].',
 'special-categories-sort-count' => 'triada per compte',
 'special-categories-sort-abc'   => 'triada alfabetica',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribucions suprimidas d’un utilizaire',
+
+# Special:LinkSearch
+'linksearch'       => 'Ligams extèrnes',
+'linksearch-pat'   => 'Recercar l’expression :',
+'linksearch-ns'    => 'Espacis de noms :',
+'linksearch-ok'    => 'Recercar',
+'linksearch-text'  => 'De caractèrs « joker » pòdon èsser utilizats, per exemple <code>*.wikipedia.org</code>.<br />Protocòls reconeguts : <tt>$1</tt>.',
+'linksearch-line'  => '$1 amb un ligam a partir de $2',
+'linksearch-error' => 'Los caractèrs « joker » pòdon pas èsser utilizats qu’al començament del nom de domeni.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Afichar los utilizaires a partir de :',
 'listusers-submit'   => 'Mostrar',
 'listusers-noresult' => "S'es pas trobat de noms d'utilizaires correspondents. Cercatz tanben amb de majusculas e minusculas.",
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Istoric de las creacions de comptes',
+'newuserlogpagetext'          => "Jornal de las creacions de comptes d'utilizaires.",
+'newuserlog-byemail'          => 'senhal mandat per corrièr electronic',
+'newuserlog-create-entry'     => 'Utilizaire novèl',
+'newuserlog-create2-entry'    => 'a creat lo compte novèl $1',
+'newuserlog-autocreate-entry' => 'Compte creat automaticament',
+
 # Special:ListGroupRights
-'listgrouprights'          => "Dreches dels gropes d'utilizaires",
-'listgrouprights-summary'  => "Aquesta pagina conten una tièra de gropes definits sus aqueste wiki e mai los dreches d'accès qu'i son associats.
+'listgrouprights'                 => "Dreches dels gropes d'utilizaires",
+'listgrouprights-summary'         => "Aquesta pagina conten una tièra de gropes definits sus aqueste wiki e mai los dreches d'accès qu'i son associats.
 I pòt aver [[{{MediaWiki:Listgrouprights-helppage}}|d'entresenhas complementàrias]] a prepaus dels dreches.",
-'listgrouprights-group'    => 'Grop',
-'listgrouprights-rights'   => 'Dreches associats',
-'listgrouprights-helppage' => 'Help:Dreches dels gropes',
-'listgrouprights-members'  => '(lista dels membres)',
+'listgrouprights-group'           => 'Grop',
+'listgrouprights-rights'          => 'Dreches associats',
+'listgrouprights-helppage'        => 'Help:Dreches dels gropes',
+'listgrouprights-members'         => '(lista dels membres)',
+'listgrouprights-addgroup'        => 'Pòt apondre $2 {{PLURAL:$2|grop|gropes}} : $1',
+'listgrouprights-removegroup'     => 'Pòt levar $2 {{PLURAL:$2|gropa|gropes}} : $1',
+'listgrouprights-addgroup-all'    => 'Pòt apondre totes los gropes',
+'listgrouprights-removegroup-all' => 'Pòt levar totes los gropes',
 
 # E-mail user
-'mailnologin'     => "Pas d'adreça",
-'mailnologintext' => 'Vos cal èsser [[Special:UserLogin|connectat(ada)]]
+'mailnologin'      => "Pas d'adreça",
+'mailnologintext'  => 'Vos cal èsser [[Special:UserLogin|connectat(ada)]]
 e aver indicat una adreça electronica valida dins vòstras [[Special:Preferences|preferéncias]]
 per poder mandar un messatge a un autre utilizaire.',
-'emailuser'       => 'Mandar un messatge a aqueste utilizaire',
-'emailpage'       => 'Mandar un corrièr electronic a l’utilizaire',
-'emailpagetext'   => "Podètz utilizar lo formulari çaijós per mandar un corrièr electronic a aqueste utilizaire.
+'emailuser'        => 'Mandar un messatge a aqueste utilizaire',
+'emailpage'        => 'Mandar un corrièr electronic a l’utilizaire',
+'emailpagetext'    => "Podètz utilizar lo formulari çaijós per mandar un corrièr electronic a aqueste utilizaire.
 L'adreça electronica qu'avètz indicada dins [[Special:Preferences|vòstras preferéncias]] apareisserà dins lo camp « Expeditor » de vòstre messatge. E mai, lo destinatari vos poirà respondre dirèctament.",
-'usermailererror' => 'Error dins lo subjècte del corrièr electronic :',
-'defemailsubject' => 'Corrièr electronic mandat dempuèi {{SITENAME}}',
-'noemailtitle'    => "Pas d'adreça electronica",
-'noemailtext'     => "Aquesta utilizaire a pas especificat d'adreça electronica valida o a causit de recebre pas de corrièr electronic dels autres utilizaires.",
-'emailfrom'       => 'Expeditor :',
-'emailto'         => 'Destinatari :',
-'emailsubject'    => 'Subjècte :',
-'emailmessage'    => 'Messatge :',
-'emailsend'       => 'Mandar',
-'emailccme'       => 'Me mandar per corrièr electronic una còpia de mon messatge.',
-'emailccsubject'  => 'Còpia de vòstre messatge a $1 : $2',
-'emailsent'       => 'Messatge mandat',
-'emailsenttext'   => 'Vòstre messatge es estat mandat.',
-'emailuserfooter' => 'Aqueste corrièr electronic es estat mandat per « $1 » a « $2 » per la foncion « Mandar un corrièr electronic a l’utilizaire » sus {{SITENAME}}.',
+'usermailererror'  => 'Error dins lo subjècte del corrièr electronic :',
+'defemailsubject'  => 'Corrièr electronic mandat dempuèi {{SITENAME}}',
+'noemailtitle'     => "Pas d'adreça electronica",
+'noemailtext'      => "Aqueste utilizaire a pas especificat d'adreça electronica valida.",
+'nowikiemailtitle' => 'Pas de corrièr electronic autorizat',
+'nowikiemailtext'  => "Aqueste utilizaire a causit de recebre pas de corrièr electronic de la part d'autres utilizaires.",
+'email-legend'     => 'Mandar un corrièr electronic a un autre utilizaire de {{SITENAME}}',
+'emailfrom'        => 'Expeditor :',
+'emailto'          => 'Destinatari :',
+'emailsubject'     => 'Subjècte :',
+'emailmessage'     => 'Messatge :',
+'emailsend'        => 'Mandar',
+'emailccme'        => 'Me mandar per corrièr electronic una còpia de mon messatge.',
+'emailccsubject'   => 'Còpia de vòstre messatge a $1 : $2',
+'emailsent'        => 'Messatge mandat',
+'emailsenttext'    => 'Vòstre messatge es estat mandat.',
+'emailuserfooter'  => 'Aqueste corrièr electronic es estat mandat per « $1 » a « $2 » per la foncion « Mandar un corrièr electronic a l’utilizaire » sus {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Lista de seguit',
 'mywatchlist'          => 'Lista de seguit',
 'watchlistfor'         => "(per l’utilizaire '''$1''')",
 'nowatchlist'          => "Vòstra lista de seguit conten pas cap d'article.",
-'watchlistanontext'    => 'Per poder afichar o editar los elements de vòstra lista de seguit, vos devètz $1.',
+'watchlistanontext'    => 'Per poder afichar o editar los elements de vòstra lista de seguit, vos cal vos $1.',
 'watchnologin'         => 'Vos sètz pas identificat(ada)',
 'watchnologintext'     => 'Vos cal èsser [[Special:UserLogin|connectat(ada)]]
 per modificar vòstra lista de seguit.',
@@ -1646,12 +1824,7 @@ Las modificacions venentas d\'aquesta pagina e de la pagina de discussion associ
 'iteminvalidname'      => "Problèma amb l'article « $1 » : lo nom es invalid...",
 'wlnote'               => 'Çaijós se {{PLURAL:$1|tròba la darrièra modificacion|tròban las $1 darrièras modificacions}} dempuèi {{PLURAL:$2|la darrièra ora|las <b>$2</b> darrièras oras}}.',
 'wlshowlast'           => 'Mostrar las darrièras $1 oras, los darrièrs $2 jorns, o $3.',
-'watchlist-show-bots'  => 'Afichar las contribucions dels bòts',
-'watchlist-hide-bots'  => 'Amagar las contribucions dels bòts',
-'watchlist-show-own'   => 'Afichar mas modificacions',
-'watchlist-hide-own'   => 'Amagar mas modificacions',
-'watchlist-show-minor' => 'Afichar las modificacions menoras',
-'watchlist-hide-minor' => 'Amagar las modificacions menoras',
+'watchlist-options'    => 'Opcions de la lista de seguit',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Seguit...',
@@ -1690,80 +1863,97 @@ Per modificar los paramètres de vòstra lista de seguit, visitatz
 Retorn e assisténcia :
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Suprimir la pagina',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "contenent '$1'",
-'excontentauthor'             => "lo contengut èra : « $1 » (e l'unic contributor èra « [[Special:Contributions/$2|$2]] »)",
-'exbeforeblank'               => "lo contengut abans blanquiment èra :'$1'",
-'exblank'                     => 'pagina voida',
-'delete-confirm'              => 'Escafar «$1»',
-'delete-legend'               => 'Escafar',
-'historywarning'              => 'Atencion : La pagina que sètz a mand de suprimir a un istoric :',
-'confirmdeletetext'           => "Sètz a mand de suprimir definitivament de la banca de donadas una pagina
+# Delete
+'deletepage'             => 'Suprimir la pagina',
+'confirm'                => 'Confirmar',
+'excontent'              => "contenent '$1'",
+'excontentauthor'        => "lo contengut èra : « $1 » (e l'unic contributor èra « [[Special:Contributions/$2|$2]] »)",
+'exbeforeblank'          => "lo contengut abans blanquiment èra :'$1'",
+'exblank'                => 'pagina voida',
+'delete-confirm'         => 'Escafar «$1»',
+'delete-legend'          => 'Escafar',
+'historywarning'         => 'Atencion : La pagina que sètz a mand de suprimir a un istoric :',
+'confirmdeletetext'      => "Sètz a mand de suprimir definitivament de la banca de donadas una pagina
 o un imatge, e mai totas sas versions anterioras.
 Confirmatz qu'es plan çò que volètz far, que ne comprenètz las consequéncias e que fasètz aquò en acòrdi amb las [[{{MediaWiki:Policy-url|règlas intèrnas}}]].",
-'actioncomplete'              => 'Accion efectuada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" es estat suprimit.
+'actioncomplete'         => 'Accion efectuada',
+'deletedtext'            => '"<nowiki>$1</nowiki>" es estat suprimit.
 Vejatz $2 per una lista de las supressions recentas.',
-'deletedarticle'              => 'a escafat «[[$1]]»',
-'suppressedarticle'           => 'amagat  « [[$1]] »',
-'dellogpage'                  => 'Istoric dels escafaments',
-'dellogpagetext'              => 'Vaquí çaijós la lista de las supressions recentas.',
-'deletionlog'                 => 'istoric dels escafaments',
-'reverted'                    => 'Restabliment de la version precedenta',
-'deletecomment'               => 'Motiu de la supression :',
-'deleteotherreason'           => 'Motius suplementaris o autres :',
-'deletereasonotherlist'       => 'Autre motiu',
-'deletereason-dropdown'       => "*Motius de supression mai corrents
+'deletedarticle'         => 'a escafat «[[$1]]»',
+'suppressedarticle'      => 'amagat  « [[$1]] »',
+'dellogpage'             => 'Istoric dels escafaments',
+'dellogpagetext'         => 'Vaquí çaijós la lista de las supressions recentas.',
+'deletionlog'            => 'istoric dels escafaments',
+'reverted'               => 'Restabliment de la version precedenta',
+'deletecomment'          => 'Motiu de la supression :',
+'deleteotherreason'      => 'Motius suplementaris o autres :',
+'deletereasonotherlist'  => 'Autre motiu',
+'deletereason-dropdown'  => "*Motius de supression mai corrents
 ** Demanda de l'autor
 ** Violacion dels dreches d'autor
 ** Vandalisme",
-'delete-edit-reasonlist'      => 'Modifica los motius de la supression',
-'delete-toobig'               => "Aquesta pagina dispausa d'un istoric important, depassant {{PLURAL:$1|revision|revisions}}.
+'delete-edit-reasonlist' => 'Modifica los motius de la supression',
+'delete-toobig'          => "Aquesta pagina dispausa d'un istoric important, depassant {{PLURAL:$1|revision|revisions}}.
 La supression de talas paginas es estada limitada per evitar de perturbacions accidentalas de {{SITENAME}}.",
-'delete-warning-toobig'       => "Aquesta pagina dispausa d'un istoric important, depassant {{PLURAL:$1|revision|revisions}}.
+'delete-warning-toobig'  => "Aquesta pagina dispausa d'un istoric important, depassant {{PLURAL:$1|revision|revisions}}.
 La suprimir pòt perturbar lo foncionament de la banca de donada de {{SITENAME}}.
 D'efectuar amb prudéncia.",
-'rollback'                    => 'Anullar las modificacions',
-'rollback_short'              => 'Anullar',
-'rollbacklink'                => 'anullar',
-'rollbackfailed'              => "L'anullacion a pas capitat",
-'cantrollback'                => "Impossible d'anullar : l'autor es la sola persona a aver efectuat de modificacions sus aqueste article",
-'alreadyrolled'               => "Impossible d'anullar la darrièra modificacion de l'article « [[$1]] » efectuada per [[User:$2|$2]] ([[User talk:$2|Discussion]]) ; qualqu'un d'autre ja a modificat o revocat l'article.
-
-La darrièra modificacion es estada efectuada per [[User:$3|$3]] ([[User talk:$3|Discussion]]).",
-'editcomment'                 => 'Lo resumit de la modificacion èra: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Anullacion de las modificacions de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) cap a la darrièra version de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Anullacion de las modificacions de $1 ; retorn a la version de $2.',
-'sessionfailure'              => 'Vòstra sesilha de connexion sembla aver de problèmas ;
+
+# Rollback
+'rollback'         => 'Anullar las modificacions',
+'rollback_short'   => 'Anullar',
+'rollbacklink'     => 'anullar',
+'rollbackfailed'   => "L'anullacion a pas capitat",
+'cantrollback'     => "Impossible d'anullar : l'autor es la sola persona a aver efectuat de modificacions sus aqueste article",
+'alreadyrolled'    => "Impossible d'anullar la darrièra modificacion de l'article « [[$1]] » efectuada per [[User:$2|$2]] ([[User talk:$2|Discutir]]){{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) ; qualqu’un mai ja a modificat o revocat la pagina. La darrièra modificacion es estada efectuada per [[User:$3|$3]] ([[User talk:$3|Discutir]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
+'editcomment'      => "Lo resumit de la modificacion èra : « ''$1'' ».", # only shown if there is an edit comment
+'revertpage'       => 'Anullacion de las modificacions de [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussion]]) cap a la darrièra version de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Anullacion de las modificacions de $1 ; retorn a la version de $2.',
+'sessionfailure'   => 'Vòstra sesilha de connexion sembla aver de problèmas ;
 aquesta accion es estada anullada en prevencion d’un piratatge de sesilha.
 Clicatz sus « Precedent » e tornatz cargar la pagina d’ont venètz, puèi ensajatz tornarmai.',
+
+# Protect
 'protectlogpage'              => 'Istoric de las proteccions',
 'protectlogtext'              => 'Vejatz las [[Special:ProtectedPages|directivas]] per mai d’informacion.',
 'protectedarticle'            => 'a protegit « [[$1]] »',
 'modifiedarticleprotection'   => 'a modificat lo nivèl de proteccion de « [[$1]] »',
 'unprotectedarticle'          => 'a desprotegit « [[$1]] »',
+'movedarticleprotection'      => 'a desplaçat los paramètres de proteccion dempuèi « [[$2]] » cap a « [[$1]] »',
 'protect-title'               => 'Cambiar lo nivèl de proteccion de « $1 »',
+'prot_1movedto2'              => 'a renomenat [[$1]] en [[$2]]',
 'protect-legend'              => 'Confirmar la proteccion',
 'protectcomment'              => 'Motiu de la proteccion :',
 'protectexpiry'               => 'Expiracion (expira pas per defaut)',
 'protect_expiry_invalid'      => 'Lo temps d’expiracion es invalid',
 'protect_expiry_old'          => 'Lo temps d’expiracion ja es passat.',
 'protect-unchain'             => 'Desblocar las permissions de cambiament de nom',
-'protect-text'                => 'Podètz consultar e modificar lo nivèl de proteccion de la pagina <strong><nowiki>$1</nowiki></strong>. Asseguratz-vos que seguissètz las règlas intèrnas.',
-'protect-locked-blocked'      => 'Podètz pas modificar lo nivèl de proteccion tant que sètz blocat. Vaquí los reglatges actuals de la pagina <strong>$1</strong> :',
-'protect-locked-dblock'       => 'Lo nivèl de proteccion pòt pas èsser modificat perque la banca de donadas es blocada. Vaquí los reglatges actuals de la pagina <strong>$1</strong> :',
-'protect-locked-access'       => 'Avètz pas los dreches necessaris per modificar la proteccion de la pagina. Vaquí los reglatges actuals de la pagina <strong>$1</strong> :',
+'protect-text'                => "Podètz consultar e modificar lo nivèl de proteccion de la pagina '''<nowiki>$1</nowiki>'''. Asseguratz-vos que seguissètz las règlas intèrnas.",
+'protect-locked-blocked'      => "Podètz pas modificar lo nivèl de proteccion tant que sètz blocat. Vaquí los reglatges actuals de la pagina '''$1''' :",
+'protect-locked-dblock'       => "Lo nivèl de proteccion pòt pas èsser modificat perque la banca de donadas es blocada. Vaquí los reglatges actuals de la pagina '''$1''' :",
+'protect-locked-access'       => "Avètz pas los dreches necessaris per modificar la proteccion de la pagina. Vaquí los reglatges actuals de la pagina '''$1''' :",
 'protect-cascadeon'           => "Aquesta pagina es actualament protegida perque es inclusa dins {{PLURAL:$1|la pagina seguenta|las paginas seguentas}}, {{PLURAL:$1|qu'es estada protegida|que son estadas protegidas}} amb l’opcion « proteccion en cascada » activada. Podètz cambiar lo nivèl de proteccion d'aquesta pagina sens qu'aquò afècte la proteccion en cascada.",
-'protect-default'             => 'Pas de proteccion',
+'protect-default'             => 'Autorizar totes los utilizaires',
 'protect-fallback'            => 'Necessita l’abilitacion «$1»',
-'protect-level-autoconfirmed' => 'Semiproteccion',
+'protect-level-autoconfirmed' => 'Blocar los utilizaires novèls e los utilizaires anonims',
 'protect-level-sysop'         => 'Administrators unicament',
 'protect-summary-cascade'     => 'proteccion en cascada',
 'protect-expiring'            => 'expira lo $1',
+'protect-expiry-indefinite'   => 'indefinit',
 'protect-cascade'             => 'Proteccion en cascada - Protegís totas las paginas enclusas dins aquesta.',
 'protect-cantedit'            => "Podètz pas modificar los nivèls de proteccion d'aquesta pagina perque avètz pas la permission de l'editar.",
+'protect-othertime'           => 'Autra expiracion :',
+'protect-othertime-op'        => 'Autra expiracion',
+'protect-existing-expiry'     => 'Durada d’expiracion existenta : $2 a $3',
+'protect-otherreason'         => 'Motiu suplementari o autre :',
+'protect-otherreason-op'      => 'Motiu suplementari o autre',
+'protect-dropdown'            => "*Motius de proteccion mai corrents
+** Vandalisme excessiu
+** Spam excessiu
+** Guèrra d'edicion
+** Pagina de trafic fòrt",
+'protect-edit-reasonlist'     => 'Modificar las rasons de proteccion',
+'protect-expiry-options'      => '2 oras:2 hours,1 jorn:1 day,3 jorns:3 days,1 setmana:1 week,2 setmanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 an:1 year,indefinidament:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permission :',
 'restriction-level'           => 'Nivèl de restriccion :',
 'minimum-size'                => 'Talha minimoma',
@@ -1786,7 +1976,7 @@ Clicatz sus « Precedent » e tornatz cargar la pagina d’ont venètz, puèi en
 'undeletepage'                 => 'Veire e restablir la pagina escafada',
 'undeletepagetitle'            => "'''La lista seguenta se compausa de versions suprimidas de [[:$1]]'''.",
 'viewdeletedpage'              => 'Istoric de la pagina suprimida',
-'undeletepagetext'             => "Aquestas paginas son estadas escafadas e se tròban dins l'archiu. Figuran totjorn dins la banca de donada e pòdon èsser restablidas.
+'undeletepagetext'             => "{{PLURAL:$1|Aquesta pagina es estada escafada e se tròba|Aquestas paginas son estadas escafadas e se tròban}} dins l'archiu. {{PLURAL:$1|Figura|Figuran}} encara dins la banca de donada e {{PLURAL:$1|pòt èsser restablida|pòdon èsser restablidas}}.
 L'archiu pòt èsser escafat periodicament.",
 'undelete-fieldset-title'      => 'Restablir las versions',
 'undeleteextrahelp'            => "Per restablir l'istoric complet d'aquesta pagina, daissatz vèrjas totas las casas de marcar, puèi clicatz sus '''''Restablir'''''.
@@ -1798,12 +1988,13 @@ En clicant sul boton '''''Reïnicializar''''', la bóstia de resumit e las casas
 S'una pagina novèla amb lo meteis nom es estada creada dempuèi la supression, las revisions restablidas apareisseràn dins l'istoric anterior e la version correnta serà pas automaticament remplaçada.",
 'undeleterevdel'               => 'Lo restabliment serà pas efectuat se, fin finala, la version mai recenta de la pagina es parcialament suprimida. Dins aqueste cas, vos cal deseleccionatz las versions mai recentas (en naut). Las versions dels fichièrs a las qualas avètz pas accès seràn pas restablidas.',
 'undeletehistorynoadmin'       => "Aqueste article es estat suprimit. Lo motiu de la supression es indicat dins lo resumit çaijós, amb los detalhs dels utilizaires que l’an modificat abans sa supression. Lo contengut d'aquestas versions es pas accessible qu’als administrators.",
-'undelete-revision'            => 'Version suprimida de $1, (revision del $2) per $3 :',
+'undelete-revision'            => 'Version suprimida de $1, (revision del $4 a $5) per $3 :',
 'undeleterevision-missing'     => 'Version invalida o mancanta. Benlèu avètz un ligam marrit, o la version es estada restablida o suprimida de l’archiu.',
 'undelete-nodiff'              => 'Cap de revision precedenta pas trobada.',
 'undeletebtn'                  => 'Restablir',
 'undeletelink'                 => 'restablir',
 'undeletereset'                => 'Reïnicializar',
+'undeleteinvert'               => 'Inversar la seleccion',
 'undeletecomment'              => 'Comentari :',
 'undeletedarticle'             => 'a restablit « [[$1]] »',
 'undeletedrevisions'           => '{{PLURAL:$1|1 revision restablida|$1 revisions restablidas}}',
@@ -1835,27 +2026,27 @@ $1",
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => "Contribucions d'aqueste contributor",
-'mycontris'     => 'Mas contribucions',
-'contribsub2'   => 'Lista de las contribucions de $1 ($2). Las paginas que son estadas escafadas son pas afichadas.',
-'nocontribs'    => 'Cap de modificacion correspondenta a aquestes critèris es pas estada trobada.',
-'uctop'         => '(darrièra)',
-'month'         => 'A partir del mes (e precedents) :',
-'year'          => 'A partir de l’annada (e precedentas) :',
-
-'sp-contributions-newbies'     => 'Mostrar pas que las contribucions dels utilizaires novèls',
-'sp-contributions-newbies-sub' => 'Lista de las contribucions dels utilizaires novèls. Las paginas que son estadas suprimidas son pas afichadas.',
-'sp-contributions-blocklog'    => 'Istoric dels blocatges',
-'sp-contributions-search'      => 'Cercar las contribucions',
-'sp-contributions-username'    => 'Adreça IP o nom d’utilizaire :',
-'sp-contributions-submit'      => 'Cercar',
+'contributions'       => "Contribucions d'aqueste contributor",
+'contributions-title' => 'Tièra de las contribucions de l’utilizaire $1',
+'mycontris'           => 'Mas contribucions',
+'contribsub2'         => 'Lista de las contribucions de $1 ($2). Las paginas que son estadas escafadas son pas afichadas.',
+'nocontribs'          => 'Cap de modificacion correspondenta a aquestes critèris es pas estada trobada.',
+'uctop'               => '(darrièra)',
+'month'               => 'A partir del mes (e precedents) :',
+'year'                => 'A partir de l’annada (e precedentas) :',
+
+'sp-contributions-newbies'       => 'Mostrar pas que las contribucions dels utilizaires novèls',
+'sp-contributions-newbies-sub'   => 'Lista de las contribucions dels utilizaires novèls. Las paginas que son estadas suprimidas son pas afichadas.',
+'sp-contributions-newbies-title' => 'Las contribucions de l’utilizaire pels comptes novèls',
+'sp-contributions-blocklog'      => 'Istoric dels blocatges',
+'sp-contributions-search'        => 'Cercar las contribucions',
+'sp-contributions-username'      => 'Adreça IP o nom d’utilizaire :',
+'sp-contributions-submit'        => 'Cercar',
 
 # What links here
 'whatlinkshere'            => 'Paginas ligadas a aquesta',
 'whatlinkshere-title'      => 'Paginas que puntan cap a « $1 »',
 'whatlinkshere-page'       => 'Pagina :',
-'whatlinkshere-barrow'     => '>',
-'linklistsub'              => '(Lista de ligams)',
 'linkshere'                => "Las paginas çaijós contenon un ligam cap a '''[[:$1]]''':",
 'nolinkshere'              => "Cap de pagina conten pas de ligam cap a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Cap de pagina conten pas de ligam cap a '''[[:$1]]''' dins l’espaci de nom causit.",
@@ -1902,6 +2093,8 @@ Donatz çaijós una rason precisa (per exemple en indicant las paginas que son e
 'ipbotherreason'                  => 'Motiu diferent o suplementari',
 'ipbhidename'                     => "Amagar lo nom d’utilizaire de l'istoric de blocatge, de la lista dels blocatges actius e de la lista dels utilizaires",
 'ipbwatchuser'                    => "Seguir las paginas d'utilizaire e de discussion d'aqueste utilizaire",
+'ipballowusertalk'                => 'Permet a aqueste utilizaire de modificar sa pròpria pagina de discussion pendent son periòde de blocatge',
+'ipb-change-block'                => 'Tronar blocar aqueste utilizaire amb aquestes paramètres',
 'badipaddress'                    => "L'adreça IP es incorrècta",
 'blockipsuccesssub'               => 'Blocatge capitat',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] es estat blocat.<br />
@@ -1911,15 +2104,19 @@ Podètz consultar la [[Special:IPBlockList|lista dels comptes e de las adreças
 'ipb-unblock'                     => "Desblocar un compte d'utilizaire o una adreça IP",
 'ipb-blocklist-addr'              => 'Blocatges existents per $1',
 'ipb-blocklist'                   => 'Vejatz los blocatges existents',
+'ipb-blocklist-contribs'          => 'Contribucions per $1',
 'unblockip'                       => 'Desblocar un utilizaire o una adreça IP',
 'unblockiptext'                   => "Utilizatz lo formulari çaijós per restablir l'accès en escritura
 a partir d'una adreça IP precedentament blocada.",
-'ipusubmit'                       => 'Desblocar aquesta adreça',
+'ipusubmit'                       => 'Suprimir aqueste blocatge',
 'unblocked'                       => '[[User:$1|$1]] es estat desblocat',
 'unblocked-id'                    => 'Lo blocatge $1 es estat levat',
 'ipblocklist'                     => 'Adreças IP e dels utilizaires blocats',
 'ipblocklist-legend'              => 'Cercar un utilizaire blocat',
 'ipblocklist-username'            => 'Nom de l’utilizaire o adreça IP :',
+'ipblocklist-sh-userblocks'       => '$1 los comptes blocats',
+'ipblocklist-sh-tempblocks'       => '$1 los blocatges temporaris',
+'ipblocklist-sh-addressblocks'    => "$1 los blocatges d'una sola adreça IP",
 'ipblocklist-submit'              => 'Recercar',
 'blocklistline'                   => '$1, $2 a blocat $3 ($4)',
 'infiniteblock'                   => 'permanent',
@@ -1928,26 +2125,33 @@ a partir d'una adreça IP precedentament blocada.",
 'noautoblockblock'                => 'blocatge automatic desactivat',
 'createaccountblock'              => 'La creacion de compte es blocada.',
 'emailblock'                      => 'mandadís de corrièr electronic blocat',
+'blocklist-nousertalk'            => 'pòdon pas modificar lor pròpria pagina de discussion',
 'ipblocklist-empty'               => 'La lista dels blocatges es voida.',
 'ipblocklist-no-results'          => 'L’adreça IP o l’utilizaire es pas esta blocat.',
 'blocklink'                       => 'blocar',
 'unblocklink'                     => 'desblocar',
+'change-blocklink'                => 'modificar lo blocatge',
 'contribslink'                    => 'contribucions',
 'autoblocker'                     => 'Sètz estat autoblocat perque partejatz una adreça IP amb "[[User:$1|$1]]".
 La rason balhada per $1 es : « $2 ».',
 'blocklogpage'                    => 'Istoric dels blocatges',
+'blocklog-fulllog'                => 'Jornal complet dels blocatges',
 'blocklogentry'                   => 'a blocat « [[$1]] » - durada : $2 $3',
+'reblock-logentry'                => 'a modificat los parametratge de blocatge per [[$1]] amb una durada d’expiracion de $2 $3',
 'blocklogtext'                    => "Aquò es l'istoric dels blocatges e desblocatges dels utilizaires. Las adreças IP automaticament blocadas son pas listadas. Consultatz la [[Special:IPBlockList|lista dels utilizaires blocats]] per veire qui es actualament efectivament blocat.",
 'unblocklogentry'                 => 'a desblocat « $1 »',
 'block-log-flags-anononly'        => 'utilizaires anonims solament',
 'block-log-flags-nocreate'        => 'creacion de compte interdicha',
 'block-log-flags-noautoblock'     => 'autoblocatge de las IP desactivat',
 'block-log-flags-noemail'         => 'Mandadís de corrièr electronic blocat',
+'block-log-flags-nousertalk'      => 'pòt pas modificar sa pròpria pagina de discussion',
 'block-log-flags-angry-autoblock' => 'autoblocatge melhorat en servici',
 'range_block_disabled'            => "Lo blocatge de plajas d'IP es estat desactivat.",
 'ipb_expiry_invalid'              => 'Temps d’expiracion invalid.',
 'ipb_expiry_temp'                 => 'Las plajas dels utilizaires amagats deurián èsser permanentas.',
 'ipb_already_blocked'             => '« $1 » ja es blocat',
+'ipb-needreblock'                 => '== Ja blocat ==
+$1 ja es blocat. Volètz modificar los paramètres ?',
 'ipb_cant_unblock'                => 'Error : Lo blocatge d’ID $1 existís pas. Es possible qu’un desblocatge ja siá estat efectuat.',
 'ipb_blocked_as_range'            => "Error : L'adreça IP $1 es pas estada blocada dirèctament e doncas pòt pas èsser deblocada. Çaquelà, es estada blocada per la plaja $2 la quala pòt èsser deblocada.",
 'ip_range_invalid'                => 'Plaja IP incorrècta.',
@@ -1959,6 +2163,7 @@ La rason balhada per $1 es : « $2 ».',
 'sorbsreason'                     => 'Vòstra adreça IP es listada en tant que mandatari (proxy) dobert DNSBL per {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'Vòstra adreça IP es listada en tant que mandatari (proxy) dobert DNSBL per {{SITENAME}}.
 Podètz pas crear un compte',
+'cant-block-while-blocked'        => "Podètz pas blocar d'autres utilizaires pendent que sètz blocat(ada).",
 
 # Developer tools
 'lockdb'              => 'Varrolhar la banca',
@@ -1982,58 +2187,72 @@ Doblidetz pas de la desvarrolhar quand auretz acabat vòstra operacion de manten
 'databasenotlocked'   => 'La banca de donadas es pas varrolhada.',
 
 # Move page
-'move-page'               => 'Tornar nomenar $1',
-'move-page-legend'        => 'Tornar nomenar una pagina',
-'movepagetext'            => "Utilizatz lo formulari çaijós per tornar nomenar una pagina, en desplaçant tot son istoric cap al nom novèl. Lo títol ancian vendrà una pagina de redireccion cap al títol novèl. Los ligams cap al títol de la pagina anciana seràn pas cambiats ; verificatz qu'aqueste desplaçament a pas creat de [[Special:DoubleRedirects|redireccion dobla]] o de [[Special:BrokenRedirects|redireccion copada]].
+'move-page'                    => 'Tornar nomenar $1',
+'move-page-legend'             => 'Tornar nomenar una pagina',
+'movepagetext'                 => "Utilizatz lo formulari çaijós per tornar nomenar una pagina, en desplaçant tot son istoric cap al nom novèl. Lo títol ancian vendrà una pagina de redireccion cap al títol novèl. Los ligams cap al títol de la pagina anciana seràn pas cambiats ; verificatz qu'aqueste desplaçament a pas creat de [[Special:DoubleRedirects|redireccion dobla]] o de [[Special:BrokenRedirects|redireccion copada]].
 
 Avètz la responsabilitat de vos assegurar que los ligams contunhen de puntar cap a lor destinacion supausada. Una pagina serà pas desplaçada se la pagina del títol novèl existís ja, a mens qu'aquesta darrièra siá voida o en redireccion, e qu’aja pas d’istoric. Aquò vòl dire que podètz tornar nomenar una pagina cap a sa posicion d’origina s'avètz fach una error, mas que podètz pas escafar una pagina qu'existís ja amb aqueste procediment.
 
 '''ATENCION !''' Aquò pòt provocar un cambiament radical e imprevist per una pagina consultada frequentament. Asseguratz-vos de n'aver comprés las consequéncias abans de contunhar.",
-'movepagetalktext'        => "La pagina de discussion associada, se presenta, serà automaticament desplaçada amb '''en defòra de se:'''
+'movepagetalktext'             => "La pagina de discussion associada, se presenta, serà automaticament desplaçada amb '''en defòra de se:'''
 *Desplaçatz una pagina cap a un autre espaci,
 *Una pagina de discussion ja existís amb lo nom novèl, o
 *Avètz deseleccionat lo boton çaijós.
 
 Dins aqueste cas, deuretz desplaçar o fusionar la pagina manualament se o volètz.",
-'movearticle'             => "Tornar nomenar l'article",
-'movenotallowed'          => 'Avètz pas la permission de tornar nomenar de paginas.',
-'newtitle'                => 'Títol novèl',
-'move-watch'              => 'Seguir aquesta pagina',
-'movepagebtn'             => "Tornar nomenar l'article",
-'pagemovedsub'            => 'Cambiament de nom capitat',
-'movepage-moved'          => 'La pagina « $1 » es estada renomenada en « $2 ».', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "Existís ja un article que pòrta aqueste títol, o lo títol qu'avètz causit es pas valid.
+'movearticle'                  => "Tornar nomenar l'article",
+'movenologin'                  => 'Vos sètz pas identificat(ada)',
+'movenologintext'              => "Per poder tornar nomenar un article, vos cal èsser [[Special:UserLogin|connectat(ada)]]
+en tant qu'utilizaire enregistrat.",
+'movenotallowed'               => 'Avètz pas la permission de tornar nomenar de paginas.',
+'movenotallowedfile'           => 'Avètz pas la permission de desplaçar los fichièrs.',
+'cant-move-user-page'          => "Avètz pas la permission de tornar nomenar de paginas d'utilizaires raices sus aqueste wiki.",
+'cant-move-to-user-page'       => "Avètz pas la permission de tornar nomenar una pagina cap a una pagina d'utilizaire (a l'excepcion d'una sospagina).",
+'newtitle'                     => 'Títol novèl',
+'move-watch'                   => 'Seguir aquesta pagina',
+'movepagebtn'                  => "Tornar nomenar l'article",
+'pagemovedsub'                 => 'Cambiament de nom capitat',
+'movepage-moved'               => 'La pagina « $1 » es estada renomenada en « $2 ».', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Una redireccion es estada creada.',
+'movepage-moved-noredirect'    => 'La creacion de la redireccion es estada suprimida.',
+'articleexists'                => "Existís ja un article que pòrta aqueste títol, o lo títol qu'avètz causit es pas valid.
 Causissètz-ne un autre.",
-'cantmove-titleprotected' => 'Avètz pas la possibilitat de desplaçar una pagina cap a aqueste emplaçament perque lo títol es estat protegit a la creacion.',
-'talkexists'              => "La pagina ela-meteissa es estada desplaçada amb succès, mas
+'cantmove-titleprotected'      => 'Avètz pas la possibilitat de desplaçar una pagina cap a aqueste emplaçament perque lo títol es estat protegit a la creacion.',
+'talkexists'                   => "La pagina ela-meteissa es estada desplaçada amb succès, mas
 la pagina de discussion a pas pogut èsser desplaçada perque ja n'existissiá una
 jol nom novèl. Se vos plai, fusionatz-las manualament.",
-'movedto'                 => 'renomenat en',
-'movetalk'                => 'Tornar nomenar tanben la pagina de discussion associada',
-'move-subpages'           => 'Tornar nomenar, se fa mestièr, totas las sospaginas',
-'move-talk-subpages'      => 'Tornar nomenar, se fa mestièr, totas las sospaginas de las paginas de discussion',
-'movepage-page-exists'    => 'La pagina $1 existís ja e pòt pas èsser espotida automaticament.',
-'movepage-page-moved'     => 'La pagina $1 es estada renomenada en $2.',
-'movepage-page-unmoved'   => 'La pagina $1 pòt èsser renomenada en $2.',
-'movepage-max-pages'      => "Lo maximom de $1 {{PLURAL:$1|pagina es estat renomenat|paginas son estadas renomenadas}} e cap d'autra o poirà pas èsser automaticament.",
-'1movedto2'               => 'a renomenat [[$1]] en [[$2]]',
-'1movedto2_redir'         => 'a redirigit [[$1]] cap a [[$2]]',
-'movelogpage'             => 'Istoric dels cambiaments de nom',
-'movelogpagetext'         => 'Vaquí la lista de las darrièras paginas renomenadas.',
-'movereason'              => 'Motiu :',
-'revertmove'              => 'anullar',
-'delete_and_move'         => 'Suprimir e tornar nomenar',
-'delete_and_move_text'    => '==Supression requesida==
+'movedto'                      => 'renomenat en',
+'movetalk'                     => 'Tornar nomenar tanben la pagina de discussion associada',
+'move-subpages'                => 'Tornar nomenar, se fa mestièr, totas las sospaginas',
+'move-talk-subpages'           => 'Tornar nomenar, se fa mestièr, totas las sospaginas de las paginas de discussion',
+'movepage-page-exists'         => 'La pagina $1 existís ja e pòt pas èsser espotida automaticament.',
+'movepage-page-moved'          => 'La pagina $1 es estada renomenada en $2.',
+'movepage-page-unmoved'        => 'La pagina $1 pòt èsser renomenada en $2.',
+'movepage-max-pages'           => "Lo maximum de $1 {{PLURAL:$1|pagina es estada renomenada|paginas son estadas renomenadas}} e cap d'autra o poirà pas èsser automaticament.",
+'1movedto2'                    => 'a renomenat [[$1]] en [[$2]]',
+'1movedto2_redir'              => 'a redirigit [[$1]] cap a [[$2]]',
+'move-redirect-suppressed'     => 'redireccion suprimida',
+'movelogpage'                  => 'Istoric dels cambiaments de nom',
+'movelogpagetext'              => 'Vaquí la lista de las darrièras paginas renomenadas.',
+'movereason'                   => 'Motiu :',
+'revertmove'                   => 'anullar',
+'delete_and_move'              => 'Suprimir e tornar nomenar',
+'delete_and_move_text'         => '==Supression requesida==
 L’article de destinacion « [[:$1]] » existís ja.
 Lo volètz suprimir per permetre lo cambiament de nom ?',
-'delete_and_move_confirm' => 'Òc, accèpti de suprimir la pagina de destinacion per permetre lo cambiament de nom.',
-'delete_and_move_reason'  => 'Pagina suprimida per permetre un cambiament de nom',
-'selfmove'                => 'Los títols d’origina e de destinacion son los meteisses : impossible de tornar nomenar una pagina sus ela-meteissa.',
-'immobile_namespace'      => 'Lo títol de destinacion es d’un tipe especial ; es impossible de tornar nomenar de paginas cap a aqueste espaci de noms.',
-'imagenocrossnamespace'   => 'Pòt pas desplaçar un imatge cap a un espaci de nomenatge que siá pas un imatge.',
-'imagetypemismatch'       => "L'extension novèla d'aqueste fichièr reconeis pas aqueste format.",
-'imageinvalidfilename'    => 'Lo nom del fichièr cibla es incorrècte',
-'fix-double-redirects'    => 'Metre a jorn las redireccions que puntant cap al títol ancian',
+'delete_and_move_confirm'      => 'Òc, accèpti de suprimir la pagina de destinacion per permetre lo cambiament de nom.',
+'delete_and_move_reason'       => 'Pagina suprimida per permetre un cambiament de nom',
+'selfmove'                     => 'Los títols d’origina e de destinacion son los meteisses : impossible de tornar nomenar una pagina sus ela-meteissa.',
+'immobile-source-namespace'    => "Podètz pas tornar nomenar de paginas dins l'espaci de noms « $1 »",
+'immobile-target-namespace'    => "Podètz pas desplaçar de paginas cap a l'espaci de noms « $1 »",
+'immobile-target-namespace-iw' => 'Los ligams interwikis son pas una cibla valida pels cambiaments de nom.',
+'immobile-source-page'         => 'Aquesta pagina se pòt pas tornar nomenar.',
+'immobile-target-page'         => 'Es pas possible de desplaçar la pagina cap a aqueste títol.',
+'imagenocrossnamespace'        => 'Pòt pas desplaçar un imatge cap a un espaci de nomenatge que siá pas un imatge.',
+'imagetypemismatch'            => "L'extension novèla d'aqueste fichièr reconeis pas aqueste format.",
+'imageinvalidfilename'         => 'Lo nom del fichièr cibla es incorrècte',
+'fix-double-redirects'         => 'Metre a jorn las redireccions que puntant cap al títol ancian',
+'move-leave-redirect'          => 'Daissar una redireccion darrièr',
 
 # Export
 'export'            => 'Exportar de paginas',
@@ -2041,7 +2260,7 @@ Lo volètz suprimir per permetre lo cambiament de nom ?',
 
 Per exportar de paginas, entratz lors títols dins la bóstia de tèxt çaijós, un títol per linha, e seleccionatz s'o desiratz o pas la version actuala amb totas las versions ancianas, amb la pagina d’istoric, o simplament la pagina actuala amb d'informacions sus la darrièra modificacion.
 
-Dins aqueste darrièr cas, podètz tanben utilizar un ligam, coma [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] per la pagina [[{{MediaWiki:Mainpage}}]].",
+Dins aqueste darrièr cas, podètz tanben utilizar un ligam, coma [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] per la pagina [[{{MediaWiki:Mainpage}}]].",
 'exportcuronly'     => 'Exportar unicament la version correnta sens l’istoric complet',
 'exportnohistory'   => "----
 '''Nòta :''' l’exportacion complèta de l’istoric de las paginas amb l’ajuda d'aqueste formulari es estada desactivada per de rasons de performàncias.",
@@ -2057,7 +2276,7 @@ Dins aqueste darrièr cas, podètz tanben utilizar un ligam, coma [[{{ns:special
 'allmessagesdefault'        => 'Messatge per defaut',
 'allmessagescurrent'        => 'Messatge actual',
 'allmessagestext'           => 'Aquò es la lista de totes los messatges disponibles dins l’espaci MediaWiki.
-Visitatz la [http://www.mediawiki.org/wiki/Localisation Localizacion MèdiaWiki] e [http://translatewiki.net Betawiki] se desiratz contribuir a la localizacion MèdiaWiki generica.',
+Visitatz la [http://www.mediawiki.org/wiki/Localisation Localizacion MèdiaWiki] e [http://translatewiki.net translatewiki.net] se desiratz contribuir a la localizacion MèdiaWiki generica.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' es pas disponible perque '''\$wgUseDatabaseMessages''' es desactivat.",
 'allmessagesfilter'         => 'Filtre d’expression racionala :',
 'allmessagesmodified'       => 'Afichar pas que las modificacions',
@@ -2077,9 +2296,12 @@ Visitatz la [http://www.mediawiki.org/wiki/Localisation Localizacion MèdiaWiki]
 'import-interwiki-text'      => "Seleccionatz un wiki e un títol de pagina d'importar.
 Las datas de las versions e los noms dels editors seràn preservats.
 Totas las accions d’importacion interwiki son conservadas dins lo [[Special:Log/import|jornal d’impòrt]].",
+'import-interwiki-source'    => 'Wiki e pagina font :',
 'import-interwiki-history'   => "Copiar totas las versions de l'istoric d'aquesta pagina",
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Espaci de noms de destinacion :',
+'import-upload-filename'     => 'Nom del fichièr :',
+'import-comment'             => 'Comentari :',
 'importtext'                 => 'Exportatz lo fichièr dempuèi lo wiki d’origina en utilizant l’esplech Special:Export, salvatz-lo sus vòstre disc dur e copiatz-lo aicí.',
 'importstart'                => 'Impòrt de las paginas...',
 'import-revision-count'      => '$1 {{PLURAL:$1|version|versions}}',
@@ -2113,19 +2335,19 @@ Totas las accions d’importacion interwiki son conservadas dins lo [[Special:Lo
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|version|versions}} dempuèi $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "Ma pagina d'utilizaire",
+'tooltip-pt-userpage'             => "Vòstra pagina d'utilizaire",
 'tooltip-pt-anonuserpage'         => "La pagina d'utilizare de l’IP amb la quala contribuissètz",
-'tooltip-pt-mytalk'               => 'Ma pagina de discussion',
+'tooltip-pt-mytalk'               => 'Vòstra pagina de discussion',
 'tooltip-pt-anontalk'             => 'La pagina de discussion per aquesta adreça IP',
 'tooltip-pt-preferences'          => 'Mas preferéncias',
 'tooltip-pt-watchlist'            => 'La lista de las paginas que seguissètz',
-'tooltip-pt-mycontris'            => 'Lista de mas contribucions',
+'tooltip-pt-mycontris'            => 'Lista de vòstras contribucions',
 'tooltip-pt-login'                => 'Sètz convidat(ada) a vos identificar, mas es pas obligatòri.',
 'tooltip-pt-anonlogin'            => 'Sètz convidat(ada) a vos identificar, mas es pas obligatòri.',
 'tooltip-pt-logout'               => 'Se desconnectar',
 'tooltip-ca-talk'                 => "Discussion a prepaus d'aquesta pagina",
 'tooltip-ca-edit'                 => 'Podètz modificar aquesta pagina. Mercé de previsualizar abans d’enregistrar.',
-'tooltip-ca-addsection'           => 'Apondre un comentari a aquesta discussion.',
+'tooltip-ca-addsection'           => 'Començar una seccion novèla',
 'tooltip-ca-viewsource'           => 'Aquesta pagina es protegida. Çaquelà, ne podètz veire lo contengut.',
 'tooltip-ca-history'              => "Los autors e versions precedentas d'aquesta pagina.",
 'tooltip-ca-protect'              => 'Protegir aquesta pagina',
@@ -2172,6 +2394,8 @@ Totas las accions d’importacion interwiki son conservadas dins lo [[Special:Lo
 'tooltip-watch'                   => 'Apondre aquesta pagina a vòstra lista de seguit',
 'tooltip-recreate'                => 'Tornar crear la pagina, quitament se es estada escafada',
 'tooltip-upload'                  => 'Amodar lo mandadís',
+'tooltip-rollback'                => '"Revocar" anulla en un clic la o las edicion(s) sus aquesta pagina del darrièr contributor.',
+'tooltip-undo'                    => '"Desfar" revòca aquesta edicion e dobrís la fenèstra d’edicion en mòde previsualizacion. Permet d’apondre una rason dins la bóstia de resumit.',
 
 # Stylesheets
 'common.css'      => '/** Lo CSS plaçat aicí serà aplicat a totas las aparéncias. */',
@@ -2194,12 +2418,12 @@ Totas las accions d’importacion interwiki son conservadas dins lo [[Special:Lo
 'notacceptable'     => 'Aqueste servidor wiki pòt pas fornir las donadas dins un format que vòstre client es capable de legir.',
 
 # Attribution
-'anonymous'        => 'Utilizaire(s) anonim(s) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utilizaire anonim|Utilizaires anonims}} de {{SITENAME}}',
 'siteuser'         => 'Utilizaire $1 de {{SITENAME}}',
 'lastmodifiedatby' => 'Aquesta pagina es estada modificada pel darrièr còp lo $1 a $2 per $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basat sul trabalh de $1.',
 'others'           => 'autres',
-'siteusers'        => 'Utilizaire(s) $1',
+'siteusers'        => '{{PLURAL:$2|utilizaire|utilizaires}} $1 de {{SITENAME}}',
 'creditspage'      => 'Pagina de crèdits',
 'nocredits'        => 'I a pas d’entresenhas d’atribucion disponiblas per aquesta pagina.',
 
@@ -2220,6 +2444,16 @@ Aquò es probablament causat per un ligam sus lista negra que punta cap a un sit
 'numauthors'     => 'Nombre d’autors distints : $1',
 'numtalkauthors' => 'Nombre d’autors distints (pagina de discussion) : $1',
 
+# Skin names
+'skinname-standard'    => 'Estandard',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Colonha Blau',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'Mon interfàcia',
+'skinname-chick'       => 'Poleton',
+'skinname-simple'      => 'Simple',
+'skinname-modern'      => 'Modèrn',
+
 # Math options
 'mw_math_png'    => 'Totjorn produire un imatge PNG',
 'mw_math_simple' => 'HTML se plan simpla, si que non PNG',
@@ -2240,11 +2474,12 @@ Aquò es probablament causat per un ligam sus lista negra que punta cap a un sit
 'markedaspatrollederror-noautopatrol' => 'Avètz pas lo drech de marcar vòstras pròprias modificacions coma susvelhadas.',
 
 # Patrol log
-'patrol-log-page'   => 'Istoric de las versions patrolhadas',
-'patrol-log-header' => 'Vaquí un jornal de las versions patrolhadas.',
-'patrol-log-line'   => 'a marcat la version $1 de $2 coma verificada $3',
-'patrol-log-auto'   => '(automatic)',
-'patrol-log-diff'   => 'v$1',
+'patrol-log-page'      => 'Istoric de las versions patrolhadas',
+'patrol-log-header'    => 'Vaquí un jornal de las versions patrolhadas.',
+'patrol-log-line'      => 'a marcat la version $1 de $2 coma verificada $3',
+'patrol-log-auto'      => '(automatic)',
+'patrol-log-diff'      => 'v$1',
+'log-show-hide-patrol' => "$1 l'istoric de las versions patrolhadas",
 
 # Image deletion
 'deletedrevision'                 => 'La version anciana $1 es estada suprimida.',
@@ -2261,6 +2496,9 @@ $1",
 'previousdiff' => '� Cambiament precedent',
 'nextdiff'     => 'Cambiament seguent →',
 
+# Visual comparison
+'visual-comparison' => 'Comparason visuala',
+
 # Media information
 'mediawarning'         => '<b>Atencion</b>: Aqueste fichièr pòt conténer de còde malvolent, vòstre sistèma pòt èsser mes en dangièr per son execucion. <hr />',
 'imagemaxsize'         => 'Format maximal pels imatges dins las paginas de descripcion d’imatges :',
@@ -2273,10 +2511,12 @@ $1",
 'show-big-image'       => 'Imatge en resolucion mai nauta',
 'show-big-image-thumb' => "<small>Talha d'aqueste apercebut : $1 × $2 pixèls</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galariá dels fichièrs novèls',
 'imagelisttext'         => "Vaquí una lista de '''$1''' {{PLURAL:$1|fichièr|fichièrs}} classats $2.",
 'newimages-summary'     => 'Aquesta pagina especiala aficha los darrièrs fichièrs importats.',
+'newimages-legend'      => 'Filtre',
+'newimages-label'       => "Nom del fichièr (o una partida d'aqueste) :",
 'showhidebots'          => '($1 bòts)',
 'noimages'              => "Cap d'imatge d'afichar pas.",
 'ilsubmit'              => 'Cercar',
@@ -2289,37 +2529,6 @@ $1",
 Solas las listas d'enumeracion (las linhas començant per *) son presas en compte. Lo primièr ligam d'una linha deu èsser cap a un imatge marrit.
 Los autres ligams sus la meteissa linha son considerats coma d'excepcions, per exemple d'articles sulsquals l'imatge deu aparéisser.",
 
-/*
-Short names for language variants used for language conversion links.
-To disable showing a particular link, set it to 'disable', e.g.
-'variantname-zh-sg' => 'disable',
-Variants for Chinese language
-*/
-'variantname-zh-hans' => 'hans',
-'variantname-zh-hant' => 'hant',
-'variantname-zh-cn'   => 'cn',
-'variantname-zh-tw'   => 'tw',
-'variantname-zh-hk'   => 'hk',
-'variantname-zh-sg'   => 'sg',
-'variantname-zh'      => 'zh',
-
-# Variants for Serbian language
-'variantname-sr-ec' => 'sr-ec',
-'variantname-sr-el' => 'sr-el',
-'variantname-sr'    => 'sr',
-
-# Variants for Kazakh language
-'variantname-kk-kz'   => 'kk-kz',
-'variantname-kk-tr'   => 'kk-tr',
-'variantname-kk-cn'   => 'kk-cn',
-'variantname-kk-cyrl' => 'kk-cyrl',
-'variantname-kk-latn' => 'kk-latn',
-'variantname-kk-arab' => 'kk-arab',
-'variantname-kk'      => 'kk',
-
-# Variants for Kurdish language
-'variantname-ku-arab' => 'ku-Arab',
-
 # Metadata
 'metadata'          => 'Metadonadas',
 'metadata-help'     => "Aqueste fichièr conten d'entresenhas suplementàrias probablament apondudas per l’aparelh de fòto numeric o l'escanèr que las a aquesas. Se lo fichièr es estat modificat dempuèi son estat original, d'unes detalhs pòdon reflectir pas entièrament l’imatge modificat.",
@@ -2470,8 +2679,6 @@ Variants for Chinese language
 'exif-planarconfiguration-1' => 'Donadas atenentas',
 'exif-planarconfiguration-2' => 'Donadas separadas',
 
-'exif-xyresolution-c' => '$1 dpc',
-
 'exif-colorspace-ffff.h' => 'Pas calibrat',
 
 'exif-componentsconfiguration-0' => 'existís pas',
@@ -2513,11 +2720,21 @@ Variants for Chinese language
 'exif-lightsource-17'  => 'Lum estandard A',
 'exif-lightsource-18'  => 'Lum estandard B',
 'exif-lightsource-19'  => 'Lum estandard C',
-'exif-lightsource-22'  => 'D75',
-'exif-lightsource-23'  => 'D50',
 'exif-lightsource-24'  => "Tungstèni ISO d'estudiò",
 'exif-lightsource-255' => 'Autra font de lum',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flash pas desenclavat',
+'exif-flash-fired-1'    => 'Flash desenclavat',
+'exif-flash-return-0'   => "cap d'estroboscòpi retorna pas una foncion de deteccion",
+'exif-flash-return-2'   => "l'estroboscòpi retorna un lum pas detectat",
+'exif-flash-return-3'   => "l'estroboscòpi retorna un lum detectat",
+'exif-flash-mode-1'     => 'lum del flash obligatòri',
+'exif-flash-mode-2'     => 'supression del flash obligatòri',
+'exif-flash-mode-3'     => 'Mòde automatic',
+'exif-flash-function-1' => 'Pas de foncion de flash',
+'exif-flash-redeye-1'   => 'Mòde anti uèlhs roges',
+
 'exif-focalplaneresolutionunit-2' => 'poce',
 
 'exif-sensingmethod-1' => 'Pas definit',
@@ -2660,25 +2877,15 @@ $1
 Confirmatz que desiratz tornar crear aqueste article.",
 'recreate'            => 'Tornar crear',
 
-# HTML dump
-'redirectingto' => 'Redireccion cap a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Volètz refrescar aquesta pagina (purgar l'amagatal) ?
-
-$1",
 'confirm_purge_button' => 'Confirmar',
-
-# AJAX search
-'searchcontaining' => 'Cercar los articles que contenon « $1 ».',
-'searchnamed'      => 'Cercar los articles nomenats « $1 ».',
-'articletitles'    => 'Articles que començan per « $1 »',
-'hideresults'      => 'Amagar los resultats',
-'useajaxsearch'    => 'Utilizar la recèrca AJAX',
+'confirm-purge-top'    => "Volètz refrescar aquesta pagina (purgar l'amagatal) ?",
+'confirm-purge-bottom' => "Purgar una pagina vioda l'amagatal e fòrça la darrièra version a èsser afichada.",
 
 # Separators for various lists, etc.
 'colon-separator'    => '&nbsp;:&#32;',
 'autocomment-prefix' => '-',
+'pipe-separator'     => '&#32;•&#32;',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pagina precedenta',
@@ -2698,10 +2905,10 @@ $1",
 'table_pager_empty'        => 'Cap de resultat',
 
 # Auto-summaries
-'autosumm-blank'   => 'Resumit automatic : blanquiment',
+'autosumm-blank'   => 'Blanquiment de la pagina',
 'autosumm-replace' => 'Resumit automatic : contengut remplaçat per « $1 ».',
 'autoredircomment' => 'Redireccion cap a [[$1]]',
-'autosumm-new'     => 'Pagina novèla : $1',
+'autosumm-new'     => 'Creacion de la pagina amb « $1 »',
 
 # Size units
 'size-bytes'     => '$1 o',
@@ -2745,6 +2952,7 @@ Ensajatz la previsualizacion normala.',
 
 # Core parser functions
 'unknown_extension_tag' => "Balisa d'extension « $1 » desconeguda",
+'duplicate-defaultsort' => 'Atencion : La clau de triada per defaut « $2 » espotís la mai recenta « $1 ».',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2773,13 +2981,13 @@ Ensajatz la previsualizacion normala.',
 'filepath-submit'  => "Camin d'accès",
 'filepath-summary' => "Aquesta pagina especiala balha lo camin d'accès complet d’un fichièr ; los imatges son mostrats en nauta resolucion, los fichièrs audiò e vidèo s’executan amb lor programa associat.
 
-Picatz lo nom del fichièr sens lo prefix « {{ns:image}}: »",
+Picatz lo nom del fichièr sens lo prefix « {{ns:file}}: »",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Recèrca dels fichièrs en doble',
 'fileduplicatesearch-summary'  => 'Recèrca per de fichièrs en doble sus la banca de valors fragmentàrias.
 
-Picatz lo nom del fichièr sens lo prefix « {{ns:image}}: ».',
+Picatz lo nom del fichièr sens lo prefix « {{ns:file}}: ».',
 'fileduplicatesearch-legend'   => 'Recèrca d’un doble',
 'fileduplicatesearch-filename' => 'Nom del fichièr :',
 'fileduplicatesearch-submit'   => 'Recercar',
@@ -2809,4 +3017,13 @@ Picatz lo nom del fichièr sens lo prefix « {{ns:image}}: ».',
 'blankpage'              => 'Pagina voida',
 'intentionallyblankpage' => 'Aquesta pagina es intencionalament voida e es utilizada coma un tèst de performància, eca.',
 
+# External image whitelist
+'external_image_whitelist' => " #Daissatz aquesta linha exactament coma es<pre>
+#Indicatz los còdes d’expression regularas (sonque la partida indicada entre los //) çaijós
+#Correspondràn amb las URLs dels imatges (fòrt ligadas) extèrnes 
+#Atal, aquesta correspondéncia s'aficharà coma d'imatges, siquenon solament un ligam cap a l'imatge serà afichat
+#Las linhas que començan amb # seràn consideradas coma de comentaris
+
+#Indicatz totes los fragments d’expressions regularas en bas d'aquesta linha. Aquesta darrièra deu èsser daissada exactament coma es.</pre>",
+
 );
diff --git a/languages/messages/MessagesOm.php b/languages/messages/MessagesOm.php
new file mode 100644
index 00000000..1533194b
--- /dev/null
+++ b/languages/messages/MessagesOm.php
@@ -0,0 +1,44 @@
+<?php
+/** Oromo (Oromoo)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Malafaya
+ * @author Node ue
+ */
+
+$messages = array(
+# Dates
+'sunday'    => 'Dilbata',
+'monday'    => 'Wiixata',
+'tuesday'   => 'Qibxata',
+'wednesday' => 'Roobii',
+'thursday'  => 'Kamiisa',
+'friday'    => 'Jimaata',
+'saturday'  => 'Sanbata',
+'sun'       => 'Dil',
+'mon'       => 'Wix',
+'tue'       => 'Qib',
+'wed'       => 'Rob',
+'thu'       => 'Kam',
+'fri'       => 'Jim',
+'sat'       => 'San',
+'january'   => 'Amajjii',
+'february'  => 'Guraandhala',
+'march'     => 'Bitooteessa',
+'april'     => 'Elba',
+'may_long'  => 'Caamsa',
+'june'      => 'Waxabajjii',
+'july'      => 'Adooleessa',
+'august'    => 'Hagayya',
+'september' => 'Fuulbana',
+'october'   => 'Onkololeessa',
+'november'  => 'Sadaasa',
+'december'  => 'Muddee',
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'mainpage'             => 'Fuula Dura',
+'mainpage-description' => 'Fuula Dura',
+
+);
diff --git a/languages/messages/MessagesOr.php b/languages/messages/MessagesOr.php
index 67dfa0ae..6ff16568 100644
--- a/languages/messages/MessagesOr.php
+++ b/languages/messages/MessagesOr.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Jose77
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  */
 
@@ -21,8 +22,69 @@ $digitTransformTable = array(
 );
 
 $messages = array(
+'mytalk'     => 'ମୋ କଥା',
+'navigation' => 'ଦିଗ�ଦର�ଶକ',
+
+'help'             => 'ସାହାଜ�ଯ',
+'search'           => 'ସନ�ଧାନ',
+'searchbutton'     => 'ସନ�ଧାନ',
+'history_short'    => 'ଇତିହାସ',
+'protect'          => 'ସ�ରଖ�ଯା',
+'talk'             => 'ଆଲୋଚନା',
+'toolbox'          => 'ଜନ�ତ�ର ବାକ�ସ',
+'jumptonavigation' => 'ଦିଗ�ଦର�ଶକ',
+'jumptosearch'     => 'ସନ�ଧାନ',
+
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'mainpage'             => 'ପ�ରଧାନ ପୃଷ�ଠା',
-'mainpage-description' => 'ପ�ରଧାନ ପୃଷ�ଠା',
+'mainpage'             => 'ପ�ରଧାନ ପ�ର�ଷ�ଟ�ଆ',
+'mainpage-description' => 'ପ�ରଧାନ ପ�ର�ଷ�ଟ�ଆ',
+
+'viewsourcelink' => 'େଦଖ ଉର�ସ',
+
+# General errors
+'viewsource' => 'େଦଖ ଉର�ସ',
+
+# Edit pages
+'summary'  => 'ସାରକଥା:',
+'showdiff' => 'େଦଖାଅ ପରିବର�ତନଗ�ଡିକ',
+
+# Preferences page
+'searchresultshead' => 'ସନ�ଧାନ',
+
+# Recent changes linked
+'recentchangeslinked' => 'ସମ�ବଧ�ହିତ ପରିବର�ତନ',
+
+# Upload
+'filedesc'          => 'ସାରକଥା',
+'fileuploadsummary' => 'ସାରକଥା:',
+
+# Special:LinkSearch
+'linksearch-ok' => 'ସନ�ଧାନ',
+
+# Watchlist
+'watch' => 'େଦଖ',
+
+# Undelete
+'undelete-search-submit' => 'ସନ�ଧାନ',
+
+# Contributions
+'contributions' => 'ବ�ଯବହରକାରୀନ�କ ଅନ�ଦାନ',
+
+'sp-contributions-submit' => 'ସନ�ଧାନ',
+
+# Block/unblock
+'ipblocklist-submit' => 'ସନ�ଧାନ',
+
+# Tooltip help for the actions
+'tooltip-p-logo' => 'ପ�ରଧାନ ପ�ର�ଷ�ଟ�ଆ',
+
+# Special:NewFiles
+'ilsubmit' => 'ସନ�ଧାନ',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch-submit' => 'ସନ�ଧାନ',
+
+# Special:SpecialPages
+'specialpages' => 'ସ�ବତନ�ତ�ର',
 
 );
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index 09d140ca..2ca5640b 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -10,14 +10,6 @@
 
 $fallback = 'ru';
 
-$skinNames = array(
-	'standard' => 'Стандартон',
-	'nostalgia' => 'Æнкъард',
-	'cologneblue' => 'Кёльны æрхæндæг',
-	'monobook' => 'Моно-чиныг',
-	'myskin' => 'Мæхи',
-	'chick' => 'Карк'
-);
 $namespaceNames = array(
 	NS_MEDIA            => 'Media', //чтоб не пи�ать "Мультимеди�"
 	NS_SPECIAL          => 'Сæрмагонд',
@@ -27,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => '�рхайæджы_ди�ку��и',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Ди�ку��и_$1',
-	NS_IMAGE            => '�ыв',
-	NS_IMAGE_TALK       => '�ывы_тыххæй_ди�ку��и',
+	NS_FILE             => '�ыв',
+	NS_FILE_TALK        => '�ывы_тыххæй_ди�ку��и',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Ди�ку��и_MediaWiki',
 	NS_TEMPLATE         => 'Шаблон',
@@ -130,6 +122,7 @@ $messages = array(
 'category-empty'                => "''�цы категори афтид ма у.''",
 'hidden-categories'             => 'Æмбæх�т {{PLURAL:$1|категори|категоритæ}}',
 'hidden-category-category'      => 'Æмбæх�т категоритæ', # Name of the category where hidden categories will be listed
+'category-subcat-count'         => '{{PLURAL:$2|�цы категорийы мидæг æрмæ�т иу дæлкатегори и.|{{PLURAL:$1|$1 дæлкатегори æвды�т у|$1 дæлкатегорийы æвды�т �ты}}, æдæппæт $2.}}',
 'category-subcat-count-limited' => '�цы категорийы мидæг и� {{PLURAL:$1|$1 дæлкатегори|$1 дæлкатегорийы}}.',
 'category-file-count-limited'   => '�цы категорийы {{PLURAL:$1|$1 файл|$1 файлы}} и�.',
 'listingcontinuesabbrev'        => '(дарддæрдзу)',
@@ -141,6 +134,7 @@ $messages = array(
 'qbbrowse'       => 'Фен',
 'qbedit'         => 'Баив æй',
 'qbpageoptions'  => '�цы фар�',
+'qbpageinfo'     => 'Фар�ы контек�т',
 'qbmyoptions'    => 'Мæ фæр�тæ',
 'qbspecialpages' => 'Сæрмагонд фæр�тæ',
 'moredotdotdot'  => 'Фылдæр…',
@@ -148,9 +142,10 @@ $messages = array(
 'mytalk'         => 'Дæумæ цы дзурынц',
 'anontalk'       => '�цы IP-адри�ы ди�ку��и',
 'navigation'     => 'хъæугæ æрвитæнтæ',
-'and'            => 'æмæ',
+'and'            => '&#32;æмæ',
 
 'errorpagetitle'    => 'Рæдыд',
+'returnto'          => '$1 фар�мæ раздæх.',
 'tagline'           => 'Сæрибар �нциклопеди Википедийы æрмæг.',
 'help'              => 'Æххуы�',
 'search'            => 'агур',
@@ -159,6 +154,7 @@ $messages = array(
 'searcharticle'     => 'Стать�мæ',
 'history'           => 'Фар�ы и�тори',
 'history_short'     => 'И�тори',
+'info_short'        => 'Информаци',
 'printableversion'  => 'Мыхурмæ вер�и',
 'permalink'         => '�цы вер�имæ æрвитæн',
 'print'             => 'Мыхуыр',
@@ -195,11 +191,12 @@ $messages = array(
 'redirectpagesub'   => 'Рарвитыны фар�',
 'lastmodifiedat'    => '�цы фар� фæ�таг хатт ивд æрцыд: $1, $2.', # $1 date, $2 time
 'protectedpage'     => 'Æхгæд фар�',
+'jumptonavigation'  => 'навигаци',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{grammar:genitive|{{SITENAME}}}} тыххæй',
 'aboutpage'            => 'Project:�фы�т',
-'bugreports'           => 'Рæдыдыл хъуы�ынгæнинаг',
+'copyrightpage'        => '{{ns:project}}:�вторы бартæ',
 'currentevents'        => '�ог хабæрттæ',
 'currentevents-url'    => 'Project:Xabar',
 'mainpage'             => 'Сæйраг фар�',
@@ -219,13 +216,17 @@ $messages = array(
 'editsection'         => 'баив æй',
 'editold'             => 'баив æй',
 'viewsourceold'       => 'йæ код фен',
+'editlink'            => 'баив æй',
+'viewsourcelink'      => 'йæ код фен',
 'editsectionhint'     => 'Баив æй: $1',
 'toc'                 => 'Сæргæндтæ',
 'showtoc'             => 'равди�',
 'hidetoc'             => 'бамбæх�',
 'viewdeleted'         => '$1 фенын дæ фæнды?',
-'site-rss-feed'       => '$1 — RSS-уаццаг',
-'site-atom-feed'      => '$1 — Atom-уаццаг',
+'site-rss-feed'       => '$1 — RSS-уадздзаг',
+'site-atom-feed'      => '$1 — Atom-уадздзаг',
+'page-rss-feed'       => '«$1» — RSS-уадздзаг',
+'page-atom-feed'      => '«$1» — Atom-уадздзаг',
 'red-link-title'      => '$1 (фы�т нæма у)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
@@ -291,6 +292,7 @@ $messages = array(
 'badsiglength'            => 'Æгæр даргъ къухæрфы�т, хъуамæ $1 дамгъæйæ къаддæр уа.',
 'email'                   => 'Эл. по�ты адри�',
 'loginsuccess'            => '�ыр та Википедийы архайы� $1, зæгъгæ, ахæм номæй.',
+'nouserspecified'         => 'Дæхи бацамонын хъæуы: дæ архайæджы ном цы у.',
 'wrongpasswordempty'      => 'Пароль афтид уыд. �фтæ нæ баззы, ныффы�-ма и�ты пароль.',
 'mailmypassword'          => 'Рарвит мæм ног пароль',
 'noemail'                 => '�рхайæг $1 йæ �лектрон по�ты адри� нæ ныууагъта.',
@@ -298,7 +300,9 @@ $messages = array(
 'loginlanguagelabel'      => 'Æвзаг: $1',
 
 # Password reset dialog
-'resetpass_text' => '<!-- Бахæ�� дæ тек�т ам -->',
+'resetpass_text'          => '<!-- Бахæ�� дæ тек�т ам -->',
+'newpassword'             => '�овый пароль',
+'resetpass-temp-password' => 'Рæ�тæгмæ пароль:',
 
 # Edit page toolbar
 'bold_sample'     => '�цы тек�т бæзджын �уыдзæн',
@@ -313,8 +317,8 @@ $messages = array(
 'math_tip'        => 'Математикон формулæ (формат LaTeX)',
 
 # Edit pages
-'summary'            => 'Ивддзинæдты миди�',
-'subject'            => 'Темæ/�æргонд',
+'summary'            => 'Ивддзинæдты миди�:',
+'subject'            => 'Темæ/�æргонд:',
 'minoredit'          => '�й чы�ыл ивддзинад у.',
 'watchthis'          => '�цы фар�мæ дæ цæ�т æрдар',
 'savearticle'        => '�фтæ уæд!',
@@ -322,14 +326,16 @@ $messages = array(
 'showdiff'           => 'Цы баивтай ацы тек�ты, уый фен',
 'blockednoreason'    => 'аххо� амынд не ’рцыд',
 'newarticle'         => '(�ог)',
-'note'               => '<strong>Бафиппай:</strong>',
+'note'               => "'''Бафиппай:'''",
 'editing'            => 'Ивы�: $1',
+'editingsection'     => 'Ивы� $1 (фар�ы хай)',
 'editconflict'       => 'Ивыны конфликт: $1',
-'longpagewarning'    => '<strong>Р�ГФÆДЗ�ХСТ: �цы фар�ы бæрцуат у $1 килобайты.
+'longpagewarning'    => "'''Р�ГФÆДЗ�ХСТ: �цы фар�ы бæрцуат у $1 килобайты.
 Сæ бæрцуат 32 килобайтæй фылдæр кæмæн у, ахæм фæр�тæ иуæй-иу браузерты ра�т нæ зынынц.
-Кæд ахæм вариант и, уæд ацы фар�æй цалдæр фар�ы �кæн.</strong>',
+Кæд ахæм вариант и, уæд ацы фар�æй цалдæр фар�ы �кæн.'''",
 'templatesused'      => '�цы фар�ы шаблонтæ:',
 'template-protected' => '(æхгæд)',
+'edit-conflict'      => 'Иввдзинæдты конфликт.',
 
 # History pages
 'currentrev'          => '�ырыккон вер�и',
@@ -339,6 +345,8 @@ $messages = array(
 'page_first'          => 'фыццаг',
 'page_last'           => 'фæ�таг',
 'histlegend'          => 'Куыд æй æмбарын: (нырыккон) = нырыккон вер�ийæ хъауджыдæрдзинад, (раздæры) = раздæры вер�ийæ хъауджыдæрдзинад, Ч = чы�ыл ивддзинад.',
+'histfirst'           => 'раздæр',
+'histlast'            => 'фæ�тæдæр',
 'historyempty'        => '(афтид)',
 
 # Revision feed
@@ -355,34 +363,71 @@ $messages = array(
 'lineno' => 'Рæнхъ $1:',
 
 # Search results
-'searchresults'      => 'Цы ��ардæуы',
-'titlematches'       => 'Стать�ты �æргæндты æмцаутæ',
-'textmatches'        => 'Стать�ты æмцаутæ',
-'prevn'              => '$1 фæ�тæмæ',
-'nextn'              => '$1 размæ',
-'searchall'          => 'æппæт',
-'powersearch'        => 'Сæрмагонд агуырд',
-'powersearch-legend' => 'Сæрмагонд агуырд',
+'searchresults'            => 'Цы ��ардæуы',
+'titlematches'             => 'Стать�ты �æргæндты æмцаутæ',
+'textmatches'              => 'Стать�ты æмцаутæ',
+'prevn'                    => '$1 фæ�тæмæ',
+'nextn'                    => '$1 размæ',
+'viewprevnext'             => 'Фен ($1) ($2) ($3)',
+'search-section'           => '(хай $1)',
+'search-interwiki-caption' => 'Æф�ымæрон проекттæ',
+'searchall'                => 'æппæт',
+'powersearch'              => 'Сæрмагонд агуырд',
+'powersearch-legend'       => 'Сæрмагонд агуырд',
 
 # Preferences page
 'mypreferences'           => 'Æрмадз',
 'prefsnologin'            => 'Си�темæйæн дæхи нæ бацамыдтай',
+'qbsettings'              => '�авигацион таг',
 'qbsettings-none'         => 'Ма равди�',
 'qbsettings-fixedleft'    => 'Галиуырдыгæй',
 'qbsettings-fixedright'   => 'Рахизырдыгæй',
 'qbsettings-floatingleft' => 'Рахизырдыгæй ленккæнгæ',
-'newpassword'             => '�овый пароль',
+'skin-preview'            => 'Разæрка�т',
 'rows'                    => 'Рæнхътæ:',
 'timezonelegend'          => 'Сахаты таг',
 'localtime'               => 'Бынатон рæ�тæг',
 'timezoneoffset'          => 'Хъауджыдæрдзинад',
 
 # Groups
-'group-all' => '(æппæт)',
+'group'            => 'Къорд:',
+'group-user'       => '�рхайджытæ',
+'group-bot'        => 'Роботтæ',
+'group-sysop'      => '�дминтæ',
+'group-bureaucrat' => 'Бюрократтæ',
+'group-all'        => '(æппæт)',
+
+'group-user-member'       => 'архайæг',
+'group-bot-member'        => 'робот',
+'group-sysop-member'      => 'админ',
+'group-bureaucrat-member' => 'бюрократ',
+
+'grouppage-user'       => '{{ns:project}}:�рхайджытæ',
+'grouppage-bot'        => '{{ns:project}}:Роботтæ',
+'grouppage-sysop'      => '{{ns:project}}:�дминтæ',
+'grouppage-bureaucrat' => '{{ns:project}}:Бюрократтæ',
+
+# Rights
+'right-read'          => 'фæр�тæ кæ�ын',
+'right-edit'          => 'фæр�тæ ивын',
+'right-move'          => 'фæр�ты нæмттæ ивын',
+'right-move-subpages' => 'фæр�ты æмæ �æ дæлфæр�ты нæмттæ ивын',
+'right-movefile'      => 'файлты нæмттæ ивын',
+'right-upload'        => 'файлтæ �æвæрын',
+'right-upload_by_url' => 'интернет-адри�æй файлтæ �æвæрын',
+'right-delete'        => 'фæр�тæ аппарын',
+'right-bigdelete'     => 'фæр�тæ æмæ �æ ивды и�тори аппарын',
 
 # User rights log
 'rightsnone' => '(нæй)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'     => 'ацы фар� кæ�ын',
+'action-edit'     => 'ацы фар� ивын',
+'action-move'     => 'ацы фар�ы ном ивын',
+'action-movefile' => 'ацы файлы ном ивын',
+'action-delete'   => 'ацы фар� аппарын',
+
 # Recent changes
 'recentchanges'     => 'Фæ�таг ивддзинæдтæ',
 'recentchangestext' => '�цы фар�ыл ирон Википедийы фæ�таг ивддзинæдтæ фенæн и�.',
@@ -402,26 +447,33 @@ $3',
 'recentchangeslinked' => 'Ба�т ивддзинæдтæ',
 
 # Upload
-'upload'          => '�ог файл �æвæр',
-'uploadbtn'       => '�ог файл �æвæр',
-'uploadnologin'   => 'Си�темæйæн дæхи нæ бацамыдтай',
-'filename'        => 'Файлы ном',
-'savefile'        => 'Бавæр æй',
-'uploadvirus'     => 'Файлы разынд виру�! Кæ� $1',
-'watchthisupload' => '�цы файлмæ дæ цæ�т æрдар',
-
-# Special:ImageList
-'imagelist' => '�ывты номхыгъд',
-
-# Image description page
-'filehist'          => 'Файлы и�тори',
-'filehist-current'  => 'нырыккон',
-'filehist-datetime' => 'Датæ/рæ�тæг',
-'filehist-user'     => '�рхайæг',
-'filehist-filesize' => 'Файлы бæрцуат',
-'filehist-comment'  => 'Фиппаинаг',
-'imagelinks'        => 'Æрвитæнтæ',
-'linkstoimage'      => '�цы нывæй пайда {{PLURAL:$1|кæны иу фар�|кæнынц ахæм фæр�тæ}}:',
+'upload'           => '�ог файл �æвæр',
+'uploadbtn'        => '�ог файл �æвæр',
+'uploadnologin'    => 'Си�темæйæн дæхи нæ бацамыдтай',
+'uploaderror'      => 'Файл �æвæрыны рæдыд',
+'filename'         => 'Файлы ном',
+'minlength1'       => 'Файлы номы хъуамæ æппынкъаддæр иу дамгъæ уа.',
+'fileexists-thumb' => "<center>'''И� ахæм файл'''</center>",
+'successfulupload' => 'Файлы �æвæрд фæрæ�тмæ',
+'savefile'         => 'Бавæр æй',
+'uploadvirus'      => 'Файлы разынд виру�! Кæ� $1',
+'watchthisupload'  => '�цы файлмæ дæ цæ�т æрдар',
+
+'upload-file-error' => 'Мидæг рæдыд',
+
+# Special:ListFiles
+'listfiles' => '�ывты номхыгъд',
+
+# File description page
+'filehist'                  => 'Файлы и�тори',
+'filehist-current'          => 'нырыккон',
+'filehist-datetime'         => 'Датæ/рæ�тæг',
+'filehist-user'             => '�рхайæг',
+'filehist-filesize'         => 'Файлы бæрцуат',
+'filehist-comment'          => 'Фиппаинаг',
+'imagelinks'                => 'Æрвитæнтæ файлмæ',
+'linkstoimage'              => '�цы нывæй пайда {{PLURAL:$1|кæны иу фар�|кæнынц ахæм фæр�тæ}}:',
+'shareduploadwiki-linktext' => 'файлы �фы�ты фар�ы',
 
 # File deletion
 'filedelete-submit'           => '�ппар',
@@ -431,35 +483,48 @@ $3',
 # MIME search
 'download' => 'æрбавгæн',
 
+# Unused templates
+'unusedtemplates' => 'Пайда кæмæй нæ чындæуы, ахæм шаблонтæ',
+
 # Random page
 'randompage' => 'Æнæбары æвзæр�т фар�',
 
 # Statistics
-'userstats'     => '�рхайджыты �тати�тикæ',
-'userstatstext' => "Реги�трацигонд {{PLURAL:$1|æрцыд '''иу архайæг'''|æрцыды�ты $1 [[Special:ListUsers|архайæджы]]}}, уыдонæй '''$2''' (ома �æ '''$4%''') {{PLURAL:$2|у|�ты}} $5.",
+'statistics-header-users' => '�рхайджыты �тати�тикæ',
 
 'brokenredirects-edit'   => '(баив æй)',
 'brokenredirects-delete' => '(аппар)',
 
 'withoutinterwiki-submit' => 'Равди�',
 
+'fewestrevisions' => 'Къаддæр кæй ивынц, ахæм фæр�тæ',
+
 # Miscellaneous special pages
-'nbytes'            => '$1 {{PLURAL:$1|байт|байты}}',
-'nlinks'            => '$1 {{PLURAL:$1|æрвитæн|æрвитæны}}',
-'nviews'            => '$1 {{PLURAL:$1|æрка�т|æрка�ты}}',
-'lonelypages'       => 'Сидзæр фæр�тæ',
-'wantedcategories'  => 'Хъæугæ категоритæ',
-'wantedpages'       => 'Хъæугæ фæр�тæ',
-'shortpages'        => 'Цыбыр фæр�тæ',
-'longpages'         => 'Даргъ фæр�тæ',
-'protectedpages'    => 'Æхгæд фæр�тæ',
-'listusers'         => '�рхайджыты номхыгъд',
-'newpages'          => '�ог фæр�тæ',
-'newpages-username' => '�рхайæг:',
-'ancientpages'      => 'Зæронддæр фæр�тæ',
-'move'              => '�ом баив',
+'nbytes'                 => '$1 {{PLURAL:$1|байт|байты}}',
+'nlinks'                 => '$1 {{PLURAL:$1|æрвитæн|æрвитæны}}',
+'nviews'                 => '$1 {{PLURAL:$1|æрка�т|æрка�ты}}',
+'lonelypages'            => 'Сидзæр фæр�тæ',
+'uncategorizedpages'     => 'Æнæкатегори фæр�тæ',
+'uncategorizedimages'    => 'Æнæкатегори файлтæ',
+'uncategorizedtemplates' => 'Æнæкатегори шаблонтæ',
+'wantedcategories'       => 'Хъæугæ категоритæ',
+'wantedpages'            => 'Хъæугæ фæр�тæ',
+'mostlinked'             => 'Фылдæр æрвитæнтæ кæмæ и, ахæм фæр�тæ',
+'mostlinkedcategories'   => 'Фылдæр æрвитæнтæ кæмæ и, уыцы категоритæ',
+'mostrevisions'          => 'Фылдæр кæй ивынц, ахæм фæр�тæ',
+'shortpages'             => 'Цыбыр фæр�тæ',
+'longpages'              => 'Даргъ фæр�тæ',
+'protectedpages'         => 'Æхгæд фæр�тæ',
+'listusers'              => '�рхайджыты номхыгъд',
+'newpages'               => '�ог фæр�тæ',
+'newpages-username'      => '�рхайæг:',
+'ancientpages'           => 'Зæронддæр фæр�тæ',
+'move'                   => '�ом баив',
+'pager-newer-n'          => '{{PLURAL:$1|фæ�тæдæр иу|фæ�тæдæр $1}}',
+'pager-older-n'          => '{{PLURAL:$1|раздæр иу|раздæр $1}}',
 
 # Special:Log
+'specialloguserlabel'  => '�рхайæг:',
 'speciallogtitlelabel' => 'Сæргонд:',
 
 # Special:AllPages
@@ -475,48 +540,59 @@ $3',
 'special-categories-sort-count' => 'нымæцмæ гæ�гæ равæр',
 'special-categories-sort-abc'   => 'алфавитмæ гæ�гæ равæр',
 
+# Special:LinkSearch
+'linksearch-ok' => '�гур',
+
 # Special:ListUsers
 'listusers-submit' => 'Равди�',
 
+# Special:ListGroupRights
+'listgrouprights-group' => 'Къорд',
+
 # E-mail user
 'mailnologintext' => 'Фы�тæгтæ æрвитынмæ хъуамæ [[Special:UserLogin|�и�темæйæн дæхи бавди�ай]] æмæ дæ бæлвырд �лектронон по�ты адри� [[Special:Preferences|ныффы��ай]].',
 'emailpage'       => 'Электронон фы�тæг йæм барвит',
 
 # Watchlist
-'watchlist'            => 'Цæ�тдарды номхыгъд',
-'mywatchlist'          => 'Дæ цæ�т кæмæ дары�, уыцы фæр�тæ',
-'nowatchlist'          => 'Иу �тать�мæ дæр дæ цæ�т нæ дары�.',
-'watchnologin'         => 'Си�темæйæн дæхи нæ бацамыдтай',
-'watchnologintext'     => '�цы номхыгъд ивынмæ [[Special:UserLogin|хъуамæ дæхи бацамонай �и�темæйæн]].',
-'addedwatch'           => 'Дæ цæ�т кæмæ дары�, уыцы �тать�тæм бафтыд.',
-'watch'                => 'Дæ цæ�т æрдар',
-'watchthispage'        => '�цы фар�мæ дæ цæ�т æрдар',
-'unwatch'              => 'Мауал дæ цæ�т дар',
-'watchlist-details'    => '$1 фар�мæ дæ цæ�т дары�, ди�ку��иты фæ�тæмæ.',
-'watchlistcontains'    => 'Дæ цæ�т $1 фар�мæ дары�.',
-'wlnote'               => "Дæлæ афæ�таг '''$2 �ахаты дæргъы''' цы $1 {{PLURAL:$1|ивддзинад|ивддзинады}} æрцыди.",
-'wlshowlast'           => 'Фæ�тæг $1 �ахаты, $2 боны дæргъы; $3.',
-'watchlist-show-bots'  => 'Роботты куы�т равди�',
-'watchlist-hide-bots'  => 'Роботты куы�т бамбæх�',
-'watchlist-show-own'   => 'Мæхæдæг цы ивддзинæдтæ �кодтон, уыдон равди�',
-'watchlist-hide-own'   => 'Мæхæдæг цы ивддзинæдтæ �кодтон, уыдон бамбæх�',
-'watchlist-show-minor' => 'Чы�ыл ивддзинæдтæ равди�',
-'watchlist-hide-minor' => 'Чы�ыл ивддзинæдтæ бамбæх�',
+'watchlist'         => 'Цæ�тдарды номхыгъд',
+'mywatchlist'       => 'Дæ цæ�т кæмæ дары�, уыцы фæр�тæ',
+'nowatchlist'       => 'Иу �тать�мæ дæр дæ цæ�т нæ дары�.',
+'watchnologin'      => 'Си�темæйæн дæхи нæ бацамыдтай',
+'watchnologintext'  => '�цы номхыгъд ивынмæ [[Special:UserLogin|хъуамæ дæхи бацамонай �и�темæйæн]].',
+'addedwatch'        => 'Дæ цæ�т кæмæ дары�, уыцы �тать�тæм бафтыд.',
+'removedwatch'      => '�ал дары� дæ цæ�т',
+'removedwatchtext'  => 'Фар�мæ «[[:$1]]» нал дары� дæ цæ�т.',
+'watch'             => 'Дæ цæ�т æрдар',
+'watchthispage'     => '�цы фар�мæ дæ цæ�т æрдар',
+'unwatch'           => 'Мауал дæ цæ�т дар',
+'watchlist-details' => '$1 фар�мæ дæ цæ�т дары�, ди�ку��иты фæ�тæмæ.',
+'watchlistcontains' => 'Дæ цæ�т $1 фар�мæ дары�.',
+'wlnote'            => "Дæлæ афæ�таг '''$2 �ахаты дæргъы''' цы $1 {{PLURAL:$1|ивддзинад|ивддзинады}} æрцыди.",
+'wlshowlast'        => 'Фæ�тæг $1 �ахаты, $2 боны дæргъы; $3.',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Цæ�тдард фæр�ты номхыгъдмæ афтауын...',
 'unwatching' => 'Цæ�тдард фæр�ты номхыгъдæй аиувар� кæнын...',
 
-# Delete/protect/revert
+# Delete
 'exblank'               => 'фар� афтид уыди�',
 'deleteotherreason'     => 'Æндæр кæнæ уæлæмха�æн аххо�:',
 'deletereasonotherlist' => 'Æндæр аххо�',
-'restriction-type'      => 'Бартæ:',
+
+# Protect
+'protectcomment'         => 'Сæхкæнынæн аххо�:',
+'protectexpiry'          => 'Кæдмæ æхгæд у:',
+'protect-othertime'      => 'Æндæр рæ�тæг:',
+'protect-othertime-op'   => 'æндæр рæ�тæг',
+'protect-otherreason'    => 'Æндæр аххо�/уæлæмха�æн:',
+'protect-otherreason-op' => 'æндæр кæнæ уæлæмха�æн аххо�',
+'restriction-type'       => 'Бартæ:',
 
 # Restrictions (nouns)
 'restriction-edit' => 'Ивын',
 
 # Namespace form on various pages
+'namespace'      => '�æмтты тыгъдад:',
 'blanknamespace' => '(Сæйраг)',
 
 # Contributions
@@ -529,23 +605,28 @@ $3',
 # What links here
 'whatlinkshere'           => 'Цавæр æрвитæнтæ цæуынц ардæм',
 'whatlinkshere-page'      => 'Фар�:',
-'linklistsub'             => '(Æрвитæнты номхыгъд)',
+'whatlinkshere-next'      => '{{PLURAL:$1|фæдылдзог|фæдылдзог $1}}',
 'whatlinkshere-links'     => '� æрвитæнтæ',
 'whatlinkshere-hidelinks' => '$1 æрвитæнтæ',
 'whatlinkshere-filters'   => 'Фильтртæ',
 
 # Block/unblock
-'ipbreason'          => '�ххо�',
-'ipbreasonotherlist' => 'Æндæр аххо�',
-'ipbotherreason'     => 'Æндæр кæнæ уæлæмха�æн аххо�:',
-'ipb-blocklist'      => '�ктуалон хъоды равди�',
-'ipblocklist-legend' => 'Хъодыгонд архайæджы ацагур',
-'ipblocklist-empty'  => 'Хъодыгæндты номхыгъд афтид у.',
-'contribslink'       => 'бавæрд',
-'blocklogpage'       => 'Хъодыты лог',
+'blockip'                => 'Бахъоды кæн',
+'blockip-legend'         => 'Бахъоды æй кæн',
+'ipbreason'              => '�ххо�',
+'ipbreasonotherlist'     => 'Æндæр аххо�',
+'ipbotherreason'         => 'Æндæр кæнæ уæлæмха�æн аххо�:',
+'ipb-blocklist'          => '�ктуалон хъоды равди�',
+'ipb-blocklist-contribs' => '$1, зæгъгæ, уыцы архайæджы бавæрд',
+'ipblocklist-legend'     => 'Хъодыгонд архайæджы ацагур',
+'ipblocklist-empty'      => 'Хъодыгæндты номхыгъд афтид у.',
+'blocklink'              => 'бахъоды кæн',
+'contribslink'           => 'бавæрд',
+'blocklogpage'           => 'Хъодыты лог',
 
 # Move page
 'movearticle' => 'Стать�йы ном баив',
+'movenologin' => 'Си�темæйæн дæхи нæ бацамыдтай',
 'newtitle'    => '�ог ном',
 'move-watch'  => '�цы фар�мæ дæ цæ�т æрдар',
 'movereason'  => '�ххо�:',
@@ -557,24 +638,28 @@ $3',
 'importnotext' => '�фтид у кæнæ тек�т дзы нæй',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'     => 'Мæхи фар� (дæу тыххæй ам ныффы��)',
-'tooltip-pt-mytalk'       => 'Мæ ди�ку��и',
-'tooltip-pt-preferences'  => 'Википеди куыд ку�ы, уый �рæвдз кæн дæ хъæуындзинæдтæм гæ�гæ',
-'tooltip-pt-mycontris'    => 'Мæ бавæрд',
-'tooltip-pt-login'        => 'Си�темæмæ дæхи бацамонай, кæд æцæг дæ хæ� нæу, уæддæр',
-'tooltip-pt-logout'       => 'Реги�трацигонд �еан�æй рацу',
-'tooltip-ca-edit'         => '�цы фар� дæ бон у ивын. Дæ хорзæхæй, «Фен уал æй» джыбыйæ пайда кæн',
-'tooltip-ca-protect'      => '�цы фар� ивддзинæдтæй �æхгæн',
-'tooltip-ca-delete'       => '�ппар ацы фар�',
-'tooltip-ca-watch'        => 'Дæ цæ�т кæмæ дары�, уыцы фæр�ты номхыгъдмæ бафтау',
-'tooltip-n-mainpage'      => 'Сæйраг фар�мæ рацу',
-'tooltip-n-portal'        => 'Проекты тыххæй æмæ, дæу цы бон у, уый тыххæй дæр',
-'tooltip-n-recentchanges' => 'Чи æмæ цавæр �тать�ты баивта',
-'tooltip-n-help'          => 'Кæд цыдæртæ нæ бамбæр�тай',
-'tooltip-t-whatlinkshere' => '�цы фар�мæ чи ’рвитынц, ахæм фæр�ты номхыгъд',
-'tooltip-t-upload'        => '�ывтæ кæнæ мультимедиа-файлтæ бавæр',
-'tooltip-t-specialpages'  => 'Сæрмагонд фæр�ты номхыгъд',
-'tooltip-ca-nstab-image'  => '�ывы фар�',
+'tooltip-pt-userpage'      => 'Мæхи фар� (дæу тыххæй ам ныффы��)',
+'tooltip-pt-mytalk'        => 'Æндæр ахрхайджытæ мын цы дзурынц',
+'tooltip-pt-preferences'   => 'Википеди куыд ку�ы, уый �рæвдз кæн дæ хъæуындзинæдтæм гæ�гæ',
+'tooltip-pt-mycontris'     => 'Цы у мæ бавæрд',
+'tooltip-pt-login'         => 'Си�темæмæ дæхи бацамонай, кæд æцæг дæ хæ� нæу, уæддæр',
+'tooltip-pt-logout'        => 'Реги�трацигонд �еан�æй рацу',
+'tooltip-ca-edit'          => '�цы фар� дæ бон у ивын. Дæ хорзæхæй, «Фен уал æй» джыбыйæ пайда кæн',
+'tooltip-ca-protect'       => '�цы фар� ивддзинæдтæй �æхгæн',
+'tooltip-ca-delete'        => '�ппар ацы фар�',
+'tooltip-ca-watch'         => 'Дæ цæ�т кæмæ дары�, уыцы фæр�ты номхыгъдмæ бафтау',
+'tooltip-n-mainpage'       => 'Сæйраг фар�мæ рацу',
+'tooltip-n-portal'         => 'Проекты тыххæй æмæ, дæу цы бон у, уый тыххæй дæр',
+'tooltip-n-recentchanges'  => 'Чи æмæ цавæр �тать�ты баивта',
+'tooltip-n-randompage'     => 'Æнæбары æвзæр�т фар� фен',
+'tooltip-n-help'           => 'Кæд цыдæртæ нæ бамбæр�тай',
+'tooltip-t-whatlinkshere'  => '�цы фар�мæ чи ’рвитынц, ахæм фæр�ты номхыгъд',
+'tooltip-t-upload'         => '�ывтæ кæнæ мультимедиа-файлтæ бавæр',
+'tooltip-t-specialpages'   => 'Сæрмагонд фæр�ты номхыгъд',
+'tooltip-t-permalink'      => 'Фар�ы ацы вер�имæ æрвитæн (фæр�тæ ивынц, ацы вер�и — никуы)',
+'tooltip-ca-nstab-user'    => '�рхайæджы фар� фен',
+'tooltip-ca-nstab-project' => 'Проекты фар�',
+'tooltip-ca-nstab-image'   => '�ывы фар�',
 
 # Attribution
 'others' => 'æндæртæ',
@@ -582,14 +667,30 @@ $3',
 # Spam protection
 'spamprotectiontitle' => 'Спамы ныхмæ фильтр',
 
+# Skin names
+'skinname-standard'    => 'Стандартон',
+'skinname-nostalgia'   => 'Æнкъард',
+'skinname-cologneblue' => 'Кёльны æрхæндæг',
+'skinname-monobook'    => 'Моно-чиныг',
+'skinname-myskin'      => 'Мæхи',
+'skinname-chick'       => 'Карк',
+
+# Browsing diffs
+'previousdiff' => '� Раздæры ивддзинад',
+'nextdiff'     => 'Фæ�тæдæр ивддзинад →',
+
 # Media information
-'widthheightpage' => '$1 × $2, $3 фар�ы',
+'widthheightpage' => '$1 × $2, $3 {{PLURAL:$3|фар�|фар�ы}}',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => '�ог нывты галерей',
 'ilsubmit'  => '�гур',
 'bydate'    => 'рæ�тæгмæ гæ�гæ',
 
+# Metadata
+'metadata'        => 'Метабæрæггæнæнтæ',
+'metadata-expand' => 'Фылдæр детальтæ равди�',
+
 # EXIF tags
 'exif-artist' => 'Чи йæ �и�та',
 
diff --git a/languages/messages/MessagesPa.php b/languages/messages/MessagesPa.php
index 83e0ff6d..2a65c1ab 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -11,14 +11,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'ਕਲਾਸਿਕ',
-	'monobook'    => 'ਮੋਨੋਬ�ੱਕ',
-	'myskin'      => 'ਮੇਰੀਸਕਿਨ',
-	'chick'       => 'ਚੀਚਕ',
-	'simple'      => 'ਸੈਂਪਲ'
-);
-
 $namespaceNames = array(
 	NS_MEDIA          => 'ਮੀਡੀਆ',
 	NS_SPECIAL        => 'ਖਾਸ',
@@ -28,8 +20,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'ਮੈਂਬਰ_ਚਰਚਾ',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_ਚਰਚਾ',
-	NS_IMAGE          => 'ਤਸਵੀਰ',
-	NS_IMAGE_TALK     => 'ਤਸਵੀਰ_ਚਰਚਾ',
+	NS_FILE           => 'ਤਸਵੀਰ',
+	NS_FILE_TALK      => 'ਤਸਵੀਰ_ਚਰਚਾ',
 	NS_MEDIAWIKI      => 'ਮੀਡੀਆਵਿਕਿ',
 	NS_MEDIAWIKI_TALK => 'ਮੀਡੀਆਵਿਕਿ_ਚਰਚਾ',
 	NS_TEMPLATE       => 'ਨਮੂਨਾ',
@@ -70,8 +62,6 @@ $messages = array(
 'underline-never'   => 'ਕਦੇ ਨਹੀਂ',
 'underline-default' => 'ਬਰਾਊਜ਼ਰ ਡਿਫਾਲਟ',
 
-'skinpreview' => '(�ਲਕ)',
-
 # Dates
 'sunday'        => '�ਤਵਾਰ',
 'monday'        => 'ਸੋਮਵਾਰ',
@@ -149,7 +139,7 @@ $messages = array(
 'mytalk'         => 'ਮੇਰੀ ਗੱਲਬਾਤ',
 'anontalk'       => 'ਇਹ IP ਲਈ ਗੱਲਬਾਤ',
 'navigation'     => 'ਨੇਵੀਗੇਸ਼ਨ',
-'and'            => 'ਅਤੇ',
+'and'            => '&#32;ਅਤੇ',
 
 'errorpagetitle'    => 'ਗਲਤੀ',
 'returnto'          => '$1 ਤੇ ਵਾਪਸ ਜਾਓ',
@@ -207,8 +197,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} ਬਾਰੇ',
 'aboutpage'            => 'Project:ਬਾਰੇ',
-'bugreports'           => 'ਬੱਗ ਰਿਪੋਰਟਾਂ',
-'bugreportspage'       => 'Project:ਬੱਗ ਰਿਪੋਰਟ',
 'copyright'            => 'ਸਮੱਗਰੀ $1 ਹੇਠ ਉਪਲੱਬਧ ਹੈ।',
 'copyrightpagename'    => '{{SITENAME}} ਕਾਪੀਰਾਈਟ',
 'copyrightpage'        => '{{ns:project}}:ਕਾਪੀਰਾਈਟ',
@@ -281,11 +269,11 @@ A list of valid special pages can be found at [[Special:SpecialPages]].",
 
 # Login and logout pages
 'logouttitle'                => 'ਯੂਜ਼ਰ ਲਾਗਆਉਟ',
-'logouttext'                 => '<strong>ਹ�ਣ ਤ�ਸੀਂ ਲਾਗਆਉਟ ਹੋ ਗ� ਹੋ।</strong><br />
+'logouttext'                 => "'''ਹ�ਣ ਤ�ਸੀਂ ਲਾਗਆਉਟ ਹੋ ਗ� ਹੋ।'''<br />
 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.',
+your browser cache.",
 'welcomecreation'            => "== ਜੀ ਆਇਆਂ ਨੂੰ, $1! ==
 
 Your account has been created. Don't forget to change your {{SITENAME}} preferences.",
@@ -295,7 +283,6 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'yourpasswordagain'          => 'ਪਾਸਵਰਡ ਮ�ੜ-ਲਿਖੋ:',
 'remembermypassword'         => 'ਇਹ ਕੰਪਿਊਟਰ ਲਈ ਆਪਣਾ ਲਾਗਇਨ ਯਾਦ ਰੱਖੋ',
 'yourdomainname'             => 'ਤ�ਹਾਡੀ ਡੋਮੇਨ:',
-'loginproblem'               => '<b>ਤ�ਹਾਡੇ ਲਾਗਇਨ ਨਾਲ ਇੱਕ ਸਮੱਸਿਆ ਹੈ।</b><br />ਮ�ੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ!',
 'login'                      => 'ਲਾਗ ਇਨ',
 'nav-login-createaccount'    => 'ਲਾਗ ਇਨ / ਅਕਾਊਂਟ ਬਣਾਓ',
 'loginprompt'                => 'ਤ�ਹਾਨੂੰ {{SITENAME}} ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਲਈ ਕੂਕੀਜ਼ ਯੋਗ ਕਰਨੇ ਜ਼ਰੂਰੀ ਹਨ।',
@@ -363,11 +350,13 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'resetpass'               => 'ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਰੀ-ਸੈੱਟ ਕਰੋ',
 'resetpass_announce'      => 'ਤ�ਸੀਂ ਇੱਕ ਆਰਜ਼ੀ ਈ-ਮੇਲ ਕੀਤੇ ਕੋਡ ਨਾਲ ਲਾਗਇਨ ਕੀਤਾ ਹੈ। ਲਾਗਇਨ ਪੂਰਾ ਕਰਨ ਲਈ, ਤ�ਹਾਨੂੰ ਇੱਥੇ ਨਵਾਂ ਪਾਸਵਰਡ ਦੇਣਾ ਪਵੇਗਾ:',
 'resetpass_header'        => 'ਪਾਸਵਰਡ ਰੀ-ਸੈੱਟ ਕਰੋ',
+'oldpassword'             => 'ਪ�ਰਾਣਾ ਪਾਸਵਰਡ:',
+'newpassword'             => 'ਨਵਾਂ ਪਾਸਵਰਡ:',
+'retypenew'               => 'ਨਵਾਂ ਪਾਸਵਰਡ ਮ�ੜ-ਲਿਖੋ:',
 'resetpass_submit'        => 'ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ ਅਤੇ ਲਾਗਇਨ ਕਰੋ',
 'resetpass_success'       => 'ਤ�ਹਾਡਾ ਪਾਸਵਰਡ ਠੀਕ ਤਰਾਂ ਬਦਲਿਆ ਗਿਆ ਹੈ! ਹ�ਣ ਤ�ਸੀਂ ਲਾਗਇਨ ਕਰ ਸਕਦੇ ਹੋ...',
 'resetpass_bad_temporary' => 'ਗਲਤ ਆਰਜ਼ੀ ਪਾਸਵਰਡ ਹੈ। ਤ�ਸੀਂ ਸ਼ਾਇਦ ਪਹਿਲਾਂ ਹੀ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲ ਚ�ੱਕੇ ਹੋ ਜਾਂ ਇੱਕ ਨਵੇਂ ਆਰਜ਼ੀ ਪਾਸਵਰਡ ਦੀ ਮੰਗ ਭੇਜੀ ਹੈ।',
 'resetpass_forbidden'     => 'ਇਹ ਵਿਕਿ ਲਈ ਪਾਸਵਰਡ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।',
-'resetpass_missing'       => 'ਕੋਈ ਫਾਰਮ ਡਾਟਾ ਨਹੀਂ।',
 
 # Edit page toolbar
 'bold_sample'     => 'ਬੋਲਡ ਟੈਕਸਟ',
@@ -384,8 +373,8 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'hr_tip'          => 'ਹਾਰੀਜ਼ਟਲ ਲਾਈਨ (use sparingly)',
 
 # Edit pages
-'summary'                => 'ਸੰਖੇਪ',
-'subject'                => 'ਵਿਸ਼ਾ/ਹੈੱਡਲਾਈਨ',
+'summary'                => 'ਸੰਖੇਪ:',
+'subject'                => 'ਵਿਸ਼ਾ/ਹੈੱਡਲਾਈਨ:',
 'minoredit'              => 'ਇਹ ਛੋਟੀ ਸੋਧ ਹੈ',
 'watchthis'              => 'ਇਹ ਪੇਜ ਵਾਚ ਕਰੋ',
 'savearticle'            => 'ਪੇਜ ਸੰਭਾਲੋ',
@@ -395,8 +384,8 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'showdiff'               => 'ਬਦਲਾਅ ਵੇਖਾਓ',
 'anoneditwarning'        => "'''ਚੇਤਾਵਨੀ:''' ਤ�ਸੀਂ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਹੈ। ਤ�ਹਾਡਾ IP �ਡਰੈੱਸ ਇਸ ਪੇਜ ਦੇ �ਡਿਟ ਅਤੀਤ ਵਿੱਚ ਰਿਕਾਰਡ ਕੀਤਾ ਜਾਵੇਗਾ।",
 'missingcommenttext'     => 'ਹੇਠਾਂ ਇੱਕ ਟਿੱਪਣੀ ਦਿਓ।',
-'summary-preview'        => 'ਸੰਖੇਪ �ਲਕ',
-'subject-preview'        => 'ਵਿਸ਼ਾ/ਹੈੱਡਲਾਈਨ �ਲਕ',
+'summary-preview'        => 'ਸੰਖੇਪ �ਲਕ:',
+'subject-preview'        => 'ਵਿਸ਼ਾ/ਹੈੱਡਲਾਈਨ �ਲਕ:',
 'blockedtitle'           => 'ਯੂਜ਼ਰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ',
 'whitelistedittitle'     => 'ਸੋਧਣ ਲਈ ਲਾਗਇਨ ਕਰਨਾ ਪਵੇਗਾ',
 'whitelistedittext'      => 'ਪੇਜ ਸੋਧਣ ਲਈ ਤ�ਹਾਨੂੰ $1 ਕਰਨਾ ਪਵੇਗਾ।',
@@ -409,8 +398,8 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'accmailtext'            => '"$1" ਲਈ ਪਾਸਵਰਡ $2 ਨੂੰ ਭੇਜਿਆ ਗਿਆ।',
 'newarticle'             => '(ਨਵਾਂ)',
 'updated'                => '(ਅੱਪਡੇਟ)',
-'note'                   => '<strong>ਨੋਟ:</strong>',
-'previewnote'            => '<strong>ਇਹ ਸਿਰਫ਼ ਇੱਕ �ਲਕ ਹੈ; ਬਦਲਾਅ ਹਾਲੇ ਸੰਭਾਲੇ ਨਹੀਂ ਗ� ਹਨ!</strong>',
+'note'                   => "'''ਨੋਟ:'''",
+'previewnote'            => "'''ਇਹ ਸਿਰਫ਼ ਇੱਕ �ਲਕ ਹੈ; ਬਦਲਾਅ ਹਾਲੇ ਸੰਭਾਲੇ ਨਹੀਂ ਗ� ਹਨ!'''",
 'editing'                => '$1 ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ',
 'editingsection'         => '$1 (ਸ਼ੈਕਸ਼ਨ) ਸੋਧ',
 'editingcomment'         => '$1 (ਟਿੱਪਣੀ) ਸੋਧ',
@@ -431,7 +420,6 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 
 # History pages
 'viewpagelogs'        => 'ਇਸ ਪੇਜ ਦੇ ਲਈ ਲਾਗ ਵੇਖੋ',
-'revnotfound'         => 'ਰੀਵਿਜ਼ਨ ਨਹੀਂ ਲੱਭਿਆ',
 'currentrev'          => 'ਮੌਜੂਦਾ ਰੀਵਿਜ਼ਨ',
 'revisionasof'        => '$1 ਦੇ ਰੀਵਿਜ਼ਨ ਵਾਂਗ',
 'previousrevision'    => '�ਪ�ਰਾਣਾ ਰੀਵਿਜ਼ਨ',
@@ -471,6 +459,8 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'lineno'                  => 'ਲਾਈਨ $1:',
 'compareselectedversions' => 'ਚ�ਣੇ ਵਰਜਨਾਂ ਦੀ ਤ�ਲਨਾ',
 'editundo'                => 'ਵਾਪਸ(undo)',
+'diff-width'              => 'ਚੌੜਾਈ',
+'diff-height'             => 'ਉਚਾਈ',
 
 # Search results
 'searchresults'         => 'ਖੋਜ ਨਤੀਜੇ',
@@ -485,6 +475,7 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'prevn'                 => 'ਪਿੱਛੇ $1',
 'nextn'                 => 'ਅੱਗੇ $1',
 'viewprevnext'          => 'ਵੇਖੋ ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:ਸਮੱਗਰੀ',
 'searchall'             => 'ਸਭ',
 'powersearch'           => 'ਖੋਜ',
 
@@ -499,6 +490,7 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'qbsettings-none'       => 'ਕੋਈ ਨਹੀਂ',
 'changepassword'        => 'ਪਾਸਵਰਡ ਬਦਲੋ',
 'skin'                  => 'ਸਕਿਨ',
+'skin-preview'          => '�ਲਕ',
 'math'                  => 'ਗਣਿਤ',
 'dateformat'            => 'ਮਿਤੀ ਫਾਰਮੈਟ',
 'datedefault'           => 'ਕੋਈ ਪਸੰਦ ਨਹੀਂ',
@@ -514,9 +506,6 @@ $1 ਘੰਟੇ ਵਿੱਚ। ਨ�ਕਸਾਨ ਤੋਂ ਬਚਣ ਲਈ, $
 'prefs-misc'            => 'ਫ�ਟਕਲ',
 'saveprefs'             => 'ਸੰਭਾਲੋ',
 'resetprefs'            => 'ਰੀ-ਸੈੱਟ',
-'oldpassword'           => 'ਪ�ਰਾਣਾ ਪਾਸਵਰਡ:',
-'newpassword'           => 'ਨਵਾਂ ਪਾਸਵਰਡ:',
-'retypenew'             => 'ਨਵਾਂ ਪਾਸਵਰਡ ਮ�ੜ-ਲਿਖੋ:',
 'textboxsize'           => 'ਸੰਪਾਦਨ',
 'rows'                  => 'ਕਤਾਰਾਂ:',
 'columns'               => 'ਕਾਲਮ:',
@@ -585,11 +574,11 @@ to upload files.',
 'minlength1'           => 'ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੱਖਰ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।',
 'badfilename'          => 'ਫਾਇਲ ਨਾਂ "$1" ਬਦਲਿਆ ਗਿਆ ਹੈ।',
 'filetype-missing'     => 'ਫਾਇਲ ਦੀ ਕੋਈ �ਕਸ਼ਟੇਸ਼ਨ ਨਹੀਂ ਹੈ (ਜਿਵੇਂ ".jpg").',
-'fileexists'           => 'ਇਹ ਫਾਇਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਜੇ ਤ�ਸੀਂ ਇਹ ਬਦਲਣ ਬਾਰੇ ਜਾਣਦੇ ਨਹੀਂ ਹੋ ਤਾਂ  <strong><tt>$1</tt></strong> ਵੇਖੋ ਜੀ।',
-'fileexists-extension' => 'ਇਸ ਨਾਂ ਨਾਲ ਰਲਦੀ ਫਾਇਲ ਮੌਜੂਦ ਹੈ:<br />
-ਅੱਪਲੋਡ ਕੀਤੀ ਫਾਇਲ ਦਾ ਨਾਂ: <strong><tt>$1</tt></strong><br />
-ਮੌਜੂਦ ਫਾਇਲ ਦਾ ਨਾਂ: <strong><tt>$2</tt></strong><br />
-ਇੱਕ ਵੱਖਰਾ ਨਾਂ ਚ�ਣੋ ਜੀ',
+'fileexists'           => "ਇਹ ਫਾਇਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਜੇ ਤ�ਸੀਂ ਇਹ ਬਦਲਣ ਬਾਰੇ ਜਾਣਦੇ ਨਹੀਂ ਹੋ ਤਾਂ  '''<tt>$1</tt>''' ਵੇਖੋ ਜੀ।",
+'fileexists-extension' => "ਇਸ ਨਾਂ ਨਾਲ ਰਲਦੀ ਫਾਇਲ ਮੌਜੂਦ ਹੈ:<br />
+ਅੱਪਲੋਡ ਕੀਤੀ ਫਾਇਲ ਦਾ ਨਾਂ: '''<tt>$1</tt>'''<br />
+ਮੌਜੂਦ ਫਾਇਲ ਦਾ ਨਾਂ: '''<tt>$2</tt>'''<br />
+ਇੱਕ ਵੱਖਰਾ ਨਾਂ ਚ�ਣੋ ਜੀ",
 'fileexists-thumb'     => "<center>'''ਮੌਜੂਦ ਚਿੱਤਰ'''</center>",
 'successfulupload'     => 'ਠੀਕ ਤਰ�ਹਾਂ ਅੱਪਲੋਡ',
 'uploadwarning'        => 'ਅੱਪਲੋਡ ਚੇਤਾਵਨੀ',
@@ -611,16 +600,16 @@ to upload files.',
 'license-nopreview'  => '(�ਲਕ ਉਪਲੱਬਧ ਨਹੀਂ)',
 'upload_source_file' => ' (ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੱਕ ਫਾਇਲ)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => 'ਫਾਇਲ',
-'imagelist'             => 'ਫਾਇਲ ਲਿਸਟ',
-'imagelist_date'        => 'ਮਿਤੀ',
-'imagelist_name'        => 'ਨਾਂ',
-'imagelist_user'        => 'ਯੂਜ਼ਰ',
-'imagelist_size'        => 'ਆਕਾਰ',
-'imagelist_description' => 'ਵੇਰਵਾ',
-
-# Image description page
+'listfiles'             => 'ਫਾਇਲ ਲਿਸਟ',
+'listfiles_date'        => 'ਮਿਤੀ',
+'listfiles_name'        => 'ਨਾਂ',
+'listfiles_user'        => 'ਯੂਜ਼ਰ',
+'listfiles_size'        => 'ਆਕਾਰ',
+'listfiles_description' => 'ਵੇਰਵਾ',
+
+# File description page
 'filehist'                  => 'ਫਾਇਲ ਅਤੀਤ',
 'filehist-deleteall'        => 'ਸਭ ਹਟਾਓ',
 'filehist-deleteone'        => 'ਇਹ ਹਟਾਓ',
@@ -654,10 +643,9 @@ to upload files.',
 'download'   => 'ਡਾਊਨਲੋਡ',
 
 # Statistics
-'statistics'             => 'ਅੰਕੜੇ',
-'sitestats'              => '{{SITENAME}} ਅੰਕੜੇ',
-'userstats'              => 'ਯੂਜ਼ਰ ਅੰਕੜੇ',
-'statistics-mostpopular' => 'ਸਭ ਤੋਂ ਵੱਧ ਵੇਖੇ ਪੇਜ',
+'statistics'              => 'ਅੰਕੜੇ',
+'statistics-header-users' => 'ਯੂਜ਼ਰ ਅੰਕੜੇ',
+'statistics-mostpopular'  => 'ਸਭ ਤੋਂ ਵੱਧ ਵੇਖੇ ਪੇਜ',
 
 'brokenredirects-edit'   => '(ਸੋਧ)',
 'brokenredirects-delete' => '(ਹਟਾਓ)',
@@ -684,7 +672,6 @@ to upload files.',
 'speciallogtitlelabel' => 'ਟਾਇਟਲ:',
 'log'                  => 'ਲਾਗ',
 'all-logs-page'        => 'ਸਭ ਲਾਗ',
-'log-search-submit'    => 'ਜਾਓ',
 
 # Special:AllPages
 'allpages'          => 'ਸਭ ਪੇਜ',
@@ -721,17 +708,15 @@ to upload files.',
 'emailsenttext'   => 'ਤ�ਹਾਡੀ ਈਮੇਲ ਭੇਜੀ ਗਈ ਹੈ।',
 
 # Watchlist
-'watchlist'          => 'ਮੇਰੀ ਵਾਚ-ਲਿਸਟ',
-'mywatchlist'        => 'ਮੇਰੀ ਵਾਚ-ਲਿਸਟ',
-'watchlistfor'       => "('''$1''' ਲਈ)",
-'watchnologin'       => 'ਲਾਗਇਨ ਨਹੀਂ',
-'addedwatch'         => 'ਵਾਚ-ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਲ',
-'watch'              => 'ਵਾਚ',
-'watchthispage'      => 'ਇਹ ਪੇਜ ਵਾਚ ਕਰੋ',
-'unwatch'            => 'ਅਣ-ਵਾਚ',
-'wlshowlast'         => 'ਆਖਰੀ $1 ਦਿਨ $2 ਘੰਟੇ $3 ਵੇਖੋ',
-'watchlist-show-own' => 'ਮੇਰੀ ਸੋਧ ਵੇਖਾਓ',
-'watchlist-hide-own' => 'ਮੇਰੀ ਸੋਧ ਓਹਲੇ',
+'watchlist'     => 'ਮੇਰੀ ਵਾਚ-ਲਿਸਟ',
+'mywatchlist'   => 'ਮੇਰੀ ਵਾਚ-ਲਿਸਟ',
+'watchlistfor'  => "('''$1''' ਲਈ)",
+'watchnologin'  => 'ਲਾਗਇਨ ਨਹੀਂ',
+'addedwatch'    => 'ਵਾਚ-ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਲ',
+'watch'         => 'ਵਾਚ',
+'watchthispage' => 'ਇਹ ਪੇਜ ਵਾਚ ਕਰੋ',
+'unwatch'       => 'ਅਣ-ਵਾਚ',
+'wlshowlast'    => 'ਆਖਰੀ $1 ਦਿਨ $2 ਘੰਟੇ $3 ਵੇਖੋ',
 
 'enotif_newpagetext'           => 'ਇਹ ਨਵਾਂ ਪੇਜ ਹੈ।',
 'enotif_impersonal_salutation' => '{{SITENAME}} ਯੂਜ਼ਰ',
@@ -739,16 +724,20 @@ to upload files.',
 'created'                      => 'ਬਣਾਇਆ',
 'enotif_anon_editor'           => 'ਅਗਿਆਤ ਯੂਜ਼ਰ $1',
 
-# Delete/protect/revert
-'deletepage'       => 'ਪੇਜ ਹਟਾਓ',
-'confirm'          => 'ਪ�ਸ਼ਟੀ',
-'excontent'        => "ਸਮੱਗਰੀ ਸੀ: '$1'",
-'exblank'          => 'ਪੇਜ ਖਾਲੀ ਹੈ',
-'actioncomplete'   => '�ਕਸ਼ਨ ਪੂਰਾ ਹੋਇਆ',
-'deletedarticle'   => '"[[$1]]" ਹਟਾਇਆ',
-'rollback_short'   => 'ਰੋਲਬੈਕ',
-'rollbacklink'     => 'ਰੋਲਬੈਕ',
-'rollbackfailed'   => 'ਰੋਲਬੈਕ ਫੇਲ�ਹ',
+# Delete
+'deletepage'     => 'ਪੇਜ ਹਟਾਓ',
+'confirm'        => 'ਪ�ਸ਼ਟੀ',
+'excontent'      => "ਸਮੱਗਰੀ ਸੀ: '$1'",
+'exblank'        => 'ਪੇਜ ਖਾਲੀ ਹੈ',
+'actioncomplete' => '�ਕਸ਼ਨ ਪੂਰਾ ਹੋਇਆ',
+'deletedarticle' => '"[[$1]]" ਹਟਾਇਆ',
+
+# Rollback
+'rollback_short' => 'ਰੋਲਬੈਕ',
+'rollbacklink'   => 'ਰੋਲਬੈਕ',
+'rollbackfailed' => 'ਰੋਲਬੈਕ ਫੇਲ�ਹ',
+
+# Protect
 'protectlogpage'   => 'ਸ�ਰੱਖਿਆ ਲਾਗ',
 'protect-legend'   => 'ਸ�ਰੱਖਿਆ ਕਨਫਰਮ',
 'protectcomment'   => 'ਟਿੱਪਣੀ:',
@@ -770,9 +759,10 @@ to upload files.',
 'restriction-level-all'           => 'ਕੋਈ ਲੈਵਲ',
 
 # Undelete
-'undeletebtn'     => 'ਰੀਸਟੋਰ',
-'undeletereset'   => 'ਰੀ-ਸੈੱਟ',
-'undeletecomment' => 'ਟਿੱਪਣੀ:',
+'undeletebtn'               => 'ਰੀਸਟੋਰ',
+'undeletereset'             => 'ਰੀ-ਸੈੱਟ',
+'undeletecomment'           => 'ਟਿੱਪਣੀ:',
+'undelete-show-file-submit' => 'ਹਾਂ',
 
 # Namespace form on various pages
 'invert'         => 'ਉਲਟ ਚੋਣ',
@@ -788,7 +778,6 @@ to upload files.',
 'sp-contributions-submit'      => 'ਖੋਜ',
 
 # What links here
-'linklistsub'         => '(ਲਿੰਕਾਂ ਦੀ ਲਿਸਟ)',
 'whatlinkshere-links' => '� ਲਿੰਕ',
 
 # Block/unblock
@@ -824,6 +813,8 @@ to upload files.',
 # Move page
 'move-page-legend' => 'ਪੇਜ ਮੂਵ ਕਰੋ',
 'movearticle'      => 'ਪੇਜ ਮੂਵ ਕਰੋ:',
+'movenologin'      => 'ਲਾਗਇਨ ਨਹੀਂ ਹੋ',
+'movenologintext'  => 'ਇੱਕ ਪੇਜ ਮੂਵ ਕਰਨ ਲਈ ਤ�ਸੀਂ ਰਜਿਸਟਰਡ ਯੂਜ਼ਰ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ ਅਤੇ [[Special:UserLogin|logged in]] ਕੀਤਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।',
 'newtitle'         => 'ਨਵੇਂ ਟਾਇਟਲ ਲਈ:',
 'move-watch'       => 'ਇਹ ਪੇਜ ਵਾਚ ਕਰੋ',
 'movepagebtn'      => 'ਪੇਜ ਮੂਵ ਕਰੋ',
@@ -851,6 +842,7 @@ to upload files.',
 # Special:Import
 'import'                  => 'ਪੇਜ ਇੰਪੋਰਟ ਕਰੋ',
 'import-interwiki-submit' => 'ਇੰਪੋਰਟ',
+'import-comment'          => 'ਟਿੱਪਣੀ:',
 'importstart'             => 'ਪੇਜ ਇੰਪੋਰਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ...',
 'importfailed'            => 'ਇੰਪੋਰਟ ਫੇਲ�ਹ: $1',
 'importnotext'            => 'ਖਾਲੀ ਜਾਂ ਕੋਈ ਟੈਕਸਟ ਨਹੀਂ',
@@ -900,6 +892,13 @@ to upload files.',
 # Info page
 'infosubtitle' => 'ਸਫ਼ੇ ਦੀ ਜਾਣਕਾਰੀ',
 
+# Skin names
+'skinname-standard' => 'ਕਲਾਸਿਕ',
+'skinname-monobook' => 'ਮੋਨੋਬ�ੱਕ',
+'skinname-myskin'   => 'ਮੇਰੀਸਕਿਨ',
+'skinname-chick'    => 'ਚੀਚਕ',
+'skinname-simple'   => 'ਸੈਂਪਲ',
+
 # Patrol log
 'patrol-log-auto' => '(ਆਟੋਮੈਟਿਕ)',
 
@@ -916,7 +915,7 @@ to upload files.',
 'show-big-image'       => 'ਪੂਰਾ ਰੈਜ਼ੋਲੇਸ਼ਨ',
 'show-big-image-thumb' => '<small>ਇਹ �ਲਕ ਦਾ ਆਕਾਰ: $1 × $2 ਪਿਕਸਲ</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'ਨਵੀਆਂ ਫਾਇਲਾਂ ਦੀ ਗੈਲਰੀ',
 'noimages'  => 'ਵੇਖਣ ਲਈ ਕ�� ਨਹੀਂ',
 'ilsubmit'  => 'ਖੋਜ',
@@ -979,7 +978,7 @@ to upload files.',
 'confirmemail_subject'  => '{{SITENAME}} ਈਮੇਲ �ਡਰੈੱਸ ਪ�ਸ਼ਟੀ',
 
 # Scary transclusion
-'scarytranscludetoolong' => '[URL ਬਹ�ਤ ਲੰਮਾ ਹੈ; ਅਫਸੋਸ ਹੈ]',
+'scarytranscludetoolong' => '[ਅਫਸੋਸ ਹੈ ਕਿ URL ਬਹ�ਤ ਲੰਮਾ ਹੈ]',
 
 # Trackbacks
 'trackbackremove' => ' ([$1 ਹਟਾਓ])',
@@ -988,15 +987,9 @@ to upload files.',
 # Delete conflict
 'recreate' => 'ਮ�ੜ-ਬਣਾਓ',
 
-# HTML dump
-'redirectingto' => '[[:$1]] ਲਈ ਰੀ-ਡਿਰੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...',
-
 # action=purge
 'confirm_purge_button' => 'ਠੀਕ ਹੈ',
 
-# AJAX search
-'hideresults' => 'ਨਤੀਜੇ ਓਹਲੇ',
-
 # Multipage image navigation
 'imgmultipageprev' => '� ਪਿਛਲਾ ਪੇਜ',
 'imgmultipagenext' => 'ਅਗਲਾ ਪੇਜ →',
@@ -1031,4 +1024,7 @@ to upload files.',
 'specialpages'             => 'ਖਾਸ ਪੇਜ',
 'specialpages-group-login' => 'ਲਾਗ ਇਨ / ਅਕਾਊਂਟ ਬਣਾਓ',
 
+# Special:BlankPage
+'blankpage' => 'ਖ਼ਾਲੀ ਪੇਜ',
+
 );
diff --git a/languages/messages/MessagesPag.php b/languages/messages/MessagesPag.php
index be0307ea..33dd7de2 100644
--- a/languages/messages/MessagesPag.php
+++ b/languages/messages/MessagesPag.php
@@ -25,7 +25,7 @@ $messages = array(
 'mypage'         => 'Say bolong ko',
 'mytalk'         => 'Say tongtongan ko',
 'anontalk'       => 'Tongtongan para ed sayan IP',
-'and'            => 'san',
+'and'            => '&#32;san',
 
 'returnto'          => 'Impawel ed $1.',
 'help'              => 'Tolong',
@@ -106,6 +106,9 @@ $messages = array(
 'accountcreated'             => 'Agawa so account',
 'accountcreatedtext'         => 'Agawa la so user account para $1.',
 
+# Password reset dialog
+'newpassword' => 'Balon password:',
+
 # Edit page toolbar
 'link_tip' => 'Gawing ed loob',
 
@@ -145,6 +148,7 @@ $messages = array(
 # Search results
 'searchsubtitle'        => "'''[[:$1]]''' so inanap mo.",
 'searchsubtitleinvalid' => "'''$1''' so inanap mo.",
+'searchhelp-url'        => 'Help:Saray Laman',
 'powersearch'           => 'Anapen',
 
 # Preferences page
@@ -156,7 +160,6 @@ $messages = array(
 'math_unknown_error' => 'aga-antan error',
 'prefs-rc'           => 'Sampot ran binalo',
 'prefs-watchlist'    => 'Listaan na babantayan',
-'newpassword'        => 'Balon password:',
 'textboxsize'        => 'Babaloen',
 'searchresultshead'  => 'Anapen',
 
@@ -180,10 +183,10 @@ $messages = array(
 'sourcefilename'  => 'Filename na pinanlapuan:',
 'watchthisupload' => 'Bantayan yan bolong',
 
-# Special:ImageList
-'imagelist_name' => 'Ngaran',
+# Special:ListFiles
+'listfiles_name' => 'Ngaran',
 
-# Image description page
+# File description page
 'imagelinks'       => 'Saray Gawing',
 'noimage-linktext' => 'I-segep ya',
 
@@ -215,8 +218,7 @@ $messages = array(
 'booksources-go'            => 'Ula',
 
 # Special:Log
-'all-logs-page'     => 'Amin ran log',
-'log-search-submit' => 'Ula',
+'all-logs-page' => 'Amin ran log',
 
 # Special:AllPages
 'allpages'          => 'Amin ya bolobolong',
@@ -231,6 +233,14 @@ $messages = array(
 'allpagessubmit'    => 'Ula',
 'allpagesprefix'    => 'Ipanengneng so saray bolobolong ya walay prefix:',
 
+# Special:LinkSearch
+'linksearch'     => 'Anapen ramay gawing ed web',
+'linksearch-pat' => 'Anapen so pattern:',
+'linksearch-ok'  => 'Anapen',
+
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Balon user',
+
 # E-mail user
 'emailuser'     => 'E-mail so ayan user',
 'emailfrom'     => 'Manlapud',
@@ -257,15 +267,18 @@ No labay mon ekalen may bolong diad listaan na babantayan, tapik mo labat so \"e
 'changed'            => 'asalatan',
 'created'            => 'agawa',
 
-# Delete/protect/revert
-'deletepage'          => 'Buralen so bolong',
-'confirm'             => 'Paletan',
-'exblank'             => 'Anggapoy laman na bolong',
-'actioncomplete'      => 'Asumpal lan agawa',
-'deletedtext'         => 'Abural lay "<nowiki>$1</nowiki>".
+# Delete
+'deletepage'     => 'Buralen so bolong',
+'confirm'        => 'Paletan',
+'exblank'        => 'Anggapoy laman na bolong',
+'actioncomplete' => 'Asumpal lan agawa',
+'deletedtext'    => 'Abural lay "<nowiki>$1</nowiki>".
 Pinengneng so $2 para ed listaan na saray abural ran balo.',
-'deletedarticle'      => 'binural so "[[$1]]"',
-'deletecomment'       => 'Aken buralen',
+'deletedarticle' => 'binural so "[[$1]]"',
+'deletecomment'  => 'Aken buralen',
+
+# Protect
+'prot_1movedto2'      => 'say [[$1]] enyales paula ed [[$2]]',
 'protect-legend'      => 'Palitaen so pangiyagel',
 'protect-level-sysop' => 'Sysops labat',
 
@@ -343,7 +356,7 @@ Pinengneng so $2 para ed listaan na saray abural ran balo.',
 # Attribution
 'lastmodifiedatby' => 'Sampot ya binalo yan bolong nen agew ya $2, $1 nen $3.', # $1 date, $2 time, $3 user
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Anapen',
 
 # EXIF tags
@@ -366,13 +379,7 @@ Pinengneng so $2 para ed listaan na saray abural ran balo.',
 'deletedwhileediting' => 'Pasakbay: Abural yan bolong nen ginapuan mon baloen!',
 
 # action=purge
-'confirm_purge' => 'Ekalen so cache na sayan bolong?
-
-$1',
-
-# AJAX search
-'articletitles' => "Saray article na manggagapo ed ''$1''",
-'hideresults'   => 'Iyamot so saray result',
+'confirm-purge-top' => 'Ekalen so cache na sayan bolong?',
 
 # Multipage image navigation
 'imgmultipagenext' => 'ontombok ya bolong →',
diff --git a/languages/messages/MessagesPam.php b/languages/messages/MessagesPam.php
index 793af351..aefcf04a 100644
--- a/languages/messages/MessagesPam.php
+++ b/languages/messages/MessagesPam.php
@@ -56,8 +56,6 @@ Pabusten ing pamanaliling dake kapamilatan [alilan] ning suglung',
 'underline-never'   => 'emaliari agiang misan',
 'underline-default' => 'Browser default',
 
-'skinpreview' => '(I-preview)',
-
 # Dates
 'sunday'        => 'Dominggu',
 'monday'        => 'Lunis',
@@ -150,7 +148,7 @@ Pabusten ing pamanaliling dake kapamilatan [alilan] ning suglung',
 'mytalk'         => 'Makisabi kaku',
 'anontalk'       => 'Pamakisabi para keng IPing ini',
 'navigation'     => 'Pamaglibut',
-'and'            => 'ampo',
+'and'            => '&#32;ampo',
 
 'errorpagetitle'    => 'Mali',
 'returnto'          => 'Magbalik king $1.',
@@ -210,8 +208,6 @@ Pabusten ing pamanaliling dake kapamilatan [alilan] ning suglung',
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Tungkul {{SITENAME}}',
 'aboutpage'            => 'Project:tungkul',
-'bugreports'           => 'Tala da reng bug',
-'bugreportspage'       => 'Project:Ulat kareng bug',
 'copyright'            => 'Mipaintulutan ing laman na niti lalam ning $1.',
 'copyrightpagename'    => 'Copyright (katulirang mangopia) ning {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Deng Copyright',
@@ -234,8 +230,6 @@ Pabusten ing pamanaliling dake kapamilatan [alilan] ning suglung',
 
 'badaccess'        => 'Kapintulutan kamalian',
 'badaccess-group0' => 'Ala kang paintulut para daptan mu ing pamipamuk a inyawad mu.',
-'badaccess-group1' => 'Ing pamipamuc a inyawad mu kareng yang talagamit ning lupun $1.',
-'badaccess-group2' => 'Ing pamipamuk a inyawad mu kareng yang talagamit karing metung a lupun $1.',
 'badaccess-groups' => 'Ing pamipamuk a inyawad mu kareng yang talagamit karing metung a lupun $1.',
 
 'versionrequired'     => 'Ing bersion $1 ning MediaWiki ing kailangan',
@@ -327,7 +321,6 @@ Ini ing sangkan a binie ning talapanibalang minyara: $1',
 'cannotdelete'         => "E mebura ing bulung o file a pinili mu.  (Mapalyaring ati'nang aliwang memura kaniti.)",
 'badtitle'             => 'Matsurang pamansag',
 'badtitletext'         => 'E ya matatanggap o ala yang laman, o bansag yang inter-language o inter-wiki a e ustu pamisuglung, ing bansag ning bulung a paintunan mu. Mapalyaring atin yang metung o maygit pang letra o kulit (character) a e malyaring gamitan kareng bansag/pamagat.',
-'perfdisabled'         => 'Pasensia na ka! Pansamantala yang makapatda ing gamit (feature) a iti uling papabagalan ne ing database, anggang e ne bisang gumana ing wiki.',
 'perfcached'           => 'Makasimpan (cached) ya iting makatuking data, at mapalyaring e ne makapanaun.',
 'perfcachedts'         => 'Makasimpan (cached) ya ing makatuking data, at tauli yang mibayu kanitang $1.',
 'querypage-no-updates' => 'Updates for this page are currently disabled. Data here will not presently be refreshed.
@@ -343,7 +336,7 @@ Pakisubukan mung pasibayu kaibat ning mapilang minutu.',
 'protectedpagetext'    => 'Ining bulung a iti misusi ya para eya ma-edit',
 'viewsourcetext'       => 'Malyari meng lon at kopian ing pikuanan (source) ning bulung a ini:',
 'protectedinterface'   => 'Maki interface text ya para king software ing bulung a iti. Makasara ya ba yang e mayabusu.',
-'editinginterface'     => "'''Babala:''' Babie yang interface text para king software ing bulung a i-edit mu. Makayapektu la king itsura ning user interface para kareng aliwang gagamit deng pamagbayu keti. Malyari lang munta king [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki] deng bisang sumaup king pamaglikas.",
+'editinginterface'     => "'''Babala:''' Babie yang interface text para king software ing bulung a i-edit mu. Makayapektu la king itsura ning user interface para kareng aliwang gagamit deng pamagbayu keti. Malyari lang munta king [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net] deng bisang sumaup king pamaglikas.",
 'sqlhidden'            => '(makasalikut ya ing SQL query)',
 'cascadeprotected'     => 'Makaprotekta ya king pamag-edit ing bulung a ini uling kayabe ya king makatuking {{PLURAL:$1|bulung, a|bulung, a}} a maki proteksiun uling makasalangi ya ing  "tuki-tuki" o "cascading" option:
 $2',
@@ -356,10 +349,10 @@ Iti ing binie nang sangkan: ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Talagamit isulat-lumual (logout)',
-'logouttext'                 => '<strong>Maka logout na ka.</strong>
+'logouttext'                 => "'''Maka logout na ka.'''
 
 Malyari mung isundu ing pamangamit mu king {{SITENAME}} a e ka papakilala, o malyari kang mag login pasibayu anting pareu o aliwang talagamit.
-Apansingan mung mapalyaring makalto la pa murin deng aliwang bulung a bala mu maka login ka pa murin, anggang e me lilinisan (clear) ing kekang browser cache.',
+Apansingan mung mapalyaring makalto la pa murin deng aliwang bulung a bala mu maka login ka pa murin, anggang e me lilinisan (clear) ing kekang browser cache.",
 'welcomecreation'            => '== Malaus ka, $1! ==
 
 Melalang ne ing kekang account. E mo kakalingwan alilan deng kekang piniling {{SITENAME}}',
@@ -370,7 +363,6 @@ Melalang ne ing kekang account. E mo kakalingwan alilan deng kekang piniling {{S
 'remembermypassword'         => 'Tandanan me ing login ku king computer a ini',
 'yourdomainname'             => 'Ing kekang karinan (domain):',
 'externaldberror'            => 'Mapalyaring mika pamagkamali king external authentication (pamagpatutung panlual) ning database, o ala kang paintulut a i-update ya ing kekang account a panlual (external account).',
-'loginproblem'               => '<b>Mika prublema king kekang pamag-login.</b><br />Subukan mung pasibayu!',
 'login'                      => 'Mag log in',
 'nav-login-createaccount'    => 'Mag-login / maglalang account',
 'loginprompt'                => 'Kailangan mo reng cookie a makasalangi (enabled) ba kang makapag log in king {{SITENAME}}.',
@@ -459,12 +451,14 @@ Malyari meng e pansinan ining mensahi, nung pamagkamali ing pamaglalang na nitin
 'resetpass_announce'      => 'Gagamit kang pansamantalang code a me e-mail keka aniang mig-login ka.
 Bang mayari ing kekang pamag-login, kailangan mung mangibiling bayung password keni:',
 'resetpass_header'        => 'Alilan ya ing password',
+'oldpassword'             => 'Sadiang/lumang password:',
+'newpassword'             => 'Bayung password:',
+'retypenew'               => 'Sulat meng pasibayu ing bayung password:',
 'resetpass_submit'        => 'Mangibili kang password at maglogin ka',
 'resetpass_success'       => 'Melaus ing pamanalili mung password! Ngeni mila-login naka...',
 'resetpass_bad_temporary' => 'E matatanggap ing kekang pansamantalang password.
 Mapaliaring melaus na ing pamanalili mung password, o mekapaniad na kang bayung pansamantalang password.',
 'resetpass_forbidden'     => 'E la malyaring alilan deng password keng wiking ini',
-'resetpass_missing'       => 'Alang form data.',
 
 # Edit page toolbar
 'bold_sample'     => 'Makapasalang kulitan',
@@ -487,8 +481,8 @@ Mapaliaring melaus na ing pamanalili mung password, o mekapaniad na kang bayung
 'hr_tip'          => 'Gulis a pakera (e dapat paneng gagamitan)',
 
 # Edit pages
-'summary'                   => 'Sampulung (Summary)',
-'subject'                   => 'Paksa/pamagat (headline)',
+'summary'                   => 'Sampulung (Summary):',
+'subject'                   => 'Paksa/pamagat (headline):',
 'minoredit'                 => 'Malati yang edit ini',
 'watchthis'                 => 'Banten ya ing bulung a ini',
 'savearticle'               => 'I-save ya ing bulung',
@@ -502,8 +496,8 @@ Nung i-click meng pasibayu ing Save, ma-save ya ing kekang in-edit a alang anti
 'missingcommenttext'        => 'Pakisulat me ing kekang komentu/puna king lalam.',
 'missingcommentheader'      => "'''Kapabaluan:''' Ala kang binieng paksa/pamagat para kaniting komentu.
 Nung i-click meng pasibayu ing Save, ma-save ya ing kekang i-edit a yalang anti kaniti.",
-'summary-preview'           => 'Preview ning sampulung (summary preview)',
-'subject-preview'           => 'Preview ning paksa/pamagat',
+'summary-preview'           => 'Preview ning sampulung (summary preview):',
+'subject-preview'           => 'Preview ning paksa/pamagat:',
 'blockedtitle'              => 'Ing talagamit mesabat ya',
 'blockedtext'               => "<big>'''Mesabat ya ing kekang lagiung talagamit (user name) o IP address.'''</big>
 
@@ -554,26 +548,26 @@ Nung migkamali kang minta keni, i-click me mu ing '''back''' (mibalik) button ni
 'noarticletext'             => 'King salukuyan, alang sulat king bulung a ini; malyari meng [[Special:Search/{{PAGENAME}}|paintunan ing pamagat ning bulung a ini]] kareng aliwang bulung o [{{fullurl:{{FULLPAGENAME}}|action=edit}} i-edit ining bulung].',
 'userpage-userdoesnotexist' => 'E makarehistru ing account ning talagamit (user account) a "$1". Pakilawe mu nung buri meng lalangan o i-edit ing bulung a ini.',
 'clearyourcache'            => "'''Kapabaluan:''' Kaibat mung mig-save, maliari meng lakton ing simpan (cache) ning kekang browser ba mong akit deng miyalilan. '''Mozilla / Firefox / Safari:''' timid me ing ''Shift'' kabang ki-click me ing ''Reload'', o timid me ing ''Ctrl-Shift-R'' (''Cmd-Shift-R'' king Apple Mac); '''IE:''' timid me ing ''Ctrl'' kabang ki-click me ing ''Refresh'', o timid me ing ''Ctrl-F5''; '''Konqueror:''': i-click me mu ing ''Reload'' button, o timid me ing ''F5''; deng talagamit ning '''Opera''', mapaliaring kailangan deng laganas a linisan (i-clear) ing karelang simpan (cache) king ''Tools→Preferences''.",
-'usercssjsyoucanpreview'    => "<strong>Tip:</strong> Gamitan me ing button a 'Pakit ya ing preview' ('Show preview') ba yang subukan ing kekang bayung CSS/JS bayu ka mag-save.",
+'usercssjsyoucanpreview'    => "'''Tip:''' Gamitan me ing button a 'Pakit ya ing preview' ('Show preview') ba yang subukan ing kekang bayung CSS/JS bayu ka mag-save.",
 'usercsspreview'            => "'''Tandanan mung pi-preview me mu ing kekang user CSS, e ya pa me-save!'''",
 'userjspreview'             => "'''Tandanan mung susubukan/pi-preview me pamu ing kekang user JavaScript, e ya pa me-save iti!'''",
 'userinvalidcssjstitle'     => "'''Kapiadian:''' Alang pabalat (skin) a \"\$1\".
 Tandanan mung deng pasadiang bulung (custom pages) a .css ampong .js, gagamit lang bansag a mababang letra (lowercase), alm. (alimbawa), {{ns:user}}:Foo/monobook.css, at e {{ns:user}}:Foo/Monobook.css.",
 'updated'                   => '(Mibayu)',
-'note'                      => '<strong>Kapabaluan:</strong>',
-'previewnote'               => '<strong>Preview ya mu ini;
-e la pa me-save detang miyalilan!</strong>',
+'note'                      => "'''Kapabaluan:'''",
+'previewnote'               => "'''Preview ya mu ini;
+e la pa me-save detang miyalilan!'''",
 'previewconflict'           => 'Ing ayus ning makasulat king dake nang babo ning lugal a pipag-edit-an (upper text editing area) ing magi nang itsura ning kekang gagawan nung i-save me iti.',
-'session_fail_preview'      => '<strong>Pasensia na ka! E mi ya apalub ing kekang in-edit uling mewala ing session data.
-Pakisubukan mung pasibayu. Nung ala pa muring miliari, subukan mung mag-logout at mag-login pasibayu.</strong>',
-'session_fail_preview_html' => "<strong> Pasensia na ka! E mi ya apalub ing kekang in-edit uling mewala ing session data.</strong>
+'session_fail_preview'      => "'''Pasensia na ka! E mi ya apalub ing kekang in-edit uling mewala ing session data.
+Pakisubukan mung pasibayu. Nung ala pa muring miliari, subukan mung mag-logout at mag-login pasibayu.'''",
+'session_fail_preview_html' => "''' Pasensia na ka! E mi ya apalub ing kekang in-edit uling mewala ing session data.'''
 
 ''Uling ing {{SITENAME}} maki makasalangi yang HTML a e me-prosesu (raw HTML), makasalikut ya ing preview bang panyagka kareng ataking JavaScript.''
 
-<strong>Nung seriosu yang tangkang mag-edit ini, pakisubukan mung pasibayu. Nung ala pa muring miliari, subukan mung mag-logout at mag-login pasibayu.</strong>",
-'token_suffix_mismatch'     => '<strong>Your edit has been rejected because your client mangled the punctuation characters in the edit token.
+'''Nung seriosu yang tangkang mag-edit ini, pakisubukan mung pasibayu. Nung ala pa muring miliari, subukan mung mag-logout at mag-login pasibayu.'''",
+'token_suffix_mismatch'     => "'''Your edit has been rejected because your client mangled the punctuation characters in the edit token.
 The edit has been rejected to prevent corruption of the page text.
-This sometimes happens when you are using a buggy web-based anonymous proxy service.</strong>',
+This sometimes happens when you are using a buggy web-based anonymous proxy service.'''",
 'editing'                   => 'Manalili $1',
 'editingsection'            => 'Alilan (e-edit) ya ing $1 (dake)',
 'editingcomment'            => 'I-edit ya ing $1 (komentu)',
@@ -585,31 +579,31 @@ Kailangan mong piyabe deng elilan mu ketang kasalungsungan a makasulat.
 Bukud mung ing makasulat king babo ing ma-save katimid mu ketang   "I-save ya ining bulung" ("Save page").',
 'yourtext'                  => 'Ing kekang sinulat',
 'storedversion'             => 'Bersion a makasimpan',
-'nonunicodebrowser'         => '<strong>BABALA: E ya unicode compliant ing kekang browser.
-Ating paralan ba kang e mika-prublema king pamag-edit: lunto la antimong hexadecimal code king kahun a pipag-editan deng letra/kulit a e-ASCII (non-ASCII characters).</strong>',
-'editingold'                => '<strong>KAPIADIAN: Laun neng pamagbayu ning bulung a ini ing kekang alilan.
-Nung i-save me, mawala la ngan deng miyalilan manibat ketang pamagbayung ini.</strong>',
+'nonunicodebrowser'         => "'''BABALA: E ya unicode compliant ing kekang browser.
+Ating paralan ba kang e mika-prublema king pamag-edit: lunto la antimong hexadecimal code king kahun a pipag-editan deng letra/kulit a e-ASCII (non-ASCII characters).'''",
+'editingold'                => "'''KAPIADIAN: Laun neng pamagbayu ning bulung a ini ing kekang alilan.
+Nung i-save me, mawala la ngan deng miyalilan manibat ketang pamagbayung ini.'''",
 'yourdiff'                  => 'Pamiyaliwa',
-'copyrightwarning'          => 'Pakitandanan mung tuturing lang mipaintulutan deng eganaganang ambag king {{SITENAME}} lalam ning $2 (lon ya ing $1 para kareng detalle). 
+'copyrightwarning'          => "Pakitandanan mung tuturing lang mipaintulutan deng eganaganang ambag king {{SITENAME}} lalam ning $2 (lon ya ing $1 para kareng detalle). 
 Nung e mu buri ing alilan deng laganas at alang patugut ing kekang sinulat, at mipamie ya angiang kaninu
 iti, e me duduang keni.
 <br />
 Mangaku ka mu naman a ika mismu ing sinulat kaniti, o acopia me ketang metung a pikuanan a mipaintulutan king malda o aliwa pang libring pikukuanan.
-<strong>E KA M�NAMBAG OBRANG MAKI COPYRIGHT NUNG ALANG PAINTULUT!</strong>',
-'copyrightwarning2'         => 'Pakitandanan da lang alilan, ibayu o ilako deng aliwang talagamit deng kekang ambag king {{SITENAME}}. 
+'''E KA M�NAMBAG OBRANG MAKI COPYRIGHT NUNG ALANG PAINTULUT!'''",
+'copyrightwarning2'         => "Pakitandanan da lang alilan, ibayu o ilako deng aliwang talagamit deng kekang ambag king {{SITENAME}}. 
 Nung e mu buri ing alilan deng alang patugut at alang lunus ing kekang sinulat, e me duduang keni.<br />
 Mangaku ka mu naman a ika mismu ing sinulat kaniti, o akopia me ketang metung a pikuanan a mipaintulutan king malda o aliwa pang libring pikukuanan (lon me ing $1 para kareng detalle).
-<strong>E KA MANAMBAG OBRANG MAKI COPYRIGHT NUNG ALANG PAINTULUT!',
-'longpagewarning'           => '<strong>KAPIADIAN: Maki kaba yang $1 kilobyte ining bulung;
+'''E KA MANAMBAG OBRANG MAKI COPYRIGHT NUNG ALANG PAINTULUT!",
+'longpagewarning'           => "'''KAPIADIAN: Maki kaba yang $1 kilobyte ining bulung;
 mágkasákit lang mag-edit bulung a maigit 32 kb deng aliwang browser.
-Nung maliari, pakipitnan me kareng adua o maigit pang dake.</strong>',
-'longpageerror'             => '<strong>MALI: Miras yang $1 kilobyte ing kekang sinulat; sobra ya ketang $2 a pekamakabang maliaring iyambag. E ya ma-save iti.</strong>',
-'readonlywarning'           => '<strong>BABALA: Makasara ya ing database uling sasamasan de iti, ania e mo a-save ngeni detang kekang in-edit.
-Maliari meng i-"cut-n-paste" ing sinulat mu king metung a text file, at i-save mu ne mu para king tutuki.</strong>',
-'protectedpagewarning'      => '<strong>BABALA:  Makasara ya ing bulung a ini. Den mung talagamit a maki upayang sysop ing maliaring mag-edit.</strong>',
+Nung maliari, pakipitnan me kareng adua o maigit pang dake.'''",
+'longpageerror'             => "'''MALI: Miras yang $1 kilobyte ing kekang sinulat; sobra ya ketang $2 a pekamakabang maliaring iyambag. E ya ma-save iti.'''",
+'readonlywarning'           => "'''BABALA: Makasara ya ing database uling sasamasan de iti, ania e mo a-save ngeni detang kekang in-edit.
+Maliari meng i-\"cut-n-paste\" ing sinulat mu king metung a text file, at i-save mu ne mu para king tutuki.'''",
+'protectedpagewarning'      => "'''BABALA:  Makasara ya ing bulung a ini. Den mung talagamit a maki upayang sysop ing maliaring mag-edit.'''",
 'semiprotectedpagewarning'  => "'''Babala:''' Misara ya ing bulung a ini, ania den mung talagamit a makarehistru ing makapag-edit kaniti.",
 'cascadeprotectedwarning'   => "'''Babala:''' Misara ya ing bulung a ini. Deta mung talagamit a maki upayang sysop ing makapag-edit kaniti, uling kayabe ya kareng makatuking bulung a maki proteksiun a mituki-tuki (cascade protected) {{PLURAL:$1|bulung|bulung}}:",
-'titleprotectedwarning'     => '<strong>BABALA:  Misara ya ing bulung a ini, ania den mung aliwang talagamit ing makapaglalang kaniti.</strong>',
+'titleprotectedwarning'     => "'''BABALA:  Misara ya ing bulung a ini, ania den mung aliwang talagamit ing makapaglalang kaniti.'''",
 'templatesused'             => 'Deng template a magagamit king bulung a ini:',
 'templatesusedpreview'      => 'Deng modelung (template) megamit kening preview:',
 'templatesusedsection'      => 'Deng modelung (template) magagamit king seksiyon a ini:',
@@ -648,11 +642,9 @@ Ini ing sangkan a binie nang $3: ''$2''",
 # History pages
 'viewpagelogs'        => 'Lon la reng log para king bulung a ini',
 'nohistory'           => 'Alang amlat ning pamag-edit (edit history) para king bulung a ini.',
-'revnotfound'         => 'E meyakit itang miyalilan',
-'revnotfoundtext'     => 'Ing matuang meyaliling bulung a pakiduang mu eya mayakit. Paki lawe me ing URL a ginamit mu para apuntalan me ing bulung.',
 'currentrev'          => 'Kasalungsungan a pangayalili',
 'revisionasof'        => 'Ing mibayu aniang $1',
-'revision-info'       => 'Deng miyalilan aniang $1 ibat kang $2',
+'revision-info'       => 'Deng miyalilan aniang $1 ibat kang $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Minunang pamagbayu',
 'nextrevision'        => 'Mas tauling pamagbayu→',
 'currentrevisionlink' => 'Kasalungsungan a pamagbayu',
@@ -784,6 +776,7 @@ Malyari meng [[:\$1|lalangan ing bulung a iti]].",
 'prevn'                     => 'minunang $1',
 'nextn'                     => 'tutuking $1',
 'viewprevnext'              => 'Lon ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:Kalamnan',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 a kataya|$2 kataya}})',
 'search-result-score'       => 'Kaugnayan (relevance): $1%',
 'search-redirect'           => '(pamanalis direksiun $1)',
@@ -824,6 +817,7 @@ Pakitandanan mung maliaring e no makapanaun deng karelang index king kalamnan ni
 'qbsettings-floatingright' => 'Kikimut ya ing wanan',
 'changepassword'           => 'Alilan ya ing password',
 'skin'                     => 'Balat',
+'skin-preview'             => 'I-preview',
 'dateformat'               => 'Ayus ning petsa',
 'datedefault'              => 'Alang mepili',
 'datetime'                 => 'Petsa ampong oras',
@@ -846,9 +840,6 @@ pakilawe me ing math/README ba meng i-configure.',
 'prefs-misc'               => 'Alwp',
 'saveprefs'                => 'I-save',
 'resetprefs'               => 'Buran la retang miyalilan a e me-save',
-'oldpassword'              => 'Sadiang/lumang password:',
-'newpassword'              => 'Bayung password:',
-'retypenew'                => 'Sulat meng pasibayu ing bayung password:',
 'textboxsize'              => 'Mag-edit',
 'rows'                     => 'Dane (rows):',
 'columns'                  => 'Ding asias:',
@@ -875,7 +866,7 @@ pakilawe me ing math/README ba meng i-configure.',
 'userrights-lookup-user'      => 'Panibalan la reng grupung talagamit',
 'userrights-user-editname'    => 'Mangibili kang lagyungtalagamit (username):',
 'editusergroup'               => 'I-edit ya ing Grupung Talagamit',
-'editinguser'                 => "Alilan mu la reng katuliran nang talagamit (user rights) nang talagamit a '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Alilan mu la reng katuliran nang talagamit (user rights) nang talagamit a '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'I-edit la reng grupung talagamit',
 'saveusergroups'              => 'I-save la reng Grupung Talagamit (User Groups)',
 'userrights-groupsmember'     => 'Kayanib ning:',
@@ -1018,11 +1009,11 @@ king kekang watchlist (tala da reng babanten).",
 'upload_directory_read_only'  => 'E ne maliaring sulatanan ning webserver ing piyakitan pamaglulan o upload directory ($1).',
 'uploaderror'                 => 'Migkamaling maglulan',
 'uploadtext'                  => "Gamitan me ing ayus (form) king lalam bang maglulan simpan (upload files).
-Ba mong lon o paintunan deng simpan a sadia nang milulan, munta ka king [[Special:ImageList|tala da reng simpan a milulan]]; maka-login la murin deng milulan ampong mebura king [[Special:Log/upload|tala da reng milulan (upload log)]].
+Ba mong lon o paintunan deng simpan a sadia nang milulan, munta ka king [[Special:FileList|tala da reng simpan a milulan]]; maka-login la murin deng milulan ampong mebura king [[Special:Log/upload|tala da reng milulan (upload log)]].
 
 Ba yang iyabe ing simpan king metung a bulung gamitan me ing suglung (link) king ayus (form) a
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' or
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' or
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' bang diretsung misuglung king simpan.",
 'upload-permitted'            => 'Deng uring simpan (file type) a maliari: $1.',
 'upload-preferred'            => 'Deng uring simpan a mas pipilinan (preferred file types): $1.',
@@ -1049,25 +1040,25 @@ Ba yang iyabe ing simpan king metung a bulung gamitan me ing suglung (link) king
 Ing simpan a ini $2 ya.',
 'largefileserver'             => 'Mas maragul ya ing simpan (file) a ini kesa ketang makapaintulut (configured) king server.',
 'emptyfile'                   => 'Balamu ala yang laman ing simpan (file) a linulan mu. Mapaliaring ing sangkan, pamagkamali (typo) ya king lagyung simpan (file name). Pakaisipan mu nung taganang buri meng ilulan ining simpan.',
-'fileexists'                  => 'Atin nang simpan (file) a maki lagyung anti kaniti; pakilawe mu <strong><tt>$1</tt></strong> nung e ka siguradu nung buri meng alilan.',
-'filepageexists'              => 'Melalang na ing bulung pamilarawan (description page) para king simpan (file) a ini king <strong><tt>$1</tt></strong>, oneng king salukuyan, ala pang simpan a maki lagyung anti kaniti.
+'fileexists'                  => "Atin nang simpan (file) a maki lagyung anti kaniti; pakilawe mu '''<tt>$1</tt>''' nung e ka siguradu nung buri meng alilan.",
+'filepageexists'              => "Melalang na ing bulung pamilarawan (description page) para king simpan (file) a ini king '''<tt>$1</tt>''', oneng king salukuyan, ala pang simpan a maki lagyung anti kaniti.
 E ya tambing lunto king bulung pamilarawan ing sampulung (summary) a isulat mu.
-Ba yang lunto karin ing kekang sampulung, kailangan me pamung i-edit',
-'fileexists-extension'        => 'Maki simpan (file) a makayawig lagyu kaniti:<br />
-Lagyu ning simpan a milululan: <strong><tt>$1</tt></strong><br />
-Lagyu ning salukuyan a simpan: <strong><tt>$2</tt></strong><br />
-Mamili kang aliwang lagyu.',
+Ba yang lunto karin ing kekang sampulung, kailangan me pamung i-edit",
+'fileexists-extension'        => "Maki simpan (file) a makayawig lagyu kaniti:<br />
+Lagyu ning simpan a milululan: '''<tt>$1</tt>'''<br />
+Lagyu ning salukuyan a simpan: '''<tt>$2</tt>'''<br />
+Mamili kang aliwang lagyu.",
 'fileexists-thumb'            => "<center>'''Salukuyan a simpan (file)'''</center>",
-'fileexists-thumbnail-yes'    => 'Lupa yang larawan a pepalati ing simpan <i>(thumbnail)</i>.
-Pakilawe me ing simpan <strong><tt>$1</tt></strong>.<br />
-Nung ya naman ketang minunang maki orihinal a dagul ing simpan a maka-check, e na kailangang maglulan karagdagan a thumbnail.',
-'file-thumbnail-no'           => 'Magumpisa ya ing lagyungsimpan (filename) king <strong><tt>$1</tt></strong>.
-Lupa yang larawan a pepalati <i>(thumbnail)</i>.
-Nung atyu keka ining larawan king bersion a pekamalino (full resolution), ilulan me ini; nung ali naman, pakiyalilan me ing lagyung simpan.',
+'fileexists-thumbnail-yes'    => "Lupa yang larawan a pepalati ing simpan ''(thumbnail)''.
+Pakilawe me ing simpan '''<tt>$1</tt>'''.<br />
+Nung ya naman ketang minunang maki orihinal a dagul ing simpan a maka-check, e na kailangang maglulan karagdagan a thumbnail.",
+'file-thumbnail-no'           => "Magumpisa ya ing lagyungsimpan (filename) king '''<tt>$1</tt>'''.
+Lupa yang larawan a pepalati ''(thumbnail)''.
+Nung atyu keka ining larawan king bersion a pekamalino (full resolution), ilulan me ini; nung ali naman, pakiyalilan me ing lagyung simpan.",
 'fileexists-forbidden'        => 'Atin nang simpan a maki lagyung anti kaniti;
-mibalik ka at ilulan (upload) me king lalam ning bayung lagyu. [[Image:$1|thumb|center|$1]]',
+mibalik ka at ilulan (upload) me king lalam ning bayung lagyu. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Atin nang simpan (file) a maki lagyung anti kaniti king abe-abeng simpanan (shared file repository);
-mibalik ka at ilulan (upload) me king lalam ning bayung lagyu. [[Image:$1|thumb|center|$1]]',
+mibalik ka at ilulan (upload) me king lalam ning bayung lagyu. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Melaus ing pamaglulan',
 'uploadwarning'               => 'Babala king pamaglulan',
 'savefile'                    => 'I-save ya ing simpan (file)',
@@ -1089,8 +1080,8 @@ Pakilawe me ing $1 bayu mu isundu ing pamaglulan kaniti.',
 
 Pakaisipan mu sa nung ustu ing isundu mu ing pamaglulan kaniti.
 Makabili ya keni ing tala da reng mengabura ba meng asuri:",
-'filename-bad-prefix'         => 'Magumpisa ya king <strong>"$1"</strong> ing lagyu ning simpan (file) a kekang lululan. Iti metung yang lagyung tambing dang bibie deng digital camera, at ala yang kaugnayan ketang letratu.
-Mamili ka sanang lagyung mas maglarawan keng kekang simpan.',
+'filename-bad-prefix'         => "Magumpisa ya king '''\"\$1\"''' ing lagyu ning simpan (file) a kekang lululan. Iti metung yang lagyung tambing dang bibie deng digital camera, at ala yang kaugnayan ketang letratu.
+Mamili ka sanang lagyung mas maglarawan keng kekang simpan.",
 
 'upload-proto-error'      => 'E ustung protocol',
 'upload-proto-error-text' => 'Mangailangan yang URL a magumpisa king <code>http://</code> o <code>ftp://</code> ing pang-malaut a pamaglulan (remote upload).',
@@ -1117,20 +1108,20 @@ Mapaliaring mas masanting yang subukan nung mas ditak la reng gagamit.',
 'upload_source_url'  => ' (metung a URL a matatanggap at aluban ding malda)',
 'upload_source_file' => ' (metung a simpan king kekang computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Papakit no ngan niting bulung a makabukud/espesial deng simpan a milulan (uploaded files).
+# Special:ListFiles
+'listfiles-summary'     => 'Papakit no ngan niting bulung a makabukud/espesial deng simpan a milulan (uploaded files).
 Karaniwan, keta lang babo ning tala deng simpan a tauling milulan.
 Miyalilan ing pamanayus nung i-click ya ing pamagat ning kolum (column header).',
-'imagelist_search_for'  => 'Maintun kang lagyu ning media:',
+'listfiles_search_for'  => 'Maintun kang lagyu ning media:',
 'imgfile'               => 'simpan',
-'imagelist'             => 'Tala da reng simpan (file list)',
-'imagelist_date'        => 'Petsa',
-'imagelist_name'        => 'Lagyu',
-'imagelist_user'        => 'Talagamit',
-'imagelist_size'        => 'Dagul',
-'imagelist_description' => 'Pamilarawan (description)',
-
-# Image description page
+'listfiles'             => 'Tala da reng simpan (file list)',
+'listfiles_date'        => 'Petsa',
+'listfiles_name'        => 'Lagyu',
+'listfiles_user'        => 'Talagamit',
+'listfiles_size'        => 'Dagul',
+'listfiles_description' => 'Pamilarawan (description)',
+
+# File description page
 'filehist'                       => 'Amlat ning simpan (File history)',
 'filehist-help'                  => 'Mag-click kang petsa/oras ba meng akit ing itsura ning simpan aniang panaun a ita.',
 'filehist-deleteall'             => 'buran ing eganagana',
@@ -1179,8 +1170,6 @@ Miyalilan ing pamanayus nung i-click ya ing pamagat ning kolum (column header).'
 'filedelete-success-old'      => '<span class="plainlinks">Ing bersion ning \'\'\'[[Media:$1|$1]]\'\'\' aniang $3, $2 mebura ne.</span>',
 'filedelete-nofile'           => "Ing '''$1''' ala yu.",
 'filedelete-nofile-old'       => "Alang bersion a makasimpan (archived version) ning '''$1''' a magdala kareng metunggeng kaurian (specified attributes).",
-'filedelete-iscurrent'        => 'Susubukan meng buran ing pekabayung bersion ning simpan (file) a ini.
-Isubli me pamu king metung a minunang/mas matuang bersion.',
 'filedelete-otherreason'      => 'Aliwang/karagdagang sangkan:',
 'filedelete-reason-otherlist' => 'Aliwang sangkan',
 'filedelete-reason-dropdown'  => '*Keraklan a sangkan king pamamura
@@ -1214,20 +1203,9 @@ Isulat (input): contenttype/subtype, alimbawa <tt>image/jpeg</tt>.',
 'randomredirect-nopages' => 'Alang pamanalis direksiun (redirect) king pirinan lagyung (namespace) ini.',
 
 # Statistics
-'statistics'             => 'Deng datos (Statistics)',
-'sitestats'              => 'Datos tungkul king {{SITENAME}}',
-'userstats'              => 'Talagamit statistics',
-'sitestatstext'          => "Maki {{PLURAL:\$1|'''1''' a bulung|'''\$1''' a bulung}} king database. 
-Kayabe la kareti deng bulung \"pamisabi-sabi\", bulung tungkul king {{SITENAME}}, mangalating bulung a \"stub\", at aliwa pang bulung a e maliaring ausan \"content pages\" o bulung a malaman. Liban kareti, mapaliaring ating {{PLURAL:\$2|'''1''' a bulung a|'''\$2''' bulung a}} maliaring ituring a tuneng {{PLURAL:\$2|bulung|bulung}} a malaman o content pages. 
-
-'''\$8''' {{PLURAL:\$8|ya ing simpan a|la ring simpan a}} milulan.
-
-Mekata'''\$3''' {{PLURAL:\$3|de linawe|de linawe}} at mekata'''\$4''' de {{PLURAL:\$4|binayu|binayu}} ing {{SITENAME}} manibat aniang melalang ya iti. 
-King kabilugan, miras ya iti king average a '''\$5''' a pamagbayu o edit balang bulung, at '''\$6''' a pamaglawe balang edit.  
-
-Ing kaba ning [http://www.mediawiki.org/wiki/Manual:Job_queue job queue]  '''\$7''' ya.",
-'userstatstext'          => "Ating {{PLURAL:$1|'''1''' a makarehistrung [[Special:ListUsers|talagamit]]|'''$1''' makarehistrung [[Special:ListUsers|talagamit]]}}, at kareti '''$2''' (o '''$4%''') {{PLURAL:$2|ing|ing}} maki katuliran (rights) a $5.",
-'statistics-mostpopular' => 'Bulung a pekamaralas dang linawe',
+'statistics'              => 'Deng datos (Statistics)',
+'statistics-header-users' => 'Talagamit statistics',
+'statistics-mostpopular'  => 'Bulung a pekamaralas dang linawe',
 
 'disambiguations'      => 'Bulung a pamipalino',
 'disambiguationspage'  => 'Template:pamipalino',
@@ -1313,8 +1291,6 @@ Tuturing yang bulung pamipalino ing metung a bulung nung gagamit yang modelung (
 'speciallogtitlelabel' => 'Bansag:',
 'log'                  => 'Deng tala (logs)',
 'all-logs-page'        => 'Eganaganang tala/listaan',
-'log-search-legend'    => 'Maintun tala (log)',
-'log-search-submit'    => 'Sulung',
 'alllogstext'          => 'Piyabeng talatag da ring pamanyampa, pamaglako, proteksyun, pamanyabat, at sysop pamangamittala.
 Malyari meng kitiran ing panimanman o akakit, kapamilatan ning pamamili ning nung sanu ing pamangamittala.',
 'logempty'             => 'Ala yang kapareu (matching items) king tala (log).',
@@ -1342,6 +1318,9 @@ Malyari meng kitiran ing panimanman o akakit, kapamilatan ning pamamili ning nun
 'special-categories-sort-count' => 'surian tukituki agpang keng bilang',
 'special-categories-sort-abc'   => 'surian lang tukituki agpang keng kulitan',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Deng ambag da reng talagamit a mebura',
+
 # Special:ListUsers
 'listusersfrom'      => 'Ipakit la reng talagamit magumpisa king:',
 'listusers-submit'   => 'Pakit',
@@ -1408,12 +1387,6 @@ click me ing \"Tuknangan ing pamagbante\" (Unwatch) king gilid na ning bulung.",
 'iteminvalidname'      => "Maki prublema king '$1', e maliari ing lagyu...",
 'wlnote'               => "{{PLURAL:$1|Ing makatuki ing tauling|Ding makatuki ring tauling '''$1''' miyalilan}} kilub {{PLURAL:$2|ning tauling metung a oras|ding tauling '''$2''' oras}}.",
 'wlshowlast'           => 'Pakit la reng tauling $1 oras $2 aldo $3',
-'watchlist-show-bots'  => 'Pakit la reng in-edit da reng bot',
-'watchlist-hide-bots'  => 'Isalikut la reng in-edit dang bot',
-'watchlist-show-own'   => 'Pakit la reng in-edit ku',
-'watchlist-hide-own'   => 'Isalikut la reng in-edit ku',
-'watchlist-show-minor' => 'Pakit la reng mangalating edit',
-'watchlist-hide-minor' => 'Isalikut la reng mangalating edit',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Babanten...',
@@ -1453,57 +1426,61 @@ Ba mong ayalilan deng pakatuldu king kekang tala ring babanten (watchlist settin
 Keni ka magparalang puna/komentu at maniad karagdagang saup:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Buran ya ing bulung',
-'confirm'                     => 'Patutuan/kumpirman',
-'excontent'                   => "ini ing laman na: '$1'",
-'excontentauthor'             => "ini ing makabili: '$1' (at bukud mung i '[[Special:Contributions/$2|$2]]' ing sinulat)",
-'exbeforeblank'               => "ing laman bayu ya meblangku yapin iti: '$1'",
-'exblank'                     => 'ala yang laman ing bulung',
-'delete-confirm'              => 'Buran ya ing "$1"',
-'delete-legend'               => 'Buran',
-'historywarning'              => 'Babala: Maki amlat (history) ya ing bulung a kekang buburan:',
-'confirmdeletetext'           => 'Buburan mu ne ing metung a bulung, kayabe na ing mabilug nang amlat/kasalesayan.
+# Delete
+'deletepage'             => 'Buran ya ing bulung',
+'confirm'                => 'Patutuan/kumpirman',
+'excontent'              => "ini ing laman na: '$1'",
+'excontentauthor'        => "ini ing makabili: '$1' (at bukud mung i '[[Special:Contributions/$2|$2]]' ing sinulat)",
+'exbeforeblank'          => "ing laman bayu ya meblangku yapin iti: '$1'",
+'exblank'                => 'ala yang laman ing bulung',
+'delete-confirm'         => 'Buran ya ing "$1"',
+'delete-legend'          => 'Buran',
+'historywarning'         => 'Babala: Maki amlat (history) ya ing bulung a kekang buburan:',
+'confirmdeletetext'      => 'Buburan mu ne ing metung a bulung, kayabe na ing mabilug nang amlat/kasalesayan.
 Pakikumpirma nung ini pin ing buri mung gawan, nung aintindian mu ing eganaganang kabaldugan na niti, at nung daraptan mu iti agpang king [[{{MediaWiki:Policy-url}}|patakaran]].',
-'actioncomplete'              => 'Ing dapat mebuu ne.',
-'deletedtext'                 => 'Mebura ya ing "<nowiki>$1</nowiki>".
+'actioncomplete'         => 'Ing dapat mebuu ne.',
+'deletedtext'            => 'Mebura ya ing "<nowiki>$1</nowiki>".
 Makasulat la king $2 deng pekabayung mebura.',
-'deletedarticle'              => 'mebura ne ing "[[$1]]"',
-'suppressedarticle'           => 'mesabat ya ing "[[$1]]"',
-'dellogpage'                  => 'Tala da reng mebura',
-'dellogpagetext'              => 'Makabili la king lalam deng pekabayung mebura.',
-'deletionlog'                 => 'tala da ring mebura',
-'reverted'                    => 'Misubli ya king minunang bersion',
-'deletecomment'               => 'Sangkan ning pangabura',
-'deleteotherreason'           => 'Aliwa/karagdagang sangkan:',
-'deletereasonotherlist'       => 'Aliwang sangkan',
-'deletereason-dropdown'       => '*Karaniwang sangkan king pamamura
+'deletedarticle'         => 'mebura ne ing "[[$1]]"',
+'suppressedarticle'      => 'mesabat ya ing "[[$1]]"',
+'dellogpage'             => 'Tala da reng mebura',
+'dellogpagetext'         => 'Makabili la king lalam deng pekabayung mebura.',
+'deletionlog'            => 'tala da ring mebura',
+'reverted'               => 'Misubli ya king minunang bersion',
+'deletecomment'          => 'Sangkan ning pangabura',
+'deleteotherreason'      => 'Aliwa/karagdagang sangkan:',
+'deletereasonotherlist'  => 'Aliwang sangkan',
+'deletereason-dropdown'  => '*Karaniwang sangkan king pamamura
 ** Pekisabi ning sinulat 
 ** Pamaglabang king katulirang mangopia (copyright violation)
 ** Pamanyira (vandalism)',
-'delete-edit-reasonlist'      => 'I-edit la reng sangkan king pamamura',
-'delete-toobig'               => 'Maki maragul yang amlat ning pamag-edit ing bulung a ini, nung nu maigit lang $1 deng miyalilan.
+'delete-edit-reasonlist' => 'I-edit la reng sangkan king pamamura',
+'delete-toobig'          => 'Maki maragul yang amlat ning pamag-edit ing bulung a ini, nung nu maigit lang $1 deng miyalilan.
 Me-limita ing pamamura kareng bulung a anti kaniti, bang e maliliari ing e sasarian a kaguluan o pamag-distorbu king {{SITENAME}}.',
-'delete-warning-toobig'       => 'Makaba ya ing amlat ding mibayu/me-edit ning bulung a ini, maigit la king $1 ding pamagbayu. 
+'delete-warning-toobig'  => 'Makaba ya ing amlat ding mibayu/me-edit ning bulung a ini, maigit la king $1 ding pamagbayu. 
 Posibling miyapektuan ing palakad ning database ning {{SITENAME}};
 pakakalale ka.',
-'rollback'                    => 'Iurung la retang me-edit',
-'rollback_short'              => 'Iurung',
-'rollbacklink'                => 'i-urung',
-'rollbackfailed'              => 'E melaus ing pamanurung',
-'cantrollback'                => 'E malyaring ibalik itang miyalilan; bukud mung ing tawling minambag yang sinulat king bulung a ini.',
-'alreadyrolled'               => 'E malyaring isubli king sadya ing tawling pamanalili ning [[:$1]]
+
+# Rollback
+'rollback'         => 'Iurung la retang me-edit',
+'rollback_short'   => 'Iurung',
+'rollbacklink'     => 'i-urung',
+'rollbackfailed'   => 'E melaus ing pamanurung',
+'cantrollback'     => 'E malyaring ibalik itang miyalilan; bukud mung ing tawling minambag yang sinulat king bulung a ini.',
+'alreadyrolled'    => 'E malyaring isubli king sadya ing tawling pamanalili ning [[:$1]]
 a gewa nang [[User:$2|$2]] ([[User talk:$2|Talk]]); atin nang aliwang menalili o minyubli ketang bulung.
 
 I [[User:$3|$3]] ([[User talk:$3|Talk]]) ing tawling menalili.',
-'editcomment'                 => 'Ini ing komentu king edit: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Miurung la reng in-edit nang [[Special:Contributions/$2|$2]] ([[User talk:$2|Pamisabi-sabi]]);
-binalik neng [[User:$1|$1]] king tauling bersion', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Deng edit nang $1 a miurung;
+'editcomment'      => "Ini ing komentu king edit: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Miurung la reng in-edit nang [[Special:Contributions/$2|$2]] ([[User talk:$2|Pamisabi-sabi]]);
+binalik neng [[User:$1|$1]] king tauling bersion', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Deng edit nang $1 a miurung;
 binalik nong $2 king sadiang bersion.',
-'sessionfailure'              => 'Balamu ating prublema king kekang login session;
+'sessionfailure'   => 'Balamu ating prublema king kekang login session;
 mituknang ya ing kimut (action) a ini bang milisia king session hijacking (pamaniamsam session).
 Pakitimid me ing "mibalik" ("back") at luban meng pasibayu ing bulung a penibatan mu, potang kai subukan mung pasibayu.',
+
+# Protect
 'protectlogpage'              => 'Tala da reng babanten',
 'protectlogtext'              => 'Maki tala da reng pamaniara ampong pamamusning bulung (page locks and unlocks) king lalam.
 Lon me ing [[Special:ProtectedPages|tala ring bulung a protektadu/makakambil]] para king tala ring proteksiung bulung a gagana king salukuyan.',
@@ -1511,18 +1488,19 @@ Lon me ing [[Special:ProtectedPages|tala ring bulung a protektadu/makakambil]] p
 'modifiedarticleprotection'   => 'miyalilan ing sikan ning proteksiun/pamangambil para king "[[$1]]"',
 'unprotectedarticle'          => 'e protektadu "[[$1]]"',
 'protect-title'               => 'Alilan ing sikan ning proteksiun pamangambil para "$1"',
+'prot_1movedto2'              => 'Ing [[$1]] miyalis ya king [[$2]]',
 'protect-legend'              => 'Kumpirman ing pamangambil/proteksiun',
 'protectcomment'              => 'Komentu/puna:',
 'protectexpiry'               => 'Mayari ya keng:',
 'protect_expiry_invalid'      => 'E matatanggap ing panaun nung kapilan ya mayari.',
 'protect_expiry_old'          => 'Keta ya pang milabas ing panaun a miyari ya.',
 'protect-unchain'             => 'Lako la pangakandadu deng paintulut king pamanalis',
-'protect-text'                => 'Malyari meng lon at alilan ing sikan ning proteksiun (protection level) para king bulung keti <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'E mo maliaring alilan deng sikan/lebel ning proteksiun kabang makasabat ka.
-Deni reng kasalungsungan a makatuldu (settings) para king bulung <strong>$1</strong>:',
-'protect-locked-dblock'       => 'E la maliaring alilan deng sikan/lebel ning proteksiun uling kasalungsungan yang makasara ing database. Deni reng pakatuldu (settings) para king bulung <strong>$1</strong>:',
-'protect-locked-access'       => 'Ala yang paintulut manaliling sikan ning proteksiun (protection level) ing kekang account.
-Deni reng kasalungsungan a setting para king bulung <strong>$1</strong>:',
+'protect-text'                => "Malyari meng lon at alilan ing sikan ning proteksiun (protection level) para king bulung keti '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "E mo maliaring alilan deng sikan/lebel ning proteksiun kabang makasabat ka.
+Deni reng kasalungsungan a makatuldu (settings) para king bulung '''$1''':",
+'protect-locked-dblock'       => "E la maliaring alilan deng sikan/lebel ning proteksiun uling kasalungsungan yang makasara ing database. Deni reng pakatuldu (settings) para king bulung '''$1''':",
+'protect-locked-access'       => "Ala yang paintulut manaliling sikan ning proteksiun (protection level) ing kekang account.
+Deni reng kasalungsungan a setting para king bulung '''$1''':",
 'protect-cascadeon'           => 'Kasalungsungan yang protektadu ining bulung uling makalub ya kareng makatuking {{PLURAL:$1|bulung|bulung}}, nung nu makasalangi ing tuki-tuking (cascading) proteksiun. Malyari meng alilan ing sikan ning proteksiun a iti, dapot e matagin ing tuki-tuking proteksiun.',
 'protect-default'             => '(karaniwan)',
 'protect-fallback'            => 'Kailangan ing "$1" a paintulut',
@@ -1532,6 +1510,7 @@ Deni reng kasalungsungan a setting para king bulung <strong>$1</strong>:',
 'protect-expiring'            => 'mayari ya keng $1 (UTC)',
 'protect-cascade'             => 'Protektan/kambilan la reng bulung a kayabe kening bulung a ini (tuki-tuking proteksiun o cascading protection)',
 'protect-cantedit'            => 'E mo malyaring alilan deng sikan ning proteksiun (protection levels) king bulung a ini, uling ala kang paintulut a i-edit ya.',
+'protect-expiry-options'      => '2 oras:2 hours,metung a yaldo:1 day,3ng aldo:3 days,paruminggu:1 week,2ng duminggu:2 weeks,pabulan:1 month,3ng bulan:3 months,6 a bulan:6 months,pabanua:1 year,alang kapupusan:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Paintulut:',
 'restriction-level'           => 'Lebel ning pamag-limita:',
 'minimum-size'                => 'Pekamalati',
@@ -1622,7 +1601,6 @@ $1',
 'whatlinkshere'            => 'Deng pakasuglung keti',
 'whatlinkshere-title'      => 'Bulung a makasuglung king $1',
 'whatlinkshere-page'       => 'Bulung:',
-'linklistsub'              => '(Tala da reng suglung)',
 'linkshere'                => "Pakasuglung la king '''[[:$1]]''' deng makatuking bulung:",
 'nolinkshere'              => "Alang bulung a makasuglung king '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Alang bulung a makatuglung king '''[[:$1]]''' ketang mepiling pirinan lagyu (namespace).",
@@ -1767,6 +1745,8 @@ pakisiguraduan mung aintindian mu ing kabaldugan na ampong epektu niti bayu mu i
 
 Nung makanyan pin ing milyari, kailangan meng iyalis o isanib (merge) ing bulung a saparadu nung ita ing buri mung gawan.",
 'movearticle'             => 'Ialis ya ing bulung',
+'movenologin'             => 'E maka-login',
+'movenologintext'         => 'Kailangan, metung kang talagamit a makarehistru at [[Special:UserLogin|maka-login]] ka ba kang makapanalis bulung.',
 'movenotallowed'          => 'Ala kang paintulut a manalis bulung king {{SITENAME}}.',
 'newtitle'                => 'King bayung bansag:',
 'move-watch'              => 'Banten ya ing bulung a ini',
@@ -1795,8 +1775,6 @@ Buri meng buran bang malaus ing pamanales?',
 'delete_and_move_reason'  => 'Mebura ya bang malaus ing pamanalis',
 'selfmove'                => 'Pareu ya ing penibatan ampo ing puntalan;
 e maliaring itumpak king sarili na ing metung a bulung.',
-'immobile_namespace'      => 'Makabukud/espesial yang uri ing bansag ning penibatan o puntalan;
-e maliaring manalis bulung manibat o papunta king pirinan lagyung (namespace) ita',
 'imagenocrossnamespace'   => 'E ne ayalis ing larawan king pirinan lagyung e-panglarawan (non-image namespace)',
 'imagetypemismatch'       => 'E ne kaparis ning bayung file extension itang kayang uri (type)',
 
@@ -1806,7 +1784,7 @@ e maliaring manalis bulung manibat o papunta king pirinan lagyung (namespace) it
 
 Bang maglual (export) kareng bulung, isulat mo reng bansag ketang text box king lalam, metung a bansag king balang gulis, at pilinan mu nung buri me ing salukuyan a a balung pati na detang sadiang bersion, kayabe la reng gulis tungkul king amlat bulung (page history), o ita mung salukuyan a bersion, kayabe ing impormasiun ketang tauling me-edit.
 
-Ketang tauling kasu, makagamit ka muring suglung (link), alimbawa, ing [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] para king bulung a "[[{{MediaWiki:Mainpage}}]]".',
+Ketang tauling kasu, makagamit ka muring suglung (link), alimbawa, ing [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] para king bulung a "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Ita mung salukuyan a bersion ing iyabe, aliwa ing mabilug a amlat',
 'exportnohistory'   => "----
 '''Kapabaluan:''' Makapatda ing pamaglual (export) ning kumpletung amlat da reng bulung kapamilatan ning form a ini uling miyapektuan ing pamangimut o pamang-gana ning sistema.",
@@ -1844,6 +1822,7 @@ Maka-login la reng eganaganang pamaglub a transwiki (transwiki import actions) k
 'import-interwiki-history'   => 'Kopian la reng eganaganang bersion ning amlat para king bulung a ini.',
 'import-interwiki-submit'    => 'Maglub (import)',
 'import-interwiki-namespace' => 'Iyalis la king pirinan lagyu (namespace) deng bulung:',
+'import-comment'             => 'Komentu:',
 'importtext'                 => 'Pakilual (export) me ing simpan (file) manibat ketang pikuanan a wiki a gagamitan ya ing Special:Export utilit. Potang kayi, i-save me king kekang disk at ilulan (upload) me keni.',
 'importstart'                => 'Maglub bulung...',
 'import-revision-count'      => '$1 {{PLURAL:$1|pamagbayu|pamagbayu}}',
@@ -2024,7 +2003,7 @@ $1',
 'show-big-image'       => 'Pekamalino',
 'show-big-image-thumb' => '<small>Dagul na niting preview: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Pirinan kareng bayung simpan (new files)',
 'imagelisttext'         => "Ing makatuki tala yang '''$1''' {{PLURAL:$1|simpan|simpan}} a misamasan $2.",
 'newimages-summary'     => 'Ining bulung a makabukud papakit no reng simpan (file) a tauling milulan.',
@@ -2306,21 +2285,9 @@ Mayari/mapasu ya ining confirmation code keng $4.',
 'deletedwhileediting' => 'Kapiadian: Mebura ya ing bulung ini kaibat mung migumpisang mag-edit!',
 'recreate'            => 'Lalangan yang pasibayu',
 
-# HTML dump
-'redirectingto' => 'Iyalis ya direksion king [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Ilako ya king simpanan (cache) ing bulung a ine?
-
-$1',
 'confirm_purge_button' => 'Sigi',
-
-# AJAX search
-'searchcontaining' => "Maintun kareng bulung a maki ''$1''.",
-'searchnamed'      => "Maintun bulung a maki lagiung ''$1''.",
-'articletitles'    => "Ding articulung magumpisa king ''$1''",
-'hideresults'      => 'Isalikut la reng linual/resulta',
-'useajaxsearch'    => 'Maintun kapamilatan ning AJAX',
+'confirm-purge-top'    => 'Ilako ya king simpanan (cache) ing bulung a ine?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� minunang bulung',
diff --git a/languages/messages/MessagesPap.php b/languages/messages/MessagesPap.php
index ed7b8865..03b45b41 100644
--- a/languages/messages/MessagesPap.php
+++ b/languages/messages/MessagesPap.php
@@ -57,7 +57,7 @@ $messages = array(
 'mytalk'        => 'Mi diskushon',
 'anontalk'      => 'Diskushon pa e IP aki',
 'navigation'    => 'Nabegashon',
-'and'           => 'i',
+'and'           => '&#32;i',
 
 'errorpagetitle'    => 'Eror',
 'returnto'          => 'Bai bèk $1.',
@@ -186,7 +186,8 @@ Bo por kambia página libremente, pero tene kuenta ku lo nota bo IP adrès den e
 'histlast'            => 'Último',
 
 # Search results
-'nextn' => 'siguiente $1',
+'nextn'          => 'siguiente $1',
+'searchhelp-url' => 'Help:Kontenido',
 
 # Preferences page
 'preferences'    => 'Preferensianan',
@@ -210,9 +211,8 @@ Bo por kambia página libremente, pero tene kuenta ku lo nota bo IP adrès den e
 'unwatchedpages' => 'Páginanan no observá',
 
 # Statistics
-'statistics' => 'Estadístika',
-'sitestats'  => 'Estadístika di {{SITENAME}}',
-'userstats'  => 'Estadístika di uzadónan',
+'statistics'              => 'Estadístika',
+'statistics-header-users' => 'Estadístika di uzadónan',
 
 # Miscellaneous special pages
 'ncategories'             => '$1 {{PLURAL:$1|kategoria|kategorianan}}',
@@ -279,9 +279,12 @@ Si despues bo ke kita e página for di bo lista di observashon, primi \"Stop di
 'changed' => 'kambiá',
 'created' => 'trahá',
 
-# Delete/protect/revert
+# Delete
 'confirm'        => 'Konfirmá',
 'actioncomplete' => 'Akshon kompletá',
+
+# Protect
+'prot_1movedto2' => '[[$1]] mové pa [[$2]]',
 'protect-legend' => 'Konfirmá protekshon',
 
 # Undelete
@@ -375,10 +378,6 @@ E kódigo di konfirmashon aki lo kaduká riba $4.',
 : ''$2''
 Por fabor konfirmá ku bo ke traha e artíkulo aki di nobo.",
 
-# AJAX search
-'articletitles' => "Artíkulonan kuminsando ku ''$1''",
-'hideresults'   => 'Skonde resultado',
-
 # Special:SpecialPages
 'specialpages' => 'Páginanan Spesial',
 
diff --git a/languages/messages/MessagesPdc.php b/languages/messages/MessagesPdc.php
index 53903f5d..4e1e62f5 100644
--- a/languages/messages/MessagesPdc.php
+++ b/languages/messages/MessagesPdc.php
@@ -4,7 +4,6 @@
  * @ingroup Language
  * @file
  *
- * @author G - ×’
  * @author לערי ריינה�רט
  */
 
@@ -96,7 +95,7 @@ $messages = array(
 # Tooltip help for the actions
 'tooltip-p-logo' => 'Haaptblatt',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Guuck uff',
 
 );
diff --git a/languages/messages/MessagesPdt.php b/languages/messages/MessagesPdt.php
index fbcb7552..8342f7cf 100644
--- a/languages/messages/MessagesPdt.php
+++ b/languages/messages/MessagesPdt.php
@@ -100,6 +100,7 @@ $messages = array(
 'mytalk'         => 'Miene Beredsied',
 'anontalk'       => 'Beredsied fe dise IP',
 'navigation'     => 'Navigatioon',
+'and'            => '&#32;onn',
 
 'errorpagetitle'   => 'Fäla',
 'returnto'         => 'Trigj no $1.',
@@ -152,8 +153,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Äwa {{SITENAME}}',
 'aboutpage'            => 'Project:Äwa',
-'bugreports'           => 'Fehla-Berecht',
-'bugreportspage'       => 'Project:Fehla-Berecht',
 'copyright'            => 'Enhault es to habe unja $1.',
 'currentevents'        => 'Aktuelle Sache',
 'currentevents-url'    => 'Project:Aktuelle Sache',
@@ -265,11 +264,24 @@ Bitte nemm eenen aundren.',
 'media_tip' => 'Datei-Link',
 
 # Edit pages
-'minoredit'          => 'Dit es en kjleene Endaniss',
-'watchthis'          => 'Paus op dise Sied op',
-'showdiff'           => 'Endanisse wiese',
-'newarticle'         => '(Nie)',
-'template-protected' => "(be'schutst)",
+'summary'              => 'Toofotinj:',
+'subject'              => 'Teema:',
+'minoredit'            => 'Dit es eene tjliene Endanis.',
+'watchthis'            => 'Paus op dise Sied op',
+'savearticle'          => 'Sied bewoare',
+'preview'              => 'Preview',
+'showpreview'          => 'Wies Preview',
+'showlivepreview'      => 'Live-Preview',
+'showdiff'             => 'Endanisse wiese',
+'anoneditwarning'      => "'''Paus opp:''' Du best nich aunjemaldt. Diene IP-Adras woat enne Versioonsjeschicht oppbewoat en es emma to seene.",
+'missingsummary'       => "'''Dentj draun:''' Du hast tjeene Toopfotinj jemoakt. Wan du wada opp Bewoare klickst, woat diene Endanis ohne Toopfotinj ewanohme.",
+'missingcommenttext'   => 'Bitte schriew eene korte Toopfotinj.',
+'missingcommentheader' => "'''Dentj draun:''' Du hast tjeen Teema em Plautz \"Teema\" jeschrewe. Wan du wada opp Sied Bewoare klickst, woat diene Oabeit ohne Teema bewoat.",
+'summary-preview'      => 'Toopfotinj-Preview:',
+'subject-preview'      => 'Teema-Preview:',
+'blockedtitle'         => 'Dis Brucka es jeblockt.',
+'newarticle'           => '(Nie)',
+'template-protected'   => "(be'schutst)",
 
 # History pages
 'cur'        => 'dise',
@@ -285,9 +297,10 @@ Bitte nemm eenen aundren.',
 'editundo' => 'trigjsate',
 
 # Search results
-'prevn'       => '$1 ferhäa',
-'nextn'       => 'näakjste $1',
-'powersearch' => 'Bätre Sääk',
+'prevn'          => '$1 ferhäa',
+'nextn'          => 'näakjste $1',
+'searchhelp-url' => 'Help:Enhault',
+'powersearch'    => 'Bätre Sääk',
 
 # Preferences page
 'preferences'   => 'Ennstalinje',
@@ -311,6 +324,7 @@ Bitte nemm eenen aundren.',
 # Recent changes linked
 'recentchangeslinked'          => 'Endarunge aun velinkte Siede',
 'recentchangeslinked-title'    => 'Endarunge aun Siede, woone von "$1" velinkt send',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => 'Em utjesochten Tietrum es aun dee velinkte Siede nuscht aundasch jemoakt worde.',
 'recentchangeslinked-summary'  => "Dit es eene List mette latzte Endarunge aune velinkte Siede (ooda bie Kategorien von Mettjlieda von dise Kategorie). Dee Siede opp diene [[Special:Watchlist|your watchlist]] woare '''fat''' jewese.",
 'recentchangeslinked-page'     => 'Siednome:',
@@ -326,10 +340,10 @@ Bitte nemm eenen aundren.',
 'upload_directory_read_only' => 'Dee Webserver haft tjeene Schriewrajchte fe daut Nopplode-Vetetjnis ($1).',
 'uploaderror'                => 'Fehla biem Nopplode',
 
-# Special:ImageList
-'imagelist_user' => 'Brucker',
+# Special:ListFiles
+'listfiles_user' => 'Brucker',
 
-# Image description page
+# File description page
 'filehist-datetime'   => 'Tiet',
 'filehist-user'       => 'Brucker',
 'filehist-dimensions' => 'Moten',
@@ -374,24 +388,28 @@ Bitte nemm eenen aundren.',
 'allarticles'    => 'Aule Siede',
 
 # Watchlist
-'mywatchlist'          => 'Miene Oppaussied',
-'watchlistfor'         => "(fer '''$1''')",
-'addedwatch'           => "No Oppausssied bieje'done",
-'watch'                => 'Oppausse',
-'watchthispage'        => 'Op dise Sied oppausse',
-'unwatch'              => 'Nijch mea oppausse',
-'watchlist-hide-minor' => 'Kjleene Endanisse nijch wiese',
+'mywatchlist'   => 'Miene Oppaussied',
+'watchlistfor'  => "(fer '''$1''')",
+'addedwatch'    => "No Oppausssied bieje'done",
+'watch'         => 'Oppausse',
+'watchthispage' => 'Op dise Sied oppausse',
+'unwatch'       => 'Nijch mea oppausse',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Oppausse...',
 'unwatching' => 'Nijch mea oppausse......',
 
-# Delete/protect/revert
+# Delete
 'deleteotherreason'     => 'Aundra Grunt:',
 'deletereasonotherlist' => 'Aundre Grunt',
-'rollbacklink'          => 'trigj rolle',
-'protectexpiry'         => 'Ãœtgontiet:',
-'restriction-type'      => "Er'laubniss:",
+
+# Rollback
+'rollbacklink' => 'trigj rolle',
+
+# Protect
+'protectexpiry'          => 'Ãœtgontiet:',
+'protect-expiry-options' => '2 Stunde:2 hours,1 Dach:1 day,3 Doag:3 days,1 Wäakj:1 week,2 Wäakje:2 weeks,1 Moonat:1 month,3 Moonate:3 months,6 Moonate:6 months,1 Joa:1 year,one Enj:infinite', # display1:time1,display2:time2,...
+'restriction-type'       => "Er'laubniss:",
 
 # Namespace form on various pages
 'namespace'      => 'Nomerüm:',
@@ -404,20 +422,30 @@ Bitte nemm eenen aundren.',
 'year'      => 'Fonn Joa (onn ferdäm):',
 
 # What links here
-'whatlinkshere'       => 'Links opp dise Sied',
-'whatlinkshere-title' => 'Siede, woone opp "$1" eenen Link habe',
-'whatlinkshere-page'  => 'Sied:',
-'linkshere'           => "Dee neachste Siede habe eenen Link opp '''[[:$1]]''':",
-'nolinkshere'         => "Tjeene Sied haft eenen Link opp '''[[:$1]]'''.",
-'nolinkshere-ns'      => "Tjeene Siede habe eenen Link opp '''[[:$1]]''' em utjesochten Nomesrum.",
-'isredirect'          => 'Wiedaleid-Sied',
-'istemplate'          => 'Vealoag-Enbinje (Inklusioon)',
-'isimage'             => 'Dotei-Link',
-'whatlinkshere-links' => '� Links',
+'whatlinkshere'          => 'Links opp dise Sied',
+'whatlinkshere-title'    => 'Siede, woone opp "$1" eenen Link habe',
+'whatlinkshere-page'     => 'Sied:',
+'whatlinkshere-backlink' => '� $1',
+'linkshere'              => "Dee neachste Siede habe eenen Link opp '''[[:$1]]''':",
+'nolinkshere'            => "Tjeene Sied haft eenen Link opp '''[[:$1]]'''.",
+'nolinkshere-ns'         => "Tjeene Siede habe eenen Link opp '''[[:$1]]''' em utjesochten Nomesrum.",
+'isredirect'             => 'Wiedaleid-Sied',
+'istemplate'             => 'Vealoag-Enbinje (Inklusioon)',
+'isimage'                => 'Dotei-Link',
+'whatlinkshere-links'    => '� Links',
 
 # Block/unblock
-'ipboptions'   => '2 Stunde:2 hours,1 Dach:1 day,3 Doag:3 days,1 Wäakj:1 week,2 Wäakje:2 weeks,1 Moonat:1 month,3 Moonate:3 months,6 Moonate:6 months,1 Joa:1 year,one Enj:infinite', # display1:time1,display2:time2,...
-'contribslink' => 'Biedrachs',
+'ipboptions'       => '2 Stunde:2 hours,1 Dach:1 day,3 Doag:3 days,1 Wäakj:1 week,2 Wäakje:2 weeks,1 Moonat:1 month,3 Moonate:3 months,6 Moonate:6 months,1 Joa:1 year,one Enj:infinite', # display1:time1,display2:time2,...
+'blocklink'        => 'blocke',
+'unblocklink'      => 'frie jewe',
+'change-blocklink' => 'Daut Blocke endre',
+'contribslink'     => 'Biedrachs',
+'autoblocker'      => 'Automatisch jeblockt, wiels diene IP-Adras soo es aus bie "[[User:$1|$1]]".
+Dee Grunt es: "$2"',
+'blocklogpage'     => 'Block-Logbok',
+'blocklog-fulllog' => 'Vollstendjet Block-Logbok',
+'blocklogentry'    => 'haft [[$1]] jeblockt fe dee Tiet $2 $3',
+'reblock-logentry' => "haft dee Block-Enstalinj fe [[$1]] je'endat fe dee Tiet $2 $3",
 
 # Move page
 'newtitle'   => 'No nie Tietel:',
@@ -432,11 +460,11 @@ Bitte nemm eenen aundren.',
 'thumbnail-more' => "Fe'jreetre",
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Miene Bruckersied',
-'tooltip-pt-mytalk'               => 'Miene Beredsied',
+'tooltip-pt-userpage'             => 'Diene Bruckersied',
+'tooltip-pt-mytalk'               => 'Diene Beredsied',
 'tooltip-pt-preferences'          => 'Miene Ennstalinje',
 'tooltip-pt-watchlist'            => 'List fonn Siede, op de du oppausst, waut sikj endat',
-'tooltip-pt-mycontris'            => 'List fonn miene Biedroage',
+'tooltip-pt-mycontris'            => 'List fonn diene Biedroage',
 'tooltip-pt-login'                => 'Aunmalde wudd scheen senne, es oba nich onbedinjt needich.',
 'tooltip-pt-anonlogin'            => 'Aunmalde wudd scheen senne, es oba nich onbedinjt needich.',
 'tooltip-pt-logout'               => 'Rut hia',
@@ -488,6 +516,8 @@ Bitte nemm eenen aundren.',
 'tooltip-watch'                   => 'Doo dise Sied bie diene Oobacht-List doatoo',
 'tooltip-recreate'                => 'Moak dee Sied wada fresh, uck wan se wea jelascht haft.',
 'tooltip-upload'                  => 'Nopplode aunfange',
+'tooltip-rollback'                => '"Rollback" dreit dee Endarung(e) von dise Sied mett eenem Klick wada tridj bettem latsten Biedrach.',
+'tooltip-undo'                    => 'Moakt bloos dise eene Endarung tridj en wiest daut Resultaut en eenem Eschtmolseene-Fensta, doamett enne Toopfotinj een Grunt jenant woare kaun.',
 
 # Stylesheets
 'common.css'      => '/* CSS opp dise Sted woat opp aula Skins wirtje */',
@@ -499,6 +529,7 @@ Bitte nemm eenen aundren.',
 'chick.css'       => '/* CSS opp dise Sted wirtjt opp daut Chick-Skin */',
 'simple.css'      => '/* CSS opp dise Sted wirtjt opp daut Simple-Skin */',
 'modern.css'      => '/* CSS opp dise Sted wirtjt opp daut Modern-Skin */',
+'print.css'       => '/* CSS opp dise Sted woat daut Utkome vom Dretje aundasch moake */',
 
 # Scripts
 'common.js'      => '/* Daut neachste JavaScript woat fe aula Brucka jelode. */',
@@ -517,10 +548,12 @@ Bitte nemm eenen aundren.',
 'notacceptable'     => 'Dee Wiki-Server kaun dee Dote nich soo reedmoake, daut dien Jereetschauft dee lese kaun.',
 
 # Attribution
+'anonymous'        => 'Onbekaunda Brucka {{PLURAL:$1|user|users}} von {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Brucka $1',
 'lastmodifiedatby' => "Dise Sied word daut latste Mol aum $1, Klock $2 von $3 je'endat.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Oppe Gruntloag vonne Oabeit von $1.',
 'others'           => 'aundre',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|user|users}} $1',
 'creditspage'      => 'Siede-Informatioone',
 'nocredits'        => 'Fe dise Sied send tjeene Informatioone to habe.',
 
diff --git a/languages/messages/MessagesPfl.php b/languages/messages/MessagesPfl.php
index 8b41d8ed..1723d441 100644
--- a/languages/messages/MessagesPfl.php
+++ b/languages/messages/MessagesPfl.php
@@ -126,7 +126,7 @@ $messages = array(
 
 'enotif_reset' => 'Alle Seide als bsuchd margiere',
 
-# Delete/protect/revert
+# Delete
 'deletepage' => 'Seid lesche',
 'confirm'    => 'Bestädiche',
 
@@ -165,7 +165,7 @@ $messages = array(
 # Special:Import
 'import-interwiki-submit' => 'Impordiere',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Such',
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesPih.php b/languages/messages/MessagesPih.php
index d0eddeee..a241c0db 100644
--- a/languages/messages/MessagesPih.php
+++ b/languages/messages/MessagesPih.php
@@ -44,6 +44,9 @@ $messages = array(
 'nstab-main' => 'Artikal',
 'nstab-help' => 'Hiiwp Paij',
 
+# Search results
+'searchhelp-url' => 'Help:Dem Kontent',
+
 # Preferences page
 'prefs-rc' => 'Dem Riisent Chayng',
 
diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index d4746d63..2dbd1156 100644
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -14,10 +14,13 @@
  * @author Maikking
  * @author Masti
  * @author Matma Rex
+ * @author McMonster
  * @author Remember the dot
+ * @author Saper
  * @author Sp5uhe
  * @author Stv
  * @author Szczepan1990
+ * @author Timpul
  * @author ToSter
  * @author Wpedzich
  * @author Ymar
@@ -25,37 +28,30 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Specjalna',
-	NS_MAIN           => '',
-	NS_TALK           => 'Dyskusja',
-	NS_USER           => 'Użytkownik',
-	NS_USER_TALK      => 'Dyskusja_użytkownika',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Dyskusja_$1',
-	NS_IMAGE          => 'Grafika',
-	NS_IMAGE_TALK     => 'Dyskusja_grafiki',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Dyskusja_MediaWiki',
-	NS_TEMPLATE       => 'Szablon',
-	NS_TEMPLATE_TALK  => 'Dyskusja_szablonu',
-	NS_HELP           => 'Pomoc',
-	NS_HELP_TALK      => 'Dyskusja_pomocy',
-	NS_CATEGORY       => 'Kategoria',
-	NS_CATEGORY_TALK  => 'Dyskusja_kategorii',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Specjalna',
+	NS_TALK             => 'Dyskusja',
+	NS_USER             => 'Użytkownik',
+	NS_USER_TALK        => 'Dyskusja_użytkownika',
+	NS_PROJECT_TALK     => 'Dyskusja_$1',
+	NS_FILE             => 'Plik',
+	NS_FILE_TALK        => 'Dyskusja_pliku',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Dyskusja_MediaWiki',
+	NS_TEMPLATE         => 'Szablon',
+	NS_TEMPLATE_TALK    => 'Dyskusja_szablonu',
+	NS_HELP             => 'Pomoc',
+	NS_HELP_TALK        => 'Dyskusja_pomocy',
+	NS_CATEGORY         => 'Kategoria',
+	NS_CATEGORY_TALK    => 'Dyskusja_kategorii',
 );
 
-$skinNames = array(
-	'standard'    => 'Standardowa',
-	'nostalgia'   => 'Tęsknota',
-	'cologneblue' => 'Błękit',
-	'monobook'    => 'Książka',
-	'myskin'      => 'Moja skórka',
-	'chick'       => 'Kurczaczek',
-	'simple'      => 'Prosta',
-	'modern'      => 'Nowoczesna',
+$namespaceAliases = array(
+	'Grafika' => NS_FILE,
+	'Dyskusja_grafiki' => NS_FILE_TALK,
 );
 
+
 $dateFormats = array(
 	'mdy time' => 'H:i',
 	'mdy date' => 'M j, Y',
@@ -79,87 +75,91 @@ $separatorTransformTable = array(
 $linkTrail = '/^([a-zęóąśłżźćńĘÓĄŚ�ŻŹĆŃ]+)(.*)$/sDu';
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Podwójne_przekierowania' ),
-	'BrokenRedirects'           => array( 'Zerwane_przekierowania' ),
+	'DoubleRedirects'           => array( 'Podwójne przekierowania' ),
+	'BrokenRedirects'           => array( 'Zerwane przekierowania' ),
 	'Disambiguations'           => array( 'Ujednoznacznienia' ),
 	'Userlogin'                 => array( 'Zaloguj' ),
 	'Userlogout'                => array( 'Wyloguj' ),
-	'CreateAccount'             => array( 'Stwórz_konto' ),
+	'CreateAccount'             => array( 'Stwórz konto' ),
 	'Preferences'               => array( 'Preferencje' ),
 	'Watchlist'                 => array( 'Obserwowane' ),
-	'Recentchanges'             => array( 'Ostatnie_zmiany', 'OZ' ),
+	'Recentchanges'             => array( 'Ostatnie zmiany', 'OZ' ),
 	'Upload'                    => array( 'Prześlij' ),
-	'Imagelist'                 => array( 'Pliki' ),
-	'Newimages'                 => array( 'Nowe_pliki' ),
+	'Listfiles'                 => array( 'Pliki' ),
+	'Newimages'                 => array( 'Nowe pliki' ),
 	'Listusers'                 => array( 'Użytkownicy' ),
-	'Listgrouprights'           => array( 'Uprawnienia_grup_użytkowników', 'Uprawnienia' ),
+	'Listgrouprights'           => array( 'Uprawnienia grup użytkowników', 'Uprawnienia' ),
 	'Statistics'                => array( 'Statystyka', 'Statystyki' ),
-	'Randompage'                => array( 'Losowa_strona', 'Losowa' ),
-	'Lonelypages'               => array( 'Porzucone_strony' ),
-	'Uncategorizedpages'        => array( 'Nieskategoryzowane_strony' ),
-	'Uncategorizedcategories'   => array( 'Nieskategoryzowane_kategorie' ),
-	'Uncategorizedimages'       => array( 'Nieskategoryzowane_pliki' ),
-	'Uncategorizedtemplates'    => array( 'Nieskategoryzowane_szablony' ),
-	'Unusedcategories'          => array( 'Nieużywane_kategorie' ),
-	'Unusedimages'              => array( 'Nieużywane_pliki' ),
-	'Wantedpages'               => array( 'Potrzebne_strony' ),
-	'Wantedcategories'          => array( 'Potrzebne_kategorie' ),
-	'Mostlinked'                => array( 'Najczęściej_linkowane' ),
-	'Mostlinkedcategories'      => array( 'Najczęściej_linkowane_kategorie' ),
-	'Mostlinkedtemplates'       => array( 'Najczęściej_linkowane_szablony' ),
-	'Mostcategories'            => array( 'Najwięcej_kategorii' ),
-	'Mostimages'                => array( 'Najczęściej_linkowane_pliki' ),
-	'Mostrevisions'             => array( 'Najwięcej_edycji', 'Najczęściej_edytowane' ),
-	'Fewestrevisions'           => array( 'Najmniej_edycji' ),
-	'Shortpages'                => array( 'Najkrótsze_strony' ),
-	'Longpages'                 => array( 'Najdłuższe_strony' ),
-	'Newpages'                  => array( 'Nowe_strony' ),
-	'Ancientpages'              => array( 'Stare_strony' ),
-	'Deadendpages'              => array( 'Bez_linków' ),
-	'Protectedpages'            => array( 'Zabezpieczone_strony' ),
-	'Protectedtitles'           => array( 'Zabezpieczone_nazwy_stron' ),
-	'Allpages'                  => array( 'Wszystkie_strony' ),
-	'Prefixindex'               => array( 'Strony_według_prefiksu' ),
+	'Randompage'                => array( 'Losowa strona', 'Losowa' ),
+	'Lonelypages'               => array( 'Porzucone strony' ),
+	'Uncategorizedpages'        => array( 'Nieskategoryzowane strony' ),
+	'Uncategorizedcategories'   => array( 'Nieskategoryzowane kategorie' ),
+	'Uncategorizedimages'       => array( 'Nieskategoryzowane pliki' ),
+	'Uncategorizedtemplates'    => array( 'Nieskategoryzowane szablony' ),
+	'Unusedcategories'          => array( 'Nieużywane kategorie' ),
+	'Unusedimages'              => array( 'Nieużywane pliki' ),
+	'Wantedpages'               => array( 'Potrzebne strony' ),
+	'Wantedcategories'          => array( 'Potrzebne kategorie' ),
+	'Wantedfiles'               => array( 'Potrzebne pliki' ),
+	'Wantedtemplates'           => array( 'Potrzebne szablony' ),
+	'Mostlinked'                => array( 'Najczęściej linkowane' ),
+	'Mostlinkedcategories'      => array( 'Najczęściej linkowane kategorie' ),
+	'Mostlinkedtemplates'       => array( 'Najczęściej linkowane szablony' ),
+	'Mostimages'                => array( 'Najczęściej linkowane pliki' ),
+	'Mostcategories'            => array( 'Najwięcej kategorii' ),
+	'Mostrevisions'             => array( 'Najwięcej edycji', 'Najczęściej edytowane' ),
+	'Fewestrevisions'           => array( 'Najmniej edycji' ),
+	'Shortpages'                => array( 'Najkrótsze strony' ),
+	'Longpages'                 => array( 'Najdłuższe strony' ),
+	'Newpages'                  => array( 'Nowe strony' ),
+	'Ancientpages'              => array( 'Stare strony' ),
+	'Deadendpages'              => array( 'Bez linków' ),
+	'Protectedpages'            => array( 'Zabezpieczone strony' ),
+	'Protectedtitles'           => array( 'Zabezpieczone nazwy stron' ),
+	'Allpages'                  => array( 'Wszystkie strony' ),
+	'Prefixindex'               => array( 'Strony według prefiksu' ),
 	'Ipblocklist'               => array( 'Zablokowani' ),
-	'Specialpages'              => array( 'Strony_specjalne' ),
+	'Specialpages'              => array( 'Strony specjalne' ),
 	'Contributions'             => array( 'Wkład' ),
 	'Emailuser'                 => array( 'E-mail' ),
-	'Confirmemail'              => array( 'Potwierdź_e-mail' ),
+	'Confirmemail'              => array( 'Potwierdź e-mail' ),
 	'Whatlinkshere'             => array( 'LinkujÄ…ce' ),
-	'Recentchangeslinked'       => array( 'Zmiany_w_linkujÄ…cych' ),
+	'Recentchangeslinked'       => array( 'Zmiany w linkujÄ…cych' ),
 	'Movepage'                  => array( 'PrzenieÅ›' ),
-	'Blockme'                   => array( 'Zablokuj_mnie' ),
+	'Blockme'                   => array( 'Zablokuj mnie' ),
 	'Booksources'               => array( 'Książki' ),
 	'Categories'                => array( 'Kategorie' ),
 	'Export'                    => array( 'Eksport' ),
 	'Version'                   => array( 'Wersja' ),
-	'Allmessages'               => array( 'Wszystkie_komunikaty' ),
+	'Allmessages'               => array( 'Wszystkie komunikaty' ),
 	'Log'                       => array( 'Rejestr', 'Logi' ),
 	'Blockip'                   => array( 'Blokuj' ),
 	'Undelete'                  => array( 'Odtwórz' ),
-	'Import'                    => array( 'Import' ),
-	'Lockdb'                    => array( 'Zablokuj_bazÄ™' ),
-	'Unlockdb'                  => array( 'Odblokuj_bazÄ™' ),
-	'Userrights'                => array( 'Uprawnienia', 'Prawa_użytkowników' ),
-	'MIMEsearch'                => array( 'Wyszukiwanie_MIME' ),
-	'FileDuplicateSearch'       => array( 'Szukaj_duplikatu_pliku' ),
-	'Unwatchedpages'            => array( 'Nieobserwowane_strony' ),
+	'Lockdb'                    => array( 'Zablokuj bazÄ™' ),
+	'Unlockdb'                  => array( 'Odblokuj bazÄ™' ),
+	'Userrights'                => array( 'Uprawnienia', 'Prawa użytkowników' ),
+	'MIMEsearch'                => array( 'Wyszukiwanie MIME' ),
+	'FileDuplicateSearch'       => array( 'Szukaj duplikatu pliku' ),
+	'Unwatchedpages'            => array( 'Nieobserwowane strony' ),
 	'Listredirects'             => array( 'Przekierowania' ),
-	'Revisiondelete'            => array( 'Usuń_wersję' ),
-	'Unusedtemplates'           => array( 'Nieużywane_szablony' ),
-	'Randomredirect'            => array( 'Losowe_przekierowanie' ),
-	'Mypage'                    => array( 'Moja_strona' ),
-	'Mytalk'                    => array( 'Moja_dyskusja' ),
-	'Mycontributions'           => array( 'Mój_wkład' ),
+	'Revisiondelete'            => array( 'Usuń wersję' ),
+	'Unusedtemplates'           => array( 'Nieużywane szablony' ),
+	'Randomredirect'            => array( 'Losowe przekierowanie' ),
+	'Mypage'                    => array( 'Moja strona' ),
+	'Mytalk'                    => array( 'Moja dyskusja' ),
+	'Mycontributions'           => array( 'Mój wkład' ),
 	'Listadmins'                => array( 'Administratorzy' ),
 	'Listbots'                  => array( 'Boty' ),
-	'Popularpages'              => array( 'Pupularne_strony' ),
+	'Popularpages'              => array( 'Popularne strony' ),
 	'Search'                    => array( 'Szukaj' ),
-	'Resetpass'                 => array( 'Resetuj_hasło' ),
-	'Withoutinterwiki'          => array( 'Strony_bez_interwiki' ),
-	'MergeHistory'              => array( 'Połącz_historię' ),
-	'Filepath'                  => array( 'Ścieżka_do_pliku' ),
-	'Invalidateemail'           => array( 'Anuluj_e-mail' ),
+	'Resetpass'                 => array( 'Zmień hasło', 'Resetuj hasło' ),
+	'Withoutinterwiki'          => array( 'Strony bez interwiki' ),
+	'MergeHistory'              => array( 'Połącz historię' ),
+	'Filepath'                  => array( 'Ścieżka do pliku' ),
+	'Invalidateemail'           => array( 'Anuluj e-mail' ),
+	'Blankpage'                 => array( 'Pusta strona' ),
+	'LinkSearch'                => array( 'Wyszukiwarka linków' ),
+	'DeletedContributions'      => array( 'Usunięty wkład' ),
 );
 
 $magicWords = array(
@@ -218,7 +218,7 @@ $magicWords = array(
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Podkreślenie linków',
-'tog-highlightbroken'         => 'Oznacz <a href="" class="new">tak</a> linki do brakujących stron (alternatywa: dołączany znak zapytania<a href="" class="internal">?</a>).',
+'tog-highlightbroken'         => 'Oznacz <a href="" class="new">tak</a> linki do brakujących stron (alternatywa – dołączany znak zapytania<a href="" class="internal">?</a>).',
 'tog-justify'                 => 'Wyrównuj tekst w akapitach do obu stron',
 'tog-hideminor'               => 'Ukryj drobne poprawki w „Ostatnich zmianach�',
 'tog-extendwatchlist'         => 'Rozszerzona lista obserwowanych',
@@ -253,17 +253,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ukryj moje edycje na liście obserwowanych',
 'tog-watchlisthidebots'       => 'Ukryj edycje botów na liście obserwowanych',
 'tog-watchlisthideminor'      => 'Ukryj drobne zmiany na liście obserwowanych',
+'tog-watchlisthideliu'        => 'Ukryj edycje zalogowanych użytkowników na liście obserwowanych',
+'tog-watchlisthideanons'      => 'Ukryj edycje anonimowych użytkowników na liście obserwowanych',
 'tog-nolangconversion'        => 'Wyłącz odmianę',
-'tog-ccmeonemails'            => 'Przesyłaj mi kopie wiadomości wysłanych przez mnie do innych użytkowników',
+'tog-ccmeonemails'            => 'Przesyłaj mi kopie wiadomości wysłanych przeze mnie do innych użytkowników',
 'tog-diffonly'                => 'Nie pokazuj treści stron pod porównaniami zmian',
 'tog-showhiddencats'          => 'Pokaż ukryte kategorie',
+'tog-noconvertlink'           => 'Wyłącz konwersję tytułów w linkach',
+'tog-norollbackdiff'          => 'Pomiń pokazywanie zmian po użyciu funkcji „cofnij�',
 
 'underline-always'  => 'zawsze',
 'underline-never'   => 'nigdy',
 'underline-default' => 'według ustawień przeglądarki',
 
-'skinpreview' => '(podglÄ…d)',
-
 # Dates
 'sunday'        => 'niedziela',
 'monday'        => 'poniedziałek',
@@ -353,10 +355,10 @@ $messages = array(
 'qbspecialpages' => 'strony specjalne',
 'moredotdotdot'  => 'Więcej...',
 'mypage'         => 'Moja strona',
-'mytalk'         => 'moja dyskusja',
+'mytalk'         => 'Moja dyskusja',
 'anontalk'       => 'Dyskusja tego IP',
-'navigation'     => 'nawigacja',
-'and'            => 'oraz',
+'navigation'     => 'Nawigacja',
+'and'            => '&#32;oraz',
 
 # Metadata in edit box
 'metadata_help' => 'Metadane:',
@@ -370,34 +372,34 @@ $messages = array(
 'go'                => 'Przejdź',
 'searcharticle'     => 'Przejdź',
 'history'           => 'Historia strony',
-'history_short'     => 'historia i autorzy',
+'history_short'     => 'Historia i autorzy',
 'updatedmarker'     => 'zmienione od ostatniej wizyty',
 'info_short'        => 'Informacja',
 'printableversion'  => 'Wersja do druku',
 'permalink'         => 'Link do tej wersji',
-'print'             => 'drukuj',
-'edit'              => 'edytuj',
-'create'            => 'utwórz',
+'print'             => 'Drukuj',
+'edit'              => 'Edytuj',
+'create'            => 'Utwórz',
 'editthispage'      => 'Edytuj tÄ™ stronÄ™',
 'create-this-page'  => 'Utwórz tę stronę',
-'delete'            => 'usuń',
+'delete'            => 'Usuń',
 'deletethispage'    => 'Usuń tę stronę',
 'undelete_short'    => 'odtwórz {{PLURAL:$1|1 wersję|$1 wersje|$1 wersji}}',
-'protect'           => 'zabezpiecz',
+'protect'           => 'Zabezpiecz',
 'protect_change'    => 'zmień',
 'protectthispage'   => 'Zabezpiecz tÄ™ stronÄ™',
-'unprotect'         => 'odbezpiecz',
+'unprotect'         => 'Odbezpiecz',
 'unprotectthispage' => 'Odbezpiecz tÄ™ stronÄ™',
 'newpage'           => 'Nowa strona',
 'talkpage'          => 'Dyskusja',
 'talkpagelinktext'  => 'dyskusja',
-'specialpage'       => 'strona specjalna',
-'personaltools'     => 'osobiste',
-'postcomment'       => 'Skomentuj',
+'specialpage'       => 'Strona specjalna',
+'personaltools'     => 'Osobiste',
+'postcomment'       => 'Nowa sekcja',
 'articlepage'       => 'Artykuł',
-'talk'              => 'dyskusja',
+'talk'              => 'Dyskusja',
 'views'             => 'Widok',
-'toolbox'           => 'narzędzia',
+'toolbox'           => 'Narzędzia',
 'userpage'          => 'Strona użytkownika',
 'projectpage'       => 'Strona projektu',
 'imagepage'         => 'Strona pliku',
@@ -419,8 +421,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'O {{GRAMMAR:MS.lp|{{SITENAME}}}}',
 'aboutpage'            => 'Project:O {{GRAMMAR:MS.lp|{{SITENAME}}}}',
-'bugreports'           => 'Raport o błędach',
-'bugreportspage'       => 'Project:Błędy',
 'copyright'            => 'Treść udostępniana na licencji $1.',
 'copyrightpagename'    => 'prawami autorskimi {{GRAMMAR:D.lp|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:Prawa_autorskie',
@@ -443,15 +443,14 @@ $messages = array(
 
 'badaccess'        => 'Niewłaściwe uprawnienia',
 'badaccess-group0' => 'Nie masz uprawnień wymaganych do wykonania tej operacji.',
-'badaccess-group1' => 'Wykonywanie tej operacji zostało ograniczone do użytkowników w grupie $1.',
-'badaccess-group2' => 'Wykonywanie tej operacji zostało ograniczone do użytkowników w jednej z grup $1.',
-'badaccess-groups' => 'Wykonywanie tej operacji zostało ograniczone do użytkowników w jednej z grup $1.',
+'badaccess-groups' => 'Wykonywanie tej operacji zostało ograniczone do użytkowników w {{PLURAL:$2|grupie|jednej z grup:}} $1.',
 
 'versionrequired'     => 'Wymagane MediaWiki w wersji $1',
 'versionrequiredtext' => 'Użycie tej strony wymaga oprogramowania MediaWiki w wersji $1. Zobacz stronę [[Special:Version|wersja oprogramowania]].',
 
 'ok'                      => 'OK',
-'retrievedfrom'           => 'Źródło: „$1�',
+'pagetitle'               => '$1 – {{SITENAME}}',
+'retrievedfrom'           => 'Źródło „$1�',
 'youhavenewmessages'      => 'Masz $1 ($2).',
 'newmessageslink'         => 'nowe wiadomości',
 'newmessagesdifflink'     => 'różnica z poprzednią wersją',
@@ -459,11 +458,13 @@ $messages = array(
 'editsection'             => 'edytuj',
 'editold'                 => 'edytuj',
 'viewsourceold'           => 'pokaż źródło',
+'editlink'                => 'edytuj',
+'viewsourcelink'          => 'tekst źródłowy',
 'editsectionhint'         => 'Edytuj sekcjÄ™: $1',
 'toc'                     => 'Spis treści',
 'showtoc'                 => 'pokaż',
 'hidetoc'                 => 'ukryj',
-'thisisdeleted'           => 'Pokaż/odtwórz $1',
+'thisisdeleted'           => 'Pokazać czy odtworzyć $1?',
 'viewdeleted'             => 'Zobacz $1',
 'restorelink'             => '{{PLURAL:$1|jedną usuniętą wersję|$1 usunięte wersje|$1 usuniętych wersji}}',
 'feedlinks'               => 'Kanały:',
@@ -473,7 +474,7 @@ $messages = array(
 'site-atom-feed'          => 'Kanał Atom {{GRAMMAR:D.lp|$1}}',
 'page-rss-feed'           => 'Kanał RSS „$1�',
 'page-atom-feed'          => 'Kanał Atom „$1�',
-'red-link-title'          => '$1 (jeszcze nie napisana)',
+'red-link-title'          => '$1 (strona nie istnieje)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Strona',
@@ -489,7 +490,8 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Brak takiej operacji',
-'nosuchactiontext'  => 'Oprogramowanie wiki nie rozpoznało polecenia zawartego w adresie URL',
+'nosuchactiontext'  => 'Działanie określone w adresie URL jest nieprawidłowe.
+Możliwe przyczyny to literówka w adresie, nieprawidłowy link lub błąd w oprogramowaniu {{GRAMMAR:D.lp|{{SITENAME}}}}.',
 'nosuchspecialpage' => 'Brak takiej strony specjalnej',
 'nospecialpagetext' => "<big>'''Brak żądanej strony specjalnej.'''</big>
 
@@ -525,25 +527,24 @@ Zazwyczaj jest to spowodowane odwołaniem do nieaktualnego linku prowadzącego d
 
 Jeśli tak nie jest, możliwe, że problem został wywołany przez błąd w oprogramowaniu.
 Można zgłosić ten fakt [[Special:ListUsers/sysop|administratorowi]], podając adres URL.',
-'missingarticle-rev'   => '(wersja: $1)',
+'missingarticle-rev'   => '(wersja $1)',
 'missingarticle-diff'  => '(różnica: $1, $2)',
 'readonly_lag'         => 'Baza danych została automatycznie zablokowana na czas potrzebny do wykonania synchronizacji zmian między serwerem głównym i serwerami pośredniczącymi.',
 'internalerror'        => 'Błąd wewnętrzny',
-'internalerror_info'   => 'Błąd wewnętrzny: $1',
+'internalerror_info'   => 'Błąd wewnętrzny – $1',
 'filecopyerror'        => 'Nie można skopiować pliku „$1� do „$2�.',
 'filerenameerror'      => 'Nie można zmienić nazwy pliku „$1� na „$2�.',
 'filedeleteerror'      => 'Nie można usunąć pliku „$1�.',
 'directorycreateerror' => 'Nie udało się utworzyć katalogu „$1�.',
 'filenotfound'         => 'Nie można znaleźć pliku „$1�.',
-'fileexistserror'      => 'Nie udało się zapisać do pliku „$1�: plik istnieje',
-'unexpected'           => 'Niespodziewana wartość: „$1�=„$2�.',
-'formerror'            => 'Błąd: nie można wysłać formularza',
+'fileexistserror'      => 'Nie udało się zapisać do pliku „$1� ponieważ plik istnieje',
+'unexpected'           => 'Nieoczekiwana wartość „$1�=„$2�.',
+'formerror'            => 'Błąd – nie można wysłać formularza',
 'badarticleerror'      => 'Dla tej strony ta operacja nie może być wykonana.',
 'cannotdelete'         => 'Nie można usunąć podanej strony lub grafiki.
 Możliwe, że zostały już usunięte przez kogoś innego.',
 'badtitle'             => 'Niepoprawny tytuł',
 'badtitletext'         => 'Podano niepoprawny tytuł strony. Prawdopodobnie jest pusty lub zawiera znaki, których użycie jest zabronione.',
-'perfdisabled'         => 'Uwaga! Możliwość użycia tej funkcjonalności została czasowo zablokowana, ponieważ obniża ona wydajność systemu bazy danych do poziomu uniemożliwiającego komukolwiek skorzystanie z tej wiki.',
 'perfcached'           => 'Poniższe dane są kopią z pamięci podręcznej i mogą być nieaktualne.',
 'perfcachedts'         => 'Poniższe dane są kopią z pamięci podręcznej. Ostatnia aktualizacja odbyła się $1.',
 'querypage-no-updates' => 'Uaktualnienia dla tej strony są obecnie wyłączone. Znajdujące się tutaj dane nie zostaną odświeżone.',
@@ -559,7 +560,7 @@ Zapytanie: $2',
 'protectedinterface'   => 'Ta strona zawiera tekst interfejsu oprogramowania, dlatego możliwość jej edycji została zablokowana.',
 'editinginterface'     => "'''Ostrzeżenie:''' Edytujesz stronę, która zawiera tekst interfejsu oprogramowania.
 Zmiany na tej stronie zmienią wygląd interfejsu dla innych użytkowników.
-Rozważ wykonanie tłumaczenia na [http://translatewiki.net/wiki/Main_Page?setlang=pl Betawiki], specjalizowanym projekcie lokalizacji oprogramowania MediaWiki.",
+Rozważ wykonanie tłumaczenia na [http://translatewiki.net/wiki/Main_Page?setlang=pl translatewiki.net], specjalizowanym projekcie lokalizacji oprogramowania MediaWiki.",
 'sqlhidden'            => '(ukryto zapytanie SQL)',
 'cascadeprotected'     => 'Ta strona została zabezpieczona przed edycją, ponieważ jest ona zawarta na {{PLURAL:$1|następującej stronie, która została zabezpieczona|następujących stronach, które zostały zabezpieczone}} z włączoną opcją dziedziczenia:
 $2',
@@ -570,27 +571,26 @@ $2',
 Uzasadnienie blokady: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Zła konfiguracja – nieznany skaner antywirusowy <i>$1</i>',
+'virus-badscanner'     => "Zła konfiguracja – nieznany skaner antywirusowy ''$1''",
 'virus-scanfailed'     => 'skanowanie nieudane (błąd $1)',
 'virus-unknownscanner' => 'nieznany program antywirusowy',
 
 # Login and logout pages
 'logouttitle'                => 'Wylogowanie użytkownika',
-'logouttext'                 => '<strong>Zostałeś wylogowany.</strong>
+'logouttext'                 => "'''Nie jesteś już zalogowany.'''
 
 Możesz kontynuować pracę w {{GRAMMAR:MS.lp|{{SITENAME}}}} jako niezarejestrowany użytkownik albo [[Special:UserLogin|zalogować się ponownie]] jako ten sam lub inny użytkownik.
-Zauważ, że do momentu wyczyszczenia pamięci podręcznej przeglądarki niektóre strony mogą wyglądać tak, jakbyś wciąż był zalogowany.',
+Zauważ, że do momentu wyczyszczenia pamięci podręcznej przeglądarki niektóre strony mogą wyglądać tak, jakbyś wciąż był zalogowany.",
 'welcomecreation'            => '== Witaj, $1! ==
 Twoje konto zostało utworzone.
 Nie zapomnij dostosować [[Special:Preferences|preferencji dla {{GRAMMAR:D.lp|{{SITENAME}}}}]].',
 'loginpagetitle'             => 'Logowanie',
-'yourname'                   => 'Nazwa użytkownika:',
-'yourpassword'               => 'Hasło:',
-'yourpasswordagain'          => 'Powtórz hasło:',
+'yourname'                   => 'Nazwa użytkownika',
+'yourpassword'               => 'Hasło',
+'yourpasswordagain'          => 'Powtórz hasło',
 'remembermypassword'         => 'Zapamiętaj moje hasło na tym komputerze',
 'yourdomainname'             => 'Twoja domena',
 'externaldberror'            => 'Wystąpił błąd zewnętrznej bazy autentyfikacyjnej lub nie posiadasz uprawnień koniecznych do aktualizacji zewnętrznego konta.',
-'loginproblem'               => '<b>Wystąpił problem przy próbie zalogowania.</b><br />Spróbuj ponownie!',
 'login'                      => 'Zaloguj siÄ™',
 'nav-login-createaccount'    => 'Logowanie i rejestracja',
 'loginprompt'                => 'Musisz mieć włączoną w przeglądarce obsługę ciasteczek, by móc się zalogować do {{GRAMMAR:D.lp|{{SITENAME}}}}.',
@@ -635,7 +635,8 @@ Spróbuj ponownie po ich odblokowaniu.',
 'loginsuccesstitle'          => 'Zalogowano pomyślnie',
 'loginsuccess'               => "'''Zalogowałeś się do {{GRAMMAR:D.lp|{{SITENAME}}}} jako „$1�.'''",
 'nosuchuser'                 => 'Brak użytkownika o nazwie „$1�.
-Sprawdź pisownię lub [[Special:UserLogin/signup|użyj formularza, by utworzyć nowe konto]].',
+W nazwa użytkownika ma znaczenie wielkość znaków.
+Sprawdź pisownię lub [[Special:UserLogin/signup|utwórz nowe konto]].',
 'nosuchusershort'            => 'Brak użytkownika o nazwie „<nowiki>$1</nowiki>�.
 Sprawdź poprawność pisowni.',
 'nouserspecified'            => 'Musisz podać nazwę użytkownika.',
@@ -660,12 +661,12 @@ Zanim jakiekolwiek inne wiadomości zostaną wysłane na ten adres, należy wyko
 'throttled-mailpassword'     => 'Przypomnienie hasła zostało już wysłane w ciągu {{PLURAL:$1|ostatniej godziny|ostatnich $1 godzin}}.
 W celu powstrzymania nadużyć możliwość wysyłania przypomnień została ograniczona do jednego na {{PLURAL:$1|godzinę|$1 godziny|$1 godzin}}.',
 'mailerror'                  => 'W trakcie wysyłania wiadomości e-mail wystąpił błąd: $1',
-'acct_creation_throttle_hit' => 'Założyłeś już {{PLURAL:$1|konto|$1 konta|$1 kont}}.
-Nie możesz założyć kolejnego.',
-'emailauthenticated'         => 'Twój adres e-mail został uwierzytelniony o $1',
+'acct_creation_throttle_hit' => 'Z adresu IP, z którego korzystasz {{PLURAL:$1|ktoś już utworzył dziś konto|goście już utworzyli dziś $1 konta|goście już utworzyli dziś $1 kont}}, co jest maksymalną dopuszczalną liczbą w tym czasie.
+W związku z tym, osoby korzystające z tego adresu IP w chwili obecnej nie mogą założyć kolejnego.',
+'emailauthenticated'         => 'Twój adres e-mail został potwierdzony $2 o $3.',
 'emailnotauthenticated'      => "Twój adres '''e-mail nie został potwierdzony'''.
 Poniższe funkcje poczty nie działają.",
-'noemailprefs'               => 'Musisz podać adres e-mail, by skorzystać z tych funkcji.',
+'noemailprefs'               => 'Podaj adres e-mail w preferencjach, by skorzystać z tych funkcji.',
 'emailconfirmlink'           => 'Potwierdź swój adres e-mail',
 'invalidemailaddress'        => 'Adres e-mail jest niepoprawny i nie może być zaakceptowany.
 Wpisz poprawny adres e-mail lub wyczyść pole.',
@@ -676,20 +677,28 @@ Wpisz poprawny adres e-mail lub wyczyść pole.',
 Zaloguj się teraz i je zmień.
 
 Możesz zignorować tę wiadomość, jeśli konto zostało utworzone przez pomyłkę.',
+'login-throttled'            => 'Wykonałeś zbyt wiele prób zalogowania się na to konto. Odczekaj chwilę przez spróbowaniem ponownie.',
 'loginlanguagelabel'         => 'Język: $1',
 
 # Password reset dialog
-'resetpass'               => 'Resetuj hasło',
-'resetpass_announce'      => 'Zalogowałeś się, wykorzystując tymczasowe hasło otrzymane poprzez e-mail.
+'resetpass'                 => 'Zmień hasło',
+'resetpass_announce'        => 'Zalogowałeś się, wykorzystując tymczasowe hasło otrzymane poprzez e-mail.
 Aby zakończyć proces logowania, musisz ustawić nowe hasło:',
-'resetpass_text'          => '<!-- Dodaj tekst -->',
-'resetpass_header'        => 'Zmień hasło dla swojego konta',
-'resetpass_submit'        => 'Ustaw hasło i zaloguj się',
-'resetpass_success'       => 'Twoje hasło zostało pomyślnie zmienione! Trwa logowanie...',
-'resetpass_bad_temporary' => 'Nieprawidłowe hasło tymczasowe.
+'resetpass_text'            => '<!-- Dodaj tekst -->',
+'resetpass_header'          => 'Zmień hasło dla swojego konta',
+'oldpassword'               => 'Stare hasło',
+'newpassword'               => 'Nowe hasło',
+'retypenew'                 => 'Powtórz nowe hasło',
+'resetpass_submit'          => 'Ustaw hasło i zaloguj się',
+'resetpass_success'         => 'Twoje hasło zostało pomyślnie zmienione! Trwa logowanie...',
+'resetpass_bad_temporary'   => 'Nieprawidłowe hasło tymczasowe.
 Być może zakończyłeś już proces zmiany hasła lub poprosiłeś o nowe hasło tymczasowe.',
-'resetpass_forbidden'     => 'Hasła nie mogą zostać zmienione',
-'resetpass_missing'       => 'Brak danych formularza.',
+'resetpass_forbidden'       => 'Hasła nie mogą zostać zmienione',
+'resetpass-no-info'         => 'Musisz być zalogowany, by uzyskać bezpośredni dostęp do tej strony.',
+'resetpass-submit-loggedin' => 'Zmień hasło',
+'resetpass-wrong-oldpass'   => 'Nieprawidłowe tymczasowe lub aktualne hasło. 
+Być może właśnie zmieniłeś swoje hasło lub poprosiłeś o nowe tymczasowe hasło.',
+'resetpass-temp-password'   => 'Tymczasowe hasło:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tekst tłustą czcionką',
@@ -714,8 +723,8 @@ Być może zakoÅ„czyÅ‚eÅ› już proces zmiany hasÅ‚a lub poprosiÅ‚eÅ› o nowe hasÅ
 'hr_tip'          => 'Linia pozioma (nie nadużywaj)',
 
 # Edit pages
-'summary'                          => 'Opis zmian',
-'subject'                          => 'Temat/nagłówek',
+'summary'                          => 'Opis zmian ',
+'subject'                          => 'Temat/nagłówek:',
 'minoredit'                        => 'To jest drobna zmiana',
 'watchthis'                        => 'Obserwuj',
 'savearticle'                      => 'Zapisz',
@@ -730,8 +739,8 @@ Jeżeli nie chcesz go wprowadzać, naciśnij przycisk Zapisz jeszcze raz.",
 'missingcommenttext'               => 'Wprowadź komentarz poniżej.',
 'missingcommentheader'             => "'''Uwaga:''' Treść nagłówka jest pusta – uzupełnij go!
 Jeśli tego nie zrobisz, Twój komentarz zostanie zapisany bez nagłówka.",
-'summary-preview'                  => 'PodglÄ…d opisu',
-'subject-preview'                  => 'Podgląd nagłówka',
+'summary-preview'                  => 'PodglÄ…d opisu:',
+'subject-preview'                  => 'Podgląd nagłówka:',
 'blockedtitle'                     => 'Użytkownik jest zablokowany',
 'blockedtext'                      => "<big>'''Twoje konto lub adres IP zostały zablokowane.'''</big>
 
@@ -785,37 +794,39 @@ Jeśli utworzenie nowej strony nie było Twoim zamiarem, wciśnij ''Wstecz'' w s
 By go identyfikować, używamy adresów IP.
 Jednak adres IP może być współdzielony przez wielu użytkowników.
 Jeśli jesteś anonimowym użytkownikiem i uważasz, że zamieszczone tu komentarze nie są skierowane do Ciebie, [[Special:UserLogin/signup|utwórz konto]] lub [[Special:UserLogin|zaloguj się]] – dzięki temu unikniesz w przyszłości podobnych nieporozumień.''",
-'noarticletext'                    => 'Brak strony o tym tytule. Możesz [[Special:Search/{{PAGENAME}}|poszukać {{PAGENAME}} na innych stronach]] lub [{{fullurl:{{FULLPAGENAME}}|action=edit}} utworzyć stronę {{FULLPAGENAME}}].',
+'noarticletext'                    => 'Brak strony o tym tytule.
+Możesz [[Special:Search/{{PAGENAME}}|poszukać „{{PAGENAME}}� na innych stronach]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} przeszukać log] lub [{{fullurl:{{FULLPAGENAME}}|action=edit}} utworzyć tę stronę]</span>.',
 'userpage-userdoesnotexist'        => 'Użytkownik „$1� nie jest zarejestrowany. Upewnij się, czy na pewno zamierzałeś utworzyć/zmodyfikować właśnie tę stronę.',
 'clearyourcache'                   => "'''Uwaga:''' Zmiany po zapisaniu nowych ustawień mogą nie być widoczne. Należy wyczyścić zawartość pamięci podręcznej przeglądarki internetowej.
 *'''Mozilla, Firefox lub Safari –''' przytrzymaj wciśnięty ''Shift'' i kliknij na ''Odśwież'' lub wciśnij ''Ctrl-F5'' lub ''Ctrl-R'' (''Cmd-Shift-R'' na Macintoshu)
 *'''Konqueror –''' kliknij przycisk ''Odśwież'' lub wciśnij ''F5''
 *'''Opera –''' wyczyść pamięć podręczną w menu ''Narzędzia → Preferencje''
 *'''Internet Explorer –''' przytrzymaj ''Ctrl'' i kliknij na ''Odśwież'' lub wciśnij ''Ctrl-F5''",
-'usercssjsyoucanpreview'           => '<strong>Podpowiedź:</strong> Użyj przycisku „Podgląd�, aby przetestować nowy arkusz stylów CSS lub kod JavaScript przed jego zapisaniem.',
+'usercssjsyoucanpreview'           => "'''Podpowiedź:''' Użyj przycisku „Podgląd�, aby przetestować nowy arkusz stylów CSS lub kod JavaScript przed jego zapisaniem.",
 'usercsspreview'                   => "'''Pamiętaj, że to tylko podgląd arkusza stylów CSS – nic jeszcze nie zostało zapisane!'''",
 'userjspreview'                    => "'''Pamiętaj, że to tylko podgląd Twojego kodu JavaScript – nic jeszcze nie zostało zapisane!'''",
 'userinvalidcssjstitle'            => "'''Uwaga:''' Brak skórki o nazwie „$1�.
 Strony użytkownika zawierające CSS i JavaScript powinny zaczynać się małą literą, np. {{ns:user}}:Foo/monobook.css, w przeciwieństwie do nieprawidłowego {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Zmodyfikowano)',
-'note'                             => '<strong>Uwaga:</strong>',
-'previewnote'                      => '<strong>To jest tylko podgląd – zmiany nie zostały jeszcze zapisane!</strong>',
+'note'                             => "'''Uwaga:'''",
+'previewnote'                      => "'''To jest tylko podgląd – zmiany nie zostały jeszcze zapisane!'''",
 'previewconflict'                  => 'Podgląd odnosi się do tekstu z górnego pola edycji. Tak będzie wyglądać strona, jeśli zdecydujesz się ją zapisać.',
-'session_fail_preview'             => '<strong>Uwaga! Serwer nie może przetworzyć tej edycji z powodu utraty danych sesji.
+'session_fail_preview'             => "'''Uwaga! Serwer nie może przetworzyć tej edycji z powodu utraty danych sesji.
 Spróbuj jeszcze raz.
-Jeśli to nie pomoże – [[Special:UserLogout|wyloguj się]] i zaloguj ponownie.</strong>',
-'session_fail_preview_html'        => "<strong>Uwaga! Serwer nie może przetworzyć tej edycji z powodu utraty danych sesji.</strong>
+Jeśli to nie pomoże – [[Special:UserLogout|wyloguj się]] i zaloguj ponownie.'''",
+'session_fail_preview_html'        => "'''Uwaga! Serwer nie może przetworzyć tej edycji z powodu utraty danych sesji.'''
 
 ''Ponieważ w {{GRAMMAR:MS.lp|{{SITENAME}}}} włączona została opcja „surowy HTML�, podgląd został ukryty w celu zabezpieczenia przed atakami z użyciem JavaScriptu.''
 
-<strong>Jeśli jest to uprawniona próba dokonania edycji, spróbuj jeszcze raz.
-Jeśli to nie pomoże – [[Special:UserLogout|wyloguj się]] i zaloguj ponownie.</strong>",
-'token_suffix_mismatch'            => '<strong>Twoja edycja została odrzucona, ponieważ twój klient pomieszał znaki interpunkcyjne w żetonie edycyjnym.
+'''Jeśli jest to uprawniona próba dokonania edycji, spróbuj jeszcze raz.
+Jeśli to nie pomoże – [[Special:UserLogout|wyloguj się]] i zaloguj ponownie.'''",
+'token_suffix_mismatch'            => "'''Twoja edycja została odrzucona, ponieważ twój klient pomieszał znaki interpunkcyjne w żetonie edycyjnym.
 Twoja edycja została odrzucona by zapobiec zniszczeniu tekstu strony.
-Takie problemy zdarzają się w wypadku korzystania z wadliwych anonimowych sieciowych usług proxy.</strong>',
+Takie problemy zdarzają się w wypadku korzystania z wadliwych anonimowych sieciowych usług proxy.'''",
 'editing'                          => 'Edytujesz „$1�',
 'editingsection'                   => 'Edytujesz „$1� (fragment)',
-'editingcomment'                   => 'Edytujesz „$1� (komentarz)',
+'editingcomment'                   => 'Edytujesz „$1� (nowa sekcja)',
 'editconflict'                     => 'Konflikt edycji: $1',
 'explainconflict'                  => "Ktoś zmienił treść strony w trakcie Twojej edycji.
 Górne pole zawiera tekst strony aktualnie zapisany w bazie danych.
@@ -824,25 +835,27 @@ By wprowadzić swoje zmiany, musisz zmodyfikować tekst z górnego pola.
 '''Tylko''' tekst z górnego pola zostanie zapisany w bazie, gdy wciśniesz „Zapisz�.",
 'yourtext'                         => 'Twój tekst',
 'storedversion'                    => 'Zapisana wersja',
-'nonunicodebrowser'                => '<strong>Uwaga! Twoja przeglÄ…darka nie rozpoznaje poprawnie kodowania UTF-8 (Unicode).
-Z tego powodu wszystkie znaki, których przeglądarka nie rozpoznaje, zostały zastąpione ich kodami szesnastkowymi.</strong>',
-'editingold'                       => '<strong>Uwaga! Edytujesz inną niż bieżąca wersję tej strony.
-Jeśli zapiszesz ją, wszystkie zmiany wykonane w międzyczasie zostaną wycofane.</strong>',
+'nonunicodebrowser'                => "'''Uwaga! Twoja przeglÄ…darka nie rozpoznaje poprawnie kodowania UTF-8 (Unicode).
+Z tego powodu wszystkie znaki, których przeglądarka nie rozpoznaje, zostały zastąpione ich kodami szesnastkowymi.'''",
+'editingold'                       => "'''Uwaga! Edytujesz inną niż bieżąca wersję tej strony.
+Jeśli zapiszesz ją, wszystkie zmiany wykonane w międzyczasie zostaną wycofane.'''",
 'yourdiff'                         => 'Różnice',
 'copyrightwarning'                 => "Wkład do {{GRAMMAR:D.lp|{{SITENAME}}}} jest udostępniany na licencji $2 (szczegóły w $1). Jeśli nie chcesz, żeby Twój tekst był dowolnie zmieniany przez każdego i rozpowszechniany bez ograniczeń, nie umieszczaj go tutaj.<br />
 Zapisując swoją edycję, oświadczasz, że ten tekst jest Twoim dziełem lub pochodzi z materiałów dostępnych na zasadach ''public domain'' albo kompatybilnych.
-<strong>PROSZĘ NIE UŻYWAĆ MATERIA�ÓW CHRONIONYCH PRAWEM AUTORSKIM BEZ POZWOLENIA W�AŚCICIELA!</strong>",
+'''PROSZĘ NIE UŻYWAĆ MATERIA�ÓW CHRONIONYCH PRAWEM AUTORSKIM BEZ POZWOLENIA W�AŚCICIELA!'''",
 'copyrightwarning2'                => "Wszelki wkład w {{GRAMMAR:B.lp|{{SITENAME}}}} może być edytowany, zmieniany lub usunięty przez innych użytkowników.
 Jeśli nie chcesz, żeby Twój tekst był dowolnie zmieniany przez każdego i rozpowszechniany bez ograniczeń, nie umieszczaj go tutaj.<br />
 Zapisując swoją edycję, oświadczasz, że ten tekst jest Twoim dziełem lub pochodzi z materiałów dostępnych na zasadach ''public domain'' albo kompatybilnych (zobacz także $1).
-<strong>PROSZĘ NIE UŻYWAĆ MATERIA�ÓW CHRONIONYCH PRAWEM AUTORSKIM BEZ POZWOLENIA W�AŚCICIELA!</strong>",
-'longpagewarning'                  => '<strong>Ta strona ma {{PLURAL:$1|1 kilobajt|$1 kilobajty|$1 kilobajtów}}. Jeśli to możliwe, spróbuj podzielić tekst na mniejsze części.</strong>',
-'longpageerror'                    => '<strong>Błąd! Wprowadzony przez Ciebie tekst ma {{PLURAL:$1|1 kilobajt|$1 kilobajty|$1 kilobajtów}}. Długość tekstu nie może przekraczać {{PLURAL:$2|1 kilobajt|$2 kilobajty|$2 kilobajtów}}. Tekst nie może być zapisany.</strong>',
-'readonlywarning'                  => '<strong>Uwaga! Baza danych została zablokowana do celów administracyjnych. W tej chwili nie można zapisać nowej wersji strony. Zapisz jej treść do pliku, używając wytnij/wklej, i zachowaj na później.</strong>',
-'protectedpagewarning'             => '<strong>Uwaga! Modyfikacja tej strony została zablokowana. Mogą ją edytować jedynie użytkownicy z uprawnieniami administratora.</strong>',
+'''PROSZĘ NIE UŻYWAĆ MATERIA�ÓW CHRONIONYCH PRAWEM AUTORSKIM BEZ POZWOLENIA W�AŚCICIELA!'''",
+'longpagewarning'                  => "'''Ta strona ma {{PLURAL:$1|1 kilobajt|$1 kilobajty|$1 kilobajtów}}. Jeśli to możliwe, spróbuj podzielić tekst na mniejsze części.'''",
+'longpageerror'                    => "'''Błąd! Wprowadzony przez Ciebie tekst ma {{PLURAL:$1|1 kilobajt|$1 kilobajty|$1 kilobajtów}}. Długość tekstu nie może przekraczać {{PLURAL:$2|1 kilobajt|$2 kilobajty|$2 kilobajtów}}. Tekst nie może być zapisany.'''",
+'readonlywarning'                  => "'''Uwaga! Baza danych została zablokowana do celów administracyjnych. W tej chwili nie można zapisać nowej wersji strony. Zapisz jej treść do pliku, używając wytnij i wklej, aby zachować na później.'''
+
+Administrator, który zablokował bazę, podał następujące wyjaśnienie: $1",
+'protectedpagewarning'             => "'''Uwaga! Modyfikacja tej strony została zablokowana. Mogą ją edytować jedynie użytkownicy z uprawnieniami administratora.'''",
 'semiprotectedpagewarning'         => "'''Uwaga!''' Ta strona została zabezpieczona i tylko zarejestrowani użytkownicy mogą ją edytować.",
 'cascadeprotectedwarning'          => "'''Uwaga!''' Ta strona została zabezpieczona i tylko użytkownicy z uprawnieniami administratora mogą ją edytować. Strona ta jest zawarta na {{PLURAL:$1|następującej stronie, która została zabezpieczona|następujących stronach, które zostały zabezpieczone}} z włączoną opcją dziedziczenia:",
-'titleprotectedwarning'            => '<strong>Uwaga! Utworzenie strony o tej nazwie zostało zablokowane. Tylko niektórzy użytkownicy mogą ją utworzyć.</strong>',
+'titleprotectedwarning'            => "'''Uwaga! Utworzenie strony o tej nazwie zostało zablokowane. Do jej utworzenia wymagane są [[Special:ListGroupRights|specyficzne uprawnienia]].'''",
 'templatesused'                    => 'Szablony użyte w tym artykule:',
 'templatesusedpreview'             => 'Szablony użyte w tym podglądzie:',
 'templatesusedsection'             => 'Szablony użyte w tej sekcji:',
@@ -861,18 +874,30 @@ Możesz edytować istniejące strony bądź też [[Special:UserLogin|zalogować
 
 Upewnij siÄ™, czy ponowne utworzenie tej strony jest uzasadnione.
 Poniżej znajduje się rejestr usunięć tej strony:",
+'deleted-notice'                   => 'Ta strona została usunięta. Rejestr usunięć tej strony jest pokazany poniżej.',
+'deletelog-fulllog'                => 'Zobacz cały rejestr',
+'edit-hook-aborted'                => 'Edycja zatrzymana z powodu haka.
+Wystąpił z nieokreślonej przyczyny.',
+'edit-gone-missing'                => 'Nie udało się zaktualizować strony.
+Zdaje się, że została skasowana.',
+'edit-conflict'                    => 'Konflikt edycji.',
+'edit-no-change'                   => 'Twoja edycja została zignorowana, ponieważ nie zmieniono nic w tekście.',
+'edit-already-exists'              => 'Nie udało się stworzyć nowej strony.
+Strona już istnieje.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Uwaga! Ta strona zawiera zbyt wiele wywołań złożonych obliczeniowo funkcji parsera.
 
-Powinno ich być mniej niż $2, a jest obecnie $1.',
+Powinno być mniej niż $2 {{PLURAL:$2|wywołanie|wywołania|wywołań}}, a obecnie {{PLURAL:$1|jest $1 wywołanie|są $1 wywołania|jest $1 wywołań}}.',
 'expensive-parserfunction-category'       => 'Strony ze zbyt dużą liczbą wywołań trudnych funkcji parsera',
-'post-expand-template-inclusion-warning'  => 'Uwaga: Zbyt duża wielkość wykorzystanych szablonów.
+'post-expand-template-inclusion-warning'  => 'Uwaga – zbyt duża wielkość wykorzystanych szablonów.
 Niektóre szablony nie zostaną użyte.',
 'post-expand-template-inclusion-category' => 'Strony, w których przekroczone jest ograniczenie wielkości użytych szablonów',
-'post-expand-template-argument-warning'   => 'Uwaga: Strona zawiera co najmniej jeden argument szablonu, który po rozwinięciu jest zbyt duży.
+'post-expand-template-argument-warning'   => 'Uwaga – strona zawiera co najmniej jeden argument szablonu, który po rozwinięciu jest zbyt duży.
 Argument ten będzie pominięty.',
-'post-expand-template-argument-category'  => 'Strony, w których użyto szablonu z pominięciem argumentów',
+'post-expand-template-argument-category'  => 'Strony, w których użyto szablon z pominięciem argumentów',
+'parser-template-loop-warning'            => 'Wykryto szablon zapętlenia: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Przekroczno limit głębokości rekurencji szablonu ($1)',
 
 # "Undo" feature
 'undo-success' => 'Edycja może zostać wycofana. Porównaj ukazane poniżej różnice między wersjami, a następnie zapisz zmiany.',
@@ -887,29 +912,29 @@ Argument ten będzie pominięty.',
 Podany przez $3 powód to ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Zobacz rejestry operacji dla tej strony',
-'nohistory'           => 'Ta strona nie ma swojej historii edycji.',
-'revnotfound'         => 'Wersja nie została odnaleziona',
-'revnotfoundtext'     => 'Żądana, starsza wersja strony nie została odnaleziona. Sprawdź użyty adres URL.',
-'currentrev'          => 'Aktualna wersja',
-'revisionasof'        => 'Wersja z $1',
-'revision-info'       => 'Wersja $2 z dnia $1',
-'previousrevision'    => '� poprzednia wersja',
-'nextrevision'        => 'następna wersja →',
-'currentrevisionlink' => 'przejdź do aktualnej wersji',
-'cur'                 => 'bież.',
-'next'                => 'następna',
-'last'                => 'poprz.',
-'page_first'          => 'poczÄ…tek',
-'page_last'           => 'koniec',
-'histlegend'          => "Wybór porównania: zaznacz kropeczkami dwie wersje do porównania i wciśnij enter lub przycisk ''Porównaj wybrane wersje''.<br />
+'viewpagelogs'           => 'Zobacz rejestry operacji dla tej strony',
+'nohistory'              => 'Ta strona nie ma swojej historii edycji.',
+'currentrev'             => 'Aktualna wersja',
+'currentrev-asof'        => 'Aktualna wersja na dzień $1',
+'revisionasof'           => 'Wersja z $1',
+'revision-info'          => 'Wersja $2 z dnia $1', # Additionally available: $3: revision id
+'previousrevision'       => '� poprzednia wersja',
+'nextrevision'           => 'następna wersja →',
+'currentrevisionlink'    => 'przejdź do aktualnej wersji',
+'cur'                    => 'bież.',
+'next'                   => 'następna',
+'last'                   => 'poprz.',
+'page_first'             => 'poczÄ…tek',
+'page_last'              => 'koniec',
+'histlegend'             => "Wybór porównania: zaznacz kropeczkami dwie wersje do porównania i wciśnij enter lub przycisk ''Porównaj wybrane wersje''.<br />
 Legenda: (bież.) – pokaż zmiany od tej wersji do bieżącej,
 (poprz.) – pokaż zmiany od wersji poprzedzającej, m – mała (drobna) zmiana",
-'deletedrev'          => '[usunięto]',
-'histfirst'           => 'od poczÄ…tku',
-'histlast'            => 'od końca',
-'historysize'         => '({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtów}})',
-'historyempty'        => '(pusta)',
+'history-fieldset-title' => 'PrzeglÄ…daj historiÄ™',
+'deletedrev'             => '[usunięto]',
+'histfirst'              => 'od poczÄ…tku',
+'histlast'               => 'od końca',
+'historysize'            => '({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtów}})',
+'historyempty'           => '(pusta)',
 
 # Revision feed
 'history-feed-title'          => 'Historia wersji',
@@ -932,7 +957,7 @@ Jednak jako administrator {{GRAMMAR:D.lp|{{SITENAME}}}} możesz ją obejrzeć.
 Powody usunięcia mogą znajdować się w [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} rejestrze usunięć].</div>',
 'rev-delundel'                => 'pokaż/ukryj',
 'revisiondelete'              => 'Usuń/przywróć wersje',
-'revdelete-nooldid-title'     => 'Nie wybrano wersji',
+'revdelete-nooldid-title'     => 'Nieprawidłowa wersja do przeprowadzenia operacji',
 'revdelete-nooldid-text'      => 'Nie wybrano wersji, na których ma zostać wykonana ta operacja,
 wybrana wersja nie istnieje lub próbowano ukryć wersję bieżącą.',
 'revdelete-selected'          => "'''{{PLURAL:$2|Zaznaczona wersja|Zaznaczone wersje}} strony [[:$1]]:'''",
@@ -949,18 +974,18 @@ Inni administratorzy {{GRAMMAR:D.lp|{{SITENAME}}}} nadal będą mieć dostęp do
 'revdelete-suppress'          => 'Utajnij informacje przed administratorami, tak samo jak przed innymi',
 'revdelete-hide-image'        => 'Ukryj zawartość pliku',
 'revdelete-unsuppress'        => 'Wyłącz utajnianie dla odtwarzanej historii zmian',
-'revdelete-log'               => 'Komentarz:',
+'revdelete-log'               => 'Komentarz',
 'revdelete-submit'            => 'Zaakceptuj dla wybranych wersji',
 'revdelete-logentry'          => 'zmienił widoczność wersji w [[$1]]',
 'logdelete-logentry'          => 'zmienił widoczność zdarzenia dla [[$1]]',
-'revdelete-success'           => "'''Pomyślnie zmieniono widoczność wersji.'''",
-'logdelete-success'           => "'''Pomyślnie zmieniono widoczność zdarzeń.'''",
+'revdelete-success'           => "'''Zmieniono widoczność wersji.'''",
+'logdelete-success'           => "'''Zmieniono widoczność zdarzeń.'''",
 'revdel-restore'              => 'Zmień widoczność',
 'pagehist'                    => 'Historia edycji strony',
 'deletedhist'                 => 'Usunięta historia edycji',
 'revdelete-content'           => 'zawartość',
 'revdelete-summary'           => 'opis zmian',
-'revdelete-uname'             => 'nazwa użytkownika',
+'revdelete-uname'             => 'nazwę użytkownika',
 'revdelete-restricted'        => 'ustaw ograniczenia dla administratorów',
 'revdelete-unrestricted'      => 'usuń ograniczenia dla administratorów',
 'revdelete-hid'               => 'ukryj $1',
@@ -987,7 +1012,7 @@ Użycie linków nawigacyjnych kasuje wybór w kolumnie.',
 'mergehistory-go'                  => 'Pokaż możliwe do scalenia zmiany',
 'mergehistory-submit'              => 'Scal historiÄ™ zmian',
 'mergehistory-empty'               => 'Brak historii zmian do scalenia.',
-'mergehistory-success'             => '$3 {{PLURAL:$3|zmiana|zmiany|zmian}} w [[:$1]] z powodzeniem zostało scalonych z [[:$2]].',
+'mergehistory-success'             => '$3 {{PLURAL:$3|zmiana|zmiany|zmian}} w [[:$1]] zostało scalonych z [[:$2]].',
 'mergehistory-fail'                => 'Scalenie historii zmian jest niewykonalne. Zmień ustawienia parametrów.',
 'mergehistory-no-source'           => 'Strona źródłowa $1 nie istnieje.',
 'mergehistory-no-destination'      => 'Strona docelowa $1 nie istnieje.',
@@ -995,6 +1020,7 @@ Użycie linków nawigacyjnych kasuje wybór w kolumnie.',
 'mergehistory-invalid-destination' => 'Strona docelowa musi mieć poprawną nazwę.',
 'mergehistory-autocomment'         => 'Historia [[:$1]] scalona z [[:$2]]',
 'mergehistory-comment'             => 'Historia [[:$1]] scalona z [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Strona źródłowa i docelowa nie mogą być takie same',
 
 # Merge log
 'mergelog'           => 'Scalone',
@@ -1007,129 +1033,209 @@ Użycie linków nawigacyjnych kasuje wybór w kolumnie.',
 'difference'              => '(Różnice między wersjami)',
 'lineno'                  => 'Linia $1:',
 'compareselectedversions' => 'porównaj wybrane wersje',
-'editundo'                => 'anuluj zmiany',
+'visualcomparison'        => 'Porównanie treści',
+'wikicodecomparison'      => 'Porównanie wikitekstu',
+'editundo'                => 'anuluj edycjÄ™',
 'diff-multi'              => '(Nie pokazano $1 {{PLURAL:$1|wersji|wersji}} pomiędzy niniejszymi.)',
+'diff-movedto'            => 'przeniesiono do $1',
+'diff-styleadded'         => 'dodano styl: $1',
+'diff-added'              => 'dodano $1',
+'diff-changedto'          => 'zmieniono na $1',
+'diff-movedoutof'         => 'przeniesione z $1',
+'diff-styleremoved'       => 'usunięto styl: $1',
+'diff-removed'            => 'usunięto $1',
+'diff-changedfrom'        => 'zmieniono z $1',
+'diff-src'                => 'źródło',
+'diff-withdestination'    => 'z przeznaczeniem $1',
+'diff-with'               => '&#32;z $1 $2',
+'diff-with-final'         => '&#32;oraz $1 $2',
+'diff-width'              => 'szerokość',
+'diff-height'             => 'wysokość',
+'diff-p'                  => "'''paragraf'''",
+'diff-blockquote'         => "'''cytat'''",
+'diff-h1'                 => "'''nagłówek (poziom 1)'''",
+'diff-h2'                 => "'''nagłówek (poziom 2)'''",
+'diff-h3'                 => "'''nagłówek (poziom 3)'''",
+'diff-h4'                 => "'''nagłówek (poziom 4)'''",
+'diff-h5'                 => "'''nagłówek (poziom 5)'''",
+'diff-pre'                => "'''tekst preformatowany'''",
+'diff-div'                => "'''element „div�'''",
+'diff-ul'                 => "'''lista nieuporzÄ…dkowana'''",
+'diff-ol'                 => "'''lista uporzÄ…dkowana'''",
+'diff-li'                 => "'''element listy'''",
+'diff-table'              => "'''tabela'''",
+'diff-tbody'              => "'''zawartość tabeli'''",
+'diff-tr'                 => "'''wiersz'''",
+'diff-td'                 => "'''komórka'''",
+'diff-th'                 => "'''nagłówek'''",
+'diff-br'                 => "'''złamanie wiersza'''",
+'diff-hr'                 => "'''linia pozioma'''",
+'diff-code'               => "'''blok kodu'''",
+'diff-dl'                 => "'''lista definicji'''",
+'diff-dt'                 => "'''termin w definicji'''",
+'diff-dd'                 => "'''definicja'''",
+'diff-input'              => "'''pole formularza'''",
+'diff-form'               => "'''formularz'''",
+'diff-img'                => "'''grafika'''",
+'diff-span'               => "'''element „span�'''",
+'diff-a'                  => "'''link'''",
+'diff-i'                  => "'''kursywa'''",
+'diff-b'                  => "'''pogrubienie'''",
+'diff-strong'             => "'''silne wyróżnienie'''",
+'diff-em'                 => "'''wyróżnienie (emfaza)'''",
+'diff-font'               => "'''czcionka'''",
+'diff-big'                => "'''pogrubienie'''",
+'diff-del'                => "'''usunięcie tekstu'''",
+'diff-tt'                 => "'''czcionka maszynowa'''",
+'diff-sub'                => "'''indeks dolny'''",
+'diff-sup'                => "'''indeks górny'''",
+'diff-strike'             => "'''przekreślenie'''",
 
 # Search results
-'searchresults'             => 'Wyniki wyszukiwania',
-'searchresulttext'          => 'Więcej informacji o przeszukiwaniu {{GRAMMAR:D.lp|{{SITENAME}}}} odnajdziesz na [[{{MediaWiki:Helppage}}|stronach pomocy]].',
-'searchsubtitle'            => "Wyniki dla zapytania '''[[:$1]]''' ([[Special:Prefixindex/$1|strony zaczynające się od „$1�]] |
-[[Special:WhatLinksHere/$1|strony, które linkują do „$1�]])",
-'searchsubtitleinvalid'     => "Dla zapytania '''$1'''",
-'noexactmatch'              => "'''Brak strony zatytułowanej „$1�.'''
+'searchresults'                    => 'Wyniki wyszukiwania',
+'searchresults-title'              => 'Wyniki wyszukiwania dla „$1�',
+'searchresulttext'                 => 'Więcej informacji o przeszukiwaniu {{GRAMMAR:D.lp|{{SITENAME}}}} odnajdziesz na [[{{MediaWiki:Helppage}}|stronach pomocy]].',
+'searchsubtitle'                   => "Wyniki dla zapytania '''[[:$1]]''' ([[Special:Prefixindex/$1|strony zaczynające się od „$1�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|strony, które linkują do „$1�]])",
+'searchsubtitleinvalid'            => "Dla zapytania '''$1'''",
+'noexactmatch'                     => "'''Brak strony zatytułowanej „$1�.'''
 Możesz [[:$1|utworzyć tę stronę]].",
-'noexactmatch-nocreate'     => "'''Brak strony „$1�.'''",
-'toomanymatches'            => 'Zbyt wiele elementów pasujących do wzorca, spróbuj innego zapytania',
-'titlematches'              => 'Znaleziono w tytułach',
-'notitlematches'            => 'Nie znaleziono w tytułach',
-'textmatches'               => 'Znaleziono w treści stron',
-'notextmatches'             => 'Nie znaleziono w treści stron',
-'prevn'                     => '{{PLURAL:$1|poprzedni|poprzednie $1}}',
-'nextn'                     => '{{PLURAL:$1|następny|następne $1}}',
-'viewprevnext'              => 'Zobacz ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 słowo|$2 słowa|$2 słów}})',
-'search-result-score'       => 'Trafność: $1%',
-'search-redirect'           => '(przekierowanie $1)',
-'search-section'            => '(sekcja $1)',
-'search-suggest'            => 'Czy chodziło Ci o: $1',
-'search-interwiki-caption'  => 'Projekty siostrzane',
-'search-interwiki-default'  => 'Wyniki dla $1:',
-'search-interwiki-more'     => '(więcej)',
-'search-mwsuggest-enabled'  => 'z dynamicznymi propozycjami',
-'search-mwsuggest-disabled' => 'bez dynamicznych propozycji',
-'search-relatedarticle'     => 'Pokrewne',
-'mwsuggest-disable'         => 'Wyłącz dynamiczne podpowiedzi',
-'searchrelated'             => 'pokrewne',
-'searchall'                 => 'wszystkie',
-'showingresults'            => "Poniżej znajduje się lista z {{PLURAL:$1|'''1''' wynikiem|'''$1''' wynikami}}, rozpoczynając od wyniku numer '''$2'''.",
-'showingresultsnum'         => "Poniżej znajduje się lista z {{PLURAL:$3|'''1''' wynikiem|'''$3''' wynikami}}, rozpoczynając od wyniku numer '''$2'''.",
-'showingresultstotal'       => "Poniżej {{PLURAL:$3|znajduje się wynik wyszukania '''$1'''|znajdują się wyniki wyszukiwania '''$1 – $2''', z ogólnej liczby '''$3'''}}",
-'nonefound'                 => "'''Uwaga''': Domyślnie przeszukiwane są wyłącznie niektóre przestrzenie nazw. Spróbuj poprzedzić wyszukiwaną frazę przedrostkiem ''all:'', co spowoduje przeszukanie całej zawartości {{GRAMMAR:D.lp|{{SITENAME}}}} (włącznie ze stronami dyskusji, szablonami itp) lub spróbuj użyć jako przedrostka wybranej, jednej przestrzeni nazw.",
-'powersearch'               => 'Szukaj',
-'powersearch-legend'        => 'Wyszukiwanie zaawansowane',
-'powersearch-ns'            => 'Przeszukaj przestrzenie nazw:',
-'powersearch-redir'         => 'Pokaż przekierowania',
-'powersearch-field'         => 'Szukaj',
-'search-external'           => 'Wyszukiwanie zewnętrzne',
-'searchdisabled'            => 'Wyszukiwanie w {{GRAMMAR:MS.lp|{{SITENAME}}}} zostało wyłączone.
+'noexactmatch-nocreate'            => "'''Brak strony „$1�.'''",
+'toomanymatches'                   => 'Zbyt wiele elementów pasujących do wzorca, spróbuj innego zapytania',
+'titlematches'                     => 'Znaleziono w tytułach',
+'notitlematches'                   => 'Nie znaleziono w tytułach',
+'textmatches'                      => 'Znaleziono w treści stron',
+'notextmatches'                    => 'Nie znaleziono w treści stron',
+'prevn'                            => '{{PLURAL:$1|poprzedni|poprzednie $1}}',
+'nextn'                            => '{{PLURAL:$1|następny|następne $1}}',
+'viewprevnext'                     => 'Zobacz ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Opcje wyszukiwania',
+'searchmenu-exists'                => "* Strona '''[[$1]]'''",
+'searchmenu-new'                   => "'''Utwórz stronę „[[:$1|$1]]� na tej wiki.'''",
+'searchhelp-url'                   => 'Help:Spis treści',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|PrzeglÄ…daj strony zaczynajÄ…ce siÄ™ od tego przedrostka]]',
+'searchprofile-articles'           => 'Strony',
+'searchprofile-articles-and-proj'  => 'Wszystkie strony projektu',
+'searchprofile-project'            => 'Strony spoza głównej przestrzeni nazw',
+'searchprofile-images'             => 'Pliki',
+'searchprofile-everything'         => 'Wszystko',
+'searchprofile-advanced'           => 'Zaawansowane',
+'searchprofile-articles-tooltip'   => 'Szukanie w przestrzeni nazw $1',
+'searchprofile-project-tooltip'    => 'Szukanie w przestrzeniach nazw $1',
+'searchprofile-images-tooltip'     => 'Szukanie plików',
+'searchprofile-everything-tooltip' => 'Szukanie w całej zawartości (także strony dyskusji)',
+'searchprofile-advanced-tooltip'   => 'Szukanie w wybranych przestrzeniach nazw',
+'prefs-search-nsdefault'           => 'Domyślnie przeszukuj w przestrzeniach nazw:',
+'prefs-search-nscustom'            => 'Przeszukuj w wybranych przestrzeniach nazw:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 słowo|$2 słowa|$2 słów}})',
+'search-result-score'              => 'Trafność: $1%',
+'search-redirect'                  => '(przekierowanie $1)',
+'search-section'                   => '(sekcja $1)',
+'search-suggest'                   => 'Czy chodziło Ci o: $1',
+'search-interwiki-caption'         => 'Projekty siostrzane',
+'search-interwiki-default'         => 'Wyniki dla $1:',
+'search-interwiki-more'            => '(więcej)',
+'search-mwsuggest-enabled'         => 'z dynamicznymi propozycjami',
+'search-mwsuggest-disabled'        => 'bez dynamicznych propozycji',
+'search-relatedarticle'            => 'Pokrewne',
+'mwsuggest-disable'                => 'Wyłącz dynamiczne podpowiedzi',
+'searchrelated'                    => 'pokrewne',
+'searchall'                        => 'wszystkie',
+'showingresults'                   => "Poniżej znajduje się lista z {{PLURAL:$1|'''1''' wynikiem|'''$1''' wynikami}}, rozpoczynając od wyniku numer '''$2'''.",
+'showingresultsnum'                => "Poniżej znajduje się lista z {{PLURAL:$3|'''1''' wynikiem|'''$3''' wynikami}}, rozpoczynając od wyniku numer '''$2'''.",
+'showingresultstotal'              => "Poniżej {{PLURAL:$4|znajduje się wynik wyszukania numer '''$1''' z '''$3'''|znajdują się wyniki wyszukiwania '''$1 – $2''', z ogólnej liczby '''$3'''}}",
+'nonefound'                        => "'''Uwaga''': Domyślnie przeszukiwane są wyłącznie niektóre przestrzenie nazw. Spróbuj poprzedzić wyszukiwaną frazę przedrostkiem ''all:'', co spowoduje przeszukanie całej zawartości {{GRAMMAR:D.lp|{{SITENAME}}}} (włącznie ze stronami dyskusji, szablonami itp) lub spróbuj użyć jako przedrostka wybranej, jednej przestrzeni nazw.",
+'search-nonefound'                 => 'Brak wyników spełniających kryteria podane w zapytaniu.',
+'powersearch'                      => 'Szukaj',
+'powersearch-legend'               => 'Wyszukiwanie zaawansowane',
+'powersearch-ns'                   => 'Przeszukaj przestrzenie nazw:',
+'powersearch-redir'                => 'Pokaż przekierowania',
+'powersearch-field'                => 'Szukaj',
+'search-external'                  => 'Wyszukiwanie zewnętrzne',
+'searchdisabled'                   => 'Wyszukiwanie w {{GRAMMAR:MS.lp|{{SITENAME}}}} zostało wyłączone.
 W międzyczasie możesz skorzystać z wyszukiwania Google.
 Jednak informacje o treści {{GRAMMAR:D.lp|{{SITENAME}}}} mogą być w Google nieaktualne.',
 
 # Preferences page
-'preferences'              => 'Preferencje',
-'mypreferences'            => 'preferencje',
-'prefs-edits'              => 'Liczba edycji',
-'prefsnologin'             => 'Nie jesteÅ› zalogowany',
-'prefsnologintext'         => 'Musisz się <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} zalogować]</span> przed zmianą swoich preferencji.',
-'prefsreset'               => 'Preferencje domyślne zostały odtworzone.',
-'qbsettings'               => 'Pasek szybkiego dostępu',
-'qbsettings-none'          => 'Brak',
-'qbsettings-fixedleft'     => 'Stały, z lewej',
-'qbsettings-fixedright'    => 'Stały, z prawej',
-'qbsettings-floatingleft'  => 'UnoszÄ…cy siÄ™, z lewej',
-'qbsettings-floatingright' => 'UnoszÄ…cy siÄ™, z prawej',
-'changepassword'           => 'Zmiana hasła',
-'skin'                     => 'Skórka',
-'math'                     => 'Wzory',
-'dateformat'               => 'Format daty',
-'datedefault'              => 'Domyślny',
-'datetime'                 => 'Data i czas',
-'math_failure'             => 'Parser nie mógł rozpoznać',
-'math_unknown_error'       => 'nieznany błąd',
-'math_unknown_function'    => 'nieznana funkcja',
-'math_lexing_error'        => 'błędna nazwa',
-'math_syntax_error'        => 'błąd składni',
-'math_image_error'         => 'Konwersja do formatu PNG nie powiodła się.
+'preferences'               => 'Preferencje',
+'mypreferences'             => 'Preferencje',
+'prefs-edits'               => 'Liczba edycji',
+'prefsnologin'              => 'Nie jesteÅ› zalogowany',
+'prefsnologintext'          => 'Musisz się <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} zalogować]</span> przed zmianą swoich preferencji.',
+'prefsreset'                => 'Preferencje domyślne zostały odtworzone.',
+'qbsettings'                => 'Pasek szybkiego dostępu',
+'qbsettings-none'           => 'Brak',
+'qbsettings-fixedleft'      => 'Stały, z lewej',
+'qbsettings-fixedright'     => 'Stały, z prawej',
+'qbsettings-floatingleft'   => 'UnoszÄ…cy siÄ™, z lewej',
+'qbsettings-floatingright'  => 'UnoszÄ…cy siÄ™, z prawej',
+'changepassword'            => 'Zmiana hasła',
+'skin'                      => 'Skórka',
+'skin-preview'              => 'podglÄ…d',
+'math'                      => 'Wzory',
+'dateformat'                => 'Format daty',
+'datedefault'               => 'Domyślny',
+'datetime'                  => 'Data i czas',
+'math_failure'              => 'Parser nie mógł rozpoznać',
+'math_unknown_error'        => 'nieznany błąd',
+'math_unknown_function'     => 'nieznana funkcja',
+'math_lexing_error'         => 'błędna nazwa',
+'math_syntax_error'         => 'błąd składni',
+'math_image_error'          => 'Konwersja do formatu PNG nie powiodła się.
 Sprawdź, czy poprawnie zainstalowane są latex, dvips, gs i convert.',
-'math_bad_tmpdir'          => 'Nie można utworzyć lub zapisywać w tymczasowym katalogu dla wzorów matematycznych',
-'math_bad_output'          => 'Nie można utworzyć lub zapisywać w wyjściowym katalogu dla wzorów matematycznych',
-'math_notexvc'             => 'Brak programu texvc.
+'math_bad_tmpdir'           => 'Nie można utworzyć lub zapisywać w tymczasowym katalogu dla wzorów matematycznych',
+'math_bad_output'           => 'Nie można utworzyć lub zapisywać w wyjściowym katalogu dla wzorów matematycznych',
+'math_notexvc'              => 'Brak programu texvc.
 Zapoznaj siÄ™ z math/README w celu konfiguracji.',
-'prefs-personal'           => 'Dane użytkownika',
-'prefs-rc'                 => 'Ostatnie zmiany',
-'prefs-watchlist'          => 'Obserwowane',
-'prefs-watchlist-days'     => 'Liczba dni widocznych na liście obserwowanych',
-'prefs-watchlist-edits'    => 'Liczba edycji pokazywanych w rozszerzonej liście obserwowanych',
-'prefs-misc'               => 'Ustawienia różne',
-'saveprefs'                => 'Zapisz',
-'resetprefs'               => 'Cofnij niezapisane zmiany',
-'oldpassword'              => 'Stare hasło',
-'newpassword'              => 'Nowe hasło',
-'retypenew'                => 'Powtórz nowe hasło',
-'textboxsize'              => 'Edytowanie',
-'rows'                     => 'Wiersze',
-'columns'                  => 'Kolumny',
-'searchresultshead'        => 'Wyszukiwanie',
-'resultsperpage'           => 'Liczba wyników na stronie',
-'contextlines'             => 'Pierwsze wiersze stron',
-'contextchars'             => 'Litery kontekstu w linijce',
-'stub-threshold'           => 'Maksymalny (w bajtach) rozmiar strony oznaczanej jako <a href="#" class="stub">zalążek (stub)</a>',
-'recentchangesdays'        => 'Liczba dni do pokazania w ostatnich zmianach',
-'recentchangescount'       => 'Liczba pozycji na liście ostatnich zmian, w historii stron i na stronach rejestrów:',
-'savedprefs'               => 'Twoje preferencje zostały zapisane.',
-'timezonelegend'           => 'Strefa czasowa',
-'timezonetext'             => '¹Liczba godzin różnicy między Twoim czasem lokalnym, a czasem uniwersalnym (UTC).',
-'localtime'                => 'Twój czas lokalny',
-'timezoneoffset'           => 'Różnica¹',
-'servertime'               => 'Aktualny czas serwera',
-'guesstimezone'            => 'Pobierz z przeglÄ…darki',
-'allowemail'               => 'Zgadzam się, by inni użytkownicy mogli przesyłać mi e-maile',
-'prefs-searchoptions'      => 'Opcje wyszukiwania',
-'prefs-namespaces'         => 'Przestrzenie nazw',
-'defaultns'                => 'Domyślnie przeszukuj przestrzenie nazw',
-'default'                  => 'domyślnie',
-'files'                    => 'Pliki',
+'prefs-personal'            => 'Dane użytkownika',
+'prefs-rc'                  => 'Ostatnie zmiany',
+'prefs-watchlist'           => 'Obserwowane',
+'prefs-watchlist-days'      => 'Liczba dni widocznych na liście obserwowanych',
+'prefs-watchlist-days-max'  => '(maksimum 7 dni)',
+'prefs-watchlist-edits'     => 'Liczba edycji pokazywanych w rozszerzonej liście obserwowanych',
+'prefs-watchlist-edits-max' => '(maksymalna liczba: 1000)',
+'prefs-misc'                => 'Ustawienia różne',
+'prefs-resetpass'           => 'Zmień hasło',
+'saveprefs'                 => 'Zapisz',
+'resetprefs'                => 'Cofnij niezapisane zmiany',
+'textboxsize'               => 'Edytowanie',
+'prefs-edit-boxsize'        => 'Rozmiar okna edycji.',
+'rows'                      => 'Wiersze',
+'columns'                   => 'Kolumny',
+'searchresultshead'         => 'Wyszukiwanie',
+'resultsperpage'            => 'Liczba wyników na stronie',
+'contextlines'              => 'Pierwsze wiersze stron',
+'contextchars'              => 'Litery kontekstu w linijce',
+'stub-threshold'            => 'Maksymalny (w bajtach) rozmiar strony oznaczanej jako <a href="#" class="stub">zalążek (stub)</a>',
+'recentchangesdays'         => 'Liczba dni do pokazania w ostatnich zmianach',
+'recentchangesdays-max'     => '(maksymalnie $1 {{PLURAL:$1|dzień|dni}})',
+'recentchangescount'        => 'Domyślna liczba pozycji do wyświetlenia na liście ostatnich zmian, w historii stron i na stronach rejestrów',
+'savedprefs'                => 'Twoje preferencje zostały zapisane.',
+'timezonelegend'            => 'Strefa czasowa',
+'timezonetext'              => '¹Liczba godzin różnicy między Twoim czasem lokalnym, a czasem uniwersalnym (UTC).',
+'localtime'                 => 'Czas lokalny',
+'timezoneselect'            => 'Strefa czasowa',
+'timezoneuseserverdefault'  => 'Użyj domyślnego czasu serwera',
+'timezoneuseoffset'         => 'Inna (określ różnicę czasu)',
+'timezoneoffset'            => 'Różnica¹',
+'servertime'                => 'Czas serwera',
+'guesstimezone'             => 'Pobierz z przeglÄ…darki',
+'allowemail'                => 'Zgadzam się, by inni użytkownicy mogli przesyłać mi e-maile',
+'prefs-searchoptions'       => 'Opcje wyszukiwania',
+'prefs-namespaces'          => 'Przestrzenie nazw',
+'defaultns'                 => 'Domyślnie przeszukuj przestrzenie nazw',
+'default'                   => 'domyślnie',
+'files'                     => 'Pliki',
 
 # User rights
 'userrights'                  => 'Zarządzaj uprawnieniami użytkowników', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Zarządzaj grupami użytkownika',
 'userrights-user-editname'    => 'Wprowadź nazwę użytkownika',
 'editusergroup'               => 'Edytuj grupy użytkownika',
-'editinguser'                 => "Zmiana uprawnień użytkownika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Zmiana uprawnień użytkownika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Edytuj grupy użytkownika',
 'saveusergroups'              => 'Zapisz',
 'userrights-groupsmember'     => 'Należy do:',
-'userrights-groups-help'      => 'Możesz zmienić przynależność tego użytkownika do podanych grup:
+'userrights-groups-help'      => 'Możesz zmienić przynależność tego użytkownika do podanych grup.
 * Zaznaczone pole oznacza przynależność użytkownika do danej grupy.
 * Niezaznaczone pole oznacza, że użytkownik nie należy do danej grupy.
 * Gwiazdka * informuje, że nie możesz usunąć z grupy po dodaniu do niej lub dodać po usunięciu z grupy.',
@@ -1159,7 +1265,7 @@ Zapoznaj siÄ™ z math/README w celu konfiguracji.',
 'group-suppress-member'      => 'rewizor',
 
 'grouppage-user'          => '{{ns:project}}:Użytkownicy',
-'grouppage-autoconfirmed' => '{{ns:project}}:Automatycznie zatwierdzeni użytkownicy',
+'grouppage-autoconfirmed' => '{{ns:project}}:Automatycznie zatwierdzani użytkownicy',
 'grouppage-bot'           => '{{ns:project}}:Boty',
 'grouppage-sysop'         => '{{ns:project}}:Administratorzy',
 'grouppage-bureaucrat'    => '{{ns:project}}:Biurokraci',
@@ -1174,6 +1280,8 @@ Zapoznaj siÄ™ z math/README w celu konfiguracji.',
 'right-minoredit'            => 'Oznaczanie edycji jako drobnych',
 'right-move'                 => 'Przenoszenie stron',
 'right-move-subpages'        => 'Przenoszenie stron razem z ich podstronami',
+'right-move-rootuserpages'   => 'Przenoszenie stron użytkowników',
+'right-movefile'             => 'Przenoszenie plików',
 'right-suppressredirect'     => 'Przenoszenie stron bez tworzenia przekierowania w miejscu starej nazwy',
 'right-upload'               => 'Przesyłanie plików na serwer',
 'right-reupload'             => 'Nadpisywanie istniejÄ…cego pliku',
@@ -1182,10 +1290,10 @@ Zapoznaj siÄ™ z math/README w celu konfiguracji.',
 'right-upload_by_url'        => 'Przesyłanie plików z adresu URL',
 'right-purge'                => 'Czyszczenie pamięci podręcznej stron bez pytania o potwierdzenie',
 'right-autoconfirmed'        => 'Edycja stron częściowo zabezpieczonych',
-'right-bot'                  => 'Oznaczanie edycji jako automatycznie',
+'right-bot'                  => 'Oznaczanie edycji jako wykonanych automatycznie',
 'right-nominornewtalk'       => 'Drobne zmiany na stronach dyskusji użytkowników nie włączają powiadomienia o nowej wiadomości',
 'right-apihighlimits'        => 'Zwiększony limit w zapytaniach, wykonywanych poprzez interfejs API',
-'right-writeapi'             => 'Zapisu poprzez interfejs API',
+'right-writeapi'             => 'Zapis poprzez interfejs API',
 'right-delete'               => 'Usuwanie stron',
 'right-bigdelete'            => 'Usuwanie stron z długą historią edycji',
 'right-deleterevision'       => 'Usuwanie i odtwarzanie określonej wersji strony',
@@ -1208,7 +1316,7 @@ Zapoznaj siÄ™ z math/README w celu konfiguracji.',
 'right-noratelimit'          => 'Brak ograniczeń przepustowości',
 'right-import'               => 'Import stron z innych wiki',
 'right-importupload'         => 'Import stron poprzez przesłanie pliku',
-'right-patrol'               => 'Oznaczanie edycji jako „sprawdzone�',
+'right-patrol'               => 'Oznaczanie edycji jako „sprawdzonych�',
 'right-autopatrol'           => 'Własne edycje automatycznie oznaczane jako „sprawdzone�',
 'right-patrolmarks'          => 'Podgląd znaczników patrolowania ostatnich zmian – oznaczania jako „sprawdzone�',
 'right-unwatchedpages'       => 'PodglÄ…d listy stron nieobserwowanych',
@@ -1224,9 +1332,46 @@ Zapoznaj siÄ™ z math/README w celu konfiguracji.',
 'rightslogentry' => 'zmienił przynależność $1 do grup ($2 → $3)',
 'rightsnone'     => 'brak',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'przeglÄ…dania tej strony',
+'action-edit'                 => 'edytowania tej strony',
+'action-createpage'           => 'tworzenia stron',
+'action-createtalk'           => 'tworzenia stron dyskusji',
+'action-createaccount'        => 'utworzenia tego konta użytkownika',
+'action-minoredit'            => 'do oznaczenia tej edycji jako drobna zmiana',
+'action-move'                 => 'przeniesienia tej strony',
+'action-move-subpages'        => 'przeniesienia tej strony oraz jej podstron',
+'action-move-rootuserpages'   => 'przenoszenia stron użytkowników (za wyjątkiem podstron)',
+'action-movefile'             => 'przeniesienia tego pliku',
+'action-upload'               => 'przesłania tego pliku',
+'action-reupload'             => 'nadpisania tego pliku',
+'action-reupload-shared'      => 'nadpisania tego pliku we wspólnym repozytorium',
+'action-upload_by_url'        => 'przesłania tego pliku z adresu URL',
+'action-writeapi'             => 'zapisu poprzez interfejs API',
+'action-delete'               => 'usunięcia tej strony',
+'action-deleterevision'       => 'usunięcia tej wersji',
+'action-deletedhistory'       => 'podglądu historii usunięć tej strony',
+'action-browsearchive'        => 'przeszukiwania usuniętych stron',
+'action-undelete'             => 'odtworzenia tej strony',
+'action-suppressrevision'     => 'podglÄ…du i odtworzenia tej wersji ukrytej',
+'action-suppressionlog'       => 'podglÄ…du rejestru ukrywania',
+'action-block'                => 'zablokowania temu użytkownikowi możliwości edycji',
+'action-protect'              => 'zmiany poziomu zabezpieczenia tej strony',
+'action-import'               => 'importu tej strony z innej wiki',
+'action-importupload'         => 'importu tej strony poprzez przesłanie pliku',
+'action-patrol'               => 'oznaczenia edycji jako „sprawdzonej�',
+'action-autopatrol'           => 'oznaczenia własnej edycji jako „sprawdzonej�',
+'action-unwatchedpages'       => 'podglÄ…du listy nieobserwowanych stron',
+'action-trackback'            => 'wysyłania trackbacka',
+'action-mergehistory'         => 'Å‚Ä…czenia historii edycji tej strony',
+'action-userrights'           => 'edytowania uprawnień wszystkich użytkowników',
+'action-userrights-interwiki' => 'edytowania uprawnień użytkowników na innych witrynach wiki',
+'action-siteadmin'            => 'blokowania i odblokowywania bazy danych',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|zmiana|zmiany|zmian}}',
 'recentchanges'                     => 'Ostatnie zmiany',
+'recentchanges-legend'              => 'Opcje ostatnich zmian',
 'recentchangestext'                 => 'Ta strona przedstawia historiÄ™ ostatnich zmian w tej wiki.',
 'recentchanges-feed-description'    => 'Obserwuj najświeższe zmiany w tej wiki.',
 'rcnote'                            => "Poniżej {{PLURAL:$1|znajduje się '''1''' ostatnia zmiana wykonana|znajdują się ostatnie '''$1''' zmiany wykonane|znajduje się ostatnich '''$1''' zmian wykonanych}} w ciągu {{PLURAL:$2|ostatniego dnia|ostatnich '''$2''' dni}}, licząc od $5 dnia $4.",
@@ -1250,6 +1395,8 @@ Zapoznaj siÄ™ z math/README w celu konfiguracji.',
 'rc_categories'                     => 'Ogranicz do kategorii (oddzielaj za pomocą „|�)',
 'rc_categories_any'                 => 'Wszystkie',
 'newsectionsummary'                 => '/* $1 */ nowa sekcja',
+'rc-enhanced-expand'                => 'Pokaż szczegóły (wymagana JavaScript)',
+'rc-enhanced-hide'                  => 'Ukryj szczegóły',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Zmiany w dolinkowanych',
@@ -1271,11 +1418,11 @@ Strony z [[Special:Watchlist|listy obserwowanych]] są '''wytłuszczone'''.",
 'upload_directory_read_only'  => 'Serwer nie może zapisywać do katalogu ($1) przeznaczonego na przesyłane pliki.',
 'uploaderror'                 => 'Błąd wysyłania',
 'uploadtext'                  => "Użyj poniższego formularza do przesłania plików.
-Jeśli chcesz przejrzeć lub przeszukać dotychczas przesłane pliki, przejdź do [[Special:ImageList|listy plików]]. Każde przesłanie jest odnotowane w [[Special:Log/upload|rejestrze przesyłanych plików]], a usunięcie w [[Special:Log/delete|rejestrze usuniętych]].
+Jeśli chcesz przejrzeć lub przeszukać dotychczas przesłane pliki, przejdź do [[Special:FileList|listy plików]]. Każde przesłanie zostaje odnotowane w [[Special:Log/upload|rejestrze przesyłanych plików]], a usunięcie w [[Special:Log/delete|rejestrze usuniętych]].
 
 Plik pojawi się na stronie, jeśli użyjesz linku według jednego z następujących wzorów:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Plik.jpg]]</nowiki></tt>''' pokaże plik w pełnej postaci
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Plik.png|200px|thumb|left|podpis grafiki]]</nowiki></tt>''' pokaże szeroką na 200 pikseli miniaturkę umieszczoną przy lewym marginesie, otoczoną ramką, z podpisem „podpis grafiki�
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Plik.jpg]]</nowiki></tt>''' pokaże plik w pełnej postaci
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Plik.png|200px|thumb|left|podpis grafiki]]</nowiki></tt>''' pokaże szeroką na 200 pikseli miniaturkę umieszczoną przy lewym marginesie, otoczoną ramką, z podpisem „podpis grafiki�
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Plik.ogg]]</nowiki></tt>''' utworzy bezpośredni link do pliku bez wyświetlania samego pliku",
 'upload-permitted'            => 'Dopuszczalne formaty plików: $1.',
 'upload-preferred'            => 'Zalecane formaty plików: $1.',
@@ -1283,7 +1430,7 @@ Plik pojawi się na stronie, jeśli użyjesz linku według jednego z następują
 'uploadlog'                   => 'rejestr przesyłania plików',
 'uploadlogpage'               => 'Przesłane',
 'uploadlogpagetext'           => 'Lista ostatnio przesłanych plików.
-Przejdź na stronę [[Special:NewImages|galerii nowych plików]], by zobaczyć pliki jako miniaturki.',
+Przejdź na stronę [[Special:NewFiles|galerii nowych plików]], by zobaczyć pliki jako miniaturki.',
 'filename'                    => 'Nazwa pliku',
 'filedesc'                    => 'Opis',
 'fileuploadsummary'           => 'Opis',
@@ -1306,28 +1453,29 @@ Plik ma rozmiar {{PLURAL:$2|1 bajt|$2 bajty|$2 bajtów}}.',
 'largefileserver'             => 'Plik jest większy niż maksymalny dozwolony rozmiar.',
 'emptyfile'                   => 'Przesłany plik wydaje się być pusty. Może być to spowodowane literówką w nazwie pliku.
 Sprawdź, czy nazwa jest prawidłowa.',
-'fileexists'                  => 'Plik o takiej nazwie już istnieje. Sprawdź <strong><tt>$1</tt></strong>, jeśli nie jesteś pewien czy chcesz go zastąpić.',
-'filepageexists'              => 'Istnieje już strona opisu tego pliku utworzona <strong><tt>$1</tt></strong>, ale brak obecnie pliku o tej nazwie.
+'fileexists'                  => "Plik o takiej nazwie już istnieje. Sprawdź '''<tt>$1</tt>''', jeśli nie jesteś pewien czy chcesz go zastąpić.",
+'filepageexists'              => "Istnieje już strona opisu tego pliku utworzona '''<tt>$1</tt>''', ale brak obecnie pliku o tej nazwie.
 Informacje o pliku, które wprowadziłeś, nie pojawią się na stronie opisu.
-Jeśli chcesz, by informacje te zostały pokazane, musisz je ręcznie przeredagować',
-'fileexists-extension'        => 'Plik o podobnej nazwie już istnieje:<br />
-Nazwa przesyłanego pliku: <strong><tt>$1</tt></strong><br />
-Nazwa istniejÄ…cego pliku: <strong><tt>$2</tt></strong><br />
-Wybierz innÄ… nazwÄ™.',
+Jeśli chcesz, by informacje te zostały pokazane, musisz je ręcznie przeredagować",
+'fileexists-extension'        => "Plik o podobnej nazwie już istnieje:<br />
+Nazwa przesyłanego pliku: '''<tt>$1</tt>'''<br />
+Nazwa istniejÄ…cego pliku: '''<tt>$2</tt>'''<br />
+Wybierz innÄ… nazwÄ™.",
 'fileexists-thumb'            => "<center>'''IstniejÄ…cy plik'''</center>",
-'fileexists-thumbnail-yes'    => 'Plik wydaje się być pomniejszoną grafiką <i>(miniaturką)</i>.
-Sprawdź plik <strong><tt>$1</tt></strong>.<br />
-Jeśli wybrany plik jest tą samą grafiką co ta w oryginalnym rozmiarze, nie musisz przesyłać dodatkowej miniaturki.',
-'file-thumbnail-no'           => 'Nazwa pliku zaczyna siÄ™ od <strong><tt>$1</tt></strong>.
-Wydaje się, że jest to pomniejszona grafika <i>(miniaturka)</i>.
-Jeśli posiadasz tę grafikę w pełnym rozmiarze – prześlij ją. Jeśli chcesz wysłać tę – zmień nazwę przesyłanego obecnie pliku.',
-'fileexists-forbidden'        => 'Plik o tej nazwie już istnieje.
-Cofnij się i załaduj plik pod inną nazwą. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Plik wydaje się być pomniejszoną grafiką ''(miniaturką)''.
+Sprawdź plik '''<tt>$1</tt>'''.<br />
+Jeśli wybrany plik jest tą samą grafiką co ta w oryginalnym rozmiarze, nie musisz przesyłać dodatkowej miniaturki.",
+'file-thumbnail-no'           => "Nazwa pliku zaczyna siÄ™ od '''<tt>$1</tt>'''.
+Wydaje się, że jest to pomniejszona grafika ''(miniaturka)''.
+Jeśli posiadasz tę grafikę w pełnym rozmiarze – prześlij ją. Jeśli chcesz wysłać tę – zmień nazwę przesyłanego obecnie pliku.",
+'fileexists-forbidden'        => 'Plik o tej nazwie już istnieje i nie może zostać nadpisany.
+Jeśli chcesz przesłać plik cofnij się i prześlij go pod inną nazwą. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Plik o tej nazwie już istnieje we współdzielonym repozytorium plików.
-Cofnij się i załaduj plik pod inną nazwą. [[Image:$1|thumb|center|$1]]',
+Cofnij się i załaduj plik pod inną nazwą. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ten plik jest kopią {{PLURAL:$1|pliku|następujących plików:}}',
+'file-deleted-duplicate'      => 'Identyczny do tego plik ([[$1]]) został wcześniej usunięty. Sprawdź historię usunięć tamtego pliku zanim prześlesz go ponownie.',
 'successfulupload'            => 'Przesłanie pliku powiodło się',
-'uploadwarning'               => 'Ostrzeżenie o przesyłce',
+'uploadwarning'               => 'Ostrzeżenie o przesyłaniu',
 'savefile'                    => 'Zapisz plik',
 'uploadedimage'               => 'przesłał [[$1]]',
 'overwroteimage'              => 'przesłał nową wersję [[$1]]',
@@ -1339,7 +1487,7 @@ Sprawdź plik i załaduj poprawną wersję.',
 'uploadvirus'                 => 'W pliku jest wirus! Szczegóły: $1',
 'sourcefilename'              => 'Nazwa oryginalna',
 'destfilename'                => 'Nazwa docelowa',
-'upload-maxfilesize'          => 'Wielkość pliku jest ograniczona do $1',
+'upload-maxfilesize'          => 'Wielkość pliku ograniczona jest do $1',
 'watchthisupload'             => 'Obserwuj',
 'filewasdeleted'              => 'Plik o tej nazwie istniał, ale został usunięty.
 Zanim załadujesz go ponownie, sprawdź $1.',
@@ -1347,8 +1495,8 @@ Zanim załadujesz go ponownie, sprawdź $1.',
 
 Zastanów się, czy powinno się ładować ten plik.
 Rejestr usunięć tego pliku jest podany poniżej:",
-'filename-bad-prefix'         => 'Nazwa pliku, który przesyłasz, zaczyna się od <strong>„$1�</strong>. Jest to nazwa zazwyczaj przypisywana automatycznie przez cyfrowe aparaty fotograficzne, która nie informuje o zawartości pliku.
-Zmień nazwę pliku na bardziej opisową.',
+'filename-bad-prefix'         => "Nazwa pliku, który przesyłasz, zaczyna się od '''„$1�'''. Jest to nazwa zazwyczaj przypisywana automatycznie przez cyfrowe aparaty fotograficzne, która nie informuje o zawartości pliku.
+Zmień nazwę pliku na bardziej opisową.",
 'filename-prefix-blacklist'   => '  #<!-- nie modyfikuj tej linii --> <pre>
 # Składnia jest następująca:
 #  * Wszystko od znaku "#" do końca linii uznawane jest za komentarz
@@ -1388,37 +1536,44 @@ Możesz także spróbować w czasie mniejszego obciążenia serwera.',
 'upload_source_url'  => ' (poprawny, publicznie dostępny adres URL)',
 'upload_source_file' => ' (plik na twoim komputerze)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Na tej stronie specjalnej prezentowane są wszystkie pliki przesłane na serwer.
+# Special:ListFiles
+'listfiles-summary'     => 'Na tej stronie specjalnej prezentowane są wszystkie pliki przesłane na serwer.
 Domyślnie na górze listy umieszczane są ostatnio przesłane pliki.
 Kliknięcie w nagłówek kolumny zmienia sposób sortowania.',
-'imagelist_search_for'  => 'Szukaj pliku o nazwie',
+'listfiles_search_for'  => 'Szukaj pliku o nazwie',
 'imgfile'               => 'plik',
-'imagelist'             => 'Lista plików',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nazwa',
-'imagelist_user'        => 'Użytkownik',
-'imagelist_size'        => 'Wielkość',
-'imagelist_description' => 'Opis',
-
-# Image description page
+'listfiles'             => 'Lista plików',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nazwa',
+'listfiles_user'        => 'Użytkownik',
+'listfiles_size'        => 'Wielkość',
+'listfiles_description' => 'Opis',
+'listfiles_count'       => 'Wersje',
+
+# File description page
 'filehist'                       => 'Historia pliku',
 'filehist-help'                  => 'Kliknij na datę/czas, aby zobaczyć, jak plik wyglądał w tym czasie.',
 'filehist-deleteall'             => 'usuń wszystkie',
 'filehist-deleteone'             => 'usuń',
 'filehist-revert'                => 'cofnij',
 'filehist-current'               => 'aktualny',
-'filehist-datetime'              => 'Data/czas',
+'filehist-datetime'              => 'Data i czas',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura wersji z $1',
+'filehist-nothumb'               => 'Brak miniatury',
 'filehist-user'                  => 'Użytkownik',
 'filehist-dimensions'            => 'Wymiary',
 'filehist-filesize'              => 'Rozmiar pliku',
 'filehist-comment'               => 'Opis',
 'imagelinks'                     => 'Odnośniki do pliku',
 'linkstoimage'                   => '{{PLURAL:$1|Poniższa strona odwołuje|Następujące strony odwołują}} się do tego pliku:',
+'linkstoimage-more'              => 'Więcej niż $1 {{PLURAL:$1|strona linkuje|strony linkują|stron linkuje}} do tego pliku.
+Poniższa lista pokazuje jedynie {{PLURAL:$1|pierwszy link|pierwsze $1 linki|pierwszych $1 linków}} do tego pliku.
+Dostępna jest też [[Special:WhatLinksHere/$2|pełna lista]].',
 'nolinkstoimage'                 => 'Żadna strona nie odwołuje się do tego pliku.',
 'morelinkstoimage'               => 'Pokaż [[Special:WhatLinksHere/$1|więcej odnośników]] do tego pliku.',
 'redirectstofile'                => '{{PLURAL:$1|Następujący plik przekierowuje|Następujące pliki przekierowują}} do tego pliku:',
-'duplicatesoffile'               => '{{PLURAL:$1|Następujący plik jest kopią|Następujące pliki są kopiami}} tego pliku:',
+'duplicatesoffile'               => '{{PLURAL:$1|Następujący plik jest kopią|Następujące pliki są kopiami}} pliku ([[Special:FileDuplicateSearch/$2|więcej informacji]]):',
 'sharedupload'                   => 'Ten plik znajduje się na wspólnym serwerze plików i może być używany w innych projektach.',
 'shareduploadwiki'               => 'Więcej informacji odnajdziesz na $1.',
 'shareduploadwiki-desc'          => 'Opis znajdujący się na $1 we współdzielonych zasobach możesz zobaczyć poniżej.',
@@ -1436,7 +1591,7 @@ Kliknięcie w nagłówek kolumny zmienia sposób sortowania.',
 'filerevert'                => 'Przywracanie $1',
 'filerevert-legend'         => 'Przywracanie poprzedniej wersji pliku',
 'filerevert-intro'          => "Zamierzasz przywrócić '''[[Media:$1|$1]]''' do [wersji $4 z $3, $2].",
-'filerevert-comment'        => 'Komentarz:',
+'filerevert-comment'        => 'Komentarz',
 'filerevert-defaultcomment' => 'Przywrócono wersję z $2, $1',
 'filerevert-submit'         => 'Przywróć',
 'filerevert-success'        => "Plik '''[[Media:$1|$1]]''' został cofnięty do [wersji $4 z $3, $2].",
@@ -1445,16 +1600,14 @@ Kliknięcie w nagłówek kolumny zmienia sposób sortowania.',
 # File deletion
 'filedelete'                  => 'Usuń „$1�',
 'filedelete-legend'           => 'Usuń plik',
-'filedelete-intro'            => "Usuwasz '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Chcesz usunąć plik '''[[Media:$1|$1]]''' razem z całą jego historią.",
 'filedelete-intro-old'        => "Usuwasz wersjÄ™ pliku '''[[Media:$1|$1]]''' z datÄ… [$4 $3, $2].",
-'filedelete-comment'          => 'Komentarz:',
+'filedelete-comment'          => 'Komentarz',
 'filedelete-submit'           => 'Usuń',
 'filedelete-success'          => "Usunięto plik '''$1'''.",
 'filedelete-success-old'      => "Usunięto plik '''[[Media:$1|$1]]''' w wersji z $3, $2.",
 'filedelete-nofile'           => "Plik '''$1''' nie istnieje.",
 'filedelete-nofile-old'       => "Brak zarchiwizowanej wersji '''$1''' o podanych atrybutach.",
-'filedelete-iscurrent'        => 'Próbujesz usunąć najnowszą wersję tego pliku.
-Musisz najpierw przywrócić starszą wersję.',
 'filedelete-otherreason'      => 'Inny (dodatkowy) powód:',
 'filedelete-reason-otherlist' => 'Inny powód',
 'filedelete-reason-dropdown'  => '* Najczęstsze przyczyny usunięcia
@@ -1483,35 +1636,37 @@ Sprawdź inne linki do szablonów, zanim usuniesz tę stronę.',
 
 # Random page
 'randompage'         => 'Losuj stronÄ™',
-'randompage-nopages' => 'Brak jakichkolwiek stron w tej przestrzeni nazw.',
+'randompage-nopages' => 'Brak jakichkolwiek stron w przestrzeni nazw „$1�.',
 
 # Random redirect
 'randomredirect'         => 'Losowe przekierowanie',
-'randomredirect-nopages' => 'Brak przekierowań w tej przestrzeni nazw.',
+'randomredirect-nopages' => 'Brak jakichkolwiek przekierowań w przestrzeni nazw „$1�.',
 
 # Statistics
-'statistics'             => 'Statystyki',
-'sitestats'              => 'Statystyka {{GRAMMAR:D.lp|{{SITENAME}}}}',
-'userstats'              => 'Statystyka użytkowników',
-'sitestatstext'          => "W bazie danych {{PLURAL:$1|jest '''1''' strona|sÄ… '''$1''' strony|jest '''$1''' stron}}.
-
-Ta liczba uwzględnia strony dyskusji, strony na temat {{GRAMMAR:D.lp|{{SITENAME}}}}, zalążki (stuby), strony przekierowujące, oraz inne, które trudno uznać za artykuły.
-Wyłączając powyższe, {{PLURAL:$2|jest|są|jest}} prawdopodobnie '''$2''' {{PLURAL:$2|strona, którą można uznać za artykuł|strony, które można uznać za artykuły|stron, które można uznać za artykuły}}.
-
-Przesłano $8 {{PLURAL:$8|plik|pliki|plików}}.
-
-Od uruchomienia {{GRAMMAR:D.lp|{{SITENAME}}}} {{PLURAL:$3|'''1''' raz odwiedzono strony|'''$3''' razy odwiedzono strony|było '''$3''' odwiedzin stron}} i wykonano '''$4''' {{PLURAL:$4|edycję|edycje|edycji}}.
-Daje to średnio '''$5''' {{PLURAL:$5|edycję|edycje|edycji}} na stronę i '''$6''' {{PLURAL:$6|odwiedzinę|odwiedziny|odwiedzin}} na edycję.
-
-Długość [http://www.mediawiki.org/wiki/Manual:Job_queue kolejki zadań] wynosi '''$7'''.",
-'userstatstext'          => "Jest {{PLURAL:$1|'''1''' zarejestrowany użytkownik|'''$1''' zarejestrowanych użytkowników}}. {{PLURAL:$1|Użytkownik ten|Spośród nich '''$2''' (czyli '''$4%''')}} ma status $5.",
-'statistics-mostpopular' => 'Najczęściej odwiedzane strony',
+'statistics'                   => 'Statystyki',
+'statistics-header-pages'      => 'Statystyka stron',
+'statistics-header-edits'      => 'Statystyka edycji',
+'statistics-header-views'      => 'Statystyka odwiedzin',
+'statistics-header-users'      => 'Statystyka użytkowników',
+'statistics-articles'          => 'Strony',
+'statistics-pages'             => 'Strony',
+'statistics-pages-desc'        => 'Wszystkie strony na wiki, w tym strony dyskusji, przekierowania, itd.',
+'statistics-files'             => 'Przesłane pliki',
+'statistics-edits'             => 'Edycje wykonane od powstania {{grammar:D.lp|{{SITENAME}}}}',
+'statistics-edits-average'     => 'Åšrednia liczba edycji na stronÄ™',
+'statistics-views-total'       => 'Całkowita liczba odwiedzin',
+'statistics-views-peredit'     => 'Liczba odwiedzin na edycjÄ™',
+'statistics-jobqueue'          => 'Rozmiar [http://www.mediawiki.org/wiki/Manual:Job_queue kolejki zadań]',
+'statistics-users'             => 'Zarejestrowanych [[Special:ListUsers|użytkowników]]',
+'statistics-users-active'      => 'Aktywnych użytkowników',
+'statistics-users-active-desc' => 'Użytkownicy, którzy byli aktywni w ciągu {{PLURAL:$1|ostatniego dnia|ostatnich $1 dni}}',
+'statistics-mostpopular'       => 'Najczęściej odwiedzane strony',
 
 'disambiguations'      => 'Strony ujednoznaczniajÄ…ce',
 'disambiguationspage'  => 'Template:disambig',
 'disambiguations-text' => "Poniższe strony odwołują się do '''stron ujednoznaczniających''',
 a powinny odwoływać się bezpośrednio do stron treści.<br />
-Strona uznawana jest za ujednoznaczniającą, jeśli zawiera ona szablon linkowany przez stronę [[MediaWiki:Disambiguationspage]]",
+Strona uznawana jest za ujednoznaczniającą, jeśli zawiera szablon linkowany przez stronę [[MediaWiki:Disambiguationspage]]",
 
 'doubleredirects'            => 'Podwójne przekierowania',
 'doubleredirectstext'        => 'Lista zawiera strony z przekierowaniami do stron, które przekierowują do innej strony. Każdy wiersz zawiera linki do pierwszego i drugiego przekierowania oraz link, do którego prowadzi drugie przekierowanie. Ostatni link prowadzi zazwyczaj do strony, do której powinna w rzeczywistości przekierowywać pierwsza strona.',
@@ -1523,8 +1678,8 @@ Strona uznawana jest za ujednoznaczniającą, jeśli zawiera ona szablon linkowa
 'brokenredirects-edit'   => '(edytuj)',
 'brokenredirects-delete' => '(usuń)',
 
-'withoutinterwiki'         => 'Strony bez odnośników językowych',
-'withoutinterwiki-summary' => 'Poniższe strony nie odwołują się do innych wersji językowych:',
+'withoutinterwiki'         => 'Strony bez odnośników do projektów w innych językach',
+'withoutinterwiki-summary' => 'Poniższe strony nie odwołują się do innych wersji językowych.',
 'withoutinterwiki-legend'  => 'Prefiks',
 'withoutinterwiki-submit'  => 'Pokaż',
 
@@ -1549,30 +1704,34 @@ Strona uznawana jest za ujednoznaczniającą, jeśli zawiera ona szablon linkowa
 'popularpages'            => 'Najpopularniejsze strony',
 'wantedcategories'        => 'BrakujÄ…ce kategorie',
 'wantedpages'             => 'Najpotrzebniejsze strony',
-'missingfiles'            => 'Brak plików',
+'wantedfiles'             => 'Potrzebne pliki',
+'wantedtemplates'         => 'Potrzebne szablony',
 'mostlinked'              => 'Najczęściej linkowane strony',
 'mostlinkedcategories'    => 'Kategorie o największej liczbie stron',
 'mostlinkedtemplates'     => 'Najczęściej linkowane szablony',
 'mostcategories'          => 'Strony z największą liczbą kategorii',
 'mostimages'              => 'Najczęściej linkowane pliki',
 'mostrevisions'           => 'Strony o największej liczbie wersji',
-'prefixindex'             => 'Wszystkie strony według prefiksu',
+'prefixindex'             => 'Wszystkie strony o prefiksie',
 'shortpages'              => 'Najkrótsze strony',
 'longpages'               => 'Najdłuższe strony',
 'deadendpages'            => 'Strony bez linków wewnętrznych',
 'deadendpagestext'        => 'Poniższe strony nie posiadają odnośników do innych stron znajdujących się w {{GRAMMAR:MS.lp|{{SITENAME}}}}.',
 'protectedpages'          => 'Strony zabezpieczone',
 'protectedpages-indef'    => 'Tylko strony zabezpieczone na zawsze',
+'protectedpages-cascade'  => 'Tylko strony zabezpieczone rekursywnie',
 'protectedpagestext'      => 'Poniższe strony zostały zabezpieczone przed przenoszeniem lub edytowaniem.',
 'protectedpagesempty'     => 'Żadna strona nie jest obecnie zabezpieczona z podanymi parametrami.',
 'protectedtitles'         => 'Zabezpieczone nazwy stron',
 'protectedtitlestext'     => 'Utworzenie stron o następujących nazwach jest zablokowane',
 'protectedtitlesempty'    => 'Dla tych ustawień dopuszczalne jest utworzenie stron o dowolnej nazwie.',
 'listusers'               => 'Lista użytkowników',
+'listusers-editsonly'     => 'Pokaż tylko użytkowników z edycjami',
+'usereditcount'           => '$1 {{PLURAL:$1|edycja|edycje|edycji}}',
 'newpages'                => 'Nowe strony',
 'newpages-username'       => 'Nazwa użytkownika',
 'ancientpages'            => 'Najstarsze strony',
-'move'                    => 'przenieÅ›',
+'move'                    => 'PrzenieÅ›',
 'movethispage'            => 'PrzenieÅ› tÄ™ stronÄ™',
 'unusedimagestext'        => 'Inne witryny mogą odwoływać się do tych plików, używając bezpośrednich adresów URL. Oznacza to, że niektóre z plików mogą się znajdować na tej liście pomimo tego, że są wykorzystywane.',
 'unusedcategoriestext'    => 'Poniższe kategorie istnieją, choć nie korzysta z nich żadna strona ani kategoria.',
@@ -1588,15 +1747,14 @@ Strona uznawana jest za ujednoznaczniającą, jeśli zawiera ona szablon linkowa
 'booksources'               => 'Książki',
 'booksources-search-legend' => 'Szukaj informacji o książkach',
 'booksources-go'            => 'Pokaż',
-'booksources-text'          => 'Poniżej znajduje się lista odnośników do innych witryn, które pośredniczą w sprzedaży nowych i używanych książek, a także mogą posiadać dalsze informacje na temat poszukiwanej przez ciebie książki.',
+'booksources-text'          => 'Poniżej znajduje się lista odnośników do innych witryn, które pośredniczą w sprzedaży nowych i używanych książek, a także mogą posiadać dalsze informacje na temat poszukiwanej przez Ciebie książki.',
+'booksources-invalid-isbn'  => 'Podany numer ISBN został rozpoznany jako nieprawidłowy. Sprawdź czy podany numer zgadza się z numerem zaczerpniętym ze źródła.',
 
 # Special:Log
 'specialloguserlabel'  => 'Użytkownik',
 'speciallogtitlelabel' => 'Tytuł',
 'log'                  => 'Rejestr operacji',
 'all-logs-page'        => 'Wszystkie operacje',
-'log-search-legend'    => 'Szukaj w rejestrze',
-'log-search-submit'    => 'Szukaj',
 'alllogstext'          => 'Wspólny rejestr wszystkich typów operacji dla {{GRAMMAR:D.lp|{{SITENAME}}}}.
 Możesz zawęzić liczbę wyników poprzez wybranie typu rejestru, nazwy użytkownika albo tytułu strony.',
 'logempty'             => 'Brak wpisów w rejestrze.',
@@ -1607,7 +1765,8 @@ Możesz zawęzić liczbę wyników poprzez wybranie typu rejestru, nazwy użytko
 'alphaindexline'    => 'od $1 do $2',
 'nextpage'          => 'Następna strona ($1)',
 'prevpage'          => 'Poprzednia strona ($1)',
-'allpagesfrom'      => 'Strony o tytułach rozpoczynających się od:',
+'allpagesfrom'      => 'Strony o tytułach rozpoczynających się od',
+'allpagesto'        => 'Strony o tytułach kończących się na',
 'allarticles'       => 'Wszystkie artykuły',
 'allinnamespace'    => 'Wszystkie strony (w przestrzeni nazw $1)',
 'allnotinnamespace' => 'Wszystkie strony (oprócz przestrzeni nazw $1)',
@@ -1622,50 +1781,78 @@ Możesz zawęzić liczbę wyników poprzez wybranie typu rejestru, nazwy użytko
 'categories'                    => 'Kategorie',
 'categoriespagetext'            => 'Strona przedstawia listÄ™ kategorii zawierajÄ…cych strony i pliki.
 [[Special:UnusedCategories|Nieużywane kategorie]] nie zostały tutaj pokazane.
-Zobacz też [[Special:WantedCategories|nieistniejące kategorie]].',
-'categoriesfrom'                => 'Wyświetl kategorie, zaczynając od:',
+Zobacz też [[Special:WantedCategories|brakujące kategorie]].',
+'categoriesfrom'                => 'Wyświetl kategorie, zaczynając od',
 'special-categories-sort-count' => 'sortowanie według liczby',
 'special-categories-sort-abc'   => 'sortowanie alfabetyczne',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Usunięty wkład użytkownika',
+
+# Special:LinkSearch
+'linksearch'       => 'Linki zewnętrzne',
+'linksearch-pat'   => 'Wzorzec wyszukiwania',
+'linksearch-ns'    => 'Przestrzeń nazw',
+'linksearch-ok'    => 'Szukaj',
+'linksearch-text'  => 'Można użyć symbolu wieloznacznego „*�. Dla przykładu „*.wikipedia.org� spowoduje wyszukanie wszystkich linków prowadzących do domeny „wikipedia.org� i jej poddomen.<br />
+Obsługiwane protokoły: <tt>$1</tt>',
+'linksearch-line'  => '$1 link na stronie $2',
+'linksearch-error' => 'Symbolu wieloznacznego można użyć wyłącznie na początku nazwy hosta.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Pokaż użytkowników zaczynając od',
 'listusers-submit'   => 'Pokaż',
 'listusers-noresult' => 'Nie znaleziono żadnego użytkownika.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Nowi użytkownicy',
+'newuserlogpagetext'          => 'To jest rejestr ostatnio utworzonych kont użytkowników',
+'newuserlog-byemail'          => 'hasło zostało wysłane e-mailem',
+'newuserlog-create-entry'     => '– nowy użytkownik',
+'newuserlog-create2-entry'    => 'utworzył konto $1',
+'newuserlog-autocreate-entry' => '– konto utworzone automatycznie',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Uprawnienia grup użytkowników',
-'listgrouprights-summary'  => 'Poniżej znajduje się spis zdefiniowanych na tej wiki grup użytkowników, z wyszczególnieniem przydzielonych im uprawnień.
+'listgrouprights'                 => 'Uprawnienia grup użytkowników',
+'listgrouprights-summary'         => 'Poniżej znajduje się spis zdefiniowanych na tej wiki grup użytkowników, z wyszczególnieniem przydzielonych im uprawnień.
 Sprawdź stronę z [[{{MediaWiki:Listgrouprights-helppage}}|dodatkowymi informacjami]] o uprawnieniach.',
-'listgrouprights-group'    => 'Grupa',
-'listgrouprights-rights'   => 'Uprawnienia',
-'listgrouprights-helppage' => 'Help:Uprawnienia grup użytkowników',
-'listgrouprights-members'  => '(lista członków grupy)',
+'listgrouprights-group'           => 'Grupa',
+'listgrouprights-rights'          => 'Uprawnienia',
+'listgrouprights-helppage'        => 'Help:Uprawnienia grup użytkowników',
+'listgrouprights-members'         => '(lista członków grupy)',
+'listgrouprights-addgroup'        => 'Możliwość dodawania do {{PLURAL:$2|grupy|grup:}} $1',
+'listgrouprights-removegroup'     => 'Możliwość usuwania z {{PLURAL:$2|grupy|grup:}} $1',
+'listgrouprights-addgroup-all'    => 'Możliwość dodania użytkownika do każdej grupy',
+'listgrouprights-removegroup-all' => 'Możliwość usunięcia użytkownika z każdej grupy',
 
 # E-mail user
-'mailnologin'     => 'Brak adresu',
-'mailnologintext' => 'Musisz się [[Special:UserLogin|zalogować]] i mieć wpisany aktualny adres e-mailowy w swoich [[Special:Preferences|preferencjach]], aby móc wysłać e-mail do innego użytkownika.',
-'emailuser'       => 'Wyślij e-mail do tego użytkownika',
-'emailpage'       => 'Wyślij e-mail do użytkownika',
-'emailpagetext'   => 'Możesz użyć poniższego formularza, aby wysłać wiadomość e-mail do tego użytkownika.
-Adres e-mailowy, który został przez Ciebie wprowadzony w [[Special:Preferences|Twoich preferencjach]], pojawi się w polu „Od�, dzięki czemu odbiorca będzie mógł Ci odpowiedzieć.',
-'usermailererror' => 'Moduł obsługi poczty zwrócił błąd:',
-'defemailsubject' => 'Wiadomość z {{GRAMMAR:D.lp|{{SITENAME}}}}',
-'noemailtitle'    => 'Brak adresu e-mail',
-'noemailtext'     => 'Ten użytkownik nie podał poprawnego adresu e-mail albo zadecydował, że nie chce otrzymywać wiadomości e-mail od innych użytkowników.',
-'emailfrom'       => 'Od:',
-'emailto'         => 'Do:',
-'emailsubject'    => 'Temat:',
-'emailmessage'    => 'Wiadomość:',
-'emailsend'       => 'Wyślij',
-'emailccme'       => 'Wyślij mi kopię mojej wiadomości.',
-'emailccsubject'  => 'Kopia Twojej wiadomości do $1: $2',
-'emailsent'       => 'Wiadomość została wysłana',
-'emailsenttext'   => 'Twoja wiadomość została wysłana.',
-'emailuserfooter' => 'Wiadomość e-mail została wysłana z {{GRAMMAR:D.lp|{{SITENAME}}}} do $2 przez $1 z użyciem „Wyślij e-mail do tego użytkownika�.',
+'mailnologin'      => 'Brak adresu',
+'mailnologintext'  => 'Musisz się [[Special:UserLogin|zalogować]] i mieć wpisany aktualny adres e-mailowy w swoich [[Special:Preferences|preferencjach]], aby móc wysłać e-mail do innego użytkownika.',
+'emailuser'        => 'Wyślij e-mail do tego użytkownika',
+'emailpage'        => 'Wyślij e-mail do użytkownika',
+'emailpagetext'    => 'Możesz użyć poniższego formularza, aby wysłać wiadomość e-mail do tego użytkownika.
+Adres e-mailowy, który został przez Ciebie wprowadzony w [[Special:Preferences|Twoich preferencjach]], zostanie umieszczony w polu „Od�, dzięki czemu odbiorca będzie mógł Ci odpowiedzieć.',
+'usermailererror'  => 'Moduł obsługi poczty zwrócił błąd:',
+'defemailsubject'  => 'Wiadomość z {{GRAMMAR:D.lp|{{SITENAME}}}}',
+'noemailtitle'     => 'Brak adresu e-mail',
+'noemailtext'      => 'Ten użytkownik nie podał poprawnego adresu e-mail.',
+'nowikiemailtitle' => 'Brak zezwolenia na otrzymywanie e-mailów',
+'nowikiemailtext'  => 'Ten użytkownik nie chce otrzymywać wiadomości e-mail od innych użytkowników.',
+'email-legend'     => 'Wyślij e-mail do innego użytkownika {{GRAMMAR:MS.lp|{{SITENAME}}}}',
+'emailfrom'        => 'Od:',
+'emailto'          => 'Do:',
+'emailsubject'     => 'Temat:',
+'emailmessage'     => 'Wiadomość:',
+'emailsend'        => 'Wyślij',
+'emailccme'        => 'Wyślij mi kopię mojej wiadomości.',
+'emailccsubject'   => 'Kopia Twojej wiadomości do $1: $2',
+'emailsent'        => 'Wiadomość została wysłana',
+'emailsenttext'    => 'Twoja wiadomość została wysłana.',
+'emailuserfooter'  => 'Wiadomość e-mail została wysłana z {{GRAMMAR:D.lp|{{SITENAME}}}} do $2 przez $1 z użyciem „Wyślij e-mail do tego użytkownika�.',
 
 # Watchlist
 'watchlist'            => 'Obserwowane',
-'mywatchlist'          => 'obserwowane',
+'mywatchlist'          => 'Obserwowane',
 'watchlistfor'         => "(raport dla użytkownika '''$1''')",
 'nowatchlist'          => 'Lista obserwowanych przez Ciebie stron jest pusta.',
 'watchlistanontext'    => '$1, aby obejrzeć lub edytować elementy listy obserwowanych.',
@@ -1685,19 +1872,14 @@ Każda zmiana treści tej strony lub związanej z nią strony dyskusji zostanie
 'watchnochange'        => 'Żadna z obserwowanych stron nie była edytowana w podanym okresie.',
 'watchlist-details'    => 'Na liście obserwowanych {{PLURAL:$1|jest 1 strona|są $1 strony|jest $1 stron}}, nie licząc stron dyskusji.',
 'wlheader-enotif'      => '* Wysyłanie powiadomień na adres e-mail jest włączone.',
-'wlheader-showupdated' => "* Strony, które zostały zmodyfikowane od Twojej ostatniej wizyty na nich zostały '''wytłuszczone'''.",
+'wlheader-showupdated' => "* '''Wytłuszczone''' zostały strony, które zostały zmodyfikowane od Twojej ostatniej na nich wizyty.",
 'watchmethod-recent'   => 'poszukiwanie ostatnich zmian wśród obserwowanych stron',
 'watchmethod-list'     => 'poszukiwanie obserwowanych stron wśród ostatnich zmian',
 'watchlistcontains'    => 'Na liście obserwowanych przez Ciebie stron {{PLURAL:$1|znajduje się 1 pozycja|znajdują się $1 pozycje|znajduje się $1 pozycji}}.',
-'iteminvalidname'      => 'Problem z pozycją „$1�, niepoprawna nazwa...',
+'iteminvalidname'      => 'Problem z pozycją „$1� – niepoprawna nazwa...',
 'wlnote'               => "Poniżej pokazano {{PLURAL:$1|ostatnią zmianę wykonaną|ostatnie '''$1''' zmiany wykonane|ostatnich '''$1''' zmian wykonanych}} w ciągu {{PLURAL:$2|ostatniej godziny|ostatnich '''$2''' godzin}}.",
 'wlshowlast'           => 'Pokaż ostatnie $1 godzin, $2 dni ($3)',
-'watchlist-show-bots'  => 'Pokaż edycje botów',
-'watchlist-hide-bots'  => 'Ukryj edycje botów',
-'watchlist-show-own'   => 'Pokaż moje edycje',
-'watchlist-hide-own'   => 'Ukryj moje edycje',
-'watchlist-show-minor' => 'Pokaż drobne edycje',
-'watchlist-hide-minor' => 'Ukryj drobne edycje',
+'watchlist-options'    => 'Opcje obserwowanych',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ObserwujÄ™...',
@@ -1737,82 +1919,101 @@ W celu zmiany ustawień swojej listy obserwowanych odwiedź
 Pomoc:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Usuń stronę',
-'confirm'                     => 'Potwierdź',
-'excontent'                   => 'treść: „$1�',
-'excontentauthor'             => 'treść: „$1� (jedyny autor: [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => 'poprzednia zawartość, obecnie pustej strony: „$1�',
-'exblank'                     => 'Strona była pusta',
-'delete-confirm'              => 'Usuń „$1�',
-'delete-legend'               => 'Usuń',
-'historywarning'              => 'Uwaga! Strona, którą chcesz usunąć, ma starsze wersje:',
-'confirmdeletetext'           => 'Zamierzasz usunąć stronę razem z całą dotyczącą jej historią.
+# Delete
+'deletepage'             => 'Usuń stronę',
+'confirm'                => 'Potwierdź',
+'excontent'              => 'treść: „$1�',
+'excontentauthor'        => 'treść: „$1� (jedyny autor: [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'poprzednia zawartość, obecnie pustej strony: „$1�',
+'exblank'                => 'Strona była pusta',
+'delete-confirm'         => 'Usuń „$1�',
+'delete-legend'          => 'Usuń',
+'historywarning'         => 'Uwaga! Strona, którą chcesz usunąć, ma starsze wersje:',
+'confirmdeletetext'      => 'Zamierzasz usunąć stronę razem z całą dotyczącą jej historią.
 Upewnij się, czy na pewno chcesz to zrobić, że rozumiesz konsekwencje i że robisz to w zgodzie z [[{{MediaWiki:Policy-url}}|zasadami]].',
-'actioncomplete'              => 'Operacja wykonana',
-'deletedtext'                 => 'Usunięto „<nowiki>$1</nowiki>�.
+'actioncomplete'         => 'Operacja wykonana',
+'deletedtext'            => 'Usunięto „<nowiki>$1</nowiki>�.
 Zobacz na stronie $2 rejestr ostatnio wykonanych usunięć.',
-'deletedarticle'              => 'usunÄ…Å‚ [[$1]]',
-'suppressedarticle'           => 'utajnił [[$1]]',
-'dellogpage'                  => 'Usunięte',
-'dellogpagetext'              => 'Poniżej znajduje się lista ostatnio wykonanych usunięć.',
-'deletionlog'                 => 'rejestr usunięć',
-'reverted'                    => 'Przywrócono poprzednią wersję',
-'deletecomment'               => 'Powód usunięcia:',
-'deleteotherreason'           => 'Inny/dodatkowy powód:',
-'deletereasonotherlist'       => 'Inny powód',
-'deletereason-dropdown'       => '* Najczęstsze powody usunięcia
+'deletedarticle'         => 'usunÄ…Å‚ [[$1]]',
+'suppressedarticle'      => 'utajnił [[$1]]',
+'dellogpage'             => 'Usunięte',
+'dellogpagetext'         => 'Poniżej znajduje się lista ostatnio wykonanych usunięć.',
+'deletionlog'            => 'rejestr usunięć',
+'reverted'               => 'Przywrócono poprzednią wersję',
+'deletecomment'          => 'Powód usunięcia:',
+'deleteotherreason'      => 'Inny lub dodatkowy powód:',
+'deletereasonotherlist'  => 'Inny powód',
+'deletereason-dropdown'  => '* Najczęstsze powody usunięcia
 ** Prośba autora
 ** Naruszenie praw autorskich
 ** Wandalizm',
-'delete-edit-reasonlist'      => 'Edycja listy powodów usunięcia strony',
-'delete-toobig'               => 'Ta strona ma bardzo długą historię edycji, ponad $1 {{PLURAL:$1|zmianę|zmiany|zmian}}.
+'delete-edit-reasonlist' => 'Edycja listy powodów usunięcia strony',
+'delete-toobig'          => 'Ta strona ma bardzo długą historię edycji, ponad $1 {{PLURAL:$1|zmianę|zmiany|zmian}}.
 Usunięcie jej mogłoby spowodować zakłócenia w pracy {{GRAMMAR:D.lp|{{SITENAME}}}} i dlatego zostało ograniczone.',
-'delete-warning-toobig'       => 'Ta strona ma bardzo długą historię edycji, ponad $1 {{PLURAL:$1|zmianę|zmiany|zmian}}.
+'delete-warning-toobig'  => 'Ta strona ma bardzo długą historię edycji, ponad $1 {{PLURAL:$1|zmianę|zmiany|zmian}}.
 Bądź ostrożny, ponieważ usunięcie jej może spowodować zakłócenia w pracy {{GRAMMAR:D.lp|{{SITENAME}}}}.',
-'rollback'                    => 'Cofnij edycjÄ™',
-'rollback_short'              => 'Cofnij',
-'rollbacklink'                => 'cofnij',
-'rollbackfailed'              => 'Nie udało się cofnąć zmiany',
-'cantrollback'                => 'Nie można cofnąć edycji, ponieważ jest tylko jedna wersja tej strony.',
-'alreadyrolled'               => 'Nie można dla strony [[:$1|$1]] cofnąć ostatniej zmiany, którą wykonał [[User:$2|$2]] ([[User talk:$2|dyskusja]] | [[Special:Contributions/$2|{{int:contribslink}}]]).
+
+# Rollback
+'rollback'         => 'Cofnij edycjÄ™',
+'rollback_short'   => 'Cofnij',
+'rollbacklink'     => 'cofnij',
+'rollbackfailed'   => 'Nie udało się cofnąć zmiany',
+'cantrollback'     => 'Nie można cofnąć edycji, ponieważ jest tylko jedna wersja tej strony.',
+'alreadyrolled'    => 'Nie można dla strony [[:$1|$1]] cofnąć ostatniej zmiany, którą wykonał [[User:$2|$2]] ([[User talk:$2|dyskusja]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]).
 Ktoś inny zdążył już to zrobić lub wprowadził własne poprawki do treści strony.
 
-Autorem ostatniej zmiany jest teraz [[User:$3|$3]] ([[User talk:$3|dyskusja]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Edycję opisano: „<i>$1</i>�.', # only shown if there is an edit comment
-'revertpage'                  => 'Wycofano edycje użytkownika [[Special:Contributions/$2|$2]] ([[User talk:$2|dyskusja]]). Autor przywróconej wersji to [[User:$1|$1]].', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Wycofano edycje użytkownika $1.
+Autorem ostatniej zmiany jest teraz [[User:$3|$3]] ([[User talk:$3|dyskusja]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Edycję opisał „''$1''�.", # only shown if there is an edit comment
+'revertpage'       => 'Wycofano edycje użytkownika [[Special:Contributions/$2|$2]] ([[User talk:$2|dyskusja]]). Autor przywróconej wersji to [[User:$1|$1]].', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Wycofano edycje użytkownika $1.
 Przywrócono ostatnią wersję autorstwa $2.',
-'sessionfailure'              => 'Wystąpił problem z weryfikacją zalogowania.
+'sessionfailure'   => 'Wystąpił problem z weryfikacją zalogowania.
 Polecenie zostało anulowane, aby uniknąć przechwycenia sesji.
 Naciśnij „wstecz� w przeglądarce, przeładuj stronę, po czym ponownie wydaj polecenie.',
+
+# Protect
 'protectlogpage'              => 'Zabezpieczone',
 'protectlogtext'              => 'Poniżej znajduje się lista blokad założonych i zdjętych z pojedynczych stron.
 Aby przejrzeć listę obecnie działających zabezpieczeń, przejdź na stronę wykazu [[Special:ProtectedPages|zabezpieczonych stron]].',
 'protectedarticle'            => 'zabezpieczył [[$1]]',
 'modifiedarticleprotection'   => 'zmienił poziom zabezpieczenia [[$1]]',
 'unprotectedarticle'          => 'odbezpieczył [[$1]]',
+'movedarticleprotection'      => 'przeniósł ustawienia zabezpieczeń z [[$2]] do [[$1]]',
 'protect-title'               => 'Zmiana poziomu zabezpieczenia „$1�',
+'prot_1movedto2'              => 'stronę [[$1]] przeniósł do [[$2]]',
 'protect-legend'              => 'Potwierdź zabezpieczenie',
 'protectcomment'              => 'powód zabezpieczenia',
-'protectexpiry'               => 'Czas wygaśnięcia:',
+'protectexpiry'               => 'Czas wygaśnięcia',
 'protect_expiry_invalid'      => 'Podany czas automatycznego odbezpieczenia jest nieprawidłowy.',
 'protect_expiry_old'          => 'Podany czas automatycznego odblokowania znajduje się w przeszłości.',
 'protect-unchain'             => 'Odblokowanie możliwości przenoszenia strony',
-'protect-text'                => 'Możesz tu sprawdzić i zmienić poziom zabezpieczenia strony <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nie możesz zmienić poziomów zabezpieczenia, ponieważ jesteś zablokowany.
-Obecne ustawienia dla strony <strong>$1</strong> to:',
-'protect-locked-dblock'       => 'Nie można zmienić poziomu zabezpieczenia z powodu działającej blokady bazy danych. Obecne ustawienia dla strony <strong>$1</strong> to:',
-'protect-locked-access'       => 'Nie masz uprawnień do zmiany poziomu zabezpieczenia strony. Obecne ustawienia dla strony <strong>$1</strong> to:',
+'protect-text'                => "Możesz tu sprawdzić i zmienić poziom zabezpieczenia strony '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nie możesz zmienić poziomów zabezpieczenia, ponieważ jesteś zablokowany.
+Obecne ustawienia dla strony '''$1''' to:",
+'protect-locked-dblock'       => "Nie można zmienić poziomu zabezpieczenia z powodu działającej blokady bazy danych. Obecne ustawienia dla strony '''$1''' to:",
+'protect-locked-access'       => "Nie masz uprawnień do zmiany poziomu zabezpieczenia strony. Obecne ustawienia dla strony '''$1''' to:",
 'protect-cascadeon'           => 'Ta strona jest zabezpieczona przed edycją, ponieważ jest używana przez {{PLURAL:$1|następującą stronę, która została zabezpieczona|następujące strony, które zostały zabezpieczone}} z włączoną opcją dziedziczenia. Możesz zmienić poziom zabezpieczenia strony, ale nie wpłynie to na dziedziczenie zabezpieczenia.',
-'protect-default'             => '(wszyscy)',
+'protect-default'             => 'Dostęp mają wszyscy użytkownicy',
 'protect-fallback'            => 'Wymaga uprawnień „$1�',
-'protect-level-autoconfirmed' => 'tylko zarejestrowani',
+'protect-level-autoconfirmed' => 'Blokuj nowych i niezarejestrowanych użytkowników',
 'protect-level-sysop'         => 'tylko administratorzy',
 'protect-summary-cascade'     => 'dziedziczenie',
 'protect-expiring'            => 'wygasa $1 (UTC)',
+'protect-expiry-indefinite'   => 'na zawsze',
 'protect-cascade'             => 'Dziedziczenie zabezpieczenia – zabezpiecz wszystkie strony zawarte na tej stronie.',
 'protect-cantedit'            => 'Nie możesz zmienić poziomu zabezpieczenia tej strony, ponieważ nie masz uprawnień do jej edycji.',
+'protect-othertime'           => 'Inny okres',
+'protect-othertime-op'        => 'inny okres',
+'protect-existing-expiry'     => 'Obecny czas wygaśnięcia: $2 o $3',
+'protect-otherreason'         => 'Inny lub dodatkowy powód',
+'protect-otherreason-op'      => 'inny lub dodatkowy powód',
+'protect-dropdown'            => '*Najczęstsze powody zabezpieczenia
+** Częste wandalizmy
+** Częste spamowanie
+** Wojna edycyjna
+** Wygłupy',
+'protect-edit-reasonlist'     => 'Edytuj listÄ™ przyczyn zabezpieczenia',
+'protect-expiry-options'      => '2 godziny:2 hours,1 dzień:1 day,3 dni:3 days,1 tydzień:1 week,2 tygodnie:2 weeks,1 miesiąc:1 month,3 miesiące:3 months,6 miesięcy:6 months,1 rok:1 year,na zawsze:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ograniczenia',
 'restriction-level'           => 'Poziom',
 'minimum-size'                => 'Minimalny rozmiar',
@@ -1820,10 +2021,10 @@ Obecne ustawienia dla strony <strong>$1</strong> to:',
 'pagesize'                    => '(bajtów)',
 
 # Restrictions (nouns)
-'restriction-edit'   => 'Edytowanie',
-'restriction-move'   => 'Przenoszenie',
-'restriction-create' => 'Utworzenie',
-'restriction-upload' => 'Prześlij',
+'restriction-edit'   => 'edytowanie',
+'restriction-move'   => 'przenoszenie',
+'restriction-create' => 'tworzenie',
+'restriction-upload' => 'przesyłanie',
 
 # Restriction levels
 'restriction-level-sysop'         => 'całkowite zabezpieczenie',
@@ -1835,7 +2036,7 @@ Obecne ustawienia dla strony <strong>$1</strong> to:',
 'undeletepage'                 => 'Odtwarzanie usuniętych stron',
 'undeletepagetitle'            => "'''Poniżej znajdują się usunięte wersje strony [[:$1]]'''.",
 'viewdeletedpage'              => 'Zobacz usunięte wersje',
-'undeletepagetext'             => 'Poniższe strony zostały usunięte, ale ich kopia wciąż znajduje się w archiwum.
+'undeletepagetext'             => '{{PLURAL:$1|Następująca strona została usunięta, ale jej|Następujące $1 strony zostały usunięte, ale ich}} kopia wciąż znajduje się w archiwum.
 Archiwum co jakiś czas może być oczyszczane.',
 'undelete-fieldset-title'      => 'Odtwarzanie wersji',
 'undeleteextrahelp'            => "Jeśli chcesz odtworzyć całą stronę, pozostaw wszystkie pola niezaznaczone i kliknij '''''Odtwórz'''''.
@@ -1849,14 +2050,15 @@ W takiej sytuacji należy odznaczyć lub przywrócić widoczność najnowszej us
 'undeletehistorynoadmin'       => 'Ta strona została usunięta.
 Przyczyna usunięcia podana jest w podsumowaniu poniżej, razem z danymi użytkownika, który edytował stronę przed usunięciem.
 Sama treść usuniętych wersji jest dostępna jedynie dla administratorów.',
-'undelete-revision'            => 'Usunięto wersję $1 z $2 autorstwa $3:',
+'undelete-revision'            => 'Usunięto wersję $1 (z $5 $4) autorstwa $3:',
 'undeleterevision-missing'     => 'Nieprawidłowa lub brakująca wersja.
 Możesz mieć zły link lub wersja mogła zostać odtworzona lub usunięta z archiwum.',
 'undelete-nodiff'              => 'Nie znaleziono poprzednich wersji.',
 'undeletebtn'                  => 'Odtwórz',
 'undeletelink'                 => 'odtwórz',
 'undeletereset'                => 'Wyczyść',
-'undeletecomment'              => 'Powód odtworzenia:',
+'undeleteinvert'               => 'Odwróć zaznaczenie',
+'undeletecomment'              => 'Powód odtworzenia',
 'undeletedarticle'             => 'odtworzył [[$1]]',
 'undeletedrevisions'           => 'odtworzono {{PLURAL:$1|1 wersjÄ™|$1 wersje|$1 wersji}}',
 'undeletedrevisions-files'     => 'odtworzono $1 {{PLURAL:$1|wersję|wersje|wersji}} i $2 {{PLURAL:$2|plik|pliki|plików}}',
@@ -1889,26 +2091,27 @@ $1',
 'blanknamespace' => '(główna)',
 
 # Contributions
-'contributions' => 'Wkład użytkownika',
-'mycontris'     => 'moje edycje',
-'contribsub2'   => 'Dla użytkownika $1 ($2)',
-'nocontribs'    => 'Brak zmian odpowiadajÄ…cych tym kryteriom.',
-'uctop'         => ' (jako ostatnia)',
-'month'         => 'Przed miesiącem (włącznie)',
-'year'          => 'Przed rokiem (włącznie)',
-
-'sp-contributions-newbies'     => 'Pokaż wyłącznie wkład nowych użytkowników',
-'sp-contributions-newbies-sub' => 'Dla nowych użytkowników',
-'sp-contributions-blocklog'    => 'blokady',
-'sp-contributions-search'      => 'Szukaj wkładu',
-'sp-contributions-username'    => 'Adres IP lub nazwa użytkownika',
-'sp-contributions-submit'      => 'Szukaj',
+'contributions'       => 'Wkład użytkownika',
+'contributions-title' => 'Wkład użytkownika $1',
+'mycontris'           => 'Moje edycje',
+'contribsub2'         => 'Dla użytkownika $1 ($2)',
+'nocontribs'          => 'Brak zmian odpowiadajÄ…cych tym kryteriom.',
+'uctop'               => ' (jako ostatnia)',
+'month'               => 'Przed miesiącem (włącznie)',
+'year'                => 'Przed rokiem (włącznie)',
+
+'sp-contributions-newbies'       => 'Pokaż wyłącznie wkład nowych użytkowników',
+'sp-contributions-newbies-sub'   => 'Dla nowych użytkowników',
+'sp-contributions-newbies-title' => 'Wkład nowych użytkowników',
+'sp-contributions-blocklog'      => 'blokady',
+'sp-contributions-search'        => 'Szukaj wkładu',
+'sp-contributions-username'      => 'Adres IP lub nazwa użytkownika',
+'sp-contributions-submit'        => 'Szukaj',
 
 # What links here
 'whatlinkshere'            => 'LinkujÄ…ce',
 'whatlinkshere-title'      => 'Strony linkujące do „$1�',
 'whatlinkshere-page'       => 'Strona',
-'linklistsub'              => '(Lista linków)',
 'linkshere'                => "Następujące strony odwołują się do '''[[:$1]]''':",
 'nolinkshere'              => "Żadna strona nie odwołuje się do '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Żadna strona nie odwołuje się do '''[[:$1]]''' w wybranej przestrzeni nazw.",
@@ -1939,7 +2142,7 @@ Podaj powód (np. umieszczając nazwy stron, na których dopuszczono się wandal
 ** Ataki na innych użytkowników
 ** Naruszenie praw autorskich
 ** Niedozwolona nazwa użytkownika
-** Open proxy/Tor
+** Open proxy lub Tor
 ** Spamowanie
 ** Usuwanie treści stron
 ** Wprowadzanie fałszywych informacji
@@ -1947,15 +2150,17 @@ Podaj powód (np. umieszczając nazwy stron, na których dopuszczono się wandal
 ** Wypisywanie bzdur na stronach',
 'ipbanononly'                     => 'Zablokuj tylko anonimowych użytkowników',
 'ipbcreateaccount'                => 'Zapobiegnij utworzeniu konta',
-'ipbemailban'                     => 'Zablokuj możliwość wysyłania e-maili',
+'ipbemailban'                     => 'Zablokuj możliwość wysyłania e-mailów',
 'ipbenableautoblock'              => 'Zablokuj ostatni adres IP tego użytkownika i automatycznie wszystkie kolejne, z których będzie próbował edytować',
 'ipbsubmit'                       => 'Zablokuj użytkownika',
-'ipbother'                        => 'Inny okres:',
+'ipbother'                        => 'Inny okres',
 'ipboptions'                      => '2 godziny:2 hours,1 dzień:1 day,3 dni:3 days,1 tydzień:1 week,2 tygodnie:2 weeks,1 miesiąc:1 month,3 miesiące:3 months,6 miesięcy:6 months,1 rok:1 year,na zawsze:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'inny',
-'ipbotherreason'                  => 'Inne/dodatkowe uzasadnienie:',
-'ipbhidename'                     => 'Ukryj nazwę użytkownika/adres IP w rejestrze blokad, na liście aktywnych blokad i liście użytkowników',
+'ipbotherreason'                  => 'Inne lub dodatkowe uzasadnienie',
+'ipbhidename'                     => 'Ukryj nazwę użytkownika (adres IP) w rejestrze blokad, na liście aktywnych blokad i liście użytkowników',
 'ipbwatchuser'                    => 'Obserwuj stronę osobistą i stronę dyskusji tego użytkownika',
+'ipballowusertalk'                => 'Pozwól temu użytkownikowi edytować własną stronę dyskusji, kiedy jest zablokowany',
+'ipb-change-block'                => 'Zmień ustawienia blokady',
 'badipaddress'                    => 'Niepoprawny adres IP',
 'blockipsuccesssub'               => 'Zablokowanie powiodło się',
 'blockipsuccesstext'              => 'Użytkownik [[Special:Contributions/$1|$1]] został zablokowany.<br />
@@ -1965,14 +2170,18 @@ Przejdź do [[Special:IPBlockList|listy zablokowanych adresów IP]], by przejrze
 'ipb-unblock'                     => 'Odblokuj użytkownika lub adres IP',
 'ipb-blocklist-addr'              => 'IstniejÄ…ce blokady dla $1',
 'ipb-blocklist'                   => 'Zobacz istniejÄ…ce blokady',
+'ipb-blocklist-contribs'          => 'Wkład $1',
 'unblockip'                       => 'Odblokuj użytkownika',
 'unblockiptext'                   => 'Użyj poniższego formularza, by przywrócić możliwość edycji z wcześniej zablokowanego adresu IP lub użytkownikowi.',
-'ipusubmit'                       => 'Odblokuj użytkownika',
+'ipusubmit'                       => 'Odblokuj',
 'unblocked'                       => '[[User:$1|$1]] został odblokowany.',
 'unblocked-id'                    => 'Blokada $1 została zdjęta',
 'ipblocklist'                     => 'Lista zablokowanych adresów IP i użytkowników',
 'ipblocklist-legend'              => 'Znajdź zablokowanego użytkownika',
 'ipblocklist-username'            => 'Nazwa użytkownika lub adres IP',
+'ipblocklist-sh-userblocks'       => '$1 blokady kont',
+'ipblocklist-sh-tempblocks'       => '$1 tymczasowe blokady',
+'ipblocklist-sh-addressblocks'    => '$1 blokady pojedynczych adresów IP',
 'ipblocklist-submit'              => 'Szukaj',
 'blocklistline'                   => '$1, $2 zablokował $3 ($4)',
 'infiniteblock'                   => 'na zawsze',
@@ -1981,15 +2190,19 @@ Przejdź do [[Special:IPBlockList|listy zablokowanych adresów IP]], by przejrze
 'noautoblockblock'                => 'automatyczne blokowanie wyłączone',
 'createaccountblock'              => 'blokada tworzenia kont',
 'emailblock'                      => 'zablokowany e-mail',
+'blocklist-nousertalk'            => 'nie mogą edytować własnych stron dyskusji',
 'ipblocklist-empty'               => 'Lista blokad jest pusta.',
 'ipblocklist-no-results'          => 'Podany adres IP lub użytkownik nie jest zablokowany.',
 'blocklink'                       => 'zablokuj',
 'unblocklink'                     => 'odblokuj',
+'change-blocklink'                => 'zmień blokadę',
 'contribslink'                    => 'wkład',
 'autoblocker'                     => 'Zablokowano Cię automatycznie, ponieważ używasz tego samego adresu IP, co użytkownik „[[User:$1|$1]]�.
 Przyczyna blokady $1 to: „$2�',
 'blocklogpage'                    => 'Historia blokad',
+'blocklog-fulllog'                => 'Pełny rejestr blokad',
 'blocklogentry'                   => 'zablokował [[$1]], czas blokady: $2 $3',
+'reblock-logentry'                => 'zmienił ustawienia blokady dla [[$1]], czas blokady: $2 $3',
 'blocklogtext'                    => 'Poniżej znajduje się lista blokad założonych i zdjętych z poszczególnych adresów IP.
 Na liście nie znajdą się adresy IP, które zablokowano w sposób automatyczny.
 By przejrzeć listę obecnie aktywnych blokad, przejdź na stronę [[Special:IPBlockList|zablokowanych adresów i użytkowników]].',
@@ -1998,13 +2211,16 @@ By przejrzeć listę obecnie aktywnych blokad, przejdź na stronę [[Special:IPB
 'block-log-flags-nocreate'        => 'blokada tworzenia konta',
 'block-log-flags-noautoblock'     => 'automatyczne blokowanie wyłączone',
 'block-log-flags-noemail'         => 'e-mail zablokowany',
+'block-log-flags-nousertalk'      => 'nie może edytować własnej strony dyskusji',
 'block-log-flags-angry-autoblock' => 'rozszerzone automatyczne blokowanie włączone',
 'range_block_disabled'            => 'Możliwość blokowania zakresu adresów IP została wyłączona.',
 'ipb_expiry_invalid'              => 'Błędny czas wygaśnięcia blokady.',
-'ipb_expiry_temp'                 => 'Ukrytą nazwę użytkownika należy zablokować trwale.',
+'ipb_expiry_temp'                 => 'Ukryte blokowanie nazwy użytkownika należy wykonać trwale.',
 'ipb_already_blocked'             => '„$1� jest już zablokowany',
+'ipb-needreblock'                 => '== IstniejÄ…ca blokada ==
+$1 jest już zablokowany. Czy chcesz zmienić ustawienia blokady?',
 'ipb_cant_unblock'                => 'Błąd: Blokada o ID $1 nie została znaleziona. Mogła ona zostać zdjęta wcześniej.',
-'ipb_blocked_as_range'            => 'Błąd: Adres IP $1 nie został zablokowany bezpośrednio i nie może zostać odblokowany.
+'ipb_blocked_as_range'            => 'Błąd – adres IP $1 nie został zablokowany bezpośrednio i nie może zostać odblokowany.
 Należy on do zablokowanego zakresu adresów $2. Odblokować można tylko cały zakres.',
 'ip_range_invalid'                => 'Niepoprawny zakres adresów IP.',
 'blockme'                         => 'Zablokuj mnie',
@@ -2016,6 +2232,7 @@ O tym poważnym problemie dotyczącym bezpieczeństwa należy poinformować dost
 'sorbsreason'                     => 'Twój adres IP znajduje się na liście serwerów open proxy w DNSBL, używanej przez {{GRAMMAR:B.lp|{{SITENAME}}}}.',
 'sorbs_create_account_reason'     => 'Twój adres IP znajduje się na liście serwerów open proxy w DNSBL, używanej przez {{GRAMMAR:B.lp|{{SITENAME}}}}.
 Nie możesz utworzyć konta',
+'cant-block-while-blocked'        => 'Nie możesz zablokować innych użytkowników, kiedy sam jesteś zablokowany.',
 
 # Developer tools
 'lockdb'              => 'Zablokuj bazÄ™ danych',
@@ -2038,9 +2255,9 @@ Blokowanie i odblokowywanie bazy danych, wymaga by plik mógł być zapisywany p
 'databasenotlocked'   => 'Baza danych nie jest zablokowana.',
 
 # Move page
-'move-page'               => 'PrzenieÅ› $1',
-'move-page-legend'        => 'Przeniesienie strony',
-'movepagetext'            => "Za pomocą poniższego formularza zmienisz nazwę strony, przenosząc jednocześnie jej historię.
+'move-page'                    => 'PrzenieÅ› $1',
+'move-page-legend'             => 'Przeniesienie strony',
+'movepagetext'                 => "Za pomocą poniższego formularza zmienisz nazwę strony, przenosząc jednocześnie jej historię.
 Pod starym tytułem zostanie umieszczona strona przekierowująca.
 Możesz automatycznie zaktualizować przekierowania wskazujące na tytuł przed zmianą.
 Jeśli nie wybierzesz tej opcji, upewnij się po przeniesieniu strony, czy nie powstały [[Special:DoubleRedirects|podwójne]] lub [[Special:BrokenRedirects|zerwane przekierowania]].
@@ -2052,50 +2269,62 @@ To oznacza, że błędną operację zmiany nazwy można bezpiecznie odwrócić,
 '''UWAGA!'''
 Może to być drastyczna lub nieprzewidywalna zmiana w przypadku popularnych stron.
 Upewnij siÄ™ co do konsekwencji tej operacji, zanim siÄ™ na niÄ… zdecydujesz.",
-'movepagetalktext'        => 'Powiązana strona dyskusji, jeśli istnieje, będzie przeniesiona automatycznie, chyba że:
+'movepagetalktext'             => 'Powiązana strona dyskusji, jeśli istnieje, będzie przeniesiona automatycznie, chyba że:
 *niepusta strona dyskusji już jest pod nową nazwą
 *usuniesz zaznaczenie z poniższego pola wyboru
 
 W takich przypadkach treść dyskusji można przenieść tylko ręcznie.',
-'movearticle'             => 'Przeniesienie strony',
-'movenotallowed'          => 'Nie masz uprawnień do przenoszenia stron.',
-'newtitle'                => 'Nowy tytuł',
-'move-watch'              => 'Obserwuj',
-'movepagebtn'             => 'PrzenieÅ› stronÄ™',
-'pagemovedsub'            => 'Przeniesienie powiodło się',
-'movepage-moved'          => "<big>'''Strona „$1� została przeniesiona do „$2�.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Strona o podanej nazwie już istnieje albo wybrana przez Ciebie nazwa nie jest poprawna.
+'movearticle'                  => 'Przeniesienie strony',
+'movenologin'                  => 'Nie jesteÅ› zalogowany',
+'movenologintext'              => 'Przenoszenie stron jest możliwe dopiero po zarejestrowaniu się i [[Special:UserLogin|zalogowaniu]].',
+'movenotallowed'               => 'Nie masz uprawnień do przenoszenia stron.',
+'movenotallowedfile'           => 'Nie masz uprawnień do przenoszenia plików.',
+'cant-move-user-page'          => 'Nie masz uprawnień do przenoszenia stron użytkowników (za wyjątkiem podstron).',
+'cant-move-to-user-page'       => 'Nie masz uprawnień do przenoszenia strony do strony użytkownika (za wyjątkiem podstron użytkownika).',
+'newtitle'                     => 'Nowy tytuł',
+'move-watch'                   => 'Obserwuj',
+'movepagebtn'                  => 'PrzenieÅ› stronÄ™',
+'pagemovedsub'                 => 'Przeniesienie powiodło się',
+'movepage-moved'               => "<big>'''„$1� została przeniesiona do „$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Zostało utworzone przekierowanie.',
+'movepage-moved-noredirect'    => 'Nie zostało utworzone przekierowanie.',
+'articleexists'                => 'Strona o podanej nazwie już istnieje albo wybrana przez Ciebie nazwa nie jest poprawna.
 Wybierz innÄ… nazwÄ™.',
-'cantmove-titleprotected' => 'Nie możesz przenieść strony, ponieważ nowa nazwa strony jest niedozwolona z powodu zabezpieczenia przed utworzeniem',
-'talkexists'              => "'''Strona zawartości została przeniesiona, natomiast strona dyskusji nie, ponieważ strona dyskusji o nowym tytule już istnieje. Połącz teksty obu dyskusji ręcznie.'''",
-'movedto'                 => 'przeniesiono do',
-'movetalk'                => 'Przenieś także stronę dyskusji, jeśli to możliwe.',
-'move-subpages'           => 'Jeśli to możliwe przenieś wszystkie podstrony',
-'move-talk-subpages'      => 'Jeśli to możliwe przenieś wszystkie strony dyskusji podstron',
-'movepage-page-exists'    => 'Strona $1 istnieje. Automatyczne nadpisanie nie jest możliwe.',
-'movepage-page-moved'     => 'Strona $1 została przeniesiona do $2.',
-'movepage-page-unmoved'   => 'Nazwa strony $1 nie może zostać zmieniona na $2.',
-'movepage-max-pages'      => 'Przeniesionych zostało $1 {{PLURAL:$1|strona|strony|stron}}. Większa liczba nie może być przeniesiona automatycznie.',
-'1movedto2'               => 'stronę [[$1]] przeniósł do [[$2]]',
-'1movedto2_redir'         => 'stronę [[$1]] przeniósł do [[$2]] nad przekierowaniem',
-'movelogpage'             => 'Przeniesione',
-'movelogpagetext'         => 'Lista stron, które ostatnio zostały przeniesione.',
-'movereason'              => 'Powód',
-'revertmove'              => 'cofnij',
-'delete_and_move'         => 'Usuń i przenieś',
-'delete_and_move_text'    => '== Przeniesienie wymaga usunięcia innej strony ==
+'cantmove-titleprotected'      => 'Nie możesz przenieść strony, ponieważ nowa nazwa strony jest niedozwolona z powodu zabezpieczenia przed utworzeniem',
+'talkexists'                   => "'''Strona treści została przeniesiona, natomiast strona dyskusji nie, ponieważ strona dyskusji o nowym tytule już istnieje. Połącz teksty obu dyskusji ręcznie.'''",
+'movedto'                      => 'przeniesiono do',
+'movetalk'                     => 'Przenieś także stronę dyskusji, jeśli to możliwe.',
+'move-subpages'                => 'Jeśli to możliwe przenieś wszystkie podstrony',
+'move-talk-subpages'           => 'Jeśli to możliwe przenieś wszystkie strony dyskusji podstron',
+'movepage-page-exists'         => 'Strona $1 istnieje. Automatyczne nadpisanie nie jest możliwe.',
+'movepage-page-moved'          => 'Strona $1 została przeniesiona do $2.',
+'movepage-page-unmoved'        => 'Nazwa strony $1 nie może zostać zmieniona na $2.',
+'movepage-max-pages'           => 'Przeniesionych zostało $1 {{PLURAL:$1|strona|strony|stron}}. Większa liczba nie może być przeniesiona automatycznie.',
+'1movedto2'                    => 'stronę [[$1]] przeniósł do [[$2]]',
+'1movedto2_redir'              => 'stronę [[$1]] przeniósł do [[$2]] nad przekierowaniem',
+'move-redirect-suppressed'     => 'nie utworzono przekierowania pod starym tytułem',
+'movelogpage'                  => 'Przeniesione',
+'movelogpagetext'              => 'Lista stron, które ostatnio zostały przeniesione.',
+'movereason'                   => 'Powód',
+'revertmove'                   => 'cofnij',
+'delete_and_move'              => 'Usuń i przenieś',
+'delete_and_move_text'         => '== Przeniesienie wymaga usunięcia innej strony ==
 Strona docelowa „[[:$1]]� istnieje.
 Czy chcesz ją usunąć, by zrobić miejsce dla przenoszonej strony?',
-'delete_and_move_confirm' => 'Tak, usuń stronę',
-'delete_and_move_reason'  => 'Usunięto, by zrobić miejsce dla przenoszonej strony',
-'selfmove'                => 'Nazwy stron źródłowej i docelowej są takie same.
+'delete_and_move_confirm'      => 'Tak, usuń stronę',
+'delete_and_move_reason'       => 'Usunięto, by zrobić miejsce dla przenoszonej strony',
+'selfmove'                     => 'Nazwy stron źródłowej i docelowej są takie same.
 Strony nie można przenieść na nią samą.',
-'immobile_namespace'      => 'Strona źródłowa lub strona docelowa są specjalnego typu.
-Nie można przenieść z lub do tej przestrzeni nazw.',
-'imagenocrossnamespace'   => 'Nie można przenieść grafiki do przestrzeni nazw nie przeznaczonej dla grafik',
-'imagetypemismatch'       => 'Nowe rozszerzenie nazwy pliku jest innego typu niż zawartość',
-'imageinvalidfilename'    => 'Nazwa pliku docelowego jest nieprawidłowa',
-'fix-double-redirects'    => 'Popraw przekierowania wskazujące na oryginalny tytuł strony',
+'immobile-source-namespace'    => 'Nie można przenieść stron w przestrzeni nazw „$1�',
+'immobile-target-namespace'    => 'Nie można przenieść stron do przestrzeni nazw „$1�',
+'immobile-target-namespace-iw' => 'Link interwiki jest nieprawidłowym tytułem, pod który miałaby być przeniesiona strona.',
+'immobile-source-page'         => 'Tej strony nie można przenieść.',
+'immobile-target-page'         => 'Nie można przenieść pod wskazany tytuł.',
+'imagenocrossnamespace'        => 'Nie można przenieść grafiki do przestrzeni nazw nie przeznaczonej dla grafik',
+'imagetypemismatch'            => 'Nowe rozszerzenie nazwy pliku jest innego typu niż zawartość',
+'imageinvalidfilename'         => 'Nazwa pliku docelowego jest nieprawidłowa',
+'fix-double-redirects'         => 'Popraw przekierowania wskazujące na oryginalny tytuł strony',
+'move-leave-redirect'          => 'Pozostaw przekierowanie pod dotychczasowym tytułem',
 
 # Export
 'export'            => 'Eksport stron',
@@ -2104,7 +2333,7 @@ Wyeksportowane informacje można później zaimportować do innej wiki, działaj
 
 Wyeksportowanie wielu stron wymaga wpisania poniżej tytułów stron po jednym tytule w wierszu oraz określenia, czy ma zostać wyeksportowana bieżąca czy wszystkie wersje strony z opisami edycji lub też tylko bieżąca wersja z opisem ostatniej edycji.
 
-Możesz również użyć linku, np. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] dla strony „[[{{MediaWiki:Mainpage}}]]�.',
+Możesz również użyć linku, np. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] dla strony „[[{{MediaWiki:Mainpage}}]]�.',
 'exportcuronly'     => 'Tylko bieżąca wersja, bez historii',
 'exportnohistory'   => "----
 '''Uwaga:''' Wyłączono możliwość eksportowania pełnej historii stron z użyciem tego narzędzia z powodu kłopotów z wydajnością.",
@@ -2120,9 +2349,9 @@ Możesz również użyć linku, np. [[{{ns:special}}:Export/{{MediaWiki:Mainpage
 'allmessagesdefault'        => 'Tekst domyślny',
 'allmessagescurrent'        => 'Tekst obecny',
 'allmessagestext'           => 'Lista wszystkich komunikatów systemowych dostępnych w przestrzeni nazw MediaWiki.
-Odwiedź [http://www.mediawiki.org/wiki/Localisation Tłumaczenie MediaWiki] oraz [http://translatewiki.net Betawiki], jeśli chcesz uczestniczyć w tłumaczeniu oprogramowania MediaWiki.',
+Odwiedź [http://www.mediawiki.org/wiki/Localisation Tłumaczenie MediaWiki] oraz [http://translatewiki.net translatewiki.net], jeśli chcesz uczestniczyć w tłumaczeniu oprogramowania MediaWiki.',
 'allmessagesnotsupportedDB' => "Ta strona nie może być użyta, ponieważ zmienna '''\$wgUseDatabaseMessages''' jest wyłączona.",
-'allmessagesfilter'         => 'Filtr nazw komunikatów:',
+'allmessagesfilter'         => 'Filtr nazw komunikatów',
 'allmessagesmodified'       => 'Pokaż tylko zmodyfikowane',
 
 # Thumbnails
@@ -2140,9 +2369,12 @@ Odwiedź [http://www.mediawiki.org/wiki/Localisation Tłumaczenie MediaWiki] ora
 'import-interwiki-text'      => 'Wybierz wiki i nazwÄ™ strony do importowania.
 Daty oraz nazwy autorów zostaną zachowane.
 Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rejestrze importu]].',
+'import-interwiki-source'    => 'Źródło wiki/strony:',
 'import-interwiki-history'   => 'Kopiuj całą historię edycji tej strony',
 'import-interwiki-submit'    => 'Importuj',
-'import-interwiki-namespace' => 'Docelowa przestrzeń nazw:',
+'import-interwiki-namespace' => 'Docelowa przestrzeń nazw',
+'import-upload-filename'     => 'Nazwa pliku',
+'import-comment'             => 'Komentarz',
 'importtext'                 => 'Używając narzędzia [[Special:Export|eksportu]], wyeksportuj plik ze źródłowej wiki, zapisz go na swoim dysku, a następnie prześlij go tutaj.',
 'importstart'                => 'Trwa importowanie stron...',
 'import-revision-count'      => '$1 {{PLURAL:$1|wersja|wersje|wersji}}',
@@ -2153,12 +2385,13 @@ Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rej
 'importbadinterwiki'         => 'Błędny link interwiki',
 'importnotext'               => 'Brak tekstu lub zawartości',
 'importsuccess'              => 'Import zakończony powodzeniem!',
-'importhistoryconflict'      => 'Wystąpił konflikt wersji (ta strona mogła zostać importowana już wcześniej)',
+'importhistoryconflict'      => 'Wystąpił konflikt wersji (ta strona mogła zostać zaimportowana już wcześniej)',
 'importnosources'            => 'Możliwość bezpośredniego importu historii została wyłączona, ponieważ nie zdefiniowano źródła.',
 'importnofile'               => 'Importowany plik nie został przesłany.',
 'importuploaderrorsize'      => 'Przesyłanie pliku importowanego zawiodło. Jest większy niż dopuszczalny rozmiar dla przesyłanych plików.',
 'importuploaderrorpartial'   => 'Przesyłanie pliku importowanego zawiodło. Został przesłany tylko częściowo.',
-'importuploaderrortemp'      => 'Przesyłanie pliku importowanego zawiodło. Brak katalogu na dla plików tymczasowych.',
+'importuploaderrortemp'      => 'Przesyłanie pliku importowanego zawiodło.
+Brak katalogu dla plików tymczasowych.',
 'import-parse-failure'       => 'nieudana analiza składni importowanego XML',
 'import-noarticle'           => 'Brak stron do zaimportowania!',
 'import-nonewrevisions'      => 'Wszystkie wersje zostały już wcześniej zaimportowane.',
@@ -2188,7 +2421,7 @@ Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rej
 'tooltip-pt-logout'               => 'Wyloguj',
 'tooltip-ca-talk'                 => 'Dyskusja o zawartości tej strony.',
 'tooltip-ca-edit'                 => 'Możesz edytować tę stronę. Przed zapisaniem zmian użyj przycisku podgląd.',
-'tooltip-ca-addsection'           => 'Dodaj swój komentarz do dyskusji.',
+'tooltip-ca-addsection'           => 'Dodaj nowy wÄ…tek.',
 'tooltip-ca-viewsource'           => 'Ta strona jest zabezpieczona. Możesz zobaczyć tekst źródłowy.',
 'tooltip-ca-history'              => 'Starsze wersje tej strony.',
 'tooltip-ca-protect'              => 'Zabezpiecz tÄ™ stronÄ™.',
@@ -2199,13 +2432,13 @@ Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rej
 'tooltip-ca-unwatch'              => 'Usuń tę stronę z listy obserwowanych',
 'tooltip-search'                  => 'Przeszukaj {{GRAMMAR:B.lp|{{SITENAME}}}}',
 'tooltip-search-go'               => 'Przejdź do strony o dokładnie takim tytule, o ile istnieje',
-'tooltip-search-fulltext'         => 'Szukaj wprowadzonego tekstu na stronach',
+'tooltip-search-fulltext'         => 'Szukaj wprowadzonego tekstu w treści stron',
 'tooltip-p-logo'                  => 'Strona główna',
 'tooltip-n-mainpage'              => 'Zobacz stronę główną',
 'tooltip-n-portal'                => 'O projekcie, co możesz zrobić, gdzie możesz znaleźć informacje',
 'tooltip-n-currentevents'         => 'Informacje o aktualnych wydarzeniach',
 'tooltip-n-recentchanges'         => 'Lista ostatnich zmian na {{GRAMMAR:D.lp|{{SITENAME}}}}.',
-'tooltip-n-randompage'            => 'Pokaż losowo wybraną stronę',
+'tooltip-n-randompage'            => 'Pokaż stronę wybraną losowo',
 'tooltip-n-help'                  => 'Tutaj możesz się wielu rzeczy dowiedzieć.',
 'tooltip-t-whatlinkshere'         => 'Pokaż listę wszystkich stron linkujących do tej strony',
 'tooltip-t-recentchangeslinked'   => 'Ostatnie zmiany w stronach, do których ta strona linkuje',
@@ -2217,9 +2450,9 @@ Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rej
 'tooltip-t-specialpages'          => 'Lista wszystkich specjalnych stron',
 'tooltip-t-print'                 => 'Wersja do wydruku',
 'tooltip-t-permalink'             => 'Stały link do tej wersji strony',
-'tooltip-ca-nstab-main'           => 'Zobacz stronę zawartości',
+'tooltip-ca-nstab-main'           => 'Zobacz stronę treści',
 'tooltip-ca-nstab-user'           => 'Zobacz stronę osobistą użytkownika',
-'tooltip-ca-nstab-media'          => 'Pokaż stronę pliku',
+'tooltip-ca-nstab-media'          => 'Zobacz stronÄ™ pliku',
 'tooltip-ca-nstab-special'        => 'To jest strona specjalna. Nie możesz jej edytować.',
 'tooltip-ca-nstab-project'        => 'Zobacz stronÄ™ projektu',
 'tooltip-ca-nstab-image'          => 'Zobacz stronÄ™ grafiki',
@@ -2235,14 +2468,33 @@ Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rej
 'tooltip-watch'                   => 'Dodaj tÄ™ stronÄ™ do listy obserwowanych',
 'tooltip-recreate'                => 'Utwórz stronę pomimo jej wcześniejszego usunięcia.',
 'tooltip-upload'                  => 'Rozpoczęcie przesyłania',
+'tooltip-rollback'                => '„cofnij� jednym kliknięciem wycofuje wszystkie zmiany tej strony wykonane przez ostatniego edytującego.',
+'tooltip-undo'                    => '„anuluj edycję� wycofuje tę edycję i otwiera okno edycji w trybie podglądu.
+Pozwala na wpisanie powodu w opisie zmian.',
 
 # Stylesheets
-'common.css'   => '/* Umieszczony tutaj kod CSS zostanie zastosowany we wszystkich skórkach */',
-'monobook.css' => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Monobook */',
+'common.css'      => '/* Umieszczony tutaj kod CSS zostanie zastosowany we wszystkich skórkach */',
+'standard.css'    => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Standardowa */',
+'nostalgia.css'   => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Tęsknota */',
+'cologneblue.css' => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Błękit */',
+'monobook.css'    => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Książka */',
+'myskin.css'      => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Moja skórka */',
+'chick.css'       => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Kurczaczek */',
+'simple.css'      => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Prosta */',
+'modern.css'      => '/* Umieszczony tutaj kod CSS wpłynie na wygląd skórki Nowoczesna */',
+'print.css'       => '/* Umieszczony tutaj kod CSS wpłynie na wygląd wydruku */',
+'handheld.css'    => '/* Umieszczony tutaj kod CSS wpłynie na wygląd na urządzeniach kieszonkowych skórki ustawionej w zmiennej $wgHandheldStyle */',
 
 # Scripts
-'common.js'   => '/* Umieszczony tutaj kod JavaScript zostanie załadowany przez każdego użytkownika, podczas każdego ładowania strony. */',
-'monobook.js' => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki MonoBook */',
+'common.js'      => '/* Umieszczony tutaj kod JavaScript zostanie załadowany przez każdego użytkownika, podczas każdego ładowania strony. */',
+'standard.js'    => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Standardowa */',
+'nostalgia.js'   => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Tęsknota */',
+'cologneblue.js' => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Błękit */',
+'monobook.js'    => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Książka */',
+'myskin.js'      => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Moja skórka */',
+'chick.js'       => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Kurczaczek */',
+'simple.js'      => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Prosta */',
+'modern.js'      => '/* Umieszczony tu kod JavaScript zostanie załadowany wyłącznie przez użytkowników korzystających ze skórki Nowoczesna */',
 
 # Metadata
 'nodublincore'      => 'Metadane zgodne z Dublin Core RDF zostały wyłączone dla tego serwera.',
@@ -2250,12 +2502,12 @@ Wszystkie operacje importu transwiki sÄ… odnotowywane w [[Special:Log/import|rej
 'notacceptable'     => 'Serwer wiki nie może dostarczyć danych w formacie, którego Twoja przeglądarka oczekuje.',
 
 # Attribution
-'anonymous'        => 'Anonimowi użytkownicy {{GRAMMAR:D.lp|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|Anonimowy użytkownik|Anonimowi użytkownicy}} {{GRAMMAR:D.lp|{{SITENAME}}}}',
 'siteuser'         => 'Użytkownik {{GRAMMAR:D.lp|{{SITENAME}}}} – $1',
 'lastmodifiedatby' => 'Ostatnia edycja tej strony: $2, $1 (autor zmian: $3)', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Inni autorzy: $1.',
 'others'           => 'inni',
-'siteusers'        => 'Użytkownicy {{GRAMMAR:D.lp|{{SITENAME}}}}: $1',
+'siteusers'        => '{{PLURAL:$2|Użytkownik|Użytkownicy}} {{GRAMMAR:D.lp|{{SITENAME}}}}: $1',
 'creditspage'      => 'Autorzy',
 'nocredits'        => 'Brak informacji o autorach tej strony.',
 
@@ -2276,6 +2528,16 @@ Najprawdopodobniej zostało to spowodowane przez link do zewnętrznej strony int
 'numauthors'     => 'Liczba autorów (strona zawartości): $1',
 'numtalkauthors' => 'Liczba autorów (strona dyskusji): $1',
 
+# Skin names
+'skinname-standard'    => 'Standardowa',
+'skinname-nostalgia'   => 'Tęsknota',
+'skinname-cologneblue' => 'Błękit',
+'skinname-monobook'    => 'Książka',
+'skinname-myskin'      => 'Moja skórka',
+'skinname-chick'       => 'Kurczaczek',
+'skinname-simple'      => 'Prosta',
+'skinname-modern'      => 'Nowoczesna',
+
 # Math options
 'mw_math_png'    => 'Zawsze generuj grafikÄ™ PNG',
 'mw_math_simple' => 'HTML dla prostych, dla pozostałych grafika PNG',
@@ -2286,20 +2548,22 @@ Najprawdopodobniej zostało to spowodowane przez link do zewnętrznej strony int
 
 # Patrolling
 'markaspatrolleddiff'                 => 'oznacz edycję jako „sprawdzoną�',
-'markaspatrolledtext'                 => 'Oznacz tę stronę jako „sprawdzony�',
+'markaspatrolledtext'                 => 'Oznacz tę stronę jako „sprawdzoną�',
 'markedaspatrolled'                   => 'Sprawdzone',
 'markedaspatrolledtext'               => 'Ta wersja została oznaczona jako „sprawdzona�.',
-'rcpatroldisabled'                    => 'Wyłączono funkcjonalność patrolowania na ostatnich zmianach',
+'rcpatroldisabled'                    => 'Wyłączono funkcjonalność patrolowania na stronie ostatnich zmian',
 'rcpatroldisabledtext'                => 'Patrolowanie ostatnich zmian jest obecnie wyłączone.',
 'markedaspatrollederror'              => 'Nie można oznaczyć jako „sprawdzone�',
 'markedaspatrollederrortext'          => 'Musisz wybrać wersję żeby oznaczyć ją jako „sprawdzoną�.',
 'markedaspatrollederror-noautopatrol' => 'Nie masz uprawnień wymaganych do oznaczania swoich edycji jako „sprawdzone�.',
 
 # Patrol log
-'patrol-log-page'   => 'Dziennik patrolowania',
-'patrol-log-header' => 'Poniżej znajduje się dziennik patrolowania stron.',
-'patrol-log-line'   => 'oznaczył wersję $1 hasła $2 jako sprawdzoną $3',
-'patrol-log-auto'   => '(automatycznie)',
+'patrol-log-page'      => 'Dziennik patrolowania',
+'patrol-log-header'    => 'Poniżej znajduje się dziennik patrolowania stron.',
+'patrol-log-line'      => 'oznaczył wersję $1 hasła $2 jako sprawdzoną $3',
+'patrol-log-auto'      => '(automatycznie)',
+'patrol-log-diff'      => 'wersja $1',
+'log-show-hide-patrol' => '$1 rejestr sprawdzania',
 
 # Image deletion
 'deletedrevision'                 => 'Usunięto poprzednie wersje $1',
@@ -2316,6 +2580,9 @@ $1',
 'previousdiff' => '� poprzednia edycja',
 'nextdiff'     => 'następna edycja →',
 
+# Visual comparison
+'visual-comparison' => 'Porównanie treści',
+
 # Media information
 'mediawarning'         => "'''Uwaga!''' Plik może zawierać złośliwy kod. Jeśli go otworzysz, możesz zarazić swój system.<hr />",
 'imagemaxsize'         => 'Na stronach opisu plików ogranicz rozmiar obrazków do',
@@ -2328,10 +2595,12 @@ $1',
 'show-big-image'       => 'Oryginalna rozdzielczość',
 'show-big-image-thumb' => '<small>Rozmiar podglądu: $1 × $2 pikseli</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Najnowsze pliki',
 'imagelisttext'         => "Poniżej na {{PLURAL:$1||posortowanej $2}} liście {{PLURAL:$1|znajduje|znajdują|znajduje}} się '''$1''' {{PLURAL:$1|plik|pliki|plików}}.",
 'newimages-summary'     => 'Na tej stronie specjalnej prezentowane są ostatnio przesłane pliki.',
+'newimages-legend'      => 'Filtruj',
+'newimages-label'       => 'Nazwa pliku (lub jej fragment)',
 'showhidebots'          => '($1 boty)',
 'noimages'              => 'Brak plików do pokazania.',
 'ilsubmit'              => 'Szukaj',
@@ -2388,7 +2657,7 @@ Pozostałe pola zostaną domyślnie ukryte.
 'exif-ycbcrcoefficients'           => 'Macierz współczynników transformacji barw z RGB na YCbCr',
 'exif-referenceblackwhite'         => 'Wartość punktu odniesienia czerni i bieli',
 'exif-datetime'                    => 'Data i czas modyfikacji pliku',
-'exif-imagedescription'            => 'Tytuł/opis obrazu',
+'exif-imagedescription'            => 'Tytuł lub opis obrazu',
 'exif-make'                        => 'Producent aparatu',
 'exif-model'                       => 'Model aparatu',
 'exif-software'                    => 'Użyte oprogramowanie',
@@ -2541,6 +2810,18 @@ Pozostałe pola zostaną domyślnie ukryte.
 'exif-lightsource-24'  => 'żarowe studyjne ISO',
 'exif-lightsource-255' => 'Inne źródło światła',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Bez błysku flesza',
+'exif-flash-fired-1'    => 'Z błyskiem flesza',
+'exif-flash-return-0'   => 'bez funkcji wykrywania światła odbitego',
+'exif-flash-return-2'   => 'nie wykryto światła odbitego',
+'exif-flash-return-3'   => 'wykryto światło odbite',
+'exif-flash-mode-1'     => 'wymuszony błysk flesza',
+'exif-flash-mode-2'     => 'wymuszony brak błysku flesza',
+'exif-flash-mode-3'     => 'tryb automatyczny',
+'exif-flash-function-1' => 'Brak funkcji flesza',
+'exif-flash-redeye-1'   => 'tryb redukcji efektu czerwonych oczu',
+
 'exif-focalplaneresolutionunit-2' => 'cale',
 
 'exif-sensingmethod-1' => 'niezdefiniowana',
@@ -2638,7 +2919,7 @@ Otwórz ten link w przeglądarce, czym potwierdzisz, że jesteś użytkownikiem
 'confirmemail_oncreate'    => 'Link z kodem potwierdzenia został wysłany na Twój adres e-mail.
 Kod ten nie jest wymagany do zalogowania się, jednak będziesz musiał go aktywować otwierając, otrzymany link, w przeglądarce przed włączeniem niektórych opcji e-mail na wiki.',
 'confirmemail_sendfailed'  => 'Nie udało się wysłać potwierdzającej wiadomości e-mail.
-Sprawdzić poprawność adresu.
+Sprawdź poprawność adresu pod kątem literówki.
 
 System pocztowy zwrócił komunikat: $1',
 'confirmemail_invalid'     => 'Błędny kod potwierdzenia.
@@ -2685,21 +2966,10 @@ Kod zawarty w linku straci ważność $4.',
 Czy na pewno chcesz ją ponownie utworzyć?",
 'recreate'            => 'Utwórz ponownie',
 
-# HTML dump
-'redirectingto' => 'Przekierowanie do [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Wyczyścić pamięć podręczną dla tej strony?
-
-$1',
 'confirm_purge_button' => 'Wyczyść',
-
-# AJAX search
-'searchcontaining' => "Szukaj artykułów zawierających ''$1''.",
-'searchnamed'      => "Szukaj artykułów nazywających się ''$1''.",
-'articletitles'    => "Artykuły o tytule rozpoczynającym się od ''$1''",
-'hideresults'      => 'Ukryj wyniki',
-'useajaxsearch'    => 'Użyj wyszukiwania AJAX',
+'confirm-purge-top'    => 'Wyczyścić pamięć podręczną dla tej strony?',
+'confirm-purge-bottom' => 'Odświeżenie strony wyczyści pamięć podręczną i wymusi pokazanie jej aktualnej wersji.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� poprzednia strona',
@@ -2722,7 +2992,7 @@ $1',
 'autosumm-blank'   => 'UWAGA! Usunięcie treści (strona pozostała pusta)!',
 'autosumm-replace' => 'UWAGA! Zastąpienie treści hasła bardzo krótkim tekstem: „$1�',
 'autoredircomment' => 'Przekierowanie do [[$1]]',
-'autosumm-new'     => 'Nowa strona: $1',
+'autosumm-new'     => 'Utworzył nową stronę „$1�',
 
 # Size units
 'size-kilobytes' => '$1 kB',
@@ -2768,16 +3038,24 @@ Możesz również [[Special:Watchlist/edit|użyć standardowego edytora]].',
 'iranian-calendar-m3'  => 'Chord�d',
 'iranian-calendar-m5'  => 'Mord�d',
 'iranian-calendar-m6'  => 'Szahriwar',
-'iranian-calendar-m7'  => 'Mehr',
 'iranian-calendar-m8'  => 'Āb�n',
 'iranian-calendar-m9'  => 'Ä€sar',
 'iranian-calendar-m10' => 'Déi',
-'iranian-calendar-m11' => 'Bahman',
-'iranian-calendar-m12' => 'Esfand',
+
+# Hijri month names
+'hijri-calendar-m3'  => 'Rabi al-awwal',
+'hijri-calendar-m4'  => 'Rabi al-achira',
+'hijri-calendar-m5'  => 'Dżumada al-ula',
+'hijri-calendar-m6'  => 'Dżumada al-achira',
+'hijri-calendar-m7'  => 'Radżab',
+'hijri-calendar-m8'  => 'Szaban',
+'hijri-calendar-m10' => 'Szawwal',
+'hijri-calendar-m11' => 'Zu al-kada',
+'hijri-calendar-m12' => 'Zu al-hidżdża',
 
 # Hebrew month names
 'hebrew-calendar-m1'      => 'Tiszri',
-'hebrew-calendar-m2'      => 'Heszwan',
+'hebrew-calendar-m2'      => 'Cheszwan',
 'hebrew-calendar-m3'      => 'Kislew',
 'hebrew-calendar-m4'      => 'Tewet',
 'hebrew-calendar-m5'      => 'Szewat',
@@ -2785,7 +3063,7 @@ Możesz również [[Special:Watchlist/edit|użyć standardowego edytora]].',
 'hebrew-calendar-m9'      => 'Siwan',
 'hebrew-calendar-m11'     => 'Aw',
 'hebrew-calendar-m1-gen'  => 'Tiszri',
-'hebrew-calendar-m2-gen'  => 'Heszwan',
+'hebrew-calendar-m2-gen'  => 'Cheszwan',
 'hebrew-calendar-m3-gen'  => 'Kislew',
 'hebrew-calendar-m4-gen'  => 'Tewet',
 'hebrew-calendar-m5-gen'  => 'Szewat',
@@ -2795,6 +3073,7 @@ Możesz również [[Special:Watchlist/edit|użyć standardowego edytora]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Nieznany znacznik rozszerzenia „$1�',
+'duplicate-defaultsort' => 'Uwaga: Domyślnym kluczem sortowania będzie „$2� i zastąpi on wcześniej wykorzystywany klucz „$1�.',
 
 # Special:Version
 'version'                          => 'Wersja oprogramowania', # Not used as normal message but as header for the special page itself
@@ -2824,13 +3103,13 @@ Możesz również [[Special:Watchlist/edit|użyć standardowego edytora]].',
 'filepath-summary' => 'Ta strona specjalna zwraca pełną ścieżkę do pliku.
 Grafiki są pokazywane w pełnej rozdzielczości, inne typy plików są otwierane w skojarzonym z nimi programie.
 
-Wpisz nazwę pliku bez prefiksu „{{ns:image}}:�.',
+Wpisz nazwę pliku bez prefiksu „{{ns:file}}:�.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Szukaj duplikatów pliku',
 'fileduplicatesearch-summary'  => 'Szukaj duplikatów pliku na podstawie wartości funkcji skrótu.
 
-Wpisz nazwę pliku z pominięciem prefiksu „{{ns:image}}:�.',
+Wpisz nazwę pliku z pominięciem prefiksu „{{ns:file}}:�.',
 'fileduplicatesearch-legend'   => 'Szukaj duplikatów pliku',
 'fileduplicatesearch-filename' => 'Nazwa pliku',
 'fileduplicatesearch-submit'   => 'Szukaj',
@@ -2854,10 +3133,19 @@ Wpisz nazwę pliku z pominięciem prefiksu „{{ns:image}}:�.',
 'specialpages-group-pagetools'   => 'Narzędzia stron',
 'specialpages-group-wiki'        => 'Informacje oraz narzędzia wiki',
 'specialpages-group-redirects'   => 'Specjalne strony przekierowujÄ…ce',
-'specialpages-group-spam'        => 'Narzędzia walki ze spamem',
+'specialpages-group-spam'        => 'Narzędzia do walki ze spamem',
 
 # Special:BlankPage
 'blankpage'              => 'Pusta strona',
 'intentionallyblankpage' => 'Ta strona umyślnie pozostała pusta',
 
+# External image whitelist
+'external_image_whitelist' => ' #Leave this line exactly as it is<pre>
+#Wstaw poniżej fragmenty wyrażeń regularnych (tylko to, co znajduje się między //)
+#Wyrażenia te zostaną dopasowane do URL-i zewnętrznych (bezpośrednio linkowanych) grafik
+#Dopasowane URL-e zostaną wyświetlone jako grafiki, w przeciwnym wypadku będzie pokazany jedynie link do grafiki
+#Linie zaczynajÄ…ce siÄ™ od # sÄ… traktowane jako komentarze
+
+#Put all regex fragments above this line. Leave this line exactly as it is</pre>',
+
 );
diff --git a/languages/messages/MessagesPms.php b/languages/messages/MessagesPms.php
index 8d88c3a4..47fd4187 100644
--- a/languages/messages/MessagesPms.php
+++ b/languages/messages/MessagesPms.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Ciaciarade',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Discussion_ant_sla_$1',
-	NS_IMAGE            => 'Figura',
-	NS_IMAGE_TALK       => 'Discussion_dla_figura',
+	NS_FILE             => 'Figura',
+	NS_FILE_TALK        => 'Discussion_dla_figura',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussion_dla_MediaWiki',
 	NS_TEMPLATE         => 'Stamp',
@@ -82,8 +82,6 @@ dj'artìcol ancó pa scrit",
 'underline-never'   => 'Mai',
 'underline-default' => 'Dòvra lë stàndard dël programma ëd navigassion (browser)',
 
-'skinpreview' => '(Preuva)',
-
 # Dates
 'sunday'        => 'Dumìnica',
 'monday'        => 'Lun-es',
@@ -177,7 +175,7 @@ dj'artìcol ancó pa scrit",
 'mytalk'         => 'Mie ciaciarade',
 'anontalk'       => "Ciaciarade për st'adrëssa IP-sì",
 'navigation'     => 'Navigassion',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadat:',
@@ -240,8 +238,6 @@ dj'artìcol ancó pa scrit",
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'A propòsit ëd {{SITENAME}}',
 'aboutpage'            => 'Project:A propòsit',
-'bugreports'           => 'Malfunsionament',
-'bugreportspage'       => 'Project:Malfonsionament',
 'copyright'            => 'Ël contnù a resta disponibil sota a na licensa $1.',
 'copyrightpagename'    => "Drit d'autor ëd {{SITENAME}}",
 'copyrightpage'        => "{{ns:project}}:Drit d'autor",
@@ -264,8 +260,6 @@ dj'artìcol ancó pa scrit",
 
 'badaccess'        => 'Përmess nen giust',
 'badaccess-group0' => "A l'ha pa ij përmess dont a fa dë manca për fé st'operassion-sì.",
-'badaccess-group1' => "Costa funsion-sì a l'é riservà a j'utent dla partìa $1.",
-'badaccess-group2' => "Costa funsion-sì a l'é riservà a j'utent dle partìe $1.",
 'badaccess-groups' => "Costa funsion-sì a l'é riservà a j'utent che a sio almanch ant un-a dle partìe: $1.",
 
 'versionrequired'     => 'A-i va për fòrsa la version $1 ëd MediaWiki',
@@ -350,7 +344,6 @@ L'aministrator che a l'ha blocala a l'ha lassà sto messagi-sì:
 'cannotdelete'         => "As peul pa scancelesse la pàgina, l'archivi ò la figura che a veul scancelé.",
 'badtitle'             => 'Tìtol nen giust',
 'badtitletext'         => "La pàgina che a l'ha ciamà a peul pa esse mostrà. A podrìa tratesse ëd na pàgina nen bon-a, veujda, ò pura a podrìa ëdcò esse n'eror ant n'anliura antra lenghe diferente ò tra diferente version ëd {{SITENAME}}.",
-'perfdisabled'         => "An dëspias, ma costa funsion a l'é nen disponibila ant j'ore ëd pì gran acess a la base dat, për nen ralenté l'acess dj'Utent!<br />Che a preuva torna antra 2 bot e 4 ore dòp mesdì (UTC).<br /><br />Mersì.",
 'perfcached'           => "Sòn a l'é stait memorisà an local e podrìa ëdcò nen esse agiornà:",
 'perfcachedts'         => "Lòn che a-j ven dapress a sossì a l'é pijait da 'nt na còpia local \"cache\" dla base dat. L'ùltim agiornament a l'é dël: \$1.",
 'querypage-no-updates' => "J'agiornament për sta pàgina-sì për adess a travajo nen. Ij dat ambelessì a saran nen rinfrescà.",
@@ -364,7 +357,7 @@ Query: $2',
 'protectedpagetext'    => "Sta pàgina-sì a l'è staita blocà për evité che a-j faso dle modìfiche.",
 'viewsourcetext'       => 'A peul vardé e copié la sorgiss dë sta pàgina:',
 'protectedinterface'   => "Costa pàgina-sì a l'ha andrinta un chèich-còs che a fa part d'antërfacia dël programa che a dòvro tùit; donca a l'é proteta për evité che a-i rivo dle ròbe brute.",
-'editinginterface'     => "'''Dosman!''' A l'é dapress ch'a-i travaja ansima a na pàgina ch'as dòvra për generé ël test dl'antërfacia dël programa. Le modìfiche fàite ambelessì a-j bogio l'antërfacia a tuti j'utent. Se sò but a l'é col ëd fé na tradussion, për piasì ch'a considerà la possibilità dë dovré [http://translatewiki.net/wiki/Main_Page?setlang=pms Betawiki], ël proget ëd localisassion ëd MediaWiki.",
+'editinginterface'     => "'''Dosman!''' A l'é dapress ch'a-i travaja ansima a na pàgina ch'as dòvra për generé ël test dl'antërfacia dël programa. Le modìfiche fàite ambelessì a-j bogio l'antërfacia a tuti j'utent. Se sò but a l'é col ëd fé na tradussion, për piasì ch'a considerà la possibilità dë dovré [http://translatewiki.net/wiki/Main_Page?setlang=pms translatewiki.net], ël proget ëd localisassion ëd MediaWiki.",
 'sqlhidden'            => "(l'anterogassion SQL a l'é stërmà)",
 'cascadeprotected'     => 'Ant sta pàgina-sì as peulo pa fé ëd modìfiche, përché a-i intra ant {{PLURAL:$1|la pàgina|le pàgine}} butà sot a protession con la fonsion "a tombé" viscà ansima a: $2',
 'namespaceprotected'   => "A l'ha nen ël përmess dë feje dle modìfiche a le pàgine dlë spassi nominal '''$1'''.",
@@ -385,8 +378,6 @@ A peul tiré anans a dovré {{SITENAME}} coma Utent anonim, ò pura a peul rintr
 'remembermypassword'         => "Vis-te mia ciav për vàire session (për podej felo a fa da manca che un a l'abia ij ''cookies'' abilità).",
 'yourdomainname'             => 'Sò domini',
 'externaldberror'            => "Ò che a l'é rivaje n'eror d'autenticassion esterna, ò pura a l'é chiel (chila) che a l'é nen autorisà a agiornesse sò cont estern.",
-'loginproblem'               => "<b>A l'é staje n'eror dëmentré che as provava a rintré ant ël sistema.</b><br />
-Che a preuva n'àutra vira, miraco che sta vira a andèissa mai bin!",
 'login'                      => 'Rintré ant ël sistema',
 'nav-login-createaccount'    => 'rintré ant ël sistema',
 'loginprompt'                => 'Che a varda mach che a venta avej ij cookies abilità për podej rintré an {{SITENAME}}.',
@@ -449,7 +440,7 @@ Anans che qualsëssìa àutr messagi ëd pòsta a ven-a mandà a 's cont-sì, a
 'emailauthenticated'         => "Soa adrëssa ëd pòsta eletrònica a l'é staita autenticà ël $1.",
 'emailnotauthenticated'      => "Soa adrëssa ëd pòsta eletrònica a l'é ancó pa staita autenticà.
 Da qualsëssìa ëd coste funsion a sarà mandà gnun messagi fin che chiel (chila) a s'auténtica nen.",
-'noemailprefs'               => "<strong>Che a specìfica n'adrëssa ëd pòsta eletrònica se a veul dovré coste funsion-sì.</strong>",
+'noemailprefs'               => "Che a specìfica n'adrëssa ëd pòsta eletrònica se a veul dovré coste funsion-sì.",
 'emailconfirmlink'           => 'Che an conferma sa adrëssa ëd pòsta eletrònica',
 'invalidemailaddress'        => "Costa adrëssa ëd pòsta eletrònica-sì as peul nen pijesse përchè a l'ha na forma nen bon-a.
 Për piasì che a buta n'adrëssa scrita giusta ò che a lassa ël camp veujd.",
@@ -466,11 +457,13 @@ Se sòn a l\'é rivà për eror, a peul lassé sté e fe gnente sensa problema.'
 'resetpass_announce'      => "A l'é rintrà ant ël sistema con na ciav provisòria mandà via për pòsta eletrònica. Për podej finì la procedura a l'ha da butesse na ciav neuva ambelessì:",
 'resetpass_text'          => '<!-- Gionté dël test ambelessì -->',
 'resetpass_header'        => 'Buta ël valor për sòlit',
+'oldpassword'             => 'Veja ciav',
+'newpassword'             => 'Neuva ciav',
+'retypenew'               => 'Che a scriva torna soa neuva ciav',
 'resetpass_submit'        => 'Registra la ciav e rintra ant ël sistema',
 'resetpass_success'       => "Soa ciav a l'é staita registrà sensa problema. I soma dapress a rintré ant ël sistema...",
 'resetpass_bad_temporary' => "Ciav provisòria nen bon-a. A peul esse che a l'abia già cambiasse soa ciav, ò pura che a l'abia ciamà na ciav provisòria neuva.",
 'resetpass_forbidden'     => 'An {{SITENAME}} le ciav as peulo pa cambiesse.',
-'resetpass_missing'       => "Ël mòdulo a l'avìa gnun dat andrinta (ò pura a son përdusse për la stra).",
 
 # Edit page toolbar
 'bold_sample'     => 'Test an grassèt',
@@ -495,8 +488,8 @@ Se sòn a l\'é rivà për eror, a peul lassé sté e fe gnente sensa problema.'
 'hr_tip'          => 'Riga orisontal (da dovresse nen tròp soèns)',
 
 # Edit pages
-'summary'                   => 'Somari',
-'subject'                   => 'Sogèt',
+'summary'                   => 'Somari:',
+'subject'                   => 'Sogèt:',
 'minoredit'                 => "Costa-sì a l'è na modìfica cita",
 'watchthis'                 => "Ten sot euj st'artìcol-sì",
 'savearticle'               => 'Salva sta pàgina',
@@ -508,8 +501,8 @@ Se sòn a l\'é rivà për eror, a peul lassé sté e fe gnente sensa problema.'
 'missingsummary'            => "'''Nòta:''' a l'ha pa butà gnun somari dla modìfica. Se a sgnaca Salva n'àutra vira, soa modìfica a resterà salvà sensa pa ëd somari.",
 'missingcommenttext'        => 'Për piasì che a buta un coment ambelessì sota.',
 'missingcommentheader'      => "'''A l'euj!:''' ës coment-sì a l'é sensa intestassion. Se a sgnaca torna \"Salva sta pàgina\" soa modìfica a sarà salvà sensa gnun-a intestassion.",
-'summary-preview'           => "Preuva dl'oget",
-'subject-preview'           => "Preuva d'oget/intestassion",
+'summary-preview'           => "Preuva dl'oget:",
+'subject-preview'           => "Preuva d'oget/intestassion:",
 'blockedtitle'              => "Belavans cost ëstranòm-sì a resta col ëd n'utent che a l'é stait disabilità a fé 'd modìfiche a j'articoj.",
 'blockedtext'               => "<big>'''Sò stranòm ò pura adrëssa IP a l'é stait blocà.'''</big>
 
@@ -555,24 +548,24 @@ Sò nùmer ëd blòch a l'é \$5. Për piasì, ës nùmer-sì ch'a lo buta sempe
 *'''IE:''' che a ten-a sgnacà ''Ctrl'' antramentr che a sgnaca col rat ansima a ''Refresh'', ò pura che a sgnaca tut ansema ''Ctrl-F5'';
 *'''Konqueror:''': a basta mach sgnaché ël boton ''Reload'', ò pura sgnaché ''F5'';
 *'''Opera''' j'utent a peulo avej da manca dë veujdé 'd continùo soa memorisassion (cache) andrinta a ''Tools&rarr;Preferences''.",
-'usercssjsyoucanpreview'    => "<strong>Drita:</strong> che a dòvra ël boton 'Mostra na preuva' për controlé l'efet ëd sò còdes CSS/JS anans che salvelo.",
+'usercssjsyoucanpreview'    => "'''Drita:''' che a dòvra ël boton 'Mostra na preuva' për controlé l'efet ëd sò còdes CSS/JS anans che salvelo.",
 'usercsspreview'            => "'''Che a varda che a lòn che a s-ciàira a l'é nomach na preuva ëd sò CSS, che salvà a resta ancó nen!'''",
 'userjspreview'             => "'''Che as visa che a l'é mach antramentr che as fa na preuva ëd sò Javascript, che a l'é ancó pa stait salvà!'''",
 'userinvalidcssjstitle'     => "'''Avis:''' A-i é pa gnun-a facia \"\$1\". Che as visa che le pàgine .css e .js che un as fa daspërchiel a dòvro tute minùscole për tìtol, pr'esempi {{ns:user}}:Scaramacaj/monobook.css nopà che {{ns:user}}:Scaramacaj/Monobook.css.",
 'updated'                   => '(Agiornà)',
-'note'                      => '<strong>NÃ’TA:</strong>',
-'previewnote'               => "<strong>Che a ten-a mach present che costa-sì a l'é nomach na PREUVA, e che soa version a l'é ancó pa staita salvà!</strong>",
+'note'                      => "'''NÃ’TA:'''",
+'previewnote'               => "'''Che a ten-a mach present che costa-sì a l'é nomach na PREUVA, e che soa version a l'é ancó pa staita salvà!'''",
 'previewconflict'           => "Costa preuva a-j mostra ël test dl'articol ambelessì dzora. Se a sërn dë salvelo, a l'é parej che a lo s-ciaireran ëdcò tuti j'àutri Utent.",
-'session_fail_preview'      => "<strong>Darmagi! I l'oma pa podù processé soa modìfica per via che a son përdusse për la stra ij dat ëd session.
-Për piasì che a preuva n'àutra vira. Se a dovèissa mai torna riveje sossì, che a preuva a seurte dal sistema e peuj torna a rintré.</strong>",
-'session_fail_preview_html' => "<strong>Darmagi! I l'oma nen podù processé soa modìfica ën essend che a son përdusse për la stra ij dat ëd session.</strong>
+'session_fail_preview'      => "'''Darmagi! I l'oma pa podù processé soa modìfica per via che a son përdusse për la stra ij dat ëd session.
+Për piasì che a preuva n'àutra vira. Se a dovèissa mai torna riveje sossì, che a preuva a seurte dal sistema e peuj torna a rintré.'''",
+'session_fail_preview_html' => "'''Darmagi! I l'oma nen podù processé soa modìfica ën essend che a son përdusse për la stra ij dat ëd session.'''
 
 ''Për via che {{SITENAME}} a lassa mostré còdes HTML nen filtrà, la preuva a ven ëstarmà coma precaussion contra a dij possibij atach fait an Javascript.''
 
-<strong>Se sòn a l'èra na modìfica normal, për piasì che a preuva a fela n'àutra vira. Se a dovèissa mai torna deje dle gran-e, che a preuva a seurte da 'nt ël sistema e peuj torna a rintré.</strong>",
-'token_suffix_mismatch'     => "<strong>Soa modìfica a l'é nen staita acetà përché sò navigator a l'hai fait ciadel con ij pont e le vìrgole
+'''Se sòn a l'èra na modìfica normal, për piasì che a preuva a fela n'àutra vira. Se a dovèissa mai torna deje dle gran-e, che a preuva a seurte da 'nt ël sistema e peuj torna a rintré.'''",
+'token_suffix_mismatch'     => "'''Soa modìfica a l'é nen staita acetà përché sò navigator a l'hai fait ciadel con ij pont e le vìrgole
 ant ël quàder ëd modìfica. La rason che a l'é nen stait acetà a l'r për evité ch'a-i fasa darmagi al
-test ch'a-i é già. Sossì dle vire a riva quand un a dòvra un programa proxy ëd coj un pòch dla Bajòna.</strong>",
+test ch'a-i é già. Sossì dle vire a riva quand un a dòvra un programa proxy ëd coj un pòch dla Bajòna.'''",
 'editing'                   => 'Modìfica ëd $1',
 'editingsection'            => 'I soma dapress a modifiché $1 (session)',
 'editingcomment'            => 'I soma dapress a modifiché $1 (coment)',
@@ -583,31 +576,31 @@ test ch'a-i é già. Sossì dle vire a riva quand un a dòvra un programa proxy
 <b>Mach</b> ël test ant ël quàder dë dzora a sarà salvà, ën sgnacand ël boton \"Salva\".<br />",
 'yourtext'                  => 'Sò test',
 'storedversion'             => 'Version memorisà',
-'nonunicodebrowser'         => "<strong>A L'EUJ! Sò programa ëd navigassion (browser) a travaja pa giust con lë stàndard unicode. I soma obligà a dovré dij truschin përchè a peula salvesse sò artìcoj sensa problema: ij caràter che a son nen ASCII a jë s-ciairerà ant ël quàder ëd modìfica test coma còdes esadecimaj.</strong>",
-'editingold'                => "<strong>CHE A FASA MACH ATENSION: che a sta fasend-je dle modìfiche a na version nen agiornà dl'artìcol.<br />
-Se a la salva parej, lòn che a l'era stait fait dapress a sta revision-sì as përderà d'autut.</strong>",
+'nonunicodebrowser'         => "'''A L'EUJ! Sò programa ëd navigassion (browser) a travaja pa giust con lë stàndard unicode. I soma obligà a dovré dij truschin përchè a peula salvesse sò artìcoj sensa problema: ij caràter che a son nen ASCII a jë s-ciairerà ant ël quàder ëd modìfica test coma còdes esadecimaj.'''",
+'editingold'                => "'''CHE A FASA MACH ATENSION: che a sta fasend-je dle modìfiche a na version nen agiornà dl'artìcol.<br />
+Se a la salva parej, lòn che a l'era stait fait dapress a sta revision-sì as përderà d'autut.'''",
 'yourdiff'                  => 'Diferense',
 'copyrightwarning'          => "Che a ten-a për piasì present che tute le contribussion a {{SITENAME}} as considero daite sota a na licensa ëd la sòrt $2 (che a varda $1 për avej pì 'd detaj).
 Se a veul nen che sò test a peula esse modificà e distribuì da qualsëssìa person-a sensa gnun-a limitassion ëd gnun-a sòrt, che a lo buta pa ansima a {{SITENAME}}, ma pitòst che as lo pùblica ansima a un sò sit personal.<br />
 Ën mandand ës test-sì chiel (chila) as fa garant sota soa responsabilità che ël test a l'ha scrivusslo despërchiel (daspërchila) coma original, ò pura che a l'ha tracopialo da na sorgiss ëd pùblich domini, ò da n'àutra sorgiss dla midema sòrt, ò pura che chiel (chila) a l'ha arseivù autorisassion scrita a dovré sto test e che sòn a peul dimostrelo.<br />
-<strong>DOVRÉ PA MAI DËL MATERIAL COERTÀ DA DRIT D'AUTOR (c) SENSA AVEJ N'AUTORISASSION SCRITA PËR FELO!!!</strong>",
+'''DOVRÉ PA MAI DËL MATERIAL COERTÀ DA DRIT D'AUTOR (c) SENSA AVEJ N'AUTORISASSION SCRITA PËR FELO!!!'''",
 'copyrightwarning2'         => "Për piasì, che a ten-a present che tute le contribussion a {{SITENAME}} a peulo esse modificà ò scancelà da dj'àutri contributor. Se a veul nen che lòn che a scriv a ven-a modificà sensa limitassion ëd gnun-a sòrt, che a lo manda nen ambelessì.<br />
 Ant l'istess temp, ën mandand dël material un as pija la responsabilità dë dì che a l'ha scrivusslo daspërchiel (ò daspërchila), ò pura che a l'ha copialo da na sorgiss ëd domini pùblich, ò pura da 'nt n'àutra sorgiss dla midema sòrt (che a varda $1 për avej pì d'anformassion).
-<strong>CHE A MANDA PA DËL MATERIAL COERTÀ DA DRIT D'AUTOR SENSA AVEJ AVÙ ËL PËRMESS SCRIT DË FELO!</strong>",
-'longpagewarning'           => "<strong>CHE A TEN-A PRESENT!: Sta pàgina-sì a l'é longa $1 kb; chèich
+'''CHE A MANDA PA DËL MATERIAL COERTÀ DA DRIT D'AUTOR SENSA AVEJ AVÙ ËL PËRMESS SCRIT DË FELO!'''",
+'longpagewarning'           => "'''CHE A TEN-A PRESENT!: Sta pàgina-sì a l'é longa $1 kb; chèich
 programa ëd navigassion a podrìa avej dle gran-e a modifiché dle pàgine che a-j rivo a brus
 ò pura a passo ij 32 kb.
-Për piasì che a varda se a-i fussa mai la possibilità dë divide sto paginon an vàire tòch pì cit.</strong>",
-'longpageerror'             => "<strong>EROR: Ël test che a l'ha mandà a l'é longh $1 kb, che a resta pì che ël
+Për piasì che a varda se a-i fussa mai la possibilità dë divide sto paginon an vàire tòch pì cit.'''",
+'longpageerror'             => "'''EROR: Ël test che a l'ha mandà a l'é longh $1 kb, che a resta pì che ël
 lìmit màssim ëd $2 kb. Parej as peul nen salvesse. A venta che a në fasa vàire
-pàgine diferente për rintré ant ij lìmit tècnich.</strong>",
-'readonlywarning'           => "<strong>AVIS: La base dat a l'é staita blocà për manutension,
+pàgine diferente për rintré ant ij lìmit tècnich.'''",
+'readonlywarning'           => "'''AVIS: La base dat a l'é staita blocà për manutension,
 e donca a peudrà pa salvesse soe modìfiche tut sùbit. A peul esse che
-a-j ven-a còmod copiesse via sò test e butesslo da na part për salvelo peuj.</strong>",
-'protectedpagewarning'      => "<strong>AVIS: costa pàgina-sì a l'é staita blocà an manera che mach j'utent con la qualìfica da aministrator a peulo feje dle modìfiche.</strong>",
+a-j ven-a còmod copiesse via sò test e butesslo da na part për salvelo peuj.'''",
+'protectedpagewarning'      => "'''AVIS: costa pàgina-sì a l'é staita blocà an manera che mach j'utent con la qualìfica da aministrator a peulo feje dle modìfiche.'''",
 'semiprotectedpagewarning'  => "'''Nòta:'''costa pàgina-sì a l'é staita protegiùa an manera che mach j'utent registrà a peulo modifichela.",
 'cascadeprotectedwarning'   => "'''Tension:''' sta pàgina-sì a l'è staita blocà an manera che mach j'utent con la qualìfica da aministrator a peulo modifichela, për via che {{PLURAL:\$1|a l'é proteta|a-i intra ant le pàgine protete}} col sistema \"a cascada\":",
-'titleprotectedwarning'     => "<strong>DOSMAN: sta pàgina-sì a l'é protegiùa an manera che mach chèich utent a peul creéla.</strong>",
+'titleprotectedwarning'     => "'''DOSMAN: sta pàgina-sì a l'é protegiùa an manera che mach chèich utent a peul creéla.'''",
 'templatesused'             => 'Stamp dovrà dzora a sta pàgina-sì:',
 'templatesusedpreview'      => 'Stamp dovrà ant sta preuva-sì:',
 'templatesusedsection'      => 'Stamp dovrà ant sta session-sì:',
@@ -640,12 +633,9 @@ La rason butà da $3 për ël blocagi a l'é staita: ''$2''",
 # History pages
 'viewpagelogs'        => 'Smon ij registr dë sta pàgina-sì',
 'nohistory'           => "La stòria dle version dë sta pàgina-sì a l'é pa trovasse.",
-'revnotfound'         => 'Version nen trovà',
-'revnotfoundtext'     => "La version prima dl'artìcol che a l'ha ciamà a l'é pa staita trovà.
-Che as controla për piasì l'adrëssa (URL) che a l'ha dovrà për rivé a sta pàgina-sì.",
 'currentrev'          => "Versione dël dì d'ancheuj",
 'revisionasof'        => 'Revision $1',
-'revision-info'       => 'Revision al $1; $2',
+'revision-info'       => 'Revision al $1; $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Version pì veja',
 'nextrevision'        => 'Revision pì neuve→',
 'currentrevisionlink' => 'vardé la version corenta',
@@ -762,6 +752,7 @@ Ch'a varda mach che a-i ven-a nen fòra rabel ant la continuità stòrica.",
 'prevn'                 => 'ij $1 prima',
 'nextn'                 => 'ij $1 peuj',
 'viewprevnext'          => 'Che a varda ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Agiut',
 'search-result-size'    => '$1 ({{PLURAL:$2|un|$2}} mòt)',
 'search-result-score'   => 'Arlevansa: $1%',
 'search-redirect'       => '(ridiression $1)',
@@ -792,6 +783,7 @@ për podej specifiché ij sò gust.',
 'qbsettings-floatingright' => 'Flotant a la man drita',
 'changepassword'           => 'Cambia ciav',
 'skin'                     => 'Facia',
+'skin-preview'             => 'Preuva',
 'math'                     => 'Fòrmule ëd matemàtica',
 'dateformat'               => 'Forma dla data',
 'datedefault'              => "franch l'istess",
@@ -813,9 +805,6 @@ për podej specifiché ij sò gust.',
 'prefs-misc'               => 'Sòn e lòn',
 'saveprefs'                => 'Salvé ij sò gust',
 'resetprefs'               => 'Buta torna ij "mè gust" coma a-i ero al prinsipi',
-'oldpassword'              => 'Veja ciav',
-'newpassword'              => 'Neuva ciav',
-'retypenew'                => 'Che a scriva torna soa neuva ciav',
 'textboxsize'              => 'Amzure dël quàder ëd modìfica dël test',
 'rows'                     => 'Righe',
 'columns'                  => 'Colòne',
@@ -923,7 +912,7 @@ për podej carié dj'archivi.",
 'uploadtext'                  => "'''DOSMAN!''' Anans che carié dla ròba ansima a {{SITENAME}}, che a sia motobin sigur d'avej bin lesù e capì
 [[{{MediaWiki:Policy-url}}|ël regolament ëd {{SITENAME}} ansima al dovré dle figure]].
 
-Për vardé ò pura sërché figure già carià ant sla {{SITENAME}}, che a vada ant sla [[Special:ImageList|lista dle figure]].
+Për vardé ò pura sërché figure già carià ant sla {{SITENAME}}, che a vada ant sla [[Special:FileList|lista dle figure]].
 Lòn che as caria e së scancela a resta marcà ant ël [[Special:Log/upload|registr dij càrich]].
 
 Che a dòvra ël mòdulo ambelessì sota për carié neuv archivi con figure da dovré për fé pì bej e bin spiegà ij sò artìcoj.
@@ -971,20 +960,20 @@ Che a ten-a present che tan-me për tuti ij contnù ëd la {{SITENAME}}, qualsë
 'emptyfile'                   => "L'archivi che a l'ha pen-a carià a smija veujd.
 Sòn a podrìa esse rivà përchè che chiel a l'ha scrivù mal ël nòm dl'archivi midem.
 Për piasì che a contròla se a l'é pro cost l'archivi che a veul carié.",
-'fileexists'                  => "N'archivi con ës nòm-sì a-i é già, për piasì che as contròla <strong><tt>$1</tt></strong> se a l'é pa sigur dë volej cangelo.",
-'filepageexists'              => "La pàgina ëd descrission për st'archivi-sì a l'é già stàita creà an <strong><tt>$1</tt></strong>, mach ch'a-i é pa gnun archivi ch'as ciama parej. Lòn ch'a buta për somari as ës-ciairerà nen ant la pàgina ëd descrission. Për podej buté sò somari a l'ha da modifichesse la pàgina a man",
+'fileexists'                  => "N'archivi con ës nòm-sì a-i é già, për piasì che as contròla '''<tt>$1</tt>''' se a l'é pa sigur dë volej cangelo.",
+'filepageexists'              => "La pàgina ëd descrission për st'archivi-sì a l'é già stàita creà an '''<tt>$1</tt>''', mach ch'a-i é pa gnun archivi ch'as ciama parej. Lòn ch'a buta për somari as ës-ciairerà nen ant la pàgina ëd descrission. Për podej buté sò somari a l'ha da modifichesse la pàgina a man",
 'fileexists-extension'        => "N'archivi con ës nòm-s a-i é già:<br />
-Nòm dl'archivi ch'as carìa: <strong><tt>$1</tt></strong><br />
-Nòm dl'archivi ch'a-i é già: <strong><tt>$2</tt></strong><br />
+Nòm dl'archivi ch'as carìa: '''<tt>$1</tt>'''<br />
+Nòm dl'archivi ch'a-i é già: '''<tt>$2</tt>'''<br />
 Për piasì, ch'a serna un nòm diferent.",
 'fileexists-thumb'            => "<center>'''Figura ch'a-i é'''</center>",
-'fileexists-thumbnail-yes'    => "L'archivi a-j ëmsija a na <i>figurin-a</i>. Për piasì, ch'a contròla l'archivi <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "L'archivi a-j ëmsija a na ''figurin-a''. Për piasì, ch'a contròla l'archivi '''<tt>$1</tt>'''.<br />
 S'a l'é la midema figura a amzura pijn-a, a veul dì ch'a fa nen dë manca dë carié na figurin-a.",
-'file-thumbnail-no'           => "Ël nòm dl'archivi as anandia con <strong><tt>$1</tt></strong>. A-j ësmija a na <i>figurin-a</i>.
+'file-thumbnail-no'           => "Ël nòm dl'archivi as anandia con '''<tt>$1</tt>'''. A-j ësmija a na ''figurin-a''.
 Se a l'ha na figura a amzura pijn-a a l'é mej ch'a carìa cola-lì, dësnò ch'a-j cangia nòm a l'archivi, për piasì.",
-'fileexists-forbidden'        => "Belavans n'archivi con ës nòm-sì a-i é già, donca ël nòm as peul pa pì dovresse; për piasì che a torna andré e che as caria sò archivi con un nòm diferent. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Belavans n'archivi con ës nòm-sì a-i é già, donca ël nòm as peul pa pì dovresse; për piasì che a torna andré e che as caria sò archivi con un nòm diferent. [[File:$1|thumb|center|$1]]",
 'fileexists-shared-forbidden' => "Belavans n'archivi con ës nòm-sì ant la diretriss dj'archivi condivis a-i é già, donca ël nòm as peul pa pì dovresse; për piasì che a torna andré e che as caria sò archivi con un nòm diferent.
-[[Image:$1|thumb|center|$1]]",
+[[File:$1|thumb|center|$1]]",
 'successfulupload'            => 'Carià complet',
 'uploadwarning'               => 'Avis che i soma dapress a carié',
 'savefile'                    => "Salva l'archivi",
@@ -1003,7 +992,7 @@ Se a l'ha na figura a amzura pijn-a a l'é mej ch'a carìa cola-lì, dësnò ch'
 
 Për piasì, ch'a contròla s'a val la pen-a dë felo.
 Për soa comodità, ambelessì a-i son ij dat dla scancelament:",
-'filename-bad-prefix'         => "Ël nòm dl'archivi ch'a l'é dapress a carié as anandia për <strong>\"\$1\"</strong>, ch'a l'é un nòm sensa sust, për sòlit butà-lì n'aotomàtich da le màchine fotogràfiche digitaj, basta ch'a-i në sia un. Për piasì, ch'a-j daga a sò archivi un nòm ch'a disa lòn ch'a l'é.",
+'filename-bad-prefix'         => "Ël nòm dl'archivi ch'a l'é dapress a carié as anandia për '''\"\$1\"''', ch'a l'é un nòm sensa sust, për sòlit butà-lì n'aotomàtich da le màchine fotogràfiche digitaj, basta ch'a-i në sia un. Për piasì, ch'a-j daga a sò archivi un nòm ch'a disa lòn ch'a l'é.",
 'filename-prefix-blacklist'   => " #<!-- ch'a lassa sta riga-sì tanme ch'a l'é --> <pre>
 # La sintassi a l'é:
 #   * Tut lòn ch'a-i ven dapress al segn \"#\" fin a la fin dla riga a resta mach un coment
@@ -1038,20 +1027,20 @@ PICT # vàire marche diferente
 'upload_source_url'  => "  (n'anliura bon-a e che as peula dovresse)",
 'upload_source_file' => " (n'archivi da sò calcolator)",
 
-# Special:ImageList
-'imagelist-summary'     => "Sta pàgina special-sì a la smon tuti j'archivi ch'a ëstàit carià.
+# Special:ListFiles
+'listfiles-summary'     => "Sta pàgina special-sì a la smon tuti j'archivi ch'a ëstàit carià.
 Për sòlit j'ùltim carià a resto an sima.
 Ch'a-i bata 'n colp col rat ansima a j'antestassion dle colòne për cangé órdin.",
-'imagelist_search_for'  => "Arsërca për nòm d'archivi multimojen:",
+'listfiles_search_for'  => "Arsërca për nòm d'archivi multimojen:",
 'imgfile'               => 'archivi',
-'imagelist'             => 'Lista dle figure',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nòm',
-'imagelist_user'        => 'Utent',
-'imagelist_size'        => 'Amzura an byte',
-'imagelist_description' => 'Descrission',
-
-# Image description page
+'listfiles'             => 'Lista dle figure',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nòm',
+'listfiles_user'        => 'Utent',
+'listfiles_size'        => 'Amzura an byte',
+'listfiles_description' => 'Descrission',
+
+# File description page
 'filehist'                  => "Stòria dl'archivi",
 'filehist-help'             => "Ch'a-i daga un colp col rat ant sna cobia data/ora për ës-ciairé coma restèissa l'archivi ant col moment-là.",
 'filehist-deleteall'        => 'dëscancelé tut',
@@ -1096,7 +1085,6 @@ Ch'a-i bata 'n colp col rat ansima a j'antestassion dle colòne për cangé órd
 'filedelete-success-old'      => "<span class=\"plainlinks\">A l'é dëscancelasse la version dël \$3, \$2 ëd l'archivi '''[[Media:\$1|\$1]]'''.</span>",
 'filedelete-nofile'           => "A-i é pa gnun archivi ch'as ciama: $1",
 'filedelete-nofile-old'       => "A-i é pa gnun-a version parej ëd l'archivi '''$1'''",
-'filedelete-iscurrent'        => "A l'é antramentr ch'as preuva a scancelé la version pì giovna dl'archivi. Për piasì, anans dë fé sòn, ch'a arpija andaré na version pì veja, an manera che costa-sì a la resta pì nen corenta.",
 'filedelete-otherreason'      => 'Rason àutra/adissional:',
 'filedelete-reason-otherlist' => 'Àutra rason',
 'filedelete-reason-dropdown'  => "*Për sòlit la ròba ës ëscancela për
@@ -1130,22 +1118,9 @@ Ch'a-i bata 'n colp col rat ansima a j'antestassion dle colòne për cangé órd
 'randomredirect-nopages' => 'A-i é pa gnun-a ridiression ant stë spassi nominal-sì.',
 
 # Statistics
-'statistics'             => 'Statìstiche',
-'sitestats'              => 'Statìstiche dël sit',
-'userstats'              => 'Statìstiche ëd {{SITENAME}}',
-'sitestatstext'          => "A-i é la blëssa ëd {{PLURAL:\$1|na pàgina|'''\$1'''pàgine totaj}} ant la base dat.
-Ës nùmer-sì a ciapa andrinta le pàgine ëd ciaciarada, cole ansima a {{SITENAME}}, artìcoj curt (che ant ël parlé técnich dla wiki as ciamo \"sbòss\"), ardiression, e àutre pàgine ch'a l'é belfé ch'a sio pa dj'artìcoj.
-Gavà coste, a {{PLURAL:\$2|resta na pàgina ch'a l'ha|resto '''\$2''' pàgine ch'a l'han}} tuta l'ària d'esse {{PLURAL:\$2|n'artìcol|dj'artìcoj}} da bon.
-
-'''\$8''' archivi a {{PLURAL:\$8|l'é|son}} stàit carià.
-
-Da che la wiki a l'é duvèrta, i l'oma avù 'n total {{PLURAL:\$3|d'un-a pàgina|ëd '''\$3''' pàgine}} consultà e ëd {{PLURAL:\$4|na modìfica|'''\$4''' modìfiche}} a j'artìcoj.
-Coma valor mojen i l'oma <b>\$5</b> modìfiche për artìcol, e minca artìcol a l'é stait lesù <b>\$6</b> vire për modìfica.
-
-Ant la [http://www.mediawiki.org/wiki/Manual:Job_queue coa] a-i {{PLURAL:\$7|é|son}} '''\$7''' process.",
-'userstatstext'          => "A-i {{PLURAL:$1|é '''1''' |son '''$1'''}} utent registrà, dont
-'''$2''' (visadì ël '''$4%''') a l'{{PLURAL:$2|ha|han}} la qualìfica da $5.",
-'statistics-mostpopular' => "Pàgine ch'a 'ncontro dë pì",
+'statistics'              => 'Statìstiche',
+'statistics-header-users' => 'Statìstiche ëd {{SITENAME}}',
+'statistics-mostpopular'  => "Pàgine ch'a 'ncontro dë pì",
 
 'disambiguations'      => 'Pàgine për la gestion dij sinònim',
 'disambiguationspage'  => 'Template:Gestion dij sinònim',
@@ -1227,8 +1202,6 @@ Vira riga a l'ha andrinta j'anliure a la prima e a la sconda rediression, ant sÃ
 'speciallogtitlelabel' => 'Tìtol:',
 'log'                  => 'Registr',
 'all-logs-page'        => 'Tuti ij registr',
-'log-search-legend'    => 'Sërchè ant ij registr',
-'log-search-submit'    => 'Va',
 'alllogstext'          => "Son a mostra na combinassion dij registr ëd lòn che a l'é cariasse, scancelasse, blocasse e ëd lòn che a l'han fait j'aministrator.
 A peul sern-se n'arsultà pì strèit ën selessionand na sòrt ëd registr sola, un nòm Utent ò pura la pàgina che a-j anteressa.",
 'logempty'             => 'Pa gnun element parej che a sia trovasse ant ij registr.',
@@ -1256,11 +1229,29 @@ A peul sern-se n'arsultà pì strèit ën selessionand na sòrt ëd registr sola
 'special-categories-sort-count' => 'ordiné për nùmer',
 'special-categories-sort-abc'   => 'òrdiné për alfabétich',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Modìfiche faite da utent scancelà',
+
+# Special:LinkSearch
+'linksearch'       => "Sërchè antra j'anliure dla Ragnà",
+'linksearch-pat'   => "Schema d'arsërca:",
+'linksearch-ns'    => 'Spassi nominal:',
+'linksearch-ok'    => 'Sërca',
+'linksearch-text'  => 'As peulo dovresse dij ciapatut coma "*.wikipedia.org".<br />Protocòj ch\'as peulo dovré: <tt>$1</tt>',
+'linksearch-line'  => "$1 a l'ha n'anliura ch'a-i riva dzora da $2",
+'linksearch-error' => 'Ij ciapatut as peulo butesse mach an prinsipi dël nòm dël servent.',
+
 # Special:ListUsers
 'listusersfrom'      => "Smon-me j'utent a parte da:",
 'listusers-submit'   => 'Smon',
 'listusers-noresult' => 'Pa gnun utent parej.',
 
+# Special:Log/newusers
+'newuserlogpage'           => "Registr dla creassion dj'utent",
+'newuserlogpagetext'       => "Sossì a l'é un registr andova ch'as marco le creassion dj'utent.",
+'newuserlog-create-entry'  => 'Neuv utent',
+'newuserlog-create2-entry' => 'Cont doertà për $1',
+
 # E-mail user
 'mailnologin'     => 'A-i é pa gnun-a adrëssa për mandé ël messagi',
 'mailnologintext' => "A dev [[Special:UserLogin|rintré ant ël sistema]]
@@ -1315,12 +1306,6 @@ Se a vorèissa mai gavé st'articol-sì da 'nt la lista dij ''Sot Euj'', che a s
 'iteminvalidname'      => "Problema con l'element '$1', nòm nen vàlid...",
 'wlnote'               => "Ambelessì sota a-i {{PLURAL:$1|é l'ùltima modìfica|son j'ùltime '''$1''' modìfiche}} ant {{PLURAL:$2|l'ùltima ora|j'ùltime '''$2''' ore}}.",
 'wlshowlast'           => "Most-me j'ùltime $1 ore $2 dì $3",
-'watchlist-show-bots'  => 'Smon ëdcò ël travaj dij trigomiro',
-'watchlist-hide-bots'  => 'Stërma ël travaj dij trigomiro',
-'watchlist-show-own'   => 'Smon mie modìfiche',
-'watchlist-hide-own'   => 'Stërma mie modìfiche',
-'watchlist-show-minor' => 'Smon le modìfiche cite',
-'watchlist-hide-minor' => 'Stërma le modìfiche cite',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Sot euj...',
@@ -1360,50 +1345,54 @@ Për cangé ij setagi ëd lòn che as ten sot euj che a vada ansima a
 Për fé dle comunicassion ëd servissi e avej pì d\'agiut:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Scancela pàgina',
-'confirm'                     => 'Conferma',
-'excontent'                   => "Ël contnù a l'era: '$1'",
-'excontentauthor'             => "ël contnù a l'era: '$1' (e l'ùnich contributor a l'era stait '$2')",
-'exbeforeblank'               => "Anans d'esse dësvojdà ël contnù a l'era: '$1'",
-'exblank'                     => "La pàgina a l'era veujda",
-'delete-confirm'              => 'Scancela "$1"',
-'delete-legend'               => 'Scancela',
-'historywarning'              => "Avis: la pàgina che a l'é antramentr che a scancela a l'ha na stòria:",
-'confirmdeletetext'           => "A sta për scancelé d'autut da 'nt la base dat na pàgina ò pura na figura, ansema a tuta soa cronologìa.<p>
+# Delete
+'deletepage'             => 'Scancela pàgina',
+'confirm'                => 'Conferma',
+'excontent'              => "Ël contnù a l'era: '$1'",
+'excontentauthor'        => "ël contnù a l'era: '$1' (e l'ùnich contributor a l'era stait '$2')",
+'exbeforeblank'          => "Anans d'esse dësvojdà ël contnù a l'era: '$1'",
+'exblank'                => "La pàgina a l'era veujda",
+'delete-confirm'         => 'Scancela "$1"',
+'delete-legend'          => 'Scancela',
+'historywarning'         => "Avis: la pàgina che a l'é antramentr che a scancela a l'ha na stòria:",
+'confirmdeletetext'      => "A sta për scancelé d'autut da 'nt la base dat na pàgina ò pura na figura, ansema a tuta soa cronologìa.<p>
 Për piasì, che an conferma che sòn a l'é da bon sò but, che a as rend cont ëd le conseguense ëd lòn che a fa, e che sòn a resta an pien an régola con lòn che a l'é stabilì ant la [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Travaj fait e finì',
-'deletedtext'                 => 'La pàgina "<nowiki>$1</nowiki>" a l\'é staita scancelà.
+'actioncomplete'         => 'Travaj fait e finì',
+'deletedtext'            => 'La pàgina "<nowiki>$1</nowiki>" a l\'é staita scancelà.
 Che a varda $2 për na lista dle pàgine scancelà ant j\'ùltim temp.',
-'deletedarticle'              => 'Scancelà "$1"',
-'dellogpage'                  => 'Registr djë scancelament',
-'dellogpagetext'              => "Ambelessì sota na lista dle pàgine scancelà ant j'ùltim temp.
+'deletedarticle'         => 'Scancelà "$1"',
+'dellogpage'             => 'Registr djë scancelament',
+'dellogpagetext'         => "Ambelessì sota na lista dle pàgine scancelà ant j'ùltim temp.
 Ij temp a son conforma a l'ora dël server.",
-'deletionlog'                 => 'Registr djë scancelament',
-'reverted'                    => 'Version prima butà torna sù',
-'deletecomment'               => 'Rason dlë scancelament:',
-'deleteotherreason'           => 'Rason àutra/adissional:',
-'deletereasonotherlist'       => 'Àutra rason',
-'deletereason-dropdown'       => "*Rason sòlite ch'as ëscancela la ròba
+'deletionlog'            => 'Registr djë scancelament',
+'reverted'               => 'Version prima butà torna sù',
+'deletecomment'          => 'Rason dlë scancelament:',
+'deleteotherreason'      => 'Rason àutra/adissional:',
+'deletereasonotherlist'  => 'Àutra rason',
+'deletereason-dropdown'  => "*Rason sòlite ch'as ëscancela la ròba
 ** a lo ciama l'àutor
 ** violassion dij drit d'autor
 ** vanadalism",
-'delete-edit-reasonlist'      => 'Modifiché la rason dlë scancelament',
-'delete-toobig'               => "Sta pàgina-sì a l'ha na stòria motobin longa, bele pì che $1 revision. Lë scancelassion ëd pàgine parej a l'é stàita limità për evité ch'as fasa darmagi për eror a {{SITENAME}}.",
-'delete-warning-toobig'       => "Sta pàgina-sì a l'ha na stòria motobin longa, bele pì che $1 revision. A scancelela as peul fesse darmagi a j'operassion dla base dat ëd {{SITENAME}}; ch'a fasa euj a lòn ch'a fa.",
-'rollback'                    => 'Dòvra na revision pì veja',
-'rollback_short'              => 'Ripristinè',
-'rollbacklink'                => "ripristiné j'archivi",
-'rollbackfailed'              => "A l'é pa podusse ripristiné",
-'cantrollback'                => "As peul pa tornesse a na version pì veja: l'ùltima modìfica a l'ha fala l'ùnich utent che a l'abia travajà a cost artìcol-sì.",
-'alreadyrolled'               => "As peulo pa anulé j'Ultime modìfiche ëd [[:$1]]
+'delete-edit-reasonlist' => 'Modifiché la rason dlë scancelament',
+'delete-toobig'          => "Sta pàgina-sì a l'ha na stòria motobin longa, bele pì che $1 revision. Lë scancelassion ëd pàgine parej a l'é stàita limità për evité ch'as fasa darmagi për eror a {{SITENAME}}.",
+'delete-warning-toobig'  => "Sta pàgina-sì a l'ha na stòria motobin longa, bele pì che $1 revision. A scancelela as peul fesse darmagi a j'operassion dla base dat ëd {{SITENAME}}; ch'a fasa euj a lòn ch'a fa.",
+
+# Rollback
+'rollback'         => 'Dòvra na revision pì veja',
+'rollback_short'   => 'Ripristinè',
+'rollbacklink'     => "ripristiné j'archivi",
+'rollbackfailed'   => "A l'é pa podusse ripristiné",
+'cantrollback'     => "As peul pa tornesse a na version pì veja: l'ùltima modìfica a l'ha fala l'ùnich utent che a l'abia travajà a cost artìcol-sì.",
+'alreadyrolled'    => "As peulo pa anulé j'Ultime modìfiche ëd [[:$1]]
 faite da [[User:$2|$2]] ([[User talk:$2|Talk]]); Cheidun d'àutr a l'ha già modificà ò pura anulà le modìfiche a sta pàgina-sì.
 
 L'ùltima modìfica a l'é staita faita da [[User:$3|$3]] ([[User talk:$3|Talk]]).",
-'editcomment'                 => 'Ël coment dla modìfica a l\'era: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "Gavà via le modìfiche dl'utent [[Special:Contributions/$2|$2]] ([[User_talk:$2|Talk]]); ël contnù a l'é stait tirà andarè a l'ùltima version dl'utent [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "Modìfiche anulà da $1; tirà andré a l'ùltima version da $2.",
-'sessionfailure'              => "A-i son ëstaje dle gran-e con la session che a identìfica sò acess; ël sistema a l'ha nen eseguì l'ordin che a l'ha daje për precaussion. Che a torna andaré a la pàgina prima con ël boton \"andaré\" ëd sò programa ëd navigassion (browser), peuj che as carìa n'àutra vira costa pàgina-sì e che a preuva torna a fé lòn che vorìa fé.",
+'editcomment'      => "Ël coment dla modìfica a l'era: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => "Gavà via le modìfiche dl'utent [[Special:Contributions/$2|$2]] ([[User_talk:$2|Talk]]); ël contnù a l'é stait tirà andarè a l'ùltima version dl'utent [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "Modìfiche anulà da $1; tirà andré a l'ùltima version da $2.",
+'sessionfailure'   => "A-i son ëstaje dle gran-e con la session che a identìfica sò acess; ël sistema a l'ha nen eseguì l'ordin che a l'ha daje për precaussion. Che a torna andaré a la pàgina prima con ël boton \"andaré\" ëd sò programa ëd navigassion (browser), peuj che as carìa n'àutra vira costa pàgina-sì e che a preuva torna a fé lòn che vorìa fé.",
+
+# Protect
 'protectlogpage'              => 'Registr dle protession',
 'protectlogtext'              => "Ambelessì sota a-i é na lista d'event ëd protession e dësprotession ëd pàgine.
 Ch'a varda la [[Special:ProtectedPages|Lista dle pàgine protegiùe]] për ës-ciairé le protession corente.",
@@ -1411,18 +1400,19 @@ Ch'a varda la [[Special:ProtectedPages|Lista dle pàgine protegiùe]] për ës-c
 'modifiedarticleprotection'   => 'A l\'é cambia-ie ël livel ëd protession për "[[$1]]"',
 'unprotectedarticle'          => 'Dësprotegiù "[[$1]]"',
 'protect-title'               => 'I soma antramentr che i protegioma "$1"',
+'prot_1movedto2'              => '[[$1]] Tramudà a [[$2]]',
 'protect-legend'              => 'Che an conferma la protession',
 'protectcomment'              => 'Motiv dla protession',
 'protectexpiry'               => 'Scadensa:',
 'protect_expiry_invalid'      => 'Scadensa pa bon-a.',
 'protect_expiry_old'          => 'Scadensa già passà.',
 'protect-unchain'             => 'Dësbloché ij permess ëd tramudé dla ròba',
-'protect-text'                => 'Ambelessì a peul vardé e cangé ël livel ëd protession dla pàgina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => "Un a peul pa modifiché ij livel ëd protession antramentr ch'a l'é blocà chiel. Ambelessì a-i son le regolassion corente për la pàgina <strong>$1</strong>:",
+'protect-text'                => "Ambelessì a peul vardé e cangé ël livel ëd protession dla pàgina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Un a peul pa modifiché ij livel ëd protession antramentr ch'a l'é blocà chiel. Ambelessì a-i son le regolassion corente për la pàgina '''$1''':",
 'protect-locked-dblock'       => "Ij livej ëd protession as peulo nen cambiesse antramentr che la base dat a l'é blocà.
-Ambelessì a-i son le regolassion corente për la pàgina <strong>$1</strong>:",
+Ambelessì a-i son le regolassion corente për la pàgina '''$1''':",
 'protect-locked-access'       => "Sò cont a l'ha pa la qualìfica për podej cambié ij livej ëd protession.
-Ambelessì a-i son le regolassion corente për la pàgina <strong>$1</strong>:",
+Ambelessì a-i son le regolassion corente për la pàgina '''$1''':",
 'protect-cascadeon'           => "Sta pàgina për adess a l'é blocà përchè a-i intra an {{PLURAL:$1|la pàgina sì sota, ch'a l'ha|le pàgine sì sota, ch'a l'han}} na protession a sàut avisca. A peul cambie-je sò livel ëd protession a sta pàgina-sì ma lòn a tochërà pa la protession a sàut.",
 'protect-default'             => '(stàndard)',
 'protect-fallback'            => 'A-i va ël përmess "$1"',
@@ -1518,7 +1508,6 @@ $1",
 'whatlinkshere'       => "Pàgine con dj'anliure che a men-o a costa-sì",
 'whatlinkshere-title' => "Pàgine ch'a men-o a $1",
 'whatlinkshere-page'  => 'Pàgina:',
-'linklistsub'         => "(Lista d'anliure)",
 'linkshere'           => "Le pàgine sì sota a l'han andrinta dj'anliure che a men-o a '''[[:$1]]''':",
 'nolinkshere'         => "A-i é pa gnun-a pàgina che a l'abia dj'anliure che a men-o a '''[[:$1]]'''.",
 'nolinkshere-ns'      => "An stë spassi nominal-sì a-i è pa gnun-a pagina con dj'anliure ch'a men-o a '''[[:$1]]'''.",
@@ -1659,6 +1648,9 @@ Se a l'ha dij dùbit, che a contata pura n'aministrator për ciameje 'd consej."
 *a l'ha deselessionà ël quadrèt ëd conferma ambelessì sota.
 Ant costi cas-sì, se a chërd dë felo, a-j farà da manca dë tramudesse la pàgina ëd discussion daspërchiel, a man.",
 'movearticle'             => "Cang-je nòm a l'artìcol",
+'movenologin'             => "Che a varda che chiel (chila) a l'è pa rintrà ant ël sistema",
+'movenologintext'         => "A venta esse n'Utent registrà e esse [[Special:UserLogin|rintrà ant ël sistema]]
+për podej tramudé na pàgina.",
 'movenotallowed'          => "A l'ha pa ij përmess dont a fa da manca për tramudé pàgine.",
 'newtitle'                => 'Neuv tìtol ëd',
 'move-watch'              => 'Ten sot euj sta pàgina-sì',
@@ -1683,7 +1675,6 @@ L\'artìcol ëd destinassion "[[:$1]]" a-i é già. Veul-lo scancelelo për avej
 'delete_and_move_confirm' => 'É, scancela la pàgina',
 'delete_and_move_reason'  => "Scancelà për liberé ël pòst për tramudene n'àutra",
 'selfmove'                => "Tìtol neuv e tìtol vej a resto midem antra lor; as peul pa tramudesse na pàgina butand-la andoa che a l'é già.",
-'immobile_namespace'      => "Belavans ël tìtol ëd destinassion a l'é ëd na sòrt riservà; as peulo pa tramudé dle pàgine anvers a col ëspassi nominal-lì.",
 
 # Export
 'export'            => 'Esporté dle pàgine',
@@ -1695,7 +1686,7 @@ Për esporté le pàgine, che a së scriva ij tìtoj ant ël quàder ambelessì
 e che as serna se a veul la version corenta ansema a cole veje, con le righe che conto la stòria dla pàgina,
 ò pura mach l'anformassion ant sël quand che a sia staje l'ùltima modìfica.
 
-Se costa ùltima possibilità a fussa lòn che a-j serv, a podrìa ëdcò dovré n'anliura, pr'esempi [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] për la pàgina \"[[{{MediaWiki:Mainpage}}]]\".",
+Se costa ùltima possibilità a fussa lòn che a-j serv, a podrìa ëdcò dovré n'anliura, pr'esempi [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] për la pàgina \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Ciapa sù mach la version corenta, pa tuta la stòria',
 'exportnohistory'   => "----
 '''Nòta:''' la possibilità d'esporté la stòria completa dle pàgine a l'é staita gavà për dle question corelà a le prestassion dël sistema.",
@@ -1733,6 +1724,7 @@ Tute le amportassion antra wiki diferente a resto marcà ant ël [[Special:Log/i
 'import-interwiki-history'   => 'Còpia tute le version stòriche dë sta pàgina-sì',
 'import-interwiki-submit'    => 'Amporté',
 'import-interwiki-namespace' => 'Tramuda ste pàgine-sì ant lë spassi nominal:',
+'import-comment'             => 'Oget:',
 'importtext'                 => "Për piasì, che as espòrta l'archivi da 'nt la sorgiss wiki esterna ën dovrand l'utiss  Special:Esportassion, che as lo salva ansima a sò disch e peui che a lo caria ambelessì.",
 'importstart'                => 'I soma antramentr che amportoma le pàgine...',
 'import-revision-count'      => '{{PLURAL:$1|Na|$1}} revision',
@@ -1915,7 +1907,7 @@ $1",
 'show-big-image'       => 'Version a amzura pijn-a',
 'show-big-image-thumb' => '<small>Amzure dë sta figurin-a: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerìa ëd figure e son neuv',
 'imagelisttext'         => "Ambelessì sota a-i é {{PLURAL:$1|l'ùnica figura che a-i sia|na lista ëd '''$1''' figure, ordinà për $2}}.",
 'newimages-summary'     => "Sta pàgina special-sì a la smon j'ùltim archivi carià.",
@@ -2278,21 +2270,9 @@ $1
 Për piasì, che an conferma che da bon a veul torna creélo.",
 'recreate'            => "Créa n'àutra vira",
 
-# HTML dump
-'redirectingto' => 'I soma antramentr che i foma na ridiression a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Veujdé la memorisassion dë sta pàgina-sì?
-
-$1',
 'confirm_purge_button' => 'Va bin',
-
-# AJAX search
-'searchcontaining' => "Sërca le vos che a l'han andrinta ''$1''.",
-'searchnamed'      => "Sërca le vos che a l'han për tìtol ''$1''.",
-'articletitles'    => "Artìcoj che as anandio për ''$1''",
-'hideresults'      => "Stërma j'arsultà",
-'useajaxsearch'    => "Dovré l'arsërca AJAX",
+'confirm-purge-top'    => 'Veujdé la memorisassion dë sta pàgina-sì?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pàgina andré',
@@ -2404,13 +2384,13 @@ a podrìo ëdcò nen ess-ie ant sta lista -sì.",
 'filepath-summary' => "Sta pàgina special-sì a la smon ël përcors complet për rive-ie a n'archivi.
 Le figure as ësmon-o a amzura pijn-a, j'àotre sòrt d'archivi a ven-o faite parte da sò programa a pòsta.
 
-Ch'a buta mach ël nòm dl'archivi sensa pa ël prefiss \"{{ns:image}}:\".",
+Ch'a buta mach ël nòm dl'archivi sensa pa ël prefiss \"{{ns:file}}:\".",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => "Arsërca dj'archivi dobi",
 'fileduplicatesearch-summary'  => "Arsërca dj'archivi dobi a parte dal valor d'ordinament.
 
-Ch'a bata 'l nòm dl'archivi sensa pa bute-ie 'l prefiss \"{{ns:image}}:\".",
+Ch'a bata 'l nòm dl'archivi sensa pa bute-ie 'l prefiss \"{{ns:file}}:\".",
 'fileduplicatesearch-legend'   => 'Arsërca ëd na dobia',
 'fileduplicatesearch-filename' => "Nòm dl'archivi:",
 'fileduplicatesearch-submit'   => 'Arsërca',
diff --git a/languages/messages/MessagesPnb.php b/languages/messages/MessagesPnb.php
index d25fb1ea..e249bda9 100644
--- a/languages/messages/MessagesPnb.php
+++ b/languages/messages/MessagesPnb.php
@@ -29,8 +29,6 @@ $messages = array(
 'underline-always' => '�میش�',
 'underline-never'  => 'کدی وی نئیں',
 
-'skinpreview' => '(وکھاؤ)',
-
 # Dates
 'sunday'        => 'اتوار',
 'monday'        => 'پیر',
@@ -107,7 +105,6 @@ $messages = array(
 'mytalk'         => 'میریاں گلاں',
 'anontalk'       => 'اس آئی پی آسطے گل کرو',
 'navigation'     => 'تلاش',
-'and'            => 'تے',
 
 # Metadata in edit box
 'metadata_help' => 'میٹا ڈیٹا:',
@@ -166,8 +163,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'بارے چ {{SITENAME}}',
 'aboutpage'            => 'Project:بارے وچ',
-'bugreports'           => 'بگ رپورٹ',
-'bugreportspage'       => 'Project:بگ رپورٹس',
 'copyrightpage'        => '{{ns:project}}:نقل دے حق',
 'currentevents'        => 'اج کل دے واقعات',
 'currentevents-url'    => 'Project:اج کل دے واقعات',
@@ -194,6 +189,8 @@ $messages = array(
 'editsection'         => 'Ù„Ú©Ú¾Ùˆ',
 'editold'             => 'Ù„Ú©Ú¾Ùˆ',
 'viewsourceold'       => 'لکھیا ویکھو',
+'editlink'            => 'Ù„Ú©Ú¾Ùˆ',
+'viewsourcelink'      => 'لکھائی وکھاؤ',
 'editsectionhint'     => 'حص� لکھو: $1',
 'toc'                 => 'حصے',
 'showtoc'             => 'کھولو',
@@ -292,8 +289,10 @@ $messages = array(
 'loginlanguagelabel'        => 'بولی: $1',
 
 # Password reset dialog
-'resetpass'           => 'کھاتے دی کنجی دوبار� بناؤ',
 'resetpass_header'    => 'کھاتے دی کنجی بدلو',
+'oldpassword'         => 'پرانی کنجی:',
+'newpassword'         => 'نوی کنجی:',
+'retypenew'           => 'نئی کنجی دوبار� لکھو:',
 'resetpass_submit'    => 'کنجی رکھو تے لاگ ان �و جاو',
 'resetpass_forbidden' => 'کنجی بدلی نئیں جاسکدی',
 
@@ -318,8 +317,8 @@ $messages = array(
 'hr_tip'          => 'سدھی لکیر',
 
 # Edit pages
-'summary'                => 'خلاص�',
-'subject'                => 'مضمون/سرخی',
+'summary'                => 'خلاص�:',
+'subject'                => 'موضوع/ش� صرحی:',
 'minoredit'              => 'اے نکا جیا کم اے',
 'watchthis'              => 'اس ص�حے تے نظر رکھو',
 'savearticle'            => 'کم بچاؤ',
@@ -330,8 +329,7 @@ $messages = array(
 'anoneditwarning'        => "<div/>'''خبردار''' تسی اندر ن�یں آۓ
 تواڈا ''آئی پی'' پت� �ائل �ائل وچ لکھیا جاۓ گا۔",
 'missingcommenttext'     => 'تھلے اپنی گل لکھو۔',
-'summary-preview'        => 'کچا خلاص�',
-'subject-preview'        => 'مضمون/سرخی نوں کچیاں ویکھو',
+'summary-preview'        => 'کچے کم دا خلاص�:',
 'blockedtitle'           => 'ورتن آلے نوں روکیا �ویا اے',
 'blockedtext'            => "<big>'''تواڈا ورتن والا ناں یا �یر آئی پی ایڈریس روک دتا گیا اے۔'''</big>
 
@@ -357,18 +355,18 @@ $messages = array(
 اگر تسی ایتھے غلطی نال پ�نچے او تے اپنے کھوجی توں "بیک" دا بٹن دبا دیو۔',
 'noarticletext'          => 'اس ویلے اس ص�حے تے کج ن�یں لکھیا �ویا تسی [[Special:Search/{{PAGENAME}}|اس ص�حے دے ناں نوں دوجے ص�حیاں تے کھوج سکدے او]] یا �یر [{{fullurl:{{FULLPAGENAME}}|action=edit}} اس ص�حے نوں لکھ سکدے او۔]',
 'updated'                => '(نواں کیتا گیا)',
-'previewnote'            => '<strong>اے �لے کچا کم اے؛ تبدیلیاں بچائیاں ن�یں گئیاں</strong>',
+'previewnote'            => "'''اے �لے کچا کم اے؛ تبدیلیاں بچائیاں ن�یں گئیاں'''",
 'editing'                => 'تسی "$1" لکھ ر�ے او',
 'editingsection'         => '$1 دا حص� لکھ ر�ے او',
 'yourtext'               => 'تواڈی لکھائی',
 'storedversion'          => 'سانبیا ورژن',
 'yourdiff'               => 'تبدیلیاں',
-'copyrightwarning'       => 'م�ربانی کر کے اے گل یاد رکھ لو کے سارے کم {{SITENAME}} ایتھے $2 دے تھلے آن گے (زیاد� علم واسطے $1 تکو)۔<br />
+'copyrightwarning'       => "م�ربانی کر کے اے گل یاد رکھ لو کے سارے کم {{SITENAME}} ایتھے $2 دے تھلے آن گے (زیاد� علم واسطے $1 تکو)۔<br />
 اگر تسی نئیں چاندے کے تواڑی لکھائی نوں بے رحمی نال ٹھیک کیتا جاۓ تے نالے اپنی مرضی نال اونھوں چھاپیا جاۓ تے ایتدے مت لکھو۔<br />
 تسی اے وی ساڈے نال وعد� کر ر�ے او ک� اینوں تسی آپ لکھیا اے یا �یر کسی پبلک ڈومین توں یا ای�و جۓ کسے آزاد ذریعے توں نقل کیتا اے۔<br />
-<strong>ایتھے او کم بغیر اجازت توں نا لکھو جیدے حق راکھویں نے <strong>',
-'longpagewarning'        => '<strong>�وشیار: اے ص�ح� $1 کلوبائیٹ لمبا اے؛ کچھ کھوجیاں نو 32 کلوبائیٹ توں لمبے ص�حے لکھنا یا پ�نچنا مسئل� �وندا اے۔ <br />
-اس ص�ح� نوں چھوٹے ٹوٹیاں چ تقسیم کرن دے بارے چ سوچ لو۔</strong>',
+'''ایتھے او کم بغیر اجازت توں نا لکھو جیدے حق راکھویں نے '''",
+'longpagewarning'        => "'''�وشیار: اے ص�ح� $1 کلوبائیٹ لمبا اے؛ کچھ کھوجیاں نو 32 کلوبائیٹ توں لمبے ص�حے لکھنا یا پ�نچنا مسئل� �وندا اے۔ <br />
+اس ص�ح� نوں چھوٹے ٹوٹیاں چ تقسیم کرن دے بارے چ سوچ لو۔'''",
 'templatesused'          => 'اس ص�حے تے استعمال کیتے گۓ سانچے:',
 'templatesusedpreview'   => 'اس کچے کم تے استعمال �وۓ سانچے:',
 'templatesusedsection'   => 'اس ٹوٹے چ استعمال کیتے گۓ سچے:',
@@ -388,27 +386,27 @@ $messages = array(
 'cantcreateaccounttitle' => 'کھات� نئیں کھول سکدے',
 
 # History pages
-'viewpagelogs'        => 'ص�حے دے لاگ ویکھو',
-'nohistory'           => 'اس ص�حے دی پرانی لکھائی دی کوئی تاریخ نئیں۔',
-'revnotfound'         => 'د�رائی نئیں لبی',
-'currentrev'          => '�ن آلی تبدیلی',
-'revisionasof'        => 'دی تبدیلیاں $1',
-'revision-info'       => '$2 نے $1 تے اے لکھیا',
-'previousrevision'    => '� اوس توں پچھلا کم',
-'nextrevision'        => 'نویں تبدیلی →',
-'currentrevisionlink' => 'موجود� حالت',
-'cur'                 => 'موجود�',
-'next'                => 'اگلا',
-'last'                => 'آخری',
-'page_first'          => 'پ�لا',
-'page_last'           => 'آخری',
-'histlegend'          => 'ڈ� سلیکشن: وکھری تبدیلیاں دا مقابلا کرن واسطے ریڈیو ڈبیاں تے نشان لاؤ تے اینٹر یا تھلے دتا گیا بٹن دباؤ۔<br />
+'viewpagelogs'           => 'ص�حے دے لاگ ویکھو',
+'nohistory'              => 'اس ص�حے دی پرانی لکھائی دی کوئی تاریخ نئیں۔',
+'currentrev'             => '�ن آلی تبدیلی',
+'revisionasof'           => 'دی تبدیلیاں $1',
+'revision-info'          => '$2 نے $1 تے اے لکھیا', # Additionally available: $3: revision id
+'previousrevision'       => '� اوس توں پچھلا کم',
+'nextrevision'           => 'نویں تبدیلی →',
+'currentrevisionlink'    => 'موجود� حالت',
+'cur'                    => 'موجود�',
+'next'                   => 'اگلا',
+'last'                   => 'آخری',
+'page_first'             => 'پ�لا',
+'page_last'              => 'آخری',
+'histlegend'             => 'ڈ� سلیکشن: وکھری تبدیلیاں دا مقابلا کرن واسطے ریڈیو ڈبیاں تے نشان لاؤ تے اینٹر یا تھلے دتا گیا بٹن دباؤ۔<br />
 لیجنڈ: (موجود�) = موجود� تبدیلی نال مقابل�، 
 (آخری) = پچھلی تبدیلی توں �رق، M = تھوڑی تبدیلی',
-'deletedrev'          => '[مٹایا جا چکیا اے]',
-'histfirst'           => 'سب توں پ�لا',
-'histlast'            => 'سب توں نواں',
-'historyempty'        => '(خالی)',
+'history-fieldset-title' => 'ریکارڈ ویکھو',
+'deletedrev'             => '[مٹایا جا چکیا اے]',
+'histfirst'              => 'سب توں پ�لا',
+'histlast'               => 'سب توں نواں',
+'historyempty'           => '(خالی)',
 
 # Revision feed
 'history-feed-item-nocomment' => '$2 نوں $1', # user at time
@@ -451,6 +449,7 @@ $messages = array(
 'prevn'                     => 'پ�لا $1',
 'nextn'                     => 'اگلا $1',
 'viewprevnext'              => 'ویکھو ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:��رست',
 'search-interwiki-caption'  => 'نال دے منصوبے',
 'search-mwsuggest-enabled'  => 'صلاع دے نال',
 'search-mwsuggest-disabled' => 'کوئی صلاع نئیں',
@@ -478,14 +477,13 @@ $messages = array(
 'prefs-rc'              => 'نویاں تبدیلیاں',
 'prefs-watchlist'       => 'نظر تھلے ص�حے',
 'saveprefs'             => 'بچاؤ',
-'oldpassword'           => 'پرانی کنجی:',
-'newpassword'           => 'نوی کنجی:',
-'retypenew'             => 'نئی کنجی دوبار� لکھو:',
 'textboxsize'           => 'لکھائی',
 'rows'                  => 'قطار:',
 'columns'               => 'کالم:',
 'searchresultshead'     => 'کھوج',
 'timezonelegend'        => 'ویلے دا علاق�',
+'localtime'             => 'مقامی ویلا:',
+'timezoneselect'        => 'ویلیاں دے علاقے:',
 'files'                 => '�ائلاں',
 
 # User rights
@@ -526,6 +524,21 @@ $messages = array(
 'rightslog'  => 'ورتن والے دے حقاں دی لاگ',
 'rightsnone' => '(کوئی وی نئیں)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'          => 'اس ص�حے نوں پڑھو',
+'action-edit'          => 'اس ص�حے تے لکھو',
+'action-createpage'    => 'ص�حے بناؤ',
+'action-createtalk'    => 'گلاں باتاں آلا ص�ح� بناؤ',
+'action-move'          => 'اس ص�حے نوں لے جاؤ',
+'action-move-subpages' => 'اس ص�حے نوں تے ایدے نال دے جڑے ص�حیاں نوں لے چلو',
+'action-upload'        => 'اس �ائل نوں اتے چاڑو',
+'action-reupload'      => 'اس پ�لاں توں موجود �ائل دے اتے لکھو',
+'action-delete'        => 'اس ص�حے نوں مٹا دیو',
+'action-browsearchive' => 'مٹاۓ گۓ ص�حے کھوجو',
+'action-undelete'      => 'اس ص�حے نوں واپس لیاؤ',
+'action-block'         => 'اس ورتن آلے نوں لکھن توں روکو',
+'action-protect'       => 'اس ص�حے دے بچاؤ دا درج� بدلو',
+
 # Recent changes
 'nchanges'                       => '$1 {{PLURAL:$1|change|تبدیلیاں}}',
 'recentchanges'                  => 'نویاں تبدیلیاں',
@@ -593,16 +606,16 @@ $messages = array(
 'license-nopreview'  => '(کچا کم نئیں ویکھ سکدے او)',
 'upload_source_file' => ' (تواڈے کمپیوٹر تے اک �ائل)',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => '�ائل',
-'imagelist'             => '�ائل لسٹ',
-'imagelist_date'        => 'تاریخ',
-'imagelist_name'        => 'ناں',
-'imagelist_user'        => 'ورتن آلا',
-'imagelist_size'        => 'ناپ',
-'imagelist_description' => 'ت�صیل',
-
-# Image description page
+'listfiles'             => '�ائل لسٹ',
+'listfiles_date'        => 'تاریخ',
+'listfiles_name'        => 'ناں',
+'listfiles_user'        => 'ورتن آلا',
+'listfiles_size'        => 'ناپ',
+'listfiles_description' => 'ت�صیل',
+
+# File description page
 'filehist'                       => 'پچھلی حالت',
 'filehist-help'                  => '�ائل نو اس ویلے دی حالت وچ ویکھن واسطے تاریخ/ویلے تے کلک کرو۔',
 'filehist-deleteall'             => 'سب نوں مٹاؤ',
@@ -662,7 +675,6 @@ $messages = array(
 
 # Statistics
 'statistics'             => 'حساب کتاب',
-'userstats'              => 'ورتن آلے دا حساب کتاب',
 'statistics-mostpopular' => 'سب توں بوتے ویکھے گۓ ص�جے',
 
 'disambiguations' => 'اک جۓ ص�حے',
@@ -692,7 +704,6 @@ $messages = array(
 'popularpages'            => 'مش�ور ص�حے',
 'wantedcategories'        => 'چاھیدیاں کیٹاگریاں',
 'wantedpages'             => 'چائیدے ص�حے',
-'missingfiles'            => 'گواچیاں �ائلاں',
 'mostlinked'              => 'سب توں بوتے جوڑاں آۂے ص�حے',
 'mostlinkedcategories'    => 'سب توں بوتیاں جڑیاں کیٹاگریاں',
 'mostlinkedtemplates'     => 'سب توں زیاد� جوڑ والے سچے',
@@ -725,8 +736,6 @@ $messages = array(
 'speciallogtitlelabel' => 'ناں:',
 'log'                  => 'لاگز',
 'all-logs-page'        => 'سارے لاگ',
-'log-search-legend'    => 'لاگ کھوجو',
-'log-search-submit'    => 'جاؤ',
 
 # Special:AllPages
 'allpages'       => 'سارے ص�حے',
@@ -760,23 +769,20 @@ $messages = array(
 'emailsend'    => 'پیجو',
 
 # Watchlist
-'watchlist'            => 'میریاں اکھاں تھلے وچ',
-'mywatchlist'          => 'میری نظر وچ',
-'watchlistfor'         => "('''$1''' لئی)",
-'addedwatch'           => 'اکھ تھلے آگیا',
-'addedwatchtext'       => 'اے ص�ح� "[[:$1]] تواڈیاں اکھاں تھلے آگیا اے۔<br />
+'watchlist'         => 'میریاں اکھاں تھلے وچ',
+'mywatchlist'       => 'میری نظر وچ',
+'watchlistfor'      => "('''$1''' لئی)",
+'addedwatch'        => 'اکھ تھلے آگیا',
+'addedwatchtext'    => 'اے ص�ح� "[[:$1]] تواڈیاں اکھاں تھلے آگیا اے۔<br />
 مستقبل وچ اس ص�ح� تے ایدے بارے چ گل بات نویاں تبدیلیاں وچ موٹے نظر آن گے تا ک� آسانی نال کھوجیا جا سکے۔',
-'removedwatch'         => 'اکھ تھلیوں �ٹا لیا گیا',
-'removedwatchtext'     => 'اے ص�ح� "[[:$1]]" تواڈی اکھ تھلیوں �ٹا لیا گیا اے۔',
-'watch'                => 'نظر رکھو',
-'watchthispage'        => 'اس ص�حے تے اکھ رکھو',
-'unwatch'              => 'نظر ھٹاؤ',
-'unwatchthispage'      => 'اکھ رکھنا چھڈو',
-'watchlist-details'    => '{{PLURAL:$1|$1 ص�ح�|$1 ص�ح�}} تواڈی اکھ تھلے گلاں باتاں شامل ن�یں۔',
-'wlshowlast'           => 'آخری $1 گھنٹے $2 دن $3 وکھاؤ',
-'watchlist-hide-bots'  => 'باٹ دے کم چھپاؤ',
-'watchlist-hide-own'   => 'میرے کم چھپاؤ',
-'watchlist-hide-minor' => 'چھوٹیاں تبدیلیاں چھپاؤ',
+'removedwatch'      => 'اکھ تھلیوں �ٹا لیا گیا',
+'removedwatchtext'  => 'اے ص�ح� "[[:$1]]" تواڈی اکھ تھلیوں �ٹا لیا گیا اے۔',
+'watch'             => 'نظر رکھو',
+'watchthispage'     => 'اس ص�حے تے اکھ رکھو',
+'unwatch'           => 'نظر ھٹاؤ',
+'unwatchthispage'   => 'اکھ رکھنا چھڈو',
+'watchlist-details' => '{{PLURAL:$1|$1 ص�ح�|$1 ص�ح�}} تواڈی اکھ تھلے گلاں باتاں شامل ن�یں۔',
+'wlshowlast'        => 'آخری $1 گھنٹے $2 دن $3 وکھاؤ',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'نظر تھلے۔۔۔۔',
@@ -788,28 +794,32 @@ $messages = array(
 'created'            => 'بن گیا',
 'enotif_anon_editor' => 'گم نام ورتن آلا $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'ص�ح� مٹاؤ',
-'confirm'                     => 'پکا کرو',
-'exblank'                     => 'ص�ح� خالی سی',
-'delete-confirm'              => '"$1" مٹاؤ',
-'delete-legend'               => 'مٹاؤ',
-'historywarning'              => 'خوشیار: او ص�ح� جس نوں تسی مٹانے لگے او دا ریکارڈ موجود اے۔',
-'confirmdeletetext'           => 'تسی اک ص�ح� اسدی تاریخ دے نال مٹان لگے او۔
+# Delete
+'deletepage'             => 'ص�ح� مٹاؤ',
+'confirm'                => 'پکا کرو',
+'exblank'                => 'ص�ح� خالی سی',
+'delete-confirm'         => '"$1" مٹاؤ',
+'delete-legend'          => 'مٹاؤ',
+'historywarning'         => 'خوشیار: او ص�ح� جس نوں تسی مٹانے لگے او دا ریکارڈ موجود اے۔',
+'confirmdeletetext'      => 'تسی اک ص�ح� اسدی تاریخ دے نال مٹان لگے او۔
 کیا تسی اے ای کرنا چا�ندے او کیا تسی اس دے نتیجے نوں جاندے او ک� تسی اے کم [[{{MediaWiki:Policy-url}}|پالیسی]] دے مطابق کر ر�ے او۔',
-'actioncomplete'              => 'کم �وگیا',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" مٹایا جا چکیا اے۔<br />
+'actioncomplete'         => 'کم �وگیا',
+'deletedtext'            => '"<nowiki>$1</nowiki>" مٹایا جا چکیا اے۔<br />
 نیڑے نیڑے مٹاۓ گۓ ریکارڈ نوں دیکن آسطے $2 ایتھے چلو۔',
-'deletedarticle'              => '"[[$1]]" مٹا دتا گیا',
-'dellogpage'                  => 'مٹان آلی لاگ',
-'dellogpagetext'              => 'تھلے نویاں مٹائے گۓ ص�حیاں دی لسٹ اے۔',
-'deletecomment'               => 'مٹانے دی وج�:',
-'deleteotherreason'           => 'دوجی/�ور وج�:',
-'deletereasonotherlist'       => '�ور وج�',
-'delete-edit-reasonlist'      => 'مٹانے دیاں وج� لکھو',
-'rollback'                    => 'لکھائیاں واپس کرو',
-'rollback_short'              => 'واپس کرو',
-'rollbacklink'                => 'واپس',
+'deletedarticle'         => '"[[$1]]" مٹا دتا گیا',
+'dellogpage'             => 'مٹان آلی لاگ',
+'dellogpagetext'         => 'تھلے نویاں مٹائے گۓ ص�حیاں دی لسٹ اے۔',
+'deletecomment'          => 'مٹانے دی وج�:',
+'deleteotherreason'      => 'دوجی/�ور وج�:',
+'deletereasonotherlist'  => '�ور وج�',
+'delete-edit-reasonlist' => 'مٹانے دیاں وج� لکھو',
+
+# Rollback
+'rollback'       => 'لکھائیاں واپس کرو',
+'rollback_short' => 'واپس کرو',
+'rollbacklink'   => 'واپس',
+
+# Protect
 'protectlogpage'              => 'بچت لاگ',
 'protectedarticle'            => '"[[$1]]" بچایا گیا اے',
 'unprotectedarticle'          => '"[[$1]]" نئیں بچایا گیا',
@@ -819,9 +829,9 @@ $messages = array(
 'protect_expiry_invalid'      => 'اکسپائری ٹیم غلط اے۔',
 'protect_expiry_old'          => 'ایدا اکسپائری ٹائم گزر چکیا اے۔',
 'protect-unchain'             => 'لے جانے دی اجازتاں دیو',
-'protect-text'                => 'تسی اس ص�حے دے ح�اظتی درجے نوں تک تے تبدیل کر سکدے او<strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'تواڈا کھات� اجازت ن�یں دیندا ک� تسی ص�حے دے ح�اظتی درجے نوں تبدیل کرو۔<br />
-ایتھے ص�حے آسطے موجود� ترتیب نے <strong>$1</strong>:',
+'protect-text'                => "تسی اس ص�حے دے ح�اظتی درجے نوں تک تے تبدیل کر سکدے او'''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "تواڈا کھات� اجازت ن�یں دیندا ک� تسی ص�حے دے ح�اظتی درجے نوں تبدیل کرو۔<br />
+ایتھے ص�حے آسطے موجود� ترتیب نے '''$1''':",
 'protect-cascadeon'           => 'اے ص�ح� ایس ویلے بچایا گیا کیوج� اے اونھاں {{PLURAL:$1|page, which has|ص�حیاں وچ شامل اے }} جیناں دی کسکیڈنگ ح�اظت آن اے۔ 
 
 تسی اس ص�حے دا بچاؤ لیول نوں تبدیل کرسکدے او لیکن اے اودھے کسکیڈنگ بچاؤ تے اثر نئیں کریگی۔',
@@ -886,7 +896,6 @@ $messages = array(
 'whatlinkshere'         => 'ایتھے کیدا تعلق اے',
 'whatlinkshere-title'   => 'او ص�حات جیڑے "$1" نال جڑے نے',
 'whatlinkshere-page'    => 'ص�ح�:',
-'linklistsub'           => '(جوڑاں دی لسٹ)',
 'linkshere'             => "تھلے دتے گۓ ص�حے اس دے نال جڑدے نے '''[[:$1]]''':",
 'nolinkshere'           => "'''[[:$1]]''' دے نال کسے دا جوڑ ن�یں",
 'isredirect'            => 'ریڈائرکٹ ص�ح�',
@@ -1085,7 +1094,7 @@ $messages = array(
 'show-big-image'       => 'وڈی مورت',
 'show-big-image-thumb' => '<small>کچے کم دے پکسل:$1 × $2</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'نئی �ائلاں دی نگری',
 'noimages'  => 'ویکھن آسطے کج نئیں۔',
 'ilsubmit'  => 'کھوجو',
@@ -1214,9 +1223,6 @@ $messages = array(
 # action=purge
 'confirm_purge_button' => 'ٹھیکھ �ے',
 
-# AJAX search
-'hideresults' => 'نتیجے لکاؤ',
-
 # Multipage image navigation
 'imgmultipageprev' => '� پچھلا ص�ح�',
 'imgmultipagenext' => 'اگلا ص�ح� →',
diff --git a/languages/messages/MessagesPnt.php b/languages/messages/MessagesPnt.php
index c46629d3..1ef3e7f0 100644
--- a/languages/messages/MessagesPnt.php
+++ b/languages/messages/MessagesPnt.php
@@ -8,6 +8,7 @@
  * @author Omnipaedista
  * @author Sinopeus
  * @author Urhixidur
+ * @author ZaDiak
  */
 
 $namespaceNames = array(
@@ -16,10 +17,9 @@ $namespaceNames = array(
 	NS_TALK           => 'Καλάτσεμαν',
 	NS_USER           => 'Χ�ήστες',
 	NS_USER_TALK      => 'Καλάτσεμαν_χ�ήστε',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_καλάτσεμαν',
-	NS_IMAGE          => 'Εικόναν',
-	NS_IMAGE_TALK     => 'Καλάτσεμαν_εικόνας',
+	NS_FILE           => 'Εικόναν',
+	NS_FILE_TALK      => 'Καλάτσεμαν_εικόνας',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
 	NS_TEMPLATE       => 'Π�ότυπον',
@@ -48,14 +48,13 @@ $dateFormats = array(
 
 $messages = array(
 # User preference toggles
+'tog-editondblclick'      => 'Άλλαγμαν σελιδίων με διπλόν κλικ (JavaScript)',
 'tog-shownumberswatching' => "Δείξον τοι χ�ήστς π' δεαβάζνε",
 'tog-showhiddencats'      => 'Δείξον κ�υμμένα κατηγο�ίας',
 
 'underline-always' => 'Πάντα',
 'underline-never'  => 'Καμίαν',
 
-'skinpreview' => '(Π�ώτον τέ�εμα)',
-
 # Dates
 'sunday'        => 'Κε�εκήν',
 'monday'        => 'Δευτέ�αν',
@@ -128,6 +127,7 @@ $messages = array(
 'newwindow'      => "(ανοίγ' σ' άλλον πα�αθ��)",
 'cancel'         => 'Χάτεμαν',
 'qbfind'         => 'Ε��ον',
+'qbbrowse'       => 'Πλοήγησην',
 'qbedit'         => 'Άλλαξον',
 'qbpageoptions'  => 'Ατή η σελίδαν',
 'qbpageinfo'     => 'Συμφ�αζόμενα',
@@ -138,7 +138,7 @@ $messages = array(
 'mytalk'         => "Τ' εμόν το καλάτσεμαν",
 'anontalk'       => "Καλάτσεμα για τ'ατό το IP",
 'navigation'     => 'Πο�πάτεμαν',
-'and'            => 'και',
+'and'            => '&#32;και',
 
 # Metadata in edit box
 'metadata_help' => 'Μεταδογμένα:',
@@ -174,7 +174,7 @@ $messages = array(
 'talkpagelinktext'  => 'Καλάτσεμαν',
 'specialpage'       => 'Ειδικόν σελίδαν',
 'personaltools'     => 'Π�οσωπικά ε�γαλεία',
-'postcomment'       => 'Ποίσον σχόλιον',
+'postcomment'       => "�έον κομμάτ'",
 'articlepage'       => 'Σελίδα',
 'talk'              => 'Καλάτσεμαν',
 'views'             => 'Τε�έματα',
@@ -199,8 +199,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Πε�ί {{SITENAME}}',
 'aboutpage'            => 'Project:Σχετικά',
-'bugreports'           => 'Αναφο�άντας λαθίων',
-'bugreportspage'       => 'Project:Γ�αφέστεν',
 'copyrightpagename'    => '{{SITENAME}} δικαιώματα πνευματί',
 'copyrightpage'        => '{{ns:project}}:Δικαιώματα Πνευματί',
 'currentevents'        => 'Ατω�ιζνά γεγονότα',
@@ -223,6 +221,7 @@ $messages = array(
 'versionrequiredtext' => 'Για να κουλε�ετε αβο�τεν τη σελίδαν χ�ειάσκεται η έκδοση $1 τη MediaWiki.
 Τε�έστεν τη [[Special:Version|version page]].',
 
+'ok'                      => 'Εγέντον',
 'retrievedfrom'           => 'Ασο "$1"',
 'youhavenewmessages'      => 'Έχετε $1 ($2).',
 'newmessageslink'         => 'καινο��εα μενέματα',
@@ -230,6 +229,9 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Έχετε καινο��εα μενέματα σο $1',
 'editsection'             => 'άλλαξον',
 'editold'                 => 'άλλαξον',
+'viewsourceold'           => 'τε�έστεν κωδικόν',
+'editlink'                => 'άλλαξον',
+'viewsourcelink'          => 'τε�έστεν κωδικόν',
 'editsectionhint'         => "Άλλαξον κομμάτ': $1",
 'toc'                     => 'Πε�ιεχόμενα',
 'showtoc'                 => 'δείξον',
@@ -239,13 +241,14 @@ $messages = array(
 'site-rss-feed'           => '$1 RSS Συνδ�ομή',
 'site-atom-feed'          => '$1 Atom Συνδ�ομή',
 'page-rss-feed'           => '"$1" RSS Συνδ�ομή',
+'page-atom-feed'          => '"$1" Atom Συνδ�ομή',
 'red-link-title'          => "$1 ('κ εγ�άφτεν ακόμαν)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Σελίδαν',
 'nstab-user'      => 'Σελίδα χ�ήστε',
 'nstab-media'     => 'Σελίδα μεσίων',
-'nstab-special'   => 'Ειδικόν',
+'nstab-special'   => 'Ειδικόν σελίδα',
 'nstab-project'   => 'Σχετικά με',
 'nstab-image'     => 'Εικόνα',
 'nstab-mediawiki' => 'Μένεμαν',
@@ -263,6 +266,8 @@ $messages = array(
 'laggedslavemode'      => "Ω�ία: Η σελίδαν ίσως ξάι 'κ εχ' τα υστε�νά τα αλλαγάς.",
 'readonly'             => 'Βάση δογμενίων εν ασπαλιζμένον',
 'enterlockreason'      => "Βαλέστεν λόγον για τ' ασπάλιγμαν και ους πότε θα εν ασπαλιγμένον",
+'missingarticle-rev'   => '(μο�φήν#: $1)',
+'missingarticle-diff'  => '(Δεαφ: $1, $2)',
 'internalerror'        => 'Σφάλμαν απές με�έαν',
 'internalerror_info'   => 'Σφάλμαν απές με�έαν: $1',
 'filecopyerror'        => 'Η αντιγ�αφή τ\' α�χείου ασό "$1" σο "$2" \'κ εγέντον.',
@@ -287,73 +292,85 @@ $messages = array(
 'virus-unknownscanner' => 'αναγνώ�ιμον αντιικόν:',
 
 # Login and logout pages
-'logouttitle'             => 'Εξέβεμαν χ�ήστονος',
-'welcomecreation'         => "== Καλώς έ�θετεν, $1! ==
+'logouttitle'                => 'Εξέβεμαν χ�ήστονος',
+'welcomecreation'            => "== Καλώς έ�θετεν, $1! ==
 Η λογα�ίαν εσουν εγέντον.
 Τ' άλλαγμαν τη [[Special:Preferences|{{SITENAME}} π�οτιμησίων]] εσουν μη νεσπάλετε.",
-'loginpagetitle'          => 'Εσέβεμαν χ�ήστονος',
-'yourname'                => 'Όνεμαν χ�ήστε:',
-'yourpassword'            => 'Σημάδι:',
-'yourpasswordagain'       => "Ξαν' γ�άψτεν το σημάδι:",
-'remembermypassword'      => "Αποθήκεμαν τη σημαδίμ σ' αβο�τον τον υπολογιστήν",
-'yourdomainname'          => 'Το domain εσο�ν:',
-'login'                   => 'Εμπάτε',
-'nav-login-createaccount' => 'Εμπάτε / Ποίστεν λογα�ίαν',
-'loginprompt'             => "Π�έπ' ν' άφτετε τα cookies για εμπείτε σο {{SITENAME}}.",
-'userlogin'               => 'Εμπάτε / Ποίστεν λογα�ίαν',
-'logout'                  => 'οξουκά',
-'userlogout'              => 'Οξουκά',
-'notloggedin'             => 'Ευ�ίσκεζνε οξουκά ασή Βικιπαίδειαν',
-'nologin'                 => "Λογα�ίαν 'κ έχετε; $1.",
-'nologinlink'             => 'Ποίστεν λογα�ίαν',
-'createaccount'           => 'Ποίσον λογα�ίαν',
-'gotaccount'              => 'Λογα�ίαν έχετε; $1.',
-'gotaccountlink'          => 'Εμπάτε',
-'badretype'               => "Τα σημάδε ντ' εγ�άψετεν 'κ ται�ιάζνε.",
-'userexists'              => "Τ' όνεμαν έχ' ατό άλλος χ�ήστες.
+'loginpagetitle'             => 'Εσέβεμαν χ�ήστονος',
+'yourname'                   => 'Όνεμαν χ�ήστε:',
+'yourpassword'               => 'Σημάδι:',
+'yourpasswordagain'          => "Ξαν' γ�άψτεν το σημάδι:",
+'remembermypassword'         => "Αποθήκεμαν τη σημαδίμ σ' αβο�τον τον υπολογιστήν",
+'yourdomainname'             => 'Το domain εσο�ν:',
+'login'                      => 'Εμπάτε',
+'nav-login-createaccount'    => 'Εμπάτε / Ποίστεν λογα�ίαν',
+'loginprompt'                => "Π�έπ' ν' άφτετε τα cookies για εμπείτε σο {{SITENAME}}.",
+'userlogin'                  => 'Εμπάτε / Ποίστεν λογα�ίαν',
+'logout'                     => 'οξουκά',
+'userlogout'                 => 'Οξουκά',
+'notloggedin'                => 'Ευ�ίσκεζνε οξουκά ασή Βικιπαίδειαν',
+'nologin'                    => "Λογα�ίαν 'κ έχετε; $1.",
+'nologinlink'                => 'Ποίστεν λογα�ίαν',
+'createaccount'              => 'Ποίσον λογα�ίαν',
+'gotaccount'                 => 'Λογα�ίαν έχετε; $1.',
+'gotaccountlink'             => 'Εμπάτε',
+'createaccountmail'          => 'με ελεκτ�ονικόν μένεμαν',
+'badretype'                  => "Τα σημάδε ντ' εγ�άψετεν 'κ ται�ιάζνε.",
+'userexists'                 => "Τ' όνεμαν έχ' ατό άλλος χ�ήστες.
 Βαλέστε άλλον όνεμαν.",
-'youremail'               => 'Ελεκτ�ονικόν μένεμαν:',
-'username'                => 'Όνεμα χ�ήστε:',
-'yourrealname'            => 'Π�αματικόν όνεμαν:',
-'yourlanguage'            => "Τ' εσόν η γλώσσαν:",
-'yournick'                => 'Υπογ�αφή:',
-'badsiglength'            => "Η υπογ�αφή εν πολλά τ�ανόν.
-Επ�έπ να έχ' λιγότε�α ασα $1 {{PLURAL:$1|γ�άμμα|γ�άμματα}}.",
-'email'                   => 'Ελεκτ�ονικόν μένεμαν',
-'prefs-help-realname'     => "'Κ επ�έπ' να βάλετεν το τεσέτε�ον το π�αματικόν τ' όνεμαν.
+'youremail'                  => 'Ελεκτ�ονικόν μένεμαν:',
+'username'                   => 'Όνεμα χ�ήστε:',
+'uid'                        => 'ID Χ�ήστε:',
+'yourrealname'               => 'Π�αματικόν όνεμαν:',
+'yourlanguage'               => "Τ' εσόν η γλώσσαν:",
+'yournick'                   => 'Υπογ�αφή:',
+'badsiglength'               => "Το σημάδινεσουν εν πολλά τ�ανόν.
+Π�έπ' να εχ' λιγότε�α ασά $1 {{PLURAL:$1|γ�άμμαν|γ�άμματα}}.",
+'email'                      => 'Ελεκτ�ονικόν μένεμαν',
+'prefs-help-realname'        => "'Κ επ�έπ' να βάλετεν το τεσέτε�ον το π�αματικόν τ' όνεμαν.
 Άμα αν εβάλετεν ατό, αμπο�εί πα ν' αναγνω�ίζκεται το τεσέτε�ον η δουλείαν.",
-'loginerror'              => 'Σφάλμα εγγ�αφής',
-'noname'                  => "'Κ έβαλατε καλόν όνεμαν χ�ήστονος.",
-'loginsuccesstitle'       => "Έντον τ' εσέβεμαν",
-'loginsuccess'            => "'''Εσήβετεν σο {{SITENAME}} ους \"\$1\".'''",
-'nosuchuser'              => 'Αδά \'κ εχ\' χ�ήστεν με τ\' όνεμαν "$1".
+'loginerror'                 => 'Σφάλμα εγγ�αφής',
+'noname'                     => "'Κ έβαλατε καλόν όνεμαν χ�ήστονος.",
+'loginsuccesstitle'          => "Έντον τ' εσέβεμαν",
+'loginsuccess'               => "'''Εσήβετεν σο {{SITENAME}} με τ'όνεμαν \"\$1\".'''",
+'nosuchuser'                 => 'Αδά \'κ εχ\' χ�ήστεν με τ\' όνεμαν "$1".
+Τα γ�άμματα τη ονεματί χ�ήστε διακ�ίνουνται σε κεφαλαιογ�άμματα και σε μικ�ογ�άμματα.
 Το γ�άψιμον ω�ία γιά [[Special:UserLogin/signup|ποίσον καινο��εον λογα�ίαν]].',
-'nosuchusershort'         => 'Αδά \'κ εχ\' χ�ήστεν με τ\' όνομα "<nowiki>$1</nowiki>".
+'nosuchusershort'            => 'Αδά \'κ εχ\' χ�ήστεν με τ\' όνομα "<nowiki>$1</nowiki>".
 Το γ�άψιμονις ω�ία.',
-'nouserspecified'         => "Π�έπ' να ψιλίζετε έναν όνεμαν.",
-'wrongpassword'           => "Το σημάδι 'κ εν σωστόν.
+'nouserspecified'            => "Π�έπ' να ψιλίζετε έναν όνεμαν.",
+'wrongpassword'              => "Το σημάδι 'κ εν σωστόν.
 Ποίστεν άλλο π�οσπάθειαν.",
-'wrongpasswordempty'      => 'Το σημάδι έτον ε�και�ον.
+'wrongpasswordempty'         => 'Το σημάδι έτον ε�και�ον.
 Ποίστεν άλλο π�οσπάθειαν.',
-'passwordtooshort'        => "Το σημάδι εν πολλά μικ�όν.
-Π�έπ' να εχ' {{PLURAL:$1|1 γ�άμμαν|$1 γ�άμματα}} κιαν. Το σημάδινεσουν π�έπ' να εν αλλέτε�ον ασόν όνομαν τη χ�ήστε.",
-'mailmypassword'          => 'Αποστολή καινο��εου κωδικο�',
-'passwordremindertitle'   => 'Καινο��εον σημάδιν για {{SITENAME}}',
-'passwordremindertext'    => 'Κάποιος (ίσως εσείς, ασήν διε�θυνσην IP $1)
+'passwordtooshort'           => "Το σημάδινεσουν εν πολλά μικ�όν.
+Π�έπ' να εχ' {{PLURAL:$1|1 γ�άμμαν|$1 γ�άμματα}} κιαν και π�έπ' να εν αλλέτε�ον ασόν όνομαν τη χ�ήστε.",
+'mailmypassword'             => 'Αποστολή καινο��εου κωδικο�',
+'passwordremindertitle'      => 'Καινο��εον σημάδιν για {{SITENAME}}',
+'passwordremindertext'       => 'Κάποιος (ίσως εσείς, ασήν διε�θυνσην IP $1)
 εποίκεν ψαλαφίον να στείλκουμες έναν νέον σημάδιν για τον ιστοτόπον {{SITENAME}} ($4).
 Το σημάδιν για τον χ�ήστεν "$2" ατώ�α εν "$3". Εάν το ψαλαφήσατε εσείς,
 ατώ�α εμπάτε σην σελίδαν και ποίστεν το σημάδινεσουν διαφο�ετικόν.
 
 Εάν το ψαλαφίον εποίκενατο άλλος για έχετε σο νο�νεσουν αξάν το παλαιόν το σημάδινεσουν και το καινο��εον ξάι \'κ χ�ειάσκεται, επο�είτε ν\' ανασπάλλετε το καινο��εον το σημάδιν με τ\' αβο�το το μένεμαν εντάμαν και να μεταχει�ίσκεστε το παλαιόν το σημάδιν άμον ντ\' εφτάγατε ους οσήμε�ον.',
-'noemail'                 => '\'Κ εδώθεν e-mail address τη χ�ήστε "$1".',
-'passwordsent'            => 'Έναν καινο��εον σημάδιν επήγεν σο e-mail τη "$1".
+'noemail'                    => '\'Κ εδώθεν e-mail address τη χ�ήστε "$1".',
+'passwordsent'               => 'Έναν καινο��εον σημάδιν επήγεν σο e-mail τη "$1".
 Άμον ντο παί�ετ\' ατό, εμπάτε ξαν.',
-'eauthentsent'            => "Έναν μένεμαν confirmation e-mail επήγεν σην διε�θυνσην ντ' εδώκατε.
+'eauthentsent'               => "Έναν μένεμαν confirmation e-mail επήγεν σην διε�θυνσην ντ' εδώκατε.
 Π�ιχο� να πηγαίνει άλλον μένεμαν σ' αβο�τεν τη λογα�ίαν, θα φτάτεν ατά ντο γ�αφ' σο μένεμαν απές. Αέτς πα θα δεκνίζετε το e-mail ατό εν το τεσέτε�ον.",
-'accountcreated'          => 'Έντον η λογα�ίαν',
-'accountcreatedtext'      => "Έντον η λογα�ίαν τη χ�ήστ' $1.",
-'createaccount-title'     => 'Δημιου�γίαν λογα�ίας για {{SITENAME}}',
-'loginlanguagelabel'      => 'Γλώσσαν: $1',
+'acct_creation_throttle_hit' => "Εποίκατε, ή ίσως αλλέτε�ος ασήν διε�θυνσήνεσουν IP, {{PLURAL:$1|1 λογα�ίαν|$1 λογα�ίας}}, το μέγιστον γι' ατώ�α.
+'Κ επο�είτε ν' εφτάτε άλλον.",
+'accountcreated'             => 'Έντον η λογα�ίαν',
+'accountcreatedtext'         => "Έντον η λογα�ίαν τη χ�ήστ' $1.",
+'createaccount-title'        => 'Δημιου�γίαν λογα�ίας για {{SITENAME}}',
+'loginlanguagelabel'         => 'Γλώσσαν: $1',
+
+# Password reset dialog
+'resetpass'                 => '�έον σημάδιν',
+'oldpassword'               => 'Παλαιόν σημάδιν:',
+'newpassword'               => 'Καινο��εον σημάδιν:',
+'retypenew'                 => 'Γ�άψον ξαν το νέον σημάδιν:',
+'resetpass-submit-loggedin' => 'Άλλαξον σημάδιν',
 
 # Edit page toolbar
 'bold_sample'     => 'Χοντ�όν κείμενον',
@@ -376,8 +393,8 @@ $messages = array(
 'hr_tip'          => "Ο�ιζόντιον γ�αμμή (μη θέκ'ς ατέν πολλά)",
 
 # Edit pages
-'summary'                => 'Σ�νοψη',
-'subject'                => 'Θέμα/επικεφαλίδα',
+'summary'                => 'Σ�νοψη:',
+'subject'                => 'Θέμα/επικεφαλίδα:',
 'minoredit'              => 'Μικ�όν αλλαγήν',
 'watchthis'              => 'Ω�ίαγμαν τη σελίδας',
 'savearticle'            => 'Αποθήκεμαν σελίδας',
@@ -386,7 +403,7 @@ $messages = array(
 'showdiff'               => 'Αλλαγάς',
 'anoneditwarning'        => "'''Ω�ίασων:''' 'Κ εποίκες τ' εσέβεμαν.
 Τ' IP ις θα γ�άφκεται και θα ελέπν' ατό σ' ιστο�ικόν τη σελίδας.",
-'summary-preview'        => 'Π�ώτον τέ�εμαν τη σ�νοψης',
+'summary-preview'        => 'Π�ώτον τέ�εμαν τη σ�νοψης:',
 'blockedtitle'           => 'Ο χ�ήστες εν ασπαλιζμένος',
 'blockedtext'            => "<big>'''Τ' όνομαν ή το IP εσο�ν εκλείστεν.'''</big>
 
@@ -427,22 +444,25 @@ $messages = array(
 'newarticletext'         => "Έ�θατεν ασ' έναν σ�νδεσμον σ' έναν ε�και�ον σελίδαν. 
 Για να εφτάτε τη σελίδαν, α�χινέστε γ�άψιμον σο χουτίν αφκά (δεαβάστεν τη [[{{MediaWiki:Helppage}}|σελίδαν βοήθειας]] και μαθέστεν κιάλλα).
 Εάν 'κ θέλετε ν' εφτάτε αβο�τεν τη σελίδαν, πατήστε το κουμπίν το λεει '''οπίς''' και δεβάτεν οπίς απ' όθεν έ�θατεν.",
-'noarticletext'          => "(Αβο�τεν η σελίδαν 'κ εχ' κείμενον απές ακόμαν.)",
-'previewnote'            => "<strong>Ατό πα π�ώτον τέ�εμαν εν και μόνον.
-Τ' αλλαγάς 'κ εκ�ατέθαν!</strong>",
+'noarticletext'          => "Αβο�τεν η σελίδαν 'κ εχ' κείμενον απές ακόμαν. 
+[[Special:Search/{{PAGENAME}}|Ε��ον αβο�τον τον τίτλον]] σ' αλλέα τοι σελίδας,
+<span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ε��ον την σελίδαν σα σχετικά α�χεία],
+ή [{{fullurl:{{FULLPAGENAME}}|action=edit}} άλλαξον αβο�τεν την σελίδαν].",
+'previewnote'            => "'''Ατό πα π�ώτον τέ�εμαν εν και μόνον.
+Τ' αλλαγάς 'κ εκ�ατέθαν!'''",
 'editing'                => 'Αλλαγήν $1',
 'editingsection'         => 'Αλλαγήν $1 (τμήμα)',
-'editingcomment'         => 'Άλλαγμαν $1 (καλάτσεμαν)',
+'editingcomment'         => "Άλλαγμαν $1 (καινο��εον κομμάτ')",
 'yourtext'               => 'Το γ�άψιμονις',
 'storedversion'          => 'Αποθηκεμένον μο�φή',
-'editingold'             => "<strong>ΩΡΙΑ: Εφτάτε αλλαγάς σε παλαιόν έκδοσην τη σελίδας. 
-Εάν θα κ�ατείτε ατά, ο�λ' τ' επεκεί αλλαγάς θα χάνταν.</strong>",
+'editingold'             => "'''ΩΡΙΑ: Εφτάτε αλλαγάς σε παλαιόν έκδοσην τη σελίδας. 
+Εάν θα κ�ατείτε ατά, ο�λ' τ' επεκεί αλλαγάς θα χάνταν.'''",
 'yourdiff'               => 'Διαφο�άς',
 'copyrightwarning'       => "Ο�λαι τα γ�αψίματα ασο {{SITENAME}} θα μεταχει�ίσκουνταν άμον ντο λεει το $2 (τε�έστεν και $1).
 Εάν 'κ θέλετε ατό να ίνεται, να μην εφτάτε το αποθήκεμαν.<br />
 Καμμίαν κι ανασπάλλετε: Αδακά 'κ εν ο τόπον για να θέκουμε γ�άψιμον ντ' έγ�αψαν αλλ. Βαλέστε ά�θ�α όνταν κατέχετε τα δικαιώματα πνευματί μαναχόν. 
-<strong>ΚΑΜΜΙΑ� 'Κ ΘΕΚΕΤΕ ΓΡΑΨΙΜΟ� ΑΔΑΚΑ Ο�ΤΕΣ 'Κ ΕΧΕΤΕ ΤΑ ΔΙΚΑΙΩΜΑΤΑ Π�ΕΥΜΑΤΙ!</strong>",
-'longpagewarning'        => "<strong>ΩΡΙΑ: Αβο�τεν η σελίδαν έχ' μέγεθος $1 kb. Με�ικά browser 'κ επο�ο�ν ν' επεξε�γάσκουνταν σελίδας ντ' έχνε 32 kb κιαν. Επο�είτε να λ�ετε το π�όβλημαν αν εφτάτεν ατέναν μικ�ά κομμάται.</strong>",
+'''ΚΑΜΜΙΑ� 'Κ ΘΕΚΕΤΕ ΓΡΑΨΙΜΟ� ΑΔΑΚΑ Ο�ΤΕΣ 'Κ ΕΧΕΤΕ ΤΑ ΔΙΚΑΙΩΜΑΤΑ Π�ΕΥΜΑΤΙ!'''",
+'longpagewarning'        => "'''ΩΡΙΑ: Αβο�τεν η σελίδαν έχ' μέγεθος $1 kb. Με�ικά browser 'κ επο�ο�ν ν' επεξε�γάσκουνταν σελίδας ντ' έχνε 32 kb κιαν. Επο�είτε να λ�ετε το π�όβλημαν αν εφτάτεν ατέναν μικ�ά κομμάται.'''",
 'templatesused'          => "Π�ότυπα το μεταχει�ίσκουνταν σ' αβο�τεν την σελίδαν:",
 'templatesusedpreview'   => "Π�ότυπα σ' αβο�τον το π�ώτον τέ�εμαν:",
 'template-protected'     => '(ασπαλιγμένον)',
@@ -458,34 +478,37 @@ $messages = array(
 'cantcreateaccounttitle' => "Το ποίσιμον τη λογα�ίας 'κ έντον",
 
 # History pages
-'viewpagelogs'        => "Τέ�εν π�ωτόκολλα γι' αβο�τεν τη σελίδαν",
-'currentrev'          => 'Ατω�ιζνόν μο�φήν',
-'revisionasof'        => 'Μο�φήν τη $1',
-'revision-info'       => 'Έκδοση σα $1 ασόν/ασήν $2',
-'previousrevision'    => '�Παλαιόν μο�φήν',
-'nextrevision'        => 'Κι άλλο καινο��εον μο�φήν→',
-'currentrevisionlink' => 'Ατω�ιζνόν μο�φήν',
-'cur'                 => 'ατω�ιζνόν',
-'next'                => 'επόμενον',
-'last'                => 'τελευταίον',
-'page_first'          => 'π�ώτον',
-'page_last'           => 'τελευταίον',
-'histlegend'          => 'Σ�γκ�ιμα διαφο�ίων: βαλέστεν τα μο�φάς το θέλετε και τε�έστεν τα διαφο�άσατουν. Για να τε�είτε τα διαφο�άς, ποίστεν έναν κλικ σο πεδίον το λεει "Γα�σουλαε�τε...". <br />
+'viewpagelogs'           => "Τέ�εν α�χεία γι' αβο�τεν τη σελίδαν",
+'currentrev'             => 'Ατω�ιζνόν μο�φήν',
+'revisionasof'           => 'Μο�φήν τη $1',
+'revision-info'          => 'Έκδοση σα $1 ασόν/ασήν $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Παλαιόν μο�φήν',
+'nextrevision'           => 'Κι άλλο καινο��εον μο�φήν→',
+'currentrevisionlink'    => 'Ατω�ιζνόν μο�φήν',
+'cur'                    => 'ατω�ιζνόν',
+'next'                   => 'επόμενον',
+'last'                   => 'τελευταίον',
+'page_first'             => 'π�ώτον',
+'page_last'              => 'τελευταίον',
+'histlegend'             => 'Σ�γκ�ιμα διαφο�ίων: βαλέστεν τα μο�φάς το θέλετε και τε�έστεν τα διαφο�άσατουν. Για να τε�είτε τα διαφο�άς, ποίστεν έναν κλικ σο πεδίον το λεει "Γα�σουλαε�τε...". <br />
 Πλη�οφο�ία: (ατω�ιζνόν) = διαφο�άς με τ\' ατω�ιζνόν τη μο�φήν,
 (υστε�νόν) = διαφο�άς με τ\' υστε�νόν τη μο�φήν, μ = μικ�ά διαφο�άς.',
-'deletedrev'          => '[εσβήεν]',
-'histfirst'           => "Ασ' όλεα παλαιόν",
-'histlast'            => "Ασ' όλεα καινο��'",
-'historyempty'        => '(ε�και�ον)',
+'history-fieldset-title' => 'Ε��ον σο ιστο�ικόν',
+'deletedrev'             => '[εσβήεν]',
+'histfirst'              => "Ασ' όλεα παλαιόν",
+'histlast'               => "Ασ' όλεα καινο��'",
+'historyempty'           => '(ε�και�ον)',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 σο $2', # user at time
 
 # Revision deletion
-'rev-delundel'    => 'δείξον/κ��ψον',
-'pagehist'        => 'Ιστο�ίαν σελίδας',
-'deletedhist'     => 'Σβηγμένον ιστο�ίαν',
-'revdelete-uname' => "όνεμαν χ�ήστ'",
+'rev-delundel'      => 'δείξον/κ��ψον',
+'pagehist'          => 'Ιστο�ίαν σελίδας',
+'deletedhist'       => 'Σβηγμένον ιστο�ίαν',
+'revdelete-content' => 'πε�ιεχόμενον',
+'revdelete-summary' => 'σ�νοψην',
+'revdelete-uname'   => "όνεμαν χ�ήστ'",
 
 # Diffs
 'history-title'           => 'Ιστο�ικόν εκδοσίων για τη σελίδαν "$1"',
@@ -494,47 +517,85 @@ $messages = array(
 'compareselectedversions' => 'Γα�σουλαε�τε...',
 'editundo'                => 'αναί�εση',
 'diff-multi'              => "({{PLURAL:$1|Μίαν αλλαγήν|$1 αλλαγάς}} 'κ δεκνίζκουνταν.)",
+'diff-src'                => 'πηγήν',
+'diff-with'               => '&#32;με $1 $2',
+'diff-with-final'         => '&#32;και $1 $2',
+'diff-width'              => 'πλάτος',
+'diff-height'             => '�ψος',
+'diff-td'                 => "'''κελλίον'''",
+'diff-dt'                 => "εις '''ό�ον ο�ισμο�'''",
+'diff-strike'             => "'''εγκά�σιον σβήσεμαν'''",
 
 # Search results
-'noexactmatch'             => "'''Η Βικιπαίδειαν 'κ εχ' σελίδαν με τ' όνεμαν \"\$1\".'''
+'searchresults'             => 'Ε��ον αποτελέσματα',
+'searchresults-title'       => 'Ε��ον αποτελέσματα για "$1"',
+'noexactmatch'              => "'''Η Βικιπαίδειαν 'κ εχ' σελίδαν με τ' όνεμαν \"\$1\".'''
 Εμπο�είτε να [[:\$1|εφτάτε ατέναν]].",
-'prevn'                    => '$1 π�οηγουμένων',
-'nextn'                    => '$1 επομένων',
-'viewprevnext'             => 'Τέ�εν ($1) ($2) ($3)',
-'search-suggest'           => 'Γιαμ α�αε�ετε: $1',
-'search-interwiki-caption' => 'Αδε�φικά έ�γα',
-'search-interwiki-more'    => '(πλέα)',
-'searchall'                => 'ο�λαι',
-'powersearch'              => 'Αναλυτικόν α�άεμαν',
-'search-external'          => 'Ε��ον σα εξ με�έαν',
+'prevn'                     => '$1 π�οηγουμένων',
+'nextn'                     => '$1 επομένων',
+'viewprevnext'              => 'Τέ�εν ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:Πε�ιεχόμενα',
+'searchprofile-images'      => 'Α�χεία',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 λέξη|$2 λέξεις}})',
+'search-redirect'           => '(το διπλόν ο σ�νδεσμον $1)',
+'search-section'            => "(κομμάτ' $1)",
+'search-suggest'            => 'Γιαμ α�αε�ετε: $1',
+'search-interwiki-caption'  => 'Αδε�φικά έ�γα',
+'search-interwiki-default'  => '$1 αποτελέσματα:',
+'search-interwiki-more'     => '(πλέα)',
+'search-mwsuggest-enabled'  => 'με οδηγίας',
+'search-mwsuggest-disabled' => 'θίχως οδηγίας',
+'searchall'                 => 'ο�λαι',
+'powersearch'               => 'Αναλυτικόν α�άεμαν',
+'powersearch-field'         => 'Α�άεμαν τη',
+'search-external'           => 'Ε��ον σα εξ με�έαν',
 
 # Preferences page
-'preferences'       => 'Αγαπεμένα',
-'mypreferences'     => "Τ' εμά τ' αγαπεμένα",
-'changepassword'    => 'Άλλαξον σημάδιν',
-'dateformat'        => 'Μο�φή ημε�ομηνίας',
-'datetime'          => 'Ημε�ομηνίαν και ώ�αν',
-'prefs-misc'        => 'Διαφ',
-'saveprefs'         => 'Αποθήκεμαν',
-'oldpassword'       => 'Παλαιόν σημάδιν:',
-'newpassword'       => 'Καινο��εον σημάδιν:',
-'retypenew'         => 'Γ�άψον ξαν το νέον σημάδιν:',
-'searchresultshead' => 'Ε��ον',
+'preferences'           => 'Αγαπεμένα',
+'mypreferences'         => "Τ' εμά τ' αγαπεμένα",
+'changepassword'        => 'Άλλαξον σημάδιν',
+'skin'                  => 'Όψην',
+'skin-preview'          => 'Π�ώτον τέ�εμαν',
+'math'                  => 'Απόδοσην μαθηματικίων',
+'dateformat'            => 'Μο�φή ημε�ομηνίας',
+'datetime'              => 'Ημε�ομηνίαν και ώ�αν',
+'math_unknown_function' => 'άγνω�ος συνά�τησην',
+'math_lexing_error'     => 'σφάλμαν λεξικής ανάλυσης',
+'math_syntax_error'     => 'σφάλμαν σ�νταξης',
+'prefs-rc'              => 'Υστε�νά αλλαγάς',
+'prefs-misc'            => 'Διαφ',
+'saveprefs'             => 'Αποθήκεμαν',
+'searchresultshead'     => 'Ε��ον',
+'timezonelegend'        => 'Χ�ονικόν ζώνην',
+'localtime'             => 'Τοπικόν χ�όνον:',
+'files'                 => 'Α�χεία',
+
+# User rights
+'userrights-groupsmember' => 'Μέλος τη:',
 
 # Groups
-'group-user'  => 'Χ�ήστες',
-'group-bot'   => 'Bots',
-'group-sysop' => '�οματέοι',
-'group-all'   => '(ο�λαι)',
-
-'group-user-member'  => 'Χ�ήστες',
-'group-bot-member'   => 'bot',
-'group-sysop-member' => '�οματέας',
-
-'grouppage-sysop' => '{{ns:project}}:�οματέοι',
+'group-user'          => 'Χ�ήστες',
+'group-autoconfirmed' => 'Αυτόματα βεβαιωμένοι χ�ηστ',
+'group-bot'           => 'Bots',
+'group-sysop'         => '�οματέοι',
+'group-bureaucrat'    => 'Γε�οντάδες',
+'group-suppress'      => 'Πα�αβλέμματα',
+'group-all'           => '(ο�λαι)',
+
+'group-user-member'          => 'Χ�ήστες',
+'group-autoconfirmed-member' => 'Αυτόματα βεβαιωμένος χ�ήστες',
+'group-bot-member'           => 'bot',
+'group-sysop-member'         => '�οματέας',
+'group-bureaucrat-member'    => 'Γέ�οντας',
+'group-suppress-member'      => 'Επόπτες',
+
+'grouppage-autoconfirmed' => '{{ns:project}}:Αυτόματα βεβαιωμένοι χ�ηστ',
+'grouppage-sysop'         => '{{ns:project}}:�οματέοι',
+'grouppage-bureaucrat'    => '{{ns:project}}:Γε�οντάδες',
+'grouppage-suppress'      => '{{ns:project}}:Επόπτες',
 
 # Rights
-'right-read'          => 'Δέβασον σελίδας',
+'right-read'          => 'Δεάβασον σελίδας',
 'right-edit'          => 'Άλλαξον σελίδας',
 'right-createpage'    => "Ποίσον σελίδας (ντο 'κ εν σελίδας καλατζεματί)",
 'right-createtalk'    => 'Ποίσον σελίδας καλατζεματί',
@@ -550,6 +611,11 @@ $messages = array(
 # User rights log
 'rightslog' => 'Α�χείον δικαιωματίων',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit'          => 'άλλαγμαν τη σελίδας',
+'action-upload'        => 'φό�τωσον αβο�το το α�χείον',
+'action-upload_by_url' => "φό�τωσον αβο�το το α�χείον ασ' έναν URL",
+
 # Recent changes
 'nchanges'                       => '$1 {{PLURAL:$1|αλλαγή|αλλαγάς}}',
 'recentchanges'                  => 'Υστε�νά αλλαγάς',
@@ -584,6 +650,7 @@ $messages = array(
 'upload'            => 'Φό�τωσον α�χείον',
 'uploadbtn'         => 'Φό�τωσον α�χείον',
 'reupload'          => 'Φό�τωσον αξάν',
+'reuploaddesc'      => 'Στα! Μην εφτάς το φό�τεμαν! Δέβα οπίς ση σελίδαν φω�τεματί!',
 'uploadnologin'     => "'Κ είστουν απές. Εμπάτε σην λογα�ίανεσουν.",
 'uploadnologintext' => "Π�επ' σην σελίδαν [[Special:UserLogin|απές]] να είσνε (log in) για πο�είτε να φο�τώνετε α�χεία.",
 'uploaderror'       => 'Έντον λάθος σο φό�τωμαν',
@@ -601,25 +668,28 @@ $messages = array(
 'upload-file-error' => 'Σφάλμαν απές με�έαν',
 'upload-misc-error' => 'Αναγνώ�ιμον λάθος φο�τωματί',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => 'α�χείον',
-'imagelist'             => 'Λίσταν εικονίων',
-'imagelist_date'        => 'Ημε�ομηνία',
-'imagelist_name'        => 'Όνεμαν',
-'imagelist_user'        => 'Χ�ήστες',
-'imagelist_size'        => 'Μέγεθος',
-'imagelist_description' => 'Σχόλιον',
-
-# Image description page
+'listfiles'             => 'Λίσταν εικονίων',
+'listfiles_date'        => 'Ημε�ομηνία',
+'listfiles_name'        => 'Όνεμαν',
+'listfiles_user'        => 'Χ�ήστες',
+'listfiles_size'        => 'Μέγεθος',
+'listfiles_description' => 'Σχόλιον',
+
+# File description page
 'filehist'                      => "Ιστο�ικόν τ' α�χείου",
 'filehist-help'                 => "Εφτάτε κλικ σ' έναν ημε�ομηνίαν/ώ�αν απάν αέτς για να τε�είτε πως έτον τ' α�χείον σ' εκείνεν την ώ�αν.",
 'filehist-current'              => 'υστε�ινά',
 'filehist-datetime'             => '��αν/Ημε�ομ.',
+'filehist-thumb'                => 'Εικονιδίον',
+'filehist-thumbtext'            => 'Εικονιδίον για την έκδοσην τη $1',
+'filehist-nothumb'              => "'Κ εν γ�αφικήν σ�νοψην (thumbnail)",
 'filehist-user'                 => 'Χ�ήστες',
 'filehist-dimensions'           => 'Διαστάσεις',
 'filehist-filesize'             => 'Μέγεθος',
 'filehist-comment'              => 'Σχόλιον',
-'imagelinks'                    => 'Σ�νδεσμοι',
+'imagelinks'                    => 'Σ�νδεσμοι α�χείων',
 'linkstoimage'                  => "Ατά τα {{PLURAL:$1|σελίδαν δεκνίζ'|$1 σελίδας δεκνίζ'νε}} σην εικόναν:",
 'nolinkstoimage'                => "'Κ εχ σελίδας ντο δεκνίζνε σ' αβο�τεν εικόναν.",
 'sharedupload'                  => "Αβο�τον τ' α�χείον εφο�τώθεν για κοινόν κουλάνεμαν κι εν δυνατόν να χ�ησιμοπισκάται και σ' άλλα έ�γα.",
@@ -635,6 +705,7 @@ $messages = array(
 
 # MIME search
 'mimesearch' => 'Α�άεμαν MIME',
+'mimetype'   => 'Τ�πον MIME:',
 
 # List redirects
 'listredirects' => 'Κατάλογον με διπλά συνδέσμ',
@@ -650,13 +721,15 @@ $messages = array(
 'randomredirect' => 'Τυχαία διπλά συνδέσμ',
 
 # Statistics
-'statistics' => 'Στατιστικήν',
+'statistics'       => 'Στατιστικήν',
+'statistics-pages' => 'Σελίδας',
 
 'disambiguations' => 'Σελίδας εξηγησίων',
 
 'doubleredirects' => 'Πε�ισσά διπλά συνδέσμ',
 
-'brokenredirects' => 'Τσακωμένα διπλά συνδέσμ',
+'brokenredirects'        => 'Τσακωμένα διπλά συνδέσμ',
+'brokenredirects-delete' => '(σβήσεμαν)',
 
 'withoutinterwiki'        => "Σελίδας ντο κ' έχνε συνδέσμ",
 'withoutinterwiki-legend' => 'Π�οθέκεμαν',
@@ -682,7 +755,7 @@ $messages = array(
 'mostcategories'          => "Σελίδας με τ' ασ' όλτς πολλά κατηγο�ίας",
 'mostimages'              => "Α�χεία με τ' ασόλων πλέα σελίδας ντο δεκνίζν' εκαικά",
 'mostrevisions'           => "Σελίδας με τ' ασόλων πλέα αλλαγάς",
-'prefixindex'             => 'Κατάλογος κατά π�όθεμαν',
+'prefixindex'             => 'Κατάλογον σελιδίων κατά π�όθεμαν',
 'shortpages'              => 'Μικ�ά σελίδας',
 'longpages'               => 'Τ�ανά σελίδας',
 'deadendpages'            => 'Αδιέξοδα σελίδας',
@@ -695,6 +768,7 @@ $messages = array(
 'movethispage'            => "Άλλαξον τ' όνεμα τη σελίδας",
 'pager-newer-n'           => '{{PLURAL:$1|κιάλλο καινο��εο 1|κιάλλο καινο��εα $1}}',
 'pager-older-n'           => '{{PLURAL:$1|κιάλλο παλαιόν 1|κιάλλο παλαιά $1}}',
+'suppress'                => 'Επόπτες',
 
 # Book sources
 'booksources'               => 'Βιβλιογ�αφικά πηγάς',
@@ -706,7 +780,6 @@ $messages = array(
 'speciallogtitlelabel' => 'Τίτλος:',
 'log'                  => 'Α�χεία',
 'all-logs-page'        => "Όλεα τ' α�χεία",
-'log-search-submit'    => 'Δέβα',
 
 # Special:AllPages
 'allpages'       => 'Όλεα τα σελίδας',
@@ -725,6 +798,12 @@ $messages = array(
 'categoriespagetext' => "Τ' αφκά τα κατηγο�ίας έχνε απές σελίδας και μέσα. [[Special:UnusedCategories|Κατηγο�ίας που 'κ εμεταχει�ίσκουνταν]] 'κ επο�είτε να ελέπετε τα αδακά.
 Τε�έστεν και τα [[Special:WantedCategories|κατηγο�ίας που χ�ειάσκουνταν]].",
 
+# Special:LinkSearch
+'linksearch' => 'Συνδέσμαι',
+
+# Special:Log/newusers
+'newuserlog-create-entry' => '�έον χ�ήστες',
+
 # Special:ListGroupRights
 'listgrouprights-rights' => 'Δικαιώματα',
 
@@ -733,24 +812,20 @@ $messages = array(
 'emailmessage' => 'Μένεμαν:',
 
 # Watchlist
-'watchlist'            => "Σελίδας ντ' ω�ιάζω",
-'mywatchlist'          => "Σελίδας ντ' ω�ιάζω",
-'watchlistfor'         => "(για '''$1''')",
-'addedwatch'           => 'Εθέκεν σην λίσταν ω�ιαγματί',
-'addedwatchtext'       => "Η σελίδαν \"[[:\$1]]\" επήγεν σον [[Special:Watchlist|κατάλογον ο�ιαγματί]] εσο�ν.
+'watchlist'         => "Σελίδας ντ' ω�ιάζω",
+'mywatchlist'       => "Σελίδας ντ' ω�ιάζω",
+'watchlistfor'      => "(για '''$1''')",
+'addedwatch'        => 'Εθέκεν σην λίσταν ω�ιαγματί',
+'addedwatchtext'    => "Η σελίδαν \"[[:\$1]]\" επήγεν σον [[Special:Watchlist|κατάλογον ο�ιαγματί]] εσο�ν.
 Μελλο�μενα αλλαγάς τ' ατεινές τη σελίδας θα γ�άφκουνταικεκά, και η σελίδαν θ' ευ�ίεται με γ�άμματα '''χοντ�ά''' σ' [[Special:RecentChanges|υστε�νά τ' αλλαγάς]] για να τε�είτετα καλίον.",
-'removedwatch'         => 'Αση λίσταν επά�θεν',
-'removedwatchtext'     => 'Η σελίδαν "[[:$1]]" νεβζινέθεν ασ\' [[Special:Watchlist|τ\'εσόν τον κατάλογον]].',
-'watch'                => 'Ω�ίαγμαν',
-'watchthispage'        => 'Ω�ίαν τη σελίδαν',
-'unwatch'              => "Τέλεμαν τ' ω�ιαγματί",
-'unwatchthispage'      => 'Τέλεμαν ω�ιαγματί',
-'watchlist-details'    => '{{PLURAL:$1|$1 σελίδα|$1 σελίδας}} ω�ιάσκουνταν, θέγα τα σελίδας καλατσεματί.',
-'wlshowlast'           => "Φανέ�ωμαν τ' υστε�ναίων $1 ω�ίων $2 ημε�ίων $3",
-'watchlist-hide-bots'  => "Κ��ψον τ' αλλαγάς τη bots",
-'watchlist-show-own'   => "Δείξον τ' αλλαγάς 'ιμ",
-'watchlist-hide-own'   => "Κ��ψον τ' αλλαγάς 'ιμ",
-'watchlist-hide-minor' => 'Κ��ψον τα μικ�ά αλλαγάς',
+'removedwatch'      => 'Αση λίσταν επά�θεν',
+'removedwatchtext'  => 'Η σελίδαν "[[:$1]]" νεβζινέθεν ασ\' [[Special:Watchlist|τ\'εσόν τον κατάλογον]].',
+'watch'             => 'Ω�ίαγμαν',
+'watchthispage'     => 'Ω�ίαν τη σελίδαν',
+'unwatch'           => "Τέλεμαν τ' ω�ιαγματί",
+'unwatchthispage'   => 'Τέλεμαν ω�ιαγματί',
+'watchlist-details' => '{{PLURAL:$1|$1 σελίδα|$1 σελίδας}} ω�ιάσκουνταν, θέγα τα σελίδας καλατσεματί.',
+'wlshowlast'        => "Φανέ�ωμαν τ' υστε�ναίων $1 ω�ίων $2 ημε�ίων $3",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ω�ιάζω...',
@@ -758,41 +833,47 @@ $messages = array(
 
 'changed'            => 'ελλάγεν',
 'created'            => 'έντον',
-'enotif_anon_editor' => 'ανόνυμον χ�ήστες $1',
-
-# Delete/protect/revert
-'deletepage'                  => 'Σβήσον τη σελίδαν',
-'exblank'                     => 'σελίδα έτον ε�και�ον',
-'historywarning'              => "Ω�ία: Η σελίδαν που θα σβήετε έχ' ιστο�ικόν:",
-'confirmdeletetext'           => "Είστουν σουμά σο σβήσεμαν είνος σελίδας και ο�λ' τ' ιστο�ίασατς εντάμαν.
-Πα�ακαλο�με σας να δίτε το τελικόν τη βεβαίωσην το θέλετε να εφτάτε το σβήσεμαν, τ' εγ�οικάτε τα συνέπειας τ' ατεινές τη π�άξης και τ' εφτάτ' ατεν με βάσην [[{{MediaWiki:Policy-url}}|τη πολιτικήν]].",
-'actioncomplete'              => 'Η ενέ�γειαν ετελέθεν',
-'deletedtext'                 => 'Το "<nowiki>$1</nowiki>" εσβήγανατο.
+'enotif_anon_editor' => 'ανώνυμον χ�ήστες $1',
+
+# Delete
+'deletepage'            => 'Σβήσον τη σελίδαν',
+'exblank'               => 'σελίδα έτον ε�και�ον',
+'historywarning'        => "Ω�ία: Η σελίδαν που θα σβήετε έχ' ιστο�ικόν:",
+'confirmdeletetext'     => "Είστουν σουμά σο σβήσεμαν είνος σελίδας και ο�λ' τ' ιστο�ίασατς εντάμαν.
+Πα�ακαλο�με σας να δείτε το τελικόν τη βεβαίωσην το θέλετε να εφτάτε το σβήσεμαν, τ' εγ�οικάτε τα συνέπειας τ' ατεινές τη π�άξης και τ' εφτάτ' ατεν με βάσην [[{{MediaWiki:Policy-url}}|τη πολιτικήν]].",
+'actioncomplete'        => 'Η ενέ�γειαν ετελέθεν',
+'deletedtext'           => 'Το "<nowiki>$1</nowiki>" εσβήγανατο.
 Τε�έστεν το $2 και δεαβάστεν για τα υστε�νά τα σβησίματα.',
-'deletedarticle'              => 'νεβζινέθεν η "[[$1]]"',
-'dellogpage'                  => "Κατάλογος με τ' ατά ντ' εσβήγαν",
-'deletecomment'               => 'Λόγον για το σβήσιμο:',
-'deleteotherreason'           => 'Άλλον/αλλομίαν λόγον:',
-'deletereasonotherlist'       => 'Άλλον λόγον',
-'rollbacklink'                => 'φέ�ον ξαν σην υστε�ναίαν',
+'deletedarticle'        => 'νεβζινέθεν η "[[$1]]"',
+'dellogpage'            => "Κατάλογος με τ' ατά ντ' εσβήγαν",
+'deletecomment'         => 'Λόγον για το σβήσιμο:',
+'deleteotherreason'     => 'Άλλον/αλλομίαν λόγον:',
+'deletereasonotherlist' => 'Άλλον λόγον',
+
+# Rollback
+'rollbacklink' => 'φέ�ον ξαν σην υστε�ναίαν',
+
+# Protect
 'protectlogpage'              => 'Α�χείον ασπαλιγματίων',
+'prot_1movedto2'              => '[[$1]] ετε�χλαε�τεν σο [[$2]]',
 'protectcomment'              => 'Σχόλιον:',
 'protectexpiry'               => 'Τελείται:',
 'protect_expiry_invalid'      => "Ο χ�όνος τελεματί 'κ εν σωστόν.",
 'protect_expiry_old'          => 'Ο χ�όνος τελεματί πέ�νιξον.',
 'protect-unchain'             => 'Άνοιξον τα δικαιώματα ετε�οχλάεματι',
-'protect-text'                => "Αδά επο�είτε να τε�είτε και ν' αλλάζετε τ' επίπεδον τη π�οστασίας για τη σελίδαν <strong><nowiki>$1</nowiki></strong>.",
+'protect-text'                => "Αδά επο�είτε να τε�είτε και ν' αλλάζετε τ' επίπεδον τη π�οστασίας για τη σελίδαν '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "Η λογα�ίανεσουν 'κ έχ' το δικαίωμαν να αλλάζ' τ' ασπάλιγμαν τη σελίδας.
-Αδά έχ' τ' ατω�ιζνά τα νομς για τη σελίδαν <strong>$1</strong>:",
+Αδά έχ' τ' ατω�ιζνά τα νομς για τη σελίδαν '''$1''':",
 'protect-cascadeon'           => "Αβο�τη η σελίδα ατώ�α εν ασπαλιγμένον: Εν απές {{PLURAL:$1|σ' ακόλουθουν τη σελίδαν, ντο έχ'|σ' ακόλουθα τα σελίδας, τ' έχνε}} ενε�γοποιημένον το διαδοχικόν τ' ασπάλιγμαν. Πο�είτε ν' ελλάζετε το επίπεδον ασπαλιγματί τη σελίδας, άμα αβο�το ξάι 'κ θ' αλλάζ' το διαδοχικόν τ' ασπάλιγμαν.",
-'protect-default'             => '(π�οεπιλεγμένον)',
+'protect-default'             => "Επιτ�έπ' ολς τοι χ�ηστς",
 'protect-fallback'            => 'Ψαλαφίον δικαιωματίων "$1"',
-'protect-level-autoconfirmed' => 'Ασπάλιγμαν χ�ηστίων θίχως λογα�ίαν',
+'protect-level-autoconfirmed' => 'Ασπάλιγμαν καινο��εων χ�ηστίων και θίχως λογα�ίαν',
 'protect-level-sysop'         => '�οματέοι μαναχόν',
 'protect-summary-cascade'     => 'διαδοχικόν',
 'protect-expiring'            => 'λήγει στις $1 (UTC)',
 'protect-cascade'             => "Ασπάλιγμαν σελιδίων ντ' είν απές σ' αβο�τεν σελίδαν (διαδοχικόν π�οστασίαν)",
 'protect-cantedit'            => "'Κι έχετε δικαίωμαν ν' αλλάζετε τ' επίπεδον ασπάλιγματι τ' ατεινές σελίδας.",
+'protect-expiry-options'      => '2 ώ�ας:2 hours,1 ημέ�α:1 day,3 ημέ�ας:3 days,1 εβδομάδα:1 week,2 εβδομάδας:2 weeks,1 μήνα:1 month,3 μήνας:3 months,6 μήνας:6 months,1 χ�όνο:1 year,αό�ιστα:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Δικαίωμαν:',
 'restriction-level'           => 'Επίπεδον πε�ιο�ισμο�:',
 
@@ -800,8 +881,11 @@ $messages = array(
 'restriction-upload' => "Σκώσ' ατό",
 
 # Undelete
-'undeletebtn'            => 'Ποίσον ξαν',
-'undelete-search-submit' => 'Ε��ον',
+'undeletebtn'               => 'Ποίσον ξαν',
+'undeletelink'              => 'επαναφο�ά',
+'undeletedarticle'          => 'επαναφο�ά τη "[[$1]]"',
+'undelete-search-submit'    => 'Ε��ον',
+'undelete-show-file-submit' => '�αι',
 
 # Namespace form on various pages
 'namespace'      => 'Πε�ιοχήν:',
@@ -824,20 +908,26 @@ $messages = array(
 'sp-contributions-submit'      => 'Α�άεμαν',
 
 # What links here
-'whatlinkshere'       => "�το δεκνίζ' αδακές",
-'whatlinkshere-title' => 'Σελίδας ντο συνδέουν ση σελίδαν $1',
-'whatlinkshere-page'  => 'Σελίδαν:',
-'linklistsub'         => "(Κατάλογον με τοι συνδέσμ')",
-'linkshere'           => "Αβο�τα τα σελίδας δεκνίζνε σο '''[[:$1]]''':",
-'nolinkshere'         => "'Κ ευ�έθεν σελίδα το δεκνίζ' ση σελίδαν '''[[:$1]]'''.",
-'isredirect'          => 'σελίδαν διπλο� σ�νδεσμονος',
-'istemplate'          => 'ενσωμάτωση',
-'whatlinkshere-prev'  => '{{PLURAL:$1|π�οτεσνή|π�οτεσνά $1}}',
-'whatlinkshere-next'  => '{{PLURAL:$1|υστε�νή|υστε�ναία $1}}',
-'whatlinkshere-links' => '� σ�νδεσμοι',
+'whatlinkshere'            => "�το δεκνίζ' αδακές",
+'whatlinkshere-title'      => 'Σελίδας ντο συνδέουν ση σελίδαν $1',
+'whatlinkshere-page'       => 'Σελίδαν:',
+'linkshere'                => "Αβο�τα τα σελίδας δεκνίζνε σο '''[[:$1]]''':",
+'nolinkshere'              => "'Κ ευ�έθεν σελίδα το δεκνίζ' ση σελίδαν '''[[:$1]]'''.",
+'isredirect'               => 'σελίδαν διπλο� σ�νδεσμονος',
+'istemplate'               => 'ενσωμάτωση',
+'isimage'                  => 'σ�νδεσμον εικόνας',
+'whatlinkshere-prev'       => '{{PLURAL:$1|π�οτεσνή|π�οτεσνά $1}}',
+'whatlinkshere-next'       => '{{PLURAL:$1|υστε�νή|υστε�ναία $1}}',
+'whatlinkshere-links'      => '� σ�νδεσμοι',
+'whatlinkshere-hideredirs' => '$1 τα διπλά οι συνδέσμαι',
+'whatlinkshere-hidetrans'  => '$1 υπε�κλεισμοί',
+'whatlinkshere-hidelinks'  => '$1 συνδέσμαι',
+'whatlinkshere-hideimages' => '$1 συνδέσμαι εικονίων',
+'whatlinkshere-filters'    => 'Φίλτ�α',
 
 # Block/unblock
 'blockip'            => 'Ασπάλιγμαν τη χ�ήστε',
+'blockip-legend'     => 'Ασπάλισον το χ�ήστ',
 'ipbexpiry'          => 'Τέλεμαν:',
 'ipbreason'          => 'Αιτία:',
 'ipbreasonotherlist' => 'Άλλον αιτία',
@@ -933,19 +1023,20 @@ $messages = array(
 'import-noarticle'        => "'Κ εχ' σελίδαν για έμπαζμαν!",
 
 # Import log
-'importlogpage' => 'Α�χείον εμπαζματίων',
+'importlogpage'             => 'Α�χείον εμπαζματίων',
+'import-logentry-interwiki' => 'εγέντον εισαγωγήν transwiki σην σελίδαν $1',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "Τ' εμόν η σελίδαν",
-'tooltip-pt-mytalk'               => "Σελίδαν με τ' εμά τα καλατσέματα",
+'tooltip-pt-userpage'             => "Τ' εσόν η σελίδαν",
+'tooltip-pt-mytalk'               => "Τ' εσόν το καλάτσεμαν",
 'tooltip-pt-preferences'          => "Τ' εμά τα π�οτιμήσεις",
 'tooltip-pt-watchlist'            => "Λίστα με τα σελίδας ντ' ω�ιάζω",
-'tooltip-pt-mycontris'            => "Λίστα με τα δουλείας ντ' εποίκα",
+'tooltip-pt-mycontris'            => "Λίστα με τα δουλείας ντ' εποίκες",
 'tooltip-pt-login'                => "Μπο�είτε νε εφτάτε λογα�ίαν άμα 'κ π�επ'.",
 'tooltip-pt-logout'               => 'Απιδεβένετεν τη Βικιπαίδειαν',
 'tooltip-ca-talk'                 => "Γονο�σεμαν γι' αβο�τον τ' ά�θ�ον",
 'tooltip-ca-edit'                 => "Άλλαγμαν τη σελίδας. Άμαν τε�έστεν τ' αλλαγάς π�ιν θα κ�ατείτε ατά.",
-'tooltip-ca-addsection'           => "Βαλέστε σχόλιον σ' αβο�το το γουνο�σεμα.",
+'tooltip-ca-addsection'           => "Α�χίνεστε καινο��εον κομμάτ'.",
 'tooltip-ca-viewsource'           => "Ατό η σελίδαν εν ασπαλιγμένον. Άμαν μπο�είτε να τε�είτε το κείμενον ατ'ς.",
 'tooltip-ca-history'              => 'Παλαιά εκδώσεις τη σελίδας.',
 'tooltip-ca-protect'              => 'Ασπάλιγμα τη σελίδας',
@@ -962,6 +1053,8 @@ $messages = array(
 'tooltip-n-randompage'            => 'Κατά τ�χην ε��ον σελίδαν και δείξον ατέν',
 'tooltip-n-help'                  => "Αδά θα ευ�ίετε τα απαντήσεις ντ' α�αε�ετε.",
 'tooltip-t-whatlinkshere'         => "Ο�λ' τ' ά�θ�α ντο δεκνίζνε σο πα�όν το ά�θ�ον",
+'tooltip-feed-rss'                => 'RSS συνδ�ομή για την σελίδαν ατέν',
+'tooltip-feed-atom'               => 'Atom συνδ�ομή για την σελίδαν ατέν',
 'tooltip-t-contributions'         => 'Τε�έστεν τη λίσταν με τα συνεισφο�άντας τη χ�ήστε',
 'tooltip-t-emailuser'             => "E-mail σ' αβο�τον χ�ήστεν",
 'tooltip-t-upload'                => 'Φό�τωμα α�χείων',
@@ -985,6 +1078,9 @@ $messages = array(
 # Attribution
 'others' => "άλλ'",
 
+# Spam protection
+'spamprotectiontitle' => 'Φίλτ�ον π�οστασίας ασό σπαμ',
+
 # Patrol log
 'patrol-log-auto' => '(αυτόματον)',
 
@@ -993,16 +1089,18 @@ $messages = array(
 'nextdiff'     => 'Άλλον διαφο�ά →',
 
 # Media information
+'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|σελίδα|σελίδας}}',
 'file-info-size'       => '($1 × $2 εικονοστοιχεία, μέγεθος α�χείου: $3, MIME τ�πος: $4)',
 'file-nohires'         => "<small>'Κ εχ κι άλλο ψηλόν ανάλυσην.</small>",
 'svg-long-desc'        => "(Α�χείον SVG, κατ' όνομα $1 × $2 εικονοστοιχεία, μέγεθος α�χεί: $3)",
 'show-big-image'       => 'Τζιπ τ�ανόν ανάλυση',
 'show-big-image-thumb' => "<small>Μέγεθος τη π�ώτ' τε�εματί: $1 × $2 εικονοστοιχεία</small>",
 
-# Special:NewImages
-'newimages' => 'Τε�έστεν τα καινο��εα φωτογ�αφίας',
-'ilsubmit'  => 'Α�άεμαν',
-'bydate'    => 'ημε�ομηνίας',
+# Special:NewFiles
+'newimages'        => 'Τε�έστεν τα καινο��εα φωτογ�αφίας',
+'newimages-legend' => 'Φίλτ�ον',
+'ilsubmit'         => 'Α�άεμαν',
+'bydate'           => 'ημε�ομηνίας',
 
 # Bad image list
 'bad_image_list' => "Η σ�νταξην εν αέτς:
@@ -1039,18 +1137,27 @@ $messages = array(
 'exif-xresolution'                 => 'Ο�ιζόντιον ανάλυση',
 'exif-yresolution'                 => 'Κατακό�υφον ανάλυση',
 'exif-resolutionunit'              => 'Μονάδα μέτ�ησης ανάλυσης X και Y',
-'exif-stripoffsets'                => 'Τοποθέτηση δεδομενίων εικόνας',
+'exif-stripoffsets'                => 'Τοποθέτηση δογμενίων εικόνας',
 'exif-stripbytecounts'             => 'Bytes ανά συμπιεσμένον λω�ίδα',
 'exif-jpeginterchangeformat'       => 'Μετάθεση σε JPEG SOI',
-'exif-jpeginterchangeformatlength' => 'Bytes δεδομενίων JPEG',
+'exif-jpeginterchangeformatlength' => 'Bytes δογμενίων JPEG',
 'exif-transferfunction'            => 'Λειτου�γία μεταφο�άς',
 'exif-whitepoint'                  => "Χ�ωματικόν π�οσδιο�ισμός τ' άσπ�ου",
 'exif-primarychromaticities'       => 'Π�ωτε�οντες χ�ωματισμοί',
 'exif-imagedescription'            => 'Τίτλος εικόνας',
 
+'exif-subjectdistance-value' => '$1 μέτ�α',
+
+'exif-meteringmode-3' => 'Μονοσημειακόν',
+
 'exif-focalplaneresolutionunit-2' => 'ίντζας',
 
+'exif-subjectdistancerange-1' => 'Macro',
+
+'exif-gpsstatus-v' => 'Διαλειτου�γικότητα μετ�ησίων',
+
 # Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-m' => 'Μίλιαν την ώ�αν',
 'exif-gpsspeed-n' => 'Κο�δίλαι',
 
 # External editor support
@@ -1067,8 +1174,8 @@ $messages = array(
 # Delete conflict
 'recreate' => 'Ποίσον αξάν',
 
-# AJAX search
-'useajaxsearch' => "Κουλάνεμαν τ' α�αεματί AJAX",
+# action=purge
+'confirm_purge_button' => 'Εγέντον',
 
 # Multipage image navigation
 'imgmultipageprev' => '� π�ωτεζνόν σελίδα',
@@ -1077,6 +1184,8 @@ $messages = array(
 'imgmultigoto'     => 'Δέβα σην σελίδαν $1',
 
 # Table pager
+'ascending_abbrev'         => 'ανεβ',
+'descending_abbrev'        => 'κατεβ',
 'table_pager_next'         => 'Επόμενον σελίδα',
 'table_pager_prev'         => 'Π�ωτεζνόν σελίδα',
 'table_pager_first'        => 'Π�ώτον σελίδα',
@@ -1084,7 +1193,7 @@ $messages = array(
 'table_pager_limit_submit' => 'Δέβα',
 
 # Auto-summaries
-'autosumm-new' => 'Καινο��εον σελίδα: $1',
+'autosumm-new' => "Καινο��εον σελίδαν με '$1'",
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Τε�έστεν σοβα�ά αλλαγάς',
@@ -1094,10 +1203,14 @@ $messages = array(
 # Special:Version
 'version'                  => 'Έκδοση', # Not used as normal message but as header for the special page itself
 'version-specialpages'     => 'Ειδικά σελίδας',
+'version-other'            => 'Αλλέτε�α',
+'version-hooks'            => 'Αγκιστ�ία',
+'version-license'          => 'Ἀδεια',
 'version-software-version' => 'Έκδοση',
 
 # Special:FilePath
-'filepath-page' => 'Α�χείον:',
+'filepath-page'   => 'Α�χείον:',
+'filepath-submit' => 'Διαδ�ομή',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch-filename' => 'Όνεμα α�χείου:',
@@ -1105,6 +1218,9 @@ $messages = array(
 
 # Special:SpecialPages
 'specialpages'             => 'Ειδικά σελίδας',
-'specialpages-group-other' => 'Αλέτε�α ειδικά σελίδας',
+'specialpages-group-other' => 'Αλλέτε�α ειδικά σελίδας',
+
+# Special:BlankPage
+'blankpage' => 'Κενόν σελίδα',
 
 );
diff --git a/languages/messages/MessagesPs.php b/languages/messages/MessagesPs.php
index 39071131..c675e198 100644
--- a/languages/messages/MessagesPs.php
+++ b/languages/messages/MessagesPs.php
@@ -7,39 +7,15 @@
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
 
-$specialPageAliases = array(
-	'Shortpages'                => array( 'لنډ_مخونه' ),
-	'Longpages'                 => array( 'اوږده_مخونه' ),
-	'Newpages'                  => array( 'نوي_مخونه' ),
-	'Protectedpages'            => array( 'ژغورلي_مخونه' ),
-	'Protectedtitles'           => array( 'ژغورلي_سرليکونه' ),
-	'Allpages'                  => array( 'ټول_مخونه' ),
-	'Categories'                => array( 'و�شنيز�' ),
-	'Mypage'                    => array( 'زما_پاڼه' ),
-	'Search'                    => array( 'لټون' ),
-);
-
-$skinNames = array(
-	'standard'    => 'کلاسيک',
-	'nostalgia'   => 'نوستالژي',
-	'cologneblue' => 'شين کلون',
-	'monobook'    => 'مونوبوک',
-	'myskin'      => 'زمابڼه',
-	'chick'       => 'شيک',
-	'simple'      => 'ساده',
-	'modern'      => 'نوی',
-);
-
 $namespaceNames = array(
 	NS_MEDIA          => 'رسن�',
 	NS_SPECIAL        => '�انګړی',
 	NS_TALK           => 'خبر�_اتر�',
 	NS_USER           => 'کارونکی',
 	NS_USER_TALK      => 'د_کارونکي_خبر�_اتر�',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => 'د_$1_خبر�_اتر�',
-	NS_IMAGE          => 'ان�ور',
-	NS_IMAGE_TALK     => 'د_ان�ور_خبر�_اتر�',
+	NS_FILE           => 'ان�ور',
+	NS_FILE_TALK      => 'د_ان�ور_خبر�_اتر�',
 	NS_MEDIAWIKI      => 'ميډياويکي',
 	NS_MEDIAWIKI_TALK => 'د_ميډياويکي_خبر�_اتر�',
 	NS_TEMPLATE       => 'کينډ�',
@@ -50,6 +26,43 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'د_و�شنيز�_خبر�_اتر�',
 );
 
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'ننوتل' ),
+	'Userlogout'                => array( 'وتل' ),
+	'CreateAccount'             => array( 'کارن-حساب جوړول' ),
+	'Preferences'               => array( 'غوره توبونه' ),
+	'Watchlist'                 => array( 'کتلی لړليک' ),
+	'Recentchanges'             => array( 'اوسني بدلونونه' ),
+	'Upload'                    => array( 'پورته کول' ),
+	'Listfiles'                 => array( 'د ان�ورونو لړليک' ),
+	'Newimages'                 => array( 'نوي ان�ورونه' ),
+	'Listusers'                 => array( 'د کارونکو لړليک' ),
+	'Randompage'                => array( 'ناټاکلی، ناټاکلی مخ' ),
+	'Lonelypages'               => array( 'يتيم مخونه' ),
+	'Shortpages'                => array( 'لنډ مخونه' ),
+	'Longpages'                 => array( 'اوږده مخونه' ),
+	'Newpages'                  => array( 'نوي مخونه' ),
+	'Ancientpages'              => array( 'لرغوني مخونه' ),
+	'Protectedpages'            => array( 'ژغورلي مخونه' ),
+	'Protectedtitles'           => array( 'ژغورلي سرليکونه' ),
+	'Allpages'                  => array( 'ټول مخونه' ),
+	'Specialpages'              => array( '�انګړي مخونه' ),
+	'Contributions'             => array( 'ونډ�' ),
+	'Categories'                => array( 'و�شنيز�' ),
+	'Export'                    => array( 'صادرول' ),
+	'Version'                   => array( 'بڼه' ),
+	'Allmessages'               => array( 'ټول-پيغامونه' ),
+	'Log'                       => array( 'يادښتونه، يادښت' ),
+	'Undelete'                  => array( 'ناړنګول' ),
+	'Mypage'                    => array( 'زما پاڼه' ),
+	'Mytalk'                    => array( 'زما خبر� اتر�' ),
+	'Mycontributions'           => array( 'زماونډ�' ),
+	'Popularpages'              => array( 'نامتومخونه' ),
+	'Search'                    => array( 'لټون' ),
+	'LinkSearch'                => array( 'د تړن� پلټنه' ),
+	'DeletedContributions'      => array( 'ړنګ� شوي ونډ�' ),
+);
+
 $magicWords = array(
 	'notoc'               => array( '0', '__بی‌نيولک__', '__NOTOC__' ),
 	'nogallery'           => array( '0', '__بی‌نندارتونه__', '__NOGALLERY__' ),
@@ -124,8 +137,6 @@ $messages = array(
 'underline-always' => 'تل',
 'underline-never'  => 'ه�څکله',
 
-'skinpreview' => '(مخکتنه)',
-
 # Dates
 'sunday'        => 'اتوار',
 'monday'        => 'Ú«Ù„',
@@ -203,7 +214,7 @@ $messages = array(
 'newwindow'      => '(په نو� کړک� ک� پرانيستل ک�ږي)',
 'cancel'         => 'کوره کول',
 'qbfind'         => 'موندل',
-'qbedit'         => 'سمادول',
+'qbedit'         => 'سمون',
 'qbpageoptions'  => 'همدا مخ',
 'qbpageinfo'     => 'متن',
 'qbmyoptions'    => 'زما پاڼ�',
@@ -213,7 +224,7 @@ $messages = array(
 'mytalk'         => 'زما خبر� اتر�',
 'anontalk'       => 'دد� IP لپاره خبر� اتر�',
 'navigation'     => 'ګر�ښت',
-'and'            => 'او',
+'and'            => '&#32;او',
 
 # Metadata in edit box
 'metadata_help' => 'م�ټاډاټا:',
@@ -230,11 +241,11 @@ $messages = array(
 'history_short'     => 'پ�ښليک',
 'info_short'        => 'مالومات',
 'printableversion'  => 'د چاپ بڼه',
-'permalink'         => 'تلپات� تړن',
+'permalink'         => 'تلپات� تړنه',
 'print'             => 'چاپ',
-'edit'              => 'سمادول',
+'edit'              => 'سمون',
 'create'            => 'جوړول',
-'editthispage'      => 'دا مخ سماد کړی',
+'editthispage'      => 'همدا مخ سمول',
 'create-this-page'  => 'همدا مخ ليکل',
 'delete'            => 'ړنګول',
 'deletethispage'    => 'دا مخ ړنګ کړه',
@@ -248,14 +259,14 @@ $messages = array(
 'talkpagelinktext'  => 'خبر� اتر�',
 'specialpage'       => '�انګړ� پاڼه',
 'personaltools'     => 'شخصي اوزار',
-'postcomment'       => 'يوه تبصره ليکل',
+'postcomment'       => 'نو� برخه',
 'articlepage'       => 'د مخ م�ن�پانګه ښکاره کول',
 'talk'              => 'خبر� اتر�',
 'views'             => 'کتن�',
 'toolbox'           => 'اوزاربکس',
 'userpage'          => 'د کاروونکي پاڼه ښکاره کول',
 'projectpage'       => 'د پروژ� مخ ښکاره کول',
-'imagepage'         => 'د ان�ورونو مخ کتل',
+'imagepage'         => 'د دوتن� مخ کتل',
 'mediawikipage'     => 'د پيغامونو مخ کتل',
 'templatepage'      => 'د کينډ� مخ ښکاره کول',
 'viewhelppage'      => 'د لارښود مخ کتل',
@@ -274,31 +285,27 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'د {{SITENAME}} په اړه',
 'aboutpage'            => 'Project:په اړه',
-'bugreports'           => 'د ستونزو راپورونه',
-'bugreportspage'       => 'Project:د ستونزو راپور',
 'copyright'            => 'دا م�ن�پانګه د $1 له مخ� ستاسو لاس رسي لپاره دلته ده.',
 'copyrightpagename'    => 'د {{SITENAME}} رښت�',
 'copyrightpage'        => '{{ns:project}}:رښت�',
 'currentevents'        => 'اوسن� پ�ښ�',
-'currentevents-url'    => 'Project:اوسن� پ�ښ�',
+'currentevents-url'    => 'Project:تازه پ�ښ�',
 'disclaimers'          => 'ردادعاليکونه',
 'disclaimerpage'       => 'Project:ټولګړی ردادعاليک',
-'edithelp'             => 'د لارښود سماد',
-'edithelppage'         => 'Help:سماد�دنه',
-'helppage'             => 'Help:لړليک',
+'edithelp'             => 'د لارښود سمون',
+'edithelppage'         => 'Help:سمونه',
+'helppage'             => 'Help:نيوليک',
 'mainpage'             => 'لومړی مخ',
 'mainpage-description' => 'لومړی مخ',
 'policy-url'           => 'Project:تګلاره',
 'portal'               => 'ټولګړی ورټک',
-'portal-url'           => 'Project:ټولګړی ورټک',
+'portal-url'           => 'Project:د ټولن� ورټک',
 'privacy'              => 'د محرميت تګلاره',
 'privacypage'          => 'Project:د محرميت_تګلاره',
 
 'badaccess'        => 'د لاسرس� ت�روتنه',
 'badaccess-group0' => 'تاسو د غوښتل شو� کړن� د ترسره کولو اجازه نه لر�.',
-'badaccess-group1' => 'د کوم� کړن� غوښتنه چ� تاسو کړ� د $1 د ډل� کارونکو پور� محدوده ده.',
-'badaccess-group2' => 'د کوم� کړن� غوښتنه چ� تاسو کړ� د هغو کارونکو پور� محدوده ده کوم چ� يو د $1 د ډل� څخه دي.',
-'badaccess-groups' => 'د کوم� کړن� غوښتنه چ� تاسو کړ� د هغو کارونکو پور� محدوده ده کوم چ� يو د $1 د ډل� څخه دي.',
+'badaccess-groups' => 'د کوم� کړن� غوښتنه چ� تاسو کړ� د هغو کارونکو پور� محدوده ده چ� {{PLURAL:$2|په ډله د|په ډلو د}}: $1 ک� دي.',
 
 'ok'                      => 'هو',
 'retrievedfrom'           => 'همدا مخ له "$1" څخه رااخيستل شوی',
@@ -306,9 +313,11 @@ $messages = array(
 'newmessageslink'         => 'نوي پيغامونه',
 'newmessagesdifflink'     => 'وروستی بدلون',
 'youhavenewmessagesmulti' => 'ستاسو لپاره په $1 ک� نوي پ�غام راغلي.',
-'editsection'             => 'سمادول',
-'editold'                 => 'سمادول',
+'editsection'             => 'سمول',
+'editold'                 => 'سمول',
 'viewsourceold'           => 'سرچين� کتل',
+'editlink'                => 'سمول',
+'viewsourcelink'          => 'سرچينه کتل',
 'editsectionhint'         => 'د سمادلو برخه: $1',
 'toc'                     => 'نيوليک',
 'showtoc'                 => 'ښکاره کول',
@@ -318,13 +327,13 @@ $messages = array(
 'site-atom-feed'          => '$1 د اټوم کتنه',
 'page-rss-feed'           => '"$1" د آر اس اس کتنه',
 'feed-rss'                => 'آر اس اس',
-'red-link-title'          => '$1 (تر اوسه پور� نه دی ليکل شوی)',
+'red-link-title'          => '$1 (تر اوسه پور� نه شته)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ليکنه',
 'nstab-user'      => 'د کارونکي پاڼه',
 'nstab-media'     => 'د رسن� مخ',
-'nstab-special'   => '�انګړی',
+'nstab-special'   => '�انګړی مخ',
 'nstab-project'   => 'د پروژ� مخ',
 'nstab-image'     => 'دوتنه',
 'nstab-mediawiki' => 'پيغام',
@@ -354,7 +363,7 @@ $messages = array(
 'badarticleerror'      => 'دا کړنه پد� مخ نه شي ترسره ک�دلای.',
 'cannotdelete'         => 'د اړونده مخ يا دوتن� ړنګ�دنه ترسره نه شوه.  (ک�دای شي چ� دا د بل چا لخوا نه پخوا ړنګه شو� وي.)',
 'badtitle'             => 'ناسم سرليک',
-'badtitletext'         => 'ستاسو د غوښتل شوي مخ سرليک يا سم نه وو، د سرليک �ای تش وو او يا هم د ژبو خپلمن�ي تړن� څخه يا د ويکي ګانو خپلمن�ي سرليکونو څخه يو ناسم توری پک� کارول شوی.
+'badtitletext'         => 'يا خو ستاسو د غوښتل شوي مخ سرليک سم نه وو، د سرليک �ای مو تش وو او يا هم د ژبو خپلمن�ي تړن� څخه يا د ويکي ګانو خپلمن�ي سرليکونو څخه يو ناسم توری پک� کارول شوی.
 ک�دای شي چ� ستاسو په ورکړ شوي سرليک ک� يو يا ګڼ شم�ر داس� توري وي چ� د سرليک په توګه بايد و نه کار�ږي.',
 'viewsource'           => 'سرچينه کتل',
 'viewsourcefor'        => 'د $1 لپاره',
@@ -369,10 +378,10 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => 'کارن-حساب نه وتنه',
-'logouttext'                 => '<strong>تاسو اوس د غونډال نه ووتلی.</strong>
+'logouttext'                 => "'''تاسو اوس د غونډال نه ووتلی.'''
 
 تاسو کولای شی چ� پرته د کارن-نوم نه {{SITENAME}} په ورکنومي توګه وکاروی، او يا هم تاسو کولای شی چ� په همد� کارن-نوم يا په کوم بل کارن-نوم خپل� ليکن� خپر� کړی. 
-يادونه د� وي چ� �ين� مخونو ک� به تاسو لا تر اوسه پور� غونډال ک� ننوتي ښکاری، تر څو تاسو د خپل کتنمل حا�ظه نه وي سپينه کړی.',
+يادونه د� وي چ� �ين� مخونو ک� به تاسو لا تر اوسه پور� غونډال ک� ننوتي ښکاری، تر څو تاسو د خپل کتنمل حا�ظه نه وي سپينه کړی.",
 'welcomecreation'            => '==$1 ښه راغلاست! ==
 
 ستاسو کارن-حساب جوړ شو. لط�اً د [[Special:Preferences|{{SITENAME}} غوره توبونو]] بدلول مو مه ه�روی.',
@@ -381,7 +390,6 @@ $messages = array(
 'yourpassword'               => 'پټنوم:',
 'yourpasswordagain'          => 'پټنوم بيا وليکه',
 'remembermypassword'         => 'زما پټنوم پد� کمپيوټر په ياد ولره!',
-'loginproblem'               => '<b>همد� غونډال ته ستاسو په ننوتنه ک� يوه ستونزه راپ�ښه شوه!</b><br />بيا ي� وآزموي�!',
 'login'                      => 'ننوتل',
 'nav-login-createaccount'    => 'ننوتل / کارن-حساب جوړول',
 'loginprompt'                => 'دد� لپاره چ� {{SITENAME}} ک� ننو�� نو بايد چ� ستاسو د کمپيوټر کوکيز چارن وي.',
@@ -406,7 +414,7 @@ $messages = array(
 'yourlanguage'               => 'ژبه:',
 'yournick'                   => 'کورنی نوم:',
 'badsiglength'               => 'ستاسو لاسليک ډ�ر اوږد دی.
-پکار ده چ� لاسليک مو له $1 {{PLURAL:$1|توری|تورو}} نه لږ وي.',
+بايد چ� لاسليک مو له $1 {{PLURAL:$1|توري|تورو}} نه لږ وي.',
 'email'                      => 'بر�ښليک',
 'prefs-help-realname'        => 'د اصلي نوم ليکل ستاسو په خوښه دی خو که تاسو خپل اصلي نوم وټاک� پد� سره به ستاسو ټول کارونه او ونډ� ستاسو د نوم په اړوندولو ک� وکار�ږي.',
 'loginerror'                 => 'د ننوتن� ستونزه',
@@ -423,8 +431,9 @@ $messages = array(
 'noname'                     => 'تاسو تر اوسه پور� کوم کره کارن نوم نه دی �انګړی کړی.',
 'loginsuccesstitle'          => 'ننوتل مو برياليتوب سره ترسره شوه',
 'loginsuccess'               => "'''تاسو اوس {{SITENAME}} ک� د \"\$1\" په نوم ننوتي ياست.'''",
-'nosuchuser'                 => 'د "$1" په نامه ه�څ کوم کارونکی نه شته.
-مهرباني وکړی خپل ټاپ کړی نوم وګوری چ� سم مو ليکلی او که نه، او يا هم �ان ته [[Special:UserLogin/signup|يو نوی کارن-حساب جوړ کړی]].',
+'nosuchuser'                 => 'د "$1" په نوم ه�څ کارونکی نشته.
+د کارونکو نومونه د غټو او واړو تورو سره حساس دي.
+خپل حجا وڅار�، او يا هم [[Special:UserLogin/signup|يو نوی کارن-حساب جوړ کړی]].',
 'nosuchusershort'            => 'د "<nowiki>$1</nowiki>" په نوم ه�څ کوم کارن-حساب نشته. لط�اً خپل د نوم ليکل� بڼ� ته �ير شی چ� پک� ت�روتنه نه وي.',
 'nouserspecified'            => 'تاسو �ان ته کوم کارن نوم نه دی �انګړی کړی.',
 'wrongpassword'              => 'ناسم پټنوم مو ليکلی. لط�اً يو �ل بيا ي� وليک�.',
@@ -440,14 +449,15 @@ $messages = array(
 
 که چ�رته ستاسو نه پرته کوم بل چا دغه غوښتنه کړ� وي او يا هم تاسو ته ب�رته خپل پټنوم در پزړه شوی وي او تاسو د خپل پټنوم بدلول نه غواړ�، نو تاسو همدا پيغام باب�زه وګڼ� او د پخوا په څ�ر خپل هماغه پخوانی پټنوم وکاروی.',
 'noemail'                    => 'د "$1" کارونکي په نامه ه�څ کومه بر�ښليک پته نه ده ثبته شو�.',
-'passwordsent'               => 'د "$1" په نوم ثبت شوي غړي/غړ� لپاره يو نوی پټنوم د هغه/هغ� د بر�ښليک پت� ته ول�ږل شو.
+'passwordsent'               => 'د "$1" لپاره يو نوی پټنوم د هغه/هغ� د بر�ښليک پت� ته ول�ږل شو.
 لط�اً کله چ� پټنوم مو ترلاسه کړ نو بيا غونډال ته ننو��.',
 'blocked-mailpassword'       => 'ستاسو په IP پت� بنديز لګ�دلی او تاسو نه شی کولای چ� ليکن� وکړی، په همد� توګه تاسو نه شی کولای چ� د پټنوم د پر�ای کولو کړن� وکاروی دا دد� لپاره چ� د وراني مخنيوی وشي.',
 'eauthentsent'               => 'ستاسو ورکړ شو� بر�ښليک پت� ته مو يو تاييدي بر�ښليک درول�ږی.
 تر د� دمخه چ� ستاسو کارن-حساب ته کوم بل بر�ښليک درول�ږو، پکار ده چ� تاسو په بر�ښليک ک� درل�ږل شو� لارښوون� پلي کړی او دد� پخلی وکړی چ� همدا کارن-حساب په رښتيا ستاسو دی.',
 'mailerror'                  => 'د بر�ښليک د ل�ږلو ستونزه: $1',
-'acct_creation_throttle_hit' => 'اوبښ�، تاسو وار دمخ� پدغه $1 نوم کارن-حساب جوړ کړی. تاسو نه شی کولای چ� نور جوړ کړی.',
-'emailauthenticated'         => 'ستاسو بر�ښليک پته په $1 د منلو وړ وګر��ده.',
+'acct_creation_throttle_hit' => 'اوبښ�، تاسو د پخوا نه {{PLURAL:$1|1 کارن-حساب جوړ کړی|$1 کارن-حسابونه جوړ کړي}}. 
+تاسو نه شی کولای چ� نور جوړ کړی.',
+'emailauthenticated'         => 'ستاسو بر�ښليک پته په $2 ن�ټه په $3 بجو د منلو وړ وګر��ده.',
 'emailnotauthenticated'      => 'ستاسو د بر�ښليک پته لا تر اوسه پور� د منلو وړ نه ده ګر��دل�. د اړوندو ب�لوونکو نښو په هکله تاسو ته ه�څ کوم بر�ښليک نه ل�ږل ک�ږي.',
 'noemailprefs'               => 'دد� لپاره چ� دا کړن� کار وکړي نو تاسو يو بر�ښليک وټاک�.',
 'emailconfirmlink'           => 'د خپل د بر�ښليک پت� پخلی وکړی',
@@ -457,8 +467,14 @@ $messages = array(
 'loginlanguagelabel'         => 'ژبه: $1',
 
 # Password reset dialog
-'resetpass_bad_temporary' => 'لنډمهالی پټنوم مو سم نه دی. ک�دای شي تاسو وار دمخ� خپل پټنوم برياليتوب سره بدل کړی وي او يا هم د نوي لنډمهالي پټنوم غوښتنه مو کړ� وي.',
-'resetpass_forbidden'     => 'پټنومونه مو نه شي بدل�دلای',
+'resetpass'                 => 'پټنوم بدلول',
+'oldpassword'               => 'زوړ پټنوم:',
+'newpassword'               => 'نوی پټنوم:',
+'retypenew'                 => 'نوی پټنوم بيا وليکه:',
+'resetpass_bad_temporary'   => 'لنډمهالی پټنوم مو سم نه دی. ک�دای شي تاسو وار دمخ� خپل پټنوم برياليتوب سره بدل کړی وي او يا هم د نوي لنډمهالي پټنوم غوښتنه مو کړ� وي.',
+'resetpass_forbidden'       => 'پټنومونه مو نه شي بدل�دلای',
+'resetpass-submit-loggedin' => 'پټنوم بدلول',
+'resetpass-temp-password'   => 'لنډمهالی پټنوم:',
 
 # Edit page toolbar
 'bold_sample'     => 'روڼ ليک',
@@ -466,7 +482,7 @@ $messages = array(
 'italic_sample'   => 'کوږ ليک',
 'italic_tip'      => 'کوږ ليک',
 'link_sample'     => 'د تړن سرليک',
-'link_tip'        => 'کورنی تړن',
+'link_tip'        => 'کورنيزه تړنه',
 'extlink_sample'  => 'http://www.example.com د تړن� سرليک',
 'extlink_tip'     => 'باندن� تړن� (د http:// مختاړی مه ه�روی)',
 'headline_sample' => 'سرليک',
@@ -481,21 +497,21 @@ $messages = array(
 'hr_tip'          => 'څنډيزه ليکه (دد� په کارولو ک� سپما وکړ�)',
 
 # Edit pages
-'summary'                  => 'لنډيز',
-'subject'                  => 'سکالو/سرليک',
-'minoredit'                => 'دا يوه وړوک� سماد�دنه ده',
-'watchthis'                => 'همدا مخ کتل',
-'savearticle'              => 'مخ خوندي کول',
-'preview'                  => 'مخکتنه',
-'showpreview'              => 'مخکتنه',
-'showlivepreview'          => 'ژوند� مخکتنه',
-'showdiff'                 => 'بدلونونه ښکاره کول',
-'anoneditwarning'          => "'''يادونه:''' تاسو غونډال ته نه ياست ننوتي. ستاسو IP پته به د د� مخ د سمادولو په پ�ښليک ک� ثبت شي.",
-'missingcommenttext'       => 'لط�اً تبصره لاند� وليک�.',
-'summary-preview'          => 'د لنډيز مخکتنه',
-'subject-preview'          => 'موضوع/سرليک مخکتنه',
-'blockedtitle'             => 'د کارونکي مخه نيول شو�',
-'blockedtext'              => "<big>'''ستاسو د کارن-نوم يا آی پي پت� مخنيوی شوی.'''</big>
+'summary'                          => 'لنډيز:',
+'subject'                          => 'سکالو/سرليک:',
+'minoredit'                        => 'دا يوه وړه سمونه ده',
+'watchthis'                        => 'همدا مخ کتل',
+'savearticle'                      => 'مخ خوندي کول',
+'preview'                          => 'مخکتنه',
+'showpreview'                      => 'مخکتنه',
+'showlivepreview'                  => 'ژوند� مخکتنه',
+'showdiff'                         => 'بدلونونه ښکاره کول',
+'anoneditwarning'                  => "'''يادونه:''' تاسو غونډال ته نه ياست ننوتي. ستاسو IP پته به د د� مخ د سمونونو په پ�ښليک ک� ثبت شي.",
+'missingcommenttext'               => 'لط�اً تبصره لاند� وليک�.',
+'summary-preview'                  => 'د لنډيز مخکتنه:',
+'subject-preview'                  => 'موضوع/سرليک مخکتنه:',
+'blockedtitle'                     => 'د کارونکي مخه نيول شو�',
+'blockedtext'                      => "<big>'''ستاسو د کارن-نوم يا آی پي پت� مخنيوی شوی.'''</big>
 
 همدا بنديز د $1 له خوا پر تاسو لږ�دلی. او د همد� کړن� سبب دی ''$2''.
 
@@ -506,49 +522,50 @@ $messages = array(
 تاسو کولای شی چ� د $1 او يا هم د يو بل [[{{MediaWiki:Grouppage-sysop}}|پازوال]] سره اړيک� ټينګ� کړی او د بنديز ستونز� مو هوار� کړی.
 تاسو نه شی کولای چ� د 'همد� کارونکي ته بر�ښلک ل�ږل ' کړن� نه ګټه پورته کړی تر څو چ� تاسو د خپل کارن-حساب په [[Special:Preferences|غوره توبونو]] ک� يوه کره بر�ښليک پته نه وي �انګړ� کړ� او تر د� بريده چ� پر تاسو د هغ� د کارولو بنديز نه وي لګ�دلی.
 ستاسو د دم مهال آی پي پته ده $3، او ستاسو د مخنيوي پ�ژند #$5 دی. مهرباني وکړ� د خپل� يادون� پر مهال د دغو دوو څخه د يوه او يا هم د دواړو ورکول مه ه�رو�.",
-'blockednoreason'          => 'ه�څ سبب نه دی ورکړ شوی',
-'blockedoriginalsource'    => "د '''$1''' سرچين� لاند� ښودل شوي:",
-'whitelistedittitle'       => 'که د سمادولو تکل لری نو بايد غونډال ته ورننو��.',
-'whitelistedittext'        => 'دد� لپاره چ� سمادول ترسره کړی تاسو بايد $1.',
-'loginreqtitle'            => 'غونډال ک� ننوتنه پکار ده',
-'loginreqlink'             => 'ننوتل',
-'loginreqpagetext'         => 'د نورو مخونو د کتلو لپاره تاسو بايد $1 وکړ�.',
-'accmailtitle'             => 'پټنوم ول�ږل شو.',
-'accmailtext'              => 'د "$1" لپاره پټنوم $2 ته ول�ږل شو.',
-'newarticle'               => '(نوی)',
-'newarticletext'           => "تاسو د يوه داس� تړن� څارنه کړ� چ� لا تر اوسه پور� شتون نه لري.
+'blockednoreason'                  => 'ه�څ سبب نه دی ورکړ شوی',
+'blockedoriginalsource'            => "د '''$1''' سرچين� لاند� ښودل شوي:",
+'whitelistedittitle'               => 'که د سمادولو تکل لری نو بايد غونډال ته ورننو��.',
+'whitelistedittext'                => 'دد� لپاره چ� سمادول ترسره کړی تاسو بايد $1.',
+'loginreqtitle'                    => 'غونډال ک� ننوتنه پکار ده',
+'loginreqlink'                     => 'ننوتل',
+'loginreqpagetext'                 => 'د نورو مخونو د کتلو لپاره تاسو بايد $1 وکړ�.',
+'accmailtitle'                     => 'پټنوم ول�ږل شو.',
+'accmailtext'                      => 'د "$1" لپاره پټنوم $2 ته ول�ږل شو.',
+'newarticle'                       => '(نوی)',
+'newarticletext'                   => "تاسو د يوه داس� تړن� څارنه کړ� چ� لا تر اوسه پور� شتون نه لري.
 که همدا مخ ليکل غواړ�، نو په لانديني چوکاټ ک� خپل متن وټاپ� (د لا نورو مالوماتو لپاره د [[{{MediaWiki:Helppage}}|لارښود مخ]] وګور�).
 که چ�رته تاسو دلته په غلط� سره راغلي ياست، نو يوا�� د خپل د کتنمل '''مخ پر شا''' تڼ� مو وټوک�.",
-'anontalkpagetext'         => "----''دا د ب� نومه کارونکو لپاره چ� کارن نوم ي� نه دی جوړ کړی او يا هم خپل کارن نوم نه دی کارولی، د سکالو پاڼه ده. نو دد� پخاطر مونږ د هغه کارونکي/هغ� کارونک� د انټرن�ټ شم�ره يا IP پته د نوموړي/نوموړ� د پ�ژندلو لپاره کاروو. داس� يوه IP پته د ډ�رو کارونکو لخوا هم کار�دلی شي. که تاسو يو ب� نومه کارونکی ياست او تاسو ته نااړونده پ�غامونه او تبصر� اشاره شوي، نو لط�اً د نورو ب� نومو کارونکو او ستاسو ترم�ن� د ټکنتوب مخ نيون� لپاره [[Special:UserLogin|کارن-حساب جوړول يا ننوتنه]] وټوک�.''",
-'noarticletext'            => 'دم مهال په همد� مخ ک� ه�څ متن نشته، تاسو کولای شی چ�  په نورو مخونو ک� [[Special:Search/{{PAGENAME}}|د همد� سرليک لپاره پلټنه]] وکړ�، او يا هم [{{fullurl:{{FULLPAGENAME}}|action=edit}} همدا مخ سماد کړ�].',
-'clearyourcache'           => "'''يادونه:''' د غوره توبونو د خوندي کولو وروسته، دد� لپاره چ� تاسو خپل سر ته رسولي ونجونه وګور� نو پکار ده چ� د خپل بروزر ساتل شو� حا�ظه تازه کړی. د '''Mozilla / Firefox / Safari:''' لپاره د ''Shift'' تڼ� نيول� وساتی کله مو چ� په ''Reload''، ټک واهه، او يا هم ''Ctrl-Shift-R'' تڼ� ک�ښکاږ� (په Apple Mac کمپيوټر باند� ''Cmd-Shift-R'' ک�ښکاږ�); '''IE:''' د ''Ctrl'' تڼ� ک�ښکاږ� کله مو چ� په ''Refresh'' ټک واهه، او يا هم د ''Ctrl-F5'' تڼ� ک�ښکاږ�; '''Konqueror:''' بروزر ک� يوا�� ''Reload'' ته ټک ورکړ�، او يا په ''F5''; د '''Opera''' کارونکو ته پکار ده چ� په بشپړه توګه د خپل کمپيوټر ساتل شو� حا�ظه تازه کړي چ� پد� توګه ک�ږي ''Tools→Preferences''.",
-'updated'                  => '(تازه)',
-'note'                     => '<strong>يادونه:</strong>',
-'previewnote'              => '<strong>دا يوا�� مخکتنه ده، تاسو چ� کوم بدلونونه ترسره کړي، لا تر اوسه پور� نه دي خوندي شوي!</strong>',
-'editing'                  => 'سماد�دنه $1',
-'editingsection'           => 'سماد�دنه $1 (برخه)',
-'editconflict'             => 'په سمادولو ک� خنډ: $1',
-'yourtext'                 => 'ستاسو متن',
-'yourdiff'                 => 'توپيرونه',
-'copyrightwarning'         => 'لط�اً په پام ک� وسات� چ� ټول� هغه ونډ� چ� تاسو ي� {{SITENAME}} ک� ترسره کوی هغه د $2 له مخ� د خپرولو لپاره ګڼل ک�ږي (د لانورو ت�صيلاتو لپاره $1 وګور�). که تاسو نه غواړ� چ� ستاس� په ليکنو ک� په ب� رحم� سره لاسوهن� (سماد�دن�) وشي او د نورو په غوښتنه پس� لانور� هم خپر� شي، نو دلته ي� مه �ای پر �ای کوی..<br />
-تاسو زمونږ سره دا ژمنه هم کوی چ� تاسو پخپله دا ليکنه کښل�، او يا مو د ټولګړو پاڼو او يا هم ورته وړيا سرچينو نه کاپي کړ� ده <strong>لط�اً د ليکوال د اجاز� نه پرته د خوندي حقونو ليکن� مه خپروی!</strong>',
-'longpagewarning'          => '<strong>پاملرنه: همدا مخ $1 کيلوبايټه اوږد دی؛ ک�دای شي چ� �ين� براوزرونه د ۳۲ کيلوبايټ نه د اوږدو مخونو په سمادونه ک� ستونزه رام�ن� ته کړي.
-لط�اً د مخ په لنډولو او په وړو برخو و�شلو باند� غور وکړی.</strong>',
-'longpageerror'            => '<strong>ستونزه: کوم متن چ� دلته تاسو ليکلی، $1 کيلوبايټه اوږد دی او دا د همد� مخ د لوړترين ټاکلي بريده، $2 کيلوبايټه، څخه اوږد دی.
-ستاسو متن نه شي خوندي ک�دلای.</strong>',
-'semiprotectedpagewarning' => "'''يادونه:''' همدا مخ تړل شوی دی او يوا�� ثبت شوي کارونکي کولای شي چ� په د� مخ ک� بدلونونه راولي.",
-'titleprotectedwarning'    => '<strong>ګواښنه:  همدا مخ تړل شوی دی او يوا�� �ين� کارونکي ي� جوړ کړلای شي.</strong>',
-'templatesused'            => 'په د� مخ کار�دلي کينډ�:',
-'templatesusedpreview'     => 'په د� مخکتنه ک� کار�دلي کينډ�:',
-'templatesusedsection'     => 'په د� برخه کار�دلي کينډ�:',
-'template-protected'       => '(ژغورل شوی)',
-'template-semiprotected'   => '(نيم-ژغورلی)',
-'nocreatetext'             => '{{SITENAME}} د نوو مخونو د جوړولو وړتيا محدوده کړ�.
-تاسو ب�رته پر شا تللای شی او په شته مخونو ک� سماد�دن� ترسره کولای شی، او يا هم [[Special:UserLogin|غونډال ته ننوتلای او يو کارن-حساب جوړولای شی]].',
-'nocreate-loggedin'        => 'تاسو د نوو مخونو د جوړولو اجازه نه لری.',
-'recreate-deleted-warn'    => "'''ګواښ: تاسو د يو داس� مخ بياجوړونه کوی کوم چ� يو �ل پخوا ړنګ شوی وو.'''
-
-پکار ده چ� تاسو په د� �ان پوه کړی چ� ايا دا تاسو ته وړ ده چ� د همد� مخ سماد�دنه په پرله پس� توګه وکړی.
+'anontalkpagetext'                 => "----''دا د ب� نومه کارونکو لپاره چ� کارن نوم ي� نه دی جوړ کړی او يا هم خپل کارن نوم نه دی کارولی، د سکالو پاڼه ده. نو دد� پخاطر مونږ د هغه کارونکي/هغ� کارونک� د انټرن�ټ شم�ره يا IP پته د نوموړي/نوموړ� د پ�ژندلو لپاره کاروو. داس� يوه IP پته د ډ�رو کارونکو لخوا هم کار�دلی شي. که تاسو يو ب� نومه کارونکی ياست او تاسو ته نااړونده پ�غامونه او تبصر� اشاره شوي، نو لط�اً د نورو ب� نومو کارونکو او ستاسو ترم�ن� د ټکنتوب مخ نيون� لپاره [[Special:UserLogin|کارن-حساب جوړول يا ننوتنه]] وټوک�.''",
+'noarticletext'                    => 'دم مهال په همد� مخ ک� ه�څ متن نشته، تاسو کولای شی چ�  په نورو مخونو ک� [[Special:Search/{{PAGENAME}}|د همد� سرليک لپاره پلټنه]] وکړ�، او يا هم [{{fullurl:{{FULLPAGENAME}}|action=edit}} همدا مخ سم کړ�].',
+'clearyourcache'                   => "'''يادونه:''' د غوره توبونو د خوندي کولو وروسته، دد� لپاره چ� تاسو خپل سر ته رسولي ونجونه وګور� نو پکار ده چ� د خپل بروزر ساتل شو� حا�ظه تازه کړی. د '''Mozilla / Firefox / Safari:''' لپاره د ''Shift'' تڼ� نيول� وساتی کله مو چ� په ''Reload''، ټک واهه، او يا هم ''Ctrl-Shift-R'' تڼ� ک�ښکاږ� (په Apple Mac کمپيوټر باند� ''Cmd-Shift-R'' ک�ښکاږ�); '''IE:''' د ''Ctrl'' تڼ� ک�ښکاږ� کله مو چ� په ''Refresh'' ټک واهه، او يا هم د ''Ctrl-F5'' تڼ� ک�ښکاږ�; '''Konqueror:''' بروزر ک� يوا�� ''Reload'' ته ټک ورکړ�، او يا په ''F5''; د '''Opera''' کارونکو ته پکار ده چ� په بشپړه توګه د خپل کمپيوټر ساتل شو� حا�ظه تازه کړي چ� پد� توګه ک�ږي ''Tools→Preferences''.",
+'updated'                          => '(تازه)',
+'note'                             => "'''يادونه:'''",
+'previewnote'                      => "'''دا يوا�� مخکتنه ده، تاسو چ� کوم بدلونونه ترسره کړي، لا تر اوسه پور� نه دي خوندي شوي!'''",
+'editing'                          => 'د $1 سمونه',
+'editingsection'                   => 'سمونه $1 (برخه)',
+'editconflict'                     => 'په سمادولو ک� خنډ: $1',
+'yourtext'                         => 'ستاسو متن',
+'yourdiff'                         => 'توپيرونه',
+'copyrightwarning'                 => "لط�اً په پام ک� وسات� چ� ټول� هغه ونډ� چ� تاسو ي� {{SITENAME}} ک� ترسره کوی هغه د $2 له مخ� د خپرولو لپاره ګڼل ک�ږي (د لانورو ت�صيلاتو لپاره $1 وګور�). که تاسو نه غواړ� چ� ستاس� په ليکنو ک� په ب� رحم� سره لاسوهن� (سمون�) وشي او د نورو په غوښتنه پس� لانور� هم خپر� شي، نو دلته ي� مه �ای پر �ای کوی..<br />
+تاسو زمونږ سره دا ژمنه هم کوی چ� تاسو پخپله دا ليکنه کښل�، او يا مو د ټولګړو پاڼو او يا هم ورته وړيا سرچينو نه کاپي کړ� ده '''لط�اً د ليکوال د اجاز� نه پرته د خوندي حقونو ليکن� مه خپروی!'''",
+'longpagewarning'                  => "'''پاملرنه: همدا مخ $1 کيلوبايټه اوږد دی؛ ک�دای شي چ� �ين� کتنملونه د ۳۲ کيلوبايټ نه د اوږدو مخونو په سمونه ک� ستونزه رام�ن� ته کړي.
+لط�اً د مخ په لنډولو او په وړو برخو و�شلو باند� غور وکړی.'''",
+'longpageerror'                    => "'''ستونزه: کوم متن چ� دلته تاسو ليکلی، $1 کيلوبايټه اوږد دی او دا د همد� مخ د لوړترين ټاکلي بريده، $2 کيلوبايټه، څخه اوږد دی.
+ستاسو متن نه شي خوندي ک�دلای.'''",
+'semiprotectedpagewarning'         => "'''يادونه:''' همدا مخ تړل شوی دی او يوا�� ثبت شوي کارونکي کولای شي چ� په د� مخ ک� بدلونونه راولي.",
+'titleprotectedwarning'            => "'''ګواښنه:  همدا مخ تړل شوی دی او يوا�� �ين� کارونکي ي� جوړ کړلای شي.'''",
+'templatesused'                    => 'په د� مخ کار�دل� کينډ�:',
+'templatesusedpreview'             => 'په د� مخکتنه ک� کار�دل� کينډ�:',
+'templatesusedsection'             => 'په د� برخه کار�دلي کينډ�:',
+'template-protected'               => '(ژغورل شوی)',
+'template-semiprotected'           => '(نيم-ژغورلی)',
+'nocreatetext'                     => '{{SITENAME}} د نوو مخونو د جوړولو وړتيا محدوده کړ�.
+تاسو ب�رته پر شا تللای شی او په شته مخونو ک� سمون� ترسره کولای شی، او يا هم [[Special:UserLogin|غونډال ته ننوتلای او يو کارن-حساب جوړولای شی]].',
+'nocreate-loggedin'                => 'تاسو د نوو مخونو د جوړولو اجازه نه لری.',
+'permissionserrorstext-withaction' => 'تاسو د $2 اجازه نه لری، دا د دغو {{PLURAL:$1|سبب|سببونو}} پخاطر:',
+'recreate-deleted-warn'            => "'''ګواښنه: تاسو د يو داس� مخ بياجوړونه کوی کوم چ� يو �ل پخوا ړنګ شوی وو.'''
+
+پکار ده چ� تاسو په د� �ان پوه کړی چ� ايا دا تاسو ته وړ ده چ� د همد� مخ سمونه په پرله پس� توګه وکړی.
 ستاسو د اسانتياوو لپاره د همد� مخ د ړنګ�دلو يادښت هم ورکړ شوی:",
 
 # Account creation failure
@@ -559,7 +576,7 @@ $messages = array(
 'nohistory'           => 'دد� مخ لپاره د سماد�دن� ه�څ کوم پ�ښليک نه شته.',
 'currentrev'          => 'اوسن� بڼه',
 'revisionasof'        => 'د $1 پور� شته مخليدنه',
-'revision-info'       => 'د $1 پور� شته مخليدنه، د $2 لخوا ترسره شو�',
+'revision-info'       => 'د $1 پور� شته مخليدنه، د $2 لخوا ترسره شو�', # Additionally available: $3: revision id
 'previousrevision'    => '� زړه بڼه',
 'nextrevision'        => '� نو� بڼه',
 'currentrevisionlink' => 'اوسن� بڼه',
@@ -570,7 +587,7 @@ $messages = array(
 'page_last'           => 'وروستنی',
 'histlegend'          => 'د توپير ټاکنه: د هر� هغ� بڼ� پرتلنه چ� تاسو غواړ� نو د هماغ� بڼ� چوکاټک په نښه کړی او بيا په لاندين� تڼ� وټوک�.<br />
 لنډيز: (اوس) = د اوسن� بڼ� سره توپير،
-(وروست) = د وروست� بڼ� سره توپير، و = وړه سماد�دنه.',
+(وروست) = د وروست� بڼ� سره توپير، و = وړه سمونه.',
 'deletedrev'          => '[ړنګ شو]',
 'histfirst'           => 'پخواني',
 'histlast'            => 'تازه',
@@ -592,20 +609,33 @@ $messages = array(
 'compareselectedversions' => 'ټاکل� بڼ� سره پرتله کول',
 'editundo'                => 'ناکړ',
 'diff-multi'              => '({{PLURAL:$1|يوه من�ګړ� مخليدنه نه ده ښکاره شو�|$1 من�ګړ� مخليدن� نه دي ښکاره شوي}}.)',
+'diff-src'                => 'سرچينه',
 
 # Search results
-'searchresults'         => 'د لټون پايل�',
-'searchsubtitle'        => "تاسو د '''[[:$1]]''' لپاره لټون کړی",
-'searchsubtitleinvalid' => "تاسو د '''$1''' لپاره لټون کړی",
-'noexactmatch'          => "'''تر اوسه پور� د \"\$1\" په نوم ه�څ کوم مخ نشته.''' تاسو کولای شی چ� [[:\$1|همدا مخ جوړ کړی]].",
-'prevn'                 => 'ت�ر $1',
-'nextn'                 => 'راتلونکي $1',
-'viewprevnext'          => '($1) ($2) ($3) ښکاره کول',
-'search-suggest'        => 'آيا همدا ستاسو موخه ده: $1',
-'search-relatedarticle' => 'اړونده',
-'searchall'             => 'ټول',
-'powersearch'           => 'پرمختلل� پلټنه',
-'powersearch-legend'    => 'پرمختلل� پلټنه',
+'searchresults'             => 'د لټون پايل�',
+'searchsubtitle'            => "تاسو د '''[[:$1]]''' لپاره لټون کړی",
+'searchsubtitleinvalid'     => "تاسو د '''$1''' لپاره لټون کړی",
+'noexactmatch'              => "'''تر اوسه پور� د \"\$1\" په نوم ه�څ کوم مخ نشته.''' تاسو کولای شی چ� [[:\$1|همدا مخ جوړ کړی]].",
+'noexactmatch-nocreate'     => "'''د \"\$1\" په سرليک ه�څ کوم مخ نشته.'''",
+'prevn'                     => 'ت�ر $1',
+'nextn'                     => 'راتلونکي $1',
+'viewprevnext'              => '($1) ($2) ($3) ښکاره کول',
+'searchhelp-url'            => 'Help:لړليک',
+'searchprofile-images'      => 'دوتن�',
+'search-result-size'        => '$1 ({{PLURAL:$2|1 ويی|$2 وييونه}})',
+'search-suggest'            => 'آيا همدا ستاسو موخه ده: $1',
+'search-interwiki-caption'  => 'خورلڼ� پروژ�',
+'search-interwiki-default'  => '$1 پايل�:',
+'search-interwiki-more'     => '(نور)',
+'search-mwsuggest-enabled'  => 'د وړانديزونو سره',
+'search-mwsuggest-disabled' => 'له وړانديزونو نه پرته',
+'search-relatedarticle'     => 'اړونده',
+'searchall'                 => 'ټول',
+'powersearch'               => 'پرمختلل� پلټنه',
+'powersearch-legend'        => 'پرمختلل� پلټنه',
+'powersearch-ns'            => 'په نوم-تشيالونو ک� پلټل:',
+'powersearch-field'         => 'پلټنه د',
+'search-external'           => 'باندن� پلټنه',
 
 # Preferences page
 'preferences'           => 'غوره توبونه',
@@ -616,6 +646,7 @@ $messages = array(
 'qbsettings-none'       => 'Ù‡Û�Ú…',
 'changepassword'        => 'پټنوم بدلول',
 'skin'                  => 'بڼه',
+'skin-preview'          => 'مخکتنه',
 'math'                  => 'شم�رپوهنه',
 'dateformat'            => 'د ن�ټ� بڼه',
 'datedefault'           => 'ه�څ نه ټاکل',
@@ -627,20 +658,20 @@ $messages = array(
 'prefs-watchlist'       => 'کتلی لړليک',
 'prefs-watchlist-days'  => 'د ور�و شم�ر چ� په کتلي لړليک ک� به ښکاري:',
 'prefs-misc'            => 'ب�لاب�ل',
+'prefs-resetpass'       => 'پټنوم بدلول',
 'saveprefs'             => 'خوندي کول',
 'resetprefs'            => 'بيا سمول',
-'oldpassword'           => 'زوړ پټنوم:',
-'newpassword'           => 'نوی پټنوم:',
-'retypenew'             => 'نوی پټنوم بيا وليکه:',
 'textboxsize'           => 'سماد�دنه',
 'searchresultshead'     => 'پلټل',
 'recentchangesdays'     => 'د هغو ور�و شم�ر وټاکی چ� په وروستي بدلونو ک� ي� ليدل غواړی:',
 'recentchangescount'    => 'د هغو سمادونو شم�ر چ� په وروستي بدلونو ک� ي� ليدل غواړی:',
 'savedprefs'            => 'ستاسو غوره توبونه خوندي شوه.',
 'timezonelegend'        => 'د وخت سيمه',
-'localtime'             => 'سيمه ايز وخت',
-'servertime'            => 'د پالنګر وخت',
+'localtime'             => 'سيمه ايز وخت:',
+'timezoneselect'        => 'د وخت سيمه:',
+'servertime'            => 'د پالنګر وخت:',
 'allowemail'            => 'د نورو کارونکو لخوا د بر�ښليک رال�ږل چارن کړه',
+'prefs-namespaces'      => 'نوم-تشيالونه',
 'defaultns'             => 'په دغو نوم-تشيالونو ک� د ټاکل شوو سمونونو له مخ� لټون وکړی:',
 'default'               => 'تلواليز',
 'files'                 => 'دوتن�',
@@ -653,18 +684,30 @@ $messages = array(
 'userrights-reason'        => 'د بدلون سبب:',
 
 # Groups
-'group'      => 'ډله:',
-'group-user' => 'کارونکي',
-'group-all'  => '(ټول)',
+'group'       => 'ډله:',
+'group-user'  => 'کارونکي',
+'group-sysop' => 'پازوالان',
+'group-all'   => '(ټول)',
 
 'group-user-member' => 'کارونکی',
 
 'grouppage-sysop' => '{{ns:project}}:پازوالان',
 
+# Rights
+'right-delete'        => 'مخونه ړنګول',
+'right-browsearchive' => 'ړنګ شوي مخونه پلټل',
+
 # User rights log
 'rightslog'  => 'د کارونکي د رښتو يادښت',
 'rightsnone' => '(Ù‡Û�Ú…)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit'       => 'دا مخ سمول',
+'action-createpage' => 'مخونه جوړول',
+'action-move'       => 'همدا مخ ل�ږدول',
+'action-delete'     => 'همدا مخ ړنګول',
+'action-undelete'   => 'همدا مخ ناړنګول',
+
 # Recent changes
 'nchanges'                       => '$1 {{PLURAL:$1|بدلون|بدلونونه}}',
 'recentchanges'                  => 'وروستي بدلونونه',
@@ -673,11 +716,11 @@ $messages = array(
 'rcnote'                         => "دلته لاند� {{PLURAL:$1|وروستی '''1''' بدلون دی|وروستي '''$1''' بدلونونه دي}} چ� په  {{PLURAL:$2| يو� ور�|'''$2''' ور�و}} ک� تر $4 ن�ټ� او $5 بجو پ�ښ شوي.",
 'rcnotefrom'                     => "په همد� �ای ک� لاند� هغه بدلونونه دي چ� د '''$2''' نه راپد�خوا پ�ښ شوي (تر '''$1''' پور� ښکاره شوي).",
 'rclistfrom'                     => 'هغه بدلونونه ښکاره کړی چ� له $1 نه پيل�ږي',
-'rcshowhideminor'                => 'وړ� سماد�دن� $1',
-'rcshowhidebots'                 => 'bots $1',
-'rcshowhideliu'                  => 'غونډال ته ننوتي $1 کارونکي',
+'rcshowhideminor'                => 'وړ� سمون� $1',
+'rcshowhidebots'                 => 'باټس $1',
+'rcshowhideliu'                  => 'غونډال ک� ننوتي کارونکي $1',
 'rcshowhideanons'                => 'ب� نومه کارونکي $1',
-'rcshowhidepatr'                 => '$1 څارلي سماد�دن�',
+'rcshowhidepatr'                 => '$1 څارل� سمون�',
 'rcshowhidemine'                 => 'زما سماد�دن� $1',
 'rclinks'                        => 'هغه وروستي $1 بدلونونه ښکاره کړی چ� په $2 ور�و ک� پ�ښ شوي<br />$3',
 'diff'                           => 'توپير',
@@ -688,13 +731,14 @@ $messages = array(
 'newpageletter'                  => 'نوی',
 'boteditletter'                  => 'باټ',
 'newsectionsummary'              => '/* $1 */ نو� برخه',
+'rc-enhanced-hide'               => 'ت�صيل پټول',
 
 # Recent changes linked
 'recentchangeslinked'          => 'اړونده بدلونونه',
 'recentchangeslinked-title'    => '"$1" ته اړونده بدلونونه',
-'recentchangeslinked-noresult' => 'په ورکړ شوي موده ک� ه�څ کوم بدلونونه په تړل شويو مخونو ک� نه دي راپ�ښ شوي.',
+'recentchangeslinked-noresult' => 'په د� موده، په تړل شويو مخونو ک� ه�څ کوم بدلونونه نه دي راپ�ښ شوي.',
 'recentchangeslinked-summary'  => "دا د هغه بدلونونو لړليک دی چ� وروست� �ل په تړن لرونکيو مخونو ک� د يوه �انګړي مخ (او يا هم د يو� �انګړ� و�شنيز� غړو) نه رام�ن� ته شوي.
-[[Special:Watchlist|ستاسو د کتلي لړليک]] مخونه په '''روڼ ليک''' ک� ښکاري.",
+[[Special:Watchlist|ستاسو د کتنلړليک]] مخونه په '''روڼ ليک''' ک� ښکاري.",
 'recentchangeslinked-page'     => 'د مخ نوم:',
 
 # Upload
@@ -704,7 +748,7 @@ $messages = array(
 'uploadnologin'         => 'غونډال ک� نه ياست ننوتي',
 'uploadnologintext'     => 'دد� لپاره چ� دوتن� پورته کړای ش�، تاسو ته پکار ده چ� لومړی غونډال ک� [[Special:UserLogin|ننوتنه]] ترسره کړی.',
 'uploaderror'           => 'د پورته کولو ستونزه',
-'uploadtext'            => "د دوتنو د پورته کولو لپاره د لانديني چوکاټ نه کار واخل�، که چ�رته غواړ� چ� د پخوانيو پورته شوو ان�ورونو په اړه لټون وکړ� او يا ي� وکتلای ش� نو بيا د [[Special:ImageList|پورته شوو دوتنو لړليک]] ته لاړ شی، د پورته شوو دوتنو او ړنګ شوو دوتنو يادښتونه په [[Special:Log/upload|پورته شوي يادښت]] ک� کتلای شی.
+'uploadtext'            => "د دوتنو د پورته کولو لپاره د لانديني چوکاټ نه کار واخل�، که چ�رته غواړ� چ� د پخوانيو پورته شوو ان�ورونو په اړه لټون وکړ� او يا ي� وکتلای ش� نو بيا د [[Special:FileList|پورته شوو دوتنو لړليک]] ته لاړ شی، د پورته شوو دوتنو او ړنګ شوو دوتنو يادښتونه په [[Special:Log/upload|پورته شوي يادښت]] ک� کتلای شی.
 
 دد� لپاره چ� يوه مخ ته ان�ور ورواچوی، نو بيا پد� ډول تړن (ل�نک) وکاروی
 '''<nowiki>[[</nowiki>Image:File.jpg<nowiki>]]</nowiki>''',
@@ -722,12 +766,12 @@ $messages = array(
 'minlength1'            => 'پکار ده چ� د دوتنو نومونه لږ تر لږه يو حر� ولري.',
 'badfilename'           => 'ددغ� دوتن� نوم "$1" ته واوړ�ده.',
 'filetype-badmime'      => 'د MIME بڼ� "$1" د دوتنو د پورته کولو اجازه نشته.',
-'fileexists'            => 'د پخوا نه پد� نوم يوه دوتنه شته، که تاسو ډاډه نه ياست او يا هم که تاسو غواړ� چ� بدلون پک� راول�، لط�اً <strong><tt>$1</tt></strong> وګور�.',
-'fileexists-extension'  => 'په همد� نوم يوه بله دوتنه د پخوا نه شته:<br />
-د پورته ک�دونک� دوتن� نوم: <strong><tt>$1</tt></strong><br />
-د پخوا نه شته دوتنه: <strong><tt>$2</tt></strong><br />
-لط�اً يو داس� نوم وټاکی چ� د پخوان� دوتن� سره توپير ولري.',
-'fileexists-forbidden'  => 'د پخوا نه پد� نوم يوه دوتنه شته؛ لط�اً ب�رته وګر�� او همدغه دوتنه بيا په يوه نوي نوم پورته کړی. [[Image:$1|thumb|center|$1]]',
+'fileexists'            => "د پخوا نه پد� نوم يوه دوتنه شته، که تاسو ډاډه نه ياست او يا هم که تاسو غواړ� چ� بدلون پک� راول�، لط�اً '''<tt>$1</tt>''' وګور�.",
+'fileexists-extension'  => "په همد� نوم يوه بله دوتنه د پخوا نه شته:<br />
+د پورته ک�دونک� دوتن� نوم: '''<tt>$1</tt>'''<br />
+د پخوا نه شته دوتنه: '''<tt>$2</tt>'''<br />
+لط�اً يو داس� نوم وټاکی چ� د پخوان� دوتن� سره توپير ولري.",
+'fileexists-forbidden'  => 'د پخوا نه پد� نوم يوه دوتنه شته؛ لط�اً ب�رته وګر�� او همدغه دوتنه بيا په يوه نوي نوم پورته کړی. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate' => 'همدا دوتنه د {{PLURAL:$1|لاندين� دوتن�|لاندينيو دوتنو}} غبرګه لم�سه ده:',
 'savefile'              => 'دوتنه خوندي کړه',
 'uploadedimage'         => '"[[$1]]" پورته شوه',
@@ -742,17 +786,17 @@ $messages = array(
 'nolicense'          => 'ه�څ نه دي ټاکل شوي',
 'upload_source_file' => '(ستاسو په کمپيوټر ک� يوه دوتنه)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'د ان�ور د نوم لټون:',
+# Special:ListFiles
+'listfiles_search_for'  => 'د ان�ور د نوم لټون:',
 'imgfile'               => 'دوتنه',
-'imagelist'             => 'د دوتنو لړليک',
-'imagelist_date'        => 'ن�ټه',
-'imagelist_name'        => 'نوم',
-'imagelist_user'        => 'کارونکی',
-'imagelist_size'        => 'Ú©Ú†Ù‡ (bytes)',
-'imagelist_description' => 'څرګندونه',
-
-# Image description page
+'listfiles'             => 'د دوتنو لړليک',
+'listfiles_date'        => 'ن�ټه',
+'listfiles_name'        => 'نوم',
+'listfiles_user'        => 'کارونکی',
+'listfiles_size'        => 'Ú©Ú†Ù‡ (bytes)',
+'listfiles_description' => 'څرګندونه',
+
+# File description page
 'filehist'                  => 'د دوتن� پ�ښليک',
 'filehist-help'             => 'په يو� ن�ټ�/يوه وخت وټوک� چ� د هماغه وخت او ن�ټ� دوتنه چ� په هماغه وخت ک� څنګه ښکار�ده هماغس� درښکاره شي.',
 'filehist-deleteall'        => 'ټول ړنګول',
@@ -764,7 +808,7 @@ $messages = array(
 'filehist-dimensions'       => 'Ú‰Ú‰Û�',
 'filehist-filesize'         => 'د دوتن� کچه',
 'filehist-comment'          => 'تبصره',
-'imagelinks'                => 'تړنونه',
+'imagelinks'                => 'د دوتن� تړن�',
 'linkstoimage'              => 'دا {{PLURAL:$1|لاندينی مخ|$1 لانديني مخونه}} د همد� دوتن� سره تړن� لري:',
 'nolinkstoimage'            => 'داس� ه�څ کوم مخ نه شته چ� د دغ� دوتن� سره تړن� ولري.',
 'duplicatesoffile'          => 'دا لاندين� {{PLURAL:$1| دوتنه د همد� دوتن� غبرګون� لم�سه ده|$1 دوتن� د همد� دوتن� غبرګون� لم�س� دي}}:',
@@ -808,13 +852,14 @@ $messages = array(
 
 # Random page
 'randompage'         => 'ناټاکلی مخ',
-'randompage-nopages' => 'په همدغه نوم-تشيال ک� ه�څ کوم مخ نشته.',
+'randompage-nopages' => 'د "$1" په نوم-تشيال ک� ه�څ کوم مخ نشته.',
 
 # Random redirect
 'randomredirect' => 'ناټاکلی ورګر��دنه',
 
 # Statistics
 'statistics'             => 'شمار',
+'statistics-pages'       => 'مخونه',
 'statistics-mostpopular' => 'تر ټولو ډ�ر کتل شوي مخونه',
 
 'disambiguations' => 'د څرګندون� مخونه',
@@ -822,6 +867,7 @@ $messages = array(
 'doubleredirects' => 'دوه �لي ورګر��دن�',
 
 'brokenredirects'        => 'مات� ورګر��دن�',
+'brokenredirects-edit'   => '(سمول)',
 'brokenredirects-delete' => '(ړنګول)',
 
 'withoutinterwiki'        => 'د ژب� د تړنو ب� برخ� مخونه',
@@ -845,12 +891,12 @@ $messages = array(
 'wantedcategories'        => 'غوښتل� و�شنيز�',
 'wantedpages'             => 'غوښتل شو� پاڼ�',
 'mostlinked'              => 'د ډ�رو تړنو مخونه',
-'mostlinkedcategories'    => 'د ګڼ شم�ر تړنو و�شنيز�',
+'mostlinkedcategories'    => 'د ګڼو تړنو و�شنيز�',
 'mostlinkedtemplates'     => 'د ډ�رو تړنو کينډ�',
-'mostcategories'          => 'د ګڼ شم�ر و�شنيزو لرونکي مخونه',
+'mostcategories'          => 'د ګڼو و�شنيزو مخونه',
 'mostimages'              => 'د ډ�رو تړنو ان�ورونه',
-'mostrevisions'           => 'ډ�ر کتل شوي مخونه',
-'prefixindex'             => 'د مختاړيو ليکلړ',
+'mostrevisions'           => 'ډ�ر کتلي مخونه',
+'prefixindex'             => 'د مختاړيو ټول مخونه',
 'shortpages'              => 'لنډ مخونه',
 'longpages'               => 'اوږده مخونه',
 'deadendpages'            => 'ب� پايه مخونه',
@@ -877,8 +923,6 @@ $messages = array(
 'speciallogtitlelabel' => 'سرليک:',
 'log'                  => 'يادښتونه',
 'all-logs-page'        => 'ټول يادښتونه',
-'log-search-legend'    => 'د يادښتونو لپاره لټون',
-'log-search-submit'    => 'ور�ه',
 
 # Special:AllPages
 'allpages'          => 'ټول مخونه',
@@ -892,7 +936,7 @@ $messages = array(
 'allpagesprev'      => 'پخواني',
 'allpagesnext'      => 'راتلونکي',
 'allpagessubmit'    => 'ور�ه',
-'allpagesprefix'    => 'هغه مخونه ښکاره کړه چ� مختاړی ي� داس� وي:',
+'allpagesprefix'    => 'هغه مخونه ښکاره کړه چ� مختاړی ي� وي:',
 'allpagesbadtitle'  => 'ورکړ شوی سرليک سم نه دی او يا هم د ژبو او يا د ب�لاب�لو ويکي ګانو مختاړی لري. ستاسو په سرليک ک� يو يا څو داس� اب�څ� دي کوم چ� په سرليک ک� نه شي کار�دلی.',
 'allpages-bad-ns'   => '{{SITENAME}} د "$1" په نامه ه�څ کوم نوم-تشيال نه لري.',
 
@@ -904,11 +948,29 @@ $messages = array(
 'categoriesfrom'              => 'هغه و�شنيز� د� ښکاره شي چ� پ�ل�ږي په:',
 'special-categories-sort-abc' => 'د اب�څو له مخ� اوډل',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'د کارونکي ونډ� ړنګ� شو�',
+
+# Special:LinkSearch
+'linksearch'      => 'باندن� تړن�',
+'linksearch-pat'  => 'د پلټن� مخب�لګه:',
+'linksearch-ns'   => 'نوم-تشيال:',
+'linksearch-ok'   => 'پلټل',
+'linksearch-line' => '$1 د $2 سره تړل شوی',
+
 # Special:ListUsers
 'listusersfrom'      => 'هغه کارونکي ښکاره کړه چ� نومونه ي� پ�ل�ږي په:',
 'listusers-submit'   => 'ښکاره کول',
 'listusers-noresult' => 'ه�څ کوم کارونکی و نه موندل شو.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'د کارن-نوم د جوړ�دو يادښت',
+'newuserlogpagetext'          => 'دا د کارن-نوم د جوړ�دو يادښت دی',
+'newuserlog-byemail'          => 'پټنوم مو بر�ښليک ته درول�ږه',
+'newuserlog-create-entry'     => 'نوی کارونکی',
+'newuserlog-create2-entry'    => 'د $1 لپاره کارن-حساب جوړ شو',
+'newuserlog-autocreate-entry' => 'کارن-حساب په اتوماتيک ډول جوړ شو',
+
 # Special:ListGroupRights
 'listgrouprights-group'   => 'ډله',
 'listgrouprights-rights'  => 'رښت�',
@@ -916,7 +978,7 @@ $messages = array(
 
 # E-mail user
 'mailnologin'     => 'ه�څ کومه ل�ږل شو� پته نشته',
-'emailuser'       => 'همد� کارونکي ته بر�ښليک ل�ږل',
+'emailuser'       => 'دغه کارونکي ته بر�ښليک ل�ږل',
 'emailpage'       => 'کارونکي ته بر�ښليک ول�ږه',
 'defemailsubject' => 'د {{SITENAME}} بر�ښليک',
 'noemailtitle'    => 'ه�څ کومه بر�ښليک پته نشته.',
@@ -938,7 +1000,7 @@ $messages = array(
 'nowatchlist'          => 'ستاسو په کتلي لړليک ک� ه�څ نه شته.',
 'watchnologin'         => 'غونډال ک� نه ياست ننوتي.',
 'watchnologintext'     => 'دد� لپاره چ� خپل کتل شوي لړليک ک� بدلون راولی نو تاسو ته پکار ده چ� لومړی غونډال ک� [[Special:UserLogin|ننوتنه]] ترسره کړی.',
-'addedwatch'           => 'په کتلي لړليک ک� ورګډ شو.',
+'addedwatch'           => 'په کتنلړليک ک� ورګډ شو.',
 'addedwatchtext'       => "د \"[[:\$1]]\" په نوم يو مخ ستاسو [[Special:Watchlist|کتنلړليک]] ک� ورګډ شو.
 په راتلونک� ک� چ� په دغه مخ او د ده د خبرواترو مخ ک� کوم بدلونونه را�ي نو هغه به ستاسو په کتنلړليک ک� ښکاره شي،
 او په همد� توګه هغه مخونه به د [[Special:RecentChanges|وروستي بدلونونو]] په لړليک ک� په '''روڼ''' ليک ښکاري ترڅو په اسان� سره څوک وپوه�ږي چ� په کوم کوم مخونو ک� بدلونونه ترسره شوي.
@@ -953,9 +1015,6 @@ $messages = array(
 'wlheader-enotif'      => 'د بر�ښليک له لار� خبرول چارن شوی.*',
 'wlheader-showupdated' => "* هغه مخونه چ� وروستی �ل ستاسو د کتلو نه وروسته بدلون موندلی په '''روڼ''' ليک نښه شوي.",
 'wlshowlast'           => 'وروستي $1 ساعتونه $2 ور�� $3 ښکاره کړه',
-'watchlist-hide-bots'  => 'د باټ سماد�دن� پټول',
-'watchlist-hide-own'   => 'زما سمادونه پټول',
-'watchlist-hide-minor' => 'وړ� سماد�دن� پټول',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'د کتلو په حال ک�...',
@@ -969,59 +1028,66 @@ $messages = array(
 'enotif_lastdiff'              => 'د همدغه بدلون د کتلو لپاره $1 وګور�.',
 'enotif_anon_editor'           => 'ورکنومی کارونکی $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'پاڼه ړنګول',
-'confirm'                     => 'تاييد',
-'exblank'                     => 'دا مخ تش وه',
-'delete-confirm'              => '"$1" ړنګوول',
-'delete-legend'               => 'ړنګول',
-'historywarning'              => 'پاملرنه: کومه پاڼه چ� تاسو ي� د ړنګولو هڅه کوی يو پ�ښليک لري:',
-'confirmdeletetext'           => 'تاسو د تل لپار يو مخ يا ان�ور د هغه ټول پ�ښليک سره سره د دغه ډ�ټاب�ز نه ړنګو�. که چ�رته تاسو ددغ� کړن� په پايل� پوه ياست او د دغ� پاڼ� د [[پروژ�:تګلار�]] سره سمون خوري نو لط�اً ددغ� کړن� تاييد وکړی .',
-'actioncomplete'              => 'بشپړه کړنه',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ړنګ شوی.
+# Delete
+'deletepage'            => 'پاڼه ړنګول',
+'confirm'               => 'تاييد',
+'exblank'               => 'دا مخ تش وه',
+'delete-confirm'        => '"$1" ړنګوول',
+'delete-legend'         => 'ړنګول',
+'historywarning'        => 'پاملرنه: کومه پاڼه چ� تاسو ي� د ړنګولو هڅه کوی يو پ�ښليک لري:',
+'confirmdeletetext'     => 'تاسو د تل لپار يو مخ يا ان�ور د هغه ټول پ�ښليک سره د دغه ډ�ټاب�ز نه ړنګو�. که چ�رته تاسو ددغ� کړن� په پايل� پوه ياست او د دغ� پاڼ� د [[{{MediaWiki:Policy-url}}|تګلار�]] سره سمون خوري نو لط�اً ددغ� کړن� تاييد وکړی .',
+'actioncomplete'        => 'بشپړه کړنه',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ړنګ شوی.
 د نوو ړنګ شوو سوانحو لپاره $2 وګور�.',
-'deletedarticle'              => 'ړنګ شو "[[$1]]"',
-'dellogpage'                  => 'د ړنګولو يادښت',
-'dellogpagetext'              => 'دا لاند� د نوو ړنګ شوو کړنو لړليک دی.',
-'deletionlog'                 => 'د ړنګولو يادښت',
-'deletecomment'               => 'د ړنګولو سبب',
-'deleteotherreason'           => 'بل/اضا�ه سبب:',
-'deletereasonotherlist'       => 'بل سبب',
-'deletereason-dropdown'       => '*د ړنګولو ټولګړی سبب
+'deletedarticle'        => 'ړنګ شو "[[$1]]"',
+'dellogpage'            => 'د ړنګولو يادښت',
+'dellogpagetext'        => 'دا لاند� د نوو ړنګ شوو کړنو لړليک دی.',
+'deletionlog'           => 'د ړنګولو يادښت',
+'deletecomment'         => 'د ړنګولو سبب',
+'deleteotherreason'     => 'بل/اضا�ه سبب:',
+'deletereasonotherlist' => 'بل سبب',
+'deletereason-dropdown' => '*د ړنګولو ټولګړی سبب
 ** د ليکوال غوښتنه
 ** د رښتو ت�ری
 ** د پوه� سره دښمني',
-'rollback_short'              => 'په شاب�ول',
-'rollbacklink'                => 'په شاب�ول',
+
+# Rollback
+'rollback_short' => 'په شاب�ول',
+'rollbacklink'   => 'په شاب�ول',
+
+# Protect
 'protectlogpage'              => 'د ژغورن� يادښت',
 'protectedarticle'            => '"[[$1]]" وژغورلی شو',
+'modifiedarticleprotection'   => 'د "[[$1]]" لپاره د ژغورن� کچه بدله شوه',
 'protect-title'               => 'د "$1" لپاره د ژغورن� کچه بدلول',
+'prot_1movedto2'              => '[[$1]]، [[$2]] ته ول�ږد�ده',
 'protect-legend'              => 'د ژغورلو پخلی کول',
 'protectcomment'              => 'تبصره:',
 'protectexpiry'               => 'د پای ن�ټه:',
 'protect_expiry_invalid'      => 'د پای وخت ناسم دی.',
 'protect_expiry_old'          => 'د پای وخت په ت�رمهال ک� دی.',
 'protect-unchain'             => 'د ل�ږدون اجاز� ناتړل',
-'protect-text'                => 'تاسو کولای شی چ� د <strong><nowiki>$1</nowiki></strong> مخ لپاره د ژغورلو کچه همدلته وګور� او بدلون پک� راولی.',
-'protect-locked-access'       => 'ستاسو کارن-حساب دا اجازه نه لري چ� د پاڼو د ژغورن� په کچه ک� بدلون راولي.
-دلته د <strong>$1</strong> مخ لپاره اوسني شته امستن� دي:',
+'protect-text'                => "تاسو کولای شی چ� د '''<nowiki>$1</nowiki>''' مخ لپاره د ژغورلو کچه همدلته وګور� او بدلون پک� راولی.",
+'protect-locked-access'       => "ستاسو کارن-حساب دا اجازه نه لري چ� د پاڼو د ژغورن� په کچه ک� بدلون راولي.
+دلته د '''$1''' مخ لپاره اوسني شته امستن� دي:",
 'protect-cascadeon'           => 'د اوسمهال لپاره همدا مخ ژغورل شوی دا �که چ� همدا مخ په {{PLURAL:$1|لانديني مخ|لانديني مخونو}} ک� ورګډ دی چ� {{PLURAL:$1|�وړاوبيزه ژغورنه ي� چارنه ده|�وړاوبيز� ژغورن� ي� چارن� دي}}.
 تاسو د همد� مخ د ژغورن� په کچه ک� بدلون راوستلای شی، خو دا به په �وړاوبيزه ژغورنه اغ�زمنه نه کړي.',
-'protect-default'             => '(تلواليز)',
+'protect-default'             => 'ټول کارونکي پر�ښودل',
 'protect-fallback'            => 'د "$1" اجازه پکار ده',
-'protect-level-autoconfirmed' => 'د ناثبته کارونکو مخنيوی کول',
+'protect-level-autoconfirmed' => 'د نويو او ناثبته کارونکو مخه نيول',
 'protect-level-sysop'         => 'يوا�� پازوالان',
 'protect-summary-cascade'     => '�وړاوبيز',
 'protect-expiring'            => 'په $1 (UTC) پای ته رس�ږي',
 'protect-cascade'             => 'په همد� مخ ک� د ټولو ګډو مخونو نه ژغورنه ک�ږي (�وړاوبيزه ژغورنه)',
-'protect-cantedit'            => 'تاسو نه شی کولای چ� د همدغه مخ د ژغورن� په کچه ک� بدلون راولی، دا �که چ� تاسو د همدغه مخ د سمادولو اجازه نه لری.',
+'protect-cantedit'            => 'تاسو نه شی کولای چ� د همدغه مخ د ژغورن� په کچه ک� بدلون راولی، دا �که چ� تاسو د همدغه مخ د سمولو اجازه نه لری.',
+'protect-expiry-options'      => '2 ساعتونه:2 hours,1 ور�:1 day,3 ور��:3 days,1 اوون�:1 week,2 اوون�:2 weeks,1 مياشت:1 month,3 مياشت�:3 months,6 مياشت�:6 months,1 کال:1 year,لامحدوده:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'اجازه:',
 'restriction-level'           => 'د بنديز کچه:',
 'minimum-size'                => 'ÙˆÚ“Ù‡ Ú©Ú†Ù‡',
 'pagesize'                    => '(بايټونه)',
 
 # Restrictions (nouns)
-'restriction-edit'   => 'سمادول',
+'restriction-edit'   => 'سمون',
 'restriction-move'   => 'ل�ږدول',
 'restriction-create' => 'جوړول',
 
@@ -1045,12 +1111,13 @@ $messages = array(
 'blanknamespace' => '(اصلي)',
 
 # Contributions
-'contributions' => 'د کارونکي ونډ�',
-'mycontris'     => 'زما ونډ�',
-'contribsub2'   => 'د $1 لپاره ($2)',
-'uctop'         => '(سرپاڼه)',
-'month'         => 'له ټاکل� مياشت� نه راپد�خوا (او تر د� پخواني):',
-'year'          => 'له ټاکلي کال نه راپد�خوا (او تر د� پخواني):',
+'contributions'       => 'د کارونکي ونډ�',
+'contributions-title' => 'د $1 کارن ونډ�',
+'mycontris'           => 'زما ونډ�',
+'contribsub2'         => 'د $1 لپاره ($2)',
+'uctop'               => '(سرپاڼه)',
+'month'               => 'له ټاکل� مياشت� نه راپد�خوا (او تر د� پخواني):',
+'year'                => 'له ټاکلي کال نه راپد�خوا (او تر د� پخواني):',
 
 'sp-contributions-newbies'     => 'د نوو کارن-حسابونو ونډ� ښکاره کول',
 'sp-contributions-newbies-sub' => 'د نوو کارن-حسابونو لپاره',
@@ -1060,18 +1127,18 @@ $messages = array(
 'sp-contributions-submit'      => 'پلټل',
 
 # What links here
-'whatlinkshere'         => 'د همد� پاڼ� تړنونه',
-'whatlinkshere-title'   => 'هغه مخونه چ� د "$1" سره تړن� لري',
-'whatlinkshere-page'    => 'مخ:',
-'linklistsub'           => '(د تړنونو لړليک)',
-'linkshere'             => "دغه لانديني مخونه د '''[[:$1]]''' سره تړن� لري:",
-'nolinkshere'           => "د '''[[:$1]]''' سره ه�څ يو مخ هم تړن� نه لري .",
-'isredirect'            => 'ورګر��دلی مخ',
-'istemplate'            => 'ورګډ�دنه',
-'whatlinkshere-prev'    => '{{PLURAL:$1|پخوانی|پخواني $1}}',
-'whatlinkshere-next'    => '{{PLURAL:$1|راتلونکی|راتلونکي $1}}',
-'whatlinkshere-links'   => '� تړن�',
-'whatlinkshere-filters' => 'چاڼګرونه',
+'whatlinkshere'           => 'د همد� پاڼ� تړن�',
+'whatlinkshere-title'     => 'هغه مخونه چ� د "$1" سره تړن� لري',
+'whatlinkshere-page'      => 'مخ:',
+'linkshere'               => "دغه لانديني مخونه د '''[[:$1]]''' سره تړن� لري:",
+'nolinkshere'             => "د '''[[:$1]]''' سره ه�څ يو مخ هم تړن� نه لري .",
+'isredirect'              => 'ورګر��دلی مخ',
+'istemplate'              => 'ورګډ�دنه',
+'whatlinkshere-prev'      => '{{PLURAL:$1|پخوانی|پخواني $1}}',
+'whatlinkshere-next'      => '{{PLURAL:$1|راتلونکی|راتلونکي $1}}',
+'whatlinkshere-links'     => '� تړن�',
+'whatlinkshere-hidelinks' => '$1 تړن�',
+'whatlinkshere-filters'   => 'چاڼګرونه',
 
 # Block/unblock
 'blockip'                  => 'د کاروونکي مخه نيول',
@@ -1122,6 +1189,8 @@ $messages = array(
 
 نو په هغه وخت ک� پکار ده چ� د خبرواترو د مخ ل�ږدونه او د نوي مخ سره د يو�ای کولو کړنه په لاسي توګه ترسره کړی.",
 'movearticle'             => 'مخ ل�ږدول',
+'movenologin'             => 'غونډال ک� نه ياست ننوتي',
+'movenologintext'         => 'دد� لپاره چ� يو مخ ول�ږدوی، نو تاسو بايد يو ثبت شوی کارونکی او غونډال ک� [[Special:UserLogin|ننوتي]] اوس�.',
 'newtitle'                => 'يو نوي سرليک ته:',
 'move-watch'              => 'همدا مخ کتل',
 'movepagebtn'             => 'مخ ل�ږدول',
@@ -1160,27 +1229,30 @@ $messages = array(
 'filemissing'     => 'دوتنه ورکه ده',
 'thumbnail_error' => 'د  بټنوک د جوړ�دن� ستونزه: $1',
 
+# Special:Import
+'import-comment' => 'تبصره:',
+
 # Import log
 'importlogpage' => 'د واردولو يادښت',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'زما کارن مخ',
-'tooltip-pt-mytalk'               => 'زما د خبرواترو مخ',
+'tooltip-pt-userpage'             => 'ستاسو کارن مخ',
+'tooltip-pt-mytalk'               => 'ستاسو د خبرواترو مخ',
 'tooltip-pt-preferences'          => 'زما غوره توبونه',
 'tooltip-pt-watchlist'            => 'د هغه مخونو لړليک چ� تاسو ي� د بدلون لپاره څاری',
-'tooltip-pt-mycontris'            => 'زما د ونډو لړليک',
+'tooltip-pt-mycontris'            => 'ستاسو د ونډو لړليک',
 'tooltip-pt-login'                => 'تاسو ته په غونډال ک� د ننوتلو سپارښتنه کوو، که څه هم چ� دا يو اړين کار نه دی.',
 'tooltip-pt-anonlogin'            => 'تاسو ته په غونډال ک� د ننوتن� سپارښتنه کوو، که څه هم چ� دا يو اړين کار نه دی.',
 'tooltip-pt-logout'               => 'وتل',
 'tooltip-ca-talk'                 => 'د مخ د م�ن�پانګ� په اړه خبر� اتر�',
-'tooltip-ca-edit'                 => 'تاسو همدا مخ سمادولای شی. مهرباني وکړی د ليکن� د خوندي کولو دمخه مو د همد� ليکن� مخکتنه وګور�.',
-'tooltip-ca-addsection'           => 'د خبرواترو همدغه مخ ک� يوه تبصره ورګډول.',
+'tooltip-ca-edit'                 => 'تاسو همدا مخ سمولای شی. مهرباني وکړی د ليکن� د خوندي کولو دمخه مو د همد� ليکن� مخکتنه وګور�.',
+'tooltip-ca-addsection'           => 'يوه نو� برخه پيلول',
 'tooltip-ca-viewsource'           => 'همدا مخ ژغورل شوی. تاسو کولای شی چ� د همد� مخ سرجينه وګور�.',
 'tooltip-ca-protect'              => 'همدا مخ ژغورل',
 'tooltip-ca-delete'               => 'همدا مخ ړنګول',
 'tooltip-ca-move'                 => 'همدا مخ ل�ږدول',
-'tooltip-ca-watch'                => 'همدا مخ پخپل کتلي لړليک ک� ګډول',
-'tooltip-ca-unwatch'              => 'همدا مخ خپل د کتلي لړليک نه لر� کول',
+'tooltip-ca-watch'                => 'دا مخ پخپل کتنلړليک ک� ګډول',
+'tooltip-ca-unwatch'              => 'همدا مخ خپل کتنلړليک نه لر� کول',
 'tooltip-search'                  => 'د {{SITENAME}} لټون',
 'tooltip-p-logo'                  => 'لومړی مخ',
 'tooltip-n-mainpage'              => 'لومړي مخ ته ورتلل',
@@ -1190,6 +1262,7 @@ $messages = array(
 'tooltip-n-randompage'            => 'يو ناټاکلی مخ ښکاره کوي',
 'tooltip-n-help'                  => 'هغه �ای چ�رته چ� راڅرګندولای شو.',
 'tooltip-t-whatlinkshere'         => 'د ويکي د ټولو هغو مخونو لړليک چ� دلته تړن� لري',
+'tooltip-feed-rss'                => 'د همد� مخ د آر اس اس کتنه',
 'tooltip-t-contributions'         => 'د همد� کارونکي د ونډو لړليک کتل',
 'tooltip-t-emailuser'             => 'همد� کارونکي ته يو بر�ښليک ل�ږل',
 'tooltip-t-upload'                => 'دوتن� پورته کول',
@@ -1203,12 +1276,12 @@ $messages = array(
 'tooltip-ca-nstab-template'       => 'کينډ� ښکاره کول',
 'tooltip-ca-nstab-help'           => 'د لارښود مخ کتل',
 'tooltip-ca-nstab-category'       => 'د و�شنيز� مخ ښکاره کول',
-'tooltip-minoredit'               => 'دا لکه يوه وړه سماد�دنه په نښه کوي[alt-i]',
+'tooltip-minoredit'               => 'دا لکه يوه وړه سمونه په نښه کوي[alt-i]',
 'tooltip-save'                    => 'ستاسو بدلونونه خوندي کوي',
 'tooltip-preview'                 => 'ستاسو بدلونونه ښکاره کوي, لط�اً دا کړنه د خوندي کولو دمخه وکارو�! [alt-p]',
 'tooltip-diff'                    => 'دا هغه بدلونونه چ� تاسو په متن ک� ترسره کړي، ښکاره کوي. [alt-v]',
 'tooltip-compareselectedversions' => 'د همد� مخ د دوو ټاکل شويو بڼو تر م�ن� توپيرونه وګور�.',
-'tooltip-watch'                   => 'همدا مخ ستاسو کتلي لړليک ک� ورګډوي [alt-w]',
+'tooltip-watch'                   => 'همدا مخ ستاسو کتنلړليک ک� ورګډوي [alt-w]',
 
 # Attribution
 'lastmodifiedatby' => 'دا مخ وروستی �ل د $3 لخوا په $2، $1 بدلون موندلی.', # $1 date, $2 time, $3 user
@@ -1216,6 +1289,16 @@ $messages = array(
 # Info page
 'infosubtitle' => 'د مخ مالومات',
 
+# Skin names
+'skinname-standard'    => 'کلاسيک',
+'skinname-nostalgia'   => 'نوستالژي',
+'skinname-cologneblue' => 'شين کلون',
+'skinname-monobook'    => 'مونوبوک',
+'skinname-myskin'      => 'زمابڼه',
+'skinname-chick'       => 'شيک',
+'skinname-simple'      => 'ساده',
+'skinname-modern'      => 'نوی',
+
 # Patrol log
 'patrol-log-auto' => '(خپلسر)',
 
@@ -1234,10 +1317,12 @@ $messages = array(
 'show-big-image'       => 'بشپړه ب�لن نښ�',
 'show-big-image-thumb' => '<small>د همد� مخکتن� کچه: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'د نوو دوتنو نندارتون',
 'imagelisttext'         => "دلته لاند� د '''$1''' {{PLURAL:$1|دوتنه|دوتن�}} يو لړليک دی چ� اوډل شوي $2.",
 'newimages-summary'     => 'همدا �انګړی مخ، وروستن� پورته شو� دوتن� ښکاره کوي.',
+'newimages-legend'      => 'چاڼګر',
+'showhidebots'          => '($1 باټس)',
 'noimages'              => 'د کتلو لپاره څه نشته.',
 'ilsubmit'              => 'پلټل',
 'bydate'                => 'د ن�ټ� له مخ�',
@@ -1260,12 +1345,12 @@ $messages = array(
 'metadata-expand'   => 'غ��دلی ت�صيل ښکاره کړی',
 'metadata-collapse' => 'غ��دلی ت�صيل پټ کړی',
 'metadata-fields'   => 'د EXIF ميټاډاټا ډګرونه چ� لړليک ي� په همد� پيغام ک� په لاند� توګه راغلی د ان�وريز مخ په ښکار�دنه ک� به هغه وخت ورګډ شي کله چ� د م�ټاډاټا چوکاټ پرانيستل ک�ږي.
-* make
-* model
-* datetimeoriginal
+* جوړول
+* ماډل
+* آرن� وخت او ن�ټه
 * exposuretime
-* fnumber
-* focallength', # Do not translate list items
+* fشم�ره
+* �وکل واټن', # Do not translate list items
 
 # EXIF tags
 'exif-datetime'         => 'د دوتن� د بدلون وخت او ن�ټه',
@@ -1304,7 +1389,7 @@ $messages = array(
 'exif-gpsspeed-k' => 'کيلومتره په يوه ساعت ک�',
 
 # External editor support
-'edit-externally'      => 'د باندنيو پروګرامونو په کارولو سره دا دوتنه سمادول',
+'edit-externally'      => 'د باندنيو پروګرامونو په کارولو سره دا دوتنه سمول',
 'edit-externally-help' => 'د نورو مالوماتو لپاره [http://www.mediawiki.org/wiki/Manual:External_editors د امستنو لارښوون�] وګور�.',
 
 # 'all' in various places, this might be different for inflected languages
@@ -1330,17 +1415,8 @@ $messages = array(
 'trackbackremove' => '([$1 ړنګول])',
 
 # action=purge
-'confirm_purge'        => 'په رښتيا د همد� مخ حا�ظه سپينول غواړ�؟
-
-$1',
 'confirm_purge_button' => 'ښه/هو',
-
-# AJAX search
-'searchcontaining' => "د هغو ليکنو لټون چ� ''$1'' په ک� شته.",
-'searchnamed'      => "د هغ� ليکن� لټون چ� نوم ي� ''$1'' دی.",
-'articletitles'    => "هغه ليکن� چ� په ''$1'' پيل�ږي",
-'hideresults'      => 'پايل� پټول',
-'useajaxsearch'    => 'د AJAX پلټن� کارول',
+'confirm-purge-top'    => 'په رښتيا د همد� مخ حا�ظه سپينول غواړ�؟',
 
 # Multipage image navigation
 'imgmultipageprev' => '� پخوانی مخ',
@@ -1370,16 +1446,16 @@ $1',
 
 # Watchlist editor
 'watchlistedit-noitems'    => 'ستاسو په کتلي لړليک ک� ه�څ کوم سرليک نشته.',
-'watchlistedit-raw-title'  => 'خام کتلی لړليک سمادول',
-'watchlistedit-raw-legend' => 'خام کتلی لړليک سمادول',
+'watchlistedit-raw-title'  => 'خام کتنلړليک سمول',
+'watchlistedit-raw-legend' => 'خام کتنلړليک سمول',
 'watchlistedit-raw-titles' => 'سرليکونه:',
 'watchlistedit-raw-submit' => 'کتلی لړليک تازه کول',
 'watchlistedit-raw-done'   => 'ستاسو کتلی لړليک تازه شو.',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'اړونده بدلونونه کتل',
-'watchlisttools-edit' => 'کتلی لړليک ليدل او سمادول',
-'watchlisttools-raw'  => 'خام کتلی لړليک سمادول',
+'watchlisttools-edit' => 'کتنلړليک ليدل او سمول',
+'watchlisttools-raw'  => 'خام کتنلړليک سمول',
 
 # Iranian month names
 'iranian-calendar-m1'  => 'وری',
diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index 1df02dae..9f1ddf25 100644
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -13,7 +13,9 @@
  * @author Nuno Tavares
  * @author Paulo Juntas
  * @author Rei-artur
+ * @author Remember the dot
  * @author Rodrigo Calanca Nishino
+ * @author Sir Lestaty de Lioncourt
  * @author Sérgio Ribeiro
  * @author Urhixidur
  * @author Villate
@@ -24,37 +26,32 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discussão',
-	NS_USER           => 'Usuário',
-	NS_USER_TALK      => 'Usuário_Discussão',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_Discussão',
-	NS_IMAGE          => 'Imagem',
-	NS_IMAGE_TALK     => 'Imagem_Discussão',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_Discussão',
-	NS_TEMPLATE       => 'Predefinição',
-	NS_TEMPLATE_TALK  => 'Predefinição_Discussão',
-	NS_HELP           => 'Ajuda',
-	NS_HELP_TALK      => 'Ajuda_Discussão',
-	NS_CATEGORY       => 'Categoria',
-	NS_CATEGORY_TALK  => 'Categoria_Discussão',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_TALK             => 'Discussão',
+	NS_USER             => 'Usuário',
+	NS_USER_TALK        => 'Usuário_Discussão',
+	NS_PROJECT_TALK     => '$1_Discussão',
+	NS_FILE             => 'Ficheiro',
+	NS_FILE_TALK        => 'Ficheiro_Discussão',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discussão',
+	NS_TEMPLATE         => 'Predefinição',
+	NS_TEMPLATE_TALK    => 'Predefinição_Discussão',
+	NS_HELP             => 'Ajuda',
+	NS_HELP_TALK        => 'Ajuda_Discussão',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Categoria_Discussão',
 );
 
-$skinNames = array(
-	'standard'    => 'Clássico',
-	'nostalgia'   => 'Nostalgia',
-	'cologneblue' => 'Azul colonial',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Chique',
-	'simple'      => 'Simples',
-	'modern'      => 'Moderno',
+$namespaceAliases = array(
+	'Imagem' => NS_FILE,
+	'Imagem_Discussão' => NS_FILE_TALK,
+	'Arquivo' => NS_FILE,
+	'Arquivo_Discussão' => NS_FILE_TALK,
 );
 
+
 $defaultDateFormat = 'dmy';
 
 $dateFormats = array(
@@ -69,89 +66,92 @@ $separatorTransformTable = array(',' => ' ', '.' => ',' );
 #$linkTrail = '/^([a-z]+)(.*)$/sD';# ignore list
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Redireccionamentos duplos', 'redirecionamentos duplos' ),
-	'BrokenRedirects'         => array( 'Redireccionamentos quebrados', 'redirecionamentos quebrados' ),
-	'Disambiguations'         => array( 'Páginas de desambiguação', 'Desambiguar', 'Desambiguações' ),
-	'Userlogin'               => array( 'Entrar', 'Login' ),
-	'Userlogout'              => array( 'Sair', 'Logout' ),
-	'CreateAccount'           => array( 'Criar conta' ),
-	'Preferences'             => array( 'Preferências' ),
-	'Watchlist'               => array( 'Páginas vigiadas', 'Artigos vigiados', 'Vigiados' ),
-	'Recentchanges'           => array( 'Mudanças recentes' ),
-	'Upload'                  => array( 'Carregar imagem', 'Carregar ficheiro', 'Carregar arquivo', 'Enviar' ),
-	'Imagelist'               => array( 'Lista de imagens', 'Lista de ficheiros', 'Lista de arquivos' ),
-	'Newimages'               => array( 'Imagens novas', 'Ficheiros novos', 'Arquivos novos' ),
-	'Listusers'               => array( 'Lista de usuários', 'Lista de utilizadores' ),
-	'Listgrouprights'         => array( 'Listar privilégios de grupos' ),
-	'Statistics'              => array( 'Estatísticas' ),
-	'Randompage'              => array( 'Aleatória', 'Aleatório', 'Página aleatória', 'Artigo aleatório' ),
-	'Lonelypages'             => array( 'Páginas órfãs', 'Artigos órfãos', 'Páginas sem afluentes', 'Artigos sem afluentes' ),
-	'Uncategorizedpages'      => array( 'Páginas sem categorias', 'Artigos sem categorias' ),
-	'Uncategorizedcategories' => array( 'Categorias sem categorias' ),
-	'Uncategorizedimages'     => array( 'Imagens sem categorias', 'Ficheiros sem categorias', 'Arquivos sem categorias' ),
-	'Uncategorizedtemplates'  => array( 'Predefinições não categorizadas', 'Predefinições sem categorias' ),
-	'Unusedcategories'        => array( 'Categorias não utilizadas', 'Categorias sem uso' ),
-	'Unusedimages'            => array( 'Imagens sem uso', 'Imagens não utilizadas', 'Ficheiros sem uso', 'Ficheiros não utilizados', 'Arquivos sem uso', 'Arquivos não utilizados' ),
-	'Wantedpages'             => array( 'Páginas em falta', 'Artigos em falta', 'Páginas pedidas', 'Artigos pedidos' ),
-	'Wantedcategories'        => array( 'Categorias em falta', 'Categorias inexistentes' ),
-	'Missingfiles'            => array( 'Ficheiros em falta', 'Arquivos em falta', 'Imagens em falta', '' ),
-	'Mostlinked'              => array( 'Páginas com mais afluentes', 'Artigos com mais afluentes' ),
-	'Mostlinkedcategories'    => array( 'Categorias com mais afluentes' ),
-	'Mostlinkedtemplates'     => array( 'Predefinições com mais afluentes' ),
-	'Mostcategories'          => array( 'Páginas com mais categorias', 'Artigos com mais categorias' ),
-	'Mostimages'              => array( 'Imagens com mais afluentes', 'Ficheiros com mais afluentes', 'Arquivos com mais afluentes' ),
-	'Mostrevisions'           => array( 'Páginas com mais edições', 'Artigos com mais edições' ),
-	'Fewestrevisions'         => array( 'Páginas com menos edições', 'Artigos com menos edições', 'Artigos menos editados' ),
-	'Shortpages'              => array( 'Páginas curtas', 'Artigos curtos' ),
-	'Longpages'               => array( 'Páginas longas', 'Artigos extensos' ),
-	'Newpages'                => array( 'Páginas novas', 'Artigos novos' ),
-	'Ancientpages'            => array( 'Páginas inativas', 'Artigos inativos' ),
-	'Deadendpages'            => array( 'Páginas sem saída', 'Artigos sem saída' ),
-	'Protectedpages'          => array( 'Páginas protegidas', 'Artigos protegidos' ),
-	'Protectedtitles'         => array( 'Títulos protegidos' ),
-	'Allpages'                => array( 'Todas as páginas', 'Todos os artigos', 'Todas páginas', 'Todos artigos' ),
-	'Prefixindex'             => array( '�ndice de prefixo', '�ndice por prefixo' ),
-	'Ipblocklist'             => array( 'Registo de bloqueios', 'Registro de bloqueios', 'IPs bloqueados', 'Utilizadores bloqueados', 'Usuários bloqueados' ),
-	'Specialpages'            => array( 'Páginas especiais' ),
-	'Contributions'           => array( 'Contribuições' ),
-	'Emailuser'               => array( 'Contactar usuário', 'Contactar utilizador', 'Contatar usuário' ),
-	'Confirmemail'            => array( 'Confirmar e-mail', 'Confirmar email' ),
-	'Whatlinkshere'           => array( 'Páginas afluentes', 'Artigos afluentes' ),
-	'Recentchangeslinked'     => array( 'Novidades relacionadas', 'Mudanças relacionadas' ),
-	'Movepage'                => array( 'Mover', 'Mover página', 'Mover artigo' ),
-	'Blockme'                 => array( 'Bloquear-me', 'Auto-bloqueio' ),
-	'Booksources'             => array( 'Fontes de livros' ),
-	'Categories'              => array( 'Categorias' ),
-	'Export'                  => array( 'Exportar' ),
-	'Version'                 => array( 'Versão', 'Sobre' ),
-	'Allmessages'             => array( 'Todas as mensagens', 'Todas mensagens' ),
-	'Log'                     => array( 'Registo', 'Registro', 'Registos', 'Registros' ),
-	'Blockip'                 => array( 'Bloquear', 'Bloquear IP', 'Bloquear utilizador', 'Bloquear usuário' ),
-	'Undelete'                => array( 'Restaurar', 'Restaurar páginas eliminadas', 'Restaurar artigos eliminados' ),
-	'Import'                  => array( 'Importar' ),
-	'Lockdb'                  => array( 'Bloquear a base de dados', 'Bloquear banco de dados' ),
-	'Unlockdb'                => array( 'Desbloquear a base de dados', 'Desbloquear banco de dados' ),
-	'Userrights'              => array( 'Privilégios', 'Direitos', 'Estatutos' ),
-	'MIMEsearch'              => array( 'Busca MIME' ),
-	'FileDuplicateSearch'     => array( 'Busca de ficheiros duplicados', 'Busca de arquivos duplicados' ),
-	'Unwatchedpages'          => array( 'Páginas não-vigiadas', 'Páginas não vigiadas', 'Artigos não-vigiados', 'Artigos não vigiados' ),
-	'Listredirects'           => array( 'Redireccionamentos', 'Redirecionamentos', 'Lista de redireccionamentos', 'Lista de redirecionamentos' ),
-	'Revisiondelete'          => array( 'Eliminar edição', 'Eliminar revisão', 'Apagar edição', 'Apagar revisão' ),
-	'Unusedtemplates'         => array( 'Predefinições sem uso', 'Predefinições não utilizadas' ),
-	'Randomredirect'          => array( 'Redireccionamento aleatório', 'Redirecionamento aleatório' ),
-	'Mypage'                  => array( 'Minha página' ),
-	'Mytalk'                  => array( 'Minha discussão' ),
-	'Mycontributions'         => array( 'Minhas contribuições', 'Minhas edições', 'Minhas constribuições' ),
-	'Listadmins'              => array( 'Administradores', 'Admins', 'Lista de administradores', 'Lista de admins' ),
-	'Listbots'                => array( 'Bots', 'Lista de bots' ),
-	'Popularpages'            => array( 'Páginas populares', 'Artigos populares' ),
-	'Search'                  => array( 'Busca', 'Buscar', 'Procurar', 'Pesquisar', 'Pesquisa' ),
-	'Resetpass'               => array( 'Repor senha', 'Zerar senha' ),
-	'Withoutinterwiki'        => array( 'Páginas sem interwikis', 'Artigos sem interwikis' ),
-	'MergeHistory'            => array( 'Fundir históricos', 'Fundir edições' ),
-	'Filepath'                => array( 'Diretório de ficheiro', 'Diretório de arquivo' ),
-	'Invalidateemail'         => array( 'Invalidar e-mail' ),
-	'Blankpage'               => array( 'Página em branco' ),
+	'DoubleRedirects'           => array( 'Redireccionamentos duplos', 'Redirecionamentos duplos' ),
+	'BrokenRedirects'           => array( 'Redireccionamentos quebrados', 'Redirecionamentos quebrados' ),
+	'Disambiguations'           => array( 'Páginas de desambiguação', 'Desambiguar', 'Desambiguações' ),
+	'Userlogin'                 => array( 'Entrar', 'Login' ),
+	'Userlogout'                => array( 'Sair', 'Logout' ),
+	'CreateAccount'             => array( 'Criar conta' ),
+	'Preferences'               => array( 'Preferências' ),
+	'Watchlist'                 => array( 'Páginas vigiadas', 'Artigos vigiados', 'Vigiados' ),
+	'Recentchanges'             => array( 'Mudanças recentes' ),
+	'Upload'                    => array( 'Carregar imagem', 'Carregar ficheiro', 'Carregar arquivo', 'Enviar' ),
+	'Listfiles'                 => array( 'Lista de imagens', 'Lista de ficheiros', 'Lista de arquivos' ),
+	'Newimages'                 => array( 'Imagens novas', 'Ficheiros novos', 'Arquivos novos' ),
+	'Listusers'                 => array( 'Lista de usuários', 'Lista de utilizadores' ),
+	'Listgrouprights'           => array( 'Listar privilégios de grupos' ),
+	'Statistics'                => array( 'Estatísticas' ),
+	'Randompage'                => array( 'Aleatória', 'Aleatório', 'Página aleatória', 'Artigo aleatório' ),
+	'Lonelypages'               => array( 'Páginas órfãs', 'Artigos órfãos', 'Páginas sem afluentes', 'Artigos sem afluentes' ),
+	'Uncategorizedpages'        => array( 'Páginas sem categorias', 'Artigos sem categorias' ),
+	'Uncategorizedcategories'   => array( 'Categorias sem categorias' ),
+	'Uncategorizedimages'       => array( 'Imagens sem categorias', 'Ficheiros sem categorias', 'Arquivos sem categorias' ),
+	'Uncategorizedtemplates'    => array( 'Predefinições não categorizadas', 'Predefinições sem categorias' ),
+	'Unusedcategories'          => array( 'Categorias não utilizadas', 'Categorias sem uso' ),
+	'Unusedimages'              => array( 'Imagens sem uso', 'Imagens não utilizadas', 'Ficheiros sem uso', 'Ficheiros não utilizados', 'Arquivos sem uso', 'Arquivos não utilizados' ),
+	'Wantedpages'               => array( 'Páginas em falta', 'Artigos em falta', 'Páginas pedidas', 'Artigos pedidos' ),
+	'Wantedcategories'          => array( 'Categorias em falta', 'Categorias inexistentes' ),
+	'Wantedfiles'               => array( 'Ficheiros em falta', 'Arquivos em falta', 'Imagens em falta' ),
+	'Wantedtemplates'           => array( 'Predefinições em falta' ),
+	'Mostlinked'                => array( 'Páginas com mais afluentes', 'Artigos com mais afluentes' ),
+	'Mostlinkedcategories'      => array( 'Categorias com mais afluentes' ),
+	'Mostlinkedtemplates'       => array( 'Predefinições com mais afluentes' ),
+	'Mostcategories'            => array( 'Páginas com mais categorias', 'Artigos com mais categorias' ),
+	'Mostimages'                => array( 'Imagens com mais afluentes', 'Ficheiros com mais afluentes', 'Arquivos com mais afluentes' ),
+	'Mostrevisions'             => array( 'Páginas com mais edições', 'Artigos com mais edições' ),
+	'Fewestrevisions'           => array( 'Páginas com menos edições', 'Artigos com menos edições', 'Artigos menos editados' ),
+	'Shortpages'                => array( 'Páginas curtas', 'Artigos curtos' ),
+	'Longpages'                 => array( 'Páginas longas', 'Artigos extensos' ),
+	'Newpages'                  => array( 'Páginas novas', 'Artigos novos' ),
+	'Ancientpages'              => array( 'Páginas inativas', 'Artigos inativos' ),
+	'Deadendpages'              => array( 'Páginas sem saída', 'Artigos sem saída' ),
+	'Protectedpages'            => array( 'Páginas protegidas', 'Artigos protegidos' ),
+	'Protectedtitles'           => array( 'Títulos protegidos' ),
+	'Allpages'                  => array( 'Todas as páginas', 'Todos os artigos', 'Todas páginas', 'Todos artigos' ),
+	'Prefixindex'               => array( '�ndice de prefixo', '�ndice por prefixo' ),
+	'Ipblocklist'               => array( 'Registo de bloqueios', 'Registro de bloqueios', 'IPs bloqueados', 'Utilizadores bloqueados', 'Usuários bloqueados' ),
+	'Specialpages'              => array( 'Páginas especiais' ),
+	'Contributions'             => array( 'Contribuições' ),
+	'Emailuser'                 => array( 'Contactar usuário', 'Contactar utilizador', 'Contatar usuário' ),
+	'Confirmemail'              => array( 'Confirmar e-mail', 'Confirmar email' ),
+	'Whatlinkshere'             => array( 'Páginas afluentes', 'Artigos afluentes' ),
+	'Recentchangeslinked'       => array( 'Novidades relacionadas', 'Mudanças relacionadas' ),
+	'Movepage'                  => array( 'Mover', 'Mover página', 'Mover artigo' ),
+	'Blockme'                   => array( 'Bloquear-me', 'Auto-bloqueio' ),
+	'Booksources'               => array( 'Fontes de livros' ),
+	'Categories'                => array( 'Categorias' ),
+	'Export'                    => array( 'Exportar' ),
+	'Version'                   => array( 'Versão', 'Sobre' ),
+	'Allmessages'               => array( 'Todas as mensagens', 'Todas mensagens' ),
+	'Log'                       => array( 'Registo', 'Registro', 'Registos', 'Registros' ),
+	'Blockip'                   => array( 'Bloquear', 'Bloquear IP', 'Bloquear utilizador', 'Bloquear usuário' ),
+	'Undelete'                  => array( 'Restaurar', 'Restaurar páginas eliminadas', 'Restaurar artigos eliminados' ),
+	'Import'                    => array( 'Importar' ),
+	'Lockdb'                    => array( 'Bloquear a base de dados', 'Bloquear banco de dados' ),
+	'Unlockdb'                  => array( 'Desbloquear a base de dados', 'Desbloquear banco de dados' ),
+	'Userrights'                => array( 'Privilégios', 'Direitos', 'Estatutos' ),
+	'MIMEsearch'                => array( 'Busca MIME' ),
+	'FileDuplicateSearch'       => array( 'Busca de ficheiros duplicados', 'Busca de arquivos duplicados' ),
+	'Unwatchedpages'            => array( 'Páginas não-vigiadas', 'Páginas não vigiadas', 'Artigos não-vigiados', 'Artigos não vigiados' ),
+	'Listredirects'             => array( 'Redireccionamentos', 'Redirecionamentos', 'Lista de redireccionamentos', 'Lista de redirecionamentos' ),
+	'Revisiondelete'            => array( 'Eliminar edição', 'Eliminar revisão', 'Apagar edição', 'Apagar revisão' ),
+	'Unusedtemplates'           => array( 'Predefinições sem uso', 'Predefinições não utilizadas' ),
+	'Randomredirect'            => array( 'Redireccionamento aleatório', 'Redirecionamento aleatório' ),
+	'Mypage'                    => array( 'Minha página' ),
+	'Mytalk'                    => array( 'Minha discussão' ),
+	'Mycontributions'           => array( 'Minhas contribuições', 'Minhas edições', 'Minhas constribuições' ),
+	'Listadmins'                => array( 'Administradores', 'Admins', 'Lista de administradores', 'Lista de admins' ),
+	'Listbots'                  => array( 'Bots', 'Lista de bots' ),
+	'Popularpages'              => array( 'Páginas populares', 'Artigos populares' ),
+	'Search'                    => array( 'Busca', 'Buscar', 'Procurar', 'Pesquisar', 'Pesquisa' ),
+	'Resetpass'                 => array( 'Repor senha', 'Zerar senha' ),
+	'Withoutinterwiki'          => array( 'Páginas sem interwikis', 'Artigos sem interwikis' ),
+	'MergeHistory'              => array( 'Fundir históricos', 'Fundir edições' ),
+	'Filepath'                  => array( 'Diretório de ficheiro', 'Diretório de arquivo' ),
+	'Invalidateemail'           => array( 'Invalidar e-mail' ),
+	'Blankpage'                 => array( 'Página em branco' ),
+	'LinkSearch'                => array( 'Pesquisar links' ),
+	'DeletedContributions'      => array( 'Contribuições eliminadas', 'Edições eliminadas' ),
 );
 
 $messages = array(
@@ -174,7 +174,7 @@ $messages = array(
 'tog-watchdefault'            => 'Adicionar páginas editadas por mim à minha lista de vigiados',
 'tog-watchmoves'              => 'Adicionar páginas movidas por mim à minha lista de vigiados',
 'tog-watchdeletion'           => 'Adicionar páginas eliminadas por mim à minha lista de vigiados',
-'tog-minordefault'            => 'Marcar todas as edições como secundárias, por padrão',
+'tog-minordefault'            => 'Marcar todas as edições como secundárias, por defeito',
 'tog-previewontop'            => 'Mostrar previsão antes da caixa de edição',
 'tog-previewonfirst'          => 'Mostrar previsão na primeira edição',
 'tog-nocache'                 => 'Desactivar caching de páginas',
@@ -184,25 +184,27 @@ $messages = array(
 'tog-enotifrevealaddr'        => 'Revelar o meu endereço de email nas notificações',
 'tog-shownumberswatching'     => 'Mostrar o número de utilizadores a vigiar',
 'tog-fancysig'                => 'Assinaturas sem atalhos automáticos',
-'tog-externaleditor'          => 'Utilizar editor externo por padrão (apenas para usuários avançados, já que serão necessárias configurações adicionais em seus computadores)',
-'tog-externaldiff'            => 'Utilizar diferenças externas por padrão (apenas para usuários avançados, já que serão necessárias configurações adicionais em seus computadores)',
+'tog-externaleditor'          => 'Utilizar editor externo por defeito (apenas para usuários avançados, já que serão necessárias configurações adicionais em seus computadores)',
+'tog-externaldiff'            => 'Utilizar diferenças externas por defeito (apenas para usuários avançados, já que serão necessárias configurações adicionais em seus computadores)',
 'tog-showjumplinks'           => 'Activar hiperligações de acessibilidade "ir para"',
 'tog-uselivepreview'          => 'Utilizar pré-visualização em tempo real (JavaScript) (Experimental)',
 'tog-forceeditsummary'        => 'Avisar-me ao introduzir um sumário vazio',
 'tog-watchlisthideown'        => 'Esconder as minhas edições da lista de vigiados',
 'tog-watchlisthidebots'       => 'Esconder edições efectuadas por robôs da lista de vigiados',
 'tog-watchlisthideminor'      => 'Esconder edições menores da lista de vigiados',
+'tog-watchlisthideliu'        => 'Ocultar edições de utilizadores autenticados da lista de vigiados',
+'tog-watchlisthideanons'      => 'Ocultar edições de utilizadores anônimos da lista de vigiados',
 'tog-nolangconversion'        => 'Desabilitar conversão de variantes de idioma',
 'tog-ccmeonemails'            => 'Enviar para mim cópias de e-mails que eu enviar a outros utilizadores',
 'tog-diffonly'                => 'Não mostrar o conteúdo da página ao comparar duas edições',
 'tog-showhiddencats'          => 'Exibir categorias ocultas',
+'tog-noconvertlink'           => 'Desabilitar conversão de títulos de ligações',
+'tog-norollbackdiff'          => 'Omitir diferenças depois de desfazer edições em bloco',
 
 'underline-always'  => 'Sempre',
 'underline-never'   => 'Nunca',
 'underline-default' => 'Padrão do navegador',
 
-'skinpreview' => '(Pré-visualizar)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Segunda-feira',
@@ -218,35 +220,35 @@ $messages = array(
 'thu'           => 'Qui',
 'fri'           => 'Sex',
 'sat'           => 'Sáb',
-'january'       => 'Janeiro',
-'february'      => 'Fevereiro',
-'march'         => 'Março',
-'april'         => 'Abril',
+'january'       => 'janeiro',
+'february'      => 'fevereiro',
+'march'         => 'março',
+'april'         => 'abril',
 'may_long'      => 'Maio',
-'june'          => 'Junho',
-'july'          => 'Julho',
-'august'        => 'Agosto',
-'september'     => 'Setembro',
-'october'       => 'Outubro',
-'november'      => 'Novembro',
-'december'      => 'Dezembro',
-'january-gen'   => 'Janeiro',
-'february-gen'  => 'Fevereiro',
-'march-gen'     => 'Março',
-'april-gen'     => 'Abril',
-'may-gen'       => 'Maio',
-'june-gen'      => 'Junho',
-'july-gen'      => 'Julho',
-'august-gen'    => 'Agosto',
-'september-gen' => 'Setembro',
-'october-gen'   => 'Outubro',
-'november-gen'  => 'Novembro',
-'december-gen'  => 'Dezembro',
+'june'          => 'junho',
+'july'          => 'julho',
+'august'        => 'agosto',
+'september'     => 'setembro',
+'october'       => 'outubro',
+'november'      => 'novembro',
+'december'      => 'dezembro',
+'january-gen'   => 'janeiro',
+'february-gen'  => 'fevereiro',
+'march-gen'     => 'março',
+'april-gen'     => 'abril',
+'may-gen'       => 'maio',
+'june-gen'      => 'junho',
+'july-gen'      => 'julho',
+'august-gen'    => 'agosto',
+'september-gen' => 'setembro',
+'october-gen'   => 'outubro',
+'november-gen'  => 'novembro',
+'december-gen'  => 'dezembro',
 'jan'           => 'Jan',
 'feb'           => 'Fev',
 'mar'           => 'Mar',
 'apr'           => 'Abr',
-'may'           => 'Mai',
+'may'           => 'maio',
 'jun'           => 'Jun',
 'jul'           => 'Jul',
 'aug'           => 'Ago',
@@ -296,7 +298,7 @@ $messages = array(
 'mytalk'         => 'Minha discussão',
 'anontalk'       => 'Discussão para este IP',
 'navigation'     => 'Navegação',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadados:',
@@ -333,14 +335,14 @@ $messages = array(
 'talkpagelinktext'  => 'disc',
 'specialpage'       => 'Página especial',
 'personaltools'     => 'Ferramentas pessoais',
-'postcomment'       => 'Envie um comentário',
+'postcomment'       => 'Nova secção',
 'articlepage'       => 'Ver página de conteúdo',
 'talk'              => 'Discussão',
 'views'             => 'Acessos',
 'toolbox'           => 'Ferramentas',
 'userpage'          => 'Ver página de utilizador',
 'projectpage'       => 'Ver página de projecto',
-'imagepage'         => 'Ver página de imagens',
+'imagepage'         => 'Ver página de ficheiro',
 'mediawikipage'     => 'Ver página de mensagens',
 'templatepage'      => 'Ver página de predefinições',
 'viewhelppage'      => 'Ver página de ajuda',
@@ -357,10 +359,8 @@ $messages = array(
 'jumptosearch'      => 'pesquisa',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'aboutsite'            => 'Sobre',
+'aboutsite'            => 'Sobre {{SITENAME}}',
 'aboutpage'            => 'Project:Sobre',
-'bugreports'           => 'Relatar bugs',
-'bugreportspage'       => 'Project:Relatos_de_bugs',
 'copyright'            => 'Conteúdo disponível sob $1.',
 'copyrightpagename'    => 'Direitos de autor de {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Direitos_de_autor',
@@ -383,9 +383,7 @@ $messages = array(
 
 'badaccess'        => 'Erro de permissão',
 'badaccess-group0' => 'Você não está autorizado a executar a acção requisitada.',
-'badaccess-group1' => 'A acção que você requisitou está limitada a utilizadores do grupo $1.',
-'badaccess-group2' => 'A acção que você requisitou está limitada a utilizadores de um dos seguintes grupos: $1.',
-'badaccess-groups' => 'A acção que você requisitou está limitada a utilizadores de um dos seguintes grupos: $1.',
+'badaccess-groups' => 'A acção que você requisitou está limitada a utilizadores {{PLURAL:$2|do grupo|de um dos seguintes grupos}}: $1.',
 
 'versionrequired'     => 'É necessária a versão $1 do MediaWiki',
 'versionrequiredtext' => 'Esta página requer a versão $1 do MediaWiki para poder ser utilizada. Consulte [[Special:Version|a página sobre a versão do sistema]]',
@@ -399,6 +397,8 @@ $messages = array(
 'editsection'             => 'editar',
 'editold'                 => 'editar',
 'viewsourceold'           => 'ver código',
+'editlink'                => 'editar',
+'viewsourcelink'          => 'ver fonte',
 'editsectionhint'         => 'Editar secção: $1',
 'toc'                     => 'Tabela de conteúdo',
 'showtoc'                 => 'mostrar',
@@ -413,13 +413,13 @@ $messages = array(
 'site-atom-feed'          => 'Feed Atom $1',
 'page-rss-feed'           => 'Feed RSS de "$1"',
 'page-atom-feed'          => 'Feed Atom de "$1"',
-'red-link-title'          => '$1 (ainda não escrito)',
+'red-link-title'          => '$1 (página não existe)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Página',
 'nstab-user'      => 'Página de utilizador',
 'nstab-media'     => 'Mídia',
-'nstab-special'   => 'Especial',
+'nstab-special'   => 'Página especial',
 'nstab-project'   => 'Página de projecto',
 'nstab-image'     => 'Ficheiro',
 'nstab-mediawiki' => 'Mensagem',
@@ -429,7 +429,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Acção não existente',
-'nosuchactiontext'  => 'A acção especificada pelo URL não é reconhecida pelo MediaWiki',
+'nosuchactiontext'  => 'A ação especificada pela URL é inválida.
+Você poderá ter introduzido mal a URL, ou ter seguido uma ligação incorreta.
+Isto poderá também ser indicador de um defeito em {{SITENAME}}.',
 'nosuchspecialpage' => 'Não existe a página especial requisitada',
 'nospecialpagetext' => "<big>'''Você requisitou uma página especial inválida.'''</big>
 
@@ -448,7 +450,7 @@ A última tentativa de busca na base de dados foi:
 <blockquote><tt>$1</tt></blockquote>
 na função "<tt>$2</tt>".
 O MySQL retornou o erro "<tt>$3: $4</tt>".',
-'noconnect'            => 'A wiki está a experimentar algumas dificuldades técnicas e não pode contactar o servidor da base de dados. <br />
+'noconnect'            => 'Desculpe! O wiki está a experimentar algumas dificuldades técnicas e não pode contactar o servidor da base de dados.<br />
 $1',
 'nodb'                 => 'Não foi possível seleccionar a base de dados $1',
 'cachederror'          => 'A página apresentada é uma cópia em cache da página requisitada e pode não estar actualizada.',
@@ -481,7 +483,6 @@ Por favor, reporte este facto a um [[Special:ListUsers/sysop|administrador]], to
 'cannotdelete'         => 'Não foi possível eliminar a página ou ficheiro especificado (provavelmente por já ter sido eliminada por outra pessoa.)',
 'badtitle'             => 'Título inválido',
 'badtitletext'         => 'O título de página requisitado é inválido, vazio, ou uma ligação incorrecta de inter-linguagem ou título inter-wiki. Pode ser que ele contenha um ou mais caracteres que não podem ser utilizados em títulos.',
-'perfdisabled'         => 'Desculpe-nos! Esta opção foi temporariamente desabilitada devido a tornar a base de dados lenta demais, a ponto de impossibilitar o funcionamento da wiki.',
 'perfcached'           => 'Os dados seguintes encontram-se na cache e podem não estar actualizados.',
 'perfcachedts'         => 'Os seguintes dados encontram-se armazenados na cache e foram actualizados pela última vez a $1.',
 'querypage-no-updates' => 'Momentaneamente as atualizações para esta página estão desativadas. Por enquanto, os dados aqui presentes não poderão ser atualizados.',
@@ -490,12 +491,12 @@ Function: $1<br />
 Query: $2',
 'viewsource'           => 'Ver código',
 'viewsourcefor'        => 'para $1',
-'actionthrottled'      => 'Acção controlada',
+'actionthrottled'      => 'Acção limitada',
 'actionthrottledtext'  => 'Como medida "anti-spam", está impedido de realizar esta operação demasiadas vezes num curto espaço de tempo, e já excedeu esse limite. Por favor, tente de novo dentro de alguns minutos.',
 'protectedpagetext'    => 'Esta página foi protegida contra novas edições.',
 'viewsourcetext'       => 'Você pode ver e copiar o código desta página:',
 'protectedinterface'   => 'Esta página fornece texto de interface ao software e encontra-se trancada para prevenir abusos.',
-'editinginterface'     => "'''Aviso:''' Encontra-se a editar uma página que é utilizada para fornecer texto de interface ao software. Alterações nesta página irão afectar a aparência da interface de utilizador para outros utilizadores. Para traduções, considere utilizar a [http://translatewiki.net/wiki/Main_Page?setlang=pt Betawiki], um projecto destinado à tradução do MediaWiki.",
+'editinginterface'     => "'''Aviso:''' Encontra-se a editar uma página que é utilizada para fornecer texto de interface ao software. Alterações nesta página irão afectar a aparência da interface de utilizador para outros utilizadores. Para traduções, considere utilizar a [http://translatewiki.net/wiki/Main_Page?setlang=pt translatewiki.net], um projecto destinado à tradução do MediaWiki.",
 'sqlhidden'            => '(Consulta SQL em segundo-plano)',
 'cascadeprotected'     => 'Esta página foi protegida contra edições por estar incluída {{PLURAL:$1|na página listada|nas páginas listadas}} a seguir, ({{PLURAL:$1|página essa que está protegida|páginas essas que estão protegidas}} com a opção de "proteção progressiva" ativada):
 $2',
@@ -506,16 +507,16 @@ $2',
 Quem o protegeu foi [[User:$1|$1]], com a justificativa: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Má configuração: antivírus desconhecido: <i>$1</i>',
+'virus-badscanner'     => "Má configuração: antivírus desconhecido: ''$1''",
 'virus-scanfailed'     => 'a verificação falhou (código $1)',
 'virus-unknownscanner' => 'antivírus desconhecido:',
 
 # Login and logout pages
 'logouttitle'                => 'Desautenticar do sistema',
-'logouttext'                 => '<strong>Você agora está desautenticado.</strong>
+'logouttext'                 => "'''Você agora está desautenticado.'''
 
 Pode continuar a utilizar a {{SITENAME}} anonimamente, ou pode [[Special:UserLogin|autenticar-se novamente]] com o mesmo nome de utilizador ou com um nome de utilizador diferente.
-Tenha em atenção que algumas páginas poderão continuar a ser apresentadas como se você ainda estivesse autenticado até que a cache de seu navegador seja limpa.',
+Tenha em atenção que algumas páginas poderão continuar a ser apresentadas como se você ainda estivesse autenticado até que a cache de seu navegador seja limpa.",
 'welcomecreation'            => '== Bem-vindo, $1! ==
 A sua conta foi criada.
 Não se esqueça de personalizar as suas [[Special:Preferences|preferências na {{SITENAME}}]].',
@@ -526,7 +527,6 @@ Não se esqueça de personalizar as suas [[Special:Preferences|preferências na
 'remembermypassword'         => 'Lembrar a minha palavra-chave entre sessões.',
 'yourdomainname'             => 'Seu domínio',
 'externaldberror'            => 'Ocorreu um erro externo à base de dados durante a autenticação ou não lhe é permitido actualizar a sua conta externa.',
-'loginproblem'               => '<b>Houve um problema com a sua autenticação.</b><br />Tente novamente!',
 'login'                      => 'Entrar',
 'nav-login-createaccount'    => 'Entrar / criar conta',
 'loginprompt'                => 'Você necessita de ter os <i>cookies</i> ligados para poder autenticar-se na {{SITENAME}}.',
@@ -552,8 +552,8 @@ Escolha um nome diferente.',
 'yourvariant'                => 'Variante',
 'yournick'                   => 'Assinatura:',
 'badsig'                     => 'Assinatura inválida; verifique o código HTML utilizado.',
-'badsiglength'               => 'Assinatura muito longa.
-Seria necessário que possuísse menos de $1 {{PLURAL:$1|caractere|caracteres}}.',
+'badsiglength'               => 'A sua assinatura é muito longa.
+Não deverá ter mais de $1 {{PLURAL:$1|caráter|carateres}}.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'O fornecimento de seu Nome verdadeiro é opcional, mas, caso decida o revelar, este será utilizado para lhe dar crédito pelo seu trabalho.',
 'loginerror'                 => 'Erro de autenticação',
@@ -566,7 +566,8 @@ Pode também escolher permitir que outros entrem em contacto consigo através da
 'loginsuccesstitle'          => 'Login bem sucedido',
 'loginsuccess'               => "'''Encontra-se agora ligado à {{SITENAME}} como \"\$1\"'''.",
 'nosuchuser'                 => 'Não existe nenhum utilizador com o nome "$1".
-Verifique o nome que introduziu, ou [[Special:UserLogin/signup|crie uma nova conta]].',
+Os nomes de utilizador são sensíveis à capitalização.
+Verifique a ortografia, ou [[Special:UserLogin/signup|crie uma nova conta]].',
 'nosuchusershort'            => 'Não existe um utilizador com o nome "<nowiki>$1</nowiki>". Verifique o nome que introduziu.',
 'nouserspecified'            => 'Precisa de especificar um nome de utilizador.',
 'wrongpassword'              => 'A palavra-chave que introduziu é inválida. Por favor, tente novamente.',
@@ -576,7 +577,7 @@ Deve de ter no mínimo {{PLURAL:$1|1 caracter|$1 caracteres}} e ser diferente do
 'mailmypassword'             => 'Enviar uma nova palavra-chave por e-mail',
 'passwordremindertitle'      => 'Nova palavra-chave temporária em {{SITENAME}}',
 'passwordremindertext'       => 'Alguém (provavelmente você, a partir do endereço de IP $1) solicitou que fosse lhe enviada uma nova palavra-chave para {{SITENAME}} ($4).
-A palavra-chave temporária para o utilizador "$2" é, a partir de agora, "$3". Caso essa tenha sido a sua intenção, entre na sua conta e defina uma nova palavra-chave.
+Foi criada uma palavra-chave temporária para o utilizador "$2", e foi reposta como "$3". Caso esta tenha sido a sua intenção, entre na sua conta e escolha uma nova palavra-chave agora.
 
 Caso tenha sido outra pessoa a fazer este pedido, ou caso você já se tenha lembrado da sua palavra-chave e não deseja alterará-la, ignore esta mensagem e continue a utilizar a palavra-chave antiga.',
 'noemail'                    => 'Não há um endereço de correio electrónico associado ao utilizador "$1".',
@@ -589,10 +590,11 @@ de modo a confirmar que a conta é mesmo sua.',
 'throttled-mailpassword'     => 'Um lembrete de palavra-chave já foi enviado {{PLURAL:$1|na última hora|nas últimas $1 horas}}.
 Para prevenir abusos, apenas um lembrete poderá ser enviado a cada {{PLURAL:$1|hora|$1 horas}}.',
 'mailerror'                  => 'Erro a enviar o email: $1',
-'acct_creation_throttle_hit' => 'Pedimos desculpa, mas já foram criadas $1 contas por si. Não lhe é possível criar mais nenhuma.',
-'emailauthenticated'         => 'O seu endereço de correio electrónico foi autenticado em $1.',
+'acct_creation_throttle_hit' => 'Visitantes deste wiki utilizando o seu endereço IP criaram {{PLURAL:$1|1 conta|$1 contas}} no último dia, o que é o máximo permitido neste período de tempo.
+Como resultado, visitantes que usam este endereço IP não podem criar mais nenhuma conta de momento.',
+'emailauthenticated'         => 'O seu endereço de e-mail foi autenticado às $3 de $2.',
 'emailnotauthenticated'      => 'O seu endereço de correio electrónico ainda não foi autenticado. Não lhe será enviado nenhum correio sobre nenhuma das seguintes funcionalidades.',
-'noemailprefs'               => 'Especifique um endereço de e-mail para que os seguintes recursos funcionem.',
+'noemailprefs'               => 'Especifique um endereço de e-mail nas suas preferências para activar estas funcionalidades.',
 'emailconfirmlink'           => 'Confirme o seu endereço de correio electrónico',
 'invalidemailaddress'        => 'O endereço de e-mail não pode ser aceite devido a talvez possuir um formato inválido.
 Introduza um endereço correctamente formatado ou esvazie o campo.',
@@ -602,18 +604,26 @@ Introduza um endereço correctamente formatado ou esvazie o campo.',
 'createaccount-text'         => 'Alguém criou uma conta de nome $2 para o seu endereço de email no wiki {{SITENAME}} ($4), tendo como palavra-chave #$3". Você deve se autenticar e alterar sua palavra-chave.
 
 Você pode ignorar esta mensagem caso a conta tenha sido criada por engano.',
+'login-throttled'            => 'Você fez muitas tentativas recentes de se autenticar com esta conta. Aguarde antes de tentar novamente.',
 'loginlanguagelabel'         => 'Idioma: $1',
 
 # Password reset dialog
-'resetpass'               => 'Criar nova palavra-chave',
-'resetpass_announce'      => 'Você foi autenticado através de uma palavra-chave temporária. Para prosseguir, será necessário definir uma nova palavra-chave.',
-'resetpass_text'          => '<!-- Adicionar texto aqui -->',
-'resetpass_header'        => 'Alterar palavra-chave da conta',
-'resetpass_submit'        => 'Definir palavra-chave e entrar',
-'resetpass_success'       => 'Sua palavra-chave foi alterada com sucesso! Autenticando-se...',
-'resetpass_bad_temporary' => 'Palavra-chave temporária incorrecta. Pode ser que você já tenha conseguido alterar a sua palavra-chave ou pedido que uma nova temporária fosse gerada.',
-'resetpass_forbidden'     => 'Não é possível alterar palavras-chave',
-'resetpass_missing'       => 'Sem dados no formulário.',
+'resetpass'                 => 'Alterar palavra-chave',
+'resetpass_announce'        => 'Você foi autenticado através de uma palavra-chave temporária. Para prosseguir, será necessário definir uma nova palavra-chave.',
+'resetpass_text'            => '<!-- Adicionar texto aqui -->',
+'resetpass_header'          => 'Alterar palavra-chave da conta',
+'oldpassword'               => 'Palavra-chave antiga',
+'newpassword'               => 'Nova palavra-chave',
+'retypenew'                 => 'Reintroduza a nova palavra-chave',
+'resetpass_submit'          => 'Definir palavra-chave e entrar',
+'resetpass_success'         => 'Sua palavra-chave foi alterada com sucesso! Autenticando-se...',
+'resetpass_bad_temporary'   => 'Palavra-chave temporária incorrecta. Pode ser que você já tenha conseguido alterar a sua palavra-chave ou pedido que uma nova temporária fosse gerada.',
+'resetpass_forbidden'       => 'Não é possível alterar palavras-chave',
+'resetpass-no-info'         => 'Você precisa estar autenticado para aceder a esta página directamente.',
+'resetpass-submit-loggedin' => 'Alterar palavra-chave',
+'resetpass-wrong-oldpass'   => 'Palavra-chave temporária ou actual inválida. 
+Você pode já ter alterado com sucesso a sua palavra-chave, ou solicitado uma nova palavra-chave temporária.',
+'resetpass-temp-password'   => 'Palavra-chave temporária:',
 
 # Edit page toolbar
 'bold_sample'     => 'Texto a negrito',
@@ -638,11 +648,11 @@ Você pode ignorar esta mensagem caso a conta tenha sido criada por engano.',
 'hr_tip'          => 'Linha horizontal (utilize moderadamente)',
 
 # Edit pages
-'summary'                          => 'Sumário',
-'subject'                          => 'Assunto/cabeçalho',
+'summary'                          => 'Sumário:',
+'subject'                          => 'Assunto/cabeçalho:',
 'minoredit'                        => 'Marcar como edição menor',
 'watchthis'                        => 'Observar esta página',
-'savearticle'                      => 'Salvar página',
+'savearticle'                      => 'Gravar página',
 'preview'                          => 'Prever',
 'showpreview'                      => 'Mostrar previsão',
 'showlivepreview'                  => 'Pré-visualização em tempo real',
@@ -651,8 +661,8 @@ Você pode ignorar esta mensagem caso a conta tenha sido criada por engano.',
 'missingsummary'                   => "'''Lembrete:''' Você não introduziu um sumário de edição. Se carregar novamente em Salvar a sua edição será salva sem um sumário.",
 'missingcommenttext'               => 'Por favor, introduzida um comentário abaixo.',
 'missingcommentheader'             => "'''Lembrete:''' Você não introduziu um assunto/título para este comentário. Se carregar novamente em Salvar a sua edição será salva sem um título/assunto.",
-'summary-preview'                  => 'Previsão de sumário',
-'subject-preview'                  => 'Previsão de assunto/título',
+'summary-preview'                  => 'Previsão de sumário:',
+'subject-preview'                  => 'Previsão de assunto/título:',
 'blockedtitle'                     => 'O utilizador está bloqueado',
 'blockedtext'                      => '<big>O seu nome de utilizador ou endereço de IP foi bloqueado</big>
 
@@ -707,34 +717,37 @@ Se você chegou até aqui por engano, clique no botão '''voltar''' (ou ''back''
 'anontalkpagetext'                 => "----''Esta é a página de discussão para um utilizador anónimo que ainda não criou uma conta ou que não a utiliza, de modo a que temos que utilizar o endereço de IP para identificá-lo(a).
 Um endereço de IP pode ser partilhado por vários utilizadores.
 Se é um utilizador anónimo e sente que comentários irrelevantes foram direccionados a você, por favor [[Special:UserLogin/signup|crie uma conta]] ou [[Special:UserLogin|autentique-se]] para evitar futuras confusões com outros utilizadores anónimos.''",
-'noarticletext'                    => 'Não existe actualmente texto nesta página; você pode [[Special:Search/{{PAGENAME}}|pesquisar pelo título desta página noutras páginas]] ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página].',
+'noarticletext'                    => 'Não existe atualmente texto nesta página.
+Você pode [[Special:Search/{{PAGENAME}}|pesquisar pelo título desta página]] noutras páginas,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} pesquisar os registos relacionados],
+ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página]</span>.',
 'userpage-userdoesnotexist'        => 'A conta "$1" não se encontra registada. Por gentileza, verifique se deseja mesmo criar/editar esta página.',
 'clearyourcache'                   => "'''Nota:''' Após salvar, terá de limpar a cache do seu navegador para ver as alterações.'''
 '''Mozilla / Firefox / Safari:''' pressione ''Shift'' enquanto clica em ''Recarregar'', ou pressione ou ''Ctrl-F5'' ou ''Ctrl-R'' (''Command-R'' num Macintosh); '''Konqueror:''': clique no botão ''Recarregar'' ou pressione ''F5''; '''Opera:''' limpe a sua cache em ''Ferramentas → Preferências'' (''Tools → Preferences''); '''Internet Explorer:''' pressione ''Ctrl'' enquanto clica em ''Recarregar'' ou pressione ''Ctrl-F5'';",
-'usercssjsyoucanpreview'           => '<strong>Dica:</strong> Utilize o botão "Mostrar previsão" para testar seu novo CSS/JS antes de salvar.',
+'usercssjsyoucanpreview'           => "'''Dica:''' Utilize o botão \"Mostrar previsão\" para testar seu novo CSS/JS antes de salvar.",
 'usercsspreview'                   => "'''Lembre-se que está apenas a prever o seu CSS particular.
 Ele ainda não foi salvo!'''",
 'userjspreview'                    => "'''Lembre-se que está apenas a testar/prever o seu JavaScript particular e que ele ainda não foi salvo!'''",
 'userinvalidcssjstitle'            => "'''Aviso:''' Não existe um tema \"\$1\". Lembre-se que as páginas .css e  .js utilizam um título em minúsculas, exemplo: {{ns:user}}:Alguém/monobook.css aposto a {{ns:user}}:Alguém/Monobook.css.",
 'updated'                          => '(Actualizado)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Isto é apenas uma previsão.
-As modificações ainda não foram salvas!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Isto é apenas uma previsão.
+As modificações ainda não foram salvas!'''",
 'previewconflict'                  => 'Esta previsão reflete o texto que está na área de edição acima e como ele aparecerá se você escolher salvar.',
-'session_fail_preview'             => '<strong>Não foi possível processar a sua edição devido à perda de dados da sua sessão.
+'session_fail_preview'             => "'''Não foi possível processar a sua edição devido à perda de dados da sua sessão.
 Por favor tente novamente.
-Caso continue a não funcionar, tente [[Special:UserLogout|sair]] e voltar a entrar na sua conta.</strong>',
-'session_fail_preview_html'        => "<strong>Não foi possível processar a sua edição devido a uma perda de dados de sessão.</strong>
+Caso continue a não funcionar, tente [[Special:UserLogout|sair]] e voltar a entrar na sua conta.'''",
+'session_fail_preview_html'        => "'''Não foi possível processar a sua edição devido a uma perda de dados de sessão.'''
 
 ''Devido a {{SITENAME}} possuir HTML bruto activo, a previsão não será exibida, como forma de precaução contra ataques por JavaScript.''
 
-<strong>Por favor, tente novamente caso esta seja uma tentativa de edição legítima.
-Caso continue a não funcionar, tente [[Special:UserLogout|desautenticar-se]] e voltar a entrar na sua conta.</strong>",
-'token_suffix_mismatch'            => '<strong>A sua edição foi rejeitada uma vez que seu software de navegação mutilou os sinais de pontuação no identificador de edição. A edição foi rejeitada para evitar perdas no texto da página.
-Isso acontece ocasionalmente quando se usa um serviço de proxy anonimizador mal configurado.</strong>',
+'''Por favor, tente novamente caso esta seja uma tentativa de edição legítima.
+Caso continue a não funcionar, tente [[Special:UserLogout|desautenticar-se]] e voltar a entrar na sua conta.'''",
+'token_suffix_mismatch'            => "'''A sua edição foi rejeitada uma vez que seu software de navegação mutilou os sinais de pontuação no identificador de edição. A edição foi rejeitada para evitar perdas no texto da página.
+Isso acontece ocasionalmente quando se usa um serviço de proxy anonimizador mal configurado.'''",
 'editing'                          => 'Editando $1',
 'editingsection'                   => 'Editando $1 (secção)',
-'editingcomment'                   => 'Editando $1 (comentário)',
+'editingcomment'                   => 'Editando $1 (nova secção)',
 'editconflict'                     => 'Conflito de edição: $1',
 'explainconflict'                  => 'Alguém mudou a página enquanto você a estava editando.
 A área de texto acima mostra o texto da forma como está no momento.
@@ -744,27 +757,30 @@ Você terá que mesclar suas modificações no texto existente.
 "Salvar página".<br />',
 'yourtext'                         => 'Seu texto',
 'storedversion'                    => 'Versão guardada',
-'nonunicodebrowser'                => '<strong>AVISO: O seu navegador não é compatível com as especificações unicode.
-Um contorno terá de ser utilizado para permitir que você possa editar as páginas com segurança: os caracteres não-ASCII aparecerão na caixa de edição no formato de códigos hexadecimais.</strong>',
-'editingold'                       => '<strong>CUIDADO: Encontra-se a editar uma revisão
+'nonunicodebrowser'                => "'''AVISO: O seu navegador não é compatível com as especificações unicode.
+Um contorno terá de ser utilizado para permitir que você possa editar as páginas com segurança: os caracteres não-ASCII aparecerão na caixa de edição no formato de códigos hexadecimais.'''",
+'editingold'                       => "'''CUIDADO: Encontra-se a editar uma revisão
 desactualizada desta página.
-Se salvá-la, todas as mudanças feitas a partir desta revisão serão perdidas.</strong>',
+Se salvá-la, todas as mudanças feitas a partir desta revisão serão perdidas.'''",
 'yourdiff'                         => 'Diferenças',
-'copyrightwarning'                 => 'Por favor, note que todas as suas contribuições em {{SITENAME}} são consideradas como lançadas nos termos da licença $2 (veja $1 para detalhes). Se não deseja que o seu texto seja inexoravelmente editado e redistribuído de tal forma, não o envie.<br />
+'copyrightwarning'                 => "Por favor, note que todas as suas contribuições em {{SITENAME}} são consideradas como lançadas nos termos da licença $2 (veja $1 para detalhes). Se não deseja que o seu texto seja inexoravelmente editado e redistribuído de tal forma, não o envie.<br />
 Você está, ao mesmo tempo, a garantir-nos que isto é algo escrito por si, ou algo copiado de uma fonte de textos em domínio público ou similarmente de teor livre.
-<strong>NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!</strong>',
-'copyrightwarning2'                => 'Por favor, note que todas as suas contribuições em {{SITENAME}} podem ser editadas, alteradas ou removidas por outros contribuidores. Se você não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />
+'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!'''",
+'copyrightwarning2'                => "Por favor, note que todas as suas contribuições em {{SITENAME}} podem ser editadas, alteradas ou removidas por outros contribuidores. Se você não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />
 Você está, ao mesmo tempo, a garantir-nos que isto é algo escrito por si, ou algo copiado de alguma fonte de textos em domínio público ou similarmente de teor livre (veja $1 para detalhes).
-<strong>NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!</strong>',
-'longpagewarning'                  => '<strong>AVISO: Esta página possui $1 kilobytes; alguns
+'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!'''",
+'longpagewarning'                  => "'''AVISO: Esta página possui $1 kilobytes; alguns
 navegadores possuem problemas em editar páginas maiores que 32 kb.
-Por favor, considere seccionar a página em secções de menor dimensão.</strong>',
-'longpageerror'                    => '<strong>ERRO: O texto de página que você submeteu tem mais de $1 kilobytes em tamanho, que é maior que o máximo de $2 kilobytes. A página não pode ser salva.</strong>',
-'readonlywarning'                  => '<strong>AVISO: A base de dados foi bloqueada para manutenção, pelo que não poderá salvar a sua edição neste momento. Pode, no entanto, copiar o seu texto num editor externo e guardá-lo para posterior submissão.</strong>',
-'protectedpagewarning'             => '<strong>AVISO: Esta página foi protegida e poderá ser editada apenas por utilizadores com privilégios sysop (administradores).</strong>',
+Por favor, considere seccionar a página em secções de menor dimensão.'''",
+'longpageerror'                    => "'''ERRO: O texto de página que você submeteu tem mais de $1 kilobytes em tamanho, que é maior que o máximo de $2 kilobytes. A página não pode ser salva.'''",
+'readonlywarning'                  => "'''AVISO: A base de dados foi bloqueada para manutenção, pelo que não poderá salvar a sua edição neste momento.
+Pode, no entanto, copiar o seu texto num editor externo e guardá-lo para posterior submissão.'''
+
+Quem bloqueou a base de dados forneceu a seguinte justificativa: $1",
+'protectedpagewarning'             => "'''AVISO: Esta página foi protegida e poderá ser editada apenas por utilizadores com privilégios sysop (administradores).'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Esta página foi protegida de modo a que apenas utilizadores registados a possam editar.",
 'cascadeprotectedwarning'          => "'''Atenção:''' Esta página se encontra protegida de forma que apenas {{int:group-sysop}} possam editá-la, uma vez que se encontra incluída {{PLURAL:\$1|na seguinte página protegida|nas seguintes páginas protegidas}} com a \"proteção progressiva\":",
-'titleprotectedwarning'            => '<strong>ATENÇÃO: Esta página foi protegida, apenas alguns utilizadores poderão criá-la.</strong>',
+'titleprotectedwarning'            => "'''ATENÇÃO: Esta página foi protegida por forma a que [[Special:ListGroupRights|privilégios específicos]] sejam necessários para criá-la.'''",
 'templatesused'                    => 'Predefinições utilizadas nesta página:',
 'templatesusedpreview'             => 'Predefinições utilizadas nesta previsão:',
 'templatesusedsection'             => 'Predefinições utilizadas nesta secção:',
@@ -778,22 +794,34 @@ Pode voltar atrás e editar uma página já existente, ou [[Special:UserLogin|au
 'nocreate-loggedin'                => 'Você não possui permissões de criar novas páginas.',
 'permissionserrors'                => 'Erros de permissões',
 'permissionserrorstext'            => 'Você não possui permissão de fazer isso, {{PLURAL:$1|pelo seguinte motivo|pelos seguintes motivos}}:',
-'permissionserrorstext-withaction' => 'Você não possui permissão para $2, {{PLURAL:$1|pelo seguinte motivo|pelos motivos a seguir}}:',
+'permissionserrorstext-withaction' => 'Você não possui permissão para $2, {{PLURAL:$1|pelo seguinte motivo|pelos seguintes motivos}}:',
 'recreate-deleted-warn'            => "'''Atenção: Você está criando novamente uma página já eliminada em outra ocasião.'''
 
 Certifique-se de que seja adequado prosseguir editando esta página.
 O registo de eliminação desta página é exibido a seguir, para sua comodidade:",
+'deleted-notice'                   => 'Esta página foi eliminada. Disponibiliza-se abaixo o registo de eliminações para esta página, para referência.',
+'deletelog-fulllog'                => 'Ver registo completo',
+'edit-hook-aborted'                => 'Edição abortada por hook.
+Ele não deu nenhuma explicação.',
+'edit-gone-missing'                => 'Não foi possível atualizar a página.
+Ela foi, aparentemente, eliminada.',
+'edit-conflict'                    => 'Conflito de edição.',
+'edit-no-change'                   => 'A sua edição foi ignorada, uma vez que o texto não sofreu alterações.',
+'edit-already-exists'              => 'Não foi possível criar uma nova página.
+Ela já existia.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Aviso: Esta página contém demasiadas chamadas custosas a funções do analisador "parser".
 
-Deveria ter menos de $2, e neste momento existem $1.',
+Deveria ter menos de $2 {{PLURAL:$2|chamada|chamadas}}. Neste momento {{PLURAL:$1|há $1 chamada|existem $1 chamadas}}.',
 'expensive-parserfunction-category'       => 'Páginas com demasiadas chamadas custosas a funções do analisador "parser"',
 'post-expand-template-inclusion-warning'  => 'Aviso: O tamanho de inclusão de predefinições é demasiado grande, algumas predefinições não serão incluídas.',
 'post-expand-template-inclusion-category' => 'Páginas onde o tamanho de inclusão de predefinições é excedido',
 'post-expand-template-argument-warning'   => 'Aviso: Esta página contém pelo menos um argumento de predefinição com um tamanho expandido demasiado grande.
 Estes argumentos foram omitidos.',
 'post-expand-template-argument-category'  => 'Páginas com omissões de argumentos em predefinições',
+'parser-template-loop-warning'            => 'Ciclo de predefinições detectado: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Atingido o limite de profundidade de recursividade de predefinição ($1)',
 
 # "Undo" feature
 'undo-success' => 'A edição pode ser desfeita.
@@ -809,29 +837,29 @@ Por favor, verifique a seguinte comparação para se certificar de que é o que
 A justificativa apresentada por $3 foi ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Ver registos para esta página',
-'nohistory'           => 'Não há histórico de edições para esta página.',
-'revnotfound'         => 'Revisão não encontrada',
-'revnotfoundtext'     => 'A antiga revisão desta página que requesitou não pode ser encontrada. Por favor verifique o URL que utilizou para aceder esta página.',
-'currentrev'          => 'Revisão actual',
-'revisionasof'        => 'Edição tal como às $1',
-'revision-info'       => 'Revisão de $1; $2',
-'previousrevision'    => '� Versão anterior',
-'nextrevision'        => 'Versão posterior →',
-'currentrevisionlink' => 'ver versão actual',
-'cur'                 => 'act',
-'next'                => 'prox',
-'last'                => 'ult',
-'page_first'          => 'primeira',
-'page_last'           => 'última',
-'histlegend'          => 'Selecção de diferença: marque as caixas em uma das versões que deseja comparar e carregue no botão.<br />
-Legenda: (actu) = diferenças da versão actual,
-(ult) = diferença da versão precedente, m = edição menor',
-'deletedrev'          => '[eliminada]',
-'histfirst'           => 'Mais antigas',
-'histlast'            => 'Mais recentes',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vazia)',
+'viewpagelogs'           => 'Ver registos para esta página',
+'nohistory'              => 'Não há histórico de edições para esta página.',
+'currentrev'             => 'Revisão actual',
+'currentrev-asof'        => 'Edição actual tal como $1',
+'revisionasof'           => 'Edição tal como às $1',
+'revision-info'          => 'Revisão de $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Versão anterior',
+'nextrevision'           => 'Versão posterior →',
+'currentrevisionlink'    => 'ver versão actual',
+'cur'                    => 'atu',
+'next'                   => 'prox',
+'last'                   => 'ant',
+'page_first'             => 'primeira',
+'page_last'              => 'última',
+'histlegend'             => "Seleção de diferença: marque as caixas de opção das versões que deseja comparar e carregue em 'Enter' ou no botão no fundo da página.<br />
+Legenda: '''(atu)''' = diferenças da versão atual,
+'''(ant)''' = diferenças da versão anterior, '''m''' = edição menor",
+'history-fieldset-title' => 'Navegar pelo histórico',
+'deletedrev'             => '[eliminada]',
+'histfirst'              => 'Mais antigas',
+'histlast'               => 'Mais recentes',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vazia)',
 
 # Revision feed
 'history-feed-title'          => 'História de revisão',
@@ -914,6 +942,7 @@ Certifique-se de que tal alteração manterá a continuidade das ações.',
 'mergehistory-invalid-destination' => 'A página de destino precisa ser um título válido.',
 'mergehistory-autocomment'         => '[[:$1]] fundido em [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fundido em [[:$2]]: $3',
+'mergehistory-same-destination'    => 'As páginas de origem e de destino não podem ser as mesmas',
 
 # Merge log
 'mergelog'           => 'Registo de fusão de históricos',
@@ -926,121 +955,202 @@ Certifique-se de que tal alteração manterá a continuidade das ações.',
 'difference'              => '(Diferença entre edições)',
 'lineno'                  => 'Linha $1:',
 'compareselectedversions' => 'Compare as versões seleccionadas',
+'visualcomparison'        => 'Comparação visual',
+'wikicodecomparison'      => 'Comparação de wikitexto',
 'editundo'                => 'desfazer',
 'diff-multi'              => '({{PLURAL:$1|uma edição intermédia não está sendo exibida|$1 edições intermédias não estão sendo exibidas}}.)',
+'diff-movedto'            => 'movido para $1',
+'diff-styleadded'         => 'estilo $1 adicionado',
+'diff-added'              => '$1 adicionado',
+'diff-changedto'          => 'alterado para $1',
+'diff-movedoutof'         => 'movido para fora de $1',
+'diff-styleremoved'       => 'estilo $1 removido',
+'diff-removed'            => '$1 removido',
+'diff-changedfrom'        => 'alterado de $1',
+'diff-src'                => 'fonte',
+'diff-withdestination'    => 'com destino $1',
+'diff-with'               => '&#32;com $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'largura',
+'diff-height'             => 'altura',
+'diff-p'                  => "um '''parágrafo'''",
+'diff-blockquote'         => "uma '''citação'''",
+'diff-h1'                 => "um '''cabeçalho (de nível 1)'''",
+'diff-h2'                 => "um '''cabeçalho (de nível 2)'''",
+'diff-h3'                 => "um '''cabeçalho (de nível 3)'''",
+'diff-h4'                 => "um '''cabeçalho (de nível 4)'''",
+'diff-h5'                 => "um '''cabeçalho (de nível 5)'''",
+'diff-pre'                => "um '''bloco pré-formatado'''",
+'diff-div'                => "uma '''divisão'''",
+'diff-ul'                 => "uma '''lista sem ordenação'''",
+'diff-ol'                 => "uma '''lista ordenada'''",
+'diff-li'                 => "um '''item de lista'''",
+'diff-table'              => "uma '''tabela'''",
+'diff-tbody'              => "o '''conteúdo de uma tabela'''",
+'diff-tr'                 => "uma '''linha'''",
+'diff-td'                 => "uma '''célula'''",
+'diff-th'                 => "um '''cabeçalho'''",
+'diff-br'                 => "uma '''quebra de linha'''",
+'diff-hr'                 => "uma '''linha horizontal'''",
+'diff-code'               => "um '''bloco de código computacional'''",
+'diff-dl'                 => "uma '''lista de definições'''",
+'diff-dt'                 => "uma '''definição do termo'''",
+'diff-dd'                 => "uma '''definição'''",
+'diff-input'              => "uma '''entrada de dados'''",
+'diff-form'               => "um '''formulário'''",
+'diff-img'                => "uma '''imagem'''",
+'diff-span'               => "um '''span'''",
+'diff-a'                  => "uma '''ligação'''",
+'diff-i'                  => "'''itálico'''",
+'diff-b'                  => "'''negrito'''",
+'diff-strong'             => "'''forte'''",
+'diff-em'                 => "'''ênfase'''",
+'diff-font'               => "'''tipo de letra'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''apagado'''",
+'diff-tt'                 => "'''largura fixa'''",
+'diff-sub'                => "'''sub script'''",
+'diff-sup'                => "'''super script'''",
+'diff-strike'             => "'''paralizado através de'''",
 
 # Search results
-'searchresults'             => 'Resultados de pesquisa',
-'searchresulttext'          => 'Para mais informações de como pesquisar em {{SITENAME}}, consulte [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Você pesquisou por \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|páginas iniciadas por "$1"]] | [[Special:WhatLinksHere/$1|páginas que apontam para "$1"]])',
-'searchsubtitleinvalid'     => 'Você pesquisou por "$1"',
-'noexactmatch'              => "'''Não existe uma página com o título \"\$1\".''' Você pode [[:\$1|criar tal página]].",
-'noexactmatch-nocreate'     => "'''Não há uma página intitulada como \"\$1\".'''",
-'toomanymatches'            => 'Foram retornados demasiados resultados. Por favor, tente um filtro de pesquisa diferente',
-'titlematches'              => 'Resultados nos títulos das páginas',
-'notitlematches'            => 'Nenhum título de página coincide com o termo pesquisado',
-'textmatches'               => 'Resultados dos textos das páginas',
-'notextmatches'             => 'Não foi possível localizar o termo pesquisado no conteúdo das páginas',
-'prevn'                     => 'anteriores $1',
-'nextn'                     => 'próximos $1',
-'viewprevnext'              => 'Ver ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 palavra|$2 palavras}})',
-'search-result-score'       => 'Relevancia: $1%',
-'search-redirect'           => '(redireccionamento para $1)',
-'search-section'            => '(secção $1)',
-'search-suggest'            => 'Será que quis dizer: $1',
-'search-interwiki-caption'  => 'Projectos irmãos',
-'search-interwiki-default'  => 'Resultados de $1:',
-'search-interwiki-more'     => '(mais)',
-'search-mwsuggest-enabled'  => 'com sugestões',
-'search-mwsuggest-disabled' => 'sem sugestões',
-'search-relatedarticle'     => 'Relacionado',
-'mwsuggest-disable'         => 'Desactivar sugestões AJAX',
-'searchrelated'             => 'relacionados',
-'searchall'                 => 'todos',
-'showingresults'            => "A seguir {{PLURAL:$1|é mostrado '''um''' resultado|são mostrados até '''$1''' resultados}}, iniciando no '''$2'''º.",
-'showingresultsnum'         => "A seguir {{PLURAL:$3|é mostrado '''um''' resultado|são mostrados '''$3''' resultados}}, iniciando com o '''$2'''º.",
-'showingresultstotal'       => "Exibindo {{PLURAL:$3|o resultado '''$1''' de '''$3'''|os resultados '''$1 a $2''' de '''$3'''}}",
-'nonefound'                 => "'''Nota''': apenas alguns espaços nominais são pesquisados por padrão. Tente utilizar o prefixo ''all:'' em sua busca, para pesquisar por todos os conteúdos deste wiki (inclusive páginas de discussão, predefinições etc), ou mesmo, utilizando o espaço nominal desejado como prefixo.",
-'powersearch'               => 'Pesquisa avançada',
-'powersearch-legend'        => 'Pesquisa avançada',
-'powersearch-ns'            => 'Pesquisar nos espaços nominais:',
-'powersearch-redir'         => 'Listar redireccionamentos',
-'powersearch-field'         => 'Pesquisar',
-'search-external'           => 'Pesquisa externa',
-'searchdisabled'            => 'A pesquisa da {{SITENAME}} se encontra desabilitada.
+'searchresults'                    => 'Resultados de pesquisa',
+'searchresults-title'              => 'Resultados da pesquisa por "$1"',
+'searchresulttext'                 => 'Para mais informações de como pesquisar em {{SITENAME}}, consulte [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Você pesquisou por \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|páginas iniciadas por "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|páginas que apontam para "$1"]])',
+'searchsubtitleinvalid'            => 'Você pesquisou por "$1"',
+'noexactmatch'                     => "'''Não existe uma página com o título \"\$1\".''' Você pode [[:\$1|criar tal página]].",
+'noexactmatch-nocreate'            => "'''Não há uma página intitulada como \"\$1\".'''",
+'toomanymatches'                   => 'Foram retornados demasiados resultados. Por favor, tente um filtro de pesquisa diferente',
+'titlematches'                     => 'Resultados nos títulos das páginas',
+'notitlematches'                   => 'Nenhum título de página coincide com o termo pesquisado',
+'textmatches'                      => 'Resultados dos textos das páginas',
+'notextmatches'                    => 'Não foi possível localizar o termo pesquisado no conteúdo das páginas',
+'prevn'                            => 'anteriores $1',
+'nextn'                            => 'próximos $1',
+'viewprevnext'                     => 'Ver ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opções de pesquisa',
+'searchmenu-exists'                => "*Página '''[[$1]]'''",
+'searchmenu-new'                   => "'''Criar a página \"[[:\$1]]\" nesta wiki!'''",
+'searchhelp-url'                   => 'Help:Conteúdos',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Navegue por páginas com este prefixo]]',
+'searchprofile-articles'           => 'Páginas de conteúdo',
+'searchprofile-articles-and-proj'  => 'Páginas de conteúdo e de projecto',
+'searchprofile-project'            => 'Páginas de projecto',
+'searchprofile-images'             => 'Ficheiros',
+'searchprofile-everything'         => 'Tudo',
+'searchprofile-advanced'           => 'Avançado',
+'searchprofile-articles-tooltip'   => 'Pesquisar em $1',
+'searchprofile-project-tooltip'    => 'Pesquisar em $1',
+'searchprofile-images-tooltip'     => 'Pesquisar ficheiros',
+'searchprofile-everything-tooltip' => 'Pesquisar em todo o conteúdo (incluindo páginas de discussão)',
+'searchprofile-advanced-tooltip'   => 'Pesquisar nos espaços nominais personalizados',
+'prefs-search-nsdefault'           => 'Pesquisar usando as definições padrão:',
+'prefs-search-nscustom'            => 'Pesquisar domínios personalizados:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 palavra|$2 palavras}})',
+'search-result-score'              => 'Relevancia: $1%',
+'search-redirect'                  => '(redireccionamento para $1)',
+'search-section'                   => '(secção $1)',
+'search-suggest'                   => 'Será que quis dizer: $1',
+'search-interwiki-caption'         => 'Projetos irmãos',
+'search-interwiki-default'         => 'Resultados de $1:',
+'search-interwiki-more'            => '(mais)',
+'search-mwsuggest-enabled'         => 'com sugestões',
+'search-mwsuggest-disabled'        => 'sem sugestões',
+'search-relatedarticle'            => 'Relacionado',
+'mwsuggest-disable'                => 'Desactivar sugestões AJAX',
+'searchrelated'                    => 'relacionados',
+'searchall'                        => 'todos',
+'showingresults'                   => "A seguir {{PLURAL:$1|é mostrado '''um''' resultado|são mostrados até '''$1''' resultados}}, iniciando no '''$2'''º.",
+'showingresultsnum'                => "A seguir {{PLURAL:$3|é mostrado '''um''' resultado|são mostrados '''$3''' resultados}}, iniciando com o '''$2'''º.",
+'showingresultstotal'              => "Exibindo {{PLURAL:$4|o resultado '''$1''' de '''$3'''|os resultados '''$1 a $2''' de '''$3'''}}",
+'nonefound'                        => "'''Nota''': apenas alguns espaços nominais são pesquisados por defeito. Tente utilizar o prefixo ''all:'' em sua busca, para pesquisar por todos os conteúdos deste wiki (inclusive páginas de discussão, predefinições etc), ou mesmo, utilizando o espaço nominal desejado como prefixo.",
+'search-nonefound'                 => 'Não houve resultados para a pesquisa.',
+'powersearch'                      => 'Pesquisa avançada',
+'powersearch-legend'               => 'Pesquisa avançada',
+'powersearch-ns'                   => 'Pesquisar nos espaços nominais:',
+'powersearch-redir'                => 'Listar redireccionamentos',
+'powersearch-field'                => 'Pesquisar',
+'search-external'                  => 'Pesquisa externa',
+'searchdisabled'                   => 'A pesquisa da {{SITENAME}} se encontra desabilitada.
 Utilize nesse meio tempo mecanismos externos, tal como o do Google.
 Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desactualizados.',
 
 # Preferences page
-'preferences'              => 'Preferências',
-'mypreferences'            => 'Minhas preferências',
-'prefs-edits'              => 'Número de edições:',
-'prefsnologin'             => 'Não autenticado',
-'prefsnologintext'         => 'Precisa de estar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autenticado]</span> para definir as suas preferências.',
-'prefsreset'               => 'As preferências foram restauradas tal como se encontravam na base de dados.',
-'qbsettings'               => 'Barra Rápida',
-'qbsettings-none'          => 'Nenhuma',
-'qbsettings-fixedleft'     => 'Fixo à esquerda',
-'qbsettings-fixedright'    => 'Fixo à direita',
-'qbsettings-floatingleft'  => 'Flutuando à esquerda',
-'qbsettings-floatingright' => 'Flutuando à direita',
-'changepassword'           => 'Alterar palavra-chave',
-'skin'                     => 'Tema',
-'math'                     => 'Matemática',
-'dateformat'               => 'Formato da data',
-'datedefault'              => 'Sem preferência',
-'datetime'                 => 'Data e hora',
-'math_failure'             => 'Falhou ao verificar gramática',
-'math_unknown_error'       => 'Erro desconhecido',
-'math_unknown_function'    => 'Função desconhecida',
-'math_lexing_error'        => 'Erro léxico',
-'math_syntax_error'        => 'Erro de sintaxe',
-'math_image_error'         => 'Falha na conversão para PNG. Verifique a instalação do latex, dvips, gs e convert',
-'math_bad_tmpdir'          => 'Ocorreram problemas na criação ou escrita no directorio temporário math',
-'math_bad_output'          => 'Ocorreram problemas na criação ou escrita no directorio de resultados math',
-'math_notexvc'             => 'O executável texvc não foi encontrado. Consulte math/README para instruções da configuração.',
-'prefs-personal'           => 'Perfil de utilizador',
-'prefs-rc'                 => 'Mudanças recentes',
-'prefs-watchlist'          => 'Lista de páginas vigiadas',
-'prefs-watchlist-days'     => 'Dias a mostrar na lista de vigiados:',
-'prefs-watchlist-edits'    => 'Número de edições a mostrar na lista de vigiados expandida:',
-'prefs-misc'               => 'Diversos',
-'saveprefs'                => 'Salvar',
-'resetprefs'               => 'Eliminar as alterações não-salvas',
-'oldpassword'              => 'Palavra-chave antiga',
-'newpassword'              => 'Nova palavra-chave',
-'retypenew'                => 'Reintroduza a nova palavra-chave',
-'textboxsize'              => 'Opções de edição',
-'rows'                     => 'Linhas:',
-'columns'                  => 'Colunas:',
-'searchresultshead'        => 'Pesquisa',
-'resultsperpage'           => 'Resultados por página:',
-'contextlines'             => 'Linhas por resultado:',
-'contextchars'             => 'Contexto por linha:',
-'stub-threshold'           => 'Links para páginas de conteúdo aparecerão <a href="#" class="stub">desta forma</a> se elas possuírem menos de (bytes):',
-'recentchangesdays'        => 'Dias a serem exibidos nas Mudanças recentes:',
-'recentchangescount'       => 'Número de edições a serem exibidas nas Mudanças recentes, históricos e páginas de registos:',
-'savedprefs'               => 'As suas preferências foram salvas.',
-'timezonelegend'           => 'Fuso horário',
-'timezonetext'             => '¹Número de horas que o seu horário local difere do horário do servidor (UTC).',
-'localtime'                => 'Hora local',
-'timezoneoffset'           => 'Diferença horária¹',
-'servertime'               => 'Horário do servidor',
-'guesstimezone'            => 'Preencher a partir do navegador (browser)',
-'allowemail'               => 'Permitir email de outros utilizadores',
-'prefs-searchoptions'      => 'Opções de busca',
-'prefs-namespaces'         => 'Espaços nominais',
-'defaultns'                => 'Pesquisar por padrão nestes espaços nominais:',
-'default'                  => 'padrão',
-'files'                    => 'Ficheiros',
+'preferences'               => 'Preferências',
+'mypreferences'             => 'Minhas preferências',
+'prefs-edits'               => 'Número de edições:',
+'prefsnologin'              => 'Não autenticado',
+'prefsnologintext'          => 'Precisa de estar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autenticado]</span> para definir as suas preferências.',
+'prefsreset'                => 'As preferências foram restauradas tal como se encontravam na base de dados.',
+'qbsettings'                => 'Barra Rápida',
+'qbsettings-none'           => 'Nenhuma',
+'qbsettings-fixedleft'      => 'Fixo à esquerda',
+'qbsettings-fixedright'     => 'Fixo à direita',
+'qbsettings-floatingleft'   => 'Flutuando à esquerda',
+'qbsettings-floatingright'  => 'Flutuando à direita',
+'changepassword'            => 'Alterar palavra-chave',
+'skin'                      => 'Tema',
+'skin-preview'              => 'Pré-visualizar',
+'math'                      => 'Matemática',
+'dateformat'                => 'Formato da data',
+'datedefault'               => 'Sem preferência',
+'datetime'                  => 'Data e hora',
+'math_failure'              => 'Falhou ao verificar gramática',
+'math_unknown_error'        => 'Erro desconhecido',
+'math_unknown_function'     => 'Função desconhecida',
+'math_lexing_error'         => 'Erro léxico',
+'math_syntax_error'         => 'Erro de sintaxe',
+'math_image_error'          => 'Falha na conversão para PNG. Verifique a instalação do latex, dvips, gs e convert',
+'math_bad_tmpdir'           => 'Ocorreram problemas na criação ou escrita no directorio temporário math',
+'math_bad_output'           => 'Ocorreram problemas na criação ou escrita no directorio de resultados math',
+'math_notexvc'              => 'O executável texvc não foi encontrado. Consulte math/README para instruções da configuração.',
+'prefs-personal'            => 'Perfil de utilizador',
+'prefs-rc'                  => 'Mudanças recentes',
+'prefs-watchlist'           => 'Lista de páginas vigiadas',
+'prefs-watchlist-days'      => 'Dias a mostrar na lista de vigiados:',
+'prefs-watchlist-days-max'  => '(máximo: 7 dias)',
+'prefs-watchlist-edits'     => 'Número de edições a mostrar na lista de vigiados expandida:',
+'prefs-watchlist-edits-max' => '(máximo: 1000)',
+'prefs-misc'                => 'Diversos',
+'prefs-resetpass'           => 'Alterar palavra-chave',
+'saveprefs'                 => 'Salvar',
+'resetprefs'                => 'Eliminar as alterações não-salvas',
+'textboxsize'               => 'Opções de edição',
+'prefs-edit-boxsize'        => 'Tamanho da janela de edição.',
+'rows'                      => 'Linhas:',
+'columns'                   => 'Colunas:',
+'searchresultshead'         => 'Pesquisa',
+'resultsperpage'            => 'Resultados por página:',
+'contextlines'              => 'Linhas por resultado:',
+'contextchars'              => 'Contexto por linha:',
+'stub-threshold'            => 'Links para páginas de conteúdo aparecerão <a href="#" class="stub">desta forma</a> se elas possuírem menos de (bytes):',
+'recentchangesdays'         => 'Dias a serem exibidos nas Mudanças recentes:',
+'recentchangesdays-max'     => '(máximo: $1 {{PLURAL:$1|dia|dias}})',
+'recentchangescount'        => 'Número de edições a serem exibidas nas mudanças recentes, históricos de páginas e páginas de registos, por defeito:',
+'savedprefs'                => 'As suas preferências foram gravadas.',
+'timezonelegend'            => 'Fuso horário',
+'timezonetext'              => '¹Número de horas que o seu horário local difere do horário do servidor (UTC).',
+'localtime'                 => 'Horário local:',
+'timezoneselect'            => 'Fuso horário:',
+'timezoneuseserverdefault'  => 'Usar padrão do servidor',
+'timezoneuseoffset'         => 'Outro (especificar diferença)',
+'timezoneoffset'            => 'Diferença horária¹:',
+'servertime'                => 'Horário do servidor:',
+'guesstimezone'             => 'Preencher a partir do navegador (browser)',
+'allowemail'                => 'Permitir email de outros utilizadores',
+'prefs-searchoptions'       => 'Opções de busca',
+'prefs-namespaces'          => 'Espaços nominais',
+'defaultns'                 => 'Pesquisar por defeito nestes espaços nominais:',
+'default'                   => 'padrão',
+'files'                     => 'Ficheiros',
 
 # User rights
 'userrights'                  => 'Gestão de privilégios de utilizadores', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Gerir grupos de utilizadores',
-'userrights-user-editname'    => 'Intruduza um nome de utilizador:',
+'userrights-user-editname'    => 'Introduza um nome de utilizador:',
 'editusergroup'               => 'Editar Grupos de Utilizadores',
-'editinguser'                 => "Modificando privilégios do utilizador '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Modificando privilégios do utilizador '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Editar grupos do utilizador',
 'saveusergroups'              => 'Salvar Grupos do Utilizador',
 'userrights-groupsmember'     => 'Membro de:',
@@ -1089,6 +1199,8 @@ Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desac
 'right-minoredit'            => 'Marcar edições como menores',
 'right-move'                 => 'Mover páginas',
 'right-move-subpages'        => 'Mover páginas com as suas subpáginas',
+'right-move-rootuserpages'   => 'Mover páginas raiz de utilizadores',
+'right-movefile'             => 'Mover ficheiros',
 'right-suppressredirect'     => 'Não criar um redireccionamento do nome antigo quando uma página é movida',
 'right-upload'               => 'Carregar ficheiros',
 'right-reupload'             => 'Sobrescrever um ficheiro existente',
@@ -1139,9 +1251,46 @@ Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desac
 'rightslogentry' => 'alterou grupo de acesso de $1 (de $2 para $3)',
 'rightsnone'     => '(nenhum)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'ler esta página',
+'action-edit'                 => 'editar esta página',
+'action-createpage'           => 'criar páginas',
+'action-createtalk'           => 'criar páginas de discussão',
+'action-createaccount'        => 'criar esta conta de utilizador',
+'action-minoredit'            => 'marcar esta edição como uma edição menor',
+'action-move'                 => 'mover esta página',
+'action-move-subpages'        => 'mover esta página e suas subpáginas',
+'action-move-rootuserpages'   => 'mover páginas raiz de utilizadores',
+'action-movefile'             => 'mover este ficheiro',
+'action-upload'               => 'enviar este ficheiro',
+'action-reupload'             => 'sobrescrever o ficheiro existente',
+'action-reupload-shared'      => 'sobrescrever este ficheiro disponível em um repositório partilhado',
+'action-upload_by_url'        => 'enviar este ficheiro através de uma URL',
+'action-writeapi'             => 'utilizar o modo de escrita da API',
+'action-delete'               => 'eliminar esta página',
+'action-deleterevision'       => 'eliminar esta edição',
+'action-deletedhistory'       => 'ver o histórico de edições eliminadas desta página',
+'action-browsearchive'        => 'pesquisar páginas eliminadas',
+'action-undelete'             => 'restaurar esta página',
+'action-suppressrevision'     => 'rever e restaurar esta edição oculta',
+'action-suppressionlog'       => 'ver este registo privado',
+'action-block'                => 'impedir este utilizador de editar',
+'action-protect'              => 'alterar os níveis de proteção desta página',
+'action-import'               => 'importar esta página a partir de outra wiki',
+'action-importupload'         => 'importar esta página a partir de um ficheiro xml',
+'action-patrol'               => 'marcar as edições de outros utilizadores como patrulhadas',
+'action-autopatrol'           => 'ter suas edições marcadas como patrulhadas',
+'action-unwatchedpages'       => 'ver a lista de páginas não-vigiadas',
+'action-trackback'            => 'enviar um trackback',
+'action-mergehistory'         => 'fundir o histórico de edições desta página',
+'action-userrights'           => 'editar os privilégios de utilizadores',
+'action-userrights-interwiki' => 'editar privilégios de utilizadores de outras wikis',
+'action-siteadmin'            => 'bloquear ou desbloquear a base de dados',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|alteração|alterações}}',
 'recentchanges'                     => 'Mudanças recentes',
+'recentchanges-legend'              => 'Opções das mudanças recentes',
 'recentchangestext'                 => 'Veja as mais novas mudanças na {{SITENAME}} nesta página.',
 'recentchanges-feed-description'    => 'Acompanhe as Mudanças recentes deste wiki por este feed.',
 'rcnote'                            => "A seguir {{PLURAL:$1|está listada '''uma''' alteração ocorrida|estão listadas '''$1''' alterações ocorridas}} {{PLURAL:$2|no último dia|nos últimos '''$2''' dias}}, a partir das $5 de $4.",
@@ -1165,6 +1314,8 @@ Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desac
 'rc_categories'                     => 'Limite para categorias (separar com "|")',
 'rc_categories_any'                 => 'Qualquer',
 'newsectionsummary'                 => '/* $1 */ nova secção',
+'rc-enhanced-expand'                => 'Mostrar detalhes (requer JavaScript)',
+'rc-enhanced-hide'                  => 'Esconder detalhes',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Alterações relacionadas',
@@ -1186,11 +1337,11 @@ Páginas que estejam em [[Special:Watchlist|sua lista de vigiados]] são exibida
 'upload_directory_read_only'  => 'O directório de recebimento de ficheiros ($1) não tem permissões de escrita para o servidor Web.',
 'uploaderror'                 => 'Erro ao carregar',
 'uploadtext'                  => "Utilize o formulário abaixo para carregar novos ficheiros.
-Para ver ou pesquisar imagens anteriormente carregadas consulte a [[Special:ImageList|lista de ficheiros carregados]]. (re)Envios e eliminações são também registados no [[Special:Log|registo do projecto]]. Eliminações no [[Special:Log/delete|registo de eliminação]]
+Para ver ou pesquisar imagens anteriormente carregadas consulte a [[Special:FileList|lista de ficheiros carregados]]. (re)Envios e eliminações são também registados no [[Special:Log|registo do projecto]]. Eliminações no [[Special:Log/delete|registo de eliminação]]
 
 Para incluir a imagem numa página, utilize o link em um dos seguintes formatos:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:ficheiro.jpg]]</nowiki></tt>''' para utilizar a versão completa da imagem;
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:ficheiro.png|200px|thumb|left|texto]]</nowiki></tt>''' para utilizar uma renderização de 200 pixels dentro de um box posicionado à esquerda contendo 'texto' como descrição;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:ficheiro.jpg]]</nowiki></tt>''' para utilizar a versão completa da imagem;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:ficheiro.png|200px|thumb|left|texto]]</nowiki></tt>''' para utilizar uma renderização de 200 pixels dentro de um box posicionado à esquerda contendo 'texto' como descrição;
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:ficheiro.ogg]]</nowiki></tt>''' para uma ligação directa ao ficheiro.",
 'upload-permitted'            => 'Tipos de ficheiros permitidos: $1.',
 'upload-preferred'            => 'Tipos de ficheiros preferidos: $1.',
@@ -1198,7 +1349,7 @@ Para incluir a imagem numa página, utilize o link em um dos seguintes formatos:
 'uploadlog'                   => 'registo de carregamento',
 'uploadlogpage'               => 'Registo de carregamento',
 'uploadlogpagetext'           => 'Segue-se uma lista dos carregamentos mais recentes.
-Consulte a [[Special:NewImages|galeria de novos ficheiros]] para uma visualização mais amigável.',
+Consulte a [[Special:NewFiles|galeria de novos ficheiros]] para uma visualização mais amigável.',
 'filename'                    => 'Nome do ficheiro',
 'filedesc'                    => 'Descrição do ficheiro',
 'fileuploadsummary'           => 'Sumário:',
@@ -1220,22 +1371,24 @@ Consulte a [[Special:NewImages|galeria de novos ficheiros]] para uma visualizaç
 'large-file'                  => 'É recomendável que os ficheiros não sejam maiores que $1; este possui $2.',
 'largefileserver'             => 'O tamanho deste ficheiro é superior ao qual o servidor encontra-se configurado para permitir.',
 'emptyfile'                   => 'O ficheiro que está a tentar carregar parece encontrar-se vazio. Isto poderá ser devido a um erro na escrita do nome do ficheiro. Por favor verifique se realmente deseja carregar este ficheiro.',
-'fileexists'                  => 'Já existe um ficheiro com este nome. Por favor, verifique <strong><tt>$1</tt></strong> caso não tenha a certeza se deseja alterar o ficheiro actual.',
-'filepageexists'              => 'A página de descrição deste ficheiro já foi criada em <strong><tt>$1</tt></strong>, mas actualmente não existe nenhum ficheiro com este nome. O sumário que introduziu não aparecerá na página de descrição. Para o fazer aparecer, terá que o editar manualmente',
-'fileexists-extension'        => 'Já existe um ficheiro de nome similar:<br />
-Nome do ficheiro que está sendo enviado: <strong><tt>$1</tt></strong><br />
-Nome do ficheiro existente: <strong><tt>$2</tt></strong><br />
-Por gentileza, escolha um nome diferente.',
+'fileexists'                  => "Já existe um ficheiro com este nome. Por favor, verifique '''<tt>$1</tt>''' caso não tenha a certeza se deseja alterar o ficheiro actual.",
+'filepageexists'              => "A página de descrição deste ficheiro já foi criada em '''<tt>$1</tt>''', mas actualmente não existe nenhum ficheiro com este nome. O sumário que introduziu não aparecerá na página de descrição. Para o fazer aparecer, terá que o editar manualmente",
+'fileexists-extension'        => "Já existe um ficheiro de nome similar:<br />
+Nome do ficheiro que está sendo enviado: '''<tt>$1</tt>'''<br />
+Nome do ficheiro existente: '''<tt>$2</tt>'''<br />
+Por gentileza, escolha um nome diferente.",
 'fileexists-thumb'            => "<center>'''Ficheiro existente'''</center>",
-'fileexists-thumbnail-yes'    => 'O ficheiro aparenta ser uma imagem de tamanho reduzido (<i>miniatura</i>, ou <i>thumbnail)</i>. Por gentileza, verifique o ficheiro <strong><tt>$1</tt></strong>.<br />
-Se o ficheiro enviado é o mesmo do de tamanho original, não é necessário enviar uma versão de miniatura adicional.',
-'file-thumbnail-no'           => 'O nome do ficheiro começa com <strong><tt>$1</tt></strong>.
-Isso faz parecer se tratar de uma imagem de tamanho reduzido (<i>miniatura</i>, ou <i>thumbnail)</i>.
-Se você tem acesso à imagem de resolução completa, prefira envia-la no lugar desta. Caso não seja o caso, altere o nome de ficheiro.',
-'fileexists-forbidden'        => 'Já existe um ficheiro com este nome. Por favor, volte atrás e carregue este ficheiro sob um novo nome. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "O ficheiro aparenta ser uma imagem de tamanho reduzido (''miniatura'', ou ''thumbnail)''. Por gentileza, verifique o ficheiro '''<tt>$1</tt>'''.<br />
+Se o ficheiro enviado é o mesmo do de tamanho original, não é necessário enviar uma versão de miniatura adicional.",
+'file-thumbnail-no'           => "O nome do ficheiro começa com '''<tt>$1</tt>'''.
+Isso faz parecer se tratar de uma imagem de tamanho reduzido (''miniatura'', ou ''thumbnail)''.
+Se você tem acesso à imagem de resolução completa, prefira envia-la no lugar desta. Caso não seja o caso, altere o nome de ficheiro.",
+'fileexists-forbidden'        => 'Já existe um ficheiro com este nome, e não pode ser reescrito.
+Se ainda pretende carregar o seu ficheiro, por favor, volte atrás e use um novo nome. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Já existe um ficheiro com este nome no repositório de ficheiros partilhados. 
-Caso deseje mesmo assim enviar seu ficheiro, volte atrás e carregue-o sob um novo nome. [[Image:$1|thumb|center|$1]]',
+Caso deseje mesmo assim enviar seu ficheiro, volte atrás e carregue-o sob um novo nome. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Esta imagem é uma duplicata do seguinte {{PLURAL:$1|ficheiro|ficheiros}}:',
+'file-deleted-duplicate'      => 'Um ficheiro idêntico a este ([[$1]]) foi eliminado anteriormente. Verifique o motivo da eliminação de tal ficheiro antes de prosseguir com o re-envio.',
 'successfulupload'            => 'Envio efectuado com sucesso',
 'uploadwarning'               => 'Aviso de envio',
 'savefile'                    => 'Salvar ficheiro',
@@ -1255,7 +1408,7 @@ Caso deseje mesmo assim enviar seu ficheiro, volte atrás e carregue-o sob um no
 
 Verfique se é apropriado prosseguir enviando este ficheiro.
 O registo de eliminação é exibido a seguir, para sua comodidade:",
-'filename-bad-prefix'         => 'O nome do ficheiro que você está enviando começa com <strong>"$1"</strong>, um nome pouco esclarecedor, comumente associado de forma automática por câmeras digitais. Por gentileza, escolha um nome de ficheiro mais explicativo.',
+'filename-bad-prefix'         => "O nome do ficheiro que você está enviando começa com '''\"\$1\"''', um nome pouco esclarecedor, comumente associado de forma automática por câmeras digitais. Por gentileza, escolha um nome de ficheiro mais explicativo.",
 'filename-prefix-blacklist'   => ' #<!-- deixe esta linha exactamente como está --> <pre>
 # A sintaxe é a seguinte:
 #   * Tudo a partir do caractere "#" até ao fim da linha é um comentário
@@ -1293,20 +1446,21 @@ Caso o problema persista, contacte um [[Special:ListUsers/sysop|administrador]].
 'upload_source_url'  => ' (um URL válido, publicamente acessível)',
 'upload_source_file' => ' (um ficheiro no seu computador)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Esta página especial mostra todos os ficheiros carregados.
+# Special:ListFiles
+'listfiles-summary'     => 'Esta página especial mostra todos os ficheiros carregados.
 Por defeito, os últimos ficheiros carregados são mostrados no topo da lista.
 Um clique sobre um cabeçalho de coluna altera a ordenação.',
-'imagelist_search_for'  => 'Pesquisar por nome de imagem:',
+'listfiles_search_for'  => 'Pesquisar por nome de imagem:',
 'imgfile'               => 'ficheiro',
-'imagelist'             => 'Lista de ficheiros',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Utilizador',
-'imagelist_size'        => 'Tamanho',
-'imagelist_description' => 'Descrição',
-
-# Image description page
+'listfiles'             => 'Lista de ficheiros',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Utilizador',
+'listfiles_size'        => 'Tamanho',
+'listfiles_description' => 'Descrição',
+'listfiles_count'       => 'Versões',
+
+# File description page
 'filehist'                       => 'Histórico do ficheiro',
 'filehist-help'                  => 'Clique em uma data/horário para ver o ficheiro tal como ele se encontrava em tal momento.',
 'filehist-deleteall'             => 'eliminar todas',
@@ -1314,19 +1468,25 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 'filehist-revert'                => 'reverter',
 'filehist-current'               => 'actual',
 'filehist-datetime'              => 'Data/Horário',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura da versão das $1',
+'filehist-nothumb'               => 'Miniatura indisponível',
 'filehist-user'                  => 'Utilizador',
 'filehist-dimensions'            => 'Dimensões',
 'filehist-filesize'              => 'Tamanho do ficheiro',
 'filehist-comment'               => 'Comentário',
-'imagelinks'                     => 'Ligações',
+'imagelinks'                     => 'Ligações de ficheiros',
 'linkstoimage'                   => '{{PLURAL:$1|A seguinte página aponta|As seguintes $1 páginas apontam}} para este ficheiro:',
+'linkstoimage-more'              => 'Mais de $1 {{PLURAL:$1|página liga|páginas ligam}} à este ficheiro.
+A lista a seguir mostra apenas {{PLURAL:$1|o primeiro link de página|os primeiros $1 links de páginas}} para este ficheiro.
+Uma [[Special:WhatLinksHere/$2|listagem completa]] se encontra disponível.',
 'nolinkstoimage'                 => 'Nenhuma página aponta para este ficheiro.',
 'morelinkstoimage'               => 'Ver [[Special:WhatLinksHere/$1|mais ligações]] para este ficheiro.',
 'redirectstofile'                => '{{PLURAL:$1|O seguinte ficheiro redirecciona|Os seguintes ficheiros redireccionam}} para este ficheiro:',
-'duplicatesoffile'               => '{{PLURAL:$1|O seguinte ficheiro é duplicado|Os seguintes ficheiros são duplicados}} deste ficheiro:',
+'duplicatesoffile'               => '{{PLURAL:$1|O seguinte ficheiro é duplicado|Os seguintes $1 ficheiros são duplicados}} deste ficheiro ([[Special:FileDuplicateSearch/$2|mais detalhes]]):',
 'sharedupload'                   => 'Este ficheiro encontra-se partilhado e pode ser utilizado por outros projectos.',
 'shareduploadwiki'               => 'Por favor, consulte a $1 para mais informações.',
-'shareduploadwiki-desc'          => 'A descrição na sua $1 do repositório partilhado é mostrada abaixo.',
+'shareduploadwiki-desc'          => 'A descrição lá na sua $1 é mostrada abaixo.',
 'shareduploadwiki-linktext'      => 'página de descrição de ficheiro',
 'shareduploadduplicate'          => 'Este ficheiro é um duplicado de $1 do repositório partilhado.',
 'shareduploadduplicate-linktext' => 'outro ficheiro',
@@ -1350,7 +1510,7 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 # File deletion
 'filedelete'                  => 'Eliminar $1',
 'filedelete-legend'           => 'Eliminar ficheiro',
-'filedelete-intro'            => "Você está prestes a eliminar '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Você está prestes a eliminar o ficheiro '''[[Media:$1|$1]]''' junto com todo o seu histórico.",
 'filedelete-intro-old'        => "Você se encontra prestes a eliminar a versão de '''[[Media:$1|$1]]''' tal como se encontrava em [$4 $3, $2].",
 'filedelete-comment'          => 'Motivo de eliminação:',
 'filedelete-submit'           => 'Eliminar',
@@ -1358,7 +1518,6 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 'filedelete-success-old'      => "A versão de '''[[Media:$1|$1]]''' tal como $3, $2 foi eliminada.",
 'filedelete-nofile'           => "'''$1''' não existe.",
 'filedelete-nofile-old'       => "Não há uma versão de '''$1''' em arquivo com os parâmetros especificados.",
-'filedelete-iscurrent'        => 'Você está tentando eliminar a versão mais recente deste ficheiro. Por gentileza, reverta para uma edição anterior antes de tentar novamente.',
 'filedelete-otherreason'      => 'Outro/motivo adicional:',
 'filedelete-reason-otherlist' => 'Outro motivo',
 'filedelete-reason-dropdown'  => '*Motivos comuns para eliminação
@@ -1385,27 +1544,31 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 
 # Random page
 'randompage'         => 'Página aleatória',
-'randompage-nopages' => 'Não há páginas neste espaço nominal.',
+'randompage-nopages' => 'Não há páginas no espaço nominal "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redireccionamento aleatório',
-'randomredirect-nopages' => 'Não há redireccionamentos neste espaço nominal.',
+'randomredirect-nopages' => 'Não há redireccionamentos no espaço nominal "$1".',
 
 # Statistics
-'statistics'             => 'Estatísticas',
-'sitestats'              => 'Estatísticas do site',
-'userstats'              => 'Estatísticas dos utilizadores',
-'sitestatstext'          => "Há actualmente um total de {{PLURAL:\$1|'''\$1''' página|'''\$1''' páginas}} na base de dados.
-Isto inclui páginas de \"discussão\", páginas sobre o projecto ({{SITENAME}}), páginas de rascunho, redireccionamentos e outras que provavelmente não são qualificadas como páginas de conteúdo.
-Excluindo estas, há {{PLURAL:\$2|'''\$2''' página que provavelmente é uma página de conteúdo legítima|'''\$2''' páginas que provavelmente são páginas de conteúdo legítimas}}.
-
-'''\$8''' {{PLURAL:\$8|ficheiro foi carregado|ficheiros foram carregados}}.
-
-Há um total de '''\$3''' {{PLURAL:\$3|página vista|páginas vistas}} e '''\$4''' {{PLURAL:\$4|edição|edições}} em páginas desde que este wiki foi instalado, o que resulta em aproximadamente '''\$5''' edições por página e '''\$6''' vistas por edição.
-
-O tamanho actual da [http://www.mediawiki.org/wiki/Manual:Job_queue fila de tarefas] é '''\$7'''.",
-'userstatstext'          => "Há actualmente {{PLURAL:$1|'''$1''' utilizador registado|'''$1''' utilizadores registados}}, dentre os quais '''$2''' (ou '''$4%''') {{PLURAL:$2|é|são}} $5.",
-'statistics-mostpopular' => 'Páginas mais vistas',
+'statistics'                   => 'Estatísticas',
+'statistics-header-pages'      => 'Estatísticas de páginas',
+'statistics-header-edits'      => 'Estatísticas de edições',
+'statistics-header-views'      => 'Ver estatísticas',
+'statistics-header-users'      => 'Estatísticas de utilizadores',
+'statistics-articles'          => 'Páginas de conteúdo',
+'statistics-pages'             => 'Páginas',
+'statistics-pages-desc'        => 'Todas as páginas do wiki, incluindo páginas de discussão, redireccionamentos etc',
+'statistics-files'             => 'Ficheiros carregados',
+'statistics-edits'             => 'Edições de página desde que {{SITENAME}} foi instalado',
+'statistics-edits-average'     => 'Média de edições por página',
+'statistics-views-total'       => 'Total de visualizações',
+'statistics-views-peredit'     => 'Visualizações por edição',
+'statistics-jobqueue'          => 'Tamanho da [http://www.mediawiki.org/wiki/Manual:Job_queue fila de tarefas]',
+'statistics-users'             => '[[Special:ListUsers|Utilizadores]] registados',
+'statistics-users-active'      => 'Utilizadores activos',
+'statistics-users-active-desc' => 'Utilizadores que efectuaram uma acção {{PLURAL:$1|ontem|nos últimos $1 dias}}',
+'statistics-mostpopular'       => 'Páginas mais vistas',
 
 'disambiguations'      => 'Página de desambiguações',
 'disambiguationspage'  => 'Template:disambig',
@@ -1418,7 +1581,7 @@ Uma página é considerada como de desambiguação se utilizar uma predefiniçã
 'double-redirect-fixer'      => 'Corretor de redirecionamentos',
 
 'brokenredirects'        => 'Redireccionamentos quebrados',
-'brokenredirectstext'    => 'Os seguintes redireccionamentos ligam para páginas inexistentes.',
+'brokenredirectstext'    => 'Os seguintes redireccionamentos ligam para páginas inexistentes:',
 'brokenredirects-edit'   => '(editar)',
 'brokenredirects-delete' => '(eliminar)',
 
@@ -1438,7 +1601,7 @@ Uma página é considerada como de desambiguação se utilizar uma predefiniçã
 'nviews'                  => '$1 {{PLURAL:$1|visita|visitas}}',
 'specialpage-empty'       => 'Actualmente não há dados a serem exibidos nesta página.',
 'lonelypages'             => 'Páginas órfãs',
-'lonelypagestext'         => 'As seguintes páginas ou não têm hiperligações a apontar para elas ou não são transclusionadas a partir de outras páginas nesta wiki.',
+'lonelypagestext'         => 'As seguintes páginas ou não têm hiperligações a apontar para elas ou não são transcluídas a partir de outras páginas nesta wiki.',
 'uncategorizedpages'      => 'Páginas não categorizadas',
 'uncategorizedcategories' => 'Categorias não categorizadas',
 'uncategorizedimages'     => 'Imagens não categorizadas',
@@ -1448,26 +1611,30 @@ Uma página é considerada como de desambiguação se utilizar uma predefiniçã
 'popularpages'            => 'Páginas populares',
 'wantedcategories'        => 'Categorias pedidas',
 'wantedpages'             => 'Páginas pedidas',
-'missingfiles'            => 'Ficheiros em falta',
+'wantedfiles'             => 'Ficheiros desejados',
+'wantedtemplates'         => 'Predefinições pedidas',
 'mostlinked'              => 'Páginas com mais afluentes',
 'mostlinkedcategories'    => 'Categorias com mais membros',
 'mostlinkedtemplates'     => 'Predefinições com mais afluentes',
 'mostcategories'          => 'Páginas de conteúdo com mais categorias',
 'mostimages'              => 'Imagens com mais afluentes',
 'mostrevisions'           => 'Páginas de conteúdo com mais edições',
-'prefixindex'             => '�ndice de prefixo',
+'prefixindex'             => 'Todas as páginas com prefixo',
 'shortpages'              => 'Páginas curtas',
 'longpages'               => 'Páginas longas',
 'deadendpages'            => 'Páginas sem saída',
 'deadendpagestext'        => 'As seguintes páginas não contêm hiperligações para outras páginas nesta wiki.',
 'protectedpages'          => 'Páginas protegidas',
 'protectedpages-indef'    => 'Apenas protecções infinitas',
+'protectedpages-cascade'  => 'Apenas protecções progressivas',
 'protectedpagestext'      => 'As seguintes páginas encontram-se protegidas contra edições ou movimentações',
 'protectedpagesempty'     => 'Não existem páginas, neste momento, protegidas com tais parâmetros.',
 'protectedtitles'         => 'Títulos protegidos',
 'protectedtitlestext'     => 'Os títulos a seguir encontram-se protegidos contra criação',
 'protectedtitlesempty'    => 'Não há títulos protegidos com os parâmetros fornecidos.',
 'listusers'               => 'Lista de utilizadores',
+'listusers-editsonly'     => 'Mostrar apenas utilizadores com edições',
+'usereditcount'           => '$1 {{PLURAL:$1|edição|edições}}',
 'newpages'                => 'Páginas novas',
 'newpages-username'       => 'Nome de utilizador:',
 'ancientpages'            => 'Páginas mais antigas',
@@ -1488,14 +1655,13 @@ Uma página é considerada como de desambiguação se utilizar uma predefiniçã
 'booksources-search-legend' => 'Procurar por fontes livreiras',
 'booksources-go'            => 'Ir',
 'booksources-text'          => 'É exibida a seguir uma listagem de links para outros sítios que vendem livros novos e usados e que possam possuir informações adicionais sobre os livros que você está pesquisando:',
+'booksources-invalid-isbn'  => 'O número ISBN fornecido não parece ser válido; verifique a existência de erros ao copiar da fonte original.',
 
 # Special:Log
 'specialloguserlabel'  => 'Utilizador:',
 'speciallogtitlelabel' => 'Título:',
 'log'                  => 'Registos',
 'all-logs-page'        => 'Todos os registos',
-'log-search-legend'    => 'Pesquisar nos registos',
-'log-search-submit'    => 'Ir',
 'alllogstext'          => 'Exposição combinada de todos registos disponíveis no wiki {{SITENAME}}.
 Você pode diminuir a lista escolhendo um tipo de registo, um nome de utilizador (sensível a minúsculas), ou uma página afectada (também sensível a minúsculas).',
 'logempty'             => 'Nenhum item idêntico no registo.',
@@ -1507,6 +1673,7 @@ Você pode diminuir a lista escolhendo um tipo de registo, um nome de utilizador
 'nextpage'          => 'Próxima página ($1)',
 'prevpage'          => 'Página anterior ($1)',
 'allpagesfrom'      => 'Começar exibindo páginas com:',
+'allpagesto'        => 'Terminar de exibir páginas em:',
 'allarticles'       => 'Todas as páginas',
 'allinnamespace'    => 'Todas as páginas (espaço nominal $1)',
 'allnotinnamespace' => 'Todas as páginas (excepto as do espaço nominal $1)',
@@ -1527,45 +1694,72 @@ Veja também as [[Special:WantedCategories|categorias em falta]].',
 'special-categories-sort-count' => 'ordenar por contagem',
 'special-categories-sort-abc'   => 'ordenar alfabeticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Edições eliminadas',
+
+# Special:LinkSearch
+'linksearch'       => 'Ligações externas',
+'linksearch-pat'   => 'Padrão de procura:',
+'linksearch-ns'    => 'Espaço nominal:',
+'linksearch-ok'    => 'Pesquisar',
+'linksearch-text'  => 'É possível utilizar "caracteres mágicos" como em "*.wikipedia.org".<br />Protocolos suportados: <tt>$1</tt>',
+'linksearch-line'  => '$1 está lincado em $2',
+'linksearch-error' => '"Caracteres mágicos" (wildcards) podem ser utilizados apenas no início do endereço.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostrar utilizadores começando em:',
 'listusers-submit'   => 'Exibir',
 'listusers-noresult' => 'Não foram encontrados utilizadores para a forma pesquisada.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Registo de criação de utilizadores',
+'newuserlogpagetext'          => 'Este é um registo de novas contas de utilizador',
+'newuserlog-byemail'          => 'palavra-chave enviada por correio-electrónico',
+'newuserlog-create-entry'     => 'Novo utilizador',
+'newuserlog-create2-entry'    => 'criou nova conta $1',
+'newuserlog-autocreate-entry' => 'Conta criada automaticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Privilégios de grupo de utilizadores',
-'listgrouprights-summary'  => 'A seguinte lista contém os grupos de utilizadores definidos neste wiki, com os seus privilégios de acessos associados.
+'listgrouprights'                 => 'Privilégios de grupo de utilizadores',
+'listgrouprights-summary'         => 'A seguinte lista contém os grupos de utilizadores definidos neste wiki, com os seus privilégios de acessos associados.
 Se encontram disponíveis [[{{MediaWiki:Listgrouprights-helppage}}|informações adicionais]] sobre privilégios individuais.',
-'listgrouprights-group'    => 'Grupo',
-'listgrouprights-rights'   => 'Privilégios',
-'listgrouprights-helppage' => 'Help:Privilégios de grupo',
-'listgrouprights-members'  => '(lista de membros)',
+'listgrouprights-group'           => 'Grupo',
+'listgrouprights-rights'          => 'Privilégios',
+'listgrouprights-helppage'        => 'Help:Privilégios de grupo',
+'listgrouprights-members'         => '(lista de membros)',
+'listgrouprights-addgroup'        => 'Podem conceder acesso {{PLURAL:$2|ao grupo|aos grupos}}: $1',
+'listgrouprights-removegroup'     => 'Podem remover acesso {{PLURAL:$2|do grupo|dos grupos}}: $1',
+'listgrouprights-addgroup-all'    => 'Podem conceder acesso a todos os grupos',
+'listgrouprights-removegroup-all' => 'Podem remover acesso a todos os grupos',
 
 # E-mail user
-'mailnologin'     => 'Nenhum endereço de envio',
-'mailnologintext' => 'Necessita de estar [[Special:UserLogin|autenticado]] e de possuir um endereço de e-mail válido nas suas [[Special:Preferences|preferências]] para poder enviar um e-mail a outros utilizadores.',
-'emailuser'       => 'Contactar este utilizador',
-'emailpage'       => 'Contactar utilizador',
-'emailpagetext'   => 'Utilize o formulário abaixo para enviar uma mensagem a este utilizador.
+'mailnologin'      => 'Nenhum endereço de envio',
+'mailnologintext'  => 'Necessita de estar [[Special:UserLogin|autenticado]] e de possuir um endereço de e-mail válido nas suas [[Special:Preferences|preferências]] para poder enviar um e-mail a outros utilizadores.',
+'emailuser'        => 'Contactar este utilizador',
+'emailpage'        => 'Contactar utilizador',
+'emailpagetext'    => 'Utilize o formulário abaixo para enviar uma mensagem a este utilizador.
 O endereço que você introduziu nas [[Special:Preferences|suas preferências]] irá aparecer no campo "Remetente" do e-mail, para que o destinatário lhe possa responder directamente.',
-'usermailererror' => 'Objecto de correio retornou um erro:',
-'defemailsubject' => 'E-mail: {{SITENAME}}',
-'noemailtitle'    => 'Sem endereço de e-mail',
-'noemailtext'     => 'Este utilizador não especificou um endereço de e-mail válido, ou optou por não receber e-mail de outros utilizadores.',
-'emailfrom'       => 'De:',
-'emailto'         => 'Para:',
-'emailsubject'    => 'Assunto:',
-'emailmessage'    => 'Mensagem:',
-'emailsend'       => 'Enviar',
-'emailccme'       => 'Enviar ao meu e-mail uma cópia de minha mensagem.',
-'emailccsubject'  => 'Cópia de sua mensagem para $1: $2',
-'emailsent'       => 'E-mail enviado',
-'emailsenttext'   => 'A sua mensagem foi enviada.',
-'emailuserfooter' => 'Este e-mail foi enviado por $1 para $2 através da opção de "contactar utilizador" da {{SITENAME}}.',
+'usermailererror'  => 'Objecto de correio retornou um erro:',
+'defemailsubject'  => 'E-mail: {{SITENAME}}',
+'noemailtitle'     => 'Sem endereço de e-mail',
+'noemailtext'      => 'Este utilizador não especificou um endereço de e-mail válido.',
+'nowikiemailtitle' => 'E-mail não permitido',
+'nowikiemailtext'  => 'Este utilizador optou por não receber e-mail de outros utilizadores.',
+'email-legend'     => 'Enviar e-mail para outro utilizador da {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'Para:',
+'emailsubject'     => 'Assunto:',
+'emailmessage'     => 'Mensagem:',
+'emailsend'        => 'Enviar',
+'emailccme'        => 'Enviar ao meu e-mail uma cópia de minha mensagem.',
+'emailccsubject'   => 'Cópia de sua mensagem para $1: $2',
+'emailsent'        => 'E-mail enviado',
+'emailsenttext'    => 'A sua mensagem foi enviada.',
+'emailuserfooter'  => 'Este e-mail foi enviado por $1 para $2 através da opção de "contactar utilizador" da {{SITENAME}}.',
 
 # Watchlist
-'watchlist'            => 'Artigos vigiados',
-'mywatchlist'          => 'Artigos vigiados',
+'watchlist'            => 'Páginas vigiadas',
+'mywatchlist'          => 'Páginas vigiadas',
 'watchlistfor'         => "(para '''$1''')",
 'nowatchlist'          => 'A sua lista de vigiados não possui títulos.',
 'watchlistanontext'    => 'Por favor, $1 para ver ou editar os itens na sua lista de vigiados.',
@@ -1592,12 +1786,7 @@ Modificações futuras em tal página e páginas de discussão a ela associadas
 'iteminvalidname'      => "Problema com item '$1', nome inválido...",
 'wlnote'               => "A seguir {{PLURAL:$1|está a última alteração ocorrida|estão as últimas '''$1''' alterações ocorridas}} {{PLURAL:$2|na última hora|nas últimas '''$2''' horas}}.",
 'wlshowlast'           => 'Ver últimas $1 horas $2 dias $3',
-'watchlist-show-bots'  => 'Mostrar edições de robôs',
-'watchlist-hide-bots'  => 'Ocultar edições de robôs',
-'watchlist-show-own'   => 'Exibir minhas edições',
-'watchlist-hide-own'   => 'Ocultar minhas edições',
-'watchlist-show-minor' => 'Exibir edições menores',
-'watchlist-hide-minor' => 'Ocultar edições menores',
+'watchlist-options'    => 'Opções da lista de vigiados',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vigiando...',
@@ -1637,83 +1826,102 @@ Para alterar as suas preferências da lista de vigiados, visite
 Contacto e assistência:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Eliminar página',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "o conteúdo era: '$1'",
-'excontentauthor'             => "o conteúdo era: '$1' (e o único editor era '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "o conteúdo antes de esvaziar era: '$1'",
-'exblank'                     => 'página esvaziada',
-'delete-confirm'              => 'Eliminar "$1"',
-'delete-legend'               => 'Eliminar',
-'historywarning'              => 'Aviso: A página que está prestes a eliminar possui um histórico:',
-'confirmdeletetext'           => 'Encontra-se prestes a eliminar permanentemente uma página ou uma imagem e todo o seu histórico.
+# Delete
+'deletepage'             => 'Eliminar página',
+'confirm'                => 'Confirmar',
+'excontent'              => "o conteúdo era: '$1'",
+'excontentauthor'        => "o conteúdo era: '$1' (e o único editor era '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "o conteúdo antes de esvaziar era: '$1'",
+'exblank'                => 'página esvaziada',
+'delete-confirm'         => 'Eliminar "$1"',
+'delete-legend'          => 'Eliminar',
+'historywarning'         => 'Aviso: A página que está prestes a eliminar possui um histórico:',
+'confirmdeletetext'      => 'Encontra-se prestes a eliminar permanentemente uma página ou uma imagem e todo o seu histórico.
 Por favor, confirme que possui a intenção de fazer isto, que compreende as consequências e que encontra-se a fazer isto de acordo com as [[{{MediaWiki:Policy-url}}|políticas]] do projecto.',
-'actioncomplete'              => 'Acção completada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" foi eliminada.
+'actioncomplete'         => 'Acção completada',
+'deletedtext'            => '"<nowiki>$1</nowiki>" foi eliminada.
 Consulte $2 para um registo de eliminações recentes.',
-'deletedarticle'              => 'eliminou "[[$1]]"',
-'suppressedarticle'           => 'suprimiu "[[$1]]"',
-'dellogpage'                  => 'Registo de eliminação',
-'dellogpagetext'              => 'Abaixo uma lista das eliminações mais recentes.',
-'deletionlog'                 => 'registo de eliminação',
-'reverted'                    => 'Revertido para versão mais nova',
-'deletecomment'               => 'Motivo de eliminação',
-'deleteotherreason'           => 'Justificativa adicional:',
-'deletereasonotherlist'       => 'Outro motivo',
-'deletereason-dropdown'       => '* Motivos de eliminação comuns
+'deletedarticle'         => 'eliminou "[[$1]]"',
+'suppressedarticle'      => 'suprimiu "[[$1]]"',
+'dellogpage'             => 'Registo de eliminação',
+'dellogpagetext'         => 'Abaixo uma lista das eliminações mais recentes.',
+'deletionlog'            => 'registo de eliminação',
+'reverted'               => 'Revertido para versão mais nova',
+'deletecomment'          => 'Motivo de eliminação',
+'deleteotherreason'      => 'Justificativa adicional:',
+'deletereasonotherlist'  => 'Outro motivo',
+'deletereason-dropdown'  => '* Motivos de eliminação comuns
 ** Pedido do autor
 ** Violação de direitos de autor
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Editar motivos de eiliminação',
-'delete-toobig'               => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
+'delete-edit-reasonlist' => 'Editar motivos de eiliminação',
+'delete-toobig'          => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
 A eliminação de tais páginas foi restrita, a fim de se evitarem problemas acidentais em {{SITENAME}}.',
-'delete-warning-toobig'       => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
+'delete-warning-toobig'  => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
 Eliminá-la poderá causar problemas na base de dados de {{SITENAME}};
 prossiga com cuidado.',
-'rollback'                    => 'Reverter edições',
-'rollback_short'              => 'Voltar',
-'rollbacklink'                => 'voltar',
-'rollbackfailed'              => 'A reversão falhou',
-'cantrollback'                => 'Não foi possível reverter a edição; o último contribuidor é o único autor desta página',
-'alreadyrolled'               => 'Não foi possível reverter as edições de [[:$1]] por [[User:$2|$2]] ([[User talk:$2|discussão]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+
+# Rollback
+'rollback'         => 'Reverter edições',
+'rollback_short'   => 'Voltar',
+'rollbacklink'     => 'voltar',
+'rollbackfailed'   => 'A reversão falhou',
+'cantrollback'     => 'Não foi possível reverter a edição; o último contribuidor é o único autor desta página',
+'alreadyrolled'    => 'Não foi possível reverter as edições de [[:$1]] por [[User:$2|$2]] ([[User talk:$2|discussão]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 alguém editou ou já reverteu a página.
 
-A última edição foi de [[User:$3|$3]] ([[User talk:$3|discussão]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'O sumário de edição era: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Foram revertidas as edições de [[Special:Contributions/$2|$2]] ([[User talk:$2|disc]]) para a última versão por [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Foram revertidas as edições de $1, com o conteúdo passando a estar como na última edição de $2.',
-'sessionfailure'              => 'Foram detectados problemas com a sua sessão;
+A última edição foi de [[User:$3|$3]] ([[User talk:$3|discussão]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "O sumário de edição era: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Foram revertidas as edições de [[Special:Contributions/$2|$2]] ([[User talk:$2|disc]]) para a última versão por [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Foram revertidas as edições de $1, com o conteúdo passando a estar como na última edição de $2.',
+'sessionfailure'   => 'Foram detectados problemas com a sua sessão;
 Esta acção foi cancelada como medida de protecção contra a intercepção de sessões.
-Experimente usar o botão "Voltar" e refrescar a página de onde veio e tente novamente.',
+Experimente usar o botão "Voltar" e recarregar a página de onde veio e tente novamente.',
+
+# Protect
 'protectlogpage'              => 'Registo de protecção',
 'protectlogtext'              => 'Abaixo encontra-se o registo de protecção e desprotecção de páginas.
 Veja a [[Special:ProtectedPages|lista de páginas protegidas]] para uma listagem das páginas que se encontram protegidas no momento.',
 'protectedarticle'            => 'protegeu "[[$1]]"',
 'modifiedarticleprotection'   => 'alterou o nível de protecção para "[[$1]]"',
 'unprotectedarticle'          => 'desprotegeu "[[$1]]"',
+'movedarticleprotection'      => 'moveu as configurações de proteção de "[[$2]]" para "[[$1]]"',
 'protect-title'               => 'Protegendo "$1"',
+'prot_1movedto2'              => 'moveu [[$1]] para [[$2]]',
 'protect-legend'              => 'Confirmar protecção',
 'protectcomment'              => 'Motivo de protecção',
 'protectexpiry'               => 'Expiração',
 'protect_expiry_invalid'      => 'O tempo de expiração fornecido é inválido.',
 'protect_expiry_old'          => 'O tempo de expiração fornecido se situa no passado.',
 'protect-unchain'             => 'Desbloquear permissões de moção',
-'protect-text'                => 'Você pode, nesta página, alterar o nível de proteção para <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Você não poderá alterar os níveis de proteção enquanto estiver bloqueado. Esta é a configuração atual para a página <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Não é possível alterar os níveis de proteção, uma vez que a base de dados se encontra trancada.
-Esta é a configuração atual para a página <strong>$1</strong>:',
-'protect-locked-access'       => 'Sua conta não possui permissões para alterar os níveis de proteção de uma página.
-Esta é a configuração atual para a página <strong>$1</strong>:',
+'protect-text'                => "Você pode, nesta página, alterar o nível de proteção para '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Você não poderá alterar os níveis de proteção enquanto estiver bloqueado. Esta é a configuração atual para a página '''$1''':",
+'protect-locked-dblock'       => "Não é possível alterar os níveis de proteção, uma vez que a base de dados se encontra trancada.
+Esta é a configuração atual para a página '''$1''':",
+'protect-locked-access'       => "Sua conta não possui permissões para alterar os níveis de proteção de uma página.
+Esta é a configuração atual para a página '''$1''':",
 'protect-cascadeon'           => 'Esta página encontra-se protegida, uma vez que se encontra incluída {{PLURAL:$1|na página listada a seguir, protegida|nas páginas listadas a seguir, protegidas}} com a "protecção progressiva" activada. Você poderá alterar o nível de protecção desta página, mas isso não afectará a "protecção progressiva".',
-'protect-default'             => '(padrão)',
+'protect-default'             => 'Permitir todos os utilizadores',
 'protect-fallback'            => 'É necessário o privilégio de "$1"',
-'protect-level-autoconfirmed' => 'Bloquear utilizadores não-registados',
+'protect-level-autoconfirmed' => 'Bloquear utilizadores novos e não registados',
 'protect-level-sysop'         => 'Apenas administradores',
 'protect-summary-cascade'     => 'p. progressiva',
 'protect-expiring'            => 'expira em $1 (UTC)',
+'protect-expiry-indefinite'   => 'infinito',
 'protect-cascade'             => 'Proteja quaisquer páginas que estejam incluídas nesta (proteção progressiva)',
 'protect-cantedit'            => 'Você não pode alterar o nível de proteção desta página uma vez que você não se encontra habilitado a editá-la.',
+'protect-othertime'           => 'Outra duração:',
+'protect-othertime-op'        => 'outra duração',
+'protect-existing-expiry'     => 'A proteção atual expirará às $3 de $2',
+'protect-otherreason'         => 'Outro motivo/motivo adicional:',
+'protect-otherreason-op'      => 'outro/motivo adicional',
+'protect-dropdown'            => '*Motivos comuns para proteção
+** Vandalismo excessivo
+** Inserção excessiva de spams
+** Guerra de edições improdutiva
+** Página bastante acessada',
+'protect-edit-reasonlist'     => 'Editar motivos de proteções',
+'protect-expiry-options'      => '1 hora:1 hour,1 dia:1 day,1 semana:1 week,2 semanas:2 weeks,1 mês:1 month,3 meses:3 months,6 meses:6 months,1 ano:1 year,indefinido:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permissão:',
 'restriction-level'           => 'Nível de restrição:',
 'minimum-size'                => 'Tam. mínimo',
@@ -1736,7 +1944,7 @@ Esta é a configuração atual para a página <strong>$1</strong>:',
 'undeletepage'                 => 'Ver e restaurar páginas eliminadas',
 'undeletepagetitle'            => "'''Seguem-se as edições eliminadas de [[:$1]]'''.",
 'viewdeletedpage'              => 'Ver páginas eliminadas',
-'undeletepagetext'             => 'As seguintes páginas foram eliminadas, apesar de ainda permanecem na base de dados e poderem ser restauradas. O arquivo pode periodicamente ser limpo.',
+'undeletepagetext'             => '{{PLURAL:$1|A seguinte página foi eliminada|As seguintes páginas foram eliminadas}}, mas ainda {{PLURAL:$1|permanece|permanecem}} na base de dados e poderem ser restauradas. O arquivo pode ser limpo periodicamente.',
 'undelete-fieldset-title'      => 'Restaurar edições',
 'undeleteextrahelp'            => "Para restaurar o histórico de edições completo desta página, deixe todas as caixas de selecção desseleccionadas e clique em '''''Restaurar'''''.
 Para efectuar uma restauração selectiva, seleccione as caixas correspondentes às edições a serem restauradas e clique em '''''Restaurar'''''.
@@ -1747,12 +1955,13 @@ Se uma nova página foi criada com o mesmo nome desde a eliminação, as ediçõ
 'undeleterevdel'               => 'O restauro não será executado se resultar na remoção parcial da versão mais recente da página ou ficheiro.
 Em tais casos, deverá desseleccionar ou reverter a ocultação da versão apagada mais recente.',
 'undeletehistorynoadmin'       => 'Esta página foi eliminada. O motivo de eliminação é apresentado no súmario abaixo, junto dos detalhes do utilizador que editou esta página antes de eliminar. O texto actual destas edições eliminadas encontra-se agora apenas disponível para administradores.',
-'undelete-revision'            => 'A edição $1 de $2 foi eliminada por $3:',
+'undelete-revision'            => 'Edição eliminada da página $1 (das $5 de $4), por $3:',
 'undeleterevision-missing'     => 'Edição inválida ou não encontrada. Talvez você esteja com um link incorrecto ou talvez a edição foi restaurada ou removida dos arquivos.',
 'undelete-nodiff'              => 'Não foram encontradas edições anteriores.',
 'undeletebtn'                  => 'Restaurar',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Limpar',
+'undeleteinvert'               => 'Inverter selecção',
 'undeletecomment'              => 'Comentário:',
 'undeletedarticle'             => 'restaurado "[[$1]]"',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|edição restaurada|edições restauradas}}',
@@ -1784,26 +1993,27 @@ $1',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contribuições do utilizador',
-'mycontris'     => 'Minhas contribuições',
-'contribsub2'   => 'Para $1 ($2)',
-'nocontribs'    => 'Não foram encontradas mudanças com este critério.',
-'uctop'         => ' (edição actual)',
-'month'         => 'Mês (inclusive anteriores):',
-'year'          => 'Ano (inclusive anteriores):',
-
-'sp-contributions-newbies'     => 'Pesquisar apenas nas contribuições de contas recentes',
-'sp-contributions-newbies-sub' => 'Para contas novas',
-'sp-contributions-blocklog'    => 'Registo de bloqueios',
-'sp-contributions-search'      => 'Pesquisar contribuições',
-'sp-contributions-username'    => 'Endereço de IP ou utilizador:',
-'sp-contributions-submit'      => 'Pesquisar',
+'contributions'       => 'Contribuições do utilizador',
+'contributions-title' => 'Contribuições do utilizador $1',
+'mycontris'           => 'Minhas contribuições',
+'contribsub2'         => 'Para $1 ($2)',
+'nocontribs'          => 'Não foram encontradas mudanças com este critério.',
+'uctop'               => ' (edição actual)',
+'month'               => 'Mês (inclusive anteriores):',
+'year'                => 'Ano (inclusive anteriores):',
+
+'sp-contributions-newbies'       => 'Pesquisar apenas nas contribuições de contas recentes',
+'sp-contributions-newbies-sub'   => 'Para contas novas',
+'sp-contributions-newbies-title' => 'Contribuições de contas novas',
+'sp-contributions-blocklog'      => 'Registo de bloqueios',
+'sp-contributions-search'        => 'Pesquisar contribuições',
+'sp-contributions-username'      => 'Endereço de IP ou utilizador:',
+'sp-contributions-submit'        => 'Pesquisar',
 
 # What links here
 'whatlinkshere'            => 'Páginas afluentes',
 'whatlinkshere-title'      => 'Páginas que apontam para "$1"',
 'whatlinkshere-page'       => 'Página:',
-'linklistsub'              => '(Lista de ligações)',
 'linkshere'                => "As seguintes páginas possuem ligações para '''[[:$1]]''':",
 'nolinkshere'              => "Não existem ligações para '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Não há links para '''[[:$1]]''' no espaço nominal selecionado.",
@@ -1848,6 +2058,8 @@ Isto só deve ser feito para prevenir vandalismo, e de acordo com a [[{{MediaWik
 'ipbotherreason'                  => 'Outro motivo/motivo adicional:',
 'ipbhidename'                     => 'Ocultar utilizador/IP do registo de bloqueios, lista de bloqueios e lista de utilizadores',
 'ipbwatchuser'                    => 'Vigiar as páginas de utilizador e de discussão deste utilizador',
+'ipballowusertalk'                => 'Permitir que este utilizador edite sua própria página de discussão mesmo estando bloqueado',
+'ipb-change-block'                => 'Re-bloquear o utilizador com estes parâmetros',
 'badipaddress'                    => 'Endereço de IP inválido',
 'blockipsuccesssub'               => 'Bloqueio bem sucedido',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] foi bloqueado.<br />
@@ -1857,14 +2069,18 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para rever os bloquei
 'ipb-unblock'                     => 'Desbloquear um utilizador ou endereço de IP',
 'ipb-blocklist-addr'              => 'Bloqueios em vigência para $1',
 'ipb-blocklist'                   => 'Ver bloqueios em vigência',
+'ipb-blocklist-contribs'          => 'Contribuições de $1',
 'unblockip'                       => 'Desbloquear utilizador',
 'unblockiptext'                   => 'Utilize o formulário a seguir para restaurar o acesso à escrita para um endereço de IP ou utilizador previamente bloqueado.',
-'ipusubmit'                       => 'Desbloquear este utilizador',
+'ipusubmit'                       => 'Remover este bloqueio',
 'unblocked'                       => '[[User:$1|$1]] foi desbloqueado',
 'unblocked-id'                    => 'O bloqueio de $1 foi removido com sucesso',
 'ipblocklist'                     => 'Utilizadores e endereços de IP bloqueados',
 'ipblocklist-legend'              => 'Procurar por um utilizador bloqueado',
 'ipblocklist-username'            => 'Utilizador ou endereço de IP:',
+'ipblocklist-sh-userblocks'       => '$1 bloqueios de contas',
+'ipblocklist-sh-tempblocks'       => '$1 bloqueios temporários',
+'ipblocklist-sh-addressblocks'    => '$1 bloqueios de IP único',
 'ipblocklist-submit'              => 'Pesquisar',
 'blocklistline'                   => '$1, $2 bloqueou $3 ($4)',
 'infiniteblock'                   => 'infinito',
@@ -1873,14 +2089,18 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para rever os bloquei
 'noautoblockblock'                => 'bloqueio automático desabilitado',
 'createaccountblock'              => 'criação de conta de utilizador bloqueada',
 'emailblock'                      => 'impedido de enviar e-mail',
+'blocklist-nousertalk'            => 'impossibilitado de editar a própria página de discussão',
 'ipblocklist-empty'               => 'A lista de bloqueios encontra-se vazia.',
 'ipblocklist-no-results'          => 'O endereço de IP ou nome de utilizador procurado não se encontra bloqueado.',
 'blocklink'                       => 'bloquear',
 'unblocklink'                     => 'desbloquear',
+'change-blocklink'                => 'alterar bloqueio',
 'contribslink'                    => 'contribs',
 'autoblocker'                     => 'Você foi automaticamente bloqueado, pois partilha um endereço de IP com "[[User:$1|$1]]". O motivo apresentado foi: "$2".',
 'blocklogpage'                    => 'Registo de bloqueio',
+'blocklog-fulllog'                => 'Registo completo de bloqueios',
 'blocklogentry'                   => '"[[$1]]" foi bloqueado com um tempo de expiração de $2 $3',
+'reblock-logentry'                => 'modificou parâmetros de bloqueio para [[$1]] com um tempo de expiração de $2 $3',
 'blocklogtext'                    => 'Este é um registo de acções de bloqueio e desbloqueio.
 Endereços IP sujeitos a bloqueio automático não são listados.
 Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para obter a lista de bloqueios e banimentos actualmente válidos.',
@@ -1889,11 +2109,14 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para obter a lista de
 'block-log-flags-nocreate'        => 'criação de contas desabilitada',
 'block-log-flags-noautoblock'     => 'bloqueio automático desabilitado',
 'block-log-flags-noemail'         => 'impedido de enviar e-mail',
+'block-log-flags-nousertalk'      => 'impossibilitado de editar a própria página de discussão',
 'block-log-flags-angry-autoblock' => 'autobloqueio melhorado activado',
 'range_block_disabled'            => 'A funcionalidade de bloquear gamas de IPs encontra-se desactivada.',
 'ipb_expiry_invalid'              => 'Tempo de expiração inválido.',
 'ipb_expiry_temp'                 => 'Bloqueios com nome de utilizador ocultado devem ser permanentes.',
 'ipb_already_blocked'             => '"$1" já se encontra bloqueado',
+'ipb-needreblock'                 => '== Já se encontra bloqueado ==
+$1 já se encontra bloqueado. Deseja alterar as configurações?',
 'ipb_cant_unblock'                => 'Erro: Bloqueio com ID $1 não encontrado. Poderá já ter sido desbloqueado.',
 'ipb_blocked_as_range'            => 'Erro: O IP $1 não se encontra bloqueado de forma direta, não podendo ser desbloqueado deste modo. Se encontra bloqueado como parte do "range" $2, o qual pode ser desbloqueado.',
 'ip_range_invalid'                => 'Gama de IPs inválida.',
@@ -1904,6 +2127,7 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para obter a lista de
 'proxyblocksuccess'               => 'Concluído.',
 'sorbsreason'                     => 'O seu endereço IP encontra-se listado como proxy aberto pela DNSBL utilizada por {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'O seu endereço de IP encontra-se listado como proxy aberto na DNSBL utilizada por {{SITENAME}}. Você não pode criar uma conta',
+'cant-block-while-blocked'        => 'Você não pode bloquear outros utilizadores enquanto estiver bloqueado.',
 
 # Developer tools
 'lockdb'              => 'Trancar base de dados',
@@ -1926,9 +2150,9 @@ Lembre-se de [[Special:UnlockDB|remover o bloqueio]] após a manutenção.',
 'databasenotlocked'   => 'A base de dados não encontra-se bloqueada.',
 
 # Move page
-'move-page'               => 'Mover $1',
-'move-page-legend'        => 'Mover página',
-'movepagetext'            => "Utilizando o seguinte formulário você poderá renomear uma página, movendo todo o histórico de edições para o novo título.
+'move-page'                    => 'Mover $1',
+'move-page-legend'             => 'Mover página',
+'movepagetext'                 => "Utilizando o seguinte formulário você poderá renomear uma página, movendo todo o histórico de edições para o novo título.
 É possível corrigir de forma automática redirecionamentos que apontem para o título original.
 Caso escolha para que isso não seja feito, certifique-se de verificar redirecionamentos [[Special:DoubleRedirects|duplos]] ou [[Special:BrokenRedirects|quebrados]].
 É de sua responsabilidade ter certeza de que os links continuem apontando para onde se é suposto apontar.
@@ -1939,47 +2163,60 @@ Isto significa que pode renomear uma página de volta para o nome que tinha ante
 '''CUIDADO!'''
 Isto pode ser uma mudança drástica e inesperada para uma página popular;
 por favor, tenha certeza de que compreende as conseqüências da mudança antes de prosseguir.",
-'movepagetalktext'        => "A página de \"discussão\" associada, se existir, será automaticamente movida, '''a não ser que:'''
+'movepagetalktext'             => "A página de \"discussão\" associada, se existir, será automaticamente movida, '''a não ser que:'''
 *Uma página de discussão com conteúdo já exista sob o novo título, ou
 *Você não marque a caixa abaixo.
 
 Nestes casos, você terá que mover ou mesclar a página manualmente, se assim desejar.",
-'movearticle'             => 'Mover página',
-'movenotallowed'          => 'Você não possui permissão de mover páginas.',
-'newtitle'                => 'Para novo título',
-'move-watch'              => 'Vigiar esta página',
-'movepagebtn'             => 'Mover página',
-'pagemovedsub'            => 'Página movida com sucesso',
-'movepage-moved'          => '<big>\'\'\'"$1" foi movida para "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Uma página com este título já existe, ou o título que escolheu é inválido.
+'movearticle'                  => 'Mover página',
+'movenologin'                  => 'Não autenticado',
+'movenologintext'              => 'Você precisa ser um utilizador registado e [[Special:UserLogin|autenticado]] para poder mover uma página.',
+'movenotallowed'               => 'Você não possui permissão de mover páginas.',
+'movenotallowedfile'           => 'Você não possui permissão de mover ficheiros.',
+'cant-move-user-page'          => 'Você não possui permissão de mover páginas principais de usuários.',
+'cant-move-to-user-page'       => 'Você não tem permissão para mover uma página para uma página de utilizador (excepto para uma subpágina de utilizador).',
+'newtitle'                     => 'Para novo título',
+'move-watch'                   => 'Vigiar esta página',
+'movepagebtn'                  => 'Mover página',
+'pagemovedsub'                 => 'Página movida com sucesso',
+'movepage-moved'               => '<big>\'\'\'"$1" foi movida para "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Um redireccionamento foi criado.',
+'movepage-moved-noredirect'    => 'A criação de um redirecionamento foi suprimida.',
+'articleexists'                => 'Uma página com este título já existe, ou o título que escolheu é inválido.
 Por favor, escolha outro nome.',
-'cantmove-titleprotected' => 'Você não pode mover uma página para tal denominação uma vez que o novo título se encontra protegido contra criação',
-'talkexists'              => "'''A página em si foi movida com sucesso. No entanto, a página de discussão não foi movida, uma vez que já existia uma com este título. Por favor, mescle-as manualmente.'''",
-'movedto'                 => 'movido para',
-'movetalk'                => 'Mover também a página de discussão associada.',
-'move-subpages'           => 'Mover todas as sub-páginas, se aplicável',
-'move-talk-subpages'      => 'Mover todas as sub-páginas da página de discussão, se aplicável',
-'movepage-page-exists'    => 'A página $1 já existe e não pode ser substituída.',
-'movepage-page-moved'     => 'A página $1 foi movida para $2',
-'movepage-page-unmoved'   => 'A página $1 não pôde ser movida para $2.',
-'movepage-max-pages'      => 'O limite de $1 {{PLURAL:$1|página movida|páginas movidas}} foi atingido; não será possível mover mais páginas de forma automática.',
-'1movedto2'               => 'moveu [[$1]] para [[$2]]',
-'1movedto2_redir'         => 'moveu [[$1]] para [[$2]] sobre redireccionamento',
-'movelogpage'             => 'Registo de movimento',
-'movelogpagetext'         => 'Abaixo encontra-se uma lista de páginas movidas.',
-'movereason'              => 'Motivo:',
-'revertmove'              => 'reverter',
-'delete_and_move'         => 'Eliminar e mover',
-'delete_and_move_text'    => '==Eliminação necessária==
+'cantmove-titleprotected'      => 'Você não pode mover uma página para tal denominação uma vez que o novo título se encontra protegido contra criação',
+'talkexists'                   => "'''A página em si foi movida com sucesso. No entanto, a página de discussão não foi movida, uma vez que já existia uma com este título. Por favor, mescle-as manualmente.'''",
+'movedto'                      => 'movido para',
+'movetalk'                     => 'Mover também a página de discussão associada.',
+'move-subpages'                => 'Mover todas as sub-páginas, se aplicável',
+'move-talk-subpages'           => 'Mover todas as sub-páginas da página de discussão, se aplicável',
+'movepage-page-exists'         => 'A página $1 já existe e não pode ser substituída.',
+'movepage-page-moved'          => 'A página $1 foi movida para $2',
+'movepage-page-unmoved'        => 'A página $1 não pôde ser movida para $2.',
+'movepage-max-pages'           => 'O limite de $1 {{PLURAL:$1|página movida|páginas movidas}} foi atingido; não será possível mover mais páginas de forma automática.',
+'1movedto2'                    => 'moveu [[$1]] para [[$2]]',
+'1movedto2_redir'              => 'moveu [[$1]] para [[$2]] sobre redireccionamento',
+'move-redirect-suppressed'     => 'redirecionamento suprimido',
+'movelogpage'                  => 'Registo de movimento',
+'movelogpagetext'              => 'Abaixo encontra-se uma lista de páginas movidas.',
+'movereason'                   => 'Motivo:',
+'revertmove'                   => 'reverter',
+'delete_and_move'              => 'Eliminar e mover',
+'delete_and_move_text'         => '==Eliminação necessária==
 A página de destino ("[[:$1]]") já existe. Deseja eliminá-la de modo a poder mover?',
-'delete_and_move_confirm' => 'Sim, eliminar a página',
-'delete_and_move_reason'  => 'Eliminada para poder mover outra página para este título',
-'selfmove'                => 'O título fonte e o título destinatário são os mesmos; não é possível mover uma página para ela mesma.',
-'immobile_namespace'      => 'O título destinatário é de um tipo especial; não é possível mover páginas para esse espaço nominal.',
-'imagenocrossnamespace'   => 'Não é possível mover imagem para espaço nominal que não de imagens',
-'imagetypemismatch'       => 'A extensão do novo ficheiro não corresponde ao seu tipo',
-'imageinvalidfilename'    => 'O nome do ficheiro alvo é inválido',
-'fix-double-redirects'    => 'Atualizar todos os redirecionamentos que apontem para o título original',
+'delete_and_move_confirm'      => 'Sim, eliminar a página',
+'delete_and_move_reason'       => 'Eliminada para poder mover outra página para este título',
+'selfmove'                     => 'O título fonte e o título destinatário são os mesmos; não é possível mover uma página para ela mesma.',
+'immobile-source-namespace'    => 'Não é possível mover páginas no espaço nominal "$1"',
+'immobile-target-namespace'    => 'Não é possível mover páginas para o espaço nominal "$1"',
+'immobile-target-namespace-iw' => 'Uma ligação interwiki não é um destino válido para uma movimentação de página.',
+'immobile-source-page'         => 'Esta página não pode ser movida.',
+'immobile-target-page'         => 'Não é possível mover para esse título de destino.',
+'imagenocrossnamespace'        => 'Não é possível mover imagem para espaço nominal que não de imagens',
+'imagetypemismatch'            => 'A extensão do novo ficheiro não corresponde ao seu tipo',
+'imageinvalidfilename'         => 'O nome do ficheiro alvo é inválido',
+'fix-double-redirects'         => 'Atualizar todos os redirecionamentos que apontem para o título original',
+'move-leave-redirect'          => 'Criar um redireccionamento',
 
 # Export
 'export'            => 'Exportação de páginas',
@@ -1987,7 +2224,7 @@ A página de destino ("[[:$1]]") já existe. Deseja eliminá-la de modo a poder
 
 Para exportar páginas, introduza os títulos na caixa de texto abaixo (um título por linha) e seleccione se deseja todas as versões, com as linhas de histórico de edições, ou apenas a edição atual e informações apenas sobre a mais recente das edições.
 
-Se desejar, pode utilizar uma ligação (por exemplo, [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] para a [[{{MediaWiki:Mainpage}}]]).',
+Se desejar, pode utilizar uma ligação (por exemplo, [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] para a [[{{MediaWiki:Mainpage}}]]).',
 'exportcuronly'     => 'Incluir apenas a edição actual, não o histórico inteiro',
 'exportnohistory'   => "----
 '''Nota:''' a exportação do histórico completo das páginas através deste formulário foi desactivada devido a motivos de performance.",
@@ -2003,7 +2240,7 @@ Se desejar, pode utilizar uma ligação (por exemplo, [[{{ns:special}}:Export/{{
 'allmessagesdefault'        => 'Texto padrão',
 'allmessagescurrent'        => 'Texto actual',
 'allmessagestext'           => 'Esta é uma lista de todas mensagens de sistema disponíveis no espaço nominal {{ns:mediawiki}}.
-Acesse [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net Betawiki] caso deseje contribuir para traduções do MediaWiki feitas para uso geral.',
+Acesse [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] caso deseje contribuir para traduções do MediaWiki feitas para uso geral.',
 'allmessagesnotsupportedDB' => "Esta página não pode ser utilizada, uma vez que '''\$wgUseDatabaseMessages''' foi desativado.",
 'allmessagesfilter'         => 'Filtro de nome de mensagem:',
 'allmessagesmodified'       => 'Mostrar apenas modificados',
@@ -2023,9 +2260,12 @@ Acesse [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [ht
 'import-interwiki-text'      => 'Seleccione uma wiki e um título de página a importar.
 As datas das edições e os seus editores serão mantidos.
 Todas as acções de importação transwiki são registadas no [[Special:Log/import|Registo de importações]].',
+'import-interwiki-source'    => 'Wiki/página fonte:',
 'import-interwiki-history'   => 'Copiar todas as edições desta página',
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Domínio de destino:',
+'import-upload-filename'     => 'Nome do ficheiro:',
+'import-comment'             => 'Comentário:',
 'importtext'                 => 'Por favor, exporte o ficheiro da wiki de origem utilizando a ferramenta [[Special:Export|de exportar edições]] (Special:Export).
 Salve o ficheiro para o seu disco e importe-o aqui.',
 'importstart'                => 'Importando páginas...',
@@ -2060,19 +2300,19 @@ Salve o ficheiro para o seu disco e importe-o aqui.',
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|$1 edição|$1 edições}} de $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Minha página de utilizador',
+'tooltip-pt-userpage'             => 'Sua página de utilizador',
 'tooltip-pt-anonuserpage'         => 'A página de utilizador para o ip que está a utilizar para editar',
-'tooltip-pt-mytalk'               => 'Minha página de discussão',
+'tooltip-pt-mytalk'               => 'Sua página de discussão',
 'tooltip-pt-anontalk'             => 'Discussão sobre edições deste endereço de IP',
 'tooltip-pt-preferences'          => 'Minhas preferências',
 'tooltip-pt-watchlist'            => 'A lista de páginas às quais você está monitorando alterações',
-'tooltip-pt-mycontris'            => 'Lista das minhas contribuições',
+'tooltip-pt-mycontris'            => 'Lista das suas contribuições',
 'tooltip-pt-login'                => 'Você é encorajado a autenticar-se, apesar disso não ser obrigatório.',
 'tooltip-pt-anonlogin'            => 'Você é encorajado a autenticar-se, apesar disso não ser obrigatório.',
 'tooltip-pt-logout'               => 'Sair',
 'tooltip-ca-talk'                 => 'Discussão sobre o conteúdo da página',
 'tooltip-ca-edit'                 => 'Você pode editar esta página. Por favor, utilize o botão Mostrar Previsão antes de salvar.',
-'tooltip-ca-addsection'           => 'Adicionar comentário a essa discussão.',
+'tooltip-ca-addsection'           => 'Iniciar uma nova secção',
 'tooltip-ca-viewsource'           => 'Esta página está protegida; você pode exibir seu código, no entanto.',
 'tooltip-ca-history'              => 'Edições anteriores desta página.',
 'tooltip-ca-protect'              => 'Proteger esta página',
@@ -2091,7 +2331,7 @@ Salve o ficheiro para o seu disco e importe-o aqui.',
 'tooltip-n-recentchanges'         => 'A lista de mudanças recentes nesta wiki.',
 'tooltip-n-randompage'            => 'Carregar página aleatória',
 'tooltip-n-help'                  => 'Um local reservado para auxílio.',
-'tooltip-t-whatlinkshere'         => 'Lista de todas as páginas que ligam-se a esta',
+'tooltip-t-whatlinkshere'         => 'Lista de todas as páginas que se ligam a esta',
 'tooltip-t-recentchangeslinked'   => 'Mudanças recentes em páginas relacionadas a esta',
 'tooltip-feed-rss'                => 'Feed RSS desta página',
 'tooltip-feed-atom'               => 'Feed Atom desta página',
@@ -2119,6 +2359,8 @@ Salve o ficheiro para o seu disco e importe-o aqui.',
 'tooltip-watch'                   => 'Adicionar esta página à sua lista de vigiados',
 'tooltip-recreate'                => 'Recriar a página apesar de ter sido eliminada',
 'tooltip-upload'                  => 'Iniciar o upload',
+'tooltip-rollback'                => '"{{int:rollbacklink}}" reverte, com um só clique, as edições do último editor desta página.',
+'tooltip-undo'                    => '"{{int:editundo}}" reverte esta edição exibindo o box de edição no modo de previsão, permitindo alterações adicionais e o uso do sumário de edição para justificativas.',
 
 # Stylesheets
 'common.css'   => '/** o código CSS colocado aqui será aplicado a todos os temas */',
@@ -2134,12 +2376,12 @@ Salve o ficheiro para o seu disco e importe-o aqui.',
 'notacceptable'     => 'O servidor não pode fornecer os dados num formato que o seu cliente possa ler.',
 
 # Attribution
-'anonymous'        => 'Utilizador(es) anónimo(s) da {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utilizador anónimo|Utilizadores anónimos}} da {{SITENAME}}',
 'siteuser'         => 'um utilizador da {{SITENAME}}: $1',
 'lastmodifiedatby' => 'Esta página foi modificada pela última vez às $2 de $1 por $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Baseado no trabalho de $1.',
 'others'           => 'outros',
-'siteusers'        => '{{SITENAME}} utilizador(es) $1',
+'siteusers'        => '{{PLURAL:$2|um utilizador|$2 utilizadores}} da {{SITENAME}}: $1',
 'creditspage'      => 'Créditos da página',
 'nocredits'        => 'Não há informação disponível sobre os créditos desta página.',
 
@@ -2160,6 +2402,16 @@ Tal bloqueio foi provavelmente causado por uma ligação para um website externo
 'numauthors'     => 'Número de autores distintos (página): $1',
 'numtalkauthors' => 'Número de autores distintos (página de discussão): $1',
 
+# Skin names
+'skinname-standard'    => 'Clássico',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Azul colonial',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chique',
+'skinname-simple'      => 'Simples',
+'skinname-modern'      => 'Moderno',
+
 # Math options
 'mw_math_png'    => 'Gerar sempre como PNG',
 'mw_math_simple' => 'HTML caso seja simples, caso contrário, PNG',
@@ -2180,10 +2432,12 @@ Tal bloqueio foi provavelmente causado por uma ligação para um website externo
 'markedaspatrollederror-noautopatrol' => 'Você não está autorizado a marcar suas próprias edições como edições patrulhadas.',
 
 # Patrol log
-'patrol-log-page'   => 'Registo de edições patrulhadas',
-'patrol-log-header' => 'Este é um registo de edições patrulhadas.',
-'patrol-log-line'   => 'marcou a edição $1 de $2 como uma edição patrulhada $3',
-'patrol-log-auto'   => 'automaticamente',
+'patrol-log-page'      => 'Registo de edições patrulhadas',
+'patrol-log-header'    => 'Este é um registo de edições patrulhadas.',
+'patrol-log-line'      => 'marcou a edição $1 de $2 como uma edição patrulhada $3',
+'patrol-log-auto'      => 'automaticamente',
+'patrol-log-diff'      => 'edição $1',
+'log-show-hide-patrol' => '$1 registo de edições patrulhadas',
 
 # Image deletion
 'deletedrevision'                 => 'Apagada a versão antiga $1',
@@ -2200,6 +2454,9 @@ $1',
 'previousdiff' => '� Edição anterior',
 'nextdiff'     => 'Edição posterior →',
 
+# Visual comparison
+'visual-comparison' => 'Comparação visual',
+
 # Media information
 'mediawarning'         => "'''Aviso''': Este ficheiro pode conter código malicioso. Ao executar, o seu sistema poderá estar comprometido.<hr />",
 'imagemaxsize'         => 'Limitar imagens nas páginas de descrição a:',
@@ -2212,10 +2469,12 @@ $1',
 'show-big-image'       => 'Resolução completa',
 'show-big-image-thumb' => '<small>Tamanho desta previsão: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria de novos ficheiros',
 'imagelisttext'         => "É exibida a seguir uma listagem {{PLURAL:$1|de '''um''' ficheiro organizado|de '''$1''' ficheiros organizados}} por $2.",
 'newimages-summary'     => 'Esta página especial mostra os ficheiros mais recentemente enviados.',
+'newimages-legend'      => 'Filtrar',
+'newimages-label'       => 'Nome de ficheiro (ou parte dele):',
 'showhidebots'          => '($1 robôs)',
 'noimages'              => 'Nada para ver.',
 'ilsubmit'              => 'Procurar',
@@ -2234,7 +2493,7 @@ Any subsequent links on the same line are considered to be exceptions, i.e. arti
 Caso o ficheiro tenha sido modificado a partir do seu estado original, alguns detalhes poderão não reflectir completamente as mudanças efectuadas.',
 'metadata-expand'   => 'Mostrar restantes detalhes',
 'metadata-collapse' => 'Esconder detalhes restantes',
-'metadata-fields'   => 'Os campos de metadados EXIF listados nesta mensagem poderão estar presente na exibição da página de imagem quando a tabela de metadados estiver no modo "expandida". Outros poderão estar escondidos por padrão.
+'metadata-fields'   => 'Os campos de metadados EXIF listados nesta mensagem poderão estar presente na exibição da página de imagem quando a tabela de metadados estiver no modo "expandida". Outros poderão estar escondidos por defeito.
 * make
 * model
 * datetimeoriginal
@@ -2420,6 +2679,18 @@ Caso o ficheiro tenha sido modificado a partir do seu estado original, alguns de
 'exif-lightsource-24'  => 'Tungsténio de estúdio ISO',
 'exif-lightsource-255' => 'Outra fonte de luz',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flash não disparou',
+'exif-flash-fired-1'    => 'Flash disparado',
+'exif-flash-return-0'   => 'strobe não encontrou ou detectou nenhuma função',
+'exif-flash-return-2'   => 'strobe não retornou a função detectada',
+'exif-flash-return-3'   => 'strobe retornou a função detectada',
+'exif-flash-mode-1'     => 'disparo de flash forçado',
+'exif-flash-mode-2'     => 'disparo de flash suprimido',
+'exif-flash-mode-3'     => 'modo auto',
+'exif-flash-function-1' => 'Sem função de flash',
+'exif-flash-redeye-1'   => 'modo de redução de olhos vermelhos',
+
 'exif-focalplaneresolutionunit-2' => 'polegadas',
 
 'exif-sensingmethod-1' => 'Indefinido',
@@ -2564,21 +2835,10 @@ $1
 Por favor, confirme que realmente deseja recriar esta página.",
 'recreate'            => 'Recriar',
 
-# HTML dump
-'redirectingto' => 'Redireccionando para [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Limpar a memória cache desta página?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Pesquisar por páginas contendo ''$1''.",
-'searchnamed'      => "Pesquisar por páginas nomeadas como ''$1''.",
-'articletitles'    => "Páginas começando com ''$1''",
-'hideresults'      => 'Esconder resultados',
-'useajaxsearch'    => 'Usar busca AJAX',
+'confirm-purge-top'    => 'Limpar a memória cache desta página?',
+'confirm-purge-bottom' => 'Purgar uma página limpa a cache e força a sua versão mais recente a aparecer.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� página anterior',
@@ -2598,10 +2858,10 @@ $1',
 'table_pager_empty'        => 'Sem resultados',
 
 # Auto-summaries
-'autosumm-blank'   => 'Foi removido o conteúdo completo desta página',
+'autosumm-blank'   => 'Limpou toda a página',
 'autosumm-replace' => "Página substituída por '$1'",
 'autoredircomment' => 'Redireccionando para [[$1]]',
-'autosumm-new'     => 'Nova página: $1',
+'autosumm-new'     => "Criou nova página com '$1'",
 
 # Live preview
 'livepreview-loading' => 'Carregando…',
@@ -2642,6 +2902,7 @@ Você também pode [[Special:Watchlist/edit|editar a lista da forma convencional
 
 # Core parser functions
 'unknown_extension_tag' => '"$1" é uma tag de extensão desconhecida',
+'duplicate-defaultsort' => 'Aviso: A chave de ordenação padrão "$2" sobrepõe-se à anterior chave de ordenação padrão "$1".',
 
 # Special:Version
 'version'                          => 'Versão', # Not used as normal message but as header for the special page itself
@@ -2668,15 +2929,16 @@ Você também pode [[Special:Watchlist/edit|editar a lista da forma convencional
 'filepath'         => 'Caminho do ficheiro',
 'filepath-page'    => 'Ficheiro:',
 'filepath-submit'  => 'Diretório',
-'filepath-summary' => 'Através dsta página especial é possível descobrir o endereço completo de um determinado ficheiro. As imagens serão exibidas em sua resolução máxima, outros tipos de ficheiros serão iniciados automaticamente em seus programas correspondentes.
+'filepath-summary' => 'Através desta página especial, é possível descobrir o endereço completo de um determinado ficheiro.
+As imagens serão exibidas em sua resolução máxima, outros tipos de ficheiros serão iniciados automaticamente em seus programas correspondentes.
 
-Entre com o nome do ficheiro sem utilizar o prefixo "{{ns:image}}:".',
+Introduza o nome do ficheiro sem utilizar o prefixo "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Procurar por ficheiros duplicados',
 'fileduplicatesearch-summary'  => 'Procure por ficheiros duplicados tendo por base seu valor "hash".
 
-Entre com o nome de ficheiro sem fornecer o prefixo "{{ns:image}}:".',
+Entre com o nome de ficheiro sem fornecer o prefixo "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Procurar por duplicatas',
 'fileduplicatesearch-filename' => 'Nome do ficheiro:',
 'fileduplicatesearch-submit'   => 'Pesquisa',
@@ -2706,4 +2968,12 @@ Entre com o nome de ficheiro sem fornecer o prefixo "{{ns:image}}:".',
 'blankpage'              => 'Página em branco',
 'intentionallyblankpage' => 'Esta página foi intencionalmente deixada em branco',
 
+# External image whitelist
+'external_image_whitelist' => '# Deixe esta linha exatamente como ela é <pre> 
+# Coloque uma expressão regular (apenas a parte que vai entre o //) a seguir
+# Estes serão compensados com as URLs de imagens (hotlinked) externas
+# Aqueles que corresponderem serão exibidos como imagens, caso contrário, apenas um link para a imagem será mostrada
+# As linhas que começam com # são tratadas como comentários
+# Coloque todos os fragmentos de regex acima dessa linha. Deixe esta linha exatamente como ela é </ pre>',
+
 );
diff --git a/languages/messages/MessagesPt_br.php b/languages/messages/MessagesPt_br.php
index cecf5237..fb02f166 100644
--- a/languages/messages/MessagesPt_br.php
+++ b/languages/messages/MessagesPt_br.php
@@ -7,12 +7,14 @@
  * @author Bani
  * @author Brunoy Anastasiya Seryozhenko
  * @author Carla404
+ * @author Eduardo.mps
  * @author GKnedo
  * @author Heldergeovane
  * @author LeonardoG
  * @author Lijealso
  * @author Rodrigo Calanca Nishino
  * @author Urhixidur
+ * @author Waldir
  * @author Yves Marques Junqueira
  * @author לערי ריינה�רט
  * @author 555
@@ -21,37 +23,32 @@
 $fallback = 'pt'; 
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Especial',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discussão',
-	NS_USER           => 'Usuário',
-	NS_USER_TALK      => 'Usuário_Discussão',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_Discussão',
-	NS_IMAGE          => 'Imagem',
-	NS_IMAGE_TALK     => 'Imagem_Discussão',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_Discussão',
-	NS_TEMPLATE       => 'Predefinição',
-	NS_TEMPLATE_TALK  => 'Predefinição_Discussão',
-	NS_HELP           => 'Ajuda',
-	NS_HELP_TALK      => 'Ajuda_Discussão',
-	NS_CATEGORY       => 'Categoria',
-	NS_CATEGORY_TALK  => 'Categoria_Discussão',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_TALK             => 'Discussão',
+	NS_USER             => 'Usuário',
+	NS_USER_TALK        => 'Usuário_Discussão',
+	NS_PROJECT_TALK     => '$1_Discussão',
+	NS_FILE             => 'Arquivo',
+	NS_FILE_TALK        => 'Arquivo_Discussão',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discussão',
+	NS_TEMPLATE         => 'Predefinição',
+	NS_TEMPLATE_TALK    => 'Predefinição_Discussão',
+	NS_HELP             => 'Ajuda',
+	NS_HELP_TALK        => 'Ajuda_Discussão',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Categoria_Discussão',
 );
 
-$skinNames = array(
-	'standard'    => 'Clássico',
-	'nostalgia'   => 'Nostalgia',
-	'cologneblue' => 'Azul colonial',
-	'monobook'    => 'MonoBook',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Chique',
-	'simple'      => 'Simples',
-	'modern'      => 'Moderno',
+$namespaceAliases = array(
+	'Imagem' => NS_FILE,
+	'Imagem_Discussão' => NS_FILE_TALK,
+	'Ficheiro' => NS_FILE,
+	'Ficheiro_Discussão' => NS_FILE_TALK,
 );
 
+
 $defaultDateFormat = 'dmy';
 
 $dateFormats = array(
@@ -63,92 +60,122 @@ $dateFormats = array(
 );
 
 $separatorTransformTable = array(',' => ' ', '.' => ',' );
-#$linkTrail = '/^([a-z]+)(.*)$/sD';# ignore list
 
 $specialPageAliases = array(
-	'DoubleRedirects'         => array( 'Redirecionamentos duplos', 'Redireccionamentos duplos' ),
-	'BrokenRedirects'         => array( 'Redirecionamentos quebrados', 'Redireccionamentos quebrados' ),
-	'Disambiguations'         => array( 'Páginas de desambiguação', 'Desambiguar', 'Desambiguações' ),
-	'Userlogin'               => array( 'Entrar', 'Login' ),
-	'Userlogout'              => array( 'Sair', 'Logout' ),
-	'CreateAccount'           => array( 'Criar conta' ),
-	'Preferences'             => array( 'Preferências' ),
-	'Watchlist'               => array( 'Páginas vigiadas', 'Artigos vigiados', 'Vigiados' ),
-	'Recentchanges'           => array( 'Mudanças recentes' ),
-	'Upload'                  => array( 'Carregar imagem', 'Carregar ficheiro', 'Carregar arquivo', 'Enviar' ),
-	'Imagelist'               => array( 'Lista de imagens', 'Lista de ficheiros', 'Lista de arquivos' ),
-	'Newimages'               => array( 'Imagens novas', 'Ficheiros novos', 'Arquivos novos' ),
-	'Listusers'               => array( 'Lista de usuários', 'Lista de utilizadores' ),
-	'Listgrouprights'         => array( 'Listar privilégios de grupos' ),
-	'Statistics'              => array( 'Estatísticas' ),
-	'Randompage'              => array( 'Aleatória', 'Aleatório', 'Página aleatória', 'Artigo aleatório' ),
-	'Lonelypages'             => array( 'Páginas órfãs', 'Artigos órfãos', 'Páginas sem afluentes', 'Artigos sem afluentes' ),
-	'Uncategorizedpages'      => array( 'Páginas sem categorias', 'Artigos sem categorias' ),
-	'Uncategorizedcategories' => array( 'Categorias sem categorias' ),
-	'Uncategorizedimages'     => array( 'Imagens sem categorias', 'Ficheiros sem categorias', 'Arquivos sem categorias' ),
-	'Uncategorizedtemplates'  => array( 'Predefinições não categorizadas', 'Predefinições sem categorias' ),
-	'Unusedcategories'        => array( 'Categorias não utilizadas', 'Categorias sem uso' ),
-	'Unusedimages'            => array( 'Imagens sem uso', 'Imagens não utilizadas', 'Ficheiros sem uso', 'Ficheiros não utilizados', 'Arquivos sem uso', 'Arquivos não utilizados' ),
-	'Wantedpages'             => array( 'Páginas em falta', 'Artigos em falta', 'Páginas pedidas', 'Artigos pedidos' ),
-	'Wantedcategories'        => array( 'Categorias em falta', 'Categorias inexistentes' ),
-	'Missingfiles'            => array( 'Arquivos em falta', 'Imagens em falta', 'Ficheiros em falta' ),
-	'Mostlinked'              => array( 'Páginas com mais afluentes', 'Artigos com mais afluentes' ),
-	'Mostlinkedcategories'    => array( 'Categorias com mais afluentes' ),
-	'Mostlinkedtemplates'     => array( 'Predefinições com mais afluentes' ),
-	'Mostcategories'          => array( 'Páginas com mais categorias', 'Artigos com mais categorias' ),
-	'Mostimages'              => array( 'Imagens com mais afluentes', 'Ficheiros com mais afluentes', 'Arquivos com mais afluentes' ),
-	'Mostrevisions'           => array( 'Páginas com mais edições', 'Artigos com mais edições' ),
-	'Fewestrevisions'         => array( 'Páginas com menos edições', 'Artigos com menos edições', 'Artigos menos editados' ),
-	'Shortpages'              => array( 'Páginas curtas', 'Artigos curtos' ),
-	'Longpages'               => array( 'Páginas longas', 'Artigos extensos' ),
-	'Newpages'                => array( 'Páginas novas', 'Artigos novos' ),
-	'Ancientpages'            => array( 'Páginas inativas', 'Artigos inativos' ),
-	'Deadendpages'            => array( 'Páginas sem saída', 'Artigos sem saída' ),
-	'Protectedpages'          => array( 'Páginas protegidas', 'Artigos protegidos' ),
-	'Protectedtitles'         => array( 'Títulos protegidos' ),
-	'Allpages'                => array( 'Todas as páginas', 'Todos os artigos', 'Todas páginas', 'Todos artigos' ),
-	'Prefixindex'             => array( '�ndice de prefixo', '�ndice por prefixo' ),
-	'Ipblocklist'             => array( 'Registro de bloqueios', 'IPs bloqueados', 'Utilizadores bloqueados', 'Usuários bloqueados', 'Registo de bloqueios' ),
-	'Specialpages'            => array( 'Páginas especiais' ),
-	'Contributions'           => array( 'Contribuições' ),
-	'Emailuser'               => array( 'Contactar usuário', 'Contactar utilizador', 'Contatar usuário' ),
-	'Confirmemail'            => array( 'Confirmar e-mail', 'Confirmar email' ),
-	'Whatlinkshere'           => array( 'Páginas afluentes', 'Artigos afluentes' ),
-	'Recentchangeslinked'     => array( 'Novidades relacionadas', 'Mudanças relacionadas' ),
-	'Movepage'                => array( 'Mover', 'Mover página', 'Mover artigo' ),
-	'Blockme'                 => array( 'Bloquear-me', 'Auto-bloqueio' ),
-	'Booksources'             => array( 'Fontes de livros' ),
-	'Categories'              => array( 'Categorias' ),
-	'Export'                  => array( 'Exportar' ),
-	'Version'                 => array( 'Versão', 'Sobre' ),
-	'Allmessages'             => array( 'Todas as mensagens', 'Todas mensagens' ),
-	'Log'                     => array( 'Registro', 'Registos', 'Registros', 'Registo' ),
-	'Blockip'                 => array( 'Bloquear', 'Bloquear IP', 'Bloquear utilizador', 'Bloquear usuário' ),
-	'Undelete'                => array( 'Restaurar', 'Restaurar páginas eliminadas', 'Restaurar artigos eliminados' ),
-	'Import'                  => array( 'Importar' ),
-	'Lockdb'                  => array( 'Bloquear banco de dados', 'Bloquear a base de dados' ),
-	'Unlockdb'                => array( 'Desbloquear banco de dados', 'Desbloquear a base de dados' ),
-	'Userrights'              => array( 'Privilégios', 'Direitos', 'Estatutos' ),
-	'MIMEsearch'              => array( 'Busca MIME' ),
-	'FileDuplicateSearch'     => array( 'Busca de arquivos duplicados', 'Busca de ficheiros duplicados' ),
-	'Unwatchedpages'          => array( 'Páginas não-vigiadas', 'Páginas não vigiadas', 'Artigos não-vigiados', 'Artigos não vigiados' ),
-	'Listredirects'           => array( 'Redirecionamentos', 'Lista de redireccionamentos', 'Lista de redirecionamentos', 'Redireccionamentos' ),
-	'Revisiondelete'          => array( 'Eliminar edição', 'Eliminar revisão', 'Apagar edição', 'Apagar revisão' ),
-	'Unusedtemplates'         => array( 'Predefinições sem uso', 'Predefinições não utilizadas' ),
-	'Randomredirect'          => array( 'Redirecionamento aleatório', 'Redireccionamento aleatório' ),
-	'Mypage'                  => array( 'Minha página' ),
-	'Mytalk'                  => array( 'Minha discussão' ),
-	'Mycontributions'         => array( 'Minhas contribuições', 'Minhas edições' ),
-	'Listadmins'              => array( 'Administradores', 'Admins', 'Lista de administradores', 'Lista de admins' ),
-	'Listbots'                => array( 'Bots', 'Lista de bots' ),
-	'Popularpages'            => array( 'Páginas populares', 'Artigos populares' ),
-	'Search'                  => array( 'Busca', 'Buscar', 'Procurar', 'Pesquisar', 'Pesquisa' ),
-	'Resetpass'               => array( 'Zerar senha', 'Repor senha' ),
-	'Withoutinterwiki'        => array( 'Páginas sem interwikis', 'Artigos sem interwikis' ),
-	'MergeHistory'            => array( 'Fundir históricos', 'Fundir edições' ),
-	'Filepath'                => array( 'Diretório de arquivo', 'Diretório de ficheiro' ),
-	'Invalidateemail'         => array( 'Invalidar e-mail' ),
-	'Blankpage'               => array( 'Página em branco' ),
+	'DoubleRedirects'           => array( 'Redirecionamentos duplos', 'Redireccionamentos duplos' ),
+	'BrokenRedirects'           => array( 'Redirecionamentos quebrados', 'Redireccionamentos quebrados' ),
+	'Disambiguations'           => array( 'Páginas de desambiguação', 'Desambiguar', 'Desambiguações' ),
+	'Userlogin'                 => array( 'Entrar', 'Login' ),
+	'Userlogout'                => array( 'Sair', 'Logout' ),
+	'CreateAccount'             => array( 'Criar conta' ),
+	'Preferences'               => array( 'Preferências' ),
+	'Watchlist'                 => array( 'Páginas vigiadas', 'Artigos vigiados', 'Vigiados' ),
+	'Recentchanges'             => array( 'Mudanças recentes', 'Recentes' ),
+	'Upload'                    => array( 'Carregar imagem', 'Carregar ficheiro', 'Carregar arquivo', 'Enviar' ),
+	'Listfiles'                 => array( 'Lista de imagens', 'Lista de ficheiros', 'Lista de arquivos' ),
+	'Newimages'                 => array( 'Imagens novas', 'Ficheiros novos', 'Arquivos novos' ),
+	'Listusers'                 => array( 'Lista de usuários', 'Lista de utilizadores' ),
+	'Listgrouprights'           => array( 'Listar privilégios de grupos' ),
+	'Statistics'                => array( 'Estatísticas' ),
+	'Randompage'                => array( 'Aleatória', 'Aleatório', 'Página aleatória', 'Artigo aleatório' ),
+	'Lonelypages'               => array( 'Páginas órfãs', 'Artigos órfãos', 'Páginas sem afluentes', 'Artigos sem afluentes' ),
+	'Uncategorizedpages'        => array( 'Páginas sem categorias', 'Artigos sem categorias' ),
+	'Uncategorizedcategories'   => array( 'Categorias sem categorias' ),
+	'Uncategorizedimages'       => array( 'Imagens sem categorias', 'Ficheiros sem categorias', 'Arquivos sem categorias' ),
+	'Uncategorizedtemplates'    => array( 'Predefinições não categorizadas', 'Predefinições sem categorias' ),
+	'Unusedcategories'          => array( 'Categorias não utilizadas', 'Categorias sem uso' ),
+	'Unusedimages'              => array( 'Imagens sem uso', 'Imagens não utilizadas', 'Ficheiros sem uso', 'Ficheiros não utilizados', 'Arquivos sem uso', 'Arquivos não utilizados' ),
+	'Wantedpages'               => array( 'Páginas em falta', 'Artigos em falta', 'Páginas pedidas', 'Artigos pedidos' ),
+	'Wantedcategories'          => array( 'Categorias em falta', 'Categorias inexistentes' ),
+	'Wantedfiles'               => array( 'Arquivos em falta', 'Ficheiros em falta', 'Imagens em falta' ),
+	'Wantedtemplates'           => array( 'Predefinições em falta' ),
+	'Mostlinked'                => array( 'Páginas com mais afluentes', 'Artigos com mais afluentes' ),
+	'Mostlinkedcategories'      => array( 'Categorias com mais afluentes' ),
+	'Mostlinkedtemplates'       => array( 'Predefinições com mais afluentes' ),
+	'Mostimages'                => array( 'Imagens com mais afluentes', 'Ficheiros com mais afluentes', 'Arquivos com mais afluentes' ),
+	'Mostcategories'            => array( 'Páginas com mais categorias', 'Artigos com mais categorias' ),
+	'Mostrevisions'             => array( 'Páginas com mais edições', 'Artigos com mais edições' ),
+	'Fewestrevisions'           => array( 'Páginas com menos edições', 'Artigos com menos edições', 'Artigos menos editados' ),
+	'Shortpages'                => array( 'Páginas curtas', 'Artigos curtos' ),
+	'Longpages'                 => array( 'Páginas longas', 'Artigos extensos' ),
+	'Newpages'                  => array( 'Páginas novas', 'Artigos novos' ),
+	'Ancientpages'              => array( 'Páginas inativas', 'Artigos inativos' ),
+	'Deadendpages'              => array( 'Páginas sem saída', 'Artigos sem saída' ),
+	'Protectedpages'            => array( 'Páginas protegidas', 'Artigos protegidos' ),
+	'Protectedtitles'           => array( 'Títulos protegidos' ),
+	'Allpages'                  => array( 'Todas as páginas', 'Todos os artigos', 'Todas páginas', 'Todos artigos' ),
+	'Prefixindex'               => array( '�ndice de prefixo', '�ndice por prefixo' ),
+	'Ipblocklist'               => array( 'Registro de bloqueios', 'IPs bloqueados', 'Utilizadores bloqueados', 'Usuários bloqueados', 'Registo de bloqueios' ),
+	'Specialpages'              => array( 'Páginas especiais' ),
+	'Contributions'             => array( 'Contribuições' ),
+	'Emailuser'                 => array( 'Contactar usuário', 'Contactar utilizador', 'Contatar usuário' ),
+	'Confirmemail'              => array( 'Confirmar e-mail', 'Confirmar email' ),
+	'Whatlinkshere'             => array( 'Páginas afluentes', 'Artigos afluentes' ),
+	'Recentchangeslinked'       => array( 'Novidades relacionadas', 'Mudanças relacionadas' ),
+	'Movepage'                  => array( 'Mover', 'Mover página', 'Mover artigo' ),
+	'Blockme'                   => array( 'Bloquear-me', 'Auto-bloqueio' ),
+	'Booksources'               => array( 'Fontes de livros' ),
+	'Categories'                => array( 'Categorias' ),
+	'Export'                    => array( 'Exportar' ),
+	'Version'                   => array( 'Versão', 'Sobre' ),
+	'Allmessages'               => array( 'Todas as mensagens', 'Todas mensagens' ),
+	'Log'                       => array( 'Registro', 'Registos', 'Registros', 'Registo' ),
+	'Blockip'                   => array( 'Bloquear', 'Bloquear IP', 'Bloquear utilizador', 'Bloquear usuário' ),
+	'Undelete'                  => array( 'Restaurar', 'Restaurar páginas eliminadas', 'Restaurar artigos eliminados' ),
+	'Import'                    => array( 'Importar' ),
+	'Lockdb'                    => array( 'Bloquear banco de dados', 'Bloquear a base de dados' ),
+	'Unlockdb'                  => array( 'Desbloquear banco de dados', 'Desbloquear a base de dados' ),
+	'Userrights'                => array( 'Privilégios', 'Direitos', 'Estatutos' ),
+	'MIMEsearch'                => array( 'Busca MIME' ),
+	'FileDuplicateSearch'       => array( 'Busca de arquivos duplicados', 'Busca de ficheiros duplicados' ),
+	'Unwatchedpages'            => array( 'Páginas não-vigiadas', 'Páginas não vigiadas', 'Artigos não-vigiados', 'Artigos não vigiados' ),
+	'Listredirects'             => array( 'Redirecionamentos', 'Lista de redireccionamentos', 'Lista de redirecionamentos', 'Redireccionamentos' ),
+	'Revisiondelete'            => array( 'Eliminar edição', 'Eliminar revisão', 'Apagar edição', 'Apagar revisão' ),
+	'Unusedtemplates'           => array( 'Predefinições sem uso', 'Predefinições não utilizadas' ),
+	'Randomredirect'            => array( 'Redirecionamento aleatório', 'Redireccionamento aleatório' ),
+	'Mypage'                    => array( 'Minha página' ),
+	'Mytalk'                    => array( 'Minha discussão' ),
+	'Mycontributions'           => array( 'Minhas contribuições', 'Minhas edições' ),
+	'Listadmins'                => array( 'Administradores', 'Admins', 'Lista de administradores', 'Lista de admins' ),
+	'Listbots'                  => array( 'Bots', 'Lista de bots' ),
+	'Popularpages'              => array( 'Páginas populares', 'Artigos populares' ),
+	'Search'                    => array( 'Busca', 'Buscar', 'Procurar', 'Pesquisar', 'Pesquisa' ),
+	'Resetpass'                 => array( 'Zerar senha', 'Repor senha' ),
+	'Withoutinterwiki'          => array( 'Páginas sem interwikis', 'Artigos sem interwikis' ),
+	'MergeHistory'              => array( 'Fundir históricos', 'Fundir edições' ),
+	'Filepath'                  => array( 'Diretório de arquivo', 'Diretório de ficheiro' ),
+	'Invalidateemail'           => array( 'Invalidar e-mail' ),
+	'Blankpage'                 => array( 'Página em branco' ),
+	'LinkSearch'                => array( 'Pesquisar links' ),
+	'DeletedContributions'      => array( 'Contribuições eliminadas', 'Edições eliminadas' ),
+);
+
+$magicWords = array(
+	'redirect'              => array( '0', '#REDIRECIONAMENTO', '#REDIRECT' ),
+	'currentmonth'          => array( '1', 'MESATUAL', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', 'NOMEDOMESATUAL', 'CURRENTMONTHNAME' ),
+	'currentday'            => array( '1', 'DIAATUAL', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'DIAATUAL2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'ANOATUAL', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'HORARIOATUAL', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'HORAATUAL', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'MESLOCAL', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
+	'localday'              => array( '1', 'DIALOCAL', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'DIALOCAL2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'HORARIOLOCAL', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'NUMERODEPAGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'NUMERODEARTIGOS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'NUMERODEARQUIVOS', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'NUMERODEUSUARIOS', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'NUMERODEEDICOES', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'NUMERODEEXIBICOES', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', 'NOMEDAPAGINA', 'PAGENAME' ),
+	'namespace'             => array( '1', 'DOMINIO', 'NAMESPACE' ),
 );
 
 $messages = array(
@@ -189,17 +216,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Esconder as minhas edições da lista de artigos vigiados',
 'tog-watchlisthidebots'       => 'Esconder edições efetuadas por robôs da lista de artigos vigiados',
 'tog-watchlisthideminor'      => 'Esconder edições menores da lista de artigos vigiados',
+'tog-watchlisthideliu'        => 'Ocultar edições de usuários autenticados da lista de vigiados',
+'tog-watchlisthideanons'      => 'Ocultar edições de usuários anônimos da lista de vigiados',
 'tog-nolangconversion'        => 'Desabilitar conversão de variantes de idioma',
 'tog-ccmeonemails'            => 'Enviar para mim cópias de e-mails que eu enviar a outros usuários',
 'tog-diffonly'                => 'Não mostrar o conteúdo da página ao comparar duas edições',
 'tog-showhiddencats'          => 'Exibir categorias ocultas',
+'tog-norollbackdiff'          => 'Omitir diferenças depois de desfazer edições em bloco',
 
 'underline-always'  => 'Sempre',
 'underline-never'   => 'Nunca',
 'underline-default' => 'Padrão do navegador',
 
-'skinpreview' => '(Pré-visualizar)',
-
 # Dates
 'sunday'        => 'Domingo',
 'monday'        => 'Segunda-feira',
@@ -215,9 +243,9 @@ $messages = array(
 'thu'           => 'Qui',
 'fri'           => 'Sex',
 'sat'           => 'Sáb',
-'january'       => 'Janeiro',
-'february'      => 'Fevereiro',
-'march'         => 'Março',
+'january'       => 'janeiro',
+'february'      => 'fevereiro',
+'march'         => 'março',
 'april'         => 'Abril',
 'may_long'      => 'Maio',
 'june'          => 'Junho',
@@ -227,9 +255,9 @@ $messages = array(
 'october'       => 'Outubro',
 'november'      => 'Novembro',
 'december'      => 'Dezembro',
-'january-gen'   => 'Janeiro',
-'february-gen'  => 'Fevereiro',
-'march-gen'     => 'Março',
+'january-gen'   => 'janeiro',
+'february-gen'  => 'fevereiro',
+'march-gen'     => 'março',
 'april-gen'     => 'Abril',
 'may-gen'       => 'Maio',
 'june-gen'      => 'Junho',
@@ -293,7 +321,7 @@ $messages = array(
 'mytalk'         => 'Minha discussão',
 'anontalk'       => 'Discussão para este IP',
 'navigation'     => 'Navegação',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadados:',
@@ -330,14 +358,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discussão',
 'specialpage'       => 'Página especial',
 'personaltools'     => 'Ferramentas pessoais',
-'postcomment'       => 'Envie um comentário',
+'postcomment'       => 'Nova seção',
 'articlepage'       => 'Ver página de conteúdo',
 'talk'              => 'Discussão',
 'views'             => 'Acessos',
 'toolbox'           => 'Ferramentas',
 'userpage'          => 'Ver página de usuário',
 'projectpage'       => 'Ver página de projeto',
-'imagepage'         => 'Ver página de imagens',
+'imagepage'         => 'Ver página do arquivo',
 'mediawikipage'     => 'Ver página de mensagens',
 'templatepage'      => 'Ver página de predefinições',
 'viewhelppage'      => 'Ver página de ajuda',
@@ -356,8 +384,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Sobre',
 'aboutpage'            => 'Project:Sobre',
-'bugreports'           => 'Relatar bugs',
-'bugreportspage'       => 'Project:Relatos_de_bugs',
 'copyright'            => 'Conteúdo disponível sob $1.',
 'copyrightpagename'    => 'Direitos de autor de {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Direitos_de_autor',
@@ -380,9 +406,7 @@ $messages = array(
 
 'badaccess'        => 'Erro de permissão',
 'badaccess-group0' => 'Você não está autorizado a executar a ação requisitada.',
-'badaccess-group1' => 'A ação que você requisitou está limitada a usuários do grupo $1.',
-'badaccess-group2' => 'A ação que você requisitou está limitada a usuários de um dos seguintes grupos: $1.',
-'badaccess-groups' => 'A ação que você requisitou está limitada a usuários de um dos seguintes grupos: $1.',
+'badaccess-groups' => 'A ação que você requisitou está limitada a usuários {{PLURAL:$2|do grupo|de um dos seguintes grupos}}: $1.',
 
 'versionrequired'     => 'É necessária a versão $1 do MediaWiki',
 'versionrequiredtext' => 'Esta página requer a versão $1 do MediaWiki para poder ser utilizada. Consulte [[Special:Version|a página sobre a versão do sistema]].',
@@ -396,6 +420,8 @@ $messages = array(
 'editsection'             => 'editar',
 'editold'                 => 'editar',
 'viewsourceold'           => 'ver código',
+'editlink'                => 'editar',
+'viewsourcelink'          => 'ver fonte',
 'editsectionhint'         => 'Editar secção: $1',
 'toc'                     => 'Tabela de conteúdo',
 'showtoc'                 => 'mostrar',
@@ -410,13 +436,13 @@ $messages = array(
 'site-atom-feed'          => 'Feed Atom $1',
 'page-rss-feed'           => 'Feed RSS de "$1"',
 'page-atom-feed'          => 'Feed Atom de "$1"',
-'red-link-title'          => '$1 (ainda não escrito)',
+'red-link-title'          => '$1 (página não existe)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Página',
 'nstab-user'      => 'Página de usuário',
 'nstab-media'     => 'Página de mídia',
-'nstab-special'   => 'Especial',
+'nstab-special'   => 'Página especial',
 'nstab-project'   => 'Página de projeto',
 'nstab-image'     => 'Arquivo',
 'nstab-mediawiki' => 'Mensagem',
@@ -426,7 +452,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Ação inexistente',
-'nosuchactiontext'  => 'A ação especificada pela URL não é reconhecida pelo MediaWiki.',
+'nosuchactiontext'  => 'A ação especificada pela URL é inválida.
+Você deve ter se enganado ao digitar a URL, ou seguiu uma ligação incorreta.
+Isto também pode indicar um erro no(a) {{SITENAME}}.',
 'nosuchspecialpage' => 'Esta página especial não existe',
 'nospecialpagetext' => "<big>'''Você requisitou uma página especial inválida.'''</big>
 
@@ -478,7 +506,6 @@ Por favor, reporte este fato a um administrador, fazendo notar a URL.',
 'cannotdelete'         => 'Não foi possível eliminar a página ou arquivo especificado (provavelmente por já ter sido eliminada por outra pessoa.)',
 'badtitle'             => 'Título inválido',
 'badtitletext'         => 'O título de página requisitado é inválido, vazio, ou uma ligação incorreta de inter-linguagem ou título inter-wiki. Pode ser que ele contenha um ou mais caracteres que não podem ser utilizados em títulos.',
-'perfdisabled'         => 'Desculpe-nos! Esta opção foi temporariamente desabilitada devido a tornar o banco de dados lenta demais, a ponto de impossibilitar o funcionamento da {{SITENAME}}.',
 'perfcached'           => 'Os dados seguintes encontram-se na cache e podem não estar atualizados.',
 'perfcachedts'         => 'Os seguintes dados encontram-se armazenados na cache e foram atualizados pela última vez às $1.',
 'querypage-no-updates' => 'Momentaneamente as atualizações para esta página estão desativadas. Por enquanto, os dados aqui presentes não poderão ser atualizados.',
@@ -492,7 +519,7 @@ Query: $2',
 'protectedpagetext'    => 'Esta página foi protegida contra novas edições.',
 'viewsourcetext'       => 'Você pode ver e copiar o código desta página:',
 'protectedinterface'   => 'Esta página fornece texto de interface ao software e encontra-se trancada para prevenir abusos.',
-'editinginterface'     => "'''Aviso:''' Você se encontra prestes a editar uma página que é utilizada para fornecer texto de interface ao software. Alterações nesta página irão afetar a aparência da interface de usuário para outros usuários. Para traduções, considere utilizar a [http://translatewiki.net/wiki/Main_Page?setlang=pt-br Betawiki], um projeto destinado para a tradução do MediaWiki.",
+'editinginterface'     => "'''Aviso:''' Você se encontra prestes a editar uma página que é utilizada para fornecer texto de interface ao software. Alterações nesta página irão afetar a aparência da interface de usuário para outros usuários. Para traduções, considere utilizar a [http://translatewiki.net/wiki/Main_Page?setlang=pt-br translatewiki.net], um projeto destinado para a tradução do MediaWiki.",
 'sqlhidden'            => '(Consulta SQL em segundo-plano)',
 'cascadeprotected'     => 'Esta página foi protegida contra edições por estar incluída {{PLURAL:$1|na página listada|nas páginas listadas}} a seguir, ({{PLURAL:$1|página essa que está protegida|páginas essas que estão protegidas}} com a opção de "proteção progressiva" ativada):
 $2',
@@ -503,13 +530,13 @@ $2',
 Quem o protegeu foi [[User:$1|$1]], com a justificativa: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Má configuração: antivírus desconhecido: <i>$1</i>',
+'virus-badscanner'     => "Má configuração: antivírus desconhecido: ''$1''",
 'virus-scanfailed'     => 'a verificação falhou (código $1)',
 'virus-unknownscanner' => 'antivírus desconhecido:',
 
 # Login and logout pages
 'logouttitle'                => 'Desautenticar do sistema',
-'logouttext'                 => "<strong>Agora você está desautenticado.</strong>
+'logouttext'                 => "'''Agora você está desautenticado.'''
 
 Você pode continuar usando o projeto {{SITENAME}} anonimamente, ou pode [[Special:UserLogin|se autenticar novamente]] com o mesmo nome de usuário ou com um nome de usuário diferente.
 Tenha em mente que algumas páginas poderão continuar sendo exibidas como se você ainda estivesse autenticado, até que a ''cache'' de seu navegador seja limpa.",
@@ -523,7 +550,6 @@ Não se esqueça de personalizar as suas [[Special:Preferences|preferências na
 'remembermypassword'         => 'Lembrar de minha senha em outras sessões.',
 'yourdomainname'             => 'Seu domínio:',
 'externaldberror'            => 'Ocorreu um erro externo ao banco de dados durante a autenticação ou não lhe é permitido atualizar a sua conta externa.',
-'loginproblem'               => '<b>Houve um problema com a sua autenticação.</b><br />Tente novamente!',
 'login'                      => 'Entrar',
 'nav-login-createaccount'    => 'Criar uma conta ou entrar',
 'loginprompt'                => 'É necessário estar com os <i>cookies</i> ativados para poder autenticar-se na {{SITENAME}}.',
@@ -549,8 +575,8 @@ Por favor, escolha um nome diferente.',
 'yourvariant'                => 'Variante',
 'yournick'                   => 'Assinatura:',
 'badsig'                     => 'Assinatura inválida; verifique o código HTML utilizado.',
-'badsiglength'               => 'Assinatura muito longa.
-Seria necessário que possuísse menos de $1 {{PLURAL:$1|caractere|caracteres}}.',
+'badsiglength'               => 'A sua assinatura é muito longa.
+Ela deve ter menos de $1 {{PLURAL:$1|caractere|caracteres}}.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'O fornecimento de seu Nome verdadeiro é opcional, mas, caso decida o revelar, este será utilizado para lhe dar crédito pelo seu trabalho.',
 'loginerror'                 => 'Erro de autenticação',
@@ -564,8 +590,9 @@ Por favor ative-os, depois autentique-se com o seu novo nome de usuário e a sua
 'noname'                     => 'Você não colocou um nome de usuário válido.',
 'loginsuccesstitle'          => 'Login bem sucedido',
 'loginsuccess'               => "'''Agora você está ligado à {{SITENAME}} como \"\$1\"'''.",
-'nosuchuser'                 => 'O usuário de nome "$1" não existe.
-Verifique se digitou corretamente, ou [[Special:UserLogin/signup|crie uma nova conta de usuário]].',
+'nosuchuser'                 => 'Não existe nenhum utilizador com o nome "$1".
+Os nomes de utilizador são sensíveis à capitalização.
+Verifique a ortografia, ou [[Special:UserLogin/signup|crie uma nova conta]].',
 'nosuchusershort'            => 'Não existe um usuário com o nome "<nowiki>$1</nowiki>". Verifique o nome que introduziu.',
 'nouserspecified'            => 'Você precisa especificar um nome de usuário.',
 'wrongpassword'              => 'A senha que introduziu é inválida. Por favor, tente novamente.',
@@ -587,8 +614,9 @@ Antes de qualquer outro e-mail ser enviado para a sua conta, você precisará se
 'throttled-mailpassword'     => 'Um lembrete de senha já foi enviado {{PLURAL:$1|na última hora|nas últimas $1 horas}}.
 Para prevenir abusos, apenas um lembrete poderá ser enviado a cada {{PLURAL:$1|hora|$1 horas}}.',
 'mailerror'                  => 'Erro a enviar o email: $1',
-'acct_creation_throttle_hit' => 'Pedimos desculpas, mas já foram criadas $1 contas por si. Não lhe é possível criar mais nenhuma.',
-'emailauthenticated'         => 'O seu endereço de e-mail foi autenticado em $1.',
+'acct_creation_throttle_hit' => 'Visitantes deste wiki utilizando o seu endereço IP criaram {{PLURAL:$1|1 conta|$1 contas}} no último dia, o que é o máximo permitido neste período de tempo.
+Como resultado, visitantes que usam este endereço IP não podem criar mais nenhuma conta no momento.',
+'emailauthenticated'         => 'O seu endereço de e-mail foi autenticado às $3 de $2.',
 'emailnotauthenticated'      => 'O seu endereço de e-mail ainda não foi autenticado. Não lhe será enviado nenhum e-mail sobre nenhuma das seguintes funcionalidades.',
 'noemailprefs'               => 'Especifique um endereço de e-mail para que os seguintes recursos funcionem.',
 'emailconfirmlink'           => 'Confirme o seu endereço de e-mail',
@@ -599,18 +627,27 @@ Para prevenir abusos, apenas um lembrete poderá ser enviado a cada {{PLURAL:$1|
 'createaccount-text'         => 'Alguém criou uma conta de nome $2 para o seu endereço de email no wiki {{SITENAME}} ($4), tendo como senha #$3". Você deve se autenticar e alterar sua senha.
 
 Você pode ignorar esta mensagem caso a conta tenha sido criada por engano.',
+'login-throttled'            => 'Você fez muitas tentativas recentes de se autenticar com esta conta.
+Por favor aguarde antes de tentar novamente.',
 'loginlanguagelabel'         => 'Idioma: $1',
 
 # Password reset dialog
-'resetpass'               => 'Criar nova senha',
-'resetpass_announce'      => 'Você foi autenticado através de uma senha temporária. Para prosseguir, será necessário definir uma nova senha.',
-'resetpass_text'          => '<!-- Adicionar texto aqui -->',
-'resetpass_header'        => 'Alterar a senha da conta',
-'resetpass_submit'        => 'Definir senha e entrar',
-'resetpass_success'       => 'Sua senha foi alterada com sucesso! Autenticando-se...',
-'resetpass_bad_temporary' => 'Senha temporária incorreta. Pode ser que você já tenha conseguido alterar a sua senha ou pedido que uma nova senha temporária fosse gerada.',
-'resetpass_forbidden'     => 'As senhas não podem ser alteradas',
-'resetpass_missing'       => 'Sem dados no formulário.',
+'resetpass'                 => 'Alterar senha',
+'resetpass_announce'        => 'Você foi autenticado através de uma senha temporária. Para prosseguir, será necessário definir uma nova senha.',
+'resetpass_text'            => '<!-- Adicionar texto aqui -->',
+'resetpass_header'          => 'Alterar a senha da conta',
+'oldpassword'               => 'Senha antiga',
+'newpassword'               => 'Nova senha',
+'retypenew'                 => 'Reintroduza a nova senha',
+'resetpass_submit'          => 'Definir senha e entrar',
+'resetpass_success'         => 'Sua senha foi alterada com sucesso! Autenticando-se...',
+'resetpass_bad_temporary'   => 'Senha temporária incorreta. Pode ser que você já tenha conseguido alterar a sua senha ou pedido que uma nova senha temporária fosse gerada.',
+'resetpass_forbidden'       => 'As senhas não podem ser alteradas',
+'resetpass-no-info'         => 'Você precisa estar autenticado para acessar esta página diretamente.',
+'resetpass-submit-loggedin' => 'Alterar senha',
+'resetpass-wrong-oldpass'   => 'Senha temporária ou atual inválida. 
+Você pode já ter alterado com sucesso a sua senha, ou solicitado uma nova senha temporária.',
+'resetpass-temp-password'   => 'Senha temporária:',
 
 # Edit page toolbar
 'bold_sample'     => 'Texto em negrito',
@@ -635,8 +672,8 @@ Você pode ignorar esta mensagem caso a conta tenha sido criada por engano.',
 'hr_tip'          => 'Linha horizontal (use de forma moderada)',
 
 # Edit pages
-'summary'                          => 'Sumário',
-'subject'                          => 'Assunto/cabeçalho',
+'summary'                          => 'Sumário:',
+'subject'                          => 'Assunto/cabeçalho:',
 'minoredit'                        => 'Marcar como edição menor',
 'watchthis'                        => 'Vigiar esta página',
 'savearticle'                      => 'Salvar página',
@@ -648,8 +685,8 @@ Você pode ignorar esta mensagem caso a conta tenha sido criada por engano.',
 'missingsummary'                   => "'''Lembrete:''' Você não introduziu um sumário de edição. Se clicar novamente em Salvar, a sua edição será salva sem um sumário.",
 'missingcommenttext'               => 'Por favor, introduzida um comentário abaixo.',
 'missingcommentheader'             => "'''Lembrete:''' Você não introduziu um assunto/título para este comentário. Se carregar novamente em Salvar a sua edição será salva sem um título/assunto.",
-'summary-preview'                  => 'Previsão de sumário',
-'subject-preview'                  => 'Previsão de assunto/título',
+'summary-preview'                  => 'Previsão de sumário:',
+'subject-preview'                  => 'Previsão de assunto/título:',
 'blockedtitle'                     => 'O usuário está bloqueado',
 'blockedtext'                      => '<big>O seu nome de usuário ou endereço de IP foi bloqueado</big>
 
@@ -700,34 +737,36 @@ Para criá-la, começe escrevendo na caixa abaixo
 (veja [[{{MediaWiki:Helppage}}|a página de ajuda]] para mais informações).
 Se você chegou aqui por engano, apenas clique no botão '''voltar''' do seu navegador.",
 'anontalkpagetext'                 => "---- ''Esta é a página de discussão para um usuário anônimo que ainda não criou uma conta ou que não a usa, de forma que temos de utilizar o endereço de IP para identificá-lo(a). Tal endereço de IP pode ser compartilhado por vários usuários. Se você é um usuário anônimo e acha que comentários irrelevantes foram direcionados a você, por gentileza, [[Special:UserLogin/signup|crie uma conta]] ou [[Special:UserLogin|autentique-se]], a fim de evitar futuras confusões com outros usuários anônimos.''",
-'noarticletext'                    => 'Não existe atualmente texto nesta página; você pode [[Special:Search/{{PAGENAME}}|pesquisar pelo título desta página em outras páginas]] ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página].',
+'noarticletext'                    => 'Atualmente não existe  texto nesta página.
+Você pode [[Special:Search/{{PAGENAME}}|pesquisar pelo título desta página]] em outras páginas <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} buscar nos registros relacionados],
+ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página]</span>.',
 'userpage-userdoesnotexist'        => 'A conta "$1" não se encontra registrada. Por gentileza, verifique se deseja mesmo criar/editar esta página.',
 'clearyourcache'                   => "'''Nota:''' Após salvar, terá de limpar a cache do seu navegador para ver as alterações.'''
 '''Mozilla / Firefox / Safari:''' pressione ''Shift'' enquanto clica em ''Recarregar'', ou pressione ou ''Ctrl-F5'' ou ''Ctrl-R'' (''Command-R'' para Macintosh); '''Konqueror:''': clique no botão ''Recarregar'' ou pressione ''F5''; '''Opera:''' limpe a sua cache em ''Ferramentas → Preferências'' (''Tools → Preferences''); '''Internet Explorer:''' pressione ''Ctrl'' enquanto clica em ''Recarregar'' ou pressione ''Ctrl-F5'';",
-'usercssjsyoucanpreview'           => '<strong>Dica:</strong> Utilize o botão "Mostrar previsão" para testar seu novo CSS/JS antes de salvar.',
+'usercssjsyoucanpreview'           => "'''Dica:''' Utilize o botão \"Mostrar previsão\" para testar seu novo CSS/JS antes de salvar.",
 'usercsspreview'                   => "'''Lembre-se que está apenas prevendo o seu CSS particular.'''
 '''Ele ainda não foi salvo!'''",
 'userjspreview'                    => "'''Lembre-se que está apenas testando/prevendo o seu JavaScript particular e que ele ainda não foi salvo!'''",
 'userinvalidcssjstitle'            => "'''Aviso:''' Não existe um tema \"\$1\". Lembre-se que as páginas .css e  .js utilizam um título em minúsculas, exemplo: {{ns:user}}:Alguém/monobook.css aposto a {{ns:user}}:Alguém/Monobook.css.",
 'updated'                          => '(Atualizado)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => '<strong>Isto é apenas uma previsão.
-As modificações ainda não foram salvas!</strong>',
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Isto é apenas uma previsão.
+As modificações ainda não foram salvas!'''",
 'previewconflict'                  => 'Esta previsão reflete o texto que está na área de edição acima e como ele aparecerá se você escolher salvar.',
-'session_fail_preview'             => '<strong>Pedimos desculpas, mas não foi possível processar a sua edição devido à perda de dados da sua sessão.
+'session_fail_preview'             => "'''Pedimos desculpas, mas não foi possível processar a sua edição devido à perda de dados da sua sessão.
 Por favor tente novamente.
-Caso continue não funcionando, tente [[Special:UserLogout|sair]] e voltar a entrar na sua conta.</strong>',
-'session_fail_preview_html'        => "<strong>Desculpe-nos! Não foi possível processar a sua edição devido a uma perda de dados de sessão.</strong>
+Caso continue não funcionando, tente [[Special:UserLogout|sair]] e voltar a entrar na sua conta.'''",
+'session_fail_preview_html'        => "'''Desculpe-nos! Não foi possível processar a sua edição devido a uma perda de dados de sessão.'''
 
 ''Como o projeto {{SITENAME}} possui HTML bruto ativo, a previsão não será exibida, como uma precaução contra ataques por JavaScript.''
 
-<strong>Se esta é uma tentativa de edição legítima, por favor tente novamente.
-Caso continue não funcionando, tente [[Special:UserLogout|desautenticar-se]] e voltar a entrar na sua conta.</strong>",
-'token_suffix_mismatch'            => '<strong>A sua edição foi rejeitada uma vez que seu software de navegação mutilou os sinais de pontuação do sinal de edição. A edição foi rejeitada para evitar perdas no texto da página.
-Isso acontece ocasionalmente quando se usa um serviço de proxy anonimizador mal configurado.</strong>',
+'''Se esta é uma tentativa de edição legítima, por favor tente novamente.
+Caso continue não funcionando, tente [[Special:UserLogout|desautenticar-se]] e voltar a entrar na sua conta.'''",
+'token_suffix_mismatch'            => "'''A sua edição foi rejeitada uma vez que seu software de navegação mutilou os sinais de pontuação do sinal de edição. A edição foi rejeitada para evitar perdas no texto da página.
+Isso acontece ocasionalmente quando se usa um serviço de proxy anonimizador mal configurado.'''",
 'editing'                          => 'Editando $1',
 'editingsection'                   => 'Editando $1 (seção)',
-'editingcomment'                   => 'Editando $1 (comentário)',
+'editingcomment'                   => 'Editando $1 (nova seção)',
 'editconflict'                     => 'Conflito de edição: $1',
 'explainconflict'                  => 'Alguém mudou a página enquanto você a estava editando.
 A área de texto acima mostra o texto original.
@@ -736,25 +775,27 @@ Você terá que mesclar suas modificações no texto existente.
 <b>SOMENTE</b> o texto na área acima será salvo quando você pressionar "Salvar página".<br />',
 'yourtext'                         => 'Seu texto',
 'storedversion'                    => 'Versão guardada',
-'nonunicodebrowser'                => '<strong>AVISO: O seu navegador não é compatível com as especificações unicode. Um contorno terá de ser utilizado para permitir que você possa editar com segurança os artigos: os caracteres não-ASCII aparecerão na caixa de edição no formato de códigos hexadecimais.</strong>',
-'editingold'                       => '<strong>CUIDADO: Você está editando uma revisão desatualizada deste artigo.
-Se você salvá-lo, todas as mudanças feitas a partir desta revisão serão perdidas.</strong>',
+'nonunicodebrowser'                => "'''AVISO: O seu navegador não é compatível com as especificações unicode. Um contorno terá de ser utilizado para permitir que você possa editar com segurança os artigos: os caracteres não-ASCII aparecerão na caixa de edição no formato de códigos hexadecimais.'''",
+'editingold'                       => "'''CUIDADO: Você está editando uma revisão desatualizada deste artigo.
+Se você salvá-lo, todas as mudanças feitas a partir desta revisão serão perdidas.'''",
 'yourdiff'                         => 'Diferenças',
-'copyrightwarning'                 => 'Por favor, note que todas as suas contribuições em {{SITENAME}} são consideradas como lançadas nos termos da licença $2 (veja $1 para detalhes). Se não deseja que o seu texto seja inexoravelmente editado e redistribuído de tal forma, não o envie.<br />
+'copyrightwarning'                 => "Por favor, note que todas as suas contribuições em {{SITENAME}} são consideradas como lançadas nos termos da licença $2 (veja $1 para detalhes). Se não deseja que o seu texto seja inexoravelmente editado e redistribuído de tal forma, não o envie.<br />
 Você está, ao mesmo tempo, garantindo-nos que isto é algo escrito por você mesmo ou algo copiado de uma fonte de textos em domínio público ou similarmente de teor livre.
-<strong>NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS AUTORAIS SEM A DEVIDA PERMISSÃO!</strong>',
-'copyrightwarning2'                => 'Por favor, note que todas as suas contribuições em {{SITENAME}} podem ser editadas, alteradas ou removidas por outros contribuidores. Se você não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />
+'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS AUTORAIS SEM A DEVIDA PERMISSÃO!'''",
+'copyrightwarning2'                => "Por favor, note que todas as suas contribuições em {{SITENAME}} podem ser editadas, alteradas ou removidas por outros contribuidores. Se você não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />
 Você está, ao mesmo tempo, a garantir-nos que isto é algo escrito por si, ou algo copiado de alguma fonte de textos em domínio público ou similarmente de teor livre (veja $1 para detalhes).
-<strong>NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!</strong>',
-'longpagewarning'                  => '<strong>CUIDADO: Esta página tem $1 kilobytes; alguns browsers podem ter problemas ao editar páginas maiores que 32 kb.
-Por gentileza, considere quebrar a página em sessões menores.</strong>',
-'longpageerror'                    => '<strong>ERRO: O texto de página que você submeteu tem mais de $1 kilobytes em tamanho, que é maior que o máximo de $2 kilobytes. A página não pode ser salva.</strong>',
-'readonlywarning'                  => '<strong>CUIDADO: O banco de dados está sendo bloqueado para manutenção.
-No momento não é possível salvar suas edições. Você pode copiar e colar o texto em um arquivo de texto e salvá-lo em seu computador para adicioná-lo ao wiki mais tarde.</strong>',
-'protectedpagewarning'             => '<strong>CUIDADO: Apenas os usuários com privilégios de sysop (Administradores) podem editar esta página pois ela foi bloqueada.</strong>',
+'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!'''",
+'longpagewarning'                  => "'''CUIDADO: Esta página tem $1 kilobytes; alguns browsers podem ter problemas ao editar páginas maiores que 32 kb.
+Por gentileza, considere quebrar a página em sessões menores.'''",
+'longpageerror'                    => "'''ERRO: O texto de página que você submeteu tem mais de $1 kilobytes em tamanho, que é maior que o máximo de $2 kilobytes. A página não pode ser salva.'''",
+'readonlywarning'                  => "'''AVISO: O banco de dados foi bloqueado para manutenção; você não poderá salvar a sua edição neste momento.
+Pode, no entanto, copiar o seu texto num editor externo e guardá-lo para posterior envio.'''
+
+Quem bloqueou o banco de dados forneceu a seguinte justificativa: $1",
+'protectedpagewarning'             => "'''CUIDADO: Apenas os usuários com privilégios de sysop (Administradores) podem editar esta página pois ela foi bloqueada.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Esta página foi protegida, sendo que apenas usuários registrados poderão editá-la.",
 'cascadeprotectedwarning'          => "'''Atenção:''' Esta página se encontra protegida; apenas {{int:group-sysop}} podem editá-la, uma vez que se encontra incluída {{PLURAL:\$1|na seguinte página protegida|nas seguintes páginas protegidas}} com a \"proteção progressiva\":",
-'titleprotectedwarning'            => '<strong>ATENÇÃO: Esta página foi protegida, apenas alguns usuários poderão criá-la.</strong>',
+'titleprotectedwarning'            => "'''ATENÇÃO: Esta página foi protegida, [[Special:ListGroupRights|privilégios específicos]] são necessários para criá-la",
 'templatesused'                    => 'Predefinições utilizadas nesta página:',
 'templatesusedpreview'             => 'Predefinições utilizadas nesta previsão:',
 'templatesusedsection'             => 'Predefinições utilizadas nesta seção:',
@@ -773,17 +814,29 @@ Volte à tela anterior e edite uma página já existente, ou [[Special:UserLogin
 
 Certifique-se de que seja adequado prosseguir editando esta página.
 O registro de eliminação desta página é exibido a seguir, para sua comodidade:",
+'deleted-notice'                   => 'Esta página foi eliminada. O registro de eliminações para esta página é disponibilizado abaixo, para referência.',
+'deletelog-fulllog'                => 'Ver registro completo',
+'edit-hook-aborted'                => "Edição abortada por ''hook''.
+Ele não deu nenhuma explicação.",
+'edit-gone-missing'                => 'Não foi possível atualizar a página.
+Ela parece ter sido eliminada.',
+'edit-conflict'                    => 'Conflito de edição.',
+'edit-no-change'                   => 'A sua edição foi ignorada, uma vez que o texto não sofreu alterações.',
+'edit-already-exists'              => 'Não foi possível criar uma nova página.
+Ela já existia.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Aviso: Esta página contém muitas chamadas a funções do analisador "parser".
 
-Deveria ter menos de $2, e neste momento existem $1.',
+Deveria ter menos de $2 {{PLURAL:$2|chamada|chamadas}}. Neste momento {{PLURAL:$1|há $1 chamada|existem $1 chamadas}}.',
 'expensive-parserfunction-category'       => 'Páginas com muitas chamadas a funções do analisador "parser"',
 'post-expand-template-inclusion-warning'  => 'Aviso: O tamanho de inclusão de predefinições é muito grande, algumas predefinições não serão incluídas.',
 'post-expand-template-inclusion-category' => 'Páginas onde o tamanho de inclusão de predefinições é excedido',
 'post-expand-template-argument-warning'   => 'Aviso: Esta página contém pelo menos um argumento de predefinição com um tamanho muito grande.
 Estes argumentos foram omitidos.',
 'post-expand-template-argument-category'  => 'Páginas com omissões de argumentos em predefinições',
+'parser-template-loop-warning'            => 'Ciclo de predefinições detectado: [[$1]]',
+'parser-template-recursion-depth-warning' => 'O limite de profundidade de recursividade de predefinição foi ultrapassado ($1)',
 
 # "Undo" feature
 'undo-success' => 'A edição pôde ser desfeita. Por gentileza, verifique o comparativo a seguir para se certificar de que é isto que deseja fazer, salvando as alterações após ter terminado de revisá-las.',
@@ -798,30 +851,29 @@ Estes argumentos foram omitidos.',
 A justificativa apresentada por $3 foi ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Ver registros para esta página',
-'nohistory'           => 'Não há histórico de revisões para esta página.',
-'revnotfound'         => 'Revisão não encontrada',
-'revnotfoundtext'     => 'A antiga revisão da página que você está procurando não pode ser encontrada.
-Por favor verifique a URL que você usou para acessar esta página.',
-'currentrev'          => 'Revisão atual',
-'revisionasof'        => 'Edição de $1',
-'revision-info'       => 'Edição feita às $1 por $2',
-'previousrevision'    => '� Versão anterior',
-'nextrevision'        => 'Versão posterior →',
-'currentrevisionlink' => 'ver versão atual',
-'cur'                 => 'atu',
-'next'                => 'prox',
-'last'                => 'ult',
-'page_first'          => 'primeira',
-'page_last'           => 'última',
-'histlegend'          => 'Seleção para diferença: marque as caixas em uma das versões que deseja comparar e clique no botão.<br />
+'viewpagelogs'           => 'Ver registros para esta página',
+'nohistory'              => 'Não há histórico de revisões para esta página.',
+'currentrev'             => 'Revisão atual',
+'currentrev-asof'        => 'Edição atual tal como $1',
+'revisionasof'           => 'Edição de $1',
+'revision-info'          => 'Edição feita às $1 por $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Versão anterior',
+'nextrevision'           => 'Versão posterior →',
+'currentrevisionlink'    => 'ver versão atual',
+'cur'                    => 'atu',
+'next'                   => 'prox',
+'last'                   => 'ult',
+'page_first'             => 'primeira',
+'page_last'              => 'última',
+'histlegend'             => 'Seleção para diferença: marque as caixas em uma das versões que deseja comparar e clique no botão.<br />
 Legenda: (atu) = diferenças da versão atual,
 (ult) = diferença da versão anterior, m = edição menor',
-'deletedrev'          => '[eliminada]',
-'histfirst'           => 'Mais antigas',
-'histlast'            => 'Mais recentes',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vazio)',
+'history-fieldset-title' => 'Navegar pelo histórico',
+'deletedrev'             => '[eliminada]',
+'histfirst'              => 'Mais antigas',
+'histlast'               => 'Mais recentes',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vazio)',
 
 # Revision feed
 'history-feed-title'          => 'Histórico de revisão',
@@ -906,6 +958,7 @@ Certifique-se de que tal alteração manterá a continuidade das ações.',
 'mergehistory-invalid-destination' => 'A página de destino precisa ser um título válido.',
 'mergehistory-autocomment'         => '[[:$1]] fundido em [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] fundido em [[:$2]]: $3',
+'mergehistory-same-destination'    => 'As páginas de origem e de destino não podem ser as mesmas',
 
 # Merge log
 'mergelog'           => 'Registro de fusão de históricos',
@@ -918,120 +971,201 @@ Certifique-se de que tal alteração manterá a continuidade das ações.',
 'difference'              => '(Diferença entre revisões)',
 'lineno'                  => 'Linha $1:',
 'compareselectedversions' => 'Compare as versões selecionadas',
+'visualcomparison'        => 'Comparação visual',
+'wikicodecomparison'      => 'Comparação de wikitexto',
 'editundo'                => 'desfazer',
 'diff-multi'              => '({{PLURAL:$1|uma edição intermediária não está sendo exibida|$1 edições intermediárias não estão sendo exibidas}}.)',
+'diff-movedto'            => 'movido para $1',
+'diff-styleadded'         => 'estilo $1 adicionado',
+'diff-added'              => '$1 adicionado',
+'diff-changedto'          => 'alterado para $1',
+'diff-movedoutof'         => 'movido para fora de $1',
+'diff-styleremoved'       => 'estilo $1 removido',
+'diff-removed'            => '$1 removido',
+'diff-changedfrom'        => 'alterado de $1',
+'diff-src'                => 'fonte',
+'diff-withdestination'    => 'com destino $1',
+'diff-with'               => '&#32;com $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'largura',
+'diff-height'             => 'altura',
+'diff-p'                  => "um '''parágrafo'''",
+'diff-blockquote'         => "uma '''citação'''",
+'diff-h1'                 => "um '''cabeçalho (de nível 1)'''",
+'diff-h2'                 => "um '''cabeçalho (de nível 2)'''",
+'diff-h3'                 => "um '''cabeçalho (de nível 3)'''",
+'diff-h4'                 => "um '''cabeçalho (de nível 4)'''",
+'diff-h5'                 => "um '''cabeçalho (de nível 5)'''",
+'diff-pre'                => "um '''bloco pré-formatado'''",
+'diff-div'                => "uma '''divisão'''",
+'diff-ul'                 => "uma '''lista sem ordenação'''",
+'diff-ol'                 => "uma '''lista ordenada'''",
+'diff-li'                 => "um '''item de lista'''",
+'diff-table'              => "uma '''tabela'''",
+'diff-tbody'              => "um '''conteúdo de tabela'''",
+'diff-tr'                 => "uma '''linha'''",
+'diff-td'                 => "uma '''célula'''",
+'diff-th'                 => "um '''cabeçalho'''",
+'diff-br'                 => "uma '''quebra de linha'''",
+'diff-hr'                 => "uma '''linha horizontal'''",
+'diff-code'               => "um '''bloco de código computacional'''",
+'diff-dl'                 => "uma '''lista de definições'''",
+'diff-dt'                 => "uma '''definição do termo'''",
+'diff-dd'                 => "uma '''definição'''",
+'diff-input'              => "uma '''entrada de dados'''",
+'diff-form'               => "um '''formulário'''",
+'diff-img'                => "uma '''imagem'''",
+'diff-span'               => "um '''''span'''''",
+'diff-a'                  => "uma '''ligação'''",
+'diff-i'                  => "'''itálico'''",
+'diff-b'                  => "'''negrito'''",
+'diff-strong'             => "'''forte'''",
+'diff-em'                 => "'''ênfase'''",
+'diff-font'               => "'''fonte'''",
+'diff-big'                => "'''grande'''",
+'diff-del'                => "'''apagado'''",
+'diff-tt'                 => "'''largura fixa'''",
+'diff-sub'                => "'''subscrito'''",
+'diff-sup'                => "'''sobrescrito'''",
+'diff-strike'             => "'''riscado'''",
 
 # Search results
-'searchresults'             => 'Resultados de pesquisa',
-'searchresulttext'          => 'Para mais informações de como pesquisar na {{SITENAME}}, consulte [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Você pesquisou por "[[:$1]]"',
-'searchsubtitleinvalid'     => 'Você pesquisou por "$1"',
-'noexactmatch'              => "'''Não existe uma página com o título \"\$1\".''' Você pode [[:\$1|criar tal página]].",
-'noexactmatch-nocreate'     => "'''Não há uma página intitulada como \"\$1\".'''",
-'toomanymatches'            => 'Foram retornados muitos resultados. Por favor, tente um filtro de pesquisa diferente',
-'titlematches'              => 'Resultados nos títulos das páginas',
-'notitlematches'            => 'Nenhum título de página coincide',
-'textmatches'               => 'Resultados dos textos das páginas',
-'notextmatches'             => 'Nenhum texto nas páginas coincide',
-'prevn'                     => 'anteriores $1',
-'nextn'                     => 'próximos $1',
-'viewprevnext'              => 'Ver ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 palavra|$2 palavras}})',
-'search-result-score'       => 'Relevância: $1%',
-'search-redirect'           => '(redirecionamento para $1)',
-'search-section'            => '(seção $1)',
-'search-suggest'            => 'Será que quis dizer: $1',
-'search-interwiki-caption'  => 'Projetos irmãos',
-'search-interwiki-default'  => 'Resultados de $1:',
-'search-interwiki-more'     => '(mais)',
-'search-mwsuggest-enabled'  => 'com sugestões',
-'search-mwsuggest-disabled' => 'sem sugestões',
-'search-relatedarticle'     => 'Relacionado',
-'mwsuggest-disable'         => 'Desativar sugestões AJAX',
-'searchrelated'             => 'relacionados',
-'searchall'                 => 'todos',
-'showingresults'            => "A seguir {{PLURAL:$1|é mostrado '''um''' resultado|são mostrados até '''$1''' resultados}}, iniciando no '''$2'''º.",
-'showingresultsnum'         => "A seguir {{PLURAL:$3|é mostrado '''um''' resultado|são mostrados '''$3''' resultados}}, iniciando com o '''$2'''º.",
-'showingresultstotal'       => "Exibindo {{PLURAL:$3|o resultado '''$1''' de '''$3'''|os resultados '''$1 a $2''' de '''$3'''}}",
-'nonefound'                 => "'''Nota''': apenas alguns espaços nominais são pesquisados por padrão. Tente utilizar o prefixo ''all:'' em sua busca, para pesquisar por todos os conteúdos desta wiki (inclusive páginas de discussão, predefinições etc), ou mesmo, utilizando o espaço nominal desejado como prefixo.",
-'powersearch'               => 'Pesquisa avançada',
-'powersearch-legend'        => 'Pesquisa avançada',
-'powersearch-ns'            => 'Pesquisar nos espaços nominais:',
-'powersearch-redir'         => 'Listar redirecionamentos',
-'powersearch-field'         => 'Pesquisar',
-'search-external'           => 'Pesquisa externa',
-'searchdisabled'            => 'O motor de pesquisa na {{SITENAME}} foi desativado por motivos de desempenho. Enquanto isso pode fazer a sua pesquisa através do Google ou do Yahoo!.<br />
+'searchresults'                    => 'Resultados de pesquisa',
+'searchresults-title'              => 'Resultados da pesquisa por "$1"',
+'searchresulttext'                 => 'Para mais informações de como pesquisar na {{SITENAME}}, consulte [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Você pesquisou por \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|páginas iniciadas por "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|páginas que apontam para "$1"]])',
+'searchsubtitleinvalid'            => 'Você pesquisou por "$1"',
+'noexactmatch'                     => "'''Não existe uma página com o título \"\$1\".''' Você pode [[:\$1|criar tal página]].",
+'noexactmatch-nocreate'            => "'''Não há uma página intitulada como \"\$1\".'''",
+'toomanymatches'                   => 'Foram retornados muitos resultados. Por favor, tente um filtro de pesquisa diferente',
+'titlematches'                     => 'Resultados nos títulos das páginas',
+'notitlematches'                   => 'Nenhum título de página coincide',
+'textmatches'                      => 'Resultados dos textos das páginas',
+'notextmatches'                    => 'Nenhum texto nas páginas coincide',
+'prevn'                            => 'anteriores $1',
+'nextn'                            => 'próximos $1',
+'viewprevnext'                     => 'Ver ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opções de pesquisa',
+'searchmenu-exists'                => "*'''Há uma página chamada \"[[\$1]]\" nesta wiki'''",
+'searchmenu-new'                   => "'''Criar a página \"[[:\$1|\$1]]\" nesta wiki!'''",
+'searchhelp-url'                   => 'Help:Conteúdos',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Navegue pelas páginas com este prefixo]]',
+'searchprofile-articles'           => 'Páginas de conteúdo',
+'searchprofile-articles-and-proj'  => 'Páginas de conteúdo e do projeto',
+'searchprofile-project'            => 'Páginas do projeto',
+'searchprofile-images'             => 'Arquivos',
+'searchprofile-everything'         => 'Tudo',
+'searchprofile-advanced'           => 'Avançado',
+'searchprofile-articles-tooltip'   => 'Pesquisar em $1',
+'searchprofile-project-tooltip'    => 'Pesquisar em $1',
+'searchprofile-images-tooltip'     => 'Pesquisar arquivos',
+'searchprofile-everything-tooltip' => 'Pesquisar em todo o conteúdo (incluindo páginas de discussão)',
+'searchprofile-advanced-tooltip'   => 'Pesquisar nos espaços nominais personalizados',
+'prefs-search-nsdefault'           => 'Pesquisar usando as definições padrão:',
+'prefs-search-nscustom'            => 'Pesquisar domínios personalizados:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 palavra|$2 palavras}})',
+'search-result-score'              => 'Relevância: $1%',
+'search-redirect'                  => '(redirecionamento para $1)',
+'search-section'                   => '(seção $1)',
+'search-suggest'                   => 'Será que quis dizer: $1',
+'search-interwiki-caption'         => 'Projetos irmãos',
+'search-interwiki-default'         => 'Resultados de $1:',
+'search-interwiki-more'            => '(mais)',
+'search-mwsuggest-enabled'         => 'com sugestões',
+'search-mwsuggest-disabled'        => 'sem sugestões',
+'search-relatedarticle'            => 'Relacionado',
+'mwsuggest-disable'                => 'Desativar sugestões AJAX',
+'searchrelated'                    => 'relacionados',
+'searchall'                        => 'todos',
+'showingresults'                   => "A seguir {{PLURAL:$1|é mostrado '''um''' resultado|são mostrados até '''$1''' resultados}}, iniciando no '''$2'''º.",
+'showingresultsnum'                => "A seguir {{PLURAL:$3|é mostrado '''um''' resultado|são mostrados '''$3''' resultados}}, iniciando com o '''$2'''º.",
+'showingresultstotal'              => "Exibindo {{PLURAL:$4|o resultado '''$1''' de '''$3'''|os resultados '''$1 a $2''' de '''$3'''}}",
+'nonefound'                        => "'''Nota''': apenas alguns espaços nominais são pesquisados por padrão. Tente utilizar o prefixo ''all:'' em sua busca, para pesquisar por todos os conteúdos desta wiki (inclusive páginas de discussão, predefinições etc), ou mesmo, utilizando o espaço nominal desejado como prefixo.",
+'search-nonefound'                 => 'Não houve resultados para a pesquisa.',
+'powersearch'                      => 'Pesquisa avançada',
+'powersearch-legend'               => 'Pesquisa avançada',
+'powersearch-ns'                   => 'Pesquisar nos espaços nominais:',
+'powersearch-redir'                => 'Listar redirecionamentos',
+'powersearch-field'                => 'Pesquisar',
+'search-external'                  => 'Pesquisa externa',
+'searchdisabled'                   => 'O motor de pesquisa na {{SITENAME}} foi desativado por motivos de desempenho. Enquanto isso pode fazer a sua pesquisa através do Google ou do Yahoo!.<br />
 Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desatualizados.',
 
 # Preferences page
-'preferences'              => 'Preferências',
-'mypreferences'            => 'Minhas preferências',
-'prefs-edits'              => 'Número de edições:',
-'prefsnologin'             => 'Não autenticado',
-'prefsnologintext'         => 'É necessário estar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autenticado]</span> para definir as suas preferências.',
-'prefsreset'               => 'As preferências foram restauradas tal como se encontravam no banco de dados.',
-'qbsettings'               => 'Configurações da Barra Rápida',
-'qbsettings-none'          => 'Nenhuma',
-'qbsettings-fixedleft'     => 'Fixo à esquerda',
-'qbsettings-fixedright'    => 'Fixo à direita',
-'qbsettings-floatingleft'  => 'Flutuando à esquerda',
-'qbsettings-floatingright' => 'Flutuando à direita',
-'changepassword'           => 'Alterar senha',
-'skin'                     => 'Tema',
-'math'                     => 'Matemática',
-'dateformat'               => 'Formato da data',
-'datedefault'              => 'Sem preferência',
-'datetime'                 => 'Data e hora',
-'math_failure'             => 'Falhou ao verificar gramática',
-'math_unknown_error'       => 'Erro desconhecido',
-'math_unknown_function'    => 'Função desconhecida',
-'math_lexing_error'        => 'Erro léxico',
-'math_syntax_error'        => 'Erro de sintaxe',
-'math_image_error'         => 'Falha na conversão para PNG. Verifique a instalação do latex, dvips, gs e convert',
-'math_bad_tmpdir'          => 'Ocorreram problemas na criação ou escrita no diretório temporário math',
-'math_bad_output'          => 'Ocorreram problemas na criação ou escrita no diretório de resultados math',
-'math_notexvc'             => 'O executável texvc não foi encontrado. Consulte math/README para instruções da configuração.',
-'prefs-personal'           => 'Perfil de usuário',
-'prefs-rc'                 => 'Mudanças recentes',
-'prefs-watchlist'          => 'Lista de artigos vigiados',
-'prefs-watchlist-days'     => 'Dias a mostrar na lista de artigos vigiados:',
-'prefs-watchlist-edits'    => 'Número de edições mostradas na lista de vigiados expandida:',
-'prefs-misc'               => 'Diversos',
-'saveprefs'                => 'Salvar',
-'resetprefs'               => 'Eliminar as alterações não-salvas',
-'oldpassword'              => 'Senha antiga',
-'newpassword'              => 'Nova senha',
-'retypenew'                => 'Reintroduza a nova senha',
-'textboxsize'              => 'Opções de edição',
-'rows'                     => 'Linhas:',
-'columns'                  => 'Colunas:',
-'searchresultshead'        => 'Pesquisa',
-'resultsperpage'           => 'Resultados por página:',
-'contextlines'             => 'Linhas por resultado:',
-'contextchars'             => 'Contexto por linha:',
-'stub-threshold'           => 'Links para páginas de conteúdo aparecerão <a href="#" class="stub">desta forma</a> se elas possuírem menos de (bytes):',
-'recentchangesdays'        => 'Dias a serem exibidos nas Mudanças recentes:',
-'recentchangescount'       => 'Número de edições a serem exibidas nas Mudanças recentes, históricos e páginas de registros:',
-'savedprefs'               => 'As suas preferências foram salvas.',
-'timezonelegend'           => 'Fuso horário',
-'timezonetext'             => '¹Número de horas que o seu horário local difere do horário do servidor (UTC).',
-'localtime'                => 'Hora local',
-'timezoneoffset'           => 'Diferença horária¹',
-'servertime'               => 'Horário do servidor',
-'guesstimezone'            => 'Preencher a partir do navegador (browser)',
-'allowemail'               => 'Permitir email de outros usuários',
-'prefs-searchoptions'      => 'Opções de busca',
-'prefs-namespaces'         => 'Espaços nominais',
-'defaultns'                => 'Pesquisar por padrão nestes espaços nominais:',
-'default'                  => 'padrão',
-'files'                    => 'Arquivos',
+'preferences'               => 'Preferências',
+'mypreferences'             => 'Minhas preferências',
+'prefs-edits'               => 'Número de edições:',
+'prefsnologin'              => 'Não autenticado',
+'prefsnologintext'          => 'É necessário estar <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autenticado]</span> para definir as suas preferências.',
+'prefsreset'                => 'As preferências foram restauradas tal como se encontravam no banco de dados.',
+'qbsettings'                => 'Configurações da Barra Rápida',
+'qbsettings-none'           => 'Nenhuma',
+'qbsettings-fixedleft'      => 'Fixo à esquerda',
+'qbsettings-fixedright'     => 'Fixo à direita',
+'qbsettings-floatingleft'   => 'Flutuando à esquerda',
+'qbsettings-floatingright'  => 'Flutuando à direita',
+'changepassword'            => 'Alterar senha',
+'skin'                      => 'Tema',
+'skin-preview'              => 'Pré-visualizar',
+'math'                      => 'Matemática',
+'dateformat'                => 'Formato da data',
+'datedefault'               => 'Sem preferência',
+'datetime'                  => 'Data e hora',
+'math_failure'              => 'Falhou ao verificar gramática',
+'math_unknown_error'        => 'Erro desconhecido',
+'math_unknown_function'     => 'Função desconhecida',
+'math_lexing_error'         => 'Erro léxico',
+'math_syntax_error'         => 'Erro de sintaxe',
+'math_image_error'          => 'Falha na conversão para PNG. Verifique a instalação do latex, dvips, gs e convert',
+'math_bad_tmpdir'           => 'Ocorreram problemas na criação ou escrita no diretório temporário math',
+'math_bad_output'           => 'Ocorreram problemas na criação ou escrita no diretório de resultados math',
+'math_notexvc'              => 'O executável texvc não foi encontrado. Consulte math/README para instruções da configuração.',
+'prefs-personal'            => 'Perfil de usuário',
+'prefs-rc'                  => 'Mudanças recentes',
+'prefs-watchlist'           => 'Lista de artigos vigiados',
+'prefs-watchlist-days'      => 'Dias a mostrar na lista de artigos vigiados:',
+'prefs-watchlist-days-max'  => '(no máximo 7 dias)',
+'prefs-watchlist-edits'     => 'Número de edições mostradas na lista de vigiados expandida:',
+'prefs-watchlist-edits-max' => '(número máximo: 1000)',
+'prefs-misc'                => 'Diversos',
+'prefs-resetpass'           => 'Alterar senha',
+'saveprefs'                 => 'Salvar',
+'resetprefs'                => 'Eliminar as alterações não-salvas',
+'textboxsize'               => 'Opções de edição',
+'prefs-edit-boxsize'        => 'Tamanho da janela de edição.',
+'rows'                      => 'Linhas:',
+'columns'                   => 'Colunas:',
+'searchresultshead'         => 'Pesquisa',
+'resultsperpage'            => 'Resultados por página:',
+'contextlines'              => 'Linhas por resultado:',
+'contextchars'              => 'Contexto por linha:',
+'stub-threshold'            => 'Links para páginas de conteúdo aparecerão <a href="#" class="stub">desta forma</a> se elas possuírem menos de (bytes):',
+'recentchangesdays'         => 'Dias a serem exibidos nas Mudanças recentes:',
+'recentchangesdays-max'     => '(máximo: $1 {{PLURAL:$1|dia|dias}})',
+'recentchangescount'        => 'Número de edições a serem exibidas nas mudanças recentes, históricos de páginas e páginas de registos, por padrão:',
+'savedprefs'                => 'As suas preferências foram salvas.',
+'timezonelegend'            => 'Fuso horário',
+'timezonetext'              => '¹Número de horas que o seu horário local difere do horário do servidor (UTC).',
+'localtime'                 => 'Horário local:',
+'timezoneselect'            => 'Fuso horário:',
+'timezoneuseserverdefault'  => 'Usa padrão do servidor',
+'timezoneuseoffset'         => 'Outro (especifique diferença horária)',
+'timezoneoffset'            => 'Diferença horária¹',
+'servertime'                => 'Horário do servidor:',
+'guesstimezone'             => 'Preencher a partir do navegador (browser)',
+'allowemail'                => 'Permitir email de outros usuários',
+'prefs-searchoptions'       => 'Opções de busca',
+'prefs-namespaces'          => 'Espaços nominais',
+'defaultns'                 => 'Pesquisar por padrão nestes espaços nominais:',
+'default'                   => 'padrão',
+'files'                     => 'Arquivos',
 
 # User rights
 'userrights'                  => 'Gestão de privilégios de usuários', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Administrar grupos de usuários',
 'userrights-user-editname'    => 'Forneça um nome de usuário:',
 'editusergroup'               => 'Editar grupos de usuários',
-'editinguser'                 => "Modificando privilégios do usuário '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Modificando privilégios do usuário '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Editar grupos do usuário',
 'saveusergroups'              => 'Salvar grupos do usuário',
 'userrights-groupsmember'     => 'Membro de:',
@@ -1080,6 +1214,8 @@ Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desat
 'right-minoredit'            => 'Marcar edições como menores',
 'right-move'                 => 'Mover páginas',
 'right-move-subpages'        => 'Mover páginas com as suas subpáginas',
+'right-move-rootuserpages'   => 'Mover páginas raiz de usuários',
+'right-movefile'             => 'Mover arquivos',
 'right-suppressredirect'     => 'Não criar um redirecionamento do nome antigo quando uma página é movida',
 'right-upload'               => 'Carregar arquivos',
 'right-reupload'             => 'Sobrescrever um arquivo existente',
@@ -1130,9 +1266,46 @@ Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desat
 'rightslogentry' => 'foi alterado o grupo de acesso de $1 (de $2 para $3)',
 'rightsnone'     => '(nenhum)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'ler esta página',
+'action-edit'                 => 'editar esta página',
+'action-createpage'           => 'criar páginas',
+'action-createtalk'           => 'criar páginas de discussão',
+'action-createaccount'        => 'criar esta conta de usuário',
+'action-minoredit'            => 'marcar esta edição como uma edição menor',
+'action-move'                 => 'mover esta página',
+'action-move-subpages'        => 'mover esta página e suas subpáginas',
+'action-move-rootuserpages'   => 'mover páginas raiz de usuários',
+'action-movefile'             => 'mover este arquivo',
+'action-upload'               => 'enviar este arquivo',
+'action-reupload'             => 'sobrescrever o arquivo existente',
+'action-reupload-shared'      => 'sobrescrever este arquivo em um repositório compartilhado',
+'action-upload_by_url'        => 'enviar este arquivo a partir de um endereço URL',
+'action-writeapi'             => 'utilizar o modo de escrita da API',
+'action-delete'               => 'excluir esta página',
+'action-deleterevision'       => 'eliminar esta revisão',
+'action-deletedhistory'       => 'ver o histórico de edições eliminadas desta página',
+'action-browsearchive'        => 'pesquisar páginas eliminadas',
+'action-undelete'             => 'restaurar esta página',
+'action-suppressrevision'     => 'rever e restaurar esta edição oculta',
+'action-suppressionlog'       => 'ver este registro privado',
+'action-block'                => 'impedir que este usuário edite',
+'action-protect'              => 'alterar os níveis de proteção desta página',
+'action-import'               => 'importar esta página a partir de outra wiki',
+'action-importupload'         => 'importar esta página através do carregamento de um arquivo',
+'action-patrol'               => 'marcar as edições de outros usuários como patrulhadas',
+'action-autopatrol'           => 'ter suas edições marcadas como patrulhadas',
+'action-unwatchedpages'       => 'ver a lista de páginas não-vigiadas',
+'action-trackback'            => "enviar um ''trackback''",
+'action-mergehistory'         => 'fundir o histórico de edições desta página',
+'action-userrights'           => 'editar todos os privilégios de usuário',
+'action-userrights-interwiki' => 'editar privilégios de usuários de outras wikis',
+'action-siteadmin'            => 'bloquear ou desbloquear o banco de dados',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|alteração|alterações}}',
 'recentchanges'                     => 'Mudanças recentes',
+'recentchanges-legend'              => 'Opções das mudanças recentes',
 'recentchangestext'                 => 'Veja as mais novas mudanças na {{SITENAME}} nesta página.',
 'recentchanges-feed-description'    => 'Acompanhe as Mudanças recentes deste wiki por este feed.',
 'rcnote'                            => "A seguir {{PLURAL:$1|está listada '''uma''' alteração ocorrida|estão listadas '''$1''' alterações ocorridas}} {{PLURAL:$2|no último dia|nos últimos '''$2''' dias}}, a partir das $5 de $4.",
@@ -1156,6 +1329,8 @@ Note que os índices do conteúdo da {{SITENAME}} destes sites podem estar desat
 'rc_categories'                     => 'Limite para categorias (separar com "|")',
 'rc_categories_any'                 => 'Qualquer',
 'newsectionsummary'                 => '/* $1 */ nova seção',
+'rc-enhanced-expand'                => 'Mostrar detalhes (requer JavaScript)',
+'rc-enhanced-hide'                  => 'Esconder detalhes',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Alterações relacionadas',
@@ -1177,13 +1352,12 @@ Páginas que estejam em [[Special:Watchlist|sua lista de vigiados]] são exibida
 'upload_directory_read_only'  => 'O diretório de download de arquivos ($1) não tem permissões de escrita para o servidor Web.',
 'uploaderror'                 => 'Erro ao carregar',
 'uploadtext'                  => "Utilize o formulário abaixo para carregar novos arquivos.
-Para ver ou pesquisar imagens anteriormente carregadas consulte a [[Special:ImageList|lista de arquivos carregados]].
-Uploads e eliminações são também registadros no [[Special:Log|registro do projeto]].
+Para ver ou pesquisar imagens anteriormente carregadas consulte a [[Special:FileList|lista de arquivos carregados]]. (Re)Envios são também registrados no [[Special:Log/upload|registro de carregamento]], e as eliminações no [[Special:Log/delete|registro de eliminação]]
 
-Para incluír a imagem em uma página, utilize o link na forma de
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:arquivo.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:arquivo.png|texto]]</nowiki>''' ou
-'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:arquivo.ogg]]</nowiki>''' para uma ligação directa ao arquivo.",
+Para incluir a imagem numa página, utilize uma ligação em um dos seguintes formatos:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Arquivo.jpg]]</nowiki></tt>''' para utilizar a versão completa do arquivo;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Arquivo.png|200px|thumb|left|texto]]</nowiki></tt>''' para utilizar uma renderização de 200 pixels dentro de uma caixa posicionada à margem esquerda contendo 'texto' como descrição;
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Arquivo.ogg]]</nowiki></tt>''' para uma ligação direta ao arquivo sem que ele seja exibido.",
 'upload-permitted'            => 'Tipos de arquivos permitidos: $1.',
 'upload-preferred'            => 'Tipos de arquivos preferidos: $1.',
 'upload-prohibited'           => 'Tipos de arquivo proibidos: $1.',
@@ -1211,20 +1385,23 @@ Para incluír a imagem em uma página, utilize o link na forma de
 'large-file'                  => 'É recomendável que os arquivos não sejam maiores que $1; este possui $2.',
 'largefileserver'             => 'O tamanho deste arquivo é superior ao qual o servidor encontra-se configurado para permitir.',
 'emptyfile'                   => 'O arquivo que está tentando carregar parece encontrar-se vazio. Isto poderá ser devido a um erro na escrita do nome do arquivo. Por favor verifique se realmente deseja carregar este arquivo.',
-'fileexists'                  => 'Já existe um arquivo com este nome. Por favor, verifique <strong><tt>$1</tt></strong> caso não tenha a certeza se deseja alterar o arquivo atual.',
-'filepageexists'              => 'A página de descrição deste arquivo já foi criada em <strong><tt>$1</tt></strong>, mas atualmente não existe nenhum arquivo com este nome. O sumário que introduziu não aparecerá na página de descrição. Para o fazer aparecer, terá que o editar manualmente',
-'fileexists-extension'        => 'Já existe um arquivo de nome similar:<br />
-Nome do arquivo que está sendo enviado: <strong><tt>$1</tt></strong><br />
-Nome do arquivo existente: <strong><tt>$2</tt></strong><br />
-Por gentileza, escolha um nome diferente.',
+'fileexists'                  => "Já existe um arquivo com este nome. Por favor, verifique '''<tt>$1</tt>''' caso não tenha a certeza se deseja alterar o arquivo atual.",
+'filepageexists'              => "A página de descrição deste arquivo já foi criada em '''<tt>$1</tt>''', mas atualmente não existe nenhum arquivo com este nome. O sumário que introduziu não aparecerá na página de descrição. Para o fazer aparecer, terá que o editar manualmente",
+'fileexists-extension'        => "Já existe um arquivo de nome similar:<br />
+Nome do arquivo que está sendo enviado: '''<tt>$1</tt>'''<br />
+Nome do arquivo existente: '''<tt>$2</tt>'''<br />
+Por gentileza, escolha um nome diferente.",
 'fileexists-thumb'            => "<center>'''arquivo existente'''</center>",
-'fileexists-thumbnail-yes'    => 'O arquivo aparenta ser uma imagem de tamanho reduzido (<i>miniatura</i>, ou <i>thumbnail</i>). Por gentileza, verifique o arquivo <strong><tt>$1</tt></strong>.<br />
-Se o arquivo enviado é o mesmo do de tamanho original, não é necessário enviar uma versão de miniatura adicional.',
-'file-thumbnail-no'           => 'O nome do arquivo começa com <strong><tt>$1</tt></strong>. Isso faz parecer se tratar de uma imagem de tamanho reduzido (<i>miniatura</i>, ou <i>thumbnail</i>).
-Se você tem esta imagem em sua resolução completa, envie a no lugar desta. Caso contrário, por gentileza, altere o nome de arquivo.',
-'fileexists-forbidden'        => 'Já existe um arquivo com este nome. Por favor, volte atrás e carregue este arquivo sob um novo nome. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Já existe um arquivo com este nome no repositório de arquivo partilhados. Por favor, volte atrás e carregue este arquivo sob um novo nome. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "O arquivo aparenta ser uma imagem de tamanho reduzido (''miniatura'', ou ''thumbnail''). Por gentileza, verifique o arquivo '''<tt>$1</tt>'''.<br />
+Se o arquivo enviado é o mesmo do de tamanho original, não é necessário enviar uma versão de miniatura adicional.",
+'file-thumbnail-no'           => "O nome do arquivo começa com '''<tt>$1</tt>'''. Isso faz parecer se tratar de uma imagem de tamanho reduzido (''miniatura'', ou ''thumbnail'').
+Se você tem esta imagem em sua resolução completa, envie a no lugar desta. Caso contrário, por gentileza, altere o nome de arquivo.",
+'fileexists-forbidden'        => 'Já existe um arquivo com este nome, e não pode ser reescrito.
+Se ainda pretende carregar o seu arquivo, por favor, volte e use um novo nome. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Já existe um arquivo com este nome no repositório de arquivos compartilhados.
+Se você ainda quer carregar o seu arquivo, por favor volte e use um novo nome. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Esta imagem é uma duplicata do seguinte {{PLURAL:$1|arquivo|arquivos}}:',
+'file-deleted-duplicate'      => 'Um arquivo idêntico a este ([[$1]]) foi eliminado anteriormente. Verifique o motivo da eliminação de tal arquivo antes de prosseguir com o re-envio.',
 'successfulupload'            => 'Envio efetuado com sucesso',
 'uploadwarning'               => 'Aviso de envio',
 'savefile'                    => 'Salvar arquivo',
@@ -1244,7 +1421,7 @@ Se você tem esta imagem em sua resolução completa, envie a no lugar desta. Ca
 
 Verfique se é apropriado prosseguir enviando este arquivo.
 O registro de eliminação é exibido a seguir, para sua comodidade:",
-'filename-bad-prefix'         => 'O nome do arquivo que você está enviando começa com <strong>"$1"</strong>, um nome pouco esclarecedor, comumente associado de forma automática por câmeras digitais. Por gentileza, escolha um nome de arquivo mais explicativo.',
+'filename-bad-prefix'         => "O nome do arquivo que você está enviando começa com '''\"\$1\"''', um nome pouco esclarecedor, comumente associado de forma automática por câmeras digitais. Por gentileza, escolha um nome de arquivo mais explicativo.",
 'filename-prefix-blacklist'   => ' #<!-- deixe esta linha exatamente como está --> <pre>
 # A sintaxe é a seguinte:
 #   * Tudo a partir do caractere "#" até ao fim da linha é um comentário
@@ -1279,20 +1456,21 @@ PICT # misc.
 'upload_source_url'  => ' (um URL válido, publicamente acessível)',
 'upload_source_file' => ' (um arquivo no seu computador)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Esta página especial mostra todos os arquivos carregados.
+# Special:ListFiles
+'listfiles-summary'     => 'Esta página especial mostra todos os arquivos carregados.
 Por padrão, os últimos arquivos carregados são mostrados no topo da lista.
 Um clique sobre um cabeçalho de coluna altera a ordenação.',
-'imagelist_search_for'  => 'Pesquisar por nome de imagem:',
+'listfiles_search_for'  => 'Pesquisar por nome de imagem:',
 'imgfile'               => 'arquivo',
-'imagelist'             => 'Lista de arquivo',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Usuário',
-'imagelist_size'        => 'Tamanho',
-'imagelist_description' => 'Descrição',
-
-# Image description page
+'listfiles'             => 'Lista de arquivo',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Usuário',
+'listfiles_size'        => 'Tamanho',
+'listfiles_description' => 'Descrição',
+'listfiles_count'       => 'Versões',
+
+# File description page
 'filehist'                       => 'Histórico do arquivo',
 'filehist-help'                  => 'Clique em uma data/horário para ver o arquivo tal como ele se encontrava em tal momento.',
 'filehist-deleteall'             => 'eliminar todas',
@@ -1300,19 +1478,25 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 'filehist-revert'                => 'reverter',
 'filehist-current'               => 'atual',
 'filehist-datetime'              => 'Data/Horário',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura para a versão de $1',
+'filehist-nothumb'               => 'Miniatura indisponível',
 'filehist-user'                  => 'Usuário',
 'filehist-dimensions'            => 'Dimensões',
 'filehist-filesize'              => 'Tamanho do arquivo',
 'filehist-comment'               => 'Comentário',
-'imagelinks'                     => 'Ligações',
+'imagelinks'                     => 'Ligações de arquivos',
 'linkstoimage'                   => '{{PLURAL:$1|A seguinte página aponta|As seguintes $1 páginas apontam}} para este arquivo:',
+'linkstoimage-more'              => 'Mais de $1 {{PLURAL:$1|página tem alguma ligação|páginas têm alguma ligação}} para este arquivo.
+A lista a seguir mostra apenas {{PLURAL:$1|a primeira ligação de página|as primeiras $1 ligações de página}} para este arquivo.
+Uma [[Special:WhatLinksHere/$2|listagem completa]] está disponível.',
 'nolinkstoimage'                 => 'Nenhuma página aponta para este arquivo.',
 'morelinkstoimage'               => 'Ver [[Special:WhatLinksHere/$1|mais ligações]] para este arquivo.',
 'redirectstofile'                => '{{PLURAL:$1|O seguinte arquivo redireciona|Os seguintes arquivos redirecionam}} para este arquivo:',
-'duplicatesoffile'               => '{{PLURAL:$1|O seguinte arquivo é duplicado|Os seguintes arquivos são duplicados}} deste arquivo:',
+'duplicatesoffile'               => '{{PLURAL:$1|O seguinte arquivo é duplicado|Os seguintes arquivos são duplicados}} deste arquivo ([[Special:FileDuplicateSearch/$2|mais detalhes]]):',
 'sharedupload'                   => 'Este arquivo encontra-se partilhado e pode ser utilizado por outros projetos.',
 'shareduploadwiki'               => 'Por favor, consulte a $1 para mais informações.',
-'shareduploadwiki-desc'          => 'A descrição na sua $1 do repositório partilhado é mostrada abaixo.',
+'shareduploadwiki-desc'          => 'A descrição na sua $1 é mostrada abaixo.',
 'shareduploadwiki-linktext'      => 'página de descrição de arquivo',
 'shareduploadduplicate'          => 'Este arquivo é um duplicado de $1 do repositório partilhado.',
 'shareduploadduplicate-linktext' => 'outro arquivo',
@@ -1336,7 +1520,7 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 # File deletion
 'filedelete'                  => 'Eliminar $1',
 'filedelete-legend'           => 'Eliminar arquivo',
-'filedelete-intro'            => "Você está prestes a eliminar '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Você está prestes a eliminar o arquivo '''[[Media:$1|$1]]''' junto com todo o seu histórico.",
 'filedelete-intro-old'        => '<span class="plainlinks">Você se encontra prestes a eliminar a versão de \'\'\'[[Media:$1|$1]]\'\'\' tal como se encontrava em [$4 $3, $2].</span>',
 'filedelete-comment'          => 'Motivo de eliminação:',
 'filedelete-submit'           => 'Eliminar',
@@ -1344,7 +1528,6 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 'filedelete-success-old'      => "A versão de '''[[Media:$1|$1]]''' tal como $3, $2 foi eliminada.",
 'filedelete-nofile'           => "'''$1''' não existe.",
 'filedelete-nofile-old'       => "Não há uma versão de '''$1''' em arquivo com os parâmetros especificados.",
-'filedelete-iscurrent'        => 'Você está tentando eliminar a versão mais recente deste arquivo. Por gentileza, reverta para uma edição anterior antes de tentar novamente.',
 'filedelete-otherreason'      => 'Outro/motivo adicional:',
 'filedelete-reason-otherlist' => 'Outro motivo',
 'filedelete-reason-dropdown'  => '*Motivos comuns para eliminação
@@ -1371,27 +1554,31 @@ Um clique sobre um cabeçalho de coluna altera a ordenação.',
 
 # Random page
 'randompage'         => 'Página aleatória',
-'randompage-nopages' => 'Não há páginas neste espaço nominal.',
+'randompage-nopages' => 'Não há páginas no espaço nominal "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redirecionamento aleatório',
-'randomredirect-nopages' => 'Não há redirecionamentos neste espaço nominal.',
+'randomredirect-nopages' => 'Não há redirecionamentos no espaço nominal "$1".',
 
 # Statistics
-'statistics'             => 'Estatísticas',
-'sitestats'              => 'Estatísticas do site',
-'userstats'              => 'Estatísticas dos usuários',
-'sitestatstext'          => "Há atualmente um total de {{PLURAL:\$1|'''\$1''' página|'''\$1''' páginas}} na base de dados.
-Isto inclui páginas de \"discussão\", páginas sobre o projeto ({{SITENAME}}), páginas de rascunho, redirecionamentos e outras que provavelmente não são qualificadas como páginas de conteúdo.
-Excluindo estas, há {{PLURAL:\$2|'''\$2''' página que provavelmente é uma página de conteúdo legítima|'''\$2''' páginas que provavelmente são páginas de conteúdo legítimas}}.
-
-'''\$8''' {{PLURAL:\$8|arquivo foi carregado|arquivos foram carregados}}.
-
-Há um total de '''\$3''' {{PLURAL:\$3|página vista|páginas vistas}} e '''\$4''' {{PLURAL:\$4|edição|edições}} em páginas desde que este wiki foi instalado, o que resulta em aproximadamente '''\$5''' edições por página e '''\$6''' vistas por edição.
-
-O tamanho atual da [http://www.mediawiki.org/wiki/Manual:Job_queue fila de tarefas] é '''\$7'''.",
-'userstatstext'          => "Há atualmente {{PLURAL:$1|'''$1''' usuário registrado|'''$1''' usuários registrados}}, dentre os quais '''$2''' (ou '''$4%''') {{PLURAL:$2|é|são}} $5.",
-'statistics-mostpopular' => 'Páginas mais visitadas',
+'statistics'                   => 'Estatísticas',
+'statistics-header-pages'      => 'Estatísticas de páginas',
+'statistics-header-edits'      => 'Estatísticas de edições',
+'statistics-header-views'      => 'Ver estatísticas',
+'statistics-header-users'      => 'Estatísticas dos usuários',
+'statistics-articles'          => 'Páginas de conteúdo',
+'statistics-pages'             => 'Páginas',
+'statistics-pages-desc'        => 'Todas as páginas na wiki, incluindo páginas de discussão, redireccionamentos, etc.',
+'statistics-files'             => 'Arquivos carregados',
+'statistics-edits'             => 'Edições de página desde que {{SITENAME}} foi instalado',
+'statistics-edits-average'     => 'Média de edições por página',
+'statistics-views-total'       => 'Total de visualizações',
+'statistics-views-peredit'     => 'Visualizações por edição',
+'statistics-jobqueue'          => 'Tamanho da [http://www.mediawiki.org/wiki/Manual:Job_queue fila de tarefas]',
+'statistics-users'             => '[[Special:ListUsers|Usuários]] registrados',
+'statistics-users-active'      => 'Usuários ativos',
+'statistics-users-active-desc' => 'Usuários que efetuaram uma ação {{PLURAL:$1|no último dia|nos últimos $1 dias}}',
+'statistics-mostpopular'       => 'Páginas mais visitadas',
 
 'disambiguations'      => 'Página de desambiguações',
 'disambiguationspage'  => 'Template:disambig',
@@ -1434,26 +1621,30 @@ Uma página é considerada como de desambiguação se utilizar uma predefiniçã
 'popularpages'            => 'Páginas populares',
 'wantedcategories'        => 'Categorias pedidas',
 'wantedpages'             => 'Páginas pedidas',
-'missingfiles'            => 'Arquivos em falta',
+'wantedfiles'             => 'Arquivos pedidos',
+'wantedtemplates'         => 'Predefinições pedidas',
 'mostlinked'              => 'Páginas com mais afluentes',
 'mostlinkedcategories'    => 'Categorias com mais membros',
 'mostlinkedtemplates'     => 'Predefinições com mais afluentes',
 'mostcategories'          => 'Páginas de conteúdo com mais categorias',
 'mostimages'              => 'Imagens com mais afluentes',
 'mostrevisions'           => 'Páginas de conteúdo com mais revisões',
-'prefixindex'             => '�ndice de prefixo',
+'prefixindex'             => 'Todas as páginas com prefixo',
 'shortpages'              => 'Páginas curtas',
 'longpages'               => 'Páginas longas',
 'deadendpages'            => 'Páginas sem saída',
 'deadendpagestext'        => 'As seguintes páginas não contêm hiperligações para outras páginas nesta wiki.',
 'protectedpages'          => 'Páginas protegidas',
 'protectedpages-indef'    => 'Proteções infinitas apenas',
+'protectedpages-cascade'  => 'Apenas proteções progressivas',
 'protectedpagestext'      => 'As seguintes páginas encontram-se protegidas contra edições ou movimentações',
 'protectedpagesempty'     => 'Não existem páginas, neste momento, protegidas com tais parâmetros.',
 'protectedtitles'         => 'Títulos protegidos',
 'protectedtitlestext'     => 'Os títulos a seguir encontram-se protegidos contra criação',
 'protectedtitlesempty'    => 'Não há títulos protegidos com os parâmetros fornecidos.',
 'listusers'               => 'Lista de usuários',
+'listusers-editsonly'     => 'Mostrar apenas usuários com edições',
+'usereditcount'           => '$1 {{PLURAL:$1|edição|edições}}',
 'newpages'                => 'Páginas novas',
 'newpages-username'       => 'Nome de usuário:',
 'ancientpages'            => 'Páginas mais antigas',
@@ -1474,14 +1665,13 @@ Uma página é considerada como de desambiguação se utilizar uma predefiniçã
 'booksources-search-legend' => 'Procurar por fontes de livrarias',
 'booksources-go'            => 'Ir',
 'booksources-text'          => 'É exibida a seguir uma listagem de links para outros sites que vendem livros novos e usados e que possam possuir informações adicionais sobre os livros que você está pesquisando:',
+'booksources-invalid-isbn'  => 'O número ISBN fornecido não parece ser válido; verifique se houve erros ao copiar da fonte original.',
 
 # Special:Log
 'specialloguserlabel'  => 'Usuário:',
 'speciallogtitlelabel' => 'Título:',
 'log'                  => 'Registros',
 'all-logs-page'        => 'Todos os registros',
-'log-search-legend'    => 'Pesquisar nos registros',
-'log-search-submit'    => 'Ir',
 'alllogstext'          => 'Exibição combinada de todos registros disponíveis para o {{SITENAME}}.
 Você pode diminuir a lista escolhendo um tipo de registro, um nome de usuário (sensível a maiúsculas e minúsculas), ou uma página afetada (também sensível a maiúsculas e minúsculas).',
 'logempty'             => 'Nenhum item idêntico no registro.',
@@ -1493,6 +1683,7 @@ Você pode diminuir a lista escolhendo um tipo de registro, um nome de usuário
 'nextpage'          => 'Próxima página ($1)',
 'prevpage'          => 'Página anterior ($1)',
 'allpagesfrom'      => 'Mostrar páginas começando em:',
+'allpagesto'        => 'Terminar de exibir páginas em:',
 'allarticles'       => 'Todas as páginas',
 'allinnamespace'    => 'Todas as páginas (espaço nominal $1)',
 'allnotinnamespace' => 'Todas as páginas (excepto as do espaço nominal $1)',
@@ -1512,41 +1703,69 @@ Veja também as [[Special:WantedCategories|categorias em falta]].',
 'special-categories-sort-count' => 'ordenar por contagem',
 'special-categories-sort-abc'   => 'ordenar alfabeticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribuições de usuário eliminadas',
+
+# Special:LinkSearch
+'linksearch'       => 'Ligações externas',
+'linksearch-pat'   => 'Procurar padrão:',
+'linksearch-ns'    => 'Espaço nominal:',
+'linksearch-ok'    => 'Pesquisar',
+'linksearch-text'  => 'É possível utilizar "caracteres mágicos" como em "*.wikipedia.org".<br />
+Protocolos suportados: <tt>$1</tt>',
+'linksearch-line'  => '$1 está lincado a partir de $2',
+'linksearch-error' => "\"Caracteres mágicos\" (''wildcards'') só podem ser suados no início do endereço.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostrar usuários começando em:',
 'listusers-submit'   => 'Exibir',
 'listusers-noresult' => 'Não foram encontrados usuários para a forma pesquisada.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Registro de criação de usuários',
+'newuserlogpagetext'          => 'Este é um registro de novas contas de usuário',
+'newuserlog-byemail'          => 'senha enviada por correio-eletrônico',
+'newuserlog-create-entry'     => 'Novo usuário',
+'newuserlog-create2-entry'    => 'criou nova conta para $1',
+'newuserlog-autocreate-entry' => 'Conta criada automaticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Privilégios de grupo de usuários',
-'listgrouprights-summary'  => 'O que segue é uma lista dos grupos de usuários definidos nesta wiki, com os seus privilégios de acessos associados.
+'listgrouprights'                 => 'Privilégios de grupo de usuários',
+'listgrouprights-summary'         => 'O que segue é uma lista dos grupos de usuários definidos nesta wiki, com os seus privilégios de acessos associados.
 Pode haver [[{{MediaWiki:Listgrouprights-helppage}}|informações adicionais]] sobre privilégios individuais.',
-'listgrouprights-group'    => 'Grupo',
-'listgrouprights-rights'   => 'Privilégios',
-'listgrouprights-helppage' => 'Help:Privilégios de grupo',
-'listgrouprights-members'  => '(lista de membros)',
+'listgrouprights-group'           => 'Grupo',
+'listgrouprights-rights'          => 'Privilégios',
+'listgrouprights-helppage'        => 'Help:Privilégios de grupo',
+'listgrouprights-members'         => '(lista de membros)',
+'listgrouprights-addgroup'        => 'Podem adicionar {{PLURAL:$2|grupo|grupos}}: $1',
+'listgrouprights-removegroup'     => 'Podem remover {{PLURAL:$2|grupo|grupos}}: $1',
+'listgrouprights-addgroup-all'    => 'Podem adicionar todos os grupos',
+'listgrouprights-removegroup-all' => 'Podem remover todos os grupos',
 
 # E-mail user
-'mailnologin'     => 'Nenhum endereço de envio',
-'mailnologintext' => 'Necessita de estar [[Special:UserLogin|autenticado]] e de possuir um endereço de e-mail válido nas suas [[Special:Preferences|preferências]] para poder enviar um e-mail a outros usuários.',
-'emailuser'       => 'Contatar este usuário',
-'emailpage'       => 'Contactar usuário',
-'emailpagetext'   => 'Você pode usar o formulário abaixo para enviar uma mensagem por correio eletrônico para este usuário.
+'mailnologin'      => 'Nenhum endereço de envio',
+'mailnologintext'  => 'Necessita de estar [[Special:UserLogin|autenticado]] e de possuir um endereço de e-mail válido nas suas [[Special:Preferences|preferências]] para poder enviar um e-mail a outros usuários.',
+'emailuser'        => 'Contatar este usuário',
+'emailpage'        => 'Contactar usuário',
+'emailpagetext'    => 'Você pode usar o formulário abaixo para enviar uma mensagem por correio eletrônico para este usuário.
 O endereço eletrônico que você inseriu em [[Special:Preferences|suas preferências de usuário]] irá aparecer como o endereço do remetente da mensagem, então o destinatário poderá responder diretamente para você.',
-'usermailererror' => 'Erro no email:',
-'defemailsubject' => 'E-mail: {{SITENAME}}',
-'noemailtitle'    => 'Sem endereço de e-mail',
-'noemailtext'     => 'Este usuário não especificou um endereço de e-mail válido, ou optou por não receber e-mail de outros usuários.',
-'emailfrom'       => 'De:',
-'emailto'         => 'Para:',
-'emailsubject'    => 'Assunto:',
-'emailmessage'    => 'Mensagem:',
-'emailsend'       => 'Enviar',
-'emailccme'       => 'Enviar ao meu e-mail uma cópia de minha mensagem.',
-'emailccsubject'  => 'Cópia de sua mensagem para $1: $2',
-'emailsent'       => 'E-mail enviado',
-'emailsenttext'   => 'Sua mensagem foi enviada.',
-'emailuserfooter' => 'Este e-mail foi enviado por $1 para $2 através da opção de "contactar usuário" da {{SITENAME}}.',
+'usermailererror'  => 'Erro no email:',
+'defemailsubject'  => 'E-mail: {{SITENAME}}',
+'noemailtitle'     => 'Sem endereço de e-mail',
+'noemailtext'      => 'Este utilizador não especificou um endereço de e-mail válido.',
+'nowikiemailtitle' => 'E-mail não permitido',
+'nowikiemailtext'  => 'Este utilizador optou por não receber e-mail de outros utilizadores.',
+'email-legend'     => 'Enviar uma mensagem eletrônica para outro usuário da {{SITENAME}}',
+'emailfrom'        => 'De:',
+'emailto'          => 'Para:',
+'emailsubject'     => 'Assunto:',
+'emailmessage'     => 'Mensagem:',
+'emailsend'        => 'Enviar',
+'emailccme'        => 'Enviar ao meu e-mail uma cópia de minha mensagem.',
+'emailccsubject'   => 'Cópia de sua mensagem para $1: $2',
+'emailsent'        => 'E-mail enviado',
+'emailsenttext'    => 'Sua mensagem foi enviada.',
+'emailuserfooter'  => 'Este e-mail foi enviado por $1 para $2 através da opção de "contactar usuário" da {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Páginas vigiadas',
@@ -1577,12 +1796,7 @@ Modificações futuras em tal página e páginas de discussão a ela associadas
 'iteminvalidname'      => "Problema com item '$1', nome inválido...",
 'wlnote'               => "A seguir {{PLURAL:$1|está a última alteração ocorrida|estão as últimas '''$1''' alterações ocorridas}} {{PLURAL:$2|na última hora|nas últimas '''$2''' horas}}.",
 'wlshowlast'           => 'Ver últimas $1 horas $2 dias $3',
-'watchlist-show-bots'  => 'Mostrar edições de robôs',
-'watchlist-hide-bots'  => 'Ocultar edições de robôs',
-'watchlist-show-own'   => 'Exibir minhas edições',
-'watchlist-hide-own'   => 'Ocultar minhas edições',
-'watchlist-show-minor' => 'Exibir edições menores',
-'watchlist-hide-minor' => 'Ocultar edições menores',
+'watchlist-options'    => 'Opções da lista de vigiados',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Vigiando...',
@@ -1622,83 +1836,102 @@ Para alterar as suas preferências da lista de páginas vigiados, visite
 Contato e assistência
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Eliminar página',
-'confirm'                     => 'Confirmar',
-'excontent'                   => "o conteúdo era: '$1'",
-'excontentauthor'             => "o conteúdo era: '$1' (e o único editor era '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "o conteúdo antes de esvaziar era: '$1'",
-'exblank'                     => 'página esvaziada',
-'delete-confirm'              => 'Eliminar "$1"',
-'delete-legend'               => 'Eliminar',
-'historywarning'              => 'Aviso: A página que está prestes a eliminar possui um histórico:',
-'confirmdeletetext'           => 'Encontra-se prestes a eliminar permanentemente uma página ou uma imagem e todo o seu histórico.
+# Delete
+'deletepage'             => 'Eliminar página',
+'confirm'                => 'Confirmar',
+'excontent'              => "o conteúdo era: '$1'",
+'excontentauthor'        => "o conteúdo era: '$1' (e o único editor era '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "o conteúdo antes de esvaziar era: '$1'",
+'exblank'                => 'página esvaziada',
+'delete-confirm'         => 'Eliminar "$1"',
+'delete-legend'          => 'Eliminar',
+'historywarning'         => 'Aviso: A página que está prestes a eliminar possui um histórico:',
+'confirmdeletetext'      => 'Encontra-se prestes a eliminar permanentemente uma página ou uma imagem e todo o seu histórico.
 Por favor, confirme que possui a intenção de fazer isto, que compreende as consequências e que encontra-se a fazer isto de acordo com as [[{{MediaWiki:Policy-url}}|políticas]] do projeto.',
-'actioncomplete'              => 'Ação completada',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" foi eliminada.
+'actioncomplete'         => 'Ação completada',
+'deletedtext'            => '"<nowiki>$1</nowiki>" foi eliminada.
 Consulte $2 para um registro de eliminações recentes.',
-'deletedarticle'              => 'eliminada "[[$1]]"',
-'suppressedarticle'           => 'suprimiu "[[$1]]"',
-'dellogpage'                  => 'Registro de eliminação',
-'dellogpagetext'              => 'Abaixo uma lista das eliminações mais recentes.',
-'deletionlog'                 => 'registro de eliminação',
-'reverted'                    => 'Revertido para versão mais nova',
-'deletecomment'               => 'Motivo de eliminação',
-'deleteotherreason'           => 'Justificativa adicional:',
-'deletereasonotherlist'       => 'Outro motivo',
-'deletereason-dropdown'       => '* Motivos de eliminação comuns
+'deletedarticle'         => 'eliminada "[[$1]]"',
+'suppressedarticle'      => 'suprimiu "[[$1]]"',
+'dellogpage'             => 'Registro de eliminação',
+'dellogpagetext'         => 'Abaixo uma lista das eliminações mais recentes.',
+'deletionlog'            => 'registro de eliminação',
+'reverted'               => 'Revertido para versão mais nova',
+'deletecomment'          => 'Motivo de eliminação',
+'deleteotherreason'      => 'Justificativa adicional:',
+'deletereasonotherlist'  => 'Outro motivo',
+'deletereason-dropdown'  => '* Motivos de eliminação comuns
 ** Pedido do autor
 ** Violação de direitos de autor
 ** Vandalismo',
-'delete-edit-reasonlist'      => 'Editar motivos de eliminação',
-'delete-toobig'               => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
+'delete-edit-reasonlist' => 'Editar motivos de eliminação',
+'delete-toobig'          => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
 A eliminação de tais páginas foi restrita, a fim de se evitarem problemas acidentais em {{SITENAME}}.',
-'delete-warning-toobig'       => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
+'delete-warning-toobig'  => 'Esta página possui um longo histórico de edições, com mais de $1 {{PLURAL:$1|edição|edições}}.
 Eliminá-la poderá causar problemas na base de dados de {{SITENAME}};
 prossiga com cuidado.',
-'rollback'                    => 'Reverter edições',
-'rollback_short'              => 'Voltar',
-'rollbacklink'                => 'voltar',
-'rollbackfailed'              => 'A reversão falhou',
-'cantrollback'                => 'Não foi possível reverter a edição; o último contribuidor é o único autor desta página',
-'alreadyrolled'               => 'Não foi possível reverter a última edição de [[:$1]] por [[User:$2|$2]] ([[User talk:$2|discussão]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+
+# Rollback
+'rollback'         => 'Reverter edições',
+'rollback_short'   => 'Voltar',
+'rollbacklink'     => 'voltar',
+'rollbackfailed'   => 'A reversão falhou',
+'cantrollback'     => 'Não foi possível reverter a edição; o último contribuidor é o único autor desta página',
+'alreadyrolled'    => 'Não foi possível reverter a última edição de [[:$1]] por [[User:$2|$2]] ([[User talk:$2|discussão]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 alguém já editou ou reverteu a página.
 
-A última edição da página foi feita por [[User:$3|$3]] ([[User talk:$3|discussão]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'O sumário de edição era: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Foram revertidas as edições de [[Special:Contributions/$2|$2]] ([[User talk:$2|disc]]) para a última versão por [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Foram revertidas as edições de $1, com o conteúdo passando a estar como na última edição de $2.',
-'sessionfailure'              => 'Foram detetados problemas com a sua sessão;
+A última edição da página foi feita por [[User:$3|$3]] ([[User talk:$3|discussão]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "O sumário de edição era: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Foram revertidas as edições de [[Special:Contributions/$2|$2]] ([[User talk:$2|disc]]) para a última versão por [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Foram revertidas as edições de $1, com o conteúdo passando a estar como na última edição de $2.',
+'sessionfailure'   => 'Foram detetados problemas com a sua sessão;
 Esta ação foi cancelada como medida de proteção contra a intercepção de sessões.
 Experimente usar o botão "Voltar" e atualizar a página de onde veio e tente novamente.',
+
+# Protect
 'protectlogpage'              => 'Registro de proteção',
 'protectlogtext'              => 'Abaixo encontra-se o registro de proteção e desproteção de páginas.
 Veja a [[Special:ProtectedPages|lista de páginas protegidas]] para uma listagem das páginas que se encontram protegidas no momento.',
 'protectedarticle'            => 'protegeu "[[$1]]"',
 'modifiedarticleprotection'   => 'foi alterado o nível de proteção para "[[$1]]"',
 'unprotectedarticle'          => 'desprotegeu "[[$1]]"',
+'movedarticleprotection'      => 'moveu as configurações de proteção de "[[$2]]" para "[[$1]]"',
 'protect-title'               => 'Protegendo "$1"',
+'prot_1movedto2'              => '[[$1]] foi movido para [[$2]]',
 'protect-legend'              => 'Confirmar proteção',
 'protectcomment'              => 'Motivo de proteção',
 'protectexpiry'               => 'Expiração',
 'protect_expiry_invalid'      => 'O tempo de expiração fornecido é inválido.',
 'protect_expiry_old'          => 'O tempo de expiração fornecido se situa no passado.',
 'protect-unchain'             => 'Desbloquear permissões de moção',
-'protect-text'                => 'Você pode, nesta página, alterar o nível de proteção para <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Você não poderá alterar os níveis de proteção enquanto estiver bloqueado. Esta é a configuração atual para a página <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Não é possível alterar os níveis de proteção, uma vez que a base de dados se encontra trancada.
-Esta é a configuração atual para a página <strong>$1</strong>:',
-'protect-locked-access'       => 'Sua conta não possui permissões para alterar os níveis de proteção de uma página.
-Esta é a configuração atual para a página <strong>$1</strong>:',
+'protect-text'                => "Você pode, nesta página, alterar o nível de proteção para '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Você não poderá alterar os níveis de proteção enquanto estiver bloqueado. Esta é a configuração atual para a página '''$1''':",
+'protect-locked-dblock'       => "Não é possível alterar os níveis de proteção, uma vez que a base de dados se encontra trancada.
+Esta é a configuração atual para a página '''$1''':",
+'protect-locked-access'       => "Sua conta não possui permissões para alterar os níveis de proteção de uma página.
+Esta é a configuração atual para a página '''$1''':",
 'protect-cascadeon'           => 'Esta página encontra-se protegida, uma vez que se encontra incluída {{PLURAL:$1|na página listada a seguir, protegida|nas páginas listadas a seguir, protegidas}} com a "proteção progressiva" ativada. Você poderá alterar o nível de proteção desta página, mas isso não afetará a "proteção progressiva".',
-'protect-default'             => '(padrão)',
+'protect-default'             => 'Permitir todos os utilizadores',
 'protect-fallback'            => 'É necessário o privilégio de "$1"',
-'protect-level-autoconfirmed' => 'Bloquear usuários não-registrados',
+'protect-level-autoconfirmed' => 'Bloquear utilizadores novos e não registrados',
 'protect-level-sysop'         => 'Apenas administradores',
 'protect-summary-cascade'     => 'p. progressiva',
 'protect-expiring'            => 'expira em $1 (UTC)',
+'protect-expiry-indefinite'   => 'indefinido',
 'protect-cascade'             => '"Proteção progressiva" - proteja quaisquer páginas que estejam incluídas nesta.',
 'protect-cantedit'            => 'Você não pode alterar o nível de proteção desta página uma vez que você não se encontra habilitado a editá-la.',
+'protect-othertime'           => 'Outra duração:',
+'protect-othertime-op'        => 'outra duração',
+'protect-existing-expiry'     => 'A proteção atual expirará às $3 de $2',
+'protect-otherreason'         => 'Outro motivo/motivo adicional:',
+'protect-otherreason-op'      => 'outro motivo/motivo adicional',
+'protect-dropdown'            => "*Motivos comuns para proteção
+** Vandalismo excessivo
+** Inserção excessiva de ''spams''
+** Guerra de edições improdutiva
+** Página bastante acessada",
+'protect-edit-reasonlist'     => 'Editar motivos de proteções',
+'protect-expiry-options'      => '2 horas:2 hours,1 dia:1 day,3 dias:3 days,1 semana:1 week,2 semanas:2 weeks,1 mês:1 month,3 meses:3 months,6 meses:6 months,1 ano:1 year,indefinido:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permissão:',
 'restriction-level'           => 'Nível de restrição:',
 'minimum-size'                => 'Tam. mínimo',
@@ -1721,7 +1954,8 @@ Esta é a configuração atual para a página <strong>$1</strong>:',
 'undeletepage'                 => 'Ver e restaurar páginas eliminadas',
 'undeletepagetitle'            => "'''Seguem-se as edições eliminadas de [[:$1]]'''.",
 'viewdeletedpage'              => 'Ver páginas eliminadas',
-'undeletepagetext'             => 'As seguintes páginas foram eliminadas, apesar de ainda permanecem na base de dados e poderem ser restauradas. O arquivo pode periodicamente ser limpo.',
+'undeletepagetext'             => '{{PLURAL:$1|A seguinte página foi eliminada|As $1 páginas seguintes foram eliminadas}}, mas ainda {{PLURAL:$1|permanece|permanecem}} no arquivo e poderem ser restauradas.
+O arquivo pode ser limpo periodicamente.',
 'undelete-fieldset-title'      => 'Restaurar edições',
 'undeleteextrahelp'            => "Para restaurar todo o histórico de edições desta página, deixe todas as caixas de seleção desmarcadas e clique em '''''Restaurar'''''.
 Para efetuar uma restauração seletiva, selecione as caixas correspondentes às edições a serem restauradas e clique em '''''Restaurar'''''.
@@ -1732,12 +1966,13 @@ Se uma nova página foi criada com o mesmo nome desde a eliminação, as ediçõ
 'undeleterevdel'               => 'O restauro não será executado se resultar na remoção parcial da versão mais recente da página ou arquivo.
 Em tais casos, deverá desselecionar ou reverter a ocultação da versão apagada mais recente.',
 'undeletehistorynoadmin'       => 'Esta página foi eliminada. O motivo de eliminação é apresentado no súmario abaixo, junto dos detalhes do usuário que editou esta página antes de eliminar. O texto atual destas edições eliminadas encontra-se agora apenas disponível para administradores.',
-'undelete-revision'            => 'A edição $1 de $2 foi eliminada por $3:',
+'undelete-revision'            => 'Edição eliminada da página $1 (das $5 de $4), por $3:',
 'undeleterevision-missing'     => 'Edição inválida ou não encontrada. Talvez você esteja com um link incorreto ou talvez a edição foi restaurada ou removida dos arquivos.',
 'undelete-nodiff'              => 'Não foram encontradas edições anteriores.',
 'undeletebtn'                  => 'Restaurar',
 'undeletelink'                 => 'restaurar',
 'undeletereset'                => 'Limpar',
+'undeleteinvert'               => 'Inverter seleção',
 'undeletecomment'              => 'Comentário:',
 'undeletedarticle'             => 'restaurado "[[$1]]"',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|edição restaurada|edições restauradas}}',
@@ -1769,26 +2004,27 @@ $1',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contribuições do usuário',
-'mycontris'     => 'Minhas contribuições',
-'contribsub2'   => 'Para $1 ($2)',
-'nocontribs'    => 'Não foram encontradas mudanças com este critério.',
-'uctop'         => ' (revisão atual)',
-'month'         => 'Mês (inclusive anteriores):',
-'year'          => 'Ano (inclusive anteriores):',
-
-'sp-contributions-newbies'     => 'Pesquisar apenas nas contribuições de contas recentes',
-'sp-contributions-newbies-sub' => 'Para contas novas',
-'sp-contributions-blocklog'    => 'Registro de bloqueios',
-'sp-contributions-search'      => 'Pesquisar contribuições',
-'sp-contributions-username'    => 'Endereço de IP ou usuário:',
-'sp-contributions-submit'      => 'Pesquisar',
+'contributions'       => 'Contribuições do usuário',
+'contributions-title' => 'Contribuições do usuário $1',
+'mycontris'           => 'Minhas contribuições',
+'contribsub2'         => 'Para $1 ($2)',
+'nocontribs'          => 'Não foram encontradas mudanças com este critério.',
+'uctop'               => ' (revisão atual)',
+'month'               => 'Mês (inclusive anteriores):',
+'year'                => 'Ano (inclusive anteriores):',
+
+'sp-contributions-newbies'       => 'Pesquisar apenas nas contribuições de contas recentes',
+'sp-contributions-newbies-sub'   => 'Para contas novas',
+'sp-contributions-newbies-title' => 'Contribuições de usuários de contas novas',
+'sp-contributions-blocklog'      => 'Registro de bloqueios',
+'sp-contributions-search'        => 'Pesquisar contribuições',
+'sp-contributions-username'      => 'Endereço de IP ou usuário:',
+'sp-contributions-submit'        => 'Pesquisar',
 
 # What links here
 'whatlinkshere'            => 'Páginas afluentes',
 'whatlinkshere-title'      => 'Páginas que apontam para "$1"',
 'whatlinkshere-page'       => 'Página:',
-'linklistsub'              => '(Lista de ligações)',
 'linkshere'                => "As seguintes páginas possuem ligações para '''[[:$1]]''':",
 'nolinkshere'              => "Não existem ligações para '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Não há links para '''[[:$1]]''' no espaço nominal selecionado.",
@@ -1833,6 +2069,8 @@ Isto só deve ser feito para prevenir vandalismo, e de acordo com a [[{{MediaWik
 'ipbotherreason'                  => 'Outro motivo/motivo adicional:',
 'ipbhidename'                     => 'Ocultar usuário/IP do registro de bloqueios, lista de bloqueios e lista de usuários',
 'ipbwatchuser'                    => 'Vigiar as páginas de usuários e de discussão deste usuário',
+'ipballowusertalk'                => 'Permitir que este usuário edite sua própria página de discussão mesmo estando bloqueado',
+'ipb-change-block'                => 'Bloquear o usuário novamente com estes parâmetros',
 'badipaddress'                    => 'Endereço de IP inválido',
 'blockipsuccesssub'               => 'Bloqueio bem sucedido',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] foi bloqueado.<br />
@@ -1842,14 +2080,18 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para rever os bloquei
 'ipb-unblock'                     => 'Desbloquear um usuário ou endereço de IP',
 'ipb-blocklist-addr'              => 'Bloqueios existentes para $1',
 'ipb-blocklist'                   => 'Ver bloqueios em vigência',
+'ipb-blocklist-contribs'          => 'Contribuições de $1',
 'unblockip'                       => 'Desbloquear usuário',
 'unblockiptext'                   => 'Utilize o formulário a seguir para restaurar o acesso à escrita para um endereço de IP ou usuário previamente bloqueado.',
-'ipusubmit'                       => 'Desbloquear este usuário',
+'ipusubmit'                       => 'Remover este bloqueio',
 'unblocked'                       => '[[User:$1|$1]] foi desbloqueado',
 'unblocked-id'                    => 'O bloqueio de $1 foi removido com sucesso',
 'ipblocklist'                     => 'Usuários e endereços de IP bloqueados',
 'ipblocklist-legend'              => 'Procurar por um usuário bloqueado',
 'ipblocklist-username'            => 'Usuário ou endereço de IP:',
+'ipblocklist-sh-userblocks'       => '$1 bloqueios de contas',
+'ipblocklist-sh-tempblocks'       => '$1 bloqueios temporários',
+'ipblocklist-sh-addressblocks'    => '$1 bloqueios de IP único',
 'ipblocklist-submit'              => 'Pesquisar',
 'blocklistline'                   => '$1, $2 bloqueou $3 ($4)',
 'infiniteblock'                   => 'infinito',
@@ -1858,14 +2100,18 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para rever os bloquei
 'noautoblockblock'                => 'bloqueio automático desabilitado',
 'createaccountblock'              => 'criação de conta de usuário bloqueada',
 'emailblock'                      => 'impedido de enviar e-mail',
+'blocklist-nousertalk'            => 'impossibilitado de editar a própria página de discussão',
 'ipblocklist-empty'               => 'A lista de bloqueios encontra-se vazia.',
 'ipblocklist-no-results'          => 'O endereço de IP ou nome de usuário procurado não se encontra bloqueado.',
 'blocklink'                       => 'bloquear',
 'unblocklink'                     => 'desbloquear',
+'change-blocklink'                => 'alterar bloqueio',
 'contribslink'                    => 'contribs',
 'autoblocker'                     => 'Você foi automaticamente bloqueado, pois partilha um endereço de IP com "[[User:$1|$1]]". O motivo apresentado foi: "$2".',
 'blocklogpage'                    => 'Registro de bloqueio',
+'blocklog-fulllog'                => 'Registro completo de bloqueios',
 'blocklogentry'                   => '"[[$1]]" foi bloqueado com um tempo de expiração de $2 $3',
+'reblock-logentry'                => 'modificou parâmetros de bloqueio para [[$1]] com um tempo de expiração de $2 $3',
 'blocklogtext'                    => 'Este é um registro de ações de bloqueio e desbloqueio.
 Endereços IP sujeitos a bloqueio automático não são listados.
 Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para obter a lista de bloqueios e banimentos atualmente válidos.',
@@ -1874,11 +2120,14 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para obter a lista de
 'block-log-flags-nocreate'        => 'criação de contas desabilitada',
 'block-log-flags-noautoblock'     => 'bloqueio automático desabilitado',
 'block-log-flags-noemail'         => 'impedido de enviar e-mail',
+'block-log-flags-nousertalk'      => 'impossibilitado de editar a própria página de discussão',
 'block-log-flags-angry-autoblock' => 'autobloqueio melhorado ativado',
 'range_block_disabled'            => 'A funcionalidade de bloquear gamas de IPs encontra-se desativada.',
 'ipb_expiry_invalid'              => 'Tempo de expiração inválido.',
 'ipb_expiry_temp'                 => 'Bloqueios com nome de usuário ocultado devem ser permanentes.',
 'ipb_already_blocked'             => '"$1" já se encontra bloqueado',
+'ipb-needreblock'                 => '== Já se encontra bloqueado ==
+$1 já se encontra bloqueado. Deseja alterar as configurações?',
 'ipb_cant_unblock'                => 'Erro: Bloqueio com ID $1 não encontrado. Poderá já ter sido desbloqueado.',
 'ipb_blocked_as_range'            => 'Erro: O IP $1 não se encontra bloqueado de forma direta, não podendo ser desbloqueado deste modo. Se encontra bloqueado como parte do "range" $2, o qual pode ser desbloqueado.',
 'ip_range_invalid'                => 'Gama de IPs inválida.',
@@ -1889,6 +2138,7 @@ Consulte a [[Special:IPBlockList|lista de IPs bloqueados]] para obter a lista de
 'proxyblocksuccess'               => 'Concluído.',
 'sorbsreason'                     => 'O seu endereço IP encontra-se listado como proxy aberto pela DNSBL utilizada por {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'O seu endereço de IP encontra-se listado como proxy aberto na DNSBL utilizada por {{SITENAME}}. Você não pode criar uma conta',
+'cant-block-while-blocked'        => 'Você não pode bloquear outros usuários enquanto estiver bloqueado.',
 
 # Developer tools
 'lockdb'              => 'Trancar banco de dados',
@@ -1910,9 +2160,9 @@ Por favor, confirme que você realmente pretende fazer isso e que vai destrancar
 'databasenotlocked'   => 'A base de dados não encontra-se bloqueada.',
 
 # Move page
-'move-page'               => 'Mover $1',
-'move-page-legend'        => 'Mover página',
-'movepagetext'            => "Utilizando o seguinte formulário você poderá renomear uma página, movendo todo o histórico para o novo título. O título anterior será transformado em um redirecionamento para o novo.
+'move-page'                    => 'Mover $1',
+'move-page-legend'             => 'Mover página',
+'movepagetext'                 => "Utilizando o seguinte formulário você poderá renomear uma página, movendo todo o histórico para o novo título. O título anterior será transformado em um redirecionamento para o novo.
 
 Links para as páginas antigas não serão mudados; certifique-se de verificar por redirecionamentos quebrados ou duplos. Você é responsável por certificar-se que os links continuam apontando para onde eles deveriam apontar.
 
@@ -1920,47 +2170,60 @@ Note que a página '''não''' será movida se já existir uma página com o novo
 
 <b>CUIDADO!</b>
 Isto pode ser uma mudança drástica e inesperada para uma página popular; por favor, tenha certeza de que compreende as consequências da mudança antes de prosseguir.",
-'movepagetalktext'        => "A página de \"discussão\" associada, se existir, será automaticamente movida, '''a não ser que:'''
+'movepagetalktext'             => "A página de \"discussão\" associada, se existir, será automaticamente movida, '''a não ser que:'''
 *Uma página de discussão com conteúdo já exista sob o novo título, ou
 *Você não marque a caixa abaixo.
 
 Nestes casos, você terá que mover ou mesclar a página manualmente, se assim desejar.",
-'movearticle'             => 'Mover página',
-'movenotallowed'          => 'Você não possui permissão para mover páginas.',
-'newtitle'                => 'Para novo título',
-'move-watch'              => 'Vigiar esta página',
-'movepagebtn'             => 'Mover página',
-'pagemovedsub'            => 'Página movida com sucesso',
-'movepage-moved'          => '<big>\'\'\'"$1" foi movida para "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Uma página com este título já existe, ou o título que escolheu é inválido.
+'movearticle'                  => 'Mover página',
+'movenologin'                  => 'Não autenticado',
+'movenologintext'              => 'Você precisa ser um usuário registrado e [[Special:UserLogin|autenticado]] para poder mover uma página.',
+'movenotallowed'               => 'Você não possui permissão para mover páginas.',
+'movenotallowedfile'           => 'Você não possui permissão para mover arquivos.',
+'cant-move-user-page'          => 'Você não possui permissão de mover páginas principais de usuários.',
+'cant-move-to-user-page'       => 'Você não tem permissão para mover uma página para uma página de usuários (exceto para uma subpágina de usuário).',
+'newtitle'                     => 'Para novo título',
+'move-watch'                   => 'Vigiar esta página',
+'movepagebtn'                  => 'Mover página',
+'pagemovedsub'                 => 'Página movida com sucesso',
+'movepage-moved'               => '<big>\'\'\'"$1" foi movida para "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Um redirecionamento foi criado.',
+'movepage-moved-noredirect'    => 'A criação de um redirecionamento foi suprimida.',
+'articleexists'                => 'Uma página com este título já existe, ou o título que escolheu é inválido.
 Por favor, escolha outro nome.',
-'cantmove-titleprotected' => 'Você não pode mover uma página para tal denominação uma vez que o novo título se encontra protegido contra criação',
-'talkexists'              => "'''A página em si foi movida com sucesso. No entanto, a página de discussão não foi movida, uma vez que já existia uma com este título. Por favor, mescle-as manualmente.'''",
-'movedto'                 => 'movido para',
-'movetalk'                => 'Mover também a página de discussão associada.',
-'move-subpages'           => 'Mover todas as sub-páginas, se aplicável',
-'move-talk-subpages'      => 'Mover todas as sub-páginas da página de discussão, se aplicável',
-'movepage-page-exists'    => 'A página $1 já existe e não pode ser substituída.',
-'movepage-page-moved'     => 'A página $1 foi movida para $2',
-'movepage-page-unmoved'   => 'A página $1 não pôde ser movida para $2.',
-'movepage-max-pages'      => 'O limite de $1 {{PLURAL:$1|página movida|páginas movidas}} foi atingido; não será possível mover mais páginas de forma automática.',
-'1movedto2'               => '[[$1]] foi movido para [[$2]]',
-'1movedto2_redir'         => '[[$1]] foi movido para [[$2]] sob redirecionamento',
-'movelogpage'             => 'Registro de movimento',
-'movelogpagetext'         => 'Abaixo encontra-se uma lista de páginas movidas.',
-'movereason'              => 'Motivo:',
-'revertmove'              => 'reverter',
-'delete_and_move'         => 'Eliminar e mover',
-'delete_and_move_text'    => '==Eliminação necessária==
+'cantmove-titleprotected'      => 'Você não pode mover uma página para tal denominação uma vez que o novo título se encontra protegido contra criação',
+'talkexists'                   => "'''A página em si foi movida com sucesso. No entanto, a página de discussão não foi movida, uma vez que já existia uma com este título. Por favor, mescle-as manualmente.'''",
+'movedto'                      => 'movido para',
+'movetalk'                     => 'Mover também a página de discussão associada.',
+'move-subpages'                => 'Mover todas as sub-páginas, se aplicável',
+'move-talk-subpages'           => 'Mover todas as sub-páginas da página de discussão, se aplicável',
+'movepage-page-exists'         => 'A página $1 já existe e não pode ser substituída.',
+'movepage-page-moved'          => 'A página $1 foi movida para $2',
+'movepage-page-unmoved'        => 'A página $1 não pôde ser movida para $2.',
+'movepage-max-pages'           => 'O limite de $1 {{PLURAL:$1|página movida|páginas movidas}} foi atingido; não será possível mover mais páginas de forma automática.',
+'1movedto2'                    => '[[$1]] foi movido para [[$2]]',
+'1movedto2_redir'              => '[[$1]] foi movido para [[$2]] sob redirecionamento',
+'move-redirect-suppressed'     => 'redirecionamento suprimido',
+'movelogpage'                  => 'Registro de movimento',
+'movelogpagetext'              => 'Abaixo encontra-se uma lista de páginas movidas.',
+'movereason'                   => 'Motivo:',
+'revertmove'                   => 'reverter',
+'delete_and_move'              => 'Eliminar e mover',
+'delete_and_move_text'         => '==Eliminação necessária==
 A página de destino ("[[:$1]]") já existe. Deseja eliminá-la de modo a poder mover?',
-'delete_and_move_confirm' => 'Sim, eliminar a página',
-'delete_and_move_reason'  => 'Eliminada para poder mover outra página para este título',
-'selfmove'                => 'O título fonte e o título destinatário são os mesmos; não é possível mover uma página para ela mesma.',
-'immobile_namespace'      => 'O título destinatário é de um tipo especial; não é possível mover páginas para esse espaço nominal.',
-'imagenocrossnamespace'   => 'Não é possível mover imagem para espaço nominal que não de imagens',
-'imagetypemismatch'       => 'A extensão do novo arquivo não corresponde ao seu tipo',
-'imageinvalidfilename'    => 'O nome do arquivo alvo é inválido',
-'fix-double-redirects'    => 'Atualizar todos os redirecionamentos que apontem para o título original',
+'delete_and_move_confirm'      => 'Sim, eliminar a página',
+'delete_and_move_reason'       => 'Eliminada para poder mover outra página para este título',
+'selfmove'                     => 'O título fonte e o título destinatário são os mesmos; não é possível mover uma página para ela mesma.',
+'immobile-source-namespace'    => 'Não é possível mover páginas no espaço nominal "$1"',
+'immobile-target-namespace'    => 'Não é possível mover páginas para o espaço nominal "$1"',
+'immobile-target-namespace-iw' => 'Uma ligação interwiki não é um destino válido para uma movimentação de página.',
+'immobile-source-page'         => 'Esta página não pode ser movida.',
+'immobile-target-page'         => 'Não é possível mover para esse título de destino.',
+'imagenocrossnamespace'        => 'Não é possível mover imagem para espaço nominal que não de imagens',
+'imagetypemismatch'            => 'A extensão do novo arquivo não corresponde ao seu tipo',
+'imageinvalidfilename'         => 'O nome do arquivo alvo é inválido',
+'fix-double-redirects'         => 'Atualizar todos os redirecionamentos que apontem para o título original',
+'move-leave-redirect'          => 'Criar um redirecionamento',
 
 # Export
 'export'            => 'Exportação de páginas',
@@ -1968,7 +2231,7 @@ A página de destino ("[[:$1]]") já existe. Deseja eliminá-la de modo a poder
 
 Para exportar páginas, introduza os títulos na caixa de texto abaixo (um título por linha) e selecione se deseja todas as versões, com as linhas de histórico de edições, ou apenas a edição atual e informações apenas sobre a mais recente das edições.
 
-Se desejar, pode utilizar uma ligação (por exemplo, [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] para a [[{{MediaWiki:Mainpage}}]]).',
+Se desejar, pode utilizar uma ligação (por exemplo, [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] para a [[{{MediaWiki:Mainpage}}]]).',
 'exportcuronly'     => 'Incluir apenas a revisão atual, não o histórico inteiro',
 'exportnohistory'   => "----
 '''Nota:''' a exportação do histórico completo das páginas através deste formulário foi desactivada devido a motivos de performance.",
@@ -1984,7 +2247,7 @@ Se desejar, pode utilizar uma ligação (por exemplo, [[{{ns:special}}:Export/{{
 'allmessagesdefault'        => 'Texto padrão',
 'allmessagescurrent'        => 'Texto atual',
 'allmessagestext'           => 'Esta é uma lista de todas mensagens de sistema disponíveis no espaço nominal {{ns:mediawiki}}.
-Acesse [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net Betawiki] caso deseje contribuir para traduções do MediaWiki feitas para uso geral.',
+Acesse [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] caso deseje contribuir para traduções do MediaWiki feitas para uso geral.',
 'allmessagesnotsupportedDB' => "Esta página não pode ser utilizada, uma vez que '''\$wgUseDatabaseMessages''' foi desativado.",
 'allmessagesfilter'         => 'Filtro de nome de mensagem:',
 'allmessagesmodified'       => 'Mostrar apenas modificados',
@@ -2004,9 +2267,12 @@ Acesse [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [ht
 'import-interwiki-text'      => 'Selecione uma wiki e um título de página a importar.
 As datas das edições e os seus editores serão mantidos.
 Todas as acções de importação transwiki são registradas no [[Special:Log/import|Registro de importações]].',
+'import-interwiki-source'    => 'Wiki/página fonte:',
 'import-interwiki-history'   => 'Copiar todas as edições desta página',
 'import-interwiki-submit'    => 'Importar',
 'import-interwiki-namespace' => 'Domínio de destino:',
+'import-upload-filename'     => 'Nome do arquivo:',
+'import-comment'             => 'Comentário:',
 'importtext'                 => 'Por favor, exporte o arquivo da fonte wiki utilizando a ferramenta {{ns:special}}:Export, salve o arquivo para o seu disco e importe-o aqui.',
 'importstart'                => 'Importando páginas...',
 'import-revision-count'      => '{{PLURAL:$1|uma edição|$1 edições}}',
@@ -2040,19 +2306,19 @@ Todas as acções de importação transwiki são registradas no [[Special:Log/im
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|$1 edição|$1 edições}} de $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Minha página de usuário',
+'tooltip-pt-userpage'             => 'Sua página de utilizador',
 'tooltip-pt-anonuserpage'         => 'A página de usuário para o ip que está a utilizar para editar',
-'tooltip-pt-mytalk'               => 'Minha página de discussão',
+'tooltip-pt-mytalk'               => 'Sua página de discussão',
 'tooltip-pt-anontalk'             => 'Discussão sobre edições deste endereço de ip',
 'tooltip-pt-preferences'          => 'Minhas preferências',
 'tooltip-pt-watchlist'            => 'Lista de artigos vigiados.',
-'tooltip-pt-mycontris'            => 'Lista das minhas contribuições',
+'tooltip-pt-mycontris'            => 'Lista das suas contribuições',
 'tooltip-pt-login'                => 'Você é encorajado a autenticar-se, apesar disso não ser obrigatório.',
 'tooltip-pt-anonlogin'            => 'Você é encorajado a autenticar-se, apesar disso não ser obrigatório.',
 'tooltip-pt-logout'               => 'Sair',
 'tooltip-ca-talk'                 => 'Discussão sobre o conteúdo da página',
 'tooltip-ca-edit'                 => 'Você pode editar esta página. Por favor, utilize o botão Mostrar Previsão antes de salvar.',
-'tooltip-ca-addsection'           => 'Adicionar comentário a essa discussão.',
+'tooltip-ca-addsection'           => 'Iniciar uma nova seção',
 'tooltip-ca-viewsource'           => 'Esta página está protegida; você pode exibir seu código, no entanto.',
 'tooltip-ca-history'              => 'Edições anteriores desta página.',
 'tooltip-ca-protect'              => 'Proteger esta página',
@@ -2099,6 +2365,8 @@ Todas as acções de importação transwiki são registradas no [[Special:Log/im
 'tooltip-watch'                   => 'Adicionar esta página à sua lista de artigos vigiados',
 'tooltip-recreate'                => 'Recriar a página apesar de ter sido eliminada',
 'tooltip-upload'                  => 'Iniciar o upload',
+'tooltip-rollback'                => '"{{int:rollbacklink}}" reverte, com um só clique, as edições do último editor desta página.',
+'tooltip-undo'                    => '"{{int:editundo}}" reverte esta edição exibindo a caixa de edição no modo de previsão, permitindo alterações adicionais e o uso do sumário de edição para justificativas.',
 
 # Stylesheets
 'common.css'   => '/** o código CSS colocado aqui será aplicado a todos os temas */',
@@ -2114,12 +2382,12 @@ Todas as acções de importação transwiki são registradas no [[Special:Log/im
 'notacceptable'     => 'O servidor não pode fornecer os dados em um formato que o seu cliente possa ler.',
 
 # Attribution
-'anonymous'        => 'Usuário(s) anônimo(s) da {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Usuário anônimo|Usuários anônimos}} da {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} usuário $1',
 'lastmodifiedatby' => 'Esta página foi modificada pela última vez a $2, $1 por $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Baseado no trabalho de $1.',
 'others'           => 'outros',
-'siteusers'        => '{{SITENAME}} usuário(es) $1',
+'siteusers'        => '{{PLURAL:$2|um usuário|$2 usuários}} da {{SITENAME}}: $1',
 'creditspage'      => 'Créditos da página',
 'nocredits'        => 'Não há informação disponível sobre os créditos desta página.',
 
@@ -2140,6 +2408,16 @@ Tal bloqueio foi provavelmente causado por uma ligação para um ''website'' ext
 'numauthors'     => 'Número de autores distintos (página): $1',
 'numtalkauthors' => 'Número de autores distintos (página de discussão): $1',
 
+# Skin names
+'skinname-standard'    => 'Clássico',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Azul colonial',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chique',
+'skinname-simple'      => 'Simples',
+'skinname-modern'      => 'Moderno',
+
 # Math options
 'mw_math_png'    => 'Gerar sempre como PNG',
 'mw_math_simple' => 'HTML caso seja simples, caso contrário, PNG',
@@ -2160,10 +2438,12 @@ Tal bloqueio foi provavelmente causado por uma ligação para um ''website'' ext
 'markedaspatrollederror-noautopatrol' => 'Você não está autorizado a marcar suas próprias edições como edições patrulhadas.',
 
 # Patrol log
-'patrol-log-page'   => 'Registro de edições patrulhadas',
-'patrol-log-header' => 'Este é um registro de edições patrulhadas.',
-'patrol-log-line'   => 'marcou a edição $1 de $2 como uma edição patrulhada $3',
-'patrol-log-auto'   => 'automaticamente',
+'patrol-log-page'      => 'Registro de edições patrulhadas',
+'patrol-log-header'    => 'Este é um registro de edições patrulhadas.',
+'patrol-log-line'      => 'marcou a edição $1 de $2 como uma edição patrulhada $3',
+'patrol-log-auto'      => 'automaticamente',
+'patrol-log-diff'      => 'edição $1',
+'log-show-hide-patrol' => '$1 registro de edições patrulhadas',
 
 # Image deletion
 'deletedrevision'                 => 'Apagada a versão antiga $1',
@@ -2180,6 +2460,9 @@ $1',
 'previousdiff' => '� Edição anterior',
 'nextdiff'     => 'Edição posterior →',
 
+# Visual comparison
+'visual-comparison' => 'Comparação visual',
+
 # Media information
 'mediawarning'         => "'''Aviso''': Este arquivo pode conter código malicioso. Ao executar, o seu sistema poderá estar comprometido.<hr />",
 'imagemaxsize'         => 'Limitar imagens nas páginas de descrição a:',
@@ -2192,10 +2475,12 @@ $1',
 'show-big-image'       => 'Resolução completa',
 'show-big-image-thumb' => '<small>Tamanho desta previsão: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria de novos arquivos',
 'imagelisttext'         => "É exibida a seguir uma listagem {{PLURAL:$1|de '''um''' arquivo organizado|de '''$1''' arquivos organizados}} por $2.",
 'newimages-summary'     => 'Esta página especial mostra os arquivos mais recentemente enviados',
+'newimages-legend'      => 'Filtrar',
+'newimages-label'       => 'Nome de arquivo (ou parte dele):',
 'showhidebots'          => '($1 robôs)',
 'noimages'              => 'Nada para ver.',
 'ilsubmit'              => 'Procurar',
@@ -2400,6 +2685,18 @@ Caso o arquivo tenha sido modificado a partir do seu estado original, alguns det
 'exif-lightsource-24'  => 'Tungsténio de estúdio ISO',
 'exif-lightsource-255' => 'Outra fonte de luz',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flash não disparou',
+'exif-flash-fired-1'    => 'Flash disparado',
+'exif-flash-return-0'   => "''strobe'' não encontrou ou detectou nenhuma função",
+'exif-flash-return-2'   => "''strobe'' não retornou a função detectada",
+'exif-flash-return-3'   => "''strobe'' retornou a luz detectada",
+'exif-flash-mode-1'     => 'disparo de flash forçado',
+'exif-flash-mode-2'     => "disparo de ''flash'' suprimido",
+'exif-flash-mode-3'     => 'modo automático',
+'exif-flash-function-1' => "Sem função de ''flash''",
+'exif-flash-redeye-1'   => 'modo de redução de olhos vermelhos',
+
 'exif-focalplaneresolutionunit-2' => 'polegadas',
 
 'exif-sensingmethod-1' => 'Indefinido',
@@ -2544,21 +2841,10 @@ $1
 Por favor, confirme que realmente deseja recriar esta página.",
 'recreate'            => 'Recriar',
 
-# HTML dump
-'redirectingto' => 'Redirecionando para [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Limpar a memória cache desta página?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Pesquisar por páginas contendo ''$1''.",
-'searchnamed'      => "Pesquisar por páginas nomeadas como ''$1''.",
-'articletitles'    => "Páginas começando com ''$1''",
-'hideresults'      => 'Esconder resultados',
-'useajaxsearch'    => 'Usar busca AJAX',
+'confirm-purge-top'    => 'Limpar a memória cache desta página?',
+'confirm-purge-bottom' => "Purgar uma página limpa o ''cache'' e força a sua versão mais recente a aparecer.",
 
 # Multipage image navigation
 'imgmultipageprev' => '� página anterior',
@@ -2578,10 +2864,10 @@ $1',
 'table_pager_empty'        => 'Sem resultados',
 
 # Auto-summaries
-'autosumm-blank'   => 'Foi removido o conteúdo completo desta página',
+'autosumm-blank'   => 'Limpou toda a página',
 'autosumm-replace' => "Página substituída por '$1'",
 'autoredircomment' => 'Redirecionando para [[$1]]',
-'autosumm-new'     => 'Nova página: $1',
+'autosumm-new'     => "Criou página com '$1'",
 
 # Live preview
 'livepreview-loading' => 'Carregando…',
@@ -2622,6 +2908,7 @@ Você também pode [[Special:Watchlist/edit|editar a lista da forma convencional
 
 # Core parser functions
 'unknown_extension_tag' => '"$1" é uma tag de extensão desconhecida',
+'duplicate-defaultsort' => 'Aviso: A chave de ordenação padrão "$2" sobrepõe-se à anterior chave de ordenação padrão "$1".',
 
 # Special:Version
 'version'                          => 'Versão', # Not used as normal message but as header for the special page itself
@@ -2650,13 +2937,13 @@ Você também pode [[Special:Watchlist/edit|editar a lista da forma convencional
 'filepath-submit'  => 'Diretório',
 'filepath-summary' => 'Através dsta página especial é possível descobrir o endereço completo de um determinado arquivo. As imagens serão exibidas em sua resolução máxima, outros tipos de arquivos serão iniciados automaticamente em seus programas correspondentes.
 
-Entre com o nome do arquivo sem utilizar o prefixo "{{ns:image}}:".',
+Entre com o nome do arquivo sem utilizar o prefixo "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Procurar por arquivos duplicados',
 'fileduplicatesearch-summary'  => 'Procure por arquivos duplicados tendo por base seu valor "hash".
 
-Entre com o nome de arquivo sem fornecer o prefixo "{{ns:image}}:".',
+Entre com o nome de arquivo sem fornecer o prefixo "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Procurar por duplicatas',
 'fileduplicatesearch-filename' => 'Nome do arquivo:',
 'fileduplicatesearch-submit'   => 'Pesquisa',
@@ -2686,4 +2973,13 @@ Entre com o nome de arquivo sem fornecer o prefixo "{{ns:image}}:".',
 'blankpage'              => 'Página em branco',
 'intentionallyblankpage' => 'Esta página foi intencionalmente deixada em branco e é usada para medições de performance, etc.',
 
+# External image whitelist
+'external_image_whitelist' => "  # Deixe esta linha exatamente como ela é <pre> 
+# Coloque uma expressão regular (apenas a parte que vai entre o //) a seguir
+# Estes serão casados com as URLs de imagens externas (''hotlinked'')
+# Aqueles que corresponderem serão exibidos como imagens, caso contrário, apenas uma ligação para a imagem será mostrada
+# As linhas que começam com # são tratadas como comentários
+
+# Coloque todos os fragmentos de ''regex'' acima dessa linha. Deixe esta linha exatamente como ela é</pre>",
+
 );
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
new file mode 100644
index 00000000..f2e1d425
--- /dev/null
+++ b/languages/messages/MessagesQqq.php
@@ -0,0 +1,2548 @@
+<?php
+/** Message documentation (Message documentation)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Ahonc
+ * @author Aleator
+ * @author AnakngAraw
+ * @author Ans
+ * @author Aotake
+ * @author Bangin
+ * @author Boivie
+ * @author Brest
+ * @author BrokenArrow
+ * @author Codex Sinaiticus
+ * @author Dalibor Bosits
+ * @author Darth Kule
+ * @author Dsvyas
+ * @author Erwin85
+ * @author EugeneZelenko
+ * @author Fryed-peach
+ * @author Garas
+ * @author GerardM
+ * @author Helix84
+ * @author Huji
+ * @author IAlex
+ * @author INkubusse
+ * @author Jon Harald Søby
+ * @author Karduelis
+ * @author Kizito
+ * @author Klenje
+ * @author Klutzy
+ * @author Kwj2772
+ * @author Leinad
+ * @author Lejonel
+ * @author Li-sung
+ * @author Lloffiwr
+ * @author Malafaya
+ * @author McDutchie
+ * @author Meno25
+ * @author MichaelFrey
+ * @author Mormegil
+ * @author Mpradeep
+ * @author Nemo bis
+ * @author Niels
+ * @author Nike
+ * @author Node ue
+ * @author Octahedron80
+ * @author Platonides
+ * @author Purodha
+ * @author Raymond
+ * @author SPQRobin
+ * @author Sanbec
+ * @author Sborsody
+ * @author Seb35
+ * @author Shushruth
+ * @author Siebrand
+ * @author Singularity
+ * @author Sionnach
+ * @author Slomox
+ * @author Sp5uhe
+ * @author Srhat
+ * @author UV
+ * @author Urhixidur
+ * @author Verdy p
+ * @author Vinhtantran
+ * @author Yyy
+ * @author פוילישער
+ */
+
+$messages = array(
+# User preference toggles
+'tog-underline' => "[[Special:Preferences]], tab 'Misc'. Offers user a choice how to underline links.",
+'tog-highlightbroken' => "[[Special:Preferences]], tab 'Misc'. Offers user a choice how format internal links to non-existing pages. As red links or with a trailing question mark.",
+'tog-justify' => "[[Special:Preferences]], tab 'Misc'. Offers user a choice to justify paragraphs or not.",
+'tog-hideminor' => "[[Special:Preferences]], tab 'Recent changes'. Offers user to hide minor edits in recent changes or not.",
+'tog-extendwatchlist' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to show all applicable changes in watchlist (by default only the last change to a page on the watchlist is shown).",
+'tog-usenewrc' => "[[Special:Preferences]], tab 'Recent changes'. Offers user to use alternative reprsentation of [[Special:RecentChanges]].",
+'tog-numberheadings' => "[[Special:Preferences]], tab 'Misc'. Offers numbered headings on content pages to user.",
+'tog-showtoolbar' => "[[Special:Preferences]], tab 'Edit'. Offers user to show edit toolbar in page edit screen.
+
+This is the toolbar: [[Image:Toolbar.png]]",
+'tog-editondblclick' => "[[Special:Preferences]], tab 'Edit'. Offers user to open edit page on double click.",
+'tog-editsection' => "[[Special:Preferences]], tab 'Edit'. Offers user to add links in sub headings for editing sections.",
+'tog-editsectiononrightclick' => "[[Special:Preferences]], tab 'Edit'. Offers user to edit a section by clicking on a section title.",
+'tog-showtoc' => "[[Special:Preferences]], tab 'Misc'. Offers user to show a table of contents automatically if a page has more than three headings.",
+'tog-rememberpassword' => "[[Special:Preferences]], tab 'User profile', section 'Change password'. Offers user remember login details.
+
+{{Identical|Remember my login on this computer}}",
+'tog-editwidth' => "[[Special:Preferences]], tab 'Edit'. Offers user make give edit box full width in browser.",
+'tog-watchcreations' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to add created pages to watchlist.",
+'tog-watchdefault' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to add edited pages to watchlist.",
+'tog-watchmoves' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to add moved pages to watchlist.",
+'tog-watchdeletion' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to add deleted pages to watchlist.",
+'tog-minordefault' => "[[Special:Preferences]], tab 'Edit'. Offers user to mark all edits minor by default.",
+'tog-previewontop' => 'Toggle option used in [[Special:Preferences]].',
+'tog-previewonfirst' => 'Toggle option used in [[Special:Preferences]].',
+'tog-nocache' => "[[Special:Preferences]], tab 'Misc.'. Offers the user the option of disabling caching of pages in the browser",
+'tog-enotifwatchlistpages' => 'In user preferences',
+'tog-enotifusertalkpages' => 'In user preferences',
+'tog-enotifminoredits' => 'In user preferences',
+'tog-enotifrevealaddr' => 'Toggle option used in [[Special:Preferences]].',
+'tog-shownumberswatching' => 'Toggle option used in [[Special:Preferences]], in the section for recent changes. When this option is activated, the entries in recent changes includes the number of users who watch pages.',
+'tog-fancysig' => 'In user preferences under the signature box',
+'tog-externaleditor' => "[[Special:Preferences]], tab 'Edit'. Offers user to use an external editor by default.",
+'tog-externaldiff' => "[[Special:Preferences]], tab 'Edit'. Offers user to use an external diff program by default.",
+'tog-showjumplinks' => 'Toggle option used in [[Special:Preferences]]. The "jump to" links are shown as "jump to: navigation, search" but they are hidden by default (you can enable them with this option).',
+'tog-uselivepreview' => 'Toggle option used in [[Special:Preferences]]. Live preview is an experimental feature (unavailable by default) to use edit preview without loading the page again.',
+'tog-forceeditsummary' => 'Toggle option used in [[Special:Preferences]].',
+'tog-watchlisthideown' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide own edits from watchlist.",
+'tog-watchlisthidebots' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide bot edits from watchlist.",
+'tog-watchlisthideminor' => "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide minor edits from watchlist.",
+'tog-watchlisthideliu' => "Option in tab 'Watchlist' of [[Special:Preferences]]",
+'tog-watchlisthideanons' => "Option in tab 'Watchlist' of [[Special:Preferences]]",
+'tog-nolangconversion' => 'In user preferences.',
+'tog-ccmeonemails' => 'In user preferences',
+'tog-diffonly' => 'Toggle option used in [[Special:Preferences]].',
+'tog-showhiddencats' => 'Toggle option used in [[Special:Preferences]].',
+'tog-noconvertlink' => '{{optional}}',
+'tog-norollbackdiff' => "Option in [[Special:Preferences]], 'Misc' tab. Only shown for users with the rollback right. By default a diff is shown below the return screen of a rollback. Checking this preference toggle will suppress that.
+{{Identical|Rollback}}",
+
+'underline-always' => 'Used in [[Special:Preferences]] (under "Misc"). This option means "always underline links", there are also options "never" and "browser default".',
+'underline-never' => 'Used in [[Special:Preferences]] (under "Misc"). This option means "never underline links", there are also options "always" and "browser default".
+
+{{Identical|Never}}',
+'underline-default' => 'Used in [[Special:Preferences]] (under "Misc"). This option means "underline links as in your browser", there are also options "never" and "always".',
+
+# Dates
+'sunday' => 'Name of the day of the week.',
+'monday' => 'Name of the day of the week.',
+'tuesday' => 'Name of the day of the week.',
+'wednesday' => 'Name of the day of the week.',
+'thursday' => 'Name of the day of the week.',
+'friday' => 'Name of the day of the week.',
+'saturday' => 'Name of the day of the week.',
+'sun' => 'Abbreviation for Sunday, a day of the week.',
+'mon' => 'Abbreviation for Monday, a day of the week.',
+'tue' => 'Abbreviation for Tuesday, a day of the week.',
+'wed' => 'Abbreviation for Wednesday, a day of the week.',
+'thu' => 'Abbreviation for Thursday, a day of the week.',
+'fri' => 'Abbreviation for Friday, a day of the week.',
+'sat' => 'Abbreviation for Saturday, a day of the week.',
+'january' => 'The first month of the Gregorian calendar',
+'february' => 'The second month of the Gregorian calendar',
+'march' => 'The third month of the Gregorian calendar',
+'april' => 'The fourth month of the Gregorian calendar',
+'may_long' => 'The fifth month of the Gregorian calendar',
+'june' => 'The sixth month of the Gregorian calendar',
+'july' => 'The seventh month of the Gregorian calendar',
+'august' => 'The eighth month of the Gregorian calendar',
+'september' => 'The ninth month of the Gregorian calendar',
+'october' => 'The tenth month of the Gregorian calendar',
+'november' => 'The eleventh month of the Gregorian calendar',
+'december' => 'The twelfth month of the Gregorian calendar',
+'january-gen' => 'The first month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'february-gen' => 'The second month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'march-gen' => 'The third month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'april-gen' => 'The fourth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'may-gen' => 'The fifth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'june-gen' => 'The sixth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'july-gen' => 'The seventh month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'august-gen' => 'The eighth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'september-gen' => 'The nineth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'october-gen' => 'The tenth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'november-gen' => 'The eleventh month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'december-gen' => 'The twelfth month of the Gregorian calendar. Must be in genitive, if the language has a genitive case.',
+'jan' => 'Abbreviation of January, the first month of the Gregorian calendar',
+'feb' => 'Abbreviation of February, the second month of the Gregorian calendar',
+'mar' => 'Abbreviation of March, the thrird month of the Gregorian calendar',
+'apr' => 'Abbreviation of April, the fourth month of the Gregorian calendar',
+'may' => 'Abbreviation of May, the fifth month of the Gregorian calendar',
+'jun' => 'Abbreviation of June, the sixth month of the Gregorian calendar',
+'jul' => 'Abbreviation of July, the seventh month of the Gregorian calendar',
+'aug' => 'Abbreviation of August, the eighth month of the Gregorian calendar',
+'sep' => 'Abbreviation of September, the nineth month of the Gregorian calendar',
+'oct' => 'Abbreviation of October, the tenth month of the Gregorian calendar',
+'nov' => 'Abbreviation of November, the eleventh month of the Gregorian calendar',
+'dec' => 'Abbreviation of December, the twelfth month of the Gregorian calendar',
+
+# Categories related messages
+'category_header' => 'In category description page',
+'category-media-header' => 'In category description page',
+'category-empty' => 'The text displayed in category page when that category is empty',
+'hidden-category-category' => 'Name of the category where hidden categories will be listed.',
+'category-subcat-count' => 'This message is displayed at the top of a category page showing the number of pages in the category.
+
+* $1: number of subcategories shown
+* $2: total number of subcategories in category',
+'category-subcat-count-limited' => 'This message is displayed at the top of a category page showing the number of pages in the category when not all pages in a category are counted.
+
+* $1: number of subcategories shown',
+'category-article-count' => 'This message is used on category pages.
+
+* $1: number of pages shown
+* $2: total number of pages in category',
+'category-article-count-limited' => 'This message is displayed at the top of a category page showing the number of pages in the category when not all pages in a category are counted.
+
+* $1: number of pages shown',
+'category-file-count' => 'This message is displayed at the top of a category page showing the number of pages in the category.
+
+* $1: number of files shown
+* $2: total number of files in category',
+'category-file-count-limited' => 'This message is displayed at the top of a category page showing the number of pages in the category when not all pages in a category are counted.
+
+* $1: number of files shown',
+'listingcontinuesabbrev' => 'Shown in contiuation of each first letter group.
+See http://test.wikipedia.org/wiki/Category:Test_ko?uselang={{SUBPAGENAME}}, for example.',
+
+'linkprefix' => '{{optional}}',
+'mainpagetext' => 'Along with {{msg|mainpagedocfooter}}, the text you will see on the Main Page when your wiki is installed.',
+'mainpagedocfooter' => 'Along with {{msg|mainpagetext}}, the text you will see on the Main Page when your wiki is installed.',
+
+'about' => '{{Identical|About}}',
+'article' => '{{Identical|Content page}}',
+'newwindow' => 'Below the edit form, next to "[[MediaWiki:Edithelp/{{SUBPAGENAME}}|Editing help]]".',
+'cancel' => 'Message shown below the edit form, and if you click on it, you stop with editing the page and go back to the normal page view.
+
+{{Identical|Cancel}}',
+'qbfind' => 'Alternative for "search" as used in Cologne Blue skin.',
+'qbedit' => '{{Identical|Edit}}',
+'qbmyoptions' => '{{Identical|My pages}}',
+'qbspecialpages' => '{{Identical|Special pages}}',
+'moredotdotdot' => '{{Identical|More...}}',
+'mytalk' => 'In the personal urls page section - right upper corner.',
+'navigation' => '{{Identical|Navigation}}',
+'and' => 'The translation for "and" appears in the [[Special:Version]] page, between the last two items of a list. If a comma is needed, add it at the beginning without a gap between it and the "&". <nowiki>&#32;</nowiki> is a blank space, one character long. Please leave it as it is.
+
+{{Identical|And}}',
+
+# Metadata in edit box
+'metadata_help' => '{{Identical|Metadata}}',
+
+'errorpagetitle' => 'Message shown in browser title bar when encountering error operation.
+
+{{Identical|Error}}',
+'returnto' => '{{Identical|Return to $1}}',
+'tagline' => 'Used to idenify the source of copied information. Do not change <nowiki>{{SITENAME}}</nowiki>.',
+'help' => 'General text (noun) used in the sidebar (by default). 
+
+See also [[MediaWiki:Helppage/{{SUBPAGENAME}}|{{int:helppage}}]] and [[MediaWiki:Edithelp/{{SUBPAGENAME}}|{{int:edithelp}}]].
+
+{{Identical|Help}}',
+'search' => 'Noun. Text of menu section shown on every page of the wiki above the search form.
+
+{{Identical|Search}}',
+'searchbutton' => 'The button you can see in the sidebar, below the search input box. The "Go" button is [[MediaWiki:Searcharticle/{{SUBPAGENAME}}]].
+
+{{Identical|Search}}',
+'go' => '{{Identical|Go}}',
+'searcharticle' => 'Button description in the search menu displayed on every page. The "Search" button is [[MediaWiki:Searchbutton/{{SUBPAGENAME}}]].
+
+{{Identical|Go}}',
+'history_short' => 'Text used on the history tab.
+
+{{Identical|History}}',
+'updatedmarker' => 'Displayed in the page history (of a page you are [[Special:Watchlist|watching]]), when the page has been edited since the last time you visited it.',
+'printableversion' => 'Display name for link in wiki menu that leads to a printable version of a content page. Example: see one but last menu item on [[Main Page]].',
+'permalink' => 'Display name for a permanent link to the current revision of a page. When the page is edited, permalink will still link to this revision. Example: Last menu link on [[{{MediaWiki:Mainpage}}]]',
+'edit' => 'The text of the tab going to the edit form. When the page is protected, you will see "[[MediaWiki:Viewsource/{{SUBPAGENAME}}|{{int:viewsource}}]]". Should be in the infinitive mood.
+
+{{Identical|Edit}}',
+'create' => 'The text on the tab for to the edit form on unexisting pages.
+
+{{Identical|Create}}',
+'editthispage' => 'This is the "edit" link as used in the skins Classic/Standard, Cologne Blue and Nostalgia. See {{msg|create-this-page}} for when the page does not exist.',
+'create-this-page' => 'In the skins Classic/Standard, Cologne Blue and Nostalgia this is the text for the link leading to the edit form on pages that have not yet been created. See {{msg|editthispage}} for when the page already exists.',
+'delete' => 'Name of the Delete tab shown for admins. Should be in the imperative mood.
+
+{{Identical|Delete}}',
+'deletethispage' => '{{Identical|Delete this page}}',
+'undelete_short' => "It is tab label. It's really can be named ''nstab-undelete''.",
+'protect' => 'Name of protect tab displayed for admins',
+'protect_change' => 'Text on links for each entry in [[Special:ProtectedPages]] to change the protection of pages (only displayed to admins).',
+'protectthispage' => '{{Identical|Protect this page}}',
+'unprotect' => 'Name of unprotect tab displayed for admins',
+'talkpagelinktext' => 'Used as name of links going to talk page in some places, like in the subheading of [[Special:Mycontributions|Special:Contributions]], in [[Special:RecentChanges]], and in [[Special:Watchlist]].
+
+{{Identical|Talk}}',
+'personaltools' => 'Heading for a group of links to your user page, talk page, preferences, watchlist, and contributions. This heading is visible in the sidebar in some skins. For an example, see [http://translatewiki.net/wiki/Main_Page?useskin=simple Main Page using simple skin].',
+'articlepage' => '{{Identical|Content page}}',
+'talk' => 'Used as display name for the tab to all talk pages. These pages accompany all content pages and can be used for discussing the content page. Example: [[Talk:Example]].
+
+{{Identical|Discussion}}',
+'views' => 'Subtitle for the list of available views, for the current page. In "monobook" skin the list of views are shown as tabs, so this sub-title is not shown.  To check when and where this message is displayed switch to "simple" skin.
+
+\'\'\'Note:\'\'\' This is "views" as in "appearances"/"representations", \'\'\'not\'\'\' as in "visits"/"accesses".',
+'toolbox' => 'The title of the toolbox below the search menu.',
+'otherlanguages' => 'This message is shown under the toolbox. It is used if there are interwiki links added to the page, like <tt><nowiki>[[</nowiki>en:Interwiki article]]</tt>.',
+'redirectedfrom' => 'The text displayed when a certain page is redirected to another page. Variable <tt>$1</tt> contains the name of the page user came from.',
+'redirectpagesub' => 'Displayed under the page title of a page which is a redirect to another page, see [{{fullurl:Betawiki:Translators|redirect=no}} Betawiki:Translators] for example.
+
+{{Identical|Redirect page}}',
+'lastmodifiedat' => 'This message is shown below each page, in the footer with the logos and links.
+* $1: date
+* $2: time
+
+See also [[MediaWiki:Lastmodifiedatby/{{SUBPAGENAME}}]].',
+'jumpto' => '"Jump to" navigation links. Hidden by default in monobook skin. The format is: {{int:jumpto}} [[MediaWiki:Jumptonavigation/{{SUBPAGENAME}}|{{int:jumptonavigation}}]], [[MediaWiki:Jumptosearch/{{SUBPAGENAME}}|{{int:jumptosearch}}]].',
+'jumptonavigation' => 'Part of the "jump to" navigation links. Hidden by default in monobook skin. The format is: [[MediaWiki:Jumpto/{{SUBPAGENAME}}|{{int:jumpto}}]] {{int:jumptonavigation}}, [[MediaWiki:Jumptosearch/{{SUBPAGENAME}}|{{int:jumptosearch}}]].
+
+{{Identical|Navigation}}',
+'jumptosearch' => 'Part of the "jump to" navigation links. Hidden by default in monobook skin. The format is: [[MediaWiki:Jumpto/{{SUBPAGENAME}}|{{int:jumpto}}]] [[MediaWiki:Jumptonavigation/{{SUBPAGENAME}}|{{int:jumptonavigation}}]], {{int:jumptosearch}}.
+
+{{Identical|Search}}',
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite' => 'Used as page name and link at the bottom of each wiki page. The contents of the page explain the purpose of the site.
+
+{{doc-important|Do not change <nowiki>{{SITENAME}}</nowiki>}}
+
+{{Identical|About}}',
+'aboutpage' => 'Used as page for that contains the site description. Used at the bottom of every page on the wiki. Example: [[{{MediaWiki:Aboutpage}}|{{MediaWiki:About}} {{SITENAME}}]].
+
+{{doc-important|Do not translate "Project:" part}}',
+'copyrightpagename' => '{{doc-important|Do not change <nowiki>{{SITENAME}}</nowiki>}}',
+'copyrightpage' => '{{doc-important|Do not change <nowiki>{{ns:project}}</nowiki>}}',
+'currentevents' => 'Standard link in the sidebar, for news. See also {{msg|currentevents-url}} for the link url.',
+'currentevents-url' => "Target page of ''{{Mediawiki:currentevents}}'' in the sidebar. See also {{msg|currentevents}}.
+{{doc-important|Do not translate <tt>Project:</tt> part.}}",
+'disclaimers' => 'Used as display name for the link to [[{{MediaWiki:Disclaimerpage}}]] shown at the bottom of every page on the wiki. Example [[{{MediaWiki:Disclaimerpage}}|{{MediaWiki:Disclaimers}}]].',
+'disclaimerpage' => 'Used as page for that contains the site disclaimer. Used at the bottom of every page on the wiki. Example: [[{{MediaWiki:Disclaimerpage}}|{{MediaWiki:Disclaimers}}]]. 
+{{doc-important|Do not change <tt>Project:</tt> part.}}',
+'edithelp' => 'This is the text that appears on the editing help link that is near the bottom of the editing page',
+'edithelppage' => 'The help page displayed when a user clicks on editing help link which is present on the right of Show changes button. 
+{{doc-important|Do not change <tt>Help:</tt> part.}}',
+'faqpage' => "FAQ is short for ''frequently asked questions''. This page is only linked on some of the old skins, not in Monobook or Modern.
+
+{{doc-important|Do not translate <tt>Project:</tt> part.}}",
+'helppage' => 'The link destination used by default in the sidebar, and in {{msg|noarticletext}}. 
+{{doc-important|Do not change <tt>Help:</tt> part.}}
+{{Identical|HelpContent}}',
+'mainpage' => 'Defines the link and display name of the main page of the wiki. Shown as the top link in the navigation part of the interface. Please do not change it too often, that could break things!
+
+{{Identical|Main page}}',
+'mainpage-description' => 'The same as {{msg|mainpage|pl=yes}}, used as link text on [[MediaWiki:Sidebar]]. This makes it possible to the change the link destination (the message "mainpage") without changing the link text or without disabling translations.',
+'policy-url' => 'Description: The URL of the project page describing the policies of the wiki. This is shown below every page (the left link).
+{{doc-important|Do not change "Project:" part.}}',
+'portal' => "Display name for the 'Community portal', shown in the sidebar menu of all pages. The target page is meant to be a portal for users where useful links are to be found about the wiki's operation.",
+'portal-url' => 'Description: The URL of the community portal. This is shown in the sidebar by default (removed on Betawiki).
+{{doc-important|Do not change "Project:" part.}}',
+'privacy' => 'Used as page name and link at the bottom of each wiki page. The page contains a legal notice providing information about the use of personal information by the website owner.of the site. Example: [[Privacy policy]].',
+'privacypage' => 'Used as page for that contains the privacy policy. Used at the bottom of every page on the wiki. Example: [[{{MediaWiki:Privacypage}}|{{MediaWiki:Privacy}}]].
+
+{{doc-important|Do not change <tt>Project:</tt> part.}}',
+
+'badaccess' => 'Title shown within page indicating unauthorized access.',
+'badaccess-group0' => 'Shown when you are not allowed to do something.',
+'badaccess-groups' => "Error message when you aren't allowed to do something.
+
+* $1 is a list of groups.
+* $2 is the number of groups.",
+
+'versionrequired' => 'This message is not used in the MediaWiki core, but was introduced with the reason that it could be useful for extensions. See also {{msg|versionrequiredtext}}.',
+'versionrequiredtext' => 'This message is not used in the MediaWiki core, but was introduced with the reason that it could be useful for extensions. See also {{msg|versionrequired}}.',
+
+'ok' => '{{Identical|OK}}',
+'pagetitle' => '{{doc-important|You most probably do not need to translate this message.}}',
+'retrievedfrom' => 'Message which appears in the source of every page, but it is hidden. It is shown when printing. $1 is a link back to the current page: {{FULLURL:{{FULLPAGENAME}}}}.',
+'youhavenewmessages' => 'The orange message appearing when someone edited your user talk page.
+The format is: "{{int:youhavenewmessages| [[MediaWiki:Newmessageslink/{{SUBPAGENAME}}|{{int:newmessageslink}}]] |[[MediaWiki:Newmessagesdifflink/{{SUBPAGENAME}}|{{int:newmessagesdifflink}}]]}}"',
+'newmessageslink' => 'This is the first link displayed in an orange rectangle when a user gets a message on his talk page. Used in message {{msg|youhavenewmessages|pl=yes}} (as parameter $1).
+
+{{Identical|New messages}}',
+'newmessagesdifflink' => 'This is the second link displayed in an orange rectangle when a user gets a message on his talk page',
+'youhavenewmessagesmulti' => 'The alternative of {{msg|youhavenewmessages}} as used on wikis with a special setup so they can receive the "new message" notice on other wikis as well. Used on [http://www.wikia.com/ Wikia].',
+'editsection' => 'Display name of link to edit a section on a content page. Example: [{{MediaWiki:Editsection}}].
+
+{{Identical|Edit}}',
+'editsection-brackets' => '{{doc-important|This message should most probably not be translated.}}',
+'editold' => '{{Identical|Edit}}',
+'editlink' => 'Text of the edit link shown next to every (editable) template in the list of used templates below the edit window. See also {{msg-mw|Viewsourcelink}}.
+
+{{Identical|Edit}}',
+'viewsourcelink' => 'Text of the link shown next to every uneditable (protected) template in the list of used templates below the edit window. See also {{msg-mw|Editlink}}.
+
+{{Identical|View source}}',
+'editsectionhint' => "Tool tip shown when hovering the mouse over the link to '[{{MediaWiki:Editsection}}]' a section. Example: Edit section: Heading name",
+'toc' => 'This is the title of the table of contents displayed in pages with more than 3 sections
+
+{{Identical|Contents}}',
+'showtoc' => 'This is the link used to show the table of contents
+
+{{Identical|Show}}',
+'hidetoc' => 'This is the link used to hide the table of contents
+
+{{Identical|Hide}}',
+'restorelink' => "This text is always displayed in conjunction with the {{msg-mw|thisisdeleted}} message (View or restore $1?). The user will see
+View or restore <nowiki>{{PLURAL:$1|one deleted edit|$1 deleted edits}}</nowiki>?    i.e ''View or restore one deleted edit?''     or 
+''View or restore n deleted edits?''",
+'feed-unavailable' => 'This message is displayed when a user tries to use an RSS or Atom feed on a wiki where such feeds have been disabled.',
+'site-rss-feed' => "Used in the HTML header of a wiki's RSS feed.
+$1 is <nowiki>{{SITENAME}}</nowiki>.
+HTML markup cannot be used.",
+'site-atom-feed' => "Used in the HTML header of a wiki's Atom feed.
+$1 is <nowiki>{{SITENAME}}</nowiki>.
+HTML markup cannot be used.",
+'feed-atom' => '{{optional}}',
+'feed-rss' => '{{optional}}',
+'red-link-title' => 'Title for red hyperlinks. Indicates, that the page is empty, not written yet.',
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-main' => 'The name for the tab of the main namespace. Example: [[Example]]
+
+{{Identical|Page}}',
+'nstab-user' => 'The name for the tab of the user namespace. Example: [[User:Example]]
+
+{{Identical|User page}}',
+'nstab-special' => 'The name for the tab of the special namespace. Example: [[Special:Version]]',
+'nstab-project' => 'The name for the tab of the project namespace. Example: [[Project:Example]]',
+'nstab-image' => 'The name for the tab of the image namespace. Example: [[Image:Example]]
+
+{{Identical|File}}',
+'nstab-mediawiki' => 'The name for the tab of the MediaWiki namespace. Example: [[MediaWiki:Example]]
+
+{{Identical|Message}}',
+'nstab-template' => 'The name for the tab of the template namespace. Example: [[Template:Example]]
+
+{{Identical|Template}}',
+'nstab-help' => 'The name for the tab of the help namespace. Example: [[Help:Rollback]]',
+'nstab-category' => 'The name for the tab of the category namespace. Example: [[:Category:Example]]
+
+{{Identical|Category}}',
+
+# Main script and global functions
+'nosuchspecialpage' => 'The title of the error you get when trying to open a special page which does not exist.
+The text of the warning is the message [[MediaWiki:Nospecialpagetext/{{SUBPAGENAME}}]]. Example: [[Special:Nosuchpage]]',
+'nospecialpagetext' => "The text of the error you get when trying to open a special page which does not exist.
+The title of the warning is the message [[MediaWiki:Nosuchspecialpage/{{SUBPAGENAME}}]]. \"''<nowiki>[[Special:SpecialPages|{{int:specialpages}}]]</nowiki>''\" should remain untranslated. Example: [[Special:Nosuchpage]]",
+
+# General errors
+'error' => '{{Identical|Error}}',
+'enterlockreason' => 'For developers when locking the database',
+'missing-article' => "This message is shown when a revision does not exist, either as permalink or as diff. Examples:
+
+# [http://translatewiki.net/w/i.php?title=Betawiki:News&oldid=9999999 Permalink with invalid revision#]
+# [http://translatewiki.net/w/i.php?title=Betawiki:News&diff=426850&oldid=99999999 Diff with invalid revision#]
+
+'''Parameters'''
+* $1: Pagename
+* $2: Content of 
+*# {{msg|Missingarticle-rev}} - Permalink with invalid revision#
+*# {{msg|Missingarticle-diff}} - Diff with invalid revision#",
+'missingarticle-rev' => 'Parameter $2 of {{msg|Missing-article}}: It is shown after the articlename.
+
+* $1: revision# of the requested id
+
+[http://translatewiki.net/w/i.php?title=Translating:Tasks&oldid=371789000 Click here] to see an example of such an error message.',
+'missingarticle-diff' => 'Parameter $2 of {{msg|Missing-article}}: It is shown after the articlename.
+
+* $1: revision# of the old id
+* $2: revision# of the id build the diff with.
+
+[http://translatewiki.net/w/i.php?title=Translating:Tasks&diff=372398&oldid=371789000 Click here] to see an example of such an error message.',
+'readonly_lag' => 'Error message displayed when the database is locked.',
+'internalerror' => '{{Identical|Internal error}}',
+'badtitle' => '{{Identical|Bad title}}',
+'querypage-no-updates' => 'Text on some special pages, e.g. [[Special:FewestRevisions]].',
+'viewsource' => 'The text displayed in place of the "edit" tab when the user has no permission to edit the page.
+
+{{Identical|View source}}',
+'viewsourcefor' => 'Subtitle shown when trying to edit a protected page.
+
+{{Identical|For $1}}',
+'protectedpagetext' => 'This message is displayed when trying to edit a page you can\'t edit because it has been protected.
+
+* $1: the protection type, e.g. "protect" for fully protected pages',
+'viewsourcetext' => 'The text shown when displaying the source of a page that the user has no permission to edit',
+'protectedinterface' => 'Message shown if a user without the "editinterface" right tries to edit a page in the MediaWiki namespace.',
+'editinginterface' => "A message shown when editing pages in the namespace MediaWiki:. In the [http://translatewiki.net/wiki/Main_Page?setlang=en URL], '''change \"setlang=en\" to your own language code.'''",
+'ns-specialprotected' => 'Error message displayed when trying to edit a page in the Special namespace',
+
+# Login and logout pages
+'logouttext' => 'Log out message',
+'welcomecreation' => 'The welcome message users see after registering a user account. $1 is the username of the new user.',
+'yourname' => 'In user preferences
+
+{{Identical|Username}}',
+'yourpassword' => 'In user preferences
+
+{{Identical|Password}}',
+'yourpasswordagain' => 'In user preferences',
+'remembermypassword' => '{{Identical|Remember my login on this computer}}',
+'externaldberror' => 'This message is thrown when a valid attempt to change the wiki password for a user fails because of a database error or an error from an external system.',
+'login' => "Shown to anonymous users in the upper right corner of the page. It is shown when you can't create an account, otherwise the message {{msg|nav-login-createaccount}} is shown.
+
+{{Identical|Log in}}",
+'nav-login-createaccount' => "Shown to anonymous users in the upper right corner of the page. When you can't create an account, the message {{msg|login}} is shown.",
+'loginprompt' => 'A small notice in the log in form.',
+'userlogin' => 'Name of special page [[Special:UserLogin]] where a user can log in or click to create a user account.',
+'logout' => '{{Identical|Log out}}',
+'userlogout' => '{{Identical|Log out}}',
+'notloggedin' => 'This message is displayed in the standard skin when not logged in. The message is placed above the login link in the top right corner of pages.
+
+{{Identical|Not logged in}}',
+'nologin' => 'A message shown in the log in form. $1 is a link to the account creation form, and the text of it is "[[MediaWiki:Nologinlink/{{SUBPAGENAME}}|{{int:nologinlink}}]]".',
+'nologinlink' => 'Text of the link to the account creation form. Before that link, the message [[MediaWiki:Nologin/{{SUBPAGENAME}}]] appears.',
+'createaccount' => 'Used on the submit button in the form where you register a new account.',
+'gotaccount' => 'A message shown in the account creation form. $1 is a link to the log in form, and the text of it is "[[MediaWiki:Gotaccountlink/{{SUBPAGENAME}}|{{int:gotaccountlink}}]]".',
+'gotaccountlink' => 'Text of the link to the log in form. Before that link, the message [[MediaWiki:Gotaccount/{{SUBPAGENAME}}]] appears.
+
+{{Identical|Log in}}',
+'youremail' => '{{Identical|E-mail}}',
+'username' => '{{Identical|Username}}',
+'uid' => '{{Identical|User ID}}',
+'prefs-memberingroups' => 'This message is shown on [[Special:Preferences]], first tab, where it is follwed by a colon.',
+'yourrealname' => '{{Identical|Real name}}',
+'yourlanguage' => '{{Identical|Language}}',
+'yourvariant' => '{{optional}}',
+'yournick' => 'Used in [[Special:Preferences]].',
+'badsig' => 'Error message displayed when entering invalid signature in user preferences',
+'badsiglength' => 'Warning message that is displayed on [[Special:Preferences]] when trying to save a signature that is too long. Parameter $1 is the maximum number of characters that is allowed in a signature (multi-byte characters are counted as one character).',
+'email' => '{{Identical|E-mail}}',
+'prefs-help-realname' => 'In user preferences.',
+'prefs-help-email' => 'Shown as explanation text on [[Special:Preferences]].',
+'nocookiesnew' => "This message is displayed when a new account was successfully created, but the browser doesn't accept cookies.",
+'nocookieslogin' => "This message is displayed when someone tried to login, but the browser doesn't accept cookies.",
+'loginsuccesstitle' => 'The title of the page saying that you are logged in. The content of the page is the message "[[MediaWiki:Loginsuccess/{{SUBPAGENAME}}]]".',
+'loginsuccess' => 'The content of the page saying that you are logged in. The title of the page is "[[MediaWiki:Loginsuccesstitle/{{SUBPAGENAME}}|{{int:loginsuccesstitle}}]]". $1 is the name of the logged in user.',
+'nosuchuser' => 'Displayed when trying to log in with an unexisting username. When you are not allowed to create an account, the message {{msg|nosuchusershort}} is displayed.',
+'nosuchusershort' => "Displayed when trying to log in with an unexisting username. This message is only shown when you can't create an account, otherwise the message {{msg|nosuchusershort}} is displayed.",
+'wrongpasswordempty' => 'Error message displayed when entering a blank password',
+'passwordtooshort' => 'This message is shown at
+
+* [[Special:Preferences]]
+* [[Special:CreateAccount]]
+
+$1 is the minimum number of characters in the password.',
+'mailmypassword' => 'Shown at [[Special:UserLogin]]',
+'passwordremindertitle' => 'Title of e-mail which contains temporary password',
+'passwordremindertext' => 'This text is used in an e-mail sent when a user requests a new temporary password (he has forgotten his password) or when an sysop creates a new user account choosing to have password and username sent to the new user by e-mail.
+* $1 is an IP addres. Example: 123.123.123.123
+* $2 is a username. Example: Joe
+* $3 is a password. Example: er##@fdas!
+* $4 is a URL. Example: http://wiki.example.com',
+'noemail' => 'Shown as error message when trying to register a user sending password to e-mail adress and no e-mail address has been given. Registering users and sending a password to an e-mail address may require non-standard user rights. ([http://translatewiki.net/w/i.php?title=Special:UserLogin&action=submitlogin&type=signup Register user link])',
+'acct_creation_throttle_hit' => 'Errormessage at [[Special:CreateAccount]].
+"in the last day" precisely means: during the lasts 86400 seconds (24 hours) ending right now.',
+'emailauthenticated' => 'In user preferences. ([[Special:Preferences]])
+
+* $1: obsolete, date and time
+* $2: date
+* $3: time',
+'invalidemailaddress' => 'Shown as a warning when written an invalid e-mail adress in [[Special:Preferences]] and {{fullurl:Special:UserLogin|type=signup}} page',
+'createaccount-title' => 'This is the subject of an e-mail sent to the e-mail address entered at [[Special:CreateAccount]] if the button "by e-mail" is clicked.',
+'createaccount-text' => 'This text is sent as an e-mail to the e-mail address entered at [[Special:CreateAccount]] if the button "by e-mail" is clicked.
+
+*Parameter $2 is the name entered as username.
+*Parameter $3 is a password (randomly generated).
+*Parameter $4 is a URL to the wiki',
+'login-throttled' => 'Error message shown at [[Special:UserLogin]] after 5 wrong passwords. The hardcoded waiting time is 300 seconds.',
+
+# Password reset dialog
+'resetpass' => 'The caption of [[Special:Resetpass]]',
+'resetpass_header' => '{{Identical|Reset password}}',
+'oldpassword' => "Used on the 'User profile' tab of 'my preferences'. This is the text next to an entry box for the old password in the 'change password' section.",
+'newpassword' => '{{Identical|New password}}',
+'retypenew' => "Appears on the 'User profile' tab of the 'Preferences' special page in the 'Change password' section. It appears next to the text box for entering the new password a second time.",
+'resetpass-submit-loggedin' => 'Button on [[Special:ResetPass]] to submit new password.',
+'resetpass-wrong-oldpass' => 'Error message shown on [[Special:Resetpass]] when the old password is not valid.',
+'resetpass-temp-password' => 'The label of the input box for the temporary password (received by e-mail) on the form displayed after logging in with a temporary password.',
+
+# Edit page toolbar
+'bold_sample' => 'This is the sample text that you get when you press the first button on the left on the edit toolbar.
+
+{{Identical|Bold text}}',
+'bold_tip' => 'This is the text that appears when you hover the mouse over the first button on the left of the edit toolbar.
+
+{{Identical|Bold text}}',
+'italic_sample' => 'The sample text that you get when you press the second button from the left on the edit toolbar.
+
+{{Identical|Italic text}}',
+'italic_tip' => 'This is the text that appears when you hover the mouse over the second button from the left on the edit toolbar.
+
+{{Identical|Italic text}}',
+'link_sample' => 'This is the default text in the internal link that is created when you press the third button from the left on the edit toolbar (the "Ab" icon).',
+'link_tip' => 'Tip for internal links',
+'extlink_sample' => 'This message appears when clicking on the fourth button of the edit toolbar. You can translate "link title". Because many of the localisations had urls that went to domains reserved for advertising, it is recommended that the link is left as-is. All customised links were replaced with the standard one, that is reserved in the standard and will never have adds or something.',
+'extlink_tip' => 'This is the tip that appears when you hover the mouse over the fourth button from the left on the edit toolbar.',
+'headline_sample' => 'Sample of headline text.',
+'headline_tip' => 'This is the text that appears when you hover the mouse over the fifth button from the left on the edit toolbar.',
+'math_sample' => 'The sample formula text that you get when you press the fourth button from the right on the edit toolbar.',
+'math_tip' => 'This is the text that appears when you hover the mouse over the fourth button from the right on the edit toolbar.',
+'nowiki_sample' => 'Text inserted between nowiki tags',
+'nowiki_tip' => 'This is the text that appears when you hover the mouse over the third button from the right on the edit toolbar.',
+'image_sample' => 'Used in text generated by Picture button in toolbar',
+'image_tip' => 'This is the text that appears when you hover the mouse over the sixth (middle) button on the edit toolbar',
+'media_tip' => 'This is the text that appears when you hover the mouse over the fifth button from the right in the edit toolbar.',
+'sig_tip' => 'This is the text that appears when you hover the mouse over the second key from the right on the edit toolbar.',
+'hr_tip' => 'This is the text that appears when you hover the mouse over the first button on the right on the edit toolbar.',
+
+# Edit pages
+'summary' => 'The Summary text beside the edit summary field
+
+{{Identical|Summary}}',
+'minoredit' => 'Text above Save page button in editor',
+'watchthis' => 'Text above Show preview button in editor
+
+{{Identical|Watch this page}}',
+'savearticle' => 'Text on the Save page button. See also {{msg|showpreview}} and {{msg|showdiff}} for the other buttons.',
+'preview' => 'The title of the Preview page shown after clicking the "Show preview" button in the edit page. Since this is a heading, it should probably be translated as a noun and not as a verb.
+
+{{Identical|Preview}}',
+'showpreview' => 'The text of the button to preview the page you are editing. See also {{msg|showdiff}} and {{msg|savearticle}} for the other buttons.',
+'showdiff' => 'Button below the edit page. See also {{msg|showpreview}} and {{msg|savearticle}} for the other buttons.',
+'anoneditwarning' => 'Shown when editing a page anonymously.',
+'summary-preview' => 'Preview of the edit summary, shown under the edit summary itself.',
+'blockedtext' => 'Text displayed to blocked users',
+'autoblockedtext' => 'Text displayed to automatically blocked users.
+
+Parameters:
+* <tt>$1</tt> is the blocking sysop (with a link to his/her userpage)
+* <tt>$2</tt> is the reason for the block
+* <tt>$3</tt> is the current IP address of the blocked user
+* <tt>$4</tt> is the blocking sysop’s username (plain text, without the link)
+* <tt>$5</tt> is the unique numeric identifier of the applied autoblock
+* <tt>$6</tt> is the expiry of the block
+* <tt>$7</tt> is the intended target of the block (what the blocking user specified in the blocking form)
+* <tt>$8</tt> is the timestamp when the block started',
+'blockednoreason' => '{{Identical|No reason given}}',
+'whitelistedittext' => '* $1: link to Special:UserLogin with {{msg|loginreqlink}} as link description',
+'nosuchsectiontext' => 'This message is displayed when a user tries to edit a section that does not exist. 
+
+Parameter $1 is the content of section parameter in the URL (for example 1234 in the URL http://translatewiki.net/w/i.php?title=Sandbox&action=edit&section=1234)',
+'loginreqlink' => 'Take a look on inflection. Used as parameter in {{msg|loginreqpagetext}} and {{msg|whitelistedittext}}.
+
+{{Identical|Log in}}',
+'newarticle' => '{{Identical|New}}',
+'newarticletext' => "Text displayed above the edit box in editor when trying to create a new page.<br />'''Very important:''' leave <tt><nowiki>{{MediaWiki:Helppage}}</nowiki></tt> exactly as it is!",
+'noarticletext' => 'This is the message that you get if you search for a term that has not yet got any entries on the wiki.',
+'userpage-userdoesnotexist' => 'Error message displayed when trying to edit or create a page or a subpage that belongs to a user who is not registered on the wiki',
+'clearyourcache' => 'Text displayed at the bottom in user preferences',
+'usercssjsyoucanpreview' => 'Text displayed on every css/js page',
+'updated' => '{{Identical|Updated}}',
+'previewnote' => 'Note displayed when clicking on Show preview',
+'editing' => "Shown as page title when editing a page. \$1 is the name of the page that is being edited. Example: \"''Editing Main Page''\".",
+'editingsection' => 'The variable $1 is the page name.  This message displays at the top of the page when a user is editing a page section.',
+'yourdiff' => '{{Identical|Differences}}',
+'copyrightwarning' => 'Copyright warning displayed under the edit box in editor',
+'longpagewarning' => 'Warning displayed when trying to edit a long page',
+'longpageerror' => 'Warning displayed when trying to save a text larger than the maximum size allowed',
+'titleprotectedwarning' => 'Warning message above the edit form when editing a page that has been protected aginst creation.',
+'templatesused' => 'Displayed below the page when editing it. It indicates a list of templates which are used on that page.',
+'templatesusedpreview' => 'Used in editor when displaying a preview.',
+'templatesusedsection' => 'Used in editor when displaying a preview.',
+'template-protected' => '{{Identical|Protected}}',
+'template-semiprotected' => 'Used on [[Special:ProtectedPages]]. Appears in brackets after listed page titles which are semi-protected.',
+'hiddencategories' => "This message is shown below the edit form, like you have a section ''\"Templates used on this page\"''.",
+'edittools' => 'This text will be shown below edit and upload forms. It can be used to offer special characters not present on most keyboards for copying/pasting, and also often makes them clickable for insertion via a javascript. Since these are seen as specific to a wiki, however, this message should not contain anything but an html comment explaining how it should be used once the wiki has been installed.',
+'permissionserrorstext-withaction' => '* $1 is the number of reasons that were found why the action cannot be performed.
+* $2 is one of the action-* messages (for example {{msg|action-edit}}).
+
+Please report at [[Support]] if you are unable to properly translate this message. Also see [[bugzilla:14246]]',
+'recreate-deleted-warn' => 'Warning shown when creating a page which has already been deleted. See for example [[Test]].',
+'deleted-notice' => 'Shown on top of a deleted page in normal view modus ([http://translatewiki.net/wiki/Test example]).',
+
+# Parser/template warnings
+'expensive-parserfunction-warning' => 'On some (expensive) [[MetaWikipedia:Help:ParserFunctions|parser functions]] (e.g. <code><nowiki>{{#ifexist:}}</nowiki></code>) there is a limit of how many times it may be used. This is an error message shown when the limit is exceeded.
+
+* $1 is the current number of parser function calls.
+* $2 is the allowed number of parser function calls.',
+'expensive-parserfunction-category' => 'This message is used as a category name for a category where pages are placed automatically if they contain too many calls to expensive parser functions.',
+'post-expand-template-inclusion-category' => 'When templates are expanded, there is a size limit for the number of bytes yielded. Usually that occurs from excessively nested templates, recursive templates, or ones having x-zillion of #if #case or similar contructs in them. When the wikicode parser detects this, it outputs a red warning message to the page.',
+
+# "Undo" feature
+'undo-success' => '{{Identical|Undo}}',
+'undo-failure' => '{{Identical|Undo}}',
+'undo-norev' => '{{Identical|Undo}}',
+'undo-summary' => '{{Identical|Undo}}',
+
+# History pages
+'viewpagelogs' => 'Link displayed in history of pages',
+'currentrev' => '{{Identical|Current revision}}',
+'currentrev-asof' => 'The text appears at the right side when comparing 2 different edits of the same page. For example: [http://translatewiki.net/w/i.php?title=FreeCol%3AIntegerAboveZero%2Fca&diff=788645&oldid=788644]',
+'revisionasof' => "Used on a difference page when comparing different versions of a page or when viewing an non-current version of a page. \$1 is the date/time at which the revision was created. Example: \"''Revision as of 14:44, 24 January 2008''\".",
+'revision-info' => 'Appears just below the page title when an old version of the page is being viewed.
+
+* $1 indicates the time of that revision and 
+* $2 the author of the revision
+* (optional) $3 is the revision ID',
+'currentrevisionlink' => '{{Identical|Current revision}}',
+'cur' => 'Link in page history',
+'next' => 'Link in page history
+
+{{Identical|Next}}',
+'last' => 'Link in page history
+
+{{Identical|Last}}',
+'page_first' => "This is part of the navigation message on the top and bottom of Special pages which are lists of things in alphabetical order, e.g. the 'Categories' special page. It is followed by the message [[Mediawiki:viewprevnext]].
+
+first",
+'page_last' => "This is part of the navigation message on the top and bottom of Special pages which are lists of things in alphabetical order, e.g. the 'Categories' special page. It is followed by the message [[Mediawiki:viewprevnext]].
+
+{{Identical|Last}}",
+'histlegend' => 'Text in history page. Refers to {{msg-mw|cur}}, {{msg-mw|last}}, and {{msg-mw|minoreditletter}}.',
+'history-fieldset-title' => 'Fieldset label in the edit history pages.',
+'deletedrev' => 'When comparing deleted revisions for sysops
+
+{{Identical|Deleted}}',
+'histfirst' => 'Used in page history.',
+'histlast' => 'Used in page history.',
+'historyempty' => 'Text in page history for empty page revisions
+
+{{Identical|Empty}}',
+
+# Revision feed
+'history-feed-item-nocomment' => "Title for each revision when viewing the RSS/Atom feed for a page history:
+
+'''$1''' - user name
+
+'''$2''' - date/time",
+
+# Revision deletion
+'rev-delundel' => 'Link in page history for oversight',
+'revisiondelete' => '{{RevisionDelete}}
+It is the page title of [[Special:RevisionDelete]].',
+'revdelete-nooldid-title' => '{{RevisionDelete}}',
+'revdelete-nooldid-text' => '{{RevisionDelete}}',
+'revdelete-selected' => '{{RevisionDelete}}',
+'logdelete-selected' => '{{RevisionDelete}}',
+'revdelete-text' => '{{RevisionDelete}}
+This is the introduction explaining the feature.',
+'revdelete-legend' => '{{RevisionDelete}}',
+'revdelete-hide-text' => 'Option for oversight',
+'revdelete-hide-name' => 'Option for oversight',
+'revdelete-hide-comment' => 'Option for oversight',
+'revdelete-hide-user' => 'Option for oversight',
+'revdelete-hide-restricted' => 'Option for oversight.',
+'revdelete-suppress' => 'Option for oversight',
+'revdelete-hide-image' => 'Option for <del>oversight</del> [[:mw:RevisionDelete|RevisionDelete]] feature.',
+'revdelete-unsuppress' => '{{RevisionDelete}}',
+'revdelete-log' => 'Log comment text for oversight
+
+{{Identical|Log comment}}',
+'revdelete-submit' => '{{RevisionDelete}}
+This is the submit button on [[Special:RevisionDelete]].',
+'revdelete-logentry' => '{{RevisionDelete}}
+This is the message for the log entry in [[Special:Log/delete]] when changing visibility restrictions for page revisions. It is followed by the message {{msg|revdelete-log-message}} in brackets.
+
+The parameter $1 is the page name.
+
+The name of the user doing this task appears before this message.',
+'logdelete-logentry' => '{{RevisionDelete}}
+This is the message for the log entry in [[Special:Log/delete]] when changing visibility restrictions for log events. It is followed by the message {{msg|logdelete-log-message}} in brackets.
+
+The parameter $1 is the log name in brackets.
+
+The name of the user who did this task appears before this message.',
+'revdelete-success' => '{{RevisionDelete}}',
+'logdelete-success' => '{{RevisionDelete}}',
+'revdel-restore' => '{{RevisionDelete}}',
+'revdelete-content' => 'This message is used as parameter $1 in {{msg|revdelete-hid}} and {{msg|revdelete-unhid}} when hiding or unhiding the content of a revision or event.',
+'revdelete-summary' => 'This message is used as parameter $1 in {{msg|revdelete-hid}} and {{msg|revdelete-unhid}} when hiding or unhiding the edit summary of a revision or event.',
+'revdelete-uname' => 'This message is used as parameter $1 in {{msg|revdelete-hid}} and {{msg|revdelete-unhid}} when hiding or unhiding the username for a revision or event.
+
+{{Identical|Username}}',
+'revdelete-restricted' => 'This message is used as parameter $1 in {{msg|revdelete-log-message}} when setting visibility restrictions for administrators.',
+'revdelete-unrestricted' => 'This message is used as parameter $1 in {{msg|revdelete-log-message}} when removing visibility restrictions for administrators.',
+'revdelete-hid' => 'This message is used as parameter $1 in {{msg|revdelete-log-message}} when hiding revisions, and {{msg|logdelete-log-message}} when hiding information in the log entry about hiding revisions.
+
+Parameter $1 is either {{msg|revdelete-content}} (when hiding the page content), {{msg|revdelete-summary}} (when hiding the edit summary), {{msg|revdelete-uname}} (when hiding the user name), or a combination of these three messages.',
+'revdelete-unhid' => 'This message is used as parameter $1 in {{msg|revdelete-log-message}} when unhiding revisions, and {{msg|logdelete-log-message}} when unhiding information in the log entry about unhiding revisions.
+
+Parameter $1 is either {{msg|revdelete-content}} (when unhiding the page content), {{msg|revdelete-summary}} (when unhiding the edit summary), {{msg|revdelete-uname}} (when unhiding the user name), or a combination of these three messages.',
+'revdelete-log-message' => 'This log message is used together with {{msg|revdelete-logentry}} in the deletion or suppression logs when changing visibility restrictions for page revisions.
+
+*Parameter $1 is either {{msg|revdelete-hid}} (when hiding data), {{msg|revdelete-unhid}} (when unhiding data), {{msg|revdelete-restricted}} (when applying restrictions for sysops),  {{msg|revdelete-unrestricted}} (when removing restrictions for sysops), or a combination of those messages.
+*Parameter $2 is the number of revisions for which the restrictions are changed.
+
+Please note that the parameters in a log entry will appear in the log only in the default language of the wiki. View [[Special:Log]] for examples on Betawiki with English default language.',
+'logdelete-log-message' => 'This log message appears in brackets after the message {{msg|logdelete-logentry}} in the deletion or suppression logs when changing the visibility of a log entry for events. For a brief description of the process of changing the visibility of events and their log entries see this [http://www.mediawiki.org/wiki/RevisionDelete mediawiki explanation]. 
+
+*Parameter $1 is either {{msg|revdelete-hid}} (when hiding data), {{msg|revdelete-unhid}} (when unhiding data), {{msg|revdelete-restricted}} (when applying restrictions for sysops),  {{msg|revdelete-unrestricted}} (when removing restrictions for sysops), or a combination of those messages.
+*Parameter $2 is the number of events for which the restrictions are changed.
+
+Please note that the parameters in a log entry will appear in the log only in the default language of the wiki. View [[Special:Log]] for examples on Betawiki with English default language.',
+
+# Suppression log
+'suppressionlog' => 'Title of the suppression log. Shown in the drop down menu at [[Special:log]] and as header of [[Special:log/suppress]].',
+'suppressionlogtext' => 'Description text of the suppression log. Shown at top of of [[Special:log/suppress]].',
+
+# History merging
+'mergehistory-autocomment' => 'This message is used as an edit summary when a redirect is automatically created after an entire page history is merged into another page history, and the user who did the merge wrote no comment.
+
+*Parameter $1 is the name of the redirect page which is created
+*Parameter $2 is the target of the redirect',
+'mergehistory-comment' => 'This message is used as an edit summary when a redirect is automatically created after an entire page history is merged into another page history, and the user who did the merge wrote a comment.
+
+*Parameter $1 is the name of the redirect page which is created
+*Parameter $2 is the target of the redirect
+*Parameter $3 is a log comment for the merge',
+'mergehistory-same-destination' => 'Error message shown on [[Special:MergeHistory]] when the user entered the same page title to both source and destination',
+
+# Merge log
+'mergelog' => 'This is the name of a log of merge actions done on [[Special:MergeHistory]]. This special page and this log is not enabled by default.',
+
+# Diffs
+'history-title' => 'Displayed as page title when you click on the "history" tab. The parameter $1 is the normal page title.',
+'difference' => 'Displayed under the title when viewing the difference between two or more edits.',
+'lineno' => 'Message used when comparing different versions of a page (diff). $1 is a line number.',
+'compareselectedversions' => 'Used as button in history pages.',
+'visualcomparison' => '{{Identical|Visual comparison}}',
+'editundo' => 'Undo link when viewing diffs
+{{Identical|Undo}}',
+'diff-multi' => "This message appears in the revision history of a page when comparing two versions which aren't consecutive.",
+'diff-src' => '{{Identical|Source}}',
+'diff-with' => '* "<code><nowiki>&amp;#32;</nowiki></code>" is a forced space; leave it in if your language uses spaces
+* $1 is a name of a HTML attribute (for example <code>style</code> or <code>class</code>)
+* $2 is the value of the attribute (for example <code>background:red;</code> in <code>style="background:red;"</code>)
+Used in conjunction with {{msg-mw|diff-with-additional}} and {{msg-mw|diff-with-final}} in the head position before a {{msg-mw|comma-separator}} separated list.',
+'diff-with-additional' => '* $1 is a name of a HTML attribute (for example <code>style</code> or <code>class</code>)
+* $2 is the value of the attribute (for example <code>background:red;</code> in <code>style="background:red;"</code>)
+Used, possibly repeatedly, in a {{msg-mw|comma-separator}} separated list after {{msg-mw|diff-with}} and before {{msg-mw|diff-with-final}}.',
+'diff-with-final' => '* "<code><nowiki>&amp;#32;</nowiki></code>" is a forced space; leave it in if your language uses spaces
+* $1 is a name of a HTML attribute (for example <code>style</code> or <code>class</code>)
+* $2 is the value of the attribute (for example <code>background:red;</code> in <code>style="background:red;"</code>)
+Used in the final position of a {{msg-mw|comma-separator}} separated list headed by {{msg-mw|diff-with}} followed by zero or more repetitions of {{msg-mw|diff-with-additional}}.',
+'diff-width' => '{{Identical|Width}}',
+'diff-height' => '{{Identical|Height}}',
+
+# Search results
+'searchresults-title' => 'Appears as page title in the html header of the search result special page.',
+'noexactmatch' => 'This is the message that you get if you follow a link to a page or article that does not exist.',
+'notitlematches' => 'Header of results page after a search for a title for which no page exists',
+'textmatches' => 'When displaying search results',
+'notextmatches' => 'Error message when there are no results',
+'prevn' => "This is part of the navigation message on the top and bottom of Special pages (lists of things in alphabetical order, i.e. the 'Special:Categories' page), where it is used as the first argument of [[MediaWiki:Viewprevnext]].
+It is also used by Category pages (which do ''not'' use [[MediaWiki:Viewprevnext]]).
+$1 is the number of items shown per page. It is not used when $1 is zero; not sure what happens when $1 is one.
+Whatlinkshere pages use [[MediaWiki:Whatlinkshere-prev]] instead (still as an argument to [[MediaWiki:Viewprevnext]]).
+
+{{Identical|Previous}}",
+'nextn' => "This is part of the navigation message on the top and bottom of Special pages (lists of things in alphabetical order, i.e. the 'Special:Categories' page), where it is used as the second argument of [[MediaWiki:Viewprevnext]].
+It is also used by Category pages (which do ''not'' use [[MediaWiki:Viewprevnext]]).
+$1 is the number of items shown per page. It is not used when $1 is zero; not sure what happens when $1 is one.
+Whatlinkshere pages use [[MediaWiki:Whatlinkshere-next]] instead (still as an argument to [[MediaWiki:Viewprevnext]]).
+
+{{Identical|Next $1}}",
+'viewprevnext' => 'This is part of the navigation message on the top and bottom of Special pages which are lists of things, e.g. the User\'s contributions page (in date order) or the list of all categories (in alphabetical order). ($1) and ($2) are either [[MediaWiki:Pager-older-n]] and [[MediaWiki:Pager-newer-n]] (for date order) or [[MediaWiki:Prevn]] and [[MediaWiki:Nextn]] (for alphabetical order).
+It is also used by Whatlinkshere pages, where ($1) and ($2) are [[MediaWiki:Whatlinkshere-prev]] and [[MediaWiki:Whatlinkshere-next]].
+($3) is made up in all cases of the various proposed numbers of results per page, e.g. "(20 | 50 | 100 | 250 | 500)".
+For Special pages, the navigation bar is prefixed by "([[MediaWiki:Page_first]] | [[MediaWiki:Page_last]])" (alphabetical order) or "([[MediaWiki:Histfirst]] | [[MediaWiki:Histlast]])" (date order).
+Viewprevnext is sometimes preceded by the [[MediaWiki:Showingresults]] or [[MediaWiki:Showingresultsnum]] message (for Special pages) or by the [[MediaWiki:Linkshere]] message (for Whatlinkshere pages).',
+'searchmenu-exists' => 'An option shown in a menu beside search form offering a link to the existing page having the specified title (when using the default MediaWiki search engine).',
+'searchmenu-new' => 'An option shown in a menu beside search form offering a red link to the not yet existing page having the specified title (when using the default MediaWiki search engine).',
+'searchhelp-url' => '{{Identical|HelpContent}}
+Description: The URL of the search help page.
+{{doc-important|Do not change "Help:" part.}}',
+'searchprofile-articles' => 'A quick link in the advanced search box on [[Special:Search]]. Clicking on this link starts a search in the content pages of the wiki.
+
+{{Identical|Content page}}',
+'searchprofile-articles-and-proj' => '{{Identical|Content page}}',
+'searchprofile-articles-tooltip' => '{{Identical|Search in $1}}',
+'searchprofile-project-tooltip' => '{{Identical|Search in $1}}',
+'search-result-size' => 'Shown per line of a [[Special:Search|search result]]
+* $1 is the size of the page in bytes, but no need to add "byte" or similar as the unit is added by special function.
+* $2 is the sum of all words in this page.',
+'search-result-score' => 'Shown per line of a [[Special:Search|search result]].
+
+$1 is the relevance of this result in per cent.
+
+{{Identical|Relevance: $1%}}',
+'search-interwiki-default' => '* $1 is the hostname of the remote wiki from where the additional results listed below are returned',
+'search-relatedarticle' => '{{Identical|Related}}',
+'searchrelated' => '{{Identical|Related}}',
+'searchall' => '{{Identical|All}}',
+'showingresults' => "This message is used on some special pages such as 'Wanted categories'. $1 is the total number of results in the batch shown and $2 is the number of the first item listed.",
+'showingresultsnum' => '$3 is the number of results on the page and $2 is the first number in the batch of results.',
+'showingresultstotal' => 'Text above list of search results on special page of search results. 
+* $1–$2 is the range of results shown on the page
+* $3 is the total number of results from the search
+* $4 is the number of results shown on the page (equal to the size of the $1–$2 interval)',
+'nonefound' => 'This message appears on the search results page if no results are found.
+{{doc-important|Do not translate "all:".}}',
+'search-nonefound' => 'Message shown when a search returned no results (when using the default MediaWiki search engine).',
+'powersearch' => 'Verb. Text of search button at the bottom of [[Special:Search]], for searching in selected namespaces.
+
+{{Identical|Advanced search}}',
+'powersearch-legend' => 'Advanced search
+
+{{Identical|Advanced search}}',
+'powersearch-ns' => 'Used in the extended search form at [[Special:Search]]',
+'powersearch-redir' => 'Used in the extended search form at [[Special:Search]]',
+'powersearch-field' => 'Used in the extended search form at [[Special:Search]]',
+'search-external' => 'Legend of the fieldset for the input form when the internal search is disabled. Inside the fieldset [[MediaWiki:Searchdisabled]] and [[MediaWiki:Googlesearch]] is shown.',
+'searchdisabled' => 'Shown on [[Special:Search]] when the internal search is disabled.',
+
+# Preferences page
+'preferences' => '{{Identical|Preferences}}',
+'mypreferences' => '{{Identical|My preferences}}',
+'prefs-edits' => 'In user preferences.',
+'prefsnologin' => '{{Identical|Not logged in}}',
+'qbsettings' => 'The title of the section in [[Special:Preferences]], only shown when using the skins "Standard/Classic" or "Cologne Blue". The quicbar is the same as the sidebar.',
+'qbsettings-none' => '{{Identical|None}}',
+'changepassword' => "Section heading on [[Special:Preferences]], tab 'User profile'.",
+'skin' => 'Used in user preferences.',
+'skin-preview' => 'The link beside each skin name in [[Special:Preferences|your user preferences]], tab "skin".
+
+{{Identical|Preview}}',
+'math' => 'Used in user preferences.',
+'datetime' => '{{Identical|Date}}',
+'math_syntax_error' => '{{Identical|Syntax error}}',
+'prefs-personal' => 'Title of a tab in [[Special:Preferences]].',
+'prefs-rc' => 'Used in user preferences.
+
+{{Identical|Recent changes}}',
+'prefs-watchlist' => 'Used in user preferences.',
+'prefs-watchlist-days' => 'Used in [[Special:Preferences]], tab "Watchlist".',
+'prefs-watchlist-days-max' => 'Shown as hint in [[Special:Preferences]], tab "Watchlist"',
+'prefs-watchlist-edits' => 'Used in [[Special:Preferences]], tab "Watchlist".',
+'prefs-watchlist-edits-max' => 'Shown as hint in [[Special:Preferences]], tab "Watchlist"',
+'prefs-misc' => 'Used in user preferences.',
+'prefs-resetpass' => 'Button on user data tab in user preferences. When you click the button you go to the special page [[Special:ResetPass]].',
+'saveprefs' => 'Button for saving changes in the preferences page.
+
+{{Identical|Save}}',
+'resetprefs' => 'Button for resetting changes in the preferences page.',
+'textboxsize' => 'Title of a tab in [[Special:Preferences]].',
+'searchresultshead' => 'This is the label of the tab in [[Special:Preferences|my preferences]] which contains options for searching the wiki.
+
+{{Identical|Search}}',
+'contextchars' => 'Used in Preferences/Search tab',
+'stub-threshold' => 'Used in [[Special:Preferences]], tab "Misc".',
+'recentchangesdays' => 'Used in [[Special:Preferences]], tab "Recent changes".',
+'recentchangesdays-max' => 'Shown as hint in [[Special:Preferences]], tab "Recent changes"',
+'recentchangescount' => 'Used in [[Special:Preferences]], tab "Recent changes".',
+'savedprefs' => 'This message appears after saving changes to your user preferences.',
+'timezonetext' => "Additional explanation given in [[Special:Preferences]], tab 'date and time' with the preference in message ''timezoneoffset''",
+'timezoneoffset' => "Text next to input box in [[Special:Preferences]], tab 'date and time', section 'timezone'.",
+'allowemail' => 'Used in [[Special:Preferences]], tab "User profile".',
+'prefs-searchoptions' => "Shown at the top of the tab 'Search' in [[Special:Preferences]]",
+'prefs-namespaces' => "{{Identical|Namespaces}}
+Shown as legend of the second fieldset of the tab 'Search' in [[Special:Preferences]]",
+'defaultns' => 'Used in [[Special:Preferences]], tab "Search".',
+'default' => '{{Identical|Default}}',
+'files' => 'Title of a tab in [[Special:Preferences]].',
+
+# User rights
+'userrights' => 'Page title of [[Special:UserRights]].',
+'userrights-lookup-user' => 'Button text when managing user rights',
+'userrights-user-editname' => 'Displayed on [[Special:UserRights]].',
+'editusergroup' => '{{Identical|Edit user groups}}',
+'editinguser' => "Appears on [[Special:UserRights]]. The '''last part''' of the message '''should remain completely untranslated''', but if your language has S-O-V word order, the verb can follow it.",
+'userrights-editusergroup' => '{{Identical|Edit user groups}}',
+'saveusergroups' => 'Button text when editing user groups',
+'userrights-groupsmember' => 'When editing user groups',
+'userrights-groups-help' => 'Instructions displayed on [[Special:UserRights]].',
+'userrights-reason' => 'Text beside log field when editing user groups',
+'userrights-no-interwiki' => 'Error message when editing user groups',
+'userrights-nodatabase' => 'Error message when editing user groups',
+'userrights-nologin' => "Error displayed on [[Special:UserRights]] when you aren't logged in. If you are logged in, but don't have the correct permission, you see {{msg|userrights-notallowed|pl=yes}}.",
+'userrights-notallowed' => "Error displayed on [[Special:UserRights]] when you don't have the permission.",
+'userrights-changeable-col' => 'Used in [[Special:UserRights]].',
+'userrights-unchangeable-col' => 'Used in [[Special:UserRights]].',
+
+# Groups
+'group' => '{{Identical|Group}}',
+'group-user' => 'Name of group',
+'group-autoconfirmed' => 'Name of group. On Wikimedia sites autoconfirmed users are users which are older than 4 days. After those 4 days, they have more rights.',
+'group-bot' => 'Name of group',
+'group-sysop' => 'Name of group',
+'group-bureaucrat' => 'Name of group',
+'group-suppress' => 'This is an optional (disabled by default) user group, meant for the [[mw:RevisionDelete|RevisionDelete]] feature, to change the visibility of revisions through [[Special:RevisionDelete]].
+
+* See also: {{msg-mw|Group-suppress-member|pl=yes}} for a member of this group.
+{{Identical|Oversight}}',
+'group-all' => 'The name of the user group that contains all users, including anonymous users
+
+{{Identical|All}}',
+
+'group-user-member' => 'Name of member of group',
+'group-autoconfirmed-member' => 'Name of a member of group',
+'group-bot-member' => 'Name of a member of group',
+'group-sysop-member' => 'Name of member of group',
+'group-bureaucrat-member' => 'Name of member of group',
+'group-suppress-member' => 'This is a member of the optional (disabled by default) user group, meant for the [[mw:RevisionDelete|RevisionDelete]] feature, to change the visibility of revisions through [[Special:RevisionDelete]].
+
+* See also: {{msg|Group-suppress|pl=yes}} for the name of the group.
+{{Identical|Oversight}}',
+
+'grouppage-user' => 'Link to group page on wiki',
+'grouppage-autoconfirmed' => 'Link to group page on wiki.',
+'grouppage-bot' => 'Link to project page of this group, displayed on [[Special:ListUsers/bot]].',
+'grouppage-sysop' => 'Link to project page of this group, displayed on [[Special:ListUsers/sysop]].',
+'grouppage-bureaucrat' => 'Name of project page of this group, linked to from [[Special:ListUsers/bureaucrat]], [[Special:ListGroupRights]], and some other special pages.',
+'grouppage-suppress' => 'Link to project page of this group, displayed on [[Special:ListUsers/suppress]].',
+
+# Rights
+'right-read' => '{{doc-right}}
+Basic right to read any page.',
+'right-edit' => '{{doc-right}}
+Basic right to edit pages that are not protected.',
+'right-createpage' => '{{doc-right}}
+Basic right to create pages. The right to edit discussion/talk pages is {{msg|right-createtalk|pl=yes}}.',
+'right-createtalk' => '{{doc-right}}
+Basic right to create discussion/talk pages. The right to edit other pages is {{msg|right-createpage|pl=yes}}.',
+'right-createaccount' => '{{doc-right}}
+The right to [[Special:CreateAccount|create a user account]].',
+'right-minoredit' => '{{doc-right}}
+The right to use the "This is a minor edit" checkbox. See {{msg|minoredit|pl=yes}} for the message used for that checkbox.',
+'right-move' => '{{doc-right}}
+The right to move any page that is not protected from moving.',
+'right-move-rootuserpages' => '{{doc-right}}',
+'right-movefile' => '{{doc-right}}',
+'right-upload' => '{{doc-right}}
+The right to [[Special:Upload|upload]] a file (this includes images, media, audio, ...).',
+'right-reupload' => '{{doc-right}}
+The right to upload a file under a file name that already exists. Related messages: {{msg|right-upload|pl=yes}}, {{msg|right-reupload-own|pl=yes}} and {{msg|right-reupload-shared|pl=yes}}.',
+'right-reupload-own' => '{{doc-right}}
+Right to upload a file under a file name that already exists, and that the same user has uploaded. Related messages: {{msg|right-upload|pl=yes}} and {{msg|right-reupload|pl=yes}}.',
+'right-reupload-shared' => '{{doc-right}}
+The right to upload a file locally under a file name that already exists in a shared database (for example Commons). Related messages: {{msg|right-upload|pl=yes}} and {{msg|right-reupload|pl=yes}}.',
+'right-purge' => '{{doc-right}}
+The right to use <tt>&action=purge</tt> in the URL, without needing to confirm it (by default, anonymous users need to confirm it).',
+'right-autoconfirmed' => "{{doc-right}}
+If your account is older than [[mw:Manual:\$wgAutoConfirmAge|wgAutoConfirmAge]] and if you have at least [[mw:Manual:\$wgAutoConfirmCount|\$wgAutoConfirmCount]] edits, you are in the '''group \"autoconfirmed\"''' (note that you can't see this group at [[Special:ListUsers]]).
+If you are in that group, you have (by default) the '''right \"autoconfirmed\"'''. With this right, you can for example <!-- I think this right includes more things --> edit semi-protected pages.",
+'right-nominornewtalk' => '{{doc-right}}
+If someone with this right (bots by default) edits a user talk page and marks it as minor (requires {{msg|right-minoredit|pl=yes}}), the user will not get a notification "You have new messages".',
+'right-writeapi' => '{{doc-right}}',
+'right-deleterevision' => 'This is a user right that is part of the [[mw:RevisionDelete|RevisionDelete]] feature.
+It can be given to the group {{msg|group-sysop|pl=yes}}, although this right is disabled by default.
+
+See also
+* {{msg|right-suppressionlog|pl=yes}}
+* {{msg|right-hideuser|pl=yes}}
+* {{msg|right-suppressrevision|pl=yes}}',
+'right-suppressrevision' => 'This is a user right that is part of the [[mw:RevisionDelete|RevisionDelete]] feature.
+It can be given to the group {{msg|group-suppress|pl=yes}}, although that group is disabled by default.
+
+See also
+* {{msg|right-suppressionlog|pl=yes}}
+* {{msg|right-hideuser|pl=yes}}
+* {{msg|right-deleterevision|pl=yes}}',
+'right-suppressionlog' => 'This is a user right that is part of the [[mw:RevisionDelete|RevisionDelete]] feature.
+It can be given to the group {{msg|group-suppress|pl=yes}}, although that group is disabled by default.
+
+See also
+* {{msg|right-suppressrevision|pl=yes}}
+* {{msg|right-hideuser|pl=yes}}
+* {{msg|right-deleterevision|pl=yes}}',
+'right-hideuser' => 'This is a user right that is part of the [[mw:RevisionDelete|RevisionDelete]] feature.
+It can be given to the group {{msg|group-suppress|pl=yes}}, although that group is disabled by default.
+
+See also
+* {{msg|right-suppressionlog|pl=yes}}
+* {{msg|right-suppressrevision|pl=yes}}
+* {{msg|right-deleterevision|pl=yes}}',
+'right-ipblock-exempt' => 'This user automatically 
+bypasses IP blocks, auto-blocks and range blocks - so I presume - but I am uncertain',
+'right-rollback' => '{{Identical|Rollback}}',
+'right-markbotedits' => '{{doc-right}}
+A user with this right can mark a roll-back edit as a bot edit by adding <tt>&bot=1</tt> to the URL (not by default).',
+'right-noratelimit' => '{{doc-right}}
+The rate limits have no effect on the groups that have this right. Rate limits is a restriction that you can only do X actions (edits, moves, etc.) in Y number of seconds (set by [[mw:Manual:$wgRateLimits|$wgRateLimits]]).',
+'right-import' => '{{doc-right}}',
+'right-importupload' => '{{doc-right}}',
+'right-patrol' => '{{doc-right}}',
+
+# User rights log
+'rightslog' => 'In [[Special:Log]]',
+'rightslogtext' => 'Text in [[Special:Log/rights]].',
+'rightslogentry' => 'This message is displayed in the [[Special:Log/rights|User Rights Log]] when a bureaucrat changes the user groups for a user.
+
+* Parameter $1 is the username
+* Parameters $2 and $3 are lists of user groups or {{msg-mw|Rightsnone}}
+
+The name of the bureaucrat who did this task appears before this message.',
+'rightsnone' => 'Default rights for registered users.
+
+{{Identical|None}}',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read' => '{{Doc-action}}',
+'action-edit' => '{{Doc-action}}',
+'action-createpage' => '{{Doc-action}}',
+'action-createtalk' => '{{Doc-action}}',
+'action-createaccount' => '{{Doc-action}}',
+'action-minoredit' => '{{Doc-action}}',
+'action-move' => '{{Doc-action}}',
+'action-move-subpages' => '{{Doc-action}}',
+'action-move-rootuserpages' => '{{Doc-action}}',
+'action-movefile' => '{{doc-action}}',
+'action-upload' => '{{Doc-action}}',
+'action-reupload' => '{{Doc-action}}',
+'action-reupload-shared' => '{{Doc-action}}',
+'action-upload_by_url' => '{{Doc-action}}',
+'action-writeapi' => '{{Doc-action}}',
+'action-delete' => '{{Doc-action}}',
+'action-deleterevision' => '{{Doc-action}}',
+'action-deletedhistory' => '{{Doc-action}}',
+'action-browsearchive' => '{{Doc-action}}',
+'action-undelete' => '{{Doc-action}}',
+'action-suppressrevision' => '{{Doc-action}}',
+'action-suppressionlog' => '{{Doc-action}}',
+'action-block' => '{{Doc-action}}',
+'action-protect' => '{{Doc-action}}',
+'action-import' => '{{Doc-action}}',
+'action-importupload' => '{{Doc-action}}',
+'action-patrol' => '{{Doc-action}}',
+'action-autopatrol' => '{{Doc-action}}',
+'action-unwatchedpages' => '{{Doc-action}}',
+'action-trackback' => '{{Doc-action}}',
+'action-mergehistory' => '{{Doc-action}}',
+'action-userrights' => '{{Doc-action}}
+
+This action allows editing of all of the "user rights", not just the rights of the group "all users".',
+'action-userrights-interwiki' => '{{Doc-action}}',
+'action-siteadmin' => '{{Doc-action}}',
+
+# Recent changes
+'nchanges' => 'Appears on the [[Special:RecentChanges]] special page in brackets after pages having more than one change on that date. $1 is the number of changes on that day.',
+'recentchanges' => 'The text of the link in sidebar going to the special page [[Special:RecentChanges]]. Also the page title of that special page.
+
+{{Identical|Recent changes}}',
+'recentchanges-legend' => 'Legend of the fieldset of [[Special:RecentChanges]]',
+'recentchangestext' => 'Text in recent changes',
+'rcnote' => 'Used on [[Special:RecentChanges]].
+* $1 is the number of changes shown,
+* $2 is the number of days for which the changes are shown,
+* $3 is a datetime (deprecated),
+* $4 is a date alone,
+* $5 is a time alone.
+
+ Example: "\'\'Below are the last 50 changes in the last 7 days, as of 14:48, 24 January 2008.\'\'"',
+'rcnotefrom' => 'This message is displayed at [[Special:RecentChanges]] when viewing recentchanges from some specific time.
+
+Parameter $1 is the maximum number of changes that are displayed.
+Parameter $2 is a date and time.',
+'rclistfrom' => 'Used on [[Special:RecentChanges]]. Parameter $1 is a date.',
+'rcshowhideminor' => 'Option text in [[Special:RecentChanges]]',
+'rcshowhidebots' => "Option text in [[Special:RecentChanges]]. $1 is the 'show/hide' command, with the text taken from either [[Mediawiki:Show]] or [[Mediawiki:Hide]].
+
+{{Identical|$1 bots}}",
+'rcshowhideliu' => 'Option text in [[Special:RecentChanges]]',
+'rcshowhideanons' => 'Option text in [[Special:RecentChanges]]',
+'rcshowhidepatr' => "Option text in [[Special:RecentChanges]]. $1 is the 'show/hide' command, with the text taken from either [[Mediawiki:Show]] or [[Mediawiki:Hide]].",
+'rclinks' => "Used on [[Special:RecentChanges]]. \$1 is a list of different choices with number of pages to be shown, \$2 is a list of clickable links with a number of days for which recent changes are to be displayed. Example: \"''Show last 50 | 100 | 250 | 500 changes in last 1 | 3 | 7 | 14 | 30 days''\".
+
+\$3 is a block of text that consists of other messages: \"''Hide minor edits | Show bots | Hide anonymous users | Hide logged-in users | Hide patrolled edits | Hide my edits''\"",
+'diff' => 'Short form of "differences". Used on [[Special:RecentChanges]], [[Special:Watchlist]], ...',
+'hist' => 'Short form of "history". Used on [[Special:RecentChanges]], [[Special:Watchlist]], ...',
+'hide' => 'Option text in [[Special:RecentChanges]]
+
+{{Identical|Hide}}',
+'show' => '{{Identical|Show}}',
+'minoreditletter' => "Very short form of \"'''minor edit'''\". Used in [[Special:RecentChanges]], [[Special:Watchlist]], [[Special:Contributions]] and history pages.",
+'newpageletter' => "Very short form of \"'''new page'''\". Used in [[Special:RecentChanges]], [[Special:Watchlist]] and [[Special:Contributions]].",
+'boteditletter' => 'Abbreviation of "bot". Appears in [[Special:RecentChanges]] and [[Special:Watchlist]].',
+'newsectionsummary' => 'Default summary when adding a new section to a page.',
+
+# Recent changes linked
+'recentchangeslinked' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].',
+'recentchangeslinked-title' => 'Message used as title and page header on [[Special:RecentChangesLinked]] (needs an argument like "/Main Page"). Related changes are all recent change to pages that are linked from \'\'this page\'\'. "$1" is the name of the page for which related changes as show.',
+'recentchangeslinked-summary' => 'Summary of [[Special:RecentChangesLinked]].',
+'recentchangeslinked-page' => '{{Identical|Page name}}',
+
+# Upload
+'upload' => 'Display name for link to [[Special:Upload]] for uploading files to the wiki.
+
+{{Identical|Upload file}}',
+'uploadbtn' => 'Button name in [[Special:Upload]].
+
+{{Identical|Upload file}}',
+'uploadnologin' => '{{Identical|Not logged in}}',
+'uploadtext' => 'Text displayed when uploading a file using [[Special:Upload]].',
+'upload-permitted' => 'Used in [[Special:Upload]].',
+'upload-preferred' => 'Used in [[Special:Upload]].',
+'upload-prohibited' => 'Used in [[Special:Upload]].',
+'uploadlogpage' => 'Page title of [[Special:Log/upload]].',
+'filename' => '{{Identical|Filename}}',
+'filedesc' => '{{Identical|Summary}}',
+'fileuploadsummary' => '{{Identical|Summary}}',
+'filesource' => 'On page [[Special:Upload]] if defined $wgUseCopyrightUpload for detailed copyright information forms. This is source of file.
+
+{{Identical|Source}}',
+'ignorewarnings' => 'In [[Special:Upload]]',
+'filetype-bad-ie-mime' => '$1 will contain a mime type like <tt>image/jpeg</tt> or <tt>application/zip</tt>',
+'filetype-unwanted-type' => "* $1 is the extension of the file which cannot be uploaded
+* $2 is the list of file extensions that can be uploaded (Example: ''png, gif, jpg, jpeg, ogg, pdf, svg.'')
+* $3 is the number of allowed file formats (to be used for the PLURAL function)",
+'filetype-banned-type' => "* $1 is the extension of the file which cannot be uploaded
+* $2 is the list of file extensions that can be uploaded (Example: ''png, gif, jpg, jpeg, ogg, pdf, svg.'')
+* $3 is the number of allowed file formats (to be used for the PLURAL function)",
+'filetype-missing' => 'Error when uploading a file with no extension',
+'large-file' => 'Variables $1 and $2 have appropriate unit symbols already. See for example [[Mediawiki:size-kilobytes]].',
+'largefileserver' => 'Error message when uploading a file whose size is larger than the maximum allowed',
+'emptyfile' => 'Error message when trying to upload an empty file',
+'filepageexists' => 'Shown on [[Special:Upload]], $1 is link to the page. This message is displayed if a description page exists, but a file with the same name does not yet exists, and a user tries to upload a file with that name. In that case the description page is not changed, even if the uploading user specifies a description with the upload.',
+'file-thumbnail-no' => 'Error message at [[Special:Upload]]',
+'fileexists-shared-forbidden' => 'Error message at [[Special:Upload]]',
+'savefile' => 'When uploading a file',
+'uploadedimage' => 'This is the text of an entry in the [[Special:Log|upload log]] (and Recent Changes), after hour (and date, only in the Upload log) and sysop name. $1 is the name of the file uploaded.',
+'overwroteimage' => 'This is the text of an entry in the [[Special:Log|upload log]] (and Recent Changes), after hour (and date, only in the Upload log) and sysop name. $1 is the name of the file uploaded.',
+'uploaddisabled' => 'Title of the Special:Upload page when upload is disabled.',
+'uploaddisabledtext' => 'This message can have parameter $1, which contains the name of the target file. See r22243 and [https://bugzilla.wikimedia.org/show_bug.cgi?id=8818 bug 8818].',
+'uploadvirus' => 'Note displayed when uploaded file contains a virus',
+'sourcefilename' => 'In [[Special:Upload]]',
+'destfilename' => 'In [[Special:Upload]]',
+'upload-maxfilesize' => 'Shows at [[Special:Upload]] the maximum file size that can be uploaded.
+
+$1 is the value in KB/MB/GB',
+'watchthisupload' => 'In [[Special:Upload]]
+
+{{Identical|Watch this page}}',
+'filewasdeleted' => 'This warning is shown when trying to upload a file that does not exist, but has previously been deleted.
+Parameter $1 is a link to the deletion log, with the text in {{msg|deletionlog}}.',
+
+'upload-file-error' => '{{Identical|Internal error}}',
+
+'nolicense' => '{{Identical|None selected}}',
+'license-nopreview' => 'Error message when a certain license does not exist',
+
+# Special:ListFiles
+'listfiles-summary' => 'This message is displayed at the top of [[Special:ImageList]] to explain how to use that special page.',
+'listfiles_search_for' => 'Input label for the form displayed on [[Special:ImageList]].',
+'imgfile' => '{{Identical|File}}',
+'listfiles' => 'Page title and grouping label for the form displayed on [[Special:ImageList]].
+{{Identical|File list}}',
+'listfiles_date' => 'Column header for the result table displayed on [[Special:ImageList]].
+{{Identical|Date}}',
+'listfiles_name' => 'Column header for the result table displayed on [[Special:ImageList]].
+{{Identical|Name}}',
+'listfiles_user' => 'Column header for the result table displayed on [[Special:ImageList]].
+{{Identical|User}}',
+'listfiles_size' => 'Column header for the result table displayed on [[Special:ImageList]].
+{{Identical|Size}}',
+'listfiles_description' => '{{Identical|Description}}',
+'listfiles_count' => 'One of the table column headers in [[Special:Listfiles]] denoting the amount of saved versions of that file.',
+
+# File description page
+'filehist' => 'Text shown on a media description page. Heads the section where the different versions of the file are displayed.',
+'filehist-help' => 'In file description page',
+'filehist-deleteall' => 'Link in image description page for admins.',
+'filehist-deleteone' => 'Link description on file description page to delete an earlier version of a file.
+
+{{Identical|Delete}}',
+'filehist-revert' => 'Link in image description page.
+
+{{Identical|Revert}}',
+'filehist-current' => 'Link in file description page.
+
+{{Identical|Current}}',
+'filehist-datetime' => 'Used on image descriptions, see for example [[:File:Yes.png#filehistory]].
+{{Identical|Date}}',
+'filehist-thumb' => 'Shown in the file history list of a file desription page.
+
+Example: [[:Image:Addon-icn.png]]',
+'filehist-thumbtext' => "Shown in the file history list of a file description page. '''$1''' is a time followed by a date, e.g. ''10:23, 18 april 2007''.
+
+Example: [[wikipedia:Image:Madeleine close2.jpg]]",
+'filehist-nothumb' => 'Shown if no thumbnail is available in the file history list of a file desription page.
+
+Example: [[:Image:Addon-icn.png]]',
+'filehist-user' => 'In image description page.
+
+{{Identical|User}}',
+'filehist-dimensions' => 'In file description page',
+'filehist-filesize' => 'In image description page',
+'filehist-comment' => 'In file description page
+
+{{Identical|Comment}}',
+'imagelinks' => 'In top header of the image description page, see for example [[:Image:Yes.png]].
+
+{{Identical|Links}}',
+'linkstoimage' => 'Used on image description, see for example [[:Image:Yes.png#filelinks]].
+* Parameter $1 is the number of pages that link to the file/image.',
+'linkstoimage-more' => 'Shown on an image description page when a file is used/linked more than 100 times on other pages.
+
+* $1: limit. At the moment hardcoded at 100
+* $2: filename',
+'nolinkstoimage' => 'Displayed on image description pages, see for exampe [[:Image:Tournesol.png#filelinks]].',
+'redirectstofile' => 'Used on file description pages after the list of pages which used this file',
+'duplicatesoffile' => 'Shown on file description pages when a file is duplicated
+
+* $1: Number of identical files
+* $2: Name of the shown file to link to the special page "FileDuplicateSearch"',
+'sharedupload' => 'Shown on an image description page when it is used in a central repository (i.e. [http://commons.wikimedia.org/ Commons] for Wikimedia wikis).
+{{doc-important|Do not customise this message. Just translate it.|Customisation should be done by local wikis.}}',
+'shareduploadwiki' => 'The variable $1 is {{msg|shareduploadwiki-linktext}}',
+'shareduploadwiki-desc' => "This message appears after {{msg-mw|Sharedupload}}. \$1 is a link to the file description page on the shared repository with {{msg-mw|Shareduploadwiki-linktext}} as displayed anchor text. Example: \"''The description on its <u>file description</u> page there is shown below.''\"",
+'shareduploadwiki-linktext' => 'This message is used as variable $1 in {{msg-mw|Shareduploadwiki}} and in {{msg-mw|Shareduploadwiki-desc}}.',
+'shareduploadduplicate' => '$1 is contents of message shareduploadduplicate-linktext (i.e. "another file")',
+'shareduploadduplicate-linktext' => 'This message is the text of $1 in the message [[MediaWiki:Shareduploadduplicate]].
+
+{{Identical|Another file}}',
+'shareduploadconflict' => '$1 is contents of message shareduploadconflict-linktext (i.e. "another file")',
+'shareduploadconflict-linktext' => 'This message is the text of $1 in the message [[MediaWiki:Shareduploadconflict]].
+
+{{Identical|Another file}}',
+'noimage' => 'In image description page when there is no file by that name.  The variable $1 comes from {{msg|noimage-linktext}}, which is only substituted in this message.',
+'noimage-linktext' => 'This message is used as a variable in {{msg|noimage}}, and will not be used anywhere else.',
+'imagepage-searchdupe' => 'This message is used as text on a link from image pages to [[Special:FileDuplicateSearch]].',
+
+# File reversion
+'filerevert' => '{{Identical|Revert}}',
+'filerevert-legend' => '{{Identical|Revert}}',
+'filerevert-intro' => 'Message displayed when you try to revert a version of a file.
+* $1 is the name of the media
+* $2 is a date
+* $3 is a hour
+* $4 is an URL and must follow square bracket: [$4
+{{Identical|Revert}}',
+'filerevert-comment' => '{{Identical|Comment}}',
+'filerevert-defaultcomment' => '* $1 is a date
+* $2 is an hour
+{{Identical|Revert}}',
+'filerevert-submit' => '{{Identical|Revert}}',
+'filerevert-success' => 'Message displayed when you succeed in reverting a version of a file.
+* $1 is the name of the media
+* $2 is a date
+* $3 is a hour
+* $4 is an URL and must follow square bracket: [$4
+{{Identical|Revert}}',
+
+# File deletion
+'filedelete-intro-old' => 'Message displayed when you try to delete a version of a file.
+* $1 is the name of the media
+* $2 is a date
+* $3 is a hour
+* $4 is an URL and must follow square bracket: [$4',
+'filedelete-comment' => '{{Identical|Reason for deletion}}',
+'filedelete-submit' => 'Delete button when deleting a file for admins
+
+{{Identical|Delete}}',
+'filedelete-success-old' => 'Message displayed when you succeed in deleting a version of a file.
+* $1 is the name of the media
+* $2 is a date
+* $3 is a hour',
+'filedelete-otherreason' => 'Message used when deleting a file. This is the description field for "Other/additional reason" for deletion.
+
+{{Identical|Other/additional reason}}',
+'filedelete-reason-otherlist' => 'Message used as default in the dropdown menu in the form for deleting a file. Keeping this message selected assumes that a reason for deletion is specified in the field below.
+
+{{Identical|Other reason}}',
+'filedelete-reason-dropdown' => 'Predefined reasons for deleting a file that can be selected in a drop down list. Entries prefixed with one asterisk ("*") are group headers and cannot be selected. Entries prefixed with two asterisks can be selected as reason for deletion.',
+'filedelete-edit-reasonlist' => 'Shown beneath the file deletion form on the right side. It is a link to [[MediaWiki:Filedelete-reason-dropdown]].
+
+{{Identical|Edit delete reasons}}',
+
+# MIME search
+'mimesearch' => 'Title of [[Special:MIMESearch]].',
+'mimesearch-summary' => 'Text for [[Special:MIMESearch]]',
+'download' => 'Direct download link in each line returned by [[Special:MIMESearch]]. Points to the actual file, rather than the image description page.
+{{Identical|Download}}',
+
+# Unwatched pages
+'unwatchedpages' => 'Name of special page displayed in [[Special:SpecialPages]] for admins',
+
+# List redirects
+'listredirects' => 'Name of special page displayed in [[Special:SpecialPages]].',
+
+# Unused templates
+'unusedtemplates' => 'Name of special page displayed in [[Special:SpecialPages]].',
+'unusedtemplatestext' => 'Shown on top of [[Special:Unusedtemplates]]',
+
+# Random page
+'randompage' => 'Name of special page displayed in [[Special:SpecialPages]].
+
+{{Identical|Random page}}',
+
+# Random redirect
+'randomredirect' => 'Name of special page displayed in [[Special:SpecialPages]].',
+
+# Statistics
+'statistics' => 'Name of special page displayed in [[Special:SpecialPages]].
+
+{{Identical|Statistics}}',
+'statistics-header-pages' => 'Used in [[Special:Statistics]]',
+'statistics-header-edits' => 'Used in [[Special:Statistics]]',
+'statistics-header-views' => 'Used in [[Special:Statistics]]',
+'statistics-header-users' => 'Used in [[Special:Statistics]]',
+'statistics-articles' => 'Used in [[Special:Statistics]]
+
+{{Identical|Content page}}',
+'statistics-pages' => 'Used in [[Special:Statistics]]',
+'statistics-pages-desc' => "Tooltip shown over ''Pages'' (or as a note below it) in [[Special:Statistics]]",
+'statistics-files' => 'Used in [[Special:Statistics]]',
+'statistics-edits' => 'Used in [[Special:Statistics]]',
+'statistics-edits-average' => 'Used in [[Special:Statistics]]',
+'statistics-views-total' => 'Used in [[Special:Statistics]]',
+'statistics-views-peredit' => 'Used in [[Special:Statistics]]',
+'statistics-jobqueue' => 'Used in [[Special:Statistics]]',
+'statistics-users' => 'Used in [[Special:Statistics]]',
+'statistics-users-active' => 'Used in [[Special:Statistics]]',
+'statistics-users-active-desc' => "Description shown beneath ''Active users'' in [[Special:Statistics]]
+
+* \$1: Value of \$wgRCMaxAge in days",
+'statistics-mostpopular' => 'Used in [[Special:Statistics]]',
+
+'disambiguations' => 'Name of a special page displayed in [[Special:SpecialPages]].',
+'disambiguationspage' => 'This message is the name of the template used for marking disambiguation pages. It is used by [[Special:Disambiguations]] to find all pages that links to disambiguation pages.
+
+{{doc-important|Don\'t translate the "Template:" part!}}',
+'disambiguations-text' => "This block of text is shown on [[:Special:Disambiguations]].
+
+* '''Note:''' Do not change the link [[MediaWiki:Disambiguationspage]], even because it is listed as problematic. Be sure the \"D\" is in uppercase, so not \"d\".
+
+* '''Background information:''' Beyond telling about links going to disambiguation pages, that they are generally bad, it should explain which pages in the article namespace are seen as diambiguations: [[MediaWiki:Disambiguationspage]] usually holds a list of diambiguation templates of the local wiki. Pages linking to one of them (by transclusion) will count as disambiguation pages. Pages linking to these disambiguation pages, instead to the disambiguated article itself, are listed on [[:Special:Disambiguations]].",
+
+'doubleredirects' => 'Name of [[Special:DoubleRedirects]] displayed in [[Special:SpecialPages]]',
+'doubleredirectstext' => 'Shown on top of [[Special:Doubleredirects]]',
+'double-redirect-fixed-move' => 'This is the message in the log when the software (under the username {{msg|double-redirect-fixer}}) updates the redirects after a page move. See also {{msg|fix-double-redirects}}.',
+'double-redirect-fixer' => "This is the '''username''' of the user who updates the double redirects after a page move. A user is created with this username, so it is perhaps better to not change this message too often. See also {{msg|double-redirect-fixed-move}} and {{msg|fix-double-redirects}}.",
+
+'brokenredirects' => 'Name of [[Special:BrokenRedirects]] displayed in [[Special:SpecialPages]]',
+'brokenredirectstext' => 'Shown on top of [[Special:BrokenRedirects]].',
+'brokenredirects-edit' => 'Link in [[Special:BrokenRedirects]]
+
+{{Identical|Edit}}',
+'brokenredirects-delete' => 'Link in [[Special:BrokenRedirects]] for admins
+
+{{Identical|Delete}}',
+
+'withoutinterwiki' => 'The title of the special page [[Special:WithoutInterwiki]].',
+'withoutinterwiki-summary' => 'Summary of [[Special:WithoutInterwiki]].',
+'withoutinterwiki-legend' => 'Used on [[Special:WithoutInterwiki]] as title of fieldset.',
+'withoutinterwiki-submit' => '{{Identical|Show}}',
+
+'fewestrevisions' => 'Name of a special page displayed in [[Special:SpecialPages]].',
+
+# Miscellaneous special pages
+'nbytes' => 'Message used on the history page of a wiki page. Each version of a page consist of a number of bytes. $1 is the number of bytes that the page uses. Uses plural as configured for a language based on $1.',
+'ncategories' => "Used in the special page '[[Special:MostCategories]]' in brackets after each entry on the list signifying how many categories a page is part of. $1 is the number of categories.",
+'nlinks' => 'This appears in brackets after each entry on the special page [[Special:MostLinked]]. $1 is the number of wiki links.',
+'nmembers' => 'Appears in brackets after each category listed on the special page [[Special:WantedCategories]]. $1 is the number of members of the category.',
+'nrevisions' => 'Number of revisions.',
+'nviews' => 'This message is used on [[Special:PopularPages]] to say how many times each page has been viewed. Parameter $1 is the number of views.',
+'specialpage-empty' => 'Used on a special page when there is no data. For example on [[Special:Unusedimages]] when all images are used.',
+'lonelypages' => 'Name of [[Special:LonelyPages]] displayed in [[Special:SpecialPages]]',
+'lonelypagestext' => 'Text displayed in [[Special:LonelyPages]]',
+'uncategorizedpages' => 'Name of a special page displayed in [[Special:SpecialPages]].',
+'uncategorizedcategories' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'uncategorizedimages' => 'The title of the special page [[Special:UncategorizedImages]].',
+'uncategorizedtemplates' => 'The title of the special page [[Special:UncategorizedTemplates]].',
+'unusedcategories' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'unusedimages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'popularpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'wantedcategories' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'wantedpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'wantedfiles' => 'Name of special page displayed in [[Special:SpecialPages]] and title of [[Special:WantedFiles]].',
+'mostlinked' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'mostlinkedcategories' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'mostlinkedtemplates' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'mostcategories' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'mostimages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'mostrevisions' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'prefixindex' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'shortpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'longpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'deadendpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'deadendpagestext' => 'Introductory text for [[Special:DeadendPages]]',
+'protectedpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'protectedpages-indef' => 'Option in [[Special:ProtectedPages]]',
+'protectedpages-cascade' => 'Option in [[Special:ProtectedPages]]',
+'protectedpagestext' => 'Shown on top of [[Special:ProtectedPages]]',
+'protectedtitles' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'protectedtitlestext' => 'Shown on top of list of titles on [[Special:ProtectedTitles]]. If the list is empty the message [[MediaWiki:Protectedtitlesempty]] appears instead of this. See the [http://www.mediawiki.org/wiki/Project:Protected_titles help page on Mediawiki] for more information.',
+'protectedtitlesempty' => 'Used on [[Special:ProtectedTitles]]. This text appears if the list of protected titles is empty. See the [http://www.mediawiki.org/wiki/Project:Protected_titles help page on Mediawiki] for more information.',
+'listusers' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'listusers-editsonly' => 'Option in [[Special:ListUsers]].',
+'usereditcount' => 'Shown behind every username on [[Special:ListUsers]].',
+'newpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'newpages-username' => '{{Identical|Username}}',
+'ancientpages' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'move' => 'Name of Move tab. Should be in the imperative mood.
+
+{{Identical|Move}}',
+'movethispage' => '{{Identical|Move this page}}',
+'unusedimagestext' => 'Header message of [[Special:UnusedFiles]]',
+'pager-newer-n' => "This is part of the navigation message on the top and bottom of Special pages which are lists of things in date order, e.g. the User's contributions page. It is passed as the second argument of [[MediaWiki:Viewprevnext]]. $1 is the number of items shown per page.",
+'pager-older-n' => "This is part of the navigation message on the top and bottom of Special pages which are lists of things in date order, e.g. the User's contributions page. It is passed as the first argument of [[MediaWiki:Viewprevnext]]. $1 is the number of items shown per page.",
+
+# Book sources
+'booksources' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'booksources-isbn' => '{{optional}}',
+'booksources-go' => 'Name of button in [[Special:BookSources]]
+
+{{Identical|Go}}',
+
+# Special:Log
+'specialloguserlabel' => 'Used in [[Special:Log]].
+
+{{Identical|User}}',
+'speciallogtitlelabel' => 'Used in [[Special:Log]].
+
+{{Identical|Title}}',
+'log' => 'Name of special page displayed in [[Special:SpecialPages]]',
+'all-logs-page' => 'Title of [[Special:Log]].',
+'alllogstext' => 'Header of [[Special:Log]]',
+'log-title-wildcard' => '* Appears in: [[Special:Log]]
+* Description: A check box to enable prefix search option',
+
+# Special:AllPages
+'allpages' => 'Name of special page displayed in [[Special:AllPages]]
+
+{{Identical|All pages}}',
+'alphaindexline' => 'Used on [[Special:AllPages]] if the main namespace contains more than 960 pages. Indicates the page range displayed behind the link. "from page $1 to page $2". $1 is the source page name. $1 is the target page name.',
+'nextpage' => 'Third part of the navigation bar for the special page [[Special:AllPages]]. $1 is a page title. The other parts are {{msg-mw|Allarticles}} and {{msg-mw|Prevpage}}.
+
+{{Identical|Next page}}',
+'prevpage' => 'Second part of the navigation bar for the special page [[Special:AllPages]]. $1 is a page title. The other parts are {{msg-mw|Allarticles}} and {{msg-mw|Nextpage}}.
+
+{{Identical|Previous page}}',
+'allpagesfrom' => 'Option in [[Special:AllPages]]. See also {{msg|allpagesto}}.',
+'allpagesto' => 'Option in [[Special:AllPages]]. See also {{msg|allpagesfrom}}.',
+'allarticles' => 'First part of the navigation bar for the special page [[Special:AllPages]]. The other parts are {{msg-mw|Prevpage}} and {{msg-mw|Nextpage}}.
+{{Identical|All pages}}',
+'allpagesprev' => "Allegedly used in [[Special:AllPages]], although I haven't seen it.
+
+{{Identical|Previous}}",
+'allpagesnext' => "Allegedly used in [[Special:AllPages]], although I haven't seen it.
+
+{{Identical|Next}}",
+'allpagessubmit' => 'Text on submit button in [[Special:AllPages]], [[Special:RecentChanges]], [[Special:RecentChangesLinked]], [[Special:NewPages]], [[Special:Log]], [[Special:ListUsers]], [[Special:ProtectedPages]], [[Special:ProtectedTitles]], [[Special:WhatLinksHere]] and [[Special:Watchlist]].
+
+{{Identical|Go}}',
+
+# Special:Categories
+'categories' => '{{Identical|Categories}}',
+'categoriespagetext' => "Text displayed in [[Special:Categories]]. Do not translate or change links. In order to translate ''Unused categories'' and ''wanted categories'' see {{msg|unusedcategories}} and {{msg|wantedcategories}}.",
+'special-categories-sort-count' => 'This message is used on [[Special:Categories]] to sort the list by the number of members in the categories.',
+
+# Special:DeletedContributions
+'deletedcontributions' => 'The message is shown as a link on [[Special:Contributions]] to the DeletedContributions special page.
+
+{{Identical|Deleted user contributions}}',
+
+# Special:LinkSearch
+'linksearch-ns' => '{{Identical|Namespace}}',
+'linksearch-ok' => '{{Identical|Search}}',
+
+# Special:ListUsers
+'listusers-submit' => 'Text displayed in the submission button of the [[Special:ListUsers]] form.
+{{Identical|Go}}
+{{Identical|Show}}',
+
+# Special:Log/newusers
+'newuserlogpage' => 'Part of the "Newuserlog" extension. It is both the title of [[Special:Log/newusers]] and the link you can see in the recent changes.',
+'newuserlogpagetext' => 'Part of the "Newuserlog" extension. It is the description you can see on [[Special:Log/newusers]].',
+'newuserlog-create-entry' => 'Part of the "Newuserlog" extension. It is the summary in the [[Special:RecentChanges|recent changes]] and on [[Special:Log/newusers]].',
+'newuserlog-create2-entry' => 'Part of the "Newuserlog" extension. It is the summary in the [[Special:RecentChanges|recent changes]] and on [[Special:Log/newusers]] when creating an account for someone else ("$1"). The name of the user doing this task appears before this message.',
+'newuserlog-autocreate-entry' => 'This message is used in the [[:mw:Extension:Newuserlog|new user log]] to mark an account that was created by MediaWiki as part of a [[:mw:Extension:CentralAuth|CentralAuth]] global account.',
+
+# Special:ListGroupRights
+'listgrouprights' => 'The name of the special page [[Special:ListGroupRights]].',
+'listgrouprights-summary' => 'The description used on [[Special:ListGroupRights]].',
+'listgrouprights-group' => "The title of the column in the table, about user groups (like you are in the ''translator'' group).
+
+{{Identical|Group}}",
+'listgrouprights-rights' => "The title of the column in the table, about user rights (like you can ''edit'' this page).",
+'listgrouprights-helppage' => "The link used on [[Special:ListGroupRights]]. Just translate \"Group rights\", and '''leave the \"Help:\" namespace exactly as it is'''.",
+'listgrouprights-members' => 'Used on [[Special:ListGroupRights]] and [[Special:Statistics]] as a link to [[Special:ListUsers|Special:ListUsers/"group"]], a list of members in that group.',
+'listgrouprights-addgroup' => 'This is an individual right for groups, used on [[Special:ListGroupRights]].
+* $1 is an enumeration of group names.
+* $2 is the number of group names in $1.
+See also {{msg|listgrouprights-removegroup}}.',
+'listgrouprights-removegroup' => 'This is an individual right for groups, used on [[Special:ListGroupRights]].
+* $1 is an enumeration of group names.
+* $2 is the number of group names in $1.
+See also {{msg|listgrouprights-addgroup}}.',
+'listgrouprights-addgroup-all' => '{{doc-right}}',
+'listgrouprights-removegroup-all' => '{{doc-right}}',
+
+# E-mail user
+'emailuser' => 'Link in the sidebar',
+'emailpagetext' => 'This is the text that is displayed above the e-mail form on [[Special:EmailUser]].
+
+Special:EmailUser appears when you click on the link "E-mail this user" in the sidebar, but only if there is an e-mail address in the recipient\'s user preferences. If there isn\'t then the message [[Mediawiki:Noemailtext]] will appear instead of Special:EmailUser.',
+'noemailtitle' => 'The title of the message that appears instead of Special:EmailUser after clicking the "E-mail this user" link in the sidebar, if no e-mail can be sent to the user.',
+'noemailtext' => 'The text of the message that appears instead of Special:EmailUser after clicking the "E-mail this user" link in the sidebar, if no e-mail can be sent to the user.',
+'email-legend' => 'Title of the box in [[Special:EmailUser]]',
+'emailfrom' => 'Field in [[Special:EmailUser]].',
+'emailto' => 'Field in [[Special:EmailUser]].',
+'emailsubject' => 'Field in [[Special:EmailUser]].
+
+{{Identical|Subject}}',
+'emailmessage' => 'Field in [[Special:EmailUser]].
+
+{{Identical|Message}}',
+'emailsend' => 'Button name in [[Special:EmailUser]].
+
+{{Identical|Send}}',
+'emailuserfooter' => 'This message is appended to every email sent through the "Email user" function.
+
+* $1: username of the sender
+* $2: username of the recipient',
+
+# Watchlist
+'watchlist' => '{{Identical|My watchlist}}',
+'mywatchlist' => 'Link at the upper right corner of the screen.
+
+{{Identical|My watchlist}}',
+'watchlistfor' => 'Subtitle on [[Special:Watchlist]].
+
+*$1: Username of current user
+{{Identical|For $1}}',
+'nowatchlist' => 'Displayed when there is no pages in the watchlist.',
+'watchnologin' => '{{Identical|Not logged in}}',
+'addedwatch' => 'Page title displayed when clicking on {{msg|watch}} tab (only when not using the AJAX feauture which allows watching a page without reloading the page or such). See also {{msg|addedwatchtext}}.',
+'addedwatchtext' => 'Explanation shown when clicking on the {{msg|watch}} tab. See also {{msg|addedwatch}}.',
+'removedwatch' => 'Page title displayed when clicking on {{msg|unwatch}} tab (only when not using the AJAX feauture which allows watching a page without reloading the page or such). See also {{msg|removedwatchtext}}.',
+'removedwatchtext' => "After a page has been removed from a user's watchlist by clicking the {{msg|unwatch}} tab at the top of an article, this message appears just below the title of the article. $1 is the title of the article. See also {{msg|removedwatch}} and {{msg|addedwatchtext}}.",
+'watch' => 'Name of the Watch tab. Should be in the imperative mood.',
+'watchthispage' => '{{Identical|Watch this page}}',
+'unwatch' => 'Name of "Unwatch" tab.',
+'notanarticle' => '{{Identical|Content page}}',
+'watchlist-details' => 'Message on Special page: My watchlist. This is paired with the message [[Mediawiki:Nowatchlist]] which appears instead of Watchlist-details when $1 is 0.',
+'wlheader-showupdated' => 'This message shows up near top of users watchlist page.',
+'wlshowlast' => "Appears on [[Special:Watchlist]]. Variable $1 gives a choice of different numbers of hours, $2 gives a choice of different numbers of days and $3 is '{{int:watchlistall2}}' ([[Mediawiki:watchlistall2/{{SUBPAGENAME}}]]). Clicking on your choice changes the list of changes you see (without changing the default in my preferences).",
+'watchlist-options' => 'Legend of the fieldset of [[Special:Watchlist]]',
+
+# Displayed when you click the "watch" button and it is in the process of watching
+'watching' => 'Text displayed when clicked on the watch tab: [[MediaWiki:Watch/{{SUBPAGENAME}}|{{int:watch}}]]. It means the wiki is adding that page to your watchlist.',
+'unwatching' => 'Text displayed when clicked on the unwatch tab: [[MediaWiki:Unwatch/{{SUBPAGENAME}}|{{int:unwatch}}]]. It means the wiki is removing that page from your watchlist.',
+
+'changed' => 'Possible value for $CHANGEDORCREATED in {{msg|enotif_subject}} and {{msg|enotif_body}}.',
+'created' => 'Possible value for $CHANGEDORCREATED in {{msg|enotif_subject}} and {{msg|enotif_body}}.',
+'enotif_subject' => '$CHANGEDORCREATED can be one of {{msg|changed}} and {{msg|created}}.',
+'enotif_body' => '$CHANGEDORCREATED can be one of {{msg|changed}} and {{msg|created}}.',
+
+# Delete
+'confirm' => 'Submit button text for protection confirmation
+
+{{Identical|Confirm}}',
+'excontent' => 'Automated deletion reason when deleting a page for admins',
+'excontentauthor' => 'Automated deletion reason when deleting a page for admins providing that the page has one author only.',
+'exbeforeblank' => 'Automated deletion reason when deleting a page for admins providing that the page was blanked before deletion.',
+'delete-confirm' => 'The title of the form to delete a page.
+
+$1 = the name of the page',
+'delete-legend' => '{{Identical|Delete}}',
+'historywarning' => 'Warning when about to delete a page that has history.',
+'confirmdeletetext' => 'Introduction shown when deleting a page.',
+'actioncomplete' => 'Used in several situations, for example when a page has been deleted.',
+'deletedarticle' => "This is a ''logentry'' message. $1 is deleted page name.",
+'dellogpage' => 'The name of the deletion log. Used as heading on [[Special:Log/delete]] and in the drop down menu for selecting logs on [[Special:Log]].
+
+{{Identical|Deletion log}}',
+'dellogpagetext' => 'Text in [[Special:Log/delete]].',
+'deletionlog' => 'This message is used to link to the deletion log as parameter $1 of {{msg|Filewasdeleted}} and as parameter $2 of {{msg|deletedtext}}.
+
+{{Identical|Deletion log}}',
+'reverted' => '{{Identical|Revert}}',
+'deletecomment' => '{{Identical|Reason for deletion}}',
+'deleteotherreason' => '{{Identical|Other/additional reason}}',
+'deletereasonotherlist' => '{{Identical|Other reason}}',
+'deletereason-dropdown' => 'Default reasons for deletion. Displayed as a drop-down list. Format:
+<pre>* Group
+** Common delete reason
+** ...</pre>',
+'delete-edit-reasonlist' => 'Shown beneath the page deletion form on the right side. It is a link to [[MediaWiki:Deletereason-dropdown]]. See also {{msg|Ipb-edit-dropdown}} and {{msg|Protect-edit-reasonlist}}.
+
+{{Identical|Edit delete reasons}}',
+
+# Rollback
+'rollback' => '{{Identical|Rollback}}',
+'rollback_short' => '{{Identical|Rollback}}',
+'rollbacklink' => '{{Identical|Rollback}}',
+'rollbackfailed' => '{{Identical|Rollback}}',
+'cantrollback' => '{{Identical|Revert}}
+{{Identical|Rollback}}',
+'alreadyrolled' => "Appear when there's rollback and/or edit collision.
+* $1: the page to be rollbacked
+* $2: the editor to be rollbacked of that page
+* $3: the editor that cause collision
+
+{{Identical|Rollback}}",
+'revertpage' => '{{Identical|Revert}}',
+'rollback-success' => 'This message shows up on screen after successful revert (generally visible only to admins). $1 describes user whose changes have been reverted, $2 describes user which produced version, which replaces reverted version.
+{{Identical|Revert}}
+{{Identical|Rollback}}',
+
+# Protect
+'protectlogpage' => 'Title of [[Special:Log/protect]].',
+'protectlogtext' => 'Text in [[Special:Log/protect]].',
+'protectedarticle' => 'Text describing an action on [[Special:Log]]. $1 is a page title.',
+'modifiedarticleprotection' => 'Text describing an action on [[Special:Log]]. $1 is a page title.',
+'protect-title' => 'Title for the protection form. $1 is the title of the page to be (un)protected.',
+'protect-backlink' => 'Optional message. Translate it only if you have to change it, i.e. for RTL wikis
+
+Shown as subtitle of the protection form. $1 is the title of the page to be (un)protected.',
+'protect-legend' => 'Legend of the fieldset around the input form of the protection form.',
+'protectcomment' => '{{Identical|Comment}}',
+'protectexpiry' => '{{Identical|Expires}}',
+'protect-unchain' => 'Used for a checkbox to be able to change move permissions. See [[meta:Protect]] for more information.',
+'protect-text' => 'Intro of the protection interface. See [[meta:Protect]] for more information.',
+'protect-default' => '{{Identical|Default}}',
+'protect-fallback' => 'This message is used as an option in the protection form on wikis were extra protection levels have been configured.',
+'protect-summary-cascade' => 'Used in edit summary when cascade protecting a page.',
+'protect-expiring' => 'Used in page history, and in [[Special:Protectedtitles]], [[Special:Protectedpages]].
+
+$1 = date and time,
+$2 = date,
+$3 = time.
+
+{{Identical|Expires $1 (UTC)}}',
+'protect-cascade' => 'See [[meta:Protect]] for more information.',
+'protect-othertime' => 'Used on the page protection form as label for the following input field (text)
+{{Identical|Other time}}',
+'protect-othertime-op' => 'Used on the page protection form in the drop down menu
+{{Identical|Other time}}',
+'protect-existing-expiry' => 'Shows the existing expiry time in the drop down menu of the protection form ([http://translatewiki.net/w/i.php?title=User:Raymond/test&action=unprotect example])
+
+* $1: date and time of the existing expiry time (kept for backward compatibility purposes)
+* $2: date of the existing expiry time
+* $3: time of the existing expiry time',
+'protect-otherreason' => 'Shown on the page protection form as label for the following input field (text)
+{{Identical|Other/additional reason}}',
+'protect-otherreason-op' => 'Shown on the page protection form in the drop down menu
+{{Identical|Other/additional reason}}',
+'protect-dropdown' => 'Shown on the page protection form as drop down menu for protection reasons.
+
+<tt><nowiki>* Groupname</nowiki></tt> - defines a new group<br />
+<tt><nowiki>** Reason</nowiki></tt> - defines a reason in this group',
+'protect-edit-reasonlist' => 'Shown beneath the page protection form on the right side. It is a link to [[MediaWiki:Protect-dropdown]]. See also {{msg|Delete-edit-reasonlist}} and {{msg|Ipb-edit-dropdown}}.',
+'protect-expiry-options' => "* Description: Options for the duration of the block. 
+* <font color=\"red\">Be careful:</font> '''1 translation:1 english''', so the first part is the translation and the second part should stay in English. 
+* Example: See e.g. [[MediaWiki:Protect-expiry-options/nl]] if you still don't know how to do it.
+
+{{Identical|Infinite}}",
+'restriction-type' => 'Used on [[Special:ProtectedPages]]. The text next to a drop-down box. See the help page on [http://meta.wikimedia.org/wiki/Protect Meta] for more information on protection.',
+'restriction-level' => 'Used on [[Special:ProtectedPages]] and [[Special:ProtectedTitles]]. The text next to a drop-down box. See the [http://www.mediawiki.org/wiki/Project:Protected_titles help page on Mediawiki] and on [http://meta.wikimedia.org/wiki/Protect Meta] for more information.',
+'minimum-size' => 'Used in [[Special:Protectedpages]] as a pair of radio buttons, with [[MediaWiki:Maximum-size]]. There is an input box to specify the minimum bites of the projected pages listed.',
+'maximum-size' => 'Used in [[Special:Protectedpages]] as a pair of radio buttons, with [[MediaWiki:Minimum-size]]. There is an input box to specify the maximum bites of the projected pages listed.',
+'pagesize' => 'Used on [[Special:ProtectedPages]]. See the help page on [http://meta.wikimedia.org/wiki/Protect Meta] for more information on protection.',
+
+# Restrictions (nouns)
+'restriction-edit' => "Used on [[Special:ProtectedPages]]. Option in the 'permission' drop-down box.
+
+{{Identical|Edit}}",
+'restriction-move' => "Used on [[Special:ProtectedPages]]. Option in the 'permission' drop-down box.
+
+{{Identical|Move}}",
+'restriction-create' => 'Used on [[Special:ProtectedPages]]. An option in a drop-down box. See the help pages on [http://www.mediawiki.org/wiki/Project:Protected_titles MediaWiki] and [http://meta.wikimedia.org/wiki/Protect Meta] for more information on protection.
+
+{{Identical|Create}}',
+
+# Restriction levels
+'restriction-level-sysop' => "Used on [[Special:ProtectedPages]] and [[Special:ProtectedTitles]]. An option in the drop-down box 'Restriction level'. See the [http://www.mediawiki.org/wiki/Project:Protected_titles help page on Mediawiki] and on [http://meta.wikimedia.org/wiki/Protect Meta] for more information.",
+'restriction-level-autoconfirmed' => "Used on [[Special:ProtectedPages]] and [[Special:ProtectedTitles]]. An option in the drop-down box 'Restriction level'. See the [http://www.mediawiki.org/wiki/Project:Protected_titles help page on Mediawiki] and on [http://meta.wikimedia.org/wiki/Protect Meta] for more information.",
+'restriction-level-all' => "Used on [[Special:ProtectedPages]] and [[Special:ProtectedTitles]]. An option in the drop-down box 'Restriction level'. See the [http://www.mediawiki.org/wiki/Project:Protected_titles help page on Mediawiki] and on [http://meta.wikimedia.org/wiki/Protect Meta] for more information.",
+
+# Undelete
+'undelete' => 'Name of special page for admins as displayed in [[Special:SpecialPages]].
+
+{{Identical|View deleted pages}}',
+'undeletepage' => 'Title of special page [[Special:Undelete]]. This special page is only visible to administrators.',
+'viewdeletedpage' => '{{Identical|View deleted pages}}',
+'undeleteextrahelp' => "Help message displayed when restoring history of a page. In your language, ''Restore'' is called ''[[MediaWiki:Undeletebtn/{{SUBPAGENAME}}|{{int:Undeletebtn}}]]'' ({{msg|Undeletebtn}}), ''Reset'' button is called ''[[MediaWiki:Undeletereset/{{SUBPAGENAME}}|{{int:Undeletereset}}]]'' ({{msg|Undeletereset}}).",
+'undelete-revision' => 'Shown in "View and restore deleted pages" ([[Special:Undelete/$1]]).
+
+* $1: deleted page name
+* $3: user name (author of revision, not who deleted it)
+* $4: date of the revision
+* $5: time of the revision
+
+\'\'Example:\'\' Deleted revision of [[Main Page]] (as of {{CURRENTDAY}} {{CURRENTMONTHNAME}} {{CURRENTYEAR}}, at {{CURRENTTIME}}) by [[User:Username|Username]]:',
+'undeletebtn' => 'Shown on [[Special:Undelete]] as button caption and on [[Special:Log/delete|deletion log]] after each entry (for sysops).
+
+{{Identical|Restore}}',
+'undeletelink' => 'Display name of link to undelete a page used on [[Special:Log/delete]]
+
+{{Identical|Restore}}',
+'undeletereset' => 'Shown on [[Special:Undelete]] as button caption.
+{{Identical|Reset}}',
+'undeleteinvert' => '{{Identical|Invert selection}}',
+'undeletecomment' => '{{Identical|Comment}}',
+'undelete-search-submit' => '{{Identical|Search}}',
+'undelete-show-file-confirm' => 'A confirmation message shown on Special:Undelete when the request does not contain a valid token (e.g. when a user clicks a link received in mail).
+* <code>$1</code> is the name of the file being undeleted.
+* <code>$2</code> is the date of the displayed revision.
+* <code>$3</code> is the time of the displayed revision.',
+'undelete-show-file-submit' => '{{Identical|Yes}}',
+
+# Namespace form on various pages
+'namespace' => '{{Identical|Namespace}}',
+'invert' => 'Displayed in [[Special:RecentChanges]].
+
+{{Identical|Invert selection}}',
+'blanknamespace' => 'Name for main namespace (blank namespace) in drop-down menus at [[Special:RecentChanges]] and other special pages.',
+
+# Contributions
+'contributions' => "Display name for the 'User contributions', shown in the sidebar menu of all user pages and user talk pages. Also the page name of the target page. The target page shows an overview of the most recent contributions by a user.",
+'contributions-title' => 'The page title in your browser bar, but not the page title. See also {{msg|contributions}}. Parameter $1 is the username.',
+'mycontris' => 'In the personal urls page section - right upper corner.',
+'uctop' => 'This message is used in [[Special:Contributions]]. It is used to show that a particular edit was the last made to a page. Example: 09:57, 11 February 2008 (hist) (diff) Pagename‎ (edit summary) (top)',
+'month' => 'Used in [[Special:Contributions]] and history pages ([{{fullurl:Sandbox|action=history}} example]), as label for a dropdown box to select a specific month to view the edits made in that month, and the earlier months. See also {{msg|year}}.',
+'year' => 'Used in [[Special:Contributions]] and history pages ([{{fullurl:Sandbox|action=history}} example]), as label for a inputbox to select a specific year to view the edits made in that year, and the earlier years. See also {{msg|month}}.',
+
+'sp-contributions-newbies' => 'Text of radio button on special page [[Special:Contributions]].',
+'sp-contributions-newbies-sub' => "Note at the top of the page of results for a search on [[Special:Contributions]] where 'Show contributions for new accounts only' has been selected.",
+'sp-contributions-newbies-title' => 'The page title in your browser bar, but not the page title. See also {{msg|sp-contributions-newbies-sub}}.',
+'sp-contributions-blocklog' => 'Used as a display name for a link to the block log on for example [[Special:Contributions/Mediawiki default]]
+
+{{Identical|Block log}}',
+'sp-contributions-submit' => '{{Identical|Search}}',
+
+# What links here
+'whatlinkshere' => 'The text of the link in the toolbox (on the left, below the search menu) going to [[Special:WhatLinksHere]].',
+'whatlinkshere-title' => "Title of the special page [[Special:WhatLinksHere]]. This page appears when you click on the 'What links here' button in the toolbox. $1 is the name of the page concerned.",
+'whatlinkshere-page' => '{{Identical|Page}}',
+'linkshere' => "This message is the header line of the [[Special:WhatLinksHere/$1]] page generated by clicking 'What links here' in the sidebar toolbox. It is followed by a navigation bar built using [[MediaWiki:Viewprevnext]].",
+'nolinkshere' => 'This appears on Whatlinkshere pages which are empty.
+
+Parameter $1 is a page title.',
+'isredirect' => 'Displayed in Special:WhatLinksHere (see [{{fullurl:Special:WhatLinksHere/Betawiki:Translator|hidelinks=1}} Special:WhatLinksHere/Betawiki:Translator] for example).
+
+{{Identical|Redirect page}}',
+'istemplate' => 'Means that a page (a template, specifically) is used as <code><nowiki>{{Page name}}</nowiki></code>.
+Displayed in Special:WhatLinksHere (see [[Special:WhatLinksHere/Template:New portal]] for example).',
+'isimage' => 'This message is displayed on [[Special:WhatLinksHere]] for images. It means that the image is used on the page (as opposed to just being linked to like an non-image page).',
+'whatlinkshere-prev' => 'This is part of the navigation message on the top and bottom of Whatlinkshere pages, where it is used as the first argument of [[MediaWiki:Viewprevnext]].
+$1 is the number of items shown per page. It is not used when $1 is zero; not sure what happens when $1 is one.
+Special pages use [[MediaWiki:Prevn]] instead (still as an argument to [[MediaWiki:Viewprevnext]]).
+
+{{PLURAL:$1|previous|previous $1}}',
+'whatlinkshere-next' => 'This is part of the navigation message on the top and bottom of Whatlinkshere pages, where it is used as the second argument of [[MediaWiki:Viewprevnext]].
+$1 is the number of items shown per page. It is not used when $1 is zero; not sure what happens when $1 is one.
+Special pages use [[MediaWiki:Nextn]] instead (still as an argument to [[MediaWiki:Viewprevnext]]).
+
+{{PLURAL:$1|next|next $1}}',
+'whatlinkshere-links' => 'Used on [[Special:WhatLinksHere]]. It is a link to the WhatLinksHere page of that page.
+
+Example line:
+* [[Main Page]] ([[Special:WhatLinksHere/Main Page|{{int:whatlinkshere-links}}]])
+
+{{Identical|Links}}',
+'whatlinkshere-hideredirs' => 'Parameter $1 is the message "[[MediaWiki:Hide/{{SUBPAGENAME}}|hide]]" or "[[MediaWiki:Show/{{SUBPAGENAME}}|show]]".',
+'whatlinkshere-hidetrans' => 'Parameter $1 is the message "[[MediaWiki:Hide/{{SUBPAGENAME}}|hide]]" or "[[MediaWiki:Show/{{SUBPAGENAME}}|show]]".',
+'whatlinkshere-hidelinks' => 'Parameter $1 is the message "[[MediaWiki:Hide/{{SUBPAGENAME}}|hide]]" or "[[MediaWiki:Show/{{SUBPAGENAME}}|show]]".',
+'whatlinkshere-hideimages' => 'This is the text of the option on [[Special:WhatLinksHere]] for image pages, allowing to hide/show pages which display the file inline.
+Parameter $1 is the message "[[MediaWiki:Hide/{{SUBPAGENAME}}|hide]]" or "[[MediaWiki:Show/{{SUBPAGENAME}}|show]]".',
+'whatlinkshere-filters' => '{{Identical|Filter}}',
+
+# Block/unblock
+'blockip' => 'The title of the special page [[Special:BlockIP]].
+
+{{Identical|Block user}}',
+'blockip-legend' => 'Legend/Header for the fieldset around the input form of [[Special:BlockIP]].
+
+{{Identical|Block user}}',
+'ipaddress' => '{{Identical|IP Address}}',
+'ipbexpiry' => '{{Identical|Expiry}}',
+'ipbreason' => 'Label of the block reason dropdown in [[Special:BlockIP]] and the unblock reason textfield in [{{fullurl:Special:IPBlockList|action=unblock}} Special:IPBlockList?action=unblock].
+
+{{Identical|Reason}}',
+'ipbreasonotherlist' => '{{Identical|Other reason}}',
+'ipbanononly' => '{{Identical|Block anonymous users only}}',
+'ipbcreateaccount' => '{{Identical|Prevent account creation}}',
+'ipbemailban' => '{{Identical|Prevent user from sending e-mail}}',
+'ipbenableautoblock' => '{{Identical|Automatically block ...}}',
+'ipbsubmit' => '{{Identical|Block this user}}',
+'ipbother' => '{{Identical|Other time}}',
+'ipboptions' => "* Description: Options for the duration of the block. 
+* <font color=\"red\">Be careful:</font> '''1 translation:1 english''', so the first part is the translation and the second part should stay in English. 
+* Example: See e.g. [[MediaWiki:Ipboptions/nl]] if you still don't know how to do it.
+
+{{Identical|Infinite}}",
+'ipbotheroption' => '{{Identical|Other}}',
+'ipbotherreason' => '{{Identical|Other/additional reason}}',
+'ipbhidename' => 'This is the label for a checkbox in the user block form on [[Special:BlockIP]].',
+'ipbwatchuser' => 'This is an option on [[Special:BlockIP]] to watch the user page and talk page of the blocked user',
+'ipballowusertalk' => 'Option in [[Special:BlockIP]] that allows the blocked user to edit own talk page.',
+'ipb-change-block' => 'Confirmation checkbox required for blocks that would override an earlier block. Appears together with {{msg|ipb-needreblock}}.',
+'ipb-edit-dropdown' => 'Shown beneath the user block form on the right side. It is a link to [[MediaWiki:Ipbreason-dropdown]]. See also {{msg|Delete-edit-reasonlist}} and {{msg|Protect-edit-reasonlist}}.',
+'ipusubmit' => 'Used as button text on Special:BlockList?action=unblock. To see the message:
+* Go to [[Special:BlockList]]
+* Click "unblock" for any block (but you can only see "unblock" if you have administrator rights)
+* It is now the button below the form',
+'ipblocklist-sh-userblocks' => 'Top selection button at [[Special:IPBlockList]], which means Show/Hide indefinite blocks
+
+* $1 - word "{{msg|Hide}}" or "{{msg|Show}}"',
+'ipblocklist-sh-tempblocks' => 'Top selection button at [[Special:IPBlockList]]
+
+* $1 - word "{{msg|Hide}}" or "{{msg|Show}}"',
+'ipblocklist-sh-addressblocks' => 'Top selection button at [[Special:IPBlockList]]
+
+* $1 - word "{{msg|Hide}}" or "{{msg|Show}}"',
+'ipblocklist-submit' => '{{Identical|Search}}',
+'blocklistline' => 'This is the text of an entry in the Special:IPBlockList.
+* $1 is the hour and date of the block. 
+* $2 is the sysop. 
+* $3 is the blocked user or IP (with link to contributions and talk)
+* $4 contains "hour and date of expiry, details (\'\'reason\'\')"
+
+See also {{msg-mw|Blocklogentry}}.',
+'infiniteblock' => '{{Identical|Infinite}}',
+'anononlyblock' => '{{Identical|Anon only}}',
+'noautoblockblock' => '{{Identical|Autoblock disabled}}',
+'emailblock' => '{{Identical|E-mail blocked}}',
+'blocklist-nousertalk' => 'Used in [[Special:IPBlockList]] when "Allow this user to edit own talk page while blocked" option hasn\'t been flagged. See also {{msg-mw|Block-log-flags-nousertalk}}.',
+'blocklink' => "Display name for a link that, when selected, leads to a form where a user can be blocked. Used in page history and recent changes pages. Example: \"''UserName (Talk | contribs | '''block''')''\".",
+'change-blocklink' => 'Used to name the link on Special:Log',
+'contribslink' => 'Short for "contributions". Used as display name for a link to user contributions on history pages, [[Special:RecentChanges]], [[Special:Watchlist]], etc.',
+'blocklogpage' => '{{Identical|Block log}}',
+'blocklog-fulllog' => 'Shown at Special:BlockIP at the end of the block log if there are more than 10 entries for this user, see [[Special:BlockIP/Raymond]] as example (visible for sysops only).',
+'blocklogentry' => 'This is the text of an entry in the Block log (and RC), after hour (and date, only in the Block log) and sysop name: 
+* $1 is the blocked user or IP (with link to contributions and talk)
+* $2 is the duration of the block (hours, days etc.) or the specified expiry date
+* $3 contains "(details) (\'\'reason\'\')"
+See also {{msg-mw|Blocklistline}}.',
+'reblock-logentry' => 'This is the text of an entry in the Block log (and Recent Changes), after hour (and date, only in the Block log) and sysop name:
+* $1 is the user being reblocked
+* $2 is the expiry time of the block
+* $3 is the reason for the block',
+'blocklogtext' => 'See {{msg-mw|ipblocklist}} for the special page name.',
+'unblocklogentry' => 'This is the text of an entry in the Block log (and Recent Changes), after hour (and date, only in the Block log) and sysop name:
+* $1 is the user being unblocked',
+'block-log-flags-noautoblock' => '{{Identical|Autoblock disabled}}',
+'block-log-flags-noemail' => "Log message for [[Special:Log/block]] to note that a user cannot use the 'email another user' option.
+
+{{Identical|E-mail blocked}}",
+'block-log-flags-nousertalk' => 'Used in [[Special:Log/block]] when "Allow this user to edit own talk page while blocked" option hasn\'t been flagged. See also {{msg-mw|Blocklist-nousertalk}}.',
+'ipb_expiry_temp' => 'Warning message displayed on [[Special:BlockIP]] if the option "hide username" is selected but the expiry time is not infinite.',
+'ipb_already_blocked' => '{{Identical|$1 is already blocked}}',
+'blockme' => 'The page title of [[Special:Blockme]], a feature which is disabled by default.',
+'sorbs' => '{{optional}}',
+
+# Developer tools
+'lockdb' => 'The title of the special page [[Special:LockDB]].
+
+{{Identical|Lock database}}',
+'unlockdb' => 'The title of the special page [[Special:UnlockDB]].
+
+{{Identical|Unlock database}}',
+'lockbtn' => 'The submit button on the special page [[Special:LockDB]].
+
+{{Identical|Lock database}}',
+'unlockbtn' => 'The submit button on the special page [[Special:UnlockDB]].
+
+{{Identical|Unlock database}}',
+'lockfilenotwritable' => "'No longer needed' on wikipedia.",
+
+# Move page
+'move-page' => 'Header of the special page to move pages. $1 is the name of the page to be moved.',
+'move-page-backlink' => 'Optional message. Translate it only if you have to change it, i.e. for RTL wikis
+
+Shown as subtitle of [[Special:MovePage/testpage]]. $1 is the title of the page to be moved.',
+'move-page-legend' => 'Legend of the fieldset around the input form of [[Special:MovePage/testpage]].
+
+{{Identical|Move page}}',
+'movepagetext' => 'Introduction shown when moving a page ([[Special:MovePage]]).',
+'movepagetalktext' => "Text on the special 'Move page'. This text only appears if the talk page is not empty.",
+'movearticle' => 'The text before the name of the page that you are moving.
+
+{{Identical|Move page}}',
+'movenologin' => '{{Identical|Not logged in}}',
+'movenologintext' => "Text of message on special page 'Permissions Errors', which appears when somebody tries to move a page without being logged in.",
+'newtitle' => 'Used in the special page "[[Special:MovePage]]". The text for the inputbox to give the new page title.',
+'move-watch' => 'The text of the checkbox to watch the page you are moving.
+
+{{Identical|Watch this page}}',
+'movepagebtn' => "Button label on the special 'Move page'.
+
+{{Identical|Move page}}",
+'pagemovedsub' => 'Message displayed as aheader of the body, after succesfully moving a page from source to target name.',
+'movepage-moved' => 'Message displayed after succesfully moving a page from source to target name.
+* $1 is the source page as a link with display name
+* $2 is the target page as a link with display name
+* $3 (optional) is the source page name without a link
+* $4 (optional) is the target page name without a link',
+'movetalk' => 'The text of the checkbox to watch the associated talk page to the page you are moving. This only appears when the talk page is not empty.',
+'move-subpages' => 'The text of an option on the special page [[Special:MovePage|MovePage]]. If this option is ticked, any subpages will be moved with the main page to a new title.',
+'move-talk-subpages' => 'The text of an option on the special page [[Special:MovePage|MovePage]]. If this option is ticked, any subpages will be moved with the talk page to a new title.',
+'1movedto2' => "This is ''logentry'' message. $1 is the original page name, $2 is the destination page name.",
+'1movedto2_redir' => "This is ''logentry'' message. $1 is the original page name, $2 is the destination page name.",
+'movelogpage' => 'Title of special page',
+'movelogpagetext' => "Text on the special page 'Move log'.",
+'movereason' => 'Used in [[Special:MovePage]]. The text for the inputbox to give a reason for the page move.
+
+{{Identical|Reason}}',
+'revertmove' => '{{Identical|Revert}}',
+'delete_and_move_text' => 'Used when moving a page, but the destination page already exists and needs deletion. This message is to confirm that you really want to delete the page. See also {{msg|delete and move confirm}}.',
+'delete_and_move_confirm' => 'Used when moving a page, but the destination page already exists and needs deletion. This message is for a checkbox to confirm that you really want to delete the page. See also {{msg|delete and move text}}.',
+'fix-double-redirects' => 'This is a checkbox in [[Special:MovePage]] which allows to move all redirects from the old title to the new title.',
+
+# Export
+'export' => 'Page title of [[Special:Export]], a page where a user can export pages from a wiki to a file.',
+'exporttext' => 'Main text on [[Special:Export]]. Leave the line <tt><nowiki>[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]</nowiki></tt> exactly as it is!',
+'exportcuronly' => 'A label of checkbox option in [[Special:Export]]',
+'export-submit' => 'Button name in [[Special:Export]].
+
+{{Identical|Export}}',
+'export-addcat' => '{{Identical|Add}}',
+'export-download' => 'A label of checkbox option in [[Special:Export]]',
+'export-templates' => 'A label of checkbox option in [[Special:Export]]',
+
+# Namespace 8 related
+'allmessages' => 'The title of the special page [[Special:AllMessages]].',
+'allmessagesname' => 'Used on [[Special:Allmessages]] meaning "the name of the message".
+{{Identical|Name}}',
+'allmessagesdefault' => 'Used in [[Special:AllMessages]].',
+'allmessagescurrent' => 'Used in [[Special:AllMessages]].',
+'allmessagestext' => 'Used in [[Special:AllMessages]].',
+'allmessagesnotsupportedDB' => 'This message is displayed on [[Special:AllMessages]] on wikis were the configuration variable $wgUseDatabaseMessages is disabled. It means that the MediaWiki namespace is not used.',
+
+# Thumbnails
+'thumbnail-more' => '[[Image:Yes.png|thumb|This:]]
+Tooltip shown when hovering over a little sign of a thumb image, to go to the image page (where it is bigger). For example, see the image at the right:',
+
+# Special:Import
+'import' => 'The title of the special page [[Special:Import]];',
+'import-interwiki-submit' => '{{Identical|Import}}',
+'xml-error-string' => ':$1: Some kind of message, perhaps name of the error?
+:$2: line number
+:$3: columm number
+:$4: ?? $this->mByte . $this->mContext
+:$5: error description
+----
+:Example
+Import failed: XML import parse failure at line 1, col 1 (byte 3; "- <mediawiki xml"): Empty document',
+'import-upload' => 'Used on [[Special:Import]].
+
+Related messages: {{msg|right-importupload|pl=yes}} (the user right for this).',
+
+# Import log
+'importlogpage' => '{{Identical|Import log}}',
+'import-logentry-upload' => 'This is the text of an entry in the Import log (and Recent Changes), after hour (and date, only in the Import log) and sysop name:
+* $1 is the name of the imported file',
+
+# Tooltip help for the actions
+'tooltip-pt-userpage' => 'This text appears in the tool-tip when you hover the mouse over your the tab with you User name on it',
+'tooltip-pt-mytalk' => 'Tooltip shown when hovering over the "my talk" link in your personal toolbox (upper right side).',
+'tooltip-pt-preferences' => 'Tooltip shown when hovering over the "my preferences" link in your personal toolbox (upper right side).
+
+{{Identical|My preferences}}',
+'tooltip-pt-watchlist' => 'Tooltip shown when hovering over the "my watchlist" link in your personal toolbox (upper right side).',
+'tooltip-pt-mycontris' => 'Tooltip shown when hovering over the "my contributions" link in your personal toolbox (upper right side).',
+'tooltip-pt-login' => "Tooltip shown when hovering over the link 'Log in / create account' in the upper right corner show on all pages while not logged in.",
+'tooltip-pt-logout' => 'Tooltip shown when hovering over the "Log out" link in your personal toolbox (upper right side).
+
+{{Identical|Log out}}',
+'tooltip-ca-talk' => 'Tooltip shown when hovering over the "[[MediaWiki:Talk/{{SUBPAGENAME}}|{{int:talk}}]]" tab.
+
+{{Identical|Content page}}',
+'tooltip-ca-edit' => 'The tooltip when hovering over the "[[MediaWiki:Edit/{{SUBPAGENAME}}|{{int:edit}}]]" tab.',
+'tooltip-ca-addsection' => 'Tooltip shown when hovering over the "addsection" tab (shown on talk pages).',
+'tooltip-ca-viewsource' => 'Tooltip displayed when hovering over the {{msg|viewsource}} tab.',
+'tooltip-ca-protect' => '{{Identical|Protect this page}}',
+'tooltip-ca-delete' => 'Tooltip shown when hovering over the "[[MediaWiki:Delete/{{SUBPAGENAME}}|{{int:delete}}]]" tab.
+
+{{Identical|Delete this page}}',
+'tooltip-ca-move' => '{{Identical|Move this page}}',
+'tooltip-ca-watch' => '{{Identical|Add this page to your watchlist}}',
+'tooltip-ca-unwatch' => 'Tooltip shown when hovering over the {{msg|unwatch}} tab.',
+'tooltip-search' => 'The tooltip when hovering over the search menu.',
+'tooltip-search-go' => 'This is the text of the tooltip displayed when hovering the mouse over the “[[MediaWiki:Go|Go]]� button next to the search box.',
+'tooltip-search-fulltext' => 'This is the text of the tooltip displayed when hovering the mouse over the “[[MediaWiki:Search|Search]]� button under the search box.',
+'tooltip-p-logo' => '{{Identical|Main page}}',
+'tooltip-n-mainpage' => 'Tool tip shown when hovering the mouse over the link to [[{{MediaWiki:Mainpage}}]].',
+'tooltip-n-portal' => "Tooltip shown when hovering over the link to 'Community portal' shown in the side bar menu on all pages.",
+'tooltip-n-currentevents' => 'Tooltip shown when hovering over {{msg|currentevents}} in the sidebar.',
+'tooltip-n-recentchanges' => 'The tooltip when hovering over the "[[MediaWiki:Recentchanges/{{SUBPAGENAME}}|{{int:recentchanges}}]]" link in the sidebar going to the special page [[Special:RecentChanges]].',
+'tooltip-n-randompage' => "Tooltip shown when hovering over the link to 'Random page' shown in the side bar menu on all pages. Clicking the link will show a random page in from the wiki's main namespace.",
+'tooltip-n-help' => "Tooltip shown when hovering over the link 'help' shown in the side bar menu on all pages.",
+'tooltip-t-whatlinkshere' => 'Tooltip shown when hovering over the {{msg|whatlinkshere}} message in the toolbox.',
+'tooltip-t-contributions' => 'Tooltip shown when hovering over {{msg|contributions}} in the toolbox.',
+'tooltip-t-emailuser' => 'Tooltip shown when hovering over the {{msg|emailuser}} link in the toolbox (sidebar, below).',
+'tooltip-t-upload' => 'Tooltip shown when hovering over the link to upload files shown in the side bar menu on all pages.
+
+{{Identical|Upload files}}',
+'tooltip-t-specialpages' => 'The tooltip when hovering over the link "[[MediaWiki:Specialpages/{{SUBPAGENAME}}|{{int:specialpages}}]]" going to a list of all special pages available in the wiki.',
+'tooltip-ca-nstab-main' => '{{Identical|Content page}}',
+'tooltip-ca-nstab-user' => 'Tooltip shown when hovering over {{msg|nstab-user}} (User namespace tab).',
+'tooltip-ca-nstab-image' => 'Tooltip shown when hovering over {{msg|nstab-image}} (Image namespace tab).',
+'tooltip-ca-nstab-template' => 'Tooltip shown when hovering over the {{msg|nstab-template}} tab.',
+'tooltip-ca-nstab-help' => 'Tootip shown when hovering over the {{msg|nstab-help}} tab in the Help namespace.',
+'tooltip-ca-nstab-category' => 'Tooltip shown when hovering over the {{msg|nstab-category}} tab.',
+'tooltip-minoredit' => 'Tooltip shown when hovering over the "[[MediaWiki:Minoredit/{{SUBPAGENAME}}|{{int:minoredit}}]]" link below the edit form.',
+'tooltip-save' => "This is the text that appears when you hover the mouse over the 'Save page' button on the edit page",
+'tooltip-preview' => 'Tooltip shown when hovering over the "Show preview" button.
+
+If the length of the translated message is over 60 characters (including spaces) then the end of the message will be cut off when using Firefox 2.0.0.7 browser, Linux operating system and the Monobook skin.',
+'tooltip-diff' => 'This is the text (tooltip) that appears when you hover the mouse over the "Show changes" button ({{msg|showdiff}}) on the edit page.',
+'tooltip-compareselectedversions' => 'Tooltip of {{msg|compareselectedversions}} (which is used as button in history pages).',
+'tooltip-watch' => '{{Identical|Add this page to your watchlist}}',
+'tooltip-rollback' => 'Tooltip of the rollback link on the history page and the diff view
+{{Identical|Rollback}}
+{{Identical|Revert}}',
+'tooltip-undo' => 'Tooltip of the undo link on the history page and the diff view
+{{Identical|Undo}}{{Identical|Revert}}',
+
+# Stylesheets
+'common.css' => 'CSS applied to all users.',
+'monobook.css' => 'CSS applied to users using Monobook skin.',
+
+# Scripts
+'common.js' => 'JS for all users.',
+'monobook.js' => 'JS for users using Monobook skin.',
+
+# Attribution
+'lastmodifiedatby' => 'This message is shown when viewing the credits of a page (example: {{fullurl:Main Page|action=credits}}). Note that this action is disabled by default (currently enabled on Betawiki).
+* $1: date
+* $2: time
+* $3: user
+
+See also [[MediaWiki:Lastmodifiedat/{{SUBPAGENAME}}]].',
+'siteusers' => '* $1 is a list of user names (example: "\'\'Jim, Janet, Jane, Joe\'\'")
+* $2 is the number of user names in $1',
+'creditspage' => "This message is the ''contentSub'' (the grey subtitle) shown when viewing credits of a page (example: {{fullurl:Betawiki:News|action=credits}}). Note that the credits action is disabled by default (currently enabled on Betawiki).",
+'nocredits' => 'This message is shown when viewing the credits of a page (example: {{fullurl:Main Page|action=credits}}) but when there are no credits available. Note that the credits action is disabled by default (currently enabled on Betawiki).',
+
+# Spam protection
+'spam_reverting' => '{{Identical|Revert}}',
+
+# Skin names
+'skinname-standard' => '{{optional}}',
+'skinname-nostalgia' => '{{optional}}',
+'skinname-cologneblue' => '{{optional}}',
+'skinname-monobook' => '{{optional}}',
+'skinname-myskin' => '{{optional}}',
+'skinname-chick' => '{{optional}}',
+'skinname-simple' => '{{optional}}',
+'skinname-modern' => '{{optional}}',
+
+# Math options
+'mw_math_png' => 'In user preferences.',
+'mw_math_simple' => 'In user preferences.',
+'mw_math_html' => 'In user preferences.',
+'mw_math_source' => 'In user preferences (math)',
+'mw_math_modern' => 'In user preferences (math)',
+'mw_math_mathml' => 'In user preferences.',
+
+# Patrol log
+'patrol-log-page' => 'Name of log.',
+'patrol-log-header' => 'Text that appears above the log entries on the [[Special:log|patrol log]].',
+'patrol-log-line' => 'Text of notes on entries in the [[Special:Log|patrol log]]. $1 is the link whose text is [[Mediawiki:patrol-log-diff]]. $2 is the name of the page. $3 appears to be [[Mediawiki:Patrol-log-auto]] (at least sometimes).
+
+The message appears after the name of the patroller.',
+'patrol-log-auto' => 'Automated edit summary when patrolling.
+
+{{Identical|Automatic}}',
+'patrol-log-diff' => 'The text of the diff link in [[MediaWiki:Patrol-log-line]] (inside $1 there)',
+'log-show-hide-patrol' => '* $1 is one of {{msg|show}} or {{msg|hide}}',
+
+# Browsing diffs
+'previousdiff' => 'Used when viewing the difference between edits. See also {{msg|nextdiff}}.',
+'nextdiff' => 'Used when viewing the difference between edits. See also {{msg|previousdiff}}.',
+
+# Visual comparison
+'visual-comparison' => '{{Identical|Visual comparison}}',
+
+# Media information
+'imagemaxsize' => 'This is used in Special:Preferences, under Files.',
+'widthheightpage' => 'This message is used on image pages in the dimensions column in the file history section for images  with more than one page. Parameter $1 is the image width (in pixels), parameter $2 is the image height, and parameter $3 is the number of pages.',
+'file-info' => 'File info displayed on file description page.',
+'file-info-size' => 'File info displayed on file description page.',
+'file-nohires' => 'File info displayed on file description page.',
+'svg-long-desc' => 'Displayed under an SVG image at the image description page. See for example [[:Image:Wiki.svg]].',
+'show-big-image' => 'Displayed under an image at the image description page, when it is displayed smaller there than it was uploaded.',
+'show-big-image-thumb' => 'File info displayed on file description page.',
+
+# Special:NewFiles
+'newimages' => 'Page title of [[Special:NewImages]].',
+'imagelisttext' => 'This is text on [[Special:NewImages]]. $1 is the number of files. $2 is the message {{msg-mw|Mediawiki:Bydate}}.',
+'newimages-summary' => 'This message is displayed at the top of [[Special:NewImages]] to explain what is shown on that special page.',
+'newimages-legend' => 'Caption of the fieldset for the filter on [[Special:NewImages]]
+
+{{Identical|Filter}}',
+'newimages-label' => 'Caption of the filter editbox on [[Special:NewImages]]',
+'showhidebots' => 'This is shown on the special page [[Special:NewImages]]. The format is "{{int:showhidebots|[[MediaWiki:Hide/{{SUBPAGENAME}}|{{int:hide}}]]}}" or "{{int:showhidebots|[[MediaWiki:Show/{{SUBPAGENAME}}|{{int:show}}]]}}"
+
+{{Identical|$1 bots}}',
+'noimages' => "This is shown on the special page [[Special:NewImages]], when there aren't any recently uploaded files.",
+'ilsubmit' => '{{Identical|Search}}',
+'bydate' => '{{Identical|Date}}',
+'sp-newimages-showfrom' => "This is a link on [[Special:NewImages]] which takes you to a gallery of the newest files.
+* $1 is a date (example: ''19 March 2008'')
+* $2 is a time (example: ''12:15'')",
+
+# Video information, used by Language::formatTimePeriod() to format lengths in the above messages
+'seconds-abbrev' => '{{optional}}',
+'minutes-abbrev' => '{{optional}}',
+'hours-abbrev' => 'Abbreviation for "hours"',
+
+# Bad image list
+'bad_image_list' => 'This is only message appears to guide administrators to add links with right format. This will not appear anywhere else in Mediawiki.',
+
+/*
+Short names for language variants used for language conversion links.
+To disable showing a particular link, set it to 'disable', e.g.
+'variantname-zh-sg' => 'disable',
+Variants for Chinese language
+*/
+'variantname-zh-hans' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-zh-hant' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-zh-cn' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-zh-tw' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-zh-hk' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-zh-mo' => '{{optional}}',
+'variantname-zh-sg' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-zh-my' => '{{optional}}',
+'variantname-zh' => 'Varient Option for wikis with variants conversion enabled.',
+
+# Variants for Serbian language
+'variantname-sr-ec' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-sr-el' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-sr' => 'Varient Option for wikis with variants conversion enabled.',
+
+# Variants for Kazakh language
+'variantname-kk-kz' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-kk-tr' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-kk-cn' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-kk-cyrl' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-kk-latn' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-kk-arab' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-kk' => 'Varient Option for wikis with variants conversion enabled.',
+
+# Variants for Kurdish language
+'variantname-ku-arab' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-ku-latn' => 'Varient Option for wikis with variants conversion enabled.',
+'variantname-ku' => 'Varient Option for wikis with variants conversion enabled.',
+
+# Variants for Tajiki language
+'variantname-tg-cyrl' => '{{optional}}',
+'variantname-tg-latn' => '{{optional}}',
+'variantname-tg' => '{{optional}}',
+
+# Metadata
+'metadata' => 'The title of a section on an image description page, with information and data about the image.
+
+{{Identical|Metadata}}',
+'metadata-expand' => 'On an image description page, there is mostly a table containing data (metadata) about the image. The most important data are shown, but if you click on this link, you can see more data and information. For the link to hide back the less important data, see "[[MediaWiki:Metadata-collapse/{{SUBPAGENAME}}|{{int:metadata-collapse}}]]".',
+'metadata-collapse' => 'On an image description page, there is mostly a table containing data (metadata) about the image. The most important data are shown, but if you click on the link "[[MediaWiki:Metadata-expand/{{SUBPAGENAME}}|{{int:metadata-expand}}]]", you can see more data and information. This message is for the link to hide back the less important data.',
+'metadata-fields' => "'''Warning:''' Do not translate list items, only translate the text! So leave \"<tt>* make</tt>\" and the other items exactly as they are.",
+
+# EXIF tags
+'exif-imagewidth' => '{{Identical|Width}}',
+'exif-imagelength' => '{{Identical|Height}}',
+'exif-primarychromaticities' => 'The chromaticity of the three primary colours of the image. Normally this tag is not necessary, since colour space is specified in the colour space information tag. This should probably be translated it as "Chromaticity of primary colours".',
+'exif-software' => 'Short for "The software which was used to create this image".',
+'exif-artist' => '{{Identical|Author}}',
+'exif-flash' => '{{Identical|Flash}}',
+'exif-subjectarea' => 'This exif property contains the position of the main subject of the picture in pixels from the upper left corner and additionally its width and heigth in pixels.',
+'exif-spatialfrequencyresponse' => '[http://en.wikipedia.org/wiki/Spatial_frequency Spatial frequency] is the number of edges per degree of the visual angle. The human eye scans the viewed scenary for edges and uses these edges to detect what it sees. Few edges make it hard to recognize the seen objects, but many edges do so too. A rate of about 4 to 6 edges per degree of the viewing range is seen as optimal for the recognition of objects.
+
+Spatial frequency response is a measure for the capability of camera lenses to depict spatial frequencies.',
+'exif-gpslatitude' => '{{Identical|Latitude}}',
+'exif-gpslongitude' => '{{Identical|Longitude}}',
+
+# EXIF attributes
+'exif-compression-6' => '{{optional}}',
+
+'exif-photometricinterpretation-2' => '{{optional}}',
+
+'exif-orientation-1' => '{{Identical|Normal}}',
+
+'exif-componentsconfiguration-1' => '{{optional}}',
+'exif-componentsconfiguration-2' => '{{optional}}',
+'exif-componentsconfiguration-3' => '{{optional}}',
+'exif-componentsconfiguration-4' => '{{optional}}',
+'exif-componentsconfiguration-5' => '{{optional}}',
+'exif-componentsconfiguration-6' => '{{optional}}',
+
+'exif-exposureprogram-1' => "One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article '[http://en.wikipedia.org/wiki/Mode_dial Mode dial]' for an explanation.",
+'exif-exposureprogram-3' => 'One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article for a definition of the term [http://en.wikipedia.org/wiki/Aperture_priority aperture priority].',
+'exif-exposureprogram-4' => 'One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article for a definition of the term [http://en.wikipedia.org/wiki/Shutter_priority shutter priority].',
+'exif-exposureprogram-5' => "One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article '[http://en.wikipedia.org/wiki/Mode_dial Mode dial]' for an explanation.",
+'exif-exposureprogram-6' => "One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article '[http://en.wikipedia.org/wiki/Mode_dial Mode dial]' for an explanation.",
+'exif-exposureprogram-7' => "One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article '[http://en.wikipedia.org/wiki/Mode_dial Mode dial]' for an explanation.",
+'exif-exposureprogram-8' => "One of the exposure program types in the table of metadata on image description pages. See the Wikipedia article '[http://en.wikipedia.org/wiki/Mode_dial Mode dial]' for an explanation.",
+
+'exif-subjectdistance-value' => '$1 is a distance measured in metres. The value can, and usually does, include decimal places.',
+
+'exif-meteringmode-0' => '{{Identical|Unknown}}',
+'exif-meteringmode-255' => '{{Identical|Other}}',
+
+'exif-lightsource-0' => '{{Identical|Unknown}}',
+'exif-lightsource-4' => '{{Identical|Flash}}',
+'exif-lightsource-21' => '{{optional}}',
+'exif-lightsource-22' => '{{optional}}',
+'exif-lightsource-23' => '{{optional}}',
+
+# Flash modes
+'exif-flash-mode-1' => 'This is when you have chosen that your camera must use a flash for this picture.',
+'exif-flash-mode-2' => "This is when you have chosen that your camera must ''not'' use a flash for this picture.",
+
+'exif-sensingmethod-5' => "''Color sequential'' means, that the three base colors are measured one after another (i.e. the sensor is first measuring red, than green, than blue).",
+'exif-sensingmethod-8' => "''Color sequential'' means, that the three base colors are measured one after another (i.e. the sensor is first measuring red, than green, than blue).",
+
+'exif-filesource-3' => '{{optional}}',
+
+'exif-scenecapturetype-0' => '{{Identical|Standard}}',
+
+'exif-gaincontrol-0' => 'Gain amplifies the signal off of the image sensor. Gain turns the brightness level up or down.
+
+:0: None: no gain at all
+:1: Low gain up: some more brightness
+:2: High gain up: much more brightness
+:3: Low gain down: some less brightness (seems to be uncommon in photography)
+:4: High gain down: much less brightness (seems to be uncommon in photography)
+
+{{Identical|None}}',
+'exif-gaincontrol-1' => '{{:MediaWiki:Exif-gaincontrol-0/qqq}}',
+'exif-gaincontrol-2' => '{{:MediaWiki:Exif-gaincontrol-0/qqq}}',
+'exif-gaincontrol-3' => '{{:MediaWiki:Exif-gaincontrol-0/qqq}}',
+'exif-gaincontrol-4' => '{{:MediaWiki:Exif-gaincontrol-0/qqq}}',
+
+'exif-contrast-0' => '{{Identical|Normal}}',
+'exif-contrast-1' => '{{Identical|Soft}}',
+'exif-contrast-2' => '{{Identical|Hard}}',
+
+'exif-saturation-0' => '{{Identical|Normal}}',
+
+'exif-sharpness-0' => '{{Identical|Normal}}',
+'exif-sharpness-1' => '{{Identical|Soft}}',
+'exif-sharpness-2' => '{{Identical|Hard}}',
+
+'exif-subjectdistancerange-0' => '{{Identical|Unknown}}',
+'exif-subjectdistancerange-1' => 'See also:
+* {{msg|Exif-subjectdistancerange-0}}
+* {{msg|Exif-subjectdistancerange-1}}
+* {{msg|Exif-subjectdistancerange-2}}
+* {{msg|Exif-subjectdistancerange-3}}',
+
+# Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-n' => "Knots: ''Knot'' is a unit of speed on water used for ships, etc., equal to one nautical mile per hour.",
+
+# External editor support
+'edit-externally' => 'Displayed on image description pages. See for example [[:Image:Yes.png#filehistory]].',
+'edit-externally-help' => 'Displayed on image description pages. See for example [[:Image:Yes.png#filehistory]].
+
+Please leave the link http://www.mediawiki.org/wiki/Manual:External_editors exactly as it is.',
+
+# 'all' in various places, this might be different for inflected languages
+'recentchangesall' => '{{Identical|All}}',
+'imagelistall' => '{{Identical|All}}',
+'watchlistall2' => 'Appears on [[Special:Watchlist]]. It is variable $3 in the text message [[Mediawiki:Wlshowlast]].
+
+{{Identical|All}}',
+'namespacesall' => 'In special page [[Special:WhatLinksHere]]. Drop-down box option for namespace.
+
+{{Identical|All}}',
+'monthsall' => 'Used in a drop-down box on [[Special:Contributions]] as an option for "all months". See also [[MediaWiki:Month/{{SUBPAGENAME}}]].
+
+{{Identical|All}}',
+
+# E-mail address confirmation
+'confirmemail_needlogin' => 'Used on [[Special:ConfirmEmail]] when you are logged out. Parameter $1 is a link to the log in form.',
+'confirmemail_body' => 'This message is sent as an e-mail to users when they add or change their e-mail adress in [[Special:Preferences]].
+
+*$1 is the IP adress of the user that changed the e-mail adress
+*$2 is the name of the user
+*$3 is a URL to [[Special:ConfirmEmail]]
+*$4 is a time and date 
+*$5 is a URL to [[Special:InvalidateEmail]]',
+'confirmemail_invalidated' => 'This is the text of the special page [[Special:InvalidateEmail|InvalidateEmail]] (with the title in [[Mediawiki:Invalidateemail]]) where user goes if he chooses the cancel e-mail confirmation link from the confirmation e-mail.',
+'invalidateemail' => "This is the '''name of the special page''' where user goes if he chooses the cancel e-mail confirmation link from the confirmation e-mail.",
+
+'unit-pixel' => '{{optional}}',
+
+# action=purge
+'confirm_purge_button' => '{{Identical|OK}}',
+
+# Separators for various lists, etc.
+'colon-separator' => "Optional message. Change it only if your language uses another character for ':' or it needs an extra space before the colon.",
+'word-separator' => 'This is a string which is (usually) put between words of the language. It is used, e.g. when messages are concatenated (appended to each other). Note that you must express a space as html entity &amp;#32; because the editing and updating process strips leading and trailing spaces from messages.
+
+Most languages use a space, but some Asian languages, such as Thai and Chinese, do not.',
+
+# Multipage image navigation
+'imgmultipageprev' => '{{Identical|Previous page}}',
+'imgmultipagenext' => '{{Identical|Next page}}',
+'imgmultigo' => '{{Identical|Go}}',
+
+# Table pager
+'ascending_abbrev' => 'Abbreviation of Ascending power',
+'table_pager_next' => '{{Identical|Next page}}',
+'table_pager_prev' => '{{Identical|Previous page}}',
+'table_pager_limit' => "Do not use PLURAL in this message, because ''$1'' is not the actual number. ''$1'' is a limit selector drop-down list.",
+'table_pager_limit_submit' => '{{Identical|Go}}',
+'table_pager_empty' => 'Used in a table pager when there are no results (e.g. when there are no images in the table on [[Special:ImageList]]).',
+
+# Auto-summaries
+'autosumm-blank' => 'The auto summary when blanking the whole page. This is not the same as deleting the page.',
+'autosumm-replace' => 'The auto summary when a user removes a lot of characters in the page.',
+'autoredircomment' => 'The auto summary when making a redirect. $1 is the page where it redirects to.',
+'autosumm-new' => 'The auto summary when creating a new page. $1 are the first X number of characters of the new page.',
+
+# Size units
+'size-bytes' => 'Size (of a page, typically) in bytes.',
+'size-kilobytes' => 'Size (of a page, typically) in kibibytes (1 kibibyte = 1024 bytes).',
+'size-megabytes' => 'Size (of a file, typically) in mebibytes (1 mebibyte = 1024×1024 bytes).',
+'size-gigabytes' => 'Size (of a file, typically) in gibibytes (1 gibibyte = 1024×1024×1024 bytes).',
+
+# Live preview
+'livepreview-loading' => '{{Identical|Loading}}',
+
+# Watchlist editor
+'watchlistedit-numitems' => 'Message on Special page: Edit watchlist. This is paired with the message [[Mediawiki:Watchlistedit-noitems]] which appears instead of Watchlistedit-numitems when $1 is 0.',
+'watchlistedit-noitems' => "Message on Special page: Edit watchlist, which only appears when a user's watchlist is empty.",
+'watchlistedit-normal-explain' => 'An introduction/explanation about the [[Special:Watchlist/edit|normal edit watchlist function]].',
+'watchlistedit-normal-done' => 'Message on Special page: Edit watchlist after pages are removed from the watchlist.',
+'watchlistedit-raw-title' => '{{Identical|Edit raw watchlist}}',
+'watchlistedit-raw-legend' => '{{Identical|Edit raw watchlist}}',
+'watchlistedit-raw-explain' => 'An introduction/explanation about the [[Special:Watchlist/raw|raw edit watchlist function]].',
+'watchlistedit-raw-added' => 'Message on special page: Edit raw watchlist. The message appears after at least 1 message is added to the raw watchlist.',
+'watchlistedit-raw-removed' => 'Message on special page: Edit raw watchlist. The message appears after at least 1 message is deleted from the raw watchlist.',
+
+# Watchlist editing tools
+'watchlisttools-view' => '[[Special:Watchlist]]: Navigation link under the title. See also {{msg|watchlisttools-edit}} and {{msg|watchlisttools-raw}}.',
+'watchlisttools-edit' => '[[Special:Watchlist]]: Navigation link under the title. See also {{msg|watchlisttools-view}} and {{msg|watchlisttools-raw}}.',
+'watchlisttools-raw' => '[[Special:Watchlist]]: Navigation link under the title. See also {{msg|watchlisttools-view}} and {{msg|watchlisttools-edit}}.
+
+{{Identical|Edit raw watchlist}}',
+
+# Iranian month names
+'iranian-calendar-m1' => 'Name of month in Iranian calender.',
+'iranian-calendar-m2' => 'Name of month in Iranian calender.',
+'iranian-calendar-m3' => 'Name of month in Iranian calender.',
+'iranian-calendar-m4' => 'Name of month in Iranian calender.',
+'iranian-calendar-m5' => 'Name of month in Iranian calender.',
+'iranian-calendar-m6' => 'Name of month in Iranian calender.',
+'iranian-calendar-m7' => 'Name of month in Iranian calender.',
+'iranian-calendar-m8' => 'Name of month in Iranian calender.',
+'iranian-calendar-m9' => 'Name of month in Iranian calender.',
+'iranian-calendar-m10' => 'Name of month in Iranian calender.',
+'iranian-calendar-m11' => 'Name of month in Iranian calender.',
+'iranian-calendar-m12' => 'Name of month in Iranian calender.',
+
+# Hijri month names
+'hijri-calendar-m1' => 'Name of month in Islamic calender.',
+'hijri-calendar-m2' => 'Name of month in Islamic calender.',
+'hijri-calendar-m3' => 'Name of month in Islamic calender.',
+'hijri-calendar-m4' => 'Name of month in Islamic calender.',
+'hijri-calendar-m5' => 'Name of month in Islamic calender.',
+'hijri-calendar-m6' => 'Name of month in Islamic calender.',
+'hijri-calendar-m7' => 'Name of month in Islamic calender.',
+'hijri-calendar-m8' => 'Name of month in Islamic calender.',
+'hijri-calendar-m9' => 'Name of month in Islamic calender.',
+'hijri-calendar-m10' => 'Name of month in Islamic calender.',
+'hijri-calendar-m11' => 'Name of month in Islamic calender.',
+'hijri-calendar-m12' => 'Name of month in Islamic calender.',
+
+# Hebrew month names
+'hebrew-calendar-m1' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m2' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m3' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m4' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m5' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m6' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m6a' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m6b' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m7' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m8' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m9' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m10' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m11' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m12' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m1-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m2-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m3-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m4-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m5-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m6-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m6a-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m6b-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m7-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m8-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m9-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m10-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m11-gen' => 'Name of month in Hebrew calender.',
+'hebrew-calendar-m12-gen' => 'Name of month in Hebrew calender.',
+
+# Signatures
+'timezone-utc' => '{{optional}}',
+
+# Core parser functions
+'unknown_extension_tag' => '* Description: This is an error shown when you use an unknown extension tag name. This feature allows tags like <tt><nowiki><pre></nowiki></tt> to be called with a parser like <tt><nowiki>{{#tag:pre}}</nowiki></tt>.
+* Parameter $1: This is the unknown extension tag name.',
+
+# Special:Version
+'version' => 'Name of special page displayed in [[Special:SpecialPages]]
+
+{{Identical|Version}}',
+'version-extensions' => 'Header on [[Special:Version]].',
+'version-specialpages' => 'Part of [[Special:Version]].
+
+{{Identical|Special pages}}',
+'version-parserhooks' => 'This message is a heading at [[Special:Version]] for extensions that modifies the parser of wikitext.',
+'version-other' => '{{Identical|Other}}',
+'version-mediahandlers' => 'Used in [[Special:Version]]. It is the title of a section for media handler extensions (e.g. [[mw:Extension:OggHandler]]).
+There are no such extensions here, so look at [[wikipedia:Special:Version]] for an example.',
+'version-hooks' => 'Shown in [[Special:Version]]',
+'version-extension-functions' => 'Shown in [[Special:Version]]',
+'version-parser-function-hooks' => 'Shown in [[Special:Version]]',
+'version-skin-extension-functions' => 'Shown in [[Special:Version]]',
+'version-hook-name' => 'Shown in [[Special:Version]]',
+'version-hook-subscribedby' => 'Shown in [[Special:Version]]',
+'version-version' => '{{Identical|Version}}',
+'version-software-product' => 'Shown in [[Special:Version]]',
+'version-software-version' => '{{Identical|Version}}',
+
+# Special:FilePath
+'filepath' => 'Shown in [[Special:FilePath]]',
+'filepath-page' => 'Shown in [[Special:FilePath]]
+
+{{Identical|File}}',
+'filepath-submit' => 'Shown in [[Special:FilePath]]',
+'filepath-summary' => 'Shown in [[Special:FilePath]]',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch-summary' => 'Summary of [[Special:FileDuplicateSearch]]',
+'fileduplicatesearch-legend' => 'Legend of the fieldset around the input form of [[Special:FileDuplicateSearch]]',
+'fileduplicatesearch-filename' => 'Input form of [[Special:FileDuplicateSearch]]:
+
+{{Identical|Filename}}',
+'fileduplicatesearch-submit' => '{{Identical|Search}}',
+'fileduplicatesearch-info' => 'Information beneath the thumbnail on the right side shown after a successful search via [[Special:FileDuplicateSearch]]
+
+* $1: width of the file
+* $2: height of the file
+* $3: File size 
+* $4: MIME type',
+'fileduplicatesearch-result-1' => 'Result line after the list of files of [[Special:FileDuplicateSearch]]
+
+$1 is the name of the requested file.',
+'fileduplicatesearch-result-n' => 'Result line after the list of files of [[Special:FileDuplicateSearch]]
+
+* $1 is the name of the requested file. 
+* $2 is the number of identical duplicates of the requested file',
+
+# Special:SpecialPages
+'specialpages' => 'Display name of link to [[Special:SpecialPages]] shown on all pages in the toolbox, as well as the page title and header of [[Special:SpecialPages]].
+
+{{Identical|Special pages}}',
+'specialpages-note' => 'Footer note for the [[Special:SpecialPages]] page',
+'specialpages-group-maintenance' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-other' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-login' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-changes' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-media' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-users' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-highuse' => 'Section heading in the list of [[Special:SpecialPages|Special pages]].',
+'specialpages-group-pages' => 'Title of the special pages group, containing pages like [[Special:AllPages]], [[Special:PrefixIndex]], [[Special:Categories]], [[Special:Disambiguations]], etc.',
+'specialpages-group-pagetools' => 'Title of the special pages group containing special pages like [[Special:MovePage]], [[Special:Undelete]], [[Special:WhatLinksHere]], [[Special:Export]] etc.',
+'specialpages-group-wiki' => 'Title of the special pages group, containing special pages like [[Special:Version]], [[Special:Statistics]], [[Special:LockDB]], etc.',
+'specialpages-group-redirects' => 'Title of the special pages group, containing special pages that redirect to another location, like [[Special:Randompage]], [[Special:Mypage]], [[Special:Mytalk]], etc.',
+
+# Special:BlankPage
+'intentionallyblankpage' => 'Text displayed in [[Special:BlankPage]].',
+
+# External image whitelist
+'external_image_whitelist' => "As usual please leave all the wiki markup, including the spaces, as they are. You can translate the text, including 'Leave this line exactly as it is'.",
+
+);
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index cddc517b..edc59932 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author AlimanRuna
+ * @author Omnipaedista
  * @author לערי ריינה�רט
  */
 
@@ -13,14 +14,12 @@ $fallback = 'es';
 $namespaceNames = array(
 	NS_MEDIA          => 'Midya',
 	NS_SPECIAL        => 'Sapaq',
-	NS_MAIN           => '',
 	NS_TALK           => 'Rimanakuy',
 	NS_USER           => 'Ruraq',
 	NS_USER_TALK      => 'Ruraq_rimanakuy',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_rimanakuy',
-	NS_IMAGE          => 'Rikcha',
-	NS_IMAGE_TALK     => 'Rikcha_rimanakuy',
+	NS_FILE           => 'Rikcha',
+	NS_FILE_TALK      => 'Rikcha_rimanakuy',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_rimanakuy',
 	NS_TEMPLATE       => 'Plantilla',
@@ -31,6 +30,95 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Katiguriya_rimanakuy',
 );
 
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'IskayllaPusapuna' ),
+	'BrokenRedirects'           => array( 'PantaPusapuna', 'PitisqaPusapuna' ),
+	'Disambiguations'           => array( 'SutichanaQillqa' ),
+	'Userlogin'                 => array( 'RuraqYaykuy' ),
+	'Userlogout'                => array( 'RuraqLluqsiy' ),
+	'CreateAccount'             => array( 'RakiqunaKamariy' ),
+	'Preferences'               => array( 'Allinkachina', 'Allinkachinakuna' ),
+	'Watchlist'                 => array( 'Watiqasqa', 'Watiqasqakuna' ),
+	'Recentchanges'             => array( 'NaqhaHukchasqa' ),
+	'Upload'                    => array( 'Churkuy' ),
+	'Listfiles'                 => array( 'RikchaSutisuyu' ),
+	'Newimages'                 => array( 'MusuqRikcha', 'MusuqRikchakuna' ),
+	'Listusers'                 => array( 'Ruraqkuna', 'RuraqSutisuyu' ),
+	'Listgrouprights'           => array( 'HunuHayni', 'HunupHaynin', 'RuraqpaHaynin', 'RuraqkunapHayninkuna' ),
+	'Statistics'                => array( 'Ranuy', 'Kanchachani' ),
+	'Randompage'                => array( 'MayninpiPanqa' ),
+	'Lonelypages'               => array( 'WakchaPanqa' ),
+	'Uncategorizedpages'        => array( 'KatiguriyannaqPanqa' ),
+	'Uncategorizedcategories'   => array( 'KatiguriyannaqKatiguriya' ),
+	'Uncategorizedimages'       => array( 'KatiguriyannaqRikcha' ),
+	'Uncategorizedtemplates'    => array( 'KatiguriyannaqPlantilla' ),
+	'Unusedcategories'          => array( 'ChusaqKatiguriya', 'ManaLlamkachisqaKatiguriya' ),
+	'Unusedimages'              => array( 'ManaLlamkachisqaRikcha' ),
+	'Wantedpages'               => array( 'MunasqaPanqa', 'MunakusqaPanqa', 'MuchusqaPanqa' ),
+	'Wantedcategories'          => array( 'MunasqaKatiguriya', 'MunakusqaKatiguriya', 'MuchusqaKatiguriya' ),
+	'Wantedfiles'               => array( 'MunasqaWillaniqi', 'MunakusqaWillaniqi', 'MuchusqaWillaniqi' ),
+	'Wantedtemplates'           => array( 'MunasqaPlantilla', 'MunakusqaPlantilla', 'MuchusqaPlantilla' ),
+	'Mostlinked'                => array( 'Tinkimuqsapa', 'LliwmantaAswanTinkimuqniyuq' ),
+	'Mostlinkedcategories'      => array( 'TinkimuqsapaKatiguriya', 'AnchaLlamkachisqa', 'AchkaKutiLlamkachisqa' ),
+	'Mostlinkedtemplates'       => array( 'TinkimuqsapaPlantilla' ),
+	'Mostimages'                => array( 'TinkimuqsapaRikcha' ),
+	'Mostcategories'            => array( 'Katiguriyasapa' ),
+	'Mostrevisions'             => array( 'AnchaLlamkapusqa', 'AchkaKutiLlamkapusqa' ),
+	'Fewestrevisions'           => array( 'AsllaLlamkapusqa', 'AsllaKutiLlamkapusqa' ),
+	'Shortpages'                => array( 'UchuyPanqa' ),
+	'Longpages'                 => array( 'HatunPanqa' ),
+	'Newpages'                  => array( 'MusuqPanqa' ),
+	'Ancientpages'              => array( 'MawkaPanqa' ),
+	'Deadendpages'              => array( 'Lluqsinannaq' ),
+	'Protectedpages'            => array( 'AmachasqaPanqa' ),
+	'Protectedtitles'           => array( 'AmachasqaSuti' ),
+	'Allpages'                  => array( 'TukuyPanqakuna' ),
+	'Prefixindex'               => array( 'QallarinaKaskaSutisuyu' ),
+	'Ipblocklist'               => array( 'HarkasqaRuraq', 'HarkasqaIP', 'HarkasqaRuraqkuna' ),
+	'Specialpages'              => array( 'SapaqPanqa', 'SapaqPanqakuna' ),
+	'Contributions'             => array( 'Rurasqakuna', 'Llamkapusqakuna' ),
+	'Emailuser'                 => array( 'EChaskitaManakuy' ),
+	'Confirmemail'              => array( 'EChaskitaTakyachiy' ),
+	'Whatlinkshere'             => array( 'KaymanTinkimuq' ),
+	'Recentchangeslinked'       => array( 'HukchasqaTinkimuq' ),
+	'Movepage'                  => array( 'PanqataAstay' ),
+	'Blockme'                   => array( 'Harkaway' ),
+	'Booksources'               => array( 'PukyuLiwru' ),
+	'Categories'                => array( 'Katiguriyakuna' ),
+	'Export'                    => array( 'HawamanQuy' ),
+	'Version'                   => array( 'Musuqchasqa' ),
+	'Allmessages'               => array( 'TukuyWillaykuna' ),
+	'Log'                       => array( 'Hallcha', 'Hallchasqa' ),
+	'Blockip'                   => array( 'Harkay', 'RuraqtaHarkay', 'IPHarkay' ),
+	'Undelete'                  => array( 'QullusqataPaqarichiy' ),
+	'Import'                    => array( 'HawamantaChaskiy' ),
+	'Lockdb'                    => array( 'WillaniqintintaHarkay' ),
+	'Unlockdb'                  => array( 'WillaniqintintaPaskay' ),
+	'Userrights'                => array( 'RuraqpaHaynin' ),
+	'MIMEsearch'                => array( 'MIMEkamaMaskay' ),
+	'FileDuplicateSearch'       => array( 'IskayllaWillaniqitaMaskay' ),
+	'Unwatchedpages'            => array( 'ManaWatiqasqa' ),
+	'Listredirects'             => array( 'Pusapunakuna', 'TukuyPusapuna' ),
+	'Revisiondelete'            => array( 'MusuqchasqaQulluy' ),
+	'Unusedtemplates'           => array( 'ManaLlamkachisqaPlantilla' ),
+	'Randomredirect'            => array( 'KikinmantaPusapuna' ),
+	'Mypage'                    => array( 'Panqay', 'NuqapPanqay' ),
+	'Mytalk'                    => array( 'Rimachinay', 'RimanakuyPanqay', 'NuqapRimachinay', 'NuqapRimanakuyPanqay' ),
+	'Mycontributions'           => array( 'Rurasqaykuna', 'Llamkapusqaykuna' ),
+	'Listadmins'                => array( 'Kamachiqkuna' ),
+	'Listbots'                  => array( 'RuranaAntachakuna' ),
+	'Popularpages'              => array( 'WatukuqsapaPanqa', 'RikuqsapaPanqa', 'QhawaqsapaPanqa' ),
+	'Search'                    => array( 'Maskay' ),
+	'Resetpass'                 => array( 'YaykunaRimataKutichiy' ),
+	'Withoutinterwiki'          => array( 'Interwikinnaq', 'Wikipurannaq' ),
+	'MergeHistory'              => array( 'WinayKawsaytaHunuy' ),
+	'Filepath'                  => array( 'WillaniqiNan' ),
+	'Invalidateemail'           => array( 'EChaskitaManaallinchay' ),
+	'Blankpage'                 => array( 'PanqataChusaqchay' ),
+	'LinkSearch'                => array( 'TinkitaMaskay', 'TinkikunataMaskay' ),
+	'DeletedContributions'      => array( 'QullusqaRurasqa', 'QullusqaLlamkapusqa' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => "T'inkikunata uranpi sikwiy",
@@ -69,17 +157,18 @@ $messages = array(
 'tog-watchlisthideown'        => "Watiqasqaykunapiqa ñuqap llamk'apusqaykunata pakay",
 'tog-watchlisthidebots'       => "Watiqasqaykunapiqa rurana antachakunap llamk'apusqankunata pakay",
 'tog-watchlisthideminor'      => "Watiqasqaykunapiqa uchuylla llamk'apusqakunata pakay",
+'tog-watchlisthideliu'        => "Rakiqunayuq ruraqkunap llamk'apusqankunata watiqay sutisuyupi pakay",
+'tog-watchlisthideanons'      => "Rakiqunannaq ruraqkunap llamk'apusqankunata watiqay sutisuyupi pakay",
 'tog-nolangconversion'        => 'Simi kutiyman ama niy',
 'tog-ccmeonemails'            => 'Huk ruraqkunaman kachasqay e-chaskikunamanta iskaychasqakunata kachamuway',
 'tog-diffonly'                => "Huk kaykunap uranpi kaq p'anqap samiqninta ama rikuchiychu",
 'tog-showhiddencats'          => 'Pakasqa katiguriyakunata rikuchiy',
+'tog-norollbackdiff'          => 'Ruraqpa hukchasqankunata kutichispa ama wakin kayta willaychu',
 
 'underline-always'  => "Hayk'appas",
 'underline-never'   => "Mana hayk'appas",
 'underline-default' => "Wamp'unap kikinmanta chanin",
 
-'skinpreview' => '(Ñawpaqta qhaway)',
-
 # Dates
 'sunday'        => 'Intichaw',
 'monday'        => 'Killachaw',
@@ -173,7 +262,7 @@ $messages = array(
 'mytalk'         => 'Rimachinay',
 'anontalk'       => 'Kay IP huchhapaq rimanakuy',
 'navigation'     => "Wamp'una",
-'and'            => '-wan',
+'and'            => '&#32;-wan',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -210,14 +299,14 @@ $messages = array(
 'talkpagelinktext'  => 'rimanakuy',
 'specialpage'       => "Sapaq p'anqa",
 'personaltools'     => "Kikin ruraqpa llamk'anankuna",
-'postcomment'       => 'Willamuy',
+'postcomment'       => 'Musuq raki',
 'articlepage'       => 'Qillqata qhaway',
 'talk'              => 'Rimachina',
 'views'             => 'Rikunakuna',
 'toolbox'           => "Llamk'anakuna",
 'userpage'          => "Ruraqpa p'anqanta qhaway",
 'projectpage'       => "Meta p'anqata qhaway",
-'imagepage'         => "Rikchamanta p'anqata qhaway",
+'imagepage'         => "Willañiqimanta p'anqata qhaway",
 'mediawikipage'     => "Willay p'anqata qhaway",
 'templatepage'      => "Plantilla p'anqata qhaway",
 'viewhelppage'      => "Yanapana p'anqata qhaway",
@@ -236,8 +325,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}manta',
 'aboutpage'            => 'Project:{{SITENAME}}manta',
-'bugreports'           => "Llamp'u kaqpi pantasqamanta willaykuna",
-'bugreportspage'       => 'Project:Pantasqamanta willaykuna',
 'copyright'            => "Ch'aqtasqakunataqa llamk'achinkiman <i>$1</i> nisqap ruraq hayñinkama",
 'copyrightpagename'    => "{{SITENAME}} p'anqayuq ruraqpa iskaychay hayñin",
 'copyrightpage'        => '{{ns:project}}:Ruraqpa hayñin',
@@ -260,9 +347,7 @@ $messages = array(
 
 'badaccess'        => 'Saqillay pantasqa',
 'badaccess-group0' => 'Manam saqillasunkichu munasqayta rurayta.',
-'badaccess-group1' => 'Munasqay ruranaqa kay huñupi kachkaq ruraqkunallatam rurayta saqillan: $1.',
-'badaccess-group2' => 'Munasqay ruranaqa kay huñupi kachkaq ruraqkunallatam rurayta saqillan: $1.',
-'badaccess-groups' => 'Munasqay ruranaqa kay huñupi kachkaq ruraqkunallatam rurayta saqillan: $1.',
+'badaccess-groups' => 'Munasqay ruranaqa kay {{PLURAL:$2|huñupi|$2 huñukunapi}} kachkaq ruraqkunallatam rurayta saqillan: $1.',
 
 'versionrequired'     => "$1 nisqa MediaWiki llamk'apusqatam muchunki kay p'anqata llamk'achinaykipaq",
 'versionrequiredtext' => "$1 nisqa MediaWiki llamk'apusqatam muchunki kay p'anqata llamk'achinaykipaq. Astawan willasunaykipaqqa, [[Special:Version]] nisqapi qhaway",
@@ -276,6 +361,8 @@ $messages = array(
 'editsection'             => 'allichay',
 'editold'                 => "llamk'apuy",
 'viewsourceold'           => 'pukyu qillqata qhaway',
+'editlink'                => "llamk'apuy",
+'viewsourcelink'          => 'pukyu qillqata qhaway',
 'editsectionhint'         => 'Allichay rakita: $1',
 'toc'                     => 'Yuyarina',
 'showtoc'                 => 'rikuchiy',
@@ -290,13 +377,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom feed',
 'page-rss-feed'           => '"$1" RSS feed',
 'page-atom-feed'          => '"$1" Atom Feed',
-'red-link-title'          => '$1 (manaraq qillqasqa)',
+'red-link-title'          => "$1 (manaraqmi p'anqachu)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Qillqa',
 'nstab-user'      => "Ruraqpa p'anqan",
 'nstab-media'     => 'Midya',
-'nstab-special'   => 'Sapaq',
+'nstab-special'   => "Sapaq p'anqa",
 'nstab-project'   => "Ruraykamaypa p'anqan",
 'nstab-image'     => 'Rikcha',
 'nstab-mediawiki' => 'Willay',
@@ -306,7 +393,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Kay hina rurayqa manam kanchu',
-'nosuchactiontext'  => "URL tiyaypi sut'ichasqa rurayqa manam kanchu {{SITENAME}} sutiyuq wikipi",
+'nosuchactiontext'  => "URL tiyaypi sut'ichasqa rurayqa manam kanchu.
+Mana allintachá qillqanki, icha p'itisqa t'inkitachá qatinki.
+{{SITENAME}} sutiyuq wikipi llamp'u kaqpipas pantasqachá kanman.",
 'nosuchspecialpage' => "Kay hina sapaq p'anqaqa manam kanchu",
 'nospecialpagetext' => "<big>'''Mana kaq sapaq p'anqatam munanki.'''</big>
 
@@ -356,7 +445,6 @@ Ama hina kaspa, huk [[Special:ListUsers/sysop|kamachiqman]] willariy, URL nisqa
 'cannotdelete'         => "Manam atinichu sananchasqay p'anqata icha willañiqita qulluyta. (P'anqaqa qullusqañachá)",
 'badtitle'             => "P'anqap sutinqa manam allinchu",
 'badtitletext'         => "Kay p'anqap sutinqa manam allinchu, mana allin interwiki t'inkichá icha ch'usaqchá, p'anqa sutipaq mana saqillasqa sananchayuqchá.",
-'perfdisabled'         => "Achachaw, kay ruranaqa mit'alla manam atinchu, willañiqintinta hank'achiptinmi mana ruranalla kayninkama.",
 'perfcached'           => "Kay willakunaqa ''cache'' nisqa pakasqa hallch'apim kachkan, chayrayku manañachá musuqchasqachu:",
 'perfcachedts'         => 'Kay willakunaqa waqaychasqam. Qhipaq musuqchasqaqa $1 karqan.',
 'querypage-no-updates' => "Kay p'anqata musuqchayqa manam atichkanchu. Kunanqa kaypi willakuna manam musuqchasqachu kanqa.",
@@ -371,7 +459,7 @@ Tapuna: $2',
 'viewsourcetext'       => "Kay p'anqatam qhawayta iskaychaytapas atinki:",
 'protectedinterface'   => "Kay p'anqapiqa wakichintinpa uyapuranpaq qillqam.
 Wandalismu nisqamanta amachasqam kachkan.",
-'editinginterface'     => "'''Paqtataq:''' Uyapura p'anqatam llamk'apuchkanki. Hukchaptiykiqa, chay uyapurap rikch'ayninqa hukyanqa huk ruraqkunapaqpas. Uyapurata t'ikrayta munaspaykiqa, [http://translatewiki.net/wiki/Main_Page?setlang=qu Betawiki] nisqa MediaWiki t'ikrana ruraykamay llika tiyaypi ruranaykimanta hamut'ariy.",
+'editinginterface'     => "'''Paqtataq:''' Uyapura p'anqatam llamk'apuchkanki. Hukchaptiykiqa, chay uyapurap rikch'ayninqa hukyanqa huk ruraqkunapaqpas. Uyapurata t'ikrayta munaspaykiqa, [http://translatewiki.net/wiki/Main_Page?setlang=qu translatewiki.net] nisqa MediaWiki t'ikrana ruraykamay llika tiyaypi ruranaykimanta hamut'ariy.",
 'sqlhidden'            => '(SQL tapunaqa pakasqam)',
 'cascadeprotected'     => "Kay p'anqaqa amachasqam kachkan, ''phaqcha'' nisqa kamachiwan amachasqa kay {{PLURAL:$1|p'anqapi|p'anqakunapi}} ch'aqtasqa kaspanmi:
 $2",
@@ -381,13 +469,13 @@ $2",
 'titleprotected'       => "Kay p'anqa sutitaqa [[User:$1|$1]] sutiyuq ruraq kamariymanta hark'arqanmi, kayraykum nispa: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Manam allintachu churapusqa: mana riqsisqa añaw maskaq: <i>$1</i>',
+'virus-badscanner'     => "Manam allintachu churapusqa: mana riqsisqa añaw maskaq: ''$1''",
 'virus-scanfailed'     => 'manam atinchu añaw maskayta (tuyru: $1)',
 'virus-unknownscanner' => 'mana riqsisqa añaw qulluna (antivirus):',
 
 # Login and logout pages
 'logouttitle'                => "Llamk'apuy tiyaypa puchukaynin",
-'logouttext'                 => "<strong>Llamk'apuy tiyayniykiqa puchukasqañam.</strong>
+'logouttext'                 => "'''Llamk'apuy tiyayniykiqa puchukasqañam.'''
 
 Sutinnaq kaspaykipas {{SITENAME}}pi wamp'uytam atinki. Mana hinataq munaspaykiqa, [[Special:UserLogin|musuqmanta yaykuy]] ñawpaq icha huk sutiwan. Huk p'anqakunaqa kaqllam rikch'akunqa, ''cache'' nisqa pakasqa hallch'ata mana ch'usaqchaptiykiqa.",
 'welcomecreation'            => '== Allinmi hamusqayki $1! ==
@@ -400,7 +488,6 @@ Ama qunqaychu [[Special:Preferences|{{SITENAME}} allinkachinaykikunata]] kikinch
 'remembermypassword'         => "Llamk'apuy tiyayniykunapura yuyaykuway.",
 'yourdomainname'             => 'Duminyuykip sutin',
 'externaldberror'            => 'Hawa yaykuna pantasqam karqan, ichataq manam saqillasunkichu hawa rakiqunaykita musuqchayta.',
-'loginproblem'               => '<b>Manam yaykuytachu atirqunki.</b><br />Huk kutitam ruraykachay!',
 'login'                      => 'Yaykuy',
 'nav-login-createaccount'    => 'Yaykuy',
 'loginprompt'                => "{{SITENAME}}man yaykunaykipaqqa wamp'unaykipi <i>cookies</i> nisqakunaman ari ninaykim tiyan.",
@@ -439,6 +526,7 @@ Huk ruraqkunata ruraqpa p'anqaykimanta icha rimachinaykimanta qamman qillqamusun
 'loginsuccesstitle'          => "Llamk'apuy tiyayqa qallarisqañam",
 'loginsuccess'               => 'Llamk\'apuy tiyayniykiqa qallarisqam {{SITENAME}}-pi "$1" sutiyuq kaspa.',
 'nosuchuser'                 => 'Nisqayki "$1" sutiyuq ruraqqa manam kanchu.
+Ruraqpa sutinqa uchuypas hatunpas sanampakunayuqmi kayta atin.
 Allin qillqasqaykita llanchiriy, ichataq urapi kaq hunt\'ana p\'anqata llamk\'achiy [[Special:UserLogin/signup|musuq rakiqunata kicharinaykipaq]].',
 'nosuchusershort'            => 'Nisqayki "<nowiki>$1</nowiki>" sutiyuq ruraqqa manam kanchu.
 Allin qillqasqaykita llanchiriy.',
@@ -460,8 +548,8 @@ Ama hina kaspa, chaskispaykiqa ruraqpa sutiykita nispa musuqmanta yaykuy.',
 'eauthentsent'               => 'Takyachina e-chaskiqa qusqayki e-chaski imamaytaman kachamusqam. Manaraq huk e-chaskikuna kachamusqa kaptinqa, ñawpaqta e-chaskipi kamachisqakunata qatinaykim tiyan, chiqap e-chaski imamaytaykita takyachinaykipaq.',
 'throttled-mailpassword'     => "Huk yaykuna rima yuyachinañam qayna {{PLURAL:$1|huk ura|$1 ura}} mit'api kachamusqam. {{PLURAL:$1|Huk ura|$1 ura}} mit'apiqa hukllam yaykuna rima yuyachina kachasqa kachun millay rurayta hark'anapaq.",
 'mailerror'                  => 'E-chaskita kachaspa pantasqa: $1',
-'acct_creation_throttle_hit' => '$1 sutiyuq rakiqunaqa kachkañam. Manam atinkichu kaqllata kichayta.',
-'emailauthenticated'         => 'E-chaski imamaytaykiqa $1 nisqapi chiqapchasqañam.',
+'acct_creation_throttle_hit' => "Qampa IP huchhaykiyuq kachkaq ruraqkunaqa kay wikita watukuspa ñaqha 24 urapi {{PLURAL:$1|rakiqunaykim|$1 rakiqunaykim}} kamarirqanña. Manam atinkichikchu astawan kichayta huklla p'unchawpi chay IP huchhallayuq kaspa.",
+'emailauthenticated'         => "E-chaski imamaytaykiqa $2 p'unchawpi, $3 pachapi chiqapchasqañam.",
 'emailnotauthenticated'      => 'E-chaski imamaytaykitaqa manaraqmi takyachirqunkichu. Mana takyachirquptiykiqa, kay qatiq rurachinakunataqa manam atinkichu.',
 'noemailprefs'               => "E-chaski imamaytaykita willaway kay rurachinakunata llamk'achinapaq.",
 'emailconfirmlink'           => 'E-chaski imamaytaykita takyachiy',
@@ -472,18 +560,26 @@ Ama hina kaspa, chaskispaykiqa ruraqpa sutiykita nispa musuqmanta yaykuy.',
 'createaccount-text'         => 'Pipas e-chaski imamaytaykipaq {{SITENAME}}pi ($4) "$2" sutiyuq rakiqunatam kicharqan, "$3" nisqa yaykuna rimayuq. Yaykuspayki yaykuna rimaykita hukchanaykim tiyanman.
 
 Kay willay pantasqa kaptinqa, qhawarparillay.',
+'login-throttled'            => 'Nisyu kutitachá kay rakiqunapaq yaykuna rimawan ñaqha yaykuykachanki. Ama hina kaspa, suyariy manaraq musuqmanta yaykuykachaspa.',
 'loginlanguagelabel'         => 'Rimay: $1',
 
 # Password reset dialog
-'resetpass'               => 'Ruraqpa yaykuna rimanta kutichiy',
-'resetpass_announce'      => "E-chaskiwan kachasqa mit'alla yaykuna rimawanmi yaykurqunki. Ama hina kaspa, musuq yaykuna rimaykita qillqamuy:",
-'resetpass_text'          => '<!-- Añada texto aquí -->',
-'resetpass_header'        => 'Yaykuna rimata hukchay',
-'resetpass_submit'        => 'Yaykuna rimata hukchaspa yaykuy',
-'resetpass_success'       => 'Yaykuna rimaykiqa hukchasqañam. Yaykamuchkankim...',
-'resetpass_bad_temporary' => "Mit'alla yaykuna rimaqa manam allinchu. Yaykuna rimaykiqa hukchasqañachá ichataq musuqtach mañakurqanki.",
-'resetpass_forbidden'     => 'Manam saqillanchu yaykuna rimata hukchayta',
-'resetpass_missing'       => "Kay hunt'ana p'anqapiqa manam willakunachu kachkan.",
+'resetpass'                 => 'Ruraqpa yaykuna rimanta hukchay',
+'resetpass_announce'        => "E-chaskiwan kachasqa mit'alla yaykuna rimawanmi yaykurqunki. Ama hina kaspa, musuq yaykuna rimaykita qillqamuy:",
+'resetpass_text'            => '<!-- Añada texto aquí -->',
+'resetpass_header'          => 'Yaykuna rimata hukchay',
+'oldpassword'               => "Mawk'a yaykuna rima:",
+'newpassword'               => 'Musuq yaykuna rima:',
+'retypenew'                 => 'Musuq yaykuna rimaykita takyachiy:',
+'resetpass_submit'          => 'Yaykuna rimata hukchaspa yaykuy',
+'resetpass_success'         => 'Yaykuna rimaykiqa hukchasqañam. Yaykamuchkankim...',
+'resetpass_bad_temporary'   => "Mit'alla yaykuna rimaqa manam allinchu. Yaykuna rimaykiqa hukchasqañachá ichataq musuqtach mañakurqanki.",
+'resetpass_forbidden'       => 'Manam saqillanchu yaykuna rimata hukchayta',
+'resetpass-no-info'         => "Yaykunaykim tiyan kay p'anqata chiqalla aypanaykipaq.",
+'resetpass-submit-loggedin' => 'Yaykuna rimata hukchay',
+'resetpass-wrong-oldpass'   => "Mit'alla icha kunan yaykuna rimaqa manam allinchu. 
+Yaykuna rimaykitaqa aypalla hukcharqunkiñachá icha huk mit'alla yaykuna rimata mañakurqunkiñachá.",
+'resetpass-temp-password'   => "Mit'alla yaykuna rima:",
 
 # Edit page toolbar
 'bold_sample'     => 'Yanasapa qillqa',
@@ -507,8 +603,8 @@ Kay willay pantasqa kaptinqa, qhawarparillay.',
 'hr_tip'          => "Siriq siq'i (ama nisyutachu llamk'apuy)",
 
 # Edit pages
-'summary'                          => 'Pisichay',
-'subject'                          => 'Yachaywa/umalli',
+'summary'                          => 'Pisichay:',
+'subject'                          => 'Yachaywa/umalli:',
 'minoredit'                        => 'Kayqa uchuylla hukchaymi',
 'watchthis'                        => 'Kay qillqata watiqay',
 'savearticle'                      => "P'anqata waqaychay",
@@ -520,8 +616,8 @@ Kay willay pantasqa kaptinqa, qhawarparillay.',
 'missingsummary'                   => "'''Paqtataq:''' Manaraqmi llamk'apusqaykimanta pisichaytachu qillqamurqunki. Musuqmanta «{{MediaWiki:Savearticle}}» nisqapi ñit'iptiykiqa, llamk'apusqayki waqaychasqam kanqa mana pisichay kaptinpas.",
 'missingcommenttext'               => 'Ama hina kaspa, kay qatiqpi willaspa qillqamuy.',
 'missingcommentheader'             => "'''Paqtataq:''' Manaraqmi kay willaypa umallintachu qillqamurqunki. Musuqmanta «waqaychay» nisqapi ñit'iptiykiqa, llamk'apusqayki waqaychasqam kanqa mana willaypa umallin kaptinpas.",
-'summary-preview'                  => 'Pisichayta ñawpaqta qhawarillay',
-'subject-preview'                  => 'Yachaywata/umallita ñawpaqta qhawarillay',
+'summary-preview'                  => 'Pisichayta ñawpaqta qhawarillay:',
+'subject-preview'                  => 'Yachaywata/umallita ñawpaqta qhawarillay:',
 'blockedtitle'                     => "Ruraqqa hark'asqam",
 'blockedtext'                      => "<big>'''Ruraqpa sutiykiqa icha IP huchhaykiqa hark'asqam.'''</big>
 
@@ -563,29 +659,29 @@ Kunan IP huchhaykiqa $3 nisqam, hark'ay huchhataq #$5 nisqam. Mañakuspaykiqa ka
 'newarticle'                       => '(Musuq)',
 'newarticletext'                   => "Manaraq kachkaq p'anqatam llamk'apuchkanki. Musuq p'anqata kamariyta munaspaykiqa, qillqarillay. Astawan ñawiriyta munaspaykiqa, [[{{MediaWiki:Helppage}}|yanapana p'anqata]] qhaway. Mana munaspaykitaq, ñawpaq p'anqaman ripuy.",
 'anontalkpagetext'                 => "---- ''Kayqa huk sutinnaq icha mana sutinta llamk'achiq ruraqpa rimanakuyninmi. IP huchhantam hallch'asunchik payta sutinchanapaq. Achka ruraqkunam huklla IP huchhanta llamk'achiyta atin. Sutinnaq ruraq kaspaykiqa, mana qampa rurasqaykimanta willamusqakunata rikuspaykiqa, ama hina kaspa [[Special:UserLogin|ruraqpa sutiykita kamariy icha yaykuy]] huk sutinnaq ruraqkunawan ama pantasqa kanaykipaq.''",
-'noarticletext'                    => "Kay p'anqaqa ch'usaqmi. Kaytam rurayta atinkiman: {{PAGENAME}} nisqata [[Special:Search/{{PAGENAME}}|huk qillqakunapi maskay]] icha [{{fullurl:{{FULLPAGENAME}}|action=edit}} musuq qillqata qallariy].",
+'noarticletext'                    => "Kunanqa kay p'anqa ch'usaqmi. Kaytam rurayta atinkiman: kay p'anqap sutinta [[Special:Search/{{PAGENAME}}|huk p'anqakunapi maskay]], <span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} hallch'ankunapi maskay] icha [{{fullurl:{{FULLPAGENAME}}|action=edit}} kay p'anqata llamk'apuy].",
 'userpage-userdoesnotexist'        => '"$1" sutiyuq ruraqpa rakiqunanqa manam kanchu. Ama hina kaspa, llanchikuy kay p\'anqata kamarinaykimanta.',
 'clearyourcache'                   => "'''Paqtataq''': Willañiqita waqaycharquspaykiqa, wamp'unaykip ''cache'' nisqa pakasqa waqaychananta ch'usaqchanaykichá tiyanman hukchasqaykikunata rikunaykipaq:
 '''Mozilla / Firefox / Safari:''' ''Shift'' yatachkaspa ''Reload'' ñit'iy, ichataq ''Ctrl-F5'' icha ''Ctrl-R'' yatay (''Command-R'' Macintosh nisqapi); '''Konqueror: '''''Reload'' ñit'iy icha ''F5'' yatay; '''Opera:''' ''cache'' nisqata ch'usaqchay kaypi: ''Tools → Preferences;'' '''Internet Explorer:''' ''Ctrl'' yatachkaspa ''Refresh'' ñit'iy, icha ''Ctrl-F5'' yatay.",
-'usercssjsyoucanpreview'           => "<strong>Kunay:</strong> «Ñawpaqta qhawallay» nisqa ñit'inata llamk'achiy musuq css/js qhawanaykipaq, manaraq waqaychaspa.",
+'usercssjsyoucanpreview'           => "'''Kunay:''' «Ñawpaqta qhawallay» nisqa ñit'inata llamk'achiy musuq css/js qhawanaykipaq, manaraq waqaychaspa.",
 'usercsspreview'                   => "Yuyariy, qhawarillachkankim ruraqpa CSS-niykita, manaraqmi waqaychasqachu!'''",
 'userjspreview'                    => "'''Yuyariy, qhawarillachkankim ruraqpa JavaScript-niykita, manaraqmi waqaychasqachu!'''",
 'userinvalidcssjstitle'            => "'''Paqtataq:''' Manam kanchu \"\$1\" qara. Yuyariy, kikinpa .css, .js p'anqankunaqa uchuy sanampa umalliyuqmi, ahinataq {{ns:user}}:Foo/monobook.css manataq  {{ns:user}}:Foo/Monobook.css nisqachu.",
 'updated'                          => '(Musuqchasqa)',
-'note'                             => '<strong>Musyay:</strong>',
-'previewnote'                      => '<strong>Yuyaykuy: Kayqa manaraq waqaychaspa qhawariymi!</strong>',
+'note'                             => "'''Musyay:'''",
+'previewnote'                      => "'''Yuyaykuy: Kayqa manaraq waqaychaspa qhawariymi!'''",
 'previewconflict'                  => "Rikuchkanki kay p'anqataqa, ima hinachus waqaychasqa kanqa.",
-'session_fail_preview'             => "<strong>Achachaw! Llamk'apusqaykiqa manam waqaychasqachu, llamk'ana tiyaypa willankuna chinkaptinmi. Ama hina kaspa, musuqmanta ruraykachay. Mana atispaykiqa, [[Special:UserLogout|lluqsispa]] musuqmanta yaykuy.</strong>",
-'session_fail_preview_html'        => "<strong>Achachaw! Llamk'apusqaykiqa manam waqaychasqachu, llamk'ana tiyaypa willankuna chinkaptinmi.</strong>
+'session_fail_preview'             => "'''Achachaw! Llamk'apusqaykiqa manam waqaychasqachu, llamk'ana tiyaypa willankuna chinkaptinmi. Ama hina kaspa, musuqmanta ruraykachay. Mana atispaykiqa, [[Special:UserLogout|lluqsispa]] musuqmanta yaykuy.'''",
+'session_fail_preview_html'        => "'''Achachaw! Llamk'apusqaykiqa manam waqaychasqachu, llamk'ana tiyaypa willankuna chinkaptinmi.'''
 
 ''{{SITENAME}} llump'aq HTML nisqawan llamk'achkaptinmi, ñawpaq qhawariyqa pakasqam kachkan JavaScript nisqawan wankhayta hark'anapaq.''
 
-<strong>Allin sunquwan kamarirqaspaykiqa, musuqmanta ruraykachay. Mana atispaykiqa, [[Special:UserLogout|lluqsispa]] musuqmanta yaykuspa ruraykachay.</strong>",
-'token_suffix_mismatch'            => "<strong>Llamk'apusqaykimanqa ama nisqam, mink'akuqniyki llamk'apuy willaypi sapaq sananchakunata arwiptinmi. Ama nisqa karqanqa qillqata waqlliymantam amachanapaq.
-Kayqa maykunapi tukukun, mana allin wakichisqa proxy sirwiytam llamk'achiptiyki.</strong>",
+'''Allin sunquwan kamarirqaspaykiqa, musuqmanta ruraykachay. Mana atispaykiqa, [[Special:UserLogout|lluqsispa]] musuqmanta yaykuspa ruraykachay.'''",
+'token_suffix_mismatch'            => "'''Llamk'apusqaykimanqa ama nisqam, mink'akuqniyki llamk'apuy willaypi sapaq sananchakunata arwiptinmi. Ama nisqa karqanqa qillqata waqlliymantam amachanapaq.
+Kayqa maykunapi tukukun, mana allin wakichisqa proxy sirwiytam llamk'achiptiyki.'''",
 'editing'                          => "$1-ta llamk'apuspa",
 'editingsection'                   => "$1-ta llamk'apuspa (raki)",
-'editingcomment'                   => "$1-ta llamk'apuspa (rimapay)",
+'editingcomment'                   => "$1-ta llamk'apuspa (musuq raki)",
 'editconflict'                     => 'Ruray taripanakuy: $1',
 'explainconflict'                  => "Ruray taripanakuy: Huk runam kay p'anqata llamk'apurqun, qamtaq manaraq waqaychaptiyki.
 Umapi kaq qillqana k'itipi kunan kachkaq qillqam.
@@ -594,24 +690,26 @@ Kunanqa rurasqaykikunata musuq qillqaman ch'aqtanaykim tiyan.
 '''Umapi kaq qillqallam''' waqaychasqa kanqa.",
 'yourtext'                         => 'Qillqasqayki',
 'storedversion'                    => "Hallch'asqa musuqchasqa",
-'nonunicodebrowser'                => "<strong>Paqtataq: Wamp'unaykiqa manam Unicode nisqawan llamk'anchu. Huk llamk'apuna llikam llamk'achkan p'anqakunata takyasqalla llamk'apunaykipaq: mana ASCII kaq sananchakunaqa chunka suqtayuqnintin huchha llikapim kanqa.</strong>",
-'editingold'                       => "<strong>Paqtataq: Kay p'anqap mawk'a hukchasqantam llamk'apuchkanki. Waqaychaptiykiqa, chaymanta aswan musuq hukchasqankuna chinkanqam.</strong>",
+'nonunicodebrowser'                => "'''Paqtataq: Wamp'unaykiqa manam Unicode nisqawan llamk'anchu. Huk llamk'apuna llikam llamk'achkan p'anqakunata takyasqalla llamk'apunaykipaq: mana ASCII kaq sananchakunaqa chunka suqtayuqnintin huchha llikapim kanqa.'''",
+'editingold'                       => "'''Paqtataq: Kay p'anqap mawk'a hukchasqantam llamk'apuchkanki. Waqaychaptiykiqa, chaymanta aswan musuq hukchasqankuna chinkanqam.'''",
 'yourdiff'                         => 'Hukchasqaykikuna',
 'copyrightwarning'                 => "Lliw {{SITENAME}}paq llamk'apuykunaqa $2 nisqawanmi uyaychasqa kanqa ($1 p'anqata qhaway). Llamk'asqaykikunata huk runakunap allinchayninta qispilla mast'ariyninta mana munaptiykiqa, ama kayman qillqamuychu.<br />
 Takyachichkankim: Kayqa ñuqap qillqasqaymi icha qispi pukyumanta iskaychamusqaymi, nispa.
-<br /><strong>Mana saqillasqa kaspaykiqa, ama qillqarimuychu iskaychay hayñi ''(copyright)'' nisqayuq qillqakunata iskaychamuspa!</strong>",
+<br />'''Mana saqillasqa kaspaykiqa, ama qillqarimuychu iskaychay hayñi ''(copyright)'' nisqayuq qillqakunata iskaychamuspa!'''",
 'copyrightwarning2'                => "Lliw {{SITENAME}}paq llamk'apuykunaqa huk ruraqkunap llamk'apunallanmi, hukchanallanmi icha qullunallanmi. Llamk'asqaykikunata huk runakunap allinchayninta qispilla mast'ariyninta mana munaptiykiqa, ama kayman qillqamuychu.<br />
 Takyachichkankim: Kayqa ñuqap qillqasqaymi, ñuqamanmi kapuwan icha qispi pukyumanta iskaychamusqaymi, nispa ($1 p'anqata qhaway).
-<br /><strong>Mana saqillasqa kaspaykiqa, ama qillqarimuychu iskaychay hayñi ''(copyright)'' nisqayuq qillqakunata iskaychamuspa!</strong>",
-'longpagewarning'                  => "<strong>Paqtataq: Kay p'anqaqa $1 kB hatunmi; huk wamp'unakunaqa sasachakunmanchá 32 kB-manta aswan hatun willañiqita llamk'apuspa.
-Ama hina kaspa, hamut'ariy kay p'anqata rakiyta.</strong>",
-'longpageerror'                    => '<strong>PANTASQA: Kachasqayki qillqaqa $1 kB hatunmi, $2 kB-manta aswan hatunmi. Manam waqaychasqa kayta atinchu.</strong>',
-'readonlywarning'                  => "<strong>PAQTATAQ: Willañiqintinqa hark'asqam mit'awa kakuchinapaq. Chayrayku kunanqa manam atichkankichu llamk'apusqaykikunata waqaychayta.
-Qillqasqaykita iskaychaspa antañiqiqniykipi willañiqiman llut'amuspa chaypi waqaychariy. Kunanmanta huk pachallapi musuqmanta waqaychaykachay.</strong>",
-'protectedpagewarning'             => "<strong>PAQTATAQ: Kay p'anqaqa llamk'apuymanta amachasqam kamachiqkunallap hukchananpaq.</strong>",
+<br />'''Mana saqillasqa kaspaykiqa, ama qillqarimuychu iskaychay hayñi ''(copyright)'' nisqayuq qillqakunata iskaychamuspa!'''",
+'longpagewarning'                  => "'''Paqtataq: Kay p'anqaqa $1 kB hatunmi; huk wamp'unakunaqa sasachakunmanchá 32 kB-manta aswan hatun willañiqita llamk'apuspa.
+Ama hina kaspa, hamut'ariy kay p'anqata rakiyta.'''",
+'longpageerror'                    => "'''PANTASQA: Kachasqayki qillqaqa $1 kB hatunmi, $2 kB-manta aswan hatunmi. Manam waqaychasqa kayta atinchu.'''",
+'readonlywarning'                  => "'''PAQTATAQ: Willañiqintinqa hark'asqam mit'awa kakuchinapaq. Chayrayku kunanqa manam atichkankichu llamk'apusqaykikunata waqaychayta.
+Qillqasqaykita iskaychaspa antañiqiqniykipi willañiqiman llut'amuspa chaypi waqaychariy. Kunanmanta huk pachallapi musuqmanta waqaychaykachay.'''
+
+Hark'aq kamachiqqa kaytam nirqan: $1, kayraykum nispa.",
+'protectedpagewarning'             => "'''PAQTATAQ: Kay p'anqaqa llamk'apuymanta amachasqam kamachiqkunallap hukchananpaq.'''",
 'semiprotectedpagewarning'         => "'''Musyay:''' Kay p'anqaqa amachasqam rakiqunayuq ruraqkunallap hukchananpaq.",
 'cascadeprotectedwarning'          => "'''Paqtataq:''' Kay p'anqaqa amachasqam, kamachiqkunallam llamk'apuyta atin, ''phaqcha'' nisqa kamachiwan amachasqa kay {{PLURAL:$1|p'anqapim|p'anqakunapim}} ch'aqtasqa kaspanmi:",
-'titleprotectedwarning'            => "<strong>PAQTATAQ:  Kay p'anqaqa hark'asqam, chayrayku huk sapaq ruraqkunam kamariyta atin.</strong>",
+'titleprotectedwarning'            => "'''PAQTATAQ:  Kay p'anqaqa hark'asqam, chayrayku huk sapaq ruraqkunam kamariyta atin.'''",
 'templatesused'                    => "Kay p'anqapi llamk'achisqa plantillakuna:",
 'templatesusedpreview'             => "Kay qhawariypi llamk'achisqa plantillakuna:",
 'templatesusedsection'             => "Kay p'anqa rakipi llamk'achisqa plantillakuna:",
@@ -628,11 +726,21 @@ Qillqasqaykita iskaychaspa antañiqiqniykipi willañiqiman llut'amuspa chaypi wa
 
 Hamut'arillay, chayaqillachu manallachu kay p'anqata kamariy.
 Kaymi kay p'anqamanta qulluy hallch'a:",
+'deleted-notice'                   => "Kay p'anqaqa qullusqam. Kay qatiq qulluy hallch'apim qullusqamanta rikunki.",
+'deletelog-fulllog'                => "Hunt'a hallch'asqata qhaway",
+'edit-hook-aborted'                => "Ch'iwinam llamk'apuyta t'ipirqan.
+Manam nirqanchu imarayku.",
+'edit-gone-missing'                => "Manam atirqanichu p'anqata musuqchayta.
+Qullusqachá.",
+'edit-conflict'                    => "Tuylla llamk'apuymanta sasachakuy.",
+'edit-no-change'                   => "Manapuni hukchaptiykim, llamk'apusqayki manam hallch'asqachu.",
+'edit-already-exists'              => "Manam atinichu musuq p'anqata kamariyta.
+Kachkañam.",
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Paqtataq: Kay p'anqaqa nisyu achka qullqipaq t'ikrana rurana qayayniyuqmi.
 
-$2-manta aswan pisillam qayayniyuq kanman, kunantaq $1 kachkanmi.",
+$2-manta aswan pisillam {{PLURAL:$2|qayayniyuq|qayayniyuq}} kanman, kunantaq {{PLURAL:$1|$1 qayayniyuqmi|$1 qayayniyuqmi}} kachkan.",
 'expensive-parserfunction-category'       => "Nisyu achka qullqipaq t'ikrana rurana qayayniyuq p'anqakuna",
 'post-expand-template-inclusion-warning'  => "Paqtataq: Nisyum ch'aqtasqa plantillakuna.
 Huk plantillakunaqa manam ch'aqtasqachu kanqa.",
@@ -640,6 +748,8 @@ Huk plantillakunaqa manam ch'aqtasqachu kanqa.",
 'post-expand-template-argument-warning'   => "Paqtataq: Kay p'anqaqa huk icha aswan nisyu ch'aqtasqa plantilla niyniyuqmi.
 Chay niykunaqa manam chaninchasqachu.",
 'post-expand-template-argument-category'  => "Mana chaninchasqa plantilla niyniyuq p'anqakuna",
+'parser-template-loop-warning'            => 'Muyurikuq pusapunam tarisqa: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Pusapunap muyurikuy saywanmi yallisqa ($1)',
 
 # "Undo" feature
 'undo-success' => 'Rurasqata kutichiyta atinkim. Manaraq kutichispaykiqa, kay qatiq wakichayta qhawariy rikunaykipaq chiqapta munasqaykichu manallachu, chaymantataq waqaychay kutichinapaq.',
@@ -654,29 +764,28 @@ Chay niykunaqa manam chaninchasqachu.",
 $3-qa nirqan kayraykum: ''$2''",
 
 # History pages
-'viewpagelogs'        => "Kay p'anqamanta hallch'akunata qhaway",
-'nohistory'           => "Kay p'anqamantaqa manam llamk'apuy wiñay kawsay kanchu.",
-'revnotfound'         => "Llamk'apusqaqa manam tarisqachu",
-'revnotfoundtext'     => "Mañakusqayki llamk'apusqaqa manam tarisqachu.
-Ama hina kaspa, kay p'anqap URL nisqa tiyayninta k'uskiriy.",
-'currentrev'          => 'Kunan hukchasqa',
-'revisionasof'        => "$1-pa llamk'apusqan",
-'revision-info'       => "Kayqa p'anqap mawk'a llamk'apusqa kasqanmi, $1 p'unchawpi $2-pa rurasqan",
-'previousrevision'    => '� ñawpaq hukchasqa',
-'nextrevision'        => 'Qatiq hukchasqa →',
-'currentrevisionlink' => 'Kunan hukchasqata qhaway',
-'cur'                 => 'kunan',
-'next'                => 'qat',
-'last'                => 'ñawpaq',
-'page_first'          => 'ñawpaqkuna',
-'page_last'           => 'qhipaqkuna',
-'histlegend'          => "Sut'ichana: (kunan) = p'anqap kunan kachkayninwan huk kaykuna,
+'viewpagelogs'           => "Kay p'anqamanta hallch'akunata qhaway",
+'nohistory'              => "Kay p'anqamantaqa manam llamk'apuy wiñay kawsay kanchu.",
+'currentrev'             => 'Kunan hukchasqa',
+'currentrev-asof'        => 'Kunan musuqchasqa, $1 pacha',
+'revisionasof'           => "$1-pa llamk'apusqan",
+'revision-info'          => "Kayqa p'anqap mawk'a llamk'apusqa kasqanmi, $1 p'unchawpi $2-pa rurasqan", # Additionally available: $3: revision id
+'previousrevision'       => '� ñawpaq hukchasqa',
+'nextrevision'           => 'Qatiq hukchasqa →',
+'currentrevisionlink'    => 'Kunan hukchasqata qhaway',
+'cur'                    => 'kunan',
+'next'                   => 'qat',
+'last'                   => 'ñawpaq',
+'page_first'             => 'ñawpaqkuna',
+'page_last'              => 'qhipaqkuna',
+'histlegend'             => "Sut'ichana: (kunan) = p'anqap kunan kachkayninwan huk kaykuna,
 (ñawpaq) = ñawpaq kachkasqanwan huk kaykuna, a = aslla hukchasqa",
-'deletedrev'          => '[qullusqa]',
-'histfirst'           => 'Ñawpaqkuna',
-'histlast'            => 'Qhipaqkuna',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => "(ch'usaq)",
+'history-fieldset-title' => 'Wiñay kawsaypi maskay',
+'deletedrev'             => '[qullusqa]',
+'histfirst'              => 'Ñawpaqkuna',
+'histlast'               => 'Qhipaqkuna',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => "(ch'usaq)",
 
 # Revision feed
 'history-feed-title'          => 'Hukchasqakunap wiñay kawsaynin',
@@ -760,6 +869,7 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'mergehistory-invalid-destination' => "Qusqayki taripana p'anqap sutinqa manam allinchu.",
 'mergehistory-autocomment'         => '[[:$1]]-ta [[:$2]]-man huñusqa',
 'mergehistory-comment'             => '[[:$1]]-ta [[:$2]]-man huñusqa: $3',
+'mergehistory-same-destination'    => "Qallarinapas taripanapas p'anqakunaqa manam kaqlla kayta atinchu",
 
 # Merge log
 'mergelog'           => "Huñuy hallch'a",
@@ -772,119 +882,200 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'difference'              => '(Hukchasqapura wak kaynin)',
 'lineno'                  => "Siq'i $1:",
 'compareselectedversions' => "Akllasqa llamk'apusqakunata wakichay",
+'visualcomparison'        => 'Rikuspa tupanachiy',
+'wikicodecomparison'      => 'Wiki qillqawan tupanachiy',
 'editundo'                => 'kutichiy',
 'diff-multi'              => "({{PLURAL:$1|Chawpipi huk llamk'apusqaqa manam rikuchisqachu|Chawpipi $1 llamk'apusqaqa manam rikuchisqachu}}.)",
+'diff-movedto'            => '$1-man astasqa',
+'diff-styleadded'         => '$1 allin rikuchina yapasqa',
+'diff-added'              => '$1 yapasqa',
+'diff-changedto'          => '$1-man hukchasqa',
+'diff-movedoutof'         => '$1-manta astasqa',
+'diff-styleremoved'       => '$1 allin rikuchina qichusqa',
+'diff-removed'            => '$1 qichusqa',
+'diff-changedfrom'        => '$1-manta hukchasqa',
+'diff-src'                => 'pukyu qillqa',
+'diff-withdestination'    => '$1 chayamunawan',
+'diff-with'               => '&#32;kaywan: $1 $2',
+'diff-with-final'         => '&#32;-wan $1 $2',
+'diff-width'              => 'kinraynin',
+'diff-height'             => 'sayaynin',
+'diff-p'                  => "'''rakiri'''",
+'diff-blockquote'         => "'''nisqa'''",
+'diff-h1'                 => "'''uma sinru (1 ñiqin hanaq)'''",
+'diff-h2'                 => "'''uma sinru (2 ñiqin hanaq)'''",
+'diff-h3'                 => "'''uma sinru (3 ñiqin hanaq)'''",
+'diff-h4'                 => "'''uma sinru (4 ñiqin hanaq)'''",
+'diff-h5'                 => "'''uma sinru (5 ñiqin hanaq)'''",
+'diff-pre'                => "'''ñawpaqta allinchasqa raki'''",
+'diff-div'                => "'''rakisqa'''",
+'diff-ul'                 => "'''mana ñiqinchasqa sutisuyu'''",
+'diff-ol'                 => "'''ñiqinchasqa sutisuyu'''",
+'diff-li'                 => "'''sutisuyuchana'''",
+'diff-table'              => "'''wachuchasqa'''",
+'diff-tbody'              => "'''wachuchasqap samiqnin'''",
+'diff-tr'                 => "'''sinru'''",
+'diff-td'                 => "'''wachu ukhu'''",
+'diff-th'                 => "'''wachu uma'''",
+'diff-br'                 => "'''kutichina'''",
+'diff-hr'                 => "'''siriq suniyaq'''",
+'diff-code'               => "'''antañiqiqpaq qillqa raki'''",
+'diff-dl'                 => "'''ch'uyanchana sutisuyu'''",
+'diff-dt'                 => "'''ch'uyanchana tallqi'''",
+'diff-dd'                 => "'''ch'uyanchaku'''",
+'diff-input'              => "'''yaykuchina'''",
+'diff-form'               => "'''hunt'ana p'anqa'''",
+'diff-img'                => "'''rikcha'''",
+'diff-span'               => "'''paqtama'''",
+'diff-a'                  => "'''t'inki'''",
+'diff-i'                  => "'''wiksu qillqa'''",
+'diff-b'                  => "'''yanasapa qillqa'''",
+'diff-strong'             => "'''sinchi'''",
+'diff-em'                 => "'''sapaqchasqa'''",
+'diff-font'               => "'''qillqa rikch'aq'''",
+'diff-big'                => "'''hatun'''",
+'diff-del'                => "'''qullusqa'''",
+'diff-tt'                 => "'''kakuqlla kinraynin'''",
+'diff-sub'                => "'''uranpi'''",
+'diff-sup'                => "'''hananpi'''",
+'diff-strike'             => "'''siq'ichasqa qillqa'''",
 
 # Search results
-'searchresults'             => 'Maskaymanta tarisqakuna',
-'searchresulttext'          => '{{SITENAME}}pi maskaymanta astawan ñawirinaykipaqqa, [[{{MediaWiki:Helppage}}|{{int:help}}]] nisqapi qhaway.',
-'searchsubtitle'            => '\'\'\'[[:$1]]\'\'\' nisqatam maskanki ([[Special:Prefixindex/$1|tukuy "$1" nisqawan qallariq p\'anqakuna]] | [[Special:WhatLinksHere/$1|tukuy "$1" nisqaman t\'inkimuq p\'anqakuna]])',
-'searchsubtitleinvalid'     => '"$1" nisqatam maskanki',
-'noexactmatch'              => "'''Manam kanchu \"\$1\" sutiyuq p'anqa.''' Munaspaykiqa [[:\$1|kamarillay]].",
-'noexactmatch-nocreate'     => "'''\"\$1\" sutiyuq p'anqaqa manam kanchu.'''",
-'toomanymatches'            => 'Nisyu taripasqakunam kutisqa, ama hina kaspa, huk taripanawan ruraykachay',
-'titlematches'              => "P'anqakunap sutinkunapi tarisqa",
-'notitlematches'            => "Manam ima p'anqakunap sutinkunapipas tarisqachu",
-'textmatches'               => "P'anqakunap qillqankunapi tarisqa",
-'notextmatches'             => "Manam ima p'anqakunap qillqankunapipas tarisqachu",
-'prevn'                     => '$1 ñawpaq',
-'nextn'                     => '$1 qatiq',
-'viewprevnext'              => 'Qhaway ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 rima|$2 rimakuna}})',
-'search-result-score'       => 'Chaniyuq kaynin: $1%',
-'search-redirect'           => '(pusapuna $1)',
-'search-section'            => '(raki $1)',
-'search-suggest'            => 'Kaytachu niyta munanki? - $1',
-'search-interwiki-caption'  => 'Ñaña ruraykamaykuna',
-'search-interwiki-default'  => '$1 taripasqakuna:',
-'search-interwiki-more'     => '(aswan)',
-'search-mwsuggest-enabled'  => 'rimapusqakunawan',
-'search-mwsuggest-disabled' => 'mana rimapusqakunawanchu',
-'search-relatedarticle'     => 'Apanakuq',
-'mwsuggest-disable'         => 'AJAX rimapuykunaman ama niy',
-'searchrelated'             => 'apanakuq',
-'searchall'                 => 'tukuy',
-'showingresults'            => "Qhipanpiqa rikuchkanki {{PLURAL:$1|'''1''' tarisqatam|'''$1'''-kama tarisqakunatam}}, '''$2''' huchhawan qallarispa.",
-'showingresultsnum'         => "Qhipanpiqa rikuchkanki {{PLURAL:$3|'''1''' tarisqatam|'''$3''' tarisqakunatam}}, '''$2''' yupaywan qallarispa.",
-'showingresultstotal'       => "Kay qatiqpi {{PLURAL:$3|result '''$1''' of '''$3'''|taripasqa '''$1''', '''$3'''-pura|taripasqakuna '''$1 - $2''', '''$3'''-pura}}",
-'nonefound'                 => "'''Musyay''': Kikinmantaqa huk suti k'itikunallapim maskanki, manataqmi tukuykunapichu. Ñawpaqninpi ''all:'' nisqata qillqaspaykiqa, tukuy suti k'itikunapim maskanki (rimachinakunapipas, plantillakunapipas). Huk sapaq suti k'itipi maskayta munaspaykiqa, chay k'itip sutinta k'askaq hina ñawpaqninpi qillqamuy.",
-'powersearch'               => 'Maskay',
-'powersearch-legend'        => 'Ñawparikusqa maskay',
-'powersearch-ns'            => "Kay suti k'itikunapi maskay:",
-'powersearch-redir'         => 'Pusapunakunata rikuchiy',
-'powersearch-field'         => 'Kayta maskay:',
-'search-external'           => 'Hawapi maskay',
-'searchdisabled'            => "{{SITENAME}} nisqapi maskaymanqa ama nisqam. Hinachkaptinqa, maskariy google nisqawan icha huk hawa maskanakunawan, ichataq yuyariy, {{SITENAME}}manta hallch'asqankunaqa manañachá musuqllachu.",
+'searchresults'                    => 'Maskaymanta tarisqakuna',
+'searchresults-title'              => '"$1" nisqapaq maskaspa taripasqakuna',
+'searchresulttext'                 => '{{SITENAME}}pi maskaymanta astawan ñawirinaykipaqqa, [[{{MediaWiki:Helppage}}|{{int:help}}]] nisqapi qhaway.',
+'searchsubtitle'                   => '\'\'\'[[:$1]]\'\'\' nisqatam maskanki ([[Special:Prefixindex/$1|tukuy "$1" nisqawan qallariq p\'anqakuna]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|tukuy "$1" nisqaman t\'inkimuq p\'anqakuna]])',
+'searchsubtitleinvalid'            => '"$1" nisqatam maskanki',
+'noexactmatch'                     => "'''Manam kanchu \"\$1\" sutiyuq p'anqa.''' Munaspaykiqa [[:\$1|kamarillay]].",
+'noexactmatch-nocreate'            => "'''\"\$1\" sutiyuq p'anqaqa manam kanchu.'''",
+'toomanymatches'                   => 'Nisyu taripasqakunam kutisqa, ama hina kaspa, huk taripanawan ruraykachay',
+'titlematches'                     => "P'anqakunap sutinkunapi tarisqa",
+'notitlematches'                   => "Manam ima p'anqakunap sutinkunapipas tarisqachu",
+'textmatches'                      => "P'anqakunap qillqankunapi tarisqa",
+'notextmatches'                    => "Manam ima p'anqakunap qillqankunapipas tarisqachu",
+'prevn'                            => '$1 ñawpaq',
+'nextn'                            => '$1 qatiq',
+'viewprevnext'                     => 'Qhaway ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Maskaypaq akllanakuna',
+'searchmenu-exists'                => "'''Kay wikipiqa «[[$1]]» sutiyuq p'anqam kachkan'''",
+'searchmenu-new'                   => "'''Kay wikipi \"[[:\$1]]\" sutiyuq p'anqata kamariy!'''",
+'searchhelp-url'                   => 'Help:Yanapana',
+'searchmenu-prefix'                => "[[Special:PrefixIndex/$1|Kay ñawpa k'askaqchayuq huk p'anqakunata maskay]]",
+'searchprofile-articles'           => "Samiq p'anqakuna",
+'searchprofile-articles-and-proj'  => "Samiqpas ruraykamaypaqpas p'anqakuna",
+'searchprofile-project'            => "Ruraykamaypaq p'anqakuna",
+'searchprofile-images'             => 'Willañiqikuna',
+'searchprofile-everything'         => 'Tukuy',
+'searchprofile-advanced'           => 'Ñawparikusqa',
+'searchprofile-articles-tooltip'   => '$1 nisqapi maskay',
+'searchprofile-project-tooltip'    => '$1 nisqapi maskay',
+'searchprofile-images-tooltip'     => 'Willañiqikunata maskay',
+'searchprofile-everything-tooltip' => "Tukuy samiqninpi maskay (rimanakuy p'anqakunapipas)",
+'searchprofile-advanced-tooltip'   => "Akllasqa suti k'itikunapi maskay",
+'prefs-search-nsdefault'           => "Ñawpaqta sut'ichasqa chanikunata llamk'apuspa maskay:",
+'prefs-search-nscustom'            => "Kay akllasqa suti k'itikunapi maskay:",
+'search-result-size'               => '$1 ({{PLURAL:$2|1 rima|$2 rimakuna}})',
+'search-result-score'              => 'Chaniyuq kaynin: $1%',
+'search-redirect'                  => '(pusapuna $1)',
+'search-section'                   => '(raki $1)',
+'search-suggest'                   => 'Kaytachu niyta munanki? - $1',
+'search-interwiki-caption'         => 'Ñaña ruraykamaykuna',
+'search-interwiki-default'         => '$1 taripasqakuna:',
+'search-interwiki-more'            => '(aswan)',
+'search-mwsuggest-enabled'         => 'rimapusqakunawan',
+'search-mwsuggest-disabled'        => 'mana rimapusqakunawanchu',
+'search-relatedarticle'            => 'Apanakuq',
+'mwsuggest-disable'                => 'AJAX rimapuykunaman ama niy',
+'searchrelated'                    => 'apanakuq',
+'searchall'                        => 'tukuy',
+'showingresults'                   => "Qhipanpiqa rikuchkanki {{PLURAL:$1|'''1''' tarisqatam|'''$1'''-kama tarisqakunatam}}, '''$2''' huchhawan qallarispa.",
+'showingresultsnum'                => "Qhipanpiqa rikuchkanki {{PLURAL:$3|'''1''' tarisqatam|'''$3''' tarisqakunatam}}, '''$2''' yupaywan qallarispa.",
+'showingresultstotal'              => "Kay qatiqpi {{PLURAL:$4||taripasqa '''$1''', '''$3'''-pura|taripasqakuna '''$1 - $2''', '''$3'''-pura}}",
+'nonefound'                        => "'''Musyay''': Kikinmantaqa huk suti k'itikunallapim maskanki, manataqmi tukuykunapichu. Ñawpaqninpi ''all:'' nisqata qillqaspaykiqa, tukuy suti k'itikunapim maskanki (rimachinakunapipas, plantillakunapipas). Huk sapaq suti k'itipi maskayta munaspaykiqa, chay k'itip sutinta k'askaq hina ñawpaqninpi qillqamuy.",
+'search-nonefound'                 => 'Maskaypaq kay hina kachun nisqakamaqa manam kanchu taripasqakuna.',
+'powersearch'                      => 'Maskay',
+'powersearch-legend'               => 'Ñawparikusqa maskay',
+'powersearch-ns'                   => "Kay suti k'itikunapi maskay:",
+'powersearch-redir'                => 'Pusapunakunata rikuchiy',
+'powersearch-field'                => 'Kayta maskay:',
+'search-external'                  => 'Hawapi maskay',
+'searchdisabled'                   => "{{SITENAME}} nisqapi maskaymanqa ama nisqam. Hinachkaptinqa, maskariy google nisqawan icha huk hawa maskanakunawan, ichataq yuyariy, {{SITENAME}}manta hallch'asqankunaqa manañachá musuqllachu.",
 
 # Preferences page
-'preferences'              => 'Allinkachinakuna',
-'mypreferences'            => 'Allinkachinaykuna',
-'prefs-edits'              => 'Hukchasqakunap yupaynin:',
-'prefsnologin'             => 'Manam yaykurqankichu',
-'prefsnologintext'         => '<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} Yaykunaykim]</span> tiyan allinkachinaykikunata hukchanaykipaq.',
-'prefsreset'               => 'Allinkachinakunaqa qallariy kachkaykunaman kutisqañam.',
-'qbsettings'               => 'Utqaytawna ("Quickbar") allinkachinakuna',
-'qbsettings-none'          => 'Mana imapas',
-'qbsettings-fixedleft'     => "Lluq'iman watay",
-'qbsettings-fixedright'    => 'Pañaman watay',
-'qbsettings-floatingleft'  => "Lluq'iman tuytuy",
-'qbsettings-floatingright' => 'Pañaman tuytuy',
-'changepassword'           => 'Yaykuna rimata hukchay',
-'skin'                     => 'Qara',
-'math'                     => 'Minuywa',
-'dateformat'               => "P'unchaw pacha chanta",
-'datedefault'              => 'Kikinmanta allinkachina',
-'datetime'                 => "P'unchaw, pacha",
-'math_failure'             => "Manam hap'inichu",
-'math_unknown_error'       => 'mana riqsisqa pantasqa',
-'math_unknown_function'    => 'mana riqsisqa rurana',
-'math_lexing_error'        => 'rima pantasqa',
-'math_syntax_error'        => 'rimay ukhunpuray pantasqa',
-'math_image_error'         => "Manam atinichu PNG-man t'ikrayta; latex, dvips, gs, convert nisqakunap tiyachisqa kayninta llanchiy",
-'math_bad_tmpdir'          => "Manam atinichu <em>math</em> nisqapaq mit'alla willañiqi churanata kamayta icha qillqayta",
-'math_bad_output'          => 'Manam atinichu <em>math</em> nisqapaq lluqsichina willañiqi churanata kamayta icha qillqayta',
-'math_notexvc'             => 'Manam kanchu ruranalla <strong>texvc</strong>. Ama hina kaspa, <em>math/README</em> nisqata ñawiriy allinkachinaykipaq.',
-'prefs-personal'           => 'Kikinpa willankuna',
-'prefs-rc'                 => 'Ñaqha hukchasqakuna',
-'prefs-watchlist'          => "Watiqasqa p'anqakuna",
-'prefs-watchlist-days'     => "Hayk'a p'unchawkunata watiqana sutisuyupi rikuchiy:",
-'prefs-watchlist-edits'    => "Hayk'a hukchasqakunata hatunchasqa watiqana sutisuyupi rikuchiy:",
-'prefs-misc'               => 'Ñawra',
-'saveprefs'                => 'Allinkachinakunata waqaychay',
-'resetprefs'               => 'Mana waqaychasqa hukchasqakunaman ama niy',
-'oldpassword'              => "Mawk'a yaykuna rima:",
-'newpassword'              => 'Musuq yaykuna rima:',
-'retypenew'                => 'Musuq yaykuna rimaykita takyachiy:',
-'textboxsize'              => "Llamk'apusqa",
-'rows'                     => 'Sinrukuna:',
-'columns'                  => 'Wachukuna:',
-'searchresultshead'        => 'Maskay',
-'resultsperpage'           => "Huk p'anqapi hayk'a tarinakuna:",
-'contextlines'             => "Siq'ikuna taripasqaman:",
-'contextchars'             => "Ukhunpuray sananchakuna siq'iman:",
-'stub-threshold'           => 'Kay hatun kaykamam <a href="#" class="stub">t\'una qillqasqa t\'inki</a> nisqa kachun (byte):',
-'recentchangesdays'        => "Ñaqha hukchasqakunapi rikuchina p'unchawkuna:",
-'recentchangescount'       => "Ñaqha hukchasqakunapi p'anqa sutikuna",
-'savedprefs'               => "Allinkachinaykikunaqa hallch'asqañam.",
-'timezonelegend'           => "Pacha t'urpi",
-'timezonetext'             => "¹Hayk'a urataq qampa tiyayllaykip pachan sirwiqpa pachanmanta (UTC).",
-'localtime'                => 'Tiyaylla pacha',
-'timezoneoffset'           => 'Huk kay¹',
-'servertime'               => 'Sirwiqpa pachan',
-'guesstimezone'            => 'Pacha suyuta chaskimuy',
-'allowemail'               => 'Huk ruraqkunamanta e-chaskita saqillay',
-'prefs-searchoptions'      => 'Akllanakunata maskay',
-'prefs-namespaces'         => "Suti k'itikuna",
-'defaultns'                => "Kay suti k'itikunapi kikinmanta maskay:",
-'default'                  => 'kikinmanta',
-'files'                    => 'Willañiqikuna',
+'preferences'               => 'Allinkachinakuna',
+'mypreferences'             => 'Allinkachinaykuna',
+'prefs-edits'               => 'Hukchasqakunap yupaynin:',
+'prefsnologin'              => 'Manam yaykurqankichu',
+'prefsnologintext'          => '<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} Yaykunaykim]</span> tiyan allinkachinaykikunata hukchanaykipaq.',
+'prefsreset'                => 'Allinkachinakunaqa qallariy kachkaykunaman kutisqañam.',
+'qbsettings'                => 'Utqaytawna ("Quickbar") allinkachinakuna',
+'qbsettings-none'           => 'Mana imapas',
+'qbsettings-fixedleft'      => "Lluq'iman watay",
+'qbsettings-fixedright'     => 'Pañaman watay',
+'qbsettings-floatingleft'   => "Lluq'iman tuytuy",
+'qbsettings-floatingright'  => 'Pañaman tuytuy',
+'changepassword'            => 'Yaykuna rimata hukchay',
+'skin'                      => 'Qara',
+'skin-preview'              => 'Ñawpaqta qhaway',
+'math'                      => 'Minuywa',
+'dateformat'                => "P'unchaw pacha chanta",
+'datedefault'               => 'Kikinmanta allinkachina',
+'datetime'                  => "P'unchaw, pacha",
+'math_failure'              => "Manam hap'inichu",
+'math_unknown_error'        => 'mana riqsisqa pantasqa',
+'math_unknown_function'     => 'mana riqsisqa rurana',
+'math_lexing_error'         => 'rima pantasqa',
+'math_syntax_error'         => 'rimay ukhunpuray pantasqa',
+'math_image_error'          => "Manam atinichu PNG-man t'ikrayta; latex, dvips, gs, convert nisqakunap tiyachisqa kayninta llanchiy",
+'math_bad_tmpdir'           => "Manam atinichu <em>math</em> nisqapaq mit'alla willañiqi churanata kamayta icha qillqayta",
+'math_bad_output'           => 'Manam atinichu <em>math</em> nisqapaq lluqsichina willañiqi churanata kamayta icha qillqayta',
+'math_notexvc'              => 'Manam kanchu ruranalla <strong>texvc</strong>. Ama hina kaspa, <em>math/README</em> nisqata ñawiriy allinkachinaykipaq.',
+'prefs-personal'            => 'Kikinpa willankuna',
+'prefs-rc'                  => 'Ñaqha hukchasqakuna',
+'prefs-watchlist'           => "Watiqasqa p'anqakuna",
+'prefs-watchlist-days'      => "Hayk'a p'unchawkunata watiqana sutisuyupi rikuchiy:",
+'prefs-watchlist-days-max'  => "(ama qanchismanta aswan p'unchaw kachunchu)",
+'prefs-watchlist-edits'     => "Hayk'a hukchasqakunata hatunchasqa watiqana sutisuyupi rikuchiy:",
+'prefs-watchlist-edits-max' => '(ama waranqamanta aswan kachunchu)',
+'prefs-misc'                => 'Ñawra',
+'prefs-resetpass'           => 'Yaykuna rimata hukchay',
+'saveprefs'                 => 'Allinkachinakunata waqaychay',
+'resetprefs'                => 'Mana waqaychasqa hukchasqakunaman ama niy',
+'textboxsize'               => "Llamk'apusqa",
+'prefs-edit-boxsize'        => "Llamk'apuna wintanap chhikan.",
+'rows'                      => 'Sinrukuna:',
+'columns'                   => 'Wachukuna:',
+'searchresultshead'         => 'Maskay',
+'resultsperpage'            => "Huk p'anqapi hayk'a tarinakuna:",
+'contextlines'              => "Siq'ikuna taripasqaman:",
+'contextchars'              => "Ukhunpuray sananchakuna siq'iman:",
+'stub-threshold'            => 'Kay hatun kaykamam <a href="#" class="stub">t\'una qillqasqa t\'inki</a> nisqa kachun (byte):',
+'recentchangesdays'         => "Ñaqha hukchasqakunapi rikuchina p'unchawkuna:",
+'recentchangesdays-max'     => "(ama $1-manta aswan {{PLURAL:$1|p'unchaw|p'unchaw}} kachunchu)",
+'recentchangescount'        => "Ñaqha hukchasqakunapi, wiñay kawsaykunapi, hallch'asqakunapipas p'anqa sutikunap yupaynin, kikinmanta:",
+'savedprefs'                => "Allinkachinaykikunaqa hallch'asqañam.",
+'timezonelegend'            => "Pacha t'urpi",
+'timezonetext'              => "¹Hayk'a urataq qampa tiyayllaykip pachan sirwiqpa pachanmanta (UTC).",
+'localtime'                 => 'Tiyaylla pacha:',
+'timezoneselect'            => 'Pacha suyu:',
+'timezoneuseserverdefault'  => 'Sirwiqpa kikinmanta',
+'timezoneuseoffset'         => 'Huk pacha (pachap wakin kayninta willay)',
+'timezoneoffset'            => 'Huk kay¹:',
+'servertime'                => 'Sirwiqpa pachan:',
+'guesstimezone'             => 'Pacha suyuta chaskimuy',
+'allowemail'                => 'Huk ruraqkunamanta e-chaskita saqillay',
+'prefs-searchoptions'       => 'Akllanakunata maskay',
+'prefs-namespaces'          => "Suti k'itikuna",
+'defaultns'                 => "Kay suti k'itikunapi kikinmanta maskay:",
+'default'                   => 'kikinmanta',
+'files'                     => 'Willañiqikuna',
 
 # User rights
 'userrights'                  => 'Ruraqkunata saqillanap allinkachinan', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Ruraqkunap huñunkunata allinkachiy',
 'userrights-user-editname'    => 'Ruraqpa sutinta qillqamuy:',
 'editusergroup'               => 'Ruraqkunap huñunkunata hukchay',
-'editinguser'                 => "Kay ruraqpa hayñinkunata hukchaspa: '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Kay ruraqpa hayñinkunata hukchaspa: '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Ruraqkunap huñunkunata hukchay',
 'saveusergroups'              => 'Ruraq huñukunata waqaychay',
 'userrights-groupsmember'     => 'Kayman kapuq:',
@@ -933,6 +1124,8 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'right-minoredit'            => 'Llamk\'apusqakunata "Kayqa uchuylla hukchaymi" nispa sananchay',
 'right-move'                 => "P'anqakunata astay",
 'right-move-subpages'        => "P'anqakunata urin p'anqankunatawan astay",
+'right-move-rootuserpages'   => "Ruraqpa saphi p'anqankunata astay",
+'right-movefile'             => 'Willañiqikunata astay',
 'right-suppressredirect'     => "Huk p'anqata astaspa pusapuna p'anqata mana kamariy",
 'right-upload'               => 'Willañiqikunata churkuy',
 'right-reupload'             => 'Kachkaqña willañiqita huknachay',
@@ -983,9 +1176,46 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'rightslogentry' => 'hukchan $1-pa hayñinkunata $2-manta $3-man',
 'rightsnone'     => '(-)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => "kay p'anqata ñawiriy",
+'action-edit'                 => "kay p'anqata llamk'apuy",
+'action-createpage'           => "p'anqakunata kamariy",
+'action-createtalk'           => "rimanakuy p'anqakunata kamariy",
+'action-createaccount'        => 'kay ruraqpa rakiqunanta kamariy',
+'action-minoredit'            => "kay llamk'apusqata asllalla nispa sananchay",
+'action-move'                 => "kay p'anqata astay",
+'action-move-subpages'        => "kay p'anqata urin p'anqankunatapas astay",
+'action-move-rootuserpages'   => "ruraqpa saphi p'anqankunata astay",
+'action-movefile'             => 'kay willañiqita astay',
+'action-upload'               => 'kay willañiqita churkuy',
+'action-reupload'             => 'kay kachkaqña willañiqita huknachay',
+'action-reupload-shared'      => 'kay willañiqita rakinakusqa churanapi qhawarpariy',
+'action-upload_by_url'        => 'kay willañiqita URL tiyaymanta churkuy',
+'action-writeapi'             => "qillqay API nisqata llamk'achiy",
+'action-delete'               => "kay p'anqata qulluy",
+'action-deleterevision'       => 'kay musuqchasqata qulluy',
+'action-deletedhistory'       => "kay qullusqa p'anqap wiñay kawsasqanta qhaway",
+'action-browsearchive'        => "qullusqa p'anqakunata maskay",
+'action-undelete'             => "kay qullusqa p'anqata paqarichiy",
+'action-suppressrevision'     => 'kay pakasqa musuqchasqata musuqchaspa kutichimuy',
+'action-suppressionlog'       => "kay sapaqpa hallch'anta qhaway",
+'action-block'                => "kay ruraqta llamk'apuymanta hark'ay",
+'action-protect'              => "kay p'anqapaq amachana kamachisqakunata hukchay",
+'action-import'               => "kay p'anqata hawa wikimanta chaskimuy",
+'action-importupload'         => "kay p'anqata willañiqi churkusqamanta chaskimuy",
+'action-patrol'               => "huk ruraqpa llamk'apusqanta patrullasqa nispa sananchay",
+'action-autopatrol'           => "kikiykip llamk'apusqaykita patrullasqa nispa sananchakuy",
+'action-unwatchedpages'       => "mana watiqasqa p'anqa sutisuyuta qhaway",
+'action-trackback'            => "ñawpaqman yupi qatiyta (''trackback'' nisqata) kachamuy",
+'action-mergehistory'         => "kay p'anqap wiñay kawsayninta huñuy",
+'action-userrights'           => "tukuy ruraqkunap hayñinkunata llamk'apuy",
+'action-userrights-interwiki' => "hawa wikikunapi ruraqkunap hayñinkunata llamk'apuy",
+'action-siteadmin'            => "willañiqintinta hark'ay icha paskay",
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|hukchasqa|hukchasqakuna}}',
 'recentchanges'                     => 'Ñaqha hukchasqa',
+'recentchanges-legend'              => 'Ñaqha hukchasqapaq allinkachinakuna',
 'recentchangestext'                 => "Kay p'anqapiqa aswan qhipaq ñaqha hukchasqakunam.",
 'recentchanges-feed-description'    => 'Kay mikhuchinapi wikipi qhipaq ñaqha hukchasqakunata qatiy.',
 'rcnote'                            => "Kay qatiqpiqa qhipaq {{PLURAL:$1|'''1''' hukchasqam|'''$1''' hukchasqakunam}} qhipaq {{PLURAL:$2|p'unchawpi|'''$2''' p'unchawkunapi}}, musuqchasqa $5, $4.",
@@ -1009,6 +1239,8 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'rc_categories'                     => 'Kay katiguriyakunaman saywachay ("|" nisqawan rakisqa)',
 'rc_categories_any'                 => 'Imallapas',
 'newsectionsummary'                 => 'Musuq raki: /* $1 */',
+'rc-enhanced-expand'                => 'Imaymanachakunata rikuchiy (JavaScript kananmi)',
+'rc-enhanced-hide'                  => 'Imaymanachakunata pakay',
 
 # Recent changes linked
 'recentchangeslinked'          => "Hukchasqa t'inkimuq",
@@ -1029,18 +1261,18 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'upload_directory_read_only'  => "Llika sirwiqqa manam atinchu churkuna hallch'aman ($1) qillqayta.",
 'uploaderror'                 => 'Willañiqita churkunayaptiyki pantasqam tukurqan',
 'uploadtext'                  => "Willañiqita churkunaykipaqqa kay qatiqpi kaq hunt'ana p'anqata llamk'achiy.
-Churkusqaña rikchakunatataq qhawanaykipaq icha maskanaykipaqqa [[Special:ImageList|rikchakuna p'anqaman]] riy. Churkusqakunata [[Special:Log/upload|churkuy hallch'apim]], qullusqakunatataq [[Special:Log/delete|qulluy hallch'apim]] rikunki.
+Churkusqaña rikchakunatataq qhawanaykipaq icha maskanaykipaqqa [[Special:FileList|rikchakuna p'anqaman]] riy. Churkusqakunata [[Special:Log/upload|churkuy hallch'apim]], qullusqakunatataq [[Special:Log/delete|qulluy hallch'apim]] rikunki.
 
 Rikchata huk p'anqaman ch'aqtanaykipaqqa kay hunt'ana p'anqapi t'inkita llamk'achiy:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Willañiqi.jpg]]</nowiki></tt>''', willañiqip hunt'a musuqchasqan llamk'achinapaq
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Willañiqi.png|huk qillqa]]</nowiki></tt>''', lluq'i manyapi kaq kahapi 200 iñu suni rikch'achisqata llamk'achinapaq
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Willañiqi.jpg]]</nowiki></tt>''', willañiqip hunt'a musuqchasqan llamk'achinapaq
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Willañiqi.png|huk qillqa]]</nowiki></tt>''', lluq'i manyapi kaq kahapi 200 iñu suni rikch'achisqata llamk'achinapaq
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Willañiqi.ogg]]</nowiki></tt>''', willañiqiman chiqalla t'inkinapaq, willañiqita mana rikuchispa",
 'upload-permitted'            => 'Saqillasqa willañiqi layakuna: $1.',
 'upload-preferred'            => 'Astawan munasqa willañiqi layakuna: $1.',
 'upload-prohibited'           => 'Mana saqillasqa willañiqi layakuna: $1.',
 'uploadlog'                   => "churkuy hallch'a",
 'uploadlogpage'               => 'Churkusqa willañiqikuna',
-'uploadlogpagetext'           => 'Kay qatiqpiqa ñaqha willañiqi churkusqakunam. [[Special:NewImages|Musuq willañiqikunayuq suyu-suyuta]] qhaway rikchachakunata rikunaykipaq.',
+'uploadlogpagetext'           => 'Kay qatiqpiqa ñaqha willañiqi churkusqakunam. [[Special:NewFiles|Musuq willañiqikunayuq suyu-suyuta]] qhaway rikchachakunata rikunaykipaq.',
 'filename'                    => 'Willañiqip sutin',
 'filedesc'                    => 'Pisichay',
 'fileuploadsummary'           => "T'iktu:",
@@ -1060,7 +1292,7 @@ Rikchata huk p'anqaman ch'aqtanaykipaqqa kay hunt'ana p'anqapi t'inkita llamk'ac
 'large-file'                  => 'Kamalliykiku, willañiqikunaqa ama $1-manta aswan hatun kachunchu; kay willañiqiqa $2 hatunmi.',
 'largefileserver'             => 'Kay willañiqiqa sirwiqpi allinkachisqakama saqillasqa chhikanmanta aswan hatunmi.',
 'emptyfile'                   => "Churkusqayki willañiqiqa ch'usaqmi rikch'akun. Pantasqa sutinchá. Ama hina kaspa, llanchiy, churkuyman munasqayki willañiqichu.",
-'fileexists'                  => "Kachkanñam kay sutiyuq willañiqi. Ama hina kaspa, <strong><tt>$1</tt></strong> nisqata llanchiy, huknachanaykimanta mana allin yachaspaykiqa.
+'fileexists'                  => "Kachkanñam kay sutiyuq willañiqi. Ama hina kaspa, '''<tt>$1</tt>''' nisqata llanchiy, huknachanaykimanta mana allin yachaspaykiqa.
 
 
 '''Musyay:''' Willañiqita huknachaspaykiqa, ''cache'' nisqa pakasqa hallch'ata ch'usaqchay hukchasqaykikunata rikunaykipaq:
@@ -1068,19 +1300,20 @@ Rikchata huk p'anqaman ch'aqtanaykipaqqa kay hunt'ana p'anqapi t'inkita llamk'ac
 *'''Internet Explorer''' / '''Opera''': '''ctrl-f5'''
 *'''Safari''': '''cmd-r'''
 *'''Konqueror''': '''ctrl-r'''",
-'filepageexists'              => "Kay willañiqipaq sut'ichana p'anqaqa kamarisqañam <strong><tt>$1</tt></strong> nisqapi, ichataq kay sutiyuq willañiqi manaraqmi kanchu. Willanayki pisichayqa manam rikch'akunqachu sut'ichana p'anqapi, kikiykip makiykiwanmi llamk'apunayki tiyanqa.",
-'fileexists-extension'        => 'Kay willañiqip sutinman yaqa kaqlla sutiyuq willañiqim kachkanña:<br />
-Churkunayasqayki willañiqip sutin: <strong><tt>$1</tt></strong><br />
-Kachkaqña willañiqip sutin: <strong><tt>$2</tt></strong><br />
-Ama hina kaspa, huk sutita akllay.',
+'filepageexists'              => "Kay willañiqipaq sut'ichana p'anqaqa kamarisqañam '''<tt>$1</tt>''' nisqapi, ichataq kay sutiyuq willañiqi manaraqmi kanchu. Willanayki pisichayqa manam rikch'akunqachu sut'ichana p'anqapi, kikiykip makiykiwanmi llamk'apunayki tiyanqa.",
+'fileexists-extension'        => "Kay willañiqip sutinman yaqa kaqlla sutiyuq willañiqim kachkanña:<br />
+Churkunayasqayki willañiqip sutin: '''<tt>$1</tt>'''<br />
+Kachkaqña willañiqip sutin: '''<tt>$2</tt>'''<br />
+Ama hina kaspa, huk sutita akllay.",
 'fileexists-thumb'            => "<center>'''Kachkaq rikcha'''</center>",
-'fileexists-thumbnail-yes'    => "Willañiqiqa ancha uchuylla rikchamanmi rikch'akun <i>(thumbnail)</i>. Ama hina kaspa, <strong><tt>$1</tt></strong> nisqa willañiqita llanchiy.<br />
+'fileexists-thumbnail-yes'    => "Willañiqiqa ancha uchuylla rikchamanmi rikch'akun ''(thumbnail)''. Ama hina kaspa, '''<tt>$1</tt>''' nisqa willañiqita llanchiy.<br />
 Llanchisqa willañiqi qallariy chhikan kikin rikchaman kaqlla kaptinqa, huk rikchachata churkunaykiqa manam tiyanchu.",
-'file-thumbnail-no'           => "Willañiqip sutinqa <strong><tt>$1</tt></strong> nisqawanmi qallarin. Ancha uchuylla rikchamanmi rikch'akun <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "Willañiqip sutinqa '''<tt>$1</tt>''' nisqawanmi qallarin. Ancha uchuylla rikchamanmi rikch'akun ''(thumbnail)''.
 Kay churkunayki rikcha hunt'a chhikan kayniyuq kaptinqa, chay hunt'atam churkuy, manataq hinaptinqa willañiqip sutinta hukchay.",
-'fileexists-forbidden'        => 'Kay sutiyuq willañiqiqa kachkanñam. Ama hina kaspa, willañiqip sutinta hukchaspa musuqmanta churkuy. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => "Kay sutiyuq willañiqiqa kachkañam rakinakusqa willañiqi qullqapi. Ama hina kaspa, churkuyta munaspaykiraq, ñawpaq p'anqaman kutispa willañiqiykita huk sutiwan churkuy. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => 'Kay sutiyuq willañiqiqa kachkanñam, manam huknachanallachu. Willañiqiykita kunanraq churkuyta munaspaykiqa, ama hina kaspa, willañiqip sutinta hukchaspa musuqmanta churkuy. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => "Kay sutiyuq willañiqiqa kachkañam rakinakusqa willañiqi qullqapi. Ama hina kaspa, churkuyta munaspaykiraq, ñawpaq p'anqaman kutispa willañiqiykita huk sutiwan churkuy. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Kay willañiqiqa kay qatiq {{PLURAL:$1|willañiqip|willañiqikunap}} iskaychasqanmi:',
+'file-deleted-duplicate'      => 'Kay hinalla ([[$1]]) willañiqiña qullusqam karqa. Qhawariy imarayku qullusqa karqa, manaraq musuqmanta churkuykachaspa.',
 'successfulupload'            => 'Aypalla churkusqañam',
 'uploadwarning'               => 'Willañiqi churkuymanta paqtataq niy',
 'savefile'                    => 'Willañiqita waqaychay',
@@ -1100,7 +1333,7 @@ Kay churkunayki rikcha hunt'a chhikan kayniyuq kaptinqa, chay hunt'atam churkuy,
 
 Hamut'arinaykim tiyanman, kay willañiqita musuqmanta churkuyqa allinchu mana allinchu chaylla.
 Kay qatiqpiqa willañiqimanta qulluy hallch'atam rikunki:",
-'filename-bad-prefix'         => 'Churkunayasqayki willañiqip sutinqa <strong>"$1"</strong> nisqawanmi qallarin. Chay sutinqa iliktruniku rikcha hap\'inap kamasqanmanmi rikch\'akun. Ama hina kaspa, willañiqiykita astawan t\'iktuq sutinta akllay.',
+'filename-bad-prefix'         => "Churkunayasqayki willañiqip sutinqa '''\"\$1\"''' nisqawanmi qallarin. Chay sutinqa iliktruniku rikcha hap'inap kamasqanmanmi rikch'akun. Ama hina kaspa, willañiqiykita astawan t'iktuq sutinta akllay.",
 
 'upload-proto-error'      => 'Tantari qillqaqa manam allinchu',
 'upload-proto-error-text' => "Huk p'anqamanta willañiqita churkunapaqqa URL tiyaypa <code>http://</code> icha <code>ftp://</code> nisqawan qallarinanmi.",
@@ -1121,20 +1354,21 @@ Kay qatiqpiqa willañiqimanta qulluy hallch'atam rikunki:",
 'upload_source_url'  => ' (allin, sapsi chayanalla URL tiyay)',
 'upload_source_file' => ' (antañiqiqniykipi willañiqi)',
 
-# Special:ImageList
-'imagelist-summary'     => "Kay sapaq p'anqapiqa tukuy churkusqa willañiqikunatam rikunki.
+# Special:ListFiles
+'listfiles-summary'     => "Kay sapaq p'anqapiqa tukuy churkusqa willañiqikunatam rikunki.
 Kikinmantaqa ñaqha churkusqa willañiqikunatam sutisuyup patanpi rikunki.
 Wachup umanpi ñit'ispaqa allichaytam hukchanki.",
-'imagelist_search_for'  => 'Rikchap sutinta maskay:',
+'listfiles_search_for'  => 'Rikchap sutinta maskay:',
 'imgfile'               => 'willañiqi',
-'imagelist'             => 'Rikchakuna',
-'imagelist_date'        => "P'unchaw",
-'imagelist_name'        => 'Suti',
-'imagelist_user'        => 'Ruraq',
-'imagelist_size'        => 'Hatun kay',
-'imagelist_description' => "T'iktuna",
-
-# Image description page
+'listfiles'             => 'Rikchakuna',
+'listfiles_date'        => "P'unchaw",
+'listfiles_name'        => 'Suti',
+'listfiles_user'        => 'Ruraq',
+'listfiles_size'        => 'Hatun kay',
+'listfiles_description' => "T'iktuna",
+'listfiles_count'       => 'Musuqchasqakuna',
+
+# File description page
 'filehist'                       => 'Willañiqip wiñay kawsaynin',
 'filehist-help'                  => "P'unchaw/pacha nisqapi ñit'iy chaypacha willañiqi kachkasqata qhawanaykipaq.",
 'filehist-deleteall'             => 'tukuyta qulluy',
@@ -1142,12 +1376,18 @@ Wachup umanpi ñit'ispaqa allichaytam hukchanki.",
 'filehist-revert'                => 'kutichiy',
 'filehist-current'               => 'kunan',
 'filehist-datetime'              => "P'unchaw/Pacha",
+'filehist-thumb'                 => 'Uchuylla rikchacha',
+'filehist-thumbtext'             => '$1-pa musuqchasqanmanta uchuylla rikchacha',
+'filehist-nothumb'               => 'Manam uchuylla rikchachachu kachun',
 'filehist-user'                  => 'Ruraq',
 'filehist-dimensions'            => 'Chhikanyachikuqkuna',
 'filehist-filesize'              => 'Willañiqip chhikan kaynin',
 'filehist-comment'               => 'Willapuy',
-'imagelinks'                     => "Rikchaman t'inkimuq",
+'imagelinks'                     => "Willañiqiman t'inkimuq",
 'linkstoimage'                   => "Kay rikchamanqa kay qatiq {{PLURAL:$1|p'anqam|$1 p'anqakunam}} t'inkimun:",
+'linkstoimage-more'              => "$1-manta aswan {{PLURAL:$1|p'anqam|p'anqakunam}} kay willañiqiman t'inkimun.
+Kay qatiq sutisuyupiqa {{PLURAL:$1|ñawpaqllam t'inkita|ñawpaqllam $1 t'inkikunata}} rikunki.
+Munaspaykiqa, [[Special:WhatLinksHere/$2|hunt'a sutisuyuta]] qhaway.",
 'nolinkstoimage'                 => "Kay rikchamanqa manam ima p'anqakunachu t'inkimun.",
 'morelinkstoimage'               => "Kay willañiqiman [[Special:WhatLinksHere/$1|aswan t'inkimuqkunata]] qhaway.",
 'redirectstofile'                => "Kay qatiq {{PLURAL:$1|p'anqam|$1 p'anqakunam}} kay willañiqiman pusampun:",
@@ -1178,7 +1418,7 @@ Wachup umanpi ñit'ispaqa allichaytam hukchanki.",
 # File deletion
 'filedelete'                  => '$1-ta qulluy',
 'filedelete-legend'           => 'Willañiqita qulluy',
-'filedelete-intro'            => "'''[[Media:$1|$1]]'''-tam qulluchkanki.",
+'filedelete-intro'            => "'''[[Media:$1|$1]]''' sutiyuq willañiqitam qulluykachachkanki, tukuy wiñay kawsaynintapas.",
 'filedelete-intro-old'        => "'''[[Media:$1|$1]]''' musuqchasqatam qulluchkanki [$4 $3, $2] nisqamanta.",
 'filedelete-comment'          => 'Willapuy:',
 'filedelete-submit'           => 'Qulluy',
@@ -1186,7 +1426,6 @@ Wachup umanpi ñit'ispaqa allichaytam hukchanki.",
 'filedelete-success-old'      => "$3, $2 pachamanta '''[[Media:$1|$1]]''' llamk'apusqaqa qullusqañam.",
 'filedelete-nofile'           => "'''$1''' manam kanchu.",
 'filedelete-nofile-old'       => "Qusqa kachkaykunayuq '''$1'''-manta waqaychasqa llamk'apusqaqa manam kanchu.",
-'filedelete-iscurrent'        => "Kay willañiqimanta lliwmanta aswan ñaqha llamk'apusqatam qulluykachachkanki. Ama hina kaspa, ñawpaqta mawk'a llamk'apusqaman kutichiy.",
 'filedelete-otherreason'      => 'Hukrayku:',
 'filedelete-reason-otherlist' => 'Hukrayku',
 'filedelete-reason-dropdown'  => "*Sapsirayku qullusqa
@@ -1213,29 +1452,31 @@ Wachup umanpi ñit'ispaqa allichaytam hukchanki.",
 
 # Random page
 'randompage'         => "Mayninpi p'anqa",
-'randompage-nopages' => "Manam kanchu kay suti k'itipi p'anqakuna.",
+'randompage-nopages' => 'Manam kanchu "$1" nisqa suti k\'itipi p\'anqakuna.',
 
 # Random redirect
 'randomredirect'         => "Mayninpi pusapuna p'anqa",
-'randomredirect-nopages' => "Manam kanchu kay suti k'itipi pusapuna p'anqakuna.",
+'randomredirect-nopages' => 'Manam kanchu "$1" nisqa suti k\'itipi pusapuna p\'anqakuna.',
 
 # Statistics
-'statistics'             => 'Ranuy (kanchachani)',
-'sitestats'              => '{{SITENAME}} tiyaymanta ranuy',
-'userstats'              => 'Ruraqmanta ranuy',
-'sitestatstext'          => "Willañiqintinpiqa {{PLURAL:$1|'''1''' p'anqam|'''$1''' p'anqakunam}} kachkan.
-Kaypi ch'aqtasqaqa rimanakuymi, {{SITENAME}}manta p'anqakunam, ch'iñicha tuna qillqakunam, pusapuna p'anqakunam, huk manachá samiqniyuqchu kaq p'anqakunapas.
-Chaykunata mana yupaptinchikqa, {{PLURAL:$2|huklla samiqniyuq qillqa p'anqachá|'''$2''' samiqniyuq qillqa p'anqachá}} kachkan.
-
-Sirwiqpiqa '''$8''' {{PLURAL:$8|churkusqa willañiqim|churkusqa willañiqikunam}} kachkan.
-
-Kay wikip qallarisqanmantaqa '''$3''' kutiñam {{PLURAL:$3|watukusqa|watukusqa}}, '''$4''' kutitaqmi {{PLURAL:$4|p'anqa llamk'apusqa|p'anqakuna llamk'apusqa}} karqan.
-Chaymantaqa yurinmi: kuskanchaku '''$5''' {{PLURAL:$5|llamk'apusqa|llamk'apusqa}} p'anqaman, '''$6''' {{PLURAL:$6|watukusqa|watukusqa}} llamk'apusqaman.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Llamk'ana chupaqa] '''$7''' sunim.",
-'userstatstext'          => "{{PLURAL:$1|'''1''' rakiqunayuq ruraqmi|'''$1''' rakiqunayuq ruraqkunam}} kachkan,
-paypurataq '''$2''' ('''$4%'''-nin) $5 hayñiyuqmi.",
-'statistics-mostpopular' => "Lliwmanta astawan rikusqa p'anqakuna",
+'statistics'                   => 'Ranuy (kanchachani)',
+'statistics-header-pages'      => "P'anqakunamanta ranuy (kanchachani)",
+'statistics-header-edits'      => "Llamk'apuymanta ranuy (kanchachani)",
+'statistics-header-views'      => 'Qhawaymanta ranuy (kanchachani)',
+'statistics-header-users'      => 'Ruraqmanta ranuy',
+'statistics-articles'          => "Samiq p'anqakuna",
+'statistics-pages'             => "P'anqakuna",
+'statistics-pages-desc'        => "Wikipi tukuy p'anqakuna, rimanakuykunapas pusapunapas hukkunapas",
+'statistics-files'             => 'Churkusqa willañiqikuna',
+'statistics-edits'             => "P'anqa llamk'apusqakuna {{SITENAME}}-pa paqarisqanmanta",
+'statistics-edits-average'     => "Kuskanchaku llamk'apusqakuna p'anqaman",
+'statistics-views-total'       => 'Tukuy qhawasqakuna',
+'statistics-views-peredit'     => "Qhawasqakuna llamk'apusqaman",
+'statistics-jobqueue'          => "[http://www.mediawiki.org/wiki/Manual:Job_queue Llamk'ana sinru] chhikan",
+'statistics-users'             => 'Rakiqunayuq [[Special:ListUsers|ruraqkuna]]',
+'statistics-users-active'      => "Llamk'achkaq ruraqkuna",
+'statistics-users-active-desc' => "Ñaqha {{PLURAL:$1|p'unchawpi|$1 p'unchawkunapi}} llamk'apuq ruraqkuna",
+'statistics-mostpopular'       => "Lliwmanta astawan rikusqa p'anqakuna",
 
 'disambiguations'      => "Sut'ichana qillqakuna",
 'disambiguationspage'  => "Plantilla:Sut'ichana qillqa",
@@ -1248,7 +1489,7 @@ Kay p'anqapiqa huk pusapuna p'anqaman pusapuq p'anqakunap sutinkunatam rikunki.
 'double-redirect-fixer'      => 'Pusapuna allinchaq',
 
 'brokenredirects'        => 'Panta pusapunakuna',
-'brokenredirectstext'    => "Kay pusapuna p'anqakunaqa mana kachkaq p'anqamanmi pusapuchkan.",
+'brokenredirectstext'    => "Kay pusapuna p'anqakunaqa mana kachkaq p'anqakunamanmi pusapuchkan:",
 'brokenredirects-edit'   => "(llamk'apuy)",
 'brokenredirects-delete' => '(qulluy)',
 
@@ -1278,26 +1519,30 @@ Kay p'anqapiqa huk pusapuna p'anqaman pusapuq p'anqakunap sutinkunatam rikunki.
 'popularpages'            => "Munasqa p'anqakuna",
 'wantedcategories'        => 'Muchusqa katiguriyakuna',
 'wantedpages'             => "Muchusqa p'anqakuna",
-'missingfiles'            => 'Mana kachkaq willañiqikuna',
+'wantedfiles'             => 'Munakusqa willañiqikuna',
+'wantedtemplates'         => 'Munakusqa plantillakuna',
 'mostlinked'              => "Lliwmanta aswan t'inkimuqniyuq qillqakuna",
 'mostlinkedcategories'    => "Lliwmanta aswan t'inkimuqniyuq katiguriyakuna",
 'mostlinkedtemplates'     => "Lliwmanta aswan t'inkimuqniyuq plantillakuna",
 'mostcategories'          => "Lliwmanta aswan katiguriyayuq p'anqakuna",
 'mostimages'              => "Lliwmanta astawan llamk'achisqa rikchakuna",
 'mostrevisions'           => 'Lliwmanta aswan hukchasqayuq qillqakuna',
-'prefixindex'             => "P'anqakuna, ñawpa k'askaqchakama",
+'prefixindex'             => "Tukuy p'anqakuna ñawpa k'askaqchayuq",
 'shortpages'              => "Uchuylla p'anqakuna",
 'longpages'               => "Hatun p'anqakuna",
 'deadendpages'            => "Lluqsinannaq p'anqakuna",
 'deadendpagestext'        => "Kay p'anqakunaqa mana ima p'anqakunamanpas t'inkimunchu.",
 'protectedpages'          => "Amachasqa p'anqakuna",
 'protectedpages-indef'    => 'Wiñaypaq amachasqakuna chaylla',
+'protectedpages-cascade'  => 'Phaqchallallapi amachay',
 'protectedpagestext'      => "Kay p'anqakunaqa llamk'apuymanta icha astaymanta amachasqam",
 'protectedpagesempty'     => "Kay kuskanachina tupukunawan amachasqa p'anqakunaqa manam kachkanchu.",
 'protectedtitles'         => "Amachasqa p'anqa sutikuna",
 'protectedtitlestext'     => "Kay sutikunayuq p'anqakunaqa kamarinamanta hark'asqam",
 'protectedtitlesempty'    => "Manam kachkanchu kay kuskanachina tupukunawan amachasqa p'anqakuna.",
 'listusers'               => 'Tukuy ruraqkuna',
+'listusers-editsonly'     => "Llamk'apusqayuq ruraqkunallata rikuchiy",
+'usereditcount'           => "$1 {{PLURAL:$1|llamk'apusqa|llamk'apusqakuna}}",
 'newpages'                => "Musuq p'anqakuna",
 'newpages-username'       => 'Ruraqpa sutin:',
 'ancientpages'            => "Ñawpaqta qallarisqa p'anqakuna",
@@ -1318,14 +1563,13 @@ Kay p'anqapiqa huk pusapuna p'anqaman pusapuq p'anqakunap sutinkunatam rikunki.
 'booksources-search-legend' => 'Liwrukunapi pukyukunata maskay',
 'booksources-go'            => 'Riy',
 'booksources-text'          => "Kay qatiqpiqa huk llika tiyaykunaman t'inkikunatam rikunki, musuq icha mawk'a liwrukunata qhatuq, maskasqayki liwrukunamantachá astawan willaq:",
+'booksources-invalid-isbn'  => 'ISBN huchhaqa manachá allinchu; pantasqata llanchiriy qallariy qillqamanta iskaychamuspa.',
 
 # Special:Log
 'specialloguserlabel'  => 'Ruraq:',
 'speciallogtitlelabel' => 'Sutichay:',
 'log'                  => "Hallch'asqakuna",
 'all-logs-page'        => "Tukuy hallch'akuna",
-'log-search-legend'    => "Hallch'asqakunata maskay",
-'log-search-submit'    => 'Riy',
 'alllogstext'          => "{{SITENAME}}pa tukuy hallch'ankunamanta ch'allisqa rikuy.
 Rikuyniykitaqa k'ullkuchaytam atinki hallch'a layata, ruraqpa sutinta (uchuy icha hatun sanampakunata musyaq) icha chayachisqa p'anqata (uchuy icha hatun sanampakunata musyaq) akllaspa.",
 'logempty'             => "Manam hallch'asqakuna kachkanchu.",
@@ -1337,6 +1581,7 @@ Rikuyniykitaqa k'ullkuchaytam atinki hallch'a layata, ruraqpa sutinta (uchuy ich
 'nextpage'          => "Qatiq p'anqa ($1)",
 'prevpage'          => "Ñawpaq p'anqa ($1)",
 'allpagesfrom'      => "Rikuchiy kaywan qallariq p'anqakunata:",
+'allpagesto'        => "Kaywan tukukuq p'anqakunata rikuchiy:",
 'allarticles'       => 'Tukuy qillqasqakuna',
 'allinnamespace'    => "Tukuy p'anqakuna ($1 suti k'itipi)",
 'allnotinnamespace' => "Tukuy p'anqakuna (manataq $1 suti k'itipi)",
@@ -1356,41 +1601,68 @@ Rikuyniykitaqa k'ullkuchaytam atinki hallch'a layata, ruraqpa sutinta (uchuy ich
 'special-categories-sort-count' => 'yupaykama allichay',
 'special-categories-sort-abc'   => 'qallarina sanampakama allichay',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Qullusqa ruraqpa hukchasqankuna',
+
+# Special:LinkSearch
+'linksearch'       => "Hawa t'inkikuna",
+'linksearch-pat'   => 'Kay qatinallakama maskay:',
+'linksearch-ns'    => "Suti k'iti:",
+'linksearch-ok'    => 'Maskay',
+'linksearch-text'  => 'Ima rantipas sananchawanpas maskayta saqillasunkim, ahinataq "*.wikipedia.org".<br />Q\'imichisqa tantari qillqa: <tt>$1</tt>',
+'linksearch-line'  => "$1-man $2-manta t'inkimusqa",
+'linksearch-error' => 'Ima rantipas sananchaqa (* ?) tiyaypa qallariyninpim kanman chaylla.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Kaywan qallariq ruraqkunata rikuchiy:',
 'listusers-submit'   => 'Rikuchiy',
 'listusers-noresult' => 'Ruraqqa manam tarisqachu.',
 
+# Special:Log/newusers
+'newuserlogpage'              => "Rakiquna kamariy hallch'a",
+'newuserlogpagetext'          => "Kayqa ruraqkunap rakiqunankunata kamariymanta hallch'am.",
+'newuserlog-byemail'          => 'e-chaskiwan kachasqa yaykuna rima',
+'newuserlog-create-entry'     => 'Musuq ruraq',
+'newuserlog-create2-entry'    => 'kamarin $1-paq musuq rakiqunata',
+'newuserlog-autocreate-entry' => 'Kikinmanta kamarisqa rakiquna',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Ruraq huñup hayñinkuna',
-'listgrouprights-summary'  => "Kay qatiq sutisuyupiqa kay wikipi sut'ichasqa ruraq huñukunatam, kikinpa chayamuna hayñinkunatawan rikunki.
+'listgrouprights'                 => 'Ruraq huñup hayñinkuna',
+'listgrouprights-summary'         => "Kay qatiq sutisuyupiqa kay wikipi sut'ichasqa ruraq huñukunatam, kikinpa chayamuna hayñinkunatawan rikunki.
 Chay kikinkunap hayñinkunamanta astawan ñawirinaykipaqqa [[{{MediaWiki:Listgrouprights-helppage}}|kaypi qhaway]].",
-'listgrouprights-group'    => 'Huñu',
-'listgrouprights-rights'   => 'Hayñikuna',
-'listgrouprights-helppage' => 'Help:Ruraq huñup hayñinkuna',
-'listgrouprights-members'  => '(wankurisqakunap sutisuyun)',
+'listgrouprights-group'           => 'Huñu',
+'listgrouprights-rights'          => 'Hayñikuna',
+'listgrouprights-helppage'        => 'Help:Ruraq huñup hayñinkuna',
+'listgrouprights-members'         => '(wankurisqakunap sutisuyun)',
+'listgrouprights-addgroup'        => 'Kay {{PLURAL:$2|huñutam|huñukunatam}} yapayta atini: $1',
+'listgrouprights-removegroup'     => 'Kay {{PLURAL:$2|huñutam|huñukunatam}} qichuyta atini: $1',
+'listgrouprights-addgroup-all'    => 'Tukuy huñukunatam yapayta atini',
+'listgrouprights-removegroup-all' => 'Tukuy huñukunatam qichuyta atini',
 
 # E-mail user
-'mailnologin'     => 'Imamaytataqa ama kachaychu',
-'mailnologintext' => '[[Special:UserLogin|Yaykunaykim]], [[Special:Preferences|allinkachinaykikunapi]] chaniyuq e-chaski imamaytappas kananmi tiyan huk ruraqkunaman e-chaskita kachanaykipaq.',
-'emailuser'       => 'Kay ruraqman e-chaskita kachay',
-'emailpage'       => 'E-chaski kay ruraqman:',
-'emailpagetext'   => "Kay hunt'ana p'anqatam llamk'achiyta atinki e-chaskita kachanaykipaq.
+'mailnologin'      => 'Imamaytataqa ama kachaychu',
+'mailnologintext'  => '[[Special:UserLogin|Yaykunaykim]], [[Special:Preferences|allinkachinaykikunapi]] chaniyuq e-chaski imamaytappas kananmi tiyan huk ruraqkunaman e-chaskita kachanaykipaq.',
+'emailuser'        => 'Kay ruraqman e-chaskita kachay',
+'emailpage'        => 'E-chaski kay ruraqman:',
+'emailpagetext'    => "Kay hunt'ana p'anqatam llamk'achiyta atinki e-chaskita kachanaykipaq.
 Qampa [[Special:Preferences|allinkachinaykikunapi]] qillqakamachisqayki imamaytaqa paqarinqa kachasqayki e-chaskipi chaskiqpa kutichisunaykita atinanpaq.",
-'usermailererror' => 'Chaski llikaqa pantasqatam kutichimurqan:',
-'defemailsubject' => "{{SITENAME}} p'anqamanta chaski",
-'noemailtitle'    => 'Manam kanchu e-chaski imamayta',
-'noemailtext'     => 'Kay ruraqqa manam willawarqanchu chaniyuq imamaytata, ichataq huk ruraqkunamanta e-chaski chaskiykuyman ama nirqanmi.',
-'emailfrom'       => 'Kachaq:',
-'emailto'         => 'Chaskiq:',
-'emailsubject'    => 'Yuyancha:',
-'emailmessage'    => 'Willay:',
-'emailsend'       => 'Kachay',
-'emailccme'       => 'Willaypa iskaychasqanta kacharimuway.',
-'emailccsubject'  => 'Willaypa iskaychasqan $1: $2-man',
-'emailsent'       => 'Chaskiqa kachasqañam',
-'emailsenttext'   => 'Chaskiykiqa kachasqañam.',
-'emailuserfooter' => 'Kay e-chaskitaqa $1 sutiyuqmi kacharqan $2 sutiyuqman "e-chaski kachay" nisqapaq ruranawan kay tiyaypi: {{SITENAME}}.',
+'usermailererror'  => 'Chaski llikaqa pantasqatam kutichimurqan:',
+'defemailsubject'  => "{{SITENAME}} p'anqamanta chaski",
+'noemailtitle'     => 'Manam kanchu e-chaski imamayta',
+'noemailtext'      => 'Kay ruraqqa manam willawarqanchu chaniyuq imamaytata.',
+'nowikiemailtitle' => 'E-chaskiqa manam saqillasqachu',
+'nowikiemailtext'  => 'Kay ruraqqa nirqan, huk ruraqkunamanta ama e-chaskita chaskisaqchu, nispa.',
+'email-legend'     => '{{SITENAME}}pi huk ruraqman e-chaskita kachay',
+'emailfrom'        => 'Kachaq:',
+'emailto'          => 'Chaskiq:',
+'emailsubject'     => 'Yuyancha:',
+'emailmessage'     => 'Willay:',
+'emailsend'        => 'Kachay',
+'emailccme'        => 'Willaypa iskaychasqanta kacharimuway.',
+'emailccsubject'   => 'Willaypa iskaychasqan $1: $2-man',
+'emailsent'        => 'Chaskiqa kachasqañam',
+'emailsenttext'    => 'Chaskiykiqa kachasqañam.',
+'emailuserfooter'  => 'Kay e-chaskitaqa $1 sutiyuqmi kacharqan $2 sutiyuqman "e-chaski kachay" nisqapaq ruranawan kay tiyaypi: {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => "Watiqasqa p'anqakuna",
@@ -1420,12 +1692,7 @@ Qampa [[Special:Preferences|allinkachinaykikunapi]] qillqakamachisqayki imamayta
 'iteminvalidname'      => "'$1' nisqa qillqaqa sasachakunmi, sutinqa manam allinchu...",
 'wlnote'               => "Kay qatiqpiqa {{PLURAL:$1|qhipaq hukchasqam|'''$1''' qhipaq hukchasqakunam}} qhipaq {{PLURAL:$2|urapim|'''$2''' urakunapim}}.",
 'wlshowlast'           => "$1 ura, $2 p'unchaw $3-mantapacha hukchasqakunata rikuchiy",
-'watchlist-show-bots'  => "Rurana antachakunap llamk'apusqankunata rikuchiy",
-'watchlist-hide-bots'  => "Rurana antachakunap llamk'apusqankunata pakay",
-'watchlist-show-own'   => "Ñuqap llamk'apusqaykunata rikuchiy",
-'watchlist-hide-own'   => "Ñuqap llamk'apusqaykunata pakay",
-'watchlist-show-minor' => 'Aslla hukchasqakunata rikuchiy',
-'watchlist-hide-minor' => 'Aslla hukchasqakunata pakay',
+'watchlist-options'    => 'Watiqana sutisuyupaq allinkachinakuna',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Watiqasqakunaman yapaspa...',
@@ -1464,78 +1731,97 @@ Watiqana sutisuyuykipaq allinkachinakunata hukchanaykipaqqa kay p\'anqatam qhawa
 Yanapasunaykipaq:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => "Kay p'anqata qulluy",
-'confirm'                     => 'Takyachiy',
-'excontent'                   => "Samiqnin karqan kay hinam: '$1'",
-'excontentauthor'             => "Samiqnin karqan kay hinam: '$1' (huklla ruraqnin: '$2')",
-'exbeforeblank'               => "manaraq qullusqa kaptin, samiqnin kay hinam karqan: '$1'",
-'exblank'                     => "p'anqaqa ch'usaqmi karqan",
-'delete-confirm'              => '"$1"-ta qulluy',
-'delete-legend'               => 'Qulluy',
-'historywarning'              => "Paqtataq: Kay qulluna p'anqaqa wiñay kawsasqayuqmi:",
-'confirmdeletetext'           => "Qullunayachkanki p'anqatam icha rikchatam, wiñay kawsasqantapas.
+# Delete
+'deletepage'             => "Kay p'anqata qulluy",
+'confirm'                => 'Takyachiy',
+'excontent'              => "Samiqnin karqan kay hinam: '$1'",
+'excontentauthor'        => "Samiqnin karqan kay hinam: '$1' (huklla ruraqnin: '$2')",
+'exbeforeblank'          => "manaraq qullusqa kaptin, samiqnin kay hinam karqan: '$1'",
+'exblank'                => "p'anqaqa ch'usaqmi karqan",
+'delete-confirm'         => '"$1"-ta qulluy',
+'delete-legend'          => 'Qulluy',
+'historywarning'         => "Paqtataq: Kay qulluna p'anqaqa wiñay kawsasqayuqmi:",
+'confirmdeletetext'      => "Qullunayachkanki p'anqatam icha rikchatam, wiñay kawsasqantapas.
 Ama hina kaspa, takyachiy munayniykita, qatiqninkunata riqsiyniykita, [[{{MediaWiki:Policy-url}}|kawpaykama]] rurayniykitapas.",
-'actioncomplete'              => 'Rurasqañam',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" qullusqañam.
+'actioncomplete'         => 'Rurasqañam',
+'deletedtext'            => '"<nowiki>$1</nowiki>" qullusqañam.
 $2 nisqa p\'anqata qhaway ñaqha qullusqakunata rikunaykipaq.',
-'deletedarticle'              => 'qullusqa "$1"',
-'suppressedarticle'           => 'ñit\'ipasqa "[[$1]]"',
-'dellogpage'                  => 'Qullusqakuna',
-'dellogpagetext'              => 'Kay qatiqpiqa lliwmanta aswan ñaqha qullusqakunatam rikunki. Rikuchisqa pachankunaqa sirwiqpa pachanpim.',
-'deletionlog'                 => 'qullusqakuna',
-'reverted'                    => 'Ñawpaq hukchasqata kutichiy',
-'deletecomment'               => 'Imarayku qullusqa',
-'deleteotherreason'           => 'Huk rayku:',
-'deletereasonotherlist'       => 'Huk rayku',
-'deletereason-dropdown'       => "*Qulluypaq sapsi raykukuna
+'deletedarticle'         => 'qullusqa "$1"',
+'suppressedarticle'      => 'ñit\'ipasqa "[[$1]]"',
+'dellogpage'             => 'Qullusqakuna',
+'dellogpagetext'         => 'Kay qatiqpiqa lliwmanta aswan ñaqha qullusqakunatam rikunki. Rikuchisqa pachankunaqa sirwiqpa pachanpim.',
+'deletionlog'            => 'qullusqakuna',
+'reverted'               => 'Ñawpaq hukchasqata kutichiy',
+'deletecomment'          => 'Imarayku qullusqa',
+'deleteotherreason'      => 'Huk rayku:',
+'deletereasonotherlist'  => 'Huk rayku',
+'deletereason-dropdown'  => "*Qulluypaq sapsi raykukuna
 ** Kikin kamariqpa mañakusqan
 ** Ruraqpa hayñinta k'irisqa
 ** Wandaluchasqa",
-'delete-edit-reasonlist'      => "Qullusqapaq raykukunata llamk'apuy",
-'delete-toobig'               => "Kay p'anqaqa ancha wiñay kawsaysapa, $1-manta aswan {{PLURAL:$1|musuqchasqayuq|musuqchasqayuq}}. Kay hina p'anqakunata qulluyqa saywachasqam, {{SITENAME}}ta mana waqllinapaq.",
-'delete-warning-toobig'       => "Kay p'anqaqa ancha wiñay kawsaysapa, $1-manta aswan {{PLURAL:$1|musuqchasqayuq|musuqchasqayuq}}. Kay hina p'anqata qulluspaykiqa, {{SITENAME}}ta waqllinkimanchá. Kay ruraymanta anchata yuyaychakuspa hamut'ay.",
-'rollback'                    => 'Hukchasqakunata kutichiy',
-'rollback_short'              => 'Kutichiy',
-'rollbacklink'                => 'Kutichiy',
-'rollbackfailed'              => 'Manam kutichiyta atinchu',
-'cantrollback'                => "Manam atinichu llamk'apusqata kutichiyta; qhipaq kaq llamk'apuqqa kay p'anqap hukllam ruraqnin.",
-'alreadyrolled'               => "Manam atinichu [[User:$2|$2]]-pa ([[User talk:$2|rimanakuy]]) [[$1]] nisqa qhipaq llamk'apusqanta kutichiyta; pipas kay p'anqataqa llamk'apurqunñam icha kutichirqunñam.
-
-Qhipaq kaq llamk'apusqaqa [[User:$3|$3]]-pa ([[User talk:$3|rimanakuy]] | [[Special:Contributions/$3|{{int:contribslink}}]]) rurasqanmi.",
-'editcomment'                 => 'Llamk\'apusqamantaqa kaymi willasqa: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|rimachina]]) sutiyuq ruraqpa hukchasqankunaqa kutichisqam [[User:$1|$1]]-pa ñawpaq hukchasqanman', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => "$1-pa hukchasqankunaqa kutichisqañam $2-pa ñawpaq llamk'apusqanta paqarichispa.",
-'sessionfailure'              => "Lamk'apuy tiyayniykiwanqa sasachakuymi rikch'akun;
+'delete-edit-reasonlist' => "Qullusqapaq raykukunata llamk'apuy",
+'delete-toobig'          => "Kay p'anqaqa ancha wiñay kawsaysapa, $1-manta aswan {{PLURAL:$1|musuqchasqayuq|musuqchasqayuq}}. Kay hina p'anqakunata qulluyqa saywachasqam, {{SITENAME}}ta mana waqllinapaq.",
+'delete-warning-toobig'  => "Kay p'anqaqa ancha wiñay kawsaysapa, $1-manta aswan {{PLURAL:$1|musuqchasqayuq|musuqchasqayuq}}. Kay hina p'anqata qulluspaykiqa, {{SITENAME}}ta waqllinkimanchá. Kay ruraymanta anchata yuyaychakuspa hamut'ay.",
+
+# Rollback
+'rollback'         => 'Hukchasqakunata kutichiy',
+'rollback_short'   => 'Kutichiy',
+'rollbacklink'     => 'Kutichiy',
+'rollbackfailed'   => 'Manam kutichiyta atinchu',
+'cantrollback'     => "Manam atinichu llamk'apusqata kutichiyta; qhipaq kaq llamk'apuqqa kay p'anqap hukllam ruraqnin.",
+'alreadyrolled'    => "Manam atinichu [[User:$2|$2]]-pa ([[User talk:$2|rimanakuy]]) [[$1]] nisqa qhipaq llamk'apusqanta kutichiyta; pipas kay p'anqataqa llamk'apurqunñam icha kutichirqunñam.
+
+Qhipaq kaq llamk'apusqaqa [[User:$3|$3]]-pa ([[User talk:$3|rimanakuy]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) rurasqanmi.",
+'editcomment'      => "Llamk'apusqakunamanta pisichasqaqa kay hinam: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|rimachina]]) sutiyuq ruraqpa hukchasqankunaqa kutichisqam [[User:$1|$1]]-pa ñawpaq hukchasqanman', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => "$1-pa hukchasqankunaqa kutichisqañam $2-pa ñawpaq llamk'apusqanta paqarichispa.",
+'sessionfailure'   => "Lamk'apuy tiyayniykiwanqa sasachakuymi rikch'akun;
 kay rurayqa t'ipisqam karqan millay runap llullaspa yaykunanta hark'anapaq.
 Ama hina kaspa, llika wamp'unaykipi \"Ñawpaqman\" (\"Back\") ñit'ispa ñawpaq p'anqata musuqmanta chaqnamuspa huk kutita yaykuykachay.",
+
+# Protect
 'protectlogpage'              => "P'anqa amachasqakuna",
 'protectlogtext'              => "Kay qatiqpiqa p'anqata amachasqakunatam paskasqakunatapas rikunki. [[Special:ProtectedPages|Amachasqa p'anqakunata]] qhaway astawan willasunaykipaq.",
 'protectedarticle'            => 'amachan [[$1]]-ta',
 'modifiedarticleprotection'   => 'hukchan kay p\'anqap amachasqa kachkayninta: "[[$1]]"',
 'unprotectedarticle'          => 'paskan amachasqa [[$1]]-ta',
+'movedarticleprotection'      => 'amachana kamachisqakuna "[[$2]]" nisqamanta "[[$1]]" nisqaman astasqa',
 'protect-title'               => '"$1"-ta amachaspa',
+'prot_1movedto2'              => '«[[$1]]» «[[$2]]»-man astasqa',
 'protect-legend'              => 'Amachayta takyachiy',
 'protectcomment'              => 'Imarayku amachasqa',
 'protectexpiry'               => 'Amachaypa puchukaynin',
 'protect_expiry_invalid'      => 'Amachaypa puchukay pachanqa manam allinchu.',
 'protect_expiry_old'          => 'Amachaypa puchukay pachanqa ñawpa pachapim.',
 'protect-unchain'             => "Astana saqillaykunata llamk'apuy chaylla",
-'protect-text'                => "<strong><nowiki>$1</nowiki></strong> sutiyuq p'anqap amachasqa kachkaynintaqa kaypim qhawayta hukchaytapas atinki.",
-'protect-locked-blocked'      => "Hark'asqa kaspayki manam atinkichu amachasqa kachkayninta hukchayta. Kay qatiqpiqa <strong>$1</strong> sutiyuq p'anqap kunan allinkachinankunatam rikunki:",
+'protect-text'                => "'''<nowiki>$1</nowiki>''' sutiyuq p'anqap amachasqa kachkaynintaqa kaypim qhawayta hukchaytapas atinki.",
+'protect-locked-blocked'      => "Hark'asqa kaspayki manam atinkichu amachasqa kachkayninta hukchayta. Kay qatiqpiqa '''$1''' sutiyuq p'anqap kunan allinkachinankunatam rikunki:",
 'protect-locked-dblock'       => "Willañiqintin hark'asqa kachkaptinmi, manam atinkichu amachaypa kachkayninkunata hukchayta.
-Kay qatiqpiqa <strong>$1</strong> sutiyuq p'anqap kunan allinkachinankunatam rikunki:",
+Kay qatiqpiqa '''$1''' sutiyuq p'anqap kunan allinkachinankunatam rikunki:",
 'protect-locked-access'       => "Qampa rakiqunaykiwanqa manam p'anqa amachaypa kachkayninkunata hukchayta atinkichu.
-Kay qatiqpiqa <strong>$1</strong> sutiyuq p'anqap kunan allinkachinankunatam rikunki:",
+Kay qatiqpiqa '''$1''' sutiyuq p'anqap kunan allinkachinankunatam rikunki:",
 'protect-cascadeon'           => "Kay p'anqaqa amachasqam kachkan, kay phaqchalla amachasqa {{PLURAL:$1|p'anqapi|p'anqakunapi}} ch'aqtasqa kaspanmi. Kay p'anqap amachasqa kachkayninta hukchaytam atinki, hinaspapas manam phaqcha nisqa amachasqa kaynintachu hukchanki.",
-'protect-default'             => 'Tukuy ruraqkunapaq (kikinmanta)',
+'protect-default'             => 'Tukuy ruraqkunapaq',
 'protect-fallback'            => '"$1" saqillanam',
-'protect-level-autoconfirmed' => 'Rakiqunayuq ruraqkunallapaq',
+'protect-level-autoconfirmed' => 'Mana llullu rakiqunayuq ruraqkunallapaq',
 'protect-level-sysop'         => 'Kamachiqkunallapaq',
 'protect-summary-cascade'     => "''phaqcha'' nisqapi",
 'protect-expiring'            => 'puchukanqa $1 (UTC)',
+'protect-expiry-indefinite'   => 'mana sapaqchasqa',
 'protect-cascade'             => "Phaqchalla amachay - kay p'anqapi ch'aqtasqa p'anqakunatapaq amachay.",
 'protect-cantedit'            => "Manam atinkichu kay p'anqap amachasqa kachkayninta hukchayta, mana saqillasqa kaspaykim.",
+'protect-othertime'           => 'Huk pacha:',
+'protect-othertime-op'        => 'huk pacha',
+'protect-existing-expiry'     => 'Kunanraq nispaqa kay pachakama: $3, $2',
+'protect-otherreason'         => 'Huk/wakin rayku:',
+'protect-otherreason-op'      => 'huk/wakin rayku',
+'protect-dropdown'            => "*Amachaypaq sapsi imaraykukuna
+** Achka wandalismu
+** Achka spam yapay
+** Mana ruruchiq llamk'apuy awqanakuy
+** Ancha qhawasqa p'anqa",
+'protect-edit-reasonlist'     => 'Kayrayku amachasqa nisqata hukchay',
+'protect-expiry-options'      => "1 ura:1 hour,2 ura:2 hours,1 p'unchaw:1 day,3 p'unchaw:3 days,1 simana:1 week,2 simana:2 weeks,1 killa:1 month,3 killa:3 months,6 killa:6 months,1 wata:1 year,wiñaypaq:infinite", # display1:time1,display2:time2,...
 'restriction-type'            => 'Saqillay:',
 'restriction-level'           => 'Amachay hanan kay:',
 'minimum-size'                => 'Kaymanta aswan hatun',
@@ -1558,7 +1844,7 @@ Kay qatiqpiqa <strong>$1</strong> sutiyuq p'anqap kunan allinkachinankunatam rik
 'undeletepage'                 => "Qullusqa p'anqakunata qhawaspa paqarichiy",
 'undeletepagetitle'            => "'''Kay qatiqpiqa [[:$1]]-pa qullusqa musuqchayninkunam'''.",
 'viewdeletedpage'              => "Qullusqa p'anqakunata qhaway",
-'undeletepagetext'             => "Kay p'anqakunaqa qullusqam, ichataq hallch'apiraqmi kachkan, chayrayku paqarichiytam atinki. Mit'a-mit'allaqa hallch'ata ch'usaqchankuchá.",
+'undeletepagetext'             => "Kay {{PLURAL:$1|p'anqaqa|p'anqakunaqa}} qullusqam, ichataq hallch'apiraqmi kachkan, chayrayku paqarichiytam atinki. Mit'a-mit'allaqa hallch'ata ch'usaqchankuchá.",
 'undelete-fieldset-title'      => 'Musuqchasqakunata musuqmanta paqarichiy',
 'undeleteextrahelp'            => "Tukuy llamk'apusqakunata paqarichinaykipaqqa, mana imatapas akllaspa '''''Paqarichiy!''''' ñit'iy.
 Huklla llamk'apusqakunata paqarichinaykipaqqa, munasqayki llamk'apusqakunata akllaspa '''''Paqarichiy!''''' ñit'iy.
@@ -1567,12 +1853,13 @@ Huklla llamk'apusqakunata paqarichinaykipaqqa, munasqayki llamk'apusqakunata akl
 'undeletehistory'              => "Qullusqaña p'anqata paqarichiptiykiqa, tukuy llamk'apusqakunam paqarinqa wiñay kawsaypi. Kaqlla sutiyuq musuq p'anqaña kachkaptinqa, paqarichisqa llamk'apusqakunaqa chay musuq p'anqap wiñay kawsaypim, ñawpaq kaq llamk'apusqakuna hinam paqarinqa.",
 'undeleterevdel'               => "Qullusqaqa manam paqarichisqachu kanqa qhipaq llamk'apusqa rakilla qullusqa kaptinmanqa. Hinaptinqa, akllasqa nisqaykita qichuy icha lliwmanta aswan ñaqha qullusqa llamk'apusqakunata rikuchiy. Mana saqillasusqayki llamk'apusqakunaqa manam paqarichisqachu kanqa.",
 'undeletehistorynoadmin'       => "Kay qillqaqa qullusqam. Kay qatiq pisichaypim rikunki imarayku qullusqa karqan, qhipaq llamk'apuqkunamanta willasqakunatapas. Tukuy qillqantintaqa kamachiqkunallam ñawiriyta atin.",
-'undelete-revision'            => "$2-pi $1-pa llamk'apusqan, $3-pa qullusqan:",
+'undelete-revision'            => "$1-pa ($4 p'unchawpi, $5 pachapi) llamk'apusqan, $3-pa qullusqan:",
 'undeleterevision-missing'     => "Llamk'apusqaqa manam allinchu icha chinkasqam. Mana allin t'inkichá, icha llamk'apusqaqa hallch'amanta qullusqachá icha musuqmanta paqarichisqachá.",
 'undelete-nodiff'              => "Manam tarinichu ñawpaq llamk'apusqata.",
 'undeletebtn'                  => 'Paqarichiy!',
 'undeletelink'                 => 'paqarichiy',
 'undeletereset'                => 'Mana imapas',
+'undeleteinvert'               => "Akllasqata t'ikray",
 'undeletecomment'              => 'Imarayku paqarichisqa:',
 'undeletedarticle'             => 'qullurqasqa "$1" paqarisqa',
 'undeletedrevisions'           => "{{PLURAL:$1|Huk paqarichisqa llamk'apusqa|$1 paqarichisqa llamk'apusqakuna}}",
@@ -1604,26 +1891,27 @@ $1',
 'blanknamespace' => '(Uma)',
 
 # Contributions
-'contributions' => "Ruraqpa llamk'apusqankuna",
-'mycontris'     => "Llamk'apusqaykuna",
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Manam kay hina hukchasqakuna kanchu.',
-'uctop'         => ' (qhipaq hukchasqa)',
-'month'         => 'Kay killamanta (ñawpaqmantapas):',
-'year'          => 'Kay watamanta (ñawpaqmantapas):',
-
-'sp-contributions-newbies'     => "Musuq ruraqkunallap llamk'apusqankunata rikuchiy",
-'sp-contributions-newbies-sub' => 'Musuqkunapaq',
-'sp-contributions-blocklog'    => "Hark'ay hallch'asqakuna",
-'sp-contributions-search'      => "Llamk'apusqakunata maskay",
-'sp-contributions-username'    => 'IP huchha icha ruraqpa sutin:',
-'sp-contributions-submit'      => 'Maskay',
+'contributions'       => "Ruraqpa llamk'apusqankuna",
+'contributions-title' => "$1 sutiyuq ruraqpa llamk'apusqankuna",
+'mycontris'           => "Llamk'apusqaykuna",
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Manam kay hina hukchasqakuna kanchu.',
+'uctop'               => ' (qhipaq hukchasqa)',
+'month'               => 'Kay killamanta (ñawpaqmantapas):',
+'year'                => 'Kay watamanta (ñawpaqmantapas):',
+
+'sp-contributions-newbies'       => "Musuq ruraqkunallap llamk'apusqankunata rikuchiy",
+'sp-contributions-newbies-sub'   => 'Musuqkunapaq',
+'sp-contributions-newbies-title' => "Musuq ruraqkunap llamk'apusqankuna",
+'sp-contributions-blocklog'      => "Hark'ay hallch'asqakuna",
+'sp-contributions-search'        => "Llamk'apusqakunata maskay",
+'sp-contributions-username'      => 'IP huchha icha ruraqpa sutin:',
+'sp-contributions-submit'        => 'Maskay',
 
 # What links here
 'whatlinkshere'            => "Kayman t'inkimuq",
 'whatlinkshere-title'      => "$1 sutiyuq p'anqaman t'inkimuqkuna",
 'whatlinkshere-page'       => "P'anqa:",
-'linklistsub'              => "(T'inkikuna)",
 'linkshere'                => "'''[[:$1]]''' sutiyuq p'anqamanqa kay qatiq p'anqakunam t'inkimun:",
 'nolinkshere'              => "Manam kachkanchu '''[[:$1]]'''-man t'inkiq p'anqa.",
 'nolinkshere-ns'           => "Manam kachkanchu '''[[:$1]]'''-man t'inkiq p'anqa akllasqa suti k'itipi.",
@@ -1669,6 +1957,8 @@ Willariy imaraykum hark'anki (ahinataq: sapaq wandaluchasqa p'anqakunamanta will
 'ipbotherreason'                  => 'Huk imarayku:',
 'ipbhidename'                     => "Ruraqpa sutinta pakay hark'ay hallch'amanta, kunan hark'asqakunapi ruraqkunapipas",
 'ipbwatchuser'                    => "Kay ruraqpa p'anqanta rimachinantapas watiqay",
+'ipballowusertalk'                => "Kay ruraqta kikinpa rimanakuy p'anqanta hukchayta saqillay, hark'asqa kaptinpas",
+'ipb-change-block'                => "Ruraqta musuqmanta hark'ay kay allinchanakunata churaspa",
 'badipaddress'                    => 'IP huchhaqa manam allinchu.',
 'blockipsuccesssub'               => "Ruraqqa hark'asqañam",
 'blockipsuccesstext'              => "IP \"\$1\"-niyuq tiyayqa hark'asqañam. <br />[[Special:IPBlockList|Hark'asqakunamanta p'anqata]] qhaway hark'akunata hukchanaykipaq.",
@@ -1677,14 +1967,18 @@ Willariy imaraykum hark'anki (ahinataq: sapaq wandaluchasqa p'anqakunamanta will
 'ipb-unblock'                     => "Hark'asqa ruraqta icha IP huchhata qispichiy",
 'ipb-blocklist-addr'              => "Kachkaq hark'asqakuna, $1-paq",
 'ipb-blocklist'                   => "Kachkaq hark'asqakunata qhaway",
+'ipb-blocklist-contribs'          => "$1-paq llamk'apusqakuna",
 'unblockip'                       => "Hark'asqa ruraqta qispichiy",
 'unblockiptext'                   => "Kay qatiq hunt'ana p'anqata llamk'achiy ñawpaqta hark'asqa IP huchhaman icha ruraqman qillqana hayñinta kutichinapaq.",
-'ipusubmit'                       => "Kay hark'asqa tiyayta qispichiy",
+'ipusubmit'                       => "Kay hark'asqata qispichiy",
 'unblocked'                       => "Hark'asqa [[User:$1|$1]] qispisqañam",
 'unblocked-id'                    => "Hark'asqa $1-qa qispisqañam",
 'ipblocklist'                     => "Hark'asqa ruraqkuna IP tiyaykunapas",
 'ipblocklist-legend'              => "Hark'asqa ruraqta tariy",
 'ipblocklist-username'            => 'Ruraqpa sutin icha IP huchha:',
+'ipblocklist-sh-userblocks'       => "$1 rakiquna hark'asqakuna",
+'ipblocklist-sh-tempblocks'       => "$1 mit'alla hark'asqakuna",
+'ipblocklist-sh-addressblocks'    => "$1 sapaq IP-paq hark'asqakuna",
 'ipblocklist-submit'              => 'Maskay',
 'blocklistline'                   => "$1, $2 hark'an kay ruraqtam: $3 ($4)",
 'infiniteblock'                   => 'wiñaypaq',
@@ -1693,25 +1987,32 @@ Willariy imaraykum hark'anki (ahinataq: sapaq wandaluchasqa p'anqakunamanta will
 'noautoblockblock'                => "kikinmanta hark'ayqa ama kachunchu",
 'createaccountblock'              => "rakiqunata kichariyqa hark'asqam",
 'emailblock'                      => "hark'asqa e-chaski",
+'blocklist-nousertalk'            => "kikinpa rimanakuy p'anqanta manam hukchayta atinchu",
 'ipblocklist-empty'               => "Mana pipas hark'asqachu kachkan.",
 'ipblocklist-no-results'          => "Kay ruraqqa/IP huchhaqa manam hark'asqachu kachkan.",
 'blocklink'                       => "hark'ay",
 'unblocklink'                     => "hark'asqata qispichiy",
+'change-blocklink'                => "hark'ayta hukniraqchay",
 'contribslink'                    => "llamk'apusqakuna",
 'autoblocker'                     => 'Kikinmanta hark\'asqam kanki, "[[User:$1|$1]]" sutiyuq ruraq IP huchhaykita ñaqha llamk\'arquptinmi. Hark\'aqqa "[[User:$1|$1]]"-ta hark\'aspa kaytam nirqan, kayrayku: "$2".',
 'blocklogpage'                    => "Ruraq hark'asqakuna",
+'blocklog-fulllog'                => "Hunt'a hark'ay hallch'asqata rikuy",
 'blocklogentry'                   => "hark'an [[$1]]-ta kay pachakama: $2 $3",
+'reblock-logentry'                => "hukchan [[$1]]-paq hark'ana allinchanakunata kay pachakama hark'aspa: $2 $3",
 'blocklogtext'                    => "Kayqa ruraqta hark'asqakunap qispichisqakunappas hallch'anmi. Kikinmanta hark'asqa tiyaykunataqa manam kaypi rikunkichu. [[Special:IPBlockList|Hark'asqakunamanta p'anqata]] qhaway kunan hark'asqakunata rikunaykipaq.",
 'unblocklogentry'                 => 'paskan "$1"-ta hark\'asqa kaymanta',
 'block-log-flags-anononly'        => 'sutinnaqlla',
 'block-log-flags-nocreate'        => 'rakiquna kichariyman ama nisqa',
 'block-log-flags-noautoblock'     => "kikinmanta hark'ayman ama nisqa",
 'block-log-flags-noemail'         => 'e-chaskiman ama nisqa',
+'block-log-flags-nousertalk'      => "kikinpa rimanakuy p'anqanta manam hukchayta atinchu",
 'block-log-flags-angry-autoblock' => "ñawparikusqa kikinmanta hark'ayman arí nisqa",
 'range_block_disabled'            => "Kamachiqpa patayayku hark'ay hayñinman ama nisqam.",
 'ipb_expiry_invalid'              => 'Puchukana pachaqa manam allinchu.',
 'ipb_expiry_temp'                 => "Pakasqa ruraqpa sutin hark'aykunaqa tiyaqllam kachun.",
 'ipb_already_blocked'             => '"$1" sutiyuqqa hark\'asqañam kachkan.',
+'ipb-needreblock'                 => "== Hark'asqaña ==
+$1 sutiyuqqa hark'asqañam. Allinchanakunata hukchayta munankichu?",
 'ipb_cant_unblock'                => "'''Pantasqa''': Manam tarinichu ID $1 hark'ay huchhata. Qispisqañachá.",
 'ipb_blocked_as_range'            => "Pantasqa: IP $1 huchhaqa manam chiqallachu hark'asqa kaptinmi manam paskanallachu. Chaywanpas, $2 patayayku kaspataq hark'asqam kachkan. Chay patayaykuqa hark'asqamanta paskanallam.",
 'ip_range_invalid'                => "IP huchha k'itiqa manam chanichkanchu.",
@@ -1722,6 +2023,7 @@ Willariy imaraykum hark'anki (ahinataq: sapaq wandaluchasqa p'anqakunamanta will
 'proxyblocksuccess'               => 'Rurasqañam.',
 'sorbsreason'                     => 'IP huchhaykiqa kichasqa proxy nispa {{SITENAME}}pi DNSBL nisqapi qillqasqam.',
 'sorbs_create_account_reason'     => 'IP huchhaykiqa kichasqa proxy nispa {{SITENAME}}pi DNSBL nisqapi qillqasqam. Manam atinkichu rakiqunata kichayta',
+'cant-block-while-blocked'        => "Kikiyki hark'asqa kaspaykiqa, manam huk ruraqkunata hark'ayta atinkichu.",
 
 # Developer tools
 'lockdb'              => "Willañiqintinta hark'ay",
@@ -1742,9 +2044,9 @@ Willariy imaraykum hark'anki (ahinataq: sapaq wandaluchasqa p'anqakunamanta will
 'databasenotlocked'   => "Willañiqintinqa manam hark'asqachu.",
 
 # Move page
-'move-page'               => '$1-ta astay',
-'move-page-legend'        => "P'anqata astay",
-'movepagetext'            => "Kay hunt'ana p'anqawanqa huk p'anqam tukuy wiñay kawsasqanpas astasqa kanqa. Mawk'a sutinqa musuq sutiman pusapuq p'anqam tukunqa. Mawk'a sutiman t'inkimuq p'anqakunaqa manam hukyanqachu. Paqtataq iskaylla pusapuna p'anqakunata allinchallay. Ama panta t'inkimuqkunata saqiychu.
+'move-page'                    => '$1-ta astay',
+'move-page-legend'             => "P'anqata astay",
+'movepagetext'                 => "Kay hunt'ana p'anqawanqa huk p'anqam tukuy wiñay kawsasqanpas astasqa kanqa. Mawk'a sutinqa musuq sutiman pusapuq p'anqam tukunqa. Mawk'a sutiman t'inkimuq p'anqakunaqa manam hukyanqachu. Paqtataq iskaylla pusapuna p'anqakunata allinchallay. Ama panta t'inkimuqkunata saqiychu.
 
 
 Nisqayki musuq sutiyuq wiñay kawsasqayuq p'anqaña kachkaptinqa, kay p'anqa '''manam''' astasqa kanqachu.
@@ -1754,48 +2056,61 @@ Huklla kuti astasqa p'anqataqa mawk'a sutinman astayta atinkim, manataq huk mawk
 <b>PAQTATAQ!</b>
 Kay astayqa ancha riqsisqa p'anqata hatun mana suyapusqa hukchaymi kayta atinman;
 ama hina kaspa, yuyarillay imachus kay astanaykita saqispa tukunata atinman.",
-'movepagetalktext'        => "P'anqaman kapuq rimachina p'anqaqa - kachkaspaqa - kikinmanta astasqam kanqa. '''Manallam astasqachu kanqa,'''
+'movepagetalktext'             => "P'anqaman kapuq rimachina p'anqaqa - kachkaspaqa - kikinmanta astasqam kanqa. '''Manallam astasqachu kanqa,'''
 *p'anqa huk suti huñumanta huk suti huñuman astasqa kachkaptinqa;
 *huk wiñay kawsasqayuq musuq sutiyuq rimachina p'anqa kachkaptinqa;
 *\"Rimachinapas, atikuq hinaptin\" nisqa akllanaman ama niptiykiqa.
 
 Hinaptinqa, kay rimachina p'anqap samiqninta makiykiwan astanaykim tiyanqa.",
-'movearticle'             => "P'anqata astay",
-'movenotallowed'          => "Manam saqillasunkichu p'anqata astayta.",
-'newtitle'                => 'Kay musuq sutiman',
-'move-watch'              => "Kay p'anqata watiqay",
-'movepagebtn'             => "P'anqata astay",
-'pagemovedsub'            => "P'anqaqa astasqañam",
-'movepage-moved'          => "<big>'''\"\$1\" sutiyuq p'anqaqa kaymanmi astasqa: \"\$2\".'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "Kay sutiyuq p'anqaqa kachkanñam icha akllasqayki sutiqa manam allinchu. Ama hina kaspa, huk sutita akllay.",
-'cantmove-titleprotected' => "Manam atinkichu p'anqata kayman astamuyta, musuq p'anqa suti kamarinamanta hark'asqa kaptinmi",
-'talkexists'              => "P'anqaqa astasqañam, manataq rimanakuy p'anqachu, musuq sutiyuq rimanakuy p'anqa kachkaptinñam. Ama hina kaspa, makillaykiwan samiqninkuta huñuy.",
-'movedto'                 => 'kayman astasqa:',
-'movetalk'                => 'Rimachinapas, atikuq hinaptin.',
-'move-subpages'           => "Tukuy urin p'anqakunata astay, astanalla kaptinqa",
-'move-talk-subpages'      => "Tukuy urin rimanakuy p'anqakunata astay, astanalla kaptinqa",
-'movepage-page-exists'    => "$1 sutiyuq p'anqaqa kachkanñam, manam kikinmanta huknachanallachu.",
-'movepage-page-moved'     => "$1 sutiyuq p'anqaqa $2 sutiman astasqañam.",
-'movepage-page-unmoved'   => "Manam atinichu $1 sutiyuq p'anqata $2 sutiman astayta.",
-'movepage-max-pages'      => "$1 {{PLURAL:$1|p'anqa|p'anqakuna}} astasqañam, kikinmanta manam aswan astasqa kanqachu.",
-'1movedto2'               => '«[[$1]]» «[[$2]]»-man astasqa',
-'1movedto2_redir'         => '[[$1]] [[$2]]-man astasqa pusana qillqata huknachaspa',
-'movelogpage'             => "Astay hallch'asqa",
-'movelogpagetext'         => "Kay qatiqpiqa astasqa p'anqakunam.",
-'movereason'              => 'Imarayku astasqa',
-'revertmove'              => 'kutichiy',
-'delete_and_move'         => 'Qulluspa astay',
-'delete_and_move_text'    => '==Qullunam tiyan==
+'movearticle'                  => "P'anqata astay",
+'movenologin'                  => "Manam qallarisqachu llamk'apuy tiyayniyki",
+'movenologintext'              => "P'anqata astanaykipaqqa hallch'asqa ruraqmi kanayki [[Special:UserLogin|llamk'apuy tiyay qallarinaykipas]] tiyan.",
+'movenotallowed'               => "Manam saqillasunkichu p'anqata astayta.",
+'movenotallowedfile'           => 'Manam atinkichu willañiqikunata astayta.',
+'cant-move-user-page'          => "Ruraqpa p'anqankunataqa manam astayta atinkichu (urin p'anqakunallatam).",
+'cant-move-to-user-page'       => "Ruraqpa p'anqanmanqa manam astayta atinkichu (urin p'anqallamanmi).",
+'newtitle'                     => 'Kay musuq sutiman',
+'move-watch'                   => "Kay p'anqata watiqay",
+'movepagebtn'                  => "P'anqata astay",
+'pagemovedsub'                 => "P'anqaqa astasqañam",
+'movepage-moved'               => "<big>'''\"\$1\" sutiyuq p'anqaqa kaymanmi astasqa: \"\$2\".'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Pusapunam kamarisqaña.',
+'movepage-moved-noredirect'    => "Pusapuna kamariyqa hark'asqam.",
+'articleexists'                => "Kay sutiyuq p'anqaqa kachkanñam icha akllasqayki sutiqa manam allinchu. Ama hina kaspa, huk sutita akllay.",
+'cantmove-titleprotected'      => "Manam atinkichu p'anqata kayman astamuyta, musuq p'anqa suti kamarinamanta hark'asqa kaptinmi",
+'talkexists'                   => "P'anqaqa astasqañam, manataq rimanakuy p'anqachu, musuq sutiyuq rimanakuy p'anqa kachkaptinñam. Ama hina kaspa, makillaykiwan samiqninkuta huñuy.",
+'movedto'                      => 'kayman astasqa:',
+'movetalk'                     => 'Rimachinapas, atikuq hinaptin.',
+'move-subpages'                => "Tukuy urin p'anqakunata astay, astanalla kaptinqa",
+'move-talk-subpages'           => "Tukuy urin rimanakuy p'anqakunata astay, astanalla kaptinqa",
+'movepage-page-exists'         => "$1 sutiyuq p'anqaqa kachkanñam, manam kikinmanta huknachanallachu.",
+'movepage-page-moved'          => "$1 sutiyuq p'anqaqa $2 sutiman astasqañam.",
+'movepage-page-unmoved'        => "Manam atinichu $1 sutiyuq p'anqata $2 sutiman astayta.",
+'movepage-max-pages'           => "$1 {{PLURAL:$1|p'anqa|p'anqakuna}} astasqañam, kikinmanta manam aswan astasqa kanqachu.",
+'1movedto2'                    => '«[[$1]]» «[[$2]]»-man astasqa',
+'1movedto2_redir'              => '[[$1]] [[$2]]-man astasqa pusana qillqata huknachaspa',
+'move-redirect-suppressed'     => "pusapunaqa hark'asqam",
+'movelogpage'                  => "Astay hallch'asqa",
+'movelogpagetext'              => "Kay qatiqpiqa astasqa p'anqakunam.",
+'movereason'                   => 'Imarayku astasqa',
+'revertmove'                   => 'kutichiy',
+'delete_and_move'              => 'Qulluspa astay',
+'delete_and_move_text'         => '==Qullunam tiyan==
 
 Tukuna p\'anqaqa ("[[:$1]]") kachkañam. Astanapaq qulluyta munankichu?',
-'delete_and_move_confirm' => "Arí, kay p'anqata qulluy",
-'delete_and_move_reason'  => 'Astanapaq qullusqa',
-'selfmove'                => "Qallarinawan taripana sutikunaqa kaqllam kachkan. Manam atinchu p'anqata kikinman astay.",
-'immobile_namespace'      => "Qallarina icha taripana sutiqa sapaq layam. Manam atinchu p'anqata chayman astay.",
-'imagenocrossnamespace'   => "Manam atinichu p'anqata astayta mana willañiqipaq suti k'itiman",
-'imagetypemismatch'       => "Willañiqip musuq mast'arinanqa kay layapaq manam allinchu",
-'imageinvalidfilename'    => 'Taripana willañiqip sutinqa manam allinchu',
-'fix-double-redirects'    => 'Qallariy sutiman astamuq tukuy pusapunakunata musuqchay',
+'delete_and_move_confirm'      => "Arí, kay p'anqata qulluy",
+'delete_and_move_reason'       => 'Astanapaq qullusqa',
+'selfmove'                     => "Qallarinawan taripana sutikunaqa kaqllam kachkan. Manam atinchu p'anqata kikinman astay.",
+'immobile-source-namespace'    => "Manam atinichu «$1» suti k'itipi p'anqakunata astayta",
+'immobile-target-namespace'    => "Manam atinichu p'anqakunata «$1» suti k'itiman astayta",
+'immobile-target-namespace-iw' => "Wikipura t'inkiqa p'anqa astanapaq manam allin taripanachu.",
+'immobile-source-page'         => "Kay p'anqaqa manam astanallachu.",
+'immobile-target-page'         => 'Manam atinichu chay taripana sutiman astayta.',
+'imagenocrossnamespace'        => "Manam atinichu p'anqata astayta mana willañiqipaq suti k'itiman",
+'imagetypemismatch'            => "Willañiqip musuq mast'arinanqa kay layapaq manam allinchu",
+'imageinvalidfilename'         => 'Taripana willañiqip sutinqa manam allinchu',
+'fix-double-redirects'         => 'Qallariy sutiman astamuq tukuy pusapunakunata musuqchay',
+'move-leave-redirect'          => 'Pusapunata qhipaqpi saqispa puchuchiy',
 
 # Export
 'export'            => "P'anqakunata hawaman quy",
@@ -1803,7 +2118,7 @@ Tukuna p\'anqaqa ("[[:$1]]") kachkañam. Astanapaq qulluyta munankichu?',
 
 P'anqakunata hawaman qunaykipaqqa, sutinkunata kay qatiqppi qillqana k'itichaman qillqay, sapa siq'ipi huk suti, akllaspa kunan p'anqata wiñay kawsaynintapas munankichu ichataq kunan p'anqatallachu qhipaq hukchasqallamanta willayllawan.
 
-Qhipaqta munaspaykiqa, t'inkitapas llamk'achiyta atinki, ahinataq [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]], \"[[{{MediaWiki:Mainpage}}]]\" p'anqapaq.",
+Qhipaqta munaspaykiqa, t'inkitapas llamk'achiyta atinki, ahinataq [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]], \"[[{{MediaWiki:Mainpage}}]]\" p'anqapaq.",
 'exportcuronly'     => "Kunan llamk'apusqatam ch'aqtay, manataqmi wiñay kawsaynintinchu.",
 'exportnohistory'   => "----
 '''Musyay:''' Wiñay kawsaynintinta kay hunt'ana p'anqawan hawan quymanqa ama nisqam, sirwiq mana atiptinmi.",
@@ -1838,9 +2153,12 @@ Qhipaqta munaspaykiqa, t'inkitapas llamk'achiyta atinki, ahinataq [[{{ns:special
 'import-interwiki-text'      => "Huk wikita p'anqap sutintapas akllay hawamanta chaskinapaq.
 Llamk'apusqap pachankunaqa ruraqpa sutinkunapas kakuspa hallch'asqam kanqa.
 Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hallch'api]] hallch'asqam kanqa.",
+'import-interwiki-source'    => "Qallariy wiki icha p'anqa:",
 'import-interwiki-history'   => "Kay p'anqapaq tukuy wiñay kawsaynintinta iskaychay",
 'import-interwiki-submit'    => 'Hawamanta chaskiy',
 'import-interwiki-namespace' => "Kay suti k'itiman churay:",
+'import-upload-filename'     => 'Willañiqip sutin:',
+'import-comment'             => 'Willayniyki:',
 'importtext'                 => "Ama hina kaspa, willañiqita qallariy wikimanta [[Special:Export|hawaman quna llamk'anawan]] hawaman quy antañiqiqniykipi waqaychaspa, chaymantataq kaypi churkuy.",
 'importstart'                => "P'anqakunatam hawamanta chaskichkani...",
 'import-revision-count'      => "$1 {{PLURAL:$1|llamk'apusqa|llamk'apusqakuna}}",
@@ -1874,19 +2192,19 @@ Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hall
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|hukchasqa|hukchasqakuna}} $2-manta',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "Ñuqap ruraqpa p'anqay",
+'tooltip-pt-userpage'             => "Qampa ruraqpa p'anqayki",
 'tooltip-pt-anonuserpage'         => "IP huchhaykipaq ruraqpa p'anqan",
-'tooltip-pt-mytalk'               => "Rimanakuy p'anqay",
+'tooltip-pt-mytalk'               => "Rimanakuy p'anqayki",
 'tooltip-pt-anontalk'             => "Kay IP huchhamanta llamk'apusqakuna hawa rimanakuy",
 'tooltip-pt-preferences'          => 'Allinkachinaykuna',
 'tooltip-pt-watchlist'            => "Ruraqpa hukchasqakunakama watiqasqan p'anqakuna",
-'tooltip-pt-mycontris'            => "Llamk'apusqaykuna",
+'tooltip-pt-mycontris'            => "Llamk'apusqaykikuna",
 'tooltip-pt-login'                => 'Kallpachaykiku yaykunaykiqa allinmi nispa, mana manu kanayki kaptinpas',
 'tooltip-pt-anonlogin'            => 'Kallpachaykiku yaykunaykiqa allinmi nispa, mana manu kanayki kaptinpas',
 'tooltip-pt-logout'               => "Llamk'apuy tiyaymanta lluqsiy",
 'tooltip-ca-talk'                 => "Qillqasqap samiqninmanta rimanakuna p'anqa",
 'tooltip-ca-edit'                 => "Kay p'anqata llamk'apuytam atinki. Ama hina kaspa, manaraq waqaychaspa ñawpaqta qhawarillay.",
-'tooltip-ca-addsection'           => 'Kay rimanakuyman willayniykita yapay.',
+'tooltip-ca-addsection'           => 'Musuq rakita qallariy',
 'tooltip-ca-viewsource'           => "Kay p'anqaqa amachasqam. Qallariy qillqataqa qhawallaytam atinki, mana hukchaspa.",
 'tooltip-ca-history'              => "Kay p'anqapaq ñawpaq llamk'apusqakuna llamk'apuqkunapas",
 'tooltip-ca-protect'              => "Kay p'anqata amachay",
@@ -1933,6 +2251,8 @@ Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hall
 'tooltip-watch'                   => "Kay p'anqata watiqay",
 'tooltip-recreate'                => "Kay p'anqata musuqmanta kamariy, qullusqa kaptinpas",
 'tooltip-upload'                  => 'Churkuyta qallariy',
+'tooltip-rollback'                => "\"Kutichina\" nisqapi ñit'ispaykiqa huk ruraqpa tukuy qhipaq llamk'apusqankunatam huklla ñit'iyniykiwan kutichinki.",
+'tooltip-undo'                    => "\"Kutichiy\" nisqapi ñit'ispaykiqa kay llamk'apusqatam kutichinki, p'anqata ñawpaqta qhawaspa llamk'anapaq kichaspa. Pisichaypi imarayku niyta atinki.",
 
 # Stylesheets
 'common.css'   => "/* Churamusqa CSS chantakunaqa tukuy qarakunapim llamk'anqa */",
@@ -1948,12 +2268,12 @@ Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hall
 'notacceptable'     => "Wiki sirwiqqa manam willakunata quyta atinchu mink'akuqniykip (wamp'unaykip) hap'iyta atisqan chantapi.",
 
 # Attribution
-'anonymous'        => '{{SITENAME}}pi sutinnaq ruraqkuna',
+'anonymous'        => '{{SITENAME}}pi sutinnaq {{PLURAL:$1|ruraq|ruraqkuna}}',
 'siteuser'         => '{{SITENAME}}-pa $1 sutiyuq ruraqnin',
 'lastmodifiedatby' => "Kay p'anqaqa $2, $1 qhipaq kutitam $3-pa hukchasqan karqan.", # $1 date, $2 time, $3 user
 'othercontribs'    => '$1-pa rurasqanmanta paqariq.',
 'others'           => 'hukkuna',
-'siteusers'        => '{{SITENAME}}-pa $1 sutiyuq ruraqnin(kuna)',
+'siteusers'        => '{{SITENAME}}-pa $1 sutiyuq {{PLURAL:$2|ruraqnin|ruraqninkuna}}',
 'creditspage'      => "P'anqap manuyninkuna",
 'nocredits'        => "Manam ima willasqapas kay p'anqap manuyninkunamantachu.",
 
@@ -1993,10 +2313,12 @@ Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hall
 'markedaspatrollederror-noautopatrol' => "Manam saqillasunkichu qampa llamk'apusqaykikunata qhawakipasqaman sananchayta.",
 
 # Patrol log
-'patrol-log-page'   => "Qhawakipay hallch'a",
-'patrol-log-header' => "Kayqa patrullasqa musuqchasqakunamanta hallch'asqam.",
-'patrol-log-line'   => '$1 sananchasqa $2-manta qhawakipasqa $3',
-'patrol-log-auto'   => '(kikinmanta)',
+'patrol-log-page'      => "Qhawakipay hallch'a",
+'patrol-log-header'    => "Kayqa patrullasqa musuqchasqakunamanta hallch'asqam.",
+'patrol-log-line'      => '$1 sananchasqa $2-manta qhawakipasqa $3',
+'patrol-log-auto'      => '(kikinmanta)',
+'patrol-log-diff'      => 'musuqchasqa $1',
+'log-show-hide-patrol' => "$1 patrullay hallch'a",
 
 # Image deletion
 'deletedrevision'                 => "Qullusqam mawk'a qhawakipasqa $1",
@@ -2013,6 +2335,9 @@ $1",
 'previousdiff' => "� ñawpaq llamk'apusqa",
 'nextdiff'     => "Qatiq llamk'apusqa →",
 
+# Visual comparison
+'visual-comparison' => 'Rikuspa tupanachiy',
+
 # Media information
 'mediawarning'         => "'''Paqtataq''': Kay willañiqiqa millay wakichi qillqayuqchá, payta rurachiyqa antañiqiqniykita llikaykitapas waqllinqachá.<hr />",
 'imagemaxsize'         => "Willana p'anqakunapi rikchakunata kaykama saywachay:",
@@ -2025,10 +2350,12 @@ $1",
 'show-big-image'       => 'Qallariy huyaku',
 'show-big-image-thumb' => '<small>Kay ñawpaq qhawariypa chhikan kaynin: $1 × $2 iñu</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Musuq rikchakunap suyu-suyun',
 'imagelisttext'         => "Kay qatiqpiqa '''$1''' {{PLURAL:$1|rikchatam|rikchakunatam}} rikunki, $2-kama ñiqichasqa.",
 'newimages-summary'     => "Kay sapaq p'anqapiqa ñaqha churkusqa willañiqikunatam rikunki.",
+'newimages-legend'      => 'Suysuna',
+'newimages-label'       => 'Willañiqip sutin (icha sutinpa rakin):',
 'showhidebots'          => '($1 rurana antacha)',
 'noimages'              => 'Manam ima rikunallapas kanchu.',
 'ilsubmit'              => 'Maskay',
@@ -2232,6 +2559,18 @@ Kikin siq'ipi ima qatiq t'inkillapas sapaqllatam hamut'arisqa, ahinataq siq'ipi
 'exif-lightsource-24'  => 'ISO istudyu wolframyu',
 'exif-lightsource-255' => "Huk k'anchay pukyu",
 
+# Flash modes
+'exif-flash-fired-0'    => 'Manam pinchi illaparqanchu',
+'exif-flash-fired-1'    => 'Pinchi illaparqanmi',
+'exif-flash-return-0'   => 'llukchipayay musyanaqa ama kachunchu',
+'exif-flash-return-2'   => "llukchipayay k'anchanaqa manam tarisqachu",
+'exif-flash-return-3'   => "llukchipayay k'anchanaqa tarisqam",
+'exif-flash-mode-1'     => 'pinchi illapanam atin',
+'exif-flash-mode-2'     => 'pinchi illapana manam kachunchu',
+'exif-flash-mode-3'     => 'kikinmanta',
+'exif-flash-function-1' => 'Manam pinchi illapanachu',
+'exif-flash-redeye-1'   => 'puka ñawi pakana',
+
 'exif-focalplaneresolutionunit-2' => 'inch',
 
 'exif-sensingmethod-1' => "Mana ch'uyanchasqa",
@@ -2371,21 +2710,10 @@ $1
 Ama hina kaspa, chiqapta kay p'anqatam musuqmanta kamayta munani nispa takyachiy.",
 'recreate'            => 'Musuqta paqarichiy',
 
-# HTML dump
-'redirectingto' => '[[:$1]]-man pusapuspa...',
-
 # action=purge
-'confirm_purge'        => "Kay p'anqap ''cache'' nisqa pakasqa hallch'an ch'usaqchasqa kachunchu?
-
-$1",
 'confirm_purge_button' => 'Arí niy',
-
-# AJAX search
-'searchcontaining' => "''$1'' nisqa samiqniyuq p'anqakunata maskay.",
-'searchnamed'      => "''$1'' sutiyuq p'anqakunata maskay.",
-'articletitles'    => "''$1'' nisqawan qallariq p'anqakunata maskay",
-'hideresults'      => 'Lluqsiykunata pakay',
-'useajaxsearch'    => 'AJAX nisqawan maskay',
+'confirm-purge-top'    => "Kay p'anqap ''cache'' nisqa pakasqa hallch'an ch'usaqchasqa kachunchu?",
+'confirm-purge-bottom' => "P'anqa pichayqa pakasqa hallch'atam ch'usaqchan, qayna musuqchasqatataqmi rikch'achin.",
 
 # Multipage image navigation
 'imgmultipageprev' => "� ñawpaq p'anqa",
@@ -2405,10 +2733,10 @@ $1",
 'table_pager_empty'        => 'Manam ima taripasqapas kanchu',
 
 # Auto-summaries
-'autosumm-blank'   => "P'anqata tukuy samiqninmanta ch'usaqchasqa",
+'autosumm-blank'   => "P'anqata ch'usaqchasqa",
 'autosumm-replace' => "P'anqap tukuy samiqnin '$1'-wan huknachasqa",
 'autoredircomment' => '[[$1]]-man pusapusqa',
-'autosumm-new'     => "Musuq p'anqa: $1",
+'autosumm-new'     => "Musuq p'anqa kamarisqa kaywan: $1",
 
 # Live preview
 'livepreview-loading' => 'Chaqnamuspa…',
@@ -2446,6 +2774,7 @@ Sapsilla ñawpaq qhawariyta tukuykachay.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Mana riqsisqa "$1" mast\'arina k\'askana',
+'duplicate-defaultsort' => 'Paqtataq: Kikinmanta allinchana llawi «$2» ñawpaq kikinmanta allinchana llawitam «$1» huknachan.',
 
 # Special:Version
 'version'                          => 'Musuqchasqa', # Not used as normal message but as header for the special page itself
@@ -2475,13 +2804,13 @@ Sapsilla ñawpaq qhawariyta tukuykachay.',
 'filepath-summary' => "Kay sapaq p'anqaqa willañiqipaq tukuy ñannintam kutichin.
 Rikchakunatataq hunt'a ch'irkukupim rikunki. Huk willañiqi llayakunaqa tantapusqa wakichiwanmi chiqalla kicharikun.
 
-Willañiqi sutita yaykuchispaqa ama \"{{ns:image}}:\" ñawpaq k'askaqta qillqamuychu.",
+Willañiqi sutita yaykuchispaqa ama \"{{ns:file}}:\" ñawpaq k'askaqta qillqamuychu.",
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Iskaychasqa willañiqikunata maskay',
 'fileduplicatesearch-summary'  => "Iskaychasqa willañiqikunata maskay ''hash'' chaninpi tiksispa.
 
-Mana “{{ns:image}}:� k'askaqniyuq willañiqip sutinta yaykuchiy.",
+Mana “{{ns:file}}:� k'askaqniyuq willañiqip sutinta yaykuchiy.",
 'fileduplicatesearch-legend'   => 'Iskaychasqata maskay',
 'fileduplicatesearch-filename' => 'Willañiqip sutin:',
 'fileduplicatesearch-submit'   => 'Maskay',
@@ -2511,4 +2840,13 @@ Mana “{{ns:image}}:� k'askaqniyuq willañiqip sutinta yaykuchiy.",
 'blankpage'              => "Ch'usaq p'anqa",
 'intentionallyblankpage' => "Kay p'anqaqa munaylla ch'usaqmi kachun",
 
+# External image whitelist
+'external_image_whitelist' => " #Kay sinruta kay hinallatam saqiy<pre>
+#Ñiqilla hawanchana rakikunata churay (// nisqapura rakitam) urapi
+#Kaykunaqa hawa (q'uñilla t'inkisqa) rikchakunap URL tiyayninkunawanmi taripanachisqa kanqa
+#Taripasqakunaqa rikcha hinam rikurinqa, hukkunapaqtaq rikchaman t'inkillam rikurinqa
+#«#» nisqawan qallariq sinrukunaqa willapuy hinam llamk'apusqa kanqa
+
+#Tukuy regex rakikunata kay siq'ip hananman churay. Kay sinruta kay hinallatam saqiy</pre>",
+
 );
diff --git a/languages/messages/MessagesRif.php b/languages/messages/MessagesRif.php
index a615d512..d9ba614e 100644
--- a/languages/messages/MessagesRif.php
+++ b/languages/messages/MessagesRif.php
@@ -103,8 +103,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Xef {{SITENAME}}',
 'aboutpage'            => 'Project:Xef',
-'bugreports'           => 'ina-neɣ x ca n (Bug)',
-'bugreportspage'       => 'Project:ina-neɣ x ca n (Bug)',
 'copyrightpage'        => '{{ns:project}}:izrefan ussenɣel',
 'currentevents'        => 'Mayn itemsaren rux',
 'currentevents-url'    => 'Project:mayn itmesaren ruxa',
@@ -112,7 +110,7 @@ $messages = array(
 'disclaimerpage'       => 'Project:Asmigl n umatu',
 'edithelp'             => 'Tallalt deg uẓareg',
 'edithelppage'         => 'Help:Aẓareg',
-'helppage'             => 'Help:Contents',
+'helppage'             => 'Help:tallalt',
 'mainpage'             => 'Tasna Tamzwarut',
 'mainpage-description' => 'Tasna Tamzwarut',
 'portal'               => 'Tawwart n timetti',
@@ -192,6 +190,9 @@ adeff-d xmi ɣa teṭfed.',
 'eauthentsent'            => 'ijj n e-mail itwasekked ɣar e-mail nni.
 zzat ma ca n e-mail nni�en ma ad itwasekk ɣar umi�an , ixessa ad tegged manayenni di e-mail, bac ad nessen ila qa ami�an a inec.',
 
+# Password reset dialog
+'retypenew' => '�awd arri Taguri n wadaf tamaynut:',
+
 # Edit page toolbar
 'bold_sample'     => 'Tirra tizurarin',
 'bold_tip'        => 'Tirra tizurarin',
@@ -213,8 +214,8 @@ zzat ma ca n e-mail nni�en ma ad itwasekk ɣar umi�an , ixessa ad tegged man
 'hr_tip'          => 'Acari� aglawan',
 
 # Edit pages
-'summary'                => 'Tag�wit',
-'subject'                => 'Subject/headline',
+'summary'                => 'Tag�wit:',
+'subject'                => 'Subject/headline:',
 'minoredit'              => 'Ta d taẓrigt d-tamẓeyant',
 'watchthis'              => 'Ẓar Tasna ya',
 'savearticle'            => 'Ḥa� Tasna',
@@ -223,7 +224,7 @@ zzat ma ca n e-mail nni�en ma ad itwasekk ɣar umi�an , ixessa ad tegged man
 'showdiff'               => 'Ẓar mayn teẓṛegd.',
 'anoneditwarning'        => "'''É£ark:''' war tudifd ca s isem inec.
 Tansa n IP inac ad-teqqim deg umezruy n teẓṛigin n Tasna ya .",
-'summary-preview'        => 'Azar-ascan n Teg�wit',
+'summary-preview'        => 'Azar-ascan n Teg�wit:',
 'blockedtext'            => "<big>'''Isem useqdac niɣ tansa IP inecc tewabluca  .'''</big>
 
 iblocat  $1.
@@ -242,18 +243,18 @@ maṛṛa manaya deg ujenna eggit di tabrat i ɣ-ad tsekked.",
 bac ad tegged , arri di taflwit a swadday (xemm i [[{{MediaWiki:Helppage}}| Tasna n Tallalt]] i ineɣmisen ifruryen).
 mala qacek da s ɣalaṭ waha, tecca di tbutunt n '''deffar''' di (browser) inec .",
 'noarticletext'          => 'walu tirra di Tasna ya , tzemred [[Special:Search/{{PAGENAME}}|a tarzud isem n Tasna ya]] di Tasniwin nni�n niɣ [{{fullurl:{{FULLPAGENAME}}|action=edit}} egg Tasna ya cek].',
-'previewnote'            => '<strong>Wa d Azar-ascan waha;
-tiẓṛigin εad war twaḥ�ent!</strong>',
+'previewnote'            => "'''Wa d Azar-ascan waha;
+tiẓṛigin εad war twaḥ�ent!'''",
 'editing'                => 'Aẓṛag di $1',
 'editingsection'         => 'Aẓrag  di $1 (tigezmi)',
-'copyrightwarning'       => 'Maṛṛa tirra di {{SITENAME}} twaggent swadday i $2 (ẓar da $1).
+'copyrightwarning'       => "Maṛṛa tirra di {{SITENAME}} twaggent swadday i $2 (ẓar da $1).
 mala war texsed tirra inac ad twaẓṛegent , ad twamseb�ant .
 Ur ten-teg ca da.<br />
 tjadjid-anɣ �awt ila qa d cekk ig yuran manaya, niɣ tesneɣlet-id zi ca n uɣbal nni�n d alelli.
-<strong>UR SADDAF CA TIRRA ƔARSENT COPYRIGHTE BLA MA AD-IXES BAB-INES !</strong>',
-'longpagewarning'        => '<strong>WARNING: Tasna ya dag-s $1 kilobyte ;
+'''UR SADDAF CA TIRRA ƔARSENT COPYRIGHTE BLA MA AD-IXES BAB-INES !'''",
+'longpagewarning'        => "'''WARNING: Tasna ya dag-s $1 kilobyte ;
 ca n imsuṭṭuyen(browsers) war zemren ca ad ẓṛegen tasniwin dag-sent 32 kb niɣ ktar.
-ixessa ad ten teb�id ɣar tigezmin(sections) d timeẓyanin.</strong>',
+ixessa ad ten teb�id ɣar tigezmin(sections) d timeẓyanin.'''",
 'templatesused'          => 'Timudmiwin itwaggen di Tasna ya:',
 'templatesusedpreview'   => 'Timudmiwin igg itwasxdemen dg uzar-ascan a :',
 'template-protected'     => '(twaḥ�a)',
@@ -265,22 +266,23 @@ tzemred addewred ɣar deffar, niɣ [[Special:UserLogin|Adeff niɣ egg ami�an]]
 Ẓar aɣmis n umzruy n usfad n Tasna ya bac ad tsenad ma mliḥ ad tkemled aẓṛag.",
 
 # History pages
-'viewpagelogs'        => 'Ẓar aɣmis n Tasna ya',
-'currentrev'          => 'Afegged n ruxa',
-'revisionasof'        => 'Affegged am $1',
-'revision-info'       => 'Afegged am $1 s $2',
-'previousrevision'    => '�Affegged n zik/zic',
-'nextrevision'        => 'Afegged d amaynu→',
-'currentrevisionlink' => 'Afegged n rux',
-'cur'                 => 'N ruxa',
-'last'                => 'anggaru',
-'page_first'          => 'amzwaru',
-'page_last'           => 'anggaru',
-'histlegend'          => 'imṣeb�iyen: Sti(ixter) tibuttonin a ɣar wadday n tunɣilin n Tasna bac ad tsmzazal(compare).<br />
+'viewpagelogs'           => 'Ẓar aɣmis n Tasna ya',
+'currentrev'             => 'Afegged n ruxa',
+'revisionasof'           => 'Affegged am $1',
+'revision-info'          => 'Afegged am $1 s $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Affegged n zik/zic',
+'nextrevision'           => 'Afegged d amaynu→',
+'currentrevisionlink'    => 'Afegged n rux',
+'cur'                    => 'N ruxa',
+'last'                   => 'anggaru',
+'page_first'             => 'amzwaru',
+'page_last'              => 'anggaru',
+'histlegend'             => 'imṣeb�iyen: Sti(ixter) tibuttonin a ɣar wadday n tunɣilin n Tasna bac ad tsmzazal(compare).<br />
 Tasarut: (cur) = imṣeb�iyen ag tunɣilt n ruxa,
 (last) = imṣeb�iyen ag tunɣilt n zik, M = taẓrigt d-tamẓeyant.',
-'histfirst'           => 'Amzwaru qaε',
-'histlast'            => 'Anggaru qaε',
+'history-fieldset-title' => 'Amezruy',
+'histfirst'              => 'Amzwaru qaε',
+'histlast'               => 'Anggaru qaε',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 ɣar $2', # user at time
@@ -305,7 +307,6 @@ tzemred ad [[:\$1|tarnid cek]].",
 # Preferences page
 'preferences'       => 'Isemyifiyen',
 'mypreferences'     => 'Isemyifiyen inu',
-'retypenew'         => '�awd arri Taguri n wadaf tamaynut:',
 'searchresultshead' => 'Tarzzut',
 
 # Groups
@@ -354,10 +355,10 @@ Tasniwin di [[Special:Watchlist|Tabdart uḥṭṭu inec]] d '''tizurarin'''.",
 'uploadedimage'     => 'itwazdem-d "[[$1]]"',
 'watchthisupload'   => 'Xm tasbtirt a',
 
-# Special:ImageList
-'imagelist' => 'Tabdart n ifayluten',
+# Special:ListFiles
+'listfiles' => 'Tabdart n ifayluten',
 
-# Image description page
+# File description page
 'filehist'                  => 'Amzruy n ufaylu',
 'filehist-help'             => 'Tka di date/time bac ad tẓerd afaylu mamec ja d-itban di Lwaqt a .',
 'filehist-deleteone'        => 'sfa�',
@@ -372,7 +373,7 @@ Tasniwin di [[Special:Watchlist|Tabdart uḥṭṭu inec]] d '''tizurarin'''.",
 'nolinkstoimage'            => 'war telli ca n Tasna teqqen-d ɣa ufaylu ya.',
 'sharedupload'              => 'Wa d ijj ufaylu itwacrec jar aá¹­á¹­as n isenfaren(projects).',
 'noimage'                   => 'war illi ca n ufaylu s isem a , tzemred ad $1.',
-'noimage-linktext'          => 'Zdem-it-id',
+'noimage-linktext'          => 'Zdem d ijj',
 'uploadnewversion-linktext' => 'Zdem-d tunɣilt d-tamaynut n ufaylu a',
 
 # File deletion
@@ -438,6 +439,8 @@ Tasniwin di [[Special:Watchlist|Tabdart uḥṭṭu inec]] d '''tizurarin'''.",
 'ancientpages'            => 'Tasniwin n zik qqaε',
 'move'                    => 'Snaql',
 'movethispage'            => 'snaql Tasna ya',
+'pager-newer-n'           => '{{PLURAL:$1|amynu 1|amynu $1}}',
+'pager-older-n'           => '{{PLURAL:$1|aqbur 1|aqbur $1}}',
 
 # Book sources
 'booksources'    => 'iɣbalen n udlis',
@@ -448,7 +451,6 @@ Tasniwin di [[Special:Watchlist|Tabdart uḥṭṭu inec]] d '''tizurarin'''.",
 'speciallogtitlelabel' => 'isem:',
 'log'                  => 'AÉ£mis',
 'all-logs-page'        => 'Maṛṛa iɣmisen',
-'log-search-submit'    => 'Raḥ ɣa',
 
 # Special:AllPages
 'allpages'       => 'Maṛṛa Tasniwin',
@@ -463,6 +465,9 @@ Tasniwin di [[Special:Watchlist|Tabdart uḥṭṭu inec]] d '''tizurarin'''.",
 # Special:Categories
 'categories' => 'Taggayin',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Tarzzut',
+
 # Special:ListUsers
 'listusers-submit' => 'Smmrad',
 
@@ -470,50 +475,52 @@ Tasniwin di [[Special:Watchlist|Tabdart uḥṭṭu inec]] d '''tizurarin'''.",
 'emailuser' => 'Ssek E-mail i bnadm a',
 
 # Watchlist
-'watchlist'            => 'Tabdart uḥṭṭu inu',
-'mywatchlist'          => 'Tabdart uḥṭṭu inu',
-'watchlistfor'         => "(i '''$1''')",
-'addedwatch'           => 'Temmarni ɣar Tabdart uḥṭṭu',
-'addedwatchtext'       => 'Tasna "[[:$1]]" Temmarni ɣar [[Special:Watchlist|Tabdart uḥṭṭu]].',
-'removedwatch'         => 'twakkes zi Tabdart uḥṭṭu',
-'removedwatchtext'     => 'Tasna "[[:$1]]" twakkes zi [[Special:Watchlist|Tabdart uḥṭṭu inec]].',
-'watch'                => 'Ẓar',
-'watchthispage'        => 'Ẓar Tasna ya',
-'unwatch'              => 'War-twaẓer',
-'watchlist-details'    => '{{PLURAL:$1|$1 n Tasniwin|$1 n Tasniwin}} Twaẓrent bla Tasniwin n usiwl.',
-'wlshowlast'           => 'Sseml-ad $1 tisεεatin $2 ussan $3 inggura',
-'watchlist-hide-bots'  => 'Snuffar tiẓṛigin n urobot',
-'watchlist-hide-own'   => 'Snuffar tiẓṛigin inu',
-'watchlist-hide-minor' => 'Snuffar tiẓṛigin timeẓyanin',
+'watchlist'         => 'Tabdart uḥṭṭu inu',
+'mywatchlist'       => 'Tabdart uḥṭṭu inu',
+'watchlistfor'      => "(i '''$1''')",
+'addedwatch'        => 'Temmarni ɣar Tabdart uḥṭṭu',
+'addedwatchtext'    => 'Tasna "[[:$1]]" Temmarni ɣar [[Special:Watchlist|Tabdart uḥṭṭu]].',
+'removedwatch'      => 'twakkes zi Tabdart uḥṭṭu',
+'removedwatchtext'  => 'Tasna "[[:$1]]" twakkes zi [[Special:Watchlist|Tabdart uḥṭṭu inec]].',
+'watch'             => 'Ẓar',
+'watchthispage'     => 'Ẓar Tasna ya',
+'unwatch'           => 'War-twaẓer',
+'watchlist-details' => '{{PLURAL:$1|$1 n Tasniwin|$1 n Tasniwin}} Twaẓrent bla Tasniwin n usiwl.',
+'wlshowlast'        => 'Sseml-ad $1 tisεεatin $2 ussan $3 inggura',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Twaxmim...',
 'unwatching' => 'War-twaxmim...',
 
-# Delete/protect/revert
-'deletepage'                  => 'kkes Tasna',
-'delete-legend'               => 'Sfa�',
-'historywarning'              => 'ɣark: Tasna i txisd atekesd ɣars amzruy :',
-'confirmdeletetext'           => '�layn ad-tsfded Tasna ag maṛṛa amzruy ines.
+# Delete
+'deletepage'            => 'kkes Tasna',
+'delete-legend'         => 'Sfa�',
+'historywarning'        => 'ɣark: Tasna i txisd atekesd ɣars amzruy :',
+'confirmdeletetext'     => '�layn ad-tsfded Tasna ag maṛṛa amzruy ines.
 Ma nican txisd ad tekkesd, ma tesned mayn tegged, u tegget am mamec teqqar  [[{{MediaWiki:Policy-url}}|tasretit]].',
-'actioncomplete'              => 'Tiggawt tsala',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" Twakkes.
+'actioncomplete'        => 'Tiggawt tsala',
+'deletedtext'           => '"<nowiki>$1</nowiki>" Twakkes.
 Xemm $2 i tikkas timaynutin.',
-'deletedarticle'              => 'twakkes "[[$1]]"',
-'dellogpage'                  => 'Aɣmis n uṣfa�',
-'deletecomment'               => 'Mayemmi ɣa tteksed:',
-'deleteotherreason'           => 'Ca n ssebba nni�n:',
-'deletereasonotherlist'       => 'Ssebba nni�n',
-'rollbacklink'                => 'Ar-ad',
+'deletedarticle'        => 'twakkes "[[$1]]"',
+'dellogpage'            => 'Aɣmis n uṣfa�',
+'deletecomment'         => 'Mayemmi ɣa tteksed:',
+'deleteotherreason'     => 'Ca n ssebba nni�n:',
+'deletereasonotherlist' => 'Ssebba nni�n',
+
+# Rollback
+'rollbacklink' => 'Ar-ad',
+
+# Protect
 'protectlogpage'              => 'Aɣmis n uẓarq',
+'prot_1movedto2'              => '[[$1]] twaneql ɣa [[$2]]',
 'protectcomment'              => 'Tinit:',
 'protectexpiry'               => 'itsala:',
 'protect_expiry_invalid'      => 'Akud n usali war icni ca.',
 'protect_expiry_old'          => 'Akud usali yeεda.',
 'protect-unchain'             => 'Arzem turagin n usnaqel',
-'protect-text'                => 'tzemred ad teẓṛed u atbedeld aswir n uḥeṭṭu n Tasna ya da <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Ami�an inecc war ɣars turagt bac ad ibeddel aswir n uḥeṭṭu n Tasna .
-Aqa (settings) n Tasna <strong>$1</strong>:',
+'protect-text'                => "tzemred ad teẓṛed u atbedeld aswir n uḥeṭṭu n Tasna ya da '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Ami�an inecc war ɣars turagt bac ad ibeddel aswir n uḥeṭṭu n Tasna .
+Aqa (settings) n Tasna '''$1''':",
 'protect-cascadeon'           => 'Tasna ya tẓarq ruxa mayenzi tudef di {{PLURAL:$1|Tasna, iɣa illa|Tasniwin, iɣa illa}} aḥeṭṭu n usmuzzar(cascading protection).
 Tezemred ad tbedeld aswir n uḥeṭṭu n Tasna ya, maca war itegg walu i uḥeṭṭu n usmuzzar(cascading protection).',
 'protect-default'             => '(amzwar)',
@@ -524,6 +531,7 @@ Tezemred ad tbedeld aswir n uḥeṭṭu n Tasna ya, maca war itegg walu i uḥe
 'protect-expiring'            => 'itsala deg $1 (UTC)',
 'protect-cascade'             => 'Ḥ�a Tasniwin i yudfen di Tasna ya (cascading protection)',
 'protect-cantedit'            => 'war tezemred ca ad tbedeld iswiren n uḥeṭṭu n Tasna ya, mayenzi war ɣark turagt bac ad tẓṛegd.',
+'protect-expiry-options'      => '2 tasεεat:2 hours,1 ass:1 day,3 ussan:3 days,1 amalass:1 week,2 imallasen:2 weeks,1 ayur:1 month,3 iyuren:3 months,6 iyuren:6 months,1 asggas:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'turagt:',
 'restriction-level'           => 'Aswir usekref:',
 
@@ -547,14 +555,16 @@ Tezemred ad tbedeld aswir n uḥeṭṭu n Tasna ya, maca war itegg walu i uḥe
 'month'         => 'Zeg ayur (ar amzwaru):',
 'year'          => 'Zi asgg°as (d zik):',
 
+'sp-contributions-newbies'     => 'Ẓar Tabdart n tiggawin n useqdac a deg umi�an amaynu waha',
 'sp-contributions-newbies-sub' => 'i imi�an imaynuten',
 'sp-contributions-blocklog'    => 'Aɣmis n iẓariqqen',
+'sp-contributions-search'      => 'Arzu x tiggawin',
+'sp-contributions-username'    => 'Tansa IP d isem useqdac:',
 'sp-contributions-submit'      => 'Tarzzut',
 
 # What links here
 'whatlinkshere'       => 'Mayn id-izedyen da',
 'whatlinkshere-title' => 'Tasniwin id-izedyen ɣar "$1"',
-'linklistsub'         => '(Tabdart n tizdayin)',
 'linkshere'           => "Tasna ya tzedi ɣa '''[[:$1]]''':",
 'nolinkshere'         => "war tlli ca n Tasna tqqen-d da '''[[:$1]]'''.",
 'isredirect'          => 'Tasna n (redirect)',
@@ -675,7 +685,7 @@ snaqlitent s ufus.'''",
 'show-big-image'       => 'Resolution ameqran',
 'show-big-image-thumb' => '<small>Tiddi n uzar-ascan: $1 × $2 pixel </small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Amewlaf n ifayluten imaynuten',
 'ilsubmit'  => 'Tarzzut',
 
@@ -703,7 +713,7 @@ mayn nni�n ad itwasenfar.
 
 # External editor support
 'edit-externally'      => 'Ẓṛeg afaylu a s usnas zi baṛṛa',
-'edit-externally-help' => 'Xemm [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] i bezzaf n tilɣa(informations).',
+'edit-externally-help' => 'Xemm [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] i ktar n tilɣa(informations).',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'maṛṛa',
diff --git a/languages/messages/MessagesRm.php b/languages/messages/MessagesRm.php
index 3aa0ae46..4c73f58b 100644
--- a/languages/messages/MessagesRm.php
+++ b/languages/messages/MessagesRm.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Gion
  * @author Gion-andri
  * @author Urhixidur
  * @author לערי ריינה�רט
@@ -11,21 +12,36 @@
 
 $messages = array(
 # User preference toggles
-'tog-underline'        => 'suttastritgar colliaziuns:',
-'tog-highlightbroken'  => 'Formatar links betg existents <a href="" class="new">uschia</a> (alternativa: uschia<a href="" class="internal">?</a>)',
-'tog-justify'          => "Text en furma da 'bloc'",
-'tog-hideminor'        => 'Zuppentar pitschnas midadas en las ultimas midadas',
-'tog-usenewrc'         => "Activar la versiun extendida da las ''Ulimas midadas'' (JavaScript)",
-'tog-numberheadings'   => 'Numerar automaticamain ils titels',
-'tog-rememberpassword' => "S'annunziar permanantamain (be sch'il pled-clav n'è batg vegnì generà da la software da MediaWiki)",
-'tog-fancysig'         => 'Suttascripziun senza linc automatic tar la pagina dal utilisader.',
+'tog-underline'               => 'suttastritgar colliaziuns:',
+'tog-highlightbroken'         => 'Formatar links betg existents <a href="" class="new">uschia</a> (alternativa: uschia<a href="" class="internal">?</a>)',
+'tog-justify'                 => "Text en furma da 'bloc'",
+'tog-hideminor'               => 'Zuppentar pitschnas midadas en las ultimas midadas',
+'tog-usenewrc'                => "Activar la versiun extendida da las ''Ulimas midadas'' (JavaScript)",
+'tog-numberheadings'          => 'Numerar automaticamain ils titels',
+'tog-showtoolbar'             => "Mussa la trav d'utensils (basegna JavaScript)",
+'tog-editondblclick'          => 'Editar paginas cun in clic dubel (basegna JavaScript)',
+'tog-editsection'             => 'Activar links per [editar] secziuns',
+'tog-editsectiononrightclick' => "Activar la pussaivladad d'editar secziuns cun in clic dretg (basegna JavaScript)",
+'tog-rememberpassword'        => "S'annunziar permanantamain (be sch'il pled-clav n'è batg vegnì generà da la software da MediaWiki)",
+'tog-watchcreations'          => "Observar paginas ch'jau hai creà",
+'tog-watchdefault'            => "Observar paginas ch'jau hai edità",
+'tog-watchmoves'              => "Observar paginas ch'jau hai spustà",
+'tog-watchdeletion'           => "Observar paginas ch'jau hai stizzà",
+'tog-nocache'                 => 'deactivar il caching da la pagina',
+'tog-enotifwatchlistpages'    => "Trametta in e-mail sch'ina pagina sin mia glista d'observaziun vegn midada",
+'tog-enotifusertalkpages'     => "Trametta in e-mail sch'i ha dà midadas sin mia pagina da discussiun.",
+'tog-enotifminoredits'        => 'Trametta era in e-mail tar pitschnas midadas da las paginas',
+'tog-fancysig'                => 'Suttascripziun senza linc automatic tar la pagina dal utilisader.',
+'tog-watchlisthideown'        => "Zuppa mias modificaziuns en la glista d'observaziun",
+'tog-watchlisthidebots'       => "Zuppa modificaziuns da bots en la glista d'observaziun",
+'tog-watchlisthideminor'      => "Zuppa pitschnas modificaziuns en la glista d'observaziun",
+'tog-watchlisthideliu'        => "Zuppa modificaziuns d'utilisaders ch'èn s'annunziads en la glista d'observaziun",
+'tog-watchlisthideanons'      => "Zuppa modificaziuns da utilisaders anonims en la glista d'observaziun",
 
 'underline-always'  => 'adina suttastritgar',
 'underline-never'   => 'mai suttastritgar',
 'underline-default' => 'surprender standard dal browser',
 
-'skinpreview' => '(Prevista)',
-
 # Dates
 'sunday'        => 'Dumengia',
 'monday'        => 'Glindesdi',
@@ -79,68 +95,93 @@ $messages = array(
 'dec'           => 'dec',
 
 # Categories related messages
-'pagecategories'         => '{{PLURAL:$1|Categoria|Categorias}}',
-'category_header'        => 'Artitgels en la categoria "$1"',
-'subcategories'          => 'sutcategorias',
-'category-media-header'  => 'Datotecas en la categoria "$1"',
-'category-empty'         => "''Questa categoria cuntegna actualmain naigns artitgels ed naginas datotecas.''",
-'listingcontinuesabbrev' => 'cuntinuaziun',
-
-'about'         => 'Surda',
-'article'       => 'artitgel',
-'newwindow'     => '(avra ina nova fanestra)',
-'cancel'        => 'refusar las midadas',
-'qbfind'        => 'Chattar',
-'qbedit'        => 'Editar',
-'moredotdotdot' => 'Dapli...',
-'mypage'        => 'mia pagina',
-'mytalk'        => 'Mia pagina da discussiun',
-'anontalk'      => 'Pagina da discussiun da questa IP',
-'navigation'    => 'Navigaziun',
-'and'           => 'e',
-
-'errorpagetitle'   => 'Sbagl',
-'returnto'         => 'Enavos tar $1.',
-'tagline'          => 'Ord {{SITENAME}}',
-'help'             => 'Agid',
-'search'           => 'Tschertgar',
-'searchbutton'     => 'Tschertgar',
-'go'               => 'Artitgel',
-'searcharticle'    => 'dai!',
-'history'          => 'versiuns',
-'history_short'    => 'versiuns/auturs',
-'printableversion' => 'versiun per stampar',
-'permalink'        => 'Link permanent',
-'print'            => 'stampar',
-'edit'             => 'Editar',
-'editthispage'     => 'Editar questa pagina',
-'delete'           => 'Stidar',
-'deletethispage'   => 'Stidar questa pagina',
-'protect'          => 'proteger',
-'newpage'          => 'Pagina nova',
-'talkpage'         => "Discutar quest'artitgel",
-'talkpagelinktext' => 'Discussiun',
-'specialpage'      => 'Pagina speziala',
-'personaltools'    => 'Instruments persunals',
-'articlepage'      => 'guardar artitgel',
-'talk'             => 'discussiun',
-'views'            => 'Questa pagina',
-'toolbox'          => 'utensils',
-'userpage'         => "Guardar la pagina d'utilisader",
-'categorypage'     => 'Guardar la pagina da questa categoria',
-'viewtalkpage'     => 'guardar la discussiun',
-'otherlanguages'   => 'En auteras linguas',
-'redirectedfrom'   => '(renvià da $1)',
-'redirectpagesub'  => "questa pagina renviescha ad in'auter artitgel",
-'jumpto'           => 'Midar tar:',
-'jumptonavigation' => 'navigaziun',
-'jumptosearch'     => 'tschertga',
+'pagecategories'           => '{{PLURAL:$1|Categoria|Categorias}}',
+'category_header'          => 'Artitgels en la categoria "$1"',
+'subcategories'            => 'sutcategorias',
+'category-media-header'    => 'Datotecas en la categoria "$1"',
+'category-empty'           => "''Questa categoria cuntegna actualmain naigns artitgels ed naginas datotecas.''",
+'hidden-category-category' => 'Zuppa categorias', # Name of the category where hidden categories will be listed
+'listingcontinuesabbrev'   => 'cuntinuaziun',
+
+'about'          => 'Surda',
+'article'        => 'artitgel',
+'newwindow'      => '(avra ina nova fanestra)',
+'cancel'         => 'refusar las midadas',
+'qbfind'         => 'Chattar',
+'qbbrowse'       => 'Sfegliar',
+'qbedit'         => 'Editar',
+'qbpageoptions'  => 'Questa pagina',
+'qbpageinfo'     => 'Context',
+'qbmyoptions'    => 'Mia pagina',
+'qbspecialpages' => 'paginas spezialas',
+'moredotdotdot'  => 'Dapli...',
+'mypage'         => 'mia pagina',
+'mytalk'         => 'Mia pagina da discussiun',
+'anontalk'       => 'Pagina da discussiun da questa IP',
+'navigation'     => 'Navigaziun',
+'and'            => '&#32;e',
+
+# Metadata in edit box
+'metadata_help' => 'Datas da meta:',
+
+'errorpagetitle'    => 'Errur',
+'returnto'          => 'Enavos tar $1.',
+'tagline'           => 'Ord {{SITENAME}}',
+'help'              => 'Agid',
+'search'            => 'Tschertgar',
+'searchbutton'      => 'Tschertgar',
+'go'                => 'Artitgel',
+'searcharticle'     => 'dai!',
+'history'           => 'versiuns',
+'history_short'     => 'versiuns/auturs',
+'updatedmarker'     => "actualisà dapi mi'ultima visita",
+'info_short'        => 'Infurmaziun',
+'printableversion'  => 'versiun per stampar',
+'permalink'         => 'Link permanent',
+'print'             => 'stampar',
+'edit'              => 'Editar',
+'create'            => 'Crear',
+'editthispage'      => 'Editar questa pagina',
+'create-this-page'  => 'Crear questa pagina',
+'delete'            => 'Stidar',
+'deletethispage'    => 'Stidar questa pagina',
+'undelete_short'    => 'Revocar {{PLURAL:$1|ina modificaziun|$1 modificaziuns}}',
+'protect'           => 'proteger',
+'protect_change'    => 'midar',
+'protectthispage'   => 'Protegier questa pagina',
+'unprotect'         => 'Nunprotegì',
+'unprotectthispage' => 'Annullescha la protecziun da la pagina',
+'newpage'           => 'Nova pagina',
+'talkpage'          => 'Discutar quest artitgel',
+'talkpagelinktext'  => 'Discussiun',
+'specialpage'       => 'Pagina speziala',
+'personaltools'     => 'Utensils persunals',
+'postcomment'       => 'Nova secziun',
+'articlepage'       => 'guardar artitgel',
+'talk'              => 'discussiun',
+'views'             => 'Questa pagina',
+'toolbox'           => 'Utensils',
+'userpage'          => "Guardar la pagina d'utilisader",
+'projectpage'       => 'Guardar la pagina da project',
+'imagepage'         => 'Guardar la pagina da datotecas',
+'mediawikipage'     => 'Guardar la pagina da messadis',
+'templatepage'      => 'Guardar la pagina da templates',
+'viewhelppage'      => "Guardar pagina d'agid",
+'categorypage'      => 'Guardar la pagina da questa categoria',
+'viewtalkpage'      => 'guardar la discussiun',
+'otherlanguages'    => 'En auteras linguas',
+'redirectedfrom'    => '(renvià da $1)',
+'redirectpagesub'   => "questa pagina renviescha tar in'auter artitgel",
+'lastmodifiedat'    => "L'ultima modificaziun da questa pagina: ils $1 a las $2.", # $1 date, $2 time
+'viewcount'         => 'Questa pagina è vegnida guardada {{PLURAL:$1|ina giada|$1 giadas}}.',
+'protectedpage'     => 'Pagina protegida',
+'jumpto'            => 'Midar tar:',
+'jumptonavigation'  => 'navigaziun',
+'jumptosearch'      => 'tschertga',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'aboutsite'            => 'Surda {{SITENAME}}',
-'aboutpage'            => 'Project:Surda',
-'bugreports'           => 'Rapportar sbagls',
-'bugreportspage'       => 'Project:Rapportar sbagls',
+'aboutsite'            => 'Davart {{SITENAME}}',
+'aboutpage'            => 'Project:Davart',
 'copyright'            => 'Cuntegn disponibel sut $1.',
 'copyrightpagename'    => '{{ns:project}}:Resguardar_dretgs_d_autur',
 'copyrightpage'        => '{{ns:project}}:Resguardar_dretgs_d_autur',
@@ -148,19 +189,24 @@ $messages = array(
 'currentevents-url'    => 'Project:Events actuals',
 'disclaimers'          => 'Impressum',
 'disclaimerpage'       => 'Project:Impressum',
-'edithelp'             => 'agid dad editar',
+'edithelp'             => 'agid per editar',
 'edithelppage'         => 'Help:Prims pass',
+'faq'                  => 'FAQ',
+'faqpage'              => 'Project:FAQ',
 'helppage'             => 'Help:Cuntegn',
 'mainpage'             => 'Pagina principala',
 'mainpage-description' => 'Pagina principala',
+'policy-url'           => 'Project:Directivas',
 'portal'               => 'Portal da {{SITENAME}}',
 'portal-url'           => 'Project:Portal da {{SITENAME}}',
 'privacy'              => 'Protecziun da datas',
 'privacypage'          => 'Project:Protecziun_da_datas',
 
-'badaccess' => "Errur dad access: vus n'avais betg avunda dretgs",
+'badaccess'        => "Errur dad access: vus n'avais betg avunda dretgs",
+'badaccess-group0' => "Vus na dastgais betg exequir l'acziun giavischada.",
+'badaccess-groups' => "L'acziun che vus vulais far dastgan mo utilisaders en {{PLURAL:$2|las gruppas|la gruppa}} $1 exequir.",
 
-'versionrequired'     => 'Versiun $1 da MediaWiki vegn duvrada',
+'versionrequired'     => 'Versiun $1 da MediaWiki è necessaria',
 'versionrequiredtext' => 'Ti dovras versiun $1 da mediawiki per duvrar questa pagina. Guarda [[Special:Version| qua!]]',
 
 'ok'                      => "D'accord",
@@ -171,30 +217,56 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Ti as novs messadis en $1',
 'editsection'             => 'editar',
 'editold'                 => 'editar',
+'viewsourceold'           => 'guardar code funtauna',
+'editlink'                => 'editar',
+'viewsourcelink'          => 'guardar code funtauna',
 'editsectionhint'         => 'Editar secziun: $1',
 'toc'                     => 'Cuntegn',
 'showtoc'                 => 'mussar',
 'hidetoc'                 => 'zuppar',
+'thisisdeleted'           => 'Guardar u restaurar $1?',
+'viewdeleted'             => 'Mussa $1?',
+'restorelink'             => '{{PLURAL:$1|ina modificaziun stizzada|$1 modificaziuns stizzadas}}',
+'feedlinks'               => 'Feed:',
+'feed-invalid'            => 'Faus tip da feed per la subscripziun.',
+'feed-unavailable'        => "Feed n'è betg disponibel",
 'site-rss-feed'           => 'RSS Feed da $1',
 'site-atom-feed'          => 'Atom Feed da $1',
 'page-rss-feed'           => 'RSS Feed "$1"',
+'page-atom-feed'          => 'Atom feed "$1"',
+'feed-atom'               => 'Atom',
+'feed-rss'                => 'RSS',
+'red-link-title'          => "$1 (n'exista betg)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artitgel',
-'nstab-user'      => 'Pagina dal utilisader',
-'nstab-special'   => 'Spezial',
+'nstab-user'      => "Pagina da l'utilisader",
+'nstab-media'     => 'Pagina da medias',
+'nstab-special'   => 'Pagina speziala',
 'nstab-project'   => 'pagina dal project',
 'nstab-image'     => 'Datoteca',
-'nstab-mediawiki' => 'messagi',
+'nstab-mediawiki' => 'messadi',
 'nstab-template'  => 'template',
 'nstab-help'      => 'Agid',
 'nstab-category'  => 'Categoria',
 
+# Main script and global functions
+'nosuchaction'      => "Talas acziuns n'existan betg",
+'nosuchactiontext'  => "L'acziun specifitgada per questa URL è faussa.
+Vus avais endatà fauss la URL, u avais suandà in link incorrect.
+I po dentant er esser in errur en la software da {{SITENAME}}.",
+'nosuchspecialpage' => "I n'exista betg ina tala pagina speziala",
+'nospecialpagetext' => "<big>'''Vus avais tschertgà ina pagina speziala che n'exista betg.'''</big>
+
+Ina glista da las paginas spezialas existentas chattais vus sut [[Special:SpecialPages|{{int:specialpages}}]].",
+
 # General errors
+'error'            => 'Errur',
 'databaseerror'    => 'Sbagl da la datoteca',
 'dberrortext'      => 'Tar la damonda per la datoteca <blockquote><tt>$1</tt></blockquote> ord la funcziun "<tt>$2</tt>" ha MySQL rapporta il sbagl "<tt>$3: $4</tt>".',
 'dberrortextcl'    => 'Tier la damonda "$1" peer la datoteca ord la funcziun "<tt>$2</tt>" ha MySQL rapporta dal sbagl: "<tt>$3: $4</tt>".',
 'laggedslavemode'  => 'Attenziun: La pagina mussada na cuntign eventualmain betg anc las ultimas midadas.',
+'internalerror'    => 'Errur intern',
 'badtitle'         => "Il num da titel endatà n'è betg valaivel",
 'badtitletext'     => 'Il titel da pagina era betg valaivels, vids u in titel inter-lingua u inter-wiki betg correct. 
 El po cuntegnair in u plirs segns che na pon betg vegnir utilisads en titels.',
@@ -202,15 +274,13 @@ El po cuntegnair in u plirs segns che na pon betg vegnir utilisads en titels.',
 'viewsource'       => 'guardar fontaunas',
 'viewsourcefor'    => 'per $1',
 'viewsourcetext'   => 'Ti pos guardar e copiar il code-fundamental da questa pagina:',
-'editinginterface' => "'''Attenziun:''' Questa pagina cuntegn text che vegn duvra da software da mediawiki. Midadas influenzeschan directamain l'interface da l'utilisader. Sche ti vuls far translaziuns u correcturas: Studegia da far quai sin [http://translatewiki.net/wiki/Main_Page?setlang=rm Betawiki], per che las midadas pon vegnidas surprendidas da tut ils projects.",
+'editinginterface' => "'''Attenziun:''' Questa pagina cuntegn text che vegn duvra da software da mediawiki. Midadas influenzeschan directamain l'interface da l'utilisader. Sche ti vuls far translaziuns u correcturas: Studegia da far quai sin [http://translatewiki.net/wiki/Main_Page?setlang=rm translatewiki.net], per che las midadas pon vegnidas surprendidas da tut ils projects.",
 
 # Login and logout pages
 'logouttitle'                => "Log-out d'utilisaders",
-'logouttext'                 => '<strong>Log-out cun success.</strong><br />
-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.',
+'logouttext'                 => "'''Log-out cun success.'''<br />
+
+Ti pos cuntinuar cun utilisar {{SITENAME}} anonimamain, u che ti pos [[Special:UserLogin|t'annunziar]] sco medem u in'auter utilisader. Resguarda che entginas paginas pon anc vesair or tuttina sco sche ti era annunzià enfin che ti has stidà il cache da tes browser.",
 'welcomecreation'            => '==Chau, $1! ==
 
 Tes conto è vegni creà. Betg emblida da midar tias preferenzas da {{SITENAME}}.',
@@ -220,13 +290,13 @@ Tes conto è vegni creà. Betg emblida da midar tias preferenzas da {{SITENAME}}
 'yourpasswordagain'          => 'repeter pled-clav',
 'remembermypassword'         => 'Memorisar il pled-clav',
 'yourdomainname'             => 'Vossa domain',
-'loginproblem'               => '<b>I ha dà in problem cun voss log-in.</b><br />Empruvai per plaschair danovamain!',
 'login'                      => 'Log-in',
 'nav-login-createaccount'    => 'Log-in / crear in conto',
 'loginprompt'                => "Vus stuais avair '''activà cookies''' per pudair s'annunziar tar {{SITENAME}}.",
 'userlogin'                  => "s'annunziar / crear in nov conto d'utilisader",
 'logout'                     => 'Log-out',
 'userlogout'                 => 'Log-out',
+'notloggedin'                => "Betg s'annunzià",
 'nologin'                    => 'Anc nagin conto? $1.',
 'nologinlink'                => "Crear in conto d'utilisader",
 'createaccount'              => "Crear in conto d'utilisader",
@@ -242,10 +312,12 @@ Tes conto è vegni creà. Betg emblida da midar tias preferenzas da {{SITENAME}}
 'yournick'                   => 'Signatura:',
 'prefs-help-realname'        => "Opziun: Qua pos inditgar in surnum che vegn inditga empè da tes num d'utilisader en tias suttascripziuns cun '''<nowiki>--~~~~</nowiki>'''.",
 'loginerror'                 => 'Sbagl da log-in',
-'prefs-help-email'           => 'Opziun: Pussibilitescha ad auters utilisaders da contactar tai per email senza che ti stos publitgar tia identitad. Pussibilitescha er da trametter in nov pled-clav en cass da sperdita.',
+'prefs-help-email'           => "L'adressa d'email è opziunala, pussibilitescha dentant da trametter in nov pled-clav en cass da sperdita. Plinavant pussibilitescha ella ad auters utilisaders da contactar tai per email senza che ti stos publitgar tia identitad.",
+'prefs-help-email-required'  => "Inditgar in'adressa d'email è obligatoric.",
 'loginsuccesstitle'          => "S'annunzià cun success",
 'loginsuccess'               => "''' Vus essas uss annunziads tar {{SITENAME}} sco \"\$1\".'''",
-'nosuchuser'                 => 'I dat nagin utilisader cun il num "$1". 
+'nosuchuser'                 => 'I exista nagin utilisader cun il num "$1". 
+Fa stim dad utilisar correctamain maiusclas e minusclas. 
 Curregia il num u [[Special:UserLogin/signup|creescha in nov conto]].',
 'nosuchusershort'            => 'I dat nagin utilisader cun il num "<nowiki>$1</nowiki>".
 Curregia ti\'endataziun.',
@@ -264,14 +336,20 @@ Sch\'insatgi auter ha fatg questa dumonda, ni sch\'il pled-clav è vegnì endame
 T'annunzia per plaschair sche ti has retschavì el.",
 'eauthentsent'               => "In e-mail da confermaziun è vegnì tramess a l'adressa d'e-mail numnada. 
 Suonda las infurmaziuns en l'e-mail per confirmar ch'il conto d'utilisader è il tes.",
-'acct_creation_throttle_hit' => "Stgisai, vus avais gia creà $1 contos d'utilisaders. Vus na pudais betg far plirs.",
-'emailauthenticated'         => "Tia adressa d'email è vegnida verifitgada ils $1.",
+'acct_creation_throttle_hit' => "Stgisa, ti has gia creà {{PLURAL:$1|in conto|$1 contos}} d'utilisader. 
+Ti na sas betg far plirs.",
+'emailauthenticated'         => "Tia adressa d'email è vegnida verifitgada ils $2 las $3.",
 'emailnotauthenticated'      => "Vus n'avais betg anc <strong>confermà vossa adressa dad email</strong>.<br />
 Perquei è anc nagin retschaiver e trametter dad emails per las suandantas funcziuns pussaivel.",
 'emailconfirmlink'           => "Confirmar l'adressa dad email",
 'accountcreated'             => "Creà il conto d'utilisader",
 'accountcreatedtext'         => "Il conto d'utilisader per $1 è vegnì creà.",
 
+# Password reset dialog
+'oldpassword' => 'pled-clav vegl:',
+'newpassword' => 'pled-clav nov:',
+'retypenew'   => 'repeter pled-clav nov:',
+
 # Edit page toolbar
 'bold_sample'     => 'Text grass',
 'bold_tip'        => 'Text grass',
@@ -294,7 +372,8 @@ Perquei è anc nagin retschaiver e trametter dad emails per las suandantas funcz
 'hr_tip'          => 'Lingia orizontala (betg utilisar savens!)',
 
 # Edit pages
-'summary'                => 'Resumaziun',
+'summary'                => 'Resumaziun:',
+'subject'                => 'Pertutga:',
 'minoredit'              => 'Midà be bagatellas',
 'watchthis'              => 'observar quest artitgel',
 'savearticle'            => "memorisar l'artitgel",
@@ -303,6 +382,7 @@ Perquei è anc nagin retschaiver e trametter dad emails per las suandantas funcz
 'showlivepreview'        => 'prevista directa',
 'showdiff'               => 'mussar midadas',
 'anoneditwarning'        => "Vus essas betg annunziads. Empè dal num d'utilisader vign l'adressa dad IP registrada en la historia da las versiuns.",
+'summary-preview'        => 'prevista da la resumaziun:',
 'blockedtitle'           => 'Utilisader è bloccà',
 'blockedtext'            => "<big>'''Tes num d'utilisader u tia adressa d'IP è vegnida bloccada.'''</big>
 
@@ -335,19 +415,20 @@ Integrescha per plaschair tut las indicaziuns survart sche ti contacteschas insa
 '''Konqueror: '''clicca ''Reload'' u smatga ''F5'';
 '''Opera:''' stidar il cache sut ''Tools → Preferences'';
 '''Internet Explorer:''' tegna ''Ctrl'' durant cliccar ''Refresh,'' u smatga ''Ctrl-F5''.",
-'previewnote'            => "<strong>Quai è be ina prevista; midadas n'èn anc betg vegnidas memorisadas!</strong>",
+'note'                   => "'''Remartga:'''",
+'previewnote'            => "'''Quai è be ina prevista; midadas n'èn anc betg vegnidas memorisadas!'''",
 'editing'                => 'Editar $1',
 'editingsection'         => 'Editar $1 (secziun)',
 'yourtext'               => 'Voss text',
 'yourdiff'               => 'Differenzas',
 '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.<br />
 You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource.
-<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>",
-'longpagewarning'        => '<strong>ADATG: Questa artitgel è $1 kilobytes gronda. Insaquants browsers 
+'''DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!'''",
+'longpagewarning'        => "'''ADATG: Questa artitgel è $1 kilobytes gronda. Insaquants browsers 
 han forsa problems cun editar artitgels da la grondezza 32 kb u pli grond. 
-Ponderai per plaschair da divider quest artitgel en pli pitschnas parts. </strong>',
-'longpageerror'          => "<strong>SBAGL: Il text che ti has tramess è $1 kilobytes gronds. Quei ei pli grond ch'il maximum da $2 kilobytes. Il text na sa betg vegnir memorisà. </strong>",
-'protectedpagewarning'   => '<strong>ATTENZIUN: Questa pagina è vegnida bloccada, uschè che be utilisaders cun dretgs dad administraturs pon editar ella. </strong>',
+Ponderai per plaschair da divider quest artitgel en pli pitschnas parts. '''",
+'longpageerror'          => "'''SBAGL: Il text che ti has tramess è $1 kilobytes gronds. Quei ei pli grond ch'il maximum da $2 kilobytes. Il text na sa betg vegnir memorisà. '''",
+'protectedpagewarning'   => "'''ATTENZIUN: Questa pagina è vegnida bloccada, uschè che be utilisaders cun dretgs dad administraturs pon editar ella. '''",
 'templatesused'          => 'Templates utilisads sin questa pagina:',
 'templatesusedpreview'   => 'Templates utilisads en questa prevista:',
 'template-protected'     => '(protegì)',
@@ -364,25 +445,27 @@ En il ''log da stidar'' che suonda pos ti guardar daco che la pagina è vegnida
 'cantcreateaccounttitle' => "Betg pussaivel da crear l'account",
 
 # History pages
-'viewpagelogs'        => 'Guardar ils logs da questa pagina',
-'currentrev'          => 'Versiun actuala',
-'revisionasof'        => 'Versiun dals $1',
-'revision-info'       => "Quai è ina versiun veglia. Temp da la midada ''$1'' da ''$2''",
-'previousrevision'    => '� versiun pli veglia',
-'nextrevision'        => 'versiun pli nova →',
-'currentrevisionlink' => 'Guardar la versiun actuala',
-'cur'                 => 'act',
-'next'                => 'proxim',
-'last'                => 'davosa',
-'page_first'          => 'entschatta',
-'page_last'           => 'fin',
-'histlegend'          => 'Per vesair las differenzas tranter duas versiuns, marca ils quaderins da la versiuns che ti vul cumparegliar e clicca sin "cumparegliar las versiuns selecziunadas".
+'viewpagelogs'           => 'Guardar ils logs da questa pagina',
+'currentrev'             => 'Versiun actuala',
+'revisionasof'           => 'Versiun dals $1',
+'revision-info'          => "Quai è ina versiun veglia. Temp da la midada ''$1'' da ''$2''", # Additionally available: $3: revision id
+'previousrevision'       => '� versiun pli veglia',
+'nextrevision'           => 'versiun pli nova →',
+'currentrevisionlink'    => 'Guardar la versiun actuala',
+'cur'                    => 'act',
+'next'                   => 'proxim',
+'last'                   => 'davosa',
+'page_first'             => 'entschatta',
+'page_last'              => 'fin',
+'histlegend'             => 'Per vesair las differenzas tranter duas versiuns, marca ils quaderins da la versiuns che ti vul cumparegliar e clicca sin "cumparegliar las versiuns selecziunadas".
 * (act) = differenzas cun la versiun actuala
 * (davosa) = differenza cun la versiun precedenta
 * M = Midà be bagatellas',
-'deletedrev'          => '[stidà]',
-'histfirst'           => 'pli veglia',
-'histlast'            => 'pli nova',
+'history-fieldset-title' => 'tschertgar en la cronica',
+'deletedrev'             => '[stidà]',
+'histfirst'              => 'pli veglia',
+'histlast'               => 'pli nova',
+'historyempty'           => '(vid)',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 las $2', # user at time
@@ -390,6 +473,7 @@ En il ''log da stidar'' che suonda pos ti guardar daco che la pagina è vegnida
 # Revision deletion
 'rev-deleted-comment' => '(eliminà commentari)',
 'rev-delundel'        => 'mussar/zuppar',
+'revdelete-uname'     => "num d'utilisader",
 
 # Diffs
 'history-title'           => 'Cronica da versiuns da "$1"',
@@ -400,12 +484,19 @@ En il ''log da stidar'' che suonda pos ti guardar daco che la pagina è vegnida
 'diff-multi'              => '({{PLURAL:$1|Ina versiun|$1 versiuns}} tranter en na vegnan betg mussadas.)',
 
 # Search results
-'prevn'             => 'davos $1',
-'nextn'             => 'proxims $1',
-'viewprevnext'      => 'Mussar ($1) ($2) ($3).',
-'showingresults'    => "Sutvart èn enfin {{PLURAL:$1|'''in''' resultat|'''$1''' resultats}} cumenzond cun il numer '''$2'''.",
-'showingresultsnum' => "Qua èn '''$3''' resultats, cumenzond cun il number '''$2'''.",
-'powersearch'       => 'retschertgar',
+'searchresults'             => 'Resultats da tschertga',
+'searchresults-title'       => 'Resultats da tschertga per "$1"',
+'searchsubtitle'            => 'Ti has tschertgà \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tut las paginas che entschevan cun "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|colliaziuns a "$1"]])',
+'prevn'                     => 'davos $1',
+'nextn'                     => 'proxims $1',
+'viewprevnext'              => 'Mussar ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Cuntegn',
+'search-result-size'        => '$1 ({{PLURAL:$2|in pled|$2 pleds}})',
+'search-mwsuggest-enabled'  => 'cun propostas',
+'search-mwsuggest-disabled' => 'naginas propostas',
+'showingresults'            => "Sutvart èn enfin {{PLURAL:$1|'''in''' resultat|'''$1''' resultats}} cumenzond cun il numer '''$2'''.",
+'showingresultsnum'         => "Qua èn '''$3''' resultats, cumenzond cun il number '''$2'''.",
+'powersearch'               => 'retschertgar',
 
 # Preferences page
 'preferences'           => 'Preferenzas',
@@ -414,6 +505,7 @@ En il ''log da stidar'' che suonda pos ti guardar daco che la pagina è vegnida
 'prefsnologintext'      => 'Ti stos esser <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} annunzià]</span> per midar tias preferenzas.',
 'prefsreset'            => 'Preferenzas da standard ein vegnì reconstruidas.',
 'changepassword'        => 'Midar pled-clav',
+'skin-preview'          => 'Prevista',
 'dateformat'            => 'format da las datas',
 'datedefault'           => 'Nagina preferenza',
 'datetime'              => 'Data e temp',
@@ -424,9 +516,6 @@ En il ''log da stidar'' che suonda pos ti guardar daco che la pagina è vegnida
 'prefs-watchlist-edits' => 'Dumber da las midadas mussadas en la glista dad observaziun extendida:',
 'saveprefs'             => 'memorisar',
 'resetprefs'            => 'remetter las preferenzas (reset)',
-'oldpassword'           => 'pled-clav vegl:',
-'newpassword'           => 'pled-clav nov:',
-'retypenew'             => 'repeter pled-clav nov:',
 'columns'               => 'Colonna:',
 'searchresultshead'     => 'Tschertga',
 'resultsperpage'        => 'resultats per pagina:',
@@ -447,6 +536,10 @@ En il ''log da stidar'' che suonda pos ti guardar daco che la pagina è vegnida
 'userrights-user-editname' => "Inditgescha in num d'utilisader:",
 'userrights-groupsmember'  => 'Commember da:',
 
+# Groups
+'group-sysop'      => 'Administraturs',
+'group-bureaucrat' => 'Birocrat',
+
 'grouppage-sysop' => '{{ns:project}}:Administraturs',
 
 # User rights log
@@ -488,11 +581,11 @@ Paginas sin [[Special:Watchlist|tia glista d'observaziun]] èn '''grassas'''.",
 'reupload'          => 'chargiar si danovamain',
 'reuploaddesc'      => 'Anavos tar la pagina da chargiar si.',
 'uploadnologintext' => "Ti stos [[Special:UserLogin|t'annunziar]] per chargiar si files.",
-'uploadtext'        => "Cun il formular sutvart pos ti chargiar si files, per vesair u tschertgar maletgs gia chargiads si, dovra [[Special:ImageList|quest link]]. I dat er ina [[Special:Log/upload|glista dals files chargiads si u stidads]].
+'uploadtext'        => "Cun il formular sutvart pos ti chargiar si files, per vesair u tschertgar maletgs gia chargiads si, dovra [[Special:FileList|quest link]]. I dat er ina [[Special:Log/upload|glista dals files chargiads si u stidads]].
 
 Per integrar il maletg/purtret en tes artitgel sas ti per exempel duvrar in dals suandants cumonds: 
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.png]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:file.jpg]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki>'''
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki>'''",
 'uploadlogpage'     => 'Log da chargiar si',
 'filedesc'          => 'Resumaziun',
@@ -504,10 +597,10 @@ Per integrar il maletg/purtret en tes artitgel sas ti per exempel duvrar in dals
 'sourcefilename'    => 'file sin tes computer:',
 'destfilename'      => 'num dal file sin il server:',
 
-# Special:ImageList
-'imagelist' => 'Glista dals maletgs',
+# Special:ListFiles
+'listfiles' => 'Glista dals maletgs',
 
-# Image description page
+# File description page
 'filehist'                  => 'Istorgia da las versiuns',
 'filehist-help'             => 'Clicca sin ina data/temps per vesair la versiun da lura.',
 'filehist-current'          => 'actual',
@@ -516,7 +609,7 @@ Per integrar il maletg/purtret en tes artitgel sas ti per exempel duvrar in dals
 'filehist-dimensions'       => 'dimensiuns',
 'filehist-filesize'         => 'grondezza da datoteca',
 'filehist-comment'          => 'commentari',
-'imagelinks'                => 'Colliaziuns',
+'imagelinks'                => 'Paginas che cuntegnan la datoteca',
 'linkstoimage'              => '{{PLURAL:$1|La suandanta pagina è colliada|Las suandantas $1 paginas èn colliadas}} cun questa datoteca:',
 'nolinkstoimage'            => 'Naginas paginas mussan sin questa datoteca.',
 'sharedupload'              => 'Quai è ina datoteca partida e vegn eventualmain utilisada dad auters projects.',
@@ -541,24 +634,8 @@ Per integrar il maletg/purtret en tes artitgel sas ti per exempel duvrar in dals
 'randomredirect' => 'Redirect casual',
 
 # Statistics
-'statistics'    => 'Statisticas',
-'sitestats'     => 'Statisticas da {{SITENAME}}',
-'userstats'     => 'Statisticas davart ils utilisaders',
-'sitestatstext' => "There {{PLURAL:\$1|is '''1''' page|are '''\$1''' total pages}} in the database.
-This includes \"talk\" pages, pages about {{SITENAME}}, minimal \"stub\"
-pages, redirects, and others that probably don't qualify as content pages.
-Excluding those, there {{PLURAL:\$2|is '''1''' page that is a|are '''\$2''' pages that are}} probably legitimate
-content {{PLURAL:\$2|page|pages}}.
-
-'''\$8''' {{PLURAL:\$8|file|files}} have been uploaded.
-
-There have been a total of '''\$3''' {{PLURAL:\$3|page view|page views}}, and '''\$4''' {{PLURAL:\$4|page edit|page edits}}
-since {{SITENAME}} was setup.
-That comes to '''\$5''' average edits per page, and '''\$6''' views per edit.
-
-La lunghezza da la [http://www.mediawiki.org/wiki/Manual:Job_queue job queue]: '''\$7'''.",
-'userstatstext' => "There {{PLURAL:$1|is '''1''' registered [[Special:ListUsers|user]]|are '''$1''' registered [[Special:ListUsers|users]]}}, of which
-'''$2''' (or '''$4%''') {{PLURAL:$2|has|have}} $5 rights.",
+'statistics'              => 'Statisticas',
+'statistics-header-users' => 'Statisticas davart ils utilisaders',
 
 'disambiguations' => 'pagina per la decleraziun da noziuns',
 
@@ -592,7 +669,7 @@ La lunghezza da la [http://www.mediawiki.org/wiki/Manual:Job_queue job queue]: '
 'mostcategories'          => "Artitgels ch'èn en las pli biaras chategorias",
 'mostimages'              => 'Datotecas utilisadas il pli savens',
 'mostrevisions'           => 'Artitgels cun las pli biaras revisiuns',
-'prefixindex'             => 'tut las paginas (cun prefix)',
+'prefixindex'             => 'Tut las paginas cun prefix',
 'shortpages'              => 'Paginas curtas',
 'longpages'               => 'Artitgels lungs',
 'deadendpages'            => 'artitgels senza links interns che mainan anavant',
@@ -631,6 +708,9 @@ La lunghezza da la [http://www.mediawiki.org/wiki/Manual:Job_queue job queue]: '
 # Special:Categories
 'categories' => 'Categorias',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Tschertgar',
+
 # E-mail user
 'mailnologintext' => "Ti stos [[Special:UserLogin|t'annunziar]] ed avair ina adressa d'email valaivla en tias [[Special:Preferences|preferenzas]] per trametter emails ad auters utilisaders.",
 'emailuser'       => 'Trametter in email a quest utilisader',
@@ -676,39 +756,44 @@ Midadas futuras vid quai artitgel e la pagina da discussiun appertegnenta vegnan
 'changed' => 'midà',
 'created' => 'creà',
 
-# Delete/protect/revert
-'deletepage'                  => 'Stidar la pagina',
-'confirm'                     => 'Confermar',
-'historywarning'              => "Attenziun: L'artitgel che ti vuls stidar ha in'istorgia (pliras versiuns):",
-'confirmdeletetext'           => 'Ti es vidlonder da stidar permanentamain in artitgel u in maletg e tut las versiuns pli veglias ord la datoteca. <br /> 
+# Delete
+'deletepage'            => 'Stidar la pagina',
+'confirm'               => 'Confermar',
+'historywarning'        => "Attenziun: L'artitgel che ti vuls stidar ha in'istorgia (pliras versiuns):",
+'confirmdeletetext'     => 'Ti es vidlonder da stidar permanentamain in artitgel u in maletg e tut las versiuns pli veglias ord la datoteca. <br /> 
 Conferma per plaschair che ti ta es conscient da las consequenzas e che ti ageschas tenor las [[{{MediaWiki:Policy-url}}|directivas da {{SITENAME}}]].',
-'actioncomplete'              => "L' acziun è terminada.",
-'deletedtext'                 => '"<nowiki>$1</nowiki>" è vegnì stidà.
+'actioncomplete'        => "L' acziun è terminada.",
+'deletedtext'           => '"<nowiki>$1</nowiki>" è vegnì stidà.
 Sin $2 chattas ti ina glista dals davos artitgels stidads.',
-'deletedarticle'              => '"[[$1]]" è stidà',
-'dellogpage'                  => 'log dal stidar',
-'deletecomment'               => 'Motiv per il stidar',
-'deleteotherreason'           => 'Autra / supplementara raschun:',
-'deletereasonotherlist'       => 'Autra raschun:',
-'rollbacklink'                => 'reinizialisar',
-'alreadyrolled'               => "I n'è betg pussaivel da reconstruir l'artigel [[:$1]] da [[User:$2|$2]] ([[User talk:$2|discussiun]]), perquai che insatgi auter ha midà u reconstruì la pagina.
+'deletedarticle'        => '"[[$1]]" è stidà',
+'dellogpage'            => 'log dal stidar',
+'deletecomment'         => 'Motiv per il stidar',
+'deleteotherreason'     => 'Autra / supplementara raschun:',
+'deletereasonotherlist' => 'Autra raschun:',
+
+# Rollback
+'rollbacklink'  => 'reinizialisar',
+'alreadyrolled' => "I n'è betg pussaivel da reconstruir l'artigel [[:$1]] da [[User:$2|$2]] ([[User talk:$2|discussiun]]), perquai che insatgi auter ha midà u reconstruì la pagina.
 
 Quest calöri è  [[User:$3|$3]] ([[User talk:$3|discussiun]]).",
+
+# Protect
 'protectlogpage'              => 'Log da las protecziuns',
+'prot_1movedto2'              => 'Spustà [[$1]] tar [[$2]]',
 'protect-legend'              => 'Midar il status da protecziun da la pagina.',
 'protectcomment'              => 'Commentari:',
 'protectexpiry'               => 'Pretegì enfin:',
 'protect_expiry_invalid'      => "Il temp endatà n'è betg valaivel.",
 'protect_expiry_old'          => 'Il temp da proteger giascha en il passà.',
 'protect-unchain'             => 'Midar la protecziun per spustar',
-'protect-text'                => "Qua pos ti contemplar ed midar il livel da protecziun per l'artitgel <strong><nowiki>$1</nowiki></strong>.",
+'protect-text'                => "Qua pos ti contemplar ed midar il livel da protecziun per l'artitgel '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "Tes conto d'utilisader n'ha betg il dretg da midar ils livels da protecziun. 
-Qua èn las reglas actualas per l'artitgel <strong>$1</strong>:",
+Qua èn las reglas actualas per l'artitgel '''$1''':",
 'protect-cascadeon'           => 'Questa pagina è actualmain protegida, perquai ch\'ella è integrada en {{PLURAL:$1|suandant artitgel che ha activà|suandants artitgels che han activà}} la "protecziun ertada". 
 Ti pos midar il livel da protecziun da quest\'artitgel, quai na vegn dentant betg ad avair in effec sin la "protecziun ertada".',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Lubir tut ils utilisaders',
 'protect-fallback'            => 'Il dretg "$1" è necessari',
-'protect-level-autoconfirmed' => 'Bloccar utilisaders na-registrads',
+'protect-level-autoconfirmed' => 'Bloccar utilisaders novs e na-registrads',
 'protect-level-sysop'         => 'be administraturs',
 'protect-summary-cascade'     => '"protecziun ertaivla"',
 'protect-expiring'            => 'Scroda $1 (UTC)',
@@ -791,6 +876,7 @@ sajas conscient da las consequenzas che quai process po avair.",
 
 En quests cas as ti da spustar u colliar manualmain las paginas, sche giavischà.",
 'movearticle'             => 'Spustar artitgel:',
+'movenologintext'         => "Ti stos [[Special:UserLogin|t'annunziar]] per spustar in artitgel.",
 'newtitle'                => 'Al titel nov:',
 'move-watch'              => 'Observar questa pagina',
 'movepagebtn'             => 'Spustar la pagina',
@@ -821,7 +907,7 @@ L\'artitgel da destinaziun "[[:$1]]" exista gia. Vul ti stidar el per far plaz p
 'allmessagesdefault'        => 'text original',
 'allmessagescurrent'        => 'text actual',
 'allmessagestext'           => 'Quai è ina glista da tut las communicaziuns dals differents tips da paginas da MediaWiki che vegnan utilisadas da la software da MediaWiki.
-Fai ina visita sin [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net Betawiki] sche ti vuls gidar da translatar la software da MediaWiki.',
+Fai ina visita sin [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] sche ti vuls gidar da translatar la software da MediaWiki.',
 'allmessagesnotsupportedDB' => "Questa pagina na po betg vegnir mussada, perquai che '''\$wgUseDatabaseMessages''' è vegnì deactivà.",
 'allmessagesfilter'         => 'filter dals nums da las novitads:',
 'allmessagesmodified'       => 'Be mussar modifitgads',
@@ -834,25 +920,28 @@ Fai ina visita sin [http://www.mediawiki.org/wiki/Localisation MediaWiki Localis
 'importlogpage' => 'Log dals imports',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "mia pagina d'utilisader",
-'tooltip-pt-mytalk'               => 'mia pagina da discussiun',
+'tooltip-pt-userpage'             => "Guardar tia pagina d'utilisader",
+'tooltip-pt-mytalk'               => 'Guardar tia pagina da discussiun',
 'tooltip-pt-preferences'          => 'mias preferenzas',
 'tooltip-pt-watchlist'            => 'La glista da las paginas da las qualas jau observ las midadas',
-'tooltip-pt-mycontris'            => 'Glista da tut mias contribuziuns',
+'tooltip-pt-mycontris'            => 'Guardar la glista da tut tias contribuziuns',
 'tooltip-pt-login'                => "I fiss bun sche ti s'annunziassas, ti na stos dentant betg.",
 'tooltip-pt-logout'               => 'Log-out',
 'tooltip-ca-talk'                 => "Discussiuns davart il cuntegn da l'artitgel",
 'tooltip-ca-edit'                 => "Ti pos editar questa pagina. 
 Utilisescha per plaschair il buttun 'mussar prevista' avant che memorisar.",
-'tooltip-ca-addsection'           => 'Agiuntar in commentari a questa discussiun.',
+'tooltip-ca-addsection'           => 'Cumenzar nov paragraf',
 'tooltip-ca-viewsource'           => 'Questa pagina è protegida.
 Ti pos vesair il code-fundamental.',
+'tooltip-ca-history'              => 'Versiuns pli veglias da questa pagina',
 'tooltip-ca-protect'              => 'Proteger questa pagina',
 'tooltip-ca-delete'               => 'Stidar quest artitgel',
 'tooltip-ca-move'                 => 'Spustar questa pagina',
 'tooltip-ca-watch'                => "Agiuntar questa pagina a tia glista d'observaziun",
 'tooltip-ca-unwatch'              => "Allontanar questa pagina da tia pagina d'observaziun",
 'tooltip-search'                  => 'Intercurir {{SITENAME}}',
+'tooltip-search-go'               => "Mussar la pagina cun exact quest num (sch'ella exista)",
+'tooltip-search-fulltext'         => 'Tschertgar en tut las paginas quest text',
 'tooltip-n-mainpage'              => 'Ir a la pagina principala',
 'tooltip-n-portal'                => 'Infurmaziuns davart il project, tge che ti pos far, nua che ti chassas infurmaziuns',
 'tooltip-n-currentevents'         => 'Chattar infurmaziuns davart occurrenzas actualas',
@@ -860,13 +949,21 @@ Ti pos vesair il code-fundamental.',
 'tooltip-n-randompage'            => 'Chargiar ina pagina casuala.',
 'tooltip-n-help'                  => 'Qua chattas agid.',
 'tooltip-t-whatlinkshere'         => 'Glista da tut las paginas vichi che mussan sin questa pagina',
+'tooltip-t-recentchangeslinked'   => 'Ultimas midadas sin paginas colliadas cun questa pagina',
+'tooltip-feed-rss'                => 'RSS feed per questa pagina',
+'tooltip-feed-atom'               => 'Atom feed per questa pagina',
 'tooltip-t-contributions'         => 'Guardar las contribuziuns da quest utilisader',
 'tooltip-t-emailuser'             => 'Trametter in e-mail a quest utilisader',
 'tooltip-t-upload'                => 'Chargiar si datotecas',
 'tooltip-t-specialpages'          => 'Glista da tut las paginas spezialas',
+'tooltip-t-print'                 => 'Versiun per stampar da questa pagina',
+'tooltip-ca-nstab-main'           => "Guardar l'artitgel",
 'tooltip-ca-nstab-user'           => "Guardar la pagina da l'utilisader",
+'tooltip-ca-nstab-media'          => 'Guardiar la pagina cun medias',
+'tooltip-ca-nstab-special'        => 'Quai è ina pagina speziala, quella na pos ti betg editar',
 'tooltip-ca-nstab-project'        => 'Guardar la pagina da project',
 'tooltip-ca-nstab-image'          => 'Guardar la pagina da la datoteca',
+'tooltip-ca-nstab-mediawiki'      => 'Guardar ils messadis dal sistem',
 'tooltip-ca-nstab-template'       => 'Guardar il template',
 'tooltip-ca-nstab-help'           => "Guardar la pagina d'agid",
 'tooltip-ca-nstab-category'       => 'Guardar la pagina da la categoria',
@@ -885,7 +982,7 @@ Ti pos vesair il code-fundamental.',
 'monobook.js' => '/* Deprecated; use [[MediaWiki:common.js]] */',
 
 # Attribution
-'anonymous'     => 'Utilisader(s) anonim(s) da {{SITENAME}}',
+'anonymous'     => '{{PLURAL:$1|In utilisader anonim|Utilisaders anonims}} da {{SITENAME}}',
 'othercontribs' => 'Basescha sin la lavur da $1.',
 'others'        => 'auters',
 'creditspage'   => 'Statistica da la pagina',
@@ -921,7 +1018,7 @@ Ti pos vesair il code-fundamental.',
 'show-big-image'       => 'Resoluziun cumplaina',
 'show-big-image-thumb' => '<small>Grondezza da quest prevista: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Novs maletgs',
 'ilsubmit'  => 'Tschertgar',
 'bydate'    => 'tenor data',
@@ -989,14 +1086,8 @@ Bler divertiment!',
 Conferma per plaschair che ti vuls propi crear danovamain quest artitgel.",
 
 # action=purge
-'confirm_purge'        => 'Stidar il cache da questa pagina?
-
-$1',
 'confirm_purge_button' => 'ok',
-
-# AJAX search
-'articletitles' => "Artitgels che entschaivan cun ''$1''",
-'hideresults'   => 'zuppar ils resultats',
+'confirm-purge-top'    => 'Stidar il cache da questa pagina?',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Guardar las midadas relevantas',
diff --git a/languages/messages/MessagesRmy.php b/languages/messages/MessagesRmy.php
index 68ccac8b..21c58975 100644
--- a/languages/messages/MessagesRmy.php
+++ b/languages/messages/MessagesRmy.php
@@ -5,7 +5,6 @@
  * @file
  *
  * @author Desiphral
- * @author Niklas Laxström
  * @author לערי ריינה�רט
  */
 
@@ -20,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Jeno_vakyarimata',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '{{grammar:genitive-pl|$1}}_vakyarimata',
-	NS_IMAGE          => 'Chitro',
-	NS_IMAGE_TALK     => 'Chitro_vakyarimata',
+	NS_FILE           => 'Chitro',
+	NS_FILE_TALK      => 'Chitro_vakyarimata',
 	NS_MEDIAWIKI      => 'MediyaViki',
 	NS_MEDIAWIKI_TALK => 'MediyaViki_vakyarimata',
 	NS_TEMPLATE       => 'Sikavno',
@@ -83,7 +82,7 @@ $messages = array(
 'mypage'         => 'Miri patrin',
 'mytalk'         => 'Mire vakyarimata',
 'navigation'     => 'Phiripen',
-'and'            => 'thai',
+'and'            => '&#32;thai',
 
 'errorpagetitle'   => 'Dosh',
 'returnto'         => 'Ja palpale kai $1.',
@@ -174,7 +173,6 @@ Akana si tuke ekh akont. Te na bistares te paruves, kana trebul tuke, tire kamim
 'yourpassword'               => 'O nakhavipnasko lav',
 'yourpasswordagain'          => 'O nakhavipnasko lav de nevo',
 'externaldberror'            => 'Sas ekh dosh kai datengi baza le avrutne prinjaripnyange vai nai tuke drom te akanutnisares o avrutno akonto.',
-'loginproblem'               => '<b>Sas ek problem kai tiro prinjaripen</b><br />Ker les de nevo!',
 'login'                      => 'Prinjaripen',
 'loginprompt'                => "Trebul te das drom le phandimatenge ''cookie'' te das andre kai {{SITENAME}}.",
 'userlogin'                  => 'Prinjaripen / Ker ek akount',
@@ -215,11 +213,15 @@ Mishto si te jas kai {{SITENAME}} thai te paruves tiro lav sigo.',
 'accountcreated'             => 'Akount kerdo',
 'accountcreatedtext'         => 'Kerdo o akonto le jenesko ko $1.',
 
+# Password reset dialog
+'oldpassword' => 'Purano nakahvipnasko lav',
+'newpassword' => 'Nevo nakhavipnasko lav:',
+
 # Edit page toolbar
 'image_sample' => 'Misal.jpg',
 
 # Edit pages
-'summary'            => 'Xarno xalyaripen',
+'summary'            => 'Xarno xalyaripen:',
 'minoredit'          => 'Kadava si ek tikno editisarimos',
 'watchthis'          => 'Dikh kadaya patrin',
 'savearticle'        => 'Uxtav i patrin',
@@ -242,7 +244,6 @@ Kana avilyan kathe doshatar, ja palpale.',
 'yourdiff'           => 'Ververimata',
 
 # History pages
-'revnotfoundtext'  => 'I puraneder versiya la patrinyaki so tu manglyan na arakhel pes. Mangas tuke te palemdikhes o phandipen so labyardyan kana avilyan kathe.',
 'previousrevision' => '� Purano paruvipen',
 'nextrevision'     => 'Nevi paruvipen →',
 'cur'              => 'akanutni',
@@ -263,6 +264,7 @@ Kana avilyan kathe doshatar, ja palpale.',
 'prevn'             => 'mai neve $1',
 'nextn'             => 'mai purane $1',
 'viewprevnext'      => 'Dikh ($1) ($2) ($3).',
+'searchhelp-url'    => 'Help:Zhutipen',
 'showingresults'    => 'Tele si <b>$1</b> rezultaturya shirdindoi le ginestar <b>$2</b>.',
 'showingresultsnum' => 'Tele si <b>$3</b> rezultaturya shirdindoi le ginestar <b>$2</b>.',
 'powersearch'       => 'Rod',
@@ -283,8 +285,6 @@ Kana avilyan kathe doshatar, ja palpale.',
 'prefs-rc'              => 'Neve paruvimata',
 'saveprefs'             => 'Uxtav le kamimata',
 'resetprefs'            => 'Thov le kamimata sar ko shirdipen',
-'oldpassword'           => 'Purano nakahvipnasko lav',
-'newpassword'           => 'Nevo nakhavipnasko lav:',
 'columns'               => 'Uche vortorina:',
 'contextlines'          => 'Vortorinyango gin pe avimos:',
 'contextchars'          => 'Grafemengo gin pe ekh vortorin:',
@@ -346,10 +346,10 @@ Kana avilyan kathe doshatar, ja palpale.',
 'badfilename' => 'O chitrosko anav sas paruvdo; o nevo anav si "$1".',
 'savefile'    => 'Uxtav file',
 
-# Special:ImageList
-'imagelist' => 'Patrinipen le chitrengo',
+# Special:ListFiles
+'listfiles' => 'Patrinipen le chitrengo',
 
-# Image description page
+# File description page
 'imagelinks' => 'Chitroske phandimata',
 
 # Unused templates
@@ -360,10 +360,7 @@ Kana avilyan kathe doshatar, ja palpale.',
 'randompage' => 'Ekh patrin savigodi',
 
 # Statistics
-'statistics'    => 'Beshimata',
-'sitestats'     => 'Site-ske beshimata',
-'userstatstext' => 'Si <b>$1</b> jene rejistrime (lekhavde).
-Mashkar lende <b>$2</b> si administratorurya (dikh $3).',
+'statistics' => 'Beshimata',
 
 # Miscellaneous special pages
 'wantedpages'  => 'Kamle pajine',
@@ -403,7 +400,7 @@ Kana kamesa te khoses kadaya patrin andar tiri lista le patryange so arakhes len
 'enotif_reset'       => 'Thov semno kai patrya so dikhlem',
 'enotif_newpagetext' => 'Kadaya si ek nevi patrin.',
 
-# Delete/protect/revert
+# Delete
 'deletepage'      => 'Khos i patrin',
 'confirm'         => 'Ja',
 'excontent'       => "o ander sas: '$1'",
@@ -414,9 +411,14 @@ Kana kamesa te khoses kadaya patrin andar tiri lista le patryange so arakhes len
 'deletedtext'     => '"<nowiki>$1</nowiki>" sas khosli.
 Dikh ando $2 ek patrinipen le palutne butyange khosle.',
 'deletedarticle'  => '"$1" sas khosli.',
-'rollback_short'  => 'Palemavilipen',
-'rollbacklink'    => 'palemavilipen',
-'rollbackfailed'  => 'O palemavilipen nashtisardyas te kerel pes.',
+
+# Rollback
+'rollback_short' => 'Palemavilipen',
+'rollbacklink'   => 'palemavilipen',
+'rollbackfailed' => 'O palemavilipen nashtisardyas te kerel pes.',
+
+# Protect
+'prot_1movedto2' => '[[$1]] bichhaldo kai [[$2]]',
 
 # Undelete
 'undelete'      => 'Dikh le khosle patrya',
@@ -528,7 +530,7 @@ Dikh ando $2 ek patrinipen le palutne butyange khosle.',
 'previousdiff' => '� Purano ververipen',
 'nextdiff'     => 'Anglutno paruvipen →',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1 boturya)',
 'ilsubmit'     => 'Rod',
 
diff --git a/languages/messages/MessagesRo.php b/languages/messages/MessagesRo.php
index 2332b975..d23cd100 100644
--- a/languages/messages/MessagesRo.php
+++ b/languages/messages/MessagesRo.php
@@ -15,11 +15,6 @@
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => 'Normală',
-	'nostalgia' => 'Nostalgie'
-);
-
 $separatorTransformTable = array( ',' => ".", '.' => ',' );
 
 $magicWords = array(
@@ -38,47 +33,115 @@ $magicWords = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Special',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discuţie',
-	NS_USER           => 'Utilizator',
-	NS_USER_TALK      => 'Discuţie_Utilizator',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Discuţie_$1',
-	NS_IMAGE          => 'Imagine',
-	NS_IMAGE_TALK     => 'Discuţie_Imagine',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Discuţie_MediaWiki',
-	NS_TEMPLATE       => 'Format',
-	NS_TEMPLATE_TALK  => 'Discuţie_Format',
-	NS_HELP           => 'Ajutor',
-	NS_HELP_TALK      => 'Discuţie_Ajutor',
-	NS_CATEGORY       => 'Categorie',
-	NS_CATEGORY_TALK  => 'Discuţie_Categorie'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Special',
+	NS_TALK             => 'Discuţie',
+	NS_USER             => 'Utilizator',
+	NS_USER_TALK        => 'Discuţie_Utilizator',
+	NS_PROJECT_TALK     => 'Discuţie_$1',
+	NS_FILE             => 'FiÅŸier',
+	NS_FILE_TALK        => 'Discuţie_Fişier',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Discuţie_MediaWiki',
+	NS_TEMPLATE         => 'Format',
+	NS_TEMPLATE_TALK    => 'Discuţie_Format',
+	NS_HELP             => 'Ajutor',
+	NS_HELP_TALK        => 'Discuţie_Ajutor',
+	NS_CATEGORY         => 'Categorie',
+	NS_CATEGORY_TALK    => 'Discuţie_Categorie',
+);
+
+$namespaceAliases = array(
+	'Imagine' => NS_FILE,
+	'Discuţie_Imagine' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Redirectări_duble' ),
-	'BrokenRedirects'           => array( 'Redirectări_invalide' ),
+	'DoubleRedirects'           => array( 'Redirectări duble' ),
+	'BrokenRedirects'           => array( 'Redirectări invalide' ),
 	'Disambiguations'           => array( 'Dezambiguizări' ),
-	'Userlogin'                 => array( 'Conectare', 'Autentificare' ),
-	'Userlogout'                => array( 'Deconectare', 'IeÅŸire' ),
+	'Userlogin'                 => array( 'Autentificare' ),
+	'Userlogout'                => array( 'IeÅŸire' ),
 	'CreateAccount'             => array( 'ÃŽnregistrare' ),
 	'Preferences'               => array( 'Preferinţe' ),
-	'Watchlist'                 => array( 'Articole_urmărite', 'Pagini_urmărite' ),
-	'Recentchanges'             => array( 'Schimbări_recente' ),
-	'Upload'                    => array( 'Încarcă', 'Încărcare' ),
-	'Imagelist'                 => array( 'Listă_imagini', 'Lista_imaginilor' ),
-	'Newimages'                 => array( 'Imagini_noi', 'ImaginiNoi' ),
-	'Listusers'                 => array( 'Listă_utilizatori' ),
-	'Listgrouprights'           => array( 'Listă_drepturi_grup' ),
+	'Watchlist'                 => array( 'Pagini urmărite' ),
+	'Recentchanges'             => array( 'Schimbări recente' ),
+	'Upload'                    => array( 'Încărcare' ),
+	'Listfiles'                 => array( 'Listă imagini' ),
+	'Newimages'                 => array( 'Imagini noi' ),
+	'Listusers'                 => array( 'Listă utilizatori' ),
+	'Listgrouprights'           => array( 'Listă drepturi grup' ),
 	'Statistics'                => array( 'Statistici' ),
-	'Randompage'                => array( 'Aleatoriu', 'PaginăAleatorie' ),
-	'Lonelypages'               => array( 'Pagini_orfane', 'PaginiOrfane' ),
-	'Uncategorizedpages'        => array( 'PaginiNecategorizate' ),
-	'Uncategorizedcategories'   => array( 'CategoriiNecategorizate' ),
-	'Uncategorizedimages'       => array( 'ImaginiNecategorizate' ),
+	'Randompage'                => array( 'Aleatoriu', 'Pagină aleatorie' ),
+	'Lonelypages'               => array( 'Pagini orfane' ),
+	'Uncategorizedpages'        => array( 'Pagini necategorizate' ),
+	'Uncategorizedcategories'   => array( 'Categorii necategorizate' ),
+	'Uncategorizedimages'       => array( 'Imagini necategorizate' ),
+	'Uncategorizedtemplates'    => array( 'Formate necategorizate' ),
+	'Unusedcategories'          => array( 'Categorii nefolosite' ),
+	'Unusedimages'              => array( 'Imagini nefolosite' ),
+	'Wantedpages'               => array( 'Pagini dorite', 'Legături invalide' ),
+	'Wantedcategories'          => array( 'Categorii dorite' ),
+	'Wantedfiles'               => array( 'FiÅŸiere dorite' ),
+	'Wantedtemplates'           => array( 'Formate dorite' ),
+	'Mostlinked'                => array( 'Legături multe' ),
+	'Mostlinkedcategories'      => array( 'Categorii des folosite' ),
+	'Mostlinkedtemplates'       => array( 'Formate des folosite' ),
+	'Mostimages'                => array( 'Imagini multe' ),
+	'Mostcategories'            => array( 'Categorii multe' ),
+	'Mostrevisions'             => array( 'Revizii multe' ),
+	'Fewestrevisions'           => array( 'Revizii puţine' ),
+	'Shortpages'                => array( 'Pagini scurte' ),
+	'Longpages'                 => array( 'Pagini lungi' ),
+	'Newpages'                  => array( 'Pagini noi' ),
+	'Ancientpages'              => array( 'Pagini vechi' ),
+	'Deadendpages'              => array( 'Pagini fără legături' ),
+	'Protectedpages'            => array( 'Pagini protejate' ),
+	'Protectedtitles'           => array( 'Titluri protejate' ),
+	'Allpages'                  => array( 'Toate paginile' ),
+	'Prefixindex'               => array( 'Index' ),
+	'Ipblocklist'               => array( 'Listă IP blocat' ),
+	'Specialpages'              => array( 'Pagini speciale' ),
+	'Contributions'             => array( 'Contribuţii' ),
+	'Emailuser'                 => array( 'Email utilizator' ),
+	'Confirmemail'              => array( 'Confirmă email' ),
+	'Whatlinkshere'             => array( 'Ce se leagă aici' ),
+	'Recentchangeslinked'       => array( 'Modificări corelate' ),
+	'Movepage'                  => array( 'Mută pagina' ),
+	'Blockme'                   => array( 'Blochează-mă' ),
+	'Booksources'               => array( 'Referinţe în cărţi' ),
+	'Categories'                => array( 'Categorii' ),
+	'Export'                    => array( 'Exportă' ),
+	'Version'                   => array( 'Versiune' ),
+	'Allmessages'               => array( 'Toate mesajele' ),
+	'Log'                       => array( 'Jurnal', 'Jurnale' ),
+	'Blockip'                   => array( 'Blochează IP' ),
+	'Undelete'                  => array( 'Restaurează' ),
+	'Import'                    => array( 'Importă' ),
+	'Lockdb'                    => array( 'Blochează BD' ),
+	'Unlockdb'                  => array( 'Deblochează BD' ),
+	'Userrights'                => array( 'Drepturi utilizator' ),
+	'MIMEsearch'                => array( 'Căutare MIME' ),
+	'FileDuplicateSearch'       => array( 'Căutare fişier duplicat' ),
+	'Unwatchedpages'            => array( 'Pagini neurmărite' ),
+	'Listredirects'             => array( 'Listă redirectări' ),
+	'Revisiondelete'            => array( 'Åžterge revizie' ),
+	'Unusedtemplates'           => array( 'Formate nefolosite' ),
+	'Randomredirect'            => array( 'Redirectare aleatorie' ),
+	'Mypage'                    => array( 'Pagina mea' ),
+	'Mytalk'                    => array( 'Discuţiile mele' ),
+	'Mycontributions'           => array( 'Contribuţiile mele' ),
+	'Listadmins'                => array( 'Listă administratori' ),
+	'Listbots'                  => array( 'Listă roboţi' ),
+	'Popularpages'              => array( 'Pagini populare' ),
+	'Search'                    => array( 'Căutare' ),
+	'Resetpass'                 => array( 'Resetează parola' ),
+	'Withoutinterwiki'          => array( 'Fără legături interwiki' ),
+	'MergeHistory'              => array( 'Istoria combinărilor' ),
+	'Filepath'                  => array( 'Cale fiÅŸier' ),
+	'Invalidateemail'           => array( 'Invalidează email' ),
+	'Blankpage'                 => array( 'Pagină goală' ),
+	'DeletedContributions'      => array( 'Contibuţii şterse' ),
 );
 
 $datePreferences = false;
@@ -130,17 +193,18 @@ pe titlul secţiunii (JavaScript)',
 'tog-watchlisthideown'        => 'Ascunde modificările mele la lista mea de urmărire',
 'tog-watchlisthidebots'       => 'Ascunde modificările boţilor la lista mea de urmărire',
 'tog-watchlisthideminor'      => 'Ascunde modificările minore la lista mea de urmărire',
+'tog-watchlisthideliu'        => 'Ascunde modificările făcute de utilizatori anonimi din lista de pagini urmărite',
+'tog-watchlisthideanons'      => 'Ascunde modificările făcute de utilizatori anonimi din lista de pagini urmărite',
 'tog-nolangconversion'        => 'Dezactivează conversia variabilelor',
 'tog-ccmeonemails'            => 'Trimite-mi o copie când trimit un email altui utilizator',
 'tog-diffonly'                => 'Nu arăta conţinutul paginii sub dif',
 'tog-showhiddencats'          => 'Arată categoriile ascunse',
+'tog-norollbackdiff'          => 'Nu arăta diferenţa după efectuarea unei reveniri',
 
 'underline-always'  => 'ÃŽntotdeauna',
 'underline-never'   => 'Niciodată',
 'underline-default' => 'Standardul browser-ului',
 
-'skinpreview' => '(Previzualizare)',
-
 # Dates
 'sunday'        => 'duminică',
 'monday'        => 'luni',
@@ -233,7 +297,7 @@ pe titlul secţiunii (JavaScript)',
 'mytalk'         => 'Discuţii',
 'anontalk'       => 'Discuţia pentru această adresă IP',
 'navigation'     => 'Navigare',
-'and'            => 'ÅŸi',
+'and'            => '&#32;ÅŸi',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -296,8 +360,6 @@ pe titlul secţiunii (JavaScript)',
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Despre {{SITENAME}}',
 'aboutpage'            => 'Project:Despre',
-'bugreports'           => 'Raportare probleme',
-'bugreportspage'       => 'Project:Rapoarte probleme',
 'copyright'            => 'Conţinutul este disponibil sub $1.',
 'copyrightpagename'    => 'Drepturi de autor în {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Drepturi de autor',
@@ -320,9 +382,7 @@ pe titlul secţiunii (JavaScript)',
 
 'badaccess'        => 'Eroare permisiune',
 'badaccess-group0' => 'Execuţia acţiunii cerute nu este permisă.',
-'badaccess-group1' => 'Acţiunea cerută este rezervată utilizatorilor din grupul $1.',
-'badaccess-group2' => 'Acţiunea cerută este rezervată utilizatorilor din unul din grupurile $1.',
-'badaccess-groups' => 'Acţiunea cerută este rezervată utilizatorilor din unul din grupurile $1.',
+'badaccess-groups' => 'Acţiunea cerută este rezervată utilizatorilor din {{PLURAL:$2|grupul|unul din grupurile}}: $1.',
 
 'versionrequired'     => 'Este necesară versiunea $1 MediaWiki',
 'versionrequiredtext' => 'Versiunea $1 MediaWiki este necesară pentru a folosi această pagină. Vezi [[Special:Version|versiunea actuală]].',
@@ -336,6 +396,8 @@ pe titlul secţiunii (JavaScript)',
 'editsection'             => 'modifică',
 'editold'                 => 'modifică',
 'viewsourceold'           => 'vizualizaţi sursa',
+'editlink'                => 'modifică',
+'viewsourcelink'          => 'vezi sursa',
 'editsectionhint'         => 'Modifică secţiunea: $1',
 'toc'                     => 'Cuprins',
 'showtoc'                 => 'arată',
@@ -412,7 +474,6 @@ Te rog anunţă acest aspect unui [[Special:ListUsers/sysop|administrator]], ind
 'cannotdelete'         => 'Comanda de ştergere nu s-a putut executa! Probabil că ştergerea a fost operată între timp.',
 'badtitle'             => 'Titlu incorect',
 'badtitletext'         => 'Titlul căutat a fost invalid, gol sau o legătură invalidă inter-linguală sau inter-wiki.',
-'perfdisabled'         => 'Ne pare rău! Această opţiune a fost dezactivată temporar în timpul orelor de vârf din motive de performanţă. Te rugăm să revii la altă oră şi să încerci din nou.',
 'perfcached'           => 'Datele următoare au fost păstrate în cache şi s-ar putea să nu fie la zi.',
 'perfcachedts'         => "Informaţiile de mai jos provin din ''cache''; ultima actualizare s-a efectuat la $1.",
 'querypage-no-updates' => 'Actualizările acestei pagini sunt momentan dezactivate. Informaţiile de aici nu sunt împrospătate.',
@@ -427,7 +488,7 @@ Te rog încearcă din nou în câteva minute.',
 'protectedpagetext'    => 'Această pagină este protejată împotriva modificărilor.',
 'viewsourcetext'       => 'Se poate vizualiza şi copia conţinutul acestei pagini:',
 'protectedinterface'   => 'Această pagină asigură textul interfeţei pentru software şi este protejată pentru a preveni abuzurile.',
-'editinginterface'     => "'''Avertizare''': Editezi o pagină care este folosită pentru a furniza textul interfeţei pentru software. Modificările aduse acestei pagini vor afecta aspectul interfeţei utilizatorului pentru alţi utilizatori. Pentru traduceri, consideraţi utilizarea [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], proiectul MediaWiki de localizare.",
+'editinginterface'     => "'''Avertizare''': Editezi o pagină care este folosită pentru a furniza textul interfeţei pentru software. Modificările aduse acestei pagini vor afecta aspectul interfeţei utilizatorului pentru alţi utilizatori. Pentru traduceri, consideraţi utilizarea [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], proiectul MediaWiki de localizare.",
 'sqlhidden'            => '(interogare SQL ascunsă)',
 'cascadeprotected'     => 'Această pagină a fost protejată la scriere deoarece este inclusă în {{PLURAL:$1|următoarea pagină|următoarele pagini}}, care {{PLURAL:$1|este protejată|sunt protejate}} în cascadă:
 $2',
@@ -438,7 +499,7 @@ $2',
 Motivul invocat este ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Configuraţie greşită: scaner de virus necunoscut: <i>$1</i>',
+'virus-badscanner'     => "Configuraţie greşită: scaner de virus necunoscut: ''$1''",
 'virus-scanfailed'     => 'scanare eşuată (cod $1)',
 'virus-unknownscanner' => 'antivirus necunoscut:',
 
@@ -455,8 +516,6 @@ Contul dumneavoatră a fost creat. Nu uitaţi să vă personalizaţi [[Special:P
 'remembermypassword'         => 'Reţine-mi parola între sesiuni',
 'yourdomainname'             => 'Domeniul tău',
 'externaldberror'            => 'A fost fie o eroare de bază de date pentru o autentificare extenă sau nu aveţi permisiunea să actualizaţi contul extern.',
-'loginproblem'               => '<b>A apărut o problemă la autentificarea ta.</b><br />
-Încearcă din nou!',
 'login'                      => 'Autentificare',
 'nav-login-createaccount'    => 'Creare cont / Autentificare',
 'loginprompt'                => 'Trebuie să ai modulele cookie activate pentru a te autentifica la {{SITENAME}}.',
@@ -494,6 +553,7 @@ Dimensiunea trebuie să fie mai mică de $1 {{PLURAL:$1|caracter|caractere}}.',
 'loginsuccesstitle'          => 'Autentificare reuşită',
 'loginsuccess'               => 'Aţi fost autentificat în {{SITENAME}} ca "$1".',
 'nosuchuser'                 => 'Nu există nici un utilizator cu numele „$1�.
+Numele de utilizatori sunt sensibile la majuscule.
 Verifică dacă ai scris corect sau [[Special:UserLogin/signup|creează un nou cont de utilizator]].',
 'nosuchusershort'            => 'Nu este nici un utilizator cu numele "<nowiki>$1</nowiki>". Verificaţi dacă aţi scris corect.',
 'nouserspecified'            => 'Trebuie să specificaţi un nume de utilizator.',
@@ -517,10 +577,10 @@ să folosiţi vechea parolă.',
 'eauthentsent'               => 'Un email de confirmare a fost trimis adresei nominalizate. Înainte de a fi trimis orice alt email acestui cont, trebuie să urmaţi intrucţiunile din email, pentru a confirma că acest cont este într-adevăr al dvs.',
 'throttled-mailpassword'     => 'O parolă a fost deja trimisă în {{PLURAL:$1|ultima oră|ultimele $1 ore}}. Pentru a preveni abuzul, se poate trimite doar o parolă la {{PLURAL:$1|o oră|$1 ore}}.',
 'mailerror'                  => 'Eroare la trimitere e-mail: $1',
-'acct_creation_throttle_hit' => 'Ne pare rău, aţi creat deja $1 conturi de utilizator. Nu mai puteţi crea altul.',
-'emailauthenticated'         => 'Adresa de email a fost autentificată la $1.',
+'acct_creation_throttle_hit' => 'Ne pare rău, aţi creat deja {{PLURAL:$1|1 cont|$1 conturi}} de utilizator. Nu mai puteţi crea altul.',
+'emailauthenticated'         => 'Adresa de e-mail a fost autentificată pe $2, la $3.',
 'emailnotauthenticated'      => 'Adresa de email <strong>nu este autentificată încă</strong>. Nici un email nu va fi trimis pentru nici una din întrebuinţările următoare.',
-'noemailprefs'               => '<strong>Nu a fost specificată o adresă email</strong>, următoarele nu vor funcţiona.',
+'noemailprefs'               => 'Nu a fost specificată o adresă email, următoarele nu vor funcţiona.',
 'emailconfirmlink'           => 'Confirmaţi adresa dvs. de email',
 'invalidemailaddress'        => 'Adresa de email nu a putut fi acceptată pentru că pare a avea un format invalid. Vă rugăm să reintroduceţi o adresă bine formatată sau să goliţi acel câmp.',
 'accountcreated'             => 'Contul a fost creat.',
@@ -530,18 +590,26 @@ să folosiţi vechea parolă.',
 Este de dorit să vă autentificaţi şi să schimbaţi parola cât mai repede.
 
 Ignoraţi acest mesaj, dacă acea creare a fost o greşeală.',
+'login-throttled'            => 'Ai încercat de prea multe ori să introduci parola. Te rog aşteaptă înainte de a încerca din nou.',
 'loginlanguagelabel'         => 'Limba: $1',
 
 # Password reset dialog
-'resetpass'               => 'Resetează parola contului',
-'resetpass_announce'      => 'Sunteţi autentificat cu un cod temporar trimis pe mail. Pentru a termina acţiunea de autentificare, trebuie să setaţi o parolă nouă aici:',
-'resetpass_text'          => '<!-- Adaugă text aici -->',
-'resetpass_header'        => 'Modifică parola',
-'resetpass_submit'        => 'Setează parola şi autentifică',
-'resetpass_success'       => 'Parola a fost schimbată cu succes! Autentificare în curs...',
-'resetpass_bad_temporary' => 'Parola temporară nu este validă. Este posibil să vă fi schimbat deja parola cu succes sau să fi cerut o nouă parolă temporară.',
-'resetpass_forbidden'     => 'Parolele nu pot fi schimbate.',
-'resetpass_missing'       => 'Nu există date în formular.',
+'resetpass'                 => 'Modifică parola',
+'resetpass_announce'        => 'Sunteţi autentificat cu un cod temporar trimis pe mail. Pentru a termina acţiunea de autentificare, trebuie să setaţi o parolă nouă aici:',
+'resetpass_text'            => '<!-- Adaugă text aici -->',
+'resetpass_header'          => 'Modifică parola',
+'oldpassword'               => 'Parola veche',
+'newpassword'               => 'Parola nouă',
+'retypenew'                 => 'Repetă parola nouă',
+'resetpass_submit'          => 'Setează parola şi autentifică',
+'resetpass_success'         => 'Parola a fost schimbată cu succes! Autentificare în curs...',
+'resetpass_bad_temporary'   => 'Parola temporară nu este validă. Este posibil să vă fi schimbat deja parola cu succes sau să fi cerut o nouă parolă temporară.',
+'resetpass_forbidden'       => 'Parolele nu pot fi schimbate.',
+'resetpass-no-info'         => 'Trebuie să fiţi autentificat pentru a accesa această pagină direct.',
+'resetpass-submit-loggedin' => 'Modifică parola',
+'resetpass-wrong-oldpass'   => 'Parolă curentă sau temporară incorectă. 
+Este posibil să fi reuşit deja schimbarea parolei sau să fi cerut o parolă temporară nouă.',
+'resetpass-temp-password'   => 'Parolă temporară:',
 
 # Edit page toolbar
 'bold_sample'     => 'Text aldin',
@@ -566,8 +634,8 @@ Ignoraţi acest mesaj, dacă acea creare a fost o greşeală.',
 'hr_tip'          => 'Linie orizontală (folosiţi-o cumpătat)',
 
 # Edit pages
-'summary'                          => 'Sumar',
-'subject'                          => 'Subiect / titlu',
+'summary'                          => 'Rezumat:',
+'subject'                          => 'Subiect / titlu:',
 'minoredit'                        => 'Aceasta este o editare minoră',
 'watchthis'                        => 'Urmăreşte această pagină',
 'savearticle'                      => 'Salvează pagina',
@@ -579,7 +647,7 @@ Ignoraţi acest mesaj, dacă acea creare a fost o greşeală.',
 'missingsummary'                   => "'''Atenţie:''' Nu aţi completat caseta \"descriere modificări\". Dacă apăsaţi din nou butonul \"salvează pagina\" modificările vor fi salvate fără descriere.",
 'missingcommenttext'               => 'Vă rugăm să introduceţi un comentariu.',
 'missingcommentheader'             => "'''Atenţie:''' Nu aţi furnizat un titlu/subiect pentru acest comentariu. Dacă daţi click pe \"Salvaţi din nou\", modificarea va fi salvată fără titlu.",
-'summary-preview'                  => 'Previzualizare descriere',
+'summary-preview'                  => 'Previzualizare descriere:',
 'subject-preview'                  => 'Previzualizare subiect/titlu:',
 'blockedtitle'                     => 'Utilizatorul este blocat',
 'blockedtext'                      => "<big>'''Adresa IP sau contul dumneavoastră de utilizator a fost blocat.'''</big>
@@ -632,25 +700,25 @@ Dacă sunteţi un astfel de utilizator şi credeţi că vă sunt adresate mesaje
 'noarticletext'                    => '{{SITENAME}} nu are încă un articol referitor la această pagină. Puteţi [[Special:Search/{{PAGENAME}}|căuta titlul paginii cu acest nume]] în alte pagini sau [{{fullurl:{{FULLPAGENAME}}|action=edit}} edita această pagină].',
 'userpage-userdoesnotexist'        => 'Contul de utilizator "$1" nu este înregistrat. Verificaţi dacă doriţi să creaţi/modificaţi această pagină.',
 'clearyourcache'                   => "'''Notă:''' După salvare, trebuie să treceţi peste cache-ul browser-ului pentru a vedea modificările. '''Mozilla/Safari/Konqueror:''' ţineţi apăsat ''Shift'' în timp ce apăsaţi ''Reload'' (sau apăsaţi ''Ctrl-Shift-R''), '''IE:''' apăsaţi ''Ctrl-F5'', '''Opera:''' apăsaţi ''F5''.",
-'usercssjsyoucanpreview'           => "<strong>Sfat:</strong> Foloseşte butonul 'Arată previzualizare' pentru a testa noul tău css/js înainte de a salva.",
+'usercssjsyoucanpreview'           => "'''Sfat:''' Foloseşte butonul 'Arată previzualizare' pentru a testa noul tău css/js înainte de a salva.",
 'usercsspreview'                   => "'''Reţine că urmăreşti doar o previzualizare a css-ului tău de utilizator, acesta nu este încă salvat!'''",
 'userjspreview'                    => "'''Reţine că urmăreşti doar un test/o previzualizare a javascript-ului tău de utilizator, acesta nu este încă salvat!'''",
 'userinvalidcssjstitle'            => '<b>Avertizare:</b> Nu există skin "$1". Aminteşte-ţi că paginile .css and .js specifice utilizatorilor au titluri care încep cu literă mică, de exemplu {{ns:user}}:Foo/monobook.css în comparaţie cu {{ns:user}}:Foo/Monobook.css.',
 'updated'                          => '(Actualizat)',
-'note'                             => '<strong>Notă:</strong>',
-'previewnote'                      => 'Aceasta este doar o previzualizare! Pentru a salva pagina în forma actuală, descrieţi succint modificările efectuate şi apăsaţi butonul <strong>Salvează pagina</strong>.',
+'note'                             => "'''Notă:'''",
+'previewnote'                      => "Aceasta este doar o previzualizare! Pentru a salva pagina în forma actuală, descrieţi succint modificările efectuate şi apăsaţi butonul '''Salvează pagina'''.",
 'previewconflict'                  => 'Această pre-vizualizare reflectă textul din caseta de sus, respectiv felul în care va arăta articolul dacă alegeţi să-l salvaţi acum.',
-'session_fail_preview'             => '<strong>Ne pare rău! Nu am putut procesa modificarea dumneavoastră din cauza pierderii datelor sesiunii.
+'session_fail_preview'             => "'''Ne pare rău! Nu am putut procesa modificarea dumneavoastră din cauza pierderii datelor sesiunii.
 Vă rugăm să încercaţi din nou.
-Dacă tot nu funcţionează, încercaţi să [[Special:UserLogout|închideţi sesiunea]] şi să vă autentificaţi din nou.</strong>',
-'session_fail_preview_html'        => "<strong>Ne pare rău! Modificările tale nu au putut fi procesate din cauza pierderii datelor sesiunii.</strong> 
+Dacă tot nu funcţionează, încercaţi să [[Special:UserLogout|închideţi sesiunea]] şi să vă autentificaţi din nou.'''",
+'session_fail_preview_html'        => "'''Ne pare rău! Modificările tale nu au putut fi procesate din cauza pierderii datelor sesiunii.''' 
 
 ''Deoarece {{SITENAME}} are activat HTML brut, previzualizarea este ascunsă ca măsură de precauţie împotriva atacurilor JavaScript.''
 
-<strong>Dacă această încercare de modificare este legitimă, te rugăm să încerci din nou. Dacă nu funcţionează nici în acest fel, [[Special:UserLogout|închide sesiunea]] şi încearcă să te autentifici din nou.</strong>",
-'token_suffix_mismatch'            => '<strong>Modificarea ta a fost refuzată pentru că clientul tău a deformat caracterele de punctuatie în modificarea semnului.
+'''Dacă această încercare de modificare este legitimă, te rugăm să încerci din nou. Dacă nu funcţionează nici în acest fel, [[Special:UserLogout|închide sesiunea]] şi încearcă să te autentifici din nou.'''",
+'token_suffix_mismatch'            => "'''Modificarea ta a fost refuzată pentru că clientul tău a deformat caracterele de punctuatie în modificarea semnului.
 Modificarea a fost respinsă pentru a preveni deformarea textului paginii.
-Acest fapt se poate întâmpla atunci când foloseşti un serviciu proxy anonim.</strong>',
+Acest fapt se poate întâmpla atunci când foloseşti un serviciu proxy anonim.'''",
 'editing'                          => 'modificare $1',
 'editingsection'                   => 'modificare $1 (secţiune)',
 'editingcomment'                   => 'modificare $1 (comentariu)',
@@ -662,23 +730,25 @@ Va trebui să editezi manual caseta de sus pentru a reflecta modificările pe ca
 '''Numai''' textul din caseta de sus va fi salvat atunci când vei apăsa pe \"Salvează pagina\".",
 'yourtext'                         => 'Textul tău',
 'storedversion'                    => 'Versiunea curentă',
-'nonunicodebrowser'                => '<strong>ATENŢIE: Browser-ul dumneavoastră nu este compilant unicode, vă rugăm să îl schimbaţi înainte de a începe modificarea unui articol.</strong>',
-'editingold'                       => '<strong>ATENŢIE! Modifici o variantă mai veche a acestei pagini! Orice modificări care s-au făcut de la această versiune şi până la cea curentă se vor pierde!</strong>',
+'nonunicodebrowser'                => "'''ATENŢIE: Browser-ul dumneavoastră nu este compilant unicode, vă rugăm să îl schimbaţi înainte de a începe modificarea unui articol.'''",
+'editingold'                       => "'''ATENŢIE! Modifici o variantă mai veche a acestei pagini! Orice modificări care s-au făcut de la această versiune şi până la cea curentă se vor pierde!'''",
 'yourdiff'                         => 'Diferenţe',
 'copyrightwarning'                 => "<!-- Gol deocamdată. Avertismentul se află în MediaWiki:Summary -->
-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.<br /> You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource. <strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>",
-'copyrightwarning2'                => 'Reţineţi că toate contribuţiile la {{SITENAME}} pot fi modificate, alterate sau şterse de alţi contribuitori.
+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.<br /> 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'                => "Reţineţi că toate contribuţiile la {{SITENAME}} pot fi modificate, alterate sau şterse de alţi contribuitori.
 Dacă nu doriţi ca ceea ce scrieţi să fie modificat fără milă şi redistribuit în voie, atunci nu trimiteţi materialele respective aici.<br />
 De asemenea, ne asiguraţi că ceea ce aţi scris a fost compoziţie proprie sau copie dintr-o resursă publică sau liberă (vedeţi $1 pentru detalii).
-<strong>NU INTRODUCEÅ¢I MATERIALE CU DREPTURI DE AUTOR FÄ‚RÄ‚ PERMISIUNE!</strong>',
-'longpagewarning'                  => '<strong>ATENŢIE! Conţinutul acestei pagini are $1 kB; unele browsere au probleme la modificarea paginilor în jur de 32 kB sau mai mari. Te rugăm să iei în considerare posibilitatea de a împărţi pagina în mai multe secţiuni.</strong>',
-'longpageerror'                    => '<strong>EROARE: Textul pe care vrei să-l salvezi are $1 kilobytes,
-ceea ce înseamnă mai mult decât maximum de $2 kilobytes. Salvarea nu este posibilă.</strong>',
-'readonlywarning'                  => '<strong>ATENŢIE! Baza de date a fost blocată pentru întreţinere, deci nu vei putea să salvezi editările în acest moment. Poţi copia textul într-un fişier text local pentru a modifica conţinutul în {{SITENAME}} când va fi posibil.</strong>',
-'protectedpagewarning'             => '<strong>ATENŢIE! Această pagină a fost protejată la scriere şi numai utilizatorii cu privilegii de administrator o pot modifica.</strong>',
+'''NU INTRODUCEÅ¢I MATERIALE CU DREPTURI DE AUTOR FÄ‚RÄ‚ PERMISIUNE!'''",
+'longpagewarning'                  => "'''ATENŢIE! Conţinutul acestei pagini are $1 kB; unele browsere au probleme la modificarea paginilor în jur de 32 kB sau mai mari. Te rugăm să iei în considerare posibilitatea de a împărţi pagina în mai multe secţiuni.'''",
+'longpageerror'                    => "'''EROARE: Textul pe care vrei să-l salvezi are $1 kilobytes,
+ceea ce înseamnă mai mult decât maximum de $2 kilobytes. Salvarea nu este posibilă.'''",
+'readonlywarning'                  => "'''ATENŢIE: Baza de date a fost blocată pentru întreţinere, deci nu veţi putea salva modificările în acest moment. Puteţi copia textul într-un fişier text local pentru a-l salva când va fi posibil.'''
+
+Administratorul care a efectuat blocarea a oferit următoarea explicaţie: $1",
+'protectedpagewarning'             => "'''ATENŢIE! Această pagină a fost protejată la scriere şi numai utilizatorii cu privilegii de administrator o pot modifica.'''",
 'semiprotectedpagewarning'         => "'''Atenţie:''' Această pagină poate fi modificată numai de utilizatorii înregistraţi.",
 'cascadeprotectedwarning'          => "'''Atenţie:''' Această pagină a fost blocată astfel încât numai administratorii o pot modifica, deoarece este inclusă în {{PLURAL:$1|următoarea pagină protejată|următoarele pagini protejate}} în cascadă:",
-'titleprotectedwarning'            => '<strong>ATENŢIE:  Această pagină a fost blocată, doar anumiţi utilizatori o pot crea.</strong>',
+'titleprotectedwarning'            => "'''ATENŢIE:  Această pagină a fost blocată, doar anumiţi utilizatori o pot crea.'''",
 'templatesused'                    => 'Formate folosite în această pagină:',
 'templatesusedpreview'             => 'Formate utilizate în această previzualizare:',
 'templatesusedsection'             => 'Formate utilizate în această secţiune:',
@@ -697,11 +767,20 @@ Puteţi edita o pagină deja existentă sau puteţi să vă [[Special:UserLogin|
 
 
 Pentru a verifica dacă recrearea paginii este într-adevăr oportună, iată aici jurnalul ştergerilor:",
+'deleted-notice'                   => 'Această pagină a fost ştearsă.
+Pentru detalii puteţi vedea jurnalul ştergerilor de mai jos.',
+'deletelog-fulllog'                => 'Vizualizează întreg jurnalul',
+'edit-gone-missing'                => 'Pagina nu s-a putut actualiza.
+Se pare că a fost ştearsă.',
+'edit-conflict'                    => 'Conflict de modificare.',
+'edit-no-change'                   => 'Modificarea dvs. a fost ignorată deoarece nu s-a efectuat nicio schimbare.',
+'edit-already-exists'              => 'Pagina nouă nu a putut fi creată.
+Ea există deja.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Atenţie: Această pagină conţine prea multe apelări costisitoare ale funcţiilor parser.
 
-Ar trebui să existe mai puţin de $2 {{PLURAL:$2|apelare|apelări}}, acum există {{PLURAL:$1|$1 apelare|$1 apelări}}.',
+Ar trebui să existe mai puţin de $2 {{PLURAL:$2|apelare|apelări}}, acolo există {{PLURAL:$1|$1 apelare|$1 apelări}}.',
 'expensive-parserfunction-category'       => 'Pagini cu prea multe apelări costisitoare de funcţii parser',
 'post-expand-template-inclusion-warning'  => 'Atenţie: Formatele incluse sunt prea mari.
 Unele formate nu vor fi incluse.',
@@ -709,6 +788,8 @@ Unele formate nu vor fi incluse.',
 'post-expand-template-argument-warning'   => 'Atenţie: Această pagină conţine cel puţin un argument al unui format care are o mărime prea mare atunci când este expandat.
 Acsete argumente au fost omise.',
 'post-expand-template-argument-category'  => 'Pagini care conţin formate cu argumente omise',
+'parser-template-loop-warning'            => 'Buclă de formate detectată: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limită de adâncime a recursiei depăşită ($1)',
 
 # "Undo" feature
 'undo-success' => 'Modificarea poate fi anulată. Verificaţi diferenţa de dedesupt şi apoi salvaţi pentru a termina anularea modificării.',
@@ -723,28 +804,28 @@ Acsete argumente au fost omise.',
 Motivul invocat de $3 este ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vezi jurnalele pentru această pagină',
-'nohistory'           => 'Nu există istoric pentru această pagină.',
-'revnotfound'         => 'Versiunea nu a fost găsită',
-'revnotfoundtext'     => 'Versiunea mai veche a paginii pe care aţi cerut-o nu a fost găsită. Vă rugăm să verificaţi legătura pe care aţi folosit-o pentru a accesa această pagină.',
-'currentrev'          => 'Versiunea curentă',
-'revisionasof'        => 'Versiunea de la data $1',
-'revision-info'       => 'Revizia pentru $1; $2',
-'previousrevision'    => '�Versiunea anterioară',
-'nextrevision'        => 'Versiunea următoare →',
-'currentrevisionlink' => 'afişează versiunea curentă',
-'cur'                 => 'actuală',
-'next'                => 'următoarea',
-'last'                => 'prec',
-'page_first'          => 'prim',
-'page_last'           => 'ultim',
-'histlegend'          => 'Legendă: (actuală) = diferenţe faţă de versiunea curentă,
+'viewpagelogs'           => 'Vezi jurnalele pentru această pagină',
+'nohistory'              => 'Nu există istoric pentru această pagină.',
+'currentrev'             => 'Versiunea curentă',
+'currentrev-asof'        => 'Versiunea curentă din $1',
+'revisionasof'           => 'Versiunea de la data $1',
+'revision-info'          => 'Revizia pentru $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Versiunea anterioară',
+'nextrevision'           => 'Versiunea următoare →',
+'currentrevisionlink'    => 'afişează versiunea curentă',
+'cur'                    => 'actuală',
+'next'                   => 'următoarea',
+'last'                   => 'prec',
+'page_first'             => 'prim',
+'page_last'              => 'ultim',
+'histlegend'             => 'Legendă: (actuală) = diferenţe faţă de versiunea curentă,
 (prec) = diferenţe faţă de versiunea precedentă, M = modificare minoră',
-'deletedrev'          => '[ÅŸters]',
-'histfirst'           => 'Primele',
-'histlast'            => 'Ultimele',
-'historysize'         => '({{PLURAL:$1|1 octet|$1 octeţi}})',
-'historyempty'        => '(gol)',
+'history-fieldset-title' => 'Răsfoieşte istoricul',
+'deletedrev'             => '[ÅŸters]',
+'histfirst'              => 'Primele',
+'histlast'               => 'Ultimele',
+'historysize'            => '({{PLURAL:$1|1 octet|$1 octeţi}})',
+'historyempty'           => '(gol)',
 
 # Revision feed
 'history-feed-title'          => 'Revizia istoricului',
@@ -829,6 +910,7 @@ Folosirea linkurilor de navigare va reseta această coloană.',
 'mergehistory-invalid-destination' => 'Pagina de destinaţie trebuie să aibă un titlu valid.',
 'mergehistory-autocomment'         => 'Combinat [[:$1]] în [[:$2]]',
 'mergehistory-comment'             => 'Combinat [[:$1]] în [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Paginile sursă şi destinaţie nu pot fi identice',
 
 # Merge log
 'mergelog'           => 'Jurnal unificări',
@@ -841,119 +923,202 @@ Folosirea linkurilor de navigare va reseta această coloană.',
 'difference'              => '(Diferenţa dintre versiuni)',
 'lineno'                  => 'Linia $1:',
 'compareselectedversions' => 'Compară versiunile selectate',
+'visualcomparison'        => 'Comparare vizuală',
+'wikicodecomparison'      => 'Comparare a wikitext-ului',
 'editundo'                => 'anulează',
 'diff-multi'              => '({{PLURAL:$1|O revizie intermediară neafişată|$1 revizii intermediare neafişate}})',
+'diff-movedto'            => 'mutat la $1',
+'diff-styleadded'         => 'stilul $1 a fost adăugat',
+'diff-added'              => '$1 a fost adăugat',
+'diff-changedto'          => 'schimbat în $1',
+'diff-movedoutof'         => 'mutat din $1',
+'diff-styleremoved'       => 'stilul $1 a fost ÅŸters',
+'diff-removed'            => '$1 a fost ÅŸters',
+'diff-changedfrom'        => 'schimbat din $1',
+'diff-src'                => 'sursă',
+'diff-withdestination'    => 'cu destinaţia $1',
+'diff-with'               => '&#32;cu $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;ÅŸi $1 $2',
+'diff-width'              => 'lăţime',
+'diff-height'             => 'înălţime',
+'diff-p'                  => "un '''paragraf'''",
+'diff-blockquote'         => "un '''citat'''",
+'diff-h1'                 => "un '''antet (nivel 1)'''",
+'diff-h2'                 => "un '''antet (nivel 2)'''",
+'diff-h3'                 => "un '''antet (nivel 3)'''",
+'diff-h4'                 => "un '''antet (nivel 4)'''",
+'diff-h5'                 => "un '''antet (nivel 5)'''",
+'diff-pre'                => "un '''bloc preformatat'''",
+'diff-div'                => "o '''diviziune'''",
+'diff-ul'                 => "o '''listă neordonată'''",
+'diff-ol'                 => "o '''listă ordonată'''",
+'diff-li'                 => "un '''element de listă'''",
+'diff-table'              => "un '''tabel'''",
+'diff-tbody'              => "un '''conţinut al tabelului'''",
+'diff-tr'                 => "un '''rând'''",
+'diff-td'                 => "o '''celulă'''",
+'diff-th'                 => "un '''antet'''",
+'diff-br'                 => "o '''rupere de rând'''",
+'diff-hr'                 => "o '''bară orizontală'''",
+'diff-code'               => "un '''bloc de cod de calculator'''",
+'diff-dl'                 => "o '''listă de definiţii'''",
+'diff-dt'                 => "un '''termen de definiţie'''",
+'diff-dd'                 => "o '''definiţie'''",
+'diff-input'              => "o '''introducere'''",
+'diff-form'               => "un '''formular'''",
+'diff-img'                => "o '''imagine'''",
+'diff-span'               => "o '''parte'''",
+'diff-a'                  => "o '''legătură'''",
+'diff-i'                  => "'''cursiv'''",
+'diff-b'                  => "'''aldin'''",
+'diff-strong'             => "'''îngroşat'''",
+'diff-em'                 => "'''accentuat'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''mare'''",
+'diff-del'                => "'''ÅŸters'''",
+'diff-tt'                 => "'''lăţime fixă'''",
+'diff-sub'                => "'''indice inferior'''",
+'diff-sup'                => "'''indice superior'''",
+'diff-strike'             => "'''tăiat'''",
 
 # Search results
-'searchresults'             => 'Rezultatele căutării',
-'searchresulttext'          => 'Pentru mai multe detalii despre căutarea în {{SITENAME}}, vezi [[Project:Căutare]].',
-'searchsubtitle'            => 'Ai căutat \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|toate paginile care încep cu "$1"]] | [[Special:WhatLinksHere/$1|toate paginile care se leagă de "$1"]])',
-'searchsubtitleinvalid'     => 'Pentru căutarea "$1"',
-'noexactmatch'              => "'''Pagina cu titlul \"\$1\" nu există.''' Poţi [[:\$1|crea această pagină]].",
-'noexactmatch-nocreate'     => "'''Nu există nici o pagină cu titlul \"\$1\".'''",
-'toomanymatches'            => 'Prea multe rezultate au fost întoarse, încercă o căutare diferită',
-'titlematches'              => 'Rezultate în titluri de articole',
-'notitlematches'            => 'Nici un rezultat în titlurile articolelor',
-'textmatches'               => 'Rezultate în textele articolelor',
-'notextmatches'             => 'Nici un rezultat în textele articolelor',
-'prevn'                     => 'anterioarele $1',
-'nextn'                     => 'următoarele $1',
-'viewprevnext'              => 'Vezi ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 cuvânt|$2 cuvinte}})',
-'search-result-score'       => 'Relevanţă: $1%',
-'search-redirect'           => '(redirecţionare către $1)',
-'search-section'            => '(secţiunea $1)',
-'search-suggest'            => 'Te-ai referit la: $1',
-'search-interwiki-caption'  => 'Proiecte înrudite',
-'search-interwiki-default'  => '$1 rezultate:',
-'search-interwiki-more'     => '(mai mult)',
-'search-mwsuggest-enabled'  => 'cu sugestii',
-'search-mwsuggest-disabled' => 'fără sugestii',
-'search-relatedarticle'     => 'Relaţionat',
-'mwsuggest-disable'         => 'Dezactivează sugestiile AJAX',
-'searchrelated'             => 'relaţionat',
-'searchall'                 => 'toate',
-'showingresults'            => "Mai jos {{PLURAL:$1|apare '''1''' rezultat|apar '''$1''' rezultate}} începând cu #<b>$2</b>.",
-'showingresultsnum'         => "Mai jos {{PLURAL:$3|apare '''1''' rezultat|apar '''$3''' rezultate}} cu #<b>$2</b>.",
-'showingresultstotal'       => "Arată {{PLURAL:$3|rezultatul '''$1''' din '''$3'''|rezultatele '''$1 - $2''' din '''$3'''}}",
-'nonefound'                 => "'''Notă''': căutările nereuşite sunt în general datorate căutării unor cuvinte prea comune care nu sunt indexate, sau cautărilor a mai multe cuvinte (numai articolele care conţin ''toate'' cuvintele specificate apar ca rezultate).",
-'powersearch'               => 'Căutare avansată',
-'powersearch-legend'        => 'Căutare avansată',
-'powersearch-ns'            => 'Căutare în spaţiile de nume:',
-'powersearch-redir'         => 'Afişează redirectările',
-'powersearch-field'         => 'Caută',
-'search-external'           => 'Căutare externă',
-'searchdisabled'            => '<p>Ne pare rău! Căutarea după text a fost dezactivată temporar, din motive de performanţă. Între timp puteţi folosi căutarea prin Google mai jos, însă aceasta poate să dea rezultate învechite.</p>',
+'searchresults'                    => 'Rezultatele căutării',
+'searchresults-title'              => 'Caută rezultate pentru "$1"',
+'searchresulttext'                 => 'Pentru mai multe detalii despre căutarea în {{SITENAME}}, vezi [[Project:Căutare]].',
+'searchsubtitle'                   => 'Ai căutat \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|toate paginile care încep cu "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|toate paginile care se leagă de "$1"]])',
+'searchsubtitleinvalid'            => 'Pentru căutarea "$1"',
+'noexactmatch'                     => "'''Pagina cu titlul \"\$1\" nu există.''' Poţi [[:\$1|crea această pagină]].",
+'noexactmatch-nocreate'            => "'''Nu există nici o pagină cu titlul \"\$1\".'''",
+'toomanymatches'                   => 'Prea multe rezultate au fost întoarse, încercă o căutare diferită',
+'titlematches'                     => 'Rezultate în titluri de articole',
+'notitlematches'                   => 'Nici un rezultat în titlurile articolelor',
+'textmatches'                      => 'Rezultate în textele articolelor',
+'notextmatches'                    => 'Nici un rezultat în textele articolelor',
+'prevn'                            => 'anterioarele $1',
+'nextn'                            => 'următoarele $1',
+'viewprevnext'                     => 'Vezi ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opţiuni căutare',
+'searchmenu-exists'                => "* Pagina '''[[$1]]'''",
+'searchmenu-new'                   => "'''Creează pagina \"[[:\$1]]\" pe acest wiki!'''",
+'searchhelp-url'                   => 'Help:Ajutor',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Răsfoieşte paginile cu acest prefix]]',
+'searchprofile-articles'           => 'Pagini',
+'searchprofile-articles-and-proj'  => 'Articole & pagini',
+'searchprofile-project'            => 'Proiect',
+'searchprofile-images'             => 'FiÅŸiere',
+'searchprofile-everything'         => 'Totul',
+'searchprofile-advanced'           => 'Avansat',
+'searchprofile-articles-tooltip'   => 'Caută în $1',
+'searchprofile-project-tooltip'    => 'Caută în $1',
+'searchprofile-images-tooltip'     => 'Caută fişiere',
+'searchprofile-everything-tooltip' => 'Caută în tot conţinutul (incluzând paginile de discuţie)',
+'searchprofile-advanced-tooltip'   => 'Caută în namespace-uri personalizate',
+'prefs-search-nsdefault'           => 'Caută utilizând standardul:',
+'prefs-search-nscustom'            => 'Caută în namespace-uri personalizate:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 cuvânt|$2 cuvinte}})',
+'search-result-score'              => 'Relevanţă: $1%',
+'search-redirect'                  => '(redirecţionare către $1)',
+'search-section'                   => '(secţiunea $1)',
+'search-suggest'                   => 'Te-ai referit la: $1',
+'search-interwiki-caption'         => 'Proiecte înrudite',
+'search-interwiki-default'         => '$1 rezultate:',
+'search-interwiki-more'            => '(mai mult)',
+'search-mwsuggest-enabled'         => 'cu sugestii',
+'search-mwsuggest-disabled'        => 'fără sugestii',
+'search-relatedarticle'            => 'Relaţionat',
+'mwsuggest-disable'                => 'Dezactivează sugestiile AJAX',
+'searchrelated'                    => 'relaţionat',
+'searchall'                        => 'toate',
+'showingresults'                   => "Mai jos {{PLURAL:$1|apare '''1''' rezultat|apar '''$1''' rezultate}} începând cu #<b>$2</b>.",
+'showingresultsnum'                => "Mai jos {{PLURAL:$3|apare '''1''' rezultat|apar '''$3''' rezultate}} cu #<b>$2</b>.",
+'showingresultstotal'              => "Arată {{PLURAL:$4|rezultatul '''$1''' din '''$3'''|rezultatele '''$1 - $2''' din '''$3'''}}",
+'nonefound'                        => "'''Notă''': Numai unele spaţii de nume sunt căutate implicit.
+Încercaţi să puneţi ca şi prefix al căutării ''all:'' pentru a căuta în tot conţinutul (incluzând şi paginile de discuţii, formate, etc), sau folosiţi spaţiul de nume dorit ca şi prefix.",
+'search-nonefound'                 => 'Nu sunt rezultate conforme interogării.',
+'powersearch'                      => 'Căutare avansată',
+'powersearch-legend'               => 'Căutare avansată',
+'powersearch-ns'                   => 'Căutare în spaţiile de nume:',
+'powersearch-redir'                => 'Afişează redirectările',
+'powersearch-field'                => 'Caută',
+'search-external'                  => 'Căutare externă',
+'searchdisabled'                   => '<p>Ne pare rău! Căutarea după text a fost dezactivată temporar, din motive de performanţă. Între timp puteţi folosi căutarea prin Google mai jos, însă aceasta poate să dea rezultate învechite.</p>',
 
 # Preferences page
-'preferences'              => 'Preferinţe',
-'mypreferences'            => 'preferinţe',
-'prefs-edits'              => 'Număr de modificări:',
-'prefsnologin'             => 'Neautentificat',
-'prefsnologintext'         => 'Trebuie să fiţi <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autentificat]</span> pentru a vă putea salva preferinţele.',
-'prefsreset'               => 'Preferinţele au fost resetate.',
-'qbsettings'               => 'Setări pentru bara rapidă',
-'qbsettings-none'          => 'Fără',
-'qbsettings-fixedleft'     => 'Fixă, în stânga',
-'qbsettings-fixedright'    => 'Fixă, în dreapta',
-'qbsettings-floatingleft'  => 'Liberă',
-'qbsettings-floatingright' => 'Plutire la dreapta',
-'changepassword'           => 'Schimbă parola',
-'skin'                     => 'Aspect',
-'math'                     => 'Aspect formule',
-'dateformat'               => 'Formatul datelor',
-'datedefault'              => 'Nici o preferinţă',
-'datetime'                 => 'Data ÅŸi ora',
-'math_failure'             => 'Nu s-a putut interpreta',
-'math_unknown_error'       => 'eroare necunoscută',
-'math_unknown_function'    => 'funcţie necunoscută',
-'math_lexing_error'        => 'eroare lexicală',
-'math_syntax_error'        => 'eroare de sintaxă',
-'math_image_error'         => 'Conversiune în PNG eşuată',
-'math_bad_tmpdir'          => 'Nu se poate crea sau nu se poate scrie în directorul temporar pentru formule matematice',
-'math_bad_output'          => 'Nu se poate crea sau nu se poate scrie în directorul de ieşire pentru formule matematice',
-'math_notexvc'             => 'LipseÅŸte executabilul texvc; vezi math/README pentru configurare.',
-'prefs-personal'           => 'Date de utilizator',
-'prefs-rc'                 => 'Schimbări recente',
-'prefs-watchlist'          => 'Listă de urmărire',
-'prefs-watchlist-days'     => 'Numărul de zile care apar în lista paginilor urmărite:',
-'prefs-watchlist-edits'    => 'Numărul de editări care apar în lista extinsă a paginilor urmărite:',
-'prefs-misc'               => 'Parametri diverÅŸi',
-'saveprefs'                => 'Salvează preferinţele',
-'resetprefs'               => 'Resetează preferinţele',
-'oldpassword'              => 'Parola veche',
-'newpassword'              => 'Parola nouă',
-'retypenew'                => 'Repetă parola nouă',
-'textboxsize'              => 'Dimensiunile casetei de text',
-'rows'                     => 'Rânduri:',
-'columns'                  => 'Coloane',
-'searchresultshead'        => 'Parametri căutare',
-'resultsperpage'           => 'Numărul de rezultate per pagină',
-'contextlines'             => 'Numărul de linii per rezultat',
-'contextchars'             => 'Numărul de caractere per linie',
-'stub-threshold'           => 'Valoarea minimă pentru un <a href="#" class="stub">ciot</a> (octeţi):',
-'recentchangesdays'        => 'Numărul de zile afişate în schimbări recente:',
-'recentchangescount'       => 'Numărul de articole pentru schimbări recente:',
-'savedprefs'               => 'Preferinţele tale au fost salvate.',
-'timezonelegend'           => 'Fus orar',
-'timezonetext'             => '¹Introduceţi numărul de ore diferenţă între ora Dv. locală şi ora serverului (UTC, timp universal).',
-'localtime'                => 'Ora locală',
-'timezoneoffset'           => 'Diferenţa¹',
-'servertime'               => 'Ora serverului',
-'guesstimezone'            => 'Încearcă determinarea automată a diferenţei',
-'allowemail'               => 'Activează email de la alţi utilizatori',
-'prefs-searchoptions'      => 'Opţiuni de căutare',
-'prefs-namespaces'         => 'Spaţii de nume',
-'defaultns'                => 'Caută în aceste secţiuni implicit:',
-'default'                  => 'standard',
-'files'                    => 'FiÅŸiere',
+'preferences'               => 'Preferinţe',
+'mypreferences'             => 'preferinţe',
+'prefs-edits'               => 'Număr de modificări:',
+'prefsnologin'              => 'Neautentificat',
+'prefsnologintext'          => 'Trebuie să fiţi <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} autentificat]</span> pentru a vă putea salva preferinţele.',
+'prefsreset'                => 'Preferinţele au fost resetate.',
+'qbsettings'                => 'Setări pentru bara rapidă',
+'qbsettings-none'           => 'Fără',
+'qbsettings-fixedleft'      => 'Fixă, în stânga',
+'qbsettings-fixedright'     => 'Fixă, în dreapta',
+'qbsettings-floatingleft'   => 'Liberă',
+'qbsettings-floatingright'  => 'Plutire la dreapta',
+'changepassword'            => 'Schimbă parola',
+'skin'                      => 'Aspect',
+'skin-preview'              => 'Previzualizare',
+'math'                      => 'Aspect formule',
+'dateformat'                => 'Formatul datelor',
+'datedefault'               => 'Nici o preferinţă',
+'datetime'                  => 'Data ÅŸi ora',
+'math_failure'              => 'Nu s-a putut interpreta',
+'math_unknown_error'        => 'eroare necunoscută',
+'math_unknown_function'     => 'funcţie necunoscută',
+'math_lexing_error'         => 'eroare lexicală',
+'math_syntax_error'         => 'eroare de sintaxă',
+'math_image_error'          => 'Conversiune în PNG eşuată',
+'math_bad_tmpdir'           => 'Nu se poate crea sau nu se poate scrie în directorul temporar pentru formule matematice',
+'math_bad_output'           => 'Nu se poate crea sau nu se poate scrie în directorul de ieşire pentru formule matematice',
+'math_notexvc'              => 'LipseÅŸte executabilul texvc; vezi math/README pentru configurare.',
+'prefs-personal'            => 'Date de utilizator',
+'prefs-rc'                  => 'Schimbări recente',
+'prefs-watchlist'           => 'Listă de urmărire',
+'prefs-watchlist-days'      => 'Numărul de zile care apar în lista paginilor urmărite:',
+'prefs-watchlist-days-max'  => '(maxim 7 zile)',
+'prefs-watchlist-edits'     => 'Numărul de editări care apar în lista extinsă a paginilor urmărite:',
+'prefs-watchlist-edits-max' => '(număr maxim: 1000)',
+'prefs-misc'                => 'Parametri diverÅŸi',
+'prefs-resetpass'           => 'Modifică parola',
+'saveprefs'                 => 'Salvează preferinţele',
+'resetprefs'                => 'Resetează preferinţele',
+'textboxsize'               => 'Dimensiunile casetei de text',
+'prefs-edit-boxsize'        => 'Mărimea ferestrei de modificare.',
+'rows'                      => 'Rânduri:',
+'columns'                   => 'Coloane',
+'searchresultshead'         => 'Parametri căutare',
+'resultsperpage'            => 'Numărul de rezultate per pagină',
+'contextlines'              => 'Numărul de linii per rezultat',
+'contextchars'              => 'Numărul de caractere per linie',
+'stub-threshold'            => 'Valoarea minimă pentru un <a href="#" class="stub">ciot</a> (octeţi):',
+'recentchangesdays'         => 'Numărul de zile afişate în schimbări recente:',
+'recentchangesdays-max'     => '(maxim {{PLURAL:$1|o zi|$1 zile}})',
+'recentchangescount'        => 'Numărul de articole pentru schimbări recente:',
+'savedprefs'                => 'Preferinţele tale au fost salvate.',
+'timezonelegend'            => 'Fus orar',
+'timezonetext'              => '¹Introduceţi numărul de ore diferenţă între ora Dv. locală şi ora serverului (UTC, timp universal).',
+'localtime'                 => 'Timpul local:',
+'timezoneselect'            => 'Fus orar:',
+'timezoneuseserverdefault'  => 'FoloseÅŸte ora server-ului',
+'timezoneuseoffset'         => 'Altul (specifică diferenţa)',
+'timezoneoffset'            => 'Diferenţa¹:',
+'servertime'                => 'Ora serverului:',
+'guesstimezone'             => 'Încearcă determinarea automată a diferenţei',
+'allowemail'                => 'Activează email de la alţi utilizatori',
+'prefs-searchoptions'       => 'Opţiuni de căutare',
+'prefs-namespaces'          => 'Spaţii de nume',
+'defaultns'                 => 'Caută în aceste secţiuni implicit:',
+'default'                   => 'standard',
+'files'                     => 'FiÅŸiere',
 
 # User rights
 'userrights'                  => 'Administrarea permisiunilor de utilizator', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Administrare grupuri de utilizatori',
 'userrights-user-editname'    => 'Introdu un nume de utilizator:',
 'editusergroup'               => 'Modificare grup de utilizatori',
-'editinguser'                 => "modificare permisiuni de utilizator ale utilizatorului '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "modificare permisiuni de utilizator ale utilizatorului '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modifică grupul de utilizatori',
 'saveusergroups'              => 'Salvează grupul de utilizatori',
 'userrights-groupsmember'     => 'Membru al:',
@@ -1052,9 +1217,41 @@ Folosirea linkurilor de navigare va reseta această coloană.',
 'rightslogentry' => 'a schimbat pentru $1 apartenenţa la un grup de la $2 la $3',
 'rightsnone'     => '(niciunul)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'citeşti această pagină',
+'action-edit'                 => 'modifici această pagină',
+'action-createpage'           => 'creezi pagini',
+'action-createtalk'           => 'creezi pagini de discuţie',
+'action-createaccount'        => 'creezi acest cont de utilizator',
+'action-minoredit'            => 'marchezi această modificare ca minoră',
+'action-move'                 => 'muţi această pagină',
+'action-move-subpages'        => 'muţi această pagină şi subpaginile sale',
+'action-upload'               => 'încarci acest fişier',
+'action-reupload'             => 'suprascrii fiÅŸierul existent',
+'action-upload_by_url'        => 'încarci acest fişier de la o adresă URL',
+'action-writeapi'             => 'utilizezi acest API',
+'action-delete'               => 'ştergi această pagină',
+'action-deleterevision'       => 'ştergi această revizie',
+'action-deletedhistory'       => 'vizualizezi istoricul ÅŸters al aceste pagini',
+'action-browsearchive'        => 'cauţi pagini şterse',
+'action-undelete'             => 'recuperezi această pagină',
+'action-suppressionlog'       => 'vizualizezi acest jurnal privat',
+'action-block'                => 'blochezi permisiunea de modificare a acestui utilizator',
+'action-protect'              => 'modifici nivelurile de protecţie pentru această pagină',
+'action-import'               => 'imporţi această pagină din alt wiki',
+'action-importupload'         => 'imporţi această pagină prin încărcarea unui fişier',
+'action-patrol'               => 'marchezi modificările celorlalţi ca patrulate',
+'action-autopatrol'           => 'marchezi modificarea drept patrulată',
+'action-unwatchedpages'       => 'vizualizezi lista de pagini neurmărite',
+'action-mergehistory'         => 'uneÅŸti istoricul acestei pagini',
+'action-userrights'           => 'modifici toate permisiunile utilizatorilor',
+'action-userrights-interwiki' => 'modifici permisiunile utilizatorilor de pe alte wiki',
+'action-siteadmin'            => 'blochezi sau deblochezi baza de date',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|modificare|modificări}}',
 'recentchanges'                     => 'Schimbări recente',
+'recentchanges-legend'              => 'Opţiuni schimbări recente',
 'recentchangestext'                 => 'Schimbări recente ... (Log)',
 'recentchanges-feed-description'    => 'Urmăreşte cele mai recente schimbări folosind acest flux.',
 'rcnote'                            => "Mai jos se află {{PLURAL:$|ultima modificare|ultimele '''$1''' modificări}} din {{PLURAL:$2|ultima zi|ultimele '''$2''' zile}}, începând cu $5, $4.",
@@ -1079,6 +1276,8 @@ $3',
 'rc_categories'                     => 'Limitează la categoriile (separate prin "|")',
 'rc_categories_any'                 => 'Oricare',
 'newsectionsummary'                 => '/* $1 */ secţiune nouă',
+'rc-enhanced-expand'                => 'Arată detalii (necesită JavaScript)',
+'rc-enhanced-hide'                  => 'Ascunde detaliile',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Modificări corelate',
@@ -1100,11 +1299,11 @@ Paginile pe care le [[Special:Watchlist|urmăriţi]] apar în '''aldine'''.",
 'upload_directory_read_only'  => 'Directorul de încărcare ($1) nu poate fi scris de server.',
 'uploaderror'                 => 'Eroare la trimitere fiÅŸier',
 'uploadtext'                  => "FoloseÅŸte formularul de mai jos pentru a trimite fiÅŸiere. 
-Pentru a vizualiza sau căuta imagini deja trimise, mergi la [[Special:ImageList|lista de imagini]], încărcările şi ştergerile sunt de asemenea înregistrate în [[Special:Log/upload|jurnalul fişierelor trimise]], ştergerile în [[Special:Log/delete|jurnalul fişierelor şterse]].
+Pentru a vizualiza sau căuta imagini deja trimise, mergi la [[Special:FileList|lista de imagini]], încărcările şi ştergerile sunt de asemenea înregistrate în [[Special:Log/upload|jurnalul fişierelor trimise]], ştergerile în [[Special:Log/delete|jurnalul fişierelor şterse]].
 
 Pentru a include un fişier de sunet într-un articol, foloseşti o legătură de forma:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fişier.jpg]]</nowiki></tt>''' pentru a include versiunea integrală a unui fişier
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fişier.png|200px|thumb|left|alt text]]</nowiki></tt>''' pentru a introduce o imagine de 200px într-un chenar cu textul 'alt text' în partea stângă ca descriere
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fişier.jpg]]</nowiki></tt>''' pentru a include versiunea integrală a unui fişier
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fişier.png|200px|thumb|left|alt text]]</nowiki></tt>''' pentru a introduce o imagine de 200px într-un chenar cu textul 'alt text' în partea stângă ca descriere
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fişier.ogg]]</nowiki></tt>''' pentru a lega direct fişierul fără a-l afişa",
 'upload-permitted'            => 'Tipuri de fiÅŸiere permise: $1.',
 'upload-preferred'            => 'Tipuri de fiÅŸiere preferate: $1.',
@@ -1112,7 +1311,7 @@ Pentru a include un fişier de sunet într-un articol, foloseşti o legătură d
 'uploadlog'                   => 'jurnal fiÅŸiere trimise',
 'uploadlogpage'               => 'Jurnal fiÅŸiere trimise',
 'uploadlogpagetext'           => 'Mai jos este afişată lista ultimelor fişiere trimise.
-Vezi [[Special:NewImages|galeria fişierelor noi]] pentru o mai bună vizualizare.',
+Vezi [[Special:NewFiles|galeria fişierelor noi]] pentru o mai bună vizualizare.',
 'filename'                    => 'Nume fiÅŸier',
 'filedesc'                    => 'Descriere fiÅŸier',
 'fileuploadsummary'           => 'Rezumat:',
@@ -1134,24 +1333,25 @@ Vezi [[Special:NewImages|galeria fişierelor noi]] pentru o mai bună vizualizar
 'large-file'                  => 'Este recomandat ca fişierele să nu fie mai mari de $1; acest fişier are $2.',
 'largefileserver'             => 'Fişierul este mai mare decât este configurat serverul să permită.',
 'emptyfile'                   => 'Fişierul pe care l-aţi încărcat pare a fi gol. Aceasta poate fi datorită unei greşeli în numele fişierului. Verificaţi dacă într-adevăr doriţi să încărcaţi acest fişier.',
-'fileexists'                  => 'Un fişier cu acelaşi nume există deja, vă rugăm verificaţi <strong><tt>$1</tt></strong> dacă nu sunteţi sigur dacă doriţi să îl modificaţi.',
-'filepageexists'              => 'Pagina cu descrierea fişierului a fost deja creată la <strong><tt>$1</tt></strong>, dar niciun fişier cu acest nume nu există în acest moment.
+'fileexists'                  => "Un fişier cu acelaşi nume există deja, vă rugăm verificaţi '''<tt>$1</tt>''' dacă nu sunteţi sigur dacă doriţi să îl modificaţi.",
+'filepageexists'              => "Pagina cu descrierea fişierului a fost deja creată la '''<tt>$1</tt>''', dar niciun fişier cu acest nume nu există în acest moment.
 Sumarul pe care l-ai introdus nu va apărea în pagina cu descriere.
-Pentru ca sumarul tău să apară, va trebui să îl adaugi manual',
-'fileexists-extension'        => 'Un fişier cu un nume similar există:<br />
-Numele fişierului de încărcat: <strong><tt>$1</tt></strong><br />
-Numele fiÅŸierului existent: <strong><tt>$2</tt></strong><br />
-Te rog alege alt nume.',
+Pentru ca sumarul tău să apară, va trebui să îl adaugi manual",
+'fileexists-extension'        => "Un fişier cu un nume similar există:<br />
+Numele fişierului de încărcat: '''<tt>$1</tt>'''<br />
+Numele fiÅŸierului existent: '''<tt>$2</tt>'''<br />
+Te rog alege alt nume.",
 'fileexists-thumb'            => "<center>'''Imagine existentă'''</center>",
-'fileexists-thumbnail-yes'    => 'Fişierul pare a fi o imagine cu o rezoluţie scăzută <i>(thumbnail)</i>.
-Verifică fişierul<strong><tt>$1</tt></strong>.<br />
-Dacă fişierul verificat este identic cu imaginea originală nu este necesară încărcarea altui thumbnail.',
-'file-thumbnail-no'           => 'Numele fişierului începe cu <strong><tt>$1</tt></strong>.
-Se pare că este o imagine cu dimensiune redusă<i>(thumbnail)</i>.
-Dacă ai această imagine la rezoluţie mare încarc-o pe aceasta, altfel schimbă numele fişierului.',
-'fileexists-forbidden'        => 'Un fişier cu acest nume există deja; mergeţi înapoi şi încărcaţi acest fişier sub un nume nou. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Un fişier cu acest nume există deja în magazia de imagini comune; mergeţi înapoi şi încărcaţi fişierul sub un nou nume. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Fişierul pare a fi o imagine cu o rezoluţie scăzută ''(thumbnail)''.
+Verifică fişierul'''<tt>$1</tt>'''.<br />
+Dacă fişierul verificat este identic cu imaginea originală nu este necesară încărcarea altui thumbnail.",
+'file-thumbnail-no'           => "Numele fişierului începe cu '''<tt>$1</tt>'''.
+Se pare că este o imagine cu dimensiune redusă''(thumbnail)''.
+Dacă ai această imagine la rezoluţie mare încarc-o pe aceasta, altfel schimbă numele fişierului.",
+'fileexists-forbidden'        => 'Un fişier cu acest nume există deja; mergeţi înapoi şi încărcaţi acest fişier sub un nume nou. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Un fişier cu acest nume există deja în magazia de imagini comune; mergeţi înapoi şi încărcaţi fişierul sub un nou nume. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Acest fiÅŸier este dublura {{PLURAL:$1|fiÅŸierului|fiÅŸierelor}}:',
+'file-deleted-duplicate'      => 'Un fişier identic cu acesta ([[$1]]) a fost şters anterior. Verificaţi istoricul ştergerilor fişierului înainte de a-l reîncărca.',
 'successfulupload'            => 'FiÅŸierul a fost trimis',
 'uploadwarning'               => 'Avertizare la trimiterea fiÅŸierului',
 'savefile'                    => 'Salvează fişierul',
@@ -1171,8 +1371,8 @@ Dacă ai această imagine la rezoluţie mare încarc-o pe aceasta, altfel schimb
 
 Vă rugăm să aveţi în vedere dacă este utilă reîncărcarea acestuia.
 Jurnalul pentru această ştergere este disponibil aici:",
-'filename-bad-prefix'         => 'Numele fişierului pe care îl încărcaţi începe cu <strong>"$1"</strong>, care este un nume non-descriptiv alocat automat în general de camerele digitale.
-Vă rugăm, alegeţi un nume mai descriptiv pentru fişerul dumneavoastră.',
+'filename-bad-prefix'         => "Numele fişierului pe care îl încărcaţi începe cu '''\"\$1\"''', care este un nume non-descriptiv alocat automat în general de camerele digitale.
+Vă rugăm, alegeţi un nume mai descriptiv pentru fişerul dumneavoastră.",
 
 'upload-proto-error'      => 'Protocol incorect',
 'upload-proto-error-text' => 'Importul de la distanţă necesită adrese URL care încep cu <code>http://</code> sau <code>ftp://</code>.',
@@ -1199,20 +1399,20 @@ Poate doreşti să încerci la o oră mai puţin ocupată.',
 'upload_source_url'  => ' (un URL valid, accesibil public)',
 'upload_source_file' => ' (un fişier de pe computerul tău)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Această pagină specială arată toate fişierele încărcate.
+# Special:ListFiles
+'listfiles-summary'     => 'Această pagină specială arată toate fişierele încărcate.
 În mod normal ultimul fişier încărcat este aşezat în capul listei.
 O apăsare pe antetul coloanei schimbă sortarea.',
-'imagelist_search_for'  => 'Caută imagine după nume:',
+'listfiles_search_for'  => 'Caută imagine după nume:',
 'imgfile'               => 'fiÅŸier',
-'imagelist'             => 'Lista imaginilor',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nume',
-'imagelist_user'        => 'Utilizator',
-'imagelist_size'        => 'Mărime (octeţi)',
-'imagelist_description' => 'Descriere',
-
-# Image description page
+'listfiles'             => 'Lista imaginilor',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nume',
+'listfiles_user'        => 'Utilizator',
+'listfiles_size'        => 'Mărime (octeţi)',
+'listfiles_description' => 'Descriere',
+
+# File description page
 'filehist'                       => 'Istoricul fiÅŸierului',
 'filehist-help'                  => 'Faceţi click pe o dată/timp pentru a vizualiza fişierul de la timpul respectiv.',
 'filehist-deleteall'             => 'ÅŸterge tot',
@@ -1220,12 +1420,18 @@ O apăsare pe antetul coloanei schimbă sortarea.',
 'filehist-revert'                => 'revenire',
 'filehist-current'               => 'curentă',
 'filehist-datetime'              => 'Dată/Timp',
+'filehist-thumb'                 => 'Miniatură',
+'filehist-thumbtext'             => 'Miniatură pentru versiunea din $1',
+'filehist-nothumb'               => 'Nicio miniatură',
 'filehist-user'                  => 'Utilizator',
 'filehist-dimensions'            => 'Dimensiuni',
 'filehist-filesize'              => 'Mărimea fişierului',
 'filehist-comment'               => 'Comentariu',
 'imagelinks'                     => 'Legături',
 'linkstoimage'                   => '{{PLURAL:$1|Următoarea pagină trimite spre|Următoarele $1 pagini trimit spre}} această imagine:',
+'linkstoimage-more'              => 'Mai mult de $1 {{PLURAL:$1|pagină este legată|pagini sunt legate}} de acest fişier.
+Următoarea listă arată {{PLURAL:$1|prima legătură|primele $1 legături}} către acest fişier.
+O [[Special:WhatLinksHere/$2|listă completă]] este disponibilă.',
 'nolinkstoimage'                 => 'Nici o pagină nu se leagă la această imagine.',
 'morelinkstoimage'               => 'Vedeţi [[Special:WhatLinksHere/$1|mai multe legături]] către acest fişier.',
 'redirectstofile'                => 'The following {{PLURAL:$1|file redirects|$1 files redirect}} to this file:
@@ -1265,7 +1471,6 @@ O apăsare pe antetul coloanei schimbă sortarea.',
 'filedelete-success-old'      => "Versiunea fişierului '''[[Media:$1|$1]]''' din $2 $3 a fost ştearsă.",
 'filedelete-nofile'           => "'''$1''' nu există.",
 'filedelete-nofile-old'       => "Nu există nicio versiune arhivată a '''$1''' cu atributele specificate.",
-'filedelete-iscurrent'        => 'Eşti pe cale să ştergi cea mai recentă versiune a acestui fişier. Te rog să revii la o versiune mai veche.',
 'filedelete-otherreason'      => 'Motiv diferit/adiţional:',
 'filedelete-reason-otherlist' => 'Alt motiv',
 'filedelete-reason-dropdown'  => '*Motive uzuale
@@ -1305,28 +1510,30 @@ Lista tipurilor MIME recunoscute de MediaWiki poate fi găsită la [http://svn.w
 
 # Random page
 'randompage'         => 'Pagină aleatorie',
-'randompage-nopages' => 'Nu există pagini în acest spaţiu de nume.',
+'randompage-nopages' => 'Nu există pagini în spaţiul de nume "$1".',
 
 # Random redirect
 'randomredirect'         => 'Redirecţionare aleatorie',
-'randomredirect-nopages' => 'Nu există redirecţionări în acest spaţiu de nume.',
+'randomredirect-nopages' => 'Nu există redirecţionări în spaţiul de nume "$1".',
 
 # Statistics
-'statistics'             => 'Statistici',
-'sitestats'              => 'Statisticile sitului {{SITENAME}}',
-'userstats'              => 'Statistici legate de utilizatori',
-'sitestatstext'          => "Există un număr total de {{PLURAL:\$1|'''1''' pagină|'''\$1''' pagini}} în baza de date.
-Acest număr include paginile de \"discuţii\", paginile despre {{SITENAME}}, pagini minimale (\"cioturi\"), pagini de redirecţionare şi altele care probabil că nu intră de fapt în categoria articolelor reale.
-În afară de acestea, există {{PLURAL:\$2|'''1''' pagină care este|'''\$2''' pagini care sunt}} probabil din categoria articole (numărate automat, în funcţie strict de mărime).<br />
-
-<b>\$8</b> pagini au fost transferate (upload).
-
-În total au fost '''\$3''' {{PLURAL:\$3|vizită (accesare)|vizite (accesări)}} şi {{PLURAL:\$4|modificare|modificări}} de la lansarea acestei wiki.
-În medie, rezultă <b>\$5</b> modificări per pagină şi <b>\$6</b> vizualizări la fiecare modificare.
-
-Mărimea [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] este <b>\$7</b>.",
-'userstatstext'          => "Există {{PLURAL:$1|'''1''' [[Special:ListUsers|utilizator]] înregistrat|un număr de '''$1''' [[Special:ListUsers|utilizatori]] înregistraţi}}. Dintre aceştia '''$2''' (sau '''$4%''') {{PLURAL:$2|are|au}} drepturi de $5.",
-'statistics-mostpopular' => 'Paginile cele mai vizualizate',
+'statistics'                   => 'Statistici',
+'statistics-header-pages'      => 'Statisticile paginii',
+'statistics-header-edits'      => 'Editează statisticile',
+'statistics-header-views'      => 'Vizualizează statisticile',
+'statistics-header-users'      => 'Statistici legate de utilizatori',
+'statistics-articles'          => 'Articole',
+'statistics-pages'             => 'Pagini',
+'statistics-pages-desc'        => 'Toate paginile din wiki, inclusiv pagini de discuţie, redirectări etc.',
+'statistics-files'             => 'Fişiere încărcate',
+'statistics-edits'             => 'Editări de la instalarea {{SITENAME}}',
+'statistics-edits-average'     => 'Media editărilor pe pagină',
+'statistics-views-total'       => 'Număr de vizualizări',
+'statistics-views-peredit'     => 'Vizualizări pe editare',
+'statistics-users'             => '[[Special:ListUsers|Utilizatori]] înregistraţi',
+'statistics-users-active'      => 'Utilizatori activi',
+'statistics-users-active-desc' => 'Utilizatori care au efectuat o acţiune în {{PLURAL:$1|ultima zi|ultimele $1 zile}}',
+'statistics-mostpopular'       => 'Paginile cele mai vizualizate',
 
 'disambiguations'      => 'Pagini de dezambiguizare',
 'disambiguationspage'  => 'Template:Dezambiguizare',
@@ -1370,26 +1577,30 @@ O pagină este considerată o pagină de dezambiguizare dacă foloseşte formate
 'popularpages'            => 'Pagini populare',
 'wantedcategories'        => 'Categorii dorite',
 'wantedpages'             => 'Pagini dorite',
-'missingfiles'            => 'Fişiere lipsă',
+'wantedfiles'             => 'FiÅŸiere dorite',
+'wantedtemplates'         => 'Formate dorite',
 'mostlinked'              => 'Cele mai căutate articole',
 'mostlinkedcategories'    => 'Cele mai căutate categorii',
 'mostlinkedtemplates'     => 'Cele mai folosite formate',
 'mostcategories'          => 'Articole cu cele mai multe categorii',
 'mostimages'              => 'Cele mai căutate imagini',
 'mostrevisions'           => 'Articole cu cele mai multe revizuiri',
-'prefixindex'             => 'Afişare articole începând de la',
+'prefixindex'             => 'Toate paginile cu prefix',
 'shortpages'              => 'Pagini scurte',
 'longpages'               => 'Pagini lungi',
 'deadendpages'            => 'Pagini fără legături',
 'deadendpagestext'        => 'Următoarele pagini nu se leagă de alte pagini din acest wiki.',
 'protectedpages'          => 'Pagini protejate',
 'protectedpages-indef'    => 'Doar protecţiile pe termen nelimitat',
+'protectedpages-cascade'  => 'Doar protejări în cascadă',
 'protectedpagestext'      => 'Următoarele pagini sunt protejate la mutare sau editare',
 'protectedpagesempty'     => 'Nu există pagini protejate',
 'protectedtitles'         => 'Titluri protejate',
 'protectedtitlestext'     => 'Următoarele titluri sunt protejate la creare',
 'protectedtitlesempty'    => 'Nu există titluri protejate cu aceşti parametri.',
 'listusers'               => 'Lista de utilizatori',
+'listusers-editsonly'     => 'Arată doar utiliatori cu modificări',
+'usereditcount'           => '$1 {{PLURAL:$1|editare|editări}}',
 'newpages'                => 'Pagini noi',
 'newpages-username'       => 'Nume de utilizator:',
 'ancientpages'            => 'Cele mai vechi articole',
@@ -1410,14 +1621,13 @@ O pagină este considerată o pagină de dezambiguizare dacă foloseşte formate
 'booksources-search-legend' => 'Caută surse pentru cărţi',
 'booksources-go'            => 'Du-te',
 'booksources-text'          => 'Mai jos se află o listă de legături înspre alte situri care vând cărţi noi sau vechi, şi care pot oferi informaţii suplimentare despre cărţile pe care le căutaţi:',
+'booksources-invalid-isbn'  => 'Codul ISBN oferit nu este valid; verificaţi dacă a fost copiat corect de la sursa originală.',
 
 # Special:Log
 'specialloguserlabel'  => 'Utilizator:',
 'speciallogtitlelabel' => 'Titlu:',
 'log'                  => 'Jurnale',
 'all-logs-page'        => 'Toate jurnalele',
-'log-search-legend'    => 'Caută jurnale',
-'log-search-submit'    => 'Du-te',
 'alllogstext'          => 'Afişare combinată a tuturor jurnalelor {{SITENAME}}.
 Puteţi limita vizualizarea selectând tipul jurnalului, numele de utilizator sau pagina afectată.',
 'logempty'             => 'Nici o înregistrare în jurnal.',
@@ -1429,6 +1639,7 @@ Puteţi limita vizualizarea selectând tipul jurnalului, numele de utilizator sa
 'nextpage'          => 'Pagina următoare ($1)',
 'prevpage'          => 'Pagina anterioară ($1)',
 'allpagesfrom'      => 'Afişează paginile pornind de la:',
+'allpagesto'        => 'Afişează paginile terminând cu:',
 'allarticles'       => 'Toate articolele',
 'allinnamespace'    => 'Toate paginile (spaţiu de nume $1)',
 'allnotinnamespace' => 'Toate paginile (în afara spaţiului de nume $1)',
@@ -1448,19 +1659,40 @@ Vedeţi şi [[Special:WantedCategories|categoriile dorite]].',
 'special-categories-sort-count' => 'ordonează după număr',
 'special-categories-sort-abc'   => 'sortează alfabetic',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contribuţii şterse',
+
+# Special:LinkSearch
+'linksearch'     => 'Caută legături web',
+'linksearch-pat' => 'Model de căutare:',
+'linksearch-ns'  => 'Spaţiu de nume:',
+'linksearch-ok'  => 'Caută',
+
 # Special:ListUsers
 'listusersfrom'      => 'Afişează utilizatori începând cu:',
 'listusers-submit'   => 'Arată',
 'listusers-noresult' => 'Nici un utilizator găsit.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Jurnal utilizatori noi',
+'newuserlogpagetext'          => 'Acesta este jurnalul creărilor conturilor de utilizator.',
+'newuserlog-byemail'          => 'parola trimisă prin e-mail',
+'newuserlog-create-entry'     => 'Utilizator nou',
+'newuserlog-create2-entry'    => 'a deschis cont pentru $1',
+'newuserlog-autocreate-entry' => 'Cont creat automat',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Permisiunile grupurilor de utilizatori',
-'listgrouprights-summary'  => 'Mai jos este afişată o listă a grupurilor de utilizatori definită în această wiki, împreună cu permisiunile de acces asociate.
+'listgrouprights'                 => 'Permisiunile grupurilor de utilizatori',
+'listgrouprights-summary'         => 'Mai jos este afişată o listă a grupurilor de utilizatori definită în această wiki, împreună cu permisiunile de acces asociate.
 Pot exista [[{{MediaWiki:Listgrouprights-helppage}}|informaţii adiţionale]] despre permisiunile individuale.',
-'listgrouprights-group'    => 'Grup',
-'listgrouprights-rights'   => 'Permisiuni',
-'listgrouprights-helppage' => 'Help:Group rights',
-'listgrouprights-members'  => '(listă de membri)',
+'listgrouprights-group'           => 'Grup',
+'listgrouprights-rights'          => 'Permisiuni',
+'listgrouprights-helppage'        => 'Help:Group rights',
+'listgrouprights-members'         => '(listă de membri)',
+'listgrouprights-addgroup'        => 'Poţi adăuga {{PLURAL:$2|grupul|grupurile}}: $1',
+'listgrouprights-removegroup'     => 'Poţi elimina {{PLURAL:$2|grupul|grupurile}}: $1',
+'listgrouprights-addgroup-all'    => 'Pot fi adăugate toate grupurile',
+'listgrouprights-removegroup-all' => 'Pot fi eliminate toate grupurile',
 
 # E-mail user
 'mailnologin'     => 'Nu există adresă de trimitere',
@@ -1472,7 +1704,8 @@ Adresa de e-mail introdusă de tine în [[Special:Preferences|preferinţele de u
 'usermailererror' => 'Obiectul de mail a dat eroare:',
 'defemailsubject' => 'E-mail {{SITENAME}}',
 'noemailtitle'    => 'Fără adresă de e-mail',
-'noemailtext'     => 'Utilizatorul nu a specificat o adresă validă de e-mail, sau a ales să nu primească e-mail de la alţi utilizatori.',
+'noemailtext'     => 'Utilizatorul nu a specificat o adresă validă de e-mail.',
+'email-legend'    => 'Trimite e-mail altui utilizator de la {{SITENAME}}',
 'emailfrom'       => 'De la:',
 'emailto'         => 'Către:',
 'emailsubject'    => 'Subiect:',
@@ -1514,12 +1747,7 @@ Dacă doreşti să elimini această pagină din lista ta de pagini urmărite în
 'iteminvalidname'      => "E o problemă cu elementul '$1', numele este invalid...",
 'wlnote'               => "Mai jos se află {{PLURAL:$1|ultima schimbare|ultimele $1 schimbări}} din {{PLURAL:$2|ultima oră|ultimele '''$2''' ore}}.",
 'wlshowlast'           => 'Arată ultimele $1 ore $2 zile $3',
-'watchlist-show-bots'  => 'Arată editările roboţilor',
-'watchlist-hide-bots'  => 'Ascunde editările roboţilor',
-'watchlist-show-own'   => 'Arată editările mele',
-'watchlist-hide-own'   => 'Ascunde editările mele',
-'watchlist-show-minor' => 'Arată editările minore',
-'watchlist-hide-minor' => 'Ascunde editările minore',
+'watchlist-options'    => 'Opţiunile listei de pagini urmărite',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Aşteptaţi...',
@@ -1558,80 +1786,97 @@ Pentru a modifica preferinţele listei de urmărire, vizitaţi
 Asistenţă şi suport:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Åžterge pagina',
-'confirm'                     => 'Confirmă',
-'excontent'                   => "conţinutul era: '$1'",
-'excontentauthor'             => "conţinutul a fost: '$1' (şi unicul contribuitor era '$2')",
-'exbeforeblank'               => "conţinutul înainte de golire era: '$1'",
-'exblank'                     => 'pagina era goală',
-'delete-confirm'              => 'Åžterge "$1"',
-'delete-legend'               => 'Åžterge',
-'historywarning'              => 'Atenţie! Pagina pe care o ştergi are istorie:',
-'confirmdeletetext'           => 'Sunteţi pe cale să ştergeţi permanent o pagină sau imagine din baza de date, împreună cu istoria asociată acesteia. Vă rugăm să confirmaţi alegerea făcută de dvs., faptul că înţelegeţi consecinţele acestei acţiuni şi faptul că o faceţi în conformitate cu [[{{MediaWiki:Policy-url}}|Politica oficială]].',
-'actioncomplete'              => 'Acţiune finalizată',
-'deletedtext'                 => 'Pagina "<nowiki>$1</nowiki>" a fost ştearsă. Vedeţi $2 pentru o listă a elementelor şterse recent.',
-'deletedarticle'              => 'a ÅŸters "[[$1]]"',
-'suppressedarticle'           => 'eliminate "[[$1]]"',
-'dellogpage'                  => 'Jurnal pagini ÅŸterse',
-'dellogpagetext'              => 'Mai jos se află lista celor mai recente elemente şterse.',
-'deletionlog'                 => 'jurnal pagini ÅŸterse',
-'reverted'                    => 'Revenire la o versiune mai veche',
-'deletecomment'               => 'Motiv pentru ÅŸtergere:',
-'deleteotherreason'           => 'Motiv diferit/adiţional:',
-'deletereasonotherlist'       => 'Alt motiv',
-'deletereason-dropdown'       => '*Motive uzuale
+# Delete
+'deletepage'             => 'Åžterge pagina',
+'confirm'                => 'Confirmă',
+'excontent'              => "conţinutul era: '$1'",
+'excontentauthor'        => "conţinutul a fost: '$1' (şi unicul contribuitor era '$2')",
+'exbeforeblank'          => "conţinutul înainte de golire era: '$1'",
+'exblank'                => 'pagina era goală',
+'delete-confirm'         => 'Åžterge "$1"',
+'delete-legend'          => 'Åžterge',
+'historywarning'         => 'Atenţie! Pagina pe care o ştergi are istorie:',
+'confirmdeletetext'      => 'Sunteţi pe cale să ştergeţi permanent o pagină sau imagine din baza de date, împreună cu istoria asociată acesteia. Vă rugăm să confirmaţi alegerea făcută de dvs., faptul că înţelegeţi consecinţele acestei acţiuni şi faptul că o faceţi în conformitate cu [[{{MediaWiki:Policy-url}}|Politica oficială]].',
+'actioncomplete'         => 'Acţiune finalizată',
+'deletedtext'            => 'Pagina "<nowiki>$1</nowiki>" a fost ştearsă. Vedeţi $2 pentru o listă a elementelor şterse recent.',
+'deletedarticle'         => 'a ÅŸters "[[$1]]"',
+'suppressedarticle'      => 'eliminate "[[$1]]"',
+'dellogpage'             => 'Jurnal pagini ÅŸterse',
+'dellogpagetext'         => 'Mai jos se află lista celor mai recente elemente şterse.',
+'deletionlog'            => 'jurnal pagini ÅŸterse',
+'reverted'               => 'Revenire la o versiune mai veche',
+'deletecomment'          => 'Motiv pentru ÅŸtergere:',
+'deleteotherreason'      => 'Motiv diferit/adiţional:',
+'deletereasonotherlist'  => 'Alt motiv',
+'deletereason-dropdown'  => '*Motive uzuale
 ** Cererea autorului
 ** Violare drepturi de autor
 ** Vandalism',
-'delete-edit-reasonlist'      => 'Modifică motivele ştergerii',
-'delete-toobig'               => 'Această pagină are un istoric al modificărilor mare, mai mult de $1 {{PLURAL:$1|revizie|revizii}}.
+'delete-edit-reasonlist' => 'Modifică motivele ştergerii',
+'delete-toobig'          => 'Această pagină are un istoric al modificărilor mare, mai mult de $1 {{PLURAL:$1|revizie|revizii}}.
 Ştergerea unei astfel de pagini a fost restricţionată pentru a preveni apariţia unor erori în {{SITENAME}}.',
-'delete-warning-toobig'       => 'Această pagină are un istoric al modificărilor mult prea mare, mai mult de $1 {{PLURAL:$1|revizie|revizii}}.
+'delete-warning-toobig'  => 'Această pagină are un istoric al modificărilor mult prea mare, mai mult de $1 {{PLURAL:$1|revizie|revizii}}.
 Åžtergere lui poate afecta baza de date a sitului {{SITENAME}};
 continuă cu atenţie.',
-'rollback'                    => 'Editări de revenire',
-'rollback_short'              => 'Revenire',
-'rollbacklink'                => 'revenire',
-'rollbackfailed'              => 'Revenirea nu s-a putut face',
-'cantrollback'                => 'Nu se poate reveni; ultimul contribuitor este autorul acestui articol.',
-'alreadyrolled'               => 'Nu se poate reveni peste ultima modificare a articolului [[:$1]] făcută de către [[User:$2|$2]] ([[User talk:$2|discuţie]] | [[Special:Contributions/$2|{{int:contribslink}}]]); altcineva a modificat articolul sau a revenit deja.
-
-Ultima editare a fost făcută de către [[User:$3|$3]] ([[User talk:$3|discuţie]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Comentariul de modificare a fost: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Anularea modificărilor efectuate de către [[Special:Contributions/$2|$2]] ([[User talk:$2|discuţie]]) şi revenire la ultima versiune de către [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Anularea modificărilor făcute de $1;
+
+# Rollback
+'rollback'         => 'Editări de revenire',
+'rollback_short'   => 'Revenire',
+'rollbacklink'     => 'revenire',
+'rollbackfailed'   => 'Revenirea nu s-a putut face',
+'cantrollback'     => 'Nu se poate reveni; ultimul contribuitor este autorul acestui articol.',
+'alreadyrolled'    => 'Nu se poate reveni peste ultima modificare a articolului [[:$1]] făcută de către [[User:$2|$2]] ([[User talk:$2|discuţie]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); altcineva a modificat articolul sau a revenit deja.
+
+Ultima editare a fost făcută de către [[User:$3|$3]] ([[User talk:$3|discuţie]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Comentariul de modificare a fost: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Anularea modificărilor efectuate de către [[Special:Contributions/$2|$2]] ([[User talk:$2|discuţie]]) şi revenire la ultima versiune de către [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Anularea modificărilor făcute de $1;
 revenire la ultima versiune de $2.',
-'sessionfailure'              => 'Se pare că este o problemă cu sesiunea de autentificare; această acţiune a fost oprită ca o precauţie împotriva hijack. Apăsaţi "back" şi reîncărcaţi pagina de unde aţi venit, apoi reîncercaţi.',
+'sessionfailure'   => 'Se pare că este o problemă cu sesiunea de autentificare; această acţiune a fost oprită ca o precauţie împotriva hijack. Apăsaţi "back" şi reîncărcaţi pagina de unde aţi venit, apoi reîncercaţi.',
+
+# Protect
 'protectlogpage'              => 'Jurnal protecţii',
 'protectlogtext'              => 'Mai jos se află lista de blocări/deblocări a paginilor. Vezi [[Special:ProtectedPages]] pentru mai multe informaţii.',
 'protectedarticle'            => 'a protejat "[[$1]]"',
 'modifiedarticleprotection'   => 'schimbat nivelul de protecţie pentru "[[$1]]"',
 'unprotectedarticle'          => 'a deprotejat "[[$1]]"',
+'movedarticleprotection'      => 'setările de protecţie au fost mutate de la "[[$2]]" la "[[$1]]"',
 'protect-title'               => 'Protejare "$1"',
+'prot_1movedto2'              => 'a mutat [[$1]] la [[$2]]',
 'protect-legend'              => 'Confirmă protejare',
 'protectcomment'              => 'Comentariu:',
 'protectexpiry'               => 'Expiră:',
 'protect_expiry_invalid'      => 'Timpul de expirare este nevalid.',
 'protect_expiry_old'          => 'Timpul de expirare este în trecut.',
 'protect-unchain'             => 'Deblochează permisiunile de mutare',
-'protect-text'                => 'Poţi vizualiza sau modifica nivelul de protecţie pentru pagina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nu poţi schimba nivelurile de protecţie fiind blocat.
-Iată configuraţia curentă a paginii <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Nivelurile de protecţie nu pot fi aplicate deoarece baza de date este închisă.
-Iată configuraţia curentă a paginii <strong>$1</strong>:',
-'protect-locked-access'       => 'Contul dumneavoastră nu are permisiunea de a schimba nivelurile de protejare.
-Aici sunt setările curente pentru pagina <strong>$1</strong>:',
+'protect-text'                => "Poţi vizualiza sau modifica nivelul de protecţie pentru pagina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nu poţi schimba nivelurile de protecţie fiind blocat.
+Iată configuraţia curentă a paginii '''$1''':",
+'protect-locked-dblock'       => "Nivelurile de protecţie nu pot fi aplicate deoarece baza de date este închisă.
+Iată configuraţia curentă a paginii '''$1''':",
+'protect-locked-access'       => "Contul dumneavoastră nu are permisiunea de a schimba nivelurile de protejare.
+Aici sunt setările curente pentru pagina '''$1''':",
 'protect-cascadeon'           => 'Această pagină este protejată deoarece este inclusă în {{PLURAL:$1|următoarea pagină, ce are|următoarele pagini ce au}} activată protejarea la modificare în cascadă.
 Puteţi schimba nivelul de protejare al acestei pagini, dar asta nu va afecta protecţia în cascadă.',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Permite toţi utilizatorii',
 'protect-fallback'            => 'Cere permisiunea "$1"',
-'protect-level-autoconfirmed' => 'Blochează utilizatorii neînregistraţi',
+'protect-level-autoconfirmed' => 'Blochează utilizatorii noi şi neînregistraţi',
 'protect-level-sysop'         => 'Numai administratorii',
 'protect-summary-cascade'     => 'în cascadă',
 'protect-expiring'            => 'expiră $1 (UTC)',
 'protect-cascade'             => 'Protejare în cascadă - toate paginile incluse în această pagină vor fi protejate.',
 'protect-cantedit'            => 'Nu puteţi schimba nivelul de protecţie a acestei pagini, deoarece nu aveţi permisiunea de a o modifica.',
+'protect-othertime'           => 'Alt termen:',
+'protect-othertime-op'        => 'alt termen',
+'protect-otherreason'         => 'Motiv diferit/adiţional:',
+'protect-otherreason-op'      => 'motiv diferit/adiţional',
+'protect-dropdown'            => '*Motive comune de protejare
+** Vandalism excesiv
+** Spam excesiv
+** Modificări neproductive
+** Pagină cu trafic mare',
+'protect-edit-reasonlist'     => 'Modifică motivele protejării',
+'protect-expiry-options'      => '15 minute:15 minutes,1 oră:1 hour,3 ore:3 hours,24 ore:24 hours,48 ore:48 hours,1 săptămână:1 week,1 lună:1 month,nelimitat:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permisiune:',
 'restriction-level'           => 'Nivel de restricţie:',
 'minimum-size'                => 'Mărime minimă',
@@ -1654,7 +1899,7 @@ Puteţi schimba nivelul de protejare al acestei pagini, dar asta nu va afecta pr
 'undeletepage'                 => 'Vizualizează şi recuperează pagini şterse',
 'undeletepagetitle'            => "'''Această listă cuprinde versiuni şterse ale paginii [[:$1|$1]].'''",
 'viewdeletedpage'              => 'Vezi paginile ÅŸterse',
-'undeletepagetext'             => 'Următoarele pagini au fost şterse, dar încă se află în arhivă şi pot fi recuperate. Reţine că arhiva se poate şterge din timp în timp.',
+'undeletepagetext'             => '{{PLURAL:$1|Următoarea pagină a fost ştearsă, dar încă se află în arhivă şi poate fi recuperată|Următoarele $1 pagini au fost şterse, dar încă se află în arhivă şi pot fi recuperate}}. Reţine că arhiva se poate şterge din timp în timp.',
 'undelete-fieldset-title'      => 'Recuperează versiuni',
 'undeleteextrahelp'            => "Pentru a recupera întreaga pagină lăsaţi toate căsuţele nebifate şi apăsaţi butonul '''''Recuperează'''''. Pentru a realiza o recuperare selectivă bifaţi versiunile pe care doriţi să le recuperaţi şi apăsaţi butonul '''''Recuperează'''''. Butonul '''''Resetează'''''  va şterge comentariul şi toate bifările.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|versiune arhivată|versiuni arhivate}}',
@@ -1662,13 +1907,14 @@ Puteţi schimba nivelul de protejare al acestei pagini, dar asta nu va afecta pr
 'undeleterevdel'               => 'Restaurarea unui revizii nu va fi efectuată dacă ea va apărea în capul listei de revizii parţial şterse.
 În acest caz, trebuie să debifezi sau să arăţi (unhide) cea mai recentă versiune ştearsă.',
 'undeletehistorynoadmin'       => 'Acest articol a fost şters. Motivul ştergerii apare mai jos, alături de detaliile utilzatorilor care au editat această pagină înainte de ştergere. Textul prorpiu-zis al reviziilor şterse este disponibil doar administratorilor.',
-'undelete-revision'            => 'Ştergere revizia $1 (din $2) de către $3:',
+'undelete-revision'            => 'Ştergere revizia $1 (din $4 $5) de către $3:',
 'undeleterevision-missing'     => 'Revizie lipsă sau invalidă.
 S-ar putea ca această legătură să fie greşită, sau revizia a fost restaurată ori ştearsă din arhivă.',
 'undelete-nodiff'              => 'Nu s-a găsit vreo revizie anterioară.',
 'undeletebtn'                  => 'Recuperează',
 'undeletelink'                 => 'recuperează',
 'undeletereset'                => 'Resetează',
+'undeleteinvert'               => 'Exclude spaţiul',
 'undeletecomment'              => 'Comentariu:',
 'undeletedarticle'             => '"[[$1]]" a fost recuperat',
 'undeletedrevisions'           => '{{PLURAL:$1|o revizie restaurată|$1 revizii restaurate}}',
@@ -1701,26 +1947,27 @@ $1',
 'blanknamespace' => '(Principală)',
 
 # Contributions
-'contributions' => 'Contribuţii ale utilizatorului',
-'mycontris'     => 'Contribuţii',
-'contribsub2'   => 'Pentru $1 ($2)',
-'nocontribs'    => 'Nu a fost găsită nici o modificare care să satisfacă acest criteriu.',
-'uctop'         => '(sus)',
-'month'         => 'Din luna (ÅŸi dinainte):',
-'year'          => 'Începând cu anul (şi precedenţii):',
-
-'sp-contributions-newbies'     => 'Arată doar contribuţiile conturilor noi',
-'sp-contributions-newbies-sub' => 'Pentru începători',
-'sp-contributions-blocklog'    => 'Jurnal blocări',
-'sp-contributions-search'      => 'Caută contribuţii',
-'sp-contributions-username'    => 'Adresă IP sau nume de utilizator:',
-'sp-contributions-submit'      => 'Caută',
+'contributions'       => 'Contribuţii ale utilizatorului',
+'contributions-title' => 'Contribuţiile utilizatorului pentru $1',
+'mycontris'           => 'Contribuţii',
+'contribsub2'         => 'Pentru $1 ($2)',
+'nocontribs'          => 'Nu a fost găsită nici o modificare care să satisfacă acest criteriu.',
+'uctop'               => '(sus)',
+'month'               => 'Din luna (ÅŸi dinainte):',
+'year'                => 'Începând cu anul (şi precedenţii):',
+
+'sp-contributions-newbies'       => 'Arată doar contribuţiile conturilor noi',
+'sp-contributions-newbies-sub'   => 'Pentru începători',
+'sp-contributions-newbies-title' => 'Contribuţiile utilizatorului pentru conturile noi',
+'sp-contributions-blocklog'      => 'Jurnal blocări',
+'sp-contributions-search'        => 'Caută contribuţii',
+'sp-contributions-username'      => 'Adresă IP sau nume de utilizator:',
+'sp-contributions-submit'        => 'Caută',
 
 # What links here
 'whatlinkshere'            => 'Ce se leagă aici',
 'whatlinkshere-title'      => 'Pagini care se leagă de "$1"',
 'whatlinkshere-page'       => 'Pagină:',
-'linklistsub'              => '(Lista de legături)',
 'linkshere'                => "Următoarele pagini conţin legături către '''[[:$1]]''':",
 'nolinkshere'              => "Nici o pagină nu se leagă la '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nici o pagină din spaţiul de nume ales nu se leagă la '''[[:$1]]'''.",
@@ -1766,6 +2013,8 @@ Precizaţi motivul blocării; de exemplu indicaţi paginile vandalizate de acest
 'ipbotherreason'                  => 'Motiv diferit/adiţional:',
 'ipbhidename'                     => 'Ascunde numele de utilizator din jurnalul blocărilor, lista activă a blocărilor şi lista utilizatorilor',
 'ipbwatchuser'                    => 'Urmăreşte pagina sa de utilizator şi de discuţii',
+'ipballowusertalk'                => 'Permite acestui utilizator să-şi modifice propria pagină de discuţie cât timp este blocat',
+'ipb-change-block'                => 'Reblochează utilizatorul cu aceşti parametri',
 'badipaddress'                    => 'Adresa IP este invalidă.',
 'blockipsuccesssub'               => 'Utilizatorul a fost blocat',
 'blockipsuccesstext'              => 'Adresa IP "$1" a fost blocată.
@@ -1775,6 +2024,7 @@ Precizaţi motivul blocării; de exemplu indicaţi paginile vandalizate de acest
 'ipb-unblock'                     => 'Deblocaţi un nume de utilizator sau o adresă IP',
 'ipb-blocklist-addr'              => 'Blocări existente pentru $1',
 'ipb-blocklist'                   => 'Vezi blocările existente',
+'ipb-blocklist-contribs'          => 'Contribuţii la $1',
 'unblockip'                       => 'Deblochează adresă IP',
 'unblockiptext'                   => 'Folosiţi formularul de mai jos pentru a restaura permisiunea de scriere pentru adrese IP sau nume de utilizator blocate anterior.',
 'ipusubmit'                       => 'Deblochează această adresă',
@@ -1783,6 +2033,9 @@ Precizaţi motivul blocării; de exemplu indicaţi paginile vandalizate de acest
 'ipblocklist'                     => 'Lista adreselor IP ÅŸi a conturilor blocate',
 'ipblocklist-legend'              => 'Găseşte un utilizator blocat',
 'ipblocklist-username'            => 'Nume de utilizator sau adresă IP:',
+'ipblocklist-sh-userblocks'       => '$1 blocări de conturi',
+'ipblocklist-sh-tempblocks'       => '$1 blocări temporare',
+'ipblocklist-sh-addressblocks'    => '$1 blocări de adrese IP',
 'ipblocklist-submit'              => 'Caută',
 'blocklistline'                   => '$1, $2 a blocat $3 ($4)',
 'infiniteblock'                   => 'termen nelimitat',
@@ -1810,6 +2063,8 @@ Precizaţi motivul blocării; de exemplu indicaţi paginile vandalizate de acest
 'ipb_expiry_invalid'              => 'Dată de expirare invalidă.',
 'ipb_expiry_temp'                 => 'Blocarea numelor de utilizator ascunse trebuie să fie permanentă.',
 'ipb_already_blocked'             => '"$1" este deja blocat',
+'ipb-needreblock'                 => '== Deja blocat ==
+$1 este deja blocat. Vrei să schimbi parametrii?',
 'ipb_cant_unblock'                => 'Eroare: nu găsesc identificatorul $1. Probabil a fost deja deblocat.',
 'ipb_blocked_as_range'            => 'Eroare: Adresa IP $1 nu este blocată direct deci nu poate fi deblocată.
 Face parte din area de blocare $2, care nu poate fi deblocată.',
@@ -1821,6 +2076,7 @@ Face parte din area de blocare $2, care nu poate fi deblocată.',
 'proxyblocksuccess'               => 'Realizat.',
 'sorbsreason'                     => 'Adresa dumneavoastră IP este listată ca un proxy deschis în DNSBL.',
 'sorbs_create_account_reason'     => 'Adresa dvs. IP este listată la un proxy deschis în lista neagră DNS. Nu vă puteţi crea un cont',
+'cant-block-while-blocked'        => 'Nu poţi bloca alţi utilizatori cât timp şi tu eşti blocat.',
 
 # Developer tools
 'lockdb'              => 'Blochează baza de date',
@@ -1847,9 +2103,9 @@ Pentru a închide sau deschide baza de date, acesta trebuie să poată fi scris
 'databasenotlocked'   => 'Baza de date nu este blocată.',
 
 # Move page
-'move-page'               => 'Mută $1',
-'move-page-legend'        => 'Mută pagina',
-'movepagetext'            => "Puteţi folosi formularul de mai jos pentru a redenumi o pagină, mutându-i toată istoria sub noul nume.
+'move-page'                 => 'Mută $1',
+'move-page-legend'          => 'Mută pagina',
+'movepagetext'              => "Puteţi folosi formularul de mai jos pentru a redenumi o pagină, mutându-i toată istoria sub noul nume.
 Pagina veche va deveni o pagină de redirecţionare către pagina nouă.
 Legăturile către pagina veche nu vor fi redirecţionate către cea nouă;
 nu uitaţi să verificaţi dacă nu există redirecţionări [[Special:DoubleRedirects|duble]] sau [[Special:BrokenRedirects|invalide]].
@@ -1863,7 +2119,7 @@ Cu alte cuvinte, veţi putea muta înapoi o pagină pe care aţi mutat-o greşit
 '''ATENÅ¢IE!'''
 Aceasta poate fi o schimbare drastică şi neaşteptată pentru o pagină populară;
 vă rugăm, să vă asiguraţi că înţelegeţi toate consecinţele înainte de a continua.",
-'movepagetalktext'        => "Pagina asociată de discuţii, dacă există, va fi mutată
+'movepagetalktext'          => "Pagina asociată de discuţii, dacă există, va fi mutată
 automat odată cu aceasta '''afară de cazul că''':
 * Mutaţi pagina în altă secţiune a {{SITENAME}}
 * Există deja o pagină de discuţii cu conţinut (care nu este goală), sau
@@ -1871,42 +2127,46 @@ automat odată cu aceasta '''afară de cazul că''':
 
 În oricare din cazurile de mai sus va trebui să muţi sau să unifici
 manual paginile de discuţii, dacă doreşti acest lucru.",
-'movearticle'             => 'Mută pagina',
-'movenotallowed'          => 'Nu ai permisiunea să muţi pagini.',
-'newtitle'                => 'Titlul nou',
-'move-watch'              => 'Urmăreşte această pagină',
-'movepagebtn'             => 'Mută pagina',
-'pagemovedsub'            => 'Pagina a fost mutată',
-'movepage-moved'          => '<big>\'\'\'Pagina "$1" a fost mutată la pagina "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'O pagină cu acelaşi nume există deja, sau numele pe care l-ai ales este invalid. Te rugăm să alegi un alt nume.',
-'cantmove-titleprotected' => 'Nu poţi muta o pagina în această locaţie, pentru că noul titlu a fost protejat la creare',
-'talkexists'              => "'''Pagina în sine a fost mutată, dar pagina de discuţii nu a putut fi mutată deoarece deja există o alta cu acelaşi nume. Te rugăm să unifici manual cele două pagini de discuţii.'''",
-'movedto'                 => 'mutată la',
-'movetalk'                => 'Mută şi pagina de "discuţii" dacă se poate.',
-'move-subpages'           => 'Mută toate subpaginile, dacă este nevoie',
-'move-talk-subpages'      => 'Mută toate subpaginile paginii de discuţii, dacă se poate',
-'movepage-page-exists'    => 'Pagina $1 există deja şi nu poate fi rescrisă automat.',
-'movepage-page-moved'     => 'Pagina $1 a fost mutată la $2.',
-'movepage-page-unmoved'   => 'Pagina $1 nu a putut fi mutată la $2.',
-'movepage-max-pages'      => 'Maxim $1 {{PLURAL:$1|pagină a fost mutată|pagini au fost mutate}}, nicio altă pagină nu va mai fi mutată automat.',
-'1movedto2'               => 'a mutat [[$1]] la [[$2]]',
-'1movedto2_redir'         => 'a mutat [[$1]] la [[$2]] prin redirecţionare',
-'movelogpage'             => 'Jurnal mutări',
-'movelogpagetext'         => 'Mai jos se află o listă cu paginile mutate.',
-'movereason'              => 'Motiv:',
-'revertmove'              => 'revenire',
-'delete_and_move'         => 'Şterge şi mută',
-'delete_and_move_text'    => '==Ştergere necesară==
+'movearticle'               => 'Mută pagina',
+'movenologin'               => 'Nu eÅŸti autentificat',
+'movenologintext'           => 'Trebuie să fii un utilizator înregistrat şi să te [[Special:UserLogin|autentifici]] pentru a muta o pagină.',
+'movenotallowed'            => 'Nu ai permisiunea să muţi pagini.',
+'newtitle'                  => 'Titlul nou',
+'move-watch'                => 'Urmăreşte această pagină',
+'movepagebtn'               => 'Mută pagina',
+'pagemovedsub'              => 'Pagina a fost mutată',
+'movepage-moved'            => '<big>\'\'\'Pagina "$1" a fost mutată la pagina "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'O pagină cu acelaşi nume există deja, sau numele pe care l-ai ales este invalid. Te rugăm să alegi un alt nume.',
+'cantmove-titleprotected'   => 'Nu poţi muta o pagina în această locaţie, pentru că noul titlu a fost protejat la creare',
+'talkexists'                => "'''Pagina în sine a fost mutată, dar pagina de discuţii nu a putut fi mutată deoarece deja există o alta cu acelaşi nume. Te rugăm să unifici manual cele două pagini de discuţii.'''",
+'movedto'                   => 'mutată la',
+'movetalk'                  => 'Mută şi pagina de "discuţii" dacă se poate.',
+'move-subpages'             => 'Mută toate subpaginile, dacă este nevoie',
+'move-talk-subpages'        => 'Mută toate subpaginile paginii de discuţii, dacă se poate',
+'movepage-page-exists'      => 'Pagina $1 există deja şi nu poate fi rescrisă automat.',
+'movepage-page-moved'       => 'Pagina $1 a fost mutată la $2.',
+'movepage-page-unmoved'     => 'Pagina $1 nu a putut fi mutată la $2.',
+'movepage-max-pages'        => 'Maxim $1 {{PLURAL:$1|pagină a fost mutată|pagini au fost mutate}}, nicio altă pagină nu va mai fi mutată automat.',
+'1movedto2'                 => 'a mutat [[$1]] la [[$2]]',
+'1movedto2_redir'           => 'a mutat [[$1]] la [[$2]] prin redirecţionare',
+'movelogpage'               => 'Jurnal mutări',
+'movelogpagetext'           => 'Mai jos se află o listă cu paginile mutate.',
+'movereason'                => 'Motiv:',
+'revertmove'                => 'revenire',
+'delete_and_move'           => 'Şterge şi mută',
+'delete_and_move_text'      => '==Ştergere necesară==
 
 Articolul de destinaţie "[[:$1]]" există deja. Doriţi să îl ştergeţi pentru a face loc mutării?',
-'delete_and_move_confirm' => 'Da, ÅŸterge pagina.',
-'delete_and_move_reason'  => 'Şters pentru a face loc mutării',
-'selfmove'                => 'Titlurile sursei şi ale destinaţiei sunt aceleaşi; nu puteţi muta o pagină peste ea însăşi.',
-'immobile_namespace'      => 'Titlul destinaţiei este al unui tip special; nu se pot muta pagini în acel spaţiu de nume.',
-'imagenocrossnamespace'   => 'Fişierul nu poate fi mutat la un spaţiu de nume care nu este destinat fişierelor',
-'imagetypemismatch'       => 'Extensia nouă a fişierului nu se potriveşte cu tipul acestuia',
-'imageinvalidfilename'    => 'Numele fişierului destinaţie este invalid',
-'fix-double-redirects'    => 'Actualizează toate redirecţionările care trimit la titlul original',
+'delete_and_move_confirm'   => 'Da, ÅŸterge pagina.',
+'delete_and_move_reason'    => 'Şters pentru a face loc mutării',
+'selfmove'                  => 'Titlurile sursei şi ale destinaţiei sunt aceleaşi; nu puteţi muta o pagină peste ea însăşi.',
+'immobile-source-namespace' => 'Nu se pot muta paginile din spaţiul de nume "$1"',
+'immobile-target-namespace' => 'Nu se pot muta paginile în spaţiul de nume "$1"',
+'immobile-source-page'      => 'Această pagină nu poate fi mutată.',
+'imagenocrossnamespace'     => 'Fişierul nu poate fi mutat la un spaţiu de nume care nu este destinat fişierelor',
+'imagetypemismatch'         => 'Extensia nouă a fişierului nu se potriveşte cu tipul acestuia',
+'imageinvalidfilename'      => 'Numele fişierului destinaţie este invalid',
+'fix-double-redirects'      => 'Actualizează toate redirecţionările care trimit la titlul original',
 
 # Export
 'export'            => 'Exportă pagini',
@@ -1925,7 +2185,7 @@ Articolul de destinaţie "[[:$1]]" există deja. Doriţi să îl ştergeţi pent
 'allmessagesdefault'        => 'Textul standard',
 'allmessagescurrent'        => 'Textul curent',
 'allmessagestext'           => 'Aceasta este lista completă a mesajelor disponibile în domeniul MediaWiki.
-Vă rugăm să vizitaţi [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] şi [http://translatewiki.net Betawiki] dacă vreţi să contribuiţi la localizarea programului MediaWiki generic.',
+Vă rugăm să vizitaţi [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] şi [http://translatewiki.net translatewiki.net] dacă vreţi să contribuiţi la localizarea programului MediaWiki generic.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' nu poate fi folosit deoarece '''\$wgUseDatabaseMessages''' este închisă.",
 'allmessagesfilter'         => 'Filtrare în funcţie de titlul mesajului:',
 'allmessagesmodified'       => 'Arată doar mesajele modificate.',
@@ -1943,9 +2203,12 @@ Vă rugăm să vizitaţi [http://www.mediawiki.org/wiki/Localisation MediaWiki L
 'import'                     => 'Importă pagini',
 'importinterwiki'            => 'Import transwiki',
 'import-interwiki-text'      => 'Selectează un wiki şi titlul paginii care trebuie importate. Datele reviziilor şi numele editorilor vor fi salvate. Toate acţiunile de import transwiki pot fi găsite la [[Special:Log/import|log import]]',
+'import-interwiki-source'    => 'Wiki/pagină sursă:',
 'import-interwiki-history'   => 'Copiază toate versiunile istoricului acestei pagini',
 'import-interwiki-submit'    => 'Importă',
 'import-interwiki-namespace' => 'Transferă către spaţiul de nume:',
+'import-upload-filename'     => 'Nume fiÅŸier:',
+'import-comment'             => 'Comentariu:',
 'importtext'                 => 'Te rog exportă fişierul din sursa wiki folosind [[Special:Export|utilitarul de exportare]].
 Salvează-l pe discul tău şi trimite-l aici.',
 'importstart'                => 'Se importă paginile...',
@@ -1983,9 +2246,9 @@ Un dosar temporar lipseÅŸte.',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|versiune|versiuni}} de la $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Pagina mea de utilizator',
+'tooltip-pt-userpage'             => 'Pagina dumneavoastră de utilizator',
 'tooltip-pt-anonuserpage'         => 'Pagina de utilizator pentru adresa IP curentă',
-'tooltip-pt-mytalk'               => 'Pagina mea de discuţii',
+'tooltip-pt-mytalk'               => 'Pagina dumneavoastră de discuţii',
 'tooltip-pt-anontalk'             => 'Discuţii despre editări pentru adresa IP curentă',
 'tooltip-pt-preferences'          => 'Preferinţele mele',
 'tooltip-pt-watchlist'            => 'Lista paginilor pe care le monitorizez.',
@@ -1995,7 +2258,7 @@ Un dosar temporar lipseÅŸte.',
 'tooltip-pt-logout'               => 'ÃŽnchide sesiunea',
 'tooltip-ca-talk'                 => 'Discuţie despre articol',
 'tooltip-ca-edit'                 => 'Poţi edita această pagină. Te rugăm să previzualizezi conţinutul înainte de salvare.',
-'tooltip-ca-addsection'           => 'Adaugă un comentariu acestei discuţii.',
+'tooltip-ca-addsection'           => 'Adaugă o nouă secţiune.',
 'tooltip-ca-viewsource'           => 'Aceasta pagina este protejată. Poţi sa vezi doar codul sursă.',
 'tooltip-ca-history'              => 'Versiuni vechi ale acestui document.',
 'tooltip-ca-protect'              => 'Protejează acest document.',
@@ -2053,12 +2316,12 @@ Un dosar temporar lipseÅŸte.',
 'notacceptable'     => 'Serverul wiki nu poate oferi date într-un format pe care clientul tău să-l poată citi.',
 
 # Attribution
-'anonymous'        => 'Utilizator(i) anonimi ai {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utilizator anonim|Utilizatori anonimi}} ai {{SITENAME}}',
 'siteuser'         => 'Utilizator {{SITENAME}} $1',
 'lastmodifiedatby' => 'Această pagină a fost modificată $2, $1 de către $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Bazat pe munca lui $1.',
 'others'           => 'alţii',
-'siteusers'        => 'Utilizator(i) {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|Utilizator|Utilozatori}} {{SITENAME}} $1',
 'creditspage'      => 'Credenţiale',
 'nocredits'        => 'Nu există credenţiale disponibile pentru această pagină.',
 
@@ -2078,6 +2341,10 @@ Un dosar temporar lipseÅŸte.',
 'numauthors'     => 'Număr de autori distincţi (articole): $1',
 'numtalkauthors' => 'Număr de autori distincţi (pagini de discuţii): $1',
 
+# Skin names
+'skinname-standard'  => 'Normală',
+'skinname-nostalgia' => 'Nostalgie',
+
 # Math options
 'mw_math_png'    => 'Întodeauna afişează PNG',
 'mw_math_simple' => 'HTML pentru formule simple, altfel PNG',
@@ -2118,6 +2385,9 @@ $1',
 'previousdiff' => '� Diferenţa anterioară',
 'nextdiff'     => 'Diferenţa următoare →',
 
+# Visual comparison
+'visual-comparison' => 'Comparare vizuală',
+
 # Media information
 'mediawarning'         => "'''Atenţie''': Acest fişier poate conţine cod maliţios, executându-l, sistemul dvs. poate fi compromis.<hr />",
 'imagemaxsize'         => 'Limitează imaginile pe paginile de descriere la:',
@@ -2131,10 +2401,12 @@ $1',
 'show-big-image'       => 'Măreşte rezoluţia imaginii',
 'show-big-image-thumb' => '<small>Mărimea acestei previzualizări: $1 × $2 pixeli</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria de imagini noi',
 'imagelisttext'         => "Mai jos se află lista a '''$1''' {{PLURAL:$1|fişier ordonat|fişiere ordonate}} $2.",
 'newimages-summary'     => 'Această pagină specială arată ultimele fişiere încărcate.',
+'newimages-legend'      => 'Filtru',
+'newimages-label'       => 'Numele fiÅŸierului (sau parte din el):',
 'showhidebots'          => '($1 roboţi)',
 'noimages'              => 'Nimic de văzut.',
 'ilsubmit'              => 'Caută',
@@ -2342,6 +2614,10 @@ Altele vor fi ascunse implicit.
 'exif-lightsource-24'  => 'Lumină artificială normată ISO în studio',
 'exif-lightsource-255' => 'Altă sursă de lumină',
 
+# Flash modes
+'exif-flash-mode-3'     => 'modul automat',
+'exif-flash-function-1' => 'Fără funcţie flash',
+
 'exif-focalplaneresolutionunit-2' => 'Å£oli',
 
 'exif-sensingmethod-1' => 'Nedefinit',
@@ -2480,22 +2756,9 @@ $1
 Vă rugăm să confirmaţi faptul că într-adevăr doriţi să recreaţi acest articol.",
 'recreate'            => 'Recreează',
 
-# HTML dump
-'redirectingto' => 'Redirecţionând la [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Doriţi să reîncărcaţi pagina? $1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Caută articolele care conţin ''$1''.",
-'searchnamed'      => "Caută articole cu numele ''$1''.",
-'articletitles'    => "Articole începând cu ''$1''",
-'hideresults'      => 'Ascunde rezultatele',
-'useajaxsearch'    => 'Foloseşte căutare AJAX',
-
-# Separators for various lists, etc.
-'comma-separator' => ',&#32;',
+'confirm-purge-top'    => 'Doriţi să reîncărcaţi pagina?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pagina anterioară',
@@ -2589,13 +2852,13 @@ Poţi şi să [[Special:Watchlist/edit|foloseşti un editor standard]].',
 'filepath-summary' => 'Această pagină specială întoarce calea completă a fişierului.
 Imaginile sunt prezentate la rezoluţia maximă, alte tipuri de fişiere vor porni direct în programele asociate.
 
-Introdu numele fişierului fără prefixul "{{ns:image}}:".',
+Introdu numele fişierului fără prefixul "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Caută fişiere duplicate',
 'fileduplicatesearch-summary'  => 'Caută fişiere duplicat bazate pe valoarea sa hash.
 
-Introdu numele fişierului fără prefixul "{{ns:image}}:".',
+Introdu numele fişierului fără prefixul "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Caută un duplicat',
 'fileduplicatesearch-filename' => 'Nume fiÅŸier:',
 'fileduplicatesearch-submit'   => 'Caută',
diff --git a/languages/messages/MessagesRoa_rup.php b/languages/messages/MessagesRoa_rup.php
index c951492d..2b5e8592 100644
--- a/languages/messages/MessagesRoa_rup.php
+++ b/languages/messages/MessagesRoa_rup.php
@@ -4,8 +4,8 @@
  * @ingroup Language
  * @file
  *
+ * @author Dumitrachi T. Fundu
  * @author Hakka
- * @author Hakka (with the help of a native speaker Dumitrachi T. Fundu)
  */
 
 $messages = array(
@@ -106,7 +106,7 @@ Isape a vostrã ira adratã. Nu agãrshits s-le alãxits alidzerle-a vostre ti {
 'username'           => 'Numa di ufilizitor:',
 
 # Edit pages
-'summary'            => 'Rezime',
+'summary'            => 'Rezime:',
 'minoredit'          => 'Aistã easte alãxire njicã',
 'watchthis'          => 'Mutrits-u frãndzã aistã',
 'savearticle'        => 'Avigljats-u frãndzã',
@@ -151,9 +151,6 @@ Isape a vostrã ira adratã. Nu agãrshits s-le alãxits alidzerle-a vostre ti {
 # Book sources
 'booksources-go' => 'Du-vã',
 
-# Special:Log
-'log-search-submit' => 'Du-vã',
-
 # Special:AllPages
 'allpagessubmit' => 'Du-vã',
 
@@ -165,6 +162,9 @@ Isape a vostrã ira adratã. Nu agãrshits s-le alãxits alidzerle-a vostre ti {
 'watchthispage' => 'Mutrits-u frãndzã aistã',
 'unwatch'       => 'Azãptãsits videare',
 
+# Protect
+'prot_1movedto2' => '[[$1]] s-trãdzi tu [[$2]]',
+
 # Restrictions (nouns)
 'restriction-edit' => 'Alãxiri',
 'restriction-move' => 'Tradzets',
@@ -202,7 +202,7 @@ Isape a vostrã ira adratã. Nu agãrshits s-le alãxits alidzerle-a vostre ti {
 'tooltip-pt-logout'      => 'Disligats-vã',
 'tooltip-p-logo'         => 'Prota frãndzã',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Caftã',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesRoa_tara.php b/languages/messages/MessagesRoa_tara.php
index bc08cf2b..3690f2d0 100644
--- a/languages/messages/MessagesRoa_tara.php
+++ b/languages/messages/MessagesRoa_tara.php
@@ -7,8 +7,6 @@
  * @author Joetaras
  */
 
-$fallback = 'it';
-
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Cullegaminde sottolinèete:',
@@ -47,16 +45,17 @@ $messages = array(
 'tog-watchlisthideown'        => "Scunne le cangiaminde mie da 'a liste de le pàgene condrollete",
 'tog-watchlisthidebots'       => "Scunne le cangiaminde de le not da 'a liste de le pàgene condrollete",
 'tog-watchlisthideminor'      => "Scunne le cangiaminde stuèdeche da 'a liste de le pàgene condrollete",
+'tog-watchlisthideliu'        => "Scunne le cangiaminde de l'utinde canusciute da 'a liste de le pàgene condrollete",
+'tog-watchlisthideanons'      => "Scunne le cangiaminde de l'utinde scanusciute da 'a liste de le pàgene condrollete",
 'tog-ccmeonemails'            => "Manneme 'na copie de le mail ca je manne a l'ôtre utinde",
 'tog-diffonly'                => 'No fà vedè le pàggene cu le condenute sotte a le differenze',
 'tog-showhiddencats'          => 'Fa vedè le categorije scunnute',
+'tog-norollbackdiff'          => "Non sce penzanne a le differenze apprisse l'esecuzione de 'nu rollback",
 
 'underline-always'  => 'Sembre',
 'underline-never'   => 'Maje',
 'underline-default' => "Valore de default d'u browser",
 
-'skinpreview' => 'Andeprime',
-
 # Dates
 'sunday'        => 'Dumèneche',
 'monday'        => 'Lunedìe',
@@ -149,7 +148,7 @@ $messages = array(
 'mytalk'         => 'Ngazzaminde mie',
 'anontalk'       => "'Ngazzaminde pe quiste IP",
 'navigation'     => 'Naveghesce',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -186,16 +185,16 @@ $messages = array(
 'talkpagelinktext'  => 'Parle',
 'specialpage'       => 'Pàgene Speciele',
 'personaltools'     => 'Struminde personele',
-'postcomment'       => "Pueste 'nu commende",
+'postcomment'       => 'Seziona nove',
 'articlepage'       => "Vide 'a pàgene de le condenute",
 'talk'              => "'Ngazzaminde",
 'views'             => 'Visite',
 'toolbox'           => 'Cascette de le struminde',
 'userpage'          => "Vide a pàgene de l'utende",
 'projectpage'       => 'Vide a pàgene de le pruggette',
-'imagepage'         => 'Vide a pàgene de le media',
+'imagepage'         => 'Vide a pàgene de le file',
 'mediawikipage'     => 'Vide a pàgene de le messàgge',
-'templatepage'      => 'Vide a pàgene de le templeit',
+'templatepage'      => 'Vide a pàgene de le template',
 'viewhelppage'      => "Vide a pàgene de l'ajute",
 'categorypage'      => 'Vide a pàgene de le categorije',
 'viewtalkpage'      => "Vide le 'ngazzaminde",
@@ -212,8 +211,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Sus a {{SITENAME}}',
 'aboutpage'            => 'Project:Sus a',
-'bugreports'           => 'Liste de le bochere',
-'bugreportspage'       => "Project:Liste de l'errore",
 'copyright'            => "'U condenute jè disponibile sotte a $1.",
 'copyrightpagename'    => '{{SITENAME}} copyright',
 'copyrightpage'        => '{{ns:project}}:Copyrights',
@@ -236,6 +233,7 @@ $messages = array(
 
 'badaccess'        => 'Errore de permesse',
 'badaccess-group0' => "Tu non ge puè fa l'azione ca è richieste.",
+'badaccess-groups' => "L'azione ca tu è richieste è limitete a l'utinde ca stonne jndr'à {{PLURAL:$2|'u gruppe|une de ste gruppe}}: $1.",
 
 'versionrequired'     => "Jè richieste 'a versione $1 de MediaUicchi",
 'versionrequiredtext' => "Ha ausà 'a versione $1 de MediaUicchi pe ausà sta pàgene.
@@ -252,6 +250,8 @@ Vide [[Special:Version|Versione d'a pàgene]].",
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'cange',
 'viewsourceold'           => 'vide sorgende',
+'editlink'                => 'cange',
+'viewsourcelink'          => "vide 'u sorgende",
 'editsectionhint'         => "Cange 'a sezione: $1",
 'toc'                     => 'Condenute',
 'showtoc'                 => 'fà vedè',
@@ -268,23 +268,25 @@ Vide [[Special:Version|Versione d'a pàgene]].",
 'page-atom-feed'          => '"$1" Atom Feed',
 'feed-atom'               => 'Atom',
 'feed-rss'                => 'RSS',
-'red-link-title'          => '$1 (addà essere scritte)',
+'red-link-title'          => "$1 (non g'esiste - addà essere scritte)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pàgene',
 'nstab-user'      => "Pàgene de l'utende",
 'nstab-media'     => 'Pàgene de le media',
-'nstab-special'   => 'Speciale',
+'nstab-special'   => 'Pàgene Speciale',
 'nstab-project'   => 'Pàgene de le pruggette',
 'nstab-image'     => 'File',
 'nstab-mediawiki' => 'Messàgge',
-'nstab-template'  => 'Templeit',
+'nstab-template'  => 'Template',
 'nstab-help'      => "Pàgene d'ajute",
 'nstab-category'  => 'Categorije',
 
 # Main script and global functions
 'nosuchaction'      => 'Non ge stonne otre azione',
-'nosuchactiontext'  => "L'aziona specifichete da l'URL non g'è canusciute da Uicchi",
+'nosuchactiontext'  => "L'aziona specifichete da l'URL non g'è canusciute da Uicchi.
+Tu puè avè scritte male 'a URL, o quidde ca è scritte jè 'nu collegamende sbagliete.
+Pò essere pure ca quiste jè 'nu bochere jndr'à 'u software de {{SITENAME}}.",
 'nosuchspecialpage' => 'Non ge stonne pàggene speciele',
 'nospecialpagetext' => "<big>'''Tu è richieste 'na pàgena speciele ca non g'esiste.'''</big>
 
@@ -293,6 +295,17 @@ Pe 'na liste de le pàggene speciele cirche aqquà [[Special:SpecialPages|{{int:
 # General errors
 'error'                => 'Errore',
 'databaseerror'        => "Errore de l'archivije",
+'dberrortext'          => "Ha assute n'errore de sindassi de 'na inderrogazione sus a 'u database.
+Quiste pò indicà 'nu bochere jndr'à 'u software.
+L'urteme tendative de inderrogazione sus a 'u database ha state:
+<blockquote><tt>\$1</tt></blockquote>
+cu 'a funzione \"<tt>\$2</tt>\".
+MySQL ha returnete l'errore \"<tt>\$3: \$4</tt>\".",
+'dberrortextcl'        => 'A assute \'n\'errore de sindasse sus a \'n\'inderrogazione d\'u database.
+L\'urteme tendative de inderrogazione sus a \'u database ha state:
+"$1"
+ausanne \'a funzione "$2".
+MySQL ha returnete l\'errore "$3: $4"',
 'noconnect'            => "Sime dispiaciute! Sus 'a Uicchipedie stè quacche probbleme tecniche e non ge putime condattà 'u server d'u database.<br />
 $1",
 'nodb'                 => "Non ge pozze scacchià l'archivie $1",
@@ -300,8 +313,18 @@ $1",
 'laggedslavemode'      => "Attenzione: 'A pàgene no ge tène cangiaminde recente.",
 'readonly'             => 'Archivie blocchete',
 'enterlockreason'      => "Mitte 'na raggione p'u blocche, 'ncludenne 'na stime de quanne 'u blocche avène luate.",
+'readonlytext'         => "'U database jndr'à stu mumende jè blocchete pe nueve 'nzereminde e otre cangiaminde, pò essere 'nu blocche pe 'na manutenziona de ''routine'', apprisse 'a quale torne tutte a poste.
+
+Le amministrature ca onne mise 'u blocche onne date sta motivazione: $1",
+'missing-article'      => "'U database non ge iacchije 'u teste de 'na pàgene ca avesse acchià, nnomenete \"\$1\" \$2.
+
+Stu fatte pò succedere quanne le collegaminde 'mbrà le differenze o le cunde non ge sonde aggiornete sus a 'na pàgene ca ha state scangellete.
+
+Ce quiste non g'è 'u case, tu pò essere ca è 'cchiate 'nu bochere jndr'à 'u software.
+Pe piacere manne 'na comunicazzione a 'n'[[Special:ListUsers/sysop|amministratore]], mettène jndr'à note pure l'URL.",
 'missingarticle-rev'   => '(versione#: $1)',
 'missingarticle-diff'  => '(Diff: $1, $2)',
+'readonly_lag'         => "'U database ha state automaticamende blocchete purcè le server de le database ca depennene da 'u master onne sciute in eccezzione",
 'internalerror'        => 'Errore inderne',
 'internalerror_info'   => 'Errore inderne: $1',
 'filecopyerror'        => 'Non ge pozze cupià \'u fail "$1" jndr\'à "$2".',
@@ -313,18 +336,32 @@ $1",
 'unexpected'           => 'Valore inattese: "$1"="$2".',
 'formerror'            => "Errore: non ge riesche a reggistrà 'u form",
 'badarticleerror'      => "Quest'azione non ge pò essere fatte sus 'a sta pàgene.",
+'cannotdelete'         => "Non ge puè scangellà 'a pàgene o 'u file specifichete.
+Pò essere ca ggià ha state scangellete da quacche otre.",
 'badtitle'             => 'Titele sbagliete',
 'badtitletext'         => "'A pàgene ca è cerchete tène 'nu titele errete, vacande, o jè 'nu collegamende inter-lènghe o inter-uicchi errete.
 Pò essere ca tène une o cchiù carattere ca non ge ponne essere ausete jndr'à le titele.",
+'perfcached'           => "'U date segeunde stè jndr'à cache e non ge pò essere aggiornete.",
+'perfcachedts'         => "'U date segeunde stè jndr'à cache e l'urteme aggiornamente ha state $1.",
+'querypage-no-updates' => "L'aggiornaminde pe sta pàgene sonde, pe mò, disabbilitete.
+Le date ca stonne aqquà jndre non ge sonde aggiornete.",
 'wrong_wfQuery_params' => "Parametre incorrette sus 'a wfQuery()<br />
 Function: $1<br />
 Query: $2",
 'viewsource'           => "Vide 'u sorgende",
 'viewsourcefor'        => 'pe $1',
 'actionthrottled'      => 'Azione inderrotte',
+'actionthrottledtext'  => "Cumme 'na mesure andi-spam, tu è state limitete da fà st'azione troppe vote jndr'à 'nu timbe piccinne e tu è subranete stu limite.
+Pe piacere prueve cchiù tarde.",
 'protectedpagetext'    => 'Sta pàgene ha state prutette pe no fa fà cangiaminde a uecchje.',
 'viewsourcetext'       => "Tu puè vedè e cupià 'a sorgente de sta pàgene:",
+'protectedinterface'   => "Sta pàgene te dè l'inderfacce de teste pìu software e jè blocchete pe prevenì l'abbuse.",
+'editinginterface'     => "'''Fà attenziò:'''  Tu ste cange 'na pàgene ca jè ausete pe dà ìnìinderfacce p'u software.
+Le cangiaminde de sta pàgene vonne a mettene mane sus a l'inderfacce utende pe l'otre utinde.
+Pe traduziune, pe piacere vide ce ause [http://translatewiki.net/wiki/Main_Page?setlang=roa-tara BetaUicchi], 'u pruggette de localizzazione de MediaUicchi.",
 'sqlhidden'            => '(query SQL ascunnute)',
+'cascadeprotected'     => 'Sta pàgene ha state prutette da le cangiaminde, purcè jè ingluse jndr\'à {{PLURAL:$1|seguende pàgene, ca jè|le seguende pàggene, ca sonde}} prutette cu l\'opzione "a caschete":
+$2',
 'namespaceprotected'   => "Non ge tine 'u permesse pe cangià pàggene d'u neimspeise '''$1'''.",
 'customcssjsprotected' => "Non ge tine 'u permesse pe cangià sta pàgene, purcè tène otre configurazione personele.",
 'ns-specialprotected'  => 'Le pàgene speciale no ponne essere cangete.',
@@ -332,92 +369,139 @@ Query: $2",
 'U mutive jè ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Configurazione ca fece schife: Virus scanner scanusciute: <i>$1</i>',
+'virus-badscanner'     => "Configurazione ca fece schife: Virus scanner scanusciute: ''$1''",
 'virus-scanfailed'     => 'condrolle fallite (codece $1)',
 'virus-unknownscanner' => 'antivirus scanusciute:',
 
 # Login and logout pages
-'logouttitle'               => 'Utende assute',
-'welcomecreation'           => "== Bovegne, $1! ==
+'logouttitle'                => 'Utende assute',
+'logouttext'                 => "'''Tu tè scolleghete.'''
+
+Tu puè condinuà a ausà {{SITENAME}} in mode anonime, o tu puè [[Special:UserLogin|collegarte 'n'otra vote]] cumme 'u stesse utende o cumme 'n'otre utende.
+Note Bbuene ca certe pàggene ponne condinuà a essere viste cumme ce tu ste angore colleghete, fine a quanne a cache d'u browser no se sdeveche.",
+'welcomecreation'            => "== Bovegne, $1! ==
 'U cunde tue ha state ccrejete.
 No te sce scurdanne de cangià le [[Special:Preferences|{{SITENAME}} preferenze tue]].",
-'loginpagetitle'            => "Nome de l'utende",
-'yourname'                  => 'Nome utende:',
-'yourpassword'              => 'Passuord:',
-'yourpasswordagain'         => "Scrive 'a passuord notra vote:",
-'remembermypassword'        => "Arrencuerdete 'u nome mie sus a stu combiuter",
-'yourdomainname'            => "'U nome d'u dominie tue:",
-'login'                     => 'Tràse',
-'nav-login-createaccount'   => 'Tràse / Reggistrete',
-'loginprompt'               => "Tu a tenè le cookies abilitate pe tràse jndr'à {{SITENAME}}.",
-'userlogin'                 => 'Tràse / Reggistrete',
-'logout'                    => 'Isse',
-'userlogout'                => 'Isse',
-'notloggedin'               => 'Non ge sì colleghete',
-'nologin'                   => "Non ge tine n'utenze? $1.",
-'nologinlink'               => "Ccreje 'nu cunde utende",
-'createaccount'             => "Ccreje 'nu cunde",
-'gotaccount'                => "Tine già 'nu cunde? $1.",
-'gotaccountlink'            => 'Tràse',
-'createaccountmail'         => 'pe e-mail',
-'badretype'                 => 'Le passuord ca è scritte non ge sonde uguale.',
-'userexists'                => "'U nome de l'utende ca è scritte jè già ausete.
+'loginpagetitle'             => "Nome de l'utende",
+'yourname'                   => 'Nome utende:',
+'yourpassword'               => 'Passuord:',
+'yourpasswordagain'          => "Scrive 'a passuord notra vote:",
+'remembermypassword'         => "Arrencuerdete 'u nome mie sus a stu combiuter",
+'yourdomainname'             => "'U nome d'u dominie tue:",
+'externaldberror'            => "Vide bbuene, o stè 'n'errore de autendicazione a 'u database oppure tu non ge puè aggiorna 'u cunde tue esterne.",
+'login'                      => 'Tràse',
+'nav-login-createaccount'    => 'Tràse / Reggistrete',
+'loginprompt'                => "Tu a tenè le cookies abilitate pe tràse jndr'à {{SITENAME}}.",
+'userlogin'                  => 'Tràse / Reggistrete',
+'logout'                     => 'Isse',
+'userlogout'                 => 'Isse',
+'notloggedin'                => 'Non ge sì colleghete',
+'nologin'                    => "Non ge tine n'utenze? $1.",
+'nologinlink'                => "Ccreje 'nu cunde utende",
+'createaccount'              => "Ccreje 'nu cunde",
+'gotaccount'                 => "Tine già 'nu cunde? $1.",
+'gotaccountlink'             => 'Tràse',
+'createaccountmail'          => 'pe e-mail',
+'badretype'                  => 'Le passuord ca è scritte non ge sonde uguale.',
+'userexists'                 => "'U nome de l'utende ca è scritte jè già ausete.
 Mittene n'otre.",
-'youremail'                 => 'Poste:',
-'username'                  => "Nome de l'utende:",
-'uid'                       => 'ID Utende:',
-'prefs-memberingroups'      => "Membre {{PLURAL:$1|d'u gruppe|de le gruppe}}:",
-'yourrealname'              => 'Nome vere:',
-'yourlanguage'              => 'Lènga:',
-'yournick'                  => 'Firma toje:',
-'badsig'                    => "'A firme grezze jè sbagliete.
+'youremail'                  => 'Poste:',
+'username'                   => "Nome de l'utende:",
+'uid'                        => 'ID Utende:',
+'prefs-memberingroups'       => "Membre {{PLURAL:$1|d'u gruppe|de le gruppe}}:",
+'yourrealname'               => 'Nome vere:',
+'yourlanguage'               => 'Lènga:',
+'yournick'                   => 'Firma toje:',
+'badsig'                     => "'A firme grezze jè sbagliete.
 Condrolle le tag HTML.",
-'badsiglength'              => "'A firme jè troppe longhe.
+'badsiglength'               => "'A firme jè troppe longhe.
 Addà essere assaje assaje sotte a $1 {{PLURAL:$1|carattere|carattere}}.",
-'email'                     => 'Poste',
-'prefs-help-realname'       => "'U nome vere (quidde d'u munne reale) jè facoltative.
+'email'                      => 'Poste',
+'prefs-help-realname'        => "'U nome vere (quidde d'u munne reale) jè facoltative.
 Ce tu 'u mitte, a fatje ca è fatte t'avène ricanusciute.",
-'loginerror'                => 'Errore de collegamende',
-'prefs-help-email-required' => "L'indirizze e-mail jè obbligatorie.",
-'noname'                    => "Non gìè specifichete 'nu nome utende valide.",
-'loginsuccesstitle'         => 'Tutte a poste, è trasute!',
-'loginsuccess'              => "'''Mò tu si colleghete jndr'à {{SITENAME}} cumme \"\$1\".'''",
-'nosuchuser'                => "Non g'esiste n'utende cu 'u nome \"\$1\".
+'loginerror'                 => 'Errore de collegamende',
+'prefs-help-email'           => "L'indirizze e-mail jè facoltative ma te dè 'a possibbilità de mannarte 'na password nova nove ce tu te scuèrde quedde ca tenive.
+Tu puè pure scacchià de lassà otre condatte ausanne l'utende tue o le pàggene de le 'ngazzaminde senza ca abbesogne de fa canoscere l'idendità toje.",
+'prefs-help-email-required'  => "L'indirizze e-mail jè obbligatorie.",
+'nocookiesnew'               => "'U cunde utende ha state ccrejete ma angore non g'è trasute jndr'à {{SITENAME}}.
+
+{{SITENAME}} ause le cookie pe fà collegà l'utinde.
+Tu tine le cookie disabbilitete.
+Pe piacere, ce vuè ccu trase, abilitesce le cookie e pò prueve a mettere 'a ''login'' e 'a password.",
+'nocookieslogin'             => "{{SITENAME}} ause le cookie pe fà trasè l'utinde.
+
+Tu tine le cookie disabbilitete.
+Pe piacere, vide ce l'abilitesce e pò prueve 'n'otra vote a mettere le date tue.",
+'noname'                     => "Non gìè specifichete 'nu nome utende valide.",
+'loginsuccesstitle'          => 'Tutte a poste, è trasute!',
+'loginsuccess'               => "'''Mò tu si colleghete jndr'à {{SITENAME}} cumme \"\$1\".'''",
+'nosuchuser'                 => "Non g'esiste n'utende cu 'u nome \"\$1\".
+Fà attenzione ca le nome de l'utinde so senzibbele a le lettere granne e piccenne.
 Vide bbuene a cumme l'è scritte, o [[Special:UserLogin/signup|ccreje n'utende nuève]].",
-'nosuchusershort'           => 'Non ge ste nisciune utende cu \'u nome "<nowiki>$1</nowiki>".
+'nosuchusershort'            => 'Non ge ste nisciune utende cu \'u nome "<nowiki>$1</nowiki>".
 Condrolle accume l\'è scritte.',
-'nouserspecified'           => "A scrivere pe forze 'u nome de l'utende.",
-'wrongpassword'             => "E mise 'na passuor sbagliete.
+'nouserspecified'            => "A scrivere pe forze 'u nome de l'utende.",
+'wrongpassword'              => "E mise 'na passuor sbagliete.
 Prueve n'otra vote.",
-'wrongpasswordempty'        => "'A passuord 'nzerite jè vianghe.
+'wrongpasswordempty'         => "'A passuord 'nzerite jè vianghe.
 Mitta n'otra vota.",
-'passwordtooshort'          => "'A passuord ca è mise o non g'è valida o jè troppe piccenne.
+'passwordtooshort'           => "'A passuord ca è mise o non g'è valida o jè troppe piccenne.
 Tu a mettere almene {{PLURAL:$1|1 carattere|$1 carattere}} e adda essere diverse da 'u nome utende.",
-'mailmypassword'            => 'Passuord nova pe e-mail',
-'passwordremindertitle'     => 'Passuord temboranea nova pe {{SITENAME}}',
-'passwordremindertext'      => "Quacchedune (pò essere tu, da quiste indirizze IP \$1) ha cerchete 'na nova passuord pe {{SITENAME}} (\$4). 
+'mailmypassword'             => 'Passuord nova pe e-mail',
+'passwordremindertitle'      => 'Passuord temboranea nova pe {{SITENAME}}',
+'passwordremindertext'       => "Quacchedune (pò essere tu, da quiste indirizze IP \$1) ha cerchete 'na nova passuord pe {{SITENAME}} (\$4). 
 'Na passuord temboranea pe l'utende \"\$2\" ha state ccrejete e ha state 'mbostete a \"\$3\".
 Ce quiste ere quidde ca vulive, mo vide ce te colleghe e te scacchie 'na passuord nova.
 
 Ce quacche otre 'nvece ha fatte sta rechieste, o ce tu t'è recurdate 'a passuord, e non g'à vuè cu cangè cchiù, allore no sce penzanne a 'stu messagge e continue a ausà 'a vecchia passuord.",
-'noemail'                   => 'Non ge stonne email reggistrete pe l\'utende "$1".',
-'passwordsent'              => "'Na nova passuord ha state mannete a l'indirizze e-mail reggistrete pe \"\$1\".
+'noemail'                    => 'Non ge stonne email reggistrete pe l\'utende "$1".',
+'passwordsent'               => "'Na nova passuord ha state mannete a l'indirizze e-mail reggistrete pe \"\$1\".
 Pe piacere, colleghete n'otra vota quanne l'è ricevute.",
-'eauthentsent'              => "'N'e-mail de conferme ha state mannete a l'indirizze ca tu è ditte.
+'blocked-mailpassword'       => "L'indirizze IP tue jè blocchete pe le cangiaminde e accussì tu non ge puè ausà 'a funzione de recupere d'a password pe prevenìe l'abbuse.",
+'eauthentsent'               => "'N'e-mail de conferme ha state mannete a l'indirizze ca tu è ditte.
 Apprime ca otre e-mail avènene mannete a 'u cunde tue, tu ha seguì le 'struzione ca stonne jndr'à l'e-mail, pe confermà l'iscrizione.",
-'mailerror'                 => "Errore mannanne 'a mail: $1",
-'emailconfirmlink'          => "Conferme l'indirizze e-mail tue",
-'accountcreated'            => 'cunde utende ccrejete',
-'accountcreatedtext'        => "'U cunde utende pe $1 ha state ccrejete.",
-'createaccount-title'       => "Ccreazzione de 'u cunde utende pe {{SITENAME}}",
-'loginlanguagelabel'        => 'Lénga: $1',
+'throttled-mailpassword'     => "'Nu arrecordatore de password ha stete già mannete jndr'à {{PLURAL:$1|l'urtema ore|l'urteme $1 ore}}.
+Pe prevenì l'abbuse, sulamende 'nu arrecordatore de password avene mannete ogne {{PLURAL:$1|ore|$1 ore}}.",
+'mailerror'                  => "Errore mannanne 'a mail: $1",
+'acct_creation_throttle_hit' => "Le visitature de sta Uicchi ca stonne ausene stu indirizze IP onne ccrejete {{PLURAL:$1|'nu cunde utende|$1 cunde utinde}} jndr'à l'urteme giurne, e onne raggiunde 'u numere massime ca se pò fà jndr'à stu periode.
+'U resultete jè ca le visitature ca stonne ausene stu indirizze IP non ge ponne ccrejà otre cunde utinde nuève jndr'à stu mumende.",
+'emailauthenticated'         => "L'indirizze e-mail ca ne date ha state autendichete 'u sciurne $2 a le $3.",
+'emailnotauthenticated'      => "L'indirizze e-mail tue non g'a state angore autendichete.
+Nisciuna mail t'avène mannete pe tutte le seguende dettaglie.",
+'noemailprefs'               => "Specifiche 'n'indirizze e-mail pe ste dettaglie ca onne essere fatiete.",
+'emailconfirmlink'           => "Conferme l'indirizze e-mail tue",
+'invalidemailaddress'        => "L'indirizze e-mail non ge pò essere accettete cumme l'è scritte purcè tène 'nu formete invalide.
+Pe piacere mitte l'indirizze a cumme criste cumanne, ce nò no 'u scè mettènne proprie.",
+'accountcreated'             => 'cunde utende ccrejete',
+'accountcreatedtext'         => "'U cunde utende pe $1 ha state ccrejete.",
+'createaccount-title'        => "Ccreazzione de 'u cunde utende pe {{SITENAME}}",
+'createaccount-text'         => 'Quacchedune ha ccrejete \'nu cunde utende cu l\'indirizze e-mail tue sus a {{SITENAME}} ($4) chiamete "$2", cu password "$3".
+Tu, mò, t\'avisse a collegà e cangià \'a password toje.
+
+Tu puè pure cacà stu messagge, ce stu cunde utende ha state ccrejete pe errore.',
+'login-throttled'            => "Urtemamende tu è pruvete troppe vote a mettere 'a password d'u cunde tue.
+Pe piacere vide c'aspitte 'nu picche de timbe prima de pruvà 'n'otra vote e a prossema vote, vide ce ta signe 'a password.",
+'loginlanguagelabel'         => 'Lénga: $1',
 
 # Password reset dialog
-'resetpass'           => "Azzere 'a password d'u cunde utende",
-'resetpass_text'      => "<!-- Mitte 'u teste aqquà -->",
-'resetpass_header'    => "Cange 'a password d'u cunde utende",
-'resetpass_submit'    => "'Mboste 'a passuord e colleghete",
-'resetpass_forbidden' => 'Le Password non ge ponne cangià',
+'resetpass'                 => "Cange 'a password",
+'resetpass_announce'        => "Tu tè colleghete cu 'nu codece mannete pe e-mail temboranee.
+Pe spiccià 'a procedure de collegamende, tu a 'mbostà 'na password nove aqquà:",
+'resetpass_text'            => "<!-- Mitte 'u teste aqquà -->",
+'resetpass_header'          => "Cange 'a password d'u cunde utende",
+'oldpassword'               => 'Vécchie passuord:',
+'newpassword'               => 'Nova passuord:',
+'retypenew'                 => "Scrive n'otra vota 'a passuord nova:",
+'resetpass_submit'          => "'Mboste 'a passuord e colleghete",
+'resetpass_success'         => "'A password toje ha state cangete cu successe! Mò te puè collegà...",
+'resetpass_bad_temporary'   => "'A password temboranea jè invalide.
+Pò essere ca tu è già chieste 'na password temboranea nove oppure è già cangete 'a password cu quedda definitive.",
+'resetpass_forbidden'       => 'Le Password non ge ponne cangià',
+'resetpass-no-info'         => 'Tu a essere colleghete pe accedere a sta pàgene direttamende.',
+'resetpass-submit-loggedin' => "Cange 'a password",
+'resetpass-wrong-oldpass'   => "'A password temboranea o quedda corrende jè invalide.
+Pò essere ca tu è già cangete 'a password toje o è richieste una temboranea nove.",
+'resetpass-temp-password'   => 'Password temboranea:',
 
 # Edit page toolbar
 'bold_sample'     => 'Teste grascette',
@@ -442,6 +526,8 @@ Apprime ca otre e-mail avènene mannete a 'u cunde tue, tu ha seguì le 'struzio
 'hr_tip'          => 'Linee orizzondele (ausele picche)',
 
 # Edit pages
+'summary'                          => 'Riepileghe:',
+'subject'                          => 'Oggette/Testete:',
 'minoredit'                        => 'Cangiaminde stuèdeche',
 'watchthis'                        => 'Condrolle sta pàgene',
 'savearticle'                      => "Registre 'a vôsce",
@@ -451,7 +537,13 @@ Apprime ca otre e-mail avènene mannete a 'u cunde tue, tu ha seguì le 'struzio
 'showdiff'                         => 'Fa vedè le cangiaminde',
 'anoneditwarning'                  => "'''Attenziò:''' Tu non ge sinde colleghete..
 L'indirizze IP tue avène reggistrete jndr'à le cangiaminde de sta pàgene.",
+'missingsummary'                   => "'''Arrecuèrdete:''' Tu non g'è provvedute a 'nu riepileghe de le cangiaminde.
+Ce tu cazze Reggistre 'n'otra vote, 'u cangiamende tue avène memorizzete senze une.",
 'missingcommenttext'               => "Pe piacere mitte 'nu commende aqquà sotte.",
+'missingcommentheader'             => "'''Arrecuèrdete:''' Tu non g'è provvedute a 'nu soggette/testate pe stu commende.
+Ce tu cazze Reggistre 'n'otra vote, 'u cangiamende tue avène memorizzete senze une.",
+'summary-preview'                  => "Andeprime d'u riepileghe:",
+'subject-preview'                  => "Andeprime de l'Oggette/Testete:",
 'blockedtitle'                     => "L'utende è blocchete",
 'blockedtext'                      => "<big>''''U nome de l'utende o l'indirizze IP ha state blocchete.'''</big>
 
@@ -467,12 +559,32 @@ Tu non ge puè ausà 'u strumende 'manne 'na mail a stu utende' senza ca mitte n
 [[Special:Preferences|preferenze tue]] e ce è state blocchete sus 'a l'use sue.
 L'IP ca tine mò jè $3 e 'u codece d'u blocche jè #$5.
 Pe piacere mitte ste doje 'mbormaziune ce manne 'na richieste de sblocche.",
+'autoblockedtext'                  => "L'indirizze IP tue ha state automaticamende blocchete purcè ha state ausete da n'otre utende, ca avère state blocchete da \$1.
+'U mutive date jè 'u seguende:
+
+:''\$2''
+
+* Inizie d'u blocche: \$8
+* Scadenze d'u blocche: \$6
+* Blocche 'ndise: \$7
+
+Tu puè cundattà \$1 o une de l'otre [[{{MediaWiki:Grouppage-sysop}}|amministrature]] pe parà de stu probbleme.
+
+Vide Bbuene ca tu non ge puè ausà 'a funziona \"manne n'e-mail a stu utende\" senze ca tu tìne 'n'indirizze e-mail valide e reggistrete jndr'à seziona [[Special:Preferences|me piace accussì]] e tu non ge sinde blocchete da ausarle.
+
+L'indirizze IP corrende jè \$3, e 'u codece d'u blocche jè #\$5.
+Pe piacere mitte tutte le dettaglie ca ponne essere utile pe le richieste tue.",
 'blockednoreason'                  => 'nisciune mutive',
 'blockedoriginalsource'            => "'A sorgende de '''$1''' jè mostreta aqquà sotte:",
 'blockededitsource'                => "'U teste de le '''cangiaminde tue''' sus a '''$1''' ìu stè vide aqquà sotte:",
 'whitelistedittitle'               => "Pe fa le cangiaminde t'a collegà",
+'whitelistedittext'                => 'Tu ha $1 pàggene da cangià.',
 'confirmedittitle'                 => "Ce vuè cu fece le cangiaminde a confermà cu l'email",
+'confirmedittext'                  => "Tu a confermà l'indirizze e-mail tue apprime de cangià le pàggene.
+Pe piacere mitte e validesce l'indirizze e-mail tue ausanne le [[Special:Preferences|preferenze de l'utende]].",
 'nosuchsectiontitle'               => 'Non ge stonne seziune',
+'nosuchsectiontext'                => "Tu stè prueve a cangià 'na sezione ca non g'esiste.
+Ce non ge stè 'a seziona $1, quiste non g'è 'u poste addò a reggistrà le cangiaminde tue.",
 'loginreqtitle'                    => "T'a collegà pe forze",
 'loginreqlink'                     => 'trase',
 'loginreqpagetext'                 => 'Tu a $1 pe vedè otre pàggene.',
@@ -482,16 +594,37 @@ Pe piacere mitte ste doje 'mbormaziune ce manne 'na richieste de sblocche.",
 'newarticletext'                   => "Tu ste segue 'nu collegamende a pàgene ca angore non g'esiste.
 Pe ccrejà 'a pàgene, accuminze a scrivere jndr'à 'u scatole de sotte (vide 'a [[{{MediaWiki:Helppage}}|pàggene d'ajute]] pe avè cchiù 'mbormaziune).
 Ce tu te iacche aqquà e manghe tu 'u se purcè, allore cazze 'u buttone '''back''' d'u brauser.",
-'noarticletext'                    => "Non ge stè scritte ninde jndr'à sta pàgene, tu puè [[Special:Search/{{PAGENAME}}|cercà pe quiste titele]] jndr'à otre pàggene oppure [{{fullurl:{{FULLPAGENAME}}|action=edit}} cange sta pàgene].",
+'anontalkpagetext'                 => "----''Queste jè 'na pàgene de 'ngazzaminde pe 'n'utende anonime, ca non ge vò ccu ccreje angore 'nu cunde utende, o de ce non g'u use.
+Nuje auseme 'n'indirizze IP (ca jè numereche) pe identificarle.
+E' normale ca essende 'n'indirizze IP pò essere ausete pure da otre utinde ca 'u pigghiene.
+Ce tu non ge si 'n'utende anonime e pinze ca le commende ca so revolte a te sonde studecarije, pe piacere [[Special:UserLogin/signup|ccreje 'nu cunde utende]] o [[Special:UserLogin|tràse]] pe no fà confusione jndr'à 'u future cu otre utinde anoneme.''",
+'noarticletext'                    => 'Non ge stè scritte ninde jndr\'à sta pàgene.
+Tu puè [[Special:Search/{{PAGENAME}}|cercà pe quiste titele]] jndr\'à otre pàggene, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} oppure [{{fullurl:{{FULLPAGENAME}}|action=edit}} cange sta pàgene]</span>.',
 'userpage-userdoesnotexist'        => '\'U cunde utende "$1" non g\'è reggistrete.
 Pe piacere, condrolle ce tu vuè cu ccreje/cange sta pàgene.',
+'clearyourcache'                   => "'''Vide Bbuene - Apprisse 'a reggistrazione, tu puè zumbà 'a cache d'u browser tue pe vedè le cangiaminde.'''
+*'''Mozilla / Firefox / Safari:''' cazze 'u ''Shift'' e condemboranemende cazze 'u buttone ''Aggiorna'', o cazze 'nzieme ''Ctrl-F5'' o ''Ctrl-R'' (''Command-R'' sus a 'nu Macintosh);
+*'''Konqueror: '''cazze ''Aggiorna'' o cazze ''F5'';
+*'''Opera:''' pulizze 'a cache da ''Tools → Preferences'' (in inglese) (Struminde - Preferenze in tagliàne);
+*'''Internet Explorer:''' cazze ''Ctrl'' e condemboraneamende cazze ''Aggiorna,'' o cazze ''Ctrl-F5''.",
+'usercssjsyoucanpreview'           => "'''Conziglie:''' Ause 'u buttone 'Vide l'andeprime' pe condrollà 'u CSS/JS nuève apprime de reggistrà.",
+'usercsspreview'                   => "'''Arrecuerdete ca tu ste vide sulamende in andeprime 'u CSS tue.'''
+'''Non g'à state angore reggistrete ninde!'''",
+'userjspreview'                    => "'''Arrecuerdete ca tu ste vide/teste sulamende in andeprime 'u JavaScript tue.'''
+'''Non g'à state angore reggistrete ninde!'''",
+'userinvalidcssjstitle'            => "'''Attenziò:''' Non ge stè 'nu skin \"\$1\".
+Arrecuerdete ca jndr'à le file personalizzete .css e .js s'ause scrivere le titele cu le lettere piccenne, pe esembie {{ns:user}}:Foo/monobook.css è diverse da {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Cangiete)',
-'note'                             => '<strong>Vide Bbuene:</strong>',
-'previewnote'                      => "<strong>Queste è sole 'n'andeprime;
-le cangiaminde non g'onne state angore reggistrete!</strong>",
+'note'                             => "'''Vide Bbuene:'''",
+'previewnote'                      => "'''Queste è sole 'n'andeprime;
+le cangiaminde non g'onne state angore reggistrete!'''",
+'previewconflict'                  => "Sta andeprime fece vedè 'u teste ca ste jndr'à 'u teste de l'area de sus cumme avène fore ce tu decide cu reggistre.",
+'session_fail_preview'             => "'''Ne dispiace! Non ge putime processà 'u cangiamende tue purcè s'a perse 'a sessione de le date.
+Pe piacere pruève 'n'otra vote.
+Ce angore non ge funzione ninde, [[Special:UserLogout|isse]] e tràse 'n'otre vote.'''",
 'editing'                          => 'Cangiaminde de $1',
 'editingsection'                   => 'Cangiaminde de $1 (sezione)',
-'editingcomment'                   => 'Cangiaminde de $1 (commende)',
+'editingcomment'                   => 'Cangiaminde de $1 (seziona nove)',
 'editconflict'                     => 'Conflitte de cangiaminde: $1',
 'yourtext'                         => "'U teste tue",
 'storedversion'                    => 'Versione archivijete',
@@ -499,17 +632,20 @@ le cangiaminde non g'onne state angore reggistrete!</strong>",
 'copyrightwarning'                 => "Pe piacere vide ca tutte le condrebbute de {{SITENAME}} sonde considerete de essere rilasciete sotte 'a $2 (vide $1 pe le dettaglie).
 Ce tu non ge vuè ca le condrebbute tue avènene ausete da otre o avènene cangete, non le scè mettènne proprie.<br />
 Tu na promettere pure ca le cose ca scrive tu, sonde 'mbormaziune libbere o copiete da 'nu pubbleche dominie.<br />
-<strong>NON METTE' NISCIUNA FATJE CA JE' PROTETTE DA DERITTE SENZA PERMESSE!</strong>",
-'longpagewarning'                  => "<strong>ATTENZIO': Sta pàgene jè longhe $1 kilobyte;
+'''NON METTE' NISCIUNA FATJE CA JE' PROTETTE DA DERITTE SENZA PERMESSE!'''",
+'longpagewarning'                  => "'''ATTENZIO': Sta pàgene jè longhe $1 kilobyte;
 certe brauser ponne avè probleme quanne vuè cu cange pàggene ca sonde granne cchiù o mene 32 KB.
-Pe piacere considere de cangià 'a pàgene a stuezze stuezze ausanne le sezione.</strong>",
+Pe piacere considere de cangià 'a pàgene a stuezze stuezze ausanne le sezione.'''",
+'protectedpagewarning'             => "'''ATTENZIO': Sta pàgene ha state blocchete e allore sulamende le utinde cu le privilegge de ''sysop'' ponne cangiarle.'''",
 'semiprotectedpagewarning'         => "'''Fà attenzione:''' Sta pàgene ha state blocchete accussì sulamende l'utinde reggistrete ponne fà cangiaminde.",
-'titleprotectedwarning'            => '<strong>ATTENZIONE: Sta pàgene ha state blocchete accussì sulamende certe utinde a ponne ccrejà.</strong>',
-'templatesused'                    => "Templeit ausete sus 'a sta pàgene:",
-'templatesusedpreview'             => "Templeit ausete jndr'à sta andeprime:",
+'titleprotectedwarning'            => "'''ATTENZIONE: Sta pàgene ha state blocchete accussì sulamende certe utinde a ponne ccrejà.'''",
+'templatesused'                    => "Template ausete sus 'a sta pàgene:",
+'templatesusedpreview'             => "Template ausete jndr'à sta andeprime:",
 'templatesusedsection'             => "Jndr'à sta sezione sonde ausete chiste template:",
 'template-protected'               => '(prutette)',
 'template-semiprotected'           => '(mmienze protette)',
+'hiddencategories'                 => 'Sta pàgene jè membre de {{PLURAL:$1|1 categorja|$1 categorije}} scunnute:',
+'nocreatetitle'                    => "Ccreazione d'a pàgene limitete",
 'nocreatetext'                     => "{{SITENAME}} ha restritte l'abilità de ccrejà pàggene nuéve.
 Tu puè turnà rrete e cangià 'na pàgene ca già esiste, oppure puè [[Special:UserLogin|trasè o ccrejà n'utende nuéve]].",
 'nocreate-loggedin'                => 'Non ge tine le permesse pe ccreja pàggene nuève.',
@@ -519,6 +655,27 @@ Tu puè turnà rrete e cangià 'na pàgene ca già esiste, oppure puè [[Special
 'recreate-deleted-warn'            => "'''Fa Attenziò: Ste ccreje 'na pàgene ca avère state scangillete apprime.'''
 
 Vide bbuene ce l'ha ccrejà sta pàgene, ce non ge sinde sicure vide l'archivie de le scangellaziune:",
+'deleted-notice'                   => "Sta pàgene ha state scangellete.
+L'archivije de le scangellaminde pe sta pàgene 'u puè vedè aqquà sotte pe riferimende.",
+'deletelog-fulllog'                => "Vide l'archivie comblete",
+'edit-hook-aborted'                => "Cangiamende annullete da  'nu ''hook''.
+Non g'à date nisciune mutive.",
+'edit-gone-missing'                => "Non ge puè cangià sta pàgene.
+Pare proprie ca l'onne scangellete.",
+'edit-conflict'                    => 'conflitte de cangiaminde.',
+'edit-no-change'                   => "'U cangiamende ca p fatte, avène scettate purcè 'u teste non g'à cangete manghe de 'na virgola.",
+'edit-already-exists'              => "Non ge puè ccrejà 'na pàgene nove purcè esiste già!",
+
+# Parser/template warnings
+'post-expand-template-inclusion-category' => "Pàggene addò le dimenziune d'u template sonde assaije proprie",
+'post-expand-template-argument-category'  => 'Pàggene ca condenene template cu quacche argomende zumbete',
+'parser-template-loop-warning'            => "Amme acchiete 'nu cicle de template: [[$1]]",
+'parser-template-recursion-depth-warning' => "Ha state supranete 'u limite di ricorsione de le template ($1)",
+
+# "Undo" feature
+'undo-failure' => "'U cangiamende non ge pò essere annullete purcè stè 'nu conflitte de cangiaminde indermedije.",
+'undo-norev'   => "'U cangiamende non ge pò essere annullete purcè non g'esiste o a state scangellete.",
+'undo-summary' => "Repristine 'a revisione $1 da [[Special:Contributions/$2|$2]] ([[User talk:$2|'Ngazzaminde]])",
 
 # Account creation failure
 'cantcreateaccounttitle' => "Non ge puè ccrejà 'nu cunde utende",
@@ -527,27 +684,29 @@ Vide bbuene ce l'ha ccrejà sta pàgene, ce non ge sinde sicure vide l'archivie
 'U mutive dete da $3 jè ''$2''",
 
 # History pages
-'viewpagelogs'        => "Vide l'archivie pe sta pàgene",
-'nohistory'           => "Sta pàgene non ge tène 'a storie de le cangiaminde ca onne state fatte.",
-'currentrev'          => 'Versione de osce a die',
-'revisionasof'        => 'Versione de $1',
-'revision-info'       => "Versione scritte jndr'à $1 da $2",
-'previousrevision'    => '� Versione Vecchje',
-'nextrevision'        => 'Versione cchiù nova →',
-'currentrevisionlink' => 'Versione de mò',
-'cur'                 => 'cur',
-'next'                => 'prosseme',
-'last'                => 'urteme',
-'page_first'          => 'prime',
-'page_last'           => 'urteme',
-'histlegend'          => "Differenze de selezione: signe le radio box de le versiune ca vuè cu combronde e cazze ''invio'' o 'u buttone ca ste sotte.<br />
+'viewpagelogs'           => "Vide l'archivie pe sta pàgene",
+'nohistory'              => "Sta pàgene non ge tène 'a storie de le cangiaminde ca onne state fatte.",
+'currentrev'             => 'Versione de osce a die',
+'currentrev-asof'        => 'Revisiona corrende de $1',
+'revisionasof'           => 'Versione de $1',
+'revision-info'          => "Versione scritte jndr'à $1 da $2", # Additionally available: $3: revision id
+'previousrevision'       => '� Versione Vecchje',
+'nextrevision'           => 'Versione cchiù nova →',
+'currentrevisionlink'    => 'Versione de mò',
+'cur'                    => 'cur',
+'next'                   => 'prosseme',
+'last'                   => 'urteme',
+'page_first'             => 'prime',
+'page_last'              => 'urteme',
+'histlegend'             => "Differenze de selezione: signe le radio box de le versiune ca vuè cu combronde e cazze ''invio'' o 'u buttone ca ste sotte.<br />
 Leggenda: (cur) = differenze cu 'a versiona corrende,
 (last) = differenze ca 'a versione precedende, M = cangiaminde stuédeche.",
-'deletedrev'          => '[scangellete]',
-'histfirst'           => 'Prime',
-'histlast'            => 'Urteme',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 bytes}})',
-'historyempty'        => '(vacande)',
+'history-fieldset-title' => "Sfogghje 'a storie",
+'deletedrev'             => '[scangellete]',
+'histfirst'              => 'Prime',
+'histlast'               => 'Urteme',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 bytes}})',
+'historyempty'           => '(vacande)',
 
 # Revision feed
 'history-feed-title'          => 'Storie de le revisiune',
@@ -555,119 +714,265 @@ Leggenda: (cur) = differenze cu 'a versiona corrende,
 'history-feed-item-nocomment' => '$1 a $2', # user at time
 
 # Revision deletion
-'rev-deleted-comment'    => '(commende scangillete)',
-'rev-deleted-user'       => '(nome utende scangillete)',
-'rev-deleted-event'      => "(azione de l'archivie scangillete)",
-'rev-delundel'           => 'fa vedè/scunne',
-'revisiondelete'         => 'Scangille/Repristine revisiune',
-'revdelete-hide-text'    => "Scunne 'u teste d'a revisione",
-'revdelete-hide-name'    => 'Scunne azione e obbiettive',
-'revdelete-hide-comment' => 'Scunne le commende de le cangiaminde',
-'revdelete-hide-user'    => "Scunne 'u nome utende/IP de quidde ca ha fatte 'u cangiamende",
-'revdelete-hide-image'   => "Scunne 'u codenute d'u fail",
-'revdelete-log'          => 'Archivie de le commende:',
-'revdel-restore'         => "Cange 'a visibilità",
-'pagehist'               => "Storie d'a vôsce",
-'deletedhist'            => "Storie d'u scangellamende",
-'revdelete-content'      => 'condenute',
-'revdelete-summary'      => "cange 'u riepileghe",
-'revdelete-uname'        => "nome de l'utende",
-'revdelete-restricted'   => 'appliche le restriziune a le SysOps',
-'revdelete-unrestricted' => 'live le restriziune a le SysOps',
-'revdelete-hid'          => 'scunne $1',
-'revdelete-unhid'        => 'fa vedè $1',
-'revdelete-log-message'  => '$1 pe $2 {{PLURAL:$2|revisione|revisione}}',
-'logdelete-log-message'  => '$1 pe $2 {{PLURAL:$2|fatte|fatte}}',
+'rev-deleted-comment'     => '(commende scangillete)',
+'rev-deleted-user'        => '(nome utende scangillete)',
+'rev-deleted-event'       => "(azione de l'archivie scangillete)",
+'rev-delundel'            => 'fa vedè/scunne',
+'revisiondelete'          => 'Scangille/Repristine revisiune',
+'revdelete-nooldid-title' => 'Revisione de destinazione invalida',
+'revdelete-selected'      => "'''{{PLURAL:$2|Revisiona selezionete|Revisiune selezionete}} de [[:$1]]:'''",
+'logdelete-selected'      => "'''{{PLURAL:$1|Fatte de l'archivije selezionete|Fatte de l'archivije selezionete}}:'''",
+'revdelete-legend'        => "'Mboste le restriziune sus 'a visibbilità",
+'revdelete-hide-text'     => "Scunne 'u teste d'a revisione",
+'revdelete-hide-name'     => 'Scunne azione e obbiettive',
+'revdelete-hide-comment'  => 'Scunne le commende de le cangiaminde',
+'revdelete-hide-user'     => "Scunne 'u nome utende/IP de quidde ca ha fatte 'u cangiamende",
+'revdelete-hide-image'    => "Scunne 'u codenute d'u fail",
+'revdelete-log'           => 'Archivie de le commende:',
+'revdelete-submit'        => 'Applichesce a le revisiune selezionete',
+'revdelete-logentry'      => "ha state cangete 'a visibbilità d'a revisione de [[$1]]",
+'logdelete-logentry'      => "ha state cangete 'a visibbilità de l'evende de [[$1]]",
+'revdel-restore'          => "Cange 'a visibilità",
+'pagehist'                => "Storie d'a vôsce",
+'deletedhist'             => "Storie d'u scangellamende",
+'revdelete-content'       => 'condenute',
+'revdelete-summary'       => "cange 'u riepileghe",
+'revdelete-uname'         => "nome de l'utende",
+'revdelete-restricted'    => 'appliche le restriziune a le SysOps',
+'revdelete-unrestricted'  => 'live le restriziune a le SysOps',
+'revdelete-hid'           => 'scunne $1',
+'revdelete-unhid'         => 'fa vedè $1',
+'revdelete-log-message'   => '$1 pe $2 {{PLURAL:$2|revisione|revisione}}',
+'logdelete-log-message'   => '$1 pe $2 {{PLURAL:$2|fatte|fatte}}',
 
 # Suppression log
 'suppressionlog' => 'Archivie de le soppressiune',
 
 # History merging
-'mergehistory-from'        => 'Pàgene sorgende:',
-'mergehistory-into'        => 'Pàgene de destinazione:',
-'mergehistory-autocomment' => "Squagghiete [[:$1]] jndr'à [[:$2]]",
-'mergehistory-comment'     => "Squagghiete [[:$1]] jndr'à [[:$2]]: $3",
+'mergehistory-from'                => 'Pàgene sorgende:',
+'mergehistory-into'                => 'Pàgene de destinazione:',
+'mergehistory-go'                  => "Fà vedè le cangiaminde ca se ponne squagghià 'nzieme",
+'mergehistory-submit'              => "Scuagghije 'nzieme le revisiune",
+'mergehistory-no-source'           => "'A pàgena sorgende $1 non g'esiste.",
+'mergehistory-no-destination'      => "'A pàgene de destinazione $1 non g'esiste.",
+'mergehistory-invalid-destination' => "'A pàgene de destinazione addà tenè 'nu titele valide.",
+'mergehistory-autocomment'         => "Squagghiete [[:$1]] jndr'à [[:$2]]",
+'mergehistory-comment'             => "Squagghiete [[:$1]] jndr'à [[:$2]]: $3",
+'mergehistory-same-destination'    => 'Le pàggene sorgende e de destinazione non ge ponne essere le stesse',
+
+# Merge log
+'mergelog'    => 'Archivije de le scuagghiaminde',
+'revertmerge' => 'Squascie',
 
 # Diffs
 'history-title'           => 'Liste de le versiune de "$1"',
 'difference'              => "(Differenze 'mbrà versiune)",
 'lineno'                  => 'Linea $1:',
-'compareselectedversions' => 'Combornde le versiune selezionete',
+'compareselectedversions' => 'Combronde le versiune selezionete',
+'visualcomparison'        => 'Combronde visuele',
+'wikicodecomparison'      => 'Combronde de Uicchi teste',
 'editundo'                => 'annulle',
 'diff-multi'              => "({{PLURAL:$1|'na versione de mmienze|$1 cchiù versiune de mmienze}} non ge se vèdene.)",
+'diff-movedto'            => "spustete jndr'à $1",
+'diff-styleadded'         => '$1 stile aggiunde',
+'diff-added'              => '$1 aggiunde',
+'diff-changedto'          => 'cangete cu $1',
+'diff-styleremoved'       => '$1 stile scangellete',
+'diff-removed'            => '$1 scangellete',
+'diff-changedfrom'        => 'cangiete da $1',
+'diff-src'                => 'sorgende',
+'diff-withdestination'    => 'cu destinazione $1',
+'diff-with'               => '&#32;cu $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'larghezze',
+'diff-height'             => 'altezze',
+'diff-p'                  => "'nu '''paragrafe'''",
+'diff-blockquote'         => "'na '''citazione'''",
+'diff-h1'                 => "'na '''testete (levèlle 1)'''",
+'diff-h2'                 => "'na '''testete (levèlle 2)'''",
+'diff-h3'                 => "'na '''testete (levèlle 3)'''",
+'diff-h4'                 => "'na '''testete (levèlle 4)'''",
+'diff-h5'                 => "'na '''testete (levèlle 5)'''",
+'diff-pre'                => "'nu '''blocche pre-formattete'''",
+'diff-div'                => "'na '''divisione'''",
+'diff-ul'                 => "'na '''liste non arrengàte'''",
+'diff-ol'                 => "'na '''liste arrengàte'''",
+'diff-li'                 => "'n''''elemende d'a liste'''",
+'diff-table'              => "'na '''tagelle'''",
+'diff-tbody'              => "'na '''tagelle de condenute'''",
+'diff-tr'                 => "'na '''riga'''",
+'diff-td'                 => "'na '''celle'''",
+'diff-th'                 => "'na '''testete'''",
+'diff-br'                 => "'n''''inderruzione'''",
+'diff-hr'                 => "'na '''horizontal rule'''",
+'diff-code'               => "'nu '''computer code block'''",
+'diff-dl'                 => "'na '''definition list'''",
+'diff-dt'                 => "'nu '''definition term'''",
+'diff-dd'                 => "'na '''definition'''",
+'diff-input'              => "'n''''input'''",
+'diff-form'               => "'nu '''form'''",
+'diff-img'                => "'n''''image'''",
+'diff-span'               => "'nu '''span'''",
+'diff-a'                  => "'nu '''link'''",
+'diff-i'                  => "'''italics'''",
+'diff-b'                  => "'''bold'''",
+'diff-strong'             => "'''strong'''",
+'diff-em'                 => "'''emphasis'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''big'''",
+'diff-del'                => "'''deleted'''",
+'diff-tt'                 => "'''fixed width'''",
+'diff-sub'                => "'''subscript'''",
+'diff-sup'                => "'''superscript'''",
+'diff-strike'             => "'''strikethrough'''",
 
 # Search results
-'searchresults'             => "Resultete d'a ricerche",
-'searchsubtitleinvalid'     => "Tu è cerchete pe '''$1'''",
-'noexactmatch'              => "'''Non g'esiste 'na pàgene ca se chiama \"\$1\".'''
+'searchresults'                    => "Resultete d'a ricerche",
+'searchresults-title'              => 'Resultete d\'a ricerche pe "$1"',
+'searchresulttext'                 => "Pe cchiù 'mbormaziune sus 'a recerche de {{SITENAME}}, vide [[{{MediaWiki:Helppage}}|{{int:help}}]].",
+'searchsubtitle'                   => 'Tu è cerchete pe \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tutte le pàggene ca accumenzene cu "$1"]]{{int:pipe-separator}} [[Special:WhatLinksHere/$1|tutte le pàggene ca appondene a "$1"]])',
+'searchsubtitleinvalid'            => "Tu è cerchete pe '''$1'''",
+'noexactmatch'                     => "'''Non g'esiste 'na pàgene ca se chiama \"\$1\".'''
 Tu puè [[:\$1|ccrejà sta pàgene]].",
-'notitlematches'            => "Nisciune titele de pàgene s'accocchie cu 'a recerche",
-'textmatches'               => "'U teste d'a pàgene combacie",
-'notextmatches'             => "Nisciune teste de pàgene s'accocchie cu 'a recerche",
-'prevn'                     => 'rrede $1',
-'nextn'                     => 'nnande $1',
-'viewprevnext'              => 'Vide ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 parole|$2 parole}})',
-'search-result-score'       => "'Mbortanze: $1%",
-'search-redirect'           => '(Redirette $1)',
-'search-section'            => '(sezione $1)',
-'search-suggest'            => 'Ce signifeche: $1',
-'search-interwiki-caption'  => 'Pruggette sorelle',
-'search-interwiki-default'  => '$1 resultete:',
-'search-interwiki-more'     => '(de cchiù)',
-'search-mwsuggest-enabled'  => 'cu le consiglie',
-'search-mwsuggest-disabled' => 'senza consiglie',
-'searchall'                 => 'tutte',
-'powersearch'               => 'Ricerche avanzete',
-'powersearch-ns'            => "Cirche jndr'à le namespace:",
-'powersearch-field'         => 'Cirche pe',
-'search-external'           => 'Ricerche esterne',
+'noexactmatch-nocreate'            => "'''Non ge stè 'na vosce ca se nnomene \"\$1\".'''",
+'titlematches'                     => "'U titele d'a pàgene se iacchje",
+'notitlematches'                   => "Nisciune titele de pàgene s'accocchie cu 'a recerche",
+'textmatches'                      => "'U teste d'a pàgene combacie",
+'notextmatches'                    => "Nisciune teste de pàgene s'accocchie cu 'a recerche",
+'prevn'                            => 'rrede $1',
+'nextn'                            => 'nnande $1',
+'viewprevnext'                     => 'Vide ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Opzione de ricerche',
+'searchmenu-exists'                => "'''Stè 'na pàgene nnumenete \"[[\$1]]\" sus 'a sta Uicchipèdie'''",
+'searchmenu-new'                   => "'''[[:\$1|Ccreje]] 'a pàgene \"[[:\$1|\$1]]\" sus 'a sta Uicchipèdie!'''",
+'searchhelp-url'                   => 'Help:Condenute',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Sfogghije le pàggene cu stu prefisse]]',
+'searchprofile-articles'           => 'Pàggene de condenute',
+'searchprofile-articles-and-proj'  => 'Pàggene de condenute & de pruggette',
+'searchprofile-project'            => "Pàggene d'u pruggette",
+'searchprofile-images'             => 'Le fail',
+'searchprofile-everything'         => 'Tutte',
+'searchprofile-advanced'           => 'Avanzete',
+'searchprofile-articles-tooltip'   => "Cirche jndr'à $1",
+'searchprofile-project-tooltip'    => "Cirche jndr'à $1",
+'searchprofile-images-tooltip'     => 'Cirche pe le fail',
+'searchprofile-everything-tooltip' => "Cirche jndr'à tutte le vosce (combrese le vosce de le 'ngazzaminde)",
+'searchprofile-advanced-tooltip'   => "Cirche jndr'à le namespace personalizzete",
+'prefs-search-nscustom'            => 'Cirche le namespace personalizzete:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 parole|$2 parole}})',
+'search-result-score'              => "'Mbortanze: $1%",
+'search-redirect'                  => '(Redirette $1)',
+'search-section'                   => '(sezione $1)',
+'search-suggest'                   => 'Ce signifeche: $1',
+'search-interwiki-caption'         => 'Pruggette sorelle',
+'search-interwiki-default'         => '$1 resultete:',
+'search-interwiki-more'            => '(de cchiù)',
+'search-mwsuggest-enabled'         => 'cu le consiglie',
+'search-mwsuggest-disabled'        => 'senza consiglie',
+'search-relatedarticle'            => 'Colleghete',
+'mwsuggest-disable'                => 'Disabbilete le conziglie in AJAX',
+'searchrelated'                    => 'colleghete',
+'searchall'                        => 'tutte',
+'showingresultstotal'              => "Ste vide aqquà sotte {{PLURAL:$4|resultete '''$1''' de '''$3'''|resultete '''$1 - $2''' de '''$3'''}}",
+'nonefound'                        => "'''Vide bbuene''': Sulamende sus a certe namespace avène fatte 'a ricerche pe default.
+Prueve mettènne nnande a l'inderrogaziona toje 'u prefisse '''all:''' pe cercà jndr'à tutte le namespace (ingludenne le pàggene de le 'ngazzaminde, le template, etc), o ause 'u namespace addò vuliva fa 'a ricerche cumme prefisse.",
+'search-nonefound'                 => "Non ge stonne resultete ca soddisfecene l'inderrogazione.",
+'powersearch'                      => 'Ricerche avanzete',
+'powersearch-legend'               => 'Ricerche avanzete',
+'powersearch-ns'                   => "Cirche jndr'à le namespace:",
+'powersearch-redir'                => 'Liste de le ridirezionaminde',
+'powersearch-field'                => 'Cirche pe',
+'search-external'                  => 'Ricerche esterne',
 
 # Preferences page
-'preferences'        => 'Me piece accussì',
-'mypreferences'      => 'Me piece accussì',
-'prefs-edits'        => 'Numere de cangiaminde:',
-'prefsnologin'       => 'Non ge sinde colleghete',
-'qbsettings'         => 'Barra veloce',
-'qbsettings-none'    => 'Ninde',
-'changepassword'     => "Cange 'a password",
-'skin'               => 'Skin',
-'math'               => 'Math',
-'dateformat'         => "Formete d'a date",
-'datetime'           => 'Date e ore',
-'math_unknown_error' => 'errore scanusciute',
-'math_lexing_error'  => 'errore de lessiche',
-'math_syntax_error'  => 'errore de sintassi',
-'prefs-personal'     => "Profile de l'utende",
-'prefs-watchlist'    => 'Pàggene condrollete',
-'saveprefs'          => 'Reggistre',
-'resetprefs'         => "Pulizze le cangiaminde ca non g'è reggistrete",
-'oldpassword'        => 'Vécchie passuord:',
-'newpassword'        => 'Nova passuord:',
-'retypenew'          => "Scrive n'otra vota 'a passuord nova:",
-'rows'               => 'Righe:',
-'columns'            => 'Culonne:',
-'searchresultshead'  => 'Cirche',
-'timezonelegend'     => "Orarie d'a zone",
-'prefs-namespaces'   => 'Namespaces',
-'default'            => 'defolt',
-'files'              => 'Fails',
+'preferences'               => 'Me piece accussì',
+'mypreferences'             => 'Me piece accussì',
+'prefs-edits'               => 'Numere de cangiaminde:',
+'prefsnologin'              => 'Non ge sinde colleghete',
+'prefsnologintext'          => 'Tu a essere <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} colleghete]</span> pe \'mbostà le preferenze de l\'utinde.',
+'qbsettings'                => 'Barra veloce',
+'qbsettings-none'           => 'Ninde',
+'qbsettings-fixedleft'      => 'Fissete a sinistre (Fixed left)',
+'qbsettings-fixedright'     => 'Fissete a destre (Fixed right)',
+'qbsettings-floatingleft'   => 'Volanne a sinistre (Floating left)',
+'qbsettings-floatingright'  => 'Volanne a destre (Floating right)',
+'changepassword'            => "Cange 'a password",
+'skin'                      => 'Skin',
+'skin-preview'              => 'Andeprime',
+'math'                      => 'Math',
+'dateformat'                => "Formete d'a date",
+'datedefault'               => 'Nisciuna preferenze',
+'datetime'                  => 'Date e ore',
+'math_unknown_error'        => 'errore scanusciute',
+'math_unknown_function'     => 'funziona scanusciute',
+'math_lexing_error'         => 'errore de lessiche',
+'math_syntax_error'         => 'errore de sintassi',
+'math_image_error'          => "'A conversione d'u PNG ha fallite;
+condrolle ce l'installazione de latex, dvips, gs e convertitore jè corrette",
+'math_bad_tmpdir'           => "Non ge puè scrivere o ccrejà 'na cartelle temboranea de math",
+'math_bad_output'           => "Non ge puè scrivere o ccrejà 'na cartelle de destinazzione de math",
+'prefs-personal'            => "Profile de l'utende",
+'prefs-rc'                  => 'Cangiaminde recende',
+'prefs-watchlist'           => 'Pàggene condrollete',
+'prefs-watchlist-days'      => "Giurne da fà vedè jndr'à liste de le pàggene condrollete:",
+'prefs-watchlist-days-max'  => '(massime 7 sciurne)',
+'prefs-watchlist-edits'     => "Numere massime de cangiaminde ca se ponne fa vedè jndr'à liste de le pàggene condrollete spannute:",
+'prefs-watchlist-edits-max' => '(numere massime: 1000)',
+'prefs-misc'                => 'Misc',
+'prefs-resetpass'           => "Cange a 'password",
+'saveprefs'                 => 'Reggistre',
+'resetprefs'                => "Pulizze le cangiaminde ca non g'è reggistrete",
+'textboxsize'               => 'Cangiaminde...',
+'prefs-edit-boxsize'        => "Dimenzione d'a pàgene de cangiamende.",
+'rows'                      => 'Righe:',
+'columns'                   => 'Culonne:',
+'searchresultshead'         => 'Cirche',
+'contextlines'              => 'Linne pe collegamende:',
+'contextchars'              => 'Condeste pe linee:',
+'recentchangesdays'         => "Sciurne da fà vedè jndr'à le cangiaminde recende:",
+'recentchangesdays-max'     => '(massime $1 {{PLURAL:$1|sciurne|sciurne}})',
+'savedprefs'                => 'Le preferenze tue onne state aggiornete.',
+'timezonelegend'            => "Orarie d'a zone",
+'localtime'                 => 'Orarie lochele:',
+'timezoneselect'            => "Orarie de l'area:",
+'timezoneuseserverdefault'  => "Ause 'u valore de default d'u server",
+'timezoneuseoffset'         => "Otre (specifiche 'a distanze)",
+'timezoneoffset'            => 'Distanze¹:',
+'servertime'                => "Orarie d'u server:",
+'guesstimezone'             => "Jnghie da 'u browser",
+'allowemail'                => "Abbilite l'e-mail da l'otre utinde",
+'prefs-searchoptions'       => 'Opzione de ricerche',
+'prefs-namespaces'          => 'Namespaces',
+'defaultns'                 => "Cirche jndr'à chiste namespace pe default:",
+'default'                   => 'defolt',
+'files'                     => 'Fails',
 
 # User rights
+'userrights'                     => 'Gestione de le deritte utende', # Not used as normal message but as header for the special page itself
+'userrights-lookup-user'         => "Gestisce le gruppe de l'utinde",
 'userrights-user-editname'       => "Mitte 'nu nome utende:",
+'editusergroup'                  => 'Cange le gruppe utinde',
+'editinguser'                    => "Stè cange le deritte de l'utende de l'utende '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}} [[Special:Contributions/$1|{{int:contribslink}}]])",
+'userrights-editusergroup'       => "Cange le gruppe d'utinde",
+'saveusergroups'                 => "Reggistre le gruppe d'utinde",
 'userrights-groupsmember'        => 'Membre de:',
 'userrights-reason'              => "Mutive d'u cangiamende:",
+'userrights-no-interwiki'        => "Tu non ge tìne le permesse pe cangià le deritte utende sus a l'otre uicchi.",
+'userrights-nodatabase'          => "'U Database $1 non g'esiste o non g'è lochele.",
+'userrights-notallowed'          => "'U cunde utende tue non ge tène le permesse pe assignà de deritte a l'utinde.",
 'userrights-changeable-col'      => 'Gruppe ca tu puè cangià',
 'userrights-unchangeable-col'    => 'Gruppe ca tu non ge puè cangià',
 'userrights-irreversible-marker' => '$1*',
 
 # Groups
-'group'            => 'Gruppe:',
-'group-user'       => 'Utinde',
-'group-bot'        => 'Bot',
-'group-sysop'      => 'Sysop',
-'group-bureaucrat' => 'Burocrate',
-'group-all'        => '(tutte)',
+'group'               => 'Gruppe:',
+'group-user'          => 'Utinde',
+'group-autoconfirmed' => 'Utinde auto confermatarije',
+'group-bot'           => 'Bot',
+'group-sysop'         => 'Sysop',
+'group-bureaucrat'    => 'Burocrate',
+'group-all'           => '(tutte)',
 
 'group-user-member'          => 'Utende',
 'group-autoconfirmed-member' => 'Utende Autoconfermete',
@@ -682,134 +987,244 @@ Tu puè [[:\$1|ccrejà sta pàgene]].",
 'grouppage-bureaucrat'    => '{{ns:project}}:Burocrate',
 
 # Rights
-'right-minoredit' => 'Signe le cangiaminde cumme stuedéche',
-'right-move'      => 'Spuéste le pàggene',
-'right-upload'    => 'Careche le fail',
-'right-delete'    => 'Scangille le pàggene',
-'right-bigdelete' => "Scangille le pàggene cu 'na storia longa longa",
-'right-block'     => 'Blocche otre utinde a fà le cangiaminde',
-'right-import'    => "Pàggene 'mbortete da otre Uicchipèdie",
+'right-read'             => 'Ligge le pàggene',
+'right-edit'             => 'Cange le pàggene',
+'right-createpage'       => "Ccreje le pàggene (ca non ge tènene le pàggene de le 'ngazzaminde)",
+'right-createtalk'       => "Ccreje le pàggene de le 'ngazzaminde",
+'right-createaccount'    => 'Ccreje nueve cunde utinde',
+'right-minoredit'        => 'Signe le cangiaminde cumme stuedéche',
+'right-move'             => 'Spuéste le pàggene',
+'right-move-subpages'    => 'Spueste le pàggene cu tutte le pàggene ca stonne da sotte',
+'right-movefile'         => 'Spueste le file',
+'right-suppressredirect' => "No scè ccrejanne 'nu ridirezionamende da 'u nome vecchije quanne spueste 'na pàgene",
+'right-upload'           => 'Careche le fail',
+'right-reupload'         => "Sovrascrive 'nu file esistende",
+'right-reupload-own'     => "Sovrascrive 'nu file esistende carichete da quacchedune",
+'right-upload_by_url'    => "Careche 'nu file da l'indirizze URL",
+'right-autoconfirmed'    => 'Cange le pàggene prutette a metà',
+'right-apihighlimits'    => "Ause 'nu limite cchiù ierte jndr'à l'inderrogaziune de le API",
+'right-writeapi'         => 'Ause de le API scritte',
+'right-delete'           => 'Scangille le pàggene',
+'right-bigdelete'        => "Scangille le pàggene cu 'na storia longa longa",
+'right-browsearchive'    => 'Cirche le pàggene scangellete',
+'right-undelete'         => "Repristine 'na pàgene",
+'right-suppressionlog'   => "Vide l'archivije privete",
+'right-block'            => 'Blocche otre utinde a fà le cangiaminde',
+'right-blockemail'       => "Blocche l'utente a fà mannà le email",
+'right-hideuser'         => "Bluecche 'nu cunde utende, scunnènnele da 'u pubbliche",
+'right-protect'          => 'Cange le levèelle de protezione e cange le pàggene prutette',
+'right-editinterface'    => "Cange l'inderfacce utende",
+'right-editusercssjs'    => "Cange 'u CSS e 'u JS de l'otre utinde",
+'right-import'           => "Pàggene 'mbortete da otre Uicchipèdie",
+'right-importupload'     => "'Mborte le pàggene da 'nu file carechete",
+'right-unwatchedpages'   => "Vide 'na liste de pàggene non condrollete",
+'right-trackback'        => "Conferme 'nu trackback",
+'right-userrights'       => 'Cange tutte le deritte utende',
+'right-siteadmin'        => "Blocche e sblocche 'u database",
 
 # User rights log
 'rightslog'  => "Archivie de le diritte de l'utende",
 'rightsnone' => '(ninde)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'           => 'ligge sta pàgene',
+'action-edit'           => 'cange sta pàgene',
+'action-createpage'     => 'ccreje le pàggene',
+'action-createtalk'     => "ccreje le pàggene de le 'ngazzaminde",
+'action-createaccount'  => 'ccreje stu cunde utende',
+'action-minoredit'      => 'signe stu cangiamende cumme stuédeche',
+'action-move'           => 'spuéste sta pàgene',
+'action-move-subpages'  => 'spuéste sta pàgene e tutte chidde ca stonne sotte a jedde',
+'action-movefile'       => 'spueste stu file',
+'action-upload'         => 'careche stu fail',
+'action-reupload'       => 'sovrascrive stu file esistende',
+'action-upload_by_url'  => "careche stu file da st'indirizze web",
+'action-writeapi'       => "ause 'a scritta API",
+'action-delete'         => 'scangille sta pàgene',
+'action-deleterevision' => 'scangille sta versione',
+'action-browsearchive'  => 'cirche le pàggene scangellete',
+'action-undelete'       => 'repristine sta pàgene',
+'action-suppressionlog' => "vide st'archivije privete",
+'action-block'          => "blocche st'utende pe le cangiaminde",
+'action-protect'        => "cange 'u levèlle de protezzione pe sta pàgene",
+'action-import'         => "'mborte sta pàgene da n'otra Uicchi",
+'action-importupload'   => "'mborte sta pàgene da 'nu carecamende de 'nu file",
+'action-unwatchedpages' => "vide 'a liste de le pàggene ca non ge sonde condrollete",
+'action-trackback'      => "conferme 'nu trackback",
+'action-userrights'     => "cange tutte le deritte de l'utende",
+'action-siteadmin'      => "blocche o sblocche 'u database",
+
 # Recent changes
-'nchanges'                       => '$1 {{PLURAL:$1|cangiaminde|cangiaminde}}',
-'recentchanges'                  => 'Cangiaminde recende',
-'recentchanges-feed-description' => "Tracce le urteme cangiaminde sus 'a sta Uicchipedie jndr'à quiste feed.",
-'rcnote'                         => "Sotte {{PLURAL:$1|jè '''1''' cangiamende|sonde le urteme '''$1''' cangiaminde}} jndr'à l'urteme{{PLURAL:$2|sciurne|'''$2''' sciurne}}, jndr'à $5, $4.",
-'rcnotefrom'                     => "Sotte stonne le cangiaminde da '''$2''' (fine a '''$1''' mustrete).",
-'rclistfrom'                     => 'Fà vedè le urteme cangiaminde partenne da $1',
-'rcshowhideminor'                => '$1 cangiaminde stuèdeche',
-'rcshowhidebots'                 => '$1 bot',
-'rcshowhideliu'                  => '$1 utende reggistrete',
-'rcshowhideanons'                => '$1 utende scanusciute',
-'rcshowhidepatr'                 => '$1 cangiaminde condrollete',
-'rcshowhidemine'                 => '$1 cangiaminde mie',
-'rclinks'                        => "Vide l'urteme $1 cangiaminde jndr'à l'urteme $2 sciurne<br />$3",
-'diff'                           => 'diff',
-'hist'                           => 'cunde',
-'hide'                           => 'Scunne',
-'show'                           => 'Fà vedè',
-'minoreditletter'                => 'm',
-'newpageletter'                  => 'N',
-'boteditletter'                  => 'b',
-'sectionlink'                    => '→',
-'rc_categories_any'              => 'Tutte',
-'rc-change-size'                 => '$1',
-'newsectionsummary'              => '/* $1 */ seziona nove',
+'nchanges'                          => '$1 {{PLURAL:$1|cangiaminde|cangiaminde}}',
+'recentchanges'                     => 'Cangiaminde recende',
+'recentchanges-legend'              => 'Opzione pe le cangiaminde recende',
+'recentchanges-feed-description'    => "Tracce le urteme cangiaminde sus 'a sta Uicchipedie jndr'à quiste feed.",
+'rcnote'                            => "Sotte {{PLURAL:$1|jè '''1''' cangiamende|sonde le urteme '''$1''' cangiaminde}} jndr'à l'urteme{{PLURAL:$2|sciurne|'''$2''' sciurne}}, jndr'à $5, $4.",
+'rcnotefrom'                        => "Sotte stonne le cangiaminde da '''$2''' (fine a '''$1''' mustrete).",
+'rclistfrom'                        => 'Fà vedè le urteme cangiaminde partenne da $1',
+'rcshowhideminor'                   => '$1 cangiaminde stuèdeche',
+'rcshowhidebots'                    => '$1 bot',
+'rcshowhideliu'                     => '$1 utende reggistrete',
+'rcshowhideanons'                   => '$1 utende scanusciute',
+'rcshowhidepatr'                    => '$1 cangiaminde condrollete',
+'rcshowhidemine'                    => '$1 cangiaminde mie',
+'rclinks'                           => "Vide l'urteme $1 cangiaminde jndr'à l'urteme $2 sciurne<br />$3",
+'diff'                              => 'diff',
+'hist'                              => 'cunde',
+'hide'                              => 'Scunne',
+'show'                              => 'Fà vedè',
+'minoreditletter'                   => 'm',
+'newpageletter'                     => 'N',
+'boteditletter'                     => 'b',
+'sectionlink'                       => '→',
+'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|utende|utinde}} ca condrollene]',
+'rc_categories'                     => 'Limite de le categorije (separate cu "|")',
+'rc_categories_any'                 => 'Tutte',
+'rc-change-size'                    => '$1',
+'newsectionsummary'                 => '/* $1 */ seziona nove',
+'rc-enhanced-expand'                => 'Fà vedè le dettaglie (ha ausà JavaScript)',
+'rc-enhanced-hide'                  => 'Scunne le dettaglie',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Cangiaminde culleghete',
 'recentchangeslinked-title'    => 'Cangiaminde culleghete a "$1"',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => "Non g'onne state fatte cangiaminde sus 'a sta pàgene jndr'à 'u periede selezionete.",
 'recentchangeslinked-summary'  => "Queste jè 'a liste de le cangiaminde fatte de recende a le pàggene culleghete da ' na pàgene specifiche (o a le membre de 'na specifiche categorije).
 Pàggene sus 'a [[Special:Watchlist|le Pàggene condrollete]] sonde in '''grascette'''.",
 'recentchangeslinked-page'     => "Nome d'a vôsce:",
+'recentchangeslinked-to'       => "Fa vedè le cangiaminde de le pàggene colleghete a 'na certa pàgene",
 
 # Upload
-'upload'            => "Careche 'u file",
-'uploadbtn'         => "Careche 'nu fail",
-'reupload'          => 'Recareche',
-'uploadnologin'     => 'non ge sinde colleghete',
-'uploaderror'       => 'Errore de carecamende',
-'upload-permitted'  => 'Tipe de file permesse: $1.',
-'upload-preferred'  => 'Tipe de file preferite: $1.',
-'upload-prohibited' => 'Tipe de file proibbite: $1.',
-'uploadlog'         => 'Archivie de le carecaminde',
-'uploadlogpage'     => 'Archivije de le carecaminde',
-'filename'          => "Nome d'u fail",
-'filedesc'          => 'Riepileghe',
-'fileuploadsummary' => 'Riepileghe:',
-'filestatus'        => "State d'u Copyright:",
-'filesource'        => 'Sorgende:',
-'uploadedfiles'     => 'File carechete',
-'fileexists-thumb'  => "<center>'''File già ca esiste'''</center>",
-'successfulupload'  => 'Carecamende sciute apposte',
-'savefile'          => "Reggistre 'u file",
-'uploadedimage'     => 'carechete "[[$1]]"',
-'overwroteimage'    => 'ha state carechete \'na versiona nove de "[[$1]]"',
-'uploadscripted'    => "Stu file condene HTML o codece de script ca ponne essere inderpretete jndr'à 'nu mode sbagliete da le browser.",
-'sourcefilename'    => "Nome d'u fail d'origgine:",
-'destfilename'      => "Nome d'u file de destinazione:",
-'watchthisupload'   => 'Condrolle sta pàgene',
+'upload'             => "Careche 'u file",
+'uploadbtn'          => "Careche 'nu fail",
+'reupload'           => 'Recareche',
+'reuploaddesc'       => "Scangille 'u carecamende e tuerne a 'a schermete de le carecaminde",
+'uploadnologin'      => 'non ge sinde colleghete',
+'uploadnologintext'  => 'Tu a essere [[Special:UserLogin|colleghete]] pe carecà le file.',
+'uploaderror'        => 'Errore de carecamende',
+'upload-permitted'   => 'Tipe de file permesse: $1.',
+'upload-preferred'   => 'Tipe de file preferite: $1.',
+'upload-prohibited'  => 'Tipe de file proibbite: $1.',
+'uploadlog'          => 'Archivie de le carecaminde',
+'uploadlogpage'      => 'Archivije de le carecaminde',
+'uploadlogpagetext'  => "Sotte ste 'na liste de le cchiù recende file carechete.
+Vide 'a [[Special:NewFiles|gallerie de le file nuève]] pe vedè l'otre andeprime.",
+'filename'           => "Nome d'u fail",
+'filedesc'           => 'Riepileghe',
+'fileuploadsummary'  => 'Riepileghe:',
+'filestatus'         => "State d'u Copyright:",
+'filesource'         => 'Sorgende:',
+'uploadedfiles'      => 'File carechete',
+'ignorewarning'      => "Futtetene de l'avvertimende e reggistre 'u file",
+'ignorewarnings'     => "No scè penzanne a tutte l'avvise",
+'minlength1'         => "'U nome d'u file addà tenè almene 'na lettere.",
+'badfilename'        => '\'U nome d\'u file ha state cangete jndr\'à "$1".',
+'filetype-missing'   => '\'U file non ge tène l\'estenzione (cumme a ".jpg").',
+'fileexists-thumb'   => "<center>'''File già ca esiste'''</center>",
+'successfulupload'   => 'Carecamende sciute apposte',
+'uploadwarning'      => 'Avvise de carecamende',
+'savefile'           => "Reggistre 'u file",
+'uploadedimage'      => 'carechete "[[$1]]"',
+'overwroteimage'     => 'ha state carechete \'na versiona nove de "[[$1]]"',
+'uploaddisabled'     => 'Carecaminde disabbilitete',
+'uploaddisabledtext' => 'Le carecaminde de le file sonde disabbilitete.',
+'uploadscripted'     => "Stu file condene HTML o codece de script ca ponne essere inderpretete jndr'à 'nu mode sbagliete da le browser.",
+'uploadcorrupt'      => "'U file face schife o tène 'n'estenziona incorrette.
+Pe piacere condrolle 'u file e carechele 'n'otra vote.",
+'sourcefilename'     => "Nome d'u fail d'origgine:",
+'destfilename'       => "Nome d'u file de destinazione:",
+'upload-maxfilesize' => "Dimenzione massima d'u file: $1",
+'watchthisupload'    => 'Condrolle sta pàgene',
+
+'upload-file-error' => 'Errore inderne',
+'upload-misc-error' => 'Errore de carecamende scanusciute',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
-'upload-curl-error6' => "Non ge riesche a raggiungere l'URL",
+'upload-curl-error6'  => "Non ge riesche a raggiungere l'URL",
+'upload-curl-error28' => 'Carecamende in timeout',
 
+'license'            => 'Licenziete da:',
+'nolicense'          => 'Ninde selezionete',
 'license-nopreview'  => "(L'andeprime non g'è disponibbile)",
+'upload_source_url'  => " ('na URL, valide e accessibbile pubblicamende)",
 'upload_source_file' => " ('nu fail sus a 'u combiuter tue)",
 
-# Special:ImageList
+# Special:ListFiles
+'listfiles_search_for'  => 'Cirche pe nome de le media:',
 'imgfile'               => 'file',
-'imagelist'             => 'Liste de le fail',
-'imagelist_date'        => 'Sciurne',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Utende',
-'imagelist_size'        => 'Dimenzione',
-'imagelist_description' => 'Descrizione',
-
-# Image description page
-'filehist'                      => 'cunde',
-'filehist-help'                 => "Cazze sus 'na date/orarie pe vedè 'u fail a cumme asseva jndr'à quidde timbe.",
-'filehist-deleteall'            => 'scangille tutte',
-'filehist-deleteone'            => 'scangille',
-'filehist-current'              => 'corrende',
-'filehist-datetime'             => 'Sciurne/Orarie',
-'filehist-user'                 => 'Utende',
-'filehist-dimensions'           => 'Dimenziune',
-'filehist-filesize'             => "Dimenzione d'u file",
-'filehist-comment'              => 'Commende',
-'imagelinks'                    => 'Collegaminde',
-'linkstoimage'                  => '{{PLURAL:$1|sta pàgene apponde |$1 ste pàggene appondene}} a stu fail:',
-'nolinkstoimage'                => 'Non ge stonne pàggene ca appodene a stu fail.',
-'sharedupload'                  => 'This file is a shared upload and may be used by other projects.',
-'shareduploadconflict-linktext' => "n'otre fail",
-'noimage'                       => "Non g'esiste nisciune fail cu stu nome, ma tu puè $1.",
-'noimage-linktext'              => 'carechene une',
-'uploadnewversion-linktext'     => "Careche 'na versiona nove de stu fail",
+'listfiles'             => 'Liste de le fail',
+'listfiles_date'        => 'Sciurne',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Utende',
+'listfiles_size'        => 'Dimenzione',
+'listfiles_description' => 'Descrizione',
+'listfiles_count'       => 'Versiune',
+
+# File description page
+'filehist'                       => 'cunde',
+'filehist-help'                  => "Cazze sus 'na date/orarie pe vedè 'u fail a cumme asseva jndr'à quidde timbe.",
+'filehist-deleteall'             => 'scangille tutte',
+'filehist-deleteone'             => 'scangille',
+'filehist-revert'                => "'nvirte",
+'filehist-current'               => 'corrende',
+'filehist-datetime'              => 'Sciurne/Orarie',
+'filehist-thumb'                 => 'Thumbnail',
+'filehist-thumbtext'             => "Thumbnail p'a versione de $1",
+'filehist-nothumb'               => 'Nisciuna thumbnail',
+'filehist-user'                  => 'Utende',
+'filehist-dimensions'            => 'Dimenziune',
+'filehist-filesize'              => "Dimenzione d'u file",
+'filehist-comment'               => 'Commende',
+'imagelinks'                     => 'Collegaminde de file',
+'linkstoimage'                   => '{{PLURAL:$1|sta pàgene apponde |$1 ste pàggene appondene}} a stu fail:',
+'nolinkstoimage'                 => 'Non ge stonne pàggene ca appodene a stu fail.',
+'sharedupload'                   => 'This file is a shared upload and may be used by other projects.',
+'shareduploadwiki'               => "Pe piacere vide $1 pe avè cchiù 'mbormaziune.",
+'shareduploadwiki-desc'          => "'A descrizione de le sue $1 sus a 'u scatelone condivise jè visualizzete aqquà sotte.",
+'shareduploadwiki-linktext'      => "pàgene d'a descrizione d'u file",
+'shareduploadduplicate-linktext' => "'n'otre file",
+'shareduploadconflict-linktext'  => "n'otre fail",
+'noimage'                        => "Non g'esiste nisciune fail cu stu nome, ma tu puè $1.",
+'noimage-linktext'               => 'carechene une',
+'uploadnewversion-linktext'      => "Careche 'na versiona nove de stu fail",
+'imagepage-searchdupe'           => 'Cirche pe le file duplichete',
 
 # File reversion
+'filerevert'          => "'Nvirte $1",
 'filerevert-backlink' => '� $1',
+'filerevert-legend'   => "'Nvirte 'u file",
 'filerevert-comment'  => 'Commende:',
+'filerevert-submit'   => "'Nvirte",
 
 # File deletion
-'filedelete'          => 'Scangille $1',
-'filedelete-backlink' => '� $1',
-'filedelete-legend'   => "Scangille 'u file",
-'filedelete-submit'   => 'Scangille',
+'filedelete'                  => 'Scangille $1',
+'filedelete-backlink'         => '� $1',
+'filedelete-legend'           => "Scangille 'u file",
+'filedelete-comment'          => "Mutive d'u scangellamende:",
+'filedelete-submit'           => 'Scangille',
+'filedelete-success'          => "'''$1''' ha state scangellete.",
+'filedelete-nofile'           => "'''$1''' non g'esiste.",
+'filedelete-otherreason'      => 'Otre/addizionale mutive:',
+'filedelete-reason-otherlist' => 'Otre mutive',
+'filedelete-reason-dropdown'  => "*Mutive comune pe le scangellaminde
+** Violazione d'u Copyright
+** File duplichete",
+'filedelete-edit-reasonlist'  => "Cange le mutive d'a scangellazione",
 
 # MIME search
 'mimesearch' => "Ricerca jndr'à 'u MIME",
 'mimetype'   => 'Tipe de MIME:',
 'download'   => 'scareche',
 
+# Unwatched pages
+'unwatchedpages' => 'Pàggene ca non ge ste condrolle',
+
 # List redirects
 'listredirects' => 'Liste de le ridirezionaminde',
 
 # Unused templates
-'unusedtemplates'    => 'Templeit ca non ge sonde ausete',
+'unusedtemplates'    => 'Template ca non ge sonde ausete',
 'unusedtemplateswlh' => 'Otre collegaminde',
 
 # Random page
@@ -819,9 +1234,27 @@ Pàggene sus 'a [[Special:Watchlist|le Pàggene condrollete]] sonde in '''grasce
 'randomredirect' => 'Redirezionamende a uecchie',
 
 # Statistics
-'statistics' => 'Statisteche',
-
-'disambiguations' => 'Pàggene de disambiguazione',
+'statistics'                   => 'Statisteche',
+'statistics-header-pages'      => 'Pàgene de le statisteche',
+'statistics-header-edits'      => 'Cange le statisteche',
+'statistics-header-views'      => 'Vide le statisteche',
+'statistics-header-users'      => "Statisteche de l'utende",
+'statistics-articles'          => 'Pàggene de le condenute',
+'statistics-pages'             => 'Pàggene',
+'statistics-pages-desc'        => "Tutte le pàggene jndr'à Uicchi, mettènne le pàggene de le 'ngazzaminde, ridirezionaminde, ecc.",
+'statistics-files'             => 'File carechete',
+'statistics-edits'             => 'Cangiaminde de le pàggene da quanne sta {{SITENAME}} ha state ccrejete',
+'statistics-edits-average'     => 'Cangiaminde medie pe pàgene',
+'statistics-views-total'       => 'Visite totele',
+'statistics-views-peredit'     => 'Visite pe cangiaminde',
+'statistics-jobqueue'          => "Lunghezze d'a [http://www.mediawiki.org/wiki/Manual:Job_queue Code de fatije]",
+'statistics-users'             => '[[Special:ListUsers|Utinde reggistrete]]',
+'statistics-users-active'      => 'Utinde attive',
+'statistics-users-active-desc' => "Sonde l'utinde ca onne fatte quacchecose jndr'à l'urteme {{PLURAL:$1|giurne|$1 giurne}}",
+'statistics-mostpopular'       => 'Pàggene cchiù visitete',
+
+'disambiguations'     => 'Pàggene de disambiguazione',
+'disambiguationspage' => 'Template:disambigue',
 
 'doubleredirects' => 'Ridirezionaminde a doppie',
 
@@ -837,49 +1270,59 @@ Pàggene sus 'a [[Special:Watchlist|le Pàggene condrollete]] sonde in '''grasce
 
 # Miscellaneous special pages
 'nbytes'                  => '$1 {{PLURAL:$1|byte|bytes}}',
+'ncategories'             => '$1 {{PLURAL:$1|categorije|categorije}}',
 'nlinks'                  => '$1 {{PLURAL:$1|collegamende|collegaminde}}',
 'nmembers'                => '$1 {{PLURAL:$1|membre|membre}}',
+'nrevisions'              => '$1 {{PLURAL:$1|revisione|revisiune}}',
+'nviews'                  => '$1 {{PLURAL:$1|visite|visite}}',
 'lonelypages'             => 'Pàggene orfane',
 'uncategorizedpages'      => 'Pàggene senza categorije',
 'uncategorizedcategories' => 'Categorije senza categorije',
 'uncategorizedimages'     => 'fail senza categorije',
-'uncategorizedtemplates'  => 'Templeit senza categorije',
+'uncategorizedtemplates'  => 'Template senza categorije',
 'unusedcategories'        => 'Categorije ca non ge sonde ausete',
 'unusedimages'            => "Fail ca non g'avènene ausete",
+'popularpages'            => 'Pàggene cchiù canusciute',
 'wantedcategories'        => 'Categorije cerchete',
 'wantedpages'             => 'Pàggene cchiù cerchete',
+'wantedfiles'             => 'File cchiù cerchete',
+'wantedtemplates'         => 'Template cchiù ausete',
 'mostlinked'              => 'Pàggene cchiù appundete',
 'mostlinkedcategories'    => 'Categorije cchiù appundete',
-'mostlinkedtemplates'     => 'Templeit cchiù appundete',
+'mostlinkedtemplates'     => 'Template cchiù appundete',
 'mostcategories'          => "Pàggene cu 'nu sacche de categorije",
 'mostimages'              => 'Fail cchiù appundete',
 'mostrevisions'           => 'Pàggene cchiù cangete',
-'prefixindex'             => "Indice p'u prefisse",
+'prefixindex'             => "Tutte le pàggene cu 'u prefisse",
 'shortpages'              => 'Pàggene corte',
 'longpages'               => 'Pàggene longhe',
 'deadendpages'            => 'Pàggene senza collegamende',
 'protectedpages'          => 'Pàggene prutette',
+'protectedpagesempty'     => 'Nisciuna pàgene jè prutette pe mò cu ste parametre.',
 'protectedtitles'         => 'Titele prutette',
 'listusers'               => "Liste de l'utende",
+'usereditcount'           => '$1 {{PLURAL:$1|cangiamende|cangiaminde}}',
 'newpages'                => 'Pàggene nuève',
 'newpages-username'       => "Nome de l'utende:",
 'ancientpages'            => 'Pàggene vìcchje',
 'move'                    => 'Spuèste',
 'movethispage'            => 'Spueste sta pàgene',
+'notargettitle'           => 'Nisciuna destinazione',
 'pager-newer-n'           => '{{PLURAL:$1|cchiù nueve 1|cchiù nueve $1}}',
 'pager-older-n'           => '{{PLURAL:$1|cchiù vecchie 1|cchiù vicchie $1}}',
 
 # Book sources
-'booksources'      => 'Sorgende de le libbre',
-'booksources-isbn' => 'ISBN:',
-'booksources-go'   => 'Veje',
+'booksources'               => 'Sorgende de le libbre',
+'booksources-search-legend' => 'Cirche pe le fonde de le libbre',
+'booksources-isbn'          => 'ISBN:',
+'booksources-go'            => 'Veje',
 
 # Special:Log
 'specialloguserlabel'  => 'Utende:',
 'speciallogtitlelabel' => 'Titele:',
 'log'                  => 'Archivije',
 'all-logs-page'        => "Tutte l'archivije",
-'log-search-submit'    => 'Veje',
+'logempty'             => "Non ge stè 'n'anema de priatorie jndr'à l'archivije.",
 
 # Special:AllPages
 'allpages'          => 'Tutte le pàggene',
@@ -887,6 +1330,7 @@ Pàggene sus 'a [[Special:Watchlist|le Pàggene condrollete]] sonde in '''grasce
 'nextpage'          => 'Pàgene apprisse ($1)',
 'prevpage'          => 'Pàgene apprime ($1)',
 'allpagesfrom'      => 'Fà vedè le pàggene partenne da:',
+'allpagesto'        => "Fà vedè pàggene ca spiccene 'u:",
 'allarticles'       => 'Tutte le pàggene',
 'allinnamespace'    => 'Tutte le pàggene (neimspeise $1)',
 'allnotinnamespace' => "Tutte le pàggene (ca non ge stonne jndr'à 'u namespace $1)",
@@ -894,108 +1338,165 @@ Pàggene sus 'a [[Special:Watchlist|le Pàggene condrollete]] sonde in '''grasce
 'allpagesnext'      => 'Prossime',
 'allpagessubmit'    => 'Veje',
 'allpagesprefix'    => "Fa vedè le pàggene cu 'u prefisse:",
+'allpages-bad-ns'   => '{{SITENAME}} non ge tène \'u namaspace "$1".',
 
 # Special:Categories
-'categories' => 'Le Categorije',
+'categories'                    => 'Le Categorije',
+'special-categories-sort-count' => 'ordere pe condegge',
+'special-categories-sort-abc'   => 'ordere alfabbeticamende',
+
+# Special:DeletedContributions
+'deletedcontributions' => "Condrebbute de l'utende scangellete",
+
+# Special:LinkSearch
+'linksearch'      => 'Collegaminde fore a Uicchipèdie',
+'linksearch-ns'   => 'Neimspeise:',
+'linksearch-ok'   => 'Cirche',
+'linksearch-line' => '$1 jè pundete da $2',
 
 # Special:ListUsers
+'listusersfrom'      => "Fà vedè l'utinde partenne da:",
 'listusers-submit'   => 'Fa vedè',
 'listusers-noresult' => 'Nisciune utende acchiete.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Archivije de ccreazione de le utinde',
+'newuserlog-byemail'          => 'password mannete pe e-mail',
+'newuserlog-create-entry'     => 'Utende nuève',
+'newuserlog-create2-entry'    => 'cunde utende ccrejete pe $1',
+'newuserlog-autocreate-entry' => 'Cunde utende ccrejete automaticamende',
+
 # Special:ListGroupRights
-'listgrouprights-group'         => 'Gruppe',
-'listgrouprights-rights'        => 'Diritte',
-'listgrouprights-members'       => '(liste de le membre)',
-'listgrouprights-right-display' => '$1 ($2)',
+'listgrouprights'                 => 'Deritte de le gruppe utinde',
+'listgrouprights-group'           => 'Gruppe',
+'listgrouprights-rights'          => 'Diritte',
+'listgrouprights-helppage'        => 'Help:Deritte de le gruppe',
+'listgrouprights-members'         => '(liste de le membre)',
+'listgrouprights-right-display'   => '$1 ($2)',
+'listgrouprights-addgroup'        => 'Puè aggiungere {{PLURAL:$2|gruppe|gruppe}}: $1',
+'listgrouprights-removegroup'     => 'Puè scangellà {{PLURAL:$2|gruppe|gruppe}}: $1',
+'listgrouprights-addgroup-all'    => 'Puè aggiungere tutte le gruppe',
+'listgrouprights-removegroup-all' => 'Puè luà tutte le gruppe',
 
 # E-mail user
-'emailuser'       => "Manne n'email a stu utende",
-'emailpage'       => "E-mail de l'utende",
-'defemailsubject' => 'e-mail de {{SITENAME}}',
-'noemailtitle'    => 'Nisciune indirizze e-mail',
-'emailfrom'       => 'Da:',
-'emailto'         => 'A:',
-'emailsubject'    => 'Oggette:',
-'emailmessage'    => 'Messagge:',
-'emailsend'       => 'Manne',
-'emailsent'       => 'E-mail mannete',
+'mailnologin'      => 'Nisciune indirizze de invie',
+'emailuser'        => "Manne n'email a stu utende",
+'emailpage'        => "E-mail de l'utende",
+'usermailererror'  => "L'oggette ''Mail'' ha returnete 'n'errore:",
+'defemailsubject'  => 'e-mail de {{SITENAME}}',
+'noemailtitle'     => 'Nisciune indirizze e-mail',
+'nowikiemailtitle' => 'Nisciuna e-mail è permesse',
+'email-legend'     => "Manne 'na mail a n'otre utende de {{SITENAME}}",
+'emailfrom'        => 'Da:',
+'emailto'          => 'A:',
+'emailsubject'     => 'Oggette:',
+'emailmessage'     => 'Messagge:',
+'emailsend'        => 'Manne',
+'emailccme'        => "Manneme 'n'email cu 'na copie d'u messàgge.",
+'emailccsubject'   => 'Copie de le messàgge tue a $1: $2',
+'emailsent'        => 'E-mail mannete',
+'emailsenttext'    => "'U messagge email tue ha state mannete.",
 
 # Watchlist
-'watchlist'            => 'Pàggene condrollete',
-'mywatchlist'          => 'Pàggene condrollete',
-'watchlistfor'         => "(pe '''$1''')",
-'nowatchlist'          => "Non ge tine pàggene jndr'à liste de le pàggene condrollete.",
-'watchnologin'         => 'Non ge sinde colleghete',
-'watchnologintext'     => 'Tu a essere [[Special:UserLogin|colleghete]] pe cangià le pàggene condrollete tue.',
-'addedwatch'           => "Mise jndr'à le pàggene condrollete",
-'addedwatchtext'       => "'A pàgene \"[[:\$1]]\" ha state aggiunde jndr'à le [[Special:Watchlist|pàggene condrollete]].
+'watchlist'         => 'Pàggene condrollete',
+'mywatchlist'       => 'Pàggene condrollete',
+'watchlistfor'      => "(pe '''$1''')",
+'nowatchlist'       => "Non ge tine pàggene jndr'à liste de le pàggene condrollete.",
+'watchnologin'      => 'Non ge sinde colleghete',
+'watchnologintext'  => 'Tu a essere [[Special:UserLogin|colleghete]] pe cangià le pàggene condrollete tue.',
+'addedwatch'        => "Mise jndr'à le pàggene condrollete",
+'addedwatchtext'    => "'A pàgene \"[[:\$1]]\" ha state aggiunde jndr'à le [[Special:Watchlist|pàggene condrollete]].
 Le cangiaminde future a sta pàgene e 'a pàgene de le 'ngazzaminde associete le puè acchià aqquà, e 'a pàgene avène signete cu 'u '''grascette''' jndr'à [[Special:RecentChanges|liste de le cangiaminde recende]] pe facilità l'identificazione.",
-'removedwatch'         => 'Live da le pàggene condrollete',
-'removedwatchtext'     => '\'A pàgene "[[:$1]]" ha state scangillete da [[Special:Watchlist|le pàggene condrollete tue]].',
-'watch'                => 'Condrolle',
-'watchthispage'        => 'Condrolle sta pàgene',
-'unwatch'              => 'No condrollà cchiù',
-'unwatchthispage'      => "No condrollà cchiù 'a pàgene",
-'notanarticle'         => "Non g'è 'na vosce",
-'notvisiblerev'        => "'A revisione ha state scangellete",
-'watchlist-details'    => "{{PLURAL:$1|$1 pàgene|$1 pàggene}} jndr'à liste de le pàggene condrollete, scartanne le pàggene de le 'ngazzaminde.",
-'wlshowlast'           => "Vide l'urteme $1 ore $2 sciurne $3",
-'watchlist-show-bots'  => 'Fà vedè le cangiaminde de le bot',
-'watchlist-hide-bots'  => 'Scunne le cangiaminde de le bot',
-'watchlist-show-own'   => 'Fà vedè le cangiaminde mie',
-'watchlist-hide-own'   => 'Scunne le cangiaminde mie',
-'watchlist-show-minor' => 'Fà vedè le cangiaminde stuèdeche',
-'watchlist-hide-minor' => 'Scunne le cangiaminde stuèdeche',
+'removedwatch'      => 'Live da le pàggene condrollete',
+'removedwatchtext'  => '\'A pàgene "[[:$1]]" ha state scangillete da [[Special:Watchlist|le pàggene condrollete tue]].',
+'watch'             => 'Condrolle',
+'watchthispage'     => 'Condrolle sta pàgene',
+'unwatch'           => 'No condrollà cchiù',
+'unwatchthispage'   => "No condrollà cchiù 'a pàgene",
+'notanarticle'      => "Non g'è 'na vosce",
+'notvisiblerev'     => "'A revisione ha state scangellete",
+'watchlist-details' => "{{PLURAL:$1|$1 pàgene|$1 pàggene}} jndr'à liste de le pàggene condrollete, scartanne le pàggene de le 'ngazzaminde.",
+'wlheader-enotif'   => "* 'A notifiche de le e-mail notification jè abbilitete.",
+'watchlistcontains' => "'A liste de le pàggene condrollete toje condene $1 {{PLURAL:$1|pàgene|pàggene}}.",
+'wlshowlast'        => "Vide l'urteme $1 ore $2 sciurne $3",
+'watchlist-options' => "Opzione d'a liste de le pàggene condrollete",
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Fà vedè...',
 'unwatching' => 'No fà vedè...',
 
+'enotif_mailer'                => '{{SITENAME}} Notificatore de email',
+'enotif_reset'                 => 'Signe tutte le pàggene cumme visitete',
 'enotif_newpagetext'           => "Queste è 'na pàgena nove.",
 'enotif_impersonal_salutation' => 'Utende de {{SITENAME}}',
 'changed'                      => 'cangete',
 'created'                      => 'ccrejete',
+'enotif_subject'               => '\'A pàgene de {{SITENAME}} $PAGETITLE ha state $CHANGEDORCREATED da $PAGEEDITOR',
+'enotif_lastvisited'           => "Vide $1 pe tutte le cangiaminde da l'urtema visita toje.",
+'enotif_lastdiff'              => 'Vide $1 pe vedè stu cangiamende.',
 'enotif_anon_editor'           => 'Utende anonime $1',
 
-# Delete/protect/revert
-'deletepage'                  => "Scangille 'a pàgene",
-'confirm'                     => 'Conferme',
-'excontent'                   => "'u condenute ere: '$1'",
-'delete-confirm'              => 'Scangille "$1"',
-'delete-backlink'             => '� $1',
-'delete-legend'               => 'Scangille',
-'historywarning'              => "Vide Bbuene: 'a pàgene ca ste scangille tène 'na storie de cangiaminde:",
-'confirmdeletetext'           => "Vide Bbuene, vide ca ste scangille 'na pàgene ca tène pure nu sbuenne de cangiaminde.
+# Delete
+'deletepage'            => "Scangille 'a pàgene",
+'confirm'               => 'Conferme',
+'excontent'             => "'u condenute ere: '$1'",
+'excontentauthor'       => "'u condenute ere: '$1' (e l'uneche condrebbutore ere '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'         => "'u condenute apprime d'a pulizie ere: '$1'",
+'exblank'               => "'a vosce ere vacande",
+'delete-confirm'        => 'Scangille "$1"',
+'delete-backlink'       => '� $1',
+'delete-legend'         => 'Scangille',
+'historywarning'        => "Vide Bbuene: 'a pàgene ca ste scangille tène 'na storie de cangiaminde:",
+'confirmdeletetext'     => "Vide Bbuene, vide ca ste scangille 'na pàgene ca tène pure nu sbuenne de cangiaminde.
 Conferme quidde ca ste face, ce si sicure ca è capite quidde ca ste cumbine e ce è corrette rispette a [[{{MediaWiki:Policy-url}}|le regole de scangellazione]], ce no statte quiete.",
-'actioncomplete'              => 'Aziona Combletete',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" onne state scangillete.
+'actioncomplete'        => 'Aziona Combletete',
+'deletedtext'           => '"<nowiki>$1</nowiki>" onne state scangillete.
 Vide $2 pe \'na reggistrazione de le scangellaziune recende.',
-'deletedarticle'              => 'scangillete "[[$1]]"',
-'dellogpage'                  => 'Archivie de le scangellaminde',
-'deletecomment'               => "Mutive p'a scangellazione:",
-'deleteotherreason'           => 'Otre mutive de cchiù:',
-'deletereasonotherlist'       => 'Otre mutive',
-'rollbacklink'                => "annulle 'u cangiaminde",
+'deletedarticle'        => 'scangillete "[[$1]]"',
+'suppressedarticle'     => 'soppresse "[[$1]]"',
+'dellogpage'            => 'Archivie de le scangellaminde',
+'dellogpagetext'        => "Sotte ste 'na liste de le cchiù recende scangellaziune.",
+'deletionlog'           => 'Archivije de le scangellaminde',
+'deletecomment'         => "Mutive p'a scangellazione:",
+'deleteotherreason'     => 'Otre mutive de cchiù:',
+'deletereasonotherlist' => 'Otre mutive',
+
+# Rollback
+'rollbacklink' => "annulle 'u cangiaminde",
+
+# Protect
 'protectlogpage'              => 'Archibie de le prutezziune',
+'protectedarticle'            => 'prutette "[[$1]]"',
+'modifiedarticleprotection'   => '\'u levèlle de protezione ha state cangete pe "[[$1]]"',
+'unprotectedarticle'          => 'sprutette "[[$1]]"',
+'protect-title'               => 'Cange levèlle de protezione pe "$1"',
+'prot_1movedto2'              => "[[$1]] spustete jndr'à [[$2]]",
 'protect-backlink'            => '� $1',
+'protect-legend'              => "Conferme 'a protezione",
 'protectcomment'              => 'Commende:',
 'protectexpiry'               => 'More:',
 'protect_expiry_invalid'      => 'Orarie de scadenze jè invalide.',
 'protect_expiry_old'          => "L'ore de scadenza jè jndr'à 'u passate.",
 'protect-unchain'             => 'Sblocche le permisse de spustaminde',
-'protect-text'                => "Tu puè vedè e cangià 'u levèlle de protezzione p'a pàgene <strong><nowiki>$1</nowiki></strong>.",
+'protect-text'                => "Tu puè vedè e cangià 'u levèlle de protezzione p'a pàgene '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "Tu non ge tine le permesse pe putè cangià le levèlle de protezione de le pàggene.
-Chiste sonde le configuraziune corrende p'a pàgene <strong>$1</strong>:",
+Chiste sonde le configuraziune corrende p'a pàgene '''$1''':",
 'protect-cascadeon'           => "Sta pàgene mò jè  prutette purcè jè ingluse jndr'à {{PLURAL:$1|'a seguende pàgene, ca tène|le seguende pàggene, ca tènene}} a protezione a cascata appizzechete.
 Tu puè cangià 'u levèlle de protezione de sta pàgene ma stu cangiamende non ge tène effette a cascata.",
-'protect-default'             => '(defolt)',
+'protect-default'             => "Permitte a tutte l'utinde",
 'protect-fallback'            => 'Richieste \'u permesse "$1"',
-'protect-level-autoconfirmed' => "Blocche l'utinde non reggistrete",
+'protect-level-autoconfirmed' => "Blocche l'utinde nuève e chidde non reggistrete",
 'protect-level-sysop'         => 'Sulamende pe le Sysops',
 'protect-summary-cascade'     => 'a caschete',
 'protect-expiring'            => "more 'u $1 (UTC)",
+'protect-expiry-indefinite'   => 'indefinite',
 'protect-cascade'             => "Le pàggene prutette 'ngludene sta pàgene (protezione a caschete)",
 'protect-cantedit'            => 'Tu non ge puè cangià le levèlle de protezzione de sta pàgene, purcè tu non ge tine le diritte pe cangiarle.',
+'protect-othertime'           => 'Otre timbe:',
+'protect-othertime-op'        => 'otre orarie',
+'protect-otherreason'         => 'Otre mutive:',
+'protect-otherreason-op'      => 'otre mutive',
+'protect-expiry-options'      => '1 ore:1 hour,1 giurne:1 day,1 sumane:1 week,2 sumane:2 weeks,1 mese:1 month,3 mise:3 months,6 mise:6 months,1 anne:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permesse:',
 'restriction-level'           => 'Levèlle de restrizione:',
 'minimum-size'                => 'Dimenzione minime:',
@@ -1011,11 +1512,26 @@ Tu puè cangià 'u levèlle de protezione de sta pàgene ma stu cangiamende non
 # Restriction levels
 'restriction-level-sysop'         => 'tutte prutette',
 'restriction-level-autoconfirmed' => "'mmienze prutette",
+'restriction-level-all'           => 'ogne levèlle',
 
 # Undelete
-'undeletebtn'            => 'Repristine',
-'undeletecomment'        => 'Commende:',
-'undelete-search-submit' => 'Cirche',
+'undelete'                  => 'Vide le pàggene scangellete',
+'undeletepage'              => 'Vide e sripristine le pàggene scangellete',
+'viewdeletedpage'           => 'Vide le pàggene scangellete',
+'undelete-fieldset-title'   => 'Repristine le revisiune',
+'undeleterevisions'         => '$1 {{PLURAL:$1|revisione|revisiune}} archiviete',
+'undelete-revision'         => 'Revisiona scangellete de $1 (cumme de $4, a $5) da $3:',
+'undeletebtn'               => 'Repristine',
+'undeletelink'              => 'repristine',
+'undeletereset'             => 'Azzere',
+'undeleteinvert'            => 'Selezione a smerse',
+'undeletecomment'           => 'Commende:',
+'undeletedarticle'          => 'ripristinete "[[$1]]"',
+'undeletedrevisions'        => '{{PLURAL:$1|1 revisione|$1 revisiune}} ripristinete',
+'undeletedrevisions-files'  => '{{PLURAL:$1|1 revisione|$1 revisiune}} e {{PLURAL:$2|1 file|$2 file}} ripristinete',
+'undeletedfiles'            => '{{PLURAL:$1|1 file|$1 file}} ripristinete',
+'undelete-search-submit'    => 'Cirche',
+'undelete-show-file-submit' => 'Sine',
 
 # Namespace form on various pages
 'namespace'      => 'Namespace:',
@@ -1023,12 +1539,13 @@ Tu puè cangià 'u levèlle de protezione de sta pàgene ma stu cangiamende non
 'blanknamespace' => '(Prengepàle)',
 
 # Contributions
-'contributions' => "Condrebbute de l'utende",
-'mycontris'     => 'Condrebbute mie',
-'contribsub2'   => 'Pe $1 ($2)',
-'uctop'         => '(sus)',
-'month'         => "Da 'u mese (e cchiù recende):",
-'year'          => "Da l'anne (e cchiù recende):",
+'contributions'       => "Condrebbute de l'utende",
+'contributions-title' => "Condrebbute de l'utende pe $1",
+'mycontris'           => 'Condrebbute mie',
+'contribsub2'         => 'Pe $1 ($2)',
+'uctop'               => '(sus)',
+'month'               => "Da 'u mese (e cchiù recende):",
+'year'                => "Da l'anne (e cchiù recende):",
 
 'sp-contributions-newbies'     => 'Fà vedè sulamende le condrebbute de le utinde nueve',
 'sp-contributions-newbies-sub' => "Pe l'utinde nuève",
@@ -1038,41 +1555,100 @@ Tu puè cangià 'u levèlle de protezione de sta pàgene ma stu cangiamende non
 'sp-contributions-submit'      => 'Cirche',
 
 # What links here
-'whatlinkshere'       => 'Appondene aqquà',
-'whatlinkshere-title' => 'Pàggene ca appondene a "$1"',
-'linkshere'           => "Le pàggene ca avènene appondene a '''[[:$1]]''':",
-'nolinkshere'         => "Nisciuna pàgene apponde a '''[[:$1]]'''.",
-'isredirect'          => 'pàgene de ridirezionamende',
-'istemplate'          => 'inclusione',
-'whatlinkshere-prev'  => '{{PLURAL:$1|apprime|apprime $1}}',
-'whatlinkshere-next'  => '{{PLURAL:$1|apprisse|apprisse $1}}',
-'whatlinkshere-links' => '� collegaminde',
+'whatlinkshere'            => 'Appondene aqquà',
+'whatlinkshere-title'      => 'Pàggene ca appondene a "$1"',
+'whatlinkshere-page'       => 'Pàgene:',
+'whatlinkshere-backlink'   => '� $1',
+'linkshere'                => "Le pàggene ca avènene appondene a '''[[:$1]]''':",
+'nolinkshere'              => "Nisciuna pàgene apponde a '''[[:$1]]'''.",
+'isredirect'               => 'pàgene de ridirezionamende',
+'istemplate'               => 'inclusione',
+'isimage'                  => "collegamende a l'immaggine",
+'whatlinkshere-prev'       => '{{PLURAL:$1|apprime|apprime $1}}',
+'whatlinkshere-next'       => '{{PLURAL:$1|apprisse|apprisse $1}}',
+'whatlinkshere-links'      => '� collegaminde',
+'whatlinkshere-hideredirs' => '$1 ridirezionaminde',
+'whatlinkshere-hidetrans'  => '$1 transclusiune',
+'whatlinkshere-hidelinks'  => '$1 collegaminde',
+'whatlinkshere-hideimages' => '$1 collegaminde a immaggine',
+'whatlinkshere-filters'    => 'Filtre',
 
 # Block/unblock
-'blockip'           => "Blocche l'utende",
-'ipboptions'        => '2 ore:2 hours,1 giurne:1 day,3 giurne:3 days,1 sumane:1 week,2 sumane:2 weeks,1 mese:1 month,3 mise:3 months,6 mise:6 months,1 anne:1 year,infinite:infinite', # display1:time1,display2:time2,...
-'ipblocklist'       => "'Ndirizze IP e nome utinde blocchete",
-'blocklink'         => 'blocche',
-'unblocklink'       => 'sblocche',
-'contribslink'      => 'condrebbute',
-'blocklogpage'      => 'Archivije de le Bloccaminde',
-'blocklogentry'     => "blocchete [[$1]] pe 'nu timbe de $2 $3",
-'proxyblocksuccess' => 'Spicciete.',
-'sorbs'             => 'DNSBL',
+'blockip'                      => "Blocche l'utende",
+'ipaddress'                    => 'Indirizze IP:',
+'ipadressorusername'           => "Indirizze IP o nome de l'utende:",
+'ipbexpiry'                    => 'More:',
+'ipbreason'                    => 'Mutive:',
+'ipbreasonotherlist'           => 'Otre mutive',
+'ipbanononly'                  => "Blocche sulamende l'utinde anonime",
+'ipbsubmit'                    => "Blocche st'utende",
+'ipbother'                     => 'Otre orarie:',
+'ipboptions'                   => '2 ore:2 hours,1 giurne:1 day,3 giurne:3 days,1 sumane:1 week,2 sumane:2 weeks,1 mese:1 month,3 mise:3 months,6 mise:6 months,1 anne:1 year,infinite:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'               => 'otre',
+'ipbotherreason'               => 'Otre mutive:',
+'badipaddress'                 => 'Indirizze IP invalide',
+'blockipsuccesssub'            => 'Blocche effettuate',
+'ipb-unblock-addr'             => 'Sblocche $1',
+'ipb-unblock'                  => 'Sblocche nome utende o indirizze IP',
+'ipb-blocklist-contribs'       => 'Condrebbute pe $1',
+'unblockip'                    => "Sblocche l'utende",
+'ipusubmit'                    => 'Live stu blocche',
+'unblocked'                    => '[[User:$1|$1]] ha state sblocchete',
+'unblocked-id'                 => 'Blocche $1 ha state luvete',
+'ipblocklist'                  => "'Ndirizze IP e nome utinde blocchete",
+'ipblocklist-legend'           => "Iacchije 'n'utende blocchete",
+'ipblocklist-username'         => 'Nome utende o indirizze IP:',
+'ipblocklist-sh-userblocks'    => '$1 le cunde utinde blocchete',
+'ipblocklist-sh-tempblocks'    => '$1 le blocche temboranee',
+'ipblocklist-sh-addressblocks' => '$1 le blocche de le singhele indirizze IP',
+'ipblocklist-submit'           => 'Cirche',
+'blocklistline'                => '$1, $2 blocchete $3 ($4)',
+'infiniteblock'                => 'quanne pisce a iaddine',
+'expiringblock'                => "more 'u $1",
+'anononlyblock'                => "sulamende l'anonime",
+'createaccountblock'           => "sulamende l'utinde anonime",
+'emailblock'                   => 'e-mail blocchete',
+'ipblocklist-empty'            => "'A liste de le blocche jè vacande.",
+'ipblocklist-no-results'       => "L'indirizze IP ca è cerchete o 'u nome utende non ge sonde blocchete.",
+'blocklink'                    => 'blocche',
+'unblocklink'                  => 'sblocche',
+'change-blocklink'             => "cange 'u blocche",
+'contribslink'                 => 'condrebbute',
+'blocklogpage'                 => 'Archivije de le Bloccaminde',
+'blocklogentry'                => "blocchete [[$1]] pe 'nu timbe de $2 $3",
+'unblocklogentry'              => 'sblocchete $1',
+'block-log-flags-anononly'     => "sulamende l'utinde anonime",
+'block-log-flags-nocreate'     => 'ccreazione de le cunde utinde disabbilitete',
+'block-log-flags-noautoblock'  => 'auto blocche disabbilitete',
+'block-log-flags-noemail'      => 'e-mail blocchete',
+'ipb_expiry_invalid'           => "L'orarije de scadenze non g'è valide.",
+'ipb_already_blocked'          => '"$1" jè ggià blocchete',
+'ipb-needreblock'              => "== Già blocchete ==
+$1 ha state già blocchete. Vuè cu cange le 'mbostaziune?",
+'ip_range_invalid'             => "L'indervalle de l'IP non g'è valide.",
+'blockme'                      => 'Bloccheme',
+'proxyblocker-disabled'        => "'A funzione ha state disabbilitete.",
+'proxyblocksuccess'            => 'Spicciete.',
+'sorbs'                        => 'DNSBL',
+'cant-block-while-blocked'     => 'Tu non ge puè bloccà otre utinde quanne tu si blocchete.',
 
 # Developer tools
-'lockdb'        => 'Blocche databeise',
-'unlockdb'      => 'Sblocche databeise',
-'lockconfirm'   => "Sine, Je avveramende vogghie cu blocche 'u database.",
-'unlockconfirm' => "Sine, Je avveramende vogghie cu sblocche 'u database.",
-'lockbtn'       => 'Blocche databeise',
-'unlockbtn'     => 'Sblocche databeise',
+'lockdb'              => 'Blocche databeise',
+'unlockdb'            => 'Sblocche databeise',
+'lockconfirm'         => "Sine, Je avveramende vogghie cu blocche 'u database.",
+'unlockconfirm'       => "Sine, Je avveramende vogghie cu sblocche 'u database.",
+'lockbtn'             => 'Blocche databeise',
+'unlockbtn'           => 'Sblocche databeise',
+'lockdbsuccesssub'    => "'U blocche d'u database ha state fatte cu successe",
+'unlockdbsuccesssub'  => "'U blocche d'u database ha state luete",
+'unlockdbsuccesstext' => "'U database ha state sblocchete.",
+'databasenotlocked'   => "'U database non g'è blocchete.",
 
 # Move page
-'move-page'          => 'Spuèste $1',
-'move-page-backlink' => '� $1',
-'move-page-legend'   => "Spuèste 'a pàgene",
-'movepagetext'       => "Ausanne 'u form aqquà sotte ste cange 'u nome d'a pàgene, spustanne tutte a storia soje sus a 'u nome néve.
+'move-page'                 => 'Spuèste $1',
+'move-page-backlink'        => '� $1',
+'move-page-legend'          => "Spuèste 'a pàgene",
+'movepagetext'              => "Ausanne 'u form aqquà sotte ste cange 'u nome d'a pàgene, spustanne tutte a storia soje sus a 'u nome néve.
 U' vecchie titele devènde 'nu ridirezionamende sus 'a pàgena nove.
 Tu puè aggiornà 'u ridirezionamende ca apponde da 'u titele automaticamende.
 Ce tu no fece ninde condrolle ca non ccreje [[Special:DoubleRedirects|doppie ridirezionaminde ]] o [[Special:BrokenRedirects|ridirezionaminde scuasciete]].
@@ -1084,44 +1660,84 @@ Quieste significhe ca tu puè fà turnà 'u vecchie nome 'a pàgene ce jedde ha
 '''ATTENZIONE!'''
 Quiste pò essere 'nu cangiamende drastiche e inaspettete de 'na pàgene famose assaje;
 pe piacere a essere secure-secure de le conseguenze prime de procedere.",
-'movepagetalktext'   => "'A pagene de le 'ngazzaminde associete avène spustete automaticamende ce però:
+'movepagetalktext'          => "'A pagene de le 'ngazzaminde associete avène spustete automaticamende ce però:
 
 * Ste 'na pàgene de 'ngazzaminde chiena sotte 'a vôsce nova, o
 * Non ge signe 'u cieck box de sotte.
 
 Jndr'à ste case, 'a pàgene non g'avène spustete e pò t'a cupià a màne 'u codenute sue.",
-'movearticle'        => 'Spuèste:',
-'newtitle'           => "A 'u titele nuève:",
-'move-watch'         => 'condrolle sta pàgene',
-'movepagebtn'        => "Spueste 'a pàgene",
-'pagemovedsub'       => 'Spustaminde eseguite',
-'movepage-moved'     => "<big>'''\"\$1\" ha state spustate jndr'à \"\$2\"'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'      => "'Na pàgene cu stu nome già esiste, o 'u nome ca tu è scacchiete non g'è valide.
+'movearticle'               => 'Spuèste:',
+'movenologin'               => 'Non ge sinde colleghete',
+'movenologintext'           => "Tu a essere 'n'utende reggistrete e [[Special:UserLogin|colleghete]] pe spustà 'na pàgene.",
+'movenotallowed'            => "Tu non ge tìne 'u permesse pe spustà le pàggene.",
+'movenotallowedfile'        => "Tu non ge tìne 'u permesse pe spustà le file.",
+'cant-move-user-page'       => "Tu non ge tìne 'u permesse pe spustà le pàggene de l'utinde (staccannele cumme sottopàggene).",
+'cant-move-to-user-page'    => "Tu non ge tìne 'u permesse pe spustà 'na pàgene a 'na pàgene utende (sulamende pe le sottopàggene de l'utinde).",
+'newtitle'                  => "A 'u titele nuève:",
+'move-watch'                => 'condrolle sta pàgene',
+'movepagebtn'               => "Spueste 'a pàgene",
+'pagemovedsub'              => 'Spustaminde eseguite',
+'movepage-moved'            => "<big>'''\"\$1\" ha state spustate jndr'à \"\$2\"'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => "'Na pàgene cu stu nome già esiste, o 'u nome ca tu è scacchiete non g'è valide.
 Pe piacere scacchie n'otre nome.",
-'talkexists'         => "''''A pàgene ha state spustete, però 'a pàgene de le 'ngazzaminde pò essere ca non g'à state spustete purcè ne ste n'otre già cu 'u titele nuéve.
+'talkexists'                => "''''A pàgene ha state spustete, però 'a pàgene de le 'ngazzaminde pò essere ca non g'à state spustete purcè ne ste n'otre già cu 'u titele nuéve.
 Videta tu 'a màne a 'ngollà 'a pàgena vecchie cu quedda nova.'''",
-'movedto'            => 'spustete a',
-'movetalk'           => "Spuéste 'a pàgene de le 'ngazzaminde associete",
-'1movedto2'          => "[[$1]] spustete jndr'à [[$2]]",
-'movelogpage'        => 'Archivije de le spustaminde',
-'movereason'         => 'Raggione:',
-'revertmove'         => 'a smerse',
+'movedto'                   => 'spustete a',
+'movetalk'                  => "Spuéste 'a pàgene de le 'ngazzaminde associete",
+'movepage-page-moved'       => "'A pàgene $1 ha state spustete sus a $2.",
+'1movedto2'                 => "[[$1]] spustete jndr'à [[$2]]",
+'1movedto2_redir'           => "spustete [[$1]] jndr'à [[$2]] sus a 'nu ridirezionamende",
+'movelogpage'               => 'Archivije de le spustaminde',
+'movelogpagetext'           => "Sotte stè 'na liste de le pàggene spustete.",
+'movereason'                => 'Raggione:',
+'revertmove'                => 'a smerse',
+'delete_and_move'           => 'Scangille e spuèste',
+'delete_and_move_confirm'   => "Sine, scangille 'a pàggene",
+'immobile-source-namespace' => 'Non ge pozze spustà le pàggene da \'u namespace "$1"',
+'immobile-target-namespace' => 'Non ge pozze spustà le pàggene jndr\'à \'u namespace "$1"',
+'immobile-source-page'      => 'Sta pàgene non ge se pò spustà.',
+'immobile-target-page'      => 'Non ge puè spustà sus a stu titele de destinazione.',
 
 # Export
-'export' => 'Pàggene esportete',
+'export'            => 'Pàggene esportete',
+'export-submit'     => 'Esporte',
+'export-addcattext' => "Aggiunge le pàggene da 'a categorije:",
+'export-addcat'     => 'Aggiunge',
+'export-download'   => "Reggistre cumme a 'nu file",
+'export-templates'  => 'Inglude le template',
 
 # Namespace 8 related
-'allmessages' => "Messagge d'u Sisteme",
+'allmessages'         => "Messagge d'u Sisteme",
+'allmessagesname'     => 'Nome',
+'allmessagesdefault'  => 'Teste de default',
+'allmessagescurrent'  => 'Teste corrende',
+'allmessagesfilter'   => "Nome d'u filtre d'u Mèssagge:",
+'allmessagesmodified' => 'Fà vedè sulamende le cangete',
 
 # Thumbnails
 'thumbnail-more'  => 'Allarije',
 'thumbnail_error' => "Errore ccrejanne l'andeprime picenne: $1",
+'djvu_page_error' => 'Pàgene DjVu fore da le limite',
 
 # Special:Import
-'import'           => "Pàggene 'mbortete",
-'importinterwiki'  => "'Mborte da Transuicchi",
-'xml-error-string' => "$1 a 'a linea $2, colonne $3 (byte $4): $5",
-'import-upload'    => 'Careche le date in XML',
+'import'                     => "Pàggene 'mbortete",
+'importinterwiki'            => "'Mborte da Transuicchi",
+'import-interwiki-history'   => "Copie tutte 'a sotrie de le versiune de sta pàgene",
+'import-interwiki-submit'    => "'Mborte",
+'import-interwiki-namespace' => 'Namespace de destinazione:',
+'import-upload-filename'     => "Nome d'u file:",
+'import-comment'             => 'Commende:',
+'importstart'                => "'Mbortazione de le pàggene...",
+'import-revision-count'      => '$1 {{PLURAL:$1|revisione|revisiune}}',
+'importnopages'              => "Nisciuna pàgene da 'mbortà.",
+'importfailed'               => "'Mbortaziona fallite: <nowiki>$1</nowiki>",
+'importcantopen'             => "Non ge puè aprè 'u file 'mbortete",
+'importbadinterwiki'         => 'collegamende interuicchi errete',
+'importnotext'               => 'Vacande o senza teste',
+'importsuccess'              => "'Mbortaziona spicciete!",
+'import-noarticle'           => "Nisciuna pàgene 'mbortete!",
+'xml-error-string'           => "$1 a 'a linea $2, colonne $3 (byte $4): $5",
+'import-upload'              => 'Careche le date in XML',
 
 # Import log
 'importlogpage'             => "Archivie de le 'mbortaziune",
@@ -1129,7 +1745,7 @@ Videta tu 'a màne a 'ngollà 'a pàgena vecchie cu quedda nova.'''",
 'import-logentry-interwiki' => 'transuicchied $1',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => "'A pàgene meje",
+'tooltip-pt-userpage'             => "'A pàgene utende meje",
 'tooltip-pt-mytalk'               => "'Ngazzaminde mie",
 'tooltip-pt-preferences'          => 'Me piece accussì',
 'tooltip-pt-watchlist'            => "'A liste de le pàggene ca ste condrolle pe le camgiaminde",
@@ -1139,15 +1755,18 @@ Videta tu 'a màne a 'ngollà 'a pàgena vecchie cu quedda nova.'''",
 'tooltip-ca-talk'                 => "'Ngazzaminde sus 'a pàgene de le condenute",
 'tooltip-ca-edit'                 => "Tu puè cangià sta pàgene.
 Pe piacere ause 'u buttone de l'andeprime apprime de salvà.",
-'tooltip-ca-addsection'           => "Aggiunge 'nu commende a stu 'ngazzaminde",
+'tooltip-ca-addsection'           => "Fà accumenzà 'na seziona nove",
 'tooltip-ca-viewsource'           => "Sta pàgene jè prutette.
 Puè vedè sulamende 'u sorgende.",
+'tooltip-ca-history'              => 'Versiune passete de sta pàgene',
 'tooltip-ca-protect'              => 'Prutegge sta pàgene',
 'tooltip-ca-delete'               => 'Scangille sta pàgene',
 'tooltip-ca-move'                 => 'Spuèste sta pàgene',
 'tooltip-ca-watch'                => "Aggiunge sta pàgene jndr'à le pàggene condrollete",
 'tooltip-ca-unwatch'              => 'No condrollà cchiù sta pàgene',
 'tooltip-search'                  => 'Cirche {{SITENAME}}',
+'tooltip-search-go'               => "Veje 'a pàgene cu 'u nome esatte ce quiste esiste",
+'tooltip-search-fulltext'         => 'Cirche le pàggene cu stu teste',
 'tooltip-p-logo'                  => 'Pàgene Prengepàle',
 'tooltip-n-mainpage'              => "Vè vide 'a pàgene prengepàle",
 'tooltip-n-portal'                => "Parkanne d'u proggette, ce puà fà, addò puè acchjà le cose.",
@@ -1156,16 +1775,22 @@ Puè vedè sulamende 'u sorgende.",
 'tooltip-n-randompage'            => "Careche 'na pàgene a uecchje",
 'tooltip-n-help'                  => "'Nu poste da scuprì",
 'tooltip-t-whatlinkshere'         => 'Liste de tutte le pàggene de Uicchi ca appondene aqquà',
+'tooltip-t-recentchangeslinked'   => "Cangiaminde recende jndr'à le pàggene appundete da sta pàgene",
 'tooltip-feed-rss'                => 'RSS feed pe sta pàgene',
 'tooltip-feed-atom'               => 'Atom feed pe sta pàgene',
 'tooltip-t-contributions'         => "Vide 'a liste de le condrebbute de quiste utende",
 'tooltip-t-emailuser'             => "Manne n'e-mail a stu utende",
 'tooltip-t-upload'                => 'Careche le file',
 'tooltip-t-specialpages'          => 'Liste de tutte le pàggene speciale',
+'tooltip-t-print'                 => 'Versiona stambabele de sta pàgene',
+'tooltip-t-permalink'             => "Collegamende permanende a sta versione d'a pàgene",
 'tooltip-ca-nstab-main'           => "Vide 'a pàgene cu le condenute",
 'tooltip-ca-nstab-user'           => "Vide 'a pàgene de l'utende",
+'tooltip-ca-nstab-media'          => "Vide 'a pàgene de le media",
+'tooltip-ca-nstab-special'        => "Queste jè 'na pàgena speciale, ca tu non ge puè cangià",
 'tooltip-ca-nstab-project'        => "Vide 'a pàgene d'u proggette",
 'tooltip-ca-nstab-image'          => "Vide 'a pàgene d'u fail",
+'tooltip-ca-nstab-mediawiki'      => "Vide le messàgge d'u sisteme",
 'tooltip-ca-nstab-template'       => "Fà vedè 'u template",
 'tooltip-ca-nstab-help'           => "Vide 'a pàgene d'ajute",
 'tooltip-ca-nstab-category'       => 'Vide a pàgene de le categorije',
@@ -1175,17 +1800,45 @@ Puè vedè sulamende 'u sorgende.",
 'tooltip-diff'                    => "Fà vedè ce cangiaminde e fatte a 'u teste.",
 'tooltip-compareselectedversions' => "Vide le differenze 'mbrà le doje versiune selezionete de sta pàgene.",
 'tooltip-watch'                   => "Mitte sta pàgene jndr'à liste de le pàggene condrollete",
+'tooltip-upload'                  => "Accumenze 'u carecamende",
+'tooltip-rollback'                => '"Ripristine" annulle le cangiaminde a sta pàgene de l\'urteme condrebbutore cu \'nu cazzamende',
+'tooltip-undo'                    => "\"Annulle\" annulle stu cangiamende e iapre 'u form de le cangiaminde facenne vedè l'andeprime.
+Permette de aggiungere 'nu mutive jndr'à 'u riepileghe",
 
 # Attribution
-'others' => 'otre',
+'anonymous'     => '{{PLURAL:$1|utende|utinde}} anonime de {{SITENAME}}',
+'siteuser'      => 'Utende de {{SITENAME}} $1',
+'othercontribs' => "Basete sus a 'na fatije de $1.",
+'others'        => 'otre',
+'siteusers'     => '{{PLURAL:$2|utende|utinde}} de {{SITENAME}} $1',
+'creditspage'   => 'Pàgene de le crediti',
+
+# Spam protection
+'spamprotectiontitle' => "Filtre de protezione da 'u spam",
+
+# Info page
+'infosubtitle' => "'Mbormazione pe pàgene",
+'numedits'     => 'Numere de cangiaminde (pàgene): $1',
+'numtalkedits' => "Numere de cangiaminde (pàgene de le 'ngazzaminde): $1",
+'numwatchers'  => 'Numere de visitature: $1',
+
+# Math options
+'mw_math_png'    => "Fà sembre 'u render de le PNG",
+'mw_math_simple' => 'HTML ce jè avveramende facile oppure PNG',
+'mw_math_html'   => 'HTML ce jè possibbile oppure PNG',
+'mw_math_mathml' => 'MathML ce possibbile (sperimendele)',
 
 # Patrol log
 'patrol-log-auto' => '(automatiche)',
+'patrol-log-diff' => 'revisione $1',
 
 # Image deletion
-'filedeleteerror-long' => "Quanne ste scangelleve 'u file s'onne presendede ste errore:
+'deletedrevision'       => 'Vecchia revisione scangellete $1',
+'filedeleteerror-short' => "Errore mentre stè scangelleve 'u file: $1",
+'filedeleteerror-long'  => "Quanne ste scangelleve 'u file s'onne presendede ste errore:
 
 $1",
+'filedelete-missing'    => '\'U file "$1" non ge pò essere scangellete purcè non g\'esiste!',
 
 # Browsing diffs
 'previousdiff' => '� Cangiaminde vecchije',
@@ -1199,12 +1852,15 @@ $1",
 'show-big-image'       => 'Risoluzione chiena chiena',
 'show-big-image-thumb' => '<small>Dimenziune de sta andeprime: $1 × $2 pixels</small>',
 
-# Special:NewImages
-'newimages'    => 'Gallerie de le fail nuève',
-'showhidebots' => '($1 bot)',
-'noimages'     => 'Non ge stè ninde da vedè.',
-'ilsubmit'     => 'Cirche',
-'bydate'       => 'pe date',
+# Special:NewFiles
+'newimages'             => 'Gallerie de le fail nuève',
+'newimages-legend'      => 'Filtre',
+'newimages-label'       => "Nome d'u fail (o 'nu stuezze de jidde):",
+'showhidebots'          => '($1 bot)',
+'noimages'              => 'Non ge stè ninde da vedè.',
+'ilsubmit'              => 'Cirche',
+'bydate'                => 'pe date',
+'sp-newimages-showfrom' => 'Fa vedè le file nuève partenne da $2, $1',
 
 # Bad image list
 'bad_image_list' => "'U formete jè 'u seguende:
@@ -1229,26 +1885,35 @@ Otre avènene scunnute pe defolt.
 * focallength", # Do not translate list items
 
 # EXIF tags
-'exif-orientation'         => 'Oriendamende',
-'exif-imagedescription'    => "Titele de l'immaggine",
-'exif-software'            => 'Softuer ausete',
-'exif-artist'              => 'Autore',
-'exif-exifversion'         => 'Versione de Exif',
-'exif-usercomment'         => "Commende de l'utende",
-'exif-exposuretime-format' => '$1 sec ($2)',
-'exif-fnumber'             => 'Numere de F',
-'exif-flash'               => 'Flash',
-'exif-contrast'            => 'Condraste',
-'exif-saturation'          => 'Saturazione',
-'exif-gpslatitude'         => 'Latitudene',
-'exif-gpslongitude'        => 'Longitudene',
-'exif-gpsaltitude'         => 'Altitudene',
-'exif-gpsdatestamp'        => "Date d'u GPS",
+'exif-orientation'                 => 'Oriendamende',
+'exif-jpeginterchangeformatlength' => "Byte d'u date d'u JPEG",
+'exif-imagedescription'            => "Titele de l'immaggine",
+'exif-software'                    => 'Softuer ausete',
+'exif-artist'                      => 'Autore',
+'exif-copyright'                   => "Titolere d'u Copyright",
+'exif-exifversion'                 => 'Versione de Exif',
+'exif-usercomment'                 => "Commende de l'utende",
+'exif-exposuretime-format'         => '$1 sec ($2)',
+'exif-fnumber'                     => 'Numere de F',
+'exif-flash'                       => 'Flash',
+'exif-filesource'                  => "Sorgende d'u file",
+'exif-contrast'                    => 'Condraste',
+'exif-saturation'                  => 'Saturazione',
+'exif-gpslatitude'                 => 'Latitudene',
+'exif-gpslongitude'                => 'Longitudene',
+'exif-gpsaltitude'                 => 'Altitudene',
+'exif-gpsimgdirection'             => "Direzione de l'immaggine",
+'exif-gpsareainformation'          => "Nome de l'area d'u GPS",
+'exif-gpsdatestamp'                => "Date d'u GPS",
+
+'exif-unknowndate' => 'Data scanusciute',
 
 'exif-orientation-1' => 'Normale', # 0th row: top; 0th column: left
 
 'exif-componentsconfiguration-0' => "non g'esiste",
 
+'exif-exposureprogram-0' => 'Non definite',
+
 'exif-subjectdistance-value' => '$1 metre',
 
 'exif-meteringmode-0'   => 'Scanusciute',
@@ -1257,15 +1922,22 @@ Otre avènene scunnute pe defolt.
 'exif-meteringmode-6'   => 'Parziele',
 'exif-meteringmode-255' => 'Otre',
 
-'exif-lightsource-0' => 'Scanusciute',
+'exif-lightsource-0'  => 'Scanusciute',
+'exif-lightsource-1'  => "Luce d'u giurne",
+'exif-lightsource-4'  => 'Flash',
+'exif-lightsource-24' => 'ISO studio tungstene',
 
 'exif-focalplaneresolutionunit-2' => 'pollece (inches)',
 
+'exif-sensingmethod-1' => 'Indefinite',
+
 'exif-customrendered-0' => 'Processe normele',
 'exif-customrendered-1' => 'Processe personalizzete',
 
+'exif-scenecapturetype-0' => 'Stàndàrd',
 'exif-scenecapturetype-1' => 'Orizzondele',
 'exif-scenecapturetype-2' => 'Vertichele',
+'exif-scenecapturetype-3' => 'Scene de notte',
 
 'exif-gaincontrol-0' => 'Ninde',
 
@@ -1279,6 +1951,8 @@ Otre avènene scunnute pe defolt.
 
 'exif-subjectdistancerange-0' => 'Scanusciute',
 'exif-subjectdistancerange-1' => 'Macro',
+'exif-subjectdistancerange-2' => "Chiude 'a viste",
+'exif-subjectdistancerange-3' => "Distanzie 'a viste",
 
 # Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
 'exif-gpsspeed-k' => "Chilometre a l'ore",
@@ -1297,37 +1971,66 @@ Otre avènene scunnute pe defolt.
 'monthsall'        => 'tutte',
 
 # E-mail address confirmation
-'confirmemail'           => "Conferme l'indirizze e-mail",
-'confirmemail_sent'      => 'E-mail de conferme mannete.',
-'confirmemail_needlogin' => "A confermà $1 l'indirizze email ca è mise.",
-'confirmemail_subject'   => 'Indirizze email de conferme pe {{SITENAME}}',
+'confirmemail'             => "Conferme l'indirizze e-mail",
+'confirmemail_sent'        => 'E-mail de conferme mannete.',
+'confirmemail_needlogin'   => "A confermà $1 l'indirizze email ca è mise.",
+'confirmemail_subject'     => 'Indirizze email de conferme pe {{SITENAME}}',
+'confirmemail_invalidated' => "Conferme de l'indirizze e-mail scangellete",
+'invalidateemail'          => "Scangille 'a conferme de l'e-mail",
 
 # Scary transclusion
 'scarytranscludetoolong' => '[URL jè troppe longhe]',
 
 # Trackbacks
-'trackbackremove' => ' ([$1 Scangille])',
+'trackbackbox'      => '<div id="mw_trackbacks">Trackback pe sta pàgene:<br />
+$1
+</div>',
+'trackbackremove'   => ' ([$1 Scangille])',
+'trackbacklink'     => 'Trackback',
+'trackbackdeleteok' => "'U trackback ha state scangellete cu successe.",
+
+# Delete conflict
+'deletedwhileediting' => "'''Fà attenziò''': Sta pàgene ha state scangellete apprime ca tu acumenzasse a fà 'u cangiamende!",
+'recreate'            => "Ccreje n'otra vote",
 
 # action=purge
 'confirm_purge_button' => 'OK',
+'confirm-purge-top'    => "Pulizze 'a cache de sta pàgene?",
 
 # Multipage image navigation
-'imgmultigo' => 'Veje!',
+'imgmultipageprev' => '� pàgena precedende',
+'imgmultipagenext' => 'pàgena successive →',
+'imgmultigo'       => 'Veje!',
+'imgmultigoto'     => "Veje 'a pàgene $1",
 
 # Table pager
 'ascending_abbrev'         => 'asc',
 'descending_abbrev'        => 'desc',
+'table_pager_next'         => 'Pàgena successive',
+'table_pager_prev'         => 'Pàgena precedende',
 'table_pager_first'        => 'Prima pàgene',
 'table_pager_last'         => 'Urtema pàgene',
+'table_pager_limit'        => 'Fa vedè $1 vosce pe pàgene',
 'table_pager_limit_submit' => 'Veje',
+'table_pager_empty'        => 'Nisciune resultete',
+
+# Auto-summaries
+'autoredircomment' => 'Stoche a ridirezione sus a [[$1]]',
+'autosumm-new'     => "Pàgena ccrejete cu '$1'",
 
 # Live preview
 'livepreview-loading' => 'Stoche a careche…',
 'livepreview-ready'   => 'Stoche a careche… Agghje fenìte!',
+'livepreview-error'   => 'Non ge tè riuscite a connettere: $1 "$2".
+Prueve l\'andeprima normele.',
 
 # Watchlist editor
 'watchlistedit-normal-title'  => 'Vide le pàggene condrollete',
+'watchlistedit-normal-legend' => "Live le titele da 'a liste de le pàggene condrollete",
 'watchlistedit-normal-submit' => 'Live le titele',
+'watchlistedit-normal-done'   => "{{PLURAL:$1|1 titele ha state|$1 titele onne state}} scangellete da 'a liste de le pàggene condrollete toje:",
+'watchlistedit-raw-title'     => "Cange 'a liste de le pàggene condrollete grezze",
+'watchlistedit-raw-legend'    => "Cange 'a liste de le pàggene condrollete grezze",
 'watchlistedit-raw-titles'    => 'Titele:',
 'watchlistedit-raw-submit'    => "Aggiorne 'a liste de le pàggene condrollete",
 'watchlistedit-raw-done'      => "'A liste de le pàggene condrollete ha state aggiornete.",
@@ -1340,20 +2043,23 @@ Otre avènene scunnute pe defolt.
 'watchlisttools-raw'  => 'Cange le pàggene condrollete grezze grezze',
 
 # Core parser functions
-'unknown_extension_tag' => 'Estenzione d\'u tag scanuscite "S1"',
+'unknown_extension_tag' => 'Estenzione d\'u tag scanuscite "$1"',
 
 # Special:Version
-'version'                   => 'Versione', # Not used as normal message but as header for the special page itself
-'version-extensions'        => 'Estenziune installete',
-'version-specialpages'      => 'Pàggene speciele',
-'version-variables'         => 'Variabbele',
-'version-other'             => 'Otre',
-'version-hook-subscribedby' => 'Sottoscritte da',
-'version-version'           => 'Versione',
-'version-license'           => 'Licenze',
-'version-software'          => 'Softuer installete',
-'version-software-product'  => 'Prodotte',
-'version-software-version'  => 'Versione',
+'version'                     => 'Versione', # Not used as normal message but as header for the special page itself
+'version-extensions'          => 'Estenziune installete',
+'version-specialpages'        => 'Pàggene speciele',
+'version-variables'           => 'Variabbele',
+'version-other'               => 'Otre',
+'version-hooks'               => 'Hook',
+'version-extension-functions' => 'Funziune estese',
+'version-hook-name'           => "Nome de l'hook",
+'version-hook-subscribedby'   => 'Sottoscritte da',
+'version-version'             => 'Versione',
+'version-license'             => 'Licenze',
+'version-software'            => 'Softuer installete',
+'version-software-product'    => 'Prodotte',
+'version-software-version'    => 'Versione',
 
 # Special:FilePath
 'filepath'        => "Percorse d'u fail",
@@ -1362,21 +2068,30 @@ Otre avènene scunnute pe defolt.
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Cirche pe le file duplichete',
+'fileduplicatesearch-summary'  => "Cirche pe file duplichete sus a base d'u valore hash.
+
+Mitte 'u nome d'u file senze 'u \"{{ns:file}}:\" prefisse.",
+'fileduplicatesearch-legend'   => "Cirche pe 'nu duplichete",
 'fileduplicatesearch-filename' => "Nome d'u faile:",
 'fileduplicatesearch-submit'   => 'Cirche',
 'fileduplicatesearch-info'     => "$1 × $2 pixel<br />Dimenzione d'u file: $3<br />Tipe de MIME: $4",
+'fileduplicatesearch-result-1' => '\'U file "$1" non ge tène \'na duplicazione uguale uguale.',
+'fileduplicatesearch-result-n' => '\'U file "$1" tène {{PLURAL:$2|1 duplicazione|$2 duplicaziune}} uguale uguale.',
 
 # Special:SpecialPages
-'specialpages'                 => 'Pàggene speciele',
-'specialpages-group-other'     => 'Otre pàggene speciele',
-'specialpages-group-login'     => 'Tràse / Reggistrete',
-'specialpages-group-changes'   => 'Cangiaminde recende e archivie',
-'specialpages-group-users'     => 'Utinde e deritte',
-'specialpages-group-highuse'   => 'Pàggene ausete assaje proprie',
-'specialpages-group-pages'     => 'Liste de le pàggene',
-'specialpages-group-pagetools' => 'Pàgene de le struminde',
-'specialpages-group-wiki'      => 'Date e struminde de Uicchi',
-'specialpages-group-spam'      => "Struminde p'u spam",
+'specialpages'                   => 'Pàggene speciele',
+'specialpages-group-maintenance' => "Report d'a manutenzione",
+'specialpages-group-other'       => 'Otre pàggene speciele',
+'specialpages-group-login'       => 'Tràse / Reggistrete',
+'specialpages-group-changes'     => 'Cangiaminde recende e archivie',
+'specialpages-group-media'       => 'Riepileghe de media e carecaminde',
+'specialpages-group-users'       => 'Utinde e deritte',
+'specialpages-group-highuse'     => 'Pàggene ausete assaje proprie',
+'specialpages-group-pages'       => 'Liste de le pàggene',
+'specialpages-group-pagetools'   => 'Pàgene de le struminde',
+'specialpages-group-wiki'        => 'Date e struminde de Uicchi',
+'specialpages-group-redirects'   => 'Redirezionaminde de le pàggene speciele',
+'specialpages-group-spam'        => "Struminde p'u spam",
 
 # Special:BlankPage
 'blankpage'              => 'Pàgene vacande',
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index 3d47b877..b382340a 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -44,14 +44,12 @@ $linkPrefixExtension = false;
 $namespaceNames = array(
 	NS_MEDIA            => 'Медиа',
 	NS_SPECIAL          => 'Служебна�',
-	NS_MAIN             => '',
 	NS_TALK             => 'Об�уждение',
 	NS_USER             => 'Уча�тник',
 	NS_USER_TALK        => 'Об�уждение_уча�тника',
-	#NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK     => 'Об�уждение_{{grammar:genitive|$1}}',
-	NS_IMAGE            => 'Изображение',
-	NS_IMAGE_TALK       => 'Об�уждение_изображени�',
+	NS_PROJECT_TALK     => 'Об�уждение_{{GRAMMAR:genitive|$1}}',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Об�уждение_файла',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Об�уждение_MediaWiki',
 	NS_TEMPLATE         => 'Шаблон',
@@ -65,17 +63,10 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'Уча�тница'            => NS_USER,
 	'Об�уждение уча�тницы' => NS_USER_TALK,
+	'Изображение' => NS_FILE,
+	'Об�уждение_изображени�' => NS_FILE_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'Кла��иче�кое',
-	'nostalgia'   => '�о�тальги�',
-	'cologneblue' => 'Кёльн�ка� то�ка',
-	'myskin'      => 'Своё',
-	'chick'       => 'Цыпа',
-	'simple'      => 'Про�тое',
-	'modern'      => 'Современное',
-);
 
 $dateFormats = array(
 	'mdy time' => 'H:i',
@@ -106,128 +97,138 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#REDIRECT', '#ПЕРЕ��ПР�ВЛЕ�ИЕ', '#ПЕРЕ��ПР' ),
-	'notoc'               => array( '0', '__NOTOC__', '__БЕЗ_ОГЛ__' ),
-	'nogallery'           => array( '0', '__NOGALLERY__', '__БЕЗ_Г�ЛЕРЕИ__' ),
-	'forcetoc'            => array( '0', '__FORCETOC__', '__ОБЯЗ_ОГЛ__' ),
-	'toc'                 => array( '0', '__TOC__', '__ОГЛ__' ),
-	'noeditsection'       => array( '0', '__NOEDITSECTION__', '__БЕЗ_РЕД�КТИРОВ��ИЯ_Р�ЗДЕЛ�__' ),
-	'currentmonth'        => array( '1', 'CURRENTMONTH', 'ТЕКУЩИЙ_МЕСЯЦ' ),
-	'currentmonthname'    => array( '1', 'CURRENTMONTHNAME', '��ЗВ��ИЕ_ТЕКУЩЕГО_МЕСЯЦ�' ),
-	'currentmonthnamegen' => array( '1', 'CURRENTMONTHNAMEGEN', '��ЗВ��ИЕ_ТЕКУЩЕГО_МЕСЯЦ�_РОД' ),
-	'currentmonthabbrev'  => array( '1', 'CURRENTMONTHABBREV', '��ЗВ��ИЕ_ТЕКУЩЕГО_МЕСЯЦ�_�БР' ),
-	'currentday'          => array( '1', 'CURRENTDAY', 'ТЕКУЩИЙ_ДЕ�Ь' ),
-	'currentday2'         => array( '1', 'CURRENTDAY2', 'ТЕКУЩИЙ_ДЕ�Ь_2' ),
-	'currentdayname'      => array( '1', 'CURRENTDAYNAME', '��ЗВ��ИЕ_ТЕКУЩЕГО_Д�Я' ),
-	'currentyear'         => array( '1', 'CURRENTYEAR', 'ТЕКУЩИЙ_ГОД' ),
-	'currenttime'         => array( '1', 'CURRENTTIME', 'ТЕКУЩЕЕ_ВРЕМЯ' ),
-	'currenthour'         => array( '1', 'CURRENTHOUR', 'ТЕКУЩИЙ_Ч�С' ),
-	'localmonth'          => array( '1', 'LOCALMONTH', 'МЕСТ�ЫЙ_МЕСЯЦ' ),
-	'localmonthname'      => array( '1', 'LOCALMONTHNAME', '��ЗВ��ИЕ_МЕСТ�ОГО_МЕСЯЦ�' ),
-	'localmonthnamegen'   => array( '1', 'LOCALMONTHNAMEGEN', '��ЗВ��ИЕ_МЕСТ�ОГО_МЕСЯЦ�_РОД' ),
-	'localmonthabbrev'    => array( '1', 'LOCALMONTHABBREV', '��ЗВ��ИЕ_МЕСТ�ОГО_МЕСЯЦ�_�БР' ),
-	'localday'            => array( '1', 'LOCALDAY', 'МЕСТ�ЫЙ_ДЕ�Ь' ),
-	'localday2'           => array( '1', 'LOCALDAY2', 'МЕСТ�ЫЙ_ДЕ�Ь_2' ),
-	'localdayname'        => array( '1', 'LOCALDAYNAME', '��ЗВ��ИЕ_МЕСТ�ОГО_Д�Я' ),
-	'localyear'           => array( '1', 'LOCALYEAR', 'МЕСТ�ЫЙ_ГОД' ),
-	'localtime'           => array( '1', 'LOCALTIME', 'МЕСТ�ОЕ_ВРЕМЯ' ),
-	'localhour'           => array( '1', 'LOCALHOUR', 'МЕСТ�ЫЙ_Ч�С' ),
-	'numberofpages'       => array( '1', 'NUMBEROFPAGES', 'КОЛИЧЕСТВО_СТР��ИЦ' ),
-	'numberofarticles'    => array( '1', 'NUMBEROFARTICLES', 'КОЛИЧЕСТВО_СТ�ТЕЙ' ),
-	'numberoffiles'       => array( '1', 'NUMBEROFFILES', 'КОЛИЧЕСТВО_Ф�ЙЛОВ' ),
-	'numberofusers'       => array( '1', 'NUMBEROFUSERS', 'КОЛИЧЕСТВО_УЧ�СТ�ИКОВ' ),
-	'numberofedits'       => array( '1', 'NUMBEROFEDITS', 'КОЛИЧЕСТВО_ПР�ВОК' ),
-	'pagename'            => array( '1', 'PAGENAME', '��ЗВ��ИЕ_СТР��ИЦЫ' ),
-	'pagenamee'           => array( '1', 'PAGENAMEE', '��ЗВ��ИЕ_СТР��ИЦЫ_2' ),
-	'namespace'           => array( '1', 'NAMESPACE', 'ПРОСТР��СТВО_ИМ��' ),
-	'namespacee'          => array( '1', 'NAMESPACEE', 'ПРОСТР��СТВО_ИМ��_2' ),
-	'talkspace'           => array( '1', 'TALKSPACE', 'ПРОСТР��СТВО_ОБСУЖДЕ�ИЙ' ),
-	'talkspacee'          => array( '1', 'TALKSPACEE', 'ПРОСТР��СТВО_ОБСУЖДЕ�ИЙ_2' ),
-	'subjectspace'        => array( '1', 'SUBJECTSPACE', 'ARTICLESPACE', 'ПРОСТР��СТВО_СТ�ТЕЙ' ),
-	'subjectspacee'       => array( '1', 'SUBJECTSPACEE', 'ARTICLESPACEE', 'ПРОСТР��СТВО_СТ�ТЕЙ_2' ),
-	'fullpagename'        => array( '1', 'FULLPAGENAME', 'ПОЛ�ОЕ_��ЗВ��ИЕ_СТР��ИЦЫ' ),
-	'fullpagenamee'       => array( '1', 'FULLPAGENAMEE', 'ПОЛ�ОЕ_��ЗВ��ИЕ_СТР��ИЦЫ_2' ),
-	'subpagename'         => array( '1', 'SUBPAGENAME', '��ЗВ��ИЕ_ПОДСТР��ИЦЫ' ),
-	'subpagenamee'        => array( '1', 'SUBPAGENAMEE', '��ЗВ��ИЕ_ПОДСТР��ИЦЫ_2' ),
-	'basepagename'        => array( '1', 'BASEPAGENAME', 'ОС�ОВ�_��ЗВ��ИЯ_СТР��ИЦЫ' ),
-	'basepagenamee'       => array( '1', 'BASEPAGENAMEE', 'ОС�ОВ�_��ЗВ��ИЯ_СТР��ИЦЫ_2' ),
-	'talkpagename'        => array( '1', 'TALKPAGENAME', '��ЗВ��ИЕ_СТР��ИЦЫ_ОБСУЖДЕ�ИЯ' ),
-	'talkpagenamee'       => array( '1', 'TALKPAGENAMEE', '��ЗВ��ИЕ_СТР��ИЦЫ_ОБСУЖДЕ�ИЯ_2' ),
-	'subjectpagename'     => array( '1', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME', '��ЗВ��ИЕ_СТР��ИЦЫ_СТ�ТЬИ' ),
-	'subjectpagenamee'    => array( '1', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE', '��ЗВ��ИЕ_СТР��ИЦЫ_СТ�ТЬИ_2' ),
-	'msg'                 => array( '0', 'MSG:', 'СООБЩ:' ),
-	'subst'               => array( '0', 'SUBST:', 'ПОДСТ:' ),
-	'msgnw'               => array( '0', 'MSGNW:', 'СООБЩ_БЕЗ_ВИКИ:' ),
-	'img_thumbnail'       => array( '1', 'thumbnail', 'thumb', 'мини' ),
-	'img_manualthumb'     => array( '1', 'thumbnail=$1', 'thumb=$1', 'мини=$1' ),
-	'img_right'           => array( '1', 'right', '�права' ),
-	'img_left'            => array( '1', 'left', '�лева' ),
-	'img_none'            => array( '1', 'none', 'без' ),
-	'img_width'           => array( '1', '$1px', '$1пк�' ),
-	'img_center'          => array( '1', 'center', 'centre', 'центр' ),
-	'img_framed'          => array( '1', 'framed', 'enframed', 'frame', 'обрамить' ),
-	'img_frameless'       => array( '1', 'frameless', 'безрамки' ),
-	'img_page'            => array( '1', 'page=$1', 'page $1', '�траница=$1', '�траница $1' ),
-	'img_upright'         => array( '1', 'upright', 'upright=$1', 'upright $1', '�верху�права', '�верху�права=$1', '�верху�права $1' ),
-	'img_border'          => array( '1', 'border', 'граница' ),
-	'img_baseline'        => array( '1', 'baseline', 'о�нование' ),
-	'img_sub'             => array( '1', 'sub', 'под' ),
-	'img_super'           => array( '1', 'super', 'sup', 'над' ),
-	'img_top'             => array( '1', 'top', '�верху' ),
-	'img_text_top'        => array( '1', 'text-top', 'тек�т-�верху' ),
-	'img_middle'          => array( '1', 'middle', 'по�ередине' ),
-	'img_bottom'          => array( '1', 'bottom', '�низу' ),
-	'img_text_bottom'     => array( '1', 'text-bottom', 'тек�т-�низу' ),
-	'int'                 => array( '0', 'INT:', 'В�УТР:' ),
-	'sitename'            => array( '1', 'SITENAME', '��ЗВ��ИЕ_С�ЙТ�' ),
-	'ns'                  => array( '0', 'NS:', 'ПИ:' ),
-	'localurl'            => array( '0', 'LOCALURL:', 'ЛОК�ЛЬ�ЫЙ_�ДРЕС:' ),
-	'localurle'           => array( '0', 'LOCALURLE:', 'ЛОК�ЛЬ�ЫЙ_�ДРЕС_2:' ),
-	'server'              => array( '0', 'SERVER', 'СЕРВЕР' ),
-	'servername'          => array( '0', 'SERVERNAME', '��ЗВ��ИЕ_СЕРВЕР�' ),
-	'scriptpath'          => array( '0', 'SCRIPTPATH', 'ПУТЬ_К_СКРИПТУ' ),
-	'grammar'             => array( '0', 'GRAMMAR:', 'П�ДЕЖ:' ),
-	'notitleconvert'      => array( '0', '__NOTITLECONVERT__', '__NOTC__', '__БЕЗ_ПРЕОБР�ЗОВ��ИЯ_З�ГОЛОВК�__' ),
-	'nocontentconvert'    => array( '0', '__NOCONTENTCONVERT__', '__NOCC__', '__БЕЗ_ПРЕОБР�ЗОВ��ИЯ_ТЕКСТ�__' ),
-	'currentweek'         => array( '1', 'CURRENTWEEK', 'ТЕКУЩ�Я_�ЕДЕЛЯ' ),
-	'currentdow'          => array( '1', 'CURRENTDOW', 'ТЕКУЩИЙ_ДЕ�Ь_�ЕДЕЛИ' ),
-	'localweek'           => array( '1', 'LOCALWEEK', 'МЕСТ��Я_�ЕДЕЛЯ' ),
-	'localdow'            => array( '1', 'LOCALDOW', 'МЕСТ�ЫЙ_ДЕ�Ь_�ЕДЕЛИ' ),
-	'revisionid'          => array( '1', 'REVISIONID', 'ИД_ВЕРСИИ' ),
-	'revisionday'         => array( '1', 'REVISIONDAY', 'ДЕ�Ь_ВЕРСИИ' ),
-	'revisionday2'        => array( '1', 'REVISIONDAY2', 'ДЕ�Ь_ВЕРСИИ_2' ),
-	'revisionmonth'       => array( '1', 'REVISIONMONTH', 'МЕСЯЦ_ВЕРСИИ' ),
-	'revisionyear'        => array( '1', 'REVISIONYEAR', 'ГОД_ВЕРСИИ' ),
-	'revisiontimestamp'   => array( '1', 'REVISIONTIMESTAMP', 'ОТМЕТК�_ВРЕМЕ�И_ВЕРСИИ' ),
-	'plural'              => array( '0', 'PLURAL:', 'М�ОЖЕСТВЕ��ОЕ_ЧИСЛО:' ),
-	'fullurl'             => array( '0', 'FULLURL:', 'ПОЛ�ЫЙ_�ДРЕС:' ),
-	'fullurle'            => array( '0', 'FULLURLE:', 'ПОЛ�ЫЙ_�ДРЕС_2:' ),
-	'lcfirst'             => array( '0', 'LCFIRST:', 'ПЕРВ�Я_БУКВ�_М�ЛЕ�ЬК�Я:' ),
-	'ucfirst'             => array( '0', 'UCFIRST:', 'ПЕРВ�Я_БУКВ�_БОЛЬШ�Я:' ),
-	'lc'                  => array( '0', 'LC:', 'М�ЛЕ�ЬКИМИ_БУКВ�МИ:' ),
-	'uc'                  => array( '0', 'UC:', 'БОЛЬШИМИ_БУКВ�МИ:' ),
-	'raw'                 => array( '0', 'RAW:', '�ЕОБР�Б:' ),
-	'displaytitle'        => array( '1', 'DISPLAYTITLE', 'ПОК�З�ТЬ_З�ГОЛОВОК' ),
-	'rawsuffix'           => array( '1', 'R', '�' ),
-	'newsectionlink'      => array( '1', '__NEWSECTIONLINK__', '__ССЫЛК�_��_�ОВЫЙ_Р�ЗДЕЛ__' ),
-	'currentversion'      => array( '1', 'CURRENTVERSION', 'ТЕКУЩ�Я_ВЕРСИЯ' ),
-	'urlencode'           => array( '0', 'URLENCODE:', 'З�КОДИРОВ���ЫЙ_�ДРЕС:' ),
-	'anchorencode'        => array( '0', 'ANCHORENCODE', 'КОДИРОВ�ТЬ_МЕТКУ' ),
-	'currenttimestamp'    => array( '1', 'CURRENTTIMESTAMP', 'ОТМЕТК�_ТЕКУЩЕГО_ВРЕМЕ�И' ),
-	'localtimestamp'      => array( '1', 'LOCALTIMESTAMP', 'ОТМЕТК�_МЕСТ�ОГО_ВРЕМЕ�И' ),
-	'directionmark'       => array( '1', 'DIRECTIONMARK', 'DIRMARK', '��ПР�ВЛЕ�ИЕ_ПИСЬМ�' ),
-	'language'            => array( '0', '#LANGUAGE:', '#ЯЗЫК:' ),
-	'contentlanguage'     => array( '1', 'CONTENTLANGUAGE', 'CONTENTLANG', 'ЯЗЫК_СОДЕРЖ��ИЯ' ),
-	'pagesinnamespace'    => array( '1', 'PAGESINNAMESPACE:', 'PAGESINNS:', 'СТР��ИЦ_В_ПРОСТР��СТВЕ_ИМ��:' ),
-	'numberofadmins'      => array( '1', 'NUMBEROFADMINS', 'КОЛИЧЕСТВО_�ДМИ�ИСТР�ТОРОВ' ),
-	'formatnum'           => array( '0', 'FORMATNUM', 'ФОРМ�ТИРОВ�ТЬ_ЧИСЛО' ),
-	'padleft'             => array( '0', 'PADLEFT', 'З�ПОЛ�ИТЬ_СЛЕВ�' ),
-	'padright'            => array( '0', 'PADRIGHT', 'З�ПОЛ�ИТЬ_СПР�В�' ),
-	'special'             => array( '0', 'special', '�лужебна�' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:', 'СОРТИРОВК�_ПО_УМОЛЧ��ИЮ', 'КЛЮЧ_СОРТИРОВКИ' ),
-	'filepath'            => array( '0', 'FILEPATH:', 'ПУТЬ_К_Ф�ЙЛУ:' ),
-	'tag'                 => array( '0', 'tag', 'тег' ),
-	'hiddencat'           => array( '1', '__HIDDENCAT__', '__СКРЫТ�Я_К�ТЕГОРИЯ__' ),
+	'redirect'              => array( '0', '#перенаправление', '#перенапр', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__БЕЗ_Г�ЛЕРЕИ__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__ОБЯЗ_ОГЛ__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__ОГЛ__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__БЕЗ_РЕД�КТИРОВ��ИЯ_Р�ЗДЕЛ�__', '__NOEDITSECTION__' ),
+	'noheader'              => array( '0', '__БЕЗ_З�ГОЛОВК�__', '__NOHEADER__' ),
+	'currentmonth'          => array( '1', 'ТЕКУЩИЙ_МЕСЯЦ', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', '��ЗВ��ИЕ_ТЕКУЩЕГО_МЕСЯЦ�', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', '��ЗВ��ИЕ_ТЕКУЩЕГО_МЕСЯЦ�_РОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', '��ЗВ��ИЕ_ТЕКУЩЕГО_МЕСЯЦ�_�БР', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'ТЕКУЩИЙ_ДЕ�Ь', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'ТЕКУЩИЙ_ДЕ�Ь_2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', '��ЗВ��ИЕ_ТЕКУЩЕГО_Д�Я', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'ТЕКУЩИЙ_Ч�С', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'МЕСТ�ЫЙ_МЕСЯЦ', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', '��ЗВ��ИЕ_МЕСТ�ОГО_МЕСЯЦ�', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', '��ЗВ��ИЕ_МЕСТ�ОГО_МЕСЯЦ�_РОД', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', '��ЗВ��ИЕ_МЕСТ�ОГО_МЕСЯЦ�_�БР', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'МЕСТ�ЫЙ_ДЕ�Ь', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'МЕСТ�ЫЙ_ДЕ�Ь_2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', '��ЗВ��ИЕ_МЕСТ�ОГО_Д�Я', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'МЕСТ�ЫЙ_ГОД', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'МЕСТ�ОЕ_ВРЕМЯ', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'МЕСТ�ЫЙ_Ч�С', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'КОЛИЧЕСТВО_СТР��ИЦ', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'КОЛИЧЕСТВО_СТ�ТЕЙ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'КОЛИЧЕСТВО_Ф�ЙЛОВ', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'КОЛИЧЕСТВО_УЧ�СТ�ИКОВ', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'КОЛИЧЕСТВО_ПР�ВОК', 'NUMBEROFEDITS' ),
+	'numberofviews'         => array( '1', 'КОЛИЧЕСТВО_ПРОСМОТРОВ', 'NUMBEROFVIEWS' ),
+	'pagename'              => array( '1', '��ЗВ��ИЕ_СТР��ИЦЫ', 'PAGENAME' ),
+	'pagenamee'             => array( '1', '��ЗВ��ИЕ_СТР��ИЦЫ_2', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'ПРОСТР��СТВО_ИМ��', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'ПРОСТР��СТВО_ИМ��_2', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'ПРОСТР��СТВО_ОБСУЖДЕ�ИЙ', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'ПРОСТР��СТВО_ОБСУЖДЕ�ИЙ_2', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'ПРОСТР��СТВО_СТ�ТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'ПРОСТР��СТВО_СТ�ТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'ПОЛ�ОЕ_��ЗВ��ИЕ_СТР��ИЦЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'ПОЛ�ОЕ_��ЗВ��ИЕ_СТР��ИЦЫ_2', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', '��ЗВ��ИЕ_ПОДСТР��ИЦЫ', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', '��ЗВ��ИЕ_ПОДСТР��ИЦЫ_2', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'ОС�ОВ�_��ЗВ��ИЯ_СТР��ИЦЫ', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'ОС�ОВ�_��ЗВ��ИЯ_СТР��ИЦЫ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', '��ЗВ��ИЕ_СТР��ИЦЫ_ОБСУЖДЕ�ИЯ', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', '��ЗВ��ИЕ_СТР��ИЦЫ_ОБСУЖДЕ�ИЯ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', '��ЗВ��ИЕ_СТР��ИЦЫ_СТ�ТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', '��ЗВ��ИЕ_СТР��ИЦЫ_СТ�ТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'СООБЩ:', 'MSG:' ),
+	'subst'                 => array( '0', 'ПОДСТ:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'мини', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'мини=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', '�права', 'right' ),
+	'img_left'              => array( '1', '�лева', 'left' ),
+	'img_none'              => array( '1', 'без', 'none' ),
+	'img_width'             => array( '1', '$1пк�', '$1px' ),
+	'img_center'            => array( '1', 'центр', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'обрамить', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'безрамки', 'frameless' ),
+	'img_page'              => array( '1', '�траница=$1', '�траница $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', '�верху�права', '�верху�права=$1', '�верху�права $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'граница', 'border' ),
+	'img_baseline'          => array( '1', 'о�нование', 'baseline' ),
+	'img_sub'               => array( '1', 'под', 'sub' ),
+	'img_super'             => array( '1', 'над', 'super', 'sup' ),
+	'img_top'               => array( '1', '�верху', 'top' ),
+	'img_text_top'          => array( '1', 'тек�т-�верху', 'text-top' ),
+	'img_middle'            => array( '1', 'по�ередине', 'middle' ),
+	'img_bottom'            => array( '1', '�низу', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'тек�т-�низу', 'text-bottom' ),
+	'img_link'              => array( '1', '��ылка=$1', 'link=$1' ),
+	'img_alt'               => array( '1', 'альт=$1', 'alt=$1' ),
+	'int'                   => array( '0', 'В�УТР:', 'INT:' ),
+	'sitename'              => array( '1', '��ЗВ��ИЕ_С�ЙТ�', 'SITENAME' ),
+	'ns'                    => array( '0', 'ПИ:', 'NS:' ),
+	'localurl'              => array( '0', 'ЛОК�ЛЬ�ЫЙ_�ДРЕС:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'ЛОК�ЛЬ�ЫЙ_�ДРЕС_2:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'СЕРВЕР', 'SERVER' ),
+	'servername'            => array( '0', '��ЗВ��ИЕ_СЕРВЕР�', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'ПУТЬ_К_СКРИПТУ', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'П�ДЕЖ:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__БЕЗ_ПРЕОБР�ЗОВ��ИЯ_З�ГОЛОВК�__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__БЕЗ_ПРЕОБР�ЗОВ��ИЯ_ТЕКСТ�__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'ТЕКУЩ�Я_�ЕДЕЛЯ', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'ТЕКУЩИЙ_ДЕ�Ь_�ЕДЕЛИ', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'МЕСТ��Я_�ЕДЕЛЯ', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'МЕСТ�ЫЙ_ДЕ�Ь_�ЕДЕЛИ', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'ИД_ВЕРСИИ', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'ДЕ�Ь_ВЕРСИИ', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'ДЕ�Ь_ВЕРСИИ_2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'ОТМЕТК�_ВРЕМЕ�И_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'М�ОЖЕСТВЕ��ОЕ_ЧИСЛО:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'ПОЛ�ЫЙ_�ДРЕС:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'ПОЛ�ЫЙ_�ДРЕС_2:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', 'ПЕРВ�Я_БУКВ�_М�ЛЕ�ЬК�Я:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'ПЕРВ�Я_БУКВ�_БОЛЬШ�Я:', 'UCFIRST:' ),
+	'lc'                    => array( '0', 'М�ЛЕ�ЬКИМИ_БУКВ�МИ:', 'LC:' ),
+	'uc'                    => array( '0', 'БОЛЬШИМИ_БУКВ�МИ:', 'UC:' ),
+	'raw'                   => array( '0', '�ЕОБР�Б:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'ПОК�З�ТЬ_З�ГОЛОВОК', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', '�', 'R' ),
+	'newsectionlink'        => array( '1', '__ССЫЛК�_��_�ОВЫЙ_Р�ЗДЕЛ__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'ТЕКУЩ�Я_ВЕРСИЯ', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'З�КОДИРОВ���ЫЙ_�ДРЕС:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'КОДИРОВ�ТЬ_МЕТКУ', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'ОТМЕТК�_ТЕКУЩЕГО_ВРЕМЕ�И', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'ОТМЕТК�_МЕСТ�ОГО_ВРЕМЕ�И', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', '��ПР�ВЛЕ�ИЕ_ПИСЬМ�', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#ЯЗЫК:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'ЯЗЫК_СОДЕРЖ��ИЯ', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'СТР��ИЦ_В_ПРОСТР��СТВЕ_ИМ��:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'КОЛИЧЕСТВО_�ДМИ�ИСТР�ТОРОВ', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'ФОРМ�ТИРОВ�ТЬ_ЧИСЛО', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'З�ПОЛ�ИТЬ_СЛЕВ�', 'PADLEFT' ),
+	'padright'              => array( '0', 'З�ПОЛ�ИТЬ_СПР�В�', 'PADRIGHT' ),
+	'special'               => array( '0', '�лужебна�', 'special' ),
+	'defaultsort'           => array( '1', 'СОРТИРОВК�_ПО_УМОЛЧ��ИЮ', 'КЛЮЧ_СОРТИРОВКИ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'ПУТЬ_К_Ф�ЙЛУ:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'тег', 'т�г', 'метка', 'tag' ),
+	'hiddencat'             => array( '1', '__СКРЫТ�Я_К�ТЕГОРИЯ__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'СТР��ИЦ_В_К�ТЕГОРИИ', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'Р�ЗМЕР_СТР��ИЦЫ', 'PAGESIZE' ),
+	'index'                 => array( '1', '__И�ДЕКС__', '__INDEX__' ),
+	'noindex'               => array( '1', '__БЕЗ_И�ДЕКС�__', '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'ЧИСЛО_В_ГРУППЕ', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__СТ�ТИЧЕСКОЕ_ПЕРЕ��ПР�ВЛЕ�ИЕ__', '__STATICREDIRECT__' ),
 );
 
 $imageFiles = array(
@@ -276,17 +277,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Скрывать мои правки из �пи�ка наблюдени�',
 'tog-watchlisthidebots'       => 'Скрывать правки ботов из �пи�ка наблюдени�',
 'tog-watchlisthideminor'      => 'Скрывать малые правки из �пи�ка наблюдени�',
+'tog-watchlisthideliu'        => 'Скрывать правки пред�тавивших�� уча�тников из �пи�ка наблюдени�',
+'tog-watchlisthideanons'      => 'Скрывать правки анонимных уча�тников из �пи�ка наблюдени�',
 'tog-nolangconversion'        => 'Отключить преобразование �и�тем пи�ьма',
 'tog-ccmeonemails'            => 'Отправл�ть мне копии пи�ем, которые � по�ылаю другим уча�тникам.',
 'tog-diffonly'                => '�е показывать �одержание �траницы под �равнением двух вер�ий',
 'tog-showhiddencats'          => 'Показывать �крытые категории',
+'tog-norollbackdiff'          => '�е показывать разницу вер�ий по�ле выполнени� отката',
 
 'underline-always'  => 'В�егда',
 'underline-never'   => '�икогда',
 'underline-default' => 'И�пользовать на�тройки браузера',
 
-'skinpreview' => '(Предпро�мотр)',
-
 # Dates
 'sunday'        => 'во�кре�енье',
 'monday'        => 'понедельник',
@@ -379,7 +381,7 @@ $messages = array(
 'mytalk'         => 'Мо� �траница об�уждени�',
 'anontalk'       => 'Об�уждение дл� �того IP-адре�а',
 'navigation'     => '�авигаци�',
-'and'            => 'и',
+'and'            => '&#32;и',
 
 # Metadata in edit box
 'metadata_help' => 'Метаданные:',
@@ -416,14 +418,14 @@ $messages = array(
 'talkpagelinktext'  => 'Об�уждение',
 'specialpage'       => 'Служебна� �траница',
 'personaltools'     => 'Личные ин�трументы',
-'postcomment'       => 'Прокомментировать',
+'postcomment'       => '�овый раздел',
 'articlepage'       => 'Про�мотреть �татью',
 'talk'              => 'Об�уждение',
 'views'             => 'Про�мотры',
 'toolbox'           => 'Ин�трументы',
 'userpage'          => 'Про�мотреть �траницу уча�тника',
 'projectpage'       => 'Про�мотреть �траницу проекта',
-'imagepage'         => 'Про�мотреть �траницу изображени�',
+'imagepage'         => 'Про�мотреть �траницу файла',
 'mediawikipage'     => 'Показать �траницу �ообщени�',
 'templatepage'      => 'Про�мотреть �траницу шаблона',
 'viewhelppage'      => 'Получить �правку',
@@ -442,8 +444,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Опи�ание {{grammar:genitive|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Опи�ание',
-'bugreports'           => 'Отчёт об ошибке',
-'bugreportspage'       => 'Project:Отчёты об ошибке',
 'copyright'            => 'Содержимое до�тупно в �оответ�твии � $1.',
 'copyrightpagename'    => '�втор�кие права проекта {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:�втор�кое право',
@@ -466,9 +466,7 @@ $messages = array(
 
 'badaccess'        => 'Ошибка до�тупа',
 'badaccess-group0' => 'Вы не можете выполн�ть запрошенное дей�твие.',
-'badaccess-group1' => 'Запрошенное дей�твие могут выполн�ть только уча�тники из группы $1.',
-'badaccess-group2' => 'Запрошенное дей�твие могут выполн�ть только уча�тники из групп $1.',
-'badaccess-groups' => 'Запрошенное дей�твие могут выполн�ть только уча�тники из групп $1.',
+'badaccess-groups' => 'Запрошенное дей�твие могут выполн�ть только уча�тники из {{PLURAL:$2|группы|групп}} $1.',
 
 'versionrequired'     => 'Требует�� MediaWiki вер�ии $1',
 'versionrequiredtext' => 'Дл� работы � �той �траницей требует�� MediaWiki вер�ии $1. См. [[Special:Version|информацию о вер�и�х и�пользуемого ПО]].',
@@ -483,6 +481,8 @@ $messages = array(
 'editsection'             => 'править',
 'editold'                 => 'править',
 'viewsourceold'           => 'про�мотреть и�ходный код',
+'editlink'                => 'править',
+'viewsourcelink'          => 'про�мотреть и�ходный код',
 'editsectionhint'         => 'Править �екцию: $1',
 'toc'                     => 'Содержание',
 'showtoc'                 => 'показать',
@@ -497,7 +497,7 @@ $messages = array(
 'site-atom-feed'          => '$1 — Atom-лента',
 'page-rss-feed'           => '«$1» — RSS-лента',
 'page-atom-feed'          => '«$1» — Atom-лента',
-'red-link-title'          => '$1 (ещё не напи�ано)',
+'red-link-title'          => '$1 (такой �траницы не �уще�твует)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Стать�',
@@ -513,7 +513,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Такого дей�тви� нет',
-'nosuchactiontext'  => 'Дей�твие, указанное в URL, не ра�познаёт�� программным обе�печением вики',
+'nosuchactiontext'  => 'Указанное в URL дей�твие ошибочно.
+Возможно вы допу�тили опечатку при наборе URL или перешли по ошибочной ��ылке.
+Это может также указывать на ошибку в проекте {{SITENAME}}.',
 'nosuchspecialpage' => 'Такой �пециальной �траницы нет',
 'nospecialpagetext' => "<big>'''Запрошенной вами �лужебной �траницы не �уще�твует.'''</big>
 
@@ -565,7 +567,6 @@ $1',
 'cannotdelete'         => '�евозможно удалить указанную �траницу или файл. Возможно, его уже удалил кто-то другой.',
 'badtitle'             => '�едопу�тимое название',
 'badtitletext'         => 'Запрашиваемое название �траницы неправильно, пу�то, либо неправильно указано межъ�зыковое или интервики название. Возможно, в названии и�пользуют�� недопу�тимые �имволы.',
-'perfdisabled'         => 'К �ожалению, �та возможно�ть временно недо�тупна в �в�зи � загруженно�тью �ервера.',
 'perfcached'           => 'Следующие данные вз�ты из кеша и могут не учитывать по�ледних изменений.',
 'perfcachedts'         => 'Следующие данные вз�ты из кеша, по�ледний раз он обновл�л�� в $1.',
 'querypage-no-updates' => 'Обновление �той �траницы �ейча� отключено.
@@ -582,7 +583,7 @@ $1',
 'protectedinterface'   => 'Эта �траница �одержит интерфей�ное �ообщение программного обе�печени�. Во избежание вандализма её изменение запрещено.',
 'editinginterface'     => "'''Внимание.''' Вы редактируете �траницу, �одержащую тек�т интерфей�а программного обе�печени�.
 Её изменение повли�ет на внешний вид интерфей�а дл� других пользователей.
-Дл� переводов лучше и�пользовать [http://translatewiki.net/wiki/Main_Page?setlang=ru Betawiki], проект по локализации MediaWiki.",
+Дл� переводов лучше и�пользовать [http://translatewiki.net/wiki/Main_Page?setlang=ru translatewiki.net], проект по локализации MediaWiki.",
 'sqlhidden'            => '(SQL запро� �крыт)',
 'cascadeprotected'     => 'Страница защищена от изменений, по�кольку она включена в {{PLURAL:$1|�ледующую �траницу, дл� которой|�ледующие �траницы, дл� которых}} включена ка�кадна� защита:
 $2',
@@ -593,16 +594,16 @@ $2',
 Указана �ледующа� причина: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Ошибка на�тройки. �еизве�тный �канер виру�ов: <i>$1</i>',
+'virus-badscanner'     => "Ошибка на�тройки. �еизве�тный �канер виру�ов: ''$1''",
 'virus-scanfailed'     => 'ошибка �канировани� (код $1)',
 'virus-unknownscanner' => 'неизве�тный антивиру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Стать инкогнито',
-'logouttext'                 => '<strong>Вы завершили �еан� работы.</strong>
+'logouttext'                 => "'''Вы завершили �еан� работы.'''
 
 Вы можете продолжить уча�тие в {{grammar:genitive|{{SITENAME}}}} анонимно или [[Special:UserLogin|пред�тавить�� заново]] под тем же или другим именем.
-�екоторые �траницы могут продолжать отображать�� в том виде, как будто вы в�ё ещё пред�тавлены �и�теме. Дл� борьбы � �тим �влением обновите кеш браузера.',
+�екоторые �траницы могут продолжать отображать�� в том виде, как будто вы в�ё ещё пред�тавлены �и�теме. Дл� борьбы � �тим �влением обновите кеш браузера.",
 'welcomecreation'            => '== Добро пожаловать, $1! ==
 Ваша учётна� запи�ь �оздана.
 �е забудьте прове�ти [[Special:Preferences|пер�ональную на�тройку]] �айта.',
@@ -613,10 +614,9 @@ $2',
 'remembermypassword'         => 'Помнить мою учётную запи�ь на �том компьютере',
 'yourdomainname'             => 'Ваш домен:',
 'externaldberror'            => 'Произошла ошибка при аутентификации � помощью внешней базы данных, или у ва� недо�таточно прав дл� вне�ени� изменений в �вою внешнюю учётную запи�ь.',
-'loginproblem'               => '<span style="color:red">Уча�тник не опознан.</span>',
 'login'                      => 'Пред�тавить�� �и�теме',
 'nav-login-createaccount'    => 'Пред�тавить�� / зареги�трировать��',
-'loginprompt'                => 'Вы должны разрешить «cookies», чтобы пред�тавить�� {{grammar:genitive|{{SITENAME}}}}.',
+'loginprompt'                => 'Вы должны разрешить «cookies», чтобы пред�тавить�� �и�теме.',
 'userlogin'                  => 'Пред�тавить�� или зареги�трировать��',
 'logout'                     => 'Завершение �еан�а',
 'userlogout'                 => 'Завершение �еан�а',
@@ -653,7 +653,8 @@ $2',
 'loginsuccesstitle'          => 'Опознание прошло у�пешно',
 'loginsuccess'               => 'Теперь вы работаете под именем $1.',
 'nosuchuser'                 => 'Уча�тника � именем $1 не �уще�твует.
-Проверьте правильно�ть напи�ани� имени или во�пользуйте�ь формой ниже, чтобы [[Special:UserLogin/signup|зареги�трировать нового уча�тника]].',
+Имена уча�тников чув�твительны к реги�тру букв.
+Проверьте правильно�ть напи�ани� имени или [[Special:UserLogin/signup|�оздайте новую учётную запи�ь]].',
 'nosuchusershort'            => '�е �уще�твует уча�тника � именем <nowiki>$1</nowiki>. Проверьте напи�ание имени.',
 'nouserspecified'            => 'Вы должны указать им� уча�тника.',
 'wrongpassword'              => 'Введённый вами пароль неверен. Попробуйте ещё раз.',
@@ -679,8 +680,9 @@ $2',
 'throttled-mailpassword'     => 'Функци� напоминани� парол� уже и�пользовала�ь в течение {{PLURAL:$1|по�леднего $1 ча�а|по�ледних $1 ча�ов|по�ледних $1 ча�ов}} .
 Дл� предотвращени� злоупотреблений, разрешено запрашивать не более одного напоминани� за $1 {{PLURAL:$1|ча�|ча�а|ча�ов}}.',
 'mailerror'                  => 'Ошибка при отправке почты: $1',
-'acct_creation_throttle_hit' => 'К �ожалению, вы уже �оздали $1 учётных запи�ей. Вы не можете �оздать больше ни одной.',
-'emailauthenticated'         => 'Ваш почтовый адре� был подтверждён $1.',
+'acct_creation_throttle_hit' => 'За �утки � вашего IP-адре�а {{PLURAL:$1|была �оздана $1 учётна� запи�ь уча�тника|было �оздано $1 учётных запи�ей уча�тников|было �оздано $1 учётных запи�ей уча�тников}}, что �вл�ет�� пределом дл� данного отрезка времени.
+Таким образом, пользователи, обладающие данным IP-адре�ом, в данный момент больше не могут �оздавать новых учётных запи�ей.',
+'emailauthenticated'         => 'Ваш почтовый адре� подтверждён $2 в $3.',
 'emailnotauthenticated'      => 'Ваш адре� �лектронной почты ещё не был подтверждён, функции вики-движка по работе � �л. почтой отключены.',
 'noemailprefs'               => '�дре� �лектронной почты не был указан, функции вики-движка по работе � �л. почтой отключены.',
 'emailconfirmlink'           => 'Подтвердить ваш адре� �лектронной почты',
@@ -692,18 +694,26 @@ $2',
 'createaccount-text'         => 'Кто-то �оздал учётную запи�ь «$2» на �ервере проекта {{SITENAME}} ($4) � паролем «$3», указав ваш адре� �лектронной почты. Вам �ледует зайти и изменить пароль.
 
 Проигнорируйте данное �ообщение, е�ли учётна� запи�ь была �оздана по ошибке.',
+'login-throttled'            => 'Вы �делали �лишком много попыток вве�ти пароль дл� �той учётной запи�и. Пожалуй�та, подождите, перед тем, как попробовать �нова.',
 'loginlanguagelabel'         => 'Язык: $1',
 
 # Password reset dialog
-'resetpass'               => 'Сбро� парол� от учётной запи�и',
-'resetpass_announce'      => 'Вы пред�тавили�ь � помощью временного парол�, полученного по �лектронной почте. Дл� завершени� входа в �и�тему, вы должны у�тановить новый пароль.',
-'resetpass_text'          => '<!-- Добавьте �юда тек�т -->',
-'resetpass_header'        => 'Изменение парол� учётной запи�и',
-'resetpass_submit'        => 'У�тановить пароль и пред�тавить��',
-'resetpass_success'       => 'Ваш пароль был у�пешно изменён! Выполн�ет�� вход в �и�тему…',
-'resetpass_bad_temporary' => '�едей�твительный временный пароль. Возможно, вы уже изменили ваш пароль, или попробуйте запро�ить временный пароль �нова.',
-'resetpass_forbidden'     => 'Пароль не может быть изменён',
-'resetpass_missing'       => 'Форма не �одержит данных.',
+'resetpass'                 => 'Изменение парол�',
+'resetpass_announce'        => 'Вы пред�тавили�ь � помощью временного парол�, полученного по �лектронной почте. Дл� завершени� входа в �и�тему, вы должны у�тановить новый пароль.',
+'resetpass_text'            => '<!-- Добавьте �юда тек�т -->',
+'resetpass_header'          => 'Изменение парол� учётной запи�и',
+'oldpassword'               => 'Старый пароль:',
+'newpassword'               => '�овый пароль:',
+'retypenew'                 => 'Повторите ввод нового парол�:',
+'resetpass_submit'          => 'У�тановить пароль и пред�тавить��',
+'resetpass_success'         => 'Ваш пароль был у�пешно изменён! Выполн�ет�� вход в �и�тему…',
+'resetpass_bad_temporary'   => '�едей�твительный временный пароль. Возможно, вы уже изменили ваш пароль, или попробуйте запро�ить временный пароль �нова.',
+'resetpass_forbidden'       => 'Пароль не может быть изменён',
+'resetpass-no-info'         => 'Чтобы обращать�� непо�ред�твенно к �той �транице, вам �ледует пред�тавить�� �и�теме.',
+'resetpass-submit-loggedin' => 'Изменить пароль',
+'resetpass-wrong-oldpass'   => '�еправильный временный или текущий пароль.
+Возможно, вы уже у�пешно изменили пароль, или запро�или новый временный пароль.',
+'resetpass-temp-password'   => 'Временный пароль:',
 
 # Edit page toolbar
 'bold_sample'     => 'Полужирное начертание',
@@ -726,8 +736,8 @@ $2',
 'hr_tip'          => 'Горизонтальна� лини� (не и�пользуйте ча�то)',
 
 # Edit pages
-'summary'                          => 'Опи�ание изменений',
-'subject'                          => 'Тема/заголовок',
+'summary'                          => 'Опи�ание изменений:',
+'subject'                          => 'Тема/заголовок:',
 'minoredit'                        => 'Малое изменение',
 'watchthis'                        => 'Включить �ту �траницу в �пи�ок наблюдени�',
 'savearticle'                      => 'Запи�ать �траницу',
@@ -740,8 +750,8 @@ $2',
 'missingcommenttext'               => 'Пожалуй�та, введите ниже ваше �ообщение.',
 'missingcommentheader'             => "'''�апоминание:''' Вы не указали заголовок комментари�.
 При повторном нажатии на кнопку �охранени�, ваша правка будет запи�ана без заголовка.",
-'summary-preview'                  => 'Опи�ание будет',
-'subject-preview'                  => 'Заголовок будет',
+'summary-preview'                  => 'Опи�ание будет:',
+'subject-preview'                  => 'Заголовок будет:',
 'blockedtitle'                     => 'Уча�тник заблокирован',
 'blockedtext'                      => "<big>'''Ваша учётна� запи�ь или IP-адре� заблокированы.'''</big>
 
@@ -778,7 +788,7 @@ $2',
 'confirmedittitle'                 => 'Требует�� подтверждение адре�а �лектронной почты',
 'confirmedittext'                  => 'Вы должны подтвердить ваш адре� �лектронной почты перед правкой �траниц.
 Пожалуй�та, введите и подтвердите ваш адре� �лектронной почты на [[Special:Preferences|�транице на�троек]].',
-'nosuchsectiontitle'               => '�ет такой �екции',
+'nosuchsectiontitle'               => '�ет такого раздела',
 'nosuchsectiontext'                => 'Вы пытаете�ь редактировать под�траницу, которой не �уще�твует. Так как не �уще�твует под�траницы � названием $1, ваши правки некуда �охран�ть.',
 'loginreqtitle'                    => 'Требует�� авторизаци�',
 'loginreqlink'                     => 'пред�тавить��',
@@ -793,59 +803,63 @@ $2',
 Дл� идентификации и�пользует�� цифровой IP-адре�.
 Этот же адре� может �оответ�твовать не�кольким другим уча�тникам.
 Е�ли вы анонимный уча�тник и полагаете, что получили �ообщени�, адре�ованные не вам, пожалуй�та, [[Special:UserLogin|пред�тавьте�ь �и�теме]], чтобы впредь избежать возможной путаницы � другими уча�тниками.''",
-'noarticletext'                    => "В на�то�щий момент тек�т на данной �транице от�ут�твует. Вы можете [[Special:Search/{{PAGENAME}}|найти упоминание данного названи�]] в других �тать�х или '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} �оздать �траницу � таким названием]'''.",
+'noarticletext'                    => "В на�то�щий момент тек�т на данной �транице от�ут�твует.
+Вы можете [[Special:Search/{{PAGENAME}}|найти упоминание данного названи�]] в других �тать�х,
+<span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} найти �оответ�твующие запи�и журналов],
+или '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} �оздать �траницу � таким названием]'''.",
 'userpage-userdoesnotexist'        => 'Учётной запи�и «$1» не �уще�твует. Убедите�ь, что вы дей�твительно желаете �оздать или изменить �ту �траницу.',
 'clearyourcache'                   => "'''Замечание:''' Чтобы по�ле �охранени� увидеть �деланные изменени�, очи�тите кеш �воего браузера: '''Mozilla / Firefox''': ''Ctrl+Shift+R'', '''IE:''' ''Ctrl+F5'', '''Safari''': ''Cmd+Shift+R'', '''Konqueror''': ''F5'', '''Opera''': через меню ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => '<strong>Под�казка.</strong> �ажмите кнопку «Предварительный про�мотр», чтобы проверить ваш новый CSS- или JS-файл перед �охранением.',
+'usercssjsyoucanpreview'           => "'''Под�казка.''' �ажмите кнопку «Предварительный про�мотр», чтобы проверить ваш новый CSS- или JS-файл перед �охранением.",
 'usercsspreview'                   => "'''Помните, что �то только предварительный про�мотр вашего CSS-файла, он ещё не �охранён!'''",
 'userjspreview'                    => "'''Помните, что �то только предварительный про�мотр вашего javascript-файла, он ещё не �охранён!'''",
 'userinvalidcssjstitle'            => "'''Внимание:''' тема оформлени� «$1» не найдена. Помните, что пользователь�кие �траницы .css и .js должны иметь название, �о�то�щее только из �трочных букв, например «{{ns:user}}:�екто/monobook.css», а не «{{ns:user}}:�екто/Monobook.css».",
 'updated'                          => '(Обновлена)',
-'note'                             => '<strong>Примечание:</strong>',
-'previewnote'                      => '<strong>Это только предварительный про�мотр, тек�т ещё не запи�ан!</strong>',
+'note'                             => "'''Примечание:'''",
+'previewnote'                      => "'''Это только предварительный про�мотр, тек�т ещё не запи�ан!'''",
 'previewconflict'                  => 'Этот предварительный про�мотр отражает тек�т в верхнем окне редактировани� так, как он будет выгл�деть, е�ли вы решите запи�ать его.',
-'session_fail_preview'             => '<strong>К �ожалению, �ервер не �мог обработать вашу правку из-за потери идентификатора �е��ии.
+'session_fail_preview'             => "'''К �ожалению, �ервер не �мог обработать вашу правку из-за потери идентификатора �е��ии.
 Пожалуй�та, попробуйте ещё раз.
-Е�ли �та ошибка повторит��, попробуйте [[Special:UserLogout|завершить �еан�]] и заново пред�тавить�� �и�теме.</strong>',
-'session_fail_preview_html'        => "<strong>К �ожалению, �ервер не �мог обработать вашу правку из-за потери данных �е��ии.</strong>
+Е�ли �та ошибка повторит��, попробуйте [[Special:UserLogout|завершить �еан�]] и заново пред�тавить�� �и�теме.'''",
+'session_fail_preview_html'        => "'''К �ожалению, �ервер не �мог обработать вашу правку из-за потери данных �е��ии.'''
 
 ''Так как {{SITENAME}} разрешает и�пользовать чи�тый HTML, предварительный про�мотр отключён в каче�тве меры предотвращени� JavaScript-атак.''
 
-<strong>Е�ли �то добро�ове�тна� попытка редактировани�, пожалуй�та, попробуйте ещё раз.
-Е�ли не получает�� повторна� правка, попробуйте [[Special:UserLogout|завершить �еан�]] работы и заново пред�тавить��.</strong>",
-'token_suffix_mismatch'            => '<strong>Ваша правка была отклонена, так как ваша программа неправильно обрабатывает знаки пунктуации
+'''Е�ли �то добро�ове�тна� попытка редактировани�, пожалуй�та, попробуйте ещё раз.
+Е�ли не получает�� повторна� правка, попробуйте [[Special:UserLogout|завершить �еан�]] работы и заново пред�тавить��.'''",
+'token_suffix_mismatch'            => "'''Ваша правка была отклонена, так как ваша программа неправильно обрабатывает знаки пунктуации
 в окне редактировани�. Правка была отменена дл� предотвращени и�кажени� тек�та �татьи.
-Подобные проблемы могут возникать при и�пользовании анонимизирующих веб-прок�и, �одержащих ошибки.</strong>',
+Подобные проблемы могут возникать при и�пользовании анонимизирующих веб-прок�и, �одержащих ошибки.'''",
 'editing'                          => 'Редактирование: $1',
-'editingsection'                   => 'Редактирование $1 (�екци�)',
-'editingcomment'                   => 'Редактирование $1 (комментарий)',
+'editingsection'                   => 'Редактирование $1 (раздел)',
+'editingcomment'                   => 'Редактирование $1 (новый раздел)',
 'editconflict'                     => 'Конфликт редактировани�: $1',
 'explainconflict'                  => 'Пока вы редактировали �ту �траницу, кто-то внё� в неё изменени�. В верхнем окне дл� редактировани� вы видите текущий тек�т �траницы.  В нижнем окне находит�� ваш вариант. Перене�ите �деланные вами изменени� из нижнего окна в верхнее. При нажатии на кнопку «Запи�ать �траницу» будет �охранён тек�т верхнего окна.',
 'yourtext'                         => 'Ваш тек�т',
 'storedversion'                    => 'Сохранённа� вер�и�',
-'nonunicodebrowser'                => '<strong>ПРЕДУПРЕЖДЕ�ИЕ: Ваш браузер не поддерживает кодировку Юникод. При редактировании �татей в�е не-ASCII �имволы будут заменены на �вои ше�тнадцатеричные коды.</strong>',
-'editingold'                       => '<strong>ПРЕДУПРЕЖДЕ�ИЕ: Вы редактируете у�таревшую вер�ию данной �траницы. По�ле �охранени� �траницы будут потер�ны изменени�, �деланные в по�ледующих вер�и�х.</strong>',
+'nonunicodebrowser'                => "'''ПРЕДУПРЕЖДЕ�ИЕ: Ваш браузер не поддерживает кодировку Юникод. При редактировании �татей в�е не-ASCII �имволы будут заменены на �вои ше�тнадцатеричные коды.'''",
+'editingold'                       => "'''ПРЕДУПРЕЖДЕ�ИЕ: Вы редактируете у�таревшую вер�ию данной �траницы. По�ле �охранени� �траницы будут потер�ны изменени�, �деланные в по�ледующих вер�и�х.'''",
 'yourdiff'                         => 'Различи�',
-'copyrightwarning'                 => 'Обратите внимание, что в�е добавлени� и изменени� тек�та �татьи ра��матривают��, как выпущенные на у�лови�х лицензии $2 (�м. $1).
+'copyrightwarning'                 => "Обратите внимание, что в�е добавлени� и изменени� тек�та �татьи ра��матривают��, как выпущенные на у�лови�х лицензии $2 (�м. $1).
 Е�ли вы не хотите, чтобы ваши тек�ты �вободно ра�про�тран�ли�ь и редактировали�ь любым желающим, не помещайте их �юда.<br />
 Вы также подтверждаете, что �вл�ете�ь автором вно�имых дополнений, или �копировали их из
 и�точника, допу�кающего �вободное ра�про�транение и изменение �воего �одержимого.<br />
-<strong>�Е Р�ЗМЕЩ�ЙТЕ БЕЗ Р�ЗРЕШЕ�ИЯ М�ТЕРИ�ЛЫ, ОХР��ЯЕМЫЕ �ВТОРСКИМ ПР�ВОМ!</strong>',
-'copyrightwarning2'                => 'Пожалуй�та, обратите внимание, что в�е ваши добавлени� могут быть отредактированы или удалены другими уча�тниками.
+'''�Е Р�ЗМЕЩ�ЙТЕ БЕЗ Р�ЗРЕШЕ�ИЯ М�ТЕРИ�ЛЫ, ОХР��ЯЕМЫЕ �ВТОРСКИМ ПР�ВОМ!'''",
+'copyrightwarning2'                => "Пожалуй�та, обратите внимание, что в�е ваши добавлени� могут быть отредактированы или удалены другими уча�тниками.
 Е�ли вы не хотите, чтобы кто-либо измен�л ваши тек�ты, не помещайте их �юда.<br />
 Вы также подтверждаете, что �вл�ете�ь автором вно�имых дополнений, или �копировали их из и�точника, допу�кающего �вободное ра�про�транение и изменение �воего �одержимого (�м. $1).
-<strong>�Е Р�ЗМЕЩ�ЙТЕ БЕЗ Р�ЗРЕШЕ�ИЯ ОХР��ЯЕМЫЕ �ВТОРСКИМ ПР�ВОМ М�ТЕРИ�ЛЫ!</strong>',
-'longpagewarning'                  => '<strong>ПРЕДУПРЕЖДЕ�ИЕ: Длина �той �траницы �о�тавл�ет $1 килобайт.
+'''�Е Р�ЗМЕЩ�ЙТЕ БЕЗ Р�ЗРЕШЕ�ИЯ ОХР��ЯЕМЫЕ �ВТОРСКИМ ПР�ВОМ М�ТЕРИ�ЛЫ!'''",
+'longpagewarning'                  => "'''ПРЕДУПРЕЖДЕ�ИЕ: Длина �той �траницы �о�тавл�ет $1 килобайт.
 Страницы, размер которых приближает�� к 32 КБ или превышает �то значение, могут неверно отображать�� в некоторых браузерах.
-Пожалуй�та, ра��мотрите вариант разбиени� �траницы на меньшие ча�ти.</strong>',
-'longpageerror'                    => '<strong>ОШИБК�: запи�ываемый вами тек�т имеет размер $1 килобайт, что больше, чем у�тановленный предел $2 килобайт. Страница не может быть �охранена.</strong>',
-'readonlywarning'                  => '<strong>ПРЕДУПРЕЖДЕ�ИЕ: база данных заблокирована в �в�зи � процедурами об�луживани�,
-по�тому вы не можете запи�ать ваши изменени� пр�мо �ейча�.
-Возможно, вам �ледует �охранить тек�т в файл на �воём ди�ке и поме�тить его в данный проект позже.</strong>',
-'protectedpagewarning'             => '<strong>ПРЕДУПРЕЖДЕ�ИЕ: �та �траница защищена от изменений, её могут редактировать только админи�траторы.</strong>',
+Пожалуй�та, ра��мотрите вариант разбиени� �траницы на меньшие ча�ти.'''",
+'longpageerror'                    => "'''ОШИБК�: запи�ываемый вами тек�т имеет размер $1 килобайт, что больше, чем у�тановленный предел $2 килобайт. Страница не может быть �охранена.'''",
+'readonlywarning'                  => "'''ПРЕДУПРЕЖДЕ�ИЕ. База данных заблокирована в �в�зи � процедурами об�луживани�, по�тому вы не можете запи�ать ваши изменени� пр�мо �ейча�.
+Возможно, вам �ледует �охранить тек�т в файл, чтобы во�пользовать�� �тим тек�том позже.'''
+
+�дмини�тратор, заблокировавший базу данных, о�тавил �ледующее объ��нение: $1",
+'protectedpagewarning'             => "'''ПРЕДУПРЕЖДЕ�ИЕ: �та �траница защищена от изменений, её могут редактировать только админи�траторы.'''",
 'semiprotectedpagewarning'         => "'''Замечание:''' �та �траница была защищена; редактировать её могут только зареги�трированные уча�тники.",
 'cascadeprotectedwarning'          => "'''Предупреждение:''' Данную �траницу могут редактировать только уча�тники группы «�дмини�траторы», по�кольку она включена {{PLURAL:$1|в �ледующую �траницу, дл� которой|в �ледующие �траницы, дл� которых}} включена ка�кадна� защита:",
-'titleprotectedwarning'            => '<strong>Предупреждение. Эта �траница была защищена, �оздать её могут только определённые уча�тники.</strong>',
+'titleprotectedwarning'            => "'''ПРЕДУПРЕЖДЕ�ИЕ. Страница � таким названием была защищена, поме�тить тек�т на неё могут только уча�тники � [[Special:ListGroupRights|�оответ�твующими правами]].'''",
 'templatesused'                    => 'Шаблоны, и�пользованные на текущей вер�ии �траницы:',
 'templatesusedpreview'             => 'Шаблоны, и�пользуемые в предпро�матриваемой �транице:',
 'templatesusedsection'             => 'Шаблоны, и�пользуемые в �той �екции:',
@@ -863,11 +877,21 @@ $2',
 'recreate-deleted-warn'            => "'''Внимание: вы пытаете�ь во��оздать �траницу, котора� ранее удал�ла�ь.'''
 
 Проверьте, дей�твительно ли вам нужно во��оздавать �ту �траницу. �иже приведён журнал удалений.",
+'deleted-notice'                   => 'Эта �траница была удалена. Дл� �правки ниже показаны �оответ�твующие запи�и из журнала удалений.',
+'deletelog-fulllog'                => 'Про�мотреть полный журнал',
+'edit-hook-aborted'                => 'Правка отменена процедурой-перехватчиком.
+Дополнительных разъ��нений не приведено.',
+'edit-gone-missing'                => '�евозможно обновить �траницу.
+Веро�тно, она была удалена.',
+'edit-conflict'                    => 'Конфликт правок.',
+'edit-no-change'                   => 'Ваша правка была отклонена, так как в тек�те не было �делано изменений.',
+'edit-already-exists'              => '�евозможно �оздать новую �траницу.
+Она уже �уще�твует.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Внимание. Эта �траница �одержит �лишком много вызовов ре�ур�оёмких функций.
 
-Количе�тво вызовов не должно превышать $2, �ейча� же оно равно $1.',
+Ограничение на количе�тво вызовов у�тановлено на уровне $2 {{PLURAL:$2|вызова|вызовов|вызовов}}, в данном �лучае требует�� �делать {{PLURAL:$1|$1 вызов|$1 вызова|$1 вызовов}}.',
 'expensive-parserfunction-category'       => 'Страницы �о �лишком большим количе�твом вызовов ре�ур�оёмких функций',
 'post-expand-template-inclusion-warning'  => 'Внимание. Размер включаемых шаблонов �лишком велик.
 �екоторые шаблоны не будут включены.',
@@ -875,6 +899,8 @@ $2',
 'post-expand-template-argument-warning'   => 'Внимание. Эта �траница �одержит по крайней мере один аргумент шаблона, имеющий �лишком большой размер дл� развёртывани�.
 Подобные аргументы были опущены.',
 'post-expand-template-argument-category'  => 'Страницы, �одержащие пропущенные аргументы шаблонов',
+'parser-template-loop-warning'            => 'Обнаружена петл� в шаблонах: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Превышен предел глубины рекур�ии шаблона ($1)',
 
 # "Undo" feature
 'undo-success' => 'Правка может быть отменена. Пожалуй�та, про�мотрите �равнение вер�ий, чтобы убедить��, что �то именно те изменени�, которые ва� интере�уют, и нажмите «Запи�ать �траницу», чтобы изменени� в�тупили в �илу.',
@@ -889,27 +915,27 @@ $2',
 $3 указал �ледующую причину: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Показать журналы дл� �той �траницы',
-'nohistory'           => 'Дл� �той �траницы журнал изменений от�ут�твует.',
-'revnotfound'         => 'Вер�и� не найдена',
-'revnotfoundtext'     => 'Стара� вер�и� �траницы не найдена. Пожалуй�та, проверьте правильно�ть ��ылки, которую вы и�пользовали дл� до�тупа к �той �транице.',
-'currentrev'          => 'Текуща� вер�и�',
-'revisionasof'        => 'Вер�и� $1',
-'revision-info'       => 'Вер�и� от $1; $2',
-'previousrevision'    => '� Предыдуща�',
-'nextrevision'        => 'Следующа� →',
-'currentrevisionlink' => 'Текуща� вер�и�',
-'cur'                 => 'текущ.',
-'next'                => '�лед.',
-'last'                => 'пред.',
-'page_first'          => 'перва�',
-'page_last'           => 'по�ледн��',
-'histlegend'          => "По��нени�: (текущ.) — отличие от текущей вер�ии; (пред.) — отличие от предше�твующей вер�ии; '''м''' — малозначимое изменение",
-'deletedrev'          => '[удалена]',
-'histfirst'           => '�тарейшие',
-'histlast'            => 'недавние',
-'historysize'         => '($1 {{PLURAL:$1|байт|байта|байт}})',
-'historyempty'        => '(пу�то)',
+'viewpagelogs'           => 'Показать журналы дл� �той �траницы',
+'nohistory'              => 'Дл� �той �траницы журнал изменений от�ут�твует.',
+'currentrev'             => 'Текуща� вер�и�',
+'currentrev-asof'        => 'Текуща� вер�и� на $1',
+'revisionasof'           => 'Вер�и� $1',
+'revision-info'          => 'Вер�и� от $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Предыдуща�',
+'nextrevision'           => 'Следующа� →',
+'currentrevisionlink'    => 'Текуща� вер�и�',
+'cur'                    => 'текущ.',
+'next'                   => '�лед.',
+'last'                   => 'пред.',
+'page_first'             => 'перва�',
+'page_last'              => 'по�ледн��',
+'histlegend'             => "По��нени�: (текущ.) — отличие от текущей вер�ии; (пред.) — отличие от предше�твующей вер�ии; '''м''' — малозначимое изменение",
+'history-fieldset-title' => 'Про�мотреть и�торию',
+'deletedrev'             => '[удалена]',
+'histfirst'              => '�тарейшие',
+'histlast'               => 'недавние',
+'historysize'            => '($1 {{PLURAL:$1|байт|байта|байт}})',
+'historyempty'           => '(пу�то)',
 
 # Revision feed
 'history-feed-title'          => 'И�тори� изменений',
@@ -946,7 +972,7 @@ $3 указал �ледующую причину: ''$2''",
 'revdelete-legend'            => 'У�тановить ограничени�:',
 'revdelete-hide-text'         => 'Скрыть тек�т �той вер�ии �траницы',
 'revdelete-hide-name'         => 'Скрыть дей�твие и его объект',
-'revdelete-hide-comment'      => 'Скрыть комментарий',
+'revdelete-hide-comment'      => 'Скрыть опи�ание изменений',
 'revdelete-hide-user'         => 'Скрыть им� автора',
 'revdelete-hide-restricted'   => 'Применить ограничени� также и к админи�траторам',
 'revdelete-suppress'          => 'Скрывать данные также и от админи�траторов',
@@ -954,7 +980,7 @@ $3 указал �ледующую причину: ''$2''",
 'revdelete-unsuppress'        => 'Сн�ть ограничени� � во��тановленных вер�ий',
 'revdelete-log'               => 'Примечание:',
 'revdelete-submit'            => 'Применить к выбранной вер�ии',
-'revdelete-logentry'          => 'Изменена видимо�ть вер�ии �траницы [[$1]]',
+'revdelete-logentry'          => 'изменил видимо�ть вер�ии �траницы [[$1]]',
 'logdelete-logentry'          => 'Изменена видимо�ть �обыти� дл� [[$1]]',
 'revdelete-success'           => 'Видимо�ть вер�ии изменена.',
 'logdelete-success'           => 'Видимо�ть �обыти� изменена.',
@@ -996,6 +1022,7 @@ $3 указал �ледующую причину: ''$2''",
 'mergehistory-invalid-destination' => 'Целева� �траница должна иметь правильный заголовок.',
 'mergehistory-autocomment'         => 'Перено� [[:$1]] в [[:$2]]',
 'mergehistory-comment'             => 'Перено� [[:$1]] в [[:$2]]: $3',
+'mergehistory-same-destination'    => 'И�ходна� и целева� �траницы должны различать��',
 
 # Merge log
 'mergelog'           => 'Журнал объединений',
@@ -1008,120 +1035,202 @@ $3 указал �ледующую причину: ''$2''",
 'difference'              => '(Различи� между вер�и�ми)',
 'lineno'                  => 'Строка $1:',
 'compareselectedversions' => 'Сравнить выбранные вер�ии',
+'visualcomparison'        => '�агл�дное �равнение',
+'wikicodecomparison'      => 'Сравнение вики-тек�та',
 'editundo'                => 'отменить',
 'diff-multi'              => '({{PLURAL:$1|$1 промежуточна� вер�и� не показана|$1 промежуточные вер�ии не показаны|$1 промежуточных вер�ий не показаны.}})',
+'diff-movedto'            => 'оформлено как $1',
+'diff-styleadded'         => 'добавлен �тиль $1',
+'diff-added'              => '$1 добавл.',
+'diff-changedto'          => 'изменено на $1',
+'diff-movedoutof'         => 'выне�ено из $1',
+'diff-styleremoved'       => 'убран �тиль $1',
+'diff-removed'            => '$1 удал.',
+'diff-changedfrom'        => 'изменено � $1',
+'diff-src'                => 'и�точник',
+'diff-withdestination'    => '� назначением $1',
+'diff-with'               => '&#32;� $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;и $1 $2',
+'diff-width'              => 'ширина',
+'diff-height'             => 'вы�ота',
+'diff-p'                  => "'''абзац'''",
+'diff-blockquote'         => "'''цитата'''",
+'diff-h1'                 => "'''заголовок 1-го уровн�'''",
+'diff-h2'                 => "'''заголовок 2-го уровн�'''",
+'diff-h3'                 => "'''заголовок 3-го уровн�'''",
+'diff-h4'                 => "'''заголовок 4-го уровн�'''",
+'diff-h5'                 => "'''заголовок 5-го уровн�'''",
+'diff-pre'                => "'''блок заданного формата'''",
+'diff-div'                => "'''раздел'''",
+'diff-ul'                 => "'''неупор�доченный �пи�ок'''",
+'diff-ol'                 => "'''упор�доченный �пи�ок'''",
+'diff-li'                 => "'''�лемент �пи�ка'''",
+'diff-table'              => "'''таблица'''",
+'diff-tbody'              => "'''�одержание таблицы'''",
+'diff-tr'                 => "'''�трока'''",
+'diff-td'                 => "'''�чейка'''",
+'diff-th'                 => "'''заголовок'''",
+'diff-br'                 => "'''разрыв'''",
+'diff-hr'                 => "'''горизонтальна� лини�'''",
+'diff-code'               => "'''блок компьютерного кода'''",
+'diff-dl'                 => "'''�пи�ок определений'''",
+'diff-dt'                 => "'''определ�емый термин'''",
+'diff-dd'                 => "'''определение'''",
+'diff-input'              => "'''ввод'''",
+'diff-form'               => "'''форма'''",
+'diff-img'                => "'''изображение'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''��ылка'''",
+'diff-i'                  => "'''кур�ив'''",
+'diff-b'                  => "'''выделение жирным'''",
+'diff-strong'             => "'''выделение «strong»'''",
+'diff-em'                 => "'''выделение «em»'''",
+'diff-font'               => "'''шрифт'''",
+'diff-big'                => "'''большой шрифт'''",
+'diff-del'                => "'''удалено'''",
+'diff-tt'                 => "'''моноширинный шрифт'''",
+'diff-sub'                => "'''под�трочный'''",
+'diff-sup'                => "'''над�трочный'''",
+'diff-strike'             => "'''зачёркнутый'''",
 
 # Search results
-'searchresults'             => 'Результаты пои�ка',
-'searchresulttext'          => 'Дл� получени� более подробной информации о пои�ке на �траницах проекта, �м. [[{{MediaWiki:Helppage}}|�правочный раздел]].',
-'searchsubtitle'            => 'По запро�у «[[:$1]]» ([[Special:Prefixindex/$1|�траницы, начинающие�� � �того названи�]] | [[Special:WhatLinksHere/$1|��ылающие�� на �то название]])',
-'searchsubtitleinvalid'     => 'По запро�у «$1»',
-'noexactmatch'              => "'''Страницы � названием «$1» не �уще�твует.''' [[:$1|Создать �траницу]].",
-'noexactmatch-nocreate'     => 'Страницы � названием «$1» не �уще�твует.',
-'toomanymatches'            => '�айдено �лишком много �оответ�твий, пожалуй�та, попробуйте другой запро�',
-'titlematches'              => 'Совпадени� в названи�х �траниц',
-'notitlematches'            => '�ет �овпадений в названи�х �траниц',
-'textmatches'               => 'Совпадени� в тек�тах �траниц',
-'notextmatches'             => '�ет �овпадений в тек�тах �траниц',
-'prevn'                     => 'предыдущие $1',
-'nextn'                     => '�ледующие $1',
-'viewprevnext'              => 'Про�мотреть ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|$2 �лово|$2 �лова|$2 �лов}})',
-'search-result-score'       => 'Релевантно�ть: $1 %',
-'search-redirect'           => '(перенаправление $1)',
-'search-section'            => '(раздел $1)',
-'search-suggest'            => 'Возможно, вы имели в виду: $1',
-'search-interwiki-caption'  => 'Род�твенные проекты',
-'search-interwiki-default'  => '$1 результ.:',
-'search-interwiki-more'     => '(ещё)',
-'search-mwsuggest-enabled'  => '� �оветами',
-'search-mwsuggest-disabled' => 'без �оветов',
-'search-relatedarticle'     => 'Св�занный',
-'mwsuggest-disable'         => 'Отключить AJAX-под�казки',
-'searchrelated'             => '�в�занный',
-'searchall'                 => 'в�е',
-'showingresults'            => '�иже {{PLURAL:$1|показан|показаны|показаны}} <strong>$1</strong> {{PLURAL:$1|результат|результата|результатов}}, начина� � №&nbsp;<strong>$2</strong>.',
-'showingresultsnum'         => '�иже {{PLURAL:$3|показан|показаны|показаны}} <strong>$3</strong> {{PLURAL:$3|результат|результата|результатов}}, начина� � №&nbsp;<strong>$2</strong>.',
-'showingresultstotal'       => "�иже {{PLURAL:$3|показан результат '''$1''' из '''$3'''|показаны результаты '''$1 — $2''' из '''$3'''}}",
-'nonefound'                 => "'''Замечание.''' По умолчанию пои�к производит�� не во в�ех про�тран�твах имён. И�пользуйте при�тавку ''all:'', чтобы и�кать во в�ех про�тран�твах имён (включа� об�уждени� уча�тников, шаблоны и пр.), или укажите требуемое про�тран�тво имён.",
-'powersearch'               => 'Ра�ширенный пои�к',
-'powersearch-legend'        => 'Ра�ширенный пои�к',
-'powersearch-ns'            => 'Пои�к в про�тран�твах имён:',
-'powersearch-redir'         => 'Выводить перенаправлени�',
-'powersearch-field'         => 'Пои�к',
-'search-external'           => 'Внешний пои�к',
-'searchdisabled'            => 'Извините, но в�троенный полнотек�товый пои�к выключен. Вы можете во�пользовать�� пои�ком по �айту через пои�ковые �и�темы общего назначени�, однако имейте в виду, что копи� �айта в их кеше может быть не�колько у�таревшей.',
+'searchresults'                    => 'Результаты пои�ка',
+'searchresults-title'              => 'Результаты пои�ка «$1»',
+'searchresulttext'                 => 'Дл� получени� более подробной информации о пои�ке на �траницах проекта, �м. [[{{MediaWiki:Helppage}}|�правочный раздел]].',
+'searchsubtitle'                   => 'По запро�у «[[:$1]]» ([[Special:Prefixindex/$1|�траницы, начинающие�� � �того названи�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|��ылающие�� на �то название]])',
+'searchsubtitleinvalid'            => 'По запро�у «$1»',
+'noexactmatch'                     => "'''Страницы � названием «$1» не �уще�твует.''' [[:$1|Создать �траницу]].",
+'noexactmatch-nocreate'            => 'Страницы � названием «$1» не �уще�твует.',
+'toomanymatches'                   => '�айдено �лишком много �оответ�твий, пожалуй�та, попробуйте другой запро�',
+'titlematches'                     => 'Совпадени� в названи�х �траниц',
+'notitlematches'                   => '�ет �овпадений в названи�х �траниц',
+'textmatches'                      => 'Совпадени� в тек�тах �траниц',
+'notextmatches'                    => '�ет �овпадений в тек�тах �траниц',
+'prevn'                            => 'предыдущие $1',
+'nextn'                            => '�ледующие $1',
+'viewprevnext'                     => 'Про�мотреть ($1) ($2) ($3)',
+'searchmenu-legend'                => '�а�тройки пои�ка',
+'searchmenu-exists'                => "* Страница '''[[$1]]'''",
+'searchmenu-new'                   => "'''Создать �траницу «[[$1]]» в �той вики!'''",
+'searchhelp-url'                   => 'Help:Содержание',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Показать �траницы � �тим префик�ом]]',
+'searchprofile-articles'           => 'По о�новным �траницам',
+'searchprofile-articles-and-proj'  => 'По о�новным �траницам и проекту',
+'searchprofile-project'            => 'По проекту',
+'searchprofile-images'             => 'По файлам',
+'searchprofile-everything'         => 'Везде',
+'searchprofile-advanced'           => 'Ра�ширенный',
+'searchprofile-articles-tooltip'   => 'Пои�к в $1',
+'searchprofile-project-tooltip'    => 'Пои�к в $1',
+'searchprofile-images-tooltip'     => 'Пои�к файлов',
+'searchprofile-everything-tooltip' => 'Пои�к на в�ех �траницах (включа� �траницы об�уждени�)',
+'searchprofile-advanced-tooltip'   => 'И�кать в заданных про�тран�твах имён',
+'prefs-search-nsdefault'           => 'Пои�к � и�пользованием умолчаний:',
+'prefs-search-nscustom'            => 'Пои�к в заданных про�тран�твах имён:',
+'search-result-size'               => '$1 ({{PLURAL:$2|$2 �лово|$2 �лова|$2 �лов}})',
+'search-result-score'              => 'Релевантно�ть: $1 %',
+'search-redirect'                  => '(перенаправление $1)',
+'search-section'                   => '(раздел $1)',
+'search-suggest'                   => 'Возможно, вы имели в виду: $1',
+'search-interwiki-caption'         => 'Род�твенные проекты',
+'search-interwiki-default'         => '$1 результ.:',
+'search-interwiki-more'            => '(ещё)',
+'search-mwsuggest-enabled'         => '� �оветами',
+'search-mwsuggest-disabled'        => 'без �оветов',
+'search-relatedarticle'            => 'Св�занный',
+'mwsuggest-disable'                => 'Отключить AJAX-под�казки',
+'searchrelated'                    => '�в�занный',
+'searchall'                        => 'в�е',
+'showingresults'                   => '�иже {{PLURAL:$1|показан|показаны|показаны}} <strong>$1</strong> {{PLURAL:$1|результат|результата|результатов}}, начина� � №&nbsp;<strong>$2</strong>.',
+'showingresultsnum'                => '�иже {{PLURAL:$3|показан|показаны|показаны}} <strong>$3</strong> {{PLURAL:$3|результат|результата|результатов}}, начина� � №&nbsp;<strong>$2</strong>.',
+'showingresultstotal'              => "�иже {{PLURAL:$4|показан результат '''$1''' из '''$3'''|показаны результаты '''$1 — $2''' из '''$3'''}}",
+'nonefound'                        => "'''Замечание.''' По умолчанию пои�к производит�� не во в�ех про�тран�твах имён. И�пользуйте при�тавку ''all:'', чтобы и�кать во в�ех про�тран�твах имён (включа� об�уждени� уча�тников, шаблоны и пр.), или укажите требуемое про�тран�тво имён.",
+'search-nonefound'                 => 'Соответ�твий запро�у не найдено.',
+'powersearch'                      => 'Ра�ширенный пои�к',
+'powersearch-legend'               => 'Ра�ширенный пои�к',
+'powersearch-ns'                   => 'Пои�к в про�тран�твах имён:',
+'powersearch-redir'                => 'Выводить перенаправлени�',
+'powersearch-field'                => 'Пои�к',
+'search-external'                  => 'Внешний пои�к',
+'searchdisabled'                   => 'Извините, но в�троенный полнотек�товый пои�к выключен. Вы можете во�пользовать�� пои�ком по �айту через пои�ковые �и�темы общего назначени�, однако имейте в виду, что копи� �айта в их кеше может быть не�колько у�таревшей.',
 
 # Preferences page
-'preferences'              => '�а�тройки',
-'mypreferences'            => '�а�тройки',
-'prefs-edits'              => 'Количе�тво правок:',
-'prefsnologin'             => 'Вы не пред�тавили�ь �и�теме',
-'prefsnologintext'         => 'Вы должны <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} пред�тавить�� �и�теме]</span>, чтобы измен�ть на�тройки уча�тника.',
-'prefsreset'               => 'Во��тановлены на�тройки по умолчанию.',
-'qbsettings'               => 'Панель навигации',
-'qbsettings-none'          => '�е показывать',
-'qbsettings-fixedleft'     => '�еподвижна� �лева',
-'qbsettings-fixedright'    => '�еподвижна� �права',
-'qbsettings-floatingleft'  => 'Плавающа� �лева',
-'qbsettings-floatingright' => 'Плавающа� �права',
-'changepassword'           => 'Изменение парол�',
-'skin'                     => 'Оформление',
-'math'                     => 'Отображение формул',
-'dateformat'               => 'Формат даты',
-'datedefault'              => 'По умолчанию',
-'datetime'                 => 'Дата и врем�',
-'math_failure'             => '�евозможно разобрать выражение',
-'math_unknown_error'       => 'неизве�тна� ошибка',
-'math_unknown_function'    => 'неизве�тна� функци�',
-'math_lexing_error'        => 'лек�иче�ка� ошибка',
-'math_syntax_error'        => '�интак�иче�ка� ошибка',
-'math_image_error'         => 'Преобразование в PNG прошло � ошибкой; проверьте правильно�ть у�тановки latex, dvips, gs и convert',
-'math_bad_tmpdir'          => '�е удаёт�� �оздать или запи�ать во временный каталог математики',
-'math_bad_output'          => '�е удаёт�� �оздать или запи�ать в выходной каталог математики',
-'math_notexvc'             => 'Выполн�емый файл texvc не найден; См. math/README — �правку по на�тройке.',
-'prefs-personal'           => 'Личные данные',
-'prefs-rc'                 => 'Страница �вежих правок',
-'prefs-watchlist'          => 'Спи�ок наблюдени�',
-'prefs-watchlist-days'     => 'Мак�имальное чи�ло дней, отображаемых в �пи�ке наблюдени�:',
-'prefs-watchlist-edits'    => 'Мак�имальное количе�тво правок, отображаемых в ра�ширенном �пи�ке наблюдени�:',
-'prefs-misc'               => 'Другие на�тройки',
-'saveprefs'                => 'Запи�ать',
-'resetprefs'               => 'Сбро�ить',
-'oldpassword'              => 'Старый пароль:',
-'newpassword'              => '�овый пароль:',
-'retypenew'                => 'Повторите ввод нового парол�:',
-'textboxsize'              => 'Редактирование',
-'rows'                     => 'Строк:',
-'columns'                  => 'Столбцов:',
-'searchresultshead'        => 'Пои�к',
-'resultsperpage'           => 'Количе�тво найденных запи�ей на �траницу:',
-'contextlines'             => 'Количе�тво показываемых �трок дл� каждой найденной:',
-'contextchars'             => 'Количе�тво �имволов контек�та на �троку:',
-'stub-threshold'           => 'Порог дл� определени� оформлени� <a href="#" class="stub">��ылок на заготовки</a> (в байтах):',
-'recentchangesdays'        => 'Количе�тво дней, за которые показывать �вежие правки:',
-'recentchangescount'       => 'Количе�тво правок, отображаемое в �пи�ках и журналах:',
-'savedprefs'               => 'Ваши на�тройки �охранены.',
-'timezonelegend'           => 'Ча�овой по��',
-'timezonetext'             => 'Введите �мещение (в ча�ах) вашего ме�тного времени
+'preferences'               => '�а�тройки',
+'mypreferences'             => '�а�тройки',
+'prefs-edits'               => 'Количе�тво правок:',
+'prefsnologin'              => 'Вы не пред�тавили�ь �и�теме',
+'prefsnologintext'          => 'Вы должны <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} пред�тавить�� �и�теме]</span>, чтобы измен�ть на�тройки уча�тника.',
+'prefsreset'                => 'Во��тановлены на�тройки по умолчанию.',
+'qbsettings'                => 'Панель навигации',
+'qbsettings-none'           => '�е показывать',
+'qbsettings-fixedleft'      => '�еподвижна� �лева',
+'qbsettings-fixedright'     => '�еподвижна� �права',
+'qbsettings-floatingleft'   => 'Плавающа� �лева',
+'qbsettings-floatingright'  => 'Плавающа� �права',
+'changepassword'            => 'Изменение парол�',
+'skin'                      => 'Оформление',
+'skin-preview'              => 'Предпро�мотр',
+'math'                      => 'Отображение формул',
+'dateformat'                => 'Формат даты',
+'datedefault'               => 'По умолчанию',
+'datetime'                  => 'Дата и врем�',
+'math_failure'              => '�евозможно разобрать выражение',
+'math_unknown_error'        => 'неизве�тна� ошибка',
+'math_unknown_function'     => 'неизве�тна� функци�',
+'math_lexing_error'         => 'лек�иче�ка� ошибка',
+'math_syntax_error'         => '�интак�иче�ка� ошибка',
+'math_image_error'          => 'Преобразование в PNG прошло � ошибкой; проверьте правильно�ть у�тановки latex, dvips, gs и convert',
+'math_bad_tmpdir'           => '�е удаёт�� �оздать или запи�ать во временный каталог математики',
+'math_bad_output'           => '�е удаёт�� �оздать или запи�ать в выходной каталог математики',
+'math_notexvc'              => 'Выполн�емый файл texvc не найден; См. math/README — �правку по на�тройке.',
+'prefs-personal'            => 'Личные данные',
+'prefs-rc'                  => 'Страница �вежих правок',
+'prefs-watchlist'           => 'Спи�ок наблюдени�',
+'prefs-watchlist-days'      => 'Мак�имальное чи�ло дней, отображаемых в �пи�ке наблюдени�:',
+'prefs-watchlist-days-max'  => '(не более 7 дней)',
+'prefs-watchlist-edits'     => 'Мак�имальное количе�тво правок, отображаемых в ра�ширенном �пи�ке наблюдени�:',
+'prefs-watchlist-edits-max' => '(не более 1000)',
+'prefs-misc'                => 'Другие на�тройки',
+'prefs-resetpass'           => 'Изменить пароль',
+'saveprefs'                 => 'Запи�ать',
+'resetprefs'                => 'Сбро�ить',
+'textboxsize'               => 'Редактирование',
+'prefs-edit-boxsize'        => 'Размер окна редактировани�.',
+'rows'                      => 'Строк:',
+'columns'                   => 'Столбцов:',
+'searchresultshead'         => 'Пои�к',
+'resultsperpage'            => 'Количе�тво найденных запи�ей на �траницу:',
+'contextlines'              => 'Количе�тво показываемых �трок дл� каждой найденной:',
+'contextchars'              => 'Количе�тво �имволов контек�та на �троку:',
+'stub-threshold'            => 'Порог дл� определени� оформлени� <a href="#" class="stub">��ылок на заготовки</a> (в байтах):',
+'recentchangesdays'         => 'Количе�тво дней, за которые показывать �вежие правки:',
+'recentchangesdays-max'     => '(не более $1 {{PLURAL:$1|дн�|дней|дней}})',
+'recentchangescount'        => 'Количе�тво правок, отображаемое �пи�ке �вежих правок, и�тори�х �траниц, журналах, по умолчанию:',
+'savedprefs'                => 'Ваши на�тройки �охранены.',
+'timezonelegend'            => 'Ча�овой по��',
+'timezonetext'              => 'Введите �мещение (в ча�ах) вашего ме�тного времени
 от времени �ервера (UTC — гринвич�кого).',
-'localtime'                => 'Ме�тное врем�',
-'timezoneoffset'           => 'Смещение¹',
-'servertime'               => 'Текущее врем� �ервера',
-'guesstimezone'            => 'Заполнить из браузера',
-'allowemail'               => 'Разрешить приём �лектронной почты от других уча�тников',
-'prefs-searchoptions'      => '�а�тройки пои�ка',
-'prefs-namespaces'         => 'Про�тран�тва имён',
-'defaultns'                => 'По умолчанию и�кать в �ледующих про�тран�твах имён:',
-'default'                  => 'по умолчанию',
-'files'                    => 'Файлы',
+'localtime'                 => 'Ме�тное врем�:',
+'timezoneselect'            => 'Ча�овой по��:',
+'timezoneuseserverdefault'  => 'И�пользовать на�тройки �ервера',
+'timezoneuseoffset'         => 'Иное (укажите �мещение)',
+'timezoneoffset'            => 'Смещение¹:',
+'servertime'                => 'Врем� �ервера:',
+'guesstimezone'             => 'Заполнить из браузера',
+'allowemail'                => 'Разрешить приём �лектронной почты от других уча�тников',
+'prefs-searchoptions'       => '�а�тройки пои�ка',
+'prefs-namespaces'          => 'Про�тран�тва имён',
+'defaultns'                 => 'По умолчанию и�кать в �ледующих про�тран�твах имён:',
+'default'                   => 'по умолчанию',
+'files'                     => 'Файлы',
 
 # User rights
 'userrights'                  => 'Управление правами уча�тников', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Управление группами уча�тников',
 'userrights-user-editname'    => 'Введите им� уча�тника:',
 'editusergroup'               => 'Изменить группы уча�тника',
-'editinguser'                 => "Изменение прав уча�тника '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Изменение прав уча�тника '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Изменить группы уча�тника',
 'saveusergroups'              => 'Сохранить группы уча�тника',
 'userrights-groupsmember'     => 'Член групп:',
@@ -1170,6 +1279,8 @@ $3 указал �ледующую причину: ''$2''",
 'right-minoredit'            => 'про�тановка отметки «малое изменение»',
 'right-move'                 => 'переименование �траниц',
 'right-move-subpages'        => 'переименовывать �траницы � их под�траницами',
+'right-move-rootuserpages'   => 'переименование корневых �траниц уча�тников',
+'right-movefile'             => 'переименовывать файлы',
 'right-suppressredirect'     => 'не �оздаёт�� перенаправление �о �тарого имени при переименовании �траницы',
 'right-upload'               => 'загрузка файлов',
 'right-reupload'             => 'запи�ь файлов поверх �уще�твующих',
@@ -1220,9 +1331,46 @@ $3 указал �ледующую причину: ''$2''",
 'rightslogentry' => 'изменил член�тво в группах дл� $1 � $2 на $3',
 'rightsnone'     => '(нет)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'чтение �той �траницы',
+'action-edit'                 => 'и�правление �той �траницы',
+'action-createpage'           => '�оздание �траниц',
+'action-createtalk'           => '�оздание �траниц об�уждений',
+'action-createaccount'        => '�оздание �той учётной запи�и уча�тника',
+'action-minoredit'            => 'отметка �той правки как малой',
+'action-move'                 => 'переименование �той �траницы',
+'action-move-subpages'        => 'переименование �той �траницы �о в�еми её под�траницами',
+'action-move-rootuserpages'   => 'переименовывать корневые �траницы уча�тников',
+'action-movefile'             => 'переименовать �тот файл',
+'action-upload'               => 'загрузка �того файла',
+'action-reupload'             => 'перезапи�ь �уще�твующего файла',
+'action-reupload-shared'      => 'перекрытие файла из общего хранилища',
+'action-upload_by_url'        => 'загрузка �того файла � адре�а URL',
+'action-writeapi'             => 'и�пользование API дл� правок',
+'action-delete'               => 'удаление �той �траницы',
+'action-deleterevision'       => 'удаление �той вер�ии �траницы',
+'action-deletedhistory'       => 'про�мотр удалённой и�тории �той �траницы',
+'action-browsearchive'        => 'пои�к удалённых �траниц',
+'action-undelete'             => 'во��тановление �той �траницы',
+'action-suppressrevision'     => 'про�мотр и во��тановление �той �крытой вер�ии �траницы',
+'action-suppressionlog'       => 'про�мотр �того ча�тного журнала',
+'action-block'                => 'блокировка уча�тника, запрещение ему делать правки',
+'action-protect'              => 'изменение уровн� защиты �той �траницы',
+'action-import'               => 'импорт �той �траницы из другой вики',
+'action-importupload'         => 'импорт �той �траницы из загруженного файла',
+'action-patrol'               => 'отметка чужих правок как отпатрулированных',
+'action-autopatrol'           => 'отметка �воих правок как отпатрулированных',
+'action-unwatchedpages'       => 'про�мотр �пи�ок �траниц, за которыми никто не наблюдает',
+'action-trackback'            => 'отправка trackback',
+'action-mergehistory'         => 'при�оединение и�тории изменений �той �траницы',
+'action-userrights'           => 'изменение в�ех прав уча�тника',
+'action-userrights-interwiki' => 'изменение прав уча�тников в других вики',
+'action-siteadmin'            => 'блокировка и разблокировка базы данных',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|изменение|изменени�|изменений}}',
 'recentchanges'                     => 'Свежие правки',
+'recentchanges-legend'              => '�а�тройки �вежих правок',
 'recentchangestext'                 => '�иже в хронологиче�ком пор�дке перечи�лены по�ледние изменени� на �траницах {{grammar:genitive|{{SITENAME}}}}.',
 'recentchanges-feed-description'    => 'От�леживать по�ледние изменени� в вики в �том потоке.',
 'rcnote'                            => "{{PLURAL:$1|По�леднее '''$1''' изменение|По�ледние '''$1''' изменени�|По�ледние '''$1''' изменений}} за '''$2''' {{PLURAL:$2|день|дн�|дней}}, на момент времени $5 $4.",
@@ -1246,6 +1394,8 @@ $3 указал �ледующую причину: ''$2''",
 'rc_categories'                     => 'Только из категорий (разделитель «|»)',
 'rc_categories_any'                 => 'Любой',
 'newsectionsummary'                 => '/* $1 */ �ова� тема',
+'rc-enhanced-expand'                => 'Показать подробно�ти (и�пользует�� JavaScript)',
+'rc-enhanced-hide'                  => 'Скрыть подробно�ти',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Св�занные правки',
@@ -1268,11 +1418,11 @@ $3 указал �ледующую причину: ''$2''",
 'upload_directory_read_only'  => 'Веб-�ервер не имеет прав запи�и в папку ($1), в которой предполагает�� хранить загружаемые файлы.',
 'uploaderror'                 => 'Ошибка загрузки файла',
 'uploadtext'                  => "И�пользу� �ту форму вы можете загрузить на �ервер файлы.
-Чтобы про�мотреть ранее загруженные файлы, обратите�ь к [[Special:ImageList|�пи�ку загруженных файлов]]. Загрузка файлов также запи�ывает�� в [[Special:Log/upload|журнал загрузок]], удалени� файлов запи�ывают�� в [[Special:Log/delete|журнал удалений]].
+Чтобы про�мотреть ранее загруженные файлы, обратите�ь к [[Special:FileList|�пи�ку загруженных файлов]]. Загрузка файлов также запи�ывает�� в [[Special:Log/upload|журнал загрузок]], удалени� файлов запи�ывают�� в [[Special:Log/delete|журнал удалений]].
 
 Дл� включени� файла в �татью вы можете и�пользовать �троки вида:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' дл� в�тавки полной вер�ии файла;
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|опи�ание]]</nowiki></tt>''' дл� в�тавки уменьшенной до 200 пик�елей по ширине вер�ии файла �лева от тек�та � выводом под ним указанного опи�ани�;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' дл� в�тавки полной вер�ии файла;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|опи�ание]]</nowiki></tt>''' дл� в�тавки уменьшенной до 200 пик�елей по ширине вер�ии файла �лева от тек�та � выводом под ним указанного опи�ани�;
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' дл� в�тавки ��ылки на файл, без отображени� его �одержимого на �транице.",
 'upload-permitted'            => 'Разрешённые типы файлов: $1.',
 'upload-preferred'            => 'Предпочтительные типы файлов: $1.',
@@ -1280,7 +1430,7 @@ $3 указал �ледующую причину: ''$2''",
 'uploadlog'                   => 'журнал загрузок',
 'uploadlogpage'               => 'Журнал загрузок',
 'uploadlogpagetext'           => '�иже пред�тавлен �пи�ок по�ледних загрузок файлов.
-См. также [[Special:NewImages|галерею новых файлов]], где �ведени� о новых загрузках пред�тавлены в более нагл�дном виде.',
+См. также [[Special:NewFiles|галерею новых файлов]], где �ведени� о новых загрузках пред�тавлены в более нагл�дном виде.',
 'filename'                    => 'Им� файла',
 'filedesc'                    => 'Краткое опи�ание',
 'fileuploadsummary'           => 'Краткое опи�ание:',
@@ -1302,26 +1452,28 @@ $3 указал �ледующую причину: ''$2''",
 'large-file'                  => 'Рекомендует�� и�пользовать изображени�, размер которых не превышает $1 байт (размер загруженного файла �о�тавл�ет $2 байт).',
 'largefileserver'             => 'Размер файла превышает мак�имально разрешённый.',
 'emptyfile'                   => 'Загруженный вами файл веро�тно пу�той. Возможно, �то произошло из-за ошибки при наборе имени файла. Пожалуй�та, проверьте, дей�твительно ли вы хотите загрузить �тот файл.',
-'fileexists'                  => 'Файл � �тим именем уже �уще�твует, пожалуй�та, проверьте <strong><tt>$1</tt></strong>, е�ли вы не уверены, что хотите заменить его.',
-'filepageexists'              => 'Страница опи�ани� дл� �того файла уже �оздана как <strong><tt>$1</tt></strong>, но файла � таким именем нет. Введённое опи�ание не по�вит�� на �транице опи�ани� изображени�. Чтобы добавить новое опи�ание, вам придёт�� изменить его вручную.',
-'fileexists-extension'        => 'Суще�твует файл � похожим именем:<br />
-Им� загруженного файла: <strong><tt>$1</tt></strong><br />
-Им� �уще�твующего файла: <strong><tt>$2</tt></strong><br />
-Пожалуй�та, выберите другое им�.',
+'fileexists'                  => "Файл � �тим именем уже �уще�твует, пожалуй�та, проверьте '''<tt>$1</tt>''', е�ли вы не уверены, что хотите заменить его.",
+'filepageexists'              => "Страница опи�ани� дл� �того файла уже �оздана как '''<tt>$1</tt>''', но файла � таким именем нет. Введённое опи�ание не по�вит�� на �транице опи�ани� изображени�. Чтобы добавить новое опи�ание, вам придёт�� изменить его вручную.",
+'fileexists-extension'        => "Суще�твует файл � похожим именем:<br />
+Им� загруженного файла: '''<tt>$1</tt>'''<br />
+Им� �уще�твующего файла: '''<tt>$2</tt>'''<br />
+Пожалуй�та, выберите другое им�.",
 'fileexists-thumb'            => "<center>'''Суще�твующее изображение'''</center>",
-'fileexists-thumbnail-yes'    => 'Файл, веро�тно, �вл�ет�� уменьшенной копией (миниатюрой). Пожалуй�та, проверьте файл <strong><tt>$1</tt></strong>.<br />
-Е�ли указанный файл �вл�ет�� тем же изображением, не �тоит загружать отдельно его уменьшенную копию.',
-'file-thumbnail-no'           => '�азвание файла начинает�� � <strong><tt>$1</tt></strong>.
-Веро�тно, �то уменьшенна� копи� изображени� <i>(миниатюра)</i>.
-Е�ли у ва� е�ть данное изображение в полном размере, пожалуй�та, загрузите его или измените им� файла.',
-'fileexists-forbidden'        => 'Файл � �тим именем уже �уще�твует; пожалуй�та, верните�ь назад и загрузите файл под другим именем. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Файл, веро�тно, �вл�ет�� уменьшенной копией (миниатюрой). Пожалуй�та, проверьте файл '''<tt>$1</tt>'''.<br />
+Е�ли указанный файл �вл�ет�� тем же изображением, не �тоит загружать отдельно его уменьшенную копию.",
+'file-thumbnail-no'           => "�азвание файла начинает�� � '''<tt>$1</tt>'''.
+Веро�тно, �то уменьшенна� копи� изображени� ''(миниатюра)''.
+Е�ли у ва� е�ть данное изображение в полном размере, пожалуй�та, загрузите его или измените им� файла.",
+'fileexists-forbidden'        => 'Файл � �тим именем уже �уще�твует и не может быть перезапи�ан.
+Е�ли в�ё равно хотите загрузить данный файл, пожалуй�та, верните�ь назад и загрузите его под другим именем. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Файл � �тим именем уже �уще�твует в общем хранилище файлов.
-Е�ли вы в�ё-таки хотите загрузить �тот файл, пожалуй�та, верните�ь назад и измените им� файла. [[Image:$1|thumb|center|$1]]',
+Е�ли вы в�ё-таки хотите загрузить �тот файл, пожалуй�та, верните�ь назад и измените им� файла. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Этот файл �вл�ет�� дубликатом {{PLURAL:$1|�ледующего файла|�ледующих файлов}}:',
+'file-deleted-duplicate'      => 'Подобный файл ([[$1]]) уже удал�л��. Пожалуй�та, ознакомьте�ь � и�торией удалени� файла, прежде чем загружать его �нова.',
 'successfulupload'            => 'Загрузка у�пешно завершена',
 'uploadwarning'               => 'Предупреждение',
 'savefile'                    => 'Запи�ать файл',
-'uploadedimage'               => 'загружено «[[$1]]»',
+'uploadedimage'               => 'загрузил «[[$1]]»',
 'overwroteimage'              => 'загружена нова� вер�и� «[[$1]]»',
 'uploaddisabled'              => 'Загрузка запрещена',
 'uploaddisabledtext'          => 'Загрузка файлов отключена.',
@@ -1329,7 +1481,7 @@ $3 указал �ледующую причину: ''$2''",
 'uploadcorrupt'               => 'Файл либо повреждён, либо имеет неверное ра�ширение. Пожалуй�та, проверьте файл и попробуйте загрузить его ещё раз.',
 'uploadvirus'                 => 'Файл �одержит виру�! См. $1',
 'sourcefilename'              => 'И�ходное им� файла:',
-'destfilename'                => 'Целевое им� файла:',
+'destfilename'                => '�овое им� файла:',
 'upload-maxfilesize'          => 'Мак�имальный размер файла: $1',
 'watchthisupload'             => 'Включить �тот файл в �пи�ок наблюдени�',
 'filewasdeleted'              => 'Файл � таким именем уже �уще�твовал ранее, но был удалён. Пожалуй�та, проверьте $1 перед повторной загрузкой.',
@@ -1337,7 +1489,7 @@ $3 указал �ледующую причину: ''$2''",
 
 Проверьте, дей�твительно ли вам нужно загружать �тот файл.
 �иже приведён журнал удалений:",
-'filename-bad-prefix'         => 'Им� загружаемого файла начинает�� � <strong>«$1»</strong> и веро�тно �вл�ет�� шаблонным именем, которое цифрова� фотокамера даёт �нимкам. Пожалуй�та, выберите им� лучше опи�ывающее �одержание файла.',
+'filename-bad-prefix'         => "Им� загружаемого файла начинает�� � '''«$1»''' и веро�тно �вл�ет�� шаблонным именем, которое цифрова� фотокамера даёт �нимкам. Пожалуй�та, выберите им� лучше опи�ывающее �одержание файла.",
 'filename-prefix-blacklist'   => ' #<!-- о�тавьте �ту �трочку как е�ть --> <pre>
 # Синтак�и� �ледующий:
 #   * В�ё, что начинает�� � �имвола «#» �читает�� комментарием (до конца �троки)
@@ -1372,20 +1524,21 @@ PICT # различные
 'upload_source_url'  => ' (правильный, публично до�тупный интернет-адре�)',
 'upload_source_file' => ' (файл на вашем компьютере)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Эта �лужебна� �траница показывает в�е загруженные файлы.
+# Special:ListFiles
+'listfiles-summary'     => 'Эта �лужебна� �траница показывает в�е загруженные файлы.
 �едавно загруженные файлы по умолчанию показывают�� в верху �пи�ка.
 Щелчок на заголовке колонки измен�ет пор�док �ортировки.',
-'imagelist_search_for'  => 'Пои�к по имени изображени�:',
+'listfiles_search_for'  => 'Пои�к по имени изображени�:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Спи�ок файлов',
-'imagelist_date'        => 'Дата',
-'imagelist_name'        => 'Им� файла',
-'imagelist_user'        => 'Уча�тник',
-'imagelist_size'        => 'Размер',
-'imagelist_description' => 'Опи�ание',
-
-# Image description page
+'listfiles'             => 'Спи�ок файлов',
+'listfiles_date'        => 'Дата',
+'listfiles_name'        => 'Им� файла',
+'listfiles_user'        => 'Уча�тник',
+'listfiles_size'        => 'Размер',
+'listfiles_description' => 'Опи�ание',
+'listfiles_count'       => 'Вер�ий',
+
+# File description page
 'filehist'                       => 'И�тори� файла',
 'filehist-help'                  => '�ажмите на дату/врем�, чтобы про�мотреть, как тогда выгл�дел файл.',
 'filehist-deleteall'             => 'удалить в�е',
@@ -1393,19 +1546,25 @@ PICT # различные
 'filehist-revert'                => 'вернуть',
 'filehist-current'               => 'текущий',
 'filehist-datetime'              => 'Дата/врем�',
+'filehist-thumb'                 => 'Миниатюра',
+'filehist-thumbtext'             => 'Миниатюра дл� вер�ии от $1',
+'filehist-nothumb'               => '�ет миниатюры',
 'filehist-user'                  => 'Уча�тник',
 'filehist-dimensions'            => 'Размер объекта',
 'filehist-filesize'              => 'Размер файла',
 'filehist-comment'               => 'Примечание',
-'imagelinks'                     => 'С�ылки',
+'imagelinks'                     => 'С�ылки на файл',
 'linkstoimage'                   => '{{PLURAL:$1|Следующа� $1 �траница ��ылает��|Следующие $1 �траницы ��ылают��|Следующие $1 �траниц ��ылают��}} на данный файл:',
+'linkstoimage-more'              => 'Более $1 {{PLURAL:$1|�траницы|�траниц|�траниц}} ��ылают�� на �тот файл.
+В данном �пи�ке {{PLURAL:$1|пред�тавлена только $1 ��ылка|пред�тавлены только $1 ��ылки|пред�тавлены только $1 ��ылок}} на �тот файл.
+До�тупен также [[Special:WhatLinksHere/$2|полный �пи�ок]].',
 'nolinkstoimage'                 => '�ет �траниц, ��ылающих�� на данный файл.',
 'morelinkstoimage'               => 'Про�мотреть [[Special:WhatLinksHere/$1|о�тальные ��ылки]] на �тот файл.',
 'redirectstofile'                => 'Со {{PLURAL:$1|�ледующего $1 файла у�тановлено перенаправление|�ледующих $1 файлов у�тановлены перенаправлени�|�ледующих $1 файлов у�тановлены перенаправлени�}} на �тот файл:',
-'duplicatesoffile'               => '{{PLURAL:$1|Следующий $1 файл �вл�ет�� дубликатом|Следующие $1 файла �вл�ют�� дубликатами|Следующие $1 файлов �вл�ют�� дубликатами}} �того файла:',
+'duplicatesoffile'               => '{{PLURAL:$1|Следующий $1 файл �вл�ет�� дубликатом|Следующие $1 файла �вл�ют�� дубликатами|Следующие $1 файлов �вл�ют�� дубликатами}} �того файла ([[Special:FileDuplicateSearch/$2|подробно�ти]]):',
 'sharedupload'                   => 'Этот файл загружен в общее дл� не�кольких проектов хранилище.',
 'shareduploadwiki'               => 'Дополнительную информацию можно найти на $1.',
-'shareduploadwiki-desc'          => 'Содержимое его $1 из общего хранилища показано ниже.',
+'shareduploadwiki-desc'          => 'Содержимое его $1 показано ниже.',
 'shareduploadwiki-linktext'      => '�траницы опи�ани�',
 'shareduploadduplicate'          => 'Этот файл �вл�ет�� дубликатом $1 из общего хранилища.',
 'shareduploadduplicate-linktext' => 'другого файла',
@@ -1429,7 +1588,7 @@ PICT # различные
 # File deletion
 'filedelete'                  => '$1 — удаление',
 'filedelete-legend'           => 'Удалить файл',
-'filedelete-intro'            => "Вы удал�ете '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Вы �обираете�ь удалить файл '''[[Media:$1|$1]]''' �о в�ей его и�торией.",
 'filedelete-intro-old'        => '<span class="plainlinks">Вы удал�ете вер�ию \'\'\'[[Media:$1|$1]]\'\'\' от [$4 $3, $2].</span>',
 'filedelete-comment'          => 'Причина удалени�:',
 'filedelete-submit'           => 'Удалить',
@@ -1437,7 +1596,6 @@ PICT # различные
 'filedelete-success-old'      => "Вер�и� '''[[Media:$1|$1]]''' от $3 $2 была удалена.",
 'filedelete-nofile'           => "'''$1''' не �уще�твует.",
 'filedelete-nofile-old'       => "�е �уще�твует архивной вер�ии '''$1''' � указанными атрибутами.",
-'filedelete-iscurrent'        => 'Вы пытаете�ь удалить по�леднюю вер�ию �того файла. Пожалуй�та, верните �начала файл к одной из �тарых вер�ий.',
 'filedelete-otherreason'      => 'Друга� причина:',
 'filedelete-reason-otherlist' => 'Друга� причина',
 'filedelete-reason-dropdown'  => '* Ра�про�траненные причины удалени�
@@ -1465,27 +1623,31 @@ PICT # различные
 
 # Random page
 'randompage'         => 'Случайна� �тать�',
-'randompage-nopages' => 'В данном про�тран�тве имён от�ут�твуют �траницы.',
+'randompage-nopages' => 'В про�тран�тве имён «$1» от�ут�твуют �траницы.',
 
 # Random redirect
 'randomredirect'         => 'Случайное перенаправление',
-'randomredirect-nopages' => 'Это про�тран�тво имён не �одержит перенаправлений.',
+'randomredirect-nopages' => 'Про�тран�тво имён «$1» не �одержит перенаправлений.',
 
 # Statistics
-'statistics'             => 'Стати�тика',
-'sitestats'              => 'Стати�тика {{grammar:genitive|{{SITENAME}}}}',
-'userstats'              => 'Стати�тика уча�тников',
-'sitestatstext'          => "В�его в базе данных �одержит�� '''$1''' {{PLURAL:$1|�траница|�траницы|�траниц}}.
-Это чи�ло включает в �еб� �траницы о проекте, �траницы об�уждений, незаконченные �татьи, перенаправлени� и другие �траницы, которые, не учитывают�� при под�чёте количе�тва �татей.
-За и�ключением них, е�ть '''$2''' {{PLURAL:$2|�траница|�траницы|�траниц}}, которые �читают�� полноценными �тать�ми.
-
-{{PLURAL:$8|Был загружен|Было загружено|Было загружено}} '''$8''' {{PLURAL:$8|файл|файла|файлов}}.
-
-В�его � момента у�тановки вики {{PLURAL:$3|был произведён '''$3''' про�мотр|было произведено '''$3''' про�мотра|было произведено '''$3''' про�мотров}} �траниц и '''$4''' {{PLURAL:$4|изменение|изменени�|изменений}} �траниц. Таким образом, в �реднем приходит�� '''$5''' {{PLURAL:$5|изменение|изменени�|изменений}} на одну �траницу, и '''$6''' про�мотров на одно изменение.
-
-Величина [http://www.mediawiki.org/wiki/Manual:Job_queue очереди заданий] �о�тавл�ет '''$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Зареги�трировал��|Зареги�трировали�ь|Зареги�трировали�ь}} '''$1''' {{PLURAL:$1|уча�тник|уча�тника|уча�тников}}, из которых '''$2''' ($4 %) имеют права «$5».",
-'statistics-mostpopular' => '�аиболее ча�то про�матриваемые �траницы',
+'statistics'                   => 'Стати�тика',
+'statistics-header-pages'      => 'Стати�тика по �траницам',
+'statistics-header-edits'      => 'Стати�тика правок',
+'statistics-header-views'      => 'Стати�тика про�мотров',
+'statistics-header-users'      => 'Стати�тика по уча�тникам',
+'statistics-articles'          => 'Статей',
+'statistics-pages'             => 'Страниц',
+'statistics-pages-desc'        => 'В�е �траницы в вики, включа� �траницы об�уждени�, перенаправлени� и прочее.',
+'statistics-files'             => 'Загружено файлов',
+'statistics-edits'             => 'Чи�ло правок � момента у�тановки {{grammar:genitive|{{SITENAME}}}}',
+'statistics-edits-average'     => 'Среднее чи�ло правок на �траницу',
+'statistics-views-total'       => 'В�его про�мотров',
+'statistics-views-peredit'     => 'Про�мотров на правку',
+'statistics-jobqueue'          => 'Величина [http://www.mediawiki.org/wiki/Manual:Job_queue очереди заданий]',
+'statistics-users'             => 'Зареги�трированные [[Special:ListUsers|уча�тники]]',
+'statistics-users-active'      => '�ктивные уча�тники',
+'statistics-users-active-desc' => 'Уча�тники, �овершившие какое-либо дей�твие за {{PLURAL:$1|по�ледний $1 день|по�ледние $1 дн�|по�ледние $1 дней}}',
+'statistics-mostpopular'       => '�аиболее ча�то про�матриваемые �траницы',
 
 'disambiguations'      => 'Страницы �о ��ылками на многозначные термины',
 'disambiguationspage'  => 'Template:�еоднозначно�ть',
@@ -1499,7 +1661,7 @@ PICT # различные
 'double-redirect-fixer'      => 'И�правитель перенаправлений',
 
 'brokenredirects'        => 'Разорванные перенаправлени�',
-'brokenredirectstext'    => 'Следующие перенаправлени� указывают на не�уще�твующие �траницы.',
+'brokenredirectstext'    => 'Следующие перенаправлени� указывают на не�уще�твующие �траницы:',
 'brokenredirects-edit'   => '(править)',
 'brokenredirects-delete' => '(удалить)',
 
@@ -1529,26 +1691,30 @@ PICT # различные
 'popularpages'            => 'Попул�рные �траницы',
 'wantedcategories'        => 'Требуемые категории',
 'wantedpages'             => 'Требуемые �траницы',
-'missingfiles'            => 'От�ут�твующие файлы',
+'wantedfiles'             => 'Требуемые файлы',
+'wantedtemplates'         => 'Требуемые шаблоны',
 'mostlinked'              => 'Страницы, на которые больше в�его ��ылок',
 'mostlinkedcategories'    => 'Категории, на которые больше в�его ��ылок',
 'mostlinkedtemplates'     => 'Самые и�пользуемые шаблоны',
 'mostcategories'          => 'Страницы, включённые в большое количе�тво категорий',
 'mostimages'              => 'Самые и�пользуемые изображени�',
 'mostrevisions'           => '�аиболее ча�то редактировавшие�� �траницы',
-'prefixindex'             => 'Указатель по началу �лов',
+'prefixindex'             => 'Указатель по началу названий �траниц',
 'shortpages'              => 'Короткие �татьи',
 'longpages'               => 'Длинные �траницы',
 'deadendpages'            => 'Тупиковые �траницы',
 'deadendpagestext'        => 'Следующие �траницы не �одержат ��ылок на другие �траницы в �той вики.',
 'protectedpages'          => 'Защищённые �траницы',
 'protectedpages-indef'    => 'Только бе��рочные защиты',
+'protectedpages-cascade'  => 'Только ка�кадна� защита',
 'protectedpagestext'      => 'Следующие �траницы защищены от переименовани� или изменени�.',
 'protectedpagesempty'     => 'В на�то�щий момент нет защищённых �траниц � указанными параметрами',
 'protectedtitles'         => 'Запрещённые названи�',
 'protectedtitlestext'     => 'Следующие названи� не разрешает�� и�пользовать',
 'protectedtitlesempty'    => 'В на�то�щий момент нет запрещённых названий � указанными параметрами.',
 'listusers'               => 'Спи�ок уча�тников',
+'listusers-editsonly'     => 'Показать только тех уча�тников, кто �делал хот� бы одну правку',
+'usereditcount'           => '$1 {{PLURAL:$1|правка|правки|правок}}',
 'newpages'                => '�овые �траницы',
 'newpages-username'       => 'Уча�тник:',
 'ancientpages'            => 'Статьи по дате по�леднего редактировани�',
@@ -1569,14 +1735,13 @@ PICT # различные
 'booksources-search-legend' => 'Пои�к информации о книге',
 'booksources-go'            => '�айти',
 'booksources-text'          => '�а �той �транице приведён �пи�ок ��ылок на �айты, где вы, возможно, найдёте дополнительную информацию о книге. Это интернет-магазины и �и�темы пои�ка в библиотечных каталогах.',
+'booksources-invalid-isbn'  => 'Указанный номер ISBN, �уд� по в�ему, �одержит ошибку. Пожалуй�та, проверьте, что при перено�е номера из первои�точника не возникло и�кажений.',
 
 # Special:Log
 'specialloguserlabel'  => 'Уча�тник:',
 'speciallogtitlelabel' => 'Заголовок:',
 'log'                  => 'Журналы',
 'all-logs-page'        => 'В�е журналы',
-'log-search-legend'    => 'Пои�к журналов',
-'log-search-submit'    => '�айти',
 'alllogstext'          => 'Общий �пи�ок журналов �айта {{SITENAME}}.
 Вы можете отфильтровать результаты по типу журнала, имени уча�тника (учитывает�� реги�тр) или затронутой �транице (также учитывает�� реги�тр).',
 'logempty'             => 'Подход�щие запи�и в журнале от�ут�твуют.',
@@ -1588,6 +1753,7 @@ PICT # различные
 'nextpage'          => 'Следующа� �траница ($1)',
 'prevpage'          => 'Предыдуща� �траница ($1)',
 'allpagesfrom'      => 'Выве�ти �траницы, начинающие�� на:',
+'allpagesto'        => 'О�тановить вывод на:',
 'allarticles'       => 'В�е �траницы',
 'allinnamespace'    => 'В�е �траницы в про�тран�тве имён «$1»',
 'allnotinnamespace' => 'В�е �траницы (кроме про�тран�тва имён «$1»)',
@@ -1607,41 +1773,69 @@ PICT # различные
 'special-categories-sort-count' => 'упор�дочить по количе�тву',
 'special-categories-sort-abc'   => 'упор�дочить по алфавиту',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Удалённый вклад',
+
+# Special:LinkSearch
+'linksearch'       => 'Внешние ��ылки',
+'linksearch-pat'   => 'Шаблон дл� пои�ка:',
+'linksearch-ns'    => 'Про�тран�тво имён:',
+'linksearch-ok'    => '�айти',
+'linksearch-text'  => 'Можно и�пользовать под�тановочные �имволы, например, <code>*.wikipedia.org</code>.<br />
+Поддерживаемые протоколы: <tt>$1</tt>',
+'linksearch-line'  => 'С�ылка на $1 из $2',
+'linksearch-error' => 'Под�тановочные �имволы могут и�пользовать�� только в начале адре�ов.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Показать уча�тников, начина� �:',
 'listusers-submit'   => 'Показать',
 'listusers-noresult' => '�е найдено уча�тников.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Журнал реги�трации уча�тников',
+'newuserlogpagetext'          => 'Спи�ок недавно зареги�трировавших�� уча�тников',
+'newuserlog-byemail'          => 'пароль отправлен по �л. почте',
+'newuserlog-create-entry'     => '�овый уча�тник',
+'newuserlog-create2-entry'    => 'cоздал новую учётную запи�ь $1',
+'newuserlog-autocreate-entry' => 'Учётна� запи�ь �оздана автоматиче�ки',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Права групп уча�тников',
-'listgrouprights-summary'  => '�иже пред�тавлен �пи�ок определённых в �той вики групп уча�тников, указаны �оответ�твующие им права до�тупа.
+'listgrouprights'                 => 'Права групп уча�тников',
+'listgrouprights-summary'         => '�иже пред�тавлен �пи�ок определённых в �той вики групп уча�тников, указаны �оответ�твующие им права до�тупа.
 Возможно, �уще�твует [[{{MediaWiki:Listgrouprights-helppage}}|дополнительна� информаци�]] об индивидуальных правах.',
-'listgrouprights-group'    => 'Группа',
-'listgrouprights-rights'   => 'Права',
-'listgrouprights-helppage' => 'Help:Права групп',
-'listgrouprights-members'  => '(�пи�ок группы)',
+'listgrouprights-group'           => 'Группа',
+'listgrouprights-rights'          => 'Права',
+'listgrouprights-helppage'        => 'Help:Права групп',
+'listgrouprights-members'         => '(�пи�ок группы)',
+'listgrouprights-addgroup'        => 'может добавл�ть в {{PLURAL:$2|группу|группы}}: $1',
+'listgrouprights-removegroup'     => 'может и�ключать из {{PLURAL:$2|группы|групп}}: $1',
+'listgrouprights-addgroup-all'    => 'может добавл�ть во в�е группы',
+'listgrouprights-removegroup-all' => 'может и�ключать из в�ех групп',
 
 # E-mail user
-'mailnologin'     => '�дре� дл� отправки от�ут�твует',
-'mailnologintext' => 'Вы должны [[Special:UserLogin|пред�тавить�� �и�теме]] и иметь дей�твительный адре� �лектронной почты в ваших [[Special:Preferences|на�тройках]], чтобы иметь возможно�ть отправл�ть �лектронную почту другим уча�тникам.',
-'emailuser'       => 'Пи�ьмо уча�тнику',
-'emailpage'       => 'Пи�ьмо уча�тнику',
-'emailpagetext'   => 'С помощью данной формы можно отправить �ообщение на адре� �лектронной почты �того уча�тника.
+'mailnologin'      => '�дре� дл� отправки от�ут�твует',
+'mailnologintext'  => 'Вы должны [[Special:UserLogin|пред�тавить�� �и�теме]] и иметь дей�твительный адре� �лектронной почты в ваших [[Special:Preferences|на�тройках]], чтобы иметь возможно�ть отправл�ть �лектронную почту другим уча�тникам.',
+'emailuser'        => 'Пи�ьмо уча�тнику',
+'emailpage'        => 'Пи�ьмо уча�тнику',
+'emailpagetext'    => 'С помощью данной формы можно отправить �ообщение на адре� �лектронной почты �того уча�тника.
 В каче�тве обратного адре�а будет указан тот адре�, который вы указали в [[Special:Preferences|�воих на�тройках]], таким образом получатель будет иметь возможно�ть ответить непо�ред�твенно вам.',
-'usermailererror' => 'При отправке �ообщени� �лектронной почты произошла ошибка:',
-'defemailsubject' => 'Пи�ьмо из {{grammar:genitive|{{SITENAME}}}}',
-'noemailtitle'    => '�дре� �лектронной почты от�ут�твует',
-'noemailtext'     => 'Этот уча�тник не указал дей�твительный адре� �лектронной почты или указал, что не желает получать пи�ьма от других уча�тников.',
-'emailfrom'       => 'От кого:',
-'emailto'         => 'Кому:',
-'emailsubject'    => 'Тема:',
-'emailmessage'    => 'Сообщение:',
-'emailsend'       => 'Отправить',
-'emailccme'       => 'Отправить мне копию пи�ьма.',
-'emailccsubject'  => 'Копи� вашего �ообщени� дл� $1: $2',
-'emailsent'       => 'Пи�ьмо отправлено',
-'emailsenttext'   => 'Ваше �лектронное �ообщение отправлено.',
-'emailuserfooter' => 'Это пи�ьмо было отправлено уча�тнику $2 от уча�тника $1 � помощью функции «Отправить пи�ьмо» проекта {{SITENAME}}.',
+'usermailererror'  => 'При отправке �ообщени� �лектронной почты произошла ошибка:',
+'defemailsubject'  => 'Пи�ьмо из {{grammar:genitive|{{SITENAME}}}}',
+'noemailtitle'     => '�дре� �лектронной почты от�ут�твует',
+'noemailtext'      => 'Этот уча�тник не указал дей�твительный адре� �лектронной почты.',
+'nowikiemailtitle' => '�ет разрешени� отправл�ть пи�ьма',
+'nowikiemailtext'  => 'Этот уча�тник указал, что не желает получать пи�ьма от других уча�тников.',
+'email-legend'     => 'Отправить пи�ьмо другому уча�тнику {{grammar:genitive|{{SITENAME}}}}',
+'emailfrom'        => 'От кого:',
+'emailto'          => 'Кому:',
+'emailsubject'     => 'Тема:',
+'emailmessage'     => 'Сообщение:',
+'emailsend'        => 'Отправить',
+'emailccme'        => 'Отправить мне копию пи�ьма.',
+'emailccsubject'   => 'Копи� вашего �ообщени� дл� $1: $2',
+'emailsent'        => 'Пи�ьмо отправлено',
+'emailsenttext'    => 'Ваше �лектронное �ообщение отправлено.',
+'emailuserfooter'  => 'Это пи�ьмо было отправлено уча�тнику $2 от уча�тника $1 � помощью функции «Отправить пи�ьмо» проекта {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Спи�ок наблюдени�',
@@ -1672,12 +1866,7 @@ PICT # различные
 'iteminvalidname'      => 'Проблема � �лементом «$1», недопу�тимое название…',
 'wlnote'               => '�иже {{PLURAL:$1|�ледует по�леднее $1 изменение|�ледуют по�ледние $1 изменени�|�ледуют по�ледние $1 изменений}} за {{PLURAL:$2|по�ледний|по�ледние|по�ледние}} <strong>$2</strong> {{plural:$2|ча�|ча�а|ча�ов}}.',
 'wlshowlast'           => 'Показать за по�ледние $1 ча�ов $2 дней $3',
-'watchlist-show-bots'  => 'Показать правки ботов',
-'watchlist-hide-bots'  => 'Скрыть правки ботов',
-'watchlist-show-own'   => 'Показать мои правки',
-'watchlist-hide-own'   => 'Скрыть мои правки',
-'watchlist-show-minor' => 'Показать малые правки',
-'watchlist-hide-minor' => 'Скрыть малые правки',
+'watchlist-options'    => '�а�тройки �пи�ка наблюдени�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Добавление в �пи�ок наблюдени�…',
@@ -1716,83 +1905,102 @@ $NEWPAGE
 Обратна� �в�зь и помощь:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Удалить �траницу',
-'confirm'                     => 'Подтвердить',
-'excontent'                   => '�одержимое: «$1»',
-'excontentauthor'             => '�одержимое: «$1» (един�твенным автором был [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => '�одержимое до очи�тки: «$1»',
-'exblank'                     => '�траница была пу�та',
-'delete-confirm'              => '$1 — удаление',
-'delete-legend'               => 'Удаление',
-'historywarning'              => 'Предупреждение: у �траницы, которую вы �обираете�ь удалить, е�ть и�тори� изменений:',
-'confirmdeletetext'           => 'Вы запро�или полное удаление �траницы (или изображени�) и в�ей её и�тории изменений из базы данных.
+# Delete
+'deletepage'             => 'Удалить �траницу',
+'confirm'                => 'Подтвердить',
+'excontent'              => '�одержимое: «$1»',
+'excontentauthor'        => '�одержимое: «$1» (един�твенным автором был [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => '�одержимое до очи�тки: «$1»',
+'exblank'                => '�траница была пу�та',
+'delete-confirm'         => '$1 — удаление',
+'delete-legend'          => 'Удаление',
+'historywarning'         => 'Предупреждение: у �траницы, которую вы �обираете�ь удалить, е�ть и�тори� изменений:',
+'confirmdeletetext'      => 'Вы запро�или полное удаление �траницы (или изображени�) и в�ей её и�тории изменений из базы данных.
 Пожалуй�та, подтвердите, что вы дей�твительно желаете �то �делать, понимаете по�лед�тви� �воих дей�твий,
 и делаете �то в �оответ�твии � правилами, изложенными в разделе [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Дей�твие выполнено',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» была удалена.
+'actioncomplete'         => 'Дей�твие выполнено',
+'deletedtext'            => '«<nowiki>$1</nowiki>» была удалена.
 См. $2 дл� про�мотра �пи�ка по�ледних удалений.',
-'deletedarticle'              => 'удалил «[[$1]]»',
-'suppressedarticle'           => '�крыл «[[$1]]»',
-'dellogpage'                  => 'Журнал удалений',
-'dellogpagetext'              => '�иже приведён журнал по�ледних удалений.',
-'deletionlog'                 => 'журнал удалений',
-'reverted'                    => 'Откачено к ранней вер�ии',
-'deletecomment'               => 'Причина удалени�:',
-'deleteotherreason'           => 'Друга� причина/дополнение:',
-'deletereasonotherlist'       => 'Друга� причина',
-'deletereason-dropdown'       => '* Типовые причины удалени�
+'deletedarticle'         => 'удалил «[[$1]]»',
+'suppressedarticle'      => '�крыл «[[$1]]»',
+'dellogpage'             => 'Журнал удалений',
+'dellogpagetext'         => '�иже приведён журнал по�ледних удалений.',
+'deletionlog'            => 'журнал удалений',
+'reverted'               => 'Откачено к ранней вер�ии',
+'deletecomment'          => 'Причина удалени�:',
+'deleteotherreason'      => 'Друга� причина/дополнение:',
+'deletereasonotherlist'  => 'Друга� причина',
+'deletereason-dropdown'  => '* Типовые причины удалени�
 ** вандализм
 ** по запро�у автора
 ** нарушение автор�ких прав',
-'delete-edit-reasonlist'      => 'Править �пи�ок причин',
-'delete-toobig'               => 'У �той �траницы очень длинна� и�тори� изменений, более $1 {{PLURAL:$1|вер�ии|вер�ий|вер�ий}}.
+'delete-edit-reasonlist' => 'Править �пи�ок причин',
+'delete-toobig'          => 'У �той �траницы очень длинна� и�тори� изменений, более $1 {{PLURAL:$1|вер�ии|вер�ий|вер�ий}}.
 Удаление таких �траниц было запрещено во избежание нарушений в работе �айта {{SITENAME}}.',
-'delete-warning-toobig'       => 'У �той �траницы очень длинна� и�тори� изменений, более $1 {{PLURAL:$1|вер�ии|вер�ий|вер�ий}}.
+'delete-warning-toobig'  => 'У �той �траницы очень длинна� и�тори� изменений, более $1 {{PLURAL:$1|вер�ии|вер�ий|вер�ий}}.
 Её удаление может приве�ти к нарушению нормальной работы базы данных �айта {{SITENAME}};
 дей�твуйте � о�торожно�тью.',
-'rollback'                    => 'Откатить изменени�',
-'rollback_short'              => 'Откат',
-'rollbacklink'                => 'откатить',
-'rollbackfailed'              => 'Ошибка при �овершении отката',
-'cantrollback'                => '�евозможно откатить изменени�; по�ледний, кто вно�ил изменени�, �вл�ет�� един�твенным автором �той �траницы.',
-'alreadyrolled'               => '�евозможно откатить по�ледние изменени� [[:$1]], �деланные [[User:$2|$2]] ([[User talk:$2|Об�уждение]] | [[Special:Contributions/$2|{{int:contribslink}}]]);
+
+# Rollback
+'rollback'         => 'Откатить изменени�',
+'rollback_short'   => 'Откат',
+'rollbacklink'     => 'откатить',
+'rollbackfailed'   => 'Ошибка при �овершении отката',
+'cantrollback'     => '�евозможно откатить изменени�; по�ледний, кто вно�ил изменени�, �вл�ет�� един�твенным автором �той �траницы.',
+'alreadyrolled'    => '�евозможно откатить по�ледние изменени� [[:$1]], �деланные [[User:$2|$2]] ([[User talk:$2|Об�уждение]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
 кто-то другой уже отредактировал или откатил �ту �траницу.
 
-По�ледние изменени� внё� [[User:$3|$3]] ([[User talk:$3|Об�уждение]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Изменение было по��нено так: <i>«$1»</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Правки [[Special:Contributions/$2|$2]] ([[User talk:$2|об�уждение]]) откачены к вер�ии [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Откачены правки $1; возврат к вер�ии $2.',
-'sessionfailure'              => 'Похоже, возникли проблемы � текущим �еан�ом работы;
+По�ледние изменени� внё� [[User:$3|$3]] ([[User talk:$3|Об�уждение]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Изменение было по��нено как ''«$1»''.", # only shown if there is an edit comment
+'revertpage'       => 'Правки [[Special:Contributions/$2|$2]] ([[User talk:$2|об�уждение]]) откачены к вер�ии [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Откачены правки $1; возврат к вер�ии $2.',
+'sessionfailure'   => 'Похоже, возникли проблемы � текущим �еан�ом работы;
 �то дей�твие было отменено в цел�х предотвращени� «захвата �еан�а».
 Пожалуй�та, нажмите кнопку «�азад» и перезагрузите �траницу, � которой вы пришли.',
+
+# Protect
 'protectlogpage'              => 'Журнал защиты',
 'protectlogtext'              => '�иже приведён журнал у�тановок и �н�тий защиты �о �татей. Вы можете также про�мотреть [[Special:ProtectedPages|�пи�ок �траниц, которые в данный момент защищены]].',
 'protectedarticle'            => 'защищена �траница «[[$1]]»',
 'modifiedarticleprotection'   => 'изменён уровень защиты �траницы «[[$1]]»',
 'unprotectedarticle'          => '�н�та защита �о �траницы «[[$1]]»',
+'movedarticleprotection'      => 'перенё� на�тройки защиты � «[[$2]]» на «[[$1]]»',
 'protect-title'               => 'У�тановка уровн� защиты дл� «$1»',
+'prot_1movedto2'              => '«[[$1]]» переименована в «[[$2]]»',
 'protect-legend'              => 'Подтвердите у�тановку защиты �траницы',
 'protectcomment'              => 'Причина у�тановки защиты:',
 'protectexpiry'               => 'И�текает:',
 'protect_expiry_invalid'      => '�еправильное врем� окончани� защиты.',
 'protect_expiry_old'          => 'Врем� окончани� — в прошлом.',
 'protect-unchain'             => 'Разблокировать переименование �траницы',
-'protect-text'                => 'Зде�ь вы можете про�мотреть и изменить уровень защиты дл� �траницы <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Вы не можете измен�ть уровень защиты �траницы, пока ваша учётна� запи�ь заблокирована.
-Текущие у�тановки дл� �траницы <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Уровень защиты не может быть изменён, так как о�новна� база данных временно заблокирована.
-Текущие у�тановки дл� �траницы <strong>$1</strong>:',
-'protect-locked-access'       => 'У вашей учётной запи�и недо�таточно прав дл� изменени� уровн� защиты �траницы. Текущие у�тановки дл� �траницы <strong>$1</strong>:',
+'protect-text'                => "Зде�ь вы можете про�мотреть и изменить уровень защиты дл� �траницы '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Вы не можете измен�ть уровень защиты �траницы, пока ваша учётна� запи�ь заблокирована.
+Текущие у�тановки дл� �траницы '''$1''':",
+'protect-locked-dblock'       => "Уровень защиты не может быть изменён, так как о�новна� база данных временно заблокирована.
+Текущие у�тановки дл� �траницы '''$1''':",
+'protect-locked-access'       => "У вашей учётной запи�и недо�таточно прав дл� изменени� уровн� защиты �траницы. Текущие у�тановки дл� �траницы '''$1''':",
 'protect-cascadeon'           => 'Эта �траница защищена в �в�зи � тем, что она включена {{PLURAL:$1|в указанную ниже �траницу, на которую|в ниже�ледующие �траницы, на которые}} у�тановлена ка�кадна� защита. Вы можете изменить уровень защиты �той �траницы, но �то не повли�ет на ка�кадную защиту.',
-'protect-default'             => '(по умолчанию)',
+'protect-default'             => 'Без защиты',
 'protect-fallback'            => 'Требует�� разрешение «$1»',
-'protect-level-autoconfirmed' => 'Защитить от незареги�трированных и новых уча�тников',
+'protect-level-autoconfirmed' => 'Защитить от новых и незареги�трированных уча�тников',
 'protect-level-sysop'         => 'Только админи�траторы',
 'protect-summary-cascade'     => 'ка�кадна�',
 'protect-expiring'            => 'и�текает $1 (UTC)',
+'protect-expiry-indefinite'   => 'бе��рочно',
 'protect-cascade'             => 'Защищать �траницы, включённые в �ту �траницу (ка�кадна� защита)',
 'protect-cantedit'            => 'Вы не можете изменить уровень защиты �той �траницы, потому что у ва� нет прав дл� её редактировани�.',
+'protect-othertime'           => 'Другое врем�:',
+'protect-othertime-op'        => 'другое врем�',
+'protect-existing-expiry'     => 'Текущее врем� окончани�: $2, $3',
+'protect-otherreason'         => 'Друга� причина/дополнение:',
+'protect-otherreason-op'      => 'друга� причина',
+'protect-dropdown'            => '* Типовые причины защиты
+** за�длый вандализм
+** чрезмерный �пам
+** непродуктивна� война правок
+** попул�рна� �траница',
+'protect-edit-reasonlist'     => 'Править �пи�ок причин',
+'protect-expiry-options'      => '1 ча�:1 hour,1 день:1 day,1 недел�:1 week,2 недели:2 weeks,1 ме��ц:1 month,3 ме��ца:3 months,6 ме��цев:6 months,1 год:1 year,бе��рочно:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Права:',
 'restriction-level'           => 'Уровень до�тупа:',
 'minimum-size'                => 'Минимальный размер',
@@ -1815,7 +2023,8 @@ $NEWPAGE
 'undeletepage'                 => 'Про�мотр и во��тановление удалённых �траниц',
 'undeletepagetitle'            => "'''�иже перечи�лены удалённые вер�ии �траницы [[:$1]]'''.",
 'viewdeletedpage'              => 'Про�мотреть удалённые �траницы',
-'undeletepagetext'             => 'Следующие �траницы были удалены, однако они в�ё ещё наход�т�� в архиве, и по�тому могут быть во��тановлены. �рхив периодиче�ки очищает��.',
+'undeletepagetext'             => '{{PLURAL:$1|Следующа� $1 �траница была удалена|Следующие $1 �траницы были удалены|Следующие $1 �траниц были удалены}}, однако {{PLURAL:$1|она в�ё ещё наход�т�� в архиве, и по�тому может быть во��тановлена|они в�ё ещё наход�т�� в архиве, и по�тому могут быть во��тановлены}}.
+�рхив может периодиче�ки очищать��.',
 'undelete-fieldset-title'      => 'Во��тановить вер�ии',
 'undeleteextrahelp'            => "Дл� полного во��тановлени� и�тории �траницы о�тавьте в�е отметки пу�тыми и нажмите '''«Во��тановить»'''.
 Дл� ча�тичного во��тановлени� отметьте те вер�ии �траницы, которые нужно во��тановить, и нажмите '''«Во��тановить»'''.
@@ -1826,12 +2035,13 @@ $NEWPAGE
 'undeleterevdel'               => 'Во��тановление не будет произведено, е�ли оно приведёт к ча�тичному удалению по�ледней вер�ии �траницы или файла.
 В подобном �лучае вы должны �н�ть отметку или показать по�ледние удалённые вер�ии.',
 'undeletehistorynoadmin'       => 'Стать� была удалена. Причина удалени� и �пи�ок уча�тников, редактировавших �татью до её удалени�, показаны ниже. Тек�т удалённой �татьи могут про�мотреть только админи�траторы.',
-'undelete-revision'            => 'Удалённа� вер�и� $1 (от $2) уча�тника $3:',
+'undelete-revision'            => 'Удалённа� вер�и� $1 (от $4 $5) уча�тника $3:',
 'undeleterevision-missing'     => '�еверна� или от�ут�твующа� вер�и�. Возможно, вы перешли по неправильной ��ылке, либо вер�и� могла быть удалена из архива.',
 'undelete-nodiff'              => '�е найдено предыдущей вер�ии.',
 'undeletebtn'                  => 'Во��тановить',
 'undeletelink'                 => 'во��тановить',
 'undeletereset'                => 'Очи�тить',
+'undeleteinvert'               => 'Обратить выделение',
 'undeletecomment'              => 'Комментарий:',
 'undeletedarticle'             => 'во��тановил «[[$1]]»',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|изменение|изменени�|изменений}} во��тановлено',
@@ -1863,26 +2073,27 @@ $1',
 'blanknamespace' => '(О�новное)',
 
 # Contributions
-'contributions' => 'Вклад уча�тника',
-'mycontris'     => 'Мой вклад',
-'contribsub2'   => 'Вклад $1 ($2)',
-'nocontribs'    => 'Изменений, �оответ�твующих заданным у�лови�м, найдено не было.',
-'uctop'         => ' (по�ледн��)',
-'month'         => 'С ме��ца (и ранее):',
-'year'          => 'С года (и ранее):',
-
-'sp-contributions-newbies'     => 'Показать только вклад, �деланный � новых учётных запи�ей',
-'sp-contributions-newbies-sub' => 'С новых учётных запи�ей',
-'sp-contributions-blocklog'    => 'Журнал блокировок',
-'sp-contributions-search'      => 'Пои�к вклада',
-'sp-contributions-username'    => 'IP-адре� или им� уча�тника:',
-'sp-contributions-submit'      => '�айти',
+'contributions'       => 'Вклад уча�тника',
+'contributions-title' => 'Вклад уча�тника $1',
+'mycontris'           => 'Мой вклад',
+'contribsub2'         => 'Вклад $1 ($2)',
+'nocontribs'          => 'Изменений, �оответ�твующих заданным у�лови�м, найдено не было.',
+'uctop'               => ' (по�ледн��)',
+'month'               => 'С ме��ца (и ранее):',
+'year'                => 'С года (и ранее):',
+
+'sp-contributions-newbies'       => 'Показать только вклад, �деланный � новых учётных запи�ей',
+'sp-contributions-newbies-sub'   => 'С новых учётных запи�ей',
+'sp-contributions-newbies-title' => 'Вклад � недавно �озданных учётных запи�ей',
+'sp-contributions-blocklog'      => 'Журнал блокировок',
+'sp-contributions-search'        => 'Пои�к вклада',
+'sp-contributions-username'      => 'IP-адре� или им� уча�тника:',
+'sp-contributions-submit'        => '�айти',
 
 # What links here
 'whatlinkshere'            => 'С�ылки �юда',
 'whatlinkshere-title'      => 'Страницы, ��ылающие�� на «$1»',
 'whatlinkshere-page'       => 'Страница:',
-'linklistsub'              => '(Спи�ок ��ылок)',
 'linkshere'                => "Следующие �траницы ��ылают�� на '''[[:$1]]''':",
 'nolinkshere'              => "�а �траницу '''[[:$1]]''' от�ут�твуют ��ылки � других �траниц.",
 'nolinkshere-ns'           => "В выбранном про�тран�тве имён нет �траниц, ��ылающих�� на '''[[:$1]]'''.",
@@ -1929,6 +2140,8 @@ $1',
 'ipbotherreason'                  => 'Друга� причина/дополнение:',
 'ipbhidename'                     => 'Скрыть им� уча�тника или IP-адре� из журнала блокировок, �пи�ка заблокированных и общего �пи�ка уча�тников.',
 'ipbwatchuser'                    => 'Добавить в �пи�ок наблюдени� личную �траницу уча�тника и его �траницу об�уждени�',
+'ipballowusertalk'                => 'Разрешить уча�тнику править �вою �траницу об�уждени� во врем� блокировки',
+'ipb-change-block'                => 'Переблокировать уча�тника � �тими на�тройками',
 'badipaddress'                    => 'IP-адре� запи�ан в неправильном формате, или уча�тника � таким именем не �уще�твует.',
 'blockipsuccesssub'               => 'Блокировка произведена',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|«$1»]] заблокирован.<br />
@@ -1938,14 +2151,18 @@ $1',
 'ipb-unblock'                     => 'Разблокировать уча�тника или IP-адре�',
 'ipb-blocklist-addr'              => 'Дей�твующие блокировки дл� $1',
 'ipb-blocklist'                   => 'Показать дей�твующие блокировки',
+'ipb-blocklist-contribs'          => 'Вклад уча�тника $1',
 'unblockip'                       => 'Разблокировать IP-адре�',
 'unblockiptext'                   => 'И�пользуйте форму ниже, чтобы во��тановить возможно�ть запи�и � ранее заблокированного IP-адре�а или учётной запи�и.',
-'ipusubmit'                       => 'Разблокировать �тот адре�',
+'ipusubmit'                       => 'Сн�ть �ту блокировку',
 'unblocked'                       => '[[User:$1|$1]] разблокирован.',
 'unblocked-id'                    => 'Блокировка $1 была �н�та',
 'ipblocklist'                     => 'Заблокированные IP-адре�а и учётные запи�и',
 'ipblocklist-legend'              => 'Пои�к заблокированного уча�тника',
 'ipblocklist-username'            => 'Им� уча�тника или IP-адре�:',
+'ipblocklist-sh-userblocks'       => '$1 блокировки учётных запи�ей',
+'ipblocklist-sh-tempblocks'       => '$1 временные блокировки',
+'ipblocklist-sh-addressblocks'    => '$1 блокировки отдельных IP',
 'ipblocklist-submit'              => '�айти',
 'blocklistline'                   => '$1, $2 заблокировал $3 ($4)',
 'infiniteblock'                   => 'бе��рочна� блокировка',
@@ -1954,14 +2171,18 @@ $1',
 'noautoblockblock'                => 'автоблокировка отключена',
 'createaccountblock'              => '�оздание учётных запи�ей заблокировано',
 'emailblock'                      => 'отправка пи�ем запрещена',
+'blocklist-nousertalk'            => 'не может править �вою �траницу об�уждени�',
 'ipblocklist-empty'               => 'Спи�ок блокировок пу�т.',
 'ipblocklist-no-results'          => 'Заданный IP-адре� или им� уча�тника не заблокированы.',
 'blocklink'                       => 'заблокировать',
 'unblocklink'                     => 'разблокировать',
+'change-blocklink'                => 'изменить блокировку',
 'contribslink'                    => 'вклад',
 'autoblocker'                     => '�втоблокировка из-за �овпадени� вашего IP-адре�а � $1. Причина блокировки адре�а — «$2».',
 'blocklogpage'                    => 'Журнал блокировок',
+'blocklog-fulllog'                => 'Ве�ь журнал блокировок',
 'blocklogentry'                   => 'заблокировал [[$1]] на период $2 $3',
+'reblock-logentry'                => 'изменил на�тройки блокировки дл� [[$1]], и�текает $2 $3',
 'blocklogtext'                    => 'Журнал блокировани� и разблокировани� уча�тников.
 �втоматиче�ки блокируемые IP-адре�а зде�ь не указывают��.
 См. [[Special:IPBlockList|Спи�ок текущих запретов и блокировок]].',
@@ -1970,11 +2191,14 @@ $1',
 'block-log-flags-nocreate'        => 'запрещена реги�траци� учётных запи�ей',
 'block-log-flags-noautoblock'     => 'автоблокировка отключена',
 'block-log-flags-noemail'         => 'отправка пи�ем запрещена',
+'block-log-flags-nousertalk'      => 'не может править �вою �траницу об�уждени�',
 'block-log-flags-angry-autoblock' => 'включён ра�ширенный автоблок',
 'range_block_disabled'            => '�дмини�траторам запрещено блокировать диапазоны.',
 'ipb_expiry_invalid'              => '�едопу�тимый период дей�тви�.',
 'ipb_expiry_temp'                 => 'Блокировки � �окрытием имени уча�тника должны быть бе��рочными.',
 'ipb_already_blocked'             => '«$1» уже заблокирован.',
+'ipb-needreblock'                 => '== Уже заблокирован ==
+Уча�тник $1 уже заблокирован. Желаете ли вы изменить параметры блокировки?',
 'ipb_cant_unblock'                => 'Ошибка. �е найдена блокировка � ID $1. Возможно, она уже была �н�та.',
 'ipb_blocked_as_range'            => 'Ошибка: IP-адре� $1 был заблокирован не напр�мую и не может быть разблокирован. Однако, он принадлежит к заблокированному диапазону $2, который можно разблокировать.',
 'ip_range_invalid'                => '�едопу�тимый диапазон IP-адре�ов.',
@@ -1985,6 +2209,7 @@ $1',
 'proxyblocksuccess'               => 'Выполнено.',
 'sorbsreason'                     => 'Ваш IP-адре� чи�лит�� как открытый прок�и в DNSBL.',
 'sorbs_create_account_reason'     => 'Ваш IP-адре� чи�лит�� как открытый прок�и в DNSBL. Вы не можете �оздать учётную запи�ь.',
+'cant-block-while-blocked'        => 'Вы не можете блокировать других уча�тников, пока вы �ами заблокированы.',
 
 # Developer tools
 'lockdb'              => 'Сделать базу данных до�тупной только дл� чтени�',
@@ -2011,9 +2236,9 @@ $1',
 'databasenotlocked'   => 'База данных не была заблокирована.',
 
 # Move page
-'move-page'               => '$1 — переименование',
-'move-page-legend'        => 'Переименование �траницы',
-'movepagetext'            => "Во�пользовавши�ь формой ниже, вы переименуете �траницу, одновременно переме�тив на новое ме�то её журнал изменений.
+'move-page'                    => '$1 — переименование',
+'move-page-legend'             => 'Переименование �траницы',
+'movepagetext'                 => "Во�пользовавши�ь формой ниже, вы переименуете �траницу, одновременно переме�тив на новое ме�то её журнал изменений.
 Старое название �танет перенаправлением на новое название.
 Вы можете автоматиче�ки обновить перенаправлени�, которые вели на �тарое название.
 Е�ли вы �того не �делаете, пожалуй�та, проверьте наличие [[Special:DoubleRedirects|двойных]] и [[Special:BrokenRedirects|разорванных перенаправлений]].
@@ -2025,49 +2250,63 @@ $1',
 '''ПРЕДУПРЕЖДЕ�ИЕ!'''
 Переименование может приве�ти к ма�штабным и неожиданным изменени�м дл� ''попул�рных'' �траниц.
 Пожалуй�та, прежде чем вы продолжите, убедите�ь, что вы понимаете в�е возможные по�лед�тви�.",
-'movepagetalktext'        => "При�оединённа� �траница об�уждени� будет также автоматиче�ки переименована, '''кроме �лучаев, когда:'''
+'movepagetalktext'             => "При�оединённа� �траница об�уждени� будет также автоматиче�ки переименована, '''кроме �лучаев, когда:'''
 
 *�е пу�та� �траница об�уждени� уже �уще�твует под таким же именем или
 *Вы не по�тавили галочку в поле ниже.
 
 В �тих �луча�х, вы будете вынуждены переме�тить или объединить �траницы вручную, е�ли �то нужно.",
-'movearticle'             => 'Переименовать �траницу',
-'movenotallowed'          => 'У ва� нет разрешени� переименовывать �траницы.',
-'newtitle'                => '�овое название',
-'move-watch'              => 'Включить �ту �траницу в �пи�ок наблюдени�',
-'movepagebtn'             => 'Переименовать �траницу',
-'pagemovedsub'            => 'Страница переименована',
-'movepage-moved'          => "<big>'''Страница «$1» переименована в «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Страница � таким именем уже �уще�твует или указанное вами название недопу�тимо.
+'movearticle'                  => 'Переименовать �траницу',
+'movenologin'                  => 'Вы не пред�тавили�ь �и�теме',
+'movenologintext'              => 'Вы должны [[Special:UserLogin|пред�тавить�� �и�теме]],
+чтобы иметь возможно�ть переименовать �траницы.',
+'movenotallowed'               => 'У ва� нет разрешени� переименовывать �траницы.',
+'movenotallowedfile'           => 'У ва� нет разрешени� переименовывать файлы.',
+'cant-move-user-page'          => 'У ва� нет разрешени� переименовывать о�новные �траницы уча�тников.',
+'cant-move-to-user-page'       => 'У ва� нет разрешени� преобразовывать какую-либо �траницу в �траницу в про�тран�тве уча�тника (за и�ключением под�траниц уча�тника).',
+'newtitle'                     => '�овое название',
+'move-watch'                   => 'Включить �ту �траницу в �пи�ок наблюдени�',
+'movepagebtn'                  => 'Переименовать �траницу',
+'pagemovedsub'                 => 'Страница переименована',
+'movepage-moved'               => "<big>'''Страница «$1» переименована в «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Было �оздано перенаправление.',
+'movepage-moved-noredirect'    => 'Создание перенаправлени� было запрещено.',
+'articleexists'                => 'Страница � таким именем уже �уще�твует или указанное вами название недопу�тимо.
 Пожалуй�та, выберите другое название.',
-'cantmove-titleprotected' => '�евозможно переименовать �траницу, так как новое название входит в �пи�ок запрещённых.',
-'talkexists'              => "'''Страница была переименована, но �траница об�уждени� не может быть переименована, потому что �траница � таким названием уже �уще�твует. Пожалуй�та, объедините их вручную.'''",
-'movedto'                 => 'переименована в',
-'movetalk'                => 'Переименовать �оответ�твующую �траницу об�уждени�',
-'move-subpages'           => 'Переименовать в�е под�траницы, е�ли возможно',
-'move-talk-subpages'      => 'Переименовать в�е под�траницы �траницы об�уждени�, е�ли �то возможно',
-'movepage-page-exists'    => 'Страница $1 уже �уще�твует и не может быть автоматиче�ки перезапи�ана.',
-'movepage-page-moved'     => 'Страница $1 была переименована в $2.',
-'movepage-page-unmoved'   => 'Страница $1 не может быть переименована в $2.',
-'movepage-max-pages'      => '$1 {{PLURAL:$1|�траница была переименована|�траницы было переименовано|�траниц было переименовано}} — �то мак�имум, больше �траниц нельз� переименовать автоматиче�ки.',
-'1movedto2'               => '«[[$1]]» переименована в «[[$2]]»',
-'1movedto2_redir'         => '«[[$1]]» переименована в «[[$2]]» поверх перенаправлени�',
-'movelogpage'             => 'Журнал переименований',
-'movelogpagetext'         => '�иже пред�тавлен �пи�ок переименованных �траниц.',
-'movereason'              => 'Причина',
-'revertmove'              => 'откат',
-'delete_and_move'         => 'Удалить и переименовать',
-'delete_and_move_text'    => '==Требует�� удаление==
+'cantmove-titleprotected'      => '�евозможно переименовать �траницу, так как новое название входит в �пи�ок запрещённых.',
+'talkexists'                   => "'''Страница была переименована, но �траница об�уждени� не может быть переименована, потому что �траница � таким названием уже �уще�твует. Пожалуй�та, объедините их вручную.'''",
+'movedto'                      => 'переименована в',
+'movetalk'                     => 'Переименовать �оответ�твующую �траницу об�уждени�',
+'move-subpages'                => 'Переименовать в�е под�траницы, е�ли возможно',
+'move-talk-subpages'           => 'Переименовать в�е под�траницы �траницы об�уждени�, е�ли �то возможно',
+'movepage-page-exists'         => 'Страница $1 уже �уще�твует и не может быть автоматиче�ки перезапи�ана.',
+'movepage-page-moved'          => 'Страница $1 была переименована в $2.',
+'movepage-page-unmoved'        => 'Страница $1 не может быть переименована в $2.',
+'movepage-max-pages'           => '$1 {{PLURAL:$1|�траница была переименована|�траницы было переименовано|�траниц было переименовано}} — �то мак�имум, больше �траниц нельз� переименовать автоматиче�ки.',
+'1movedto2'                    => 'переименовал «[[$1]]» в «[[$2]]»',
+'1movedto2_redir'              => '«[[$1]]» переименована в «[[$2]]» поверх перенаправлени�',
+'move-redirect-suppressed'     => 'перенаправление подавлено',
+'movelogpage'                  => 'Журнал переименований',
+'movelogpagetext'              => '�иже пред�тавлен �пи�ок переименованных �траниц.',
+'movereason'                   => 'Причина',
+'revertmove'                   => 'откат',
+'delete_and_move'              => 'Удалить и переименовать',
+'delete_and_move_text'         => '==Требует�� удаление==
 
 Страница � именем [[:$1|«$1»]] уже �уще�твует. Вы хотите её удалить, чтобы �делать возможным переименование?',
-'delete_and_move_confirm' => 'Да, удалить �ту �траницу',
-'delete_and_move_reason'  => 'Удалено дл� возможно�ти переименовани�',
-'selfmove'                => '�евозможно переименовать �траницу: и�ходное и новое им� �траницы �овпадают.',
-'immobile_namespace'      => '�евозможно переименовать �траницу: новое или �тарое им� �одержит зарезервированное �лужебное �лово.',
-'imagenocrossnamespace'   => '�евозможно дать изображению им� из другого про�тран�тва имён',
-'imagetypemismatch'       => '�овое ра�ширение файла не �оответ�твует его типу',
-'imageinvalidfilename'    => 'Целевое им� файла ошибочно',
-'fix-double-redirects'    => '�втоматиче�ки и�править перенаправлени�, указывающие на прежнее название',
+'delete_and_move_confirm'      => 'Да, удалить �ту �траницу',
+'delete_and_move_reason'       => 'Удалено дл� возможно�ти переименовани�',
+'selfmove'                     => '�евозможно переименовать �траницу: и�ходное и новое им� �траницы �овпадают.',
+'immobile-source-namespace'    => '�евозможно переименовывать �траницы в про�тран�тве имён «$1»',
+'immobile-target-namespace'    => '�евозможно переме�тить �траницу в про�тран�тво имён «$1»',
+'immobile-target-namespace-iw' => 'С�ылка интервики не может быть и�пользована дл� переименовани�.',
+'immobile-source-page'         => 'Эту �траницу нельз� переименовывать.',
+'immobile-target-page'         => '�ельз� при�воить �транице �то им�.',
+'imagenocrossnamespace'        => '�евозможно дать изображению им� из другого про�тран�тва имён',
+'imagetypemismatch'            => '�овое ра�ширение файла не �оответ�твует его типу',
+'imageinvalidfilename'         => 'Целевое им� файла ошибочно',
+'fix-double-redirects'         => '�втоматиче�ки и�править перенаправлени�, указывающие на прежнее название',
+'move-leave-redirect'          => 'О�тавить перенаправление',
 
 # Export
 'export'            => 'Эк�портирование �татей',
@@ -2075,7 +2314,7 @@ $1',
 
 Чтобы �к�портировать �татьи, введите их наименовани� в поле редактировани�, одно название на �троку, и выберите хотите ли вы �к�портировать в�ю и�торию изменений �татей или только по�ледние вер�ии �татей.
 
-Вы также можете и�пользовать �пециальный адре� дл� �к�порта только по�ледней вер�ии. �апример дл� �траницы [[{{MediaWiki:Mainpage}}]] �то будет адре� [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]].',
+Вы также можете и�пользовать �пециальный адре� дл� �к�порта только по�ледней вер�ии. �апример дл� �траницы [[{{MediaWiki:Mainpage}}]] �то будет адре� [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Включать только текущую вер�ию, без полной преды�тории',
 'exportnohistory'   => "----
 '''Замечание:''' �к�порт полной и�тории изменений �траниц отключен из-за проблем � производительно�тью.",
@@ -2091,7 +2330,7 @@ $1',
 'allmessagesdefault'        => 'Тек�т по умолчанию',
 'allmessagescurrent'        => 'Текущий тек�т',
 'allmessagestext'           => 'Это �пи�ок �и�темных �ообщений, до�тупных в про�тран�тве имён «MediaWiki».
-Пожалуй�та, по�етите на �траницу [http://www.mediawiki.org/wiki/Localisation опи�ани� локализации] и проект [http://translatewiki.net Betawiki], е�ли вы хотите вне�ти вклад в общую локализацию MediaWiki.',
+Пожалуй�та, по�етите на �траницу [http://www.mediawiki.org/wiki/Localisation опи�ани� локализации] и проект [http://translatewiki.net translatewiki.net], е�ли вы хотите вне�ти вклад в общую локализацию MediaWiki.',
 'allmessagesnotsupportedDB' => "Эта �траница недо�тупна, так как отключена опци� '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Фильтр в формате регул�рного выражени�:',
 'allmessagesmodified'       => 'Показать только изменённые',
@@ -2111,9 +2350,12 @@ $1',
 'import-interwiki-text'      => 'Укажите вики и название импортируемой �траницы.
 Даты изменений и имена авторов будут �охранены.
 В�е операции межвики импорта реги�трируют�� в [[Special:Log/import|�оответ�твующем журнале]].',
+'import-interwiki-source'    => 'Вики-и�точник/�траница:',
 'import-interwiki-history'   => 'Копировать в�ю и�торию изменений �той �траницы',
 'import-interwiki-submit'    => 'Импортировать',
 'import-interwiki-namespace' => 'Целевое про�тран�тво имён:',
+'import-upload-filename'     => 'Им� файла:',
+'import-comment'             => 'Примечание:',
 'importtext'                 => 'Пожалуй�та, �к�портируйте �траницу из и�ходной вики, и�пользу� [[Special:Export|�оответ�твующий ин�трумент]]. Сохраните файл на ди�к, а затем загрузите его �юда.',
 'importstart'                => 'Импортирование �траниц…',
 'import-revision-count'      => '$1 {{PLURAL:$1|вер�и�|вер�ии|вер�ий}}',
@@ -2147,19 +2389,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|вер�и�|вер�ии|вер�ий}} из $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Мо� �траница уча�тника',
+'tooltip-pt-userpage'             => 'Ваша �траница уча�тника',
 'tooltip-pt-anonuserpage'         => 'Страница уча�тника дл� моего IP',
-'tooltip-pt-mytalk'               => 'Мо� �траница об�уждений',
+'tooltip-pt-mytalk'               => 'Ваша �траница об�уждений',
 'tooltip-pt-anontalk'             => 'Страница об�уждений дл� моего IP',
 'tooltip-pt-preferences'          => 'Мои на�тройки',
 'tooltip-pt-watchlist'            => 'Спи�ок �траниц моего наблюдени�',
-'tooltip-pt-mycontris'            => 'Мой вклад',
+'tooltip-pt-mycontris'            => 'Спи�ок ваших правок',
 'tooltip-pt-login'                => 'Зде�ь можно зареги�трировать�� в �и�теме, но �то необ�зательно.',
 'tooltip-pt-anonlogin'            => 'Зде�ь можно зареги�трировать�� в �и�теме, но �то необ�зательно.',
 'tooltip-pt-logout'               => 'Завершить зареги�трированный �еан�',
 'tooltip-ca-talk'                 => 'Об�уждение �одержани� �траницы',
 'tooltip-ca-edit'                 => 'Эту �траницу можно измен�ть. И�пользуйте, пожалуй�та, предварительный про�мотр перед �охранением',
-'tooltip-ca-addsection'           => 'Добавить комментарий к об�уждению',
+'tooltip-ca-addsection'           => 'Создать новый раздел',
 'tooltip-ca-viewsource'           => 'Эта �траница защищена от изменений, но вы можете по�мотреть и �копировать её и�ходный тек�т',
 'tooltip-ca-history'              => 'Журнал изменений �траницы',
 'tooltip-ca-protect'              => 'Защитить �траницу от изменений',
@@ -2206,6 +2448,8 @@ $1',
 'tooltip-watch'                   => 'Добавить текущую �траницу в �пи�ок наблюдени�',
 'tooltip-recreate'                => 'Во��тановить �траницу не�мотр� на то, что она была удалена',
 'tooltip-upload'                  => '�ачать загрузку',
+'tooltip-rollback'                => 'Одним нажатием убрать изменени�, �деланные по�ледним редактором',
+'tooltip-undo'                    => 'Убрать вне�ённую правку и показать предпро�мотр, � возможно�тью указать причину отмены',
 
 # Stylesheets
 'common.css'   => '/** Размещённый зде�ь CSS будет примен�ть�� ко в�ем темам оформлени� */',
@@ -2222,12 +2466,12 @@ $1',
 The wiki server can't provide data in a format your client can read.",
 
 # Attribution
-'anonymous'        => '�нонимные пользователи {{grammar:genitive|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|�нонимный уча�тник|�нонимные уча�тники}} {{grammar:genitive|{{SITENAME}}}}',
 'siteuser'         => 'Уча�тник {{grammar:genitive|{{SITENAME}}}} $1',
 'lastmodifiedatby' => 'Эта �траница по�ледний раз была изменена $2, $1 уча�тником $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'О�новано на работе $1.',
 'others'           => 'другие',
-'siteusers'        => 'Уча�тник(и) {{grammar:genitive|{{SITENAME}}}} $1',
+'siteusers'        => '{{PLURAL:$2|Уча�тник|Уча�тники}} {{grammar:genitive|{{SITENAME}}}} $1',
 'creditspage'      => 'Благодарно�ти',
 'nocredits'        => '�ет �пи�ка уча�тников дл� �той �татьи',
 
@@ -2248,6 +2492,15 @@ The wiki server can't provide data in a format your client can read.",
 'numauthors'     => 'Чи�ло различных авторов (�тать�): $1',
 'numtalkauthors' => 'Чи�ло различных авторов (�траница об�уждени�): $1',
 
+# Skin names
+'skinname-standard'    => 'Кла��иче�кое',
+'skinname-nostalgia'   => '�о�тальги�',
+'skinname-cologneblue' => 'Кёльн�ка� то�ка',
+'skinname-myskin'      => 'Своё',
+'skinname-chick'       => 'Цыпа',
+'skinname-simple'      => 'Про�тое',
+'skinname-modern'      => 'Современное',
+
 # Math options
 'mw_math_png'    => 'В�егда генерировать PNG',
 'mw_math_simple' => 'HTML в про�тых �луча�х, иначе PNG',
@@ -2268,10 +2521,12 @@ The wiki server can't provide data in a format your client can read.",
 'markedaspatrollederror-noautopatrol' => 'Вам не разрешено отмечать �об�твенные правки как проверенные.',
 
 # Patrol log
-'patrol-log-page'   => 'Журнал патрулировани�',
-'patrol-log-header' => 'Это журнал патрулированных вер�ий.',
-'patrol-log-line'   => 'проверена $1 из $2 $3',
-'patrol-log-auto'   => '(автоматиче�ки)',
+'patrol-log-page'      => 'Журнал патрулировани�',
+'patrol-log-header'    => 'Это журнал патрулированных вер�ий.',
+'patrol-log-line'      => 'проверил $1 из $2 $3',
+'patrol-log-auto'      => '(автоматиче�ки)',
+'patrol-log-diff'      => 'вер�ию $1',
+'log-show-hide-patrol' => '$1 журнал патрулировани�',
 
 # Image deletion
 'deletedrevision'                 => 'Удалена �тара� вер�и� $1',
@@ -2288,6 +2543,9 @@ $1',
 'previousdiff' => '� Предыдуща� правка',
 'nextdiff'     => 'Следующа� правка →',
 
+# Visual comparison
+'visual-comparison' => '�агл�дное �равнение',
+
 # Media information
 'mediawarning'         => "'''Внимание''': �тот файл может �одержать вредоно�ный программный код, выполнение которого �по�обно подвергнуть ри�ку вашу �и�тему. <hr />",
 'imagemaxsize'         => 'Ограничивать изображени� на �транице изображений до:',
@@ -2301,10 +2559,12 @@ $1',
 'show-big-image'       => 'Изображение в более вы�оком разрешении',
 'show-big-image-thumb' => '<small>Размер при предпро�мотре: $1 × $2 пик�елов</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Галере� новых файлов',
 'imagelisttext'         => "�иже пред�тавлен �пи�ок из '''$1''' {{PLURAL:$1|файла|файлов|файлов}}, от�ортированных $2.",
 'newimages-summary'     => 'Эта �лужебна� �траница показывает недавно загруженные файлы.',
+'newimages-legend'      => 'Фильтр',
+'newimages-label'       => 'Им� файла (или его ча�ть):',
 'showhidebots'          => '($1 ботов)',
 'noimages'              => 'Изображени� от�ут�твуют.',
 'ilsubmit'              => '�айти',
@@ -2519,6 +2779,18 @@ $1',
 'exif-lightsource-24'  => 'Студийна� лампа �тандарта ISO',
 'exif-lightsource-255' => 'Другой и�точник �вета',
 
+# Flash modes
+'exif-flash-fired-0'    => 'В�пышка не �рабатывала',
+'exif-flash-fired-1'    => 'Сработала в�пышка',
+'exif-flash-return-0'   => 'нет режима предварительной в�пышки',
+'exif-flash-return-2'   => 'обратный импуль� предварительной в�пышки не получен',
+'exif-flash-return-3'   => 'получен обратный импуль� предварительной в�пышки',
+'exif-flash-mode-1'     => 'импуль� заполн�ющей в�пышки',
+'exif-flash-mode-2'     => 'подавление заполн�ющей в�пышки',
+'exif-flash-mode-3'     => 'автоматиче�кий режим',
+'exif-flash-function-1' => '�ет в�пышки',
+'exif-flash-redeye-1'   => 'режим у�транени� �ффекта кра�ных глаз',
+
 'exif-focalplaneresolutionunit-2' => 'дюймов',
 
 'exif-sensingmethod-1' => '�еопределённый',
@@ -2672,21 +2944,10 @@ $1
 
 'unit-pixel' => ' пик�.',
 
-# HTML dump
-'redirectingto' => 'Перенаправление на �траницу [[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'Очи�тить кеш �той �траницы?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => 'Пои�к �татей, �одержащих «$1».',
-'searchnamed'      => "Пои�к �траниц � именем ''$1''.",
-'articletitles'    => 'Статьи, начинающие�� � «$1»',
-'hideresults'      => 'Скрыть результаты',
-'useajaxsearch'    => 'И�пользовать AJAX-пои�к',
+'confirm-purge-top'    => 'Очи�тить кеш �той �траницы?',
+'confirm-purge-bottom' => 'По�ле очи�тки к�ша �траницы будет показана её по�ледн�� вер�и�.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� предыдуща� �траница',
@@ -2706,10 +2967,10 @@ $1',
 'table_pager_empty'        => '�е найдено',
 
 # Auto-summaries
-'autosumm-blank'   => 'Полно�тью удалено �одержимое �траницы',
+'autosumm-blank'   => 'Удалено �одержимое �траницы',
 'autosumm-replace' => 'Содержимое �траницы заменено на «$1»',
 'autoredircomment' => 'Перенаправление на [[$1]]',
-'autosumm-new'     => '�ова�: $1',
+'autosumm-new'     => 'Создана нова� �траница размером $1',
 
 # Size units
 'size-bytes'     => '$1 байт',
@@ -2798,6 +3059,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '�еизве�тный тег дополнени� «$1»',
+'duplicate-defaultsort' => 'Внимание. Ключ �ортировки по умолчанию «$2» переопредел�ет прежний ключ �ортировки по умолчанию «$1».',
 
 # Special:Version
 'version'                          => 'Вер�и� MediaWiki', # Not used as normal message but as header for the special page itself
@@ -2826,13 +3088,13 @@ $1',
 'filepath-submit'  => 'Путь',
 'filepath-summary' => 'Данна� �лужебна� �траница возвращает полный путь к файлу в том виде, в котором он хранит�� на ди�ке.
 
-Введите им� файла без префик�а <code>{{ns:image}}:</code>.',
+Введите им� файла без префик�а <code>{{ns:file}}:</code>.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Пои�к одинаковых файлов',
 'fileduplicatesearch-summary'  => 'Пои�к одинаковых файлов по их х�ш-коду.
 
-Введите им� файла без при�тавки «{{ns:image}}:».',
+Введите им� файла без при�тавки «{{ns:file}}:».',
 'fileduplicatesearch-legend'   => 'Пои�к дубликатов',
 'fileduplicatesearch-filename' => 'Им� файла:',
 'fileduplicatesearch-submit'   => '�айти',
@@ -2862,4 +3124,13 @@ $1',
 'blankpage'              => 'Пу�та� �траница',
 'intentionallyblankpage' => 'Эта �траница намеренно о�тавлена пу�той',
 
+# External image whitelist
+'external_image_whitelist' => ' #О�тавьте �ту �трочку такой, как она е�ть<pre>
+#Разме�тите зде�ь фрагменты регул�рных выражений (ту ча�ть, что находит�� между //)
+#они будут �оотне�ены � URL внешних изображений.
+#Подход�щие будут показаны как изображени�, о�тальные будут показаны как ��ылки на изображени�.
+#Строки, начинающие�� � # �читают�� комментари�ми.
+
+#Размещайте фрагменты регул�рных выражений над �той �трочкой. О�тавьте �ту �трочку такой, как она е�ть.</pre>',
+
 );
diff --git a/languages/messages/MessagesRuq.php b/languages/messages/MessagesRuq.php
index 676bce5e..47b6f022 100644
--- a/languages/messages/MessagesRuq.php
+++ b/languages/messages/MessagesRuq.php
@@ -3,7 +3,8 @@
  *
  * @ingroup Language
  * @file
- * @comment redirects to Megleno-Romanian (Latin)
+ * @comment falls back to Megleno-Romanian (Latin)
+ *
  */
 
 $fallback = 'ruq-latn';
diff --git a/languages/messages/MessagesRuq_cyrl.php b/languages/messages/MessagesRuq_cyrl.php
index eb355ca7..9695f22a 100644
--- a/languages/messages/MessagesRuq_cyrl.php
+++ b/languages/messages/MessagesRuq_cyrl.php
@@ -161,8 +161,8 @@ $messages = array(
 'hr_tip'          => 'Линеа оризонтала (е�нидивале)',
 
 # Edit pages
-'summary'                => 'Сумар',
-'subject'                => 'Субјект / титлур',
+'summary'                => 'Сумар:',
+'subject'                => 'Субјект / титлур:',
 'minoredit'              => '�цеа�та е�те о едитаре минорај',
 'watchthis'              => 'Клајаере це пажу',
 'showpreview'            => 'Ратај превизуализаре',
@@ -170,8 +170,8 @@ $messages = array(
 'newarticle'             => '(�ова)',
 'editing'                => 'о $1 едитаере',
 'editingsection'         => 'Едитаере $1 (�екцион)',
-'copyrightwarning'       => '<!-- Гол деоцамдатај. Верти�ментул �е флај ен MediaWiki:Summary -->
-Те рог нотари ла дин контрибући ал {{SITENAME}} �унт кон�идераере реле�ават �упра $2 (�уах $1 дин детај�). �џтеу не�ав те �е тек�ти �унт едитаере деномерци дет реди�трибутаере дин вент, хатае ици.<br /> Ту е�те но�тре проми�аере бонти у� ту �крир�те це �е, нега копиаере дин публик домен нега �имилари ре�ор�уе. <strong>�Е СУБМИТЕ КОПИЛЕГРУ СКРИЕ С�С ПЕРМИћИО�!</strong>',
+'copyrightwarning'       => "<!-- Гол деоцамдатај. Верти�ментул �е флај ен MediaWiki:Summary -->
+Те рог нотари ла дин контрибући ал {{SITENAME}} �унт кон�идераере реле�ават �упра $2 (�уах $1 дин детај�). �џтеу не�ав те �е тек�ти �унт едитаере деномерци дет реди�трибутаере дин вент, хатае ици.<br /> Ту е�те но�тре проми�аере бонти у� ту �крир�те це �е, нега копиаере дин публик домен нега �имилари ре�ор�уе. '''�Е СУБМИТЕ КОПИЛЕГРУ СКРИЕ С�С ПЕРМИћИО�!'''",
 'template-protected'     => '(ажатмат)',
 'template-semiprotected' => '(�еми-ажатмат)',
 
@@ -189,9 +189,10 @@ $messages = array(
 'editundo'                => 'анулизаје',
 
 # Search results
-'noexactmatch' => "'''�пажу вец лном \"\$1\" н-ќ�и�т�т.''' Путе [[:\$1|креаре це пажу]].",
-'viewprevnext' => 'Ву ($1) ($2) ($3)',
-'powersearch'  => 'каутај аван�ата',
+'noexactmatch'   => "'''�пажу вец лном \"\$1\" н-ќ�и�т�т.''' Путе [[:\$1|креаре це пажу]].",
+'viewprevnext'   => 'Ву ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:�јутор',
+'powersearch'    => 'каутај аван�ата',
 
 # Preferences page
 'mypreferences' => 'Мај префиренћу',
@@ -220,7 +221,7 @@ $3',
 # Upload
 'upload' => 'тримиће фиширул',
 
-# Image description page
+# File description page
 'filehist'            => 'Хи�ториа фиширулу',
 'filehist-current'    => 'куренту',
 'filehist-datetime'   => 'Дата/Темп',
@@ -258,9 +259,11 @@ $3',
 'watching'   => 'О клајаере...',
 'unwatching' => 'О деклајаере...',
 
-# Delete/protect/revert
+# Delete
 'deletedarticle' => 'делајрај "[[$1]]"',
-'rollbacklink'   => 'ревенире',
+
+# Rollback
+'rollbacklink' => 'ревенире',
 
 # Namespace form on various pages
 'namespace'      => 'лСпаћи:',
@@ -276,7 +279,6 @@ $3',
 # What links here
 'whatlinkshere'       => 'Легајтул а це пажу',
 'whatlinkshere-title' => 'Пажу� легајтулент а $1',
-'linklistsub'         => '(Ли�та де легајтул)',
 'nolinkshere'         => "Пажи не легајтент а '''[[:$1]]'''.",
 'istemplate'          => 'викулабе',
 'whatlinkshere-links' => '� легајтул�',
diff --git a/languages/messages/MessagesRuq_grek.php b/languages/messages/MessagesRuq_grek.php
index 302d9e33..7d7a8952 100644
--- a/languages/messages/MessagesRuq_grek.php
+++ b/languages/messages/MessagesRuq_grek.php
@@ -3,6 +3,7 @@
  *
  * @ingroup Language
  * @file
+ *
  */
 
 $fallback = 'el';
diff --git a/languages/messages/MessagesRuq_latn.php b/languages/messages/MessagesRuq_latn.php
index 481929f8..2396aff8 100644
--- a/languages/messages/MessagesRuq_latn.php
+++ b/languages/messages/MessagesRuq_latn.php
@@ -161,8 +161,8 @@ $messages = array(
 'hr_tip'          => 'Linia orizontala (esnidivale)',
 
 # Edit pages
-'summary'                => 'Sumar',
-'subject'                => 'Subjekt / titlur',
+'summary'                => 'Sumar:',
+'subject'                => 'Subjekt / titlur:',
 'minoredit'              => 'Aceasta este o editare minoră',
 'watchthis'              => 'klăaere ce pažu',
 'showpreview'            => 'Rată previzualizare',
@@ -170,8 +170,8 @@ $messages = array(
 'newarticle'             => '(Nova)',
 'editing'                => 'o $1 editaere',
 'editingsection'         => 'Editaere $1 (sekcion)',
-'copyrightwarning'       => '<!-- Gol deocamdată. Vertismentul se flă en MediaWiki:Summary -->
-Te rog notari la din kontribuţi al {{SITENAME}} sunt konsideraere relesavat supra $2 (suah $1 din detăs). Açteu nesav te se teksti sunt editaere denomerci det redistributaere din vent, hatae ici.<br /> Tu este nostre promisaere bonti us tu skrirste ce se, nega kopiaere din publik domen nega similari resorsua. <strong>NE SUBMITE KOPILEGRU SKRIE SAS PERMIŢION!</strong>',
+'copyrightwarning'       => "<!-- Gol deocamdată. Vertismentul se flă en MediaWiki:Summary -->
+Te rog notari la din kontribuţi al {{SITENAME}} sunt konsideraere relesavat supra $2 (suah $1 din detăs). Açteu nesav te se teksti sunt editaere denomerci det redistributaere din vent, hatae ici.<br /> Tu este nostre promisaere bonti us tu skrirste ce se, nega kopiaere din publik domen nega similari resorsua. '''NE SUBMITE KOPILEGRU SKRIE SAS PERMIŢION!'''",
 'template-protected'     => '(ažatmat)',
 'template-semiprotected' => '(semi-ažatmat)',
 
@@ -189,9 +189,10 @@ Te rog notari la din kontribuţi al {{SITENAME}} sunt konsideraere relesavat sup
 'editundo'                => 'anulizăe',
 
 # Search results
-'noexactmatch' => "'''N'pažu vec l'nom \"\$1\" n'ķsistst.''' Pute [[:\$1|kreare ce pažu]].",
-'viewprevnext' => 'Vu ($1) ($2) ($3)',
-'powersearch'  => 'kaută avansata',
+'noexactmatch'   => "'''N'pažu vec l'nom \"\$1\" n'ķsistst.''' Pute [[:\$1|kreare ce pažu]].",
+'viewprevnext'   => 'Vu ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Ajutor',
+'powersearch'    => 'kaută avansata',
 
 # Preferences page
 'mypreferences' => 'Maj prefirenţu',
@@ -220,7 +221,7 @@ $3',
 # Upload
 'upload' => 'trimiţe fişirul',
 
-# Image description page
+# File description page
 'filehist'            => 'Historia fiÅŸirulu',
 'filehist-current'    => 'kurentu',
 'filehist-datetime'   => 'Data/Temp',
@@ -258,9 +259,11 @@ $3',
 'watching'   => 'O klăaere...',
 'unwatching' => 'O deklăaere...',
 
-# Delete/protect/revert
+# Delete
 'deletedarticle' => 'delÇŽraj "[[$1]]"',
-'rollbacklink'   => 'revenire',
+
+# Rollback
+'rollbacklink' => 'revenire',
 
 # Namespace form on various pages
 'namespace'      => 'lSpaţi:',
@@ -276,7 +279,6 @@ $3',
 # What links here
 'whatlinkshere'       => 'Legǎtul a ce pažu',
 'whatlinkshere-title' => 'Paži legǎtulent a $1',
-'linklistsub'         => '(Lista de legătul)',
 'nolinkshere'         => "Paži ne legǎtent a '''[[:$1]]'''.",
 'istemplate'          => 'vikulabe',
 'whatlinkshere-links' => '� legătuls',
diff --git a/languages/messages/MessagesSa.php b/languages/messages/MessagesSa.php
index 1551c283..9dd50e05 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -6,6 +6,7 @@
  *
  * @author Kaustubh
  * @author Mahitgar
+ * @author Omnipaedista
  */
 
 $fallback = 'hi';
@@ -34,8 +35,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'योजकसंभाषणं',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1संभाषणं',
-	NS_IMAGE            => 'चित�रं',
-	NS_IMAGE_TALK       => 'चित�रसंभाषणं',
+	NS_FILE             => 'चित�रं',
+	NS_FILE_TALK        => 'चित�रसंभाषणं',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -46,17 +47,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'वर�गसंभाषणं',
 );
 
-$skinNames = array(
-	'standard' => 'पूर�व',
-	'nostalgia' => 'प�राण',
-	'cologneblue' => 'नील',
-	'monobook' => 'प�स�तक',
-	'myskin' => 'मे चर�मन�',
-	'chick' => 'Chick'
-);
-
 $messages = array(
 'underline-always' => 'सदा',
+'underline-never'  => 'न जात�',
 
 # Dates
 'sunday'    => 'विश�रामवासरे',
@@ -87,6 +80,7 @@ $messages = array(
 'december'  => 'मार�गशीर�षपौषे',
 
 # Categories related messages
+'pagecategories'         => '{{PLURAL:$1|वर�ग|वर�गा}}',
 'listingcontinuesabbrev' => 'आगामि.',
 
 'about'         => 'विषये',
@@ -95,9 +89,13 @@ $messages = array(
 'qbfind'        => 'शोध',
 'qbedit'        => 'संपादयति',
 'qbpageoptions' => 'इदम�‌ पृष�ठ',
+'qbmyoptions'   => 'मदीय लिखितपृष�ठ',
+'mypage'        => 'मम पृष�ठ',
+'mytalk'        => 'मम लोकप�रवाद',
 'navigation'    => 'स�चालन',
-'and'           => '�वम�',
+'and'           => '&#32;�वम�',
 
+'tagline'          => '{{SITENAME}}त�',
 'help'             => 'सहायता',
 'search'           => 'शोध',
 'searchbutton'     => 'शोध',
@@ -107,13 +105,24 @@ $messages = array(
 'history_short'    => 'इतिहास',
 'printableversion' => 'म�द�रणस�य पाठ',
 'permalink'        => 'स�थायी निबन�धन',
+'print'            => 'म�द�रण',
+'edit'             => 'सम�पादन',
+'create'           => 'सृजति',
+'editthispage'     => 'इदं पृष�ठस�य सम�पादनार�थ',
+'create-this-page' => 'इदं पृष�ठ सृजामि',
+'delete'           => 'विलोप',
+'protect'          => 'स�रक�षित करोसि',
+'protect_change'   => 'स�रक�षा नियम परिवर�त',
 'newpage'          => 'नविन पृष�ठ',
 'talkpagelinktext' => 'संवाद',
 'specialpage'      => 'विशेष पृष�ठ',
 'personaltools'    => 'वैयक�तिक साधन',
+'talk'             => 'संवाद',
 'views'            => 'दृश�य',
 'toolbox'          => 'साधनपेटी',
+'jumpto'           => 'कूर�दनं करोति :',
 'jumptonavigation' => 'स�चालन',
+'jumptosearch'     => 'शोध',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}विषये',
@@ -121,14 +130,25 @@ $messages = array(
 'copyrightpage'        => '{{ns:project}}:प�रताधिकार',
 'currentevents'        => 'सद�य घटना',
 'disclaimers'          => 'स�वाम�यत�यागं',
+'disclaimerpage'       => 'Project:स�वाम�यत�यागं',
 'edithelp'             => 'संपादनार�थं सहायता',
 'faq'                  => 'अतिप�रश�नपृष�ट',
 'helppage'             => 'Help:सहाय�य',
-'mainpage'             => 'म�खपृष�ठं',
-'mainpage-description' => 'म�खपृष�ठं',
+'mainpage'             => 'म�ख�यपृष�ठम�',
+'mainpage-description' => 'म�ख�यपृष�ठम�',
 'privacy'              => 'गोपनीयविषये नीति',
-
-'editsection' => 'संपादयति',
+'privacypage'          => 'Project:गोपनीयता नीति',
+
+'retrievedfrom'   => 'इतः "$1" निसह�वे',
+'newmessageslink' => 'नूतन संदेश',
+'editsection'     => 'संपादयति',
+'editsectionhint' => 'विभाग संपादन: $1',
+'hidetoc'         => 'ल�प�य',
+'feedlinks'       => 'अन�बन�ध:',
+'site-rss-feed'   => '$1 आर�स�स पूरयति',
+'site-atom-feed'  => '$1 �टम पूरयति',
+'page-rss-feed'   => '"$1" आर�स�स अन�बन�ध',
+'page-atom-feed'  => '"$1" �टम अन�बन�ध',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'     => 'पृष�ठ',
@@ -137,18 +157,28 @@ $messages = array(
 'nstab-category' => 'वर�ग',
 
 # General errors
-'error'      => 'विभ�रम',
-'viewsource' => 'स�रोत पश�यति',
+'error'         => 'विभ�रम',
+'viewsource'    => 'स�रोत पश�यति',
+'viewsourcefor' => '$1 कृते',
 
 # Login and logout pages
+'yourpassword'            => 'सङ�केतशब�द:',
 'login'                   => 'प�रवेश करोसि',
 'nav-login-createaccount' => 'प�रवेश करोसि/ सृज� उपयोजकसंज�ञा',
+'userlogin'               => 'प�रवेश करोसि/ सृज� उपयोजकसंज�ञा',
 'logout'                  => 'बहिर�गच�छति',
 'userlogout'              => 'बहिर�गच�छति',
 'createaccount'           => 'सृज उपयोजकसंज�ञा',
 'gotaccountlink'          => 'प�रवेश करोसि',
+'yourlanguage'            => 'भाषा:',
+'email'                   => 'विद�य�त�पत�रव�यवस�था',
+'loginsuccesstitle'       => 'स�स�वागतम�‌ प�रवेश यशस�वी अस�ति',
+
+# Edit page toolbar
+'italic_sample' => 'इटालिकाक�षर�‌',
 
 # Edit pages
+'summary'     => 'सारांश:',
 'watchthis'   => 'इदं पृष�ठ निरीक�षा',
 'savearticle' => 'पृष�ठ त�रायते',
 'preview'     => 'प�रारूप प�रेक�षा',
@@ -162,16 +192,26 @@ $messages = array(
 'page_first'          => 'प�रथम�‌',
 'page_last'           => 'अन�तिम',
 
+# Revision feed
+'history-feed-item-nocomment' => '$1 उप $2', # user at time
+
 # Diffs
+'lineno'   => 'रेखा $1:',
 'editundo' => 'पूर�ववत करोसि',
 
 # Search results
+'nextn'       => 'आगामि$1',
 'powersearch' => 'परिणत शोध',
 
 # Recent changes
-'recentchanges' => 'नवीनतम परिवर�तन',
-'hide'          => 'प�रछद�',
-'show'          => 'दर�शयति',
+'recentchanges'   => 'नवीनतम परिवर�तन',
+'rcshowhideanons' => 'अनामिक योजकस�य परिवर�त $1',
+'hist'            => 'इति.',
+'hide'            => 'प�रछद�',
+'show'            => 'दर�शयति',
+'minoreditletter' => 'ल�घ�',
+'newpageletter'   => 'न',
+'boteditletter'   => 'य',
 
 # Recent changes linked
 'recentchangeslinked' => 'सम�भन�दिन� परिवर�त',
@@ -179,16 +219,30 @@ $messages = array(
 # Upload
 'upload' => 'भारं न�यस�यति सञ�चिका',
 
+# Special:ListFiles
+'imgfile' => 'संचिका',
+
+# File description page
+'filehist-deleteone' => 'विलोप',
+
 # Random page
 'randompage' => 'अविशिष�ट पृष�ठ',
 
+# Statistics
+'statistics' => 'सांख�यिकी',
+
 # Miscellaneous special pages
+'longpages'    => 'दीर�घ पृष�ठ',
+'newpages'     => 'नूतन पृष�ठ',
 'ancientpages' => 'प�राचीनतम� पृष�ठा',
+'move'         => 'नामभेद',
+'movethispage' => 'इदं पृष�ठस�य स�थानांतर',
 
 # Book sources
 'booksources-go' => 'प�रस�थानम�',
 
 # Special:AllPages
+'allpages'       => 'सर�व पृष�ठ',
 'alphaindexline' => 'इतः $1 यावत� $2',
 'allarticles'    => 'सर�व लेखा',
 'allpagessubmit' => 'गच�छति',
@@ -201,35 +255,65 @@ $messages = array(
 'emailmessage' => 'सन�देशः',
 
 # Watchlist
+'watch'         => 'निरीक�षति',
 'watchthispage' => 'प�रतिरक�षति इदं पृष�ठ',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching' => 'निरिक�षा',
 
-# Delete/protect/revert
+# Delete
 'actioncomplete' => 'कार�य समापनम�',
 
+# Protect
+'protectcomment'          => 'प�रतिक�रीया:',
+'protect-level-sysop'     => 'केवल प�रबंधक',
+'protect-summary-cascade' => 'निःश�रेणि',
+'restriction-type'        => 'अन�मति:',
+
 # Namespace form on various pages
-'namespace' => 'नामविश�व:',
+'namespace'      => 'नामविश�व:',
+'blanknamespace' => '(म�ख�य)',
 
 # What links here
-'whatlinkshere' => 'किम�‌ पृष�ठ सम�बद�धं करोति',
+'whatlinkshere'       => 'किम�‌ पृष�ठ सम�बद�धं करोति',
+'whatlinkshere-links' => '� निबन�धन',
 
 # Block/unblock
-'blocklink' => 'निषेध',
+'blocklink'    => 'निषेध',
+'contribslink' => 'योगदान',
 
 # Namespace 8 related
 'allmessages'     => 'व�यवस�था सन�देशानि',
 'allmessagesname' => 'नाम',
 
+# Thumbnails
+'thumbnail-more' => 'विस�तार',
+
+# Special:Import
+'import-comment' => 'व�याखान:',
+
 # Tooltip help for the actions
+'tooltip-pt-logout'       => 'बहिर�गच�छति',
 'tooltip-search'          => '{{SITENAME}} अन�वेषणं करोति',
-'tooltip-n-mainpage'      => 'म�खपृष�ठ अभ�यागम',
+'tooltip-p-logo'          => 'म�ख�यपृष�ठम�  अभ�यागम�',
+'tooltip-n-mainpage'      => 'म�ख�यपृष�ठम�  अभ�यागम�',
+'tooltip-n-portal'        => 'प�रकल�प विषये,भवदिय त�वां किम�‌ करोति, शोधिका',
 'tooltip-n-recentchanges' => 'नविनतम परिवर�तन सूची',
 'tooltip-n-randompage'    => 'अविशीष�ट लेख',
+'tooltip-n-help'          => 'शोधन�‌ स�थानम�‌।',
+'tooltip-t-upload'        => 'भारं न�यस�यति संचिका',
+'tooltip-t-specialpages'  => 'सर�वानि विशेष पृष�ठस�य सूची',
 'tooltip-save'            => 'त�रायते',
 
-# Special:NewImages
+# Skin names
+'skinname-standard'    => 'पूर�व',
+'skinname-nostalgia'   => 'प�राण',
+'skinname-cologneblue' => 'नील',
+'skinname-monobook'    => 'प�स�तक',
+'skinname-myskin'      => 'मे चर�मन�',
+'skinname-chick'       => 'Chick',
+
+# Special:NewFiles
 'newimages' => 'नूतन संचिका दालन',
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesSah.php b/languages/messages/MessagesSah.php
index 2454cd55..7fa73479 100644
--- a/languages/messages/MessagesSah.php
+++ b/languages/messages/MessagesSah.php
@@ -6,12 +6,29 @@
  *
  * @author Bert Jickty
  * @author HalanTul
+ * @author Meno25
  * @author Urhixidur
  */
 
+$namespaceNames = array(
+	NS_SPECIAL          => '�наллаах',
+	NS_TALK             => 'Ырытыы',
+	NS_USER             => 'Кыттааччы',
+	NS_USER_TALK        => 'Кыттааччы ырытыыта',
+	NS_PROJECT_TALK     => '$1_ырытыыта',
+	NS_FILE             => 'Ойуу',
+	NS_FILE_TALK        => 'Ойуу ырытыыта',
+	NS_TEMPLATE         => 'Халыып',
+	NS_TEMPLATE_TALK    => 'Халыып ырытыыта',
+	NS_HELP             => 'Көмө',
+	NS_HELP_TALK        => 'Көмө ырытыыта',
+	NS_CATEGORY         => 'Категори�',
+	NS_CATEGORY_TALK    => 'Категори� ырытыыта',
+);
+
 $messages = array(
 # User preference toggles
-'tog-underline'               => 'Бу ыйынньыктары б�ли�т��:',
+'tog-underline'               => 'Ыйынньыктары аннынан тардыы:',
 'tog-highlightbroken'         => 'Кураанах ыйынньыктары <a href="" class="new">маннык</a> (�б�т�р: маннык<a href="" class="internal">?</a>) көрдөр.',
 'tog-justify'                 => 'Сир�й к�титин�н тарҕат',
 'tog-hideminor'               => 'Кыра көннөрүүл�ри көрдөрбөккө',
@@ -23,7 +40,7 @@ $messages = array(
 'tog-editsection'             => '[Көннөрүү] ди�н ыйынньыгынан �и�к�ий�ны көннөрүү',
 'tog-editsectiononrightclick' => 'Си�к�ий� баһыгар уҥа тим�ҕин�н<br />баттаан �и�к�ий�ни көннөрүү (JavaScript)',
 'tog-showtoc'                 => 'Иһин��ҕитин көрдөр (ы�татыйа ү�т�н ордук ба� тыллаах буоллаҕына)',
-'tog-rememberpassword'        => '�аппын бу компьютерга �иг��',
+'tog-rememberpassword'        => '�аппын бу көмпүүт�рг� �иг��',
 'tog-editwidth'               => 'Көннөрүү түннүг� муҥутуур к�титт��х буоллун',
 'tog-watchcreations'          => 'Суруйбут ы�татыйаларбын к�т��н көрүүг� килл�р�н и�',
 'tog-watchdefault'            => 'Уларыппыт �ир�йд�рбин к�т��н көрүү и�пииһ�г�р килл�р�н и�',
@@ -47,17 +64,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'К�т��н көрүү и�пииһ�г�р б�й�м уларытыыларбын көрдөрүм�',
 'tog-watchlisthidebots'       => 'К�т��н көрүү и�пииһ�г�р робот уларытыытын көрдөрүм�',
 'tog-watchlisthideminor'      => 'Кыра уларытыылары к�т��м�',
+'tog-watchlisthideliu'        => 'Б�ли�т�ммит кыттааччылар уларытыыларын к�тиир и�пииһ�кк� көрдөрүм�',
+'tog-watchlisthideanons'      => '�аттарын �пп�т�х кыттааччылар уларытыыларын к�т��һин и�пииһ�г�р көрдөрүм�',
 'tog-nolangconversion'        => 'Сурук �и�тематын уларытары боп',
 'tog-ccmeonemails'            => '�тын кыттааччыларга �уруйбут �уруктарбын б�й�б�р �ми� ыыт',
-'tog-diffonly'                => 'Икки вер�и�ны т�ҥниирг� �ир�й иһин көрдөрүм�',
+'tog-diffonly'                => 'Икки барылы т�ҥниирг� �ир�й иһин көрдөрүм�',
 'tog-showhiddencats'          => 'Ки�т�ммит категори�лары көрдөр',
+'tog-norollbackdiff'          => 'Төннөрүү к�ннитт�н барыллар уратыларын көрдөрүм�',
 
 'underline-always'  => 'Куруук',
-'underline-never'   => 'Хаһан да',
+'underline-never'   => '�ннынан тардыма',
 'underline-default' => 'Браузер на�тройкатынан',
 
-'skinpreview' => '(Хайдах буолара)',
-
 # Dates
 'sunday'        => 'Өрөбүл',
 'monday'        => 'Б�ниди�нньик',
@@ -151,7 +169,7 @@ $messages = array(
 'mytalk'         => 'К�п��т�р �ирим',
 'anontalk'       => 'Бу IP-га ырытыы',
 'navigation'     => '�авигаци�',
-'and'            => 'уонна',
+'and'            => '&#32;уонна',
 
 # Metadata in edit box
 'metadata_help' => 'Мета дааннайдар:',
@@ -188,14 +206,14 @@ $messages = array(
 'talkpagelinktext'  => 'Ырытыы',
 'specialpage'       => '�нал �ир�й',
 'personaltools'     => 'Ту� б�й� туттар туруоруулара',
-'postcomment'       => 'Ырытыыга �урук',
+'postcomment'       => 'Саҥа �алаа',
 'articlepage'       => 'Ы�татыйаны көр',
 'talk'              => 'Ырытыы',
 'views'             => 'Көрүүл�р',
 'toolbox'           => 'Үнү�түрүмүөнн�р',
 'userpage'          => 'Кыттааччы туһунан �ир�й',
 'projectpage'       => 'Бырайыак �ир�й�',
-'imagepage'         => 'Медиа-бил� �ир�й�',
+'imagepage'         => 'Бил� �ир�йин көрүү',
 'mediawikipage'     => 'Сурук �ир�й�',
 'templatepage'      => 'Халыып �ир�й�',
 'viewhelppage'      => 'Көмө �ир�й�',
@@ -214,13 +232,11 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} туһунан',
 'aboutpage'            => 'Project:туһунан',
-'bugreports'           => 'Сыыһалар ту�тарынан хобо',
-'bugreportspage'       => 'Project:�ыыһаларын туһунан хобо',
 'copyright'            => 'Маны туһанары $1 көҥүллүүр.',
 'copyrightpagename'    => '{{SITENAME}} ба� билиит�',
 'copyrightpage'        => '{{ns:project}}:ба� билиит�',
-'currentevents'        => 'Оҥоһулла турар дьайыылар',
-'currentevents-url'    => 'Project:Оҥоһулла турааччылар',
+'currentevents'        => 'Туох буола турара',
+'currentevents-url'    => 'Project:Сонуннар',
 'disclaimers'          => 'Бүк ох�унуу',
 'disclaimerpage'       => 'Project:Бүк ох�унуу',
 'edithelp'             => 'Уларытааччыларга көмө',
@@ -237,9 +253,7 @@ $messages = array(
 
 'badaccess'        => 'Сатаан киирб�т�',
 'badaccess-group0' => 'Эн бу дьайыыны оҥорор кыаҕыҥ �уох.',
-'badaccess-group1' => '$1 бөлөх кыттыылаахтара бу дьайыыга хааччахтаахтар',
-'badaccess-group2' => '$1 бөлөхтөртөн биирд��т�рин кыттааччыларыгар бу дьайыы хааччахтаах .',
-'badaccess-groups' => '$1 бөлөхтөртөн биирд��т�рин кыттааччыларыгар бу дьайыы хааччахтаах',
+'badaccess-groups' => 'Дьайыыны $1 {{PLURAL:$2|бөлөххө|бөлөхтөртөн биирд��т�риг�р}} киир�р кыттааччыларылар �р� оҥорор кыахтаахтар.',
 
 'versionrequired'     => 'MediaWiki $1 -� би�р�ий�т� наада',
 'versionrequiredtext' => 'Бу �ир�йи туттарга MediaWiki $1 -� би�р�ий�т� наада. [[Special:Version|version page]] көр.',
@@ -253,6 +267,8 @@ $messages = array(
 'editsection'             => 'уларыт',
 'editold'                 => 'уларыт',
 'viewsourceold'           => 'и�ходнигын көрүү',
+'editlink'                => 'көннөрөргө',
+'viewsourcelink'          => 'и�ходнигын көрүү',
 'editsectionhint'         => '$1 �екци�ны уларыт',
 'toc'                     => 'И� хоһооно',
 'showtoc'                 => 'көрдөр',
@@ -267,7 +283,7 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom би�рии',
 'page-rss-feed'           => '"$1" RSS би�рии',
 'page-atom-feed'          => '"$1" Atom би�рии',
-'red-link-title'          => '$1 (ө��ө �урулла илик)',
+'red-link-title'          => '$1 (маннык �ир�й �уох)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Ы�татыйа',
@@ -283,7 +299,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Маннык дьайыы �уох',
-'nosuchactiontext'  => 'Бу URL-га баар дьайыыны биики бырагырааммата кыайан аахпата',
+'nosuchactiontext'  => 'Бу URL-га баар дьайыы �ыыһалаах. 
+Баҕар URL �уруйарга алҕаһаабытыҥ буолуо �б�т�р �ыыһалаах �иг�нн�н тах�ыбытыҥ буолуо. 
+{{SITENAME}} б�й�тин �ыыһата �ми� буолуон �өп.',
 'nosuchspecialpage' => 'Маннык анал �ир�й �уох',
 'nospecialpagetext' => '�наллаах �ир�йи �ыыһа көрдөөтүҥ,  [[Special:SpecialPages|манна]] аналлаах �ир�йд�р и�пииһ�кт�рин булуоххун �өп.',
 
@@ -333,7 +351,6 @@ $1',
 'cannotdelete'         => 'Ыйыллыбыт бил�ни кыайан �отторботум. (Ким �р� инники �отторбут буолуон �өп)',
 'badtitle'             => 'Табыллыбат аат',
 'badtitletext'         => 'Ыйытыллыбыт �ир�й аата �ыыһа, иччит�х, �б�т�р �ыыһа ыйынньыктаах тыллар ыккардыларынааҕы дуу, биикил�р ыккардыларынааҕы дуу аат.',
-'perfdisabled'         => 'Бука ди�н баалаамаҥ, маны оҥоруу билии олоҕун күүрд�рин иһин билигин бобуллан турар.',
 'perfcached'           => 'Бу билии к���т�н ылыллыбыт онон бүт�һик уларыйыылары аах�ымыан �өп.',
 'perfcachedts'         => 'Бу билии к���т�н ылыллыбыт, бүт�һигин $1 уларыйбыт.',
 'querypage-no-updates' => 'Бу �ир�й уларыйыыта бобуллан турар. Билиит� билигин кыайан уларыйбат.',
@@ -347,7 +364,7 @@ $1',
 'protectedpagetext'    => 'Бу �ир�й уларытыллыбат.',
 'viewsourcetext'       => 'Эн бу �ир�й төрдүн көрүөххүн уонна төгүллүөххүн �өп:',
 'protectedinterface'   => 'Бу �ир�й бырагыраамма холбуурун хааччыйар, онон моһуогурууттан халытан хатанан турар',
-'editinginterface'     => "'''Болҕой:''' Быраҕыраамма та� кө�түүтүн (интерфей�ын) хааччыйар ти�киһи уларытаары гынан �р�ҕин. Бу �ир�йи уларыттаххына атын кыттааччылар көрөллөрүг�р бырагыраамма кө�түүт� уларыйыа. Тылбаа�тыыр буоллаххына Медиавики бырайыактарын �ахалыы тылбааһын [http://translatewiki.net/wiki/Main_Page?setlang=sah Betawiki] туһан.",
+'editinginterface'     => "'''Болҕой:''' Быраҕыраамма та� кө�түүтүн (интерфей�ын) хааччыйар ти�киһи уларытаары гынан �р�ҕин. Бу �ир�йи уларыттаххына атын кыттааччылар көрөллөрүг�р бырагыраамма кө�түүт� уларыйыа. Тылбаа�тыыр буоллаххына Медиавики бырайыактарын �ахалыы тылбааһын [http://translatewiki.net/wiki/Main_Page?setlang=sah translatewiki.net] туһан.",
 'sqlhidden'            => '(SQL ыйытык ки�т�ммит)',
 'cascadeprotected'     => 'Бу �ир�й уларыйар кыаҕа �уох, тоҕо ди�т�хх� уларыйара бобуллубут (ка�каднай көмү�к�л холбоммут) {{PLURAL:$1|�ир�й бөлөҕөр|�ир�йд�р бөлөхтөрүг�р}} киир�р:
 $2',
@@ -358,15 +375,15 @@ $2',
 Төрүөт� - ''$2''",
 
 # Virus scanner
-'virus-badscanner'     => 'Сатаммата. Виру� �канера биллиб�т�: <i>$1</i>',
+'virus-badscanner'     => "Сатаммата. Виру� �канера биллиб�т�: ''$1''",
 'virus-scanfailed'     => '�кан �ыыһата (куода $1)',
 'virus-unknownscanner' => 'биллиб�т антивиру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Тах�ыы',
-'logouttext'                 => '<strong>Эн �и�тематтан таҕы�тыҥ.</strong> 
+'logouttext'                 => "'''Эн �и�тематтан таҕы�тыҥ.''' 
 
-{{SITENAME}} �аайка билигин ааккынан буолбакка IP-аадырыһынан �р� кө�төҕүн. �ата �уох үл�ли�ххин �өп, �б�т�р �аҥаттан урукку ааккынан дуу, атын аатынан дуу [[Special:UserLogin|киири�ххин]] �өп. Сорох �ир�йд�р ө��ө даҕаны �йигин ааккынан көрдөрүөхт�рин �өп, ону �уох гыныаххын баҕардаххына инт�рини�т көрдөрөөччүҥ к��һин ыраа�таа.',
+{{SITENAME}} �аайка билигин ааккынан буолбакка IP-аадырыһынан �р� кө�төҕүн. �ата �уох үл�ли�ххин �өп, �б�т�р �аҥаттан урукку ааккынан дуу, атын аатынан дуу [[Special:UserLogin|киири�ххин]] �өп. Сорох �ир�йд�р ө��ө даҕаны �йигин ааккынан көрдөрүөхт�рин �өп, ону �уох гыныаххын баҕардаххына инт�рини�т көрдөрөөччүҥ к��һин ыраа�таа.",
 'welcomecreation'            => '== �өрүөн нөргүй, $1! ==
 Эн манна б�ли�т�нниҥ.
 [[Special:Preferences|{{SITENAME}} туруорууларын]] б�й�ҕ�р �өп түб�һ�р гына уларытаргын умнума.',
@@ -377,7 +394,6 @@ $2',
 'remembermypassword'         => 'Миигин бу компьютерга �иг��',
 'yourdomainname'             => 'Эн дөмүөнүҥ:',
 'externaldberror'            => 'Та� киирии билиитин олоҕун �ыыһата буолла, �б�т�р та� киирии билииҥ олоҕун �аҥардар кыаҕыҥ �уох.',
-'loginproblem'               => '<span style="color:red">Эн аатыҥ ылыныллыбата.</span> Ө��ө �уруйан көр!',
 'login'                      => 'Киир',
 'nav-login-createaccount'    => 'Киир / б�ли�т�н',
 'loginprompt'                => '{{SITENAME}} �аайтыгар киир�рг� «cookies» туттары көҥүлл��.',
@@ -404,7 +420,7 @@ $2',
 'yournick'                   => 'Илии баттааһын:',
 'badsig'                     => 'Сыыһа илии баттааһын; HTML ти�гт�рин көр.',
 'badsiglength'               => '�аһаа уһун илии баттааһын.
-$1 б�ли�тт�н (буукубаттан) ордук буолуо �уохтаах.',
+$1 {{PLURAL:$1|б�ли�тт�н|б�ли�тт�н (буукубаттан)}} ордук буолуо �уохтаах.',
 'email'                      => 'Почта',
 'prefs-help-realname'        => 'Сурукка киирбит аатыҥ (булгуччута �уох): ким бу �ир�йи уларыппытын көрдөрөргө туттуллар',
 'loginerror'                 => '�аккын �и�тема билб�т�',
@@ -416,7 +432,9 @@ $1 бÑ�лиÑ�Ñ‚Ñ‚Ñ�н (буукубаттан) ордук буолуо Ñ�уохÑ
 'noname'                     => 'Эн тиһилик бил�р аатын килл�рб�т�ххин.',
 'loginsuccesstitle'          => 'Киирдиҥ',
 'loginsuccess'               => "'''Билигин бу аатынан үл�лиигин: \"\$1\".'''",
-'nosuchuser'                 => 'Маннык - "$1" - ааттаах кыттааччы �уох. �атыҥ �өпкө �уруллубутун көр �б�т�р [[Special:UserLogin/signup|�аҥаттан киир]].',
+'nosuchuser'                 => 'Маннык - "$1" - ааттаах кыттааччы �уох.
+Улахан кыра буукубалар атыннаахтар.
+�атыҥ �өпкө �уруллубутун көр �б�т�р [[Special:UserLogin/signup|�аҥаттан б�ли�т�н]].',
 'nosuchusershort'            => 'Маннык - "<nowiki>$1</nowiki>" - ааттаах кыттааччы �уох. �атыҥ �өпкө �уруллубутун көр.',
 'nouserspecified'            => 'Кыттааччы аатын килл�ри�хт��ххин.',
 'wrongpassword'              => 'Киирии тылыҥ �ыыһалаах. Ө��ө килл�р�н көр.',
@@ -442,8 +460,9 @@ $1 бÑ�лиÑ�Ñ‚Ñ‚Ñ�н (буукубаттан) ордук буолуо Ñ�уохÑ
 'throttled-mailpassword'     => 'Киирии тылы өйдөтөр �и�ти�ма бүт�һик {{PLURAL:$1|чаа�|$1 чаа�}} иһиг�р туттулла �ылдьыбыт. 
 Киирии тылы {{PLURAL:$1|чаа�ка|$1 чаа�ка}} биирд� �р� ыйытыахха �өп.',
 'mailerror'                  => 'Сурук ыытарга алҕа� таҕы�та: $1',
-'acct_creation_throttle_hit' => 'Эн номнуо $1 �каунт оҥорбуккун. Онон ө��ө оҥорор кыаҕыҥ �уох.',
-'emailauthenticated'         => 'Эн почтаҥ аадырыһа бу аакка �урулла �ылдьар: $1.',
+'acct_creation_throttle_hit' => 'Эн IP-гыттан бүгүн {{PLURAL:$1|1 аат оҥоһуллубут|$1 аат б�ли�т�ммит}} буолан бүгүҥҥү күнн��ҕи нуорма туолбут.
+Бу IP-тан киир�р дьон �аҥа ааты билигин б�ли�тиир кыахтара �уох.',
+'emailauthenticated'         => 'Эн почтаҥ аадырыһа баччаҕа биг�рг�тиллибит: $2, $3.',
 'emailnotauthenticated'      => 'Эл. почтаҥ аадырыһа биг�рг�тилл� илик.
 Онон вики-движок �н почтаҕын кытта үл�лиир кыаҕа �уох.',
 'noemailprefs'               => 'Эл. почтаҥ ыйыллыбатах, онон вики-движок аадыры�кын туһанар кыаҕа �уох.',
@@ -456,20 +475,29 @@ $1 бÑ�лиÑ�Ñ‚Ñ‚Ñ�н (буукубаттан) ордук буолуо Ñ�уохÑ
 'createaccount-text'         => 'Ким �р� {{SITENAME}} бырайыакка ($4) �аҥа $2 ааты б�ли�т��бит. "$2" киирии тыла "$3". Билигин киир�н киирии тылгын уларытыаххын наада.
 
 Саҥа аат �ыыһа оҥоһуллубут буоллаҕына тугу да гыныа �уоххун �өп.',
+'login-throttled'            => 'Киирии тылы наһаа �лб�хтик килл�р� �атаатыҥ.
+Бука ди�н кыратык тохтуу түһ�н баран ө��ө боруобалаа.',
 'loginlanguagelabel'         => 'Омугун тыла: $1',
 
 # Password reset dialog
-'resetpass'               => 'Киирии тылы �аҥаттан килл�р',
-'resetpass_announce'      => 'Бу бы�тах к�мҥ� туттуллар киирии тылынан киирдиҥ. Түмүкк� �аҥа киирии тылла �уруй:',
-'resetpass_text'          => '<!-- Ти�киһи манна �б�н �уруйуҥ -->',
-'resetpass_header'        => '�ат киирии тылын уларытыы',
-'resetpass_submit'        => 'Киирии тылы уларыт уонна киир',
-'resetpass_success'       => 'Your password has been changed successfully! Now logging you in...
+'resetpass'                 => 'Киирии тылы уларытыы',
+'resetpass_announce'        => 'Бу бы�тах к�мҥ� туттуллар киирии тылынан киирдиҥ. Түмүкк� �аҥа киирии тылла �уруй:',
+'resetpass_text'            => '<!-- Ти�киһи манна �б�н �уруйуҥ -->',
+'resetpass_header'          => '�ат киирии тылын уларытыы',
+'oldpassword'               => 'Эрг� киирии тыл:',
+'newpassword'               => 'Саҥа киирии тыл:',
+'retypenew'                 => 'Саҥа киирии тылы хатылаа:',
+'resetpass_submit'          => 'Киирии тылы уларыт уонна киир',
+'resetpass_success'         => 'Your password has been changed successfully! Now logging you in...
 Киирии тылыҥ �т�ҥҥ� уларыйда. Сотору к�мин�н киири�ҥ...',
-'resetpass_bad_temporary' => 'Бы�тах к�мҥ� туттуллар киирии тыл �рг�рбит. �рааһа �аҥа киирии тылы олохтообуккун быһылаах.
+'resetpass_bad_temporary'   => 'Бы�тах к�мҥ� туттуллар киирии тыл �рг�рбит. �рааһа �аҥа киирии тылы олохтообуккун быһылаах.
 Киирии тылы �аҥаттан көрдөөн ылыаххын �өп.',
-'resetpass_forbidden'     => 'Киирии тылы уларытар �атаммат',
-'resetpass_missing'       => 'Формаҕа туох да �уох.',
+'resetpass_forbidden'       => 'Киирии тылы уларытар �атаммат',
+'resetpass-no-info'         => '�аккын билиһинн�рд�ххин� �р� бу �ир�йг� быһа тиийи�ххин �өп.',
+'resetpass-submit-loggedin' => 'Киирии тылы уларытыы',
+'resetpass-wrong-oldpass'   => 'Киирии тыл �өп түб��п�т�. 
+Баҕар уларыппытыҥ буолуо �б�т�р бы�тах к�мҥ� туттуллар киирии тылы оҥотторбутуҥ буолуо.',
+'resetpass-temp-password'   => 'Бы�тах к�мҥ� туттуллар киирии тыл:',
 
 # Edit page toolbar
 'bold_sample'     => 'Модьу бичик',
@@ -494,8 +522,8 @@ $1 бÑ�лиÑ�Ñ‚Ñ‚Ñ�н (буукубаттан) ордук буолуо Ñ�уохÑ
 'hr_tip'          => 'Туора �урааһын (наһаа �лб�хтик туттума)',
 
 # Edit pages
-'summary'                          => 'Уларытыыҥ и� хоһооно',
-'subject'                          => 'Ти�м�т�/ба� тыла',
+'summary'                          => 'Уларытыыҥ и� хоһооно:',
+'subject'                          => 'Ти�м�т�/ба� тыла:',
 'minoredit'                        => 'Бу �уолтата �уох уларытыы',
 'watchthis'                        => 'Бу �ир�йи к�т��н көрөргө',
 'savearticle'                      => 'Уларытыыны биг�рг�тии',
@@ -507,8 +535,8 @@ $1 бÑ�лиÑ�Ñ‚Ñ‚Ñ�н (буукубаттан) ордук буолуо Ñ�уохÑ
 'missingsummary'                   => "'''Санатыы:''' Уларыппытыҥ кылга� быһаарыытын �уруйбатаххын. Уларытыыны биг�рг�тт�ххин� улартытыыҥ хо� быһаарыыта �уох барыа.",
 'missingcommenttext'               => 'Манна хо� быһаарыыны �уруй.',
 'missingcommentheader'             => "'''Санатыы:''' Хо� быһаарыы аатын �уруйбатаххын. Биг�рг�тт�ххин� быһаарыыҥ аата �уох барыа.",
-'summary-preview'                  => 'Хо� быһаарыыны көрүү',
-'subject-preview'                  => '�атын көрүү',
+'summary-preview'                  => 'Хо� быһаарыыны көрүү:',
+'subject-preview'                  => '�атын/ти�м�тин көрүү:',
 'blockedtitle'                     => 'Кыттааччы уларытар кыаҕа быһылынна',
 'blockedtext'                      => "<big>'''Эн аатыҥ �б�т�р IP-аадырыһыҥ бобулуннулар.'''</big>
 
@@ -559,33 +587,36 @@ IP-аадырыһыҥ $3, бобуу нүөм�р� — #$5.
 'anontalkpagetext'                 => "----''Бу аатын �пп�т�х кыттааччы ырытар �ир�й�.
 IP-аадырыһа �р� кө�төр.
 Биир IP-аадыры� ха� да киһи�х� б�рилли�н �өп. Ө�кө атын киһи�х� �уруллубут �уругу алҕа� туппут буоллаххына, б�й�ҥ [[Special:UserLogin/signup|ааккын билиһинн�р]] �б�т�р [[Special:UserLogin|киир]], оччоҕо к�лин да булкуур тах�ыа �уоҕа.''",
-'noarticletext'                    => 'Билигин бу �ир�й кураанах. Бу аат атын ы�татыйалга туттулларын [[Special:Search/{{PAGENAME}}|булуоххутун �өп]] �б�т�р маннык ааттаах [{{fullurl:{{FULLPAGENAME}}|action=edit}} �аҥа ы�татыйаны �уруйуоххутун] �өп.',
+'noarticletext'                    => 'Билигин бу �ир�й кураанах.
+Бу аат атын ы�татыйалга туттулларын [[Special:Search/{{PAGENAME}}|булуоххун �өп]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} �урунаалларга көрдүөххүн �өп],
+�б�т�р [{{fullurl:{{FULLPAGENAME}}|action=edit}} маннык ааттаах �аҥа ы�татыйаны �уруйуоххун] �өп</span>.',
 'userpage-userdoesnotexist'        => '"$1" аат б�ли�т�мм�т�х. Бу �ир�йи оҥорор/уларытар баҕалааххын дуо?',
 'clearyourcache'                   => "'''Болҕой - Уларыппыт �ир�йгин �өпкө көрөргө инт�рини�т бырагыраамматын к��һин ыраа�таа.''' '''Mozilla / Firefox / Safari:''' ''Shift'' кнопканы тутан туран ''Reload'' баттаа, �б�т�р ''Ctrl-F5'', ''Ctrl-R'' дуу (Macintosh-ка ''Command-R'') баттаа; '''Konqueror: ''' ''Reload'' ''F5'' �б�т�р баттаа;
 '''Opera:''' к��һин ыраа�тыырга манна ''Tools → Preferences'' киир; '''Internet Explorer:''' ''Ctrl'' тутан туран ''Refresh'' баттаа, �б�т�р ''Ctrl-F5'' баттаа.",
-'usercssjsyoucanpreview'           => '<strong>Көмө:</strong> Саҥа css- �б�т�р js-бил�ни тургутуоххун баҕардаххына �рд� көрөр тим�ҕи баттаа.',
+'usercssjsyoucanpreview'           => "'''Көмө:''' Саҥа css- �б�т�р js-бил�ни тургутуоххун баҕардаххына �рд� көрөр тим�ҕи баттаа.",
 'usercsspreview'                   => "'''Умнума: бу CSS тургутуута �р�.
 Билигин оҥорбутуҥ биг�рг�тилл� илик!'''",
 'userjspreview'                    => "'''Умнума: бу JavaScript тургутуут� �р�, уларыппытыҥ биг�рг�тилл� илик!'''",
 'userinvalidcssjstitle'            => "'''Болҕой:''' Бу ти�м� «$1» �уох. Кыттааччы .css и .js �ир�йд�р� кыра буукубаннан �уруллуохтаахтар, холобур «{{ns:user}}:�ьургун/monobook.css», маннык буолуо �уохтаах «{{ns:user}}:�ьургун/Monobook.css».",
 'updated'                          => '(Саҥардылынна)',
-'note'                             => '<strong>Хо� быһаарыы:</strong>',
-'previewnote'                      => '<strong>Бу көрүү �р�; уларытыылар биг�рг�тилл� иликт�р!</strong>',
+'note'                             => "'''Хо� быһаарыы:'''",
+'previewnote'                      => "'''Бу көрүү �р�; уларытыылар биг�рг�тилл� иликт�р!'''",
 'previewconflict'                  => 'Этот предварительный про�мотр отражает тек�т в верхнем окне редактировани� так, как он будет выгл�деть, е�ли вы решите запи�ать его.',
-'session_fail_preview'             => '<strong>Си�рб�р �е��и� идентификаторын �үт�р�н к�биһ�н �н уларытыыгын кыайан килл�рб�т�.
+'session_fail_preview'             => "'''Си�рб�р �е��и� идентификаторын �үт�р�н к�биһ�н �н уларытыыгын кыайан килл�рб�т�.
 Ө��ө холонон көр. 
-Олох �атамматаҕына биикитт�н [[Special:UserLogout|тах�ан]] баран ө��ө киир�н көрөөр.</strong>',
-'session_fail_preview_html'        => "<strong>Се��и� дааннайдарын �үт�р�н к�биһ�н �и�рб�р �н уларытыыгын килл�рб�т�.</strong>
+Олох �атамматаҕына биикитт�н [[Special:UserLogout|тах�ан]] баран ө��ө киир�н көрөөр.'''",
+'session_fail_preview_html'        => "'''Се��и� дааннайдарын �үт�р�н к�биһ�н �и�рб�р �н уларытыыгын килл�рб�т�.'''
 
 ''{{SITENAME}} ыраа� HTML тылы көҥүллүүр буолан JavaScript туһананнар куһаҕаны оҥоруохтарын �өп, онон �рд� көрдөрүү араарыллыбыт.''
 
-<strong>Ө�кө бу уларытыы туох да куһаҕаны аҕалыа ди�б�т буоллаххына ө��ө биирд� боруобалаа. Ол �атамматаҕына [[Special:UserLogout|тах�ан баран]] ө��ө киир�н көрөөр.</strong>",
-'token_suffix_mismatch'            => '<strong>Эн уларытыыҥ киирб�т�, тоҕо ди�т�хх� �н бырагырааммаҥ �орох �урук б�ли�л�рин �ыыһа көрөр �бит.
+'''Ө�кө бу уларытыы туох да куһаҕаны аҕалыа ди�б�т буоллаххына ө��ө биирд� боруобалаа. Ол �атамматаҕына [[Special:UserLogout|тах�ан баран]] ө��ө киир�н көрөөр.'''",
+'token_suffix_mismatch'            => "'''Эн уларытыыҥ киирб�т�, тоҕо ди�т�хх� �н бырагырааммаҥ �орох �урук б�ли�л�рин �ыыһа көрөр �бит.
 Ы�татыйаны буорту гынымаары уларытыыҥ ылыныллыбата.
-Итинник �ыыһалар үк�үн прок�и-�и�рб�рд�ри туһаннахха тах�ааччылар.</strong>',
+Итинник �ыыһалар үк�үн прок�и-�и�рб�рд�ри туһаннахха тах�ааччылар.'''",
 'editing'                          => 'Уларытыы $1',
 'editingsection'                   => 'Уларытыы $1 (раздел)',
-'editingcomment'                   => 'Уларытыы $1 (ырытыы)',
+'editingcomment'                   => 'Уларытыы $1 (�аҥа �алаа)',
 'editconflict'                     => 'Уларытыы мөккүөр�: $1',
 'explainconflict'                  => "Ы�татыйаны көннөрө олордоххутуна ким �р� �ми� бу ы�татыйаны көннөрбүт.
 Үөһ��ҥи түннүкк� \"Уларытыыны биг�рг�т\" тим�ҕи баттаатахха киири�хт��х барыл �урулунна.
@@ -594,27 +625,29 @@ IP-аадырыһа �р� кө�төр.
 \"Уларытыыны биг�рг�т\" баттаатаххына үөһ��ҥи '''�р�''' ти�ки� хаалыаҕа.",
 'yourtext'                         => 'Ти�киһиҥ',
 'storedversion'                    => 'Суруллубут барыл',
-'nonunicodebrowser'                => '<strong>СЭРЭТИИ: Инт�рини�тиҥ бырагырааммата Юникод кодировканы билимм�т �бит. Ы�татыйаны уларытаргар ASCII-тан атын б�ли�л�р ше�тнадцатиричнай кодка уларытыллыахтара.</strong>',
-'editingold'                       => '<strong>СЭРЭТИИ: Эрг�рбит барылы көннөрө олороҕун.
-Уларытыыны килл�рд�ххин� к�нники уларытыылар �уох буолуохтара.</strong>',
+'nonunicodebrowser'                => "'''СЭРЭТИИ: Инт�рини�тиҥ бырагырааммата Юникод кодировканы билимм�т �бит. Ы�татыйаны уларытаргар ASCII-тан атын б�ли�л�р ше�тнадцатиричнай кодка уларытыллыахтара.'''",
+'editingold'                       => "'''СЭРЭТИИ: Эрг�рбит барылы көннөрө олороҕун.
+Уларытыыны килл�рд�ххин� к�нники уларытыылар �уох буолуохтара.'''",
 'yourdiff'                         => 'Уратылар',
-'copyrightwarning'                 => 'Болҕой, манна оҥоһуллубут �биил�р уонна уларытыылар $2 лицензи�лаахтар (�иһ. маны көр $1). Ө�кө �н ы�татыйаларыҥ көҥүл тарҕаналларын уонна туһаныллалларын баҕарбат буоллаххына манна �уруйума.<br />
+'copyrightwarning'                 => "Болҕой, манна оҥоһуллубут �биил�р уонна уларытыылар $2 лицензи�лаахтар (�иһ. маны көр $1). Ө�кө �н ы�татыйаларыҥ көҥүл тарҕаналларын уонна туһаныллалларын баҕарбат буоллаххына манна �уруйума.<br />
 Эбиитин манна �уруйар матырыйаалгын �б�т�р б�й�ҥ �уруйуохтааххын, �б�т�р көҥүл туһаныллары уонна көҥүл уларытары көҥүллүүр �ирт�н ылбыт буолуохтааххын.
-<strong>КИМ ЭРЭ Б�С БИЛЭР М�ТЫРЫЙ��ЛЫ� КИ�ИТТЭ� КӨҤҮЛЭ СУОХ М���� УГУМ�!</strong>',
-'copyrightwarning2'                => 'Болҕой, �н �уруйбут матырыйаалгын ким баҕарар уларытар уонна �уох гынар бырааптаах. Суруйбуккун уларыталларын �өбүл��б�т буоллаххына манна �уруйума.<br />
-Эбиитин манна �уруйдаххына, уларытыы ааптара мин буолабын, �б�т�р көҥүл туһанары уонна уларытары көҥүллүүр �ирт�н ыллым ди�н биг�рг�т�ҕин (маны көр $1).<br /> <strong>КИМ ЭРЭ Б�С БИЛИИТИ� М���� КИ�ИТТЭ� КӨҤҮЛЭ СУОХ УГУМ�!</strong>',
-'longpagewarning'                  => '<strong>СЭРЭТИИ: Бу �ир�й ыйааһына $1 килобайт.
+'''КИМ ЭРЭ Б�С БИЛЭР М�ТЫРЫЙ��ЛЫ� КИ�ИТТЭ� КӨҤҮЛЭ СУОХ М���� УГУМ�!'''",
+'copyrightwarning2'                => "Болҕой, �н �уруйбут матырыйаалгын ким баҕарар уларытар уонна �уох гынар бырааптаах. Суруйбуккун уларыталларын �өбүл��б�т буоллаххына манна �уруйума.<br />
+Эбиитин манна �уруйдаххына, уларытыы ааптара мин буолабын, �б�т�р көҥүл туһанары уонна уларытары көҥүллүүр �ирт�н ыллым ди�н биг�рг�т�ҕин (маны көр $1).<br /> '''КИМ ЭРЭ Б�С БИЛИИТИ� М���� КИ�ИТТЭ� КӨҤҮЛЭ СУОХ УГУМ�!'''",
+'longpagewarning'                  => "'''СЭРЭТИИ: Бу �ир�й ыйааһына $1 килобайт.
 Сорох инт�рини�т бырагырааммаларыгар 32 kБ ыйааһыҥҥа чугаһыыр �ир�йд�р үчүг�йдик кө�түб�тт�р.
-Онон бука ди�н бу �ир�йи кыра �ир�йд�рг� хайытар туһунан толкуйдааҥ.</strong>',
-'longpageerror'                    => '<strong>ERROR: The text you have submitted is $1 kilobytes
-long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</strong>
-<strong>�ЛҔ�С: Суруйар к�рчиккит $1 килобайт ыйааһыннаах, онтуккут көҥүлл�ммит $2 килобайты куоһарар. Маннык хаалар кыаҕа �уох</strong>',
-'readonlywarning'                  => '<strong>СЭРЭТИИ: Си�рб�рг� техниче�кай үл� бара турар, онон килл�рбит уларытыыларыҥ тута хаалар кыахтара �уох.
-Билигин уларытыыгын б�й�ҥ дии�к�ҕ�р хаалларан баран, к�лин манна уган би�ри�ххин �өп.</strong>',
-'protectedpagewarning'             => '<strong>СЭРЭТИИ:  Бу �ир�й хатанан турар, админи�тратордар �р� уларытар кыахтаахтар.</strong>',
+Онон бука ди�н бу �ир�йи кыра �ир�йд�рг� хайытар туһунан толкуйдааҥ.'''",
+'longpageerror'                    => "'''ERROR: The text you have submitted is $1 kilobytes
+long, which is longer than the maximum of $2 kilobytes. It cannot be saved.'''
+'''�ЛҔ�С: Суруйар к�рчиккит $1 килобайт ыйааһыннаах, онтуккут көҥүлл�ммит $2 килобайты куоһарар. Маннык хаалар кыаҕа �уох'''",
+'readonlywarning'                  => "'''СЭРЭТИИ: Си�рб�рг� техниче�кай үл� бара турар, онон килл�рбит уларытыыларыҥ тута хаалар кыахтара �уох.
+Билигин уларытыыгын б�й�ҥ дии�к�ҕ�р хаалларан баран, к�лин манна уган би�ри�ххин �өп.'''
+
+Дьаһабыл маннык быһаарбыт: $1",
+'protectedpagewarning'             => "'''СЭРЭТИИ:  Бу �ир�й хатанан турар, админи�тратордар �р� уларытар кыахтаахтар.'''",
 'semiprotectedpagewarning'         => "'''Билл�рии:''' Бу �ир�й хатанан турар, ааттарын билиһинн�рбит �р� кыттааччылар уларытар кыахтаахтар.",
 'cascadeprotectedwarning'          => "'''С�р�тии:''' Бу �ир�йи \"дьаһабыллар\" бөлөххө киир�р кыттааччылар �р� уларытар кыахтаахтар, тоҕо ди�т�хх� �ир�й ка�каднай көмү�к�лл��х {{PLURAL:\$1|�ир�й бөлөҕөр|�ир�йд�р бөлөхтөрүг�р}} киир�р:",
-'titleprotectedwarning'            => '<strong>СЭРЭТИИ:  Бу �ир�йи уларытар бобуллубут, аҕыйах �р� киһи уларытыан �өп.</strong>',
+'titleprotectedwarning'            => "'''СЭРЭТИИ:  Бу �ир�йи уларытар бобуллубут, аҕыйах �р� киһи уларытыан �өп.'''",
 'templatesused'                    => 'Манна туттуллубут халыыптар:',
 'templatesusedpreview'             => 'Манна туттуллубут халыыптар:',
 'templatesusedsection'             => 'Манна туттуллубут халыыптар:',
@@ -632,11 +665,22 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'recreate-deleted-warn'            => "'''Болҕой: �отулубут �ир�йи төттөрү оҥорон �р�ҕин.'''
 
 Толкуйдаан баран оҥор. �ллара �отуулар �урунааллара көрдөрүлүнн�.",
+'deleted-notice'                   => 'Бу �ир�й �отуллубут.
+�ллара �отуу �урунаалыгар онно �ыһыаннаах туох �уруллубута кө�төр.',
+'deletelog-fulllog'                => 'Сурунаалы бүтүннүү көрөргө',
+'edit-hook-aborted'                => 'Көннөрүү төттөрү көннөрүллүбүт.
+Эбии туох да быһаарыллыбатах.',
+'edit-gone-missing'                => 'Сир�йи �аҥардар кыах �уох.
+�рааһа �отуллубут быһыылаах.',
+'edit-conflict'                    => 'Көннөрүүл�р утар�ыылара.',
+'edit-no-change'                   => 'Эн көннөрүүҥ киирб�т�, тоҕо ди�т�хх� тугу да уларыппатаххын.',
+'edit-already-exists'              => 'Саҥа �ир�йи оҥорор табыллыбат.
+Маннык �ир�й баар �бит.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Болҕой. Бу �ир�й наһаа �лб�х көмпүүт�ри ноҕуруу�калыыр ре�ур�аларга �иг�н�р.
 
-Сиг�нии ах�аана мантан тах�ыа �уохтаах - $2, билигин ах�аана - $1.',
+{{PLURAL:$2|Сиг�нии ах�аана|Сиг�ниил�р ах�ааннара}} мантан тах�ыа �уохтаах - $2, билигин {{PLURAL:$1|$1 �иг�ниил��х|$1 �иг�ниил�рд��х}}.',
 'expensive-parserfunction-category'       => 'Көмпүүт�ри ноҕуруу�калыыр ре�ур�аларга наһаа �лб�хтик �иг�н�р �ир�йд�р',
 'post-expand-template-inclusion-warning'  => 'Болҕой: Килл�р�р халыыптарыҥ ыйааһыннара наһаа улахан.
 Онон �орох халыыптар килл�рилли�хт�р� �уоҕа.',
@@ -644,6 +688,8 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'post-expand-template-argument-warning'   => 'Болҕой. Бу �ир�йг� баар халыып биир �б�т�р �лб�х наһаа улахан ыйааһыннаах толоруллар аргуменнаах �бит.
 Оннук аргуменнар толоруллубатылар.',
 'post-expand-template-argument-category'  => 'Толоруллубатах (көтүтүллүбүт) аргуменнаах �ир�йд�р',
+'parser-template-loop-warning'            => 'Халыыптар б�й� б�йл�риг�р �иг�ниил�р� (петл�) булулунна: [[$1]]',
+'parser-template-recursion-depth-warning' => '($1) халыып рекур�и�тын муҥура бүппүт (Превышен предел глубины рекур�ии)',
 
 # "Undo" feature
 'undo-success' => 'Правка может быть отменена. Пожалуй�та, про�мотрите �равнение вер�ий, чтобы убедить��, что �то именно те изменени�, которые ва� интере�уют, и нажмите «Запи�ать �траницу», чтобы изменени� в�тупили в �илу.',
@@ -658,29 +704,29 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 Быһаарыыта: $3 - ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Бу �ир�й и�тори�тын көрдөр',
-'nohistory'           => 'Бу �ир�й и�тори�та �уох �бит.',
-'revnotfound'         => 'Уларытыы булуллубата',
-'revnotfoundtext'     => 'Бу �ир�й урукку барыла булуллубата. Ыйынньыгы �ыыһата �уох �уруйбуккун көр.',
-'currentrev'          => 'Билиҥҥи барыл',
-'revisionasof'        => '$1 барыл',
-'revision-info'       => 'Вер�и� от $1; $2',
-'previousrevision'    => '�Инники барыл',
-'nextrevision'        => '�ныгы�кы барыл→',
-'currentrevisionlink' => 'Билиҥҥи барыл',
-'cur'                 => 'бил.',
-'next'                => 'аныгы�кы',
-'last'                => 'бүт�һик',
-'page_first'          => 'ба�такы',
-'page_last'           => 'бүт�һик',
-'histlegend'          => 'Тал: торумнары т�ҥниирг� б�ли�т��. <br />
+'viewpagelogs'           => 'Бу �ир�й и�тори�тын көрдөр',
+'nohistory'              => 'Бу �ир�й и�тори�та �уох �бит.',
+'currentrev'             => 'Билиҥҥи барыл',
+'currentrev-asof'        => 'Билиҥҥи торум манна: $1',
+'revisionasof'           => '$1 барыл',
+'revision-info'          => 'Вер�и� от $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Инники барыл',
+'nextrevision'           => '�ныгы�кы барыл→',
+'currentrevisionlink'    => 'Билиҥҥи барыл',
+'cur'                    => 'бил.',
+'next'                   => 'аныгы�кы',
+'last'                   => 'бүт�һик',
+'page_first'             => 'ба�такы',
+'page_last'              => 'бүт�һик',
+'histlegend'             => 'Тал: торумнары т�ҥниирг� б�ли�т��. <br />
 Легенда: (cur) = билигин баар торумтан атына,
 (бүт�һик) = инники баар торумтан атына, М. = улахан �уолтата �уох көннөрүү.',
-'deletedrev'          => '[�отуллубут]',
-'histfirst'           => 'Эрд�т��ҥи',
-'histlast'            => 'Соторутааҥы',
-'historysize'         => '($1 байт)',
-'historyempty'        => '(кураанах)',
+'history-fieldset-title' => 'И�тори�тын көрүү',
+'deletedrev'             => '[�отуллубут]',
+'histfirst'              => 'Эрд�т��ҥи',
+'histlast'               => 'Соторутааҥы',
+'historysize'            => '($1 байт)',
+'historyempty'           => '(кураанах)',
 
 # Revision feed
 'history-feed-title'          => 'Уларытыы и�тори�та',
@@ -764,6 +810,7 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'mergehistory-invalid-destination' => 'Сир�й �өптөөх ааттаах буолуохтаах.',
 'mergehistory-autocomment'         => '[[:$1]] манна [[:$2]] көһүүт� (көһөрүү)',
 'mergehistory-comment'             => '[[:$1]] манна [[:$2]] көһүүт�. Быһаарыы: $3',
+'mergehistory-same-destination'    => 'Саҕалыыр уонна түмүктүүр �ир�йд�риҥ атын (уратылаах) буолуохтаахтар.',
 
 # Merge log
 'mergelog'           => 'Силб�һиил�р �урунааллара',
@@ -776,119 +823,200 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'difference'              => '(Торумнар б�й�-б�й�л�ритт�н уратылара)',
 'lineno'                  => '$1 �трока:',
 'compareselectedversions' => 'Талыллыбыт торумнары т�ҥн��',
+'visualcomparison'        => 'Хараҕынан т�ҥн��һин',
+'wikicodecomparison'      => 'Биики ти�киһин т�ҥн��һин',
 'editundo'                => 'төнүн',
 'diff-multi'              => '({{PLURAL:$1|$1 орто торум көрдөрүллүб�т�|$1 орто торумнар көрдөрүллүб�тил�р|$1.}})',
+'diff-movedto'            => 'маннык �уруллубут $1',
+'diff-styleadded'         => '$1 и�тиил �биллибит',
+'diff-added'              => '$1 �биллибит',
+'diff-changedto'          => 'манныкка уларытыллыбыт: $1',
+'diff-movedoutof'         => 'мантан ылыллыбыт $1',
+'diff-styleremoved'       => '$1 и�тиил �отуллубут/�отулунна',
+'diff-removed'            => '$1 �отулунна',
+'diff-changedfrom'        => '$1 мантан уларыйда',
+'diff-src'                => 'ылыллыбыт �ир�',
+'diff-withdestination'    => '$1 анааһыннаах',
+'diff-with'               => '&#32;маннык атрибуттаах $1 $2',
+'diff-with-final'         => '&#32;уонна $1 $2',
+'diff-width'              => 'к�тит�',
+'diff-height'             => 'үрдүг�',
+'diff-p'                  => "'''ап�аа�'''",
+'diff-blockquote'         => "'''�ытаата'''",
+'diff-h1'                 => "'''ба� тыл (1 араҥа)'''",
+'diff-h2'                 => "'''ба� тыл (2 араҥа)'''",
+'diff-h3'                 => "'''ба� тыл (3 араҥа)'''",
+'diff-h4'                 => "'''ба� тыл (4 араҥа)'''",
+'diff-h5'                 => "'''ба� тыл (5 араҥа)'''",
+'diff-pre'                => "'''�рд�тт�н формааттаммыт блок'''",
+'diff-div'                => "'''түһүм�х'''",
+'diff-ul'                 => "'''�ааһыламматах тиһик'''",
+'diff-ol'                 => "'''�ааһыламмыт тиһик'''",
+'diff-li'                 => "'''тиһик �л�ми�н�'''",
+'diff-table'              => "'''табылыы��а'''",
+'diff-tbody'              => "'''табылыы��а иһин��ҕит�'''",
+'diff-tr'                 => "'''у�туруока'''",
+'diff-td'                 => "'''�чейка'''",
+'diff-th'                 => "'''аата'''",
+'diff-br'                 => "'''бы�тыыта'''",
+'diff-hr'                 => "'''�ытыары �урааһын'''",
+'diff-code'               => "'''көмпүүт�р куодун бобуу'''",
+'diff-dl'                 => "'''�уолталарын тиһиг�'''",
+'diff-dt'                 => "'''�уолтата быһаарыллар ти�рмин'''",
+'diff-dd'                 => "'''�уолтата'''",
+'diff-input'              => "'''килл�рии'''",
+'diff-form'               => "'''та� кө�түүт�, быһыыта'''",
+'diff-img'                => "'''ойуу'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''�иг�'''",
+'diff-i'                  => "'''иҥн�ри'''",
+'diff-b'                  => "'''модьу'''",
+'diff-strong'             => "'''модьу бичик'''",
+'diff-em'                 => "'''em''' б�ли�т��һин",
+'diff-font'               => "'''бичик'''",
+'diff-big'                => "'''бөдөҥ'''",
+'diff-del'                => "'''�отулунна'''",
+'diff-tt'                 => "'''б�ли�л�рин к�тит� биир т�ҥ бичик'''",
+'diff-sub'                => "'''кыра алын бичик'''",
+'diff-sup'                => "'''кыра үөһ�� бичик'''",
+'diff-strike'             => "'''�отуллубут бичик'''",
 
 # Search results
-'searchresults'             => 'Булулунна',
-'searchresulttext'          => 'Көрдөөһүн туһунан �иһилии ааҕыаххын баҕардаххына [[{{MediaWiki:Helppage}}|маны]] көр.',
-'searchsubtitle'            => 'Эн [[:$1]] көмөтүн�н ([[Special:Prefixindex/$1|"$1" �аҕаланар �ир�йд�ри ]] | [[Special:WhatLinksHere/$1|"$1" �иг�н�р �ир�йд�ри]]) көрдөөбүтүҥ',
-'searchsubtitleinvalid'     => 'По запро�у «$1»',
-'noexactmatch'              => "'''«\$1» ааттаах �ир�й �уох.''' <span style=\"display: block; margin: 1.5em 2em\"> [[:\$1|Саҥа �ир�йи оҥорорго]]</span>",
-'noexactmatch-nocreate'     => "'''Маннык ааттаах: \"\$1\" �ир�й �уох.'''",
-'toomanymatches'            => '�аһаа �лб�х ыйытыы төнүнн�, бука ди�н атыннык көрдөө',
-'titlematches'              => 'Ы�татыйалар ааттара хоһулаһар',
-'notitlematches'            => 'Ы�татыйалар ааттара хоһула�паттар',
-'textmatches'               => 'Ы�татыйалар и�т�р� хатыланар',
-'notextmatches'             => 'Ы�татыйалар и�т�р� хатыламмат',
-'prevn'                     => 'инники $1',
-'nextn'                     => 'аныгы�кы $1',
-'viewprevnext'              => 'Көр ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 тыл|$2 тыл}})',
-'search-result-score'       => 'Релевантноһа: $1%',
-'search-redirect'           => '(утаарыы $1)',
-'search-section'            => '($1 �и�к�ий�)',
-'search-suggest'            => 'Баҕар маннык ди�ри гыммытыҥ буолуо: $1',
-'search-interwiki-caption'  => 'Уруулуу бырайыактар',
-'search-interwiki-default'  => '$1 түмүг�:',
-'search-interwiki-more'     => '(ө��ө)',
-'search-mwsuggest-enabled'  => '�тиил�рд��х',
-'search-mwsuggest-disabled' => '�тиил�р� �уох',
-'search-relatedarticle'     => 'Сиг�н�р',
-'mwsuggest-disable'         => 'AJAX �т�н би�риил�рин араар',
-'searchrelated'             => '�иб���т�ммит',
-'searchall'                 => 'бары',
-'showingresults'            => 'Манна {{PLURAL:$1|түмүк|түмүкт�р}} {{PLURAL:$1|көрдөрүлүнн�|көрдөрүлүннүл�р}} <strong>$1</strong> , мантан �аҕалаан №&nbsp;<strong>$2</strong>.',
-'showingresultsnum'         => 'Манна {{PLURAL:$3|түмүк|түмүкт�р}} {{PLURAL:$3|көрдөрөлүнн�|көрдөрүлүннүл�р}} <strong>$3</strong>, мантан �аҕалаан №&nbsp;<strong>$2</strong>.',
-'showingresultstotal'       => "�ллара {{PLURAL:$3|'''$3''' '''$1''' түмүк|'''$3''' '''$1 - $2''' түмүк}} көрдөрүлүнн�",
-'nonefound'                 => "'''Болҕой:''' �наан �пп�т�хх� көрдөөһүн аат �орох далларыгар �р� көрдүүр. Бу �ыһыарыыны ''all:'' тутуннаххына аат туох баар далларыгар барытыгар (холобур, кыттаачылар ырыытыыларыгар, халыыптарга иҥин) көрдүөҕ�.",
-'powersearch'               => 'Бу бөлөхтөргө көрдөө',
-'powersearch-legend'        => 'Дириҥ�т�н көрдөөһүн',
-'powersearch-ns'            => '�ат далыгар көрдөө:',
-'powersearch-redir'         => 'Утаарыылар и�пииһ�кт�р�',
-'powersearch-field'         => 'Көрдөөһүн',
-'search-external'           => 'Та�тан көрдөөһүн',
-'searchdisabled'            => '{{SITENAME}} көрдүүр т�рил� араарыллыбыт. �тын көрдүүр �и�темаларынан наадыйар �ир�йд�ргитин көрдөтүөххүтүн �өп. Ол гынан баран пои�ковик к��һиг�р баар торум �рг�рбит буолуон �өп.',
+'searchresults'                    => 'Булулунна',
+'searchresults-title'              => 'Көрдөөһүн түмүг� "$1"',
+'searchresulttext'                 => 'Көрдөөһүн туһунан �иһилии ааҕыаххын баҕардаххына [[{{MediaWiki:Helppage}}|маны]] көр.',
+'searchsubtitle'                   => 'Эн [[:$1]] көмөтүн�н ([[Special:Prefixindex/$1|"$1" �аҕаланар �ир�йд�ри ]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" �иг�н�р �ир�йд�ри]]) көрдөөбүтүҥ',
+'searchsubtitleinvalid'            => 'По запро�у «$1»',
+'noexactmatch'                     => "'''«\$1» ааттаах �ир�й �уох.''' <span style=\"display: block; margin: 1.5em 2em\"> [[:\$1|Саҥа �ир�йи оҥорорго]]</span>",
+'noexactmatch-nocreate'            => "'''Маннык ааттаах: \"\$1\" �ир�й �уох.'''",
+'toomanymatches'                   => '�аһаа �лб�х ыйытыы төнүнн�, бука ди�н атыннык көрдөө',
+'titlematches'                     => 'Ы�татыйалар ааттара хоһулаһар',
+'notitlematches'                   => 'Ы�татыйалар ааттара хоһула�паттар',
+'textmatches'                      => 'Ы�татыйалар и�т�р� хатыланар',
+'notextmatches'                    => 'Ы�татыйалар и�т�р� хатыламмат',
+'prevn'                            => 'инники $1',
+'nextn'                            => 'аныгы�кы $1',
+'viewprevnext'                     => 'Көр ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Көрдөөһүн туруоруулара',
+'searchmenu-exists'                => "'''Бу биикиг� бу �ир�й маннык ааттаах \"[[\$1]]\"'''",
+'searchmenu-new'                   => "'''Бу биикиг� \"[[:\$1]]\" �ир�йи айарга!'''",
+'searchhelp-url'                   => 'Help:Көмө',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Маннык префик�таах �ир�йд�ри көрөргө]]',
+'searchprofile-articles'           => 'Ы�татыйаларынан',
+'searchprofile-articles-and-proj'  => 'Ы�татыйаларынан уонна бырайыак �ир�йд�рин иһин�н',
+'searchprofile-project'            => 'Бырайыак �ир�йд�рин�н',
+'searchprofile-images'             => 'Бил�л�р',
+'searchprofile-everything'         => 'Барыта',
+'searchprofile-advanced'           => 'Дириҥ�тиллибит',
+'searchprofile-articles-tooltip'   => 'Манна $1 көрдөөһүн',
+'searchprofile-project-tooltip'    => 'Манна $1 көрдөөһүн',
+'searchprofile-images-tooltip'     => 'Бил�л�ри көрдөөһүн',
+'searchprofile-everything-tooltip' => 'Сир�йд�рг� барытыгар (ырытыы ги�нн�риг�р �ми�) көрдөөһүн',
+'searchprofile-advanced-tooltip'   => 'Этиллибит аат далларыгар көрдөөһүн',
+'prefs-search-nsdefault'           => 'Эрд�тт�н туруоруулары туһанан көрдөөһүн:',
+'prefs-search-nscustom'            => 'Эрд�тт�н �тиллибит аат далларыгар көрдөөһүн:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 тыл|$2 тыл}})',
+'search-result-score'              => 'Релевантноһа: $1%',
+'search-redirect'                  => '(утаарыы $1)',
+'search-section'                   => '($1 �и�к�ий�)',
+'search-suggest'                   => 'Баҕар маннык ди�ри гыммытыҥ буолуо: $1',
+'search-interwiki-caption'         => 'Уруулуу бырайыактар',
+'search-interwiki-default'         => '$1 түмүг�:',
+'search-interwiki-more'            => '(ө��ө)',
+'search-mwsuggest-enabled'         => '�тиил�рд��х',
+'search-mwsuggest-disabled'        => '�тиил�р� �уох',
+'search-relatedarticle'            => 'Сиг�н�р',
+'mwsuggest-disable'                => 'AJAX �т�н би�риил�рин араар',
+'searchrelated'                    => '�иб���т�ммит',
+'searchall'                        => 'бары',
+'showingresults'                   => 'Манна {{PLURAL:$1|түмүк|түмүкт�р}} {{PLURAL:$1|көрдөрүлүнн�|көрдөрүлүннүл�р}} <strong>$1</strong> , мантан �аҕалаан №&nbsp;<strong>$2</strong>.',
+'showingresultsnum'                => 'Манна {{PLURAL:$3|түмүк|түмүкт�р}} {{PLURAL:$3|көрдөрөлүнн�|көрдөрүлүннүл�р}} <strong>$3</strong>, мантан �аҕалаан №&nbsp;<strong>$2</strong>.',
+'showingresultstotal'              => "�ллара {{PLURAL:$4|'''$3''' '''$1''' түмүк|'''$3''' '''$1 - $2''' түмүк}} көрдөрүлүнн�",
+'nonefound'                        => "'''Болҕой:''' �наан �пп�т�хх� көрдөөһүн аат �орох далларыгар �р� көрдүүр. Бу �ыһыарыыны ''all:'' тутуннаххына аат туох баар далларыгар барытыгар (холобур, кыттаачылар ырыытыыларыгар, халыыптарга иҥин) көрдүөҕ�.",
+'search-nonefound'                 => 'Көрдөбүлг� �ппи�ттиир бил�л�р кө�түб�тил�р.',
+'powersearch'                      => 'Бу бөлөхтөргө көрдөө',
+'powersearch-legend'               => 'Дириҥ�т�н көрдөөһүн',
+'powersearch-ns'                   => '�ат далыгар көрдөө:',
+'powersearch-redir'                => 'Утаарыылар и�пииһ�кт�р�',
+'powersearch-field'                => 'Көрдөөһүн',
+'search-external'                  => 'Та�тан көрдөөһүн',
+'searchdisabled'                   => '{{SITENAME}} көрдүүр т�рил� араарыллыбыт. �тын көрдүүр �и�темаларынан наадыйар �ир�йд�ргитин көрдөтүөххүтүн �өп. Ол гынан баран пои�ковик к��һиг�р баар торум �рг�рбит буолуон �өп.',
 
 # Preferences page
-'preferences'              => 'Уларытыылар',
-'mypreferences'            => 'Туруорууларым',
-'prefs-edits'              => 'Көннөрүү ах�аана:',
-'prefsnologin'             => '�аккын �пп�тиҥ',
-'prefsnologintext'         => 'Эн <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ааккын �тт�ххин�]</span> �р� кыттаачы туруорууларын уларытар кыахтаныаҥ.',
-'prefsreset'               => 'Саҥа киир�рг� баар туруоруулар төнүннүл�р.',
-'qbsettings'               => '�авигаци� панела',
-'qbsettings-none'          => 'Көрдөрүм�',
-'qbsettings-fixedleft'     => 'Хаҥа� өттө хам�аабат',
-'qbsettings-fixedright'    => 'Уҥа өттө хам�аабат',
-'qbsettings-floatingleft'  => 'Хаҥа� өттө у�таҥныыр',
-'qbsettings-floatingright' => 'Уҥа өттө у�таҥныыр',
-'changepassword'           => 'Киирии тылы уларытарга',
-'skin'                     => 'Та� кө�түү',
-'math'                     => 'Фуормулалар',
-'dateformat'               => 'Дьыл-хонук формаата',
-'datedefault'              => 'Көннөрү кө�түүт�',
-'datetime'                 => 'Күн�-дьыла уонна к�м�',
-'math_failure'             => 'Сатаан ааҕыллыбата',
-'math_unknown_error'       => 'биллиб�т алҕа�',
-'math_unknown_function'    => 'биллиб�т дьайыы (функци�)',
-'math_lexing_error'        => 'лек�иката алҕа�таах',
-'math_syntax_error'        => '�интак�и� алҕаһа',
-'math_image_error'         => 'PNG-га уларытыы �атаммата; latex, dvips, gs, уонна convert туруоруулара �өбүн көр',
-'math_bad_tmpdir'          => 'Математика бы�тах к�мн��ҕи директори�та �атаан оҥоһуллубута',
-'math_bad_output'          => 'Математика таһынааҕы директори�та �атаан оҥоһуллубата',
-'math_notexvc'             => 'texvc кыайан толоруллубата; маны math/README көр.',
-'prefs-personal'           => 'Кыттааччы туруоруулара',
-'prefs-rc'                 => 'К�лиҥҥи уларытыылар',
-'prefs-watchlist'          => 'К�т��һин',
-'prefs-watchlist-days'     => 'Ха� хонуктааҕы уларыйыылар к�т��һин и�пииһ�г�р кө�төллөрө:',
-'prefs-watchlist-edits'    => 'Ха� уларытыыны туп�арыллыбыт к�т��һиҥҥ� көрдөрөрө:',
-'prefs-misc'               => '�тын туруоруулар',
-'saveprefs'                => 'Биг�рг�т',
-'resetprefs'               => 'Биг�рг�тиллиб�т�х уларыйыылары �от',
-'oldpassword'              => 'Эрг� киирии тыл:',
-'newpassword'              => 'Саҥа киирии тыл:',
-'retypenew'                => 'Саҥа киирии тылы хатылаа:',
-'textboxsize'              => 'Уларытыы',
-'rows'                     => 'Строкаалара:',
-'columns'                  => 'Колонкалара:',
-'searchresultshead'        => 'Көрдөөһүн түмүг�',
-'resultsperpage'           => 'Сир�йг� булуллубут �уруктар ах�ааннара:',
-'contextlines'             => 'Булуллубут �ир�й ха� �трокатын көрдөрөрө:',
-'contextchars'             => 'Строкааҕа контек�т б�ли�л�рин ах�аана:',
-'stub-threshold'           => '<a href="#" class="stub">омооннорго ыйынньыктары</a> оҥоруу боруога:',
-'recentchangesdays'        => 'Ха� хонук иһин�н уларытыылары көрдөрөргө:',
-'recentchangescount'       => 'И�тори�ларга уонна реги�траци� �урунаалларыгар көрдөрүлл�р �аҥа уларытыылар ах�ааннара:',
-'savedprefs'               => 'Эн туруорууларыҥ олохтоннулар.',
-'timezonelegend'           => 'Чаһыы пуойаһа',
-'timezonetext'             => '¹Эн бири�м�ҥ �и�рб�р (Гринвич, UTC) бири�м�титт�н ха� чаа� уратылааҕын килл�р.',
-'localtime'                => 'Олорор �ириҥ бири�м�т�',
-'timezoneoffset'           => 'Сыҕарыйыы',
-'servertime'               => 'Си�рб�р бири�м�т�',
-'guesstimezone'            => 'Инт�рини�тиҥ бырагыраамматыттан ылан толор',
-'allowemail'               => '�тын кыттааччылартан �урук тутары көҥүллүүрг�',
-'prefs-searchoptions'      => 'Көрдөөһүн туруоруулара',
-'prefs-namespaces'         => '�ат дала',
-'defaultns'                => 'Чопчу ыйыллыбатаҕына бу ааттар быы�тарыгар көрдүүрг�:',
-'default'                  => 'чопчу ыйыллыбатаҕына маннык',
-'files'                    => 'Бил�л�р',
+'preferences'               => 'Уларытыылар',
+'mypreferences'             => 'Туруорууларым',
+'prefs-edits'               => 'Көннөрүү ах�аана:',
+'prefsnologin'              => '�аккын �пп�тиҥ',
+'prefsnologintext'          => 'Эн <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ааккын �тт�ххин�]</span> �р� кыттаачы туруорууларын уларытар кыахтаныаҥ.',
+'prefsreset'                => 'Саҥа киир�рг� баар туруоруулар төнүннүл�р.',
+'qbsettings'                => '�авигаци� панела',
+'qbsettings-none'           => 'Көрдөрүм�',
+'qbsettings-fixedleft'      => 'Хаҥа� өттө хам�аабат',
+'qbsettings-fixedright'     => 'Уҥа өттө хам�аабат',
+'qbsettings-floatingleft'   => 'Хаҥа� өттө у�таҥныыр',
+'qbsettings-floatingright'  => 'Уҥа өттө у�таҥныыр',
+'changepassword'            => 'Киирии тылы уларытарга',
+'skin'                      => 'Та� кө�түү',
+'skin-preview'              => 'Хайдах буолара',
+'math'                      => 'Фуормулалар',
+'dateformat'                => 'Дьыл-хонук формаата',
+'datedefault'               => 'Көннөрү кө�түүт�',
+'datetime'                  => 'Күн�-дьыла уонна к�м�',
+'math_failure'              => 'Сатаан ааҕыллыбата',
+'math_unknown_error'        => 'биллиб�т алҕа�',
+'math_unknown_function'     => 'биллиб�т дьайыы (функци�)',
+'math_lexing_error'         => 'лек�иката алҕа�таах',
+'math_syntax_error'         => '�интак�и� алҕаһа',
+'math_image_error'          => 'PNG-га уларытыы �атаммата; latex, dvips, gs, уонна convert туруоруулара �өбүн көр',
+'math_bad_tmpdir'           => 'Математика бы�тах к�мн��ҕи директори�та �атаан оҥоһуллубута',
+'math_bad_output'           => 'Математика таһынааҕы директори�та �атаан оҥоһуллубата',
+'math_notexvc'              => 'texvc кыайан толоруллубата; маны math/README көр.',
+'prefs-personal'            => 'Кыттааччы туруоруулара',
+'prefs-rc'                  => 'К�лиҥҥи уларытыылар',
+'prefs-watchlist'           => 'К�т��һин',
+'prefs-watchlist-days'      => 'Ха� хонуктааҕы уларыйыылар к�т��һин и�пииһ�г�р кө�төллөрө:',
+'prefs-watchlist-days-max'  => '(улааппыта 7 күн)',
+'prefs-watchlist-edits'     => 'Ха� уларытыыны туп�арыллыбыт к�т��һиҥҥ� көрдөрөрө:',
+'prefs-watchlist-edits-max' => '(улааппыта: 1000)',
+'prefs-misc'                => '�тын туруоруулар',
+'prefs-resetpass'           => 'Кирии тылы уларытыы',
+'saveprefs'                 => 'Биг�рг�т',
+'resetprefs'                => 'Биг�рг�тиллиб�т�х уларыйыылары �от',
+'textboxsize'               => 'Уларытыы',
+'prefs-edit-boxsize'        => 'Эр�д��к�ий�лиир түннүк улахана.',
+'rows'                      => 'Строкаалара:',
+'columns'                   => 'Колонкалара:',
+'searchresultshead'         => 'Көрдөөһүн түмүг�',
+'resultsperpage'            => 'Сир�йг� булуллубут �уруктар ах�ааннара:',
+'contextlines'              => 'Булуллубут �ир�й ха� �трокатын көрдөрөрө:',
+'contextchars'              => 'Строкааҕа контек�т б�ли�л�рин ах�аана:',
+'stub-threshold'            => '<a href="#" class="stub">омооннорго ыйынньыктары</a> оҥоруу боруога:',
+'recentchangesdays'         => 'Ха� хонук иһин�н уларытыылары көрдөрөргө:',
+'recentchangesdays-max'     => '(улааппыта $1 күн)',
+'recentchangescount'        => 'Саҥа уларытыылар тиһикт�риг�р, �ир�йд�р и�тори�ларыгар уонна �урунаалларга көрдөрүлл�р �аҥа уларытыылар ах�ааннара:',
+'savedprefs'                => 'Эн туруорууларыҥ олохтоннулар.',
+'timezonelegend'            => 'Олохтоох к�м',
+'timezonetext'              => '¹Олохтоох к�миҥ �и�рб�р (Гринвич, UTC) к�митт�н ха� чаа� уратылааҕын килл�р.',
+'localtime'                 => 'Олохтоох к�мим:',
+'timezoneselect'            => 'Олохтоох к�м:',
+'timezoneuseserverdefault'  => 'Си�рб�р туруоруутунан',
+'timezoneuseoffset'         => '�тын (�ыҕарыйыытын көрдөр)',
+'timezoneoffset'            => 'Сыҕарыйыы¹:',
+'servertime'                => 'Си�рб�р бири�м�т�:',
+'guesstimezone'             => 'Инт�рини�тим бырагыраамматыттан ылан толор',
+'allowemail'                => '�тын кыттааччылартан �урук тутары көҥүллүүбүн',
+'prefs-searchoptions'       => 'Көрдөөһүн туруоруулара',
+'prefs-namespaces'          => '�ат дала',
+'defaultns'                 => 'Чопчу ыйыллыбатаҕына бу ааттар быы�тарыгар көрдүүрг�:',
+'default'                   => 'чопчу ыйыллыбатаҕына маннык',
+'files'                     => 'Бил�л�р',
 
 # User rights
 'userrights'                  => 'Кыттааччылар бырааптарын �алайыы', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Кыттаачылар бөлөхтөрүн �алайыы',
 'userrights-user-editname'    => 'Кыттааччы аата:',
 'editusergroup'               => 'Кыттааччылар бөлөхтөрүн уларытарга',
-'editinguser'                 => "'''[[User:$1|$1]]''' кыттааччы быраабын уларытыы ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "'''[[User:$1|$1]]''' кыттааччы быраабын уларытыы ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Кыттааччы бөлөхтөрүн уларытарга',
 'saveusergroups'              => 'Кыттааччы бөлөхтөрүн биг�рг�т',
 'userrights-groupsmember'     => 'Бу бөлөхтөргө киир�р:',
@@ -909,7 +1037,7 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'group-user'          => 'Кыттааччылар',
 'group-autoconfirmed' => '�птамаатынан биг�рг�тиллибит кыттааччылар',
 'group-bot'           => 'Роботтар',
-'group-sysop'         => 'Дьаһабыл',
+'group-sysop'         => 'Дьаһабыллар',
 'group-bureaucrat'    => 'Бюрокрааттар',
 'group-suppress'      => '�лҕа�тар',
 'group-all'           => '(бары)',
@@ -937,6 +1065,8 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'right-minoredit'            => 'Уларытыыны кыра �уолталаах курдук б�ли�т��',
 'right-move'                 => 'Сир�йд�р ааттарын уларытыы',
 'right-move-subpages'        => 'Сир�йд�р ааттарын иһиг�р киир�р �ир�йд�ри кытта уларытыы',
+'right-move-rootuserpages'   => 'Кыттааччылар �ир�йд�рин аатын уларытыы',
+'right-movefile'             => 'бил�л�р ааттарын уларытыы',
 'right-suppressredirect'     => '�атын уларытарга урукку ааттан утаарыы �ир�й кыайан оҥоһуллубат',
 'right-upload'               => 'Бил�л�ри килл�р',
 'right-reupload'             => 'Баар бил�ни �аҥаттан �уруттар',
@@ -987,9 +1117,46 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'rightslogentry' => '$1 кыттаачы киир�р бырааба $2-тан $3 уларыйда',
 'rightsnone'     => '(�уох)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'бу �ир�йи ааҕыы',
+'action-edit'                 => 'бу �ир�йи көннөрүү',
+'action-createpage'           => '�ир�йд�ри оҥоруу',
+'action-createtalk'           => 'ырытыы �ир�йд�рин оҥоруу',
+'action-createaccount'        => 'кыттааччы бу б�ли�т�н�р аатын оҥоруу',
+'action-minoredit'            => 'бу уларытыыны �уолтата �уох курдук б�ли�т��',
+'action-move'                 => 'бу �ир�й аатын уларытыы',
+'action-move-subpages'        => 'бу �ир�й уонна кини аннынааҕы �ир�йд�р ааттарын уларытыы',
+'action-move-rootuserpages'   => 'кыттааччылар ту� �ир�йд�рин аатын уларытыы',
+'action-movefile'             => 'бу бил�ни аатын уларытарга',
+'action-upload'               => 'бу бил�ни �уруттар',
+'action-reupload'             => 'баар бил�ни хат �уруйуу',
+'action-reupload-shared'      => 'бу бил� уоп�ай ы�кылаакка баар (перекрытие файла из общего хранилища)',
+'action-upload_by_url'        => 'бу бил�ни URL-аадыры�тан килл�рии',
+'action-writeapi'             => 'көннөрөргө API-ны туһаныы',
+'action-delete'               => 'бу �ир�йи �отуу',
+'action-deleterevision'       => 'бу торуму �отуу',
+'action-deletedhistory'       => 'бу �ир�й �отуллубут и�тори�тын көрүү',
+'action-browsearchive'        => '�отуллубут �ир�йд�ри көрдөөһүн',
+'action-undelete'             => 'бу �ир�йи төннөрүү',
+'action-suppressrevision'     => '�ир�й бу ки�т�ммит торумун көрүү уонна төннөрүү',
+'action-suppressionlog'       => 'бу ту� �урунаалы көрүү',
+'action-block'                => 'кыттааччы уларытыыны оҥорорун бобуу',
+'action-protect'              => 'бу �ир�й хары�халын таһымын уларытыы',
+'action-import'               => 'бу �ир�йи атын биикитт�н килл�рии',
+'action-importupload'         => 'бу �ир�йи �рд� �уруллубут бил�тт�н килл�рии',
+'action-patrol'               => 'атыттар көннөрүүл�рин ботуруулламмыт курдук б�ли�т��',
+'action-autopatrol'           => 'б�й� көннөрүүтүн ботуруулламмыт курдук б�ли�т��һин',
+'action-unwatchedpages'       => 'ким да к�т��б�т �ир�йд�рин тиһикт�рин көрүү',
+'action-trackback'            => 'trackback Ñ‹Ñ‹Ñ‚Ñ‹Ñ‹',
+'action-mergehistory'         => 'бу �ир�й и�тори�тын холбооһун',
+'action-userrights'           => 'кыттар бары бырааптарын уларытыы',
+'action-userrights-interwiki' => 'атын биикиг� кыттыы бырааптарын уларытыы',
+'action-siteadmin'            => 'бил� олоҕун хааччахтааһын уонна хааччахтааһынын у�туу',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|уларытыы|уларытыылар}}',
 'recentchanges'                     => 'К�нники уларытыылар',
+'recentchanges-legend'              => 'К�лиҥҥи уларытыылар хайдах кө�төллөрүн туруоруу',
 'recentchangestext'                 => 'Манна хаһан киирибитин�н �ааһыланан {{SITENAME}} к�нники уларыытыылара �урулуннулар.',
 'recentchanges-feed-description'    => 'Бу ботуокка биики бүт�һик уларыйыыларын к�тиирг�.',
 'rcnote'                            => "{{PLURAL:$2|хонук|'''$2''' хонуктар}} иһин�н бүт�һик {{PLURAL:$1|'''1''' уларыйыы|'''$1''' уларыйыылар}}, $5, $4.",
@@ -1013,6 +1180,8 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'rc_categories'                     => 'Бу �р� категори�лартан (араар б�ли� "|")',
 'rc_categories_any'                 => 'Ханнык баҕарар',
 'newsectionsummary'                 => '/* $1 */ �аҥа �и�к�ий�',
+'rc-enhanced-expand'                => 'Сиһилии көрдөр (JavaScript туһаныллар)',
+'rc-enhanced-hide'                  => 'Сиһилиитин көрдөрүм�',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Сиг�н�р уларытыылар',
@@ -1033,11 +1202,11 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'upload_directory_read_only'  => '($1) директори�ҕа �и�рб�р бил�ни �уруйар кыаҕа �уох.',
 'uploaderror'                 => 'Бил� �уруллубата',
 'uploadtext'                  => "Бу форманы туһанан �и�рб�рг� бил�л�ри �уруйуоххун �өп.
-Урут �уруллубут бил�л�ри көрөргө манна тиий: [[Special:ImageList|ойуулар тиһикт�р�]]. Бил�л�ри �уруйуу уонна икки�т��н �уруйуу у�туоруйата [[Special:Log/upload|манна]], �отуу у�туоруйата [[Special:Log/delete|манна]] кө�төллөр.
+Урут �уруллубут бил�л�ри көрөргө манна тиий: [[Special:FileList|ойуулар тиһикт�р�]]. Бил�л�ри �уруйуу уонна икки�т��н �уруйуу у�туоруйата [[Special:Log/upload|манна]], �отуу у�туоруйата [[Special:Log/delete|манна]] кө�төллөр.
 
 Ойууну ы�татыйаҕа килл�р�рг� маннык �уруйуллар:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' ойуу хайдах баарынан (кыччаппакка)
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|хо� быһаарыы]]</nowiki></tt>''' 200 пиик��л к�титт��х аллараа өттүг�р быһаарыы �уруктаах �кран хаҥа� кырыытыгар �ы�тар ойуу
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' ойуу хайдах баарынан (кыччаппакка)
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|хо� быһаарыы]]</nowiki></tt>''' 200 пиик��л к�титт��х аллараа өттүг�р быһаарыы �уруктаах �кран хаҥа� кырыытыгар �ы�тар ойуу
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' - ойууну б�й�тин көрдөрбөккө �иг�тин �р� көрдөрүү.",
 'upload-permitted'            => 'Көҥүлл�ммит бил� көрүҥн�р�: $1.',
 'upload-preferred'            => 'Маннык бил� көрүҥн�рин туһанар ордук: $1.',
@@ -1045,7 +1214,7 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'uploadlog'                   => 'уларытыы у�туоруйата',
 'uploadlogpage'               => 'Уларытыы у�туоруйата',
 'uploadlogpagetext'           => 'Манна бүт�һик уларытыылар тиһикт�р� кө�төр.
-Ө��ө [[Special:NewImages|�аҥа бил�л�р]] тиһикт�рин көрүөххүн �өп.',
+Ө��ө [[Special:NewFiles|�аҥа бил�л�р]] тиһикт�рин көрүөххүн �өп.',
 'filename'                    => 'Бил� аата',
 'filedesc'                    => 'Быһаарыы',
 'fileuploadsummary'           => 'Быһаарыы:',
@@ -1067,23 +1236,26 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'large-file'                  => 'Манна $1 байт аннынан ыйааһыннаах ойуулары туттар ордук (�н �уруйбут бил�ҥ $2 байтаах).',
 'largefileserver'             => 'Бил� ыйааһына көҥүлл�ммитт�н ордук.',
 'emptyfile'                   => 'Суруйбут бил�ҥ арааһа кураанах быһылаах. Баҕар бил� аатын �ыыһа �уруйбутуҥ буолаарай. Ө��ө төгүл көр.',
-'fileexists'                  => 'Инник ааттаах бил� б�ли�р баар �бит, ону уларытыаххын �аарбахтыыр буоллаххына - маны көр <strong><tt>$1</tt></strong>.',
-'filepageexists'              => 'Бу бил�ни быһаарар �ир�й номнуо оҥоһуллубут <strong><tt>$1</tt></strong>, ол гынан баран маннык ааттаах �ир�й �уох.
+'fileexists'                  => "Инник ааттаах бил� б�ли�р баар �бит, ону уларытыаххын �аарбахтыыр буоллаххына - маны көр '''<tt>$1</tt>'''.",
+'filepageexists'              => "Бу бил�ни быһаарар �ир�й номнуо оҥоһуллубут '''<tt>$1</tt>''', ол гынан баран маннык ааттаах �ир�й �уох.
 Килл�рбит быһаарыыҥ быһаарыы �ир�йиг�р тах�ыа �уоҕа.
-Саҥа быһаарыыны �б�р буоллаххына илиигин�н уларытыаххын наада.',
-'fileexists-extension'        => 'Майгынныыр ааттаах бил� баар:<br />
-Эн �уруйбут бил�ҥ аата: <strong><tt>$1</tt></strong><br />
-Уруккуттан баар бил� аата: <strong><tt>$2</tt></strong><br />
-�тын аатта таларыҥ буоллар.',
+Саҥа быһаарыыны �б�р буоллаххына илиигин�н уларытыаххын наада.",
+'fileexists-extension'        => "Майгынныыр ааттаах бил� баар:<br />
+Эн �уруйбут бил�ҥ аата: '''<tt>$1</tt>'''<br />
+Уруккуттан баар бил� аата: '''<tt>$2</tt>'''<br />
+�тын аатта таларыҥ буоллар.",
 'fileexists-thumb'            => "<center>'''Баар ойуу'''</center>",
-'fileexists-thumbnail-yes'    => 'Ойуу арааһа кыччатыллыбыт ойуу (миниатюра) быһыылаах. Көр <strong><tt>$1</tt></strong>.<br /> Бу ойуу урукку ойуу кыччатыллыбыта буоллаҕына �уруйар наадата �уох.',
-'file-thumbnail-no'           => 'Бил� аата мантан �аҕаланар <strong><tt>$1</tt></strong>. 
-�рааһа ойуу кыра куоппуйата быһыылаах <i>(миниатюра)</i>. 
-Бу ойуу толору барыйаана баар буоллаҕына ону манна �уруй, �б�т�р аатын уларыт.',
-'fileexists-forbidden'        => 'Маннык ааттаах ойуу баар, төннөн атыннык ааттаа. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Ойуу арааһа кыччатыллыбыт ойуу (миниатюра) быһыылаах. Көр '''<tt>$1</tt>'''.<br /> Бу ойуу урукку ойуу кыччатыллыбыта буоллаҕына �уруйар наадата �уох.",
+'file-thumbnail-no'           => "Бил� аата мантан �аҕаланар '''<tt>$1</tt>'''. 
+�рааһа ойуу кыра куоппуйата быһыылаах ''(миниатюра)''. 
+Бу ойуу толору барыйаана баар буоллаҕына ону манна �уруй, �б�т�р аатын уларыт.",
+'fileexists-forbidden'        => 'Маннык ааттаах бил� баар, хат �уруллар кыаҕа �уох.
+
+Син биир бу бил�ни килл�ри�ххин баҕарар буоллаххына төннөн атыннык ааттаа. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Маннык ааттаах ойуу уоп�ай ы�кылаакка баар �бит. 
-Ол да буоллар бил�ни килл�ри�ххин баҕарар буоллаххына төннөн атыннык ааттаа. [[Image:$1|thumb|center|$1]]',
+Ол да буоллар бил�ни килл�ри�ххин баҕарар буоллаххына төннөн атыннык ааттаа. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Бу бил� атын {{PLURAL:$1|бил� дубликаата|бил�л�р дубликааттара}} буолар:',
+'file-deleted-duplicate'      => 'Маннык бил� ([[$1]]) урут �отуллубут �бит. Суруттарыаҥ иннин� ба�таан тоҕо �отуллубутун көр.',
 'successfulupload'            => 'Сатанна',
 'uploadwarning'               => 'С�р�тии',
 'savefile'                    => 'Бил�ни �уруттарыы',
@@ -1102,7 +1274,7 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 'upload-wasdeleted'           => "'''С�р�тии: Эн �уох оҥоһуллубут би�ни �аҥаттан �уруйан �р�ҕин.'''
 
 Бу бил�ни �уруттарар тоҕоо�тооҕун ырыҥалаан көр. Суох оҥорууну (�отторууну) реги�траци�лыыр файл манна баар:",
-'filename-bad-prefix'         => 'Килл�р��ри гынар бил�ҥ аата <strong>"$1"</strong> фотоаппарат аптамаатынан ааттыыр аатыгар майгынныыр. Бука ди�н атыннык, арыый �иһилии ааттаан килл�р�риҥ буоллар.',
+'filename-bad-prefix'         => "Килл�р��ри гынар бил�ҥ аата '''\"\$1\"''' фотоаппарат аптамаатынан ааттыыр аатыгар майгынныыр. Бука ди�н атыннык, арыый �иһилии ааттаан килл�р�риҥ буоллар.",
 'filename-prefix-blacklist'   => ' #<!-- Бу �троканы оннунан хааллар --> <pre>
 # Синтак�ииһа маннык:
 #   * Бу "#" б�ли�тт�н �аҕалаан �трока бүтүөр дылы быһаарыы
@@ -1140,20 +1312,21 @@ PICT # misc.
 'upload_source_url'  => ' (�өптөөх URL, ким баҕарбыт киир�р �ир�)',
 'upload_source_file' => ' (бил� компьютергар баар)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Бу анал �ир�й килл�риллибит бил�л�ри барытын көрдөрөр.
+# Special:ListFiles
+'listfiles-summary'     => 'Бу анал �ир�й килл�риллибит бил�л�ри барытын көрдөрөр.
 Соторутааҕыта килл�риллибитт�р үөһ� �ылдьаллар.
 Колонка баһын баттаатаххына наардааһын б�р��д�г� уларыйар.',
-'imagelist_search_for'  => 'Ми�дьий�ни (ойууну) аатынан көрдөтүү:',
+'listfiles_search_for'  => 'Ми�дьий�ни (ойууну) аатынан көрдөтүү:',
 'imgfile'               => 'бил�',
-'imagelist'             => 'Бил�л�р',
-'imagelist_date'        => 'Күн�-ыйа',
-'imagelist_name'        => '�ата',
-'imagelist_user'        => 'Кыттааччы',
-'imagelist_size'        => 'К��м�й�',
-'imagelist_description' => 'Быһаарыыта',
-
-# Image description page
+'listfiles'             => 'Бил�л�р',
+'listfiles_date'        => 'Күн�-ыйа',
+'listfiles_name'        => '�ата',
+'listfiles_user'        => 'Кыттааччы',
+'listfiles_size'        => 'К��м�й�',
+'listfiles_description' => 'Быһаарыыта',
+'listfiles_count'       => 'Барыллар',
+
+# File description page
 'filehist'                       => 'Бил� у�туоруйата',
 'filehist-help'                  => 'Ыйын-күнүн/к�мин баттаа, оччотооҕуга баар буолбут.',
 'filehist-deleteall'             => 'барытын �от',
@@ -1161,19 +1334,25 @@ PICT # misc.
 'filehist-revert'                => 'Ñ‚Ó©Ñ‚Ñ‚Ó©Ñ€Ò¯',
 'filehist-current'               => 'билиҥҥи',
 'filehist-datetime'              => 'Күн�-ыйа/К�м�',
+'filehist-thumb'                 => 'Ойуучаан',
+'filehist-thumbtext'             => '$1 торум оччугуй ойуута (миниатюрата)',
+'filehist-nothumb'               => 'Оччугуй ойуута �уох',
 'filehist-user'                  => 'Кыттааччы',
 'filehist-dimensions'            => 'К��м�йд�р�',
 'filehist-filesize'              => 'Бил� к��м�й�',
 'filehist-comment'               => 'Хо� быһаарыы',
-'imagelinks'                     => 'Ыйынньыктар',
+'imagelinks'                     => 'Бил� �иг�л�р�',
 'linkstoimage'                   => 'Бу бил�ҕ� маннык атын {{PLURAL:$1|�ир�й �иг�н�р|$1 �ир�йд�р �иг�н�лл�р}}:',
+'linkstoimage-more'              => '$1 {{PLURAL:$1|�ир�йт�н|�ир�йт�н}} �лб�х �ир�й бу бил�ҕ� �иг�н�р.
+Онтон бу тиһикк� {{PLURAL:$1|$1 �р� �иг� көһүнн�|$1 �иг� �р� көһүнн�}}.
+Ө��ө [[Special:WhatLinksHere/$2|толору тиһиги]] көрүөххүн �өп.',
 'nolinkstoimage'                 => '�тын �ир�йд�р бу бил�ҕ� �иг�мм�тт�р.',
 'morelinkstoimage'               => 'Бу бил�ҕ� [[Special:WhatLinksHere/$1|атын �иг�л�ри]] көрөргө.',
 'redirectstofile'                => 'Бил�ҕ� бу {{PLURAL:$1|бил�тт�н �иг� олохтоммут|$1 бил�л�рт�н �иг�л�р олохтоммуттар}}:',
-'duplicatesoffile'               => 'Бу бил� {{PLURAL:$1|дубликаата манна кө�төр|$1 дубликаата манна кө�төллөр}}:',
+'duplicatesoffile'               => 'Бу бил� {{PLURAL:$1|дубликаата манна кө�төр|$1 дубликаата манна кө�төллөр}} ([[Special:FileDuplicateSearch/$2|�иһилии]]):',
 'sharedupload'                   => 'Бу бил� ха� да бырайыак туһанар ы�кылаатыгар �ытар.',
 'shareduploadwiki'               => 'Эбиитин мантан ааҕыаххын �өп $1.',
-'shareduploadwiki-desc'          => 'Уоп�ай ы�кылааттан $1 туһунан аллара көһүнн�.',
+'shareduploadwiki-desc'          => 'Уоп�ай ы�кылааттан $1 �ир�й аллара көрдөрүлүнн�.',
 'shareduploadwiki-linktext'      => 'Бил�ни хо� быһаарар �ир�й',
 'shareduploadduplicate'          => 'Бу бил� уоп�ай ы�кылаакка �ытар $1 дубликаата.',
 'shareduploadduplicate-linktext' => 'атын бил�',
@@ -1197,7 +1376,7 @@ PICT # misc.
 # File deletion
 'filedelete'                  => 'Сот: $1',
 'filedelete-legend'           => 'Бил�ни �от',
-'filedelete-intro'            => "Маны �отон �р�ҕин '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Бу бил�ни '''[[Media:$1|$1]]''' туох баар �уруллубут и�тори�тын кытта �отон �р�ҕин.",
 'filedelete-intro-old'        => "Манна баар [$4 $3, $2]  '''[[Media:$1|$1]]''' торумнара �отулуннулар.",
 'filedelete-comment'          => 'Быһаарыыта:',
 'filedelete-submit'           => 'Сотуу',
@@ -1205,7 +1384,6 @@ PICT # misc.
 'filedelete-success-old'      => "$3-ҕа баар '''[[Media:$1|$1]]''' торуму (вер�и�ны)  $2 �оппут.",
 'filedelete-nofile'           => "'''$1''' �уох.",
 'filedelete-nofile-old'       => "Этиллибит параметрдаах '''$1''' архыыптаммыт торума �уох.",
-'filedelete-iscurrent'        => 'Эн бил� �аҥа торумун �ото �атыыгын. Ба�таан �рг� торумун көр.',
 'filedelete-otherreason'      => '�тын/�бии төрүөт:',
 'filedelete-reason-otherlist' => '�тын төрүөт',
 'filedelete-reason-dropdown'  => '*Common �отор төрүөтт�р�
@@ -1232,26 +1410,32 @@ PICT # misc.
 'unusedtemplateswlh'  => 'атын ыйынньыктар',
 
 # Random page
-'randompage'         => 'Үлүб��й �ир�й',
-'randompage-nopages' => 'Майгынныыр ааттаах �ир�йд�р �уохтар.',
+'randompage'         => 'Түб��пичч� �ир�й',
+'randompage-nopages' => 'Бу аат дала ($1) кураанах.',
 
 # Random redirect
 'randomredirect'         => 'Случайное перенаправление',
-'randomredirect-nopages' => 'Бу ааттарга көһөрөр ыйынньыктар �уохтар.',
+'randomredirect-nopages' => 'Бу аат далыгар($1) көһөрөр ыйынньыктар �уохтар.',
 
 # Statistics
-'statistics'             => 'Стати�тика',
-'sitestats'              => '{{SITENAME}} �тати�тиката',
-'userstats'              => 'Кыттааччы �тати�тиката',
-'sitestatstext'          => "Барыта '''$1''' �ир�й баар. Онно киир�лл�р: бырайыак туһунан �ир�йд�р, ырытыылар, �ит�риллиб�т�х ы�татыйалар, атын �ир�йг� көһөрөр �ир�йд�р уонна да атын ы�татыйа ах�ааныгар киирб�т ы�татыйалар. Мантан ураты толору ы�татыйа ди�н ааттанар '''$2''' ы�татыйа баар.
-
-Барыта '''$8''' бил� �уруттарыллыбыт.
-
-{{SITENAME}} туруоҕуттан барыта '''$3''' �ир�й көрөөһүн� буолбут уонна '''$4''' �ир�й уларытыыта. Онон ортотунан ыллахха биир �ир�йг� '''$5''' уларытыы уонна '''$6''' көрүү тик��р.
-
-Величина [http://www.mediawiki.org/wiki/Manual:Job_queue очереди заданий] �о�тавл�ет '''$7'''.",
-'userstatstext'          => "'''$1''' б�ли�т�ммит [[Special:ListUsers|кыттааччы]] баарыттан '''$2''' (�б�т�р '''$4%''') $2 $5 бырааптаах",
-'statistics-mostpopular' => 'Саамай �лб�хтик көрүлл�р ы�татыйалар',
+'statistics'                   => 'Стати�тика',
+'statistics-header-pages'      => 'Сир�й �татии�тиката',
+'statistics-header-edits'      => 'Көннөрүү �татии�тиката',
+'statistics-header-views'      => 'Көрөөһүн �тати�тиката',
+'statistics-header-users'      => 'Кыттааччылар �татии�тикалара',
+'statistics-articles'          => 'Ы�татыйалар ах�ааннара',
+'statistics-pages'             => 'Сир�йд�р',
+'statistics-pages-desc'        => 'Биики бары �ир�йд�рин (ырытыы �ир�йд�рин, утаарыылары уо.д.а килл�р�н туран).',
+'statistics-files'             => 'Килл�риллибит бил�л�р (ойуулар иҥин) ах�ааннара',
+'statistics-edits'             => '{{SITENAME}} оҥоһуллуоҕуттан көннөрүү ах�аана',
+'statistics-edits-average'     => 'Биир �ир�йг� ортотунан ха� көннөрүү тик��р�',
+'statistics-views-total'       => 'Көрүү ах�аана',
+'statistics-views-peredit'     => 'Биир улартыыга тик��р көрүү ах�аана',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] к��м�й�',
+'statistics-users'             => 'Б�ли�т�ммит [[Special:ListUsers|кыттааччы]] ах�аана',
+'statistics-users-active'      => 'Көхтөөх кыттааччылар ах�ааннара',
+'statistics-users-active-desc' => '�а�пыт {{PLURAL:$1|биир хонук иһиг�р|$1 хонукка}} тугу �м� оҥорбут кыттааччылар',
+'statistics-mostpopular'       => 'Саамай �лб�хтик көрүлл�р ы�татыйалар',
 
 'disambiguations'      => 'Элб�х �уолталаах өйдөбүлл�р �ир�йд�р�',
 'disambiguationspage'  => 'Template:�лб�х �уолталаах өйдөбүлл�р',
@@ -1263,7 +1447,7 @@ PICT # misc.
 'double-redirect-fixer'      => 'Утаарыылары көннөрөөччү',
 
 'brokenredirects'        => 'Бы�тыбыт көһөрүүл�р',
-'brokenredirectstext'    => 'Бу көһөрөр �ир�йд�р �уох ы�татыйаларга �иг�н�лл�р:',
+'brokenredirectstext'    => 'Бу утаарыы �ир�йд�р� �уох ы�татыйаларга �иг�н�лл�р (ыыталлар):',
 'brokenredirects-edit'   => '(уларытыы)',
 'brokenredirects-delete' => '(�отуу)',
 
@@ -1293,26 +1477,30 @@ PICT # misc.
 'popularpages'            => 'Элб�х киһи көрөр �ир�йд�р�',
 'wantedcategories'        => 'Көрдөнүлл�р категори�лар',
 'wantedpages'             => 'Көрдөнүлл�р �ир�йд�р',
-'missingfiles'            => 'Суох бил�л�р',
+'wantedfiles'             => 'Көрдөммүт бил�л�р',
+'wantedtemplates'         => 'Көрдөнөр халыыптар',
 'mostlinked'              => 'Саамай �лб�х �ир�й �иг�н�р �ир�йд�р�',
 'mostlinkedcategories'    => 'Саамай �лб�х �ир�й �иг�н�р категори�лара',
 'mostlinkedtemplates'     => 'Саамай �лб�хтик туттуллар халыыптар',
 'mostcategories'          => 'Элб�х категори�ҕа киир�р ы�татыйалар',
 'mostimages'              => 'Саамай �лб�хтик �иг�нилл�р бил�л�р',
 'mostrevisions'           => 'Саамай �лб�хтик уларытыллыбыт ы�татыйалар',
-'prefixindex'             => 'Префик� б�ли�т�',
+'prefixindex'             => 'Мантан �аҕаланар (префик�таах) �ир�йд�р барыта',
 'shortpages'              => 'Кылга� ы�татыйалар',
 'longpages'               => 'Уһун ы�татыйалар',
 'deadendpages'            => 'Dead-end (Бүт�й) �ир�йд�р',
 'deadendpagestext'        => 'Бу ы�татыйалар {{SITENAME}} �аайтын атын �ир�йд�риг�р �иг�мм�тт�р.',
 'protectedpages'          => 'Көмү�к�ммит ы�татыйалар',
 'protectedpages-indef'    => 'Болдьоҕо �уох �р� көмү�к�лл�р',
+'protectedpages-cascade'  => 'Ка�каадынан �р� көмү�к�нии',
 'protectedpagestext'      => 'Бу ы�татыйалар аатын уларытартан уонна көннөрөртөн көмү�к�ммитт�р',
 'protectedpagesempty'     => 'Билигин �тиллибит параметрдаах көмү�к�ниллибит ы�татыйалар �уохтар.',
 'protectedtitles'         => 'Көмү�к�ммит ааттар',
 'protectedtitlestext'     => 'Бу ааттары оҥорор/айар бобуллар',
 'protectedtitlesempty'    => 'Биир да аат бу параметрдарынан көмү�к�мм�т',
 'listusers'               => 'Кыттааччылар и�пииһ�кт�р�',
+'listusers-editsonly'     => 'Саатар биир көннөрүүнү оҥорбут кыттааччылары көрдөр',
+'usereditcount'           => '$1 {{PLURAL:$1|көннөрүү|көннөрүү}}',
 'newpages'                => 'Саҥа ы�татыйалар',
 'newpages-username'       => 'Кыттааччы:',
 'ancientpages'            => 'Бүт�һик уларытыы киирбитин�н наардаммыт ы�татыйалар',
@@ -1333,14 +1521,13 @@ PICT # misc.
 'booksources-search-legend' => 'Киниг� туһунан көрдөө',
 'booksources-go'            => 'Бул',
 'booksources-text'          => 'Манна киниг� туһунан атын �аайтарга ыйынньыктар хомулуннулар, онно баҕар �бии информаци� кө�түөҕ�.',
+'booksources-invalid-isbn'  => 'ISBN, арааһа, �ыыһалаах. �үөм�р көһөрөргө алҕа� тах�ыбатаҕын хат көр �р�.',
 
 # Special:Log
 'specialloguserlabel'  => 'Кыттааччы:',
 'speciallogtitlelabel' => 'Баһа:',
 'log'                  => 'Сурунааллар',
 'all-logs-page'        => 'Сурунааллар барыта',
-'log-search-legend'    => 'Сурунааллары көрдөөһүн',
-'log-search-submit'    => 'Бул',
 'alllogstext'          => '{{SITENAME}} �урунаалларын уоп�ай и�пииһ�г�. 
 Сурунаал көрүҥүн�н, кыттааччы аатынан (улахан-кыра буукубата учуоттанар) �б�т�р �ир�й аатынан (�ми� улахана-кырата учуоттанар) наардыаххытын �өп.',
 'logempty'             => 'Сурунаалга �өп түб�һ�р �л�ми�нн�р �уохтар.',
@@ -1352,6 +1539,7 @@ PICT # misc.
 'nextpage'          => '�ныгы�кы �ир�й ($1)',
 'prevpage'          => 'Бу иннин��ҕи �ир�й ($1)',
 'allpagesfrom'      => 'Мантан �аҕаланар �ир�йд�ри көрдөр:',
+'allpagesto'        => 'Көрдөрүүнү манна тохтот:',
 'allarticles'       => 'Бары ы�татыйалар',
 'allinnamespace'    => 'Бары �ир�йд�р (про�тран�тво имен $1)',
 'allnotinnamespace' => 'Бары �ир�йд�р ($1 namespace-тан уратылар)',
@@ -1371,43 +1559,71 @@ PICT # misc.
 'special-categories-sort-count' => 'ах�аанынан б�р��д�кт��һин',
 'special-categories-sort-abc'   => 'алпабыытынан б�р��д�кт��һин',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Сотуллубут көннөрүү',
+
+# Special:LinkSearch
+'linksearch'       => 'Та� �иг�л�р',
+'linksearch-pat'   => 'Көрдөөһүн халыыба:',
+'linksearch-ns'    => '�ат хочото (namespace):',
+'linksearch-ok'    => 'Бул',
+'linksearch-text'  => 'Туруоран би�р�р б�ли�л�ри туһаныахха �өп, холобур, "*.wikipedia.org".
+
+Өйүүр боротокуол: <tt>$1</tt>',
+'linksearch-line'  => 'Мантан $2 манна $1 ыйынньык',
+'linksearch-error' => 'Туруоран би�р�р б�ли�л�ри аадыры�/hostname �аҕаланыытыгар �р� туттуохха �өп.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Мантан �аҕалаан кыттааччылары көрдөр:',
 'listusers-submit'   => 'Көрдөр',
 'listusers-noresult' => 'Кыттааччылар булуллубатылар.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Кыттааччылары б�ли�тиир �урунаал',
+'newuserlogpagetext'          => 'Соторутааҕыта б�ли�т�ммит кыттааччылар.',
+'newuserlog-byemail'          => 'киирии тыл �л. почтаннан ыытылынна',
+'newuserlog-create-entry'     => 'Саҥа кыттааччы',
+'newuserlog-create2-entry'    => '$1 ди�н �аҥа киһи б�ли�т�нн�',
+'newuserlog-autocreate-entry' => 'Кыттааччы аата аптамаатынан оҥоһуллубут',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Кыттааччылар бөлөхтөрүн бырааптара',
-'listgrouprights-summary'  => 'Манна бу биикиг� баар бөлөхтөр уонна кинил�р киир�р бырааптара кө�төллөр.
+'listgrouprights'                 => 'Кыттааччылар бөлөхтөрүн бырааптара',
+'listgrouprights-summary'         => 'Манна бу биикиг� баар бөлөхтөр уонна кинил�р киир�р бырааптара кө�төллөр.
 Баҕар дьон ту�па бырааптарын  туһунан [[{{MediaWiki:Listgrouprights-helppage}}|�бии информаци�]] баара буолуо.',
-'listgrouprights-group'    => 'Бөлөх',
-'listgrouprights-rights'   => 'Бырааптар',
-'listgrouprights-helppage' => 'Help:Бөлөхтөр бырааптара',
-'listgrouprights-members'  => '(кыттар дьон и�пииһ�г�)',
+'listgrouprights-group'           => 'Бөлөх',
+'listgrouprights-rights'          => 'Бырааптар',
+'listgrouprights-helppage'        => 'Help:Бөлөхтөр бырааптара',
+'listgrouprights-members'         => '(кыттар дьон и�пииһ�г�)',
+'listgrouprights-addgroup'        => 'Бу {{PLURAL:$2|бөлөххө|бөлөхтөргө}} килл�ри�н �өп: $1',
+'listgrouprights-removegroup'     => 'Бу {{PLURAL:$2|бөлөхтөн|бөлөхтөртөн}} таһаарыан �өп: $1',
+'listgrouprights-addgroup-all'    => 'Бөлөхтөргө барыларыгар килл�ри�н �өп',
+'listgrouprights-removegroup-all' => 'Бөлөхтөртөн барытыттан таһаарыан �өп',
 
 # E-mail user
-'mailnologin'     => '�адырыһа �уох',
-'mailnologintext' => '�тын кыттааччылары кытта e-mail көмөтүн�н �уруй�уоххун баҕарар буоллаххына б�й�ҕин [[Special:UserLogin|билиһинн�ри�хт��ххин]]  уонна e-mail аадыры�кын [[Special:Preferences|туруорууларгар]] �уруйуохтааххын.',
-'emailuser'       => 'Кыттааччыга �урук',
-'emailpage'       => 'Кыттааччыга E-mail ыыт',
-'emailpagetext'   => 'Бу фуорма көмөтүн�н кыттааччыга �урук ыытыаххын �өп.
+'mailnologin'      => '�адырыһа �уох',
+'mailnologintext'  => '�тын кыттааччылары кытта e-mail көмөтүн�н �уруй�уоххун баҕарар буоллаххына б�й�ҕин [[Special:UserLogin|билиһинн�ри�хт��ххин]]  уонна e-mail аадыры�кын [[Special:Preferences|туруорууларгар]] �уруйуохтааххын.',
+'emailuser'        => 'Кыттааччыга �урук',
+'emailpage'        => 'Кыттааччыга E-mail ыыт',
+'emailpagetext'    => 'Бу фуорма көмөтүн�н кыттааччыга �урук ыытыаххын �өп.
 "Кимт�н" графааҕа �н [[Special:Preferences|туруорууларгар]] баар аадырыһыҥ киири�ҕ�,
 онон туппут киһи хардарар кыахтаныа.',
-'usermailererror' => 'Сурук кыайан барбата:',
-'defemailsubject' => '{{SITENAME}} �л. почтата',
-'noemailtitle'    => 'E-mail �уох',
-'noemailtext'     => 'Бу кыттааччы e-mail аадырыһын �пп�т�х,
-�б�т�р атын кыттааччылартан �урук тутуон баҕарбатын билл�рбит.',
-'emailfrom'       => 'Кимт�н:',
-'emailto'         => 'Кими�х�:',
-'emailsubject'    => 'Сурук аата:',
-'emailmessage'    => 'Сурук:',
-'emailsend'       => 'Ыыт',
-'emailccme'       => 'Сурукпун б�й�б�р �ми� ыыт.',
-'emailccsubject'  => 'Эн �уругуҥ куоппуйата $1: $2',
-'emailsent'       => 'Сурук барда',
-'emailsenttext'   => 'Эн �уругуҥ ыытылынна.',
-'emailuserfooter' => 'Бу �урук $2 кыттааччыга $1 кыттааччыттан «Сурукта ыыт» ди�н функци� көмөтүн�н {{SITENAME}} �аайтан ыытыллыбыт.',
+'usermailererror'  => 'Сурук кыайан барбата:',
+'defemailsubject'  => '{{SITENAME}} �л. почтата',
+'noemailtitle'     => 'E-mail �уох',
+'noemailtext'      => 'Бу кыттааччы e-mail аадырыһын �пп�т�х.',
+'nowikiemailtitle' => 'Сурук ыытар кыах �уох',
+'nowikiemailtext'  => 'Бу кыттааччы �урук тутуон баҕарбат.',
+'email-legend'     => '{{SITENAME}} атын кыттааччытыгар �урук ыытарга',
+'emailfrom'        => 'Кимт�н:',
+'emailto'          => 'Кими�х�:',
+'emailsubject'     => 'Сурук аата:',
+'emailmessage'     => 'Сурук:',
+'emailsend'        => 'Ыыт',
+'emailccme'        => 'Сурукпун б�й�б�р �ми� ыыт.',
+'emailccsubject'   => 'Эн �уругуҥ куоппуйата $1: $2',
+'emailsent'        => 'Сурук барда',
+'emailsenttext'    => 'Эн �уругуҥ ыытылынна.',
+'emailuserfooter'  => 'Бу �урук $2 кыттааччыга $1 кыттааччыттан «Сурукта ыыт» ди�н функци� көмөтүн�н {{SITENAME}} �аайтан ыытыллыбыт.',
 
 # Watchlist
 'watchlist'            => 'Мин к�т��һиним',
@@ -1438,12 +1654,7 @@ PICT # misc.
 'iteminvalidname'      => "'$1' моһуогурда, аата �атаммата...",
 'wlnote'               => 'Манна к�лиҥҥи <strong>$2</strong> чаа�ка бүт�һик $1 уларытыы көрдөрүлүнн�.',
 'wlshowlast'           => 'бүт�һик $1 чаа�ка $2 күҥҥ� $3 көрдөр',
-'watchlist-show-bots'  => 'Роботтар уларытыыларын көрдөр',
-'watchlist-hide-bots'  => 'Роботтар уларытыыларын көрдөрүм�',
-'watchlist-show-own'   => 'Мин уларытыыларбын көрдөр',
-'watchlist-hide-own'   => 'Мин уларытыыларбын көрдөрүм�',
-'watchlist-show-minor' => 'Кыра �уолталаах уларытыылары көрдөр',
-'watchlist-hide-minor' => 'Кыра �уолталаах уларытыылары көрдөрүм�',
+'watchlist-options'    => 'К�т��н көрүү туруоруутун уларытыы',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'К�т��...',
@@ -1453,109 +1664,128 @@ PICT # misc.
 'enotif_reset'                 => 'Бары �ир�йд�ри көрбүтүм курдук б�ли�т��',
 'enotif_newpagetext'           => 'Бу �аҥа �ир�й.',
 'enotif_impersonal_salutation' => '{{SITENAME}} кыттааччыта',
-'changed'                      => 'уларыйбыт',
+'changed'                      => 'уларыппыт (уларытыллыбыт)',
 'created'                      => 'айыллыбыт',
-'enotif_subject'               => '«{{SITENAME}}» $PAGETITLE �ир�йин $PAGEEDITOR кыттааччы $CHANGEDORCREATED',
+'enotif_subject'               => '«{{SITENAME}}» $PAGETITLE кыттааччыга �ыһыаннаах �ир�йи $PAGEEDITOR кыттааччы $CHANGEDORCREATED',
 'enotif_lastvisited'           => 'Бут�һик киирииҥ к�ннитт�н оҥоһуллубут уларыйыылары барытын көрөргө манна киир: $1.',
 'enotif_lastdiff'              => 'Уларытыыны манна көрүҥ: $1.',
 'enotif_anon_editor'           => 'ааттамматах кыттааччы $1',
 'enotif_body'                  => 'Күндү $WATCHINGUSERNAME,
 
-«{{SITENAME}}» $PAGETITLE �ир�йин $PAGEEDITDATE $PAGEEDITOR кыттааччы $CHANGEDORCREATED. Сир�й билиҥҥи туругун манна көр: $PAGETITLE_URL.
+«{{SITENAME}}» $PAGETITLE кыттаачыга �ыһыаннаах �ир�йи $PAGEEDITDATE $PAGEEDITOR кыттааччы $CHANGEDORCREATED. Сир�й билиҥҥи туругун манна көр: $PAGETITLE_URL.
 
 $NEWPAGE
 
 Уларытыы кылга� и� хоһооно: $PAGESUMMARY $PAGEMINOREDIT
 
 Уларыппыт киһи:
-�л. почтата $PAGEEDITOR_EMAIL
-вики: $PAGEEDITOR_WIKI
+�л. аадырыһа $PAGEEDITOR_EMAIL
+Биикиг� �ир�й�: $PAGEEDITOR_WIKI
 
-Бу �ир�йи к�лин көрбөт буоллаххына атын билл�рии/��р�тии к�ли� �уоҕа. Эн баҕар к�тиир �ир�йд�рг�р "уларытыыны билл�р�рг�" ди�ни икки�т��н туруобутуҥ буолуо.
+Бу �ир�йи көрө иликкин� хо� билл�рии к�ли� �уоҕа. �рай к�т�били туруорар �ирг� "уларытыыны билл�р�рг�" ди�ни икки�т��н туруордаххына к�ли�н �өп.
 
-         Бары үтүөнү кытта {{SITENAME}} билл�р�р �и�темата
+         Бары үтүөнү кытта, {{SITENAME}} билл�р�р �и�ти�м�т�
 
 --
-К�тиир �ир�йд�риҥ и�пииһ�гин уларытарга маны көр
+К�тиир �ир�йд�риҥ тиһигин уларытарга маны көр
 {{fullurl:{{ns:special}}:Watchlist/edit}}
 
-Көмө оҥорор уонна ыйытар �ир: {{fullurl:{{MediaWiki:Helppage}}}}',
-
-# Delete/protect/revert
-'deletepage'                  => 'Сир�йи �от',
-'confirm'                     => 'Биг�рг�тии',
-'excontent'                   => "иһин��ҕит�: '$1'",
-'excontentauthor'             => 'иһин��ҕит�: «$1» (�оҕотох ааптар [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => "иһин��ҕит� �отуллуон иннин�: '$1'",
-'exblank'                     => '�ир�й кураанах �т�',
-'delete-confirm'              => 'Маны "$1" �оторго',
-'delete-legend'               => 'Сотуу',
-'historywarning'              => 'С�р�тии: Сотоору турар �ир�йиҥ у�туоруйалаах:',
-'confirmdeletetext'           => 'Эн �ир�йи (ойууну) уонна кини у�туоруйатын букатын �отоору гынаҕын.
+Көмөлөһүнн�р�р уонна быһаартарар �ир: {{fullurl:{{MediaWiki:Helppage}}}}',
+
+# Delete
+'deletepage'             => 'Сир�йи �от',
+'confirm'                => 'Биг�рг�тии',
+'excontent'              => "иһин��ҕит�: '$1'",
+'excontentauthor'        => 'иһин��ҕит�: «$1» (�оҕотох ааптар [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => "иһин��ҕит� �отуллуон иннин�: '$1'",
+'exblank'                => '�ир�й кураанах �т�',
+'delete-confirm'         => 'Маны "$1" �оторго',
+'delete-legend'          => 'Сотуу',
+'historywarning'         => 'С�р�тии: Сотоору турар �ир�йиҥ у�туоруйалаах:',
+'confirmdeletetext'      => 'Эн �ир�йи (ойууну) уонна кини у�туоруйатын букатын �отоору гынаҕын.
 Бука ди�н, кырдьык иннь� гынаары гынаргын,
 бу дьайыы туох �одуллаах буоларын толору бил�ргин
 уонна [[{{MediaWiki:Policy-url}}]] �и�рин к��п�ккин биг�рг�т.',
-'actioncomplete'              => 'Дьайыы оҥоһулунна',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» �отуллубут.
+'actioncomplete'         => 'Дьайыы оҥоһулунна',
+'deletedtext'            => '«<nowiki>$1</nowiki>» �отуллубут.
 Бүт�һик �отуулар и�пииһ�кт�рин манна: $2 көр.',
-'deletedarticle'              => '"[[$1]]" �отуллубут',
-'suppressedarticle'           => '"[[$1]]" ки�т��бит',
-'dellogpage'                  => 'Сотуу и�пииһ�г�',
-'dellogpagetext'              => 'Манна к�нники �отуулар и�пииһ�кт�р� кө�төр.',
-'deletionlog'                 => '�отуу и�пииһ�г�',
-'reverted'                    => 'Урукку торумугар төннөрүлүнн�',
-'deletecomment'               => 'Сотуу төрүөт�:',
-'deleteotherreason'           => '�тын/�бии биричиин�л�р:',
-'deletereasonotherlist'       => '�тын биричиин�',
-'deletereason-dropdown'       => '*Common �отуу биричиин�т�
+'deletedarticle'         => '"[[$1]]" �отуллубут',
+'suppressedarticle'      => '"[[$1]]" ки�т��бит',
+'dellogpage'             => 'Сотуу и�пииһ�г�',
+'dellogpagetext'         => 'Манна к�нники �отуулар и�пииһ�кт�р� кө�төр.',
+'deletionlog'            => '�отуу и�пииһ�г�',
+'reverted'               => 'Урукку торумугар төннөрүлүнн�',
+'deletecomment'          => 'Сотуу төрүөт�:',
+'deleteotherreason'      => '�тын/�бии биричиин�л�р:',
+'deletereasonotherlist'  => '�тын биричиин�',
+'deletereason-dropdown'  => '*Common �отуу биричиин�т�
 ** ааптар ирд��һин�
 ** ааптар быраабын күөмчүл��һин
 ** �лдьатыы (Вандализм)',
-'delete-edit-reasonlist'      => 'Сотуу төрүөтүн уларытыы',
-'delete-toobig'               => 'Бу �ир�й уларытыыларын и�тори�та уһун, ха� да ($1) {{PLURAL:$1|хат көрүүл��х|хат көрүүл�рд��х}}. Маннык �ир�йд�ри �отор хааччахтанар, тоҕо ди�хх� алҕа� {{SITENAME}} алдьаныан �өп.',
-'delete-warning-toobig'       => 'Бу �ир�й уларыылара уһун и�тори�лаах, ха� да ($1) {{PLURAL:$1|хат көрүүл��х|хат көрүүл�рд��х}}. Маны �оттоххуна, {{SITENAME}} бил�тин тиһигин алдьатыан �өп; �алгыыр буоллаххына ��р�н�н үл�л��.',
-'rollback'                    => 'Уруккутугар төннөр',
-'rollback_short'              => 'Төннөрүү',
-'rollbacklink'                => 'төннөр',
-'rollbackfailed'              => 'Төннөрөргө моһуок үө�к��т�',
-'cantrollback'                => 'Төннөрөр кыах �уох; бүт�һик көннөрүүнү оҥорбут киһи бу �ир�й �оҕотох ааптара буолар.',
-'alreadyrolled'               => 'Бүт�һик [[User:$2|$2]] ([[User talk:$2|Ырытыы]] | [[Special:Contributions/$2|{{int:contribslink}}]]) оҥорбут [[:$1]] уларытыыларын төннөрөр кыах �уох;
+'delete-edit-reasonlist' => 'Сотуу төрүөтүн уларытыы',
+'delete-toobig'          => 'Бу �ир�й уларытыыларын и�тори�та уһун, ха� да ($1) {{PLURAL:$1|хат көрүүл��х|хат көрүүл�рд��х}}. Маннык �ир�йд�ри �отор хааччахтанар, тоҕо ди�хх� алҕа� {{SITENAME}} алдьаныан �өп.',
+'delete-warning-toobig'  => 'Бу �ир�й уларыылара уһун и�тори�лаах, ха� да ($1) {{PLURAL:$1|хат көрүүл��х|хат көрүүл�рд��х}}. Маны �оттоххуна, {{SITENAME}} бил�тин тиһигин алдьатыан �өп; �алгыыр буоллаххына ��р�н�н үл�л��.',
+
+# Rollback
+'rollback'         => 'Уруккутугар төннөр',
+'rollback_short'   => 'Төннөрүү',
+'rollbacklink'     => 'төннөр',
+'rollbackfailed'   => 'Төннөрөргө моһуок үө�к��т�',
+'cantrollback'     => 'Төннөрөр кыах �уох; бүт�һик көннөрүүнү оҥорбут киһи бу �ир�й �оҕотох ааптара буолар.',
+'alreadyrolled'    => 'Бүт�һик [[User:$2|$2]] ([[User talk:$2|Ырытыы]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) оҥорбут [[:$1]] уларытыыларын төннөрөр кыах �уох;
 ким �р� атын номнуо бу �ир�йи уларыппыт �б�т�р уруккутун төннөрбүт.
 
-К�нники уларытыыны [[User:$3|$3]] ([[User talk:$3|Ырытыы]] | [[Special:Contributions/$3|{{int:contribslink}}]]) оҥорбут.',
-'editcomment'                 => 'Уларытыыны маннык быһаарбыттар: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '([[User talk:$2|Ырытыы]]) көннөрүүл�р�: [[Special:Contributions/$2|$2]] бу торумҥа: [[User:$1|$1]] төннөрүлүннүл�р', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 көннөрүүл�р бу торумҥа төннөрүлүннүл�р: $2.',
-'sessionfailure'              => '�рааһа туох �р� �атаммата, дьайыыҥ оҥоһуллубата. Браузергар "Төнүн" тим�ҕи баттаа уонна бу иннин��ҕи �ир�йгин икки�т��н килл�р�н көр.',
+К�нники уларытыыны [[User:$3|$3]] ([[User talk:$3|Ырытыы]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) оҥорбут.',
+'editcomment'      => "Уларытыыны маннык быһаарбыттар: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '([[User talk:$2|Ырытыы]]) көннөрүүл�р�: [[Special:Contributions/$2|$2]] бу торумҥа: [[User:$1|$1]] төннөрүлүннүл�р', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 көннөрүүл�р бу торумҥа төннөрүлүннүл�р: $2.',
+'sessionfailure'   => '�рааһа туох �р� �атаммата, дьайыыҥ оҥоһуллубата. Браузергар "Төнүн" тим�ҕи баттаа уонна бу иннин��ҕи �ир�йгин икки�т��н килл�р�н көр.',
+
+# Protect
 'protectlogpage'              => 'Хары�хал �урунаала (көннөрүүтт�н көмү�к�ммит бил�л�р и�пииһ�кт�р�)',
 'protectlogtext'              => 'Манна ы�татыйалары уларытыыттан көмү�к��һин уонна ол көмү�к�ли �уох оҥоруу у�туоруйата �уруллубут.
 Эн ө��ө [[Special:ProtectedPages|билигин уларытыллыбат �ир�йд�р]] и�пииһ�кт�рин көрүөххүн �өп.',
 'protectedarticle'            => '"[[$1]]" �ир�й уларытыллыбат',
 'modifiedarticleprotection'   => '"[[$1]]" �ир�й уларытыытын таһыма уларыйда',
 'unprotectedarticle'          => '"[[$1]]": уларытыыны хааччахтааһын �уох оҥоһулунна',
+'movedarticleprotection'      => 'көмү�к�л туруоруутун мантан "[[$2]]" манна "[[$1]]" көһөрдө',
 'protect-title'               => '"$1": Уларытыы таһымын туруоруу',
+'prot_1movedto2'              => '[[$1]] аата манныкка уларытылынна: [[$2]]',
 'protect-legend'              => 'Уларытыы таһымын биг�рг�т',
 'protectcomment'              => 'Хо� быһаарыы:',
 'protectexpiry'               => 'Бүтүөхт��х:',
 'protect_expiry_invalid'      => 'Уларытыыны хааччахтааһын болдьоҕун к�м� �атаан турбата.',
 'protect_expiry_old'          => 'Болдьох к�м� �ыыһа аа�пыт к�мҥ� турбут.',
 'protect-unchain'             => '�аты уларытыыны көҥүлл��',
-'protect-text'                => 'Эн <strong><nowiki>$1</nowiki></strong> �ир�й уларытыытын таһымын көрүөххүн уонна уларытыаххын �өп.',
-'protect-locked-blocked'      => 'Уларытыы таһымын учуотунай �уругуҥ бобуллубут к�миг�р уларытар кыаҕыҥ �уох.
-<strong>$1</strong> �ир�й уларытыытын таһыма:',
-'protect-locked-dblock'       => 'Уларытыы таһыма уларыйар кыаҕа �уох - дааннайдар баазаларын уларытар бобулунна.
-<strong>$1</strong> �ир�й уларытыытын таһыма билиҥҥи туругунан маннык:',
-'protect-locked-access'       => 'Эн аккаунуҥ уларытыы таһымын көннөрөр кыаҕа �уох.
-<strong>$1</strong> �ир�й уларыыттын таһыма билиҥҥи туругунан маннык:',
+'protect-text'                => "Эн '''<nowiki>$1</nowiki>''' �ир�й уларытыытын таһымын көрүөххүн уонна уларытыаххын �өп.",
+'protect-locked-blocked'      => "Уларытыы таһымын учуотунай �уругуҥ бобуллубут к�миг�р уларытар кыаҕыҥ �уох.
+'''$1''' �ир�й уларытыытын таһыма:",
+'protect-locked-dblock'       => "Уларытыы таһыма уларыйар кыаҕа �уох - дааннайдар баазаларын уларытар бобулунна.
+'''$1''' �ир�й уларытыытын таһыма билиҥҥи туругунан маннык:",
+'protect-locked-access'       => "Эн аккаунуҥ уларытыы таһымын көннөрөр кыаҕа �уох.
+'''$1''' �ир�й уларыыттын таһыма билиҥҥи туругунан маннык:",
 'protect-cascadeon'           => 'Бу �ир�й уларытыыттан көмү�к�ммит {{PLURAL:$1|�ир�й бөлөҕөр|�ир�йд�р бөлөхтөрүг�р}} (ка�кааднай көмү�к�л) киир�р буолан �ми� көмү�к�ммит. Эн көмү�к�нии таһымын уларытыаххын �өп, ол ка�каднай көмү�к�ли уларыппат.',
-'protect-default'             => '(�тиллиб�т�ҕин�)',
+'protect-default'             => 'Барыларыгар көҥүлл�н�р',
 'protect-fallback'            => '"$1" көҥүлл� көрдөө',
-'protect-level-autoconfirmed' => 'Б�ли�т�мм�т�х кыттааччылар уларыппаттарын курдук оҥор',
+'protect-level-autoconfirmed' => 'Саҥа уонна б�ли�т�мм�т�х кыттааччылар уларыппаттарын курдук оҥор',
 'protect-level-sysop'         => '�дминнар �р�',
 'protect-summary-cascade'     => 'ка�кадтаах',
 'protect-expiring'            => 'болдьоҕо $1 (UTC)',
+'protect-expiry-indefinite'   => 'болдьоҕо �уох к�мҥ�',
 'protect-cascade'             => 'Бу �ир�йг� киир�р �ир�йд�ри уларытыыттан көмү�к�� (cascading protection)',
 'protect-cantedit'            => 'Бу �ир�й хатааһынын таһымын уларыппаккын: уларытар кыах б�риллиб�т�х.',
+'protect-othertime'           => '�тын к�м:',
+'protect-othertime-op'        => 'атын к�м',
+'protect-existing-expiry'     => 'Билиҥҥи болдьоҕо: $3, $2',
+'protect-otherreason'         => '�тын/�бии төрүөт�:',
+'protect-otherreason-op'      => 'атын/�бии төрүөт�',
+'protect-dropdown'            => '*Уларытыыны хааччахтааһын �үрүн төрүөтт�р�
+** дьаныардаах вандааллааһын
+** наһаалыыр �паамнааһын
+** уларытыы мөккүөрүг�р аһара барыы
+** �лб�хтик туттуллар �ир�й',
+'protect-edit-reasonlist'     => 'Уларытыыттан көмү�к��һин төрүөтүн көннөрөн би�рии',
+'protect-expiry-options'      => '2 чаа�:2 hours,1 күн:1 day,3 күн:3 day,1 н�ди�л�:1 week,2 н�ди�л�:2 week,1 ый:1 month,3 ый:3 month,6 ый:6 month,1 �ыл:1 month,больдьоҕо �уох:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Маны оҥорор кыахтааххын:',
 'restriction-level'           => 'Киирии таһыма:',
 'minimum-size'                => 'Оччугуй',
@@ -1578,7 +1808,7 @@ $NEWPAGE
 'undeletepage'                 => 'Сотуллубут �ир�йд�ри көрүү уонна төннөрүү',
 'undeletepagetitle'            => "'''Манна [[:$1|$1]] �ир�й �отуллубут торумнарын тиһиг� кө�төр'''.",
 'viewdeletedpage'              => 'Сотуллубут �ир�йд�ри көрүү',
-'undeletepagetext'             => 'Манна ыйыллыбыт �ир�йд�р �отуллубуттар гынан баран архыыпка �ыталлар.
+'undeletepagetext'             => 'Манна ыйыллыбыт {{PLURAL:$1|�ир�й �отуллубут|$1 �ир�й �отуллубуттар}} гынан баран архыыпка �ыталлар.
 Онон оннуларыгар төннөрүөххүн �өп. �рхыып к�митт�н к�миг�р ыраа�танар.',
 'undelete-fieldset-title'      => 'Торумнары төнүнн�р',
 'undeleteextrahelp'            => "Сир�йи барытын оннугар төннөрөргө тугу да б�ли�т��м� уонна '''''Төннөр''''' тим�ҕи баттаа.
@@ -1592,13 +1822,14 @@ $NEWPAGE
 'undeletehistorynoadmin'       => 'Ы�татыйа �отуллубут.
 Сотуу төрүөт� уонна ы�татыйаны �уруйбут кыттааччылар и�пииһ�кт�р� манна көрдөрүлүнн�.
 Сотуллубут ы�татыйа и� хоһоонун админнар �р� көрүөхт�рин �өп.',
-'undelete-revision'            => '$1 �отуллубут торума ($2), $3 �оппут:',
+'undelete-revision'            => '$3 �уруйбут $1 ы�татыйа �отуллубут торума (�уруйуу к�м�: $4, $5):',
 'undeleterevision-missing'     => 'Сыыһа �б�т�р �уох торум.
 �рааһа ыйынньыгыҥ �ыыһа �уруллубут, �б�т�р бу торум архыыптан �отуллан хаалбыт.',
 'undelete-nodiff'              => 'Ханнык да иннин��ҕи торум кө�түб�т�.',
 'undeletebtn'                  => 'Төннөр',
 'undeletelink'                 => 'төннөр',
 'undeletereset'                => 'Саҥаттан',
+'undeleteinvert'               => 'Хараардыллыбыты инвер�и�лаа',
 'undeletecomment'              => 'Хо� быһаарыы:',
 'undeletedarticle'             => '"[[$1]]" төннөрүлүнн�',
 'undeletedrevisions'           => '$1 уларытыы төннөрүлүнн�',
@@ -1630,26 +1861,27 @@ $1',
 'blanknamespace' => '(Сүрүн)',
 
 # Contributions
-'contributions' => 'Кыттааччы �уруйуута (вклад)',
-'mycontris'     => 'Суруйуум и�пииһ�г�',
-'contribsub2'   => 'Вклад $1 ($2)',
-'nocontribs'    => 'Эппит критерийг�р �ппи�ттиир уларытыылар кө�түб�тил�р.',
-'uctop'         => '(бүт�һик)',
-'month'         => 'Ый иһиг�р:',
-'year'          => 'Сыл иһиг�р:',
-
-'sp-contributions-newbies'     => 'Саҥа �р� ааттан оҥоһуллубут уларытыылары көрдөр',
-'sp-contributions-newbies-sub' => 'Саҥа ааттартан',
-'sp-contributions-blocklog'    => 'Бобуу �урунаала',
-'sp-contributions-search'      => 'Кыттааччы оҥорбут уларытыыларын көрдөөһүн',
-'sp-contributions-username'    => 'IP аадырыһа �б�т�р аата:',
-'sp-contributions-submit'      => 'Көрдөө',
+'contributions'       => 'Кыттааччы �уруйуута (вклад)',
+'contributions-title' => '$1 кыттааччы килл�рбит уларытыылара',
+'mycontris'           => 'Суруйуум и�пииһ�г�',
+'contribsub2'         => 'Вклад $1 ($2)',
+'nocontribs'          => 'Эппит критерийг�р �ппи�ттиир уларытыылар кө�түб�тил�р.',
+'uctop'               => '(бүт�һик)',
+'month'               => 'Ый иһиг�р:',
+'year'                => 'Сыл иһиг�р:',
+
+'sp-contributions-newbies'       => 'Саҥа �р� ааттан оҥоһуллубут уларытыылары көрдөр',
+'sp-contributions-newbies-sub'   => 'Саҥа ааттартан',
+'sp-contributions-newbies-title' => 'Саҥа б�й�л�рин билиһинн�рбит дьон уларытыылара',
+'sp-contributions-blocklog'      => 'Бобуу �урунаала',
+'sp-contributions-search'        => 'Кыттааччы оҥорбут уларытыыларын көрдөөһүн',
+'sp-contributions-username'      => 'IP аадырыһа �б�т�р аата:',
+'sp-contributions-submit'        => 'Көрдөө',
 
 # What links here
 'whatlinkshere'            => 'Манна �иг�н�лл�р',
 'whatlinkshere-title'      => 'Сир�й манна �иг�н�р "$1"',
 'whatlinkshere-page'       => 'Сир�й:',
-'linklistsub'              => '(Ыйынньыктар и�пииһ�кт�р�)',
 'linkshere'                => "'''[[:$1]]''' бил�ҕ� манна көрдөрүллүбүт �ир�йд�р �иг�н�лл�р:",
 'nolinkshere'              => "'''[[:$1]]''' �ир�йг� �иг�н�р �ир�йд�р �уохтар.",
 'nolinkshere-ns'           => "Талыллыбыт бөлөххө (namespace) бу '''[[:$1]]''' �ир�йг� �иг�н�р �ир�йд�р �уохтар.",
@@ -1697,6 +1929,8 @@ $1',
 'ipbotherreason'                  => '�тын/�бии биричиин�л�р:',
 'ipbhidename'                     => 'Кыттааччы аатын бобуу �урунаалыгар, бобуллубуттар уонна кытааччылар уоп�ай и�пииһ�кт�риг�р көрдөрүм�',
 'ipbwatchuser'                    => 'Кыттааччы б�й�тин туһунан �ир�йин уонна ырытыытын �ир�йин к�тиирг�',
+'ipballowusertalk'                => 'Кыттааччы манна үл�лиирин боппут к�мҥ� б�й�тин �ир�йиг�р �уруйарын көҥүллүүрг�',
+'ipb-change-block'                => 'Бу туруорууларынан кыттааччыны хат хааччахтаа',
 'badipaddress'                    => 'IP аадырыһа �ыыһа',
 'blockipsuccesssub'               => 'Тохтотулунна',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|«$1»]] бобуллубут/тохтотуллубут.<br />
@@ -1706,14 +1940,18 @@ $1',
 'ipb-unblock'                     => 'Кыттаачыны �б�т�р IP-ны бобуллубуттар и�пииһ�кт�ритт�н таһаар',
 'ipb-blocklist-addr'              => '$1 бобууларын көрдөр',
 'ipb-blocklist'                   => 'Бобуулары көрдөр',
+'ipb-blocklist-contribs'          => '$1 кыттааччы кылаата/килл�риит�',
 'unblockip'                       => 'Кыттааччыны көҥүлл��',
 'unblockiptext'                   => 'IP �б�т�р кыттааччы көннөрөр/уларытар быраабын манна баар форманы туһанан төннөр.',
-'ipusubmit'                       => 'Бу IP-га уларытар быраабын төннөр',
+'ipusubmit'                       => 'Хааччаҕын уһул',
 'unblocked'                       => '[[User:$1|$1]] хааччахтаныыта уһулунна',
 'unblocked-id'                    => '$1 хааччахтаныыта уһулунна',
 'ipblocklist'                     => 'Бобуллубут IP-лар уонна кыттааччылар',
 'ipblocklist-legend'              => 'Хааччахтаммыт/бобуллубут кыттааччыны көрдөөһүн',
 'ipblocklist-username'            => 'Кыттааччы аата �б�т�р IP-та:',
+'ipblocklist-sh-userblocks'       => '$1 ааты хааччахтааһын',
+'ipblocklist-sh-tempblocks'       => '$1 бы�тах хааччахтааһын',
+'ipblocklist-sh-addressblocks'    => 'IP-ны $1 хааччахтааһын',
 'ipblocklist-submit'              => 'Бул',
 'blocklistline'                   => '$1, $2 хааччахтаабыт/боппут: $3 ($4)',
 'infiniteblock'                   => 'болдьоҕо �уох',
@@ -1722,14 +1960,18 @@ $1',
 'noautoblockblock'                => 'автоблокировка араарылынна',
 'createaccountblock'              => '�аҥа б�ли�т�нии бобуллубут',
 'emailblock'                      => '�уруйар бобуллубут',
+'blocklist-nousertalk'            => 'б�й�тин ырытыытын �ир�йин уларытар кыаҕа �уох',
 'ipblocklist-empty'               => 'Бобуллуу и�пииһ�г� кураанах.',
 'ipblocklist-no-results'          => 'Бу IP �б�т�р кыттааччы бобуллубатах.',
 'blocklink'                       => 'боп/хааччахтаа',
 'unblocklink'                     => 'бобууну/хааччахтааһыны �уох гын',
+'change-blocklink'                => 'хааччахтааһыны уларытыы',
 'contribslink'                    => 'вклад',
 'autoblocker'                     => 'Эн IP-ҥ "[[User:$1|$1]]" кыттааччыны кытта биир буолан, �н �ми� хааччахтаныыга түб��тиҥ. Кини хааччахтаммыт төрүөт�: "$2"',
 'blocklogpage'                    => 'Хааччахтааһын/бобуу �урунаала',
+'blocklog-fulllog'                => 'Хааччахтааһын �урунаалыгар барытыгар �ыһыаннаах',
 'blocklogentry'                   => '[[$1]] хааччахтаата, болдьоҕо: $2 $3',
+'reblock-logentry'                => 'манна [[$1]] аналлаах хааччахтааһын туруоруулара уларыйда, болдьоҕо $2 $3',
 'blocklogtext'                    => 'Кыттааччылары хааччахтааһын уонна ол хааччахтааһыннарын �уох гыныы �урунаала.
 �птамаатынан хааччахтаммыт IP-лар манна кө�түб�тт�р.
 [[Special:IPBlockList|Билигин баар хааччахтаныылар и�пииһ�кт�рин]] көр.',
@@ -1738,11 +1980,14 @@ $1',
 'block-log-flags-nocreate'        => '�аҥа б�ли�т�нии бобуллубут',
 'block-log-flags-noautoblock'     => 'аптаамаатынан хааччахтааһын араарыллыбыт',
 'block-log-flags-noemail'         => '�уруктар бобуллубуттар',
+'block-log-flags-nousertalk'      => 'б�й�тин ырытар �ир�йин уларытар кыаҕа �уох',
 'block-log-flags-angry-autoblock' => 'к�ҥ�тиллибит автоблок холбоммут',
 'range_block_disabled'            => '�дминнар диапазоннары боболлоро көҥүлл�мм�т.',
 'ipb_expiry_invalid'              => 'Сатаммат к�ми туруордуҥ.',
 'ipb_expiry_temp'                 => '�атын ки�ти�һинн��х бобуу больдьоҕо �уох буолуохтаах.',
 'ipb_already_blocked'             => '"$1" номнуо бобуллубут',
+'ipb-needreblock'                 => '== Хааччахтаммыт �бит ==
+$1 б�ли�р хааччахтаммыт. Хааччахтааһын туруорууларын уларытыаххын баҕараҕын дуо?',
 'ipb_cant_unblock'                => '�лҕа�: $1 нүөм�рд��х бобуу булуллубата. Баҕар кыттааччы хааччаҕын у�тубуттара буолуо.',
 'ipb_blocked_as_range'            => 'Сыыһа: $1 IP-та чопчу бобуллубатах (не блокирован), онон аһыллар кыаҕа �уох. Ол гынан баран IP бу $2 диапазон �орҕотун быһыытынан бобуллубут, ону арыйыахха (бобуутун у�туохха) �өп.',
 'ip_range_invalid'                => 'IP-лар диапазоннара �атаммат.',
@@ -1753,6 +1998,7 @@ $1',
 'proxyblocksuccess'               => 'Сатанна.',
 'sorbsreason'                     => 'Эн IP-ҥ {{SITENAME}} �аайт DNSBL-гар аһаҕа� прок�и быһыытынан �ылдьар.',
 'sorbs_create_account_reason'     => 'Эн IP-ҥ {{SITENAME}} �аайт DNSBL-гар аһаҕа� прок�и быһыытынан �ылдьар. Саҥаттан б�ли�т�н�р кыаҕыҥ �уох.',
+'cant-block-while-blocked'        => 'Б�й�ҥ хааччахтаммыт к�мҥ�р атын кыттааччылары хааччахтыыр кыаҕыҥ �уох.',
 
 # Developer tools
 'lockdb'              => 'Билии олоҕо (database) хатаммыт (көрүөхх� �р� �өп)',
@@ -1775,9 +2021,9 @@ $1',
 'databasenotlocked'   => 'БД уларытааһын бобуллубата.',
 
 # Move page
-'move-page'               => '$1 - аатын уларытыы',
-'move-page-legend'        => '�атын уларытыы',
-'movepagetext'            => "Манна баар форманы туһанан �ир�й аатын уларытыаххын �өп.
+'move-page'                    => '$1 - аатын уларытыы',
+'move-page-legend'             => '�атын уларытыы',
+'movepagetext'                 => "Манна баар форманы туһанан �ир�й аатын уларытыаххын �өп.
 Бу түб�лт�ҕ� уларытыы �урунаала �аҥа �ирг� көһөр.
 Урукку аат �аҥа �ир�йг� утаарар �ир�йг� кубулуйар.
 Урукку аакка ыйынньыктар уларыйбаттар; 
@@ -1790,49 +2036,62 @@ $1',
 '''СЭРЭТИИ!'''
 Сир�й аатын уларытыы улахан уонна �рд�тт�н өйдөммөтөх �одуллаах буолуон �өп.
 Онон, бука ди�н �алгыаҥ иннин� үчүг�йдик толкуйдаа.",
-'movepagetalktext'        => 'Холбонуллубут ырытыы (баар буоллаҕына) �ми� аатын уларытыа. Ол �атаммат түб�лт�л�р�:
+'movepagetalktext'             => 'Холбонуллубут ырытыы (баар буоллаҕына) �ми� аатын уларытыа. Ол �атаммат түб�лт�л�р�:
 *Маннык ааттаах кураанах буолбатах ырытыы баар буоллаҕына
 *Манна б�ли� туруорбатаххына.
 
 Ити түг�нн�рг� �ир�йд�ри б�й�ҥ көһөрүөхт��ххин �б�т�р холбуохтааххын.',
-'movearticle'             => 'Бу аатын уларыт:',
-'movenotallowed'          => 'Cир�йд�р ааттарын уларытар кыаҕыҥ �уох.',
-'newtitle'                => 'Саҥа аата:',
-'move-watch'              => 'К�т��н көрөргө',
-'movepagebtn'             => '�атын уларыт',
-'pagemovedsub'            => '�ата уларыйда',
-'movepage-moved'          => '<big>\'\'\'"$1" �ир�й аата маннык буолла "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Маннык ааттаах �ир�й баар, �б�т�р
+'movearticle'                  => 'Бу аатын уларыт:',
+'movenologin'                  => '�аккын билиһинн�рб�т�ххин',
+'movenologintext'              => 'Эн аакын [[Special:UserLogin|билиһинн�рд�ххин�]] �р� �ир�й аатын уларытар кыахтаныаҥ.',
+'movenotallowed'               => 'Cир�йд�р ааттарын уларытар кыаҕыҥ �уох.',
+'movenotallowedfile'           => 'Бил�л�р ааттарын уларытар кыаҕыҥ �уох.',
+'cant-move-user-page'          => 'Эн кыттааччылар �үрүн �ир�йд�рин аатын уларытар кыаҕыҥ �уох.',
+'cant-move-to-user-page'       => 'Эн кыттааччы аатын далыгар �ир�йд�ри уларытар кыаҕыҥ �уох (анныкы �ир�йд�ритт�н ураты).',
+'newtitle'                     => 'Саҥа аата:',
+'move-watch'                   => 'К�т��н көрөргө',
+'movepagebtn'                  => '�атын уларыт',
+'pagemovedsub'                 => '�ата уларыйда',
+'movepage-moved'               => '<big>\'\'\'"$1" �ир�й аата маннык буолла "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Утаарыы оҥоһулунна.',
+'movepage-moved-noredirect'    => 'Утаарыы-�ир�й оҥорор бобуллубут.',
+'articleexists'                => 'Маннык ааттаах �ир�й баар, �б�т�р
 маннык аат көҥүлл�мм�т �бит.
 �тын аатта таларгар көрдөһөбүт.',
-'cantmove-titleprotected' => 'Сир�йи көһөрөр кыаҕыҥ �уох: �аҥа аат оҥоһуллара бобуллубут',
-'talkexists'              => "'''Сир�й аата уларыйда, ол гынан баран ырытыы аата �атаан уларыйбата, тоҕо ди�т�хх� маннык ааттаах ырытыы �ир�й� баар �бит. Онон б�й�ҥ ол икки ырытыы �ир�йд�рин холбууруҥ буоллар.'''",
-'movedto'                 => 'аатын манныкка уларытыллыбыт:',
-'movetalk'                => 'Сөп түб�һ�р ырытыы �ир�йин аатын �ми� уларыт',
-'move-subpages'           => 'Суб�ир�йд�ри �атанар буоллаҕына ааттарын уларыт',
-'move-talk-subpages'      => 'Сатанар буоллаҕына ырытыы �уб�ир�йд�рин барытын ааттарын уларыт',
-'movepage-page-exists'    => '$1 �ир�й номнуо баар, онон аптамаатынан хо� �уруллар кыаҕа �уох.',
-'movepage-page-moved'     => '$1 �ир�й аата $2 буолбут.',
-'movepage-page-unmoved'   => '$1 �ир�й $2 ааттанар кыаҕа �уох.',
-'movepage-max-pages'      => '$1 {{PLURAL:$1|�ир�й аата уларыйда|�ир�йд�р ааттара уларыйда}} — мантан �лб�х �ир�йи аптамаатынан уларытар кыах �уох.',
-'1movedto2'               => '[[$1]] аата манныкка уларытылынна: [[$2]]',
-'1movedto2_redir'         => 'Утаарыы үрдүн�н [[$1]] �ир�й аата манныкка уларытылынна: [[$2]]',
-'movelogpage'             => '�ат уларыйыытын и�пииһ�г�',
-'movelogpagetext'         => 'Манна ааттара уларытыллыбыт �ир�йд�р и�пииһ�кт�р� кө�төр.',
-'movereason'              => 'Төрүөт�:',
-'revertmove'              => 'төннөрүү',
-'delete_and_move'         => 'Суох гын уонна аатын уларыт',
-'delete_and_move_text'    => '==Сотуохха наада==
+'cantmove-titleprotected'      => 'Сир�йи көһөрөр кыаҕыҥ �уох: �аҥа аат оҥоһуллара бобуллубут',
+'talkexists'                   => "'''Сир�й аата уларыйда, ол гынан баран ырытыы аата �атаан уларыйбата, тоҕо ди�т�хх� маннык ааттаах ырытыы �ир�й� баар �бит. Онон б�й�ҥ ол икки ырытыы �ир�йд�рин холбууруҥ буоллар.'''",
+'movedto'                      => 'аатын манныкка уларытыллыбыт:',
+'movetalk'                     => 'Сөп түб�һ�р ырытыы �ир�йин аатын �ми� уларыт',
+'move-subpages'                => 'Суб�ир�йд�ри �атанар буоллаҕына ааттарын уларыт',
+'move-talk-subpages'           => 'Сатанар буоллаҕына ырытыы �уб�ир�йд�рин барытын ааттарын уларыт',
+'movepage-page-exists'         => '$1 �ир�й номнуо баар, онон аптамаатынан хо� �уруллар кыаҕа �уох.',
+'movepage-page-moved'          => '$1 �ир�й аата $2 буолбут.',
+'movepage-page-unmoved'        => '$1 �ир�й $2 ааттанар кыаҕа �уох.',
+'movepage-max-pages'           => '$1 {{PLURAL:$1|�ир�й аата уларыйда|�ир�йд�р ааттара уларыйда}} — мантан �лб�х �ир�йи аптамаатынан уларытар кыах �уох.',
+'1movedto2'                    => '[[$1]] аата манныкка уларытылынна: [[$2]]',
+'1movedto2_redir'              => 'Утаарыы үрдүн�н [[$1]] �ир�й аата манныкка уларытылынна: [[$2]]',
+'move-redirect-suppressed'     => 'утаарыы бобуллубут',
+'movelogpage'                  => '�ат уларыйыытын и�пииһ�г�',
+'movelogpagetext'              => 'Манна ааттара уларытыллыбыт �ир�йд�р и�пииһ�кт�р� кө�төр.',
+'movereason'                   => 'Төрүөт�:',
+'revertmove'                   => 'төннөрүү',
+'delete_and_move'              => 'Суох гын уонна аатын уларыт',
+'delete_and_move_text'         => '==Сотуохха наада==
 
 Маннык ааттаах �ир�й [[:$1|«$1»]] б�ли�р баар. Эн ону �уох гынан баран аатын уларытаары гынаҕын дуо?',
-'delete_and_move_confirm' => 'Сөп, бу �ир�йи �уох гын',
-'delete_and_move_reason'  => '�атын уларытаары �отулунна',
-'selfmove'                => '�атын уларытар �атаммат. Эрг� уонна �аҥа аата биирд�р.',
-'immobile_namespace'      => '�атын уларытар �атаммат. Саҥа дуу �рг� дуу аата аналлаах (�лужебнай) тыллаах �бит.',
-'imagenocrossnamespace'   => 'Ойууга атын аат далыттан аат би�р�р �атаммат',
-'imagetypemismatch'       => 'Бил� �аҥа ра�ширени�та тиибиг�р �өп түб��п�т',
-'imageinvalidfilename'    => 'Бил� аата �ыыһалаах',
-'fix-double-redirects'    => 'Утаарыылары урукку ааттарыгар төннөр',
+'delete_and_move_confirm'      => 'Сөп, бу �ир�йи �уох гын',
+'delete_and_move_reason'       => '�атын уларытаары �отулунна',
+'selfmove'                     => '�атын уларытар �атаммат. Эрг� уонна �аҥа аата биирд�р.',
+'immobile-source-namespace'    => '"$1" аат далыгар баар �ир�йд�р ааттарын уларытар кыах �уох.',
+'immobile-target-namespace'    => '"$1" аат далыгар �ир�йи көһөрөр кыах �уох',
+'immobile-target-namespace-iw' => 'Интервики �иг�т� ааты уларытыыга туһаныллыбат.',
+'immobile-source-page'         => 'Бу �ир�йи аатын уларытар табыллыбат.',
+'immobile-target-page'         => 'Сир�йг� бу ааты иҥ�р�р табыллыбат.',
+'imagenocrossnamespace'        => 'Ойууга атын аат далыттан аат би�р�р �атаммат',
+'imagetypemismatch'            => 'Бил� �аҥа ра�ширени�та тиибиг�р �өп түб��п�т',
+'imageinvalidfilename'         => 'Бил� аата �ыыһалаах',
+'fix-double-redirects'         => 'Утаарыылары урукку ааттарыгар төннөр',
+'move-leave-redirect'          => 'Утаарыыны хааллар',
 
 # Export
 'export'            => 'Сир�йд�ри та�ка таһаарааһын (export)',
@@ -1844,7 +2103,7 @@ $1',
 Онтон тал: ы�татыйалар и�тори�ларын барытын көһөрөҕүн дуу, к�лиҥҥи торумнарын �р� дуу.
 
 Эк�порт анал аадырыһын туһанан �ир�й бүт�һик торумун көһөрүөхх� �ми� �өп.
-Холобур, [[{{MediaWiki:Mainpage}}]] �ир�йи маннык: [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]].',
+Холобур, [[{{MediaWiki:Mainpage}}]] �ир�йи маннык: [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Бүт�һик торуму �р� килл�р, уларытыы толору и�тори�та наадата �уох',
 'exportnohistory'   => "----
 '''Билл�рии:''' Сир�й толору и�тори�тын таһаарыы (�к�порт) кыах тиийб�тин�н араарыллыбыт.",
@@ -1860,7 +2119,7 @@ $1',
 'allmessagesdefault'        => 'Ту�па �тиллиб�т�ҕин� �уруллар ти�ки�',
 'allmessagescurrent'        => 'Билиҥҥи ти�ки�',
 'allmessagestext'           => 'Манна MediaWiki билл�риил�рин и�пииһ�г� кө�төр.
-Эн MediaWiki движогун тылбаа�тыырга көмөлөһүөххүн баҕарар буоллаххына манна [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] уонна манна [http://translatewiki.net Betawiki] киир.',
+Эн MediaWiki движогун тылбаа�тыырга көмөлөһүөххүн баҕарар буоллаххына манна [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] уонна манна [http://translatewiki.net translatewiki.net] киир.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' туттуллар кыаҕа �уох, тоҕо ди�т�хх� '''\$wgUseDatabaseMessages''' араарыллыбыт.",
 'allmessagesfilter'         => 'Сурук аатын фильтра:',
 'allmessagesmodified'       => 'Уларыйбыттары �р� көрдөр',
@@ -1880,9 +2139,12 @@ $1',
 'import-interwiki-text'      => 'Биикини уонна импортанар �ир�й аатын килл�р.
 Уларытыылар күнн�р�-ыйдара уонна аапптардар ааттара оннуларынан хаалыахтара.
 Биики ыккардынааҕы импорт дьайыылара [[Special:Log/import|аналлаах �урунаалга]] �уруллаллар.',
+'import-interwiki-source'    => 'Ылыллыбыт биикит�/�ир�й�:',
 'import-interwiki-history'   => 'Сир�й туох баар и�тори�тын көһөрөргө',
 'import-interwiki-submit'    => 'Импортаа',
 'import-interwiki-namespace' => 'Бу аат далыгар көһөрөргө:',
+'import-upload-filename'     => 'Бил� аата:',
+'import-comment'             => 'Хо� быһаарыы:',
 'importtext'                 => 'Сир�йи [[Special:Export|�к�порт үнү�түрүмүөнүн]] көмөтүн�н �к�портаа. Бил�ни б�й�ҥ көмпүүт�рг�р �уруй, онтон манна көһөр.',
 'importstart'                => 'Сир�йд�ри импортааһын...',
 'import-revision-count'      => '$1 {{PLURAL:$1|торум|торумнар}}',
@@ -1916,19 +2178,19 @@ $1',
 'import-logentry-interwiki-detail' => 'барыта $2 торумтан $1 торум',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Кыттааччы быһыытынан б�й�м �ир�йим',
+'tooltip-pt-userpage'             => 'Кыттааччы быһыытынан ту� �ир�йиҥ',
 'tooltip-pt-anonuserpage'         => 'Билигин киирбит IP-м �ир�й�',
-'tooltip-pt-mytalk'               => 'Ырытар �ирим',
+'tooltip-pt-mytalk'               => 'К�п��т�р-ырытар �ириҥ',
 'tooltip-pt-anontalk'             => 'Бу IP ырытыыта',
 'tooltip-pt-preferences'          => 'Б�й�м туруорууларым',
 'tooltip-pt-watchlist'            => 'К�т��н көрөр �ир�йд�рим и�пииһ�г�',
-'tooltip-pt-mycontris'            => 'Суруйбут/көннөрбүт �ир�йд�рим и�пииһ�кт�р�',
+'tooltip-pt-mycontris'            => 'Суруйбут/уларыппыт �ир�йд�риҥ тиһикт�р�',
 'tooltip-pt-login'                => 'Манна б�й�ҕин билиһинн�ри�ххин �өп (булгуччута �уох).',
 'tooltip-pt-anonlogin'            => 'Б�й�ҕин билиһинн�ри�ххин �өп (булгуччута �уох).',
 'tooltip-pt-logout'               => 'Тах�ыы',
 'tooltip-ca-talk'                 => 'Ы�татыйаны ырытыы',
 'tooltip-ca-edit'                 => 'Бу �ир�йи уларытыахха �өп. Бука ди�н ба�таан хайдах буоларын көрөн баран уларыт.',
-'tooltip-ca-addsection'           => 'Бу ырытыыга б�й� �анаатын �бии.',
+'tooltip-ca-addsection'           => 'Саҥа �алааны �аҕалааһын',
 'tooltip-ca-viewsource'           => 'Бу �ир�й улартыллыбат. Ол гынан баран тутулун көрүөххүн уонна у�тан ылыаххын �өп.',
 'tooltip-ca-history'              => 'Бу �ир�й урукку торумнара.',
 'tooltip-ca-protect'              => 'Бу �ир�йи уларытары боборго',
@@ -1945,7 +2207,7 @@ $1',
 'tooltip-n-portal'                => 'Бу бырайыак туһунан, манна тугу гыныаххытын �өбүй уонна туох ханна баара',
 'tooltip-n-currentevents'         => '�айдите вводную информацию на текущих �обыти�х',
 'tooltip-n-recentchanges'         => 'Бу биикиг� буолбут бүт�һик уларытыылар.',
-'tooltip-n-randompage'            => 'Үлүб��й �ир�йи көрдөр',
+'tooltip-n-randompage'            => 'Ханнык баҕарар �ир�йи көрдөр',
 'tooltip-n-help'                  => '«{{SITENAME}}» �правочнига.',
 'tooltip-t-whatlinkshere'         => 'Бу �ир�йг� �иг�н�р �ир�йд�р и�пииһ�кт�р�',
 'tooltip-t-recentchangeslinked'   => 'Бу �ир�й �иг�н�р �ир�йд�риг�р к�нники уларыйыылар',
@@ -1975,6 +2237,9 @@ $1',
 'tooltip-watch'                   => 'Бу �ир�йи к�т��һин и�пииһ�г�р килл�р',
 'tooltip-recreate'                => 'Сир�йи �уох гыныллыбытын үрдүн�н �өргүтүү',
 'tooltip-upload'                  => 'Суруйууну �аҕалаа',
+'tooltip-rollback'                => 'Биир баттааһынынан бүт�һик көннөрүүл�ри оҥорбут киһи уларытыыларын �уох оҥорорго.',
+'tooltip-undo'                    => 'Бүт�һик көннөрүүнү �уох оҥор уонна уларытыах иннин� хайдах кө�түөхт��ҕин көрдөрөр түннүгү таһаар.
+Уларытыы төрүөтүн быһаарар кыаҕы би�р.',
 
 # Stylesheets
 'common.css'   => '/** Манна оҥоһуллубут CSS атын �киннарга �ми� олохтонуо */',
@@ -1990,12 +2255,12 @@ $1',
 'notacceptable'     => "Биики-�и�рб�р �н браузерыҥ ааҕар формаатын кыайан көрдөрбөт.<br /> The wiki server can't provide data in a format your client can read.",
 
 # Attribution
-'anonymous'        => '{{SITENAME}} ааттамматах кыттааччылара',
+'anonymous'        => '{{SITENAME}} ааттамматах {{PLURAL:$1|кыттааччыта|кыттааччылара}}',
 'siteuser'         => '{{SITENAME}} кыттааччыта $1',
 'lastmodifiedatby' => 'Бу �ир�йи бүт�һигин $3 кыттааччы $2 уларыппыт, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 үл�тиг�р олоҕурбут.',
 'others'           => 'атыттар',
-'siteusers'        => '{{SITENAME}} кыттааччыта (-лара) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|кыттааччыта|кыттааччылара}} $1',
 'creditspage'      => 'Махтаныы',
 'nocredits'        => 'Бу �ир�й кыттааччыларын и�пииһ�г� �уох.',
 
@@ -2016,6 +2281,14 @@ $1',
 'numauthors'     => 'Ту� ту�па ааптардар ах�ааннара (ы�татыйа): $1',
 'numtalkauthors' => 'Ту� ту�па ааптардар ах�ааннара (ырытыы): $1',
 
+# Skin names
+'skinname-standard'  => 'Кла��ика',
+'skinname-nostalgia' => 'Мунчаарыы',
+'skinname-myskin'    => 'Ми�н�',
+'skinname-chick'     => 'Чуппуу�ка',
+'skinname-simple'    => 'Судургу',
+'skinname-modern'    => 'Билиҥҥи',
+
 # Math options
 'mw_math_png'    => 'Куруук PNG таһаарарга (туһанарга)',
 'mw_math_simple' => 'көннөрү түб�лт�ҕ� HTML, атын буоллаҕына PNG',
@@ -2036,10 +2309,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'Б�й�ҥ уларытыыгын б�р�би�рк�л�ммит курдук оҥороруҥ �атаммат.',
 
 # Patrol log
-'patrol-log-page'   => 'Б�р�би�рк� �урунаала',
-'patrol-log-header' => 'Ботуруулламмыт торумнар �урунааллара.',
-'patrol-log-line'   => '$2-т�н $1 б�ли�т�ммит, патрулламмыт $3',
-'patrol-log-auto'   => '(аптамаатынан)',
+'patrol-log-page'      => 'Б�р�би�рк� �урунаала',
+'patrol-log-header'    => 'Ботуруулламмыт торумнар �урунааллара.',
+'patrol-log-line'      => '$2-т�н $1 б�ли�т�ммит, патрулламмыт $3',
+'patrol-log-auto'      => '(аптамаатынан)',
+'patrol-log-diff'      => '$1 барыл',
+'log-show-hide-patrol' => '$1 ботурууллааһын �урунаала',
 
 # Image deletion
 'deletedrevision'                 => '$1 урукку торума �отулунна',
@@ -2056,9 +2331,12 @@ $1',
 'previousdiff' => '� Иннин��ҕи уларытыыга',
 'nextdiff'     => 'К�ннин��ҕи уларытыыга →',
 
+# Visual comparison
+'visual-comparison' => 'Т�ҥн��н көрүү',
+
 # Media information
 'mediawarning'         => "'''С�р�тии''': бу бил� �и�ти�м�ни алдьатар куһаҕан бырагыраамма куодун илдь� �ылдьар буолуон �өп. <hr />",
-'imagemaxsize'         => 'Ойуу туһунан �ир�й ойууларын бу к��м�йг� дылы кыччат:',
+'imagemaxsize'         => 'Ойуу �ир�йд�рин ойууларын бу к��м�йг� дылы кыччат:',
 'thumbsize'            => 'Кыра ойуу (миниатюра) к��м�й�:',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|�ир�й|�ир�й}}',
 'file-info'            => '(бил� к��м�й�: $1, MIME тииб�: $2)',
@@ -2068,10 +2346,12 @@ $1',
 'show-big-image'       => 'Ойуу б�й�тин толору к��м�й�',
 'show-big-image-thumb' => '<small>Хачайдыах иннин� көрүү к��м�й�: $1 × $2 пиик��л</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Саҥа бил�л�р галере�лара',
 'imagelisttext'         => "Манна {{PLURAL:$1|бил�|бил�л�р}} и�пииһ�кт�р� ('''$1''') кө�төр, �уортаммыт: $2.",
 'newimages-summary'     => 'Бу анал �ир�й килл�риллибит бил�л�р и�пииһ�кт�рин көрдөрөр.',
+'newimages-legend'      => 'Фильтр',
+'newimages-label'       => 'Бил� аата (�б�т�р �орҕото):',
 'showhidebots'          => '($1 робот)',
 'noimages'              => 'Ойуу �уох.',
 'ilsubmit'              => 'Көрдөт',
@@ -2280,6 +2560,18 @@ $1',
 'exif-lightsource-24'  => 'ISO �туди� лаампата',
 'exif-lightsource-255' => '�тын уот',
 
+# Flash modes
+'exif-flash-fired-0'    => 'В�пышката тыкпатах',
+'exif-flash-fired-1'    => 'В�пышката тыкпыт',
+'exif-flash-return-0'   => 'в�пышка �рд� тыгар режима �уох',
+'exif-flash-return-2'   => 'обратный импуль� предварительной в�пышки не получен',
+'exif-flash-return-3'   => 'получен обратный импуль� предварительной в�пышки',
+'exif-flash-mode-1'     => 'в�пышка "толорор" тыгыыта',
+'exif-flash-mode-2'     => 'подавление заполн�ющей в�пышки',
+'exif-flash-mode-3'     => 'в�пышка аптамаатынан холбонор режим�',
+'exif-flash-function-1' => 'В�пышката �уох',
+'exif-flash-redeye-1'   => '"кыһыл хараҕы" �уох оҥорор режим',
+
 'exif-focalplaneresolutionunit-2' => 'дюйм',
 
 'exif-sensingmethod-1' => 'Чуолкайдамматах',
@@ -2420,21 +2712,10 @@ $1
 Бука ди�н �ир�йи төннөрөргүн биг�рг�т.",
 'recreate'            => 'Саҥаттан оҥоруу',
 
-# HTML dump
-'redirectingto' => '[[:$1]] �ир�йг� көһөрүү...',
-
 # action=purge
-'confirm_purge'        => 'Бу �ир�й к��һин �отоору гынаҕын дуо?
-
-$1',
 'confirm_purge_button' => 'Сөп',
-
-# AJAX search
-'searchcontaining' => "Маннык тыллаах/тыллардаах �ир�йд�ри көрдөөһүн: ''$1''.",
-'searchnamed'      => "Маннык ааттаах �ир�йи көрдөөһүн: ''$1''.",
-'articletitles'    => "Мантан �аҕаланар ы�татыйалары көрдөөһүн: ''$1''",
-'hideresults'      => 'Булуллубуту кө�түб�т оҥор',
-'useajaxsearch'    => 'AJAX көрдөөһүнү туһаныы',
+'confirm-purge-top'    => 'Бу �ир�й к��һин �отоору гынаҕын дуо?',
+'confirm-purge-bottom' => 'К��һин ыраа�таабыт к�нн� �ир�й бүт�һик торума кө�түө.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� инники �ир�й',
@@ -2454,10 +2735,10 @@ $1',
 'table_pager_empty'        => 'Туох да кө�түб�т�',
 
 # Auto-summaries
-'autosumm-blank'   => 'Сир�й иһ� барыта �отуллубут',
+'autosumm-blank'   => 'Бу �ир�й ыраа�таныллыбыт',
 'autosumm-replace' => "Сир�й иһ� уларытыллыбыт: '$1'",
 'autoredircomment' => 'Утаарыы: [[$1]]',
-'autosumm-new'     => 'Саҥа: $1',
+'autosumm-new'     => "'$1' ыйааһыннаах �аҥа �ир�й оҥоһулунна",
 
 # Size units
 'size-bytes' => '$1 байт',
@@ -2498,6 +2779,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'Биллиб�т ти�г "$1"',
+'duplicate-defaultsort' => 'Болҕой: �аардааһын «$2» күлүүһ� урукку «$1» күлүүһү �абар (Ключ �ортировки переопредел�ет прежний ключ).',
 
 # Special:Version
 'version'                          => 'MediaWiki би�р�ий�т� (барыла)', # Not used as normal message but as header for the special page itself
@@ -2526,13 +2808,13 @@ $1',
 'filepath-submit'  => 'Суол',
 'filepath-summary' => 'Бу аналлаах �ир�й бил� толору �уолун (ди��к�ҕ� ханна �ытарын) көрдөрөр.
 
-Бил� аатын префик�а �уох килл�р <code>{{ns:image}}:</code>.',
+Бил� аатын префик�а �уох килл�р <code>{{ns:file}}:</code>.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Хо� бил�л�ри көрдөөһүн',
 'fileduplicatesearch-summary'  => 'Т�ҥ бил�л�ри х�ш-куодтарынан көрдөөһүн.
 
-Бил� аатын "{{ns:image}}:" префик�а �уох килл�р.',
+Бил� аатын "{{ns:file}}:" префик�а �уох килл�р.',
 'fileduplicatesearch-legend'   => 'Хатылааһыннары көрдөөһүн',
 'fileduplicatesearch-filename' => 'Бил� аата:',
 'fileduplicatesearch-submit'   => 'Бул',
@@ -2562,4 +2844,13 @@ $1',
 'blankpage'              => 'Кураанах �ир�й',
 'intentionallyblankpage' => 'Бу �ир�й �оруйан кураанах хаалларыллыбыт',
 
+# External image whitelist
+'external_image_whitelist' => ' #Бу �трокааны хайдах баарынан хааллар<pre>
+#Разме�тите зде�ь фрагменты регул�рных выражений (ту ча�ть, что находит�� между //)
+#они будут �оотне�ены � URL внешних изображений.
+#Сатанар буоллаҕына ойуу курдук кө�түөҕ�, атыттара ойууларга �иг� курдук кө�түө.
+#Бу # б�ли�тт�н �аҕаланар �трокаалар быһаарыы �урук курдук ааҕыллыахтара.
+
+#Размещайте фрагменты регул�рных выражений над �той �трочкой. Бу �трокааны хайдах баарынан хааллар.</pre>',
+
 );
diff --git a/languages/messages/MessagesSc.php b/languages/messages/MessagesSc.php
index b155a6a9..092fd7d1 100644
--- a/languages/messages/MessagesSc.php
+++ b/languages/messages/MessagesSc.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER_TALK       => 'Utente_discussioni',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK    => '$1_discussioni',
-	NS_IMAGE           => 'Immàgini',
-	NS_IMAGE_TALK      => 'Immàgini_contièndha'
+	NS_FILE            => 'Immàgini',
+	NS_FILE_TALK       => 'Immàgini_contièndha'
 );
 
 $dateFormats = array(
@@ -116,8 +116,6 @@ $messages = array(
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'A proposito di {{SITENAME}}',
-'bugreports'           => 'Segnalazioni di malfunzionamento',
-'bugreportspage'       => 'Project:Malfunzionamenti',
 'currentevents'        => 'Attualità',
 'edithelp'             => 'Guida per la modifica o la scrittura di un articolo',
 'edithelppage'         => 'Help:Come_scrivere_un_articolo',
@@ -159,7 +157,6 @@ L/'amministratore di sistema che ha imposto il blocco, ha lasciato questa nota:
 'cannotdelete'    => "Impossibile cancellare la pagina o l'immagine richiesta.",
 'badtitle'        => 'Titolo non corretto',
 'badtitletext'    => 'La pagina richiesta non è disponibile, potrebbe essere non valida, vuota, o potrebbe trattarsi di un errore in un link interlinguistico o fra diverse versioni di {{SITENAME}}.',
-'perfdisabled'    => 'Siamo davvero rammaricati, ma questa funzionalità è temporaneamente disabilitata durante le ore di maggiore accesso al database per ragioni di accessibilità al resto del sito! Torna fra le 02:00 e le 14:00 UTC e riprova. Grazie.',
 
 # Login and logout pages
 'logouttitle'             => 'Logout Utente',
@@ -171,7 +168,6 @@ Ora puoi continuare ad usare {{SITENAME}} come utente anonimo (ma il tuo indiriz
 'yourpassword'            => 'La tua  password',
 'yourpasswordagain'       => 'Ripeti la password',
 'remembermypassword'      => 'Ricorda la mia password per più sessioni (richiede uso dei cookies).',
-'loginproblem'            => '<b>Si è verificato un errore durante il tuo tentativo di login.</b><br />Riprova, sarai più fortunato!',
 'nav-login-createaccount' => 'Log in',
 'userlogin'               => 'Log in',
 'createaccount'           => 'Crea nuovo account',
@@ -196,8 +192,13 @@ Per evidenti ragioni di sicurezza, dovresti fare un log in il prima possibile, e
 'passwordsent'            => 'Una nuova password è stata inviata alla casella e-mail registrata per l\'Utente "$1".
 Per favore, fai subito un log in non appena la ricevi.',
 
+# Password reset dialog
+'oldpassword' => 'Vecchia password',
+'newpassword' => 'Nuova password',
+'retypenew'   => 'Riscrivi qui la nuova password',
+
 # Edit pages
-'summary'         => 'Oggetto',
+'summary'         => 'Oggetto:',
 'minoredit'       => 'Questa è una modifica minore',
 'watchthis'       => "Tieni d'occhio questo articolo",
 'savearticle'     => 'Salva la pagina',
@@ -216,8 +217,8 @@ Se lo desideri, puoi contattare $1, o uno degli altri [[{{MediaWiki:Grouppage-sy
 'newarticletext'  => 'Scrivi qui il tuo testo.',
 'noarticletext'   => "(L'articolo è vuoto, potresti gentilmente iniziare l'articolo oppure richiedere la cancellazione di questa pagina)",
 'updated'         => '(Aggiornato)',
-'note'            => '<strong>Nota:</strong>',
-'previewnote'     => '<strong>Tieni presente che questa è solo una ANTEPRIMA, e che la tua versione non è ancora stata salvata!</strong>',
+'note'            => "'''Nota:'''",
+'previewnote'     => "'''Tieni presente che questa è solo una ANTEPRIMA, e che la tua versione non è ancora stata salvata!'''",
 'previewconflict' => "Questa anteprima rappresenta il testo nella casella di edizione di sopra, l'articolo apparirà n questa forma se sceglierai di salvare la pagina.",
 'editing'         => 'Modifica di $1',
 'editconflict'    => 'Conflitto di edizione: $1',
@@ -227,21 +228,18 @@ Dovrai inserire, se lo desideri, le tue modifiche nel testo esistente, e perciò
 <b>Soltanto</b> il testo nella casella di sopra sarà sakvato se premerai il bottone "Salva".<br />',
 'yourtext'        => 'Il tuo testo',
 'storedversion'   => 'Versione in archivio',
-'editingold'      => "<strong>ATTENZIONE: Stai modificando una versione dell'articolo non aggiornata.
-Se la salvi così, tutti i cambiamenti apportati dopo questa revisione verranno persi per sempre.</strong>",
+'editingold'      => "'''ATTENZIONE: Stai modificando una versione dell'articolo non aggiornata.
+Se la salvi così, tutti i cambiamenti apportati dopo questa revisione verranno persi per sempre.'''",
 'yourdiff'        => 'Differenze',
 
 # History pages
-'nohistory'       => 'Cronologia delle versioni di questa pagina non reperibile.',
-'revnotfound'     => 'Versione non trovata',
-'revnotfoundtext' => 'La versione precedente di questo articolo che hai richiesto, non è stata trovata.
-Controlla per favore la URL che hai usato per accedere a questa pagina.',
-'currentrev'      => 'Versione attuale',
-'revisionasof'    => 'Revisione $1',
-'cur'             => 'corr',
-'next'            => 'succ',
-'last'            => 'prec',
-'histlegend'      => 'Legend: (corr) = differenze con la versione corrente,
+'nohistory'    => 'Cronologia delle versioni di questa pagina non reperibile.',
+'currentrev'   => 'Versione attuale',
+'revisionasof' => 'Revisione $1',
+'cur'          => 'corr',
+'next'         => 'succ',
+'last'         => 'prec',
+'histlegend'   => 'Legend: (corr) = differenze con la versione corrente,
 (prec) = differenze con la versione precedente, M = modifica minore',
 
 # Diffs
@@ -260,6 +258,7 @@ Controlla per favore la URL che hai usato per accedere a questa pagina.',
 'prevn'                 => 'precedenti $1',
 'nextn'                 => 'successivi $1',
 'viewprevnext'          => 'Vedi ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Aiuto',
 'showingresults'        => 'Qui di seguito <b>$1</b> risultati, partendo dal numero #<b>$2</b>.',
 'nonefound'             => '<strong>Nota</strong>: la ricerca di parole troppo comuni, come "avere" o "essere", che non sono indicizzate, può causare un esito negativo, così come indicare più di un termine da ricercare (solo le pagine che contengano tutti i termini ricercati verrebbero infatti visualizzate fra i risultati).',
 'powersearch'           => 'Ricerca',
@@ -280,9 +279,6 @@ per poter personalizzare le tue preferenze.',
 'skin'                     => 'Aspetto',
 'saveprefs'                => 'Salva preferenze',
 'resetprefs'               => 'Resetta preferenze',
-'oldpassword'              => 'Vecchia password',
-'newpassword'              => 'Nuova password',
-'retypenew'                => 'Riscrivi qui la nuova password',
 'textboxsize'              => 'Dimensione della casella di edizione',
 'rows'                     => 'Righe',
 'columns'                  => 'Colonne',
@@ -323,7 +319,7 @@ per fare lo upload di files.',
 'uploadtext'        => "'''FERMA!''' Prima di effettuare un upload su {{SITENAME}}, accertati di avere ben letto e soprattutto compreso
 le regole di {{SITENAME}} sull'uso delle immagini.
 
-Per visualizzare o cercare immagini precedentemente caricate su {{SITENAME}}, vai alla [[Special:ImageList|lista delle immagini già caricate]].
+Per visualizzare o cercare immagini precedentemente caricate su {{SITENAME}}, vai alla [[Special:FileList|lista delle immagini già caricate]].
 Uploads e cancellazioni delle immagini sono registrati nello
 upload log.
 
@@ -355,10 +351,10 @@ Tutti i tempi indicati sono calcolati sul fuso orario del server.',
 'savefile'          => 'Salva file',
 'uploadedimage'     => 'caricato "[[$1]]"',
 
-# Special:ImageList
-'imagelist' => 'Lista delle immagini',
+# Special:ListFiles
+'listfiles' => 'Lista delle immagini',
 
-# Image description page
+# File description page
 'imagelinks'     => 'Link alle immagini',
 'linkstoimage'   => 'Le pagine seguenti linkano questa immagine:',
 'nolinkstoimage' => 'Nessuna pagina linka questa immagine.',
@@ -367,16 +363,8 @@ Tutti i tempi indicati sono calcolati sul fuso orario del server.',
 'randompage' => 'Una pagina a caso',
 
 # Statistics
-'statistics'    => 'Statistiche',
-'sitestats'     => 'Statistiche del sito',
-'userstats'     => 'Statistiche del {{SITENAME}}',
-'sitestatstext' => 'Ci sono ben <b>$1</b> pagine nel database.
-Questa cifra comprende le pagine "talk" (discussione), pagine su {{SITENAME}}, articoli esigui ("stub"), redirects, e altre pagine che probabilmente non andrebbero conteggiate fra gli articoli.
-Escludendo queste, ci sono ben  <b>$2</b> pagine che sono con buona probabilità propriamente degli articoli.<p>
-Ci sono state un totale di <b>$3</b> pagine viste, e <b>$4</b> modifiche agli articoli da quando il software è stato potenziato (Dicembre, 2002).
-Questa media rivela che ci sono state una media di  <b>$5</b> modifiche per ciascun articolo, e che l\'articolo è stato letto <b>$6</b> volte per ciascuna modifica.',
-'userstatstext' => 'Ci sono <b>$1</b> Utenti registrati.
-<b>$2</b> di questi hanno il grado di amministratori (vedi $3).',
+'statistics'              => 'Statistiche',
+'statistics-header-users' => 'Statistiche del {{SITENAME}}',
 
 'disambiguationspage' => '{{ns:project}}:Links_to_disambiguating_pages',
 
@@ -437,7 +425,7 @@ Se in seguito vorrai togliere questo articolo dalla tua lista di osservati speci
 'unwatchthispage'  => 'Smetti di seguire',
 'notanarticle'     => 'Non è un articolo',
 
-# Delete/protect/revert
+# Delete
 'deletepage'        => 'Cancella pagina',
 'confirm'           => 'Conferma',
 'confirmdeletetext' => 'Stai per cancellare permanentemente dal database una pagina o una immagine, insieme a tutta la sua cronologia.
@@ -452,9 +440,11 @@ Vedi $2 per un elenco delle pagine cancellate di recente.',
 Tutti i tempi sono in ora del server.',
 'reverted'          => 'Ripristinata versione precedente',
 'deletecomment'     => 'Motivazione della cancellazione',
-'rollback'          => 'Usa una revisione precdente',
-'cantrollback'      => "Impossibile tornare ad una versione precedente: l'ultima modifica è stata apportata dall'unico utente che abbia lavorato a questo articolo.",
-'revertpage'        => 'Riportata alla revisione precedente da [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Rollback
+'rollback'     => 'Usa una revisione precdente',
+'cantrollback' => "Impossibile tornare ad una versione precedente: l'ultima modifica è stata apportata dall'unico utente che abbia lavorato a questo articolo.",
+'revertpage'   => 'Riportata alla revisione precedente da [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
 
 # Undelete
 'undelete'          => 'Recupera una pagina cancellata',
@@ -474,7 +464,6 @@ Se una nuova pagina è stata creata con questo stesso nome dopo la cancellazione
 
 # What links here
 'whatlinkshere' => 'Pagine che linkano questa',
-'linklistsub'   => '(Lista di links)',
 'linkshere'     => 'Le seguenti pagine contengono link che puntano qui:',
 'nolinkshere'   => 'Nessuna pagina contiene links che puntano a questa.',
 'isredirect'    => 'redirect',
@@ -537,6 +526,9 @@ Questo cambiamento drastico potrebbe creare inattesi contrattempi, specialmente
 
 In questi casi, se lo ritieni opportuno, dovrai spostare o aggiungere manualmente la pagina di discussione.",
 'movearticle'      => 'Rinomina articolo',
+'movenologin'      => 'Non hai effettuato il login',
+'movenologintext'  => 'Devi essere un Utente registrato ed aver effettuato il [[Special:UserLogin|login]]
+per poter spostare una pagina.',
 'newtitle'         => 'Al nuovo titolo di',
 'movepagebtn'      => 'Sposta questa pagina',
 'pagemovedsub'     => 'Spostamento effettuato con successo',
@@ -546,7 +538,7 @@ Scegli, per cortesia, un titolo diverso per l'articolo.",
 'movedto'          => 'spostata a',
 'movetalk'         => 'Sposta anche la corrispondente pagina "discussione", se possibile.',
 
-# Special:NewImages
+# Special:NewFiles
 'imagelisttext' => 'Qui di seguito una lista di $1 immagini, ordinate per $2.',
 'ilsubmit'      => 'Cerca',
 'bydate'        => 'data',
diff --git a/languages/messages/MessagesScn.php b/languages/messages/MessagesScn.php
index dd53dadf..1f7b3e8c 100644
--- a/languages/messages/MessagesScn.php
+++ b/languages/messages/MessagesScn.php
@@ -6,61 +6,61 @@
  *
  * @author Gmelfi
  * @author Melos
+ * @author Omnipaedista
  * @author Santu
  * @author Sarvaturi
  * @author Tonyfroio
+ * @author Urhixidur
  * @author לערי ריינה�רט
  */
 
 $fallback = 'it';
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Mèdia',
-	NS_SPECIAL        => 'Spiciali',
-	NS_MAIN           => '',
-	NS_TALK           => 'Discussioni',
-	NS_USER           => 'Utenti',
-	NS_USER_TALK      => 'Discussioni_utenti',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Discussioni_$1',
-	NS_IMAGE          => 'Mmàggini',
-	NS_IMAGE_TALK     => 'Discussioni_mmàggini',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Discussioni_MediaWiki',
-	NS_TEMPLATE       => 'Template',
-	NS_TEMPLATE_TALK  => 'Discussioni_template',
-	NS_HELP           => 'Aiutu',
-	NS_HELP_TALK      => 'Discussioni_aiutu',
-	NS_CATEGORY       => 'Catigurìa',
-	NS_CATEGORY_TALK  => 'Discussioni_catigurìa',
+	NS_MEDIA            => 'Mèdia',
+	NS_SPECIAL          => 'Spiciali',
+	NS_TALK             => 'Discussioni',
+	NS_USER             => 'Utenti',
+	NS_USER_TALK        => 'Discussioni_utenti',
+	NS_PROJECT_TALK     => 'Discussioni_$1',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussioni_file',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Discussioni_MediaWiki',
+	NS_TEMPLATE         => 'Template',
+	NS_TEMPLATE_TALK    => 'Discussioni_template',
+	NS_HELP             => 'Aiutu',
+	NS_HELP_TALK        => 'Discussioni_aiutu',
+	NS_CATEGORY         => 'Catigurìa',
+	NS_CATEGORY_TALK    => 'Discussioni_catigurìa',
 );
 
 $namespaceAliases = array(
 	'Discussioni_Utenti' => NS_USER_TALK,
+	'Mmàggini' => NS_FILE,
+	'Discussioni mmàggini' => NS_FILE_TALK,
 	'Discussioni_Template' => NS_TEMPLATE_TALK,
 	'Discussioni_Aiutu' => NS_HELP_TALK,
 	'Discussioni_Catigurìa' => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'Classicu',
-	'simple'      => 'Sìmprici',
-);
 
 $specialPageAliases = array(
 	'DoubleRedirects'           => array( 'RinnirizzamentiDuppi' ),
 	'BrokenRedirects'           => array( 'RinnirizzamentiSbagghiati' ),
 	'Disambiguations'           => array( 'Disambiguazzioni' ),
-	'Userlogin'                 => array( 'Tràsi,Login' ),
-	'Userlogout'                => array( 'Nesci,Logout' ),
+	'Userlogin'                 => array( 'Tràsi', 'Login' ),
+	'Userlogout'                => array( 'Nesci', 'Logout' ),
+	'CreateAccount'             => array( 'CrìatiNuCuntu' ),
 	'Preferences'               => array( 'Prifirenzi' ),
-	'Watchlist'                 => array( 'ArtìculiTalìati' ),
+	'Watchlist'                 => array( 'ArtìculiTaliati' ),
 	'Recentchanges'             => array( 'ÙrtimiCanciamenti' ),
 	'Upload'                    => array( 'Càrrica' ),
-	'Imagelist'                 => array( 'Mmàggini' ),
+	'Listfiles'                 => array( 'Mmàggini' ),
 	'Newimages'                 => array( 'MmàgginiRicenti' ),
-	'Listusers'                 => array( 'Utilizzatura,ListaUtilizzatura' ),
-	'Statistics'                => array( 'Statistichi' ),
+	'Listusers'                 => array( 'Utilizzatura', 'ListaUtilizzatura' ),
+	'Listgrouprights'           => array( 'AlencuPirmessiGruppi' ),
+	'Statistics'                => array( 'Statìstichi' ),
 	'Randompage'                => array( 'PàgginaAmmuzzu' ),
 	'Lonelypages'               => array( 'PàgginiOrfani' ),
 	'Uncategorizedpages'        => array( 'PàgginiSenzaCatigurìi' ),
@@ -69,47 +69,51 @@ $specialPageAliases = array(
 	'Uncategorizedtemplates'    => array( 'TemplateSenzaCatigurìi' ),
 	'Unusedcategories'          => array( 'CatigurìiNonUsati' ),
 	'Unusedimages'              => array( 'MmàgginiNonUsati' ),
-	'Wantedpages'               => array( 'PàgginiRichiesti' ),
-	'Wantedcategories'          => array( 'CatigurìiRichiesti' ),
-	'Mostlinked'                => array( 'PàgginiCchiùrRichiamati' ),
+	'Wantedpages'               => array( 'PàgginiAddumannati' ),
+	'Wantedcategories'          => array( 'CatigurìiAddumannati' ),
+	'Wantedfiles'               => array( 'FileAddumannati' ),
+	'Wantedtemplates'           => array( 'TemplateAddumannati' ),
+	'Mostlinked'                => array( 'PàgginiCchiùRichiamati' ),
 	'Mostlinkedcategories'      => array( 'CatigurìiCchiùrRichiamati' ),
 	'Mostlinkedtemplates'       => array( 'TemplateCchiùRichiamati' ),
-	'Mostcategories'            => array( 'PàgginiCuCchiùCatigurìi' ),
+	'Mostcategories'            => array( 'PàgginiCuCchiossaiCatigurìi' ),
 	'Mostimages'                => array( 'MmàgginiCchiùRichiamati' ),
-	'Mostrevisions'             => array( 'PàgginiCuCchiùRivisioni' ),
-	'Fewestrevisions'           => array( 'PàgginiCuMenuRivisioni,PàgginiCuMenoRivisioni' ),
+	'Mostrevisions'             => array( 'PàgginiCuCchiossaiRivisioni' ),
+	'Fewestrevisions'           => array( 'PàgginiCuCchiuPiccaRivisioni', 'PàgginiCuCchiùPiccaRivisioni' ),
 	'Shortpages'                => array( 'PàgginiCchiùCurti' ),
 	'Longpages'                 => array( 'PàgginiCchiùLonghi' ),
-	'Newpages'                  => array( 'PàgginiCchiùRicenti,PàgginiCchiùRecenti' ),
-	'Ancientpages'              => array( 'PàgginiMenuRecenti,PàgginiMenoRicenti,PàgginiMenuRecenti,PàgginiMenoRicenti' ),
+	'Newpages'                  => array( 'PàgginiCchiùRicenti' ),
+	'Ancientpages'              => array( 'PàgginiMenuRicenti', 'PàgginiMenoRicenti' ),
 	'Deadendpages'              => array( 'PàgginiSenzaNisciuta' ),
 	'Protectedpages'            => array( 'PàgginiPrutetti' ),
+	'Protectedtitles'           => array( 'TìtuliPrutetti' ),
 	'Allpages'                  => array( 'TuttiLiPàggini' ),
-	'Prefixindex'               => array( 'Prifissi,Prefissi' ),
+	'Prefixindex'               => array( 'Prifissi' ),
 	'Ipblocklist'               => array( 'IPBluccati' ),
 	'Specialpages'              => array( 'PàgginiSpiciali' ),
-	'Contributions'             => array( 'Cuntribbuti,CuntribbutiUtenti' ),
+	'Contributions'             => array( 'Cuntribbuti', 'CuntribbutiUtenti' ),
 	'Emailuser'                 => array( 'MannaEmail' ),
+	'Confirmemail'              => array( 'CunfermaEmail' ),
 	'Whatlinkshere'             => array( 'ChiPuntaCcà' ),
 	'Recentchangeslinked'       => array( 'CancaimentiCurrilati' ),
-	'Movepage'                  => array( 'Sposta,Rinomina' ),
+	'Movepage'                  => array( 'Sposta', 'Rinòmina' ),
 	'Blockme'                   => array( 'BloccaProxy' ),
 	'Booksources'               => array( 'RicercaISBN' ),
 	'Categories'                => array( 'Catigurìi' ),
 	'Export'                    => array( 'Esporta' ),
 	'Version'                   => array( 'Virsioni' ),
 	'Allmessages'               => array( 'Missaggi' ),
-	'Log'                       => array( 'Log,Riggistri,Riggistro' ),
+	'Log'                       => array( 'Riggistri', 'Riggistru' ),
 	'Blockip'                   => array( 'Blocca' ),
 	'Undelete'                  => array( 'Riprìstina' ),
 	'Import'                    => array( 'Mporta' ),
-	'Lockdb'                    => array( 'BloccaDB,BloccaDatabase' ),
-	'Unlockdb'                  => array( 'SbloccaDB,SbloccaDatabase' ),
-	'Userrights'                => array( 'PirmissiUtenti' ),
+	'Lockdb'                    => array( 'BloccaDB', 'BloccaDatabase' ),
+	'Unlockdb'                  => array( 'SbloccaDB', 'SbloccaDatabase' ),
+	'Userrights'                => array( 'PirmessiUtenti' ),
 	'MIMEsearch'                => array( 'RicercaMIME' ),
-	'Unwatchedpages'            => array( 'PàgginiNunOssirvati' ),
-	'Listredirects'             => array( 'Rinnirizzamenti,ListaRinnirizzamenti' ),
-	'Revisiondelete'            => array( 'CancellaRivisioni' ),
+	'Unwatchedpages'            => array( 'PàgginiNunUssirvati' ),
+	'Listredirects'             => array( 'Rinnirizzamenti', 'ListaRinnirizzamenti' ),
+	'Revisiondelete'            => array( 'ScancellaRivisioni' ),
 	'Unusedtemplates'           => array( 'TemplateNunUsati' ),
 	'Randomredirect'            => array( 'RedirectAmmuzzu' ),
 	'Mypage'                    => array( 'MèPàgginaUtenti' ),
@@ -117,9 +121,13 @@ $specialPageAliases = array(
 	'Mycontributions'           => array( 'MèCuntribbuti' ),
 	'Listadmins'                => array( 'Amministratura' ),
 	'Popularpages'              => array( 'PàgginiCchiùVisitati' ),
-	'Search'                    => array( 'Ricerca,Cerca' ),
-	'Resetpass'                 => array( 'ReimpostaPassword' ),
+	'Search'                    => array( 'Ricerca', 'Cerca' ),
+	'Resetpass'                 => array( 'RimpostaPassword' ),
 	'Withoutinterwiki'          => array( 'SenzaInterwiki' ),
+	'MergeHistory'              => array( 'UnìficaCrunoluggìa' ),
+	'Blankpage'                 => array( 'PàgginaLèggia' ),
+	'LinkSearch'                => array( 'CercaCullicamenti' ),
+	'DeletedContributions'      => array( 'CuntribbutiScancillati' ),
 );
 
 $messages = array(
@@ -160,17 +168,18 @@ $messages = array(
 'tog-watchlisthideown'        => "Ammuccia li mè canciamenti nta l'ossirvati spiciali",
 'tog-watchlisthidebots'       => "Ammuccia li canciamenti dî bot nta l'ossirvati spiciali",
 'tog-watchlisthideminor'      => "Ammuccia li canciamenti nichi nta l'ossirvati spiciali",
+'tog-watchlisthideliu'        => "Ammuccia li canciamenti di l'utilizzatura riggistrati nti l'ussirvati spiciali",
+'tog-watchlisthideanons'      => "Ammuccia li canciamenti di l'utilizzatura anònimi nti l'ussirvati spiciali",
 'tog-nolangconversion'        => 'Disattiva la cunvirsioni tra varianti linguìstichi',
 'tog-ccmeonemails'            => "Mànnami na copia dî missaggi spiditi a l'àutri utenti",
 'tog-diffonly'                => "Nun visualizzari lu cuntinutu dâ pàggina quannu s'esequi na ''diff'' tra dui virsioni",
 'tog-showhiddencats'          => 'Ammustra li catigurìi ammucciati.',
+'tog-norollbackdiff'          => "Umettiri li ''diff'' doppu aviri fattu nu ''rollback''",
 
 'underline-always'  => 'sempri',
 'underline-never'   => 'mai',
 'underline-default' => 'manteni li mpustazzioni dû browser',
 
-'skinpreview' => '(Antiprima)',
-
 # Dates
 'sunday'        => 'Duminicadìa',
 'monday'        => 'Lunidìa',
@@ -263,7 +272,7 @@ $messages = array(
 'mytalk'         => 'la mè pàggina di discussioni',
 'anontalk'       => 'Discussione pi stu IP',
 'navigation'     => 'Navigazzioni',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadati:',
@@ -300,14 +309,14 @@ $messages = array(
 'talkpagelinktext'  => 'Discussioni',
 'specialpage'       => 'Pàggina spiciali',
 'personaltools'     => 'Strumenta pirsunali',
-'postcomment'       => 'Manna un cummentu',
+'postcomment'       => 'Nova sizzioni',
 'articlepage'       => 'artìculu',
 'talk'              => 'discussioni',
 'views'             => 'Vìsiti',
 'toolbox'           => 'Strummenta',
 'userpage'          => 'Visualizza la pàggina utenti',
 'projectpage'       => 'Visualizza la pàggina di sirvizziu',
-'imagepage'         => 'Visualizza la pàggina di discrizzioni dâ mmàggini',
+'imagepage'         => 'Visualizza la pàggina dô file',
 'mediawikipage'     => 'Visualizza lu missaggiu',
 'templatepage'      => 'Visualizza lu template',
 'viewhelppage'      => "Visualizza la pàggina d'aiutu",
@@ -326,8 +335,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Àutri nfurmazzioni supra {{SITENAME}}',
 'aboutpage'            => 'Project:Àutri nformazzioni',
-'bugreports'           => 'Malifunziunamenti',
-'bugreportspage'       => 'Project:Malifunziunamenti',
 'copyright'            => 'Lu cuntinutu è utilizzàbbili secunnu la $1.',
 'copyrightpagename'    => 'Lu copyright supra {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -350,9 +357,7 @@ $messages = array(
 
 'badaccess'        => 'Pirmessi nun sufficienti',
 'badaccess-group0' => "Nun hai li pirmessi nicissari p'esèquiri l'azzioni addumannata.",
-'badaccess-group1' => "La funzioni addumannata è risirvata a l'utenti ca appartèninu a lu gruppu $1.",
-'badaccess-group2' => "La funzioni addumannata è risirvata a l'utenti di unu dî gruppi $1.",
-'badaccess-groups' => "La funzioni addumannata è risirvata a l'utenti ca appartèninu a unu dî siquenti gruppi: $1.",
+'badaccess-groups' => "La funzioni addumannata è risirvata a l'utenti ca appartèninu {{PLURAL:$2|ô gruppu|a unu dî gruppi siquenti}}: $1.",
 
 'versionrequired'     => 'È nicissaria la virsioni $1 dû software MediaWiki',
 'versionrequiredtext' => "P'usari sta pàggina ci voli la virsioni $1 dû software MediaWiki. Talìa [[Special:Version|sta pàggina]]",
@@ -366,6 +371,8 @@ $messages = array(
 'editsection'             => 'cancia',
 'editold'                 => 'cancia',
 'viewsourceold'           => 'talìa la fonti',
+'editlink'                => 'cancia',
+'viewsourcelink'          => 'Talìa la funti',
 'editsectionhint'         => 'Cancia la sezzioni $1',
 'toc'                     => 'ÃŒndici',
 'showtoc'                 => 'ammustra',
@@ -386,7 +393,7 @@ $messages = array(
 'nstab-main'      => 'artìculu',
 'nstab-user'      => "Pàggina d'utenti",
 'nstab-media'     => 'File multimidiali',
-'nstab-special'   => 'spiciali',
+'nstab-special'   => 'Spiciali',
 'nstab-project'   => 'pàggina',
 'nstab-image'     => 'mmàggini',
 'nstab-mediawiki' => 'missagiu',
@@ -396,7 +403,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Opirazzioni nun ricanusciuta',
-'nosuchactiontext'  => 'La URL mmessa nun currispunni a un cumannu ricanusciutu dû software MediaWiki',
+'nosuchactiontext'  => "L'azzioni spicificata nâ URL nun è vailida.
+Poi aviri sbagghiatu a digitari â URL, o cliccatu supra nu link sbagghiatu.
+Chistu putissi ndicari nu bug nô software usatu da {{SITENAME}}.",
 'nosuchspecialpage' => 'Sta pàggina spiciali nun è dispunìbbili',
 'nospecialpagetext' => "<big>'''Hai cercatu na pàggina spiciali nun vàlida.'''</big>
 
@@ -437,7 +446,6 @@ V\'arringrazziamu si signaliati zoccu succidìu a nu [[Special:ListUsers/sysop|a
 'cannotdelete'         => 'Mpussìbbili cancillari la pàggina o lu file addumannatu. (Putissi aviri statu già cancillatu.)',
 'badtitle'             => 'Tìtulu nun currettu',
 'badtitletext'         => "Lu tìtulu dâ pàggina addumannata è vacanti, erratu o cu caràttiri nun ammessi oppuru diriva di n'erruri ntê culligamenti tra siti wiki diversi o virsioni n lingui diversi dû stissu situ.",
-'perfdisabled'         => "Semu spiacenti, sta funziunalitati è timpuraniamenti disabbilitata pirchì lu sò usu rallenta lu database finu a rìnniri lu situ nutilizzàbbili pi tutti l'utenti.",
 'perfcached'           => "'''Nota:''' li dati ca sèquinu sunnu stratti di na copia ''cache'' dû database, nun aggiurnati n tempu riali.",
 'perfcachedts'         => 'Li dati ccà sutta foru attruvati e sunnu aggiurnati ô $1.',
 'querypage-no-updates' => "L'aggiurnamenti dâ pàggina sunnu timpuraniamenti suspisi. Li dati 'n chidda cuntinuti nun vèninu aggiurnati.",
@@ -462,13 +470,13 @@ $2',
 La mutivazzioni è chista: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Sbagghiu di cunfigurazzioni: antivirus scanusciutu: <i>$1</i>',
+'virus-badscanner'     => "Sbagghiu di cunfigurazzioni: antivirus scanusciutu: ''$1''",
 'virus-scanfailed'     => 'scanzioni nun arrinisciuta (còdici $1)',
 'virus-unknownscanner' => 'antivirus scanusciutu:',
 
 # Login and logout pages
 'logouttitle'                => 'Logout utenti',
-'logouttext'                 => "<strong>Ora tu niscisti.</strong><br />
+'logouttext'                 => "'''Ora tu niscisti.'''<br />
 Poi cuntinuari a usari {{SITENAME}} di manera anònima, o poi tràsiri n'àutra vota cu lu stissu o cu n'àutru nomu d'utenti. Accura chi quarchi pàggina pò cuntinuari a èssiri ammustrata comu si nun avissi nisciutu nzinu a quannu tu nun scancelli tutta la mimoria dû tò browser.",
 'welcomecreation'            => "== Bonvinutu, $1! ==
 
@@ -480,7 +488,6 @@ L'account hà statu criatu currettamenti. Nun ti scurdari di pirsunalizzari li [
 'remembermypassword'         => "Ricòrdami la mè ''password'' duranti li sissioni.",
 'yourdomainname'             => 'Lu tò dominiu',
 'externaldberror'            => "S'havi virificatu n'erruri cû server d'autinticazzioni sternu, oppuru nun si disponi di l'auturizzazzioni nicissari p'aggiurnari lu propiu accessu sternu.",
-'loginproblem'               => "<b>S'hà virificatu n'erruri duranti l'accessu.</b><br />Ripruvari.",
 'login'                      => 'Trasi',
 'nav-login-createaccount'    => 'Riggìstrati o trasi',
 'loginprompt'                => "Tu hai a abbilitari li ''cookies'' pi tràsiri ntâ {{SITENAME}}.",
@@ -531,8 +538,8 @@ L'account hà statu criatu currettamenti. Nun ti scurdari di pirsunalizzari li [
 'eauthentsent'               => "Un missaggiu e-mail di cunferma hà statu spiditu a lu ndirizzu ndicatu. Pi abbilitari la mannata di missaggi e-mail pi st'accessu è nicissariu sèquiri li istruzzioni ca vi sunnu ndicati, 'n modu di cunfirmari ca s'è li liggìttimi prupitari di lu ndirizzu",
 'throttled-mailpassword'     => 'Na password nova hà già statu mannata di menu di {{PLURAL:$1|1 ura|$1 uri}}. Pi privèniri abbusi, la funzioni "Manna password nova" pò èssiri usata sulu una vota ogni {{PLURAL:$1|1 ura|$1 uri}}.',
 'mailerror'                  => 'Erruri nta lu mannu dû missaggiu: $1',
-'acct_creation_throttle_hit' => 'Semu spiacenti, ma hai già criatu $1 account. Nun poi criàrinni àutri.',
-'emailauthenticated'         => 'Lu ndirizzu e-mail hà statu cunfirmatu lu $1.',
+'acct_creation_throttle_hit' => 'Semu spiacenti, ma hai già criatu {{PLURAL:$1|1 account|$1 account}}. Nun poi criàrinni àutri.',
+'emailauthenticated'         => 'Lu nnirizzu e-mail fu cunfirmatu lu $2 ê $3.',
 'emailnotauthenticated'      => 'Lu tò ndrizzu imeil nun hà statu ancora autinticatu. Nun vannu a èssiri mannati missaggi imeil pi sti funzioni.',
 'noemailprefs'               => "Innicari un ndirizzu e-mail p'attivari sti funzioni.",
 'emailconfirmlink'           => 'Cunfirmari lu tò ndrizzu imeil',
@@ -544,18 +551,26 @@ Pi favuri nziriti nu nnirizzu vàlidu o svacantati la casella.',
 'createaccount-text'         => 'Qualcuno criau n\'accessu a {{SITENAME}} ($4) a nomu di $2, associatu cu stu ndirizzu di posta elettronica. La password pi l\'utenti "$2" è mpustata a "$3". È opportunu trasiri quantu prima e canciari la password subbutu.
 
 Si l\'accessu fu criatu pi sbagghiu, si può gnurari stu missaggiu.',
+'login-throttled'            => "Facisti troppi tintativi sùpira la password di chistu account. Aspetta anticchia prima di pruvari  n'àutra vota.",
 'loginlanguagelabel'         => 'Lingua: $1',
 
 # Password reset dialog
-'resetpass'               => 'Rimposta la password',
-'resetpass_announce'      => "Hai effittuatu l'accessu cu na password timpurània ca t'hà statu mannata via email. Pi tirminari l'accessu, hai a nziriri na password nova ccà:",
-'resetpass_text'          => '<!-- Agghiunci lu testu ccà -->',
-'resetpass_header'        => 'Rimposta la password',
-'resetpass_submit'        => 'Mposta la password e accedi',
-'resetpass_success'       => "Lu canciu password hà statu effittuatu cu successu! Ora stai effittuannu l'accessu...",
-'resetpass_bad_temporary' => 'Password timpurània nun vàlida. Putissi aviri già canciatu la password o addumannatu na password nova timpurània.',
-'resetpass_forbidden'     => 'Li password nun ponnu èssiri canciati sùpira sta wiki',
-'resetpass_missing'       => 'Dati mancanti ntô mòdulu.',
+'resetpass'                 => "Scrivi n'àutra vota la password",
+'resetpass_announce'        => "Hai effittuatu l'accessu cu na password timpurània ca t'hà statu mannata via email. Pi tirminari l'accessu, hai a nziriri na password nova ccà:",
+'resetpass_text'            => '<!-- Agghiunci lu testu ccà -->',
+'resetpass_header'          => 'Rimposta la password',
+'oldpassword'               => 'Password vecchia:',
+'newpassword'               => 'Password nova:',
+'retypenew'                 => "Scrivi n'àutra vota la password",
+'resetpass_submit'          => 'Mposta la password e accedi',
+'resetpass_success'         => "Lu canciu password hà statu effittuatu cu successu! Ora stai effittuannu l'accessu...",
+'resetpass_bad_temporary'   => 'Password timpurània nun vàlida. Putissi aviri già canciatu la password o addumannatu na password nova timpurània.',
+'resetpass_forbidden'       => 'Li password nun ponnu èssiri canciati sùpira sta wiki',
+'resetpass-no-info'         => 'Pi tràsiri nta sta pàggina hà èssiri riggistratu',
+'resetpass-submit-loggedin' => 'Cancia la password',
+'resetpass-wrong-oldpass'   => "La password timpurrània nun è giusta. 
+Pò èssiri ca ggià canciasti cu successu la tò password o c'addumannasti na nova password timpurrània.",
+'resetpass-temp-password'   => 'Password timpurrània:',
 
 # Edit page toolbar
 'bold_sample'     => 'Grassettu',
@@ -580,8 +595,8 @@ Si l\'accessu fu criatu pi sbagghiu, si può gnurari stu missaggiu.',
 'hr_tip'          => 'Lìnia urizzuntali (usari cu giudizziu)',
 
 # Edit pages
-'summary'                          => 'Discrizzioni',
-'subject'                          => 'Suggettu/ntistazzioni',
+'summary'                          => 'Discrizzioni:',
+'subject'                          => 'Suggettu/ntistazzioni:',
 'minoredit'                        => 'Chistu è nu canciamentu nicu',
 'watchthis'                        => 'talìa sta pàggina',
 'savearticle'                      => 'sarva la pàggina',
@@ -593,8 +608,8 @@ Si l\'accessu fu criatu pi sbagghiu, si può gnurari stu missaggiu.',
 'missingsummary'                   => "'''Accura:''' Nun hà statu spicificatu l'uggettu di stu canciamentu. Primennu di novu '''Sarva''' lu canciamentu veni sarvatu cu l'uggettu vacanti.",
 'missingcommenttext'               => 'Nziriri un cummentu ccà sutta.',
 'missingcommentheader'             => "'''Accura:''' Nun hà statu spicificatu la ntistazzioni di stu cummentu. Primennu di novu '''Sarva''' lu canciamentu veni saravtu senza ntistazzioni.",
-'summary-preview'                  => 'Antiprima uggettu',
-'subject-preview'                  => 'Antiprima suggettu/ntistazzioni',
+'summary-preview'                  => 'Antiprima uggettu:',
+'subject-preview'                  => 'Antiprima suggettu/ntistazzioni:',
 'blockedtitle'                     => 'Utenti bluccatu.',
 'blockedtext'                      => "<big>'''Stu nomu d'utenti o nnirizzu IP havi statu bluccatu.'''</big>
 
@@ -645,46 +660,48 @@ Pi favuri nclùdilu nta tutti li dumanni chi fai.",
 Pi criari na pàggina cu stu tìtulu, accumenza a scrìviri ccassutta (talìa la [[{{MediaWiki:Helppage}}|pàggina d'aiutu]] pi aviri maiuri nfurmazzioni).
 Si agghicasti ccà pi sbagghiu, clicca lu buttuni ''''n arreri (back)''' dû tò browser.",
 'anontalkpagetext'                 => "----''Chista è la pàggina di discussioni di n’utenti anònimu, ca nun hà ancora criatu n’accessu o comu è gghiè nun l’usa. P’idintificàrilu è quinni nicissariu usari lu nùmmiru di lu sò nnirizzu IP. Li nnirizzi IP ponnu pirò èssiri cunnivisi di cchiù utenti. Siddu sî n’utenti anònimu e riteni ca li cummenti prisenti nta sta pàggina nun si rifirìscinu a tia, [[Special:UserLogin|crea n’accessu novu o trasi]] cu chiddu ca già hai p’evitari d’èssiri cunfusu cu àutri utenti anònimi ‘n futuru''",
-'noarticletext'                    => "Nta stu mumentu la pàggina richiesta è vacanti. È pussìbbili [[Special:Search/{{PAGENAME}}|circari stu tìtulu]] nta l'àutri pàggini dû situ oppuru [{{fullurl:{{FULLPAGENAME}}|action=edit}} canciari la pàggina ora].",
+'noarticletext'                    => "Nta stu mumentu la pàggina addumannata è vacanti. È pussìbbili [[Special:Search/{{PAGENAME}}|circari stu tìtulu]] nta l'àutri pàggini dû situ oppuru [{{fullurl:{{FULLPAGENAME}}|action=edit}} canciari la pàggina ora].",
 'userpage-userdoesnotexist'        => 'L\'account "$1" nun currispunni a n\'utenti riggistratu. Virificari si si voli criari o canciari sta pàggina.',
 'clearyourcache'                   => "'''Nota:''' doppu aviri sarvatu è nicissariu puliri la cache dû propiu browser pi vìdiri li canciamenti. Pi '''Mozilla / Firefox / Safari''': fari clic supra ''Ricarica'' tinnennu primutu lu tastu dî maiùsculi, oppuru prèmiri ''Ctrl-Maiusc-R'' (''Cmd-Maiusc-R'' supra Mac); pi '''Internet Explorer:''' mantèniri primutu lu tastu ''Ctrl'' mentri si premi lu pulsanti ''Aggiorna'' o prèmiri ''Ctrl-F5''; pi '''Konqueror''': prèmiri lu pulsanti ''Ricarica'' o lu tastu ''F5''; pi '''Opera''' pò èssiri nicissariu svacantari cumpletamenti la cache dû menu ''Strumenti → Preferenze''.",
-'usercssjsyoucanpreview'           => "<strong>Suggirimentu:</strong> Usa lu tastu 'Visualizza antiprima' pi pruvari li novi css/js prima di sarvàrili.",
+'usercssjsyoucanpreview'           => "'''Suggirimentu:''' Usa lu tastu 'Visualizza antiprima' pi pruvari li novi css/js prima di sarvàrili.",
 'usercsspreview'                   => "'''Arricorda ca stai sulu visualizzannu n'antiprima dû tò CSS pirsunali.'''
 '''Nun hà ancora statu sarvatu!'''",
 'userjspreview'                    => "'''Arricorda ca stai sulu tistanno/vidennu 'n antiprima lu tò javascript pirsunali, nun hà statu ancora sarvatu!'''",
 'userinvalidcssjstitle'            => "'''Accura:''' Nun esisti arcuna skin cu nomu \"\$1\". S'arricorda ca li pàggini pi li .css e .js pirsunalizzati hannu la nizziali dû tìtulu minùscula, p'asempiu {{ns:user}}:Asempiu/monobook.js e nun {{ns:user}}:Asempiu/Monobook.css.",
 'updated'                          => '(Aggiurnatu)',
-'note'                             => '<strong>Accura:</strong>',
-'previewnote'                      => "<strong>Ricurdàtivi ca chista è sulu n'antiprima, e ca nun hà statu ancora sarvata!</strong>",
+'note'                             => "'''Accura:'''",
+'previewnote'                      => "'''Ricurdàtivi ca chista è sulu n'antiprima, e ca nun hà statu ancora sarvata!'''",
 'previewconflict'                  => "L'antiprima currispunni a lu testu prisenti ntâ casella di canciamentu supiriuri e rapprisenta la pàggina comu appari siddu si scegghi di prèmiri 'Sarva' 'n stu mumentu.",
-'session_fail_preview'             => "<strong>Purtroppu nun hà statu pussìbbili sarvari li tò canciamenti pirchì li dati dâ sissioni hannu jutu pirduti. Pi favuri, riprova. Siddu arricevi stu missaggiu d'erruri cchiù voti, prova a sculligàriti e a culligàriti novamenti.</strong>",
-'session_fail_preview_html'        => "<strong>Semu spiacenti, nun hà statu pussìbbili elabburari lu canciamentu pirchì hannu jutu pirduti li dati rilativi â sissioni.</strong>
+'session_fail_preview'             => "'''Purtroppu nun hà statu pussìbbili sarvari li tò canciamenti pirchì li dati dâ sissioni hannu jutu pirduti. Pi favuri, riprova. Siddu arricevi stu missaggiu d'erruri cchiù voti, prova a sculligàriti e a culligàriti novamenti.'''",
+'session_fail_preview_html'        => "'''Semu spiacenti, nun hà statu pussìbbili elabburari lu canciamentu pirchì hannu jutu pirduti li dati rilativi â sissioni.'''
 
 ''Poichì nta stu situ è abbilitatu l'usu di HTML senza limitazzioni, l'antiprima nun veni visualizzata; si tratta di na misura di sicurizza contra l'attacchi JavaScript.''
 
-<strong>Siddu chistu è nu tintativu liggìttimu di canciamentu, arriprova. Siddu lu prubbrema pirsisti, si pò pruvari a [[Special:UserLogout|sculligàrisi]] e effittuari n'accessu novu.</strong>",
-'token_suffix_mismatch'            => "<strong>Lu canciamentu nun fu sarvatu pirchì lu client ammustrau di gèstiri 'n modu sbagghiatu li caràttiri di puntiggiatura nta lu token assuciatu a iddu. P'evitari na curruzzioni pussìbbili dô testu dâ pàggina, fu rifiutatu tuttu lu canciamentu. Sta situazzioni pò virificàrisi, certi voti, quannu s'adòpiranu arcuni sirvizza di proxy anònimi via web chi prisèntanu bug.</strong>",
+'''Siddu chistu è nu tintativu liggìttimu di canciamentu, arriprova. Siddu lu prubbrema pirsisti, si pò pruvari a [[Special:UserLogout|sculligàrisi]] e effittuari n'accessu novu.'''",
+'token_suffix_mismatch'            => "'''Lu canciamentu nun fu sarvatu pirchì lu client ammustrau di gèstiri 'n modu sbagghiatu li caràttiri di puntiggiatura nta lu token assuciatu a iddu. P'evitari na curruzzioni pussìbbili dô testu dâ pàggina, fu rifiutatu tuttu lu canciamentu. Sta situazzioni pò virificàrisi, certi voti, quannu s'adòpiranu arcuni sirvizza di proxy anònimi via web chi prisèntanu bug.'''",
 'editing'                          => 'Canciu di la vuci "$1"',
 'editingsection'                   => 'Canciamentu di $1 (sezzioni)',
-'editingcomment'                   => 'Canciu di $1 (cummentu)',
+'editingcomment'                   => 'Canciu di $1 (nova sizzioni)',
 'editconflict'                     => "Cunflittu d'edizzioni supra $1",
 'explainconflict'                  => "N'àutru utenti havi sarvatu na virsioni nova dâ pàggina mentri stavi effittuannu li canciamenti.<br /> La casella di canciamentu supiriuri cunteni lu testu dâ pàggina attuarmenti online, accussì comu hà statu aggiurnatu di l'àutru utenti. La virsioni cu li tò canciamenti è mmeci ripurtata ntâ casella di canciamentu nfiriuri. Siddu addisìi cunfirmàrili, hai a ripurtari li tò canciamenti ntô testu asistenti (casella supiriuri). Primennu lu pulsanti 'Sarva la pàggina', veni sarvatu <b>sulu</b> lu testu cuntinutu ntâ casella di canciamentu supiriuri.<br />",
 'yourtext'                         => 'Lu tò testu',
 'storedversion'                    => 'La virsioni mimurizzata',
-'nonunicodebrowser'                => "<strong>'''ACCURA: Lu tò browser nun supporta unicode, li caràttiri nun-ASCII appàrinu nta lu box di canciamentu comu còdici esadicimali.'''</strong>",
-'editingold'                       => '<strong>Accura: si sta canciannu na virsioni nun aggiurnata dâ pàggina.<br /> Siddu si scegghi di sarvàrila, tutti li canciamenti appurtati doppu sta rivisioni vannu pirduti.</strong>',
+'nonunicodebrowser'                => "''''''ACCURA: Lu tò browser nun supporta unicode, li caràttiri nun-ASCII appàrinu nta lu box di canciamentu comu còdici esadicimali.''''''",
+'editingold'                       => "'''Accura: si sta canciannu na virsioni nun aggiurnata dâ pàggina.<br /> Siddu si scegghi di sarvàrila, tutti li canciamenti appurtati doppu sta rivisioni vannu pirduti.'''",
 'yourdiff'                         => 'Diffirenzi',
 'copyrightwarning'                 => "Nutati chi tutti li cuntribbuti a {{SITENAME}} s'hannu a cunzidirari sutta la licenza d'usu $2 (talìa $1 pî dittagghi). Si nun vuliti chi lu vostru travagghiu curri lu rìsicu di vèniri ritravagghiatu e/o ridistribbuitu, nun suttamittìtilu ccà.<br />
 Vuatri prumittiti puru chi lu scrivìstivu chî vostri palori, o chi lu cupiàstivu di nu duminiu pùbbricu o di risursi sìmili
-<strong>NUN SUTTAMITTÃŒTI MATIRIALI SUTTA COPYRIGHT SENZA PIRMISSU!</strong>",
-'copyrightwarning2'                => "Nota: tutti li cuntribbuti mannati a {{SITENAME}} ponnu èssiri mudificati o cancillati di parti di l'àutri participanti. Siddu nun addisìi ca li tò testi ponnu èssiri mudificati senza arcunu riguardu, nun mannàrili a stu situ.<br /> Cu la mannata dû testu dichiari noltri, sutta la tò rispunzabbilitati, ca lu testu hà statu scrittu di tia pirsunalmenti oppuru c'hà statu cupiatu di na fonti di pùbbricu dominiu o analucamenti lìbbira. (vidi $1 pi maiuri dittagghi) <strong>NUN MANNARI MATIRIALI CUPERTU DI DRITTU D'AUTURI SENZA AUTURIZZAZZIONI!</strong>",
-'longpagewarning'                  => "<strong>ACCURA: Sta pàggina è longa $1 kilobyte. Arcuni browser putìssiru prisintari dî prubbremi ntô canciari pàggini ca s'avvicìnanu o sùpiranu 32 kb. Pi favuri pigghia n cunzidirazzioni la pussibbilitati di suddivìdiri la pàggina n sizzioni cchiù nichi.</strong>",
-'longpageerror'                    => "<strong>ERRURI: Lu testu ca hai suttamissu è longu $1 kilobyte, ch'è cchiù dû màssimu di $2 kilobyte. Nun pò èssiri sarvatu.</strong>",
-'readonlywarning'                  => "<strong>ACCURA: lu database è fermu pi manutinzioni, pirciò nun poi sarvari li tò canciamenti nta stu mumentu. La cosa megghia è fari un copia e ncolla dû testu nta n'àutru prugramma e sarvàrilu pi quannu lu database è accissìbbili.</strong>",
-'protectedpagewarning'             => "<strong>ACCURA: Sta pàggina havi na prutizzioni spiciali e sulu l'utenti chi hannu lu status di amministraturi ponnu canciàrila.</strong>",
+'''NUN SUTTAMITTÃŒTI MATIRIALI SUTTA COPYRIGHT SENZA PIRMISSU!'''",
+'copyrightwarning2'                => "Nota: tutti li cuntribbuti mannati a {{SITENAME}} ponnu èssiri mudificati o cancillati di parti di l'àutri participanti. Siddu nun addisìi ca li tò testi ponnu èssiri mudificati senza arcunu riguardu, nun mannàrili a stu situ.<br /> Cu la mannata dû testu dichiari noltri, sutta la tò rispunzabbilitati, ca lu testu hà statu scrittu di tia pirsunalmenti oppuru c'hà statu cupiatu di na fonti di pùbbricu dominiu o analucamenti lìbbira. (vidi $1 pi maiuri dittagghi) '''NUN MANNARI MATIRIALI CUPERTU DI DRITTU D'AUTURI SENZA AUTURIZZAZZIONI!'''",
+'longpagewarning'                  => "'''ACCURA: Sta pàggina è longa $1 kilobyte. Arcuni browser putìssiru prisintari dî prubbremi ntô canciari pàggini ca s'avvicìnanu o sùpiranu 32 kb. Pi favuri pigghia n cunzidirazzioni la pussibbilitati di suddivìdiri la pàggina n sizzioni cchiù nichi.'''",
+'longpageerror'                    => "'''ERRURI: Lu testu ca hai suttamissu è longu $1 kilobyte, ch'è cchiù dû màssimu di $2 kilobyte. Nun pò èssiri sarvatu.'''",
+'readonlywarning'                  => "'''ACCURA: Lu database è fermu pi manutinzioni, pirciò nun poi sarvari li tò canciamenti nta stu mumentu. La cosa megghia è fari un copia e ncolla dû testu nta n'àutru prugramma e sarvàrilu pi quannu lu database è accissìbbili.'''
+
+L'amministraturi ca bluccau lu database lu fici pi stu mutivu: $1",
+'protectedpagewarning'             => "'''ACCURA: Sta pàggina havi na prutizzioni spiciali e sulu l'utenti chi hannu lu status di amministraturi ponnu canciàrila.'''",
 'semiprotectedpagewarning'         => "'''ACCURA:''' Sta pàggina hà statu bluccata n modu ca sulu li utenti riggistrati ponnu canciàrila.",
 'cascadeprotectedwarning'          => "'''Accura:''' Sta pàggina havi stata bluccata n modu ca sulu li utenti cu privileggi di amministraturi ponnu mudificàrila, pirchì veni nclusa {{PLURAL:\$1|nta siquente pàggina ca hà stata prutiggiuta|ntê siquenti pàggini ca hannu stati prutiggiuti}} silizziunannu la prutizzioni \"ricursiva\":",
-'titleprotectedwarning'            => '<strong>ATTENZIONI:  Sta pàggina fu bluccata n modu tali ca sulu alcuni catigurìi di utenti la ponu criari.</strong>',
+'titleprotectedwarning'            => "'''ATTENZIONI:  Sta pàggina fu bluccata n modu tali ca sulu alcuni catigurìi di utenti la ponu criari.'''",
 'templatesused'                    => "Template utilizzati 'n sta pàggina:",
 'templatesusedpreview'             => "Template utilizzati 'n st'antiprima:",
 'templatesusedsection'             => "Template utilizzati 'n sta sezzioni:",
@@ -702,17 +719,29 @@ Vuatri prumittiti puru chi lu scrivìstivu chî vostri palori, o chi lu cupiàst
 
 Accuràtivi ch'è uppurtunu cuntinuari a canciari sta pàggina.
 L'alencu dî cancillazzioni rilativi veni ripurtatu ccà pi cummudità:",
+'deleted-notice'                   => 'Sta pàggina fu scancillata. La lista di li scancillazzioni veni ammustrata di sècutu pi nfurmazzioni.',
+'deletelog-fulllog'                => 'Visualizza riggistru cumpretu',
+'edit-hook-aborted'                => "Canciamentu scancillatu di l'hook.
+Nun desi nudda spiecazzioni.",
+'edit-gone-missing'                => 'Mpussìbbili aggiurnari la pàggina.
+Pari ca fu scancillata.',
+'edit-conflict'                    => 'Cunflittu di edizzioni.',
+'edit-no-change'                   => 'La mudifica fu ignurata pirchì nu foru appurtati canci ntô testu.',
+'edit-already-exists'              => 'Mpussìbbili criari na nova pàggina. 
+Esisti ggià.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Attenzioni: Sta pàggina cunteni troppi chiamati ê parser functions.
+'expensive-parserfunction-warning'        => "Accura: Sta pàggina cunteni troppi chiamati ê parser functions.
 
-Avissi essiri menu di $2, al momentu ci sunu $1.',
+Avissi a èssiri menu di $2, ô mumentu ci {{PLURAL:$1|nn'è $1|nni sunnu $1}}.",
 'expensive-parserfunction-category'       => 'Pàggini cu troppi chiamati ê parser functions',
 'post-expand-template-inclusion-warning'  => 'Accura: la diminzioni di li template nziriti è troppu granni.
 Arcuni template non vènunu nziriti.',
 'post-expand-template-inclusion-category' => 'Pàggini unni la diminsioni dê template nclusi supira lu limiti cunsintutu',
 'post-expand-template-argument-warning'   => "Attenzioni: Sta pàggina cunteni almenu n'argomentu di nu template ca havi na diminsioni troppu rossa pi essiri espansu. St'argomenti verrannu omessi.",
 'post-expand-template-argument-category'  => 'Pàggini ca cuntèninu template cu argumenti mancanti',
+'parser-template-loop-warning'            => 'Fu truvatu nu loop di Template : [[$1]]',
+'parser-template-recursion-depth-warning' => 'Limiti di ricursioni funnuti di Template surpassatu ($1)',
 
 # "Undo" feature
 'undo-success' => "Lu canciamentu pò essiri annullatu. 
@@ -728,27 +757,27 @@ Virificati lu paraguni ccà sutta p'accuràrivi ca lu cuntinutu è chiddu addisi
 Lu mutivu è ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Vidi li log rilativi a sta pàggina',
-'nohistory'           => 'Cronoluggìa dî virsioni di sta pàggina nun ripirìbbili.',
-'revnotfound'         => 'Virsioni nun attruvata',
-'revnotfoundtext'     => "La virsioni pricidenti di st'artìculu c'hai addumannatu nun hà statu attruvata. Cuntrolla pi favuri la URL c'hai usatu p'accèdiri a sta pàggina.",
-'currentrev'          => 'Virsioni currenti',
-'revisionasof'        => 'Virsioni dû $1',
-'revision-info'       => 'Virsioni dû $1 di $2',
-'previousrevision'    => '� Virsioni menu ricenti',
-'nextrevision'        => 'Virsioni cchiù ricenti →',
-'currentrevisionlink' => 'Virsioni currenti',
-'cur'                 => 'curr',
-'next'                => 'pròssimu',
-'last'                => 'pric',
-'page_first'          => 'prima',
-'page_last'           => 'ùrtima',
-'histlegend'          => "Cunfrontu tra virsioni: silizziunari li caselli currispunnenti ê virsioni addisiati e prèmiri Mannu o lu pulsanti a basciu.<br /> Liggenna: (curr) = diffirenzi cu la virsioni attuali, (pric) = diffirenzi cu la virsioni pricidenti, '''m''' = canciamentu nicu",
-'deletedrev'          => '[cancillata]',
-'histfirst'           => 'Prima',
-'histlast'            => 'Ùrtima',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(vacanti)',
+'viewpagelogs'           => 'Vidi li log rilativi a sta pàggina',
+'nohistory'              => 'Cronoluggìa dî virsioni di sta pàggina nun ripirìbbili.',
+'currentrev'             => 'Virsioni currenti',
+'currentrev-asof'        => 'Virsioni currenti dû $1',
+'revisionasof'           => 'Virsioni dû $1',
+'revision-info'          => 'Virsioni dû $1 di $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Virsioni menu ricenti',
+'nextrevision'           => 'Virsioni cchiù ricenti →',
+'currentrevisionlink'    => 'Virsioni currenti',
+'cur'                    => 'curr',
+'next'                   => 'pròssimu',
+'last'                   => 'pric',
+'page_first'             => 'prima',
+'page_last'              => 'ùrtima',
+'histlegend'             => "Cunfrontu tra virsioni: silizziunari li caselli currispunnenti ê virsioni addisiati e prèmiri Mannu o lu pulsanti a basciu.<br /> Liggenna: (curr) = diffirenzi cu la virsioni attuali, (pric) = diffirenzi cu la virsioni pricidenti, '''m''' = canciamentu nicu",
+'history-fieldset-title' => 'Scurri ntâ crunuluggìa',
+'deletedrev'             => '[cancillata]',
+'histfirst'              => 'Prima',
+'histlast'               => 'Ùrtima',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(vacanti)',
 
 # Revision feed
 'history-feed-title'          => 'Lista dî canciamenti',
@@ -821,6 +850,7 @@ S'havi accirtari ca la cuntinuità storica di la pàggina nun veni altirata.",
 'mergehistory-invalid-destination' => 'La pàggina di distinazzioni havi aviri nu tìtulu currettu.',
 'mergehistory-autocomment'         => 'Unioni di [[:$1]] ni [[:$2]]',
 'mergehistory-comment'             => 'Unioni di [[:$1]] in [[:$2]]: $3',
+'mergehistory-same-destination'    => "Li pàggini d'urìggini e di distinazioni non ponnu èssiri la stissa",
 
 # Merge log
 'mergelog'           => "Log d'unioni",
@@ -833,119 +863,201 @@ S'havi accirtari ca la cuntinuità storica di la pàggina nun veni altirata.",
 'difference'              => '(Diffirenzi tra li rivisioni)',
 'lineno'                  => 'Lìnia $1:',
 'compareselectedversions' => 'Fari lu paraguni',
+'visualcomparison'        => 'Cunfrontu visuali',
+'wikicodecomparison'      => 'Cunfrontu dû wikitext',
 'editundo'                => 'annulla',
 'diff-multi'              => '({{PLURAL:$1|Na rivisioni ntirmèdia nun ammustrata|$1 rivisioni ntirmedi nun ammustrati}}.)',
+'diff-movedto'            => 'muvutu a $1',
+'diff-styleadded'         => 'stili $1 junciutu',
+'diff-added'              => '$1 junciutu',
+'diff-changedto'          => "canciatu 'n $1",
+'diff-movedoutof'         => 'muvutu fora di $1',
+'diff-styleremoved'       => 'stili $1 livatu',
+'diff-removed'            => '$1 livatu',
+'diff-changedfrom'        => 'canciatu di $1',
+'diff-src'                => 'funti',
+'diff-withdestination'    => 'cu distinazzioni $1',
+'diff-with'               => '&#32;cu $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'larichizza',
+'diff-height'             => 'autizza',
+'diff-p'                  => "nu '''paràgrafu'''",
+'diff-blockquote'         => "na '''citazzioni'''",
+'diff-h1'                 => "na '''ntistazzioni (liveddu 1)'''",
+'diff-h2'                 => "na '''ntistazzioni (liveddu 2)'''",
+'diff-h3'                 => "na '''ntistazzioni (liveddu 3)'''",
+'diff-h4'                 => "na '''ntistazzioni (liveddu 4)'''",
+'diff-h5'                 => "na '''ntistazzioni (liveddu 5)'''",
+'diff-pre'                => "nu '''bloccu prifurmattatu'''",
+'diff-div'                => "na '''divisioni'''",
+'diff-ul'                 => "na '''lista senz'òrdini'''",
+'diff-ol'                 => "na '''lista nummirata'''",
+'diff-li'                 => "n' '''elimentu di lista'''",
+'diff-table'              => "na '''tabbedda'''",
+'diff-tbody'              => "nu '''cuntinutu di tabbedda'''",
+'diff-tr'                 => "na '''riga'''",
+'diff-td'                 => "na '''cella'''",
+'diff-th'                 => "na '''ntistazzioni'''",
+'diff-br'                 => "nu '''a capu'''",
+'diff-hr'                 => "na '''lìnia urizzuntali'''",
+'diff-code'               => "nu '''bloccu di còdici pi computer'''",
+'diff-dl'                 => "na '''lista di difinizzioni'''",
+'diff-dt'                 => "nu '''tèrmini di difinizzioni'''",
+'diff-dd'                 => "na '''difinizzioni'''",
+'diff-input'              => "n' '''input'''",
+'diff-form'               => "nu '''mòdulu'''",
+'diff-img'                => "na '''mmàggini'''",
+'diff-span'               => "nu '''span'''",
+'diff-a'                  => "nu '''link'''",
+'diff-i'                  => "'''cursivu'''",
+'diff-b'                  => "'''grassettu'''",
+'diff-strong'             => "'''grassettu'''",
+'diff-em'                 => "'''ènfasi'''",
+'diff-font'               => "'''font'''",
+'diff-big'                => "'''granni'''",
+'diff-del'                => "'''scancillatu'''",
+'diff-tt'                 => "'''spazziatura fissa'''",
+'diff-sub'                => "'''suttascrivutu'''",
+'diff-sup'                => "'''scritta ccillenti'''",
+'diff-strike'             => "'''sbarratu'''",
 
 # Search results
-'searchresults'             => 'Risurtati dâ circata',
-'searchresulttext'          => 'Pi cchiossai nfurmazzioni supra la circata nterna di {{SITENAME}}, talìa [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Pruvasti a circari: '''[[$1]]'''",
-'searchsubtitleinvalid'     => "Circata di '''$1'''",
-'noexactmatch'              => "'''Nun c'è na pàggina chi si tìtula \"\$1\".''' Putiti [[:\$1|criari sta pàggina]].",
-'noexactmatch-nocreate'     => "'''La pàggina cu lu tìtulu \"\$1\" nun esisti.'''",
-'toomanymatches'            => 'Troppi currispunnenzi. Cancia la richiesta.',
-'titlematches'              => "Ntê tìtuli di l'artìculi",
-'notitlematches'            => 'Nudda currispunnenza ntê tìtuli dî pàggini',
-'textmatches'               => "Ntô testu di l'artìculi",
-'notextmatches'             => 'Nudda currispunnenza ntô testu dî pàggini',
-'prevn'                     => 'li pricidenti $1',
-'nextn'                     => 'li pròssimi $1',
-'viewprevnext'              => 'Talìa ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|na parola|$2 paroli}})',
-'search-result-score'       => 'Rilivanza: $1%',
-'search-redirect'           => '(redirect $1)',
-'search-section'            => '(sizzioni $1)',
-'search-suggest'            => 'Forsi circavutu: $1',
-'search-interwiki-caption'  => 'Pruggetti frati',
-'search-interwiki-default'  => 'Risultati da $1:',
-'search-interwiki-more'     => '(cchiù)',
-'search-mwsuggest-enabled'  => 'cu suggirimenti',
-'search-mwsuggest-disabled' => 'senza suggirimenti',
-'search-relatedarticle'     => 'Risultati currilati',
-'mwsuggest-disable'         => 'Astuta suggirimenti AJAX',
-'searchrelated'             => 'currilati',
-'searchall'                 => 'tutti',
-'showingresults'            => "Ammustra nzinu a {{PLURAL:$1|'''1''' risurtatu|'''$1''' risurtati}} a pàrtiri dô nùmmuru '''$2'''.",
-'showingresultsnum'         => "L'alencu cunteni {{PLURAL:$3|'''1''' risurtatu|'''$3''' risurtati}} a pàrtiri dû nùmmuru '''$2'''.",
-'showingresultstotal'       => "Appressu {{PLURAL:$3|veni ammustratu lu risurtatu '''$1''' di '''$3'''|venunu ammustrati li risultati '''$1 - $2''' di '''$3'''}}",
-'nonefound'                 => "'''Nota''': la circata è effittuata pi default sulu nta arcuni namespace. Prova a primèttiri ''all:'' ô testu dâ circata pi circari nta tutti li namespace (cumprisi pàggini di discussioni, template, ecc) oppuru usa lu namespace disidiratu comu prifissu.",
-'powersearch'               => 'Arriscedi',
-'powersearch-legend'        => 'Ricerca avanzata',
-'powersearch-ns'            => 'Cerca ntê namespace:',
-'powersearch-redir'         => 'Elenca redirect',
-'powersearch-field'         => 'Cerca',
-'search-external'           => 'Ricerca sterna',
-'searchdisabled'            => 'La circata nterna di {{SITENAME}} hà statu disabbilitata. Nta stu mentri, poi usari la circata supra Google o supra àutri muturi di circata. Accura ca li sò ìnnici dê cuntinuti di {{SITENAME}} ponnu nun èssiri aggiurnati.',
+'searchresults'                    => 'Risurtati dâ circata',
+'searchresults-title'              => 'Risurtati dâ circata di "$1"',
+'searchresulttext'                 => 'Pi cchiossai nfurmazzioni supra la circata nterna di {{SITENAME}}, talìa [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Pruvasti a circari: '''[[$1]]'''",
+'searchsubtitleinvalid'            => "Circata di '''$1'''",
+'noexactmatch'                     => "'''Nun c'è na pàggina chi si tìtula \"\$1\".''' Putiti [[:\$1|criari sta pàggina]].",
+'noexactmatch-nocreate'            => "'''La pàggina cu lu tìtulu \"\$1\" nun esisti.'''",
+'toomanymatches'                   => 'Troppi currispunnenzi. Cancia la richiesta.',
+'titlematches'                     => "Ntê tìtuli di l'artìculi",
+'notitlematches'                   => 'Nudda currispunnenza ntê tìtuli dî pàggini',
+'textmatches'                      => "Ntô testu di l'artìculi",
+'notextmatches'                    => 'Nudda currispunnenza ntô testu dî pàggini',
+'prevn'                            => 'li pricidenti $1',
+'nextn'                            => 'li pròssimi $1',
+'viewprevnext'                     => 'Talìa ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opzioni di circata',
+'searchmenu-exists'                => "* Pàggina '''[[$1]]'''",
+'searchmenu-new'                   => "'''Crea la pàggina \"[[:\$1]]\" supra sta wiki!'''",
+'searchhelp-url'                   => 'Help:Cuntinuti',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Visualizza li pàggini cu stu prifissu]]',
+'searchprofile-articles'           => 'Pàggini',
+'searchprofile-articles-and-proj'  => 'Pàggina/Pruggettu',
+'searchprofile-project'            => 'Pàggini/Pruggettu',
+'searchprofile-images'             => 'File',
+'searchprofile-everything'         => 'Tuttu',
+'searchprofile-advanced'           => 'Avanzata',
+'searchprofile-articles-tooltip'   => 'Cerca nti $1',
+'searchprofile-project-tooltip'    => 'Cerca nti $1',
+'searchprofile-images-tooltip'     => 'Cerca file',
+'searchprofile-everything-tooltip' => 'Cerca unnegghiè (puru ntî pàggini di discussioni)',
+'searchprofile-advanced-tooltip'   => 'Cerca ntê namespace pirsunalizzati',
+'prefs-search-nsdefault'           => 'Cerca utilizzannu li pridgifinit:',
+'prefs-search-nscustom'            => 'Cerca ntê namespace pirsunalizzati:',
+'search-result-size'               => '$1 ({{PLURAL:$2|na parola|$2 paroli}})',
+'search-result-score'              => 'Rilivanza: $1%',
+'search-redirect'                  => '(redirect $1)',
+'search-section'                   => '(sizzioni $1)',
+'search-suggest'                   => 'Forsi circavutu: $1',
+'search-interwiki-caption'         => 'Pruggetti frati',
+'search-interwiki-default'         => 'Risultati da $1:',
+'search-interwiki-more'            => '(cchiù)',
+'search-mwsuggest-enabled'         => 'cu suggirimenti',
+'search-mwsuggest-disabled'        => 'senza suggirimenti',
+'search-relatedarticle'            => 'Risultati currilati',
+'mwsuggest-disable'                => 'Astuta suggirimenti AJAX',
+'searchrelated'                    => 'currilati',
+'searchall'                        => 'tutti',
+'showingresults'                   => "Ammustra nzinu a {{PLURAL:$1|'''1''' risurtatu|'''$1''' risurtati}} a pàrtiri dô nùmmuru '''$2'''.",
+'showingresultsnum'                => "L'alencu cunteni {{PLURAL:$3|'''1''' risurtatu|'''$3''' risurtati}} a pàrtiri dû nùmmuru '''$2'''.",
+'showingresultstotal'              => "Appressu {{PLURAL:$4|veni ammustratu lu risurtatu '''$1''' di '''$3'''|vèninu ammustrati li risurtati '''$1 - $2''' di '''$3'''}}",
+'nonefound'                        => "'''Nota''': la circata è effittuata pi default sulu nta arcuni namespace. Prova a primèttiri ''all:'' ô testu dâ circata pi circari nta tutti li namespace (cumprisi pàggini di discussioni, template, ecc) oppuru usa lu namespace disidiratu comu prifissu.",
+'search-nonefound'                 => 'La circata nun desi nuddu risurtatu.',
+'powersearch'                      => 'Arriscedi',
+'powersearch-legend'               => 'Ricerca avanzata',
+'powersearch-ns'                   => 'Cerca ntê namespace:',
+'powersearch-redir'                => 'Elenca redirect',
+'powersearch-field'                => 'Cerca',
+'search-external'                  => 'Ricerca sterna',
+'searchdisabled'                   => 'La circata nterna di {{SITENAME}} hà statu disabbilitata. Nta stu mentri, poi usari la circata supra Google o supra àutri muturi di circata. Accura ca li sò ìnnici dê cuntinuti di {{SITENAME}} ponnu nun èssiri aggiurnati.',
 
 # Preferences page
-'preferences'              => 'prifirenzi',
-'mypreferences'            => 'Li mè prifirenzi',
-'prefs-edits'              => 'Nùmmuru di canciamenti:',
-'prefsnologin'             => 'Accessu nun effittuatu',
-'prefsnologintext'         => 'Pi putiri pirsunalizzari li prifirenzi è nicissariu fari l\'<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} accessu]</span>.',
-'prefsreset'               => 'Li prifirenzi hannu statu ripristinati a li valura pridifiniti.',
-'qbsettings'               => 'Pusizzioni QuickBar',
-'qbsettings-none'          => 'Nuddu',
-'qbsettings-fixedleft'     => 'Fissu a manu manca',
-'qbsettings-fixedright'    => 'Fissu a manu dritta',
-'qbsettings-floatingleft'  => 'Fluttuanti a manu manca',
-'qbsettings-floatingright' => 'Fluttuanti a manu dritta',
-'changepassword'           => 'Cancia la password',
-'skin'                     => 'Aspettu',
-'math'                     => 'Fòrmuli',
-'dateformat'               => 'Furmatu dâ data',
-'datedefault'              => 'Nudda prifirenza',
-'datetime'                 => 'Data e ura',
-'math_failure'             => "S'hà virificatu un erruri ntô parsing",
-'math_unknown_error'       => 'erruri scanusciutu',
-'math_unknown_function'    => 'funzioni scanusciuta',
-'math_lexing_error'        => 'erruri lissicali',
-'math_syntax_error'        => 'erruri di sintassi',
-'math_image_error'         => "Cunvirsioni 'n PNG fallita; virificati la curretta nstallazzioni dî siquenti prugrammi: latex, dvips, gs e convert.",
-'math_bad_tmpdir'          => 'Mpussìbbili scrìviri o criari la directory timpurània pi math',
-'math_bad_output'          => 'Mpussìbbili scrìviri o criari la directory di output pi math',
-'math_notexvc'             => 'Esiquìbbili texvc mancanti; pi favuri cunzurtari math/README pi la cunfigurazzioni.',
-'prefs-personal'           => 'Prufilu utenti',
-'prefs-rc'                 => 'Ùrtimi canciamenti',
-'prefs-watchlist'          => 'Ossirvati spiciali',
-'prefs-watchlist-days'     => "Nùmmiru di jorna ammustrati nta l'ossirvati spiciali:",
-'prefs-watchlist-edits'    => 'Nùmmaru di canciamenti a ammustrari cu li funzioni avanzati:',
-'prefs-misc'               => 'Vari',
-'saveprefs'                => 'Sarva li prifirenzi',
-'resetprefs'               => 'Annulla',
-'oldpassword'              => 'Password vecchia:',
-'newpassword'              => 'Password nova:',
-'retypenew'                => "Scrivi n'àutra vota la password",
-'textboxsize'              => 'Cancia',
-'rows'                     => 'Righi:',
-'columns'                  => 'Culonni:',
-'searchresultshead'        => 'Circata',
-'resultsperpage'           => 'Nùmmiru di risurtati pi pàggina:',
-'contextlines'             => 'Righi di testu pi ognunu risurtatu:',
-'contextchars'             => 'Nùmmaru di caràttiri di cuntestu:',
-'stub-threshold'           => 'Valuri minimu pî <a href="#" class="stub">liami a li stub</a>:',
-'recentchangesdays'        => "Nùmmuru di jorna a ammustrari nte l'urtimi cancaiamenti:",
-'recentchangescount'       => "Nùmmiru di righi nta l'ùrtimi canciamenti",
-'savedprefs'               => 'Li tò prifirenzi foru sarvati.',
-'timezonelegend'           => 'Zona oraria',
-'timezonetext'             => "Mmetti lu nùmmiru d'uri di diffirenza tra la tò ura lucali e l'ura dû server (UTC).",
-'localtime'                => 'Ura lucali',
-'timezoneoffset'           => 'Uri di diffirenza¹',
-'servertime'               => 'Ura dû server',
-'guesstimezone'            => "Usa l'ura dû tò browser",
-'allowemail'               => 'Cunzenti la ricezzioni di e-mail di àutri utenti',
-'prefs-searchoptions'      => 'Opzioni di circata',
-'prefs-namespaces'         => 'Namespace',
-'defaultns'                => 'Namespace pridifiniti pi la ricerca:',
-'default'                  => 'pridifinitu',
-'files'                    => 'Mmàggini',
+'preferences'               => 'prifirenzi',
+'mypreferences'             => 'Li mè prifirenzi',
+'prefs-edits'               => 'Nùmmuru di canciamenti:',
+'prefsnologin'              => 'Accessu nun effittuatu',
+'prefsnologintext'          => 'Pi putiri pirsunalizzari li prifirenzi è nicissariu fari l\'<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} accessu]</span>.',
+'prefsreset'                => 'Li prifirenzi hannu statu ripristinati a li valura pridifiniti.',
+'qbsettings'                => 'Pusizzioni QuickBar',
+'qbsettings-none'           => 'Nuddu',
+'qbsettings-fixedleft'      => 'Fissu a manu manca',
+'qbsettings-fixedright'     => 'Fissu a manu dritta',
+'qbsettings-floatingleft'   => 'Fluttuanti a manu manca',
+'qbsettings-floatingright'  => 'Fluttuanti a manu dritta',
+'changepassword'            => 'Cancia la password',
+'skin'                      => 'Aspettu',
+'skin-preview'              => 'Antiprima',
+'math'                      => 'Fòrmuli',
+'dateformat'                => 'Furmatu dâ data',
+'datedefault'               => 'Nudda prifirenza',
+'datetime'                  => 'Data e ura',
+'math_failure'              => "S'hà virificatu un erruri ntô parsing",
+'math_unknown_error'        => 'erruri scanusciutu',
+'math_unknown_function'     => 'funzioni scanusciuta',
+'math_lexing_error'         => 'erruri lissicali',
+'math_syntax_error'         => 'erruri di sintassi',
+'math_image_error'          => "Cunvirsioni 'n PNG fallita; virificati la curretta nstallazzioni dî siquenti prugrammi: latex, dvips, gs e convert.",
+'math_bad_tmpdir'           => 'Mpussìbbili scrìviri o criari la directory timpurània pi math',
+'math_bad_output'           => 'Mpussìbbili scrìviri o criari la directory di output pi math',
+'math_notexvc'              => 'Esiquìbbili texvc mancanti; pi favuri cunzurtari math/README pi la cunfigurazzioni.',
+'prefs-personal'            => 'Prufilu utenti',
+'prefs-rc'                  => 'Ùrtimi canciamenti',
+'prefs-watchlist'           => 'Ossirvati spiciali',
+'prefs-watchlist-days'      => "Nùmmiru di jorna ammustrati nta l'ossirvati spiciali:",
+'prefs-watchlist-days-max'  => '(Non cchiossai di 7 jorna)',
+'prefs-watchlist-edits'     => 'Nùmmaru di canciamenti a ammustrari cu li funzioni avanzati:',
+'prefs-watchlist-edits-max' => '(nùmmaru màssimu: 1000)',
+'prefs-misc'                => 'Vari',
+'prefs-resetpass'           => 'Cancia password',
+'saveprefs'                 => 'Sarva li prifirenzi',
+'resetprefs'                => 'Annulla',
+'textboxsize'               => 'Cancia',
+'prefs-edit-boxsize'        => 'Diminzioni dâ finestra di mudìfica.',
+'rows'                      => 'Righi:',
+'columns'                   => 'Culonni:',
+'searchresultshead'         => 'Circata',
+'resultsperpage'            => 'Nùmmiru di risurtati pi pàggina:',
+'contextlines'              => 'Righi di testu pi ognunu risurtatu:',
+'contextchars'              => 'Nùmmaru di caràttiri di cuntestu:',
+'stub-threshold'            => 'Valuri minimu pî <a href="#" class="stub">liami a li stub</a>:',
+'recentchangesdays'         => "Nùmmuru di jorna a ammustrari nte l'urtimi cancaiamenti:",
+'recentchangesdays-max'     => '(màssimu $1 {{PLURAL:$1|jornu|jorna}})',
+'recentchangescount'        => "Nùmmiru di righi nta l'ùrtimi canciamenti",
+'savedprefs'                => 'Li tò prifirenzi foru sarvati.',
+'timezonelegend'            => 'Zona oraria',
+'timezonetext'              => "Mmetti lu nùmmiru d'uri di diffirenza tra la tò ura lucali e l'ura dû server (UTC).",
+'localtime'                 => 'Uràriu lucali',
+'timezoneselect'            => 'Time zone:',
+'timezoneuseserverdefault'  => 'Usa uràriu dû server',
+'timezoneuseoffset'         => 'Àutru (spicificari diffirenza)',
+'timezoneoffset'            => 'Uri di diffirenza¹',
+'servertime'                => 'Uràriu dû server',
+'guesstimezone'             => "Usa l'ura dû tò browser",
+'allowemail'                => 'Cunzenti la ricezzioni di e-mail di àutri utenti',
+'prefs-searchoptions'       => 'Opzioni di circata',
+'prefs-namespaces'          => 'Namespace',
+'defaultns'                 => 'Namespace pridifiniti pi la ricerca:',
+'default'                   => 'pridifinitu',
+'files'                     => 'Mmàggini',
 
 # User rights
 'userrights'                  => 'Gistioni dî dritti utenti', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => "Gistisci li gruppi di l'utenti",
 'userrights-user-editname'    => "Trasi nu nomu d'utenti:",
 'editusergroup'               => 'Cancia gruppi utenti',
-'editinguser'                 => "Canciamentu dî dritti di l'utenti '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Canciamentu dî dritti di l'utenti '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Cancia li gruppi di l'utenti",
 'saveusergroups'              => 'Sarva gruppi utenti',
 'userrights-groupsmember'     => 'Membru di:',
@@ -994,6 +1106,8 @@ S'havi accirtari ca la cuntinuità storica di la pàggina nun veni altirata.",
 'right-minoredit'            => 'Segna li canciamenti comu nichi',
 'right-move'                 => 'Sposta pàggini',
 'right-move-subpages'        => 'Sposta li pàggini nzemi a li rilativi suttapàggini',
+'right-move-rootuserpages'   => "Canciari li pàggini di l'utilizzaturi dâ ràdica",
+'right-movefile'             => 'Movi file',
 'right-suppressredirect'     => 'Cancella nu redirect quannu sposti na pàggina a du tìtulu',
 'right-upload'               => 'Carica file',
 'right-reupload'             => 'Sovrascrivi nu file esistenti',
@@ -1044,9 +1158,46 @@ S'havi accirtari ca la cuntinuità storica di la pàggina nun veni altirata.",
 'rightslogentry' => "hà canciatu l'appartinenza di $1 dû gruppu $2 a lu gruppu $3",
 'rightsnone'     => '(nuddu)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lèggiri sta pàggina',
+'action-edit'                 => 'canciari sta pàggina',
+'action-createpage'           => 'criari pàggini',
+'action-createtalk'           => 'creari pàggini di discussioni',
+'action-createaccount'        => 'creari stu cuntu di utilizzaturi',
+'action-minoredit'            => 'marcari stu canciu comu nicu',
+'action-move'                 => 'spustari sta pàggina',
+'action-move-subpages'        => 'spustari sta pàggina e li rilativi suttapàggini',
+'action-move-rootuserpages'   => 'spustari li pàggini di utilizzaturi dâ ràdica',
+'action-movefile'             => 'mòviri chistu file',
+'action-upload'               => 'carricari stu file',
+'action-reupload'             => 'suprascriviri stu file esistenti',
+'action-reupload-shared'      => "suprascriviri stu file prisenti nti l'archiviu spartutu",
+'action-upload_by_url'        => 'carricari stu file di nu nnirizzu URL',
+'action-writeapi'             => 'usari li API n scrittura',
+'action-delete'               => 'scancillari sta pàggina',
+'action-deleterevision'       => 'scancillari sta virsioni',
+'action-deletedhistory'       => 'talìa la crunuluggìa cancillata di sta pàggina',
+'action-browsearchive'        => 'cercari pàggini scancillati',
+'action-undelete'             => 'ricupirari sta pàggina',
+'action-suppressrevision'     => 'rivìdiri e ripristinari li canci ammucciati',
+'action-suppressionlog'       => 'visiunari stu log privatu',
+'action-block'                => 'bluccari stu utenti n scrittura',
+'action-protect'              => 'cancairi li livedda di prutizzioni pi sta pàggina',
+'action-import'               => "mpurtari sta pàggina di n'àutra wiki",
+'action-importupload'         => 'mpurtari sta pàggina di nu carricamentu di file',
+'action-patrol'               => "marcari li canci li l'àutri utilizzatura comu virificati",
+'action-autopatrol'           => 'marcari li tò canci comu virificati',
+'action-unwatchedpages'       => 'visiunari la lista dî pàggini nun taliati',
+'action-trackback'            => 'mannari na trackback',
+'action-mergehistory'         => 'jùnciri la crunuluggìa di sta pàggina',
+'action-userrights'           => "canciari tutti li diritti di l'utilizzaturi",
+'action-userrights-interwiki' => "cancia li diritti di l'utenti supra a àutri wiki",
+'action-siteadmin'            => 'bluccari e sbluccari lu database',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|canciamentu|canciamenti}}',
 'recentchanges'                     => 'Ùrtimi canciamenti',
+'recentchanges-legend'              => 'Opzioni ùrtimi canciamenti',
 'recentchangestext'                 => 'Chista pàggina prisenta li canci cchiù ricenti ê cuntinuti dô situ.',
 'recentchanges-feed-description'    => 'Stu feed riporta li canciamenti cchiù ricenti a li cuntinuti dû situ.',
 'rcnote'                            => "Ccà sutta {{PLURAL:$1|c'è lu canciamentu cchiù ricenti appurtatu|cci sunnu l'ùrtimi '''$1''' canciamenti appurtati}} ô situ {{PLURAL:$2|nta l'ùrtimi 24 uri|nta l'ùrtimi '''$2''' giorni}}; li dati sunnu aggiurnati ê $5 dû $4.",
@@ -1070,6 +1221,8 @@ S'havi accirtari ca la cuntinuità storica di la pàggina nun veni altirata.",
 'rc_categories'                     => 'Lìmita a li catigurìi (siparati di "|")',
 'rc_categories_any'                 => 'Qualisiasi',
 'newsectionsummary'                 => '/* $1 */ sizzioni nova',
+'rc-enhanced-expand'                => 'Ammustra dittagghi (addumanna JavaScript)',
+'rc-enhanced-hide'                  => 'Ammuccia dittagghi',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Canciamenti culligati',
@@ -1089,19 +1242,19 @@ S'havi accirtari ca la cuntinuità storica di la pàggina nun veni altirata.",
 'upload_directory_missing'    => 'La directory di upload ($1) nun asisti e non pò èssiri criata dû webserver.',
 'upload_directory_read_only'  => 'Lu server web nun è n gradu di scrìviri ntâ directory di upload ($1).',
 'uploaderror'                 => 'Erruri ntô carricamentu',
-'uploadtext'                  => "Usa lu mòdulu ccà sutta pi carricari file novi. Pi vìdiri o circari li file già carricati, talìa lu [[Special:ImageList|log dî file carricati]]. Carricamenti di file e di virsioni novi di file sunnu riggistrati ntô [[Special:Log/upload|log di l'upload]], li cancillazzioni di file sunnu 
+'uploadtext'                  => "Usa lu mòdulu ccà sutta pi carricari file novi. Pi vìdiri o circari li file già carricati, talìa lu [[Special:FileList|log dî file carricati]]. Carricamenti di file e di virsioni novi di file sunnu riggistrati ntô [[Special:Log/upload|log di l'upload]], li cancillazzioni di file sunnu 
 riggistrati [[Special:Log/delete|ccà]].
 
 Pi nziriri nu file nta na pàggina, fai nu lijami accussì:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' p'usari la virsioni ntera dû file
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|testu altirnativu]]</nowiki></tt>''' p'usari na virsioni làrica 200 pixel nziruta nta nu box, alliniata a manu manca e cu 'testu altirnativu' comu didascalìa
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' p'usari la virsioni ntera dû file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|testu altirnativu]]</nowiki></tt>''' p'usari na virsioni làrica 200 pixel nziruta nta nu box, alliniata a manu manca e cu 'testu altirnativu' comu didascalìa
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' pi culligari direttamenti a lu file senza vidìrilu.",
 'upload-permitted'            => 'Tipi di file cunzintiti: $1.',
 'upload-preferred'            => 'Tipi di file cunsigghiati: $1.',
 'upload-prohibited'           => 'Tipi di file pruibbiti: $1.',
 'uploadlog'                   => 'File carricati',
 'uploadlogpage'               => 'File carricati',
-'uploadlogpagetext'           => "Ccà sutta la lista di l'ùrtimi file carricati. Talìa la [[Special:NewImages|gallarìa dî file novi]] pi na visioni ginirali.",
+'uploadlogpagetext'           => "Ccà sutta la lista di l'ùrtimi file carricati. Talìa la [[Special:NewFiles|gallarìa dî file novi]] pi na visioni ginirali.",
 'filename'                    => 'Nomu dû file',
 'filedesc'                    => 'Discrizzioni',
 'fileuploadsummary'           => "Discrizzioni (auturi, fonti, discrizzioni, licenza d'usu, noti) dû file:",
@@ -1121,21 +1274,22 @@ Pi nziriri nu file nta na pàggina, fai nu lijami accussì:
 'large-file'                  => 'Si raccumanna di nun supirari li diminzioni di $1 pi ognunu file; stu file è granni $2.',
 'largefileserver'             => 'Lu file sùpira li diminzioni cunzintiti dâ cunfigurazzioni dû server.',
 'emptyfile'                   => "Lu file appena carricatu pari èssiri vacanti. Chistu putissi èssiri duvutu a n'erruri ntô nomu dû file. Virificari ca si ntenni riarmenti carricari stu file.",
-'fileexists'                  => 'Nu file cu stu nomu asisti già, pi favuri cuntrolla <strong><tt>$1</tt></strong> siddu nun sî sicuru di vulìrilu suvrascrìviri.',
-'filepageexists'              => "La pàggina di discrizzioni di stu file fu ggià criata nnû nnirizzu <strong><tt>$1</tt></strong>, macari si ancora non c'è nu file cu stu nomu. La discrizzioni di l'uggettu ca fu misa ntô mentri dû caricamentu non si vidi supra a la pàggina di discussioni. Pi fàrila cumpàriri ntâ pàggina di discussioni, c'è la nicissitati di mudificàrila a manu",
+'fileexists'                  => "Nu file cu stu nomu asisti già, pi favuri cuntrolla '''<tt>$1</tt>''' siddu nun sî sicuru di vulìrilu suvrascrìviri.",
+'filepageexists'              => "La pàggina di discrizzioni di stu file fu ggià criata nnû nnirizzu '''<tt>$1</tt>''', macari si ancora non c'è nu file cu stu nomu. La discrizzioni di l'uggettu ca fu misa ntô mentri dû caricamentu non si vidi supra a la pàggina di discussioni. Pi fàrila cumpàriri ntâ pàggina di discussioni, c'è la nicissitati di mudificàrila a manu",
 'fileexists-extension'        => "Nu file cu nu nomu simili a chistu esisti già; l'unica diffirenza è l'usu dê maiusculi nte l'estensioni:<br />
-Nomu dû file carricatu: <strong><tt>$1</tt></strong><br />
-Nome dû file esistenti: <strong><tt>$2</tt></strong><br />
+Nomu dû file carricatu: '''<tt>$1</tt>'''<br />
+Nome dû file esistenti: '''<tt>$2</tt>'''<br />
 Pi favuri scegghiti n'àutru nomu.",
 'fileexists-thumb'            => "<center>'''Mmagini esistenti'''</center>",
-'fileexists-thumbnail-yes'    => "Lu file carricato sembra èssiri lu risurtatu di n'antiprima <i>(thumbnail)</i>. Virificari, pi cunfruntu, lu file <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Lu file carricato sembra èssiri lu risurtatu di n'antiprima ''(thumbnail)''. Virificari, pi cunfruntu, lu file '''<tt>$1</tt>'''.<br />
 Siduu si tratta dâ stissa mmagini, nte dimenzioni urigginali, nun è nicissariu carricara àutri antiprimi.",
-'file-thumbnail-no'           => "Lu nomu dô file accumenza cu <strong><tt>$1</tt></strong>. 
-Pari quinni èssiri lu risurtatu di n'antiprima <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "Lu nomu dô file accumenza cu '''<tt>$1</tt>'''. 
+Pari quinni èssiri lu risurtatu di n'antiprima ''(thumbnail)''.
 Siddu si disponi dâ mmàggini ntâ risuluzzioni urigginali, si prega di carricàrila. 'N casu cuntrariu, si prega di canciari lu nomu dô file.",
-'fileexists-forbidden'        => "Nu file cu stu nomu asisti già. Turnari n'arreri e canciari lu nomu cu lu quali carricari lu file. [[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => "Nu file cu stu nomu asisti già nta l'archiviu dî risursi multimidiali cundivisi. Siddu voi ancora carricari lu file, pi favuri torna n'arreri e cancia lu nomu ca voi dari a lu file. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Nu file cu stu nomu asisti già e nun pò essiri sovrascrittu. Turnari n'arreri e canciari lu nomu cu lu quali carricari lu file. [[File:$1|thumb|center|$1]]",
+'fileexists-shared-forbidden' => "Nu file cu stu nomu asisti già nta l'archiviu dî risursi multimidiali cundivisi. Siddu voi ancora carricari lu file, pi favuri torna n'arreri e cancia lu nomu ca voi dari a lu file. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Stu file è na copia duppiuni {{PLURAL:$1|dû|dî}} file ccà di sècutu:',
+'file-deleted-duplicate'      => "Nu file lu stissu comu a chistu file ([[$1]]) vinni scanciallatu prima di ora. S'aviss'a cuntrullari la stòria e lu picchì dâ scancillazzioni dû file prima di ri-caricàrilu.",
 'successfulupload'            => 'Carricamentu cumplitatu',
 'uploadwarning'               => 'Avvisu di Upload',
 'savefile'                    => 'Sarva file',
@@ -1155,7 +1309,7 @@ Siddu si disponi dâ mmàggini ntâ risuluzzioni urigginali, si prega di carricÃ
 
 Virifica pi favuri la nicissitati di continuari cu lu carricamentu di chistu file.
 Pi tua cumoditati cca c'è la riggistrazioni dâ cancillazioni:",
-'filename-bad-prefix'         => 'Lu nomu dô file chi stai carricannu ncigna cu <strong>"$1"</strong>, chi è nu nomu non descrittivu assignatu, di solitu, automaticamenti dê màchini fotugràfici diggitali. Pi favuri scegghia nu nomu cchiù descrtittivu pi lu tò file.',
+'filename-bad-prefix'         => "Lu nomu dô file chi stai carricannu ncigna cu '''\"\$1\"''', chi è nu nomu non descrittivu assignatu, di solitu, automaticamenti dê màchini fotugràfici diggitali. Pi favuri scegghia nu nomu cchiù descrtittivu pi lu tò file.",
 'filename-prefix-blacklist'   => ' #<!-- dassa sta lìnia comu è già --> <pre>
 # Chista di sèquitu è la sintassi: 
 #   * Tutti li scritti a pàrtiri dô carattiri "#" sugnu commenti
@@ -1190,20 +1344,21 @@ PICT # arcuni
 'upload_source_url'  => '(na URL curretta e accissìbbili)',
 'upload_source_file' => '(un file supra lu propiu computer)',
 
-# Special:ImageList
-'imagelist-summary'     => "Sta pàggina spiciali ammustra tutti li file caricati.
+# Special:ListFiles
+'listfiles-summary'     => "Sta pàggina spiciali ammustra tutti li file caricati.
 Li file caricati di cchiù picca tempu sunnu ammustrati ô princìpiu dâ lista.
 Pi canciari l'urdinamentu, fari clic supra a la ntistazzioni dâ culonna scigghiuta.",
-'imagelist_search_for'  => 'Ricerca dâ mmàggini di nomu:',
+'listfiles_search_for'  => 'Ricerca dâ mmàggini di nomu:',
 'imgfile'               => 'file',
-'imagelist'             => 'Alencu dî file',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nomu',
-'imagelist_user'        => 'Utenti',
-'imagelist_size'        => 'Diminzioni (bytes)',
-'imagelist_description' => 'Discrizzioni',
-
-# Image description page
+'listfiles'             => 'Alencu dî file',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nomu',
+'listfiles_user'        => 'Utenti',
+'listfiles_size'        => 'Diminzioni (bytes)',
+'listfiles_description' => 'Discrizzioni',
+'listfiles_count'       => 'Virsioni',
+
+# File description page
 'filehist'                       => 'Crunuluggìa dô file',
 'filehist-help'                  => 'Fari clic supra nu gruppu data/ura pi vìdiri lu file comu si prisintava ntô mumentu nnicatu.',
 'filehist-deleteall'             => 'cancilla tuttu',
@@ -1211,19 +1366,25 @@ Pi canciari l'urdinamentu, fari clic supra a la ntistazzioni dâ culonna scigghi
 'filehist-revert'                => 'riprìstina',
 'filehist-current'               => 'correnti',
 'filehist-datetime'              => 'Data/Ura',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura di la virsioni dû $1',
+'filehist-nothumb'               => 'Nudda miniatura',
 'filehist-user'                  => 'Utenti',
 'filehist-dimensions'            => 'Diminsioni',
 'filehist-filesize'              => 'Dimensioni dû file',
 'filehist-comment'               => 'Oggettu',
 'imagelinks'                     => "Pàggini c'ùsanu sta mmàggini",
 'linkstoimage'                   => '{{PLURAL:$1|La pàggina siquenti richiàma|Li $1 pàggini siquenti richiàmanu}} sta mmàggini:',
+'linkstoimage-more'              => 'Chiossai di $1 {{PLURAL:$1|pàggina punta|pàggini pùntanu}} a stu file.
+Di sècutu sunnu alincati sulu {{PLURAL:$1|la prima pàggina ca punta|li primi $1 pàggini ca pùntanu}} a stu file.
+È dispunìbbilu nu [[Special:WhatLinksHere/$2|alencu cumpretu]].',
 'nolinkstoimage'                 => 'Nudda pàggina cunteni sta mmàggini.',
 'morelinkstoimage'               => 'Visualizza [[Special:WhatLinksHere/$1|àutri link]] a stu file.',
 'redirectstofile'                => '{{PLURAL:$1|Chistu|Chisti $1}} file {{PLURAL:$1|è|sunnu}} nu redirect a stu file:',
-'duplicatesoffile'               => '{{PLURAL:$1|Chistu|Chisti $1}} file {{PLURAL:$1|è nu dupppiuni|sunnu duppiuni}} di stu file:',
+'duplicatesoffile'               => '{{PLURAL:$1|Chistu|Chisti $1}} file {{PLURAL:$1|è nu dupppiuni|sunnu duppiuni}} di stu file ([[Special:FileDuplicateSearch/$2|cchiù dittagli]]):',
 'sharedupload'                   => "Chistu file è n'upload condivisu; pò èssiri quinni utilizzatu di cchiù pruggetti wiki.",
 'shareduploadwiki'               => 'Si preja di taliari $1 pi ultiriuri nfurmazzioni.',
-'shareduploadwiki-desc'          => 'La discrizzioni supra $1 ca appari nta dda sedi veni ammustrata sutta.',
+'shareduploadwiki-desc'          => 'La discrizzioni ca appari supra la rilativa $1 veni ammustrata sutta.',
 'shareduploadwiki-linktext'      => "pàggina di discrizzioni dû ''file''",
 'shareduploadduplicate'          => "Stu file è nu duppiuni di $1, prisenti nta l'archìviu cunnivisu.",
 'shareduploadduplicate-linktext' => "n'àutru file",
@@ -1247,7 +1408,7 @@ Pi canciari l'urdinamentu, fari clic supra a la ntistazzioni dâ culonna scigghi
 # File deletion
 'filedelete'                  => 'Cancella $1',
 'filedelete-legend'           => 'Cancella lu file',
-'filedelete-intro'            => "Stai pi cancillari '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Stai pi cancillari û file '''[[Media:$1|$1]]''' cu tutta la sou storia.",
 'filedelete-intro-old'        => "Stai cancillannu la virsioni di '''[[Media:$1|$1]]''' dô [$4 $3, $2].",
 'filedelete-comment'          => 'Mutivu:',
 'filedelete-submit'           => 'Cancella',
@@ -1255,7 +1416,6 @@ Pi canciari l'urdinamentu, fari clic supra a la ntistazzioni dâ culonna scigghi
 'filedelete-success-old'      => '<span class="plainlinks">La virsioni dô file \'\'\'[[Media:$1|$1]]\'\'\' dô $2, $3 hà statu cancillata.</span>',
 'filedelete-nofile'           => "Nta {{SITENAME}} nun c'è nuddu file $1",
 'filedelete-nofile-old'       => "'N archiviu nun ci sugnu virsioni di '''$1''' cu li carattiristichi nnicati.",
-'filedelete-iscurrent'        => 'Sta pruvannu a cancillari la virsioni cchiù ricenti di chistu file. Pi favuri, prima riturnàrilu a na virsioni pricidenti.',
 'filedelete-otherreason'      => 'Autra mutivazioni o mutivazioni n più:',
 'filedelete-reason-otherlist' => 'Autra mutivazioni',
 'filedelete-reason-dropdown'  => '*Mutivazzioni cchiù cumuni
@@ -1282,26 +1442,31 @@ Pi canciari l'urdinamentu, fari clic supra a la ntistazzioni dâ culonna scigghi
 
 # Random page
 'randompage'         => 'Na pàggina ammuzzu',
-'randompage-nopages' => 'Nudda pàggina ntô namespace silizziunatu.',
+'randompage-nopages' => 'Nudda pàggina ntô namespace "$1".',
 
 # Random redirect
 'randomredirect'         => 'Un redirect a muzzu',
-'randomredirect-nopages' => 'Nuddu rinnirizzamentu ntô namespace silizziunatu.',
+'randomredirect-nopages' => 'Nuddu rinnirizzamentu ntô namespace "$1".',
 
 # Statistics
-'statistics'             => 'Statìstichi',
-'sitestats'              => 'Li statìstichi di {{SITENAME}}',
-'userstats'              => "Li statìstichi di l'utilizzatura",
-'sitestatstext'          => "C{{PLURAL:\$1|'è na pàggina|i sunnu '''\$1''' pàggini}} ntô databbasi.
-Chisti nclùdunu li pàggini di discussioni, li pàggini supra {{SITENAME}}, li \"stub\" minimali, li redirects, e àutri pàggini chi nun ponnu qualificàrisi comu pàggini di cuntinutu. Escludennu chissi, c{{PLURAL:\$2|'è '''1''' pàggina chi si pò|i sunnu '''\$2''' pàggini chi si ponnu}} qualificari comu pàggini di cuntinutu.
-
-{{PLURAL:\$8|Hà statu puru carricatu|Hannu stati puru carricati}} '''\$8''' file.
-
-Dâ nstallazzioni dô situ nzinu a stu mumentu {{PLURAL:\$3|hà stata visitata '''1''' pàggina|hannu statu visitati '''\$3''' pàggini}} e {{PLURAL:\$4|fattu '''1''' canciamentu|fatti '''\$4''' canciamenti}}, pari a na media di '''\$5''' canciamenti pi pàggina e '''\$6''' richiesti di littura p'ogni canciamentu.
-
-La cuda dî prucessi a esèquiri 'n background cunteni {{PLURAL:\$7|'''1''' elementu|'''\$7''' elementi}}.",
-'userstatstext'          => "C{{PLURAL:$1|'è '''1''' [[Special:ListUsers|utilizzaturi]] riggistratu|i sunnu '''$1''' [[Special:ListUsers|utilizzatura]] riggistrati}}; di chisti '''$2''' (o lu '''$4%''') {{PLURAL:$2|havi|hannu}} li diritti di lu gruppu $5.",
-'statistics-mostpopular' => 'Pàggini cchiù visitati',
+'statistics'                   => 'Statìstichi',
+'statistics-header-pages'      => 'Statistichi pî pàggini',
+'statistics-header-edits'      => 'Statistichi pî canci',
+'statistics-header-views'      => 'Statistichî pî taliàti',
+'statistics-header-users'      => "Li statìstichi di l'utilizzatura",
+'statistics-articles'          => 'Pàggini di cuntinutu',
+'statistics-pages'             => 'Pàggini',
+'statistics-pages-desc'        => 'Tutti li pàggini dâ wiki, cu puru chiddi di discussioni, li rinnirizzamenti, ecc.',
+'statistics-files'             => 'File carricati',
+'statistics-edits'             => 'Canci a pàrtiri di la nstallazzioni di {{SITENAME}}',
+'statistics-edits-average'     => 'Media dî canci pi pàggina',
+'statistics-views-total'       => 'Visualizzazioni totali',
+'statistics-views-peredit'     => 'Visualizzazioni pî canci',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Cuda dî prucessi] a esiquiri n background',
+'statistics-users'             => '[[Special:ListUsers|Utilizzatura]] riggistrati',
+'statistics-users-active'      => 'Utilizzatura attivi',
+'statistics-users-active-desc' => "Utilizzatura chi fìciru n'azzioni lu misi passatu",
+'statistics-mostpopular'       => 'Pàggini cchiù visitati',
 
 'disambiguations'      => 'Pàggini cu liami ambìgui',
 'disambiguationspage'  => 'Template:Disambigua',
@@ -1344,7 +1509,8 @@ Vèninu cunzidirati pàggini di disambiguazzioni tutti chiddi ca cuntèninu li t
 'popularpages'            => 'Pàggini cchiù visitati',
 'wantedcategories'        => 'Catigurìi addumannati',
 'wantedpages'             => 'Artìculi cchiù addumannati',
-'missingfiles'            => 'File pirdutu',
+'wantedfiles'             => 'File addumannati',
+'wantedtemplates'         => 'Template addumannati',
 'mostlinked'              => 'Pàggini supra cui agghìcanu cchiù liami',
 'mostlinkedcategories'    => 'Catigurìi cchiù richiamati',
 'mostlinkedtemplates'     => 'Template cchiù usati',
@@ -1358,12 +1524,15 @@ Vèninu cunzidirati pàggini di disambiguazzioni tutti chiddi ca cuntèninu li t
 'deadendpagestext'        => 'Li pàggini ndicati di sèquitu sunnu privi di culligamenti versu àutri pàggini dû situ.',
 'protectedpages'          => 'Pàggini prutetti',
 'protectedpages-indef'    => 'Sulu prutizzioni nfiniti',
+'protectedpages-cascade'  => 'Sulu prutizzioni ricursivi',
 'protectedpagestext'      => 'Sta pàggina hà statu prutiggiuta pi mpidìrinni lu canciamentu.',
 'protectedpagesempty'     => 'A lu mumentu nun ci sunnu pàggini prutetti',
 'protectedtitles'         => 'Tituli prutiggiuti',
 'protectedtitlestext'     => 'Nun si ponnu criari pàggini ccu li tìtuli nnicati di sècutu',
 'protectedtitlesempty'    => 'Nta stu mumentu nun ci sunnu tìtuli prutetti ccu li paràmitri nnicati.',
 'listusers'               => 'Lista di utilizzatura',
+'listusers-editsonly'     => 'Ammustra sulu utenti cu cuntribbuti',
+'usereditcount'           => '$1 {{PLURAL:$1|cuntribbutu|cuntribbuti}}',
 'newpages'                => 'pàggini cchiù ricenti',
 'newpages-username'       => 'Utenti:',
 'ancientpages'            => 'pàggini cchiù vecchi',
@@ -1386,14 +1555,13 @@ chisti putìssiru quinni èssiri utilizzati puru siddu cumpàrinu nta l'alencu."
 'booksources-isbn'          => 'Còdici ISBN:',
 'booksources-go'            => 'Vai',
 'booksources-text'          => "Di sèquitu veni prisintatu n'alencu di culligamenti versu siti sterni ca vìnninu libbra novi e usati, attraversu li quali è pussìbbili ottèniri maiuri nfurmazzioni supra lu testu circatu:",
+'booksources-invalid-isbn'  => "L'ISBN datu pari ca nun è vàlidu; cuntrolla l'erruri di ricupiatura dâ surgenti urigginali.",
 
 # Special:Log
 'specialloguserlabel'  => 'Utenti:',
 'speciallogtitlelabel' => 'Tìtulu:',
 'log'                  => 'Log',
 'all-logs-page'        => 'Tutti li log',
-'log-search-legend'    => "Va' cerca nte riggistri",
-'log-search-submit'    => 'Vai',
 'alllogstext'          => "Prisintazzioni unificata di tutti li riggistri di {{SITENAME}}. Poi limitari li criteri di circata silizziunannu lu tipu di riggistru, l'utenti ca fici l'azzioni (case-sensitive), e/o la pàggina ntirissata (pur'idda case-sensitive).",
 'logempty'             => 'Lu log nun cunteni elementi currispunnenti â ricerca.',
 'log-title-wildcard'   => 'Attrova tituli chi ncignanu cu',
@@ -1404,6 +1572,7 @@ chisti putìssiru quinni èssiri utilizzati puru siddu cumpàrinu nta l'alencu."
 'nextpage'          => 'Pàggina doppu ($1)',
 'prevpage'          => 'Pàggina pricidenti ($1)',
 'allpagesfrom'      => 'Ammustra li pàggini a pàrtiri di:',
+'allpagesto'        => 'Ammustra li pàggini nzinu a:',
 'allarticles'       => "Tutti l'artìculi",
 'allinnamespace'    => 'Tutti li pàggini dû namespace $1',
 'allnotinnamespace' => 'Tutti li pàggini, sparti lu namespace $1',
@@ -1423,39 +1592,67 @@ Talìa macari li [[Special:WantedCategories|catigurìi addumannati]].',
 'special-categories-sort-count' => 'ordina pi nùmmuru',
 'special-categories-sort-abc'   => 'ordina alfabbeticamenti',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Cuntribbuti utenti scancillati',
+
+# Special:LinkSearch
+'linksearch'       => 'Lijami di fora',
+'linksearch-pat'   => 'Mudellu di circata:',
+'linksearch-ns'    => 'Namespace:',
+'linksearch-ok'    => 'Cerca',
+'linksearch-text'  => 'C\'è la pussibbilitati di fari usu di metacaràttiri, p\'asèmpiu "*.wikipedia.org".<br />
+Protucolli suppurtati: <tt>$1</tt>',
+'linksearch-line'  => '$1 prisenti ntâ pàggina $2',
+'linksearch-error' => 'Li metacaràttiri si ponnu usari sulu a lu princìpiu dû nnirizzu.',
+
 # Special:ListUsers
 'listusersfrom'      => "Ammustra l'utenti a pàrtiri di:",
 'listusers-submit'   => 'Ammustra',
 'listusers-noresult' => "Nuddu utenti attruvatu. Virificari l'usu di caràttiri maiùsculi/minùsculi.",
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Novi utenti',
+'newuserlogpagetext'          => 'Di sècutu vènunu elincati li criazzioni di cunti novi (account).',
+'newuserlog-byemail'          => 'password mannata via mail',
+'newuserlog-create-entry'     => "s'arriggistrau ora",
+'newuserlog-create2-entry'    => 'arriggistrau lu novu nomu utenti $1',
+'newuserlog-autocreate-entry' => 'account criatu automaticamenti',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Diritti dô gruppu utenti',
-'listgrouprights-summary'  => "Ccà sutta sunnu elincati li gruppi utenti difiniti pi sta wiki, cu li dritti d'accessu assuciati a iddi. Pi sapìrinni chiossai supra li dritti, lèggiti [[{{MediaWiki:Listgrouprights-helppage}}|sta pàggina]].",
-'listgrouprights-group'    => 'Gruppu',
-'listgrouprights-rights'   => 'Diritti',
-'listgrouprights-helppage' => 'Help:Diritti dô gruppu',
-'listgrouprights-members'  => '(Elencu di cu ni fa parti)',
+'listgrouprights'                 => 'Diritti dô gruppu utenti',
+'listgrouprights-summary'         => "Ccà sutta sunnu elincati li gruppi utenti difiniti pi sta wiki, cu li dritti d'accessu assuciati a iddi. Pi sapìrinni chiossai supra li dritti, lèggiti [[{{MediaWiki:Listgrouprights-helppage}}|sta pàggina]].",
+'listgrouprights-group'           => 'Gruppu',
+'listgrouprights-rights'          => 'Diritti',
+'listgrouprights-helppage'        => 'Help:Diritti dô gruppu',
+'listgrouprights-members'         => '(Elencu di cu ni fa parti)',
+'listgrouprights-addgroup'        => 'Pò jùnciri {{PLURAL:$2|lu gruppu|li gruppi}}: $1',
+'listgrouprights-removegroup'     => 'Pò livari {{PLURAL:$2|lu gruppu|li gruppi}}: $1',
+'listgrouprights-addgroup-all'    => 'Pò jùnciri a tutti li gruppi',
+'listgrouprights-removegroup-all' => 'Pò livari tutti li gruppi',
 
 # E-mail user
-'mailnologin'     => 'Nuddu ndirizzu cui mannari lu missaggiu',
-'mailnologintext' => 'Hai a fari lu [[Special:UserLogin|login]] e aver riggistratu na casella e-mail vàlida ntê tò [[Special:Preferences|prifirenzi]] pi mannari posta alittrònica a àutri Utenti.',
-'emailuser'       => "Manna n'imail a stu utenti",
-'emailpage'       => "Manna un missaggiu e-mail a l'utenti",
-'emailpagetext'   => "Siddu st'utenti lassau nu nnirizzu email vàlidu ntê sò prifirenzi, ci putiti mannari nu missaggiu. Lu nnirizzu email ca lassasti ntê tò [[Special:Preferences|prifirenzi]] và a cumpàriri comu mittenti di lu email, di manera ca lu distinatariu ti pò arrispùnniri.",
-'usermailererror' => "L'uggettu mail hà ristituitu l'erruri:",
-'defemailsubject' => 'Missaggiu di {{SITENAME}}',
-'noemailtitle'    => 'Nuddu ndirizzu e-mail',
-'noemailtext'     => "St'utilizzaturi nun spicificau nu nnirizzu email vàlidu, o scigghìu di nun ricìviri email di àutri utilizzatura.",
-'emailfrom'       => 'Di:',
-'emailto'         => 'A:',
-'emailsubject'    => 'Uggettu:',
-'emailmessage'    => 'Missaggiu:',
-'emailsend'       => 'Mannari',
-'emailccme'       => 'Mànnami na copia dû missaggiu.',
-'emailccsubject'  => 'Copia dû missaggiu mannatu a $1: $2',
-'emailsent'       => 'Imeil mannata',
-'emailsenttext'   => 'Lu tò missaggiu imeil ha statu mannatu.',
-'emailuserfooter' => 'Sta e-mail fu mannata di $1 a $2 attraversu la funzionu "Manna nu missàggiu e-mail a l\'utenti" supra {{SITENAME}}.',
+'mailnologin'      => 'Nuddu ndirizzu cui mannari lu missaggiu',
+'mailnologintext'  => 'Hai a fari lu [[Special:UserLogin|login]] e aver riggistratu na casella e-mail vàlida ntê tò [[Special:Preferences|prifirenzi]] pi mannari posta alittrònica a àutri Utenti.',
+'emailuser'        => "Manna n'imail a stu utenti",
+'emailpage'        => "Manna un missaggiu e-mail a l'utenti",
+'emailpagetext'    => "Siddu st'utenti lassau nu nnirizzu email vàlidu ntê sò prifirenzi, ci putiti mannari nu missaggiu. Lu nnirizzu email ca lassasti ntê tò [[Special:Preferences|prifirenzi]] và a cumpàriri comu mittenti di lu email, di manera ca lu distinatariu ti pò arrispùnniri.",
+'usermailererror'  => "L'uggettu mail hà ristituitu l'erruri:",
+'defemailsubject'  => 'Missaggiu di {{SITENAME}}',
+'noemailtitle'     => 'Nuddu ndirizzu e-mail',
+'noemailtext'      => "St'utilizzaturi nun spicificau nu nnirizzu email vàlidu.",
+'nowikiemailtitle' => 'E-mail nun pirmittuta',
+'nowikiemailtext'  => "St'utenti scigghìu di non aricèviri missaggi di posta alittrònica di l'àutri utenti.",
+'email-legend'     => "Manna n'e-mail a n'àutru utenti di {{SITENAME}}",
+'emailfrom'        => 'Di:',
+'emailto'          => 'A:',
+'emailsubject'     => 'Uggettu:',
+'emailmessage'     => 'Missaggiu:',
+'emailsend'        => 'Mannari',
+'emailccme'        => 'Mànnami na copia dû missaggiu.',
+'emailccsubject'   => 'Copia dû missaggiu mannatu a $1: $2',
+'emailsent'        => 'Imeil mannata',
+'emailsenttext'    => 'Lu tò missaggiu imeil ha statu mannatu.',
+'emailuserfooter'  => 'Sta e-mail fu mannata di $1 a $2 attraversu la funzionu "Manna nu missàggiu e-mail a l\'utenti" supra {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Lista taliata mia',
@@ -1485,12 +1682,7 @@ Talìa macari li [[Special:WantedCategories|catigurìi addumannati]].',
 'iteminvalidname'      => "Prubbremi cu la pàggina '$1', nomu nun vàlidu...",
 'wlnote'               => "Sutta attrovi l'ùrtim{{PLURAL:$1|u canciamentu|i $1 canciamenti}}, nta l'ùrtim{{PLURAL:$1|a ura|i '''$2''' uri}}.",
 'wlshowlast'           => "Ammustra l'ùrtimi $1 uri $2 jorna $3",
-'watchlist-show-bots'  => 'Ammustra li canciamenti dî bot',
-'watchlist-hide-bots'  => 'Ammuccia li canciamenti dî bot',
-'watchlist-show-own'   => 'Ammustra li mè canciamenti',
-'watchlist-hide-own'   => 'Ammuccia li mè canciamenti',
-'watchlist-show-minor' => 'Ammustra li canciamenti nichi',
-'watchlist-hide-minor' => 'Ammuccia li canciamenti nichi',
+'watchlist-options'    => 'Opzioni ussirvati spiciali',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => "Junta a l'ussirvati spiciali...",
@@ -1529,77 +1721,97 @@ Pi mudificari li mpustazzioni dâ lista di l\'ussirvati spiciali, vìsita
 Pi dari lu tò feedback e arricèviri ultiriuri assistenza:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Elìmina la pàggina',
-'confirm'                     => 'Cunferma',
-'excontent'                   => "Lu cuntinutu era: '$1'",
-'excontentauthor'             => "Lu cuntinutu era: '$1' (e lu sulu cuntribbuturi era '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Lu cuntinutu prima dû svacantamentu era: '$1'",
-'exblank'                     => 'la pàggina era vacanti',
-'delete-confirm'              => 'Cancella "$1"',
-'delete-legend'               => 'Cancella',
-'historywarning'              => 'Accura: La pàggina ca stai pi cancillari havi na cronoluggìa:',
-'confirmdeletetext'           => "Stai cancillannu dû databbasi na pàggina o na mmàggini cu tutta la sò storia di manera pirmanenti. Pi fauri, cunferma ca tu ntenni fari sta cosa, ca tu hai caputu li cunziquenzi, e chi lu fai secunnu li linìi guida stabbiliti 'n [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Azzioni cumpritata',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ha statu cancillatu.
+# Delete
+'deletepage'             => 'Elìmina la pàggina',
+'confirm'                => 'Cunferma',
+'excontent'              => "Lu cuntinutu era: '$1'",
+'excontentauthor'        => "Lu cuntinutu era: '$1' (e lu sulu cuntribbuturi era '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "Lu cuntinutu prima dû svacantamentu era: '$1'",
+'exblank'                => 'la pàggina era vacanti',
+'delete-confirm'         => 'Cancella "$1"',
+'delete-legend'          => 'Cancella',
+'historywarning'         => 'Accura: La pàggina ca stai pi cancillari havi na cronoluggìa:',
+'confirmdeletetext'      => "Stai cancillannu dû databbasi na pàggina o na mmàggini cu tutta la sò storia di manera pirmanenti. Pi fauri, cunferma ca tu ntenni fari sta cosa, ca tu hai caputu li cunziquenzi, e chi lu fai secunnu li linìi guida stabbiliti 'n [[{{MediaWiki:Policy-url}}]].",
+'actioncomplete'         => 'Azzioni cumpritata',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ha statu cancillatu.
 Talìa $2 pi na lista di cancillazzioni ricenti.',
-'deletedarticle'              => 'Hà cancillatu "[[$1]]"',
-'suppressedarticle'           => 'suppressu "[[$1]]"',
-'dellogpage'                  => 'Cancillazzioni',
-'dellogpagetext'              => 'Di sèquitu sunnu alincati li pàggini cancillati di ricenti.',
-'deletionlog'                 => 'Log dî cancillazzioni',
-'reverted'                    => 'Ripristinata la virsioni pricidenti',
-'deletecomment'               => 'Mutivazzioni pi cancillari',
-'deleteotherreason'           => 'Autra mutivazioni o mutivazioni in più:',
-'deletereasonotherlist'       => 'Autra mutivazioni',
-'deletereason-dropdown'       => "*Mutivazzioni cchiù cumuni pi la cancillazzioni
+'deletedarticle'         => 'Hà cancillatu "[[$1]]"',
+'suppressedarticle'      => 'suppressu "[[$1]]"',
+'dellogpage'             => 'Cancillazzioni',
+'dellogpagetext'         => 'Di sèquitu sunnu alincati li pàggini cancillati di ricenti.',
+'deletionlog'            => 'Log dî cancillazzioni',
+'reverted'               => 'Ripristinata la virsioni pricidenti',
+'deletecomment'          => 'Mutivazzioni pi cancillari',
+'deleteotherreason'      => 'Autra mutivazioni o mutivazioni in più:',
+'deletereasonotherlist'  => 'Autra mutivazioni',
+'deletereason-dropdown'  => "*Mutivazzioni cchiù cumuni pi la cancillazzioni
 ** Dumanna di l'auturi
 ** Viulazzioni di copyright
 ** Vannalismu",
-'delete-edit-reasonlist'      => 'Cancia li mutivazzioni pi la cancillazioni',
-'delete-toobig'               => 'La storia dî canciamenti di sta pàggina è assai longa (ortri $1 {{PLURAL:$1|rivisioni|rivisioni}}). La sò scancillazzioni vinni limitata pi scanzari la pussibbilitati di criari senza vulìrilu prubbremi di funziunamentu ô database di {{SITENAME}}.',
-'delete-warning-toobig'       => 'La storia di sta pàggina è assai longa (ortri $1 {{PLURAL:$1|rivisioni|rivisioni}}). La sò scancillazzioni pò dari prubbremi di funziunamentu ô database di {{SITENAME}}; prucèdiri cu attinzioni.',
-'rollback'                    => 'Annulla li canciamenti',
-'rollback_short'              => "Canciu n'arreri",
-'rollbacklink'                => "canciu n'arreri",
-'rollbackfailed'              => "Canciu 'n arreri fallitu",
-'cantrollback'                => "Mpussìbbili annullari li canciamenti; l'utenti ca l'effittuau è l'ùnicu a aviri cuntribbuiutu â pàggina.",
-'alreadyrolled'               => "Nun è pussìbbili annullari li canciamenti appurtati â pàggina [[:$1]] di parti di [[User:$2|$2]] ([[User talk:$2|Discussioni]] | [[Special:Contributions/$2|{{int:contribslink}}]]); n'àutru utenti hà già canciatu la pàggina oppuru hà effittuatu lu rollback.
-
-Lu canciamentu cchiù ricenti â pàggina fu appurtata di [[User:$3|$3]] ([[User talk:$3|discussioni]]).",
-'editcomment'                 => 'Lu cummentu â mudìfica era: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => "Canciu narrè di [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussioni]]) cu l'ùrtima virsioni di [[User:$1|$1]]", # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Annullati li canciamenti di $1; ritornata â virsioni pricidenti di $2.',
-'sessionfailure'              => 'S\'hà virificatu un prubbrema cu la tò sissioni di login;
+'delete-edit-reasonlist' => 'Cancia li mutivazzioni pi la cancillazioni',
+'delete-toobig'          => 'La storia dî canciamenti di sta pàggina è assai longa (ortri $1 {{PLURAL:$1|rivisioni|rivisioni}}). La sò scancillazzioni vinni limitata pi scanzari la pussibbilitati di criari senza vulìrilu prubbremi di funziunamentu ô database di {{SITENAME}}.',
+'delete-warning-toobig'  => 'La storia di sta pàggina è assai longa (ortri $1 {{PLURAL:$1|rivisioni|rivisioni}}). La sò scancillazzioni pò dari prubbremi di funziunamentu ô database di {{SITENAME}}; prucèdiri cu attinzioni.',
+
+# Rollback
+'rollback'         => 'Annulla li canciamenti',
+'rollback_short'   => "Canciu n'arreri",
+'rollbacklink'     => "canciu n'arreri",
+'rollbackfailed'   => "Canciu 'n arreri fallitu",
+'cantrollback'     => "Mpussìbbili annullari li canciamenti; l'utenti ca l'effittuau è l'ùnicu a aviri cuntribbuiutu â pàggina.",
+'alreadyrolled'    => "Nun è pussìbbili annullari li canciamenti appurtati â pàggina [[:$1]] di parti di [[User:$2|$2]] ([[User talk:$2|discussioni]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); n'àutru utenti hà già canciatu la pàggina oppuru hà effittuatu lu rollback.
+
+Lu canciamentu cchiù ricenti â pàggina fu appurtata di [[User:$3|$3]] ([[User talk:$3|discussioni]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
+'editcomment'      => "Â discrizzioni â mudìfica era: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => "Canciu narrè di [[Special:Contributions/$2|$2]] ([[User talk:$2|Discussioni]]) cu l'ùrtima virsioni di [[User:$1|$1]]", # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Annullati li canciamenti di $1; ritornata â virsioni pricidenti di $2.',
+'sessionfailure'   => 'S\'hà virificatu un prubbrema cu la tò sissioni di login;
 lu sistema nun hà esiquitu lu cumannu mpartitu pi pricauzzioni.
 Pi favuri utilizza lu tastu "\'n arreri" dû tò browser, ricàrrica la pàggina e riprova di novu.',
+
+# Protect
 'protectlogpage'              => 'Pàggini prutetti',
 'protectlogtext'              => 'Lista di prutezzioni/sprutezzioni dî pàggini. Vidi macari la [[Special:ProtectedPages|lista dî pàggini prutetti]].',
 'protectedarticle'            => 'hà prutettu [[$1]]',
 'modifiedarticleprotection'   => 'canciàu lu liveddu di prutizzioni di "[[$1]]"',
 'unprotectedarticle'          => 'hà sprutettu [[$1]]',
+'movedarticleprotection'      => 'spustau la prutizzioni di "[[$2]]" a "[[$1]]"',
 'protect-title'               => 'Prutezzioni di "$1"',
+'prot_1movedto2'              => '[[$1]] spustatu a [[$2]]',
 'protect-legend'              => 'Cunferma la prutezzioni',
 'protectcomment'              => 'Mutivu dâ prutezzioni',
 'protectexpiry'               => 'Scadenza',
 'protect_expiry_invalid'      => 'Scadenza nun vàlida.',
 'protect_expiry_old'          => 'Scadenza già trascursa.',
 'protect-unchain'             => 'Sblocca pirmissu di spustamentu',
-'protect-text'                => 'Ccà poi vìdiri e canciari lu liveddu di prutezzioni pi la pàggina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nun pò canciari li liveddi di prutizzioni quannu sî bloccatu. Li mpostazzioni correnti pâ pàggina sugnu <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Mpussibbili canciari li liveddi di prutizzioni pi nu bloccu dô database.
-Li mpostazzioni correnti pâ pàggina sugnu <strong>$1</strong>:',
-'protect-locked-access'       => 'Nun hai li pirmessi nicissari pi canciari li liveddi di prutizzioni dâ pàggina.
-Li mpostazzioni correnti pâ pàggina sugnu <strong>$1</strong>:',
+'protect-text'                => "Ccà poi vìdiri e canciari lu liveddu di prutezzioni pi la pàggina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nun pò canciari li liveddi di prutizzioni quannu sî bloccatu. Li mpostazzioni correnti pâ pàggina sugnu '''$1''':",
+'protect-locked-dblock'       => "Mpussibbili canciari li liveddi di prutizzioni pi nu bloccu dô database.
+Li mpostazzioni correnti pâ pàggina sugnu '''$1''':",
+'protect-locked-access'       => "Nun hai li pirmessi nicissari pi canciari li liveddi di prutizzioni dâ pàggina.
+Li mpostazzioni correnti pâ pàggina sugnu '''$1''':",
 'protect-cascadeon'           => 'A lu mumentu sta pàggina è bluccata, poichì nclusa nt{{PLURAL:$1|â pàggina innicata di sèquitu, supra la quala|ê pàggini innicati di sèquitu, supra li quali}} hà statu attivata la prutezzioni ricursiva. È pussìbbili mudificari lu liveddu di prutezzioni di sta pàggina ma lu liveddu di prutezzioni arresta chiddu difinitu dâ prutezzioni ricursiva, siddu la stissa nun veni canciata.',
-'protect-default'             => '(pridifinitu)',
+'protect-default'             => "Auturizza tutti l'utenti",
 'protect-fallback'            => 'Richiedi lu pirmissu "$1"',
 'protect-level-autoconfirmed' => "Blocca l'utenti nun riggistrati",
 'protect-level-sysop'         => 'Sulu li amministratura',
 'protect-summary-cascade'     => 'ricursiva',
 'protect-expiring'            => 'scadi a li $1 (UTC)',
+'protect-expiry-indefinite'   => 'senza fini',
 'protect-cascade'             => 'Prutezzioni ricursiva (pruteggi tutti li pàggini nclusi nta chista).',
 'protect-cantedit'            => 'Nun è possibili canciari li livelli di prutizzioni pi la pàggina n quantu nun si disponi dî pirmessi necissari pi canciari la pàggina stissa.',
+'protect-othertime'           => "Durata non 'n alencu:",
+'protect-othertime-op'        => "durata non 'n alencu",
+'protect-existing-expiry'     => 'Scadenza attuali: $2, $3',
+'protect-otherreason'         => 'Àustri mutivi/dittagghi:',
+'protect-otherreason-op'      => 'àutri mutivi/dittagghi',
+'protect-dropdown'            => '*Mutivi cumuni di prutizzioni
+** Vannalìsimi fatti cchiossai di na vota
+** Nzirimenti di spam fatti cchiossai di na vota
+** Edit war
+** Pàggina usata assai
+** Pàggina archiviata',
+'protect-edit-reasonlist'     => 'Cancia li mutivi pâ prutizzioni',
+'protect-expiry-options'      => '2 uri:2 hours,1 jornu:1 day,3 jorna:3 days,1 simana:1 week,2 simani:2 weeks,1 misi:1 month,3 misi:3 months,6 misi:6 months,1 annu:1 year,nfinitu:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pirmissu',
 'restriction-level'           => 'Liveddu di ristrizzioni:',
 'minimum-size'                => 'Dimensioni minima',
@@ -1622,19 +1834,20 @@ Li mpostazzioni correnti pâ pàggina sugnu <strong>$1</strong>:',
 'undeletepage'                 => 'Talìa e ricùpira li pàggini cancillati',
 'undeletepagetitle'            => "'''Quantu segui è compostu da rivisioni cancillati di [[:$1]]'''.",
 'viewdeletedpage'              => 'Talìa li pàggini cancillati',
-'undeletepagetext'             => "Li pàggini innicati di sèquitu hannu statu cancillati, ma sunnu ancora n archiviu e pirtantu ponnu èssiri ricupirati. L'archiviu pò èssiri svacantatu piriodicamenti.",
+'undeletepagetext'             => "Li pàggini nnicati di sècutu foru scancillati, ma sunnu ancora nti l'archìviu e picciò ponnu èssiri aripigghiati. L'archìviu pò èssiri svacantatu piriodicamenti.",
 'undelete-fieldset-title'      => 'Ripigghia rivisioni',
 'undeleteextrahelp'            => "Pi ricupirari la storia ntera dâ pàggina, fari clic supra '''''Riprìstina''''' senza silizziunari nudda casella. P'effittuari un riprìstinu silittivu, silizziunari li caselli currispunnenti a li rivisioni a ripristinari e fari clic supra '''''Riprìstina'''''. Facennu clic supra '''''Reset''''' vèninu disilizziunati tutti li caselli e svacantatu lu spazziu pi lu cummentu.",
 'undeleterevisions'            => '{{PLURAL:$1|Na rivisioni|$1 rivisioni}} n archiviu',
 'undeletehistory'              => "Siddu ricùpiri st'artìculu, tutti li sò rivisioni vèninu ricupirati ntâ cronoluggìa rilativa. Siddu doppu la cancillazzioni na pàggina nova cu lu stissu tìtulu fu criata, li rivisioni ricupirati sunnu nziriti ntâ cronoluggìa e la virsioni attuarmenti online dâ pàggina nun veni canciata.",
 'undeleterevdel'               => 'Lu riprìstinu nun è fattu siddu cancella parziarmenti la virsioni currenti dâ pàggina o dû file. Nta stu casu, è nicissariu livari lu signu di spunta o lu scuramentu dê rivisioni cancillati cchiù ricenti.',
 'undeletehistorynoadmin'       => "Sta pàggina hà statu cancillata. Lu mutivu dâ cancillazzioni è ammustratu ccà sutta, nzèmmula a li dittagghi di l'utenti c'hà canciatu sta pàggina prima dâ cancillazzioni. Lu testu cuntinutu ntê rivisioni cancillati è dispunìbbili sulu a li amministratura.",
-'undelete-revision'            => 'Rivisioni cancillata di $1 (scritta lu $2 di $3):',
+'undelete-revision'            => 'Rivisioni scancillata di $1, nsiruta lu $4$ ê $5$ di $3$:',
 'undeleterevision-missing'     => "Rivisioni errata o mancanti. Lu culligamentu è erratu oppuru la rivisioni hà statu già ripristinata o eliminata di l'archiviu.",
 'undelete-nodiff'              => "Nun s'havi attruvatu na rivisioni pricidenti.",
 'undeletebtn'                  => 'Riprìstina!',
 'undeletelink'                 => 'riprìstina',
 'undeletereset'                => 'Rimposta',
+'undeleteinvert'               => 'Scancia la silizzioni',
 'undeletecomment'              => 'Cummentu:',
 'undeletedarticle'             => 'hà ricupiratu "[[$1]]"',
 'undeletedrevisions'           => '$1 rivisioni ricupirat{{PLURAL:$1|a|i}}',
@@ -1664,26 +1877,27 @@ $1',
 'blanknamespace' => '(Principali)',
 
 # Contributions
-'contributions' => 'cuntribbuti',
-'mycontris'     => 'Li mei cuntribbuti',
-'contribsub2'   => 'Pi $1 ($2)',
-'nocontribs'    => 'Secunnu sti criteri nun ci sunnu canci o cuntribbuti.',
-'uctop'         => '(ùrtima pi la pàggina)',
-'month'         => 'A pàrtiri dô mese (e pricidenti):',
-'year'          => "A pàrtiri di l'annu (e pricidenti):",
-
-'sp-contributions-newbies'     => "Ammustra sulu li cuntribbuti di l'utenti novi",
-'sp-contributions-newbies-sub' => 'Pi li utenti novi',
-'sp-contributions-blocklog'    => 'log dî blocchi',
-'sp-contributions-search'      => 'Ricerca cuntribbuti',
-'sp-contributions-username'    => 'Nnirizzu IP o nomu utenti:',
-'sp-contributions-submit'      => 'Ricerca',
+'contributions'       => 'cuntribbuti',
+'contributions-title' => 'Cuntribbuti di $1',
+'mycontris'           => 'Li mei cuntribbuti',
+'contribsub2'         => 'Pi $1 ($2)',
+'nocontribs'          => 'Secunnu sti criteri nun ci sunnu canci o cuntribbuti.',
+'uctop'               => '(ùrtima pi la pàggina)',
+'month'               => 'A pàrtiri dô mese (e pricidenti):',
+'year'                => "A pàrtiri di l'annu (e pricidenti):",
+
+'sp-contributions-newbies'       => "Ammustra sulu li cuntribbuti di l'utenti novi",
+'sp-contributions-newbies-sub'   => 'Pi li utenti novi',
+'sp-contributions-newbies-title' => "Cuntribbuti di l'utenti novi",
+'sp-contributions-blocklog'      => 'log dî blocchi',
+'sp-contributions-search'        => 'Ricerca cuntribbuti',
+'sp-contributions-username'      => 'Nnirizzu IP o nomu utenti:',
+'sp-contributions-submit'        => 'Ricerca',
 
 # What links here
 'whatlinkshere'            => 'Chi punta ccà',
 'whatlinkshere-title'      => 'Pàggini ca pùntanu a "$1"',
 'whatlinkshere-page'       => 'Pàggina:',
-'linklistsub'              => '(Lista di liami)',
 'linkshere'                => "Sti pàggini hannu nu liami a '''[[:$1]]''':",
 'nolinkshere'              => "Nudda pàggina havi nu liami a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nun ci sugnu pàggini chi puntano a '''[[:$1]]''' ntô namespace silizziunatu.",
@@ -1727,6 +1941,8 @@ $1',
 'ipbotherreason'                  => 'Àutri mutivi/dittagghi:',
 'ipbhidename'                     => "Ammuccia lu nomu utenti dô log dî blocchi, di l'alencu dî blocchi attivi e di l'alencu utenti.",
 'ipbwatchuser'                    => "Talìa li pàggini e li discussioni utenti di st'utenti",
+'ipballowusertalk'                => "Pirmetti a l'utenti di putìrisi canciari la sò pàggina di discussioni ntô mentri ca è bluccatu",
+'ipb-change-block'                => "Ri-blocca l'utilizzaturi cu sti mpustazzioni",
 'badipaddress'                    => 'Ndirizzu IP nun vàlidu.',
 'blockipsuccesssub'               => 'Bloccu esiquitu',
 'blockipsuccesstext'              => "[[Special:Contributions/$1|$1]] fu bluccatu.<br />
@@ -1736,14 +1952,18 @@ Pi maggiuri nfurmazzioni, talìa la [[Special:IPBlockList|lista di l'IP bluccati
 'ipb-unblock'                     => "Sblocca n'utenti o nu ndirizzu IP",
 'ipb-blocklist-addr'              => 'Alenca li blocchi attivi pi $1',
 'ipb-blocklist'                   => 'Alenca li blocchi attivi',
+'ipb-blocklist-contribs'          => 'Cuntribbuti di $1',
 'unblockip'                       => 'Sblocca ndirizzu IP',
 'unblockiptext'                   => "Usari lu mòdulu suttastanti pi ristituiri l'accessu n scrittura a un utenti o ndirizzu IP bluccatu.",
-'ipusubmit'                       => "Sblocca l'utenti",
+'ipusubmit'                       => 'Leva stu bloccu',
 'unblocked'                       => "L'utenti [[User:$1|$1]] hà statu sbluccatu",
 'unblocked-id'                    => 'Lu bloccu $1 hà statu cacciatu',
 'ipblocklist'                     => 'Utenti e nnirizzi IP bluccati',
 'ipblocklist-legend'              => "Atrova n'utenti bluccatu",
 'ipblocklist-username'            => 'Nomu utenti o nnirizzu IP:',
+'ipblocklist-sh-userblocks'       => "$1 li blocchi di l'utenti riggistrati",
+'ipblocklist-sh-tempblocks'       => '$1 li blocchi timpurànii',
+'ipblocklist-sh-addressblocks'    => '$1 li blocchi di li sìnguli IP',
 'ipblocklist-submit'              => 'Ricerca',
 'blocklistline'                   => '$1, $2 hà bluccatu $3 ($4)',
 'infiniteblock'                   => 'nfinitu',
@@ -1752,25 +1972,32 @@ Pi maggiuri nfurmazzioni, talìa la [[Special:IPBlockList|lista di l'IP bluccati
 'noautoblockblock'                => 'bloccu automàticu disabbilitatu',
 'createaccountblock'              => 'criazzioni account bluccata',
 'emailblock'                      => 'email bluccati',
+'blocklist-nousertalk'            => 'nun pò mudificari la sò pròpia pàggina di discussioni',
 'ipblocklist-empty'               => "L'alencu dî blocchi è vacanti.",
 'ipblocklist-no-results'          => 'Lu nnirizzu IP o nomu utenti richiestu nun è bluccatu.',
 'blocklink'                       => 'blocca',
 'unblocklink'                     => 'sblocca',
+'change-blocklink'                => 'cancia bloccu',
 'contribslink'                    => 'cuntribbuti',
 'autoblocker'                     => 'Bluccatu automaticamenti pirchì lu ndirizzu IP è cundivisu cu l\'utenti "[[User:$1|$1]]". Lu bloccu di l\'utenti $1 fu mpostu pi lu siquenti mutivu: "\'\'\'$2\'\'\'".',
 'blocklogpage'                    => 'Blocchi',
+'blocklog-fulllog'                => 'Riggistru cumpretu dî blocchi',
 'blocklogentry'                   => 'hà bluccatu [[$1]]; scadenza $2 $3',
+'reblock-logentry'                => 'Canciau li mpustazzioni dû bloccu pi [[$1]] cu na scadenza di $2 $3',
 'blocklogtext'                    => "Chistu è l'alencu di l'azzioni di bloccu e sbloccu utenti. Li ndirizzi IP bluccati automaticamenti nun sunu alincati. Cunzurtari l'[[Special:IPBlockList|alencu IP bluccati]] pi l'alencu dî ndirizzi e noma utenti lu cui bloccu è opirativu.",
 'unblocklogentry'                 => 'hà sbluccatu "$1"',
 'block-log-flags-anononly'        => 'sulu utenti anònimi',
 'block-log-flags-nocreate'        => 'criazzioni account bluccata',
 'block-log-flags-noautoblock'     => 'bloccu automàticu disattivatu',
 'block-log-flags-noemail'         => 'email bluccati',
+'block-log-flags-nousertalk'      => 'nun pò mudificari la sò pròpia pàggina di discussioni',
 'block-log-flags-angry-autoblock' => 'bloccu automàticu avanzatu attivu',
 'range_block_disabled'            => 'La pussibbilitati di bluccari ntervalli di ndirizzi IP è disattiva a lu mumentu.',
 'ipb_expiry_invalid'              => 'Durata o scadenza dû bloccu nun vàlida.',
 'ipb_expiry_temp'                 => 'Li blocchi dê nomi utenti ammucciati avìssiru èssiri nfiniti',
 'ipb_already_blocked'             => 'L\'utenti "$1" è già bluccatu',
+'ipb-needreblock'                 => '== Già bluccatu ==
+$1 è già bluccatu. Vòi caciari li mpustazzioni?',
 'ipb_cant_unblock'                => 'Erruri: Mpussìbbili attruvari lu bloccu cu ID $1. Putissi aviri già statu sbluccatu.',
 'ipb_blocked_as_range'            => 'Sbagghiu: Lu ndirizzu IP $1 nun è suggettu a bloccu ndividuali e non pò èssiri sbloccatu. Lu bloccu è attivu mmeci a liveddu dû ntirvallu $2, ca pò èssiri sbluccatu.',
 'ip_range_invalid'                => 'Ntervallu di ndirizzi IP nun vàlidu.',
@@ -1781,6 +2008,7 @@ Pi maggiuri nfurmazzioni, talìa la [[Special:IPBlockList|lista di l'IP bluccati
 'proxyblocksuccess'               => 'Esiquitu.',
 'sorbsreason'                     => 'Lu tò ndirizzu IP è alincatu comu proxy apertu ntâ lista DNSBL.',
 'sorbs_create_account_reason'     => 'Lu tò ndirizzu IP è alincatu comu open proxy ntâ DNSBL. Nun poi criari un utenti.',
+'cant-block-while-blocked'        => 'Nun putiti bluccari àutri utenti ntô mentri ca vui stissi siti bluccati.',
 
 # Developer tools
 'lockdb'              => 'Blocca lu database',
@@ -1801,9 +2029,9 @@ Pi maggiuri nfurmazzioni, talìa la [[Special:IPBlockList|lista di l'IP bluccati
 'databasenotlocked'   => 'Lu database nun è bluccatu.',
 
 # Move page
-'move-page'               => 'Spustamentu di $1',
-'move-page-legend'        => 'Sposta la pàggina',
-'movepagetext'            => "Usannu lu mòdulu ccà sutta vui canciati lu nomu dâ pàggina, e spustati tutta la sò storia versu la pàggina nova. Lu tìtulu vecchiu addiventa na pàggina di ''redirect'' versu lu tìtulu novu.
+'move-page'                    => 'Spustamentu di $1',
+'move-page-legend'             => 'Sposta la pàggina',
+'movepagetext'                 => "Usannu lu mòdulu ccà sutta vui canciati lu nomu dâ pàggina, e spustati tutta la sò storia versu la pàggina nova. Lu tìtulu vecchiu addiventa na pàggina di ''redirect'' versu lu tìtulu novu.
 Li liami â pàggina vecchia nun càncianu.
 Assicuràtivi ca lu spustamentu nun havi criatu [[Special:DoubleRedirects|redirect duppi]] o [[Special:BrokenRedirects|redirect rumputi]]. Vui siti rispunzàbbili dî liami chi avìssiru a puntari â pàggina giusta.
 
@@ -1812,47 +2040,60 @@ Chistu signìfica chi vui putiti rinuminari la pàggina cu lu nomu vecchiu si av
 
 '''Accura!'''
 Chistu pò èssiri nu canciamentu dràsticu pi na pàggina pupulari; aviti a èssiri sicuri di capiri li cunziquenzi prima di cuntinuari.",
-'movepagetalktext'        => "La pàggina di discussioni assuciata, siddu esisti, veni spustata automaticamenti nzèmmula, '''a menu chi:'''
+'movepagetalktext'             => "La pàggina di discussioni assuciata, siddu esisti, veni spustata automaticamenti nzèmmula, '''a menu chi:'''
 *Na pàggina nun-vacanti di discussioni già esisti cu lu nomu novu,
 *Hai disilizziunatu lu quatratu ccà sutta.
 
 Nta sti casi, tu hai a spustari o agghiùnciri manuarmenti la pàggina di discussioni.",
-'movearticle'             => 'Sposta la pàggina',
-'movenotallowed'          => 'Nun hai li pirmessi nicissari a lu spustamentu dê pàggini.',
-'newtitle'                => 'Cu lu tìtulu novu di',
-'move-watch'              => 'Talìa sta pàggina',
-'movepagebtn'             => 'Sposta la pàggina',
-'pagemovedsub'            => 'Lu spustamentu riniscìu.',
-'movepage-moved'          => '<big>\'\'\'"$1" fu spustata a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "Na pàggina cu stu nomu esisti già, oppuru lu nomu scigghiutu nun è vàlidu. Scègghiri n'àutru tìtulu.",
-'cantmove-titleprotected' => 'Nun putiti spustari la pàggina pirchì lu tìtulu novu fu prutiggiutu pi mpidìrini la criazzioni',
-'talkexists'              => "'''La pàggina hà statu spustata currettamenti, ma nun hà statu pussìbbili spustari la pàggina di discussioni pirchì nn'esisti già n'àutra cu lu tìtulu novu. Ntigrari manuarmenti li cuntinuti dî dui pàggini.'''",
-'movedto'                 => 'spustata a',
-'movetalk'                => 'Sposta puru la pàggina di discussioni, eventuarmenti.',
-'move-subpages'           => 'Sposta tutti li suttapàggini, si è pussìbbili',
-'move-talk-subpages'      => 'Sposta tutti li suttapàggini di discussioni, si è pussìbbili',
-'movepage-page-exists'    => 'La pàggina $1 esisti ggià e nun pò èssiri autumaticamenti suprascrivuta.',
-'movepage-page-moved'     => 'La pàggina $1 fu spustata a $2.',
-'movepage-page-unmoved'   => 'La pàggina $1 nun pò èssiri spustata a $2.',
-'movepage-max-pages'      => 'Vinni spustatu lu nùmmuru màssimu di $1 {{PLURAL:$1|pàggina|pàggini}} e non si ponnu cchiù spustari àutri pàggini autumàticamenti.',
-'1movedto2'               => '[[$1]] spustatu a [[$2]]',
-'1movedto2_redir'         => '[[$1]] spustatu a [[$2]] supra rinnirizzamentu',
-'movelogpage'             => 'Spustamenti',
-'movelogpagetext'         => "Chistu è l'alencu dî pàggini spustati.",
-'movereason'              => 'Pi stu mutivu',
-'revertmove'              => 'riprìstina',
-'delete_and_move'         => 'Scancella e sposta',
-'delete_and_move_text'    => '==Richiesta di cancillazzioni==
+'movearticle'                  => 'Sposta la pàggina',
+'movenologin'                  => 'Accessu nun effittuatu',
+'movenologintext'              => "Lu spustamentu dî pàggini è cunzintitu sulu a l'utenti riggistrati c'hannu esiquitu l'[[Special:UserLogin|accessu]] a lu situ.",
+'movenotallowed'               => 'Nun hai li pirmessi nicissari a lu spustamentu dê pàggini.',
+'movenotallowedfile'           => "Nun ci su' li pirmessi nicissàrii pi spustari file.",
+'cant-move-user-page'          => 'Nun aviti lu pirmissu nicissàriu pi spustari li pàggini utenti.',
+'cant-move-to-user-page'       => 'Nun aviti li pirmessi nicessàrii pô spustamentu dâ pàggina supra na pàggina utenti (cu eccizzioni di na suttapàggina utenti).',
+'newtitle'                     => 'Cu lu tìtulu novu di',
+'move-watch'                   => 'Talìa sta pàggina',
+'movepagebtn'                  => 'Sposta la pàggina',
+'pagemovedsub'                 => 'Lu spustamentu riniscìu.',
+'movepage-moved'               => '<big>\'\'\'"$1" fu spustata a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Vinni criatu nu riinnirizzamentu.',
+'movepage-moved-noredirect'    => 'La criazzioni di nu riinnirizzamentu vinni scancillata.',
+'articleexists'                => "Na pàggina cu stu nomu esisti già, oppuru lu nomu scigghiutu nun è vàlidu. Scègghiri n'àutru tìtulu.",
+'cantmove-titleprotected'      => 'Nun putiti spustari la pàggina pirchì lu tìtulu novu fu prutiggiutu pi mpidìrini la criazzioni',
+'talkexists'                   => "'''La pàggina hà statu spustata currettamenti, ma nun hà statu pussìbbili spustari la pàggina di discussioni pirchì nn'esisti già n'àutra cu lu tìtulu novu. Ntigrari manuarmenti li cuntinuti dî dui pàggini.'''",
+'movedto'                      => 'spustata a',
+'movetalk'                     => 'Sposta puru la pàggina di discussioni, eventuarmenti.',
+'move-subpages'                => 'Sposta tutti li suttapàggini, si è pussìbbili',
+'move-talk-subpages'           => 'Sposta tutti li suttapàggini di discussioni, si è pussìbbili',
+'movepage-page-exists'         => 'La pàggina $1 esisti ggià e nun pò èssiri autumaticamenti suprascrivuta.',
+'movepage-page-moved'          => 'La pàggina $1 fu spustata a $2.',
+'movepage-page-unmoved'        => 'La pàggina $1 nun pò èssiri spustata a $2.',
+'movepage-max-pages'           => 'Vinni spustatu lu nùmmuru màssimu di $1 {{PLURAL:$1|pàggina|pàggini}} e non si ponnu cchiù spustari àutri pàggini autumàticamenti.',
+'1movedto2'                    => '[[$1]] spustatu a [[$2]]',
+'1movedto2_redir'              => '[[$1]] spustatu a [[$2]] supra rinnirizzamentu',
+'move-redirect-suppressed'     => 'riinnirizzamentu scancillatu',
+'movelogpage'                  => 'Spustamenti',
+'movelogpagetext'              => "Chistu è l'alencu dî pàggini spustati.",
+'movereason'                   => 'Pi stu mutivu',
+'revertmove'                   => 'riprìstina',
+'delete_and_move'              => 'Scancella e sposta',
+'delete_and_move_text'         => '==Richiesta di cancillazzioni==
 
 La pàggina di distinazzioni "[[:$1]]" asisti già. S\'addisìa cancillàrila pi rènniri pussìbbili lu spustamentu?',
-'delete_and_move_confirm' => 'Sì, suvrascrivi la pàggina asistenti',
-'delete_and_move_reason'  => 'Cancillata pi rènniri pussìbbili lu spustamentu',
-'selfmove'                => 'Lu tìtulu di distinazzioni nziritu è agguali a chiddu di pruvinenza; mpossibbili spustari la pàggina su idda stissa.',
-'immobile_namespace'      => 'Lu novu tìtulu currispunni a na pàggina spiciali; mpussìbbili spustari pàggini nta ddu namespace.',
-'imagenocrossnamespace'   => 'Nun pòi spustari na mmàggini fora dû namespace Mmàggini.',
-'imagetypemismatch'       => 'La estensioni nova dû file cun currispunni â sò estensioni riali',
-'imageinvalidfilename'    => 'Lu nomu dû file di distinazzioni nun è validu',
-'fix-double-redirects'    => 'Aggiorna tutti li redirect chi puntanu ô titulu urigginali',
+'delete_and_move_confirm'      => 'Sì, suvrascrivi la pàggina asistenti',
+'delete_and_move_reason'       => 'Cancillata pi rènniri pussìbbili lu spustamentu',
+'selfmove'                     => 'Lu tìtulu di distinazzioni nziritu è agguali a chiddu di pruvinenza; mpossibbili spustari la pàggina su idda stissa.',
+'immobile-source-namespace'    => 'Non pòi spustari li pàggini nto namespace "$1"',
+'immobile-target-namespace'    => 'Nun pòi spustari li pàggini ntô namespace "$1"',
+'immobile-target-namespace-iw' => "L'interwiki link nun è n'ubbiettivu bonu pi spustari la pòggina.",
+'immobile-source-page'         => 'Sta pàggina nun pò èssiri spustata.',
+'immobile-target-page'         => 'Nun pòi spustari nti stu tìtulu.',
+'imagenocrossnamespace'        => 'Nun pòi spustari na mmàggini fora dû namespace Mmàggini.',
+'imagetypemismatch'            => 'La estensioni nova dû file cun currispunni â sò estensioni riali',
+'imageinvalidfilename'         => 'Lu nomu dû file di distinazzioni nun è validu',
+'fix-double-redirects'         => 'Aggiorna tutti li redirect chi puntanu ô titulu urigginali',
+'move-leave-redirect'          => 'Lassa darreri nu redirect',
 
 # Export
 'export'            => 'Esporta pàggini',
@@ -1860,7 +2101,7 @@ La pàggina di distinazzioni "[[:$1]]" asisti già. S\'addisìa cancillàrila pi
 
 P'espurtari li pàggini innicari li tìtuli ntâ casella di testu suttastanti, unu pi riga, e spicificari siddu s'addisìa attèniri la virsioni currenti e tutti li virsioni pricidenti, cu li dati dâ cronoluggìa dâ pàggina, oppuru surtantu l'ùrtima virsioni e li dati currispunnenti a l'ùrtimu canciamentu. 
 
-Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] p'espurtari \"[[{{MediaWiki:Mainpage}}]]\".",
+Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] p'espurtari \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => 'Ncludi sulu la rivisioni attuali, nun la ntera cronoluggìa',
 'exportnohistory'   => "---- '''Nota:''' l'espurtazzioni dâ ntera cronoluggìa dî pàggini attraversu sta nterfaccia hà stata disattivata pi mutivi ligati a li pristazzioni dû sistema.",
 'export-submit'     => 'Espurtazzioni',
@@ -1874,7 +2115,8 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 'allmessagesname'           => 'Nomu',
 'allmessagesdefault'        => 'Testu pridifinitu',
 'allmessagescurrent'        => 'Testu attuali',
-'allmessagestext'           => "Chista è na lista di missaggi di sistema chi s'attròvanu sutta MediaWiki:''nomu''.",
+'allmessagestext'           => "Chista è na lista di missaggi di sistema chi s'attròvanu sutta MediaWiki:''nomu''.
+Visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] si voi cuntribbuiri â localizzazioni generica di MediaWiki.",
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' nun è suppurtatu pirchì lu flag '''\$wgUseDatabaseMessages''' nun è attivu.",
 'allmessagesfilter'         => 'Filtru supra li missaggi:',
 'allmessagesmodified'       => 'Ammustra sulu chiddi mudificati',
@@ -1892,9 +2134,12 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 'import'                     => 'Mporta pàggini',
 'importinterwiki'            => 'Mpurtazzioni transwiki',
 'import-interwiki-text'      => "Silizziunari un pruggettu wiki e lu tìtulu dâ pàggina a mpurtari. Li dati di pubbricazzioni e li noma di l'autura dî vari virsioni sunnu sarvati. Tutti l'opirazzioni di mpurtazzioni trans-wiki sunnu riggistrati ntô [[Special:Log/import|log di mpurtazzioni]].",
+'import-interwiki-source'    => 'Surgenti wiki/pàggina:',
 'import-interwiki-history'   => 'Copia la ntera cronoluggìa di sta pàggina',
 'import-interwiki-submit'    => 'Mporta',
 'import-interwiki-namespace' => 'Trasfirisci li pàggini ntô namespace:',
+'import-upload-filename'     => 'Nomu file:',
+'import-comment'             => 'Oggettu:',
 'importtext'                 => "Pi favuri, esporta lu file dâ wiki d'orìggini usannu l'utility Speciale:Export, sàrvalu supra lu tò discu e carrìcalu ccà",
 'importstart'                => 'Mpurtazzioni dî pàggini n cursu...',
 'import-revision-count'      => '{{PLURAL:$1|na rivisioni mpurtata|$1 rivisioni mpurtati}}',
@@ -1930,7 +2175,7 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 # Tooltip help for the actions
 'tooltip-pt-userpage'             => 'La tò pàggina utenti',
 'tooltip-pt-anonuserpage'         => 'La pàggina utenti di stu ndirizzu IP',
-'tooltip-pt-mytalk'               => 'La mè pàggina di discussioni',
+'tooltip-pt-mytalk'               => "La to' pàggina di discussioni",
 'tooltip-pt-anontalk'             => 'Discussioni supra li canciamenti fatti di stu ndirizzu IP',
 'tooltip-pt-preferences'          => 'Li mè prifirenzi',
 'tooltip-pt-watchlist'            => 'La lista dî pàggini ca stai tinennu sutta ossirvazzioni',
@@ -1987,6 +2232,8 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 'tooltip-watch'                   => "Agghiunci sta pàggina â lista di l'ossirvati spiciali",
 'tooltip-recreate'                => 'Ricrea la pàggina puru siddu hà statu cancillata',
 'tooltip-upload'                  => 'Ncigna carricamentu',
+'tooltip-rollback'                => '"Rollback" annulla li canci di l\'ùrtinu cuntribbuturi â sta pâggina cu nu sulu clic.',
+'tooltip-undo'                    => '"Annulla" pirmetti di annullari sta mudìfica e grapi lu mòdulu di mudifica ntâ mudalità di antiprima. Pirmetti di nsiriri na mutivazziopni nti l\'uggettu dâ mudifica.',
 
 # Stylesheets
 'common.css'   => "/* Li stili CSS nziriti ccà s'àpplicanu a tutti li skin */",
@@ -2002,12 +2249,12 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 'notacceptable'     => 'Lu server wiki nun pò furniri dati nta un furmatu liggìbbili dû tò client.',
 
 # Attribution
-'anonymous'        => 'unu o cchiù utenti anònimi di {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utenti anònimu|Utenti anònimi}} di {{SITENAME}}',
 'siteuser'         => '$1, utenti di {{SITENAME}}',
 'lastmodifiedatby' => "Sta pàggina hà statu canciata pi l'ùrtima vota lu $2, $1 di $3.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basatu supra lu travagghiu di $1.',
 'others'           => 'àutri',
-'siteusers'        => '$1, utenti di {{SITENAME}}',
+'siteusers'        => '$1, {{PLURAL:$2|utenti|utenti}} di {{SITENAME}}',
 'creditspage'      => 'Li autura dâ pàggina',
 'nocredits'        => 'Nudda nfurmazzioni supra li crèditi dispunìbbili pi sta pàggina.',
 
@@ -2027,6 +2274,16 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 'numauthors'     => "Nùmmuru d'autura distinti (artìculu): $1",
 'numtalkauthors' => "Nùmmuru d'autura distinti (pàggina di discussioni): $1",
 
+# Skin names
+'skinname-standard'    => 'Classicu',
+'skinname-nostalgia'   => 'Nustargìa',
+'skinname-cologneblue' => 'Cologne Blu',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Sìmprici',
+'skinname-modern'      => 'Mudernu',
+
 # Math options
 'mw_math_png'    => "Ammustra sempri 'n PNG",
 'mw_math_simple' => 'HTML siddu veru sìmplici, oppuru PNG',
@@ -2047,11 +2304,12 @@ Nta st'ùrtimu casu si pò macari utilizzari un culligamentu, p'asempiu [[{{ns:s
 'markedaspatrollederror-noautopatrol' => 'Nun si disponi dî pirmissi nicissari pi signari li propi canciamenti comu virificati.',
 
 # Patrol log
-'patrol-log-page'   => 'Canciamenti virificati',
-'patrol-log-header' => 'Ccassutta sunnu elencati li virìfichi dî canci.',
-'patrol-log-line'   => 'hà signatu la $1 di $2 comu virificata $3',
-'patrol-log-auto'   => '(virìfica automàtica)',
-'patrol-log-diff'   => 'virsioni $1',
+'patrol-log-page'      => 'Canciamenti virificati',
+'patrol-log-header'    => 'Ccassutta sunnu elencati li virìfichi dî canci.',
+'patrol-log-line'      => 'hà signatu la $1 di $2 comu virificata $3',
+'patrol-log-auto'      => '(virìfica automàtica)',
+'patrol-log-diff'      => 'virsioni $1',
+'log-show-hide-patrol' => '$1 log di li canciamenti virificati',
 
 # Image deletion
 'deletedrevision'                 => 'Rivisioni pricidenti, cancillata: $1.',
@@ -2068,6 +2326,9 @@ $1',
 'previousdiff' => '� Diffirenza pricidenti',
 'nextdiff'     => 'Diffirenza siquenti →',
 
+# Visual comparison
+'visual-comparison' => 'Cunfrontu visuali',
+
 # Media information
 'mediawarning'         => "'''Accura''': Stu file pò cuntèniri còdici malignu, esiquènnulu lu vostru sistema putisi vèniri cumprumissu. <hr />",
 'imagemaxsize'         => 'Diminzioni màssima dî mmàggini supra li rilativi pàggini di o:',
@@ -2080,10 +2341,12 @@ $1',
 'show-big-image'       => 'Virsioni a àuta risuluzzioni',
 'show-big-image-thumb' => "<small>Diminzioni di st'antiprima: $1 × $2 pixel</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Gallarìa dî file novi',
 'imagelisttext'         => "Di sèquitu veni prisintata na lista di '''$1''' file urdinat{{PLURAL:$1|u|i}} pi $2.",
 'newimages-summary'     => 'Sta pàggina spiciali ammustra li file caricati di cchiù picca tempu.',
+'newimages-legend'      => 'Nomu file',
+'newimages-label'       => "Nomu file (o nu pezzu d'iddu):",
 'showhidebots'          => '($1 li bot)',
 'noimages'              => 'Nenti a vìdiri.',
 'ilsubmit'              => "Va' cerca",
@@ -2296,6 +2559,18 @@ Li lijami succissivi, supra la stissa riga, sunnu cunzidirati comu eccizzioni (p
 'exif-lightsource-24'  => 'Làmpara di studiu ISO a lu tungstenu',
 'exif-lightsource-255' => 'Àutra surgenti luminusa',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Lu flash non scattau',
+'exif-flash-fired-1'    => 'Flash scattatu',
+'exif-flash-return-0'   => 'nudda funzioni di ndividuazzioni dâ turnata dâ luci strobboscòpica',
+'exif-flash-return-2'   => 'luci strobboscòpica di riturnata non ndividuata',
+'exif-flash-return-3'   => 'luci strobboscòpica di riturnata ndividuata',
+'exif-flash-mode-1'     => 'attivazzioni flash fattu câ forza',
+'exif-flash-mode-2'     => 'rimuzzioni flash fattu câ forza',
+'exif-flash-mode-3'     => 'modu automàticu',
+'exif-flash-function-1' => 'Astuta flash',
+'exif-flash-redeye-1'   => 'modu menu occhi russi',
+
 'exif-focalplaneresolutionunit-2' => 'puseri',
 
 'exif-sensingmethod-1' => 'Nun difinitu',
@@ -2429,24 +2704,10 @@ Stu còdici di cunferma scadi automaticamenti a li $4.',
 
 'unit-pixel' => 'px',
 
-# HTML dump
-'redirectingto' => 'Rinnirizzamentu a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "S'addisìa puliri la cache di sta pàggina? $1",
 'confirm_purge_button' => 'Cunferma',
-
-# AJAX search
-'searchcontaining' => "Circata di l'artìculi ca cuntèninu ''$1''.",
-'searchnamed'      => "Circata d'artìculi ca si chiàmanu ''$1''.",
-'articletitles'    => "Ricerca di l'artìculi ca accumènzanu cu ''$1''",
-'hideresults'      => 'Ammuccia li risurtati',
-'useajaxsearch'    => 'Usa la ricerca AJAX',
-
-# Separators for various lists, etc.
-'catseparator'    => '|',
-'comma-separator' => ',&#32;',
-'colon-separator' => ':&#32;',
+'confirm-purge-top'    => "S'addisìa puliri la cache di sta pàggina?",
+'confirm-purge-bottom' => "Pulizziari la cache di na pàggina pirmetti d'ammustrari la sô virsioni cchiù nova.",
 
 # Multipage image navigation
 'imgmultipageprev' => '� pàggina pricidenti',
@@ -2466,10 +2727,10 @@ Stu còdici di cunferma scadi automaticamenti a li $4.',
 'table_pager_empty'        => 'Nuddu risurtatu',
 
 # Auto-summaries
-'autosumm-blank'   => 'Cuntinutu cancillatu',
+'autosumm-blank'   => 'Pàggina svacantata',
 'autosumm-replace' => "Pàggina sustituita cu '$1'",
 'autoredircomment' => 'Rinnirizzamentu â pàggina [[$1]]',
-'autosumm-new'     => 'Pàggina nova: $1',
+'autosumm-new'     => "Criata pàggina cu '$1'",
 
 # Live preview
 'livepreview-loading' => "Carricamentu 'n cursu...",
@@ -2510,6 +2771,7 @@ Stu còdici di cunferma scadi automaticamenti a li $4.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag estensioni scanusciutu: "$1"',
+'duplicate-defaultsort' => 'Accura: la chiavi priddifinuta d\'urdinamentu "$2" si sciarrìa cu chidda d\'antura "$1".',
 
 # Special:Version
 'version'                          => 'virsioni', # Not used as normal message but as header for the special page itself
@@ -2538,13 +2800,13 @@ Stu còdici di cunferma scadi automaticamenti a li $4.',
 'filepath-submit'  => 'Pircorsu',
 'filepath-summary' => 'Sta pàggina spiciali rimanna arredi lu traggittu cumpretu di nu file. Li mmàggini sù ammustrati cu la cchiù àuta risoluzzioni dispunìbbili, pi l\'àutri tipi di file parti direttamenti lu prugramma assuciatu.
 
-Mèttiri lu nomu dû file senza lu prifissu "{{ns:image}}:"',
+Mèttiri lu nomu dû file senza lu prifissu "{{ns:file}}:"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Circata dê file duppiuni',
-'fileduplicatesearch-summary'  => "Circata di pussìbbili duppiuni dû file 'n basi ô valuru di ''hash''.
+'fileduplicatesearch-summary'  => "Circata di pussìbbili dupppiuni dû file 'n basi ô valuri di ''hash''.
 
-Nziriri lu nomu dû file senza lu prifissu \"{{ns:image}}:\"",
+Nziriri lu nomu di lu file senza lu prifissu \"{{ns:file}}:\"",
 'fileduplicatesearch-legend'   => 'Circata di nu duppiuni',
 'fileduplicatesearch-filename' => 'Nomu dû file:',
 'fileduplicatesearch-submit'   => 'Circata',
@@ -2574,4 +2836,13 @@ Nziriri lu nomu dû file senza lu prifissu \"{{ns:image}}:\"",
 'blankpage'              => 'Pàggina vacanti',
 'intentionallyblankpage' => 'Sta pàggina è lassata vacanti apposta e è usata pi benchmark, ecc.',
 
+# External image whitelist
+'external_image_whitelist' => "#lassa sta riga cum'è ora, senza tuccàrila<pre>
+#Nzirisci li frammenti dî sprissioni rigulari (solu la parti ca và tra //) di sècutu
+#Chisti hann'a currispùnniri cu li URL di mmàggini esterni (hotlinked)
+#Chiddi ca currispùnnunu vènunu appoi ammustrati comu mmàggini, casu cuntràriu s'ammustra sulu nu culligamentu a la mmàggini
+#Li lìnii ca accumincianu cu # sunnu di cummentu
+
+#Nzirisci supr'a sta riga tutti li frammenti di regex. Lassa sta riga cum'è ora, senza tuccàrila</pre>",
+
 );
diff --git a/languages/messages/MessagesSco.php b/languages/messages/MessagesSco.php
index 52672c2a..df4d4bbe 100644
--- a/languages/messages/MessagesSco.php
+++ b/languages/messages/MessagesSco.php
@@ -4,8 +4,10 @@
  * @ingroup Language
  * @file
  *
+ * @author Derek Ross
  * @author Malafaya
  * @author OchAyeTheNoo
+ * @author Omnipaedista
  * @author Urhixidur
  * @author Ushanka
  * @author sco.wikipedia.org editors
@@ -50,16 +52,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'Hide yer ain edits frae yer watchleet',
 'tog-watchlisthidebots'       => 'Hide bot edits frae yer watchleet',
 'tog-watchlisthideminor'      => 'Dinna shaw sma edits on ma watchleet',
+'tog-watchlisthideliu'        => 'Hide edits by loggit in uisers frae the watchleet',
+'tog-watchlisthideanons'      => 'Hide edits by nameless uisers frae the watchleet',
 'tog-ccmeonemails'            => 'Gie me copies o emails A write tae ither uisers',
 'tog-diffonly'                => 'Dinna shaw page contents ablo diffs',
 'tog-showhiddencats'          => 'Shaw hidden categories',
+'tog-norollbackdiff'          => 'Lave oot diff efter rowin back',
 
 'underline-always'  => 'Aye',
 'underline-never'   => 'Niver',
 'underline-default' => 'Brouser defaut',
 
-'skinpreview' => '(First Leuk)',
-
 # Dates
 'sunday'        => 'Sunday',
 'monday'        => 'Monanday',
@@ -86,7 +89,7 @@ $messages = array(
 'september'     => 'September',
 'october'       => 'October',
 'november'      => 'November',
-'december'      => 'Dizember',
+'december'      => 'December',
 'january-gen'   => 'Januar',
 'february-gen'  => 'February',
 'march-gen'     => 'March',
@@ -113,12 +116,18 @@ $messages = array(
 'dec'           => 'Diz',
 
 # Categories related messages
-'pagecategories'        => '{{PLURAL:$1|Category|Categories}}',
-'category_header'       => 'Pages in category "$1"',
-'subcategories'         => 'Subcategories',
-'category-media-header' => 'Eetems in category "$1"',
-'category-empty'        => "''This category haes no pages or eetems at the meenit.''",
-'hidden-categories'     => '{{PLURAL:$1|Hidden categorie|Hidden categories}}',
+'pagecategories'                 => '{{PLURAL:$1|Category|Categories}}',
+'category_header'                => 'Pages in category "$1"',
+'subcategories'                  => 'Subcategories',
+'category-media-header'          => 'Eetems in category "$1"',
+'category-empty'                 => "''This category haes no pages or eetems at the meenit.''",
+'hidden-categories'              => '{{PLURAL:$1|Hidden categorie|Hidden categories}}',
+'category-subcat-count'          => '{{PLURAL:$2|This category juist haes the follaein subcategory.|This category haes the follaein {{PLURAL:$1|subcategory|$1 subcategories}}, oot o $2 awthegither.}}',
+'category-subcat-count-limited'  => 'This category haes the follaein {{PLURAL:$1|subcategory|$1 subcategories}}.',
+'category-article-count'         => '{{PLURAL:$2|This category contains the ae follaein page.|The follaein {{PLURAL:$1|page|$1 pages}} is in this category, oot o $2 total.}}',
+'category-article-count-limited' => 'The follaein {{PLURAL:$1|page|$1 pages}} is in this category.',
+'category-file-count'            => '{{PLURAL:$2|This category hauds juist the ae follaein file.|The follaein {{PLURAL:$1|file|$1 files}}s is in this category, oot o $2 total.}}',
+'category-file-count-limited'    => 'The follaein {{PLURAL:$1|file is|$1 files is}} in this category.',
 
 'mainpagetext'      => "<big>'''MediaWiki haes been installit wi speed.'''</big>",
 'mainpagedocfooter' => "Aks the [http://meta.wikimedia.org/wiki/Help:Contents Uiser's Manual] for speirins aboot using the wiki saftware.
@@ -145,7 +154,7 @@ $messages = array(
 'mytalk'         => 'Ma collogue',
 'anontalk'       => 'Collogue for this IP',
 'navigation'     => 'Navigation',
-'and'            => 'an',
+'and'            => '&#32;an',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -166,12 +175,14 @@ $messages = array(
 'permalink'         => 'Permanent airtin',
 'print'             => 'Prent',
 'edit'              => 'Edit',
+'create'            => 'Mak',
 'editthispage'      => 'Edit this page',
+'create-this-page'  => 'Mak this page',
 'delete'            => 'Delete',
 'deletethispage'    => 'Delete this page',
 'undelete_short'    => 'Undelete {{PLURAL:$1|ane edit|$1 edits}}',
 'protect'           => 'Fend',
-'protect_change'    => 'chynge fend',
+'protect_change'    => 'chynge',
 'protectthispage'   => 'Fend this page',
 'unprotect'         => 'Loose fend',
 'unprotectthispage' => 'Loose the fend for this page',
@@ -180,14 +191,14 @@ $messages = array(
 'talkpagelinktext'  => 'Collogue',
 'specialpage'       => 'Byordinar Page',
 'personaltools'     => 'Personal tuils',
-'postcomment'       => 'Eik a jottin',
+'postcomment'       => 'Eik a message',
 'articlepage'       => 'Leuk at content page',
 'talk'              => 'Collogue',
 'views'             => 'Views',
 'toolbox'           => 'Tuilkist',
 'userpage'          => 'View uiser page',
 'projectpage'       => 'View project page',
-'imagepage'         => 'Leuk at eimage page',
+'imagepage'         => 'look ower image page',
 'mediawikipage'     => 'View message page',
 'templatepage'      => 'View template page',
 'viewhelppage'      => 'View help page',
@@ -206,8 +217,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Aboot {{SITENAME}}',
 'aboutpage'            => 'Project:Aboot',
-'bugreports'           => 'Mishanter reports',
-'bugreportspage'       => 'Project:Bug reports',
 'copyright'            => 'Aa text is available unner $1',
 'copyrightpagename'    => '{{SITENAME}} copyricht',
 'copyrightpage'        => '{{ns:project}}:Copyrichts',
@@ -230,9 +239,7 @@ $messages = array(
 
 'badaccess'        => 'Permeission mishanter',
 'badaccess-group0' => 'WARNIN: Ye arnae alloued tae dae whit you hae requestit!',
-'badaccess-group1' => "The action ye hae requestit is limitit tae uisers in the group: ''$1''.",
-'badaccess-group2' => "The action ye hae requestit can limitit tae uisers in ane o the groups: ''$1''.",
-'badaccess-groups' => "The action ye hae requestit is limitit tae uisers in ane o the groups:  ''$1''.",
+'badaccess-groups' => 'The action ye hae requestit is limitit tae uisers in {{PLURAL:$2|the group|ane o the groups}}: $1.',
 
 'versionrequired'     => 'Version $1 of MediaWiki requirit',
 'versionrequiredtext' => 'Version $1 o MediaWiki is requirit tae uise this page. Tak a keek at the [[Special:Version|version page]].',
@@ -246,6 +253,7 @@ $messages = array(
 'editsection'             => 'edit',
 'editold'                 => 'edit',
 'viewsourceold'           => 'ken soorce',
+'viewsourcelink'          => 'Scance ower the source',
 'editsectionhint'         => 'Edit section: $1',
 'toc'                     => 'Table o contents',
 'showtoc'                 => 'shaw',
@@ -255,16 +263,18 @@ $messages = array(
 'restorelink'             => '{{PLURAL:$1|one delete edit|$1 delete edits}}',
 'feedlinks'               => 'Feed:',
 'feed-invalid'            => "This feeds subscrieve's teep isnae habile.",
+'feed-unavailable'        => 'Syndication feeds isna available',
 'site-rss-feed'           => '$1 RSS Feed',
 'site-atom-feed'          => '$1 Atom Feed',
 'page-rss-feed'           => '"$1" RSS Feed',
 'page-atom-feed'          => '"$1" Atom Feed',
+'red-link-title'          => '$1 (page disna exist)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Page',
 'nstab-user'      => 'Uiser page',
 'nstab-media'     => 'Eetem page',
-'nstab-special'   => 'Byordinar',
+'nstab-special'   => 'Byordinar page',
 'nstab-project'   => 'Project page',
 'nstab-image'     => 'Eimage',
 'nstab-mediawiki' => 'Message',
@@ -274,7 +284,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Nae sic action',
-'nosuchactiontext'  => "The action specifiee'd bi the URL isna recognised bi the wiki",
+'nosuchactiontext'  => "The action specifiee'd bi the URL isna recognised
+Ye micht hae mistyped the URL, or follaed a wrang link
+This micht forby be caused by a bug in the saftware uised by {{SITENAME}}.",
 'nosuchspecialpage' => 'Nae sic byordinar page',
 'nospecialpagetext' => "<big>'''Ye hae requestit an invalid byordinar page.'''</big>
 
@@ -285,7 +297,7 @@ A leet o valid byordinar pages can be funnd at [[Special:SpecialPages|{{int:spec
 'databaseerror'        => 'Database error',
 'dberrortext'          => 'A database query syntax error haes occurt. This micht indicate a bug in the saftware. The last attemptit database query wis: <blockquote><tt>$1</tt></blockquote> frae athin function "<tt>$2</tt>". MySQL returned error "<tt>$3: $4</tt>".',
 'dberrortextcl'        => 'A database query syntax error haes occurt. The last attemptit database query wis: "$1" frae athin function "$2". MySQL returned error "$3: $4".',
-'noconnect'            => 'Sorry! The wiki is experiencin some technical difficulties, and canna contact the database server. <br /> $1',
+'noconnect'            => 'Sorry! The wiki is experiencin some technical difficulties, and canna contact the database server.<br /> $1',
 'nodb'                 => 'Cuidna select database $1',
 'cachederror'          => 'The follaein is a cached copy o the requestit page, an micht no be up tae date.',
 'laggedslavemode'      => 'Warning: Page micht nae contain recent updates',
@@ -295,6 +307,12 @@ A leet o valid byordinar pages can be funnd at [[Special:SpecialPages|{{int:spec
 likely for routine database maintenance; efter that it'll be back tae normal.
 The adminstration that lockit it gied this explanation:
 $1",
+'missing-article'      => 'The database didna find the text o a page that it shuid hae fund, cawed "$1" $2.
+
+Maistly this is caused by follaein an ootdated diff or history link tae a page that haes been delete.
+
+If this isna the case, you micht hae fund a bug in the saftware.
+Please lat an [[Special:ListUsers/sysop|administrator]] ken aboot this, makin note o the URL.',
 'readonly_lag'         => 'The database haes been autaematically lockit while the sclave database servers catch up tae the maister',
 'internalerror'        => 'Internal mishanter',
 'internalerror_info'   => 'Internal error: $1',
@@ -310,7 +328,6 @@ $1",
 'cannotdelete'         => "Cuidna delete the page or eimage specifee'd. (It micht hae aareadies been delete bi some ither bodie.)",
 'badtitle'             => 'Bad teitle',
 'badtitletext'         => 'The requestit page teitle wis invalid, tuim, or a wranglie airtit inter-leid or inter-wiki teitle. It mibbe haes ane or mair chairacters that canna be uised in teitles.',
-'perfdisabled'         => 'Sorry! This featur haes been temporarily disabled sith it slaws the database doun tae the pynt that naebodie can uise the wiki.',
 'perfcached'           => 'The follaeing data is cached an michtna be richt up tae date:',
 'perfcachedts'         => 'The followin data is cached, an wis hindermaist chynged $1.',
 'querypage-no-updates' => 'Updates for this page ar disablit at the meenit. Data here wilnae be refreshit at the meenit.',
@@ -330,7 +347,7 @@ Aks: $2',
 $2',
 'namespaceprotected'   => "Ye dinna hae permeession tae edit pages in the '''$1''' namespace.",
 'customcssjsprotected' => "Ye dinna hae permeession tae edit this page, sin it hauds anither uiser's personal settins.",
-'ns-specialprotected'  => 'Pages in the {{ns:special}} namespace cannae be editit.',
+'ns-specialprotected'  => 'Byordinar pages canna be editit.',
 'titleprotected'       => "This teetle haes been protectit frae bein makkit by [[User:$1|$1]].
 The grunds for this are: ''$2''.",
 
@@ -339,38 +356,40 @@ The grunds for this are: ''$2''.",
 'logouttext'                 => "Ye'r nou loggit oot. Ye can continue to uise {{SITENAME}} namelessly, or ye can log in again as the same or as a different uiser. Mynd that some pages micht continue tae be displayed as if ye war aye loggit in, till ye clear yer brouser cache.",
 'welcomecreation'            => '== Guid tae see ye, $1! ==
 
-Yer accoont haes been creatit. Mynd an chynge yer {{SITENAME}} preferences.',
+Yer accoont haes been creatit. 
+Mynd an chynge yer [[Special:Preferences|{{SITENAME}} preferences]].',
 'loginpagetitle'             => 'Uiser login',
 'yourname'                   => 'Yer uiser name',
-'yourpassword'               => 'Yer password',
+'yourpassword'               => 'Passwaird:',
 'yourpasswordagain'          => 'Retype passwaird:',
 'remembermypassword'         => 'Mynd ma password across sessions.',
 'yourdomainname'             => 'Yer domain:',
 'externaldberror'            => "Aither the wis an external authenteication database mishanter, or ye'r no alloued tae update yer external accoont.",
-'loginproblem'               => '<b>Thare haes been a problem wi yer login.</b><br />Hae anither shot!',
 'login'                      => 'Log in',
+'nav-login-createaccount'    => 'Log in / mak an accoont',
 'loginprompt'                => 'Ye maun hae cookies enabled tae log in tae {{SITENAME}}.',
 'userlogin'                  => 'Mak an accoont or log in',
 'logout'                     => 'Log oot',
 'userlogout'                 => 'Log oot',
 'notloggedin'                => 'No loggit in',
-'nologin'                    => 'Dinna hae a login? $1.',
+'nologin'                    => 'Dinna hae an accoont? $1.',
 'nologinlink'                => 'Mak an accoont',
 'createaccount'              => 'Mak new accoont',
 'gotaccount'                 => 'Got an accoont afore? $1.',
 'gotaccountlink'             => 'Log in',
 'createaccountmail'          => 'bi email',
 'badretype'                  => 'The passwords ye entered disna match.',
-'userexists'                 => 'The uiser name ye entered is aareadies in uiss. Please chuise a different name.',
+'userexists'                 => 'The uiser name ye entered is in uiss. Please chuise a different name.',
 'youremail'                  => 'Yer email:',
 'username'                   => 'Uisername:',
 'uid'                        => 'Uiser ID:',
+'prefs-memberingroups'       => 'Member o {{PLURAL:$1|group|groups}}:',
 'yourrealname'               => 'Yer real name:',
 'yourlanguage'               => 'Interface leid:',
 'yourvariant'                => 'Leid variant',
-'yournick'                   => 'Yer byname:',
+'yournick'                   => 'Seegnatur:',
 'badsig'                     => 'Raw signature nae guid; check HTML tags.',
-'badsiglength'               => 'Yer nickname is ower lang; it haes tae be unner $1 leeters.',
+'badsiglength'               => 'Yer nickname is ower lang; it haes tae be $1 {{PLURAL:$1|character|characters}} or less.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Rael name is optional an gin ye chuise tae provide it this will be uised tae gie ye attreibution for yer wark.',
 'loginerror'                 => 'Login mishanter',
@@ -381,7 +400,9 @@ Yer accoont haes been creatit. Mynd an chynge yer {{SITENAME}} preferences.',
 'noname'                     => "Ye hivna specifee'd a valid uisername.",
 'loginsuccesstitle'          => 'Login fine',
 'loginsuccess'               => 'Ye\'re nou loggit in tae {{SITENAME}} as "$1".',
-'nosuchuser'                 => 'The\'r nae sic uiser as "$1". Check yer spellin, or uise the form ablo tae mak a new uiser accoont.',
+'nosuchuser'                 => 'The\'r nae sic uiser as "$1".
+Uiser names are case-sensitive.
+Check yer spellin, or uise [[Special:UserLogin/signup|create a new account] tae mak a new accoont.',
 'nosuchusershort'            => 'The\'r nae sic uiser as "<nowiki>$1</nowiki>". Check yer spellin.',
 'nouserspecified'            => 'Ye hae tae merk up a uisername.',
 'wrongpassword'              => 'The password ye entered is wrang. Please gie it anither shot.',
@@ -405,11 +426,11 @@ canna uise the password recovery function, for tae prevent abuiss.',
 'eauthentsent'               => "A confirmation email haes been sent tae the specifee'd email address.
 Afore onie ither mail is sent tae the accoont, ye'll hae tae follae the guidance in the email,
 tae confirm that ye ar aucht the accoont.",
-'throttled-mailpassword'     => "A passwaird minder haes been sent already, in the
-hindermaist $1 hoors. To hinder abuise, only ''ane'' passwaird minder will be gettin sent in
-$1 hoors.",
+'throttled-mailpassword'     => "A password minder haes been sent afore, in the laist {{PLURAL:$1|hoor|$1 hoors}}. To hinder abuise, juist the ''ae'' password minder will be sent in
+{{PLURAL:$1|hoor|$1 hoors}}.",
 'mailerror'                  => 'Error sendin mail: $1',
-'acct_creation_throttle_hit' => "Sorry, but ye'v aaraedies made $1 accoonts. Ye canna mak onie mair.",
+'acct_creation_throttle_hit' => 'Veesitors tae this wiki uisin yer IP address haev created $1 {{PLURAL:$1|accoont|accoonts}} the day, which is the maist permeettit in that lang.
+Sae veesitors uisin this IP address canna mak ony mair accoonts juist noo.',
 'emailauthenticated'         => 'Yer e-mail address wis checkit on $1.',
 'emailnotauthenticated'      => 'Yer e-mail address hasnae been checkit! Nae e-mail
 will be sent for ony o the followin featurs.',
@@ -420,22 +441,22 @@ Please enter a weel-formattit address or mak that field tuim.',
 'accountcreated'             => 'Accoont creatit',
 'accountcreatedtext'         => 'The uiser accoont for $1 haes bin creatit.',
 'createaccount-title'        => 'Accoont makin for {{SITENAME}}',
-'createaccount-text'         => 'A body ($1) makit an accoont for $2 on {{SITENAME}}
-($4). The passwaird for "$2" is "$3". Ye should log in an chynge yer passwaird
-nou.
+'createaccount-text'         => 'A body ($1) makit an accoont for yer email address on {{SITENAME}} ($4) cried "$2", wi a password o "$3".
+Ye shuid log in an chynge yer password nou.
 
-Ye can sling a deifie on this message, if this accoont wis creatit by mistak.',
+Ye dinna hae tae heed this message, if this accoont wis creatit by mistak.',
 'loginlanguagelabel'         => 'Leid: $1',
 
 # Password reset dialog
-'resetpass'               => 'Set yer accoont passwaird again',
+'resetpass'               => 'Chynge passwaird',
 'resetpass_announce'      => 'Ye loggit in wi a short term e-mailed code. To be duin logging in, ye hae tae mak a new passwaird here:',
-'resetpass_header'        => 'Reset passwaird',
+'resetpass_header'        => 'Chynge accoont password',
+'oldpassword'             => 'Auld password',
 'resetpass_submit'        => 'Mak passwaird an log in',
 'resetpass_success'       => 'Yer passwaird chynge wis braw! Nou loggin ye in...',
 'resetpass_bad_temporary' => 'Yer short term passwaird wisnae habile. Ye micht hae already chynged yer passwaird or requestit a new short term passwaird.',
-'resetpass_forbidden'     => 'Passwairds cannae be chynged on this wiki',
-'resetpass_missing'       => 'Nae form data!',
+'resetpass_forbidden'     => 'Passwords canna be chynged',
+'resetpass-no-info'       => 'Ye maun be loggit in tae access this page directly.',
 
 # Edit page toolbar
 'bold_sample'     => 'Bauld text',
@@ -460,23 +481,23 @@ Ye can sling a deifie on this message, if this accoont wis creatit by mistak.',
 'hr_tip'          => 'Horizontal line (dinna ower uise)',
 
 # Edit pages
-'summary'                   => 'Ootline',
-'subject'                   => 'Subject/headline',
-'minoredit'                 => 'This is a smaa edit',
-'watchthis'                 => 'Leuk ower this page',
-'savearticle'               => 'Hain page',
-'preview'                   => 'Scance',
-'showpreview'               => 'Scance ower',
-'showlivepreview'           => 'Live leuk ower',
-'showdiff'                  => 'Shaw chynges',
-'anoneditwarning'           => "Ye arna loggit in. Yer IP address will be recordit in this page's edit history.",
-'missingsummary'            => "'''Mynd:''' Ye hivna gien an edit summary. Gin ye dab on Hain again, yer edit will be haint athoot ane.",
-'missingcommenttext'        => 'Please enter a comment ablo.',
-'missingcommentheader'      => "'''Mynd:''' Ye hivna gien a subject/heidline for this comment. Gin ye dab on Hain again, yer edit will be haint athoot ane.",
-'summary-preview'           => 'Ootline leuk ower',
-'subject-preview'           => 'Subject/headline leuk ower',
-'blockedtitle'              => 'Uiser is blockit',
-'blockedtext'               => '<big>\'\'\'Yer uisername or IP address haes been blockit.\'\'\'</big>
+'summary'                          => 'Ootline:',
+'subject'                          => 'Subject/headline:',
+'minoredit'                        => 'This is a smaa edit',
+'watchthis'                        => 'Leuk ower this page',
+'savearticle'                      => 'Hain page',
+'preview'                          => 'Scance',
+'showpreview'                      => 'Scance ower',
+'showlivepreview'                  => 'Live leuk ower',
+'showdiff'                         => 'Shaw chynges',
+'anoneditwarning'                  => "Ye arna loggit in. Yer IP address will be recordit in this page's edit history.",
+'missingsummary'                   => "'''Mynd:''' Ye hivna gien an edit summary. Gin ye dab on Hain again, yer edit will be haint athoot ane.",
+'missingcommenttext'               => 'Please enter a comment ablo.',
+'missingcommentheader'             => "'''Mynd:''' Ye hivna gien a subject/heidline for this comment. Gin ye dab on Hain again, yer edit will be haint athoot ane.",
+'summary-preview'                  => 'Ootline leuk ower:',
+'subject-preview'                  => 'Subject/headline leuk ower:',
+'blockedtitle'                     => 'Uiser is blockit',
+'blockedtext'                      => '<big>\'\'\'Yer uisername or IP address haes been blockit.\'\'\'</big>
 
 The block was made bi $1. The raeson gien is \'\'$2\'\'.
 
@@ -487,7 +508,7 @@ The block was made bi $1. The raeson gien is \'\'$2\'\'.
 Ye can contact $1 or ane o the ither [[{{MediaWiki:Grouppage-sysop}}|administrators]] tae discuss the block.
 Mynd that ye canna uise the "email this uiser" featur unless ye hae a valid email address registert in yer [[Special:Preferences|uiser preferences]] an ye hae not been blocked from using it.
 Yer IP address is $3, and the block ID is #$5. Please include this address in onie queries ye mak.',
-'autoblockedtext'           => 'Sairy, but yer IP address haes been blockit by the seestem acause it wis uised by an ither uiser, that wis blockit by $1.
+'autoblockedtext'                  => 'Sairy, but yer IP address haes been blockit by the seestem acause it wis uised by an ither uiser, that wis blockit by $1.
 The grunds for this were:
 
 :\'\'$2\'\'
@@ -502,83 +523,88 @@ Please jot that ye cannae uise the "e-mail this uiser" featur unless ye hae a ha
 registerit in yer [[Special:Preferences|uiser preferences]] an ye hinna been blockit frae uisin it.
 
 Yer block ID is $5. Please include this ID in ony argies ye mak.',
-'blockednoreason'           => 'nae grunds put',
-'blockedoriginalsource'     => "The soorce o '''$1''' is shawn ablo:",
-'blockededitsource'         => "The text o '''your edits''' tae '''$1''' is shawn ablo:",
-'whitelistedittitle'        => 'Login needit tae edit',
-'whitelistedittext'         => 'Ye hae tae $1 tae edit pages.',
-'confirmedittitle'          => 'E-mail confirmation needit for tae edit',
-'confirmedittext'           => 'Ye maun confirm yer e-mail address afore editin pages. Please set an validate yer e-mail address throu yer [[Special:Preferences|uiser settins]].',
-'nosuchsectiontitle'        => 'There isnae a section wi that teetle',
-'nosuchsectiontext'         => "Yer tryin tae edit a section that isnae there.  Acause there isnae a section $1, there's naegate to sauf yer edit.",
-'loginreqtitle'             => 'Login Requirit!',
-'loginreqlink'              => 'log in',
-'loginreqpagetext'          => 'Ye maun $1 tae view ither pages.',
-'accmailtitle'              => 'Passwaird sent.',
-'accmailtext'               => "The Password for '$1' haes been sent tae $2.",
-'newarticle'                => '(New)',
-'newarticletext'            => "Ye'v follaed an airtin til a page that disna exist yet. Tae create the page, stert typin in the box ablo (see the [[{{MediaWiki:Helppage}}|help page]] for mair info). Gin ye'r here by mistak, juist dab yer brouser's '''back''' button.",
-'anontalkpagetext'          => "----''This is the collogue page for a nameless uiser that haesna made an accoont yet or that disna uise it. We syne hiv tae uise the numerical IP address tae identifee thaim. Sic an IP address can be shared bi a wheen o uisers. Gin you ar a nameless uiser an feel that irrelevant comments haes been directit at ye, please [[Special:UserLogin|mak an accoont or log in]] tae evyte futur confusion wi ither nameless uisers.''",
-'noarticletext'             => "The'r nae text on this page the nou. Ye can [[Special:Search/{{PAGENAME}}|rake for this page teitle]] in ither pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].",
-'userpage-userdoesnotexist' => 'Uiser accoont "$1" hasnae been registerit. Please check gin ye wint tae mak or edit this page.',
-'clearyourcache'            => "'''Tak tent:''' Efter hainin, ye micht hae tae bypass yer brouser's cache for tae see the chynges. '''Mozilla / Firefox / Safari:''' haud doun ''Shift'' while dabbin on ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' haud doun ''Ctrl'' while dabbin on ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''' juist dab on the ''Reload'' button, or press ''F5''; '''Opera''' users micht hae tae haillie dicht thair cache in ''Tools&rarr;Preferences''.",
-'usercssjsyoucanpreview'    => "<strong>Tip:</strong> Uise the 'Show preview' button tae proof yer new CSS/JS afore savin.",
-'usercsspreview'            => "'''Mynd that ye'r juist previewin yer uiser CSS, it haesna yet been hained!'''",
-'userjspreview'             => "'''Mynd that ye're juist testin/previewing yer uiser JavaScript; it haesna been hained yet!'''",
-'userinvalidcssjstitle'     => "'''Warnin:''' There isnae a skin \"\$1\". Mynd that yer ain .css an .js pages uise a lowercase teetle, e.g. {{ns:user}}:Foo/monobook.css instead o {{ns:user}}:Foo/Monobook.css.",
-'updated'                   => '(Updatit)',
-'note'                      => '<strong>Mynd:</strong>',
-'previewnote'               => '<strong>Mynd that this is juist a scance-ower, an haesna been hained yet!</strong>',
-'previewconflict'           => 'This scance reflects the text in the upper text editin area like it will kythe gin ye chuise tae save.',
-'session_fail_preview'      => '<strong>Sairy! We culdnae process yer edit acause o a loss o term data.
-Please try again. Gin it disnae wairk still, try loggin oot an loggin in again.</strong>',
-'session_fail_preview_html' => "<strong>Sairy! We culdnae process yer edit acause o a loss o term data.</strong>
+'blockednoreason'                  => 'nae grunds put',
+'blockedoriginalsource'            => "The soorce o '''$1''' is shawn ablo:",
+'blockededitsource'                => "The text o '''your edits''' tae '''$1''' is shawn ablo:",
+'whitelistedittitle'               => 'Login needit tae edit',
+'whitelistedittext'                => 'Ye hae tae $1 tae edit pages.',
+'confirmedittitle'                 => 'E-mail confirmation needit for tae edit',
+'confirmedittext'                  => 'Ye maun confirm yer e-mail address afore editin pages. Please set an validate yer e-mail address throu yer [[Special:Preferences|uiser settins]].',
+'nosuchsectiontitle'               => 'There isnae a section wi that teetle',
+'nosuchsectiontext'                => "Yer tryin tae edit a section that isnae there.  Acause there isnae a section $1, there's naegate to sauf yer edit.",
+'loginreqtitle'                    => 'Login Requirit!',
+'loginreqlink'                     => 'log in',
+'loginreqpagetext'                 => 'Ye maun $1 tae view ither pages.',
+'accmailtitle'                     => 'Passwaird sent.',
+'accmailtext'                      => "The Password for '$1' haes been sent tae $2.",
+'newarticle'                       => '(New)',
+'newarticletext'                   => "Ye'v follaed an airtin til a page that disna exist yet. Tae create the page, stert typin in the box ablo (see the [[{{MediaWiki:Helppage}}|help page]] for mair info). Gin ye'r here by mistak, juist dab yer brouser's '''back''' button.",
+'anontalkpagetext'                 => "----''This is the collogue page for a nameless uiser that haesna made an accoont yet or that disna uise it. We syne hiv tae uise the numerical IP address tae identifee thaim. Sic an IP address can be shared bi a wheen o uisers. Gin you ar a nameless uiser an feel that irrelevant comments haes been directit at ye, please [[Special:UserLogin|mak an accoont or log in]] tae evyte futur confusion wi ither nameless uisers.''",
+'noarticletext'                    => "The'r nae text on this page the nou. Ye can [[Special:Search/{{PAGENAME}}|rake for this page teitle]] in ither pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].",
+'userpage-userdoesnotexist'        => 'Uiser accoont "$1" hasnae been registerit. Please check gin ye wint tae mak or edit this page.',
+'clearyourcache'                   => "'''Tak tent:''' Efter hainin, ye micht hae tae bypass yer brouser's cache for tae see the chynges. '''Mozilla / Firefox / Safari:''' haud doun ''Shift'' while dabbin on ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' haud doun ''Ctrl'' while dabbin on ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''' juist dab on the ''Reload'' button, or press ''F5''; '''Opera''' users micht hae tae haillie dicht thair cache in ''Tools&rarr;Preferences''.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Uise the 'Show preview' button tae proof yer new CSS/JS afore savin.",
+'usercsspreview'                   => "'''Mynd that ye'r juist previewin yer uiser CSS, it haesna yet been hained!'''",
+'userjspreview'                    => "'''Mynd that ye're juist testin/previewing yer uiser JavaScript; it haesna been hained yet!'''",
+'userinvalidcssjstitle'            => "'''Warnin:''' There isnae a skin \"\$1\". Mynd that yer ain .css an .js pages uise a lowercase teetle, e.g. {{ns:user}}:Foo/monobook.css instead o {{ns:user}}:Foo/Monobook.css.",
+'updated'                          => '(Updatit)',
+'note'                             => "'''Mynd:'''",
+'previewnote'                      => "'''Mynd that this is juist a scance-ower, an haesna been hained yet!'''",
+'previewconflict'                  => 'This scance reflects the text in the upper text editin area like it will kythe gin ye chuise tae save.',
+'session_fail_preview'             => "'''Sairy! We culdnae process yer edit acause o a loss o term data.
+Please try again. Gin it disnae wairk still, try loggin oot an loggin in again.'''",
+'session_fail_preview_html'        => "'''Sairy! We culdnae process yer edit acause o a loss o term data.'''
 
 ''Acause this wiki haes raw HTML habile, the leuk ower is hidden tae hinder JavaScript attacks.''
 
-<strong>Gin this is a proper edit try, please try again. Gin it disnae wairk still, try loggin oot an loggin back in.</strong>",
-'token_suffix_mismatch'     => '<strong>Yer edit haes been rejectit acause yer client made a richt mess o the punctuation characters
+'''Gin this is a proper edit try, please try again. Gin it disnae wairk still, try loggin oot an loggin back in.'''",
+'token_suffix_mismatch'            => "'''Yer edit haes been rejectit acause yer client made a richt mess o the punctuation characters
 in the edit token. The edit haes been rejectit tae hinder corruption o the page text.
-This whiles happens when ye are uisin a bruken web-based anonymous proxy service.</strong>',
-'editing'                   => 'Editin $1',
-'editingsection'            => 'Editin $1 (section)',
-'editingcomment'            => 'Editin $1 (comment)',
-'editconflict'              => 'Edit conflict: $1',
-'explainconflict'           => 'Some ither body haes chynged this page syne ye stertit editin it. The upper text area hauds the page text as it currently exists. Yer chynges is shawn in the lower text area. Ye\'ll hae tae merge yer chynges intae the existin text. <b>Juist</b> the text in the upper text area will be hained whan ye press "Hain page". <p>',
-'yourtext'                  => 'Yer text',
-'storedversion'             => 'Storit version',
-'nonunicodebrowser'         => "<strong>WARNIN: Yer brouser isna unicode compliant.  The'r a wirkaroond tae allou ye tae sauflie edit airticles: non-ASCII characters will kythe in the edit box as hexadecimal codes.</strong>",
-'editingold'                => "<strong>WARNIN: Ye'r editin an oot-o-date reveision o this page. Gin ye hain it, onie chynges made syne this reveision will be lost.</strong>",
-'yourdiff'                  => 'Differs',
-'copyrightwarning'          => "Please mynd that aa contreibutions tae {{SITENAME}} is conseidert tae be released unner the $2 (see $1 for details). Gin ye dinna want yer writin tae be editit athoot mercy an redistribute at will, than dinna submit it here.<br /> Forbye thon, ye'r promisin us that ye wrat this yersel, or copied it frae a public domain or siclike free resoorce. <strong>DINNA SUBMIT COPYRICHTIT WARK ATHOOT PERMEISSION!</strong>",
-'copyrightwarning2'         => "Please mynd that aa contreibutions tae {{SITENAME}} micht be editit, chynged, or remuved bi ither contreibutors.
+This whiles happens when ye are uisin a bruken web-based anonymous proxy service.'''",
+'editing'                          => 'Editin $1',
+'editingsection'                   => 'Editin $1 (section)',
+'editingcomment'                   => 'Editin $1 (comment)',
+'editconflict'                     => 'Edit conflict: $1',
+'explainconflict'                  => 'Some ither body haes chynged this page syne ye stertit editin it. The upper text area hauds the page text as it currently exists. Yer chynges is shawn in the lower text area. Ye\'ll hae tae merge yer chynges intae the existin text. <b>Juist</b> the text in the upper text area will be hained whan ye press "Hain page". <p>',
+'yourtext'                         => 'Yer text',
+'storedversion'                    => 'Storit version',
+'nonunicodebrowser'                => "'''WARNIN: Yer brouser isna unicode compliant.  The'r a wirkaroond tae allou ye tae sauflie edit airticles: non-ASCII characters will kythe in the edit box as hexadecimal codes.'''",
+'editingold'                       => "'''WARNIN: Ye'r editin an oot-o-date reveision o this page. Gin ye hain it, onie chynges made syne this reveision will be lost.'''",
+'yourdiff'                         => 'Differs',
+'copyrightwarning'                 => "Please mynd that aa contreibutions tae {{SITENAME}} is conseidert tae be released unner the $2 (see $1 for details). Gin ye dinna want yer writin tae be editit athoot mercy an redistribute at will, than dinna submit it here.<br /> Forbye thon, ye'r promisin us that ye wrat this yersel, or copied it frae a public domain or siclike free resoorce. '''DINNA SUBMIT COPYRICHTIT WARK ATHOOT PERMEISSION!'''",
+'copyrightwarning2'                => "Please mynd that aa contreibutions tae {{SITENAME}} micht be editit, chynged, or remuved bi ither contreibutors.
 Gin ye dinna want yer writin tae be editit athoot mercy and redistribute at will, than dinna submit it here.<br />
 YYe'r promisin us forbye that ye wrat this yersel, or copied it frae a
 public domain or siclike free resoorce (see $1 for details).
-<strong>DINNA SUBMIT COPYRICHTIT WARK ATHOOT PERMEISSION!</strong>",
-'longpagewarning'           => "WARNIN: This page is $1 kilobytes lang; some brousers micht hae trouble editin pages approachin or langer nor 32 kb. Please conseider brakkin the page intae smaa'er sections.",
-'longpageerror'             => "<strong>ERROR: The text ye hae submitted is $1 kilobytes 
-lang, an that's langer than the maximum of $2 kilobytes. It canna be hained.</strong>",
-'readonlywarning'           => "WARNIN: The database haes been lockit for maintenance, sae ye'll no can hain yer edits richt nou. Ye micht wish tae cut-n-paste the text intil a text file an hain it for later.",
-'protectedpagewarning'      => '<strong>WARNIN: This page haes been lockit sae that juist uisers wi administrator privileges can edit it.</strong>',
-'semiprotectedpagewarning'  => "'''Warnin:''' This page haes been lockit sae that only registerit uisers can edit it.",
-'cascadeprotectedwarning'   => "'''Warnin:''' This page haes been lockit sae that only uisers wi sysop richts can edit it, acause it is includit in the followin cascade-protectit {{PLURAL:$1|page|pages}}:",
-'templatesused'             => 'Templates uised on this page:',
-'templatesusedpreview'      => 'Templates uised in this scance ower:',
-'templatesusedsection'      => 'Templates uised in this section:',
-'template-protected'        => '(protectit)',
-'template-semiprotected'    => '(semi-protectit)',
-'nocreatetitle'             => 'Page makkin limitit',
-'nocreatetext'              => 'This site haes restrictit the ability to mak new pages.
+'''DINNA SUBMIT COPYRICHTIT WARK ATHOOT PERMEISSION!'''",
+'longpagewarning'                  => "WARNIN: This page is $1 kilobytes lang; some brousers micht hae trouble editin pages approachin or langer nor 32 kb. Please conseider brakkin the page intae smaa'er sections.",
+'longpageerror'                    => "'''ERROR: The text ye hae submitted is $1 kilobytes 
+lang, an that's langer than the maximum of $2 kilobytes. It canna be hained.'''",
+'readonlywarning'                  => "WARNIN: The database haes been lockit for maintenance, sae ye'll no can hain yer edits richt nou. Ye micht wish tae cut-n-paste the text intil a text file an hain it for later.",
+'protectedpagewarning'             => "'''WARNIN: This page haes been lockit sae that juist uisers wi administrator privileges can edit it.'''",
+'semiprotectedpagewarning'         => "'''Warnin:''' This page haes been lockit sae that only registerit uisers can edit it.",
+'cascadeprotectedwarning'          => "'''Warnin:''' This page haes been lockit sae that only uisers wi sysop richts can edit it, acause it is includit in the followin cascade-protectit {{PLURAL:$1|page|pages}}:",
+'templatesused'                    => 'Templates uised on this page:',
+'templatesusedpreview'             => 'Templates uised in this scance ower:',
+'templatesusedsection'             => 'Templates uised in this section:',
+'template-protected'               => '(protectit)',
+'template-semiprotected'           => '(semi-protectit)',
+'nocreatetitle'                    => 'Page makkin limitit',
+'nocreatetext'                     => 'This site haes restrictit the ability to mak new pages.
 Ye can go back an eik tae an existing page, or [[Special:UserLogin|log in or mak an accoont]].',
-'nocreate-loggedin'         => 'Ye dinnae hae the richts tae mak new pages on this wiki.',
-'permissionserrors'         => 'Richts Errors',
-'permissionserrorstext'     => 'Ye dinnae hae the richts tae dae that, acause o the followin {{PLURAL:$1|grund|grunds}}:',
-'recreate-deleted-warn'     => "'''Warnin: Ye are makkin a page that haes been deletit.'''
+'nocreate-loggedin'                => 'Ye dinnae hae the richts tae mak new pages on this wiki.',
+'permissionserrors'                => 'Richts Errors',
+'permissionserrorstext'            => 'Ye dinnae hae the richts tae dae that, acause o the followin {{PLURAL:$1|grund|grunds}}:',
+'permissionserrorstext-withaction' => 'Ye dinna hae the richts tae $2, for the follaein {{PLURAL:$1|reason|reasons}}:',
+'recreate-deleted-warn'            => "'''Warnin: Ye are makkin a page that haes been deletit.'''
 
 Ye shuld check that it is guid tae keep editin this page.
 The deletion log for this page is providit here:",
 
+# Parser/template warnings
+'post-expand-template-argument-warning' => 'Tak tent: This page hauds at least the ae template argument that haes an ower muckle expansion size.
+Thae arguments hae been left oot.',
+
 # "Undo" feature
 'undo-success' => 'The edit can be undone. Please check the chynges albo tae check that this is whit ye wint tae dae, an then hain the chynges albo tae be duin undooin the edit.',
 'undo-failure' => 'The edit culdnae be undone acause o conflictin edits inatween.',
@@ -593,11 +619,9 @@ The grund for this, given by $3 is ''$2''",
 # History pages
 'viewpagelogs'        => 'Leuk at logs for this page',
 'nohistory'           => "The'r nae edit history for this page.",
-'revnotfound'         => 'Reveision nae funnd',
-'revnotfoundtext'     => 'The auld reveision o the page ye socht cuidna be funnd. Please check the URL ye uised til access this page.',
 'currentrev'          => 'Current reveision',
 'revisionasof'        => 'Reveision as o $1',
-'revision-info'       => 'Revision as o $1 by $2',
+'revision-info'       => 'Revision as o $1 by $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Aulder reveision',
 'nextrevision'        => 'Newer reveision →',
 'currentrevisionlink' => 'see current reveision',
@@ -643,22 +667,24 @@ there micht be parteeculars in the [{{fullurl:Special:Log/delete|page={{FULLPAGE
 'compareselectedversions' => 'Compare selectit versions',
 
 # Search results
-'searchresults'         => 'Rake results',
-'searchresulttext'      => 'For mair information aboot rakin {{SITENAME}}, see [[{{MediaWiki:Helppage}}|Rakin {{SITENAME}}]].',
-'searchsubtitle'        => "Ye raked for '''[[:$1]]'''",
-'searchsubtitleinvalid' => "Ye raked for '''$1'''",
-'noexactmatch'          => "'''There nae page wi the teetle \"\$1\".''' Ye can [[:\$1|mak this page]].",
-'titlematches'          => 'Airticle teitle matches',
-'notitlematches'        => 'Nae page teitle matches',
-'notextmatches'         => 'Nae page text matches',
-'prevn'                 => 'foregaun $1',
-'nextn'                 => 'neist $1',
-'searchall'             => 'aw',
-'showingresults'        => "Shawin ablo up tae {{PLURAL:$1|'''1''' result|'''$1''' results}} stertin wi #'''$2'''.",
-'showingresultsnum'     => "Shawin ablo {{PLURAL:$3|'''1''' result|'''$3''' results}} stertin wi #'''$2'''.",
-'nonefound'             => "'''Mynd''': unsuccessfu rakes is afttimes caused bi rakin for common words like \"hae\" an \"frae\", that isna indexed, or bi specifeein mair nor ae rake term (juist pages haudin aa the rake terms will kythe in the result).",
-'powersearch'           => 'Rake',
-'searchdisabled'        => 'Rakin throu {{SITENAME}} is disabled for performance raesons. Ye can rake via Google juist nou. Mynd that thair indexes o {{SITENAME}} content micht be oot o date.',
+'searchresults'            => 'Rake results',
+'searchresulttext'         => 'For mair information aboot rakin {{SITENAME}}, see [[{{MediaWiki:Helppage}}|Rakin {{SITENAME}}]].',
+'searchsubtitle'           => "Ye raked for '''[[:$1]]'''",
+'searchsubtitleinvalid'    => "Ye raked for '''$1'''",
+'noexactmatch'             => "'''There nae page wi the teetle \"\$1\".''' Ye can [[:\$1|mak this page]].",
+'titlematches'             => 'Airticle teitle matches',
+'notitlematches'           => 'Nae page teitle matches',
+'notextmatches'            => 'Nae page text matches',
+'prevn'                    => 'foregaun $1',
+'nextn'                    => 'neist $1',
+'searchhelp-url'           => 'Help:Contents',
+'search-mwsuggest-enabled' => 'wi suggestions',
+'searchall'                => 'aw',
+'showingresults'           => "Shawin ablo up tae {{PLURAL:$1|'''1''' result|'''$1''' results}} stertin wi #'''$2'''.",
+'showingresultsnum'        => "Shawin ablo {{PLURAL:$3|'''1''' result|'''$3''' results}} stertin wi #'''$2'''.",
+'nonefound'                => "'''Mynd''': unsuccessfu rakes is afttimes caused bi rakin for common words like \"hae\" an \"frae\", that isna indexed, or bi specifeein mair nor ae rake term (juist pages haudin aa the rake terms will kythe in the result).",
+'powersearch'              => 'Rake',
+'searchdisabled'           => 'Rakin throu {{SITENAME}} is disabled for performance raesons. Ye can rake via Google juist nou. Mynd that thair indexes o {{SITENAME}} content micht be oot o date.',
 
 # Preferences page
 'mypreferences'      => 'Ma preferences',
@@ -666,6 +692,7 @@ there micht be parteeculars in the [{{fullurl:Special:Log/delete|page={{FULLPAGE
 'prefsnologintext'   => 'Ye maun be [[Special:UserLogin|loggit in]] tae set uiser preferences.',
 'prefsreset'         => 'Preferences haes been reset frae storage.',
 'changepassword'     => 'Chynge password',
+'skin-preview'       => 'First Leuk',
 'math'               => 'Renderin math',
 'datedefault'        => 'Nae preference',
 'datetime'           => 'Date an time',
@@ -673,7 +700,6 @@ there micht be parteeculars in the [{{fullurl:Special:Log/delete|page={{FULLPAGE
 'prefs-rc'           => 'Recent chynges an shawin stubs',
 'prefs-misc'         => 'Antrin settins',
 'saveprefs'          => 'Hain preferences',
-'oldpassword'        => 'Auld password',
 'textboxsize'        => 'Editin',
 'searchresultshead'  => 'Rake result settins',
 'resultsperpage'     => 'Hits tae shaw per page',
@@ -721,12 +747,12 @@ there micht be parteeculars in the [{{fullurl:Special:Log/delete|page={{FULLPAGE
 'uploadnologintext'           => 'Ye maun be [[Special:UserLogin|loggit in]] til uplaid files.',
 'uploaderror'                 => 'Uplaid error',
 'uploadtext'                  => "Uise the form ablo tae uplaid new files;
-tae keek at or rake throu aareadies uplaidit eimages gang tae the [[Special:ImageList|leet o uplaidit files]];
+tae keek at or rake throu aareadies uplaidit eimages gang tae the [[Special:FileList|leet o uplaidit files]];
 uplaids an deletions is recordit in the [[Special:Log|project log]].
 
 Tae pit the eimage intae a page, uise an airtin i the form
-'''<nowiki>[[</nowiki>{{ns:image}}:file.jpg<nowiki>]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}:file.png|alt text<nowiki>]]</nowiki>''' or
+'''<nowiki>[[</nowiki>{{ns:file}}:file.jpg<nowiki>]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}:file.png|alt text<nowiki>]]</nowiki>''' or
 '''<nowiki>[[</nowiki>{{ns:media}}:file.ogg<nowiki>]]</nowiki>''' for pyntin strecht tae the file",
 'uploadlog'                   => 'uplaid log',
 'uploadlogpage'               => 'Uplaid log',
@@ -739,9 +765,9 @@ Tae pit the eimage intae a page, uise an airtin i the form
 'illegalfilename'             => 'The filename "$1" haes characters that isna alloud in page teitles. Please rename the file an gie uplaidin it anither shot.',
 'badfilename'                 => 'Eimage name haes been chynged tae "$1".',
 'largefileserver'             => 'This file is bigger nor the server is confeigurt tae allou.',
-'fileexists'                  => "A file wi this name exists aareadies, please check <strong><tt>$1</tt></strong> gin ye'r no siccar that ye want tae chynge it.",
-'fileexists-forbidden'        => 'A file wi this name aareadies exists; please gang back an uplaid this file unner a new name. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'A file wi this name aareadies exists in the shared file depose; please gang back an uplaid this file unner a new name. [[Image:$1|thumb|center|$1]]',
+'fileexists'                  => "A file wi this name exists aareadies, please check '''<tt>$1</tt>''' gin ye'r no siccar that ye want tae chynge it.",
+'fileexists-forbidden'        => 'A file wi this name aareadies exists; please gang back an uplaid this file unner a new name. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'A file wi this name aareadies exists in the shared file depose; please gang back an uplaid this file unner a new name. [[File:$1|thumb|center|$1]]',
 'uploadwarning'               => 'Uplaid warnin',
 'savefile'                    => 'Hain file',
 'uploadedimage'               => 'uplaidit "$1"',
@@ -753,10 +779,10 @@ Tae pit the eimage intae a page, uise an airtin i the form
 
 'nolicense' => 'Nane selected',
 
-# Special:ImageList
-'imagelist' => 'Eimage leet',
+# Special:ListFiles
+'listfiles' => 'Eimage leet',
 
-# Image description page
+# File description page
 'imagelinks'     => 'Eimage airtins',
 'linkstoimage'   => 'The follaein $1 pages airts tae this image:',
 'nolinkstoimage' => "The'r nae pages airts tae this eimage.",
@@ -774,22 +800,7 @@ Tae pit the eimage intae a page, uise an airtin i the form
 'randompage' => 'Wale page allevolie',
 
 # Statistics
-'userstats'     => 'Uiser statistics',
-'sitestatstext' => "{{PLURAL:\$1|There is '''1''' page|The'r '''\$1''' total pages}} in the database.
-This includes \"collogue\" pages, pages aboot {{SITENAME}}, meinimal \"stub\"
-pages, reguidals, an ithers that likely disna qualifee as content pages. 
-Excludin thaim, {{PLURAL:\$2|there is '''1''' page that is a|the'r '''\$2''' pages that's}} maist likely
-legeitimate content {{PLURAL:\$2|page|pages}}.
-
-'''\$8''' {{PLURAL:\$8|file has|files have}} been uploaded.
-
-Thare haes been a total o '''\$3''' {{PLURAL:\$3|page view|page views}}, an '''\$4''' {{PLURAL:\$4|page edit|page edits}}
-syne {{SITENAME}} wis set up.
-That comes tae '''\$5''' average edits per page, and '''\$6''' views per edit.
-
-The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'''.",
-'userstatstext' => "{{PLURAL:$1|There is '''1''' registert [[Special:ListUsers|uiser]]|The'r '''$1''' registert [[Special:ListUsers|uisers]]}}.
-'''$2''' (or '''$4%''') o thaim {{PLURAL:$2|has|have}} $5 rights.",
+'statistics-header-users' => 'Uiser statistics',
 
 'doubleredirects'     => 'Dooble reguidals',
 'doubleredirectstext' => 'Ilka raw hauds airtins tae the first an saicont reguidal, as weel as the first line o the saicont reguidal text, for usual giein the "rael" tairget page, that the first reguidal shuid pynt til.',
@@ -861,22 +872,21 @@ The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'
 'noemailtext'     => "This uiser haesna specifee'd a valid e-mail address, or haes chuisen no tae receive e-mail frae ither uisers.",
 
 # Watchlist
-'watchlist'            => 'Ma watchleet',
-'mywatchlist'          => 'Ma watchleet',
-'nowatchlist'          => 'Ye hivna onie eitems on yer watchleet.',
-'watchnologin'         => 'Nae loggit in',
-'watchnologintext'     => 'Ye maun be [[Special:UserLogin|loggit in]] tae modify yer watchleet.',
-'addedwatch'           => 'Eikit ti watchleet',
-'addedwatchtext'       => "The page \"<nowiki>\$1</nowiki>\" haes been eikit ti yer [[Special:Watchlist|watchleet]]. Futur chynges ti this page an its associate Collogue page will be leetit thare, an the page will kythe '''bauldit''' in the [[Special:RecentChanges|leet o recent chynges]] ti mak it mair eith tae pick oot. <p>Gin ye want ti remuve the page frae yer watchleet later, dab \"Stop watching\" in the sidebar.",
-'removedwatch'         => 'Remuved frae watchleet',
-'removedwatchtext'     => 'The page "[[:$1]]" haes been remuved frae yer watchleet.',
-'notanarticle'         => 'No a content page',
-'watchnochange'        => 'Nane o yer watched items were edited in the time period displayed.',
-'watchlistcontains'    => 'Yer watchleet contains $1 {{PLURAL:$1|page|pages}}.',
-'iteminvalidname'      => "Trouble wi eitem '$1', invalid name...",
-'wlnote'               => "Ablo is the lest $1 {{PLURAL:$1|chynge|chynges}} in the lest {{PLURAL:$2|hour|'''$2''' hours}}.",
-'wlshowlast'           => 'Shaw lest $1 hours $2 days $3',
-'watchlist-hide-minor' => 'Dinna shaw smaa chynges',
+'watchlist'         => 'Ma watchleet',
+'mywatchlist'       => 'Ma watchleet',
+'nowatchlist'       => 'Ye hivna onie eitems on yer watchleet.',
+'watchnologin'      => 'Nae loggit in',
+'watchnologintext'  => 'Ye maun be [[Special:UserLogin|loggit in]] tae modify yer watchleet.',
+'addedwatch'        => 'Eikit ti watchleet',
+'addedwatchtext'    => "The page \"<nowiki>\$1</nowiki>\" haes been eikit ti yer [[Special:Watchlist|watchleet]]. Futur chynges ti this page an its associate Collogue page will be leetit thare, an the page will kythe '''bauldit''' in the [[Special:RecentChanges|leet o recent chynges]] ti mak it mair eith tae pick oot. <p>Gin ye want ti remuve the page frae yer watchleet later, dab \"Stop watching\" in the sidebar.",
+'removedwatch'      => 'Remuved frae watchleet',
+'removedwatchtext'  => 'The page "[[:$1]]" haes been remuved frae yer watchleet.',
+'notanarticle'      => 'No a content page',
+'watchnochange'     => 'Nane o yer watched items were edited in the time period displayed.',
+'watchlistcontains' => 'Yer watchleet contains $1 {{PLURAL:$1|page|pages}}.',
+'iteminvalidname'   => "Trouble wi eitem '$1', invalid name...",
+'wlnote'            => "Ablo is the lest $1 {{PLURAL:$1|chynge|chynges}} in the lest {{PLURAL:$2|hour|'''$2''' hours}}.",
+'wlshowlast'        => 'Shaw lest $1 hours $2 days $3',
 
 'enotif_reset'       => 'Merk aa pages visitit',
 'changed'            => 'chynged',
@@ -884,36 +894,42 @@ The [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] length is '''\$7'
 'enotif_subject'     => '{{SITENAME}} page $PAGETITLE haes been $CHANGEDORCREATED bi $PAGEEDITOR',
 'enotif_lastvisited' => 'Hae a leuk at $1 for aa chynges sin yer last visit.',
 
-# Delete/protect/revert
-'excontent'           => "content wis: '$1'",
-'excontentauthor'     => "content wis: '$1' (an the ae contreibutor wis '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'       => "content afore blankin wis: '$1'",
-'exblank'             => 'page wis tuim',
-'historywarning'      => "Warnin: The page ye're aboot tae delete haes a history:",
-'confirmdeletetext'   => "Ye'r aboot tae permanently delete a page or eimage alang wi aa its history frae the database.
+# Delete
+'excontent'         => "content wis: '$1'",
+'excontentauthor'   => "content wis: '$1' (an the ae contreibutor wis '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'     => "content afore blankin wis: '$1'",
+'exblank'           => 'page wis tuim',
+'historywarning'    => "Warnin: The page ye're aboot tae delete haes a history:",
+'confirmdeletetext' => "Ye'r aboot tae permanently delete a page or eimage alang wi aa its history frae the database.
 Please confirm that ye intend tae dae this, that ye unnerstaun the consequences,
 an that ye'r daein this in accord wi [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'      => 'Action duin',
-'deletedtext'         => '"<nowiki>$1</nowiki>" haes been delete. See $2 for a record o recent deletions.',
-'deletedarticle'      => 'deletit "[[$1]]"',
-'dellogpagetext'      => 'Ablo is a leet o the maist recent deletions.',
-'reverted'            => 'Revertit tae aulder reveision',
-'deletecomment'       => 'Raeson for deletion',
-'rollback'            => 'Row back edits',
-'rollback_short'      => 'Rowback',
-'rollbacklink'        => 'rowback',
-'rollbackfailed'      => 'Rowback failed',
-'cantrollback'        => 'Canna revert edit; last contreibutor is the ae author o this page.',
-'alreadyrolled'       => 'Canna rowback last edit o [[$1]] bi [[User:$2|$2]] ([[User talk:$2|Talk]]); some ither bodie haes editit or rowed back the page aareadies. Last edit wis bi [[User:$3|$3]] ([[User talk:$3|Talk]]).',
-'editcomment'         => 'The edit comment wis: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'          => 'Revertit edit o [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]), chynged back tae last version bi [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'protectlogtext'      => 'Ablo is a leet o page locks/unlocks. See the [[Special:ProtectedPages|protected pages list]] for the list of currently operational page protections.',
-'protectedarticle'    => 'protectit "[[$1]]"',
-'unprotectedarticle'  => 'unprotectit "[[$1]]"',
-'protect-title'       => 'Protectin "$1"',
-'protectcomment'      => 'Raeson for protectin',
-'protect-text'        => 'Ye can see an chynge the protection level here for the page <strong><nowiki>$1</nowiki></strong>.',
-'protect-level-sysop' => 'Juist administrators',
+'actioncomplete'    => 'Action duin',
+'deletedtext'       => '"<nowiki>$1</nowiki>" haes been delete. See $2 for a record o recent deletions.',
+'deletedarticle'    => 'deletit "[[$1]]"',
+'dellogpagetext'    => 'Ablo is a leet o the maist recent deletions.',
+'reverted'          => 'Revertit tae aulder reveision',
+'deletecomment'     => 'Raeson for deletion',
+
+# Rollback
+'rollback'       => 'Row back edits',
+'rollback_short' => 'Rowback',
+'rollbacklink'   => 'rowback',
+'rollbackfailed' => 'Rowback failed',
+'cantrollback'   => 'Canna revert edit; last contreibutor is the ae author o this page.',
+'alreadyrolled'  => 'Canna rowback last edit o [[$1]] bi [[User:$2|$2]] ([[User talk:$2|Talk]]); some ither bodie haes editit or rowed back the page aareadies. Last edit wis bi [[User:$3|$3]] ([[User talk:$3|Talk]]).',
+'editcomment'    => "The edit comment wis: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => 'Revertit edit o [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]), chynged back tae last version bi [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
+'protectlogtext'         => 'Ablo is a leet o page locks/unlocks. See the [[Special:ProtectedPages|protected pages list]] for the list of currently operational page protections.',
+'protectedarticle'       => 'protectit "[[$1]]"',
+'unprotectedarticle'     => 'unprotectit "[[$1]]"',
+'protect-title'          => 'Protectin "$1"',
+'prot_1movedto2'         => '[[$1]] flittit til [[$2]]',
+'protectcomment'         => 'Raeson for protectin',
+'protect-text'           => "Ye can see an chynge the protection level here for the page '''<nowiki>$1</nowiki>'''.",
+'protect-level-sysop'    => 'Juist administrators',
+'protect-expiry-options' => '2 oor:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', # display1:time1,display2:time2,...
 
 # Undelete
 'undelete'               => 'Restore delete page',
@@ -940,7 +956,6 @@ afore it wis delete. The actual text o thir deletit reveisions is available tae
 
 # What links here
 'whatlinkshere' => 'Whit airts tae here',
-'linklistsub'   => '(Leet o airtins)',
 'linkshere'     => "The follaein pages airts tae '''[[:$1]]''':",
 'nolinkshere'   => "Nae pages airt tae '''[[:$1]]'''.",
 'isredirect'    => 'reguidal page',
@@ -1006,6 +1021,8 @@ This can be a drastic and unexpectit chynge for a popular page;
 please be siccar ye unnerstaun the consequences o this afore proceedin.",
 'movepagetalktext'        => "The associate Collogue page, gin onie, will be autaematically flittit alang wi it '''unless:''' *Ye'r flittin the page across namespaces, *A collogue page that isna tuim aareadies exists unner the new name, or *Ye tak the tick oot o the box ablo. In thae cases, ye maun flit or merge the page manually later gin ye hae saicont thochts.",
 'movearticle'             => 'Flit page:',
+'movenologin'             => 'No loggit in',
+'movenologintext'         => 'Ye maun be a registert uiser an [[Special:UserLogin|loggit in]] tae flit a page.',
 'newtitle'                => 'Tae new teitle',
 'movepagebtn'             => 'Flit page',
 'pagemovedsub'            => 'Flittin succeedit',
@@ -1025,14 +1042,13 @@ The destination airticle "[[:$1]]" aareadies exists. Div ye want tae delete it f
 'delete_and_move_confirm' => 'Aye, delete the page',
 'delete_and_move_reason'  => 'Delete for tae mak wey for flittin',
 'selfmove'                => 'Ootgaun an incomin teitles is the same; canna flit a page ower itsel.',
-'immobile_namespace'      => 'Destination teitle is o a speecial kin; canna flit pages intae that namespace.',
 
 # Export
 'exporttext'    => 'Ye can export the text an editin history o a parteicular page or set o pages wappit in some XML. In the futur, this micht can be importit intae anither wiki runnin MediaWiki saftware, altho the\'r nae support for this featur in the current version.
 
 Tae export airticle pages, enter the teitles in the text box ablo, ae teitle tae ilka line, an wale whither ye want the current version alang wi aa auld versions, wi the page history lines, or the current version juist, wi wittins anent the last edit.
 
-In the saicont case ye can uise an airtin forbye, for exemplar [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] for the airticle "[[{{MediaWiki:Mainpage}}]]".',
+In the saicont case ye can uise an airtin forbye, for exemplar [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] for the airticle "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly' => 'Include juist the current revision, no the fou history',
 
 # Namespace 8 related
@@ -1057,7 +1073,7 @@ In the saicont case ye can uise an airtin forbye, for exemplar [[{{ns:special}}:
 'tooltip-pt-preferences'          => 'Ma preferences',
 'tooltip-pt-login'                => "It's a guid idea tae log i, but ye dinna hae tae.",
 'tooltip-search'                  => 'Rake {{SITENAME}}',
-'tooltip-n-mainpage'              => 'Gae tae the Main Page',
+'tooltip-n-mainpage'              => 'Gang tae the Main Page',
 'tooltip-t-contributions'         => "View this uiser's contreibutions",
 'tooltip-minoredit'               => 'Mairk this as a smaa edit',
 'tooltip-save'                    => 'Hain yer chynges',
@@ -1115,7 +1131,7 @@ In the saicont case ye can uise an airtin forbye, for exemplar [[{{ns:special}}:
 'mediawarning' => "'''Warnin''': This file micht haud mislushious code; bi executin it yer seestem micht be compromised.<hr />",
 'imagemaxsize' => 'Limit eimages on eimage description pages tae:',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'     => 'Gallery o new files',
 'imagelisttext' => 'Ablo is a leet o $1 {{PLURAL:$1|eimage|eimages}} sortit $2.',
 'noimages'      => 'Naething tae see.',
@@ -1184,19 +1200,9 @@ This confirmation code will end at $4.',
 : ''$2''
 Please confirm that ye really want tae recreate this airticle.",
 
-# HTML dump
-'redirectingto' => 'Reguidin tae [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Clair the cache o this page?
-
-$1',
 'confirm_purge_button' => 'Aye',
-
-# AJAX search
-'searchcontaining' => "Rake for airticles wi ''$1'' in them.",
-'searchnamed'      => "Rake for airticles cried ''$1''.",
-'articletitles'    => "Airticles stairting wi ''$1''",
+'confirm-purge-top'    => 'Clair the cache o this page?',
 
 # Multipage image navigation
 'imgmultigo' => 'Gang!',
diff --git a/languages/messages/MessagesSd.php b/languages/messages/MessagesSd.php
index 6cdac9aa..9daa4995 100644
--- a/languages/messages/MessagesSd.php
+++ b/languages/messages/MessagesSd.php
@@ -7,8 +7,99 @@
  * @author Aursani
  */
 
+$fallback8bitEncoding = 'windows-1256';
 $rtl = true;
 
+$namespaceNames = array(
+	NS_MEDIA            => 'ذريعات',
+	NS_SPECIAL          => 'خاص',
+	NS_TALK             => 'بحث',
+	NS_USER             => 'يوزر',
+	NS_USER_TALK        => 'يوزر_بحث',
+	NS_PROJECT_TALK     => '$1_بحث',
+	NS_FILE             => 'عڪس',
+	NS_FILE_TALK        => 'عڪس_بحث',
+	NS_MEDIAWIKI        => 'ذريعات_وڪي',
+	NS_MEDIAWIKI_TALK   => 'ذريعات_وڪي_بحث',
+	NS_TEMPLATE         => 'سانچو',
+	NS_TEMPLATE_TALK    => 'سنچو_بحث',
+	NS_HELP             => 'مدد',
+	NS_HELP_TALK        => 'مدد_بحث',
+	NS_CATEGORY         => 'زمرو',
+	NS_CATEGORY_TALK    => 'زمرو_بحث',
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'ٻٽا چورڻا' ),
+	'BrokenRedirects'           => array( 'ٽٽل چورڻا' ),
+	'Disambiguations'           => array( 'سلجھائپ' ),
+	'Userlogin'                 => array( 'يوزر لاگ ا�ن' ),
+	'Userlogout'                => array( 'يوزر لاگ آئوٽ' ),
+	'CreateAccount'             => array( 'کاتو کوليو' ),
+	'Preferences'               => array( 'ترجيحات' ),
+	'Watchlist'                 => array( 'ٽيٽ �هرست' ),
+	'Recentchanges'             => array( 'تازيون تبديليون' ),
+	'Upload'                    => array( 'چاڙهيو' ),
+	'Listfiles'                 => array( 'عڪس �هرست' ),
+	'Newimages'                 => array( 'نوان عڪس' ),
+	'Listusers'                 => array( 'يوزر �هرست' ),
+	'Statistics'                => array( 'انگ اکر' ),
+	'Randompage'                => array( 'بلا ترتيب' ),
+	'Lonelypages'               => array( 'يتيم ص�حا' ),
+	'Uncategorizedpages'        => array( 'اڻزمرايل ص�حا' ),
+	'Uncategorizedcategories'   => array( 'اڻ زمرايل زمرا' ),
+	'Uncategorizedimages'       => array( 'اڻ زمرايل عڪس' ),
+	'Uncategorizedtemplates'    => array( 'اڻ زمرايل سانچا' ),
+	'Unusedcategories'          => array( 'اڻ استعماليل زمرا' ),
+	'Unusedimages'              => array( 'اڻ استعماليل عڪس' ),
+	'Wantedpages'               => array( 'گھربل ص�حا' ),
+	'Wantedcategories'          => array( 'گھربل زمرا' ),
+	'Shortpages'                => array( 'مختصر ص�حا' ),
+	'Longpages'                 => array( 'طويل ص�حا' ),
+	'Newpages'                  => array( 'نوان ص�حا' ),
+	'Ancientpages'              => array( 'قديم ص�حا' ),
+	'Protectedpages'            => array( 'تح�ظيل ص�حا' ),
+	'Protectedtitles'           => array( 'تح�ظيل عنوان' ),
+	'Allpages'                  => array( 'سڀ ص�حا' ),
+	'Prefixindex'               => array( 'اڳياڙي �سڻي' ),
+	'Ipblocklist'               => array( 'آء� پي بندش �هرست' ),
+	'Specialpages'              => array( 'خاص ص�حا' ),
+	'Contributions'             => array( 'ڀاڱيداريون' ),
+	'Emailuser'                 => array( 'برقٽپال يوزر' ),
+	'Confirmemail'              => array( 'برقٽپال تصديقيو' ),
+	'Whatlinkshere'             => array( 'هتان ڳن�يل ص�حا' ),
+	'Movepage'                  => array( 'ص�حو چوريو' ),
+	'Blockme'                   => array( 'مونکي بندشيو' ),
+	'Categories'                => array( 'زمرا' ),
+	'Export'                    => array( 'برآمد' ),
+	'Version'                   => array( 'ورزن' ),
+	'Allmessages'               => array( 'سڀ نياپا' ),
+	'Log'                       => array( 'لاگس' ),
+	'Blockip'                   => array( 'آء� پي بندش' ),
+	'Undelete'                  => array( 'اڻ ڊاهيو' ),
+	'Import'                    => array( 'درآمد' ),
+	'Lockdb'                    => array( 'اعدادخانو بند' ),
+	'Unlockdb'                  => array( 'اعدادخانو کول' ),
+	'Userrights'                => array( 'يوزر حق' ),
+	'MIMEsearch'                => array( 'مائيم ڳولا' ),
+	'FileDuplicateSearch'       => array( 'ساڳيا �ائيل ڳولا' ),
+	'Unwatchedpages'            => array( 'اڻٽيٽيل ص�حا' ),
+	'Listredirects'             => array( 'چورڻا �هرست' ),
+	'Unusedtemplates'           => array( 'اڻ استعماليل سانچا' ),
+	'Randomredirect'            => array( 'بلا ترتيب چورڻو' ),
+	'Mypage'                    => array( 'منهنجو ص�حو' ),
+	'Mytalk'                    => array( 'مون سان ڳالهه' ),
+	'Mycontributions'           => array( 'منهنجون ڀاڱيداريون' ),
+	'Listadmins'                => array( 'منتظمين �هرست' ),
+	'Listbots'                  => array( 'بوٽس �هرست' ),
+	'Popularpages'              => array( 'مقبول ص�حا' ),
+	'Search'                    => array( 'ڳولا' ),
+	'Withoutinterwiki'          => array( 'ري بين الوڪي' ),
+	'MergeHistory'              => array( 'سوانح ضماء�' ),
+	'Filepath'                  => array( '�ائيل �س' ),
+	'Invalidateemail'           => array( 'ناقابلڪار برقٽپال' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-showtoolbar'         => 'سنوارپ اوزار دٻي �يکاريو (جاوا اسڪرپٽ)',
@@ -27,8 +118,6 @@ $messages = array(
 'underline-always' => 'هميشه',
 'underline-never'  => 'ڪ�هن به نه',
 
-'skinpreview' => '(پيش نگاهه)',
-
 # Dates
 'sunday'        => 'آچر',
 'monday'        => 'سومر',
@@ -102,7 +191,7 @@ $messages = array(
 'moredotdotdot'  => 'اڃا...',
 'mypage'         => 'منهنجو ص�حو',
 'mytalk'         => 'مون سان ڳالهه',
-'and'            => 'Û½',
+'and'            => '&#32;Û½',
 
 'errorpagetitle'    => 'Ú†Ù�ÚªÙŽ',
 'returnto'          => '$1 �انهن وَرو.',
@@ -158,8 +247,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} بابت',
 'aboutpage'            => 'Project:بابت',
-'bugreports'           => 'چ�ڪَ ناما',
-'bugreportspage'       => 'Project:چ�ڪَ ناما',
 'copyright'            => 'سمورو مواد $1 تحت ميسر ڪجي ٿو',
 'copyrightpagename'    => '{{SITENAME}} حق ۽ واسطا',
 'copyrightpage'        => '{{ns:project}}:حق ۽ واسطا',
@@ -278,6 +365,9 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'accountcreated'             => 'کاتو کلي چڪو',
 'accountcreatedtext'         => '$1 نالي يوزر کاتو کلي چڪو آھي.',
 
+# Password reset dialog
+'retypenew' => 'نئون ڳجھو ل�ظ ٻيهر ٽائيپ ڪندا:',
+
 # Edit page toolbar
 'bold_sample'     => 'گهري تحرير',
 'bold_tip'        => 'گهري لکت',
@@ -297,8 +387,8 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'hr_tip'          => 'ا�قي لڪير (غيرضروري استعمال کان پاسو ڪندا)',
 
 # Edit pages
-'summary'                => 'تَت�',
-'subject'                => 'موضوع/س�رخي',
+'summary'                => 'تَت�:',
+'subject'                => 'موضوع/س�رخي:',
 'minoredit'              => 'هيءَ هڪ معمولي ترميم آهي',
 'watchthis'              => 'هيء� ص�حو سان�يو',
 'savearticle'            => 'ص�حو سان�يو',
@@ -308,7 +398,7 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'anoneditwarning'        => "'''خبردار:''' توهان لاگ ا�ن ٿيل ناهيو.
 هن ص�حي جي سوانح ۾ توهان جو آء� پي پتو درج ڪيو ويندو.",
 'missingcommenttext'     => 'براء� مهرباني هيٺ پنهنجا تاثرات درج ڪندا.',
-'summary-preview'        => 'تت تي پيش نگاهه',
+'summary-preview'        => 'تت تي پيش نگاهه:',
 'blockedtitle'           => 'ي�وزر بندشيل آهي.',
 'blockedtext'            => "<big>'''توهان جي يوزرنانء� يا آء� پي کي بندشيو ويو آهي.'''</big>
 
@@ -324,13 +414,13 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'accmailtitle'           => 'ڳجھو ل�ظ اماڻجي چڪو.',
 'newarticle'             => '(نئون)',
 'newarticletext'         => "توهان اهڙي ص�حي جو ڳن�ڻو وٺي هتي پهتا آهيو، جيڪو اڃا وجود نه ٿو رکي. اهڙو ص�حو جوڙڻ لاء� هيٺين باڪس ۾ ٽائيپ ڪرڻ شروع ڪريو (وڌيڪ ڄاڻڻ لاء� [[{{MediaWiki:Helppage}}|امدادي ص�حو]] �سندا). جي توهان هتي غلطيءَ ۾ اچي ويا آهيو ته رڳو پنهنجي جهانگ�وءَ جو '''back''' بٽڻ ڪلڪ ڪندا.",
-'previewnote'            => '<strong>هيءَ محظ پيش نگاهه آهي، ترميمون اڃا سان�جون ناهن!</strong>',
+'previewnote'            => "'''هيءَ محظ پيش نگاهه آهي، ترميمون اڃا سان�جون ناهن!'''",
 'editing'                => 'زير ترميم $1',
 'editingsection'         => 'زير ترميم $1 (سيڪشن)',
-'copyrightwarning'       => 'ياد رکندا ته {{SITENAME}} لاء� سموريون ڀاڱيداريون $2 تحت پڌريون ڪجن ٿيون (ت�صيلن لاء� $1 �سندا). اوهان جي تحرير کي {{SITENAME}} جي قائدن تحت ترميمي سگهجي ٿو. جيڪ�هن اوهان نه ٿا چاهيو ته اوهان جي لکڻين کي بي رحميءَ سان ترميميو وڃي يا ورهائي عام ڪيو وڃي ته پوء� پنهنجي لکڻي هتي جمع نه ڪرايو. پنهنجو مواد هتي جمع ڪرڻ جو مطلب هوندو ته توهان کي جمع ڪرايل مواد جي م�ت �راهمي ۽ ک�ليل تبديليءَ تي ڪو به اعتراز ناهي.<br />
+'copyrightwarning'       => "ياد رکندا ته {{SITENAME}} لاء� سموريون ڀاڱيداريون $2 تحت پڌريون ڪجن ٿيون (ت�صيلن لاء� $1 �سندا). اوهان جي تحرير کي {{SITENAME}} جي قائدن تحت ترميمي سگهجي ٿو. جيڪ�هن اوهان نه ٿا چاهيو ته اوهان جي لکڻين کي بي رحميءَ سان ترميميو وڃي يا ورهائي عام ڪيو وڃي ته پوء� پنهنجي لکڻي هتي جمع نه ڪرايو. پنهنجو مواد هتي جمع ڪرڻ جو مطلب هوندو ته توهان کي جمع ڪرايل مواد جي م�ت �راهمي ۽ ک�ليل تبديليءَ تي ڪو به اعتراز ناهي.<br />
 توهان اهڙي پڪ �يڻ جا پابند پڻ آهيو ته توهان جو جمع ڪرايل مواد توهان جو پنهنجو لکيل آهي يا وري توهان ڪنهن م�ت وسيلي تان ڪاپي ڪيو آهي.
-</strong>تح�ظيل حق ۽ واسطا رکندڙ مواد واسطيدار مالڪ کان اڳواٽ اجازت وٺڻ کان سواء� هتي جمع نه ڪريو.<strong>',
-'longpagewarning'        => '<strong>خبردار: هيء� ص�حو $1 ڪلوٻاٽڻيون و�و آهي؛ 32 ڪلوٻاٽڻين کان و�ا ص�حا سنواريندي ڪن جھانگوئن سان مسئلا ٿين ٿا. مهرباني ڪري هن ص�حي کي نن�ن سيڪشنز ۾ ٽوڙڻ تي ويچاريندا.</strong>',
+'''تح�ظيل حق ۽ واسطا رکندڙ مواد واسطيدار مالڪ کان اڳواٽ اجازت وٺڻ کان سواء� هتي جمع نه ڪريو.'''",
+'longpagewarning'        => "'''خبردار: هيء� ص�حو $1 ڪلوٻاٽڻيون و�و آهي؛ 32 ڪلوٻاٽڻين کان و�ا ص�حا سنواريندي ڪن جھانگوئن سان مسئلا ٿين ٿا. مهرباني ڪري هن ص�حي کي نن�ن سيڪشنز ۾ ٽوڙڻ تي ويچاريندا.'''",
 'templatesused'          => 'هن ص�حي تي استعمال ٿيندڙ سانچا:',
 'templatesusedpreview'   => 'هن پيش نگاهه ۾ استعمال ٿيل سانچا:',
 'template-protected'     => '(تح�ظيل)',
@@ -346,7 +436,7 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'viewpagelogs'        => 'هن ص�حي جا لاگ �سو',
 'currentrev'          => 'هاڻوڪو مسودو',
 'revisionasof'        => '$1 وارو پرت',
-'revision-info'       => '$1 تي $2 جي ترميم بعد مسودو',
+'revision-info'       => '$1 تي $2 جي ترميم بعد مسودو', # Additionally available: $3: revision id
 'previousrevision'    => '�اڃا پراڻو پرت',
 'nextrevision'        => 'اڃا نئون پرت→',
 'currentrevisionlink' => 'هاڻوڪو پرت',
@@ -378,6 +468,7 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'prevn'             => 'پويان $1',
 'nextn'             => 'اڳيان $1',
 'viewprevnext'      => '�سو ($1) ($2) ($3)',
+'searchhelp-url'    => 'Help:�هرست',
 'powersearch'       => 'ن�يس ڳولا',
 'powersearch-redir' => 'چورڻن جي �هرست �يکاريو',
 
@@ -385,9 +476,9 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'preferences'    => 'ترجيحات',
 'mypreferences'  => 'منهنجون ترجيحات',
 'changepassword' => 'ڳجھو ل�ظ تبديل ڪريو',
+'skin-preview'   => 'پيش نگاهه',
 'datedefault'    => 'بلا ترجيحا',
 'datetime'       => 'تاريخ ۽ وقت',
-'retypenew'      => 'نئون ڳجھو ل�ظ ٻيهر ٽائيپ ڪندا:',
 'allowemail'     => 'ٻين ي�وزرس کان ايندڙ برق ٽپال بحال ڪريو',
 
 # User rights
@@ -438,10 +529,10 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'uploadlogpage' => 'چاڙهه لاگ',
 'uploadedimage' => '"[[$1]]" چاڙهيو ويو',
 
-# Special:ImageList
-'imagelist' => '�ائيل �هرست',
+# Special:ListFiles
+'listfiles' => '�ائيل �هرست',
 
-# Image description page
+# File description page
 'filehist'                       => '�ائيل جي سوانح',
 'filehist-help'                  => 'ڪنهن به تاريخ/وقت تي ڪلڪ ڪري �سندا ته ت�ڻي اهو �ائيل ڪيئن هو.',
 'filehist-current'               => 'هاڻوڪو',
@@ -546,22 +637,19 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'emailuser' => 'هن يوزر کي برق ٽپال اماڻيو',
 
 # Watchlist
-'watchlist'            => 'منهنجي ٽيٽ �هرست',
-'mywatchlist'          => 'منهنجي ٽيٽ �هرست',
-'watchlistfor'         => "(براء� '''$1''')",
-'addedwatch'           => 'ٽيٽ �ھرست ۾ شامل ڪيو ويو.',
-'addedwatchtext'       => "ص�حو بعنوان \"[[:\$1]]\" اوهان جي [[Special:Watchlist|ٽيٽ �هرست]] ۾ شامل ٿي ويو. استقبالي تبديليون هتي درج ٿينديون وينديون. اهو ص�حو [[Special:RecentChanges|تازين تبديلين]] واري ص�حي تي '''گهرن''' اکرن ۾ نمايان ڪري �يکاريو ويندو. جيڪ�هن اوهان اهو سڀ نه ٿا چاهيو ته '''اڻ ٽيٽيو''' تي ڪلڪ ڪريو.",
-'removedwatch'         => 'ٽيٽ �هرست مان هٽايو ويو',
-'removedwatchtext'     => 'ص�حو بعنوان "[[:$1]]" توهان جي ٽيٽ �هرست مان هٽي چڪو آهي.',
-'watch'                => 'ٽيٽيو',
-'watchthispage'        => 'هيء� ص�حو ٽيٽيو',
-'unwatch'              => 'اڻ ٽيٽيو',
-'unwatchthispage'      => 'ٽيٽڻ ڇ�يو',
-'watchlist-details'    => 'مباحثي ص�حن کان سواء� {{PLURAL:$1|$1 ص�حو|$1 ص�حا}} ٽيٽيل.',
-'wlshowlast'           => 'پوين $1 ڪلاڪن $2 �ينهن جا $3 �يکاريو',
-'watchlist-hide-bots'  => 'بوٽ جون ڪيل ترميمون لڪايو',
-'watchlist-hide-own'   => 'منهنجون ڪيل ترميمون لڪايو',
-'watchlist-hide-minor' => 'معمولي ترميمون لڪايو',
+'watchlist'         => 'منهنجي ٽيٽ �هرست',
+'mywatchlist'       => 'منهنجي ٽيٽ �هرست',
+'watchlistfor'      => "(براء� '''$1''')",
+'addedwatch'        => 'ٽيٽ �ھرست ۾ شامل ڪيو ويو.',
+'addedwatchtext'    => "ص�حو بعنوان \"[[:\$1]]\" اوهان جي [[Special:Watchlist|ٽيٽ �هرست]] ۾ شامل ٿي ويو. استقبالي تبديليون هتي درج ٿينديون وينديون. اهو ص�حو [[Special:RecentChanges|تازين تبديلين]] واري ص�حي تي '''گهرن''' اکرن ۾ نمايان ڪري �يکاريو ويندو. جيڪ�هن اوهان اهو سڀ نه ٿا چاهيو ته '''اڻ ٽيٽيو''' تي ڪلڪ ڪريو.",
+'removedwatch'      => 'ٽيٽ �هرست مان هٽايو ويو',
+'removedwatchtext'  => 'ص�حو بعنوان "[[:$1]]" توهان جي ٽيٽ �هرست مان هٽي چڪو آهي.',
+'watch'             => 'ٽيٽيو',
+'watchthispage'     => 'هيء� ص�حو ٽيٽيو',
+'unwatch'           => 'اڻ ٽيٽيو',
+'unwatchthispage'   => 'ٽيٽڻ ڇ�يو',
+'watchlist-details' => 'مباحثي ص�حن کان سواء� {{PLURAL:$1|$1 ص�حو|$1 ص�حا}} ٽيٽيل.',
+'wlshowlast'        => 'پوين $1 ڪلاڪن $2 �ينهن جا $3 �يکاريو',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ٽيٽيندي...',
@@ -571,29 +659,34 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'changed'            => 'تبديل ٿي ويو',
 'created'            => 'ٺهي چڪو',
 
-# Delete/protect/revert
-'deletepage'                  => 'ص�حو ڊاهيو',
-'confirm'                     => 'پڪ ڪريو',
-'historywarning'              => 'خبردار: جيڪو ص�حو توهان ڊاهڻ وارا آهيو، تنهن جي هڪ سوانح آهي:',
-'confirmdeletetext'           => 'توهان هڪ ص�حي کي ان جي سموري سوانح سميت ڊاهڻ وارا آهيو. مهرباني ڪري پڪ ڪندا ته توهان اهو ئي ڪرڻ گھرو ٿا، ۽ اهو ته توهان ان جي نتيجن کان واق� آهيو، ۽ اهو پڻ ته توهان اهو ڪم [[{{MediaWiki:Policy-url}}|پاليسي]]ءَ مطابق ڪري رهيا آهيو.',
-'actioncomplete'              => 'ڪم پ�ورو',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ڊهي چڪو آهي.
+# Delete
+'deletepage'            => 'ص�حو ڊاهيو',
+'confirm'               => 'پڪ ڪريو',
+'historywarning'        => 'خبردار: جيڪو ص�حو توهان ڊاهڻ وارا آهيو، تنهن جي هڪ سوانح آهي:',
+'confirmdeletetext'     => 'توهان هڪ ص�حي کي ان جي سموري سوانح سميت ڊاهڻ وارا آهيو. مهرباني ڪري پڪ ڪندا ته توهان اهو ئي ڪرڻ گھرو ٿا، ۽ اهو ته توهان ان جي نتيجن کان واق� آهيو، ۽ اهو پڻ ته توهان اهو ڪم [[{{MediaWiki:Policy-url}}|پاليسي]]ءَ مطابق ڪري رهيا آهيو.',
+'actioncomplete'        => 'ڪم پ�ورو',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ڊهي چڪو آهي.
 تازو ڊاٺل ص�حن جي �هرست لاء� $2 �سندا.',
-'deletedarticle'              => '"[[$1]]" ڊهي چڪو',
-'dellogpage'                  => 'ڊاٺ لاگ',
-'deletecomment'               => 'ڊاهڻ جو سبب:',
-'deleteotherreason'           => 'اڃا ڪو ٻيو سبب:',
-'deletereasonotherlist'       => 'ٻيو سبب',
-'rollbacklink'                => 'واپس ورايو',
+'deletedarticle'        => '"[[$1]]" ڊهي چڪو',
+'dellogpage'            => 'ڊاٺ لاگ',
+'deletecomment'         => 'ڊاهڻ جو سبب:',
+'deleteotherreason'     => 'اڃا ڪو ٻيو سبب:',
+'deletereasonotherlist' => 'ٻيو سبب',
+
+# Rollback
+'rollbacklink' => 'واپس ورايو',
+
+# Protect
 'protectlogpage'              => 'تح�ظ لاگ',
+'prot_1movedto2'              => '[[$1]] کي چوري [[$2]] تي رکيو ويو',
 'protect-legend'              => 'تح�ظڻ جي پڪ ڪريو',
 'protectcomment'              => 'تاثرات:',
 'protectexpiry'               => 'اختتام:',
 'protect_expiry_invalid'      => 'انجامي مدو ناقابلڪار آهي.',
 'protect_expiry_old'          => 'انجامي مدو ماضيءَ ۾ آهي.',
 'protect-unchain'             => 'چورڻ جي روڪ ختم ڪريو',
-'protect-text'                => 'توهان <strong><nowiki>$1</nowiki></strong> ص�حي جي تح�ظاتي سطح �سي ۽ بدلائي سگھو ٿا.',
-'protect-locked-access'       => 'توهان جو کاتو ص�حن جي تح�ظاتي سطح تبديلي ڪرڻ جا اختيار نه ٿو رکي. هيٺ ص�حي جون وقوعات (سيٽڱس) پيش ڪجن ٿيون <strong>$1</strong>:',
+'protect-text'                => "توهان '''<nowiki>$1</nowiki>''' ص�حي جي تح�ظاتي سطح �سي ۽ بدلائي سگھو ٿا.",
+'protect-locked-access'       => "توهان جو کاتو ص�حن جي تح�ظاتي سطح تبديلي ڪرڻ جا اختيار نه ٿو رکي. هيٺ ص�حي جون وقوعات (سيٽڱس) پيش ڪجن ٿيون '''$1''':",
 'protect-cascadeon'           => 'هيء� ص�حو �ي الوقت تح�ظيل آهي، ڇاڪاڻ ته اهو هيٺين {{PLURAL:$1|ص�حي|ص�حن}} جو حصو آهي، جنهن تي تح�ظ در تح�ظ لاڳو ٿيل آهي.',
 'protect-fallback'            => '"$1" جي اجازت گھرجي',
 'protect-level-autoconfirmed' => 'غيرکاتيدار ي�وزرس کي بندشيو',
@@ -601,6 +694,7 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'protect-summary-cascade'     => 'تح�ظ در تح�ظ',
 'protect-cascade'             => 'هن ص�حي ۾ شامل ص�حن کي تح�ظيو (تح�ظ در تح�ظ)',
 'protect-cantedit'            => 'توهان هن ص�حي جي تح�ظاتي سطح نٿا بدلائي سگھو، ڇاڪاڻ ته توهان ان کي سنوارڻ جي اجازت نٿا رکو.',
+'protect-expiry-options'      => '2 ڪلاڪ:2 hours،1 �ينهن:1 day،3 �ينهن:3 days،1 ه�تو:1 week،2 ه�تا:2 weeks،1 مهينو:1 month،3 مهينا:3 months،6 مهينا:6 months،1 سال:1 year،لامحدود:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'اجازتنامو:',
 'restriction-level'           => 'روڪ سطح:',
 'pagesize'                    => '(ٻاٽڻيون)',
@@ -628,7 +722,6 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 # What links here
 'whatlinkshere'       => 'هتان ڇا ڳن�يل آهي',
 'whatlinkshere-title' => '$1 سان ڳن�يل ص�حا',
-'linklistsub'         => '(ڳن�ڻي جي �هرست)',
 'linkshere'           => "هيٺيان ص�حا '''[[:$1]]''' سان ڳن�يل آهن:",
 'nolinkshere'         => "'''[[:$1]]''' سان ڪو به ص�حو ڳن�يل ناهي.",
 'isredirect'          => 'چورڻو ص�حو',
@@ -757,7 +850,7 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 'show-big-image'       => 'سنهو ترين تحلل',
 'show-big-image-thumb' => '<small>هن پيش نگاهه جي ماپ: $1 × $2 عڪسلون</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'نون �ائيلن جي گيلري',
 'noimages'  => '�سڻ لاء� ڪجھه ناهي.',
 'bydate'    => 'تاريخوار',
@@ -829,9 +922,6 @@ $1 {{PLURAL:$1|اکر|اکرن}} کان نن�ي هوڻ گھرجي.',
 # Delete conflict
 'recreate' => 'ورسجيو',
 
-# AJAX search
-'articletitles' => "''$1'' سان شروع ٿيندڙ مضمون",
-
 # Watchlist editing tools
 'watchlisttools-view' => 'لاڳاپيل تبديليون �سو',
 'watchlisttools-edit' => 'ٽيٽ �هرست �سو ۽ سنواريو',
diff --git a/languages/messages/MessagesSdc.php b/languages/messages/MessagesSdc.php
index d0f14c96..e3e1f8b3 100644
--- a/languages/messages/MessagesSdc.php
+++ b/languages/messages/MessagesSdc.php
@@ -9,6 +9,98 @@
  * @author Felis
  */
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Ippiziari',
+	NS_TALK             => 'Dischussioni',
+	NS_USER             => 'Utenti',
+	NS_USER_TALK        => 'Dischussioni_utenti',
+	NS_PROJECT_TALK     => 'Dischussioni_$1',
+	NS_FILE             => 'Immagina',
+	NS_FILE_TALK        => 'Dischussioni_immagina',
+	NS_MEDIAWIKI_TALK   => 'Dischussioni_MediaWiki',
+	NS_TEMPLATE         => 'Mudellu',
+	NS_TEMPLATE_TALK    => 'Dischussioni_mudellu',
+	NS_HELP             => 'Aggiuddu',
+	NS_HELP_TALK        => 'Dischussioni_aggiuddu',
+	NS_CATEGORY         => 'Categuria',
+	NS_CATEGORY_TALK    => 'Dischussioni_categuria',
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'RinviiDoppi' ),
+	'BrokenRedirects'           => array( 'RinviiIbbagliaddi' ),
+	'Disambiguations'           => array( 'CuLuMatessiInnommu' ),
+	'Userlogin'                 => array( 'Intra', 'Login', 'Accesso' ),
+	'Userlogout'                => array( 'Isci', 'Logout', 'Uscita' ),
+	'Preferences'               => array( 'Prifirènzi' ),
+	'Watchlist'                 => array( 'AbbaidaddiIppiziari' ),
+	'Recentchanges'             => array( 'UlthimiMudìfigghi' ),
+	'Upload'                    => array( 'Carrigga' ),
+	'Listfiles'                 => array( 'Immagini' ),
+	'Newimages'                 => array( 'ImmaginiRizzenti' ),
+	'Listusers'                 => array( 'Utenti', 'ErencuUtenti' ),
+	'Statistics'                => array( 'Sthatisthigghi' ),
+	'Randompage'                => array( 'PàginaCasuari' ),
+	'Lonelypages'               => array( 'PàginaÒiffana' ),
+	'Uncategorizedpages'        => array( 'PàginiChenaCateguri' ),
+	'Uncategorizedcategories'   => array( 'CateguriNòCategurizzaddi' ),
+	'Uncategorizedimages'       => array( 'ImmaginiChenaCateguri' ),
+	'Uncategorizedtemplates'    => array( 'MudelliChenaCateguri' ),
+	'Unusedcategories'          => array( 'CateguriInutirizaddi' ),
+	'Unusedimages'              => array( 'FileInutirizaddi' ),
+	'Wantedpages'               => array( 'PàginiPiùDumandaddi' ),
+	'Wantedcategories'          => array( 'CateguriDumandaddi' ),
+	'Mostlinked'                => array( 'PàginiPiùRiciamaddi' ),
+	'Mostlinkedcategories'      => array( 'CateguriPiùRiciamaddi' ),
+	'Mostlinkedtemplates'       => array( 'MudelliPiùRiciamaddi' ),
+	'Mostcategories'            => array( 'PàginiCunPiùCateguri' ),
+	'Mostimages'                => array( 'ImmaginiPiùRiciamaddi' ),
+	'Mostrevisions'             => array( 'PàginiCunPiùRibisioni' ),
+	'Fewestrevisions'           => array( 'PàginiCunMancuRibisioni' ),
+	'Shortpages'                => array( 'PàginiPiùCorthi' ),
+	'Longpages'                 => array( 'PàginiPiùLonghi' ),
+	'Newpages'                  => array( 'PàginiPiùRizzenti' ),
+	'Ancientpages'              => array( 'PàginiMancuRizzenti' ),
+	'Deadendpages'              => array( 'PàginiChenaIscidda' ),
+	'Protectedpages'            => array( 'PàginiPrutiggiddi' ),
+	'Allpages'                  => array( 'TuttiLiPàgini' ),
+	'Prefixindex'               => array( 'Prefissi' ),
+	'Ipblocklist'               => array( 'IPBroccaddi' ),
+	'Specialpages'              => array( 'PàginiIppiziari' ),
+	'Contributions'             => array( 'Cuntributi', 'CuntributiUtente' ),
+	'Emailuser'                 => array( 'InviaPosthaErettrònica' ),
+	'Whatlinkshere'             => array( 'PuntaniInogghi' ),
+	'Recentchangeslinked'       => array( 'MudìfigghiLiaddi' ),
+	'Movepage'                  => array( 'Ippustha', 'Rinumina' ),
+	'Blockme'                   => array( 'BroccaProxy' ),
+	'Booksources'               => array( 'ZirchaISBN' ),
+	'Categories'                => array( 'Categuri' ),
+	'Export'                    => array( 'Ippurtha' ),
+	'Version'                   => array( 'Versioni' ),
+	'Allmessages'               => array( 'Imbasciaddi' ),
+	'Log'                       => array( 'Rigisthru', 'Rigisthri', 'Registro', 'Registri' ),
+	'Blockip'                   => array( 'Brocca' ),
+	'Undelete'                  => array( 'TurraChePrimma' ),
+	'Import'                    => array( 'Impurtha' ),
+	'Lockdb'                    => array( 'BroccaDB' ),
+	'Unlockdb'                  => array( 'IbbruccaDB' ),
+	'Userrights'                => array( 'PrimmissiUtenti' ),
+	'MIMEsearch'                => array( 'ZirchaMIME' ),
+	'Unwatchedpages'            => array( 'PàginiNòAbbaidaddi' ),
+	'Listredirects'             => array( 'Rinvii' ),
+	'Revisiondelete'            => array( 'CanzillaRibisioni' ),
+	'Unusedtemplates'           => array( 'MudelliInutirizaddi' ),
+	'Randomredirect'            => array( 'RinviuCasuari' ),
+	'Mypage'                    => array( 'MeaPàginaUtenti' ),
+	'Mytalk'                    => array( 'MéDischussioni' ),
+	'Mycontributions'           => array( 'MéCuntributi' ),
+	'Listadmins'                => array( 'Amministhradori' ),
+	'Popularpages'              => array( 'PàginiPiùVisitaddi' ),
+	'Search'                    => array( 'Zircha', 'Ricerca' ),
+	'Resetpass'                 => array( 'RimpusthàParàuraDÓrdhini' ),
+	'Withoutinterwiki'          => array( 'PàginiChenaInterwiki' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Sotturìnia li cullegamenti:',
@@ -56,8 +148,6 @@ $messages = array(
 'underline-never'   => 'Mai',
 'underline-default' => "Manteni l'impusthazioni di lu nabiggadori",
 
-'skinpreview' => '(antiprimma)',
-
 # Dates
 'sunday'        => 'Dumènigu',
 'monday'        => 'Luni',
@@ -146,7 +236,7 @@ Li sighenti cullegamenti so in linga ingrese:
 'mytalk'         => "Li me' dischussioni",
 'anontalk'       => 'Dischussioni pa chisthu IP',
 'navigation'     => 'Nabiggazioni',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadati:',
@@ -209,8 +299,6 @@ Li sighenti cullegamenti so in linga ingrese:
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Infuimmazioni in {{SITENAME}}',
 'aboutpage'            => 'Project:Infuimmazioni',
-'bugreports'           => 'Maiffunzionamenti',
-'bugreportspage'       => 'Project:Maiffunzionamenti',
 'copyright'            => "Cuntinuddi suggetti a licèntzia d'usu $1.",
 'copyrightpagename'    => 'Lu copyright i {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -233,8 +321,6 @@ Li sighenti cullegamenti so in linga ingrese:
 
 'badaccess'        => 'Primmissi no suffizenti',
 'badaccess-group0' => "Nò si diponi di li primmissi nezzessàri pa eseguì l'azioni dumandadda.",
-'badaccess-group1' => 'La funzioni dumandadda è riseivvadda a li utenti chi apparthènini a lu gruppu $1.',
-'badaccess-group2' => 'La funzioni dumandadda è riseivvadda a li utenti chi apparthènini a li gruppi $1.',
 'badaccess-groups' => 'La funzioni dumandadda è riseivvadda a li utenti chi apparthènini a unu di li sighenti gruppi: $1.',
 
 'versionrequired'     => 'Versioni $1 di MediaWiki dumandadda',
@@ -321,7 +407,6 @@ L'amministhradori di sisthema chi l'à broccadda à lassaddu chistha giusthifigg
 'cannotdelete'         => 'Impussìbiri canzillà la pàgina o lu file dumandaddu. (Pudia assé isthaddu già canzilladdu.)',
 'badtitle'             => 'Tìturu no currettu',
 'badtitletext'         => "Lu tìturu di la pàgina dumandadda è bioddu, ibbagliaddu o cun caràtteri no ammessi oppuru deriba da un errori i' li cullegamenti tra siti wiki dibessi o versioni in linghi dibessi di lu matessi situ.",
-'perfdisabled'         => "Semmu dipiazuddi, chistha funzionariddai è timpuraniamenti disàbiritadda parchí lu so'usu rallinta la bancadati finz'a rindì lu situ inutirizabiri pa tutti l'utenti.",
 'perfcached'           => "Li dati chi seghini so cabaddi da una còpia i' la mimória cache di la bancadati, no aggiornaddi in tempu riari.",
 'perfcachedts'         => "Li dati chi seghini so cabaddi da una còpia i' la mimória cache di la bancadati. Ulthimu aggiornamentu: $1.",
 'querypage-no-updates' => "L'aggiornamenti di la pàgina so timpuraniamenti suippesi. Li dati in edda cuntinuddi no sarani aggiornaddi.",
@@ -335,7 +420,7 @@ Interrogazioni: $2",
 'protectedpagetext'    => 'Chistha pàgina è isthadda prutiggidda pa impidinni la mudìfigga.',
 'viewsourcetext'       => 'È pussìbiri visuarizzà e cupià lu còdizi di chistha pàgina:',
 'protectedinterface'   => "Chistha pàgina cunteni un'erementu chi fazzi parthi di l'interfàccia utenti di lu software; è dunca prutiggidda pa evità pussìbiri abusi.",
-'editinginterface'     => "'''Attinzioni:''' Lu testhu di chistha pàgina fazzi parthi di l'interfàccia utenti di lu situ. Tutti li mudìfigghi arriggaddi a chistha pàgina si rifrèttini i' l'imbasciaddi visuarizzaddi pa tutti l'utenti. Pa li traduzioni, pa piazeri utirizà [http://translatewiki.net/wiki/Main_Page?setlang=sdc Betawiki], lu prugettu di lucarizazioni MediaWiki.",
+'editinginterface'     => "'''Attinzioni:''' Lu testhu di chistha pàgina fazzi parthi di l'interfàccia utenti di lu situ. Tutti li mudìfigghi arriggaddi a chistha pàgina si rifrèttini i' l'imbasciaddi visuarizzaddi pa tutti l'utenti. Pa li traduzioni, pa piazeri utirizà [http://translatewiki.net/wiki/Main_Page?setlang=sdc translatewiki.net], lu prugettu di lucarizazioni MediaWiki.",
 'sqlhidden'            => "(l'interrogazioni SQL è isthadda cuadda)",
 'cascadeprotected'     => 'In chistha pàgina nò è pussìbiri effettuà mudìfigghi parchí è isthadda incrusa {{PLURAL:$1|i la sighenti pàgina indicadda, ch\'è isthadda prutiggidda|i li sighenti pàgini indicaddi, chi so isthaddi prutiggiddi}} chirriendi la prutizioni "ricussiba":
 $2',
@@ -347,7 +432,7 @@ La rasgioni frunidda è ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Iscidda utenti',
-'logouttext'                 => "<strong>Iscidda effettuadda.</strong><br />
+'logouttext'                 => "'''Iscidda effettuadda.'''<br />
 Si pò sighì a usà {{SITENAME}} cumenti utenti anònimu oppuru eseguì una noba intradda, cu' lu matessi innòmu utenti o un'innòmu dibessu.
 
 Zerthuni pàgini pudìani continuà a apparì cumenti si la iscidda nò fùssia avvinudda finaghì nò vèni puridda la mimória cache di lu propriu nabiggadori.",
@@ -361,7 +446,6 @@ La registhrazioni è isthadda criadda currettamenti. No dimintiggà di passunari
 'remembermypassword'         => "Ammenta la paràura d'órdhini",
 'yourdomainname'             => 'Ippizzificà lu dumìniu',
 'externaldberror'            => "S'è verifiggaddu un errori cu l'elaburaddori sivvidori di autentificazioni esthernu, oppuru nò si diponi di l'autorizazioni nezzessàri pa aggiornà la propria registhrazioni estherna.",
-'loginproblem'               => "<b>S'è verifiggaddu un errori duranti l'intradda.</b><br />Riprubà.",
 'login'                      => 'Intra',
 'nav-login-createaccount'    => 'Intra / registhrazioni',
 'loginprompt'                => 'Pa intrà a {{SITENAME}} è nezzessàriu abirità li cookie.',
@@ -441,11 +525,13 @@ Si la registhrazioni è isthadda criadda pa un\'errori, pói ignorà chisth\'imb
 Pa cumprità la registhrazioni è nezzessàriu impusthà una noba paràura d'órdhini inogghi:",
 'resetpass_text'          => '<!-- Aggiungi lu testhu inogghi -->',
 'resetpass_header'        => "Rimpustha paràura d'órdhini",
+'oldpassword'             => "Véccia paràura d'órdhini:",
+'newpassword'             => "Noba paràura d'órdhini:",
+'retypenew'               => "Turra a ischribì la noba paràura d'órdhini:",
 'resetpass_submit'        => "Impustha la paràura d'órdhini e intra",
 'resetpass_success'       => "La paràura d'órdhini tóia è isthadda mudìfiggadda. Abà sei intrendi...",
 'resetpass_bad_temporary' => "Paràura d'órdhini timpuràniua invàridda. La paràura d'órdhini pudaria assé isthadda già ciambadda, oppuru pudaria assé isthadda dumandadda una noba paràura d'órdhini timpurània.",
 'resetpass_forbidden'     => "No è pussìbiri mudifiggà li paràuri d'órdhini in {{SITENAME}}.",
-'resetpass_missing'       => "Dati mancanti i' lu mòdulu.",
 
 # Edit page toolbar
 'bold_sample'     => 'Grassetu',
@@ -470,8 +556,8 @@ Pa cumprità la registhrazioni è nezzessàriu impusthà una noba paràura d'ór
 'hr_tip'          => 'Lìnia orizontari (usà cun moderazioni)',
 
 # Edit pages
-'summary'                   => 'Oggettu',
-'subject'                   => 'Tìturu',
+'summary'                   => 'Oggettu:',
+'subject'                   => 'Tìturu:',
 'minoredit'                 => 'Chistha è una mudìfigga minori',
 'watchthis'                 => "Aggiungi a l'abbaidaddi ippiziari",
 'savearticle'               => 'Sàivva la pàgina',
@@ -483,8 +569,8 @@ Pa cumprità la registhrazioni è nezzessàriu impusthà una noba paràura d'ór
 'missingsummary'            => "'''Promimória:''' Nò ài ippizzificaddu l'oggettu di la mudìfigga. Turrendi à incalchà '''Sàivva la pàgina''' lu mudìfigga sarà sàivvadda cun l'oggettu bioddu.",
 'missingcommenttext'        => 'Insirì un cummentu in giossu.',
 'missingcommentheader'      => "'''Promimória:''' Nò hai ippizzificaddu l'intisthazioni di chisthu cummentu. Turrendi à incalchà '''Sàivva la pàgina''' lu mudìfigga sarà sàivvadda chena intisthazioni.",
-'summary-preview'           => 'Antiprimma oggettu',
-'subject-preview'           => 'Antiprimma oggettu/intisthazioni',
+'summary-preview'           => 'Antiprimma oggettu:',
+'subject-preview'           => 'Antiprimma oggettu/intisthazioni:',
 'blockedtitle'              => 'Utenti broccaddu.',
 'blockedtext'               => "<big>'''Chisth'innòmmu utenti o indirizzu IP so isthaddi broccaddi.'''</big>
 
@@ -537,21 +623,21 @@ S'ài sighiddu lu cullegamentu pa un'errori, è suffizenti incalchà lu buttoni
 'noarticletext'             => "Abà la pàgina è biodda. È pussìbiri [[Special:Search/{{PAGENAME}}|zirchà chistu innòmu]] i' l'althri pàgini di lu situ oppuru [{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} mudifiggà la pàgina].",
 'userpage-userdoesnotexist' => 'La registhrazioni "$1" nò curripundi a un\'utenti rigisthraddu. Verifiggà chi s\'aggia avveru gana di crià o mudìfiggà chistha pàgina.',
 'clearyourcache'            => "'''Nota:''' daboi abé saivaddu è nezzessàriu pulì la mimória cache di lu propriu nabiggadori pà vidé li ciambamenti. Pa '''Mozilla / Firefox / Safari''': fà clic i Ricàrrigga incalchendi lu buttoni di li maiuschuri, oppuru incalchà ''Ctrl-Maiusc-R'' (''Cmd-Maiusc-R'' i Mac); pa '''Internet Explorer:''' mantinì incalchaddu lu tasthu ''Ctrl'' mentri s'incalcha lu buttoni ''Aggiorna'' o incalchà ''Ctrl-F5''; pa '''Konqueror''': incalchà lu buttoni ''Ricarica'' o lu tasthu ''F5''; pa '''Opera''' pò assé nezzessàriu ibbuiddà cumpretamenti la mimória cache da lu menù ''Strumenti → Preferenze''.",
-'usercssjsyoucanpreview'    => "<strong>Suggerimentu:</strong> Usa lu buttoni '''Visuarizza antiprimma''' pa prubà li nobi CSS/JS primma di sàivvaddi.",
+'usercssjsyoucanpreview'    => "'''Suggerimentu:''' Usa lu buttoni '''Visuarizza antiprimma''' pa prubà li nobi CSS/JS primma di sàivvaddi.",
 'usercsspreview'            => "'''Ammitanti ch'è soru un'antiprimma di lu propriu CSS passunari; li mudìfigghi nò so ancora isthaddi sàivvaddi!'''",
 'userjspreview'             => "'''Ammitanti ch'è soru un'antiprimma pa prubà lu propriu JavaScript passunari; li mudìfigghi nò so ancora isthaddi sàivvaddi!'''",
 'userinvalidcssjstitle'     => "'''Attinzioni:''' Nò isisthi nisciun aipettu gràficu \"\$1\". Amminta chi li pàgini pa li .css e .js passunari àni lu primu caràtteri di lu tìturu minori, cumenti {{ns:user}}:Foo/monobook.css e nò {{ns:user}}:Foo/Monobook.css.",
 'updated'                   => '(Aggiornaddu)',
-'note'                      => '<strong>NOTA:</strong>',
-'previewnote'               => "<strong>Attinzioni: chistha è soru un'antiprimma. Li mudìfigghi a la pàgina NÒ so ancora isthaddi saivvaddi!</strong>",
+'note'                      => "'''NOTA:'''",
+'previewnote'               => "'''Attinzioni: chistha è soru un'antiprimma. Li mudìfigghi a la pàgina NÒ so ancora isthaddi saivvaddi!'''",
 'previewconflict'           => "L'antiprimma curripundi a lu testhu prisenti i' la casella di mudìfigga superiori e musthra la pàgina cumenti apparirà si s'à gana di incalchà abà '''Sàivva la pàgina'''.",
-'session_fail_preview'      => '<strong>Semmu dipiazuddi, nò è isthaddu pussìbiri sàivva la mudìfiggà parchí sò andaddi pessi i dati reratibi a la sissioni. Si lu probrema continua, prubà a iscì e effettuà una noba intradda.</strong>',
-'session_fail_preview_html' => "<strong>Semmu dipiazuddi, no è isthaddu pussìbiri elaburà la mudìfigga parchì sò andaddi pessi li dati reratibi a la sissioni.</strong>
+'session_fail_preview'      => "'''Semmu dipiazuddi, nò è isthaddu pussìbiri sàivva la mudìfiggà parchí sò andaddi pessi i dati reratibi a la sissioni. Si lu probrema continua, prubà a iscì e effettuà una noba intradda.'''",
+'session_fail_preview_html' => "'''Semmu dipiazuddi, no è isthaddu pussìbiri elaburà la mudìfigga parchì sò andaddi pessi li dati reratibi a la sissioni.'''
 
 ''Parchì in {{SITENAME}} è cunsintiddu l'usu di l'HTML chena limitazioni, l'antiprimma no è visuarizzadda, pa sigguriddai contru l'attacchi JavaScript.''
 
-<strong>Si lu probrema prisisthi, pói prubà à iscì e turrà a intrà.</strong>",
-'token_suffix_mismatch'     => "<strong>La mudìfigga nò è isthadda sàivvadda parchí lu nabiggadori à musthraddu di gesthì in modu erraddu i caràtteri di punteggiaddura i' lu identifigganti di la mudìfigga. Pa evità una pussìbiri corruzioni di lu testhu di la pàgina, è isthadda rifiutadda l'intrea mudìfigga. Chistha situazioni pó verifiggassi, calch’e voltha, candu so usaddi zerthuni sivvìzi di proxy anònimi via reti chi àni di l'errori.</strong>",
+'''Si lu probrema prisisthi, pói prubà à iscì e turrà a intrà.'''",
+'token_suffix_mismatch'     => "'''La mudìfigga nò è isthadda sàivvadda parchí lu nabiggadori à musthraddu di gesthì in modu erraddu i caràtteri di punteggiaddura i' lu identifigganti di la mudìfigga. Pa evità una pussìbiri corruzioni di lu testhu di la pàgina, è isthadda rifiutadda l'intrea mudìfigga. Chistha situazioni pó verifiggassi, calch’e voltha, candu so usaddi zerthuni sivvìzi di proxy anònimi via reti chi àni di l'errori.'''",
 'editing'                   => 'Mudifigga di $1',
 'editingsection'            => 'Mudifigga di $1 (sezzioni)',
 'editingcomment'            => 'Mudifigga di $1 (cummentu)',
@@ -563,24 +649,24 @@ Si vói cunfèimmalli, dévi arriggà li mudìfigghi tói i' lu testhu esisthent
 '''Soru''' lu testhu i' la casella superiori sarà sàivvaddu candu tu incalcharé \"Sàivva la pàgina\".",
 'yourtext'                  => 'Lu testhu tóiu',
 'storedversion'             => 'La versioni mimurizadda',
-'nonunicodebrowser'         => "<strong>ATTINZIONI: Lu nabiggadori tóiu nò è cumpatìbiri cu' li caràtteri Unicode. Pa cunsintì la mudìfigga di li pàgini chena crià incunvinienti, i caràtteri nò ASCII so visuarizzaddi i' la casella di mudìfigga cumenti còdizi esadezimari.</strong>",
-'editingold'                => '<strong>ATTINZIONI: Sei mudìfigghendi una versioni di la pàgina nò aggiornadda. Si vói saivvàlla tutti i ciambamenti arriggaddi daboi chistha ribisioni sarani pessi!</strong>',
+'nonunicodebrowser'         => "'''ATTINZIONI: Lu nabiggadori tóiu nò è cumpatìbiri cu' li caràtteri Unicode. Pa cunsintì la mudìfigga di li pàgini chena crià incunvinienti, i caràtteri nò ASCII so visuarizzaddi i' la casella di mudìfigga cumenti còdizi esadezimari.'''",
+'editingold'                => "'''ATTINZIONI: Sei mudìfigghendi una versioni di la pàgina nò aggiornadda. Si vói saivvàlla tutti i ciambamenti arriggaddi daboi chistha ribisioni sarani pessi!'''",
 'yourdiff'                  => 'Diffarènzi',
 'copyrightwarning'          => "Nota: tutti li cuntributi a {{SITENAME}} so rilassaddi i la licènzia d'usu $2 (vedi $1 pa maggiori dettàgli). Si nò vói chi li testhi tói siani mudìfiggaddi e disthribuiddi a cassisia chena l'autorizzazioni tóia, nò l'invia à {{SITENAME}}. <br />
 Inviendi lu testhu ài la ripunsabiriddai chi lu testhu sia toiu oppuru sia i lu pùbbriggu dumìniu.
 
-<strong>NÒ INVIÀ MATERIARI CUBERTHU DA DIRITTU D'AUTORI CHENA AUTORIZZAZIONI!</strong>",
+'''NÒ INVIÀ MATERIARI CUBERTHU DA DIRITTU D'AUTORI CHENA AUTORIZZAZIONI!'''",
 'copyrightwarning2'         => "Nota: tutti li cuntributi inviaddi a {{SITENAME}} pòni assé mudìfiggaddi o canzilladdi da l'althri utenti. Si nò vói chi li testhi tói siani mudìfiggaddi e disthribuiddi a cassisia chena l'autorizzazioni tóia, nò l'invia à chisthu situ.<br />
 Inviendi lu testhu ài la ripunsabiriddai chi lu testhu sia toiu oppuru sia i lu pùbbriggu dumìniu (vedi $1 pa maggiori dettàgli).
 
-<strong>NÒ INVIÀ MATERIARI CUBERTHU DA DIRITTU D'AUTORI CHENA AUTORIZZAZIONI!</strong>",
-'longpagewarning'           => '<strong>ATTINZIONI: Chistha pàgina è longa $1 kilobyte; zerthuni nabiggadori pudiani abé dei prubremi. Si pussìbiri suddibidì la pàgina in sezzioni o sottupàgini minori.</strong>',
-'longpageerror'             => "<strong>ERRORI: Lu testhu ch'ài inviaddu è longu $1 kB (kilobytes), più di la misura massima cunsintidda di $2 kB. Lu testhu nò pò assé sàivvaddu.</strong>",
-'readonlywarning'           => "<strong>ATTINZIONI: La bancadati è isthadda broccadda pa manutinzioni, dunca abà è impussìbiri saivvà li mudìfigghi. Pa no pirdhilli, copia lu testhu mudifiggaddu in un file i' lu to' elaburaddori e torra a saivvallu candu la bancadati sarà ibbruccadda.</strong>",
-'protectedpagewarning'      => "<strong>ATTINZIONI: Chista pàgina è isthadda broccadda parchì soru l'utenti cun pribiréggi di amministhradori possiano mudìfiggarla.</strong>",
+'''NÒ INVIÀ MATERIARI CUBERTHU DA DIRITTU D'AUTORI CHENA AUTORIZZAZIONI!'''",
+'longpagewarning'           => "'''ATTINZIONI: Chistha pàgina è longa $1 kilobyte; zerthuni nabiggadori pudiani abé dei prubremi. Si pussìbiri suddibidì la pàgina in sezzioni o sottupàgini minori.'''",
+'longpageerror'             => "'''ERRORI: Lu testhu ch'ài inviaddu è longu $1 kB (kilobytes), più di la misura massima cunsintidda di $2 kB. Lu testhu nò pò assé sàivvaddu.'''",
+'readonlywarning'           => "'''ATTINZIONI: La bancadati è isthadda broccadda pa manutinzioni, dunca abà è impussìbiri saivvà li mudìfigghi. Pa no pirdhilli, copia lu testhu mudifiggaddu in un file i' lu to' elaburaddori e torra a saivvallu candu la bancadati sarà ibbruccadda.'''",
+'protectedpagewarning'      => "'''ATTINZIONI: Chista pàgina è isthadda broccadda parchì soru l'utenti cun pribiréggi di amministhradori possiano mudìfiggarla.'''",
 'semiprotectedpagewarning'  => "'''Nota:''' Chista pàgina è isthadda broccadda parchì soru li utenti registhraddi possiano mudìfiggarla.",
 'cascadeprotectedwarning'   => "'''Attinzioni:''' Chistha pàgina è isthadda broccadda in modu chi soru l'utenti cun pribiréggi di amministhradori possiano mudìfiggarla. Lu chi avvini parchí la pàgina è incrusa {{PLURAL:\$1|i la pàgina indicadda ..., ch'è isthadda prutiggidda|i li pàgini indicaddi ..., chi so isthaddi prutiggiddi}} chirriendi la prutizioni \"ricussiba\":",
-'titleprotectedwarning'     => '<strong>ATTINZIONI: Chistha pàgina è isthadda broccadda in modu chi soru zerthuni utenti possiano crialla.</strong>',
+'titleprotectedwarning'     => "'''ATTINZIONI: Chistha pàgina è isthadda broccadda in modu chi soru zerthuni utenti possiano crialla.'''",
 'templatesused'             => 'Mudelli utirizaddi in chistha pàgina:',
 'templatesusedpreview'      => "Mudelli utirizaddi in chisth'antiprimma:",
 'templatesusedsection'      => 'Mudelli utirizaddi in chistha sezzioni:',
@@ -610,11 +696,9 @@ La rasgioni frunidda da $3 è ''$2''",
 # History pages
 'viewpagelogs'        => 'Visuarizza li rigisthri reratibi a chistha pàgina.',
 'nohistory'           => 'Cronologia di li versioni di chistha pàgina nò riperìbiri.',
-'revnotfound'         => 'Versioni nò acciappadda',
-'revnotfoundtext'     => "La versioni dumandadda di la pàgina nò è isthadda acciappadda. Verifiggà l'indirizzu usaddu pa intrà a chistha pàgina.",
 'currentrev'          => 'Versioni currenti',
 'revisionasof'        => 'Versioni di lu $1',
-'revision-info'       => 'Versioni di lu $1, autori: $2',
+'revision-info'       => 'Versioni di lu $1, autori: $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Versioni mancu rizzenti',
 'nextrevision'        => 'Versioni più rizzenti →',
 'currentrevisionlink' => 'Versioni currenti',
@@ -722,6 +806,7 @@ Cunsulthà lu [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} rigisthru di ca
 'prevn'                 => 'prizzidenti $1',
 'nextn'                 => 'sighenti $1',
 'viewprevnext'          => 'Vèdi ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Indizi',
 'searchrelated'         => 'curriraddi',
 'searchall'             => 'tutti',
 'showingresults'        => "Accó {{PLURAL:$1|màssimu '''1''' risulthaddu|màssimu li '''$1''' risulthaddi}} à partì da lu nùmaru #'''$2'''.",
@@ -747,6 +832,7 @@ Cunsulthà lu [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} rigisthru di ca
 'qbsettings-floatingright' => 'Galliggianti a drestha',
 'changepassword'           => "Ciamba paràura d'órdhini",
 'skin'                     => 'Aipettu gràficu',
+'skin-preview'             => 'antiprimma',
 'math'                     => 'Fòimmuri matemàtigghi',
 'dateformat'               => 'Fuimmaddu di la data',
 'datedefault'              => 'Nisciuna prifirènzia',
@@ -768,9 +854,6 @@ Cunsulthà lu [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} rigisthru di ca
 'prefs-misc'               => 'Vari',
 'saveprefs'                => 'Sàivva li prifirenzi',
 'resetprefs'               => 'Rimpusthà li prifirènzi',
-'oldpassword'              => "Véccia paràura d'órdhini:",
-'newpassword'              => "Noba paràura d'órdhini:",
-'retypenew'                => "Turra a ischribì la noba paràura d'órdhini:",
 'textboxsize'              => 'Casella di mudìfigga',
 'rows'                     => 'Righi:',
 'columns'                  => 'Curonni:',
@@ -798,7 +881,7 @@ Cunsulthà lu [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} rigisthru di ca
 'userrights-lookup-user'   => 'Gisthioni di li gruppi utenti',
 'userrights-user-editname' => "Insirì l'innòmu utenti:",
 'editusergroup'            => 'Mudìfigga gruppi utenti',
-'editinguser'              => "Mudifigga di li diritti di l'utenti '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'              => "Mudifigga di li diritti di l'utenti '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup' => 'Mudìfigga gruppi utenti',
 'saveusergroups'           => 'Sàivva gruppi utenti',
 'userrights-groupsmember'  => 'Appartheni a li gruppi:',
@@ -880,11 +963,11 @@ Cunsulthà lu [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} rigisthru di ca
 'upload_directory_read_only'  => "L'elaburaddori sivvidori nò è bonu à ischribì i' la carthella di carriggamentu ($1).",
 'uploaderror'                 => "Errori i' lu carriggamentu",
 'uploadtext'                  => "Usà lu mòdulu in giossu pà carriggà file.
-Pà visuarizzà o zirchà li file già carriggaddi, cunsulthà  lu [[Special:ImageList|rigisthru di li file carriggaddi]]. Carriggamenti e ischarriggamenti di file so registhraddi i' lu  [[Special:Log/upload|rigisthru di li carriggamenti]].
+Pà visuarizzà o zirchà li file già carriggaddi, cunsulthà  lu [[Special:FileList|rigisthru di li file carriggaddi]]. Carriggamenti e ischarriggamenti di file so registhraddi i' lu  [[Special:Log/upload|rigisthru di li carriggamenti]].
 
 Pa insirì un'immàgina i'na pàgina, fà un cullegamentu cussì:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''' ,
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' ;
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''' ,
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' ;
 usà inveci
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' pà culligà direttamenti l'althri tipi di file.",
 'upload-permitted'            => 'Fuimmaddi di file autorizaddi: $1.',
@@ -911,18 +994,18 @@ usà inveci
 'large-file'                  => 'Pa piazeri nò suparà li misuri di $1 pa ugni file; chisthu file è mannu $2.',
 'largefileserver'             => "Lu file supara li misuri cunsintiddi da la cunfigurazioni di l'elaburaddori sivvidori.",
 'emptyfile'                   => "Lu file appena cariggaddu pari assé bioddu. Lu chi pudia assé dubuddu a un'errori i' l'innòmmu di lu file. Verifiggà chi s'aggia avveru gana di cariggà chisthu file.",
-'fileexists'                  => "Un file cu' chisth'innòmmu isisthi già. Verifiggà primma <strong><tt>$1</tt></strong> si nò s'è sigguri di vurellu sobbraschribì.",
+'fileexists'                  => "Un file cu' chisth'innòmmu isisthi già. Verifiggà primma '''<tt>$1</tt>''' si nò s'è sigguri di vurellu sobbraschribì.",
 'fileexists-extension'        => "Un file cu'un'innòmmu sìmmiri isisthi già; la sora diffarènzia è l'usu di li maiuschini i' l'esthensioni:<br />
-Innòmmu di lu file cariggaddu: <strong><tt>$1</tt></strong><br />
-Innòmmu di lu file esisthenti: <strong><tt>$2</tt></strong><br />
+Innòmmu di lu file cariggaddu: '''<tt>$1</tt>'''<br />
+Innòmmu di lu file esisthenti: '''<tt>$2</tt>'''<br />
 Verifiggà ch'i dui file nò siani lu matessi o sciubarà un'innòmmu diffarènti pa lu file da carriggà.",
 'fileexists-thumb'            => "<center>'''File prisisthenti'''</center>",
-'fileexists-thumbnail-yes'    => "Lu file carriggaddu pari assé lu risulthaddu d'un'antiprimma <i>(thumbnail)</i>. Verifiggà, pa cunfrontu, lu file <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "Lu file carriggaddu pari assé lu risulthaddu d'un'antiprimma ''(thumbnail)''. Verifiggà, pa cunfrontu, lu file '''<tt>$1</tt>'''.<br />
 S'è la matessi immàgina, i' li misuri originari, nò è nezzessàriu carriggà althri antiprimmi.",
-'file-thumbnail-no'           => "L'innòmmu di lu file ischumenza cun <strong><tt>$1</tt></strong>. Pari assé lu risulthaddu d'un'antiprimma <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "L'innòmmu di lu file ischumenza cun '''<tt>$1</tt>'''. Pari assé lu risulthaddu d'un'antiprimma ''(thumbnail)''.
 Si si diponi di l'immàgina i' la risoruzioni originari, pa piazeri carriggalla. A l'invessu, pa piazeri ciambà l'innòmmu di lu file.",
-'fileexists-forbidden'        => "Un file cun chisthu innòmmu isisthi già. Turrà indareddu e mudìfiggà l'innòmmu cu' lu quari carriggà lu file. [[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => "Un file cun chisthu innòmmu isisthi già i l'archìbiu di li risuzzi mùrthimediari cundibisi. Turrà indareddu e mudìfiggà l'innòmmu cu' lu quari carriggà lu file. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => "Un file cun chisthu innòmmu isisthi già. Turrà indareddu e mudìfiggà l'innòmmu cu' lu quari carriggà lu file. [[File:$1|thumb|center|$1]]",
+'fileexists-shared-forbidden' => "Un file cun chisthu innòmmu isisthi già i l'archìbiu di li risuzzi mùrthimediari cundibisi. Turrà indareddu e mudìfiggà l'innòmmu cu' lu quari carriggà lu file. [[File:$1|thumb|center|$1]]",
 'successfulupload'            => 'Carriggamentu cumpritaddu',
 'uploadwarning'               => 'Avvisu di carriggamentu',
 'savefile'                    => 'Sàivva file',
@@ -940,7 +1023,7 @@ Si si diponi di l'immàgina i' la risoruzioni originari, pa piazeri carriggalla.
 'upload-wasdeleted'           => "'''Attenzioni: sei carrigghendi un file chi prizzidentementi è già isthaddu canzilladdu.'''
 
 Pa piazeri verifigga si vói carriggà avveru chisthu file; inogghi v'è lu rigisthru cu' la mutibazioni di la canzilladdura:",
-'filename-bad-prefix'         => "L'innòmmu di lu file chi sei carrigghendi ischumenza cun <strong>\"\$1\"</strong>, ch'è un'innòmmu nò dischrittibu assignaddu automatiggamenti da li fotocameri. Pa piazieri sciubarà un'innòmmu più dischrittibu pa lu file tóiu.",
+'filename-bad-prefix'         => "L'innòmmu di lu file chi sei carrigghendi ischumenza cun '''\"\$1\"''', ch'è un'innòmmu nò dischrittibu assignaddu automatiggamenti da li fotocameri. Pa piazieri sciubarà un'innòmmu più dischrittibu pa lu file tóiu.",
 
 'upload-proto-error'      => 'Protocollu ibbagliaddu',
 'upload-proto-error-text' => 'Pa lu cariggamentu "luntanu" è nezzessàriu ippizzificà indirizzi ch\'ischumenzani cun <code>http://</code> oppuru <code>ftp://</code>.',
@@ -961,17 +1044,17 @@ Pa piazeri verifigga si vói carriggà avveru chisthu file; inogghi v'è lu rigi
 'upload_source_url'  => " (un'indirizzu vàriddu e pùbbriggu)",
 'upload_source_file' => " (un file i' lu propriu elaburaddori)",
 
-# Special:ImageList
-'imagelist_search_for'  => 'Zercha immàgini pa innòmu:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Zercha immàgini pa innòmu:',
 'imgfile'               => 'file',
-'imagelist'             => 'Listha di li file',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Innòmu',
-'imagelist_user'        => 'Utenti',
-'imagelist_size'        => 'Misuri in byte',
-'imagelist_description' => 'Deschrizioni',
-
-# Image description page
+'listfiles'             => 'Listha di li file',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Innòmu',
+'listfiles_user'        => 'Utenti',
+'listfiles_size'        => 'Misuri in byte',
+'listfiles_description' => 'Deschrizioni',
+
+# File description page
 'filehist'                  => 'Cronologia di lu file',
 'filehist-help'             => "Fà clic i' un gruppu data/ora pa vidé lu file cumenti era i' lu mamentu indicaddu.",
 'filehist-deleteall'        => 'canzella tuttu',
@@ -1014,7 +1097,6 @@ Pa piazeri verifigga si vói carriggà avveru chisthu file; inogghi v'è lu rigi
 'filedelete-success-old' => '<span class="plainlinks">La versioni di lu $3, $2 di lu file \'\'\'[[Media:$1|$1]]\'\'\' è isthadda canzilladda.</span>',
 'filedelete-nofile'      => 'Nò esisthi un file $1.',
 'filedelete-nofile-old'  => "In archìbiu nò vi so versioni di '''$1''' cu' li caratterìsthighi indicaddi.",
-'filedelete-iscurrent'   => 'Sei prubendi a canzillà la versioni più rizzenti di chisthu file. Pa piazeri, primma fallu turrà a una versioni prizzidenti.',
 
 # MIME search
 'mimesearch'         => 'Zercha sigundu a lu tipu MIME',
@@ -1042,19 +1124,9 @@ Pa piazeri verifigga si vói carriggà avveru chisthu file; inogghi v'è lu rigi
 'randomredirect-nopages' => "Nisciun rinviu i' lu tipu di pàgina sciubaraddu.",
 
 # Statistics
-'statistics'             => 'Sthatisthigghi',
-'sitestats'              => 'Sthatisthigghi reratibi a {{SITENAME}}',
-'userstats'              => "Sthatisthigghi reratibi a l'utenti",
-'sitestatstext'          => "La bancadati cunteni {{PLURAL:\$1|'''1''' pàgina|'''\$1''' pàgini}}.
-Chisthu nùmaru cumprendi le pàgini di \"dischussioni\", li pàgini i' {{SITENAME}}, li pàgini \"sàgumi\", li rinvii e althri pàgini chi forsi nò so parthi di li cuntinuddi. Eschrudendi chisthi, {{PLURAL:\$2|v'è '''1''' pàgina|vi so '''\$2''' pàgini}} chi forsi {{PLURAL:\$2|è una vera pàgina|so veri pàgini}} di cuntinuddi.
-
-{{PLURAL:\$8|È puru isthaddu carriggaddu|So puru isthaddi carriggaddi}} '''\$8''' file.
-
-Da l'isthallazioni di {{SITENAME}} finz'abà  '''\$3''' {{PLURAL:\$3|pàgina è isthadda visitadda|pàgini so isthaddi visitaddi}}, e '''\$4''' {{PLURAL:\$4|mudìfigga è isthadda arriggadda|mudìfigghi so isthaddi arriggaddi}}, pa una mèdia di '''\$5''' mudìfigghi pa pàgina e '''\$6''' litturi pa mudìfigga.
-
-La [http://www.mediawiki.org/wiki/Manual:Job_queue coda di li pruzzessi] è longa '''\$7'''.",
-'userstatstext'          => "Abà {{PLURAL:$1|è registhraddu '''1''' [[Special:ListUsers|utenti]]|so registhraddi '''$1''' [[Special:ListUsers|utenti]]}}. Lu gruppu $5 è cumposthu da '''$2''' {{PLURAL:$2|utenti|utenti}}, pari a lu '''$4%''' di li registhraddi.",
-'statistics-mostpopular' => 'Pàgini più visitaddi',
+'statistics'              => 'Sthatisthigghi',
+'statistics-header-users' => "Sthatisthigghi reratibi a l'utenti",
+'statistics-mostpopular'  => 'Pàgini più visitaddi',
 
 'disambiguations'      => 'Pàgini cu lu matessi innòmmu',
 'disambiguationspage'  => 'Template:Matessi innòmmu',
@@ -1133,8 +1205,6 @@ La [http://www.mediawiki.org/wiki/Manual:Job_queue coda di li pruzzessi] è long
 'speciallogtitlelabel' => 'Tìturu:',
 'log'                  => 'Rigisthri',
 'all-logs-page'        => 'Tutti li rigisthri',
-'log-search-legend'    => "Zercha i' li rigisthri",
-'log-search-submit'    => 'Vai',
 'alllogstext'          => "Prisintazioni unifiggadda di li rigisthri reratibi a li operazioni di carriggamentu, canzilladdura, prutizioni, broccu e amministhrazioni di lu situ. Ribbendi li appósiddi campi si pò limità la visuarizzazioni a un'ippizzificu rigisthru, nommu utenti o pàgina.",
 'logempty'             => 'Lu rigisthru nò cunteni erementi curripundenti.',
 'log-title-wildcard'   => "Zercha li tìturi ch'ischuminzani cun",
@@ -1218,12 +1288,6 @@ Si daboi s'à gana d'eliminà la pàgina da la listha di l'abbaidaddi ippiziarii
 'iteminvalidname'      => "Probremi cu' la pàgina '$1', innòmmu nò vàriddu...",
 'wlnote'               => "Inogghi {{PLURAL:$1|è erencadda la mudìfigga più rizzenti arriggadda|so erencaddi li '''$1''' mudìfigghi più rizzenti arriggaddi}} {{PLURAL:$2|i' la ulthima ora|i' li ulthimi '''$2''' ori}}.",
 'wlshowlast'           => 'Musthra li ulthimi $1 ori $2 dì $3',
-'watchlist-show-bots'  => 'Musthra li mudìfigghi di li bot',
-'watchlist-hide-bots'  => 'Cua li mudìfigghi di li bot',
-'watchlist-show-own'   => "Musthra li me' mudìfigghi",
-'watchlist-hide-own'   => "Cua li me' mudìfigghi",
-'watchlist-show-minor' => 'Musthra li mudìfigghi minori',
-'watchlist-hide-minor' => 'Cua li mudìfigghi minori',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => "Aggiunta a l'abbaidaddi ippiziari...",
@@ -1263,58 +1327,63 @@ Pa mudìfiggà l\'impusthazioni di la listha di l\'abbaidaddi ippiziari, visita
 Pa dì cosa ni pensi e dumandà assisthènzia:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Canzella pàgina',
-'confirm'                     => 'Cunfèimma',
-'excontent'                   => "lu cuntinuddu era : '$1'",
-'excontentauthor'             => "lu cuntinuddu era: '$1' (e lu soru cuntributori era '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Lu cuntinuddu primma di l'ibbiuddamentu era: '$1'",
-'exblank'                     => 'la pàgina era biodda',
-'delete-confirm'              => 'Canzella "$1"',
-'delete-legend'               => 'Canzella',
-'historywarning'              => 'Attinzioni: La pàgina chi sei canzellendi à una cronologia:',
-'confirmdeletetext'           => "Sei canzillendi pa sempri da la bancati una pàgina o un'immàgina, umpari a la cronologia d'edda.
+# Delete
+'deletepage'             => 'Canzella pàgina',
+'confirm'                => 'Cunfèimma',
+'excontent'              => "lu cuntinuddu era : '$1'",
+'excontentauthor'        => "lu cuntinuddu era: '$1' (e lu soru cuntributori era '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "Lu cuntinuddu primma di l'ibbiuddamentu era: '$1'",
+'exblank'                => 'la pàgina era biodda',
+'delete-confirm'         => 'Canzella "$1"',
+'delete-legend'          => 'Canzella',
+'historywarning'         => 'Attinzioni: La pàgina chi sei canzellendi à una cronologia:',
+'confirmdeletetext'      => "Sei canzillendi pa sempri da la bancati una pàgina o un'immàgina, umpari a la cronologia d'edda.
 Pa piazzeri, cunfèimma chi vói canzillà avveru, ch'ài cumpresu li cunsiguènzi di l'azioni tóia e ch'edda è cunfòimmi a li [[{{MediaWiki:Policy-url}}|lìni ghia]].",
-'actioncomplete'              => 'Azioni cumpritadda',
-'deletedtext'                 => 'La pàgina "<nowiki>$1</nowiki>" è isthadda canzilladda. Cunsultha lu $2 pa un\'erencu di li pàgini canzilladdi da poggu tempu.',
-'deletedarticle'              => 'ha canzilladdu "[[$1]]"',
-'suppressedarticle'           => 'eliminaddu "[[$1]]"',
-'dellogpage'                  => 'Canzilladduri',
-'dellogpagetext'              => 'Inogghi so erencaddi li pàgini canzilladdi da poggu tempu.',
-'deletionlog'                 => 'Rigisthru di li canzilladduri',
-'reverted'                    => 'Turra a la versioni prizzidenti',
-'deletecomment'               => 'Mutibu di la canzilladdura:',
-'deleteotherreason'           => 'Althra mutibazioni o mutibazioni aggiuntiba:',
-'deletereasonotherlist'       => 'Althra mutibazioni',
-'deletereason-dropdown'       => "*Mutibazioni più cumuni pa la canzilladdura
+'actioncomplete'         => 'Azioni cumpritadda',
+'deletedtext'            => 'La pàgina "<nowiki>$1</nowiki>" è isthadda canzilladda. Cunsultha lu $2 pa un\'erencu di li pàgini canzilladdi da poggu tempu.',
+'deletedarticle'         => 'ha canzilladdu "[[$1]]"',
+'suppressedarticle'      => 'eliminaddu "[[$1]]"',
+'dellogpage'             => 'Canzilladduri',
+'dellogpagetext'         => 'Inogghi so erencaddi li pàgini canzilladdi da poggu tempu.',
+'deletionlog'            => 'Rigisthru di li canzilladduri',
+'reverted'               => 'Turra a la versioni prizzidenti',
+'deletecomment'          => 'Mutibu di la canzilladdura:',
+'deleteotherreason'      => 'Althra mutibazioni o mutibazioni aggiuntiba:',
+'deletereasonotherlist'  => 'Althra mutibazioni',
+'deletereason-dropdown'  => "*Mutibazioni più cumuni pa la canzilladdura
 ** Prigonta de l'autori
 ** Viorazioni di lu dirittu d'autori
 ** Vandarismu",
-'delete-edit-reasonlist'      => 'Mudìfigga li mutibazioni pa la canzilladdura',
-'rollback'                    => 'Annulla li mudìfigghi',
-'rollback_short'              => 'Turra che primma',
-'rollbacklink'                => 'turra che primma',
-'rollbackfailed'              => 'Nò è ridisciddu a turrà che primma',
-'cantrollback'                => "Impussìbiri annullà li mudìfigghi; l'utenti chi n'è l'autori è l'unicu cuntribudori di la pàgina.",
-'editcomment'                 => 'Lu cummentu a la mudìfigga era: "<i>$1</i>".', # only shown if there is an edit comment
-'rollback-success'            => 'Annulladdi li mudìfigghi di $1; turradda a la versioni prizzidenti di $2.',
-'sessionfailure'              => "S'è verifigaddu un probrema i' la sissioni ch'identifigga l'intradda; lu sistham nò à eseguiddu lu cumandu imparthiddu pa precauzioni. Turrà a la pàgina prizzidenti cu' lu buttoni \"Indareddu\" di lu proprio nabigaddori, turrà a carriggà la pàgina e riprubà.",
+'delete-edit-reasonlist' => 'Mudìfigga li mutibazioni pa la canzilladdura',
+
+# Rollback
+'rollback'         => 'Annulla li mudìfigghi',
+'rollback_short'   => 'Turra che primma',
+'rollbacklink'     => 'turra che primma',
+'rollbackfailed'   => 'Nò è ridisciddu a turrà che primma',
+'cantrollback'     => "Impussìbiri annullà li mudìfigghi; l'utenti chi n'è l'autori è l'unicu cuntribudori di la pàgina.",
+'editcomment'      => "Lu cummentu a la mudìfigga era: \"''\$1''\".", # only shown if there is an edit comment
+'rollback-success' => 'Annulladdi li mudìfigghi di $1; turradda a la versioni prizzidenti di $2.',
+'sessionfailure'   => "S'è verifigaddu un probrema i' la sissioni ch'identifigga l'intradda; lu sistham nò à eseguiddu lu cumandu imparthiddu pa precauzioni. Turrà a la pàgina prizzidenti cu' lu buttoni \"Indareddu\" di lu proprio nabigaddori, turrà a carriggà la pàgina e riprubà.",
+
+# Protect
 'protectlogpage'              => 'Prutizioni',
 'protectlogtext'              => "Inogghi v'è la listha di li pàgini broccaddi e ibbruccaddi. Védi la [[Special:ProtectedPages|listha di li pàgini prutiggiddi]] pa chiddi chi so attuarmenti prutiggiddi.",
 'protectedarticle'            => 'à prutiggiddu "[[$1]]"',
 'modifiedarticleprotection'   => 'ha mudìfiggaddu lu libellu di prutizioni di "[[$1]]"',
 'unprotectedarticle'          => 'à ibbruccaddu "[[$1]]"',
 'protect-title'               => 'Prutizioni di "$1"',
+'prot_1movedto2'              => 'ha ippusthaddu [[$1]] a [[$2]]',
 'protect-legend'              => 'Cunfèimma la prutizioni',
 'protectcomment'              => 'Mutibu di la prutizioni:',
 'protectexpiry'               => 'Ischadènzia:',
 'protect_expiry_invalid'      => 'Ischadènzia invàridda.',
 'protect_expiry_old'          => 'Ischadènzia già passadda.',
 'protect-unchain'             => "Ischulliga i primmissi d'ippusthamentu",
-'protect-text'                => 'Chisthu mòdulu cunsenti di vidé e mudìfiggà lu libellu di prutizioni pa la pàgina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => "Nò è pussìbiri mudìfiggà i libelli di prutizioni cand'è attibu un broccu. L'impusthazioni currenti pa la pàgina so <strong>$1</strong>:",
+'protect-text'                => "Chisthu mòdulu cunsenti di vidé e mudìfiggà lu libellu di prutizioni pa la pàgina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nò è pussìbiri mudìfiggà i libelli di prutizioni cand'è attibu un broccu. L'impusthazioni currenti pa la pàgina so '''$1''':",
 'protect-locked-access'       => "Nò si diponi di li primmissi nezzessàri pa mudìfiggà lu libellu di prutizioni di la pàgina.
-L'impusthazioni currenti pa la pàgina so <strong>$1</strong>:",
+L'impusthazioni currenti pa la pàgina so '''$1''':",
 'protect-cascadeon'           => "Chistha pàgina abà è broccadda parchí è incrusa {{PLURAL:$1|i' la sighenti pàgina, pa la quari|i' li sighenti pàgini, pa li quari}} è attiba la prutizioni ricussiba. È pussìbiri mudìfiggà lu libellu di prutizioni di la pàgina, ma l'impusthazioni reratibi a la prutuzioni ricussina nò sarani mudìfiggaddi.",
 'protect-default'             => '(pridifiniddu)',
 'protect-fallback'            => 'È nezzessàriu lu primissu "$1"',
@@ -1324,6 +1393,7 @@ L'impusthazioni currenti pa la pàgina so <strong>$1</strong>:",
 'protect-expiring'            => 'ischadènzia: $1 (UTC)',
 'protect-cascade'             => 'Prutizioni ricussiba (isthendi la prutizioni a tutti li pàgini incrusi in chistha)',
 'protect-cantedit'            => 'Nò è pussìbiri mudìfiggà li libelli di prutizioni pa la pàgina parchí nò si diponi di pimmissi nezzessàri pa mudìfiggà la pàgina.',
+'protect-expiry-options'      => '2 ori:2 hours,1 dì:1 day,3 dì:3 days,1 chedda:1 week,2 cheddi:2 weeks,1 mesi:1 month,3 mesi:3 months,6 mesi:6 months,1 anni:1 year,infiniddu:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Primmissu:',
 'restriction-level'           => 'Libellu di isthrigniddura',
 'minimum-size'                => 'Misura mìnima',
@@ -1397,7 +1467,6 @@ $1",
 'whatlinkshere'       => 'Pùntani inogghi',
 'whatlinkshere-title' => 'Pàgini chi pùntani a "$1"',
 'whatlinkshere-page'  => 'Pàgina:',
-'linklistsub'         => '(Listha di li cullegamenti)',
 'linkshere'           => "Le sighenti pàgini cuntenani dei cullegamenti a '''[[:$1]]''':",
 'nolinkshere'         => "Nisciuna pàgina cunteni dei cullegamenti chi pùntani a '''[[:$1]]'''.",
 'nolinkshere-ns'      => "Nò vi so pàgini chi pùntani a '''[[:$1]]''' i' lu namespace sciubaraddu.",
@@ -1511,6 +1580,8 @@ Azzirthati d'abé cumpresu li cunsiguènzi di l'ippusthamentu!",
 
 In chisthi casi, si lu vói avveru, débi ippusthà o aggiugnì a manu le infuimmazioni cuntinuddi i' la pàgina di dischussioni.",
 'movearticle'             => 'Ippustha la pàgina',
+'movenologin'             => 'Intradda nò effettuadda',
+'movenologintext'         => "L'ippusthamentu di li pàgini è cunsintiddu soru a l'utenti registhraddi chi so [[Special:UserLogin|intraddi]] i' lu situ.",
 'movenotallowed'          => "Nò si diponi di li primmissi nezzessàri a l'ippusthamentu di pàgini.",
 'newtitle'                => 'Nobu tìturu:',
 'move-watch'              => "Aggiungi a l'abbaidaddi ippiziari",
@@ -1534,7 +1605,6 @@ La pàgina di disthinazioni "[[:$1]]" isisthi già. Vói canzillalla pa rindì p
 'delete_and_move_confirm' => 'Emmo, sobbraischribì la pàgini',
 'delete_and_move_reason'  => "Canzilladda pa rindì pussìbiri l'ippusthamentu",
 'selfmove'                => "Lu nobu tìturu è uguari a lu vécciu; impussìbiri ippusthà la pàgina cu' lu matessi innòmmu.",
-'immobile_namespace'      => 'Lu nobu tìturu curripondi à una pàgina ippiziari; impussìbiri ippusthà pàgini in chiddu tipu di pàgina.',
 
 # Export
 'export'            => 'Ippurtha li pàgini',
@@ -1542,7 +1612,7 @@ La pàgina di disthinazioni "[[:$1]]" isisthi già. Vói canzillalla pa rindì p
 
 Pa ippurthà li pàgina indicà i tìturi i' la casella di testhu in giossu, unu pa riga, e ippizzificà si s'à gana d'uttinì la versioni currenti e tutti li versioni prizzidenti, cu' li dati di la cronologia di la pàgina, oppure soru l'ulthima versioni e i dati curripundenti a l'ulthima mudìfigga.
 
-In chisth'ulthimu casu si pó utilizzà puru un cullegamentu, pa esempiu [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pa ippurthà \"[[{{MediaWiki:Mainpage}}]]\".",
+In chisth'ulthimu casu si pó utilizzà puru un cullegamentu, pa esempiu [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pa ippurthà \"[[{{MediaWiki:Mainpage}}]]\".",
 'exportcuronly'     => "Incrudi soru la ribisioni attuari, nò l'intrea cronologia.",
 'exportnohistory'   => "----
 '''Nota:''' l'ippurthazioni di l'intrea cronologia di li pàgini attrabessu chistha interfàccia è isthadda disattibadda pa mutibi liaddi a li presthazioni di lu sisthema.",
@@ -1557,7 +1627,7 @@ In chisth'ulthimu casu si pó utilizzà puru un cullegamentu, pa esempiu [[{{ns:
 'allmessagesdefault'        => 'Testhu pridifiniddu',
 'allmessagescurrent'        => 'Testhu attuari',
 'allmessagestext'           => "Chistha è la listha di tutti l'imbasciaddi di sisthema dipunìbiri i' lu tipu di pàgina MediaWiki.
-Pa piazeri utirizà [http://www.mediawiki.org/wiki/Localisation MediaWiki Lucarizazioni] e [http://translatewiki.net Betawiki] pa l'althri traduzioni.",
+Pa piazeri utirizà [http://www.mediawiki.org/wiki/Localisation MediaWiki Lucarizazioni] e [http://translatewiki.net translatewiki.net] pa l'althri traduzioni.",
 'allmessagesnotsupportedDB' => "Chistha pàgina nò è supporthadda parchí l'indicadori '''\$wgUseDatabaseMessages''' nò è attibuu.",
 'allmessagesfilter'         => "Filthru i' l'imbasciaddi:",
 'allmessagesmodified'       => 'Musthra soru chiddi mudìfiggaddi.',
@@ -1580,6 +1650,7 @@ Tutti l'operazioni d'impurthazioni trans-wiki so rigisthraddi i' lu [[Special:Lo
 'import-interwiki-history'   => "Cupia l'intrea cronologia di chistha pàgina",
 'import-interwiki-submit'    => 'Impurtha',
 'import-interwiki-namespace' => "Traiffira li pàgini i' lu tipu di pàgina:",
+'import-comment'             => 'Oggettu:',
 'importtext'                 => "Pa piazeri ippurthà lu file da lu situ wiki d'origini cu' la funzioni Special:Export utility, saivvàllu i' lu propriu dischu e daboi carriggallu inogghi.",
 'importstart'                => 'Impurthendi li pàgini...',
 'import-revision-count'      => '{{PLURAL:$1|una ribisioni impurthadda|$1 ribisioni impurthaddi}}',
@@ -1748,7 +1819,7 @@ $1",
 'show-big-image'       => 'Versioni a altha risoruzioni',
 'show-big-image-thumb' => "<small>Misuri di chisth'antiprimma: $1 × $2 punti</small>",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galleria di li file nobi',
 'imagelisttext'         => "Inogghi una listha di '''$1''' {{PLURAL:$1|file|file}} ordhinaddi pa $2.",
 'showhidebots'          => '($1 li bot)',
@@ -1901,21 +1972,9 @@ $1
 Pa piazeri, cunfèimma chi vòi ricrià avveru chistha pàgina.",
 'recreate'            => 'Ricrea',
 
-# HTML dump
-'redirectingto' => 'Rinviu a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Vói pulì la mimória cache di chistha pàgina?
-
-$1',
 'confirm_purge_button' => 'Cunfèimma',
-
-# AJAX search
-'searchcontaining' => "Zercha li pàgini chi cuntènini ''$1''.",
-'searchnamed'      => "Zercha li pàgini cun tìturu ''$1''.",
-'articletitles'    => "Zercha di li pàgini ch'ischuminzani cun ''$1''",
-'hideresults'      => 'Cua li risulthaddi',
-'useajaxsearch'    => "Zercha cu'AJAX",
+'confirm-purge-top'    => 'Vói pulì la mimória cache di chistha pàgina?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pàgina prizzidenti',
diff --git a/languages/messages/MessagesSe.php b/languages/messages/MessagesSe.php
index 7e8038cb..b134faa0 100644
--- a/languages/messages/MessagesSe.php
+++ b/languages/messages/MessagesSe.php
@@ -48,8 +48,6 @@ $messages = array(
 'underline-always' => '�lo',
 'underline-never'  => 'Ii goassige',
 
-'skinpreview' => '(ovdalgihtii geah��an...)',
-
 # Dates
 'sunday'        => 'sotnabeaivi',
 'monday'        => 'vuossárga',
@@ -126,7 +124,7 @@ $messages = array(
 'mytalk'         => 'Mu ságastallan',
 'anontalk'       => 'Ságastala dán IP-�ujuhusain',
 'navigation'     => 'Navigašuvdna',
-'and'            => 'ja',
+'and'            => '&#32;ja',
 
 # Metadata in edit box
 'metadata_help' => 'Sisdoallogovvádusat:',
@@ -187,8 +185,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Dieđut {{GRAMMAR:elative|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Dieđut',
-'bugreports'           => 'Váttisvuođat ja buorridanevttohusat',
-'bugreportspage'       => 'Project:Váttisvuođat ja buorridanevttohusat',
 'copyright'            => 'Sisdoalu sáhttá geavahit liseanssain $1.',
 'currentevents'        => '�igeguovdil',
 'currentevents-url'    => 'Project:�igeguovdil',
@@ -212,6 +208,7 @@ $messages = array(
 'youhavenewmessagesmulti' => 'Dutnje lea ođđa dieđut siiddus $1',
 'editsection'             => 'rievdat',
 'editold'                 => 'rievdat',
+'editlink'                => 'ođasmahte',
 'editsectionhint'         => 'Rievdat oasi $1',
 'toc'                     => 'Sisdoallu',
 'showtoc'                 => '�ájet',
@@ -275,7 +272,6 @@ Du geavaheaddjidovddaldat lea dál anus.
 'yourpasswordagain'          => 'Čále suollemassáni ođđasit:',
 'remembermypassword'         => 'Muite mu',
 'yourdomainname'             => 'Fierbmenamma',
-'loginproblem'               => '<b>Sisa�állin ii lihkosmuvvan.</b><br />Iska ođđasit!',
 'login'                      => 'Čálligoađe sisa',
 'nav-login-createaccount'    => 'Daga ođđa geavaheaddjidovddaldaga dahje �álligoađe sisa',
 'loginprompt'                => 'Sisa�állimii darbbašuvvo geavssat (cookies).',
@@ -332,15 +328,18 @@ Du geavaheaddjidovddaldat lea dál anus.
 'loginlanguagelabel'         => 'Giella: $1',
 
 # Password reset dialog
-'resetpass'               => 'Suollemassáni gurren',
-'resetpass_announce'      => 'Čálligohtet sisa e-poasttain sáddejuvvon suollemassánin. Fertet addit ođđa suollemassáni dasa:',
-'resetpass_text'          => '<!-- Lasit dasa teavstta -->',
-'resetpass_header'        => 'Ođđa suollemassáni �állin',
-'resetpass_submit'        => 'Čále suollemassáni ja �álligoađe sisa',
-'resetpass_success'       => 'Suollemassáni rievdadeapmim lihkosmuvai.',
-'resetpass_bad_temporary' => 'Dohkemeahttun gaskabottosaš suollemassátni. Leat sáhttán �állit ođđa suollemassáni dahje bivdán ođđa gaskabottosaš suollemassáni.',
-'resetpass_forbidden'     => 'Suollemassániid rievdan ii lihkosmuva dán wikis.',
-'resetpass_missing'       => 'Ii teaksta.',
+'resetpass'                 => 'Suollemassáni gurren',
+'resetpass_announce'        => 'Čálligohtet sisa e-poasttain sáddejuvvon suollemassánin. Fertet addit ođđa suollemassáni dasa:',
+'resetpass_text'            => '<!-- Lasit dasa teavstta -->',
+'resetpass_header'          => 'Ođđa suollemassáni �állin',
+'oldpassword'               => 'Boares suollemassátni',
+'newpassword'               => 'Ođđa suollemassátni',
+'retypenew'                 => 'Ođđa suollemassátni ođđasit',
+'resetpass_submit'          => 'Čále suollemassáni ja �álligoađe sisa',
+'resetpass_success'         => 'Suollemassáni rievdadeapmim lihkosmuvai.',
+'resetpass_bad_temporary'   => 'Dohkemeahttun gaskabottosaš suollemassátni. Leat sáhttán �állit ođđa suollemassáni dahje bivdán ođđa gaskabottosaš suollemassáni.',
+'resetpass_forbidden'       => 'Suollemassániid rievdan ii lihkosmuva dán wikis.',
+'resetpass-submit-loggedin' => 'Molsso suollemassáni',
 
 # Edit page toolbar
 'bold_sample'     => 'Buoiddes teaksta',
@@ -364,8 +363,8 @@ Du geavaheaddjidovddaldat lea dál anus.
 'hr_tip'          => 'Láskkosárggis',
 
 # Edit pages
-'summary'                  => 'Čoahkkáigeassu',
-'subject'                  => 'Fáddá',
+'summary'                  => 'Čoahkkáigeassu:',
+'subject'                  => 'Fáddá:',
 'minoredit'                => 'Dát lea unna rievdadus',
 'watchthis'                => 'Lasit �uovvunlistui',
 'savearticle'              => 'Vurke siiddu',
@@ -377,8 +376,8 @@ Du geavaheaddjidovddaldat lea dál anus.
 'missingsummary'           => 'It leat �állán �oahkkáigeasu. Jus válljet Vurke ođđasit, de rievdadusat maid ráhkadit vurkejuvvo �oahkkáigeasuhaga.',
 'missingcommenttext'       => 'Čále �oahkkáigeasu vuollái.',
 'missingcommentheader'     => 'It leat �állán bajil�állaga du oaivilii. Vállje <em>Vurke</em>, jus it hálit �állit bajil�állaga.',
-'summary-preview'          => 'Čoahkkáigeasu ovdalgihtiigeah��an',
-'subject-preview'          => 'Bájil�állaga ovdalgihtiigeah��an',
+'summary-preview'          => 'Čoahkkáigeasu ovdalgihtiigeah��an:',
+'subject-preview'          => 'Bájil�állaga ovdalgihtiigeah��an:',
 'blockedtitle'             => 'Geavaheaddji lea cakkastallojuvvon',
 'blockedoriginalsource'    => 'Siiddu �$1� prográmmagálvu:',
 'blockededitsource'        => 'Du rievdadusat siidui �$1�:',
@@ -396,8 +395,8 @@ Du geavaheaddjidovddaldat lea dál anus.
 'newarticle'               => '(ođđa)',
 'newarticletext'           => 'Leat boahtán muhtin liŋkka mielde siidui, mii ii vel dihtto. Sáhtat álggahit siiddu vuollái. Jus it hálit álggahit siiddu, geavat neahttabláđejeaddji máhccandoaimma.',
 'updated'                  => '(Beaividuvvon)',
-'note'                     => '<strong>Cuigehus:</strong>',
-'previewnote'              => '<strong>Dát lea siiddu ovdalgihtiigeah��an. Siidu ii leat vel vurkejuvvon!</strong>',
+'note'                     => "'''Cuigehus:'''",
+'previewnote'              => "'''Dát lea siiddu ovdalgihtiigeah��an. Siidu ii leat vel vurkejuvvon!'''",
 'editing'                  => 'Rievdadit siiddu $1',
 'editingsection'           => 'Rievdadit oasi siiddus $1',
 'editingcomment'           => 'Rievdadit kommeanta siiddus $1',
@@ -419,11 +418,9 @@ Du geavaheaddjidovddaldat lea dál anus.
 # History pages
 'viewpagelogs'        => 'Čájet dán siiddu loggaid',
 'nohistory'           => 'Dán siiddus ii leat rievdadanhistorjá.',
-'revnotfound'         => 'Veršuvdna ii dihtto',
-'revnotfoundtext'     => 'Veršuvdna, man ohcet, ii dihtto. Dárkkis URL-�ujuhusa, mainna ohcet dán siiddu.',
 'currentrev'          => 'Dálá veršuvdna',
 'revisionasof'        => 'Veršuvdna $1',
-'revision-info'       => 'Dálá veršuvdna $1 – ráhkadan $2',
+'revision-info'       => 'Dálá veršuvdna $1 – ráhkadan $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Boarrásut veršuvdna',
 'nextrevision'        => 'Ođđasut veršuvdna →',
 'currentrevisionlink' => 'Dálá veršuvdna',
@@ -486,6 +483,7 @@ Eará bajasdoallit sáhtet lohkat �ihkojuvvon sisdoalu ja máhcahit dan.",
 'viewprevnext'          => 'Čájet [$3] oktanaga.
 
 $1 | $2',
+'searchhelp-url'        => 'Help:Rávvagat',
 'showingresults'        => "{{PLURAL:$1|'''Okta''' boađus|'''$1''' bohtosa}} bohtosa'''$2''' rájes.",
 'showingresultsnum'     => "Vuolábealde {{PLURAL:$3|lea '''okta''' ohcanboađus|leat '''$3''' ohcanbohtosa}} '''$2.''' bohtosa rájes.",
 'powersearch'           => 'Oza',
@@ -504,6 +502,7 @@ $1 | $2',
 'qbsettings-floatingright' => 'Biso olgesbealde',
 'changepassword'           => 'Suollemassáni molson',
 'skin'                     => 'Olggosoaidnu',
+'skin-preview'             => 'ovdalgihtii geah��an...',
 'math'                     => 'Matematihkká',
 'dateformat'               => 'Beaivemeari hápmi',
 'datedefault'              => 'Eai válljemat',
@@ -517,9 +516,6 @@ $1 | $2',
 'prefs-misc'               => 'Eará',
 'saveprefs'                => 'Vurke ásahusaid',
 'resetprefs'               => 'Máhcat vurkejuvvon ásahusaid',
-'oldpassword'              => 'Boares suollemassátni',
-'newpassword'              => 'Ođđa suollemassátni',
-'retypenew'                => 'Ođđa suollemassátni ođđasit',
 'textboxsize'              => 'Rievdadeapmi',
 'rows'                     => 'Gurgadasat',
 'columns'                  => 'Kolumnat',
@@ -648,17 +644,17 @@ $1 | $2',
 'upload_source_url'  => ' (almmolaš URL-�ujuhus)',
 'upload_source_file' => ' (fiila dihtoris)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Nammaohcan',
+# Special:ListFiles
+'listfiles_search_for'  => 'Nammaohcan',
 'imgfile'               => 'fiila',
-'imagelist'             => 'Fiilalogahallan',
-'imagelist_date'        => 'Beaivemearri',
-'imagelist_name'        => 'Namma',
-'imagelist_user'        => 'Vurkejeaddji',
-'imagelist_size'        => 'Sturrodat',
-'imagelist_description' => 'Govvádus',
-
-# Image description page
+'listfiles'             => 'Fiilalogahallan',
+'listfiles_date'        => 'Beaivemearri',
+'listfiles_name'        => 'Namma',
+'listfiles_user'        => 'Vurkejeaddji',
+'listfiles_size'        => 'Sturrodat',
+'listfiles_description' => 'Govvádus',
+
+# File description page
 'filehist'                  => 'Fiilla historjá',
 'filehist-help'             => 'Go deaddilat beaivemeari, oainnat makká fiila lei dalle.',
 'filehist-deleteall'        => 'sihko buot',
@@ -725,11 +721,9 @@ $1 | $2',
 'randomredirect-nopages' => 'Dán nammagomuvuođas eai leat ođđasitstivremat.',
 
 # Statistics
-'statistics'             => 'Statistihkat',
-'sitestats'              => 'Siidduid statistihkat',
-'userstats'              => 'Geavaheaddjistatistihkat',
-'userstatstext'          => "Registeren geavaheaddjit leat '''$1'''. Dáin '''$2''' ($4%) {{PLURAL:$2|lea bájasdoalli|leat bájasdoallit}} ($5).",
-'statistics-mostpopular' => 'Eanemusta geh�ojuvvon siiddut',
+'statistics'              => 'Statistihkat',
+'statistics-header-users' => 'Geavaheaddjistatistihkat',
+'statistics-mostpopular'  => 'Eanemusta geh�ojuvvon siiddut',
 
 'disambiguations' => 'Liŋkkat dárkonsiidduide',
 
@@ -798,8 +792,6 @@ $1 | $2',
 'speciallogtitlelabel' => 'Mearri',
 'log'                  => 'Loggat',
 'all-logs-page'        => 'Buot loggat',
-'log-search-legend'    => 'Oza loggain',
-'log-search-submit'    => 'Oza',
 'logempty'             => 'Eai dáhpáhusat loggas.',
 'log-title-wildcard'   => 'Mearri álgá mearkkaiguin',
 
@@ -872,12 +864,6 @@ $1 | $2',
 'iteminvalidname'      => 'Siidduin $1 ledje váttisvuođat! Siiddu namas lea feaila.',
 'wlnote'               => "Vuolábealde lea '''$1''' {{PLURAL:$1|rievdadus|rievdadusa}} maŋimus {{PLURAL:$2||'''$2'''}} diimma siste.",
 'wlshowlast'           => 'Čájet maŋimus $1 diimmu dahje $2 beaivvi $3',
-'watchlist-show-bots'  => 'Čájet bottaid rievdadusaid',
-'watchlist-hide-bots'  => 'ÄŒiega bottaid rievdadusaid',
-'watchlist-show-own'   => 'Čájet iežas rievdádusaid',
-'watchlist-hide-own'   => 'Čiega iežas rievdádusaid',
-'watchlist-show-minor' => 'Čájet unna rievdádusaid',
-'watchlist-hide-minor' => 'Čiega unna rievdádusaid',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Lasihuvvo �uovvunlistui...',
@@ -894,37 +880,42 @@ $1 | $2',
 'enotif_lastdiff'              => 'Rievdadus lea �ujuhusas $1.',
 'enotif_anon_editor'           => 'registereretkeahtes geavaheaddji $1',
 
-# Delete/protect/revert
-'deletepage'                  => 'Sihko siiddu',
-'confirm'                     => 'Daga',
-'excontent'                   => 'sisdisdolii: �$1�',
-'exbeforeblank'               => 'sisdoallu ovdal gurrema: �$1�',
-'exblank'                     => 'lei guoros',
-'historywarning'              => 'Siiddu, man aiggot sihkut, lea rievdaduvvon dávjit go oktii:',
-'confirmdeletetext'           => 'Leat sihkumin siiddu dahje fiilla ja buot dan historjjá. �dde dagu váikkuhsaid ja sihko {{GRAMMAR:genitive|{{SITENAME}}}} [[{{MediaWiki:Policy-url}}|geavahaid]] mielde.',
-'actioncomplete'              => 'Doaibma lea dahkkon',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" lea sihkojuvvon.
+# Delete
+'deletepage'        => 'Sihko siiddu',
+'confirm'           => 'Daga',
+'excontent'         => 'sisdisdolii: �$1�',
+'exbeforeblank'     => 'sisdoallu ovdal gurrema: �$1�',
+'exblank'           => 'lei guoros',
+'historywarning'    => 'Siiddu, man aiggot sihkut, lea rievdaduvvon dávjit go oktii:',
+'confirmdeletetext' => 'Leat sihkumin siiddu dahje fiilla ja buot dan historjjá. �dde dagu váikkuhsaid ja sihko {{GRAMMAR:genitive|{{SITENAME}}}} [[{{MediaWiki:Policy-url}}|geavahaid]] mielde.',
+'actioncomplete'    => 'Doaibma lea dahkkon',
+'deletedtext'       => '"<nowiki>$1</nowiki>" lea sihkojuvvon.
 Siiddus $2 lea listu maŋimus sihkomiin.',
-'deletedarticle'              => 'sihkoi siiddu $1',
-'dellogpage'                  => 'Sihkkunlogga',
-'dellogpagetext'              => 'Vuolábealde lea logga maŋimus sihkkumiin.',
-'deletionlog'                 => 'sihkkunlogga',
-'reverted'                    => 'Máhcahuvvon ovddit veršuvdnii',
-'deletecomment'               => 'Sihkkuma sivva',
-'rollback'                    => 'máhcat ovddit veršuvdnii',
-'rollback_short'              => 'Máhcaheapmi',
-'rollbacklink'                => 'máhcat',
-'rollbackfailed'              => 'Máhccan ii lihkosmuvvan',
-'cantrollback'                => 'Máhcaheapmi ovddit veršuvdnii ii leat vejolaš, daningo maŋimuš �álli lea siiddu aidna dahkki.',
-'alreadyrolled'               => 'Rievdadusat, maid geavaheaddji [[User:$2|$2]] ([[User talk:$2|ságastallan]]) lea dahkan, siidui $1 ii sáhte sihkkut, daningo geavaheaddji [[User:$3|$3]] ([[User talk:$3|ságastallan]]) lea dahkan ođđa rievdadusaid.',
-'editcomment'                 => 'Rievdadusa �oahkkáigeassu lei: <i>$1</i>.', # only shown if there is an edit comment
-'revertpage'                  => 'Geavaheaddji [[Special:Contributions/$2|$2]] ([[User_talk:$2|ságastallan]]) rievdadusat sihkkojuvvui ja siidu máhcahuvvui veršuvdnii, man geavaheaddji [[User:$1|$1]] lei dahkan.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Rievdadusat, maid geavaheaddji �$1� lei dahkan, sihkojuvvui ja artihkal máhcaduvvui veršuvdnii, man geavaheaddji $2 lei dahkan.',
+'deletedarticle'    => 'sihkoi siiddu $1',
+'dellogpage'        => 'Sihkkunlogga',
+'dellogpagetext'    => 'Vuolábealde lea logga maŋimus sihkkumiin.',
+'deletionlog'       => 'sihkkunlogga',
+'reverted'          => 'Máhcahuvvon ovddit veršuvdnii',
+'deletecomment'     => 'Sihkkuma sivva',
+
+# Rollback
+'rollback'         => 'máhcat ovddit veršuvdnii',
+'rollback_short'   => 'Máhcaheapmi',
+'rollbacklink'     => 'máhcat',
+'rollbackfailed'   => 'Máhccan ii lihkosmuvvan',
+'cantrollback'     => 'Máhcaheapmi ovddit veršuvdnii ii leat vejolaš, daningo maŋimuš �álli lea siiddu aidna dahkki.',
+'alreadyrolled'    => 'Rievdadusat, maid geavaheaddji [[User:$2|$2]] ([[User talk:$2|ságastallan]]) lea dahkan, siidui $1 ii sáhte sihkkut, daningo geavaheaddji [[User:$3|$3]] ([[User talk:$3|ságastallan]]) lea dahkan ođđa rievdadusaid.',
+'editcomment'      => "Rievdadusa �oahkkáigeassu lei: ''$1''.", # only shown if there is an edit comment
+'revertpage'       => 'Geavaheaddji [[Special:Contributions/$2|$2]] ([[User_talk:$2|ságastallan]]) rievdadusat sihkkojuvvui ja siidu máhcahuvvui veršuvdnii, man geavaheaddji [[User:$1|$1]] lei dahkan.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Rievdadusat, maid geavaheaddji �$1� lei dahkan, sihkojuvvui ja artihkal máhcaduvvui veršuvdnii, man geavaheaddji $2 lei dahkan.',
+
+# Protect
 'protectlogpage'              => 'Suodjálanlogga',
 'protectedarticle'            => 'suodjálii siiddu $1',
 'modifiedarticleprotection'   => 'rievddai siiddu [[$1]] suodjálandási',
 'unprotectedarticle'          => 'heittii siiddu $1 suodjaleami',
 'protect-title'               => 'Siiddu $1 suodjáleapmi',
+'prot_1movedto2'              => 'sirddii siiddu �$1� ođđa namain �$2�',
 'protect-legend'              => 'Nanne suodjáleami',
 'protectcomment'              => 'Suodjáleami sivva:',
 'protectexpiry'               => 'Boarásnuvvá',
@@ -937,6 +928,7 @@ Siiddus $2 lea listu maŋimus sihkomiin.',
 'protect-summary-cascade'     => 'viididuvvon',
 'protect-expiring'            => 'boarásnuvvá $1',
 'protect-cascade'             => 'Viidit suodjálusa guoskat buot siidduit, mat gullet dán siidui',
+'protect-expiry-options'      => '2 diimma:2 hours,1 beaivi:1 day,3 beaivve:3 days,1 vahkku:1 week,2 vahkku:2 weeks,1 mánotbádji:1 month,3 mánotbaji:3 months,6 mánotbaji:6 months,1 jahki:1 year,bissovaš:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Rádjehus',
 'restriction-level'           => 'Suodjálus',
 'minimum-size'                => 'Min. sturrodat',
@@ -989,7 +981,6 @@ Siiddus $2 lea listu maŋimus sihkomiin.',
 # What links here
 'whatlinkshere'       => 'Siiddut mat �ujuhit deikke',
 'whatlinkshere-title' => 'Siiddut mat �ujuhit $1',
-'linklistsub'         => 'Liŋkalistu',
 'linkshere'           => 'Čuovvovaš siidduin lea liŋka siidui <strong>[[:$1]]</strong>:',
 'nolinkshere'         => 'Siidui <strong>[[:$1]]</strong> eai leat liŋkkat.',
 'nolinkshere-ns'      => 'Siidui <strong>[[:$1]]</strong> eai leat liŋkkat válljejuvvon nammagomuvuođas.',
@@ -1049,6 +1040,7 @@ Siiddus $2 lea listu maŋimus sihkomiin.',
 # Move page
 'move-page-legend'        => 'Sirdde siiddu',
 'movearticle'             => 'Sirdde siiddu',
+'movenologin'             => 'It leat �álligoahtán sisa',
 'newtitle'                => 'OÄ‘Ä‘a namma siidui',
 'move-watch'              => 'Čuovo dán siiddu',
 'movepagebtn'             => 'Sirdde siiddu',
@@ -1076,6 +1068,7 @@ Siiddus $2 lea listu maŋimus sihkomiin.',
 'filemissing' => 'Fiila váilo',
 
 # Special:Import
+'import-comment'        => 'Sivva',
 'import-revision-count' => '$1 {{PLURAL:$1|veršuvdna|veršuvnna}}',
 
 # Import log
@@ -1168,7 +1161,7 @@ Siiddus $2 lea listu maŋimus sihkomiin.',
 # Media information
 'widthheightpage' => '$1×$2, $3 siiddut',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'OÄ‘Ä‘a govat',
 'imagelisttext'         => "Vuolábealde lea '''$1''' fiilla ordnejuvvon $2.",
 'ilsubmit'              => 'Oza',
@@ -1253,18 +1246,9 @@ Siiddus $2 lea listu maŋimus sihkomiin.',
 # Delete conflict
 'recreate' => '�lggat ođđasit',
 
-# HTML dump
-'redirectingto' => 'OÄ‘Ä‘asitstivrejuvvo siidui [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'Sihko',
 
-# AJAX search
-'searchcontaining' => 'Oza artihkkaliid, mat sisdisdollet �$1�.',
-'searchnamed'      => 'Oza artihkkaliid, maid namma lea �$1�.',
-'articletitles'    => 'Artihkkalat, mat álget �$1�',
-'hideresults'      => 'ÄŒiega bohtosiid',
-
 # Multipage image navigation
 'imgmultipageprev' => '� ovddit siidu',
 'imgmultipagenext' => '�uovvovaš siidu →',
diff --git a/languages/messages/MessagesSei.php b/languages/messages/MessagesSei.php
index a596606d..f56276cf 100644
--- a/languages/messages/MessagesSei.php
+++ b/languages/messages/MessagesSei.php
@@ -56,8 +56,6 @@ $messages = array(
 'underline-never'   => 'Diixepe',
 'underline-default' => 'AutoBrowser',
 
-'skinpreview' => '(Cuáxiit)',
-
 # Dates
 'sunday'        => 'Dajmino',
 'monday'        => 'Luncino',
@@ -136,7 +134,7 @@ $messages = array(
 'mytalk'         => 'Heczaxö',
 'anontalk'       => 'Czaxöde IP',
 'navigation'     => 'Navigacion',
-'and'            => 'ö',
+'and'            => '&#32;ö',
 
 # Metadata in edit box
 'metadata_help' => 'Datade Meta:',
@@ -197,8 +195,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} mii',
 'aboutpage'            => 'Project:Miilà',
-'bugreports'           => 'Iitómde bug',
-'bugreportspage'       => 'Project:Iitómde bug',
 'copyright'            => 'Contentua coitáamb $1 tan.',
 'copyrightpagename'    => 'Copyright {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyrightám',
@@ -221,8 +217,6 @@ $messages = array(
 
 'badaccess'        => 'Römjde permicion',
 'badaccess-group0' => 'Menepermicion executan accion z hecocmíiit.',
-'badaccess-group1' => 'Accion hecocmíiit coccebj diilimáat czo $1.',
-'badaccess-group2' => "Accion hecocmíiit coccebj diilimáat czo'd $1.",
 'badaccess-groups' => "Accion hecocmíiit coccebj diilimáat czo'd $1.",
 
 'versionrequired'     => 'Vercion $1 MediaWiki pal',
@@ -310,7 +304,6 @@ Sysop zo locköx zo xuniim jan rae': $1",
 'badtitle'             => 'Ahisharliit',
 'badtitletext'         => 'Zo páhina coccebj ahisharliit zo.
 Jan pos-coccebj plusöxde 1 jöx 1 characterám jan nepos-coccebj usadas titlenám iti.',
-'perfdisabled'         => 'Sorry! Jan part coccebj disablenöxde temp. Zo minöxde cáipyde database ponit zo iti nectám pos-usadad wiki zo.',
 'perfcached'           => 'Jan data coccebj cache ö necoccebj updatenom.',
 'perfcachedts'         => "Jan data coccebj cache ö coccebjöx updatenom $1 'de.",
 'querypage-no-updates' => 'Updatenámde jan páhina coccebj disablenöx cmaa. Jan data necanj cmaa.',
@@ -332,8 +325,8 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'Caitom cuípo',
-'logouttext'                 => '<strong>Me cuípo.</strong><br />
-Mecontinudad usadad {{SITENAME}} anon jïx me caápo dajcaitom ö jömcaitom. Páhinám pac continudad displayom dajme caápo, jánclearom mecachede browser.',
+'logouttext'                 => "'''Me cuípo.'''<br />
+Mecontinudad usadad {{SITENAME}} anon jïx me caápo dajcaitom ö jömcaitom. Páhinám pac continudad displayom dajme caápo, jánclearom mecachede browser.",
 'welcomecreation'            => "== Q'$1! ==
 
 Mecaitom coccebj creatöx. Quiix hequáatlaácde {{SITENAME}} pos-poop.",
@@ -344,7 +337,6 @@ Mecaitom coccebj creatöx. Quiix hequáatlaácde {{SITENAME}} pos-poop.",
 'remembermypassword'         => 'Qualtiinii he quimx canj jan ordinator iti',
 'yourdomainname'             => 'Hedomino:',
 'externaldberror'            => 'Pos-römjde authenticacionde database extername jöx me necoccebj permiccionde updatan mecaitom externom.',
-'loginproblem'               => '<b>Problemam mecaápo miimisoj.</b><br />Vancaápo!',
 'login'                      => 'Caápo',
 'nav-login-createaccount'    => 'Caápo / xuatl',
 'loginprompt'                => 'Henáabliicookám caápo {{SITENAME}}.',
@@ -414,11 +406,13 @@ confirmom account zo coccebj de'me.",
 'resetpass'               => "Account quimx canj'reset",
 'resetpass_announce'      => "Me caápo code temp e-iitomöx mii. Fini caápo, me reset' hunquimx canj cmaadexepe:",
 'resetpass_header'        => "Reset'quimx canj",
+'oldpassword'             => 'Janquimx canj:',
+'newpassword'             => 'Hunquimx canj:',
+'retypenew'               => 'Vanhunquimx canj:',
 'resetpass_submit'        => 'Vanquimx canj ö caápo',
 'resetpass_success'       => 'Me quimx canj coccebj quiixde success! Caápo cmaa...',
 'resetpass_bad_temporary' => "Quimx canj temp invalidanj. Me coccebj reset' quimx canjde success jöx requestan hunquimx canj temp pac.",
 'resetpass_forbidden'     => 'Quimx cánj nereset jan wiki iti',
-'resetpass_missing'       => 'Formdata fan.',
 
 # Edit page toolbar
 'bold_sample'     => 'Text ccomca',
@@ -443,8 +437,8 @@ confirmom account zo coccebj de'me.",
 'hr_tip'          => 'I horizont (seperatman)',
 
 # Edit pages
-'summary'                   => 'Abvuatl',
-'subject'                   => 'Subject/ccanzam',
+'summary'                   => 'Abvuatl:',
+'subject'                   => 'Subject/ccanzam:',
 'minoredit'                 => 'Jan coccebj editám z bajlöxám',
 'watchthis'                 => 'Cáminot jan páhina',
 'savearticle'               => 'Xuniim páhina',
@@ -456,8 +450,8 @@ confirmom account zo coccebj de'me.",
 'missingsummary'            => "'''Attencion:''' Me necoccebj providöx abvuatlde ticpatlöx zo. Clicköx 'Xuniim páhina' xuniim meticpatlöx sans abvuatlde ticpatlöx.",
 'missingcommenttext'        => 'Enterom commentua !-cmaa.',
 'missingcommentheader'      => "'''Attencion:''' Me necoccebj providöx subjectua/corridor zode jan commentua. Clickom 'Xuniim páhina' xuniim meticpatlöx sans subjectua/corridor zo.",
-'summary-preview'           => 'Cuáxiitde abvuatl',
-'subject-preview'           => 'Cuáxiitde subjectua/corridor',
+'summary-preview'           => 'Cuáxiitde abvuatl:',
+'subject-preview'           => 'Cuáxiitde subjectua/corridor:',
 'blockedtitle'              => 'Caitom blockámit',
 'blockedtext'               => "<big>'''Hexuatl jöx adressade IP cáablockom.'''</big>
 
@@ -504,37 +498,37 @@ Me coccebj römjasi poop, clickom meback-buttonde browser coccebj perfectua.',
 'anontalkpagetext'          => "----''Jan coccebj czaxö zode caitomde IDde adressade IP. Isój necoccebj caápo. Jan coccebj rae'de usadadde adressade IP numerical identificacion 'prenisój. Plusöxde caitom pos-coccebj jan adressade IP. Me pos-coccebj anonimo ö commentua irrevelantua coccebj directomde me poop, [[Special:UserLogin|caápo-jande]] exitom confucion diijömde IP-caitóm mii.''",
 'noarticletext'             => 'Jan páhina necoccebj textua zo, me pos-coccebj [[Special:Search/{{PAGENAME}}|yahöx jan páhina]] diijömde páhinám iti jöx [{{fullurl:{{FULLPAGENAME}}|action=edit}} ticpatlöx jan páhina].',
 'clearyourcache'            => "'''Notificacion:''' Xuniim 'depre, me pos-coccebj bypassöx mecachede browser caitomi quiíx. '''Mozilla / Firefox / Safari:''' quan ti caitomde ''Shift'' zoxepe clickom ''Reload'', jöx cuápook zo ti ''Ctrl-Shift-R'' (''Cmd-Shift-R'' Apple Mac iti); '''IE:''' quan ti ''Ctrl'' zoxepe clickom ''Refresh'', jöx cuápook zo ti ''Ctrl-F5''; '''Konqueror:''': clickom buttonde ''Reload'' zo, jöx cuápook zo iti ''F5''; '''Opera''' caitóm pos-coccebj clairomde cache completementua ''Tools→Preferences'' iti.",
-'usercssjsyoucanpreview'    => "<strong>Tip:</strong> Usadad 'Cohuatlöx cuáxiit' testom me hun CSS/JS xuniim 'depre.",
+'usercssjsyoucanpreview'    => "'''Tip:''' Usadad 'Cohuatlöx cuáxiit' testom me hun CSS/JS xuniim 'depre.",
 'usercsspreview'            => "'''He cuáxiit he CSSde caitom, zo necoccebj xuniim!'''",
 'userjspreview'             => "'''He cuáxiit/testom he JavaScriptde caitom, zo necoccebj xuniim!'''",
 'userinvalidcssjstitle'     => "'''Attencion:''' Skin \"\$1\" coccebj ne'dáár. Regardom .css ö .js páhinám usadad titlenam lowercase zo, yanuiíxzo mii yahöxde ti {{ns:user}}:Foo/monobook.css opposadadde {{ns:user}}:Foo/Monobook.css.",
 'updated'                   => '(varupdatenám)',
-'note'                      => '<strong>Notificacion:</strong>',
-'previewnote'               => '<strong>Jan coccebj cuáxiit zo; quiíx necoccebj xuniim!</strong>',
+'note'                      => "'''Notificacion:'''",
+'previewnote'               => "'''Jan coccebj cuáxiit zo; quiíx necoccebj xuniim!'''",
 'previewconflict'           => 'Jan cuáxiit reflectom textua zode upper textua ticpatlöx hant jan coccebj cuáxiitde zuniim páhina.',
-'session_fail_preview'      => '<strong>Sorry! He necoccebj processom meticpatlöx xajvon datade seccion.
-Nexajvon. Jan necoccebj naxajvon poop, cuípo ö caápo.</strong>',
-'session_fail_preview_html' => "<strong>Sorry! He necoccebj processom meticpatlöx xajvon datade seccion.</strong>
+'session_fail_preview'      => "'''Sorry! He necoccebj processom meticpatlöx xajvon datade seccion.
+Nexajvon. Jan necoccebj naxajvon poop, cuípo ö caápo.'''",
+'session_fail_preview_html' => "'''Sorry! He necoccebj processom meticpatlöx xajvon datade seccion.'''
 
 ''Jan wiki coccebj HTML raw enablenom, cuáxiit zo coccebj camaátde precaucion JavaScripts caniim.''
 
-<strong>Jan coccebj ticpatlöx legimatöx poop, reprocessom. Jan necoccebj processom poop, cuípo ö caápo.</strong>",
-'token_suffix_mismatch'     => '<strong>Meticpatlöx coccebj rejectöx meclient cahöx characteromde punctacion zo ticpatlöx zo iti. TicpatlÖx zo coccebj rejectöxde preventua corrupcionde textuade páhina zo. 
-Jan lajxepe occuram me usadad proxy service anon web-based buggy.</strong>',
+'''Jan coccebj ticpatlöx legimatöx poop, reprocessom. Jan necoccebj processom poop, cuípo ö caápo.'''",
+'token_suffix_mismatch'     => "'''Meticpatlöx coccebj rejectöx meclient cahöx characteromde punctacion zo ticpatlöx zo iti. TicpatlÖx zo coccebj rejectöxde preventua corrupcionde textuade páhina zo. 
+Jan lajxepe occuram me usadad proxy service anon web-based buggy.'''",
 'editing'                   => 'Ticpatlöx $1',
 'editingsection'            => 'Ticpatlöx $1 (seccion)',
 'editingcomment'            => 'Ticpatlöx $1 (commentua)',
 'editconflict'              => 'Römjde ticpatlöxde conflictua: $1',
 'yourtext'                  => 'Hetext',
 'storedversion'             => 'Vercion ráimuniit',
-'nonunicodebrowser'         => "<strong>ATTENCION: Mebrowser necoccebj compliantede 'unicode' (characterám sans huáp ti). Workaround coccebj hant itide me permiccion ticpatlöx páhinám: non-ASCII characterám coccebj codes hexidecimales.</strong>",
-'editingold'                => '<strong>ATTENCION: Me coccebj ticpatlöx revicion outdatenam zode jan páhina. Me xuniim zo, jömde quiíx hunde jan revicion coccebj delar poop.</strong>',
+'nonunicodebrowser'         => "'''ATTENCION: Mebrowser necoccebj compliantede 'unicode' (characterám sans huáp ti). Workaround coccebj hant itide me permiccion ticpatlöx páhinám: non-ASCII characterám coccebj codes hexidecimales.'''",
+'editingold'                => "'''ATTENCION: Me coccebj ticpatlöx revicion outdatenam zode jan páhina. Me xuniim zo, jömde quiíx hunde jan revicion coccebj delar poop.'''",
 'yourdiff'                  => 'Quiíx',
-'longpagewarning'           => '<strong>ATTENCION: Jan páhina coccebj $1 kilobynám; browserám pac pos-coccebj problemámde ticpatlöx páhinám necade jöx plusöxde 32 kb.
-Cahöx ticpatlöx jan páhina minöx seccion iti.</strong>',
-'longpageerror'             => '<strong>RÖMJ: Textua zo mexuniim coccebj $1 kilobytenám, jan coccebj plusöxde maxde $2 kilobytenám. Zo necoccebj xuniim.</strong>',
-'readonlywarning'           => "<strong>ATTENCION: Database zo coccebj lockomde kyépöx, zo necoccebj posde xuniim meticpatlöx cmaa. Me coccebj considerom ''cut-n-paste'' textua zo ciúchande textua iti ö xuniimde diijömdexepe.</strong>",
-'protectedpagewarning'      => '<strong>ATTENCION: Jan páhina coccebj lockomde sysopám coccebj ticpatlöx zo permiccional.</strong>',
+'longpagewarning'           => "'''ATTENCION: Jan páhina coccebj $1 kilobynám; browserám pac pos-coccebj problemámde ticpatlöx páhinám necade jöx plusöxde 32 kb.
+Cahöx ticpatlöx jan páhina minöx seccion iti.'''",
+'longpageerror'             => "'''RÖMJ: Textua zo mexuniim coccebj $1 kilobytenám, jan coccebj plusöxde maxde $2 kilobytenám. Zo necoccebj xuniim.'''",
+'readonlywarning'           => "'''ATTENCION: Database zo coccebj lockomde kyépöx, zo necoccebj posde xuniim meticpatlöx cmaa. Me coccebj considerom ''cut-n-paste'' textua zo ciúchande textua iti ö xuniimde diijömdexepe.'''",
+'protectedpagewarning'      => "'''ATTENCION: Jan páhina coccebj lockomde sysopám coccebj ticpatlöx zo permiccional.'''",
 'semiprotectedpagewarning'  => "'''Notificacion:''' Jan páhina coccebj lockom caitom registrar coccebj ticpatlöx zo.",
 'cascadeprotectedwarning'   => "'''Attencion:''' Jan páhina coccebj lockom jan coccebj ticpatlöxde caitom sysopán permiccion mii, zo coccebj includöx jan {{PLURAL:$1|cascade-páhina|cascade-páhinám}} hun:",
 'templatesused'             => 'Automií usadad jan páhina iti:',
@@ -563,11 +557,9 @@ Rae' zo xuniim $3 mii coccebj ''$2''",
 # History pages
 'viewpagelogs'        => 'Cohuatlöx logámde jan páhina',
 'nohistory'           => 'Jan páhina necoccebj históriade ticpatlöx.',
-'revnotfound'         => 'Revicion neyahöx',
-'revnotfoundtext'     => 'Janrevicion zode páhina zo me yahöx necoccebj yahöxom. Controlar URL zo me usadadde accesom jan páhina.',
 'currentrev'          => 'Revicion cmaa',
 'revisionasof'        => 'Revicionde $1',
-'revision-info'       => "Revicionde $1 'de $2",
+'revision-info'       => "Revicionde $1 'de $2", # Additionally available: $3: revision id
 'previousrevision'    => '�Janrevicion',
 'nextrevision'        => 'Hunrevicion→',
 'currentrevisionlink' => 'Revicion currentuanon',
@@ -624,6 +616,7 @@ Informacion: (curt) = quiíxde vercion currentua,
 'prevn'                 => 'jan $1',
 'nextn'                 => 'hun $1',
 'viewprevnext'          => 'Cohuatlöx ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:Caálixötöj',
 'powersearch'           => 'Yahöx',
 
 # Preferences page
@@ -636,6 +629,7 @@ Informacion: (curt) = quiíxde vercion currentua,
 'qbsettings-none'       => 'Nepartám',
 'changepassword'        => "Reset'quimx canj",
 'skin'                  => 'Zuláugaum',
+'skin-preview'          => 'Cuáxiit',
 'math'                  => 'HTML-cuat',
 'dateformat'            => 'Formatumde datum',
 'datedefault'           => 'Diiquáatlaac',
@@ -650,9 +644,6 @@ Informacion: (curt) = quiíxde vercion currentua,
 'prefs-misc'            => 'Jömc',
 'saveprefs'             => 'Xuniim',
 'resetprefs'            => "Reset'",
-'oldpassword'           => 'Janquimx canj:',
-'newpassword'           => 'Hunquimx canj:',
-'retypenew'             => 'Vanhunquimx canj:',
 'textboxsize'           => 'Ticpatlöx',
 'rows'                  => 'Rowám:',
 'columns'               => 'Columnám:',
@@ -766,17 +757,17 @@ Informacion: (curt) = quiíxde vercion currentua,
 'nolicense'         => 'Seleccion coccebj hun',
 'license-nopreview' => '(Necuáxiit)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Yahöxde IDde ciúchan:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Yahöxde IDde ciúchan:',
 'imgfile'               => 'ciúchan',
-'imagelist'             => 'Listade ciúchán',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Nom',
-'imagelist_user'        => 'Caitom',
-'imagelist_size'        => 'Bajlip',
-'imagelist_description' => 'Discripcion',
-
-# Image description page
+'listfiles'             => 'Listade ciúchán',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Nom',
+'listfiles_user'        => 'Caitom',
+'listfiles_size'        => 'Bajlip',
+'listfiles_description' => 'Discripcion',
+
+# File description page
 'filehist'                  => 'Historiade ciúchan',
 'filehist-deleteall'        => 'delatom jömde man',
 'filehist-deleteone'        => 'delatom jande man',
@@ -826,9 +817,8 @@ Informacion: (curt) = quiíxde vercion currentua,
 'randomredirect-nopages' => 'Zo necoccebj meniitomöx jan ipartuatl iti.',
 
 # Statistics
-'statistics' => 'Statisticám',
-'sitestats'  => '{{SITENAME}} statisticám',
-'userstats'  => 'Caitom statisticám',
+'statistics'              => 'Statisticám',
+'statistics-header-users' => 'Caitom statisticám',
 
 'doubleredirects' => 'Meniitomöx daj ti zon',
 
@@ -867,8 +857,6 @@ Informacion: (curt) = quiíxde vercion currentua,
 'speciallogtitlelabel' => 'Titlenam:',
 'log'                  => 'Logám',
 'all-logs-page'        => 'Jömde logám',
-'log-search-legend'    => 'Yahöxde logám',
-'log-search-submit'    => 'Caátemöx',
 
 # Special:AllPages
 'allpages'          => 'Jöxde páhinám',
@@ -910,26 +898,20 @@ iitom e-iitomde diijömde caitóm.',
 'emailsenttext'   => 'Hene-iitom coccebj e-iitomöx.',
 
 # Watchlist
-'watchlist'            => 'He listade cáminot',
-'mywatchlist'          => 'He listade cáminot',
-'watchlistfor'         => "('''$1''' mii)",
-'nowatchlist'          => 'Hecoccebj 0 itémii helistade cáminot iti.',
-'watchnologin'         => 'Necaápo',
-'watchnologintext'     => 'Zo coccebj Neces [[Special:UserLogin|caápo]] ticpatlöx helistade cáminot.',
-'addedwatch'           => 'Plusöxaj listade cáminot',
-'removedwatch'         => 'Delatajde he listade cáminot',
-'removedwatchtext'     => 'Páhina zo "[[:$1]]" coccebj delataj me listade cáminot.',
-'watch'                => 'Cáminot',
-'watchthispage'        => 'Cáminot jan páhina',
-'unwatch'              => 'Diicáminot',
-'unwatchthispage'      => 'Diicáminot jan páhina',
-'wlshowlast'           => 'Cohuatlöx hun $1 ixáap quij iitax $2 ixáap $3',
-'watchlist-show-bots'  => 'Cohuatlöx editám cibotám',
-'watchlist-hide-bots'  => 'Cíiitám editám cibotám',
-'watchlist-show-own'   => 'Cohuatlöx  hániideditám',
-'watchlist-hide-own'   => 'Cíiitám hániideditám',
-'watchlist-show-minor' => 'Cohuatlöx editám bajlöxám',
-'watchlist-hide-minor' => 'Cíiitám editám bajlöxám',
+'watchlist'        => 'He listade cáminot',
+'mywatchlist'      => 'He listade cáminot',
+'watchlistfor'     => "('''$1''' mii)",
+'nowatchlist'      => 'Hecoccebj 0 itémii helistade cáminot iti.',
+'watchnologin'     => 'Necaápo',
+'watchnologintext' => 'Zo coccebj Neces [[Special:UserLogin|caápo]] ticpatlöx helistade cáminot.',
+'addedwatch'       => 'Plusöxaj listade cáminot',
+'removedwatch'     => 'Delatajde he listade cáminot',
+'removedwatchtext' => 'Páhina zo "[[:$1]]" coccebj delataj me listade cáminot.',
+'watch'            => 'Cáminot',
+'watchthispage'    => 'Cáminot jan páhina',
+'unwatch'          => 'Diicáminot',
+'unwatchthispage'  => 'Diicáminot jan páhina',
+'wlshowlast'       => 'Cohuatlöx hun $1 ixáap quij iitax $2 ixáap $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Cáminot...',
@@ -941,9 +923,12 @@ iitom e-iitomde diijömde caitóm.',
 'created'                      => 'creacöx',
 'enotif_anon_editor'           => 'caitom anoniimom $1',
 
-# Delete/protect/revert
+# Delete
 'deletepage' => 'Delatar páhina',
-'pagesize'   => '(bytenám)',
+
+# Protect
+'prot_1movedto2' => '[[$1]] yacomöxde [[$2]]',
+'pagesize'       => '(bytenám)',
 
 # Restrictions (nouns)
 'restriction-edit' => 'Ticpatlöx',
@@ -968,7 +953,6 @@ iitom e-iitomde diijömde caitóm.',
 'sp-contributions-submit'   => 'Yahöx',
 
 # What links here
-'linklistsub'         => '(Listade linkám)',
 'istemplate'          => 'incluciónaj',
 'whatlinkshere-links' => '� linkám',
 
@@ -1011,6 +995,7 @@ iitom e-iitomde diijömde caitóm.',
 # Move page
 'move-page-legend' => 'Yacom páhina',
 'movearticle'      => 'Yacom páhina:',
+'movenologin'      => 'Necaápo',
 'move-watch'       => 'Cáminot jan páhina',
 'movepagebtn'      => 'Yacom páhina',
 'movedto'          => 'yacomöxde',
@@ -1031,6 +1016,7 @@ iitom e-iitomde diijömde caitóm.',
 # Special:Import
 'import'                  => 'Importóm páhinóm',
 'import-interwiki-submit' => 'Importom',
+'import-comment'          => 'Commentua:',
 'importstart'             => 'Importom páhinám...',
 'importfailed'            => 'Römjde import: $1',
 
@@ -1073,7 +1059,7 @@ iitom e-iitomde diijömde caitóm.',
 # Media information
 'widthheightpage' => '$1×$2, $3 páhinám',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1 botám)',
 'ilsubmit'     => 'Yahöx',
 'bydate'       => 'de datum',
diff --git a/languages/messages/MessagesSh.php b/languages/messages/MessagesSh.php
new file mode 100644
index 00000000..07722939
--- /dev/null
+++ b/languages/messages/MessagesSh.php
@@ -0,0 +1,132 @@
+<?php
+/** Serbo-Croatian (Srpskohrvatski / Срп�кохрват�ки)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author OC Ripper
+ * @author לערי ריינה�רט
+ */
+
+$messages = array(
+# Dates
+'january'   => 'januar',
+'february'  => 'februar',
+'march'     => 'mart',
+'april'     => 'april',
+'may_long'  => 'maj',
+'june'      => 'jun',
+'july'      => 'jul',
+'august'    => 'august',
+'september' => 'septembar',
+'october'   => 'oktobar',
+'november'  => 'novembar',
+'december'  => 'decembar',
+
+# Categories related messages
+'pagecategories' => '{{PLURAL:$1|Kategorija|Kategorije}}',
+
+'navigation' => 'Navigacija',
+
+'tagline'          => 'Izvor: {{SITENAME}}',
+'search'           => 'Pretraga',
+'searchbutton'     => 'Traži',
+'searcharticle'    => 'Idi',
+'history_short'    => 'Historija',
+'printableversion' => 'Verzija za ispis',
+'permalink'        => 'Trajni link',
+'edit'             => 'Uredi',
+'talkpagelinktext' => 'Razgovor',
+'talk'             => 'Razgovor',
+'views'            => 'Pregledi',
+'toolbox'          => 'Traka sa alatima',
+'otherlanguages'   => 'Na drugim jezicima',
+'lastmodifiedat'   => 'Ova stranica je posljednji put izmijenjena $1, $2.', # $1 date, $2 time
+'jumpto'           => 'Sko�i na:',
+'jumptonavigation' => 'navigacija',
+'jumptosearch'     => 'pretraga',
+
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite'            => 'O projektu {{SITENAME}}',
+'copyright'            => 'Sadržaj je dostupan pod $1.',
+'disclaimers'          => 'Odricanje odgovornosti',
+'mainpage'             => 'Glavna strana',
+'mainpage-description' => 'Glavna strana',
+'privacy'              => 'Politika privatnosti',
+
+'retrievedfrom'   => 'Dobavljeno iz "$1"',
+'editsection'     => 'uredi',
+'editsectionhint' => 'Uredi sekciju: $1',
+'red-link-title'  => '$1 (stranica ne postoji)',
+
+# Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-main'    => 'Stranica',
+'nstab-special' => 'Posebna stranica',
+
+# Login and logout pages
+'nav-login-createaccount' => 'Prijavi se / Registruj se',
+
+# History pages
+'cur'  => 'tren',
+'last' => 'preth',
+
+# Revision deletion
+'rev-delundel' => 'pokaži/sakrij',
+
+# Diffs
+'lineno'   => 'Linija $1:',
+'editundo' => 'ukloni ovu izmjenu',
+
+# Search results
+'searchresults'             => 'Rezultati pretrage',
+'searchresults-title'       => 'Rezultati pretrage za "$1"',
+'searchsubtitle'            => 'Tražili ste \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sve stranice koje po�inju sa "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|sve stranice koje vode do "$1"]])',
+'search-mwsuggest-enabled'  => 'sa sugestijama',
+'search-mwsuggest-disabled' => 'bez sugestija',
+'powersearch'               => 'Napredna pretraga',
+
+# Recent changes linked
+'recentchangeslinked' => 'Srodne izmjene',
+
+# Miscellaneous special pages
+'nbytes' => '$1 {{PLURAL:$1|bajt|bajtova}}',
+
+# Special:AllPages
+'alphaindexline' => '$1 do $2',
+
+# Namespace form on various pages
+'blanknamespace' => '(Glavno)',
+
+# What links here
+'whatlinkshere'       => 'Å ta je povezano ovdje',
+'whatlinkshere-links' => '� linkovi',
+
+# Block/unblock
+'contribslink' => 'doprinosi',
+
+# Namespace 8 related
+'allmessages' => 'Sistemske poruke',
+
+# Tooltip help for the actions
+'tooltip-pt-login'              => 'Predlažem da se prijavite; međutim, to nije obavezno',
+'tooltip-ca-talk'               => 'Razgovor o sadržaju stranice',
+'tooltip-ca-history'            => 'Prethodne verzije ove stranice',
+'tooltip-search'                => 'Pretraži ovaj wiki',
+'tooltip-search-go'             => 'Idi na stranicu s upravo ovakvim imenom ako postoji',
+'tooltip-search-fulltext'       => 'Pretraga stranica sa ovim tekstom',
+'tooltip-n-mainpage'            => 'Posjetite glavnu stranu',
+'tooltip-n-portal'              => 'O projektu, što možete u�initi, gdje možete naći stvari',
+'tooltip-n-recentchanges'       => 'Spisak nedavnih izmjena na wikiju.',
+'tooltip-n-randompage'          => 'Otvorite slu�ajnu stranicu',
+'tooltip-n-help'                => 'Mjesto gdje možete nešto da nau�ite',
+'tooltip-t-whatlinkshere'       => 'Spisak svih stranica povezanih sa ovim',
+'tooltip-t-recentchangeslinked' => 'Nedavne izmjene ovdje povezanih stranica',
+'tooltip-t-specialpages'        => 'Popis svih posebnih stranica',
+'tooltip-t-permalink'           => 'Stalni link ove verzije stranice',
+'tooltip-ca-nstab-main'         => 'Pogledajte sadržaj stranice',
+'tooltip-ca-nstab-special'      => 'Ovo je posebna stranica, te je ne možete uređivati',
+
+# Special:SpecialPages
+'specialpages' => 'Posebne stranice',
+
+);
diff --git a/languages/messages/MessagesShi.php b/languages/messages/MessagesShi.php
index 7547b947..93a459b3 100644
--- a/languages/messages/MessagesShi.php
+++ b/languages/messages/MessagesShi.php
@@ -90,7 +90,7 @@ $messages = array(
 'moredotdotdot'  => 'uggar...',
 'mypage'         => 'tawriqt niw',
 'mytalk'         => 'assays ino',
-'and'            => 'z',
+'and'            => '&#32;z',
 
 'tagline'          => 'mn {{SITENAME}}',
 'help'             => 'lmÉœiwna',
@@ -162,10 +162,10 @@ lcont nk ati styaqyad. ador tot atbadlt {{SITENAME}} lmЗlomat nk.',
 # Edit pages
 'noarticletext'    => 'ɣila orilla walo l-ktba ɣ tawriqt ad, tzdart [[Special:Search/{{PAGENAME}}|atsiglt smiyt n tawriqt ad]] 
 ɣ tiwriqin yadni, nɣd [{{fullurl:{{FULLPAGENAME}}|action=edit}} atbdlt tawrikt ad]',
-'copyrightwarning' => 'ikhssak atst izd kolchi tikkin noun ɣ {{SITENAME}} llan ɣdo $2 (zr $1 iɣ trit ztsnt uggar).
+'copyrightwarning' => "ikhssak atst izd kolchi tikkin noun ɣ {{SITENAME}} llan ɣdo $2 (zr $1 iɣ trit ztsnt uggar).
 iɣ ortrit ayg ɣayli torit ḥor artisbadal wnna ka-iran, attid ortgt ɣid.<br />
 ikhssak ola kiyi ador tnqilt ɣtamani yadni.
-<strong>ador tgat ɣid ɣayli origan ḥor iɣzark orilli lidn nbab-ns!</strong>',
+'''ador tgat ɣid ɣayli origan ḥor iɣzark orilli lidn nbab-ns!'''",
 
 # Search results
 'powersearch' => 'amsigl itqdmn',
diff --git a/languages/messages/MessagesSi.php b/languages/messages/MessagesSi.php
index 48cd22b8..14a39c11 100644
--- a/languages/messages/MessagesSi.php
+++ b/languages/messages/MessagesSi.php
@@ -6,92 +6,124 @@
  *
  * @author Asiri wiki
  * @author Chandana
+ * @author Meno25
  * @author නන්දිමිතුරු
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'ම�ධ්�යය',
-	NS_SPECIAL        => 'වි�ේෂ',
-	NS_TALK           => 'ස�කච්ඡ�ව',
-	NS_USER           => 'පරි�ීලක',
-	NS_USER_TALK      => 'පරි�ීලක_ස�කච්ඡ�ව',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_ස�කච්ඡ�ව',
-	NS_IMAGE          => 'රූපය',
-	NS_IMAGE_TALK     => 'රූපය_ස�කච්ඡ�ව',
-	NS_MEDIAWIKI      => 'විකිම�ධ්�ය',
-	NS_MEDIAWIKI_TALK => 'විකිම�ධ්�ය_ස�කච්ඡ�ව',
-	NS_TEMPLATE       => 'ස�කිල්ල',
-	NS_TEMPLATE_TALK  => 'ස�කිල_ස�කච්ඡ�ව',
-	NS_HELP           => 'උදවු',
-	NS_HELP_TALK      => 'උදව_ස�කච්ඡ�ව',
-	NS_CATEGORY       => 'ප්�රවර්ගය',
-	NS_CATEGORY_TALK  => 'ප්�රවර්ග_ස�කච්ඡ�ව',
+	NS_MEDIA            => 'ම�ධ්�යය',
+	NS_SPECIAL          => 'වි�ේෂ',
+	NS_TALK             => 'ස�කච්ඡ�ව',
+	NS_USER             => 'පරි�ීලක',
+	NS_USER_TALK        => 'පරි�ීලක_ස�කච්ඡ�ව',
+	NS_PROJECT_TALK     => '$1_ස�කච්ඡ�ව',
+	NS_FILE             => 'ගොනුව',
+	NS_FILE_TALK        => 'ගොනුව_ස�කච්ඡ�ව',
+	NS_MEDIAWIKI        => 'ම�ධ්�යවිකි',
+	NS_MEDIAWIKI_TALK   => 'ම�ධ්�යවිකි_ස�කච්ඡ�ව',
+	NS_TEMPLATE         => 'ස�කිල්ල',
+	NS_TEMPLATE_TALK    => 'ස�කිලි_ස�කච්ඡ�ව',
+	NS_HELP             => 'උදවු',
+	NS_HELP_TALK        => 'උදවු_ස�කච්ඡ�ව',
+	NS_CATEGORY         => 'ප්�රවර්ගය',
+	NS_CATEGORY_TALK    => 'ප්�රවර්ග_ස�කච්ඡ�ව',
+);
+
+$namespaceAliases = array(
+	'රූපය' => NS_FILE,
+	'රූපය_ස�කච්ඡ�ව' => NS_FILE_TALK,
+	'විකිම�ධ්�ය' => NS_MEDIAWIKI,
+	'විකිම�ධ්�ය_ස�කච්ඡ�ව' => NS_MEDIAWIKI_TALK,
+	'උදව_ස�කච්ඡ�ව' => NS_HELP_TALK,
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'ආපසු_හරව�_යවනව�' ),
-	'BrokenRedirects'           => array( 'ව�රදුනු_යොමුකිරිමක්' ),
-	'Userlogin'                 => array( 'ඇතුලුවිම' ),
-	'Userlogout'                => array( 'ඉවත්විම' ),
-	'CreateAccount'             => array( 'ස�ම�ජිකත්වය_ල�බිමට' ),
-	'Preferences'               => array( 'මන�පය' ),
-	'Watchlist'                 => array( 'මුරකරනව�' ),
-	'Recentchanges'             => array( 'නව_වෙනස්විමි' ),
-	'Upload'                    => array( 'ගොනුවක්_ඇතූලත්_කිරිම' ),
-	'Imagelist'                 => array( 'පින්තූර_ල�යිස්තුව' ),
-	'Newimages'                 => array( 'අලුත්_පින්තූර' ),
-	'Listusers'                 => array( 'ස�ම�ජික_ල�යිස්තුව' ),
-	'Statistics'                => array( 'සංඛ්�ය�_ලේඛනය' ),
-	'Randompage'                => array( 'අහඹු_ලෙස', 'අහඹු_පිටුව' ),
-	'Lonelypages'               => array( 'හුදකල�_පිටුව' ),
-	'Uncategorizedpages'        => array( 'වර්ගනොකල_පිටුව' ),
-	'Uncategorizedcategories'   => array( 'වර්ගනොකල_කොටස්' ),
-	'Uncategorizedimages'       => array( 'වර්ගනොකල_පින්තූර' ),
-	'Uncategorizedtemplates'    => array( 'වර්ගනොකල_අචිචු' ),
-	'Unusedcategories'          => array( 'හ�විත�_නොවන_කොටස්' ),
-	'Unusedimages'              => array( 'හ�විත�_නොවන_පින්තූර' ),
-	'Wantedpages'               => array( 'අව�ය_පිටු' ),
-	'Wantedcategories'          => array( 'අව�ය_කොටස' ),
-	'Mostlinked'                => array( 'ජනපිය_සම්බන්ධකය' ),
-	'Mostlinkedcategories'      => array( 'ව�ඬ්පුර_භව්ත�වු_කොටස' ),
-	'Mostlinkedtemplates'       => array( 'ව�ඬ්පුර_භව්ත�වු_අච්චු' ),
-	'Mostcategories'            => array( 'ජනපිය_කොටස' ),
-	'Mostimages'                => array( 'අති�ය_පින්තූර' ),
-	'Mostrevisions'             => array( 'අති�ය_පරි��ධනය' ),
-	'Shortpages'                => array( 'කෙට_පිටුව' ),
-	'Longpages'                 => array( 'දිග_පිටුව' ),
-	'Newpages'                  => array( 'නව_පිටුව' ),
-	'Ancientpages'              => array( 'අතීත_පිටුව' ),
-	'Deadendpages'              => array( 'අඩු_කරන_පිටුව' ),
-	'Protectedpages'            => array( 'ආරක්ෂිත_පිටුව' ),
-	'Protectedtitles'           => array( 'ආරක්ෂිත__හිමිකම' ),
-	'Allpages'                  => array( 'සියල_පිටුව' ),
-	'Prefixindex'               => array( 'උපසර්ගය' ),
-	'Specialpages'              => array( 'වි��ෂ_පිටුව' ),
-	'Contributions'             => array( 'ද�යකත්වය' ),
-	'Emailuser'                 => array( 'පරි�ීලකට_ඉ-ලිපිය_ය�විම' ),
-	'Confirmemail'              => array( 'ඉ-ලිපිය_තහවුරු_කරනව�' ),
-	'Recentchangeslinked'       => array( 'නුතන_වෙනස්_වීම' ),
-	'Movepage'                  => array( 'පිටුව_ගෙන_යනව�' ),
-	'Blockme'                   => array( 'මමම_අවහිර_කරනව�' ),
-	'Booksources'               => array( 'පුස්තක' ),
-	'Categories'                => array( 'වර්ගකරිම' ),
-	'Export'                    => array( 'අපනයනය' ),
+	'DoubleRedirects'           => array( 'ද්විත්ව යළි-යොමුකිරීම්' ),
+	'BrokenRedirects'           => array( 'භින්න යළි-යොමුකිරීම්' ),
+	'Disambiguations'           => array( 'වක්�ර�ත්තිහරණයන්' ),
+	'Userlogin'                 => array( 'පරි�ීලක ප්�රවිෂ්ටය' ),
+	'Userlogout'                => array( 'පරි�ීලක නිෂ්ක්�රමණය' ),
+	'CreateAccount'             => array( 'ගිණුම ත�නීමට' ),
+	'Preferences'               => array( 'අභිරුචියන්' ),
+	'Watchlist'                 => array( 'මුරල�යිස්තුව' ),
+	'Recentchanges'             => array( 'මෑත වෙනස්වීම්' ),
+	'Upload'                    => array( 'උඩුගත කිරීම' ),
+	'Listfiles'                 => array( 'රූප ල�යිස්තුව' ),
+	'Newimages'                 => array( 'අලුත් රූප' ),
+	'Listusers'                 => array( 'පරි�ීලකයන් ල�යිස්තු ගත කරන්න', 'පරි�ීලක ල�යිස්තුව' ),
+	'Listgrouprights'           => array( 'කණ්ඩ�යම් හිමිකම් ල�යිස්තුගතකරන්න' ),
+	'Statistics'                => array( 'සංඛ්�ය�න දත්ත' ),
+	'Randompage'                => array( 'අහඹු ලෙස', 'අහඹු පිටුව' ),
+	'Lonelypages'               => array( 'හුදකල� පිටුව' ),
+	'Uncategorizedpages'        => array( 'ප්�රවර්ගීකරනය නොකල පිටු' ),
+	'Uncategorizedcategories'   => array( 'ප්�රවර්ගීකරනය නොකල ප්�රවර්ග' ),
+	'Uncategorizedimages'       => array( 'ප්�රවර්ගීකරනය නොකල රූප' ),
+	'Uncategorizedtemplates'    => array( 'ප්�රවර්ගීකරනය නොකල ස�කිලි' ),
+	'Unusedcategories'          => array( 'හ�විත� නොවන ප්�රවර්ග' ),
+	'Unusedimages'              => array( 'හ�විත� නොවන රූප' ),
+	'Wantedpages'               => array( 'අව�්�ය පිටු' ),
+	'Wantedcategories'          => array( 'අව�්�ය ප්�රවර්ග' ),
+	'Wantedfiles'               => array( 'අව�්�ය ගොනු' ),
+	'Wantedtemplates'           => array( 'අව�්�ය ස�කිලි' ),
+	'Mostlinked'                => array( 'බොහ� ලෙසින් සබ�ඳි' ),
+	'Mostlinkedcategories'      => array( 'බොහ� ලෙසින් සබ�ඳි ප්�රවර්ග', 'බෙහෙවින් භ�විතවූ ප්�රවර්ග' ),
+	'Mostlinkedtemplates'       => array( 'බොහ� ලෙසින් සබ�ඳි ස�කිලි', 'බෙහෙවින් භ�විතවූ ස�කිලි' ),
+	'Mostcategories'            => array( 'බොහ� ප්�රවර්ග' ),
+	'Mostimages'                => array( 'බොහ� රූප' ),
+	'Mostrevisions'             => array( 'බොහ� සං��ධන' ),
+	'Fewestrevisions'           => array( 'අතිස්වල්ප සං��ධන' ),
+	'Shortpages'                => array( 'කොට පිටුව' ),
+	'Longpages'                 => array( 'දිගු පිටුව' ),
+	'Newpages'                  => array( 'නව පිටුව' ),
+	'Ancientpages'              => array( 'පුර�තන පිටුව' ),
+	'Deadendpages'              => array( 'අග ඇවුරුණු පිටුව' ),
+	'Protectedpages'            => array( 'ආරක්ෂිත පිටුව' ),
+	'Protectedtitles'           => array( 'ආරක්ෂිත �ීර්ෂයන්' ),
+	'Allpages'                  => array( 'සියළු පිටු' ),
+	'Prefixindex'               => array( 'උපසර්ග සූචිය' ),
+	'Ipblocklist'               => array( 'අන්තර්ජ�ල ලිපින ව�රණ ල�යිස්තුව' ),
+	'Specialpages'              => array( 'වි�ේෂ පිටු' ),
+	'Contributions'             => array( 'ද�යකත්ව' ),
+	'Emailuser'                 => array( 'පරි�ීලකට විද්�යුත්-ත�ප�ලක් ය�විම' ),
+	'Confirmemail'              => array( 'විද්�යුත්-ත�පෑල තහවුරු කරන්න' ),
+	'Whatlinkshere'             => array( 'මෙහි කුමක් සබ�ඳී ඇතිද' ),
+	'Recentchangeslinked'       => array( 'සබ�ඳුනු මෑත වෙනස්වීම්', 'මෑතවෙනස් වීම්' ),
+	'Movepage'                  => array( 'පිටුව ගෙන යනව�' ),
+	'Blockme'                   => array( 'ම� ව�රණය කරන්න' ),
+	'Booksources'               => array( 'ග්�රන්ථ මූල��්�ර' ),
+	'Categories'                => array( 'ප්�රවර්ගයන්' ),
+	'Export'                    => array( 'නිර්ය�තකරන්න' ),
 	'Version'                   => array( 'අනුව�දය' ),
-	'Allmessages'               => array( 'සියලු_පණිිවිඩ' ),
-	'Log'                       => array( 'කඳ' ),
-	'Import'                    => array( 'ආය�ත' ),
-	'Randomredirect'            => array( 'අහඹු_ලෙස_යොමුකිරිම' ),
-	'Mypage'                    => array( 'මගේ__පිටුව' ),
-	'Mytalk'                    => array( 'මගේ__කත�බහ' ),
-	'Mycontributions'           => array( 'මගේ_ද�යකත්වය' ),
-	'Popularpages'              => array( 'ජනප්�රිය_පිටුව' ),
-	'Search'                    => array( 'සෙවුම' ),
-	'Resetpass'                 => array( 'මුර_පදය_යළි_පිහිටුවනව�' ),
-	'Withoutinterwiki'          => array( 'පටන_අන්තර්_විකි' ),
-	'MergeHistory'              => array( 'ඉතිහ�සය_සංයුක්ත_කිරිම' ),
-	'Filepath'                  => array( 'ගොනු_පථය' ),
+	'Allmessages'               => array( 'සියළු පණිවුඩ' ),
+	'Log'                       => array( 'ල�ු සටහන', 'ල�ු සටහන්' ),
+	'Blockip'                   => array( 'අන්තර්ජ�ල ලිපිනය ව�රණය කරන්න' ),
+	'Undelete'                  => array( 'මක�ද�මීම අවලංගු කරන්න' ),
+	'Import'                    => array( 'ආය�ත කරන්න' ),
+	'Lockdb'                    => array( 'දත්ත ගබඩ�ව අවුරන්න' ),
+	'Unlockdb'                  => array( 'දත්ත ගබඩ�ව ඇවුරුම අවලංගු කරන්න' ),
+	'Userrights'                => array( 'පරි�ීලක හිමිකම්' ),
+	'MIMEsearch'                => array( 'MIME ගවේෂණය' ),
+	'FileDuplicateSearch'       => array( 'ගොනු අනුපිටපත් ගවේෂණය' ),
+	'Unwatchedpages'            => array( 'මුර නොකල පිටු' ),
+	'Listredirects'             => array( 'යළි-යොමුකිරීම් ල�යිස්තුගතකරන්න' ),
+	'Revisiondelete'            => array( 'සං��ධන මක�දමන්න' ),
+	'Unusedtemplates'           => array( 'භ�විත නොකල ස�කිලි' ),
+	'Randomredirect'            => array( 'අහඹු යළි-යොමුකිරිම' ),
+	'Mypage'                    => array( 'මගේ  පිටුව' ),
+	'Mytalk'                    => array( 'මගේ  ස�කච්ඡ�ව' ),
+	'Mycontributions'           => array( 'මගේ ද�යකත්වය' ),
+	'Listadmins'                => array( 'පරිප�ලකයන් ල�යිස්තුගත කරන්න' ),
+	'Listbots'                  => array( 'රොබ�වරුන් ල�යිස්තුගතකරන්න' ),
+	'Popularpages'              => array( 'ජනප්�රිය පිටු' ),
+	'Search'                    => array( 'ගවේෂණය' ),
+	'Resetpass'                 => array( 'මුර පදය ප්�රතිෂ්ඨ�පනය කරන්න' ),
+	'Withoutinterwiki'          => array( 'අන්තර් විකි නොම�තිව' ),
+	'MergeHistory'              => array( 'ඒක�බද්ධ ඉතිහ�සය' ),
+	'Filepath'                  => array( 'ගොනු පෙත' ),
+	'Invalidateemail'           => array( 'විද්්�යුත් ත�පෑල අනීතික කරන්න' ),
+	'Blankpage'                 => array( 'හිස් පිටුව' ),
+	'LinkSearch'                => array( 'සබ�ඳි ගවේෂණය' ),
+	'DeletedContributions'      => array( 'මක�ද�මුණු ද�යකත්වයන්' ),
 );
 
 $messages = array(
@@ -132,17 +164,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'මුර-ල�යිස්තුවෙන් ම�ගේ සංස්කරණ සඟවන්න',
 'tog-watchlisthidebots'       => 'මුර-ල�යිස්තුවෙන් රොබ� සංස්කරණ සඟවන්න',
 'tog-watchlisthideminor'      => 'මුර-ල�යිස්තුවෙන් සුළු සංස්කරණ සඟවන්න',
+'tog-watchlisthideliu'        => 'ප්�රවිෂ්ට වී ඇති පරි�ීලකයන් විසින් සිදුකර ඇති සංස්කරණ මුර-ල�යිස්තුවෙන් සඟවන්න',
+'tog-watchlisthideanons'      => 'නිර්න�මික පරි�ීලකයන් විසින් සිදුකොට ඇති සංස්කරණ මුර-ල�යිස්තුවෙන් සඟවන්න',
 'tog-nolangconversion'        => 'විචල්�යයන් පෙර�ළීම අක්�රීය කරන්න',
 'tog-ccmeonemails'            => 'ම� විසින් අනෙකුත් පරි�ීලකයන් හට යවන විද්�යුත්-ත�පෑලයන්හි පිටපත් ම�හට එවන්න',
 'tog-diffonly'                => '“වෙනස් �පදයන්ට පහළින්, පිටුවල අන්තර්ගතය   නොපෙන්වන්න',
 'tog-showhiddencats'          => 'ස�ඟවුනු ප්�රවර්ග පෙන්වන්න',
+'tog-noconvertlink'           => 'සබ�ඳියන්ගේ �ීර්ෂ පෙර�ළීම අක්�රීය කරන්න',
+'tog-norollbackdiff'          => 'පුනර�වර්තනයක් කිරීමෙන් පසු වෙනස්වීම් අත්හරින්න',
 
 'underline-always'  => 'ස�මවිටම කරන්න',
 'underline-never'   => 'කිසිවිටෙක නොකරන්න',
 'underline-default' => 'බ්�රවුසරයෙහි පෙරනිමිය අනුවය',
 
-'skinpreview' => '(පෙරදසුන)',
-
 # Dates
 'sunday'        => 'ඉරිද�',
 'monday'        => 'සඳුද�',
@@ -236,7 +270,7 @@ $messages = array(
 'mytalk'         => 'මගේ ස�කච්ඡ�',
 'anontalk'       => 'මෙම අන්තර්ජ�ල ලිපිනය සඳහ� ස�කච්ඡ�ව',
 'navigation'     => 'සංචලනය',
-'and'            => 'සහ',
+'and'            => '&#32;සහ',
 
 # Metadata in edit box
 'metadata_help' => 'ප�රදත්ත:',
@@ -273,14 +307,14 @@ $messages = array(
 'talkpagelinktext'  => 'ස�කච්ඡ�ව',
 'specialpage'       => 'වි�ේෂ පිටුව',
 'personaltools'     => 'පුද්ගලික මෙවලම්',
-'postcomment'       => 'පරිකථනයක් ස්ථ�පනය කරන්න',
+'postcomment'       => 'නව ඡේදයක්',
 'articlepage'       => 'අන්තර්ගත පිටුව නරඹන්න',
 'talk'              => 'සංව�දය',
 'views'             => 'න�රඹුම්',
 'toolbox'           => 'මෙවලම් ගොන්න',
 'userpage'          => 'පරි�ීලක පිටුව නරඹන්න',
 'projectpage'       => 'ව්�ය�පෘති පිටුව නරඹන්න',
-'imagepage'         => 'ම�ධ්�ය පිටුව නරඹන්න',
+'imagepage'         => 'ගොනු පිටුව නරඹන්න',
 'mediawikipage'     => 'පණිවුඩ පිටුව නරඹන්න',
 'templatepage'      => 'ස�කිලි පිටුව නරඹන්න',
 'viewhelppage'      => 'උදවු පිටුව නරඹන්න',
@@ -300,8 +334,6 @@ $messages = array(
 'aboutsite'            => '{{SITENAME}} පිළිබඳ
 <!--{{SITENAME}}About-->',
 'aboutpage'            => 'Project:පිළිබඳ',
-'bugreports'           => 'ද�ෂ ව�ර්ත�',
-'bugreportspage'       => 'Project:ද�ෂ ව�ර්ත�',
 'copyright'            => ' $1 යටතේ අන්තර්ගතය ද�ක ගත හ�ක.',
 'copyrightpagename'    => '{{SITENAME}} කර්තෘ-හිමිකම්',
 'copyrightpage'        => '{{ns:project}}:කර්තෘ-හිමිකම්',
@@ -324,9 +356,7 @@ $messages = array(
 
 'badaccess'        => 'අවසර ද�ෂය',
 'badaccess-group0' => 'ඔබ විසින් අය�දුම් කර සිටි ක�ර්යය ක්�රිය�ත්මක කිරීමට ඔබ හට ඉඩ ලබ� දෙනු නොල�බේ.',
-'badaccess-group1' => 'ඔබ අය�දුම් කර ඇති ක්�රිය�ව $1 කණ්ඩ�යමෙහි පරි�ීලකයන්ට පමණක් සීම�කොට ඇත.',
-'badaccess-group2' => 'ඔබ අය�දුම් කර ඇති ක්�රිය�ව $1 කණ්ඩ�යම් වලින් එකක පරි�ීලකයන් වෙනුවෙන් සීම� කොට ඇත.',
-'badaccess-groups' => 'ඔබ අය�දුම් කර ඇති ක්�රිය�ව $1 කණ්ඩ�යම් වලින් එකක පරි�ීලකයන් වෙනුවෙන් සීම� කොට ඇත.',
+'badaccess-groups' => 'ඔබ අය�දුම් කර සිටි ක�ර්යය, ඉදිරි {{PLURAL:$2| ක�ණ්ඩයට| ක�ණ්ඩ සමූහය අතුරින් එකකට}} අයත් පරි�ීලකයන්ගේ පරිහරණයට සීම� කර ඇත: $1.',
 
 'versionrequired'     => 'ම�ධ්�යවිකි $1 අනුව�දය අව�්�ය වේ',
 'versionrequiredtext' => 'මෙම පිටුව භ�විත� කිරීමට, ම�ධ්�යවිකි හි $1 අනුව�දය අව�්�ය වේ.
@@ -343,6 +373,8 @@ $messages = array(
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'සංස්කරණය',
 'viewsourceold'           => 'මූල��්�රය නරඹන්න',
+'editlink'                => 'සංස්කරණය',
+'viewsourcelink'          => 'මූල��්�රය නරඹන්න',
 'editsectionhint'         => 'ඡේද සංස්කරණය: $1',
 'toc'                     => 'පටුන',
 'showtoc'                 => 'පෙන්වන්න',
@@ -359,13 +391,13 @@ $messages = array(
 'page-atom-feed'          => '"$1" Atom ප�ෂකය',
 'feed-atom'               => 'Atom',
 'feed-rss'                => 'RSS',
-'red-link-title'          => '$1 (තවමත් ලිය� නොම�ත)',
+'red-link-title'          => '$1 (පිටුව නොපවතියි)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'පිටුව',
 'nstab-user'      => 'පරි�ීලක පිටුව',
 'nstab-media'     => 'ම�ධ්�ය පිටුව',
-'nstab-special'   => 'වි�ේෂ',
+'nstab-special'   => 'වි�ේෂ පිටුව',
 'nstab-project'   => 'ව්�ය�පෘති පිටුව',
 'nstab-image'     => 'ගොනුව',
 'nstab-mediawiki' => 'පණිවුඩය',
@@ -375,7 +407,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'මෙම නම�ති ක�ර්යයක් නොම�ත',
-'nosuchactiontext'  => 'URL (කල�ප ලිපිනය) විසින් හුව� දක්ව� ඇති කෘත්�යය විකිය විසින් හඳුන�ගෙන නොම�ත',
+'nosuchactiontext'  => 'URL (කල�ප ලිපිනය) විසින් හුව� දක්ව� ඇති කෘත්�යය අනීතිකයි.
+ඔබ සමහරවිට URL (කල�ප ලිපිනය) අකුරු වරදව� සටහන් කර ඇත, න�තහොත් ස�වද්�යය සබ�ඳුම ඔස්සේ ප�මිණ ඇත. 
+මෙය සමහරවිට {{SITENAME}} විසින් භ�විත� කරන මෘදුක�ංගයන්හි ද�ෂයක් පිළිඹිබු කරන්නක්ද විය හ�ක.',
 'nosuchspecialpage' => 'මෙම නම�ති වි�ේෂ පිටුවක් නොම�ත',
 'nospecialpagetext' => "<big>'''ඔබ අය�ද ඇත්තේ අනීතික වි�ේෂ පිටුවකි.'''</big>
 
@@ -458,16 +492,16 @@ $2',
 මේ සඳහ�  ''$2''  හේතුව දක්ව� ඇත.",
 
 # Virus scanner
-'virus-badscanner'     => 'අය�ග්�ය වික්�ය�සයකි: අඥ�ත වයිරස සුපිරික්සකයකි: <i>$1</i>',
+'virus-badscanner'     => "අය�ග්�ය වික්�ය�සයකි: අඥ�ත වයිරස සුපිරික්සකයකි: ''$1''",
 'virus-scanfailed'     => 'පරිල�කනය අස�ර්ථක විය (කේතය $1)',
 'virus-unknownscanner' => 'අඥ�ත ප්�රතිවයිරසයක්:',
 
 # Login and logout pages
 'logouttitle'                => 'පරි�ීලක නිෂ්ක්�රමණය',
-'logouttext'                 => '<strong>ඔබ ද�න් නිෂ්ක්�රමණය වී ඇත.</strong>
+'logouttext'                 => "'''ඔබ ද�න් නිෂ්ක්�රමණය වී ඇත.'''
 
 ඔබ හට එක්ක� නිර්න�මික ලෙස  {{SITENAME}} භ�විත කරගෙන ය� හ�ක, න�තිනම්, පෙර පරි�ීලක ලෙස හ� වෙනත් පරි�ීලකයෙකු ව�යෙන් හ� [[Special:UserLogin|න�වත ප්�රවිෂ්ට විය හ�ක]].
-ඔබගේ බ්�රවුසරයෙහි පූර්ව�පේක්�ෂී සංචිතය (කෑෂය) නිෂ්ක��නය කරන තෙක්, සමහරක් පිටු විසින් ඔබ තවදුරටත් ප්�රවිෂ්ට වී ඇති බවක් දිගටම පෙන්නුම් කිරීමට ඉඩ ඇති බව කරුණ�වෙන් සලකන්න.',
+ඔබගේ බ්�රවුසරයෙහි පූර්ව�පේක්�ෂී සංචිතය (කෑෂය) නිෂ්ක��නය කරන තෙක්, සමහරක් පිටු විසින් ඔබ තවදුරටත් ප්�රවිෂ්ට වී ඇති බවක් දිගටම පෙන්නුම් කිරීමට ඉඩ ඇති බව කරුණ�වෙන් සලකන්න.",
 'welcomecreation'            => '== ආයුබ�වන්, $1! ==
 
 ඔබ�ගේ ගිණුම ත�නී ඇත.
@@ -479,7 +513,6 @@ $2',
 'remembermypassword'         => 'ම�ගේ ප්�රවිෂ්ටය පිළිබඳ විස්තර මෙම පරිගණක මතකයෙහි රඳව� තබ� ගන්න',
 'yourdomainname'             => 'ඔබගේ වසම:',
 'externaldberror'            => 'එක්ක� සත්�ය�වත් දත්ත-ගබඩ� ද�ෂයක් ප�වතුනි න�තිනම් ඔබගේ බ�හිර ගිණුම ය�වත්ක�ලීන කිරීමට ඔබ හට අවසර දී නොම�ත.',
-'loginproblem'               => '<b>ඔබගේ ප්�රවිෂ්ටය පිළිබඳ ග�ටළුවක් ප�න න�ගී ඇත.</b><br />න�වත උත්ස�හ කරන්න!',
 'login'                      => 'ප්�රවිෂ්ටය',
 'nav-login-createaccount'    => 'ප්�රවිෂ්ට වන්න / ගිණුමක් තනන්න',
 'loginprompt'                => '{{SITENAME}} වෙත ප්�රවිෂ්ට වීම සඳහ� ඔබ විසින් කුකීස් සක්�රීය කොට තිබිය යුතුය.',
@@ -506,7 +539,7 @@ $2',
 'yournick'                   => 'විද්�යුත් අත්සන:',
 'badsig'                     => 'නොනිමි අත්සන අනීතිකයි.
 HTML ට�ගයන් පිරික්සන්න.',
-'badsiglength'               => 'විද්�යුත් අත්සන පමණට වඩ� දිගු ව�ඩිය.
+'badsiglength'               => 'ඔබගේ විද්�යුත් අත්සන පමණට වඩ� දිගු ව�ඩිය.
 එය  {{PLURAL:$1|එක් අක්ෂරයකට|අක්ෂරයන් $1 කට}} වඩ� කෙටි විය යුතුය.',
 'email'                      => 'විද්�යුත් ත�පෑල',
 'prefs-help-realname'        => 'ස�බෑ න�මය හෙළි කිරීම වෛකල්පිකයි.
@@ -526,6 +559,7 @@ HTML ට�ගයන් පිරික්සන්න.',
 'loginsuccesstitle'          => 'ප්�රවිෂ්ට වීම ස�ර්ථකයි',
 'loginsuccess'               => "'''ඔබ ද�න්, \"\$1\" ලෙස, {{SITENAME}} යට ප්�රවිෂ්ට විමට සමත් වී ඇත.'''",
 'nosuchuser'                 => '"$1" යන නම�ති පරි�ීලකයෙකු නොම�ත.
+පරි�ීලක න�මයන්හි මහ�ප්�ර�ණ ආදිය ස�ලකේ.
 ඔබගේ අක්ෂර-වින්�ය�සය පිරික්ස� බ�ලීම හ�, [[Special:UserLogin/signup|නව ගිණුමක් ත�නීම]] හ� සිදුකරන්න.',
 'nosuchusershort'            => '"<nowiki>$1</nowiki>" යන නම�ති පරි�ීලකයෙකු නොම�ත.
 ඔබගේ අක්ෂර-වින්�ය�සය පිරික්ස� බලන්න.',
@@ -555,8 +589,9 @@ HTML ට�ගයන් පිරික්සන්න.',
 'throttled-mailpassword'     => 'අවසන් {{PLURAL:$1| ප�ය|ප�ය $1 }} අතරතුරදී, ද�නටමත් එක් මුර-පද සිහිග�න්වීමක් යව� ඇත .
 අපයෙදුම වළක්වනු වස්, {{PLURAL:$1|එක් ප�යක| ප�ය $1 ක}}ට වරක් එක් මුර-පද සිහිග�න්වීමක් පමණක් යවනු ල�බේ.',
 'mailerror'                  => 'ත�පෑල ය�වීමේදී වූ ද�ෂය: $1',
-'acct_creation_throttle_hit' => 'ඔබ ද�න�ටමත් ගිණුම $1 තන� ඇත.ඔබට තවත් ගිණුම් ත�නිය නොහ�ක.',
-'emailauthenticated'         => 'ඔබගේ විද්�යුත්-ත�ප�ල් ලිපිනය $1 දී සත්�ය�පනය කරන ලදි.',
+'acct_creation_throttle_hit' => 'ඔබගේ අන්තර්ජ�ල ලිපිනය භ�විත� කල මෙම විකියට අමුත්තන් විසින් {{PLURAL:$1|එක් ගිණුමක්|ගිණුම් $1 ක්}} පසුගිය දිනය තුලදී තන� ඇති අතර, එය මෙම ක�ල පරිච්ඡේදය තුලදී ඉඩ දෙනු ලබන උපරිමය වෙයි.
+මේ හේතුවෙන්, මෙම අන්තර්ජ�ල ලිපිනය භ�විත� කරන අමුත්තන් විසින් මෙම අවස්ථ�වෙහිදී තවත් ගිණුම් ත�නීම සිදු කල නොහ�කිව ඇත.',
+'emailauthenticated'         => ' $2 දින $3 වේල�වෙහිදී ඔබගේ විද්�යුත්-ත�ප�ල් ලිපිනය සත්�යවත් කරන ලදි.',
 'emailnotauthenticated'      => 'ඔබගේ විද්�යුත්-ත�ප�ල් ලිපිනය තවමත් සත්�යවත් කර නොම�ත.
 පහත හ�කිය�වන් කිසිවක් ඉටුකරනු වස් විද්�යුත්-ත�පෑල  යවනු නොල�බේ.',
 'noemailprefs'               => 'පහත හ�කිය�වන් ඉටුකිරීමට ඉඩ සලසනු වස් විද්�යුත්-ත�ප�ල් ලිපිනයක් හුව� දක්වන්න.',
@@ -570,20 +605,29 @@ HTML ට�ගයන් පිරික්සන්න.',
 ඔබ ද�න් ප්�රවිෂ්ට වී, ඔබගේ මුර-පදය වෙනස් කල යුතුව ඇත.
 
 මෙම ගිණුම ත�නී ඇත්තේ කිසියම් ප්�රම�ද ද�ෂයකින් නම්, ඔබ විසින් මෙම පණිවුඩය නොසලක� හ�රිය හ�ක.',
+'login-throttled'            => 'ගිණුමෙහි මුර-පදය නිසි ලෙස ඇතුළත් කරනු වස් ඔබ විසින් මෑතදී  පමණට වඩ� ව�ර ගණනක් උත්ස�හ දර� ඇත.
+යළි උත්ස�හ කිරීමට පෙර කරුණ�කර මදක් පොරොත්තු වන්න.',
 'loginlanguagelabel'         => 'භ�ෂ�ව: $1',
 
 # Password reset dialog
-'resetpass'               => 'ගිණුම් මුර-පදය ප්�රත්�ය�රම්භ කරන්න',
-'resetpass_announce'      => 'විද්�යුත්-ත�පෑලෙන් එවනු ල�බූ ත�වක�ලික කේතයක් උපය�ගී කර ගනිමින් ඔබ ප්�රවිෂ්ට වී ඇත.
+'resetpass'                 => 'මුර-පදය වෙනස් කරන්න',
+'resetpass_announce'        => 'විද්�යුත්-ත�පෑලෙන් එවනු ල�බූ ත�වක�ලික කේතයක් උපය�ගී කර ගනිමින් ඔබ ප්�රවිෂ්ට වී ඇත.
 ප්�රවිෂ්ට වීම නිසි ලෙස නිමවනු වස් ඔබ ස�කසූ නව මුර-පදයක් මෙහි බහ�ලිය යුතු වේ:',
-'resetpass_text'          => '<!-- මෙත�නට පෙළ එක් කරන්න -->',
-'resetpass_header'        => 'මුරපදය ප්�රත්�ය�රම්භ කරන්න',
-'resetpass_submit'        => 'මුර-පදය පූරණය කොට ඉන් පසු ප්�රවිෂ්ට වන්න',
-'resetpass_success'       => 'ඔබගේ මුර-පදය ස�ර්ථක ලෙස වෙනස් කරන ලදි! ද�න් ඔබව ප්�රවිෂ්ට කරගනිමින්...',
-'resetpass_bad_temporary' => 'අනීතික ත�වක�ලික මුර-පදයකි.
+'resetpass_text'            => '<!-- මෙත�නට පෙළ එක් කරන්න -->',
+'resetpass_header'          => 'ගිණුම් මුර-පදය වෙනස් කරන්න',
+'oldpassword'               => 'ප�ර�ණි මුර-පදය:',
+'newpassword'               => 'නව මුර-පදය:',
+'retypenew'                 => 'නව මුර-පදය න�වත යතුරු-කරණය කරන්න:',
+'resetpass_submit'          => 'මුර-පදය පූරණය කොට ඉන් පසු ප්�රවිෂ්ට වන්න',
+'resetpass_success'         => 'ඔබගේ මුර-පදය ස�ර්ථක ලෙස වෙනස් කරන ලදි! ද�න් ඔබව ප්�රවිෂ්ට කරගනිමින්...',
+'resetpass_bad_temporary'   => 'අනීතික ත�වක�ලික මුර-පදයකි.
 ඔබ විසින් එක්ක� ඔබගේ මුර-පදය ස�ර්ථක ලෙස වෙනස් කිරීම හ� න�තිනම් නව ත�වක�ලික මුර-පදයක් අය�දීම හ� සිදුකර ඇතිව� විය හ�ක.',
-'resetpass_forbidden'     => 'මුර-පදයන් වෙනස් කිරීම  සිදු කල නොහ�ක',
-'resetpass_missing'       => 'ආකෘති පත්�ර දත්ත කිසිවක් න�ත.',
+'resetpass_forbidden'       => 'මුර-පදයන් වෙනස් කිරීම  සිදු කල නොහ�ක',
+'resetpass-no-info'         => 'මෙම පිටුව සෘජු ලෙස පරි�ීලනය කෙරුමට ඔබ පළමු ප්�රවිෂ්ට විය යුතුය.',
+'resetpass-submit-loggedin' => 'මුර-පදය වෙනස්කරන්න',
+'resetpass-wrong-oldpass'   => 'ත�වක�ලික හ� වත්මන් මුර-පදය අනීතිකයි. 
+ඔබ ද�නටමත් ස�ර්ථක ලෙස ඔබගේ මුර-පදය වෙනස් කොට හ� නව ත�වක�ලික මුර-පදයක් ඉල්ල� සිට හ� ඇතිව� විය හ�ක.',
+'resetpass-temp-password'   => 'ත�වක�ලික මුර-පදය:',
 
 # Edit page toolbar
 'bold_sample'     => 'තදකුරු පෙළ',
@@ -608,8 +652,8 @@ HTML ට�ගයන් පිරික්සන්න.',
 'hr_tip'          => 'තිරස් පේළිය (අවම ව�යෙන් භ�විත� කරන්න)',
 
 # Edit pages
-'summary'                          => 'ස�ර�ං�ය',
-'subject'                          => 'විෂයය/සිරස් තලය',
+'summary'                          => 'ස�ර�ං�ය:',
+'subject'                          => 'විෂයය/සිරස් තලය:',
 'minoredit'                        => 'මෙය සුළු සංස්කරණයකි',
 'watchthis'                        => 'මෙම පිටුව මුර කරන්න',
 'savearticle'                      => 'පිටුව සුරකින්න',
@@ -624,8 +668,8 @@ HTML ට�ගයන් පිරික්සන්න.',
 'missingcommenttext'               => 'කරුණ�කර මෙහි පහත පරිකථනයක් ආද�නය කරන්න.',
 'missingcommentheader'             => "'''සිහිග�න්වීමයි:''' මෙම පරිකථනය සඳහ� ඔබ විසින් විෂයයක්/සිරස්තලයක් සපය� නොම�ත.
 ඔබ න�වතත් සුර�කීම ක්ලික් කලහොත්, ඔබගේ සංස්කරණය එව�න්නක් විරහිතවම සුර�කෙනු ඇත.",
-'summary-preview'                  => 'ස�ර�ං� පෙර-දසුන',
-'subject-preview'                  => 'විෂයය/සිරස්තලය හි පෙර-දසුන',
+'summary-preview'                  => 'ස�ර�ං� පෙර-දසුන:',
+'subject-preview'                  => 'විෂයය/සිරස්තලය හි පෙර-දසුන:',
 'blockedtitle'                     => 'පරි�ීලකය� ව�රණය කර ඇත',
 'blockedtext'                      => "<big>ඔබගේ පරි�ීලක න�මය හ� අන්තර්ජ�ල ලිපිනය හ� ව�රණය කොට ඇත.'''</big>
 
@@ -679,7 +723,10 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 එබ�වින්, ඔහු/ඇය හ�ඳින්වීමට සංඛ්�ය�ත්මක අන්තර්ජ�ල ලිපිනය භ�විත� කිරීමට අප හට සිදුවේ.
 පරි�ීලකයන් කිහිප දෙනෙකු විසින් මෙව�නි අන්තර්ජ�ල ලිපිනයක් හවුලේ පරිහරණය කරනව� විය හ�ක.
 ඔබ නිර්න�මික පරි�ීලකයෙකු නම් හ� ඔබ පිළිබඳ අනනුකූල පරිකථනයන් සිදුවෙන බවක් ඔබට හ��ඟේ නම්, අනෙකුත් නිර්න�මික පරි�ීලකයන් හ� සමග  මෙව�නි සංකූලත� ඇතිවීම වලක්වනු වස්,  කරුණ�කර  [[Special:UserLogin/signup|ගිණුමක් ත�නීමට]] හ� [[Special:UserLogin|ප්�රවිෂ්ට වීමට]]  ක�රුණික වන්න.''",
-'noarticletext'                    => 'ද�නට මෙම පිටුවෙහි කිසිදු පෙළක් නොම�ත, අනෙකුත් පිටුවල  [[Special:Search/{{PAGENAME}}|මෙම පිටු �ීර්ෂය සඳහ� ගවේ�නය කිරීම]] හ�  [{{fullurl:{{FULLPAGENAME}}|action=edit}} මෙම පිටුව සංස්කරණය කිරීම] හ� ඔබ විසින් සිදු කල හ�ක.',
+'noarticletext'                    => 'ද�නට මෙම පිටුවෙහි කිසිදු පෙළක් නොම�ත.
+අනෙකුත් පිටුවල  [[Special:Search/{{PAGENAME}}|මෙම පිටු �ීර්ෂය සඳහ� ගවේ�නය කිරීම]] හ�,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} අද�ළ ල�ු-සටහන් සඳහ� ගවේෂණය කිරීම],
+හ� [{{fullurl:{{FULLPAGENAME}}|action=edit}} මෙම පිටුව සංස්කරණය කිරීම] හ� ඔබ විසින් සිදු කල හ�ක</span>.',
 'userpage-userdoesnotexist'        => '"$1" යන පරි�ීලක ගිණුම ලේඛනගත කොට නොම�ත.
 ඔබ හට මෙම පිටුව ත�නීමට/සංස්කරණය කිරීමට ඇව�සිද යන බව විමස� බලන්න.',
 'clearyourcache'                   => "'''සටහන - සුර�කීමෙන් පසුව, වෙනස්වීම් ද�කීම සඳහ�, බ්�රවුසරයෙහි පූර්ව�ක්ෂේපිත සංචිතය (කෑෂය)  මගහ�රීමට ඔබ හට සිදුවනව� ඇත.'''
@@ -687,7 +734,7 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 '''Konqueror: ''' ''යළිපූරණය'' ක්ලික් කරන්න න�තහොත් ''F5'' ඔබන්න;
 '''Opera:''' ''Tools → Preferences'' හි ක�ෂය නිෂ්ක��නය කරන්න;
 '''Internet Explorer:''' ''Refresh,'' ක්ලික් කරමින් ''Ctrl'' ඔබන්න න�තහොත් ‘‘Ctrl-F5'' ඔබන්න.",
-'usercssjsyoucanpreview'           => "<strong>හ�ඩුව�ව:</strong>සුර�කුමට පෙර, ඔබගේ නව  CSS/JS පරික්ෂ� කරනු වස්, 'පෙර-දසුන පෙන්වන්න' බොත්තම භ�විත� කරන්න.",
+'usercssjsyoucanpreview'           => "'''හ�ඩුව�ව:'''සුර�කුමට පෙර, ඔබගේ නව  CSS/JS පරික්ෂ� කරනු වස්, 'පෙර-දසුන පෙන්වන්න' බොත්තම භ�විත� කරන්න.",
 'usercsspreview'                   => "'''ඔබගේ පරි�ීලක CSS මත පෙර-දසුනක් පමණක් ඔබ විසින් සිදුකෙරෙන බව ධ�රණය කරන්න.'''
 '''එය තවමත් සුර�කීමට ලක් කොට නොම�ත!'''",
 'userjspreview'                    => "'''ඔබ සිදුකරන්නේ ඔබගේ පරි�ීලක ජ�ව�ස්ක්�රිප්ට් පරික්ෂ� කිරීම/පෙර-දසුන පමණක් බව ධ�රණය කරන්න.'''
@@ -695,25 +742,25 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 'userinvalidcssjstitle'            => "'''අවව�දයයි:''' ඡවියක් නොම�ත \"\$1\".
 රීති ප්�රක�රව .css හ� .js පිටු විසින් ඉංග්�රීසි කුඩ�-අකුරු �ීර්ෂ භ�විත� කෙරෙන බව සිහි තබ� ගන්න, නිදසුන. {{ns:user}}:Foo/monobook.css මිස {{ns:user}}:Foo/Monobook.css නොවන බව.",
 'updated'                          => '(ය�වත්ක�ලීන කරන ලදි)',
-'note'                             => '<strong>සටහන:</strong>',
-'previewnote'                      => '<strong>මෙය පෙරදසුනක් පමණකි;
-වෙනස්වීම් සුර�කීම තවමත් සිදුකොට නොම�ත!</strong>',
+'note'                             => "'''සටහන:'''",
+'previewnote'                      => "'''මෙය පෙරදසුනක් පමණකි;
+වෙනස්වීම් සුර�කීම තවමත් සිදුකොට නොම�ත!'''",
 'previewconflict'                  => 'ඔබ විසින් සුර�කීම ත�ර�ගත්තොත්,  ඉහළ පෙළ සංස්කරණ සරියෙහි,  පෙළ දර්�නය විය හ�කි අයුර මෙම පෙර-දසුනෙන් ආවර්ජනය වේ.',
-'session_fail_preview'             => '<strong>කණග�ටුයි! ස�සි දත්ත හ�නියක් හේතුවෙන් අප විසින් ඔබගේ  සංස්කරණය ක්�රිය�යයනය කිරීමට නොහ�කි වී ඇත.
+'session_fail_preview'             => "'''කණග�ටුයි! ස�සි දත්ත හ�නියක් හේතුවෙන් අප විසින් ඔබගේ  සංස්කරණය ක්�රිය�යයනය කිරීමට නොහ�කි වී ඇත.
 කරුණ�කර න�වත උත්ස�හ කරන්න.
-එයද ප්�රතිඵල විරහිත නම්, [[Special:UserLogout|නිෂ්ක්�රමණය වීම]] හ� න�වත ප්�රවිෂ්ට වීම අත්හද� බලන්න.</strong>',
-'session_fail_preview_html'        => "<strong>කණග�ටුයි! ස�සි දත්ත හ�නියක් හේතුවෙන්, අප විසින් ඔබගේ සංස්කරණය ක්�රිය�යනය කිරීම සිදු කල නොහ�කි විය.</strong>
+එයද ප්�රතිඵල විරහිත නම්, [[Special:UserLogout|නිෂ්ක්�රමණය වීම]] හ� න�වත ප්�රවිෂ්ට වීම අත්හද� බලන්න.'''",
+'session_fail_preview_html'        => "'''කණග�ටුයි! ස�සි දත්ත හ�නියක් හේතුවෙන්, අප විසින් ඔබගේ සංස්කරණය ක්�රිය�යනය කිරීම සිදු කල නොහ�කි විය.'''
 
 ''{{SITENAME}} විසින් නොනිමි HTML සක්�රීය කොට ඇති බ�වින්, ජ�ව�ස්ක්�රිප්ට් ප්�රහ�රයන්ගෙන් ව�ලකීමේ පූර්වොප�යයක් ලෙස, පෙර-දසුන සඟව� ඇත.''
 
-<strong>මෙය නීත්�ය�නුකූල සංස්කරණ උත්ස�හයයක් නම්,  න�වත උත්ස�හ කරන්න.
-එසේ කල තන්හීද අස�ර්ථක නම්, [[Special:UserLogout|නිෂ්ක්�රමණය වී]] න�වත ප්�රවිෂ්ට වීම අත්හද� බලන්න.</strong>",
-'token_suffix_mismatch'            => '<strong> ඔබගේ සේව�ල�භිය� විසින් සංස්කරණ ට�කනයෙහි විර�ම අක්ෂර  කලවම් කිරීම නිස� ඔබගේ සංස්කරණය නිෂ්ප්�රභ� කර ඇත.
+'''මෙය නීත්�ය�නුකූල සංස්කරණ උත්ස�හයයක් නම්,  න�වත උත්ස�හ කරන්න.
+එසේ කල තන්හීද අස�ර්ථක නම්, [[Special:UserLogout|නිෂ්ක්�රමණය වී]] න�වත ප්�රවිෂ්ට වීම අත්හද� බලන්න.'''",
+'token_suffix_mismatch'            => "''' ඔබගේ සේව�ල�භිය� විසින් සංස්කරණ ට�කනයෙහි විර�ම අක්ෂර  කලවම් කිරීම නිස� ඔබගේ සංස්කරණය නිෂ්ප්�රභ� කර ඇත.
 සංස්කරණය නිෂ්ප්�රභ� කරන ලද්දේ පිටු පෙළ දූෂණය වීම ව�ල�ක්වීමටය.
-ද�ෂ-සපිරි වෙබ්-ප�දක නිර්න�මික නියුතු සේව�වක් ඔබ විසින් භ�විත කිරීම නිස� මෙය සමහරවිට සිදුවිය හ�ක.</strong>',
+ද�ෂ-සපිරි වෙබ්-ප�දක නිර්න�මික නියුතු සේව�වක් ඔබ විසින් භ�විත කිරීම නිස� මෙය සමහරවිට සිදුවිය හ�ක.'''",
 'editing'                          => '$1 සංස්කරණය කරමින් පවතියි',
 'editingsection'                   => '$1 (ඡේදය) සංස්කරණය කරමින් පවතියි',
-'editingcomment'                   => '$1 (පරිකථනය) සංස්කරණය කරමින් පවතියි',
+'editingcomment'                   => '$1 සංස්කරණය කරමින් පවතියි (නව ඡේදයක්)',
 'editconflict'                     => 'සංස්කරණ ග�ටුම: $1',
 'explainconflict'                  => "ඔබ මෙම පිටුව සංස්කරණය කිරීමට ඇරඹි පසුව යම් අයෙකු එය වෙනස් කොට ඇත.
 ඉහළ පෙළ සරියෙහි අඩංගු වනුයේ පිටු පෙළ වත්මන පවතින අයුරිනි.
@@ -722,26 +769,30 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 ඔබ විසින්  \"පිටුව සුරකින්න\" යන්න එබූ විට සුර�කෙන්නේ ඉහළ පෙළ සරියෙහි පෙළ '''පමණි'''.",
 'yourtext'                         => 'ඔබගේ පෙළ',
 'storedversion'                    => 'ගබඩ�ගතකල අනුව�දය',
-'nonunicodebrowser'                => '<strong>අවව�දයයි: ඔබගේ බ්�රවුසරය යුනිකේත  අනුකූල නොවේ.
-මෙම දුෂ්කරත�වය මගහ�ර පිටු සංස්කරණය  සුරක්ෂිතව සිදුකිරීමට ඔබට ඉඩ සලසන වක් මගක් ඇත: ASCII-නොවන අක්ෂර  සංස්කරණ කොටුවෙහි ෂඩ්ද�ක කේතයන් ලෙස පෙන්නුම් කෙරේ.</strong>',
-'editingold'                       => '<strong>අවව�දයයි: ඔබ සංස්කරණය කරනුයේ මෙම පිටුවෙහි යල්-ප�නගිය සං��ධනයකි.
-ඔබ එය සුර�කුවහොත්, මෙම සං��ධනයට පසුව සිදු කෙරී ඇති වෙනස්වීම් කිසිවක් තිබේ නම් ඒව� න�තිවනු ඇත.</strong>',
+'nonunicodebrowser'                => "'''අවව�දයයි: ඔබගේ බ්�රවුසරය යුනිකේත  අනුකූල නොවේ.
+මෙම දුෂ්කරත�වය මගහ�ර පිටු සංස්කරණය  සුරක්ෂිතව සිදුකිරීමට ඔබට ඉඩ සලසන වක් මගක් ඇත: ASCII-නොවන අක්ෂර  සංස්කරණ කොටුවෙහි ෂඩ්ද�ක කේතයන් ලෙස පෙන්නුම් කෙරේ.'''",
+'editingold'                       => "'''අවව�දයයි: ඔබ සංස්කරණය කරනුයේ මෙම පිටුවෙහි යල්-ප�නගිය සං��ධනයකි.
+ඔබ එය සුර�කුවහොත්, මෙම සං��ධනයට පසුව සිදු කෙරී ඇති වෙනස්වීම් කිසිවක් තිබේ නම් ඒව� න�තිවනු ඇත.'''",
 'yourdiff'                         => 'වෙනස්කම්',
-'copyrightwarning'                 => '{{SITENAME}} සඳහ� ඔබ විසින් ද�යක වන කෘතීන් පල කොට මුද� හ�රීමෙහිදී,  $2 ට යටත් වන බව කරුණ�වෙන් සලකන්න (ව�ඩි විස්තර සඳහ� $1 බලන්න). ඔබගේ ලිය�විලි, අනෙකුන් විසින් හිත්පිත් නොම�ති තරම් ඉත�මත් රළු අයුරින් සංස්කරණය කිරීම හ� ඔවුන්ගේ රිසිය පරිදි  ප්�රතිසංවිධ�නය කිරීම,  ඔබ හට දර� ග�නීමට නොහ�කි නම්, ඔබගේ කෘති මෙහි පල කිරීමෙන් වලකින්න.<br />
+'copyrightwarning'                 => "{{SITENAME}} සඳහ� ඔබ විසින් ද�යක වන කෘතීන් පල කොට මුද� හ�රීමෙහිදී,  $2 ට යටත් වන බව කරුණ�වෙන් සලකන්න (ව�ඩි විස්තර සඳහ� $1 බලන්න). ඔබගේ ලිය�විලි, අනෙකුන් විසින් හිත්පිත් නොම�ති තරම් ඉත�මත් රළු අයුරින් සංස්කරණය කිරීම හ� ඔවුන්ගේ රිසිය පරිදි  ප්�රතිසංවිධ�නය කිරීම,  ඔබ හට දර� ග�නීමට නොහ�කි නම්, ඔබගේ කෘති මෙහි පල කිරීමෙන් වලකින්න.<br />
 එසේ ම මෙය ඔබ විසින් ම ලියූ බවට හ� පොදු විෂයපථයකින්, ඊ�ට ස�ම�න නිදහස් මූල��්�රයකින් උපුට� ගත් බව�ට හ� අපහ��ට සහතික විය යුතු ය. (තොරතුරු සඳහ� $1 බලන්න).
-<strong>හිමිකම් ඇවුරුණු දේ අනවසරයෙන් ප්�රක�� කිරිමෙන් වලකින්න!</strong>',
-'copyrightwarning2'                => '{{SITENAME}} වෙත ද�යක වෙමින් ඔබ විසින් යොමු කෙරෙන කෘති, එව�නිම ද�යකත්වයක් සපයන වෙනයම් ඕනෑම අයෙකුන් විසින්, සංස්කරණය කිරීම, වෙනස් කිරීම, හ� ඉවත් කිරීම සිදුවිය හ�ක්කක් බව කරුණ�වෙන් සලකන්න.ඔබගේ ලිය�විලි, හිත්පිත් න�තිව� සේ පෙනෙන ඉත� රළු අයුරින් සංස්කරණයට ලක් කිරීම නොකල යුතු ය�යි ඔබ හඟින්නේ නම්, ඔබගේ කෘති මෙහි පල කිරීමෙන් වලකින්න.<br />
+'''හිමිකම් ඇවුරුණු දේ අනවසරයෙන් ප්�රක�� කිරිමෙන් වලකින්න!'''",
+'copyrightwarning2'                => "{{SITENAME}} වෙත ද�යක වෙමින් ඔබ විසින් යොමු කෙරෙන කෘති, එව�නිම ද�යකත්වයක් සපයන වෙනයම් ඕනෑම අයෙකුන් විසින්, සංස්කරණය කිරීම, වෙනස් කිරීම, හ� ඉවත් කිරීම සිදුවිය හ�ක්කක් බව කරුණ�වෙන් සලකන්න.ඔබගේ ලිය�විලි, හිත්පිත් න�තිව� සේ පෙනෙන ඉත� රළු අයුරින් සංස්කරණයට ලක් කිරීම නොකල යුතු ය�යි ඔබ හඟින්නේ නම්, ඔබගේ කෘති මෙහි පල කිරීමෙන් වලකින්න.<br />
 එසේ ම මෙය ඔබ විසින් ම ලියූ බවට හ� පොදු විෂයපථයකින්, ඊ�ට ස�ම�න නිදහස් මූල��්�රයකින් උපුට� ගත් බව�ට හ� අපහ��ට සහතික විය යුතු ය. (තොරතුරු සඳහ� $1 බලන්න).
-<strong> හිමිකම් ඇවුරුණු දේ අනවසරයෙන් ප්�රක�� කිරිමෙන් වලකින්න!</strong>',
-'longpagewarning'                  => '<strong>අවව�දයයි: මෙම පිටුව කිල� බයිට්  $1 ගණනක් දිගුය;
+''' හිමිකම් ඇවුරුණු දේ අනවසරයෙන් ප්�රක�� කිරිමෙන් වලකින්න!'''",
+'longpagewarning'                  => "'''අවව�දයයි: මෙම පිටුව කිල� බයිට්  $1 ගණනක් දිගුය;
  32කි.බ. පමණට කිට්ටු හ� ඊට වඩ� දිගු පිටු සංස්කරණය කිරීම සමහරක් බ්�රවුසර වලට දුෂ්කර විය හ�ක.
-මෙම  �පිටුව කුඩ� කොටස් වලට බෙදීම පිළිබඳව කරුණ�කර අවධ�නය යොමු කරන්න.</strong>',
-'longpageerror'                    => '<strong>ද�ෂය: ඔබ විසින් ඉදිරිපත් කර ඇති පෙළ, කිල�බයිට් $1 ක් දිගු වන අතර, උපරිමය වන කිල�බයිට් $2 ට වඩ� දිගය.
-එය සුර�කිය නොහ�ක.</strong>',
-'protectedpagewarning'             => '<strong>අවව�දයයි: පරිප�ලක වරප්�රස�ද හිමි අය විසින් පමණක් සංස්කරණය කල හ�කි වන පරිදි මෙම පිටුව අවුර� ඇත.</strong>',
+මෙම  �පිටුව කුඩ� කොටස් වලට බෙදීම පිළිබඳව කරුණ�කර අවධ�නය යොමු කරන්න.'''",
+'longpageerror'                    => "'''ද�ෂය: ඔබ විසින් ඉදිරිපත් කර ඇති පෙළ, කිල�බයිට් $1 ක් දිගු වන අතර, උපරිමය වන කිල�බයිට් $2 ට වඩ� දිගය.
+එය සුර�කිය නොහ�ක.'''",
+'readonlywarning'                  => "'''අවව�දයයි: දත්ත-ගබඩ�ව නඩත්තු කටයුතු සඳහ� අවුර� ඇති අතර, එබ�වින් ඔබගේ සංස්කරණයන් මේ ද�න්මම සුර�කීමට ඔබ හට නොහ�කි වනු ඇත.
+ඔබ තුටු නම්, කප�-පසුව-ඇලවීමක් මගින් පෙළ වෙනත් පෙළ ගොනුවකට නංව� ඉනික්බිතිව පසුව සුර�කීම සිදුකිරීමට කරුණු ස�ලසිය හ�ක.'''
+
+එය ඇවුරූ පරිප�ලක විසින් ඒ සඳහ� දී ඇති ප�හ�දිලි කිරීම මෙසේය: $1",
+'protectedpagewarning'             => "'''අවව�දයයි: පරිප�ලක වරප්�රස�ද හිමි අය විසින් පමණක් සංස්කරණය කල හ�කි වන පරිදි මෙම පිටුව අවුර� ඇත.'''",
 'semiprotectedpagewarning'         => "'''සටහන:''' ලේඛනගත පරි�ීලකයන්ට පමණක් සංස්කරණය කල හ�කි පරිදි මෙම පිටුව අවුර� ඇත.",
 'cascadeprotectedwarning'          => "'''අවව�දයයි:''' මෙහි පහත ද�ක්වෙන තීරු දර්�න-ආරක්�ෂිත {{PLURAL:$1|පිටුවක|පිටු වල}} එය අඩංගු කොට ඇති  බ�වින්,  පරිප�ලක වරප්�රස�ද සතු පරි�ීලකයන් හට පමණක් මෙම පිටුව සංස්කරණය කල හ�කි වන පරිදි එය අවුර� ඇත:",
-'titleprotectedwarning'            => '<strong>අවව�දයයි:  සමහරක් පරි�ීලකයන්ට පමණක් එය ත�නිය හ�කි වන පරිදි මෙම පිටුව අවුර� ඇත.</strong>',
+'titleprotectedwarning'            => "'''අවව�දයයි:  සමහරක් පරි�ීලකයන්ට පමණක් එය ත�නිය හ�කි වන පරිදි මෙම පිටුව අවුර� ඇත.'''",
 'templatesused'                    => 'මෙම පිටුවෙහි භ�විත� කල ස�කිලි:',
 'templatesusedpreview'             => 'මෙම පෙර-දසුනෙහි භ�විත� වන ස�කිලි:',
 'templatesusedsection'             => 'මෙම කොටසෙහි භ�විත� කර ඇති ස�කිලි:',
@@ -760,8 +811,22 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 
 මෙම පිටුව සංස්කරණය කිරීම තවදුරටත් සිදුකරගෙන ය�ම සුදුසුද යන වග ඔබ විසින් සලක� බ�ලිය යුතුය.
 මෙම පිටුවට අද�ල මක� ද�මීම් පිළිබඳ විස්තර ද�ක්වෙන මක�-ද�මීම්-ල�ු-සටහන ඔබගේ පහසුව තක� මෙහි දක්ව� ඇත:",
+'deleted-notice'                   => 'මෙම පිටුව මක� දම� ඇත.
+මෙම පිටුවට අද�ල වන මක� ද�මීම් සටහන් කර ඇති  මක�-ද�මීම්-ල�ු-සටහන, ඔබගේ ස�ඳහුම සඳහ�, මෙහි පහත දක්ව� ඇත.',
+'deletelog-fulllog'                => 'සම්පූර්ණ ල�ු-සටහන නරඹන්න',
+'edit-hook-aborted'                => 'හසුර මගින් සංස්කරණය ර�ධනය කෙරිණි.
+එය කිසිදු ප�හ�දිලි කිරීමක් නොදුනි.',
+'edit-gone-missing'                => 'පිටුව ය�වත්ක�ල කිරීම සිදුකල නොහ�කි විය.
+එය මක� දම� ඇති බවක් පෙනේ.',
+'edit-conflict'                    => 'සංස්කරණ ග�ටුම.',
+'edit-no-change'                   => 'පෙළට කිසිදු වෙනසක් සිදු නොකල  බ�වින් ඔබගේ සංස්කරණය නොසලක�හරින ලදි.',
+'edit-already-exists'              => 'නව පිටුවක් ත�නිය නොහ�කි විය.
+එය ද�නටමත් පවතියි.',
 
 # Parser/template warnings
+'expensive-parserfunction-warning'        => 'අවව�දයයි: මෙම පිටුවෙහි අධිව�ය ව්�ය�කරණ විග්�රහ �්�රිත ක�ඳවුම් පමණට වඩ� ඇත.
+
+එහි තිබිය යුතු වූයේ  {{PLURAL:$2|එක් ක�ඳවුමකට |ක�ඳවුම් $2 ට }} අඩුවෙන් වුවද, මෙහි ද�නට  {{PLURAL:$1|එක් ක�ඳවුමක්|ක�ඳවුම්  $1 ක්}} අඩංගුව ඇත.',
 'expensive-parserfunction-category'       => 'අධිව�ය ව්�ය�කරණ විග්�රහ �්�රිත ක�ඳවුම් පමණට වඩ� ඇති පිටු',
 'post-expand-template-inclusion-warning'  => 'අවව�දයයි: ස�කිලි අඩංගු කිරීමේ ප්�රම�ණය අවසර ලබ� දී ඇති පමණට වඩ� වි��ලයි.
 සමහරක් ස�කිලි අඩංගු නොකරනු ඇත.',
@@ -769,6 +834,8 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 'post-expand-template-argument-warning'   => 'අවව�දයයි: ව්�ය�ප්ති ප්�රම�ණය ඇව�සි තරමට වඩ� වි��ල ලෙස දක්ව� ඇති ස�කිලි විචල්�යයන් අඩුම ව�යෙන් එකක් හ�  මෙම පිටුව තුල අන්තර්ගතය.
 එම විචල්�යයන් නොසලක� හ�ර ඇත.',
 'post-expand-template-argument-category'  => 'මෙම පිටුවල, ස�කිලි විචල්�යයන් හරිය�ක�ර ද�ක්වීම ප�හ�ර හ�රීම පිළිබඳ ග�ටළු පවතී',
+'parser-template-loop-warning'            => 'ස�කිලි ලූපය අන�වරණය කෙරිණි: [[$1]]',
+'parser-template-recursion-depth-warning' => 'ස�කිලි ආවර්තනික අධිකත්ව සීම�ව ඉක්මවිණි ($1)',
 
 # "Undo" feature
 'undo-success' => 'සංස්කරණය අහ�සි කල හ�ක.
@@ -784,28 +851,29 @@ $1 නම�ති ඡේදයක් නොම�ති බ�වින්, ඔ
 $3 විසින් සපය� ඇති හේතුව ''$2'' වේ",
 
 # History pages
-'viewpagelogs'        => 'මෙම පිටුව සඳහ� ල�ු-සටහන් නරඹන්න',
-'nohistory'           => 'මෙම පිටුව සඳහ� සංස්කරණ ඉතිහ�සයක් නොම�ත.',
-'revnotfound'         => 'සං��ධනය හමු නොවිණි',
-'currentrev'          => 'වත්මන් සං��ධනය',
-'revisionasof'        => '$1 තෙක් සං��ධනය',
-'revision-info'       => '$1 වන විට  $2 විසින් සිදු කර ඇති සං��ධන',
-'previousrevision'    => '� පුර�ණ සං��ධනය',
-'nextrevision'        => 'නවීන සං��ධනය →',
-'currentrevisionlink' => 'වත්මන් සං��ධනය',
-'cur'                 => 'වත්මන්',
-'next'                => 'ඊලඟ',
-'last'                => 'අවසන්',
-'page_first'          => 'පළමු',
-'page_last'           => 'අවසන්',
-'histlegend'          => 'වෙනස තේරීම: ස�සඳිය යුතු අනුව�දයන්හි  රේඩිය� බොක්ස් සලකුණු කොට ඉන්පසු එන්ටර් බොත්තම එබීම හ� පහළින්ම ඇති බොත්තම එබීම කරන්න.<br />
+'viewpagelogs'           => 'මෙම පිටුව සඳහ� ල�ු-සටහන් නරඹන්න',
+'nohistory'              => 'මෙම පිටුව සඳහ� සංස්කරණ ඉතිහ�සයක් නොම�ත.',
+'currentrev'             => 'වත්මන් සං��ධනය',
+'currentrev-asof'        => '$1 වන විට වත්මන් සං��ධනය',
+'revisionasof'           => '$1 තෙක් සං��ධනය',
+'revision-info'          => '$1 වන විට  $2 විසින් සිදු කර ඇති සං��ධන', # Additionally available: $3: revision id
+'previousrevision'       => '� පුර�ණ සං��ධනය',
+'nextrevision'           => 'නවීන සං��ධනය →',
+'currentrevisionlink'    => 'වත්මන් සං��ධනය',
+'cur'                    => 'වත්මන්',
+'next'                   => 'ඊලඟ',
+'last'                   => 'අවසන්',
+'page_first'             => 'පළමු',
+'page_last'              => 'අවසන්',
+'histlegend'             => 'වෙනස තේරීම: ස�සඳිය යුතු අනුව�දයන්හි  රේඩිය� බොක්ස් සලකුණු කොට ඉන්පසු එන්ටර් බොත්තම එබීම හ� පහළින්ම ඇති බොත්තම එබීම කරන්න.<br />
 ආඛ්�ය�යික�ව: (වත්මන්) = වත්මන් අනුව�දය හ� සමග වෙනස,
 (අවසන්) = පෙර අනුව�දය හ� සමග වෙනස, සුළු = සුළු සංස්කරණය.',
-'deletedrev'          => '[මක� දමන ලදි]',
-'histfirst'           => 'ප�රණිතම',
-'histlast'            => 'නවීනතම',
-'historysize'         => '({{PLURAL:$1|බයිට්1 |බයිට් $1 ගණනක්}})',
-'historyempty'        => '(හිස්)',
+'history-fieldset-title' => 'ඉතිහ�සය පිරික්සන්න',
+'deletedrev'             => '[මක� දමන ලදි]',
+'histfirst'              => 'ප�රණිතම',
+'histlast'               => 'නවීනතම',
+'historysize'            => '({{PLURAL:$1|බයිට්1 |බයිට් $1 ගණනක්}})',
+'historyempty'           => '(හිස්)',
 
 # Revision feed
 'history-feed-title'          => 'සං��ධන ඉතිහ�සය',
@@ -891,6 +959,7 @@ $3 විසින් සපය� ඇති හේතුව ''$2'' වේ",
 'mergehistory-invalid-destination' => 'අන්ත  පිටුව නීතික �ීර්ෂයක් සහිත විය යුතුය.',
 'mergehistory-autocomment'         => '[[:$2]] හ� සමග [[:$1]] ඒක�බද්ධ කරන ලදි',
 'mergehistory-comment'             => ' [[:$2]]: $3 හ� සමග [[:$1]] ඒක�බද්ධ කරන ලදි',
+'mergehistory-same-destination'    => 'මූල හ� අන්ත පිටු දෙකම එකක් විය නොහ�ක',
 
 # Merge log
 'mergelog'           => 'එක�බද්ධ කිරීම් ල�ු-සටහන',
@@ -903,124 +972,207 @@ $3 විසින් සපය� ඇති හේතුව ''$2'' වේ",
 'difference'              => '(අනුව�ද අතර වෙනස්කම්)',
 'lineno'                  => 'පේළිය $1:',
 'compareselectedversions' => 'ත�ර�ගෙන ඇති අනුව�ද සසඳන්න',
+'visualcomparison'        => 'දෘ�්�ය ස�ස�ඳුම',
+'wikicodecomparison'      => 'විකිපෙළ ස�ස�ඳුම',
 'editundo'                => 'අහ�සි',
 'diff-multi'              => '({{PLURAL:$1|එක් අතරම�දි සං��ධනයක්| අතරම�දි සං��ධන $1 ක්}} පෙන්නුම් කර නොම�ත.)',
+'diff-movedto'            => '$1 වෙත ගෙන යන ලදි',
+'diff-styleadded'         => '$1 �ෛලිය එක් කරන ලදි',
+'diff-added'              => '$1 එක් කරන ලදි',
+'diff-changedto'          => '$1 බවට වෙනස් කරන ලදි',
+'diff-movedoutof'         => '$1 වෙතින් ඉවතට ගෙන යන ලදි',
+'diff-styleremoved'       => '$1 �ෛලිය ඉවත් කරන ලදි',
+'diff-removed'            => '$1 ඉවත් කරන ලදි',
+'diff-changedfrom'        => '$1 වෙතින් වෙනස් කරන ලදි',
+'diff-src'                => 'මූල��්�රය',
+'diff-withdestination'    => '$1 අන්තය සමගින්',
+'diff-with'               => '&#32; $1 $2 සමගින්',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;සහ $1 $2',
+'diff-width'              => 'පළල',
+'diff-height'             => 'උස',
+'diff-p'                  => "එක් '''ඡේදයක්'''",
+'diff-blockquote'         => "එක් '''උද්ධෘතයක්'''",
+'diff-h1'                 => "එක් '''�ීර්ෂන�මයක් (1 මට්ටම)'''",
+'diff-h2'                 => "එක් '''�ීර්ෂන�මය (2වන මට්ටම)'''ක්",
+'diff-h3'                 => "එක් '''�ීර්ෂන�මය (3වන මට්ටම)'''ක්",
+'diff-h4'                 => "එක් '''�ීර්ෂන�මය (4වන මට්ටම)'''ක්",
+'diff-h5'                 => "එක් '''�ීර්ෂන�මය (5වන මට්ටම)'''ක්",
+'diff-pre'                => "එක් '''පූර්වආකෘතිකරණය නෙරුණු ව�රණය'''ක්",
+'diff-div'                => "එක් '''අං�ය'''ක්",
+'diff-ul'                 => "එක් '''අනුපිළිවෙලට නොස�කසූ ල�යිස්තුව'''ක්",
+'diff-ol'                 => "එක් '''අනුපිළිවෙලට ස�කසූ ල�යිස්තුව'''ක්",
+'diff-li'                 => "එක් '''ල�යිස්තුගත අයිතමය'''ක්",
+'diff-table'              => "එක් '''වගුව'''ක්",
+'diff-tbody'              => "එක් '''වගුවක අන්තර්ගතය'''ක්",
+'diff-tr'                 => "එක් '''පේළිය'''ක්",
+'diff-td'                 => "එක් '''කොටුව'''ක්",
+'diff-th'                 => "එක් '''�ීර්ෂකය'''ක්",
+'diff-br'                 => "එක් '''කඩනය'''ක්",
+'diff-hr'                 => " '''තිරස් රූල''' කි",
+'diff-code'               => "එක් '''පරිගණක කේත ව�රණය'''ක්",
+'diff-dl'                 => "එක් '''අර්ථද�ක්වීම් ල�යිස්තුව'''ක්",
+'diff-dt'                 => "'''අර්ථද�ක්වුම් භ�ෂිතය''' කි",
+'diff-dd'                 => "එක් '''අර්ථද�ක්වීම'''ක්",
+'diff-input'              => "එක් '''ප්�රද�නය'''ක්",
+'diff-form'               => "එක් '''ආකෘති-පත්�රය'''ක්",
+'diff-img'                => "එක් '''රූපය'''ක්",
+'diff-span'               => "එක් '''පර�යණය'''ක්",
+'diff-a'                  => "එක් '''සබ�ඳිය'''ක්",
+'diff-i'                  => "'''ඇලකුරු'''",
+'diff-b'                  => "'''තදකුරු'''",
+'diff-strong'             => "'''පබල'''",
+'diff-em'                 => "'''අවධ�රණය'''",
+'diff-font'               => "'''අකුරු හ�ඩය'''",
+'diff-big'                => "'''වි��ල'''",
+'diff-del'                => "'''මකන ලදි'''",
+'diff-tt'                 => "'''අචල පළල'''",
+'diff-sub'                => "'''යටකුර'''",
+'diff-sup'                => "'''උඩකුර'''",
+'diff-strike'             => "'''ම�දි-ඉර�ති'''",
 
 # Search results
-'searchresults'             => 'ගවේෂණ ප්�රතිඵල',
-'searchresulttext'          => '{{SITENAME}} ගවේෂණය පිළිබඳ ව�ඩි විස්තර සඳහ� , [[{{MediaWiki:Helppage}}|{{int:help}}]] බලන්න.',
-'searchsubtitle'            => 'ඔබගේ ගවේෂණය වූයේ  \'\'\'[[:$1]]\'\'\'  සඳහ�ය ([[Special:Prefixindex/$1| "$1" යෙන් ඇරඹෙන සියළු පිටු]] | [[Special:WhatLinksHere/$1| "$1" වෙත සබ��ඳෙන සියළු පිටු]])',
-'searchsubtitleinvalid'     => "ඔබගේ ගවේෂණය වූයේ  '''$1''' සඳහ�ය",
-'noexactmatch'              => "''' \"\$1\" යන න�මය හිමි  පිටුවක් නොම�ත.'''
+'searchresults'                    => 'ගවේෂණ ප්�රතිඵල',
+'searchresults-title'              => '"$1" සඳහ� ගවේෂණ ප්�රතිඵල',
+'searchresulttext'                 => '{{SITENAME}} ගවේෂණය පිළිබඳ ව�ඩි විස්තර සඳහ� , [[{{MediaWiki:Helppage}}|{{int:help}}]] බලන්න.',
+'searchsubtitle'                   => 'ඔබගේ ගවේෂණය වූයේ  \'\'\'[[:$1]]\'\'\'  සඳහ�ය ([[Special:Prefixindex/$1| "$1" යෙන් ඇරඹෙන සියළු පිටු]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1| "$1" වෙත සබ��ඳෙන සියළු පිටු]])',
+'searchsubtitleinvalid'            => "ඔබගේ ගවේෂණය වූයේ  '''$1''' සඳහ�ය",
+'noexactmatch'                     => "''' \"\$1\" යන න�මය හිමි  පිටුවක් නොම�ත.'''
 ඔබ හට [[:\$1|මෙම පිටුව ත�නිය හ�ක]].",
-'noexactmatch-nocreate'     => "''' \"\$1\" නම�ති පිටුවක් නොම�ත.'''",
-'toomanymatches'            => 'පමණට වඩ� ග�ලපුම් ගණනක් ප්�රතිල�භ ව�යෙන් ල�බුණි, කරුණ�කර වෙනස් විමසුමක් අත්හද� බලන්න',
-'titlematches'              => 'පිටු �ීර්ෂය ග�ළපෙයි',
-'notitlematches'            => 'පිටු �ීර්ෂ කිසිවක් නොග�ළපෙති',
-'textmatches'               => 'පිටු පෙළ ග�ළපෙයි',
-'notextmatches'             => 'පිටු පෙළ කිසිවක් නොග�ළපෙති',
-'prevn'                     => 'පූර්ව  $1',
-'nextn'                     => 'ඊලඟ  $1',
-'viewprevnext'              => '($1) ($2) ($3) නරඹන්න',
-'search-result-size'        => '$1 ({{PLURAL:$2|වචන1 ක් |වචන $2 ක්}})',
-'search-result-score'       => 'අද�ළත�ව: $1%',
-'search-redirect'           => '($1 යළි-යොමු කරන්න)',
-'search-section'            => '($1 ඡේදය)',
-'search-suggest'            => 'ඔබ අදහස් කළේ මෙයද: $1',
-'search-interwiki-caption'  => 'සහ�දර ව්�ය�පෘති',
-'search-interwiki-default'  => '$1 වෙතින් ප්�රතිඵල:',
-'search-interwiki-more'     => '(තවත්)',
-'search-mwsuggest-enabled'  => 'ඇඟවිලි සමගින්',
-'search-mwsuggest-disabled' => 'ඇඟවිලි නොම�ත',
-'search-relatedarticle'     => 'සහසම්බන්ධිත',
-'mwsuggest-disable'         => 'AJAX ඇඟවිලි අක්�රීය කරන්න',
-'searchrelated'             => 'සහසම්බන්ධිත',
-'searchall'                 => 'සියල්ල',
-'showingresults'            => "#'''$2''' ගෙන් ආරම්භ කොට, {{PLURAL:$1|ප්�රතිඵල '''1'''  ක් |ප්�රතිඵල '''$1''' ක්}} දක්ව� පහත පෙන්ව� ඇත.",
-'showingresultsnum'         => "#'''$2''' ගෙන් ආරම්භ කොට, {{PLURAL:$3|ප්�රතිඵල '''1'''  ක් |ප්�රතිඵල '''$3''' ක්}} පහත පෙන්ව� ඇත.",
-'nonefound'                 => "'''සටහන''': පෙරනිමියෙන් ගවේෂණය වන්නේ සමහරක් න�මඅවක�� පමණි.
-ඔබ�ගේ විමසුමට ''සියල්ල:'' උපසර්ගය යෙදීම මගින් සියළු අන්තර්ගතය ගවේෂණයට ඉඩ ස�ලසීම අත්හද� බලන්න (ස�කච්ඡ� පිටු, ස�කිලි, ආදියද ඇතුළුව), න�තහොත්, උපසර්ගය ලෙස අපේක්�ෂිත න�මඅවක��ය භ�විත� කරන්න.",
-'powersearch'               => 'ව�ඩිමනත් ගවේෂණය කරන්න',
-'powersearch-legend'        => 'ව�ඩිමනත් ගවේෂණය',
-'powersearch-ns'            => 'න�මඅවක��යන්හි ගවේෂණය කරන්න:',
-'powersearch-redir'         => 'යළි-යොමුවීම් ල�යිස්තුගත කරන්න',
-'powersearch-field'         => 'සඳහ� ගවේෂණය',
-'search-external'           => 'බ�හිර ගවේෂණය',
-'searchdisabled'            => '{{SITENAME}} ගවේෂණය අක්�රීය කොට ඇත.
+'noexactmatch-nocreate'            => "''' \"\$1\" නම�ති පිටුවක් නොම�ත.'''",
+'toomanymatches'                   => 'පමණට වඩ� ග�ලපුම් ගණනක් ප්�රතිල�භ ව�යෙන් ල�බුණි, කරුණ�කර වෙනස් විමසුමක් අත්හද� බලන්න',
+'titlematches'                     => 'පිටු �ීර්ෂය ග�ළපෙයි',
+'notitlematches'                   => 'පිටු �ීර්ෂ කිසිවක් නොග�ළපෙති',
+'textmatches'                      => 'පිටු පෙළ ග�ළපෙයි',
+'notextmatches'                    => 'පිටු පෙළ කිසිවක් නොග�ළපෙති',
+'prevn'                            => 'පූර්ව  $1',
+'nextn'                            => 'ඊලඟ  $1',
+'viewprevnext'                     => '($1) ($2) ($3) නරඹන්න',
+'searchmenu-legend'                => 'ගවේෂණ විකල්පයන්',
+'searchmenu-exists'                => "''' මෙම විකියෙහි  \"[[:\$1]]\" ලෙස නම් කර ඇති පිටුවක් ඇත'''",
+'searchmenu-new'                   => "'''මෙම විකියෙහි \"[[:\$1]]\" පිටුව තනන්න!'''",
+'searchhelp-url'                   => 'Help:පටුන',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|මෙම උපසර්ගය භ�විත කරමින් පිටු පිරික්සන්න]]',
+'searchprofile-articles'           => 'අන්තර්ගත පිටු',
+'searchprofile-articles-and-proj'  => 'අන්තර්ගත හ� ව්�ය�පෘති පිටු',
+'searchprofile-project'            => 'ව්�ය�පෘති පිටු',
+'searchprofile-images'             => 'ගොනු',
+'searchprofile-everything'         => 'සියල්ල',
+'searchprofile-advanced'           => 'ප්�රගත',
+'searchprofile-articles-tooltip'   => '$1 හි ගවේෂණය කරන්න',
+'searchprofile-project-tooltip'    => '$1 හි ගවේෂණය කරන්න',
+'searchprofile-images-tooltip'     => 'ගොනු සඳහ� ගවේෂණය කරන්න',
+'searchprofile-everything-tooltip' => 'සියළු අන්තර්ගතය ගවේෂණය කරන්න(ස�කච්ඡ� පිටුද ඇතුළුව)',
+'searchprofile-advanced-tooltip'   => 'අභිරුචි න�මඅවක��යන්හි ගවේෂණය කරන්න',
+'prefs-search-nsdefault'           => 'පෙරනිමියන් භ�විතයෙන් ගවේෂණය කරන්න:',
+'prefs-search-nscustom'            => 'අභිරුචි න�මඅවක��යන් ගවේෂණය කරන්න:',
+'search-result-size'               => '$1 ({{PLURAL:$2|වචන1 ක් |වචන $2 ක්}})',
+'search-result-score'              => 'අද�ළත�ව: $1%',
+'search-redirect'                  => '($1 යළි-යොමු කරන්න)',
+'search-section'                   => '($1 ඡේදය)',
+'search-suggest'                   => 'ඔබ අදහස් කළේ මෙයද: $1',
+'search-interwiki-caption'         => 'සහ�දර ව්�ය�පෘති',
+'search-interwiki-default'         => '$1 වෙතින් ප්�රතිඵල:',
+'search-interwiki-more'            => '(තවත්)',
+'search-mwsuggest-enabled'         => 'ඇඟවිලි සමගින්',
+'search-mwsuggest-disabled'        => 'ඇඟවිලි නොම�ත',
+'search-relatedarticle'            => 'සහසම්බන්ධිත',
+'mwsuggest-disable'                => 'AJAX ඇඟවිලි අක්�රීය කරන්න',
+'searchrelated'                    => 'සහසම්බන්ධිත',
+'searchall'                        => 'සියල්ල',
+'showingresults'                   => "#'''$2''' ගෙන් ආරම්භ කොට, {{PLURAL:$1|ප්�රතිඵල '''1'''  ක් |ප්�රතිඵල '''$1''' ක්}} දක්ව� පහත පෙන්ව� ඇත.",
+'showingresultsnum'                => "#'''$2''' ගෙන් ආරම්භ කොට, {{PLURAL:$3|ප්�රතිඵල '''1'''  ක් |ප්�රතිඵල '''$3''' ක්}} පහත පෙන්ව� ඇත.",
+'showingresultstotal'              => "{{PLURAL:$4| '''$3''' අතුරින් '''$1''' ප්�රතිඵලය|''''$3''' අතුරින් ''$1 - $2''' ප්�රතිඵල }} පහත පෙන්ව� ඇත",
+'nonefound'                        => "'''සටහන''': පෙරනිමියෙන් ගවේෂණය වන්නේ සමහරක් න�මඅවක�� පමණි.
+ඔබ�ගේ විමසුමට ''all:'' උපසර්ගය යෙදීම මගින් සියළු අන්තර්ගතය ගවේෂණයට ඉඩ ස�ලසීම අත්හද� බලන්න (ස�කච්ඡ� පිටු, ස�කිලි, ආදියද ඇතුළුව), න�තහොත්, උපසර්ගය ලෙස අපේක්�ෂිත න�මඅවක��ය භ�විත� කරන්න.",
+'search-nonefound'                 => 'විමසුම හ� ග�ලපෙන ප්�රතිථල කිසිවක් නොම�ත.',
+'powersearch'                      => 'ව�ඩිමනත් ගවේෂණය කරන්න',
+'powersearch-legend'               => 'ව�ඩිමනත් ගවේෂණය',
+'powersearch-ns'                   => 'න�මඅවක��යන්හි ගවේෂණය කරන්න:',
+'powersearch-redir'                => 'යළි-යොමුවීම් ල�යිස්තුගත කරන්න',
+'powersearch-field'                => 'සඳහ� ගවේෂණය',
+'search-external'                  => 'බ�හිර ගවේෂණය',
+'searchdisabled'                   => '{{SITENAME}} ගවේෂණය අක්�රීය කොට ඇත.
 මේ අතරතුර ඔබ හට ගූගල් ඔස්සේ ගවේෂණය කල හ�ක.
 {{SITENAME}} අන්තර්ගතය පිළිබඳ ඔවුන්ගේ සූචි යල් ප�න ගොස් ඇතිව� විය හ�කි බව සටහන් කර ගන්න.',
 
 # Preferences page
-'preferences'              => 'අභීරුචි',
-'mypreferences'            => 'මගේ අභිරුචි',
-'prefs-edits'              => 'සංස්කරණයන් සංඛ්�ය�ව:',
-'prefsnologin'             => 'ප්�රවිෂ්ට වී නොම�ත',
-'prefsnologintext'         => 'පරි�ීලක අභිරුචි පූරණය කරනු වස්, ඔබ  <span class="plainlinks">[{{fullurl:Special:Userlogin|returnto=$1}} ප්�රවිෂ්ට වී]</span> සිටිය යුතුය.',
-'prefsreset'               => 'සංචිතය අනුස�රයෙන් අභිරුචියන් ප්�රත්�ය�රම්භ කොට ඇත.',
-'qbsettings'               => 'යුහුතීරුව',
-'qbsettings-none'          => 'කිසිවක් නොම�ත',
-'qbsettings-fixedleft'     => 'ස්ථ�වර වම',
-'qbsettings-fixedright'    => 'ස්ථ�වර දකුණ',
-'qbsettings-floatingleft'  => 'ප්ල�වක වම',
-'qbsettings-floatingright' => 'ප්ල�වක දකුණ',
-'changepassword'           => 'මුරපදය වෙනස් කරන්න',
-'skin'                     => 'ඡවිය',
-'math'                     => 'ගණිත',
-'dateformat'               => 'දත්ත ආකෘතිකරණය',
-'datedefault'              => 'අභිරුචියක් නොම�ත',
-'datetime'                 => 'දිනය සහ වේල�ව',
-'math_failure'             => 'ව්�ය�කරණ විග්�රහය අසමත් විය',
-'math_unknown_error'       => 'අඥ�ත ද�ෂය',
-'math_unknown_function'    => 'අඥ�ත �්�රිතය',
-'math_lexing_error'        => 'රීතිමය ද�ෂයකි',
-'math_syntax_error'        => 'ක�රක-රීති ද�ෂය',
-'math_image_error'         => 'PNG අන්වර්තනය අස�ර්ථකවිය;
+'preferences'               => 'අභීරුචි',
+'mypreferences'             => 'මගේ අභිරුචි',
+'prefs-edits'               => 'සංස්කරණයන් සංඛ්�ය�ව:',
+'prefsnologin'              => 'ප්�රවිෂ්ට වී නොම�ත',
+'prefsnologintext'          => 'පරි�ීලක අභිරුචි පූරණය කරනු වස්, ඔබ  <span class="plainlinks">[{{fullurl:Special:Userlogin|returnto=$1}} ප්�රවිෂ්ට වී]</span> සිටිය යුතුය.',
+'prefsreset'                => 'සංචිතය අනුස�රයෙන් අභිරුචියන් ප්�රත්�ය�රම්භ කොට ඇත.',
+'qbsettings'                => 'යුහුතීරුව',
+'qbsettings-none'           => 'කිසිවක් නොම�ත',
+'qbsettings-fixedleft'      => 'ස්ථ�වර වම',
+'qbsettings-fixedright'     => 'ස්ථ�වර දකුණ',
+'qbsettings-floatingleft'   => 'ප්ල�වක වම',
+'qbsettings-floatingright'  => 'ප්ල�වක දකුණ',
+'changepassword'            => 'මුරපදය වෙනස් කරන්න',
+'skin'                      => 'ඡවිය',
+'skin-preview'              => 'පෙරදසුන',
+'math'                      => 'ගණිත',
+'dateformat'                => 'දත්ත ආකෘතිකරණය',
+'datedefault'               => 'අභිරුචියක් නොම�ත',
+'datetime'                  => 'දිනය සහ වේල�ව',
+'math_failure'              => 'ව්�ය�කරණ විග්�රහය අසමත් විය',
+'math_unknown_error'        => 'අඥ�ත ද�ෂය',
+'math_unknown_function'     => 'අඥ�ත �්�රිතය',
+'math_lexing_error'         => 'රීතිමය ද�ෂයකි',
+'math_syntax_error'         => 'ක�රක-රීති ද�ෂය',
+'math_image_error'          => 'PNG අන්වර්තනය අස�ර්ථකවිය;
 latex, dvips, gs, හ� convert හී නිදොස්  ස්ථ�පනය සිදුවී ඇතිද�යි පිරික්සන්න',
-'math_bad_tmpdir'          => 'ගණිත ත�වක�ලික ඩිරෙක්ටරිය ත�නීමට හ� එයට ලිවීමට නොහ�ක',
-'math_bad_output'          => 'ගණිත ප්�රතිද�න ඩිරෙක්ටරිය ත�නීමට හ� එයට ලිවීමට නොහ�ක',
-'math_notexvc'             => 'texvc අභිව�හකය දක්නට නොම�ත;
+'math_bad_tmpdir'           => 'ගණිත ත�වක�ලික ඩිරෙක්ටරිය ත�නීමට හ� එයට ලිවීමට නොහ�ක',
+'math_bad_output'           => 'ගණිත ප්�රතිද�න ඩිරෙක්ටරිය ත�නීමට හ� එයට ලිවීමට නොහ�ක',
+'math_notexvc'              => 'texvc අභිව�හකය දක්නට නොම�ත;
 වින්�ය�ස කෙරුමට කරුණ�කර math/README බලන්න.',
-'prefs-personal'           => 'පරි�ීලක ප�තිකඩ',
-'prefs-rc'                 => 'මෑත වෙනස්වීම්',
-'prefs-watchlist'          => 'මුර-ල�යිස්තුව',
-'prefs-watchlist-days'     => 'මුර-ල�යිස්තුවෙහි පෙන්විය යුතු දිනයන්:',
-'prefs-watchlist-edits'    => 'ආවර්ධිත මුර-ල�යිස්තුවෙහි පෙන්විය යුතු උපරිම වෙනස්වීම් සංඛ්�ය�ව:',
-'prefs-misc'               => 'විවිධ',
-'saveprefs'                => 'සුර�කුම',
-'resetprefs'               => 'නොසුර�කූ වෙනස්වීම් නිෂ්ක��නය කරන්න',
-'oldpassword'              => 'ප�ර�ණි මුර-පදය:',
-'newpassword'              => 'නව මුර-පදය:',
-'retypenew'                => 'නව මුර-පදය න�වත යතුරු-කරණය කරන්න:',
-'textboxsize'              => 'සංස්කරණය කරමින්',
-'rows'                     => 'පේළි:',
-'columns'                  => 'තීරු:',
-'searchresultshead'        => 'ගවේෂණය',
-'resultsperpage'           => 'පිටුවකට හිට් ගණන:',
-'contextlines'             => 'හිට් එකකට පේළි ගණන:',
-'contextchars'             => 'එක් පේළියකට සන්දර්භය:',
-'stub-threshold'           => '<a href="#" class="stub">කොට සබ�ඳි</a> ආකෘතිකරණය සඳහ� සීමකය (බයිට්):',
-'recentchangesdays'        => 'මෑත වෙනස්වීම්හි පෙන්විය යුතු දිනයන්:',
-'recentchangescount'       => 'මෑත වෙනස්වීම්, ඉතිහ�සය හ� ල�ු-සටහන් පිටුවල පෙන්විය යුතු සංස්කරණ ගණන:',
-'savedprefs'               => 'ඔබගේ අභිරුචි සුර�කීම සිදු කර ඇත.',
-'timezonelegend'           => 'වේල� කල�පය',
-'timezonetext'             => '¹ඔබගේ ප්�ර�දේ�ීය වේල�ව සේව�ද�යකයේ වේල�වෙන් (යූටීසී) වෙනස්වන්න�වූ ප�ය ගණන.',
-'localtime'                => 'ප්�ර�ද්�ීය වේල�ව',
-'timezoneoffset'           => 'හිලව්ව¹',
-'servertime'               => 'සේව�ද�යකයේ වේල�ව',
-'guesstimezone'            => 'බ්�රවුසරයෙන් පුරවන්න',
-'allowemail'               => 'අනෙකුත් පරි�ීලකයන්ගෙන් විද්�යුත්-ත�පෑල ල�බීම සක්�රීය කරන්න',
-'prefs-searchoptions'      => 'ගවේෂණ විකල්පයන්',
-'prefs-namespaces'         => 'න�මඅවක��',
-'defaultns'                => 'පෙරනිමියෙන් මෙම න�මඅවක��යන්හි ගවේෂණය කරන්න:',
-'default'                  => 'පෙරනිමි',
-'files'                    => 'ගොනු',
+'prefs-personal'            => 'පරි�ීලක ප�තිකඩ',
+'prefs-rc'                  => 'මෑත වෙනස්වීම්',
+'prefs-watchlist'           => 'මුර-ල�යිස්තුව',
+'prefs-watchlist-days'      => 'මුර-ල�යිස්තුවෙහි පෙන්විය යුතු දිනයන්:',
+'prefs-watchlist-days-max'  => '(උපරිමයෙන් දින7 ක්)',
+'prefs-watchlist-edits'     => 'ආවර්ධිත මුර-ල�යිස්තුවෙහි පෙන්විය යුතු උපරිම වෙනස්වීම් සංඛ්�ය�ව:',
+'prefs-watchlist-edits-max' => '(උපරිම සංඛ්�ය�ව: 1000)',
+'prefs-misc'                => 'විවිධ',
+'prefs-resetpass'           => 'මුර-පදය වෙනස් කරන්න',
+'saveprefs'                 => 'සුර�කුම',
+'resetprefs'                => 'නොසුර�කූ වෙනස්වීම් නිෂ්ක��නය කරන්න',
+'textboxsize'               => 'සංස්කරණය කරමින්',
+'prefs-edit-boxsize'        => 'සංස්කරණ �කවුළුවෙහි ප්�රම�ණය.',
+'rows'                      => 'පේළි:',
+'columns'                   => 'තීරු:',
+'searchresultshead'         => 'ගවේෂණය',
+'resultsperpage'            => 'පිටුවකට හිට් ගණන:',
+'contextlines'              => 'හිට් එකකට පේළි ගණන:',
+'contextchars'              => 'එක් පේළියකට සන්දර්භය:',
+'stub-threshold'            => '<a href="#" class="stub">කොට සබ�ඳි</a> ආකෘතිකරණය සඳහ� සීමකය (බයිට්):',
+'recentchangesdays'         => 'මෑත වෙනස්වීම්හි පෙන්විය යුතු දිනයන්:',
+'recentchangesdays-max'     => '(උපරිමයෙන් {{PLURAL:$1|එක් දිනක්|දින $1 ක්}})',
+'recentchangescount'        => 'මෑත වෙනස්වීම්, ඉතිහ�සය හ� ල�ු-සටහන් පිටුවල පෙරනිමියෙන් පෙන්විය යුතු සංස්කරණ ගණන:',
+'savedprefs'                => 'ඔබගේ අභිරුචි සුර�කීම සිදු කර ඇත.',
+'timezonelegend'            => 'වේල� කල�පය',
+'timezonetext'              => '¹ඔබගේ ප්�ර�දේ�ීය වේල�ව සේව�ද�යකයේ වේල�වෙන් (යූටීසී) වෙනස්වන්න�වූ ප�ය ගණන.',
+'localtime'                 => 'ප්�ර�දේ�ීය වේල�ව:',
+'timezoneselect'            => 'වේල� කල�පය:',
+'timezoneuseserverdefault'  => 'සේව�ද�යක පෙරනිමිය භ�විත� කරන්න',
+'timezoneuseoffset'         => 'වෙනත් (හිලව්ව නියම�ක�රයෙන් දක්වන්න)',
+'timezoneoffset'            => 'හිලව්ව¹:',
+'servertime'                => 'සේව�ද�යකයේ වේල�ව:',
+'guesstimezone'             => 'බ්�රවුසරයෙන් පුරවන්න',
+'allowemail'                => 'අනෙකුත් පරි�ීලකයන්ගෙන් විද්�යුත්-ත�පෑල ල�බීම සක්�රීය කරන්න',
+'prefs-searchoptions'       => 'ගවේෂණ විකල්පයන්',
+'prefs-namespaces'          => 'න�මඅවක��',
+'defaultns'                 => 'පෙරනිමියෙන් මෙම න�මඅවක��යන්හි ගවේෂණය කරන්න:',
+'default'                   => 'පෙරනිමි',
+'files'                     => 'ගොනු',
 
 # User rights
 'userrights'                     => 'පරි�ීලක හිමිකම් කළමන�කරණය', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'         => 'පරි�ීලක කණ්ඩ�යම් කළමන�කරණය කරන්න',
 'userrights-user-editname'       => 'පරි�ීලක-න�මයක් ආද�යනය කරන්න:',
 'editusergroup'                  => 'පරි�ීලක කණ්ඩ�යම් සංස්කරණය කරන්න',
-'editinguser'                    => "පරි�ීලක  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) ගේ පරි�ීලක හිමිකම් වෙනස්කිරීම",
+'editinguser'                    => "පරි�ීලක  '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) ගේ පරි�ීලක හිමිකම් වෙනස්කිරීම",
 'userrights-editusergroup'       => 'පරි�ීලක කණ්ඩ�යම් සංස්කරණය කරන්න',
 'saveusergroups'                 => 'පරි�ීලක කණ්ඩ�යම් සුරකින්න',
 'userrights-groupsmember'        => 'ඉදිරි ක�ණ්ඩයන්හි ස�ම�ජිකයෙකි:',
@@ -1070,6 +1222,7 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 'right-minoredit'            => 'සංස්කරණ සුළු ලෙස සළකුණු කරන්න',
 'right-move'                 => 'පිටු ගෙන යන්න',
 'right-move-subpages'        => 'පිටු ඒව�යේ උපපිටු හ� සමග ගෙන යන්න',
+'right-move-rootuserpages'   => 'මූල පරි�ීලක පිටු ගෙනයන්න',
 'right-suppressredirect'     => 'පිටුවක් ගෙනයන විට ප�රණි නම වෙතින් යළි-යොමුවක් නොතනන්න',
 'right-upload'               => 'ගොනු උඩුගත කරන්න',
 'right-reupload'             => 'පවතින ගොනුවක් අධිලිවීමකට ලක්කරන්න',
@@ -1120,9 +1273,45 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 'rightslogentry' => '$1 සඳහ� කණ්ඩ�යම් ස�ම�ජිකත්වය $2 සිට $3 දක්ව� වෙනස්කෙරිණි',
 'rightsnone'     => '(කිසිවක් නොම�ත)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'මෙම පිටුව කියවන්න',
+'action-edit'                 => 'මෙම පිටුව සංස්කරණය කරන්න',
+'action-createpage'           => 'පිටු තනන්න',
+'action-createtalk'           => 'සංව�ද පිටු තනන්න',
+'action-createaccount'        => 'මෙම පරි�ීලක ගිණුම තනන්න',
+'action-minoredit'            => 'මෙම සංස්කරණය සුළු ලෙස සලකුණු කරන්න',
+'action-move'                 => 'මෙම පිටුව ගෙනයන්න',
+'action-move-subpages'        => 'මෙම පිටුව හ� එහි උප පිටු ගෙන යන්න',
+'action-move-rootuserpages'   => 'මූල පරි�ීලක පිටු ගෙනයන්න',
+'action-upload'               => 'මෙම ගොනුව උඩුගත කරන්න',
+'action-reupload'             => 'ද�නට පවතින මෙම ගොනුව අධිලිවීමකට ලක්කරන්න',
+'action-reupload-shared'      => 'හවුල් සුරක්�ෂිත�ග�රයක ඇති මෙම ගොනුව අභිබ�වීමකට ලක් කරන්න',
+'action-upload_by_url'        => 'URL ලිපිනයක් (කල�ප ලිපිනයක්) වෙතින් මෙම ගොනුව උඩුගත කරන්න',
+'action-writeapi'             => 'ලිවීම් API භ�විත� කරන්න',
+'action-delete'               => 'මෙම පිටුව මකන්න',
+'action-deleterevision'       => 'මෙම සං��ධනය මකන්න',
+'action-deletedhistory'       => 'මෙම පිටුවේ මක�ද�මුනු ඉතිහ�සය නරඹන්න',
+'action-browsearchive'        => 'මක�ද�මුනු පිටු ගවේ�නය කරන්න',
+'action-undelete'             => 'මෙම පිටුව මක�ද�මීම ප්�රතිල�ම කරන්න',
+'action-suppressrevision'     => 'මෙම ස�ඟවුනු සං��ධනය විමර්�නය කොට ප්�රතිෂ්ඨ�පනය කරන්න',
+'action-suppressionlog'       => 'මෙම පෞද්ගලික ල�ු-සටහන නරඹන්න',
+'action-block'                => 'මෙම පරි�ීලකය� සංස්කරණය කිරීමෙන් ව�රණය කරන්න',
+'action-protect'              => 'මෙම පිටුවේ ර�කවරණ මට්ටම් වෙනස් කරන්න',
+'action-import'               => 'වෙනත් විකියක් වෙතින් මෙම පිටුව ආය�ත කරන්න',
+'action-importupload'         => 'ගොනු උඩුගත කිරීමක් වෙතින් මෙම පිටුව ආය�ත කරන්න',
+'action-patrol'               => 'අනෙකුන්ගේ සංස්කරණ, පරික්�ෂ�කර බ�ලූ ලෙස සලකුණු කරගන්න',
+'action-autopatrol'           => 'ඔබගේ සංස්කරණය, පරික්�ෂ�කර බ�ලූ ලෙස සලකුණු කරව�ගන්න',
+'action-unwatchedpages'       => 'මුර-නොකෙරෙන පිටු ල�යිස්තුව නරඹන්න',
+'action-trackback'            => 'පසුහ�ඹීමක් ඉදිරිපත් කරන්න',
+'action-mergehistory'         => 'මෙම පිටුවේ ඉතිහ�සය ඒක�බද්ධ කරන්න',
+'action-userrights'           => 'සියළු පරි�ීලක හිමිකම් සංස්කරණය කරන්න',
+'action-userrights-interwiki' => 'අනෙකුත් විකියන්ගේ පරි�ීලකයන්ගේ පරි�ීලක හිමිකම් සංස්කරණය කරන්න',
+'action-siteadmin'            => 'දත්ත-ගබඩ�ව අවුරන්න හ� ඇවුරුම ඉවත් කරන්න',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|වෙනස්වීම|වෙනස්වීම්}}',
 'recentchanges'                     => 'මෑත වෙනස්වීම්',
+'recentchanges-legend'              => 'මෑත වෙනස්වීම් විකල්පයන්',
 'recentchangestext'                 => 'මෙම පිටුවේ විකියට සිදුකල ඉත� මෑත වෙනස්වීම් පසුහඹන්න.',
 'recentchanges-feed-description'    => 'මෙම ප�ෂකයෙහි විකියට බොහ� මෑතදී සිදුකල වෙනස්වීම් හෙළිකරන්න.',
 'rcnote'                            => "$4 දින, $5 වන තෙක් ස�ලකිල්ලට ගත් කල, අවසන් {{PLURAL:$2|දිනදී|දින '''$2''' තුලදී}} සිදුවී ඇති, {{PLURAL:$1| '''1''' ක් වෙනස|අවසන් වෙනස්වීම් '''$1'''  }} මෙහි පහත ද�ක්වේ.",
@@ -1148,10 +1337,13 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 'rc_categories_any'                 => 'ඕනෑම',
 'rc-change-size'                    => '$1',
 'newsectionsummary'                 => '/* $1 */ නව ඡේදය',
+'rc-enhanced-expand'                => 'විස්කර පෙන්වන්න (ජ�ව�ස්ක්�රිප්ට් අව�්�යයි)',
+'rc-enhanced-hide'                  => 'විස්කර සඟවන්න',
 
 # Recent changes linked
 'recentchangeslinked'          => 'සහසම්බන්ධිත වෙනස්වීම්',
 'recentchangeslinked-title'    => '"$1" ට සහසම්බන්ධිත වෙනස්වීම්',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => 'සලක� බ�ලූ ක�ලසීම�වෙහිදී, සබ�ඳි පිටු වල කිසිදු වෙනසක් සිදුවී නොම�ත.',
 'recentchangeslinked-summary'  => "වි�ේෂී ලෙස නිරූපිත පිටුවකට (හ� වි�ේෂි ලෙස නිරූපිත ප්�රවර්ගයක ස�ම�ජීකයන්ට) සබ�ඳි පිටුවල  මෑතදී සිදුවූ වෙනස්වීම් ද�ක්වෙන ල�යිස්තුවක් මෙහි ද�ක්වේ.
 [[Special:Watchlist|ඔබගේ  මුර-ල�යිස්තුවෙහි]] පිටු  '''තදකුරු''' වලින් දක්ව� ඇත.",
@@ -1169,11 +1361,11 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 'upload_directory_read_only'  => 'වෙබ්-සේව�ද�යකය විසින් උඩුගත ඩිරෙක්ටරිය ($1) වෙත ලිවීමට නොහ�කි විය.',
 'uploaderror'                 => 'උඩුගත කිරීම් ද�ෂයක්',
 'uploadtext'                  => "ගොනු උඩුගත කිරීම සඳහ� පහත ආකෘති පත්�රය භ�විත� කරන්න.
-පෙරදී උඩුගතකෙරුණු ගොනු න�රඹුම හ� ගවේෂණය සඳහ�  [[Special:ImageList|උඩුගතකෙරුණු ගොනු ල�යිස්තුව]] වෙත යන්න, (යළි)උඩුගතකෙරුම්ද  [[Special:Log/upload|උඩුගතකෙරුම් ල�ු-සටහන]] තුල සටහන් කර ඇති අතර, මක�ද�මුම්  [[Special:Log/delete|මක�ද�මුම් ල�ු-සටහන]] හි ඇත.
+පෙරදී උඩුගතකෙරුණු ගොනු න�රඹුම හ� ගවේෂණය සඳහ�  [[Special:FileList|උඩුගතකෙරුණු ගොනු ල�යිස්තුව]] වෙත යන්න, (යළි)උඩුගතකෙරුම්ද  [[Special:Log/upload|උඩුගතකෙරුම් ල�ු-සටහන]] තුල සටහන් කර ඇති අතර, මක�ද�මුම්  [[Special:Log/delete|මක�ද�මුම් ල�ු-සටහන]] හි ඇත.
 
 ගොනුවක් පිටුවක බහ�ලීම සඳහ�, පහත ආක�රයේ සබ�ඳියක් භ�විත� කරන්න:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' ගොනුවෙහි පරිපූර්ණ අනුව�දය භ�විත� කිරීමට
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' 'විකල්ප පෙළ' යන්න විස්තරය ලෙසින් ත�බෙමින් වම් ම�යිමෙහි කොටුවක පික්සල 200 පළල ප්�රව�චිතයක් භ�විත� කිරීමට
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' ගොනුවෙහි පරිපූර්ණ අනුව�දය භ�විත� කිරීමට
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' 'විකල්ප පෙළ' යන්න විස්තරය ලෙසින් ත�බෙමින් වම් ම�යිමෙහි කොටුවක පික්සල 200 පළල ප්�රව�චිතයක් භ�විත� කිරීමට
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' ගොනුව ප්�රදර්�නය නොකෙරෙමින්  ගොනුවට සෘජු ලෙස සබ�ඳීමට",
 'upload-permitted'            => 'අනුදත් ගොනු වර්ගයන්: $1.',
 'upload-preferred'            => 'අභිප්�රේත ගොනු වර්ගයන්: $1.',
@@ -1181,7 +1373,7 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 'uploadlog'                   => 'උඩුගත කිරීම් ල�ු-සටහන',
 'uploadlogpage'               => 'උඩුගත කිරීම් ල�ු-සටහන',
 'uploadlogpagetext'           => 'ඉත� මෑතදී සිදුකල ගොනු උඩුගතකිරීම් ල�යිස්තුවක් පහත ද�ක්වේ.
-ව�ඩිමනත් දෘ�්�ය සම�ල�චනය සඳහ� [[Special:NewImages|නව ගොනු ග�ලරිය]] බලන්න.',
+ව�ඩිමනත් දෘ�්�ය සම�ල�චනය සඳහ� [[Special:NewFiles|නව ගොනු ග�ලරිය]] බලන්න.',
 'filename'                    => 'ගොනු-නම',
 'filedesc'                    => 'ස�ර�ං�ය',
 'fileuploadsummary'           => 'ස�ර�ං�ය:',
@@ -1195,6 +1387,7 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 කරුණ�කර ගොනුව යළිනම් කොට එය න�වත උඩුගත කිරීමට උත්ස�හ කරන්න.',
 'badfilename'                 => 'ගොනු නම "$1" බවට වෙනස් කර ඇත.',
 'filetype-badmime'            => '"$1" MIME වර්ගයෙහි ගොනු උඩුගත කිරීමට ඉඩ දෙනු නොල�බේ.',
+'filetype-bad-ie-mime'        => 'මෙම ගොනුව උඩුගත කල නොහ�කි වන්නේ ඉන්ටනෙට් එක්ස්ප්ල�රර් විසින් එය,  ප්�රතික්�ෂේප කෙරෙන හ� භව්�ය ලෙසින් අනතුරුද�යක ගොනු ම�දිලියක් වන, "$1" ලෙසින් හඳුන�ග�නෙන බ�විනි.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' යනු අනව�්�ය ගොනු වර්ගයකි.
 රුචිකර {{PLURAL:\$3|ගොනු වර්ගය|ගොනු වර්ගයන්}} වන්නේ  \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' යනු අවසරලත් ගොනු වර්ගයක් නොවේ.
@@ -1206,25 +1399,25 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 'emptyfile'                   => 'ඔබ විසින් උඩුගත කරන ලද ගොනුව හිස් බවක් පෙනේ.
 මෙය සමහරවිට ගොනු  න�මයේ මුද්�රණ ද�ෂයක් නිස� විය හ�ක.
 ඔබට නිස�කවම මෙම ගොනුව උඩුගත කිරීමට අව�්�යයද යන්න පරික්�ෂ� කර බලන්න.',
-'fileexists'                  => 'මෙම නම සහිත ගොනුවක් ද�නටමත් පවතියි, මෙය වෙනස් කල යුතු බවට ඔබට නිස�ක නොවේ නම්, කරුණ�කර <strong><tt>$1</tt></strong> පරික්ෂ� කර බලන්න .',
-'filepageexists'              => 'මෙම ගොනුව සඳහ� විස්තර පිටුව ද�නටමත් <strong><tt>$1</tt></strong> හි තන� ඇති නමුත්, මෙම නම ඇති කිසිදු ගොනුවක් ද�නට නොපවතියි.
+'fileexists'                  => "මෙම නම සහිත ගොනුවක් ද�නටමත් පවතියි, මෙය වෙනස් කල යුතු බවට ඔබට නිස�ක නොවේ නම්, කරුණ�කර '''<tt>$1</tt>''' පරික්ෂ� කර බලන්න .",
+'filepageexists'              => "මෙම ගොනුව සඳහ� විස්තර පිටුව ද�නටමත් '''<tt>$1</tt>''' හි තන� ඇති නමුත්, මෙම නම ඇති කිසිදු ගොනුවක් ද�නට නොපවතියි.
 ඔබ විසින් ඇතුලත් කෙරෙන ස�ර�ං�ය විස්තර පිටුවෙහි දිස් නොවනු ඇත.
-ස�ර�ං�ය එහි දිස්කෙරුමට, හස්තීය ලෙස සංස්කරණය කෙරුම ඔබ විසින් එය සිදුකල යුතුවේ',
-'fileexists-extension'        => 'එක්ව�නි නමක් ඇති ගොනුවක් පවතී:<br />
-උඩුගත කෙරෙන ගොනුවේ නම: <strong><tt>$1</tt></strong><br />
-පවතින ගොනුවේ නම: <strong><tt>$2</tt></strong><br />
-කරුණ�කර වෙනත් නමක් ත�ර�ගන්න.',
+ස�ර�ං�ය එහි දිස්කෙරුමට, හස්තීය ලෙස සංස්කරණය කෙරුම ඔබ විසින් එය සිදුකල යුතුවේ",
+'fileexists-extension'        => "එක්ව�නි නමක් ඇති ගොනුවක් පවතී:<br />
+උඩුගත කෙරෙන ගොනුවේ නම: '''<tt>$1</tt>'''<br />
+පවතින ගොනුවේ නම: '''<tt>$2</tt>'''<br />
+කරුණ�කර වෙනත් නමක් ත�ර�ගන්න.",
 'fileexists-thumb'            => "<center>'''ද�නට පවතින ගොනුව'''</center>",
-'fileexists-thumbnail-yes'    => 'ගොනුව, කුඩ� ප්�රම�ණයේ රූපයක් බව පෙනී යයි <i>(සිඟිති-රූපය)</i>.
-කරුණ�කර <strong><tt>$1</tt></strong> ගොනුව පරික්�ෂ� කර බලන්න.<br />
-පරික්�ෂ� කර බ�ලූ ගොනුවෙහි අඩංගු වන්නේ මුලික ප්�රම�ණයෙහි රූපයම නම් අමතර සිඟිති-රූපයක් උඩුගත කිරීම අව�්�ය නොවේ.',
-'file-thumbnail-no'           => 'ගොනු නම <strong><tt>$1</tt></strong> යන්නෙන් ආරම්භ වේ.
-එය කුඩ�කල ප්�රම�ණයෙහි රූපයක් බව පෙනී යයි  <i>(සිඟිති-රූපය)</i>.
-පූර්ණ විසර්ජනය සහිත මෙම රූපය ඔබ සතු වෙයි නම් මෙය උඩුගත කරන්න, න�තහොත් ගොනු න�මය වෙනස් කරන්න.',
-'fileexists-forbidden'        => 'මෙම නම ඇති ගොනුවක් ද�නටමත් පවතියි.
-කෙසේ හ� ඔබගේ ගොනුව උඩුගත කිරීමට ඔබට ඇව�සි නම්, කරුණ�කර න�වත ගොස් නව නමක් භ�විත� කරන්න. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "ගොනුව, කුඩ� ප්�රම�ණයේ රූපයක් බව පෙනී යයි ''(සිඟිති-රූපය)''.
+කරුණ�කර '''<tt>$1</tt>''' ගොනුව පරික්�ෂ� කර බලන්න.<br />
+පරික්�ෂ� කර බ�ලූ ගොනුවෙහි අඩංගු වන්නේ මුලික ප්�රම�ණයෙහි රූපයම නම් අමතර සිඟිති-රූපයක් උඩුගත කිරීම අව�්�ය නොවේ.",
+'file-thumbnail-no'           => "ගොනු නම '''<tt>$1</tt>''' යන්නෙන් ආරම්භ වේ.
+එය කුඩ�කල ප්�රම�ණයෙහි රූපයක් බව පෙනී යයි  ''(සිඟිති-රූපය)''.
+පූර්ණ විසර්ජනය සහිත මෙම රූපය ඔබ සතු වෙයි නම් මෙය උඩුගත කරන්න, න�තහොත් ගොනු න�මය වෙනස් කරන්න.",
+'fileexists-forbidden'        => 'මෙම නම ඇති ගොනුවක් ද�නටමත් පවතින අතර, එය උඩින් ලීවීම සිදුකල නොහ�ක.
+කෙසේ හ� ඔබගේ ගොනුව උඩුගත කිරීමට ඔබට ඇව�සි නම්, කරුණ�කර න�වත ගොස් නව නමක් භ�විත� කරන්න. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'මෙම නම සහිත ගොනුවක් හවුල් ගොනු සුරක්�ෂිත�ග�රයෙහි ද�නටමත් පවතියි.
-ඔබ හ�ට මෙම ගොනුව උඩුගත කිරීම කෙසේ හ� සිදුකිරීමට ඇව�සි නම්, කරුණ�කර පෙරළ� ගොස් අළුත් නමක් භ�විත� කරන්න. [[Image:$1|thumb|center|$1]]',
+ඔබ හ�ට මෙම ගොනුව උඩුගත කිරීම කෙසේ හ� සිදුකිරීමට ඇව�සි නම්, කරුණ�කර පෙරළ� ගොස් අළුත් නමක් භ�විත� කරන්න. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'මෙම ගොනුව පහත  {{PLURAL:$1|ගොනුවෙහි|ගොනු වල}} අනුපිටපතකි:',
 'successfulupload'            => 'ස�ර්ථක උඩුගත කිරීමකි',
 'uploadwarning'               => 'උඩුගත කිරීම් අවව�දයකි',
@@ -1247,8 +1440,8 @@ latex, dvips, gs, à·„à·� convert à·„à·“ නිදොස්  ස්ථà·�පනà¶
 
 මෙම ගොනුව උඩුගත කිරීම සිදුකරගෙනය�ම  ය�ග්�යද යන බව ඔබ විසින් සලක� බ�ලිය යුතුය.
 ඔබගේ පහසුව සඳහ� මක�ද�මුම් ල�ු-සටහන මෙහි දක්ව� ඇත:",
-'filename-bad-prefix'         => 'ඔබ උඩුගත කරන ගොනුවේ නම, ස�ම�න්�යයෙන් ස්වයංක්�රීය ලෙස ඩිජිටල් ක�මර� විසින් අනුගත කෙරෙන  අව්�ය�ක්�ය�ත්මක නමක් වන <strong>"$1"</strong> යන්නෙන් ආරම්භ වෙයි,.
-වඩ�ත් ව්�ය�ක�ත්මක නමක් ඔබගේ ගොනුව සඳහ� ත�ර�ග�නුමට ක�රුණික වන්න.',
+'filename-bad-prefix'         => "ඔබ උඩුගත කරන ගොනුවේ නම, ස�ම�න්�යයෙන් ස්වයංක්�රීය ලෙස ඩිජිටල් ක�මර� විසින් අනුගත කෙරෙන  අව්�ය�ක්�ය�ත්මක නමක් වන '''\"\$1\"''' යන්නෙන් ආරම්භ වෙයි,.
+වඩ�ත් ව්�ය�ක�ත්මක නමක් ඔබගේ ගොනුව සඳහ� ත�ර�ග�නුමට ක�රුණික වන්න.",
 'filename-prefix-blacklist'   => '#<!-- මෙම පේළිය මෙලෙසම ප�වතීමට ඉඩදෙන්න --> <pre>
 # ව�ග් රීතිය පහත පරිදිය:
 #   * "#" අක්ෂරයෙහි සිට පේළි අග දක්ව� සියල්ල පරිකථනයක් වේ
@@ -1289,20 +1482,20 @@ PICT # විවිධ.
 'upload_source_url'  => ' (නීතික, ප්�රජ�ව විසින් ප්�රවේ�්�ය කල�ප ලිපිනය (URL) කි)',
 'upload_source_file' => ' (ඔබගේ පරිගණකයේ ගොනුවකි)',
 
-# Special:ImageList
-'imagelist-summary'     => 'මෙම වි�ේෂ පිටුවෙහි ද�ක්වෙන්නේ සියළු උඩුගත කල ගොනුය.
+# Special:ListFiles
+'listfiles-summary'     => 'මෙම වි�ේෂ පිටුවෙහි ද�ක්වෙන්නේ සියළු උඩුගත කල ගොනුය.
 අවස�නයට උඩුගත කල ගොනු පෙරනිමියෙන් ල�යිස්තුවෙහි ඉහළින්ම ද�ක්වේ.
 පේළි �ීර්ෂකය ක්ලික් කිරීමෙන් සුබෙදුම් පටිප�ටිය වෙනස් කල හ�ක.',
-'imagelist_search_for'  => 'ම�ධ්�ය න�මය සඳහ� ගවේෂණය කරන්න:',
+'listfiles_search_for'  => 'ම�ධ්�ය න�මය සඳහ� ගවේෂණය කරන්න:',
 'imgfile'               => 'ගොනුව',
-'imagelist'             => 'ගොනු ල�යිස්තුව',
-'imagelist_date'        => 'දිනය',
-'imagelist_name'        => 'නම',
-'imagelist_user'        => 'පරි�ීලක',
-'imagelist_size'        => 'වි��ලත්වය',
-'imagelist_description' => 'විස්තරය',
-
-# Image description page
+'listfiles'             => 'ගොනු ල�යිස්තුව',
+'listfiles_date'        => 'දිනය',
+'listfiles_name'        => 'නම',
+'listfiles_user'        => 'පරි�ීලක',
+'listfiles_size'        => 'වි��ලත්වය',
+'listfiles_description' => 'විස්තරය',
+
+# File description page
 'filehist'                       => 'ගොනු ඉතිහ�සය',
 'filehist-help'                  => 'එම අවස්ථ�වෙහිදී  ගොනුව ප�ව�ති ආක�රය න�රඹීම ඔබ හට රිසි නම්  දිනය/වේල�ව මත ක්ලික් කරන්න.',
 'filehist-deleteall'             => 'සියල්ල මකන්න',
@@ -1310,12 +1503,18 @@ PICT # විවිධ.
 'filehist-revert'                => 'ප්�රතිවර්තනය',
 'filehist-current'               => 'වත්මන්',
 'filehist-datetime'              => 'දිනය/ක�ලය',
+'filehist-thumb'                 => 'සිඟිති-රූපය',
+'filehist-thumbtext'             => ' $1වන විට අනුව�දය සඳහ� සිඟිති-රූපය',
+'filehist-nothumb'               => 'සිඟිති-රූපයක් නොම�ත',
 'filehist-user'                  => 'පරි�ීලක',
 'filehist-dimensions'            => 'ම�න',
 'filehist-filesize'              => 'ගොනුවේ වි��ලත්වය',
 'filehist-comment'               => 'පරිකථනය',
-'imagelinks'                     => 'සබ�ඳියන්',
+'imagelinks'                     => 'ගොනු සබ�ඳියන්',
 'linkstoimage'                   => 'මෙම ගොනුවට  {{PLURAL:$1|ලිපිය බ��ඳෙයි|ලිපි $1 ක් බ�ඳෙති}}:',
+'linkstoimage-more'              => 'මෙම ගොනුවට {{PLURAL:$1|පිටුවකට |පිටු  $1 කට}} වඩ� ව�ඩි ගණනක් සබ��ඳේ.
+මෙම පිටුවට පමණක් අද�ළ වන {{PLURAL:$1|පළමු පිටු සබ�ඳිය|පළමු පිටු සබ�ඳියන් $1 }} මෙහි පහත ල�යිස්තුවෙහි ද�ක්වේ.
+ [[Special:WhatLinksHere/$2|සම්පූර්ණ ල�යිස්තුව]]ක්ද තිබේ.',
 'nolinkstoimage'                 => 'මෙම ගොනුවට සබ�ඳෙන පිටු කිසිවක් නොම�ත.',
 'morelinkstoimage'               => 'මෙම ගොනුව සඳහ� [[Special:WhatLinksHere/$1|තවත් සබ�ඳි]] තිබේද�යි නරඹන්න.',
 'redirectstofile'                => 'පහත {{PLURAL:$1|ගොනුව මෙම ගොනුව කර� යළි-යොමුවේ|ගොනු $1 මෙම ගොනුව කර� යළි-යොමුවෙති}} :',
@@ -1348,7 +1547,7 @@ PICT # විවිධ.
 'filedelete'                  => '$1 මකන්න',
 'filedelete-backlink'         => '� $1',
 'filedelete-legend'           => 'ගොනුව මකන්න',
-'filedelete-intro'            => "ඔබ විසින්   '''[[Media:$1|$1]]''' මක� දමමින් පවතියි.",
+'filedelete-intro'            => "ඔබ විසින්  '''[[Media:$1|$1]]'''ගොනුව, එහි සමස්ත ඉතිහ�සය සමගින් මක� ද�මීමට ආසන්නයේ පවතියි.",
 'filedelete-intro-old'        => "ඔබ විසින් මක� දමමින් පවතින්නේ [$4 $3, $2] වන විට '''[[Media:$1|$1]]''' හි අනුව�දයයි.",
 'filedelete-comment'          => 'මක� ද�මීමට හේතුව:',
 'filedelete-submit'           => 'මක� දමන්න',
@@ -1384,17 +1583,31 @@ PICT # විවිධ.
 
 # Random page
 'randompage'         => 'අහඹු පිටුව',
-'randompage-nopages' => 'මෙම න�ම-අවක��යෙහි කිසිදු පිටුවක් නොම�ත.',
+'randompage-nopages' => '"$1" න�ම-අවක��යෙහි කිසිදු පිටුවක් නොම�ත.',
 
 # Random redirect
 'randomredirect'         => 'අහුඹු යළි-යොමුකිරීම',
-'randomredirect-nopages' => 'මෙම න�ම-අවක��යෙහි යළි-යොමුවීම් නොම�ත.',
+'randomredirect-nopages' => '"$1" න�ම-අවක��යෙහි යළි-යොමුවීම් නොම�ත.',
 
 # Statistics
-'statistics'             => 'සංඛ්�ය�න දත්ත',
-'sitestats'              => '{{SITENAME}} සංඛ්�ය�න දත්ත',
-'userstats'              => 'පරි�ීලක සංඛ්�ය�න දත්ත',
-'statistics-mostpopular' => 'බෙහෙවින් නරඹනු ලබන පිටු',
+'statistics'                   => 'සංඛ්�ය�න දත්ත',
+'statistics-header-pages'      => 'පිටුවල සංඛ්�ය�න දත්ත',
+'statistics-header-edits'      => 'සංස්කරණ වල සංඛ්�ය�න දත්ත',
+'statistics-header-views'      => 'න�රඹුම් වල සංඛ්�ය�න දත්ත',
+'statistics-header-users'      => 'පරි�ීලකයන් පිළිබඳ සංඛ්�ය�න දත්ත',
+'statistics-articles'          => 'අන්තර්ගත  පිටු',
+'statistics-pages'             => 'පිටු',
+'statistics-pages-desc'        => 'ස�කච්ඡ� පිටු, යළි-යොමුවීම් ආදිය ඇතුළු විකියෙහි සියළු පිටු.',
+'statistics-files'             => 'උඩුගතකරන ලද ගොනු',
+'statistics-edits'             => '{{SITENAME}} පිහිටුවීමෙන් අනතුරුව සිදුවූ පිටු සංස්කරණයන්',
+'statistics-edits-average'     => 'එක් පිටුවකට සංස්කරණයන්හි  මධ්�යක අගය',
+'statistics-views-total'       => 'න�රඹුම් එකතුව',
+'statistics-views-peredit'     => 'එක් සංස්කරණයකට න�රඹුම් ගණන',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue ක�ර්යය ප�ලිමෙහි] දිග',
+'statistics-users'             => 'ලේඛනගත  [[Special:ListUsers|පරි�ීලකය�]]',
+'statistics-users-active'      => 'ක්�රිය��ීලි පරි�ීලකයන්',
+'statistics-users-active-desc' => 'පසුගිය {{PLURAL:$1|දිනය|දින $1}} තුලදී කිසියම් ක්�රිය�වක් සිදු කල පරි�ීලකයන්',
+'statistics-mostpopular'       => 'බෙහෙවින් නරඹනු ලබන පිටු',
 
 'disambiguations'      => 'වක්�ර�ත්තිහරණ පිටු',
 'disambiguationspage'  => 'Template:වක්�ර�ත්තිහරණ',
@@ -1409,7 +1622,7 @@ PICT # විවිධ.
 'double-redirect-fixer'      => 'යළි-යොමුවීම් උපස්ථ�යක',
 
 'brokenredirects'        => 'භින්න යළි-යොමුවීම්',
-'brokenredirectstext'    => 'මෙහි පහත ද�ක්වෙන යළි-යොමුවීම් නොපවතින පිටු වලට සබ�ඳේ.',
+'brokenredirectstext'    => 'මෙහි පහත ද�ක්වෙන යළි-යොමුවීම් නොපවතින පිටු වලට සබ�ඳේ:',
 'brokenredirects-edit'   => '(සංස්කරණය)',
 'brokenredirects-delete' => '(මක� ද�මීම)',
 
@@ -1439,25 +1652,30 @@ PICT # විවිධ.
 'popularpages'            => 'ජනප්�රිය පිටු',
 'wantedcategories'        => 'අව�්�ය ප්�රවර්ග',
 'wantedpages'             => 'අව�්�ය පිටු',
+'wantedfiles'             => 'අව�්�ය ගොනු',
+'wantedtemplates'         => 'අව�්�ය ස�කිලි',
 'mostlinked'              => 'පිටු වලට බෙහෙවින්ම සබ�ඳි',
 'mostlinkedcategories'    => 'ප්�රවර්ගයන්ට බෙහෙවින්ම සබ�ඳි',
 'mostlinkedtemplates'     => 'ස�කිලි වලට බෙහෙවින්ම සබ�ඳි',
 'mostcategories'          => 'ප්�රවර්ගයන් බොහ�මයක් සහිත පිටු',
 'mostimages'              => 'ගොනු වලට බෙහෙවින්ම සබ�ඳි',
 'mostrevisions'           => 'වඩ�ත්ම සං��ධන සහිත පිටු',
-'prefixindex'             => 'උපසර්ග සූචිය',
+'prefixindex'             => 'උපසර්ගය සහිත සියළු පිටු',
 'shortpages'              => 'කෙටි පිටු',
 'longpages'               => 'දිගු පිටු',
 'deadendpages'            => 'ආවෘත-අග�ති පිටු',
 'deadendpagestext'        => 'පහත පිටු, {{SITENAME}} හි අනෙකුත් පිටු වෙත සබ�ඳී නොම�ත.',
 'protectedpages'          => 'ආරක්ෂිත පිටු',
 'protectedpages-indef'    => 'අනි�්චිත ආරක්ෂණයන් පමණයි',
+'protectedpages-cascade'  => 'තීරු-දර්�න ආරක්ෂණයන් පමණයි',
 'protectedpagestext'      => 'ඉදිරියේ ද�ක්වෙන පිටු ගෙනය�ම හ� සංස්කරණය කිරීම හ� ව�රණය කොට ඇත',
 'protectedpagesempty'     => 'මෙම පර�මිතීන් හ� සමග ස�ලකූ කල,  කිසිදු පිටුවක් ද�නට ආරක්ෂිත වී නොම�ත.',
 'protectedtitles'         => 'ආරක්�ෂිත �ීර්ෂයන්',
 'protectedtitlestext'     => 'පහත ද�ක්වෙන �ීර්ෂයන් ත�නිය නොහ�කි වන පරිදි ආරක්�ෂණය කොට ඇත',
 'protectedtitlesempty'    => 'මෙම පර�මිතීන් හ� සමග ස�ලකූ කල, කිසිදු �ීර්ෂයක් ද�නට ආරක්ෂිත වී නොම�ත.',
 'listusers'               => 'පරි�ීලක ල�යිස්තුව',
+'listusers-editsonly'     => 'සංස්කරණයන් සිදුකර ඇති පරි�ීලකයන් පමණක් පෙන්වන්න',
+'usereditcount'           => ' {{PLURAL:$1|සංස්කරණ එකකි|සංස්කරණ $1 කි}}',
 'newpages'                => 'අළුත් පිටු',
 'newpages-username'       => 'පරි�ීලක-න�මය:',
 'ancientpages'            => 'පුර�ණතම පිටු',
@@ -1485,8 +1703,6 @@ PICT # විවිධ.
 'speciallogtitlelabel' => '�ීර්ෂය:',
 'log'                  => 'ල�ු-සටහන්',
 'all-logs-page'        => 'සියළු ල�ු-සටහන්',
-'log-search-legend'    => 'ල�ු-සටහන් සඳහ� ගවේෂණය කරන්න',
-'log-search-submit'    => 'යන්න',
 'alllogstext'          => '{{SITENAME}} හි සියළු සුගම ල�ු-සටහන් හි සංයුක්ත සංදර්�කය.
 ල�ු-සටහන් වර්ගය, පරි�ීලක න�මය හ�  බලපෑම එල්ල වූ පිටුව ත�ර�ග�නුමෙන් ඔබහට න�රඹුමෙහි පුළුල අඩු කර ගත හ�ක.',
 'logempty'             => 'ල�ු-සටහනෙහි ග�ලපෙන අයිතමයන් කිසිවක් නොම�ත.',
@@ -1498,6 +1714,7 @@ PICT # විවිධ.
 'nextpage'          => 'ඊළඟ පිටුව ($1)',
 'prevpage'          => 'පූර්ව පිටුව ($1)',
 'allpagesfrom'      => 'මෙහිදී ඇරඹෙන පිටු පෙන්වන්න:',
+'allpagesto'        => 'මෙහිදී කෙළවර වන පිටු පෙන්වන්න:',
 'allarticles'       => 'සියළු පිටු',
 'allinnamespace'    => 'සියළු පිටු ($1 න�මඅවක��ය)',
 'allnotinnamespace' => 'සියළු පිටු ($1 න�මඅවක��යෙහි නොම�ති)',
@@ -1518,20 +1735,45 @@ PICT # විවිධ.
 'special-categories-sort-count' => 'ගණණය පරිදි  සුබෙදුම',
 'special-categories-sort-abc'   => 'අක�ර�දියේ පිළිවෙලට සුබෙදන්න',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'මක�ද�මූ පරි�ීලක ද�යකත්වයන්',
+
+# Special:LinkSearch
+'linksearch'       => 'බ�හිර සබ�ඳි',
+'linksearch-pat'   => 'ගවේෂණ රට�ව:',
+'linksearch-ns'    => 'න�ම-අවක��ය:',
+'linksearch-ok'    => 'ගවේෂණය',
+'linksearch-text'  => '"*.wikipedia.org" ව�නි ආදේ�ක භ�විත� කල හ�ක.<br />
+පිටුවහල් වෙන මූලලේඛයන්: <tt>$1</tt>',
+'linksearch-line'  => '$2 වෙතින් $1 සබ�ඳිණි',
+'linksearch-error' => 'ආදේ�ක  පෙනීසිටිය හ�ක්කේ සත්ක�රකන�මය ආරම්භයෙහි පමණයි.',
+
 # Special:ListUsers
 'listusersfrom'      => '�මෙම අකුරෙන් පටන්ගෙන පරි�ීලකයන් ප්�රදර්�නය කරන්න:',
 'listusers-submit'   => 'පෙන්වන්න',
 'listusers-noresult' => 'පරි�ීලකයෙකු සොය�ගත නොහ�කි විය.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'පරි�ීලකයන් ත�නීමේ ල�ු-සටහන',
+'newuserlogpagetext'          => 'මෙය පරි�ිලකයන් ත�නීම පිළිබඳ ල�ු-සටහනකි.',
+'newuserlog-byemail'          => 'විද්�යුත්-ත�පෑලෙන් මුර-පදය යවන ලදි',
+'newuserlog-create-entry'     => 'නව පරි�ීලක',
+'newuserlog-create2-entry'    => '$1 නව ගිණුම තනන ලදි',
+'newuserlog-autocreate-entry' => 'ගිණුම ස්වයංක්�රීයව තනන ලදි',
+
 # Special:ListGroupRights
-'listgrouprights'               => 'පරි�ීලක ක�ණ්ඩ හිමිකම්',
-'listgrouprights-summary'       => 'මෙම විකියේ අර්ථදක්ව� ඇති පරි�ීලක ක�ණ්ඩ ල�යිස්තුවක් ඔවුනට අද�ළ ප්�රවේ� හිමිකම්ද සමගින් මෙහි පහත ල�යිස්තුගත කොට ඇත.
+'listgrouprights'                 => 'පරි�ීලක ක�ණ්ඩ හිමිකම්',
+'listgrouprights-summary'         => 'මෙම විකියේ අර්ථදක්ව� ඇති පරි�ීලක ක�ණ්ඩ ල�යිස්තුවක් ඔවුනට අද�ළ ප්�රවේ� හිමිකම්ද සමගින් මෙහි පහත ල�යිස්තුගත කොට ඇත.
 පුද්ගලික හිමිකම් පිළිබඳ  [[{{MediaWiki:Listgrouprights-helppage}}|ව�ඩිමනත් තොරතුරු]] ප�වතිය හ�ක.',
-'listgrouprights-group'         => 'ක�ණ්ඩය',
-'listgrouprights-rights'        => 'හිමිකම්',
-'listgrouprights-helppage'      => 'Help:ක�ණ්ඩ හිමිකම්',
-'listgrouprights-members'       => '(පරි�ිලකයන් ල�යිස්තුව)',
-'listgrouprights-right-display' => '$1 ($2)',
+'listgrouprights-group'           => 'ක�ණ්ඩය',
+'listgrouprights-rights'          => 'හිමිකම්',
+'listgrouprights-helppage'        => 'Help:ක�ණ්ඩ හිමිකම්',
+'listgrouprights-members'         => '(පරි�ිලකයන් ල�යිස්තුව)',
+'listgrouprights-right-display'   => '$1 ($2)',
+'listgrouprights-addgroup'        => '{{PLURAL:$2|කණ්ඩ�යම|කණ්ඩ�යම්}} එක් කල හ�ක: $1',
+'listgrouprights-removegroup'     => '{{PLURAL:$2|කණ්ඩ�යම|කණ්ඩ�යම්}} ඉවත් කල හ�ක: $1',
+'listgrouprights-addgroup-all'    => 'සියළු කණ්ඩ�යම් එක් කල හ�ක',
+'listgrouprights-removegroup-all' => 'සියළු කණ්ඩ�යම් �ඉවත් කල හ�ක',
 
 # E-mail user
 'mailnologin'     => 'ය�යුතු ලිපිනය නොම�ත',
@@ -1543,7 +1785,8 @@ PICT # විවිධ.
 'usermailererror' => 'ත�ප�ල් ආරම්මණය පෙරළ� ද�ක්වූ ද�ෂය:',
 'defemailsubject' => '{{SITENAME}} විද්�යුත්-ත�පෑල',
 'noemailtitle'    => 'විද්�යුත්-ත�ප�ල් ලිපිනයක් නොම�ත',
-'noemailtext'     => 'මෙම පරි�ීලකය� නීතික විද්�යුත්-ත�ප�ල් ලිපිනයක් සඳහන් කර න�තුව� හ�, අනෙකුන්ගෙන් විද්�යුත්-ත�ප�ල් නොල�බීම මන� ය�යි ත�ර�ගෙන හ� වේ.',
+'noemailtext'     => 'මෙම පරි�ීලකය� නීතික විද්�යුත්-ත�ප�ල් ලිපිනයක් සඳහන් කර න�ත.',
+'email-legend'    => 'වෙනත් {{SITENAME}} පරි�ීලකයෙකුට විද්�යුත්-ත�පෑලක් යවන්න',
 'emailfrom'       => 'වෙතින්:',
 'emailto'         => 'වෙතට:',
 'emailsubject'    => 'විෂයය:',
@@ -1584,12 +1827,7 @@ PICT # විවිධ.
 'iteminvalidname'      => "'$1' අයිතමය පිළිබඳ ග�ටළුවක් ඇත, අනීතික නමකි...",
 'wlnote'               => "පහත ද�ක්වෙන්නේ, අවසන් {{PLURAL:$2|ප�ය|ප�ය '''$2''' }} තුලදී සිදු කෙරී ඇති {{PLURAL:$1|අවසන් වෙනස්වීම්යි |අවසන් වෙනස්වීම්  '''$1''' යි}}.",
 'wlshowlast'           => 'අවසන් ප�ය  $1 දින  $2  $3 පෙන්වන්න',
-'watchlist-show-bots'  => 'රොබ� සංස්කරණයන් පෙන්වන්න',
-'watchlist-hide-bots'  => 'රොබ� සංස්කරණ සඟවන්න',
-'watchlist-show-own'   => 'ම�ගේ සංස්කරණයන් පෙන්වන්න',
-'watchlist-hide-own'   => 'ම�ගේ සංස්කරණ සඟවන්න',
-'watchlist-show-minor' => 'සුළු සංස්කරණයන් පෙන්වන්න',
-'watchlist-hide-minor' => 'සුළු සංස්කරණ සඟවන්න',
+'watchlist-options'    => 'මුර-ල�යිස්තු විකල්ප',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'මුර කරමින්...',
@@ -1630,65 +1868,71 @@ $NEWPAGE
 ප්�රතිප�ෂණය හ� ව�ඩිමනත්  සහ�ය:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'පිටුව මක� දමන්න',
-'confirm'                     => 'තහවුරු කරන්න',
-'excontent'                   => "අන්තර්ගතය වූයේ: '$1'",
-'excontentauthor'             => "අන්තර්ගතය වූයේ: '$1' (හ� එකම ද�යකය� වූයේ  '[[Special:Contributions/$2|$2]]' පමණි)",
-'exbeforeblank'               => "හිස්කිරීමට පෙර�තුව ප�ව�ති අන්තර්ගතය වූයේ: '$1'",
-'exblank'                     => 'පිටුව හිස්ව ප�වතිණි',
-'delete-confirm'              => '"$1" මක� දමන්න',
-'delete-backlink'             => '� $1',
-'delete-legend'               => 'මකන්න',
-'historywarning'              => 'අවව�දයයි: ඔබ විසින් මක� ද�මීමට සූද�නම් වන පිටුවට ඉතිහ�සයක් ඇත:',
-'confirmdeletetext'           => 'එහි සමස්ත ඉතිහ�සය හ� සමගින් පිටුවක් මක� ද�මීමට ඔබ ස�රසෙයි.
+# Delete
+'deletepage'             => 'පිටුව මක� දමන්න',
+'confirm'                => 'තහවුරු කරන්න',
+'excontent'              => "අන්තර්ගතය වූයේ: '$1'",
+'excontentauthor'        => "අන්තර්ගතය වූයේ: '$1' (හ� එකම ද�යකය� වූයේ  '[[Special:Contributions/$2|$2]]' පමණි)",
+'exbeforeblank'          => "හිස්කිරීමට පෙර�තුව ප�ව�ති අන්තර්ගතය වූයේ: '$1'",
+'exblank'                => 'පිටුව හිස්ව ප�වතිණි',
+'delete-confirm'         => '"$1" මක� දමන්න',
+'delete-backlink'        => '� $1',
+'delete-legend'          => 'මකන්න',
+'historywarning'         => 'අවව�දයයි: ඔබ විසින් මක� ද�මීමට සූද�නම් වන පිටුවට ඉතිහ�සයක් ඇත:',
+'confirmdeletetext'      => 'එහි සමස්ත ඉතිහ�සය හ� සමගින් පිටුවක් මක� ද�මීමට ඔබ ස�රසෙයි.
 ඔබගේ අභිමත�ර්ථය මෙයමද�යි අවල�කනය කරමින්, මෙහි ප්�රතිවිප�ක මුළුමනින් ඔබ විසින් අවබ�ධ කරගෙන ඇති බවට සෑහීමට පත් වෙමින් හ�, ඔබ මෙය සිදුකරන්නේ  [[{{MediaWiki:Policy-url}}|ප්�රතිපත්තියට]] අනුකූලවද�යි විමස� බලන්න.',
-'actioncomplete'              => 'ක්�රිය�ව පරිසම�ප්තයි',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" මක� දම� ඇත.
+'actioncomplete'         => 'ක්�රිය�ව පරිසම�ප්තයි',
+'deletedtext'            => '"<nowiki>$1</nowiki>" මක� දම� ඇත.
 මෑත මක�ද�මීම් පිළිබඳ ව�ර්ත�වක් සඳහ� $2 බලන්න.',
-'deletedarticle'              => '"[[$1]]" මක� දමන ලදි',
-'suppressedarticle'           => '"[[$1]]" යටපත් කෙරිණි',
-'dellogpage'                  => 'මක�-ද�මීම් ල�ු සටහන',
-'dellogpagetext'              => 'පහත ද�ක්වෙන්නේ ඉත� මෑතදී සිදු කර ඇති මක�ද�මීම් ල�යිස්තුවකි.',
-'deletionlog'                 => 'මක�-ද�මුම් ල�ු-සටහන',
-'reverted'                    => 'ප�රණි සං��ධනය වෙත ප්�රතිවර්තනය කෙරිණි',
-'deletecomment'               => 'මක� ද�මීමට හේතුව:',
-'deleteotherreason'           => 'අනෙකුත්/අමතර හේතුව:',
-'deletereasonotherlist'       => 'අනෙකුත් හේතුව',
-'deletereason-dropdown'       => '*ස�ම�න්�ය මක�ද�මීම් හේතූන්
+'deletedarticle'         => '"[[$1]]" මක� දමන ලදි',
+'suppressedarticle'      => '"[[$1]]" යටපත් කෙරිණි',
+'dellogpage'             => 'මක�-ද�මීම් ල�ු සටහන',
+'dellogpagetext'         => 'පහත ද�ක්වෙන්නේ ඉත� මෑතදී සිදු කර ඇති මක�ද�මීම් ල�යිස්තුවකි.',
+'deletionlog'            => 'මක�-ද�මුම් ල�ු-සටහන',
+'reverted'               => 'ප�රණි සං��ධනය වෙත ප්�රතිවර්තනය කෙරිණි',
+'deletecomment'          => 'මක� ද�මීමට හේතුව:',
+'deleteotherreason'      => 'අනෙකුත්/අමතර හේතුව:',
+'deletereasonotherlist'  => 'අනෙකුත් හේතුව',
+'deletereason-dropdown'  => '*ස�ම�න්�ය මක�ද�මීම් හේතූන්
 ** කතෘගේ ඉල්ලීම
 ** හිමිකම් උල්ලං�නය
 ** වන්ධල්�යය',
-'delete-edit-reasonlist'      => 'සංස්කරණ මක� ද�මීම් හේතු',
-'delete-toobig'               => '{{PLURAL:$1|එක් සං��ධනයකට|සං��ධන $1 කට}} වඩ� ව�ඩි, වි��ල සංස්කරණ ඉතිහ�සයක් මෙම පිටුව සතු වෙයි.
+'delete-edit-reasonlist' => 'සංස්කරණ මක� ද�මීම් හේතු',
+'delete-toobig'          => '{{PLURAL:$1|එක් සං��ධනයකට|සං��ධන $1 කට}} වඩ� ව�ඩි, වි��ල සංස්කරණ ඉතිහ�සයක් මෙම පිටුව සතු වෙයි.
 අනවධ�නය නිස�  {{SITENAME}}හි සිදුවිය හ�කි අක්�රමවත්වීම් වලකනු වස්, මෙව�නි පිටු මක�ද�මීම පිළිබඳ සීම� තහංචි පනව� ඇත.',
-'delete-warning-toobig'       => 'මෙම පිටුවට, {{PLURAL:$1|එක් සං��ධනයකට|සං��ධන $1 කට}} වඩ� ව�ඩි වි��ල සංස්කරණ ඉතිහ�සයක් ඇත.
+'delete-warning-toobig'  => 'මෙම පිටුවට, {{PLURAL:$1|එක් සං��ධනයකට|සං��ධන $1 කට}} වඩ� ව�ඩි වි��ල සංස්කරණ ඉතිහ�සයක් ඇත.
 මෙය මක�ද�මීම  {{SITENAME}} හි දත්ත-ගබඩ� ක්�රිය�ක�රකම් වලට අවහිරත� ප�න න�ංවීමට හේතු විය හ�ක;
 පරිස්සමින් ඉදිරි කටයුතු කරන්න.',
-'rollback'                    => 'සංස්කරණයන් පුනර�වර්තනය කරන්න',
-'rollback_short'              => 'පුනර�වර්තනය',
-'rollbacklink'                => 'පුනර�වර්තනය',
-'rollbackfailed'              => 'පුනර�වර්තනය අස�ර්ථකයි',
-'cantrollback'                => 'සංස්කරණය ප්�රතිවර්තනය කල නොහ�ක;
+
+# Rollback
+'rollback'         => 'සංස්කරණයන් පුනර�වර්තනය කරන්න',
+'rollback_short'   => 'පුනර�වර්තනය',
+'rollbacklink'     => 'පුනර�වර්තනය',
+'rollbackfailed'   => 'පුනර�වර්තනය අස�ර්ථකයි',
+'cantrollback'     => 'සංස්කරණය ප්�රතිවර්තනය කල නොහ�ක;
 අවසන් ද�යකය� මෙම පිටුවේ එකම කතෘවරය�ද වෙයි.',
-'alreadyrolled'               => '[[User:$2|$2]] ([[User talk:$2|ස�කච්ඡ�ව]] | [[Special:Contributions/$2|{{int:contribslink}}]]) විසින් සිදුකල  [[:$1]] හි අවස�න සං��ධනය  පුනර�වර්තනය කල නොහ�ක;
+'alreadyrolled'    => '[[User:$2|$2]] ([[User talk:$2|ස�කච්ඡ�ව]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) විසින් සිදුකල  [[:$1]] හි අවස�න සං��ධනය  පුනර�වර්තනය කල නොහ�ක;
 වෙනත් අයෙකු අතින් පිටුව ද�නටමත් සංස්කරණය වී හ� පුනර�වර්තනය වී ඇත.
 
-පිටුවට අවසන් සංස්කරණය සිදුකොට ඇත්තේ [[User:$3|$3]] ([[User talk:$3|ස�කච්ඡ�ව]] | [[Special:Contributions/$3|{{int:contribslink}}]]) විසිනි.',
-'editcomment'                 => 'සංස්කරණ පරිකථනය වූයේ: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|ස�කච්ඡ�ව]]) ගේ සංස්කරණයන්  [[User:$1|$1]] ගේ අවසන් අනුව�දය වෙත ප්�රතිවර්තනය කෙරිණි', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => ' $1 විසින් සිදුකල සංස්කරණයන් ප්�රතිවර්තනය කරන ලදි;
+පිටුවට අවසන් සංස්කරණය සිදුකොට ඇත්තේ [[User:$3|$3]] ([[User talk:$3|ස�කච්ඡ�ව]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) විසිනි.',
+'editcomment'      => "සංස්කරණ ස�ර�ං�ය වූයේ: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|ස�කච්ඡ�ව]]) ගේ සංස්කරණයන්  [[User:$1|$1]] ගේ අවසන් අනුව�දය වෙත ප්�රතිවර්තනය කෙරිණි', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => ' $1 විසින් සිදුකල සංස්කරණයන් ප්�රතිවර්තනය කරන ලදි;
 $2 ගේ අවසන් අනුව�දය වෙතට යළි වෙනස් කරන ලදි .',
-'sessionfailure'              => 'ඔබගේ ප්�රවිෂ්ට වීමේ ස�සියෙහි කිසියම් ග�ටළුක�රී තත්ත්වයක් ප�න න�ගී ඇත;
+'sessionfailure'   => 'ඔබගේ ප්�රවිෂ්ට වීමේ ස�සියෙහි කිසියම් ග�ටළුක�රී තත්ත්වයක් ප�න න�ගී ඇත;
 ස�සි පරිග්�රහණයට එරෙහි ආරක්ෂිත පියවරක් ලෙස මෙම ක්�රිය�ව අත්හ�රදම� ඇත.
 "පසුපසට" බොත්තම ක්ලික් කර ඔබ ප�මිණි පිටුව යළිපූරණය නොට න�වත උත්ස�හ කරන්න.',
+
+# Protect
 'protectlogpage'              => 'ආරක්ෂණය කිරීම් ද�ක්වෙන ල�ු-සටහන',
 'protectlogtext'              => 'පිටු ඇවුරුම් හ� ඇවුරුම් අවලංගු කිරීම් ල�යිස්තුවක් පහත ද�ක්වේ.
 ද�නට ක්�රිය�ත්මක වන පිටු ආරක්ෂණයන් ල�යිස්තුවක් සඳහ� [[Special:ProtectedPages|ආරක්ෂිත පිටු ල�යිස්තුව]] බලන්න.',
 'protectedarticle'            => '"[[$1]]" ආරක්�ෂණය කරන ලදි',
 'modifiedarticleprotection'   => ' "[[$1]]" සඳහ� ආරක්�ෂණ මට්ටම වෙනස් කෙරිණි',
 'unprotectedarticle'          => '"[[$1]]" හි ආරක්�ෂණය අවලංගු කෙරිණි',
+'movedarticleprotection'      => '"[[$2]]" සිට "[[$1]]" දක්ව� ආරක්ෂණ පරිස්ථිතීන් ගෙනයන ලදි',
 'protect-title'               => ' "$1" සඳහ� ආරක්�ෂණ මට්ටම වෙනස් කරන්න',
+'prot_1movedto2'              => '[[$2]] දක්ව� [[$1]] ගෙනයන ලදි',
 'protect-backlink'            => '� $1',
 'protect-legend'              => 'ආරක්�ෂණය තහවුරු කරන්න',
 'protectcomment'              => 'පරිකථනය:',
@@ -1696,23 +1940,36 @@ $2 ගේ අවසන් අනුව�දය වෙතට යළි වෙන
 'protect_expiry_invalid'      => 'අනීතික ඉකුත් වීමේ ක�ලයකි.',
 'protect_expiry_old'          => 'ඉකුත් වීමේ ක�ලය ද�නටමත් ඉක්ම ගොස් ඇත.',
 'protect-unchain'             => 'ගෙන ය�ම පිළිබඳ ද�නට පනව� ඇති ඇවුරුම ඉවත් කරන්න',
-'protect-text'                => '<strong><nowiki>$1</nowiki></strong> පිටුව සඳහ� ආරක්ෂණ මට්ටම න�රඹීම හ� වෙනස් කිරීම මෙහිදී ඔබ විසින් සිදු කල හ�ක.',
-'protect-locked-blocked'      => 'ව�රණයට ලක්ව සිටියදී ඔබ හට ආරක්ෂණ මට්ටම් වෙනස්කල නොහ�ක.
-<strong>$1</strong> පිටුව සඳහ� වත්මන් පරිස්ථිතීන් මෙලෙස වේ:',
-'protect-locked-dblock'       => 'සක්�රීය දත්ත-ගබඩ�ව ඇවුරුමක් හේතුවෙන්, ආරක්ෂණ මට්ටම් වෙනස් කිරීම සිදු කල නොහ�කි තත්ත්වයක් උද්ගත වී ඇත.
-පිටුව සඳහ� වත්මන් පරිස්ථිතීන් මෙසේය <strong>$1</strong>:',
-'protect-locked-access'       => 'පිටුවෙහි ආරක්ෂණ මට්ටම් වෙනස් කිරීම සඳහ� ඔබගේ ගිණුමට අවසර න�ත.
-පිටුවෙහි වත්මන් ස�කසුම් මෙහි ද�ක්වේ <strong>$1</strong>:',
+'protect-text'                => "'''<nowiki>$1</nowiki>''' පිටුව සඳහ� ආරක්ෂණ මට්ටම න�රඹීම හ� වෙනස් කිරීම මෙහිදී ඔබ විසින් සිදු කල හ�ක.",
+'protect-locked-blocked'      => "ව�රණයට ලක්ව සිටියදී ඔබ හට ආරක්ෂණ මට්ටම් වෙනස්කල නොහ�ක.
+'''$1''' පිටුව සඳහ� වත්මන් පරිස්ථිතීන් මෙලෙස වේ:",
+'protect-locked-dblock'       => "සක්�රීය දත්ත-ගබඩ�ව ඇවුරුමක් හේතුවෙන්, ආරක්ෂණ මට්ටම් වෙනස් කිරීම සිදු කල නොහ�කි තත්ත්වයක් උද්ගත වී ඇත.
+පිටුව සඳහ� වත්මන් පරිස්ථිතීන් මෙසේය '''$1''':",
+'protect-locked-access'       => "පිටුවෙහි ආරක්ෂණ මට්ටම් වෙනස් කිරීම සඳහ� ඔබගේ ගිණුමට අවසර න�ත.
+පිටුවෙහි වත්මන් ස�කසුම් මෙහි ද�ක්වේ '''$1''':",
 'protect-cascadeon'           => 'තීරු දර්�න ආරක්ෂණය බල ගන්ව� ඇති පහත  {{PLURAL:$1|පිටුව|පිටු}} අන්තර්ගත වීම හේතුවෙන් මෙම පිටුව ද�නට ආරක්ෂණයට ලක්ව ඇත.
 පිටුවෙහි ආරක්ෂණ මට්ටම ඔබ විසින් වෙනස් කල හ�කි නමුදු, එම ක්�රිය�ව තීරු දර්�න ආරක්ෂණය කෙරෙහි බලපෑම් ඇති නොකරනු ඇත.',
-'protect-default'             => '(පෙරනිමි)',
+'protect-default'             => 'සියළු පරි�ිලකයන්ට ඉඩ සලසන්න',
 'protect-fallback'            => '"$1" අවසරය අව�්�ය වේ',
-'protect-level-autoconfirmed' => 'ලිය�පදිංචි වී නොම�ති පරි�ීලකයන් ව�රණය කරන්න',
+'protect-level-autoconfirmed' => 'නව සහ ලිය�පදිංචි වී නොම�ති පරි�ීලකයන් ව�රණය කරන්න',
 'protect-level-sysop'         => 'පරිප�ලකවරුන්ට පමණයි',
 'protect-summary-cascade'     => 'තීරු දර්�නය',
 'protect-expiring'            => 'ඉකුත් වේ  $1 (යූටීසි)',
+'protect-expiry-indefinite'   => 'අනි�්චිත',
 'protect-cascade'             => 'මෙම පිටුවෙහි ඇතුළත් කර ඇති පිටු ආරක්ෂණය කරන්න (තීරු දර්�න ආරක්ෂණය)',
 'protect-cantedit'            => 'ඔබ හට එය සංස්කරණය කිරීමට අවසර නොම�ති බ�වින්, ඔබ හට මෙම පිටුවෙහි ආරක්ෂණ මට්ටම වෙනස් කල නොහ�ක.',
+'protect-othertime'           => 'අනෙකුත් වේල�ව:',
+'protect-othertime-op'        => 'අනෙකුත් වේල�ව',
+'protect-existing-expiry'     => 'සංස්කරණ කල්ඉකුත්වීම් ක�ලය time: $3, $2',
+'protect-otherreason'         => 'අනෙකුත්/අමතර හේතුව:',
+'protect-otherreason-op'      => 'අනෙකුත්/අමතර හේතුව',
+'protect-dropdown'            => '*ස�මන්�ය රක්ෂණ හේතූන්
+** අත්�යන්ත වන්ධ්�යලය
+** අත්�යන්ත අය�චිත-ත�පෑල
+** නිෂ්ඵලද�යී සංස්කරණ පොරකෑම්
+** අධික අතුරුම�රු සහිත පිටුව',
+'protect-edit-reasonlist'     => 'සංස්කරණ ආරක්ෂණ හේතූන්',
+'protect-expiry-options'      => 'ප�ය 1:1 hour,දින 1:1 day, සති 1:1 week, සති 2:2 weeks, ම�ස 1:1 month, ම�ස 3:3 months, ම�ස 6:6 months, වසර 1:1 year, අනන්තය:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'අවසරය:',
 'restriction-level'           => 'පරිසීම� මට්ටම:',
 'minimum-size'                => 'අවම වි��ලත්වය',
@@ -1735,7 +1992,7 @@ $2 ගේ අවසන් අනුව�දය වෙතට යළි වෙන
 'undeletepage'                 => 'මක� ද�මූ පිටු නරඹ� ඒව� ප්�රතිෂ්ඨ�පනය කරන්න',
 'undeletepagetitle'            => "'''මෙහි පහත සමන්විත වන්නේ [[:$1|$1]] හි මක�ද�මුණු සං��ධනයන් ගෙනි '''.",
 'viewdeletedpage'              => 'මක� ද�මූ පිටු නරඹන්න',
-'undeletepagetext'             => 'පහත පිටු මක�ද�මුවද සංරක්�ෂිත�ග�රයෙහි තවමත් පවතින බ�වින් ප්�රතිෂ්ඨ�පනය කල හ�ක.
+'undeletepagetext'             => 'පහත {{PLURAL:$1|පිටුව මක�ද�මුවද එය |පිටු $1 මක�ද�මුවද ඒව�}}සංරක්�ෂිත�ග�රයෙහි තවමත් පවතින බ�වින් ප්�රතිෂ්ඨ�පනය කල හ�ක.
 සංරක්�ෂිත�ග�රය කලින් කලට  සුද්ධ පවිත්�ර කරනු ල�බිය හ�ක.',
 'undelete-fieldset-title'      => 'සං��ධනයන් ප්�රතිෂ්ඨ�පනය කරන්න',
 'undeleteextrahelp'            => "පිටුවෙහි සමස්ත ඉතිහ�සය ප්�රතිෂ්ඨ�පනය  කරනු වස්, සියළු පිරික්සුම්කොටු නොත�ර�, '''''ප්�රතිෂ්ඨ�පනය''''' ක්ලික් කරන්න.
@@ -1749,12 +2006,14 @@ $2 ගේ අවසන් අනුව�දය වෙතට යළි වෙන
 'undeletehistorynoadmin'       => 'මෙම පිටුව මක�දම� ඇත.
 මක� ද�මුමට පෙර මෙම පිටුව සංස්කරණය කල පරි�ීලකයන් පිළිබඳ විස්තරද සහිතව, මක�ද�මුමට හේතුව පහත ස�ර�ං�යෙහි ද�ක්වේ.
 මෙම මක�ද�මුණු සං��ධනයන්ගේ තථ්�ය පෙළ පරිහරණය කල හ�ක්කේ පරිප�ලකවරුන්ට පමණයි.',
+'undelete-revision'            => '($4 දී, $5 වන විට) $3 විසින් මක� දම� තිබූ $1හි සං��ධනය :',
 'undeleterevision-missing'     => 'අනීතික හ� සොය�ගතනොහ�කි සං��ධනය.
 එක්ක� ඔබගේ සබ�ඳිය සදොස්ය, න�තහොත් සං��ධනය ප්�රතිෂ්ඨ�පනයට හ� සංරක්ෂිතයෙන් ඉවත් කිරීමට හ�  ලක්ව තිබේ.',
 'undelete-nodiff'              => 'පූර්ව සං��ධන කිසිවක් සොය� ගත නොහ�කි විය.',
 'undeletebtn'                  => 'ප්�රතිෂ්ඨ�පනය',
 'undeletelink'                 => 'ප්�රතිෂ්ඨ�පනය කරන්න',
 'undeletereset'                => 'ප්�රත්�ය�රම්භ කරන්න',
+'undeleteinvert'               => 'ත�ර�ග�නුම කණපිට පෙරලන්න',
 'undeletecomment'              => 'පරිකථනය:',
 'undeletedarticle'             => '"[[$1]]"  ප්�රතිෂ්ඨ�පනය කරන ලදි',
 'undeletedrevisions'           => '{{PLURAL:$1|සං��ධනයක්|සං��ධන $1 ක්}} ප්�රතිෂ්ඨ�පනය කරන ලදි',
@@ -1779,6 +2038,7 @@ $2 ගේ අවසන් අනුව�දය වෙතට යළි වෙන
 'undelete-error-long'          => 'මෙම ගොනුව මක�ද�මීම අවලංගු කිරීමේදී ද�ෂ හමු විය:
 
 $1',
+'undelete-show-file-submit'    => 'ඔව්',
 
 # Namespace form on various pages
 'namespace'      => 'න�මඅවක��ය:',
@@ -1786,25 +2046,28 @@ $1',
 'blanknamespace' => '(ප්�රධ�න)',
 
 # Contributions
-'contributions' => 'මේ පරි�ීලකය�ගේ ද�යකත්වයන්',
-'mycontris'     => 'මගේ ද�යකත්ව',
-'contribsub2'   => '$1 සඳහ� ($2)',
-'nocontribs'    => 'මෙම උපම�නයන් හ� ග�ලපෙන වෙනස්වීම් හමුනොවිණි.',
-'uctop'         => '(පෙරටු)',
-'month'         => 'මෙම මස (හ� ඉන් පෙර) සිට:',
-'year'          => 'මෙම වසර (හ� ඉන් පෙර�තුව) සිට:',
-
-'sp-contributions-newbies'     => 'නව ගිණුම් වලට පමණක් අද�ල ද�යකත්ව පෙන්වන්න',
-'sp-contributions-newbies-sub' => 'නව ගිණුම් වලට අද�ල',
-'sp-contributions-blocklog'    => 'ව�රණ ල�ු-සටහන',
-'sp-contributions-search'      => 'ද�යකත්ව පිළිබඳ ගවේෂණය කරන්න',
-'sp-contributions-username'    => 'පරි�ීලක න�මය හ� අන්තර්ජ�ල ලිපිනය:',
-'sp-contributions-submit'      => 'ගවේෂණය කරන්න',
+'contributions'       => 'මේ පරි�ීලකය�ගේ ද�යකත්වයන්',
+'contributions-title' => ' $1 සඳහ� පරි�ීලක ද�යකත්වයන්',
+'mycontris'           => 'මගේ ද�යකත්ව',
+'contribsub2'         => '$1 සඳහ� ($2)',
+'nocontribs'          => 'මෙම උපම�නයන් හ� ග�ලපෙන වෙනස්වීම් හමුනොවිණි.',
+'uctop'               => '(පෙරටු)',
+'month'               => 'මෙම මස (හ� ඉන් පෙර) සිට:',
+'year'                => 'මෙම වසර (හ� ඉන් පෙර�තුව) සිට:',
+
+'sp-contributions-newbies'       => 'නව ගිණුම් වලට පමණක් අද�ල ද�යකත්ව පෙන්වන්න',
+'sp-contributions-newbies-sub'   => 'නව ගිණුම් වලට අද�ල',
+'sp-contributions-newbies-title' => 'නව ගිණුම් වලට අද�ල පරි�ීලක ද�යකත්ව',
+'sp-contributions-blocklog'      => 'ව�රණ ල�ු-සටහන',
+'sp-contributions-search'        => 'ද�යකත්ව පිළිබඳ ගවේෂණය කරන්න',
+'sp-contributions-username'      => 'පරි�ීලක න�මය හ� අන්තර්ජ�ල ලිපිනය:',
+'sp-contributions-submit'        => 'ගවේෂණය කරන්න',
 
 # What links here
 'whatlinkshere'            => 'මෙයට සබ��ඳෙන පිටු',
 'whatlinkshere-title'      => '"$1" වෙත සබ��ඳෙන පිටු',
 'whatlinkshere-page'       => 'පිටුව:',
+'whatlinkshere-backlink'   => '� $1',
 'linkshere'                => "ඉදිරියෙහි ද�ක්වෙන පිටු, '''[[:$1]]''' වෙත සබ�ඳෙයි:",
 'nolinkshere'              => "'''[[:$1]]''' වෙත කිසිදු පිටුවක් සබ�ඳී නොම�ත.",
 'nolinkshere-ns'           => "ත�ර�ගෙන ඇති න�ම-අවක��ය තුලදී, කිසිදු පිටුවක්, '''[[:$1]]''' වෙත නොබ�ඳෙයි.",
@@ -1850,6 +2113,8 @@ $1',
 'ipbotherreason'                  => 'අනෙකුත්/අමතර හේතුව:',
 'ipbhidename'                     => 'ව�රණ ල�ු-සටහනෙන්, සක්�රීය ව�රණ ල�යිස්තුවෙන් සහ පරි�ීලක ල�යිස්තුවෙන්, පරි�ීලක න�මය සඟවන්න',
 'ipbwatchuser'                    => 'මෙම පරි�ීලකය�ගේ පරි�ීලක හ� ස�කච්ඡ� පිටු මුර-කරන්න',
+'ipballowusertalk'                => 'ව�රණය ප�වතියදී ස්වීය ස�කච්ඡ� පිටුව සංස්කරණය කිරීමට මෙම පරි�ීලකය�ට ඉඩදෙන්න',
+'ipb-change-block'                => 'මෙම පරිස්ථිතීන් සහිතව පරි�ීලකය� යළි-ව�රණය කරන්න',
 'badipaddress'                    => 'අනීතික අන්තර්ජ�ල ලිපිනයකි',
 'blockipsuccesssub'               => 'ව�රණය ස�ර්ථක විය',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] ව�රණයට ලක් කර ඇත.<br />
@@ -1859,14 +2124,18 @@ $1',
 'ipb-unblock'                     => 'පරි�ීලක න�මයක හ� අන්තර්ජ�ල ලිපිනයක ව�රණය අත්හිටුවන්න',
 'ipb-blocklist-addr'              => '$1 සඳහ� පවතින ව�රණයන් නරඹන්න',
 'ipb-blocklist'                   => 'පවතින ව�රණයන් නරඹන්න',
+'ipb-blocklist-contribs'          => '$1 සඳහ� ද�යකත්වයන්',
 'unblockip'                       => 'පරි�ීලකය�ගේ ව�රණය අත්හිටුවන්න',
 'unblockiptext'                   => 'පෙරදී ව�රණයට ලක්වූ අන්තර්ජ�ල ලිපිනය හ� පරි�ීලක න�මය හ� වෙත ලිවීමේ බලය ප්�රතිෂ්ඨ�පනය කෙරුමට පහත ආකෘතිය භ�විත කරන්න.',
-'ipusubmit'                       => 'මෙම ලිපිනය ව�රණය කිරීම අත්හිටුවන්න',
+'ipusubmit'                       => 'මෙම ව�රණය කිරීම අත්හිටුවන්න',
 'unblocked'                       => '[[User:$1|$1]]  ව�රණය අත්හිටුව� ඇත',
 'unblocked-id'                    => '$1 ව�රණය ඉවත් කරගන්න� ලදි',
 'ipblocklist'                     => 'ව�රණයට ලක්වූ අන්තර්ජ�ල ලිපිනයන් හ� පරි�ීලක න�ම',
 'ipblocklist-legend'              => 'ව�රණය කෙරුනු පරි�ීලකය� සොයන්න',
 'ipblocklist-username'            => 'පරි�ීලක න�මය හ� අන්තර්ජ�ල ලිපිනය:',
+'ipblocklist-sh-userblocks'       => 'ගිණුම් ව�රණයන් $1',
+'ipblocklist-sh-tempblocks'       => 'ත�වක�ලික ව�රණයන් $1',
+'ipblocklist-sh-addressblocks'    => 'ඒක අන්තර්ජ�ල-ලිපින ව�රණයන් $1',
 'ipblocklist-submit'              => 'ගවේෂණය',
 'blocklistline'                   => '$1 දී, $2 විසින් $3 ($4) ව�රණය කෙරිණි',
 'infiniteblock'                   => 'අනන්තය',
@@ -1875,6 +2144,7 @@ $1',
 'noautoblockblock'                => 'ස්වයංක්�රීය ව�රණය අක්�රීය කෙරිණි',
 'createaccountblock'              => 'ගිණුම් ත�නීම ව�රණය කෙරිණි',
 'emailblock'                      => 'විද්�යුත්-ත�පෑල ව�රණය කෙරිණි',
+'blocklist-nousertalk'            => 'ස්වීය ස�කච්ඡ� පිටුව සංස්කරණය කල නොහ�ක',
 'ipblocklist-empty'               => 'ව�රණ-ල�යිස්තුව හිස්ය.',
 'ipblocklist-no-results'          => 'අය�දුනු අන්තර්ජ�ල ලිපිනය හ� පරි�ීලක න�මය හ� ව�රණයකට ලක්ව නොම�ත.',
 'blocklink'                       => 'ව�රණය',
@@ -1883,7 +2153,9 @@ $1',
 'autoblocker'                     => 'ඔබගේ අන්තර්ජ�ල ලිපිනය "[[පරි�ීලක:$1|$1]]" විසින් මෑතකදී භ�විත� කර ඇති බ�වින් ඔබ ස්වයංක්�රීය-ව�රණයකට ලක් කර ඇත.
 $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'blocklogpage'                    => 'ව�රණ ල�ු සටහන',
+'blocklog-fulllog'                => 'පූර්ණ ව�රණ ල�ු-සටහන',
 'blocklogentry'                   => '$2 $3 වෙතින් ද�ක්වෙන ඉකුත් වීමේ ක�ලයකට යටත් කොට [[$1]] ව�රණයට ලක් කර ඇත',
+'reblock-logentry'                => '$2 $3 කල්ඉකුත්වීමේ වේල�වට යටත්ව [[$1]] සඳහ� ව�රණ පරිස්ථිතීන් වෙනස්කරන ලදි',
 'blocklogtext'                    => 'පරි�ීලකයන් ව�රණය කිරීමේ හ� ව�රණයන් අත්හිටුවීමේ ක�ර්යයන් ද�ක්වෙන ල�ු සටහන මෙහි ද�ක්වේ.
 ස්වයංක්�රීයව ව�රණය කල අන්තර්ජ�ල ලිපිනයන් ල�යිස්තුගත කොට නොම�ත.
 වර්තම�නයෙහි ක්�රිය�ත්මක වන තහනම් හ� ව�රණ සඳහ� [[Special:IPBlockList|අන්තර්ජ�ල ලිපිනයන් ව�රණ ල�යිස්තුව]] බලන්න.',
@@ -1892,11 +2164,14 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'block-log-flags-nocreate'        => 'ගිණුම් ත�නීම අක්�රීය කොට ඇත',
 'block-log-flags-noautoblock'     => 'ස්වයංක්�රීය ව�රණය අක්�රීය කොට ඇත',
 'block-log-flags-noemail'         => 'විද්�යුත්-ත�පෑල ව�රණය කොට ඇත',
+'block-log-flags-nousertalk'      => 'ස්වීය ස�කච්ඡ� පිටුව සංස්කරණය කල නොහ�ක',
 'block-log-flags-angry-autoblock' => 'ආවර්ධිත ස්වයංක්�රීය ව�රණය සක්�රීය කරන ලදි',
 'range_block_disabled'            => 'පර�ස ව�රණයන් සිදුකිරීමට පරිප�ලක වරුන්ට ඇති හ�කිය�ව අක්�රීය කරන ලදි.',
 'ipb_expiry_invalid'              => 'ඉකුත්වීමේ ක�ලය අනීතිකය.',
 'ipb_expiry_temp'                 => 'ස�ඟවුනු පරි�ීලක-න�ම ව�රණයන් ස්ථීර ඒව� විය යුතුය.',
 'ipb_already_blocked'             => '"$1" ද�නටමත් ව�රණයට ලක් කර ඇත',
+'ipb-needreblock'                 => '== ද�නටමත් ව�රණය කොට ඇත ==
+$1 ද�නටමත් ව�රණය කොට ඇත. පරිස්ථිතීන් වෙනස්කිරීම ඔබ හට ඇව�සිද?',
 'ipb_cant_unblock'                => 'ද�ෂය: ව�රණ අනන්�යන�ංකය $1 සොය� ගත නොහ�කි විය.
 මෙය ද�නටමත් ව�රණ අත්හිටුවීමකට භ�ජනය වී ඇතිව� විය හ�ක.',
 'ipb_blocked_as_range'            => 'ද�ෂය: $1 අන්තර්ජ�ල ලිපිනය සෘජුව ව�රණය කොට නොම�ති අතර එහි ව�රණ�ය අත්හිටුවිය නොහ�ක.
@@ -1912,6 +2187,7 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'sorbsreason'                     => 'ඔබගේ අන්තර්ජ�ල ලිපිනය, {{SITENAME}} විසින් භ�විත වන DNSBL හි විවෘත නියුතුවක් (ප්�රොක්සියක්) ලෙස ල�යිස්තුගත කොට ඇත.',
 'sorbs_create_account_reason'     => 'ඔබගේ අන්තර්ජ�ල ලිපිනය, {{SITENAME}} විසින් භ�විත වන DNSBL හි විවෘත නියුතුවක් (ප්�රොක්සියක්) ලෙස ල�යිස්තුගත කොට ඇත.
 ඔබ හට ගිණුමක් ත�නිය නොහ�ක',
+'cant-block-while-blocked'        => 'ඔබ ව�රණයට ලක්ව සිටින අතරතුර අනෙක් පරි�ීලකයන් ව�රණය කිරීමට ඔබ හට නොහ�ක.',
 
 # Developer tools
 'lockdb'              => 'දත්ත-ගබඩ�ව අවුරන්න',
@@ -1935,10 +2211,10 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'databasenotlocked'   => 'දත්ත-ගබඩ�ව අවුර� නොම�ත.',
 
 # Move page
-'move-page'               => ' $1 ගෙනයන්න',
-'move-page-backlink'      => '� $1',
-'move-page-legend'        => 'පිටුව ගෙනයන්න',
-'movepagetext'            => "පහත ආකෘතිය භ�විත� කිරීමෙන්, එහි සියළු ඉතිහ�සය නව න�මයට අනුයුක්ත කරමින්,  පිටුවක නම-වෙනස් කිරීම සිදුවේ.
+'move-page'                 => ' $1 ගෙනයන්න',
+'move-page-backlink'        => '� $1',
+'move-page-legend'          => 'පිටුව ගෙනයන්න',
+'movepagetext'              => "පහත ආකෘතිය භ�විත� කිරීමෙන්, එහි සියළු ඉතිහ�සය නව න�මයට අනුයුක්ත කරමින්,  පිටුවක නම-වෙනස් කිරීම සිදුවේ.
 නව න�මය වෙත යළි-යොමු වන්න�වූ පිටුවක් බවට ප�ර�ණි න�මය පත් වෙයි.
 ආදිමය න�මය වෙත ස්වයංක්�රීයව එල්ල වන යළි-යොමු වීම් ය�වත්ක�ලීන කිරීම් ඔබ විසින් සිදු කල හ�ක.
 එසේ සිදු කිරීමට ඔබ නොරිසි නම්, [[Special:DoubleRedirects|ද්විත්ව]] හ� [[Special:BrokenRedirects|භින්න යළි-යොමු වීම්]] පරික්ෂ� කර බ�ලීමට යුහුසුළු වන්න.
@@ -1950,49 +2226,58 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 '''අවව�දයයි!'''
 මෙම වෙනස ජනප්�රිය පිටුවකට විෂයෙහි සිදුවන උග්�ර හ� අනපේක්�ෂිත වෙනස්කමක් විය හ�ක;
 බිඳක් න�ව�තී  මෙහි ප්�රතිවිප�ක පිළිබඳ පරිල�කනය කිරීමට යුහුසුළු වන්න.",
-'movepagetalktext'        => "එය සමග ආ�්�රිත ස�කච්ඡ� පිටුව ස්වයංක්�රීය ලෙස ගෙනය�ම වළක්වන '''ව�ළ�හීම්:'''
+'movepagetalktext'          => "එය සමග ආ�්�රිත ස�කච්ඡ� පිටුව ස්වයංක්�රීය ලෙස ගෙනය�ම වළක්වන '''ව�ළ�හීම්:'''
 *නව පිටු න�මය යටතේ, හිස්-නොවන ස�කච්ඡ� පිටුවක් ද�නටමත් ප�ව�තීම, හ�
 *පහත කොටුව ඔබ විසින් නොතේරූ නිස�වෙන්.
 
 මෙවන් අවස්ථ� වලදී, අව�්�යත�වය ප�න නගී නම්, හස්තීය ලෙස ගෙන ය�ම හ� ඒක�බද්ධ කිරීම හ� සිදු කිරීමට ඔබ හට සිදුවේ.",
-'movearticle'             => 'පිටුව ගෙනයන්න:',
-'movenotallowed'          => 'පිටු ගෙනයෑමට ඔබ හට අවසර නොම�ත.',
-'newtitle'                => 'නව පිටු න�මය වෙත:',
-'move-watch'              => 'මෙම පිටුව මුර කරන්න',
-'movepagebtn'             => 'පිටුව ගෙන යන්න',
-'pagemovedsub'            => 'ගෙන ය�ම ස�ර්ථකයි',
-'movepage-moved'          => '<big>\'\'\'"$1" යන පිටුව  "$2"\'\'\' වෙත ගෙන යන ලදි</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'එක්ක� මෙම නම ඇති පිටුවක් ද�නටමත් පවතී, න�ත්නම් ඔබ විසින් ත�ර� ගෙන ඇති පිටුව වලංගු එකක් නොවේ.
+'movearticle'               => 'පිටුව ගෙනයන්න:',
+'movenologin'               => 'ප්�රවිෂ්ටවී නොම�ත',
+'movenologintext'           => 'පිටුවක් ගෙනයෑමට පෙර, ඔබ ලේඛනගත පරි�ීලකයෙකු වී [[Special:UserLogin|ප්�රවිෂ්ට වී]] සිටිය යුතුය.',
+'movenotallowed'            => 'පිටු ගෙනයෑමට ඔබ හට අවසර නොම�ත.',
+'cant-move-user-page'       => 'පරි�ීලක පිටු ගෙනයෑමට  (උපපිටු වලින් හ�රෙන්නට) ඔබ හට අවසර නොම�ත.',
+'cant-move-to-user-page'    => 'පිටුවක් පරි�ීලක පිටුවක් වෙතට ගෙනයෑමට  (පරි�ීලක උපපිටුවක් වෙත හ�රෙන්නට) ඔබ හට අවසර නොම�ත.',
+'newtitle'                  => 'නව පිටු න�මය වෙත:',
+'move-watch'                => 'මෙම පිටුව මුර කරන්න',
+'movepagebtn'               => 'පිටුව ගෙන යන්න',
+'pagemovedsub'              => 'ගෙන ය�ම ස�ර්ථකයි',
+'movepage-moved'            => '<big>\'\'\'"$1" යන පිටුව  "$2"\'\'\' වෙත ගෙන යන ලදි</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'එක්ක� මෙම නම ඇති පිටුවක් ද�නටමත් පවතී, න�ත්නම් ඔබ විසින් ත�ර� ගෙන ඇති පිටුව වලංගු එකක් නොවේ.
 වෙන යම් නමක් ත�ර�ගන්න.',
-'cantmove-titleprotected' => 'මෙම පරිස්ථ�නයට පිටුවක් ගෙනයෑමට ඔබ හට නොහ�කි වන්නේ, ත�නීමක් සිදුනොකෙරෙන අයුරින් නව �ිර්ෂය රක්ෂණය කර ඇති නිස�ය',
-'talkexists'              => "'''මෙම පිටුව ස�ර්ථක ලෙස ගෙන ගිය නමුදු, ස�කච්ඡ� පිටුව එසේ ගෙන ය�ම කල නොහ�කි වූයේ නව පිටු න�මයට අද�ලව ස�කච්ඡ� පිටුවක් ද�නටමත් පවතින බ�විනි.
+'cantmove-titleprotected'   => 'මෙම පරිස්ථ�නයට පිටුවක් ගෙනයෑමට ඔබ හට නොහ�කි වන්නේ, ත�නීමක් සිදුනොකෙරෙන අයුරින් නව �ිර්ෂය රක්ෂණය කර ඇති නිස�ය',
+'talkexists'                => "'''මෙම පිටුව ස�ර්ථක ලෙස ගෙන ගිය නමුදු, ස�කච්ඡ� පිටුව එසේ ගෙන ය�ම කල නොහ�කි වූයේ නව පිටු න�මයට අද�ලව ස�කච්ඡ� පිටුවක් ද�නටමත් පවතින බ�විනි.
 කරුණ�කර ඒව� හස්තීය ලෙස ඒක�බද්ධ කරන්න.'''",
-'movedto'                 => 'වෙත ගෙන යන ලදි',
-'movetalk'                => 'ආ�්�රිත ස�කච්ඡ� පිටුව ගෙන යන්න',
-'move-subpages'           => 'අද�ළ වේ නම්, සියළු පිටු ගෙනයන්න',
-'move-talk-subpages'      => 'අද�ළ වේ නම්, ස�කච්ඡ� පිටුවෙහි සියළු උපපිටු ගෙනයන්න',
-'movepage-page-exists'    => '$1 පිටුව ද�නටමත් පවතින අතර, එය ස්වයංක්�රීයව අධිලිවීමකට භ�ජනය කල නොහ�ක.',
-'movepage-page-moved'     => ' $1 පිටුව $2 වෙත ගෙනයන ලදි.',
-'movepage-page-unmoved'   => ' $1 පිටුව  $2 වෙත ගෙනයෑම සිදුකල නොහ�කි විය.',
-'movepage-max-pages'      => '{{PLURAL:$1|එක් පිටුවක|පිටු $1 ක}}  උපරිමයකට යටත්ව ගෙනයෑම සිදුකර ඇති අතර ස්වයංක්�රීය ලෙස ගෙනයෑම තවදුරටත් සිදු නොවනු ඇත.',
-'1movedto2'               => '[[$1]] යන්න [[$2]] වෙත ගෙන යන ලදි',
-'1movedto2_redir'         => 'යළි-යොමුකිරීමක් මගින් [[$2]] වෙත  [[$1]] ගෙන යන ලදි',
-'movelogpage'             => 'ගෙනයෑම් ල�ු-සටහන',
-'movelogpagetext'         => 'පහත ද�ක්වෙන්නේ ගෙනගිය පිටු ල�යිස්තුවකි.',
-'movereason'              => 'හේතුව:',
-'revertmove'              => 'ප්�රතිවර්තනය',
-'delete_and_move'         => 'මක�දම� ගෙන යන්න',
-'delete_and_move_text'    => '==මක�ද�මීම අව�්�යව ඇත==
+'movedto'                   => 'වෙත ගෙන යන ලදි',
+'movetalk'                  => 'ආ�්�රිත ස�කච්ඡ� පිටුව ගෙන යන්න',
+'move-subpages'             => 'අද�ළ වේ නම්, සියළු පිටු ගෙනයන්න',
+'move-talk-subpages'        => 'අද�ළ වේ නම්, ස�කච්ඡ� පිටුවෙහි සියළු උපපිටු ගෙනයන්න',
+'movepage-page-exists'      => '$1 පිටුව ද�නටමත් පවතින අතර, එය ස්වයංක්�රීයව අධිලිවීමකට භ�ජනය කල නොහ�ක.',
+'movepage-page-moved'       => ' $1 පිටුව $2 වෙත ගෙනයන ලදි.',
+'movepage-page-unmoved'     => ' $1 පිටුව  $2 වෙත ගෙනයෑම සිදුකල නොහ�කි විය.',
+'movepage-max-pages'        => '{{PLURAL:$1|එක් පිටුවක|පිටු $1 ක}}  උපරිමයකට යටත්ව ගෙනයෑම සිදුකර ඇති අතර ස්වයංක්�රීය ලෙස ගෙනයෑම තවදුරටත් සිදු නොවනු ඇත.',
+'1movedto2'                 => '[[$1]] යන්න [[$2]] වෙත ගෙන යන ලදි',
+'1movedto2_redir'           => 'යළි-යොමුකිරීමක් මගින් [[$2]] වෙත  [[$1]] ගෙන යන ලදි',
+'movelogpage'               => 'ගෙනයෑම් ල�ු-සටහන',
+'movelogpagetext'           => 'පහත ද�ක්වෙන්නේ ගෙනගිය පිටු ල�යිස්තුවකි.',
+'movereason'                => 'හේතුව:',
+'revertmove'                => 'ප්�රතිවර්තනය',
+'delete_and_move'           => 'මක�දම� ගෙන යන්න',
+'delete_and_move_text'      => '==මක�ද�මීම අව�්�යව ඇත==
 අන්ත පිටුව "[[:$1]]" ද�නටමත් පවතියි.
 එය මක�දම� ගෙනය�ම සඳහ� පෙත එළි කිරීමට ඔබ හට ඇව�සිද?',
-'delete_and_move_confirm' => 'ඔව්, පිටුව මක� දමන්න',
-'delete_and_move_reason'  => 'ගෙන යෑම සඳහ� ඉඩ සලසනු වස් මක�දමන ලදි',
-'selfmove'                => 'මූල හ� අන්ත �ීර්ෂ දෙකම එකමය;
+'delete_and_move_confirm'   => 'ඔව්, පිටුව මක� දමන්න',
+'delete_and_move_reason'    => 'ගෙන යෑම සඳහ� ඉඩ සලසනු වස් මක�දමන ලදි',
+'selfmove'                  => 'මූල හ� අන්ත �ීර්ෂ දෙකම එකමය;
 පිටුවක් එය වෙතම ගෙන ය� නොහ�ක.',
-'imagenocrossnamespace'   => 'ගොනුවක්, ගොනුවක්-නොවන න�මඅවක��යකට ගෙනයෑම කල නොහ�ක',
-'imagetypemismatch'       => 'නව ගොනු ප්�රසර්ජනය එහි වර්ගය හ� නොග�ලපේ',
-'imageinvalidfilename'    => 'ඉලක්කගත ගොනු න�මය අනීතිකයි',
-'fix-double-redirects'    => 'මුල් �ීර්ෂයට එල්ලවන කිසියම් යළි-යොමුවීම් උඩුගත කරන්න',
+'immobile-source-namespace' => '"$1" න�මඅවක��යෙහි පිටු ගෙනය�ම සිදුකල නොහ�ක',
+'immobile-target-namespace' => '"$1" න�මඅවක��ය වෙත පිටු ගෙනය�ම සිදුකල නොහ�ක',
+'immobile-source-page'      => 'මෙම පිටුව ගෙනය�හ�ක්කක් නොවේ.',
+'immobile-target-page'      => 'එම අන්ත �ීර්ෂයට ගෙන යෑම කල නොහ�ක.',
+'imagenocrossnamespace'     => 'ගොනුවක්, ගොනුවක්-නොවන න�මඅවක��යකට ගෙනයෑම කල නොහ�ක',
+'imagetypemismatch'         => 'නව ගොනු ප්�රසර්ජනය එහි වර්ගය හ� නොග�ලපේ',
+'imageinvalidfilename'      => 'ඉලක්කගත ගොනු න�මය අනීතිකයි',
+'fix-double-redirects'      => 'මුල් �ීර්ෂයට එල්ලවන කිසියම් යළි-යොමුවීම් උඩුගත කරන්න',
+'move-leave-redirect'       => 'යළි-යොමුවක් හ�ර දමන්න',
 
 # Export
 'export'            => 'පිටු නිර්ය�ත කරන්න',
@@ -2001,7 +2286,7 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 
 පිටු නිර්ය�ත කිරීම සඳහ�, පහත පෙළ කොටුවේ, එක් පේළියකට එක් �ීර්ෂයක් වන පරිදී �ීර්ෂයන් ඇතුළු කොට, ඔබට ඇව�සි වන්නේ,  පිටු ඉතිහ�ස පේළි හ� සමගින් සියළු ප�ර�ණි අනුව�දයන් මෙන්ම වත්මන් අනුව�දයද  න�තහොත් අවසන් සංස්කරණය පිළිබඳ තොරතුරු සමග වත්මන් අනුව�දයද යන වග ත�ර�ගත යුතුය.
 
-අපර�ක්ත අවස්ථ�වෙහිදී ඔබහට සබ�ඳියක්ද භ�විත� කල හ�ක, නිද. "[[{{MediaWiki:Mainpage}}]]" පිටුව සඳහ� [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]].',
+අපර�ක්ත අවස්ථ�වෙහිදී ඔබහට සබ�ඳියක්ද භ�විත� කල හ�ක, නිද. "[[{{MediaWiki:Mainpage}}]]" පිටුව සඳහ� [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'සම්පූර්ණ ඉතිහ�සය නොව වත්මන් සං��ධනය පමණක් අඩංගු කරන්න',
 'exportnohistory'   => "----
 '''සටහන:''' ක�ර්යස�ධන හේතූන් නිස�වෙන් මෙම ආකෘති පත්�රය භ�විතයෙන් පිටුවල සම්පූර්ණ ඉතිහ�සය නිර්ය�ත කිරීම අක්�රීය කොට ඇත.",
@@ -2039,7 +2324,8 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 සියළු අන්තර්විකි ආ�ය�ත ක්�රිය�වන් [[Special:Log/import|ආය�ත ල�ු-සටහනෙහි]] සටහන් වනු ඇත.',
 'import-interwiki-history'   => 'මෙම පිටුව සඳහ� සියළු ඉතිහ�ස අනුව�දයන් පිටපත් කරන්න',
 'import-interwiki-submit'    => 'ආය�ත කරන්න',
-'import-interwiki-namespace' => 'න�මඅවක��යට පිටු ම�රුකරන්න:',
+'import-interwiki-namespace' => 'ගමන�න්ත න�මඅවක��ය:',
+'import-comment'             => 'පරිකථනය:',
 'importtext'                 => '[[Special:Export|නිර්ය�ත උපයුක්තය]] භ�විත� කරමින් ගොනුව මූල විකියෙන් නිර්ය�ත කිරීමට ක�රුණික වන්න.
 ඔය ඔබගේ පරිගණකයෙහි සුර�ක මෙහි උඩුගත කරන්න.',
 'importstart'                => 'පිටු ආය�ත කරමින්...',
@@ -2075,20 +2361,20 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'import-logentry-interwiki-detail' => '$2 වෙතින් {{PLURAL:$1|එක් සං��ධනයක්|සං��ධන $1 ක්}}',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'ම�ගේ පරි�ීලක පිටුව',
+'tooltip-pt-userpage'             => 'ඔබගේ පරි�ීලක පිටුව',
 'tooltip-pt-anonuserpage'         => 'සංස්කරණයට ඔබ භ�විත� කරමින් පවතින අන්තර්ජ�ල ලිපිනය සඳහ� පරි�ීලක පිටුව',
-'tooltip-pt-mytalk'               => 'ම�ගේ ස�කච්ඡ� පිටුව',
+'tooltip-pt-mytalk'               => 'ඔබගේ ස�කච්ඡ� පිටුව',
 'tooltip-pt-anontalk'             => 'මෙම අන්තර්ජ�ල ලිපිනයෙන් කර ඇති සංස්කරණයන් පිළිබඳ සංව�දය',
 'tooltip-pt-preferences'          => 'මගේ අභිරුචි',
 'tooltip-pt-watchlist'            => 'වෙනස්වීම් සිදුවී තිබේද�යි යන්න පිලිබඳව ඔබගේ විමසුමට ලක්ව ඇති පිටු ල�යිස්තුව',
-'tooltip-pt-mycontris'            => 'ම�ගේ ද�යකත්ව ල�යිස්තුව�',
+'tooltip-pt-mycontris'            => 'ඔබගේ ද�යකත්වයන් ල�යිස්තුව�',
 'tooltip-pt-login'                => 'එය අව�්�ය�යෙන් කල යුත්තක් �නොවුනද, ප්�රවිෂ්ට වීම සඳහ� ඔබ ධෛර්යමත් කරනු ල�බේ.',
 'tooltip-pt-anonlogin'            => 'එය අව�්�ය�යෙන් කල යුත්තක් �නොවුනද, ප්�රවිෂ්ට වීම සඳහ� ඔබ ධෛර්යමත් කරනු ල�බේ.',
 'tooltip-pt-logout'               => 'නිෂ්ක්�රමණය',
 'tooltip-ca-talk'                 => 'අන්තර්ගත පිටුව පිළිබඳ සංව�දය',
 'tooltip-ca-edit'                 => 'ඔබ�ට මෙම පිටුව සංස්කරණය කල හ�ක.
 සුර�කීමට පෙර කරුණ�කර පෙරදසුන බොත්තම භ�විත� කරන්න.',
-'tooltip-ca-addsection'           => 'මෙම සංව�දයට පරිකථනයක් ඇතුලත් කරන්න.',
+'tooltip-ca-addsection'           => 'නව ඡේදයක් අරඹන්න',
 'tooltip-ca-viewsource'           => 'මෙම පිටුව ආරක්ෂණය කොට ඇත.
 ඔබට එහි මූල��්�රය න�රඹිය හ�ක.',
 'tooltip-ca-history'              => 'මෙම පිටුවේ ප�රණි අනුව�දයන්.',
@@ -2136,6 +2422,9 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'tooltip-watch'                   => 'මෙම පිටුව ඔබගේ මුර-ල�යිස්තුවට එක් කරන්න',
 'tooltip-recreate'                => 'පිටුව මක�දම� ඇති වුවද, එය යළි-නිර්ම�ණය කරන්න',
 'tooltip-upload'                  => 'උඩුගත කිරීම අරඹන්න',
+'tooltip-rollback'                => '"පුනර�වර්තනය" එක් වරක් ක්ලික් කිරීමෙහි ප්�රතිඵලය වනුයේ, සංස්කරණය(න්) ප්�රතිවර්තනය වී, අවසන් ද�යකය� විසින් ස�දූ මෙම පිටුව වෙත පිටුව ගෙන ඒමයි.',
+'tooltip-undo'                    => '"අහ�සි" මගින් සිදුකෙරෙනුයේ මෙම සංස්කරණය ප්�රතිවර්තනය කොට, සංස්කරණ-ආකෘතිය, පෙරදසුන් ම�දිලියෙහි විවෘත කිරීමයි.
+ස�ර�ං�යෙහි, මේ පිළිබඳව හේතුවක් පල කිරීමට, ඔබට ඉඩ ස�ලසේ.',
 
 # Stylesheets
 'common.css'      => '/* මෙහි CSS  බහ�ලීම සියළු ඡවියයන් භ�විත� කරන පරි�ීලකයන් හට බලපෑම් සිදු කල හ�ක */',
@@ -2147,6 +2436,8 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'chick.css'       => '/* මෙහි CSS  බහ�ලීම හ�ඩක�රී ඡවිය භ�විත� කරන පරි�ීලකයන් හට බලපෑම් සිදු කල හ�ක */',
 'simple.css'      => '/* මෙහි CSS  බහ�ලීම සරල ඡවිය භ�විත� කරන පරි�ීලකයන් හට බලපෑම් සිදු කල හ�ක */',
 'modern.css'      => '/* මෙහි CSS  බහ�ලීම නූතන ඡවිය භ�විත� කරන පරි�ීලකයන් හට බලපෑම් සිදු කල හ�ක */',
+'print.css'       => '/* මෙහි CSS  බහ�ලීම මුද්�රණ ප්�රතිද�නයට බලපෑම් සිදු කල හ�ක */',
+'handheld.css'    => '/* මෙහි බහ�ලන CSS විසින් $wgHandheldStyle හි වින්�ය�සකෙරෙන ජවිය මත පදනම් වූ අතේ ගෙන ය� හ�කි උපකරණ වලට බලපෑම් කල හ�ක*/',
 
 # Scripts
 'common.js'      => '/* මෙහි ඕනෑම ජ�ව�ස්ක්�රිප්ට් එකක් සෑම පිටු ප්�රවේ�නයකදීම සියළු පරි�ීලකයන්හට ප්�රවේ�නය කෙරේ. */',
@@ -2165,10 +2456,12 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'notacceptable'     => 'ඔබගේ සේව�ල�භිය�ට කිය�විය හ�කි ආකෘතියකින් දත්ත ස�ප�යීමට විකි සේව�ද�යකයට නොහ�ක.',
 
 # Attribution
+'anonymous'        => '{{SITENAME}} හි නිර්න�මික {{PLURAL:$1|පරි�ීලකය�|පරි�ීලකය�}}',
 'siteuser'         => '{{SITENAME}} පරි�ීලක $1',
 'lastmodifiedatby' => 'මෙම පිටුව අවසන් වරට විකරණය කරන ලද්දේ  $3 විසින්  $1 දින  $2 වේල�වේදීය .', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1ගේ කෘතිය මත පදනම් විය.',
 'others'           => 'අනෙකුන්',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|පරි�ීලකය�|පරි�ීලකය�}} $1',
 'creditspage'      => 'පිටුවෙහි කතෘ-බුහුමන්',
 'nocredits'        => 'මෙම පිටුව සඳහ� ස්තුතිපූර්වක තොරතුරු කිසිවක් න�ත.',
 
@@ -2209,11 +2502,12 @@ $1 ගේ ව�රණයට හේතුව මෙය වේ: "$2"',
 'markedaspatrollederror-noautopatrol' => 'ඔබගේ ස්වීය වෙනස්වීම් පරික්�ෂ�කර බ�ලූ ලෙස සලකුණු කිරීමට ඔබ හට ඉඩ දෙනු නොල�බේ.',
 
 # Patrol log
-'patrol-log-page'   => 'පරික්ෂ�කිරීම් ල�ු-සටහන',
-'patrol-log-header' => 'මෙය පරික්�ෂ�කර බ�ලූ සං��ධනයන්ගේ ල�ු-සටහනකි.',
-'patrol-log-line'   => '$2 හි $1 පරික්ෂ� කර බ�ලූ බව $3 හි ලකුණු කෙරිණි',
-'patrol-log-auto'   => '(ස්වයංක්�රීය)',
-'patrol-log-diff'   => 'r$1',
+'patrol-log-page'      => 'පරික්ෂ�කිරීම් ල�ු-සටහන',
+'patrol-log-header'    => 'මෙය පරික්�ෂ�කර බ�ලූ සං��ධනයන්ගේ ල�ු-සටහනකි.',
+'patrol-log-line'      => '$2 හි $1 පරික්ෂ� කර බ�ලූ බව $3 හි ලකුණු කෙරිණි',
+'patrol-log-auto'      => '(ස්වයංක්�රීය)',
+'patrol-log-diff'      => 'r$1',
+'log-show-hide-patrol' => 'පරික්�ෂ�කිරීම් ල�ු-සටහන් $1',
 
 # Image deletion
 'deletedrevision'                 => 'ප�ර�ණි සං��ධනය $1 මක�දමන ලදි',
@@ -2230,6 +2524,9 @@ $1',
 'previousdiff' => '� ප�ර�ණි සංස්කරණය',
 'nextdiff'     => 'නවීන සංස්කරණය →',
 
+# Visual comparison
+'visual-comparison' => 'දෘ�්�ය ස�ස�ඳුම',
+
 # Media information
 'mediawarning'         => "'''අවව�දයයි''': අනිෂ්ට කේතයන් මෙම ගොනුවෙහි අඩංගු විය හ�ක, එය ක්�රියය�නය කිරීමෙන් ඔබගේ පද්ධතිය අපහසුත�වයට ලක්විය හ�ක.<hr />",
 'imagemaxsize'         => 'ගොනු විස්තර පිටුවල ද�ක්වෙන රූප මෙම අගයට සීම� කරන්න:',
@@ -2243,10 +2540,12 @@ $1',
 'show-big-image'       => 'සම්පූර්ණ විසර්ජනය',
 'show-big-image-thumb' => '<small>පෙර න�රඹුමෙහි  වි��ලත්වය: $1 × $2 පික්සල</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'නව ගොනු ග�ලරිය',
 'imagelisttext'         => "පහත ද�ක්වෙන්නේ  $2 අනුව සුබෙදුනු {{PLURAL:$1|ගොනුවක|ගොනු '''$1''' ක}} ල�යිස්තුවකි.",
 'newimages-summary'     => 'මෙම වි�ේෂ පිටුව, අවස�නයට උඩුගත කෙරුණු ගොනු පෙන්වයි.',
+'newimages-legend'      => 'පෙරහන',
+'newimages-label'       => 'ගොනු න�මය (හ� එයින් කොටසක්):',
 'showhidebots'          => '(රොබ� $1 දෙනෙක්)',
 'noimages'              => 'පෙනෙන්නට කිසිවක් නොම�ත.',
 'ilsubmit'              => 'ගවේෂණය',
@@ -2521,6 +2820,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ISO ම�දිරි ටංස්ටන්',
 'exif-lightsource-255' => 'අනෙකුත් ආල�ක ප්�රභවය',
 
+# Flash modes
+'exif-flash-fired-0'    => 'ස�ණෙළිය නොද�ල්වුණි',
+'exif-flash-fired-1'    => 'ස�ණෙළිය ද�ල්වුණි',
+'exif-flash-return-0'   => 'ස්පන්ද�ල�ක ප්�රත්�ය�ගමන අන�වරණ කෘත්�යය න�ත',
+'exif-flash-return-2'   => 'ස්පන්ද�ල�ක ප්�රත්�ය�ගමන ආල�කය අන�වරණය නොවිණි',
+'exif-flash-return-3'   => 'ස්පන්ද�ල�ක ප්�රත්�ය�ගමන ආල�කය අන�වරණය විණි',
+'exif-flash-mode-1'     => 'ස�ණෙළිය ද�ල්වීම අනිව�ර්යයි',
+'exif-flash-mode-2'     => 'ස�ණෙලිය අනිව�ර්යයෙන් යටපත්කිරීම',
+'exif-flash-mode-3'     => 'ස්වයංක්�රීය පන්නය',
+'exif-flash-function-1' => 'ස�ණෙළි ක්�රිය�වලියක් න�ත',
+'exif-flash-redeye-1'   => 'රකුස�ස් ල�ුකරණ ම�දිලිය',
+
 'exif-focalplaneresolutionunit-2' => 'අඟල්',
 
 'exif-sensingmethod-1' => 'අනි�්චිත',
@@ -2598,7 +2909,7 @@ Variants for Chinese language
 
 # External editor support
 'edit-externally'      => 'බ�හිර  උපය�ගයක් භ�විත� කරමින් මෙම ගොනුව සංස්කරණය කරන්න',
-'edit-externally-help' => 'ව�ඩිමනත් තොරතුරු සඳහ� [http://www.mediawiki.org/wiki/Manual:External_editors පිහිටුවීම් උපදෙස්] බලන්න.',
+'edit-externally-help' => '(ව�ඩිමනත් තොරතුරු සඳහ� [http://www.mediawiki.org/wiki/Manual:External_editors පිහිටුවීම් උපදෙස්] බලන්න.)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'සියල්ල',
@@ -2672,18 +2983,9 @@ $1
 'unit-pixel' => 'පික්සල',
 
 # action=purge
-'confirm_purge'        => 'මෙම පිටුවෙහි පූර්ව�පේක්�ෂී සංචිතය (කෑෂය) හිස් කල යුතුද?
-
-$1',
 'confirm_purge_button' => 'හරි',
-
-# AJAX search
-'useajaxsearch' => 'AJAX සෙවුම භ�විත කරන්න',
-
-# Separators for various lists, etc.
-'catseparator'    => '|',
-'comma-separator' => ',&#32;',
-'colon-separator' => ':&#32;',
+'confirm-purge-top'    => 'මෙම පිටුවෙහි පූර්ව�පේක්�ෂී සංචිතය (කෑෂය) හිස් කල යුතුද?',
+'confirm-purge-bottom' => 'පිටුවක් විම�චනය කිරීම විසින් පූර්ව�පේක්�ෂිත සංචිතය (කෑෂය) හිස් කොට ඉත�මත් මෑත අනුව�දය පෙන්නුම් කිරීමට බල කරයි.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� පෙර පිටුව',
@@ -2703,10 +3005,10 @@ $1',
 'table_pager_empty'        => 'ප්�රතිඵල නොම�ත',
 
 # Auto-summaries
-'autosumm-blank'   => 'පිටුවෙන් සියළු අන්තර්ගතය ඉවත් කරමින්',
+'autosumm-blank'   => 'පිටුව හිස් කෙරිණි',
 'autosumm-replace' => "පිටුව වෙනුවට  '$1' ප්�රතිස්ථ�පනය කරමින්",
 'autoredircomment' => ' [[$1]] වෙතට යළි-යොමුකරමින්',
-'autosumm-new'     => 'නව පිටුව: $1',
+'autosumm-new'     => "'$1' යොදමින් නව පිටුවක් තනන ලදි",
 
 # Size units
 'size-bytes'     => '$1 බ',
@@ -2814,6 +3116,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'අඥ�ත ප්�රසර්ජන ට�ගය "$1"',
+'duplicate-defaultsort' => 'අවව�දයයි: "$2" පෙරනිමි සුබෙදුම් යතුර විසින් �පූර්ව පෙරනිමි සුබෙදුම් යතුර  වූ  "$1" අතික්�රමණය කරයි.',
 
 # Special:Version
 'version'                          => 'අනුව�දය', # Not used as normal message but as header for the special page itself
@@ -2843,13 +3146,13 @@ $1',
 'filepath-summary' => 'මෙම වි�ේෂ පිටුව,  ගොනුවකට අද�ල  සම්පූර්ණ පෙත හුව� දක්වයි.
 රූප, පූර්ණ විසර්ජනයෙන් ද�ක්වෙන අතර, අනෙකුත් ගොනු වර්ග ඒව�යේ ආ�්�රිත ක්�රමලේඛයන් අනුස�රයෙන් සෘජුව ආරම්භ කෙරේ.
 
-"{{ns:image}}:" උපසර්ගය විරහිතව ගොනු න�මය ඇතුලත් කරන්න.',
+"{{ns:file}}:" උපසර්ගය විරහිතව ගොනු න�මය ඇතුලත් කරන්න.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'අනුපිටපත් ගොනු සඳහ� ගවේෂණය කරන්න',
 'fileduplicatesearch-summary'  => 'එහි පූරක අගය ප�දක කර ගෙන අනුපිටපත් ගොනු සඳහ� ගවේෂණය කරන්න.
 
-"{{ns:image}}:" උපසර්ගය රහිතව ගොනු න�මය ඇතුළත් කරන්න.',
+"{{ns:file}}:" උපසර්ගය රහිතව ගොනු න�මය ඇතුළත් කරන්න.',
 'fileduplicatesearch-legend'   => 'අනුපිටපතක් සඳහ� ගවේෂණය කරන්න',
 'fileduplicatesearch-filename' => 'ගොනු-න�මය:',
 'fileduplicatesearch-submit'   => 'ගවේෂණය',
@@ -2879,4 +3182,13 @@ $1',
 'blankpage'              => 'හිස් පිටුව',
 'intentionallyblankpage' => 'මෙම පිටුව අභිප්�රේතව හිස්ව තබන ලදි',
 
+# External image whitelist
+'external_image_whitelist' => '#මෙම පේළිය මෙලෙසම ප�වතීමට ඉඩදෙන්න<pre>
+# නිත්�ය ප්�රක��න ඛණ්ඩයන් (// අතර යෙදෙන කොටස පමණක්) පහත හොබන්න
+# බ�හිර (සෘජු සබ�ඳි) රූපයන්හි කල�ප ලිපිනයන් (URL) හ� සමග මේව� ග�ලපීම සිදුකෙරේ
+#ග�ලපෙන ඒව� රූපයන් ලෙස ප්�රදර්�නය කෙරෙන අතර, එසේ නොවුවහොත්  රූපයට සබ�ඳියක් පමණක් පෙන්නුම් කෙරෙනු ඇත
+# # යන්නෙන් ඇරඹෙන පේළි පරිකථනයන් ලෙස ස�ලකේ
+
+#සියළු නිත්ප්�රක� (නිත්�ය ප්�රක��න) ඛණ්ඩයන් මෙම පේළියට ඉහළින් හොබන්න. මෙම පේළිය මෙලෙසම ප�වතීමට ඉඩදෙන්න </pre>',
+
 );
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index 6133a574..55437bdf 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -8,6 +8,7 @@
  * @author Liso
  * @author Maros
  * @author Michawiki
+ * @author Mormegil
  * @author Palica
  * @author Rudko
  * @author Sp5uhe
@@ -114,24 +115,22 @@ $magicWords = array(
 );
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Médiá',
-	NS_SPECIAL        => 'Špeciálne',
-	NS_MAIN           => '',
-	NS_TALK           => 'Diskusia',
-	NS_USER           => 'Redaktor',
-	NS_USER_TALK      => 'Diskusia_s_redaktorom',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'Diskusia_k_{{grammar:datív|$1}}',
-	NS_IMAGE          => 'Obrázok',
-	NS_IMAGE_TALK     => 'Diskusia_k_obrázku',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Diskusia_k_MediaWiki',
-	NS_TEMPLATE       => 'Šablóna',
-	NS_TEMPLATE_TALK  => 'Diskusia_k_šablóne',
-	NS_HELP           => 'Pomoc',
-	NS_HELP_TALK      => 'Diskusia_k_pomoci',
-	NS_CATEGORY       => 'Kategória',
-	NS_CATEGORY_TALK  => 'Diskusia_ku_kategórii',
+	NS_MEDIA            => 'Médiá',
+	NS_SPECIAL          => 'Špeciálne',
+	NS_TALK             => 'Diskusia',
+	NS_USER             => 'Redaktor',
+	NS_USER_TALK        => 'Diskusia_s_redaktorom',
+	NS_PROJECT_TALK     => 'Diskusia_k_{{GRAMMAR:datív|$1}}',
+	NS_FILE             => 'Súbor',
+	NS_FILE_TALK        => 'Diskusia_k_súboru',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Diskusia_k_MediaWiki',
+	NS_TEMPLATE         => 'Šablóna',
+	NS_TEMPLATE_TALK    => 'Diskusia_k_šablóne',
+	NS_HELP             => 'Pomoc',
+	NS_HELP_TALK        => 'Diskusia_k_pomoci',
+	NS_CATEGORY         => 'Kategória',
+	NS_CATEGORY_TALK    => 'Diskusia_ku_kategórii',
 );
 
 # Compatbility with old names
@@ -139,7 +138,9 @@ $namespaceAliases = array(
 	"Komentár"               => NS_TALK,
 	"Komentár_k_redaktorovi" => NS_USER_TALK,
 	"Komentár_k_Wikipédii"   => NS_PROJECT_TALK,
-	"Komentár_k_obrázku"     => NS_IMAGE_TALK,
+	'Obrázok' => NS_FILE,
+	'Diskusia_k_obrázku' => NS_FILE_TALK,
+	"Komentár_k_obrázku"     => NS_FILE_TALK,
 	"Komentár_k_MediaWiki"   => NS_MEDIAWIKI_TALK,
 );
 
@@ -188,17 +189,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Skryť moje úpravy zo zoznamu sledovaných',
 'tog-watchlisthidebots'       => 'Skryť úpravy botov zo zoznamu sledovaných',
 'tog-watchlisthideminor'      => 'Skryť drobné úpravy zo zoznamu sledovaných',
+'tog-watchlisthideliu'        => 'Skryť úpravy prihlásených používateľov zo zoznamu sledovaných stránok',
+'tog-watchlisthideanons'      => 'Skryť úpravy anonymných používateľov zo zoznamu sledovaných stránok',
 'tog-nolangconversion'        => 'Vypnúť konverziu variantov',
 'tog-ccmeonemails'            => 'Posielať mi kópie mojich emailov, ktoré pošlem ostatným používateľom',
 'tog-diffonly'                => 'Nezobrazovať obsah stránky pod rozdielmi',
 'tog-showhiddencats'          => 'Zobraziť skryté kategórie',
+'tog-norollbackdiff'          => 'Vynechať rozdiel po vykonaní rollbacku',
 
 'underline-always'  => 'Vždy',
 'underline-never'   => 'Nikdy',
 'underline-default' => 'Štandardné nastavenie prehliada�a',
 
-'skinpreview' => '(Náhľad)',
-
 # Dates
 'sunday'        => 'nedeľa',
 'monday'        => 'pondelok',
@@ -292,14 +294,14 @@ $messages = array(
 'mytalk'         => 'Moja diskusia',
 'anontalk'       => 'Diskusia k tejto IP adrese',
 'navigation'     => 'Navigácia',
-'and'            => 'a',
+'and'            => '&#32;a',
 
 # Metadata in edit box
 'metadata_help' => 'Metadáta:',
 
 'errorpagetitle'    => 'Chyba',
 'returnto'          => 'Späť na $1.',
-'tagline'           => 'Z {{GRAMMAR:akuzatív|{{SITENAME}}}}',
+'tagline'           => 'Z {{GRAMMAR:genitív|{{SITENAME}}}}',
 'help'              => 'Pomoc',
 'search'            => 'Hľadať',
 'searchbutton'      => 'Hľadať',
@@ -329,14 +331,14 @@ $messages = array(
 'talkpagelinktext'  => 'Diskusia',
 'specialpage'       => 'Špeciálna stránka',
 'personaltools'     => 'Osobné nástroje',
-'postcomment'       => 'Pridať komentár',
+'postcomment'       => 'Nová sekcia',
 'articlepage'       => 'Zobraziť stránku',
 'talk'              => 'Diskusia',
 'views'             => 'Zobrazení',
 'toolbox'           => 'Nástroje',
 'userpage'          => 'Zobraziť stránku používateľa',
 'projectpage'       => 'Zobraziť projektovú stránku',
-'imagepage'         => 'Zobraziť popisnú stránku súboru',
+'imagepage'         => 'Zobraziť stránku súboru',
 'mediawikipage'     => 'Zobraziť stránku so správou',
 'templatepage'      => 'Zobraziť stránku šablóny',
 'viewhelppage'      => 'Zobraziť stránku Pomocníka',
@@ -355,8 +357,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'O {{GRAMMAR:lokál|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Úvod',
-'bugreports'           => 'Oznámenia o chybách',
-'bugreportspage'       => 'Project:Oznámenia o chybách',
 'copyright'            => 'Obsah je k dispozícii za licen�ných podmienok $1.',
 'copyrightpagename'    => 'autorské práva {{GRAMMAR:genitív|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:Autorské práva',
@@ -367,21 +367,19 @@ $messages = array(
 'edithelp'             => 'Ako upravovať stránku',
 'edithelppage'         => 'Help:Ako upravovať stránku',
 'faq'                  => 'Často kladené otázky',
-'faqpage'              => 'Projekt:Často kladené otázky',
+'faqpage'              => 'Project:Často kladené otázky',
 'helppage'             => 'Help:Obsah',
 'mainpage'             => 'Hlavná stránka',
 'mainpage-description' => 'Hlavná stránka',
-'policy-url'           => 'Projekt:Zásady a smernice',
+'policy-url'           => 'Project:Zásady a smernice',
 'portal'               => 'Portál komunity',
-'portal-url'           => 'Projekt:Portál komunity',
+'portal-url'           => 'Project:Portál komunity',
 'privacy'              => 'Ochrana osobných údajov',
 'privacypage'          => 'Project:Ochrana osobných údajov',
 
 'badaccess'        => 'Chyba povolenia',
-'badaccess-group0' => 'Nemáte povolenie na vykonanie požadovaného úkonu.',
-'badaccess-group1' => 'Činnosť, ktorú požadujete môže vykonať iba �len skupiny $1.',
-'badaccess-group2' => 'Činnosť, ktorú požadujete môže vykonať iba �len jednej zo skupín $1.',
-'badaccess-groups' => 'Činnosť, ktorú požadujete môže vykonať iba �len jednej zo skupín $1.',
+'badaccess-group0' => 'Nemáte povolenie na vykonanie požadovanej operácie.',
+'badaccess-groups' => 'Činnosť, ktorú požadujete, môže vykonať iba �len {{PLURAL:$2|skupiny|jednej zo skupín}}: $1.',
 
 'versionrequired'     => 'Požadovaná verzia MediaWiki $1',
 'versionrequiredtext' => 'Aby ste mohli používať túto stránku, požaduje sa verzia MediaWiki $1. Pozri [[Special:Version]].',
@@ -395,6 +393,8 @@ $messages = array(
 'editsection'             => 'upraviť',
 'editold'                 => 'upraviť',
 'viewsourceold'           => 'zobraziť zdroj',
+'editlink'                => 'upraviť',
+'viewsourcelink'          => 'zobraziť zdroj',
 'editsectionhint'         => 'Upraviť sekciu: $1',
 'toc'                     => 'Obsah',
 'showtoc'                 => 'zobraziť',
@@ -409,13 +409,13 @@ $messages = array(
 'site-atom-feed'          => 'Atom kanál $1',
 'page-rss-feed'           => 'RSS kanál „$1“',
 'page-atom-feed'          => 'Atom kanál „$1“',
-'red-link-title'          => '$1 (zatiaľ nevytvorená)',
+'red-link-title'          => '$1 (stránka neexistuje)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Stránka',
 'nstab-user'      => 'Stránka používateľa',
 'nstab-media'     => 'Multimédiá',
-'nstab-special'   => 'Špeciálne',
+'nstab-special'   => 'Špeciálna stránka',
 'nstab-project'   => 'Projektová stránka',
 'nstab-image'     => 'Súbor',
 'nstab-mediawiki' => 'Správa',
@@ -425,8 +425,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Takáto �innosť neexistuje',
-'nosuchactiontext'  => 'Softvér MediaWiki nepozná akciu,
-ktorú vyžadujete pomocou URL.',
+'nosuchactiontext'  => 'Operácia, ktorú vyžadujete pomocou URL nie je platná.
+Je možné, že ste napísali URL chybne alebo ste klikli na chybný odkaz.
+Prí�inou tiež môže byť chyba v softvéri, ktorý používa {{SITENAME}}.',
 'nosuchspecialpage' => 'Takáto špeciálna stránka neexistuje',
 'nospecialpagetext' => "<big>'''Vyžiadali ste si neplatnú špeciálnu stránku.'''</big>
 
@@ -450,7 +451,7 @@ $1',
 'nodb'                 => 'Nebolo možné vybrať databázu $1',
 'cachederror'          => 'Nasledujúca stránka je kópia vyžiadanej stránky z vyrovnávacej pamäte a nemusí byť aktuálna.',
 'laggedslavemode'      => 'Upozornenie: Je možné, že stránka neobsahuje posledné aktualizácie.',
-'readonly'             => 'Databáza uzamknutá',
+'readonly'             => 'Databáza je zamknutá',
 'enterlockreason'      => 'Zadajte dôvod požadovaného zamknutia vrátane odhadu, kedy o�akávate odomknutie',
 'readonlytext'         => 'Databáza je momentálne zamknutá, nové stránky a úpravy sú zablokované, pravdepodobne z dôvodu údržby databázy. Po skon�ení tejto údržby bude {{SITENAME}} opäť fungovať normálne.
 
@@ -478,9 +479,6 @@ Oznámte to prosím [[Special:ListUsers/sysop|správcovi]] a uve�te URL.',
 'cannotdelete'         => 'Nebolo možné zmazať danú stránku alebo súbor. (Možno už bol zmazaný niekým iným.)',
 'badtitle'             => 'Neplatný nadpis',
 'badtitletext'         => 'Požadovaný nadpis bol neplatný, nezadaný, alebo nesprávne odkazovaný z inej jazykovej verzie {{GRAMMAR:genitív|{{SITENAME}}}}. Mohol tiež obsahovať jeden alebo viac znakov, ktoré nie je možné použiť v nadpisoch.',
-'perfdisabled'         => 'Prepá�te! Táto funkcia bola do�asne vypnutá,
-pretože tak spomaľuje databázu, že nikto nemôže používať
-wiki.',
 'perfcached'           => 'Nasledujúce údaje pochádzajú z vyrovnávacej pamäte a nemusia byť úplne aktuálne.',
 'perfcachedts'         => 'Nasledujúce údaje pochádzajú z vyrovnávacej pamäte a naposledy boli aktualizované $1.',
 'querypage-no-updates' => 'Aktualizácie tejto stránky sú momentálne vypnuté. Tieto dáta sa v sú�asnosti nebudú obnovovať.',
@@ -494,7 +492,7 @@ Požiadavka: $2',
 'protectedpagetext'    => 'Táto stránka bola zamknutá aby sa zamedzilo úpravám.',
 'viewsourcetext'       => 'Môžete si zobraziť a kopírovať zdroj tejto stránky:',
 'protectedinterface'   => 'Táto stránka poskytuje text používateľského rozhrania a je zamknutá, aby sa predišlo jej zneužitiu.',
-'editinginterface'     => "'''Upozornenie:''' Upravujete stránku, ktorá poskytuje text používateľského rozhrania. Zmeny tejto stránky ovplyvnia vzhľad používateľského rozhrania ostatných používateľov. Zmeny prosím vykonávajte prostredníctvom [http://translatewiki.net/wiki/Main_Page?setlang=sk Betawiki], projektu pre lokalizáciu MediaWiki.",
+'editinginterface'     => "'''Upozornenie:''' Upravujete stránku, ktorá poskytuje text používateľského rozhrania. Zmeny tejto stránky ovplyvnia vzhľad používateľského rozhrania ostatných používateľov. Zmeny prosím vykonávajte prostredníctvom [http://translatewiki.net/wiki/Main_Page?setlang=sk translatewiki.net], projektu pre lokalizáciu MediaWiki.",
 'sqlhidden'            => '(SQL príkaz je skrytý)',
 'cascadeprotected'     => 'Táto stránka bola zamknutá proti úpravám, pretože je použitá na {{PLURAL:$1|nasledovnej stránke, ktorá je zamknutá|nasledovných stránkach, ktoré sú zamknuté}} voľbou „kaskádového zamknutia“:
 $2',
@@ -505,18 +503,18 @@ $2',
 Udaný dôvod: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Chybná konfigurácia: neznámy antivírus: <i>$1</i>',
+'virus-badscanner'     => "Chybná konfigurácia: neznámy antivírus: ''$1''",
 'virus-scanfailed'     => 'kontrola zlyhala (kód $1)',
 'virus-unknownscanner' => 'neznámy antivírus:',
 
 # Login and logout pages
 'logouttitle'                => 'Odhlásiť používateľa',
-'logouttext'                 => '<strong>Práve ste sa odhlásili.</strong>
+'logouttext'                 => "'''Práve ste sa odhlásili.'''
 
 Odteraz môžete používať {{GRAMMAR:akuzatív|{{SITENAME}}}} ako anonymný používateľ alebo sa môžete
 opäť [[Special:UserLogin|prihlásiť]] pod rovnakým alebo odlišným používateľským menom.
 Uvedomte si, že niektoré stránky sa môžu na�alej zobrazovať ako keby ste boli prihlásený, až kým nevymažete
-vyrovnávaciu pamäť vášho prehliada�a.',
+vyrovnávaciu pamäť vášho prehliada�a.",
 'welcomecreation'            => '== Vitaj, $1! ==
 
 Vaše konto je vytvorené.
@@ -528,7 +526,6 @@ Nezabudnite si nastaviť svoje [[Special:Preferences|používateľské nastaveni
 'remembermypassword'         => 'Pamätať si prihlásenie na tomto po�íta�i',
 'yourdomainname'             => 'Vaša doména:',
 'externaldberror'            => 'Bu� nastala chyba externej autentifika�nej databázy alebo vám nie je povolené aktualizovať váš externý ú�et.',
-'loginproblem'               => '<b>Nastal problém pri vašom prihlasovaní.</b><br />Skúste znova!',
 'login'                      => 'Prihlásiť',
 'nav-login-createaccount'    => 'Vytvorenie konta / prihlásenie',
 'loginprompt'                => 'Na prihlásenie do {{GRAMMAR:genitív|{{SITENAME}}}} musíte mať zapnuté kolá�iky (cookies).',
@@ -554,7 +551,7 @@ Zadajte iné meno.',
 'yourvariant'                => 'Variant jazyka:',
 'yournick'                   => 'Podpis:',
 'badsig'                     => 'Neplatný podpis v pôvodnom tvare; skontrolujte HTML zna�ky.',
-'badsiglength'               => 'Podpis je príliš dlhý.
+'badsiglength'               => 'Váš podpis je príliš dlhý.
 Musí obsahovať menej ako $1 {{PLURAL:$1|znak|znaky|znakov}}.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => '¹ Skuto�né meno (nepovinné): ak sa rozhodnete ho poskytnúť, bude použité na ozna�enie vašej práce.',
@@ -567,6 +564,7 @@ Musí obsahovať menej ako $1 {{PLURAL:$1|znak|znaky|znakov}}.',
 'loginsuccesstitle'          => 'Prihlásenie úspešné',
 'loginsuccess'               => "'''Teraz ste prihlásený do {{GRAMMAR:genitív|{{SITENAME}}}} ako „$1“.'''",
 'nosuchuser'                 => 'Používateľské meno „$1“ neexistuje.
+V používateľských menách sa rozlišuje veľkosť písmen.
 Skontrolujte preklepy alebo sa [[Special:UserLogin/signup|zaregistrujte ako nový používateľ]].',
 'nosuchusershort'            => 'V sú�asnosti neexistuje používateľ s menom „<nowiki>$1</nowiki>“. Skontrolujte preklepy.',
 'nouserspecified'            => 'Musíte uviesť meno používateľa.',
@@ -593,11 +591,11 @@ Predtým ako sa na ú�et pošle akákoľvek �alšia pošta, musíte splniť in
 'throttled-mailpassword'     => 'V priebehu {{PLURAL:$1|poslednej $1 hodiny|posledných $1 hodín}} už došlo k vyžiadaniu hesla.
 Aby sa zabránilo zneužitiu, vyžiadanie hesla je možné vykonať iba raz za {{PLURAL:$1|$1 hodinu|$1 hodiny|$1 hodín}}.',
 'mailerror'                  => 'Chyba pri posielaní e-mailu: $1',
-'acct_creation_throttle_hit' => 'Prepá�te, už máte vytvorených $1 ú�tov. Nemôžete ich z tejto IP adresy vytvoriť za 24 hodín viac. Toto je opatrenie proti vandalizmu.',
-'emailauthenticated'         => 'Vaša e-mailová adresa bola overená na $1.',
+'acct_creation_throttle_hit' => 'Návštevníci tejto wiki z vašej IP adresy už za posledný deň vytvorili {{PLURAL:$1|$1 ú�et|$1 ú�ty|$1 ú�tov}}, �o je maximálny po�et povolený za toto �asové obdobie.
+Z tohto dôvodu nemôžu návštevníci z tejto IP adresy momentálne vytvoriť �alšie ú�ty.',
+'emailauthenticated'         => 'Vaša emailová adresa bola overená $2 $3.',
 'emailnotauthenticated'      => 'Vaša e-mailová adresa ešte nebola overená. Preto nemôžete prijať emaily pre žiadnu z nasledovných funkcií.',
-'noemailprefs'               => '<strong>Nezadali ste žiadnu e-mailovú adresu</strong>, nasledujúce
-nástroje nebudú prístupné.',
+'noemailprefs'               => 'Tieto nástroje budú prístupné po vyplnení emailovej adresy vo vašich nastaveniach.',
 'emailconfirmlink'           => 'Potvr�te vašu e-mailovú adresu',
 'invalidemailaddress'        => 'Emailovú adresu nemožno akceptovať, pretože sa zdá, že má neplatný formát. Zadajte adresu v správnom tvare alebo nechajte príslušné polí�ko prázdne.',
 'accountcreated'             => 'Ú�et vytvorený',
@@ -607,18 +605,26 @@ nástroje nebudú prístupné.',
 ($4) s názvom „$2“, s heslom „$3“. Mali by ste sa prihlásiť a svoje heslo teraz zmeniť.
 
 Ak bol ú�et vytvorený omylom, túto správu môžete ignorovať.',
+'login-throttled'            => 'Nedávno ste uskuto�nili príliš mnoho neúspešných pokusov zadať heslo tohto ú�tu. Prosím, po�kajte predtým, než to skúsite znova.',
 'loginlanguagelabel'         => 'Jazyk: $1',
 
 # Password reset dialog
-'resetpass'               => 'Zmeniť heslo k ú�tu',
-'resetpass_announce'      => 'Prishlásili ste sa pomocou do�asného emailom zaslaného kódu. Pre dokon�enie prihlásenia je potrebné tu nastaviť nové heslo:',
-'resetpass_text'          => '<!-- Pridajte text sem -->',
-'resetpass_header'        => 'Zmeniť heslo k ú�tu',
-'resetpass_submit'        => 'Nastaviť heslo a prihlásiť sa',
-'resetpass_success'       => 'Vaše heslo bolo úspešne zmenené! Prebieha prihlasovanie...',
-'resetpass_bad_temporary' => 'Neplatné do�asné heslo. Možno ste už úspešne zmenili svoje heslo alebo vyžiadali nové do�asné heslo.',
-'resetpass_forbidden'     => 'Heslá nie je možné zmeniť',
-'resetpass_missing'       => 'Chýbajú údaje formulára.',
+'resetpass'                 => 'Zmeniť heslo',
+'resetpass_announce'        => 'Prishlásili ste sa pomocou do�asného emailom zaslaného kódu. Pre dokon�enie prihlásenia je potrebné tu nastaviť nové heslo:',
+'resetpass_text'            => '<!-- Pridajte text sem -->',
+'resetpass_header'          => 'Zmeniť heslo k ú�tu',
+'oldpassword'               => 'Staré heslo:',
+'newpassword'               => 'Nové heslo:',
+'retypenew'                 => 'Nové heslo (ešte raz):',
+'resetpass_submit'          => 'Nastaviť heslo a prihlásiť sa',
+'resetpass_success'         => 'Vaše heslo bolo úspešne zmenené! Prebieha prihlasovanie...',
+'resetpass_bad_temporary'   => 'Neplatné do�asné heslo. Možno ste už úspešne zmenili svoje heslo alebo vyžiadali nové do�asné heslo.',
+'resetpass_forbidden'       => 'Heslá nie je možné zmeniť',
+'resetpass-no-info'         => 'Aby ste mohli priamo pristupovať k tejto stránke, musíte sa prihlásiť.',
+'resetpass-submit-loggedin' => 'Zmeniť heslo',
+'resetpass-wrong-oldpass'   => 'Neplatné do�asné alebo aktuálne heslo. 
+Je možné, že sa vám už podarilo úspešne zmeniť svoje heslo alebo ste si vyžiadali nové do�asné heslo.',
+'resetpass-temp-password'   => 'Do�asné heslo:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tu�ný text',
@@ -643,8 +649,8 @@ Ak bol ú�et vytvorený omylom, túto správu môžete ignorovať.',
 'hr_tip'          => 'Vodorovná �iara (radšej ju nepoužívajte)',
 
 # Edit pages
-'summary'                          => 'Zhrnutie úprav',
-'subject'                          => 'Téma/nadpis',
+'summary'                          => 'Zhrnutie úprav:',
+'subject'                          => 'Téma/nadpis:',
 'minoredit'                        => 'Toto je drobná úprava',
 'watchthis'                        => 'Sledovať úpravy tejto stránky',
 'savearticle'                      => 'Uložiť stránku',
@@ -657,8 +663,8 @@ Vaša IP adresa bude zaznamenaná v histórii úprav tejto stránky.",
 'missingsummary'                   => "'''Pripomienka:''' Neposkytli ste zhrnutie úprav. Ak kliknete znova na Uložiť, vaše úpravy sa uložia bez zhrnutia úprav.",
 'missingcommenttext'               => 'Prosím, dolu napíšte komentár.',
 'missingcommentheader'             => "'''Pripomienka:''' Neposkytli ste predmet/hlavi�ku tohto komentára. Ak znova kliknete na tla�idlo Uložiť, vaša úprava sa uloží bez nej.",
-'summary-preview'                  => 'Náhľad zhrnutia',
-'subject-preview'                  => 'Náhľad predmetu/hlavi�ky',
+'summary-preview'                  => 'Náhľad zhrnutia:',
+'subject-preview'                  => 'Náhľad predmetu/hlavi�ky:',
 'blockedtitle'                     => 'Používateľ je zablokovaný',
 'blockedtext'                      => "<big>'''Vaše používateľské meno alebo IP adresa bola zablokovaná.'''</big>
 
@@ -711,31 +717,34 @@ Ak ste sa sem dostali nechtiac, iba kliknite na tla�idlo '''späť''' vo svojom
 'anontalkpagetext'                 => "----''Toto je diskusná stránka anonymného používateľa, ktorý nemá vytvorené svoje konto alebo ho nepoužíva. 
 Preto musíme na jeho identifikáciu použiť numerickú IP adresu. Je možné, že takúto IP adresu používajú viacerí používatelia.
 Ak ste anonymný používateľ a máte pocit, že vám boli adresované irelevantné diskusné príspevky, [[Special:UserLogin/signup|vytvorte si konto]] alebo sa [[Special:UserLogin|prihláste]], aby sa zamedzilo budúcim zámenám s inými anonymnými používateľmi.''",
-'noarticletext'                    => 'Na tejto stránke sa momentálne nenachádza žiadny text. Môžete [[Special:Search/{{PAGENAME}}|vyhľadávať názov tejto stránky]] v obsahu iných stránok alebo [{{fullurl:{{FULLPAGENAME}}|action=edit}} upravovať túto stránku].',
+'noarticletext'                    => 'Na tejto stránke sa momentálne nenachádza žiadny text.
+Môžete [[Special:Search/{{PAGENAME}}|vyhľadávať názov tejto stránky]] v obsahu iných stránok,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} vyhľadávať v súvisiacich záznamoch],
+alebo [{{fullurl:{{FULLPAGENAME}}|action=edit}} upravovať túto stránku].',
 'userpage-userdoesnotexist'        => 'Používateľský ú�et „$1“ nie je registrovaný. Prosím, zaškrtnite ak chcete vytvoriť/upravovať túto stránku.',
 'clearyourcache'                   => "'''Poznámka: Aby sa zmeny prejavili, po uložení musíte vymazať vyrovnávaciu pamäť vášho prehliada�a.'''
 '''Mozilla / Firefox / Safari:''' držte stla�ený ''Shift'' a kliknite na ''Reload'' alebo stla�te bu� ''Ctrl-F5'' alebo ''Ctrl-R'' (''Comand-R'' na Macintosh); '''Konqueror:''': kliknite na tla�idlo ''Reload'' alebo stla�te ''F5''; '''Opera''' vymazať vyrovnávaciu pamäť prehliada�a v ponuke ''Tools→Preferences''; '''Internet Explorer:''' držte ''Ctrl'' a kliknite na ''Refresh'' alebo stla�te ''Ctrl-F5'';",
-'usercssjsyoucanpreview'           => '<strong>Tip:</strong> Váš nový CSS/JS pred uložením otestujete stla�ením tla�idla „Zobraziť náhľad“.',
+'usercssjsyoucanpreview'           => "'''Tip:''' Váš nový CSS/JS pred uložením otestujete stla�ením tla�idla „Zobraziť náhľad“.",
 'usercsspreview'                   => "'''Nezabudnite, že toto je iba náhľad vášho používateľského CSS, ešte nebolo uložené!'''",
 'userjspreview'                    => "'''Nezabudnite, že iba testujete/náhľad vášho používateľského JavaScriptu, ešte nebol uložený!'''",
 'userinvalidcssjstitle'            => "'''Upozornenie:''' Neexistuje vzhľad „$1“. Pamätajte, že vlastné .css a .js stránky používajú názov s malými písmenami, napr. {{ns:user}}:Foo/monobook.css a nie {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Aktualizovaný)',
-'note'                             => '<strong>Poznámka: </strong>',
-'previewnote'                      => '<strong>Nezabudnite, toto je iba náhľad stránky, ktorú upravujete.
-Zmeny ešte nie sú uložené!</strong>',
+'note'                             => "'''Poznámka: '''",
+'previewnote'                      => "'''Nezabudnite, toto je iba náhľad stránky, ktorú upravujete.
+Zmeny ešte nie sú uložené!'''",
 'previewconflict'                  => 'Tento náhľad upravenej stránky zobrazuje text z horného poľa s textom tak, ako sa zobrazí potom, ke� ju uložíte.',
-'session_fail_preview'             => '<strong>Prepá�te, nemohli sme spracovať váš príspevok kvôli strate údajov relácie.
+'session_fail_preview'             => "'''Prepá�te, nemohli sme spracovať váš príspevok kvôli strate údajov relácie.
 Skúste to prosím ešte raz.
-Ak to nebude fungovať, skúste sa [[Special:UserLogout|odhlásiť]] a znovu prihlásiť.</strong>',
-'session_fail_preview_html'        => "<strong>Prepá�te! Nemohli sme spracovať vašu úpravu kvôli strate údajov relácie.</strong>
+Ak to nebude fungovať, skúste sa [[Special:UserLogout|odhlásiť]] a znovu prihlásiť.'''",
+'session_fail_preview_html'        => "'''Prepá�te! Nemohli sme spracovať vašu úpravu kvôli strate údajov relácie.'''
 
 ''Pretože {{SITENAME}} má použitie HTML umožnené, náhľad sa nezobrazí (prevencia pred JavaScript útokmi).''
 
-<strong>Ak je toto legitímny pokus o úpravu, skúste to prosím znova. Ak to stále nefunguje, skúste sa [[Special:UserLogout|odhlásiť]] a znovu prihlásiť.</strong>",
-'token_suffix_mismatch'            => '<strong>Vaša úprava bola zamietnutá, pretože váš klient pokazil znaky s diakritikou v edita�nom symbole (token). Úprava bola zamietnutá, aby sa zabránilo poškodeniu textu stránky. Toto sa ob�as stáva, ke� používate chybnú anonymnú proxy službu cez webové rozhranie.</strong>',
+'''Ak je toto legitímny pokus o úpravu, skúste to prosím znova. Ak to stále nefunguje, skúste sa [[Special:UserLogout|odhlásiť]] a znovu prihlásiť.'''",
+'token_suffix_mismatch'            => "'''Vaša úprava bola zamietnutá, pretože váš klient pokazil znaky s diakritikou v edita�nom symbole (token). Úprava bola zamietnutá, aby sa zabránilo poškodeniu textu stránky. Toto sa ob�as stáva, ke� používate chybnú anonymnú proxy službu cez webové rozhranie.'''",
 'editing'                          => 'Úprava stránky $1',
 'editingsection'                   => 'Úprava stránky $1 (sekcia)',
-'editingcomment'                   => 'Úprava stránky $1 (komentár)',
+'editingcomment'                   => 'Úprava stránky $1 (nová sekcia)',
 'editconflict'                     => 'Konflikt pri úprave: $1',
 'explainconflict'                  => "Niekto iný zmenil túto stránku, zatiaľ �o ste ju upravovali vy.
 Horné okno na úpravy obsahuje text stránky tak, ako je momentálne platný.
@@ -744,31 +753,33 @@ Budete musieť zlú�iť vaše zmeny s existujúcim textom.
 '''Iba''' obsah horného okna sa uloží, ke� stla�íte „{{MediaWiki:savearticle}}“.",
 'yourtext'                         => 'Váš text',
 'storedversion'                    => 'Uložená verzia',
-'nonunicodebrowser'                => '<strong>UPOZORNENIE: Váš prehliada� nepodporuje unicode. Do�asným riešením ako bezpe�ne upravovať stránky je, že ne-ASCII znaky sa v upravovacom textovom poli zobrazia ako zodpovedajúce hexadecimálne hodnoty.</strong>',
-'editingold'                       => '<strong>UPOZORNENIE: Upravujete starú
-verziu tejto stránky. Ak vašu úpravu uložíte, prepíšete tým všetky úpravy, ktoré nasledovali po tejto starej verzii.</strong>',
+'nonunicodebrowser'                => "'''UPOZORNENIE: Váš prehliada� nepodporuje unicode. Do�asným riešením ako bezpe�ne upravovať stránky je, že ne-ASCII znaky sa v upravovacom textovom poli zobrazia ako zodpovedajúce hexadecimálne hodnoty.'''",
+'editingold'                       => "'''UPOZORNENIE: Upravujete starú
+verziu tejto stránky. Ak vašu úpravu uložíte, prepíšete tým všetky úpravy, ktoré nasledovali po tejto starej verzii.'''",
 'yourdiff'                         => 'Rozdiely',
-'copyrightwarning'                 => 'Nezabudnite, že všetky príspevky do {{GRAMMAR:genitív|{{SITENAME}}}} sa považujú za príspevky pod licenciou $2 (podrobnosti pozri pod $1). Ak nechcete, aby bolo to, �o ste napísali, neúprosne upravované a �alej ľubovoľne rozširované, tak sem váš text neumiestňujte.<br />
+'copyrightwarning'                 => "Nezabudnite, že všetky príspevky do {{GRAMMAR:genitív|{{SITENAME}}}} sa považujú za príspevky pod licenciou $2 (podrobnosti pozri pod $1). Ak nechcete, aby bolo to, �o ste napísali, neúprosne upravované a �alej ľubovoľne rozširované, tak sem váš text neumiestňujte.<br />
 
 Týmto sa právne zaväzujete, že ste tento text bu� napísali sám, alebo že je skopírovaný
 z voľného diela (public domain) alebo podobného zdroja neobmedzeného autorskými právami.
-<strong>NEUMIESTŇUJTE TU BEZ POVOLENIA DIELA CHR�NENÉ AUTORSK�M PR�VOM!</strong>',
-'copyrightwarning2'                => 'Prosím uvedomte si, že všetky príspevky do {{GRAMMAR:genitív|{{SITENAME}}}} môžu byť upravované, skracované alebo odstránené inými prispievateľmi. Ak nechcete, aby Vaše texty boli menené, tak ich tu neuverejňujte.<br />
+'''NEUMIESTŇUJTE TU BEZ POVOLENIA DIELA CHR�NENÉ AUTORSK�M PR�VOM!'''",
+'copyrightwarning2'                => "Prosím uvedomte si, že všetky príspevky do {{GRAMMAR:genitív|{{SITENAME}}}} môžu byť upravované, skracované alebo odstránené inými prispievateľmi. Ak nechcete, aby Vaše texty boli menené, tak ich tu neuverejňujte.<br />
 
 Týmto sa právne zaväzujete, že ste tento text bu� napísali sám, alebo že je skopírovaný
 z voľného diela (public domain) alebo podobného zdroja neobmedzeného autorskými právami (podrobnosti: $1).
-<strong>NEUMIESTŇUJTE SEM BEZ POVOLENIA DIELA CHR�NENÉ AUTORSK�M PR�VOM!</strong>',
-'longpagewarning'                  => '<strong>UPOZORNENIE: Táto stránka má $1 kilobajtov; niektoré
+'''NEUMIESTŇUJTE SEM BEZ POVOLENIA DIELA CHR�NENÉ AUTORSK�M PR�VOM!'''",
+'longpagewarning'                  => "'''UPOZORNENIE: Táto stránka má $1 kilobajtov; niektoré
 prehliada�e by mohli mať problémy s úpravou stránok, ktorých veľkosť sa blíži k alebo presahuje 32 kb.
-Zvážte, �i by nebolo možné rozdeliť stránku na menšie sekcie.</strong>',
-'longpageerror'                    => '<strong>CHYBA: Text, ktorý ste poslali má $1 kilobajtov, �o je viac ako maximum $2 kilobajtov. Nie je možné ho uložiť.</strong>',
-'readonlywarning'                  => '<strong>UPOZORNENIE: Databáza bola po�as upravovania stránky zamknutá z dôvodu údržby,
+Zvážte, �i by nebolo možné rozdeliť stránku na menšie sekcie.'''",
+'longpageerror'                    => "'''CHYBA: Text, ktorý ste poslali má $1 kilobajtov, �o je viac ako maximum $2 kilobajtov. Nie je možné ho uložiť.'''",
+'readonlywarning'                  => "'''UPOZORNENIE: Databáza bola po�as upravovania stránky zamknutá z dôvodu údržby,
 takže stránku momentálne nemôžete uložiť. Môžete skopírovať a vložiť
-text do textového súboru a uložiť si ho na neskôr.</strong>',
-'protectedpagewarning'             => '<strong>UPOZORNENIE: Táto stránka bola zamknutá, takže ju môžu upravovať iba používatelia s oprávnením správcu.</strong>',
+text do textového súboru a uložiť si ho na neskôr.'''
+
+Správca, ktorý ju zamkol, uviedol nasledovné vysvetlenie: $1",
+'protectedpagewarning'             => "'''UPOZORNENIE: Táto stránka bola zamknutá, takže ju môžu upravovať iba používatelia s oprávnením správcu.'''",
 'semiprotectedpagewarning'         => "'''Poznámka:''' Táto stránka bola zamknutá tak, aby ju mohli upravovať iba registrovaní používatelia.",
 'cascadeprotectedwarning'          => "'''Upozornenie:''' Táto stránka bola zamknutá (takže ju môžu upravovať iba používatelia s privilégiami správcu), pretože je použitá na {{PLURAL:$1|nasledovnej stránke|nasledovných stránkach}} s kaskádovým zamknutím:",
-'titleprotectedwarning'            => '<strong>UPOZORNENIE: Táto stránka bola zamknutá, takže ju môžu vytvoriť iba niektorí používatelia.</strong>',
+'titleprotectedwarning'            => "'''UPOZORNENIE: Táto stránka bola zamknutá, takže ju môžu vytvoriť iba používatelia s [[Special:ListGroupRights|ur�itými právami]].'''",
 'templatesused'                    => 'Šablóny použité na tejto stránke:',
 'templatesusedpreview'             => 'Šablóny použité v tomto náhľade:',
 'templatesusedsection'             => 'Šablóny použité v tejto sekcii:',
@@ -787,11 +798,21 @@ Teraz sa môžete vrátiť späť a upravovať existujúcu stránku alebo [[Spec
 
 Mali by ste zvážiť, �i je vhodné pokra�ovať v úpravách tejto stránky.
 Odkaz na záznam zmazaní:",
+'deleted-notice'                   => 'Táto stránka bola zmazaná. Dolu je uvedený záznam zmazaní.',
+'deletelog-fulllog'                => 'Zobraziť úplný záznam',
+'edit-hook-aborted'                => 'Úpravu zrušila prídavná funkcia (prípojný bod syntaktického analyzátora).
+Neudala vysvetlenie.',
+'edit-gone-missing'                => 'Nebolo možné aktualizovať stránku.
+Zdá sa, že bola zmazaná.',
+'edit-conflict'                    => 'Konflikt pri upravovaní.',
+'edit-no-change'                   => 'Vaša úprava bola ignorovaná, pretože ste v texte ni� nezmenili.',
+'edit-already-exists'              => 'Nebolo možné vytvoriť novú stránku.
+Už existuje.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Upozornenie: Táto stránka obsahuje príliš mnoho volaní funkcií syntaktického analyzátora, ktoré nadmerne zaťažujú server.
 
-Je ich $1. Malo by ich byť menej ako $2.',
+Obsahuje $1 {{PLURAL:$1|volanie|volania|volaní}}. Mala by obsahovať menej ako $2 {{PLURAL:$1|volanie|volania|volaní}}.',
 'expensive-parserfunction-category'       => 'Stránky s príliš veľkým po�tom volaní funkcií syntaktického analyzátora',
 'post-expand-template-inclusion-warning'  => 'Upozornenie: Vkladaná šablóna je príliš veľká.
 Niektoré zo šablón nebudú vložené.',
@@ -799,6 +820,8 @@ Niektoré zo šablón nebudú vložené.',
 'post-expand-template-argument-warning'   => 'Upozornenie: Táto stránka obsahuje aspoň jeden argument šalóny, ktorý je príliš veľký.
 Tieto argumenty boli vynechané.',
 'post-expand-template-argument-category'  => 'Stránky obsahujúce vynechané argumenty šablón',
+'parser-template-loop-warning'            => 'Zistená slu�ka v šablónach: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Bol prekro�ený limit rekurzie šablón ($1)',
 
 # "Undo" feature
 'undo-success' => 'Úpravu nie je možné vrátiť. Prosím skontrolujte tento rozdiel, �ím overíte, že táto úprava je tá, ktorú chcete, a následne uložte zmeny, �ím ukon�íte vrátenie.',
@@ -813,30 +836,29 @@ Tieto argumenty boli vynechané.',
 Dôvod, ktorý $3 uviedol, je ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Zobraziť záznamy pre túto stránku',
-'nohistory'           => 'Pre túto stránku neexistuje história.',
-'revnotfound'         => 'Predošlá verzia nebola nájdená',
-'revnotfoundtext'     => 'Požadovaná staršia verzia stránky nebola nájdená.
-Prosím skontrolujte URL adresu, ktorú ste použili na prístup k tejto stránke.',
-'currentrev'          => 'Aktuálna verzia',
-'revisionasof'        => 'Verzia zo dňa a �asu $1',
-'revision-info'       => 'Revízia z $1; $2',
-'previousrevision'    => '� Staršia verzia',
-'nextrevision'        => 'Novšia verzia →',
-'currentrevisionlink' => 'Aktuálna úprava',
-'cur'                 => 'aktuálna',
-'next'                => '�alšia',
-'last'                => 'posledná',
-'page_first'          => 'prvá',
-'page_last'           => 'posledná',
-'histlegend'          => 'Porovnanie zmien: ozna�te výberové polí�ka revízií, ktoré sa majú porovnať a kliknite na tla�idlo dolu.<br />
+'viewpagelogs'           => 'Zobraziť záznamy pre túto stránku',
+'nohistory'              => 'Pre túto stránku neexistuje história.',
+'currentrev'             => 'Aktuálna verzia',
+'currentrev-asof'        => 'Aktuálna revízia z $1',
+'revisionasof'           => 'Verzia zo dňa a �asu $1',
+'revision-info'          => 'Revízia z $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Staršia verzia',
+'nextrevision'           => 'Novšia verzia →',
+'currentrevisionlink'    => 'Aktuálna úprava',
+'cur'                    => 'aktuálna',
+'next'                   => '�alšia',
+'last'                   => 'posledná',
+'page_first'             => 'prvá',
+'page_last'              => 'posledná',
+'histlegend'             => 'Porovnanie zmien: ozna�te výberové polí�ka revízií, ktoré sa majú porovnať a kliknite na tla�idlo dolu.<br />
 Legenda: (aktuálna) = rozdiel oproti aktuálnej verzii,
 (posledná) = rozdiel oproti predchádzajúcej verzii, D = drobná úprava',
-'deletedrev'          => '[zmazané]',
-'histfirst'           => 'najskoršie',
-'histlast'            => 'posledné',
-'historysize'         => '(({{PLURAL:$1|jeden bajt|$1 bajty|$1 bajtov}}))',
-'historyempty'        => '(prázdne)',
+'history-fieldset-title' => 'Prechádzať históriou',
+'deletedrev'             => '[zmazané]',
+'histfirst'              => 'najskoršie',
+'histlast'               => 'posledné',
+'historysize'            => '(({{PLURAL:$1|jeden bajt|$1 bajty|$1 bajtov}}))',
+'historyempty'           => '(prázdne)',
 
 # Revision feed
 'history-feed-title'          => 'História úprav',
@@ -923,6 +945,7 @@ Uistite sa, že táto zmena zachová historickú kontinuitu zmien stránky.',
 'mergehistory-invalid-destination' => 'Cieľová stránka musí byť platný názov.',
 'mergehistory-autocomment'         => '[[:$1]] bola zlú�ená do [[:$2]]',
 'mergehistory-comment'             => '[[:$1]] bola zlú�ená do [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Zdrojová a cieľová stránka sa nemôžu zhodovať',
 
 # Merge log
 'mergelog'           => 'Záznam zlú�ení',
@@ -935,119 +958,200 @@ Uistite sa, že táto zmena zachová historickú kontinuitu zmien stránky.',
 'difference'              => '(Rozdiel medzi revíziami)',
 'lineno'                  => 'Riadok $1:',
 'compareselectedversions' => 'Porovnať ozna�ené verzie',
+'visualcomparison'        => 'Vizuálne porovnanie',
+'wikicodecomparison'      => 'Porovnanie wikitextu',
 'editundo'                => 'vrátiť',
 'diff-multi'              => '{{PLURAL:$1|Jedna medziľahlá revízia nie je zobrazená|$1 medziľahlé revízie nie sú zobrazené|$1 medziľahlých revízií nie je zobrazených}}.',
+'diff-movedto'            => 'presunuté na $1',
+'diff-styleadded'         => 'pridaný štýl $1',
+'diff-added'              => 'pridané $1',
+'diff-changedto'          => 'zmenené na $1',
+'diff-movedoutof'         => 'presunuté z $1',
+'diff-styleremoved'       => 'odstránený štýl $1',
+'diff-removed'            => 'odstránené $1',
+'diff-changedfrom'        => 'zmenené z $1',
+'diff-src'                => 'zdroj',
+'diff-withdestination'    => 's cieľom $1',
+'diff-with'               => '&#32;s $1 $2',
+'diff-with-final'         => '&#32;a $1 $2',
+'diff-width'              => 'šírka',
+'diff-height'             => 'výška',
+'diff-p'                  => "'''odstavec'''",
+'diff-blockquote'         => "'''citácia'''",
+'diff-h1'                 => "'''nadpis (úroveň 1)'''",
+'diff-h2'                 => "'''nadpis (úroveň 2)'''",
+'diff-h3'                 => "'''nadpis (úroveň 3)'''",
+'diff-h4'                 => "'''nadpis (úroveň 4)'''",
+'diff-h5'                 => "'''nadpis (úroveň 5)'''",
+'diff-pre'                => "'''predformátovaný blok'''",
+'diff-div'                => "'''rozdelenie'''",
+'diff-ul'                 => "'''nezoradený zoznam'''",
+'diff-ol'                 => "'''zoradený zoznam'''",
+'diff-li'                 => "'''položka zoznamu'''",
+'diff-table'              => "'''tabuľka'''",
+'diff-tbody'              => "'''obsah tabuľky'''",
+'diff-tr'                 => "'''riadok'''",
+'diff-td'                 => "'''bunka'''",
+'diff-th'                 => "'''hlavi�ka'''",
+'diff-br'                 => "'''zalomenie'''",
+'diff-hr'                 => "'''vodorovná �iara'''",
+'diff-code'               => "'''blok po�íta�ového kódu'''",
+'diff-dl'                 => "'''defini�ný zoznam'''",
+'diff-dt'                 => "'''defini�ný termín'''",
+'diff-dd'                 => "'''definícia'''",
+'diff-input'              => "'''vstup'''",
+'diff-form'               => "'''formulár'''",
+'diff-img'                => "'''obrázok'''",
+'diff-span'               => "'''interval'''",
+'diff-a'                  => "'''odkaz'''",
+'diff-i'                  => "'''kurzíva'''",
+'diff-b'                  => "'''hrubé'''",
+'diff-strong'             => "'''zvýraznené'''",
+'diff-em'                 => "'''dôraz'''",
+'diff-font'               => "'''písmo'''",
+'diff-big'                => "'''veľké'''",
+'diff-del'                => "'''zmazané'''",
+'diff-tt'                 => "'''s pevnou šírkou'''",
+'diff-sub'                => "'''dolný index'''",
+'diff-sup'                => "'''horný index'''",
+'diff-strike'             => "'''pre�iarknuté'''",
 
 # Search results
-'searchresults'             => 'Výsledky vyhľadávania',
-'searchresulttext'          => 'Viac informácií o vyhľadávaní vo {{GRAMMAR:lokál|{{SITENAME}}}} nájdete na stránke [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Hľadali ste „'''[[:$1]]'''“ ([[Special:Prefixindex/$1|všetky stránky za�ínajúce na „$1�]] | [[Special:WhatLinksHere/$1|všetky stránky odkazujúce na „$1�]])",
-'searchsubtitleinvalid'     => 'Na vyhľadávaciu požiadavku „$1“',
-'noexactmatch'              => "'''Neexistuje stránka nazvaná „$1“'''. Chcete '''[[:$1|vytvoriť novú stránku]]''' s týmto názvom?",
-'noexactmatch-nocreate'     => "'''Stránka s názvom „$1“ neexistuje.'''",
-'toomanymatches'            => 'Hľadanie vrátilo príliš veľa výsledkov. Prosím, skúste inú požiadavku.',
-'titlematches'              => 'Vyhovujúce názvy stránok',
-'notitlematches'            => 'V názvoch stránok nebola nájdená zhoda',
-'textmatches'               => 'Zhody v textoch stránok',
-'notextmatches'             => 'V textoch stránok nebola nájdená zhoda',
-'prevn'                     => 'predošlých $1',
-'nextn'                     => '�alších $1',
-'viewprevnext'              => 'Zobraziť ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 slovo|$2 slová|$2 slov}})',
-'search-result-score'       => 'Relevancia: $1%',
-'search-redirect'           => '(presmerovanie $1)',
-'search-section'            => '(sekcia $1)',
-'search-suggest'            => 'Mali ste na mysli „$1“?',
-'search-interwiki-caption'  => 'Sesterské projekty',
-'search-interwiki-default'  => '$1 výsledkov:',
-'search-interwiki-more'     => '(viac)',
-'search-mwsuggest-enabled'  => 's návrhmi',
-'search-mwsuggest-disabled' => 'bez návrhov',
-'search-relatedarticle'     => 'Súvisiace',
-'mwsuggest-disable'         => 'Vypnúť AJAX návrhy',
-'searchrelated'             => 'súvisiace',
-'searchall'                 => 'všetko',
-'showingresults'            => "Nižšie {{PLURAL:$1|je zobrazený jeden výsledok|sú zobrazené '''1''' výsledky|je zobrazených '''$1''' výsledkov}}, po�núc od  #<b>$2</b>.",
-'showingresultsnum'         => "Nižšie {{PLURAL:$3|je zobrazený najviac '''1''' výsledok|sú zobrazené najviac '''$3''' výsledky|je zobrazených najviac '''$3''' výsledkov}}, po�núc od  #'''$2'''.",
-'showingresultstotal'       => "{{PLURAL:$3|Zobrazuje sa výsledok '''$1''' z '''$3'''|Zobrazujú sa výsledky '''$1 - $2''' z '''$3'''}}",
-'nonefound'                 => "'''Poznámka''': Štandardne sa vyhľadáva iba v niektorých menných priestoroch. Skúste pred vyhľadávaný reťazec napísať ''all:'', aby sa hľadalo v celom obsahu (vrátane diskusných stránok, šablón at�.) alebo použite ako predponu požadovaný menný priestor.",
-'powersearch'               => 'Vyhľadávanie',
-'powersearch-legend'        => 'Pokro�ilé hľadanie',
-'powersearch-ns'            => 'Hľadať v menných priestoroch:',
-'powersearch-redir'         => 'Vypísať presmerovania',
-'powersearch-field'         => 'Hľadať',
-'search-external'           => 'Externé vyhľadávanie',
-'searchdisabled'            => 'Prepá�te! Fulltextové vyhľadávanie bolo do�asne vypnuté z dôvodu preťaženia. Zatiaľ môžete použiť hľadanie pomocou Google, ktoré však nemusí byť aktuálne.',
+'searchresults'                    => 'Výsledky vyhľadávania',
+'searchresults-title'              => 'Výsledky hľadania „$1“',
+'searchresulttext'                 => 'Viac informácií o vyhľadávaní vo {{GRAMMAR:lokál|{{SITENAME}}}} nájdete na stránke [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Hľadali ste „'''[[:$1]]'''“ ([[Special:Prefixindex/$1|všetky stránky za�ínajúce na „$1�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|všetky stránky odkazujúce na „$1�]])",
+'searchsubtitleinvalid'            => 'Na vyhľadávaciu požiadavku „$1“',
+'noexactmatch'                     => "'''Neexistuje stránka nazvaná „$1“'''. Chcete '''[[:$1|vytvoriť novú stránku]]''' s týmto názvom?",
+'noexactmatch-nocreate'            => "'''Stránka s názvom „$1“ neexistuje.'''",
+'toomanymatches'                   => 'Hľadanie vrátilo príliš veľa výsledkov. Prosím, skúste inú požiadavku.',
+'titlematches'                     => 'Vyhovujúce názvy stránok',
+'notitlematches'                   => 'V názvoch stránok nebola nájdená zhoda',
+'textmatches'                      => 'Zhody v textoch stránok',
+'notextmatches'                    => 'V textoch stránok nebola nájdená zhoda',
+'prevn'                            => 'predošlých $1',
+'nextn'                            => '�alších $1',
+'viewprevnext'                     => 'Zobraziť ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Možnosti hľadania',
+'searchmenu-exists'                => "*Stránka '''[[$1]]'''",
+'searchmenu-new'                   => "'''Vytvoriť stránku „[[:$1|$1]]“ na tejto wiki'''",
+'searchhelp-url'                   => 'Help:Obsah',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Prehliadať stránky s touto predponou]]',
+'searchprofile-articles'           => 'Stránky s obsahom',
+'searchprofile-articles-and-proj'  => 'Stránky s obsahom & stránky projektu',
+'searchprofile-project'            => 'Stránky projektu',
+'searchprofile-images'             => 'Súbory',
+'searchprofile-everything'         => 'VÅ¡etky',
+'searchprofile-advanced'           => 'Pokro�ilé',
+'searchprofile-articles-tooltip'   => 'Hľadať v $1',
+'searchprofile-project-tooltip'    => 'Hľadať v $1',
+'searchprofile-images-tooltip'     => 'Hľadať súbory',
+'searchprofile-everything-tooltip' => 'Hľadať v celom obsahu (vrátane diskusných stránok)',
+'searchprofile-advanced-tooltip'   => 'Hľadať vo vymenovaných menných priestoroch',
+'prefs-search-nsdefault'           => 'Hľadať so štandardným nastavením:',
+'prefs-search-nscustom'            => 'Hľadať vo vymenovaných menných priestoroch:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 slovo|$2 slová|$2 slov}})',
+'search-result-score'              => 'Relevancia: $1%',
+'search-redirect'                  => '(presmerovanie $1)',
+'search-section'                   => '(sekcia $1)',
+'search-suggest'                   => 'Mali ste na mysli „$1“?',
+'search-interwiki-caption'         => 'Sesterské projekty',
+'search-interwiki-default'         => '$1 výsledkov:',
+'search-interwiki-more'            => '(viac)',
+'search-mwsuggest-enabled'         => 's návrhmi',
+'search-mwsuggest-disabled'        => 'bez návrhov',
+'search-relatedarticle'            => 'Súvisiace',
+'mwsuggest-disable'                => 'Vypnúť AJAX návrhy',
+'searchrelated'                    => 'súvisiace',
+'searchall'                        => 'všetko',
+'showingresults'                   => "Nižšie {{PLURAL:$1|je zobrazený jeden výsledok|sú zobrazené '''1''' výsledky|je zobrazených '''$1''' výsledkov}}, po�núc od  #<b>$2</b>.",
+'showingresultsnum'                => "Nižšie {{PLURAL:$3|je zobrazený najviac '''1''' výsledok|sú zobrazené najviac '''$3''' výsledky|je zobrazených najviac '''$3''' výsledkov}}, po�núc od  #'''$2'''.",
+'showingresultstotal'              => "{{PLURAL:$4|Zobrazuje sa výsledok '''$1''' z '''$3'''|Zobrazujú sa výsledky '''$1 - $2''' z '''$3'''}}",
+'nonefound'                        => "'''Poznámka''': Štandardne sa vyhľadáva iba v niektorých menných priestoroch. Skúste pred vyhľadávaný reťazec napísať ''all:'', aby sa hľadalo v celom obsahu (vrátane diskusných stránok, šablón at�.) alebo použite ako predponu požadovaný menný priestor.",
+'search-nonefound'                 => 'Vyhľadávanie nenašlo žiadne výsledky.',
+'powersearch'                      => 'Vyhľadávanie',
+'powersearch-legend'               => 'Pokro�ilé hľadanie',
+'powersearch-ns'                   => 'Hľadať v menných priestoroch:',
+'powersearch-redir'                => 'Vypísať presmerovania',
+'powersearch-field'                => 'Hľadať',
+'search-external'                  => 'Externé vyhľadávanie',
+'searchdisabled'                   => 'Prepá�te! Fulltextové vyhľadávanie bolo do�asne vypnuté z dôvodu preťaženia. Zatiaľ môžete použiť hľadanie pomocou Google, ktoré však nemusí byť aktuálne.',
 
 # Preferences page
-'preferences'              => 'Nastavenia',
-'mypreferences'            => 'nastavenia',
-'prefs-edits'              => 'Po�et úprav:',
-'prefsnologin'             => 'Nie ste prihlásený/á',
-'prefsnologintext'         => 'Aby ste mohli zmeniť svoje nastavenia, musíte byť <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} prihlásený].',
-'prefsreset'               => 'Boli obnovené pôvodné nastavenia.',
-'qbsettings'               => 'Naviga�ný panel',
-'qbsettings-none'          => 'Žiadne',
-'qbsettings-fixedleft'     => 'Ukotvené vľavo',
-'qbsettings-fixedright'    => 'Ukotvené vpravo',
-'qbsettings-floatingleft'  => 'Plávajúce vľavo',
-'qbsettings-floatingright' => 'Plávajúce vpravo',
-'changepassword'           => 'Zmeniť heslo',
-'skin'                     => 'Vzhľad',
-'math'                     => 'Vykreslenie matematiky',
-'dateformat'               => 'Formát dátumu',
-'datedefault'              => 'štandardný',
-'datetime'                 => 'Dátum a �as',
-'math_failure'             => 'Syntaktická analýza (parsing) neúspešná',
-'math_unknown_error'       => 'neznáma chyba',
-'math_unknown_function'    => 'neznáma funkcia',
-'math_lexing_error'        => 'lexikálna chyba',
-'math_syntax_error'        => 'syntaktická chyba',
-'math_image_error'         => 'PNG konverzia neúspešná; skontrolujte správnosť inštalácie programov: latex, dvips, gs a convert',
-'math_bad_tmpdir'          => 'Nemožno zapisovať alebo vytvoriť do�asný matematický adresár',
-'math_bad_output'          => 'Nemožno zapisovať alebo vytvoriť výstupný matematický adresár',
-'math_notexvc'             => 'Chýbajúci program texvc; konfigurácia je popísaná v math/README.',
-'prefs-personal'           => 'Profil',
-'prefs-rc'                 => 'Posledné úpravy',
-'prefs-watchlist'          => 'Sledované stránky',
-'prefs-watchlist-days'     => 'Koľko dní zobrazovať v sledovaných stránkach:',
-'prefs-watchlist-edits'    => 'Po�et úprav, ktorý sa zobrazí v rozšírenom zozname sledovaných:',
-'prefs-misc'               => 'Rôzne',
-'saveprefs'                => 'Uložiť nastavenia',
-'resetprefs'               => 'Obnoviť pôvodné nastavenia',
-'oldpassword'              => 'Staré heslo:',
-'newpassword'              => 'Nové heslo:',
-'retypenew'                => 'Nové heslo (ešte raz):',
-'textboxsize'              => 'Úpravy',
-'rows'                     => 'Riadky:',
-'columns'                  => 'Stĺpce:',
-'searchresultshead'        => 'Vyhľadávanie',
-'resultsperpage'           => 'Po�et vyhovujúcich výsledkov zobrazených na stránku:',
-'contextlines'             => 'Po�et zobrazených riadkov z každej nájdenej stránky:',
-'contextchars'             => 'Po�et kontextových znakov v riadku',
-'stub-threshold'           => 'Prah formátovania <a href="#" class="stub">výhonkov</a> (v bajtoch):',
-'recentchangesdays'        => 'Koľko dní zobrazovať v posledných úpravách:',
-'recentchangescount'       => 'Po�et nadpisov uvedených v posledných úpravách',
-'savedprefs'               => 'Vaše nastavenia boli uložené.',
-'timezonelegend'           => 'Časové pásmo',
-'timezonetext'             => '¹Po�et hodín, o ktorý sa váš miestny �as odlišuje od �asu na serveri (UTC).',
-'localtime'                => 'Miestny �as',
-'timezoneoffset'           => 'Rozdiel¹',
-'servertime'               => 'Aktuálny �as na serveri',
-'guesstimezone'            => 'Prevziať z prehliada�a',
-'allowemail'               => 'Povoliť prijímanie e-mailov od iných používateľov',
-'prefs-searchoptions'      => 'Voľby hľadania',
-'prefs-namespaces'         => 'Menné priestory',
-'defaultns'                => 'Štandardne vyhľadávať v týchto menných priestoroch:',
-'default'                  => 'predvolený',
-'files'                    => 'Súbory',
+'preferences'               => 'Nastavenia',
+'mypreferences'             => 'nastavenia',
+'prefs-edits'               => 'Po�et úprav:',
+'prefsnologin'              => 'Nie ste prihlásený/á',
+'prefsnologintext'          => 'Aby ste mohli zmeniť svoje nastavenia, musíte byť <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} prihlásený].',
+'prefsreset'                => 'Boli obnovené pôvodné nastavenia.',
+'qbsettings'                => 'Naviga�ný panel',
+'qbsettings-none'           => 'Žiadne',
+'qbsettings-fixedleft'      => 'Ukotvené vľavo',
+'qbsettings-fixedright'     => 'Ukotvené vpravo',
+'qbsettings-floatingleft'   => 'Plávajúce vľavo',
+'qbsettings-floatingright'  => 'Plávajúce vpravo',
+'changepassword'            => 'Zmeniť heslo',
+'skin'                      => 'Vzhľad',
+'skin-preview'              => 'Náhľad',
+'math'                      => 'Vykreslenie matematiky',
+'dateformat'                => 'Formát dátumu',
+'datedefault'               => 'štandardný',
+'datetime'                  => 'Dátum a �as',
+'math_failure'              => 'Syntaktická analýza (parsing) neúspešná',
+'math_unknown_error'        => 'neznáma chyba',
+'math_unknown_function'     => 'neznáma funkcia',
+'math_lexing_error'         => 'lexikálna chyba',
+'math_syntax_error'         => 'syntaktická chyba',
+'math_image_error'          => 'PNG konverzia neúspešná; skontrolujte správnosť inštalácie programov: latex, dvips, gs a convert',
+'math_bad_tmpdir'           => 'Nemožno zapisovať alebo vytvoriť do�asný matematický adresár',
+'math_bad_output'           => 'Nemožno zapisovať alebo vytvoriť výstupný matematický adresár',
+'math_notexvc'              => 'Chýbajúci program texvc; konfigurácia je popísaná v math/README.',
+'prefs-personal'            => 'Profil',
+'prefs-rc'                  => 'Posledné úpravy',
+'prefs-watchlist'           => 'Sledované stránky',
+'prefs-watchlist-days'      => 'Koľko dní zobrazovať v sledovaných stránkach:',
+'prefs-watchlist-days-max'  => '(maximálne 7 dní)',
+'prefs-watchlist-edits'     => 'Po�et úprav, ktorý sa zobrazí v rozšírenom zozname sledovaných:',
+'prefs-watchlist-edits-max' => '(maximum: 1000)',
+'prefs-misc'                => 'Rôzne',
+'prefs-resetpass'           => 'Zmeniť heslo',
+'saveprefs'                 => 'Uložiť nastavenia',
+'resetprefs'                => 'Obnoviť pôvodné nastavenia',
+'textboxsize'               => 'Úpravy',
+'prefs-edit-boxsize'        => 'Veľkosť okna na úpravy.',
+'rows'                      => 'Riadky:',
+'columns'                   => 'Stĺpce:',
+'searchresultshead'         => 'Vyhľadávanie',
+'resultsperpage'            => 'Po�et vyhovujúcich výsledkov zobrazených na stránku:',
+'contextlines'              => 'Po�et zobrazených riadkov z každej nájdenej stránky:',
+'contextchars'              => 'Po�et kontextových znakov v riadku',
+'stub-threshold'            => 'Prah formátovania <a href="#" class="stub">výhonkov</a> (v bajtoch):',
+'recentchangesdays'         => 'Koľko dní zobrazovať v posledných úpravách:',
+'recentchangesdays-max'     => '(maximálne $1 {{PLURAL:$1|deň|dni|dní}})',
+'recentchangescount'        => 'Po�et úprav štandardne zobrazovaných v posledných úpravách, históriách stránok a záznamoch:',
+'savedprefs'                => 'Vaše nastavenia boli uložené.',
+'timezonelegend'            => 'Časové pásmo',
+'timezonetext'              => '¹Po�et hodín, o ktorý sa váš miestny �as odlišuje od �asu na serveri (UTC).',
+'localtime'                 => 'Miestny �as:',
+'timezoneselect'            => 'Časová zóna:',
+'timezoneuseserverdefault'  => 'Použiť nastavenie servera',
+'timezoneuseoffset'         => 'Iné (uvedením rozdielu)',
+'timezoneoffset'            => 'Rozdiel¹:',
+'servertime'                => 'Aktuálny �as na serveri:',
+'guesstimezone'             => 'Prevziať z prehliada�a',
+'allowemail'                => 'Povoliť prijímanie e-mailov od iných používateľov',
+'prefs-searchoptions'       => 'Voľby hľadania',
+'prefs-namespaces'          => 'Menné priestory',
+'defaultns'                 => 'Štandardne vyhľadávať v týchto menných priestoroch:',
+'default'                   => 'predvolený',
+'files'                     => 'Súbory',
 
 # User rights
 'userrights'                  => 'Spravovanie používateľských práv', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Spravovať skupiny používateľov',
 'userrights-user-editname'    => 'Zadajte meno používateľa:',
 'editusergroup'               => 'Upraviť skupinu používateľa',
-'editinguser'                 => "Zmena oprávnení používateľa '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Zmena oprávnení používateľa '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Upraviť skupiny používateľa',
 'saveusergroups'              => 'Uložiť skupiny používateľa',
 'userrights-groupsmember'     => 'ÄŒlen skupiny:',
@@ -1096,6 +1200,8 @@ Uistite sa, že táto zmena zachová historickú kontinuitu zmien stránky.',
 'right-minoredit'            => 'Ozna�ovať úpravy ako drobné',
 'right-move'                 => 'Presúvať stránky',
 'right-move-subpages'        => 'Presunúť stránky aj s podstránkami',
+'right-move-rootuserpages'   => 'Presunúť koreňové stránky používateľa',
+'right-movefile'             => 'Presunúť súbory',
 'right-suppressredirect'     => 'Nevytvoriť presmerovanie zo starého názvu pri presúvaní stránky',
 'right-upload'               => 'Nahrávať súbory',
 'right-reupload'             => 'Prepísať existujúci súbor',
@@ -1146,9 +1252,46 @@ Uistite sa, že táto zmena zachová historickú kontinuitu zmien stránky.',
 'rightslogentry' => '�lenstvo v skupine zmenené pre $1 z $2 na $3',
 'rightsnone'     => '(žiadne)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '�ítať túto stránku',
+'action-edit'                 => 'upravovať túto stránku',
+'action-createpage'           => 'vytvárať stránky',
+'action-createtalk'           => 'vytvárať diskusné stránky',
+'action-createaccount'        => 'vytvoriť tento používateľský ú�et',
+'action-minoredit'            => 'ozna�iť túto úpravu ako drobnú',
+'action-move'                 => 'presunúť túto stránku',
+'action-move-subpages'        => 'presunúť túto stránku a jej podtránky',
+'action-move-rootuserpages'   => 'presunúť koreňové stránky používateľa',
+'action-movefile'             => 'presunúť tento súbor',
+'action-upload'               => 'nahrať tento súbor',
+'action-reupload'             => 'prepísať tento existujúci súbor',
+'action-reupload-shared'      => 'uprednostniť tento súbor pred súborom zo zdieľaného úložiska',
+'action-upload_by_url'        => 'nahrať tento súbor z URL adresy',
+'action-writeapi'             => 'použiť API na zápis',
+'action-delete'               => 'zmazať túto stránku',
+'action-deleterevision'       => 'zmazať túto revíziu',
+'action-deletedhistory'       => 'zobraziť históriu zmazaných revízií tejto stránky',
+'action-browsearchive'        => 'vyhľadávať zmazané stránky',
+'action-undelete'             => 'obnoviť túto stránku',
+'action-suppressrevision'     => 'skontrolovať a obnoviť túto skrytú revíziu',
+'action-suppressionlog'       => 'zobraziť tento súkromný záznam',
+'action-block'                => 'zablokovať úpravy tohto používateľa',
+'action-protect'              => 'zmeniť úrovne ochrany tejto stránky',
+'action-import'               => 'importovať túto stránku z inej wiki',
+'action-importupload'         => 'importovať túto stránku z nahraného súboru',
+'action-patrol'               => 'ozna�iť úpravy iných ako strážené',
+'action-autopatrol'           => 'ozna�iť vlastné úpravy ako strážené',
+'action-unwatchedpages'       => 'zobraziť zoznam nesledovaných stránok',
+'action-trackback'            => 'poslať trackback',
+'action-mergehistory'         => 'zlú�iť históriu tejto stránky',
+'action-userrights'           => 'upravovať práva všetkých používateľov',
+'action-userrights-interwiki' => 'upravovať práva používateľov na iných wiki',
+'action-siteadmin'            => 'zamykať alebo odomykať databázu',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|zmena|zmeny|zmien}}',
 'recentchanges'                     => 'Posledné úpravy',
+'recentchanges-legend'              => 'Možnosti posledných zmien',
 'recentchangestext'                 => 'Pomocou tejto stránky sledujete posledné úpravy stránok {{GRAMMAR:genitív|{{SITENAME}}}}.',
 'recentchanges-feed-description'    => 'Sledovať posledné úpravy tejto wiki týmto kanálom.',
 'rcnote'                            => "Tu {{PLURAL:$1|je posledná úprava|sú posledné '''$1''' úpravy|je posledných '''$1''' úprav}} po�as {{PLURAL:$2|posledného dňa|posledných '''$2''' dní}} z $4, $5.",
@@ -1172,6 +1315,8 @@ Uistite sa, že táto zmena zachová historickú kontinuitu zmien stránky.',
 'rc_categories'                     => 'Obmedziť na kategórie (oddeľte znakom „|“)',
 'rc_categories_any'                 => 'akékoľvek',
 'newsectionsummary'                 => '/* $1 */ nová sekcia',
+'rc-enhanced-expand'                => 'Zobraziť podrobnosti (vyžaduje JavaScript)',
+'rc-enhanced-hide'                  => 'Skryť podrobnosti',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Súvisiace úpravy',
@@ -1193,12 +1338,12 @@ Stránky, ktoré sa nachádzajú vo vaÅ¡om [[Special:Watchlist|zozname sledovanÃ
 'upload_directory_read_only'  => 'Webový server nemôže zapisovať do adresára pre nahrávanie ($1).',
 'uploaderror'                 => 'Chyba pri nahrávaní',
 'uploadtext'                  => "Tento formulár použite na nahrávanie súborov.
-Už nahrané súbory môžete zobraziť alebo hľadať v [[Special:ImageList|zozname nahraných súborov]]. Nahrávania a mazania sa tiež zaznamenávajú v [[Special:Log/upload|zázname nahrávaní]].
+Už nahrané súbory môžete zobraziť alebo hľadať v [[Special:FileList|zozname nahraných súborov]]. Nahrávania a mazania sa tiež zaznamenávajú v [[Special:Log/upload|zázname nahrávaní]].
 
 Na za�lenenie obrázka do stránky použite odkaz v tvare
 
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Súbor.jpg]]</nowiki>''' - použije sa plná verzia obrázka
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Súbor.png|alternatívny text]]</nowiki>''' - vykreslí sa v šírke 200 pixelov s okrajom, na ľavom okraji, s popisom v „alt� texte.
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Súbor.jpg]]</nowiki>''' - použije sa plná verzia obrázka
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Súbor.png|alternatívny text]]</nowiki>''' - vykreslí sa v šírke 200 pixelov s okrajom, na ľavom okraji, s popisom v „alt� texte.
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Súbor.ogg]]</nowiki>''' - priamy odkaz na súbor (nezobrazí obrázok na stránke)",
 'upload-permitted'            => 'Povolené typy súborov: $1.',
 'upload-preferred'            => 'Uprednostňované typy súborov: $1.',
@@ -1206,7 +1351,7 @@ Na za�lenenie obrázka do stránky použite odkaz v tvare
 'uploadlog'                   => 'Záznam nahrávaní',
 'uploadlogpage'               => 'Záznam nahrávaní',
 'uploadlogpagetext'           => 'Nižšie je zoznam nedávno nahraných súborov.
-Vizuálny prehľad nájdete v [[Special:NewImages|galérii novo nahraných súborov]].',
+Vizuálny prehľad nájdete v [[Special:NewFiles|galérii novo nahraných súborov]].',
 'filename'                    => 'Názov súboru',
 'filedesc'                    => 'Opis súboru',
 'fileuploadsummary'           => 'Zhrnutie:',
@@ -1228,22 +1373,24 @@ Vizuálny prehľad nájdete v [[Special:NewImages|galérii novo nahraných súbo
 'large-file'                  => 'Odporú�a sa aby veľkosť súborov neprekra�ovala $1; tento súbor má $2.',
 'largefileserver'             => 'Tento súbor je vä�ší ako je možné nahrať na server (z dôvodu obmedzenia veľkosti súboru v konfigurácii servera).',
 'emptyfile'                   => 'Zdá sa, že súbor, ktorý ste nahrali je prázdny. Mohlo sa stať, že ste urobili v názve súboru preklep. Prosím, skontrolujte, �i skuto�ne chcete nahrať tento súbor.',
-'fileexists'                  => 'Súbor s týmto názvom už existuje, prosím skontrolujte <strong><tt>$1</tt></strong> ak nie ste si istý, �i ho chcete zmeniť.',
-'filepageexists'              => 'Popisná stránka tohto súboru už bola vytvorená na <strong><tt>$1</tt></strong>, ale žiadny súbor s týmto názvom momentálne neexistuje. Zhrnutie, ktoré zadáte sa neobjaví na popisnej stránke. Aby sa zhrnutie objavilo na popisnej stránke, budete ho musieť ru�ne upraviť.',
-'fileexists-extension'        => 'Súbor s podobným názvom už existuje:<br />
-Názov súboru, ktoý nahrávate: <strong><tt>$1</tt></strong><br />
-Názov existujúceho súboru: <strong><tt>$2</tt></strong><br />
-Jediný rozdiel je vo veľkosti písmen prípony. Prosím, skontrolujte totožnosť týchto súborov.',
+'fileexists'                  => "Súbor s týmto názvom už existuje, prosím skontrolujte '''<tt>$1</tt>''' ak nie ste si istý, �i ho chcete zmeniť.",
+'filepageexists'              => "Popisná stránka tohto súboru už bola vytvorená na '''<tt>$1</tt>''', ale žiadny súbor s týmto názvom momentálne neexistuje. Zhrnutie, ktoré zadáte sa neobjaví na popisnej stránke. Aby sa zhrnutie objavilo na popisnej stránke, budete ho musieť ru�ne upraviť.",
+'fileexists-extension'        => "Súbor s podobným názvom už existuje:<br />
+Názov súboru, ktoý nahrávate: '''<tt>$1</tt>'''<br />
+Názov existujúceho súboru: '''<tt>$2</tt>'''<br />
+Jediný rozdiel je vo veľkosti písmen prípony. Prosím, skontrolujte totožnosť týchto súborov.",
 'fileexists-thumb'            => "<center>'''Existujúci obrázok'''</center>",
-'fileexists-thumbnail-yes'    => 'Zdá sa, že súbor je obrázkom redukovanej veľkosti <i>(náhľadom)</i>. Prosím, skontolujte súbor <strong><tt>$1</tt></strong>.<br />
-Ak je kontrolovaný súbor rovnaký obrázok v pôvodnej veľkosti, nie je potrebné nahrávať �alší náhľad.',
-'file-thumbnail-no'           => 'Názov súboru za�ína <strong><tt>$1</tt></strong>.
-Zdá sa, že je to obrázok redukovanej veľkosti <i>(náhľad)</i>.
-Ak máte tento obrázok v plnom rozlíšení, nahrajte ho, inak prosím zmeňte názov.',
-'fileexists-forbidden'        => 'Súbor s týmto názvom už existuje; cho�te prosím späť a nahrajte tento súbor pod iným názvom. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Zdá sa, že súbor je obrázkom redukovanej veľkosti ''(náhľadom)''. Prosím, skontolujte súbor '''<tt>$1</tt>'''.<br />
+Ak je kontrolovaný súbor rovnaký obrázok v pôvodnej veľkosti, nie je potrebné nahrávať �alší náhľad.",
+'file-thumbnail-no'           => "Názov súboru za�ína '''<tt>$1</tt>'''.
+Zdá sa, že je to obrázok redukovanej veľkosti ''(náhľad)''.
+Ak máte tento obrázok v plnom rozlíšení, nahrajte ho, inak prosím zmeňte názov.",
+'fileexists-forbidden'        => 'Súbor s týmto názvom už existuje a nie je možné ho prepísať.
+Ak si aj tak želáte nahrať svoj súbor, cho�te prosím späť a nahrajte tento súbor pod iným názvom. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Súbor s týmto názvom už existuje v zdieľanom úložisku súborov.
-Ak ho chcete aj napriek tomu nahrať, cho�te prosím späť a použite iný názov. [[Image:$1|thumb|center|$1]]',
+Ak ho chcete aj napriek tomu nahrať, cho�te prosím späť a použite iný názov. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Tento súbor je duplikátom {{PLURAL:$1|nasledovného súboru|nasledovných súborov}}:',
+'file-deleted-duplicate'      => 'Súbor zhodný s týmto súborom ([[$1]]) už bol v minulosti zmazaný. Mali by ste skontrolovať históriu nahrávania tohto súboru predtým, než budete pokra�ovať v jeho nahrávaní.',
 'successfulupload'            => 'Nahranie bolo úspešné',
 'uploadwarning'               => 'Varovanie pri nahrávaní',
 'savefile'                    => 'Uložiť súbor',
@@ -1263,7 +1410,7 @@ Ak ho chcete aj napriek tomu nahrať, cho�te prosím späť a použite iný ná
 
 Mali by ste zvážiť, �i je vhodné pokra�ovať v nahrávaní tohto súboru.
 Tu je na záznam zmazaní tohto súboru:",
-'filename-bad-prefix'         => 'Názov súboru, ktorý nahrávate, za�ína <strong>„$1“</strong>, �o nie je popisné meno. Takýto názov typicky prira�ujú digitálne fotoaparáty automaticky. Prosím, dajte vášmu súboru popisnejší názov.',
+'filename-bad-prefix'         => "Názov súboru, ktorý nahrávate, za�ína '''„$1“''', �o nie je popisné meno. Takýto názov typicky prira�ujú digitálne fotoaparáty automaticky. Prosím, dajte vášmu súboru popisnejší názov.",
 'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
 # Syntax je nasledovná:
 #   * Všetko od znaku „#“ po koniec riadka je komentár
@@ -1301,20 +1448,21 @@ Ak problém pretrváva, kontaktujte [[Special:ListUsers/sysop|správcu systému]
 'upload_source_url'  => ' (platný, verejne prístupný URL)',
 'upload_source_file' => ' (súbor na vašom po�íta�i)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Táto špeciálna stránka zobrazuje všetky nahrané súbory.
+# Special:ListFiles
+'listfiles-summary'     => 'Táto špeciálna stránka zobrazuje všetky nahrané súbory.
 Posledné nahrané súbory sa štandardne zobrazujú na vrchu.
 Kliknutím na hlavi�ku stĺpca zmeníte poradie triedenia.',
-'imagelist_search_for'  => 'Hľadať názov súboru:',
+'listfiles_search_for'  => 'Hľadať názov súboru:',
 'imgfile'               => 'súbor',
-'imagelist'             => 'Zoznam obrázkov',
-'imagelist_date'        => 'Dátum',
-'imagelist_name'        => 'Názov',
-'imagelist_user'        => 'Používateľ',
-'imagelist_size'        => 'Veľkosť (v bajtoch)',
-'imagelist_description' => 'Popis',
-
-# Image description page
+'listfiles'             => 'Zoznam obrázkov',
+'listfiles_date'        => 'Dátum',
+'listfiles_name'        => 'Názov',
+'listfiles_user'        => 'Používateľ',
+'listfiles_size'        => 'Veľkosť (v bajtoch)',
+'listfiles_description' => 'Popis',
+'listfiles_count'       => 'Verzie',
+
+# File description page
 'filehist'                       => 'História súboru',
 'filehist-help'                  => 'Po kliknutí na dátum/�as uvidíte súbor ako vyzeral vtedy.',
 'filehist-deleteall'             => 'zmazať všetky',
@@ -1322,19 +1470,25 @@ Kliknutím na hlavi�ku stĺpca zmeníte poradie triedenia.',
 'filehist-revert'                => 'obnoviť',
 'filehist-current'               => 'aktuálna',
 'filehist-datetime'              => 'dátum/�as',
+'filehist-thumb'                 => 'Náhľad',
+'filehist-thumbtext'             => 'Náhľad verzie z $1',
+'filehist-nothumb'               => 'Bez náhľadu',
 'filehist-user'                  => 'používateľ',
 'filehist-dimensions'            => 'rozmery',
 'filehist-filesize'              => 'veľkosť súboru',
 'filehist-comment'               => 'komentár',
-'imagelinks'                     => 'Odkazy na obrázok',
+'imagelinks'                     => 'Odkazy na súbor',
 'linkstoimage'                   => 'Na tento obrázok {{PLURAL:$1|odkazuje nasledujúca stránka|odkazujú nasledujúce $1 stránky|odkazuje nasledujúcich $1 stránok}}:',
+'linkstoimage-more'              => 'Viac ako $1 {{PLURAL:$1|stránka odkazuje|stránky odkazujú|stránok odkazuje}} na tento súbor.
+Nasledovný zoznam zobrazuje {{PLURAL:$1|prvú stránku odkazujúcu|prvé $1 stránky odkazujúce|prvých $1 stránok odkazujúcich}} iba na tento súbor.
+Môžete si pozrieť [[Special:WhatLinksHere/$2|úplný zoznam]].',
 'nolinkstoimage'                 => 'Žiadne stránky neobsahujú odkazy na tento obrázok.',
 'morelinkstoimage'               => 'Zobraziť [[Special:WhatLinksHere/$1|�alšie odkazy]] na tento súbor.',
 'redirectstofile'                => '{{PLURAL:$1|Nasledujúci súbor presmerúva|Nasledujúce $1 súbory presmerúvajú|Nasledujúcich $1 súborov presmerúva}} na tento súbor:',
-'duplicatesoffile'               => '{{PLURAL:$1|Nasledujúci súbor je duplikát|Nasledujúce $1 súbory sú duplikáty||Nasledujúcich $1 súborov sú duplikáty}} tohto súboru:',
+'duplicatesoffile'               => '{{PLURAL:$1|Nasledujúci súbor je duplikát|Nasledujúce $1 súbory sú duplikáty||Nasledujúcich $1 súborov sú duplikáty}} tohto súboru ([[Special:FileDuplicateSearch/$2|podrobnosti]]):',
 'sharedupload'                   => 'Toto je zdieľaný súbor a je možné ho používať na iných projektoch.',
 'shareduploadwiki'               => 'Ďalšie informácie pozrite na $1.',
-'shareduploadwiki-desc'          => 'Dolu je zobrazený popis, ktorý obsahuje jeho $1 na zdieľanom úložisku.',
+'shareduploadwiki-desc'          => 'Dolu je zobrazený popis, ktorý obsahuje jeho $1.',
 'shareduploadwiki-linktext'      => 'popisná stránka súboru',
 'shareduploadduplicate'          => 'Tento súbor je duplikát $1 zo zdieľaného úložiska.',
 'shareduploadduplicate-linktext' => 'iný súbor',
@@ -1358,7 +1512,7 @@ Kliknutím na hlavi�ku stĺpca zmeníte poradie triedenia.',
 # File deletion
 'filedelete'                  => 'Zmazať $1',
 'filedelete-legend'           => 'Zmazať súbor',
-'filedelete-intro'            => "Mažete '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Chystáte sa zmazať súbor '''[[Media:$1|$1]]''' spolu s celou jeho históriou.",
 'filedelete-intro-old'        => "Mažete verziu súboru '''[[Media:$1|$1]]''' z [$4 $3, $2].",
 'filedelete-comment'          => 'Komentár:',
 'filedelete-submit'           => 'Zmazať',
@@ -1366,7 +1520,6 @@ Kliknutím na hlavi�ku stĺpca zmeníte poradie triedenia.',
 'filedelete-success-old'      => "Verzia súboru '''[[Media:$1|$1]]''' z $3, $2 bola zmazaná.",
 'filedelete-nofile'           => "'''$1''' neexistuje.",
 'filedelete-nofile-old'       => "Neexistuje archivovaná verzia '''$1''' s uvedenými atribútmi.",
-'filedelete-iscurrent'        => 'Pokúšate sa zmazať poslednú verziu tohto súboru. Prosím, najskôr vráťte staršiu verziu.',
 'filedelete-otherreason'      => 'Iný/�alší dôvod:',
 'filedelete-reason-otherlist' => 'Iný dôvod',
 'filedelete-reason-dropdown'  => '* Bežné dôvody mazania
@@ -1393,28 +1546,31 @@ Kliknutím na hlavi�ku stĺpca zmeníte poradie triedenia.',
 
 # Random page
 'randompage'         => 'Náhodná stránka',
-'randompage-nopages' => 'V tomto mennom priestore nie sú žiadne stránky.',
+'randompage-nopages' => 'V mennom priestore „$1“ nie sú žiadne stránky.',
 
 # Random redirect
 'randomredirect'         => 'Náhodná presmerovacia stránka',
-'randomredirect-nopages' => 'V tomto mennom priestore nie sú žiadne presmerovania.',
+'randomredirect-nopages' => 'V mennom „$1“ priestore nie sú žiadne presmerovania.',
 
 # Statistics
-'statistics'             => 'Å tatistiky',
-'sitestats'              => 'Štatistika {{GRAMMAR:genitív|{{SITENAME}}}}',
-'userstats'              => 'Štatistika používateľov',
-'sitestatstext'          => "{{SITENAME}} momentálne má {{PLURAL:$1|jednu stránku|'''$2''' stránky|'''$2''' stránok}}.
-Do toho sa nezapo�ítavajú presmerovania, diskusné stránky, popisné stránky obrázkov, stránky používateľských profilov, šablóny, stránky Pomocníka, portály, stránky bez odkazov na iné stránky a stránky o {{GRAMMAR:lokál|{{SITENAME}}}}.
-Vrátane týchto máme spolu {{PLURAL:$1|jednu stránku|'''$2''' stránky|'''$2''' stránok}}, {{PLURAL:$2|ktorá je pravdepodobne platná stránka s obsahom|ktoré sú pravdepodobne platné stránky s obsahom}}.
-
-Celkovo {{PLURAL:$8|bol nahraný jeden súbor|boli nahrané '''$8''' súbory|bolo nahraných '''$8''' súborov}}.
-
-Celkovo boli stránky navštívené '''$3'''-krát a upravené '''$4'''-krát. To znamená, že pripadá priemerne '''$5''' úprav na každú stránku a '''$6''' návštev na každú úpravu.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Dĺžka frontu úloh] je momentálne '''$7'''.",
-'userstatstext'          => "Celkovo {{PLURAL:$1|je jeden zaregistrovaný používateľ|sú '''$1''' zaregistrovaní používatelia|je '''$1''' zaregistrovaných používateľov}},
-z �oho '''$2''' (alebo '''$4 %''') {{PLURAL:$2|je správca|sú správcovia}} (pozri $5).",
-'statistics-mostpopular' => 'Naj�astejšie prezerané stránky',
+'statistics'                   => 'Å tatistiky',
+'statistics-header-pages'      => 'Štatistika stránok',
+'statistics-header-edits'      => 'Štatistika úprav',
+'statistics-header-views'      => 'Štatistika zobrazení',
+'statistics-header-users'      => 'Štatistika používateľov',
+'statistics-articles'          => 'Stránok s obsahom',
+'statistics-pages'             => 'Stránok',
+'statistics-pages-desc'        => 'Všetky stránky na wiki vrátane diskusných stránok, presmerovaní at�.',
+'statistics-files'             => 'Nahraných súborov',
+'statistics-edits'             => 'Úprav stránok od založenia {{GRAMMAR:genitív|{{SITENAME}}}}',
+'statistics-edits-average'     => 'Priemerný po�et úprav na stránku',
+'statistics-views-total'       => 'Celkom zobrazení',
+'statistics-views-peredit'     => 'Zobrazení na úpravu',
+'statistics-jobqueue'          => 'Dĺžka [http://www.mediawiki.org/wiki/Manual:Job_queue frontu úloh]',
+'statistics-users'             => 'Registrovaných [[Special:ListUsers|používateľov]]',
+'statistics-users-active'      => 'Aktívnych používateľov',
+'statistics-users-active-desc' => 'Používatelia, ktorí za {{PLURAL:$1|posledný deň|posledné $1 dni|posledných $1 dní}} vykonali nejakú operáciu',
+'statistics-mostpopular'       => 'Naj�astejšie prezerané stránky',
 
 'disambiguations'      => 'Stránky na rozlíšenie viacerých významov',
 'disambiguationspage'  => 'Template:Rozlišovacia stránka',
@@ -1428,7 +1584,7 @@ Stránka sa považuje za rozlišovaciu, ke� používa šablónu, na ktorú odka
 'double-redirect-fixer'      => 'Korektor presmerovaní',
 
 'brokenredirects'        => 'Pokazené presmerovania',
-'brokenredirectstext'    => 'Tieto presmerovania odkazujú na neexistujúcu stránku.',
+'brokenredirectstext'    => 'Nasledovné presmerovania odkazujú na neexistujúce stránky:',
 'brokenredirects-edit'   => '(upraviť)',
 'brokenredirects-delete' => '(zmazať)',
 
@@ -1458,26 +1614,30 @@ Stránka sa považuje za rozlišovaciu, ke� používa šablónu, na ktorú odka
 'popularpages'            => 'Populárne stránky',
 'wantedcategories'        => 'Žiadané kategórie',
 'wantedpages'             => 'Žiadané stránky',
-'missingfiles'            => 'Chýbajúce súbory',
+'wantedfiles'             => 'Žiadané súbory',
+'wantedtemplates'         => 'Žiadané šablóny',
 'mostlinked'              => 'Naj�astejšie odkazované stránky',
 'mostlinkedcategories'    => 'Naj�astejšie odkazované kategórie',
 'mostlinkedtemplates'     => 'Naj�astejšie odkazované šablóny',
 'mostcategories'          => 'Stránky s najvä�ším po�tom kategórií',
 'mostimages'              => 'Naj�astejšie odkazované súbory',
 'mostrevisions'           => 'Stránky s najvä�ším po�tom úprav',
-'prefixindex'             => 'Index prefixu',
+'prefixindex'             => 'Všetky stránky s predponou',
 'shortpages'              => 'Krátke stránky',
 'longpages'               => 'Dlhé stránky',
 'deadendpages'            => 'Slepé stránky',
 'deadendpagestext'        => 'Nasledujúce stránky neodkazujú na žiadne iné stránky na {{GRAMMAR:lokál|{{SITENAME}}}}.',
 'protectedpages'          => 'Zamknuté stránky',
 'protectedpages-indef'    => 'Zamknutia iba na neur�ito',
+'protectedpages-cascade'  => 'Iba kaskádové zamykanie',
 'protectedpagestext'      => 'Upravovanie alebo presúvanie nasledovných stránok je zamknuté',
 'protectedpagesempty'     => 'Momentálne nie sú žiadne stránky s týmito parametrami zamknuté.',
 'protectedtitles'         => 'Zamknuté názvy',
 'protectedtitlestext'     => 'Možnosť vytvoriť stránky s nasledovnými názvami bola zamknutá',
 'protectedtitlesempty'    => 'Tieto parametre momentálne nezamykajú žiadne názvy stránok.',
 'listusers'               => 'Zoznam používateľov',
+'listusers-editsonly'     => 'Vynechať používateľov bez úprav',
+'usereditcount'           => '$1 {{PLURAL:$1|úprava|úpravy|úprav}}',
 'newpages'                => 'Nové stránky',
 'newpages-username'       => 'Meno používateľa:',
 'ancientpages'            => 'Najdávnejšie upravované stránky',
@@ -1499,14 +1659,13 @@ na ktorý/-ého chcete aplikovať túto funkciu.',
 'booksources-search-legend' => 'Vyhľadávať knižné zdroje',
 'booksources-go'            => 'Vykonať',
 'booksources-text'          => 'Nižšie je zoznam odkazov na iné stránky, ktoré predávajú nové a použité knihy a tiež môžu obsahovať �alšie informácie o knihách, ktoré hľadáte:',
+'booksources-invalid-isbn'  => 'Zdá sa, že dané ISBN nie je platné. Skontrolujte, �i ste neurobili chybu pri kopírovaní z pôvodného zdroja.',
 
 # Special:Log
 'specialloguserlabel'  => 'Používateľ:',
 'speciallogtitlelabel' => 'Názov:',
 'log'                  => 'Záznamy',
 'all-logs-page'        => 'Všetky záznamy',
-'log-search-legend'    => 'Hľadať záznamy',
-'log-search-submit'    => 'Spustiť',
 'alllogstext'          => 'Kombinované zobrazenie všetkých dostupných záznamov {{GRAMMAR:genitív|{{SITENAME}}}}.
 Môžete zúžiť rozsah, ak zvolíte typ záznamu, používateľské meno alebo doty�nú stránku (záleží na veľkosti písmen).',
 'logempty'             => 'V zázname neboli nájdené zodpovedajúce položky.',
@@ -1518,6 +1677,7 @@ Môžete zúžiť rozsah, ak zvolíte typ záznamu, používateľské meno alebo
 'nextpage'          => 'Ďalšia stránka ($1)',
 'prevpage'          => 'Predchádzajúca stránka ($1)',
 'allpagesfrom'      => 'Zobraziť stránky od:',
+'allpagesto'        => 'Zobraziť stránky kon�iace na:',
 'allarticles'       => 'Všetky stránky',
 'allinnamespace'    => 'Všetky stránky (menný priestor $1)',
 'allnotinnamespace' => 'Všetky stránky (nie z menného priestoru $1)',
@@ -1537,43 +1697,70 @@ Pozri aj [[Special:WantedCategories|žiadané kategórie]].',
 'special-categories-sort-count' => 'zoradiť podľa po�tu',
 'special-categories-sort-abc'   => 'zoradiť podľa abecedy',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Zmazané príspevky používateľa',
+
+# Special:LinkSearch
+'linksearch'       => 'Externé odkazy',
+'linksearch-pat'   => 'Vyhľadávací vzor:',
+'linksearch-ns'    => 'Menný priestor:',
+'linksearch-ok'    => 'Hľadať',
+'linksearch-text'  => 'Je možné použiť zástupné znaky ako „*.wikipedia.org“.<br />
+Podporované protokoly: <tt>$1</tt>',
+'linksearch-line'  => 'Na $1 odkazuje $2',
+'linksearch-error' => 'Zástupné znaky je možné použiť iba na za�iatku názvu domény.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Zobraziť používateľov po�núc:',
 'listusers-submit'   => 'Zobraziť',
 'listusers-noresult' => 'Neboli nájdení používatelia. Prosím, skontrolujte aj varianty s veľkými/malými písmenami.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Záznam vytvorených používateľov',
+'newuserlogpagetext'          => 'Toto je záznam naposledy vytvorených používateľských ú�tov.',
+'newuserlog-byemail'          => 'heslo poslané emailom',
+'newuserlog-create-entry'     => 'Nový používateľ',
+'newuserlog-create2-entry'    => 'vytvoril nový ú�et $1',
+'newuserlog-autocreate-entry' => 'Ú�et vytvorený automaticky',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Práva skupiny používateľov',
-'listgrouprights-summary'  => 'Toto je zoznam skupín používateľov definovaných na tejto wiki a ich prístupových práv.
+'listgrouprights'                 => 'Práva skupiny používateľov',
+'listgrouprights-summary'         => 'Toto je zoznam skupín používateľov definovaných na tejto wiki a ich prístupových práv.
 Môžete si pre�ítať [[{{MediaWiki:Listgrouprights-helppage}}|�alšie informácie]] o jednotlivých právach.',
-'listgrouprights-group'    => 'Skupina',
-'listgrouprights-rights'   => 'Práva',
-'listgrouprights-helppage' => 'Help:Práva skupiny',
-'listgrouprights-members'  => '(zoznam �lenov)',
+'listgrouprights-group'           => 'Skupina',
+'listgrouprights-rights'          => 'Práva',
+'listgrouprights-helppage'        => 'Help:Práva skupiny',
+'listgrouprights-members'         => '(zoznam �lenov)',
+'listgrouprights-addgroup'        => 'Môže pridávať {{PLURAL:$2|skupinu|skupiny}}: $1',
+'listgrouprights-removegroup'     => 'Môže odoberať {{PLURAL:$2|skupinu|skupiny}}: $1',
+'listgrouprights-addgroup-all'    => 'Môže pridávať všetky skupiny',
+'listgrouprights-removegroup-all' => 'Môže odoberať všetky skupiny',
 
 # E-mail user
-'mailnologin'     => 'Žiadna adresa na zaslanie',
-'mailnologintext' => 'Musíte byť [[Special:UserLogin|prihlásený]] a mať platnú e-mailovú adresu vo vašich [[Special:Preferences|nastaveniach]], aby ste mohli iným používateľom posielať e-maily.',
-'emailuser'       => 'E-mail tomuto používateľovi',
-'emailpage'       => 'E-mail používateľovi',
-'emailpagetext'   => 'Ak tento používateľ zadal platnú emailovú adresu vo svojich nastaveniach,
+'mailnologin'      => 'Žiadna adresa na zaslanie',
+'mailnologintext'  => 'Musíte byť [[Special:UserLogin|prihlásený]] a mať platnú e-mailovú adresu vo vašich [[Special:Preferences|nastaveniach]], aby ste mohli iným používateľom posielať e-maily.',
+'emailuser'        => 'E-mail tomuto používateľovi',
+'emailpage'        => 'E-mail používateľovi',
+'emailpagetext'    => 'Ak tento používateľ zadal platnú emailovú adresu vo svojich nastaveniach,
 môžete mu pomocou nasledovného formulára poslať email.
 Emailová adresa, ktorú ste zadali vo svojich [[Special:Preferences|nastaveniach]] sa zobrazí ako adresa odosielateľa emailu, aby vám mohol príjemca priamo odpovedať.',
-'usermailererror' => 'Emailový program vrátil chybu:',
-'defemailsubject' => 'email {{GRAMMAR:genitív|{{SITENAME}}}}',
-'noemailtitle'    => 'Chýba e-mailová adresa',
-'noemailtext'     => 'Tento používateľ nešpecifikoval platnú e-mailovú adresu
-alebo sa rozhodol, že nebude prijímať e-maily od druhých používateľov.',
-'emailfrom'       => 'Od:',
-'emailto'         => 'Komu:',
-'emailsubject'    => 'Predmet:',
-'emailmessage'    => 'Správa:',
-'emailsend'       => 'Odoslať',
-'emailccme'       => 'Pošli mi emailom kópiu mojej správy.',
-'emailccsubject'  => 'Kópia správy pre $1: $2',
-'emailsent'       => 'E-mail bol odoslaný',
-'emailsenttext'   => 'Vaša e-mailová správa bola odoslaná.',
-'emailuserfooter' => 'Tento email poslal $1 pre $2 pomocu funkcie „Email používateľovi� na {{GRAMMAR:lokál|{{SITENAME}}}}.',
+'usermailererror'  => 'Emailový program vrátil chybu:',
+'defemailsubject'  => 'email {{GRAMMAR:genitív|{{SITENAME}}}}',
+'noemailtitle'     => 'Chýba e-mailová adresa',
+'noemailtext'      => 'Tento používateľ neuviedol svoju platnú e-mailovú adresu.',
+'nowikiemailtitle' => 'Posielanie emailov nie je umožnené',
+'nowikiemailtext'  => 'Tento používateľ sa rozhodol, že si neželá prijímať emaily od ostatných používateľov.',
+'email-legend'     => 'Poslať email používateľovi {{GRAMMAR:genitív|{{SITENAME}}}}',
+'emailfrom'        => 'Od:',
+'emailto'          => 'Komu:',
+'emailsubject'     => 'Predmet:',
+'emailmessage'     => 'Správa:',
+'emailsend'        => 'Odoslať',
+'emailccme'        => 'Pošli mi emailom kópiu mojej správy.',
+'emailccsubject'   => 'Kópia správy pre $1: $2',
+'emailsent'        => 'E-mail bol odoslaný',
+'emailsenttext'    => 'Vaša e-mailová správa bola odoslaná.',
+'emailuserfooter'  => 'Tento email poslal $1 pre $2 pomocu funkcie „Email používateľovi� na {{GRAMMAR:lokál|{{SITENAME}}}}.',
 
 # Watchlist
 'watchlist'            => 'Sledované stránky',
@@ -1605,12 +1792,7 @@ Ak budete chcieť neskôr stránku odstrániť zo sledovaných stránok, kliknit
 'iteminvalidname'      => 'Problém s položkou „$1“, neplatné meno...',
 'wlnote'               => "Nižšie {{PLURAL:$1|je posledná jedna zmena|sú posledné '''$1''' zmeny|je posledných '''$1''' zmien}} za {{PLURAL:$2|poslednú hodinu|posledné '''$2''' hodiny|posledných '''$2''' hodín}}.",
 'wlshowlast'           => 'Zobraziť posledných $1 hodín $2 dní $3',
-'watchlist-show-bots'  => 'Zobraziť úpravy botov',
-'watchlist-hide-bots'  => 'Skryť úpravy botov',
-'watchlist-show-own'   => 'Zobraziť moje úpravy',
-'watchlist-hide-own'   => 'Skryť moje úpravy',
-'watchlist-show-minor' => 'Zobraziť drobné úpravy',
-'watchlist-hide-minor' => 'Skryť drobné úpravy',
+'watchlist-options'    => 'Nastavenia zoznamu sledovaných',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Pridávam do zoznamu sledovaných...',
@@ -1648,79 +1830,98 @@ Zmeniť nastavenia vašich sledovaných stránok môžete na
 Návrhy a �alšia pomoc:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Zmazať stránku',
-'confirm'                     => 'Potvrdiť',
-'excontent'                   => 'obsah bol: „$1“',
-'excontentauthor'             => 'obsah bol: „$1“ (a jediný autor bol [[Special:Contributions/$2]])',
-'exbeforeblank'               => "obsah pred vy�istením stránky bol: '$1'",
-'exblank'                     => 'stránka bola prázdna',
-'delete-confirm'              => 'Zmazať „$1“',
-'delete-legend'               => 'Zmazať',
-'historywarning'              => 'UPOZORNENIE: Stránka, ktorú chcete zmazať má históriu:',
-'confirmdeletetext'           => 'Chystáte sa trvalo zmazať z databázy stránku alebo obrázok spolu so všetkými jeho/jej predošlými verziami. Potvr�te, že máte v úmysle tak urobiť, že ste si vedomý následkov, a že to robíte v súlade so [[{{MediaWiki:Policy-url}}|zásadami a smernicami {{GRAMMAR:genitív|{{SITENAME}}}}]].',
-'actioncomplete'              => 'Úloha bola dokon�ená',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" bol zmazaný.
+# Delete
+'deletepage'             => 'Zmazať stránku',
+'confirm'                => 'Potvrdiť',
+'excontent'              => 'obsah bol: „$1“',
+'excontentauthor'        => 'obsah bol: „$1“ (a jediný autor bol [[Special:Contributions/$2]])',
+'exbeforeblank'          => "obsah pred vy�istením stránky bol: '$1'",
+'exblank'                => 'stránka bola prázdna',
+'delete-confirm'         => 'Zmazať „$1“',
+'delete-legend'          => 'Zmazať',
+'historywarning'         => 'UPOZORNENIE: Stránka, ktorú chcete zmazať má históriu:',
+'confirmdeletetext'      => 'Chystáte sa trvalo zmazať z databázy stránku alebo obrázok spolu so všetkými jeho/jej predošlými verziami. Potvr�te, že máte v úmysle tak urobiť, že ste si vedomý následkov, a že to robíte v súlade so [[{{MediaWiki:Policy-url}}|zásadami a smernicami {{GRAMMAR:genitív|{{SITENAME}}}}]].',
+'actioncomplete'         => 'Úloha bola dokon�ená',
+'deletedtext'            => '"<nowiki>$1</nowiki>" bol zmazaný.
 Na $2 nájdete zoznam posledných zmazaní.',
-'deletedarticle'              => '„[[$1]]“ zmazaná',
-'suppressedarticle'           => 'potla�il „[[$1]]“',
-'dellogpage'                  => 'Záznam zmazaní',
-'dellogpagetext'              => 'Tu je zoznam posledných zmazaní.',
-'deletionlog'                 => 'záznam zmazaní',
-'reverted'                    => 'Obnovené na skoršiu verziu',
-'deletecomment'               => 'Dôvod na zmazanie',
-'deleteotherreason'           => 'Iný/�alší dôvod:',
-'deletereasonotherlist'       => 'Iný dôvod',
-'deletereason-dropdown'       => '*Bežné dôvody zmazania
+'deletedarticle'         => '„[[$1]]“ zmazaná',
+'suppressedarticle'      => 'potla�il „[[$1]]“',
+'dellogpage'             => 'Záznam zmazaní',
+'dellogpagetext'         => 'Tu je zoznam posledných zmazaní.',
+'deletionlog'            => 'záznam zmazaní',
+'reverted'               => 'Obnovené na skoršiu verziu',
+'deletecomment'          => 'Dôvod na zmazanie',
+'deleteotherreason'      => 'Iný/�alší dôvod:',
+'deletereasonotherlist'  => 'Iný dôvod',
+'deletereason-dropdown'  => '*Bežné dôvody zmazania
 ** Na žiadosť autora
 ** Porušenie autorských práv
 ** Vandalizmus',
-'delete-edit-reasonlist'      => 'Upraviť dôvody zmazania',
-'delete-toobig'               => 'Táto stránka má veľkú históriu úprav, viac ako $1 {{PLURAL:$1|revíziu|revízie|revízií}}. Mazanie takýchto stránok bolo obmedzené, aby sa zabránilo náhodnému poškodeniu {{GRAMMAR:genitív|{{SITENAME}}}}.',
-'delete-warning-toobig'       => 'Táto stránka má veľkú históriu úprav, viac ako $1 {{PLURAL:$1|revíziu|revízie|revízií}}. Jej zmazanie by mohlo narušiť databázové operácie {{GRAMMAR:genitív|{{SITENAME}}}}; postupujte opatrne.',
-'rollback'                    => 'Rollback úprav',
-'rollback_short'              => 'Rollback',
-'rollbacklink'                => 'rollback',
-'rollbackfailed'              => 'Rollback neúspešný',
-'cantrollback'                => 'Nie je možné úpravu vrátiť späť, posledný autor je jediný autor tejto stránky.',
-'alreadyrolled'               => 'Nemožno vrátiť späť poslednú úpravu [[:$1]] od [[User:$2|$2]] ([[User talk:$2|Diskusia]] | [[Special:Contributions/$2|{{int:contribslink}}]]); niekto iný bu� upravoval stránku alebo už vrátil úpravy späť.
-
-Autorom poslednej úpravy je [[User:$3|$3]] ([[User talk:$3|Diskusia]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Komentár k úprave bol: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Posledné úpravy používateľa [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusia]]) vrátené; bola obnovená posledná úprava $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Úpravy $1 vrátené; obnovená posledná verzia od $2.',
-'sessionfailure'              => 'Zdá sa, že je problém s vašou prihlasovacou reláciou;
+'delete-edit-reasonlist' => 'Upraviť dôvody zmazania',
+'delete-toobig'          => 'Táto stránka má veľkú históriu úprav, viac ako $1 {{PLURAL:$1|revíziu|revízie|revízií}}. Mazanie takýchto stránok bolo obmedzené, aby sa zabránilo náhodnému poškodeniu {{GRAMMAR:genitív|{{SITENAME}}}}.',
+'delete-warning-toobig'  => 'Táto stránka má veľkú históriu úprav, viac ako $1 {{PLURAL:$1|revíziu|revízie|revízií}}. Jej zmazanie by mohlo narušiť databázové operácie {{GRAMMAR:genitív|{{SITENAME}}}}; postupujte opatrne.',
+
+# Rollback
+'rollback'         => 'Rollback úprav',
+'rollback_short'   => 'Rollback',
+'rollbacklink'     => 'rollback',
+'rollbackfailed'   => 'Rollback neúspešný',
+'cantrollback'     => 'Nie je možné úpravu vrátiť späť, posledný autor je jediný autor tejto stránky.',
+'alreadyrolled'    => 'Nemožno vrátiť späť poslednú úpravu [[:$1]] od [[User:$2|$2]] ([[User talk:$2|Diskusia]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); niekto iný bu� upravoval stránku alebo už vrátil úpravy späť.
+
+Autorom poslednej úpravy je [[User:$3|$3]] ([[User talk:$3|Diskusia]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Zhrnutie úpravy bolo: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Posledné úpravy používateľa [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusia]]) vrátené; bola obnovená posledná úprava $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Úpravy $1 vrátené; obnovená posledná verzia od $2.',
+'sessionfailure'   => 'Zdá sa, že je problém s vašou prihlasovacou reláciou;
 táto akcia bola zrušená ako prevencia proti zneužitiu relácie (session).
 Prosím, stla�te "naspäť", obnovte stránku, z ktorej ste sa sem dostali, a skúste to znova.',
+
+# Protect
 'protectlogpage'              => 'Záznam zamknutí',
 'protectlogtext'              => 'Nižšie je zoznam zamknutí/odomknutí stránok.
 Môžete si pozrieť aj [[Special:ProtectedPages|zoznam momentálne platných zamknutí]].',
 'protectedarticle'            => 'zamyká „[[$1]]“',
 'modifiedarticleprotection'   => 'zmenená úroveň ochrany „[[$1]]“',
 'unprotectedarticle'          => 'odomyká „[[$1]]“',
+'movedarticleprotection'      => 'nastavenia zamknutia stránky presunuté z „[[$2]]� na „[[$1]]�',
 'protect-title'               => 'Zamykám „$1“',
+'prot_1movedto2'              => '[[$1]] premiestnená na [[$2]]',
 'protect-legend'              => 'Potvr�te zamknutie',
 'protectcomment'              => 'Komentár:',
 'protectexpiry'               => 'Zamknuté do:',
 'protect_expiry_invalid'      => 'Neplatný �as vypršania.',
 'protect_expiry_old'          => 'Čas vypršania je v minulosti.',
 'protect-unchain'             => 'Odomknúť povolenia pre presun',
-'protect-text'                => 'Tu si môžete pozrieť a zmeniť úroveň ochrany stránky <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nemôžete meniť úroveň ochrany, kým ste zablokovaný.
-Tu sú aktuálne nastavenia stránky <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Nie je možné zmeniť úroveň ochrany z dôvodu aktívneho zámku databázy.
-Tu sú aktuálne nastavenia stránky <strong>$1</strong>:',
-'protect-locked-access'       => 'Váš ú�et nemá oprávnenie meniť úroveň ochrany stránky.
-Tu sú aktuálne nastavenia stránky <strong>$1</strong>:',
+'protect-text'                => "Tu si môžete pozrieť a zmeniť úroveň ochrany stránky '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nemôžete meniť úroveň ochrany, kým ste zablokovaný.
+Tu sú aktuálne nastavenia stránky '''$1''':",
+'protect-locked-dblock'       => "Nie je možné zmeniť úroveň ochrany z dôvodu aktívneho zámku databázy.
+Tu sú aktuálne nastavenia stránky '''$1''':",
+'protect-locked-access'       => "Váš ú�et nemá oprávnenie meniť úroveň ochrany stránky.
+Tu sú aktuálne nastavenia stránky '''$1''':",
 'protect-cascadeon'           => 'Táto stránka je momentálne zamknutá, lebo je použitá na {{PLURAL:$1|nasledovnej stránke, ktorá má|nasledovných stránkach, ktoré majú}} zapnutú kaskádovú ochranu. Môžete zmeniť úroveň ochrany tejto stránky, ale neovplyvní to kaskádovú ochranu.',
-'protect-default'             => '(predvolené)',
+'protect-default'             => 'Povoliť všetkých používateľov',
 'protect-fallback'            => 'Vyžadovať povolenie „$1“',
-'protect-level-autoconfirmed' => 'Zablokovať neregistrovaných používateľov',
+'protect-level-autoconfirmed' => 'Zablokovať nových a nezaregistrovaných používateľov',
 'protect-level-sysop'         => 'Len pre správcov',
 'protect-summary-cascade'     => 'kaskáda',
 'protect-expiring'            => 'vyprší o $1 (UTC)',
+'protect-expiry-indefinite'   => 'na neur�ito',
 'protect-cascade'             => 'Kaskádové zamknutie - chrániť všetky stránky použité na tejto stránke.',
 'protect-cantedit'            => 'Nemôžete zmeniť úrovne ochrany tejto stránky, pretože nemáte oprávnenie ju upravovať.',
+'protect-othertime'           => 'Iný �as:',
+'protect-othertime-op'        => 'iný �as',
+'protect-existing-expiry'     => 'Sú�asný �as ukon�enia: $2, $3',
+'protect-otherreason'         => 'Iný/�alší dôvod:',
+'protect-otherreason-op'      => 'iný/�alší dôvod',
+'protect-dropdown'            => '* Bežné dôvody zamknutia
+** Nadmerný vandalizmus
+** Nadmerný spam
+** Neproduktívne upravovacie vojny
+** Veľmi �asto naštevovaná stránka',
+'protect-edit-reasonlist'     => 'Upraviť dôvody zamknutia',
+'protect-expiry-options'      => '2 hodiny:2 hours,1 deň:1 day,3 dni:3 days,1 týždeň:1 week,2 týždne:2 weeks,1 mesiac:1 month,3 mesiace:3 months,6 mesiacov:6 months,1 rok:1 year,na neur�ito:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Povolenie:',
 'restriction-level'           => 'Úroveň obmedzenia:',
 'minimum-size'                => 'Minimálna veľkosť',
@@ -1743,8 +1944,9 @@ Tu sú aktuálne nastavenia stránky <strong>$1</strong>:',
 'undeletepage'                 => 'Zobraziť a obnoviť vymazané stránky',
 'undeletepagetitle'            => "'''Nasledovné pozostáva zo zmazaných revízií stránky [[:$1]]'''.",
 'viewdeletedpage'              => 'Zobraziť zmazané stránky',
-'undeletepagetext'             => 'Tieto stránky boli zmazané, ale sú stále v archíve a
-môžu byť obnovené. Archív môže byť pravidelne vyprázdnený.',
+'undeletepagetext'             => '{{PLURAL:$1|Táto stránka bola zmazaná, ale je stále v archíve a
+možno ju obnoviť|Tieto stránky boli zmazané, ale sú stále v archíve a
+možno ich obnoviť}}. Archív môže byť pravidelne vyprázdnený.',
 'undelete-fieldset-title'      => 'Obnoviť revízie',
 'undeleteextrahelp'            => "Ak chcete obnoviť celú stránku, nechajte všetky zaškrtávacie polia nezaškrtnuté a kliknite na '''''Obnoviť'''''.
 Ak chcete vykonať selektívnu obnovu, zašktrnite polia zodpovedajúce revíziám, ktoré sa majú obnoviť a kliknite na '''''Obnoviť'''''.
@@ -1754,12 +1956,13 @@ Kliknutie na '''''Reset''''' vy�istí pole s komentárom a všetky zaškrtávac
 Ak bola od zmazania vytvorená nová stránka s rovnakým názvom, obnovené revízie sa objavia v histórii stránky.',
 'undeleterevdel'               => 'Obnovenie sa nevykoná, ak by malo mať za dôsledok �iasto�né zmazanie poslednej revízie. V takých prípadoch musíte odzna�iť alebo odkryť najnovšie zmazané revízie.',
 'undeletehistorynoadmin'       => 'Táto stránka bola zmazaná. Dôvod zmazania je zobrazený dolu v zhrnutí spolu s podrobnosťami o používateľoch, ktorí túto stránku upravovali pred zmazaním. Samotný text týchto zmazaných revízií je prístupný iba správcom.',
-'undelete-revision'            => '$3 zmazal revíziu $1 (z $2):',
+'undelete-revision'            => '$3 zmazal revíziu $1 ($4, $5):',
 'undeleterevision-missing'     => 'Neplatná alebo chýbajúca revízia. Zrejme ste použili zlý odkaz alebo revízia bola obnovená alebo odstránená z histórie.',
 'undelete-nodiff'              => 'Nebola nájdená žiadna predošlá revízia.',
 'undeletebtn'                  => 'Obnoviť!',
 'undeletelink'                 => 'obnoviť',
 'undeletereset'                => 'Reset',
+'undeleteinvert'               => 'Invertovať výber',
 'undeletecomment'              => 'Komentár:',
 'undeletedarticle'             => 'obnovený „[[$1]]“',
 'undeletedrevisions'           => '{{PLURAL:$1|jedna verzia bola obnovená|$1 verzie boli obnovené|$1 verzií bolo obnovených}}',
@@ -1791,26 +1994,27 @@ $1',
 'blanknamespace' => '(Hlavný)',
 
 # Contributions
-'contributions' => 'Príspevky používateľa',
-'mycontris'     => 'Moje príspevky',
-'contribsub2'   => 'Príspevky $1 ($2)',
-'nocontribs'    => 'Neboli nájdené úpravy, ktoré by zodpovedali týmto kritériám.',
-'uctop'         => '(posledná úprava)',
-'month'         => 'Mesiac:',
-'year'          => 'Rok:',
-
-'sp-contributions-newbies'     => 'Zobraziť len príspevky nových ú�tov',
-'sp-contributions-newbies-sub' => 'Príspevky nová�ikov',
-'sp-contributions-blocklog'    => 'Záznam blokovaní',
-'sp-contributions-search'      => 'Hľadať príspevky',
-'sp-contributions-username'    => 'IP adresa alebo meno používateľa:',
-'sp-contributions-submit'      => 'Hľadať',
+'contributions'       => 'Príspevky používateľa',
+'contributions-title' => 'Príspevky používateľa pre $1',
+'mycontris'           => 'Moje príspevky',
+'contribsub2'         => 'Príspevky $1 ($2)',
+'nocontribs'          => 'Neboli nájdené úpravy, ktoré by zodpovedali týmto kritériám.',
+'uctop'               => '(posledná úprava)',
+'month'               => 'Mesiac:',
+'year'                => 'Rok:',
+
+'sp-contributions-newbies'       => 'Zobraziť len príspevky nových ú�tov',
+'sp-contributions-newbies-sub'   => 'Príspevky nová�ikov',
+'sp-contributions-newbies-title' => 'Príspevky nových používateľov',
+'sp-contributions-blocklog'      => 'Záznam blokovaní',
+'sp-contributions-search'        => 'Hľadať príspevky',
+'sp-contributions-username'      => 'IP adresa alebo meno používateľa:',
+'sp-contributions-submit'        => 'Hľadať',
 
 # What links here
 'whatlinkshere'            => 'Odkazy na túto stránku',
 'whatlinkshere-title'      => 'Stránky odkazujúce na „$1�',
 'whatlinkshere-page'       => 'Page:',
-'linklistsub'              => '(Zoznam odkazov)',
 'linkshere'                => "Nasledujúce stránky odkazujú na '''[[:$1]]''':",
 'nolinkshere'              => "Žiadne stránky neodkazujú na '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Žiadne stránky neodkazujú na '''[[:$1]]''' vo zvolenom mennom priestore.",
@@ -1856,6 +2060,8 @@ Nižšie uve�te konkrétny dôvod (napríklad uve�te konkrétne stránky, ktor
 'ipbotherreason'                  => 'Iný/�alší dôvod',
 'ipbhidename'                     => 'Skryť používateľa zo záznamu blokovaní, aktívneho zoznamu blokovaní a zoznamu používateľov',
 'ipbwatchuser'                    => 'Sledovať používateľskú a diskusnú stránku tohto používateľa',
+'ipballowusertalk'                => 'Umožniť tomuto používateľovi upravovať vlastnú diskusnú stránku aj ke� je zablokovaný.',
+'ipb-change-block'                => 'Znovu zablokovať používateľa s týmito voľbami',
 'badipaddress'                    => 'IP adresa má nesprávny formát.',
 'blockipsuccesssub'               => 'Zablokovanie bolo úspešné',
 'blockipsuccesstext'              => '„$1“ bol/a zablokovaný/á.<br />
@@ -1865,15 +2071,19 @@ Nižšie uve�te konkrétny dôvod (napríklad uve�te konkrétne stránky, ktor
 'ipb-unblock'                     => 'Odblokovať používateľa alebo IP adresu',
 'ipb-blocklist-addr'              => 'Existujúce blokovania pre $1',
 'ipb-blocklist'                   => 'Zobraziť existujúce blokovania',
+'ipb-blocklist-contribs'          => 'Príspevky $1',
 'unblockip'                       => 'Odblokovať používateľa',
 'unblockiptext'                   => 'Použite tento formulár na obnovenie možnosti zápisov
 z/od momentálne zablokovanej IP adresy/používateľa.',
-'ipusubmit'                       => 'Odblokovať túto adresu',
+'ipusubmit'                       => 'Zrušiť toto blokovanie',
 'unblocked'                       => '[[User:$1|$1]] bol odblokovaný',
 'unblocked-id'                    => 'Blokovanie $1 bolo odstránené',
 'ipblocklist'                     => 'Zablokovaní používatelia/IP adresy',
 'ipblocklist-legend'              => 'Nájsť zablokovaného používateľa',
 'ipblocklist-username'            => 'Používateľské meno alebo IP adresa:',
+'ipblocklist-sh-userblocks'       => '$1 zablokovaných ú�tov',
+'ipblocklist-sh-tempblocks'       => '$1 do�asných zablokovaní',
+'ipblocklist-sh-addressblocks'    => '$1 zablokovaní jednotlivej IP adresy',
 'ipblocklist-submit'              => 'Hľadať',
 'blocklistline'                   => '$1, $2 zablokoval $3 (ukon�enie $4)',
 'infiniteblock'                   => 'na neur�ito',
@@ -1882,14 +2092,18 @@ z/od momentálne zablokovanej IP adresy/používateľa.',
 'noautoblockblock'                => 'automatické blokovanie vypnuté',
 'createaccountblock'              => 'tvorba ú�tov bola zablokovaná',
 'emailblock'                      => 'email blokovaný',
+'blocklist-nousertalk'            => 'nemôže upravovať svoju diskusnú stránku',
 'ipblocklist-empty'               => 'Zoznam blokovaní je prázdny.',
 'ipblocklist-no-results'          => 'Požadovaná IP adresa alebo používateľské meno nie je blokovaná.',
 'blocklink'                       => 'zablokovať',
 'unblocklink'                     => 'odblokuj',
+'change-blocklink'                => 'zmeniť blokovanie',
 'contribslink'                    => 'príspevky',
 'autoblocker'                     => 'Ste zablokovaný, pretože zdieľate IP adresu s „$1“. Dôvod „$2“.',
 'blocklogpage'                    => 'Záznam_blokovaní',
+'blocklog-fulllog'                => 'Úplný záznam blokovaní',
 'blocklogentry'                   => 'zablokoval/a "[[$1]]" s �asom ukon�enia $2 $3',
+'reblock-logentry'                => 'zmenené voľby zablokovania používateľa [[$1]] s �asom vypršania $2, $3',
 'blocklogtext'                    => 'Toto je zoznam blokovaní a odblokovaní používateľov. Automaticky
 blokované IP adresy nie sú zahrnuté. Pozri zoznam
 [[Special:IPBlockList|aktuálnych blokovaní]].',
@@ -1898,11 +2112,14 @@ blokované IP adresy nie sú zahrnuté. Pozri zoznam
 'block-log-flags-nocreate'        => 'možnosť vytvoriť si ú�et bola vypnutá',
 'block-log-flags-noautoblock'     => 'autoblokovanie vypnuté',
 'block-log-flags-noemail'         => 'email blokovaný',
+'block-log-flags-nousertalk'      => 'nemôže upravovať vlastnú diskusnú stránku',
 'block-log-flags-angry-autoblock' => 'rozšírené automatické blokovanie zapnuté',
 'range_block_disabled'            => 'Možnosť správcov vytvárať rozsah zablokovaní je vypnutá.',
 'ipb_expiry_invalid'              => 'Neplatný �as ukon�enia.',
 'ipb_expiry_temp'                 => 'Blokovania skrytých používateľských mien by mali byť trvalé.',
 'ipb_already_blocked'             => '„$1“ je už zablokovaný',
+'ipb-needreblock'                 => '== Už je zablokovaný ==
+$1 je už zablokovaný. Chcete zmeniť voľby blokovania?',
 'ipb_cant_unblock'                => 'Chyba: ID bloku $1 nenájdený. Možno už bol odblokovaný.',
 'ipb_blocked_as_range'            => 'Chyba: IP adresa $1 nie je blokovaná priamo a nie je ju teda možné odblokovať. Je však blokovaná v rámci rozsahu $2, ktorý je možné odblokovať.',
 'ip_range_invalid'                => 'Neplatný IP rozsah.',
@@ -1913,6 +2130,7 @@ blokované IP adresy nie sú zahrnuté. Pozri zoznam
 'proxyblocksuccess'               => 'Hotovo.',
 'sorbsreason'                     => 'Vaša IP adresa je vedená ako nezabezpe�ený proxy server v DNSBL.',
 'sorbs_create_account_reason'     => 'Vaša IP adresa je vedená ako nezabezpe�ený proxy server v databáze DNSBL, ktorú používa {{SITENAME}}. Nemôžete si vytvoriť ú�et.',
+'cant-block-while-blocked'        => 'Nemôžete blokovať iných používateľov, kým ste zablokovaný.',
 
 # Developer tools
 'lockdb'              => 'Zamknúť databázu',
@@ -1940,9 +2158,9 @@ Nezabudnite po dokon�ení údržby [[Special:UnlockDB|odstrániť zámok]].',
 'databasenotlocked'   => 'Databáza nie je zamknutá.',
 
 # Move page
-'move-page'               => 'Presunúť $1',
-'move-page-legend'        => 'Presunúť stránku',
-'movepagetext'            => "Pomocou tohto formulára premenujete stránku a premiestnite všetky jej predchádzajúce verzie pod zadaný nový názov.
+'move-page'                    => 'Presunúť $1',
+'move-page-legend'             => 'Presunúť stránku',
+'movepagetext'                 => "Pomocou tohto formulára premenujete stránku a premiestnite všetky jej predchádzajúce verzie pod zadaný nový názov.
 Starý názov sa stane presmerovacou stránkou na nový názov.
 Môžete automaticky aktualizovať odkazy odkazujúce na pôvodný názov.
 Ak sa rozhodnete túto možnosť nevyužiť, ubezpe�te sa, že ste skontrolovali
@@ -1957,52 +2175,65 @@ existujúcu stránku.
 '''UPOZORNENIE!'''
 Toto môže byť drastická a ne�akaná zmena pre populárnu stránku;
 ubezpe�te sa preto, skôr ako budete pokra�ovať, že chápete dôsledky svojho �inu.",
-'movepagetalktext'        => "Príslušná diskusná stránka (ak existuje) bude premiestnená spolu so samotnou stránkou; '''nestane sa tak, iba ak:'''
+'movepagetalktext'             => "Príslušná diskusná stránka (ak existuje) bude premiestnená spolu so samotnou stránkou; '''nestane sa tak, iba ak:'''
 *už existuje Diskusná stránka pod týmto novým menom, alebo
 *nezaškrtnete nižšie sa nachádzajúci textový rám�ek.
 
 V takých prípadoch budete musieť, ak si to želáte, premiestniť alebo zlú�iť stránku ru�ne.",
-'movearticle'             => 'Presunúť stránku',
-'movenotallowed'          => 'Nemáte povolenie presúvať stránky.',
-'newtitle'                => 'Na nový názov:',
-'move-watch'              => 'Sledovať túto stránku',
-'movepagebtn'             => 'Presunúť stránku',
-'pagemovedsub'            => 'Presun bol úspešný',
-'movepage-moved'          => "<big>'''„$1� bolo presunuté na „$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Stránka s týmto názvom už existuje alebo
+'movearticle'                  => 'Presunúť stránku',
+'movenologin'                  => 'Nie ste prihlásený',
+'movenologintext'              => 'Musíte byť registrovaný používateľ a [[Special:UserLogin|prihlásený]], aby ste mohli presunúť stránku.',
+'movenotallowed'               => 'Nemáte povolenie presúvať stránky.',
+'movenotallowedfile'           => 'Nemáte oprávnenie presúvať súbory.',
+'cant-move-user-page'          => 'Nemáte povolenie presúvať koreňové stránky používateľov.',
+'cant-move-to-user-page'       => 'Nemáte oprávnenie presunúť stránku na stránku používateľa (iba na podstránku používateľa).',
+'newtitle'                     => 'Na nový názov:',
+'move-watch'                   => 'Sledovať túto stránku',
+'movepagebtn'                  => 'Presunúť stránku',
+'pagemovedsub'                 => 'Presun bol úspešný',
+'movepage-moved'               => "<big>'''„$1� bolo presunuté na „$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Bolo vytvorené presmerovanie.',
+'movepage-moved-noredirect'    => 'Vytvorenie presmerovania bolo potla�ené.',
+'articleexists'                => 'Stránka s týmto názvom už existuje alebo
 vami zadaný názov je neplatný.
 Prosím vyberte si iný názov.',
-'cantmove-titleprotected' => 'Nemôžete sem presunúť stránku, pretože nový názov bol zamknutý proti vytvoreniu.',
-'talkexists'              => "'''Samotná stránka bola úspešne premiestnená,
+'cantmove-titleprotected'      => 'Nemôžete sem presunúť stránku, pretože nový názov bol zamknutý proti vytvoreniu.',
+'talkexists'                   => "'''Samotná stránka bola úspešne premiestnená,
 ale diskusná stránka sa nedala premiestniť,
 pretože už jedna existuje pod zadaným novým názvom.
 Prosím, zlú�te ich ru�ne.'''",
-'movedto'                 => 'presunutá na',
-'movetalk'                => 'Presunúť aj príslušnú diskusnú stránku, ak sa dá.',
-'move-subpages'           => 'Presunúť všetky podstránky ak existujú',
-'move-talk-subpages'      => 'Presunúť všetky podstránky diskusnej stránky ak existujú',
-'movepage-page-exists'    => 'Stránka $1 už existuje a nie je možné ju automaticky prepísať.',
-'movepage-page-moved'     => 'Stránka $1 bola presunutá na $2.',
-'movepage-page-unmoved'   => 'Stránku $1 nebolo možné presunúť na $2.',
-'movepage-max-pages'      => 'Maximum $1 {{PLURAL:$1|stránka bola presunutá|stránok bolo presunutých}} a viac nebude presunutých automaticky.',
-'1movedto2'               => '[[$1]] premiestnená na [[$2]]',
-'1movedto2_redir'         => '[[$1]] premiestnená na [[$2]] výmenou presmerovania',
-'movelogpage'             => 'Záznam presunov',
-'movelogpagetext'         => 'Tu je zoznam posledných presunutí.',
-'movereason'              => 'Dôvod:',
-'revertmove'              => 'obnova',
-'delete_and_move'         => 'Vymazať a presunúť',
-'delete_and_move_text'    => '==Je potrebné zmazať stránku==
+'movedto'                      => 'presunutá na',
+'movetalk'                     => 'Presunúť aj príslušnú diskusnú stránku, ak sa dá.',
+'move-subpages'                => 'Presunúť všetky podstránky ak existujú',
+'move-talk-subpages'           => 'Presunúť všetky podstránky diskusnej stránky ak existujú',
+'movepage-page-exists'         => 'Stránka $1 už existuje a nie je možné ju automaticky prepísať.',
+'movepage-page-moved'          => 'Stránka $1 bola presunutá na $2.',
+'movepage-page-unmoved'        => 'Stránku $1 nebolo možné presunúť na $2.',
+'movepage-max-pages'           => 'Maximum $1 {{PLURAL:$1|stránka bola presunutá|stránok bolo presunutých}} a viac nebude presunutých automaticky.',
+'1movedto2'                    => '[[$1]] premiestnená na [[$2]]',
+'1movedto2_redir'              => '[[$1]] premiestnená na [[$2]] výmenou presmerovania',
+'move-redirect-suppressed'     => 'presmerovanie bolo potla�ené',
+'movelogpage'                  => 'Záznam presunov',
+'movelogpagetext'              => 'Tu je zoznam posledných presunutí.',
+'movereason'                   => 'Dôvod:',
+'revertmove'                   => 'obnova',
+'delete_and_move'              => 'Vymazať a presunúť',
+'delete_and_move_text'         => '==Je potrebné zmazať stránku==
 
 Cieľová stránka „[[:$1]]“ už existuje. Chcete ho vymazať a vytvoriť tak priestor pre presun?',
-'delete_and_move_confirm' => '�no, zmaž stránku',
-'delete_and_move_reason'  => 'Vymazať, aby sa umožnil presun',
-'selfmove'                => 'Zdrojový a cieľový názov sú rovnaké; nemožno presunúť stránku na seba samú.',
-'immobile_namespace'      => 'Cieľový názov je špeciálneho typu; nemôžem presunúť stránku do tohto menného priestoru.',
-'imagenocrossnamespace'   => 'Obrázok nemožno presunúť mimo menného priestoru obrázkov',
-'imagetypemismatch'       => 'Nová prípona súboru nezodpovedá jeho typu',
-'imageinvalidfilename'    => 'Cieľový názov obrázka nie je platný',
-'fix-double-redirects'    => 'Aktualizovať všetky presmerovania odkazujúce na pôvodný názov',
+'delete_and_move_confirm'      => '�no, zmaž stránku',
+'delete_and_move_reason'       => 'Vymazať, aby sa umožnil presun',
+'selfmove'                     => 'Zdrojový a cieľový názov sú rovnaké; nemožno presunúť stránku na seba samú.',
+'immobile-source-namespace'    => 'Nemôžete presúvať stránky v mennom priestore „$1�',
+'immobile-target-namespace'    => 'Nemôžete presúvať stránky do menného priestoru „$1�',
+'immobile-target-namespace-iw' => 'Interwiki odkaz nie je platným cieľom na presun stránky.',
+'immobile-source-page'         => 'Túto stránku nemožno presunúť.',
+'immobile-target-page'         => 'Nie je možné presunúť na cieľovú stránku z daným názvom.',
+'imagenocrossnamespace'        => 'Obrázok nemožno presunúť mimo menného priestoru obrázkov',
+'imagetypemismatch'            => 'Nová prípona súboru nezodpovedá jeho typu',
+'imageinvalidfilename'         => 'Cieľový názov obrázka nie je platný',
+'fix-double-redirects'         => 'Aktualizovať všetky presmerovania odkazujúce na pôvodný názov',
+'move-leave-redirect'          => 'Zanechať presmerovanie',
 
 # Export
 'export'            => 'Export stránok',
@@ -2012,7 +2243,7 @@ wiki používajúceho MediaWiki softvér pomocou stránky Special:Import.
 
 Pre export stránok zadajte názvy do tohto poľa, jeden názov na riadok, a zvoľte, �i chcete iba sú�asnú verziu s informáciou o poslednej úprave alebo aj všetky staršie verzie s históriou úprav.
 
-V druhom prípade môžete tiež použiť odkaz, napr. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pre stránku [[{{MediaWiki:Mainpage}}]].',
+V druhom prípade môžete tiež použiť odkaz, napr. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pre stránku [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Zahrň iba aktuálnu verziu, nie kompletnú históriu',
 'exportnohistory'   => "----
 '''Poznámka:''' Exportovanie plnej histórie stránok pomocou tohto formulára bolo vypnuté z dôvodov výkonnosti.",
@@ -2027,7 +2258,8 @@ V druhom prípade môžete tiež použiť odkaz, napr. [[{{ns:special}}:Export/{
 'allmessagesname'           => 'Názov',
 'allmessagesdefault'        => 'štandardný text',
 'allmessagescurrent'        => 'aktuálny text',
-'allmessagestext'           => 'Toto je zoznam všetkých správ dostupných v mennom priestore MediaWiki.',
+'allmessagestext'           => 'Toto je zoznam všetkých správ dostupných v mennom priestore MediaWiki.
+Prosím, navštívte [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] a [http://translatewiki.net translatewiki.net] ak chcete prispieť k všeobecnej lokalizácii MediaWiki.',
 'allmessagesnotsupportedDB' => "Túto stránku nemožno použiť, pretože '''\$wgUseDatabaseMessages''' je vypnuté.",
 'allmessagesfilter'         => 'Filter názvov správ:',
 'allmessagesmodified'       => 'Zobraziť iba zmenené',
@@ -2047,9 +2279,12 @@ V druhom prípade môžete tiež použiť odkaz, napr. [[{{ns:special}}:Export/{
 'import-interwiki-text'      => 'Zvoľte wiki a názov stránky, ktorá sa má importovať.
 Dátumy revízií a mená používateľov budú zachované.
 Všetky transwiki importy sa zaznamenávajú v [[Special:Log/import|Zázname importov]].',
+'import-interwiki-source'    => 'Zdrojová wiki/stránka:',
 'import-interwiki-history'   => 'Skopírovať všetky historické revízie tejto stránky',
 'import-interwiki-submit'    => 'Importovať',
 'import-interwiki-namespace' => 'Cieľový menný priestor:',
+'import-upload-filename'     => 'Názov súboru:',
+'import-comment'             => 'komentár:',
 'importtext'                 => 'Prosím exportujte súbor zo zdrojovej wiki použitím [[Special:Export|nástroja na export]], uložte ho na svoj disk a nahrajte sem.',
 'importstart'                => 'Importujú sa stránky...',
 'import-revision-count'      => '$1 {{PLURAL:$1|revízia|revízie|revízií}}',
@@ -2083,19 +2318,19 @@ Všetky transwiki importy sa zaznamenávajú v [[Special:Log/import|Zázname imp
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revízia|revízie|revízií}} z $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Moja používateľská stránka',
+'tooltip-pt-userpage'             => 'Vaša používateľská stránka',
 'tooltip-pt-anonuserpage'         => 'Používateľská stránka pre ip adresu, ktorú upravujete ako',
-'tooltip-pt-mytalk'               => 'Moja diskusná stránka',
+'tooltip-pt-mytalk'               => 'Vaša diskusná stránka',
 'tooltip-pt-anontalk'             => 'Diskusia o úpravách z tejto ip adresy',
 'tooltip-pt-preferences'          => 'Moje nastavenia',
 'tooltip-pt-watchlist'            => 'Zoznam stránok, na ktorých sledujete zmeny.',
-'tooltip-pt-mycontris'            => 'Zoznam mojich príspevkov',
+'tooltip-pt-mycontris'            => 'Zoznam vašich príspevkov',
 'tooltip-pt-login'                => 'Odporú�ame vám prihlásiť sa, nie je to však povinné.',
 'tooltip-pt-anonlogin'            => 'Odporú�ame vám prihlásiť sa, nie je to však povinné.',
 'tooltip-pt-logout'               => 'Odhlásiť',
 'tooltip-ca-talk'                 => 'Diskusia o obsahu stránky',
 'tooltip-ca-edit'                 => 'Môžete upravovať túto stránku. Prosíme, pred uložením použite tla�idlo Zobraziť náhľad.',
-'tooltip-ca-addsection'           => 'Pridať komentár k tejto diskusii.',
+'tooltip-ca-addsection'           => 'Za�ať novú sekciu',
 'tooltip-ca-viewsource'           => 'Táto stránka je zamknutá. Môžete však vidieť jej zdrojový text.',
 'tooltip-ca-history'              => 'Minulé verzie tejto stránky.',
 'tooltip-ca-protect'              => 'Zamknúť túto stránku',
@@ -2142,6 +2377,8 @@ Všetky transwiki importy sa zaznamenávajú v [[Special:Log/import|Zázname imp
 'tooltip-watch'                   => 'Pridať túto stránku k sledovaným.',
 'tooltip-recreate'                => 'Znovu vytvoriť stránku napriek tomu, že bola zmazaná',
 'tooltip-upload'                  => 'Za�ať nahrávanie',
+'tooltip-rollback'                => '„Rollback� vracia úpravy posledného prispievateľa tejto stránky jedným kliknutím.',
+'tooltip-undo'                    => '„Vrátiť� vráti túto úpravu a otvorí formulár úprav v režime náhľadu. Umožnuje do zhrnutia pridať dôvod.',
 
 # Stylesheets
 'common.css'   => '/** Tu sa nachádzajúce CSS sa použije pri všetkých skinoch */',
@@ -2157,12 +2394,12 @@ Všetky transwiki importy sa zaznamenávajú v [[Special:Log/import|Zázname imp
 'notacceptable'     => 'Wiki server nedokáže poskytovať dáta vo formáte, v akom ich váš klient vie �ítať.',
 
 # Attribution
-'anonymous'        => 'anonymných používateľov {{GRAMMAR:genitív|{{SITENAME}}}}',
+'anonymous'        => '$1 {{PLURAL:$1|anonymný používateľ|anonymní používatelia|anonymných používateľov}} {{GRAMMAR:genitív|{{SITENAME}}}}',
 'siteuser'         => 'používateľa {{GRAMMAR:genitív|{{SITENAME}}}} $1',
 'lastmodifiedatby' => 'Túto stránku naposledy upravoval používateľ $3 $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Založené na práci $1.',
 'others'           => 'iné',
-'siteusers'        => 'používateľov {{GRAMMAR:genitív|{{SITENAME}}}} $1',
+'siteusers'        => '{{PLURAL:$2|používateľ|používatelia|používateľov}} {{GRAMMAR:genitív|{{SITENAME}}}} $1',
 'creditspage'      => 'Autori stránky',
 'nocredits'        => 'Pre túto stránku neexistujú žiadne dostupné ocenenia.',
 
@@ -2183,6 +2420,14 @@ Pravdepodobne to spôsobil odkaz na externú internetovú lokalitu, ktorá sa na
 'numauthors'     => 'Po�et odlišných autorov (stránka): $1',
 'numtalkauthors' => 'Po�et odlišných autorov (diskusná stránka): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasický',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Kolínska modrá',
+'skinname-monobook'    => 'MonoBook',
+'skinname-simple'      => 'Jednoduchý',
+'skinname-modern'      => 'Moderný',
+
 # Math options
 'mw_math_png'    => 'Vždy vykresľovať PNG',
 'mw_math_simple' => 'Na jednoduché použiť HTML, inak PNG',
@@ -2203,10 +2448,12 @@ Pravdepodobne to spôsobil odkaz na externú internetovú lokalitu, ktorá sa na
 'markedaspatrollederror-noautopatrol' => 'Nie je vám umožnené ozna�iť vlastné zmeny za strážené.',
 
 # Patrol log
-'patrol-log-page'   => 'Záznam strážení',
-'patrol-log-header' => 'Toto je záznam strážených revízií.',
-'patrol-log-line'   => '$1 z $2 ozna�ených ako sledované $3',
-'patrol-log-auto'   => '(automaticky)',
+'patrol-log-page'      => 'Záznam strážení',
+'patrol-log-header'    => 'Toto je záznam strážených revízií.',
+'patrol-log-line'      => '$1 z $2 ozna�ených ako sledované $3',
+'patrol-log-auto'      => '(automaticky)',
+'patrol-log-diff'      => 'revízia $1',
+'log-show-hide-patrol' => 'záznam stráženia $1',
 
 # Image deletion
 'deletedrevision'                 => 'Zmazať staré verzie $1',
@@ -2223,6 +2470,9 @@ $1',
 'previousdiff' => '� Predchádzajúca úprava',
 'nextdiff'     => 'Ďalšia úprava →',
 
+# Visual comparison
+'visual-comparison' => 'Vizuálne porovnanie',
+
 # Media information
 'mediawarning'         => "'''Upozornenie''': Tento súbor môže obsahovať nebezpe�ný programový kód, po spustení ktorého by bol váš systém kompromitovaný.
 <hr />",
@@ -2236,10 +2486,12 @@ $1',
 'show-big-image'       => 'Obrázok vo vyššom rozlíšení',
 'show-big-image-thumb' => '<small>Veľkosť tohto náhľadu: $1 × $2 pixelov</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galéria nových obrázkov',
 'imagelisttext'         => "Tu je zoznam {{PLURAL:$1|jedného súboru|'''$1''' súborov|'''$1''' súborov}} zoradený $2.",
 'newimages-summary'     => 'Táto špeciálna stránka zobrazuje posledné nahrané súbory.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Názov súboru (alebo jeho �asť):',
 'showhidebots'          => '($1 botov)',
 'noimages'              => 'Niet �o zobraziť.',
 'ilsubmit'              => 'Hľadať',
@@ -2443,6 +2695,18 @@ Každý �alší odkaz na rovnakom riadku sa považuje za výnimku, t.j. �lánk
 'exif-lightsource-24'  => 'ISO štúdiový volfrám',
 'exif-lightsource-255' => 'Iný svetelný zdroj',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Blesk sa nespustil',
+'exif-flash-fired-1'    => 'Blesk sa spustil',
+'exif-flash-return-0'   => 'bez funkcie detekcie odrazeného svetla',
+'exif-flash-return-2'   => 'odrazené svetlo nebolo detekované',
+'exif-flash-return-3'   => 'odrazené svetlo bolo detekované',
+'exif-flash-mode-1'     => 'povinné spustenie blesku',
+'exif-flash-mode-2'     => 'povinné potla�enie blesku',
+'exif-flash-mode-3'     => 'automatický režim',
+'exif-flash-function-1' => 'Bez funkcie blesku',
+'exif-flash-redeye-1'   => 'režim potla�enia �ervených o�í',
+
 'exif-focalplaneresolutionunit-2' => 'palcov',
 
 'exif-sensingmethod-1' => 'Nedefinovaná',
@@ -2592,21 +2856,10 @@ $1
 Prosím, potvr�te, že túto stránku chcete skuto�ne znovu vytvoriť.",
 'recreate'            => 'Znova vytvoriť',
 
-# HTML dump
-'redirectingto' => 'Presmerovanie na [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Vy�istiť vyrovnávaciu pamäť (cache) tejto stránky?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Hľadať stránky obsahujúce ''$1''.",
-'searchnamed'      => "Hľadať stránky s názvom ''$1''.",
-'articletitles'    => "Stránky za�ínajúce na ''$1''",
-'hideresults'      => 'Skryť výsledky',
-'useajaxsearch'    => 'Použiť AJAX vyhľadávanie',
+'confirm-purge-top'    => 'Vy�istiť vyrovnávaciu pamäť (cache) tejto stránky?',
+'confirm-purge-bottom' => 'Vy�istenie stránky vymaže vyrovnávaciu pamäť a vynúti zobrazenie najnovšej verzie.',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; predošlá stránka',
@@ -2626,10 +2879,10 @@ $1',
 'table_pager_empty'        => 'Bez výsledkov',
 
 # Auto-summaries
-'autosumm-blank'   => 'Odstraňujem obsah stránky',
+'autosumm-blank'   => 'Odstránený obsah stránky',
 'autosumm-replace' => 'Nahrádzam stránku textom „$1“',
 'autoredircomment' => 'Presmerovanie na [[$1]]',
-'autosumm-new'     => 'Nová stránka: $1',
+'autosumm-new'     => 'Vytvorená stránka „$1“',
 
 # Live preview
 'livepreview-loading' => 'Na�ítava sa…',
@@ -2670,6 +2923,7 @@ Skúste oby�ajný náhľad.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Neznáma zna�ka rozšírenia „$1“',
+'duplicate-defaultsort' => 'Upozornenie: Štandardný kláves na zora�ovanie „$2“ nahrádza starý kláves „$1“.',
 
 # Special:Version
 'version'                          => 'Verzia', # Not used as normal message but as header for the special page itself
@@ -2699,13 +2953,13 @@ Skúste oby�ajný náhľad.',
 'filepath-summary' => 'Táto špeciálna stránka vráti úplnú cestu k súboru.
 Obrázky sa zobrazia v plnom rozlíšení, ostatné typy súborov sa spustia v príslušnom priradenom programe.
 
-Zadajte názov súboru bez predpony „{{ns:image}}:“.',
+Zadajte názov súboru bez predpony „{{ns:file}}:“.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Hľadať duplicitné súbory',
 'fileduplicatesearch-summary'  => 'Hľadanie duplicitných súborov na základe ich haš hodnôt.
 
-Zadajte názov súboru bez predpony „{{ns:image}}:“.',
+Zadajte názov súboru bez predpony „{{ns:file}}:“.',
 'fileduplicatesearch-legend'   => 'Hľadať duplicity',
 'fileduplicatesearch-filename' => 'Názov súboru:',
 'fileduplicatesearch-submit'   => 'Hľadať',
@@ -2735,4 +2989,13 @@ Zadajte názov súboru bez predpony „{{ns:image}}:“.',
 'blankpage'              => 'Prázdna stránka',
 'intentionallyblankpage' => 'Táto stránka je zámerne prázdna. Používa sa na meranie výkonnosti at�.',
 
+# External image whitelist
+'external_image_whitelist' => '  #Nechajte tento riadok presne tak, ako je<pre>
+#Časti regulárnych výrazov (tie, ktoré sa píšu medzi //) napíšte dolu
+#Budú porovnané s URL externých obrázkov
+#Tie, ktoré budú zodpovedať reg. výrazu sa zobrazia ako obrázky, inak sa zobrazí iba odkaz na obrázok
+#Riadky, ktoré za�ínajú znakom # sa považujú za komentáre
+
+#Napíšte všetky �asti reg. výrazov nad tento riadok. Nechajte tento riadok presne tak, ako je</pre>',
+
 );
diff --git a/languages/messages/MessagesSl.php b/languages/messages/MessagesSl.php
index f30fc1b9..5fd298d0 100644
--- a/languages/messages/MessagesSl.php
+++ b/languages/messages/MessagesSl.php
@@ -4,8 +4,10 @@
  * @ingroup Language
  * @file
  *
+ * @author Smihael
  * @author XJamRastafire
  * @author romanm
+ * @author sl.wikipedia.org administrators
  */
 
 $namespaceNames = array(
@@ -17,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Uporabniški_pogovor',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Pogovor_{{grammar:mestnik|$1}}',
-	NS_IMAGE          => 'Slika',
-	NS_IMAGE_TALK     => 'Pogovor_o_sliki',
+	NS_FILE           => 'Slika',
+	NS_FILE_TALK      => 'Pogovor_o_sliki',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Pogovor_o_MediaWiki',
 	NS_TEMPLATE       => 'Predloga',
@@ -29,6 +31,25 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Pogovor_o_kategoriji'
 );
 
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'DvojnePreusmeritve' ),
+	'BrokenRedirects'           => array( 'PokvarjenePreusmeritve' ),
+	'Disambiguations'           => array( 'Razlo�itve' ),
+	'Userlogin'                 => array( 'Prijava' ),
+	'Userlogout'                => array( 'Odjava' ),
+	'CreateAccount'             => array( 'Registracija' ),
+	'Preferences'               => array( 'Nastavitve' ),
+	'Watchlist'                 => array( 'SpisekNadzorov' ),
+	'Recentchanges'             => array( 'ZadnjeSpremembe' ),
+	'Upload'                    => array( 'Nalaganje' ),
+	'Listfiles'                 => array( 'SeznamDatotek', 'SeznamSlik' ),
+	'Newimages'                 => array( 'NoveDatoteke', 'NoveSlike' ),
+	'Listusers'                 => array( 'SeznamUporabnikov' ),
+	'Listgrouprights'           => array( 'SeznamPravicSkupin' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Nakljucno', 'NakljucnaStran' ),
+);
+
 $datePreferences = array(
 	'default',
 	'dmy short',
@@ -75,6 +96,8 @@ $messages = array(
 'tog-editwidth'               => 'Urejevalno polje naj ima vso Å¡irino',
 'tog-watchcreations'          => 'Vse ustvarjene strani dodaj na spisek nadzorov',
 'tog-watchdefault'            => 'Dodaj na spisek nadzorov vse �lanke, ki sem jih ustvaril/-a ali spremenil/-a',
+'tog-watchmoves'              => 'Dodaj strani, ki jih premaknem, na moj spisek nadzorov',
+'tog-watchdeletion'           => 'Dodaj strani, ki jih izbrišem, na moj spisek nadzorov',
 'tog-minordefault'            => 'Vsa urejanja ozna�i kot manjša',
 'tog-previewontop'            => 'Prikaži predogled pred urejevalnim poljem in ne za njim',
 'tog-previewonfirst'          => 'Ob za�etku urejanja prikaži predogled',
@@ -92,13 +115,15 @@ $messages = array(
 'tog-forceeditsummary'        => 'Ob vpisu praznega povzetka urejanja me opozori',
 'tog-watchlisthideown'        => 'Na spisku nadzorov skrij moja urejanja',
 'tog-watchlisthidebots'       => 'Na spisku nadzorov skrij urejanja botov',
+'tog-watchlisthideminor'      => 'Skrij manjša urejanja na spisku nadzorov',
+'tog-ccmeonemails'            => 'Pošlji mi kopijo e-sporo�il, ki jih pošljem drugim uporabnikom',
+'tog-diffonly'                => 'Ne prikaži vsebine strani pod primerjavo',
+'tog-showhiddencats'          => 'Prikaži skrite kategorije',
 
 'underline-always'  => 'Vedno',
 'underline-never'   => 'Nikoli',
 'underline-default' => 'Privzeto (brskalnik)',
 
-'skinpreview' => '(Predogled)',
-
 # Dates
 'sunday'        => 'nedelja',
 'monday'        => 'ponedeljek',
@@ -107,6 +132,13 @@ $messages = array(
 'thursday'      => '�etrtek',
 'friday'        => 'petek',
 'saturday'      => 'sobota',
+'sun'           => 'ned',
+'mon'           => 'pon',
+'tue'           => 'tor',
+'wed'           => 'sre',
+'thu'           => '�et',
+'fri'           => 'pet',
+'sat'           => 'sob',
 'january'       => 'januar',
 'february'      => 'februar',
 'march'         => 'marec',
@@ -145,10 +177,20 @@ $messages = array(
 'dec'           => 'dec.',
 
 # Categories related messages
-'pagecategories'         => '{{PLURAL:$1|Kategorija|Kategoriji|Kategorije|Kategorije|Kategorije}}',
-'category_header'        => 'Strani v kategoriji »$1«',
-'subcategories'          => 'Podkategorije',
-'listingcontinuesabbrev' => 'nadalj.',
+'pagecategories'                 => '{{PLURAL:$1|Kategorija|Kategoriji|Kategorije|Kategorije|Kategorije}}',
+'category_header'                => 'Strani v kategoriji »$1«',
+'subcategories'                  => 'Podkategorije',
+'category-media-header'          => 'Predstavnostno gradivo v kategoriji »$1«',
+'category-empty'                 => "''Ta kategorija trenutno ne vsebuje �lankov ali drugega gradiva.''",
+'hidden-categories'              => '{{PLURAL:$1|Skrita kategorija|Skrite kategorije}}',
+'hidden-category-category'       => 'Skrite kategorije', # Name of the category where hidden categories will be listed
+'category-subcat-count'          => 'Ta del kategorije ima {{PLURAL:$1|$1 slede�o podkategorijo|$1 slede�i podkategoriji|$1 slede�e podkategorije|$1 slede�ih podkategorij|$1 slede�ih podkategorij}}{{PLURAL:$2||, od skupno $2}}.',
+'category-subcat-count-limited'  => 'Ta kategorija ima {{PLURAL:$1|$1 slede�o podkategorijo|$1 slede�i podkategoriji|$1 slede�e podkategorije|$1 slede�ih podkategorij|$1 slede�ih podkategorij}}.',
+'category-article-count'         => 'Ta del kategorije vsebuje {{PLURAL:$1|$1 slede�o stran|$1 slede�i strani|$1 slede�e strani|$1 slede�ih strani|$1 slede�ih strani}}{{PLURAL:$2||, od skupno $2}}.',
+'category-article-count-limited' => 'V tej kategoriji {{PLURAL:$1|je $1 slede�a stran|sta $1 slede�i strani|so $1 slede�e strani|je $1 slede�ih strani|je $1 slede�ih strani}}.',
+'category-file-count'            => 'Ta del kategorije vsebuje {{PLURAL:$1|$1 slede�o datoteko|$1 slede�i datoteki|$1 slede�e datoteke|$1 slede�ih datotek|$1 slede�ih datotek}}{{PLURAL:$2||, od skupno $2}}.',
+'category-file-count-limited'    => 'V tej kategoriji {{PLURAL:$1|je $1 slede�a datoteka|sta $1 slede�i datoteki|so $1 slede�e datoteke|je $1 slede�ih datotek|je $1 slede�ih datotek}}.',
+'listingcontinuesabbrev'         => 'nadalj.',
 
 'mainpagetext'      => 'Wikiprogramje ste uspešno naložili!',
 'mainpagedocfooter' => 'Za uporabo in pomo� pri nastavitvi, prosimo, preglejte [http://meta.wikimedia.org/wiki/MediaWiki_localisation dokumentacijo za prilagajanje vmesnika]
@@ -170,7 +212,7 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 'mytalk'         => 'Pogovor',
 'anontalk'       => 'Pogovorna stran IP',
 'navigation'     => 'Navigacija',
-'and'            => 'in',
+'and'            => '&#32;in',
 
 # Metadata in edit box
 'metadata_help' => 'Metapodatki:',
@@ -191,16 +233,20 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 'permalink'         => 'Trajna povezava',
 'print'             => 'Tisk',
 'edit'              => 'Uredite stran',
+'create'            => 'ustvari',
 'editthispage'      => 'Uredi stran',
+'create-this-page'  => 'Ustvari to stran',
 'delete'            => 'Briši',
 'deletethispage'    => 'Briši stran',
 'undelete_short'    => 'Vrni $1 {{PLURAL:$1|izbrisano urejanje|izbrisani urejanji|izbrisana urejanja|izbrisanih urejanj|izbrisanih urejanj}}',
 'protect'           => 'Zaš�iti',
+'protect_change'    => 'spremeni zaš�ito',
 'protectthispage'   => 'Zaš�iti stran',
 'unprotect'         => 'Odstrani zaš�ito',
 'unprotectthispage' => 'Odstrani zaš�ito strani',
 'newpage'           => 'Nova stran',
 'talkpage'          => 'Pogovorite se o strani',
+'talkpagelinktext'  => 'Pogovor',
 'specialpage'       => 'Posebna stran',
 'personaltools'     => 'Osebna orodja',
 'postcomment'       => 'Objavite pripombo',
@@ -211,6 +257,7 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 'userpage'          => 'Prikaži uporabnikovo stran',
 'projectpage'       => 'Prikaži projektno stran',
 'imagepage'         => 'Prikaže stran z datoteko',
+'categorypage'      => 'Prikaži stran kategorije',
 'viewtalkpage'      => '< Pogovor',
 'otherlanguages'    => 'V drugih jezikih',
 'redirectedfrom'    => '(Preusmerjeno z $1)',
@@ -225,8 +272,6 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{UCFIRST:{{GRAMMAR:orodnik|{{SITENAME}}}}}}',
 'aboutpage'            => 'Project:{{UCFIRST:{{GRAMMAR:orodnik|{{SITENAME}}}}}}',
-'bugreports'           => 'Poro�ila o hroš�ih',
-'bugreportspage'       => 'Project:Poro�ila o hroš�ih',
 'copyright'            => 'Besedilo je na razpolago pod pogoji $1.',
 'copyrightpagename'    => 'Avtorske pravice {{GRAMMAR:rodilnik|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:Avtorske pravice {{GRAMMAR:rodilnik|{{SITENAME}}}}',
@@ -241,9 +286,11 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 'helppage'             => 'Help:Vsebina',
 'mainpage'             => 'Glavna stran',
 'mainpage-description' => 'Glavna stran',
+'policy-url'           => 'WikiProjekt:Pravila',
 'portal'               => 'Portal ob�estva',
 'portal-url'           => 'Project:Portal ob�estva',
 'privacy'              => 'Politika zasebnosti',
+'privacypage'          => 'wikimedia:Politika_zasebnosti',
 
 'badaccess' => 'Napaka pri dovoljenju',
 
@@ -251,6 +298,7 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 'versionrequiredtext' => 'Za uporabo strani je potrebna razli�ica MediaWiki $1. Glejte [[Special:Version]].',
 
 'ok'                      => 'V redu',
+'pagetitle'               => '$1 - {{SITENAME}}, prosta enciklopedija',
 'retrievedfrom'           => 'Vzpostavljeno iz »$1«',
 'youhavenewmessages'      => 'Imate $1 ($2)',
 'newmessageslink'         => 'novo sporo�ilo',
@@ -267,6 +315,7 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 'restorelink'             => '$1 {{PLURAL:$1|izbrisana redakcija|izbrisani redakciji|izbrisane redakcije|izbrisanih redakcij|izbrisanih redakcij}}',
 'feedlinks'               => 'Podajanje:',
 'feed-invalid'            => 'Neveljavna vrsta naro�niškega dovoda.',
+'red-link-title'          => '$1 (�lanek še ni napisan)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'ÄŒlanek',
@@ -289,7 +338,12 @@ in [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Uporabniški priro�
 # General errors
 'error'                => 'Napaka',
 'databaseerror'        => 'Napaka zbirke podatkov',
-'dberrortext'          => 'Iskanje ali drugo želeno dejanje je verjetno zahtevalo preve� �asa. Mogo�i razlogi so: <ul> <li>Iskanje z vsemi besedami v narekovajih. Poskusite najprej iskati brez njih. Kadar to ni zadosti, vpišite še nekaj iskalnih pojmov ali dodajte besedo ali dve zunaj narekovajev, s �imer boste ozna�ili splošno predmetno podro�je. <li>Zelo obsežen spisek nadzorov (verjetno �ez 10.000 strani) ob obremenjenih strežnikih. <li>Morda ste poskušali dejanje izvesti ob za�asni izredni obremenitvi strežnikov. Ob izrednih obremenitvah lahko pride do nenadnega kon�anja številnih pomembnih opravil, da se dosežejo obi�ajni odzivni �asi. Če se zahtevano dejanje sicer izvede brez težav, poskusite znova v nekaj minutah. </ul> <p>Splošno sporo�ilo o napaki je:</p> <p> Prišlo je do napake zbirke podatkov. Vzrok bi lahko bil nesprejemljiv iskalni niz (glejte $5) ali programski hroš�. Zadnje poskušano iskanje:</p> <blockquote><tt>$1</tt></blockquote> znotraj funkcije »<tt>$2</tt>«. MySQL je vrnil napako »<tt>$3: $4</tt>«. <p>Če je zgornja napaka 2013, je vaš postopek kon�al upravljavec podatkovnega bremena. Prosimo, poskusite z ustreznejšim iskanjem ali iskanje ponovite ob manj obremenjenih strežnikih. Opravi�ujemo se za nevše�nosti.</p>',
+'dberrortext'          => 'Prišlo je do napake zbirke podatkov.
+Vzrok bi lahko bil nesprejemljiv iskalni niz ali programski hroš�.
+Zadnje poskušano iskanje:
+<blockquote><tt>$1</tt></blockquote>
+znotraj funkcije »<tt>$2</tt>«.
+MySQL je vrnil napako »<tt>$3: $4</tt>«.',
 'dberrortextcl'        => 'Pri iskanju v zbirki podatkov je prišlo do skladenjske napake. Zadnje iskanje v zbirki podatkov: »$1« iz funkcije »$2«. MySQL je vrnil napako »$3: $4«.',
 'noconnect'            => 'S PB na $1 se ne morem povezati.',
 'nodb'                 => "Zbirke podatkov '$1' ne morem izbrati",
@@ -305,26 +359,36 @@ Sistemski skrbnik, ki jo je zaklenil, je podal naslednjo razlago: ''\"\$1\"''",
 'filecopyerror'        => 'Datoteke »$1« ni mogo�e prepisati v »$2«.',
 'filerenameerror'      => 'Datoteke »$1« ni mogo�e preimenovati v »$2«.',
 'filedeleteerror'      => 'Datoteke »$1« ni mogo�e izbrisati.',
+'directorycreateerror' => 'Ne morem ustvariti direktorija »$1«.',
 'filenotfound'         => 'Datoteke »$1« ne najdem.',
+'fileexistserror'      => 'Ne morem pisati v datoteko »$1«: datoteka obstaja',
 'unexpected'           => 'Nepri�akovana vrednost: "$1"="$2".',
 'formerror'            => 'Napaka: obrazca ni mogo�e predložiti',
 'badarticleerror'      => 'Na tej strani dejanja ne morem izvesti. Morda je bila stran med predložitvijo vaše zahteve že izbrisana.',
 'cannotdelete'         => 'Navedene strani ali datoteke ni mogo�e izbrisati. Morda jo je izbrisal že kdo drug.',
 'badtitle'             => 'Nepravilen naslov',
 'badtitletext'         => 'Navedeni naslov strani je neveljaven, prazen, napa�no povezan k drugim jezikom oziroma wikiprojektom ali pa vsebuje nepodprte znake.',
-'perfdisabled'         => 'Naveden je shranjeni prepis.',
 'perfcached'           => 'Navedeni podatki morda niso popolnoma posodobljeni.',
 'perfcachedts'         => 'Prikazani podatki so shranjeni v predpomnilniku. Čas zadnje osvežitve: $1.',
+'querypage-no-updates' => 'Posodobitve za to stran so trenutno onemogo�ene. Tukajšnji podatki se v kratkem ne bodo osvežili.',
 'wrong_wfQuery_params' => 'Nepravilni parametri za wfQuery()<br />
 Funkcija: $1<br />
 Iskanje: $2',
 'viewsource'           => 'Izvorno besedilo',
 'viewsourcefor'        => 'za $1',
+'actionthrottled'      => 'Dejanje zaustavljeno',
+'protectedpagetext'    => 'Ta stran je bila zaklenjena za prepre�itev urejanja.',
+'viewsourcetext'       => 'Lahko si ogledujete in kopirate vsebino te stran:',
 'protectedinterface'   => 'Prikazana stran vsebuje besedilo ali drug element uporabniškega vmesnika programja. Zaradi prepre�evanja zlorabe je zaš�itena.',
 'editinginterface'     => "'''Opozorilo:''' Urejate stran, ki vsebuje besedilo ali drug element uporabniškega vmesnika programja.
 Spremembe te strani bodo vplivale na podobo uporabniškega vmesnika.
-For translations, please consider using [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], the MediaWiki localisation project.",
+For translations, please consider using [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], the MediaWiki localisation project.",
 'sqlhidden'            => '(SQL-poizvedovanje je skrito)',
+'cascadeprotected'     => 'Ta stran je bila zaš�itena pred urejanji, ker je vklju�ena na {{PLURAL:$1|page|slede�e strani}}, ki so bile zaš�itene z vklju�eno kaskadno možnostjo:
+$2',
+'namespaceprotected'   => "Nimate dovoljenja urejati strani v imenskem prostoru '''$1'''.",
+'customcssjsprotected' => 'Nimate pravice urejati te strani, ker vsebuje osebne nastavitve drugega uporabnika.',
+'ns-specialprotected'  => 'Strani v imenskem prostoru {{ns:special}} ni možno urejati.',
 
 # Login and logout pages
 'logouttitle'                => 'Odjava uporabnika',
@@ -339,8 +403,8 @@ Ustvarili ste ra�un.
 'remembermypassword'         => 'Zapomni si me (samodejna prijava)',
 'yourdomainname'             => 'Domena',
 'externaldberror'            => 'Pri potrjevanju istovetnosti je prišlo do notranje napake ali pa za osveževanje zunanjega ra�una nimate dovoljenja.',
-'loginproblem'               => '<b>Prijava ni uspela.</b><br />Prosimo, poskusite znova!',
 'login'                      => 'Prijava',
+'nav-login-createaccount'    => 'Prijavite se / registrirajte se',
 'loginprompt'                => '<!--Za prijavo v {{GRAMMAR:tožilnik|{{SITENAME}}}} omogo�ite piškotke.-->',
 'userlogin'                  => 'Prijavite se / registrirajte se',
 'logout'                     => 'Odjava',
@@ -388,21 +452,34 @@ Z njim se lahko prijavite in ga spremenite.
 Če je geslo zahteval nekdo drug ali ste se spomnili starega in ga ne želite ve� spremeniti, lahko sporo�ilo prezrete in se še naprej prijavljate s starim.",
 'noemail'                    => 'Elektronska pošta uporabnika »$1« ni zapisana.',
 'passwordsent'               => 'Na naslov elektronske pošte, vpisane za "$1", smo poslali novo geslo. Ko ga boste prejeli, se lahko ponovno prijavite.',
+'blocked-mailpassword'       => 'Urejanje z vašega IP naslova je blokirano. Da bi prepre�ili zlorabe, vam ni dovoljeno tudi uporabljati funkcije za povrnitev pozabljenega gesla.',
 'eauthentsent'               => 'E-sporo�ilo je poslano na navedeni e-naslov. Če želite tja poslati še katero, po v omenjenem sporo�ilu navedenih navodilih potrdite lastništvo naslova.',
 'mailerror'                  => 'Napaka pri pošiljanju pošte: $1',
-'acct_creation_throttle_hit' => 'Obiskovalci {{GRAMMAR:rodilnik|{{SITENAME}}}} so s tem [[IP-naslov]]om v zadnjih 24 urah ustvarili že $1 {{PLURAL:$1|uporabniški ra�un|uporabniška ra�una|uporabniške ra�une|uporabniških ra�unov|uporabniških ra�unov}} in s tem dosegli najve�je dopustno število v omenjenem �asovnem obdobju. Novih ra�unov zato s tem IP-naslovom trenutno žal ne morete ve� ustvariti.
+'acct_creation_throttle_hit' => 'Obiskovalci {{GRAMMAR:rodilnik|{{SITENAME}}}} so s tem IP-naslovom v zadnjih 24 urah ustvarili že $1 {{PLURAL:$1|uporabniški ra�un|uporabniška ra�una|uporabniške ra�une|uporabniških ra�unov|uporabniških ra�unov}} in s tem dosegli najve�je dopustno število v omenjenem �asovnem obdobju. Novih ra�unov zato s tem IP-naslovom trenutno žal ne morete ve� ustvariti.
 
 == Urejate prek posredniškega strežnika? ==
 
 Če urejate prek AOL ali iz Bližnjega vzhoda, Afrike, Avstralije, Nove Zelandije ali iz šole, knjižnice ali podjetja, si IP-naslov morda delite z drugimi uporabniki. Če je tako, ste to sporo�ilo morda prejeli, �eprav niste ustvarili še nobenega ra�una. Znova se lahko poskusite registrirati po nekaj urah.',
-'emailauthenticated'         => 'Čas potrditve vašega e-poštnega naslova: $1',
+'emailauthenticated'         => 'Vaš e-poštni naslov je bil potrjen $2 $3.',
 'emailnotauthenticated'      => 'Vaš e-poštni naslov še ni potrjen. Za navedene
 možnosti se e-pošte ne bo pošiljalo.',
-'noemailprefs'               => '<strong>E-poštnega naslova niste vnesli</strong>, zato naslednje možnosti ne bodo delovale.',
+'noemailprefs'               => 'E-poštnega naslova niste vnesli, zato naslednje možnosti ne bodo delovale.',
 'emailconfirmlink'           => 'Potrdite svoj e-poštni naslov',
 'invalidemailaddress'        => 'E-poštni naslov zaradi neveljavne oblike ni sprejemljiv. Prosimo, vpišite pravilno oblikovanega ali polje izpraznite.',
 'accountcreated'             => 'Ra�un je ustvarjen',
 'accountcreatedtext'         => 'Uporabniški ra�un za »$1« je ustvarjen.',
+'createaccount-title'        => 'Ustvarjanje ra�una za {{GRAMMAR:tožilnik|{{SITENAME}}}}',
+'createaccount-text'         => 'Nekdo je ustvaril ra�un $2 na {{GRAMMAR:dajalnik|{{SITENAME}}}} ($4). Geslo za »$2« je »$3«. Priporo�ljivo je, da se prijavite in spremenite svoje geslo sedaj.
+
+To sporo�ilo lahko prezrete, �e je bil ra�un ustvarjen pomotoma.',
+'loginlanguagelabel'         => 'Jezik: $1',
+
+# Password reset dialog
+'resetpass'      => 'Ponastavi geslo ra�una',
+'resetpass_text' => '<!-- Namesto te vrstice vstavite besedilo -->',
+'oldpassword'    => 'Staro geslo:',
+'newpassword'    => 'Novo geslo:',
+'retypenew'      => 'Ponovno vpišite geslo:',
 
 # Edit page toolbar
 'bold_sample'     => 'Krepko besedilo',
@@ -427,8 +504,8 @@ možnosti se e-pošte ne bo pošiljalo.',
 'hr_tip'          => 'Vodoravna �rta (uporabljajte zmerno)',
 
 # Edit pages
-'summary'                   => 'Povzetek urejanja',
-'subject'                   => 'Tema/naslov',
+'summary'                   => 'Povzetek urejanja:',
+'subject'                   => 'Tema/naslov:',
 'minoredit'                 => 'Manjše urejanje',
 'watchthis'                 => 'Opazuj �lanek',
 'savearticle'               => 'Shrani stran',
@@ -439,6 +516,9 @@ možnosti se e-pošte ne bo pošiljalo.',
 'anoneditwarning'           => "'''Opozorilo''': niste prijavljeni. V zgodovino strani se bo zapisal vaš IP-naslov.",
 'missingsummary'            => "'''Opozorilo:''' Niste napisali povzetka urejanja. Ob ponovnem kliku gumba ''Shrani'' se bo vaše urejanje shranilo brez njega.",
 'missingcommenttext'        => 'Prosimo, vpišite v spodnje polje komentar.',
+'missingcommentheader'      => "'''Opozorilo:''' Niste vnesli zadeve/naslova za ta komentar. Če boste ponovno kliknili Shrani, bo vaše urejanje shranjeno brez le-tega.",
+'summary-preview'           => 'Predogled povzetka',
+'subject-preview'           => 'Predogled zadeve/naslova',
 'blockedtitle'              => 'Uporabnik je blokiran.',
 'blockedtext'               => "Urejanje z vašim uporabniškim imenom oziroma IP-naslovom je $1 onemogo�il(-a).
 Vzrok:<br />''$2''<br />O blokiranju se lahko pogovorite z $1 ali katerim drugim
@@ -447,12 +527,15 @@ Vzrok:<br />''$2''<br />O blokiranju se lahko pogovorite z $1 ali katerim drugim
 Vedite, da lahko ukaz »Pošlji uporabniku e-pismo« uporabite le, �e ste v nastavitvah vpisali in potrdili svoj elektronski naslov. 
 
 Vaš IP-naslov je $3. Prosimo, vklju�ite ga v vse morebitne poizvedbe.",
+'blockednoreason'           => 'razlog ni podan',
 'blockedoriginalsource'     => "Izvorno besedilo strani '''$1''' je na razpolago spodaj:",
 'blockededitsource'         => "Besedilo '''vaših urejanj''' strani '''$1''' je prikazano spodaj:",
 'whitelistedittitle'        => 'Za urejanje se morate prijaviti',
 'whitelistedittext'         => 'Za urejanje strani se $1.',
 'confirmedittitle'          => 'Za urejanje je potrebna e-poštna potrditev',
 'confirmedittext'           => 'Pred urejanjem strani morate potrditi svoj e-poštni naslov. Prosimo, da ga z uporabo [[Special:Preferences|uporabniških nastavitev]] vpišete in potrdite.',
+'nosuchsectiontitle'        => 'Ni takega razdelka',
+'nosuchsectiontext'         => 'Poskušali ste urediti razdelek, ki ne obstaja. Ker ni razdelka $1, ni prostora za shranitev vašega urejanja.',
 'loginreqtitle'             => 'Treba se je prijaviti',
 'loginreqlink'              => 'prijava',
 'loginreqpagetext'          => 'Za ogled drugih strani morate $1.',
@@ -466,20 +549,20 @@ Da bi stran ustvarili, vnesite v spodnji obrazec besedilo
 'anontalkpagetext'          => "---- ''To je pogovorna stran za nepodpisanega uporabnika, ki še ni ustvaril ra�una ali, ki ga ne uporablja. Zaradi tega moramo uporabiti štev�en IP address za njegovo/njeno ugotavljanje istovetnosti. Takšen IP naslov si lahko deli ve� uporabnikov. Če ste nepodpisan uporabnik in �e menite, da so nepomembne pripombe namenjene vam, prosimo [[Special:UserLogin|ustvarite ra�un ali pa se vpišite]], da prepre�ite naslednje zmede z drugimi nepodpisanimi uporabniki.''",
 'noarticletext'             => 'Na tej strani ni trenutno nobenega besedila. Naslov strani lahko poskusite [[Special:Search/{{PAGENAME}}|poiskati]] na drugih straneh ali pa [{{fullurl:{{FULLPAGENAME}}|action=edit}} stran uredite].',
 'clearyourcache'            => "'''Opomba:''' Da bodo spremembe prišle do veljave, po shranitvi izpraznite predpomnilnik svojega brskalnika: '''Mozilla/Safari:''' držite ''Shift'' in kliknite ''Reload'' (ali pritisnite ''Ctrl-Shift-R''), '''Internet Explorer:''' ''Ctrl-F5'', '''Opera/Konqueror:''' ''F5''.",
-'usercssjsyoucanpreview'    => "<strong>Nasvet:</strong> Za preizkušanje svojega novega CSS/JS pred shranjevanjem uporabite gumb ''Prikaži predogled''.",
+'usercssjsyoucanpreview'    => "'''Nasvet:''' Za preizkušanje svojega novega CSS/JS pred shranjevanjem uporabite gumb ''Prikaži predogled''.",
 'usercsspreview'            => "'''OPOZORILO: svoj uporabniški CSS le predogledujete in ga še niste shranili!'''",
 'userjspreview'             => "'''Svoj uporabniški Javascript le predogledujete in še ni shranjen!'''",
 'userinvalidcssjstitle'     => "'''Opozorilo:''' koža »$1« ne obstaja. Vedite, da .css in .js strani po meri uporabljajo naslov z malo za�etnico, npr. {{ns:user}}:Blabla/monobook.css namesto {{ns:user}}:Blabla/Monobook.css.",
 'updated'                   => '(Posodobljeno)',
-'note'                      => '<strong>Opomba:</strong>',
-'previewnote'               => '<strong>Stran le predogledujete in Å¡e ni shranjena!</strong>',
+'note'                      => "'''Opomba:'''",
+'previewnote'               => "'''Stran le predogledujete in Å¡e ni shranjena!'''",
 'previewconflict'           => 'V prikazanem predogledu je v zgornjem predelu urejanja navedeno besedilo, kakor se bo prikazalo, �e ga boste shranili.',
-'session_fail_preview'      => '<strong>Zaradi izgube podatkov o seji nam vašega urejanja žal ni uspelo obdelati. Prosimo, poskusite znova. Če bo spet prišlo do napake, se odjavite in ponovno prijavite. Za nevše�nosti se opravi�ujemo.</strong>',
-'session_fail_preview_html' => "<strong>Zaradi izgube podatkov o seji nam vašega urejanja žal ni uspelo obdelati.</strong>
+'session_fail_preview'      => "'''Zaradi izgube podatkov o seji nam vašega urejanja žal ni uspelo obdelati. Prosimo, poskusite znova. Če bo spet prišlo do napake, se odjavite in ponovno prijavite. Za nevše�nosti se opravi�ujemo.'''",
+'session_fail_preview_html' => "'''Zaradi izgube podatkov o seji nam vašega urejanja žal ni uspelo obdelati.'''
 
 ''Ker ima ta wiki vklopljen surovi HTML, je predogled zaradi prepre�evanja napadov z JavaScriptom skrit.''
 
-<strong>Če gre za dobronameren poskus urejanja, vas prosimo, da poskusite znova. Če bo spet prišlo do napake, se odjavite in ponovno prijavite. Za nevše�nosti se opravi�ujemo.</strong>",
+'''Če gre za dobronameren poskus urejanja, vas prosimo, da poskusite znova. Če bo spet prišlo do napake, se odjavite in ponovno prijavite. Za nevše�nosti se opravi�ujemo.'''",
 'editing'                   => 'Urejanje $1',
 'editingsection'            => 'Urejanje $1 (razdelek)',
 'editingcomment'            => 'Urejanje $1 (pripomba)',
@@ -487,40 +570,66 @@ Da bi stran ustvarili, vnesite v spodnji obrazec besedilo
 'explainconflict'           => 'Med vašim urejanjem je stran spremenil nekdo drug. Zgornje besedilno obmo�je vsebuje njeno trenutno vsebino in bo edino, ki se bo ob izbiri ukaza »Shrani stran« shranilo. V spodnjem obmo�ju so prikazane vaše spremembe, ki jih boste morali vklju�iti v zgornje.<br />',
 'yourtext'                  => 'Vaše besedilo',
 'storedversion'             => 'Shranjena razli�ica',
-'nonunicodebrowser'         => '<strong>OPOMBA</strong>: Vaš brskalnik ne podpira Unicode, zato boste pri urejanju strani z nelatini�nimi znaki morda imeli težave. Za obhod te težave se bodo <strong>ne-ASCII-znaki v urejevalnem polju spodaj pojavili kot šestnajstiške kode</strong>.',
-'editingold'                => '<strong>Urejate staro redakcijo strani.
-Če jo boste shranili, bodo vse poznejše spremembe razveljavljene.</strong>',
+'nonunicodebrowser'         => "'''OPOMBA''': Vaš brskalnik ne podpira Unicode, zato boste pri urejanju strani z nelatini�nimi znaki morda imeli težave. Za obhod te težave se bodo '''ne-ASCII-znaki v urejevalnem polju spodaj pojavili kot šestnajstiške kode'''.",
+'editingold'                => "'''Urejate staro redakcijo strani.
+Če jo boste shranili, bodo vse poznejše spremembe razveljavljene.'''",
 'yourdiff'                  => 'Primerjava',
-'copyrightwarning'          => 'Vsi prispevki k {{GRAMMAR:dajalnik|{{SITENAME}}}} se obravnavajo kot objave pod pogoji $2 (za podrobnosti glej $1). Če niste pripravljeni na neusmiljeno urejanje in prosto razširjanje vašega gradiva, ga ne prispevajte.
+'copyrightwarning'          => "Vsi prispevki k {{GRAMMAR:dajalnik|{{SITENAME}}}} se obravnavajo kot objave pod pogoji $2 (za podrobnosti glej $1). Če niste pripravljeni na neusmiljeno urejanje in prosto razširjanje vašega gradiva, ga ne prispevajte.
 
 Poleg tega zagotavljate, da ste prispevke napisali oziroma ustvarili sami ali pa prepisali iz javno dostopnega ali podobnega prostega vira oziroma da pri tem ne kršite avtorskih pravic.
-<strong>NE DODAJAJTE AVTORSKO ZAÅ ÄŒITENEGA DELA BREZ DOVOLJENJA !</strong>',
-'copyrightwarning2'         => 'Vsi prispevki k {{GRAMMAR:dajalnik|{{SITENAME}}}} se lahko urejajo, spreminjajo ali odstranijo s strani drugih uporabnikov. Če niste pripravljeni na neusmiljeno urejanje in prosto razširjanje vašega gradiva, ga ne prispevajte.
+'''NE DODAJAJTE AVTORSKO ZAÅ ÄŒITENEGA DELA BREZ DOVOLJENJA !'''",
+'copyrightwarning2'         => "Vsi prispevki k {{GRAMMAR:dajalnik|{{SITENAME}}}} se lahko urejajo, spreminjajo ali odstranijo s strani drugih uporabnikov. Če niste pripravljeni na neusmiljeno urejanje in prosto razširjanje vašega gradiva, ga ne prispevajte.
 
 Poleg tega zagotavljate, da ste prispevke napisali oziroma ustvarili sami ali pa prepisali iz javno dostopnega ali podobnega prostega vira oziroma da pri tem ne kršite avtorskih pravic ($1).
-<strong>NE DODAJAJTE AVTORSKO ZAÅ ÄŒITENEGA DELA BREZ DOVOLJENJA !</strong>',
+'''NE DODAJAJTE AVTORSKO ZAÅ ÄŒITENEGA DELA BREZ DOVOLJENJA !'''",
 'longpagewarning'           => 'Stran je dolga $1 {{PLURAL:$1|kilobajt|kilobajta|kilobajte|kilobajtov|kilobajtov}}. To je morda ve�, kot bi želeli, zato premislite o razdelitvi na podstrani oziroma arhiviranju.',
-'longpageerror'             => '<strong>NAPAKA: Predloženo besedilo je dolgo $1 {{PLURAL:$1|kilobajt|kilobajta|kilobajte|kilobajtov|kilobajtov}}, s �imer presega najve�jo dovoljeno dolžino $2 {{PLURAL:$2|kilobajta|kilobajtov|kilobajtov|kilobajtov|kilobajtov}}. Zato ga žal ni mogo�e shraniti.</strong>',
-'readonlywarning'           => '<strong>OPOZORILO: Zbirka podatkov je zaradi vzdrževanja za�asno  zaklenjena, kar pomeni, da sprememb ne morete shraniti. Prosimo, prenesite besedilo v urejevalnik in ga dodajte pozneje.</strong>',
-'protectedpagewarning'      => '<strong>OPOMBA:</strong> Stran je zaklenjena in jo lahko urejajo le sodelavci z vzdrževalnimi pravicami. Pri urejanju sledite [[Project:Smernice_zaš�itenih_strani|smernicam zaš�itenih strani]].',
+'longpageerror'             => "'''NAPAKA: Predloženo besedilo je dolgo $1 {{PLURAL:$1|kilobajt|kilobajta|kilobajte|kilobajtov|kilobajtov}}, s �imer presega najve�jo dovoljeno dolžino $2 {{PLURAL:$2|kilobajta|kilobajtov|kilobajtov|kilobajtov|kilobajtov}}. Zato ga žal ni mogo�e shraniti.'''",
+'readonlywarning'           => "'''OPOZORILO: Zbirka podatkov je zaradi vzdrževanja za�asno  zaklenjena, kar pomeni, da sprememb ne morete shraniti. Prosimo, prenesite besedilo v urejevalnik in ga dodajte pozneje.'''",
+'protectedpagewarning'      => "'''OPOMBA:''' Stran je zaklenjena in jo lahko urejajo le sodelavci z vzdrževalnimi pravicami. Pri urejanju sledite [[Project:Smernice_zaš�itenih_strani|smernicam zaš�itenih strani]].",
 'semiprotectedpagewarning'  => "'''Opomba:''' Stran je [[Project:Delna zaš�ita|zaš�itena]] in jo lahko urejajo le uveljavljeni uporabniki.",
+'cascadeprotectedwarning'   => "'''Opozorilo:''' Ta stran je zaklenjena, tako da jo lahko urejajo le administratorji, saj je bila vklju�ena med slede�e {{PLURAL:$1|stran|strani}}:",
 'templatesused'             => 'Na strani uporabljene predloge:',
+'templatesusedpreview'      => 'Predloge, uporabljene v tem predogledu:',
+'templatesusedsection'      => 'Predloge, uporabljene v tem delu:',
+'template-protected'        => '(zaš�itena)',
+'template-semiprotected'    => '(delno zaš�itena)',
+'hiddencategories'          => 'Ta stran je v vsebovana v {{PLURAL:$1|1 skriti kategoriji|$1 skritih kategorijah}}:',
 'edittools'                 => '<!-- To besedilo bo prikazano pod urejevalnim poljem in poljem za nalaganje. -->',
 'nocreatetitle'             => 'Članka nisem našel',
 'nocreatetext'              => "ÄŒlanka s tem naslovom - '''{{PAGENAME}}''' - Å¡e nimamo, lahko pa ga [[Special:Search/{{PAGENAME}}|poskusite poiskati]] ali pa se [[Special:UserLogin|prijavite]] in ga ustvarite.",
+'nocreate-loggedin'         => 'Nimate pravic, da bi ustvarjali nove strani na {{GRAMMAR:dajalnik|{{SITENAME}}}}.',
+'permissionserrors'         => 'Napake dovoljenj',
+'permissionserrorstext'     => 'Nimate dovoljenja zaradi {{PLURAL:$1|naslednjega razloga|naslednjih razlogov|naslednjih razlogov|naslednjih razlogov|naslednjih razlogov}}:',
+'recreate-deleted-warn'     => "'''Opozorilo: Pišete stran, ki je bila neko� že izbrisana.'''
+
+Premislite preden nadaljujete s pisanjem, morda bo stran zaradi istih razlogov ponovno odstranjena.
+Spodaj je prikazan dnevnik brisanja z razlogi za brisanje:",
+
+# "Undo" feature
+'undo-success' => 'Urejanje ste razveljavili. Prosim, potrdite in nato shranite spodnje spremembe.',
+'undo-failure' => 'Zaradi navzkrižij urejanj, ki so se vmes pojavila, tega urejanja ni mo� razveljaviti.',
+'undo-summary' => 'Redakcija $1 uporabnika [[Posebno:Contributions/$2|$2]] ([[Uporabniški pogovor:$2|pogovor]]) razveljavljena',
+
+# Account creation failure
+'cantcreateaccounttitle' => 'Ra�una ni mo� ustvariti',
+'cantcreateaccount-text' => "Registracija novega uporabnika iz tega IP-naslova (<b>$1</b>) je bila blokirana s strani [[{{ns:2}}:$3|$3]].
+
+Razlog, ki ga je podal $3, je ''$2''.",
 
 # History pages
+'viewpagelogs'        => 'Poglej dnevniške zapise o strani',
 'nohistory'           => 'Stran nima zgodovine urejanja.',
-'revnotfound'         => 'Redakcije ne najdem',
-'revnotfoundtext'     => 'Redakcije strani, ki ste jo poskušali pridobiti, ni mogo�e najti. Prosimo, preverite spletni naslov, ki ste ga uporabili za dostop do strani.',
 'currentrev'          => 'Trenutna redakcija',
 'revisionasof'        => 'Redakcija: $1',
+'revision-info'       => 'Redakcija iz $1 od $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Starejša redakcija',
 'nextrevision'        => 'Novejša redakcija →',
 'currentrevisionlink' => 'poglejte trenutno redakcijo',
 'cur'                 => 'tren',
 'next'                => 'nasl',
 'last'                => 'prej',
+'page_first'          => 'prva',
+'page_last'           => 'zadnja',
 'histlegend'          => 'Za ogled redakcije kliknite njen datum.
 
 Napotek: (tren) = primerjava s trenutno redakcijo,
@@ -528,6 +637,7 @@ Napotek: (tren) = primerjava s trenutno redakcijo,
 'deletedrev'          => '[izbrisano]',
 'histfirst'           => 'Najstarejše',
 'histlast'            => 'Najnovejše',
+'historyempty'        => '(prazno)',
 
 # Revision feed
 'history-feed-title'          => 'Zgodovina strani',
@@ -538,6 +648,7 @@ Napotek: (tren) = primerjava s trenutno redakcijo,
 # Revision deletion
 'rev-deleted-comment'         => '(pripomba je bila odstranjena)',
 'rev-deleted-user'            => '(uporabniško ime je bilo odstranjeno)',
+'rev-deleted-event'           => '(vnos je odstranjen)',
 'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
 Prikazana redakcija je bila iz javnih arhivov odstranjena. 
 Podrobnosti so morda na razpolago v [{{fullurl:Special:Log/delete|page=Rev-deleted-text-permission dnevniku brisanja}}].
@@ -560,16 +671,25 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'revdelete-submit'            => 'Uporabi za izbrano redakcijo',
 'revdelete-logentry'          => 'sprememba vidnosti redakcij strani [[$1]]',
 
+# History merging
+'mergehistory'      => 'Združi zgodovine strani',
+'mergehistory-box'  => 'Združite redakcije dveh strani:',
+'mergehistory-from' => 'Izvorna stran:',
+
 # Diffs
+'history-title'           => 'Zgodovina strani »$1«',
 'difference'              => '(Primerjava redakcij)',
 'lineno'                  => 'Vrstica $1:',
 'compareselectedversions' => 'Primerjaj izbrani redakciji',
+'editundo'                => 'razveljavi',
 
 # Search results
 'searchresults'         => 'Izid iskanja',
 'searchresulttext'      => 'Za ve� sporo�il o iskanju v {{GRAMMAR:dajalnik|{{SITENAME}}}} glej [[{{MediaWiki:Helppage}}|Iš�em v {{GRAMMAR:dajalnik|{{SITENAME}}}}]].',
+'searchsubtitle'        => 'Za povpraševanje »[[$1]]«',
 'searchsubtitleinvalid' => 'Za povpraševanje "$1"',
 'noexactmatch'          => "'''Stran z naslovom ''$1'' ne obstaja.''' Lahko [[:$1|jo ustvarite]].",
+'noexactmatch-nocreate' => "'''Stran z naslovom »$1« ne obstaja.'''",
 'titlematches'          => 'Ujemanje z naslovom �lanka',
 'notitlematches'        => 'Iskanih besed ne vsebuje noben naslov �lanka',
 'textmatches'           => 'Ujemanje z besedilom �lanka',
@@ -577,14 +697,20 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'prevn'                 => '{{PLURAL:$1|prejšnja|prejšnji|prejšnje|prejšnjih|prejšnjih}} $1',
 'nextn'                 => '{{PLURAL:$1|naslednja|naslednji|naslednjih|naslednjih|naslednjih}} $1',
 'viewprevnext'          => 'Prikazujem ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Vsebina',
 'showingresults'        => 'Prikazujem <strong>$1</strong> {{PLURAL:$1|zadetek|zadetka|zadetke|zadetkov|zadetkov}}, za�enši s št. <strong>$2</strong>.',
 'showingresultsnum'     => "Prikazujem '''$3''' {{PLURAL:$1|zadetek|zadetka|zadetke|zadetkov|zadetkov}}, za�enši s št. '''$2'''.",
 'nonefound'             => "'''Opomba''': neuspešna poizvedovanja so pogosta ob iskanju vsakdanjih besed, na primer ''imeti'' in ''iz'', ki jih ni na seznamu. Ker gre za zelo pogoste besede, boste skoraj zagotovo iskali uspešneje z zožitvijo tematskega podro�ja.",
 'powersearch'           => 'Iskanje',
+'powersearch-legend'    => 'Napredno iskanje',
+'powersearch-ns'        => 'Iskanje v imenskih prostorih:',
+'powersearch-field'     => 'Iš�em:',
 'searchdisabled'        => '<p>Zaradi hitrejšega delovanja {{GRAMMAR:rodilnik|{{SITENAME}}}} je iskanje po vsej zbirki podatkov za�asno onemogo�eno. Uporabite lahko Googlov ali Yahoojev iskalnik, vendar so njihovi podatki morda že zastareli.</p>',
 
 # Preferences page
 'preferences'              => 'Nastavitve',
+'mypreferences'            => 'Nastavitve',
+'prefs-edits'              => 'Å tevilo urejanj:',
 'prefsnologin'             => 'Niste prijavljeni',
 'prefsnologintext'         => 'Za spreminjanje uporabniških nastavitev se [[Special:UserLogin|prijavite]].',
 'prefsreset'               => 'Nastavitve so ponastavljene.',
@@ -596,6 +722,7 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'qbsettings-floatingright' => 'Desno lete�e',
 'changepassword'           => 'Zamenjava gesla',
 'skin'                     => 'Koža',
+'skin-preview'             => 'Predogled',
 'math'                     => 'Prikaz matemati�nega besedila',
 'dateformat'               => 'Zapis datuma',
 'datedefault'              => 'Kakor koli',
@@ -617,9 +744,6 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'prefs-misc'               => 'Druge nastavitve',
 'saveprefs'                => 'Shrani',
 'resetprefs'               => 'Ponastavi',
-'oldpassword'              => 'Staro geslo:',
-'newpassword'              => 'Novo geslo:',
-'retypenew'                => 'Ponovno vpišite geslo:',
 'textboxsize'              => 'Urejanje',
 'rows'                     => 'Razsežnosti urejevalnega polja: vrstic:',
 'columns'                  => 'stolpcev:',
@@ -627,6 +751,8 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'resultsperpage'           => 'Prikazanih zadetkov na stran:',
 'contextlines'             => 'Vrstic na zadetek:',
 'contextchars'             => 'Znakov na vrstico:',
+'stub-threshold'           => 'Prag ozna�evanja <a href="" class="stub" onclick="return false">škrbin</a>:',
+'recentchangesdays'        => 'Å tevilo dni prikazanih v zadnjih spremembah:',
 'recentchangescount'       => 'Å tevilo naslovov v zadnjih spremembah:',
 'savedprefs'               => 'Spremembe ste uspešno shranili!',
 'timezonelegend'           => 'ÄŒasovni pas',
@@ -649,16 +775,20 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'userrights-editusergroup' => 'Urejanje uporabniških skupin',
 'saveusergroups'           => 'Shrani spremembe',
 'userrights-groupsmember'  => 'ÄŒlan skupine:',
+'userrights-reason'        => 'Razlog za spremembo:',
 
 # Groups
-'group'            => 'Skupina:',
-'group-bot'        => 'Boti',
-'group-sysop'      => 'Administratorji',
-'group-bureaucrat' => 'Birokrati',
-'group-all'        => '(vsi)',
-
-'group-sysop-member'      => 'Administrator',
-'group-bureaucrat-member' => 'Birokrat',
+'group'               => 'Skupina:',
+'group-user'          => 'Uporabniki',
+'group-autoconfirmed' => 'Samodejno potrjeni uporabniki',
+'group-bot'           => 'Boti',
+'group-sysop'         => 'Administratorji',
+'group-bureaucrat'    => 'Birokrati',
+'group-all'           => '(vsi)',
+
+'group-autoconfirmed-member' => 'Samodejno potrjen uporabnik',
+'group-sysop-member'         => 'Administrator',
+'group-bureaucrat-member'    => 'Birokrat',
 
 'grouppage-bot'        => '{{ns:project}}:Boti',
 'grouppage-sysop'      => '{{ns:project}}:Administratorji',
@@ -671,7 +801,9 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'rightsnone'     => '(nobeno)',
 
 # Recent changes
+'nchanges'                          => '$1 {{PLURAL:$1|sprememba|spremembi|spremembe|sprememb|sprememb}}',
 'recentchanges'                     => 'Zadnje spremembe',
+'recentchanges-legend'              => 'Možnosti zadnjih sprememb',
 'recentchangestext'                 => 'Na tej strani lahko spremljajte najnedavnejše spremembe wikija.',
 'rcnote'                            => 'Prikazujem {{PLURAL:$1|zadnjo|zadnji|zadnje|zadnjih|zadnjih}} <strong>$1</strong> {{PLURAL:$1|spremembo|spremembi|spremembe|sprememb|sprememb}} v {{PLURAL:$2|zadnjem|zadnjih|zadnjih|zadnjih|zadnjih}} <strong>$2</strong> {{PLURAL:$2|dnevu|dneh|dneh|dneh|dneh}}, kot v $3.',
 'rcnotefrom'                        => 'Navedene so spremembe od <b>$2</b> dalje (prikazujem jih do <b>$1</b>).',
@@ -690,6 +822,7 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'number_of_watching_users_pageview' => '[temo {{PLURAL:$1|spremlja|spremljata|spremljajo|spremlja|spremlja}} $1 {{PLURAL:$1|uporabnik|uporabnika|uporabniki|uporabnikov|uporabnikov}}]',
 'rc_categories'                     => 'Omejitev na kategorije (lo�ite jih z »|«)',
 'rc_categories_any'                 => 'Katero koli',
+'newsectionsummary'                 => '/* $1 */ nova razprava',
 
 # Recent changes linked
 'recentchangeslinked' => 'Sorodne spremembe',
@@ -704,7 +837,7 @@ Do skrite vsebine bodo Å¡e vedno lahko dostopali drugi administratorji in jo z u
 'upload_directory_read_only'  => 'V mapo za nalaganje datotek ($1) spletni strežnik ne more pisati.',
 'uploaderror'                 => 'Napaka',
 'uploadtext'                  => "Spodnji obrazec lahko uporabite za nalaganje datotek;
-za ogled ali iskanje že naloženih pojdite na [[Special:ImageList|seznam naloženih datotek]].
+za ogled ali iskanje že naloženih pojdite na [[Special:FileList|seznam naloženih datotek]].
 Naložitve in izbrisi so zapisani tudi v [[Special:Log/upload|dnevniku nalaganja]].
 
 Datoteko lahko na želeno stran vklju�ite z naslednjo skladnjo
@@ -712,6 +845,9 @@ Datoteko lahko na želeno stran vklju�ite z naslednjo skladnjo
 * '''<nowiki>[[</nowiki>Image:File.png|alt text<nowiki>]]</nowiki>'''
 ali za neposredno povezavo z datoteko
 * '''<nowiki>[[</nowiki>Media:File.ogg<nowiki>]]</nowiki>'''",
+'upload-permitted'            => 'Dovoljene vrste datotek: $1.',
+'upload-preferred'            => 'Priporo�ene vrste datotek: $1.',
+'upload-prohibited'           => 'Prepovedane vrste datotek: $1.',
 'uploadlog'                   => 'dnevnik nalaganja',
 'uploadlogpage'               => 'Dnevnik nalaganja datotek',
 'uploadlogpagetext'           => 'Prikazan je seznam nedavno naloženih predstavnostnih datotek. Vsi navedeni �asi so strežniški �as. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi �rkami.',
@@ -723,18 +859,32 @@ ali za neposredno povezavo z datoteko
 'uploadedfiles'               => 'Naložene datoteke',
 'ignorewarning'               => 'Naloži kljub opozorilu',
 'ignorewarnings'              => 'Prezri vsa opozorila',
+'minlength1'                  => 'Imena datotek mora biti dolga vsaj eno �rko.',
 'illegalfilename'             => 'Ime datoteke »$1« vsebuje v naslovih strani prepovedane znake. Prosimo, poskusite datoteko naložiti pod drugim imenom.',
 'badfilename'                 => 'Ime datoteke se je samodejno popravilo v »$1«.',
+'filetype-badmime'            => 'Datoteke MIME-vrste »$1« ni dovoljeno nalagati.',
+'filetype-missing'            => 'Datoteka nima kon�nice (kot ».jpg«).',
+'large-file'                  => 'Priporo�eno je, da datoteke niso ve�je od $1; ta datoteka je $2.',
 'largefileserver'             => 'Velikost datoteke presega strežnikove nastavitve.',
 'emptyfile'                   => 'Naložena datoteka je morda prazna. Do tega bi lahko prišlo zaradi slovni�ne napake v imenu. Ali datoteko resni�no želite naložiti?',
-'fileexists'                  => 'Datoteka s tem imenom že obstaja. Preden jo povozite, preverite stran <strong><tt>$1</tt></strong>. Da prepre�ite navzkrižja z že obstoje�imi datotekami, uporabljajte za datoteke opisna imena (npr. »Eifflov stolp, Pariz, pono�i.jpg«).',
-'fileexists-forbidden'        => 'Datoteka s tem imenom že obstaja in je ni mogo�e prepisati. Poskusite svojo datoteko naložiti pod drugim imenom. [[Image:$1|thumb|center|$1]]',
+'fileexists'                  => "Datoteka s tem imenom že obstaja. Preden jo povozite, preverite stran '''<tt>$1</tt>'''. Da prepre�ite navzkrižja z že obstoje�imi datotekami, uporabljajte za datoteke opisna imena (npr. »Eifflov stolp, Pariz, pono�i.jpg«).",
+'fileexists-extension'        => "Datoteka s podobnim imenom že obstaja:<br />
+Ime naložene datoteke: '''<tt>$1</tt>'''<br />
+Ime obstoje�e datoteke: '''<tt>$2</tt>'''<br />
+Prosimo, izberite drugo ime.",
+'fileexists-thumb'            => "'''<center>Obstoje�a datoteka</center>'''",
+'fileexists-thumbnail-yes'    => "Kot izgleda, je ta slika pomanjšana ''(thumbnail)''. Prosimo, preverite datoteko '''<tt>$1</tt>'''.<br />
+Če je preverjena datoteka enaka kot ta, ki jo nalage, ni potrebno nalagati še dodatne sli�ice.",
+'file-thumbnail-no'           => "Ime datoteke se za�ne z '''<tt>$1</tt>'''. Izgleda, da je to pomanjšana slika ''(thumbnail)''.
+Če imate sliko polne resolucije, jo naložite, druga�e spremenite ime datoteke.",
+'fileexists-forbidden'        => 'Datoteka s tem imenom že obstaja in je ni mogo�e prepisati. Poskusite svojo datoteko naložiti pod drugim imenom. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Datoteka s tem imenom že obstaja v skupnem repozitoriju datotek. Prosimo, vrnite se in naložite svojo datoteko pod drugim imenom. 
-[[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Datoteko ste uspešno naložili',
 'uploadwarning'               => 'Opozorilo!',
 'savefile'                    => 'Shrani datoteko',
 'uploadedimage'               => '- naložena datoteka »[[$1]]«',
+'overwroteimage'              => 'naložena nova razli�ica datoteke »[[$1]]«',
 'uploaddisabled'              => 'Nalaganje je onemogo�eno',
 'uploaddisabledtext'          => 'Nalaganje datotek je na tem wikiju onemogo�eno.',
 'uploadscripted'              => 'Datoteka vsebuje HTML- ali skriptno kodo, ki bi jo lahko brskalnik razlagal napa�no.',
@@ -742,29 +892,101 @@ ali za neposredno povezavo z datoteko
 'uploadvirus'                 => 'Datoteka morda vsebuje virus! Podrobnosti: $1',
 'sourcefilename'              => 'Ime izvorne datoteke:',
 'destfilename'                => 'Ime ciljne datoteke:',
+'upload-maxfilesize'          => 'Najve�ja velikost datoteke: $1',
+'watchthisupload'             => 'Spremljajte to stran',
 'filewasdeleted'              => 'Datoteka s tem imenom je bila neko� že naložena in potem izbrisana. Preden jo znova naložite, preverite $1.',
-
-'license'   => 'Dovoljenje:',
-'nolicense' => 'Nobeno (opomba: datoteka bo morda izbrisana)',
-
-# Special:ImageList
-'imagelist' => 'Seznam datotek',
-
-# Image description page
+'filename-bad-prefix'         => "Ime datoteke, ki jo nalagate, se za�ne z '''»$1«''', ki je neopisno ime, ponavadi dodeljeno samodejno s strani digitalnih fotoaparatov. Prosimo, dolo�ite bolj opisno ime vaše datoteke.",
+'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
+# Sintaksa:
+#   * Vse od znaka »#« in do konca vrstice je komentar
+#   * Vsaka neprazna vrstica je predpona za tipi�na imena datotek, dolo�ena samodejno s strani digitalnih fotoaparatov
+CIMG # Casio
+DSC_ # Nikon
+DSCF # Fuji
+DSCN # Nikon
+DUW # nekateri mobilni telefoni
+IMG # generi�no
+JD # Jenoptik
+MGP # Pentax
+PICT # mešano
+ #</pre> <!-- leave this line exactly as it is -->',
+
+'upload-proto-error' => 'Nepravilni protokol',
+'upload-file-error'  => 'Notranja napaka',
+'upload-misc-error'  => 'Neznana napaka nalaganja',
+
+# Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
+'upload-curl-error6'  => 'Ni možno dose�i URL',
+'upload-curl-error28' => 'ÄŒasovna prekinitev nalaganja',
+
+'license'            => 'Dovoljenje:',
+'nolicense'          => 'Nobeno (opomba: datoteka bo morda izbrisana)',
+'upload_source_url'  => ' (veljaven, javnosti dostopen URL)',
+'upload_source_file' => ' (datoteka na vašem ra�unalniku)',
+
+# Special:ListFiles
+'imgfile'   => 'dat.',
+'listfiles' => 'Seznam datotek',
+
+# File description page
+'filehist'                  => 'Zgodovina datoteke',
+'filehist-help'             => 'Klikni na datum in �as za ogled datoteke, ki je bila takrat naložena.',
+'filehist-deleteall'        => 'izbriši vse',
+'filehist-deleteone'        => 'izbriši to',
+'filehist-revert'           => 'vrni',
+'filehist-current'          => 'trenutno',
+'filehist-datetime'         => 'Datum in �as',
+'filehist-user'             => 'Uporabnik',
+'filehist-dimensions'       => 'Dimenzije',
+'filehist-filesize'         => 'Velikost datoteke',
+'filehist-comment'          => 'Komentar',
 'imagelinks'                => 'Strani z datoteko',
 'linkstoimage'              => 'Datoteka je del naslednjih strani slovenske {{GRAMMAR:rodilnik|{{SITENAME}}}} (strani drugih projektov niso navedene):',
 'nolinkstoimage'            => 'Z datoteko se ne povezuje nobena stran.',
+'redirectstofile'           => 'Na to datoteko {{PLURAL:$1|preusmerja naslednja datoteka|preusmerjata naslednji datoteki|preusmerjajo naslednje $1 datoteke|preusmerja naslednjih $1 datotek|preusmerja naslednjih $1 datotek}}:',
 'sharedupload'              => 'Datoteka se s tega mesta lahko uporabi tudi v drugih projektih.',
 'shareduploadwiki'          => 'Nadaljnje informacije najdete na strani $1.',
+'shareduploadwiki-desc'     => '<span id="shuwd" class="shuwd">Spodaj je prikazan opis iz $1.</span>',
 'shareduploadwiki-linktext' => 'Opisna stran datoteke',
 'noimage'                   => 'Datoteka s tem imenom ne obstaja; lahko jo $1.',
 'noimage-linktext'          => 'naložite',
 'uploadnewversion-linktext' => 'Naložite novo razli�ico datoteke',
 
+# File reversion
+'filerevert'                => 'Vrni $1',
+'filerevert-legend'         => 'Vrni datoteko',
+'filerevert-intro'          => '<span class="plainlinks">Vra�ate datoteko \'\'\'[[Media:$1|$1]]\'\'\' na [$4 razli�ico $3, $2].</span>',
+'filerevert-comment'        => 'Komentar:',
+'filerevert-defaultcomment' => 'Vrnjeno na razli�ico $2, $1',
+'filerevert-submit'         => 'Vrni',
+'filerevert-success'        => '<span class="plainlinks">Datoteka \'\'\'[[Media:$1|$1]]\'\'\' je bila vrnjena na [$4 razli�ico $3, $2].</span>',
+'filerevert-badversion'     => 'Ne najdem preteklih lokalnih verzij datoteke s podanim �asovnim žigom.',
+
+# File deletion
+'filedelete'                  => 'Izbriši $1',
+'filedelete-legend'           => 'Brisanje datoteke',
+'filedelete-intro'            => "Brišete '''[[Media:$1|$1]]'''.",
+'filedelete-intro-old'        => '<span class="plainlinks">Brišete razli�ico datoteke \'\'\'[[Media:$1|$1]]\'\'\' [$4 $3, $2].</span>',
+'filedelete-comment'          => 'Komentar:',
+'filedelete-submit'           => 'Izbriši',
+'filedelete-success'          => "Datoteka '''$1''' je bila izbrisana.",
+'filedelete-success-old'      => "<span class=\"plainlinks\">Razli�ica datoteke '''[[Media:\$1|\$1]]''', ''\$3, \$2'', je bila izbrisana.</span>",
+'filedelete-nofile'           => "Datoteka '''$1''' ne obstaja na tej strani.",
+'filedelete-nofile-old'       => "Arhivirana razli�ica datoteke '''$1''' z dolo�enimi vrednostmi ne obstaja.",
+'filedelete-otherreason'      => 'Drug/dodaten razlog:',
+'filedelete-reason-otherlist' => 'Drug razlog',
+'filedelete-reason-dropdown'  => '* Pogosti razlogi brisanja
+** kršitev avtorskih pravic
+** neumnosti v besedilu
+** podvojena datoteka
+** potrjen [[Wikipedija:Predlogi za brisanje|predlog za brisanje]]
+** slika je v Zbirki',
+
 # MIME search
-'mimesearch' => 'Iskanje po MIME-tipu',
-'mimetype'   => 'MIME-tip:',
-'download'   => 'naloži',
+'mimesearch'         => 'Iskanje po MIME-tipu',
+'mimesearch-summary' => 'Ta stran omogo�a filtriranje datotek po njihovi vrsti MIME. Vnesite: vrstavsebine/podvrsta, npr. <tt>image/jpeg</tt>.',
+'mimetype'           => 'MIME-tip:',
+'download'           => 'naloži',
 
 # Unwatched pages
 'unwatchedpages' => 'Nespremljane strani',
@@ -784,19 +1006,22 @@ ali za neposredno povezavo z datoteko
 'randomredirect' => 'Naklju�na preusmeritev',
 
 # Statistics
-'statistics'    => 'Statistika',
-'sitestats'     => 'Statistika {{GRAMMAR:rodilnik|{{SITENAME}}}}',
-'userstats'     => 'Uporabniška statistika',
-'sitestatstext' => "V podatkovni zbirki je skupno '''$1''' strani.
-Med te so vštete tudi ''pogovorne'' strani, strani o {{GRAMMAR:mestnik|{{SITENAME}}}}, najmanjše ''škrbinske'' strani, preusmeritve in še druge, ki niso �lanki. Če izklju�imo te zadnje, obstaja '''$2''' strani; ki so po vsej verjetnosti prave strani z vsebino.
-
-Naloženih je '''$8''' {{PLURAL:{{NUMBEROFFILES}}|datoteka|datoteki|datoteke|datotek|datotek}}.
-
-Od postavitve wikija je bilo opravljenih '''$3''' pregledov in '''$4''' urejanj strani.
-To da skupaj povpre�no '''$5''' urejanj na stran in '''$6''' pogledov na urejanje.
-
-Dolžina [http://www.mediawiki.org/wiki/Manual:Job_queue �akalne vrste delovnih nalog]: '''$7'''.",
-'userstatstext' => "Registriralo se je '''$1''' uporabnikov. Med temi je '''$2''' (oz. '''$4%''') administratorjev (glej $3).",
+'statistics'               => 'Statistika',
+'statistics-header-pages'  => 'Statistika strani',
+'statistics-header-edits'  => 'Statistika urejanj',
+'statistics-header-views'  => 'Statistika ogledov',
+'statistics-header-users'  => 'Uporabniška statistika',
+'statistics-articles'      => 'Število �lankov slovenske Wikipedije',
+'statistics-pages'         => 'Število vseh strani na slovenski Wikipediji <small>(vštete so pogovorne strani, posebne strani slovenske Wikipedije, projektne strani, nanoškrbine, preusmeritve ipd.)</small>',
+'statistics-files'         => 'Število naloženih datotek',
+'statistics-edits'         => 'Å tevilo vseh urejanj na slovenski Wikipediji',
+'statistics-edits-average' => 'Povpre�no število urejanj na stran',
+'statistics-views-total'   => 'Vseh ogledov',
+'statistics-views-peredit' => 'Razmerje med ogledi in urejanji',
+'statistics-jobqueue'      => 'Dolžina [http://www.mediawiki.org/wiki/Manual:Job_queue vrste opravil]',
+'statistics-users'         => 'Registrirani [[Posebno:ListUsers|uporabniki]]',
+'statistics-users-active'  => 'Aktivni uporabniki',
+'statistics-mostpopular'   => 'Strani z najve� ogledi',
 
 'disambiguations'     => 'Razlo�itvene strani',
 'disambiguationspage' => 'Template:Razlo�itev',
@@ -805,8 +1030,14 @@ Dolžina [http://www.mediawiki.org/wiki/Manual:Job_queue �akalne vrste delovnih
 'doubleredirectstext' => '<b>Pozor:</b> seznam morda vsebuje neprave �lane. To navadno pomeni, da pod prvim ukazom #REDIRECT obstaja dodatno besedilo s povezavami.<br />
 Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico besedila druge preusmeritve. To navadno da pravi ciljni �lanek, h kateremu naj kaže prva preusmeritev.',
 
-'brokenredirects'     => 'Pretrgane preusmeritve',
-'brokenredirectstext' => 'Naslednje preusmeritve kažejo na neobstoje�e strani.',
+'brokenredirects'        => 'Pretrgane preusmeritve',
+'brokenredirectstext'    => 'Naslednje preusmeritve kažejo na neobstoje�e strani.',
+'brokenredirects-edit'   => '(uredi)',
+'brokenredirects-delete' => '(izbriši)',
+
+'withoutinterwiki' => 'Strani brez jezikovnih povezav',
+
+'fewestrevisions' => 'Strani z najmanj urejanji',
 
 # Miscellaneous special pages
 'nbytes'                  => '$1 {{PLURAL:$1|zlog|zloga|zlogi|zlogov|zlogov}}',
@@ -815,10 +1046,12 @@ Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico bes
 'nmembers'                => '$1 {{PLURAL:$1|element|elementa|elementi|elementov|elementov}}',
 'nrevisions'              => '$1 {{PLURAL:$1|redakcija|redakciji|redakcije|redakcij|redakcij}}',
 'nviews'                  => '$1-krat pregledano',
+'specialpage-empty'       => 'Ta stran je prazna.',
 'lonelypages'             => 'Osirotele strani',
 'uncategorizedpages'      => 'Nekategorizirane strani',
 'uncategorizedcategories' => 'Nekategorizirane kategorije',
 'uncategorizedimages'     => 'Nekategorizirane slike',
+'uncategorizedtemplates'  => 'Nekategorizirane predloge',
 'unusedcategories'        => 'Osirotele kategorije',
 'unusedimages'            => 'Osirotele datoteke',
 'popularpages'            => 'Priljubljene strani',
@@ -826,6 +1059,7 @@ Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico bes
 'wantedpages'             => 'Želene strani',
 'mostlinked'              => 'Strani, na katere se najve� povezuje',
 'mostlinkedcategories'    => 'Kategorije z najve� elementi',
+'mostlinkedtemplates'     => 'Najbolj uporabljene predloge',
 'mostcategories'          => 'Članki z najve� kategorijami',
 'mostimages'              => 'Najbolj uporabljane datoteke',
 'mostrevisions'           => 'Najve�krat urejane strani',
@@ -833,8 +1067,15 @@ Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico bes
 'shortpages'              => 'Kratke strani',
 'longpages'               => 'Dolge strani',
 'deadendpages'            => 'Članki brez delujo�ih povezav',
+'deadendpagestext'        => 'Spodaj navedene strani se ne povezujejo na druge �lanke v tem wikiju.',
+'protectedpages'          => 'Zaš�itene strani',
+'protectedpagestext'      => 'Spodaj navedene strani so zaš�itene pred urejanjem in ali prestavljanjem.',
+'protectedtitles'         => 'Zaš�iteni naslovi',
+'protectedtitlestext'     => 'Naslednji naslovi so zaš�iteni pred ustvarjanjem',
+'protectedtitlesempty'    => 'Noben naslov ni trenutno zaš�iten s temi parametri.',
 'listusers'               => 'Seznam uporabnikov',
 'newpages'                => 'Nove strani',
+'newpages-username'       => 'Uporabniško ime:',
 'ancientpages'            => 'Najdlje nespremenjeni �lanki',
 'move'                    => 'Prestavi',
 'movethispage'            => 'Prestavi stran',
@@ -842,14 +1083,20 @@ Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico bes
 'unusedcategoriestext'    => 'Naslednje strani kategorij obstajajo, vendar jih ne uporablja noben �lanek ali druga kategorija.',
 'notargettitle'           => 'Ni cilja',
 'notargettext'            => 'Niste navedli ciljne strani ali uporabnika za izvedbo ukaza.',
+'pager-newer-n'           => '{{PLURAL:$1|novejši 1|novejša 2|novejši $1|novejših $1}}',
+'pager-older-n'           => '{{PLURAL:$1|starejši 1|starejša 2|starejši $1|starejših $1}}',
 
 # Book sources
-'booksources' => 'Prepoznava ISBN-Å¡tevilk',
+'booksources'               => 'Prepoznava ISBN-Å¡tevilk',
+'booksources-search-legend' => 'Iš�i knjižne vire',
+'booksources-go'            => 'Pojdi',
+'booksources-text'          => 'Sledi seznam povezav do drugi spletnih strani, ki prodajajo nove in rabljene knjige, in imajo morda nadaljne informacije o knjigah, ki jih iš�ete:',
 
 # Special:Log
 'specialloguserlabel'  => 'Uporabnik:',
 'speciallogtitlelabel' => 'Naslov:',
 'log'                  => 'Dnevniki',
+'all-logs-page'        => 'Vsi dnevniki',
 'alllogstext'          => 'Združeno so prikazani dnevniki sprememb uporabniških pravic, preimenovanj uporabnikov, nalaganja predstavnostnih datotek, prestavljanja in zaš�ite strani, brisanja, registracij uporabnikov, sprememb položaja botov ter blokiranja in deblokiranja uporabnikov. Pogled lahko zožite z izbiro dnevnika, uporabniškega imena ali strani. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi �rkami.',
 'logempty'             => 'O tej strani ni v dnevniku ni�esar.',
 
@@ -857,7 +1104,9 @@ Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico bes
 'allpages'          => 'Vse strani',
 'alphaindexline'    => '$1 do $2',
 'nextpage'          => 'Naslednja stran ($1)',
+'prevpage'          => 'Prejšnja stran ($1)',
 'allpagesfrom'      => 'Prikaži strani, ki se za�nejo na:',
+'allpagesto'        => 'Prikaži strani, ki se kon�ajo na:',
 'allarticles'       => 'Vsi �lanki',
 'allinnamespace'    => 'Vse strani (imenski prostor $1)',
 'allnotinnamespace' => 'Vse strani (brez imenskega prostora $1)',
@@ -865,10 +1114,42 @@ Vsaka vrstica vsebuje povezave k prvi in drugi preusmeritvi ter prvo vrstico bes
 'allpagesnext'      => 'Naslednja',
 'allpagessubmit'    => 'Pojdi',
 'allpagesprefix'    => 'Prikaži strani z za�etnimi �rkami:',
+'allpagesbadtitle'  => 'Podan naslov strani je neveljaven oz. ima predpono inter-jezik ali inter-wiki. Morda vsebuje enega ali ve� znakov, ki niso dovoljeni v naslovih.',
+'allpages-bad-ns'   => '{{SITENAME}} nima imenskega prostora »$1«.',
 
 # Special:Categories
 'categories'         => 'Kategorije',
 'categoriespagetext' => 'V wikiju obstajajo naslednje kategorije.',
+'categoriesfrom'     => 'Prikaži kategorije, ki se za�nejo na:',
+
+# Special:DeletedContributions
+'deletedcontributions' => 'Izbrisani uporabnikovi prispevki',
+
+# Special:LinkSearch
+'linksearch'       => 'Iš�i spletne povezave',
+'linksearch-ns'    => 'Imenski prostor:',
+'linksearch-ok'    => 'Iš�i',
+'linksearch-line'  => '$1 povezano iz $2',
+'linksearch-error' => 'Jokerji se lahko pojavijo le na za�etku gostiteljskega imena.',
+
+# Special:ListUsers
+'listusers-submit'   => 'Prikaži',
+'listusers-noresult' => 'Ni najdenih uporabnikov.',
+
+# Special:Log/newusers
+'newuserlogpage'              => 'Dnevnik registracij uporabnikov',
+'newuserlogpagetext'          => "Prikazan je dnevnik nedavnih registracij novih uporabnikov.
+
+'''OPOMBA''': Pred blokiranjem dolge vrste ra�unov, za katere se zdi, da pripadajo vandalbotu, ali ki so namenjeni za napad, preverite [[{{ns:Special}}:Log/block|dnevnik blokiranja]] in se prepri�ajte, ali niso že bili blokirani. Podobno si po blokiranju uporabnika vzemite trenutek in ozna�ite uporabniško stran z ustrezno predlogo (navadno ''{{tl|UsernameBlock}}''). S tem boste prepre�ili nepotrebni trud drugih administratorjev. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi �rkami.",
+'newuserlog-create-entry'     => 'Nov uporabnik',
+'newuserlog-create2-entry'    => '- ustvaritev ra�una »$1«',
+'newuserlog-autocreate-entry' => 'Ra�un ustvarjen samodejno',
+
+# Special:ListGroupRights
+'listgrouprights'         => 'Pravice uporabniških skupin',
+'listgrouprights-group'   => 'Skupina',
+'listgrouprights-rights'  => 'Pravice',
+'listgrouprights-members' => '(seznam �lanov)',
 
 # E-mail user
 'mailnologin'     => 'Manjka naslov pošiljatelja',
@@ -886,13 +1167,17 @@ Da bo prejemnik lahko odgovoril neposredno vam, bo v glavi sporo�ila zapisan ''
 'emailsubject'    => 'Predmet',
 'emailmessage'    => 'Sporo�ilo',
 'emailsend'       => 'Pošlji',
+'emailccme'       => 'Po elektronski pošti mi pošlji kopijo mojega sporo�ila.',
+'emailccsubject'  => 'Kopija tvojega sporo�ila iz $1: $2',
 'emailsent'       => 'E-pismo je poslano!',
 'emailsenttext'   => 'E-pismo je poslano.',
 
 # Watchlist
 'watchlist'            => 'Spisek nadzorov',
 'mywatchlist'          => 'Spisek nadzorov',
+'watchlistfor'         => "(za '''$1''')",
 'nowatchlist'          => 'Vaš spisek nadzorov je prazen.',
+'watchlistanontext'    => 'Prosimo, $1 za pregled ali urejanje vsebine vašega spiska nadzorov.',
 'watchnologin'         => 'Niste prijavljeni',
 'watchnologintext'     => 'Za urejanje spiska nadzorov se [[Special:UserLogin|prijavite]].',
 'addedwatch'           => 'Dodano na spisek nadzorov',
@@ -915,14 +1200,21 @@ Da bo prejemnik lahko odgovoril neposredno vam, bo v glavi sporo�ila zapisan ''
 'wlnote'               => 'Navedenih je {{PLURAL:$1|zadnja|zadnji|zadnje|zadnjih|zadnjih}} $1 {{PLURAL:$1|sprememba|spremembi|spremembe|sprememb}} v {{PLURAL:$2|zadnji|zadnjih|zadnjih|zadnjih|zadnjih}} <b>$2</b> {{PLURAL:$2|uri|urah|urah|urah|urah}}.',
 'wlshowlast'           => 'Prikaži zadnjih $1 ur; $2 dni; $3;',
 
-'enotif_mailer'      => '{{SITENAME}} - obvestilni poštar',
-'enotif_reset'       => 'Ozna�i vse strani kot prebrane',
-'enotif_newpagetext' => 'To je nova stran.',
-'changed'            => 'spremenjena',
-'created'            => 'ustvarjena',
-'enotif_subject'     => 'Stran {{GRAMMAR:rodilnik|{{SITENAME}}}} $PAGETITLE je $CHANGEDORCREATED $PAGEEDITOR',
-'enotif_lastvisited' => 'Za spremembe po vašem zadnjem obisku glejte $1.',
-'enotif_body'        => '$WATCHINGUSERNAME,
+# Displayed when you click the "watch" button and it is in the process of watching
+'watching'   => 'Nadziranje ...',
+'unwatching' => 'Nenadziranje ...',
+
+'enotif_mailer'                => '{{SITENAME}} - obvestilni poštar',
+'enotif_reset'                 => 'Ozna�i vse strani kot prebrane',
+'enotif_newpagetext'           => 'To je nova stran.',
+'enotif_impersonal_salutation' => 'Uporabnik {{GRAMMAR:rodilnik|{{SITENAME}}}}',
+'changed'                      => 'spremenjena',
+'created'                      => 'ustvarjena',
+'enotif_subject'               => 'Stran {{GRAMMAR:rodilnik|{{SITENAME}}}} $PAGETITLE je $CHANGEDORCREATED $PAGEEDITOR',
+'enotif_lastvisited'           => 'Za spremembe po vašem zadnjem obisku glejte $1.',
+'enotif_lastdiff'              => 'Glej $1 za to spremembo.',
+'enotif_anon_editor'           => 'anonimni uporabnik $1',
+'enotif_body'                  => '$WATCHINGUSERNAME,
 
 stran v {{GRAMMAR:dajalnik|{{SITENAME}}}} $PAGETITLE je bila $PAGEEDITDATE $CHANGEDORCREATED s strani $PAGEEDITOR,
 za trenutno redakcijo glejte $PAGETITLE_URL
@@ -946,77 +1238,111 @@ Za spremembo nastavitev spiska nadzorov obiš�ite
 Povratna sporo�ila in pomo�:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Briši stran',
-'confirm'                     => 'Potrdi',
-'excontent'                   => "vsebina: '$1'",
-'excontentauthor'             => "vsebina: '$1' (edini urejevalec pa '$2')",
-'exbeforeblank'               => "vsebina pred brisanjem: '$1'",
-'exblank'                     => 'prazna stran',
-'historywarning'              => 'OPOZORILO: stran, ki jo želite izbrisati, ima zgodovino:',
-'confirmdeletetext'           => "Iz zbirke podatkov boste izbrisali stran ali sliko skupaj z vso njeno zgodovino. 
+# Delete
+'deletepage'            => 'Briši stran',
+'confirm'               => 'Potrdi',
+'excontent'             => "vsebina: '$1'",
+'excontentauthor'       => "vsebina: '$1' (edini urejevalec pa '$2')",
+'exbeforeblank'         => "vsebina pred brisanjem: '$1'",
+'exblank'               => 'prazna stran',
+'delete-confirm'        => 'Brisanje »$1«',
+'delete-legend'         => 'Izbriši',
+'historywarning'        => 'OPOZORILO: stran, ki jo želite izbrisati, ima zgodovino:',
+'confirmdeletetext'     => "Iz zbirke podatkov boste izbrisali stran ali sliko skupaj z vso njeno zgodovino. 
 Prosimo, '''potrdite''', da to resni�no želite, da razumete posledice dejanja in da se ravnate po [[{{MediaWiki:Policy-url}}|pravilih]].",
-'actioncomplete'              => 'Poseg je kon�an',
-'deletedtext'                 => "»'''<nowiki>$1</nowiki>'''« je bila izbrisana. 
+'actioncomplete'        => 'Poseg je kon�an',
+'deletedtext'           => "»'''<nowiki>$1</nowiki>'''« je bila izbrisana. 
 Za zapise nedavnih brisanj glej $2.",
-'deletedarticle'              => 'je izbrisal(-a) »$1«',
-'dellogpage'                  => 'Dnevnik brisanja',
-'dellogpagetext'              => 'Prikazan je seznam nedavnih brisanj z navedenim strežniškim �asom. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi �rkami.',
-'deletionlog'                 => 'dnevnik brisanja',
-'reverted'                    => 'Obnova prejšnje redakcije',
-'deletecomment'               => 'Razlog za brisanje',
-'rollback'                    => 'Vrni spremembe',
-'rollback_short'              => 'Vrni',
-'rollbacklink'                => 'vrni',
-'rollbackfailed'              => 'Vrnitev ni uspela.',
-'cantrollback'                => 'Urejanja ne morem vrniti; zadnji urejevalec je hkrati edini.',
-'alreadyrolled'               => 'Ne morem vrniti zadnje spremembe [[:$1]]
+'deletedarticle'        => 'je izbrisal(-a) »$1«',
+'dellogpage'            => 'Dnevnik brisanja',
+'dellogpagetext'        => 'Prikazan je seznam nedavnih brisanj z navedenim strežniškim �asom. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi �rkami.',
+'deletionlog'           => 'dnevnik brisanja',
+'reverted'              => 'Obnova prejšnje redakcije',
+'deletecomment'         => 'Razlog za brisanje',
+'deleteotherreason'     => 'Drugi/dodatni razlogi:',
+'deletereasonotherlist' => 'Drug razlog',
+'deletereason-dropdown' => '* Pogosti razlogi za brisanje
+** zahteva avtorja
+** kršitev avtorskih pravic
+** vandalizem
+** potrjen [[Wikipedija:Predlogi za brisanje|predlog za brisanje]]
+** [[Wikipedija:Pomembnost|Wikipedija:nePomembnost]]
+** nerelevanten komentar',
+
+# Rollback
+'rollback'         => 'Vrni spremembe',
+'rollback_short'   => 'Vrni',
+'rollbacklink'     => 'vrni',
+'rollbackfailed'   => 'Vrnitev ni uspela.',
+'cantrollback'     => 'Urejanja ne morem vrniti; zadnji urejevalec je hkrati edini.',
+'alreadyrolled'    => 'Ne morem vrniti zadnje spremembe [[:$1]]
 od uporabnika [[User:$2|$2]] ([[User talk:$2|Pogovor]]); nekdo drug je že spremenil ali vrnil �lanek.
 
 Zadnja sprememba od uporabnika [[User:$3|$3]] ([[User talk:$3|Pogovor]]).',
-'editcomment'                 => "Pripomba k spremembi: »''$1''«.", # only shown if there is an edit comment
-'revertpage'                  => 'vrnitev sprememb uporabnika »[[Special:Contributions/$2|$2]]« ([[User talk:$2|pogovor]]) na zadnje urejanje uporabnika »$1«', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'sessionfailure'              => 'Vaša prijava ni uspela; da bi prepre�ili ugrabitev seje, je bilo dejanje preklicano. Prosimo, izberite »Nazaj« in ponovno naložite stran, s katere prihajate, nato poskusite znova.',
+'editcomment'      => "Pripomba k spremembi: »''$1''«.", # only shown if there is an edit comment
+'revertpage'       => 'vrnitev sprememb uporabnika »[[Special:Contributions/$2|$2]]« ([[User talk:$2|pogovor]]) na zadnje urejanje uporabnika »$1«', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Razveljavljene spremembe uporabnika $1; vrnjeno na urejanje uporabnika $2.',
+'sessionfailure'   => 'Vaša prijava ni uspela; da bi prepre�ili ugrabitev seje, je bilo dejanje preklicano. Prosimo, izberite »Nazaj« in ponovno naložite stran, s katere prihajate, nato poskusite znova.',
+
+# Protect
 'protectlogpage'              => 'Dnevnik zaš�it strani',
 'protectlogtext'              => 'Prikazan je seznam zaš�it in odstranitev zaš�it strani. Za ve� podatkov glejte [[Project:Zaš�itena stran]] in [[Project:Pravila zaš�ite]]. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi �rkami.',
 'protectedarticle'            => 'Zaš�ita strani "[[$1]]"',
+'modifiedarticleprotection'   => 'stopnja zaš�ite spremenjena za »[[$1]]«',
 'unprotectedarticle'          => 'Zaš�ita strani $1 je odstranjena.',
 'protect-title'               => 'Zaš�ita strani »$1«',
+'prot_1movedto2'              => '- prestavitev [[$1]] na [[$2]]',
 'protect-legend'              => 'Potrdite zaš�ito',
 'protectcomment'              => 'Razlog:',
+'protectexpiry'               => 'Pote�e:',
 'protect-unchain'             => 'Deblokiraj dovoljenja za premikanje',
 'protect-text'                => "Tu si lahko ogledate in spremenite raven zaš�itenosti strani '''<nowiki>$1</nowiki>'''.",
 'protect-default'             => 'Omogo�i urejanje vsem uporabnikom',
 'protect-level-autoconfirmed' => 'Blokiraj neregistrirane uporabnike',
 'protect-level-sysop'         => 'Blokiraj vse uporabnike (razen administratorjev)',
+'protect-cascade'             => 'Zaš�iti strani, ki so vklju�ene v to stran (kaskadna zaš�ita)',
+'protect-expiry-options'      => 'nedolo�en �as:infinite,15 minut:15 minutes,1 uro:1 hour,3 ure:3 hours,1 dan:1 day,2 dni:2 days,3 dni:3 days,1 teden:1 week,2 tedna:2 weeks,1 mesec:1 month,3 mesece:3 months,6 mesecev:6 months,1 leto:1 year,neomejeno dolgo:infinite', # display1:time1,display2:time2,...
+'restriction-type'            => 'Dovoljenje:',
+'minimum-size'                => 'Min. velikost',
+'maximum-size'                => 'Maks. velikost',
+'pagesize'                    => '(bitov)',
 
 # Restrictions (nouns)
-'restriction-edit' => 'Urejanje',
-'restriction-move' => 'Prestavljanje',
+'restriction-edit'   => 'Urejanje',
+'restriction-move'   => 'Prestavljanje',
+'restriction-create' => 'Ustvari',
+
+# Restriction levels
+'restriction-level-sysop'         => 'popolna zaš�ita',
+'restriction-level-autoconfirmed' => 'delno zaš�iteno',
 
 # Undelete
-'undelete'               => 'Obnovi izbrisano stran',
-'undeletepage'           => 'Prikaži izbrisane strani in jih obnovi',
-'viewdeletedpage'        => 'Pregled izbrisanih strani',
-'undeletepagetext'       => 'Naslednje strani so izbrisane, vendar so še vedno v arhivu in jih lahko obnovite. Arhiv je treba ob�asno po�istiti.',
-'undeleteextrahelp'      => "Da bi obnovili celotno stran z vso njeno zgodovino, pustite vsa potrditvena polja prazna in kliknite '''''Obnovi'''''.
+'undelete'                 => 'Obnovi izbrisano stran',
+'undeletepage'             => 'Prikaži izbrisane strani in jih obnovi',
+'viewdeletedpage'          => 'Pregled izbrisanih strani',
+'undeletepagetext'         => 'Naslednje strani so izbrisane, vendar so še vedno v arhivu in jih lahko obnovite. Arhiv je treba ob�asno po�istiti.',
+'undeleteextrahelp'        => "Da bi obnovili celotno stran z vso njeno zgodovino, pustite vsa potrditvena polja prazna in kliknite '''''Obnovi'''''.
 Če želite obnoviti le dolo�ene redakcije strani, pred klikom gumba '''''Obnovi''''' ozna�ite ustrezna potrditvena polja.
 Klik gumba '''''Ponastavi''''' bo izpraznil polje za vnos razloga in vsa potrditvena polja.",
-'undeleterevisions'      => '{{PLURAL:$1|Arhivirana je|Arhivirani sta|Arhivirane so|Arhiviranih je|Arhiviranih ni}} $1 {{PLURAL:$1|redakcija|redakciji|redakcije|redakcij|redakcij}}',
-'undeletehistory'        => 'Z obnovo strani se bodo po privzetem obnovile tudi vse pripadajo�e redakcije. Če se želite temu izogniti, ozna�ite le želene.
+'undeleterevisions'        => '{{PLURAL:$1|Arhivirana je|Arhivirani sta|Arhivirane so|Arhiviranih je|Arhiviranih ni}} $1 {{PLURAL:$1|redakcija|redakciji|redakcije|redakcij|redakcij}}',
+'undeletehistory'          => 'Z obnovo strani se bodo po privzetem obnovile tudi vse pripadajo�e redakcije. Če se želite temu izogniti, ozna�ite le želene.
 
 Kjer je bila po brisanju ustvarjena nova stran s tem imenom, se trenutna redakcija obstoje�e strani ne bo samodejno zamenjala, temve� se bodo obnovljene redakcije pojavile v prejšnji zgodovini. Pazite, da se temu izognete, razen seveda, kadar resni�no nameravate združiti zgodovini obeh strani.',
-'undeletehistorynoadmin' => 'Stran je izbrisana. Razlog za izbris je skupaj s podrobnostmi o uporabnikih, ki so jo urejali pred izbrisom, naveden v prikazanem povzetku. Dejansko besedilo izbrisanih redakcij je dostopno le administratorjem.',
-'undeletebtn'            => 'Obnovi',
-'undeletereset'          => 'Ponastavi',
-'undeletecomment'        => 'Razlog:',
-'undeletedarticle'       => 'je obnovil(-a) »$1«',
-'undeletedrevisions'     => 'obnovljeno: $1 {{PLURAL:$1|redakcija|redakciji|redakcije|redakcij|redakcij}}',
-'undeletedfiles'         => 'Obnovili ste $1 {{PLURAL:datoteka|datoteki|datoteke|datotek|datotek}}',
-'cannotundelete'         => 'Obnova ni uspela. Morda je stran obnovil že kdo drug.',
-'undeletedpage'          => "<big>'''Obnovili ste stran '$1'.'''</big>
+'undeletehistorynoadmin'   => 'Stran je izbrisana. Razlog za izbris je skupaj s podrobnostmi o uporabnikih, ki so jo urejali pred izbrisom, naveden v prikazanem povzetku. Dejansko besedilo izbrisanih redakcij je dostopno le administratorjem.',
+'undeleterevision-missing' => 'Napa�na ali manjkajo�a redakcija. Imate lahko napa�no povezavo ali pa je bila redakcija obnovljena ali odstranjena iz arhiva.',
+'undeletebtn'              => 'Obnovi',
+'undeletelink'             => 'obnovi',
+'undeletereset'            => 'Ponastavi',
+'undeletecomment'          => 'Razlog:',
+'undeletedarticle'         => 'je obnovil(-a) »$1«',
+'undeletedrevisions'       => 'obnovljeno: $1 {{PLURAL:$1|redakcija|redakciji|redakcije|redakcij|redakcij}}',
+'undeletedfiles'           => 'Obnovili ste $1 {{PLURAL:datoteka|datoteki|datoteke|datotek|datotek}}',
+'cannotundelete'           => 'Obnova ni uspela. Morda je stran obnovil že kdo drug.',
+'undeletedpage'            => "<big>'''Obnovili ste stran '$1'.'''</big>
 
 Nedavna brisanja in obnove so zapisani v [[Special:Log/delete|dnevniku brisanja]].",
+'undelete-search-box'      => 'Iš�i izbrisane strani',
+'undelete-search-submit'   => 'Iskanje',
 
 # Namespace form on various pages
 'namespace'      => 'Imenski prostor:',
@@ -1029,28 +1355,53 @@ Nedavna brisanja in obnove so zapisani v [[Special:Log/delete|dnevniku brisanja]
 'contribsub2'   => 'Uporabnik: $1 ($2)',
 'nocontribs'    => 'Ne najdem nobene merilom ustrezajo�e spremembe.',
 'uctop'         => ' (vrh)',
+'month'         => 'Od meseca (in prej):',
+'year'          => 'Od leta (in prej):',
 
+'sp-contributions-newbies'     => 'Prikaži samo prispevke novih ra�unov',
 'sp-contributions-newbies-sub' => 'Prispevki novincev',
+'sp-contributions-blocklog'    => 'Dnevnik blokiranja',
+'sp-contributions-search'      => 'Iš�i prispevke',
+'sp-contributions-username'    => 'IP-naslov ali uporabniško ime:',
+'sp-contributions-submit'      => 'Iš�i',
 
 # What links here
-'whatlinkshere' => 'Kaj se povezuje sem',
-'linklistsub'   => '(Seznam povezav)',
-'linkshere'     => 'Sem kažejo naslednje strani:',
-'nolinkshere'   => 'Sem ne kaže nobena stran.',
-'isredirect'    => 'preusmeritvena stran',
-'istemplate'    => 'vklju�itev',
+'whatlinkshere'       => 'Kaj se povezuje sem',
+'whatlinkshere-title' => 'Strani, ki se povezujejo na $1',
+'linkshere'           => 'Sem kažejo naslednje strani:',
+'nolinkshere'         => 'Sem ne kaže nobena stran.',
+'nolinkshere-ns'      => "Nobena stran se ne povezuje na '''[[:$1]]''' v izbranem imenskem prostoru.",
+'isredirect'          => 'preusmeritvena stran',
+'istemplate'          => 'vklju�itev',
+'whatlinkshere-prev'  => '{{PLURAL:$1|prejšnji|prejšnja $1|prejšnji $1|prejšnjih $1|prejšnjih $1}}',
+'whatlinkshere-next'  => '{{PLURAL:$1|naslednji|naslednja $1|naslednji $1|naslednjih $1|naslednjih $1}}',
+'whatlinkshere-links' => '� povezave',
 
 # Block/unblock
 'blockip'                     => 'Blokiranje IP-naslova ali uporabniškega imena',
+'blockip-legend'              => 'Blokiraj uporabnika',
 'blockiptext'                 => "Naslednji obrazec vam omogo�a, da dolo�enemu IP-naslovu ali uporabniškemu imenu prepre�ite urejanje. To storimo le zaradi zaš�ite pred nepotrebnim uni�evanjem in po [[{{MediaWiki:Policy-url}}|pravilih]]. Vnesite tudi razlog, ''na primer'' seznam strani, ki jih je uporabnik po nepotrebnem kvaril.",
 'ipaddress'                   => 'IP-naslov',
 'ipadressorusername'          => 'IP-naslov ali uporabniško ime',
 'ipbexpiry'                   => 'Pretek',
 'ipbreason'                   => 'Razlog',
+'ipbreasonotherlist'          => 'Drug razlog',
+'ipbreason-dropdown'          => '*Razlogi za blokado
+** [[Wikipedija:Vandalizem|vandalizem]]
+** dodajanje napa�nih/lažnih podatkov
+** brisanje strani
+** dodajanje nepotrebnih zunanjih povezav
+** dodajanje neumnosti v besedilo
+** nadlegovanje/osebni napadi
+** neprimerno uporabniško ime',
+'ipbanononly'                 => 'Blokiraj le brezimne uporabnike',
+'ipbcreateaccount'            => 'Prepre�i ustvarjanje ra�unov',
+'ipbenableautoblock'          => 'Avtomati�no blokiraj zadnji IP naslov tega uporabnika in vse naslednje naslove, ki jih bodo hoteli uporabiti',
 'ipbsubmit'                   => 'Blokiraj naslov',
 'ipbother'                    => 'Druga�en �as',
 'ipboptions'                  => 'nedolo�en �as:infinite,15 minut:15 minutes,1 uro:1 hour,3 ure:3 hours,1 dan:1 day,2 dni:2 days,3 dni:3 days,1 teden:1 week,2 tedna:2 weeks,1 mesec:1 month,3 mesece:3 months,6 mesecev:6 months,1 leto:1 year,neomejeno dolgo:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'              => 'drugo',
+'ipbotherreason'              => 'Drug/dodaten razlog:',
 'badipaddress'                => 'Neveljaven IP-naslov ali uporabniško ime.',
 'blockipsuccesssub'           => 'Blokiranje je uspelo',
 'blockipsuccesstext'          => 'IP-naslov ali uporabniški ra�un »[[Special:Contributions/$1|$1]]« je blokiran.<br />
@@ -1059,9 +1410,14 @@ Preglejte [[Special:IPBlockList|seznam blokiranih IP-naslovov]].',
 'unblockiptext'               => 'Z naslednjim obrazcem lahko obnovite možnost urejanja z blokiranega IP-naslova ali uporabniškega ra�una.',
 'ipusubmit'                   => 'Deblokiraj naslov',
 'ipblocklist'                 => 'Seznam blokiranih IP-naslovov',
+'ipblocklist-submit'          => 'Iš�i',
 'blocklistline'               => '$1, $2 je blokiral(-a) $3 ($4)',
 'infiniteblock'               => 'neomejen �as',
 'expiringblock'               => 'prete�e: $1',
+'anononlyblock'               => 'samo brezim.',
+'noautoblockblock'            => 'Avtomatska blokada je onemogo�ena',
+'createaccountblock'          => 'ustvarjanje ra�unov onemogo�eno',
+'emailblock'                  => 'e-pošta blokirana',
 'blocklink'                   => 'blokiraj',
 'unblocklink'                 => 'deblokiraj',
 'contribslink'                => 'prispevki',
@@ -1070,10 +1426,18 @@ Preglejte [[Special:IPBlockList|seznam blokiranih IP-naslovov]].',
 'blocklogentry'               => 'uporabnika »$1« sem blokiral(-a) za $2',
 'blocklogtext'                => 'Prikazan je dnevnik blokiranja in deblokiranja uporabnikov. Samodejno blokirani IP-naslovi niso navedeni. Trenutno veljavna blokiranja so navedena na [[Special:IPBlockList|seznamu blokiranih IP-naslovov]].',
 'unblocklogentry'             => 'je deblokiral(-a) »$1«',
+'block-log-flags-anononly'    => 'samo za brezimne uporabnike',
+'block-log-flags-nocreate'    => 'ustvarjanje uporabniških ra�unov onemogo�eno',
+'block-log-flags-noautoblock' => 'samodejno blokiranje onemogo�eno',
+'block-log-flags-noemail'     => 'e-naslov blokiran',
 'range_block_disabled'        => 'Možnost administratorjev za blokiranje urejanja IP-razponom je onemogo�ena.',
 'ipb_expiry_invalid'          => 'Neveljaven �as preteka',
+'ipb_already_blocked'         => '"$1" je že blokiran',
+'ipb_cant_unblock'            => 'Napaka: blokade št. $1 ni mo� najti. Morda je bila že odstranjena.',
 'ip_range_invalid'            => 'Neveljaven IP-razpon.',
+'blockme'                     => 'Blokiraj me',
 'proxyblocker'                => 'Blokator posredniških strežnikov',
+'proxyblocker-disabled'       => 'Ta funkcija je onemogo�ena.',
 'proxyblockreason'            => 'Ker uporabljate odprti posredniški strežnik, je urejanje z vašega IP-naslova prepre�eno. Gre za resno varnostno težavo, o kateri obvestite svojega internetnega ponudnika.',
 'proxyblocksuccess'           => 'Storjeno.',
 'sorbsreason'                 => 'Vaš IP-naslov je v DNSBL uvrš�en med odprte posredniške strežnike.',
@@ -1094,6 +1458,7 @@ Preglejte [[Special:IPBlockList|seznam blokiranih IP-naslovov]].',
 'lockdbsuccesstext'   => 'Podatkovna baza {{GRAMMAR:rodilnik|{{SITENAME}}}} je bila zaklenjena.
 <br />Ne pozabite odkleniti, ko boste kon�ali z vzdrževanjem.',
 'unlockdbsuccesstext' => 'Zbirka podatkov {{GRAMMAR:rodilnik|{{SITENAME}}}} je spet odklenjena.',
+'databasenotlocked'   => 'Zbirka podatkov ni zaklenjena.',
 
 # Move page
 'move-page-legend'        => 'Prestavitev strani',
@@ -1112,10 +1477,21 @@ Prestavitev strani je lahko za priljubljeno stran velika in nepri�akovana sprem
 
 Če je tako, boste morali pogovorno stran, �e želite, prestaviti ali povezati ro�no. Če tega ne morete storiti, predlagajte prestavitev na strani [[Project:Želene prestavitve]], vsekakor pa tega '''''ne''''' po�nite s preprostim izrezanjem in prilepljenjem vsebine, saj bi tako pokvarili zgodovino urejanja strani.",
 'movearticle'             => 'Prestavi stran',
+'movenologin'             => 'Niste prijavljeni',
+'movenologintext'         => 'Za prestavljanje strani morate biti registrirani in [[Special:UserLogin|prijavljeni]].',
 'newtitle'                => 'Na naslov',
+'move-watch'              => 'Opazuj to stran',
 'movepagebtn'             => 'Prestavi stran',
 'pagemovedsub'            => 'Uspešno prestavljeno',
+'movepage-moved'          => "<span class=\"navadnapovezava\">Stran '''»\$1«''' je prestavljena na naslov '''»\$2«'''.</span>
+
+'''Prosimo, [[{{ns:Special}}:Whatlinkshere/\$4|popravite]]''' vse [[{{ns:special}}:DoubleRedirects|dvojne preusmeritve]], ki so pri tem morda nastale. Za ta namen lahko uporabite naslednjo vrstico:
+
+<center><span style=\"font-family:monospace\"><nowiki>#REDIRECT [[</nowiki>\$4]]</span></center>
+
+<span id=\"specialDeleteTarget\" style=\"display:none;\">\$3</span>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
 'articleexists'           => "'''Stran ni bilo mogo�e prestaviti!''' Izbrano ime je že zasedeno ali pa ni veljavno.",
+'cantmove-titleprotected' => 'Strani ne morete premakniti na slednjo lokacijo, saj je nov naslov zaš�iten pred ustvarjanjem',
 'talkexists'              => 'Sama stran je bila uspešno prestavljena, pripadajo�a pogovorna stran pa ne, ker že obstaja na novem naslovu. Prosimo, združite ju ro�no. Če tega ne morete storiti, prosite za pomo� katerega izmed administratorjev, nikakor pa tega NE po�nite z izrezanjem in prilepljenjem vsebine.',
 'movedto'                 => 'prestavljeno na',
 'movetalk'                => 'Če je mogo�e, prestavi tudi pogovorno stran.',
@@ -1132,18 +1508,22 @@ Ciljna stran »[[:$1]]« že obstaja. Ali jo želite, da bi pripravili prostor z
 'delete_and_move_confirm' => 'Da, izbriši stran',
 'delete_and_move_reason'  => 'Izbrisano z namenom pripraviti prostor za prestavitev.',
 'selfmove'                => "'''Naslova vira in cilja sta enaka; stran ni mogo�e prestaviti samo vase.''' Prosimo, preverite, ali niste naslova cilja namesto v polje »Na naslov« vpisali v polje »Razlog«.",
-'immobile_namespace'      => 'Kot cilj ste dolo�ili naslov posebne vrste. V ta imenski prostor stran ni mogo�e prestaviti.',
 
 # Export
-'export'        => 'Izvoz strani',
-'exporttext'    => "Besedilo in urejevalno zgodovino ene ali ve� strani lahko izvozite v obliki XML. V prihodnosti bo to vsebino morda mogo�e izvoziti v drug wiki, ki ga bo poganjalo programje MediaWiki, v trenutni razli�ici pa so možnosti za to zelo omejene (kjer je omogo�eno orodje ''Special:Import'', lahko vsebino z njegovo uporabo uvozijo administratorji).
+'export'            => 'Izvoz strani',
+'exporttext'        => "Besedilo in urejevalno zgodovino ene ali ve� strani lahko izvozite v obliki XML. V prihodnosti bo to vsebino morda mogo�e izvoziti v drug wiki, ki ga bo poganjalo programje MediaWiki, v trenutni razli�ici pa so možnosti za to zelo omejene (kjer je omogo�eno orodje ''Special:Import'', lahko vsebino z njegovo uporabo uvozijo administratorji).
 
 Če želite izvoziti �lanke, v spodnje polje vpišite njihove naslove (enega v vsako vrstico) in ozna�ite, ali želite le trenutno razli�ico s podatki o trenutnem urejanju ali tudi vse prejšnje z vrsticami o zgodovini strani.
 
-ÄŒe gre za slednje, lahko uporabite tudi povezavo, npr. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] za 
+ÄŒe gre za slednje, lahko uporabite tudi povezavo, npr. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] za 
 �lanek \"[[{{MediaWiki:Mainpage}}]]\".",
-'exportcuronly' => 'Vklju�i le trenutno redakcijo, ne pa celotne zgodovine.',
-'export-submit' => 'Izvozi',
+'exportcuronly'     => 'Vklju�i le trenutno redakcijo, ne pa celotne zgodovine.',
+'exportnohistory'   => "----
+'''Opomba:''' izvoz celotne zgodovine strani je do nadaljnjega zaradi preobremenjenosti strežnikov onemogo�en. Popolno zgodovino lahko najdete v [http://download.wikimedia.org/ izmetih zbirke podatkov] — administratorji strežnikov Wikimedije.",
+'export-submit'     => 'Izvozi',
+'export-addcattext' => 'Dodaj strani iz kategorije:',
+'export-addcat'     => 'Dodaj',
+'export-download'   => 'Shrani kot datoteko',
 
 # Namespace 8 related
 'allmessages'               => 'Sistemska sporo�ila',
@@ -1151,26 +1531,33 @@ Ciljna stran »[[:$1]]« že obstaja. Ali jo želite, da bi pripravili prostor z
 'allmessagesdefault'        => 'Prednastavljeno besedilo',
 'allmessagescurrent'        => 'Trenutno besedilo',
 'allmessagestext'           => 'Navedena so v imenskem prostoru MediaWiki dostopna sistemska sporo�ila.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "Ker je '''\$wgUseDatabaseMessages''' izklju�eno, '''{{ns:special}}:Allmessages''' ni podprto.",
 'allmessagesfilter'         => 'Filter pogostih izrazov:',
 'allmessagesmodified'       => 'Prikaži le spremenjeno',
 
 # Thumbnails
-'thumbnail-more'  => 'Pove�aj',
-'filemissing'     => 'Datoteka manjka',
-'thumbnail_error' => 'Napaka pri izdelavi sli�ice: $1',
+'thumbnail-more'           => 'Pove�aj',
+'filemissing'              => 'Datoteka manjka',
+'thumbnail_error'          => 'Napaka pri izdelavi sli�ice: $1',
+'thumbnail_invalid_params' => 'Neveljavni parametri za sli�ico',
 
 # Special:Import
-'import'                => 'Uvoz strani',
-'importinterwiki'       => 'Transwikiuvoz',
-'importtext'            => 'Z uporabo orodja Special:Export izvozite datoteko iz izvornega wikija, shranite jo na disk in naložite tu.',
-'importfailed'          => 'Uvoz ni uspel: $1',
-'importnotext'          => 'Prazno ali brez besedila',
-'importsuccess'         => 'Uspešno uvoženo!',
-'importhistoryconflict' => 'Zgodovina strani vklju�uje navzkrižno redakcijo (morda je bila stran naložena že prej)',
-'importnosources'       => 'Na tem wikiju je ta možnost onemogo�ena.',
-'importnofile'          => 'Uvožena ni bila nobena datoteka.',
+'import'                     => 'Uvoz strani',
+'importinterwiki'            => 'Transwikiuvoz',
+'import-interwiki-history'   => 'Kopiraj vse dosedanje redakcije te strani',
+'import-interwiki-submit'    => 'Uvozi',
+'import-interwiki-namespace' => 'Prenesi strani v imenski prostor:',
+'importtext'                 => 'Z uporabo orodja Special:Export izvozite datoteko iz izvornega wikija, shranite jo na disk in naložite tu.',
+'importstart'                => 'Uvažam strani ...',
+'importfailed'               => 'Uvoz ni uspel: $1',
+'importcantopen'             => 'Neuspešno odpiranje uvožene datoteke',
+'importbadinterwiki'         => 'Slaba jezikovna povezava',
+'importnotext'               => 'Prazno ali brez besedila',
+'importsuccess'              => 'Uspešno uvoženo!',
+'importhistoryconflict'      => 'Zgodovina strani vklju�uje navzkrižno redakcijo (morda je bila stran naložena že prej)',
+'importnosources'            => 'Na tem wikiju je ta možnost onemogo�ena.',
+'importnofile'               => 'Uvožena ni bila nobena datoteka.',
 
 # Tooltip help for the actions
 'tooltip-pt-userpage'             => 'Vaša uporabniška stran',
@@ -1210,6 +1597,8 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-t-emailuser'             => 'Pošljite uporabniku e-pismo',
 'tooltip-t-upload'                => 'Naložite slike ali predstavnostne datoteke',
 'tooltip-t-specialpages'          => 'Preglejte seznam vseh posebnih strani',
+'tooltip-t-print'                 => 'Natisljiva razli�ica strani',
+'tooltip-t-permalink'             => 'Stalna povezava na to verzijo strani',
 'tooltip-ca-nstab-main'           => 'Prikaže �lanek',
 'tooltip-ca-nstab-user'           => 'Prikaže uporabniško stran',
 'tooltip-ca-nstab-media'          => 'Prikaže stran s predstavnostno vsebino',
@@ -1227,6 +1616,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'tooltip-compareselectedversions' => 'Preglejte razlike med izbranima redakcijama.',
 'tooltip-watch'                   => 'Dodajte stran na svoj spisek nadzorov.',
 'tooltip-recreate'                => 'Ta stran je namenoma (skoraj) prazna.',
+'tooltip-upload'                  => 'Naložite slikovno ali ve�predstavno gradivo [alt-u]',
 
 # Metadata
 'nodublincore'      => 'Metapodatki Dublin Core RDF so na tem strežniku onemogo�eni.',
@@ -1277,20 +1667,38 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'markedaspatrollederror'     => 'Ni mogo�e ozna�iti kot pregledano',
 'markedaspatrollederrortext' => 'Dolo�ite redakcijo, ki jo želite ozna�iti kot pregledano.',
 
+# Patrol log
+'patrol-log-page' => 'Dnevnik patrulje',
+'patrol-log-line' => 'je ozna�il $1 strani $2 kot preverjeno urejanje $3',
+'patrol-log-auto' => '(samodejno)',
+
 # Image deletion
-'deletedrevision' => 'Prejšnja redakcija $1 je izbrisana',
+'deletedrevision'                 => 'Prejšnja redakcija $1 je izbrisana',
+'filedeleteerror-short'           => 'Napaka pri brisanju datoteke: $1',
+'filedeleteerror-long'            => 'Pri brisanju datoteke so se pojavile napake:
+
+$1',
+'filedelete-missing'              => 'Datoteka »$1« ne more biti izbrisana, saj ne obstaja.',
+'filedelete-old-unregistered'     => 'Izbrana razli�ica datoteke »$1« ne obstaja v zbirki podatkov.',
+'filedelete-current-unregistered' => 'Izbrana datoteka »$1« ni v zbirki podatkov.',
+'filedelete-archive-read-only'    => 'Arhivna mapa »$1« ni zapisljiva s strani spletnega strežnika.',
 
 # Browsing diffs
 'previousdiff' => '� Pojdi na prejšnje urejanje',
 'nextdiff'     => 'Novejše urejanje →',
 
 # Media information
-'mediawarning' => "'''Opozorilo''': Tovrstni tip datotek lahko vsebuje kodo, ki bi mogla ogroziti vaš sistem.
+'mediawarning'         => "'''Opozorilo''': Tovrstni tip datotek lahko vsebuje kodo, ki bi mogla ogroziti vaš sistem.
 <hr />",
-'imagemaxsize' => 'Slike na opisnih straneh omeji na:',
-'thumbsize'    => 'Velikost sli�ice (thumbnail):',
-
-# Special:NewImages
+'imagemaxsize'         => 'Slike na opisnih straneh omeji na:',
+'thumbsize'            => 'Velikost sli�ice (thumbnail):',
+'file-info'            => 'Velikost datoteke: $1, MIME-vrsta: <code>$2</code>',
+'file-info-size'       => '($1 × $2 to�k, velikost datoteke: $3, MIME-vrsta: $4)',
+'file-nohires'         => '<small>Slika višje resolucije ni na voljo.</small>',
+'show-big-image'       => 'Slika v višji resoluciji',
+'show-big-image-thumb' => '<small>Velikost predogleda: $1 × $2 to�k</small>',
+
+# Special:NewFiles
 'newimages'             => 'Galerija novih datotek',
 'imagelisttext'         => 'Prikazujem $1 $2 {{PLURAL:$1|razvrš�eno datoteko|razvrš�eni datoteki|razvrš�ene datoteke|razvrš�enih datotek|razvrš�enih datotek}}.',
 'showhidebots'          => '($1 bote)',
@@ -1299,11 +1707,22 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'bydate'                => 'po datumu',
 'sp-newimages-showfrom' => 'Prikaži datoteke, naložene od $1 naprej',
 
+# Bad image list
+'bad_image_list' => 'Prikaz naslednjih slik v �lankih je prepre�en s tehni�nimi sredstvi. Zaradi pohitritve delovanja poskušajte stran obdržati kratko, npr. pod 10 KB.
+<!-- spodaj naštejte slike, ki jih želite v skladu s soglasjem ob�estva izklju�iti; sicer glejte razpravo v en: -->',
+
 # Metadata
 'metadata'          => 'Metapodatki',
 'metadata-help'     => 'Datoteka vsebuje še druge podatke, ki jih je verjetno dodal za njeno ustvaritev oziroma digitalizacijo uporabljeni fotografski aparat ali opti�ni bralnik. Če je bila datoteka pozneje spremenjena, podatki sprememb morda ne izražajo popolnoma.',
 'metadata-expand'   => 'Razširi seznam',
 'metadata-collapse' => 'Skr�i seznam',
+'metadata-fields'   => 'V skr�eni razpredelnici metapodatkov EXIF bodo prikazana le v tem sporo�ilu našteta polja. Druga bodo po privzetem skrita.
+* make
+* model
+* datetimeoriginal
+* exposuretime 
+* fnumber 
+* focallength', # Do not translate list items
 
 # EXIF tags
 'exif-imagewidth'                  => 'Å irina',
@@ -1440,6 +1859,9 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'exif-planarconfiguration-1' => 'grudast format',
 'exif-planarconfiguration-2' => 'ravninski format',
 
+'exif-xyresolution-i' => '$1 dpi ({{plural:$1|to�ka/palec|to�ki/palec|to�ke/palec|to�k/palec|to�k/palec}})',
+'exif-xyresolution-c' => '$1 dpc ({{plural:$1|to�ka/centimeter|to�ki/centimeter|to�ke/centimeter|to�k/centimeter|to�k/centimeter}})',
+
 'exif-componentsconfiguration-0' => 'ne obstaja',
 
 'exif-exposureprogram-0' => 'Ni dolo�en',
@@ -1563,26 +1985,34 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 'imagelistall'     => 'vse',
 'watchlistall2'    => 'vse',
 'namespacesall'    => 'vse',
+'monthsall'        => 'vse',
 
 # E-mail address confirmation
-'confirmemail'            => 'Potrditev naslova elektronske pošte',
-'confirmemail_text'       => 'Za uporabo e-poštnih možnosti {{GRAMMAR:rodilnik|{{SITENAME}}}} morate najprej potrditi svoj e-poštni naslov.
+'confirmemail'             => 'Potrditev naslova elektronske pošte',
+'confirmemail_noemail'     => 'Nimate dolo�enega veljavnega e-poštnega naslova v vaših [[{{ns:special}}:Preferences|uporabniških nastavitvah]].',
+'confirmemail_text'        => 'Za uporabo e-poštnih možnosti {{GRAMMAR:rodilnik|{{SITENAME}}}} morate najprej potrditi svoj e-poštni naslov.
 S klikom spodnjega gumba pošljite nanj potrditveno sporo�ilo in sledite prejetim navodilom.
 Ali ste svoj e-poštni naslov že potrdili, lahko preverite v nastavitvah.',
-'confirmemail_send'       => 'Pošlji mi potrditveno sporo�ilo',
-'confirmemail_sent'       => 'Potrditveno e-sporo�ilo je bilo poslano.',
-'confirmemail_sendfailed' => 'Potrditvenega sporo�ila ni bilo mogo�e poslati. Prosimo, preverite, �e niste naslova vnesli napa�no.',
-'confirmemail_invalid'    => 'Potrditveno geslo je neveljavno. Morda je poteklo.',
-'confirmemail_needlogin'  => 'Za potrditev svojega e-poštnega se morate $1.',
-'confirmemail_success'    => 'Vaš e-poštni naslov je potrjen. Zdaj se lahko prijavite in uporabljate wiki.',
-'confirmemail_loggedin'   => 'Svoj elektronski naslov ste uspešno potrdili.',
-'confirmemail_error'      => 'Vaša potrditev se žal ni shranila.',
-'confirmemail_subject'    => 'Potrditev e-poštnega naslova',
-'confirmemail_body'       => 'Nekdo z IP-naslovom »$1« (verjetno vi) je v {{GRAMMAR:dajalnik|{{SITENAME}}}} ustvaril ra�un »$2« in zanj vpisal vaš elektronski naslov. Da bi potrdili, da ta resni�no pripada vam in s tem lahko za�eli uporabljati e-poštne storitve {{GRAMMAR:rodilnik|{{SITENAME}}}}, odprite naslednjo povezavo: 
+'confirmemail_pending'     => '<div class="error">
+Potrditveno geslo vam je že bilo poslano; �e ste pred kratkim ustvarili svoj ra�un, boste na njega morali po�akati nekaj minut da prispe, preden boste poskušali zahtevali novo geslo.
+</div>',
+'confirmemail_send'        => 'Pošlji mi potrditveno sporo�ilo',
+'confirmemail_sent'        => 'Potrditveno e-sporo�ilo je bilo poslano.',
+'confirmemail_oncreate'    => 'Potrditveno geslo je bilo poslano na vaš e-poštni naslov.
+To geslo ni potrebno za vpis, vendar ga boste morali vnesti pred omogo�anjem katere koli funkcije temelje�e na e-pošti na wikiju.',
+'confirmemail_sendfailed'  => 'Potrditvenega sporo�ila ni bilo mogo�e poslati. Prosimo, preverite, �e niste naslova vnesli napa�no.',
+'confirmemail_invalid'     => 'Potrditveno geslo je neveljavno. Morda je poteklo.',
+'confirmemail_needlogin'   => 'Za potrditev svojega e-poštnega se morate $1.',
+'confirmemail_success'     => 'Vaš e-poštni naslov je potrjen. Zdaj se lahko prijavite in uporabljate wiki.',
+'confirmemail_loggedin'    => 'Svoj elektronski naslov ste uspešno potrdili.',
+'confirmemail_error'       => 'Vaša potrditev se žal ni shranila.',
+'confirmemail_subject'     => 'Potrditev e-poštnega naslova',
+'confirmemail_body'        => 'Nekdo z IP-naslovom »$1« (verjetno vi) je v {{GRAMMAR:dajalnik|{{SITENAME}}}} ustvaril ra�un »$2« in zanj vpisal vaš elektronski naslov. Da bi potrdili, da ta resni�no pripada vam in s tem lahko za�eli uporabljati e-poštne storitve {{GRAMMAR:rodilnik|{{SITENAME}}}}, odprite naslednjo povezavo: 
 
 $3
 
 ÄŒe tega niste napravili vi, povezavi ne sledite. Potrditveno geslo bo poteklo do $4.',
+'confirmemail_invalidated' => 'Potrditev e-poštnega naslova preklicana',
 
 # Scary transclusion
 'scarytranscludedisabled' => '[prevklju�evanje med wikiji je onemogo�eno]',
@@ -1607,28 +2037,89 @@ Prosimo, potrdite, da jo resni�no želite znova ustvariti.",
 
 'unit-pixel' => ' to�k',
 
-# HTML dump
-'redirectingto' => 'Preusmerjam na »[[:$1]]« ...',
-
 # action=purge
-'confirm_purge'        => 'Osvežim predpomnjenje strani? 
- 
-$1',
 'confirm_purge_button' => 'Osveži',
-
-# AJAX search
-'searchcontaining' => "Poiš�i �lanke, ki vsebujejo ''$1''.",
-'searchnamed'      => "Poiš�i �lanke, ki se imenujejo ''$1''.",
-'articletitles'    => "Članki, ki se za�nejo na ''$1''",
-'hideresults'      => 'Skrij zadetke',
+'confirm-purge-top'    => 'Osvežim predpomnjenje strani?',
+
+# Multipage image navigation
+'imgmultigo' => 'Pojdi!',
+
+# Table pager
+'ascending_abbrev'         => 'nar',
+'descending_abbrev'        => 'pad',
+'table_pager_next'         => 'Naslednja stran',
+'table_pager_prev'         => 'Prejšnja stran',
+'table_pager_first'        => 'Prva stran',
+'table_pager_last'         => 'Zadnja stran',
+'table_pager_limit'        => 'Prikaži $1 postavk na stran',
+'table_pager_limit_submit' => 'Pojdi',
+'table_pager_empty'        => 'Ni zadetkov',
 
 # Auto-summaries
+'autosumm-blank'   => 'Odstranjevanje celotne vsebine strani',
+'autosumm-replace' => "Zamenjava strani s/z '$1'",
 'autoredircomment' => 'preusmeritev na [[$1]]',
+'autosumm-new'     => 'Nova stran: $1',
+
+# Watchlist editor
+'watchlistedit-numitems'       => 'Tvoj spisek nadzorov vsebuje {{PLURAL:$1|1 stran|2 strani|$1 strani|$1 strani}}, izklju�ujo� pogovorne strani.',
+'watchlistedit-noitems'        => 'Tvoj spisek nadzorov je prazen.',
+'watchlistedit-normal-title'   => 'Uredi spisek nadzorov',
+'watchlistedit-normal-legend'  => 'Odstrani strani iz spiska nadzorov',
+'watchlistedit-normal-explain' => 'Strani na vašem spisku nadzorov so prikazane spodaj.
+Da odstranite stran, ozna�ite kvadratek poleg nje in kliknite {{:MediaWiki:Watchlistedit-normal-submit}}.
+Lahko tudi [[{{ns:special}}:Watchlist/raw|uredite gol spisek]].',
+'watchlistedit-normal-submit'  => 'Odstrani strani',
+'watchlistedit-normal-done'    => '{{PLURAL:$1|1 stran je bila odstranjena|2 strani sta bili odstranjeni|$1 strani so bile odstranjene|$1 strani je bilo odstranjenih|$1 strani je bilo odstranjenih}} iz tvojega spiska nadzorov:',
+'watchlistedit-raw-title'      => 'Uredi gol spisek nadzorov',
+'watchlistedit-raw-legend'     => 'Uredi gol spisek nadzorov',
+'watchlistedit-raw-titles'     => 'Strani:',
+'watchlistedit-raw-submit'     => 'Posodobi spisek nadzorov',
+'watchlistedit-raw-done'       => 'Tvoj spisek nadzorov je bil posodobljen.',
+'watchlistedit-raw-added'      => '{{PLURAL:$1|1 stran je bila dodana|2 strani sta bili dodani|$1 strani so bile dodane|$1 strani je bilo dodanih}}:',
+'watchlistedit-raw-removed'    => '{{PLURAL:$1|1 stran je bila odstranjena|2 strani sta bili odstranjeni|$1 strani so bile odstranjene|$1 strani je bilo odstranjenih}}:',
+
+# Watchlist editing tools
+'watchlisttools-view' => 'Oglej si ustrezne spremembe',
+'watchlisttools-edit' => 'Poglej in uredi spisek nadzorov',
+'watchlisttools-raw'  => 'Uredi gol spisek nadzorov',
 
 # Special:Version
-'version' => 'Razli�ica', # Not used as normal message but as header for the special page itself
+'version'                  => 'Razli�ica', # Not used as normal message but as header for the special page itself
+'version-specialpages'     => 'Posebne strani',
+'version-variables'        => 'Spremenljivke',
+'version-other'            => 'Ostalo',
+'version-version'          => 'Razli�ica',
+'version-license'          => 'Dovoljenje',
+'version-software-product' => 'Izdelek',
+'version-software-version' => 'Razli�ica',
+
+# Special:FilePath
+'filepath'         => 'Pot do datoteke',
+'filepath-page'    => 'Datoteka:',
+'filepath-submit'  => 'Pot',
+'filepath-summary' => 'Ta posebna stran vrne polno pot do datoteke. Slike so prikazane v polni resoluciji, druge vrste datotek pa se zaženejo v za njih dolo�enih programih. Vtipkajte ime datoteke brez predpone »{{ns:image}}:«.',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch'          => 'Iskanje podvojenih datotek',
+'fileduplicatesearch-summary'  => 'Iskanje podvojenih datotek temelji na podlagi njenih hash vrednosti.
+
+Vnesite ime datoteke brez predpone »{{ns:image}}:«.',
+'fileduplicatesearch-legend'   => 'Poiš�i dvojnik',
+'fileduplicatesearch-filename' => 'Ime datoteke:',
+'fileduplicatesearch-submit'   => 'Iskanje',
 
 # Special:SpecialPages
-'specialpages' => 'Posebne strani',
+'specialpages'                   => 'Posebne strani',
+'specialpages-group-maintenance' => 'Vzdrževalna poro�ila',
+'specialpages-group-other'       => 'Ostale posebne strani',
+'specialpages-group-login'       => 'Prijavite se / registrirajte se',
+'specialpages-group-changes'     => 'Zadnje spremembe in dnevniki',
+'specialpages-group-media'       => 'Poro�ila o datotekah in nalaganja',
+'specialpages-group-users'       => 'Uporabniki in pravice',
+'specialpages-group-highuse'     => 'Strani visoke uporabe',
+
+# Special:BlankPage
+'blankpage' => 'Prazna stran',
 
 );
diff --git a/languages/messages/MessagesSm.php b/languages/messages/MessagesSm.php
index 7ded9907..3cc0774b 100644
--- a/languages/messages/MessagesSm.php
+++ b/languages/messages/MessagesSm.php
@@ -118,7 +118,7 @@ $messages = array(
 'email'             => "'Imeli",
 
 # Edit pages
-'summary'      => "'Oto'otoga",
+'summary'      => "'Oto'otoga:",
 'minoredit'    => "'O se teuteuga la'itiiti lenei",
 'watchthis'    => 'Matau lenei itulau',
 'savearticle'  => 'Sefe le itulau',
@@ -193,6 +193,7 @@ $messages = array(
 # Move page
 'move-page-legend' => "Si'i le itulau",
 'movearticle'      => "Si'i le itulau",
+'movenologin'      => "Le'i fa'aolaina",
 'newtitle'         => "'I le ulutala fou",
 'move-watch'       => 'Matau lenei itulau',
 'movepagebtn'      => "Si'i le itulau",
@@ -202,7 +203,7 @@ $messages = array(
 # Namespace 8 related
 'allmessagesname' => 'Igoa',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => "Su'e",
 
 # 'all' in various places, this might be different for inflected languages
diff --git a/languages/messages/MessagesSma.php b/languages/messages/MessagesSma.php
index 69bab3f3..80e54427 100644
--- a/languages/messages/MessagesSma.php
+++ b/languages/messages/MessagesSma.php
@@ -6,6 +6,7 @@
  *
  * @author Bïerne
  * @author M.M.S.
+ * @author Urhixidur
  */
 
 $messages = array(
@@ -16,8 +17,6 @@ $messages = array(
 'underline-always' => 'Iktesth',
 'underline-never'  => 'Aaltere',
 
-'skinpreview' => '(Ã…vte-vuesiehtidh)',
-
 # Dates
 'sunday'        => 'Aejlege',
 'monday'        => 'MÃ¥anta',
@@ -92,7 +91,7 @@ $messages = array(
 'mytalk'         => 'Mov dïjveldidh',
 'anontalk'       => 'Dïjveldidh ihke dïhte IP',
 'navigation'     => 'Navigasjovne',
-'and'            => 'jih',
+'and'            => '&#32;jih',
 
 'errorpagetitle'   => 'BÃ¥ajhtode',
 'returnto'         => 'Bååstide gåajkoe $1.',
@@ -140,8 +139,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}}en bïjre',
 'aboutpage'            => 'Project:Bïjre',
-'bugreports'           => 'Bug reektehtse',
-'bugreportspage'       => 'Project:Bug reektehtse',
 'copyrightpage'        => '{{ns:project}}:Bäjjesereaktah',
 'currentevents'        => 'Daaletje deahpadimmieh',
 'currentevents-url'    => 'Project:Daaletje deahpadimmieh',
@@ -242,6 +239,11 @@ Gïemhpes logge sïjse vihth männgan datne åtna låhka dïhte.',
 'accountcreated'          => 'Nuhtjien skaepede',
 'loginlanguagelabel'      => 'Gïele: $1',
 
+# Password reset dialog
+'oldpassword' => 'BÃ¥eries loevesbaakoe:',
+'newpassword' => 'Orre loevesbaakoe:',
+'retypenew'   => 'Odhasit orre loevesbaakoe:',
+
 # Edit page toolbar
 'bold_sample'     => 'Buajtehks tjaalege',
 'bold_tip'        => 'Buajtehks tjaalege',
@@ -263,8 +265,8 @@ Gïemhpes logge sïjse vihth männgan datne åtna låhka dïhte.',
 'hr_tip'          => 'Horisontele sïeve (nuhtjie bïhteles-laakan)',
 
 # Edit pages
-'summary'                => 'Tjohkehtehteme',
-'subject'                => '�ebne/rubriike',
+'summary'                => 'Tjohkehtehteme:',
+'subject'                => '�ebne/rubriike:',
 'minoredit'              => 'Dïhte lea ohtje värrhtoedimmie',
 'watchthis'              => 'Sïektjedh dïhte bielie',
 'savearticle'            => 'Spååredh bielie',
@@ -272,26 +274,26 @@ Gïemhpes logge sïjse vihth männgan datne åtna låhka dïhte.',
 'showpreview'            => 'Vuesehte åvte-vuesiehtidh',
 'showdiff'               => 'Vuesehte värrhtoedimmie',
 'anoneditwarning'        => "'''Vaaroehtidh:''' Dov lea ijje logge sïjse. Dov IP tjaalesijjie båetedh spååredh sïjse dïhte bielie värrhtoedimmie histovrije.",
-'summary-preview'        => 'Tjohkehtehteme åvte-vuesiehtidh',
+'summary-preview'        => 'Tjohkehtehteme åvte-vuesiehtidh:',
 'loginreqlink'           => 'logge sïjse',
 'loginreqpagetext'       => 'Dov galkedh $1 ihke vuesehte jeatjebh bielieh.',
 'accmailtitle'           => 'Loevesbaakoe seedtie.',
 'accmailtext'            => 'Loevesbaakoe ihke �$1� utnedh seedtedh gåajkoe $2.',
 'newarticle'             => '(Orre)',
 'noarticletext'          => 'Dïhte lea daelie ijje tjaalege sïjse dïhte bielie, dov dorje [[Special:Search/{{PAGENAME}}|ohtsedh ihke dïhte bielie nomme]] sïjse jeatjebh bielieh jallh [{{fullurl:{{FULLPAGENAME}}|action=edit}} värrhtoedimmie dïhte bielie].',
-'usercssjsyoucanpreview' => "<strong>Tiipse:</strong> Nuhtjie 'Vuesehte åvte-vuesiehtidh' båaloe ihke pryövoe dov orre CSS/JS åvte spååredh.",
+'usercssjsyoucanpreview' => "'''Tiipse:''' Nuhtjie 'Vuesehte åvte-vuesiehtidh' båaloe ihke pryövoe dov orre CSS/JS åvte spååredh.",
 'updated'                => '(Orrestahteme)',
-'note'                   => '<strong>Galtege:</strong>',
-'previewnote'            => '<strong>Dïhte lea aktegh åvte-vuesiehtidh; värrhtoedimmieh ånta ijje sjïdtedh spååredh!</strong>',
+'note'                   => "'''Galtege:'''",
+'previewnote'            => "'''Dïhte lea aktegh åvte-vuesiehtidh; värrhtoedimmieh ånta ijje sjïdtedh spååredh!'''",
 'editing'                => 'Sjiehtedimmie $1',
 'editingsection'         => 'Värrhtoedimmie $1 (sektiovne)',
 'yourtext'               => 'Dov tjaalege',
-'copyrightwarning'       => 'Tjaeleste gaajhke värrhtoedimmieh gåajkoe {{SITENAME}} lea ahte gïehtjele goh maam buektedh nuelesne $2 (vuajna $1 ihke detaaljeh). Bïjre datne ijje sïjhtedh dov tjaalege galka värrhtoedimmieh jallh kåpieeres minngesne jeatjebh daerpies voete, galka datne ijje tjaala daesnie.<br />
+'copyrightwarning'       => "Tjaeleste gaajhke värrhtoedimmieh gåajkoe {{SITENAME}} lea ahte gïehtjele goh maam buektedh nuelesne $2 (vuajna $1 ihke detaaljeh). Bïjre datne ijje sïjhtedh dov tjaalege galka värrhtoedimmieh jallh kåpieeres minngesne jeatjebh daerpies voete, galka datne ijje tjaala daesnie.<br />
 Datne luhpede mijjieh aaj datne tjaala tjaalege jïjtje, jallh kåpieeret raejeste gaaltjie goh ijje vaarjele dejstie bäjjesereaktah, jallh plïerehke.<br />
-<strong>LISSEHTE IJJE OLKESE BÄJJESEREAKTAHVAARJELE �EBNE NAMHTAH LUHPIE!</strong>',
-'longpagewarning'        => '<strong>VAAROEHTIDH: Dïhte bielie lea $1 kilobyteh guhkie; såemies
+'''LISSEHTE IJJE OLKESE BÄJJESEREAKTAHVAARJELE �EBNE NAMHTAH LUHPIE!'''",
+'longpagewarning'        => "'''VAAROEHTIDH: Dïhte bielie lea $1 kilobyteh guhkie; såemies
 gaskeviermie-låhkoeh åtna tsagkeseh värrhtoedimmie bielih stoerre jallh guhkies enn 32 kb.
-Joekedidh värrhtoedimmie sïjse unnebe sektiovneh.</strong>',
+Joekedidh värrhtoedimmie sïjse unnebe sektiovneh.'''",
 'templatesused'          => 'Maaleh nuhtjie nille dïhte bielie:',
 'templatesusedpreview'   => 'Maaleh nuhtjie sïjse dïhte åvte-vuesiehtidh:',
 'template-protected'     => '(vaarjeleme)',
@@ -303,7 +305,7 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 'viewpagelogs'        => 'Vuesehte loggeh ihke dïhte bielie',
 'currentrev'          => 'Daaletje gïehtjedamme',
 'revisionasof'        => 'Gïehtjedamme ihke $1',
-'revision-info'       => 'Gïehtjedamme raejeste dïhte $1; $2',
+'revision-info'       => 'Gïehtjedamme raejeste dïhte $1; $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Båarasåabpoe gïehtjedamme',
 'nextrevision'        => 'Minngebe gïehtjedamme→',
 'currentrevisionlink' => 'Daaletje gïehtjedamme',
@@ -339,17 +341,16 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 'prevn'            => 'övtebe $1',
 'nextn'            => 'minngeben $1',
 'viewprevnext'     => 'Vuesehth ($1) ($2) ($3)',
+'searchhelp-url'   => 'Help:Sisvege',
 'powersearch'      => 'Ohtsedh',
 
 # Preferences page
 'preferences'        => 'Sïjsestäälningeh',
 'mypreferences'      => 'Mov sïjsesäälningeh',
 'changepassword'     => 'Värrhtoedimmie loevesbaakoe',
+'skin-preview'       => 'Ã…vte-vuesiehtidh',
 'math_unknown_error' => 'ammes båajhtede',
 'saveprefs'          => 'Spååredh',
-'oldpassword'        => 'BÃ¥eries loevesbaakoe:',
-'newpassword'        => 'Orre loevesbaakoe:',
-'retypenew'          => 'Odhasit orre loevesbaakoe:',
 'searchresultshead'  => 'Ohtsedh',
 'timezonelegend'     => 'Tïjjedajve',
 'localtime'          => 'Byjrehks tïjje',
@@ -414,15 +415,15 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 
 'license' => 'Liseense',
 
-# Special:ImageList
-'imagelist_search_for' => 'Ohtsedh ihke guvvie nomme:',
+# Special:ListFiles
+'listfiles_search_for' => 'Ohtsedh ihke guvvie nomme:',
 'imgfile'              => 'guvvie',
-'imagelist'            => 'Guvvie lästoe',
-'imagelist_name'       => 'Nomme',
-'imagelist_user'       => 'Nuhtjien',
-'imagelist_size'       => 'Stoerre',
+'listfiles'            => 'Guvvie lästoe',
+'listfiles_name'       => 'Nomme',
+'listfiles_user'       => 'Nuhtjien',
+'listfiles_size'       => 'Stoerre',
 
-# Image description page
+# File description page
 'filehist'                  => 'Baalka histovrije',
 'filehist-help'             => 'Diedtedh nille biejjie ihke vuajna man baalkan lij bealese dïhte tïjje.',
 'filehist-current'          => 'daaletje',
@@ -457,11 +458,8 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 'randomredirect' => 'Summal odhasitstivren',
 
 # Statistics
-'statistics'    => 'Statistiike',
-'sitestats'     => '{{SITENAME}} statistiike',
-'userstats'     => 'Nuhtjien statistiike',
-'userstatstext' => "Dïhte {{PLURAL:$1|lea '''1''' registreered [[Special:ListUsers|nuhtjien]]|lea '''$1''' registreered [[Special:ListUsers|nuhtjienh]]}},  jih
-'''$2''' (jallh '''$4%''') {{PLURAL:$2|Ã¥tna|Ã¥tnah}} $5 reahkta.",
+'statistics'              => 'Statistiike',
+'statistics-header-users' => 'Nuhtjien statistiike',
 
 'disambiguations' => 'Disambirgusjovne bielieh',
 
@@ -518,7 +516,6 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 'speciallogtitlelabel' => 'Tiitele:',
 'log'                  => 'Loggeh',
 'all-logs-page'        => 'Gaajhke loggeh',
-'log-search-submit'    => 'Vaadtsa',
 
 # Special:AllPages
 'allpages'       => 'Gaajhke bielieh',
@@ -550,21 +547,17 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 'emailsent'       => 'E-påaste seedtedh',
 
 # Watchlist
-'watchlist'            => 'Mov sïektjedhlästoe',
-'mywatchlist'          => 'Mov sïektjedhlästoe',
-'watchlistfor'         => "(ihke '''$1''')",
-'addedwatch'           => 'Lissiehtidh gåajkoe sïektjedhlästoe',
-'removedwatch'         => 'Sihkojuvvon raejeste sïektjedhlästoe',
-'removedwatchtext'     => 'Bielie "[[:$1]]" lea sihkojuvvon raejeste dov sïektjedhlästoe.',
-'watch'                => 'Sïektjedh',
-'watchthispage'        => 'Sïektjedh dïhte bielie',
-'unwatch'              => 'Ov-sïektjedh',
-'watchlist-details'    => '{{PLURAL:$1|$1 bielie|$1 bielieh}} sïektjedh (doekoe dïerhkestidhbielieh).',
-'wlshowlast'           => 'Vuesehte minngemes $1 täjmoeh $2 biejjieh $3',
-'watchlist-hide-bots'  => 'Gaptjedh jïjtjesvïhtjije värrhtoedimmie',
-'watchlist-show-own'   => 'Vuesehte mov värrhtoedimmieh',
-'watchlist-hide-own'   => 'Gaptjedh mov värrhtoedimmieh',
-'watchlist-hide-minor' => 'Gaptjedh smaave värrhtoedimmieh',
+'watchlist'         => 'Mov sïektjedhlästoe',
+'mywatchlist'       => 'Mov sïektjedhlästoe',
+'watchlistfor'      => "(ihke '''$1''')",
+'addedwatch'        => 'Lissiehtidh gåajkoe sïektjedhlästoe',
+'removedwatch'      => 'Sihkojuvvon raejeste sïektjedhlästoe',
+'removedwatchtext'  => 'Bielie "[[:$1]]" lea sihkojuvvon raejeste dov sïektjedhlästoe.',
+'watch'             => 'Sïektjedh',
+'watchthispage'     => 'Sïektjedh dïhte bielie',
+'unwatch'           => 'Ov-sïektjedh',
+'watchlist-details' => '{{PLURAL:$1|$1 bielie|$1 bielieh}} sïektjedh (doekoe dïerhkestidhbielieh).',
+'wlshowlast'        => 'Vuesehte minngemes $1 täjmoeh $2 biejjieh $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Sïektjeminie...',
@@ -574,28 +567,33 @@ Dov dorje värrhtoedimmie gååvnese bielieh, jallh [[Special:UserLogin|logge sÃ
 'enotif_impersonal_salutation' => '{{SITENAME}} nuhtjien',
 'created'                      => 'skaepede',
 
-# Delete/protect/revert
-'deletepage'                  => 'Tjåegkedh bielie',
-'historywarning'              => 'Vaaroehtidh: Bielie datne gïehtele ahte sihkut åtna histovrije:',
-'actioncomplete'              => 'Deahpadimmie voerkes',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" lea sihkojuvvon.
+# Delete
+'deletepage'            => 'Tjåegkedh bielie',
+'historywarning'        => 'Vaaroehtidh: Bielie datne gïehtele ahte sihkut åtna histovrije:',
+'actioncomplete'        => 'Deahpadimmie voerkes',
+'deletedtext'           => '"<nowiki>$1</nowiki>" lea sihkojuvvon.
 Vuajna $2 ihke galtege bïjre männgan sihkojuvvonh.',
-'deletedarticle'              => 'sihkoj "[[$1]]"',
-'dellogpage'                  => 'Sihkkun logge',
-'deletecomment'               => 'Gaavhtan ihke sihkkuma',
-'deleteotherreason'           => 'Jeatjebh/ehkstre gaavhtan:',
-'deletereasonotherlist'       => 'Jeatjebh gaavhtan',
-'rollbacklink'                => 'jurrelde bååstede',
+'deletedarticle'        => 'sihkoj "[[$1]]"',
+'dellogpage'            => 'Sihkkun logge',
+'deletecomment'         => 'Gaavhtan ihke sihkkuma',
+'deleteotherreason'     => 'Jeatjebh/ehkstre gaavhtan:',
+'deletereasonotherlist' => 'Jeatjebh gaavhtan',
+
+# Rollback
+'rollbacklink' => 'jurrelde bååstede',
+
+# Protect
 'protectlogpage'              => 'Vaarjelidh logge',
+'prot_1movedto2'              => '[[$1]] jåhta gåajkoe [[$2]]',
 'protect-legend'              => 'Skylledh vaarjelidh',
 'protectcomment'              => 'Lahtestimmie:',
 'protectexpiry'               => 'Boarasnuvve:',
 'protect_expiry_invalid'      => 'Ov-jiltiige buaorasjnuvvenaigi.',
 'protect_expiry_old'          => 'Boarasnuvvenaigi lea vaesedh.',
 'protect-unchain'             => 'Tjuevtedh jåhtaluhpie',
-'protect-text'                => 'Daesnie dorje datne vuajna jih värrhtoedimmie vaarjelidhdaltese dejstie bielie <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Dov nuhtjien åtna ijje luhpie gåajkoe värrhtoedimmie tjaeleste-vaarjelidh.
-Daaletje tjaeleste-vaarjelidh sïjsestäälninge ihke bielie <strong>$1</strong> lea:',
+'protect-text'                => "Daesnie dorje datne vuajna jih värrhtoedimmie vaarjelidhdaltese dejstie bielie '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Dov nuhtjien åtna ijje luhpie gåajkoe värrhtoedimmie tjaeleste-vaarjelidh.
+Daaletje tjaeleste-vaarjelidh sïjsestäälninge ihke bielie '''$1''' lea:",
 'protect-default'             => '(Ã¥vte-veeljeme)',
 'protect-fallback'            => 'Luhpie "$1"',
 'protect-level-autoconfirmed' => 'Tjöödtjehtidh ov-registreered nuhtjienh',
@@ -604,6 +602,7 @@ Daaletje tjaeleste-vaarjelidh sïjsestäälninge ihke bielie <strong>$1</strong>
 'protect-expiring'            => 'boarasnuvve $1 (UTC)',
 'protect-cascade'             => 'Vaarjelidh bielieh guosket sïjse dïhte bielie (viidit suodjaluse)',
 'protect-cantedit'            => 'Datne dorje ijje värrhtoedimmie vaarjelidhdaltese ihke dïhte bielie, ihke datne ijja åtna luhpie ahte värrhtoedimmie dïhte.',
+'protect-expiry-options'      => '2 täjmoe:2 hours,1 biejjie:1 day,3 biejjie:3 days,1 våhkoe:1 week,2 våhkoe:2 weeks,1 aske:1 month,3 aske:3 months,6 aske:6 months,1 jaepie:1 year,gietjieloeves:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permisjovne:',
 'restriction-level'           => 'Restriksjovne daltese:',
 
@@ -642,7 +641,6 @@ Daaletje tjaeleste-vaarjelidh sïjsestäälninge ihke bielie <strong>$1</strong>
 'whatlinkshere'       => 'Bilieh goh lïenghkeh diekie',
 'whatlinkshere-title' => 'Bielieh goh lïenghke gåajkoe $1',
 'whatlinkshere-page'  => 'Bielie:',
-'linklistsub'         => '(Lästoe bijjelen lïenghke)',
 'linkshere'           => "Tjuovvovasj bielie lïenghke gåajkoe '''[[:$1]]''':",
 'nolinkshere'         => "Ijje bielieh lïenghke gåajkoe '''[[:$1]]'''.",
 'isredirect'          => 'bïjre-dirisjovne bielie',
@@ -785,7 +783,7 @@ Gïemhpes veeljeme jeatjebh nomme.',
 'show-big-image'       => 'Dïeves stoerre',
 'show-big-image-thumb' => '<small>Stoerre ihke dïhte vuesiehtidh: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Gallerije dejstie orre baalkah',
 'ilsubmit'  => 'Ohtsedh',
 
@@ -852,12 +850,7 @@ Jeatjebh dajveh lea gaptjedh goh sïejhme, bine vuesehte gåessie taabelle stoer
 'scarytranscludetoolong' => '[URL lea ihke guhkie; gaatelassjedh]',
 
 # action=purge
-'confirm_purge' => 'Döömedh cache ihke dïhte bielie?
-
-$1',
-
-# AJAX search
-'useajaxsearch' => 'Nuhtjie AJAX ohtsedh',
+'confirm-purge-top' => 'Döömedh cache ihke dïhte bielie?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� övtebe bielie',
diff --git a/languages/messages/MessagesSn.php b/languages/messages/MessagesSn.php
index aeb2558e..38d658e0 100644
--- a/languages/messages/MessagesSn.php
+++ b/languages/messages/MessagesSn.php
@@ -100,7 +100,7 @@ Akaunzi yako yagadzirwa. Usakanganwe kuchinga mapreferences ako eWikipedia.',
 'username'           => 'Zita:',
 
 # Edit pages
-'summary'     => 'Muchidimbu',
+'summary'     => 'Muchidimbu:',
 'minoredit'   => 'Uku kushandurwa kudiki',
 'watchthis'   => 'Ringa peji rino',
 'savearticle' => 'Kotsa peji',
@@ -141,6 +141,9 @@ Akaunzi yako yagadzirwa. Usakanganwe kuchinga mapreferences ako eWikipedia.',
 'watch'         => 'Rinda',
 'watchthispage' => 'Ringa peji rino',
 
+# Protect
+'prot_1movedto2' => '[[$1]] rachichinurwa ku [[$2]]',
+
 # Restrictions (nouns)
 'restriction-edit' => 'Chinja',
 'restriction-move' => 'Chichinura',
diff --git a/languages/messages/MessagesSo.php b/languages/messages/MessagesSo.php
index ba340428..3c1c7461 100644
--- a/languages/messages/MessagesSo.php
+++ b/languages/messages/MessagesSo.php
@@ -48,8 +48,6 @@ $messages = array(
 'underline-always' => 'Marwalba',
 'underline-never'  => 'Marnaba',
 
-'skinpreview' => '(Horfiirin)',
-
 # Dates
 'sunday'        => 'Axad',
 'monday'        => 'Isniin',
@@ -118,7 +116,7 @@ $messages = array(
 'mypage'         => 'Boggeyga',
 'mytalk'         => 'Wadahadalkeyga',
 'anontalk'       => 'Wadahadalka IP:gan',
-'and'            => 'iyo',
+'and'            => '&#32;iyo',
 
 'errorpagetitle'    => 'Qalad',
 'returnto'          => 'Ku noqo $1.',
@@ -226,9 +224,9 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => 'Isticmaalaha ka bax',
-'logouttext'                 => '<strong>Hada waa aad ka baxday.</strong>
+'logouttext'                 => "'''Hada waa aad ka baxday.'''
 
-Waad sii isticmaali kartaa {{SITENAME}}han adoonlagu aqoon, ama gudaha ayaad gali kartaa markale adiga oo isticmaalaya gudagalkaagii hore ama mid kaduwan. OGEYSIIS waxaa lagayabaa beyjajka qaarkood in ay yiraahdaa wali gudaha ayaad kujirtaa, ilaa aad internet barowsarkaaaga aad nadiifiso.',
+Waad sii isticmaali kartaa {{SITENAME}}han adoonlagu aqoon, ama gudaha ayaad gali kartaa markale adiga oo isticmaalaya gudagalkaagii hore ama mid kaduwan. OGEYSIIS waxaa lagayabaa beyjajka qaarkood in ay yiraahdaa wali gudaha ayaad kujirtaa, ilaa aad internet barowsarkaaaga aad nadiifiso.",
 'welcomecreation'            => "== Soo dhawoow, $1! ==
 
 Gudagalahaaga waa la sameeyey. Ha' hilmaamin in aad wax ka bedesho {{SITENAME}} dooqaaga.",
@@ -238,7 +236,6 @@ Gudagalahaaga waa la sameeyey. Ha' hilmaamin in aad wax ka bedesho {{SITENAME}}
 'yourpasswordagain'          => 'Markale ereysirkaaga',
 'remembermypassword'         => 'Kumbuyuutarkaan ku xasuusnaaw gudagalkeyga',
 'yourdomainname'             => 'Magacaga shabakada',
-'loginproblem'               => '<b>Dhibaato baa kajirtay gudagalkaaga.</b><br />Iskuday marlabaad!',
 'login'                      => 'Gudaha gal',
 'userlogin'                  => 'Gudaha gal / akoon sameyso',
 'logout'                     => 'Ka bax',
@@ -282,6 +279,11 @@ Wax e-boosto ah oo ku saabsan arrimaha soo socdo looma soo diridoono.',
 'accountcreatedtext'         => "Akoonka isticmaalaha $1 waa la'sameeyay.",
 'loginlanguagelabel'         => 'Luqada: $1',
 
+# Password reset dialog
+'oldpassword' => 'Ereysirkii hore:',
+'newpassword' => 'Ereysir cusub:',
+'retypenew'   => 'Qor mar labaad ereysirka cusub:',
+
 # Edit pages
 'minoredit'                 => 'Kan waa wax ka bedel yar',
 'watchthis'                 => 'Boggaan waardiyey',
@@ -299,17 +301,17 @@ Wax e-boosto ah oo ku saabsan arrimaha soo socdo looma soo diridoono.',
 'accmailtitle'              => "Ereysirka waa la'diray.",
 'accmailtext'               => 'Ereysirka "$1" waxaa loo diray $2.',
 'anontalkpagetext'          => "----''Meeshaan waa bogga wadahadalka isticmaalayaasha aanan la aqoonsanin oo aanan weli sameysanin akoon ama aanan weli isticmaali. Si loo kala sooco isticmaalayaasha, waa in aan isticmaalnaa lambar cinwaaneedka IP:ga. Cinwaanka IP:ga waxaa suurto gal ah in ay wada isticmaalaan dad badan. Hadii aad tahay isticmaale aanan la'aqoonsanin oo aad dareemaysid in laguu gafay, fadlan ka sameyso akoon meeshaan  [[Special:UserLogin|sameyso akoon ama gudaha gal]] si aad uga dhowrsatid in laguugu qaldo isticmaalayaasha kale oo aann la'aqoonsanin.''",
-'previewnote'               => '<strong>Waxa aad aragtid waa horfiirin; wixii aad bedeshay lama keydinin!</strong>',
-'session_fail_preview'      => "<strong>Waan ka xunahay! Wixii aad bedeshay ma'suurto galin in la'keydiyo cilad dhacday awgeed.
-Fadlan markale isku day. Hadii aysan weli shaqaynin, ka bax ee markale soo gudagal.</strong>",
-'session_fail_preview_html' => "<strong>Waan ka xunahay! Wixii aad bedeshay ma'suurto galin in la'keydiyo cilad dhacday awgeed.</strong>
+'previewnote'               => "'''Waxa aad aragtid waa horfiirin; wixii aad bedeshay lama keydinin!'''",
+'session_fail_preview'      => "'''Waan ka xunahay! Wixii aad bedeshay ma'suurto galin in la'keydiyo cilad dhacday awgeed.
+Fadlan markale isku day. Hadii aysan weli shaqaynin, ka bax ee markale soo gudagal.'''",
+'session_fail_preview_html' => "'''Waan ka xunahay! Wixii aad bedeshay ma'suurto galin in la'keydiyo cilad dhacday awgeed.'''
 
 ''Sababtoo ah {{SITENAME}}han wuxuu leeyahay HTML ceyriin ah, horfiirintiisa waxaa loo qariyey si looga hortago weerar ka yimaada JavaScriptga.''
 
-<strong>Hadii wax ka bedlkaan uu yahay mid xaq ah, fadlan markale isku day. Hadii aysan weli shaqaynin, is kuday inaad  ka baxdo ee markale soo gudagal.</strong>",
+'''Hadii wax ka bedlkaan uu yahay mid xaq ah, fadlan markale isku day. Hadii aysan weli shaqaynin, is kuday inaad  ka baxdo ee markale soo gudagal.'''",
 'yourtext'                  => 'Qoraalkaaga',
-'editingold'                => '<strong>DIGNIIN: Waxaad wax ka bedeli rabtaa boggan caddadkiisa duqoobay.
-Hadii aad keydisid, waxaa dhumidoona caddadyadii kan ka dambeeyey.</strong>',
+'editingold'                => "'''DIGNIIN: Waxaad wax ka bedeli rabtaa boggan caddadkiisa duqoobay.
+Hadii aad keydisid, waxaa dhumidoona caddadyadii kan ka dambeeyey.'''",
 'yourdiff'                  => 'Kaladuwanaanshaha',
 'semiprotectedpagewarning'  => "'''Ogeysiis:''' Beyjkan waa laxiray, kuwa magaca gudagal ka leh kaliya ayaa wax ka badalikara.",
 'nocreate-loggedin'         => 'Laguuma ogola inaad beyjaj cusub ku sameysid {{SITENAME}}han.',
@@ -344,6 +346,7 @@ Iskuday in aad [[Special:Search|karaadiso wikigan]] beyjaj laxiira oo cusub.',
 'prevn'                 => 'Ka horeeya $1',
 'nextn'                 => 'Ku xiga $1',
 'viewprevnext'          => 'Fiiri ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Caawinaad',
 'powersearch'           => 'Raadi',
 
 # Preferences page
@@ -352,6 +355,7 @@ Iskuday in aad [[Special:Search|karaadiso wikigan]] beyjaj laxiira oo cusub.',
 'prefsnologin'         => 'Gudaha kuma jirtid',
 'prefsnologintext'     => 'Waa in aad [[Special:UserLogin|Gudaha ku jirtaa]] si aad dooqyadaada u dalbatid.',
 'prefsreset'           => 'Dooqyada waxaa laga keenay keydka.',
+'skin-preview'         => 'Horfiirin',
 'math'                 => 'Xisaab',
 'datedefault'          => "Ma'jiro dooq",
 'datetime'             => 'Taariikhda iyo saacada',
@@ -359,9 +363,6 @@ Iskuday in aad [[Special:Search|karaadiso wikigan]] beyjaj laxiira oo cusub.',
 'prefs-watchlist'      => 'liiska-waardiyaha',
 'prefs-watchlist-days' => 'Tirada maalamaha ay ku jirayaan liiska-waardiyaha:',
 'saveprefs'            => 'Kaydi',
-'oldpassword'          => 'Ereysirkii hore:',
-'newpassword'          => 'Ereysir cusub:',
-'retypenew'            => 'Qor mar labaad ereysirka cusub:',
 'textboxsize'          => 'Wax ka bedelka',
 'searchresultshead'    => 'Raadi',
 'recentchangesdays'    => 'Tirada maalmaha lagu tusaayo isbedelada dhow:',
@@ -394,7 +395,7 @@ Iskuday in aad [[Special:Search|karaadiso wikigan]] beyjaj laxiira oo cusub.',
 'savefile'        => 'Faylka kaydi',
 'watchthisupload' => 'Boggaan waardiyey',
 
-# Image description page
+# File description page
 'nolinkstoimage'   => "Ma'ay jiraan beyjaj ku xiran faylkaan.",
 'shareduploadwiki' => 'Fadlan meeshaa $1 ka fiiri warbixin dheeraad ah.',
 
@@ -427,9 +428,6 @@ Iskuday in aad [[Special:Search|karaadiso wikigan]] beyjaj laxiira oo cusub.',
 # Book sources
 'booksources-go' => 'Soco',
 
-# Special:Log
-'log-search-submit' => 'Soco',
-
 # Special:AllPages
 'allpages'          => 'Dhamaan boggaga',
 'alphaindexline'    => '$1 ilaa $2',
@@ -493,14 +491,17 @@ Hadii aad rabootid in aad boggan ka saartid wardiyeynta, dhagsii \"Ha' wardiyeyn
 'watchlistcontains' => 'Liiskaaga waardiyeynta waxaa ku jiro $1 {{PLURAL:$1|bog|boggag}}.',
 'wlshowlast'        => 'Fiiri $1 saacadood ama $2 maalmood $3 ee ugu dambeeyay',
 
-# Delete/protect/revert
-'confirm'                => 'Xaqiiji',
-'excontent'              => "qoraalka wuxuu ahaa: '$1'",
-'exblank'                => 'Bogga waxba kuma jirin',
-'historywarning'         => '<strong>Digniin:</strong> Bogga aad tirtirirabtid wuxuu leeyahay taariikkh hore:',
-'actioncomplete'         => "Amarka waa la'dhamaystiray",
+# Delete
+'confirm'        => 'Xaqiiji',
+'excontent'      => "qoraalka wuxuu ahaa: '$1'",
+'exblank'        => 'Bogga waxba kuma jirin',
+'historywarning' => '<strong>Digniin:</strong> Bogga aad tirtirirabtid wuxuu leeyahay taariikkh hore:',
+'actioncomplete' => "Amarka waa la'dhamaystiray",
+
+# Protect
 'protectedarticle'       => 'la\'difaacay "[[$1]]"',
 'protect-title'          => 'la\'difaacaa "$1"',
+'prot_1movedto2'         => '[[$1]] waxaa loo wareejiyey [[$2]]',
 'protect-legend'         => 'Xaqiiji difaacida',
 'protectcomment'         => 'Sababta loo difaacaayo',
 'protect_expiry_invalid' => "Wakhtiga dhicitaanka sax ma'aha.",
@@ -542,6 +543,7 @@ Hadii aad rabootid in aad boggan ka saartid wardiyeynta, dhagsii \"Ha' wardiyeyn
 'block-log-flags-nocreate' => 'sameynta gudagalah lamaogola',
 
 # Move page
+'movenologin'     => 'Gudaha kuma jirtid',
 'movedto'         => 'loo wareejiyey',
 'movetalk'        => "Wareejiyey bogga wadahadalka la'xiriira",
 '1movedto2'       => '[[$1]] waxaa loo wareejiyey [[$2]]',
@@ -553,7 +555,7 @@ Hadii aad rabootid in aad boggan ka saartid wardiyeynta, dhagsii \"Ha' wardiyeyn
 'allmessagesdefault'        => "Qoraalka la'isku ogyahay",
 'allmessagescurrent'        => 'Qoraalka hada qoran',
 'allmessagestext'           => 'Liiskan waxaa ku qoran dhamaan fariimaha lagahelikaro xarun magaceedka MediaWiki.
-Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net Betawiki] if you wish to contribute to the generic MediaWiki localisation.',
+Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [http://translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' la'ma isticmaalikaro, '''\$wgUseDatabaseMessages''' oo dansan daraadeed.",
 'allmessagesfilter'         => 'Kalasoocaha fariimaha:',
 'allmessagesmodified'       => 'Itus kuwa wax laga bedelay',
@@ -591,7 +593,7 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 # Info page
 'numwatchers' => 'Tirada waardiyeyaasha: $1',
 
-# Special:NewImages
+# Special:NewFiles
 'imagelisttext' => "Hoos waxaa yaala liiska '''$1''' {{PLURAL:$1|file|faylalka}} oo u kala soocan $2.",
 'bydate'        => 'hab taariikheed',
 
@@ -603,11 +605,6 @@ Please visit [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation]
 # E-mail address confirmation
 'confirmemail_noemail' => 'Kuma haysatid cinwaan E-boosto sax [[Special:Preferences|isticmaala dooqiisa]].',
 
-# AJAX search
-'searchcontaining' => "Raadi maqaal uu ku jiro ''$1''.",
-'searchnamed'      => "Raadi maqaalada magacoodu uu yahay ''$1''.",
-'articletitles'    => "Maqaalada ka bilaawdo ''$1''",
-
 # Multipage image navigation
 'imgmultigo' => 'Soco!',
 
diff --git a/languages/messages/MessagesSq.php b/languages/messages/MessagesSq.php
index 88283b8f..d8de1f74 100644
--- a/languages/messages/MessagesSq.php
+++ b/languages/messages/MessagesSq.php
@@ -8,33 +8,28 @@
  * @author Dori
  * @author Eagleal
  * @author Ergon
+ * @author Puntori
  * @author Urhixidur
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => 'Standarte',
-	'nostalgia' => 'Nostalgjike',
-	'cologneblue' => 'Kolonjë Blu'
-);
-
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Speciale',
-	NS_MAIN           => '',
-	NS_TALK           => 'Diskutim',
-	NS_USER           => 'Përdoruesi',
-	NS_USER_TALK      => 'Përdoruesi_diskutim',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_diskutim',
-	NS_IMAGE          => 'Figura',
-	NS_IMAGE_TALK     => 'Figura_diskutim',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_diskutim',
-	NS_TEMPLATE       => 'Stampa',
-	NS_TEMPLATE_TALK  => 'Stampa_diskutim',
-	NS_HELP           => 'Ndihmë',
-	NS_HELP_TALK      => 'Ndihmë_diskutim'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Speciale',
+	NS_TALK             => 'Diskutim',
+	NS_USER             => 'Përdoruesi',
+	NS_USER_TALK        => 'Përdoruesi_diskutim',
+	NS_PROJECT_TALK     => '$1_diskutim',
+	NS_FILE             => 'Figura',
+	NS_FILE_TALK        => 'Figura_diskutim',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskutim',
+	NS_TEMPLATE         => 'Stampa',
+	NS_TEMPLATE_TALK    => 'Stampa_diskutim',
+	NS_HELP             => 'Ndihmë',
+	NS_HELP_TALK        => 'Ndihmë_diskutim',
+	NS_CATEGORY         => 'Kategori',
+	NS_CATEGORY_TALK    => 'Kategori_Diskutim',
 );
 
 # Compatbility with alt names
@@ -43,6 +38,40 @@ $namespaceAliases = array(
 	'Perdoruesi_diskutim' => NS_USER_TALK,
 );
 
+$specialPageAliases = array(
+	'Upload'                    => array( 'Ngarko' ),
+	'Listfiles'                 => array( 'ListaSkedave' ),
+	'Newimages'                 => array( 'SkedaTëReja' ),
+	'Listusers'                 => array( 'RreshtoPërdoruesit' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Rastësishme', 'FaqeRastësishme' ),
+	'Uncategorizedpages'        => array( 'FaqeTëpakategorizuara' ),
+	'Uncategorizedcategories'   => array( 'KategoriTëpakategorizuara' ),
+	'Uncategorizedimages'       => array( 'SkedaTëpakategorizuara' ),
+	'Uncategorizedtemplates'    => array( 'StampaTëpakategorizuara' ),
+	'Unusedcategories'          => array( 'KategoriTëpapërdorura' ),
+	'Unusedimages'              => array( 'SkedaTëpapërdorura' ),
+	'Allpages'                  => array( 'TëgjithaFaqet' ),
+	'Emailuser'                 => array( 'EmailPërdoruesit' ),
+	'Confirmemail'              => array( 'KonfirmoEmail' ),
+	'Whatlinkshere'             => array( 'LidhjetKëtu' ),
+	'Movepage'                  => array( 'LëvizFaqe' ),
+	'Blockme'                   => array( 'BllokomMua' ),
+	'Categories'                => array( 'Kategori' ),
+	'Export'                    => array( 'Eksporto' ),
+	'Allmessages'               => array( 'TëgjithaMesazhet' ),
+	'Blockip'                   => array( 'BllokoIP' ),
+	'Import'                    => array( 'Importo' ),
+	'Mypage'                    => array( 'FaqjaIme' ),
+	'Mytalk'                    => array( 'DiskutimiImë' ),
+	'Mycontributions'           => array( 'KontributetëMiat' ),
+	'Listadmins'                => array( 'RreshtoAdmin' ),
+	'Listbots'                  => array( 'RreshtoBotët' ),
+	'Popularpages'              => array( 'FaqetëFamshme' ),
+	'Search'                    => array( 'Kërkim' ),
+	'Blankpage'                 => array( 'FaqeBosh' ),
+);
+
 $datePreferences = array(
 	'default',
 	'dmy',
@@ -60,9 +89,9 @@ $separatorTransformTable = array(',' => '.', '.' => ',' );
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Nënvizo lidhjet',
-'tog-highlightbroken'         => 'Trego lidhjet e faqeve bosh <a href="" class="new">kështu </a> (ndryshe: kështu<a href="" class="internal">?</a>).',
-'tog-justify'                 => 'Rregullim i kryeradhës',
-'tog-hideminor'               => 'Mos trego redaktimet e vogla',
+'tog-highlightbroken'         => 'Formato lidhjet e prishura <a href="" class="new">si kjo </a> (zgjedhore: si kjo<a href="" class="internal">?</a>).',
+'tog-justify'                 => 'Rregullo paragrafët',
+'tog-hideminor'               => 'Fshih redaktimet e vogla në ndryshimet e fundit',
 'tog-extendwatchlist'         => 'Zgjero listën mbikqyrëse të tregojë të tëra ndryshimet përkatëse',
 'tog-usenewrc'                => 'Tregoji me formatin e ri (jo për të gjithë shfletuesit)',
 'tog-numberheadings'          => 'Numëro automatikish mbishkrimet',
@@ -95,6 +124,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Fshih redaktimet e mia nga lista mbikqyrëse',
 'tog-watchlisthidebots'       => 'Fshih redaktimet e robotëve nga lista mbikqyrëse',
 'tog-watchlisthideminor'      => 'Fshih redaktimet e vogla nga lista mbikqyrëse',
+'tog-watchlisthideliu'        => 'Fshih redaktimet e përdoruesve nga lista e vëzhgimit',
+'tog-watchlisthideanons'      => 'Fshih redaktimet e anonimëve nga lista e vëzhgimit',
 'tog-ccmeonemails'            => 'Më dërgo kopje të mesazheve që u dërgoj të tjerëve',
 'tog-diffonly'                => 'Mos trego përmbajtjen e faqes nën ndryshimin',
 'tog-showhiddencats'          => 'Trego kategoritë e fshehura',
@@ -103,8 +134,6 @@ $messages = array(
 'underline-never'   => 'asnjëherë',
 'underline-default' => 'sipas shfletuesit',
 
-'skinpreview' => '(Parapamje)',
-
 # Dates
 'sunday'        => 'E diel',
 'monday'        => 'E hënë',
@@ -176,9 +205,7 @@ $messages = array(
 'mainpagetext'      => 'Wiki software u instalua me sukses.',
 'mainpagedocfooter' => 'Për më shumë informata rreth përdorimit të softwerit wiki , ju lutem shikoni [http://meta.wikimedia.org/wiki/Help:Contents dokumentacionin përkatës].
 
-
-== Fillimisht ==
-
+== Sa për fillim==
 * [http://www.mediawiki.org/wiki/Help:Configuration_settings Parazgjedhjet e MediaWiki-t]
 * [http://www.mediawiki.org/wiki/Help:FAQ Pyetjet e shpeshta rreth MediaWiki-t]
 * [http://mail.wikimedia.org/mailman/listinfo/mediawiki-announce Njoftime rreth MediaWiki-t]',
@@ -199,7 +226,7 @@ $messages = array(
 'mytalk'         => 'Diskutimet e mia',
 'anontalk'       => 'Diskutimet për këtë IP',
 'navigation'     => 'Shfleto',
-'and'            => 'dhe',
+'and'            => '&#32;dhe',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -227,7 +254,7 @@ $messages = array(
 'deletethispage'    => 'Grise faqen',
 'undelete_short'    => 'Restauro {{PLURAL:$1|një redaktim|$1 redaktime}}',
 'protect'           => 'Mbroje',
-'protect_change'    => 'ndrysho nivelin e mbrojtjes',
+'protect_change'    => 'ndrysho',
 'protectthispage'   => 'Mbroje faqen',
 'unprotect'         => 'Liroje',
 'unprotectthispage' => 'Liroje faqen',
@@ -262,8 +289,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Rreth {{SITENAME}}',
 'aboutpage'            => 'Project:Rreth',
-'bugreports'           => 'Kontakt',
-'bugreportspage'       => 'Project:Kontakt',
 'copyright'            => 'Përmbajtja është në disponim nëpërmjet licencës $1.',
 'copyrightpagename'    => '{{SITENAME}} Të drejta autori',
 'copyrightpage'        => '{{ns:project}}:Të drejta autori',
@@ -286,9 +311,7 @@ $messages = array(
 
 'badaccess'        => 'Gabim leje',
 'badaccess-group0' => 'Nuk ju lejohet veprimi i kërkuar',
-'badaccess-group1' => 'Ky veprim është i limituar për përdoruesit e grupit $1',
-'badaccess-group2' => 'Veprimi i kërkuar është i limituar për përdoruesit e grupit $1.',
-'badaccess-groups' => 'Veprimi që kërkuat lejohet vetëm nga përdorues të grupeve $1.',
+'badaccess-groups' => 'Veprimi që kërkuat lejohet vetëm nga përdorues të {{PLURAL:$2|grupit|grupeve}}: $1.',
 
 'versionrequired'     => 'Nevojitet versioni $1 i MediaWiki-it',
 'versionrequiredtext' => 'Nevojitet versioni $1 i MediaWiki-it për përdorimin e kësaj faqeje. Shikoni [[Special:Version|versionin]] tuaj.',
@@ -302,6 +325,8 @@ $messages = array(
 'editsection'             => 'redaktoni',
 'editold'                 => 'redaktoni',
 'viewsourceold'           => 'shikoni burimin',
+'editlink'                => 'redakto',
+'viewsourcelink'          => 'shih burimin',
 'editsectionhint'         => 'Redaktoni seksionin: 
 Edit section: $1',
 'toc'                     => 'Tabela e përmbajtjeve',
@@ -312,7 +337,7 @@ Edit section: $1',
 'restorelink'             => '{{PLURAL:$1|një redaktim i grisur|$1 redaktime të grisura}}',
 'feedlinks'               => 'Ushqyes:',
 'feed-invalid'            => 'Lloji i burimit të pajtimit është i pavlefshëm.',
-'feed-unavailable'        => '{{SITENAME}} nuk lejon burime me abonim',
+'feed-unavailable'        => 'Këso RSS nuk janë të lejuara',
 'site-rss-feed'           => '$1 RSS Feed',
 'site-atom-feed'          => '$1 Atom Feed',
 'page-rss-feed'           => '"$1" RSS Feed',
@@ -352,7 +377,7 @@ MySQL kthehu gabimin "<tt>$3: $4</tt>".',
 "$1"
 nga funksioni "$2".
 MySQL kthehu gabimin "$3: $4".',
-'noconnect'            => 'Ju kërkojmë ndjesë! Difekt teknik, rifillojmë së shpejti.<br />
+'noconnect'            => 'Kërkojmë ndjesë! Wiki po përjeton ca probleme teknike dhe nuk mund të kontaktojë serverin e bazave të të dhënave.<br />
 $1',
 'nodb'                 => 'Nuk mund të zgjidhja regjistrin $1',
 'cachederror'          => 'Kjo është një kopje e faqes së kërkuar dhe mund të jetë e vjetër.',
@@ -364,6 +389,11 @@ artikuj të rinj. Ka mundësi të jetë bllokuar për mirëmbajtje,
 dhe do të kthehet në gjëndje normale mbas mirëmbajtjes.
 
 Mirëmbajtësi i cili e bllokoi dha këtë arsye: $1',
+'missing-article'      => 'Baza e të dhënave se gjeti dot tekstin që duhet të faqes, të emëruar "$1" $2.
+
+Kjo zakonisht shkaktohet nga përcjellja e një ndyshimi të vjetëruar ose të një nyje të historisë së faqes që është grisur.
+
+Nëse nuk është kështu, mund të keni gjetur gabim në softuer. Ju lutemi, njoftoni një [[Special:ListUsers/sysop|administrues]], pëër këtë, duke shtuar URL-në.',
 'missingarticle-rev'   => '(versioni#: $1)',
 'missingarticle-diff'  => '(Ndryshimi: $1, $2)',
 'readonly_lag'         => "Regjistri është bllokuar automatikisht për t'i dhënë kohë shërbyesve skllevër për të arritur kryesorin. Ju lutemi provojeni përsëri më vonë.",
@@ -374,14 +404,13 @@ Mirëmbajtësi i cili e bllokoi dha këtë arsye: $1',
 'filedeleteerror'      => 'Nuk munda të gris skedën "$1".',
 'directorycreateerror' => 'S\'munda të krijoj skedarin "$1".',
 'filenotfound'         => 'Nuk munda të gjejë skedën "$1".',
-'fileexistserror'      => 'Dosja "$1" nuk mund të shkruhet : Kjo Dosje ekziston',
+'fileexistserror'      => 'Skeda "$1" nuk mund të shkruhet : skeda ekziston',
 'unexpected'           => 'Vlerë e papritur: "$1"="$2".',
 'formerror'            => 'Gabim: nuk munda të dërgoj formularin',
 'badarticleerror'      => 'Ky veprim nuk mund të bëhet në këtë faqe.',
 'cannotdelete'         => 'Nuk munda të gris këtë faqe ose figurë të dhënë. (Ka mundësi të jetë grisur nga dikush tjeter.)',
 'badtitle'             => 'Titull i pasaktë',
 'badtitletext'         => 'Titulli i faqes që kërkuat nuk ishte i saktë, ishte bosh, ose ishte një lidhje gabim me një titull wiki internacional.',
-'perfdisabled'         => 'Ju kërkoj ndjesë! Ky veprim është bllokuar përkohsisht sepse e ngadalëson regjistrin aq shumë sa nuk e përdor dot njeri tjetër.',
 'perfcached'           => 'Informacioni i mëposhtëm është kopje e ruajtur dhe mund të mos jetë i freskët:',
 'perfcachedts'         => 'Informacioni i mëposhtëm është një kopje e rifreskuar më $1.',
 'querypage-no-updates' => 'Rifreskimi i kësaj faqeje tani për tani është ndaluar, prandaj dhe informacioni i mëposhtëm mund të jetë i vjetërsuar.',
@@ -396,7 +425,7 @@ Ju lutem provojeni përsëri pas disa minutash.',
 'protectedpagetext'    => 'Kjo faqe është mbyllur për të ndaluar redaktimin.',
 'viewsourcetext'       => 'Ju mund të shikoni dhe kopjoni tekstin burimor të kësaj faqe:',
 'protectedinterface'   => 'Kjo faqe përmban tekst për pamjen gjuhësorë të softuerit dhe është e mbrojtur për të penguar keqpërdorimet.',
-'editinginterface'     => "'''Kujdes:''' Po redaktoni një faqe që përdoret për tekstin ose pamjen e softuerit. Ndryshimet e kësaj faqeje do të prekin tekstin ose pamjen për të gjithë përdoruesit e tjerë. Për përkthime, ju lutem konsideroni përdorimin e [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], projektit të përkthimit të MediaWiki-it.",
+'editinginterface'     => "'''Kujdes:''' Po redaktoni një faqe që përdoret për tekstin ose pamjen e softuerit. Ndryshimet e kësaj faqeje do të prekin tekstin ose pamjen për të gjithë përdoruesit e tjerë. Për përkthime, ju lutem konsideroni përdorimin e [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], projektit të përkthimit të MediaWiki-it.",
 'sqlhidden'            => '(Pyetje SQL e fshehur)',
 'cascadeprotected'     => 'Kjo faqe është mbrojtur nga redaktimi pasi është përfshirë në {{PLURAL:$1|faqen|faqet}} e mëposhtme që {{PLURAL:$1|është|janë}} mbrojtur sipas metodës "ujëvarë":
 $2',
@@ -406,12 +435,16 @@ $2',
 'titleprotected'       => "Ky titull është mbrojtur nga [[User:$1|$1]] dhe s'mund të krijohet një faqe nën të.
 Arsyeja e dhënë është ''$2''.",
 
+# Virus scanner
+'virus-badscanner'     => "Konfigurim jo i mirë: skanues i pa njohur virusesh: ''$1''",
+'virus-scanfailed'     => 'Hetimi dështoi (code $1)',
+'virus-unknownscanner' => 'antivirus i pa njohur:',
+
 # Login and logout pages
 'logouttitle'                => 'Përdoruesi doli',
 'logouttext'                 => 'Keni dalë jashtë {{SITENAME}}-s. Mund të vazhdoni të përdorni {{SITENAME}}-n anonimisht, ose mund të hyni brënda përsëri.',
-'welcomecreation'            => '== Mirësevini, $1! ==
-
-Llogaria juaj është hapur. Mos harroni të ndryshoni parapëlqimet e {{SITENAME}}-s.',
+'welcomecreation'            => '== Mirëserdhët, $1! ==
+Llogaria juaj është hapur. Mos harroni të ndryshoni parapëlqimet e {{SITENAME}}-s suaj.',
 'loginpagetitle'             => 'Hyrje përdoruesi',
 'yourname'                   => 'Fusni nofkën tuaj',
 'yourpassword'               => 'Fusni fjalëkalimin tuaj',
@@ -419,7 +452,6 @@ Llogaria juaj është hapur. Mos harroni të ndryshoni parapëlqimet e {{SITENAM
 'remembermypassword'         => 'Mbaj mënd fjalëkalimin tim për tërë vizitat e ardhshme.',
 'yourdomainname'             => 'Faqja juaj',
 'externaldberror'            => 'Ose kishte një gabim tek regjistri i identifikimit të jashtëm, ose nuk ju lejohet të përtërini llogarinë tuaje të jashtme.',
-'loginproblem'               => '<b>Kishte një problem me hyrjen tuaj.</b><br />Provojeni përsëri!',
 'login'                      => 'Hyni',
 'nav-login-createaccount'    => 'Hyni ose hapni një llogari',
 'loginprompt'                => 'Duhet të pranoni "biskota" për të hyrë brënda në {{SITENAME}}.',
@@ -434,7 +466,7 @@ Llogaria juaj është hapur. Mos harroni të ndryshoni parapëlqimet e {{SITENAM
 'gotaccountlink'             => 'Hyni',
 'createaccountmail'          => 'me email',
 'badretype'                  => 'Fjalëkalimet nuk janë njësoj.',
-'userexists'                 => 'Nofka që përdorët është në përdorim. Zgjidhni një nofkë tjetër.',
+'userexists'                 => 'Nofka që kërkuat është në përdorim. Zgjidhni një nofkë tjetër.',
 'youremail'                  => 'Adresa e email-it*',
 'username'                   => 'Nofka e përdoruesit:',
 'uid'                        => 'Nr. i identifikimit:',
@@ -448,7 +480,7 @@ Llogaria juaj është hapur. Mos harroni të ndryshoni parapëlqimet e {{SITENAM
 'email'                      => 'Email',
 'prefs-help-realname'        => '* Emri i vërtetë (opsion): Për të përmendur emrin tuaj si kontribuues në varësi nga puna juaj këtu.',
 'loginerror'                 => 'Gabim hyrje',
-'prefs-help-email'           => '* Email (me dëshirë): mund të përdoret për tu kontaktuar nga përdorues të tjerë pa u treguar adresën, për ndërrimin e fjalëkalimit të llogarisë nëse e harroni, apo mjete të tjera.',
+'prefs-help-email'           => "Posta elektronike është zgjedhore, por ju mundëson që fjalëkalimi i ri të ju dërgohet nëse e harroni atë. Gjithashtu mund të zgjidhni nëse doni të tjerët t'ju shkruajnë ose jo përmes faqes suaj të diskutimit pa patur nevojë të zbulojnë identitetin tuaj.",
 'prefs-help-email-required'  => 'Kërkohet e-mail adresa .',
 'nocookiesnew'               => 'Llogaria e përdoruesit u hap, por nuk keni hyrë brenda akoma. {{SITENAME}} përdor "biskota" për të futur brenda përdoruesit. Prandaj, duhet të pranoni biskota dhe të provoni përsëri me nofkën dhe fjalëkalimin tuaj.',
 'nocookieslogin'             => '{{SITENAME}} përdor "biskota" për të futur brenda përdoruesit. Prandaj, duhet të pranoni "biskota" dhe të provoni përsëri.',
@@ -481,30 +513,37 @@ Para se të pranohen eMail nga përdoruesit e tjerë, duhet që adressa e juaj t
 Ju lutemi ndiqni këshillat në eMailin e pranuar.',
 'throttled-mailpassword'     => "Një kujtesë e fjalëkalimit është dërguar gjatë {{PLURAL:$1|orës|$1 orëve}} të kaluara. Për t'u mbrojtur nga abuzime vetëm një kujtesë dërgohet çdo {{PLURAL:$1|orë|$1 orë}}.",
 'mailerror'                  => 'Gabim duke dërguar postën: $1',
-'acct_creation_throttle_hit' => 'Më vjen keq, por brenda 24 orëve të fundit është hapur një llogari $1 me IP-adresën tuaj dhe në moment nuk mundeni të hapni më. Provoni 24 orë më vonë prap.',
-'emailauthenticated'         => 'Adresa juaj është vërtetuar më $1.',
+'acct_creation_throttle_hit' => 'Nuk lejoheni të krijoni më llogari pasi keni krijuar {{PLURAL:$1|1|$1}}.',
+'emailauthenticated'         => 'Adresa juaj është vërtetuar më $2 $3.',
 'emailnotauthenticated'      => 'Adresa juaj <strong>nuk është vërtetuar</strong> akoma prandaj nuk mund të merrni e-mail.',
-'noemailprefs'               => '<strong>Detyrohet një adresë email-i për të përdorur këtë mjet.</strong>',
+'noemailprefs'               => 'Detyrohet një adresë email-i për të përdorur këtë mjet.',
 'emailconfirmlink'           => 'Vërtetoni adresën tuaj',
-'invalidemailaddress'        => 'Adresa email e dhënë nuk mund të pranohet sepse nuk duket e rregullt. Ju lutem fusni një adresë të rregullt ose boshatisni kutinë e shtypit.',
+'invalidemailaddress'        => 'Posta elektronike nuk mund të pranohet kështu si është pasi ka format jo valid. Ju lutemi, vendoni një postë mirë të formatuar, ose zbrazeni fushën.',
 'accountcreated'             => 'Llogarija e Përdoruesit u krijua',
 'accountcreatedtext'         => 'Llogarija e Përdoruesit për $1 u krijua',
 'createaccount-title'        => 'Hapja e llogarive për {{SITENAME}}',
 'createaccount-text'         => 'Dikush ka përdorur adresën tuaj për të hapur një llogari tek {{SITENAME}} ($4) të quajtur "$2" me fjalëkalimin "$3".
 Duhet të hyni brenda dhe të ndërroni fjalëkalimin tani nëse ky person jeni ju. Përndryshe shpërfilleni këtë mesazh.',
+'login-throttled'            => 'Keni bërë shumë tentime të njëpasnjëshme në fjalëkalimin e kësaj llogarie. Ju lutemi prisni para tentimit përsëri.',
 'loginlanguagelabel'         => 'Gjuha: $1',
 
 # Password reset dialog
-'resetpass'               => 'Ndrysho fjalëkalimin e llogarisë',
-'resetpass_announce'      => 'Ju keni hyrë me një kod të përkohshëm.
+'resetpass'                 => 'Ndrysho fjalëkalimin',
+'resetpass_announce'        => 'Ju keni hyrë me një kod të përkohshëm.
 Për të hyrë tërësisht duhet të vendosni një fjalëkalim të ri këtu:',
-'resetpass_header'        => 'Ndrysho fjalëkalimin',
-'resetpass_submit'        => 'Ndrysho fjalëkalimin dhe hyni brenda',
-'resetpass_success'       => 'Fjalëkalimi juaj është ndryshuar me sukses! Mund të hyni brenda...',
-'resetpass_bad_temporary' => 'Fjalëkalim i përkohshëm është i pavlefshëm.
+'resetpass_header'          => 'Ndrysho fjalëkalimin e llogarisë',
+'oldpassword'               => 'I vjetri',
+'newpassword'               => 'I riu',
+'retypenew'                 => 'I riu përsëri',
+'resetpass_submit'          => 'Ndrysho fjalëkalimin dhe hyni brenda',
+'resetpass_success'         => 'Fjalëkalimi juaj është ndryshuar me sukses! Mund të hyni brenda...',
+'resetpass_bad_temporary'   => 'Fjalëkalim i përkohshëm është i pavlefshëm.
 Ndoshta e keni ndryshuar fjalëkalimin ose keni kërkuar një fjalëkalim të përkohshëm të ri.',
-'resetpass_forbidden'     => "Fjalëkalimet s'mund të ndryshohen në {{SITENAME}}",
-'resetpass_missing'       => 'Nuk kishte të dhëna në formular.',
+'resetpass_forbidden'       => 'Fjalëkalimet nuk mund të ndryshohen',
+'resetpass-no-info'         => 'Duhet të jeni i kyçur që të keni qasje direkte në këtë faqe.',
+'resetpass-submit-loggedin' => 'Ndrysho fjalëkalimin',
+'resetpass-wrong-oldpass'   => 'Fjalëkalimi momental ose i përkohshëm nuk është i vlefshëm. Ndoshta tanimë me sukses keni ndërruar fjalëkalimin, ose keni kërkuar fjalëkalim të përkohshëm.',
+'resetpass-temp-password'   => 'Fjalëkalimi i përkohshëm:',
 
 # Edit page toolbar
 'bold_sample'     => 'Tekst i trashë',
@@ -529,8 +568,8 @@ Ndoshta e keni ndryshuar fjalëkalimin ose keni kërkuar një fjalëkalim të pÃ
 'hr_tip'          => 'vijë horizontale (përdoreni rallë)',
 
 # Edit pages
-'summary'                          => 'Përmbledhje',
-'subject'                          => 'Subjekt/Titull',
+'summary'                          => 'Përmbledhje:',
+'subject'                          => 'Subjekt/Titull:',
 'minoredit'                        => 'Ky është një redaktim i vogël',
 'watchthis'                        => 'Mbikqyre këtë faqe',
 'savearticle'                      => 'Kryej ndryshimet',
@@ -544,8 +583,8 @@ You are not logged in. Your IP address will be recorded in this page's edit hist
 'missingcommenttext'               => 'Ju lutemi shtoni një koment në vazhdim.',
 'missingcommentheader'             => "'''Kujdes:''' Ju nuk keni dhënë një titull për këtë koment.
 Nëse kryeni ndryshimet redaktimi juaj do të ruhet pa titull.",
-'summary-preview'                  => 'Parapamja e përmbledhjes',
-'subject-preview'                  => 'Parapamja e titullit',
+'summary-preview'                  => 'Parapamja e përmbledhjes:',
+'subject-preview'                  => 'Parapamja e titullit:',
 'blockedtitle'                     => 'Përdoruesi është bllokuar',
 'blockedtext'                      => "<big>'''Llogaria juaj ose adresa e IP-së është bllokuar'''</big>
 
@@ -566,13 +605,15 @@ Arsyeja e dhënë për këtë është:
 :\'\'$2\'\'
 
 * Fillimi i bllokimit: $8
-* Afati i kalimit të bllokimit: $6
+* Kalimi i kohës së bllokimit: $6
+* Zgjatja e bllokimit: $7
 
 Ju mund të kontaktoni $1 ose një tjetër [[{{MediaWiki:Grouppage-sysop}}|administrues]] për ta diskutuar bllokimin.
 
-Vini re : që nuk mund ta përdorni "dërgo e-mail" feature përveç nëse keni një e-mail valid të regjistruar në [[Special:Preferences|preferencat tuaja]]                                        dhe nuk jeni bllokuar nga përdorimi i tij.
+Vini re : që nuk mund ta përdorni mundësinë "dërgo porosi elektronike" përveç nëse keni një postë elektronike të vlefshme të regjistruar në [[Special:Preferences|preferencat tuaja]] dhe nuk jeni bllokuar nga përdorimi i saj.
 
-Numri idendifikues i bllokimit tuaj është $5. Ju lutemi përfshijeni këtë Numër në të gjitha kërkesat që i bëni.',
+IP adresa juaj e tanishme është $3 dhe ID e bllokimit është #$5.
+Ju lutemi përfshini këto detaje në të gjitha kërkesat që i bëni.',
 'blockednoreason'                  => 'nuk ka arsye',
 'blockedoriginalsource'            => "Më poshtë tregohet burimi i '''$1''':",
 'blockededitsource'                => "Më poshtë tregohet teksti i '''redaktimeve tuaja''' të '''$1''':",
@@ -591,28 +632,29 @@ Përderisa nuk ka seksion $1 nuk ka vend për të ruajtur ndryshimet tuaja.",
 'newarticle'                       => '(I Ri)',
 'newarticletext'                   => "{{SITENAME}} nuk ka akoma një ''faqe {{NAMESPACE}}'' të quajtur '''{{PAGENAME}}'''. Shtypni '''redaktoni''' më sipër ose [[Speciale:Search/{{PAGENAME}}|bëni një kërkim për {{PAGENAME}}]] (Shikoni [[{{MediaWiki:Helppage}}|faqen për ndihmë]] për më shumë informacion).
 Nëse gjetët këtë faqe aksidentalisht, shtypni butonin mbrapsh të shfletuesit tuaj.",
-'anontalkpagetext'                 => "---- ''Kjo është një faqe diskutimi për një përdorues anonim i cili nuk ka hapur akoma një llogari ose nuk e përdor atë.
-Prandaj, më duhet të përdor numrin e adresës IP për ta identifikuar.
-Kjo adresë mund të përdoret nga disa njerëz. Në qoftë se jeni një përdorues anonim dhe mendoni se komente kot janë drejtuar ndaj jush, ju lutem [[Special:UserLogin|krijoni një llogari ose hyni brënda]] për të mos u ngatarruar me përdorues të tjerë anonim.''",
+'anontalkpagetext'                 => "---- ''Kjo është faqe diskutimi për një përdorues anonim i cili nuk ka hapur akoma një llogari ose nuk e përdor atë.
+Prandaj, duhet të përdorim numrin e adresës IP për ta identifikuar.
+Kjo adresë mund të përdoret nga disa përdorues.
+Në qoftë se jeni përdorues anonim dhe mendoni se komente kot janë drejtuar ndaj jush, ju lutemi [[Special:UserLogin|krijoni një llogari]] ose [[Special:UserLogin|kyçuni]] për tu mos u ngatërruar me përdorues të tjerë anonim.''",
 'noarticletext'                    => 'Tani për tani nuk ka tekst në këtë faqe, mund ta [[Special:Search/{{PAGENAME}}|kërkoni]] këtë titull në faqe të tjera ose mund ta [{{fullurl:{{FULLPAGENAME}}|action=edit}} filloni] atë.',
 'userpage-userdoesnotexist'        => 'Llogaria e përdoruesit "$1" nuk është hapur. Ju lutem mendohuni mirë nëse dëshironi të krijoni/redaktoni këtë faqe.',
 'clearyourcache'                   => "'''Shënim:''' Pasi të ruani parapëlqimet ose pasi të kryeni ndryshimet, duhet të pastroni ''cache''-në e shfletuesit tuaj për të parë ndryshimet: për '''Mozilla/Safari/Konqueror''' shtypni ''Ctrl+Shift+Reload'' (ose ''ctrl+shift+r''), për '''IE''' ''Ctrl+f5'', '''Opera''': ''F5''.",
-'usercssjsyoucanpreview'           => "<strong>Këshillë:</strong> Përdorni butonin 'Trego parapamjen' për të provuar ndryshimet tuaja të faqeve css/js përpara se të kryeni ndryshimet.",
-'usercsspreview'                   => "'''Vini re se kjo është vetëm një provë ose parapamje e faqes tuaj CSS, ajo nuk është ruajtur akoma!'''",
+'usercssjsyoucanpreview'           => "'''Këshillë:''' Përdorni butonin 'Trego parapamjen' për të provuar ndryshimet tuaja të faqeve css/js përpara se të kryeni ndryshimet.",
+'usercsspreview'                   => "'''Vini re! Kjo është vetëm një parapamje e faqes suaj CSS. Akoma nuk është ruajtur!'''",
 'userjspreview'                    => "'''Vini re se kjo është vetëm një provë ose parapamje e faqes tuaj JavaScript, ajo nuk është ruajtur akoma!'''",
 'userinvalidcssjstitle'            => "'''Kujdes:''' Nuk ka pamje të quajtur \"\$1\". Vini re se faqet .css dhe .js përdorin titull me gërma të vogla, p.sh. {{ns:user}}:Foo/monobook.css, jo {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(E ndryshuar)',
-'note'                             => '<strong>Shënim:</strong>',
-'previewnote'                      => '<strong>Kini kujdes se kjo është vetëm një parapamje, nuk është ruajtur akoma!</strong>',
+'note'                             => "'''Shënim:'''",
+'previewnote'                      => "'''Kini kujdes se kjo është vetëm një parapamje, nuk është ruajtur akoma!'''",
 'previewconflict'                  => 'Kjo parapamje reflekton tekstin sipër kutisë së redaktimit siç do të duket kur të kryeni ndryshimin.',
-'session_fail_preview'             => '<strong>Ju kërkoj ndjesë. Nuk munda të kryej redaktimin tuaj sepse humba disa të dhëna. Provojeni përsëri dhe nëse nuk punon provoni të dilni dhe të hyni përsëri.</strong>',
-'session_fail_preview_html'        => "<strong>Ju kërkoj ndjesë! Nuk munda të ruaj redaktimin tuaj për shkaqe teknike.</strong>
+'session_fail_preview'             => "'''Ju kërkoj ndjesë. Nuk munda të kryej redaktimin tuaj sepse humba disa të dhëna. Provojeni përsëri dhe nëse nuk punon provoni të dilni dhe të hyni përsëri.'''",
+'session_fail_preview_html'        => "'''Ju kërkoj ndjesë! Nuk munda të ruaj redaktimin tuaj për shkaqe teknike.'''
 
 ''{{SITENAME}} ka ndaluar përfshirjen e tekstit HTML të papërpunuar, parapamja s'është treguar për t'ju mbrojtur nga sulme të mundshme në JavaScript''
 
-<strong>Nëse ky është një redaktim i vlefshëm, ju lutem provojeni përsëri. Nëse s'punon përsëri atëherë provoni të dilni dhe të hyni përsëri nga llogaria juaj.</strong>",
-'token_suffix_mismatch'            => "<strong>Redaktimi s'është pranuar pasi shfletuesi juaj ka prishur përmbajtjen e shkronjave. Redaktimi është shpërfilluar për të ruajtur përmbajtjen e tekstit.
-Kjo ndodh ndonjëherë kur përdoren shërbime ndërjmetësash anonim.</strong>",
+'''Nëse ky është një redaktim i vlefshëm, ju lutem provojeni përsëri. Nëse s'punon përsëri atëherë provoni të dilni dhe të hyni përsëri nga llogaria juaj.'''",
+'token_suffix_mismatch'            => "'''Redaktimi s'është pranuar pasi shfletuesi juaj ka prishur përmbajtjen e shkronjave. Redaktimi është shpërfilluar për të ruajtur përmbajtjen e tekstit.
+Kjo ndodh ndonjëherë kur përdoren shërbime ndërjmetësash anonim.'''",
 'editing'                          => 'Duke redaktuar $1',
 'editingsection'                   => 'Duke redaktuar $1 (seksion)',
 'editingcomment'                   => 'Duke redaktuar $1 (koment)',
@@ -624,24 +666,26 @@ Ju duhet të përputhni ndryshimet tuaja me tekstin ekzistues.
 '''Vetëm''' teksti në kutinë e sipërme të redaktimit do të ruhet kur të shtypni \"Ruaje faqen\".",
 'yourtext'                         => 'Teksti juaj',
 'storedversion'                    => 'Versioni i ruajtur',
-'nonunicodebrowser'                => '<strong>KUJDES: Shfletuesi juaj nuk përdor dot unikode, ju lutem ndryshoni shfletues para se të redaktoni artikuj.</strong>',
-'editingold'                       => '<strong>KUJDES: Po redaktoni një version të vjetër të kësaj faqeje. Në qoftë se e ruani, çdo ndryshim i bërë deri tani do të humbet.</strong>',
+'nonunicodebrowser'                => "'''KUJDES: Shfletuesi juaj nuk përdor dot unikode, ju lutem ndryshoni shfletues para se të redaktoni artikuj.'''",
+'editingold'                       => "'''KUJDES: Po redaktoni një version të vjetër të kësaj faqeje. Në qoftë se e ruani, çdo ndryshim i bërë deri tani do të humbet.'''",
 'yourdiff'                         => 'Ndryshimet',
 'copyrightwarning'                 => "Kontributet tek {{SITENAME}} janë të konsideruara të dhëna nën licensën $2 (shikoni $1 për hollësirat).<br />
 '''NDALOHET DHËNIA E PUNIMEVE PA PASUR LEJE NGA AUTORI NË MOSPËRPUTHJE ME KËTË LICENSË!'''<br />",
 'copyrightwarning2'                => "Ju lutem vini re se të gjitha kontributet tek {{SITENAME}} mund të redaktohen, ndryshohen apo fshihen nga përdorues të tjerë. Në qoftë se nuk dëshironi që shkrimet tuaja të redaktohen pa mëshirë mos i jepni këtu.<br />
 Po na premtoni që ç'ka po jepni këtu e keni kontributin tuaj ose e keni kopjuar nga domeni publik apo nga burime të tjera të lira sipas ligjeve përkatëse (shikoni $1 për hollësirat). 
-<strong>NDALOHET DHËNIA E PUNIMEVE PA PASUR LEJE NGA AUTORI NË MOSPËRPUTHJE ME KËTË LICENSË!</strong>",
+'''NDALOHET DHËNIA E PUNIMEVE PA PASUR LEJE NGA AUTORI NË MOSPËRPUTHJE ME KËTË LICENSË!'''",
 'longpagewarning'                  => 'KUJDES: Kjo faqe është $1 kilobytes e gjatë; disa
 shfletues mund të kenë probleme për të redaktuar faqe që afrohen ose janë akoma më shumë se 32 kb.
 Konsideroni ta ndani faqen në disa seksione më të vogla.',
-'longpageerror'                    => '<strong>GABIM: Tesksti që ju po e redaktoni është $1 KB i gjatë dhe është më i gjatë se maksimumi i lejuar prej $2 KB. Ndryshimet nuk mund të ruhen.</strong>',
-'readonlywarning'                  => 'KUJDES: Regjistri është bllokuar për mirëmbajtje,
-kështuqë nuk do keni mundësi të ruani redaktimet e tuaja tani. Mund të kopjoni dhe ruani tekstin në një skedë për më vonë.',
-'protectedpagewarning'             => '<strong>KUJDES: Kjo faqe është bllokuar kështu që vetëm përdorues me titullin administrator mund ta redaktojnë. Ju lutem ndiqni rregullat e dhëna tek [[{{SITENAME}}:Faqe e mbrojtur|faqet e mbrojtura]].</strong>',
+'longpageerror'                    => "'''GABIM: Tesksti që ju po e redaktoni është $1 KB i gjatë dhe është më i gjatë se maksimumi i lejuar prej $2 KB. Ndryshimet nuk mund të ruhen.'''",
+'readonlywarning'                  => "'''KUJDES: Baza e të dhënave është mbyllur për mirëmbajtje, pra ju nuk do të mund të ruani redaktimin tuaj për momentin.
+Ju ndoshta doni të kopjoni tekstin në një tekst dokument dhe të e ruani për më vonë.'''
+
+Administruesi që ka bërë mbylljen ka dhënë këtë sqarim: $1.",
+'protectedpagewarning'             => "'''KUJDES: Kjo faqe është mbyllur ashtu që vetëm përdoruesit me titullin administrator mund ta redaktojnë.'''",
 'semiprotectedpagewarning'         => "'''Shënim:''' Redaktimi i kësaj faqeje mund të bëhet vetëm nga përdorues të regjistruar.",
 'cascadeprotectedwarning'          => "'''Vini re:''' Kjo faqe është e mbrojtur dhe vetëm përdoruesit me privilegje administrative mund ta redaktojnë pasi është përfshirë në mbrotjen \"ujëvarë\" të {{PLURAL:\$1|faqes së|faqeve të}} mëposhtme:",
-'titleprotectedwarning'            => '<strong>VINI RE:  Kjo faqe është e mbrojtur dhe vetëm disa përdorues mund ta krijojnë.</strong>',
+'titleprotectedwarning'            => "'''VINI RE:  Kjo faqe është e mbrojtur dhe vetëm disa përdorues mund ta krijojnë.'''",
 'templatesused'                    => 'Stampa të përdorura në këtë faqe:',
 'templatesusedpreview'             => 'Stampa të përdorur në ketë parapamje:',
 'templatesusedsection'             => 'Stampat e përdorura në këtë seksion:',
@@ -651,7 +695,7 @@ kështuqë nuk do keni mundësi të ruani redaktimet e tuaja tani. Mund të kopj
 'edittools'                        => '<!-- Teksti këtu do të tregohet poshtë kutive të redaktimit dhe ngarkimit të skedave. -->',
 'nocreatetitle'                    => 'Krijimi i faqeve të reja është i kufizuar.',
 'nocreatetext'                     => 'Mundësia për të krijuar faqe të reja është kufizuar. Duhet të [[Special:UserLogin|hyni ose të hapni një llogari]] për të krijuar faqe të reja, ose mund të ktheheni mbrapsh dhe të redaktoni një faqe ekzistuese.',
-'nocreate-loggedin'                => 'Nuk ju lejohet të krijoni faqe të reja tek {{SITENAME}}.',
+'nocreate-loggedin'                => 'Nuk ju lejohet të krijoni faqe të reja.',
 'permissionserrors'                => 'Gabime privilegjesh',
 'permissionserrorstext'            => 'Nuk keni leje për të bërë këtë veprim për {{PLURAL:$1|këtë arsye|këto arsye}}:',
 'permissionserrorstext-withaction' => 'Ju nuk keni leje për $2, për {{PLURAL:$1|këtë arsye|këto arsye}}:',
@@ -659,11 +703,19 @@ kështuqë nuk do keni mundësi të ruani redaktimet e tuaja tani. Mund të kopj
 
 Mendohuni nëse dëshironi të vazhdoni me veprimin tuaj në këtë faqe.
 Regjistri i grisjes për këtë faqe jepet më poshtë:",
+'deleted-notice'                   => 'Kjo faqe është grisur. Të dhënat e grisjes për këtë faqe gjenden më poshtë, për referencë.',
+'deletelog-fulllog'                => 'Shih të dhënat e plota',
+'edit-gone-missing'                => 'Faqja nuk mund t freskohet.
+Duket se është grisur.',
+'edit-conflict'                    => 'Konflikt në redaktim.',
+'edit-no-change'                   => 'Redaktimi juaj është anashkaluar pasi që asnjë ndryshim nuk u bë në tekst.',
+'edit-already-exists'              => 'Faqja nuk mundej të hapet.
+Ajo tanimë ekziston.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Vini re: Kjo faqe ka shumë shprehje që kërkojnë analizë gramatikore të kushtueshme për sistemin.
+'expensive-parserfunction-warning'        => 'Kujdes: Kjo faqe ka shumë kërkesa që kërkojnë analizë gramatikore të kushtueshme për sistemin.
 
-Duhet të ketë më pakë se $2, por tani ka $1.',
+Duhet të ketë më pakë se $2, {{PLURAL:$2|kërkesë|kërkesa}}, kurse tani {{PLURAL:$1|është $1 kërkesë|janë $1 kërkesa}}.',
 'expensive-parserfunction-category'       => 'Faqe me shumë shprehje të kushtueshmë për analizë gramatikore',
 'post-expand-template-inclusion-warning'  => "Vini re: Stampa e përfshirë është shumë e madhe.
 Disa stampa s'do të përfshihen.",
@@ -685,28 +737,28 @@ Këto parametra nuk janë përfshirë.",
 Arsyeja e dhënë nga $3 është ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Shiko regjistrat për këtë faqe',
-'nohistory'           => 'Nuk ka histori redaktimesh për këtë faqe.',
-'revnotfound'         => 'Versioni nuk u gjet',
-'revnotfoundtext'     => 'Versioni i vjetër i faqes së kërkuar nuk mund të gjehej.Ju lutem kontrolloni URL-in që përdorët për të ardhur tek kjo faqe.',
-'currentrev'          => 'Versioni i tanishëm',
-'revisionasof'        => 'Versioni i $1',
-'revision-info'       => 'Versioni më $1 nga $2',
-'previousrevision'    => '� Version më i vjetër',
-'nextrevision'        => 'Version më i ri →',
-'currentrevisionlink' => 'shikoni versionin e tanishëm',
-'cur'                 => 'tani',
-'next'                => 'mbas',
-'last'                => 'fund',
-'page_first'          => 'Së pari',
-'page_last'           => 'Së fundmi',
-'histlegend'          => 'Legjenda: (tani) = ndryshimet me versionin e tanishëm,
+'viewpagelogs'           => 'Shiko regjistrat për këtë faqe',
+'nohistory'              => 'Nuk ka histori redaktimesh për këtë faqe.',
+'currentrev'             => 'Versioni i tanishëm',
+'currentrev-asof'        => 'Versioni momental që nga $1',
+'revisionasof'           => 'Versioni i $1',
+'revision-info'          => 'Versioni më $1 nga $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Version më i vjetër',
+'nextrevision'           => 'Version më i ri →',
+'currentrevisionlink'    => 'shikoni versionin e tanishëm',
+'cur'                    => 'tani',
+'next'                   => 'mbas',
+'last'                   => 'fund',
+'page_first'             => 'Së pari',
+'page_last'              => 'Së fundmi',
+'histlegend'             => 'Legjenda: (tani) = ndryshimet me versionin e tanishëm,
 (fund) = ndryshimet me versionin e parardhshëm, V = redaktim i vogël',
-'deletedrev'          => '[u gris]',
-'histfirst'           => 'Së pari',
-'histlast'            => 'Së fundmi',
-'historysize'         => '({{PLURAL:$1|1 B|$1 B}})',
-'historyempty'        => '(bosh)',
+'history-fieldset-title' => 'Shfleto historikun',
+'deletedrev'             => '[u gris]',
+'histfirst'              => 'Së pari',
+'histlast'               => 'Së fundmi',
+'historysize'            => '({{PLURAL:$1|1 B|$1 B}})',
+'historyempty'           => '(bosh)',
 
 # Revision feed
 'history-feed-title'          => 'Historiku i versioneve',
@@ -787,6 +839,7 @@ Kini kujdes se përdorimi i lidhjeve të shfletimit do të ndryshojë përzgjedh
 'mergehistory-invalid-destination' => 'Faqja mbledhëse duhet të ketë titull të vlefshëm.',
 'mergehistory-autocomment'         => 'U bashkua [[:$1]] në [[:$2]]',
 'mergehistory-comment'             => 'U bashkua [[:$1]] në [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Burimi dhe faqja e përcaktimit nuk mund të jenë të njëjta',
 
 # Merge log
 'mergelog'           => 'Regjistri i bashkimeve',
@@ -799,123 +852,170 @@ Kini kujdes se përdorimi i lidhjeve të shfletimit do të ndryshojë përzgjedh
 'difference'              => '(Ndryshime midis versioneve)',
 'lineno'                  => 'Rreshti $1:',
 'compareselectedversions' => 'Krahasoni versionet e zgjedhura',
+'visualcomparison'        => 'Krahasim vizual',
+'wikicodecomparison'      => 'Krahasim i wiki tekstit',
 'editundo'                => 'ktheje',
 'diff-multi'              => '({{PLURAL:$1|Një redaktim ndërmjet nuk është|$1 redaktime ndërmjet nuk janë}} treguar.)',
+'diff-movedto'            => 'bartur tek $1',
+'diff-styleadded'         => 'stili $1 u vendos',
+'diff-added'              => '$1 u vendos',
+'diff-changedto'          => 'u ndryshua në $1',
+'diff-movedoutof'         => 'u largua nga $1',
+'diff-styleremoved'       => 'stili $1 u largua',
+'diff-removed'            => '$1 u largua',
+'diff-changedfrom'        => 'ndryshuar nga $1',
+'diff-src'                => 'burimi',
+'diff-withdestination'    => 'me përcaktim $1',
+'diff-width'              => 'gjerësia',
+'diff-height'             => 'lartësia',
+'diff-p'                  => "'''paragraf'''",
+'diff-blockquote'         => "'''citat'''",
+'diff-div'                => "'''ndarje'''",
+'diff-table'              => "'''tabelë'''",
+'diff-tbody'              => "'''përmbajtje tabele'''",
+'diff-tr'                 => "'''rresht'''",
+'diff-th'                 => "'''kokë'''",
+'diff-dl'                 => "'''listë përcaktimi'''",
+'diff-dt'                 => "'''term përcaktimi'''",
+'diff-form'               => "'''formë'''",
+'diff-img'                => "'''figurë'''",
+'diff-a'                  => "'''nyje'''",
+'diff-font'               => "'''font'''",
+'diff-del'                => "'''grisur'''",
 
 # Search results
-'searchresults'             => 'Rezultatet e kërkimit',
-'searchresulttext'          => 'Për më shumë informacion rreth kërkimit në {{SITENAME}} shikoni [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Kërkim për "[[$1]]"',
-'searchsubtitleinvalid'     => 'Kërkim për "$1"',
-'noexactmatch'              => 'Faqja me atë titull nuk është krijuar akoma
-
-Mund të [[$1|filloni një artikull]] me këtë titull.
-
-Ju lutem kërkoni {{SITENAME}}-n përpara se të krijoni një artikull të ri se mund të jetë nën një titull tjetër.',
-'noexactmatch-nocreate'     => "'''Faqja e titulluar \"\$1\" nuk ekziston'''",
-'toomanymatches'            => 'Ky kërkim ka shumë përfundime, provoni një pyetje tjetër më përcaktuese',
-'titlematches'              => 'Tituj faqesh që përputhen',
-'notitlematches'            => 'Nuk ka asnjë titull faqeje që përputhet',
-'textmatches'               => 'Tekst faqesh që përputhet',
-'notextmatches'             => 'Nuk ka asnjë tekst faqeje që përputhet',
-'prevn'                     => '$1 më para',
-'nextn'                     => '$1 më pas',
-'viewprevnext'              => 'Shikoni ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 fjalë|$2 fjalë}})',
-'search-result-score'       => 'Përkatësia: $1%',
-'search-redirect'           => '(përcjellim $1)',
-'search-section'            => '(seksioni $1)',
-'search-suggest'            => 'Mos kishit për mendje: $1',
-'search-interwiki-caption'  => 'Projekte simotra',
-'search-interwiki-default'  => '$1 përfundime:',
-'search-interwiki-more'     => '(më shumë)',
-'search-mwsuggest-enabled'  => 'me këshilla',
-'search-mwsuggest-disabled' => 'pa këshilla',
-'search-relatedarticle'     => 'Të ngjashme',
-'mwsuggest-disable'         => 'Çmundësoi sugjerimet AJAX',
-'searchrelated'             => 'të ngjashme',
-'searchall'                 => 'të gjitha',
-'showingresults'            => "Më poshtë tregohen {{PLURAL:$1|'''1''' përfundim|'''$1''' përfundime}} duke filluar nga #'''$2'''.",
-'showingresultsnum'         => "Më poshtë tregohen {{PLURAL:$3|'''1''' përfundim|'''$3''' përfundime}} duke filluar nga #'''$2'''.",
-'showingresultstotal'       => "Më poshtë {{PLURAL:$3|tregohet 1 përfundim|tregohen '''$1 - $2''' nga '''$3''' përfundime}}",
-'nonefound'                 => '<strong>Shënim</strong>: Kërkimet pa rezultate ndodhin kur kërkoni për fjalë që rastisen shpesh si "ke" dhe "nga", të cilat nuk janë të futura në regjistër, ose duke dhënë më shumë se një fjalë (vetëm faqet që i kanë të gjitha ato fjalë do të tregohen si rezultate).',
-'powersearch'               => 'Kërko',
-'powersearch-legend'        => 'Kërkim i përparuar',
-'powersearch-ns'            => 'Kërkim në hapësira:',
-'powersearch-redir'         => 'Trego përcjellimet',
-'powersearch-field'         => 'Kërko për',
-'search-external'           => 'Kërkim i jashtëm',
-'searchdisabled'            => '<p>Kërkimi me tekst të plotë është bllokuar tani për tani ngaqë shërbyesi është shumë i ngarkuar; shpresojmë ta nxjerrim prapë në gjendje normale pas disa punimeve. Deri atëherë mund të përdorni Google-in për kërkime:</p>',
+'searchresults'                    => 'Rezultatet e kërkimit',
+'searchresults-title'              => 'Rezultatet e kërkimit për "$1"',
+'searchresulttext'                 => 'Për më shumë informacion rreth kërkimit në {{SITENAME}} shikoni [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Kërkuat për "[[$1]]" ([[Special:Prefixindex/$1|të gjitha faqet që fillojnë me "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|të gjitha faqet që lidhen me"$1"]])',
+'searchsubtitleinvalid'            => 'Kërkim për "$1"',
+'noexactmatch'                     => "'''Nuk ka faqe të emëruar \"\$1\".'''
+Ju mund [[:\$1|të e krijoni këtë faqe]].",
+'noexactmatch-nocreate'            => "'''Faqja e titulluar \"\$1\" nuk ekziston'''",
+'toomanymatches'                   => 'Ky kërkim ka shumë përfundime, provoni një pyetje tjetër më përcaktuese',
+'titlematches'                     => 'Tituj faqesh që përputhen',
+'notitlematches'                   => 'Nuk ka asnjë titull faqeje që përputhet',
+'textmatches'                      => 'Tekst faqesh që përputhet',
+'notextmatches'                    => 'Nuk ka asnjë tekst faqeje që përputhet',
+'prevn'                            => '$1 më para',
+'nextn'                            => '$1 më pas',
+'viewprevnext'                     => 'Shikoni ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Parazgjedhjet e kërkimit',
+'searchmenu-exists'                => "'''Në këtë wiki kjo faqe është emëruar \"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''Hapë faqen \"[[:\$1]]\" në këtë wiki!'''",
+'searchhelp-url'                   => 'Help:Ndihmë',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Shfletoi faqet me këtë parashtesë]]',
+'searchprofile-articles'           => 'Faqet përmbajtëse',
+'searchprofile-project'            => 'Projekt faqet',
+'searchprofile-images'             => 'Skedarë',
+'searchprofile-everything'         => 'Gjithçka',
+'searchprofile-advanced'           => 'Avancuar',
+'searchprofile-articles-tooltip'   => 'Kërko në $1',
+'searchprofile-project-tooltip'    => 'Kërko në $1',
+'searchprofile-images-tooltip'     => 'Kërko skedarë',
+'searchprofile-everything-tooltip' => 'Kërko gjithë përmbajtjen (duke përfshirë edhe faqet e diskutimit)',
+'prefs-search-nscustom'            => 'Kërko hapësirën e zakonshme:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 fjalë|$2 fjalë}})',
+'search-result-score'              => 'Përkatësia: $1%',
+'search-redirect'                  => '(përcjellim $1)',
+'search-section'                   => '(seksioni $1)',
+'search-suggest'                   => 'Mos kishit për mendje: $1',
+'search-interwiki-caption'         => 'Projekte simotra',
+'search-interwiki-default'         => '$1 përfundime:',
+'search-interwiki-more'            => '(më shumë)',
+'search-mwsuggest-enabled'         => 'me këshilla',
+'search-mwsuggest-disabled'        => 'pa këshilla',
+'search-relatedarticle'            => 'Të ngjashme',
+'mwsuggest-disable'                => 'Çmundësoi sugjerimet AJAX',
+'searchrelated'                    => 'të ngjashme',
+'searchall'                        => 'të gjitha',
+'showingresults'                   => "Më poshtë tregohen {{PLURAL:$1|'''1''' përfundim|'''$1''' përfundime}} duke filluar nga #'''$2'''.",
+'showingresultsnum'                => "Më poshtë tregohen {{PLURAL:$3|'''1''' përfundim|'''$3''' përfundime}} duke filluar nga #'''$2'''.",
+'showingresultstotal'              => "Duke treguar më poshtë {{PLURAL:$4|rezultatin '''$1''' nga '''$3'''|rezultatet '''$1 - $2''' nga '''$3'''}}",
+'nonefound'                        => '<strong>Shënim</strong>: Kërkimet pa rezultate ndodhin kur kërkoni për fjalë që rastisen shpesh si "ke" dhe "nga", të cilat nuk janë të futura në regjistër, ose duke dhënë më shumë se një fjalë (vetëm faqet që i kanë të gjitha ato fjalë do të tregohen si rezultate).',
+'powersearch'                      => 'Kërko',
+'powersearch-legend'               => 'Kërkim i përparuar',
+'powersearch-ns'                   => 'Kërkim në hapësira:',
+'powersearch-redir'                => 'Trego përcjellimet',
+'powersearch-field'                => 'Kërko për',
+'search-external'                  => 'Kërkim i jashtëm',
+'searchdisabled'                   => '<p>Kërkimi me tekst të plotë është bllokuar tani për tani ngaqë shërbyesi është shumë i ngarkuar; shpresojmë ta nxjerrim prapë në gjendje normale pas disa punimeve. Deri atëherë mund të përdorni Google-in për kërkime:</p>',
 
 # Preferences page
-'preferences'              => 'Parapëlqimet',
-'mypreferences'            => 'Parapëlqimet',
-'prefs-edits'              => 'Numri i redaktimeve:',
-'prefsnologin'             => 'Nuk keni hyrë brenda',
-'prefsnologintext'         => 'Duhet të keni [[Special:UserLogin|hyrë brenda]] për të ndryshuar parapëlqimet e përdoruesit.',
-'prefsreset'               => 'Parapëlqimet janë rikthyer siç ishin.',
-'qbsettings'               => 'Vendime të shpejta',
-'qbsettings-none'          => 'Asnjë',
-'qbsettings-fixedleft'     => 'Lidhur majtas',
-'qbsettings-fixedright'    => 'Lidhur djathtas',
-'qbsettings-floatingleft'  => 'Pezull majtas',
-'qbsettings-floatingright' => 'Pezull djathtas',
-'changepassword'           => 'Ndërroni fjalëkalimin',
-'skin'                     => 'Pamja',
-'math'                     => 'Formula',
-'dateformat'               => 'Data',
-'datedefault'              => 'Parazgjedhje',
-'datetime'                 => 'Data dhe Ora',
-'math_failure'             => 'Nuk e kuptoj',
-'math_unknown_error'       => 'gabim i panjohur',
-'math_unknown_function'    => 'funksion i panjohur',
-'math_lexing_error'        => 'gabim leximi',
-'math_syntax_error'        => 'gabim sintakse',
-'math_image_error'         => 'Konversioni PNG dështoi; kontrolloni për ndonjë gabim instalimi të latex-it, dvips-it, gs-it, dhe convert-it.',
-'math_bad_tmpdir'          => 'Nuk munda të shkruaj ose krijoj dosjen e përkohshme për matematikë',
-'math_bad_output'          => 'Nuk munda të shkruaj ose të krijoj prodhimin matematik në dosjen',
-'math_notexvc'             => 'Mungon zbatuesi texvc; ju lutem shikoni math/README për konfigurimin.',
-'prefs-personal'           => 'Përdoruesi',
-'prefs-rc'                 => 'Ndryshime së fundmi',
-'prefs-watchlist'          => 'Lista mbikqyrëse',
-'prefs-watchlist-days'     => 'Numri i ditëve të treguara tek lista mbikqyrëse:',
-'prefs-watchlist-edits'    => 'Numri i redaktimeve të treguara tek lista mbikqyrëse e zgjeruar:',
-'prefs-misc'               => 'Të ndryshme',
-'saveprefs'                => 'Ruaj parapëlqimet',
-'resetprefs'               => 'Rikthe parapëlqimet',
-'oldpassword'              => 'I vjetri',
-'newpassword'              => 'I riu',
-'retypenew'                => 'I riu përsëri',
-'textboxsize'              => 'Redaktimi',
-'rows'                     => 'Rreshta',
-'columns'                  => 'Kolona',
-'searchresultshead'        => 'Kërkimi',
-'resultsperpage'           => 'Sa përputhje të tregohen për faqe',
-'contextlines'             => 'Sa rreshta të tregohen për përputhje',
-'contextchars'             => 'Sa germa të tregohen për çdo rresht',
-'stub-threshold'           => 'Kufiri për formatin e <a href="#" class="stub">lidhjeve cung</a> (B):',
-'recentchangesdays'        => 'Numri i ditëve të treguara në ndryshime së fundmi:',
-'recentchangescount'       => 'Numri i titujve në ndryshime së fundmi',
-'savedprefs'               => 'Parapëlqimet tuaja janë ruajtur.',
-'timezonelegend'           => 'Zona kohore',
-'timezonetext'             => 'Fusni numrin e orëve prej të cilave ndryshon ora lokale nga ajo e shërbyesit (UTC).',
-'localtime'                => 'Tregimi i orës lokale',
-'timezoneoffset'           => 'Ndryshimi',
-'servertime'               => 'Ora e shërbyesit tani është',
-'guesstimezone'            => 'Gjeje nga shfletuesi',
-'allowemail'               => 'Lejo përdoruesit të më dërgojnë email',
-'prefs-searchoptions'      => 'Mundësi kërkimi',
-'prefs-namespaces'         => 'Hapësirat',
-'defaultns'                => 'Kërko automatikisht vetëm në këto hapësira:',
-'default'                  => 'parazgjedhje',
-'files'                    => 'Figura',
+'preferences'               => 'Parapëlqimet',
+'mypreferences'             => 'Parapëlqimet',
+'prefs-edits'               => 'Numri i redaktimeve:',
+'prefsnologin'              => 'Nuk keni hyrë brenda',
+'prefsnologintext'          => 'Duhet të jeni <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} të kyçur]</span> për të caktuar parapëlqimet e përdoruesit.',
+'prefsreset'                => 'Parapëlqimet janë rikthyer siç ishin.',
+'qbsettings'                => 'Vendime të shpejta',
+'qbsettings-none'           => 'Asnjë',
+'qbsettings-fixedleft'      => 'Lidhur majtas',
+'qbsettings-fixedright'     => 'Lidhur djathtas',
+'qbsettings-floatingleft'   => 'Pezull majtas',
+'qbsettings-floatingright'  => 'Pezull djathtas',
+'changepassword'            => 'Ndërroni fjalëkalimin',
+'skin'                      => 'Pamja',
+'skin-preview'              => 'Parapamje',
+'math'                      => 'Formula',
+'dateformat'                => 'Data',
+'datedefault'               => 'Parazgjedhje',
+'datetime'                  => 'Data dhe Ora',
+'math_failure'              => 'Nuk e kuptoj',
+'math_unknown_error'        => 'gabim i panjohur',
+'math_unknown_function'     => 'funksion i panjohur',
+'math_lexing_error'         => 'gabim leximi',
+'math_syntax_error'         => 'gabim sintakse',
+'math_image_error'          => 'Konversioni PNG dështoi; kontrolloni për ndonjë gabim instalimi të latex-it, dvips-it, gs-it, dhe convert-it.',
+'math_bad_tmpdir'           => 'Nuk munda të shkruaj ose krijoj dosjen e përkohshme për matematikë',
+'math_bad_output'           => 'Nuk munda të shkruaj ose të krijoj prodhimin matematik në dosjen',
+'math_notexvc'              => 'Mungon zbatuesi texvc; ju lutem shikoni math/README për konfigurimin.',
+'prefs-personal'            => 'Përdoruesi',
+'prefs-rc'                  => 'Ndryshime së fundmi',
+'prefs-watchlist'           => 'Lista mbikqyrëse',
+'prefs-watchlist-days'      => 'Numri i ditëve të treguara tek lista mbikqyrëse:',
+'prefs-watchlist-days-max'  => '(maksimum 7 ditë)',
+'prefs-watchlist-edits'     => 'Numri i redaktimeve të treguara tek lista mbikqyrëse e zgjeruar:',
+'prefs-watchlist-edits-max' => '(numri maksimal: 1000)',
+'prefs-misc'                => 'Të ndryshme',
+'prefs-resetpass'           => 'Ndrysho fjalëkalimin',
+'saveprefs'                 => 'Ruaj parapëlqimet',
+'resetprefs'                => 'Rikthe parapëlqimet',
+'textboxsize'               => 'Redaktimi',
+'prefs-edit-boxsize'        => 'Madhësia e dritares së redaktimit.',
+'rows'                      => 'Rreshta',
+'columns'                   => 'Kolona',
+'searchresultshead'         => 'Kërkimi',
+'resultsperpage'            => 'Sa përputhje të tregohen për faqe',
+'contextlines'              => 'Sa rreshta të tregohen për përputhje',
+'contextchars'              => 'Sa germa të tregohen për çdo rresht',
+'stub-threshold'            => 'Kufiri për formatin e <a href="#" class="stub">lidhjeve cung</a> (B):',
+'recentchangesdays'         => 'Numri i ditëve të treguara në ndryshime së fundmi:',
+'recentchangesdays-max'     => '(maksimum $1 {{PLURAL:$1|dit|ditë}})',
+'recentchangescount'        => 'Numri i titujve në ndryshime së fundmi',
+'savedprefs'                => 'Parapëlqimet tuaja janë ruajtur.',
+'timezonelegend'            => 'Zona kohore',
+'timezonetext'              => 'Fusni numrin e orëve prej të cilave ndryshon ora lokale nga ajo e shërbyesit (UTC).',
+'localtime'                 => 'Ora lokale:',
+'timezoneselect'            => 'Zona kohore:',
+'timezoneuseserverdefault'  => 'Përdor serverin e parazgjedhur',
+'timezoneuseoffset'         => 'Tjera (zgjidh rajonin)',
+'timezoneoffset'            => 'Ofset¹:',
+'servertime'                => 'Ora e shërbyesit:',
+'guesstimezone'             => 'Gjeje nga shfletuesi',
+'allowemail'                => 'Lejo përdoruesit të më dërgojnë email',
+'prefs-searchoptions'       => 'Mundësi kërkimi',
+'prefs-namespaces'          => 'Hapësirat',
+'defaultns'                 => 'Kërko automatikisht vetëm në këto hapësira:',
+'default'                   => 'parazgjedhje',
+'files'                     => 'Figura',
 
 # User rights
 'userrights'                  => 'Ndrysho privilegjet e përdoruesve', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Ndrysho grupet e përdoruesit',
 'userrights-user-editname'    => 'Fusni emrin e përdoruesit:',
 'editusergroup'               => 'Redakto grupet e përdoruesve',
-'editinguser'                 => "Duke ndryshuar privilegjet e përdoruesit '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Duke ndryshuar privilegjet e përdoruesit '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Anëtarësimi tek grupet',
 'saveusergroups'              => 'Ruaj Grupin e Përdoruesve',
 'userrights-groupsmember'     => 'Anëtar i:',
@@ -955,15 +1055,81 @@ Ju lutem kërkoni {{SITENAME}}-n përpara se të krijoni një artikull të ri se
 'grouppage-bureaucrat'    => '{{ns:project}}:Burokratë',
 'grouppage-suppress'      => '{{ns:project}}:Kujdestari',
 
+# Rights
+'right-read'             => 'Lexo faqe',
+'right-edit'             => 'Redakto faqet',
+'right-createpage'       => 'Hap faqe (që nuk janë faqe diskutimi)',
+'right-createtalk'       => 'Hap faqe diskutimi',
+'right-createaccount'    => 'Hap llogari të re',
+'right-minoredit'        => 'Shëno redaktimet si të vogla',
+'right-move'             => 'Lëviz faqet',
+'right-move-subpages'    => 'Lëviz faqet me nënfaqet e tyre',
+'right-movefile'         => 'Lëviz skedarët',
+'right-suppressredirect' => 'Mos krijo zhvendosje nga emri i vjetër kur lëvizë një faqe',
+'right-upload'           => 'Ngarko skedarë',
+'right-reupload'         => 'Ringarko skedën ekzistuese',
+'right-reupload-own'     => 'Ringarko skedën ekzistuese të ngarkuar vetë',
+'right-upload_by_url'    => 'Ngarko skedë nga ndonjë URL',
+'right-autoconfirmed'    => 'Redakto faqet gjysmë të mbrojtura',
+'right-bot'              => 'Trajtohu si një proces automatik',
+'right-delete'           => 'Gris faqet',
+'right-bigdelete'        => 'Gris faqet me histori të gjata',
+'right-deleterevision'   => 'Grisi dhe riktheji revizionet specifike të faqeve',
+'right-browsearchive'    => 'Kërko faqe të grisura',
+'right-undelete'         => 'Rikthe faqen',
+'right-block'            => 'Blloko përdoruesit tjerë nga editimi',
+'right-blockemail'       => 'Blloko përdoruesin që të mos dërgojë postë elektronike',
+'right-hideuser'         => 'Blloko përdorues, duke fshehur nga publiku',
+'right-protect'          => 'Ndrysho nivelin mbrojtës dhe redakto faqet e mbrojtura',
+'right-editprotected'    => 'Redakto faqet e mbrojtura (pa ndryshuar mbrojtjen)',
+'right-editinterface'    => 'Ndrysho parapamjen e përdoruesit',
+'right-editusercssjs'    => 'Redakto skedat CSS dhe JS të përdoruesve tjerë',
+'right-noratelimit'      => 'Mos u prek nga kufizimet e vlerësimit',
+'right-import'           => 'Importo faqe nga wiki tjera',
+'right-unwatchedpages'   => 'Shiko listën e faqeve të pa vëzhguara',
+'right-mergehistory'     => 'Bashko historinë e faqeve',
+'right-userrights'       => 'Redakto të gjitha të drejtat e përdoruesit',
+
 # User rights log
 'rightslog'      => 'Regjistri i privilegjeve',
 'rightslogtext'  => 'Ky është një regjistër për ndryshimet e titujve të përdoruesve.',
 'rightslogentry' => 'të drejtat e $1 u ndryshuan prej $2 në $3',
 'rightsnone'     => '(asgjë)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lexo këtë faqe',
+'action-edit'                 => 'redakto këtë faqe',
+'action-createpage'           => 'hapë faqe',
+'action-createtalk'           => 'hap faqe diskutimi',
+'action-createaccount'        => 'hapë këtë llogari',
+'action-minoredit'            => 'shëno këtë redaktim si të vogël',
+'action-move'                 => 'lëviz këtë faqe',
+'action-move-subpages'        => 'zhvendos këtë faqe dhe nënfaqet që ka',
+'action-movefile'             => 'lëviz këtë skedë',
+'action-upload'               => 'ngarko këtë skedë',
+'action-reupload'             => 'rishkruaj këtë skedë ekzistuese',
+'action-upload_by_url'        => 'ngarko këtë skedë nga një URL',
+'action-delete'               => 'grise këtë faqe',
+'action-deleterevision'       => 'grise këtë revizion',
+'action-deletedhistory'       => 'shiko historinë e kësaj faqeje të grisur',
+'action-browsearchive'        => 'kërko faqe të grisura',
+'action-undelete'             => 'Restauro këtë faqe',
+'action-suppressrevision'     => 'rishiko dhe rikthe këtë revizion të fshehur',
+'action-block'                => 'blloko përdoruesin',
+'action-protect'              => 'ndrysho nivelin e mbrojtjes për këtë faqe',
+'action-import'               => 'importo këtë faqe nga një wiki tjetër',
+'action-patrol'               => 'shëno redaktimin e tjerëve si të patrulluar',
+'action-autopatrol'           => 'shëno redaktimet tua si të patrulluara',
+'action-unwatchedpages'       => 'shiko listën e faqeve të pa vrojtuara',
+'action-mergehistory'         => 'bashko historikun e kësaj faqeje',
+'action-userrights'           => 'ndrysho të gjitha të drejtat e përdoruesit',
+'action-userrights-interwiki' => 'ndrysho të drejtat e përdoruesve në wiki-t tjera',
+'action-siteadmin'            => 'mbyll ose hap bazën e të dhënave',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|ndryshim|ndryshime}}',
 'recentchanges'                     => 'Ndryshime së fundmi',
+'recentchanges-legend'              => 'Zgjedhjet e ndryshimeve momentale',
 'recentchangestext'                 => 'Ndiqni ndryshime së fundmi tek kjo faqe.',
 'recentchanges-feed-description'    => 'Ndjek ndryshimet më të fundit në wiki tek kjo fushë.',
 'rcnote'                            => "Më poshtë {{PLURAL:$1|është '''1''' ndryshim| janë '''$1''' ndryshime}} së fundmi gjatë <strong>$2</strong> ditëve sipas të dhënave nga $4, $5.",
@@ -987,6 +1153,8 @@ Ju lutem kërkoni {{SITENAME}}-n përpara se të krijoni një artikull të ri se
 'rc_categories'                     => 'Kufizimi i kategorive (të ndara me "|")',
 'rc_categories_any'                 => 'Të gjitha',
 'newsectionsummary'                 => '/* $1 */ seksion i ri',
+'rc-enhanced-expand'                => 'Trego detajet (kërkon JavaScript)',
+'rc-enhanced-hide'                  => 'Fshih detajet',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Ndryshimet fqinje',
@@ -1007,11 +1175,11 @@ Faqet [[Special:Watchlist|nën mbikqyrjen tuaj]] duken të '''theksuara'''.",
 'upload_directory_read_only'  => 'Skedari i ngarkimit ($1) nuk mund të shkruhet nga shërbyesi.',
 'uploaderror'                 => 'Gabim dhënie',
 'uploadtext'                  => "Përdorni formularin e mëposhtëm për të ngarkuar skeda.
-Për të parë ose për të kërkuar skedat e ngarkuara më parë shikoni [[Special:ImageList|listën e skedave të ngarkuara]]. Ngarkime dhe grisje shënohen edhe tek [[Special:Log/upload|regjistri i ngarkimeve]].
+Për të parë ose për të kërkuar skedat e ngarkuara më parë shikoni [[Special:FileList|listën e skedave të ngarkuara]]. Ngarkime dhe grisje shënohen edhe tek [[Special:Log/upload|regjistri i ngarkimeve]].
 
 Për të përdorur një skedë në një faqe përdorni lidhje të llojit:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Skedë.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Skedë.png|Përshkrim]]</nowiki>''' ose
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Skedë.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Skedë.png|Përshkrim]]</nowiki>''' ose
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Skedë.ogg]]</nowiki>''' për lidhje të drejtpërdrejta të skedës.",
 'upload-permitted'            => 'Llojet e lejuara të skedave: $1.',
 'upload-preferred'            => 'Llojet e parapëlqyera të skedave: $1.',
@@ -1032,37 +1200,40 @@ Të gjithë orët janë me orën e shërbyesit.',
 'illegalfilename'             => 'Skeda "$1" përmban gërma që nuk lejohen tek titujt e faqeve. Ju lutem ndërrojani emrin dhe provoni ta ngarkoni përsëri.',
 'badfilename'                 => 'Emri i skedës është ndërruar në "$1".',
 'filetype-badmime'            => 'Skedat e llojit MIME "$1" nuk lejohen për ngarkim.',
-'filetype-unwanted-type'      => "'''\".\$1\"''' është një lloj skede i padëshiruar. Parapëlqehen seda të llojit \$2.",
-'filetype-banned-type'        => "'''\".\$1\"''' është një lloj skede i ndaluar. Lejohen seda të llojit \$2.",
+'filetype-unwanted-type'      => "'''\".\$1\"''' është një lloj skede i padëshiruar.
+Parapëlqehet {{PLURAL:\$3|skeda të jetë e |skedat të jenë të}} llojit \$2.",
+'filetype-banned-type'        => "'''\".\$1\"''' nuk është lloj i lejuar i skedave.
+Si {{PLURAL:\$3|i lejuar është lloji i skedës|të lejuara janë llojet e skedave}} \$2.",
 'filetype-missing'            => 'Skeda nuk ka mbaresë (si p.sh. ".jpg").',
 'large-file'                  => 'Është e këshillueshme që skedat të jenë jo më shumë se $1;
 kjo skedë është $2.',
 'largefileserver'             => 'Skeda është më e madhe se sa serveri e lejon këtë.',
 'emptyfile'                   => 'Skeda që keni dhënë është bosh ose mbi madhësinë e lejushme. Kjo gjë mund të ndodhi nëse shtypni emrin gabim, prandaj kontrolloni nëse dëshironi të jepni skedën me këtë emër.',
-'fileexists'                  => 'Ekziston një skedë me atë emër, ju lutem kontrolloni <strong><tt>$1</tt></strong> në qoftë se nuk jeni të sigurt nëse dëshironi ta zëvendësoni.',
-'filepageexists'              => 'Faqja përshkruese për këtë skedë është krijuar që më parë tek <strong><tt>$1</tt></strong>, por nuk ekziston një skedë me atë emër.
+'fileexists'                  => "Ekziston një skedë me atë emër, ju lutem kontrolloni '''<tt>$1</tt>''' në qoftë se nuk jeni të sigurt nëse dëshironi ta zëvendësoni.",
+'filepageexists'              => "Faqja përshkruese për këtë skedë është krijuar që më parë tek '''<tt>$1</tt>''', por nuk ekziston një skedë me atë emër.
 Përmbledhja që vendosët nuk do të shfaqet tek faqja përshkruese.
-Për ta treguar atje duhet ta redaktoni vetë.',
-'fileexists-extension'        => 'Ekziston një skedë me emër të ngjashëm:<br />
-Emri i skedës në ngarkim: <strong><tt>$1</tt></strong><br />
-Emri i skedës ekzistuese: <strong><tt>$2</tt></strong><br />
-Ju lutem zgjidhni një emër tjetër.',
-'fileexists-thumb'            => "<center>'''Dosja ekziston'''</center>",
-'fileexists-thumbnail-yes'    => 'Kjo skedë duket se është një figurë me madhësi të zvogëluar <i>(figurë përmbledhëse)</i>.
-Ju lutem kontrolloni skedën <strong><tt>$1</tt></strong>.<br />
-Nëse skeda e kontrolluar është e së njëjtës madhësi me origjinalen atëherë nuk ka nevojë të ngarkoni një figurë përmbledhëse.',
-'file-thumbnail-no'           => 'Emri i skedës fillon me <strong><tt>$1</tt></strong>.
-Duket se është një figurë me madhësi të zvogëluar <i>(figurë përmbledhëse)</i>.
-Nëse keni këtë figurë me madhësi të plotë ju lutem të ngarkoni atë, përndryshe ju lutem të ndryshoni emrin e skedës.',
-'fileexists-forbidden'        => 'Ekziston një skedë me të njëjtin emër. Ju lutemi kthehuni mbrapsh dhe ngarkoni këtë skedë me një emër të ri. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Ekziston një skedë me të njëjtin emër në magazinën e përbashkët. Ju lutem kthehuni mbrapsh dhe ngarkojeni këtë skedë me një emër të ri. [[Image:$1|thumb|center|$1]]',
+Për ta treguar atje duhet ta redaktoni vetë.",
+'fileexists-extension'        => "Ekziston një skedë me emër të ngjashëm:<br />
+Emri i skedës në ngarkim: '''<tt>$1</tt>'''<br />
+Emri i skedës ekzistuese: '''<tt>$2</tt>'''<br />
+Ju lutem zgjidhni një emër tjetër.",
+'fileexists-thumb'            => "<center>'''Skedë ekzistuese'''</center>",
+'fileexists-thumbnail-yes'    => "Kjo skedë duket se është një figurë me madhësi të zvogëluar ''(figurë përmbledhëse)''.
+Ju lutem kontrolloni skedën '''<tt>$1</tt>'''.<br />
+Nëse skeda e kontrolluar është e së njëjtës madhësi me origjinalen atëherë nuk ka nevojë të ngarkoni një figurë përmbledhëse.",
+'file-thumbnail-no'           => "Emri i skedës fillon me '''<tt>$1</tt>'''.
+Duket se është një figurë me madhësi të zvogëluar ''(figurë përmbledhëse)''.
+Nëse keni këtë figurë me madhësi të plotë ju lutem të ngarkoni atë, përndryshe ju lutem të ndryshoni emrin e skedës.",
+'fileexists-forbidden'        => 'Ekziston një skedë me të njëjtin emër. Ju lutemi kthehuni mbrapsh dhe ngarkoni këtë skedë me një emër të ri. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Ekziston një skedë me të njëjtin emër në magazinën e përbashkët. Ju lutem kthehuni mbrapsh dhe ngarkojeni këtë skedë me një emër të ri. [[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'Kjo skedë është dyfish i {{PLURAL:$1|skedës|skedave}} në vijim:',
 'successfulupload'            => 'Dhënie e sukseshme',
 'uploadwarning'               => 'Kujdes dhënie',
 'savefile'                    => 'Ruaj skedën',
 'uploadedimage'               => 'dha "[[$1]]"',
 'overwroteimage'              => 'dha dhe zëvendësoi me një version të ri të "[[$1]]"',
 'uploaddisabled'              => 'Ndjesë, dhëniet janë bllokuar në këtë shërbyes dhe nuk është gabimi juaj.',
-'uploaddisabledtext'          => 'Ngarkimi i skedave është ndaluar tek {{SITENAME}}.',
+'uploaddisabledtext'          => 'Ngarkimi i skedave është i ndaluar.',
 'uploadscripted'              => 'Skeda përmban HTML ose kode të tjera që mund të interpretohen gabimisht nga një shfletues.',
 'uploadcorrupt'               => 'Skeda është e dëmtuar ose ka emër të gabuar. Ju lutemi kontrolloni skedën dhe ngarkoni atë përsëri.',
 'uploadvirus'                 => 'Skeda përmban një virus! Detaje: $1',
@@ -1075,8 +1246,8 @@ Nëse keni këtë figurë me madhësi të plotë ju lutem të ngarkoni atë, pë
 
 Duhet të mendoheni nëse është e pranueshme ngarkimi i kësaj skede.
 Regjistri i grisjes së skedës jepet më poshtë:",
-'filename-bad-prefix'         => 'Emri i skedës që po ngarkoni fillon me <strong>"$1"</strong> dhe nuk është veçantisht përshkrues pasi përdoret nga shumë kamera.
-Ju lutem zgjidhni një emër më përshkrues për skedën tuaj.',
+'filename-bad-prefix'         => "Emri i skedës që po ngarkoni fillon me '''\"\$1\"''' dhe nuk është veçantisht përshkrues pasi përdoret nga shumë kamera.
+Ju lutem zgjidhni një emër më përshkrues për skedën tuaj.",
 
 'upload-proto-error'      => 'Protokoll i gabuar',
 'upload-proto-error-text' => 'Ngarkimet nga rrjeti kërkojnë që adresa URL të fillojë me <code>http://</code> ose <code>ftp://</code>.',
@@ -1103,20 +1274,21 @@ Këshillohet që ta provoni kur të jetë më pak e zënë.',
 'upload_source_url'  => ' (URL e vlefshme, publikisht e përdorshme)',
 'upload_source_file' => ' (skeda në kompjuterin tuaj)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Kjo faqe speciale tregon tërë skedat e ngarkuara.
+# Special:ListFiles
+'listfiles-summary'     => 'Kjo faqe speciale tregon tërë skedat e ngarkuara.
 Fillimisht skedat e ngarkuara së fundmi jepen më sipër.
 Shtypni kolonat e tjera për të ndryshuar radhitjen.',
-'imagelist_search_for'  => 'Kërko për emrin e figurës:',
+'listfiles_search_for'  => 'Kërko për emrin e figurës:',
 'imgfile'               => 'skeda',
-'imagelist'             => 'Lista e figurave',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Emri',
-'imagelist_user'        => 'Përdoruesi',
-'imagelist_size'        => 'Madhësia (bytes)',
-'imagelist_description' => 'Përshkrimi',
-
-# Image description page
+'listfiles'             => 'Lista e figurave',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Emri',
+'listfiles_user'        => 'Përdoruesi',
+'listfiles_size'        => 'Madhësia (bytes)',
+'listfiles_description' => 'Përshkrimi',
+'listfiles_count'       => 'Versionet',
+
+# File description page
 'filehist'                       => 'Historiku i dosjes',
 'filehist-help'                  => 'Shtypni një datë/kohë për ta parë skedën ashtu si dukej në atë kohë.',
 'filehist-deleteall'             => 'grisi të tëra',
@@ -1124,6 +1296,9 @@ Shtypni kolonat e tjera për të ndryshuar radhitjen.',
 'filehist-revert'                => 'riktheje',
 'filehist-current'               => 'e tanishme',
 'filehist-datetime'              => 'Data/Ora',
+'filehist-thumb'                 => 'Parapamje',
+'filehist-thumbtext'             => 'Parapamja për versionin nga $1',
+'filehist-nothumb'               => "S'ka parapamje",
 'filehist-user'                  => 'Përdoruesi',
 'filehist-dimensions'            => 'Dimensionet',
 'filehist-filesize'              => 'Madhësia e skedës',
@@ -1132,8 +1307,8 @@ Shtypni kolonat e tjera për të ndryshuar radhitjen.',
 'linkstoimage'                   => '{{PLURAL:$1|faqe lidhet|$1 faqe lidhen}} tek kjo skedë:',
 'nolinkstoimage'                 => 'Asnjë faqe nuk lidhet tek kjo skedë.',
 'morelinkstoimage'               => 'Shikoni [[Special:WhatLinksHere/$1|më shumë lidhje]] tek kjo skedë.',
-'redirectstofile'                => 'Skedat e mëposhtme përcillen tek kjo skedë:',
-'duplicatesoffile'               => 'Skedat e më poshtme janë kopje të kësaj skede:',
+'redirectstofile'                => 'Skeda vijuese {{PLURAL:$1|file redirects|$1 ridrejtohet}} tek kjo skedë:',
+'duplicatesoffile'               => 'Skedat vijuese {{PLURAL:$1|është e dyfishtë|$1 dyfishohen}} tek kjo skedë:',
 'sharedupload'                   => 'Kjo skedë është një ngarkim i përbashkët dhe mund të përdoret nga projekte të tjera.',
 'shareduploadwiki'               => 'Ju lutem shikoni $1 për më shumë informacion.',
 'shareduploadwiki-desc'          => '$1 së atjeshme tregohet më poshtë',
@@ -1165,10 +1340,9 @@ Shtypni kolonat e tjera për të ndryshuar radhitjen.',
 'filedelete-comment'          => 'Arsyeja:',
 'filedelete-submit'           => 'Grise',
 'filedelete-success'          => "'''$1''' është grisur.",
-'filedelete-success-old'      => '<span class="plainlinks">Versioni i \'\'\'[[Media:$1|$1]]\'\'\' së $3, $2 është grisur.</span>',
+'filedelete-success-old'      => "Versioni i '''[[Media:$1|$1]]''' që nga $3, $2 është grisur.",
 'filedelete-nofile'           => "'''$1''' nuk ekziston.",
 'filedelete-nofile-old'       => "Nuk ka version të arkivuar të '''$1''' me të dhënat e kërkuara.",
-'filedelete-iscurrent'        => 'Jeni duke grisur versionin e tanishëm të kësaj skede. Ju lutem më parë rikthejeni tek një version më të vjetër.',
 'filedelete-otherreason'      => 'Arsye tjetër / shtesë:',
 'filedelete-reason-otherlist' => 'Arsye tjetër',
 'filedelete-reason-dropdown'  => '*Arsye të shpeshpërdorura për grisje:
@@ -1190,30 +1364,36 @@ Shtypni kolonat e tjera për të ndryshuar radhitjen.',
 
 # Unused templates
 'unusedtemplates'     => 'Stampa të papërdorura',
-'unusedtemplatestext' => "Kjo faqe jep listën e të gjitha faqeve nën hapësirën Stampa të cilat nuk janë përdorur në faqe të tjera. Kujtohu të kontrollosh edhe për lidhje tek stampat përpara se t'i grisësh si të papërdorura.",
+'unusedtemplatestext' => 'Kjo faqe radhitë të gjitha faqet në {{ns:template}} që nuk janë të përfshira në faqe tjera.
+Mos harroni të shihni nyje tjera të stampave para grisjes së tyre.',
 'unusedtemplateswlh'  => 'lidhje',
 
 # Random page
 'randompage'         => 'Artikull i rastit',
-'randompage-nopages' => 'Nuk ka faqe në këtë hapësirë.',
+'randompage-nopages' => 'Nuk ka faqe në "$1".',
 
 # Random redirect
 'randomredirect'         => 'Përcjellim i rastit',
-'randomredirect-nopages' => 'Nuk ka përcjellime në këtë hapësirë.',
+'randomredirect-nopages' => 'Nuk ka përcjellim në "$1".',
 
 # Statistics
-'statistics'             => 'Statistika',
-'sitestats'              => 'Statistikat e faqeve',
-'userstats'              => 'Statistikat e përdoruesve',
-'sitestatstext'          => "{{PLURAL:\$1|Gjëndet '''1''' faqe|Gjënden '''\$1''' faqe}} në totalin e regjistrit. Kjo përfshin faqet e \"diskutimit\", faqe rreth {{SITENAME}}, faqe \"cungje\" të vogla, përcjellime, dhe faqe të tjera që ndoshta nuk kualifikohen si artikuj. Duke mos i përfshirë këto, ka {{PLURAL:\$2| '''1''' faqe që është artikull i ligjshëm|'''\$2''' faqe që janë artikuj të ligjshëm}}.
-
-'''\$8''' {{PLURAL:\$8|skedë është|skeda janë}} ngarkuar.
-
-'''\$3''' {{PLURAL:\$3|Është bërë '''\$3''' shikim faqeje|Janë bërë '''\$3''' shikime faqesh}} dhe '''\$4''' {{PLURAL:\$4|redaktim faqeje|redaktime faqesh}} që nga dita kur {{SITENAME}} u hap. Kjo do të thotë se janë bërë afërsisht '''\$5''' redaktime për faqe, dhe '''\$6''' shikime për çdo redaktim.
-
-Gjatësia e [http://www.mediawiki.org/wiki/Manual:Job_queue radhës së punëve] është '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Gjëndet|Gjënden}} '''$1''' [[Special:ListUsers|përdorues]] {{PLURAL:$1|i|të}} regjistruar. '''$2''' prej tyre (ose '''$4'''%) {{PLURAL:$2|ka|kanë}} privilegjin $5.",
-'statistics-mostpopular' => 'Faqet më të shikuara',
+'statistics'                   => 'Statistika',
+'statistics-header-pages'      => 'Statistikat e faqes',
+'statistics-header-edits'      => 'Statistikat e redaktimit',
+'statistics-header-views'      => 'Statistikat e shikimit',
+'statistics-header-users'      => 'Statistikat e përdoruesve',
+'statistics-articles'          => 'Përmbajtja e faqeve',
+'statistics-pages'             => 'Faqet',
+'statistics-pages-desc'        => 'Të gjitha faqet në wiki, duke përfshitë edhe faqet e diskutimit, zhvendosjet, etj.',
+'statistics-files'             => 'Skedat e ngarkuara',
+'statistics-edits-average'     => 'Ndryshime mesatare për faqe',
+'statistics-views-total'       => 'Shikimet gjithsej',
+'statistics-views-peredit'     => 'Shikimet për redaktim',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Gjatësia e radhës së punës]',
+'statistics-users'             => '[[Special:ListUsers|Përdoruesit]] e regjistruar',
+'statistics-users-active'      => 'Përdoruesit aktiv',
+'statistics-users-active-desc' => 'Përdoruesit që kanë së paku një veprim në {{PLURAL:$1|ditën|$1 ditët}} e fundit',
+'statistics-mostpopular'       => 'Faqet më të shikuara',
 
 'disambiguations'      => 'Faqe kthjelluese',
 'disambiguationspage'  => 'Template:Kthjellim',
@@ -1221,11 +1401,13 @@ Gjatësia e [http://www.mediawiki.org/wiki/Manual:Job_queue radhës së punëve]
 Ato duhet të kenë lidhje të drejtpërdrejtë tek artikujt e nevojshëm.<br />
 Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[MediaWiki:Disambiguationspage]]",
 
-'doubleredirects'     => 'Përcjellime dopjo',
-'doubleredirectstext' => '<b>Kujdes:</b> Kjo listë mund të ketë lidhje gabim. D.m.th. ka tekst dhe lidhje mbas #REDIRECT-it të parë.
+'doubleredirects'            => 'Përcjellime dopjo',
+'doubleredirectstext'        => '<b>Kujdes:</b> Kjo listë mund të ketë lidhje gabim. D.m.th. ka tekst dhe lidhje mbas #REDIRECT-it të parë.
 
 <br />
 Çdo rresht ka lidhje tek përcjellimi i parë dhe i dytë, gjithashtu ka edhe rreshtin e parë të tekstit të përcjellimit të dytë, duke dhënë dhe artikullin e "vërtetë", me të cilin përcjellimi i parë duhet të lidhet.',
+'double-redirect-fixed-move' => '[[$1]] u zhvendos, tani është gjendet në [[$2]]',
+'double-redirect-fixer'      => 'Rregullues zhvendosjesh',
 
 'brokenredirects'        => 'Përcjellime të prishura',
 'brokenredirectstext'    => "Përcjellimet që vijojnë lidhen tek një artikull që s'ekziston.",
@@ -1248,7 +1430,7 @@ Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[Me
 'nviews'                  => '$1 {{PLURAL:$1|shikim|shikime}}',
 'specialpage-empty'       => 'Kjo faqe është boshe.',
 'lonelypages'             => 'Artikuj të palidhur',
-'lonelypagestext'         => 'Te artikujt në vijim nuk lidh asnjë artikull tjetër në këtë wiki.',
+'lonelypagestext'         => 'Faqet në vijim nuk janë të lidhura ose nuk janë të përfshira në faqet tjera në {{SITENAME}}.',
 'uncategorizedpages'      => 'Artikuj të pakategorizuar',
 'uncategorizedcategories' => 'Kategori të pakategorizuara',
 'uncategorizedimages'     => 'Figura pa kategori',
@@ -1258,6 +1440,8 @@ Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[Me
 'popularpages'            => 'Artikuj të frekuentuar shpesh',
 'wantedcategories'        => 'Kategori më të dëshiruara',
 'wantedpages'             => 'Artikuj më të dëshiruar',
+'wantedfiles'             => 'Skedat e dëshiruara',
+'wantedtemplates'         => 'Stampat e dëshiruara',
 'mostlinked'              => 'Artikuj më të lidhur',
 'mostlinkedcategories'    => 'Kategori më të lidhura',
 'mostlinkedtemplates'     => 'Stampa më të lidhur',
@@ -1277,6 +1461,8 @@ Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[Me
 'protectedtitlestext'     => 'Krijimi i këtyre titujve është i mbrojtur',
 'protectedtitlesempty'    => 'Asnjë titull i mbrojtur nuk u gjet në këtë hapësirë.',
 'listusers'               => 'Lista e përdoruesve',
+'listusers-editsonly'     => 'Trego vetëm përdoruesit me redaktime',
+'usereditcount'           => '$1 {{PLURAL:$1|redaktim|redaktime}}',
 'newpages'                => 'Artikuj të rinj',
 'newpages-username'       => 'Përdoruesi:',
 'ancientpages'            => 'Artikuj më të vjetër',
@@ -1304,6 +1490,7 @@ Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[Me
 'all-logs-page'        => 'Të gjitha regjistrat',
 'alllogstext'          => 'Kjo faqe tregon një pamje të përmbledhur të regjistrave të ngarkimeve, grisjeve, mbrojtjeve, bllokimeve, dhe të veprimeve administrative. Mundeni të kufizoni informactionin sipas tipit të regjistrit, emrit të përdoruesit, si dhe faqes në çështje.',
 'logempty'             => 'Nuk ka asnjë përputhje në regjistër.',
+'log-title-wildcard'   => 'Kërko tituj që fillojnë me këtë tekst',
 
 # Special:AllPages
 'allpages'          => 'Të gjitha faqet',
@@ -1311,6 +1498,7 @@ Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[Me
 'nextpage'          => 'Faqja më pas ($1)',
 'prevpage'          => 'Faqja më parë ($1)',
 'allpagesfrom'      => 'Trego faqet duke filluar nga:',
+'allpagesto'        => 'Shfaq faqet që mbarojnë në:',
 'allarticles'       => 'Të gjithë artikujt',
 'allinnamespace'    => 'Të gjitha faqet (hapësira $1)',
 'allnotinnamespace' => 'Të gjitha faqet (jo në hapësirën $1)',
@@ -1318,46 +1506,80 @@ Një faqe trajtohet si faqe kthjelluese nëse përdor stampat e lidhura nga [[Me
 'allpagesnext'      => 'Më pas',
 'allpagessubmit'    => 'Shko',
 'allpagesprefix'    => 'Trego faqet me parashtesë:',
+'allpages-bad-ns'   => '{{SITENAME}} nuk ka hapësirë "$1".',
 
 # Special:Categories
-'categories'         => 'Kategori',
-'categoriespagetext' => 'Ndodhen këto kategori:',
+'categories'                    => 'Kategori',
+'categoriespagetext'            => 'Kategoritë në vijim përmbajnë faqe ose media.
+[[Special:UnusedCategories|Kategoritë e pa përdorura]] nuk janë të paraqitura këtu.
+Shih edhe [[Special:WantedCategories|kategoritë e dëshiruara]].',
+'categoriesfrom'                => 'Paraqit kategoritë duke filluar në:',
+'special-categories-sort-count' => 'radhit sipas numrit',
+'special-categories-sort-abc'   => 'radhiti sipas alfabetit',
+
+# Special:DeletedContributions
+'deletedcontributions' => 'Kontribute të grisura',
+
+# Special:LinkSearch
+'linksearch'       => 'Kërkoni lidhje të jashtme',
+'linksearch-pat'   => 'Motivi kërkimor:',
+'linksearch-ns'    => 'Hapësira:',
+'linksearch-ok'    => 'Kërko',
+'linksearch-text'  => 'Ylli zëvëndësues mund të përdoret si p.sh. "*.wikipedia.org".',
+'linksearch-line'  => '$1 lidhur nga $2',
+'linksearch-error' => 'Ylli mund të përdoret vetëm në fillim të emrit',
 
 # Special:ListUsers
 'listusersfrom'      => 'Trego përdoruesit duke filluar prej te:',
 'listusers-submit'   => 'Trego',
 'listusers-noresult' => "Asnjë përdorues s'u gjet.",
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Regjistri i llogarive',
+'newuserlogpagetext'          => 'Ky është një regjistër i llogarive të fundit që janë hapur',
+'newuserlog-byemail'          => 'fjalëkalimi u dërgua në postën elektronike',
+'newuserlog-create-entry'     => 'Përdorues i ri',
+'newuserlog-create2-entry'    => 'krijoi llogarin për përdouesin $1',
+'newuserlog-autocreate-entry' => 'Llogaria u hap automatikisht',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Grupime përdoruesish me privilegje',
-'listgrouprights-summary'  => 'Më poshtë jepet grupimi i përdoruesve sipas privilegjeve që ju janë dhënë në këtë wiki. Më shumë informacion rreth privilegjeve në veçanti mund të gjendet tek [[{{MediaWiki:Listgrouprights-helppage}}]].',
-'listgrouprights-group'    => 'Grupi',
-'listgrouprights-rights'   => 'Privilegjet',
-'listgrouprights-helppage' => 'Help:Grupime privilegjesh',
-'listgrouprights-members'  => '(lista e anëtarëve)',
+'listgrouprights'                 => 'Grupime përdoruesish me privilegje',
+'listgrouprights-summary'         => 'Më poshtë jepet grupimi i përdoruesve sipas privilegjeve që ju janë dhënë në këtë wiki. Më shumë informacion rreth privilegjeve në veçanti mund të gjendet tek [[{{MediaWiki:Listgrouprights-helppage}}]].',
+'listgrouprights-group'           => 'Grupi',
+'listgrouprights-rights'          => 'Privilegjet',
+'listgrouprights-helppage'        => 'Help:Grupime privilegjesh',
+'listgrouprights-members'         => '(lista e anëtarëve)',
+'listgrouprights-addgroup'        => 'Mund të vendosë {{PLURAL:$2|grup|grupe}}: $1',
+'listgrouprights-removegroup'     => 'Mund të {{PLURAL:$2|lëvizet grupi|lëvizen grupet}}: $1',
+'listgrouprights-addgroup-all'    => 'Mund të vendos të gjitha grupet',
+'listgrouprights-removegroup-all' => 'Mund të largojë të gjitha grupet',
 
 # E-mail user
-'mailnologin'     => "S'ka adresë dërgimi",
-'mailnologintext' => 'Duhet të keni [[Special:UserLogin|hyrë brenda]] dhe të keni një adresë të saktë në [[Special:Preferences|parapëlqimet]] tuaja për tu dërguar email përdoruesve të tjerë.',
-'emailuser'       => 'Email përdoruesit',
-'emailpage'       => 'Dërgo email përdoruesve',
-'emailpagetext'   => 'Në qoftë se ky përdorues ka dhënë një adresë të saktë në parapëlqimet, formulari më poshtë do t\'i dërgojë një mesazh. 
+'mailnologin'      => "S'ka adresë dërgimi",
+'mailnologintext'  => 'Duhet të keni [[Special:UserLogin|hyrë brenda]] dhe të keni një adresë të saktë në [[Special:Preferences|parapëlqimet]] tuaja për tu dërguar email përdoruesve të tjerë.',
+'emailuser'        => 'Email përdoruesit',
+'emailpage'        => 'Dërgo email përdoruesve',
+'emailpagetext'    => 'Në qoftë se ky përdorues ka dhënë një adresë të saktë në parapëlqimet, formulari më poshtë do t\'i dërgojë një mesazh. 
 
 Adresa e email-it që keni dhënë në parapëlqimet do të duket si pjesa "From" e adresës së mesazhit, kështuqë marrësi do të ketë mundësi tu përgjigjet.',
-'usermailererror' => 'Objekti postal ktheu gabimin:',
-'defemailsubject' => '{{SITENAME}} email',
-'noemailtitle'    => "S'ka adresë email-i",
-'noemailtext'     => "Ky përdorues s'ka dhënë një adresë të saktë,
+'usermailererror'  => 'Objekti postal ktheu gabimin:',
+'defemailsubject'  => '{{SITENAME}} email',
+'noemailtitle'     => "S'ka adresë email-i",
+'noemailtext'      => "Ky përdorues s'ka dhënë një adresë të saktë,
 ose ka vendosur të mos pranojë mesazhe email-i nga përdorues të tjerë.",
-'emailfrom'       => 'Nga',
-'emailto'         => 'Për',
-'emailsubject'    => 'Subjekti',
-'emailmessage'    => 'Mesazh',
-'emailsend'       => 'Dërgo',
-'emailccme'       => 'Dërgom edhe mua një kopje të këtij emaili.',
-'emailccsubject'  => 'Kopje e emailit tuaj për $1: $2',
-'emailsent'       => 'Email-i u dërgua',
-'emailsenttext'   => 'Email-i është dërguar.',
+'nowikiemailtitle' => 'Nuk lejohet postë elektronike',
+'nowikiemailtext'  => 'Ky përdorues ka zgjedhur të mos pranojë porosi elektronike nga përdoruesit tjerë.',
+'email-legend'     => 'Dërgoi një porosi elektronike një përdoruesit {{SITENAME}}',
+'emailfrom'        => 'Nga:',
+'emailto'          => 'Për:',
+'emailsubject'     => 'Subjekti:',
+'emailmessage'     => 'Porosia:',
+'emailsend'        => 'Dërgo',
+'emailccme'        => 'Dërgom edhe mua një kopje të këtij emaili.',
+'emailccsubject'   => 'Kopje e emailit tuaj për $1: $2',
+'emailsent'        => 'Email-i u dërgua',
+'emailsenttext'    => 'Email-i është dërguar.',
+'emailuserfooter'  => 'Kjo porosi elektronike u dërgua nga $1 tek $2 nga "Dërgoi postë elektronike përdoruesit" funksion në {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Lista mbikqyrëse',
@@ -1377,6 +1599,7 @@ Në qoftë se dëshironi të hiqni një faqe nga lista mbikqyrëse më vonë, sh
 'unwatch'              => 'Çmbikqyre',
 'unwatchthispage'      => 'Mos e mbikqyr',
 'notanarticle'         => 'Nuk është artikull',
+'notvisiblerev'        => 'Revizioni është grisur',
 'watchnochange'        => 'Asnjë nga artikujt nën mbikqyrje nuk është redaktuar gjatë kohës së dhënë.',
 'watchlist-details'    => '{{PLURAL:$1|$1 faqe|$1 faqe}} nën mbikqyrje duke mos numëruar faqet e diskutimit.',
 'wlheader-enotif'      => '* Njoftimi me email është lejuar.',
@@ -1387,12 +1610,7 @@ Në qoftë se dëshironi të hiqni një faqe nga lista mbikqyrëse më vonë, sh
 'iteminvalidname'      => "Problem me artikullin '$1', titull jo i saktë...",
 'wlnote'               => "Më poshtë {{PLURAL:$1|është $1 ndryshim i|janë $1 ndryshimet e}} {{PLURAL:$2|orës së fundit|'''$2''' orëve të fundit}}.",
 'wlshowlast'           => 'Trego $1 orët $2 ditët $3',
-'watchlist-show-bots'  => 'Trego redaktimet e robotëve',
-'watchlist-hide-bots'  => 'Fshih redaktimet e robotëve',
-'watchlist-show-own'   => 'Trego redaktimet e mia',
-'watchlist-hide-own'   => 'Fshih redaktimet e mia',
-'watchlist-show-minor' => 'Trego redaktimet e vogla',
-'watchlist-hide-minor' => 'Fshih redaktimet e vogla',
+'watchlist-options'    => 'Mundësit e listës mbikqyrëse',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Duke mbikqyrur...',
@@ -1430,60 +1648,70 @@ Për të ndryshuar parapëlqimet e mbikqyrjes shikoni {{fullurl:Special:Watchlis
 Për të na dhënë përshtypjet tuaja ose për ndihmë të mëtejshme:
 {{fullurl:Help:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Grise faqen',
-'confirm'                     => 'Konfirmoni',
-'excontent'                   => "përmbajtja ishte: '$1'",
-'excontentauthor'             => "përmbajtja ishte: '$1' (dhe i vetmi redaktor ishte '$2')",
-'exbeforeblank'               => "përmbajtja përpara boshatisjes ishte: '$1'",
-'exblank'                     => 'faqja është bosh',
-'historywarning'              => 'Kujdes: Faqja që jeni bërë gati për të grisur ka histori:',
-'confirmdeletetext'           => "Jeni duke grisur '''përfundimisht''' një faqe ose një skedë me tër historinë e saj nga regjistri. Ju lutem konfirmoni që keni ndër mënd ta bëni këtë gjë, që i kuptoni se cilat janë pasojat, dhe që po veproni në përputhje me [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Veprim i mbaruar',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" është grisur nga regjistri. Shikoni $2 për një pasqyrë të grisjeve së fundmi.',
-'deletedarticle'              => 'grisi "$1"',
-'dellogpage'                  => 'Regjistri i grisjeve',
-'dellogpagetext'              => 'Më poshtë është një listë e grisjeve më të fundit.
+# Delete
+'deletepage'             => 'Grise faqen',
+'confirm'                => 'Konfirmoni',
+'excontent'              => "përmbajtja ishte: '$1'",
+'excontentauthor'        => "përmbajtja ishte: '$1' (dhe i vetmi redaktor ishte '$2')",
+'exbeforeblank'          => "përmbajtja përpara boshatisjes ishte: '$1'",
+'exblank'                => 'faqja është bosh',
+'delete-confirm'         => 'Grise "$1"',
+'delete-legend'          => 'Grise',
+'historywarning'         => 'Kujdes: Faqja që jeni bërë gati për të grisur ka histori:',
+'confirmdeletetext'      => "Jeni duke grisur '''përfundimisht''' një faqe ose një skedë me tër historinë e saj nga regjistri. Ju lutem konfirmoni që keni ndër mënd ta bëni këtë gjë, që i kuptoni se cilat janë pasojat, dhe që po veproni në përputhje me [[{{MediaWiki:Policy-url}}]].",
+'actioncomplete'         => 'Veprim i mbaruar',
+'deletedtext'            => '"<nowiki>$1</nowiki>" është grisur nga regjistri. Shikoni $2 për një pasqyrë të grisjeve së fundmi.',
+'deletedarticle'         => 'grisi "$1"',
+'suppressedarticle'      => '"[[$1]]" i shtypur',
+'dellogpage'             => 'Regjistri i grisjeve',
+'dellogpagetext'         => 'Më poshtë është një listë e grisjeve më të fundit.
 Të gjitha kohët janë sipas orës së shërbyesit.',
-'deletionlog'                 => 'regjistrin e grisjeve',
-'reverted'                    => 'Kthehu tek një version i vjetër',
-'deletecomment'               => 'Arsyeja',
-'deleteotherreason'           => 'Arsye tjetër:',
-'deletereasonotherlist'       => 'Arsyeja tjetër',
-'deletereason-dropdown'       => '*Arsye për grisje:
+'deletionlog'            => 'regjistrin e grisjeve',
+'reverted'               => 'Kthehu tek një version i vjetër',
+'deletecomment'          => 'Arsyeja',
+'deleteotherreason'      => 'Arsye tjetër:',
+'deletereasonotherlist'  => 'Arsyeja tjetër',
+'deletereason-dropdown'  => '*Arsye për grisje:
 ** Vandalizëm
 ** Përmbajtje jo-enciklopedike
 ** Pa të drejtë autori
 ** Kërkesë nga autori',
-'rollback'                    => 'Riktheji mbrapsh redaktimet',
-'rollback_short'              => 'Riktheje',
-'rollbacklink'                => 'riktheje',
-'rollbackfailed'              => 'Rikthimi dështoi',
-'cantrollback'                => 'Nuk munda ta kthejë redaktimin; redaktori i fundit është i vetmi autor i këtij artikulli.',
-'alreadyrolled'               => 'Nuk munda ta rikthej redaktimin e fundit e [[:$1]] nga [[User:$2|$2]] ([[User talk:$2|Diskutim]]); dikush tjetër e ka redaktuar ose rikthyer këtë faqe.
+'delete-edit-reasonlist' => 'Redakto arsyet e grisjes',
+
+# Rollback
+'rollback'         => 'Riktheji mbrapsh redaktimet',
+'rollback_short'   => 'Riktheje',
+'rollbacklink'     => 'riktheje',
+'rollbackfailed'   => 'Rikthimi dështoi',
+'cantrollback'     => 'Nuk munda ta kthejë redaktimin; redaktori i fundit është i vetmi autor i këtij artikulli.',
+'alreadyrolled'    => 'Nuk munda ta rikthej redaktimin e fundit e [[:$1]] nga [[User:$2|$2]] ([[User talk:$2|Diskutim]]); dikush tjetër e ka redaktuar ose rikthyer këtë faqe.
 
 Redaktimi i fundit është bërë nga [[User:$3|$3]] ([[User talk:$3|Diskutim]]).',
-'editcomment'                 => 'Komenti i redaktimit ishte: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Ndryshimet e [[Special:Contributions/$2|$2]] ([[User talk:$2|diskutimet]]) u kthyen mbrapsht, artikulli tani ndodhet në versionin e fundit nga [[User:$1|$1]].', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Ndryshimet e $1 u kthyen mbrapsh; artikulli ndodhet tek verzioni i $2.',
-'sessionfailure'              => 'Më duket se ka një problem me seancën tuaj të hyrjes. Veprimi juaj nuk është kryer për tu mbrojtur nga ndonjë veprim dashakeq kundrejt shfletimit tuaj. Ju lutem kthehuni mbrapsh, rifreskoni faqen prej nga erdhët dhe provojeni përsëri veprimin.',
+'editcomment'      => "Komenti i redaktimit ishte: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Ndryshimet e [[Special:Contributions/$2|$2]] ([[User talk:$2|diskutimet]]) u kthyen mbrapsht, artikulli tani ndodhet në versionin e fundit nga [[User:$1|$1]].', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Ndryshimet e $1 u kthyen mbrapsh; artikulli ndodhet tek verzioni i $2.',
+'sessionfailure'   => 'Më duket se ka një problem me seancën tuaj të hyrjes. Veprimi juaj nuk është kryer për tu mbrojtur nga ndonjë veprim dashakeq kundrejt shfletimit tuaj. Ju lutem kthehuni mbrapsh, rifreskoni faqen prej nga erdhët dhe provojeni përsëri veprimin.',
+
+# Protect
 'protectlogpage'              => 'Regjistri i mbrojtjeve',
-'protectlogtext'              => 'Më poshtë është një listë e "mbrojtjeve/lirimeve" të faqeve.
-Shikoni Faqe e mbrojtur për më shumë informacion.',
+'protectlogtext'              => 'Më poshtë është lista e kyçjeve dhe çkyçjeve të faqes.
+Shih listën e [[Special:ProtectedPages|faqeve të mbrojtura]] nga lista e mbrojtjeve të faqeve tani në veprim.',
 'protectedarticle'            => 'mbrojti [[$1]]',
 'modifiedarticleprotection'   => 'ndryshoi mbrojtjen e faqes "[[$1]]"',
 'unprotectedarticle'          => 'liroi [[$1]]',
+'movedarticleprotection'      => 'u bartën të dhënat e mbrojtjes nga "[[$2]]" në "[[$1]]"',
 'protect-title'               => 'Duke ndryshuar mbrojtjen e "$1"',
+'prot_1movedto2'              => '[[$1]] u zhvendos tek [[$2]]',
 'protect-legend'              => 'Konfirmoni',
 'protectcomment'              => 'Arsyeja:',
 'protectexpiry'               => 'Afati',
 'protect_expiry_invalid'      => 'Data e skadimit është e gabuar.',
 'protect_expiry_old'          => 'Data e skadencës është në të shkuarën.',
 'protect-unchain'             => 'Ndrysho lejen e zhvendosjeve',
-'protect-text'                => 'Këtu mund të shikoni dhe ndryshoni nivelin e mbrojtjes për faqen <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Nuk mund të ndryshoni nivelet e mbrojtjes duke qenë i bllokuar. Kufizimet e kësaj faqeje janë <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Nivelet e mbrojtjes nuk mund të ndryshohen pasi regjistri është i bllokuar. Kufizimet e kësaj faqeje janë <strong>$1</strong>:',
-'protect-locked-access'       => 'Llogaria juaj nuk ka privilegjet e nevojitura për të ndryshuar nivelin e mbrojtjes. Kufizimet e kësaj faqeje janë <strong>$1</strong>:',
+'protect-text'                => "Këtu mund të shikoni dhe ndryshoni nivelin e mbrojtjes për faqen '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Nuk mund të ndryshoni nivelet e mbrojtjes duke qenë i bllokuar. Kufizimet e kësaj faqeje janë '''$1''':",
+'protect-locked-dblock'       => "Nivelet e mbrojtjes nuk mund të ndryshohen pasi regjistri është i bllokuar. Kufizimet e kësaj faqeje janë '''$1''':",
+'protect-locked-access'       => "Llogaria juaj nuk ka privilegjet e nevojitura për të ndryshuar nivelin e mbrojtjes. Kufizimet e kësaj faqeje janë '''$1''':",
 'protect-cascadeon'           => 'Kjo faqe është e mbrojtur pasi është përfshirë {{PLURAL:$1|këtë faqe që është|këto faqe që janë}} nën mbrojtje "ujëvarë".
 Mund të ndryshoni nivelin e mbrojtjes të kësaj faqeje por kjo nuk do të ndryshojë mbrojtjen "ujëvarë".',
 'protect-default'             => '(parazgjedhje)',
@@ -1492,8 +1720,16 @@ Mund të ndryshoni nivelin e mbrojtjes të kësaj faqeje por kjo nuk do të ndry
 'protect-level-sysop'         => 'Lejo vetëm administruesit',
 'protect-summary-cascade'     => 'të varura',
 'protect-expiring'            => 'skadon me $1 (UTC)',
+'protect-expiry-indefinite'   => 'i pacaktuar',
 'protect-cascade'             => 'Mbrojtje e ndërlidhur - mbro çdo faqe që përfshihet në këtë faqe.',
 'protect-cantedit'            => 'Nuk mund ta ndryshoni nivelin e mbrojtjes të kësaj faqeje sepse nuk keni leje për këtë.',
+'protect-othertime'           => 'Kohë tjetër:',
+'protect-othertime-op'        => 'kohë tjetër',
+'protect-existing-expiry'     => 'Koha ekzistuese e skadimit: $3, $2',
+'protect-otherreason'         => 'Arsye tjera/shtesë:',
+'protect-otherreason-op'      => 'arsye tjera/shtesë',
+'protect-edit-reasonlist'     => 'Redakto arsyet e mbrojtjes',
+'protect-expiry-options'      => '1 Orë:1 hour,2 Orë:2 hours,6 Orë:6 hours,1 Ditë:1 day,3 Ditë:3 days,1 Javë:1 week,2 Javë:2 weeks,1 Muaj:1 month,3 Muaj:3 months,1 Vjet:1 year,Pa kufi:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Lejet:',
 'restriction-level'           => 'Mbrojtjet:',
 'minimum-size'                => 'Madhësia minimale',
@@ -1512,31 +1748,40 @@ Mund të ndryshoni nivelin e mbrojtjes të kësaj faqeje por kjo nuk do të ndry
 'restriction-level-all'           => 'çdo nivel',
 
 # Undelete
-'undelete'                 => 'Restauroni faqet e grisura',
-'undeletepage'             => 'Shikoni ose restauroni faqet e grisura',
-'viewdeletedpage'          => 'Shikoni faqet e grisura',
-'undeletepagetext'         => 'Më poshtë janë faqet që janë grisur por që gjënden akoma në arkiv dhe mund të restaurohen. Arkivi boshatiset periodikisht.',
-'undeleteextrahelp'        => "Lini bosh të gjitha kutitë e zgjedhjes dhe shqypni '''''Restauro!''''' për të restauruar të gjitha versionet e faqes. Për të bërë një restaurim të pjesshëm zgjidhni kutitë e versioneve që dëshironi të restauroni dhe shtypni '''''Restauro!'''''. Mund të boshatisni të gjitha zgjedhjet dhe arsyen duke shtypur '''''Boshatis'''''.",
-'undeleterevisions'        => '$1 {{PLURAL:$1|version u fut|versione u futën}} në arkiv',
-'undeletehistory'          => 'N.q.s. restauroni një faqe, të gjitha versionet do të restaurohen në histori. N.q.s. një faqe e re me të njëjtin titull është krijuar që nga grisja, versionet e restauruara do të duken më përpara në histori, dhe versioni i faqes së fundit nuk do të shkëmbehet automatikisht.',
-'undeletehistorynoadmin'   => 'Kjo faqe është grisur. Arsyeja për grisjen është dhënë tek përmbledhja më poshtë bashkë me hollësitë e përdoruesve që e kanë redaktuar.',
-'undelete-revision'        => 'Version i grisur i $1 (deri më $2) nga $3:',
-'undeletebtn'              => 'Restauro!',
-'undeletereset'            => 'Boshatis',
-'undeletecomment'          => 'Arsyeja:',
-'undeletedarticle'         => 'u restaurua "$1"',
-'undeletedrevisions'       => '$1 {{PLURAL:$1|version u restaurua|versione u restauruan}}',
-'undeletedrevisions-files' => '$1 {{PLURAL:$1|version|versione}} dhe $2 {{PLURAL:$2|skedë|skeda}} janë restauruar',
-'undeletedfiles'           => '$1 {{PLURAL:$1|skedë u restaurua|skeda u restauruan}}',
-'cannotundelete'           => 'Restaurimi dështoi; dikush tjetër mund ta ketë restauruar faqen përpara jush.',
-'undeletedpage'            => "<big>'''$1 është restauruar'''</big>
+'undelete'                   => 'Restauroni faqet e grisura',
+'undeletepage'               => 'Shikoni ose restauroni faqet e grisura',
+'viewdeletedpage'            => 'Shikoni faqet e grisura',
+'undeletepagetext'           => '{{PLURAL:$1|Faqja në vazhdim është grisur, por akoma është|$1 Faqet në vazhdim janë grisur, por akoma janë}} në arkiv dhe mund të rikthehen.
+Arkivi, kohëpaskohe është e mundur të pastrohet.',
+'undelete-fieldset-title'    => 'Rikthe revizionet',
+'undeleteextrahelp'          => "Lini bosh të gjitha kutitë e zgjedhjes dhe shqypni '''''Restauro!''''' për të restauruar të gjitha versionet e faqes. Për të bërë një restaurim të pjesshëm zgjidhni kutitë e versioneve që dëshironi të restauroni dhe shtypni '''''Restauro!'''''. Mund të boshatisni të gjitha zgjedhjet dhe arsyen duke shtypur '''''Boshatis'''''.",
+'undeleterevisions'          => '$1 {{PLURAL:$1|version u fut|versione u futën}} në arkiv',
+'undeletehistory'            => 'N.q.s. restauroni një faqe, të gjitha versionet do të restaurohen në histori. N.q.s. një faqe e re me të njëjtin titull është krijuar që nga grisja, versionet e restauruara do të duken më përpara në histori, dhe versioni i faqes së fundit nuk do të shkëmbehet automatikisht.',
+'undeletehistorynoadmin'     => 'Kjo faqe është grisur. Arsyeja për grisjen është dhënë tek përmbledhja më poshtë bashkë me hollësitë e përdoruesve që e kanë redaktuar.',
+'undelete-revision'          => 'Revizioni i grisur i $1 (nga $4, në $5) nga $3:',
+'undelete-nodiff'            => 'Nuk u gjetën revizione të mëparshme.',
+'undeletebtn'                => 'Restauro!',
+'undeletelink'               => 'rikthe',
+'undeletereset'              => 'Boshatis',
+'undeleteinvert'             => 'Selektim anasjelltas',
+'undeletecomment'            => 'Arsyeja:',
+'undeletedarticle'           => 'u restaurua "$1"',
+'undeletedrevisions'         => '$1 {{PLURAL:$1|version u restaurua|versione u restauruan}}',
+'undeletedrevisions-files'   => '$1 {{PLURAL:$1|version|versione}} dhe $2 {{PLURAL:$2|skedë|skeda}} janë restauruar',
+'undeletedfiles'             => '$1 {{PLURAL:$1|skedë u restaurua|skeda u restauruan}}',
+'cannotundelete'             => 'Restaurimi dështoi; dikush tjetër mund ta ketë restauruar faqen përpara jush.',
+'undeletedpage'              => "<big>'''$1 është restauruar'''</big>
 
 Shikoni [[Special:Log/delete|regjistrin e grisjeve]] për grisjet dhe restaurimet së fundmi.",
-'undelete-header'          => 'Shikoni [[Special:Log/delete|regjistrin e grisjeve]] për faqet e grisura së fundmi.',
-'undelete-search-box'      => 'Kërko faqet e grisura',
-'undelete-search-prefix'   => 'Trego faqet duke filluar nga:',
-'undelete-search-submit'   => 'Kërko',
-'undelete-no-results'      => 'Nuk u gjet asnjë faqe përputhëse tek arkivi i grisjeve.',
+'undelete-header'            => 'Shikoni [[Special:Log/delete|regjistrin e grisjeve]] për faqet e grisura së fundmi.',
+'undelete-search-box'        => 'Kërko faqet e grisura',
+'undelete-search-prefix'     => 'Trego faqet duke filluar nga:',
+'undelete-search-submit'     => 'Kërko',
+'undelete-no-results'        => 'Nuk u gjet asnjë faqe përputhëse tek arkivi i grisjeve.',
+'undelete-cleanup-error'     => 'Gabim në grisjen e skedës "$1" të pa përdirur të arkivit .',
+'undelete-error-short'       => 'Gabim në rikthimin e skedës: $1',
+'undelete-show-file-confirm' => 'Jeni i sigurt se doni të shihni revizionin e grisur të skedës "<nowiki>$1</nowiki>" nga $2 në $3?',
+'undelete-show-file-submit'  => 'Po',
 
 # Namespace form on various pages
 'namespace'      => 'Hapësira:',
@@ -1544,26 +1789,27 @@ Shikoni [[Special:Log/delete|regjistrin e grisjeve]] për grisjet dhe restaurime
 'blanknamespace' => '(Artikujt)',
 
 # Contributions
-'contributions' => 'Kontributet',
-'mycontris'     => 'Redaktimet e mia',
-'contribsub2'   => 'Për $1 ($2)',
-'nocontribs'    => 'Nuk ka asnjë ndryshim që përputhet me këto kritere.',
-'uctop'         => ' (sipër)',
-'month'         => 'Nga muaji (dhe më herët):',
-'year'          => 'Nga viti (dhe më herët):',
-
-'sp-contributions-newbies'     => 'Trego vetëm redaktimet e llogarive të reja',
-'sp-contributions-newbies-sub' => 'Për newbies',
-'sp-contributions-blocklog'    => 'Regjistri i bllokimeve',
-'sp-contributions-search'      => 'Kërko tek kontributet',
-'sp-contributions-username'    => 'IP Addresa ose Përdoruesi:',
-'sp-contributions-submit'      => 'Kërko',
+'contributions'       => 'Kontributet',
+'contributions-title' => 'Kontributet e përdoruesit për $1',
+'mycontris'           => 'Redaktimet e mia',
+'contribsub2'         => 'Për $1 ($2)',
+'nocontribs'          => 'Nuk ka asnjë ndryshim që përputhet me këto kritere.',
+'uctop'               => ' (sipër)',
+'month'               => 'Nga muaji (dhe më herët):',
+'year'                => 'Nga viti (dhe më herët):',
+
+'sp-contributions-newbies'       => 'Trego vetëm redaktimet e llogarive të reja',
+'sp-contributions-newbies-sub'   => 'Për newbies',
+'sp-contributions-newbies-title' => 'Kontributet e përdoruesit për kontot e reja',
+'sp-contributions-blocklog'      => 'Regjistri i bllokimeve',
+'sp-contributions-search'        => 'Kërko tek kontributet',
+'sp-contributions-username'      => 'IP Addresa ose Përdoruesi:',
+'sp-contributions-submit'        => 'Kërko',
 
 # What links here
 'whatlinkshere'            => 'Lidhjet këtu',
 'whatlinkshere-title'      => 'Faqe që lidhen tek $1',
 'whatlinkshere-page'       => 'Faqja:',
-'linklistsub'              => '(Listë lidhjesh)',
 'linkshere'                => "Faqet e mëposhtme lidhen këtu '''[[:$1]]''':",
 'nolinkshere'              => "Asnjë faqe nuk lidhet tek '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Nuk ka faqe në hapësirën e zgjedhur që lidhen tek '''[[:$1]]'''.",
@@ -1580,17 +1826,17 @@ Shikoni [[Special:Log/delete|regjistrin e grisjeve]] për grisjet dhe restaurime
 'whatlinkshere-filters'    => 'Filtra',
 
 # Block/unblock
-'blockip'                     => 'Blloko përdorues',
-'blockip-legend'              => 'Blloko përdoruesin',
-'blockiptext'                 => 'Përdorni formularin e mëposhtëm për të hequr lejen e shkrimit për një përdorues ose IP-ë specifike.
+'blockip'                      => 'Blloko përdorues',
+'blockip-legend'               => 'Blloko përdoruesin',
+'blockiptext'                  => 'Përdorni formularin e mëposhtëm për të hequr lejen e shkrimit për një përdorues ose IP-ë specifike.
 Kjo duhet bërë vetëm në raste vandalizmi, dhe në përputhje me [[{{MediaWiki:Policy-url}}|rregullat e {{SITENAME}}-s]].
 Plotësoni arsyen specifike më poshtë (p.sh., tregoni faqet specifike që u vandalizuan).',
-'ipaddress'                   => 'IP Adresë/përdorues',
-'ipadressorusername'          => 'Adresë IP ose emër përdoruesi',
-'ipbexpiry'                   => 'Afati',
-'ipbreason'                   => 'Arsyeja',
-'ipbreasonotherlist'          => 'Arsye tjetër',
-'ipbreason-dropdown'          => '*Arsyet më të shpeshta të bllokimit
+'ipaddress'                    => 'IP Adresë/përdorues',
+'ipadressorusername'           => 'Adresë IP ose emër përdoruesi',
+'ipbexpiry'                    => 'Afati',
+'ipbreason'                    => 'Arsyeja',
+'ipbreasonotherlist'           => 'Arsye tjetër',
+'ipbreason-dropdown'           => '*Arsyet më të shpeshta të bllokimit
 ** Postimi i informacioneve të rreme
 ** Largimi i përmbajtjes së faqes
 ** Futja e lidhjeve "spam"
@@ -1598,58 +1844,71 @@ Plotësoni arsyen specifike më poshtë (p.sh., tregoni faqet specifike që u va
 ** Sjellje arrogante/perverze 
 ** Përdorimi i më shumë llogarive të përdoruesve
 ** Nofkë të papranueshme',
-'ipbanononly'                 => 'Blloko vetëm përdoruesin anonim',
-'ipbcreateaccount'            => 'Mbroje krijimin e llogarive',
-'ipbenableautoblock'          => 'Blloko edhe IP adresën që ka përdor ky përdorues deri tash, si dhe të gjitha subadresat nga të cilat mundohet ky përdorues të editoj.',
-'ipbsubmit'                   => 'Blloko këtë përdorues',
-'ipbother'                    => 'Kohë tjetër',
-'ipboptions'                  => '1 Orë:1 hour,2 Orë:2 hours,6 Orë:6 hours,1 Ditë:1 day,3 Ditë:3 days,1 Javë:1 week,2 Javë:2 weeks,1 Muaj:1 month,3 Muaj:3 months,1 Vjet:1 year,Pa kufi:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'tjetër',
-'ipbotherreason'              => 'Arsye tjetër/shtesë',
-'badipaddress'                => 'Nuk ka asnjë përdorues me atë emër',
-'blockipsuccesssub'           => 'Bllokimi u bë me sukses',
-'blockipsuccesstext'          => 'Përdoruesi/IP-Adresa [[Special:Contributions/$1|$1]] u bllokua.<br />
+'ipbanononly'                  => 'Blloko vetëm përdoruesin anonim',
+'ipbcreateaccount'             => 'Mbroje krijimin e llogarive',
+'ipbemailban'                  => 'Pa mundëso dërgimin  e porosive elektronike nga përdoruesit',
+'ipbenableautoblock'           => 'Blloko edhe IP adresën që ka përdor ky përdorues deri tash, si dhe të gjitha subadresat nga të cilat mundohet ky përdorues të editoj.',
+'ipbsubmit'                    => 'Blloko këtë përdorues',
+'ipbother'                     => 'Kohë tjetër',
+'ipboptions'                   => '1 Orë:1 hour,2 Orë:2 hours,6 Orë:6 hours,1 Ditë:1 day,3 Ditë:3 days,1 Javë:1 week,2 Javë:2 weeks,1 Muaj:1 month,3 Muaj:3 months,1 Vjet:1 year,Pa kufi:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'               => 'tjetër',
+'ipbotherreason'               => 'Arsye tjetër/shtesë',
+'ipbwatchuser'                 => 'Shiko faqen e prezantimit dhe diskutimit të këtij përdoruesi',
+'badipaddress'                 => 'Nuk ka asnjë përdorues me atë emër',
+'blockipsuccesssub'            => 'Bllokimi u bë me sukses',
+'blockipsuccesstext'           => 'Përdoruesi/IP-Adresa [[Special:Contributions/$1|$1]] u bllokua.<br />
 Shiko te [[Special:IPBlockList|Lista e përdoruesve dhe e IP adresave të bllokuara]] për të çbllokuar Përdorues/IP.',
-'ipb-edit-dropdown'           => 'Redakto arsyet e bllokimit',
-'ipb-unblock-addr'            => 'Çblloko $1',
-'ipb-unblock'                 => 'Çblloko përdorues dhe IP të bllokuara',
-'ipb-blocklist-addr'          => 'Shikoni bllokime në fuqi për $1',
-'ipb-blocklist'               => 'Përdorues dhe IP adresa të bllokuara',
-'unblockip'                   => 'Çblloko përdoruesin',
-'unblockiptext'               => "Përdor formularin e më poshtëm për t'i ridhënë leje shkrimi
+'ipb-edit-dropdown'            => 'Redakto arsyet e bllokimit',
+'ipb-unblock-addr'             => 'Çblloko $1',
+'ipb-unblock'                  => 'Çblloko përdorues dhe IP të bllokuara',
+'ipb-blocklist-addr'           => 'Shikoni bllokime në fuqi për $1',
+'ipb-blocklist'                => 'Përdorues dhe IP adresa të bllokuara',
+'ipb-blocklist-contribs'       => 'Kontributet për $1',
+'unblockip'                    => 'Çblloko përdoruesin',
+'unblockiptext'                => "Përdor formularin e më poshtëm për t'i ridhënë leje shkrimi
 një përdoruesi ose IP adreseje të bllokuar.",
-'ipusubmit'                   => 'Çblloko këtë përdorues',
-'unblocked'                   => '[[User:$1|$1]] është çbllokuar',
-'unblocked-id'                => 'Bllokimi $1 është hequr',
-'ipblocklist'                 => 'Lista e përdoruesve dhe e IP adresave të bllokuara',
-'ipblocklist-legend'          => 'Gjej një përdorues të bllokuar',
-'ipblocklist-username'        => 'Adresa IP ose nofka e përdoruesit:',
-'ipblocklist-submit'          => 'Kërko',
-'blocklistline'               => '$1, $2 bllokoi $3 ($4)',
-'infiniteblock'               => 'pakufi',
-'expiringblock'               => 'mbaron më $1',
-'anononlyblock'               => 'vetëm anonimët',
-'noautoblockblock'            => 'autobllokimi është çaktivizuar',
-'createaccountblock'          => 'hapja e lloggarive është bllokuar',
-'emailblock'                  => 'email është bllokuar',
-'ipblocklist-no-results'      => 'Adresa IP ose përdoruesi i kërkuar nuk është i bllokuar.',
-'blocklink'                   => 'blloko',
-'unblocklink'                 => 'çblloko',
-'contribslink'                => 'kontribute',
-'autoblocker'                 => 'I bllokuar automatikisht sepse përdor të njëjtën IP adresë si "$1". Arsye "$2".',
-'blocklogpage'                => 'Regjistri i bllokimeve',
-'blocklogentry'               => 'bllokoi [[$1]] për një kohë prej: $2 $3',
-'blocklogtext'                => 'Ky është një regjistër bllokimesh dhe çbllokimesh të përdoruesve. IP-të e bllokuara automatikisht nuk janë të dhëna. Shikoni dhe [[Special:IPBlockList|listën e IP-ve të bllokuara]] për një listë të bllokimeve të tanishme.',
-'unblocklogentry'             => 'çbllokoi "$1"',
-'range_block_disabled'        => 'Mundësia e administruesve për të bllokuar me shtrirje është çaktivizuar.',
-'ipb_expiry_invalid'          => 'Afati i kohës është gabim.',
-'ip_range_invalid'            => 'Shtrirje IP gabim.',
-'blockme'                     => 'Më blloko',
-'proxyblocker'                => 'Bllokuesi i ndërmjetëseve',
-'proxyblockreason'            => 'IP adresa juaj është bllokuar sepse është një ndërmjetëse e hapur. Ju lutem lidhuni me kompaninë e shërbimeve të Internetit që përdorni dhe i informoni për këtë problem sigurije.',
-'proxyblocksuccess'           => 'Mbaruar.',
-'sorbsreason'                 => 'Adresa IP e juaj është radhitur si ndërmjetëse e hapur tek lista DNSBL.',
-'sorbs_create_account_reason' => 'Adresa IP e juaj është radhitur si ndërmjetëse e hapur tek lista DNSBL që përdoret nga {{SITENAME}}. Nuk ju lejohet të hapni një llogari.',
+'ipusubmit'                    => 'Çblloko këtë përdorues',
+'unblocked'                    => '[[User:$1|$1]] është çbllokuar',
+'unblocked-id'                 => 'Bllokimi $1 është hequr',
+'ipblocklist'                  => 'Lista e përdoruesve dhe e IP adresave të bllokuara',
+'ipblocklist-legend'           => 'Gjej një përdorues të bllokuar',
+'ipblocklist-username'         => 'Adresa IP ose nofka e përdoruesit:',
+'ipblocklist-sh-userblocks'    => '$1 bllokimet e llogarisë',
+'ipblocklist-sh-tempblocks'    => '$1 bllokimet e përkohshme',
+'ipblocklist-sh-addressblocks' => '$1 bllokimet e IP',
+'ipblocklist-submit'           => 'Kërko',
+'blocklistline'                => '$1, $2 bllokoi $3 ($4)',
+'infiniteblock'                => 'pakufi',
+'expiringblock'                => 'mbaron më $1',
+'anononlyblock'                => 'vetëm anonimët',
+'noautoblockblock'             => 'autobllokimi është çaktivizuar',
+'createaccountblock'           => 'hapja e lloggarive është bllokuar',
+'emailblock'                   => 'email është bllokuar',
+'blocklist-nousertalk'         => 'nuk mund të editohet faqja personale e diskutimit',
+'ipblocklist-empty'            => 'Lista e të bllokimeve është e zbrazët.',
+'ipblocklist-no-results'       => 'Adresa IP ose përdoruesi i kërkuar nuk është i bllokuar.',
+'blocklink'                    => 'blloko',
+'unblocklink'                  => 'çblloko',
+'contribslink'                 => 'kontribute',
+'autoblocker'                  => 'I bllokuar automatikisht sepse përdor të njëjtën IP adresë si "$1". Arsye "$2".',
+'blocklogpage'                 => 'Regjistri i bllokimeve',
+'blocklogentry'                => 'bllokoi [[$1]] për një kohë prej: $2 $3',
+'blocklogtext'                 => 'Ky është një regjistër bllokimesh dhe çbllokimesh të përdoruesve. IP-të e bllokuara automatikisht nuk janë të dhëna. Shikoni dhe [[Special:IPBlockList|listën e IP-ve të bllokuara]] për një listë të bllokimeve të tanishme.',
+'unblocklogentry'              => 'çbllokoi "$1"',
+'block-log-flags-anononly'     => 'vetëm anonimët',
+'block-log-flags-nocreate'     => 'krijimi i kontove është pamundësuar',
+'block-log-flags-noautoblock'  => 'vetëbllokimi është pamundësuar',
+'block-log-flags-noemail'      => 'posta elektronike është e bllokuar',
+'range_block_disabled'         => 'Mundësia e administruesve për të bllokuar me shtrirje është çaktivizuar.',
+'ipb_expiry_invalid'           => 'Afati i kohës është gabim.',
+'ip_range_invalid'             => 'Shtrirje IP gabim.',
+'blockme'                      => 'Më blloko',
+'proxyblocker'                 => 'Bllokuesi i ndërmjetëseve',
+'proxyblocker-disabled'        => 'Ky funksion është pamundësuar.',
+'proxyblockreason'             => 'IP adresa juaj është bllokuar sepse është një ndërmjetëse e hapur. Ju lutem lidhuni me kompaninë e shërbimeve të Internetit që përdorni dhe i informoni për këtë problem sigurije.',
+'proxyblocksuccess'            => 'Mbaruar.',
+'sorbsreason'                  => 'Adresa IP e juaj është radhitur si ndërmjetëse e hapur tek lista DNSBL.',
+'sorbs_create_account_reason'  => 'Adresa IP e juaj është radhitur si ndërmjetëse e hapur tek lista DNSBL që përdoret nga {{SITENAME}}. Nuk ju lejohet të hapni një llogari.',
 
 # Developer tools
 'lockdb'              => 'Blloko regjistrin',
@@ -1673,9 +1932,9 @@ Shërbyesi i rrjetit duhet të jetë në gjendje të shkruaj këtë skedë për
 'databasenotlocked'   => 'Regjistri nuk është bllokuar.',
 
 # Move page
-'move-page'               => 'Zhvendose $1',
-'move-page-legend'        => 'Zhvendose faqen',
-'movepagetext'            => "Duke përdorur formularin e mëposhtëm do të ndërroni titullin e një faqeje, duke zhvendosur gjithë historinë përkatëse tek titulli i ri.
+'move-page'                 => 'Zhvendose $1',
+'move-page-legend'          => 'Zhvendose faqen',
+'movepagetext'              => "Duke përdorur formularin e mëposhtëm do të ndërroni titullin e një faqeje, duke zhvendosur gjithë historinë përkatëse tek titulli i ri.
 Titulli i vjetër do të bëhet një faqe përcjellëse tek titulli i ri.
 Lidhjet tek faqja e vjetër nuk do të ndryshohen;
 duhet të kontrolloni mirëmbajtjen për përcjellime të [[Special:DoubleRedirects|dyfishta]] ose të [[Special:BrokenRedirects|prishura]].
@@ -1686,55 +1945,62 @@ Kjo do të thotë se mund ta zhvendosni një faqe prapë tek emri i vjetër n.q.
 
 '''KUJDES!'''
 Ky mund të jetë një ndryshim i madh dhe gjëra të papritura mund të ndodhin për një faqe të shumë-frekuentuar; ju lutem, kini kujdes dhe mendohuni mirë para se të përdorni këtë funksion.",
-'movepagetalktext'        => "Faqja a bashkangjitur e diskutimit, n.q.s. ekziston, do të zhvendoset automatikisht '''përveçse''' kur:
+'movepagetalktext'          => "Faqja a bashkangjitur e diskutimit, n.q.s. ekziston, do të zhvendoset automatikisht '''përveçse''' kur:
 *Zhvendosni një faqe midis hapësirave të ndryshme,
 *Një faqe diskutimi jo-boshe ekziston nën titullin e ri, ose
 *Nuk zgjidhni kutinë më poshtë.
 
 Në ato raste, duhet ta zhvendosni ose përpuqni faqen vetë n.q.s. dëshironi.",
-'movearticle'             => 'Zhvendose faqen',
-'movenotallowed'          => 'Nuk ju lejohet të zhvendosni faqe.',
-'newtitle'                => 'Tek titulli i ri',
-'move-watch'              => 'Mbikqyre këtë faqe',
-'movepagebtn'             => 'Zhvendose faqen',
-'pagemovedsub'            => 'Zhvendosja doli me sukses',
-'movepage-moved'          => '<big>\'\'\'"$1" u zhvendos tek "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Një faqe me atë titull ekziston, ose titulli që zgjodhët nuk është i saktë. Ju lutem zgjidhni një tjetër.',
-'cantmove-titleprotected' => 'Nuk mund të zhvendosni një faqe në këtë titull pasi ky titull është mbrojtur kundrejt krijimit',
-'talkexists'              => 'Faqja për vete u zhvendos, ndërsa faqja e diskutimit nuk u zhvendos sepse një e tillë ekziston tek titulli i ri. Ju lutem, përpuqini vetë.',
-'movedto'                 => 'zhvendosur tek',
-'movetalk'                => 'Zhvendos edhe faqen e diskutimeve, në qoftë se është e mundur.',
-'move-subpages'           => 'Zhvendos të tëra nënfaqet nëse është e mundshme',
-'move-talk-subpages'      => 'Zhvendos të tëra nënfaqet e diskutimit nëse është e mundshme',
-'movepage-page-exists'    => "Faqja $1 ekziston prandaj s'mund ta mbivendos automatikisht",
-'movepage-page-moved'     => 'Faqja $1 është zhvendosur tek $2.',
-'movepage-page-unmoved'   => "Faqja $1 s'mund të zhvendosej tek $2.",
-'movepage-max-pages'      => "Maksimumi i lejuar, $1 faqe, janë zhvendosur dhe s'do të zhvendosen më faqe të tjera automatikisht.",
-'1movedto2'               => '[[$1]] u zhvendos tek [[$2]]',
-'1movedto2_redir'         => '[[$1]] u zhvendos tek [[$2]] dhe u krijua një faqe përcjellimi',
-'movelogpage'             => 'Regjistri i zhvendosjeve',
-'movelogpagetext'         => 'Më poshtë është një listë e faqeve të zhvendosura',
-'movereason'              => 'Arsyeja',
-'revertmove'              => 'ktheje',
-'delete_and_move'         => 'Grise dhe zhvendose',
-'delete_and_move_text'    => '==Nevojitet grisje==
+'movearticle'               => 'Zhvendose faqen',
+'movenologin'               => 'Nuk keni hyrë brenda',
+'movenologintext'           => 'Duhet të keni hapur një llogari dhe të keni [[Special:UserLogin|hyrë brenda]] për të zhvendosur një faqe.',
+'movenotallowed'            => 'Nuk ju lejohet të zhvendosni faqe.',
+'movenotallowedfile'        => 'Nuk keni leje për të lëvizur skeda.',
+'newtitle'                  => 'Tek titulli i ri',
+'move-watch'                => 'Mbikqyre këtë faqe',
+'movepagebtn'               => 'Zhvendose faqen',
+'pagemovedsub'              => 'Zhvendosja doli me sukses',
+'movepage-moved'            => '<big>\'\'\'"$1" u zhvendos tek "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'Një faqe me atë titull ekziston, ose titulli që zgjodhët nuk është i saktë. Ju lutem zgjidhni një tjetër.',
+'cantmove-titleprotected'   => 'Nuk mund të zhvendosni një faqe në këtë titull pasi ky titull është mbrojtur kundrejt krijimit',
+'talkexists'                => 'Faqja për vete u zhvendos, ndërsa faqja e diskutimit nuk u zhvendos sepse një e tillë ekziston tek titulli i ri. Ju lutem, përpuqini vetë.',
+'movedto'                   => 'zhvendosur tek',
+'movetalk'                  => 'Zhvendos edhe faqen e diskutimeve, në qoftë se është e mundur.',
+'move-subpages'             => 'Zhvendos të tëra nënfaqet nëse është e mundshme',
+'move-talk-subpages'        => 'Zhvendos të tëra nënfaqet e diskutimit nëse është e mundshme',
+'movepage-page-exists'      => "Faqja $1 ekziston prandaj s'mund ta mbivendos automatikisht",
+'movepage-page-moved'       => 'Faqja $1 është zhvendosur tek $2.',
+'movepage-page-unmoved'     => "Faqja $1 s'mund të zhvendosej tek $2.",
+'movepage-max-pages'        => "Maksimumi i lejuar, $1 faqe, janë zhvendosur dhe s'do të zhvendosen më faqe të tjera automatikisht.",
+'1movedto2'                 => '[[$1]] u zhvendos tek [[$2]]',
+'1movedto2_redir'           => '[[$1]] u zhvendos tek [[$2]] dhe u krijua një faqe përcjellimi',
+'movelogpage'               => 'Regjistri i zhvendosjeve',
+'movelogpagetext'           => 'Më poshtë është një listë e faqeve të zhvendosura',
+'movereason'                => 'Arsyeja',
+'revertmove'                => 'ktheje',
+'delete_and_move'           => 'Grise dhe zhvendose',
+'delete_and_move_text'      => '==Nevojitet grisje==
 
 Faqja "[[:$1]]" ekziston, dëshironi ta grisni për të mundësuar zhvendosjen?',
-'delete_and_move_confirm' => 'Po, grise faqen',
-'delete_and_move_reason'  => 'U gris për të liruar vendin për përcjellim',
-'selfmove'                => 'Nuk munda ta zhvendos faqen sepse titulli i ri është i njëjtë me të vjetrin.',
-'immobile_namespace'      => 'Titulli i dëshiruar i faqes është i veçantë; Faqja nuk mund të zhvendoset në hapësira me emër tjetër.',
+'delete_and_move_confirm'   => 'Po, grise faqen',
+'delete_and_move_reason'    => 'U gris për të liruar vendin për përcjellim',
+'selfmove'                  => 'Nuk munda ta zhvendos faqen sepse titulli i ri është i njëjtë me të vjetrin.',
+'immobile-source-namespace' => 'Nuk mund të lëvizet faqja tek "$1"',
+'immobile-target-namespace' => 'Nuk mund të lëvizen faqet tek "$1"',
+'immobile-source-page'      => 'Kjo faqe është e pa lëvizshme.',
 
 # Export
 'export'            => 'Eksportoni faqe',
 'exporttext'        => 'Mund të eksportoni tekstin dhe historinë e redaktimit e një faqeje ose disa faqesh të mbështjesha në XML; kjo mund të importohet në një wiki tjetër që përdor softuerin MediaWiki (tani për tani, ky opsion nuk është përfshirë tek {{SITENAME}}).
 
-Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijoni lidhje të tipit [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] si [[{{MediaWiki:Mainpage}}]].',
+Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijoni lidhje të tipit [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] si [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Përfshi vetëm versionin e fundit, jo të gjithë historinë',
 'exportnohistory'   => "'''Shënim:''' Eksportimi i historisë së faqes për shkaqe të rendimentit nuk është e mundshme.",
 'export-submit'     => 'Eksporto',
 'export-addcattext' => 'Shto faqe nga kategoria:',
 'export-addcat'     => 'Shto',
+'export-download'   => 'Ruaje si skedë',
+'export-templates'  => 'Përfshinë stampa',
 
 # Namespace 8 related
 'allmessages'         => 'Mesazhet e sistemit',
@@ -1751,15 +2017,25 @@ Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijo
 'thumbnail_error' => 'Gabim gjatë krijimit të figurës përmbledhëse: $1',
 
 # Special:Import
-'import'                => 'Importoni faqe',
-'importinterwiki'       => 'Import ndër-wiki',
-'importtext'            => 'Ju lutem eksportoni këtë skedë nga burimi wiki duke përdorur mjetin Special:Export, ruajeni në diskun tuaj dhe ngarkojeni këtu.',
-'importfailed'          => 'Importimi dështoi: $1',
-'importnotext'          => 'Bosh ose pa tekst',
-'importsuccess'         => 'Importim i sukseshëm!',
-'importhistoryconflict' => 'Ekzistojnë versione historiku në konflikt (kjo faqe mund të jetë importuar më parë)',
-'importnosources'       => 'Nuk ka asnjë burim importi të përcaktuar dhe ngarkimet historike të drejtpërdrejta janë ndaluar.',
-'importnofile'          => 'Nuk u ngarkua asnjë skedë importi.',
+'import'                   => 'Importoni faqe',
+'importinterwiki'          => 'Import ndër-wiki',
+'import-interwiki-history' => 'Kopjo të gjitha versionet e historisë për këtë faqe',
+'import-interwiki-submit'  => 'Importo',
+'import-comment'           => 'Arsyeja:',
+'importtext'               => 'Ju lutem eksportoni këtë skedë nga burimi wiki duke përdorur mjetin Special:Export, ruajeni në diskun tuaj dhe ngarkojeni këtu.',
+'importstart'              => 'Duke importuar faqet...',
+'importnopages'            => "S'ka faqe për tu importuar.",
+'importfailed'             => 'Importimi dështoi: $1',
+'importcantopen'           => 'Nuk mund të hapë skedën e importuar',
+'importbadinterwiki'       => 'Lidhje e prishur interwiki',
+'importnotext'             => 'Bosh ose pa tekst',
+'importsuccess'            => 'Importim i sukseshëm!',
+'importhistoryconflict'    => 'Ekzistojnë versione historiku në konflikt (kjo faqe mund të jetë importuar më parë)',
+'importnosources'          => 'Nuk ka asnjë burim importi të përcaktuar dhe ngarkimet historike të drejtpërdrejta janë ndaluar.',
+'importnofile'             => 'Nuk u ngarkua asnjë skedë importi.',
+'import-noarticle'         => "S'ka faqe për tu importuar!",
+'xml-error-string'         => '$1 në vijën $2, kol $3 (bite $4): $5',
+'import-upload'            => 'Ngarko të dhëna XML',
 
 # Import log
 'importlogpage' => 'Regjistri i importeve',
@@ -1859,6 +2135,11 @@ Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijo
 'numauthors'     => 'Numri i autorëve të artikullit: $1',
 'numtalkauthors' => 'Numri i diskutuesve për artikullin: $1',
 
+# Skin names
+'skinname-standard'    => 'Standarte',
+'skinname-nostalgia'   => 'Nostalgjike',
+'skinname-cologneblue' => 'Kolonjë Blu',
+
 # Math options
 'mw_math_png'    => 'Gjithmonë PNG',
 'mw_math_simple' => 'HTML në qoftë se është e thjeshtë ose ndryshe PNG',
@@ -1878,8 +2159,9 @@ Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijo
 'markedaspatrollederrortext' => 'Duhet të përcaktoni versionin për tu shënuar i patrulluar.',
 
 # Patrol log
-'patrol-log-line' => 'shënoi $1 të $2 të patrulluar $3',
-'patrol-log-auto' => '(automatikisht)',
+'patrol-log-header' => 'Këto janë të dhëna të revizioneve të patrulluara.',
+'patrol-log-line'   => 'shënoi $1 të $2 të patrulluar $3',
+'patrol-log-auto'   => '(automatikisht)',
 
 # Image deletion
 'deletedrevision'                 => 'Gris versionin e vjetër $1',
@@ -1892,6 +2174,9 @@ Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijo
 'previousdiff' => '� Ndryshimi më para',
 'nextdiff'     => 'Ndryshimi më pas →',
 
+# Visual comparison
+'visual-comparison' => 'Krahasim vizual',
+
 # Media information
 'mediawarning'         => "'''Kujdes''': Kjo skedë mund të ketë përmbajtje të dëmshme, duke e përdorur sistemi juaj mund të rrezikohet.<hr />",
 'imagemaxsize'         => 'Kufizo pamjen e figurave në faqet përshkruese në rezolucionin:',
@@ -1903,10 +2188,11 @@ Për të eksportuar faqe, thjesht shtypni një emër për çdo rresht, ose krijo
 'show-big-image'       => 'Rezolucion i plotë',
 'show-big-image-thumb' => '<small>Madhësia e këtij shikimi: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeria e figurave të reja',
 'imagelisttext'         => 'Më poshtë është një listë e $1 {{PLURAL:$1|skedës të renditur|skedave të renditura}} sipas $2.',
 'newimages-summary'     => 'Kjo faqe speciale tregon skedat e ngarkuara së fundmi.',
+'newimages-legend'      => 'Filtrues',
 'showhidebots'          => '($1 robotët)',
 'noimages'              => "S'ka gjë për të parë.",
 'ilsubmit'              => 'Kërko',
@@ -1943,10 +2229,13 @@ Të tjerat do të fshihen.
 'exif-photometricinterpretation' => 'Përbërja pixel',
 'exif-orientation'               => 'Orientimi',
 'exif-samplesperpixel'           => 'Numri i përbërësve',
+'exif-planarconfiguration'       => 'Përpunimi i të dhënave',
 'exif-ycbcrpositioning'          => 'Pozicioni Y dhe C',
 'exif-xresolution'               => 'Rezolucioni horizontal',
 'exif-yresolution'               => 'Rezolucioni vertikal',
+'exif-stripoffsets'              => 'Vendi i figurave',
 'exif-rowsperstrip'              => 'Numri i rreshtave për shirit',
+'exif-transferfunction'          => 'Funksioni i transferit',
 'exif-datetime'                  => 'Data dhe ora e ndryshimit të skedës',
 'exif-imagedescription'          => 'Titulli i figurës',
 'exif-make'                      => 'Prodhuesi i kamerës',
@@ -1973,6 +2262,7 @@ Të tjerat do të fshihen.
 'exif-lightsource'               => 'Burimi i dritës',
 'exif-flash'                     => 'Blici',
 'exif-focallength'               => 'Gjatësia e vatrës',
+'exif-subjectarea'               => 'Hapësira e subjektit',
 'exif-flashenergy'               => 'Energjia e blicit',
 'exif-subjectlocation'           => 'Vendndodhja e subjektit',
 'exif-filesource'                => 'Burimi i skedës',
@@ -1989,10 +2279,13 @@ Të tjerat do të fshihen.
 'exif-gpssatellites'             => 'Janë përdorur satelitë për matjen',
 'exif-gpstrack'                  => 'Drejtimi i lëvizjes',
 'exif-gpsimgdirection'           => 'Orientimi i figurës',
+'exif-gpsdatestamp'              => 'E dhënë GPS',
 
 # EXIF attributes
 'exif-compression-1' => 'E pangjeshur',
 
+'exif-unknowndate' => 'E dhënë e pa njohur',
+
 'exif-orientation-1' => 'Normale', # 0th row: top; 0th column: left
 'exif-orientation-2' => 'E kthyer horizontalisht', # 0th row: top; 0th column: right
 'exif-orientation-3' => 'E rrotulluar 180°', # 0th row: bottom; 0th column: right
@@ -2004,13 +2297,17 @@ Të tjerat do të fshihen.
 
 'exif-componentsconfiguration-0' => 'nuk ekziston',
 
+'exif-exposureprogram-0' => 'E pa definuar',
 'exif-exposureprogram-1' => 'Doracak',
+'exif-exposureprogram-2' => 'Program normal',
 'exif-exposureprogram-4' => 'Përparësia e mbyllësit',
 
 'exif-subjectdistance-value' => '$1 metra',
 
 'exif-meteringmode-0'   => 'E panjohur',
 'exif-meteringmode-1'   => 'Mesatare',
+'exif-meteringmode-3'   => 'Spot',
+'exif-meteringmode-4'   => 'MultiSpot',
 'exif-meteringmode-6'   => 'E pjesshme',
 'exif-meteringmode-255' => 'Tjetër',
 
@@ -2020,10 +2317,20 @@ Të tjerat do të fshihen.
 'exif-lightsource-9'   => 'Kohë e hapur',
 'exif-lightsource-10'  => 'Kohë e vrenjtur',
 'exif-lightsource-11'  => 'Hije',
+'exif-lightsource-17'  => 'Dritë standarde A',
+'exif-lightsource-18'  => 'Dritë standarde B',
+'exif-lightsource-19'  => 'Dritë standarde C',
 'exif-lightsource-255' => 'Tjetër burim drite',
 
+# Flash modes
+'exif-flash-mode-3'     => 'auto mode',
+'exif-flash-function-1' => "S'ka funksion të çastit",
+
 'exif-sensingmethod-1' => 'e Padefinuar',
 
+'exif-customrendered-0' => 'Proces normal',
+'exif-customrendered-1' => 'Proces i zakonshëm',
+
 'exif-scenecapturetype-0' => 'Standarte',
 'exif-scenecapturetype-1' => 'Peizazh',
 'exif-scenecapturetype-2' => 'Portret',
@@ -2044,6 +2351,7 @@ Të tjerat do të fshihen.
 'exif-sharpness-2' => 'E fortë',
 
 'exif-subjectdistancerange-0' => 'E panjohur',
+'exif-subjectdistancerange-1' => 'Makro',
 'exif-subjectdistancerange-2' => 'Pamje nga afër',
 'exif-subjectdistancerange-3' => 'Pamje nga larg',
 
@@ -2127,27 +2435,15 @@ $1
 'trackbackdeleteok' => 'Lidhja ndjekëse u hoq.',
 
 # Delete conflict
-'deletedwhileediting' => 'Kujdes! Kjo faqe është grisur pasi ju keni filluar redaktimin!',
+'deletedwhileediting' => 'Kujdes! Kjo faqe është grisur pasi keni filluar redaktimin!',
 'confirmrecreate'     => "Përdoruesi [[User:$1|$1]] ([[User talk:$1|diskutime]]) grisi këtë artikull mbasi ju filluat ta redaktoni për arsyen:
 : ''$2''
 Ju lutem konfirmoni nëse dëshironi me të vertetë ta ri-krijoni këtë artikull.",
 'recreate'            => 'Rikrijo',
 
-# HTML dump
-'redirectingto' => 'Përcjellin tek [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Pastro cache për këtë faqe?
-
-$1',
 'confirm_purge_button' => 'Shko',
-
-# AJAX search
-'searchcontaining' => "Kërko për artikuj që përmbajnë ''$1''.",
-'searchnamed'      => "Kërko për artikuj të quajtur ''$1''.",
-'articletitles'    => "Artikuj që fillojnë me ''$1''",
-'hideresults'      => 'Fshih rezultatet',
-'useajaxsearch'    => 'Përdor kërkim me AJAX',
+'confirm-purge-top'    => 'Pastro cache për këtë faqe?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� faqja e kaluar',
@@ -2209,14 +2505,17 @@ Ju gjithashtu mundeni ta redaktoni listën mbikëqyrëse [[Special:Watchlist/edi
 'watchlisttools-raw'  => 'Redaktoje drejtpërdrejt listën',
 
 # Special:Version
-'version'                  => 'Versioni', # Not used as normal message but as header for the special page itself
-'version-specialpages'     => 'Faqe speciale',
-'version-other'            => 'Të tjera',
-'version-version'          => 'Versioni',
-'version-license'          => 'Licensa',
-'version-software'         => 'Softuerët e instaluar',
-'version-software-product' => 'Produkti',
-'version-software-version' => 'Versioni',
+'version'                   => 'Versioni', # Not used as normal message but as header for the special page itself
+'version-extensions'        => 'Zgjerime të instaluara',
+'version-specialpages'      => 'Faqe speciale',
+'version-variables'         => 'Variabël',
+'version-other'             => 'Të tjera',
+'version-hook-subscribedby' => 'Abonuar nga',
+'version-version'           => 'Versioni',
+'version-license'           => 'Licensa',
+'version-software'          => 'Softuerët e instaluar',
+'version-software-product'  => 'Produkti',
+'version-software-version'  => 'Versioni',
 
 # Special:FilePath
 'filepath'         => 'Vendndodhja e skedave',
@@ -2230,7 +2529,7 @@ Shtypni emrin e skedës pa parashtesën "Figura:".',
 'fileduplicatesearch'          => 'Kërkoni për skeda të dyfishta',
 'fileduplicatesearch-summary'  => 'Kërkoni për dyfishime të skedave në bazë të vlerës përmbledhëse («hash»).
 
-Vendosni emrin e skedës pa parashtesën "{{ns:image}}:".',
+Vendosni emrin e skedës pa parashtesën "{{ns:file}}:".',
 'fileduplicatesearch-legend'   => 'Kërko për dyfishime',
 'fileduplicatesearch-filename' => 'Emri i skedës:',
 'fileduplicatesearch-submit'   => 'Kërko',
@@ -2247,5 +2546,13 @@ Vendosni emrin e skedës pa parashtesën "{{ns:image}}:".',
 'specialpages-group-media'       => 'Përmbledhje media dhe ngarkime',
 'specialpages-group-users'       => 'Përdoruesit dhe privilegjet',
 'specialpages-group-highuse'     => 'Faqe të shumëpërdorura',
+'specialpages-group-pages'       => 'Lista e faqeve',
+'specialpages-group-pagetools'   => 'Mjetet e faqes',
+'specialpages-group-wiki'        => 'Mjetet dhe të dhënat wiki',
+'specialpages-group-spam'        => 'Mjetet për spam',
+
+# Special:BlankPage
+'blankpage'              => 'Faqe e zbrazët',
+'intentionallyblankpage' => 'Kjo faqe me qëllim është lënë e zbrazët',
 
 );
diff --git a/languages/messages/MessagesSr.php b/languages/messages/MessagesSr.php
index cfe029e3..ea600492 100644
--- a/languages/messages/MessagesSr.php
+++ b/languages/messages/MessagesSr.php
@@ -4,7 +4,24 @@
  * @ingroup Language
  * @file
  *
+ * @author Misos
+ * @author Terik
  */
 
 $fallback = 'sr-ec';
 $linkTrail = '/^([abvgdđežzijklljmnnjoprstćufhc�džšабвгдђежзијклљмнњопр�тћуфхцчџш]+)(.*)$/usD';
+
+$messages = array(
+# Special:LinkSearch
+'linksearch'       => 'Претрага интернет веза',
+'linksearch-text'  => '�окери као што �у "*.wikipedia.org" могу да �е кори�те.
+Подржани протоколи: <tt>$1</tt>',
+'linksearch-line'  => '$1 повезана �а $2',
+'linksearch-error' => '�окери могу да �е појављују �амо на почетку домена.',
+
+# Special:Log/newusers
+'newuserlogpage'           => 'и�торија креирања кори�ника',
+'newuserlogpagetext'       => 'Ово је и�торија �корашњих креација кори�ника.',
+'newuserlog-create2-entry' => 'направио налог за $1',
+
+);
diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index 4a1de5bc..9880171e 100644
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author Kale
+ * @author Meno25
  * @author Millosh
  * @author Red Baron
  * @author Sasa Stefanovic
@@ -22,8 +23,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => "Разговор_�а_кори�ником",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => "Разговор_о_$1",
-	NS_IMAGE            => "Слика",
-	NS_IMAGE_TALK       => "Разговор_о_�лици",
+	NS_FILE             => "Слика",
+	NS_FILE_TALK        => "Разговор_о_�лици",
 	NS_MEDIAWIKI        => "МедијаВики",
 	NS_MEDIAWIKI_TALK   => "Разговор_о_МедијаВикију",
 	NS_TEMPLATE         => 'Шаблон',
@@ -42,8 +43,8 @@ $namespaceAliases = array(
 	"Korisnik"                => NS_USER,
 	"Razgovor_sa_korisnikom"  => NS_USER_TALK,
 	"Razgovor_o_$1"           => NS_PROJECT_TALK,
-	"Slika"                   => NS_IMAGE,
-	"Razgovor_o_slici"        => NS_IMAGE_TALK,
+	"Slika"                   => NS_FILE,
+	"Razgovor_o_slici"        => NS_FILE_TALK,
 	"MedijaViki"              => NS_MEDIAWIKI,
 	"Razgovor_o_MedijaVikiju" => NS_MEDIAWIKI_TALK,
 	'Å ablon'                  => NS_TEMPLATE,
@@ -54,9 +55,6 @@ $namespaceAliases = array(
 	'Razgovor_o_kategoriji'   => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
- "Обична", "�о�талгија", "Келн�ко плаво"
-);
 
 $extraUserToggles = array(
 	'nolangconversion',
@@ -250,6 +248,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Сакриј моје измене �а �пи�ка надгледања',
 'tog-watchlisthidebots'       => 'Сакриј измене ботова �а �пи�ка надгледања',
 'tog-watchlisthideminor'      => 'Сакриј мале измене �а �пи�ка надгледања',
+'tog-watchlisthideliu'        => 'Сакриј измене пријављених кори�ника �а �пи�ка надгледања',
+'tog-watchlisthideanons'      => 'Сакриј измене непријављених кори�ника �а �пи�ка надгледања',
 'tog-nolangconversion'        => 'И�кључи конверзију варијанти',
 'tog-ccmeonemails'            => 'Пошаљи ми копије порука које шаљем другим кори�ницима путем е-поште',
 'tog-diffonly'                => '�е приказуј �адржај �транице и�под разлике �транице',
@@ -259,8 +259,6 @@ $messages = array(
 'underline-never'   => '�икад',
 'underline-default' => 'По подешавањима браузера',
 
-'skinpreview' => '(Преглед)',
-
 # Dates
 'sunday'        => 'недеља',
 'monday'        => 'понедељак',
@@ -353,7 +351,7 @@ $messages = array(
 'mytalk'         => 'Мој разговор',
 'anontalk'       => 'Разговор за ову ИП адре�у',
 'navigation'     => '�авигација',
-'and'            => 'и',
+'and'            => '&#32;и',
 
 # Metadata in edit box
 'metadata_help' => 'Метаподаци:',
@@ -390,14 +388,14 @@ $messages = array(
 'talkpagelinktext'  => 'Разговор',
 'specialpage'       => 'По�ебна �траница',
 'personaltools'     => 'Лични алати',
-'postcomment'       => 'Пошаљи коментар',
+'postcomment'       => '�ова �екција',
 'articlepage'       => 'Погледај чланак',
 'talk'              => 'Разговор',
 'views'             => 'Прегледи',
 'toolbox'           => 'алати',
 'userpage'          => 'Погледај кори�ничку �трану',
 'projectpage'       => 'Погледај �трану пројекта',
-'imagepage'         => 'Погледај �трану �лике',
+'imagepage'         => 'Погледај �трану датотеке',
 'mediawikipage'     => 'Види �траницу поруке',
 'templatepage'      => 'Види �траницу шаблона',
 'viewhelppage'      => 'Види �траницу помоћи',
@@ -416,8 +414,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'О пројекту {{SITENAME}}',
 'aboutpage'            => 'Project:О',
-'bugreports'           => 'Пријаве грешака',
-'bugreportspage'       => 'Project:Пријаве грешака',
 'copyright'            => 'Садржај је објављен под $1.',
 'copyrightpagename'    => '�утор�ка права пројекта {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:�утор�ка права',
@@ -440,9 +436,7 @@ $messages = array(
 
 'badaccess'        => 'Грешка у дозволама',
 'badaccess-group0' => '�ије вам дозвољено да извршите акцију коју �те покренули.',
-'badaccess-group1' => '�кција коју �те покренули је резереви�ана за кори�нике у групи $1.',
-'badaccess-group2' => '�кција коју �те покренули је резерви�ана за кори�нике из једне од група $1.',
-'badaccess-groups' => '�кција коју �те покренули је резерви�ана за кори�нике из једне од група $1.',
+'badaccess-groups' => '�кција коју �те покренули је резерви�ана за кори�нике у {{PLURAL:$2|групи|једној од група}}:  $1.',
 
 'versionrequired'     => 'Верзија $1 МедијаВикија је потребна',
 'versionrequiredtext' => 'Верзија $1 МедијаВикија је потребна да би �е кори�тила ова �трана. Погледајте [[Special:Version|верзију]]',
@@ -456,6 +450,8 @@ $messages = array(
 'editsection'             => 'уреди',
 'editold'                 => 'уреди',
 'viewsourceold'           => 'погледај код',
+'editlink'                => 'уреди',
+'viewsourcelink'          => 'погледај код',
 'editsectionhint'         => 'Уреди део: $1',
 'toc'                     => 'Садржај',
 'showtoc'                 => 'прикажи',
@@ -471,13 +467,13 @@ $messages = array(
 'page-rss-feed'           => '"$1" RSS фид',
 'page-atom-feed'          => '"$1" Atom фид',
 'feed-atom'               => '�том',
-'red-link-title'          => '$1 (није још напи�ан)',
+'red-link-title'          => '$1 (�траница не по�тоји)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Чланак',
 'nstab-user'      => 'Кори�ничка �трана',
 'nstab-media'     => 'Медија',
-'nstab-special'   => 'По�ебна',
+'nstab-special'   => 'По�ебна �траница',
 'nstab-project'   => 'Страна пројекта',
 'nstab-image'     => 'Слика',
 'nstab-mediawiki' => 'Порука',
@@ -487,8 +483,7 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '�ема такве акције',
-'nosuchactiontext'  => '�кцију наведену у УРЛ-у вики �офтвер
-није препознао.',
+'nosuchactiontext'  => '�кцију наведену у УРЛ-у вики �офтвер није препознао.',
 'nosuchspecialpage' => '�ема такве по�ебне �транице',
 'nospecialpagetext' => "<big>'''Тражили �те непо�тојећу по�ебну �траницу.'''</big>
 
@@ -545,7 +540,6 @@ $1',
 'badtitle'             => 'Лош на�лов',
 'badtitletext'         => 'Захтевани на�лов �транице је био неи�праван, празан или
 неи�правно повезан међујезички или интервики на�лов. Можда �адржи један или више карактера који не могу да �е употребљавају у на�ловима.',
-'perfdisabled'         => 'Жао нам је! Ова могућно�т је привремено онемогућена јер у�порава базу до те мере да више нико не може да кори�ти вики.',
 'perfcached'           => 'Следећи подаци �у кеширани и не морају бити у потпуно�ти ажурирани.',
 'perfcachedts'         => 'Следећи подаци �у кеширани и по�ледњи пут �у ажурирани $1.',
 'querypage-no-updates' => '�журирање ове �транице је тренутно онемогућено. Подаци овде неће бити о�вежени одмах.',
@@ -561,7 +555,7 @@ $1',
 'protectedinterface'   => 'Ова �трана пружа тек�т интерфеј�а за �офтвер и закључана је како би �е �пречила злоупотреба.',
 'editinginterface'     => "'''Упозорење:''' Уређујете �трану која �е кори�ти да пружи тек�т за интерфеј� овог �офтвера. 
 Измене на овој �трани ће утицати на изглед кори�ничког интерфеј�а за о�тале кори�нике.
-За преводе, по�етите [http://translatewiki.net/wiki/Main_Page?setlang=sr_ec Betawiki], пројекат локализације МедијаВики �офтвера.",
+За преводе, по�етите [http://translatewiki.net/wiki/Main_Page?setlang=sr_ec translatewiki.net], пројекат локализације МедијаВики �офтвера.",
 'sqlhidden'            => '(SQL претрага �акривена)',
 'cascadeprotected'     => 'Ова �траница је закључана и њено уређивање је онемогућено јер је укључена у �адржај {{PLURAL:$1|�ледеће �тране|�ледећих �трана}}, који је заштићен �а опцијом "прено�иве" заштите:
 $2',
@@ -572,14 +566,14 @@ $2',
 Блокирао га је [[User:$1|$1]] а дати разлог је ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Лоша конфигурација због неодговарајућег �кенера за виру�: <i>$1</i>',
+'virus-badscanner'     => "Лоша конфигурација због неодговарајућег �кенера за виру�: ''$1''",
 'virus-scanfailed'     => '�кенирање пропало (код $1)',
 'virus-unknownscanner' => 'непознати антивиру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Одјави �е',
-'logouttext'                 => '<strong>Сада �те одјављени.</strong><br />
-Можете да на�тавите да кори�тите пројекат {{SITENAME}} анонимно, или �е поново пријавити као други кори�ник. Обратите пажњу да неке �транице могу на�тавити да �е приказују као да �те још увек пријављени, док не очи�тите кеш �вог браузера.',
+'logouttext'                 => "'''Сада �те одјављени.'''<br />
+Можете да на�тавите да кори�тите пројекат {{SITENAME}} анонимно, или �е поново пријавити као други кори�ник. Обратите пажњу да неке �транице могу на�тавити да �е приказују као да �те још увек пријављени, док не очи�тите кеш �вог браузера.",
 'welcomecreation'            => '== Добродошли, $1! ==
 
 Ваш налог је креиран.
@@ -591,7 +585,6 @@ $2',
 'remembermypassword'         => 'Запамти ме',
 'yourdomainname'             => 'Ваш домен',
 'externaldberror'            => 'Дошло је или до грешке при �пољашњој аутентификацији базе података или вам није дозвољено да ажурирате �вој �пољашњи налог.',
-'loginproblem'               => '<b>Било је проблема �а вашим пријављивањем.</b><br />Покушајте поново!',
 'login'                      => 'Пријави �е',
 'nav-login-createaccount'    => 'Реги�труј �е / Пријави �е',
 'loginprompt'                => "Морате да имате омогућене колачиће (''cookies'') да би�те �е пријавили на {{SITENAME}}.",
@@ -655,8 +648,9 @@ $2',
 'throttled-mailpassword'     => 'Под�етник лозинке вам је већ по�лао једну поруку у {{PLURAL:$1|протеклом �ату|по�ледњих $1 �ата|по�ледњих $1 �ати}}. 
 Ради превенције извршења недозвољене акције, под�етник шаље �амо једну поруку у року од {{PLURAL:$1|једног �ата|$1 �ата|$1 �ати}}.',
 'mailerror'                  => 'Грешка при �лању е-поште: $1',
-'acct_creation_throttle_hit' => 'Жао нам је, већ �те направили $1 кори�ничка имена. Више није дозвољено.',
-'emailauthenticated'         => 'Ваша адре�а е-поште је потврђена: $1.',
+'acct_creation_throttle_hit' => 'Жао нам је, већ �те направили {{PLURAL:$1|1 кори�ничко име|$1 кори�ничка имена|$1 кори�ничких имена}}.
+Више није дозвољено.',
+'emailauthenticated'         => 'Ваша адре�а е-поште је потврђена: $2 на $3.',
 'emailnotauthenticated'      => 'Ваша адре�а е-поште још увек није потврђена. Е-пошта неће бити по�лата ни за једну од �ледећих могућно�ти.',
 'noemailprefs'               => '�азначите адре�у е-поште како би ове могућно�ти радиле.',
 'emailconfirmlink'           => 'Потврдите вашу адре�у е-поште',
@@ -672,14 +666,18 @@ $2',
 'loginlanguagelabel'         => 'Језик: $1',
 
 # Password reset dialog
-'resetpass'               => 'Ре�етујте кори�ничку лозинку',
-'resetpass_announce'      => 'Пријавили �те �е �а привременом лозинком по�латом електрон�ком поштом. Да би�те завршили �а пријавом, морате поде�ити нову лозинку овде:',
-'resetpass_header'        => 'Промените лозинку',
-'resetpass_submit'        => 'Поде�и лозинку и пријави �е',
-'resetpass_success'       => 'Ваша лозинка је у�пешно промењена! Пријављивање у току...',
-'resetpass_bad_temporary' => 'Привремена лозинка не одговара. Могуће је да �те већ у�пешно променили лозинку или да �те затражили да вам �е пошаље нова привремена лозинка.',
-'resetpass_forbidden'     => 'Лозинке не могу бити промењене',
-'resetpass_missing'       => '�едо�тају подаци формулара.',
+'resetpass'                 => 'Промените кори�ничку лозинку',
+'resetpass_announce'        => 'Пријавили �те �е �а привременом лозинком по�латом електрон�ком поштом. Да би�те завршили �а пријавом, морате поде�ити нову лозинку овде:',
+'resetpass_header'          => 'Промените лозинку',
+'oldpassword'               => 'Стара лозинка:',
+'newpassword'               => '�ова лозинка:',
+'retypenew'                 => 'Поново откуцајте нову лозинку:',
+'resetpass_submit'          => 'Поде�и лозинку и пријави �е',
+'resetpass_success'         => 'Ваша лозинка је у�пешно промењена! Пријављивање у току...',
+'resetpass_bad_temporary'   => 'Привремена лозинка не одговара. Могуће је да �те већ у�пешно променили лозинку или да �те затражили да вам �е пошаље нова привремена лозинка.',
+'resetpass_forbidden'       => 'Лозинке не могу бити промењене',
+'resetpass-submit-loggedin' => 'Измени лозинку',
+'resetpass-temp-password'   => 'Привремена шифра:',
 
 # Edit page toolbar
 'bold_sample'     => 'подебљан тек�т',
@@ -698,14 +696,14 @@ $2',
 'nowiki_tip'      => 'Игнориши вики форматирање',
 'image_sample'    => 'Пример.jpg',
 'image_tip'       => 'Уклопљена �лика',
-'media_sample'    => 'име_медија_фајла.mp3',
+'media_sample'    => 'име_медија_фајла.ogg',
 'media_tip'       => 'Путања ка мултимедијалном фајлу',
 'sig_tip'         => 'Ваш потпи� �а тренутним временом',
 'hr_tip'          => 'Хоризонтална линија',
 
 # Edit pages
-'summary'                          => 'Опи� измене',
-'subject'                          => 'Тема/�а�лов',
+'summary'                          => 'Опи� измене:',
+'subject'                          => 'Тема/�а�лов:',
 'minoredit'                        => 'Ово је мала измена',
 'watchthis'                        => '�адгледај овај чланак',
 'savearticle'                      => 'Сними �траницу',
@@ -717,8 +715,8 @@ $2',
 'missingsummary'                   => "'''Опомена:''' �и�те унели опи� измене. Уколико кликнете Сними �траницу поново, ваше измене ће бити �нимљене без опи�а.",
 'missingcommenttext'               => 'Уне�тите коментар доле.',
 'missingcommentheader'             => "'''Под�етник:''' �и�те навели на�лов овог коментара. Уколико кликнете ''Сними поново'', ваш коментар ће бити �нимљен без на�лова.",
-'summary-preview'                  => 'Претпреглед опи�а измене',
-'subject-preview'                  => 'Претпреглед предмета/одељка',
+'summary-preview'                  => 'Претпреглед опи�а измене:',
+'subject-preview'                  => 'Претпреглед предмета/одељка:',
 'blockedtitle'                     => 'Кори�ник је блокиран',
 'blockedtext'                      => "<big>'''Ваше кори�ничко име или ИП адре�а је блокирана.'''</big>
 
@@ -773,27 +771,29 @@ $2',
 Због тога морамо да кори�тимо бројчану ИП адре�у како би�мо идентификовали њега или њу. 
 Такву адре�у може делити више кори�ника. 
 �ко �те анонимни кори�ник и ми�лите да �у вам упућене небитне примедбе, молимо ва� да [[Special:UserLogin/signup|направите налог]] или [[Special:UserLogin|�е пријавите]] да би�те избегли будућу забуну �а о�талим анонимним кори�ницима.',
-'noarticletext'                    => 'Тренутно не по�тоји чланак под тим именом, можете [[Special:Search/{{PAGENAME}}|тражити ову �траницу]] у другим чланцима или је [{{fullurl:{{FULLPAGENAME}}|action=edit}} уредити].',
+'noarticletext'                    => 'Тренутно не по�тоји чланак под тим именом.
+Можете [[Special:Search/{{PAGENAME}}|тражити ову �траницу]] у другим чланцима,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} претражити �родне и�торије запи�а], или је [{{fullurl:{{FULLPAGENAME}}|action=edit}} уредити].',
 'userpage-userdoesnotexist'        => '�алог "$1" није реги�трован. Проверите да ли желите да правите/уређујете ову �траницу.',
 'clearyourcache'                   => "'''Запамтите:''' �акон �нимања, можда морате очи�тити кеш вашег браузера да би�те видели промене. '''Mozilla / Firefox / Safari:''' држите ''Shift'' док кликћете ''Reload'' или прити�ните  ''Shift+Ctrl+R'' (''Cmd-Shift-R'' на ''Apple Mac'' машини); '''IE:''' држите ''Ctrl'' док кликћете ''Refresh'' или прити�ните ''Ctrl-F5''; '''Konqueror:''': �амо кликните ''Reload'' дугме или прити�ните ''F5''; кори�ници '''Оpera''' браузера можда морају да у потпуно�ти очи�те �вој кеш преко ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => "<strong>Савет:</strong> Кори�итите 'Прикажи претпреглед' дугме да те�тирате �вој нови CSS/JS пре �нимања.",
+'usercssjsyoucanpreview'           => "'''Савет:''' Кори�итите 'Прикажи претпреглед' дугме да те�тирате �вој нови CSS/JS пре �нимања.",
 'usercsspreview'                   => "'''Запамтите ово је �амо претпреглед вашег CSS.'''
 '''Још увек није �нимљен!'''",
 'userjspreview'                    => "'''Запамтите ово је �амо претпреглед ваше JavaScript-е и да још увек није �нимљен!'''",
 'userinvalidcssjstitle'            => "'''Пажња:''' �е по�тоји кожа \"\$1\". Запамтите да личне .css и .js �транице кори�те мала почетна �лова, нпр. {{ns:user}}:Петар/monobook.css а не {{ns:user}}:Петар/Monobook.css.",
 'updated'                          => '(�журирано)',
-'note'                             => '<strong>�апомена:</strong>',
-'previewnote'                      => '<strong>Ово �амо претпреглед; измене још ни�у �ачуване!</strong>',
+'note'                             => "'''�апомена:'''",
+'previewnote'                      => "'''Ово �амо претпреглед; измене још ни�у �ачуване!'''",
 'previewconflict'                  => 'Овај претпреглед о�ликава како ће тек�т у
 тек�туалном пољу изгледати ако �е одлучите да га �нимите.',
-'session_fail_preview'             => '<strong>Жао нам је! �и�мо могли да обрадимо вашу измену због губитка података �еан�е. Молимо покушајте ка�није. �ко и даље не ради, покушајте да �е одјавите и поново пријавите.</strong>',
-'session_fail_preview_html'        => "<strong>Жао нам је! �и�мо могли да обрадимо вашу измену због губитка података �е�ије.</strong>
+'session_fail_preview'             => "'''Жао нам је! �и�мо могли да обрадимо вашу измену због губитка података �еан�е. Молимо покушајте ка�није. �ко и даље не ради, покушајте да �е одјавите и поново пријавите.'''",
+'session_fail_preview_html'        => "'''Жао нам је! �и�мо могли да обрадимо вашу измену због губитка података �е�ије.'''
 
 ''Због тога што {{SITENAME}} има омогућен �иров HTML, претпреглед је �акривен као предо�трожно�т против JavaScript напада.''
 
-<strong>�ко �те покушали да направите праву измену, молимо покушајте поново. 
-�ко и даље не ради, покушајте да �е [[Special:UserLogout|одјавите]] и поново пријавите.</strong>",
-'token_suffix_mismatch'            => '<strong>Ваша измена је одбијена зато што је ваш клијент окрњио интерпункциј�ке знаке на крају токена. Ова измена је одбијена због заштите конзи�тентно�ти тек�та �тране. Понекад �е ово догађа кад �е кори�ти баговит прок�и �ерви�.</strong>',
+'''�ко �те покушали да направите праву измену, молимо покушајте поново. 
+�ко и даље не ради, покушајте да �е [[Special:UserLogout|одјавите]] и поново пријавите.'''",
+'token_suffix_mismatch'            => "'''Ваша измена је одбијена зато што је ваш клијент окрњио интерпункциј�ке знаке на крају токена. Ова измена је одбијена због заштите конзи�тентно�ти тек�та �тране. Понекад �е ово догађа кад �е кори�ти баговит прок�и �ерви�.'''",
 'editing'                          => 'Уређујете $1',
 'editingsection'                   => 'Уређујете $1 (део)',
 'editingcomment'                   => 'Уређујете $1 (коментар)',
@@ -806,24 +806,26 @@ $2',
 прити�нете "Сними �траницу".<br />',
 'yourtext'                         => 'Ваш тек�т',
 'storedversion'                    => 'У�кладиштена верзија',
-'nonunicodebrowser'                => '<strong>УПОЗОРЕЊЕ: Ваш браузер не подржава уникод. Молимо промените га пре него што почнете �а уређивањем чланка.</strong>',
-'editingold'                       => '<strong>П�ЖЊ�: Ви мењате �тарију ревизију ове �транице.
-�ко је �нимите, �ве промене учињене од ове ревизије биће изгубљене.</strong>',
+'nonunicodebrowser'                => "'''УПОЗОРЕЊЕ: Ваш браузер не подржава уникод. Молимо промените га пре него што почнете �а уређивањем чланка.'''",
+'editingold'                       => "'''П�ЖЊ�: Ви мењате �тарију ревизију ове �транице.
+�ко је �нимите, �ве промене учињене од ове ревизије биће изгубљене.'''",
 'yourdiff'                         => 'Разлике',
-'copyrightwarning'                 => 'Молимо ва� да обратите пажњу да �е за �ваки доприно� {{SITENAME}} �матра да је објављен под $2 лиценцом (погледајте $1 за детаље). �ко не желите да �е ваше пи�ање мења и реди�трибуира без ограничења, онда га немојте �лати овде.<br />
+'copyrightwarning'                 => "Молимо ва� да обратите пажњу да �е за �ваки доприно� {{SITENAME}} �матра да је објављен под $2 лиценцом (погледајте $1 за детаље). �ко не желите да �е ваше пи�ање мења и реди�трибуира без ограничења, онда га немојте �лати овде.<br />
 Такође нам обећавате да �те га �ами напи�али, или прекопирали из извора који је у јавном вла�ништву или �личног �лободног извора.
-<strong>�Е Ш�ЉИТЕ Р�ДОВЕ З�ШТИЋЕ�Е �УТОРСКИМ ПР�ВИМ� БЕЗ ДОЗВОЛЕ!</strong>',
-'copyrightwarning2'                => '�апомена: Сви доприно�и {{SITENAME}} могу да �е мењају или уклоне од �тране других кори�ника. �ко не желите да �е ваши доприно�и немило�рдно мењају, не шаљите их овде.<br />
+'''�Е Ш�ЉИТЕ Р�ДОВЕ З�ШТИЋЕ�Е �УТОРСКИМ ПР�ВИМ� БЕЗ ДОЗВОЛЕ!'''",
+'copyrightwarning2'                => "�апомена: Сви доприно�и {{SITENAME}} могу да �е мењају или уклоне од �тране других кори�ника. �ко не желите да �е ваши доприно�и немило�рдно мењају, не шаљите их овде.<br />
 Такође нам обећавате да �те ово �ами напи�али или прекопирали из извора у јавном вла�ништву или �личног �лободног извора (видите $1 за детаље).
-<strong>�Е Ш�ЉИТЕ Р�ДОВЕ З�ШТИЋЕ�Е �УТОРСКИМ ПР�ВИМ� БЕЗ ДОЗВОЛЕ!</strong>',
-'longpagewarning'                  => '<strong>П�ЖЊ�: Ова �траница има $1 килобајта; неки браузери имају проблема �а уређивањем �трана које имају близу или више од 32 килобајта. Молимо ва� да размотрите разбијање �транице на мање делове.</strong>',
-'longpageerror'                    => '<strong>ГРЕШК�: Тек�т који �нимате је велик $1 килобајта, што је веће од мак�имално дозвољене величине која изно�и $2 килобајта. �емогуће је �нимити �траницу.</strong>',
-'readonlywarning'                  => '<strong>П�ЖЊ�: База је управо закључана због одржавања,
-тако да �ада нећете моћи да �нимите �воје измене. Можда би било добро да и�копирате тек�т у неки едитор тек�та и �нимите га за ка�није.</strong>',
-'protectedpagewarning'             => "<strong>'''П�ЖЊ�:''' Ова �траница је закључана тако да �амо кори�ници �а админи�тратор�ким привилегијама могу да је мењају.</strong>",
+'''�Е Ш�ЉИТЕ Р�ДОВЕ З�ШТИЋЕ�Е �УТОРСКИМ ПР�ВИМ� БЕЗ ДОЗВОЛЕ!'''",
+'longpagewarning'                  => "'''П�ЖЊ�: Ова �траница има $1 килобајта; неки браузери имају проблема �а уређивањем �трана које имају близу или више од 32 килобајта. Молимо ва� да размотрите разбијање �транице на мање делове.'''",
+'longpageerror'                    => "'''ГРЕШК�: Тек�т који �нимате је велик $1 килобајта, што је веће од мак�имално дозвољене величине која изно�и $2 килобајта. �емогуће је �нимити �траницу.'''",
+'readonlywarning'                  => "'''П�ЖЊ�: База је управо закључана због одржавања, тако да �ада нећете моћи да �нимите �воје измене. 
+Можда би било добро да и�копирате тек�т у неки едитор тек�та и �нимите га за ка�није.'''
+
+�дмини�тратор који је закључао базу је дао �ледеће објашњење: $1",
+'protectedpagewarning'             => "''''''П�ЖЊ�:''' Ова �траница је закључана тако да �амо кори�ници �а админи�тратор�ким привилегијама могу да је мењају.'''",
 'semiprotectedpagewarning'         => "'''�апомена:''' Ова �трана је закључана тако да је �амо реги�тровани кори�ници могу уређивати.",
 'cascadeprotectedwarning'          => "'''Упозорење:''' Ова �траница је заштићена тако да је могу уређивати �амо кори�ници �а админи�тратор�ким привилегијама јер је укључена у прено�иву заштиту {{PLURAL:$1|�ледеће �тране|�ледећих �трана}}:",
-'titleprotectedwarning'            => '<strong>ПР�ЖЊ�: Ова �траница је закључана тако да �амо неки кори�ници могу да је направе.</strong>',
+'titleprotectedwarning'            => "'''ПР�ЖЊ�: Ова �траница је закључана тако да �амо неки кори�ници могу да је направе.'''",
 'templatesused'                    => 'Шаблони који �е кори�те на овој �траници:',
 'templatesusedpreview'             => 'Шаблони који �е кори�те у овом претпрегледу:',
 'templatesusedsection'             => 'Шаблони који �е кори�те у овом одељку:',
@@ -842,11 +844,14 @@ $2',
 
 Требало би да размотрите да ли је прикладно да на�тавите �а уређивањем ове �транице.
 Дневник бри�ања ове �тране је приказан овде:",
+'deletelog-fulllog'                => 'Погледај целу и�торију',
+'edit-already-exists'              => '�еможе �е направити нова �траница.
+Она већ по�тоји.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'Упозорење: Ова �трана �адржи превише �купих позива функције пар�ирања.
+'expensive-parserfunction-warning'        => 'Упозорење: Ова �трана �адржи превише позива функције пар�ирања.
 
-Требало би да има мање од $2, а �ада је $1.',
+Требало би да има мање од $2 {{PLURAL:$2|позив|позива}}, а �ада {{PLURAL:$1|по�тоји $1 позив|по�тоје $1 позива}}.',
 'expensive-parserfunction-category'       => 'Стране �а превише �купих позива функција пар�ирања.',
 'post-expand-template-inclusion-warning'  => 'Упозорење: Величина укљученог шаблона је превелика. �еки шаблони неће бити укључени.',
 'post-expand-template-inclusion-category' => 'Стране на којима је прекорачена величина укључивања шаблона.',
@@ -866,30 +871,28 @@ $2',
 Разлог који је дао $3 је ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Протоколи за ову �трану',
-'nohistory'           => '�е по�тоји и�торија измена за ову �траницу.',
-'revnotfound'         => 'Ревизија није пронађена',
-'revnotfoundtext'     => 'Старија ревизија ове �транице коју �те затражили није нађена.
-Молимо ва� да проверите УРЛ који �те употребили да би�те при�тупили овој �траници.',
-'currentrev'          => 'Тренутна ревизија',
-'revisionasof'        => 'Ревизија од $1',
-'revision-info'       => 'Ревизија од $1; $2',
-'previousrevision'    => '� Претходна ревизија',
-'nextrevision'        => 'Следећа ревизија →',
-'currentrevisionlink' => 'Тренутна ревизија',
-'cur'                 => 'трен',
-'next'                => '�лед',
-'last'                => 'по�л',
-'page_first'          => 'прво',
-'page_last'           => 'по�ледње',
-'histlegend'          => 'Одабирање разлика: одаберите кутијице ревизија за упоређивање и прити�ните ентер или дугме на дну.<br />
+'viewpagelogs'           => 'Протоколи за ову �трану',
+'nohistory'              => '�е по�тоји и�торија измена за ову �траницу.',
+'currentrev'             => 'Тренутна ревизија',
+'revisionasof'           => 'Ревизија од $1',
+'revision-info'          => 'Ревизија од $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Претходна ревизија',
+'nextrevision'           => 'Следећа ревизија →',
+'currentrevisionlink'    => 'Тренутна ревизија',
+'cur'                    => 'трен',
+'next'                   => '�лед',
+'last'                   => 'по�л',
+'page_first'             => 'прво',
+'page_last'              => 'по�ледње',
+'histlegend'             => 'Одабирање разлика: одаберите кутијице ревизија за упоређивање и прити�ните ентер или дугме на дну.<br />
 Објашњење: (трен) = разлика �а тренутном верзијом,
 (по�л) = разлика �а претходном верзијом, М = мала измена',
-'deletedrev'          => '[обри�ан]',
-'histfirst'           => '�ајраније',
-'histlast'            => 'По�ледње',
-'historysize'         => '({{PLURAL:$1|1 бајт|$1 бајта|$1 бајтова}})',
-'historyempty'        => '(празно)',
+'history-fieldset-title' => 'Прегледајте и�торију',
+'deletedrev'             => '[обри�ан]',
+'histfirst'              => '�ајраније',
+'histlast'               => 'По�ледње',
+'historysize'            => '({{PLURAL:$1|1 бајт|$1 бајта|$1 бајтова}})',
+'historyempty'           => '(празно)',
 
 # Revision feed
 'history-feed-title'          => 'Контролна и�торија',
@@ -985,119 +988,143 @@ $2',
 'compareselectedversions' => 'Упореди означене верзије',
 'editundo'                => 'врати',
 'diff-multi'              => '({{PLURAL:$1|Једна ревизија није приказана|$1 ревизије ни�у приказане|$1 ревизија није приказано}}.)',
+'diff-styleremoved'       => '$1 �тил уклоњен',
+'diff-removed'            => '$1 уклоњен',
+'diff-src'                => 'код',
+'diff-width'              => 'ширина',
+'diff-height'             => 'ви�ина',
+'diff-i'                  => "'''курзив'''",
+'diff-font'               => "'''тип �лова'''",
+'diff-big'                => "'''велико'''",
+'diff-del'                => "'''обри�ано'''",
 
 # Search results
-'searchresults'             => 'Резултати претраге',
-'searchresulttext'          => 'За више информација о претраживању {{SITENAME}}, погледајте [[{{MediaWiki:Helppage}}|Претраживање {{SITENAME}}]].',
-'searchsubtitle'            => 'Тражили �те \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�ве �транице које почињу �а "$1"]] | [[Special:WhatLinksHere/$1|�ве �транице које повезују на "$1"]])',
-'searchsubtitleinvalid'     => "Тражили �те '''$1'''",
-'noexactmatch'              => "'''�е по�тоји �траница �а на�ловом \"\$1\".''' Можете [[:\$1|напи�ати ту �траницу]].",
-'noexactmatch-nocreate'     => "'''�е по�тоји �траница �а на�ловом \"\$1\".'''",
-'toomanymatches'            => 'Превише погодака је врећно. Измените упит.',
-'titlematches'              => '�а�лов �транице одговара',
-'notitlematches'            => '�иједан на�лов �транице не одговара',
-'textmatches'               => 'Тек�т �транице одговара',
-'notextmatches'             => '�иједан тек�т �транице не одговара',
-'prevn'                     => 'претходних $1',
-'nextn'                     => '�ледећих $1',
-'viewprevnext'              => 'Погледај ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 реч|$2 речи}})',
-'search-result-score'       => 'Релевантно�т: $1%',
-'search-redirect'           => '(преу�мерење $1)',
-'search-section'            => '(на�лов $1)',
-'search-suggest'            => 'Да ли �те ми�лили: $1',
-'search-interwiki-caption'  => 'Брат�ки пројекти',
-'search-interwiki-default'  => '$1 резултати:',
-'search-interwiki-more'     => '(више)',
-'search-mwsuggest-enabled'  => '�а �уге�тијама',
-'search-mwsuggest-disabled' => 'без �уге�тија',
-'search-relatedarticle'     => 'Сродно',
-'mwsuggest-disable'         => 'И�кључи �Ј�КС �уге�тије',
-'searchrelated'             => '�родно',
-'searchall'                 => '�ве',
-'showingresults'            => "Приказујем и�под до {{PLURAL:$1|'''1''' резултат|'''$1''' резултата}} почев од #'''$2'''.",
-'showingresultsnum'         => "Приказујем и�под до {{PLURAL:$3|'''1''' резултат|'''$3''' резултата}} почев од #'''$2'''.",
-'nonefound'                 => "'''�апомена''': неу�пешне претраге �у
-че�то изазване тражењем че�тих речи као \"је\" или \"од\",
-које ни�у индек�иране, или навођењем више од једног израза за тражење (�амо �транице
-које �адрже �ве изразе који �е траже ће �е појавити у резултату).",
-'powersearch'               => 'Тражи',
-'powersearch-legend'        => '�апредна претрага',
-'powersearch-ns'            => 'Тражи у имен�ким про�торима:',
-'powersearch-redir'         => 'Спи�ак преу�мерења',
-'powersearch-field'         => 'Претражи за',
-'search-external'           => 'Спољашња претрага',
-'searchdisabled'            => '<p>Извињавамо �е! Пуна претрага тек�та је привремено онемогућена, због бржег рада {{SITENAME}}. У међувремену, можете кори�тити Гугл претрагу и�под, која може бити за�тарела.</p>',
+'searchresults'                  => 'Резултати претраге',
+'searchresults-title'            => 'Резултати претраге за „$1�',
+'searchresulttext'               => 'За више информација о претраживању {{SITENAME}}, погледајте [[{{MediaWiki:Helppage}}|Претраживање {{SITENAME}}]].',
+'searchsubtitle'                 => 'Тражили �те \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�ве �транице које почињу �а "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|�ве �транице које повезују на "$1"]])',
+'searchsubtitleinvalid'          => "Тражили �те '''$1'''",
+'noexactmatch'                   => "'''�е по�тоји �траница �а на�ловом \"\$1\".''' Можете [[:\$1|напи�ати ту �траницу]].",
+'noexactmatch-nocreate'          => "'''�е по�тоји �траница �а на�ловом \"\$1\".'''",
+'toomanymatches'                 => 'Превише погодака је врећно. Измените упит.',
+'titlematches'                   => '�а�лов �транице одговара',
+'notitlematches'                 => '�иједан на�лов �транице не одговара',
+'textmatches'                    => 'Тек�т �транице одговара',
+'notextmatches'                  => '�иједан тек�т �транице не одговара',
+'prevn'                          => 'претходних $1',
+'nextn'                          => '�ледећих $1',
+'viewprevnext'                   => 'Погледај ($1) ($2) ($3).',
+'searchmenu-legend'              => 'Опције претраге',
+'searchhelp-url'                 => 'Help:Садржај',
+'searchprofile-images'           => 'Фајлове',
+'searchprofile-everything'       => 'Све',
+'searchprofile-advanced'         => '�апредна',
+'searchprofile-articles-tooltip' => 'Тражи у $1',
+'searchprofile-project-tooltip'  => 'Тражи у $1',
+'searchprofile-images-tooltip'   => 'Претражуј фајлове',
+'prefs-search-nsdefault'         => 'претражуј кори�тећи подразумевана подешавања:',
+'prefs-search-nscustom'          => 'Претражуј у прилагођеним имен�ким про�торима:',
+'search-result-size'             => '$1 ({{PLURAL:$2|1 реч|$2 речи}})',
+'search-result-score'            => 'Релевантно�т: $1%',
+'search-redirect'                => '(преу�мерење $1)',
+'search-section'                 => '(на�лов $1)',
+'search-suggest'                 => 'Да ли �те ми�лили: $1',
+'search-interwiki-caption'       => 'Брат�ки пројекти',
+'search-interwiki-default'       => '$1 резултати:',
+'search-interwiki-more'          => '(више)',
+'search-mwsuggest-enabled'       => '�а �уге�тијама',
+'search-mwsuggest-disabled'      => 'без �уге�тија',
+'search-relatedarticle'          => 'Сродно',
+'mwsuggest-disable'              => 'И�кључи �Ј�КС �уге�тије',
+'searchrelated'                  => '�родно',
+'searchall'                      => '�ве',
+'showingresults'                 => "Приказујем и�под до {{PLURAL:$1|'''1''' резултат|'''$1''' резултата}} почев од #'''$2'''.",
+'showingresultsnum'              => "Приказујем и�под до {{PLURAL:$3|'''1''' резултат|'''$3''' резултата}} почев од #'''$2'''.",
+'showingresultstotal'            => "Приказивање {{PLURAL:$4|резултат '''$1''' од '''$3'''|резултата '''$1 - $2''' од '''$3'''}}",
+'nonefound'                      => "'''�апомена''': Само неколико имен�ких про�тора �е претражују по о�новном подешавању.
+Покушајте �а префик�ом '''�ве:''' да претражите цео �адржај (укључујући �транице за разговор, шаблоне итд.), или изаберите жељени имен�ки про�тор као префик�.",
+'powersearch'                    => 'Тражи',
+'powersearch-legend'             => '�апредна претрага',
+'powersearch-ns'                 => 'Тражи у имен�ким про�торима:',
+'powersearch-redir'              => 'Спи�ак преу�мерења',
+'powersearch-field'              => 'Претражи за',
+'search-external'                => 'Спољашња претрага',
+'searchdisabled'                 => '<p>Извињавамо �е! Пуна претрага тек�та је привремено онемогућена, због бржег рада {{SITENAME}}. У међувремену, можете кори�тити Гугл претрагу и�под, која може бити за�тарела.</p>',
 
 # Preferences page
-'preferences'              => 'Подешавања',
-'mypreferences'            => 'Моја подешавања',
-'prefs-edits'              => 'Број измена:',
-'prefsnologin'             => '�и�те пријављени',
-'prefsnologintext'         => 'Морате бити <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} пријављени]</span> да би�те подешавали кори�ничка подешавања.',
-'prefsreset'               => 'Враћена �у у�кладиштена подешавања.',
-'qbsettings'               => 'Брза палета',
-'qbsettings-none'          => '�икаква',
-'qbsettings-fixedleft'     => 'Причвршћена лево',
-'qbsettings-fixedright'    => 'Причвршћена де�но',
-'qbsettings-floatingleft'  => 'Плутајућа лево',
-'qbsettings-floatingright' => 'Плутајућа де�но',
-'changepassword'           => 'Промени лозинку',
-'skin'                     => 'Кожа',
-'math'                     => 'Математике',
-'dateformat'               => 'Формат датума',
-'datedefault'              => '�ије битно',
-'datetime'                 => 'Датум и време',
-'math_failure'             => '�еу�пех при пар�ирању',
-'math_unknown_error'       => 'непозната грешка',
-'math_unknown_function'    => 'непозната функција',
-'math_lexing_error'        => 'речничка грешка',
-'math_syntax_error'        => '�интак�на грешка',
-'math_image_error'         => 'PNG конверзија неу�пешна; проверите тачну ин�талацију latex-а, dvips-а, gs-а и convert-а',
-'math_bad_tmpdir'          => '�е могу да напишем или направим привремени math директоријум',
-'math_bad_output'          => '�е могу да напишем или направим директоријум за math излаз.',
-'math_notexvc'             => '�едо�таје извршно texvc; молимо погледајте math/README да би�те поде�или.',
-'prefs-personal'           => 'Кори�ничка подешавања',
-'prefs-rc'                 => 'Скорашње измене',
-'prefs-watchlist'          => 'Спи�ак надгледања',
-'prefs-watchlist-days'     => 'Број дана који треба да �е види на �пи�ку надгледања:',
-'prefs-watchlist-edits'    => 'Број измена који треба да �е види на проширеном �пи�ку надгледања:',
-'prefs-misc'               => 'Разно',
-'saveprefs'                => 'Сачувај',
-'resetprefs'               => 'Очи�ти измене',
-'oldpassword'              => 'Стара лозинка:',
-'newpassword'              => '�ова лозинка:',
-'retypenew'                => 'Поново откуцајте нову лозинку:',
-'textboxsize'              => 'Величине тек�туалног поља',
-'rows'                     => 'Редова',
-'columns'                  => 'Колона',
-'searchresultshead'        => 'Претрага',
-'resultsperpage'           => 'Погодака по �траници:',
-'contextlines'             => 'Линија по поготку:',
-'contextchars'             => 'Карактера контек�та по линији:',
-'stub-threshold'           => 'Праг за форматирање <a href="#" class="stub">линка као клице</a> (у бајтовима):',
-'recentchangesdays'        => 'Број дана за приказ у �корашњим изменема:',
-'recentchangescount'       => 'Број на�лова у �корашњим изменама:',
-'savedprefs'               => 'Ваша подешавања �у �ачувана.',
-'timezonelegend'           => 'Времен�ка зона',
-'timezonetext'             => 'Број �ати за који �е ваше локално време разликује од �ервер�ког времена (UTC).',
-'localtime'                => 'Локално време',
-'timezoneoffset'           => 'Од�тупање¹',
-'servertime'               => 'Време на �ерверу',
-'guesstimezone'            => 'Попуни из браузера',
-'allowemail'               => 'Омогући е-пошту од других кори�ника',
-'prefs-searchoptions'      => 'Опције претраге',
-'prefs-namespaces'         => 'Имен�ки про�тори',
-'defaultns'                => 'По �тандарду тражи у овим имен�ким про�торима:',
-'default'                  => '�тандард',
-'files'                    => 'Фајлови',
+'preferences'               => 'Подешавања',
+'mypreferences'             => 'Моја подешавања',
+'prefs-edits'               => 'Број измена:',
+'prefsnologin'              => '�и�те пријављени',
+'prefsnologintext'          => 'Морате бити <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} пријављени]</span> да би�те подешавали кори�ничка подешавања.',
+'prefsreset'                => 'Враћена �у у�кладиштена подешавања.',
+'qbsettings'                => 'Брза палета',
+'qbsettings-none'           => '�икаква',
+'qbsettings-fixedleft'      => 'Причвршћена лево',
+'qbsettings-fixedright'     => 'Причвршћена де�но',
+'qbsettings-floatingleft'   => 'Плутајућа лево',
+'qbsettings-floatingright'  => 'Плутајућа де�но',
+'changepassword'            => 'Промени лозинку',
+'skin'                      => 'Кожа',
+'skin-preview'              => 'Преглед',
+'math'                      => 'Математике',
+'dateformat'                => 'Формат датума',
+'datedefault'               => '�ије битно',
+'datetime'                  => 'Датум и време',
+'math_failure'              => '�еу�пех при пар�ирању',
+'math_unknown_error'        => 'непозната грешка',
+'math_unknown_function'     => 'непозната функција',
+'math_lexing_error'         => 'речничка грешка',
+'math_syntax_error'         => '�интак�на грешка',
+'math_image_error'          => 'PNG конверзија неу�пешна; проверите тачну ин�талацију latex-а, dvips-а, gs-а и convert-а',
+'math_bad_tmpdir'           => '�е могу да напишем или направим привремени math директоријум',
+'math_bad_output'           => '�е могу да напишем или направим директоријум за math излаз.',
+'math_notexvc'              => '�едо�таје извршно texvc; молимо погледајте math/README да би�те поде�или.',
+'prefs-personal'            => 'Кори�ничка подешавања',
+'prefs-rc'                  => 'Скорашње измене',
+'prefs-watchlist'           => 'Спи�ак надгледања',
+'prefs-watchlist-days'      => 'Број дана који треба да �е види на �пи�ку надгледања:',
+'prefs-watchlist-days-max'  => '(мак�имум 7 дана)',
+'prefs-watchlist-edits'     => 'Број измена који треба да �е види на проширеном �пи�ку надгледања:',
+'prefs-watchlist-edits-max' => '(мак�ималан број: 1000)',
+'prefs-misc'                => 'Разно',
+'prefs-resetpass'           => 'Промени лозинку',
+'saveprefs'                 => 'Сачувај',
+'resetprefs'                => 'Очи�ти измене',
+'textboxsize'               => 'Величине тек�туалног поља',
+'rows'                      => 'Редова',
+'columns'                   => 'Колона',
+'searchresultshead'         => 'Претрага',
+'resultsperpage'            => 'Погодака по �траници:',
+'contextlines'              => 'Линија по поготку:',
+'contextchars'              => 'Карактера контек�та по линији:',
+'stub-threshold'            => 'Праг за форматирање <a href="#" class="stub">линка као клице</a> (у бајтовима):',
+'recentchangesdays'         => 'Број дана за приказ у �корашњим изменема:',
+'recentchangesdays-max'     => '(mмак�имум $1 {{PLURAL:$1|дан|дана}})',
+'recentchangescount'        => 'Број на�лова у �корашњим изменама:',
+'savedprefs'                => 'Ваша подешавања �у �ачувана.',
+'timezonelegend'            => 'Времен�ка зона',
+'timezonetext'              => 'Број �ати за који �е ваше локално време разликује од �ервер�ког времена (UTC).',
+'localtime'                 => 'Локално време:',
+'timezoneselect'            => 'Времен�ка зона:',
+'timezoneuseserverdefault'  => 'Кори�ти о�новна подешавања',
+'timezoneuseoffset'         => 'Друго (одреди од�тупање)',
+'timezoneoffset'            => 'Од�тупање¹:',
+'servertime'                => 'Време на �ерверу:',
+'guesstimezone'             => 'Попуни из браузера',
+'allowemail'                => 'Омогући е-пошту од других кори�ника',
+'prefs-searchoptions'       => 'Опције претраге',
+'prefs-namespaces'          => 'Имен�ки про�тори',
+'defaultns'                 => 'По �тандарду тражи у овим имен�ким про�торима:',
+'default'                   => '�тандард',
+'files'                     => 'Фајлови',
 
 # User rights
 'userrights'                  => 'Управљање кори�ничким правима', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Управљај кори�ничким групама',
 'userrights-user-editname'    => 'Уне�ите кори�ничко име:',
 'editusergroup'               => 'Мењај групе кори�ника',
-'editinguser'                 => "Мењате кори�ничка права кори�ника '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Мењате кори�ничка права кори�ника '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Промени кори�ничке групе',
 'saveusergroups'              => 'Сачувај кори�ничке групе',
 'userrights-groupsmember'     => 'Члан:',
@@ -1196,9 +1223,20 @@ $2',
 'rightslogentry' => 'је променио права за $1 од $2 на $3',
 'rightsnone'     => '(нема)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit'           => 'уреди ову �траницу',
+'action-move'           => 'преме�ти ову �траницу',
+'action-upload'         => 'пошаљи овај фајл',
+'action-reupload'       => 'поништи овај по�тојећи фајл',
+'action-delete'         => 'обриши ову �траницу',
+'action-deleterevision' => 'обриши ову ревизију',
+'action-browsearchive'  => 'претрага обри�аних �траница',
+'action-undelete'       => 'врати ову �трану',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|измена|измене|измена}}',
 'recentchanges'                     => 'Скорашње измене',
+'recentchanges-legend'              => 'Подешавања �корашњих измена',
 'recentchangestext'                 => 'Пратите нај�корије измене на викију на овој �траници.',
 'recentchanges-feed-description'    => 'Пратите �корашње измене уз помоћ овог фида.',
 'rcnote'                            => "И�под {{PLURAL:$1|је '''1''' промена|�у по�ледње '''$1''' промене|�у по�ледњих '''$1''' промена}} у {{PLURAL:$2|по�ледњем дану|по�ледњa '''$2''' дана|по�ледњих '''$2''' дана}}, од $5, $4.",
@@ -1222,6 +1260,8 @@ $2',
 'rc_categories'                     => 'Ограничи на категорије (раздвоји �а "|")',
 'rc_categories_any'                 => 'Било који',
 'newsectionsummary'                 => '/* $1 */ нова �екција',
+'rc-enhanced-expand'                => 'Прикажи детаље (захтева JavaScript)',
+'rc-enhanced-hide'                  => 'Сакриј детаље',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Сродне промене',
@@ -1244,11 +1284,11 @@ $2',
 'upload_directory_read_only'  => '�а директоријум за �лање ($1) �ервер не може да пише.',
 'uploaderror'                 => 'Грешка при �лању',
 'uploadtext'                  => "Кори�тите формулар доле да би�те по�лали фајлове.
-Да би�те видели или тражили претходно по�лате фајлове идите на [[Special:ImageList|�пи�ак по�латих фајлова]], поновна �лања �у запи�ани у [[Special:Log/upload|и�торији �лања]], а бри�ања у [[Special:Log/delete|и�торији бри�ања]].
+Да би�те видели или тражили претходно по�лате фајлове идите на [[Special:FileList|�пи�ак по�латих фајлова]], поновна �лања �у запи�ани у [[Special:Log/upload|и�торији �лања]], а бри�ања у [[Special:Log/delete|и�торији бри�ања]].
 
 Слику додајете у погодне чланке кори�тећи �интак�у:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Слика.jpg]]</nowiki></tt>''' да би�те кори�тили пуну верзију фајла
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Слика.png|200п|мини|лево|опи�]]</nowiki></tt>''' да ви�те кори�тили 200 пик�ела широку уоквирену �лику �а леве �тране и �а \"опи�\" као опи�ом �лике.
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Слика.jpg]]</nowiki></tt>''' да би�те кори�тили пуну верзију фајла
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Слика.png|200п|мини|лево|опи�]]</nowiki></tt>''' да ви�те кори�тили 200 пик�ела широку уоквирену �лику �а леве �тране и �а \"опи�\" као опи�ом �лике.
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Фајл.ogg]]</nowiki></tt>''' да директно повежете ка фајлу без приказивања и�тог",
 'upload-permitted'            => 'Дозвољени типови фајлова �у: $1.',
 'upload-preferred'            => 'Пожељни типови фајлова �у: $1.',
@@ -1276,21 +1316,21 @@ $2',
 'large-file'                  => 'Препоручљиво је да фајлови не буду већи од $1; овај фајл је $2.',
 'largefileserver'             => 'Овај фајл је већи него што је подешено да �ервер дозволи.',
 'emptyfile'                   => 'Фајл који �те по�лали делује да је празан. Ово је могуће због грешке у имену фајла. Молимо проверите да ли �тварно желите да пошаљете овај фајл.',
-'fileexists'                  => 'Фајл �а овим именом већ по�тоји. Молимо проверите <strong><tt>$1</tt></strong> ако ни�те �игурни да ли желите да га промените.',
-'filepageexists'              => 'Страна за опи� овог фајла је већ направљена у време <strong><tt>$1</tt></strong>, али не по�тоји фајл � тим именом. Опи� који уне�еш �е неће појавити на �трани за опи�. Да би �е видео, мораћеш да измениш �трану ручно.',
-'fileexists-extension'        => 'Фајл �а �личним именом већ по�тоји:<br />
-Име фајла који шаљете: <strong><tt>$1</tt></strong><br />
-Име по�тојећег фајла: <strong><tt>$2</tt></strong><br />
-Молимо изаберите друго име.',
+'fileexists'                  => "Фајл �а овим именом већ по�тоји. Молимо проверите '''<tt>$1</tt>''' ако ни�те �игурни да ли желите да га промените.",
+'filepageexists'              => "Страна за опи� овог фајла је већ направљена у време '''<tt>$1</tt>''', али не по�тоји фајл � тим именом. Опи� који уне�еш �е неће појавити на �трани за опи�. Да би �е видео, мораћеш да измениш �трану ручно.",
+'fileexists-extension'        => "Фајл �а �личним именом већ по�тоји:<br />
+Име фајла који шаљете: '''<tt>$1</tt>'''<br />
+Име по�тојећег фајла: '''<tt>$2</tt>'''<br />
+Молимо изаберите друго име.",
 'fileexists-thumb'            => "<center>'''По�тојећи фајл'''</center>",
-'fileexists-thumbnail-yes'    => 'Овај фајл је највероватније умањена верзија �лике. Молимо ва� проверите фајл <strong><tt>$1</tt></strong>.<br />
-Уколико је дати фајл и�та �лика или оригинална �лика, није потребно да шаљете додатно умањену верзију и�те.',
-'file-thumbnail-no'           => 'Фајл почиње �а <strong><tt>$1</tt></strong>. 
+'fileexists-thumbnail-yes'    => "Овај фајл је највероватније умањена верзија �лике. Молимо ва� проверите фајл '''<tt>$1</tt>'''.<br />
+Уколико је дати фајл и�та �лика или оригинална �лика, није потребно да шаљете додатно умањену верзију и�те.",
+'file-thumbnail-no'           => "Фајл почиње �а '''<tt>$1</tt>'''. 
 Претпо�тавља �е да је ово умањена верзија �лике.
-Уколико имате ову �лику у пуној резолицуји, пошаљите је, а уколико немате, промените име фајла.',
-'fileexists-forbidden'        => 'Фајл �а овим именом већ по�тоји; молимо вратите �е и пошаљите овај фајл под новим именом. [[Image:$1|thumb|center|$1]]',
+Уколико имате ову �лику у пуној резолицуји, пошаљите је, а уколико немате, промените име фајла.",
+'fileexists-forbidden'        => 'Фајл �а овим именом већ по�тоји; молимо вратите �е и пошаљите овај фајл под новим именом. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Фајл �а овим именом већ по�тоји у заједничкој о�тави. 
-Молимо вратите �е и пошаљите овај фајл под новим именом. [[Image:$1|thumb|center|$1]]',
+Молимо вратите �е и пошаљите овај фајл под новим именом. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Овај фајл је дупликат {{PLURAL:$1|�ледећег фајла|�ледеђих фајлова}}:',
 'successfulupload'            => 'У�пешно �лање',
 'uploadwarning'               => 'Упозорење при �лању',
@@ -1311,7 +1351,7 @@ $2',
 
 Проверите да ли �те �игурно да желите по�лати овај фајл.
 Разлог бри�ања овог фајла раније је:",
-'filename-bad-prefix'         => 'Име овог фајла почиње �а <strong>"$1"</strong>, што није опи�но име, најчешће је назван аутомат�ки �а дигиталним фотоапаратом. Молимо изаберите опи�није име за ваш фајл.',
+'filename-bad-prefix'         => "Име овог фајла почиње �а '''\"\$1\"''', што није опи�но име, најчешће је назван аутомат�ки �а дигиталним фотоапаратом. Молимо изаберите опи�није име за ваш фајл.",
 
 'upload-proto-error'      => '�екоректни протокол',
 'upload-proto-error-text' => 'Слање ек�терних фајлова захтева УРЛове који почињу �а <code>http://</code> или <code>ftp://</code>.',
@@ -1332,18 +1372,18 @@ $2',
 'upload_source_url'  => ' (валидан, јавно до�тупан УРЛ)',
 'upload_source_file' => ' (фајл на вашем рачунару)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ова по�ебна �трана приказује �ве по�лате фајлове. Подразумева �е да је по�ледњи по�лат фајл приказан на врху �пи�ка. Кликом на заглавље колоне мења �е принцип �ортирања.',
-'imagelist_search_for'  => 'Тражи име �лике:',
+# Special:ListFiles
+'listfiles-summary'     => 'Ова по�ебна �трана приказује �ве по�лате фајлове. Подразумева �е да је по�ледњи по�лат фајл приказан на врху �пи�ка. Кликом на заглавље колоне мења �е принцип �ортирања.',
+'listfiles_search_for'  => 'Тражи име �лике:',
 'imgfile'               => 'фајл',
-'imagelist'             => 'Спи�ак �лика',
-'imagelist_date'        => 'Датум',
-'imagelist_name'        => 'Име',
-'imagelist_user'        => 'Кори�ник',
-'imagelist_size'        => 'Величина (бајтови)',
-'imagelist_description' => 'Опи� �лике',
-
-# Image description page
+'listfiles'             => 'Спи�ак �лика',
+'listfiles_date'        => 'Датум',
+'listfiles_name'        => 'Име',
+'listfiles_user'        => 'Кори�ник',
+'listfiles_size'        => 'Величина (бајтови)',
+'listfiles_description' => 'Опи� �лике',
+
+# File description page
 'filehist'                       => 'И�торија фајла',
 'filehist-help'                  => 'Кликните на датум/време да видите верзију фајла из тог времена.',
 'filehist-deleteall'             => 'обриши �ве',
@@ -1355,15 +1395,18 @@ $2',
 'filehist-dimensions'            => 'Димензије',
 'filehist-filesize'              => 'Величина фајла',
 'filehist-comment'               => 'Коментар',
-'imagelinks'                     => 'Употреба �лике',
+'imagelinks'                     => 'Везе ка фајлу',
 'linkstoimage'                   => '{{PLURAL:$1|Следећа �траница кори�ти|$1 Следеће �транице кори�те}} овај фајл:',
+'linkstoimage-more'              => 'Више од $1 {{PLURAL:$1|�транице �е веше|�траница �е вежу}} за овај фајл.
+Следећи �пи�ак показује �транице које �е вежу за овај фајл
+[[Special:WhatLinksHere/$2|Потпуни �пи�ак]] је до�тупан такође.',
 'nolinkstoimage'                 => '�ема �траница које кори�те овај фајл.',
 'morelinkstoimage'               => 'Види [[Special:WhatLinksHere/$1|више веза]] према овом фајлу.',
 'redirectstofile'                => 'Следећи {{PLURAL:$1|фајл �е преу�мерава|$1 фајла �е преу�меравају|$1 фајлова �е преу�мерава}} на овај фајл:',
 'duplicatesoffile'               => 'Следећи {{PLURAL:$1|фајл је дупликат|$1 фајла �у дупликати|$1 фајлова �у дупликати}} овог фајла:',
 'sharedupload'                   => 'Ова �лика је �а заједничке о�таве и можда је кори�те о�тали пројекти.',
 'shareduploadwiki'               => 'Молимо погледајте $1 за даље информације.',
-'shareduploadwiki-desc'          => 'Опи� за $1 на дељеном �кладишту налази �е и�под.',
+'shareduploadwiki-desc'          => 'Опи� на $1 �е налази и�под.',
 'shareduploadwiki-linktext'      => '�трана за опи� фајла',
 'shareduploadduplicate'          => 'Овај фајл је дупликат фајла $1 на дељеном �кладишту.',
 'shareduploadduplicate-linktext' => 'други фајл',
@@ -1395,7 +1438,6 @@ $2',
 'filedelete-success-old'      => "Верзија фајла '''[[Media:$1|$1]]''' од $3, $2 је обри�ана.",
 'filedelete-nofile'           => "'''$1''' не по�тоји.",
 'filedelete-nofile-old'       => "�е по�тоји �кладиштена верзија фајла '''$1''' �а датим о�обинама.",
-'filedelete-iscurrent'        => 'Покушаваш да обришеш по�ледњу измену фајла. �еопходно је да претходно вратиш фајл на претходну измену.',
 'filedelete-otherreason'      => 'Други/додатни разлог:',
 'filedelete-reason-otherlist' => 'Други разлог',
 'filedelete-reason-dropdown'  => '*�ајчешћи разлози бри�ања
@@ -1423,28 +1465,18 @@ $2',
 
 # Random page
 'randompage'         => 'Случајна �траница',
-'randompage-nopages' => '�ема �траница у овом имен�ком про�тору.',
+'randompage-nopages' => '�ема �траница у имен�ком про�тору „$1�.',
 
 # Random redirect
 'randomredirect'         => 'Случајно преу�мерење',
-'randomredirect-nopages' => '�ема преу�мерења у овом имен�ком про�тору.',
+'randomredirect-nopages' => '�ема преу�мерења у имен�ком про�тору „$1�.',
 
 # Statistics
-'statistics'             => 'Стати�тике',
-'sitestats'              => 'Стати�тике �ајта',
-'userstats'              => 'Стати�тике кори�ника',
-'sitestatstext'          => "База података тренутно �адржи {{PLURAL:\$1|'''1''' �траницу|'''\$1''' �транице|'''\$1''' �траница}}.
-Овај број укључује �транице за разговор, �транице о {{SITENAME}}, минималне \"клице\", редиректе, и друге неквалифициране �транице.
-И�кључујући ове, имамо {{PLURAL:\$2|чланак|чланка|чланака}}.
-
-'''\$8''' {{PLURAL:\$8|фајл је по�лат|фајла је по�лато|фајлова је по�лато}}.
-
-По�тоји укупно '''\$3''' {{PLURAL:\$3|прелед|прегледа}} �траница и '''\$4''' {{PLURAL:\$4|измена �транице|измене �транице|измена �траница}} од када вики по�тоји.
-У про�еку кори�ници направе '''\$5''' измена по �траници и претпрегледаје �траницу '''\$6''' пута током једне измене.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue �об кју] дужина је '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|По�тоји '''1''' реги�тровани [[Special:ListUsers|кори�ник]]|По�тоје '''$1''' реги�трована [[Special:ListUsers|кори�ника]]|По�тоји '''$1''' реги�трованих [[Special:ListUsers|кори�ника]]}}, од којих '''$2''' (или '''$4%''') {{PLURAL:$2|има|имају|имају}} $5 права.",
-'statistics-mostpopular' => '�ајпо�ећеније �транице',
+'statistics'              => 'Стати�тике',
+'statistics-header-edits' => 'Стати�тике измена',
+'statistics-header-users' => 'Стати�тике кори�ника',
+'statistics-pages'        => 'Странице',
+'statistics-mostpopular'  => '�ајпо�ећеније �транице',
 
 'disambiguations'      => 'Странице за вишезначне одреднице',
 'disambiguationspage'  => 'Template:Вишезначна одредница',
@@ -1488,14 +1520,15 @@ $2',
 'popularpages'            => 'Популарне �транице',
 'wantedcategories'        => 'Тражене категорије',
 'wantedpages'             => 'Тражене �транице',
-'missingfiles'            => 'недо�тајући фајлови',
+'wantedfiles'             => 'Тражени фајлови',
+'wantedtemplates'         => 'Тражени шаблони',
 'mostlinked'              => '�ајвише повезане �тране',
 'mostlinkedcategories'    => 'Чланци �а највише категорија',
 'mostlinkedtemplates'     => '�ајповезанији шаблони',
 'mostcategories'          => 'Чланци �а највише категорија',
 'mostimages'              => '�ајвише повезани фајлови',
 'mostrevisions'           => 'Чланци �а највише ревизија',
-'prefixindex'             => 'Спи�ак префик�а',
+'prefixindex'             => 'Све �транице �а префик�има',
 'shortpages'              => 'Кратке �транице',
 'longpages'               => 'Дугачке �транице',
 'deadendpages'            => 'Странице без интерних веза',
@@ -1508,6 +1541,7 @@ $2',
 'protectedtitlestext'     => 'Следећи на�лови �у заштићени од �тварања:',
 'protectedtitlesempty'    => '�ема на�лова који �у тренутно заштићени помоћу ових параметара.',
 'listusers'               => 'Спи�ак кори�ника',
+'listusers-editsonly'     => 'Прикажи кори�нике који имају измене',
 'newpages'                => '�ове �транице',
 'newpages-username'       => 'Кори�ничко име:',
 'ancientpages'            => '�ај�тарији чланци',
@@ -1534,8 +1568,6 @@ $2',
 'speciallogtitlelabel' => '�а�лов:',
 'log'                  => 'Протоколи',
 'all-logs-page'        => 'Све и�торије',
-'log-search-legend'    => 'Претражи запи�е',
-'log-search-submit'    => 'Иди',
 'alllogstext'          => 'Комбиновани приказ �вих до�тупних и�торија за {{SITENAME}}.
 Можете �узити преглед одабиром типа и�торије, кори�ничког имена или тражене �транице.',
 'logempty'             => 'Протокол је празан.',
@@ -1547,6 +1579,7 @@ $2',
 'nextpage'          => 'Следећа �трана ($1)',
 'prevpage'          => 'Претходна �трана ($1)',
 'allpagesfrom'      => 'Прикажи �транице почетно �а:',
+'allpagesto'        => 'Приказује �транице које �е завршавају �а:',
 'allarticles'       => 'Сви чланци',
 'allinnamespace'    => 'Све �транице ($1 имен�ки про�тор)',
 'allnotinnamespace' => 'Све �транице (које ни�у у $1 имен�ком про�тору)',
@@ -1566,11 +1599,30 @@ $2',
 'special-categories-sort-count' => '�ортирај по броју',
 'special-categories-sort-abc'   => '�ортирај азбучно',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Обри�ане измене',
+
+# Special:LinkSearch
+'linksearch'       => 'претрага веб линкова',
+'linksearch-pat'   => 'Образац претраге:',
+'linksearch-ns'    => 'Имен�ки про�тор:',
+'linksearch-ok'    => 'Претрага',
+'linksearch-line'  => '�трана $1 је повезана �а �тране $2',
+'linksearch-error' => '�окери �е могу појавити �амо на почетку имена хо�та.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Прикажи кори�нике почевши од:',
 'listusers-submit'   => 'Прикажи',
 'listusers-noresult' => '�ије пронађен кори�ник.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'и�торија креирања кори�ника',
+'newuserlogpagetext'          => 'Ово је и�торија �корашњих креација кори�ника',
+'newuserlog-byemail'          => 'лозинка по�лата имејлом',
+'newuserlog-create-entry'     => '�ови кори�ник',
+'newuserlog-create2-entry'    => 'направио налог за $1',
+'newuserlog-autocreate-entry' => 'налог аутомат�ки направљен',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'права �арадничких група',
 'listgrouprights-group'    => 'Група',
@@ -1589,8 +1641,7 @@ $2',
 'usermailererror' => 'Објекат поште је вратио грешку:',
 'defemailsubject' => '{{SITENAME}} е-пошта',
 'noemailtitle'    => '�ема адре�е е-поште',
-'noemailtext'     => 'Овај кори�ник није навео и�правну адре�у е-поште,
-или је изабрао да не прима е-пошту од других кори�ника.',
+'noemailtext'     => 'Овај кори�ник није навео и�правну адре�у е-поште.',
 'emailfrom'       => 'Од:',
 'emailto'         => 'За:',
 'emailsubject'    => '�а�лов:',
@@ -1633,12 +1684,7 @@ $2',
 'iteminvalidname'      => "Проблем �а �тавком '$1', неи�правно име...",
 'wlnote'               => "И�под {{PLURAL:$1|је по�ледња измена|�у по�ледње '''$1''' измене|по�ледњих '''$1''' измена}} у {{PLURAL:$2|по�ледњем �ату|по�ледња '''$2''' �ата|по�ледњих '''$2''' �ати}}.",
 'wlshowlast'           => 'Прикажи по�ледњих $1 �ати $2 дана $3',
-'watchlist-show-bots'  => 'Прикажи измене ботова',
-'watchlist-hide-bots'  => 'Сакриј измене ботова',
-'watchlist-show-own'   => 'Прикажи моје измене',
-'watchlist-hide-own'   => 'Сакриј моје измене',
-'watchlist-show-minor' => 'Прикажи мале измене',
-'watchlist-hide-minor' => 'Сакриј мале измене',
+'watchlist-options'    => 'Подешавања �пи�ка надгледања',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '�адгледам...',
@@ -1679,54 +1725,58 @@ $NEWPAGE
 Фидбек и даља помоћ:
 {{fullurl:Help:Садржај}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Обриши �траницу',
-'confirm'                     => 'Потврди',
-'excontent'                   => "�адржај је био: '$1'",
-'excontentauthor'             => "�адржај је био: '$1' (а једину измену је направио '$2')",
-'exbeforeblank'               => "�адржај пре бри�ања је био: '$1'",
-'exblank'                     => '�траница је била празна',
-'delete-confirm'              => 'Обриши „$1“',
-'delete-legend'               => 'Обриши',
-'historywarning'              => 'Пажња: �траница коју желите да обришете има и�торију:',
-'confirmdeletetext'           => '�а путу �те да трајно обришете �траницу
+# Delete
+'deletepage'             => 'Обриши �траницу',
+'confirm'                => 'Потврди',
+'excontent'              => "�адржај је био: '$1'",
+'excontentauthor'        => "�адржај је био: '$1' (а једину измену је направио '$2')",
+'exbeforeblank'          => "�адржај пре бри�ања је био: '$1'",
+'exblank'                => '�траница је била празна',
+'delete-confirm'         => 'Обриши „$1“',
+'delete-legend'          => 'Обриши',
+'historywarning'         => 'Пажња: �траница коју желите да обришете има и�торију:',
+'confirmdeletetext'      => '�а путу �те да трајно обришете �траницу
 или �лику заједно �а њеном и�торијом из базе података.
 Молимо ва� потврдите да намеравате да урадите ово, да разумете
 по�ледице, и да ово радите у �кладу �а
 [[{{MediaWiki:Policy-url}}|правилима]] {{SITENAME}}.',
-'actioncomplete'              => '�кција завршена',
-'deletedtext'                 => 'Чланак "<nowiki>$1</nowiki>" је обри�ан.
+'actioncomplete'         => '�кција завршена',
+'deletedtext'            => 'Чланак "<nowiki>$1</nowiki>" је обри�ан.
 Погледајте $2 за запи� о �корашњим бри�ањима.',
-'deletedarticle'              => 'обри�ан "[[$1]]"',
-'suppressedarticle'           => '�активено: "[[$1]]"',
-'dellogpage'                  => 'и�торија бри�ања',
-'dellogpagetext'              => 'И�под је �пи�ак нај�коријих бри�ања.',
-'deletionlog'                 => 'и�торија бри�ања',
-'reverted'                    => 'Враћено на ранију ревизију',
-'deletecomment'               => 'Разлог за бри�ање',
-'deleteotherreason'           => 'Други/додатни разлог:',
-'deletereasonotherlist'       => 'Други разлог',
-'deletereason-dropdown'       => '*�ајчешћи разлози бри�ања
+'deletedarticle'         => 'обри�ан "[[$1]]"',
+'suppressedarticle'      => '�активено: "[[$1]]"',
+'dellogpage'             => 'и�торија бри�ања',
+'dellogpagetext'         => 'И�под је �пи�ак нај�коријих бри�ања.',
+'deletionlog'            => 'и�торија бри�ања',
+'reverted'               => 'Враћено на ранију ревизију',
+'deletecomment'          => 'Разлог за бри�ање',
+'deleteotherreason'      => 'Други/додатни разлог:',
+'deletereasonotherlist'  => 'Други разлог',
+'deletereason-dropdown'  => '*�ајчешћи разлози бри�ања
 ** Захтев аутора
 ** Кршење аутор�ких права
 ** Вандализам',
-'delete-edit-reasonlist'      => 'Уреди разлоге за бри�ање',
-'delete-toobig'               => 'Ова �траница има велику и�торију �транице, преко $1 {{PLURAL:$1|ревизије|ревизије|ревизија}}.
+'delete-edit-reasonlist' => 'Уреди разлоге за бри�ање',
+'delete-toobig'          => 'Ова �траница има велику и�торију �транице, преко $1 {{PLURAL:$1|ревизије|ревизије|ревизија}}.
 Бри�ање таквих �траница је забрањено ради превентиве од �лучајног оштећења �ајта.',
-'rollback'                    => 'Врати измене',
-'rollback_short'              => 'Врати',
-'rollbacklink'                => 'врати',
-'rollbackfailed'              => 'Враћање није у�пело',
-'cantrollback'                => '�е могу да вратим измену; по�ледњи аутор је уједно и једини.',
-'alreadyrolled'               => '�е могу да вратим по�ледњу измену [[:$1]] од кори�ника [[User:$2|$2]] ([[User talk:$2|разговор]] | [[Special:Contributions/$2|{{int:contribslink}}]]); неко други је већ изменио или вратио чланак.
-
-По�ледња измена од кори�ника [[User:$3|$3]] ([[User talk:$3|разговор]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Коментар измене је: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Враћене измене кори�ника [[Special:Contributions/$2|$2]] ([[User talk:$2|Разговор]]) на по�ледњу измену кори�ника [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Враћене измене од �тране $1; на по�ледњу измену од �тране $2.',
-'sessionfailure'              => 'Изгледа да по�тоји проблем �а вашом �еан�ом пријаве;
+
+# Rollback
+'rollback'         => 'Врати измене',
+'rollback_short'   => 'Врати',
+'rollbacklink'     => 'врати',
+'rollbackfailed'   => 'Враћање није у�пело',
+'cantrollback'     => '�е могу да вратим измену; по�ледњи аутор је уједно и једини.',
+'alreadyrolled'    => '�е могу да вратим по�ледњу измену [[:$1]] од кори�ника [[User:$2|$2]] ([[User talk:$2|разговор]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); неко други је већ изменио или вратио чланак.
+
+По�ледња измена од кори�ника [[User:$3|$3]] ([[User talk:$3|разговор]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Коментар измене је: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Враћене измене кори�ника [[Special:Contributions/$2|$2]] ([[User talk:$2|Разговор]]) на по�ледњу измену кори�ника [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Враћене измене од �тране $1; на по�ледњу измену од �тране $2.',
+'sessionfailure'   => 'Изгледа да по�тоји проблем �а вашом �еан�ом пријаве;
 ова акција је прекинута као предо�трожно�т против преотимања �еан�и.
 Молимо кликните "back" и поново учитајте �трану одакле �те дошли, а онда покушајте поново.',
+
+# Protect
 'protectlogpage'              => 'и�торија закључавања',
 'protectlogtext'              => 'И�под је �пи�ак заштићених �траница.<br />
 Погледајте [[Special:ProtectedPages|правила о заштити �траница]] за више информација.',
@@ -1734,17 +1784,18 @@ $NEWPAGE
 'modifiedarticleprotection'   => 'промењен ниво заштите за „[[$1]]“',
 'unprotectedarticle'          => '�кинуо заштиту �а $1',
 'protect-title'               => '�тављање заштите "$1"',
+'prot_1movedto2'              => 'је променио име чланку [[$1]] у [[$2]]',
 'protect-legend'              => 'Потврдите заштиту',
 'protectcomment'              => 'Коментар:',
 'protectexpiry'               => 'И�тиче:',
 'protect_expiry_invalid'      => 'Време и�тека није одговарајуће.',
 'protect_expiry_old'          => 'Време и�тека је у прошло�ти.',
 'protect-unchain'             => 'Откључај дозволе премештања',
-'protect-text'                => 'Овде можете погледати и мењати ниво заштите за �траницу <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => '�е можете мењати нивое заштите док �те блокирани.
-Ово �у тренутна подешавања за �траницу <strong>$1</strong>:',
-'protect-locked-access'       => 'Ваш налог нема дозволе за измену нивоа заштите �транице.
-Ово �у тренутна подешавања за �траницу <strong>$1</strong>:',
+'protect-text'                => "Овде можете погледати и мењати ниво заштите за �траницу '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "�е можете мењати нивое заштите док �те блокирани.
+Ово �у тренутна подешавања за �траницу '''$1''':",
+'protect-locked-access'       => "Ваш налог нема дозволе за измену нивоа заштите �транице.
+Ово �у тренутна подешавања за �траницу '''$1''':",
 'protect-cascadeon'           => 'Ова �траница је тренутно заштићена јер �е налази на {{PLURAL:$1|�траници, која је заштићена|�тране, које �у заштићене|�трана, које �у заштићене}} �а опцијом "прено�иво". Можете изменити �тепен заштите ове �транице, али он неће утицати на прено�иву заштиту.',
 'protect-default'             => '(�тандард)',
 'protect-fallback'            => 'Захтева "$1" овлашћења',
@@ -1752,9 +1803,18 @@ $NEWPAGE
 'protect-level-sysop'         => 'Само админи�тратори',
 'protect-summary-cascade'     => 'прено�ива заштита',
 'protect-expiring'            => 'и�тиче $1 (UTC)',
+'protect-expiry-indefinite'   => 'бе�коначно',
 'protect-cascade'             => 'Заштићене �транице укључене у ову �траницу (прено�ива заштита)
 Protect pages included in this page (cascading protection)',
 'protect-cantedit'            => '�е можете мењати нивое заштите за ову �траницу, због тога што немате овлашћења да је уређујете.',
+'protect-othertime'           => 'Друго време:',
+'protect-othertime-op'        => 'друго време',
+'protect-dropdown'            => '*Разлози заштите
+** Вандализам
+** �ежењене поруке
+** Контра-продуктивне измене
+** Страница �а великим бројем по�ета',
+'protect-expiry-options'      => '2 �ата:2 hours,1 дан:1 day,3 дана:3 days,1 недеља:1 week,2 недеље:2 weeks,1 ме�ец:1 month,3 ме�еца:3 months,6 ме�еци:6 months,1 година:1 year,бе�коначно:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Овлашћење:',
 'restriction-level'           => '�иво заштите:',
 'minimum-size'                => 'Мин величина',
@@ -1777,8 +1837,9 @@ Protect pages included in this page (cascading protection)',
 'undeletepage'               => 'Погледај и врати обри�ане �транице',
 'undeletepagetitle'          => "'''Следеће �адржи обри�ане измене чланка: [[:$1|$1]]'''.",
 'viewdeletedpage'            => 'Погледај обри�ане �тране',
-'undeletepagetext'           => 'Следеће �транице �у обри�ане али �у још увек у архиви и
-могу бити враћене. �рхива може бити периодично чишћена.',
+'undeletepagetext'           => '{{PLURAL:$1|Следећа �трана је обри�ана али је|Следеће $1 �тране �у обри�ане али �у|Следећих $1 �трана је обри�ано али �у}} још увек у архиви и
+могу бити враћене. 
+�рхива може бити периодично чишћена.',
 'undelete-fieldset-title'    => 'враћање верзија',
 'undeleteextrahelp'          => "Да би�те вратили и�торију целе �тране, о�тавите �ве кућице неоткаченим и кликните на '''''Врати'''''. 
 Да извршите �елективно враћање, откачите кућице које одговарају ревизији која треба да �е врати и кликните на '''''Врати'''''. 
@@ -1789,7 +1850,7 @@ Protect pages included in this page (cascading protection)',
 'undeletehistorynoadmin'     => 'Ова �трана је обри�ана.
 И�под �е налази део и�торије бри�ања и и�торија ревизија обри�ане �тране.
 Питајте админи�тратора ако желите да �е �траница врати.',
-'undelete-revision'          => 'Обри�ана �трана $1 (у време $2) од �тране �арадника $3:',
+'undelete-revision'          => 'Обри�ана ревизија од $1 (у време $4, на $5) од �тране кори�ника $3:',
 'undeleterevision-missing'   => '�екоректна или непо�тојећа ревизија. Можда је ваш линк погрешан, или је ревизија ре�таурирана, или обри�ана из архиве.',
 'undelete-nodiff'            => '�ема претходних измена.',
 'undeletebtn'                => 'Врати',
@@ -1814,6 +1875,7 @@ Protect pages included in this page (cascading protection)',
 'undelete-error-long'        => 'Де�ила �е грешка при враћању фајла:
 
 $1',
+'undelete-show-file-submit'  => 'Да',
 
 # Namespace form on various pages
 'namespace'      => 'Имен�ки про�тор:',
@@ -1821,13 +1883,14 @@ $1',
 'blanknamespace' => '(Главно)',
 
 # Contributions
-'contributions' => 'Прилози кори�ника',
-'mycontris'     => 'Моји прилози',
-'contribsub2'   => 'За $1 ($2)',
-'nocontribs'    => '�и�у нађене промене које задовољавају ове у�лове.',
-'uctop'         => ' (врх)',
-'month'         => 'За ме�ец (и раније):',
-'year'          => 'Од године (и раније):',
+'contributions'       => 'Прилози кори�ника',
+'contributions-title' => 'Прилози кори�ника за $1',
+'mycontris'           => 'Моји прилози',
+'contribsub2'         => 'За $1 ($2)',
+'nocontribs'          => '�и�у нађене промене које задовољавају ове у�лове.',
+'uctop'               => ' (врх)',
+'month'               => 'За ме�ец (и раније):',
+'year'                => 'Од године (и раније):',
 
 'sp-contributions-newbies'     => 'Прикажи �амо прилоге нових налога',
 'sp-contributions-newbies-sub' => 'За новајлије',
@@ -1840,7 +1903,6 @@ $1',
 'whatlinkshere'            => 'Шта је повезано овде',
 'whatlinkshere-title'      => 'Странице које �у повезане на „$1“',
 'whatlinkshere-page'       => 'Страна:',
-'linklistsub'              => '(�пи�ак веза)',
 'linkshere'                => "Следеће �транице �у повезане на '''[[:$1]]''':",
 'nolinkshere'              => "�и једна �траница није повезана на: '''[[:$1]]'''.",
 'nolinkshere-ns'           => "�и једна �траница у одабраном имен�ком про�тору �е не веже за '''[[:$1]]'''",
@@ -1919,6 +1981,7 @@ $1',
 'ipblocklist-no-results'          => 'Унешена ИП адре�а или кори�ничко име није блокирано.',
 'blocklink'                       => 'блокирај',
 'unblocklink'                     => 'одблокирај',
+'change-blocklink'                => 'промени блок',
 'contribslink'                    => 'прилози',
 'autoblocker'                     => '�утомат�ки �те блокирани јер делите ИП адре�у �а "[[User:$1|$1]]". Дати разлог за блокирање кори�ника $1 је: "\'\'\'$2\'\'\'"',
 'blocklogpage'                    => 'и�торија блокирања',
@@ -1935,6 +1998,8 @@ $1',
 'ipb_expiry_invalid'              => 'Погрешно време трајања.',
 'ipb_expiry_temp'                 => 'Сакривени блокови �арадничких имена морају бити �тални.',
 'ipb_already_blocked'             => '"$1" је већ блокиран',
+'ipb-needreblock'                 => '== Већ блокиран ==
+$1 је већ блокиран. Да ли желите да промените подешавања?',
 'ipb_cant_unblock'                => 'Грешка: ИД блока $1 није нађен. Могуће је да је већ одблокиран.',
 'ip_range_invalid'                => '�етачан блок ИП адре�а.',
 'blockme'                         => 'Блокирај ме',
@@ -1990,6 +2055,9 @@ $1',
 
 У тим �лучајевима, мораћете ручно да преме�тите или �појите �траницу уколико то желите.",
 'movearticle'             => 'Преме�ти �траницу',
+'movenologin'             => '�и�те пријављени',
+'movenologintext'         => 'Морате бити реги�тровани кори�ник и [[Special:UserLogin|пријављени]]
+да би�те преме�тили �траницу.',
 'movenotallowed'          => '�емате облашћења за премештање �траница.',
 'newtitle'                => '�ови на�лов',
 'move-watch'              => '�адгледај ову �траницу',
@@ -2022,7 +2090,6 @@ $1',
 'delete_and_move_confirm' => 'Да, обриши �траницу',
 'delete_and_move_reason'  => 'Обри�ано како би �е направило ме�то за премештање',
 'selfmove'                => 'Изворни и циљани назив �у и�ти; �трана не може да �е преме�ти преко �аме �ебе.',
-'immobile_namespace'      => 'Циљани назив је по�ебног типа; не могу да преме�те �тране у тај имен�ки про�тор.',
 'imagenocrossnamespace'   => 'Фајл �е не може преименовати у имен�ки про�тор који не припада фајловима.',
 'imagetypemismatch'       => '�ови на�тавак за фајлове �е не поклапа �а �војим типом.',
 'imageinvalidfilename'    => 'Циљано име фајла је погрешно.',
@@ -2036,7 +2103,7 @@ $1',
 
 Да би�те извозили �транице, уне�ите називе у тек�туалном пољу и�под, �а једним на�ловом по реду, и одаберите да ли желите тренутну верзију �а �вим �тарим верзијама или �амо тренутну верзију �а информацијама о по�ледњој измени.
 
-У другом �лучају, можете такође кори�тити везу, нпр. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] за �траницу [[{{MediaWiki:Mainpage}}]].',
+У другом �лучају, можете такође кори�тити везу, нпр. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] за �траницу [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Укључи �амо тренутну ревизију, не целу и�торију',
 'exportnohistory'   => "----
 '''�апомена:''' извожење пуне и�торије �трана преко овог формулара је онемогућено због �ервер�ких разлога.",
@@ -2052,7 +2119,7 @@ $1',
 'allmessagesdefault'        => 'Стандардни тек�т',
 'allmessagescurrent'        => 'Тренутни тек�т',
 'allmessagestext'           => 'Ово је �пи�ак �и�тем�ких порука које �у у МедијаВики имен�ком про�тору.
-По�етите [http://translatewiki.net Betawiki] уколико желите да помогнете у локализацији.',
+По�етите [http://translatewiki.net translatewiki.net] уколико желите да помогнете у локализацији.',
 'allmessagesnotsupportedDB' => "Ова �траница не може бити употребљена зато што је '''\$wgUseDatabaseMessages''' и�кључен.",
 'allmessagesfilter'         => 'Филтер за регуларне изразе:',
 'allmessagesmodified'       => 'Прикажи �амо измењене',
@@ -2073,6 +2140,7 @@ $1',
 'import-interwiki-history'   => 'Копирај �ве ревизије ове �тране',
 'import-interwiki-submit'    => 'Увези',
 'import-interwiki-namespace' => 'Имен�ки про�тор:',
+'import-comment'             => 'Коментар:',
 'importtext'                 => 'Молимо извезите фајл из изворног викија кори�тећи [[Special:Export|извоз]].
 Сачувајте га код �ебе и пошаљите овде.',
 'importstart'                => 'Увожење �трана у току...',
@@ -2105,19 +2173,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|ревизија|ревизије|ревизија}} од $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Моја кори�ничка �траница',
+'tooltip-pt-userpage'             => 'Ваша кори�ничка �траница',
 'tooltip-pt-anonuserpage'         => 'Кори�ничка �траница ИП адре�е �а које уређујете',
-'tooltip-pt-mytalk'               => 'Моја �траница за разговор',
+'tooltip-pt-mytalk'               => 'Ваша �траница за разговор',
 'tooltip-pt-anontalk'             => 'Разговор о прилозима �а ове ИП адре�е',
 'tooltip-pt-preferences'          => 'Моја кори�ничка подешавања',
 'tooltip-pt-watchlist'            => 'Спи�ак чланака које надгледате',
-'tooltip-pt-mycontris'            => 'Спи�ак мојих прилога',
+'tooltip-pt-mycontris'            => 'Спи�ак ваших прилога',
 'tooltip-pt-login'                => 'Препоручује �е да �е пријавите, али није обавезно',
 'tooltip-pt-anonlogin'            => 'Препоручује �е да �е пријавите, али није обавезно',
 'tooltip-pt-logout'               => 'Одјави �е',
 'tooltip-ca-talk'                 => 'Разговор о чланку',
 'tooltip-ca-edit'                 => 'Можете уредити ову �траницу. Молимо кори�тите претпреглед пре �ачувавања.',
-'tooltip-ca-addsection'           => 'Додајте коментар на ову ди�ку�ију',
+'tooltip-ca-addsection'           => 'Почните нову �екцију',
 'tooltip-ca-viewsource'           => 'Ова �траница је закључана. Можете видети њен извор',
 'tooltip-ca-history'              => 'Претходне верзије ове �транице',
 'tooltip-ca-protect'              => 'Заштити ову �траницу',
@@ -2126,7 +2194,7 @@ $1',
 'tooltip-ca-move'                 => 'Преме�ти ову �траницу',
 'tooltip-ca-watch'                => 'Додајте ову �траницу на Ваш �пи�ак надгледања',
 'tooltip-ca-unwatch'              => 'Уклоните ову �траницу �а Вашег �пи�ка надгледања',
-'tooltip-search'                  => 'Претражите вики',
+'tooltip-search'                  => 'Претражите {{SITENAME}}',
 'tooltip-search-go'               => 'Иди на �трану � тачним именом ако по�тоји.',
 'tooltip-search-fulltext'         => 'Претражите �тране �а овим тек�том',
 'tooltip-p-logo'                  => 'Главна �трана',
@@ -2164,6 +2232,8 @@ $1',
 'tooltip-watch'                   => 'Додајте ову �траницу на Ваш �пи�ак надгледања',
 'tooltip-recreate'                => '�аправи поново �траницу без обзира да је била обри�ана',
 'tooltip-upload'                  => 'Почни �лање',
+'tooltip-rollback'                => '"Врати" враћа по�ледње измене корни�ика у једном кораку (клику)',
+'tooltip-undo'                    => '"Врати" враћа измену и отвара форму за измене за преглед. Дозвољава додавање разлога у опи� измене.',
 
 # Stylesheets
 'common.css'   => '/** CSS �тављен овде ће �е одно�ити на �ве коже */',
@@ -2175,12 +2245,12 @@ $1',
 'notacceptable'     => 'Вики �ервер не може да пружи податке у оном формату који ваш клијент може да прочита.',
 
 # Attribution
-'anonymous'        => '�нонимни кори�ник {{SITENAME}}',
+'anonymous'        => '�нонимни {{PLURAL:$1|кори�ник|кори�ници}} на {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} кори�ник $1',
 'lastmodifiedatby' => 'Ову �траницу је по�ледњи пут променио $3 у $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Базирано на раду кори�ника $1.',
 'others'           => 'о�тали',
-'siteusers'        => '{{SITENAME}} кори�ник (кори�ници) $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|кори�ник|кори�ници}} $1',
 'creditspage'      => 'За�луге за �траницу',
 'nocredits'        => '�и�у до�тупне информације о за�лугама за ову �траницу.',
 
@@ -2221,9 +2291,10 @@ $1',
 'markedaspatrollederror-noautopatrol' => '�ије ти дозвољено да обележиш �воје измене патролираним.',
 
 # Patrol log
-'patrol-log-page' => 'И�торија патролирања',
-'patrol-log-line' => 'обележена верзија $1 �тране $2 као патролирана ($3)',
-'patrol-log-auto' => '(аутомат�ки)',
+'patrol-log-page'   => 'И�торија патролирања',
+'patrol-log-header' => 'Ово је и�торија патролираних ревизија.',
+'patrol-log-line'   => 'обележена верзија $1 �тране $2 као патролирана ($3)',
+'patrol-log-auto'   => '(аутомат�ки)',
 
 # Image deletion
 'deletedrevision'                 => 'Обри�ана �тара ревизија $1.',
@@ -2252,10 +2323,11 @@ $1',
 'show-big-image'       => 'Пуна резолуција',
 'show-big-image-thumb' => '<small>Величина овог приказа: $1 × $2 пик�ела</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Галерија нових �лика',
 'imagelisttext'         => "И�под је �пи�ак од '''$1''' {{PLURAL:$1|фајла|фајла|фајлова}} поређаних $2.",
 'newimages-summary'     => 'Ова по�ебна �трана приказује по�ледње по�лате фајлове.',
+'newimages-legend'      => 'Филтер',
 'showhidebots'          => '($1 ботове)',
 'noimages'              => '�ема ништа да �е види',
 'ilsubmit'              => 'Тражи',
@@ -2607,21 +2679,9 @@ $1
 Молимо потврдите да �тварно желите да поново направите овај чланак.",
 'recreate'            => 'Поново направи',
 
-# HTML dump
-'redirectingto' => 'Преу�меравам на [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Да ли желите очи�тити кеш ове �транице?
-
-$1',
 'confirm_purge_button' => 'Да',
-
-# AJAX search
-'searchcontaining' => "Тражи чланке који �адрже ''$1''.",
-'searchnamed'      => "Чланци који �е зову ''$1''.",
-'articletitles'    => "Чланци почећи �а ''$1''",
-'hideresults'      => 'Сакриј резултате',
-'useajaxsearch'    => 'Кори�ти AJAX претрагу',
+'confirm-purge-top'    => 'Да ли желите очи�тити кеш ове �транице?',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; претходна �трана',
@@ -2668,6 +2728,10 @@ $1',
 'watchlistedit-normal-done'    => '{{PLURAL:$1|1 чланак је уклоњен|$1 чланка �у уклоњена|$1 чланака је уклоњено}} �а вашег �пи�ка надгледања:',
 'watchlistedit-raw-title'      => 'мењање �ировог �пи�ка надгледања',
 'watchlistedit-raw-legend'     => 'мењање �ировог �пи�ка надгледања',
+'watchlistedit-raw-explain'    => '�а�лови у вашој �траници надгледања �у приказани и�под, и могу �е мењати додавањем или одузимањем �а �пи�ка;
+један на�лов по линији.
+Када завршите, кликните О�вежи �пи�ак надгледања.
+Такође, можете [[Special:Watchlist/edit|кори�тити �тандардан уређивач �пи�ка]].',
 'watchlistedit-raw-titles'     => '�а�лови:',
 'watchlistedit-raw-submit'     => 'О�вежите �пи�ак надгледања',
 'watchlistedit-raw-done'       => 'Ваш �пи�ак надгледања је о�вежен.',
@@ -2715,9 +2779,13 @@ $1',
 'fileduplicatesearch-submit'   => 'Претрага',
 'fileduplicatesearch-info'     => '$1 × $2 пок�ел<br />Величина фајла: $3<br />MIME тип: $4',
 'fileduplicatesearch-result-1' => 'Датотека „$1“ нема идентичних дупликата.',
+'fileduplicatesearch-result-n' => 'Датотека "$1" има {{PLURAL:$2|1 идентичан дупликат|$2 идентична дупликата|$2 идентичних дупликата}}.',
 
 # Special:SpecialPages
 'specialpages'                   => 'По�ебне �транице',
+'specialpages-note'              => '----
+* Обичне по�ебне �транице
+* <span class="mw-specialpagerestricted">Заштићене по�ебне �транице.</span>',
 'specialpages-group-maintenance' => 'Извештаји',
 'specialpages-group-other'       => 'О�тале по�ебне �транице',
 'specialpages-group-login'       => 'Пријави �е / реги�труј �е',
diff --git a/languages/messages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php
index b85875c5..a60943df 100644
--- a/languages/messages/MessagesSr_el.php
+++ b/languages/messages/MessagesSr_el.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Meno25
  * @author Red Baron
  * @author Slaven Kosanovic
  * @author לערי ריינה�רט
@@ -18,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => "Razgovor_sa_korisnikom",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => "Razgovor_o_$1",
-	NS_IMAGE            => "Slika",
-	NS_IMAGE_TALK       => "Razgovor_o_slici",
+	NS_FILE             => "Slika",
+	NS_FILE_TALK        => "Razgovor_o_slici",
 	NS_MEDIAWIKI        => "MedijaViki",
 	NS_MEDIAWIKI_TALK   => "Razgovor_o_MedijaVikiju",
 	NS_TEMPLATE         => 'Å ablon',
@@ -38,8 +39,8 @@ $namespaceAliases = array(
 	"Кори�ник"                => NS_USER,
 	"Разговор_�а_кори�ником"  => NS_USER_TALK,
 	"Разговор_о_$1"           => NS_PROJECT_TALK,
-	"Слика"                   => NS_IMAGE,
-	"Разговор_о_�лици"        => NS_IMAGE_TALK,
+	"Слика"                   => NS_FILE,
+	"Разговор_о_�лици"        => NS_FILE_TALK,
 	"МедијаВики"              => NS_MEDIAWIKI,
 	"Разговор_о_МедијаВикију" => NS_MEDIAWIKI_TALK,
 	'Шаблон'                  => NS_TEMPLATE,
@@ -50,9 +51,6 @@ $namespaceAliases = array(
 	'Разговор_о_категорији'   => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
- "Obi�na", "Nostalgija", "Kelnsko plavo"
-);
 
 $extraUserToggles = array(
 	'nolangconversion',
@@ -224,6 +222,8 @@ $messages = array(
 'tog-editwidth'               => 'Polje za izmene ima punu Å¡irinu',
 'tog-watchcreations'          => 'Dodaj stranice koje pravim u moj spisak nadgledanja',
 'tog-watchdefault'            => 'Dodaj stranice koje menjam u moj spisak nadgledanja',
+'tog-watchmoves'              => 'Dodaj stranice koje premeštam u moj spisak nadgledanja',
+'tog-watchdeletion'           => 'Dodaj stranice koje brišem u moj spisak nadgledanja',
 'tog-minordefault'            => 'Ozna�i sve izmene malim isprva',
 'tog-previewontop'            => 'Prikaži pretpregled pre polja za izmenu',
 'tog-previewonfirst'          => 'Prikaži pretpregled pri prvoj izmeni',
@@ -241,14 +241,17 @@ $messages = array(
 'tog-forceeditsummary'        => 'Upozori me kad ne unesem opis izmene',
 'tog-watchlisthideown'        => 'Sakrij moje izmene sa spiska nadgledanja',
 'tog-watchlisthidebots'       => 'Sakrij izmene botova sa spiska nadgledanja',
+'tog-watchlisthideminor'      => 'Sakrij male izmene sa spiska nadgledanja',
+'tog-watchlisthideliu'        => 'Sakrij izmene prijavljenih korisnika sa spiska nadgledanja',
+'tog-watchlisthideanons'      => 'Sakrij izmene anonimnih korisnika sa spiska nadgledanja',
 'tog-nolangconversion'        => 'Isklju�i konverziju varijanti',
+'tog-ccmeonemails'            => 'Pošalji mi kopije imejlova koje šaljem drugim korisnicima',
+'tog-showhiddencats'          => 'Prikaži skrivene kategorije',
 
 'underline-always'  => 'Uvek',
 'underline-never'   => 'Nikad',
 'underline-default' => 'Po podešavanjima brauzera',
 
-'skinpreview' => '(Pregled)',
-
 # Dates
 'sunday'        => 'nedelja',
 'monday'        => 'ponedeljak',
@@ -302,10 +305,15 @@ $messages = array(
 'dec'           => 'dec',
 
 # Categories related messages
-'pagecategories'         => '{{PLURAL:$1|Kategorija|Kategorije|Kategorije}} stranica',
-'category_header'        => 'ÄŒlanaka u kategoriji "$1"',
-'subcategories'          => 'Potkategorije',
-'listingcontinuesabbrev' => 'nast.',
+'pagecategories'           => '{{PLURAL:$1|Kategorija|Kategorije|Kategorije}} stranica',
+'category_header'          => 'ÄŒlanaka u kategoriji "$1"',
+'subcategories'            => 'Potkategorije',
+'category-media-header'    => 'Medija u kategoriji "$1"',
+'category-empty'           => "''Ova kategorija trenutno nema stranica ili medija.''",
+'hidden-categories'        => '{{PLURAL:$1|Skrivena kategorija|Skrivene kategorije}}',
+'hidden-category-category' => 'Skrivene kategorije', # Name of the category where hidden categories will be listed
+'category-subcat-count'    => '{{PLURAL:$2|Ova kategorija sadrži samo sledeću kategoriju.|Ova kategorija sadrži {{PLURAL:$1|potkategoriju|$1 potkategorije}}, od $2 ukupno.}}',
+'listingcontinuesabbrev'   => 'nast.',
 
 'mainpagetext'      => "<big>'''MedijaViki je uspešno instaliran.'''</big>",
 'mainpagedocfooter' => 'Molimo vidite [http://meta.wikimedia.org/wiki/Help:Contents korisni�ki vodi�] za informacije o upotrebi viki softvera.
@@ -331,7 +339,7 @@ $messages = array(
 'mytalk'         => 'Moj razgovor',
 'anontalk'       => 'Razgovor za ovu IP adresu',
 'navigation'     => 'Navigacija',
-'and'            => 'i',
+'and'            => '&#32;i',
 
 # Metadata in edit box
 'metadata_help' => 'Metapodaci:',
@@ -353,15 +361,18 @@ $messages = array(
 'print'             => 'Å tampa',
 'edit'              => 'Uredi',
 'editthispage'      => 'Uredi ovu stranicu',
+'create-this-page'  => 'Napravi ovu stranicu',
 'delete'            => 'obriši',
 'deletethispage'    => 'Obriši ovu stranicu',
 'undelete_short'    => 'vrati {{PLURAL:$1|jednu obrisanu izmenu|$1 obrisane izmene|$1 obrisanih izmena}}',
 'protect'           => 'zaštiti',
+'protect_change'    => 'izmeni',
 'protectthispage'   => 'Zaštiti ovu stranicu',
 'unprotect'         => 'Skloni zaštitu',
 'unprotectthispage' => 'Skloni zaštitu sa ove stranice',
 'newpage'           => 'Nova stranica',
 'talkpage'          => 'Razgovor o ovoj stranici',
+'talkpagelinktext'  => 'Razgovor',
 'specialpage'       => 'Posebna stranica',
 'personaltools'     => 'Li�ni alati',
 'postcomment'       => 'Pošalji komentar',
@@ -371,8 +382,8 @@ $messages = array(
 'toolbox'           => 'alati',
 'userpage'          => 'Pogledaj korisni�ku stranu',
 'projectpage'       => 'Pogledaj stranu projekta',
-'imagepage'         => 'Pogledaj stranu slike',
-'mediawikipage'     => 'Vidi stranicu poruke',
+'imagepage'         => 'Pogledaj stranicu fajla',
+'mediawikipage'     => 'Pogledaj stranicu poruke',
 'templatepage'      => 'Vidi stranicu Å¡ablona',
 'viewhelppage'      => 'Vidi stranicu pomoći',
 'categorypage'      => 'Vidi stranicu kategorije',
@@ -390,8 +401,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'O projektu {{SITENAME}}',
 'aboutpage'            => 'Project:O',
-'bugreports'           => 'Prijave grešaka',
-'bugreportspage'       => 'Project:Prijave_grešaka',
 'copyright'            => 'Sadržaj je objavljen pod $1.',
 'copyrightpagename'    => 'Autorska prava projekta {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Autorska prava',
@@ -413,8 +422,6 @@ $messages = array(
 
 'badaccess'        => 'Greška u dozvolama',
 'badaccess-group0' => 'Nije vam dozvoljeno da izvršite akciju koju ste pokrenuli.',
-'badaccess-group1' => 'Akcija koju ste pokrenuli je rezerevisana za korisnike u grupi $1.',
-'badaccess-group2' => 'Akcija koju ste pokrenuli je rezervisana za korisnike iz jedne od grupa $1.',
 'badaccess-groups' => 'Akcija koju ste pokrenuli je rezervisana za korisnike iz jedne od grupa $1.',
 
 'versionrequired'     => 'Verzija $1 MedijaVikija je potrebna',
@@ -498,7 +505,6 @@ Administrator koji ju je zaklju�ao dao je ovo objašnjenje: $1',
 'badtitle'             => 'Loš naslov',
 'badtitletext'         => 'Zahtevani naslov stranice je bio neispravan, prazan ili
 neispravno povezan međujezi�ki ili interviki naslov. Možda sadrži jedan ili više karaktera koji ne mogu da se upotrebljavaju u naslovima.',
-'perfdisabled'         => 'Žao nam je! Ova mogućnost je privremeno onemogućena jer usporava bazu do te mere da više niko ne može da koristi viki.',
 'perfcached'           => 'Sledeći podaci su keširani i ne moraju biti u potpunosti ažurirani.',
 'perfcachedts'         => 'Sledeći podaci su keširani i poslednji put su ažurirani: $1',
 'wrong_wfQuery_params' => 'Neta�ni parametri za wfQuery()<br />
@@ -512,8 +518,8 @@ Pretraga: $2',
 
 # Login and logout pages
 'logouttitle'                => 'Odjavi se',
-'logouttext'                 => '<strong>Sada ste odjavljeni.</strong><br />
-Možete da nastavite da koristite projekat {{SITENAME}} anonimno, ili se ponovo prijaviti kao drugi korisnik. Obratite pažnju da neke stranice mogu nastaviti da se prikazuju kao da ste još uvek prijavljeni, dok ne o�istite keš svog brauzera.',
+'logouttext'                 => "'''Sada ste odjavljeni.'''<br />
+Možete da nastavite da koristite projekat {{SITENAME}} anonimno, ili se ponovo prijaviti kao drugi korisnik. Obratite pažnju da neke stranice mogu nastaviti da se prikazuju kao da ste još uvek prijavljeni, dok ne o�istite keš svog brauzera.",
 'welcomecreation'            => '== Dobrodošli, $1! ==
 
 Vaš nalog je napravljen.
@@ -525,8 +531,8 @@ Ne zaboravite da prilagodite sebi svoja {{SITENAME}} podešavanja.',
 'remembermypassword'         => 'Zapamti me',
 'yourdomainname'             => 'Vaš domen',
 'externaldberror'            => 'Došlo je ili do greške pri spoljašnjoj autentifikaciji baze podataka ili vam nije dozvoljeno da ažurirate svoj spoljašnji nalog.',
-'loginproblem'               => '<b>Bilo je problema sa vašim prijavljivanjem.</b><br />Pokušajte ponovo!',
 'login'                      => 'Prijavi se',
+'nav-login-createaccount'    => 'Prijavi se / registruj se',
 'loginprompt'                => "Morate da imate omogućene kola�iće (''cookies'') da biste se prijavili na {{SITENAME}}.",
 'userlogin'                  => 'Registruj se / Prijavi se',
 'logout'                     => 'Odjavi se',
@@ -539,19 +545,25 @@ Ne zaboravite da prilagodite sebi svoja {{SITENAME}} podešavanja.',
 'gotaccountlink'             => 'Prijavi se',
 'createaccountmail'          => 'e-poštom',
 'badretype'                  => 'Lozinke koje ste uneli se ne poklapaju.',
-'userexists'                 => 'Korisni�ko ime koje ste uneli već je u upotrebi. Molimo izaberite drugo ime.',
+'userexists'                 => 'Korisni�ko ime koje ste uneli već je u upotrebi. 
+Molimo izaberite drugo ime.',
 'youremail'                  => 'Adresa vaše e-pošte *',
 'username'                   => 'Korisni�ko ime:',
 'uid'                        => 'Korisni�ki ID:',
+'prefs-memberingroups'       => 'ÄŒlan {{PLURAL:$1|grupe|grupa}}:',
 'yourrealname'               => 'Vaše pravo ime *',
 'yourlanguage'               => 'Jezik:',
 'yourvariant'                => 'Varijanta:',
 'yournick'                   => 'Nadimak:',
 'badsig'                     => 'Greška u potpisu; proverite HTML tagove.',
+'badsiglength'               => 'Vaš potpis je preduga�ak.
+Mora biti ispod $1 {{PLURAL:$1|karakter|karaktera}}.',
 'email'                      => 'E-pošta',
 'prefs-help-realname'        => '* Pravo ime (opciono): ako izaberete da date ime, ovo će biti korišćeno za pripisivanje za vaš rad.',
 'loginerror'                 => 'Greška pri prijavljivanju',
-'prefs-help-email'           => '* E-pošta (opciono): Omogućuje ostalima da vas kontaktiraju preko vaše korisni�ke strane ili strane za razgovora bez potrebe da odajete svoj identitet.',
+'prefs-help-email'           => 'Adresa e-pošte je opciona, ali vam omogućava da zatražite novu lozinku u slu�aju da je zaboravite. 
+Takođe možete podesiti da drugi mogu da vas kontaktiraju preko vaše korisni�ke strane ili strane za razgovor, bez potrebe da odajete svoj identitet.',
+'prefs-help-email-required'  => 'Neophodna je adresa e-pošte.',
 'nocookiesnew'               => "Korisni�ki nalog je napravljen, ali niste prijavljeni. {{SITENAME}} koristi kola�iće (''cookies'') da bi se korisnici prijavili. Vi ste onemogućili kola�iće na svom ra�unaru. Molimo omogućite ih, a onda se prijavite sa svojim novim korisni�kim imenom i lozinkom.",
 'nocookieslogin'             => "{{SITENAME}} koristi kola�iće (''cookies'') da bi se korisnici prijavili. Vi ste onemogućili kola�iće na svom ra�unaru. Molimo omogućite ih i pokušajte ponovo sa prijavom.",
 'noname'                     => 'Niste izabrali ispravno korisni�ko ime.',
@@ -565,7 +577,7 @@ Proverite da li ste dobro napisali ili napravite [[Special:UserLogin/signup|novi
 'wrongpasswordempty'         => 'Lozinka koju ste uneli je prazna. Molimo pokušajte ponovo.',
 'passwordtooshort'           => 'Vaša šifra je previše kratka.
 Mora da ima bar {{PLURAL:$1|1 karakter|$1 karaktera}} i razli�ita od vašeg korisni�kog imena..',
-'mailmypassword'             => 'Pošalji mi lozinku',
+'mailmypassword'             => 'Pošalji mi novu lozinku',
 'passwordremindertitle'      => '{{SITENAME}} podsetnik za Å¡ifru',
 'passwordremindertext'       => 'Neko (verovatno vi, sa IP adrese $1)
 je zahtevao da vam pošaljemo novu lozinku za {{SITENAME}} ($4).
@@ -581,8 +593,9 @@ Molimo prijavite se pošto je primite.',
 'throttled-mailpassword'     => 'Podsetnik lozinke vam je već poslao jednu poruku u poslednjih {{PLURAL:$1|sat|$1 sati}}i.
 Radi prevencije izvršenja nedozvoljene akcije, podsetnik šalje samo jednu poruku u roku od {{PLURAL:$1|sata|$1 sati}}.',
 'mailerror'                  => 'Greška pri slanju e-pošte: $1',
-'acct_creation_throttle_hit' => 'Žao nam je, već ste napravili $1 korisni�ka imena. Više nije dozvoljeno.',
-'emailauthenticated'         => 'Vaša adresa e-pošte je potvrđena: $1.',
+'acct_creation_throttle_hit' => 'Žao nam je, već ste napravili {{PLURAL:$1|1 nalog|$1 naloga}}. 
+Više nije dozvoljeno.',
+'emailauthenticated'         => 'Vaša adresa e-pošte na $2 je potvrđena u $3.',
 'emailnotauthenticated'      => 'Vaša adresa e-pošte još uvek nije potvrđena. E-pošta neće biti poslata ni za jednu od sledećih mogućnosti.',
 'noemailprefs'               => 'Nazna�ite adresu e-pošte kako bi ove mogućnosti radile.',
 'emailconfirmlink'           => 'Potvrdite vašu adresu e-pošte',
@@ -591,6 +604,23 @@ Radi prevencije izvršenja nedozvoljene akcije, podsetnik šalje samo jednu poru
 'accountcreatedtext'         => 'Korisni�ki nalog za $1 je napravljen.',
 'loginlanguagelabel'         => 'Jezik: $1',
 
+# Password reset dialog
+'resetpass'                 => 'Promeni lozinku',
+'resetpass_announce'        => 'Prijavili ste se sa temporalnim kodom koji Vam je poslat preko e-pošte.
+Kako biste dovršili prijavljivanje, morate uneti novu lozinku:',
+'resetpass_text'            => '<!-- Ovde dodaj tekst -->',
+'resetpass_header'          => 'Izmeni lozinku naloga',
+'oldpassword'               => 'Stara lozinka:',
+'newpassword'               => 'Nova lozinka:',
+'retypenew'                 => 'Ponovo otkucajte novu lozinku:',
+'resetpass_submit'          => 'Unesi lozinku i prijavi se',
+'resetpass_success'         => 'Vaša lozinka je uspešno promenjena! Sada vas prijavljujem u...',
+'resetpass_bad_temporary'   => 'Nevažeća temporalna lozinka.
+Mora da ste već uspešno promenili vašu lozinku ili zatražili novu temporalnu lozinku.',
+'resetpass_forbidden'       => 'Lozinke se ne mogu menjati',
+'resetpass-no-info'         => 'Morate se prijaviti kako bi direktno pristupili ovoj stranici.',
+'resetpass-submit-loggedin' => 'Promeni lozinku',
+
 # Edit page toolbar
 'bold_sample'     => 'podebljan tekst',
 'bold_tip'        => 'podebljan tekst',
@@ -608,14 +638,14 @@ Radi prevencije izvršenja nedozvoljene akcije, podsetnik šalje samo jednu poru
 'nowiki_tip'      => 'Ignoriši viki formatiranje',
 'image_sample'    => 'ime_slike.jpg',
 'image_tip'       => 'Uklopljena slika',
-'media_sample'    => 'ime_medija_fajla.mp3',
+'media_sample'    => 'ime_medija_fajla.ogg',
 'media_tip'       => 'Putanja ka multimedijalnom fajlu',
 'sig_tip'         => 'Vaš potpis sa trenutnim vremenom',
 'hr_tip'          => 'Horizontalna linija',
 
 # Edit pages
-'summary'                   => 'Opis izmene',
-'subject'                   => 'Tema/naslov',
+'summary'                   => 'Opis izmene:',
+'subject'                   => 'Tema/naslov:',
 'minoredit'                 => 'Ovo je mala izmena',
 'watchthis'                 => 'Nadgledaj ovaj �lanak',
 'savearticle'               => 'Snimi stranicu',
@@ -662,21 +692,21 @@ Takvu adresu može deliti više korisnika.
 Ako ste anonimni korisnik i mislite da su vam upućene nebitne primedbe, molimo vas da [[Special:UserLogin|napravite nalog ili se prijavite]] da biste izbegli buduću zabunu sa ostalim anonimnim korisnicima.''",
 'noarticletext'             => 'Trenutno nema teksta na ovoj stranici. Možete [[Special:Search/{{PAGENAME}}|pretražiti ovaj naziv]] u ostalim stranicama ili [{{fullurl:{{FULLPAGENAME}}|action=edit}} urediti ovu stranicu].',
 'clearyourcache'            => "'''Zapamtite:''' Nakon snimanja, možda morate o�istiti keš vašeg brauzera da biste videli promene. '''Mozilla / Firefox / Safari:''' držite ''Shift'' dok klikćete ''Reload'' ili pritisnite  ''Shift+Ctrl+R'' (''Cmd-Shift-R'' na ''Apple Mac'' mašini); '''IE:''' držite ''Ctrl'' dok klikćete ''Refresh'' ili pritisnite ''Ctrl-F5''; '''Konqueror:''': samo kliknite ''Reload'' dugme ili pritisnite ''F5''; korisnici '''Opera''' brauzera možda moraju da u potpunosti o�iste svoj keš preko ''Tools→Preferences''.",
-'usercssjsyoucanpreview'    => "<strong>Savet:</strong> Korisitite 'Prikaži pretpregled' dugme da testirate svoj novi CSS/JS pre snimanja.",
+'usercssjsyoucanpreview'    => "'''Savet:''' Korisitite 'Prikaži pretpregled' dugme da testirate svoj novi CSS/JS pre snimanja.",
 'usercsspreview'            => "'''Zapamtite ovo je samo pretpregled vašeg CSS, još uvek nije snimljen!'''",
 'userjspreview'             => "'''Zapamtite ovo je samo pretpregled vaše JavaScript-e i da još uvek nije snimljen!'''",
 'userinvalidcssjstitle'     => "'''Pažnja:''' Ne postoji koža \"\$1\". Zapamtite da li�ne .css i .js koriste mala po�etna slova, npr. {{ns:user}}:Petar/monobook.css a ne {{ns:user}}:Petar/Monobook.css.",
 'updated'                   => '(Ažurirano)',
-'note'                      => '<strong>Napomena:</strong>',
-'previewnote'               => '<strong>Ovo samo pretpregled; izmene još nisu sa�uvane!</strong>',
+'note'                      => "'''Napomena:'''",
+'previewnote'               => "'''Ovo samo pretpregled; izmene još nisu sa�uvane!'''",
 'previewconflict'           => 'Ovaj pretpregled oslikava kako će tekst u
 tekstualnom polju izgledati ako se odlu�ite da ga snimite.',
-'session_fail_preview'      => '<strong>Žao nam je! Nismo mogli da obradimo vašu izmenu zbog gubitka podataka seanse. Molimo pokušajte kasnije. Ako i dalje ne radi, pokušajte da se odjavite i ponovo prijavite.</strong>',
-'session_fail_preview_html' => "<strong>Žao nam je! Nismo mogli da obradimo vašu izmenu zbog gubitka podataka seanse.</strong>
+'session_fail_preview'      => "'''Žao nam je! Nismo mogli da obradimo vašu izmenu zbog gubitka podataka seanse. Molimo pokušajte kasnije. Ako i dalje ne radi, pokušajte da se odjavite i ponovo prijavite.'''",
+'session_fail_preview_html' => "'''Žao nam je! Nismo mogli da obradimo vašu izmenu zbog gubitka podataka seanse.'''
 
 ''Zbog toga što {{SITENAME}} ima omogućen sirov HTML, pretpregled je sakriven kao predostrožnost protiv JavaScript napada.''
 
-<strong>Ako ste pokušali da napravite legitimnu izmenu, molimo pokušajte ponovo. Ako i dalje ne radi, pokušajte da se [[Special:UserLogout|odjavite]] i ponovo prijavite.</strong>",
+'''Ako ste pokušali da napravite legitimnu izmenu, molimo pokušajte ponovo. Ako i dalje ne radi, pokušajte da se [[Special:UserLogout|odjavite]] i ponovo prijavite.'''",
 'editing'                   => 'Uređujete $1',
 'editingsection'            => 'Uređujete $1 (deo)',
 'editingcomment'            => 'Uređujete $1 (komentar)',
@@ -689,23 +719,25 @@ Moraćete da unesete svoje promene u postojeći tekst.
 pritisnete "Snimi stranicu".<br />',
 'yourtext'                  => 'Vaš tekst',
 'storedversion'             => 'Uskladištena verzija',
-'nonunicodebrowser'         => '<strong>UPOZORENJE: Vaš brauzer ne podržava unikod. Molimo promenite ga pre nego što po�nete sa uređivanjem �lanka.</strong>',
-'editingold'                => '<strong>PAŽNJA: Vi menjate stariju reviziju ove stranice.
-Ako je snimite, sve promene u�injene od ove revizije biće izgubljene.</strong>',
+'nonunicodebrowser'         => "'''UPOZORENJE: Vaš brauzer ne podržava unikod. Molimo promenite ga pre nego što po�nete sa uređivanjem �lanka.'''",
+'editingold'                => "'''PAŽNJA: Vi menjate stariju reviziju ove stranice.
+Ako je snimite, sve promene u�injene od ove revizije biće izgubljene.'''",
 'yourdiff'                  => 'Razlike',
-'copyrightwarning'          => 'Napomena: Za sve vaše doprinose se smatra da su izdati pod $2 (vidite $1 za detalje). Ako ne želite da se vaši doprinosi nemilosrdno menjaju, ne šaljite ih ovde.<br />
+'copyrightwarning'          => "Napomena: Za sve vaše doprinose se smatra da su izdati pod $2 (vidite $1 za detalje). Ako ne želite da se vaši doprinosi nemilosrdno menjaju, ne šaljite ih ovde.<br />
 Takođe nam obećavate da ste ovo sami napisali ili prekopirali iz izvora u javnom vlasništvu ili sli�nog slobodnog izvora.
-<strong>NE ŠALJITE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOZVOLE!</strong>',
-'copyrightwarning2'         => 'Napomena: Sve vaše doprinose ostali korisnici mogu da menjaju ili uklone. Ako ne želite da se vaši doprinosi nemilosrdno menjaju, ne šaljite ih ovde.<br />
+'''NE ŠALJITE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOZVOLE!'''",
+'copyrightwarning2'         => "Napomena: Sve vaše doprinose ostali korisnici mogu da menjaju ili uklone. Ako ne želite da se vaši doprinosi nemilosrdno menjaju, ne šaljite ih ovde.<br />
 Takođe nam obećavate da ste ovo sami napisali ili prekopirali iz izvora u javnom vlasništvu ili sli�nog slobodnog izvora (vidite $1 za detalje).
-<strong>NE ŠALJITE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOZVOLE!</strong>',
-'longpagewarning'           => '<strong>PAŽNJA: Ova stranica ima $1 kilobajta; neki brauzeri imaju problema sa uređivanjem strana koje imaju blizu ili više od 32 kilobajta. Molimo vas da razmotrite razbijanje stranice na manje delove.</strong>',
-'longpageerror'             => '<strong>GREŠKA: Tekst koji snimate je velik $1 kilobajta, što je veće od maksimalno dozvoljene veli�ine koja iznosi $2 kilobajta. Nemoguće je snimiti stranicu.</strong>',
-'readonlywarning'           => '<strong>PAŽNJA: Baza je upravo zaklju�ana zbog održavanja,
-tako da sada nećete moći da snimite svoje izmene. Možda bi bilo dobro da iskopirate tekst u neki editor teksta i snimite ga za kasnije.</strong>',
-'protectedpagewarning'      => '<strong>PAŽNJA: Ova stranica je zaklju�ana tako da samo korisnici sa
+'''NE ŠALJITE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOZVOLE!'''",
+'longpagewarning'           => "'''PAŽNJA: Ova stranica ima $1 kilobajta; neki brauzeri imaju problema sa uređivanjem strana koje imaju blizu ili više od 32 kilobajta. Molimo vas da razmotrite razbijanje stranice na manje delove.'''",
+'longpageerror'             => "'''GREŠKA: Tekst koji snimate je velik $1 kilobajta, što je veće od maksimalno dozvoljene veli�ine koja iznosi $2 kilobajta. Nemoguće je snimiti stranicu.'''",
+'readonlywarning'           => "'''PAŽNJA: Baza je upravo zaklju�ana zbog održavanja, tako da sada nećete moći da snimite svoje izmene.
+Možda bi bilo dobro da iskopirate tekst u neki editor teksta i sa�uvate za kasnije.'''
+
+Administartor koji je zaklju�ao bazu je dao ovo objašnjenje: $1",
+'protectedpagewarning'      => "'''PAŽNJA: Ova stranica je zaklju�ana tako da samo korisnici sa
 administratorskim privilegijama mogu da je menjaju. Uverite se
-da pratite [[{{ns:project}}:Pravila o zaštiti stranica|pravila o zaštiti stranica]].</strong>',
+da pratite [[{{ns:project}}:Pravila o zaštiti stranica|pravila o zaštiti stranica]].'''",
 'semiprotectedpagewarning'  => "'''Napomena:''' Ova stranica je zaklju�ana tako da je samo registrovani korisnici mogu uređivati.",
 'templatesused'             => 'Å abloni koji se koriste na ovoj stranici:',
 'edittools'                 => '<!-- Tekst odavde će biti pokazan ispod formulara za uređivanje i slanje slika. -->',
@@ -719,12 +751,9 @@ Možete se vratiti i urediti već postojeću stranu ili [[Special:UserLogin|se p
 # History pages
 'viewpagelogs'        => 'Pogledaj protokole za ovu stranu',
 'nohistory'           => 'Ne postoji istorija izmena za ovu stranicu.',
-'revnotfound'         => 'Revizija nije pronađena',
-'revnotfoundtext'     => 'Starija revizija ove stranice koju ste zatražili nije nađena.
-Molimo vas da proverite URL koji ste upotrebili da biste pristupili ovoj stranici.',
 'currentrev'          => 'Trenutna revizija',
 'revisionasof'        => 'Revizija od $1',
-'revision-info'       => 'Revizija od $1; $2',
+'revision-info'       => 'Revizija od $1; $2', # Additionally available: $3: revision id
 'previousrevision'    => '� Prethodna revizija',
 'nextrevision'        => 'Sledeća revizija →',
 'currentrevisionlink' => 'Trenutna revizija',
@@ -794,6 +823,7 @@ Ostali administratori na ovoj Vikipediji će i dalje imati mogućnost da vide sk
 'prevn'                 => 'prethodnih $1',
 'nextn'                 => 'sledećih $1',
 'viewprevnext'          => 'Pogledaj ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Sadržaj',
 'showingresults'        => "Prikazujem ispod '''$1''' rezultata po�ev od #'''$2'''.",
 'showingresultsnum'     => "Prikazujem ispod '''$3''' rezultate po�ev od #'''$2'''.",
 'nonefound'             => "'''Napomena''': neuspešne pretrage su
@@ -817,6 +847,7 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatu).",
 'qbsettings-floatingright' => 'Plutajuća desno',
 'changepassword'           => 'Promeni lozinku',
 'skin'                     => 'Koža',
+'skin-preview'             => 'Pregled',
 'math'                     => 'Matematike',
 'dateformat'               => 'Format datuma',
 'datedefault'              => 'Nije bitno',
@@ -838,9 +869,6 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatu).",
 'prefs-misc'               => 'Razno',
 'saveprefs'                => 'Sa�uvaj',
 'resetprefs'               => 'Vrati',
-'oldpassword'              => 'Stara lozinka:',
-'newpassword'              => 'Nova lozinka:',
-'retypenew'                => 'Ponovo otkucajte novu lozinku:',
 'textboxsize'              => 'Veli�ine tekstualnog polja',
 'rows'                     => 'Redova',
 'columns'                  => 'Kolona',
@@ -914,7 +942,8 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatu).",
 'rc_categories_any'                 => 'Bilo koji',
 
 # Recent changes linked
-'recentchangeslinked' => 'Srodne promene',
+'recentchangeslinked'      => 'Srodne promene',
+'recentchangeslinked-page' => 'Ime stranice:',
 
 # Upload
 'upload'                      => 'Pošalji fajl',
@@ -926,12 +955,12 @@ koje sadrže sve izraze koji se traže će se pojaviti u rezultatu).",
 'upload_directory_read_only'  => 'Na direktorijum za slanje ($1) server ne može da piše.',
 'uploaderror'                 => 'Greška pri slanju',
 'uploadtext'                  => "Koristite donji obrazac da pošaljete fajlove.
-Za gledanje ili pretraživanje već poslatih slika, idite na [[Special:ImageList|spisak poslatih fajlova]].
+Za gledanje ili pretraživanje već poslatih slika, idite na [[Special:FileList|spisak poslatih fajlova]].
 Slanja i brisanja se beleže u [[Special:Log/upload|istoriji slanja]]
 
 Da biste ubacili sliku na stranu, koristite vezu u obliku
-'''<nowiki>[[</nowiki>{{ns:image}}:Fajl.jpg<nowiki>]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}:Fajl.png|opis slike<nowiki>]]</nowiki>''' ili
+'''<nowiki>[[</nowiki>{{ns:file}}:Fajl.jpg<nowiki>]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}:Fajl.png|opis slike<nowiki>]]</nowiki>''' ili
 '''<nowiki>[[</nowiki>{{ns:media}}:Fajl.ogg<nowiki>]]</nowiki>''' za direktno povezivanje na fajl.",
 'uploadlog'                   => 'istorija slanja',
 'uploadlogpage'               => 'istorija slanja',
@@ -948,11 +977,11 @@ Da biste ubacili sliku na stranu, koristite vezu u obliku
 'badfilename'                 => 'Ime slike je promenjeno u "$1".',
 'largefileserver'             => 'Ovaj fajl je veći nego što je podešeno da server dozvoli.',
 'emptyfile'                   => 'Fajl koji ste poslali deluje da je prazan. Ovo je moguće zbog greške u imenu fajla. Molimo proverite da li stvarno želite da pošaljete ovaj fajl.',
-'fileexists'                  => 'Fajl sa ovim imenom već postoji. Molimo proverite <strong><tt>$1</tt></strong> ako niste sigurni da li želite da ga promenite.',
+'fileexists'                  => "Fajl sa ovim imenom već postoji. Molimo proverite '''<tt>$1</tt>''' ako niste sigurni da li želite da ga promenite.",
 'fileexists-forbidden'        => 'Fajl sa ovim imenom već postoji;
-molimo vratite se i pošaljite ovaj fajl pod novim imenom. [[Image:$1|thumb|center|$1]]',
+molimo vratite se i pošaljite ovaj fajl pod novim imenom. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Fajl sa ovim imenom već postoji u zajedni�koj ostavi;
-molimo vratite se i pošaljite ovaj fajl pod novim imenom. [[Image:$1|thumb|center|$1]]',
+molimo vratite se i pošaljite ovaj fajl pod novim imenom. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Uspešno slanje',
 'uploadwarning'               => 'Upozorenje pri slanju',
 'savefile'                    => 'Snimi fajl',
@@ -985,17 +1014,17 @@ molimo vratite se i pošaljite ovaj fajl pod novim imenom. [[Image:$1|thumb|cent
 'upload_source_url'  => ' (validan, javno dostupan URL)',
 'upload_source_file' => ' (fajl na vašem ra�unaru)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Traži ime slike:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Traži ime slike:',
 'imgfile'               => 'fajl',
-'imagelist'             => 'Spisak slika',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Ime',
-'imagelist_user'        => 'Korisnik',
-'imagelist_size'        => 'Veli�ina (bajtovi)',
-'imagelist_description' => 'Opis slike',
-
-# Image description page
+'listfiles'             => 'Spisak slika',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Ime',
+'listfiles_user'        => 'Korisnik',
+'listfiles_size'        => 'Veli�ina (bajtovi)',
+'listfiles_description' => 'Opis slike',
+
+# File description page
 'imagelinks'                => 'Upotreba slike',
 'linkstoimage'              => 'Sledeće stranice koriste ovaj fajl:',
 'nolinkstoimage'            => 'Nema stranica koje koriste ovaj fajl.',
@@ -1029,18 +1058,9 @@ molimo vratite se i pošaljite ovaj fajl pod novim imenom. [[Image:$1|thumb|cent
 'randomredirect' => 'Slu�ajno preusmerenje',
 
 # Statistics
-'statistics'             => 'Statistike',
-'sitestats'              => 'Statistike sajta',
-'userstats'              => 'Statistike korisnika',
-'sitestatstext'          => "Postoji ukupno '''$1''' stranica u bazi podataka. Ovaj broj uklju�uje strane za razgovor, stranice o sajtu, preusmerenja, �lanke bez ijedne poveznice i ostale stranice koje se ne mogu ra�unati kao �lanci. Ne ra�unajući njih, postoji '''$2''' stranica koje su verovatno legitimni �lanci.
-
-Na ovaj sajt je poslato '''$8''' slika.
-
-Stranice su ukupno pogledane '''$3''' puta i '''$4''' izmena od postavljanja vikija. Ovo zna�i da je bilo u proseku '''$5''' izmena po stranici i '''$6''' pogleda po stranici.
-
-Dužina reda za poslove iznosi '''$7'''",
-'userstatstext'          => "Postoji '''$1''' registrovanih korisnika, od kojih su '''$2''' (ili $4%) administratori (pogledajte $3).",
-'statistics-mostpopular' => 'Najposećenije stranice',
+'statistics'              => 'Statistike',
+'statistics-header-users' => 'Statistike korisnika',
+'statistics-mostpopular'  => 'Najposećenije stranice',
 
 'disambiguations'     => 'Stranice za višezna�ne odrednice',
 'disambiguationspage' => '{{ns:template}}:Višezna�na odrednica',
@@ -1121,9 +1141,18 @@ Možete suziti pregled odabirom tipa istorije, korisni�kog imena ili tražene s
 'categories'         => 'Kategorije stranica',
 'categoriespagetext' => 'Sledeće kategorije već postoje na vikiju',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Obrisane izmene',
+
 # Special:ListUsers
 'listusersfrom' => 'Prikaži korisnike po�evši od:',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'istorija kreiranja korisnika',
+'newuserlogpagetext'       => 'Ovo je istorija skorašnjih kreacija korisnika',
+'newuserlog-create-entry'  => 'Novi korisnik',
+'newuserlog-create2-entry' => 'napravio nalog za $1',
+
 # E-mail user
 'mailnologin'     => 'Nema adrese za slanje',
 'mailnologintext' => 'Morate biti [[Special:UserLogin|prijavljeni]] i imati ispravnu adresu e-pošte u vašim [[Special:Preferences|podešavanjima]]
@@ -1212,54 +1241,60 @@ Da promenite podešavanja vezana za spisak nadgledanja posetite
 Fidbek i dalja pomoć:
 {{fullurl:{{ns:help}}:Sadržaj}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Obriši stranicu',
-'confirm'                     => 'Potvrdi',
-'excontent'                   => "sadržaj je bio: '$1'",
-'excontentauthor'             => "sadržaj je bio: '$1' (a jedinu izmenu je napravio '$2')",
-'exbeforeblank'               => "sadržaj pre brisanja je bio: '$1'",
-'exblank'                     => 'stranica je bila prazna',
-'historywarning'              => 'Pažnja: stranica koju želite da obrišete ima istoriju:',
-'confirmdeletetext'           => 'Na putu ste da trajno obrišete stranicu
+# Delete
+'deletepage'        => 'Obriši stranicu',
+'confirm'           => 'Potvrdi',
+'excontent'         => "sadržaj je bio: '$1'",
+'excontentauthor'   => "sadržaj je bio: '$1' (a jedinu izmenu je napravio '$2')",
+'exbeforeblank'     => "sadržaj pre brisanja je bio: '$1'",
+'exblank'           => 'stranica je bila prazna',
+'historywarning'    => 'Pažnja: stranica koju želite da obrišete ima istoriju:',
+'confirmdeletetext' => 'Na putu ste da trajno obrišete stranicu
 ili sliku zajedno sa njenom istorijom iz baze podataka.
 Molimo vas potvrdite da nameravate da uradite ovo, da razumete
 posledice, i da ovo radite u skladu sa
 [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Akcija završena',
-'deletedtext'                 => 'ÄŒlanak "<nowiki>$1</nowiki>" je obrisan.
+'actioncomplete'    => 'Akcija završena',
+'deletedtext'       => 'ÄŒlanak "<nowiki>$1</nowiki>" je obrisan.
 Pogledajte $2 za zapis o skorašnjim brisanjima.',
-'deletedarticle'              => 'obrisan "[[$1]]"',
-'dellogpage'                  => 'istorija brisanja',
-'dellogpagetext'              => 'Ispod je spisak najskorijih brisanja.',
-'deletionlog'                 => 'istorija brisanja',
-'reverted'                    => 'Vraćeno na raniju reviziju',
-'deletecomment'               => 'Razlog za brisanje',
-'rollback'                    => 'Vrati izmene',
-'rollback_short'              => 'Vrati',
-'rollbacklink'                => 'vrati',
-'rollbackfailed'              => 'Vraćanje nije uspelo',
-'cantrollback'                => 'Ne mogu da vratim izmenu; poslednji autor je ujedno i jedini.',
-'alreadyrolled'               => 'Ne mogu da vratim poslednju izmenu [[:$1]]
+'deletedarticle'    => 'obrisan "[[$1]]"',
+'dellogpage'        => 'istorija brisanja',
+'dellogpagetext'    => 'Ispod je spisak najskorijih brisanja.',
+'deletionlog'       => 'istorija brisanja',
+'reverted'          => 'Vraćeno na raniju reviziju',
+'deletecomment'     => 'Razlog za brisanje',
+
+# Rollback
+'rollback'       => 'Vrati izmene',
+'rollback_short' => 'Vrati',
+'rollbacklink'   => 'vrati',
+'rollbackfailed' => 'Vraćanje nije uspelo',
+'cantrollback'   => 'Ne mogu da vratim izmenu; poslednji autor je ujedno i jedini.',
+'alreadyrolled'  => 'Ne mogu da vratim poslednju izmenu [[:$1]]
 od korisnika [[User:$2|$2]] ([[User_talk:$2|razgovor]]); neko drugi je već izmenio ili vratio �lanak.
 
 Poslednju izmenu je napravio korisnik [[User:$3|$3]] ([[User_talk:$3|razgovor]]).',
-'editcomment'                 => 'Komentar izmene je: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Vraćene izmene od [[{{ns:special}}:Contributions/$2|$2]] ([[User_talk:$2|razgovor]]) na poslednju izmenu od korisnika [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'sessionfailure'              => 'Izgleda da postoji problem sa vašom seansom prijave;
+'editcomment'    => "Komentar izmene je: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'     => 'Vraćene izmene od [[{{ns:special}}:Contributions/$2|$2]] ([[User_talk:$2|razgovor]]) na poslednju izmenu od korisnika [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'sessionfailure' => 'Izgleda da postoji problem sa vašom seansom prijave;
 ova akcija je prekinuta kao predostrožnost protiv preotimanja seansi.
 Molimo kliknite "back" i ponovo u�itajte stranu odakle ste došli, a onda pokušajte ponovo.',
+
+# Protect
 'protectlogpage'              => 'istorija zaklju�avanja',
 'protectlogtext'              => 'Ispod je spisak zaklju�avanja i otklju�avanja stranica.',
 'protectedarticle'            => 'zaštitio $1',
 'unprotectedarticle'          => 'skinuo zaštitu sa $1',
 'protect-title'               => 'stavljanje zaštite "$1"',
+'prot_1movedto2'              => 'je promenio ime �lanku [[$1]] u [[$2]]',
 'protect-legend'              => 'Potvrdite zaštitu',
 'protectcomment'              => 'Razlog zaštite',
 'protect-unchain'             => 'Otklju�aj dozvole premeštanja',
-'protect-text'                => 'Ovde možete pogledati i menjati nivo zaštite za stranicu <strong><nowiki>$1</nowiki></strong>.',
+'protect-text'                => "Ovde možete pogledati i menjati nivo zaštite za stranicu '''<nowiki>$1</nowiki>'''.",
 'protect-default'             => '(standard)',
 'protect-level-autoconfirmed' => 'Blokiraj neregistrovane korisnike',
 'protect-level-sysop'         => 'Samo za administratore',
+'protect-expiry-options'      => '2 sata:2 hours,1 dan:1 day,3 dana:3 days,1 nedelja:1 week,2 nedelje:2 weeks,1 mesec:1 month,3 meseca:3 months,6 meseci:6 months,1 godina:1 year,beskona�no:infinite', # display1:time1,display2:time2,...
 
 # Restrictions (nouns)
 'restriction-edit' => 'Uređivanje',
@@ -1307,7 +1342,6 @@ Pogledajte [[{{ns:special}}:Log/delete|istoriju brisanja]] za spisak skorašnjih
 
 # What links here
 'whatlinkshere' => 'Å ta je povezano ovde',
-'linklistsub'   => '(spisak veza)',
 'linkshere'     => 'Sledeće stranice su povezane ovde:',
 'nolinkshere'   => 'Ni jedna stranica nije povezana ovde.',
 'isredirect'    => 'preusmeriva�',
@@ -1418,6 +1452,9 @@ nastavite.",
 
 U tim slu�ajevima, moraćete ru�no da premestite ili spojite stranicu ukoliko to želite.",
 'movearticle'             => 'Premesti stranicu',
+'movenologin'             => 'Niste prijavljeni',
+'movenologintext'         => 'Morate biti registrovani korisnik i [[Special:UserLogin|prijavljeni]]
+da biste premestili stranicu.',
 'newtitle'                => 'Novi naslov',
 'movepagebtn'             => 'premesti stranicu',
 'pagemovedsub'            => 'Premeštanje uspelo',
@@ -1441,7 +1478,6 @@ Ciljani �lanak "[[:$1]]" već postoji. Da li želite da ga obrišete da biste n
 'delete_and_move_confirm' => 'Da, obriši stranicu',
 'delete_and_move_reason'  => 'Obrisano kako bi se napravilo mesto za premeštanje',
 'selfmove'                => 'Izvorni i ciljani naziv su isti; strana ne može da se premesti preko same sebe.',
-'immobile_namespace'      => 'Ciljani naziv je posebnog tipa; ne mogu da premeste strane u taj imenski prostor.',
 
 # Export
 'export'          => 'Izvezi stranice',
@@ -1623,7 +1659,7 @@ Svi transviki uvozi su zabeleženi u [[Posebno:Log/import|istoriji uvoza]].',
 'imagemaxsize' => 'Ograni�i slike na stranama za razgovor o slikama na:',
 'thumbsize'    => 'Veli�ina umanjenog prikaza :',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerija novih slika',
 'imagelisttext'         => "Ispod je spisak od '''$1''' {{PLURAL:$1|fajla|fajla|fajlova}} poređanih $2.",
 'showhidebots'          => '($1 botove)',
@@ -1953,20 +1989,9 @@ $1
 Molimo potvrdite da stvarno želite da ponovo napravite ovaj �lanak.",
 'recreate'            => 'Ponovo napravi',
 
-# HTML dump
-'redirectingto' => 'Preusmeravam na [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Da li želite o�istiti keš ove stranice?
-
-$1',
 'confirm_purge_button' => 'Da',
-
-# AJAX search
-'searchcontaining' => "Pretraži �lanke koji sadrže ''$1''.",
-'searchnamed'      => "Pretraži �lanke koji se zovu ''$1''.",
-'articletitles'    => "Članci po�evši od ''$1''",
-'hideresults'      => 'Sakrij rezultate',
+'confirm-purge-top'    => 'Da li želite o�istiti keš ove stranice?',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; prethodna stranica',
diff --git a/languages/messages/MessagesSrn.php b/languages/messages/MessagesSrn.php
index abf45dd0..5c254210 100644
--- a/languages/messages/MessagesSrn.php
+++ b/languages/messages/MessagesSrn.php
@@ -13,6 +13,100 @@
 
 $fallback = 'nl';
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Spesyal',
+	NS_TALK             => 'Taki',
+	NS_USER             => 'Masyin',
+	NS_USER_TALK        => 'Taki_fu_masyin',
+	NS_PROJECT_TALK     => 'Taki_fu_$1',
+	NS_FILE             => 'Gefre',
+	NS_FILE_TALK        => 'Taki_fu_gefre',
+	NS_MEDIAWIKI_TALK   => 'Taki_fu_MediaWiki',
+	NS_TEMPLATE         => 'Ankra',
+	NS_TEMPLATE_TALK    => 'Taki_fu_ankra',
+	NS_HELP             => 'Yepi',
+	NS_HELP_TALK        => 'Taki_fu_yepi',
+	NS_CATEGORY         => 'Guru',
+	NS_CATEGORY_TALK    => 'Taki_fu_guru',
+);
+
+$namespaceAliases = array(
+	'Speciaal' => NS_SPECIAL,
+	'Overleg' => NS_TALK,
+	'Gebruiker' => NS_USER,
+	'Overleg_gebruiker' => NS_USER_TALK,
+	'Overleg_$1' => NS_PROJECT_TALK,
+	'Afbeelding' => NS_FILE,
+	'Overleg_afbeelding' => NS_FILE_TALK,
+	'Overleg_MediaWiki' => NS_MEDIAWIKI_TALK,
+	'Sjabloon' => NS_TEMPLATE,
+	'Overleg_sjabloon' => NS_TEMPLATE_TALK,
+	'Help' => NS_HELP,
+	'Overleg_help' => NS_HELP_TALK,
+	'Categorie' => NS_CATEGORY,
+	'Overleg_categorie' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'Tustirpeprewoysi' ),
+	'BrokenRedirects'           => array( 'BrokoStirpeprewoysi' ),
+	'Disambiguations'           => array( 'PeprewoysiFuKumakriki' ),
+	'Userlogin'                 => array( 'Kon' ),
+	'Userlogout'                => array( 'Gwe' ),
+	'Watchlist'                 => array( 'Sirey' ),
+	'Recentchanges'             => array( 'BakaseywanKenki' ),
+	'Upload'                    => array( 'Uploti' ),
+	'Listfiles'                 => array( 'Gefrerey' ),
+	'Newimages'                 => array( 'NyunGefre' ),
+	'Listusers'                 => array( 'Masyinrey' ),
+	'Randompage'                => array( 'SomaPapira' ),
+	'Lonelypages'               => array( 'WawanPeprewoysi' ),
+	'Uncategorizedpages'        => array( 'OguruPeprewoysi' ),
+	'Uncategorizedcategories'   => array( 'OguruGuru' ),
+	'Uncategorizedimages'       => array( 'OguruGefre' ),
+	'Uncategorizedtemplates'    => array( 'OguruAnkra' ),
+	'Unusedcategories'          => array( 'OtekiGuru' ),
+	'Unusedimages'              => array( 'OtekiGefre' ),
+	'Wantedpages'               => array( 'WinsiPeprewoysi' ),
+	'Wantedcategories'          => array( 'WinsiGuru' ),
+	'Mostlinked'                => array( 'PasatekiPeprewoysi' ),
+	'Mostlinkedcategories'      => array( 'PasatekiGuru' ),
+	'Mostlinkedtemplates'       => array( 'PasatekiAnkra' ),
+	'Mostcategories'            => array( 'PasaGuru' ),
+	'Mostimages'                => array( 'PasaGefre' ),
+	'Mostrevisions'             => array( 'PasaKenki' ),
+	'Fewestrevisions'           => array( 'MenaKenki' ),
+	'Shortpages'                => array( 'SyartuPeprewoysi' ),
+	'Longpages'                 => array( 'LangaPeprewoysi' ),
+	'Newpages'                  => array( 'NyunPeprewoysi' ),
+	'Ancientpages'              => array( 'PasaOwruPeprewoysi' ),
+	'Deadendpages'              => array( 'NoSkakiPeprewoysi' ),
+	'Protectedpages'            => array( 'TapuPeprewoysi' ),
+	'Allpages'                  => array( 'AlaPeprewoysi' ),
+	'Specialpages'              => array( 'SpesyalPeprewoysi' ),
+	'Contributions'             => array( 'Kenki' ),
+	'Emailuser'                 => array( 'EmailMasyin' ),
+	'Movepage'                  => array( 'PapiraDribi' ),
+	'Blockme'                   => array( 'SpikriMi' ),
+	'Categories'                => array( 'Guru' ),
+	'Version'                   => array( 'Si' ),
+	'Allmessages'               => array( 'Boskopu' ),
+	'Log'                       => array( 'Buku' ),
+	'Undelete'                  => array( 'Otrowe' ),
+	'Userrights'                => array( 'Masyinlesi' ),
+	'MIMEsearch'                => array( 'MIMEsuku' ),
+	'Listredirects'             => array( 'Stirpeprewoysirey' ),
+	'Unusedtemplates'           => array( 'OtekiAnkra' ),
+	'Randomredirect'            => array( 'SomaStirpapira' ),
+	'Mypage'                    => array( 'MiPapira' ),
+	'Mytalk'                    => array( 'MiTaki' ),
+	'Mycontributions'           => array( 'MiKenki' ),
+	'Listadmins'                => array( 'Sesopurey' ),
+	'Listbots'                  => array( 'Botrey' ),
+	'Search'                    => array( 'Suku' ),
+	'Withoutinterwiki'          => array( 'NoInterwiki' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Poti strepi ondro den miti:',
@@ -58,8 +152,6 @@ $messages = array(
 'underline-never'   => 'Noiti',
 'underline-default' => 'Di fu a browser',
 
-'skinpreview' => '(Si-na-fesi)',
-
 # Dates
 'sunday'        => 'sonde',
 'monday'        => 'munde',
@@ -153,7 +245,7 @@ $messages = array(
 'mytalk'         => 'Mi kruderi',
 'anontalk'       => 'Taki fu disi IP',
 'navigation'     => 'Fenipresi',
-'and'            => 'nanga',
+'and'            => '&#32;nanga',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -216,8 +308,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Abra {{SITENAME}}',
 'aboutpage'            => 'Project:Abra',
-'bugreports'           => 'Buku fu fowtu',
-'bugreportspage'       => 'Project:Buku fu fowtu',
 'copyright'            => 'Ala san skrifi dyaso de ondro $1.',
 'copyrightpagename'    => '{{SITENAME}} kopi leti',
 'copyrightpage'        => '{{ns:project}}:Kopi leti',
@@ -240,8 +330,6 @@ $messages = array(
 
 'badaccess'        => 'Primisi fowtu',
 'badaccess-group0' => 'Yu no abi primisi fu du a sani san yu wani',
-'badaccess-group1' => 'Soso kebroikiman fu a grupu $1 kan du a sani disi.',
-'badaccess-group2' => 'Soso kebroikiman fu wan fu den grupu $1 kan du a sani disi.',
 'badaccess-groups' => 'Soso kebroikiman fu wan fu den grupu $1 kan du a sani disi.',
 
 'versionrequired'     => 'Versie $1 fu MediaWiki de fanowdu',
@@ -323,9 +411,9 @@ Fu san ede: ''$2''.",
 
 # Login and logout pages
 'logouttitle'               => 'Kenroikiman psa gwe',
-'logouttext'                => '<strong>Yu psa gwe now.</strong><br />
+'logouttext'                => "'''Yu psa gwe now.'''<br />
 Yu kan tan kebroiki {{SITENAME}} sondro nen, noso yu kan psa kon baka leki a srefi noso wan tra kebroikiman.
-Sabi taki a kan gersi leki yu psa kon ete, te leki yu leygi a cache fu yu browser.',
+Sabi taki a kan gersi leki yu psa kon ete, te leki yu leygi a cache fu yu browser.",
 'welcomecreation'           => '== Welkom, $1! ==
 Yu account meki now.
 No fergiti fu kenki den seti fu yu gi {{SITENAME}}.',
@@ -335,8 +423,6 @@ No fergiti fu kenki den seti fu yu gi {{SITENAME}}.',
 'yourpasswordagain'         => 'Psa wortu ete wan leysi:',
 'remembermypassword'        => 'Tan memre mi kebroikiman nen nanga psa wortu.',
 'yourdomainname'            => 'Yu domein:',
-'loginproblem'              => '<b>Wan problema ben de di yu e psa kon.</b><br />
-Pruberi baka!',
 'login'                     => 'Psa kon',
 'nav-login-createaccount'   => 'Psa kon / meki wan account',
 'loginprompt'               => 'Yu musu man kisi cookies fu man psa kon na {{SITENAME}}.',
@@ -403,6 +489,9 @@ Bifo tra e-mail kan seni go na a account, yu musu du san skrifi ini a e-mail fu
 # Password reset dialog
 'resetpass'        => 'Kenki yu waktiwortu',
 'resetpass_header' => 'Kenki yu waktiwortu',
+'oldpassword'      => 'Owru waktiwortu:',
+'newpassword'      => 'Nyun waktiwortu:',
+'retypenew'        => 'Nyun psa wortu ete wan tron:',
 'resetpass_submit' => 'Kenki yu waktiwortu nanga kon',
 
 # Edit page toolbar
@@ -426,8 +515,8 @@ Bifo tra e-mail kan seni go na a account, yu musu du san skrifi ini a e-mail fu
 'hr_tip'          => 'Didon lini (no kebroiki furu)',
 
 # Edit pages
-'summary'                => "In' syatu",
-'subject'                => 'Abra san/ede',
+'summary'                => "In' syatu:",
+'subject'                => 'Abra san/ede:',
 'minoredit'              => 'Disi na wan pikin kenki',
 'watchthis'              => 'Tan luku a papira disi',
 'savearticle'            => 'Kibri a papira disi',
@@ -437,8 +526,8 @@ Bifo tra e-mail kan seni go na a account, yu musu du san skrifi ini a e-mail fu
 'showdiff'               => 'Sori den kenki',
 'anoneditwarning'        => "'''Warskow:''' Yu no psa kon ete. Yu IP o kibri poti ini a kenki historia fu a papira disi.",
 'missingcommenttext'     => 'Presi yu oponaki dyaso-ondro.',
-'summary-preview'        => "Luku In'syatu na fesi",
-'subject-preview'        => 'Ondroinfru/edelen fusi',
+'summary-preview'        => "Luku In'syatu na fesi:",
+'subject-preview'        => 'Ondroinfru/edelen fusi:',
 'blockedtitle'           => 'Masyin ben spikri',
 'blockedtext'            => "<big>'''Pasi tapu gi yu kebroikiman-nen noso IP.'''</big>
 
@@ -463,9 +552,9 @@ Yu IP now na $3 en a tapu pasi ID na #$5. Gi wan, noso ala tu, ini yu brifi te y
 Kebroiki a '''back''' knopo ini yu browser, efu yu no ben wan opo a papira disi.",
 'noarticletext'          => 'A papira disi leigi.
 Yu kan [[Special:Search/{{PAGENAME}}|suku a papira nen disi]] ini tra papira noso <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} kenki a papira disi]</span>.',
-'note'                   => '<strong>Opotaki:</strong>',
-'previewnote'            => '<strong>Disi na soso fu luku na fesi;
-yu kenki no kibri ete!</strong>',
+'note'                   => "'''Opotaki:'''",
+'previewnote'            => "'''Disi na soso fu luku na fesi;
+yu kenki no kibri ete!'''",
 'editing'                => 'E Kenki $1',
 'editingsection'         => 'E kenki $1 (pisi papira)',
 'editingcomment'         => 'Kenki fu $1 (opotaki)',
@@ -474,10 +563,10 @@ yu kenki no kibri ete!</strong>',
 'copyrightwarning'       => "Ala sani di yu e poti na tapu {{SITENAME}} de leki efu den ben gi fri ondro a $2 (luku $1 gi a fin'fini).
 Efu yu no wani dati trawan e kenki noso panya san yu skrifi, no skrifi noti dyaso.<br />
 Yu e pramisi unu dati na yu skrifi disi yusrefi, noso yu teki en puru fu wan fri, opo presi.<br />
-<strong>NO KEBROIKI SANI DI KIBRI BAKA SKRIFIMAN-LETI, SONDRO FU ABI PRIMISI FU DU SO!</strong>",
-'longpagewarning'        => '<strong>WARSKOW: A papira disi de $1 kilobyte bigi;
+'''NO KEBROIKI SANI DI KIBRI BAKA SKRIFIMAN-LETI, SONDRO FU ABI PRIMISI FU DU SO!'''",
+'longpagewarning'        => "'''WARSKOW: A papira disi de $1 kilobyte bigi;
 Son browser abi problema fu kenki papira di bigi moro leki 32 kb.
-Kande yu kan prati a papira disi ini moro pikin pisi.</strong>',
+Kande yu kan prati a papira disi ini moro pikin pisi.'''",
 'templatesused'          => 'Template di ben kebroiki tapu a papira disi:',
 'templatesusedpreview'   => 'Template di ben kebroiki ini a Luku-na-fesi disi:',
 'templatesusedsection'   => 'Ankra teki opo disi seksi:',
@@ -496,7 +585,7 @@ Denki fosi efu na wan bun sani fu meki a papira disi baka. A log buku fu puru so
 'viewpagelogs'        => 'Luku a log buku fu a papira disi',
 'currentrev'          => 'A versi disi',
 'revisionasof'        => 'Versi tapu $1',
-'revision-info'       => 'Versi na $1 fu $2',
+'revision-info'       => 'Versi na $1 fu $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Moro owru versi',
 'nextrevision'        => 'Moro nyun versi→',
 'currentrevisionlink' => 'A versi disi',
@@ -547,6 +636,7 @@ Yu kan [[:\$1|meki a papira disi]].",
 'prevn'                 => '$1 di psa',
 'nextn'                 => '$1 trawan',
 'viewprevnext'          => 'Luku ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:San de',
 'powersearch'           => 'Suku moro dipi',
 
 # Preferences page
@@ -562,6 +652,7 @@ Yu kan [[:\$1|meki a papira disi]].",
 'qbsettings-floatingright' => 'Han na pe',
 'changepassword'           => 'Kenki yu waktiwortu',
 'skin'                     => 'Buba',
+'skin-preview'             => 'Si-na-fesi',
 'math'                     => 'Fomula',
 'dateformat'               => 'Datumopomeki',
 'datedefault'              => 'No wana',
@@ -576,9 +667,6 @@ Yu kan [[:\$1|meki a papira disi]].",
 'prefs-misc'               => 'Diversi',
 'saveprefs'                => 'Oponaki',
 'resetprefs'               => 'Bakadray na owru si',
-'oldpassword'              => 'Owru waktiwortu:',
-'newpassword'              => 'Nyun waktiwortu:',
-'retypenew'                => 'Nyun psa wortu ete wan tron:',
 'textboxsize'              => 'Kenki',
 'rows'                     => 'Rei:',
 'columns'                  => 'Kolum:',
@@ -682,17 +770,17 @@ Papira ini [[Special:Watchlist|yu Tan Luku réy]] '''fatu'''.",
 
 'license-nopreview' => '(No fusi)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Suku na gefre:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Suku na gefre:',
 'imgfile'               => 'gefre',
-'imagelist'             => 'Réy fu file',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Nen',
-'imagelist_user'        => 'Masyin',
-'imagelist_size'        => 'Gran (byte)',
-'imagelist_description' => 'Infrumasi',
-
-# Image description page
+'listfiles'             => 'Réy fu file',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Nen',
+'listfiles_user'        => 'Masyin',
+'listfiles_size'        => 'Gran (byte)',
+'listfiles_description' => 'Infrumasi',
+
+# File description page
 'filehist'                  => 'File historia',
 'filehist-help'             => 'Naki na tapu a dei/ten fu a file fu si fa a ben de na a ten dati.',
 'filehist-deleteall'        => 'trowe ala',
@@ -755,20 +843,8 @@ Papira ini [[Special:Watchlist|yu Tan Luku réy]] '''fatu'''.",
 'randomredirect-nopages' => 'Da ben no stirpeprewoysi ini disi nenpreki.',
 
 # Statistics
-'statistics'    => 'Den statistiek',
-'sitestats'     => '{{SITENAME}}-Infrumasi',
-'userstats'     => 'Masyininfrumasi',
-'sitestatstext' => "Ini a databesi {{PLURAL:$1|ben wan papira|ben '''$1''' peprewoysi}}, nanga takipeprewoysi, {{SITENAME}}-peprewoysi, den stub dy si syartu ben, stirpeprewoysi, boskopu nanga trawan peprewoysi dy hosa no infrumasi abi.
-Da {{PLURAL:$2|ben hosa wan peprewoysi|ben hosa '''$2''' peprewoysi}} nanga tru infrumasi.
-
-Da {{PLURAL:$8|ben '''wan''' gefre|ben '''$8''' gefre}} uploti.
-
-Da {{PLURAL:$3|ben '''wan''' papira|ben '''$3''' peprewoysi}} libi si nanga {{PLURAL:$4|wan kenki|'''$4''' kenki}} e meki sins {{SITENAME}} ben e skopu.
-Taki gi wan midi fu '''$5''' kenki ies papira nanga '''$6''' sko peprewoysi ies kenki.
-
-A gran fu a [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] ben '''$7'''.",
-'userstatstext' => "Da {{PLURAL:$1|ben '''wan''' register masyin|ben '''$1''' register masyin}}, pefu da
-'''$2''' (efu '''$4%''') $5-lesi {{PLURAL:$2|abi|abi}}.",
+'statistics'              => 'Den statistiek',
+'statistics-header-users' => 'Masyininfrumasi',
 
 'disambiguations' => 'Seni doro papira',
 
@@ -834,7 +910,6 @@ A gran fu a [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] ben '''$7
 'speciallogtitlelabel' => 'Papira nen:',
 'log'                  => 'Log buku',
 'all-logs-page'        => 'Ala log buku',
-'log-search-submit'    => 'Go',
 'log-title-wildcard'   => 'Peprewoysi suku dy nanga disi nen bigin',
 
 # Special:AllPages
@@ -853,6 +928,9 @@ A gran fu a [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] ben '''$7
 # Special:Categories
 'categories' => 'Den grupu',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Trowe kenki fu masyin',
+
 # Special:ListUsers
 'listusersfrom'      => 'Masyin libi si fu:',
 'listusers-submit'   => 'Libi si',
@@ -871,50 +949,52 @@ A gran fu a [http://www.mediawiki.org/wiki/Manual:Job_queue job queue] ben '''$7
 'emailsend'       => 'Stir',
 
 # Watchlist
-'watchlist'            => 'Mi Tan Luku réy',
-'mywatchlist'          => 'Mi Tan luku réy',
-'watchlistfor'         => "(fu '''$1''')",
-'addedwatch'           => 'Presi a yu sirey',
-'addedwatchtext'       => "A papira \"[[:\$1]]\" ben presi a yu [[Special:Watchlist|sirey]]. Folo kenki fu disi papira nanga a taki sey opo [[Special:Watchlist|yu sirey]] nanga sey '''deku''' ini a [[Special:RecentChanges|rey fu bakseywan kenki]].
+'watchlist'         => 'Mi Tan Luku réy',
+'mywatchlist'       => 'Mi Tan luku réy',
+'watchlistfor'      => "(fu '''$1''')",
+'addedwatch'        => 'Presi a yu sirey',
+'addedwatchtext'    => "A papira \"[[:\$1]]\" ben presi a yu [[Special:Watchlist|sirey]]. Folo kenki fu disi papira nanga a taki sey opo [[Special:Watchlist|yu sirey]] nanga sey '''deku''' ini a [[Special:RecentChanges|rey fu bakseywan kenki]].
 
 Iksi yu wan papira no langar wana si, go na a papira nanga du opo \"No si\" ini a menu.",
-'removedwatch'         => 'Trowe fu yu sirey',
-'removedwatchtext'     => 'A papira "[[:$1]]" ben trowe fu yu sirey.',
-'watch'                => 'Tan luku',
-'watchthispage'        => 'Tan luku a papira disi',
-'unwatch'              => 'No tan luku',
-'watchlist-details'    => '{{PLURAL:$1|Wan papira|$1 papira}} de ini yu Tan Luku réy, sondro fu teri den kruderi papira.',
-'wlshowlast'           => 'Sori laste $1 yuru, $2 dey ($3)',
-'watchlist-hide-bots'  => 'Kibri kenki fu den bot',
-'watchlist-hide-own'   => 'Kibri mi kenki',
-'watchlist-hide-minor' => 'Kibri pikin kenki',
+'removedwatch'      => 'Trowe fu yu sirey',
+'removedwatchtext'  => 'A papira "[[:$1]]" ben trowe fu yu sirey.',
+'watch'             => 'Tan luku',
+'watchthispage'     => 'Tan luku a papira disi',
+'unwatch'           => 'No tan luku',
+'watchlist-details' => '{{PLURAL:$1|Wan papira|$1 papira}} de ini yu Tan Luku réy, sondro fu teri den kruderi papira.',
+'wlshowlast'        => 'Sori laste $1 yuru, $2 dey ($3)',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'A wiki e poti a papira disi ini yu Tan Luku...',
 'unwatching' => 'A wiki e puru a papira disi fu yu Tan Luku...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Disi papira trowe',
-'historywarning'              => 'Warskow: a papira di yu wani puru abi wan historia:',
-'confirmdeletetext'           => 'Yu wanaefru ben trowen wan papira, nanga si stori. Gi klari a dyaso-ondro ini a box taki disi we fuli yu miki ben, taki yu den folo luku nanga taki a trowe gu ben nanga a [[{{MediaWiki:Policy-url}}|polisi]].',
-'actioncomplete'              => 'Aksi e du',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ben e trowe. Si a $2 fu wan sibuku fu bakaseywan trowe.',
-'deletedarticle'              => 'puru "[[$1]]"',
-'dellogpage'                  => 'Log buku fu puru',
-'deletecomment'               => 'Yesikrari fu trowe:',
-'deleteotherreason'           => 'Trawan/okwan yesikrari:',
-'deletereasonotherlist'       => 'Trawan yesikrari',
-'rollbacklink'                => 'drai baka',
+# Delete
+'deletepage'            => 'Disi papira trowe',
+'historywarning'        => 'Warskow: a papira di yu wani puru abi wan historia:',
+'confirmdeletetext'     => 'Yu wanaefru ben trowen wan papira, nanga si stori. Gi klari a dyaso-ondro ini a box taki disi we fuli yu miki ben, taki yu den folo luku nanga taki a trowe gu ben nanga a [[{{MediaWiki:Policy-url}}|polisi]].',
+'actioncomplete'        => 'Aksi e du',
+'deletedtext'           => '"<nowiki>$1</nowiki>" ben e trowe. Si a $2 fu wan sibuku fu bakaseywan trowe.',
+'deletedarticle'        => 'puru "[[$1]]"',
+'dellogpage'            => 'Log buku fu puru',
+'deletecomment'         => 'Yesikrari fu trowe:',
+'deleteotherreason'     => 'Trawan/okwan yesikrari:',
+'deletereasonotherlist' => 'Trawan yesikrari',
+
+# Rollback
+'rollbacklink' => 'drai baka',
+
+# Protect
 'protectlogpage'              => 'Log buku fu den sroto',
+'prot_1movedto2'              => '[[$1]] froisi go na [[$2]]',
 'protect-legend'              => 'Gi tapu klari',
 'protectcomment'              => 'Opotaki:',
 'protectexpiry'               => 'Lasi:',
 'protect_expiry_invalid'      => 'A lasi ben fowtu.',
 'protect_expiry_old'          => 'A lasi ben ini iksini.',
 'protect-unchain'             => 'Gi dribi u',
-'protect-text'                => 'Dyaso ben yu kan tu kenki nanga aluku a tapunivo fu a papira <strong><nowiki>$1</nowiki></strong>.',
+'protect-text'                => "Dyaso ben yu kan tu kenki nanga aluku a tapunivo fu a papira '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "'''Yu masyin abi no lesi tu kenki a tapunivo.'''
-Disi ben a tapunivo fu a papira <strong>[[$1]]</strong> now:",
+Disi ben a tapunivo fu a papira '''[[$1]]''' now:",
 'protect-cascadeon'           => 'Disi papira ben tapu sins a ini den folo {{PLURAL:$1|papira|peprewoysi}} ben e presi, dy tapu ben nanga a kaskade-opsi. A tapunivo kenki abi no efekti.',
 'protect-default'             => '(soma saki)',
 'protect-fallback'            => 'Dyaso ben a lesi "$1" fanowdu',
@@ -924,6 +1004,7 @@ Disi ben a tapunivo fu a papira <strong>[[$1]]</strong> now:",
 'protect-expiring'            => 'lasi opo $1',
 'protect-cascade'             => 'Kaskadetapu - tapu ala peprewoysi nanga ankra dy ini disi papira teki ben (atessi; disi kan gran folo abi).',
 'protect-cantedit'            => 'Yu kan a tapunivo fu disi papira no kenki, sins yu no lesi abi tu kenki a.',
+'protect-expiry-options'      => '15 min:15 min,1 yuru:1 hour,2 yuru:2 hours,6 yuru:6 hours,12 yuru:12 hours,1 dey:1 day,3 dey:3 days,1 wiki:1 week,2 wiki:2 weeks,1 mun:1 month,3 mun:3 months,6 mun:6 months,1 yari:1 year,fu têgo:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Den leti:',
 'restriction-level'           => 'Pelkinivo:',
 
@@ -951,7 +1032,6 @@ Disi ben a tapunivo fu a papira <strong>[[$1]]</strong> now:",
 # What links here
 'whatlinkshere'       => 'San e miti kon dyaso',
 'whatlinkshere-title' => 'Papira di e sori go na $1',
-'linklistsub'         => '(Réy fu miti)',
 'linkshere'           => "Den papira disi e miti go na '''[[:$1]]''':",
 'nolinkshere'         => "No wan papira e miti kon na '''[[:$1]]'''.",
 'isredirect'          => 'papira fu drai go',
@@ -991,6 +1071,7 @@ Ben suri taki den folo abrasi ben pre yu disi aksi du.",
 * A takipapira ondro a nyun nen da ala ben;
 * Yu a ondroben box odu.",
 'movearticle'      => 'Dribi papira:',
+'movenologin'      => 'No kon',
 'newtitle'         => 'Na nyun papiranen:',
 'move-watch'       => 'Disi papira si',
 'movepagebtn'      => 'Dribi papira',
@@ -1016,6 +1097,9 @@ Gi wan trawan papiranen.',
 'thumbnail-more'  => 'Moro bigi',
 'thumbnail_error' => 'Fowtu na a meki fu a thumbnail: $1',
 
+# Special:Import
+'import-comment' => 'Opotaki:',
+
 # Import log
 'importlogpage' => "Log buku fu den sen'teki",
 
@@ -1082,7 +1166,7 @@ Yu ka luku a source.',
 'show-big-image'       => 'Moro srapu',
 'show-big-image-thumb' => '<small>Bigi fu a luku-na-fesi disi: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'    => 'Nyun file',
 'showhidebots' => '(Bot $1)',
 'noimages'     => 'Noti a si.',
diff --git a/languages/messages/MessagesSs.php b/languages/messages/MessagesSs.php
index 1c77896a..bb3304d5 100644
--- a/languages/messages/MessagesSs.php
+++ b/languages/messages/MessagesSs.php
@@ -85,12 +85,12 @@ $messages = array(
 # Preferences page
 'searchresultshead' => 'Kucálata',
 
-# Special:ImageList
-'imagelist_date' => 'Lusuku',
-'imagelist_name' => 'Ligama',
-'imagelist_user' => 'Umuntfu',
+# Special:ListFiles
+'listfiles_date' => 'Lusuku',
+'listfiles_name' => 'Ligama',
+'listfiles_user' => 'Umuntfu',
 
-# Image description page
+# File description page
 'filehist-datetime' => 'Lusuku/Síkhatsí',
 'filehist-user'     => 'Umuntfu',
 
@@ -106,11 +106,13 @@ $messages = array(
 
 # Special:Log
 'specialloguserlabel' => 'Umuntfu:',
-'log-search-submit'   => 'Kúhámba',
 
 # Special:AllPages
 'allpagessubmit' => 'Kúhámba',
 
+# Special:LinkSearch
+'linksearch-ok' => 'Kucálata',
+
 # Special:ListUsers
 'listusers-submit' => 'Kúfúna',
 
@@ -142,7 +144,7 @@ $messages = array(
 'tooltip-search' => 'Kucálata {{SITENAME}}',
 'tooltip-p-logo' => 'Likhasi Lelikhulu',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Kucálata',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesSt.php b/languages/messages/MessagesSt.php
index 350860a2..d251710b 100644
--- a/languages/messages/MessagesSt.php
+++ b/languages/messages/MessagesSt.php
@@ -88,22 +88,24 @@ $messages = array(
 'badretype'          => 'Mapetjo a mabedi o a ngotseng ha a tshwane.',
 'mailmypassword'     => 'Nthomele password ya ka ka email',
 
+# Password reset dialog
+'oldpassword' => 'Lepetjo la kgale:',
+'newpassword' => 'Lepetjo le letjha:',
+'retypenew'   => 'Ngola lepetjo le letjha hape:',
+
 # Edit pages
 'savearticle'  => 'Le boloke',
 'showpreview'  => 'Mpontshe hore le tlo ba jwang',
 'showdiff'     => 'Mpontshe hore ho tlo fetoha eng',
 'accmailtitle' => 'Lepetjo le rometswe.',
 'accmailtext'  => 'Lepetjo la "$1" le se le rometswe ho $2.',
-'note'         => '<strong>Ela hloko:</strong>',
+'note'         => "'''Ela hloko:'''",
 
 # Search results
 'powersearch' => 'Fuputsa',
 
 # Preferences page
 'changepassword'    => 'Fetola lepetjo',
-'oldpassword'       => 'Lepetjo la kgale:',
-'newpassword'       => 'Lepetjo le letjha:',
-'retypenew'         => 'Ngola lepetjo le letjha hape:',
 'searchresultshead' => 'Phuputso',
 'allowemail'        => 'Dumella batho ba bang hore ba nthomelle di-email',
 
diff --git a/languages/messages/MessagesStq.php b/languages/messages/MessagesStq.php
index 0b1e7974..55706cb9 100644
--- a/languages/messages/MessagesStq.php
+++ b/languages/messages/MessagesStq.php
@@ -14,14 +14,12 @@ $fallback = 'de';
 $namespaceNames = array(
 	NS_MEDIA          => 'Media',
 	NS_SPECIAL        => 'Spezial',
-	NS_MAIN           => '',
 	NS_TALK           => 'Diskussion',
 	NS_USER           => 'Benutser',
 	NS_USER_TALK      => 'Benutser_Diskussion',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_Diskussion',
-	NS_IMAGE          => 'Bielde',
-	NS_IMAGE_TALK     => 'Bielde_Diskussion',
+	NS_FILE           => 'Bielde',
+	NS_FILE_TALK      => 'Bielde_Diskussion',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Diskussion',
 	NS_TEMPLATE       => 'Foarloage',
@@ -70,17 +68,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Oaine Biedraage in ju Beooboachtengslieste ferbierge',
 'tog-watchlisthidebots'       => 'Bot-Biedraage in ju Beooboachtengslieste ferbierge',
 'tog-watchlisthideminor'      => 'Litje Biedraage in ju Beooboachtengslieste ferbierge',
+'tog-watchlisthideliu'        => 'Beoarbaidengen truch ounmäldede Benutsere in ju Beoboachtengslieste uutbländje',
+'tog-watchlisthideanons'      => 'Beoarbaidengen truch anonyme Benutsere (IP) in ju Beoboachtengslieste uutbländje',
 'tog-nolangconversion'        => 'Konvertierenge fon Sproakvarianten deaktivierje',
 'tog-ccmeonemails'            => 'Seend mie Kopien fon do E-Maile, do iek uur Benutsere seende.',
 'tog-diffonly'                => 'Wies bie dän Versionsfergliek bloot do Unnerscheede, nit ju fulboodige Siede',
 'tog-showhiddencats'          => 'Wies ferstatte Kategorien',
+'tog-norollbackdiff'          => 'Unnerscheed ätter dät Touräächsätten unnerdrukke',
 
 'underline-always'  => 'Altied',
 'underline-never'   => 'sieläärge nit',
 'underline-default' => 'honget ou fon Browser-Ienstaalenge',
 
-'skinpreview' => '(Foarschau)',
-
 # Dates
 'sunday'        => 'Sundai',
 'monday'        => 'Moundai',
@@ -168,7 +167,7 @@ $messages = array(
 'mytalk'         => 'Oaine Diskussion',
 'anontalk'       => 'Diskussionssiede foar dissen IP',
 'navigation'     => 'Navigation',
-'and'            => 'un',
+'and'            => '&#32;un',
 
 # Metadata in edit box
 'metadata_help' => 'Metadoatäie:',
@@ -177,8 +176,8 @@ $messages = array(
 'returnto'          => 'Tourääch tou Siede $1.',
 'tagline'           => 'Uut {{SITENAME}}',
 'help'              => 'Hälpe',
-'search'            => 'Säike',
-'searchbutton'      => 'Säike',
+'search'            => 'Säike (0)',
+'searchbutton'      => 'Säike (07)',
 'go'                => 'Uutfiere',
 'searcharticle'     => 'Siede',
 'history'           => 'Versione',
@@ -205,14 +204,14 @@ $messages = array(
 'talkpagelinktext'  => 'Diskussion',
 'specialpage'       => 'Spezioalsiede',
 'personaltools'     => 'Persöönelke Reewen',
-'postcomment'       => 'Kommentoar touföigje',
+'postcomment'       => 'Näi Stuk',
 'articlepage'       => 'Siede',
 'talk'              => 'Diskussion',
 'views'             => 'Anwiesengen',
 'toolbox'           => 'Reewen',
 'userpage'          => 'Benutsersiede',
 'projectpage'       => 'Meta-Text',
-'imagepage'         => 'Bekiekje Bieldesiede',
+'imagepage'         => 'Doatäisiede',
 'mediawikipage'     => 'Inhooldssiede anwiese',
 'templatepage'      => 'Foarloagensiede anwiese',
 'viewhelppage'      => 'Hälpesiede anwiese',
@@ -226,13 +225,11 @@ $messages = array(
 'protectedpage'     => 'Schutsede Siede',
 'jumpto'            => 'Wikselje tou:',
 'jumptonavigation'  => 'Navigation',
-'jumptosearch'      => 'Säike',
+'jumptosearch'      => 'Säike (08)',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Uur {{SITENAME}}',
 'aboutpage'            => 'Project:Uur_{{SITENAME}}',
-'bugreports'           => 'Kontakt',
-'bugreportspage'       => 'Project:Kontakt',
 'copyright'            => 'Inhoold is ferföichboar unner de $1.',
 'copyrightpagename'    => '{{SITENAME}} Uurheebergjuchte',
 'copyrightpage'        => '{{ns:project}}:Uurheebergjuchte',
@@ -255,14 +252,12 @@ $messages = array(
 
 'badaccess'        => 'Neen uträkkende Gjuchte',
 'badaccess-group0' => 'Du hääst nit ju ärfoarderelke Begjuchtigenge foar disse Aktion.',
-'badaccess-group1' => 'Disse Aktion ist bloot muugelk foar Benutsere, do der ju Gruppe „$1“ anheere.',
-'badaccess-group2' => 'Disse Aktion is bloot muugelk foar Benutsere, do der een fon do Gruppen „$1“ anheere.',
-'badaccess-groups' => 'Disse Aktion is bloot muugelk foar Benutsere, do der een fon do Gruppen „$1“ anheere.',
+'badaccess-groups' => 'Disse Aktion is bloot muugelk foar Benutsere, do der {{PLURAL:$2|ju Gruppe|een fon do Gruppen}} „$1“ anheere.',
 
 'versionrequired'     => 'Version $1 fon MediaWiki is nöödich',
 'versionrequiredtext' => 'Version $1 fon MediaWiki is nöödich uum disse Siede tou nutsjen. Sjuch ju [[Special:Version|Versionssiede]]',
 
-'ok'                      => 'Säike',
+'ok'                      => 'Säike (09)',
 'retrievedfrom'           => 'Fon "$1"',
 'youhavenewmessages'      => 'Du hääst $1 ($2).',
 'newmessageslink'         => 'näie Ättergjuchte',
@@ -271,6 +266,8 @@ $messages = array(
 'editsection'             => 'Beoarbaidje',
 'editold'                 => 'Beoarbaidje',
 'viewsourceold'           => 'Wältext wiese',
+'editlink'                => 'beoarbaidje',
+'viewsourcelink'          => 'Wältext bekiekje',
 'editsectionhint'         => 'Apsats beoarbaidje: $1',
 'toc'                     => 'Inhooldsferteeknis',
 'showtoc'                 => 'Anwiese',
@@ -291,7 +288,7 @@ $messages = array(
 'nstab-main'      => 'Artikkel',
 'nstab-user'      => 'Benutsersiede',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Spezial',
+'nstab-special'   => 'Spezioalsiede',
 'nstab-project'   => 'Projektsiede',
 'nstab-image'     => 'Bielde',
 'nstab-mediawiki' => 'Ättergjucht',
@@ -301,7 +298,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Disse Aktion rakt et nit',
-'nosuchactiontext'  => 'Disse Aktion wäd fon dän MediaWiki-Software nit unnerstöänd.',
+'nosuchactiontext'  => 'Ju in de URL anroate Aktion wäd fon MediaWiki nit unnerstöänd.
+Der kon n Schrieuwfailer in de URL foarlääse of der wuud n wrakken Link anklikt.
+Dät kon sik uk uum n Bug ap ((SITENAME}} honnelje.',
 'nosuchspecialpage' => 'Disse Spezialsiede rakt et nit',
 'nospecialpagetext' => 'Disse Spezialsiede wäd fon dän MediaWiki-Software nit unnerstöänd.',
 
@@ -346,7 +345,6 @@ Mäld dit n [[Special:ListUsers/sysop|Administrator]] unner Naamenge fon ju URL.
 'cannotdelete'         => 'Kon spezifizierde Siede of Artikkel nit läskje. Fielicht is ju al läsked wuuden.',
 'badtitle'             => 'Uungultige Tittel.',
 'badtitletext'         => 'Die anfräigede Tittel waas uungultich, loos, of n uungultigen Sproaklink fon n uur Wiki.',
-'perfdisabled'         => 'Disse Funtion wuude weegen Uurbeläästenge fon dän Server foaruurgungend deaktivierd.',
 'perfcached'           => 'Do foulgjende Doaten stamme uut dän Cache un sunt muugelkerwiese nit aktuäl:',
 'perfcachedts'         => 'Disse Doaten stamme uut dän Cache, lääste Update: $1',
 'querypage-no-updates' => "'''Ju Aktualisierengsfunktion foar disse Siede is apstuuns deaktivierd. Do Doaten wäide toueerst nit fernäierd.'''",
@@ -362,7 +360,7 @@ Oufroage: $2',
 'protectedinterface'   => 'Disse Siede änthaalt Text foar dät Sproak-Interface fon ju Software un is speerd, uum Misbruuk tou ferhinnerjen.',
 'editinginterface'     => "'''Woarschauenge:''' Du beoarbaidest ne Siede ju der bruukt wäd, Interface-Text foar ju Software tou lääwerjen.
 Annerengen ap disse Siede wirkje sik uut ap ju Benutseruurfläche foar uur Bruukere.
-Foar Uursättengen koast du fielicht beeter [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki] bruuke, dät is dät MediaWiki Lokalisierengsprojekt.",
+Foar Uursättengen koast du fielicht beeter [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net] bruuke, dät is dät MediaWiki Lokalisierengsprojekt.",
 'sqlhidden'            => '(SQL-Oufroage ferbierged)',
 'cascadeprotected'     => 'Disse Siede is tou Beoarbaidenge speerd. Ju is in do {{PLURAL:$1|foulgjende Siede|foulgjende Sieden}} ienbuunen, do der middels ju Kaskadenspeeroption schutsed {{PLURAL:$1|is|sunt}}:
 $2',
@@ -373,14 +371,14 @@ $2',
 Ju Speere wuude truch [[User:$1|$1]] mäd ju Begruundenge ''$2'' ienroat.",
 
 # Virus scanner
-'virus-badscanner'     => 'Failerhafte Konfiguration: uunbekoanden Virenscanner: <i>$1</i>',
+'virus-badscanner'     => "Failerhafte Konfiguration: uunbekoanden Virenscanner: ''$1''",
 'virus-scanfailed'     => 'Scan failsloain (code $1)',
 'virus-unknownscanner' => 'Uunbekoanden Virenscanner:',
 
 # Login and logout pages
 'logouttitle'                => 'Benutser-Oumäldenge',
-'logouttext'                 => '<strong>Du bäst nu oumälded.</strong>
-Du koast {{SITENAME}} nu anonym fääre benutsje, of die fonnäien unner dän sälwe of n uur Benutsernoome wier [[Special:UserLogin|anmäldje]].',
+'logouttext'                 => "'''Du bäst nu oumälded.'''
+Du koast {{SITENAME}} nu anonym fääre benutsje, of die fonnäien unner dän sälwe of n uur Benutsernoome wier [[Special:UserLogin|anmäldje]].",
 'welcomecreation'            => '== Wäilkuumen, $1 ==
 
 Dien Benutserkonto wuude iengjucht. Ferjeet nit, dien Ienstaalengen antoupaasjen.',
@@ -391,7 +389,6 @@ Dien Benutserkonto wuude iengjucht. Ferjeet nit, dien Ienstaalengen antoupaasjen
 'remembermypassword'         => 'duurhaft anmäldje',
 'yourdomainname'             => 'Dien Domain:',
 'externaldberror'            => 'Äntweeder deer lait n Failer bie ju externe Authentifizierenge foar, of du duurst din extern Benutzerkonto nit aktualisierje.',
-'loginproblem'               => "'''Dät roate n Problem mäd ju Anmäldenge.'''<br /> Fersäik dät jädden nochmoal!",
 'login'                      => 'Anmäldje',
 'nav-login-createaccount'    => 'Anmäldje',
 'loginprompt'                => 'Uum sik bie {{SITENAME}} anmäldje tou konnen, mouten Cookies aktivierd weese.',
@@ -429,7 +426,8 @@ Mäd uur Benutsere koast du uk uur do Benutserdiskussionssieden Kontakt apnieme,
 'noname'                     => 'Du moast n Benutsernoome anreeke.',
 'loginsuccesstitle'          => 'Anmäldenge mäd Ärfoulch',
 'loginsuccess'               => "'''Du bäst nu as \"\$1\" bie {{SITENAME}} anmälded.'''",
-'nosuchuser'                 => 'Die Benutsernoome "$1" bestoant nit. Uurpröif ju Schrieuwwiese, of [[Special:UserLogin/signup|mäld die as näien Benutser an]].',
+'nosuchuser'                 => 'Die Benutsernoome "$1" bestoant nit. 
+Uurpröif ju Schrieuwwiese (Groot-/Littekschrieuwenge beoachtje) of [[Special:UserLogin/signup|mäld die as näien Benutser an]].',
 'nosuchusershort'            => 'Die Benutsernooome "<nowiki>$1</nowiki>" bestoant nit. Jädden uurpröiwe ju Schrieuwwiese.',
 'nouserspecified'            => 'Reek jädden n Benutsernoome an.',
 'wrongpassword'              => 'Dät Paaswoud is falsk. Fersäik dät jädden fonnäien.',
@@ -437,11 +435,7 @@ Mäd uur Benutsere koast du uk uur do Benutserdiskussionssieden Kontakt apnieme,
 'passwordtooshort'           => 'Failer bie ju Woal fon dät Paaswoud. Dät mout mindestens {{PLURAL:$1|1 Teeken|$1 Teekene}} loang weese.',
 'mailmypassword'             => 'Näi Paaswoud touseende',
 'passwordremindertitle'      => 'Näi Paaswoud foar n {{SITENAME}}-Benutserkonto',
-'passwordremindertext'       => 'Wäl mäd ju IP-Adresse $1, woarschienelk du sälwen, häd n näi Paaswoud foar ju Anmäldenge bie {{SITENAME}} ($4) anfoarderd.
-
-Dät automatisk generierde Paaswoud foar Benutser $2 lut nu: $3
-
-Du schääst die nu anmäldje un dät Paaswoud annerje: {{fullurl:{{ns:special}}}}:Userlogin
+'passwordremindertext'       => 'Wäl (woarschienelk du sälwen, fon ju IP-Adresse $1) häd n näi Paaswoud foar ju Anmäldenge bie {{SITENAME}} ($4) anfoarderd. Dät automatisk generierde tiedwiese Paaswoud foar Benutser "$2" lut nu: "$3". Is dät wät du foarhiest, dan schääst du die nu anmäldje un dät Paaswoud annerje.
 
 Ignorier disse E-Mail, in dän Fal du ju nit sälwen anfoarderd hääst of wan du dien oold Paaswoud wier betoanke kuust. Dät oolde Paaswoud blift dan wieders gultich.',
 'noemail'                    => 'Benutser "$1" häd neen Email-Adrässe anroat of häd ju E-Mail-Funktion deaktivierd.',
@@ -453,11 +447,13 @@ wuddelke Touheeregaid tou dit Benutserkonto eerste bestäätiged wäide. Befoulg
 Waiwiese in ju Bestätigengs-E-Mail.',
 'throttled-mailpassword'     => 'Der wuude binne do lääste {{PLURAL:$1|Uure|$1 Uuren}} al n näi Paaswoud anfoarderd. Uum n Misbruuk fon ju Funktion tou ferhinnerjen, kon bloot {{PLURAL:$1|insen in e Uure|alle $1 Uuren}} n näi Paaswoud anfoarderd wäide.',
 'mailerror'                  => 'Failer bie dät Seenden fon dän Email: $1',
-'acct_creation_throttle_hit' => 'Du hääst al $1 Benutserkonten anlaid. Du koast fääre neen moor anlääse.',
-'emailauthenticated'         => 'Jou Email-Adrässe wuude bestäätiged: $1.',
+'acct_creation_throttle_hit' => 'Besäikere fon dissen Wiki, do dien IP-Adresse ferweende, hääbe dän lääste Dai {{PLURAL:$1|1 Benutserkonto|$1 Benutserkonten}} anlaid, wät ju maximoal ferlööwede Antaal in disse Tiedperiode is.
+
+Besäikere, do disse IP-Adresse ferweende, konnen apstuuns neen Benutserkonten moor moakje.',
+'emailauthenticated'         => 'Jou Email-Adrässe wuude ap n $2 uum $3 Uure bestäätiged.',
 'emailnotauthenticated'      => 'Jou Email-Adrässe wuude <strong>noch nit bestäätiged</strong>. Deeruum is bit nu neen E-
 Mail-Fersoand un Ämpfang foar do foulgjende Funktionen muugelk.',
-'noemailprefs'               => '<strong>Du hääst neen Email-Adrässe anroat</strong>, do foulgjende Funktione sunt deeruum apstuuns nit muugelk.',
+'noemailprefs'               => 'Du hääst neen Email-Adrässe anroat, do foulgjende Funktione sunt deeruum apstuuns nit muugelk.',
 'emailconfirmlink'           => 'Bestäätigje Jou Email-Adrässe',
 'invalidemailaddress'        => 'Ju Email-Adresse wuude nit akzeptierd deeruum dät ju n ungultich Formoat tou hääben schient. Reek jädden ne Adrässe in n gultich Formoat ien of moakje dät Fäild loos.',
 'accountcreated'             => 'Benutserkonto näi anlaid',
@@ -466,17 +462,25 @@ Mail-Fersoand un Ämpfang foar do foulgjende Funktionen muugelk.',
 'createaccount-text'         => 'Wäl häd foar die n Benutserkonto "$2" ap {{SITENAME}} ($4) moaked. Dät Paaswoud foar "$2" is "$3". Du schuust die nu anmäldje un dien Paaswoud annerje.
 
 In dän Fal dät Benutserkonto uut Fersjoon anlaid wuude, koast du disse Ättergjucht ignorierje.',
+'login-throttled'            => 'Du hääst tou oafte n falsk Paaswoud ienroat. Täif, eer du fon näien fersäkst.',
 'loginlanguagelabel'         => 'Sproake: $1',
 
 # Password reset dialog
-'resetpass'               => 'Paaswoud foar Benutserkonto touräächsätte',
-'resetpass_announce'      => 'Anmäldenge mäd dän uur E-Mail tousoande Code. Uum ju Anmäldenge outousluuten, moast du nu n näi Paaswoud wääle.',
-'resetpass_header'        => 'Paaswoud touräächsätte',
-'resetpass_submit'        => 'Paaswoud ienbrange un anmäldje',
-'resetpass_success'       => 'Dien Paaswoud wuude mäd Ärfoulch annerd. Nu foulget ju Anmäldenge...',
-'resetpass_bad_temporary' => 'Ungultich foarlööpich Paaswoud. Du hääst dien Paaswoud al mäd Ärfoulch annerd of n näi, foarlööpich Paaswoud anfoarderd.',
-'resetpass_forbidden'     => 'Dät Paaswoud kon nit annerd wäide.',
-'resetpass_missing'       => 'Loos Formular.',
+'resetpass'                 => 'Paaswoud annerje',
+'resetpass_announce'        => 'Anmäldenge mäd dän uur E-Mail tousoande Code. Uum ju Anmäldenge outousluuten, moast du nu n näi Paaswoud wääle.',
+'resetpass_header'          => 'Paaswoud annerje',
+'oldpassword'               => 'Oold Paaswoud:',
+'newpassword'               => 'Näi Paaswoud:',
+'retypenew'                 => 'Näi Paaswoud (nochmoal):',
+'resetpass_submit'          => 'Paaswoud ienbrange un anmäldje',
+'resetpass_success'         => 'Dien Paaswoud wuude mäd Ärfoulch annerd. Nu foulget ju Anmäldenge...',
+'resetpass_bad_temporary'   => 'Ungultich foarlööpich Paaswoud. Du hääst dien Paaswoud al mäd Ärfoulch annerd of n näi, foarlööpich Paaswoud anfoarderd.',
+'resetpass_forbidden'       => 'Dät Paaswoud kon nit annerd wäide.',
+'resetpass-no-info'         => 'Du moast die anmäldje, uum ap disse Siede direkt toutougriepen.',
+'resetpass-submit-loggedin' => 'Paaswoud annerje',
+'resetpass-wrong-oldpass'   => 'Uungultich tiedelk of aktuell Paaswoud.
+Muugelkerwiese hääst du dien Paaswoud al mäd Ärfoulch annerd of n näi tiedelk Paaswoud fräiged.',
+'resetpass-temp-password'   => 'Tiedelk Paaswoud:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fatten Text',
@@ -501,8 +505,8 @@ In dän Fal dät Benutserkonto uut Fersjoon anlaid wuude, koast du disse Ätterg
 'hr_tip'          => 'Horizontoale Lienje (spoarsoam ferweende)',
 
 # Edit pages
-'summary'                          => 'Touhoopefoatenge',
-'subject'                          => 'Themoa',
+'summary'                          => 'Touhoopefoatenge:',
+'subject'                          => 'Themoa:',
 'minoredit'                        => 'Bloot litje Seeken wuuden ferannerd',
 'watchthis'                        => 'Disse Siede beooboachtje',
 'savearticle'                      => 'Siede spiekerje',
@@ -514,8 +518,8 @@ In dän Fal dät Benutserkonto uut Fersjoon anlaid wuude, koast du disse Ätterg
 'missingsummary'                   => "'''Waiwiesenge:''' Du hääst neen Touhoopefoatenge anroat. Wan du fonnäien ap „Siede spiekerje“ klikst, wäd dien Annerenge sunner Touhoopefoatenge uurnuumen.",
 'missingcommenttext'               => 'Reek jädden ne Touhoopefoatenge ien.',
 'missingcommentheader'             => "'''OACHTENGE:''' Du hääst neen Uurschrift in dät Fäild „Beträft:“ ienroat. Wan du fonnäien ap „Siede spiekerje“ klikst, wäd dien Beoarbaidenge sunner Uurschrift spiekerd.",
-'summary-preview'                  => 'Foarschau fon ju Touhoopefoatengsriege',
-'subject-preview'                  => 'Themoa bekiekje',
+'summary-preview'                  => 'Foarschau fon ju Touhoopefoatengsriege:',
+'subject-preview'                  => 'Themoa bekiekje:',
 'blockedtitle'                     => 'Benutser is blokkierd',
 'blockedtext'                      => '<big>\'\'\'Din Benutsernoome of dien IP-Adrässe wuud fon $1 speerd.\'\'\'</big> 
 
@@ -579,33 +583,35 @@ Du koast $1 of aan fon do uur [[{{MediaWiki:Grouppage-sysop}}|Administratore]] k
 Wail naan Noome deer is, wäd ju nuumeriske IP-Adrässe tou Identifizierenge ferwoand.
 Man oafte wäd sunne Adrässe fon moorere Benutsere ferwoand.
 Wan du n uunbekoanden Benutser bääst un du toankst dät du Kommentare krichst do nit foar die meend sunt, dan koast du ap bääste n [[Special:UserLogin/signup|Benutserkonto iengjuchte]] of die [[Special:UserLogin|anmäldje]], uum sukke Fertuusengen mäd uur anomyme Benutsere tou fermieden.''",
-'noarticletext'                    => 'Deer is apstuuns naan Text ap disse Siede. Du koast [[Special:Search/{{PAGENAME}}|disse Siedenoome säike]] in uur Sieden of [{{fullurl:{{FULLPAGENAME}}|action=edit}} disse Siede beoarbaidje].',
+'noarticletext'                    => 'Deer is apstuuns naan Text ap disse Siede. 
+Du koast dissen Tittel ap do uur Sieden [[Special:Search/{{PAGENAME}}|säike]],
+<span class="plainlinks"> in do touheerige [{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} Logbouke säike] of disse Siede [{{fullurl:{{FULLPAGENAME}}|action=edit}} beoarbaidje]</span>.',
 'userpage-userdoesnotexist'        => 'Dät Benutserkonto „$1“ is nit deer. Pröif, of du disse Siede wuddelk moakje/beoarbaidje wolt.',
 'clearyourcache'                   => "'''Bemäärkenge: Ätter dät Fäästlääsen kon dät nöödich weese, dän Browser-Cache loostoumoakjen, uum do Annerengen sjo tou konnen.'''
 '''Mozilla / Firefox / Safari:''' hoold ''Shift'' deel un klik ''Reload,'' of tai ''Ctrl-F5'' of ''Ctrl-R'' (''Command-R'' ap n Macintosh); '''Konqueror: '''klik ''Reload'' of tai ''F5;'' '''Opera:''' moak dän cache loos in ''Tools → Preferences;'' '''Internet Explorer:''' hoold ''Ctrl'' deel un klik ''Refresh,'' of tai ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => '<strong>Tipp:</strong> Benutse dän Foarschau-Knoop, uum dien näi CSS/JavaScript foar dät Spiekerjen tou tästjen.',
+'usercssjsyoucanpreview'           => "'''Tipp:''' Benutse dän Foarschau-Knoop, uum dien näi CSS/JavaScript foar dät Spiekerjen tou tästjen.",
 'usercsspreview'                   => "== Foarschau fon dien Benutser-CSS ==
 '''Beoachtje:''' Ätter dät Spiekerjen moast du dien Browser anwiese, ju näie Version tou leeden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userjspreview'                    => "== Foarschau fon dien Benutser-CSS ==
 '''Beoachtje:''' Ätter dät Spiekerjen moast du dien Browser kweede, ju näie Version tou leeden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''Internet Explorer:''' ''Strg-F5'', '''Opera:''' ''F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userinvalidcssjstitle'            => "'''Woarschauenge:''' Deer existiert neen Skin \"\$1\". Betoank jädden, dät benutserspezifiske .css- un .js-Sieden män n Littek-Bouksteeuwe anfange mouten, also t.B. ''{{ns:user}}:Mustermann/monobook.css'', nit ''{{ns:user}}:Mustermann/Monobook.css''.",
 'updated'                          => '(Annerd)',
-'note'                             => '<strong>Waiwiesenge:</strong>',
-'previewnote'                      => '<strong>Dit is man ne Foarschau, die Artikkel wuude noch nit spiekerd!</strong>',
+'note'                             => "'''Waiwiesenge:'''",
+'previewnote'                      => "'''Dit is man ne Foarschau, die Artikkel wuude noch nit spiekerd!'''",
 'previewconflict'                  => 'Disse Foarschau rakt dän Inhoold fon dät buppere Täkstfäild wier; so wol die Artikkel uutsjo, wan du nu spiekerjen dääst.',
-'session_fail_preview'             => '<strong>Dien Beoarbaidenge kuud nit spiekerd wäide, deer dien Sitsengsdoaten ferlädden geen sunt. 
-Fersäik dät jädden fonnäien, deertruch dät du unner ju foulgjende Foarschau nochmoal ap "Siede spiekerje" klikst. 
-Schuul dät Problem bestounden blieuwe, mäldje die ou un deerätter wier an.</strong>',
-'session_fail_preview_html'        => "<strong>Dien Beoarbaidenge kuud nit spiekerd wäide, deer dien Sitsengsdoaten ferlädden geen sunt.</strong>
+'session_fail_preview'             => "'''Dien Beoarbaidenge kuud nit spiekerd wäide, deer dien Sitsengsdoaten ferlädden geen sunt. 
+Fersäik dät jädden fonnäien, deertruch dät du unner ju foulgjende Foarschau nochmoal ap \"Siede spiekerje\" klikst. 
+Schuul dät Problem bestounden blieuwe, mäldje die ou un deerätter wier an.'''",
+'session_fail_preview_html'        => "'''Dien Beoarbaidenge kuud nit spiekerd wäide, deer dien Sitsengsdoaten ferlädden geen sunt.'''
 
 ''Deer in  {{SITENAME}} dät Spikerjen fon scheen HTML aktivierd is, wuude ju Foarschau uutblended uum JavaScript Angriepe tou ferhinnerjen.''
 
-<strong>Fersäik et fonnäien, wan du unner ju foulgjende Textfoarschau noch moal ap „Siede spiekerje“ klikst. Schuul dät Problem bestounden blieuwe, [[Special:UserLogout|mäld die ou]] un deerätter wier an.</strong>",
-'token_suffix_mismatch'            => '<strong>Dien Beoarbaidenge wuude touräächwiesd, deer dien Browser Teekene in dät Beoarbaidje-Token ferstummeld häd.
-Ne Spiekerenge kon dän Siedeninhoold fernäile. Dit geböärt bietiede truch ju Benutsenge fon n anonymen Proxy-Tjoonst, die der failerhaft oarbaidet.</strong>',
+'''Fersäik et fonnäien, wan du unner ju foulgjende Textfoarschau noch moal ap „Siede spiekerje“ klikst. Schuul dät Problem bestounden blieuwe, [[Special:UserLogout|mäld die ou]] un deerätter wier an.'''",
+'token_suffix_mismatch'            => "'''Dien Beoarbaidenge wuude touräächwiesd, deer dien Browser Teekene in dät Beoarbaidje-Token ferstummeld häd.
+Ne Spiekerenge kon dän Siedeninhoold fernäile. Dit geböärt bietiede truch ju Benutsenge fon n anonymen Proxy-Tjoonst, die der failerhaft oarbaidet.'''",
 'editing'                          => 'Beoarbaidjen fon $1',
 'editingsection'                   => 'Beoarbaidje fon $1 (Apsats)',
-'editingcomment'                   => 'Beoarbaidjen fon $1 (Kommentoar)',
+'editingcomment'                   => 'Beoarbaidjen fon $1 (Näi Stuk)',
 'editconflict'                     => 'Beoarbaidengs-Konflikt: "$1"',
 'explainconflict'                  => "Uurswäl häd dissen Artikkel annerd, ätterdät du anfangd bäst, him tou beoarbaidjen.
 Dät buppere Textfäild änthaalt dän aktuälle Artikkel.
@@ -614,22 +620,25 @@ Föige jädden dien Annerengen in dät buppere Textfäild ien.
 '''Bloot''' die Inhoold fon dät buppere Textfäild wäd spiekerd, wan du ap \"Spiekerje\" klikst.",
 'yourtext'                         => 'Dien Text',
 'storedversion'                    => 'Spiekerde Version',
-'nonunicodebrowser'                => '<strong style="color: #330000; background: #f0e000;">Oachtenge: Dien Browser kon Unicode-Teekene nit gjucht feroarbaidje. Benutse jädden n uur Browser uum Artikkele tou beoarbaidjen.</strong>',
-'editingold'                       => '<strong>OACHTENGE: Jie beoarbaidje ne oolde Version fon disse Artikkel. Wan Jie spiekerje, wäide alle näiere Versione uurschrieuwen.</strong>',
+'nonunicodebrowser'                => "<strong style=\"color: #330000; background: #f0e000;\">Oachtenge: Dien Browser kon Unicode-Teekene nit gjucht feroarbaidje. Benutse jädden n uur Browser uum Artikkele tou beoarbaidjen.'''",
+'editingold'                       => "'''OACHTENGE: Jie beoarbaidje ne oolde Version fon disse Artikkel. Wan Jie spiekerje, wäide alle näiere Versione uurschrieuwen.'''",
 'yourdiff'                         => 'Unnerscheede',
-'copyrightwarning'                 => "<strong><big>Kopier neen Websieden,</big> do nit dien oaine sunt, benuts neen uurhääbergjuchtelk schutsede Wierke sunner Ferlof fon dän Copyright-Inhääber!</strong><br />
-Du toukwäst uus hiermäd, dät du dän Text <strong>sälwen ferfoated</strong> hääst, dät dän Text Algemeengoud (<strong>public domain</strong>) is, of dät die <strong>Copyright-Inhääber</strong> sien <strong>Toustämmenge</strong> roat häd. In dän Fal dät dissen Text al uurswain publizierd wuude, wies jädden ap ju Diskussionssiede deerap wai. 
+'copyrightwarning'                 => "'''<big>Kopier neen Websieden,</big> do nit dien oaine sunt, benuts neen uurhääbergjuchtelk schutsede Wierke sunner Ferlof fon dän Copyright-Inhääber!'''<br />
+Du toukwäst uus hiermäd, dät du dän Text '''sälwen ferfoated''' hääst, dät dän Text Algemeengoud ('''public domain''') is, of dät die '''Copyright-Inhääber''' sien '''Toustämmenge''' roat häd. In dän Fal dät dissen Text al uurswain publizierd wuude, wies jädden ap ju Diskussionssiede deerap wai. 
 <i>Beoachtje, dät aal {{SITENAME}}-Biedraage automatisk unner ju „$2“ stounde (sjuch $1 foar Details). In dän Fal dät du nit moatest, dät dien Oarbaid hier fon Uurswäkken annerd un fersprat wäd, druk dan '''nit''' ap „Siede spiekerje“.</i>",
 'copyrightwarning2'                => 'Aal Biedraage tou dän {{SITENAME}} konnen fon uur Ljuude ferannerd un fersprat wäide. Fals Jie nit moaten dät Jou Oarbaid hier fon uur Ljuude ferannerd un fersprat wäd, dan drukke Jie nit ap "Spiekerje".
 
 Jie fersicherje hiermäd uk, dät Jie dän Biedraach sälwen ferfoated hääbe blw. dät hie neen froamd Gjucht ferlätset (sjuch fääre: $1).',
-'longpagewarning'                  => '<strong>WOARSCHAUENGE: Disse Siede is $1 kb groot; eenige Browsere kuuden Probleme hääbe, Sieden tou beoarbaidjen, do der gratter as 32 kb sunt. Uurlääse Jou jädden, of ne Oudeelenge fon do Sieden in litjere Ousnitte muugelk is.</strong>',
-'longpageerror'                    => '<strong>FAILER: Die Text, dän du tou spiekerjen fersäkst, is $1 KB groot. Dät is gratter as dät ferlööwede Maximum fon $2 KB – Spiekerenge nit muugelk.</strong>',
-'readonlywarning'                  => '<strong>WOARSCHAUENGE: Ju Doatenboank wuude foar Wartengsoarbaiden speerd, so dät dien Annerengen apstuuns nit spiekerd wäide konnen. Sicherje dän Text jädden lokoal ap dien Computer un fersäik tou n leeteren Tiedpunkt, do Annerengen in ju Wikipedia tou uurdreegen.</strong>',
-'protectedpagewarning'             => '<strong>WOARSCHAUENGE: Disse Siede wuude speerd, so dät ju bloot truch Benutsere mäd Administrationsgjuchte beoarbeded wäide kon.</strong>',
+'longpagewarning'                  => "'''WOARSCHAUENGE: Disse Siede is $1 kb groot; eenige Browsere kuuden Probleme hääbe, Sieden tou beoarbaidjen, do der gratter as 32 kb sunt. Uurlääse Jou jädden, of ne Oudeelenge fon do Sieden in litjere Ousnitte muugelk is.'''",
+'longpageerror'                    => "'''FAILER: Die Text, dän du tou spiekerjen fersäkst, is $1 KB groot. Dät is gratter as dät ferlööwede Maximum fon $2 KB – Spiekerenge nit muugelk.'''",
+'readonlywarning'                  => "'''WOARSCHAUENGE: Ju Doatenboank wuude foar Wartengsoarbaiden speerd, so dät dien Annerengen apstuuns nit spiekerd wäide konnen. 
+Sicherje dän Text jädden lokoal ap dien Computer un fersäik tou n leeteren Tiedpunkt, do Annerengen in ju Wikipedia tou uurdreegen.'''
+
+Gruund foar ju Speere: $1",
+'protectedpagewarning'             => "'''WOARSCHAUENGE: Disse Siede wuude speerd, so dät ju bloot truch Benutsere mäd Administrationsgjuchte beoarbeded wäide kon.'''",
 'semiprotectedpagewarning'         => "'''Oachtenge:''' Disse Siede is ousleeten un kon bloot fon anmäldede Besäikere beoarbaided wäide.",
 'cascadeprotectedwarning'          => "'''WOARSCHAUENGE: Disse Siede wuude speerd, so dät ju bloot truch Benutsere mäd Administratorgjuchte beoarbaided wäide kon. Ju is in do {{PLURAL:$1|foulgjende Siede|foulgjende Sieden}} ienbuunen, do der middels ju Kaskadenspeeroption schutsed {{PLURAL:$1|is|sunt}}:'''",
-'titleprotectedwarning'            => '<strong>OACHTENGE: Dät Moakjen fon Sieden wuude speerd. Bloot bestimde Benutsergruppen konnen ju Siede moakje.</strong>',
+'titleprotectedwarning'            => "'''OACHTENGE: Dät Moakjen fon Sieden wuude speerd. Bloot bestimde Benutsergruppen konnen ju Siede moakje.'''",
 'templatesused'                    => 'Foulgjende Foarloagen wäide fon disse Artikkele ferwoand:',
 'templatesusedpreview'             => 'Foulgjende Foarloagen wäide fon disse Siedefoarschau ferwoand:',
 'templatesusedsection'             => 'Foulgjende Foarloagen wuuden fon disse Oudeelenge ferwoand:',
@@ -647,20 +656,30 @@ Jie fersicherje hiermäd uk, dät Jie dän Biedraach sälwen ferfoated hääbe b
 
 Pröif mäd Suurge, of dät näi Moakjen fon ju Siede do Gjuchtlienjen äntspräkt.
 Tou Dien Information foulget dät Läsk-Logbouk mäd ju Begründenge foar ju fröiere Läskenge:",
+'deleted-notice'                   => 'Disse Siede wuud läsked. Der foulget n Uutsuch uut dät Läsk-Logbouk foar disse Siede.',
+'deletelog-fulllog'                => 'Fulständich Läsk-Logbouk',
+'edit-hook-aborted'                => 'Ju Beoarbaidenge wuud sunner Ärkläärenge truch ne Snitsteede oubreeken.',
+'edit-gone-missing'                => 'Ju Siede kuud nit aktualisierd wäide.
+Ju wuud anschienend läsked.',
+'edit-conflict'                    => 'Beoarbaidengskonflikt.',
+'edit-no-change'                   => 'Dien Beoarbaidenge wuude ignorierd, deer neen Annerenge an dän Text foarnuumen wuude.',
+'edit-already-exists'              => 'Ju näie Siede kuud nit moaked wäide, deer ju al foarhounden is.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Woarschauenge: Disse Siede änthaalt tou fuul Aproupe fon stuure Parserfunktione.
  
-Der duuren nit moor as $2 Aproupe weese, apstuuns sund der $1 Aproupe.',
+Der {{PLURAL:$2|duur nit moor as 1 Aproup|duuren nit moor as $1 Aproupe}} weese.',
 'expensive-parserfunction-category'       => 'Sieden, do tou oafte stuure Parserfunktione aproupe',
 'post-expand-template-inclusion-warning'  => 'Woarschauenge: Ju Grööte fon do bietouföigede Foarloagen is tou groot, eenige Foarloagen konnen nit bietouföiged wäide.',
 'post-expand-template-inclusion-category' => 'Sieden, in wäkke do bietouföigede Foarloagen buppe ju maximoale Grööte kuume',
 'post-expand-template-argument-warning'   => 'Woarschauenge: Disse Siede änthaalt ap et minste een Argument in ne Foarloage, dät expandierd tou groot is. Disse Argumente wäide ignorierd.',
 'post-expand-template-argument-category'  => 'Sieden, do der ignorierde Foarloagenargumente änthoolde',
+'parser-template-loop-warning'            => 'Foarloagenstrik äntdäkt: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Foarloagenrekursionsdjuptenscheed uurtreeden ($1)',
 
 # "Undo" feature
 'undo-success' => 'Ju Annerenge kuud mäd Ärfoulch tourääch annerd wäide. Jädden ju Beoarbaidenge in ju Ferglieksansicht kontrollierje un dan ap „Siede spiekerje“ klikke, uum ju tou spiekerjen.',
-'undo-failure' => '<span class="error">Ju Annerenge kuud nit tourääch annerd wäide, deer ju betroffene Oudeelenge intwisken ferannerd wuude.</span>',
+'undo-failure' => 'Ju Annerenge kuud nit tourääch annerd wäide, deer ju betroffene Oudeelenge intwisken ferannerd wuude.',
 'undo-norev'   => 'Ju Beoarbaidenge kuud nit räägels troald wäide, deer ju nit foarhounden is of läsked wuude.',
 'undo-summary' => 'Annerenge $1 fon [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskussion]]) wuude tourääch annerd.',
 
@@ -671,29 +690,29 @@ Der duuren nit moor as $2 Aproupe weese, apstuuns sund der $1 Aproupe.',
 Gruund fon ju Speere: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Logbouke foar disse Siede anwiese',
-'nohistory'           => 'Dät rakt neen fröiere Versione fon dissen Artikkel.',
-'revnotfound'         => 'Disse Version wuude nit fuunen.',
-'revnotfoundtext'     => 'Ju soachte Version fon dissen Artikkel kuude nit fuunen wäide. Uurpröiwe jädden ju URL fon disse Siede.',
-'currentrev'          => 'Aktuälle Version',
-'revisionasof'        => 'Version fon $1',
-'revision-info'       => 'Dit is ne oolde Version. Tiedpunkt fon ju Beoarbaidenge: $1 truch $2.',
-'previousrevision'    => '� Naistallere Version',
-'nextrevision'        => 'Naistjungere Version →',
-'currentrevisionlink' => 'Aktuälle Version',
-'cur'                 => 'Aktuäl',
-'next'                => 'Naiste',
-'last'                => 'Foarige',
-'page_first'          => 'Ounfang',
-'page_last'           => 'Eend',
-'histlegend'          => "Diff  Uutwoal: Do Boxen fon do wonskede Versione markierje un 'Enter' drukke of ap dän Knoop unner klikke.<br />
+'viewpagelogs'           => 'Logbouke foar disse Siede anwiese',
+'nohistory'              => 'Dät rakt neen fröiere Versione fon dissen Artikkel.',
+'currentrev'             => 'Aktuälle Version',
+'currentrev-asof'        => 'Aktuelle Version fon $1',
+'revisionasof'           => 'Version fon $1',
+'revision-info'          => 'Dit is ne oolde Version. Tiedpunkt fon ju Beoarbaidenge: $1 truch $2.', # Additionally available: $3: revision id
+'previousrevision'       => '� Naistallere Version',
+'nextrevision'           => 'Naistjungere Version →',
+'currentrevisionlink'    => 'Aktuälle Version',
+'cur'                    => 'Aktuäl',
+'next'                   => 'Naiste',
+'last'                   => 'Foarige',
+'page_first'             => 'Ounfang',
+'page_last'              => 'Eend',
+'histlegend'             => "Diff  Uutwoal: Do Boxen fon do wonskede Versione markierje un 'Enter' drukke of ap dän Knoop unner klikke.<br />
 Legende: (Aktuäl) = Unnerscheed tou ju aktuälle Version,
 (Lääste) = Unnerscheed tou ju foarige Version, L = Litje Annerenge",
-'deletedrev'          => '[läsked]',
-'histfirst'           => 'Ooldste',
-'histlast'            => 'Näiste',
-'historysize'         => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
-'historyempty'        => '(loos)',
+'history-fieldset-title' => 'Säik in ju Versionsgeschichte',
+'deletedrev'             => '[läsked]',
+'histfirst'              => 'Ooldste',
+'histlast'               => 'Näiste',
+'historysize'            => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
+'historyempty'           => '(loos)',
 
 # Revision feed
 'history-feed-title'          => 'Versionsgeschichte',
@@ -771,6 +790,7 @@ Staal deertruch sicher, dät ju Versionsgeschichte fon n Artikkel historisk akro
 'mergehistory-invalid-destination' => 'Sielsiede mout n gultigen Siedennoome weese.',
 'mergehistory-autocomment'         => '„[[:$1]]“ fereeniged ätter „[[:$2]]“',
 'mergehistory-comment'             => '[[:$1]] fereeniged ätter [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Uutgongs- un Sielsiede duuren nit identisk weese',
 
 # Merge log
 'mergelog'           => 'Fereenigengs-Logbouk',
@@ -783,121 +803,202 @@ Staal deertruch sicher, dät ju Versionsgeschichte fon n Artikkel historisk akro
 'difference'              => '(Unnerscheed twiske Versione)',
 'lineno'                  => 'Riege $1:',
 'compareselectedversions' => 'Wäälde Versione ferglieke',
+'visualcomparison'        => 'Visuellen Fergliek',
+'wikicodecomparison'      => 'Wikitext-Fergliek',
 'editundo'                => 'tounichte moakje',
 'diff-multi'              => '(Die Versionsfergliek belukt {{PLURAL:$1|ne deertwiske lääsende Version|$1 deertwiske lääsende Versione}} mee ien.)',
+'diff-movedto'            => 'ferschäuwen ätter $1',
+'diff-styleadded'         => '$1-Style bietouföiged',
+'diff-added'              => '$1 bietouföiged',
+'diff-changedto'          => 'ferannerd ätter $1',
+'diff-movedoutof'         => 'ferschäuwen uut $1',
+'diff-styleremoved'       => '$1-Style wächhoald',
+'diff-removed'            => '$1 wächhoald',
+'diff-changedfrom'        => 'ferannerd fon $1',
+'diff-src'                => 'Wälle',
+'diff-withdestination'    => 'mäd Siel $1',
+'diff-with'               => '&#32;mäd $1 $2',
+'diff-with-final'         => '&#32;un $1 $2',
+'diff-width'              => 'Bratte',
+'diff-height'             => 'Höchte',
+'diff-p'                  => "een '''Stuk'''",
+'diff-blockquote'         => "aan '''Blok'''",
+'diff-h1'                 => "ne '''Uurschrift (1. Oardnenge)'''",
+'diff-h2'                 => "ne '''Uurschrift (2. Oardnenge)'''",
+'diff-h3'                 => "ne '''Uurschrift (3. Oardnenge)'''",
+'diff-h4'                 => "ne '''Uurschrift (4. Oardnenge)'''",
+'diff-h5'                 => "ne '''Uurschrift (5. Oardnenge)'''",
+'diff-pre'                => "aan '''formattierden Blok'''",
+'diff-div'                => "een '''Blokelement'''",
+'diff-ul'                 => "ne '''Lieste'''",
+'diff-ol'                 => "ne '''numerierde Lieste'''",
+'diff-li'                 => "aan '''Liesteniendraach'''",
+'diff-table'              => "ne '''Tabelle'''",
+'diff-tbody'              => "n '''Tabelleninhoold'''",
+'diff-tr'                 => "ne '''Riege'''",
+'diff-td'                 => "ne '''Zelle'''",
+'diff-th'                 => "ne '''Spaltenuurschrift'''",
+'diff-br'                 => "n '''Riegenuumbreek'''",
+'diff-hr'                 => "ne '''horizontoale Lienje'''",
+'diff-code'               => "n '''Beräk Computercode'''",
+'diff-dl'                 => "ne '''Definitionslieste'''",
+'diff-dt'                 => "n '''Definitionsterm'''",
+'diff-dd'                 => "ne '''Definition'''",
+'diff-input'              => "ne '''Iengoawe'''",
+'diff-form'               => "n '''Formular'''",
+'diff-img'                => "ne '''Bielde'''",
+'diff-span'               => "n '''Span'''",
+'diff-a'                  => "n '''Link'''",
+'diff-i'                  => "'''scheeuw'''",
+'diff-b'                  => "'''fat'''",
+'diff-strong'             => "'''mäd Ätterdruk'''",
+'diff-em'                 => "'''betoond'''",
+'diff-font'               => "'''Schriftoard'''",
+'diff-big'                => "'''groot'''",
+'diff-del'                => "'''läsked'''",
+'diff-tt'                 => "'''fääste Wiete'''",
+'diff-sub'                => "'''djoopstoald'''",
+'diff-sup'                => "'''hoochstoald'''",
+'diff-strike'             => "'''truchstrieked'''",
 
 # Search results
-'searchresults'             => 'Säikresultoate',
-'searchresulttext'          => 'Foar moor Informatione tou ju Säike sjuch ju [[{{MediaWiki:Helppage}}|Hälpesiede]].',
-'searchsubtitle'            => 'Dien Säikanfroage: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|aal mäd „$1“ ounfangende Sieden]] | [[Special:WhatLinksHere/$1|aal Sieden, do ätter „$1“ ferlinkje]])',
-'searchsubtitleinvalid'     => 'Foar dien Säikanfroage „$1“.',
-'noexactmatch'              => "'''Deer existiert neen Siede mäd dän Tittel „$1“.'''
+'searchresults'                    => 'Säikresultoate',
+'searchresults-title'              => 'Säikresultoate foar "$1"',
+'searchresulttext'                 => 'Foar moor Informatione tou ju Säike sjuch ju [[{{MediaWiki:Helppage}}|Hälpesiede]].',
+'searchsubtitle'                   => 'Dien Säikanfroage: „[[:$1|$1]]“ ([[Special:Prefixindex/$1|aal mäd „$1“ ounfangende Sieden]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|aal Sieden, do ätter „$1“ ferlinkje]])',
+'searchsubtitleinvalid'            => 'Foar dien Säikanfroage „$1“.',
+'noexactmatch'                     => "'''Deer existiert neen Siede mäd dän Tittel „$1“.'''
 
 Wan du die mäd dät Thema uutkoanst, koast du sälwen ju [[:$1|Siede ferfoatje]].",
-'noexactmatch-nocreate'     => "'''Der bestoant neen Siede mäd dän Tittel „$1“.'''",
-'toomanymatches'            => 'Ju Antaal fon Säikresultoate is tou groot, fersäik ne näie Oufroage.',
-'titlematches'              => 'Uureenstämmengen mäd Uurschrifte',
-'notitlematches'            => 'Neen Uureenstimmengen',
-'textmatches'               => 'Uureenstämmengen mäd Texte',
-'notextmatches'             => 'Neen Uureenstimmengen',
-'prevn'                     => 'foarige $1',
-'nextn'                     => 'naiste $1',
-'viewprevnext'              => 'Wies ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 Woud|$2 Woude}})',
-'search-result-score'       => 'Relevanz: $1 %',
-'search-redirect'           => '(Wiederlaitenge $1)',
-'search-section'            => '(Apsnit $1)',
-'search-suggest'            => 'Meendest du $1?',
-'search-interwiki-caption'  => 'Susterprojekte',
-'search-interwiki-default'  => '$1 Resultoate:',
-'search-interwiki-more'     => '(wiedere)',
-'search-mwsuggest-enabled'  => 'mäd Foarsleeke',
-'search-mwsuggest-disabled' => 'neen Foarsleeke',
-'search-relatedarticle'     => 'Früünde',
-'mwsuggest-disable'         => 'Foarsleeke truch Ajax deaktivierje',
-'searchrelated'             => 'früünd',
-'searchall'                 => 'aal',
-'showingresults'            => "Hier {{PLURAL:$1|is '''1''' Resultoat|sunt '''$1''' Resultoate}}, ounfangend mäd Nuumer '''$2'''.",
-'showingresultsnum'         => "Hier {{PLURAL:$3|is '''1''' Resultoat|sunt '''$3''' Resultoate}}, ounfangend mäd Nuumer '''$2'''.",
-'showingresultstotal'       => "Hier {{PLURAL:$3|foulget Säikresultoat '''$1''' fon '''$3:'''|foulgje do Säikresultoate '''$1–$2''' fon '''$3:'''}}",
-'nonefound'                 => "'''Waiwiesenge:''' Der wäide standoardmäitich man oankelde Noomensruume truchsoacht. Sät ''all:'' foar din Säikbegrip, uum aal Sieden (bietou Diskussionssieden, Foarloagen usw.) tou truchsäiken of sield dän Noome fon dän truchtousäikende Noomensruum.",
-'powersearch'               => 'Fääre säike',
-'powersearch-legend'        => 'Fääre säike',
-'powersearch-ns'            => 'Säik in Noomensruume:',
-'powersearch-redir'         => 'Fäärelaitengen anwiese',
-'powersearch-field'         => 'Säik ätter:',
-'search-external'           => 'Externe Säike',
-'searchdisabled'            => 'Ju {{SITENAME}} Fultextsäike is weegen Uurläästenge apstuuns deaktivierd. Du koast insteede deerfon ne Google- of Yahoo-Säike startje. Do Resultoate foar {{SITENAME}} speegelje oawers nit uunbedingd dän aktuällen Stand wier.',
+'noexactmatch-nocreate'            => "'''Der bestoant neen Siede mäd dän Tittel „$1“.'''",
+'toomanymatches'                   => 'Ju Antaal fon Säikresultoate is tou groot, fersäik ne näie Oufroage.',
+'titlematches'                     => 'Uureenstämmengen mäd Uurschrifte',
+'notitlematches'                   => 'Neen Uureenstimmengen',
+'textmatches'                      => 'Uureenstämmengen mäd Texte',
+'notextmatches'                    => 'Neen Uureenstimmengen',
+'prevn'                            => 'foarige $1',
+'nextn'                            => 'naiste $1',
+'viewprevnext'                     => 'Wies ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Säikoptione',
+'searchmenu-exists'                => "'''Dät rakt n Siede mäd Noome \"[[:\$1]]\" ap dissen Wiki'''",
+'searchmenu-new'                   => "'''Moak ju Siede „[[:$1]]“ in dissen Wiki.'''",
+'searchhelp-url'                   => 'Help:Hälpe',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Wies aal Sieden, do mäd dän Säikbegriep ounfange]]',
+'searchprofile-articles'           => 'Inhooldssieden',
+'searchprofile-articles-and-proj'  => 'Inhooldssieden & Projekt',
+'searchprofile-project'            => 'Projekt',
+'searchprofile-images'             => 'Doatäie',
+'searchprofile-everything'         => 'Aal',
+'searchprofile-advanced'           => 'Fergratterd',
+'searchprofile-articles-tooltip'   => 'Säike in $1',
+'searchprofile-project-tooltip'    => 'Säike in $1',
+'searchprofile-images-tooltip'     => 'Ätter Bielden säike',
+'searchprofile-everything-tooltip' => 'Gansen Inhoold truchsäike (inklusive Diskussionssieden)',
+'searchprofile-advanced-tooltip'   => 'Säik in wiedere Noomensruume',
+'prefs-search-nsdefault'           => 'Standoard-Noomensruume:',
+'prefs-search-nscustom'            => 'Säik in wiedere Noomensruume:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 Woud|$2 Woude}})',
+'search-result-score'              => 'Relevanz: $1 %',
+'search-redirect'                  => '(Wiederlaitenge $1)',
+'search-section'                   => '(Apsnit $1)',
+'search-suggest'                   => 'Meendest du $1?',
+'search-interwiki-caption'         => 'Susterprojekte',
+'search-interwiki-default'         => '$1 Resultoate:',
+'search-interwiki-more'            => '(wiedere)',
+'search-mwsuggest-enabled'         => 'mäd Foarsleeke',
+'search-mwsuggest-disabled'        => 'neen Foarsleeke',
+'search-relatedarticle'            => 'Früünde',
+'mwsuggest-disable'                => 'Foarsleeke truch Ajax deaktivierje',
+'searchrelated'                    => 'früünd',
+'searchall'                        => 'aal',
+'showingresults'                   => "Hier {{PLURAL:$1|is '''1''' Resultoat|sunt '''$1''' Resultoate}}, ounfangend mäd Nuumer '''$2'''.",
+'showingresultsnum'                => "Hier {{PLURAL:$3|is '''1''' Resultoat|sunt '''$3''' Resultoate}}, ounfangend mäd Nuumer '''$2'''.",
+'showingresultstotal'              => "Hier {{PLURAL:$4|foulget Säikresultoat '''$1''' fon '''$3:'''|foulgje do Säikresultoate '''$1–$2''' fon '''$3:'''}}",
+'nonefound'                        => "'''Waiwiesenge:''' Der wäide standoardmäitich man oankelde Noomensruume truchsoacht. Sät ''all:'' foar din Säikbegrip, uum aal Sieden (bietou Diskussionssieden, Foarloagen usw.) tou truchsäiken of sield dän Noome fon dän truchtousäikende Noomensruum.",
+'search-nonefound'                 => 'Foar dien Säikanfroage wuuden neen Resultoate fuunen.',
+'powersearch'                      => 'Fääre säike',
+'powersearch-legend'               => 'Fääre säike',
+'powersearch-ns'                   => 'Säik in Noomensruume:',
+'powersearch-redir'                => 'Fäärelaitengen anwiese',
+'powersearch-field'                => 'Säik ätter:',
+'search-external'                  => 'Externe Säike',
+'searchdisabled'                   => 'Ju {{SITENAME}} Fultextsäike is weegen Uurläästenge apstuuns deaktivierd. Du koast insteede deerfon ne Google- of Yahoo-Säike startje. Do Resultoate foar {{SITENAME}} speegelje oawers nit uunbedingd dän aktuällen Stand wier.',
 
 # Preferences page
-'preferences'              => 'Ienstaalengen',
-'mypreferences'            => 'Ienstaalengen',
-'prefs-edits'              => 'Antaal Beoarbaidengen:',
-'prefsnologin'             => 'Nit anmälded',
-'prefsnologintext'         => 'Du moast <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} anmälded]</span> weese, uum dien Ienstaalengen annerje tou konnen.',
-'prefsreset'               => 'Ienstaalengen wuuden ap Standoard touräächsät.',
-'qbsettings'               => 'Siedenlieste',
-'qbsettings-none'          => 'Naan',
-'qbsettings-fixedleft'     => 'Links, fääst',
-'qbsettings-fixedright'    => 'Gjuchts, fääst',
-'qbsettings-floatingleft'  => 'Links, swieuwjend',
-'qbsettings-floatingright' => 'Gjuchts, swieuwjend',
-'changepassword'           => 'Paaswoud annerje',
-'skin'                     => 'Skin',
-'math'                     => 'TeX',
-'dateformat'               => 'Doatumsformoat',
-'datedefault'              => 'Neen Preferenz',
-'datetime'                 => 'Doatum un Tied',
-'math_failure'             => 'Parser-Failer',
-'math_unknown_error'       => 'Uunbekoande Failer',
-'math_unknown_function'    => 'Uunbekoande Funktion',
-'math_lexing_error'        => "'Lexing'-Failer",
-'math_syntax_error'        => 'Syntaxfailer',
-'math_image_error'         => 'ju PNG-Konvertierenge sluuch fail',
-'math_bad_tmpdir'          => 'Kon dät Temporärferteeknis foar mathematiske Formeln nit anlääse of beschrieuwe.',
-'math_bad_output'          => 'Kon dät Sielferteeknis foar mathematiske Formeln nit anlääse of beschrieuwe.',
-'math_notexvc'             => 'Dät texvc-Program kon nit fuunen wäide. Beoachte jädden math/README.',
-'prefs-personal'           => 'Benutserdoaten',
-'prefs-rc'                 => 'Bekoandreekenge fon "Lääste Annerengen"',
-'prefs-watchlist'          => 'Beooboachtengslieste',
-'prefs-watchlist-days'     => 'Antaal fon Deege, do ju Beooboachtengslieste standoardmäitich uumfoatje schäl:',
-'prefs-watchlist-edits'    => 'Maximoale Antaal fon Iendraage in ju fergratterde Beooboachtengslieste:',
-'prefs-misc'               => 'Ferscheedene Ienstaalengen',
-'saveprefs'                => 'Ienstaalengen spiekerje',
-'resetprefs'               => 'Nit spiekerde Annerengen fersmiete',
-'oldpassword'              => 'Oold Paaswoud:',
-'newpassword'              => 'Näi Paaswoud:',
-'retypenew'                => 'Näi Paaswoud (nochmoal):',
-'textboxsize'              => 'Beoarbaidje',
-'rows'                     => 'Riegen',
-'columns'                  => 'Spalten',
-'searchresultshead'        => 'Säike',
-'resultsperpage'           => 'Träffere pro Siede:',
-'contextlines'             => 'Teekene pro Träffer:',
-'contextchars'             => 'Teekene pro Riege:',
-'stub-threshold'           => '<a href="#" class="stub">Kuute Artikkele</a> markierje bi (in Byte):',
-'recentchangesdays'        => 'Antaal fon Deege, do ju Lieste fon „Lääste Annerengen“ standoardmäitich uumfoatje schäl:',
-'recentchangescount'       => 'Antaal fon do Iendraage in "Lääste Annerengen", ju Versionsgeschichte un do Logbouke:',
-'savedprefs'               => 'Dien Ienstaalengen wuuden spiekerd.',
-'timezonelegend'           => 'Tiedzone',
-'timezonetext'             => '¹Reek ju Antaal fon Uuren ien, do twiske Jou Tiedzone un UPC lääse.',
-'localtime'                => 'Tied bie Jou:',
-'timezoneoffset'           => 'Unnerscheed¹:',
-'servertime'               => 'Aktuälle Tied ap dän Server:',
-'guesstimezone'            => 'Ienföigje uut dän Browser',
-'allowemail'               => 'Emails fon uur Benutsere kriegen',
-'prefs-searchoptions'      => 'Säikoptione',
-'prefs-namespaces'         => 'Noomensruume',
-'defaultns'                => 'In disse Noomensruume schäl standoardmäitich soacht wäide:',
-'default'                  => 'Standoardienstaalenge',
-'files'                    => 'Doatäie',
+'preferences'               => 'Ienstaalengen',
+'mypreferences'             => 'Ienstaalengen',
+'prefs-edits'               => 'Antaal Beoarbaidengen:',
+'prefsnologin'              => 'Nit anmälded',
+'prefsnologintext'          => 'Du moast <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} anmälded]</span> weese, uum dien Ienstaalengen annerje tou konnen.',
+'prefsreset'                => 'Ienstaalengen wuuden ap Standoard touräächsät.',
+'qbsettings'                => 'Siedenlieste',
+'qbsettings-none'           => 'Naan',
+'qbsettings-fixedleft'      => 'Links, fääst',
+'qbsettings-fixedright'     => 'Gjuchts, fääst',
+'qbsettings-floatingleft'   => 'Links, swieuwjend',
+'qbsettings-floatingright'  => 'Gjuchts, swieuwjend',
+'changepassword'            => 'Paaswoud annerje',
+'skin'                      => 'Skin',
+'skin-preview'              => 'Foarschau',
+'math'                      => 'TeX',
+'dateformat'                => 'Doatumsformoat',
+'datedefault'               => 'Neen Preferenz',
+'datetime'                  => 'Doatum un Tied',
+'math_failure'              => 'Parser-Failer',
+'math_unknown_error'        => 'Uunbekoande Failer',
+'math_unknown_function'     => 'Uunbekoande Funktion',
+'math_lexing_error'         => "'Lexing'-Failer",
+'math_syntax_error'         => 'Syntaxfailer',
+'math_image_error'          => 'ju PNG-Konvertierenge sluuch fail',
+'math_bad_tmpdir'           => 'Kon dät Temporärferteeknis foar mathematiske Formeln nit anlääse of beschrieuwe.',
+'math_bad_output'           => 'Kon dät Sielferteeknis foar mathematiske Formeln nit anlääse of beschrieuwe.',
+'math_notexvc'              => 'Dät texvc-Program kon nit fuunen wäide. Beoachte jädden math/README.',
+'prefs-personal'            => 'Benutserdoaten',
+'prefs-rc'                  => 'Bekoandreekenge fon "Lääste Annerengen"',
+'prefs-watchlist'           => 'Beooboachtengslieste',
+'prefs-watchlist-days'      => 'Antaal fon Deege, do ju Beooboachtengslieste standoardmäitich uumfoatje schäl:',
+'prefs-watchlist-days-max'  => '(Maximoal 7 Deege)',
+'prefs-watchlist-edits'     => 'Maximoale Antaal fon Iendraage in ju fergratterde Beooboachtengslieste:',
+'prefs-watchlist-edits-max' => '(Maximoale Antaal: 1000)',
+'prefs-misc'                => 'Ferscheedene Ienstaalengen',
+'prefs-resetpass'           => 'Paaswoud annerje',
+'saveprefs'                 => 'Ienstaalengen spiekerje',
+'resetprefs'                => 'Nit spiekerde Annerengen fersmiete',
+'textboxsize'               => 'Beoarbaidje',
+'prefs-edit-boxsize'        => 'Grööte fon dät Beoarbaidengsfinster:',
+'rows'                      => 'Riegen',
+'columns'                   => 'Spalten',
+'searchresultshead'         => 'Säike (010)',
+'resultsperpage'            => 'Träffere pro Siede:',
+'contextlines'              => 'Teekene pro Träffer:',
+'contextchars'              => 'Teekene pro Riege:',
+'stub-threshold'            => '<a href="#" class="stub">Kuute Artikkele</a> markierje bi (in Byte):',
+'recentchangesdays'         => 'Antaal fon Deege, do ju Lieste fon „Lääste Annerengen“ standoardmäitich uumfoatje schäl:',
+'recentchangesdays-max'     => '(Maximoal $1 {{PLURAL:$1|Dai|Deege}})',
+'recentchangescount'        => 'Antaal fon do Iendraage in ju Lieste fon do lääste Annerengen, ju Versionsgeschichte un do Logbouke:',
+'savedprefs'                => 'Dien Ienstaalengen wuuden spiekerd.',
+'timezonelegend'            => 'Tiedzone',
+'timezonetext'              => '¹Reek ju Antaal fon Uuren ien, do twiske Jou Tiedzone un UPC lääse.',
+'localtime'                 => 'Tied bie Jou:',
+'timezoneselect'            => 'Tiedzone:',
+'timezoneuseserverdefault'  => 'Standoardtied fon dän Server',
+'timezoneuseoffset'         => 'Uur (Unnerscheed anreeke)',
+'timezoneoffset'            => 'Unnerscheed¹:',
+'servertime'                => 'Tied ap dän Server:',
+'guesstimezone'             => 'Ienföigje uut dän Browser',
+'allowemail'                => 'Emails fon uur Benutsere kriegen',
+'prefs-searchoptions'       => 'Säikoptione',
+'prefs-namespaces'          => 'Noomensruume',
+'defaultns'                 => 'In disse Noomensruume schäl standoardmäitich soacht wäide:',
+'default'                   => 'Standoardienstaalenge',
+'files'                     => 'Doatäie',
 
 # User rights
 'userrights'                  => 'Benutsergjuchteferwaltenge', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Ferwaltede Gruppentouheeregaid',
 'userrights-user-editname'    => 'Benutsernoome anreeke:',
 'editusergroup'               => 'Beoarbaidede Benutsergjuchte',
-'editinguser'                 => "Uur Benutsergjuchte fon '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Uur Benutsergjuchte fon '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Beoarbaidje Gruppentouheeregaid fon dän Benutser',
 'saveusergroups'              => 'Spiekerje Gruppentouheeregaid',
 'userrights-groupsmember'     => 'Meeglid fon:',
@@ -945,6 +1046,8 @@ Wan du die mäd dät Thema uutkoanst, koast du sälwen ju [[:$1|Siede ferfoatje]
 'right-minoredit'            => 'Beoarbaidengen as littik markierje',
 'right-move'                 => 'Sieden ferschuuwe',
 'right-move-subpages'        => 'Sieden touhoope mäd Unnersieden ferschuuwe',
+'right-move-rootuserpages'   => 'Haud-Benutsersieden ferschuuwe',
+'right-movefile'             => 'Doatäie ferschuuwe',
 'right-suppressredirect'     => 'Bie dät Ferschuuwen dät Moakjen fon ne Fäärelaitenge unnerdrukke',
 'right-upload'               => 'Doatäie hoochleede',
 'right-reupload'             => 'Uurschrieuwen fon ne bestoundene Doatäi',
@@ -995,9 +1098,46 @@ Wan du die mäd dät Thema uutkoanst, koast du sälwen ju [[:$1|Siede ferfoatje]
 'rightslogentry' => 'annerde ju Gruppentouheeregaid foar „[[$1]]“ fon „$2“ ap „$3“.',
 'rightsnone'     => '(-)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'disse Siede tou leesen',
+'action-edit'                 => 'ju Siede tou beoarbaidjen',
+'action-createpage'           => 'Sieden tou moakjen',
+'action-createtalk'           => 'Diskussionssieden tou moakjen',
+'action-createaccount'        => 'n Benutserkonto tou moakjen',
+'action-minoredit'            => 'disse Beoarbaidenge as littik tou markierjen',
+'action-move'                 => 'ju Siede tou ferschuuwen',
+'action-move-subpages'        => 'disse Siede un touheerige Unnersieden tou ferschuuwen',
+'action-move-rootuserpages'   => 'Haud-Benutsersieden ferschuuwe',
+'action-movefile'             => 'Disse Doatäi ferschuuwe',
+'action-upload'               => 'Doatäie hoochtouleeden',
+'action-reupload'             => 'ju foarhoundene Doatäi tou uurschrieuwen',
+'action-reupload-shared'      => 'disse Doatäi uut dät gemeensoam nutsede Repositorium tou uurschrieuwen',
+'action-upload_by_url'        => 'Doatäie fon ne Webadresse (URL) hoochtouleeden',
+'action-writeapi'             => 'ju API mäd Schrieuwtougriepe tou ferweenden',
+'action-delete'               => 'Sieden tou läskjen',
+'action-deleterevision'       => 'Versione tou läskjen',
+'action-deletedhistory'       => 'Lieste fon do läskede Versione tou bekiekjen',
+'action-browsearchive'        => 'ätter läskede Sieden tou säiken',
+'action-undelete'             => 'ju Siede wier häärtoustaalen',
+'action-suppressrevision'     => 'ju ferstoppede Version tou bekiekjen un wier häärtoustaalen',
+'action-suppressionlog'       => 'dät privoate Logbouk ientoukiekjen',
+'action-block'                => 'dän Benutser tou speeren',
+'action-protect'              => 'dän Schutsstatus fon Sieden tou annerjen',
+'action-import'               => 'Sieden uut n uur Wiki tou importierjen',
+'action-importupload'         => 'Sieden uur dät Hoochleeden fon ne Doatäi tou importierjen',
+'action-patrol'               => 'do Beoarbaidengen fon uur Benutsere tou kontrollierjen',
+'action-autopatrol'           => 'oaine Beoarbaidengen as kontrollierd tou markierjen',
+'action-unwatchedpages'       => 'ju Lieste fon uunbeoboachtede Sieden tou bekiekjen',
+'action-trackback'            => 'n Trackback tou uurdreegen',
+'action-mergehistory'         => 'do Versionegeschichten fon Sieden tou fereenigjen',
+'action-userrights'           => 'Benutsergjuchte tou annerjen',
+'action-userrights-interwiki' => 'do Gjuchte fon Benutsere in uur Wikis annerje',
+'action-siteadmin'            => 'ju Doatenboank tou speeren of fräitoureeken',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|Annerenge|Annerengen}}',
 'recentchanges'                     => 'Lääste Annerengen',
+'recentchanges-legend'              => 'Anwiesoptione',
 'recentchangestext'                 => "Ap disse Siede koast du do lääste Annerengen ap '''{{SITENAME}}''' ättergunge.",
 'recentchanges-feed-description'    => 'Ferfoulge mäd dissen Feed do lääste Annerengen in {{SITENAME}}.',
 'rcnote'                            => "Anwiesd {{PLURAL:$1|wäd '''1''' Annerenge|wäide do lääste '''$1''' Annerengen}} in {{PLURAL:$2|dän lääste Dai|do lääste '''$2''' Deege}} siet $5, $4.",
@@ -1022,6 +1162,8 @@ Wan du die mäd dät Thema uutkoanst, koast du sälwen ju [[:$1|Siede ferfoatje]
 'rc_categories_any'                 => 'Aal',
 'rc-change-size'                    => '$1 {{PLURAL:$1|Byte|Bytes}}',
 'newsectionsummary'                 => 'Näie Apsats /* $1 */',
+'rc-enhanced-expand'                => 'Details anwiese (bruukt JavaScript)',
+'rc-enhanced-hide'                  => 'Details fersteete',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Annerengen an ferlinkede Sieden',
@@ -1043,7 +1185,7 @@ Wan du die mäd dät Thema uutkoanst, koast du sälwen ju [[:$1|Siede ferfoatje]
 'uploaderror'                 => 'Failer bie dät Hoochleeden',
 'uploadtext'                  => "Bruuk dit Formular uum näie Doatäie hoochtouleeden.
 
-Gung tou ju [[Special:ImageList|Lieste fon hoochleedene Doatäie]], uum foarhoundene Doatäie tou säiken un antouwiesen. Sjuch uk dät [[Special:Log/upload|Doatäi-]] un [[Special:Log/upload|Läsk-Logbouk]].
+Gung tou ju [[Special:FileList|Lieste fon hoochleedene Doatäie]], uum foarhoundene Doatäie tou säiken un antouwiesen. Sjuch uk dät [[Special:Log/upload|Doatäi-]] un [[Special:Log/upload|Läsk-Logbouk]].
 
 Klik ap '''„Truchsäike …“''', uum n Doatäiuutwoal-Dialog tou eepenjen.
 Ätter dän Uutwoal fon ne Doatäi wäd die Doatäinoome in dät Textfäild '''„Wäldoatäi“''' anwiesd.
@@ -1051,8 +1193,8 @@ Bestäätigje dan ju Lizenz-Fereenboarenge un klik deerätter ap '''„Doatäi h
 Dit kon n Schoft duurje, besunners bie ne loangsomme Internet-Ferbiendenge.
 
 Uum ne '''Bielde''' in ne Siede tou ferweenden, schrieuw an Steede fon ju Bielde toun Biespil:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:Doatäi.jpg<nowiki>]]</nowiki></tt>'''
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:Doatäi.jpg|Link-Text<nowiki>]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:Doatäi.jpg<nowiki>]]</nowiki></tt>'''
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:Doatäi.jpg|Link-Text<nowiki>]]</nowiki></tt>'''
 
 Uum '''Mediendoatäie''' ientoubienden, ferweende toun Biespil:
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:Doatäi.ogg<nowiki>]]</nowiki></tt>'''
@@ -1064,7 +1206,7 @@ Beoachtje, dät, juust as bie normoale Sieden-Inhoolde, uur Benutsere dien DoatÃ
 'upload-prohibited'           => 'Nit ferlööwede Doatäitypen: $1.',
 'uploadlog'                   => 'Doatäi-Logbouk',
 'uploadlogpage'               => 'Doatäi-Logbouk',
-'uploadlogpagetext'           => 'Dit is dät Logbouk fon do hoochleedene Doatäie, sjuch uk ju [[Special:NewImages|Galerie fon näie Doatäie]] foar n visuellen Uurblik.',
+'uploadlogpagetext'           => 'Dit is dät Logbouk fon do hoochleedene Doatäie, sjuch uk ju [[Special:NewFiles|Galerie fon näie Doatäie]] foar n visuellen Uurblik.',
 'filename'                    => 'Doatäinoome',
 'filedesc'                    => 'Beschrieuwenge, Wälle',
 'fileuploadsummary'           => 'Beschrieuwenge/Wälle:',
@@ -1077,6 +1219,7 @@ Beoachtje, dät, juust as bie normoale Sieden-Inhoolde, uur Benutsere dien DoatÃ
 'illegalfilename'             => 'Die Doatäinoome "$1" änthaalt ap minste een nit toulät Teeken. Benaam jädden ju Doatäi uum un fersäik, hier fon näien hoochtouleeden.',
 'badfilename'                 => 'Die Datäi-Noome is automatisk annerd tou "$1".',
 'filetype-badmime'            => 'Doatäie mäd dän MIME-Typ „$1“ duuren nit hoochleeden wäide.',
+'filetype-bad-ie-mime'        => 'Disse Doatäi kon nit hoochleeden wäide, deer die Internet Explorer ju as „$1“ ärkoant, wät n nit ferlööweden potentiell gefoarelken Doatäityp is.',
 'filetype-unwanted-type'      => "'''„.$1“''' is n nit wonsked Doateiformoat. 
 {{PLURAL:$3|Ferlööwed Doatäiformoat is|Ferlööwede Doatäiformoate sunt}} $2.",
 'filetype-banned-type'        => "'''„.$1“''' is n nit ferlööwed Doatäiformoat. 
@@ -1085,24 +1228,24 @@ Ferlööwed {{PLURAL:$3|is|sunt}} $2.",
 'large-file'                  => 'Jädden neen Bielde uur $1 hoochleede; disse Doatäi is $2 groot.',
 'largefileserver'             => 'Disse Doatäi is tou groot, deer die Server so konfigurierd is, dät Doatäien bloot bit tou ne bestimde Grööte apzeptierd wäide.',
 'emptyfile'                   => 'Ju hoochleedene Doatäi is loos. Die Gruund kon n Typfailer in dän Doatäinoome weese. Kontrollierje jädden, of du ju Doatäi wuddelk hoochleede wolt.',
-'fileexists'                  => "Ne Doatäi mäd dissen Noome bestoant al. Wan du ap 'Doatäi spiekerje' klikst, wäd ju Doatäi uurschrieuwen. Unner <strong><tt>$1</tt></strong> koast du die bewisje, of du dät wuddelk wolt.",
-'filepageexists'              => 'Ju Beschrieuwengssiede foar disse Doatäi wuude al moaked as <strong><tt>$1</tt></strong>, man der bestoant neen Doatäi mäd dissen Noome.
+'fileexists'                  => "Ne Doatäi mäd dissen Noome bestoant al. Wan du ap 'Doatäi spiekerje' klikst, wäd ju Doatäi uurschrieuwen. Unner '''<tt>$1</tt>''' koast du die bewisje, of du dät wuddelk wolt.",
+'filepageexists'              => "Ju Beschrieuwengssiede foar disse Doatäi wuude al moaked as '''<tt>$1</tt>''', man der bestoant neen Doatäi mäd dissen Noome.
 Ju ienroate Beschrieuwenge wäd nit ap ju Beschrieuwengssiede uurnuumen.
-Ju Beschrieuwengssiede moast du ätter dät Hoochleeden fon ju Doatäi noch mäd de Hounde beoarbaidje.',
-'fileexists-extension'        => 'Een Doatei mäd n äänelken Noome existiert al:<br />
-Noome fon ju hoochtouleedende Doatäi: <strong><tt>$1</tt></strong><br />
-Noome fon ju anweesende Doatäi: <strong><tt>$2</tt></strong><br />
-Bloot ju Doatäieendenge unnerschat sik in Groot-/Littikschrieuwenge. Pröif, of do Doatäie ätter dän Inhoold identisk sunt.',
+Ju Beschrieuwengssiede moast du ätter dät Hoochleeden fon ju Doatäi noch mäd de Hounde beoarbaidje.",
+'fileexists-extension'        => "Een Doatei mäd n äänelken Noome existiert al:<br />
+Noome fon ju hoochtouleedende Doatäi: '''<tt>$1</tt>'''<br />
+Noome fon ju anweesende Doatäi: '''<tt>$2</tt>'''<br />
+Bloot ju Doatäieendenge unnerschat sik in Groot-/Littikschrieuwenge. Pröif, of do Doatäie ätter dän Inhoold identisk sunt.",
 'fileexists-thumb'            => "<center>'''Bestoundende Doatäi'''</center>",
-'fileexists-thumbnail-yes'    => 'Bie ju Doatäi schient et sik uum ne Bielde fon ferlitjerde Grööte <i>(thumbnail)</i> tou honneljen. Pröif ju Doatäi <strong><tt>$1</tt></strong>.<br />
-Wan et sik uum ju Bielde in Originoalgrööte honnelt, dan houget neen apaate Foarschaubielde hoochleeden tou wäiden.',
-'file-thumbnail-no'           => 'Die Doatäinoome begint mäd <strong><tt>$1</tt></strong>. Dit tjut ap ne Bielde fon ferlitjerde Grööte <i>(thumbnail)</i> wai.
-Pröif, of du ju Bielde in fulle Aplöösenge foarlääsen hääst un leed ju unner dän Originoalnoome hooch. Uurs annerje dän Doatäinoome.',
-'fileexists-forbidden'        => 'Mäd dissen Noome bestoant al ne Doatäi.
-Gung jädden tourääch un leede dien Doatäi unner n uur Noome hooch. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Bie ju Doatäi schient et sik uum ne Bielde fon ferlitjerde Grööte ''(thumbnail)'' tou honneljen. Pröif ju Doatäi '''<tt>$1</tt>'''.<br />
+Wan et sik uum ju Bielde in Originoalgrööte honnelt, dan houget neen apaate Foarschaubielde hoochleeden tou wäiden.",
+'file-thumbnail-no'           => "Die Doatäinoome begint mäd '''<tt>$1</tt>'''. Dit tjut ap ne Bielde fon ferlitjerde Grööte ''(thumbnail)'' wai.
+Pröif, of du ju Bielde in fulle Aplöösenge foarlääsen hääst un leed ju unner dän Originoalnoome hooch. Uurs annerje dän Doatäinoome.",
+'fileexists-forbidden'        => 'Mäd dissen Noome bestoant al ne Doatäi un ju kon nit uurschieuwen wäide. Gung jädden tourääch un leede dien Doatäi unner n uur Noome hooch. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Mäd dissen Noome bestoant al ne Doatäi in dät zentroale Medienarchiv.
-Wan du ju Doatäi daach hoochleede moatest, gung dan tourääch un leed dien Doatäi unner n uur Noome hooch. [[Image:$1|thumb|center|$1]]',
+Wan du ju Doatäi daach hoochleede moatest, gung dan tourääch un leed dien Doatäi unner n uur Noome hooch. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Disse Doatäi is n Duplikoat fon foulgjende {{PLURAL:$1|Doatäi|$1 Doatäie}}:',
+'file-deleted-duplicate'      => 'Ne identiske Doatäi fon disse Doatäi ([[$1]]) wuud fröier läsked. Wröich dät Läsklogbouk, eer du ju hoochlatst.',
 'successfulupload'            => 'Mäd Ärfoulch hoochleeden',
 'uploadwarning'               => 'Woarschauenge',
 'savefile'                    => 'Doatäi spiekerje',
@@ -1122,8 +1265,8 @@ Wan du ju Doatäi daach hoochleede moatest, gung dan tourääch un leed dien Doa
 
 Pröif suurgfooldich, of dät fernäide Hoochleeden do Gjuchtlienjen äntspräkt.
 Tou Dien Information foulget dät Läsk-Logbouk mäd ju Begründenge foar ju foargungende Läskenge:",
-'filename-bad-prefix'         => 'Die Doatäinoome begint mäd <strong>„$1“</strong>. Dit is in algemeenen die fon ne Digitoalkamera foarroate Doatäinoome un deeruum nit gjucht uurtjuugend.
-Reek ju Doatäi n Noome, die dän Inhoold beeter beschrift.',
+'filename-bad-prefix'         => "Die Doatäinoome begint mäd '''„$1“'''. Dit is in algemeenen die fon ne Digitoalkamera foarroate Doatäinoome un deeruum nit gjucht uurtjuugend.
+Reek ju Doatäi n Noome, die dän Inhoold beeter beschrift.",
 
 'upload-proto-error'      => 'Falsk Protokol',
 'upload-proto-error-text' => 'Ju URL mout mäd <code>http://</code> of <code>ftp://</code> ounfange.',
@@ -1146,18 +1289,19 @@ Wan dät Problem fääre bestoant, informier n [[Special:ListUsers/sysop|System-
 'upload_source_url'  => ' (gultige, eepentelk tougongelke URL)',
 'upload_source_file' => ' (ne Doatäi ap Jou Computer)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Disse Spezialsiede liestet aal hoochleedene Doatäie ap. Standoardmäitich wäide do toulääst hoochleedene Doatäie toueerst anwiesd. Truch n Klik ap do Spaltenuurschrifte kon ju Sortierenge uumetroald wäide of der kon ätter ne uur Spalte sortierd wäide.',
-'imagelist_search_for'  => 'Säik ätter Doatäi:',
+# Special:ListFiles
+'listfiles-summary'     => 'Disse Spezialsiede liestet aal hoochleedene Doatäie ap. Standoardmäitich wäide do toulääst hoochleedene Doatäie toueerst anwiesd. Truch n Klik ap do Spaltenuurschrifte kon ju Sortierenge uumetroald wäide of der kon ätter ne uur Spalte sortierd wäide.',
+'listfiles_search_for'  => 'Säik ätter Doatäi:',
 'imgfile'               => 'Doatäi',
-'imagelist'             => 'Bieldelieste',
-'imagelist_date'        => 'Doatum',
-'imagelist_name'        => 'Noome',
-'imagelist_user'        => 'Benutser',
-'imagelist_size'        => 'Grööte',
-'imagelist_description' => 'Beschrieuwenge',
-
-# Image description page
+'listfiles'             => 'Bieldelieste',
+'listfiles_date'        => 'Doatum',
+'listfiles_name'        => 'Noome',
+'listfiles_user'        => 'Benutser',
+'listfiles_size'        => 'Grööte',
+'listfiles_description' => 'Beschrieuwenge',
+'listfiles_count'       => 'Versione',
+
+# File description page
 'filehist'                       => 'Doatäiversione',
 'filehist-help'                  => 'Klik ap n Tiedpunkt, uum disse Version tou leeden.',
 'filehist-deleteall'             => 'Aal do Versione läskje',
@@ -1165,16 +1309,22 @@ Wan dät Problem fääre bestoant, informier n [[Special:ListUsers/sysop|System-
 'filehist-revert'                => 'touräächsätte',
 'filehist-current'               => 'aktuäl',
 'filehist-datetime'              => 'Version fon',
+'filehist-thumb'                 => 'Foarschaubielde',
+'filehist-thumbtext'             => 'Foarschaubielde foar Version fon n $1',
+'filehist-nothumb'               => 'Neen Foarschaubielde deer',
 'filehist-user'                  => 'Benutser',
 'filehist-dimensions'            => 'Höchte un Bratte',
 'filehist-filesize'              => 'Doatäigrööte',
 'filehist-comment'               => 'Kommentoar',
-'imagelinks'                     => 'Bieldeferwiese',
+'imagelinks'                     => 'Doatäiferweendengen',
 'linkstoimage'                   => '{{PLURAL:$1|Ju foulgjende Siede ferwoant|Do foulgjende $1 Sieden ferweende}} disse Doatäi:',
+'linkstoimage-more'              => 'Moor as {{PLURAL:$1|een Siede ferlinket|$1 Sieden ferlinkje}} ap disse Doatäi.
+Ju foulgjende Lieste wiest bloot {{PLURAL:$1|dän eerste Link|do eerste $1 Linke}} ap disse Doatäi.
+Ne [[Special:WhatLinksHere/$2|fulständige Lieste]] is ferföigboar.',
 'nolinkstoimage'                 => 'Naan Artikkel benutset disse Bielde.',
 'morelinkstoimage'               => '[[Special:WhatLinksHere/$1|Wiedere Ferbiendengen]] foar disse Doatäi.',
 'redirectstofile'                => '{{PLURAL:$1|Ju foulgjende Doatäi laitet|Do foulgjende $1 Doatäie laitje}} ap disse Doatäi fääre:',
-'duplicatesoffile'               => '{{PLURAL:$1|Ju foulgjende Doatäi is n Duplikoat|Do foulgjende $1 Doatäie sunt Duplikoate}} fon disse Doatäi:',
+'duplicatesoffile'               => '{{PLURAL:$1|Ju foulgjende Doatäi is n Duplikoat|Do foulgjende $1 Doatäie sunt Duplikoate}} fon disse Doatäi ([[Special:FileDuplicateSearch/$2|wiedere Details]]):',
 'sharedupload'                   => 'Disse Doatäi is ne deelde Hoochleedenge un duur fon uur Projekte anwoand wäide.',
 'shareduploadwiki'               => 'Jädden sjuch dän $1 foar wiedere Information.',
 'shareduploadwiki-desc'          => 'Hier foulget die Inhoold fon $1 uut dät gemeensoam benutsede Repositorium.',
@@ -1201,7 +1351,7 @@ Wan dät Problem fääre bestoant, informier n [[Special:ListUsers/sysop|System-
 # File deletion
 'filedelete'                  => 'Läskje "$1"',
 'filedelete-legend'           => 'Läskje Doatäi',
-'filedelete-intro'            => "Du läskest ju Doatäi '''„[[Media:$1|$1]]“'''.",
+'filedelete-intro'            => "Du läskest ju Doatäi '''„[[Media:$1|$1]]“''' touhoope mäd hiere Versionsgeschichte.",
 'filedelete-intro-old'        => "Du läskest fon ju Doatäi '''„[[Media:$1|$1]]“''' ju [$4 Version fon $2, $3 Uur].",
 'filedelete-comment'          => 'Gruund:',
 'filedelete-submit'           => 'Läskje',
@@ -1209,7 +1359,6 @@ Wan dät Problem fääre bestoant, informier n [[Special:ListUsers/sysop|System-
 'filedelete-success-old'      => '<span class="plainlinks">Fon ju Doatäi \'\'\'„[[Media:$1|$1]]“\'\'\' wuud ju Version $2, $3 Uure läsked.</span>',
 'filedelete-nofile'           => "'''„$1“''' is nit deer.",
 'filedelete-nofile-old'       => "Et rakt neen archivierde Version fon '''$1''' mäd do spezifizierde Määrkmoale.",
-'filedelete-iscurrent'        => 'Du fersäkst, ju aktuelle Version fon disse Doatäi tou läskjen. Sät foartied ap ne allere Version tourääch.',
 'filedelete-otherreason'      => 'Uur/touföigeden Gruund:',
 'filedelete-reason-otherlist' => 'Uur Gruund',
 'filedelete-reason-dropdown'  => '* Algemeene Läskgruunde
@@ -1231,36 +1380,36 @@ Wan dät Problem fääre bestoant, informier n [[Special:ListUsers/sysop|System-
 
 # Unused templates
 'unusedtemplates'     => 'Nit benutsede Foarloagen',
-'unusedtemplatestext' => 'Disse Siede liestet aal Sieden in dän Foarloage-Noomensruum, do der nit bruukt wuuden sunt in ne uur Siede. Oachtje deerap tou pröiwjen foar uur Ferbiendengen tou do Foarloagen, eer do wächtouhoaljen.',
+'unusedtemplatestext' => 'Disse Siede liestet aal Sieden in dän {{ns:template}}-Noomensruum ap, do der nit bruukt wuuden sunt in uur Sieden. Pröif uur Ferbiendengen tou do Foarloagen, eer du do läskest.',
 'unusedtemplateswlh'  => 'Uur Ferbiendengen',
 
 # Random page
 'randompage'         => 'Toufällige Siede',
-'randompage-nopages' => 'In dissen Noomensruum sunt neen Sieden deer.',
+'randompage-nopages' => 'In dän Noomensruum "$1" sunt neen Sieden deer.',
 
 # Random redirect
 'randomredirect'         => 'Toufällige Fäärelaitenge',
-'randomredirect-nopages' => 'In dissen Noomensruum sunt neen Fääreleedengen deer.',
+'randomredirect-nopages' => 'In dän Noomensruum "$1" sunt neen Fääreleedengen deer.',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Siedenstatistik',
-'userstats'              => 'Benutserstatistik',
-'sitestatstext'          => "Dät rakt mädnunner '''$1''' {{PLURAL:$1|Siede|Sieden}} in ju Doatenboank.
-Dät slut Diskussionssieden, Sieden uur {{SITENAME}}, litje Sieden, Fäärelaitengen un uur Sieden ien,
-do der eventuell nit as Artikkele betrachted wäide konnen.
-
-Disse uutgenuumen rakt et '''$2''' {{PLURAL:$2|Siede|Sieden}}, do der as Artikkel betrachted wäide {{PLURAL:$2|kon|konnen}}.
-
-Mädnunner {{PLURAL:$8|wuude '''1''' Doatäi|wuuden '''$8''' Doatäie}} hoochleeden.
-
-Mädnunner roat et '''$3''' {{PLURAL:$3|Siedenouroup|Siedenouroupe}} un '''$4''' {{PLURAL:$4|Siedenbeoarbaidenge|Siedenbeoarbaidengen}} siet {{SITENAME}} iengjucht wuude.
-Deeruut reeke sik '''$5''' Beoarbaidengen pro Siede un '''$6''' Siedenouroupe pro Beoarbaidenge.
-
-Laangte fon ju [http://www.mediawiki.org/wiki/Manual:Job_queue „Job queue“]: '''$7'''",
-'userstatstext'          => "Dät rakt '''$1''' {{PLURAL:$1|registrierde|registrierde}} [[Special:ListUsers|Benutsere]].
-Deerfon {{PLURAL:$2|häd|hääbe}} '''$2''' {{PLURAL:$2|Benutser|Benutsere}} (=$4 %) $5-Gjuchte.",
-'statistics-mostpopular' => 'Maast besoachte Sieden',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Siedenstatistik',
+'statistics-header-edits'      => 'Beoarbaidengsstatistik',
+'statistics-header-views'      => 'Siedenaproupstatistik',
+'statistics-header-users'      => 'Benutserstatistik',
+'statistics-articles'          => 'Inhooldssieden',
+'statistics-pages'             => 'Sieden',
+'statistics-pages-desc'        => 'Aal Sieden in dissen Wiki, iensluutend Diskussionssieden, Fäärelaitengen usw.',
+'statistics-files'             => 'Hoochleedene Doatäie',
+'statistics-edits'             => 'Siedenbeoarbaidengen siet {{SITENAME}} waas ounfangd',
+'statistics-edits-average'     => 'Beoarbaidengen pro Siede in n Truchsleek',
+'statistics-views-total'       => 'Siedenaproupe mädnunner',
+'statistics-views-peredit'     => 'Siedenaproupe pro Beoarbaidenge',
+'statistics-jobqueue'          => 'Laangte fon ju [http://www.mediawiki.org/wiki/Manual:Job_queue Jobqueue]',
+'statistics-users'             => 'Registrierde [[Special:ListUsers|Benutsere]]',
+'statistics-users-active'      => 'Aktive Benutsere',
+'statistics-users-active-desc' => 'Benutsere mäd Beoarbaidengen {{PLURAL:$1|in do lääste 24 Uuren|in do fergeene $1 Deege}}',
+'statistics-mostpopular'       => 'Maast besoachte Sieden',
 
 'disambiguations'      => 'Begriepskläärengssieden',
 'disambiguationspage'  => 'Template:Begriepskläärenge',
@@ -1276,7 +1425,7 @@ Lääste schällen dan wächhoald wäide.',
 'double-redirect-fixer'      => 'RedirectBot',
 
 'brokenredirects'        => 'Ferkierde Fäärelaitengen',
-'brokenredirectstext'    => 'Disse Truchferwiese laitje tou nit existierjende Artikkel:',
+'brokenredirectstext'    => 'Disse Spezioalsiede liestet Truchferwiese ap nit existierjende Sieden:',
 'brokenredirects-edit'   => '(beoarbaidje)',
 'brokenredirects-delete' => '(läskje)',
 
@@ -1296,7 +1445,7 @@ Lääste schällen dan wächhoald wäide.',
 'nviews'                  => '{{PLURAL:$1|1 Oufroage|$1 Oufroagen}}',
 'specialpage-empty'       => 'Ju Siede änthaalt aktuell neen Iendraage.',
 'lonelypages'             => 'Ferwaisde Sieden',
-'lonelypagestext'         => 'Do foulgjende Sieden sunt nit ferlinked fon uur Sieden in {{SITENAME}}.',
+'lonelypagestext'         => 'Do foulgjende Sieden sunt nit ferlinked of ienbuunen fon uur Sieden in {{SITENAME}}.',
 'uncategorizedpages'      => 'Nit kategorisierde Sieden',
 'uncategorizedcategories' => 'Nit kategorisierde Kategorien',
 'uncategorizedimages'     => 'Nit kategorisierde Doatäie',
@@ -1306,26 +1455,30 @@ Lääste schällen dan wächhoald wäide.',
 'popularpages'            => 'Sieden do oafte bekieked wäide',
 'wantedcategories'        => 'Benutsede, man nit anlaide Kategorien',
 'wantedpages'             => 'Wonskede Sieden',
-'missingfiles'            => 'Failjende Doatäie',
+'wantedfiles'             => 'Failjende Doatäie',
+'wantedtemplates'         => 'Failjende Foarloagen',
 'mostlinked'              => 'Maast ferlinkede Sieden',
 'mostlinkedcategories'    => 'Maast benutsede Kategorien',
 'mostlinkedtemplates'     => 'Maastbenutsede Foarloagen',
 'mostcategories'          => 'Maast kategorisierde Sieden',
 'mostimages'              => 'Maast benutsede Doatäie',
 'mostrevisions'           => 'Sieden mäd do maaste Versione',
-'prefixindex'             => 'Aal Artikkele (mäd Präfix)',
+'prefixindex'             => 'Aal Sieden (mäd Präfix)',
 'shortpages'              => 'Kuute Sieden',
 'longpages'               => 'Loange Sieden',
 'deadendpages'            => 'Siede sunner Ferwiese',
 'deadendpagestext'        => 'Do foulgjende Sieden linkje nit tou uur Sieden in {{SITENAME}}.',
 'protectedpages'          => 'Schutsede Sieden',
 'protectedpages-indef'    => 'Bloot uunbeschränkt bruukte Sieden wiese',
+'protectedpages-cascade'  => 'Bloot Sieden mäd Kaskadenschuts',
 'protectedpagestext'      => 'Do foulgjende Sieden sunt beschutsed juun Ferschuuwen of Beoarbaidjen',
 'protectedpagesempty'     => 'Apstuuns sunt neen Sieden mäd disse Parametere schutsed.',
 'protectedtitles'         => 'Speerde Tittele',
 'protectedtitlestext'     => 'Do foulgjende Sieden sunt speerd uum näi tou moakjen',
 'protectedtitlesempty'    => 'Apstuuns sunt mäd do ounroate Parametere neen Sieden speerd uum näi tou moakjen.',
 'listusers'               => 'Benutser-Lieste',
+'listusers-editsonly'     => 'Wies bloot Benutsere mäd Biedraage',
+'usereditcount'           => '$1 {{PLURAL:$1|Beoarbaidenge|Beoarbaidengen}}',
 'newpages'                => 'Näie Sieden',
 'newpages-username'       => 'Benutsernoome:',
 'ancientpages'            => 'Siet loang uunbeoarbaidede Sieden',
@@ -1345,16 +1498,15 @@ Deeruum kon ju hier noch aptäld weese, wan ju uk aktiv benutsed wäd.',
 # Book sources
 'booksources'               => 'ISBN-Säike',
 'booksources-search-legend' => 'Säik ätter Steeden wier me Bouke kriege kon',
-'booksources-go'            => 'Säike',
+'booksources-go'            => 'Säike (011)',
 'booksources-text'          => 'Dit is ne Lieste mäd Ferbiendengen tou Internetsieden, do der näie un bruukte Bouke ferkoopje. Deer kon et uk wiedere Informatione uur do Bouke reeke. {{SITENAME}} is mäd neen fon disse Anbjoodere geschäftelk ferbuunen.',
+'booksources-invalid-isbn'  => 'Fermoudelk is ju ISBN uungultich. Säik ätter Failere in ju Kopie.',
 
 # Special:Log
 'specialloguserlabel'  => 'Benutser:',
 'speciallogtitlelabel' => 'Tittel:',
 'log'                  => 'Logbouke',
 'all-logs-page'        => 'Aal Logbouke',
-'log-search-legend'    => 'Logbouke truchsäike',
-'log-search-submit'    => 'Säike',
 'alllogstext'          => 'Dit is ne kombinierde Anwiesenge fon aal Logbouke fon {{SITENAME}}.
 Ju Uutgoawe kon truch ju Uutwoal fon dän Logbouktyp, fon dän Benutser of dän Siedentittel ienschränkt wäide (Groot-/Littekschrieuwen mout beoachtet wäide).',
 'logempty'             => 'Neen paasende Iendraage.',
@@ -1366,6 +1518,7 @@ Ju Uutgoawe kon truch ju Uutwoal fon dän Logbouktyp, fon dän Benutser of dän
 'nextpage'          => 'Naiste Siede ($1)',
 'prevpage'          => 'Foarige Siede ($1)',
 'allpagesfrom'      => 'Sieden wiese fon:',
+'allpagesto'        => 'Sieden anwiese bit:',
 'allarticles'       => 'Aal do Artikkele',
 'allinnamespace'    => 'Aal Sieden in $1 Noomenruum',
 'allnotinnamespace' => 'Aal Sieden, bute in dän $1 Noomenruum',
@@ -1383,41 +1536,68 @@ Ju Uutgoawe kon truch ju Uutwoal fon dän Logbouktyp, fon dän Benutser of dän
 'special-categories-sort-count' => 'Sortierenge ätter Antaal',
 'special-categories-sort-abc'   => 'Sortierenge ätter Alphabet',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Läskede Benutserbiedraage',
+
+# Special:LinkSearch
+'linksearch'       => 'Webferbiendenge-Säike',
+'linksearch-pat'   => 'Säikmuster:',
+'linksearch-ns'    => 'Noomensruum:',
+'linksearch-ok'    => 'Säike (012)',
+'linksearch-text'  => 'Disse Spezialsiede moaket ju Säike muugelke ätter Sieden, in do bestimde Webferbiendengen äntheelden sunt. Deerbie konne Wildcards as biespilswiese <tt>*.example.com</tt> benutsed wäide.<br />Unnerstutsede Protokolle: <tt>$1</tt>',
+'linksearch-line'  => '$1 is ferlinked fon $2',
+'linksearch-error' => 'Wildcards konnen bloot an dän Ounfang fon ju URL ferwoand wäide.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Wies Benutsere fon:',
 'listusers-submit'   => 'Wies',
 'listusers-noresult' => 'Naan Benutser fuunen.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Näianmäldengs-Logbouk',
+'newuserlogpagetext'          => 'Dit is dät Logbouk fon näi anmäldede Benutsere.',
+'newuserlog-byemail'          => 'dät Paaswoud wuud uur E-Mail fersoand',
+'newuserlog-create-entry'     => 'Benutser wuude näi registrierd',
+'newuserlog-create2-entry'    => 'moakede näi Benutserkonto „$1“',
+'newuserlog-autocreate-entry' => 'Benutserkonto wuud automatisk moaked',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Benutsergruppen-Gjuchte',
-'listgrouprights-summary'  => 'Dit is ne Lieste fon do in dissen Wiki definierde Benutsergruppen un do deermäd ferbuundene Gjuchte.
+'listgrouprights'                 => 'Benutsergruppen-Gjuchte',
+'listgrouprights-summary'         => 'Dit is ne Lieste fon do in dissen Wiki definierde Benutsergruppen un do deermäd ferbuundene Gjuchte.
 Informatione uurhäär uur eenpelde Gjuchte konnen [[{{MediaWiki:Listgrouprights-helppage}}|hier]] fuunen wäide.',
-'listgrouprights-group'    => 'Gruppe',
-'listgrouprights-rights'   => 'Gjuchte',
-'listgrouprights-helppage' => 'Help:Gruppengjuchte',
-'listgrouprights-members'  => '(Meegliedelieste)',
+'listgrouprights-group'           => 'Gruppe',
+'listgrouprights-rights'          => 'Gjuchte',
+'listgrouprights-helppage'        => 'Help:Gruppengjuchte',
+'listgrouprights-members'         => '(Meegliedelieste)',
+'listgrouprights-addgroup'        => 'Kon Benutser tou {{PLURAL:$2|disse Gruppe|disse Gruppen}} bietouföigje: $1',
+'listgrouprights-removegroup'     => 'Kon Benutser uut {{PLURAL:$2|disse Gruppe|disse Gruppen}} wächhoalje: $1',
+'listgrouprights-addgroup-all'    => 'Kon Benutser tou aal Gruppen bietouföigje',
+'listgrouprights-removegroup-all' => 'Kon Benutser uut aal Gruppen wächhoalje',
 
 # E-mail user
-'mailnologin'     => 'Du bäst nit anmälded.',
-'mailnologintext' => 'Du moast [[Special:UserLogin|anmälded weese]] un sälwen ne [[Special:Preferences|gultige E-Mail-Adrässe]] anroat hääbe, uum uur Benutsere ne E-Mail tou seenden.',
-'emailuser'       => 'Seende E-Mail an dissen Benutser',
-'emailpage'       => 'E-mail an Benutser',
-'emailpagetext'   => 'Du koast dän Benutser mäd dän unner stoundene Formular ne E-Mail seende.
+'mailnologin'      => 'Du bäst nit anmälded.',
+'mailnologintext'  => 'Du moast [[Special:UserLogin|anmälded weese]] un sälwen ne [[Special:Preferences|gultige E-Mail-Adrässe]] anroat hääbe, uum uur Benutsere ne E-Mail tou seenden.',
+'emailuser'        => 'Seende E-Mail an dissen Benutser',
+'emailpage'        => 'E-mail an Benutser',
+'emailpagetext'    => 'Du koast dän Benutser mäd dän unner stoundene Formular ne E-Mail seende.
 As Ouseender wäd ju E-Mail-Adresse uut dien [[Special:Preferences|Ienstaalengen]] iendrain, deermäd die Benutser die oantwoudje kon.',
-'usermailererror' => 'Dät Mail-Objekt roat n Failer tourääch:',
-'defemailsubject' => '{{SITENAME}}-E-Mail',
-'noemailtitle'    => 'Neen Email-Adrässe',
-'noemailtext'     => 'Disse Benutser häd neen gultige Email-Adrässe anroat of moate neen E-Mail fon uur Benutsere ämpfange.',
-'emailfrom'       => 'Fon:',
-'emailto'         => 'An:',
-'emailsubject'    => 'Beträf:',
-'emailmessage'    => 'Ättergjucht:',
-'emailsend'       => 'Seende',
-'emailccme'       => 'Seend ne Kopie fon ju E-Mail an mie',
-'emailccsubject'  => 'Kopie fon dien Ättergjucht an $1: $2',
-'emailsent'       => 'Begjucht fersoand',
-'emailsenttext'   => 'Jou Begjucht is soand wuuden.',
-'emailuserfooter' => 'Disse E-Mail wuude fon „Benutzer:$1“ an „Benutzer:$2“ mäd Hälpe fon ju „E-Mail an dissen Benutser“-Funktion fon {{SITENAME}} fersoand.',
+'usermailererror'  => 'Dät Mail-Objekt roat n Failer tourääch:',
+'defemailsubject'  => '{{SITENAME}}-E-Mail',
+'noemailtitle'     => 'Neen Email-Adrässe',
+'noemailtext'      => 'Dissen Benutser häd neen gultige Email-Adrässe anroat.',
+'nowikiemailtitle' => 'E-Mail-Ferseendenge nit muugelk',
+'nowikiemailtext'  => 'Dissen Benutser moate neen E-Mails fon uur Benutsere kriege.',
+'email-legend'     => 'E-Mail an n uur {{SITENAME}}-Benutser seende',
+'emailfrom'        => 'Fon:',
+'emailto'          => 'An:',
+'emailsubject'     => 'Beträf:',
+'emailmessage'     => 'Ättergjucht:',
+'emailsend'        => 'Seende',
+'emailccme'        => 'Seend ne Kopie fon ju E-Mail an mie',
+'emailccsubject'   => 'Kopie fon dien Ättergjucht an $1: $2',
+'emailsent'        => 'Begjucht fersoand',
+'emailsenttext'    => 'Jou Begjucht is soand wuuden.',
+'emailuserfooter'  => 'Disse E-Mail wuude fon „Benutzer:$1“ an „Benutzer:$2“ mäd Hälpe fon ju „E-Mail an dissen Benutser“-Funktion fon {{SITENAME}} fersoand.',
 
 # Watchlist
 'watchlist'            => 'Beooboachtengslieste',
@@ -1451,12 +1631,7 @@ Wan du die Artikkel wier fon ju Foulgelieste ou hoalje moatest, klik ap ju Siede
 'iteminvalidname'      => "Problem mäd dän Iendraach '$1', ungultige Noome...",
 'wlnote'               => "Hier {{PLURAL:$1|foulget do lääste Annerenge|foulgje do lääste '''$1''' Annerengen}} fon do lääste {{PLURAL:$2|Uur|'''$2''' Uuren}}.",
 'wlshowlast'           => 'Wies do lääste $1 Uuren, $2 Deege, of $3 (in do lääste 30 Deege).',
-'watchlist-show-bots'  => 'Bot-Annerengen ienbländje',
-'watchlist-hide-bots'  => 'Bot-Annerengen ferbierge',
-'watchlist-show-own'   => 'oaine Annerengen ienbländje',
-'watchlist-hide-own'   => 'oaine Annerengen ferbierge',
-'watchlist-show-minor' => 'litje Annerengen ienbländje',
-'watchlist-hide-minor' => 'litje Annerengen ferbierge',
+'watchlist-options'    => 'Anwiesoptione',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Beooboachtje …',
@@ -1496,55 +1671,61 @@ Jou Beooboachtengslieste
 Hälpe tou ju Benutsenge rakt
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Siede läskje',
-'confirm'                     => 'Bestäätigje',
-'excontent'                   => "Oolde Inhoold: '$1'",
-'excontentauthor'             => "Inhoold waas: '$1' (eensige Benutser: '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "Inhoold foar dät Loosmoakjen fon de Siede: '$1'",
-'exblank'                     => 'Siede waas loos',
-'delete-confirm'              => 'Läskjen fon „$1“',
-'delete-legend'               => 'Läskje',
-'historywarning'              => 'WOARSCHAUENGE: Ju Siede, ju du läskje moatest, häd ne Versionsgeschichte: &nbsp;',
-'confirmdeletetext'           => 'Jie sunt deerbie, n Artikkel of ne Bielde un aal allere Versione foar altied uut dän Doatenboank tou läskjen. Bitte bestäätigje Jie Jou Apsicht, dät tou dwoon, dät Jie Jou do Konsekwänsen bewust sunt, un dät Jie in Uureenstämmenge mäd uus [[{{MediaWiki:Policy-url}}]] honnelje.',
-'actioncomplete'              => 'Aktion be-eended',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" wuude läsked.
+# Delete
+'deletepage'             => 'Siede läskje',
+'confirm'                => 'Bestäätigje',
+'excontent'              => "Oolde Inhoold: '$1'",
+'excontentauthor'        => "Inhoold waas: '$1' (eensige Benutser: '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "Inhoold foar dät Loosmoakjen fon de Siede: '$1'",
+'exblank'                => 'Siede waas loos',
+'delete-confirm'         => 'Läskjen fon „$1“',
+'delete-legend'          => 'Läskje',
+'historywarning'         => 'WOARSCHAUENGE: Ju Siede, ju du läskje moatest, häd ne Versionsgeschichte: &nbsp;',
+'confirmdeletetext'      => 'Jie sunt deerbie, n Artikkel of ne Bielde un aal allere Versione foar altied uut dän Doatenboank tou läskjen. Bitte bestäätigje Jie Jou Apsicht, dät tou dwoon, dät Jie Jou do Konsekwänsen bewust sunt, un dät Jie in Uureenstämmenge mäd uus [[{{MediaWiki:Policy-url}}]] honnelje.',
+'actioncomplete'         => 'Aktion be-eended',
+'deletedtext'            => '"<nowiki>$1</nowiki>" wuude läsked.
 In $2 fiende Jie ne Lieste fon do lääste Läskengen.',
-'deletedarticle'              => '"$1" wuude läsked',
-'suppressedarticle'           => 'feranderde ju Sichtboarhaid fon „[[$1]]“',
-'dellogpage'                  => 'Läsk-Logbouk',
-'dellogpagetext'              => 'Hier is ne Lieste fon do lääste Läskengen.',
-'deletionlog'                 => 'Läsk-Logbouk',
-'reverted'                    => 'Ap ne oolde Version touräächsät',
-'deletecomment'               => 'Gruund foar ju Läskenge:',
-'deleteotherreason'           => 'Uur/additionoalen Gruund:',
-'deletereasonotherlist'       => 'Uur Gruund',
-'deletereason-dropdown'       => '* Algemeene Läskgruunde
+'deletedarticle'         => '"$1" wuude läsked',
+'suppressedarticle'      => 'feranderde ju Sichtboarhaid fon „[[$1]]“',
+'dellogpage'             => 'Läsk-Logbouk',
+'dellogpagetext'         => 'Hier is ne Lieste fon do lääste Läskengen.',
+'deletionlog'            => 'Läsk-Logbouk',
+'reverted'               => 'Ap ne oolde Version touräächsät',
+'deletecomment'          => 'Gruund foar ju Läskenge:',
+'deleteotherreason'      => 'Uur/additionoalen Gruund:',
+'deletereasonotherlist'  => 'Uur Gruund',
+'deletereason-dropdown'  => '* Algemeene Läskgruunde
 ** Wonsk fon dän Autor
 ** Urhebergjuchtsferlätsenge
 ** Vandalismus',
-'delete-edit-reasonlist'      => 'Läskgruunde beoarbaidje',
-'delete-toobig'               => 'Disse Siede häd mäd moor as $1 {{PLURAL:$1|Version|Versionen}} ne gjucht loange Versionsgeschichte. Dät Läskjen fon sukke Sieden wuud ienschränkt, uum ne toufällige Uurlastenge fon {{SITENAME}} tou ferhinnerjen.',
-'delete-warning-toobig'       => 'Disse Siede häd mäd moor as $1 {{PLURAL:$1|Version|Versione}} ne gjucht loange Versionsgeschichte. Dät Läskjen kon tou Stöörengen in {{SITENAME}} fiere.',
-'rollback'                    => 'Touräächsätten fon do Annerengen',
-'rollback_short'              => 'Touräächsätte',
-'rollbacklink'                => 'touräächsätte',
-'rollbackfailed'              => 'Touräächsätten misglukked',
-'cantrollback'                => 'Disse Annerenge kon nit touräächstoald wäide; deer et naan fröieren Autor rakt.',
-'alreadyrolled'               => 'Dät Touräächsätten fon do Annerengen fon [[User:$2|$2]] ([[User talk:$2|Diskussion]], [[Special:Contributions/$2|{{int:contribslink}}]]) an Siede [[:$1]] hied naan Ärfoulch, deer in ju Twiskentied al n uur Benutser Annerengen an disse Siede foarnuumen häd.
-
-Ju lääste Annerenge stamt fon [[User:$3|$3]] ([[User talk:$3|Diskussion]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Ju Annerengskommentoar waas: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Tounichte moakede Beoarbaidengen fon [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) tou ju lääste Version fon [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Do Annerengen fon $1 wuuden tourääch annerd un ju lääste Version fon $2 wuude wier moaked.',
-'sessionfailure'              => 'Dät roat n Problem mäd ju Uurdreegenge fon dien Benutserdoaten. Disse Aktion wuude deeruum sicherheidshoolwe oubreeken, uum ne falske Touoardnenge fon dien Annerengen tou n uur Benutser tou ferhinnerjen. Gung jädden tourääch un fersäik dän Foargong fonnäien uuttoufieren.',
+'delete-edit-reasonlist' => 'Läskgruunde beoarbaidje',
+'delete-toobig'          => 'Disse Siede häd mäd moor as $1 {{PLURAL:$1|Version|Versionen}} ne gjucht loange Versionsgeschichte. Dät Läskjen fon sukke Sieden wuud ienschränkt, uum ne toufällige Uurlastenge fon {{SITENAME}} tou ferhinnerjen.',
+'delete-warning-toobig'  => 'Disse Siede häd mäd moor as $1 {{PLURAL:$1|Version|Versione}} ne gjucht loange Versionsgeschichte. Dät Läskjen kon tou Stöörengen in {{SITENAME}} fiere.',
+
+# Rollback
+'rollback'         => 'Touräächsätten fon do Annerengen',
+'rollback_short'   => 'Touräächsätte',
+'rollbacklink'     => 'touräächsätte',
+'rollbackfailed'   => 'Touräächsätten misglukked',
+'cantrollback'     => 'Disse Annerenge kon nit touräächstoald wäide; deer et naan fröieren Autor rakt.',
+'alreadyrolled'    => 'Dät Touräächsätten fon do Annerengen fon [[User:$2|$2]] ([[User talk:$2|Diskussion]], [[Special:Contributions/$2|{{int:contribslink}}]]) an Siede [[:$1]] hied naan Ärfoulch, deer in ju Twiskentied al n uur Benutser Annerengen an disse Siede foarnuumen häd.
+
+Ju lääste Annerenge stamt fon [[User:$3|$3]] ([[User talk:$3|Diskussion]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Ju Annerengs-Touhoopefoatenge waas: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Tounichte moakede Beoarbaidengen fon [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) tou ju lääste Version fon [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Do Annerengen fon $1 wuuden tourääch annerd un ju lääste Version fon $2 wuude wier moaked.',
+'sessionfailure'   => 'Dät roat n Problem mäd ju Uurdreegenge fon dien Benutserdoaten. Disse Aktion wuude deeruum sicherheidshoolwe oubreeken, uum ne falske Touoardnenge fon dien Annerengen tou n uur Benutser tou ferhinnerjen. Gung jädden tourääch un fersäik dän Foargong fonnäien uuttoufieren.',
+
+# Protect
 'protectlogpage'              => 'Siedenschuts-Logbouk',
 'protectlogtext'              => 'Dit is ne Lieste fon do blokkierde Sieden.
 Sjuch [[Special:ProtectedPages|Schutsede Siede]] foar moor Informatione.',
 'protectedarticle'            => 'schutsede „[[$1]]“',
 'modifiedarticleprotection'   => 'annerde dän Schuts fon „[[$1]]“',
 'unprotectedarticle'          => 'hieuwede dän Schuts fon "[[$1]]" ap',
+'movedarticleprotection'      => 'ferschoof do Siedenschutsienstaalengen fon „[[$2]]“ ätter „[[$1]]“',
 'protect-title'               => 'Schuts annerje fon „$1“',
+'prot_1movedto2'              => 'häd "[[$1]]" ätter "[[$2]]" ferschäuwen',
 'protect-legend'              => 'Siedenschutsstoatus annerje',
 'protectcomment'              => 'Gruund:',
 'protectexpiry'               => 'Speerduur:',
@@ -1552,18 +1733,31 @@ Sjuch [[Special:ProtectedPages|Schutsede Siede]] foar moor Informatione.',
 'protect_expiry_old'          => 'Ju Speertied lait in ju fergeene Tied.',
 'protect-unchain'             => 'Ferschuuweschuts annerje',
 'protect-text'                => "Hier koast du dän Schutsstoatus foar ju Siede '''<nowiki>$1</nowiki>''' ienkiekje un annerje.",
-'protect-locked-blocked'      => 'Du koast dän Siedenschuts nit annerje, deer dien Benutserkonto speerd is. Hier sunt do aktuelle Siedenschuts-Ienstaalengen foar ju Siede <strong>„$1“:</strong>',
-'protect-locked-dblock'       => 'Ju Doatenboank is speerd, die Siedenschuts kon deeruum nit annerd wäide. Hier sunt do aktuelle Siedenschuts-Ienstaalengen foar ju Siede <strong>„$1“:</strong>',
-'protect-locked-access'       => 'Du bäst nit begjuchtiged, dän Siedenschutsstoatus tou annerjen. Hier is die aktuälle Schutsstoatus fon ju Siede <strong>$1</strong>:',
+'protect-locked-blocked'      => "Du koast dän Siedenschuts nit annerje, deer dien Benutserkonto speerd is. Hier sunt do aktuelle Siedenschuts-Ienstaalengen foar ju Siede '''„$1“:'''",
+'protect-locked-dblock'       => "Ju Doatenboank is speerd, die Siedenschuts kon deeruum nit annerd wäide. Hier sunt do aktuelle Siedenschuts-Ienstaalengen foar ju Siede '''„$1“:'''",
+'protect-locked-access'       => "Du bäst nit begjuchtiged, dän Siedenschutsstoatus tou annerjen. Hier is die aktuälle Schutsstoatus fon ju Siede '''$1''':",
 'protect-cascadeon'           => 'Disse Siede is apstuuns Deel fon ne Kaskadenspeere. Ju is in {{PLURAL:$1|ju foulgjende Siede|do foulgjende Sieden}} ienbuunen, do der truch ju Kaskadenspeerroption schutsed {{PLURAL:$1|is|sunt}}. Die Siedenschutsstoatus kon foar disse Siede annerd wäide, man dät häd naan Ienfloud ap ju Kaskadenspeere:',
-'protect-default'             => 'Aal (Standoard)',
+'protect-default'             => 'Aal Benutsere',
 'protect-fallback'            => 'Deer wäd ju „$1“-Begjuchtigenge benöödigd.',
-'protect-level-autoconfirmed' => 'Speerenge foar nit registrierde Benutsere',
+'protect-level-autoconfirmed' => 'Speerenge foar näie un nit registrierde Benutsere',
 'protect-level-sysop'         => 'Bloot Administration',
 'protect-summary-cascade'     => 'kaskadierjend',
 'protect-expiring'            => 'bit $1 (UTC)',
+'protect-expiry-indefinite'   => 'uunbeschränkt',
 'protect-cascade'             => 'Kaskadierjende Speere – aal in disse Siede ienbuundene Foarloagen wäide ieuwenfals speerd.',
 'protect-cantedit'            => 'Du koast ju Speere fon disse Siede nit annerje, deer du neen Begjuchtigenge toun Beoarbaidjen fon ju Siede hääst.',
+'protect-othertime'           => 'Uur Speerduur:',
+'protect-othertime-op'        => 'uur Speerduur',
+'protect-existing-expiry'     => 'Aktuel Siedenschutseende: $2, $3 Uure',
+'protect-otherreason'         => 'Uur/touföigeden Gruund:',
+'protect-otherreason-op'      => 'uur/bietoukuumenden Gruund',
+'protect-dropdown'            => '*Algemeene Schutsgruunde
+** Weblink-Spam
+** Editwar
+** Oafte ienbuundene Foarloage
+** Siede mäd hooge Besäikertaal',
+'protect-edit-reasonlist'     => 'Schutsgruunde beoarbaidje',
+'protect-expiry-options'      => '1 Uure:1 hour,2 Uuren:2 hours,6 Uuren:6 hours,1 Dai:1 day,3 Deege:3 days,1 Wiek:1 week,2 Wieke:2 weeks,1 Mound:1 month,3 Mounde:3 months,1 Jier:1 year,Uunbestimd:indefinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Schutsstoatus',
 'restriction-level'           => 'Schutshöchte',
 'minimum-size'                => 'Minstgrööte',
@@ -1586,7 +1780,7 @@ Sjuch [[Special:ProtectedPages|Schutsede Siede]] foar moor Informatione.',
 'undeletepage'                 => 'Läskede Siede wier häärstaale',
 'undeletepagetitle'            => "'''Ju foulgjende Uutgoawe wiest do läskede Versione fon [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Läskede Versione anwiese',
-'undeletepagetext'             => 'Do foulgjende Sieden wuuden läsked, man sunt altied noch spiekerd un konnen fon Administratore wier häärstoald wäide:',
+'undeletepagetext'             => '{{PLURAL:$1|Ju foulgjende Siede wuud läsked un kon|Do foulgjende $1 Sieden wuuden läsked un konnen}} fon Administratore wier häärstoald wäide:',
 'undelete-fieldset-title'      => 'Beoarbaidengen wier häärstaale',
 'undeleteextrahelp'            => "Uum ju Siede gans mäd aal Versione wiertoumoakjen, wääl neen Versione uut, reek ne Begruundenge an un klik ap '''''Wier moakje'''''.
 * Moatest du bloot bestimde Versione wier moakje, so wääl do jädden eenpeld anhound fon do Markierengen uut, reek ne Begruundenge an un klik dan ap '''''Wier moakje'''''.
@@ -1598,12 +1792,13 @@ In dissen Fal duur ju aktuelste Version nit markierd wäide of sichtboar moaked
 'undeletehistorynoadmin'       => 'Disse Siede wuude läsked. Die Gruund foar ju Läskenge is in ju Touhoopefoatenge ounroat,
 juust as Details tou dän lääste Benutser, die der disse Siede foar ju Läskenge beoarbaided häd.
 Die aktuelle Text fon ju läskede Siede is bloot Administratore tougongelk.',
-'undelete-revision'            => 'Läskede Versione fon $1 - $2, $3:',
+'undelete-revision'            => 'Läskede Version fon $1 (fon dän $4 uum $5 Uure), $3:',
 'undeleterevision-missing'     => 'Uungultige of failjende Version. Äntweeder is ju Ferbiendenge falsk of ju Version wuude uut dät Archiv wier moaked of wächhoald.',
 'undelete-nodiff'              => 'Neen foargungende Version fuunen.',
 'undeletebtn'                  => 'Wier häärstaale',
 'undeletelink'                 => 'wier häärstaale',
 'undeletereset'                => 'Oubreeke',
+'undeleteinvert'               => 'Uutwoal uumekiere',
 'undeletecomment'              => 'Gruund:',
 'undeletedarticle'             => 'häd "[[$1]]" wier häärstoald',
 'undeletedrevisions'           => '{{PLURAL:$1|1 Version wuude|$1 Versione wuuden}} wier häärstoald',
@@ -1616,7 +1811,7 @@ In dät [[Special:Log/delete|Läsk-Logbouk]] finst du ne Uursicht fon do läsked
 'undelete-header'              => 'Sjuch dät [[Special:Log/delete|Läsk-Logbouk]] foar knu läskede Sieden.',
 'undelete-search-box'          => 'Säik ätter läskede Sieden',
 'undelete-search-prefix'       => 'Säikbegriep (Woudounfang sunner Wildcards):',
-'undelete-search-submit'       => 'Säike',
+'undelete-search-submit'       => 'Säike (013)',
 'undelete-no-results'          => 'Der wuude in dät Archiv neen tou dän Säikbegriep paasjende Siede fuunen.',
 'undelete-filename-mismatch'   => 'Ju Doatäiversion mäd dän Tiedstämpel $1 kuude nit wier moaked wäide: Do Doatäinoomen paasje nit tounonner.',
 'undelete-bad-store-key'       => 'Ju Doatäiversion mäd dän Tiedstämpel $1 kuude nit wier moaked wäide: Ju Doatäi waas al foar dät Läskjen nit moor deer.',
@@ -1626,6 +1821,8 @@ In dät [[Special:Log/delete|Läsk-Logbouk]] finst du ne Uursicht fon do läsked
 'undelete-error-long'          => 'Der wuuden Failere bie dät wier moakjen fon ne Doatäi fääststoald:
 
 $1',
+'undelete-show-file-confirm'   => 'Bäst du sicher, dät du ne läskede Version fon ju Doatäi „<nowiki>$1</nowiki>“ fon n $2, $3 Uure sjo wolt?',
+'undelete-show-file-submit'    => 'Jee',
 
 # Namespace form on various pages
 'namespace'      => 'Noomensruum:',
@@ -1633,26 +1830,27 @@ $1',
 'blanknamespace' => '(Sieden)',
 
 # Contributions
-'contributions' => 'Benutserbiedraage',
-'mycontris'     => 'Oaine Biedraage',
-'contribsub2'   => 'Foar $1 ($2)',
-'nocontribs'    => 'Deer wuuden neen Annerengen foar disse Kriterien fuunen.',
-'uctop'         => '(aktuäl)',
-'month'         => 'un Mound:',
-'year'          => 'bit Jier:',
-
-'sp-contributions-newbies'     => 'Wies bloot Biedraage fon näie Benutsere',
-'sp-contributions-newbies-sub' => 'Foar Näilinge',
-'sp-contributions-blocklog'    => 'Speerlogbouk',
-'sp-contributions-search'      => 'Säike ätter Benutserbiedraage',
-'sp-contributions-username'    => 'IP-Adrässe af Benutsernoome:',
-'sp-contributions-submit'      => 'Säike',
+'contributions'       => 'Benutserbiedraage',
+'contributions-title' => 'Benutserbiedraage fon „$1“',
+'mycontris'           => 'Oaine Biedraage',
+'contribsub2'         => 'Foar $1 ($2)',
+'nocontribs'          => 'Deer wuuden neen Annerengen foar disse Kriterien fuunen.',
+'uctop'               => '(aktuäl)',
+'month'               => 'un Mound:',
+'year'                => 'bit Jier:',
+
+'sp-contributions-newbies'       => 'Wies bloot Biedraage fon näie Benutsere',
+'sp-contributions-newbies-sub'   => 'Foar Näilinge',
+'sp-contributions-newbies-title' => 'Benutserbiedraage fon näie Benutsere',
+'sp-contributions-blocklog'      => 'Speerlogbouk',
+'sp-contributions-search'        => 'Säike ätter Benutserbiedraage',
+'sp-contributions-username'      => 'IP-Adrässe af Benutsernoome:',
+'sp-contributions-submit'        => 'Säike (014)',
 
 # What links here
 'whatlinkshere'            => 'Links ap disse Siede',
 'whatlinkshere-title'      => 'Sieden, do der ap "$1" linkje',
 'whatlinkshere-page'       => 'Siede:',
-'linklistsub'              => '(Linklieste)',
 'linkshere'                => "Do foulgjende Sieden ferwiese hierhäär:  '''[[:$1]]''': <br /><small>(Moonige Sieden wäide eventuell moorfooldich liested, konnen in säildene Falle oawers uk miste. Dät kumt fon oolde Failere in dän Software häär, man schoadet fääre niks.)</small>",
 'nolinkshere'              => "Naan Artikkel ferwiest hierhäär: '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Neen Siede ferlinket ap '''„[[:$1]]“''' in dän wäälde Noomensruum.",
@@ -1700,6 +1898,8 @@ Reek dän Gruund foar ju Speere oun.',
 'ipbotherreason'                  => 'Uur/additionelle Begründenge:',
 'ipbhidename'                     => 'Benutsernoome in dät Speer-Logbouk, in ju Lieste fon aktive Speeren un in dät Benutserferteeknis ferstopje.',
 'ipbwatchuser'                    => 'Benutser(diskussions)siede beooboachtje',
+'ipballowusertalk'                => 'Benutser duur oaine Diskussionssieden unner sien Speere beoarbaidje',
+'ipb-change-block'                => 'Speere mäd disse Speerparametere fernäierje',
 'badipaddress'                    => 'Dissen Benutser bestoant nit, d.h. die Noome is falsk',
 'blockipsuccesssub'               => 'Blokkoade geloangen',
 'blockipsuccesstext'              => 'Ju IP-Adrässe [[Special:Contributions/$1|$1]] wuude blokkierd.
@@ -1707,17 +1907,21 @@ Reek dän Gruund foar ju Speere oun.',
 'ipb-edit-dropdown'               => 'Speergruunde beoarbaidje',
 'ipb-unblock-addr'                => '"$1" fräireeke',
 'ipb-unblock'                     => 'IP-Adrässe/Benutser fräireeke',
-'ipb-blocklist-addr'              => 'Aktuelle Speere foar „$1“ anwiese',
+'ipb-blocklist-addr'              => 'Aktuelle Speeren foar $1',
 'ipb-blocklist'                   => 'Aal aktuelle Speeren anwiese',
+'ipb-blocklist-contribs'          => 'Benutserbiedreege foar „$1“',
 'unblockip'                       => 'IP-Adrässe fräireeke',
 'unblockiptext'                   => 'Benutsje dät Formular, uum ne blokkierde IP-Adrässe fräitoureeken.',
-'ipusubmit'                       => 'Disse Adrässe fräireeke',
+'ipusubmit'                       => 'Disse Speerenge wächhoalje',
 'unblocked'                       => '[[User:$1|$1]] wuude fräiroat',
 'unblocked-id'                    => 'Speer-ID $1 wuude fräiroat',
 'ipblocklist'                     => 'Speerde IP-Adrässen un Benutsernoomen',
 'ipblocklist-legend'              => 'Säik ätter n speerden Benutser',
 'ipblocklist-username'            => 'Benutsernoome of IP-Adrässe:',
-'ipblocklist-submit'              => 'Säike',
+'ipblocklist-sh-userblocks'       => '$1 Benutserspeeren',
+'ipblocklist-sh-tempblocks'       => '$1 tiedwiese Speeren',
+'ipblocklist-sh-addressblocks'    => '$1 IP-Speeren',
+'ipblocklist-submit'              => 'Säike (015)',
 'blocklistline'                   => '$1, $2 blokkierde $3 ($4)',
 'infiniteblock'                   => 'uunbegränsed',
 'expiringblock'                   => '$1',
@@ -1725,25 +1929,32 @@ Reek dän Gruund foar ju Speere oun.',
 'noautoblockblock'                => 'Autoblock deaktivierd',
 'createaccountblock'              => 'Dät Moakjen fon Benutserkonten speerd',
 'emailblock'                      => 'E-Mail-Fersoand speerd',
+'blocklist-nousertalk'            => 'duur oaine Diskussionssiede nit beoarbaidje',
 'ipblocklist-empty'               => 'Ju Lieste änthaalt neen Iendraage.',
 'ipblocklist-no-results'          => 'Ju soachte IP-Adresse/die Benutsernoome is nit speerd.',
 'blocklink'                       => 'blokkierje',
 'unblocklink'                     => 'fräireeke',
+'change-blocklink'                => 'Speere annerje',
 'contribslink'                    => 'Biedraage',
 'autoblocker'                     => 'Du wierst blokkierd, deer du eene IP-Adrässe mäd "[[User:$1|$1]]" benutsjen dääst. Foar ju Blokkierenge fon dän Benutser waas as Gruund anroat: "$2".',
 'blocklogpage'                    => 'Benutserblokkoaden-Logbouk',
+'blocklog-fulllog'                => 'Fulboodich Benutserspeer-Logbouk',
 'blocklogentry'                   => '[[$1]] blokkierd foar n Tiedruum fon: $2 $3',
+'reblock-logentry'                => 'annerde ju Speere foar „[[$1]]“ foar dän Tiedruum: $2 $3',
 'blocklogtext'                    => 'Dit is n Logbouk fon Speerengen un Äntspeerengen fon Benutsere. Ju Sunnersiede fiert aal aktuäl speerde Benutsere ap, iensluutend automatisk blokkierde IP-Adrässe.',
 'unblocklogentry'                 => 'Blokkade fon $1 aphieuwed',
 'block-log-flags-anononly'        => 'bloot Anonyme',
 'block-log-flags-nocreate'        => 'Dät Moakjen fon Benutserkonten speerd',
 'block-log-flags-noautoblock'     => 'Autoblock deaktivierd',
 'block-log-flags-noemail'         => 'E-Mail-Fersoand speerd',
+'block-log-flags-nousertalk'      => 'duur oaine Diskussionssiede nit beoarbaidje',
 'block-log-flags-angry-autoblock' => 'ärwiederden Autoblock aktivierd',
 'range_block_disabled'            => 'Ju Muugelkaid, ganse Adräsruume tou speeren, is nit aktivierd.',
 'ipb_expiry_invalid'              => 'Ju anroate Oulooptied is nit gultich.',
 'ipb_expiry_temp'                 => 'Ferstatte Benutsernoomen-Speeren schällen permanent weese.',
 'ipb_already_blocked'             => '„$1“ wuude al speerd.',
+'ipb-needreblock'                 => '== Speere is al deer ==
+„$1“ is al speerd. Moatest du do Speerparametere annerje?',
 'ipb_cant_unblock'                => 'Failer: Speer-ID $1 nit fuunen. Ju Speere wuude al aphieuwed.',
 'ipb_blocked_as_range'            => 'Failer: Ju IP-Adresse $1 wuude as Deel fon ju Beräksspeere $2 indirekt speerd. Ne Äntspeerenge fon $1 alleene is nit muugelk.',
 'ip_range_invalid'                => 'Uungultige IP-Adräsberäk.',
@@ -1754,6 +1965,7 @@ Reek dän Gruund foar ju Speere oun.',
 'proxyblocksuccess'               => 'Kloor.',
 'sorbsreason'                     => 'Dien IP-Adrässe is in ju DNSBL fon {{SITENAME}} as eepene PROXY liested.',
 'sorbs_create_account_reason'     => 'Dien IP-Adrässe is in ju DNSBL fon {{SITENAME}} as eepene PROXY liested. Du koast neen Benutser-Account anlääse.',
+'cant-block-while-blocked'        => 'Du duurst neen uur Benutsere speere, wan du sälwen speerd bäst.',
 
 # Developer tools
 'lockdb'              => 'Doatenboank speere',
@@ -1774,9 +1986,9 @@ Reek jädden [[Special:UnlockDB|ju Doatenboank wier fräi]], so gau ju Fersuurge
 'databasenotlocked'   => 'Ju Doatenboank is nit speerd.',
 
 # Move page
-'move-page'               => 'Ferschuuwe „$1“',
-'move-page-legend'        => 'Siede ferschuuwe',
-'movepagetext'            => "Mäd dissen Formular koast du ne Siede tou n uur Noome ferschuuwe (touhoope mäd aal Versione).
+'move-page'                    => 'Ferschuuwe „$1“',
+'move-page-legend'             => 'Siede ferschuuwe',
+'movepagetext'                 => "Mäd dissen Formular koast du ne Siede tou n uur Noome ferschuuwe (touhoope mäd aal Versione).
 Foar dän oolde Noome wäd ne Fäärelaitenge tou dän Näie iengjucht.
 Du koast Fäärelaitengen, do ap dän Originoaltittel ferlinkje, automatisk korrigierje läite.
 Fals du dit nit dääst, pröif ap [[Special:DoubleRedirects|dubbelde]] of [[Special:BrokenRedirects|defekte Fäärelaitengen]]. 
@@ -1787,48 +1999,61 @@ Beoachtje, dät ju Siede '''nit''' ferschäuwen wäd, wan dät al ne Siede mäd
 '''WOARSCHAUENGE!'''
 Dit kon ne drastiske un uunferwachtede Ferannerenge reeke foar ne beljoowede Siede;
 wääs die deeruum sicher, dät du do Konsequenzen deerfon iensjuchst, eer du fääre moakest.",
-'movepagetalktext'        => "Ju touheerige Diskussionssiede wäd, sofier deer, mee ferschäuwen, '''of dät moast weese dät'''
+'movepagetalktext'             => "Ju touheerige Diskussionssiede wäd, sofier deer, mee ferschäuwen, '''of dät moast weese dät'''
 * der bestoant al n Diskussionssiede mäd dän näie Noome
 * du wäälst ju unnerstoundene Option ou.
 
 In disse Falle moast du ju Siede, wan wonsked, fon Hounde ferschuuwe. Jädden dän '''näie''' Tittel unner '''Siel''' iendreege, deerunner ju Uumnaamenge jädden '''begründje'''.",
-'movearticle'             => 'Siede ferschuuwe:',
-'movenotallowed'          => 'Du hääst neen Begjuchtigenge, Sieden tou ferschuuwen.',
-'newtitle'                => 'Tou dän näie Tittel:',
-'move-watch'              => 'Disse Siede beooboachtje',
-'movepagebtn'             => 'Siede ferschuuwe',
-'pagemovedsub'            => 'Ferschuuwenge mäd Ärfoulch',
-'movepage-moved'          => "<big>'''Ju Siede „$1“ wuude ätter „$2“ ferschäuwen.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Dät rakt al n Siede mäd disse Noome, of uurs is die Noome dän du anroat hääst, nit toulät.
+'movearticle'                  => 'Siede ferschuuwe:',
+'movenologin'                  => 'Du bäst nit anmälded',
+'movenologintext'              => 'Du moast n registrierden Benutser un [[Special:UserLogin|anmälded]] weese, uum ne Siede ferschuuwe tou konnen.',
+'movenotallowed'               => 'Du hääst neen Begjuchtigenge, Sieden tou ferschuuwen.',
+'movenotallowedfile'           => 'Du hääst neen Begjuchtigenge, Doatäie tou ferschuuwen.',
+'cant-move-user-page'          => 'Du hääst neen Begjuchtigenge, Benutserhaudsieden tou ferschuuwen.',
+'cant-move-to-user-page'       => 'Du hääst nit ju  Begjuchtigenge, Sieden ap ne Benutsersiede tou ferschuuwen (mäd Uutnoame fon Benutserunnersieden).',
+'newtitle'                     => 'Tou dän näie Tittel:',
+'move-watch'                   => 'Disse Siede beooboachtje',
+'movepagebtn'                  => 'Siede ferschuuwe',
+'pagemovedsub'                 => 'Ferschuuwenge mäd Ärfoulch',
+'movepage-moved'               => "<big>'''Ju Siede „$1“ wuude ätter „$2“ ferschäuwen.'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Der wuud ne Fäärelaitenge moaked.',
+'movepage-moved-noredirect'    => 'Dät Moakjen fon ne Fäärelaitenge wuud unnerdrukt.',
+'articleexists'                => 'Dät rakt al n Siede mäd disse Noome, of uurs is die Noome dän du anroat hääst, nit toulät.
 Fersäik jädden n uur Noome.',
-'cantmove-titleprotected' => 'Ju Ferschuuwenge kon nit truchfierd wäide, deeruum dät die Sieltittel speerd is uum tou moakjen.',
-'talkexists'              => 'Ju Siede sälwen wuude mäd Ärfoulch ferschäuwen, man ju Diskussionssiede nit, deer al een mäd dän näie Tittel bestoant. Glieke jädden do Inhoolde fon Hounde ou.',
-'movedto'                 => 'ferschäuwen ätter',
-'movetalk'                => 'Ju Diskussionssiede mee ferschuuwe, wan muugelk.',
-'move-subpages'           => 'Aal Unnersieden, fals deer, meeferschuuwe',
-'move-talk-subpages'      => 'Aal Unnersieden fon Diskussionssieden, fals deer, meeferschuuwe',
-'movepage-page-exists'    => 'Ju Siede „$1“ is al deer un kon nit automatisk uurschrieuwen wäide.',
-'movepage-page-moved'     => 'Ju Siede „$1“ wuude ätter „$2“ ferschäuwen.',
-'movepage-page-unmoved'   => 'Ju Siede „$1“ kuude nit ätter „$2“ ferschäuwen wäide.',
-'movepage-max-pages'      => 'Ju Maximoalantaal fon $1 {{PLURAL:$1|Siede|Sieden}} wuude ferschäuwen. Aal wiedere Sieden konnen nit automatisk ferschäuwen wäide.',
-'1movedto2'               => 'häd "[[$1]]" ätter "[[$2]]" ferschäuwen',
-'1movedto2_redir'         => 'häd „[[$1]]“ ätter „[[$2]]“ ferschäuwen un deerbie ne Fääreleedenge uurschrieuwen',
-'movelogpage'             => 'Ferschuuwengs-Logbouk',
-'movelogpagetext'         => 'Dit is ne Lieste fon aal ferschäuwene Sieden.',
-'movereason'              => 'Kuute Begründenge:',
-'revertmove'              => 'tourääch ferschuuwe',
-'delete_and_move'         => 'Läskje un ferschuuwe',
-'delete_and_move_text'    => '==Sielartikkel is al deer, läskje?==
+'cantmove-titleprotected'      => 'Ju Ferschuuwenge kon nit truchfierd wäide, deeruum dät die Sieltittel speerd is uum tou moakjen.',
+'talkexists'                   => 'Ju Siede sälwen wuude mäd Ärfoulch ferschäuwen, man ju Diskussionssiede nit, deer al een mäd dän näie Tittel bestoant. Glieke jädden do Inhoolde fon Hounde ou.',
+'movedto'                      => 'ferschäuwen ätter',
+'movetalk'                     => 'Ju Diskussionssiede mee ferschuuwe, wan muugelk.',
+'move-subpages'                => 'Aal Unnersieden, fals deer, meeferschuuwe',
+'move-talk-subpages'           => 'Aal Unnersieden fon Diskussionssieden, fals deer, meeferschuuwe',
+'movepage-page-exists'         => 'Ju Siede „$1“ is al deer un kon nit automatisk uurschrieuwen wäide.',
+'movepage-page-moved'          => 'Ju Siede „$1“ wuude ätter „$2“ ferschäuwen.',
+'movepage-page-unmoved'        => 'Ju Siede „$1“ kuude nit ätter „$2“ ferschäuwen wäide.',
+'movepage-max-pages'           => 'Ju Maximoalantaal fon $1 {{PLURAL:$1|Siede|Sieden}} wuude ferschäuwen. Aal wiedere Sieden konnen nit automatisk ferschäuwen wäide.',
+'1movedto2'                    => 'häd "[[$1]]" ätter "[[$2]]" ferschäuwen',
+'1movedto2_redir'              => 'häd „[[$1]]“ ätter „[[$2]]“ ferschäuwen un deerbie ne Fääreleedenge uurschrieuwen',
+'move-redirect-suppressed'     => 'Fäärelaitenge unnerdrukt',
+'movelogpage'                  => 'Ferschuuwengs-Logbouk',
+'movelogpagetext'              => 'Dit is ne Lieste fon aal ferschäuwene Sieden.',
+'movereason'                   => 'Kuute Begründenge:',
+'revertmove'                   => 'tourääch ferschuuwe',
+'delete_and_move'              => 'Läskje un ferschuuwe',
+'delete_and_move_text'         => '==Sielartikkel is al deer, läskje?==
 Die Artikkel "[[:$1]]" existiert al.
 Moatest du him foar ju Ferschuuwenge läskje?',
-'delete_and_move_confirm' => 'Jee, Sielartikkel foar ju Ferschuuwenge läskje',
-'delete_and_move_reason'  => 'Läsked uum Plats tou moakjen foar Ferschuuwenge',
-'selfmove'                => 'Uursproangs- un Sielnoome sunt gliek; ne Siede kon nit tou sik ferschäuwen wäide.',
-'immobile_namespace'      => 'Die wonskede Siedentittel is aan besunneren; ju Siede kon nit in dissen (uur) Noomensruum ferschäuwen wäide.',
-'imagenocrossnamespace'   => 'Doatäie konnen nit uut dän {{ns:file}}-Noomensruum hääruut ferschäuwen wäide',
-'imagetypemismatch'       => 'Ju näie Doatäifergratterenge is nit mäd ju oolde identisk',
-'imageinvalidfilename'    => 'Die Siel-Doatäinoome is nit gultich',
-'fix-double-redirects'    => 'Ätter dät Ferschuuwen dubbelde Fäärelaitengen aplööse',
+'delete_and_move_confirm'      => 'Jee, Sielartikkel foar ju Ferschuuwenge läskje',
+'delete_and_move_reason'       => 'Läsked uum Plats tou moakjen foar Ferschuuwenge',
+'selfmove'                     => 'Uursproangs- un Sielnoome sunt gliek; ne Siede kon nit tou sik ferschäuwen wäide.',
+'immobile-source-namespace'    => 'Sieden fon dän „$1“-Noomensruum konnen nit ferschäuwen wäide',
+'immobile-target-namespace'    => 'Sieden konnen nit in dän „$1“-Noomensruum ferschäuwen wäide',
+'immobile-target-namespace-iw' => 'Interwiki-Link is neen gultich Siel foar Siedenferschuuwengen.',
+'immobile-source-page'         => 'Disse Siede is nit ferschuuwboar.',
+'immobile-target-page'         => 'Der kon nit ap disse Sielsiede ferschäuwen wäide.',
+'imagenocrossnamespace'        => 'Doatäie konnen nit uut dän {{ns:file}}-Noomensruum hääruut ferschäuwen wäide',
+'imagetypemismatch'            => 'Ju näie Doatäifergratterenge is nit mäd ju oolde identisk',
+'imageinvalidfilename'         => 'Die Siel-Doatäinoome is nit gultich',
+'fix-double-redirects'         => 'Ätter dät Ferschuuwen dubbelde Fäärelaitengen aplööse',
+'move-leave-redirect'          => 'Fäärelaitenge moakje',
 
 # Export
 'export'            => 'Sieden exportierje',
@@ -1848,7 +2073,7 @@ Moatest du him foar ju Ferschuuwenge läskje?',
 'allmessagesdefault'        => 'Standardtext',
 'allmessagescurrent'        => 'Dissen Text',
 'allmessagestext'           => 'Dit is ne Lieste fon aal System-Ättergjuchte do in dän MediaWiki-Noomenruum tou Ferföigenge stounde.
-Besäik jädden [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] un [http://translatewiki.net Betawiki], wan du mee-oarbaidje wolt an ju MediaWiki-Sortierenge.',
+Besäik jädden [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] un [http://translatewiki.net translatewiki.net], wan du mee-oarbaidje wolt an ju MediaWiki-Sortierenge.',
 'allmessagesnotsupportedDB' => 'Disse Spezioalsiede stoant nit tou Ferföigenge, deer ju uur dän Parameter <tt>$wgUseDatabaseMessages</tt> deaktivierd wuude.',
 'allmessagesfilter'         => 'Ättergjuchtennoomensfilter:',
 'allmessagesmodified'       => 'Bloot annerde wiese',
@@ -1868,9 +2093,12 @@ Besäik jädden [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisati
 'import-interwiki-text'      => 'Wääl n Wiki un ne Siede toun Importierjen uut.
 Do Versionsdoaten un Benutsernoomen blieuwe deerbie beheelden.
 Aal Transwiki-Import-Aktione wäide in dät [[Special:Log/import|Import-Logbouk]] protokollierd.',
+'import-interwiki-source'    => 'Wälle-Wiki/-Siede:',
 'import-interwiki-history'   => 'Importier aal Versione fon disse Siede',
 'import-interwiki-submit'    => 'Import',
-'import-interwiki-namespace' => 'Importier ju Siede in dän Noomensruum:',
+'import-interwiki-namespace' => 'Siel-Noomensruum:',
+'import-upload-filename'     => 'Doatäinoome:',
+'import-comment'             => 'Kommentoar:',
 'importtext'                 => 'Ap disse Spezioalsiede konnen uur ju [[Special:Export|Exportfunktion]] in dän Wälwiki exportierde Sieden in dit Wiki importierd wäide.',
 'importstart'                => 'Sieden importierje …',
 'import-revision-count'      => '– {{PLURAL:$1|1 Version|$1 Versione}}',
@@ -1892,6 +2120,8 @@ Aal Transwiki-Import-Aktione wäide in dät [[Special:Log/import|Import-Logbouk]
 'import-nonewrevisions'      => 'Der sunt neen näie Versione toun Import foarhouden, aal Versione wuuden al eer importierd.',
 'xml-error-string'           => '$1 Riege $2, Spalte $3, (Byte $4): $5',
 'import-upload'              => 'XML-Doaten importierje',
+'import-token-mismatch'      => 'Ferljus fon do Sessiondoaten. Fersäik et fon näien.',
+'import-invalid-interwiki'   => 'Uut dän anroate Wiki is neen Import muugelk.',
 
 # Import log
 'importlogpage'                    => 'Import-Logbouk',
@@ -1902,19 +2132,19 @@ Aal Transwiki-Import-Aktione wäide in dät [[Special:Log/import|Import-Logbouk]
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|Version|Versione}} fon $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Oaine Benutsersiede',
+'tooltip-pt-userpage'             => 'Dien Benutsersiede',
 'tooltip-pt-anonuserpage'         => 'Benutsersiede fon ju IP-Adresse fon ju uut du Annerengen truchfierst',
-'tooltip-pt-mytalk'               => 'Oaine Diskussionssiede',
+'tooltip-pt-mytalk'               => 'Dien Diskussionssiede',
 'tooltip-pt-anontalk'             => 'Diskussion uur Annerengen fon disse IP-Adresse',
 'tooltip-pt-preferences'          => 'Oaine Ienstaalengen',
 'tooltip-pt-watchlist'            => 'Lieste fon do beooboachtede Sieden',
-'tooltip-pt-mycontris'            => 'Lieste fon oaine Biedraage',
+'tooltip-pt-mycontris'            => 'Lieste fon dien Biedraage',
 'tooltip-pt-login'                => 'Jou ientoulogjen wäd wäil jädden blouked, man is neen Plicht.',
 'tooltip-pt-anonlogin'            => 'Sik ientoulogjen wäd wäil jädden blouked, man is neen Plicht.',
 'tooltip-pt-logout'               => 'Oumäldje',
 'tooltip-ca-talk'                 => 'Diskussion uur dän Inhoold fon ju Siede',
 'tooltip-ca-edit'                 => 'Siede beoarbaidje. Jädden foar dät Spiekerjen ju Foarschaufunktion benutsje.',
-'tooltip-ca-addsection'           => 'N Kommentoar tou disse Diskussion bietouföigje.',
+'tooltip-ca-addsection'           => 'Näi Stuk ounfange',
 'tooltip-ca-viewsource'           => 'Disse Siede is schutsed. Die Wältext kon ankieked wäide.',
 'tooltip-ca-history'              => 'Fröiere Versione fon disse Siede',
 'tooltip-ca-protect'              => 'Disse Siede schutsje',
@@ -1961,6 +2191,8 @@ Aal Transwiki-Import-Aktione wäide in dät [[Special:Log/import|Import-Logbouk]
 'tooltip-watch'                   => 'Disse Siede beooboachtje',
 'tooltip-recreate'                => 'Wier häärstaale',
 'tooltip-upload'                  => 'Hoochleeden startje',
+'tooltip-rollback'                => 'moaket aal lääste Annerengen fon ju Siede, do der fon dän glieke Benutser moaked sunt, truch aan Klik tounichte.',
+'tooltip-undo'                    => 'moaket bloot disse eene Annerenge tounichte un wiest dät Resultoat in ju Foarschau an, deermäd in ju Touhoopefoatengsriege ne Begruundenge ounroat wäide kon.',
 
 # Stylesheets
 'common.css'   => '/** CSS an disse Steede wirket sik ap aal Skins uut */',
@@ -1976,12 +2208,12 @@ Aal Transwiki-Import-Aktione wäide in dät [[Special:Log/import|Import-Logbouk]
 'notacceptable'     => 'Die Wiki-Server kon do Doaten foar dien Uutgoawe-Reewe nit apberaitje.',
 
 # Attribution
-'anonymous'        => 'Anonyme(n) Benutser ap {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonymen Benutser|Anonyme Benutsere}} ap {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Benutser $1',
 'lastmodifiedatby' => 'Disse Siede wuude toulääst annerd uum $2, $1 fon $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Basierd ap ju Oarbaid fon $1.',
 'others'           => 'uur',
-'siteusers'        => '{{SITENAME}}-Benutser $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|Benutser|Benutsere}} $1',
 'creditspage'      => 'Siedenstatistik',
 'nocredits'        => 'Foar disse Siede sunt neen Informationen deer.',
 
@@ -2021,11 +2253,12 @@ Aal Transwiki-Import-Aktione wäide in dät [[Special:Log/import|Import-Logbouk]
 'markedaspatrollederror-noautopatrol' => 'Et is nit ferlööwed, oaine Beoarbaidengen as kontrollierd tou markierjen.',
 
 # Patrol log
-'patrol-log-page'   => 'Kontrol-Logbouk',
-'patrol-log-header' => 'Dit is dät Kontroll-Logbouk.',
-'patrol-log-line'   => 'häd $1 fon $2 as kontrollierd markierd $3',
-'patrol-log-auto'   => '(automatisk)',
-'patrol-log-diff'   => 'Version $1',
+'patrol-log-page'      => 'Kontrol-Logbouk',
+'patrol-log-header'    => 'Dit is dät Kontroll-Logbouk.',
+'patrol-log-line'      => 'häd $1 fon $2 as kontrollierd markierd $3',
+'patrol-log-auto'      => '(automatisk)',
+'patrol-log-diff'      => 'Version $1',
+'log-show-hide-patrol' => 'Kontroll-Logbouk $1',
 
 # Image deletion
 'deletedrevision'                 => 'Oolde Version $1 läsked',
@@ -2042,6 +2275,9 @@ $1',
 'previousdiff' => '� Tou ne allere Version',
 'nextdiff'     => 'Tou ne näiere Version →',
 
+# Visual comparison
+'visual-comparison' => 'Visuellen Fergliek',
+
 # Media information
 'mediawarning'         => "'''Warnung:''' Disse Oard fon Doatäi kon n schoadelken Programcode änthoolde. Truch dät Deelleeden of Eepenjen fon dissen Doatäi kon dän Computer Schoade toubroacht wäide. Al dät Anklikken fon dän Link kon deertou fiere, dät die Browser ju Doatäi eepen moaket un uunbekoande Programcode tou Uutfierenge kumt. Do Bedrieuwere fon ju Wikipedia uurnieme neen Feroantwoudenge foar dän Inhoold fon disse Doatäi! Schuul disse Doatäi wuddelk schoadelke Programcode änthoolde, schuul n Administrator informierd wäide.<hr />",
 'imagemaxsize'         => 'Maximoale Bieldegrööte ap Bieldebeschrieuwengssieden:',
@@ -2054,10 +2290,12 @@ $1',
 'show-big-image'       => 'Bielde in hooge Aplöösenge',
 'show-big-image-thumb' => '<small>Grööte fon disse Foarschau: $1 × $2 Pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Näie Bielden',
 'imagelisttext'         => "Hier is ne Lieste fon '''$1''' {{PLURAL:$1|Doatäi|Doatäie}}, sortierd $2.",
 'newimages-summary'     => 'Disse Spezioalsiede wiest do toulääst hoochleedene Doatäie an.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Doatäinoome (of n Paat deerfon):',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'neen Bielden fuunen.',
 'ilsubmit'              => 'Säik',
@@ -2267,6 +2505,18 @@ wiedere standdoardmäitich "ienklapte" Details konnen anwiesd wäide.
 'exif-lightsource-24'  => 'ISO Studio Kunstlucht',
 'exif-lightsource-255' => 'Uur Luchtwälle',
 
+# Flash modes
+'exif-flash-fired-0'    => 'naan Lai',
+'exif-flash-fired-1'    => 'Lai uutlöösd',
+'exif-flash-return-0'   => 'Lai soant neen Doaten',
+'exif-flash-return-2'   => 'neen Reflexion fon dän Lai fääststoald',
+'exif-flash-return-3'   => 'Reflexion fon dän Lai fääststoald',
+'exif-flash-mode-1'     => 'twoangen laien',
+'exif-flash-mode-2'     => 'Lai ouschalted',
+'exif-flash-mode-3'     => 'Automatik',
+'exif-flash-function-1' => 'Neen Laifunktion',
+'exif-flash-redeye-1'   => 'Roodoogene-Reduktion',
+
 'exif-focalplaneresolutionunit-2' => 'Tuume',
 
 'exif-sensingmethod-1' => 'Uundefinierd',
@@ -2342,8 +2592,7 @@ wiedere standdoardmäitich "ienklapte" Details konnen anwiesd wäide.
 
 # External editor support
 'edit-externally'      => 'Disse Doatäi mäd n extern Program beoarbaidje',
-'edit-externally-help' => 'Sjuch do [http://www.mediawiki.org/wiki/Manual:External_editors Installationsanwiesengen] foar
-wiedere Informatione.',
+'edit-externally-help' => '(Sjuch do [http://www.mediawiki.org/wiki/Manual:External_editors Installationsanwiesengen] foar wiedere Informatione)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'aal',
@@ -2403,29 +2652,18 @@ $1
 'trackbackdeleteok' => 'Trackback wuude mäd Ärfoulch läsked.',
 
 # Delete conflict
-'deletedwhileediting' => '<span class="error">Oachtenge: Disse Siede wuude al läsked, ätter dät du anfangd hiedest, hier tou beoarbaidjen!
+'deletedwhileediting' => 'Oachtenge: Disse Siede wuude al läsked, ätter dät du anfangd hiedest, hier tou beoarbaidjen!
 Kiekje in dät [{{fullurl:Special:Log|type=delete&page=}}{{FULLPAGENAMEE}} Läsk-Logbouk] ätter,
-wieruum ju Siede läsked wuude. Wan du ju Siede spiekerst, wäd ju näi anlaid.</span>',
+wieruum ju Siede läsked wuude. Wan du ju Siede spiekerst, wäd ju näi anlaid.',
 'confirmrecreate'     => "Benutser [[User:$1|$1]] ([[User talk:$1|Diskussion]]) häd disse Siede läsked, ätter dät du ounfangd hääst, ju tou beoarbaidjen. Ju Begruundenge lutte:
 ''$2''.
 Bestäätigje, dät du disse Siede wuddelk näi moakje moatest.",
 'recreate'            => 'Wierhäärstaale',
 
-# HTML dump
-'redirectingto' => 'Fäärelaited ätter [[:$1]]',
-
 # action=purge
-'confirm_purge'        => 'Dän Cache fon disse Siede loosmoakje?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Säik ätter Sieden, in do ''$1'' foarkumt.",
-'searchnamed'      => "Säik ätter Sieden, wierfon die Noome ''$1'' änthaalt.",
-'articletitles'    => "Sieden, do der mäd ''$1'' ounfange",
-'hideresults'      => 'ferbierge',
-'useajaxsearch'    => 'Benutsje AJAX-unnerstutsede Säike',
+'confirm-purge-top'    => 'Dän Cache fon disse Siede loosmoakje?',
+'confirm-purge-bottom' => 'Moaket dän Cache fon ne Siede loos un twingt tou dät Anwiesen fon ju aktuelle Version.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� foarige Siede',
@@ -2445,10 +2683,10 @@ $1',
 'table_pager_empty'        => 'Neen Resultoate',
 
 # Auto-summaries
-'autosumm-blank'   => 'Disse Siede wuude loosmoaked.',
+'autosumm-blank'   => 'Ju Siede wuud loosmoaked.',
 'autosumm-replace' => "Die Siedeninhoold wuude truch n uur Text ärsät: '$1'",
 'autoredircomment' => 'Fäärelaited ätter [[$1]]',
-'autosumm-new'     => 'Ju Siede wuude näi anlaid: $1',
+'autosumm-new'     => 'Ju Siede wuud näi anlaid: „$1“',
 
 # Live preview
 'livepreview-loading' => 'Leede …',
@@ -2486,6 +2724,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => 'Uunbekoanden Extension-Tag „$1“',
+'duplicate-defaultsort' => 'Paas ap: Die Sortierengskoai „$2“ uurschrift dän toufoarne ferwoanden Koai „$1“.',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2518,10 +2757,10 @@ $1',
 'fileduplicatesearch'          => 'Doatäi-Duplikoat-Säike',
 'fileduplicatesearch-summary'  => 'Säike ätter Doatäi-Duplikoate ap Basis fon hieren Hash-Wäid.
 
-Ju Iengoawe mout sunner dän Tousats „{{ns:image}}:“ geböäre.',
+Ju Iengoawe mout sunner dän Tousats „{{ns:file}}:“ geböäre.',
 'fileduplicatesearch-legend'   => 'Säike ätter Duplikoate',
 'fileduplicatesearch-filename' => 'Doatäinoome:',
-'fileduplicatesearch-submit'   => 'Säike',
+'fileduplicatesearch-submit'   => 'Säike (016)',
 'fileduplicatesearch-info'     => '$1 × $2 Pixel<br />Doatäigrööte: $3<br />MIME-Typ: $4',
 'fileduplicatesearch-result-1' => 'Ju Doatäi „$1“ häd neen identiske Duplikoate.',
 'fileduplicatesearch-result-n' => 'Ju Doatäi „$1“ häd {{PLURAL:$2|1 identisk Duplikoat|$2 identiske Duplikoate}}.',
@@ -2548,4 +2787,12 @@ Ju Iengoawe mout sunner dän Tousats „{{ns:image}}:“ geböäre.',
 'blankpage'              => 'Loose Siede',
 'intentionallyblankpage' => 'Disse Siede is apsichtelk sunner Inhoold. Ju wäd foar Benchmarks ferwoand.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Disse Riege nit ferannerje<pre>
+#Unnerstoundend konnen Fragmente fon reguläre Uutdrukke (die Deel twiske do //) ienroat wäide.
+#Disse wäide mäd do URLs fon Bielden uut externe Wällen ferglieked
+#N positiven Fergliek fiert tou Anwiesenge fon ju Bielde, uurs wäd ju Bielde bloot as Link anwiesd
+#Riegen, do der mäd n # ounfange, wäide as Kommentoar behonneld
+#Fragmente fon reguläre Uutdrukke ätter disse Riege iendreege. Disse Riege nit ferannerje</pre>',
+
 );
diff --git a/languages/messages/MessagesSu.php b/languages/messages/MessagesSu.php
index ac0fd54b..c13d1095 100644
--- a/languages/messages/MessagesSu.php
+++ b/languages/messages/MessagesSu.php
@@ -17,16 +17,14 @@ $fallback = 'id';
 $namespaceNames = array(
 	NS_MEDIA          => 'Média',
 	NS_SPECIAL        => 'Husus',
-	NS_MAIN           => '',
 	NS_TALK           => 'Obrolan',
 	NS_USER           => 'Pamaké',
 	NS_USER_TALK      => 'Obrolan_pamaké',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Obrolan_$1',
-	NS_IMAGE          => 'Gambar',
-	NS_IMAGE_TALK     => 'Obrolan_gambar',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Obrolan_MediaWiki',
+	NS_FILE           => 'Gambar',
+	NS_FILE_TALK      => 'Obrolan_gambar',
+	NS_MEDIAWIKI      => 'MédiaWiki',
+	NS_MEDIAWIKI_TALK => 'Obrolan MédiaWiki',
 	NS_TEMPLATE       => 'Citakan',
 	NS_TEMPLATE_TALK  => 'Obrolan_citakan',
 	NS_HELP           => 'Pitulung',
@@ -35,6 +33,93 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'Obrolan_kategori',
 );
 
+$namespaceAliases = array(
+	'Obrolan_MediaWiki' => NS_MEDIAWIKI_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'AlihanGanda' ),
+	'BrokenRedirects'           => array( 'AlihanPegat' ),
+	'Disambiguations'           => array( 'Disambiguasi' ),
+	'Userlogin'                 => array( 'AsupLog' ),
+	'Userlogout'                => array( 'KaluarLog' ),
+	'CreateAccount'             => array( 'NyieunRekening' ),
+	'Preferences'               => array( 'Preferensi' ),
+	'Watchlist'                 => array( 'Awaskeuneun' ),
+	'Recentchanges'             => array( 'AnyarRobah' ),
+	'Upload'                    => array( 'Kunjal' ),
+	'Listfiles'                 => array( 'DaptarGambar' ),
+	'Newimages'                 => array( 'GambarAnyar' ),
+	'Listusers'                 => array( 'DaptarPamake' ),
+	'Listgrouprights'           => array( 'DaptarHakPamake' ),
+	'Statistics'                => array( 'Statistika' ),
+	'Randompage'                => array( 'Acak', 'KacaAcak' ),
+	'Lonelypages'               => array( 'KacaNyorangan' ),
+	'Uncategorizedpages'        => array( 'KacaTanpaKategori' ),
+	'Uncategorizedcategories'   => array( 'KategoriTanpaKategori' ),
+	'Uncategorizedimages'       => array( 'GambarTanpaKategori' ),
+	'Uncategorizedtemplates'    => array( 'CitakanTanpaKategori' ),
+	'Unusedcategories'          => array( 'KategoriNganggur' ),
+	'Unusedimages'              => array( 'GambarNganggur' ),
+	'Wantedpages'               => array( 'KacaDiteang', 'TumbuPegat' ),
+	'Wantedcategories'          => array( 'KategoriDiteang' ),
+	'Mostlinked'                => array( 'PalingDitumbu' ),
+	'Mostlinkedcategories'      => array( 'KategoriPalingDitumbu', 'KategoriPalingKapake' ),
+	'Mostlinkedtemplates'       => array( 'CitakanPalingDitumbu', 'CitakanPalingKapake' ),
+	'Mostcategories'            => array( 'KategoriPalingLoba' ),
+	'Mostimages'                => array( 'GambarPalingKapake' ),
+	'Mostrevisions'             => array( 'PalingRevisi' ),
+	'Fewestrevisions'           => array( 'PangjarangnaRevisi' ),
+	'Shortpages'                => array( 'KacaPondok' ),
+	'Longpages'                 => array( 'KacaPanjang' ),
+	'Newpages'                  => array( 'KacaAnyar' ),
+	'Ancientpages'              => array( 'KacaKolot' ),
+	'Deadendpages'              => array( 'KacaBuntu' ),
+	'Protectedpages'            => array( 'KacaDikonci' ),
+	'Protectedtitles'           => array( 'JudulDikonci' ),
+	'Allpages'                  => array( 'SadayaKaca' ),
+	'Prefixindex'               => array( 'IndeksAwalan' ),
+	'Ipblocklist'               => array( 'IPDipeungpeuk' ),
+	'Specialpages'              => array( 'KacaHusus' ),
+	'Contributions'             => array( 'Kontribusi' ),
+	'Emailuser'                 => array( 'SurelekPamake' ),
+	'Confirmemail'              => array( 'KonfirmasiSurelek' ),
+	'Whatlinkshere'             => array( 'NumbuKaDieu' ),
+	'Recentchangeslinked'       => array( 'ParobahanPatali' ),
+	'Movepage'                  => array( 'PindahkeunKaca' ),
+	'Blockme'                   => array( 'PeungpeukKuring' ),
+	'Booksources'               => array( 'SumberPustaka' ),
+	'Categories'                => array( 'Kategori' ),
+	'Export'                    => array( 'Ekspor' ),
+	'Version'                   => array( 'Versi' ),
+	'Allmessages'               => array( 'SadayaTalatah' ),
+	'Blockip'                   => array( 'PeungpeukIP' ),
+	'Undelete'                  => array( 'BolayHapus' ),
+	'Import'                    => array( 'Impor' ),
+	'Lockdb'                    => array( 'KonciDB' ),
+	'Unlockdb'                  => array( 'BukaKonciDB' ),
+	'Userrights'                => array( 'HakPamake' ),
+	'MIMEsearch'                => array( 'SungsiMIME' ),
+	'FileDuplicateSearch'       => array( 'SungsiGambarDuplikat' ),
+	'Unwatchedpages'            => array( 'KacaTeuDiawaskeun' ),
+	'Listredirects'             => array( 'DaptarAlihan' ),
+	'Revisiondelete'            => array( 'HapusRevisi' ),
+	'Unusedtemplates'           => array( 'CitakanNganggur' ),
+	'Randomredirect'            => array( 'AlihanAcak' ),
+	'Mypage'                    => array( 'KacaKuring' ),
+	'Mytalk'                    => array( 'ObrolanKuring' ),
+	'Mycontributions'           => array( 'KontribusiKuring' ),
+	'Listadmins'                => array( 'DaptarKuncen' ),
+	'Listbots'                  => array( 'DaptarBot' ),
+	'Popularpages'              => array( 'KacaPayu' ),
+	'Search'                    => array( 'Sungsi' ),
+	'Resetpass'                 => array( 'GantiSandi' ),
+	'Withoutinterwiki'          => array( 'TanpaInterwiki' ),
+	'MergeHistory'              => array( 'GabungJujutan' ),
+	'Filepath'                  => array( 'JalurKoropak' ),
+	'Invalidateemail'           => array( 'SurelekTeuKaci' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Garis-handapan tumbu',
@@ -73,17 +158,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Sumputkeun éditan kuring dina daptar awaskeuneun',
 'tog-watchlisthidebots'       => 'Sumputkeun éditan bot dina daptar awaskeuneun',
 'tog-watchlisthideminor'      => 'Sumputkeun éditan leutik dina daptar awaskeuneun',
+'tog-watchlisthideliu'        => 'Sumputkeun éditan pamaké nu asup log tina daptar awaskeun',
+'tog-watchlisthideanons'      => 'Sumputkeun éditan pamaké anonim tina daptar awaskeun',
 'tog-nolangconversion'        => 'Tumpurkeun konversi varian',
 'tog-ccmeonemails'            => 'Kirimkeun ogé salinan surélékna ka alamat kuring',
 'tog-diffonly'                => 'Ulah némbongkeun eusi kaca di handapeun béda éditan',
 'tog-showhiddencats'          => 'Témbongkeun kategori nyumput',
+'tog-noconvertlink'           => 'Non-aktifkeun konvérsi judul tumbu',
 
 'underline-always'  => 'Salawasna',
 'underline-never'   => 'Ulah',
 'underline-default' => 'Luyu jeung buhunna panyungsi',
 
-'skinpreview' => '(Pramidang)',
-
 # Dates
 'sunday'        => 'Minggu',
 'monday'        => 'Senén',
@@ -171,7 +257,7 @@ $messages = array(
 'mytalk'         => 'Obrolan kuring',
 'anontalk'       => 'Obrolan pikeun IP ieu',
 'navigation'     => 'Pituduh',
-'and'            => 'jeung',
+'and'            => '&#32;jeung',
 
 # Metadata in edit box
 'metadata_help' => 'Métadata:',
@@ -208,14 +294,14 @@ $messages = array(
 'talkpagelinktext'  => 'Obrolan',
 'specialpage'       => 'Kaca Husus',
 'personaltools'     => 'Parabot pribadi',
-'postcomment'       => 'Kirim koméntar',
+'postcomment'       => 'Bagéan anyar',
 'articlepage'       => 'Témbongkeun kaca eusi',
 'talk'              => 'Sawala',
 'views'             => 'Témbongan',
 'toolbox'           => 'Kotak parabot',
 'userpage'          => 'Témbongkeun kaca pamaké',
 'projectpage'       => 'Témbongkeun kaca proyék',
-'imagepage'         => 'Témbongkeun kaca gambar',
+'imagepage'         => 'Tempo kaca gambar',
 'mediawikipage'     => 'Témbongkeun kaca talatah',
 'templatepage'      => 'Témbongkeun kaca citakan',
 'viewhelppage'      => 'Témbongkeun kaca pitulung',
@@ -234,8 +320,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ngeunaan {{SITENAME}}',
 'aboutpage'            => 'Project:Ngeunaan',
-'bugreports'           => 'Laporan kutu',
-'bugreportspage'       => 'Project:Laporan_kutu',
 'copyright'            => 'Sadaya kandungan ieu loka ditangtayungan ku $1',
 'copyrightpagename'    => 'Hak cipta {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Hak cipta',
@@ -258,9 +342,7 @@ $messages = array(
 
 'badaccess'        => 'Kasalahan widi',
 'badaccess-group0' => 'Anjeun teu wenang ngalaksanakeun peta nu dipundut.',
-'badaccess-group1' => 'Peta nu dipundut ngan bisa laksana pikeun pamaké ti gorombolan $1.',
-'badaccess-group2' => 'Peta nu dipundut ngan bisa laksana pikeun pamaké ti salah sahiji gorombolan $1.',
-'badaccess-groups' => 'Peta nu dipundut ngan bisa laksana pikeun pamaké ti salah sahiji gorombolan $1.',
+'badaccess-groups' => 'Peta nu dipundut ngan bisa laksana pikeun pamaké ti salah sahiji {{PLURAL:$2|gorombolan|salah sahiji gorombolan}}: $1.',
 
 'versionrequired'     => 'Butuh MediaWiki vérsi $1',
 'versionrequiredtext' => 'Butuh MediaWiki vérsi $1 pikeun migunakeun ieu kaca. Mangga tingal [[Special:Version|kaca vérsi]]',
@@ -288,7 +370,7 @@ $messages = array(
 'site-atom-feed'          => 'Eupan Atom $1',
 'page-rss-feed'           => 'Eupan RSS "$1"',
 'page-atom-feed'          => 'Eupan Atom "$1"',
-'red-link-title'          => '$1 (can aya)',
+'red-link-title'          => '$1 (kaca can aya)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Artikel',
@@ -355,7 +437,6 @@ Mangga laporkeun ha ieu ka salasaurang [[Special:ListUsers/sysop|Kuncén]], bari
 'cannotdelete'         => 'Teu bisa ngahapus kaca atawa gambar nu dimaksud (bisa jadi geus aya nu ngahapus saméméhna).',
 'badtitle'             => 'Judul goréng',
 'badtitletext'         => 'Judul kaca nu dipénta teu sah, kosong, atawa judul antarbasa atawa antarwikina salah tumbu.',
-'perfdisabled'         => 'Punten! Fungsi ieu pikeun samentawis ditumpurkeun sabab ngahambat pangkalan data nepi ka titik di mana teu saurang ogé bisa migunakeun wiki.',
 'perfcached'           => 'Data di handap ieu sindangan sahingga--meureun--teu mutahir:',
 'perfcachedts'         => 'Data di handap ieu mah sindangan, panungtungan diropéa téh $1.',
 'querypage-no-updates' => 'Pangrobahan ahir ti kaca ieu keur dipaéhkeun. Data anu aya di dieu ayeuna moal dimuat deui.',
@@ -376,7 +457,7 @@ Mangga laporkeun ha ieu ka salasaurang [[Special:ListUsers/sysop|Kuncén]], bari
 'titleprotected'       => "Ieu judul dikonci ku [[User:$1|$1]] kalawan alesan ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Kasalahan konfigurasi: panyekén virus teu dipikawanoh: <i>$1</i>',
+'virus-badscanner'     => "Kasalahan konfigurasi: panyekén virus teu dipikawanoh: ''$1''",
 'virus-scanfailed'     => 'nyekén gagal (kode $1)',
 'virus-unknownscanner' => 'antivirus teu dipikawanoh:',
 
@@ -393,7 +474,6 @@ Tong hilap ngarobih [[Special:Preferences|{{SITENAME}} préferénsi]] anjeun.',
 'remembermypassword'         => 'Inget sandi kuring nembus rintakan.',
 'yourdomainname'             => 'Domain anjeun',
 'externaldberror'            => 'Aya kasalahan dina pangkalan data oténtikasi luar, atawa anjeun mémang teu diwenangkeun pikeun ngaropéa rekening luar anjeun.',
-'loginproblem'               => "<b>Aya masalah na ''login'' anjeun.</b><br />Coba deui!",
 'login'                      => 'Asup log',
 'nav-login-createaccount'    => 'Nyieun rekening atawa asup log',
 'loginprompt'                => "Anjeun kudu boga ''cookies'' sangkan bisa asup log ka {{SITENAME}}.",
@@ -419,8 +499,7 @@ Mangga pilih ngaran nu séjén.',
 'yourvariant'                => 'Varian basa',
 'yournick'                   => 'Landihan anjeun (pikeun tawis leungeun)',
 'badsig'                     => 'Parafna teu valid; pariksa tag HTML-na geura.',
-'badsiglength'               => 'Ngaran panjang teuing.
-kudu kurang ti $1 {{PLURAL:$1|karaktér|karaktér}}.',
+'badsiglength'               => 'Tawis leungeun panjang teuing. Kuduna kurang ti $1 {{PLURAL:$1|karaktér|karaktér}}.',
 'email'                      => 'Surélék',
 'prefs-help-realname'        => '* Ngaran asli (pilihan): mun anjeun milih ngeusian, bakal dipaké pikeun nandaan kontribusi anjeun.',
 'loginerror'                 => 'Kasalahan asup log',
@@ -431,7 +510,9 @@ kudu kurang ti $1 {{PLURAL:$1|karaktér|karaktér}}.',
 'noname'                     => 'Anjeun teu nuliskeun ngaran pamaké nu sah.',
 'loginsuccesstitle'          => 'Asup log geus hasil',
 'loginsuccess'               => 'Anjeun ayeuna geus asup log ka {{SITENAME}} salaku "$1".',
-'nosuchuser'                 => 'Euweuh pamaké nu ngaranna "$1". Pariksa éjahanana, atawa paké formulir di handap pikeun [[Special:UserLogin/signup|nyieun rekening anyar]].',
+'nosuchuser'                 => 'Euweuh pamaké nu ngaranna "$1".
+Ngaran pamaké ngabedakeun hurup kapital.
+Pariksa éjahanana, atawa paké formulir di handap pikeun [[Special:UserLogin/signup|nyieun rekening anyar]].',
 'nosuchusershort'            => 'Taya pamaké nu ngaranna "<nowiki>$1</nowiki>", pariksa éjahanana!',
 'nouserspecified'            => 'Anjeun kudu ngeusian ngaran landihan.',
 'wrongpassword'              => 'Sandi nu diasupkeun teu cocog. Mangga cobian deui.',
@@ -450,10 +531,11 @@ is not allowed to use the password recovery function to prevent abuse.',
 'throttled-mailpassword'     => 'Hiji panginget kecap sandi geus dikirimkeun dina {{PLURAL:$1|jam|$1 jam}} pamungkas. 
 Pikeun ngahindar disalahgunakeun, ngan hiji kecap sandi anu baris dikirimkeun saban {{PLURAL:$1|jam|$1 jam}}.',
 'mailerror'                  => 'Kasalahan ngirim surat: $1',
-'acct_creation_throttle_hit' => 'Punten, anjeun geus nyieun $1 rekening, teu bisa nyieun deui.',
-'emailauthenticated'         => 'Alamat surélék anjeun geus dioténtikasi $1.',
+'acct_creation_throttle_hit' => 'Punten,pamaké alamat IP anjeun geus nyieun {{PLURAL:$1|1 rekening|$1 rekening}} dina sapoé ieu. mangrupa jumlah nu di idinan dina sapoé.
+anjeun teu bisa nyieun deui samentara waktu.',
+'emailauthenticated'         => 'Alamat surélék anjeun geus dioténtikasi dina $3, $2.',
 'emailnotauthenticated'      => 'Alamat surélék anjeun <strong>can dioténtikasi</strong>. Moal aya surélék nu bakal dikirim pikeun fitur-fitur di handap ieu.',
-'noemailprefs'               => '<strong>Teu aya alamat surélék</strong>, fitur di handap moal bisa jalan.',
+'noemailprefs'               => 'Teu aya alamat surélék, fitur di handap moal bisa jalan.',
 'emailconfirmlink'           => 'Konfirmasi alamat surélék anjeun',
 'invalidemailaddress'        => 'Alamat surélék teu bisa ditarima sabab formatna salah.
 Mangga lebetkeun alamat nu formatna bener atawa kosongkeun baé.',
@@ -466,15 +548,18 @@ Mun ieu rekening balukar ayana éror, teu kudu diwaro.',
 'loginlanguagelabel'         => 'Basa: $1',
 
 # Password reset dialog
-'resetpass'               => 'Atur deui kecap sandi rekening',
-'resetpass_announce'      => 'Anjeun asup log migunakeun sandi samentara. Salajengna, mangga gentos ku sandi anyar di dieu:',
-'resetpass_text'          => '<!-- Tambahkeun téks di dieu -->',
-'resetpass_header'        => 'Ganti sandi rekening',
-'resetpass_submit'        => 'Setél log asup katut sandina',
-'resetpass_success'       => 'Kecap sandi Anjeun geus junun dirobah! Ayeuna proses asup log Anjeun...',
-'resetpass_bad_temporary' => 'Kecap sandi samentara salah. Anjeun meureun kungsi junun ngaganti kecap sandi Anjeun atawa geus ménta kecap sandi anyar.',
-'resetpass_forbidden'     => 'Sandi henteu bisa dirobah',
-'resetpass_missing'       => 'Data formulir teu dipikawanoh.',
+'resetpass'                 => 'Ganti kecap sandi rekening',
+'resetpass_announce'        => 'Anjeun asup log migunakeun sandi samentara. Salajengna, mangga gentos ku sandi anyar di dieu:',
+'resetpass_text'            => '<!-- Tambahkeun téks di dieu -->',
+'resetpass_header'          => 'Ganti sandi rekening',
+'oldpassword'               => 'Sandi heubeul',
+'newpassword'               => 'Sandi anyar:',
+'retypenew'                 => 'Ketik ulang sandi',
+'resetpass_submit'          => 'Setél log asup katut sandina',
+'resetpass_success'         => 'Kecap sandi Anjeun geus junun dirobah! Ayeuna proses asup log Anjeun...',
+'resetpass_bad_temporary'   => 'Kecap sandi samentara salah. Anjeun meureun kungsi junun ngaganti kecap sandi Anjeun atawa geus ménta kecap sandi anyar.',
+'resetpass_forbidden'       => 'Sandi henteu bisa dirobah',
+'resetpass-submit-loggedin' => 'Ganti kecap sandi rekening',
 
 # Edit page toolbar
 'bold_sample'     => 'Téks kandel',
@@ -493,14 +578,14 @@ Mun ieu rekening balukar ayana éror, teu kudu diwaro.',
 'nowiki_tip'      => 'Format wiki tong diwaro',
 'image_sample'    => 'Conto.jpg',
 'image_tip'       => 'Ngasupkeun gambar',
-'media_sample'    => 'Conto.mp3',
+'media_sample'    => 'Conto.ogg',
 'media_tip'       => 'Tumbu koropak média',
 'sig_tip'         => 'Tawis leungeun anjeun tur cap wanci',
 'hr_tip'          => 'Garis horizontal (use sparingly)',
 
 # Edit pages
-'summary'                          => 'Ringkesan',
-'subject'                          => 'Jejer/Judul',
+'summary'                          => 'Ringkesan:',
+'subject'                          => 'Jejer/Judul:',
 'minoredit'                        => 'Ieu éditan minor',
 'watchthis'                        => 'Awaskeun kaca ieu',
 'savearticle'                      => 'Simpen',
@@ -512,8 +597,8 @@ Mun ieu rekening balukar ayana éror, teu kudu diwaro.',
 'missingsummary'                   => "'''Pépéling:''' Anjeun can ngeusian sari éditan. Mun anjeun ngaklik deui Simpen, éditan anjeun bakal disimpen tanpa sari éditan",
 'missingcommenttext'               => 'Mangga tulis koméntar di handapeun ieu.',
 'missingcommentheader'             => "'''Pépéling:''' Anjeun can ngeusian judul pikeun ieu koméntar. Mun anjeun ngaklik deui Simpen, éditan anjeun bakal disimpen tanpa judul.",
-'summary-preview'                  => 'Ringkesan pramidang',
-'subject-preview'                  => 'Sawangan subyek/tajuk',
+'summary-preview'                  => 'Ringkesan pramidang:',
+'subject-preview'                  => 'Sawangan subyek/tajuk:',
 'blockedtitle'                     => 'Pamaké dipeungpeuk',
 'blockedtext'                      => "<big>'''Ngaran pamaké atawa alamat IP anjeun dipeungpeuk.'''</big>
 
@@ -564,25 +649,28 @@ Pikeun nyieun kaca, mimitian ku ngetik jeroeun kotak di handap
 (tempo [[{{MediaWiki:Helppage}}|kaca pitulung]] pikeun leuwih écés).
 Mun anjeun ka dieu teu ngahaja, klik baé tombol '''back''' na panyungsi anjeun.",
 'anontalkpagetext'                 => "----''Ieu mangrupa kaca sawala pikeun pamaké anonim nu can (henteu) nyieun rekening, kusabab kitu alamat IP dipaké dina hal ieu pikeun nyirikeun anjeunna. Alamat IP ieu bisa dipaké ku sababaraha urang. Mun anjeun salasahiji pamaké anonim sarta ngarasa aya koméntar nu teu pakait geus ditujukeun ka anjeun, leuwih hadé [[Special:UserLogin|nyieun rekening atawa asup log]] sangkan teu pahili jeung pamaké anonim séjén.''",
-'noarticletext'                    => 'Kiwari can aya téks na kaca ieu. Mun anjeun geus kungsi nyieun kaca ieu, coba fungsi [[Special:Search/{{PAGENAME}}|sungsi keur judul]] di kaca sejen atawa [{{fullurl:{{FULLPAGENAME}}|action=edit}} édit kaca ieu].',
+'noarticletext'                    => 'Kiwari can aya téks dina ieu kaca.
+Anjeun bisa [[Special:Search/{{PAGENAME}}|nyusud judul ieu kaca]] dina kaca séjén,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} nyusud log nu tumali],
+atawa [{{fullurl:{{FULLPAGENAME}}|action=edit}} ngédit ieu kaca]</span>.',
 'userpage-userdoesnotexist'        => 'Rekening pamaké "$1" tacan kadaptar. Mangga tilikan lamun anjeun hoyong ngadamel/ngédit kaca ieu.',
 'clearyourcache'                   => "'''Catetan:''' Sanggeus nyimpen, anjeun perlu ngosongkeun sindangan panyungsi anjeun pikeun nempo parobahanana:
 '''Mozilla/Safari/Konqueror:''' pencét & tahan ''Shift'' bari ngaklik ''Reload'' (atawa pencét ''Ctrl-Shift-R''), '''IE:''' pencét ''Ctrl-F5'', '''Opera:''' pencét ''F5''.",
-'usercssjsyoucanpreview'           => "<strong>Tip:</strong> Paké tombol 'Témbongkeun pramidang' pikeun nyoba css/js anyar anjeun méméh nyimpen.",
+'usercssjsyoucanpreview'           => "'''Tip:''' Paké tombol 'Témbongkeun pramidang' pikeun nyoba css/js anyar anjeun méméh nyimpen.",
 'usercsspreview'                   => "'''Inget yén anjeun ukur nyawang css pamaké anjeun, can disimpen!'''",
 'userjspreview'                    => "'''Inget yén anjeun ukur nguji/nyawang ''javascript'' pamaké anjeun, can disimpen!'''",
 'userinvalidcssjstitle'            => "'''Awas''': kulit \"\$1\" mah teu aya. Sing émut yén kaca .css jeung .js mah migunakeun aksara leutik dina judulna, contona baé {{ns:user}}:Foo/monobook.css lawan {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Geus diropéa)',
-'note'                             => '<strong>Catetan:</strong>',
-'previewnote'                      => '<strong>Inget yén ieu ukur sawangan, can disimpen!</strong>',
+'note'                             => "'''Catetan:'''",
+'previewnote'                      => "'''Inget yén ieu ukur sawangan, can disimpen!'''",
 'previewconflict'                  => 'Sawangan ieu mangrupa eunteung pikeun téks na rohangan ngédit sakumaha bakal katémbong mun ku anjeun disimpen.',
-'session_fail_preview'             => '<strong>Punten! Kami teu bisa ngolah éditan anjeun alatan leungitna data rintakan. Mangga cobian deui. Mun tetep teu bisa, cobi kaluar log lajeng lebet deui.</strong>',
-'session_fail_preview_html'        => "<strong>Punten! Kami teu bisa ngolah éditan anjeun sabab leungitna data rintakan.</strong>
+'session_fail_preview'             => "'''Punten! Kami teu bisa ngolah éditan anjeun alatan leungitna data rintakan. Mangga cobian deui. Mun tetep teu bisa, cobi kaluar log lajeng lebet deui.'''",
+'session_fail_preview_html'        => "'''Punten! Kami teu bisa ngolah éditan anjeun sabab leungitna data rintakan.'''
 
 ''Kusabab {{SITENAME}} ngawenangkeun dipakéna HTML atah, pramidangna disumputkeun pikeun nyegah panarajang JavaScript.''
 
-<strong>Mun ieu éditan bener, mangga cobian deui. Mun tetep teu metu, cobi [[Special:UserLogout|kaluar log]] heula, lajeng lebet deui.</strong>",
-'token_suffix_mismatch'            => '<strong>Éditan anjeun ditolak sabab aplikasi klien Anjeun ngarobah karakter tanda baca dina éditan. Éditan kasebut ditolak keur nyegah kasalahan dina artikel téks. Hal ieu kadang-kadang kajadian lamun Anjeun maké proksi anonim basis web nu masalah.</strong>',
+'''Mun ieu éditan bener, mangga cobian deui. Mun tetep teu metu, cobi [[Special:UserLogout|kaluar log]] heula, lajeng lebet deui.'''",
+'token_suffix_mismatch'            => "'''Éditan anjeun ditolak sabab aplikasi klien Anjeun ngarobah karakter tanda baca dina éditan. Éditan kasebut ditolak keur nyegah kasalahan dina artikel téks. Hal ieu kadang-kadang kajadian lamun Anjeun maké proksi anonim basis web nu masalah.'''",
 'editing'                          => 'Ngédit $1',
 'editingsection'                   => 'Ngédit $1 (bagian)',
 'editingcomment'                   => 'Ngédit $1 (pamanggih)',
@@ -593,21 +681,23 @@ Anjeun kudu ngagabungkeun parobahan anjeun kana téks nu kiwari.
 '''Ngan''' téks nu béh luhur nu bakal disimpen nalika anjeun mencét \"Simpen\".",
 'yourtext'                         => 'Tulisan anjeun',
 'storedversion'                    => 'Vérsi nu disimpen',
-'nonunicodebrowser'                => '<strong>AWAS: Panyungsi anjeung teu maké unicode, mangga robah heula méméh ngédit artikel.</strong>',
-'editingold'                       => '<strong>PERHATOSAN: Anjeun ngédit révisi kadaluwarsa kaca ieu. Mun ku anjeun disimpen, sagala parobahan nu dijieun sanggeus révisi ieu bakal leungit.</strong>',
+'nonunicodebrowser'                => "'''AWAS: Panyungsi anjeung teu maké unicode, mangga robah heula méméh ngédit artikel.'''",
+'editingold'                       => "'''PERHATOSAN: Anjeun ngédit révisi kadaluwarsa kaca ieu. Mun ku anjeun disimpen, sagala parobahan nu dijieun sanggeus révisi ieu bakal leungit.'''",
 'yourdiff'                         => 'Béda',
 'copyrightwarning'                 => "Perhatikeun yén sadaya kontribusi ka MediaWiki dianggap medal dina panangtayungan lisénsi $2 (tempo $1 pikeun jéntréna). Mun anjeun teu miharep tulisan anjeun dirobah sarta disebarkeun deui, ulah dilebetkeun ka dieu.<br />
-Anjeun ogé jangji yén tulisan ieu dijieun ku sorangan, atawa disalin ti ''domain'' umum atawa sumberdaya bébas séjénna. <strong>ULAH NGASUPKEUN KARYA NU MIBANDA HAK CIPTA TANPA IDIN!</strong>",
-'copyrightwarning2'                => 'Catet yén sadaya kontribusi ka {{SITENAME}} bisa diédit, dirobah, atawa dihapus ku kontributor séjén. Mun anjeun teu miharep tulisan anjeun dirobah, ulah ngintunkeun ka dieu.<br />
+Anjeun ogé jangji yén tulisan ieu dijieun ku sorangan, atawa disalin ti ''domain'' umum atawa sumberdaya bébas séjénna. '''ULAH NGASUPKEUN KARYA NU MIBANDA HAK CIPTA TANPA IDIN!'''",
+'copyrightwarning2'                => "Catet yén sadaya kontribusi ka {{SITENAME}} bisa diédit, dirobah, atawa dihapus ku kontributor séjén. Mun anjeun teu miharep tulisan anjeun dirobah, ulah ngintunkeun ka dieu.<br />
 Anjeun ogé mastikeun yén ieu téh pituin tulisan anjeun, atawa salinan ti domain umum atawa sumberdaya bébas séjénna (tempo $1 pikeun écésna).
-<strong>ULAH NGINTUNKEUN KARYA NU MIBANDA HAK CIPTA TANPA WIDI!</strong>',
+'''ULAH NGINTUNKEUN KARYA NU MIBANDA HAK CIPTA TANPA WIDI!'''",
 'longpagewarning'                  => 'PERHATOSAN: Kaca ieu panjangna $1 kb; sababaraha panyungsi boga masalah dina ngédit kaca nu panjangna nepi ka 32 kb. Mun bisa mah bagi-bagi ieu kaca jadi sababaraha bab.',
-'longpageerror'                    => '<strong>SALAH: Téks anu dikirimkeun gedéna $1 kb, leuwih ti maksimum $2 kb. Téks teu bisa disimpen.</strong>',
-'readonlywarning'                  => "PERHATOSAN: pangkalan data dikonci pikeun diropéa, anjeun moal bisa nyimpen éditan anjeun ayeuna. Cobi ''cut-n-paste'' téksna ka na koropak téks sarta simpen dina waktu séjén.",
-'protectedpagewarning'             => '<strong>PERHATOSAN: Kaca ieu dikonci sahingga ngan bisa dirobah ku pamaké nu statusna kuncén.</strong>',
+'longpageerror'                    => "'''SALAH: Téks anu dikirimkeun gedéna $1 kb, leuwih ti maksimum $2 kb. Téks teu bisa disimpen.'''",
+'readonlywarning'                  => "'''PERHATOSAN''': pangkalan data dikonci pikeun diropéa, anjeun moal bisa nyimpen éditan anjeun ayeuna. Cobi ''cut-n-paste'' téksna ka na koropak téks sarta simpen dina waktu séjén.
+
+kuncén nu ngonci pangkalan data mikeun kajelasan : $1",
+'protectedpagewarning'             => "'''PERHATOSAN: Kaca ieu dikonci sahingga ngan bisa dirobah ku pamaké nu statusna kuncén.'''",
 'semiprotectedpagewarning'         => "'''Perhatoskeun''': ieu kaca dikonci sahingga ukur bisa dirobah ku pamaké nu geus asup log.",
 'cascadeprotectedwarning'          => "'''Awas''': ieu kaca dikonci sahingga ukur bisa dirobah ku kuncén, sabab kaasup {{PLURAL:$1|kaca|kaca}} dina panyalindungan-ngaruntuy di handap ieu:",
-'titleprotectedwarning'            => '<strong>AWAS: Ieu kaca dikonci sahingga ukur bisa dijieun ku sababaraha pamaké anu diwenangkeun.</strong>',
+'titleprotectedwarning'            => "'''AWAS: Ieu kaca dikonci sahingga ukur bisa dijieun ku sababaraha pamaké anu diwenangkeun.'''",
 'templatesused'                    => 'Citakan nu dipaké na kaca ieu:',
 'templatesusedpreview'             => 'Citakan nu dipaké dina ieu pramidang:',
 'templatesusedsection'             => 'Citakan nu dipaké dina ieu bab:',
@@ -630,7 +720,7 @@ Pikeun leuwih écés, di handap dibéréndélkeun log hapusanana:",
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "Inget!: Kaca ieu ngandung réa teuing maké fungsi ''parser''.
 
-Ayeuna aya $1, sakuduna kurang ti $2.",
+Ayeuna aya {{PLURAL:$1|$1 panggilan|$1 panggilan}}, sakuduna kurang ti $2 {{PLURAL:$2|panggilan|panggilan}}.",
 'expensive-parserfunction-category'       => 'Kaca kalawan réa teuing maké fungsi parser',
 'post-expand-template-inclusion-warning'  => 'Inget! : Ukuran citakan anu dipaké badag teuing.
 Sawatara citakan baris teu diasupkeun.',
@@ -650,30 +740,28 @@ Sawatara citakan baris teu diasupkeun.',
 Alesanana $3 cenah ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Tempo log kaca ieu',
-'nohistory'           => 'Teu aya jujutan édit pikeun kaca ieu.',
-'revnotfound'         => 'Révisi teu kapanggih',
-'revnotfoundtext'     => 'Révisi heubeul kaca nu dipénta ku anjeun teu bisa kapanggih.
-Please check the URL you used to access this page.',
-'currentrev'          => 'Révisi kiwari',
-'revisionasof'        => 'Révisi nurutkeun $1',
-'revision-info'       => 'Révisi per $1; $2',
-'previousrevision'    => '� Révisi leuwih heubeul',
-'nextrevision'        => 'Révisi nu leuwih anyar →',
-'currentrevisionlink' => 'Témbongkeun révisi kiwari',
-'cur'                 => 'kiw',
-'next'                => 'salajengna',
-'last'                => 'ahir',
-'page_first'          => 'mimiti',
-'page_last'           => 'tung-tung',
-'histlegend'          => 'Pilihan béda: tandaan wadah buleud vérsina pikeun ngabandingkeun sarta pencét énter atawa tombol di handap.<br />
+'viewpagelogs'           => 'Tempo log kaca ieu',
+'nohistory'              => 'Teu aya jujutan édit pikeun kaca ieu.',
+'currentrev'             => 'Révisi kiwari',
+'revisionasof'           => 'Révisi nurutkeun $1',
+'revision-info'          => 'Révisi per $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Révisi leuwih heubeul',
+'nextrevision'           => 'Révisi nu leuwih anyar →',
+'currentrevisionlink'    => 'Témbongkeun révisi kiwari',
+'cur'                    => 'kiw',
+'next'                   => 'salajengna',
+'last'                   => 'ahir',
+'page_first'             => 'mimiti',
+'page_last'              => 'tung-tung',
+'histlegend'             => 'Pilihan béda: tandaan wadah buleud vérsina pikeun ngabandingkeun sarta pencét énter atawa tombol di handap.<br />
 Katerangan: (kiw) = bédana jeung vérsi kiwari,
 (ahir) = bédana jeung vérsi nu harita, m = éditan minor.',
-'deletedrev'          => '[dihapus]',
-'histfirst'           => 'Pangheubeulna',
-'histlast'            => 'Pangahirna',
-'historysize'         => '($1 {{PLURAL:$1|bit|bit}})',
-'historyempty'        => '(kosong)',
+'history-fieldset-title' => 'Sungsi jujutan',
+'deletedrev'             => '[dihapus]',
+'histfirst'              => 'Pangheubeulna',
+'histlast'               => 'Pangahirna',
+'historysize'            => '($1 {{PLURAL:$1|bit|bit}})',
+'historyempty'           => '(kosong)',
 
 # Revision feed
 'history-feed-title'          => 'Sajarah révisi',
@@ -770,8 +858,9 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 
 # Search results
 'searchresults'             => 'Hasil néangan',
+'searchresults-title'       => 'Hasil nyusud "$1"',
 'searchresulttext'          => 'Pikeun iber nu leuwih lengkep ngeunaan nyaksrak di {{SITENAME}}, buka [[{{MediaWiki:Helppage}}|Nyaksrak {{SITENAME}}]].',
-'searchsubtitle'            => 'Pikeun pamundut "[[:$1]]"',
+'searchsubtitle'            => 'Anjeun nyusud \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|sakabéh kaca nu dimimitian ku "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|sakabéh kaca nu numbu ka "$1"]])',
 'searchsubtitleinvalid'     => 'Pikeun pamundut "$1"',
 'noexactmatch'              => "'''Euweuh kaca nu judulna \"\$1\".''' Anjeun bisa [[:\$1|nyieun ieu kaca]].",
 'noexactmatch-nocreate'     => "'''Euweuh kaca nu judulna \"\$1\".'''",
@@ -783,6 +872,7 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 'prevn'                     => '$1 saméméhna',
 'nextn'                     => '$1 salajengna',
 'viewprevnext'              => 'Témbongkeun ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Pitulung',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 kecap|$2 kecap}})',
 'search-result-score'       => 'Kacocogan: $1%',
 'search-redirect'           => '(alihan $1)',
@@ -798,8 +888,9 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 'searchall'                 => 'sadayana',
 'showingresults'            => "Di handap ieu némbongkeun {{PLURAL:$1|'''1''' hasil|'''$1''' hasil}}, dimimitianku  #'''$2'''.",
 'showingresultsnum'         => "Di handap ieu némbongkeun {{PLURAL:$3|'''1''' hasil|'''$3''' hasil}}, dimimitian #'''$2'''.",
-'showingresultstotal'       => "Nembongkeun {{PLURAL:$3|Hasil '''$1''' ti '''$3'''|hasil '''$1 - $2''' ti '''$3'''}} sungsi",
-'nonefound'                 => '<strong>Catetan</strong>: panéangan nu teu hasil mindeng disababkeun ku néang kecap umum kawas "ti" nu teu diasupkeun kana indéks, atawa alatan nangtukeun leuwih ti hiji istilah panéang (ngan kaca-kaca nu ngandung sakabéh istilah panéang nu bakal némbongan).',
+'showingresultstotal'       => "Nembongkeun {{PLURAL:$4|hasil '''$1'''|'''$1 - $2'''}} ti '''$3''' sungsi",
+'nonefound'                 => "'''Catetan''': Ti buhunna (default), panyusud téh ukur ngawengku sababaraha ngaran rohang.
+Coba susud dimimitian ku ''all:'' pikeun nyusud sakabéh kandunganana (kaasup kaca obrolan, citakan, jsb.) atawa pilih rohang ngaran dina awalanana luyu jeung nu dimaksud.",
 'powersearch'               => 'Sungsi',
 'powersearch-legend'        => 'Panéangan tuluy',
 'powersearch-ns'            => 'Téangan di ngaranspasi:',
@@ -823,6 +914,7 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 'qbsettings-floatingright' => 'Ngambang ka katuhu',
 'changepassword'           => 'Robah sandi',
 'skin'                     => 'Kulit',
+'skin-preview'             => 'Pramidang',
 'math'                     => 'Maté',
 'dateformat'               => 'Format titimangsa',
 'datedefault'              => 'Tanpa préferénsi',
@@ -843,9 +935,6 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 'prefs-misc'               => 'Pangaturan rupa-rupa',
 'saveprefs'                => 'Simpen préferénsi',
 'resetprefs'               => 'Sét ulang préferénsi',
-'oldpassword'              => 'Sandi heubeul',
-'newpassword'              => 'Sandi anyar:',
-'retypenew'                => 'Ketik ulang sandi',
 'textboxsize'              => 'Ukuran kotak téks',
 'rows'                     => 'Baris',
 'columns'                  => 'Kolom',
@@ -875,7 +964,7 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 'userrights-lookup-user'      => 'Atur gorombolan pamaké',
 'userrights-user-editname'    => 'Asupkeun landihan:',
 'editusergroup'               => 'Édit Golongan Pamaké',
-'editinguser'                 => "Ngarobah hak pamaké '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ngarobah hak pamaké '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Édit gorombolan pamaké',
 'saveusergroups'              => 'Simpen Grup Pamaké',
 'userrights-groupsmember'     => 'Anggota ti:',
@@ -1003,12 +1092,12 @@ Pastikeun yén ieu parobahan bisa miara jujutan kaca sagemblengna.',
 
 Mun geus aya koropak na wiki nu ngaranna sarua jeung nu disebutkeun ku anjeun, koropak nu geus lila bakal diganti otomatis. Mangka, iwal ti pikeun ngaropéa hiji koropak, tangtu leuwih hadé mun anjeun mariksa heula bisi koropak nu sarupa geus aya.
 
-Pikeun némbongkeun atawa néang gambar-gambar nu pernah dimuat saméméhna, mangga lebet ka [[Special:ImageList|daptar gambar nu dimuat]]. Muatan sarta hapusan kadaptar dina log [[Special:Log/upload|log muatan]].
+Pikeun némbongkeun atawa néang gambar-gambar nu pernah dimuat saméméhna, mangga lebet ka [[Special:FileList|daptar gambar nu dimuat]]. Muatan sarta hapusan kadaptar dina log [[Special:Log/upload|log muatan]].
 
 Paké formulir di handap pikeun ngamuat koropak gambar anyar pikeun ilustrasi kaca anjeun. Na kalolobaan panyungsi, anjeun bakal manggihan tombol \"Sungsi/''Browse''...\", nu bakal nganteur ka dialog muka-koropak nu baku na sistim operasi anjeun. Milih hiji koropak bakal ngeusian ngaran koropakna kana rohangan téks gigireun tombol nu tadi. Anjeun ogé kudu nyontréng kotak nu nandakeun yén anjeun teu ngarumpak hak cipta batur ku dimuatna ieu koropak. Pencét tombol \"Muatkeun/''Upload''\" pikeun ngeréngsékeun muatan. Prosés ieu bisa lila mun anjeun migunakeun sambungan internét nu lambat.
 
 Format nu dianjurkeun nyéta JPEG pikeun gambar fotografik, PNG pikeun hasil ngagambar sarta gambar séjénna, sarta OGG pikeun sora. Pilih ngaran koropak nu déskriptif sangkan teu ngalieurkeun. Pikeun ngasupkeun gambarna na kaca séjén, pigunakeun tumbu dina wujud
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Gambar.jpg]]</nowiki></tt>''' pikeun gambar dina ukuran aslina
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Gambar.jpg]]</nowiki></tt>''' pikeun gambar dina ukuran aslina
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Berkas.ogg]]</nowiki></tt>''' pikeun sora.
 
 Catet yén salaku kaca wiki, nu séjén bisa ngarobah atawa ngahapus muatan anjeun mun maranéhna nganggap ieu saluyu jeung kapentingan proyék, sarta anjeun bisa waé dipeungpeuk ti ngamuat koropak mun anjeun ngaruksak/ngaganggu sistim.",
@@ -1038,10 +1127,10 @@ Catet yén salaku kaca wiki, nu séjén bisa ngarobah atawa ngahapus muatan anje
 'large-file'                  => 'Hadéna mah koropak nu dimuat téh teu leuwih ti $1 bit; ieu koropak gedéna $2 bit.',
 'largefileserver'             => 'Ieu koropak badag teuing, ngaleuwihan wates nu diwenangkeun ku server.',
 'emptyfile'                   => "Koropak nu dimuatkeun ku anjeun jigana kosong. Hal ieu bisa jadi alatan sarupaning ''typo'' na ngaran koropakna. Mangga parios deui yén anjeun leres-leres hoyong ngamuat koropak éta.",
-'fileexists'                  => 'Koropak nu ngaranna kieu geus aya, mangga parios <strong><tt>$1</tt></strong> mun anjeun teu yakin rék ngaganti.',
+'fileexists'                  => "Koropak nu ngaranna kieu geus aya, mangga parios '''<tt>$1</tt>''' mun anjeun teu yakin rék ngaganti.",
 'fileexists-thumb'            => "<center>'''Koropak nu aya'''</center>",
-'fileexists-forbidden'        => 'Koropak nu ngaranna ieu geus aya; mangga balik deui sarta muatkeun koropakna maké ngaran nu béda. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => "Koropak nu ngaranna ieu geus aya dina gudang koropak babagi (''shared file repository''); mangga balik deui sarta muatkeun koropak ieu maké ngaran nu béda. [[Image:$1|thumb|center|$1]]",
+'fileexists-forbidden'        => 'Koropak nu ngaranna ieu geus aya; mangga balik deui sarta muatkeun koropakna maké ngaran nu béda. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => "Koropak nu ngaranna ieu geus aya dina gudang koropak babagi (''shared file repository''); mangga balik deui sarta muatkeun koropak ieu maké ngaran nu béda. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Gambar ieu duplikat sareng {{PLURAL:$1|gambar|gambar}}:',
 'successfulupload'            => 'Ngamuat geus hasil',
 'uploadwarning'               => 'Pépéling ngamuat',
@@ -1073,17 +1162,17 @@ Catet yén salaku kaca wiki, nu séjén bisa ngarobah atawa ngahapus muatan anje
 'upload_source_url'  => '(URL nu sohéh sarta bisa dibuka ku umum)',
 'upload_source_file' => ' (koropak dina komputer salira)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Sungsi ngaran média:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Sungsi ngaran média:',
 'imgfile'               => 'koropak',
-'imagelist'             => 'Daptar gambar',
-'imagelist_date'        => 'Titimangsa',
-'imagelist_name'        => 'Ngaran',
-'imagelist_user'        => 'Pamaké',
-'imagelist_size'        => 'Badagna',
-'imagelist_description' => 'Pedaran',
-
-# Image description page
+'listfiles'             => 'Daptar gambar',
+'listfiles_date'        => 'Titimangsa',
+'listfiles_name'        => 'Ngaran',
+'listfiles_user'        => 'Pamaké',
+'listfiles_size'        => 'Badagna',
+'listfiles_description' => 'Pedaran',
+
+# File description page
 'filehist'                       => 'Sajarah gambar',
 'filehist-help'                  => 'Klik dina titimangsa pikeun nempo koropak nu aya dina mangsa éta.',
 'filehist-deleteall'             => 'hapus kabéh',
@@ -1095,7 +1184,7 @@ Catet yén salaku kaca wiki, nu séjén bisa ngarobah atawa ngahapus muatan anje
 'filehist-dimensions'            => 'Ukuran',
 'filehist-filesize'              => 'Ukuran koropak',
 'filehist-comment'               => 'Kamandang',
-'imagelinks'                     => 'Tumbu gambar',
+'imagelinks'                     => 'Tumbu koropak',
 'linkstoimage'                   => 'Kaca ieu  {{PLURAL:$1|numbu|$1 numbu}} ka gambar ieu :',
 'nolinkstoimage'                 => 'Teu aya kaca nu numbu ka gambar ieu.',
 'sharedupload'                   => 'Ieu koropak téh muatan réréongan nu bisa jadi dipaké ku proyék-proyék lianna.',
@@ -1130,7 +1219,6 @@ Catet yén salaku kaca wiki, nu séjén bisa ngarobah atawa ngahapus muatan anje
 'filedelete-success-old'      => "Vérsi '''[[Media:$1|$1]]''' $3, $2 geus dihapus.",
 'filedelete-nofile'           => "Teu aya '''$1'''.",
 'filedelete-nofile-old'       => "Euweuh arsip vérsi '''$1''' nu tetenggerna kawas kitu.",
-'filedelete-iscurrent'        => 'Anjeun rék ngahapus vérsi paling anyar ieu koropak. Balikkeun ka vérsi nu leuwih heubeul heula atuh.',
 'filedelete-otherreason'      => 'Alesan séjén/panambah:',
 'filedelete-reason-otherlist' => 'Alesan séjén',
 'filedelete-reason-dropdown'  => '*Alesan nu ilahar
@@ -1158,26 +1246,21 @@ Saméméh ngahapus, pariksa heula bisi aya tumbu ka ieu citakan.',
 
 # Random page
 'randompage'         => 'Kaca acak',
-'randompage-nopages' => 'Euweuh kaca dina ieu spasi ngaran.',
+'randompage-nopages' => 'Euweuh kaca dina ieu spasi ngaran "$1".',
 
 # Random redirect
 'randomredirect'         => 'Alihan acak',
-'randomredirect-nopages' => 'Euweuh alihan dina ieu spasi ngaran.',
+'randomredirect-nopages' => 'Euweuh alihan dina ieu spasi ngaran "$1".',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Statistika {{SITENAME}}',
-'userstats'              => 'Statistik pamaké',
-'sitestatstext'          => "Jumlah-jamléh aya {{PLURAL:\$1|'''\$1''' kaca}} dina pangkalan data, kaasup kaca \"obrolan\", kaca-kaca ngeunaan {{SITENAME}}, kaca \"tukung\", alihan, sarta nu séjénna nu meureun teu kaasup artikel.  Lian ti nu éta, aya {{PLURAL:\$2|'''\$2''' kaca }} nu dianggap artikel nu bener.
-
-'''\$8''' {{PLURAL:\$8|koropak|koropak}} koropak geus dimuat.
-
-Jumlah-jamléh geus aya '''\$3''' {{PLURAL:\$3|kaca}} ulasan sarta '''\$4''' {{PLURAL:\$4|éditan}} ti saprak {{SITENAME}} ieu ngadeg. Jadi hartina aya rata-rata '''\$5''' éditan per kaca sarta '''\$6''' ulasan per édit.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Antrian gawé] lobana '''\$7'''.",
-'userstatstext'          => "Aya '''$1''' [[Special:ListUsers|{{PLURAL:$1|pamaké|pamaké}}]] nu kadaptar.
-'''$2''' ($4) di antarana boga hak $5.",
-'statistics-mostpopular' => 'Kaca nu pangmindengna dibuka',
+'statistics'              => 'Statistik',
+'statistics-header-pages' => 'Statistik kaca',
+'statistics-header-edits' => 'Statistik éditan',
+'statistics-header-views' => 'Statistik pidangan',
+'statistics-header-users' => 'Statistik pamaké',
+'statistics-articles'     => 'Halaman eusi',
+'statistics-pages'        => 'Kaca',
+'statistics-mostpopular'  => 'Kaca nu pangmindengna dibuka',
 
 'disambiguations'      => 'Kaca disambiguasi',
 'disambiguationspage'  => 'Project:Tumbu_ka_kaca_disambiguasi',
@@ -1264,8 +1347,6 @@ Sahiji kaca dianggap minangka kaca disambiguasi lamun kaca kasebut ngagunakeun c
 'speciallogtitlelabel' => 'Judul:',
 'log'                  => 'Log',
 'all-logs-page'        => 'Kabéh log',
-'log-search-legend'    => 'Sungsi log',
-'log-search-submit'    => 'Jung',
 'alllogstext'          => 'Béréndélan sakabéh log nu aya di {{SITENAME}}.
 Bisa dipondokkeun ku cara milih tipe log, ngaran pamaké, atawa kaca nu dimaksud.',
 'logempty'             => 'Taya item nu cocog dina log.',
@@ -1295,11 +1376,31 @@ Baca ogé [[Special:WantedCategories|kategori nu dipikabutuh]].',
 'categoriesfrom'                => 'Tembongkeun kategori-kategori dimimitian ku:',
 'special-categories-sort-count' => 'ngurut numutkeun jumlah',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Kontribusi nu dihapus',
+
+# Special:LinkSearch
+'linksearch'       => 'Sungsi tumbu ramat',
+'linksearch-pat'   => 'Pola sungsi:',
+'linksearch-ns'    => 'Spasi ngaran:',
+'linksearch-ok'    => 'Sungsi',
+'linksearch-text'  => "''Wildcard'' sarupaning \"*.wikipedia.org\" bisa dipaké.<br />Protokol nu dirojong: <tt>\$1</tt>",
+'linksearch-line'  => '$1 ditumbu ti $2',
+'linksearch-error' => "''Wildcard'' ngan bisa némbongan dina awal ngaran indung (''host'').",
+
 # Special:ListUsers
 'listusersfrom'      => 'Témbongkeun pamaké nu dimimitian ku',
 'listusers-submit'   => 'Témbongkeun',
 'listusers-noresult' => 'Teu kapendak.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Log pamaké anyar',
+'newuserlogpagetext'          => 'Di handap ieu béréndélan log pamaké anyar.',
+'newuserlog-byemail'          => 'Sandi geus dikirim maké surélék.',
+'newuserlog-create-entry'     => 'Pamaké anyar',
+'newuserlog-create2-entry'    => 'rekening pikeun $1 geus dijieun',
+'newuserlog-autocreate-entry' => 'rekening pamaké dijieun sacara otomatis',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'Hak-hak grup pamaké',
 'listgrouprights-summary'  => 'Ieu mangrupa daptar jumplukan pamaké anu aya di wiki ieu, kalawan daptar hak aksés maranéhanana.
@@ -1361,12 +1462,6 @@ Jaga, parobahan na kaca ieu katut kaca obrolanana bakal dibéréndélkeun di din
 'iteminvalidname'      => "Masalah dina '$1', ngaran teu bener...",
 'wlnote'               => "Di handap ieu mangrupa $1 {{PLURAL:$1|robahan|robahan}} ahir salila '''$2''' jam.",
 'wlshowlast'           => 'Témbongkeun $1 jam $2 poé $3 ahir',
-'watchlist-show-bots'  => 'Témbongkeun éditan bot',
-'watchlist-hide-bots'  => 'Sumputkeun éditan bot',
-'watchlist-show-own'   => 'Témbongkeun éditan kuring',
-'watchlist-hide-own'   => 'Sumputkeun éditan kuring',
-'watchlist-show-minor' => 'Témbongkeun éditan leutik',
-'watchlist-hide-minor' => 'Sumputkeun éditan leutik',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ngawaskeun...',
@@ -1404,62 +1499,67 @@ Pikeun ngarobah setélan dabtar awaseun anjeun, sindang ka {{SERVER}}{{localurl:
 Asupan jeung bantuan salajengna:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Hapus kaca',
-'confirm'                     => 'Konfirmasi',
-'excontent'                   => "eusina nu heubeul: '$1'",
-'excontentauthor'             => "eusina: '$1' (nu ditulis ku '$2' wungkul)",
-'exbeforeblank'               => "eusi méméh dikosongkeun nyéta: '$1'",
-'exblank'                     => 'kaca ieu kosong',
-'delete-confirm'              => 'Hapus "$1"',
-'delete-legend'               => 'Hapus',
-'historywarning'              => 'Perhatosan: Kaca nu rék dihapus mibanda',
-'confirmdeletetext'           => 'Anjeun rék ngahapus hiji kaca atawa gambar katut jujutanana tina pangkalan data, mangga yakinkeun yén anjeun mémang niat midamel ieu, yén anjeun ngartos kana sagala konsékuénsina, sarta yén anjeun ngalakukeun ieu saluyu jeung [[{{MediaWiki:Policy-url}}|kawijakan {{SITENAME}}]].',
-'actioncomplete'              => 'Peta geus réngsé',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" geus dihapus. Tempo $2 pikeun rékaman hapusan anyaran ieu.',
-'deletedarticle'              => 'ngahapus "$1"',
-'dellogpage'                  => 'Log_hapusan',
-'dellogpagetext'              => 'Di handap ieu daptar hapusan nu ahir-ahir, sakabéh wanci dumasar wanci server.',
-'deletionlog'                 => 'log hapusan',
-'reverted'                    => 'Malikkeun ka révisi nu ti heula',
-'deletecomment'               => 'Alesan ngahapus',
-'deleteotherreason'           => 'Alesan séjén/panambih:',
-'deletereasonotherlist'       => 'Alesan séjén',
-'deletereason-dropdown'       => '*Alesan ilahar
+# Delete
+'deletepage'             => 'Hapus kaca',
+'confirm'                => 'Konfirmasi',
+'excontent'              => "eusina nu heubeul: '$1'",
+'excontentauthor'        => "eusina: '$1' (nu ditulis ku '$2' wungkul)",
+'exbeforeblank'          => "eusi méméh dikosongkeun nyéta: '$1'",
+'exblank'                => 'kaca ieu kosong',
+'delete-confirm'         => 'Hapus "$1"',
+'delete-legend'          => 'Hapus',
+'historywarning'         => 'Perhatosan: Kaca nu rék dihapus mibanda',
+'confirmdeletetext'      => 'Anjeun rék ngahapus hiji kaca atawa gambar katut jujutanana tina pangkalan data, mangga yakinkeun yén anjeun mémang niat midamel ieu, yén anjeun ngartos kana sagala konsékuénsina, sarta yén anjeun ngalakukeun ieu saluyu jeung [[{{MediaWiki:Policy-url}}|kawijakan {{SITENAME}}]].',
+'actioncomplete'         => 'Peta geus réngsé',
+'deletedtext'            => '"<nowiki>$1</nowiki>" geus dihapus. Tempo $2 pikeun rékaman hapusan anyaran ieu.',
+'deletedarticle'         => 'ngahapus "$1"',
+'dellogpage'             => 'Log_hapusan',
+'dellogpagetext'         => 'Di handap ieu daptar hapusan nu ahir-ahir, sakabéh wanci dumasar wanci server.',
+'deletionlog'            => 'log hapusan',
+'reverted'               => 'Malikkeun ka révisi nu ti heula',
+'deletecomment'          => 'Alesan ngahapus',
+'deleteotherreason'      => 'Alesan séjén/panambih:',
+'deletereasonotherlist'  => 'Alesan séjén',
+'deletereason-dropdown'  => '*Alesan ilahar
 ** Paménta pamaké
 ** Ngarumpak hak cipta
 ** Vandalismeu',
-'delete-edit-reasonlist'      => 'Alesan ngahapus éditan',
-'delete-toobig'               => 'Jujutan édit ieu kaca panjang pisan, leuwih ti {{PLURAL:$1|révisi|révisi}}.
+'delete-edit-reasonlist' => 'Alesan ngahapus éditan',
+'delete-toobig'          => 'Jujutan édit ieu kaca panjang pisan, leuwih ti {{PLURAL:$1|révisi|révisi}}.
 Hal ieu teu diwenangkeun pikeun nyegah karuksakan {{SITENAME}} nu teu dihaja.',
-'delete-warning-toobig'       => 'Jujutan ieu kaca panjang pisan, leuwih ti{{PLURAL:$1|révisi|révisi}}. Dihapusna ieu kaca bisa ngaruksak jalanna pangkalan data {{SITENAME}}; sing ati-ati.',
-'rollback'                    => 'Balikkeun éditan',
-'rollback_short'              => 'Balikkeun',
-'rollbacklink'                => 'balikkeun',
-'rollbackfailed'              => 'Gagal malikkeun',
-'cantrollback'                => 'Éditan teu bisa dibalikkeun; kontribusi panungtung ngarupakeun hiji-hijina panulis kaca ieu.',
-'alreadyrolled'               => 'Teu bisa mulangkeun édit ahir [[$1]] ku [[User:$2|$2]] ([[User talk:$2|Obrolan]]); geus aya nu ngédit atawa mulangkeun kacana.
+'delete-warning-toobig'  => 'Jujutan ieu kaca panjang pisan, leuwih ti{{PLURAL:$1|révisi|révisi}}. Dihapusna ieu kaca bisa ngaruksak jalanna pangkalan data {{SITENAME}}; sing ati-ati.',
+
+# Rollback
+'rollback'         => 'Balikkeun éditan',
+'rollback_short'   => 'Balikkeun',
+'rollbacklink'     => 'balikkeun',
+'rollbackfailed'   => 'Gagal malikkeun',
+'cantrollback'     => 'Éditan teu bisa dibalikkeun; kontribusi panungtung ngarupakeun hiji-hijina panulis kaca ieu.',
+'alreadyrolled'    => 'Teu bisa mulangkeun édit ahir [[$1]] ku [[User:$2|$2]] ([[User talk:$2|Obrolan]]); geus aya nu ngédit atawa mulangkeun kacana.
 
 Édit ahir ku [[User:$3|$3]] ([[User talk:$3|Obrolan]]).',
-'editcomment'                 => 'Komentar ngéditna: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Malikkeun éditan $2, diganti deui ka vérsi ahir ku $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Mulangkeun éditan $1; balik deui ka vérsi panungtung ku $2.',
-'sessionfailure'              => 'Sigana aya masalah jeung termin log anjeun; peta ieu geus dibolaykeun salaku pépéling pikeun ngalawan ayana pangbajak. Mangga pencét "back" jeung muat ulang ti kaca asal anjeun, lajeng cobaan deui.',
+'editcomment'      => "Komentar ngéditna: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Malikkeun éditan $2, diganti deui ka vérsi ahir ku $1', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Mulangkeun éditan $1; balik deui ka vérsi panungtung ku $2.',
+'sessionfailure'   => 'Sigana aya masalah jeung termin log anjeun; peta ieu geus dibolaykeun salaku pépéling pikeun ngalawan ayana pangbajak. Mangga pencét "back" jeung muat ulang ti kaca asal anjeun, lajeng cobaan deui.',
+
+# Protect
 'protectlogpage'              => 'Log_koncian',
 'protectlogtext'              => 'Di handap ieu mangrupa daptar koncian kaca. Tempo [[Special:ProtectedPages|kaca nu dikonci]] pikeun iber leuwih lengkep.',
 'protectedarticle'            => 'ngonci $1',
 'modifiedarticleprotection'   => 'hambalan koncian "[[$1]]" geus dirobah',
 'unprotectedarticle'          => 'muka konci $1',
 'protect-title'               => 'Ngonci "$1"',
+'prot_1movedto2'              => 'mindahkeun [[$1]] ka [[$2]]',
 'protect-legend'              => 'Konfirmasi ngonci',
 'protectcomment'              => 'Alesan ngonci',
 'protectexpiry'               => 'Kadaluwarsa',
 'protect_expiry_invalid'      => 'Waktu kadaluwarsa teu sah.',
 'protect_expiry_old'          => 'Waktu kadaluwarsa geus kaliwat.',
 'protect-unchain'             => 'Buka konci pamindahan',
-'protect-text'                => 'Di dieu anjeun bisa nempo sarta ngarobah hambalan pangonci pikeun kaca <strong>$1</strong>.',
-'protect-locked-blocked'      => 'Anjeun teu bisa ngarobah hambalan koncian sabab keur dipeungpeuk. Setélan ayeuna pikeun kaca <strong>$1</strong> nyaéta:',
-'protect-locked-access'       => 'Rekening anjeun teu wenang ngarobah hambalan pangonci kaca. Kaca <strong>$1</strong> disetél:',
+'protect-text'                => "Di dieu anjeun bisa nempo sarta ngarobah hambalan pangonci pikeun kaca '''$1'''.",
+'protect-locked-blocked'      => "Anjeun teu bisa ngarobah hambalan koncian sabab keur dipeungpeuk. Setélan ayeuna pikeun kaca '''$1''' nyaéta:",
+'protect-locked-access'       => "Rekening anjeun teu wenang ngarobah hambalan pangonci kaca. Kaca '''$1''' disetél:",
 'protect-cascadeon'           => 'Ieu kaca dikonci sabab kaasup {{PLURAL:$1|kaca nu|kaca-kaca nu}} ngajalankeun pangonci ngaruntuy. Anjeun bisa ngarobah hambalan koncian ieu kaca, tapi ieu moal mangaruhan pangonci ngaruntuyna.',
 'protect-default'             => '(buhun)',
 'protect-fallback'            => 'Kudu aya kawenangan "$1"',
@@ -1469,6 +1569,7 @@ Hal ieu teu diwenangkeun pikeun nyegah karuksakan {{SITENAME}} nu teu dihaja.',
 'protect-expiring'            => 'kadaluwarsa $1',
 'protect-cascade'             => 'Konci kaca nu kawengku dina ieu kaca (pangonci ngaruntuy).',
 'protect-cantedit'            => 'Anjeung teu wenang ngarobah hambalan ngonci ieu kaca.',
+'protect-expiry-options'      => '2 jam:2 hours,sapoé:1 day,3 poé:3 days,saminggu:1 week,2 minggu:2 weeks,sabulan:1 month,3 bulan:3 months,6 bulan:6 months,sataun:1 year,tanpa wates:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ngonci:',
 'restriction-level'           => 'Hambalan ngonci:',
 'minimum-size'                => 'Ukuran minimum',
@@ -1491,14 +1592,14 @@ Hal ieu teu diwenangkeun pikeun nyegah karuksakan {{SITENAME}} nu teu dihaja.',
 'undeletepage'                 => 'Témbongkeun atawa simpen deui kaca nu geus dihapus',
 'undeletepagetitle'            => "'''Béréndélan révisi [[:$1]]''' anu dihapus.",
 'viewdeletedpage'              => 'Témbongkeun kaca nu dihapus',
-'undeletepagetext'             => 'Kaca di handap ieu geus dihapus tapi masih kénéh aya na arsip sarta bisa disimpen deui. Arsip aya kalana dibersihan.',
+'undeletepagetext'             => '{{PLURAL:$1|Kaca di handap ieu|Aya $1 kaca}}  geus dihapus tapi masih kénéh aya na arsip sarta bisa disimpen deui. Arsip aya kalana dibersihan.',
 'undeleterevisions'            => '$1 {{PLURAL:$1|révisi|révisi}} diarsipkeun',
 'undeletehistory'              => 'Mun anjeun nyimpen deui kacana, sadaya révisi bakal disimpen deui dina jujutan.
 Mun aya kaca anyar nu ngaranna sarua dijieun deui satutasna dihapus, révisi nu disimpen tadi bakal némbongan salaku jujutan nu ti heula, sarta révisi kiwari kaca nu hirup moal otomatis kaganti.',
 'undeletehistorynoadmin'       => 'Artikel ieu geus dihapus.
 Alesanana bisa dibaca dina katrangan di handap, katut saha waé nu geus ngédit ieu artikel saméméh dihapus.
 Téks aktual révisi nu geus dihapus ieu ngan bisa dibuka ku kuncén.',
-'undelete-revision'            => 'Révisi nu dihapus ti $1 (nepi ka $2) ku $3:',
+'undelete-revision'            => 'Révisi nu dihapus ti $1 (dina $5, $4) ku $3:',
 'undelete-nodiff'              => 'Euweuh revisi nu lewih lila',
 'undeletebtn'                  => 'Simpen deui!',
 'undeletelink'                 => 'pulangkeun',
@@ -1550,7 +1651,6 @@ $1',
 'whatlinkshere'            => 'Nu numbu ka dieu',
 'whatlinkshere-title'      => 'Kaca-kaca nu numbu ka "$1"',
 'whatlinkshere-page'       => 'Kaca:',
-'linklistsub'              => '(Daptar tumbu)',
 'linkshere'                => "Kaca di handap ieu numbu ka '''[[:$1]]''':",
 'nolinkshere'              => "Euweuh kaca nu numbu ka '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Euweuh kaca nu numbu ka '''[[:$1]]''' dina namespace nu dipilih.",
@@ -1614,6 +1714,7 @@ $1',
 'ipblocklist-no-results'      => 'Alamat IP atawa landihan pamaké nu dipundut teu dipeungpeuk.',
 'blocklink'                   => 'peungpeuk',
 'unblocklink'                 => 'buka peungpeuk',
+'change-blocklink'            => 'Robah peungpeuk',
 'contribslink'                => 'kontribusi',
 'autoblocker'                 => 'Otomatis dipeungpeuk sabab alamat IP anjeun sarua jeung "$1". Alesan "$2".',
 'blocklogpage'                => 'Log_peungpeuk',
@@ -1676,6 +1777,8 @@ anjeun kudu bener-bener ngarti kana hal ieu.",
 
 Dina kajadian kitu, mun hayang (jeung perlu) anjeun kudu mindahkeun atawa ngagabungkeun kacana sacara manual.",
 'movearticle'             => 'Pindahkeun kaca',
+'movenologin'             => 'Can asup log',
+'movenologintext'         => 'Anjeun kudu jadi pamaké nu kadaptar tur [[Special:UserLogin|asup log]] pikeun mindahkeun kaca.',
 'movenotallowed'          => 'Anjeung teu boga kawenangan mindahkeun kaca.',
 'newtitle'                => 'Ka judul anyar',
 'move-watch'              => 'Awaskeuneun kaca ieu',
@@ -1706,7 +1809,6 @@ Artikel nu dituju "[[:$1]]" geus aya. Badé dihapus baé sangkan bisa mindahkeun
 'delete_and_move_confirm' => 'Enya, hapus kaca éta',
 'delete_and_move_reason'  => 'Hapus sangkan bisa mindahkeun',
 'selfmove'                => 'Judul sumber jeung tujuanana sarua, lain gé mindahkeun atuh!',
-'immobile_namespace'      => 'Judul nu dituju kaasup kana tipe husus, teu bisa mindahkeun kaca ka ngaranspasi kitu.',
 'imagenocrossnamespace'   => 'Teu bisa mindahkeun gambar ka rohangan ngaran nu lain gambar',
 'imagetypemismatch'       => 'Éksténsi koropak anyar teu cocog jeung tipena',
 'imageinvalidfilename'    => 'Ngaran koropak tujuan teu sah',
@@ -1752,6 +1854,7 @@ Sadaya aktivitas impor transwiki baris kacatet dina [[Special:Log/import|log imp
 'import-interwiki-history'   => 'Salin sakabéh vérsi jujutan pikeun ieu kaca',
 'import-interwiki-submit'    => 'Impor',
 'import-interwiki-namespace' => 'Spasi ngaran tujuan:',
+'import-comment'             => 'Ringkesan:',
 'importtext'                 => 'Mangga ékspor koropakna ti sumber nu dipaké ku wiki migunakeun fungsi Special:Export, simpen na piringan anjeun, teras muatkeun di dieu.',
 'importstart'                => 'Ngimpor kaca...',
 'import-revision-count'      => '$1 {{PLURAL:$1|vérsi heubeul}}',
@@ -1783,13 +1886,13 @@ Sadaya aktivitas impor transwiki baris kacatet dina [[Special:Log/import|log imp
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|vérsi heubel}} ti $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Kaca pamaké kuring',
+'tooltip-pt-userpage'             => 'Kaca pamaké Anjeun',
 'tooltip-pt-anonuserpage'         => 'Kaca pamaké pikeun IP nu ku anjeun keur diédit',
-'tooltip-pt-mytalk'               => 'Kaca obrolan kuring',
+'tooltip-pt-mytalk'               => 'Kaca obrolan Anjeun',
 'tooltip-pt-anontalk'             => 'Sawala ngeunaan éditan ti alamat IP ieu',
 'tooltip-pt-preferences'          => 'Préferénsi kuring',
 'tooltip-pt-watchlist'            => 'Daptar kaca nu diawaskeun ku anjeun parobahanana.',
-'tooltip-pt-mycontris'            => 'Daptar tulisan kuring',
+'tooltip-pt-mycontris'            => 'Daptar tulisan Anjeun',
 'tooltip-pt-login'                => 'Anjeun leuwih hadé asup log, sanajan teu wajib.',
 'tooltip-pt-anonlogin'            => 'Anjeun leuwih hadé asup log, sanajan teu wajib.',
 'tooltip-pt-logout'               => 'Kaluar log',
@@ -1853,12 +1956,12 @@ Sadaya aktivitas impor transwiki baris kacatet dina [[Special:Log/import|log imp
 'notacceptable' => "''Server'' wiki teu bisa nyadiakeun data dina format nu bisa dibaca ku klien anjeun.",
 
 # Attribution
-'anonymous'        => 'Pamaké anonim {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Pamaké|Pamaké-pamaké}} anonim di {{SITENAME}}',
 'siteuser'         => 'Pamaké $1 {{SITENAME}}',
 'lastmodifiedatby' => 'Kaca ieu panungtungan dirobah $2, $1 ku $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Dumasar karya $1.',
 'others'           => 'Séjénna',
-'siteusers'        => 'Pamaké $1 {{SITENAME}}',
+'siteusers'        => '{{PLURAL:$2|Pamaké|Pamaké-pamaké}} {{SITENAME}} $1',
 'creditspage'      => 'Pangajén kaca',
 'nocredits'        => 'Teu aya émbaran pangajén pikeun kaca ieu.',
 
@@ -1912,6 +2015,9 @@ $1',
 'previousdiff' => '� Éditan saméméhna',
 'nextdiff'     => 'Éditan salajengna →',
 
+# Visual comparison
+'visual-comparison' => 'Babandingan visual',
+
 # Media information
 'imagemaxsize'         => 'Watesan gambar na kaca dadaran gambar nepi ka:',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|kaca|kaca}}',
@@ -1922,7 +2028,7 @@ $1',
 'show-big-image'       => 'Résolusi pinuh',
 'show-big-image-thumb' => '<small>Ukuran ieu pidangan: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galeri gambar anyar',
 'imagelisttext'         => "Di handap ieu daptar '''$1''' {{PLURAL:$1|gambar|gambar}} nu disusun $2.",
 'newimages-summary'     => 'Ieu kaca husus ngabéréndélkeun koropak nu alanyar dimuat.',
@@ -2175,21 +2281,9 @@ $1
 mangga pastikeun yén anjeun rék nyieun deui artikel ieu.",
 'recreate'            => 'Jieun deui',
 
-# HTML dump
-'redirectingto' => 'Mindahkeun ka [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Hapus sindangan kaca ieu?
-
-$1',
 'confirm_purge_button' => 'Heug',
-
-# AJAX search
-'searchcontaining' => "Sungsi artikel nu ngandung ''$1''.",
-'searchnamed'      => "Sungsi artikel nu judulna ''$1''.",
-'articletitles'    => "Artikel nu dimimitian ku ''$1''",
-'hideresults'      => 'Sumputkeun hasil',
-'useajaxsearch'    => 'Paké sungsi AJAX',
+'confirm-purge-top'    => 'Hapus sindangan kaca ieu?',
 
 # Multipage image navigation
 'imgmultipageprev' => '&larr; kaca saacana',
diff --git a/languages/messages/MessagesSv.php b/languages/messages/MessagesSv.php
index cc3e1648..2025088a 100644
--- a/languages/messages/MessagesSv.php
+++ b/languages/messages/MessagesSv.php
@@ -13,137 +13,128 @@
  * @author Leo Johannes
  * @author Lokal Profil
  * @author M.M.S.
- * @author Max sonnelid
  * @author Micke
  * @author Najami
  * @author S.Örvarr.S
  * @author Sannab
  * @author Skalman
+ * @author StefanB
  * @author Steinninn
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard'    => 'Standard',
-	'nostalgia'   => 'Nostalgi',
-	'cologneblue' => 'Cologne blå',
-	'monobook'    => 'Monobook',
-	'myskin'      => 'Mitt utseende',
-	'chick'       => 'Chick',
-	'simple'      => 'Enkel',
-	'modern'      => 'Modern',
-);
-
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Special',
-	NS_MAIN           => '',
-	NS_TALK           => 'Diskussion',
-	NS_USER           => 'Användare',
-	NS_USER_TALK      => 'Användardiskussion',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1diskussion',
-	NS_IMAGE          => 'Bild',
-	NS_IMAGE_TALK     => 'Bilddiskussion',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki-diskussion',
-	NS_TEMPLATE       => 'Mall',
-	NS_TEMPLATE_TALK  => 'Malldiskussion',
-	NS_HELP           => 'Hjälp',
-	NS_HELP_TALK      => 'Hjälpdiskussion',
-	NS_CATEGORY       => 'Kategori',
-	NS_CATEGORY_TALK  => 'Kategoridiskussion',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Special',
+	NS_TALK             => 'Diskussion',
+	NS_USER             => 'Användare',
+	NS_USER_TALK        => 'Användardiskussion',
+	NS_PROJECT_TALK     => '$1diskussion',
+	NS_FILE             => 'Fil',
+	NS_FILE_TALK        => 'Fildiskussion',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki-diskussion',
+	NS_TEMPLATE         => 'Mall',
+	NS_TEMPLATE_TALK    => 'Malldiskussion',
+	NS_HELP             => 'Hjälp',
+	NS_HELP_TALK        => 'Hjälpdiskussion',
+	NS_CATEGORY         => 'Kategori',
+	NS_CATEGORY_TALK    => 'Kategoridiskussion',
 );
 
 $namespaceAliases = array(
-	// For compatibility with 1.7 and older
+	'Bild' => NS_FILE,
+	'Bilddiskussion' => NS_FILE_TALK,
 	'MediaWiki_diskussion' => NS_MEDIAWIKI_TALK,
 	'Hjälp_diskussion'     => NS_HELP_TALK
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Dubbla_omdirigeringar' ),
-	'BrokenRedirects'           => array( 'DÃ¥liga_omdirigeringar' ),
+	'DoubleRedirects'           => array( 'Dubbla omdirigeringar' ),
+	'BrokenRedirects'           => array( 'Trasiga omdirigeringar', 'DÃ¥liga omdirigeringar' ),
 	'Disambiguations'           => array( 'Förgreningssidor' ),
 	'Userlogin'                 => array( 'Inloggning' ),
 	'Userlogout'                => array( 'Utloggning' ),
-	'CreateAccount'             => array( 'Skapa_konto' ),
+	'CreateAccount'             => array( 'Skapa konto' ),
 	'Preferences'               => array( 'Inställningar' ),
 	'Watchlist'                 => array( 'Bevakningslista', 'Övervakningslista' ),
-	'Recentchanges'             => array( 'Senaste_ändringar' ),
+	'Recentchanges'             => array( 'Senaste ändringar' ),
 	'Upload'                    => array( 'Uppladdning' ),
-	'Imagelist'                 => array( 'Bildlista' ),
-	'Newimages'                 => array( 'Nya_bilder' ),
+	'Listfiles'                 => array( 'Bildlista' ),
+	'Newimages'                 => array( 'Nya bilder' ),
 	'Listusers'                 => array( 'Användare', 'Användarlista' ),
-	'Listgrouprights'           => array( 'Grupprättigheter' ),
+	'Listgrouprights'           => array( 'Grupprättighetslista' ),
 	'Statistics'                => array( 'Statistik' ),
 	'Randompage'                => array( 'Slumpsida' ),
-	'Lonelypages'               => array( 'Övergivna_sidor', 'Sidor_utan_länkar_till' ),
-	'Uncategorizedpages'        => array( 'Okategoriserade_sidor' ),
-	'Uncategorizedcategories'   => array( 'Okategoriserade_kategorier' ),
-	'Uncategorizedimages'       => array( 'Okategoriserade_bilder' ),
-	'Uncategorizedtemplates'    => array( 'Okategoriserade_mallar' ),
-	'Unusedcategories'          => array( 'Oanvända_kategorier' ),
-	'Unusedimages'              => array( 'Oanvända_bilder' ),
-	'Wantedpages'               => array( 'Önskade_sidor', 'Trasiga_länkar' ),
-	'Wantedcategories'          => array( 'Önskade_kategorier' ),
-	'Missingfiles'              => array( 'Saknade_filer', 'Saknade_bilder' ),
-	'Mostlinked'                => array( 'Mest_länkade_sidor' ),
-	'Mostlinkedcategories'      => array( 'Största_kategorier' ),
-	'Mostlinkedtemplates'       => array( 'Mest_använda_mallar' ),
-	'Mostcategories'            => array( 'Flest_kategorier' ),
-	'Mostimages'                => array( 'Flest_bilder' ),
-	'Mostrevisions'             => array( 'Flest_versioner' ),
-	'Fewestrevisions'           => array( 'Minst_versioner' ),
-	'Shortpages'                => array( 'Korta_sidor' ),
-	'Longpages'                 => array( 'LÃ¥nga_sidor' ),
-	'Newpages'                  => array( 'Nya_sidor' ),
-	'Ancientpages'              => array( 'Gamla_sidor' ),
-	'Deadendpages'              => array( 'Sidor_utan_länkar', 'Sidor_utan_länkar_från' ),
-	'Protectedpages'            => array( 'Skyddade_sidor' ),
-	'Protectedtitles'           => array( 'Skyddade_titlar' ),
-	'Allpages'                  => array( 'Alla_sidor' ),
+	'Lonelypages'               => array( 'Övergivna sidor', 'Sidor utan länkar till' ),
+	'Uncategorizedpages'        => array( 'Okategoriserade sidor' ),
+	'Uncategorizedcategories'   => array( 'Okategoriserade kategorier' ),
+	'Uncategorizedimages'       => array( 'Okategoriserade bilder' ),
+	'Uncategorizedtemplates'    => array( 'Okategoriserade mallar' ),
+	'Unusedcategories'          => array( 'Oanvända kategorier' ),
+	'Unusedimages'              => array( 'Oanvända bilder' ),
+	'Wantedpages'               => array( 'Önskade sidor', 'Trasiga länkar' ),
+	'Wantedcategories'          => array( 'Önskade kategorier' ),
+	'Wantedfiles'               => array( 'Önskade filer' ),
+	'Wantedtemplates'           => array( 'Önskade mallar' ),
+	'Mostlinked'                => array( 'Mest länkade sidor' ),
+	'Mostlinkedcategories'      => array( 'Största kategorier' ),
+	'Mostlinkedtemplates'       => array( 'Mest använda mallar' ),
+	'Mostcategories'            => array( 'Flest kategorier' ),
+	'Mostimages'                => array( 'Flest bilder' ),
+	'Mostrevisions'             => array( 'Flest versioner' ),
+	'Fewestrevisions'           => array( 'Minst versioner' ),
+	'Shortpages'                => array( 'Korta sidor' ),
+	'Longpages'                 => array( 'LÃ¥nga sidor' ),
+	'Newpages'                  => array( 'Nya sidor' ),
+	'Ancientpages'              => array( 'Gamla sidor' ),
+	'Deadendpages'              => array( 'Sidor utan länkar', 'Sidor utan länkar från' ),
+	'Protectedpages'            => array( 'Skyddade sidor' ),
+	'Protectedtitles'           => array( 'Skyddade titlar' ),
+	'Allpages'                  => array( 'Alla sidor' ),
 	'Prefixindex'               => array( 'Prefixindex' ),
 	'Ipblocklist'               => array( 'Blockeringslista' ),
 	'Specialpages'              => array( 'Specialsidor' ),
 	'Contributions'             => array( 'Bidrag' ),
 	'Emailuser'                 => array( 'E-mail' ),
-	'Confirmemail'              => array( 'Bekräfta_epost' ),
-	'Whatlinkshere'             => array( 'Länkar_hit' ),
-	'Recentchangeslinked'       => array( 'Senaste_relaterade_ändringar' ),
+	'Confirmemail'              => array( 'Bekräfta epost' ),
+	'Whatlinkshere'             => array( 'Länkar hit' ),
+	'Recentchangeslinked'       => array( 'Senaste relaterade ändringar' ),
 	'Movepage'                  => array( 'Flytta' ),
-	'Blockme'                   => array( 'Blockera_mig' ),
+	'Blockme'                   => array( 'Blockera mig' ),
 	'Booksources'               => array( 'Bokkällor' ),
 	'Categories'                => array( 'Kategorier' ),
 	'Export'                    => array( 'Exportera' ),
-	'Version'                   => array( 'Version' ),
 	'Allmessages'               => array( 'Systemmeddelanden' ),
 	'Log'                       => array( 'Logg' ),
 	'Blockip'                   => array( 'Blockera' ),
 	'Undelete'                  => array( 'Återställ' ),
 	'Import'                    => array( 'Importera' ),
-	'Lockdb'                    => array( 'LÃ¥s_databasen' ),
-	'Unlockdb'                  => array( 'LÃ¥s_upp_databasen' ),
+	'Lockdb'                    => array( 'LÃ¥s databasen' ),
+	'Unlockdb'                  => array( 'LÃ¥s upp databasen' ),
 	'Userrights'                => array( 'Rättigheter' ),
 	'MIMEsearch'                => array( 'MIME-sökning' ),
 	'FileDuplicateSearch'       => array( 'Dublettfilsökning' ),
-	'Unwatchedpages'            => array( 'Obevakade_sidor' ),
+	'Unwatchedpages'            => array( 'Obevakade sidor' ),
 	'Listredirects'             => array( 'Omdirigeringar' ),
-	'Revisiondelete'            => array( 'Radera_version' ),
-	'Unusedtemplates'           => array( 'Oanvända_mallar' ),
+	'Revisiondelete'            => array( 'Radera version' ),
+	'Unusedtemplates'           => array( 'Oanvända mallar' ),
 	'Randomredirect'            => array( 'Slumpomdirigering' ),
-	'Mypage'                    => array( 'Min_sida' ),
-	'Mytalk'                    => array( 'Min_diskussion' ),
-	'Mycontributions'           => array( 'Mina_bidrag' ),
+	'Mypage'                    => array( 'Min sida' ),
+	'Mytalk'                    => array( 'Min diskussion' ),
+	'Mycontributions'           => array( 'Mina bidrag' ),
 	'Listadmins'                => array( 'Administratörer' ),
 	'Listbots'                  => array( 'Robotlista' ),
-	'Popularpages'              => array( 'Populära_sidor' ),
+	'Popularpages'              => array( 'Populära sidor' ),
 	'Search'                    => array( 'Sök' ),
-	'Resetpass'                 => array( 'Återställ_lösenord' ),
-	'Withoutinterwiki'          => array( 'Utan_interwikilänkar' ),
-	'MergeHistory'              => array( 'Slå_ihop_historik' ),
+	'Resetpass'                 => array( 'Återställ lösenord' ),
+	'Withoutinterwiki'          => array( 'Utan interwikilänkar' ),
+	'MergeHistory'              => array( 'Slå ihop historik' ),
 	'Filepath'                  => array( 'Filsökväg' ),
-	'Invalidateemail'           => array( 'Ogiltigförklara_epost' ),
+	'Invalidateemail'           => array( 'Ogiltigförklara epost' ),
+	'Blankpage'                 => array( 'Tom sida' ),
+	'LinkSearch'                => array( 'Länksökning' ),
+	'DeletedContributions'      => array( 'Raderade bidrag' ),
 );
 
 $magicWords = array(
@@ -268,15 +259,15 @@ $messages = array(
 # User preference toggles
 'tog-underline'               => 'Stryk under länkar',
 'tog-highlightbroken'         => 'Formatera trasiga länkar <a href="" class="new">så här</a> (alternativt: <a href="" class="internal">?</a>).',
-'tog-justify'                 => 'Justera indrag',
+'tog-justify'                 => 'Marginaljustera stycken',
 'tog-hideminor'               => 'Visa inte mindre redigeringar i Senaste ändringar',
 'tog-extendwatchlist'         => 'Utöka bevakningslistan till att visa alla ändringar',
 'tog-usenewrc'                => 'Avancerad Senaste ändringar (Javascript)',
 'tog-numberheadings'          => 'Numrerade rubriker',
 'tog-showtoolbar'             => 'Visa verktygsrad (Javascript)',
 'tog-editondblclick'          => 'Redigera sidor med dubbelklick (Javascript)',
-'tog-editsection'             => 'Möjliggör styckesvis redigering, genom [redigera]-länkar',
-'tog-editsectiononrightclick' => 'Styckesvis redigering via högerklick på underrubriker (Javascript)',
+'tog-editsection'             => 'Aktivera redigering av avsnitt genom [redigera]-länkar',
+'tog-editsectiononrightclick' => 'Aktivera redigering av avsnitt genom högerklick på underrubriker (Javascript)',
 'tog-showtoc'                 => 'Visa innehållsförteckning (för sidor som har minst fyra rubriker)',
 'tog-rememberpassword'        => 'Kom ihåg lösenordet till nästa besök',
 'tog-editwidth'               => 'Full bredd på redigeringsrutan',
@@ -302,17 +293,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Visa inte mina redigeringar i bevakningslistan',
 'tog-watchlisthidebots'       => 'Visa inte robotredigeringar i bevakningslistan',
 'tog-watchlisthideminor'      => 'Visa inte mindre ändringar i bevakningslistan',
+'tog-watchlisthideliu'        => 'Visa inte redigeringar av inloggade användare i bevakningslistan',
+'tog-watchlisthideanons'      => 'Visa inte redigeringar av anonyma användare i bevakningslistan',
 'tog-nolangconversion'        => 'Konvertera inte mellan språkvarianter',
 'tog-ccmeonemails'            => 'Skicka mig kopior av epost jag skickar till andra användare',
 'tog-diffonly'                => 'Visa inte sidinnehåll under diffar',
 'tog-showhiddencats'          => 'Visa dolda kategorier',
+'tog-noconvertlink'           => 'Stäng av konvertering av sidtitlar',
+'tog-norollbackdiff'          => 'Visa inte diff efter tillbakarullning',
 
 'underline-always'  => 'Alltid',
 'underline-never'   => 'Aldrig',
 'underline-default' => 'Webbläsarens standardinställning',
 
-'skinpreview' => '(Förhandsvisning)',
-
 # Dates
 'sunday'        => 'söndag',
 'monday'        => 'måndag',
@@ -406,7 +399,7 @@ $messages = array(
 'mytalk'         => 'Min diskussion',
 'anontalk'       => 'Diskussionssida för denna IP-adress',
 'navigation'     => 'Navigering',
-'and'            => 'och',
+'and'            => '&#32;och',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -443,24 +436,24 @@ $messages = array(
 'talkpagelinktext'  => 'Diskussion',
 'specialpage'       => 'Specialsida',
 'personaltools'     => 'Personliga verktyg',
-'postcomment'       => 'Skicka en kommentar',
+'postcomment'       => 'Nytt avsnitt',
 'articlepage'       => 'Visa innehållssida',
 'talk'              => 'Diskussion',
 'views'             => 'Visningar',
 'toolbox'           => 'Verktygslåda',
 'userpage'          => 'Visa användarsida',
 'projectpage'       => 'Visa projektsida',
-'imagepage'         => 'Visa mediasida',
+'imagepage'         => 'Visa filsida',
 'mediawikipage'     => 'Visa meddelandesida',
 'templatepage'      => 'Visa mallsida',
 'viewhelppage'      => 'Visa hjälpsida',
 'categorypage'      => 'Visa kategorisida',
 'viewtalkpage'      => 'Visa diskussionssida',
-'otherlanguages'    => 'Andra språk',
+'otherlanguages'    => 'På andra språk',
 'redirectedfrom'    => '(Omdirigerad från $1)',
 'redirectpagesub'   => 'Omdirigeringssida',
 'lastmodifiedat'    => 'Sidan ändrades senast den $1 kl. $2.', # $1 date, $2 time
-'viewcount'         => 'Sidan har visats {{PLURAL:$1|en gång|$1 gånger}}.',
+'viewcount'         => 'Denna sidan har visats {{PLURAL:$1|en gång|$1 gånger}}.',
 'protectedpage'     => 'Skrivskyddad sida',
 'jumpto'            => 'Hoppa till:',
 'jumptonavigation'  => 'navigering',
@@ -469,8 +462,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Om {{SITENAME}}',
 'aboutpage'            => 'Project:Om',
-'bugreports'           => 'Felrapporter',
-'bugreportspage'       => 'Project:Felrapporter',
 'copyright'            => 'Innehållet är tillgängligt under $1.',
 'copyrightpagename'    => '{{SITENAME}} upphovsrätt',
 'copyrightpage'        => '{{ns:project}}:Upphovsrätt',
@@ -479,7 +470,7 @@ $messages = array(
 'disclaimers'          => 'Förbehåll',
 'disclaimerpage'       => 'Project:Allmänt förbehåll',
 'edithelp'             => 'Redigeringshjälp',
-'edithelppage'         => 'Help:Hur man redigerar en sida',
+'edithelppage'         => 'Help:Redigering',
 'faq'                  => 'FAQ',
 'faqpage'              => 'Project:FAQ',
 'helppage'             => 'Help:Innehåll',
@@ -493,9 +484,7 @@ $messages = array(
 
 'badaccess'        => 'Behörighetsfel',
 'badaccess-group0' => 'Du har inte behörighet att utföra den handling du begärt.',
-'badaccess-group1' => 'Den handling du har begärt kan enbart utföras av användare i gruppen $1.',
-'badaccess-group2' => 'Den handling du har begärt kan enbart utföras av användare i grupperna $1.',
-'badaccess-groups' => 'Den handling du har begärt kan enbart utföras av användare i grupperna $1.',
+'badaccess-groups' => 'Den handling du har begärt kan enbart utföras av användare i {{PLURAL:$2|gruppen|grupperna}} $1.',
 
 'versionrequired'     => 'Version $1 av MediaWiki krävs',
 'versionrequiredtext' => 'Version $1 av MediaWiki är nödvändig för att använda denna sida. Se [[Special:Version|versionssidan]].',
@@ -509,6 +498,8 @@ $messages = array(
 'editsection'             => 'redigera',
 'editold'                 => 'redigera',
 'viewsourceold'           => 'visa wikitext',
+'editlink'                => 'redigera',
+'viewsourcelink'          => 'visa wikitext',
 'editsectionhint'         => 'Redigera avsnitt: $1',
 'toc'                     => 'Innehåll',
 'showtoc'                 => 'visa',
@@ -523,13 +514,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom-matning',
 'page-rss-feed'           => '"$1" RSS-matning',
 'page-atom-feed'          => '"$1" Atom-matning',
-'red-link-title'          => '$1 (inte skriven än)',
+'red-link-title'          => '$1 (sidan existerar inte)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Sida',
 'nstab-user'      => 'Användarsida',
 'nstab-media'     => 'Media',
-'nstab-special'   => 'Special',
+'nstab-special'   => 'Specialsida',
 'nstab-project'   => 'Projektsida',
 'nstab-image'     => 'Fil',
 'nstab-mediawiki' => 'Systemmeddelande',
@@ -539,8 +530,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Funktionen finns inte',
-'nosuchactiontext'  => 'Den funktion som angivits i URL:en kan inte
-hittas av programvaran',
+'nosuchactiontext'  => 'Den handling som specificerats av URL:en är ogiltig.
+Du kan ha stavat URL:en fel, eller följt en felaktig länk.
+Det kan också bero på en bug i {{SITENAME}}.',
 'nosuchspecialpage' => 'Någon sådan specialsida finns inte',
 'nospecialpagetext' => "<big>'''Du har begärt en specialsida som inte finns.'''</big>
 
@@ -559,13 +551,15 @@ MySQL returnerade felen "$3<tt>: $4</tt>".',
 $1',
 'nodb'                 => 'Kunde inte välja databasen $1',
 'cachederror'          => 'Detta är en cachad kopia av den efterfrågade sidan. Det är inte säkert att den är aktuell.',
-'laggedslavemode'      => '<b>Observera: det kan dröja en stund innan de senaste redigeringarna blir synliga.</b>',
+'laggedslavemode'      => 'Varning: Sidan kan sakna de senaste uppdateringarna.',
 'readonly'             => 'Databasen är skrivskyddad',
 'enterlockreason'      => 'Ange varför sidan skrivskyddats, och ge en uppskattning av hur länge skrivskyddet bör behållas.',
-'readonlytext'         => 'Databasen är tillfälligt låst för ändringar, förmodligen på grund av rutinmässigt underhåll. Efter avslutat arbete kommer den att återgå till normalläge. Den utvecklare som skrivskyddade den har angivit följande anledning: <p>$1',
-'missing-article'      => 'Databasen borde ha funnit texten till en sida med namnet "$1" $2, men det gjorde den inte.
+'readonlytext'         => 'Databasen är tillfälligt låst för nya inlägg och andra modifieringar, förmodligen på grund av rutinmässigt underhåll, efter vilket den kommer den att återgå till normalläge.
 
-Detta fel beror oftast på en länk till en jämförelse mellan versioner (diff) eller till en gammal version av en sida som raderats.
+Den administratör som låste den har angivit följande förklaring: $1',
+'missing-article'      => 'Databasen hittade inte texten för en sida som den borde ha funnit, med namnet "$1" $2.
+
+Detta orsakas oftast av att man följer en inaktuell länk till en jämförelse mellan versioner (diff) eller en historiklänk för en sida som raderats.
 
 Om inte så är fallet, kan du ha hittat en bugg i mjukvaran.
 Rapportera gärna problemet till någon [[Special:ListUsers/sysop|administratör]], ange då URL:en (webbadressen).',
@@ -583,12 +577,12 @@ Rapportera gärna problemet till någon [[Special:ListUsers/sysop|administratör
 'unexpected'           => 'Oväntat värde: "$1"="$2".',
 'formerror'            => 'Fel: Kunde inte sända formulär',
 'badarticleerror'      => 'Den åtgärden kan inte utföras på den här sidan.',
-'cannotdelete'         => 'Det gick inte att radera sidan eller bilden, kanske för att någon annan redan raderat den.',
+'cannotdelete'         => 'Det gick inte att radera den angivna sidan eller filen.
+Den kanske redan blivit raderad av någon annan.',
 'badtitle'             => 'Felaktig titel',
 'badtitletext'         => 'Den begärda sidtiteln är antingen ogiltig eller tom, eller så är titeln felaktigt länkad från en annan wiki.
 Den kan innehålla ett eller flera tecken som inte får användas i sidtitlar.',
-'perfdisabled'         => 'Denna funktion har stängts av tillfälligt, eftersom den gör databasen så långsam att ingen kan använda wikin.',
-'perfcached'           => 'Sidan är hämtad ur ett cacheminne; det är inte säkert att det är den senaste versionen.',
+'perfcached'           => 'Följande data är cachad och är möjligtvis inte helt uppdaterad.',
 'perfcachedts'         => 'Sidan är hämtad ur ett cacheminne och uppdaterades senast $1.',
 'querypage-no-updates' => 'Uppdatering av den här sidan är inte aktiverad. Datan kommer i nuläget inte att uppdateras.',
 'wrong_wfQuery_params' => 'Felaktiga parametrar för wfQuery()<br /> Funktion: $1<br /> Förfrågan: $2',
@@ -597,30 +591,30 @@ Den kan innehålla ett eller flera tecken som inte får användas i sidtitlar.',
 'actionthrottled'      => 'Åtgärden stoppades',
 'actionthrottledtext'  => 'Som skydd mot spam, finns det en begränsning av hur många gånger du kan utföra den här åtgärden under en viss tid. Du har överskridit den gränsen. Försök igen om några minuter.',
 'protectedpagetext'    => 'Den här sidan har skrivskyddats för att förhindra redigering.',
-'viewsourcetext'       => 'Du kan se och kopiera sidans wikikod:',
+'viewsourcetext'       => 'Du kan se och kopiera denna sidas källtext:',
 'protectedinterface'   => 'Denna sida innehåller text för mjukvarans gränssnitt, och är skrivskyddad för att förebygga missbruk.',
 'editinginterface'     => "'''Varning:''' Du redigerar en sida som används till texten i gränssnittet. Ändringar på denna sida kommer att påverka gränssnittets utseende för alla användare.
-För översättningar, använd gärna [http://translatewiki.net/wiki/Main_Page?setlang=sv Betawiki], översättningsprojektet för MediaWiki.",
+För översättningar, använd gärna [http://translatewiki.net/wiki/Main_Page?setlang=sv translatewiki.net], översättningsprojektet för MediaWiki.",
 'sqlhidden'            => '(gömd SQL-förfrågan)',
 'cascadeprotected'     => 'Den här sidan har skyddats från redigering eftersom den inkluderas på följande {{PLURAL:$1|sida|sidor}} som skrivskyddats med "kaskaderande skydd":
 $2',
 'namespaceprotected'   => "Du har inte behörighet att redigera sidor i namnrymden '''$1'''.",
 'customcssjsprotected' => 'Du har inte behörighet att redigera den här sidan eftersom den innehåller en annan användares personliga inställningar.',
 'ns-specialprotected'  => 'Specialsidor kan inte redigeras.',
-'titleprotected'       => "Den här sidtiteln har skyddats från att skapas.
-[[User:$1|$1]] skyddade sidan med motiveringen ''$2''.",
+'titleprotected'       => 'Denna sidtitel har skyddats från att skapas av [[User:$1|$1]].
+Den uppgivna anledningen är "\'\'$2\'\'".',
 
 # Virus scanner
-'virus-badscanner'     => 'Dålig konfigurering: okänd virusskanner: <i>$1</i>',
+'virus-badscanner'     => "Dålig konfigurering: okänd virusskanner: ''$1''",
 'virus-scanfailed'     => 'skanning misslyckades (kod $1)',
 'virus-unknownscanner' => 'okänt antivirusprogram:',
 
 # Login and logout pages
 'logouttitle'                => 'Användarutloggning',
-'logouttext'                 => '<strong>Du är nu utloggad.</strong>
+'logouttext'                 => "'''Du är nu utloggad.'''
 
 Du kan fortsätta att använda {{SITENAME}} anonymt, eller så kan du [[Special:UserLogin|logga in igen]] som samma eller som en annan användare.
-Observera att det, tills du tömmer din webbläsares cache, på vissa sidor kan se ut som att du fortfarande är inloggad.',
+Observera att det, tills du tömmer din webbläsares cache, på vissa sidor kan se ut som att du fortfarande är inloggad.",
 'welcomecreation'            => '== Välkommen, $1! ==
 Ditt konto har skapats.
 Glöm inte att justera dina [[Special:Preferences|{{SITENAME}}-inställningar]].',
@@ -631,7 +625,6 @@ Glöm inte att justera dina [[Special:Preferences|{{SITENAME}}-inställningar]].
 'remembermypassword'         => 'Automatisk inloggning i framtiden.',
 'yourdomainname'             => 'Din domän',
 'externaldberror'            => 'Antingen inträffade autentiseringsproblem med en extern databas, eller så får du inte uppdatera ditt externa konto.',
-'loginproblem'               => '<b>Det uppstod problem vid inloggningen.</b><br />Pröva igen!',
 'login'                      => 'Logga in',
 'nav-login-createaccount'    => 'Logga in / skapa konto',
 'loginprompt'                => 'Du måste tillåta cookies för att logga in på {{SITENAME}}.',
@@ -651,13 +644,13 @@ Välj ett annat namn.',
 'youremail'                  => 'E-post:',
 'username'                   => 'Användarnamn:',
 'uid'                        => 'Användar-ID:',
-'prefs-memberingroups'       => '{{PLURAL:$1|Användargrupp|Användargrupper}}:',
+'prefs-memberingroups'       => 'Medlem av {{PLURAL:$1|gruppen|grupperna}}:',
 'yourrealname'               => 'Riktigt namn:',
 'yourlanguage'               => 'Språk:',
 'yournick'                   => 'Signatur:',
 'badsig'                     => 'Det är något fel med råsignaturen, kontrollera HTML-koden.',
-'badsiglength'               => 'Signaturen är för lång.
-Den får innehålla högst $1 {{PLURAL:$1|tecken|tecken}}.',
+'badsiglength'               => 'Din signatur är för lång.
+Den måste vara under $1 {{PLURAL:$1|tecken|tecken}}.',
 'email'                      => 'E-post',
 'prefs-help-realname'        => 'Riktigt namn behöver inte anges.
 Om du väljer att ange ditt riktiga namn, kommer det att användas för att tillskriva dig ditt arbete.',
@@ -674,7 +667,8 @@ Aktivera dem, och logga sen in med ditt nya användarnamn och lösenord.',
 'loginsuccesstitle'          => 'Inloggningen lyckades',
 'loginsuccess'               => "'''Du är nu inloggad på {{SITENAME}} som \"\$1\".'''",
 'nosuchuser'                 => 'Det finns ingen användare med namnet "$1".
-Kontrollera stavningen, eller [[Special:UserLogin/signup|skapa ett nytt konto]].',
+Användarnamn är skiftlägeskänsliga.
+Kontrollera din stavning, eller [[Special:UserLogin/signup|skapa ett nytt konto]].',
 'nosuchusershort'            => 'Det finns ingen användare som heter "<nowiki>$1</nowiki>". Kontrollera att du stavat rätt.',
 'nouserspecified'            => 'Du måste ange ett användarnamn.',
 'wrongpassword'              => 'Lösenordet du angav är felaktigt. Försök igen',
@@ -696,10 +690,11 @@ Innan någon annan e-post kan skickas härifrån till kontot, måste du följa i
 'throttled-mailpassword'     => 'Ett nytt lösenord har redan skickats för mindre än {{PLURAL:$1|en timme|$1 timmar}} sedan.
 För att förhindra missbruk skickas bara ett nytt lösenord per {{PLURAL:$1|timme|$1-timmarsperiod}}.',
 'mailerror'                  => 'Fel vid skickande av e-post: $1',
-'acct_creation_throttle_hit' => 'Du har redan skapat $1 användare och kan inte göra fler.',
-'emailauthenticated'         => 'Din e-postadress bekräftades den $1.',
+'acct_creation_throttle_hit' => 'Besökare till den här wikin som har använt din IP-adress har skapat {{PLURAL:$1|1 användarkonto|$1 användarkonton}} under den senaste dagen, vilket är det maximalt tillåtna inom denna tidsperioden.
+Som ett resultat kan inte besökare som använder den här IP-adressen skapa några fler användarkonton just nu.',
+'emailauthenticated'         => 'Din e-postadress bekräftades den $2 kl. $3.',
 'emailnotauthenticated'      => 'Din e-postadress är ännu inte bekräftad. Ingen e-post kommer att skickas vad gäller det följande:',
-'noemailprefs'               => 'Uppge en e-postadress för att dessa funktioner skall gå att använda.',
+'noemailprefs'               => 'Uppge en e-postadress i dina inställningar för att få dessa funktioner att fungera.',
 'emailconfirmlink'           => 'Bekräfta din e-postadress',
 'invalidemailaddress'        => 'E-postadressen kan inte godtas då formatet verkar vara felaktigt.
 Skriv in en adress med korrekt format eller töm fältet.',
@@ -709,18 +704,27 @@ Skriv in en adress med korrekt format eller töm fältet.',
 'createaccount-text'         => 'Någon har skapat ett konto åt din e-postadress på {{SITENAME}} ($4) med namnet "$2" och lösenordet "$3". Du bör nu logga in och ändra ditt lösenord.
 
 Du kan ignorera detta meddelande om kontot skapats av misstag.',
+'login-throttled'            => 'Du har nyligen gjort för många inloggningsförsök med fel lösenord till det här kontot.
+Vänta innan du försöker igen.',
 'loginlanguagelabel'         => 'Språk: $1',
 
 # Password reset dialog
-'resetpass'               => 'Välj nytt lösenord',
-'resetpass_announce'      => 'Du loggade in med ett temporärt lösenord. För att slutföra inloggningen måste du välja ett nytt lösenord.',
-'resetpass_text'          => '<!-- här kan text läggas till -->',
-'resetpass_header'        => 'Ändra lösenord för konto',
-'resetpass_submit'        => 'Spara lösenord och logga in',
-'resetpass_success'       => 'Ditt lösenord ändrades. Du är nu inloggad.',
-'resetpass_bad_temporary' => 'Ditt temporära lösenord är felaktigt. Du kanske redan har loggat in med det eller begärt att få ett nytt tillfälligt lösenord.',
-'resetpass_forbidden'     => 'Lösenord kan inte ändras',
-'resetpass_missing'       => 'Formulärdata saknas.',
+'resetpass'                 => 'Ändra lösenord',
+'resetpass_announce'        => 'Du loggade in med ett temporärt lösenord. För att slutföra inloggningen måste du välja ett nytt lösenord.',
+'resetpass_text'            => '<!-- Lägg till text här -->',
+'resetpass_header'          => 'Ändra lösenord för konto',
+'oldpassword'               => 'Gammalt lösenord:',
+'newpassword'               => 'Nytt lösenord:',
+'retypenew'                 => 'Upprepa det nya lösenordet:',
+'resetpass_submit'          => 'Spara lösenord och logga in',
+'resetpass_success'         => 'Ditt lösenord har ändrats. Nu loggas du in...',
+'resetpass_bad_temporary'   => 'Ditt temporära lösenord är felaktigt. Du kanske redan har loggat in med det eller begärt att få ett nytt tillfälligt lösenord.',
+'resetpass_forbidden'       => 'Lösenord kan inte ändras',
+'resetpass-no-info'         => 'Du måste vara inloggad för att komma åt den här sidan direkt.',
+'resetpass-submit-loggedin' => 'Ändra lösenord',
+'resetpass-wrong-oldpass'   => 'Ogiltigt tillfälligt eller nuvarande lösenord.
+Du kanske redan har lyckats ändra ditt lösenord eller begärt ett nytt tillfälligt lösenord.',
+'resetpass-temp-password'   => 'Tillfälligt lösenord:',
 
 # Edit page toolbar
 'bold_sample'     => 'Fet text',
@@ -739,14 +743,14 @@ Du kan ignorera detta meddelande om kontot skapats av misstag.',
 'nowiki_tip'      => 'Ignorera wikiformatering',
 'image_sample'    => 'Exempel.jpg',
 'image_tip'       => 'Inbäddad fil',
-'media_sample'    => 'Exempel.mp3',
+'media_sample'    => 'Exempel.ogg',
 'media_tip'       => 'Länk till fil',
 'sig_tip'         => 'Din signatur med tidsstämpel',
 'hr_tip'          => 'Horisontell linje (använd sparsamt)',
 
 # Edit pages
-'summary'                          => 'Sammanfattning',
-'subject'                          => 'Ämne/rubrik',
+'summary'                          => 'Sammanfattning:',
+'subject'                          => 'Ämne/rubrik:',
 'minoredit'                        => 'Mindre ändring (m)',
 'watchthis'                        => 'Bevaka denna sida',
 'savearticle'                      => 'Spara',
@@ -760,8 +764,8 @@ Din IP-adress kommer att sparas i historiken för den här sidan.",
 Om du klickar på Spara igen, kommer din redigering att sparas utan en sådan.",
 'missingcommenttext'               => 'Var god och skriv in en kommentar nedan.',
 'missingcommentheader'             => "'''OBS:''' Du har inte skrivit någon rubrik till den här kommentaren. Om du trycker på \"Spara\" igen, så sparas kommentaren utan någon rubrik.",
-'summary-preview'                  => 'Förhandsgranskning av sammanfattning',
-'subject-preview'                  => 'Rubrikförhandsgranskning',
+'summary-preview'                  => 'Förhandsgranskning av sammanfattning:',
+'subject-preview'                  => 'Rubrikförhandsgranskning:',
 'blockedtitle'                     => 'Användaren är blockerad',
 'blockedtext'                      => "<big>'''Din IP-adress eller ditt användarnamn är blockerat.'''</big>
 
@@ -811,36 +815,37 @@ Vänligen ange informationen ovan i alla förfrågningar som du gör i ärendet.
 Därför måste personens numeriska IP-adress användas för att identifiera honom eller henne.
 En sådan IP-adress kan ibland användas av flera olika personer.
 Om du får meddelanden här som inte tycks vara riktade till dig, kan du gärna [[Special:UserLogin/signup|skapa ett konto]] eller [[Special:UserLogin|logga in]]. Då undviker du framtida förväxlingar.''",
-'noarticletext'                    => 'Det finns just nu ingen text på denna sida. Du kan [[Special:Search/{{PAGENAME}}|söka efter denna sidtitel]] i andra sidor eller [{{fullurl:{{FULLPAGENAME}}|action=edit}} redigera denna sida].',
+'noarticletext'                    => 'Det finns just nu ingen text på denna sida.
+Du kan [[Special:Search/{{PAGENAME}}|söka efter denna sidtitel]] på andra sidor, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} söka i loggarna], eller [{{fullurl:{{FULLPAGENAME}}|action=edit}} redigera denna sida]</span>.',
 'userpage-userdoesnotexist'        => '"$1" är inte ett registrerat användarkonto. Tänk efter om du vill skapa/redigera den här sidan.',
 'clearyourcache'                   => "'''Observera: Sedan du sparat sidan kan du behöva tömma din webbläsares cache för att se ändringarna.''' '''Mozilla/Firefox/Safari:''' håll ner ''Skift'' och klicka på ''Reload'' eller tryck antingen ''Ctrl-F5'' eller ''Ctrl-R'' (''Command-R'' på Macintosh); '''Konqueror:''': klicka ''Reload'' eller tryck ''F5;'' '''Opera:''' rensa cachen i ''Tools → Preferences;'' '''Internet Explorer:'''  håll ner ''Ctrl'' och klicka på ''Refresh'' eller tryck ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Tips:</strong> Använd 'Visa förhandsgranskning' för att testa din nya css/js innan du sparar.",
+'usercssjsyoucanpreview'           => "'''Tips:''' Använd 'Visa förhandsgranskning' för att testa din nya css/js innan du sparar.",
 'usercsspreview'                   => "'''Kom ihåg att du bara förhandsgranskar din användar-CSS.
 Den har inte sparats än!'''",
 'userjspreview'                    => "'''Kom ihåg att du bara testar/förhandsgranskar ditt JavaScript, det har inte sparats än!'''",
 'userinvalidcssjstitle'            => "'''Varning:''' Skalet \"\$1\" finns inte. Kom ihåg att .css- och .js-sidor för enskilda användare börjar på liten bokstav. Exempel: {{ns:user}}:Foo/monobook.css i stället för {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Uppdaterad)',
-'note'                             => '<strong>Obs!</strong>',
-'previewnote'                      => '<strong>Detta är bara en förhandsvisning;
-ändringar har ännu inte sparats!</strong>',
+'note'                             => "'''Obs!'''",
+'previewnote'                      => "'''Detta är bara en förhandsvisning;
+ändringar har ännu inte sparats!'''",
 'previewconflict'                  => 'Den här förhandsvisningen är resultatet av den
 redigerbara texten ovanför,
 så som det kommer att se ut om du väljer att spara.',
-'session_fail_preview'             => '<strong>Vi kunde inte behandla din redigering eftersom sessionsdata gått förlorad.
+'session_fail_preview'             => "'''Vi kunde inte behandla din redigering eftersom sessionsdata gått förlorad.
 Var god försök igen.
-Om det fortfarande inte fungerar, pröva att [[Special:UserLogout|logga ut]] och logga in igen.</strong>',
-'session_fail_preview_html'        => "<strong>Vi kunde inte behandla din redigering eftersom sessionsdata gått förlorad.</strong>
+Om det fortfarande inte fungerar, pröva att [[Special:UserLogout|logga ut]] och logga in igen.'''",
+'session_fail_preview_html'        => "'''Vi kunde inte behandla din redigering eftersom sessionsdata gått förlorad.'''
 
 ''Eftersom {{SITENAME}} har aktiverat rå HTML, så döljs förhandsvisningen som en förebyggande säkerhetsåtgärd mot JavaScript-attacker.''
 
-<strong>Om detta är ett försök att göra en rättmätig redigering, så försök igen.
-Om det fortfarande inte fungerar, pröva att [[Special:UserLogout|logga ut]] och logga in igen.</strong>",
-'token_suffix_mismatch'            => '<strong>Din redigering har stoppats eftersom din klient har ändrat tecknen
-i redigeringens "edit token". Redigeringen stoppades för att förhindra att sidtexten skadas.
-Detta händer ibland om du använder buggiga webbaserade anonyma proxytjänster.</strong>',
+'''Om detta är ett försök att göra en rättmätig redigering, så försök igen.
+Om det fortfarande inte fungerar, pröva att [[Special:UserLogout|logga ut]] och logga in igen.'''",
+'token_suffix_mismatch'            => "'''Din redigering har stoppats eftersom din klient har ändrat tecknen
+i redigeringens \"edit token\". Redigeringen stoppades för att förhindra att sidtexten skadas.
+Detta händer ibland om du använder buggiga webbaserade anonyma proxytjänster.'''",
 'editing'                          => 'Redigerar $1',
 'editingsection'                   => 'Redigerar $1 (avsnitt)',
-'editingcomment'                   => 'Redigerar $1 (kommentar)',
+'editingcomment'                   => 'Redigerar $1 (nytt avsnitt)',
 'editconflict'                     => 'Redigeringskonflikt: $1',
 'explainconflict'                  => "Någon annan har ändrat den här sidan efter att du började att redigera den.
 Den översta textrutan innehåller den nuvarande sparade versionen av texten.
@@ -849,24 +854,26 @@ Om du vill spara dina ändringar så måste du infoga dem i den övre texten.
 '''Endast''' texten i den översta textrutan kommer att sparas när du trycker på \"Spara\".",
 'yourtext'                         => 'Din text',
 'storedversion'                    => 'Den sparade versionen',
-'nonunicodebrowser'                => '<strong>VARNING: Din webbläsare saknar stöd för unicode. För att du ska kunna redigera sidor utan problem, så visas icke-ASCII-tecken som hexadecimala koder i redigeringsrutan.</strong>',
-'editingold'                       => '<strong>VARNING: Du redigerar en gammal version av denna sida. Om du sparar den kommer alla ändringar som har gjorts sedan denna version att skrivas över.</strong>',
+'nonunicodebrowser'                => "'''VARNING: Din webbläsare saknar stöd för unicode. För att du ska kunna redigera sidor utan problem, så visas icke-ASCII-tecken som hexadecimala koder i redigeringsrutan.'''",
+'editingold'                       => "'''VARNING: Du redigerar en gammal version av denna sida. Om du sparar den kommer alla ändringar som har gjorts sedan denna version att skrivas över.'''",
 'yourdiff'                         => 'Skillnader',
-'copyrightwarning'                 => 'Observera att alla bidrag till {{SITENAME}} är att betrakta som utgivna under $2 (se $1 för detaljer). Om du inte vill att din text ska redigeras eller kopieras efter andras gottfinnande skall du inte skriva något här.<br />
-Du lovar oss också att du skrev texten själv, eller kopierade från kulturellt allmängods som inte skyddas av upphovsrätt, eller liknande källor. <strong>LÄGG INTE UT UPPHOVSRÄTTSSKYDDAT MATERIAL HÄR UTAN TILLÅTELSE!</strong>',
-'copyrightwarning2'                => 'Observera att alla bidrag till {{SITENAME}} kan komma att redigeras, ändras, eller tas bort av andra deltagare. Om du inte vill se din text förändrad efter andras gottfinnade skall du inte skriva in någon text här.<br />
+'copyrightwarning'                 => "Observera att alla bidrag till {{SITENAME}} är att betrakta som utgivna under $2 (se $1 för detaljer). Om du inte vill att din text ska redigeras eller kopieras efter andras gottfinnande skall du inte skriva något här.<br />
+Du lovar oss också att du skrev texten själv, eller kopierade från kulturellt allmängods som inte skyddas av upphovsrätt, eller liknande källor. '''LÄGG INTE UT UPPHOVSRÄTTSSKYDDAT MATERIAL HÄR UTAN TILLÅTELSE!'''",
+'copyrightwarning2'                => "Observera att alla bidrag till {{SITENAME}} kan komma att redigeras, ändras, eller tas bort av andra deltagare. Om du inte vill se din text förändrad efter andras gottfinnade skall du inte skriva in någon text här.<br />
 Du lovar oss också att du skrev texten själv, eller kopierade från kulturellt allmängods som inte skyddas av upphovsrätt, eller liknande källor - se $1 för detaljer.
-<strong>LÄGG INTE UT UPPHOVSRÄTTSSKYDDAT MATERIAL HÄR UTAN TILLÅTELSE!</strong>',
-'longpagewarning'                  => '<strong>VARNING: Den här sidan är $1 kilobyte lång;
+'''LÄGG INTE UT UPPHOVSRÄTTSSKYDDAT MATERIAL HÄR UTAN TILLÅTELSE!'''",
+'longpagewarning'                  => "'''VARNING: Den här sidan är $1 kilobyte lång;
 vissa webbläsare kan ha problem att redigera sidor som närmar sig eller är större än 32 kB.
-Överväg att bryta upp sidan i mindre delar.</strong>',
-'longpageerror'                    => '<strong>FEL: Texten som du försöker spara är $1 kilobyte, vilket är mer än det maximalt tillåtna $2 kilobyte. Den kan inte sparas.</strong>',
-'readonlywarning'                  => '<strong>VARNING: Databasen är tillfälligt låst för underhåll. Du kommer inte att kunna spara
-dina ändringar just nu. Det kan vara klokt att kopiera över texten till din egen dator, tills databasen är upplåst igen.</strong>',
-'protectedpagewarning'             => '<strong>VARNING: Den här sidan är låst så att bara administratörer kan redigera den.</strong>',
+Överväg att bryta upp sidan i mindre delar.'''",
+'longpageerror'                    => "'''FEL: Texten som du försöker spara är $1 kilobyte, vilket är mer än det maximalt tillåtna $2 kilobyte. Den kan inte sparas.'''",
+'readonlywarning'                  => "'''VARNING: Databasen är tillfälligt låst för underhåll. Du kommer inte att kunna spara dina ändringar just nu. 
+Det kan vara klokt att kopiera över texten till din egen dator, tills databasen är upplåst igen.'''
+
+Administratören som låste databasen gav följande förklaring: $1",
+'protectedpagewarning'             => "'''VARNING: Den här sidan är låst så att bara administratörer kan redigera den.'''",
 'semiprotectedpagewarning'         => "'''Observera:''' Denna sida har skrivskyddats så att endast registrerade användare kan redigera den.",
-'cascadeprotectedwarning'          => '<strong>VARNING:</strong> Den här sidan är låst så att bara administratörer kan redigera den. Det beror på att sidan inkluderas på följande {{PLURAL:$1|sida|sidor}} som skyddats med "kaskaderande skrivskydd":',
-'titleprotectedwarning'            => '<strong>VARNING: Den här sidan har skyddats så att endast vissa användare kan skapa den.</strong>',
+'cascadeprotectedwarning'          => "'''Varning:''' Den här sidan är låst så att bara användare med administratörsrättigheter kan redigera den, eftersom den är inkluderad på följande {{PLURAL:$1|sida|sidor}} som skyddats med kaskaderande skrivskydd:",
+'titleprotectedwarning'            => "'''VARNING: Den här sidan har skyddats så att [[Special:ListGroupRights|specifika rättigheter]] krävs för att skapa den.'''",
 'templatesused'                    => 'Mallar som används på den här sidan:',
 'templatesusedpreview'             => 'Mallar som används i förhandsgranskningen:',
 'templatesusedsection'             => 'Mallar som används i det här avsnittet:',
@@ -885,11 +892,21 @@ Du kan redigera existerande sidor, eller [[Special:UserLogin|logga in eller skap
 
 Du bör överväga om det är lämpligt att fortsätta redigera sidan.
 Raderingsloggen för sidan innehåller följande:",
+'deleted-notice'                   => 'Denna sida har blivit raderad. Som referens visas nedan raderingsloggen för sidan.',
+'deletelog-fulllog'                => 'Visa fullständig logg',
+'edit-hook-aborted'                => 'Redigering avbruten av hook.
+Den gav ingen förklaring.',
+'edit-gone-missing'                => 'Kunde inte uppdatera sidan.
+Det verkar som att den har raderats.',
+'edit-conflict'                    => 'Redigeringskonflikt.',
+'edit-no-change'                   => 'Din redigering ignorerades, eftersom ingen ändring gjordes i texten.',
+'edit-already-exists'              => 'Sidan kunde inte skapas.
+Den finns redan.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Varning: Denna sida innehåller för många anrop av resurskrävande parserfunktioner.
 
-Antalet anrop borde vara mindre än $2, det är nu $1.',
+Antalet anrop får vara högst $2, nu görs {{PLURAL:$#|$1 anrop}}.',
 'expensive-parserfunction-category'       => 'Sidor med för många resurskrävande parserfunktioner',
 'post-expand-template-inclusion-warning'  => 'Varning: Den här sidan innehåller för mycket mallinklusioner.
 NÃ¥gra av mallarna kommer inte att inkluderas.',
@@ -897,12 +914,15 @@ NÃ¥gra av mallarna kommer inte att inkluderas.',
 'post-expand-template-argument-warning'   => 'Varning: Sidan innehåller en eller flera mallparametrar som blir för långa när de expanderas.
 Dessa parametrar har uteslutits.',
 'post-expand-template-argument-category'  => 'Sidor med uteslutna mallparametrar',
+'parser-template-loop-warning'            => 'Mall-loop upptäckt: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Gräns för mallrekursionsdjup överskriden ($1)',
 
 # "Undo" feature
-'undo-success' => 'Sidan kan återställas till tidigare version. Var god och kontrollera jämförelsen nedan för att bekräfta att detta är vad du avser att göra och slutför återställningen genom att spara.',
-'undo-failure' => 'Ändringen kunde inte avlägsnas på grund av motstridande ändringar som gjorts sedan dess.',
-'undo-norev'   => 'Ändringen kan inte avlägsnas eftersom den inte finns eller har raderats.',
-'undo-summary' => 'Tar bort version $1 av [[Special:Contributions/$2|$2]] ([[User talk:$2|diskussion]])',
+'undo-success' => 'Redigeringen kan göras ogjord.
+Var god och kontrollera jämförelsen nedan för att bekräfta att detta är vad du avser att göra, och spara sedan ändringarna nedan för att göra redigeringen ogjord.',
+'undo-failure' => 'Redigeringen kunde inte göras ogjord på grund av konflikt med mellanliggande redigeringar.',
+'undo-norev'   => 'Redigeringen kan inte göras ogjord eftersom den inte finns eller har raderats.',
+'undo-summary' => 'Gör version $1 av [[Special:Contributions/$2|$2]] ([[User talk:$2|diskussion]]) ogjord',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Kan inte skapa konto',
@@ -911,28 +931,28 @@ Dessa parametrar har uteslutits.',
 Anledningen till blockeringen var "$2".',
 
 # History pages
-'viewpagelogs'        => 'Visa loggar för denna sida',
-'nohistory'           => 'Den här sidan har ingen versionshistorik.',
-'revnotfound'         => 'Versionen hittades inte',
-'revnotfoundtext'     => 'Den gamla versionen av den sida du frågade efter kan inte hittas. Kontrollera den URL du använde för att nå den här sidan.',
-'currentrev'          => 'Nuvarande version',
-'revisionasof'        => 'Versionen från $1',
-'revision-info'       => 'Version från den $1 av $2',
-'previousrevision'    => '� Äldre version',
-'nextrevision'        => 'Nyare version →',
-'currentrevisionlink' => 'Nuvarande version',
-'cur'                 => 'nuvarande',
-'next'                => 'nästa',
-'last'                => 'föregående',
-'page_first'          => 'första',
-'page_last'           => 'sista',
-'histlegend'          => "Val av diff: markera i klickrutorna för att jämföra versioner och tryck enter eller knappen längst ner.<br />
+'viewpagelogs'           => 'Visa loggar för denna sida',
+'nohistory'              => 'Den här sidan har ingen versionshistorik.',
+'currentrev'             => 'Nuvarande version',
+'currentrev-asof'        => 'Nuvarande version från $1',
+'revisionasof'           => 'Versionen från $1',
+'revision-info'          => 'Version från den $1 av $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Äldre version',
+'nextrevision'           => 'Nyare version →',
+'currentrevisionlink'    => 'Nuvarande version',
+'cur'                    => 'nuvarande',
+'next'                   => 'nästa',
+'last'                   => 'föregående',
+'page_first'             => 'första',
+'page_last'              => 'sista',
+'histlegend'             => "Val av diff: markera i klickrutorna för att jämföra versioner och tryck enter eller knappen längst ner.<br />
 Förklaring: (nuvarande) = skillnad mot nuvarande version; (föregående) = skillnad mot föregående version; '''m''' = mindre ändring.",
-'deletedrev'          => '[raderad]',
-'histfirst'           => 'Första',
-'histlast'            => 'Senaste',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(tom)',
+'history-fieldset-title' => 'Bläddra i historiken',
+'deletedrev'             => '[raderad]',
+'histfirst'              => 'Första',
+'histlast'               => 'Senaste',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(tom)',
 
 # Revision feed
 'history-feed-title'          => 'Versionshistorik',
@@ -966,7 +986,7 @@ Andra administratörer på {{SITENAME}} kommer fortfarande att kunna läsa det d
 'revdelete-hide-text'         => 'Dölj versionstext',
 'revdelete-hide-name'         => 'Dölj åtgärd och sidnamn',
 'revdelete-hide-comment'      => 'Dölj redigeringskommentar',
-'revdelete-hide-user'         => 'Dölj redaktörens användarnamn/IP-adress',
+'revdelete-hide-user'         => 'Dölj skribentens användarnamn/IP-adress',
 'revdelete-hide-restricted'   => 'Låt dessa begränsningar gälla även för administratörer och lås det här gränssnittet',
 'revdelete-suppress'          => 'Undanhåll data även från administratörer',
 'revdelete-hide-image'        => 'Dölj filinnehåll',
@@ -1015,6 +1035,7 @@ Se till att sidhistorikens kontinuitet behålls när du sammanfogar historik.',
 'mergehistory-invalid-destination' => 'Målsidan måste vara en giltig sidtitel.',
 'mergehistory-autocomment'         => 'Infogade [[:$1]] i [[:$2]]',
 'mergehistory-comment'             => 'Infogade [[:$1]] i [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Käll- och målsidor kan inte vara samma',
 
 # Merge log
 'mergelog'           => 'Sammanfogningslogg',
@@ -1027,121 +1048,202 @@ Se till att sidhistorikens kontinuitet behålls när du sammanfogar historik.',
 'difference'              => '(Skillnad mellan versioner)',
 'lineno'                  => 'Rad $1:',
 'compareselectedversions' => 'Jämför angivna versioner',
-'editundo'                => 'avlägsna',
+'visualcomparison'        => 'Visuell jämförelse',
+'wikicodecomparison'      => 'Wikitextjämförelse',
+'editundo'                => 'gör ogjord',
 'diff-multi'              => '({{PLURAL:$1|En mellanliggande version|$1 mellanliggande versioner}} visas inte.)',
+'diff-movedto'            => 'flyttad till $1',
+'diff-styleadded'         => '$1 stil tillagd',
+'diff-added'              => '$1 tillagd',
+'diff-changedto'          => 'ändrad till $1',
+'diff-movedoutof'         => 'flyttad ut från $1',
+'diff-styleremoved'       => '$1 stil borttagen',
+'diff-removed'            => '$1 borttagen',
+'diff-changedfrom'        => 'ändrad från $1',
+'diff-src'                => 'källa',
+'diff-withdestination'    => 'med destination $1',
+'diff-with'               => '&#32;med $1 $2',
+'diff-with-final'         => '&#32;och $1 $2',
+'diff-width'              => 'bredd',
+'diff-height'             => 'höjd',
+'diff-p'                  => "ett '''stycke'''",
+'diff-blockquote'         => "ett '''citat'''",
+'diff-h1'                 => "en '''rubrik (nivå 1)'''",
+'diff-h2'                 => "en '''rubrik (nivå 2)'''",
+'diff-h3'                 => "en '''rubrik (nivå 3)'''",
+'diff-h4'                 => "en '''rubrik (nivå 4)'''",
+'diff-h5'                 => "en '''rubrik (nivå 5)'''",
+'diff-pre'                => "ett '''förformaterat avsnitt'''",
+'diff-div'                => "en '''indelning'''",
+'diff-ul'                 => "en '''osorterad lista'''",
+'diff-ol'                 => "en '''sorterad lista'''",
+'diff-li'                 => "ett '''listelement'''",
+'diff-table'              => "en '''tabell'''",
+'diff-tbody'              => "en '''tabells innehåll'''",
+'diff-tr'                 => "en '''rad'''",
+'diff-td'                 => "en '''cell'''",
+'diff-th'                 => "en '''rubrik'''",
+'diff-br'                 => "ett '''avbrott'''",
+'diff-hr'                 => "en '''horisontell linje'''",
+'diff-code'               => "ett '''datakodsavsnitt'''",
+'diff-dl'                 => "en '''definitionslista'''",
+'diff-dt'                 => "en '''definitionsterm'''",
+'diff-dd'                 => "en '''definition'''",
+'diff-input'              => "ett '''inlägg'''",
+'diff-form'               => "ett '''formulär'''",
+'diff-img'                => "en '''bild'''",
+'diff-span'               => "ett '''spann'''",
+'diff-a'                  => "en '''länk'''",
+'diff-i'                  => "'''kursiv'''",
+'diff-b'                  => "'''fet'''",
+'diff-strong'             => "'''skarp'''",
+'diff-em'                 => "'''betoning'''",
+'diff-font'               => "'''teckensnitt'''",
+'diff-big'                => "'''stor'''",
+'diff-del'                => "'''raderad'''",
+'diff-tt'                 => "'''fast bredd'''",
+'diff-sub'                => "'''nedsänkt'''",
+'diff-sup'                => "'''upphöjd'''",
+'diff-strike'             => "'''genomstruken'''",
 
 # Search results
-'searchresults'             => 'Sökresultat',
-'searchresulttext'          => 'Se [[{{MediaWiki:Helppage}}|hjälpsidan]] för mer information om sökning på {{SITENAME}}.',
-'searchsubtitle'            => 'Du sökte efter \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|alla sidor som startar med "$1"]] | [[Special:WhatLinksHere/$1|alla sidor som länkar till "$1"]])',
-'searchsubtitleinvalid'     => 'För sökbegreppet $1',
-'noexactmatch'              => "'''Det finns ingen sida med titeln \"\$1\".''' Du kan  [[:\$1|skapa denna sida]].",
-'noexactmatch-nocreate'     => "'''Det finns ingen sida med titeln \"\$1\".'''",
-'toomanymatches'            => 'Sökningen gav för många resultat, försök med en annan fråga',
-'titlematches'              => 'Träffar i sidtitlar',
-'notitlematches'            => 'Det finns ingen sida vars titel överensstämmer med sökordet.',
-'textmatches'               => 'Sidor som innehåller sökordet:',
-'notextmatches'             => 'Det finns inga sidor som innehåller sökordet',
-'prevn'                     => 'förra $1',
-'nextn'                     => 'nästa $1',
-'viewprevnext'              => 'Visa ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 ord|$2 ord}})',
-'search-result-score'       => 'Relevans: $1%',
-'search-redirect'           => '(omdirigering $1)',
-'search-section'            => '(avsnitt $1)',
-'search-suggest'            => 'Menade du: $1',
-'search-interwiki-caption'  => 'Systerprojekt',
-'search-interwiki-default'  => '$1 resultat:',
-'search-interwiki-more'     => '(mer)',
-'search-mwsuggest-enabled'  => 'med förslag',
-'search-mwsuggest-disabled' => 'inga förslag',
-'search-relatedarticle'     => 'Relaterad',
-'mwsuggest-disable'         => 'Avaktivera AJAX-förslag',
-'searchrelated'             => 'relaterad',
-'searchall'                 => 'alla',
-'showingresults'            => "Nedan visas upp till {{PLURAL:$1|'''1''' post|'''$1''' poster}} från och med nummer '''$2'''.",
-'showingresultsnum'         => "Nedan visas {{PLURAL:$3|'''1''' post|'''$3''' poster}} från och med nummer '''$2'''.",
-'showingresultstotal'       => "Härunder visas resultat {{PLURAL:$3|'''$1'''|'''$1 - $2'''}} av '''$3'''",
-'nonefound'                 => "'''Observera:''' Som standard sker sökning endast i vissa namnrymder. Du kan pröva att skriva ''all:'' i början av din sökning om du vill söka i alla sidor (inklusive diskussionssidor, mallar, m.m.), eller så kan du att börja din sökning med namnet på den namnrymd du vill söka i.",
-'powersearch'               => 'Avancerad sök',
-'powersearch-legend'        => 'Avancerad sökning',
-'powersearch-ns'            => 'Sök i namnrymderna:',
-'powersearch-redir'         => 'Visa omdirigeringar',
-'powersearch-field'         => 'Sök efter',
-'search-external'           => 'Extern sökning',
-'searchdisabled'            => 'Sökfunktionen på {{SITENAME}} är avstängd.
+'searchresults'                    => 'Sökresultat',
+'searchresults-title'              => 'Sökresultat för "$1"',
+'searchresulttext'                 => 'Se [[{{MediaWiki:Helppage}}|hjälpsidan]] för mer information om sökning på {{SITENAME}}.',
+'searchsubtitle'                   => 'Du sökte efter \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|alla sidor som startar med "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|alla sidor som länkar till "$1"]])',
+'searchsubtitleinvalid'            => 'För sökbegreppet $1',
+'noexactmatch'                     => "'''Det finns ingen sida med titeln \"\$1\".''' Du kan  [[:\$1|skapa denna sida]].",
+'noexactmatch-nocreate'            => "'''Det finns ingen sida med titeln \"\$1\".'''",
+'toomanymatches'                   => 'Sökningen gav för många resultat, försök med en annan fråga',
+'titlematches'                     => 'Träffar i sidtitlar',
+'notitlematches'                   => 'Det finns ingen sida vars titel överensstämmer med sökordet.',
+'textmatches'                      => 'Sidor som innehåller sökordet:',
+'notextmatches'                    => 'Det finns inga sidor som innehåller sökordet',
+'prevn'                            => 'förra $1',
+'nextn'                            => 'nästa $1',
+'viewprevnext'                     => 'Visa ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Sökalternativ',
+'searchmenu-exists'                => "'''Det finns en sida med namnet \"[[:\$1]]\" på denna wiki'''",
+'searchmenu-new'                   => "'''Skapa sidan \"[[:\$1]]\" på denna wiki!'''",
+'searchhelp-url'                   => 'Help:Innehåll',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Bläddra igenom sidor med detta prefix]]',
+'searchprofile-articles'           => 'Innehållssidor',
+'searchprofile-articles-and-proj'  => 'Innehåll & projektsidor',
+'searchprofile-project'            => 'Projektsidor',
+'searchprofile-images'             => 'Filer',
+'searchprofile-everything'         => 'Allt',
+'searchprofile-advanced'           => 'Avancerad',
+'searchprofile-articles-tooltip'   => 'Sök i $1',
+'searchprofile-project-tooltip'    => 'Sök i $1',
+'searchprofile-images-tooltip'     => 'Sök efter filer',
+'searchprofile-everything-tooltip' => 'Sök allt innehåll (inklusive diskussionssidor)',
+'searchprofile-advanced-tooltip'   => 'Sök i vissa namnrymder',
+'prefs-search-nsdefault'           => 'Sök med standardvärden:',
+'prefs-search-nscustom'            => 'Sök valda namnrymder:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 ord|$2 ord}})',
+'search-result-score'              => 'Relevans: $1%',
+'search-redirect'                  => '(omdirigering $1)',
+'search-section'                   => '(avsnitt $1)',
+'search-suggest'                   => 'Menade du: $1',
+'search-interwiki-caption'         => 'Systerprojekt',
+'search-interwiki-default'         => '$1 resultat:',
+'search-interwiki-more'            => '(mer)',
+'search-mwsuggest-enabled'         => 'med förslag',
+'search-mwsuggest-disabled'        => 'inga förslag',
+'search-relatedarticle'            => 'Relaterad',
+'mwsuggest-disable'                => 'Avaktivera AJAX-förslag',
+'searchrelated'                    => 'relaterad',
+'searchall'                        => 'alla',
+'showingresults'                   => "Nedan visas upp till {{PLURAL:$1|'''1''' post|'''$1''' poster}} från och med nummer '''$2'''.",
+'showingresultsnum'                => "Nedan visas {{PLURAL:$3|'''1''' post|'''$3''' poster}} från och med nummer '''$2'''.",
+'showingresultstotal'              => "Härunder visas resultat {{PLURAL:$4|'''$1'''|'''$1 - $2'''}} av '''$3'''",
+'nonefound'                        => "'''Observera:''' Som standard sker sökning endast i vissa namnrymder. Du kan pröva att skriva ''all:'' i början av din sökning om du vill söka i alla sidor (inklusive diskussionssidor, mallar, m.m.), eller så kan du att börja din sökning med namnet på den namnrymd du vill söka i.",
+'search-nonefound'                 => 'Inga resultat matchade frågan.',
+'powersearch'                      => 'Avancerad sökning',
+'powersearch-legend'               => 'Avancerad sökning',
+'powersearch-ns'                   => 'Sök i namnrymderna:',
+'powersearch-redir'                => 'Visa omdirigeringar',
+'powersearch-field'                => 'Sök efter',
+'search-external'                  => 'Extern sökning',
+'searchdisabled'                   => 'Sökfunktionen på {{SITENAME}} är avstängd.
 Du kan istället göra sökningar med hjälp av Google.
 Notera dock att deras indexering av {{SITENAME}} kan vara något föråldrad.',
 
 # Preferences page
-'preferences'              => 'Inställningar',
-'mypreferences'            => 'Mina inställningar',
-'prefs-edits'              => 'Antal redigeringar:',
-'prefsnologin'             => 'Inte inloggad',
-'prefsnologintext'         => 'Du måste vara <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} inloggad]</span> för att kunna ändra dina inställningar.',
-'prefsreset'               => 'Inställningarna har återställts till ursprungsvärdena.',
-'qbsettings'               => 'Inställningar för snabbmeny',
-'qbsettings-none'          => 'Ingen',
-'qbsettings-fixedleft'     => 'Fast vänster',
-'qbsettings-fixedright'    => 'Fast höger',
-'qbsettings-floatingleft'  => 'Flytande vänster',
-'qbsettings-floatingright' => 'Flytande höger',
-'changepassword'           => 'Byt lösenord',
-'skin'                     => 'Utseende',
-'math'                     => 'Matematik',
-'dateformat'               => 'Datumformat',
-'datedefault'              => 'Ovidkommande',
-'datetime'                 => 'Datum och tid',
-'math_failure'             => 'Misslyckades med att tolka formel.',
-'math_unknown_error'       => 'okänt fel',
-'math_unknown_function'    => 'okänd funktion',
-'math_lexing_error'        => 'regelfel',
-'math_syntax_error'        => 'syntaxfel',
-'math_image_error'         => 'Konvertering till PNG-format misslyckades; kontrollera om latex, dvips, gs och convert är korrekt installerade',
-'math_bad_tmpdir'          => 'Kan inte skriva till eller skapa temporär mapp för matematikresultat',
-'math_bad_output'          => 'Kan inte skriva till eller skapa mapp för matematikresultat',
-'math_notexvc'             => 'Applicationen texvc saknas; läs math/README för konfigureringsanvisningar.',
-'prefs-personal'           => 'Mitt konto',
-'prefs-rc'                 => 'Senaste ändringar',
-'prefs-watchlist'          => 'Bevakningslista',
-'prefs-watchlist-days'     => 'Antal dagar som visas i bevakningslistan:',
-'prefs-watchlist-edits'    => 'Maximalt antal redigeringar som visas i utökad bevakningslista:',
-'prefs-misc'               => 'Diverse',
-'saveprefs'                => 'Spara inställningar',
-'resetprefs'               => 'Återställ osparade ändringar',
-'oldpassword'              => 'Gammalt lösenord:',
-'newpassword'              => 'Nytt lösenord:',
-'retypenew'                => 'Upprepa det nya lösenordet:',
-'textboxsize'              => 'Redigering',
-'rows'                     => 'Rader:',
-'columns'                  => 'Kolumner:',
-'searchresultshead'        => 'Sökresultat',
-'resultsperpage'           => 'Träffar per sida:',
-'contextlines'             => 'Antal rader per träff:',
-'contextchars'             => 'Tecken per rad:',
-'stub-threshold'           => 'Formatera länkar <a href="#" class="stub">så här</a> till sidor som är kortare än:',
-'recentchangesdays'        => 'Antal dagar i "senaste ändringarna":',
-'recentchangescount'       => 'Antal ändringar som visas i "senaste ändringarna", sidhistoriker och loggsidor:',
-'savedprefs'               => 'Dina inställningar har sparats',
-'timezonelegend'           => 'Tidszon',
-'timezonetext'             => 'Ange skillnaden i timmar mellan din lokala tid och serverns tid (UTC).',
-'localtime'                => 'Lokal tid',
-'timezoneoffset'           => 'Utjämna',
-'servertime'               => 'Serverns klocka är',
-'guesstimezone'            => 'Fyll i från webbläsare',
-'allowemail'               => 'Tillåt e-post från andra användare',
-'prefs-searchoptions'      => 'Sökalternativ',
-'prefs-namespaces'         => 'Namnrymder',
-'defaultns'                => 'Sök i följande namnrymder som förval:',
-'default'                  => 'ursprungsinställning',
-'files'                    => 'Filer',
+'preferences'               => 'Inställningar',
+'mypreferences'             => 'Mina inställningar',
+'prefs-edits'               => 'Antal redigeringar:',
+'prefsnologin'              => 'Inte inloggad',
+'prefsnologintext'          => 'Du måste vara <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} inloggad]</span> för att kunna ändra dina inställningar.',
+'prefsreset'                => 'Inställningarna har återställts till ursprungsvärdena.',
+'qbsettings'                => 'Snabbmeny',
+'qbsettings-none'           => 'Ingen',
+'qbsettings-fixedleft'      => 'Fast vänster',
+'qbsettings-fixedright'     => 'Fast höger',
+'qbsettings-floatingleft'   => 'Flytande vänster',
+'qbsettings-floatingright'  => 'Flytande höger',
+'changepassword'            => 'Byt lösenord',
+'skin'                      => 'Utseende',
+'skin-preview'              => 'förhandsvisning',
+'math'                      => 'Matematik',
+'dateformat'                => 'Datumformat',
+'datedefault'               => 'Ovidkommande',
+'datetime'                  => 'Datum och tid',
+'math_failure'              => 'Misslyckades med att tolka formel.',
+'math_unknown_error'        => 'okänt fel',
+'math_unknown_function'     => 'okänd funktion',
+'math_lexing_error'         => 'regelfel',
+'math_syntax_error'         => 'syntaxfel',
+'math_image_error'          => 'Konvertering till PNG-format misslyckades; kontrollera om latex, dvips, gs och convert är korrekt installerade',
+'math_bad_tmpdir'           => 'Kan inte skriva till eller skapa temporär mapp för matematikresultat',
+'math_bad_output'           => 'Kan inte skriva till eller skapa mapp för matematikresultat',
+'math_notexvc'              => 'Applicationen texvc saknas; läs math/README för konfigureringsanvisningar.',
+'prefs-personal'            => 'Mitt konto',
+'prefs-rc'                  => 'Senaste ändringar',
+'prefs-watchlist'           => 'Bevakningslista',
+'prefs-watchlist-days'      => 'Antal dagar som visas i bevakningslistan:',
+'prefs-watchlist-days-max'  => '(maximalt 7 dagar)',
+'prefs-watchlist-edits'     => 'Maximalt antal redigeringar som visas i utökad bevakningslista:',
+'prefs-watchlist-edits-max' => '(maximalt antal: 1 000)',
+'prefs-misc'                => 'Diverse',
+'prefs-resetpass'           => 'Ändra lösenord',
+'saveprefs'                 => 'Spara',
+'resetprefs'                => 'Återställ osparade ändringar',
+'textboxsize'               => 'Redigering',
+'prefs-edit-boxsize'        => 'Storlek på redigeringsfönstret.',
+'rows'                      => 'Rader:',
+'columns'                   => 'Kolumner:',
+'searchresultshead'         => 'Sökning',
+'resultsperpage'            => 'Träffar per sida:',
+'contextlines'              => 'Antal rader per träff:',
+'contextchars'              => 'Tecken per rad:',
+'stub-threshold'            => 'Gräns för <a href="#" class="stub">stublänk</a>-formattering (byte):',
+'recentchangesdays'         => 'Antal dagar i "senaste ändringarna":',
+'recentchangesdays-max'     => '(maximalt $1 {{PLURAL:$1|dag|dagar}})',
+'recentchangescount'        => 'Antal ändringar som visas i senaste ändringarna, sidhistoriker och i loggsidor, som standard:',
+'savedprefs'                => 'Dina inställningar har sparats',
+'timezonelegend'            => 'Tidszon',
+'timezonetext'              => '¹Antal timmar din lokala tid skiljer från serverns tid (UTC).',
+'localtime'                 => 'Lokal tid:',
+'timezoneselect'            => 'Tidszon:',
+'timezoneuseserverdefault'  => 'Använd serverns standardinställning',
+'timezoneuseoffset'         => 'Annan (specificera skillnad)',
+'timezoneoffset'            => 'Skillnad¹:',
+'servertime'                => 'Serverns tid:',
+'guesstimezone'             => 'Fyll i från webbläsare',
+'allowemail'                => 'Tillåt e-post från andra användare',
+'prefs-searchoptions'       => 'Sökalternativ',
+'prefs-namespaces'          => 'Namnrymder',
+'defaultns'                 => 'Sök i följande namnrymder som förval:',
+'default'                   => 'ursprungsinställning',
+'files'                     => 'Filer',
 
 # User rights
-'userrights'                  => 'Användarrättigheter', # Not used as normal message but as header for the special page itself
+'userrights'                  => 'Hantering av användarrättigheter', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Hantera användargrupper',
 'userrights-user-editname'    => 'Skriv in ett användarnamn:',
 'editusergroup'               => 'Ändra användargrupper',
-'editinguser'                 => "Ändrar rättigheter för användaren '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Ändrar rättigheter för användaren '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Ändra användargrupper',
 'saveusergroups'              => 'Spara användargrupper',
 'userrights-groupsmember'     => 'Medlem i:',
@@ -1190,6 +1292,8 @@ Notera dock att deras indexering av {{SITENAME}} kan vara något föråldrad.',
 'right-minoredit'            => 'Markera mindre ändringar',
 'right-move'                 => 'Flytta sidor',
 'right-move-subpages'        => 'Flytta sidor med deras undersidor',
+'right-move-rootuserpages'   => 'Flytta root-användarsidor',
+'right-movefile'             => 'Flytta filer',
 'right-suppressredirect'     => 'Behöver inte skapa omdirigeringar vid sidflyttning',
 'right-upload'               => 'Ladda upp filer',
 'right-reupload'             => 'Skriva över existerande filer',
@@ -1240,9 +1344,46 @@ Notera dock att deras indexering av {{SITENAME}} kan vara något föråldrad.',
 'rightslogentry' => 'ändrade grupptillhörighet för $1 från $2 till $3',
 'rightsnone'     => '(inga)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'läsa denna sida',
+'action-edit'                 => 'redigera denna sida',
+'action-createpage'           => 'skapa sidor',
+'action-createtalk'           => 'skapa diskussionssidor',
+'action-createaccount'        => 'skapa detta användarkonto',
+'action-minoredit'            => 'markera denna redigering som mindre',
+'action-move'                 => 'flytta denna sida',
+'action-move-subpages'        => 'flytta denna sida, och dess undersidor',
+'action-move-rootuserpages'   => 'flytta root-användarsidor',
+'action-movefile'             => 'flytta den här filen',
+'action-upload'               => 'ladda upp denna fil',
+'action-reupload'             => 'skriva över denna existerade fil',
+'action-reupload-shared'      => 'skriva över denna fil i gemensam databas',
+'action-upload_by_url'        => 'ladda upp denna fil från en URL-adress',
+'action-writeapi'             => 'använda skriv-API:t',
+'action-delete'               => 'radera denna sida',
+'action-deleterevision'       => 'radera denna version',
+'action-deletedhistory'       => 'se denna sidas raderade historik',
+'action-browsearchive'        => 'söka raderade sidor',
+'action-undelete'             => 'avradera denna sida',
+'action-suppressrevision'     => 'granska och återställa denna dolda version',
+'action-suppressionlog'       => 'se denna privata logg',
+'action-block'                => 'blockera denna användare från redigering',
+'action-protect'              => 'ändra skyddsnivå för denna sida',
+'action-import'               => 'importera denna sida från en annan wiki',
+'action-importupload'         => 'importera denna sida från en uppladdad fil',
+'action-patrol'               => 'märka annans redigering som patrullerad',
+'action-autopatrol'           => 'få din redigering märkt som patrullerad',
+'action-unwatchedpages'       => 'se listan över obevakade sidor',
+'action-trackback'            => 'lägga in en trackback',
+'action-mergehistory'         => 'slå ihop historiken för denna sida',
+'action-userrights'           => 'ändra alla användarrättigheter',
+'action-userrights-interwiki' => 'ändra rättigheter för användare på andra wikier',
+'action-siteadmin'            => 'låsa eller låsa upp databasen',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|ändring|ändringar}}',
 'recentchanges'                     => 'Senaste ändringarna',
+'recentchanges-legend'              => 'Alternativ för senaste ändringarna',
 'recentchangestext'                 => 'Följ de senaste ändringarna i wikin på denna sida.',
 'recentchanges-feed-description'    => 'Följ de senaste ändringarna i wikin genom den här matningen.',
 'rcnote'                            => "Nedan visas {{PLURAL:$1|'''1''' ändring|de senaste '''$1''' ändringarna}} från {{PLURAL:$2|den senaste dagen|de senaste '''$2''' dagarna}}, per $4, kl. $5.",
@@ -1262,10 +1403,12 @@ Notera dock att deras indexering av {{SITENAME}} kan vara något föråldrad.',
 'minoreditletter'                   => 'm',
 'newpageletter'                     => 'N',
 'boteditletter'                     => 'b',
-'number_of_watching_users_pageview' => '[$1 användare bevakar]',
+'number_of_watching_users_pageview' => '[$1 bevakande {{PLURAL:$1|användare|användare}}]',
 'rc_categories'                     => 'Begränsa till följande kategorier (separera med "|")',
 'rc_categories_any'                 => 'Vilken som helst',
 'newsectionsummary'                 => '/* $1 */ nytt avsnitt',
+'rc-enhanced-expand'                => 'Visa detaljer (kräver JavaScript)',
+'rc-enhanced-hide'                  => 'Göm detaljer',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Relaterade ändringar',
@@ -1287,22 +1430,22 @@ Sidor på [[Special:Watchlist|din bevakningslista]] är markerade med '''fetstil
 'upload_directory_read_only'  => 'Webbservern kan inte skriva till uppladdningskatalogen ($1).',
 'uploaderror'                 => 'Fel vid uppladdningen',
 'uploadtext'                  => "Använd formuläret nedan för att ladda upp filer.
-För att titta på eller leta efter filer som redan har laddats upp, se [[Special:ImageList|listan över uppladdade filer]]. Uppladdningar loggförs även i [[Special:Log/upload|uppladdningsloggen]], och raderingar i [[Special:Log/delete|raderingsloggen]].
+För att titta på eller leta efter filer som redan har laddats upp, se [[Special:FileList|listan över uppladdade filer]]. Uppladdningar loggförs även i [[Special:Log/upload|uppladdningsloggen]], och raderingar i [[Special:Log/delete|raderingsloggen]].
 
-Använd en länk på något av följande format för att infoga en bild på en sida:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' för att visa bilden i dess hela storlek
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|alternativ text]]</nowiki></tt>''' för att visa en miniatyrbild med bredden 200 pixel i en ruta till vänster med bildtexten 'alternativ text'
-* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' om du vill länka direkt till filen utan att visa den",
+Använd en länk på något av följande format för att infoga en fil på en sida:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' för att visa filen i dess hela storlek
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alternativ text]]</nowiki></tt>''' för att visa en rendering med bredden 200 pixel i en ruta till vänster med bildtexten 'alternativ text'
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' för att länka direkt till filen utan att visa den",
 'upload-permitted'            => 'Tillåtna filtyper: $1.',
 'upload-preferred'            => 'Föredragna filtyper: $1.',
 'upload-prohibited'           => 'Förbjudna filtyper: $1.',
 'uploadlog'                   => 'Uppladdningar',
 'uploadlogpage'               => 'Uppladdningslogg',
 'uploadlogpagetext'           => 'Det här är en logg över de senast uppladdade filerna.
-Se [[Special:NewImages|galleriet över nya filer]] för en mer visuell översikt.',
+Se [[Special:NewFiles|galleriet över nya filer]] för en mer visuell översikt.',
 'filename'                    => 'Filnamn',
 'filedesc'                    => 'Beskrivning',
-'fileuploadsummary'           => 'Beskrivning<br />och licens:',
+'fileuploadsummary'           => 'Beskrivning:',
 'filestatus'                  => 'Upphovsrättslig status:',
 'filesource'                  => 'Källa:',
 'uploadedfiles'               => 'Uppladdade filer',
@@ -1318,26 +1461,28 @@ Se [[Special:NewImages|galleriet över nya filer]] för en mer visuell översikt
 'filetype-banned-type'        => "'''\".\$1\"''' är inte en tillåten filtyp.
 {{PLURAL:\$3|Tillåtna filtyper|Tillåten filtyp}} är \$2.",
 'filetype-missing'            => 'Filnamnet saknar ändelse (t ex ".jpg").',
-'large-file'                  => 'Filer bör inte vara större än $1; denna fil är $2',
+'large-file'                  => 'Det rekommenderas att filer inte är större än $1;
+denna fil är $2.',
 'largefileserver'             => 'Denna fil är större än vad servern ställts in att tillåta.',
 'emptyfile'                   => 'Filen du laddade upp verkar vara tom; felet kan bero på ett stavfel i filnamnet. Kontrollera om du verkligen vill ladda upp denna fil.',
-'fileexists'                  => 'Det finns redan en fil med detta namn. Titta på <strong><tt>$1</tt></strong>, såvida du inte är säker på att du vill ändra den.',
-'filepageexists'              => 'Beskrivningssidan för denna fil har redan skapats på <strong><tt>$1</tt></strong>, men just nu finns ingen fil med detta namn. Den sammanfattning du skriver här kommer inte visas på beskrivningssidan. För att din sammanfattning ska visas där, så måste du redigera beskrivningssidan manuellt.',
-'fileexists-extension'        => 'En fil med ett liknande namn finns redan:<br />
-Namn på den fil du försöker ladda upp: <strong><tt>$1</tt></strong><br />
-Namn på filen som redan finns: <strong><tt>$2</tt></strong><br />
-Den enda skillnaden är versaliseringen av filnamnsändelsen. Var vänlig kontrollera om filerna är identiska.',
+'fileexists'                  => "Det finns redan en fil med detta namn. Titta på '''<tt>$1</tt>''', såvida du inte är säker på att du vill ändra den.",
+'filepageexists'              => "Beskrivningssidan för denna fil har redan skapats på '''<tt>$1</tt>''', men just nu finns ingen fil med detta namn. Den sammanfattning du skriver här kommer inte visas på beskrivningssidan. För att din sammanfattning ska visas där, så måste du redigera beskrivningssidan manuellt.",
+'fileexists-extension'        => "En fil med ett liknande namn finns redan:<br />
+Namn på den fil du försöker ladda upp: '''<tt>$1</tt>'''<br />
+Namn på filen som redan finns: '''<tt>$2</tt>'''<br />
+Den enda skillnaden är versaliseringen av filnamnsändelsen. Var vänlig kontrollera om filerna är identiska.",
 'fileexists-thumb'            => "<center>'''Den existerande filen'''</center>",
-'fileexists-thumbnail-yes'    => 'Filen verkar vara en bild med förminskad storlek <i>(miniatyrbild)</i>. Var vänlig kontrollera filen <strong><tt>$1</tt></strong>.<br />
-Om det är samma fil i originalstorlek så är det inte nödvändigt att ladda upp en extra miniatyrbild.',
-'file-thumbnail-no'           => 'Filnamnet börjar med <strong><tt>$1</tt></strong>.
-Det verkar vara en bild med förminskad storlek <i>(miniatyrbild)</i>.
-Om du har denna bild i full storlek, ladda då hellre upp den, annars var vänlig och ändra filens namn.',
-'fileexists-forbidden'        => 'Det finns redan en fil med detta namn.
-Om du ändå vill ladda upp din fil, gå då tillbaka och välj ett annat namn. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Filen verkar vara en bild med förminskad storlek ''(miniatyrbild)''. Var vänlig kontrollera filen '''<tt>$1</tt>'''.<br />
+Om det är samma fil i originalstorlek så är det inte nödvändigt att ladda upp en extra miniatyrbild.",
+'file-thumbnail-no'           => "Filnamnet börjar med '''<tt>$1</tt>'''.
+Det verkar vara en bild med förminskad storlek ''(miniatyrbild)''.
+Om du har denna bild i full storlek, ladda då hellre upp den, annars var vänlig och ändra filens namn.",
+'fileexists-forbidden'        => 'En fil med detta namn existerar redan, och kan inte överskrivas.
+Om du fortfarande vill ladda upp din fil, var god gå tillbaka och välj ett nytt namn. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'En fil med detta namn finns redan bland de delade filerna.
-Om du ändå vill ladda upp din fil, gå då tillbaka och använd ett annat namn. [[Image:$1|thumb|center|$1]]',
+Om du ändå vill ladda upp din fil, gå då tillbaka och använd ett annat namn. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Den här filen är en dubblett till följande {{PLURAL:$1|fil|filer}}:',
+'file-deleted-duplicate'      => 'En identisk fil till den här filen ([[$1]]) har tidigare raderats. Du bör kontrollera den filens raderingshistorik innan du fortsätter att återuppladda den.',
 'successfulupload'            => 'Uppladdningen lyckades',
 'uploadwarning'               => 'Uppladdningsvarning',
 'savefile'                    => 'Spara fil',
@@ -1358,7 +1503,7 @@ Om du ändå vill ladda upp din fil, gå då tillbaka och använd ett annat namn
 Tänk över om det är lämpligt att fortsätta ladda upp denna fil.
 
 Här finns raderingsloggen för denna fil:",
-'filename-bad-prefix'         => 'Namnet på filen du vill ladda upp börjar med <strong>"$1"</strong>. Filnamnet kommer förmodligen direkt från en digitalkamera och beskriver inte filens innehåll. Välj ett annat filnamn som bättre beskriver filen.',
+'filename-bad-prefix'         => "Namnet på filen du vill ladda upp börjar med '''\"\$1\"'''. Filnamnet kommer förmodligen direkt från en digitalkamera och beskriver inte filens innehåll. Välj ett annat filnamn som bättre beskriver filen.",
 'filename-prefix-blacklist'   => ' #<!-- ändra inte den här raden --> <pre>
 # Syntaxen är följande:
 #   * All text från ett #-tecken till radens slut är en kommentar
@@ -1395,20 +1540,21 @@ Om problemet kvarstår, kontakta en [[Special:ListUsers/sysop|administratör]].'
 'upload_source_url'  => ' (en giltig URL som är allmänt åtkomlig)',
 'upload_source_file' => ' (en fil på din dator)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Den här specialsidan visar alla filer som har laddats upp.
+# Special:ListFiles
+'listfiles-summary'     => 'Den här specialsidan visar alla filer som har laddats upp.
 Som standard visas de senast upladdade filerna högst upp i listan.
 Genom att klicka på rubrikerna för kolumnerna kan man ändra sorteringsordningen.',
-'imagelist_search_for'  => 'Sök efter filnamn:',
+'listfiles_search_for'  => 'Sök efter filnamn:',
 'imgfile'               => 'fil',
-'imagelist'             => 'Fillista',
-'imagelist_date'        => 'Datum',
-'imagelist_name'        => 'Namn',
-'imagelist_user'        => 'Användare',
-'imagelist_size'        => 'Storlek (byte)',
-'imagelist_description' => 'Beskrivning',
-
-# Image description page
+'listfiles'             => 'Fillista',
+'listfiles_date'        => 'Datum',
+'listfiles_name'        => 'Namn',
+'listfiles_user'        => 'Användare',
+'listfiles_size'        => 'Storlek (byte)',
+'listfiles_description' => 'Beskrivning',
+'listfiles_count'       => 'Versioner',
+
+# File description page
 'filehist'                       => 'Filhistorik',
 'filehist-help'                  => 'Klicka på ett datum/klockslag för att se filen som den såg ut då.',
 'filehist-deleteall'             => 'radera alla',
@@ -1416,19 +1562,25 @@ Genom att klicka på rubrikerna för kolumnerna kan man ändra sorteringsordning
 'filehist-revert'                => 'återställ',
 'filehist-current'               => 'nuvarande',
 'filehist-datetime'              => 'Datum/Tid',
+'filehist-thumb'                 => 'Miniatyrbild',
+'filehist-thumbtext'             => 'Miniatyrbild för versionen från den $1',
+'filehist-nothumb'               => 'Ingen miniatyrbild',
 'filehist-user'                  => 'Användare',
 'filehist-dimensions'            => 'Dimensioner',
 'filehist-filesize'              => 'Filstorlek',
 'filehist-comment'               => 'Kommentar',
-'imagelinks'                     => 'Länkar',
+'imagelinks'                     => 'Fillänkar',
 'linkstoimage'                   => 'Följande {{PLURAL:$1|sida|$1 sidor}} länkar till den här filen:',
+'linkstoimage-more'              => 'Mer är {{PLURAL:$1|en sida|$1 sidor}} länkar till den här filen.
+Följande lista visar bara {{PLURAL:$1|den första sidan|de $1 första sidorna}} som länkar till filen.
+Det finns en [[Special:WhatLinksHere/$2|fullständig lista]].',
 'nolinkstoimage'                 => 'Inga sidor länkar till den här filen.',
 'morelinkstoimage'               => 'Visa [[Special:WhatLinksHere/$1|fler länkar]] till den här filen.',
 'redirectstofile'                => 'Följande {{PLURAL:$1|fil är en omdirigering|filer är omdirigeringar}} till den här filen:',
-'duplicatesoffile'               => 'Följande {{PLURAL:$1|fil är en dubblett|filer är dubbletter}} till den här filen:',
+'duplicatesoffile'               => 'Följande {{PLURAL:$1|fil är en dubblett|filer är dubbletter}} till den här filen ([[Special:FileDuplicateSearch/$2|mer detaljer]]):',
 'sharedupload'                   => 'Denna fil är uppladdad som delad, och kan användas av andra projekt.',
 'shareduploadwiki'               => 'Vänligen se $1 för mer information.',
-'shareduploadwiki-desc'          => 'Innehållet på $1 i den gemensamma filförvaringen visas nedan.',
+'shareduploadwiki-desc'          => 'Innehållet på dess $1 visas nedan.',
 'shareduploadwiki-linktext'      => 'filens beskrivningssida',
 'shareduploadduplicate'          => 'Den här filen är en dubblett till $1 i den delade filförvaringen.',
 'shareduploadduplicate-linktext' => 'en fil',
@@ -1452,7 +1604,7 @@ Genom att klicka på rubrikerna för kolumnerna kan man ändra sorteringsordning
 # File deletion
 'filedelete'                  => 'Radera $1',
 'filedelete-legend'           => 'Radera fil',
-'filedelete-intro'            => "Du håller på att radera '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Du håller på att radera filen '''[[Media:$1|$1]]''' tillsammans med hela dess historik.",
 'filedelete-intro-old'        => "Du håller på att radera versionen av '''[[Media:$1|$1]]''' från [$4 $2 kl. $3].",
 'filedelete-comment'          => 'Anledning:',
 'filedelete-submit'           => 'Radera',
@@ -1460,7 +1612,6 @@ Genom att klicka på rubrikerna för kolumnerna kan man ändra sorteringsordning
 'filedelete-success-old'      => "Versionen av '''[[Media:$1|$1]]''' från $2 kl. $3 har raderats.",
 'filedelete-nofile'           => "Filen '''$1''' finns inte.",
 'filedelete-nofile-old'       => "Den versionen av '''$1''' kan inte raderas eftersom den inte finns.",
-'filedelete-iscurrent'        => 'Du försöker radera den senaste versionen av en fil. För att göra det måste du först återställa till en äldre version av filen.',
 'filedelete-otherreason'      => 'Annan/ytterligare anledning:',
 'filedelete-reason-otherlist' => 'Annan anledning',
 'filedelete-reason-dropdown'  => '*Vanliga anledningar till radering
@@ -1488,25 +1639,31 @@ Innan mallarna raderas, kontrollera att det inte finns andra länkar till dem.',
 
 # Random page
 'randompage'         => 'Slumpsida',
-'randompage-nopages' => 'Det finns inte några sidor i denna namnrymd.',
+'randompage-nopages' => 'Det finns inte några sidor i namnrymden "$1".',
 
 # Random redirect
 'randomredirect'         => 'Slumpvald omdirigering',
-'randomredirect-nopages' => 'Det finns inte några omdirigeringar i denna namnrymd.',
+'randomredirect-nopages' => 'Det finns inte några omdirigeringar i namnrymden "$1".',
 
 # Statistics
-'statistics'             => 'Statistik',
-'sitestats'              => 'Statistiksida',
-'userstats'              => 'Användarstatistik',
-'sitestatstext'          => "I databasen finns just nu <b>$1</b> {{PLURAL:$1|sida|sidor}}, inklusive diskussionssidor, sidor om {{SITENAME}}, korta stumpartiklar, omdirigeringssidor, och andra sidor som inte kan räknas som artiklar. Om man tar bort ovanstående, återstår <b>$2</b> {{PLURAL:$2|riktig artikel|riktiga artiklar}}.
-
-'''$8''' {{PLURAL:$8|fil|filer}} har laddats upp.
-
-Sedan denna wiki startades har sidor visats totalt <b>$3</b> {{PLURAL:$3|gång|gånger}}, och <b>$4</b> {{PLURAL:$4|sida|sidor}} har ändrats. Detta är i genomsnitt <b>$5</b> ändringar per sida, och <b>$6</b> sidvisningar per ändring.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Jobbkön]s längd är för tillfället '''$7'''.",
-'userstatstext'          => "Det finns '''$1''' {{PLURAL:$1|registrerad|registrerade}} [[Special:ListUsers|användare]]. Av dem är '''$2''' (eller '''$4%''') $5.",
-'statistics-mostpopular' => 'Mest besökta sidor',
+'statistics'                   => 'Statistik',
+'statistics-header-pages'      => 'Sidstatistik',
+'statistics-header-edits'      => 'Redigeringsstatistik',
+'statistics-header-views'      => 'Sidvisningsstatistik',
+'statistics-header-users'      => 'Användarstatistik',
+'statistics-articles'          => 'Sidor med innehåll',
+'statistics-pages'             => 'Sidor',
+'statistics-pages-desc'        => 'Alla sidor i wikin, inklusive diskussionssidor, omdirigeringar, m.m.',
+'statistics-files'             => 'Uppladdade filer',
+'statistics-edits'             => 'Sidredigeringar sedan {{SITENAME}} startades',
+'statistics-edits-average'     => 'Redigeringar per sida i genomsnitt',
+'statistics-views-total'       => 'Totalt antal sidvisningar',
+'statistics-views-peredit'     => 'Antal sidvisningar per redigering',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Jobbköns] längd',
+'statistics-users'             => 'Registrerade [[Special:ListUsers|användare]]',
+'statistics-users-active'      => 'Aktiva användare',
+'statistics-users-active-desc' => 'Användare som utfört någon åtgärd under {{PLURAL:$1|det senaste dygnet|de senaste $1 dagarna}}',
+'statistics-mostpopular'       => 'Mest besökta sidor',
 
 'disambiguations'      => 'Sidor som länkar till förgreningssidor',
 'disambiguationspage'  => 'Template:Förgrening',
@@ -1520,7 +1677,7 @@ En sida anses vara en förgreningssida om den inkluderar en mall som länkas til
 'double-redirect-fixer'      => 'Omdirigeringsrättaren',
 
 'brokenredirects'        => 'Trasiga omdirigeringar',
-'brokenredirectstext'    => 'Följande länkar omdirigerar till sidor som inte existerar.',
+'brokenredirectstext'    => 'Följande omdirigerar länkar till ej existerande sidor:',
 'brokenredirects-edit'   => '(redigera)',
 'brokenredirects-delete' => '(radera)',
 
@@ -1532,7 +1689,7 @@ En sida anses vara en förgreningssida om den inkluderar en mall som länkas til
 'fewestrevisions' => 'Sidor med minst antal ändringar',
 
 # Miscellaneous special pages
-'nbytes'                  => '$1 byte',
+'nbytes'                  => '$1 {{PLURAL:$1|byte|byte}}',
 'ncategories'             => '$1 {{PLURAL:$1|kategori|kategorier}}',
 'nlinks'                  => '$1 {{PLURAL:$1|länk|länkar}}',
 'nmembers'                => '$1 {{PLURAL:$1|medlem|medlemmar}}',
@@ -1546,30 +1703,34 @@ En sida anses vara en förgreningssida om den inkluderar en mall som länkas til
 'uncategorizedimages'     => 'Filer utan kategori',
 'uncategorizedtemplates'  => 'Ej kategoriserade mallar',
 'unusedcategories'        => 'Tomma kategorier',
-'unusedimages'            => 'Oanvända bilder',
+'unusedimages'            => 'Oanvända filer',
 'popularpages'            => 'Populära sidor',
 'wantedcategories'        => 'Önskade kategorier',
 'wantedpages'             => 'Önskade sidor',
-'missingfiles'            => 'Saknade filer',
+'wantedfiles'             => 'Önskade filer',
+'wantedtemplates'         => 'Önskade mallar',
 'mostlinked'              => 'Sidor med flest länkar till sig',
 'mostlinkedcategories'    => 'Kategorier med flest länkar till sig',
 'mostlinkedtemplates'     => 'Mest använda mallar',
 'mostcategories'          => 'Sidor med flest kategorier',
 'mostimages'              => 'Filer med flest länkar till sig',
 'mostrevisions'           => 'Sidor med flest ändringar',
-'prefixindex'             => 'Prefixindex',
+'prefixindex'             => 'Alla sidor med prefix',
 'shortpages'              => 'Korta sidor',
 'longpages'               => 'LÃ¥nga sidor',
 'deadendpages'            => 'Sidor utan länkar',
-'deadendpagestext'        => 'Följande sidor saknar länkar till andra sidor på den här wikin.',
+'deadendpagestext'        => 'Följande sidor saknar länkar till andra sidor på {{SITENAME}}.',
 'protectedpages'          => 'Skyddade sidor',
 'protectedpages-indef'    => 'Endast skydd på obestämd tid',
+'protectedpages-cascade'  => 'Endast kaskaderande skydd',
 'protectedpagestext'      => 'Följande sidor är skyddade mot redigering eller flyttning.',
 'protectedpagesempty'     => 'Inga sidor är skyddade under de villkoren.',
 'protectedtitles'         => 'Skyddade titlar',
 'protectedtitlestext'     => 'Följande sidtitlar är skyddade från att skapas',
 'protectedtitlesempty'    => 'Just nu finns inga skyddade sidtitlar med de parametrarna.',
 'listusers'               => 'Användarlista',
+'listusers-editsonly'     => 'Visa endast användare som redigerat',
+'usereditcount'           => '$1 {{PLURAL:$1|redigering|redigeringar}}',
 'newpages'                => 'Nya sidor',
 'newpages-username'       => 'Användare:',
 'ancientpages'            => 'Äldsta sidorna',
@@ -1590,14 +1751,13 @@ En sida anses vara en förgreningssida om den inkluderar en mall som länkas til
 'booksources-search-legend' => 'Sök efter bokkällor',
 'booksources-go'            => 'Sök',
 'booksources-text'          => 'Nedan följer en lista över länkar till webbplatser som säljer nya och begagnade böcker, och som kanske har ytterligare information om de böcker du söker.',
+'booksources-invalid-isbn'  => 'Det angivna ISBN-numret verkar inte vara giltigt. Kontrollera källan för eventuella fel.',
 
 # Special:Log
 'specialloguserlabel'  => 'Användare:',
 'speciallogtitlelabel' => 'Titel:',
 'log'                  => 'Loggar',
 'all-logs-page'        => 'Alla loggar',
-'log-search-legend'    => 'Sök efter loggar',
-'log-search-submit'    => 'Sök',
 'alllogstext'          => 'Kombinerad visning av alla tillgängliga loggar för {{SITENAME}}.
 Du kan avgränsa sökningen och få färre träffar genom att ange typ av logg, användarnamn (skiftlägeskänsligt), eller berörd sida (också skiftlägeskänsligt).',
 'logempty'             => 'Inga matchande träffar i loggen.',
@@ -1609,6 +1769,7 @@ Du kan avgränsa sökningen och få färre träffar genom att ange typ av logg,
 'nextpage'          => 'Nästa sida ($1)',
 'prevpage'          => 'Föregående sida ($1)',
 'allpagesfrom'      => 'Visa sidor från och med:',
+'allpagesto'        => 'Visa sidor till och med:',
 'allarticles'       => 'Alla sidor',
 'allinnamespace'    => 'Alla sidor (i namnrymden $1)',
 'allnotinnamespace' => 'Alla sidor (inte i namnrymden $1)',
@@ -1627,41 +1788,69 @@ Du kan avgränsa sökningen och få färre träffar genom att ange typ av logg,
 'special-categories-sort-count' => 'sortera efter storlek',
 'special-categories-sort-abc'   => 'sortera alfabetiskt',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Raderade användarbidrag',
+
+# Special:LinkSearch
+'linksearch'       => 'Externa länkar',
+'linksearch-pat'   => 'Sökmönster:',
+'linksearch-ns'    => 'Namnrymd:',
+'linksearch-ok'    => 'Sök',
+'linksearch-text'  => 'Jokertecken (wildcards) som t ex "*.wikipedia.org" kan användas.<br />
+Stödda protokoll: <tt>$1</tt>',
+'linksearch-line'  => '$1 länkas från $2',
+'linksearch-error' => 'Jokertecken kan bara användas i början av domännamnet.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Visa användare från och med:',
 'listusers-submit'   => 'Visa',
 'listusers-noresult' => 'Ingen användare hittades.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Logg över nya användare',
+'newuserlogpagetext'          => 'Detta är en logg över skapade användarkonton.',
+'newuserlog-byemail'          => 'lösenord skickat med e-post',
+'newuserlog-create-entry'     => 'Ny användare',
+'newuserlog-create2-entry'    => 'skapade nytt användarkonto $1',
+'newuserlog-autocreate-entry' => 'Konto skapades automatiskt',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Behörigheter för användargrupper',
-'listgrouprights-summary'  => 'Följande lista visar vilka användargrupper som är definierade på den här wikin och vilka behörigheter grupperna har.
+'listgrouprights'                 => 'Behörigheter för användargrupper',
+'listgrouprights-summary'         => 'Följande lista visar vilka användargrupper som är definierade på den här wikin och vilka behörigheter grupperna har.
 Det kan finnas [[{{MediaWiki:Listgrouprights-helppage}}|ytterligare information]] om de olika behörigheterna.',
-'listgrouprights-group'    => 'Grupp',
-'listgrouprights-rights'   => 'Behörigheter',
-'listgrouprights-helppage' => 'Help:Gruppbehörigheter',
-'listgrouprights-members'  => '(lista över medlemmar)',
+'listgrouprights-group'           => 'Grupp',
+'listgrouprights-rights'          => 'Behörigheter',
+'listgrouprights-helppage'        => 'Help:Gruppbehörigheter',
+'listgrouprights-members'         => '(lista över medlemmar)',
+'listgrouprights-addgroup'        => 'Kan lägga till {{PLURAL:$2|gruppen|grupperna}}: $1',
+'listgrouprights-removegroup'     => 'Kan ta bort {{PLURAL:$2|gruppen|grupperna}}: $1',
+'listgrouprights-addgroup-all'    => 'Kan lägga till alla användargrupper',
+'listgrouprights-removegroup-all' => 'Kan ta bort alla användargrupper',
 
 # E-mail user
-'mailnologin'     => 'Ingen adress att skicka till',
-'mailnologintext' => 'För att kunna skicka e-post till andra användare, måste du vara [[Special:UserLogin|inloggad]] och ha angivit en korrekt e-postadress i dina [[Special:Preferences|användarinställningar]].',
-'emailuser'       => 'Skicka e-post till den här användaren',
-'emailpage'       => 'Skicka e-post till annan användare',
-'emailpagetext'   => 'Du kan använda det här formuläret för att skicka e-post till den här användaren.
+'mailnologin'      => 'Ingen adress att skicka till',
+'mailnologintext'  => 'För att kunna skicka e-post till andra användare, måste du vara [[Special:UserLogin|inloggad]] och ha angivit en korrekt e-postadress i dina [[Special:Preferences|användarinställningar]].',
+'emailuser'        => 'Skicka e-post till den här användaren',
+'emailpage'        => 'Skicka e-post till användare',
+'emailpagetext'    => 'Du kan använda det här formuläret för att skicka e-post till den här användaren.
 Den e-postadress du har angivit i [[Special:Preferences|dina användarinställningar]] kommer att visas som "Från"-adress i meddelandet, så att mottagaren har möjlighet att svara direkt till dig.',
-'usermailererror' => 'Fel i hanteringen av mail:',
-'defemailsubject' => '{{SITENAME}} e-post',
-'noemailtitle'    => 'Ingen e-postadress',
-'noemailtext'     => 'Den här användaren har inte angivet en giltig e-postadress eller har valt att inte ta emot mail från andra användare.',
-'emailfrom'       => 'Från:',
-'emailto'         => 'Till:',
-'emailsubject'    => 'Ämne:',
-'emailmessage'    => 'Meddelande:',
-'emailsend'       => 'Skicka',
-'emailccme'       => 'Skicka en kopia av meddelandet till mig.',
-'emailccsubject'  => 'Kopia av ditt meddelande till $1: $2',
-'emailsent'       => 'E-post har nu skickats',
-'emailsenttext'   => 'Din e-post har skickats.',
-'emailuserfooter' => 'Detta e-brev skickades av $1 till $2 genom "Skicka e-post"-funktionen på {{SITENAME}}.',
+'usermailererror'  => 'Fel i hanteringen av mail:',
+'defemailsubject'  => '{{SITENAME}} e-post',
+'noemailtitle'     => 'Ingen e-postadress',
+'noemailtext'      => 'Den här användaren har inte angivit en giltig e-postadress.',
+'nowikiemailtitle' => 'Ingen e-post tillåten',
+'nowikiemailtext'  => 'Den här användaren har valt att inte motta e-post från andra användare.',
+'email-legend'     => 'Skicka ett mail till en annan användare på {{SITENAME}}',
+'emailfrom'        => 'Från:',
+'emailto'          => 'Till:',
+'emailsubject'     => 'Ämne:',
+'emailmessage'     => 'Meddelande:',
+'emailsend'        => 'Skicka',
+'emailccme'        => 'Skicka en kopia av meddelandet till mig.',
+'emailccsubject'   => 'Kopia av ditt meddelande till $1: $2',
+'emailsent'        => 'E-post har nu skickats',
+'emailsenttext'    => 'Din e-post har skickats.',
+'emailuserfooter'  => 'Detta e-brev skickades av $1 till $2 genom "Skicka e-post"-funktionen på {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Bevakningslista',
@@ -1690,14 +1879,9 @@ Framtida ändringar av den här sidan och dess diskussionssida kommer att listas
 'watchmethod-list'     => 'letar efter nyligen gjorda ändringar bland bevakade sidor',
 'watchlistcontains'    => 'Din bevakningslista innehåller $1 {{PLURAL:$1|sida|sidor}}.',
 'iteminvalidname'      => "Problem med sidan '$1', ogiltigt namn...",
-'wlnote'               => 'Nedan finns {{PLURAL:$1|den senaste ändringen|de senaste $1 ändringarna}} under {{PLURAL:$2|den senaste timmen|de senaste <b>$2</b> timmarna}}.',
+'wlnote'               => "Nedan finns {{PLURAL:$1|den senaste ändringen|de senaste '''$1''' ändringarna}} under {{PLURAL:$2|den senaste timmen|de senaste '''$2''' timmarna}}.",
 'wlshowlast'           => 'Visa senaste $1 timmarna $2 dagarna $3',
-'watchlist-show-bots'  => 'Visa robotredigeringar',
-'watchlist-hide-bots'  => 'Göm robotredigeringar',
-'watchlist-show-own'   => 'Visa mina redigeringar',
-'watchlist-hide-own'   => 'Göm mina redigeringar',
-'watchlist-show-minor' => 'Visa mindre ändringar',
-'watchlist-hide-minor' => 'Göm mindre ändringar',
+'watchlist-options'    => 'Alternativ för bevakningslistan',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Bevakar...',
@@ -1737,79 +1921,98 @@ För att ändra inställningarna i din bevakningslista, besök
 Feedback och hjälp:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Ta bort sida',
-'confirm'                     => 'Bekräfta',
-'excontent'                   => "Före radering: '$1'",
-'excontentauthor'             => "sidan innehöll '$1' (den enda som skrivit var '$2')",
-'exbeforeblank'               => "Före tömning: '$1'",
-'exblank'                     => 'sidan var tom',
-'delete-confirm'              => 'Radera "$1"',
-'delete-legend'               => 'Radera',
-'historywarning'              => 'Varning: Sidan du håller på att radera har en historik:',
-'confirmdeletetext'           => 'Du håller på att ta bort en sida med hela dess historik.
+# Delete
+'deletepage'             => 'Ta bort sida',
+'confirm'                => 'Bekräfta',
+'excontent'              => "Före radering: '$1'",
+'excontentauthor'        => "innehållet var: '$1' (den enda som skrivit var '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "innehåll före tömning var: '$1'",
+'exblank'                => 'sidan var tom',
+'delete-confirm'         => 'Radera "$1"',
+'delete-legend'          => 'Radera',
+'historywarning'         => 'Varning: Sidan du håller på att radera har en historik:',
+'confirmdeletetext'      => 'Du håller på att ta bort en sida med hela dess historik.
 Bekräfta att du förstår vad du håller på med och vilka konsekvenser detta leder till, och att du följer [[{{MediaWiki:Policy-url}}|riktlinjerna]].',
-'actioncomplete'              => 'Genomfört',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" har tagits bort.
+'actioncomplete'         => 'Genomfört',
+'deletedtext'            => '"<nowiki>$1</nowiki>" har tagits bort.
 Se $2 för noteringar om de senaste raderingarna.',
-'deletedarticle'              => 'raderade "[[$1]]"',
-'suppressedarticle'           => 'undanhöll "[[$1]]"',
-'dellogpage'                  => 'Raderingslogg',
-'dellogpagetext'              => 'Nedan listas de senaste raderingarna och återställningarna.',
-'deletionlog'                 => 'raderingsloggen',
-'reverted'                    => 'Återgått till tidigare version',
-'deletecomment'               => 'Anledning till borttagning:',
-'deleteotherreason'           => 'Annan/ytterligare anledning:',
-'deletereasonotherlist'       => 'Annan anledning',
-'deletereason-dropdown'       => '*Vanliga anledningar till radering
+'deletedarticle'         => 'raderade "[[$1]]"',
+'suppressedarticle'      => 'undanhöll "[[$1]]"',
+'dellogpage'             => 'Raderingslogg',
+'dellogpagetext'         => 'Nedan listas de senaste raderingarna.',
+'deletionlog'            => 'raderingsloggen',
+'reverted'               => 'Återgått till tidigare version',
+'deletecomment'          => 'Anledning till borttagning:',
+'deleteotherreason'      => 'Annan/ytterligare anledning:',
+'deletereasonotherlist'  => 'Annan anledning',
+'deletereason-dropdown'  => '*Vanliga anledningar till radering
 ** Författarens begäran
 ** Upphovsrättsbrott
 ** Vandalism',
-'delete-edit-reasonlist'      => 'Redigera anledningar för radering',
-'delete-toobig'               => 'Denna sida har en lång redigeringshistorik med mer än $1 {{PLURAL:$1|sidversion|sidversioner}}. Borttagning av sådana sidor har begränsats för att förhindra oavsiktliga driftstörningar på {{SITENAME}}.',
-'delete-warning-toobig'       => 'Denna sida har en lång redigeringshistorik med mer än $1 {{PLURAL:$1|sidversion|sidversioner}}. Att radera sidan kan skapa problem med hanteringen av databasen på {{SITENAME}}; var försiktig.',
-'rollback'                    => 'Rulla tillbaka ändringar',
-'rollback_short'              => 'Återställning',
-'rollbacklink'                => 'rulla tillbaka',
-'rollbackfailed'              => 'Tillbakarullning misslyckades',
-'cantrollback'                => 'Det gick inte att rulla tillbaka, då sidan endast redigerats av en användare.',
-'alreadyrolled'               => 'Det gick inte att rulla tillbaka den sista redigeringen av [[User:$2|$2]] ([[User talk:$2|diskussion]] | [[Special:Contributions/$2|{{int:contribslink}}]]) på sidan [[:$1|$1]]. Någon annan har redan rullat tillbaka eller redigerat sidan.
-
-Sidan ändrades senast av [[User:$3|$3]] ([[User talk:$3|diskussion]] | [[Special:Contributions/$2|{{int:contribslink}}]]).',
-'editcomment'                 => 'Redigeringskommentaren var: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Återställde redigeringar av  [[Special:Contributions/$2|$2]] ([[User talk:$2|användardiskussion]]) till senaste versionen av [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Återställde ändringar av $1;
+'delete-edit-reasonlist' => 'Redigera anledningar för radering',
+'delete-toobig'          => 'Denna sida har en lång redigeringshistorik med mer än $1 {{PLURAL:$1|sidversion|sidversioner}}. Borttagning av sådana sidor har begränsats för att förhindra oavsiktliga driftstörningar på {{SITENAME}}.',
+'delete-warning-toobig'  => 'Denna sida har en lång redigeringshistorik med mer än $1 {{PLURAL:$1|sidversion|sidversioner}}. Att radera sidan kan skapa problem med hanteringen av databasen på {{SITENAME}}; var försiktig.',
+
+# Rollback
+'rollback'         => 'Rulla tillbaka ändringar',
+'rollback_short'   => 'Återställning',
+'rollbacklink'     => 'rulla tillbaka',
+'rollbackfailed'   => 'Tillbakarullning misslyckades',
+'cantrollback'     => 'Det gick inte att rulla tillbaka, då sidan endast redigerats av en användare.',
+'alreadyrolled'    => 'Det gick inte att rulla tillbaka den sista redigeringen av [[User:$2|$2]] ([[User talk:$2|diskussion]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) på sidan [[:$1|$1]]. Någon annan har redan rullat tillbaka eller redigerat sidan.
+
+Sidan ändrades senast av [[User:$3|$3]] ([[User talk:$3|diskussion]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]).',
+'editcomment'      => "Redigeringskommentaren var: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Återställde redigeringar av  [[Special:Contributions/$2|$2]] ([[User talk:$2|användardiskussion]]) till senaste versionen av [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Återställde ändringar av $1;
 ändrade tillbaka till senaste version av $2.',
-'sessionfailure'              => 'Något med din session som inloggad är på tok. Din begärda åtgärd har avbrutits, för att förhindra att någon kapar din session. Klicka på "Tillbaka" i din webbläsare och ladda om den sida du kom ifrån. Försök sedan igen.',
+'sessionfailure'   => 'Något med din session som inloggad är på tok. Din begärda åtgärd har avbrutits, för att förhindra att någon kapar din session. Klicka på "Tillbaka" i din webbläsare och ladda om den sida du kom ifrån. Försök sedan igen.',
+
+# Protect
 'protectlogpage'              => 'Skrivskyddslogg',
 'protectlogtext'              => 'Detta är en lista över applicerande och borttagande av skrivskydd.',
 'protectedarticle'            => 'skyddade [[$1]]',
 'modifiedarticleprotection'   => 'ändrade skyddsnivån för "[[$1]]"',
-'unprotectedarticle'          => 'tog bort skydd av $1',
+'unprotectedarticle'          => 'tog bort skydd av "[[$1]]"',
+'movedarticleprotection'      => 'flyttade skyddsinställningar från "[[$2]]" till "[[$1]]"',
 'protect-title'               => 'Skyddsinställningar för "$1"',
+'prot_1movedto2'              => 'flyttade [[$1]] till [[$2]]',
 'protect-legend'              => 'Bekräfta skrivskydd av sida',
 'protectcomment'              => 'Anledning:',
 'protectexpiry'               => 'Varaktighet:',
 'protect_expiry_invalid'      => 'Ogiltig varaktighetstid.',
 'protect_expiry_old'          => 'Den angivna varaktighetentiden har redan passerats.',
 'protect-unchain'             => 'Lås upp flyttillstånd',
-'protect-text'                => 'Här kan du se och ändra skyddsnivån av sidan <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Du kan inte ändra sidors skydd medan du är blockerad.
-Här kan du se gällande skyddsinställninger för sidan <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Skrivskydd kan inte ändras då databasen är låst.
-Nuvarande skrivskyddsinställning för sidan <strong>$1</strong> är:',
-'protect-locked-access'       => 'Ditt konto har inte behörighet att ändra skrivskydd på sidor.
-Nuvarande skrivskyddsinställning för sidan <strong>$1</strong> är:',
+'protect-text'                => "Här kan du se och ändra skyddsnivån av sidan '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Du kan inte ändra sidors skydd medan du är blockerad.
+Här kan du se gällande skyddsinställninger för sidan '''$1''':",
+'protect-locked-dblock'       => "Skrivskydd kan inte ändras då databasen är låst.
+Nuvarande skrivskyddsinställning för sidan '''$1''' är:",
+'protect-locked-access'       => "Ditt konto har inte behörighet att ändra skrivskydd på sidor.
+Nuvarande skrivskyddsinställning för sidan '''$1''' är:",
 'protect-cascadeon'           => 'Den här sidan är skrivskyddad eftersom den inkluderas på följande {{PLURAL:$1|sida|sidor}} som har ett kaskaderande skydd.
 Du kan ändra skyddet av den här sidan, men det påverkar inte det kaskaderande skyddet.',
-'protect-default'             => '(standard)',
+'protect-default'             => 'Tillåt alla användare',
 'protect-fallback'            => 'Kräver "$1"-behörighet',
-'protect-level-autoconfirmed' => 'Blockera oregistrerade användare',
+'protect-level-autoconfirmed' => 'Blockera nya och oregistrerade användare',
 'protect-level-sysop'         => 'Enbart administratörer',
 'protect-summary-cascade'     => 'kaskaderande',
 'protect-expiring'            => 'upphör den $1 (UTC)',
+'protect-expiry-indefinite'   => 'på obestämd tid',
 'protect-cascade'             => 'Skydda sidor som är inkluderade i den här sidan (kaskaderande skydd)',
 'protect-cantedit'            => 'Du kan inte ändra skyddsnivån för den här sidan, eftersom du inte har behörighet att redigera den.',
+'protect-othertime'           => 'Annan tidsperiod:',
+'protect-othertime-op'        => 'annan tidsperiod',
+'protect-existing-expiry'     => 'Gällande varaktighet: $2, kl. $3',
+'protect-otherreason'         => 'Annan/ytterligare anledning:',
+'protect-otherreason-op'      => 'Annan anledning',
+'protect-dropdown'            => '*Vanliga anledningar för skrivskydd
+** Upprepad vandalisering
+** Upprepad spam
+** Redigeringskrig
+** Sida med många besökare',
+'protect-edit-reasonlist'     => 'Redigera skyddsanledningar',
+'protect-expiry-options'      => '1 timme:1 hour,1 dag:1 day,1 vecka:1 week,2 veckor:2 weeks,1 månad:1 month,3 månader:3 months,6 månader:6 months,1 år:1 year,oändlig:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Typ av skydd:',
 'restriction-level'           => 'Skyddsnivå:',
 'minimum-size'                => 'Minsta storlek',
@@ -1830,9 +2033,10 @@ Du kan ändra skyddet av den här sidan, men det påverkar inte det kaskaderande
 # Undelete
 'undelete'                     => 'Visa raderade sidor',
 'undeletepage'                 => 'Visa och återställ borttagna sidor',
-'undeletepagetitle'            => "'''Härunder visas en lista över raderade versioner av [[:$1]]'''.",
+'undeletepagetitle'            => "'''Härunder visas en lista över raderade versioner av [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Visa raderade sidor',
-'undeletepagetext'             => 'Följande sidor har blivit borttagna, men finns fortfarande i ett arkiv och kan återställas. Arkivet kan ibland rensas på gamla versioner.',
+'undeletepagetext'             => 'Följande {{PLURAL:$1|sida har blivit raderad|$1 sidor har blivit raderade}} men finns fortfarande i arkivet och kan återställas.
+Arkivet kan ibland rensas ut.',
 'undelete-fieldset-title'      => 'Återställ sidversioner',
 'undeleteextrahelp'            => "För att återställa sidans hela historik, lämna alla rutor oifyllda och klicka '''''Återställ'''''.
 För att göra en selektiv återställning, kryssa i de rutor som hör till de versioner som ska återställas, och klicka '''''Återställ'''''.
@@ -1843,21 +2047,22 @@ Om en ny sida med samma namn har skapats sedan sidan raderades, kommer den åter
 'undeleterevdel'               => 'Återställningen kan inte utföras om den resulterar i att den senaste versionen är delvis borttagen.
 I sådana fall måste du se till att den senaste raderade versionen inte är ikryssad, eller att den inte är dold.',
 'undeletehistorynoadmin'       => 'Den här sidan har blivit raderad. Anledningen till detta anges i sammanfattningen nedan, tillsammans med uppgifter om de användare som redigerat sidan innan den raderades. Enbart administratörerna har tillgång till den raderade texten.',
-'undelete-revision'            => 'Raderad version av $1 från den $2 av $3.',
+'undelete-revision'            => 'Raderad version av $1 (från den $4 kl. $5) av $3.',
 'undeleterevision-missing'     => 'Versionen finns inte eller är felaktig. Versionen kan ha återställts eller tagits bort från arkivet, du kan också ha följt en felaktig länk.',
 'undelete-nodiff'              => 'Ingen tidigare version hittades.',
 'undeletebtn'                  => 'Återställ',
 'undeletelink'                 => 'återställ',
 'undeletereset'                => 'Rensa',
+'undeleteinvert'               => 'Invertera urval',
 'undeletecomment'              => 'Kommentar:',
-'undeletedarticle'             => 'återställde "$1"',
+'undeletedarticle'             => 'återställde "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|en version återställd|$1 versioner återställda}}',
 'undeletedrevisions-files'     => '$1 {{PLURAL:$1|version|versioner}} och $2 {{PLURAL:$2|fil|filer}} återställda',
-'undeletedfiles'               => '$1 {{PLURAL:$1|fil återställd|filer återställda}}',
+'undeletedfiles'               => '{{PLURAL:$1|en fil återställd|$1 filer återställda}}',
 'cannotundelete'               => 'Återställning misslyckades; kanske någon redan har återställt sidan.',
 'undeletedpage'                => "<big>'''$1 har återställts'''</big>
 
-I  [[Special:Log/delete|borttagningsloggen]] kan du hitta information om nyligen borttagna och återställda sidor.",
+Se [[Special:Log/delete|raderingsloggen]] för en förteckning över de senaste raderingarna och återställningarna.",
 'undelete-header'              => 'Se [[Special:Log/delete|raderingsloggen]] för nyligen raderade sidor.',
 'undelete-search-box'          => 'Sök efter raderade sidor',
 'undelete-search-prefix'       => 'Sidor som börjar med:',
@@ -1880,26 +2085,27 @@ $1',
 'blanknamespace' => '(Huvudnamnrymden)',
 
 # Contributions
-'contributions' => 'Användarbidrag',
-'mycontris'     => 'Mina bidrag',
-'contribsub2'   => 'För $1 ($2)',
-'nocontribs'    => 'Inga ändringar som motsvarar dessa kriterier hittades.',
-'uctop'         => '(senaste)',
-'month'         => 'Från månad (och tidigare):',
-'year'          => 'Från år (och tidigare):',
-
-'sp-contributions-newbies'     => 'Visa endast bidrag från nya konton',
-'sp-contributions-newbies-sub' => 'Från nya konton',
-'sp-contributions-blocklog'    => 'Blockeringslogg',
-'sp-contributions-search'      => 'Sök efter användarbidrag',
-'sp-contributions-username'    => 'IP-adress eller användarnamn:',
-'sp-contributions-submit'      => 'Sök',
+'contributions'       => 'Användarbidrag',
+'contributions-title' => 'Bidrag av $1',
+'mycontris'           => 'Mina bidrag',
+'contribsub2'         => 'För $1 ($2)',
+'nocontribs'          => 'Inga ändringar som motsvarar dessa kriterier hittades.',
+'uctop'               => '(senaste)',
+'month'               => 'Från månad (och tidigare):',
+'year'                => 'Från år (och tidigare):',
+
+'sp-contributions-newbies'       => 'Visa endast bidrag från nya konton',
+'sp-contributions-newbies-sub'   => 'Från nya konton',
+'sp-contributions-newbies-title' => 'Bidrag från nya konton',
+'sp-contributions-blocklog'      => 'Blockeringslogg',
+'sp-contributions-search'        => 'Sök efter användarbidrag',
+'sp-contributions-username'      => 'IP-adress eller användarnamn:',
+'sp-contributions-submit'        => 'Sök',
 
 # What links here
 'whatlinkshere'            => 'Vad som länkar hit',
 'whatlinkshere-title'      => 'Sidor som länkar till "$1"',
 'whatlinkshere-page'       => 'Sida:',
-'linklistsub'              => '(Länklista)',
 'linkshere'                => "Följande sidor länkar till '''[[:$1]]''':",
 'nolinkshere'              => "Inga sidor länkar till '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Inga sidor i den angivna namnrymden länkar till '''[[:$1]]'''.",
@@ -1945,6 +2151,8 @@ Ange orsak nedan (exempelvis genom att nämna sidor som blivit vandaliserade).',
 'ipbotherreason'                  => 'Annan/ytterligare anledning:',
 'ipbhidename'                     => 'Dölj användarnamnet från blockeringsloggen, blockeringslistan och användarlistan',
 'ipbwatchuser'                    => 'Bevaka användarens användarsida och diskussionssida',
+'ipballowusertalk'                => 'Låt användaren redigera sin egen diskussionssida under blockeringen',
+'ipb-change-block'                => 'Återblockera användaren med de här inställningarna',
 'badipaddress'                    => 'Du har inte skrivit IP-adressen korrekt.',
 'blockipsuccesssub'               => 'Blockeringen är utförd',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] har blockerats.
@@ -1954,30 +2162,39 @@ Ange orsak nedan (exempelvis genom att nämna sidor som blivit vandaliserade).',
 'ipb-unblock'                     => 'Ta bort blockering av en användare eller IP-adress',
 'ipb-blocklist-addr'              => 'Gällande blockeringar av $1',
 'ipb-blocklist'                   => 'Visa gällande blockeringar',
+'ipb-blocklist-contribs'          => 'Bidrag från $1',
 'unblockip'                       => 'Ta bort blockering av användare/IP-adress',
 'unblockiptext'                   => 'Använd formuläret nedan för att ta bort blockeringen av en IP-adress.',
-'ipusubmit'                       => 'Ta bort blockeringen',
+'ipusubmit'                       => 'Upphäv denna blockering',
 'unblocked'                       => 'Blockeringen av [[User:$1|$1]] har hävts',
 'unblocked-id'                    => 'Blockeringen $1 har hävts',
 'ipblocklist'                     => 'Blockerade IP-adresser och användarnamn',
 'ipblocklist-legend'              => 'Sök efter en blockerad användare',
 'ipblocklist-username'            => 'Användarnamn eller IP-adress',
+'ipblocklist-sh-userblocks'       => '$1 blockeringar av konton',
+'ipblocklist-sh-tempblocks'       => '$1 tillfälliga blockeringar',
+'ipblocklist-sh-addressblocks'    => '$1 blockeringar av enskilda IP-adresser',
 'ipblocklist-submit'              => 'Sök',
-'blocklistline'                   => '$1: $2 blockerar $3 $4',
+'blocklistline'                   => '$1, $2 blockerade $3 ($4)',
 'infiniteblock'                   => 'för evigt',
 'expiringblock'                   => 'till $1',
 'anononlyblock'                   => 'endast för oinloggade',
 'noautoblockblock'                => 'utan automatisk blockering',
 'createaccountblock'              => 'kontoregistrering blockerad',
 'emailblock'                      => 'e-post blockerad',
+'blocklist-nousertalk'            => 'kan inte redigera sin egen diskussionssida',
 'ipblocklist-empty'               => 'Listan över blockerade IP-adresser är tom.',
 'ipblocklist-no-results'          => 'Den angivna IP-adressen eller användaren är inte blockerad.',
 'blocklink'                       => 'blockera',
 'unblocklink'                     => 'ta bort blockering',
+'change-blocklink'                => 'ändra blockering',
 'contribslink'                    => 'bidrag',
-'autoblocker'                     => 'Automatisk blockering eftersom du har samma IP-adress som "$1". Motivering till blockeringen: "$2".',
+'autoblocker'                     => 'Automatisk blockerad eftersom din IP-adress nyligen använts av "[[User:$1|$1]]".
+Motiveringen som angavs för blockeringen av $1 var: "$2".',
 'blocklogpage'                    => 'Blockeringslogg',
+'blocklog-fulllog'                => 'Fullständig blockeringslogg',
 'blocklogentry'                   => 'blockerade [[$1]] med blockeringstid på $2 $3',
+'reblock-logentry'                => 'ändrade blockeringsinställningar för [[$1]] med en varaktighet på $2 $3',
 'blocklogtext'                    => 'Detta är en logg över blockeringar och avblockeringar.
 Automatiskt blockerade IP-adresser listas ej.
 I [[Special:IPBlockList|blockeringslistan]] listas alla IP-adresser och användare som är blockerade för närvarande.',
@@ -1986,11 +2203,14 @@ I [[Special:IPBlockList|blockeringslistan]] listas alla IP-adresser och använda
 'block-log-flags-nocreate'        => 'hindrar kontoregistrering',
 'block-log-flags-noautoblock'     => 'utan automatblockering',
 'block-log-flags-noemail'         => 'e-post blockerad',
+'block-log-flags-nousertalk'      => 'kan inte redigera sin diskussionssida',
 'block-log-flags-angry-autoblock' => 'utökad automatblockering aktiverad',
 'range_block_disabled'            => 'Möjligheten för administratörer att blockera intervall av IP-adresser har stängts av.',
 'ipb_expiry_invalid'              => 'Ogiltig varaktighetstid.',
 'ipb_expiry_temp'                 => 'För att dölja användarnamnet måste blockeringen vara permanent.',
 'ipb_already_blocked'             => '"$1" är redan blockerad',
+'ipb-needreblock'                 => '== Redan blockerad ==
+$1 är redan blockerad. Vill du ändra inställningarna?',
 'ipb_cant_unblock'                => 'Fel: Hittade inte blockering $1. Det är möjligt att den redan har upphävts.',
 'ipb_blocked_as_range'            => 'Fel: IP-adressen $1 är inte direkt blockerad, och kan därför inte avblockeras. Adressen är blockerad som en del av IP-intervallet $2, som kan avblockeras.',
 'ip_range_invalid'                => 'Ogiltigt IP-intervall.',
@@ -1999,8 +2219,10 @@ I [[Special:IPBlockList|blockeringslistan]] listas alla IP-adresser och använda
 'proxyblocker-disabled'           => 'Den här funktionen är avaktiverad.',
 'proxyblockreason'                => 'Din IP-adress har blivit blockerad eftersom den tillhör en öppen proxy. Kontakta din internetleverantör eller din organisations eller företags tekniska support, och informera dem om denna allvarliga säkerhetsrisk.',
 'proxyblocksuccess'               => 'Gjort.',
-'sorbsreason'                     => 'Din IP-adress finns med på DNSBL:s lista över öppna proxies.',
-'sorbs_create_account_reason'     => 'Din IP-adress finns med på listan över öppna proxyn, DNSBL, som används av {{SITENAME}}. Du kan därför inte skapa något användarkonto.',
+'sorbsreason'                     => 'Din IP-adress är listad som öppen proxy i den DNSBL {{SITENAME}} använder.',
+'sorbs_create_account_reason'     => 'Din IP-adress är listad som en öppen proxy i den DNSBL som används av {{SITENAME}}.
+Du får inte skapa ett användarkonto',
+'cant-block-while-blocked'        => 'Du kan inte blockera andra användare medan du är blockerad.',
 
 # Developer tools
 'lockdb'              => 'LÃ¥s databas',
@@ -2022,9 +2244,9 @@ Bekräfta att du verkligen vill göra detta, och att du kommer att låsa upp dat
 'databasenotlocked'   => 'Databasen är inte låst.',
 
 # Move page
-'move-page'               => 'Flytta $1',
-'move-page-legend'        => 'Flytta sida',
-'movepagetext'            => "Med hjälp av formuläret härunder kan du byta namn på en sida, och flytta hela dess historik till ett nytt namn.
+'move-page'                    => 'Flytta $1',
+'move-page-legend'             => 'Flytta sida',
+'movepagetext'                 => "Med hjälp av formuläret härunder kan du byta namn på en sida, och flytta hela dess historik till ett nytt namn.
 Den gamla sidtiteln kommer att göras om till en omdirigering till den nya titeln.
 Du kan välja att automatiskt uppdatera omdirigeringar som leder till den gamla titeln.
 Om du väljer att inte göra det, kontrollera då att du inte skapar några [[Special:DoubleRedirects|dubbla]] eller [[Special:BrokenRedirects|trasiga omdirigeringar]].
@@ -2036,48 +2258,61 @@ Det innebär att du kan flytta tillbaks en sida om du råkar göra fel, och att
 '''VARNING!'''
 Att flytta en populär sida kan vara en drastisk och oväntad ändring;
 därför bör du vara säker på att du förstår konsekvenserna innan du fortsätter med flytten.",
-'movepagetalktext'        => "Diskussionssidan kommer att även den automatiskt flyttas '''om inte''':
+'movepagetalktext'             => "Diskussionssidan kommer att även den automatiskt flyttas '''om inte''':
 *Det redan finns en diskussionssida som inte är tom med det nya namnet, eller
 *Du avmarkerar rutan nedan.
 
 I de fallen måste du flytta eller sammanfoga sidan manuellt, om det önskas.",
-'movearticle'             => 'Flytta sidan:',
-'movenotallowed'          => 'Du har inte behörighet att flytta sidor på den här wikin.',
-'newtitle'                => 'Till nya titeln:',
-'move-watch'              => 'Bevaka denna sida',
-'movepagebtn'             => 'Flytta sidan',
-'pagemovedsub'            => 'Flyttningen lyckades',
-'movepage-moved'          => '<big>\'\'\'"$1" har flyttats till "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Antingen existerar redan en sida med det namnet, eller så har du valt ett namn som inte är tillåtet.
+'movearticle'                  => 'Flytta sidan:',
+'movenologin'                  => 'Inte inloggad',
+'movenologintext'              => 'För att flytta en sida måste du vara registrerad användare och [[Special:UserLogin|inloggad]].',
+'movenotallowed'               => 'Du har inte behörighet att flytta sidor på den här wikin.',
+'movenotallowedfile'           => 'Du har inte tillåtelse att flytta filer.',
+'cant-move-user-page'          => 'Du har inte behörighet att flytta användarsidor (bortsett från undersidor).',
+'cant-move-to-user-page'       => 'Du har inte behörighet att flytta en sida till en användarsida (förutom till en användarundersida).',
+'newtitle'                     => 'Till nya titeln:',
+'move-watch'                   => 'Bevaka denna sida',
+'movepagebtn'                  => 'Flytta sidan',
+'pagemovedsub'                 => 'Flyttningen lyckades',
+'movepage-moved'               => '<big>\'\'\'"$1" har flyttats till "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'En omdirigering har skapats.',
+'movepage-moved-noredirect'    => 'Skapandet av en omdirigering avbröts.',
+'articleexists'                => 'Antingen existerar redan en sida med det namnet, eller så har du valt ett namn som inte är tillåtet.
 Välj något annat namn istället.',
-'cantmove-titleprotected' => 'Du kan inte flytta sidan till den titeln, eftersom den nya titeln har skyddats från att skapas.',
-'talkexists'              => "'''Sidan flyttades, men diskussionssidan kunde inte flyttas eftersom det redan fanns en diskussionssida med det nya namnet.
+'cantmove-titleprotected'      => 'Du kan inte flytta sidan till den titeln, eftersom den nya titeln har skyddats från att skapas.',
+'talkexists'                   => "'''Sidan flyttades, men diskussionssidan kunde inte flyttas eftersom det redan fanns en diskussionssida med det nya namnet.
 Försök att sammanfoga dem manuellt.'''",
-'movedto'                 => 'flyttad till',
-'movetalk'                => 'Flytta tillhörande diskussionssida',
-'move-subpages'           => 'Flytta alla undersidor, om det finns sådana',
-'move-talk-subpages'      => 'Flytta alla undersidor av diskussionssidan, om det finns sådana',
-'movepage-page-exists'    => 'Sidan $1 finns redan och kan inte skrivas över automatiskt.',
-'movepage-page-moved'     => 'Sidan $1 har flyttats till $2.',
-'movepage-page-unmoved'   => 'Sidan $1 kunde inte flyttas till $2.',
-'movepage-max-pages'      => 'Gränsen på $1 {{PLURAL:$1|flyttad sida|flyttade sidor}} har uppnåtts och inga fler sidor kommer att flyttas automatiskt.',
-'1movedto2'               => 'flyttade [[$1]] till [[$2]]',
-'1movedto2_redir'         => 'flyttade [[$1]] till [[$2]], som var en omdirigeringssida',
-'movelogpage'             => 'Sidflyttslogg',
-'movelogpagetext'         => 'Listan nedan visar sidor som flyttats.',
-'movereason'              => 'Anledning:',
-'revertmove'              => 'flytta tillbaka',
-'delete_and_move'         => 'Radera och flytta',
-'delete_and_move_text'    => '==Radering krävs==
+'movedto'                      => 'flyttad till',
+'movetalk'                     => 'Flytta tillhörande diskussionssida',
+'move-subpages'                => 'Flytta alla undersidor, om det finns sådana',
+'move-talk-subpages'           => 'Flytta alla undersidor av diskussionssidan, om det finns sådana',
+'movepage-page-exists'         => 'Sidan $1 finns redan och kan inte skrivas över automatiskt.',
+'movepage-page-moved'          => 'Sidan $1 har flyttats till $2.',
+'movepage-page-unmoved'        => 'Sidan $1 kunde inte flyttas till $2.',
+'movepage-max-pages'           => 'Gränsen på $1 {{PLURAL:$1|flyttad sida|flyttade sidor}} har uppnåtts och inga fler sidor kommer att flyttas automatiskt.',
+'1movedto2'                    => 'flyttade [[$1]] till [[$2]]',
+'1movedto2_redir'              => 'flyttade [[$1]] till [[$2]], som var en omdirigeringssida',
+'move-redirect-suppressed'     => 'utan omdirigering',
+'movelogpage'                  => 'Sidflyttslogg',
+'movelogpagetext'              => 'Listan nedan visar sidor som flyttats.',
+'movereason'                   => 'Anledning:',
+'revertmove'                   => 'flytta tillbaka',
+'delete_and_move'              => 'Radera och flytta',
+'delete_and_move_text'         => '==Radering krävs==
 Den titel du vill flytta sidan till, "[[:$1]]", finns redan. Vill du radera den för att möjliggöra flytt av denna sida dit?',
-'delete_and_move_confirm' => 'Ja, radera sidan',
-'delete_and_move_reason'  => 'Raderad för att flytta hit en annan sida.',
-'selfmove'                => 'Ursprungstitel och destinationstitel är identiska. Sidan kan inte flyttas till sig själv.',
-'immobile_namespace'      => 'Namnrymden du försöker flytta sidan till eller från är av en speciell typ. Det går inte att flytta sidor till eller från den namnrymden.',
-'imagenocrossnamespace'   => 'Kan inte flytta filer till andra namnrymder än filnamnrymden',
-'imagetypemismatch'       => 'Den nya filändelsen motsvarar inte filtypen',
-'imageinvalidfilename'    => 'Önskat filnamn är ogiltigt',
-'fix-double-redirects'    => 'Uppdatera omdirigeringar som leder till den gamla titeln',
+'delete_and_move_confirm'      => 'Ja, radera sidan',
+'delete_and_move_reason'       => 'Raderad för att flytta hit en annan sida.',
+'selfmove'                     => 'Ursprungstitel och destinationstitel är identiska. Sidan kan inte flyttas till sig själv.',
+'immobile-source-namespace'    => 'Kan inte flytta sidor i namnrymden "$1"',
+'immobile-target-namespace'    => 'Kan inte flytta sidor till namnrymden "$1"',
+'immobile-target-namespace-iw' => 'Interwikilänk är inte ett giltigt mål för sidflyttar.',
+'immobile-source-page'         => 'Denna sida är inte flyttbar.',
+'immobile-target-page'         => 'Kan inte flytta till det målnamnet.',
+'imagenocrossnamespace'        => 'Kan inte flytta filer till andra namnrymder än filnamnrymden',
+'imagetypemismatch'            => 'Den nya filändelsen motsvarar inte filtypen',
+'imageinvalidfilename'         => 'Önskat filnamn är ogiltigt',
+'fix-double-redirects'         => 'Uppdatera omdirigeringar som leder till den gamla titeln',
+'move-leave-redirect'          => 'Lämna kvar en omdirigering',
 
 # Export
 'export'            => 'Exportera sidor',
@@ -2087,7 +2322,7 @@ Filen kan sedan importeras till en annan MediaWiki-wiki med hjälp av sidan [[Sp
 Exportera sidor genom att skriva in sidtitlarna i rutan här nedan.
 Skriv en titel per rad och välj om du du vill exportera alla versioner av texten med sidhistorik, eller om du enbart vill exportera den nuvarande versionen med information om den senaste redigeringen.
 
-I det senare fallet kan du även använda en länk, exempel [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] för sidan "[[{{MediaWiki:Mainpage}}]]".',
+I det senare fallet kan du även använda en länk, exempel [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] för sidan "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Inkludera endast den nuvarande versionen, inte hela historiken',
 'exportnohistory'   => "----
 '''OBS:''' export av fullständig sidhistorik med hjälp av detta formulär har stängts av på grund av prestandaskäl.",
@@ -2103,7 +2338,7 @@ I det senare fallet kan du även använda en länk, exempel [[{{ns:special}}:Exp
 'allmessagesdefault'        => 'Standardtext',
 'allmessagescurrent'        => 'Nuvarande text',
 'allmessagestext'           => 'Detta är en lista över alla meddelanden i namnrymden MediaWiki.
-Besök [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] eller [http://translatewiki.net Betawiki] om du vill bidra till översättningen av MediaWiki.',
+Besök [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] eller [http://translatewiki.net translatewiki.net] om du vill bidra till översättningen av MediaWiki.',
 'allmessagesnotsupportedDB' => "Den här sidan kan inte användas eftersom '''\$wgUseDatabaseMessages''' är avstängd.",
 'allmessagesfilter'         => 'Filter för meddelandenamn:',
 'allmessagesmodified'       => 'Visa bara ändrade',
@@ -2123,14 +2358,17 @@ Besök [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] eller
 'import-interwiki-text'      => 'Välj en wiki och sidtitel att importera.
 Versionshistorik (datum och redaktörer) kommer att bevaras.
 All överföring mellan wikier (transwiki) listas i  [[Special:Log/import|importloggen]].',
+'import-interwiki-source'    => 'Källwiki/sida:',
 'import-interwiki-history'   => 'Kopiera hela versionshistoriken för denna sida',
 'import-interwiki-submit'    => 'Importera',
 'import-interwiki-namespace' => 'MÃ¥lnamnrymd:',
+'import-upload-filename'     => 'Filnamn:',
+'import-comment'             => 'Kommentar:',
 'importtext'                 => 'Exportera filen från ursprungs-wikin genom att använda [[Special:Export|exportverktyget]], spara den till din hårddisk och ladda upp den här.',
 'importstart'                => 'Importerar sidor....',
 'import-revision-count'      => '$1 {{PLURAL:$1|version|versioner}}',
 'importnopages'              => 'Det finns inga sidor att importera.',
-'importfailed'               => 'Importen misslyckades: $1',
+'importfailed'               => 'Importen misslyckades: <nowiki>$1</nowiki>',
 'importunknownsource'        => 'Okänd typ av importkälla',
 'importcantopen'             => 'Misslyckades med att öppna importfilen.',
 'importbadinterwiki'         => 'Felaktig interwiki-länk',
@@ -2159,20 +2397,20 @@ All överföring mellan wikier (transwiki) listas i  [[Special:Log/import|import
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|version|versioner}} från $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Min användarsida',
+'tooltip-pt-userpage'             => 'Din användarsida',
 'tooltip-pt-anonuserpage'         => 'Användarsida för ip-numret du redigerar från',
-'tooltip-pt-mytalk'               => 'Min diskussionssida',
+'tooltip-pt-mytalk'               => 'Din diskussionssida',
 'tooltip-pt-anontalk'             => 'Diskussion om redigeringar från det här ip-numret',
 'tooltip-pt-preferences'          => 'Mina inställningar',
 'tooltip-pt-watchlist'            => 'Listan över sidor du bevakar för ändringar',
-'tooltip-pt-mycontris'            => 'Lista över mina bidrag',
+'tooltip-pt-mycontris'            => 'Lista över dina bidrag',
 'tooltip-pt-login'                => 'Du får gärna logga in, men det är inte nödvändigt',
 'tooltip-pt-anonlogin'            => 'Du får gärna logga in, men det är inte nödvändigt',
 'tooltip-pt-logout'               => 'Logga ut',
 'tooltip-ca-talk'                 => 'Diskussion om innehållssidan',
 'tooltip-ca-edit'                 => 'Du kan redigera den här sidan.
 Vänligen använd förhandsgranskningsknappen innan du sparar.',
-'tooltip-ca-addsection'           => 'Lägg till en kommentar i den här diskussionen',
+'tooltip-ca-addsection'           => 'Starta ett nytt avsnitt',
 'tooltip-ca-viewsource'           => 'Den här sidan är skrivskyddad. Du kan se källtexten.',
 'tooltip-ca-history'              => 'Tidigare versioner av sidan',
 'tooltip-ca-protect'              => 'Skydda den här sidan',
@@ -2201,16 +2439,16 @@ Vänligen använd förhandsgranskningsknappen innan du sparar.',
 'tooltip-t-specialpages'          => 'Lista över alla specialsidor',
 'tooltip-t-print'                 => 'Utskriftvänlig version av den här sidan',
 'tooltip-t-permalink'             => 'Permanent länk till den här versionen av sidan',
-'tooltip-ca-nstab-main'           => 'Visa sidan',
+'tooltip-ca-nstab-main'           => 'Visa innehållssidan',
 'tooltip-ca-nstab-user'           => 'Visa användarsidan',
 'tooltip-ca-nstab-media'          => 'Visa mediesidan',
-'tooltip-ca-nstab-special'        => 'Detta är en specialsida; specialsidor kan inte redigeras',
+'tooltip-ca-nstab-special'        => 'Detta är en specialsida; du kan inte redigeras själva sidan',
 'tooltip-ca-nstab-project'        => 'Visa projektsidan',
-'tooltip-ca-nstab-image'          => 'Se filsidan',
-'tooltip-ca-nstab-mediawiki'      => 'Se systemmeddelandet',
-'tooltip-ca-nstab-template'       => 'Se mallen',
-'tooltip-ca-nstab-help'           => 'Se hjälpsidan',
-'tooltip-ca-nstab-category'       => 'Se kategorisidan',
+'tooltip-ca-nstab-image'          => 'Visa filsidan',
+'tooltip-ca-nstab-mediawiki'      => 'Visa systemmeddelandet',
+'tooltip-ca-nstab-template'       => 'Visa mallen',
+'tooltip-ca-nstab-help'           => 'Visa hjälpsidan',
+'tooltip-ca-nstab-category'       => 'Visa kategorisidan',
 'tooltip-minoredit'               => 'Markera som mindre ändring',
 'tooltip-save'                    => 'Spara dina ändringar',
 'tooltip-preview'                 => 'Förhandsgranska dina ändringar, vänligen använd detta innan du sparar!',
@@ -2219,6 +2457,9 @@ Vänligen använd förhandsgranskningsknappen innan du sparar.',
 'tooltip-watch'                   => 'Lägg till den här sidan i din bevakningslista',
 'tooltip-recreate'                => 'Ã…terskapa sidan fast den har tagits bort',
 'tooltip-upload'                  => 'Starta uppladdning',
+'tooltip-rollback'                => '"Tillbakarullning" tar med en knapptryckning bort ändringar som gjorts av den som senast redigerade sidan.',
+'tooltip-undo'                    => '"Gör ogjord" återställer denna redigering och öppnar redigeringsrutan med förhandsgranskning.
+Ger möjlighet att skriva en motivering i redigeringssammanfattningen',
 
 # Stylesheets
 'common.css'      => '/* CSS som skrivs här påverkar alla skal */',
@@ -2226,14 +2467,21 @@ Vänligen använd förhandsgranskningsknappen innan du sparar.',
 'nostalgia.css'   => '/* CSS som skrivs här kommer att påverka alla användare av skalet Nostalgi */',
 'cologneblue.css' => '/* CSS som skrivs här kommer att påverka alla användare av skalet Cologne blå */',
 'monobook.css'    => '/* CSS som skrivs här kommer att påverka alla användare av skalet Monobook */',
-'myskin.css'      => '/* CSS som skrivs här kommer att påverka alla användare av skalet Mitt skal */',
+'myskin.css'      => '/* CSS som skrivs här kommer att påverka alla användare av skalet Myskin */',
 'chick.css'       => '/* CSS som skrivs här kommer att påverka alla användare av skalet Chick */',
 'simple.css'      => '/* CSS som skrivs här kommer att påverka alla användare av skalet Enkelt */',
 'modern.css'      => '/* CSS som skrivs här kommer att påverka alla användare av skalet Modern */',
 
 # Scripts
-'common.js'   => '/* JavaScript som skrivs här körs varje gång en användare laddar en sida. */',
-'monobook.js' => '/* Javascript härifrån laddas endast för användare som använder Monobook-utseendet */',
+'common.js'      => '/* JavaScript som skrivs här körs varje gång en användare laddar en sida. */',
+'standard.js'    => '/* JavaScript här kommer att laddas för de som använder skinnet Standard */',
+'nostalgia.js'   => '/* JavaScript här kommer att laddas för de som använder skalet Nostalgia */',
+'cologneblue.js' => '/* JavaScript här kommer att laddas för de som använder skalet Cologne Blue */',
+'monobook.js'    => '/* JavaScript här kommer att laddas för de som använder skalet MonoBook */',
+'myskin.js'      => '/* JavaScript här kommer att laddas för de som använder skalet Myskin */',
+'chick.js'       => '/* JavaScript här kommer att laddas för de som använder skalet Chick */',
+'simple.js'      => '/* JavaScript här kommer att laddas för de som använder skalet Simple */',
+'modern.js'      => '/* JavaScript här kommer att laddas för de som använder skalet Modern */',
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF metadata avstängt på den här servern.',
@@ -2241,12 +2489,12 @@ Vänligen använd förhandsgranskningsknappen innan du sparar.',
 'notacceptable'     => 'Den här wiki-servern kan inte erbjuda data i ett format som din klient kan läsa.',
 
 # Attribution
-'anonymous'        => 'Anonym användare på {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Anonym användare|Anonyma användare}} på {{SITENAME}}',
 'siteuser'         => 'användaren $1 på {{SITENAME}}',
 'lastmodifiedatby' => 'Den här sidan ändrades senast kl. $2 den $1 av $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Baserad på arbete av $1.',
 'others'           => 'andra',
-'siteusers'        => '{{SITENAME}} användare $1',
+'siteusers'        => '{{SITENAME}}-{{PLURAL:$2|användaren|användarna}} $1',
 'creditspage'      => 'Användare som bidragit till sidan',
 'nocredits'        => 'Det finns ingen information tillgänglig om vem som bidragit till denna sida.',
 
@@ -2267,6 +2515,16 @@ Detta orsakades troligen av en länk till en svartlistad webbplats.',
 'numauthors'     => 'Antal olika bidragsgivare (sida): $1',
 'numtalkauthors' => 'Antal olika bidragsgivare (diskussionssida): $1',
 
+# Skin names
+'skinname-standard'    => 'Standard',
+'skinname-nostalgia'   => 'Nostalgi',
+'skinname-cologneblue' => 'Cologne blå',
+'skinname-monobook'    => 'Monobook',
+'skinname-myskin'      => 'Mitt utseende',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Enkel',
+'skinname-modern'      => 'Modern',
+
 # Math options
 'mw_math_png'    => 'Rendera alltid PNG',
 'mw_math_simple' => 'HTML om mycket enkel, annars PNG',
@@ -2287,11 +2545,12 @@ Detta orsakades troligen av en länk till en svartlistad webbplats.',
 'markedaspatrollederror-noautopatrol' => 'Du har inte tillåtelse att markera dina egna redigeringar som patrullerade.',
 
 # Patrol log
-'patrol-log-page'   => 'Patrulleringslogg',
-'patrol-log-header' => 'Detta är en logg över patrullerade sidversioner.',
-'patrol-log-line'   => 'markerade $1 av $2 som patrullerad $3',
-'patrol-log-auto'   => '(automatiskt)',
-'patrol-log-diff'   => 'version $1',
+'patrol-log-page'      => 'Patrulleringslogg',
+'patrol-log-header'    => 'Detta är en logg över patrullerade sidversioner.',
+'patrol-log-line'      => 'markerade $1 av $2 som patrullerad $3',
+'patrol-log-auto'      => '(automatiskt)',
+'patrol-log-diff'      => 'version $1',
+'log-show-hide-patrol' => '$1 patrulleringslogg',
 
 # Image deletion
 'deletedrevision'                 => 'Raderade gammal sidversion $1',
@@ -2308,6 +2567,9 @@ $1',
 'previousdiff' => '� Äldre redigering',
 'nextdiff'     => 'Nyare redigering →',
 
+# Visual comparison
+'visual-comparison' => 'Visuell jämförelse',
+
 # Media information
 'mediawarning'         => "'''Varning:''': Denna fil kan innehålla programkod som, om den körs, kan skada din dator.",
 'imagemaxsize'         => 'Begränsa bilders storlek på filbeskrivningssidor till:',
@@ -2320,10 +2582,12 @@ $1',
 'show-big-image'       => 'Högupplöst version',
 'show-big-image-thumb' => '<small>Storlek på förhandsvisningen: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galleri över nya filer',
 'imagelisttext'         => 'Nedan finns en lista med <strong>$1</strong> {{PLURAL:$1|fil|filer}} sorterad <strong>$2</strong>.',
 'newimages-summary'     => 'Den här specialsidan visar de senast uppladdade filerna.',
+'newimages-legend'      => 'Filter',
+'newimages-label'       => 'Filnamn (eller en del av det):',
 'showhidebots'          => '($1 robotar)',
 'noimages'              => 'Ingenting att se.',
 'ilsubmit'              => 'Sök',
@@ -2532,6 +2796,18 @@ Den första länken på en rad måste vara en länk till en otillåten fil.
 'exif-lightsource-24'  => 'ISO studiobelysning',
 'exif-lightsource-255' => 'Annan ljuskälla',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Blixten utlöstes ej',
+'exif-flash-fired-1'    => 'Blixten utlöstes',
+'exif-flash-return-0'   => 'ingen funktion för upptäckande av pulserande ljus',
+'exif-flash-return-2'   => 'pulserande ljus inte upptäckt',
+'exif-flash-return-3'   => 'pulserande ljus upptäckt',
+'exif-flash-mode-1'     => 'tvingad blixtutlösning',
+'exif-flash-mode-2'     => 'blixten avstängd',
+'exif-flash-mode-3'     => 'autoläge',
+'exif-flash-function-1' => 'Ingen blixtfunktion',
+'exif-flash-redeye-1'   => 'röda-ögon-reducering',
+
 'exif-focalplaneresolutionunit-2' => 'tum',
 
 'exif-sensingmethod-1' => 'Ej angivet',
@@ -2667,21 +2943,10 @@ Denna bekräftelsekod kommer inte att fungera efter $4.',
 Bekräfta att du verkligen vill återskapa sidan.",
 'recreate'            => 'Ã…terskapa',
 
-# HTML dump
-'redirectingto' => 'Omdirigerar till [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Rensa denna sidas cache?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Leta efter sidor som innehåller ''$1''.",
-'searchnamed'      => "Leta efter sidor som heter ''$1''.",
-'articletitles'    => "Sidor som börjar med ''$1''",
-'hideresults'      => 'Göm resultat',
-'useajaxsearch'    => 'Använd AJAX-sökning',
+'confirm-purge-top'    => 'Rensa denna sidas cache?',
+'confirm-purge-bottom' => 'Rensning av en sida tömmer cachen och tvingar fram den senaste versionen.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� föregående sida',
@@ -2701,10 +2966,10 @@ $1',
 'table_pager_empty'        => 'Inga resultat',
 
 # Auto-summaries
-'autosumm-blank'   => 'Tar bort sidans innehåll',
+'autosumm-blank'   => 'Tömde sidan',
 'autosumm-replace' => "Ersätter sidans innehåll med '$1'",
 'autoredircomment' => 'Omdirigerar till [[$1]]',
-'autosumm-new'     => 'Ny sida: $1',
+'autosumm-new'     => "Skapade sidan med '$1'",
 
 # Size units
 'size-bytes'     => '$1 byte',
@@ -2753,6 +3018,7 @@ Du kan också [[Special:Watchlist/edit|använda standardeditorn]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Okänd tagg "$1"',
+'duplicate-defaultsort' => 'Varning: Standardsorteringsnyckeln "$2" tar över från den tidigare standardsorteringsnyckeln "$1".',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2781,13 +3047,13 @@ Du kan också [[Special:Watchlist/edit|använda standardeditorn]].',
 'filepath-submit'  => 'Sökväg',
 'filepath-summary' => 'Den här sidan ger den fullständiga sökvägen till en fil. Bilder visas i full upplösning i din webbläsare, andra filtyper öppnas direkt i de program som är associerade till dem.
 
-Ange filens namn utan prefixet "{{ns:image}}:".',
+Ange filens namn utan prefixet "{{ns:file}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Sök efter dubblettfiler',
 'fileduplicatesearch-summary'  => 'Sök efter dubblettfiler baserat på filernas hash-värden.
 
-Skriv filnamnet utan prefixet "{{ns:image}}:" .',
+Skriv filnamnet utan prefixet "{{ns:file}}:" .',
 'fileduplicatesearch-legend'   => 'Sök efter en dubblettfil',
 'fileduplicatesearch-filename' => 'Filnamn:',
 'fileduplicatesearch-submit'   => 'Sök',
@@ -2817,4 +3083,13 @@ Skriv filnamnet utan prefixet "{{ns:image}}:" .',
 'blankpage'              => 'Tom sida',
 'intentionallyblankpage' => 'Denna sida har avsiktligen lämnats tom.',
 
+# External image whitelist
+'external_image_whitelist' => '  #Lämna den här raden precis som den är<pre>
+#Skriv fragment av reguljära uttryck (bara delen som ska vara mellan //) här nedan
+#Dessa kommer att jämföras med URL:er för externa (hotlinkade) bilder
+#De som matchar kommer att visas som bilder, annars visas bara en länk till bilden
+#Rader som börjar med # behandlas som kommentarer
+
+#Skriv alla fragment av reguljära uttryck ovanför den här raden. Lämna den här raden precis som den är</pre>',
+
 );
diff --git a/languages/messages/MessagesSw.php b/languages/messages/MessagesSw.php
index 0ee942b9..415d1005 100644
--- a/languages/messages/MessagesSw.php
+++ b/languages/messages/MessagesSw.php
@@ -12,6 +12,101 @@
  * @author לערי ריינה�רט
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Faili',
+	NS_SPECIAL          => 'Maalum',
+	NS_TALK             => 'Majadiliano',
+	NS_USER             => 'Mtumiaji',
+	NS_USER_TALK        => 'Majadiliano_ya_mtumiaji',
+	NS_PROJECT_TALK     => '$1_majadiliano',
+	NS_FILE             => 'Picha',
+	NS_FILE_TALK        => 'Majadiliano_faili',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_majadiliano',
+	NS_TEMPLATE         => 'Kigezo',
+	NS_TEMPLATE_TALK    => 'Kigezo_majadiliano',
+	NS_HELP             => 'Msaada',
+	NS_HELP_TALK        => 'Msaada_majadiliano',
+	NS_CATEGORY         => 'Jamii',
+	NS_CATEGORY_TALK    => 'Jamii_majadiliano',
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'ElekezoMbili' ),
+	'BrokenRedirects'           => array( 'ElekezoIliovunjika' ),
+	'Disambiguations'           => array( 'Maana' ),
+	'Userlogin'                 => array( 'IngiaMtumiaji' ),
+	'Userlogout'                => array( 'TokaMtumiaji' ),
+	'CreateAccount'             => array( 'SajiliAkaunti' ),
+	'Preferences'               => array( 'Mapendekezo' ),
+	'Watchlist'                 => array( 'Maangalizi' ),
+	'Recentchanges'             => array( 'MabadalikoyaKaribuni' ),
+	'Upload'                    => array( 'Pakia' ),
+	'Listfiles'                 => array( 'OrodhayaFali', 'OrodhayaPicha' ),
+	'Newimages'                 => array( 'FailiMpya', 'FailimpyazaPicha' ),
+	'Listusers'                 => array( 'OrodhayaWatumiaji', 'OrodhayaMtumiaji' ),
+	'Listgrouprights'           => array( 'OrodhayaWasimamizi' ),
+	'Statistics'                => array( 'Takwimu' ),
+	'Randompage'                => array( 'UkurasawaBahati' ),
+	'Lonelypages'               => array( 'KurasaPweke' ),
+	'Uncategorizedpages'        => array( 'KurasaZisizonajamii' ),
+	'Uncategorizedcategories'   => array( 'JamiiZisizopangwa' ),
+	'Uncategorizedimages'       => array( 'FailiZisizonajamii' ),
+	'Uncategorizedtemplates'    => array( 'VigezoVisivyonajamii' ),
+	'Unusedcategories'          => array( 'JamiiZisizotumika' ),
+	'Unusedimages'              => array( 'FailiZisizotumika', 'PichaZisizotumika' ),
+	'Wantedpages'               => array( 'KurasaZinazotakikana', 'ViungoVilivyovunjika' ),
+	'Wantedcategories'          => array( 'JamiiZinazotakikana' ),
+	'Wantedfiles'               => array( 'FailiZinazotakikana' ),
+	'Wantedtemplates'           => array( 'VigezoVinavyotakikana' ),
+	'Mostlinked'                => array( 'KurasaZilizoungwasana' ),
+	'Mostlinkedcategories'      => array( 'JamiiZilizoungwasana' ),
+	'Mostlinkedtemplates'       => array( 'VigezoVilivyoungwasana' ),
+	'Mostimages'                => array( 'FailiZilizoungwasana', 'PichaZilizoungwasana' ),
+	'Mostcategories'            => array( 'JamiiZaidi' ),
+	'Mostrevisions'             => array( 'MarejeoZaidi' ),
+	'Fewestrevisions'           => array( 'MarejeoMadogo' ),
+	'Shortpages'                => array( 'KurasaFupi' ),
+	'Longpages'                 => array( 'KurasaNdefu' ),
+	'Newpages'                  => array( 'KurasaMpya' ),
+	'Ancientpages'              => array( 'KurasazaZamani' ),
+	'Deadendpages'              => array( 'KurasaZilizoondoshwa' ),
+	'Protectedpages'            => array( 'KurasaZilizolindwa' ),
+	'Protectedtitles'           => array( 'JinaLililolindwa' ),
+	'Allpages'                  => array( 'KurasaZote' ),
+	'Prefixindex'               => array( 'KurasaKuu' ),
+	'Ipblocklist'               => array( 'OrodhayaIPZilizozuiliwa' ),
+	'Specialpages'              => array( 'KurasaMaalum' ),
+	'Contributions'             => array( 'Michango' ),
+	'Emailuser'                 => array( 'BaruapepeyaMtumiaji' ),
+	'Confirmemail'              => array( 'ThibitishaBaruapepe' ),
+	'Whatlinkshere'             => array( 'VingoViungavyoUkurasahuu' ),
+	'Movepage'                  => array( 'HamishaKurasa' ),
+	'Blockme'                   => array( 'Nizuiye' ),
+	'Booksources'               => array( 'ZuiaChanzo' ),
+	'Categories'                => array( 'Jamii' ),
+	'Export'                    => array( 'Toa' ),
+	'Version'                   => array( 'Toleo' ),
+	'Allmessages'               => array( 'UjumbeZote' ),
+	'Log'                       => array( 'Kumbukumbu' ),
+	'Blockip'                   => array( 'Zui', 'ZuiaIP', 'ZuiaMtumiaji' ),
+	'Undelete'                  => array( 'Usifute' ),
+	'Import'                    => array( 'Ingiza' ),
+	'Lockdb'                    => array( 'FungaDB' ),
+	'Unlockdb'                  => array( 'FunguaDB' ),
+	'Userrights'                => array( 'HakizaMtumiaji' ),
+	'MIMEsearch'                => array( 'TafutaMIME' ),
+	'Mypage'                    => array( 'KurasaYangu' ),
+	'Mytalk'                    => array( 'MajadilianoYangu' ),
+	'Mycontributions'           => array( 'MichangoYangu' ),
+	'Listadmins'                => array( 'OrodhayaWakabidhi' ),
+	'Listbots'                  => array( 'OrodhayaVikaragosi' ),
+	'Popularpages'              => array( 'KurasaMaarufu' ),
+	'Search'                    => array( 'Tafuta' ),
+	'Blankpage'                 => array( 'KurasaTupu' ),
+	'LinkSearch'                => array( 'TafutaKiungo' ),
+	'DeletedContributions'      => array( 'MichangoIliyofutwa' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Wekea mstari viungo:',
@@ -21,20 +116,20 @@ $messages = array(
 'tog-extendwatchlist'         => 'Tanua orodha ya maangalizi ili kuonyesha mabadiliko yote yaliyofanyika',
 'tog-usenewrc'                => 'Mabadiliko yaliyoongezeka hivi karibuni (JavaScript)',
 'tog-numberheadings'          => 'Vichwa vya habari vijipange namba-vyenyewe',
-'tog-showtoolbar'             => 'Onyesha ufito wa vifaa vya kuhariria (JavaScript)',
+'tog-showtoolbar'             => 'Onyesha mwambaa wa zana za kuhariria (JavaScript)',
 'tog-editondblclick'          => 'Hariri ukurasa kwa kubonyeza mara mbili',
 'tog-editsection'             => 'Wezesha sehemu ya kuandikia kwa kutumia viungo vya [hariri]',
 'tog-editsectiononrightclick' => 'Wezesha sehemu ya kuandikia kwa kubonyeza kitufe cha kulia cha puku yako juu ya sehemu ya majina husika (JavaScript)',
 'tog-showtoc'                 => 'Onyesha mistari ya yaliyomo (kwa kila kurasa iliyo na zaidi ya vichwa vya habari 3)',
 'tog-rememberpassword'        => 'Kumbuka kuingia kwangu katika kompyuta hii',
-'tog-editwidth'               => 'Hariri sanduku lenye upana mzima',
+'tog-editwidth'               => 'Sanduku la kuhariri liwe na upana mzima',
 'tog-watchcreations'          => 'Weka kurasa nilizoumba katika maangalizi yangu',
 'tog-watchdefault'            => 'Weka kurasa zote nilizohariri katika maangalizi yangu',
 'tog-watchmoves'              => 'Weka kurasa zote nilizohamisha katika maangalizi yangu',
 'tog-watchdeletion'           => 'Weka kurasa zote nilizofuta katika maangalizi yangu',
 'tog-minordefault'            => 'Weka alama zote za mabadiliko madogo kama matumizi mbadala',
 'tog-previewontop'            => 'Onyesha mandhari kabla ya sanduku la kuhariria',
-'tog-previewonfirst'          => 'Onyesha mandhari mwanzoni mwa sanduku la kuhariria',
+'tog-previewonfirst'          => 'Onyesha mandhari unapoanza kuhariri',
 'tog-nocache'                 => 'Lemaza mabaki ya kurasa',
 'tog-enotifwatchlistpages'    => 'Nitumie barua pepe pale kurasa zilizopo katika maangalizi yangu zikibadilishwa',
 'tog-enotifusertalkpages'     => 'Nitumie barua pepe pale ukurasa wangu wa majadiliano ukiwa na mabadiliko',
@@ -44,7 +139,24 @@ $messages = array(
 'tog-fancysig'                => 'Sahihi changa (bila kujiweka kiungo yenyewe)',
 'tog-externaleditor'          => 'Tumia kiharirio cha nje inaposhindikana (kwa wataalamu tu, inahitaji marekebisho maalum kwenye kompyuta yako',
 'tog-externaldiff'            => 'Tumia diff za nje inaposhindikana (kwa wataalamu tu, inahitaji marekebisho maalum kwenye kompyuta yako)',
+'tog-showjumplinks'           => 'Wezesha "ruka hadi" viungo vya mafikio',
+'tog-uselivepreview'          => 'Tumia kihakikio cha papohapo (JavaScript) (Experimental)',
+'tog-forceeditsummary'        => 'Nishtue pale ninapoingiza muhtasari mtupu wa kuhariri',
+'tog-watchlisthideown'        => 'Ficha kuhariri kwangu kwenye orodha ya maangalizi',
+'tog-watchlisthidebots'       => 'Ficha uhariri wa vikaragosi kwenye orodha ya maangalizi',
+'tog-watchlisthideminor'      => 'Ficha mabadliko madogo kwenye maangalizi',
+'tog-watchlisthideliu'        => 'Ficha mabadiliko yaliyofanywa na watumiaji kwenye maangalilizi',
+'tog-watchlisthideanons'      => 'Ficha mabadiliko yaliyofanywa na watumiaji wasiojisajili kwenye maangalilizi',
+'tog-nolangconversion'        => 'Lemaza mabadiliko kadhaa',
 'tog-ccmeonemails'            => 'Nitumie nakala ya barua pepe nitakazo tuma kwa watumiaji wengine',
+'tog-diffonly'                => 'Usionyeshe yaliyomo kwenye ukurasa chini ya faili za diff',
+'tog-showhiddencats'          => 'Onyesha jamii zilizofichwa',
+'tog-noconvertlink'           => 'Lemaza kiungo cha jina la badiliko',
+'tog-norollbackdiff'          => 'Ondoa faili za diff baada ya kufanyakazi ya kurejesha',
+
+'underline-always'  => 'Muda wote',
+'underline-never'   => 'Kamwe',
+'underline-default' => 'Kivinjari mbadala',
 
 # Dates
 'sunday'        => 'Jumapili',
@@ -99,11 +211,20 @@ $messages = array(
 'dec'           => 'Des',
 
 # Categories related messages
-'category_header'        => 'Makala katika jamii "$1"',
-'subcategories'          => 'Vijamii',
-'category-media-header'  => 'Picha, video, na sauti katika jamii  "$1"',
-'category-empty'         => "''Jamii hii haina ukurasa, picha, video, wala sauti yoyote.''",
-'listingcontinuesabbrev' => 'endelea',
+'pagecategories'                 => '{{PLURAL:$1|Jamii|Jamii}}',
+'category_header'                => 'Makala katika jamii "$1"',
+'subcategories'                  => 'Vijamii',
+'category-media-header'          => 'Picha, video, na sauti katika jamii  "$1"',
+'category-empty'                 => "''Jamii hii haina ukurasa, picha, video, wala sauti yoyote.''",
+'hidden-categories'              => '{{PLURAL:$1|Jamii zilizofichwa|Jamii zilizofichwa}}',
+'hidden-category-category'       => 'Jamii zilizofichwa', # Name of the category where hidden categories will be listed
+'category-subcat-count'          => '{{PLURAL:$2|Jamii hii ina kijamii hiki tu.|Jamii hii ina kijamii kifuatacho {{PLURAL:$1|kijamii|$1 vijamii}}, nje ya $2 jumla.}}',
+'category-subcat-count-limited'  => 'Jamii hii ina {{PLURAL:$1|kijamii|$1 vijamii}} vifuatavyo.',
+'category-article-count'         => '{{PLURAL:$2|Jamii hii ina makala zifuatazo tu.|Kurasa zifuatazo {{PLURAL:$1|ni|$1 kurasa za}} katika jamii hii, nje ya $2 jumla.}}',
+'category-article-count-limited' => 'Kurasa zifuatazo {{PLURAL:$1|ni|$1 kurasa za}} katika jamii hii.',
+'category-file-count'            => '{{PLURAL:$2|Jamii hii ina faili zifuatazo tu.|Faili zifuatazo {{PLURAL:$1|ni|$1faili za}} katika jamii hii, nje ya $2 jumla.}}',
+'category-file-count-limited'    => 'Faili zifuatazo {{PLURAL:$1|file is|$1 ni faili za}} katika jamii hii.',
+'listingcontinuesabbrev'         => 'endelea',
 
 'about'          => 'Kuhusu',
 'article'        => 'Makala',
@@ -111,9 +232,12 @@ $messages = array(
 'cancel'         => 'Batilisha',
 'qbfind'         => 'Gundua',
 'qbedit'         => 'Hariri',
+'qbpageoptions'  => 'Ukarasa huu',
 'qbspecialpages' => 'Kurasa za pekee',
+'mypage'         => 'Ukurasa wangu',
 'mytalk'         => 'Majadiliano yangu',
 'navigation'     => 'Safari',
+'and'            => '&#32;na',
 
 'errorpagetitle'    => 'Hitilafu',
 'returnto'          => 'Rudia $1.',
@@ -125,27 +249,34 @@ $messages = array(
 'searcharticle'     => 'Nenda',
 'history'           => 'Historia ya ukurasa',
 'history_short'     => 'Historia',
-'printableversion'  => 'Ukarasa kwa kuchapa',
+'printableversion'  => 'Ukurasa wa kuchapika',
 'permalink'         => 'Kiungo cha daima',
 'edit'              => 'Hariri',
 'create'            => 'Anzisha kurasa',
 'editthispage'      => 'Hariri ukurasa huu',
+'create-this-page'  => 'Anzisha ukurasa huu',
 'delete'            => 'Futa',
 'deletethispage'    => 'Futa ukurasa huo',
 'protect'           => 'Linda',
+'protect_change'    => 'badilisha',
 'protectthispage'   => 'Linda ukurasa huu',
 'unprotect'         => 'Usilinde',
-'unprotectthispage' => 'Usilinde ukurasa huu',
+'unprotectthispage' => 'Ondoa tunzo la ukarasa',
 'newpage'           => 'Ukurasa mpya',
 'talkpage'          => 'Jadilia ukarasa huu',
 'talkpagelinktext'  => 'Majadiliano',
 'specialpage'       => 'Ukarasa maalumu',
 'personaltools'     => 'Vifaa binafsi',
-'postcomment'       => 'Weka maelezo',
+'postcomment'       => 'Fungu jipya',
 'talk'              => 'Majadiliano',
 'views'             => 'Mitazamo',
 'toolbox'           => 'Vifaa',
 'userpage'          => 'Ukurasa wa mtumiaji',
+'imagepage'         => 'Tazama ukurasa wa faili',
+'mediawikipage'     => 'Tazama ukurasa wa ujumbe',
+'viewhelppage'      => 'Tazama ukurasa wa msaada',
+'categorypage'      => 'Tazama ukurasa wa jamii',
+'viewtalkpage'      => 'Tazama majadiliano',
 'otherlanguages'    => 'Lugha nyingine',
 'redirectedfrom'    => '(Elekezwa kutoka $1)',
 'redirectpagesub'   => 'Elekeza ukurasa',
@@ -158,8 +289,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Kuhusu {{SITENAME}}',
 'aboutpage'            => 'Project:Kuhusu',
-'bugreports'           => 'Simulia tatizo',
-'bugreportspage'       => 'Project:Taarifa za hitilafu',
 'copyright'            => 'Yaliyomo yafuata $1.',
 'copyrightpage'        => '{{ns:project}}:Hatimiliki',
 'currentevents'        => 'Matukio ya hivi karibuni',
@@ -177,14 +306,17 @@ $messages = array(
 'privacy'              => 'Sera ya faragha',
 'privacypage'          => 'Project:Sera ya faragha',
 
-'badaccess' => 'Kuna hitilafu ya ruhusa',
+'badaccess'        => 'Kuna hitilafu ya ruhusa',
+'badaccess-groups' => 'Ombi uliloomba limefikia ukingoni mwa watumiaji wa {{PLURAL:$2|the group|one of the groups}}: $1.',
 
+'ok'                  => 'Sawa',
 'retrievedfrom'       => 'Rudishwa kutoka "$1"',
 'youhavenewmessages'  => 'Una $1 ($2).',
 'newmessageslink'     => 'ujumbe mpya',
 'newmessagesdifflink' => 'badiliko la mwisho',
 'editsection'         => 'hariri',
 'editold'             => 'hariri',
+'viewsourceold'       => 'view source',
 'editsectionhint'     => 'Hariri kipande: $1',
 'toc'                 => 'Yaliyomo',
 'showtoc'             => 'fichua',
@@ -197,6 +329,7 @@ $messages = array(
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'     => 'Makala',
 'nstab-user'     => 'Ukurasa wa mtumiaji',
+'nstab-special'  => 'Ukurasa maalum',
 'nstab-project'  => 'Ukurasa wa mradi',
 'nstab-image'    => 'Faili',
 'nstab-template' => 'Kigezo',
@@ -214,7 +347,7 @@ $messages = array(
 'protectedinterface' => 'Ukurasa huu unatoa maelezo ya msingi ya bidhaa pepe, na pia umefungwa ili kuzuiya uharibifu.',
 'editinginterface'   => "'''Ilani:''' Una hariri ukurasa unaotumika kutoa maelezo ya msingi ya bidhaa pepe.
 Mabadiliko katika ukurasa huu yataathiri mwonekano mzima wa viungo vya watumiaji wengine.
-Kwa lengo la kutaka kutafsiri, tafadhali fikiria kutumia  [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], kwa kuweka miradi ya MediaWiki kwa kienyeji.",
+Kwa lengo la kutaka kutafsiri, tafadhali fikiria kutumia  [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], kwa kuweka miradi ya MediaWiki kwa kienyeji.",
 'sqlhidden'          => '(maulizo ya SQL yamefichwa)',
 
 # Login and logout pages
@@ -228,7 +361,6 @@ Usisahau kubadilisha mapendekezo yako ya [[Special:Preferences|{{SITENAME}}]].',
 'remembermypassword'        => 'Nikumbuke katika tarakilishi hii',
 'yourdomainname'            => 'Tovuti yako:',
 'externaldberror'           => 'Huenda kulikuwa na hitilafu ya database au labda hauruhusiwi kubadilisha akaunti yako ya nje.',
-'loginproblem'              => '<b>Tatizo limetokea wakati ulipojaribu kuingia.</b><br />Jaribu tena!',
 'login'                     => 'Ingia',
 'nav-login-createaccount'   => 'Ingia/ sajili akaunti',
 'loginprompt'               => 'Lazima kompyuta yako ipokee kuki ili uweze kuingia kwenye {{SITENAME}}.',
@@ -236,7 +368,7 @@ Usisahau kubadilisha mapendekezo yako ya [[Special:Preferences|{{SITENAME}}]].',
 'logout'                    => 'Toka',
 'userlogout'                => 'Toka',
 'notloggedin'               => 'Hujajiandikisha',
-'nologin'                   => 'Huna akaunti ya kuingilia? $1',
+'nologin'                   => 'Huna akaunti ya kuingilia? $1.',
 'nologinlink'               => 'Sajili akaunti',
 'createaccount'             => 'Sajili akaunti',
 'gotaccount'                => 'Unayo akaunti tayari? $1',
@@ -256,7 +388,7 @@ Tafadhali chagua jina lingine.',
 'badsig'                    => 'Umeweka sahihi batili.
 Angalia mabano ya HTML.',
 'badsiglength'              => 'Sahihi uliyoweka ni ndefu mno.
-Inatakiwa iwe chini ya $1 {{PLURAL:$1|character|tarakimu}}.',
+Haiwezi kuzidi {{PLURAL:$1|tarakimu|tarakimu}} $1.',
 'email'                     => 'Barua pepe',
 'prefs-help-realname'       => 'Jina la kweli si lazima. Ukichagua kutaja jina lako hapa, litatumiwa kuonyesha kwamba ndiyo ulifanya kazi unayochangia.',
 'loginerror'                => 'Kosa la kuingia',
@@ -275,8 +407,8 @@ Tafadhali, ondoa kizuizi hicho, baadaye jaribu tena.',
 'nouserspecified'           => 'Lazima uandike jina la mtumiaji.',
 'wrongpassword'             => 'Umeingiza nywila ya makosa. Jaribu tena.',
 'wrongpasswordempty'        => 'Nywila ilikuwa tupu. Jaribu tena.',
-'passwordtooshort'          => 'Nywila yako haifai.  Ni lazima iwe na herufi $1 au zaidi, na inabidi nywila na jina la mtumiaji ziwe tofauti.',
-'mailmypassword'            => 'Nitume nywila kwa barua pepe',
+'passwordtooshort'          => 'Nywila yako haifai.  Ni lazima iwe na {{PLURAL:#1|herufi}} $1 au zaidi, na inabidi nywila na jina la mtumiaji ziwe tofauti.',
+'mailmypassword'            => 'Nitume nywila mpya kwa barua pepe',
 'passwordremindertitle'     => 'Nywila mpya ya muda kwa {{SITENAME}}',
 'passwordremindertext'      => 'Mtu mmoja (yamkini wewe, kutoka anwani ya IP $1)
 ambaye ameulizia nywila mpya kwa {{SITENAME}} ($4).
@@ -295,6 +427,17 @@ Kabla ya kutuma barua pepe nyingine kwenye akaunti hiyo, itabidi ufuate maelezo
 kuthibitisha kwamba wewe ndiyo ni mwenye akaunti.',
 'throttled-mailpassword'    => 'Kikumbusho cha nywila tayari kimeshatumwa, ndani ya {{PLURAL:$1|hour|$1masaa}} kadhaa yaliyopita.
 Ili kuzuiya uhuni, kiumbusho cha nywila kimoja pekee utakachotumiwa kwa {{PLURAL:$1|hour|$1 masaa}} kadhaa.',
+'createaccount-text'        => 'Kuna mtu amesajili akaunti kwa kutumia anwani ya barua pepe yako kwenye  {{SITENAME}} ($4) anaitwa "$2", yenye nywila "$3".
+Inabidi uingie na kisha ubadilishe nywila yako sasa.
+
+Unaweza kupuuza ujumbe huu, endapo akaunti hii ilianzishwa kimakosa.',
+'login-throttled'           => 'Umefanya majaribio kadha wa kadha ya kutaka kuingiza nywila ya akaunti hii. Tafadhali subiri kwanza kabla ya kujaribu tena.',
+'loginlanguagelabel'        => 'Lugha: $1',
+
+# Password reset dialog
+'oldpassword' => 'Neno la siri la zamani',
+'newpassword' => 'Neno mpya la siri',
+'retypenew'   => 'Andika nywila tena:',
 
 # Edit page toolbar
 'bold_sample'     => 'Matini ya koze',
@@ -311,14 +454,14 @@ Ili kuzuiya uhuni, kiumbusho cha nywila kimoja pekee utakachotumiwa kwa {{PLURAL
 'math_tip'        => 'Formula ya kihesabu (LaTeX)',
 'nowiki_sample'   => 'Weka matini bila fomati hapa',
 'nowiki_tip'      => 'Puuza fomati ya Wiki',
-'image_tip'       => 'Picha iliyotiwa',
-'media_tip'       => 'Kiungo cha faili ya picha, video, au sauti',
+'image_tip'       => 'Faili lililotiwa',
+'media_tip'       => 'Kiungo cha faili la picha, video, au sauti',
 'sig_tip'         => 'Sahihi yako na saa ya kusahihisha',
 'hr_tip'          => 'Mstari wa mlalo (usitumie ovyo)',
 
 # Edit pages
-'summary'                => 'Muhtasari',
-'subject'                => 'Kuhusu/kichwa cha habari',
+'summary'                => 'Muhtasari:',
+'subject'                => 'Kuhusu/kichwa cha habari:',
 'minoredit'              => 'Haya ni mabadiliko madogo',
 'watchthis'              => 'Fuatilia ukurasa huu',
 'savearticle'            => 'Hifadhi ukurasa',
@@ -326,18 +469,19 @@ Ili kuzuiya uhuni, kiumbusho cha nywila kimoja pekee utakachotumiwa kwa {{PLURAL
 'showpreview'            => 'Onyesha hakikisho la mabadiliko',
 'showdiff'               => 'Onyesha mabadiliko',
 'anoneditwarning'        => "'''Ilani:''' Wewe hujaingia rasmi kwenye tovuti. Anwani ya IP ya tarakilishi yako itahifadhiwa katika historia ya uhariri wa ukurasa huu.",
-'summary-preview'        => 'Hakikisho la muhtasari',
+'summary-preview'        => 'Hakikisho la muhtasari:',
 'blockedtext'            => "<big>'''Jina lako la mtumiaji au anwani yako ya IP imezuiwa.'''</big>
 
-Umezuiwa na $1. Sababu alitambua ni ''$2''
+Umezuiwa na $1. 
+Sababu aliyetambua ni ''$2''
 
 * Mwanzo wa uzuio: $8
 * Mwisho wa uzuio: $6
 * Aliyezuiwa: $7
 
 Unaweza kuwasiliana na $1 au [[{{MediaWiki:Grouppage-sysop}}|mkabidhi]] kuzungumza uzuio.
-Huwezi kutumia kipengele 'kumtuma mtumiaji barua pepe' ila anwani halisi ya barua pepe inapatikana katika
-[[Special:Preferences|mapendekezo ya akaunti]] yako na hujazuiwa kuitumia.
+Huwezi kutumia kipengele 'kumtuma mtumiaji barua pepe' isipopatikana anwani halisi ya barua pepe katika
+[[Special:Preferences|mapendekezo ya akaunti]] yako, na usipozuiwa kuitumia.
 Anwani yako ya IP ni $3, na namba ya uzuio ni #$5. Tafadhali taja namba hizi ukitaka kuwasiliana kuhusu uzuio huu.",
 'loginreqtitle'          => 'Unatakiwa kuingia au kujisajili',
 'accmailtitle'           => 'Neno la siri limeshakutumia.',
@@ -345,18 +489,18 @@ Anwani yako ya IP ni $3, na namba ya uzuio ni #$5. Tafadhali taja namba hizi uki
 'newarticle'             => '(Mpya)',
 'newarticletext'         => "Ukurasa unaotaka haujaandikwa bado. Ukipenda unaweza kuuandika wewe mwenyewe kwa kutumia sanduku la hapa chini (tazama [[{{MediaWiki:Helppage}}|Mwongozo]] kwa maelezo zaidi). Ukifika hapa kwa makosa, bofya kibonyezi '''back''' (nyuma) cha programu yako.",
 'noarticletext'          => 'Ukurasa huu haujaandikwa bado. [[Special:Search/{{PAGENAME}}|tafutia jina hili]] katika kurasa nyingine au [{{fullurl:{{FULLPAGENAME}}|action=edit}} hariri ukurasa huu].',
-'previewnote'            => '<strong>Hii ni hakikisho tu; mabadiliko hayajahifadhiwa bado!</strong>',
+'previewnote'            => "'''Hii ni hakikisho tu; mabadiliko hayajahifadhiwa bado!'''",
 'editing'                => 'Kuhariri $1',
 'editingsection'         => 'Unahariri $1 (kipande)',
 'yourtext'               => 'Maandishi yako',
-'editingold'             => '<strong>ANGALIA: Unakuwa unahariri nakala ya zamani ya ukurasa huu.
-Ukiendelea kuihariri, mabadilisho yote yaliyofanywa tangu pale yatapotezwa.</strong>',
-'copyrightwarning'       => 'Tafadhali zingatia kwamba makala yote ya {{SITENAME}} unayoyaandika yanafuata $2 (tazama $1 kwa maelezo zaidi).
+'editingold'             => "'''ANGALIA: Unakuwa unahariri nakala ya zamani ya ukurasa huu.
+Ukiendelea kuihariri, mabadilisho yote yaliyofanywa tangu pale yatapotezwa.'''",
+'copyrightwarning'       => "Tafadhali zingatia kwamba makala yote ya {{SITENAME}} unayoyaandika yanafuata $2 (tazama $1 kwa maelezo zaidi).
 Usipotaka maandishi yako yaweze kuharirishwa bure na kutolewa wakati wowote, basi usiyaandike hapa.<br />
-Unakuwa unaahidi kwamba maandishi unayoyaingia ni yako tu, au uliyapata kutoka bure au ni mali ya watu wote. <strong>USITOLEE MAKALA YALIYOHIFADHIWA HAKI ZAO ZA KUTUMIWA BILA KUPATA RUHUSA HALALI!</strong>',
-'longpagewarning'        => '<strong>ILANI: Urefu wa ukurasa huu ni kilobaiti $1; vivinjari kadhaa vinaweza kuwa na matatizo ukihariri ukurasa wenye urefu zaidi ya kb 32 hivi.
-Tafadhali fikiria kuhusu kuvunja ukurasa kwa vipande vifupi.</strong>',
-'protectedpagewarning'   => '<strong>ANGALIA: Ukurasa huu unakingwa kwa hiyo watumiaji wenye haki za wasimamizi tu wanaweza kuuhariri. Hakikisha kwamba unakuwa unafuata mwongozo wa kuhariri kurasa zinazokingwa.<strong>',
+Unakuwa unaahidi kwamba maandishi unayoyaingia ni yako tu, au uliyapata kutoka bure au ni mali ya watu wote. '''USITOLEE MAKALA YALIYOHIFADHIWA HAKI ZAO ZA KUTUMIWA BILA KUPATA RUHUSA HALALI!'''",
+'longpagewarning'        => "'''ILANI: Urefu wa ukurasa huu ni kilobaiti $1; vivinjari kadhaa vinaweza kuwa na matatizo ukihariri ukurasa wenye urefu zaidi ya kb 32 hivi.
+Tafadhali fikiria kuhusu kuvunja ukurasa kwa vipande vifupi.'''",
+'protectedpagewarning'   => "'''ANGALIA: Ukurasa huu unakingwa kwa hiyo watumiaji wenye haki za wasimamizi tu wanaweza kuuhariri. Hakikisha kwamba unakuwa unafuata mwongozo wa kuhariri kurasa zinazokingwa.'''",
 'templatesused'          => 'Vigezo vinavyotumiwa kwenye ukurasa huu:',
 'templatesusedpreview'   => 'Vigezo vinavyotumiwa katika mandhari haya:',
 'template-protected'     => '(kulindwa)',
@@ -369,25 +513,29 @@ Fikiria kama inafaa kuendelea kuhariri ukurasa huu.
 Kumbukumbu ya kufuta ukurasa huu linapatikana hapa kukusaidia:",
 
 # History pages
-'viewpagelogs'        => 'Tazama kumbukumbu kwa ukurasa huu',
-'currentrev'          => 'Kiungo cha daima',
-'revisionasof'        => 'Sahihisho kutoka $1',
-'revision-info'       => 'Sahihisho kutoka $1 na $2',
-'previousrevision'    => '�Sahihisho lililotangulia',
-'nextrevision'        => 'Sahihisho mpya zaidi?',
-'currentrevisionlink' => 'Sahahisho ya sasa hivi',
-'cur'                 => 'sasa',
-'last'                => 'kabla',
-'page_first'          => 'ya kwanza',
-'page_last'           => 'ya mwisho',
-'histlegend'          => 'Chagua tofauti: tia alama katika vitufe redio kulinganisha matoleo, na bonyeza "enter" au kitufe hapo chini.<br />
+'viewpagelogs'           => 'Tazama kumbukumbu kwa ukurasa huu',
+'currentrev'             => 'Kiungo cha daima',
+'revisionasof'           => 'Sahihisho kutoka $1',
+'revision-info'          => 'Sahihisho kutoka $1 na $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Sahihisho lililotangulia',
+'nextrevision'           => 'Sahihisho mpya zaidi?',
+'currentrevisionlink'    => 'Sahahisho ya sasa hivi',
+'cur'                    => 'sasa',
+'last'                   => 'kabla',
+'page_first'             => 'ya kwanza',
+'page_last'              => 'ya mwisho',
+'histlegend'             => 'Chagua tofauti: tia alama katika vitufe redio kulinganisha matoleo, na bonyeza "enter" au kitufe hapo chini.<br />
 Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotangulia, D = mabadiliko maDogo.',
-'histfirst'           => 'Mwanzoni',
-'histlast'            => 'Mwishoni',
+'history-fieldset-title' => 'Fungua historia',
+'histfirst'              => 'Mwanzoni',
+'histlast'               => 'Mwishoni',
 
 # Revision feed
 'history-feed-item-nocomment' => '$1 kwenye $2', # user at time
 
+# Revision deletion
+'rev-delundel' => 'onyesha/ficha',
+
 # Diffs
 'history-title'           => 'Historia ya masahihisho ya "$1"',
 'difference'              => '(Tofauti baina ya masahihisho)',
@@ -397,20 +545,26 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'diff-multi'              => '(Hatuonyeshi {{PLURAL:$1|sahihisho moja la katikati|masahihisho $1 ya katikati}}.)',
 
 # Search results
-'noexactmatch' => "'''Hakuna ukurasa wenye jina \"\$1\".''' Unaweza [[:\$1|kuanza ukurasa huu]].",
-'prevn'        => '$1 iliyotangulia',
-'nextn'        => '$1 ijayo',
-'viewprevnext' => 'Tazama ($1) ($2) ($3)',
-'powersearch'  => 'Tafuta',
+'noexactmatch'       => "'''Hakuna ukurasa wenye jina \"\$1\".''' Unaweza [[:\$1|kuanza ukurasa huu]].",
+'prevn'              => '$1 iliyotangulia',
+'nextn'              => '$1 ijayo',
+'viewprevnext'       => 'Tazama ($1) ($2) ($3)',
+'searchhelp-url'     => 'Help:Yaliyomo',
+'search-result-size' => '$1 ({{PLURAL:$2|neno 1|maneno $2}})',
+'powersearch'        => 'Tafuta',
 
 # Preferences page
-'preferences'    => 'Mapendekezo',
-'mypreferences'  => 'Mapendekezo yangu',
-'changepassword' => 'Badilisha neno la siri',
-'skin'           => 'Sura',
-'oldpassword'    => 'Neno la siri la zamani',
-'newpassword'    => 'Neno mpya la siri',
-'retypenew'      => 'Andika nywila tena:',
+'preferences'     => 'Mapendekezo',
+'mypreferences'   => 'Mapendekezo yangu',
+'changepassword'  => 'Badilisha neno la siri',
+'skin'            => 'Sura',
+'prefs-watchlist' => 'Maangalizi',
+'saveprefs'       => 'Hifadhi',
+'rows'            => 'Mistari:',
+'columns'         => 'Safu:',
+'timezonelegend'  => 'Ukanda saa',
+'timezoneselect'  => 'Ukanda saa:',
+'files'           => 'Mafaili',
 
 'grouppage-sysop' => '{{ns:project}}:Wakabidhi',
 
@@ -421,7 +575,7 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'nchanges'                       => '{{PLURAL:$1|badiliko|mabadiliko}} $1',
 'recentchanges'                  => 'Mabadiliko ya karibuni',
 'recentchanges-feed-description' => 'Tumia tawanyiko hili kufuatilia mabadiliko yote ya hivi karibuni katika Wiki.',
-'rcnote'                         => "Yanayofuata {{PLURAL:$1|ni badiliko '''1'''|ni mabadiliko '''$1''' ya mwisho}} kutoka katika {{PLURAL:$2|siku iliyopita|siku '''$2''' zilizopita}}, hadi $3.",
+'rcnote'                         => "Yanayofuata ni {{PLURAL:$1|badiliko '''1'''|mabadiliko '''$1''' ya mwisho}} kutoka katika {{PLURAL:$2|siku iliyopita|siku '''$2''' zilizopita}}, hadi $5, $4.",
 'rcnotefrom'                     => "Hapo chini yaonekana mabadiliko tangu '''$2''' (tunaonyesha hadi '''$1''').",
 'rclistfrom'                     => 'Onyesha mabadiliko mapya kuanzia $1',
 'rcshowhideminor'                => '$1 mabadiliko madogo',
@@ -438,6 +592,7 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'minoreditletter'                => 'd',
 'newpageletter'                  => 'P',
 'boteditletter'                  => 'r',
+'newsectionsummary'              => '/* $1 */ mjadala mpya',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Mabadiliko husika',
@@ -455,10 +610,10 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 
 'license' => 'Hatimiliki:',
 
-# Special:ImageList
-'imagelist' => 'Orodha ya mafaili',
+# Special:ListFiles
+'listfiles' => 'Orodha ya mafaili',
 
-# Image description page
+# File description page
 'filehist'                  => 'Historia ya faili',
 'filehist-help'             => 'Bonyeza tarehe/saa kuona faili kama ilivyoonekana wakati huo.',
 'filehist-current'          => 'sasa hivi',
@@ -467,14 +622,19 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'filehist-dimensions'       => 'Vipimo',
 'filehist-filesize'         => 'Ukubwa wa faili',
 'filehist-comment'          => 'Maoni',
-'imagelinks'                => 'Viungo',
-'linkstoimage'              => 'Kurasa hizi zimeunganishwa na faili hili:',
+'imagelinks'                => 'Viungo vya mafaili',
+'linkstoimage'              => '{{PLURAL:$1|Ukurasa huu|Kurasa hizi $1}} zimeunganishwa na faili hili:',
 'nolinkstoimage'            => 'Hakuna kurasa zozote zilizounganishwa na faili hii.',
 'sharedupload'              => 'Faili hii inaweza kushirikiwa na miradi mingine.',
 'noimage'                   => 'Hakuna faili yenye jina hili, $1 kama unayo.',
-'noimage-linktext'          => 'pakia picha',
+'noimage-linktext'          => 'pakia faili',
 'uploadnewversion-linktext' => 'Pakia toleo jipya la faili hii',
 
+# File deletion
+'filedelete-intro-old'   => "You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $3, $2].",
+'filedelete-success-old' => "The version of '''[[Media:$1|$1]]''' as of $3, $2 has been deleted.",
+'filedelete-nofile-old'  => "There is no archived version of '''$1''' with the specified attributes.",
+
 # MIME search
 'mimesearch' => 'Utafutaji wa MIME',
 
@@ -491,9 +651,24 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'randomredirect' => 'Elekezo la bahati',
 
 # Statistics
-'statistics' => 'Takwimu',
-'sitestats'  => 'Takwimu za {{SITENAME}}',
-'userstats'  => 'Takwimu za watumiaji',
+'statistics'                   => 'Takwimu',
+'statistics-header-pages'      => 'Takwimu za kurasa',
+'statistics-header-edits'      => 'Takwimu za kuhariri',
+'statistics-header-views'      => 'Onyesha takwimu',
+'statistics-header-users'      => 'Takwimu za watumiaji',
+'statistics-articles'          => 'Kurasa zilizopo',
+'statistics-pages'             => 'Kurasa',
+'statistics-pages-desc'        => 'Kurasa zote za katika wiki, zikiwemo kurasa za majadiliano, elekezo, n.k.',
+'statistics-files'             => 'Faili zilizopakiwa',
+'statistics-edits'             => 'Kurasa zilizohaririwa tangu {{SITENAME}} ilivyoanzishwa',
+'statistics-edits-average'     => 'Wastani wa uhariri kwa kurasa',
+'statistics-views-total'       => 'Onyesha kwa jumla',
+'statistics-views-peredit'     => 'Onyesha kwa uhariri',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] Urefu',
+'statistics-users'             => '[[Special:ListUsers|Watumiaji]] waliojisajiri',
+'statistics-users-active'      => 'Watumiaji wanaofanya kazi',
+'statistics-users-active-desc' => 'Watumiaji waliofanya kazi katika siku {{PLURAL:$1|siku|$1 zilizopita}}',
+'statistics-mostpopular'       => 'Kurasa zinazotazamwa sana',
 
 'disambiguations' => 'Kurasa za kuainisha maneno',
 
@@ -512,7 +687,7 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'lonelypages'             => 'Kurasa ambazo haziungwi kutoka ukurasa mwingine wowote',
 'uncategorizedpages'      => 'Kurasa ambazo hazijawekwa katika jamii',
 'uncategorizedcategories' => 'Jamii ambazo hazijawekwa katika jamii',
-'uncategorizedimages'     => 'Picha ambazo hazijawekwa katika jamii',
+'uncategorizedimages'     => 'Mafaili ambazo hazijawekwa katika jamii',
 'uncategorizedtemplates'  => 'Vigezo ambavyo havijawekwa katika jamii',
 'unusedcategories'        => 'Jamii ambazo hazitumiwi',
 'unusedimages'            => 'Mafaili ambayo hayatumiwi',
@@ -561,54 +736,56 @@ Ufunguo: (sasa) = tofauti na toleo la sasa, (kabla) = tofauti na toleo lililotan
 'emailuser' => 'Mtumie mtumiaji huyu barua pepe',
 
 # Watchlist
-'watchlist'            => 'Maangalizi yangu',
-'mywatchlist'          => 'Maangalizi yangu',
-'watchlistfor'         => "(kwa '''$1''')",
-'addedwatch'           => 'Imeongezwa kwenye maangalizi yako',
-'addedwatchtext'       => "Ukurasa \"[[:\$1]]\" umewekwa kwenye [[Special:Watchlist|maangalizi]] yako.
+'watchlist'         => 'Maangalizi yangu',
+'mywatchlist'       => 'Maangalizi yangu',
+'watchlistfor'      => "(kwa '''$1''')",
+'addedwatch'        => 'Imeongezwa kwenye maangalizi yako',
+'addedwatchtext'    => "Ukurasa \"[[:\$1]]\" umewekwa kwenye [[Special:Watchlist|maangalizi]] yako.
 Mabadiliko katika ukurasa huo na ukurasa wake wa majadiliano utaonekana hapo,
 na ukurasa utaonyeshwa wenye '''koze''' kwenye [[Special:RecentChanges|orodha ya mabadiliko ya karibuni]]
 ili kukusaidia kutambua.
 
 Ukitaka kufuta ukurasa huo kutoka maangalizi yako baadaye, bonyeza \"Acha kufuatilia\" katika mwamba pembeni.",
-'removedwatch'         => 'Imefutwa kutoka maangalizi yako',
-'removedwatchtext'     => 'Ukurasa "[[:$1]]" umefutwa kutoka maangalizi yako.',
-'watch'                => 'Fuatilia',
-'watchthispage'        => 'Fuatilia ukurasa huu',
-'unwatch'              => 'Acha kufuatilia',
-'watchlist-details'    => 'Unafuatilia {{PLURAL:$1|ukurasa $1|kurasa $1}} bila kuzingatia kurasa za majadiliano',
-'wlshowlast'           => 'Onyesha kutoka masaa $1 siku $2 $3',
-'watchlist-hide-bots'  => 'Ficha masahihisho ya roboti',
-'watchlist-hide-own'   => 'Ficha hariri zangu',
-'watchlist-hide-minor' => 'Ficha mabadiliko madogo',
+'removedwatch'      => 'Imefutwa kutoka maangalizi yako',
+'removedwatchtext'  => 'Ukurasa "[[:$1]]" umefutwa kutoka maangalizi yako.',
+'watch'             => 'Fuatilia',
+'watchthispage'     => 'Fuatilia ukurasa huu',
+'unwatch'           => 'Acha kufuatilia',
+'watchlist-details' => 'Unafuatilia {{PLURAL:$1|ukurasa $1|kurasa $1}} bila kuzingatia kurasa za majadiliano',
+'wlshowlast'        => 'Onyesha kutoka masaa $1 siku $2 $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Unafuatilia...',
 'unwatching' => 'Umeacha kufuatilia...',
 
-# Delete/protect/revert
-'deletepage'                  => 'Futa ukurasa',
-'historywarning'              => 'Ilani: Ukurasa unaotaka kufuta una historia yake:',
-'confirmdeletetext'           => 'Wewe unategemea kufuta ukurasa pamoja na historia yake yote.
+# Delete
+'deletepage'            => 'Futa ukurasa',
+'historywarning'        => 'Ilani: Ukurasa unaotaka kufuta una historia yake:',
+'confirmdeletetext'     => 'Wewe unategemea kufuta ukurasa pamoja na historia yake yote.
 Tafadhali hakikisha kwamba unalenga kufanya hivyo, na kwamba unaelewa matokeo yake, na kwamba unafuata [[{{MediaWiki:Policy-url}}|sera]].',
-'actioncomplete'              => 'Kitendo kimekwisha',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" imefutwa. Ona $2 kwa historia ya kurasa zilizofutwa hivi karibuni.',
-'deletedarticle'              => '"[[$1]]" ilifutwa',
-'dellogpage'                  => 'Kumbukumbu ya ufutaji',
-'deletecomment'               => 'Sababu ya kufuta',
-'deleteotherreason'           => 'Sababu nyingine:',
-'deletereasonotherlist'       => 'Sababu nyingine',
-'rollbacklink'                => 'rejesha',
+'actioncomplete'        => 'Kitendo kimekwisha',
+'deletedtext'           => '"<nowiki>$1</nowiki>" imefutwa. Ona $2 kwa historia ya kurasa zilizofutwa hivi karibuni.',
+'deletedarticle'        => '"[[$1]]" ilifutwa',
+'dellogpage'            => 'Kumbukumbu ya ufutaji',
+'deletecomment'         => 'Sababu ya kufuta',
+'deleteotherreason'     => 'Sababu nyingine:',
+'deletereasonotherlist' => 'Sababu nyingine',
+
+# Rollback
+'rollbacklink' => 'rejesha',
+
+# Protect
 'protectlogpage'              => 'Kumbukumbu ya ulindaji',
+'prot_1movedto2'              => '[[$1]] umesogezwa hapa [[$2]]',
 'protect-legend'              => 'Hakikisha ukingo',
 'protectcomment'              => 'Maoni:',
 'protectexpiry'               => 'Itakwisha:',
 'protect_expiry_invalid'      => 'Muda wa kwisha ni batilifu.',
 'protect_expiry_old'          => 'Muda wa kuishi umepita tayari.',
 'protect-unchain'             => 'Fungua ruhusa za kusogeza',
-'protect-text'                => 'Unaweza kutazama na kubadilisha kiwango cha ulindaji hapa kwa ukurasa <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-access'       => 'Akaunti yako hairuhusiwi kubadilisha viwango vya ulindaji.
-Hivi ni vipimo kwa ukurasa <strong>$1</strong>:',
+'protect-text'                => "Unaweza kutazama na kubadilisha kiwango cha ulindaji hapa kwa ukurasa '''<nowiki>$1</nowiki>'''.",
+'protect-locked-access'       => "Akaunti yako hairuhusiwi kubadilisha viwango vya ulindaji.
+Hivi ni vipimo kwa ukurasa '''$1''':",
 'protect-cascadeon'           => 'Ukurasa huu umelindwa kwa sababu umezingatiwa katika {{PLURAL:$1|ukurasa $1 unaolinda kurasa chini yake|kurasa $1 zinazolinda kurasa chini yake}}. Unaweza kubadilisha kiwango cha ulindaji wa ukurasa huu, lakini hutaathirika ulindaji kutoka kurasa juu yake.',
 'protect-default'             => '(chaguo-msingi)',
 'protect-fallback'            => 'Lazimisha ruhusa "$1"',
@@ -618,6 +795,7 @@ Hivi ni vipimo kwa ukurasa <strong>$1</strong>:',
 'protect-expiring'            => 'itakwisha $1 (UTC)',
 'protect-cascade'             => 'Linda kurasa zinazozingatiwa chini ya ukurasa huu',
 'protect-cantedit'            => 'Huwezi kubadilisha kiwango cha ulindaji wa ukurasa huu, kwa sababu huruhusiwi kuuhariri.',
+'protect-expiry-options'      => 'Masaa 2:2 hours,siku 1:1 day,siku 3:3 days,wiki 1:1 week,wiki 2:2 weeks,mwezi 1:1 month,miezi 3:3 months,miezi 6:6 months,mwaka 1:1 year,milele:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ruhusa:',
 'restriction-level'           => 'Kiwango cha kizuio:',
 
@@ -645,16 +823,15 @@ Hivi ni vipimo kwa ukurasa <strong>$1</strong>:',
 'sp-contributions-submit'      => 'Tafuta',
 
 # What links here
-'whatlinkshere'       => 'Viungo viungacho ukurasa huu',
-'whatlinkshere-title' => 'Kurasa zilizounganishwa na $1',
-'linklistsub'         => '(Orodha ya viungo)',
+'whatlinkshere'       => 'Viungo viungavyo ukurasa huu',
+'whatlinkshere-title' => 'Kurasa zilizounganishwa na "$1"',
 'linkshere'           => "Kurasa zifuatazo zimeunganishwa na '''[[:$1]]''':",
 'nolinkshere'         => "Hakuna kurasa zilizounganishwa na '''[[:$1]]'''.",
 'isredirect'          => 'elekeza ukurasa',
 'istemplate'          => 'jumuisho',
 'whatlinkshere-prev'  => '{{PLURAL:$1|uliotangulia|$1 zilizotangulia}}',
 'whatlinkshere-next'  => '{{PLURAL:$1|ujao|$1 zijazo}}',
-'whatlinkshere-links' => '? viungo',
+'whatlinkshere-links' => '� viungo',
 
 # Block/unblock
 'blockip'       => 'Zuia mtumiaji',
@@ -720,16 +897,16 @@ Chagua jina lengine.',
 'importlogpage' => 'Kumbukumbu ya kuingizwa',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Ukurasa wangu',
-'tooltip-pt-mytalk'               => 'Majadiliano yangu',
+'tooltip-pt-userpage'             => 'Ukurasa wako',
+'tooltip-pt-mytalk'               => 'Majadiliano yako',
 'tooltip-pt-preferences'          => 'Mapendekezo yangu',
 'tooltip-pt-watchlist'            => 'Orodha ya kurasa unazofuatilia kwa mabadiliko',
-'tooltip-pt-mycontris'            => 'Orodha ya michango yangu',
+'tooltip-pt-mycontris'            => 'Orodha ya michango yako',
 'tooltip-pt-login'                => 'Tunakushajisha kuingia, lakini siyo lazima.',
 'tooltip-pt-logout'               => 'Toka',
 'tooltip-ca-talk'                 => 'Mazungumzo kuhusu makala',
 'tooltip-ca-edit'                 => 'Unaweza kuhariri ukurasa huu.  Tafadhali tumia kitufe cha kuhakikisha kabla ya kuhifadhi.',
-'tooltip-ca-addsection'           => 'Weka maoni yako kwenye majadiliano haya.',
+'tooltip-ca-addsection'           => 'Anzisha fungu jipya.',
 'tooltip-ca-viewsource'           => 'Ukurasa huu umelindwa.  Unaweza kutazama chanzo chake.',
 'tooltip-ca-protect'              => 'Linda ukurasa huu',
 'tooltip-ca-delete'               => 'Futa ukurasa huu',
@@ -750,7 +927,7 @@ Chagua jina lengine.',
 'tooltip-t-specialpages'          => 'Orodha ya kurasa maalum zote',
 'tooltip-ca-nstab-user'           => 'Tazama ukurasa wa mtumiaji',
 'tooltip-ca-nstab-project'        => 'Tazama ukurasa wa mradi',
-'tooltip-ca-nstab-image'          => 'Angalia ukurasa wa picha',
+'tooltip-ca-nstab-image'          => 'Angalia ukurasa wa faili',
 'tooltip-ca-nstab-template'       => 'Tazama kigezo',
 'tooltip-ca-nstab-help'           => 'Tazama ukurasa wa msaada',
 'tooltip-ca-nstab-category'       => 'Tazama ukurasa wa jamii',
@@ -764,9 +941,12 @@ Chagua jina lengine.',
 # Attribution
 'siteuser' => '{{SITENAME}} mtumiaji $1',
 
+# Image deletion
+'filedelete-old-unregistered' => 'The specified file revision "$1" is not in the database.',
+
 # Browsing diffs
-'previousdiff' => '�Tofauti kabla',
-'nextdiff'     => 'Tofauti ijayo→',
+'previousdiff' => '� Badilisho lililopita',
+'nextdiff'     => 'Badilisho lijalo →',
 
 # Media information
 'file-info-size'       => '(piseli $1 × $2, saizi ya faili: $3, aina ya MIME: $4)',
@@ -775,18 +955,20 @@ Chagua jina lengine.',
 'show-big-image'       => 'Ukubwa wa awali',
 'show-big-image-thumb' => '<small>Ukubwa wa hakikisho hili: piseli $1 x $2</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Mkusanyiko wa faili jipya',
 
 # Bad image list
 'bad_image_list' => 'Fomati ni hii:
 
-Tunazingatia madondoo katika orodha (mistari inayoanza na *) tu.  Inabidi kiungo cha kwanza katika mstari kiunge na picha mbaya.
-Viungo vinavyofuata katika mstari ule ule vitaelewa kuwa mambo ya pekee, yaani kurasa zinazoruhusiwa kuonyesha picha hiyo.',
+Tunazingatia madondoo katika orodha (mistari inayoanza na *) tu.  
+Inabidi kiungo cha kwanza katika mstari kiunge na faili baya.
+Viungo vinavyofuata katika mstari ule ule vitaelewa kuwa mambo ya pekee, yaani kurasa zinazoruhusiwa kuonyesha faili hilo.',
 
 # Metadata
 'metadata'          => 'Data juu',
-'metadata-help'     => 'Faili hiil lina maarifa mengine, yamkini kutoka kemra au skana iliyotumiwa kulitengeneza au kuliandaa kwa tarakilishi.  Kama faili imebadilishwa kutoka hali yake ya awali, inawezekana kwamba vipengele kadhaa vitakuwa tofauti kuliko hali ya picha sasa.',
+'metadata-help'     => 'Faili hili lina maarifa mengine, yamkini kutoka kemra au skana iliyotumiwa kulitengeneza au kuliandaa kwa tarakilishi.  
+Kama faili limebadilishwa kutoka hali yake ya awali, inawezekana kwamba vipengele kadhaa vitakuwa tofauti kuliko hali ya picha ilivyo sasa.',
 'metadata-expand'   => 'Onyesha maarifa vinaganaga',
 'metadata-collapse' => 'Ficha maarifa vinaganaga',
 'metadata-fields'   => 'Nyuga za data juu za EXIF zinazoorodheshwa katika ujumbe huu
@@ -801,13 +983,34 @@ likifupishwa. Nyuga zingine zitafichwa kama chaguo-msingi.
 
 # External editor support
 'edit-externally'      => 'Tumia programu ya nje kuhariri faili hii',
-'edit-externally-help' => 'Ona [http://www.mediawiki.org/wiki/Manual:External_editors maelezo (kwa Kiingereza)] kwa maarifa mengine.',
+'edit-externally-help' => '(Ona [http://www.mediawiki.org/wiki/Manual:External_editors maelezo (kwa Kiingereza)] kwa maarifa mengine.)',
 
 # 'all' in various places, this might be different for inflected languages
 'watchlistall2' => 'zote',
 'namespacesall' => 'zote',
 'monthsall'     => 'zote',
 
+# E-mail address confirmation
+'confirmemail_needlogin'   => 'Unahitajika $1 kuthibitisha anwani ya barua pepe yako.',
+'confirmemail_success'     => 'Barua pepe yako imethibitishwa.
+Sasa unaweza [[Special:UserLogin|kuingia]] na kuifurahia {{SITENAME}}.',
+'confirmemail_loggedin'    => 'Anwani ya barua pepe yako imethibishwa sasa.',
+'confirmemail_error'       => 'Kuna mambo yameenda kombo hifadhi ukamilisho wako.',
+'confirmemail_subject'     => 'Barua pepe ya uthibitisho ya {{SITENAME}}',
+'confirmemail_body'        => 'Kuna mtu, huenda ikawa wewe, kutoka anwani ya IP $1, amesajili akaunti "$2" na anwani ya barua pepe hii kwenye {{SITENAME}}.
+
+Kuthibitisha ya kwamba akaunti hii inamilikiwa na wewe, unatakiwa kuwezesha njia ya barua pepe kwenye  {{SITENAME}}, fungua kiungo hiki katika kivinjari chako:
+
+$3
+
+na kama *huja* sajili akaunti hii, fuata kiungo hiki ili kubatilisha uthibitisho wa anwani ya barua pepe:
+
+$5
+
+Kodi hizi za uthibitisho zitaishia mnamo $4.',
+'confirmemail_invalidated' => 'Uthibitisho wa barua pepe umebatilishwa.',
+'invalidateemail'          => 'Batilisha barua pepe ya uthibitisho.',
+
 # Watchlist editing tools
 'watchlisttools-view' => 'Tazama mabadiliko yanayohusiana',
 'watchlisttools-edit' => 'Tazama na hariri maangalizi',
diff --git a/languages/messages/MessagesSzl.php b/languages/messages/MessagesSzl.php
index 91a53f3c..99ed5ae6 100644
--- a/languages/messages/MessagesSzl.php
+++ b/languages/messages/MessagesSzl.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author Danny B.
+ * @author Djpalar
  * @author Herr Kriss
  * @author Lajsikonik
  * @author Leinad
@@ -17,145 +18,146 @@ $fallback = 'pl';
 
 $messages = array(
 # User preference toggles
-'tog-underline'               => 'Podkreślyńy linkůw:',
-'tog-highlightbroken'         => 'Uozno� <a href="" class="new">tak</a> linki do zajtůw kere chybjům (abo tyž: douon�any pytajńik<a href="" class="internal">?</a>).',
-'tog-justify'                 => 'Wyrůwnůj tekst we akapitach do uobu strůn',
-'tog-hideminor'               => 'Schowej drobne pomjyńańa we "Pomjyńanych na uostatku"',
-'tog-extendwatchlist'         => 'Rozšyřůno lista artikli, na kere dowoš pozůr',
-'tog-usenewrc'                => 'Rozšyřyńy půmjyńanych na uostatku (JavaScript)',
-'tog-numberheadings'          => 'Automaty�no numeracyjo naguůwkůw',
-'tog-showtoolbar'             => 'Pokož pasek werkcojgůw (JavaScript)',
-'tog-editondblclick'          => 'Přyńdź do sprowjańo po podwůjnym klikńyńću (JavaScript)',
-'tog-editsection'             => 'Možliwość sprowjańo poš�egůlnych tajli zajty',
-'tog-editsectiononrightclick' => 'Klikńyńće prawym kneflym myšy na tytule tajli<br />napo�yno jigo sprowjańy(JavaScript)',
-'tog-showtoc'                 => 'Pokož spis treśći (na zajtach, kere majům wjyncyj jak tři naguůwki)',
-'tog-rememberpassword'        => 'Pamjyntej moje hasuo na tym komputře',
-'tog-editwidth'               => 'Uobšar sprowjańo uo pounyj šyrokośći',
-'tog-watchcreations'          => 'Doćepuj zajty, kere žech naškryflou do zajtůw, na kere dowom pozůr',
-'tog-watchdefault'            => 'Doćepuj zajty, kere žech sprowjou, do zajtůw, na kere dowom pozůr',
-'tog-watchmoves'              => 'Doćepuj zajty, kere žech přećepywou, do zajtůw, na kere dowom pozůr',
-'tog-watchdeletion'           => 'Doćepuj zajty, kere žech wyćepou, do zajtůw, na kere dowom pozůr',
-'tog-minordefault'            => 'Uozna�ej wšyjske moje sprowjyńo domyślńy kej drobne',
-'tog-previewontop'            => 'Pokazůj podglůnd před uobšarym sprowjańo',
-'tog-previewonfirst'          => 'Pokož podglůnd zajty při pjyršym sprowjańu',
-'tog-nocache'                 => 'Wyuůn� pamjyńć podryn�no',
-'tog-enotifwatchlistpages'    => 'Wyślij e-brifa, kej jako zajta s tych, na kere dowom pozůr bydźe zmjyńono',
-'tog-enotifusertalkpages'     => 'Wyślij e-brifa, jeli zajta mojij godki bydźe zmjyńono',
+'tog-underline'               => 'Podkryślyńy linkůw:',
+'tog-highlightbroken'         => 'Uoznocz <a href="" class="new">tak</a> linki do zajtůw kere ńy trefjům (abo: dołůncz pytajńik<a href="" class="internal">?</a>).',
+'tog-justify'                 => 'Wyrůwnowej tekst we akapitach (justowańy)',
+'tog-hideminor'               => 'Schow drobne pomjyńańa we "Pomjyńanych na uostatku"',
+'tog-extendwatchlist'         => 'Poszyrzůno lista artikli, na kere dowom pozůr',
+'tog-usenewrc'                => 'Poszyrzyńy půmjyńanych na uostatku (JavaScript)',
+'tog-numberheadings'          => 'Automatyczno numeracyjo titlůw',
+'tog-showtoolbar'             => 'Pokoż pasek przirzůndůw (JavaScript)',
+'tog-editondblclick'          => 'Przyńdź do sprowjańo po podwůjnym klikńyńću (JavaScript)',
+'tog-editsection'             => 'Kożdo tajla zajty sprowjano uosobno',
+'tog-editsectiononrightclick' => 'Klikńyńće prawym kneflym myszy na titlu tajli<br />napoczyno jigo sprowjańy(JavaScript)',
+'tog-showtoc'                 => 'Pokoż spis treśći (na zajtach, kere majům wjyncyj jak trzi tajle)',
+'tog-rememberpassword'        => 'Pamjyntej můj ausdruk na tym komputrze',
+'tog-editwidth'               => 'Połna szerokość placu sprowjańo',
+'tog-watchcreations'          => 'Dowom pozůr na zajty, kere żech naszkryfloł',
+'tog-watchdefault'            => 'Dowom pozůr na zajty, kere żech sprowjoł',
+'tog-watchmoves'              => 'Dowom pozůr na zajty, kere żech przećepnył',
+'tog-watchdeletion'           => 'Dowom pozůr na zajty, kere żech wyćepnył',
+'tog-minordefault'            => 'Kożde moje sprowjańy je ńywjelge',
+'tog-previewontop'            => 'Pokoż poglůnd przed placym sprowjańo',
+'tog-previewonfirst'          => 'Pokoż poglůnd zajty przi pjyrszym sprowjańu',
+'tog-nocache'                 => 'Wypńij podrynczno pamjyńć',
+'tog-enotifwatchlistpages'    => 'Wyślij e-brifa, kej ftoś zmjyńi zajta, na kero dowom pozůr',
+'tog-enotifusertalkpages'     => 'Wyślij e-brifa, kej zajta mojij godki bydźe zmjyńono',
 'tog-enotifminoredits'        => 'Wyślij e-brifa tyž w takim raźe, kej by chodźiuo uo drobne pomjyńańa',
-'tog-enotifrevealaddr'        => 'Ńy chowej adresa mojygo e-brifa w powjadomjyńach',
-'tog-shownumberswatching'     => 'Pokož wjela užytkownikůw dowo pozůr',
-'tog-fancysig'                => 'Šrajbowańy bez automaty�nego linka',
-'tog-externaleditor'          => 'Domyślńy užywej zewnyntřnygo edytora (ino lo ekspertůw, wymogo ekstra štalowań we Twojym systymje)',
-'tog-externaldiff'            => 'Domyślńy užywej zewnyntřny program do filowańo w pomjyńańa (yno lo ekspertůw, sům wymogane ekstra štalowańo we kůmpůtře užytkowńika)',
-'tog-showjumplinks'           => 'Zauůn� cajchnůndzki "přyńdź do"',
-'tog-uselivepreview'          => 'Užywej dynami�nego podglůndu (JavaScript) (experymentalny)',
-'tog-forceeditsummary'        => 'Dej znać kejbych ńic ńy naškryflou w uopiśe pomjyńań',
-'tog-watchlisthideown'        => 'Schowej moje pomjyńańa w artiklach, na kere dowom pozůr',
-'tog-watchlisthidebots'       => 'Schowej pomjyńańa sprowjone bez boty w artiklach, na kere dowom pozůr',
-'tog-watchlisthideminor'      => 'Schowej drobne pomjyńańa w artiklach, na kere dowom pozůr',
-'tog-ccmeonemails'            => 'Přesyuej mi kopje e-brifůw co žech je posuou inkšym užytkownikom',
-'tog-diffonly'                => 'Ńy pokozůj treśći zajtůw půnižyj porůwnańo pomjyńań',
-'tog-showhiddencats'          => 'Pokož schowane kategoryje',
-
-'underline-always'  => 'Zawdy',
+'tog-enotifrevealaddr'        => 'Ńy chow mojigo e-brifa w powjadomjyńach',
+'tog-shownumberswatching'     => 'Pokoż, wjela sprowjorzy dowo pozůr',
+'tog-fancysig'                => 'Szrajbńij bez automatycznygo linka',
+'tog-externaleditor'          => 'Sztandardowo używej zewnyntrznygo edytora (jyno do ekspertůw, trza mjyć ekstra sztalowańy we systymje)',
+'tog-externaldiff'            => 'Sztandardowo używej zewnyntrzny program do filowańo w pomjyńańach (jyno do ekspertůw, trza mjyć ekstra sztalowańy we systymje)',
+'tog-showjumplinks'           => 'Zapńij cajchnůndzki "przyńdź do"',
+'tog-uselivepreview'          => 'Używej dynamicznygo poglůndu (JavaScript) (experymentalny)',
+'tog-forceeditsummary'        => 'Dej znoć, kejbych ńic ńy naszkryfloł w uopiśe pomjyńań',
+'tog-watchlisthideown'        => 'Schow moje pomjyńańa we artiklach, na kere dowom pozůr',
+'tog-watchlisthidebots'       => 'Schow pomjyńańa sprowjone bez boty we artiklach, na kere dowom pozůr',
+'tog-watchlisthideminor'      => 'Schow ńywjelge pomjyńańa w artiklach, na kere dowom pozůr',
+'tog-watchlisthideliu'        => 'Schow sprowjyńo zalůgowanych sprowjaczy na pozorliśće',
+'tog-watchlisthideanons'      => 'Schow sprowjyńa anůńimowych sprowjoczy na liśće artikli, na kere dowom pozůr',
+'tog-ccmeonemails'            => 'Przesyłej mi kopje e-brifůw co żech je posłoł inkszym sprowjaczom',
+'tog-diffonly'                => 'Ńy pokozuj treśći zajtůw půnižyj porůwnańo pomjyńań',
+'tog-showhiddencats'          => 'Pokoż schowane kategoryje',
+'tog-norollbackdiff'          => 'Uomiń pokozywańy pomjyńań po użyću funkcyje „cofej�',
+
+'underline-always'  => 'Dycki',
 'underline-never'   => 'Ńigdy',
-'underline-default' => 'Wedle štalowańo přeglůndarki',
-
-'skinpreview' => '(podglůnd)',
+'underline-default' => 'Podug sztalowańo uoglůndarki',
 
 # Dates
 'sunday'        => 'Ńedźela',
-'monday'        => 'Pyńdźouek',
+'monday'        => 'Pyńdźołek',
 'tuesday'       => 'Wtorek',
-'wednesday'     => 'Střoda',
-'thursday'      => 'Å twortek',
+'wednesday'     => 'Strzoda',
+'thursday'      => 'Sztwortek',
 'friday'        => 'Pjůntek',
 'saturday'      => 'Sobota',
 'sun'           => 'Ńed',
 'mon'           => 'Pyń',
 'tue'           => 'Wto',
-'wed'           => 'StÅ™',
-'thu'           => 'Å tw',
+'wed'           => 'Str',
+'thu'           => 'Szt',
 'fri'           => 'Pjů',
 'sat'           => 'Sob',
-'january'       => 'sty�yń',
+'january'       => 'styczyń',
 'february'      => 'luty',
-'march'         => 'mařec',
+'march'         => 'merc',
 'april'         => 'kwjećyń',
 'may_long'      => 'moj',
-'june'          => '�yrwjec',
-'july'          => 'lipjec',
+'june'          => 'czyrwjyń',
+'july'          => 'lipjyń',
 'august'        => 'śyrpjyń',
-'september'     => 'wřeśyń',
+'september'     => 'wrześyń',
 'october'       => 'paźdźerńik',
 'november'      => 'listopad',
 'december'      => 'grudźyń',
-'january-gen'   => 'sty�ńa',
+'january-gen'   => 'styczńa',
 'february-gen'  => 'lutygo',
-'march-gen'     => 'marca',
+'march-gen'     => 'merca',
 'april-gen'     => 'kwjetńa',
 'may-gen'       => 'maja',
-'june-gen'      => '�yrwca',
-'july-gen'      => 'lipca',
+'june-gen'      => 'czyrwńa',
+'july-gen'      => 'lipńa',
 'august-gen'    => 'śyrpńa',
-'september-gen' => 'wřeśńa',
+'september-gen' => 'wrześńa',
 'october-gen'   => 'paźdźerńika',
 'november-gen'  => 'listopada',
 'december-gen'  => 'grudńa',
 'jan'           => 'sty',
 'feb'           => 'lut',
-'mar'           => 'maÅ™',
+'mar'           => 'mer',
 'apr'           => 'kwj',
 'may'           => 'moj',
-'jun'           => '�yr',
+'jun'           => 'czy',
 'jul'           => 'lip',
 'aug'           => 'śyr',
-'sep'           => 'wře',
+'sep'           => 'wrz',
 'oct'           => 'paź',
 'nov'           => 'lis',
 'dec'           => 'gru',
 
 # Categories related messages
-'pagecategories'                 => '{{PLURAL:$1|Katygoryjo|Katygoryje|Katygoryji}}',
+'pagecategories'                 => '{{PLURAL:$1|Kategoryjo|Kategoryje|Kategoryje}}',
 'category_header'                => 'Zajty w katygoryji "$1"',
 'subcategories'                  => 'Podkatygoryje',
 'category-media-header'          => 'Pliki w katygoryji "$1"',
-'category-empty'                 => "''W tyj katygoryji ńy mo terozki artikli ńi plikůw''",
+'category-empty'                 => "''Terozki w tyj katygoryji sům żodne artikle a pliki''",
 'hidden-categories'              => '{{PLURAL:$1|Schowano katygoryjo|Schowane katygoryje|Schowanych katygoryji}}',
 'hidden-category-category'       => 'Schowane katygoryje', # Name of the category where hidden categories will be listed
-'category-subcat-count'          => '{{PLURAL:$2|Ta katygoryjo mo ino jydno podkatygoryjo.|Ta katygoryjo mo {{PLURAL:$1|nastympůjůnco podkatygoryjo|$1 podkatygoryje|$1 podkatygoryji}} s li�by katygoryji uogůuem: $2.}}',
-'category-subcat-count-limited'  => 'Ta katygoryjo mo {{PLURAL:$1|nastympůjůnco podkatygoryjo|$1 podkatygoryje|$1 podkatygoryji}}.',
-'category-article-count'         => '{{PLURAL:$2|W tyj katygoryji je ino jydno zajta.|W katygoryji {{PLURAL:$1|zostoua pokazano $1 zajta|zostouy pokazane $1 zajty|zostouo pokazanych $1 zajtůw}} s uůn�nyj li�by $2 zajtůw.}}',
-'category-article-count-limited' => 'W katygoryji {{PLURAL:$1|zostoua pokazano $1 zajta|zostouy pokazane $1 zajty|zostauo pokazanych $1 zajtůw}}.',
-'category-file-count'            => '{{PLURAL:$2|W katygoryji znajduje śe jydyn plik.|W katygoryji {{PLURAL:$1|zostou pokazany $1 plik|zostouy pokazane $1 pliki|zostouo pokozanych $1 plikůw}} s uůn�nyj li�by $2 plikůw.}}',
-'category-file-count-limited'    => 'W katygoryji {{PLURAL:$1|zostou pokazany $1 plik|zostouy pokazane $1 pliki|zostouo pokazanych $1 plikůw}}.',
+'category-subcat-count'          => '{{PLURAL:$2|Ta katygoryjo mo jyno jydno podkatygoryjo.|Ta katygoryjo mo {{PLURAL:$1|tako podkatygoryjo|$1 podkatygoryje|$1 podkatygoryji}} s liczby wszyjskich katygoryji: $2.}}',
+'category-subcat-count-limited'  => 'Ta katygoryjo mo {{PLURAL:$1|tako podkatygoryjo|$1 podkatygoryje|$1 podkatygoryji}}.',
+'category-article-count'         => '{{PLURAL:$2|W tyj katygoryji je jyno jydno zajta.|W katygoryji {{PLURAL:$1|je pokazano $1 zajta|sům pokozane $1 zajty|je pokozanych $1 zajtůw}} s cołkyj liczby $2 zajtůw.}}',
+'category-article-count-limited' => 'W katygoryji {{PLURAL:$1|je pokozano $1 zajta|sům pokozane $1 zajty|je pokazanych $1 zajtůw}}.',
+'category-file-count'            => '{{PLURAL:$2|W katygoryji snojduje śe jydyn plik.|W katygoryji {{PLURAL:$1|je pokozany $1 plik|sům pokozane $1 pliki|je pokozanych $1 plikůw}} s cołkyj liczby $2 plikůw.}}',
+'category-file-count-limited'    => 'W katygoryji {{PLURAL:$1|je pokozany $1 plik|sům pokozane $1 pliki|je pokozanych $1 plikůw}}.',
 'listingcontinuesabbrev'         => 'ć.d.',
 
-'mainpagetext'      => "<big>'''Inštalacyjo MediaWiki powjodua śe.'''</big>",
-'mainpagedocfooter' => 'Uobezdřij [http://meta.wikimedia.org/wiki/Help:Contents přewodńik užytkownika], kaj sům informacyje uo dźouańu uoprogramowańo MediaWiki.
+'mainpagetext'      => "<big>'''Sztalowańy MediaWiki śe udoło.'''</big>",
+'mainpagedocfooter' => 'Uobezdrzij [http://meta.wikimedia.org/wiki/Help:Contents przewodńik sprowjacza], kaj sům informacyje uo dźołańu uoprogramowańo MediaWiki.
 
-== Na Å¡tart ==
-* [http://www.mediawiki.org/wiki/Manual:Configuration_settings Lista štalowań konfiguracyji]
+== Na sztart ==
+* [http://www.mediawiki.org/wiki/Manual:Configuration_settings Lista sztalowań konfiguracyje]
 * [http://www.mediawiki.org/wiki/Manual:FAQ MediaWiki FAQ]
-* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Komůnikaty uo nowych wersyjach MediaWiki]',
+* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Komuńikaty uo nowych wersyjach MediaWiki]',
 
 'about'          => 'Uo serwiśe',
 'article'        => 'zajta',
 'newwindow'      => '(uodmyko śe w nowym uokńy)',
 'cancel'         => 'Uodćepnij',
-'qbfind'         => 'Å nupej',
-'qbbrowse'       => 'Přeglůndańy',
+'qbfind'         => 'Nojdź',
+'qbbrowse'       => 'Uoglůndańy',
 'qbedit'         => 'Sprowjej',
 'qbpageoptions'  => 'Ta zajta',
 'qbpageinfo'     => 'Kontekst',
 'qbmyoptions'    => 'Moje zajty',
-'qbspecialpages' => 'Å pecyjalne zajty',
-'moredotdotdot'  => 'Wjyncyj...',
+'qbspecialpages' => 'Szpecyjalne zajty',
+'moredotdotdot'  => 'Wjyncy...',
 'mypage'         => 'Moja zajta',
-'mytalk'         => 'Moja godka',
+'mytalk'         => 'Moja dyskusyjo',
 'anontalk'       => 'Godka tygo IP',
 'navigation'     => 'Nawigacyjo',
-'and'            => 'a',
+'and'            => '&#32;a',
 
 # Metadata in edit box
 'metadata_help' => 'Metadane:',
@@ -164,40 +166,40 @@ $messages = array(
 'returnto'          => 'Nazod do zajty $1.',
 'tagline'           => 'S {{GRAMMAR:D.lp|{{SITENAME}}}}',
 'help'              => 'Půmoc',
-'search'            => 'Å nupej',
-'searchbutton'      => 'Å nupej',
-'go'                => 'Přyńdź',
-'searcharticle'     => 'Přyńdź',
-'history'           => 'Historyjo zajty',
-'history_short'     => 'Historyjo',
+'search'            => 'Szukej',
+'searchbutton'      => 'Sznupej',
+'go'                => 'Przyńdź',
+'searcharticle'     => 'Przyńdź',
+'history'           => 'Gyszichta zajty',
+'history_short'     => 'Gyszichta',
 'updatedmarker'     => 'pomjyńane uod uostatńij wizyty',
 'info_short'        => 'Informacyjo',
-'printableversion'  => 'Wersyjo do druku',
-'permalink'         => 'Bespostředńi link',
-'print'             => 'Drukuj',
+'printableversion'  => 'Wersyjo do durku',
+'permalink'         => 'Bezpostrzedńi link',
+'print'             => 'Durkuj',
 'edit'              => 'sprowjej',
-'create'            => 'Stwůř',
+'create'            => 'Stwůrz',
 'editthispage'      => 'Sprowjej ta zajta',
-'create-this-page'  => 'Stwůř ta zajta',
+'create-this-page'  => 'Stwůrz ta zajta',
 'delete'            => 'Wyćep',
 'deletethispage'    => 'Wyćep ta zajta',
 'undelete_short'    => 'Wćep nazod {{PLURAL:$1|jedna wersyjo|$1 wersyje|$1 wersyji}}',
-'protect'           => 'Zawřij',
+'protect'           => 'Zawrzij',
 'protect_change'    => 'zmjyń',
 'protectthispage'   => 'Zawřij ta zajta',
 'unprotect'         => 'Uodymkńij',
 'unprotectthispage' => 'Uodymkńij ta zajta',
 'newpage'           => 'Nowy artikel',
 'talkpage'          => 'Godej uo tym artiklu',
-'talkpagelinktext'  => 'Godka',
+'talkpagelinktext'  => 'dyskusyjo',
 'specialpage'       => 'Å pecyjalno zajta',
 'personaltools'     => 'Uosobiste',
 'postcomment'       => 'Skůmyntuj',
 'articlepage'       => 'Zajta artikla',
-'talk'              => 'Godka',
+'talk'              => 'dyskusyjo',
 'views'             => 'Widok',
 'toolbox'           => 'Werkcojg',
-'userpage'          => 'Zajta užytkowńika',
+'userpage'          => 'Zajta sprowjorza',
 'projectpage'       => 'Zajta projekta',
 'imagepage'         => 'Zajta grafiki',
 'mediawikipage'     => 'Zajta komuńikata',
@@ -205,21 +207,19 @@ $messages = array(
 'viewhelppage'      => 'Zajta pomocy',
 'categorypage'      => 'Zajta katygoryji',
 'viewtalkpage'      => 'Zajta godki',
-'otherlanguages'    => 'W inkšych godkach',
+'otherlanguages'    => 'We inkszych godkach',
 'redirectedfrom'    => '(Překerowano s $1)',
 'redirectpagesub'   => 'Zajta překerowujůnco',
 'lastmodifiedat'    => 'Ta zajta uostatńo sprowjano $2, $1.', # $1 date, $2 time
 'viewcount'         => 'W ta zajta filowano {{PLURAL:$1|tylko roz|$1 rozůw}}.',
 'protectedpage'     => 'Zajta zawarto',
-'jumpto'            => 'Přyńdź do:',
+'jumpto'            => 'Przyńdź do:',
 'jumptonavigation'  => 'nawigacyje',
-'jumptosearch'      => 'šnupańo',
+'jumptosearch'      => 'szukańo',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Uo {{GRAMMAR:MS.lp|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Uo serwiśe',
-'bugreports'           => 'Raport uo felerach',
-'bugreportspage'       => 'Project:Felery',
 'copyright'            => 'Tekst udostympńany na licencyji $1.',
 'copyrightpagename'    => 'prawami autorskimi {{GRAMMAR:D.lp|{{SITENAME}}}}',
 'copyrightpage'        => '{{ns:project}}:Prawa autorske',
@@ -232,8 +232,8 @@ $messages = array(
 'faq'                  => 'FAQ',
 'faqpage'              => 'Project:FAQ',
 'helppage'             => 'Help:Pomoc',
-'mainpage'             => 'Přodńo zajta',
-'mainpage-description' => 'Přodńo zajta',
+'mainpage'             => 'Przodńo zajta',
+'mainpage-description' => 'Przodńo zajta',
 'policy-url'           => 'Project:Prawidua',
 'portal'               => 'Portal užytkowńikůw',
 'portal-url'           => 'Project:Portal užytkowńikůw',
@@ -242,24 +242,24 @@ $messages = array(
 
 'badaccess'        => 'Felerne uprawńyńo',
 'badaccess-group0' => 'Ńy moš uprawńyń coby wykůnać ta uoperacyjo.',
-'badaccess-group1' => 'Ta uoperacyjo mogům wykůnać ino užytkownicy z grupy $1',
-'badaccess-group2' => 'Ta uoperacyjo mogům wykůnać ino užytkownicy s keryjś z grup $1.',
-'badaccess-groups' => 'Ta uoperacyjo mogům wykůnać ino užytkownicy s keryjś z grup $1.',
+'badaccess-groups' => 'Ta uoperacyjo mogům wykůnać ino užytkownicy s keryjś z grup {{PLURAL:$2|grupa|grupy}}:$1.',
 
 'versionrequired'     => 'Wymagano MediaWiki we wersyji $1',
 'versionrequiredtext' => 'Wymagano jest MediaWiki we wersji $1 coby skořistać s tyj zajty. Uobo� [[Special:Version]]',
 
 'ok'                      => 'OK',
-'retrievedfrom'           => 'Zdřůduo "$1"',
-'youhavenewmessages'      => 'Moš $1 ($2).',
-'newmessageslink'         => 'nowe wjadůmośći',
-'newmessagesdifflink'     => 'uostatńo zmjana',
-'youhavenewmessagesmulti' => 'Moš nowe wjadůmośći: $1',
+'retrievedfrom'           => 'Zdrzůdło "$1"',
+'youhavenewmessages'      => 'Mosz $1 ($2).',
+'newmessageslink'         => 'nowe powjadůmjyńa',
+'newmessagesdifflink'     => 'uostatńe pomjyńyńy',
+'youhavenewmessagesmulti' => 'Mosz nowe powjadůmjyńa: $1',
 'editsection'             => 'sprowjej',
 'editold'                 => 'sprowjej',
-'viewsourceold'           => 'pokož zdřůduo',
+'viewsourceold'           => 'pokoż zdrzůdło',
+'editlink'                => 'sprowjej',
+'viewsourcelink'          => 'zdrzůdłowy tekst',
 'editsectionhint'         => 'Sprowjej tajla: $1',
-'toc'                     => 'Spis treśći',
+'toc'                     => 'Wykoz',
 'showtoc'                 => 'pokož',
 'hidetoc'                 => 'schrůń',
 'thisisdeleted'           => 'Pokož/wćepej nazod $1',
@@ -272,19 +272,19 @@ $messages = array(
 'site-atom-feed'          => 'Kanau Atom {{GRAMMAR:D.lp|$1}}',
 'page-rss-feed'           => 'Kanau RSS "$1"',
 'page-atom-feed'          => 'Kanau Atom "$1"',
-'red-link-title'          => '$1 (ješ�e ńy utwořono)',
+'red-link-title'          => '$1 (jeszcze Å„y napisane)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Zajta',
-'nstab-user'      => 'Zajta užytkowńika',
+'nstab-user'      => 'Zajta sprowjorza',
 'nstab-media'     => 'Medja',
 'nstab-special'   => 'Å pecyjalno zajta',
 'nstab-project'   => 'Zajta projektu',
 'nstab-image'     => 'Plik',
 'nstab-mediawiki' => 'Komuńikat',
-'nstab-template'  => 'Šablůn',
+'nstab-template'  => 'Muster',
 'nstab-help'      => 'Zajta půmocy',
-'nstab-category'  => 'Katygoryjo',
+'nstab-category'  => 'Kategoryjo',
 
 # Main script and global functions
 'nosuchaction'      => 'Ńy mo takij uoperacyji',
@@ -337,7 +337,6 @@ Jeli tak ńy je, moguo śe trefić coś znod feler we uoprůgramowańu MediaWiki
 'cannotdelete'         => 'Ńy idźe wyćepać podanyj zajty abo grafiki.',
 'badtitle'             => 'Felerno tytůua',
 'badtitletext'         => 'Podano felerny titel zajty. Prawdopodańy sům w ńim znoki, kerych ńy wolno užywać we titlach abo je pusty.',
-'perfdisabled'         => 'Přeprašomy! Coby uodćůnžyć serwer w godźinach š�ytu, �asowo zawarlimy wykůnańy tyj �ynnośći.',
 'perfcached'           => 'To co sam je naškryflane, to ino kopja s pamjyńći podryn�nyj a može ńy być aktualne.',
 'perfcachedts'         => 'To co sam je naškryflane, to ino kopja s pamjyńći podryn�nyj a bůuo uaktualńůne $1.',
 'querypage-no-updates' => 'Uaktualńyńo lo tyj zajty sům terozki zawarte. Dane, kere sam sům, ńy zostouy uodśwjyžůne.',
@@ -362,30 +361,29 @@ $2',
 Powůd zawarćo: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Felerno konfiguracyjo – ńyznany skaner antywirusowy <i>$1</i>',
+'virus-badscanner'     => "Felerno konfiguracyjo – ńyznany skaner antywirusowy ''$1''",
 'virus-scanfailed'     => 'skanowańy ńyudone (feler $1)',
 'virus-unknownscanner' => 'ńyznajůmy průgram antywirusowy',
 
 # Login and logout pages
 'logouttitle'                => 'Wylůgowańy užytkowńika',
-'logouttext'                 => '<strong>Terozki ježeś wylůgowany</strong>.<br />Možeš dali sam sprowjać zajty we {{SITENAME}} kej ńyzalůgowany užytkowńik, abo [[Special:UserLogin|zalůgować śe nazod]] kej tyn som abo inkšy užytkowńik. Dej pozůr, co na ńykerych zajtach přeglůndarka može dali pokozywać co ježeś zalůgowany, a bydźe tak aže uodśwjyžyš jeij cache.',
+'logouttext'                 => "'''Terozki ježeś wylůgowany'''.<br />Možeš dali sam sprowjać zajty we {{SITENAME}} kej ńyzalůgowany užytkowńik, abo [[Special:UserLogin|zalůgować śe nazod]] kej tyn som abo inkšy užytkowńik. Dej pozůr, co na ńykerych zajtach přeglůndarka može dali pokozywać co ježeś zalůgowany, a bydźe tak aže uodśwjyžyš jeij cache.",
 'welcomecreation'            => '== Witej, $1! ==
 Uotwarli my sam lo Ćebje kůnto.
 Ńy zapomńij poštalować [[Special:Preferences|preferencyji lo {{GRAMMAR:D.lp|{{SITENAME}}}}]].',
-'loginpagetitle'             => 'Lůgowańy',
+'loginpagetitle'             => 'Logowańy',
 'yourname'                   => 'Mjano užytkowńika:',
 'yourpassword'               => 'Hasuo:',
 'yourpasswordagain'          => 'Naškryflej hasuo zaś',
 'remembermypassword'         => 'Zapamjyntej moje hasuo na tym kůmputře',
 'yourdomainname'             => 'Twoja domyna',
 'externaldberror'            => 'Je jaki feler we zewnyntřnyj baźe autentyfikacyjnyj, abo ńy moš uprawńyń potřebnych do aktualizacyji zewnyntřnego kůnta.',
-'loginproblem'               => '<b>Zdořiu śe problym při průbje zalůgowańo.</b><br />Sprůbuj zaś!',
-'login'                      => 'Zalůguj śe',
-'nav-login-createaccount'    => 'Lůgowańy / Twořyńy kůnta',
+'login'                      => 'Zaloguj śe',
+'nav-login-createaccount'    => 'Logowańy / tworzyńy kůnta',
 'loginprompt'                => 'Muśiš mjeć zouůn�ůne cookies coby můc śe sam zalůgować.',
 'userlogin'                  => 'Lůgowańy / Twořyńy kůnta',
-'logout'                     => 'Wylůguj',
-'userlogout'                 => 'Wylůgowańy',
+'logout'                     => 'Wyloguj',
+'userlogout'                 => 'Wylogowańy',
 'notloggedin'                => 'Ńy ježeś zalůgowany',
 'nologin'                    => 'Ńy moš kůnta? $1.',
 'nologinlink'                => 'Twůř kůnto',
@@ -439,8 +437,8 @@ Jak bydźeš chćou, coby wysyuouo Ći e-brify, pjyrwyj go pře�ytej. Bydźeš
 'throttled-mailpassword'     => 'Připůmńyńy hasua bůuo juž wysuane bez {{PLURAL:$1|uostatńo godźina|uostatńe $1 godźin}}.
 Coby powstřimać nadužyća, možliwość wysyuańa připůmńeń naštalowano na jydne bez {{PLURAL:$1|godźina|$1 godźiny}}.',
 'mailerror'                  => 'Při wysyuańu e-brifa zdořiu śe feler: $1',
-'acct_creation_throttle_hit' => 'Přikro nom, zauožyu(a)žeś juž $1 kont(a). Ńy možeš zauožyć kolejnygo.',
-'emailauthenticated'         => 'Twůj adres e-brifa zostou uwjeřitelńůny $1.',
+'acct_creation_throttle_hit' => 'Přikro nom, zauožyu(a)žeś juž {{PLURAL:$1|1 kůnto|$1 kůnta}}. Ńy možeš zauožyć kolejnygo.',
+'emailauthenticated'         => 'Twůj adres e-brifa zostou uwjeřitelńůny $2 uo $3.',
 'emailnotauthenticated'      => 'Twůj adres e-brifa ńy je uwjeřitelńůny. Půnižše funkcyje po�ty ńy bydům dźauać.',
 'noemailprefs'               => 'Muśiš podać adres e-brifa, coby te funkcyje dźouauy.',
 'emailconfirmlink'           => 'Potwjerdź swůj adres e-brifa',
@@ -449,17 +447,25 @@ Coby powstřimać nadužyća, možliwość wysyuańa připůmńeń naštalowano
 'accountcreatedtext'         => 'Kůnto lo $1 zostouo utwůřůne.',
 'createaccount-title'        => 'Stwořyńy kůnta na {{GRAMMAR:MS.lp|{{SITENAME}}}}',
 'createaccount-text'         => 'Ktoś utwořiu na {{GRAMMAR:MS.lp|{{SITENAME}}}} ($4) dla Twojego adresa e-brif kůnto "$2". Aktualne hasuo to "$3". Powińežeś śe terozki zalogůwać a je zmjyńić.',
+'login-throttled'            => 'Wykonoužeś za wjela průb zalůgowańo śe na te kůnto. Po�ekej chwila ńym zaś sprůbuješ.',
 'loginlanguagelabel'         => 'Godka: $1',
 
 # Password reset dialog
-'resetpass'               => 'Resetuj hasuo',
-'resetpass_announce'      => 'Zalůgowoužeś śe s tym�asowym kodym uotřimanym bez e-brif. Coby zakůń�yć proces logůwańo muśiš naštalować nowe hasuo:',
-'resetpass_header'        => 'Zmjyń hasło lů swojygo kůnta',
-'resetpass_submit'        => 'Naštaluj hasuo a zalůguj',
-'resetpass_success'       => 'Twoje hasuo zostouo půmyślńy pomjyńone! Trwo logůwańe...',
-'resetpass_bad_temporary' => 'Felerne hasuo tym�asowe. Abo možeś juž zakůń�yu proces pomjyńańo hasua, abo poprośiužeś uo nowe hasuo tym�asowe.',
-'resetpass_forbidden'     => 'Ńy idźe sam půmjyńyć hasuůw.',
-'resetpass_missing'       => 'FormuloÅ™ Å„y mo danych.',
+'resetpass'                 => 'Zmjyń hasło',
+'resetpass_announce'        => 'Zalůgowoužeś śe s tym�asowym kodym uotřimanym bez e-brif. Coby zakůń�yć proces logůwańo muśiš naštalować nowe hasuo:',
+'resetpass_header'          => 'Zmjyń hasło lů swojygo kůnta',
+'oldpassword'               => 'Stare hasuo',
+'newpassword'               => 'Nowe hasuo',
+'retypenew'                 => 'Naškryflej ješ�e roz nowe hasuo:',
+'resetpass_submit'          => 'Naštaluj hasuo a zalůguj',
+'resetpass_success'         => 'Twoje hasuo zostouo půmyślńy pomjyńone! Trwo logůwańe...',
+'resetpass_bad_temporary'   => 'Felerne hasuo tym�asowe. Abo možeś juž zakůń�yu proces pomjyńańo hasua, abo poprośiužeś uo nowe hasuo tym�asowe.',
+'resetpass_forbidden'       => 'Ńy idźe sam půmjyńyć hasuůw.',
+'resetpass-no-info'         => 'Muśysz być zalogowany, coby uzyskać bezpostrzedńi dostymp do tyj zajty.',
+'resetpass-submit-loggedin' => 'Zmjyń hasło',
+'resetpass-wrong-oldpass'   => 'Felerne tymczasowe abo aktualne hasło. 
+Możliwe co właśńy zmjyńiłżeś swoje hasło abo poprosiłżeś uo nowe tymczasowe hasło.',
+'resetpass-temp-password'   => 'Tymczasowe hasło:',
 
 # Edit page toolbar
 'bold_sample'     => 'Ruby tekst',
@@ -482,21 +488,21 @@ Coby powstřimać nadužyća, možliwość wysyuańa připůmńeń naštalowano
 'hr_tip'          => 'Lińja poźůmo (užywej s ůmjarym)',
 
 # Edit pages
-'summary'                          => 'Uopis pomjyńań',
-'subject'                          => 'Tymat/naguůwek',
+'summary'                          => 'Uopis pomjyńań:',
+'subject'                          => 'Tymat/naguůwek:',
 'minoredit'                        => 'To je ńywjelge sprowjyńy',
 'watchthis'                        => 'Dej pozůr',
-'savearticle'                      => 'Å kryflej',
-'preview'                          => 'Podglůnd',
-'showpreview'                      => 'Pokož podglůnd',
+'savearticle'                      => 'Spamjyntej',
+'preview'                          => 'Uobźyrańy',
+'showpreview'                      => 'Uobźyrej',
 'showlivepreview'                  => 'Dynami�ny podglůnd',
-'showdiff'                         => 'Pokož zmjony',
+'showdiff'                         => 'Pozdrzyj na pomjyńańy',
 'anoneditwarning'                  => 'Ńy ježeś zalogowany. We historyji sprowjyń tyj zajty bydźe naškryflony Twůj adres IP.',
 'missingsummary'                   => "'''Připomńyńy:''' Ńy wprowadźiužeś uopisu pomjyńań. Kej go ńy chceš wprowadzać, naćiś knefel Škryflej ješ�e roz.",
 'missingcommenttext'               => 'Wćepej kůmyntoř půńižyj.',
 'missingcommentheader'             => "'''Dej pozůr:''' Treść naguůwka je pusto - uzupeuńij go! Jeli tego ńy zrobiš, Twůj kůmyntoř bydźe naškryflany bez naguůwka.",
-'summary-preview'                  => 'Podglůnd uopisu',
-'subject-preview'                  => 'Podglůnd tematu/naguůwka',
+'summary-preview'                  => 'Podglůnd uopisu:',
+'subject-preview'                  => 'Podglůnd tematu/naguůwka:',
 'blockedtitle'                     => 'Užytkowńik je zawarty uod sprowjyń',
 'blockedtext'                      => '<big>\'\'\'Twoje kůnto abo adres IP sům zawarte.\'\'\'</big>
 
@@ -545,25 +551,25 @@ Jeli ježeś anůnimowym užytkowńikym a wydowo Ći śe, aže zamjyš�ůne sam
 'noarticletext'                    => 'Ńy mo ješ�e zajty uo tym titelu. Možeš [{{fullurl:{{FULLPAGENAME}}|action=edit}} wćepać artikel {{FULLPAGENAME}}] abo [[Special:Search/{{PAGENAME}}|šnupać za {{PAGENAME}} w inkšych artiklach]].',
 'userpage-userdoesnotexist'        => 'Užytkowńik "$1" ńy je zareještrowany. Sprowdź eli na pewno chćoužeś stwořyć/pomjynić gynau ta zajta.',
 'clearyourcache'                   => "'''Dej pozůr:''' Coby uobejřeć pomjyńańo pů naškryflańu nowych štalowań poleć přeglůndorce wy�yśćić zawartość pamjyńći podryn�nyj (cache). '''Mozilla / Firefox / Safari:''' přitřimej ''Shift'' klikajůnc na ''Uodśwjyž'' abo wciś ''Ctrl-Shift-R'' (''Cmd-Shift-R'' na Macintoshu), '''IE :''' přitřimej ''Ctrl'' klikajůnc na ''Uodśwjyž'' abo wciś ''Ctrl-F5''; '''Konqueror:''': kliknij knefel ''Uodśwjyž'' abo wciś ''F5''; užytkowńicy '''Opery''' mogům być zmušeńi coby coukym wy�yśćić jejich pamjyńć podryn�no we menu ''Werkcojgi→Preferencyje''.; '''Internet Explorer:''' třim ''Ctrl'' a wćiś ''Uodśwjyž'', abo wćiś ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => '<strong>Podpowjydź:</strong> Užyj knefla "Podglůnd", coby přetestować Twůj nowy arkuš stylůw CSS abo kod JavaScript před jego zašrajbowańym.',
+'usercssjsyoucanpreview'           => "'''Podpowjydź:''' Užyj knefla \"Podglůnd\", coby přetestować Twůj nowy arkuš stylůw CSS abo kod JavaScript před jego zašrajbowańym.",
 'usercsspreview'                   => "'''Pamjyntej, aže to je na raźe ino podglůnd Twojego arkuša stylůw CSS.'''
 '''Ńic ješ�e ńy zostouo naškryflone!'''",
 'userjspreview'                    => "'''Pamjyntej, aže to je na raźe ino podglůnd Twojego JavaScriptu - nic ješ�e ńy zostouo naškryflone!'''",
 'userinvalidcssjstitle'            => "'''Pozůr:''' Ńy mo skůrki uo mjańe \"\$1\". Pamjyntej, aže zajty užytkowńika zawjyrajůnce CSS i JavaScript powinny za�ynać śe mouům buchštabům, np. {{ns:user}}:Foo/monobook.css.",
 'updated'                          => '(Pomjyńano)',
-'note'                             => '<strong>Pozůr:</strong>',
-'previewnote'                      => '<strong>To je ino podglůnd - artikel ješ�e ńy je naškryflany!</strong>',
+'note'                             => "'''Pozůr:'''",
+'previewnote'                      => "'''To je ino podglůnd - artikel ješ�e ńy je naškryflany!'''",
 'previewconflict'                  => 'Wersyjo podglůndano uodnośi śe do tekstu s pola edycyje na wjyrchu. Tak bydźe wyglůndać zajta jeli zdecyduješ śe jům naškryflać.',
-'session_fail_preview'             => '<strong>Přeprašomy! Serwer ńy može přetwořyć tygo sprowjyńo skuli utraty danych ze sesyji. Sprůbuj ješ�e roz. Kejby to ńy pomoguo - wylůguj śe i zalogůj uod nowa.</strong>',
-'session_fail_preview_html'        => "<strong>Přeprašomy! Serwer ńy može přetwořyć tygo sprowjyńo skuli utraty danych ze sesyji.</strong>
+'session_fail_preview'             => "'''Přeprašomy! Serwer ńy može přetwořyć tygo sprowjyńo skuli utraty danych ze sesyji. Sprůbuj ješ�e roz. Kejby to ńy pomoguo - wylůguj śe i zalogůj uod nowa.'''",
+'session_fail_preview_html'        => "'''Přeprašomy! Serwer ńy može přetwořyć tygo sprowjyńo skuli utraty danych ze sesyji.'''
 
 ''Jako iže na {{GRAMMAR:MS.lp|{{SITENAME}}}} wuůn�ono zostoua uopcyjo \"raw HTML\", podglůnd zostou schrůńony coby zabezpje�yć před atakami JavaScript.''
 
-<strong>Jeli to je prawiduowo průba sprowjańo, sprůbuj ješ�e roz. Kejby to ńy pomoguo - wylůguj śe a zalůguj na nowo.</strong>",
-'token_suffix_mismatch'            => '<strong>Twoje sprowjyńy zostouo uodćepńynte skuli tego, co twůj klijynt pomjyšou znaki uod interpůnkcyji w žetůńe sprowjyń. Twoje sprowjyńy zostouo uodćepńynte coby zapobjec zńyš�yńu tekstu zajty. Take průblymy zdořajům śe w roźe kůřistańo s felernych anůnimowych śećowych usuůg proxy.</strong>',
-'editing'                          => 'Sprowjoš $1',
-'editingsection'                   => 'Sprowjoš $1 (sekcyjo)',
-'editingcomment'                   => 'Sprowjoš "$1" (kůmyntoř)',
+'''Jeli to je prawiduowo průba sprowjańo, sprůbuj ješ�e roz. Kejby to ńy pomoguo - wylůguj śe a zalůguj na nowo.'''",
+'token_suffix_mismatch'            => "'''Twoje sprowjyńy zostouo uodćepńynte skuli tego, co twůj klijynt pomjyšou znaki uod interpůnkcyji w žetůńe sprowjyń. Twoje sprowjyńy zostouo uodćepńynte coby zapobjec zńyš�yńu tekstu zajty. Take průblymy zdořajům śe w roźe kůřistańo s felernych anůnimowych śećowych usuůg proxy.'''",
+'editing'                          => 'Sprowjosz $1',
+'editingsection'                   => 'Sprowjosz $1 (sekcyjo)',
+'editingcomment'                   => 'Sprowjosz "$1" (kůmyntorz)',
 'editconflict'                     => 'Kůnflikt sprowjyń: $1',
 'explainconflict'                  => 'Ktoś zdůnžyu wćepać swoja wersyjo artikla ńim žeś naškryflou sprowjyńy.
 We polu edycyji na wjyrchu moš tekst zajty aktůalńy naškryflany w baźe danych.
@@ -572,21 +578,23 @@ By wćepać swoje pomjyńańo muśiš pomjyńać tekst w polu na wjyrchu.
 <b>Tylko</b> tekst z pola na wjyrchu bydźe naškryflany we baźe jak wciśńeš "Škryflej".<br />',
 'yourtext'                         => 'Twůj tekst',
 'storedversion'                    => 'Naškryflano wersyjo',
-'nonunicodebrowser'                => '<strong>Pozůr! Twoja přeglůndorka ńy umje poprowńy rozpoznować kodowańo UTF-8 (Unicode). Bestož wšyjske znoki, kerych Twoja přeglůndorka ńy umje rozpoznować, zamjeńůno na jejich kody heksadecymalne.</strong>',
-'editingold'                       => '<strong>Dej pozůr: Sprowjoš inkšo wersyjo zajty kej bježůnco. Jeli jům naškryfloš, wšyjske půźńyjše pomjyńańa bydům wyćepane.</strong>',
+'nonunicodebrowser'                => "'''Pozůr! Twoja přeglůndorka ńy umje poprowńy rozpoznować kodowańo UTF-8 (Unicode). Bestož wšyjske znoki, kerych Twoja přeglůndorka ńy umje rozpoznować, zamjeńůno na jejich kody heksadecymalne.'''",
+'editingold'                       => "'''Dej pozůr: Sprowjoš inkšo wersyjo zajty kej bježůnco. Jeli jům naškryfloš, wšyjske půźńyjše pomjyńańa bydům wyćepane.'''",
 'yourdiff'                         => 'Růžńice',
 'copyrightwarning'                 => "Pamjyntej uo tym, aže couki wkuod do {{SITENAME}} udostympńůmy wedle zasad $2 (dokuadńij w $1). Jak ńy chceš, coby koždy můg go zmjyńać i dali rozpowšychńać, ńy wćepuj go sam. Škryflajůnc sam tukej pośwjad�oš tyž, co te pisańy je twoje wuasne, abo žeś go wźůn(a) s materjouůw kere sům na ''public domain'', abo kůmpatybilne.<br />
-<strong>PROŠA ŃY WĆEPYWAĆ SAM MATYRJOUŮW KERE SŮM CHRŮŃONE PRAWYM AUTORSKIM BEZ DOZWOLEŃO WUAŚĆIĆELA!</strong>",
-'copyrightwarning2'                => 'Pamjyntej uo tym, aže couki wkuod do {{GRAMMAR:MS.lp|{{SITENAME}}}} može być sprowjany, pomjyńany abo wyćepany bez inkšych užytkownikůw. Jak ńy chceš, coby koždy můg go zmjyńać i dali rozpowšychńać bez uograni�yń, ńy wćepuj go sam.<br />
+'''PROŠA ŃY WĆEPYWAĆ SAM MATYRJOUŮW KERE SŮM CHRŮŃONE PRAWYM AUTORSKIM BEZ DOZWOLEŃO WUAŚĆIĆELA!'''",
+'copyrightwarning2'                => "Pamjyntej uo tym, aže couki wkuod do {{GRAMMAR:MS.lp|{{SITENAME}}}} može być sprowjany, pomjyńany abo wyćepany bez inkšych užytkownikůw. Jak ńy chceš, coby koždy můg go zmjyńać i dali rozpowšychńać bez uograni�yń, ńy wćepuj go sam.<br />
 Škryflajůnc sam tukej pośwjad�oš tyž, co te pisańy je twoje wuasne, abo žeś go wźůn(a) s matyrjouůw kere sům na public domain, abo kůmpatybilne (kuknij tyž: $1).
-<strong>PROŠA ŃY WĆEPYWAĆ SAM MATYRJOUŮW KERE SŮM CHRŮŃONE PRAWYM AUTORSKIM BEZ DOZWOLEŃO WUAŚĆIĆELA!</strong>',
-'longpagewarning'                  => '<strong>Dej pozůr: Ta zajta je $1 kilobajt-y/-ůw wjelgo; w ńykerych přyglůndarkach můgům wystůmpić problymy w sprowjańu zajtůw kere majům wjyncyj jak 32 kilobajty. Kejbyś ůmjou, podźel tekst na myńše tajle.</strong>',
-'longpageerror'                    => '<strong>Feler: Tekst kery žeś sam wćepywou mo $1 kilobajtůw. Maksymalno dugość tekstu ńy može być wjynkšo kej $2 kilobajtůw. Twůj tekst ńy bydźe sam naškryflany.</strong>',
-'readonlywarning'                  => '<strong>Dej pozůr: Baza danych zostoua filowo zawarto skuli potřeb admińistracyjnych. Bestůž ńy do śe terozki naškryflać Twojich pomjyńań. Radzymy přećepać nowy tekst kajś do plika tekstowego (wytnij/wklej) a wćepać sam zaś po uodymkńyńću bazy.</strong>',
-'protectedpagewarning'             => '<strong>Dej pozůr: Sprowjańe tyj zajty zostouo zawarte. Mogům jům sprowjać ino užytkowńicy s uprawńyńami admińistratora.</strong>',
+'''PROŠA ŃY WĆEPYWAĆ SAM MATYRJOUŮW KERE SŮM CHRŮŃONE PRAWYM AUTORSKIM BEZ DOZWOLEŃO WUAŚĆIĆELA!'''",
+'longpagewarning'                  => "'''Dej pozůr: Ta zajta je $1 kilobajt-y/-ůw wjelgo; w ńykerych přyglůndarkach můgům wystůmpić problymy w sprowjańu zajtůw kere majům wjyncyj jak 32 kilobajty. Kejbyś ůmjou, podźel tekst na myńše tajle.'''",
+'longpageerror'                    => "'''Feler: Tekst kery žeś sam wćepywou mo $1 kilobajtůw. Maksymalno dugość tekstu ńy može być wjynkšo kej $2 kilobajtůw. Twůj tekst ńy bydźe sam naškryflany.'''",
+'readonlywarning'                  => "'''Dej pozůr: Baza danych zostoua filowo zawarto skuli potřeb admińistracyjnych. Bestůž ńy do śe terozki naškryflać Twojich pomjyńań. Radzymy přećepać nowy tekst kajś do plika tekstowego (wytnij/wklej) a wćepać sam zaś po uodymkńyńću bazy.'''
+
+Admińistrator kery zawar baza dou take wyjaśńyńe: $1",
+'protectedpagewarning'             => "'''Dej pozůr: Sprowjańe tyj zajty zostouo zawarte. Mogům jům sprowjać ino užytkowńicy s uprawńyńami admińistratora.'''",
 'semiprotectedpagewarning'         => "'''Pozůr:''' Ta zajta zostoua zawarto a ino zaregišterowani užytkownicy mogům jům sprowjać.",
 'cascadeprotectedwarning'          => "'''Dej pozůr:''' Ta zajta zostoua zawarto a ino užytkowńicy s uprawńyńami admińistratora mogům jům sprowjać. Zajta ta je podpjynto pod {{PLURAL:$1|nastympujůnco zajta, kero zostoua zawarto|nastympujůncych zajtach, kere zostouy zawarte}} ze zauůn�onům opcjům dźedźi�yńo:",
-'titleprotectedwarning'            => '<strong>DEJ POZŮR: Zajta uo tym titlu zostoua zawarto a ino ńykeři užytkowńicy mogům jům wćepać.</strong>',
+'titleprotectedwarning'            => "'''DEJ POZŮR: Zajta uo tym titlu zostoua zawarto a ino ńykeři užytkowńicy mogům jům wćepać.'''",
 'templatesused'                    => 'Šablůny užyte na tyj zajće:',
 'templatesusedpreview'             => 'Šablůny užyte we tym podglůńdźe:',
 'templatesusedsection'             => 'Šablůny užyte w tyj tajli:',
@@ -603,17 +611,29 @@ Možeš sprowjać te co juž sům, abo [[Special:UserLogin|zalogować śe, abo z
 'recreate-deleted-warn'            => "'''Dej pozůr: Průbuješ wćepać nazod zajta kero juž bůua wyćepano.'''
 
 Zastanůw śe, eli sprowjańy nazod tyj zajty mo uzasadńyńy. Lo wygody užytkowńikůw, ńižyj pokozano rejer wyćepńyńć tyj zajty:",
+'deleted-notice'                   => 'Ta zajta zostoua wyćepńynto. Rejer wyćepań tyj zajty je pokozany půńižyj.',
+'deletelog-fulllog'                => 'Uobejzdřyj couki rejer.',
+'edit-hook-aborted'                => 'Sprowjyńy štopńynte skiž hoka.
+Ńy je wjadůme pů jakymu.',
+'edit-gone-missing'                => 'Ńy idźe zaktualizować zajty.
+Zdowo śe, co zostoua wyćepano.',
+'edit-conflict'                    => 'Kůnflikt sprowjyń.',
+'edit-no-change'                   => 'Twoje sprowjyńe uostouo zignorowane pů takymu, co ńic žeś we tekśće ńy zmjyńiu.',
+'edit-already-exists'              => 'Ńy idźe utwořić nowyj zajty.
+Tako zajta juž sam je.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Dej pozůr: ta zajta mo za dužo uodwouań do funkcyji parsera, kere mocno uobćůnžajům systym.
 
-Powinno jejich być myńi jak $2, a terozki je $1.',
+Powinno być myńi jak $2 {{PLURAL:$2|wywouańy|wywouańo|wywouań}}, a terozki {{PLURAL:$1|je $1 wywouańy|sům $1 wywouańo|je $1 wywouań}}.',
 'expensive-parserfunction-category'       => 'Zajty kere majům za dužo uodwouań do funkcyji parsera, kere mocno uobćůnžajům systym.',
 'post-expand-template-inclusion-warning'  => 'Dej pozůr: Rozmjar doůun�onych šablůnůw je za wjelgi.
 Ńykere šablůny ńy bydům sam doůun�one.',
 'post-expand-template-inclusion-category' => 'Zajty na kerych rozmjar doůun�onych šablůnůw je za wjelgi.',
 'post-expand-template-argument-warning'   => 'Dej pozůr: Ta zajta zawjyro přinojmyńi jedyn argument we šablůńe kery powoduje co je ůun za wjelgi. Te argumynty bydům pomińynte.',
 'post-expand-template-argument-category'  => 'Zajty na kerych sům šablůny s pomińyntymi argumyntůma.',
+'parser-template-loop-warning'            => 'Wykryto szablůn zapyntlyńo: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Przekroczůno limit głymbokośći rekurencyji szablona ($1)',
 
 # "Undo" feature
 'undo-success' => 'Sprowjyńy zostouo wycůfane. Proša pomjarkować ukozane půnižyj dyferencyje mjyndzy wersyjami, coby zweryfikować jejich poprawność, potym zaś naškryflać pomjyńańo coby zakoń�yć uoperacyjo.',
@@ -628,31 +648,31 @@ Powinno jejich być myńi jak $2, a terozki je $1.',
 Skuli: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Uobo� rejery uoperacyji lo tyj zajty',
-'nohistory'           => 'Ta zajta ńy mo swojij historyje sprowjyń.',
-'revnotfound'         => 'Wersyjo ńy zostoua znejdźůno',
-'revnotfoundtext'     => 'Ńy idźe znejść staršyj wersyji zajty. Sprawdź, proša, URL kery žeś užůu coby uzyskać dostymp do tyj zajty.',
-'currentrev'          => 'Aktualno wersyjo',
-'revisionasof'        => 'Wersyjo s dńa $1',
-'revision-info'       => 'Wersyjo s dńa $1; $2',
-'previousrevision'    => '� popředńo wersyjo',
-'nextrevision'        => 'Nastympno wersyjo→',
-'currentrevisionlink' => 'Aktualno wersyjo',
-'cur'                 => 'bjež.',
-'next'                => 'nastympno',
-'last'                => 'popÅ™.',
-'page_first'          => 'po�ůnek',
-'page_last'           => 'kůńec',
-'histlegend'          => 'Wybůr růžńic do porůwnańo: postow kropki we boksach a naćiś enter abo knefel na dole.<br />
+'viewpagelogs'           => 'Uobo� rejery uoperacyji lo tyj zajty',
+'nohistory'              => 'Ta zajta ńy mo swojij historyje sprowjyń.',
+'currentrev'             => 'Aktualno wersyjo',
+'currentrev-asof'        => 'Aktualno wersyjo na dźyń $1',
+'revisionasof'           => 'Wersyjo s dńa $1',
+'revision-info'          => 'Wersyjo s dńa $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� starszo wersyjo',
+'nextrevision'           => 'Nastympno wersyjo→',
+'currentrevisionlink'    => 'Aktualno wersyjo',
+'cur'                    => 'bjež.',
+'next'                   => 'nastympno',
+'last'                   => 'popÅ™.',
+'page_first'             => 'po�ůnek',
+'page_last'              => 'kůńec',
+'histlegend'             => 'Wybůr růžńic do porůwnańo: postow kropki we boksach a naćiś enter abo knefel na dole.<br />
 Legynda: (bjež.) - růžńice s wersyjům bježůncům, (popř.) - růžńice s wersyjům popředzajůncům, d - drobne zmjany',
-'deletedrev'          => '[wyćepano]',
-'histfirst'           => 'uod po�ůnku',
-'histlast'            => 'uod uostatka',
-'historysize'         => '({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtůw}})',
-'historyempty'        => '(pusto)',
+'history-fieldset-title' => 'Přeglůndej historyjo',
+'deletedrev'             => '[wyćepano]',
+'histfirst'              => 'uod po�ůnku',
+'histlast'               => 'uod uostatka',
+'historysize'            => '({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtůw}})',
+'historyempty'           => '(pusto)',
 
 # Revision feed
-'history-feed-title'          => 'Historyjo wersyje',
+'history-feed-title'          => 'Gyszichta wersyjůw',
 'history-feed-description'    => 'Historyjo wersyje tyj zajty wiki',
 'history-feed-item-nocomment' => '$1 uo $2', # user at time
 'history-feed-empty'          => 'Wybrano zajta ńy istńije.
@@ -731,6 +751,7 @@ Inkśi admińistratoři {{GRAMMAR:D.lp|{{SITENAME}}}} dali bydům mjeć dostymp
 'mergehistory-invalid-destination' => 'Zajta docelowo muśi mjeć poprowne mjano.',
 'mergehistory-autocomment'         => 'Historyjo [[:$1]] scalono ze [[:$2]]',
 'mergehistory-comment'             => 'Historyjo [[:$1]] pouůn�ůno ze [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Zajta zdřuduowo a docelowo ńy mogům być te same.',
 
 # Merge log
 'mergelog'           => 'Pouůn�ůne',
@@ -743,124 +764,205 @@ Inkśi admińistratoři {{GRAMMAR:D.lp|{{SITENAME}}}} dali bydům mjeć dostymp
 'difference'              => '(Růžńice mjyndzy škryflańami)',
 'lineno'                  => 'Lińja $1:',
 'compareselectedversions' => 'porůwnej wybrane wersyje',
+'visualcomparison'        => 'Porůwnońy treśći',
+'wikicodecomparison'      => 'Porůwnońy wikiteksta',
 'editundo'                => 'cofej',
 'diff-multi'              => '(Ńy pokozano {{PLURAL:$1|jydnyj wersyji postředńij|$1 wersyji postředńich}}.)',
+'diff-movedto'            => 'přećepano do $1',
+'diff-styleadded'         => 'dodano styl: $1',
+'diff-added'              => 'dodano $1',
+'diff-changedto'          => 'zmjyńůno na $1',
+'diff-movedoutof'         => 'překludzůne s $1',
+'diff-styleremoved'       => 'wyćepano styl: $1',
+'diff-removed'            => 'wyćepano $1',
+'diff-changedfrom'        => 'zmjyńůno s $1',
+'diff-src'                => 'zdřuduo',
+'diff-withdestination'    => 's přezno�yńym $1',
+'diff-with'               => '&#32;s $1 $2',
+'diff-with-final'         => '&#32;a $1 $2',
+'diff-width'              => 'šyřka',
+'diff-height'             => 'wysokość',
+'diff-p'                  => "'''paragraf'''",
+'diff-blockquote'         => "'''cytot'''",
+'diff-h1'                 => "'''naguůwek (poźům 1)'''",
+'diff-h2'                 => "'''naguůwek (poźům 2)'''",
+'diff-h3'                 => "'''naguůwek (poźům 3)'''",
+'diff-h4'                 => "'''naguůwek (poźům 4)'''",
+'diff-h5'                 => "'''naguůwek (poźům 5)'''",
+'diff-pre'                => "'''tekst preformatowany'''",
+'diff-div'                => "'''dźelyńe'''",
+'diff-ul'                 => "'''ńyupořůndkowano lista'''",
+'diff-ol'                 => "'''upořůndkowano lista'''",
+'diff-li'                 => "'''elymynt listy'''",
+'diff-table'              => "'''tabůlka'''",
+'diff-tbody'              => "'''zawartość tabůlki'''",
+'diff-tr'                 => "'''wjyrš'''",
+'diff-td'                 => "'''komůrka'''",
+'diff-th'                 => "'''naguůwek'''",
+'diff-br'                 => "'''přerwa'''",
+'diff-hr'                 => "'''lińja poźůmo'''",
+'diff-code'               => "'''blok kodu'''",
+'diff-dl'                 => "'''lista defińicyji'''",
+'diff-dt'                 => "'''termin we defińicyji'''",
+'diff-dd'                 => "'''defińicyjo'''",
+'diff-input'              => "'''wkludzańe'''",
+'diff-form'               => "'''formulaÅ™'''",
+'diff-img'                => "'''grafika'''",
+'diff-span'               => "'''uodstymp'''",
+'diff-a'                  => "'''link'''",
+'diff-i'                  => "'''kursywa'''",
+'diff-b'                  => "'''pogrubjyńy'''",
+'diff-strong'             => "'''rube buchštaby'''",
+'diff-em'                 => "'''podkreślyńy'''",
+'diff-font'               => "'''�ćůnka'''",
+'diff-big'                => "'''pogrubjyńy'''",
+'diff-del'                => "'''wyćepane'''",
+'diff-tt'                 => "'''naprawjůno šyřka'''",
+'diff-sub'                => "'''indeks spodńi'''",
+'diff-sup'                => "'''indeks wjyrchńi'''",
+'diff-strike'             => "'''překreślyńy'''",
 
 # Search results
-'searchresults'             => 'Wyńiki šnupańo',
-'searchresulttext'          => 'Coby dowjydźeć śe wjyncyj uo šnupańu w {{GRAMMAR:D.lp|{{SITENAME}}}}, uobezdřij [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Wyńiki šnupańo za "[[:$1]]"
+'searchresults'                    => 'Wyńiki šnupańo',
+'searchresults-title'              => 'Wyniki sznupańo za „$1�',
+'searchresulttext'                 => 'Coby dowjydźeć śe wjyncyj uo šnupańu w {{GRAMMAR:D.lp|{{SITENAME}}}}, uobezdřij [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Wyńiki šnupańo za "[[:$1]]"
 ([[Special:Prefixindex/$1|zajty kere za�ynajům śe uod „$1�]] |
 [[Special:WhatLinksHere/$1|zajty kere sům adresowane do „$1�]])',
-'searchsubtitleinvalid'     => 'Lo zapytańo "$1"',
-'noexactmatch'              => "'''Ńy mo sam zajtůw nazwanych \"\$1\".'''
+'searchsubtitleinvalid'            => 'Lo zapytańo "$1"',
+'noexactmatch'                     => "'''Ńy mo sam zajtůw nazwanych \"\$1\".'''
 Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
-'noexactmatch-nocreate'     => "'''Ńy mo sam zajty uo mjańe \"\$1\".'''",
-'toomanymatches'            => 'Za dužo elymyntůw kere pasujům do wzorca, wćep inkše zapytańy',
-'titlematches'              => 'Znejdźono we titlach:',
-'notitlematches'            => 'Ńy znejdźono we titlach',
-'textmatches'               => 'Znejdźono na zajtach:',
-'notextmatches'             => 'Ńy znejdźono we tekście zajtůw',
-'prevn'                     => 'popředńe $1',
-'nextn'                     => 'nastympne $1',
-'viewprevnext'              => 'Uobezdřij ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 suowo|$2 suowa|$2 suůw}})',
-'search-result-score'       => 'Akuratność: $1%',
-'search-redirect'           => '(překerowańy $1)',
-'search-section'            => '(tajla $1)',
-'search-suggest'            => 'Mjoužeś na myśli: $1 ?',
-'search-interwiki-caption'  => 'Śostřane projekty',
-'search-interwiki-default'  => '$1 wyńiki:',
-'search-interwiki-more'     => '(wjyncyj)',
-'search-mwsuggest-enabled'  => 'ze sůgestyjůma',
-'search-mwsuggest-disabled' => 'ńy mo sůgestyji',
-'search-relatedarticle'     => 'Podane',
-'mwsuggest-disable'         => 'Wyuůn� sůgestyje AJAX',
-'searchrelated'             => 'podane',
-'searchall'                 => 'wšyjske',
-'showingresults'            => "To lista na keryj je {{PLURAL:$1|'''1''' wyńik|'''$1''' wyńikůw}}, po�ynojůnc uod nůmeru '''$2'''.",
-'showingresultsnum'         => "To lista na keryj je {{PLURAL:$3|'''1''' wyńik|'''$3''' wyńikůw}}, po�ynojůnc uod nůmeru '''$2'''.",
-'showingresultstotal'       => "Půńižej znojdujům śe wyńiki šnupańo '''$1 - $2''' ze '''$3'''",
-'nonefound'                 => "'''Dej pozůr''': Důmyślńy přešukiwane sům ino ńykere přestřyńy mjan. Poprůbuj popředźić wyšukiwano fraza předrostkym ''all:'', co spowoduje přešukańy coukij zawartośći {{GRAMMAR:D.lp|{{SITENAME}}}} (wůun�ńy ze zajtami godki, šablůnůma atp.), abo poprůbuj užyć kej předrostka wybranyj, jydnyj přestřyńi mjan.",
-'powersearch'               => 'Šnupańy zaawansowane',
-'powersearch-legend'        => 'Šnupańy zaawansowane',
-'powersearch-ns'            => 'Šnupej we přestřyńach mjan:',
-'powersearch-redir'         => 'Pokož překerowańa',
-'powersearch-field'         => 'Å nupej',
-'search-external'           => 'Šnupańy zewnyntřne',
-'searchdisabled'            => 'Šnupańy we {{GRAMMAR:MS.lp|{{SITENAME}}}} zostouo zawarte. Zańim go zouůn�ům, možeš sprůbować šnupańo bez Google. Ino zauwaž, co informacyje uo treśći {{GRAMMAR:MS.lp|{{SITENAME}}}} můgům być we Google ńyakuratne.',
+'noexactmatch-nocreate'            => "'''Ńy mo sam zajty uo mjańe \"\$1\".'''",
+'toomanymatches'                   => 'Za dužo elymyntůw kere pasujům do wzorca, wćep inkše zapytańy',
+'titlematches'                     => 'Znejdźono we titlach:',
+'notitlematches'                   => 'Ńy znejdźono we titlach',
+'textmatches'                      => 'Znejdźono na zajtach:',
+'notextmatches'                    => 'Ńy znejdźono we tekście zajtůw',
+'prevn'                            => 'popředńe $1',
+'nextn'                            => 'nastympne $1',
+'viewprevnext'                     => 'Uobezdřij ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Uopcyje sznupańo',
+'searchmenu-exists'                => "'''Ńy ma zajty uo mjańy \"[[:\$1]]\" na tyj wiki'''",
+'searchmenu-new'                   => "'''Stwůrz zajta „[[:$1|$1]]� na tyj wiki!'''",
+'searchhelp-url'                   => 'Help:Pomoc',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Przeglůndej zajty kere s anfanga majům tyn przedrostek]]',
+'searchprofile-articles'           => 'Zajty',
+'searchprofile-articles-and-proj'  => 'Wszyjstke zajty projekta',
+'searchprofile-project'            => 'Zajty kere ńy sům we głůwnyj przestrzyńi mjan',
+'searchprofile-images'             => 'Pliki',
+'searchprofile-everything'         => 'Wszyjstko',
+'searchprofile-advanced'           => 'Zaawansowane',
+'searchprofile-articles-tooltip'   => 'Sznupańy we przestrzyńi mjan $1',
+'searchprofile-project-tooltip'    => 'Sznupańy we przestrzyńach mjan $1',
+'searchprofile-images-tooltip'     => 'Sznupańy za plikůma',
+'searchprofile-everything-tooltip' => 'Sznupej we cołkij zawartości (wroz ze zajtami godki)',
+'searchprofile-advanced-tooltip'   => 'Sznupańy we wybranych przestrzyńach mjan',
+'prefs-search-nsdefault'           => 'Domyślńy sznupej we przestrzyńach mjan:',
+'prefs-search-nscustom'            => 'Sznupej we wybranych przestrzyńach mjan:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 suowo|$2 suowa|$2 suůw}})',
+'search-result-score'              => 'Akuratność: $1%',
+'search-redirect'                  => '(překerowańy $1)',
+'search-section'                   => '(tajla $1)',
+'search-suggest'                   => 'Mjoužeś na myśli: $1 ?',
+'search-interwiki-caption'         => 'Śostřane projekty',
+'search-interwiki-default'         => '$1 wyńiki:',
+'search-interwiki-more'            => '(wjyncyj)',
+'search-mwsuggest-enabled'         => 'ze sůgestyjůma',
+'search-mwsuggest-disabled'        => 'ńy mo sůgestyji',
+'search-relatedarticle'            => 'Podane',
+'mwsuggest-disable'                => 'Wyuůn� sůgestyje AJAX',
+'searchrelated'                    => 'podane',
+'searchall'                        => 'wšyjske',
+'showingresults'                   => "To lista na keryj je {{PLURAL:$1|'''1''' wyńik|'''$1''' wyńikůw}}, po�ynojůnc uod nůmeru '''$2'''.",
+'showingresultsnum'                => "To lista na keryj je {{PLURAL:$3|'''1''' wyńik|'''$3''' wyńikůw}}, po�ynojůnc uod nůmeru '''$2'''.",
+'showingresultstotal'              => "Půńižej {{PLURAL:$4|znojduje śe wynik šnupańo numer '''$1''' s '''$3'''|znojdujům śe wyńiki šnupańo '''$1 - $2''' ze '''$3'''}}",
+'nonefound'                        => "'''Dej pozůr''': Důmyślńy přešukiwane sům ino ńykere přestřyńy mjan. Poprůbuj popředźić wyšukiwano fraza předrostkym ''all:'', co spowoduje přešukańy coukij zawartośći {{GRAMMAR:D.lp|{{SITENAME}}}} (wůun�ńy ze zajtami godki, šablůnůma atp.), abo poprůbuj užyć kej předrostka wybranyj, jydnyj přestřyńi mjan.",
+'search-nonefound'                 => 'Ńy ma wynikůw kere społńajům kryterja podane we zapytańu.',
+'powersearch'                      => 'Sznupańy zaawansowane',
+'powersearch-legend'               => 'Šnupańy zaawansowane',
+'powersearch-ns'                   => 'Šnupej we přestřyńach mjan:',
+'powersearch-redir'                => 'Pokož překerowańa',
+'powersearch-field'                => 'Å nupej',
+'search-external'                  => 'Šnupańy zewnyntřne',
+'searchdisabled'                   => 'Šnupańy we {{GRAMMAR:MS.lp|{{SITENAME}}}} zostouo zawarte. Zańim go zouůn�ům, možeš sprůbować šnupańo bez Google. Ino zauwaž, co informacyje uo treśći {{GRAMMAR:MS.lp|{{SITENAME}}}} můgům być we Google ńyakuratne.',
 
 # Preferences page
-'preferences'              => 'Preferyncyje',
-'mypreferences'            => 'Moje preferyncyje',
-'prefs-edits'              => 'Li�ba sprowjyń:',
-'prefsnologin'             => 'Ńy ježeś zalůgowany',
-'prefsnologintext'         => 'Muśiš śe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} zalůgować]</span> coby štalować swoje preferyncyje.',
-'prefsreset'               => 'Preferyncyje důmyślne zostouy uodtwořůne.',
-'qbsettings'               => 'Gurt Å¡ybkigo dostympu',
-'qbsettings-none'          => 'Brak',
-'qbsettings-fixedleft'     => 'Stouy, s lewyj',
-'qbsettings-fixedright'    => 'Stouy, s prawyj',
-'qbsettings-floatingleft'  => 'Unošůncy śe, s lewyj',
-'qbsettings-floatingright' => 'Unošůncy śe, s prawyj',
-'changepassword'           => 'Zmjana hasua',
-'skin'                     => 'Skůrka',
-'math'                     => 'Wzory',
-'dateformat'               => 'Format daty',
-'datedefault'              => 'Důmyślny',
-'datetime'                 => 'Data i �os',
-'math_failure'             => 'Parser ńy můg rozpoznać',
-'math_unknown_error'       => 'Å„yznany feler',
-'math_unknown_function'    => 'Å„yznano funkcyjo',
-'math_lexing_error'        => 'feler leksera',
-'math_syntax_error'        => 'felerno skuadńa',
-'math_image_error'         => 'kůnwersyjo do formatu PNG ńy powjodua śe; uobadej, eli poprawńy zainštalowane sům lotex, dvips, gs i convert',
-'math_bad_tmpdir'          => 'Ńy idźe utwořić abo naškryflać w tym�asowym katalůgu do wzorůw matymaty�nych',
-'math_bad_output'          => 'Ńy idźe utwořić abo naškryflać we wyjśćowym katalůgu do wzorůw matymaty�nych',
-'math_notexvc'             => 'Ńy ma sam texvc; zapoznej śe z math/README w celu kůnfiguracyje.',
-'prefs-personal'           => 'Dane užytkowńika',
-'prefs-rc'                 => 'Půmjyńane na uostatku',
-'prefs-watchlist'          => 'Pozůrlista',
-'prefs-watchlist-days'     => 'Li�ba dńi wido�nych na liśće artikli, na kere dowoš pozůr:',
-'prefs-watchlist-edits'    => 'Li�ba půmjyńań pokazywanych we rozšyřůnyj liśće artiklůw, na kere dowoš pozůr:',
-'prefs-misc'               => 'Roztůmajte',
-'saveprefs'                => 'Naškryflej',
-'resetprefs'               => 'Preferencyje důmyślne',
-'oldpassword'              => 'Stare hasuo',
-'newpassword'              => 'Nowe hasuo',
-'retypenew'                => 'Naškryflej ješ�e roz nowe hasuo:',
-'textboxsize'              => 'Sprowjańy',
-'rows'                     => 'Wjerše:',
-'columns'                  => 'Kůlumny:',
-'searchresultshead'        => 'Šnupańy',
-'resultsperpage'           => 'Li�ba wyńikůw na zajće',
-'contextlines'             => 'Pjyrše wjerše artikla',
-'contextchars'             => 'Buchštaby kůnteksta we lińijce',
-'stub-threshold'           => 'Maksymalny rozmjar artikla uozna�anygo kej <a href="#" class="stub">stub (kůnsek)</a>',
-'recentchangesdays'        => 'Li�ba dńi do pokazańo we půmjyńanych na uostatku:',
-'recentchangescount'       => 'Li�ba pozycyji na liśće půmjyńanych na uostatku, we historyje zajtůw a zajtach rejerůw:',
-'savedprefs'               => 'Twoje štalowańo we preferyncyjach zostouy naškryflane.',
-'timezonelegend'           => 'Strefa �asowo',
-'timezonetext'             => '¹Podej uo wjela godźin růžńi śe Twůj �as uod ůńiwersalnygo (UTC).',
-'localtime'                => 'Twůj �as:',
-'timezoneoffset'           => 'Dyferencyjo ¹',
-'servertime'               => 'Aktualny �as serwera',
-'guesstimezone'            => 'Pobjer z přeglůndarki',
-'allowemail'               => 'Inkśi užytkowńicy můgům přesyuać mje e-brify',
-'prefs-searchoptions'      => 'Uopcyje šnupańo',
-'prefs-namespaces'         => 'Přystřyńe mjan',
-'defaultns'                => 'Důmyślńy šnupej we nastympujůncych přystřyńach mjan:',
-'default'                  => 'důmyślńy',
-'files'                    => 'Pliki',
+'preferences'               => 'Preferyncyje',
+'mypreferences'             => 'Moje preferyncyje',
+'prefs-edits'               => 'Li�ba sprowjyń:',
+'prefsnologin'              => 'Ńy ježeś zalůgowany',
+'prefsnologintext'          => 'Muśiš śe <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} zalůgować]</span> coby štalować swoje preferyncyje.',
+'prefsreset'                => 'Preferyncyje důmyślne zostouy uodtwořůne.',
+'qbsettings'                => 'Gurt Å¡ybkigo dostympu',
+'qbsettings-none'           => 'Brak',
+'qbsettings-fixedleft'      => 'Stouy, s lewyj',
+'qbsettings-fixedright'     => 'Stouy, s prawyj',
+'qbsettings-floatingleft'   => 'Unošůncy śe, s lewyj',
+'qbsettings-floatingright'  => 'Unošůncy śe, s prawyj',
+'changepassword'            => 'Zmjana hasua',
+'skin'                      => 'Skůrka',
+'skin-preview'              => 'podglůnd',
+'math'                      => 'Wzory',
+'dateformat'                => 'Format daty',
+'datedefault'               => 'Důmyślny',
+'datetime'                  => 'Data a czas',
+'math_failure'              => 'Parser ńy můg rozpoznać',
+'math_unknown_error'        => 'Å„yznany feler',
+'math_unknown_function'     => 'Å„yznano funkcyjo',
+'math_lexing_error'         => 'feler leksera',
+'math_syntax_error'         => 'felerno skuadńa',
+'math_image_error'          => 'kůnwersyjo do formatu PNG ńy powjodua śe; uobadej, eli poprawńy zainštalowane sům lotex, dvips, gs i convert',
+'math_bad_tmpdir'           => 'Ńy idźe utwořić abo naškryflać w tym�asowym katalůgu do wzorůw matymaty�nych',
+'math_bad_output'           => 'Ńy idźe utwořić abo naškryflać we wyjśćowym katalůgu do wzorůw matymaty�nych',
+'math_notexvc'              => 'Ńy ma sam texvc; zapoznej śe z math/README w celu kůnfiguracyje.',
+'prefs-personal'            => 'Dane užytkowńika',
+'prefs-rc'                  => 'Ńydowno pomjyńane',
+'prefs-watchlist'           => 'Pozůrlista',
+'prefs-watchlist-days'      => 'Li�ba dńi wido�nych na liśće artikli, na kere dowoš pozůr:',
+'prefs-watchlist-days-max'  => '(maksimum 7 dńi)',
+'prefs-watchlist-edits'     => 'Li�ba půmjyńań pokazywanych we rozšyřůnyj liśće artiklůw, na kere dowoš pozůr:',
+'prefs-watchlist-edits-max' => '(maksymalno liczba: 1000)',
+'prefs-misc'                => 'Roztůmajte',
+'prefs-resetpass'           => 'Zmjyń hasło',
+'saveprefs'                 => 'Naškryflej',
+'resetprefs'                => 'Preferencyje důmyślne',
+'textboxsize'               => 'Sprowjańy',
+'prefs-edit-boxsize'        => 'Rozmjor uokna edycyji.',
+'rows'                      => 'Wjerše:',
+'columns'                   => 'Kůlumny:',
+'searchresultshead'         => 'Šnupańy',
+'resultsperpage'            => 'Li�ba wyńikůw na zajće',
+'contextlines'              => 'Pjyrše wjerše artikla',
+'contextchars'              => 'Buchštaby kůnteksta we lińijce',
+'stub-threshold'            => 'Maksymalny rozmjar artikla uozna�anygo kej <a href="#" class="stub">stub (kůnsek)</a>',
+'recentchangesdays'         => 'Li�ba dńi do pokazańo we půmjyńanych na uostatku:',
+'recentchangesdays-max'     => '(maksymalńy $1 {{PLURAL:$1|dźyń|dńi}})',
+'recentchangescount'        => 'Li�ba pozycyji na liśće půmjyńanych na uostatku, we historyje zajtůw a zajtach rejerůw:',
+'savedprefs'                => 'Twoje štalowańo we preferyncyjach zostouy naškryflane.',
+'timezonelegend'            => 'Strefa �asowo',
+'timezonetext'              => '¹Podej uo wjela godźin růžńi śe Twůj �as uod ůńiwersalnygo (UTC).',
+'localtime'                 => 'Lokalny czas:',
+'timezoneselect'            => 'Sztrefa czasowo:',
+'timezoneuseserverdefault'  => 'Użyj domyślnygo czasu serwera',
+'timezoneuseoffset'         => 'Inkszo (uokryśl różnica czasu)',
+'timezoneoffset'            => 'Dyferencyjo ¹:',
+'servertime'                => 'Czas serwera:',
+'guesstimezone'             => 'Pobjer z přeglůndarki',
+'allowemail'                => 'Inkśi užytkowńicy můgům přesyuać mje e-brify',
+'prefs-searchoptions'       => 'Uopcyje šnupańo',
+'prefs-namespaces'          => 'Přystřyńe mjan',
+'defaultns'                 => 'Důmyślńy šnupej we nastympujůncych přystřyńach mjan:',
+'default'                   => 'důmyślńy',
+'files'                     => 'Pliki',
 
 # User rights
 'userrights'                  => 'Zařůndzańy prowami užytkowńikůw', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Zařůndzej prowami užytkownika',
 'userrights-user-editname'    => 'Wklepej sam nazwa užytkowńika:',
 'editusergroup'               => 'Sprowjej grupy užytkowńika',
-'editinguser'                 => "Zmjana uprawńyń užytkowńika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Zmjana uprawńyń užytkowńika '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Sprowjej grupy užytkowńika',
-'saveusergroups'              => 'Naškryflej',
+'saveusergroups'              => 'Zapisz',
 'userrights-groupsmember'     => 'Noležy do:',
 'userrights-groups-help'      => 'Možeš půmjyńać přinoležność tygo užytkowńika do podanych grup.
 *Zazna�ůne pole uozna�o přinoležność užytkowńika do danej grupy.
@@ -884,17 +986,17 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'group-suppress'      => 'Rewizoře',
 'group-all'           => '(wšyjscy)',
 
-'group-user-member'          => 'Užytkowńik',
+'group-user-member'          => 'Sprowjorz',
 'group-autoconfirmed-member' => 'Autůmaty�ńy zatwjerdzůny užytkowńik',
 'group-bot-member'           => 'Bot',
 'group-sysop-member'         => 'Admin',
 'group-bureaucrat-member'    => 'Bjurokrata',
 'group-suppress-member'      => 'Rewizůr',
 
-'grouppage-user'          => '{{ns:project}}:Užytkowńiki',
+'grouppage-user'          => '{{ns:project}}:Sprowjorze',
 'grouppage-autoconfirmed' => '{{ns:project}}:Autůmaty�ńy zatwjerdzyńi užytkowńiki',
 'grouppage-bot'           => '{{ns:project}}:Boty',
-'grouppage-sysop'         => '{{ns:project}}:Admińistratořy',
+'grouppage-sysop'         => '{{ns:project}}:Admińistratory',
 'grouppage-bureaucrat'    => '{{ns:project}}:Bjurokraty',
 'grouppage-suppress'      => '{{ns:project}}:Rewizoře',
 
@@ -907,6 +1009,7 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'right-minoredit'            => 'Uozno� půmjyńańo kej drobne',
 'right-move'                 => 'Přećepane zajty',
 'right-move-subpages'        => 'Přećep zajty wroz s jejich podzajtůma',
+'right-move-rootuserpages'   => 'Překludzańy zajtůw uod užytkowńikůw',
 'right-suppressredirect'     => 'Ńy twůř překerowańo ze starygo mjana jak přećepuješ zajta',
 'right-upload'               => 'Wćepane pliki',
 'right-reupload'             => 'Nadpisuj pliki kere sam juž sům wćepane',
@@ -927,7 +1030,7 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'right-undelete'             => 'Wćepej nazod wyćepano zajta',
 'right-suppressrevision'     => 'Přyglůndańy i uodtwařańy sprowjyń schrůńůnych před admińistratorami',
 'right-suppressionlog'       => 'Pokož prywatne lůgi',
-'right-block'                => 'Zawřij sprowjyńo inkšym užytkowńikům',
+'right-block'                => 'Zawjyrańy sprowjorzům możebnośći edytowańo',
 'right-blockemail'           => 'Zablokuj užytkowńikowi wysyuańy e-brifůw',
 'right-hideuser'             => 'Zablokuj mjano užytkowńika i schrůń to před publi�nym dostympym',
 'right-ipblock-exempt'       => 'Uobejdź zawarća uod sprowjyń do IP, autozawarća i zawarća zakresůw',
@@ -957,9 +1060,45 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'rightslogentry' => 'půmjyńiu/a uprawńyńo užytkowńika $1 ($2 → $3)',
 'rightsnone'     => 'podstawowo',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'přeglůndańo tyj zajty',
+'action-edit'                 => 'sprowjańo tyj zajty',
+'action-createpage'           => 'twořyńo zajtůw',
+'action-createtalk'           => 'twořyńo zajtůw godki',
+'action-createaccount'        => 'utwořyńo tygo kůnta užytkowńika',
+'action-minoredit'            => 'do uozna�yńo tygo sprowjyńo kej drobne půmjyńańe',
+'action-move'                 => 'přećepańe tyj zajty',
+'action-move-subpages'        => 'přećepańo tyj zajty uoroz s jeij podzajtůma',
+'action-move-rootuserpages'   => 'Překludzańy zajtůw uod užytkowńikůw (nale bes jeich podzajtůw)',
+'action-upload'               => 'wćepńyńćo tygo plika',
+'action-reupload'             => 'nadpisańo tygo plika',
+'action-reupload-shared'      => 'nadpisańo tygo plika we wspůlnym repozytorjům',
+'action-upload_by_url'        => 'wćepańo tygo plika s adresa URL',
+'action-writeapi'             => 'naškryflańo bez interfejs API',
+'action-delete'               => 'wyćepańo tyj zajty',
+'action-deleterevision'       => 'wyćepańo tyj wersyje',
+'action-deletedhistory'       => 'wejzdřyńo we historyjo wyćepań tyj zajty',
+'action-browsearchive'        => 'šnupańo za wyćepanymi zajtami',
+'action-undelete'             => 'wćepańo nazod tyj zajty',
+'action-suppressrevision'     => 'podglůndu a wćepańo nazod tyj wersyje schrůńůnyj',
+'action-suppressionlog'       => 'podglůndu rejera schrůńańo',
+'action-block'                => 'zawarća uod sprowjyń tygo spowjořa',
+'action-protect'              => 'půmjyńań poźůmu zawarćo tyj zajty',
+'action-import'               => 'importu tyj zajty s inkšyj wiki',
+'action-importupload'         => 'importu tyj zajty bez wćepańe plika',
+'action-patrol'               => 'ozna�yńo sprowjyńo kej „sprowdzůne�',
+'action-autopatrol'           => 'uozna�yńo wuasnygo sprowjyńo kej „sprawdzonygo�',
+'action-unwatchedpages'       => 'podglůndu listy zajtůw na kere ńikt ńy dowo pozoru',
+'action-trackback'            => 'wysyuańo trackbacka',
+'action-mergehistory'         => 'skuplowańo historyje sprowjyń tyj zajty',
+'action-userrights'           => 'sprowjańo uprowńyń wšyjstkich sprowjořy',
+'action-userrights-interwiki' => 'sprowjańo uprowńyń sprowjořy na inkšych witrynach wiki',
+'action-siteadmin'            => 'zawarćo a uodymkńyńćo bazy danych',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|pomjyńańe|pomjyńańa|pomjyńań}}',
-'recentchanges'                     => 'Půmjyńane na uostatku',
+'recentchanges'                     => 'Ńydowno pomjyńane',
+'recentchanges-legend'              => 'Uopcyje půmjyńanych na uostatku',
 'recentchangestext'                 => 'Ta zajta předstawjo historyjo uostatńich půmjyńań na tyj wiki',
 'recentchanges-feed-description'    => 'Dowej pozůr na půmjyńane na uostatku na tyj wiki.',
 'rcnote'                            => "Půńižej {{PLURAL:$1|pokozano uostatńo zmjano dokůnano|pokazano uostatńy '''$1''' zmjany naškryflane|pokozano uostatńich '''$1''' škryflań zrobjůnych}} bez {{PLURAL:$2|uostatńi dźyń|uostatńich '''$2''' dńi}}, za�ynojůnc uod $5 dńa $4.",
@@ -970,12 +1109,12 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'rcshowhideliu'                     => '$1 zalůgowanych užytkowńikůw',
 'rcshowhideanons'                   => '$1 anůńimowych',
 'rcshowhidepatr'                    => '$1 na kere dowomy pozůr',
-'rcshowhidemine'                    => '$1 bezy mje sprowjůne',
+'rcshowhidemine'                    => '$1 uody mje sprowjůne',
 'rclinks'                           => 'Pokož uostatńe $1 sprowjyń bez uostatńe $2 dńi.<br />$3',
-'diff'                              => 'dyf',
-'hist'                              => 'hist',
+'diff'                              => 'růż.',
+'hist'                              => 'gysz.',
 'hide'                              => 'schrůń',
-'show'                              => 'Pokož',
+'show'                              => 'Pokoż',
 'minoreditletter'                   => 'd',
 'newpageletter'                     => 'N',
 'boteditletter'                     => 'b',
@@ -983,9 +1122,11 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'rc_categories'                     => 'Uůgrańi� do katygorii (oddźelej za půmocům "|")',
 'rc_categories_any'                 => 'WÅ¡yskie',
 'newsectionsummary'                 => '/* $1 */ nowo tajla',
+'rc-enhanced-expand'                => 'Pokož š�ygůuy (wymogo JavaScript)',
+'rc-enhanced-hide'                  => 'Schrůń š�ygůuy',
 
 # Recent changes linked
-'recentchangeslinked'          => 'Pomjéńane w adrésowanych',
+'recentchangeslinked'          => 'Pomjyńańa we adresowanych',
 'recentchangeslinked-title'    => 'Pomjyńyńo w adrésowanych s "$1"',
 'recentchangeslinked-noresult' => 'Nikt nic niy pomjyńoł w dolinkowanych bez �as uo kery žeś pytou.',
 'recentchangeslinked-summary'  => "To je ekstra zajta, na kerej možeš uobo�yć zmjany w artiklach adresowanych do podanyj zajty.
@@ -995,9 +1136,9 @@ Artikle na [[Special:Watchlist|pozorliśće]] sům '''rube'''.",
 'recentchangeslinked-to'       => 'Pokož pomjyńańa na zajtach adresowanych do podany zajty',
 
 # Upload
-'upload'                      => 'Wćepnij plik',
-'uploadbtn'                   => 'Wćepnij sam plik',
-'reupload'                    => 'Wćepnij zaś',
+'upload'                      => 'Wćepej plik',
+'uploadbtn'                   => 'Wćepej sam plik',
+'reupload'                    => 'Wćepej zaś',
 'reuploaddesc'                => 'Nazod do formulařa uod wćepywańo.',
 'uploadnologin'               => 'Ńy jest žeś zalogůwany',
 'uploadnologintext'           => 'Muśyš śe [[Special:UserLogin|zalůgować]] ńim wćepńeš pliki.',
@@ -1005,11 +1146,11 @@ Artikle na [[Special:Watchlist|pozorliśće]] sům '''rube'''.",
 'upload_directory_read_only'  => 'Serwer ńy može škryflać do katalůgu ($1) kery je přezna�ůny na wćepywane pliki.',
 'uploaderror'                 => 'Feler při wćepywańu',
 'uploadtext'                  => "Ůžyj formulařa půńižej do wćepywańo plikůw.
-Jak chceš přejřeć dotych�as wćepane pliki, abo w ńich šnupać, přeńdź do [[Special:ImageList|listy douůn�ůnych plikůw]]. Wšyjstke wćepańo uodnotowane sům we [[Special:Log/upload|rejeře přesůuanych plikůw]], a jygo wyćepańy we [[Special:Log/delete|rejeře wyćepanych]].
+Jak chceš přejřeć dotych�as wćepane pliki, abo w ńich šnupać, přeńdź do [[Special:FileList|listy douůn�ůnych plikůw]]. Wšyjstke wćepańo uodnotowane sům we [[Special:Log/upload|rejeře přesůuanych plikůw]], a jygo wyćepańy we [[Special:Log/delete|rejeře wyćepanych]].
 
 Plik pojawi śe na zajće, jak užyješ linka wedle jydnygo s nastympujůncych wzorůw:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Plik.jpg]]</nowiki>''' pokože plik we pounyj postaći,
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Plik.png|tekst uopisu]]</nowiki>''' pokože šyroko na 200 pikseli mińjaturka umjyš�ůno při lewym margineśe, uoto�ůno bez ramka, s podpisym „podpis grafiki�
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Plik.jpg]]</nowiki>''' pokože plik we pounyj postaći,
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Plik.png|tekst uopisu]]</nowiki>''' pokože šyroko na 200 pikseli mińjaturka umjyš�ůno při lewym margineśe, uoto�ůno bez ramka, s podpisym „podpis grafiki�
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Plik.ogg]]</nowiki>''' dowo bezpostředńi link do plika ńy pokozujůnc go.",
 'upload-permitted'            => 'Dopuš�alne formaty plikůw: $1.',
 'upload-preferred'            => 'Zalecane formaty plikůw: $1.',
@@ -1017,7 +1158,7 @@ Plik pojawi śe na zajće, jak užyješ linka wedle jydnygo s nastympujůncych w
 'uploadlog'                   => 'Wykoz wćepywań',
 'uploadlogpage'               => 'Wćepane sam',
 'uploadlogpagetext'           => 'Půńižej znojdowo śe lista plikůw wćepanych na uostatku.
-Přelyź na zajta [[Special:NewImages|galeryje nowych plikůw]], coby uobejzdřeć pliki kej mińjatůrki.',
+Přelyź na zajta [[Special:NewFiles|galeryje nowych plikůw]], coby uobejzdřeć pliki kej mińjatůrki.',
 'filename'                    => 'Mjano pliku',
 'filedesc'                    => 'Uopis',
 'fileuploadsummary'           => 'Uopis:',
@@ -1037,22 +1178,23 @@ Přelyź na zajta [[Special:NewImages|galeryje nowych plikůw]], coby uobejzdře
 'large-file'                  => 'Zaleco śe coby rozmjar plika ńy bůu wjynkšy jak $1 bajtůw. Tyn plik mo rozmjar $2 bajtůw.',
 'largefileserver'             => 'Plik je wjynkšy ńiž maksymalny dozwolůny rozmjar.',
 'emptyfile'                   => 'Wćepywany plik cheba je pusty. Može to być bez tůž, co žeś wklepou zuo buchštaba w jygo mjańe. Sprowdź, �y mjano kere žeś wklepou je poprawne.',
-'fileexists'                  => 'Plik uo takym mjańe juž je sam wćepany! Wćepańe nowyj grafiki ńyodwracalńe wyćepńe ta kero sam juž je wćepano (<strong><tt>$1</tt></strong>)! Sprowdź �y žeś je pewny co chceš tyn plik sam wćepać.',
-'filepageexists'              => 'Je juž sam zajta uopisu tygo plika utwořůno <strong><tt>$1</tt></strong>, ino ńy ma terozki plika uo tym mjańy. Informacyje uo pliku, kere žeś wćepou, ńy bydům pokozane na zajće uopisu. Jakbyś chćou coby te informacyje zostouy pokozane, muśyš jeich sprowjać ryn�ńy.',
-'fileexists-extension'        => 'Plik uo podobnym mjańe juž sam je:<br />
-Mjano wćepywanygo plika: <strong><tt>$1</tt></strong><br />
-Mjano plika kery juž sam je: <strong><tt>$2</tt></strong><br />
-Wybjer proša inkše mjano.',
+'fileexists'                  => "Plik uo takym mjańe juž je sam wćepany! Wćepańe nowyj grafiki ńyodwracalńe wyćepńe ta kero sam juž je wćepano ('''<tt>$1</tt>''')! Sprowdź �y žeś je pewny co chceš tyn plik sam wćepać.",
+'filepageexists'              => "Je juž sam zajta uopisu tygo plika utwořůno '''<tt>$1</tt>''', ino ńy ma terozki plika uo tym mjańy. Informacyje uo pliku, kere žeś wćepou, ńy bydům pokozane na zajće uopisu. Jakbyś chćou coby te informacyje zostouy pokozane, muśyš jeich sprowjać ryn�ńy.",
+'fileexists-extension'        => "Plik uo podobnym mjańe juž sam je:<br />
+Mjano wćepywanygo plika: '''<tt>$1</tt>'''<br />
+Mjano plika kery juž sam je: '''<tt>$2</tt>'''<br />
+Wybjer proša inkše mjano.",
 'fileexists-thumb'            => "<center>'''Istniejůnco grafika'''</center>",
-'fileexists-thumbnail-yes'    => 'Zdowo śe co tyn plik je půmńijšůnům wersyjom grafiki <i>(mińjaturkom)</i>. Uobejřij plik: <strong><tt>$1</tt></strong>.<br />
-Jak to je ta sama grafika, ino wjelgo, ńy muśiš juž jei sam zaś wćepywać.',
-'file-thumbnail-no'           => 'Mjano plika za�yno śe uod <strong><tt>$1</tt></strong>. Zdowo śe, co to je půmńijšůna grafika <i>(mińaturka)</i>.
+'fileexists-thumbnail-yes'    => "Zdowo śe co tyn plik je půmńijšůnům wersyjom grafiki ''(mińjaturkom)''. Uobejřij plik: '''<tt>$1</tt>'''.<br />
+Jak to je ta sama grafika, ino wjelgo, ńy muśiš juž jei sam zaś wćepywać.",
+'file-thumbnail-no'           => "Mjano plika za�yno śe uod '''<tt>$1</tt>'''. Zdowo śe, co to je půmńijšůna grafika ''(mińaturka)''.
 Jak moš ta grafika we peunym rozmjaře - wćepej ja sam.
-Jak chceš wćepać ta, bydźeš muśou zmjyńić mjano wćepywanygo terozki plika.',
-'fileexists-forbidden'        => 'Plik uo takym mjańy juž sům můmy! Idź nazod i wćepej tyn plik pod inkšym mjanym. [[Image:$1|thumb|center|$1]]',
+Jak chceš wćepać ta, bydźeš muśou zmjyńić mjano wćepywanygo terozki plika.",
+'fileexists-forbidden'        => 'Plik uo takym mjańy juž sům můmy! Idź nazod i wćepej tyn plik pod inkšym mjanym. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Plik uo takym mjańe juž je wćepany na wspůlne repozytorjům plikůw.
-Idź nazod i wćepej tyn plik pod inkšym mjanym. [[Image:$1|thumb|center|$1]]',
+Idź nazod i wćepej tyn plik pod inkšym mjanym. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Tyn plik je kopjům {{PLURAL:$1|plika|nastypujůncych plikůw:}}',
+'file-deleted-duplicate'      => 'Identyczny plik jak tyn plik ([[$1]]) zostoł wyćepany. Sprowdź historyja wyćepań tamtygo plika ńim wćepńesz go nazod.',
 'successfulupload'            => 'Wćepańe plika udouo śe',
 'uploadwarning'               => 'Uostřežyńe uo wćepywańu',
 'savefile'                    => 'Naškryflej plik',
@@ -1072,7 +1214,7 @@ Idź nazod i wćepej tyn plik pod inkšym mjanym. [[Image:$1|thumb|center|$1]]',
 
 Zastanůw śe, �y powinno śe go sam wćepywać.
 Rejer wyćepań tygo plika je podany půńižej, cobyś miou wygoda:",
-'filename-bad-prefix'         => 'Mjano plika, kery wćepuješ, za�yno śe uod <strong>"$1"</strong> &ndash; je to mjano noj�ynśćy připisywane autůmaty�ńy bez cyfrowe fotoaparaty, uůno ńy dowo žodnych informacyji uo zawartośći plika. Prošymy cobyś nadou plikowi inkše, lepij zrozůmjaue mjano.',
+'filename-bad-prefix'         => "Mjano plika, kery wćepuješ, za�yno śe uod '''\"\$1\"''' &ndash; je to mjano noj�ynśćy připisywane autůmaty�ńy bez cyfrowe fotoaparaty, uůno ńy dowo žodnych informacyji uo zawartośći plika. Prošymy cobyś nadou plikowi inkše, lepij zrozůmjaue mjano.",
 
 'upload-proto-error'      => 'Ńyprowiduowy protokůu',
 'upload-proto-error-text' => 'Zdalne přesůuańy plikůw wymago podańo adresu URL kery za�yno śe na <code>http://</code> abo <code>ftp://</code>.',
@@ -1093,18 +1235,18 @@ Rejer wyćepań tygo plika je podany půńižej, cobyś miou wygoda:",
 'upload_source_url'  => ' (poprowny, publi�ńy dostympny URL)',
 'upload_source_file' => ' (plik na twojym komputře)',
 
-# Special:ImageList
-'imagelist-summary'     => 'To je ekstra zajta na kery sům pokazywane wšyske pliki wćepane na serwer. Důmyślńy na wiyrchu listy wyśwjetlajům śe pliki wćepane na uostatku. Coby půmjyńić sposůb sortowańo, klikńij na naguůwek kolůmny.',
-'imagelist_search_for'  => 'Šnupej za grafikům uo mjańe:',
+# Special:ListFiles
+'listfiles-summary'     => 'To je ekstra zajta na kery sům pokazywane wšyske pliki wćepane na serwer. Důmyślńy na wiyrchu listy wyśwjetlajům śe pliki wćepane na uostatku. Coby půmjyńić sposůb sortowańo, klikńij na naguůwek kolůmny.',
+'listfiles_search_for'  => 'Šnupej za grafikům uo mjańe:',
 'imgfile'               => 'plik',
-'imagelist'             => 'Lista plikůw',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Mjano',
-'imagelist_user'        => 'Užytkowńik',
-'imagelist_size'        => 'Rozmior (bajty)',
-'imagelist_description' => 'Uopis',
-
-# Image description page
+'listfiles'             => 'Lista plikůw',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Mjano',
+'listfiles_user'        => 'Užytkowńik',
+'listfiles_size'        => 'Rozmior (bajty)',
+'listfiles_description' => 'Uopis',
+
+# File description page
 'filehist'                       => 'Historjo pliku',
 'filehist-help'                  => 'Klikńij na data/�as, coby uobejřeć plik taki jak wtedy wyglůndou.',
 'filehist-deleteall'             => 'wyćep wšyskie',
@@ -1112,12 +1254,18 @@ Rejer wyćepań tygo plika je podany půńižej, cobyś miou wygoda:",
 'filehist-revert'                => 'cofej',
 'filehist-current'               => 'aktůalny',
 'filehist-datetime'              => 'Data/�as',
+'filehist-thumb'                 => 'Mińjaturka',
+'filehist-thumbtext'             => 'Mińjaturka wersyje s $1',
+'filehist-nothumb'               => 'Ńy ma mińjaturki',
 'filehist-user'                  => 'Užytkowńyk',
 'filehist-dimensions'            => 'Wymiary',
 'filehist-filesize'              => 'Rozmior plika',
 'filehist-comment'               => 'Komyntorz',
 'imagelinks'                     => 'Co sam linkuje',
 'linkstoimage'                   => '{{PLURAL:$1|Nastympujůnco zajta jeadrésowano|Nastympujůnce zajty sům adrésowane}} do tygo plika:',
+'linkstoimage-more'              => 'Wjyncyj jak $1 {{PLURAL:$1|zajta je adresowano|zajty sům adresowane|zajtůw je adresowanych}} do tygo plika.
+Půńižšo lista pokozuje yno {{PLURAL:$1|pjyršy link|pjyrše $1 linki|pjyršych $1 linkůw}} do tygo plika.
+Dostympno je tyž [[Special:WhatLinksHere/$2|pouno lista]].',
 'nolinkstoimage'                 => 'Žodno zajta ńy je adrésowano do tygo plika.',
 'morelinkstoimage'               => 'Pokož [[Special:WhatLinksHere/$1|wjyncy uodnośnikůw]] do tygo plika.',
 'redirectstofile'                => '{{PLURAL:$1|Nastympujůncy plik překerowuje|Nastympujůnce pliki překerowujům}} ku tymu plikowi:',
@@ -1156,7 +1304,6 @@ Rejer wyćepań tygo plika je podany půńižej, cobyś miou wygoda:",
 'filedelete-success-old'      => "Wyćepano plik '''[[Media:$1|$1]]''' we wersyje ze $3, $2.",
 'filedelete-nofile'           => "Plika '''$1''' Å„y ma.",
 'filedelete-nofile-old'       => "Ńy ma sam zarchiwizowanyj wersje '''$1''' o atrybutach jake žeś podou.",
-'filedelete-iscurrent'        => 'Průbuješ wyćepać nojnowšo wersyjo tygo plika. Muśyš wpjyrw přiwrůćić staršo wersyjo.',
 'filedelete-otherreason'      => 'Inkšy powůd:',
 'filedelete-reason-otherlist' => 'Inkszy powůd',
 'filedelete-reason-dropdown'  => '* Noj�ynstše powody wyćepańa
@@ -1183,27 +1330,31 @@ Rejer wyćepań tygo plika je podany půńižej, cobyś miou wygoda:",
 
 # Random page
 'randompage'         => 'Losuj zajta',
-'randompage-nopages' => 'W tej přestřyńi nazw ńy ma žodnych zajtůw.',
+'randompage-nopages' => 'We przestrzyńi mjan "$1" ńy ma żodnych zajtůw.',
 
 # Random redirect
 'randomredirect'         => 'Losowe překerowańy',
-'randomredirect-nopages' => 'W tej přestřyńi nazw ńy ma překerowań.',
+'randomredirect-nopages' => 'We przestrzyńi mjan "$1" ńy ma przekerowań.',
 
 # Statistics
-'statistics'             => 'Statystyka',
-'sitestats'              => 'Statystyki {{SITENAME}}',
-'userstats'              => 'Statystyka užytkowńikůw',
-'sitestatstext'          => "We baźe danych je cuzamyn '''\$1''' {{PLURAL:\$1|zajta|zajty|zajtůw}}.
-
-Ta li�ba uwzglyndńo zajty godki, zajty na tymat {{GRAMMAR:D.lp|{{SITENAME}}}}, zajty prowizory�ne (\"stuby\"), zajty překerowujůnce, a inkše, kere trudno uwažać za artikle. Wůuůn�ajůnc powyžše, je prawdopodobńy '''\$2''' {{PLURAL:\$2|zajta, kero idźe uwažać za artikel|zajty, kere idźe uwažać za artikle|zajtůw, kere idźe uwažać za artikle}}.
-
-Wćepano sam \$8 {{PLURAL:\$8|plik|pliki|plikůw}}.
-
-Uod uruchůmjyńo {{GRAMMAR:D.lp|{{SITENAME}}}} {{PLURAL:\$3|'''1''' raz filowano w zajty|'''\$3''' razy filowano w zajty|bůuo '''\$3''' filowań w zajty}} i wykůnano '''\$4''' {{PLURAL:\$4|sprowjyńy|sprowjyńa|sprowjyń}}. To dowo średńo '''\$5''' {{PLURAL:\$5|sprowjyńy|sprowjyńa|sprowjyń}} na zajta i '''\$6''' {{PLURAL:\$4|filowańy|filowańa|filowań}} na sprawjyńy.
-
-Duůgość [http://www.mediawiki.org/wiki/Manual:Job_queue kolejki zadań] je '''\$7'''.",
-'userstatstext'          => "Je sam {{PLURAL:$1|'''1''' zarejerowany užytkowńik|'''$1''' zarejerowanych užytkowńikůw}}. {{PLURAL:$1|Užytkowńik tyn|Spośrůd ńich '''$2''' ('''$4%''')}} mo status $5.",
-'statistics-mostpopular' => 'Zajty we kere noj�yńśći sam filujom',
+'statistics'                   => 'Statystyka',
+'statistics-header-pages'      => 'Statystyka zajtůw',
+'statistics-header-edits'      => 'Statystyka sprowjyń',
+'statistics-header-views'      => 'Statystyka bezuchůw',
+'statistics-header-users'      => 'Statystyka užytkowńikůw',
+'statistics-articles'          => 'Zajty',
+'statistics-pages'             => 'Zajty',
+'statistics-pages-desc'        => 'Wszyjstke zajty na wiki, wroz ze zajtami godki, przekerowańami a t.p.',
+'statistics-files'             => 'Wćepane pliki',
+'statistics-edits'             => 'Sprowjyńa wykůnane uod powstańo {{grammar:D.lp|{{SITENAME}}}}',
+'statistics-edits-average'     => 'Strzedńo liczba sprowjyń na zajta',
+'statistics-views-total'       => 'Cołkowito liczba bezuchůw',
+'statistics-views-peredit'     => 'Liczba bezuchůw na sprowjyńy',
+'statistics-jobqueue'          => 'Rozmjor [http://www.mediawiki.org/wiki/Manual:Job_queue raji zadań]',
+'statistics-users'             => 'Zarejerowanych [[Special:ListUsers|użytkowńikůw]]',
+'statistics-users-active'      => 'Aktywnych użytkowńikůw',
+'statistics-users-active-desc' => 'Użytkowńiki, kere bůły aktywne bez {{PLURAL:$1|uostatńi dźyń|uostatńich $1 dńi}}',
+'statistics-mostpopular'       => 'Zajty we kere noj�yńśći sam filujom',
 
 'disambiguations'      => 'Zajty ujydnozna�ńajůnce',
 'disambiguationspage'  => '{{ns:template}}:disambig',
@@ -1246,7 +1397,8 @@ Zajta uznawano je za ujydnozna�ńajůnco kej zawiyro šablůn uokreślůny we [
 'popularpages'            => 'Zajty we kere noj�ynśćej sam filujům',
 'wantedcategories'        => 'Potřebne katygoryje',
 'wantedpages'             => 'Nojpotřebńijše zajty',
-'missingfiles'            => 'Brak plikůw',
+'wantedfiles'             => 'Potrzebne pliki',
+'wantedtemplates'         => 'Potrzebne szablůny',
 'mostlinked'              => 'Noj�yńśćej adrésowane',
 'mostlinkedcategories'    => 'Kategoryje we kerych je nojwjyncyi artikli',
 'mostlinkedtemplates'     => 'Noj�yńśćej adrésowane šablôny',
@@ -1255,21 +1407,24 @@ Zajta uznawano je za ujydnozna�ńajůnco kej zawiyro šablůn uokreślůny we [
 'mostrevisions'           => 'Noj�yńśćej sprowjane artikle',
 'prefixindex'             => 'WÅ¡yskie zajty wedle prefiksa',
 'shortpages'              => 'Nojkrůtše zajty',
-'longpages'               => 'Dugje artikle',
+'longpages'               => 'Duge artikle',
 'deadendpages'            => 'Artikle bez linkůw',
 'deadendpagestext'        => 'Zajty wymjyńůne půńižej ńy majům uodnośńikůw do žodnych inkšych zajtůw kere sům na tej wiki.',
 'protectedpages'          => 'Zawarte zajty',
 'protectedpages-indef'    => 'Yno zabezpje�yńo ńyokreślůne',
+'protectedpages-cascade'  => 'Yno zajty zabezpjeczůne rekursywńy',
 'protectedpagestext'      => 'Zajty wymjyńůne půńižej sům zawarte uod prećepywańo i sprowjańo.',
 'protectedpagesempty'     => 'Žodno zajta ńy je terozki zawarto s podanymi parametrami.',
 'protectedtitles'         => 'Zawarte mjana artikli',
 'protectedtitlestext'     => 'Ůtwořyńy artikli uo nastympujůncych mjanach je zawarte',
 'protectedtitlesempty'    => 'Do tych štalowań utwořyńy artikla uo dowolnym mjańy ńy je zawarte',
 'listusers'               => 'Lista užytkowńikůw',
+'listusers-editsonly'     => 'Pokoż yno użytkowńikůw kere majům sprowjyńa',
+'usereditcount'           => '$1 {{PLURAL:$1|sprowjyńe|sprowjyńa|sprowjyń}}',
 'newpages'                => 'Nowe zajty',
 'newpages-username'       => 'Mjano užytkowńika:',
 'ancientpages'            => 'Nojstarše artikle',
-'move'                    => 'Přećep',
+'move'                    => 'Przećep',
 'movethispage'            => 'Přećepej ta zajta',
 'unusedimagestext'        => 'Pamjyntej, proša, aže inkše witryny, np. projekty Wikimedja w inkšych godkach, můgům adresować do tych plikůw užywajůnc bezpośredńo URL. Bez tůž ńykere ze plikůw můgům sam być na tej liśće pokozane mimo, aže žodna zajta ńy adresuje do ńich.',
 'unusedcategoriestext'    => 'Katygorje pokazane půńižej istńejům, choć ńy kořisto s ńich žadyn artikel ańi katygorja.',
@@ -1286,14 +1441,13 @@ Zajta uznawano je za ujydnozna�ńajůnco kej zawiyro šablůn uokreślůny we [
 'booksources-search-legend' => 'Šnupej za zdřůduůma kśiůnžkowymi',
 'booksources-go'            => 'Pokož',
 'booksources-text'          => 'Půńižej znojdowo śe lista uodnośńikůw do inkšych witryn, kere pośredńi�ům we spředažy nowych i užywanych kśiąžek, a tyž můgům mjeć dalše informacyje uo pošukiwany bez ćebje kśůnžce',
+'booksources-invalid-isbn'  => 'Podany numer ISBN zostoł rozpoznany kej felerny. Sprowdź aże podany numer je zgodny s numerym kery je we zdrzůdle.',
 
 # Special:Log
 'specialloguserlabel'  => 'Užytkowńik:',
 'speciallogtitlelabel' => 'Titel:',
-'log'                  => 'Rejery uoperacjůw',
+'log'                  => 'Register dźołano',
 'all-logs-page'        => 'WÅ¡yjstkie uoperacyje',
-'log-search-legend'    => 'Šnupej w rejeře',
-'log-search-submit'    => 'Å nupej',
 'alllogstext'          => 'Wspůlny rejer wszyjstkych typůw uoperacyji do {{SITENAME}}.
 Możesz zawyńźić liczba wyńikůw wybjerajůnc typ rejeru, mjano użytkowńika abo titel zajty (wjelge a mołe buchsztaby majům znoczyńy).',
 'logempty'             => 'Ńy ma wpisůw we rejeře',
@@ -1301,10 +1455,11 @@ Możesz zawyńźić liczba wyńikůw wybjerajůnc typ rejeru, mjano użytkowńik
 
 # Special:AllPages
 'allpages'          => 'WÅ¡yskie zajty',
-'alphaindexline'    => 'úod $1 do $2',
+'alphaindexline'    => 'uod $1 do $2',
 'nextpage'          => 'Nostympno zajta ($1)',
 'prevpage'          => 'Popředńo zajta ($1)',
 'allpagesfrom'      => 'Zajty za�ynojůnce śe na:',
+'allpagesto'        => 'Zajty uo titlach kere na zadku majům:',
 'allarticles'       => 'WÅ¡yskie zajty',
 'allinnamespace'    => 'Wšyjstke zajty (we přestřyńi mjan $1)',
 'allnotinnamespace' => 'Wšyjstke zajty (ino bes přestřyńi mjan $1)',
@@ -1323,19 +1478,44 @@ Kukńij tyż [[Special:WantedCategories|ńyistńyjůnce kategoryje]].',
 'special-categories-sort-count' => 'sortowanie wedle li�by',
 'special-categories-sort-abc'   => 'sortowanie wedle alfabyta',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Wyćepane sprowjyńa użytkowńika',
+
+# Special:LinkSearch
+'linksearch'       => 'Sznuparka uod auskuplůngůw',
+'linksearch-pat'   => 'Wzorzec sznupańo',
+'linksearch-ns'    => 'Przestrzyń mjan',
+'linksearch-ok'    => 'Å nupej',
+'linksearch-text'  => 'Idźe użyć symbola wjeloznacznygo „*�. Lů bajszpila „*.wikipedia.org� spowoduje sznupańy za wszyjstkimi linkůma kere prowadzům ku důmyńy „wikipedia.org� a jeij poddůmyn.<br />
+Uobsůgiwane protokoły: <tt>$1</tt>',
+'linksearch-line'  => '$1 link na zajće $2',
+'linksearch-error' => 'Symbola wjeloznacznygo idźe użyć yno na anfangu mjana hosta.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Pokaž užytkowńikůw za�ynojůnc uod:',
 'listusers-submit'   => 'Pokož',
 'listusers-noresult' => 'Ńy znejdźůno žodnygo užytkowńika.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Nowe użytkowniki',
+'newuserlogpagetext'          => 'To je rejer uostatńo utworzůnych kůnt użytkowńikůw',
+'newuserlog-byemail'          => 'hasło uostało wysłane e-brifym',
+'newuserlog-create-entry'     => '– nowy użytkowńik',
+'newuserlog-create2-entry'    => '– utworzůł kůnto $1',
+'newuserlog-autocreate-entry' => '– kůnto utworzůne automatyczńy',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Uprawńyńo grup užytkowńikůw',
-'listgrouprights-summary'  => 'Půńiży znojdowo śe spis grup użytkowńikůw zdefińjowanych na tyj wiki, s wyszczygůlńyńym przidźelůnych im prow dostympu.
+'listgrouprights'                 => 'Uprawńyńo grup užytkowńikůw',
+'listgrouprights-summary'         => 'Půńiży znojdowo śe spis grup użytkowńikůw zdefińjowanych na tyj wiki, s wyszczygůlńyńym przidźelůnych im prow dostympu.
 Sprowdź zajta [[{{MediaWiki:Listgrouprights-helppage}}|s dodatkowymi informacjami]] uo uprowńyńach użytkowńikůw.',
-'listgrouprights-group'    => 'Grupa',
-'listgrouprights-rights'   => 'Uprawńyńo',
-'listgrouprights-helppage' => 'Help:Uprawńyńo grup užytkowńikůw',
-'listgrouprights-members'  => '(lista �uůnkůw grupy)',
+'listgrouprights-group'           => 'Grupa',
+'listgrouprights-rights'          => 'Uprawńyńo',
+'listgrouprights-helppage'        => 'Help:Uprawńyńo grup užytkowńikůw',
+'listgrouprights-members'         => '(lista �uůnkůw grupy)',
+'listgrouprights-addgroup'        => 'Idźe dodać do {{PLURAL:$2|grupy|grup}}: $1',
+'listgrouprights-removegroup'     => 'Idźe wyćepać s {{PLURAL:$2|grupy|grup}}: $1',
+'listgrouprights-addgroup-all'    => 'Idźe dodać do kożdyj grupy',
+'listgrouprights-removegroup-all' => 'Idźe wyćepać s wszyjstkich grup',
 
 # E-mail user
 'mailnologin'     => 'Brak adresu',
@@ -1348,6 +1528,7 @@ Adres e-brifa, kery zostoł bez Ćebje wkludzůny we [[Special:Preferences|Twoji
 'defemailsubject' => 'Wjadůmość uod {{GRAMMAR:D.pl|{{SITENAME}}}}',
 'noemailtitle'    => 'Brak adresu e-brif',
 'noemailtext'     => 'Tyn užytkowńik ńy podou poprawnygo adresu e-brif, albo zadecydowou, co ńy chce uotřimywać wjadůmośći e-brif uod inkšych užytkowńikůw',
+'email-legend'    => 'Wyślij e-brif ku inkszymu użytkowńikowi {{GRAMMAR:MS.lp|{{SITENAME}}}}',
 'emailfrom'       => 'Uod:',
 'emailto'         => 'Ku:',
 'emailsubject'    => 'Tyjma:',
@@ -1361,7 +1542,7 @@ Adres e-brifa, kery zostoł bez Ćebje wkludzůny we [[Special:Preferences|Twoji
 
 # Watchlist
 'watchlist'            => 'Pozorlista',
-'mywatchlist'          => 'Mojo pozorlista',
+'mywatchlist'          => 'Moja pozůrlista',
 'watchlistfor'         => "(dla užytkowńika '''$1''')",
 'nowatchlist'          => 'Ńy ma žodnych pozycyji na liśće zajtůw, na kere dowoš pozůr.',
 'watchlistanontext'    => '$1 coby uobejřeć abo sprowjać elymynty listy zajtůw, na kere dowoš pozůr',
@@ -1372,8 +1553,8 @@ Adres e-brifa, kery zostoł bez Ćebje wkludzůny we [[Special:Preferences|Twoji
 Na tyi liśće bydźeš mjou rejer přišuych sprowjyń tyi zajty i jeji zajty godki, a mjano zajty bydźeš mjou škryflane '''tustym''' na [[Special:RecentChanges|liśće půmjyńanych na ůostatku]], cobyś mjou wygoda w jei pomjyńańa filować.",
 'removedwatch'         => 'Wyćepńjynte s pozorlisty',
 'removedwatchtext'     => 'Artikel "[[:$1]]" zostou wyćepńjynty s [[Special:Watchlist|Twojij pozorlisty]].',
-'watch'                => 'Dej pozor',
-'watchthispage'        => 'Dej pozor',
+'watch'                => 'Dej pozůr',
+'watchthispage'        => 'Dej pozůr',
 'unwatch'              => 'Njy dowej pozoru',
 'unwatchthispage'      => 'Přestoń dować pozůr',
 'notanarticle'         => 'To Å„y je artikel',
@@ -1388,12 +1569,7 @@ Na tyi liśće bydźeš mjou rejer přišuych sprowjyń tyi zajty i jeji zajty g
 'iteminvalidname'      => 'Problym ze pozycjům „$1�, felerne mjano...',
 'wlnote'               => "Půńižy pokazano {{PLURAL:$1|ostatńy sprawjyńy dokůnane|ostatńy '''$1''' sprawjyńe dokůnane|ostatńych '''$1''' sprawjyń dokůnanych}} bez {{PLURAL:$2|uostatńo godźina|uostatńich '''$2''' godźin}}.",
 'wlshowlast'           => 'Pokož uostatńy $1 godźin $2 dńi ($3)',
-'watchlist-show-bots'  => 'pokaž sprowjyńo botůw',
-'watchlist-hide-bots'  => 'schowej sprowjyńa botůw',
-'watchlist-show-own'   => 'pokož bezy mje sprowjůne',
-'watchlist-hide-own'   => 'schowej moje sprawjyńa',
-'watchlist-show-minor' => 'pokož drobne pomjyńańa',
-'watchlist-hide-minor' => 'Schowej drobne pomjyńańa',
+'watchlist-options'    => 'Uopcyje artikli na kere dowosz pozůr',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Dowom pozor...',
@@ -1433,72 +1609,78 @@ KejbyÅ› chćou půmjyÅ„ić Å¡talowaÅ„o swojej listy zajtůw, na kere dowoÅ¡ pozÅ
 Pomoc:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Wyćep artikel',
-'confirm'                     => 'Potwjyrdź',
-'excontent'                   => 'zawartość zajty „$1�',
-'excontentauthor'             => 'treść: „$1� (jedyny aůtor: [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => 'popředńo zawartość uobecńy pustej zajty: „$1�',
-'exblank'                     => 'Zajta byua pusto',
-'delete-confirm'              => 'Wyćep „$1�',
-'delete-legend'               => 'Wyćep',
-'historywarning'              => 'Pozor! Ta zajta kerům chceš wyćepnůńć mo historjo:',
-'confirmdeletetext'           => 'Chceš wyćepnůńć trwale artikel abo plik s bazy danych s historią. Pokož, aže wjyš co robdza, i to aže to je tak jak godojům [[{{MediaWiki:Policy-url}}|zasady]].',
-'actioncomplete'              => 'Fertig',
-'deletedtext'                 => 'Wyćepano "<nowiki>$1</nowiki>". Rejer uostatnio zrobiůnych wyćepań možeš uobejžyć tukej: $2.',
-'deletedarticle'              => 'wyciepnjynto "[[$1]]"',
-'suppressedarticle'           => 'utajńjyu [[$1]]',
-'dellogpage'                  => 'Wyćepane',
-'dellogpagetext'              => 'To je lista uostatńo wykůnanych wyćepań.',
-'deletionlog'                 => 'rejer wyćepań',
-'reverted'                    => 'Přiwrůcůno popředńo wersyja',
-'deletecomment'               => 'Čymu chceš wyćepnůńć:',
-'deleteotherreason'           => 'Inkšy powůd:',
-'deletereasonotherlist'       => 'Inkszy powůd',
-'deletereason-dropdown'       => '* Noj�ynstše při�yny wyćepańa
+# Delete
+'deletepage'             => 'Wyćep artikel',
+'confirm'                => 'Potwjyrdź',
+'excontent'              => 'zawartość zajty „$1�',
+'excontentauthor'        => 'treść: „$1� (jedyny aůtor: [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'popředńo zawartość uobecńy pustej zajty: „$1�',
+'exblank'                => 'Zajta byua pusto',
+'delete-confirm'         => 'Wyćep „$1�',
+'delete-legend'          => 'Wyćep',
+'historywarning'         => 'Pozor! Ta zajta kerům chceš wyćepnůńć mo historjo:',
+'confirmdeletetext'      => 'Chceš wyćepnůńć trwale artikel abo plik s bazy danych s historią. Pokož, aže wjyš co robdza, i to aže to je tak jak godojům [[{{MediaWiki:Policy-url}}|zasady]].',
+'actioncomplete'         => 'Fertig',
+'deletedtext'            => 'Wyćepano "<nowiki>$1</nowiki>". Rejer uostatnio zrobiůnych wyćepań možeš uobejžyć tukej: $2.',
+'deletedarticle'         => 'wyciepnjynto "[[$1]]"',
+'suppressedarticle'      => 'utajńjyu [[$1]]',
+'dellogpage'             => 'Wyćepane',
+'dellogpagetext'         => 'To je lista uostatńo wykůnanych wyćepań.',
+'deletionlog'            => 'rejer wyćepań',
+'reverted'               => 'Přiwrůcůno popředńo wersyja',
+'deletecomment'          => 'Čymu chceš wyćepnůńć:',
+'deleteotherreason'      => 'Inkšy powůd:',
+'deletereasonotherlist'  => 'Inkszy powůd',
+'deletereason-dropdown'  => '* Noj�ynstše při�yny wyćepańa
 ** Prośba autora
 ** Narušyńy praw autorskych
 ** Wandalizm',
-'delete-edit-reasonlist'      => 'Sprowjańe listy powodůw wyćepańo zajty',
-'delete-toobig'               => 'Ta zajta mo fest dugo historyja sprowjyń, wjyncyj jak $1 {{PLURAL:$1|půmjyńańy|půmjyńańo|půmjyńań}}.
+'delete-edit-reasonlist' => 'Sprowjańe listy powodůw wyćepańo zajty',
+'delete-toobig'          => 'Ta zajta mo fest dugo historyja sprowjyń, wjyncyj jak $1 {{PLURAL:$1|půmjyńańy|půmjyńańo|půmjyńań}}.
 Jeij wyćepańy mogło by spowodować zakłucyńo we dźołańu {{GRAMMAR:D.lp|{{SITENAME}}}} a bez tůż zostało uograńiczůne.',
-'delete-warning-toobig'       => 'Ta zajta mo fest dugo historia sprowjyń, wjyncy kej $1 {{PLURAL:$1|půmjyńeńe|půmjyńańo|půmjyńań}}.
+'delete-warning-toobig'  => 'Ta zajta mo fest dugo historia sprowjyń, wjyncy kej $1 {{PLURAL:$1|půmjyńeńe|půmjyńańo|půmjyńań}}.
 Dej pozůr, bo jei wyćepańe może spowodować zakłůcyńo w pracy {{GRAMMAR:D.lp|{{SITENAME}}}}.',
-'rollback'                    => 'Wycofej sprowjyńe',
-'rollback_short'              => 'Cofej',
-'rollbacklink'                => 'cofej',
-'rollbackfailed'              => 'Ńy idźe wycofać sprowjyńo',
-'cantrollback'                => 'Ńy idże cofnůńć pomjyńeńo, sam je ino jedna wersyja tyi zajty.',
-'alreadyrolled'               => 'Ńy idźe lů zajty [[:$1|$1]] cofnůńć uostatńygo pomjyńeńa, kere wykonoł [[User:$2|$2]] ([[User talk:$2|godka]]) | [[Special:Contributions/$2|{{int:contribslink}}]]).
+
+# Rollback
+'rollback'         => 'Wycofej sprowjyńe',
+'rollback_short'   => 'Cofej',
+'rollbacklink'     => 'cofej',
+'rollbackfailed'   => 'Ńy idźe wycofać sprowjyńo',
+'cantrollback'     => 'Ńy idże cofnůńć pomjyńeńo, sam je ino jedna wersyja tyi zajty.',
+'alreadyrolled'    => 'Ńy idźe lů zajty [[:$1|$1]] cofnůńć uostatńygo pomjyńeńa, kere wykonoł [[User:$2|$2]] ([[User talk:$2|godka]]){{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]).
 Kto inkszy zdůnżůł już to zrobić abo wprowadźił własne poprowki do treśći zajty.
 
-Autorym ostatńygo pomjyńyńo je terozki [[User:$3|$3]] ([[User talk:$3|godka]]) | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Sprowjyńe uopisano: „<i>$1</i>�.', # only shown if there is an edit comment
-'revertpage'                  => 'Wycofano sprowjyńe użytkowńika [[Special:Contributions/$2|$2]] ([[User talk:$2|godka]]).
-Autor prziwrůcůnej wersyji to [[User:$1|$1]].', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Wycofano sprowjyńa užytkowńika $1.
+Autorym ostatńygo pomjyńyńo je terozki [[User:$3|$3]] ([[User talk:$3|godka]]){{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Sprowjyńe uopisano: „''$1''�.", # only shown if there is an edit comment
+'revertpage'       => 'Wycofano sprowjyńe użytkowńika [[Special:Contributions/$2|$2]] ([[User talk:$2|godka]]).
+Autor prziwrůcůnej wersyji to [[User:$1|$1]].', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Wycofano sprowjyńa užytkowńika $1.
 Přiwrůcůno uostatńo wersyja autorstwa  $2.',
-'sessionfailure'              => 'Feler weryfikacyji zalůgowańo.
+'sessionfailure'   => 'Feler weryfikacyji zalůgowańo.
 Polecyńy zostouo anulowane, aby ůńiknůńć přechwycyńo sesyji.
 
 Naćiś „cofej�, přeuaduj zajta, a potym zaś wydej polecyńy',
+
+# Protect
 'protectlogpage'              => 'Zawarte',
 'protectlogtext'              => 'Půńižej znojdowo śe lista zawarć i uodymkńjyńć pojydyn�ych zajtůw.
 Coby přejřeć lista uobecńy zawartych zajtůw, přeńdź na zajta wykazu [[Special:ProtectedPages|zawartych zajtůw]].',
 'protectedarticle'            => 'zawar [[$1]]',
 'modifiedarticleprotection'   => 'pomjyńiu poziům zawarćo [[$1]]',
 'unprotectedarticle'          => 'uodymknyu [[$1]]',
+'movedarticleprotection'      => 'przekludzůno sztalowańa zabezpjeczyńo s „[[$2]]� ku „[[$1]]�',
 'protect-title'               => 'Pomjyńeńe poźomu zawarćo „$1�',
+'prot_1movedto2'              => '[[$1]] přećepano do [[$2]]',
 'protect-legend'              => 'Potwjyrdź zawarće',
 'protectcomment'              => 'Kůmyntoř:',
 'protectexpiry'               => 'Wygaso:',
 'protect_expiry_invalid'      => 'Čas wygaśńjyńćo je zuy.',
 'protect_expiry_old'          => 'Čas wygaśńjyńćo je w downiej ńiž terozki.',
 'protect-unchain'             => 'Uodymknij možliwość přećiśńjyńcio artikla.',
-'protect-text'                => 'Sam tukej možyš uobejžeć i pomjyńyć poźům zawarcia zajty <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Ńy možeš půmjyńać poźůmůw zawarćo kej žeś sům je zawarty uod sprowjyń. Terozki štalowańa dla zajty <strong>$1</strong> to:',
-'protect-locked-dblock'       => 'Ńy idźe půmjyńić poźůmu zawarća s kuli tygo co baza danych tyž je zawarto. Uobecne štalowańa dla zajty <strong>$1</strong> to:',
-'protect-locked-access'       => 'Ńy moš uprowńyń coby pomjyńyć poziům zawarcia zajty. Uobecne ustawjyńo dlo zajty <strong>$1</strong> to:',
+'protect-text'                => "Sam tukej možyš uobejžeć i pomjyńyć poźům zawarcia zajty '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Ńy možeš půmjyńać poźůmůw zawarćo kej žeś sům je zawarty uod sprowjyń. Terozki štalowańa dla zajty '''$1''' to:",
+'protect-locked-dblock'       => "Ńy idźe půmjyńić poźůmu zawarća s kuli tygo co baza danych tyž je zawarto. Uobecne štalowańa dla zajty '''$1''' to:",
+'protect-locked-access'       => "Ńy moš uprowńyń coby pomjyńyć poziům zawarcia zajty. Uobecne ustawjyńo dlo zajty '''$1''' to:",
 'protect-cascadeon'           => 'Ta zajta je zawarto od pomjyńań, po takjymu, co jei užywo {{PLURAL:$1|ta zajta, kero je zawarto|nastympůjůnce zajty, kere zostauy zawarte}} a opcyjo dźedźi�yńo je zaůon�ono. Možeš pomjyńyć poziům zawarcia tyi zajty, ale dlo dźedźi�yńo zawarcia to ńy mo wpuywu.',
 'protect-default'             => '(důmyślny)',
 'protect-fallback'            => 'Wymago pozwolynjo "$1"',
@@ -1506,8 +1688,21 @@ Coby přejřeć lista uobecńy zawartych zajtůw, přeńdź na zajta wykazu [[Sp
 'protect-level-sysop'         => 'Ino admini',
 'protect-summary-cascade'     => 'dźedźi�yńy',
 'protect-expiring'            => 'wygaso $1 (UTC)',
+'protect-expiry-indefinite'   => 'na zowdy',
 'protect-cascade'             => 'Dźedźy�yńe zawarćo - zawřij wšyskie zajty kere sům na tyi zajće.',
 'protect-cantedit'            => 'Ńy možeš pomjyńyć poziůmu zawarća tyi zajty, po takiymu, co uona je dlo Ćebje zawarto uod pomjyńańa.',
+'protect-othertime'           => 'Inkszy uokres:',
+'protect-othertime-op'        => 'inkszy uokres',
+'protect-existing-expiry'     => 'Czas wygaśńyńćo nasztalowany terozki: $2 uo $3',
+'protect-otherreason'         => 'Inkszy/dodatkowy powůd:',
+'protect-otherreason-op'      => 'inkszy/dodatkowy powůd',
+'protect-dropdown'            => '*Nojczynstsze powody zawarćo uod sprowjyń
+** Czynste wandalizmy
+** Czynste spamowańy
+** Wojna edycyjno
+** Wygupy',
+'protect-edit-reasonlist'     => 'Sprowjej powody zawarćo uod sprowjyń',
+'protect-expiry-options'      => '2 godźiny:2 hours,1 dźyń:1 day,3 dńi:3 days,1 tydźyń:1 week,2 tygodńy:2 weeks,1 mjeśůnc:1 month,3 mjeśůnce:3 months,6 mjeśency:6 months,1 rok:1 year,ńyskůń�ůny:infińite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pozwolyńy:',
 'restriction-level'           => 'Poźům:',
 'minimum-size'                => 'Min. wjelgość',
@@ -1530,8 +1725,7 @@ Coby přejřeć lista uobecńy zawartych zajtůw, přeńdź na zajta wykazu [[Sp
 'undeletepage'                 => 'Pokož a odtwůř wyćepńjynte zajty',
 'undeletepagetitle'            => "'''Půńižej znojdujům śe wyćepane wersyje zajty  [[:$1]]'''.",
 'viewdeletedpage'              => 'Pokož wyćepńjynte zajty',
-'undeletepagetext'             => 'Půńižše zajty zostouy wyćepane, nale jeich kopja wćůnž znojduje śe w archiwům.
-Archiwům co jakiś �as može być uo�yš�ane.',
+'undeletepagetext'             => '{{PLURAL:$1|Nastympujůnco zajta uosroła wyćepano, nale jeij|Nastympujůnce $1 zajty uostoły wyćepane, nale jejich}} kopja dalij znojdujy śe we archiwum. Aechiwum roz za kedy trza uoczyszczać.',
 'undelete-fieldset-title'      => 'Wćepywańy nazod wersyji',
 'undeleteextrahelp'            => "Jak chcesz wćepać nazod couko zajta, pozostaw wszyjstke pola ńyzaznaczůne a naćiś '''Uodtwůrz'''.
 Aby wybrać tajlowe uodtworzyńy noleży zaznaczyć '''Uodtwůrz'''.
@@ -1544,13 +1738,14 @@ W takej sytuacyji noležy uodzna�yć abo přiwrůćić wido�ność nojnowšym
 'undeletehistorynoadmin'       => 'Ta zajta zostoua wyćepano.
 Powůd wyćepańo je podany w podsůmowańu půńižej, razym s danymi užytkowńika, kery sprawjou zajta před jei wyćepańym.
 Sama treść wyćepanych wersyji je dostympna ino do admińistratorůw',
-'undelete-revision'            => 'Wyćiepnjynto wersjo $1 z $2 uod $3:',
+'undelete-revision'            => 'Wyćepńynto wersyjo $1 (s $5 $4) keryj autorym je $3:',
 'undeleterevision-missing'     => 'Felerno abo brakujůnco wersyjo.
 Možeš mjeć felerny link abo wersyjo můgua zostać wćepano nazod, abo wyćepano s archiwům.',
 'undelete-nodiff'              => 'Ńy znejdźono popřednich wersyji.',
 'undeletebtn'                  => 'Uodtwůř',
 'undeletelink'                 => 'uodtwůř',
 'undeletereset'                => 'Wy�yść',
+'undeleteinvert'               => 'Zaznocz na uopy',
 'undeletecomment'              => 'Powůd wćepańo nazod:',
 'undeletedarticle'             => 'wćepou nazod [[$1]]',
 'undeletedrevisions'           => 'Wćepano nazod {{PLURAL:$1|1 wersyja|$1 wersyje|$1 wersyji}}',
@@ -1584,26 +1779,27 @@ $1',
 'blanknamespace' => '(přodńo)',
 
 # Contributions
-'contributions' => 'Wkuod užytkowńika',
-'mycontris'     => 'Bezy mje sprowjône',
-'contribsub2'   => 'Do užytkowńika $1 ($2)',
-'nocontribs'    => 'Brak pomjyńań uodpowjadajůncych tym kryterjům.',
-'uctop'         => '(uostatnio)',
-'month'         => 'Uod mjeśůnca (i downiyjše):',
-'year'          => 'Uod roku (i dowńijše):',
-
-'sp-contributions-newbies'     => 'Pokož wkuod ino uod nowych užytkowńikůw',
-'sp-contributions-newbies-sub' => 'Dlo nowych užytkowńikůw',
-'sp-contributions-blocklog'    => 'zawarća',
-'sp-contributions-search'      => 'Å nupej za wkuodym',
-'sp-contributions-username'    => 'Adres IP abo mjano užytkowńika',
-'sp-contributions-submit'      => 'Å nupej',
+'contributions'       => 'Ajnzac sprowjorza',
+'contributions-title' => 'Wkłod użytkowńika $1',
+'mycontris'           => 'Uody mje sprowjane',
+'contribsub2'         => 'Do užytkowńika $1 ($2)',
+'nocontribs'          => 'Brak pomjyńań uodpowjadajůncych tym kryterjům.',
+'uctop'               => '(uostatnio)',
+'month'               => 'Uod mjeśůnca (i downiyjše):',
+'year'                => 'Uod roku (i dowńijše):',
+
+'sp-contributions-newbies'       => 'Pokož wkuod ino uod nowych užytkowńikůw',
+'sp-contributions-newbies-sub'   => 'Dlo nowych užytkowńikůw',
+'sp-contributions-newbies-title' => 'Wkłod nowych użytkowńików',
+'sp-contributions-blocklog'      => 'zawarća',
+'sp-contributions-search'        => 'Å nupej za wkuodym',
+'sp-contributions-username'      => 'Adres IP abo mjano užytkowńika',
+'sp-contributions-submit'        => 'Å nupej',
 
 # What links here
 'whatlinkshere'            => 'Co sam linkuje',
 'whatlinkshere-title'      => 'Zajty kere sům adrésowane do "$1"',
 'whatlinkshere-page'       => 'Zajta:',
-'linklistsub'              => '(Lista linków)',
 'linkshere'                => "Nastympůjůnce zajty sóm adrésůwane do '''[[:$1]]''':",
 'nolinkshere'              => "Žodno zajta ńy je adrésowana do '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Žodno zajta ńy je adresowano do '''[[:$1]]''' we wybrany přestřyni mjan.",
@@ -1620,8 +1816,8 @@ $1',
 'whatlinkshere-filters'    => 'Filtry',
 
 # Block/unblock
-'blockip'                         => 'Zawřij sprowjyńo užytkowńikowi',
-'blockip-legend'                  => 'Zawřij sprowjyńo do užytkowńika',
+'blockip'                         => 'Zawrzij sprowjorza',
+'blockip-legend'                  => 'Zawrzij sprowjorza',
 'blockiptext'                     => 'Tyn formulař suužy do zawjerańo sprowjyń spod uokreślůnygo adresu IP abo kůnkretnymu užytkowńikowi.
 Zawjerać noležy jydyńy po to, by zapobjec wandalizmům, zgodńy s [[{{MediaWiki:Policy-url}}|přijyntymi zasadami]].
 Podej powůd (np. umješ�ajůnc mjana zajtůw, na kerych dopuš�ůno śe wandalizmu).',
@@ -1651,6 +1847,8 @@ Podej powůd (np. umješ�ajůnc mjana zajtůw, na kerych dopuš�ůno śe wanda
 'ipbotherreason'                  => 'Inkšy powůd:',
 'ipbhidename'                     => 'Schrůń mjano užytkowńika/adres IP w rejeře zawarć, na liśće aktywnych zawarć i liśće užytkowńikůw',
 'ipbwatchuser'                    => 'Dowej pozůr na zajta uosobisto i zajta godki tygo užytkowńika',
+'ipballowusertalk'                => 'Dozwól tymu użytkowńikowi sprowjać własno zajta godki, jak je zawarty uod sprowjyń',
+'ipb-change-block'                => 'Zmjyń sztalowańa zawarća uod sprowjyń',
 'badipaddress'                    => 'Felerny adres IP',
 'blockipsuccesssub'               => 'Zawarće uod sprowjyń udane',
 'blockipsuccesstext'              => 'Užytkowńik [[Special:Contributions/$1|$1]] zostou zawarty uod sprowjyń.<br />
@@ -1660,6 +1858,7 @@ Přyńdź do [[Special:IPBlockList|listy zawartych adresůw IP]] coby přejřeć
 'ipb-unblock'                     => 'Uodymknij užytkowńika abo adres IP',
 'ipb-blocklist-addr'              => 'Istńejůnce zawarća uod sprowjyń lů $1',
 'ipb-blocklist'                   => 'Zobo� istńijůnce zawarća',
+'ipb-blocklist-contribs'          => 'Wkłod $1',
 'unblockip'                       => 'Uodymkńij sprowjyńo užytkowńikowi',
 'unblockiptext'                   => 'Ůžyj formulořa půńižej coby přiwrůćić možliwość sprowjańo s w�eśńij zawartygo adresu IP abo užytkowńikowi.',
 'ipusubmit'                       => 'Uodymkńij sprowjyńo užytkowńikowi',
@@ -1668,6 +1867,9 @@ Přyńdź do [[Special:IPBlockList|listy zawartych adresůw IP]] coby přejřeć
 'ipblocklist'                     => 'Lista zawartych uod sprowjyń adresůw IP a užytkowńikůw.',
 'ipblocklist-legend'              => 'Znejdź zawartygo uod sprawjyń užytkowńika',
 'ipblocklist-username'            => 'Mjano užytkowńika abo adres IP',
+'ipblocklist-sh-userblocks'       => '$1 zawarća uod sprowjyń kůnt',
+'ipblocklist-sh-tempblocks'       => '$1 tymczasowe zawarća uod sprowjyń',
+'ipblocklist-sh-addressblocks'    => '$1 zawarća uod sprowjyń lů pojedynczych adresůw IP',
 'ipblocklist-submit'              => 'Å nupej',
 'blocklistline'                   => '$1, $2 zawar uod sprowjyń $3 ($4)',
 'infiniteblock'                   => 'na zawše',
@@ -1676,15 +1878,19 @@ Přyńdź do [[Special:IPBlockList|listy zawartych adresůw IP]] coby přejřeć
 'noautoblockblock'                => 'autůmaty�ne zawjyrańy uod sprowjyń wůuůn�ůne',
 'createaccountblock'              => 'zawarto twořyńe kont',
 'emailblock'                      => 'zawarty e-brif',
+'blocklist-nousertalk'            => 'ńy mogům sprowjać własnych zajtůw godki',
 'ipblocklist-empty'               => 'Lista zawarć je pusto.',
 'ipblocklist-no-results'          => 'Podany adres IP abo užytkowńik ńy je zawarty uod sprowjyń.',
 'blocklink'                       => 'zablokuj',
 'unblocklink'                     => 'uodymknij',
-'contribslink'                    => 'wkůod',
+'change-blocklink'                => 'zmjyń zawarće uod sprowjyń',
+'contribslink'                    => 'ajnzac',
 'autoblocker'                     => 'Zawarto Ci sprowjyńo autůmaty�ńy, bez tůž co užywaš tygo samygo adresu IP, co užytkowńik „[[User:$1|$1]]�.
 Powůd zawarća $1 to: „$2�',
-'blocklogpage'                    => 'Historyja zawarć',
+'blocklogpage'                    => 'Gyszichta zawjyrańo',
+'blocklog-fulllog'                => 'Połny rejer zawarć',
 'blocklogentry'                   => 'zawarto [[$1]], bydźe uodymkńynty: $2 $3',
+'reblock-logentry'                => 'půmjyńił sztalowańa zawarća uod sprowjyń lů [[$1]], czas zawarćo: $2 $3',
 'blocklogtext'                    => "Půńižej znojdowo śe lista zawarć zouožůnych i zdjyntych s poš�ygůlnych adresůw IP.
 Na li'śće ńy mo adresůw IP, kere zawarto w sposůb autůmaty�ny.
 Coby přejřeć lista uobecńy aktywnych zawarć, přyńdź na zajta [[Special:IPBlockList|zawartych adresůw i užytkowńikůw]].",
@@ -1693,11 +1899,14 @@ Coby přejřeć lista uobecńy aktywnych zawarć, přyńdź na zajta [[Special:I
 'block-log-flags-nocreate'        => 'twořyńe kůnta je zawarte',
 'block-log-flags-noautoblock'     => 'autůmaty�ne zawjerańy uod sprawjyń wůuůn�ůne',
 'block-log-flags-noemail'         => 'e-brif zawarty',
+'block-log-flags-nousertalk'      => 'ńy może sprowjać włosnyj zajty godki',
 'block-log-flags-angry-autoblock' => 'rozszerzůne automatyczne zawjyrańe załůnczůne',
 'range_block_disabled'            => 'Možliwość zawjerańo zakresu adresůw IP zostoua wůuůn�ůno.',
 'ipb_expiry_invalid'              => 'Felerny �as wygaśńjyńćo zawarća.',
 'ipb_expiry_temp'                 => 'Schrůńůne mjano użytkowńika noleży zawrzić trwale.',
 'ipb_already_blocked'             => '"$1" je już zawarty uod sprowjyń',
+'ipb-needreblock'                 => '== Istńejůnce zawarće ==
+$1 je już zawarty uod sprowjyń. Chcesz půmjyńić sztalowańa zawarćo?',
 'ipb_cant_unblock'                => 'Feler: Zawarće uo ID $1 ńy zostouo znejdźone. Moguo uone zostać oudymkńynte w�eśnij.',
 'ipb_blocked_as_range'            => 'Feler: Adres IP $1 ńy zostou zawarty bezpośredńo i ńy može zostać uodymkńjynty.
 Noležy uůn do zawartygo zakresu adresůw $2. Uodymknůńć možno ino couki zakres.',
@@ -1711,6 +1920,7 @@ Sprawa noležy wyjaśńić s dostawcům Internetu abo půmocům techńi�nům in
 'sorbsreason'                     => 'Twůj adres IP znojdowo śe na liśće serwerůw open proxy w DNSBL, užywanej bez {{GRAMMAR:B.lp|{{SITENAME}}}}.',
 'sorbs_create_account_reason'     => 'Twůj adres IP znojdowo śe na liśće serwerůw open proxy w DNSBL, užywanej bez {{GRAMMAR:B.lp|{{SITENAME}}}}.
 Ńy možeš utwořić kůnta',
+'cant-block-while-blocked'        => 'Ńy możesz zawjyrać uod sprowjyń inkszych użytkowńikůw, jak sam jeżeś uod ńich zawarty.',
 
 # Developer tools
 'lockdb'              => 'Zawryj baza danych',
@@ -1733,9 +1943,9 @@ Zawjerańy i uodmykańy bazy danych wymogo coby plik můgu być naškreflany bez
 'databasenotlocked'   => 'Baza danych Å„y je zawarto.',
 
 # Move page
-'move-page'               => 'Přećep $1',
-'move-page-legend'        => 'Přećiś artikel',
-'movepagetext'            => "Při půmocy formulařa půńižej možeš půmjyńyć nazwa zajty i přećepnůńć jei historja. Pod downym titlym uostańe zajta překerowujůnca. Zajty adresowane na stary titel uostanům jak bůuy.
+'move-page'                    => 'Przećep $1',
+'move-page-legend'             => 'Přećiś artikel',
+'movepagetext'                 => "Při půmocy formulařa půńižej možeš půmjyńyć nazwa zajty i přećepnůńć jei historja. Pod downym titlym uostańe zajta překerowujůnca. Zajty adresowane na stary titel uostanům jak bůuy.
 
 Jak śe na to decyduješ, sprowdź, eli ńy je to [[Special:DoubleRedirects|podwůjne]] abo [[Special:BrokenRedirects|zuomane překerowańy]].
 Uodpowjadoš za to, coby linki wjoduy ku prawiduowym artiklům!
@@ -1747,49 +1957,57 @@ Zajta '''ńy''' bydźe přećepano, jak:
 
 '''DEJ POZŮR!'''
 To može być drasty�no abo i ńypřewidywalno zmjano, jak přećepńyš jako popularno zajta. Bydź pewny, aže wješ co robiyš, ńim klikńyš knefel \"přećep\"!",
-'movepagetalktext'        => 'Uodpowiednio zajta godki, jeśli jest, bydzie přećepano automaty�ńe, pod warůnkiem, že:
+'movepagetalktext'             => 'Uodpowiednio zajta godki, jeśli jest, bydzie přećepano automaty�ńe, pod warůnkiem, že:
 *ńy přećepuješ zajty do inkšy přestřeńy mjan
 *ńy ma sam zajty godki o takiym mjańe
 W takiych razach tekst godki třa přećepać, a jak třeba to i pouůn�yć z tym co juž sam jest, ryn�ńe. Abo možeš sie namyślić i nie přećepywać wcale ("checkbox" půnižyi).',
-'movearticle'             => 'Přećiś artikel:',
-'movenotallowed'          => 'Ńy moš uprownień do přećepywańo zajtůw.',
-'newtitle'                => 'Nowy titel:',
-'move-watch'              => 'Dej pozor',
-'movepagebtn'             => 'Přećiś artikel',
-'pagemovedsub'            => 'Přećiśńjyńće gotowe',
-'movepage-moved'          => '<big>\'\'\'"$1" přećiśńjynto ku "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Artikel s takym mjanym juž je, abo mjano je zue.
+'movearticle'                  => 'Přećiś artikel:',
+'movenologin'                  => 'Ńy jestžeś zalůgowany',
+'movenologintext'              => 'Muśyš być zarejerowanym i [[Special:UserLogin|zalůgowanym]] užytkowńikym coby můc přećepnůńć zajta.',
+'movenotallowed'               => 'Ńy moš uprownień do přećepywańo zajtůw.',
+'cant-move-user-page'          => 'Ńy mosz uprowńyń do przekludzańo zajtůw użytkowńikůw (wyjůntkym sům jejich podstrony).',
+'cant-move-to-user-page'       => 'Ńy mosz uprowńyń coby przekludźić zajta na plac kaj je zajta użytkowńika (wyjůntkym sům podzajty użytkowńika).',
+'newtitle'                     => 'Nowy titel:',
+'move-watch'                   => 'Dej pozůr',
+'movepagebtn'                  => 'Přećiś artikel',
+'pagemovedsub'                 => 'Přećiśńjyńće gotowe',
+'movepage-moved'               => '<big>\'\'\'"$1" přećiśńjynto ku "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'                => 'Artikel s takym mjanym juž je, abo mjano je zue.
 Wybjer inkše mjano.',
-'cantmove-titleprotected' => 'Ńy možeš přećepnůńć zajty, bez tůž co jei nowe mjano je ńydozwolůne s kuli zabezpje�yńo před utwořyńym',
-'talkexists'              => 'Zajta artikla zostaua přećepano, ale zajta godki ńy - zajta godki uo nowym mjańe juž sam jest. Poůun�, proša, teksty oubydwůch godek ryn�ńe.',
-'movedto'                 => 'přećiśńjynto ku',
-'movetalk'                => 'Přećiś godke, jak možno.',
-'move-subpages'           => 'Přećepńij podzajty, jak śe do',
-'move-talk-subpages'      => 'Jeli je to możliwe przekludź wszyjstke zajty godki podzajtůw',
-'movepage-page-exists'    => 'Zajta $1 już istńeje a ńy idźe jeij autůmatyczńy nadszkryflać.',
-'movepage-page-moved'     => 'Zajta $1 uostoła przekludzůno ku $2.',
-'movepage-page-unmoved'   => 'Mjana zajty $1 ńy idźe půmjyńić na $2.',
-'movepage-max-pages'      => 'Przekludzůnych uostało $1 {{PLURAL:$1|zajta|zajty|zajtůw}}. Wjynkszyj liczby ńy idźe przekludźić automatyczńy.',
-'1movedto2'               => '[[$1]] přećepano do [[$2]]',
-'1movedto2_redir'         => 'zajta [[$1]] přećepnůu do [[$2]] nad překerowańem',
-'movelogpage'             => 'Přećepńynte',
-'movelogpagetext'         => 'Uoto lista zajtůw, kere uostatńo zostouy přećepane.',
-'movereason'              => 'ÄŒymu:',
-'revertmove'              => 'cofej',
-'delete_and_move'         => 'Wyćep i przećep',
-'delete_and_move_text'    => '== Přećepańy wymaga wyćepańo inkšyj zajty ==
+'cantmove-titleprotected'      => 'Ńy možeš přećepnůńć zajty, bez tůž co jei nowe mjano je ńydozwolůne s kuli zabezpje�yńo před utwořyńym',
+'talkexists'                   => 'Zajta artikla zostaua přećepano, ale zajta godki ńy - zajta godki uo nowym mjańe juž sam jest. Poůun�, proša, teksty oubydwůch godek ryn�ńe.',
+'movedto'                      => 'přećiśńjynto ku',
+'movetalk'                     => 'Přećiś godke, jak možno.',
+'move-subpages'                => 'Přećepńij podzajty, jak śe do',
+'move-talk-subpages'           => 'Jeli je to możliwe przekludź wszyjstke zajty godki podzajtůw',
+'movepage-page-exists'         => 'Zajta $1 już istńeje a ńy idźe jeij autůmatyczńy nadszkryflać.',
+'movepage-page-moved'          => 'Zajta $1 uostoła przekludzůno ku $2.',
+'movepage-page-unmoved'        => 'Mjana zajty $1 ńy idźe půmjyńić na $2.',
+'movepage-max-pages'           => 'Przekludzůnych uostało $1 {{PLURAL:$1|zajta|zajty|zajtůw}}. Wjynkszyj liczby ńy idźe przekludźić automatyczńy.',
+'1movedto2'                    => '[[$1]] přećepano do [[$2]]',
+'1movedto2_redir'              => 'zajta [[$1]] přećepnůu do [[$2]] nad překerowańem',
+'movelogpage'                  => 'Přećepńynte',
+'movelogpagetext'              => 'Uoto lista zajtůw, kere uostatńo zostouy přećepane.',
+'movereason'                   => 'ÄŒymu:',
+'revertmove'                   => 'cofej',
+'delete_and_move'              => 'Wyćep i przećep',
+'delete_and_move_text'         => '== Přećepańy wymaga wyćepańo inkšyj zajty ==
 Zajta docelowo „[[:$1]]� juž sam jest.
 Čy chceš jům wyćepać, coby zrobić plac do přećepywanej zajty?',
-'delete_and_move_confirm' => 'Toć, wyćep zajta',
-'delete_and_move_reason'  => 'Wyćepano coby zrobić plac do přećepywanyj zajty',
-'selfmove'                => 'Mjana zajtůw zdřůdowyj i docelowyj sům take same.
+'delete_and_move_confirm'      => 'Toć, wyćep zajta',
+'delete_and_move_reason'       => 'Wyćepano coby zrobić plac do přećepywanyj zajty',
+'selfmove'                     => 'Mjana zajtůw zdřůdowyj i docelowyj sům take same.
 Zajty ńy idźe přećepać na ńa samo.',
-'immobile_namespace'      => 'Zajta zdřůduowo abo zajta docelowo to ekstra zajta.
-Ńy idźe přećepać ze abo do tyi přestřyńi mjan',
-'imagenocrossnamespace'   => 'Ńy idźe přećepać grafiki do přestřyni mjan ńy přezno�onyj do grafik',
-'imagetypemismatch'       => 'Nowe rozšeřyńe mjana plika je inkšego typu kej jygo zawartość',
-'imageinvalidfilename'    => 'Mjano plika docelowygo je felerne',
-'fix-double-redirects'    => 'Poprow przekerowańa kere adresujům ku uoryginalnymu titlowi zajty',
+'immobile-source-namespace'    => 'Ńy idźe przekludzać zajtůw we przestrzyńi mjan "$1"',
+'immobile-target-namespace'    => 'Ńy idźe przekludzić zajtůw ku przestrzyńi mjan "$1"',
+'immobile-target-namespace-iw' => 'Link interwiki je felernym titlem pod kery mjołaby być przekludzůno zajta.',
+'immobile-source-page'         => 'Tyj zajty ńy idźe przekludźić.',
+'immobile-target-page'         => 'Ńy idźe przekludzić pod wskozany titel.',
+'imagenocrossnamespace'        => 'Ńy idźe přećepać grafiki do přestřyni mjan ńy přezno�onyj do grafik',
+'imagetypemismatch'            => 'Nowe rozšeřyńe mjana plika je inkšego typu kej jygo zawartość',
+'imageinvalidfilename'         => 'Mjano plika docelowygo je felerne',
+'fix-double-redirects'         => 'Poprow przekerowańa kere adresujům ku uoryginalnymu titlowi zajty',
+'move-leave-redirect'          => 'Uostow przekerowańy pode dotychczasowym titlem',
 
 # Export
 'export'            => 'Eksport zajtůw',
@@ -1798,7 +2016,7 @@ Wyeksportowane informacyje možna půźńij zaimportować do inkšej wiki, dźou
 
 Wyeksportowańy wjelu zajtůw wymogo wpisańo půńižej titli zajtůw, po jednym titlu we wjeršu a uokreślyńo �y mo zostać wyeksportowano bježůnco �y wšyjstke wersyje zajty s uopisůma sprawjyń abo tyž ino bježůnca wersyjo s uopisym uostatńygo sprawjyńo.
 
-Možeš tyž užyć linku, np.[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] do zajty „[[{{MediaWiki:Mainpage}}]]�.',
+Možeš tyž užyć linku, np.[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] do zajty „[[{{MediaWiki:Mainpage}}]]�.',
 'exportcuronly'     => 'Ino bježůnco wersyjo, bes historji',
 'exportnohistory'   => "----
 '''Pozůr:''' Wůuůn�ůno možliwość eksportowańo peunej historii zajtůw s užyćym tygo nařyńdźa s kuli kuopotůw s wydajnośćůn",
@@ -1814,7 +2032,7 @@ Možeš tyž užyć linku, np.[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] d
 'allmessagesdefault'        => 'Tekst důmyślny',
 'allmessagescurrent'        => 'Tekst uobecny',
 'allmessagestext'           => 'Uoto lista wšyjstkych kůmůńikatůw systymowych dostympnych w přestřyńi mjan MedjaWiki.
-Uodwjydź [http://www.mediawiki.org/wiki/Localisation Tuůma�yńy MediaWiki] a tyž [http://translatewiki.net Betawiki] kejbyś chćou u�estńi�yć w tuůma�yńu uoprůgramowańo MediaWiki.',
+Uodwjydź [http://www.mediawiki.org/wiki/Localisation Tuůma�yńy MediaWiki] a tyž [http://translatewiki.net translatewiki.net] kejbyś chćou u�estńi�yć w tuůma�yńu uoprůgramowańo MediaWiki.',
 'allmessagesnotsupportedDB' => "Ta zajta ńy može być užyta, bez tůž co zmjynna '''\$wgUseDatabaseMessages''' je wůuůn�ůno.",
 'allmessagesfilter'         => 'Filter mjan kůmuńikatůw:',
 'allmessagesmodified'       => 'Pokož ino zmodyfikowane',
@@ -1834,9 +2052,12 @@ Uodwjydź [http://www.mediawiki.org/wiki/Localisation Tuůma�yńy MediaWiki] a
 'import-interwiki-text'      => 'Wybjer wiki i nmjano zajty do importowańo.
 Daty a tyž mjana autorůw bydům zachowane.
 Wšyjstke uoperacyje importu transwiki sům uodnotowywane w [[Special:Log/import|rejeře importu]].',
+'import-interwiki-source'    => 'Zdrzůdło wiki/zajty:',
 'import-interwiki-history'   => 'Kopjuj couko historja sprowjyń tyi zajty',
 'import-interwiki-submit'    => 'Importuj',
 'import-interwiki-namespace' => 'Docelowo przestrzyń mjan:',
+'import-upload-filename'     => 'Mjano plika:',
+'import-comment'             => 'Kůmyntorz:',
 'importtext'                 => 'Używajůnc werkcojga [[Special:Export|eksportuj]] wyeksportuj plik ze zdrzůdłowyj wiki, naszkryflej go na swojym dysku, a potym wćepńij go tukej.',
 'importstart'                => 'Trwo importowańe zajtůw...',
 'import-revision-count'      => '$1 {{PLURAL:$1|wersyja|wersyje|wersyji}}',
@@ -1857,7 +2078,7 @@ Wšyjstke uoperacyje importu transwiki sům uodnotowywane w [[Special:Log/import
 'import-noarticle'           => 'Ńy ma zajtůw do zaimportowańo!',
 'import-nonewrevisions'      => 'Wšyjstke wersyje zostouy juž w�eśńij zaimportowane.',
 'xml-error-string'           => '$1 lińa $2, kolůmna $3 (bajt $4): $5',
-'import-upload'              => 'Wćepnij dane XML',
+'import-upload'              => 'Wćepej dane XML',
 'import-token-mismatch'      => 'Straćiły śe dane ze sesyje. Prosza spróbować zaś.',
 'import-invalid-interwiki'   => 'Ńy idźe importować s podanyj wiki.',
 
@@ -1870,9 +2091,9 @@ Wšyjstke uoperacyje importu transwiki sům uodnotowywane w [[Special:Log/import
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|wersyja|wersyje|wersyji}} ze $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mojo osobisto zajta',
+'tooltip-pt-userpage'             => 'Moja perzůnalno zajta',
 'tooltip-pt-anonuserpage'         => 'Zajta užytkowńika do adresu IP spod kerygo sprowjoš',
-'tooltip-pt-mytalk'               => 'Mojo godka',
+'tooltip-pt-mytalk'               => 'Moja zajta dyskusyje',
 'tooltip-pt-anontalk'             => 'Godka užytkowńika do adresu IP spod kerygo sprowjoš',
 'tooltip-pt-preferences'          => 'Moje preferéncyje',
 'tooltip-pt-watchlist'            => 'Lista artiklůw na kere daješ pozor',
@@ -1895,7 +2116,7 @@ Wšyjstke uoperacyje importu transwiki sům uodnotowywane w [[Special:Log/import
 'tooltip-search-go'               => 'Přyńdź do zajty uo gynau takym titlu, uo ile sam je',
 'tooltip-search-fulltext'         => 'Šnupej za wprowadzůnym tekstym na zajtach',
 'tooltip-p-logo'                  => 'Přodńo zajta',
-'tooltip-n-mainpage'              => 'Přelyź na Přodńo zajta',
+'tooltip-n-mainpage'              => 'Przelyź na Przodńo zajta',
 'tooltip-n-portal'                => 'Uo projekće, co sam možeš majštrować, kaj idźe znolyźć informacyje',
 'tooltip-n-currentevents'         => 'Informacyje uo aktualnych wydařyńach',
 'tooltip-n-recentchanges'         => 'Lista půmjyńanych na uostatku na wiki',
@@ -1929,6 +2150,9 @@ Wšyjstke uoperacyje importu transwiki sům uodnotowywane w [[Special:Log/import
 'tooltip-watch'                   => 'Dodej tyn artikel do pozorlisty',
 'tooltip-recreate'                => 'Wćepej nazod zajta mimo aže bůua w�eśńij wyćepano.',
 'tooltip-upload'                  => 'Rozpo�yńće wćepywańa',
+'tooltip-rollback'                => '"cofej" wycofuje jednym klikńyńćym půmjeńańe (-a) tyj zajty sprowjůne bez uostatnigo sprowjorza.',
+'tooltip-undo'                    => '"anuluj půmjyńańa" wycofuje ta zmjana a uodmyko uokno sprowjańa we trybje podglůndu.
+Dozwalo na naszkryflańy powodu we uopiśe půmjyńań.',
 
 # Metadata
 'nodublincore'      => 'Metadane zgodne s Dublin Core RDF zostouy wůuůn�ůne do tygo serwera.',
@@ -1936,12 +2160,12 @@ Wšyjstke uoperacyje importu transwiki sům uodnotowywane w [[Special:Log/import
 'notacceptable'     => 'Serwer wiki ńy je w stańy dostar�yć danych we formaće, kerygo Twoja přyglůndarka uo�ekuje.',
 
 # Attribution
-'anonymous'        => 'Anůńimowe užytkowńiki {{GRAMMAR:D.lp|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|Anůńimowy użytkowńik|Anůńimowe użytkowńiki}} {{SITENAME}}',
 'siteuser'         => 'Užytkowńik {{GRAMMAR:D.lp|{{SITENAME}}}} – $1',
 'lastmodifiedatby' => 'Uostatńy sprowjyńy tej zajty: $2, $1 (autor půmjyńań: $3)', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Inkše autory: $1.',
 'others'           => 'inkśi',
-'siteusers'        => 'Ůžytkowńiki {{GRAMMAR:D.lp|{{SITENAME}}}}: $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:użytkowńik|użytkowńiki}} $1',
 'creditspage'      => 'Autořy',
 'nocredits'        => 'Brak informacyji uo autorach tyi zajty.',
 
@@ -1982,10 +2206,11 @@ Nojprawdopodobńij zostoło to spowodowane bez link do zewnyntrznyj zajty intern
 'markedaspatrollederror-noautopatrol' => 'Ńy moš uprawńyń wymaganych do uozna�ańo swojich sprawjyń kej „sprawdzůne�.',
 
 # Patrol log
-'patrol-log-page'   => 'Dźynńik patrolowańo',
-'patrol-log-header' => 'Půniżej je dźeńńik patrolowańo zajtůw.',
-'patrol-log-line'   => 'ozna�ůu wersyja $1 artikla $2 kej sprawdzůno $3',
-'patrol-log-auto'   => '(autůmaty�ńy)',
+'patrol-log-page'      => 'Dźynńik patrolowańo',
+'patrol-log-header'    => 'Půniżej je dźeńńik patrolowańo zajtůw.',
+'patrol-log-line'      => 'ozna�ůu wersyja $1 artikla $2 kej sprawdzůno $3',
+'patrol-log-auto'      => '(autůmaty�ńy)',
+'log-show-hide-patrol' => '$1 rejer sprawdzańo',
 
 # Image deletion
 'deletedrevision'                 => 'Wyćepano popředńy wersyje $1',
@@ -2002,6 +2227,9 @@ $1',
 'previousdiff' => '� Popředńy sprowjyńy',
 'nextdiff'     => 'Nostympne sprowjyńy →',
 
+# Visual comparison
+'visual-comparison' => 'Porůwnańy treśći',
+
 # Media information
 'mediawarning'         => "'''Pozůr!''' Tyn plik može zawjerać zuośliwy kod. Jak go uodymkńyš možeš zaraźić swůj systym.<hr />",
 'imagemaxsize'         => 'Na zajtach uopisu plikůw uůgrańi� rozmjar uobrazkůw do:',
@@ -2014,10 +2242,12 @@ $1',
 'show-big-image'       => 'Oryginalno rozdźel�ość',
 'show-big-image-thumb' => '<small>Rozmiar podglůndu: $1 × $2 pikseli</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerjo nowych uobrozkůw',
 'imagelisttext'         => "Půnižyj na {{PLURAL:$1||posortowanyj $2}} liśće {{PLURAL:$1|znojdowo|znojdujům|znojdowo}} śe '''$1''' {{PLURAL:$1|plik|pliki|plikůw}}.",
 'newimages-summary'     => 'Na tyi ekstra zajće prezyntowane sům uostatńo wćepńynte pliki.',
+'newimages-legend'      => 'Filtruj',
+'newimages-label'       => 'Mjano plika (abo jygo tajla):',
 'showhidebots'          => '($1 boty)',
 'noimages'              => 'Brak plikůw do pokozańo.',
 'ilsubmit'              => 'Å nupej',
@@ -2222,6 +2452,18 @@ Nostympne linki w lińii uwažůmy za wyjůntki, to sům nazwy zajtůw, kaj plik
 'exif-lightsource-24'  => 'žarowe studyjne ISO',
 'exif-lightsource-255' => 'Inkše zdřuduo śwjotua',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Bes błyska flesza',
+'exif-flash-fired-1'    => 'S błyskym flesza',
+'exif-flash-return-0'   => 'bes funkcyji wykrywańo śwjotła uodbitygo',
+'exif-flash-return-2'   => 'ńy wykryto śwjotła uodbitygo',
+'exif-flash-return-3'   => 'wykryto śwjotło uodbite',
+'exif-flash-mode-1'     => 'wymuszůny błysk flesza',
+'exif-flash-mode-2'     => 'wymuszůny brak błyska flesza',
+'exif-flash-mode-3'     => 'tryb autůmatyczny',
+'exif-flash-function-1' => 'Ńy ma funkcyji flesza',
+'exif-flash-redeye-1'   => 'tryb redukowańo efektu czyrwůnych ślypjůw',
+
 'exif-focalplaneresolutionunit-2' => 'cole',
 
 'exif-sensingmethod-1' => 'ńyzdefińjowano',
@@ -2365,21 +2607,10 @@ Kod zawarty w linku straći wažność $4.',
 Potwjerdź chęć wćepańo nazod tygo artikla.",
 'recreate'            => 'Wćepej nazod',
 
-# HTML dump
-'redirectingto' => 'Překerowańy do [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Wy�yśćić pamjyńć podryn�nům do tyi zajty?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Å nupej za artiklami we kerych je ''$1''.",
-'searchnamed'      => "Šnupej za artiklami uo mjańe ''$1''.",
-'articletitles'    => "Artikle uo titlu za�ynojůncym śe uod ''$1''",
-'hideresults'      => 'Schowej wyniki',
-'useajaxsearch'    => 'Užywej šnupańo AJAX',
+'confirm-purge-top'    => 'Wy�yśćić pamjyńć podryn�nům do tyi zajty?',
+'confirm-purge-bottom' => 'Uodśwjyżeńy zajty wyczyśći pamjyńć podrynczno a wymuśi pokozańy jeij aktualnyj wersyji.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� popředńo zajta',
@@ -2441,11 +2672,12 @@ Možeš tyž [[Special:Watchlist/edit|užyć standardowygo edytora]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Ńyznany zna�ńik rozšeřyńo „$1�',
+'duplicate-defaultsort' => 'Pozůr: Domyślnym kluczym sortowańo bydźe "$2" a zastůmpi uůn wcześńij wystympujůncy klucz "$1".',
 
 # Special:Version
 'version'                          => 'Wersjo', # Not used as normal message but as header for the special page itself
 'version-extensions'               => 'Zainstalowane rozšeřyńa',
-'version-specialpages'             => 'Ekstra zajty',
+'version-specialpages'             => 'Szpecjalne zajty',
 'version-parserhooks'              => 'Haki analizatora skuadńi (ang. parser hooks)',
 'version-variables'                => 'Zmjynne',
 'version-other'                    => 'Inkše',
@@ -2470,13 +2702,13 @@ Možeš tyž [[Special:Watchlist/edit|užyć standardowygo edytora]].',
 'filepath-summary' => 'Ta ekstra zajta zwraco peuno śćyžka do plika.
 Grafiki sům pokazywane w peunyj rozdźel�ośći, inkše typy plikůw sům uodmykane we skojařůnym ś ńimi průgramje.
 
-Naškryflej sam mjano plika bez prefiksu „{{ns:image}}:�.',
+Naškryflej sam mjano plika bez prefiksu „{{ns:file}}:�.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Å nupej za duplikatym plika',
 'fileduplicatesearch-summary'  => 'Šnupej za duplikatůma plika na podstawje wartośći fůnkcyji skrůtu.
 
-Wklepej mjano plika s půmińjyńćym prefiksu „{{ns:image}}:�.',
+Wklepej mjano plika s půmińjyńćym prefiksu „{{ns:file}}:�.',
 'fileduplicatesearch-legend'   => 'Šnupej za duplikatůma plika',
 'fileduplicatesearch-filename' => 'Mjano pliku:',
 'fileduplicatesearch-submit'   => 'Å nupej',
@@ -2485,7 +2717,7 @@ Wklepej mjano plika s půmińjyńćym prefiksu „{{ns:image}}:�.',
 'fileduplicatesearch-result-n' => 'We {{GRAMMAR:MS.lp|{{SITENAME}}}} {{PLURAL:$2|je dodatkowo kopia|sům $2 dodatkowe kopje|je $2 dodatkowych kopii}} plika „$1�.',
 
 # Special:SpecialPages
-'specialpages'                   => 'Ekstra zajty',
+'specialpages'                   => 'Szpecjalne zajty',
 'specialpages-note'              => '----
 * Ekstra zajty uogůlńy dostympne.
 * <span class="mw-specialpagerestricted">Ekstra zajty do kerych dostymp je uograńiczůny.</span>',
@@ -2506,4 +2738,13 @@ Wklepej mjano plika s půmińjyńćym prefiksu „{{ns:image}}:�.',
 'blankpage'              => 'Pusto zajta',
 'intentionallyblankpage' => 'Ta zajta nauůmyślńy uostoua śe pusto',
 
+# External image whitelist
+'external_image_whitelist' => ' #Leave this line exactly as it is<pre>
+#Wstow půńiżyj tajle wyrażyń regularnych (yno to, co znojduje śe mjyndzy //)
+#Wyrażyńa te uostanům przipasowane ku URL-ům zewnyntrznym (bezpostrzredńo linkowanych) grafik
+#Dopasowane URL-e zostanům wyśwjetlůne kej grafiki, w przećiwnym raźe bydźe pokozany yno link ku grafice
+#Lińje kere s anfanga majům # sům traktowane kej kůmyntorze
+
+#Put all regex fragments above this line. Leave this line exactly as it is</pre>',
+
 );
diff --git a/languages/messages/MessagesTa.php b/languages/messages/MessagesTa.php
index 551abb5b..86e9b349 100644
--- a/languages/messages/MessagesTa.php
+++ b/languages/messages/MessagesTa.php
@@ -7,16 +7,11 @@
  * @author Mayooranathan
  * @author Sundar
  * @author Trengarasu
+ * @author Ulmo
  * @author Urhixidur
  * @author לערי ריינה�רט
  */
 
-$skinNames = array(
-	'standard' => "இயல�பான",
-	'nostalgia' => "பச�மை நினைவ� (Nostalgia)",
-	'cologneblue' => "கொலோன� (Cologne) நீலம� Blue",
-);
-
 $namespaceNames = array(
 	NS_MEDIA          => 'ஊடகம�',
 	NS_SPECIAL        => 'சிறப�ப�',
@@ -26,8 +21,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'பயனர�_பேச�ச�',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_பேச�ச�',
-	NS_IMAGE          => 'படிமம�',
-	NS_IMAGE_TALK     => 'படிமப�_பேச�ச�',
+	NS_FILE           => 'படிமம�',
+	NS_FILE_TALK      => 'படிமப�_பேச�ச�',
 	NS_MEDIAWIKI      => 'மீடியாவிக�கி',
 	NS_MEDIAWIKI_TALK => 'மீடியாவிக�கி_பேச�ச�',
 	NS_TEMPLATE       => 'வார�ப�ப�ர�',
@@ -41,7 +36,7 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'விக�கிபீடியா' => NS_PROJECT,
 	'விக�கிபீடியா_பேச�ச�' => NS_PROJECT_TALK,
-	'உர�வப�_பேச�ச�' => NS_IMAGE_TALK
+	'உர�வப�_பேச�ச�' => NS_FILE_TALK
 );
 $linkTrail = "/^([\xE0\xAE\x80-\xE0\xAF\xBF]+)(.*)$/sDu";
 
@@ -75,14 +70,16 @@ $messages = array(
 'tog-enotifrevealaddr'        => 'அறிவித�தல� மின�னஞ�சல�களில� எனத� மின�னஞ�சல� ம�கவரியை வெளிப�பட�த�த�',
 'tog-shownumberswatching'     => 'கவனிக�க�ம� பயனர�களின� எண�ணிக�கையைக� காட�டவ�ம�',
 'tog-fancysig'                => 'வெற�ற� கையொப�பம� (இணைப�ப� இல�லாமல�)',
-'tog-externaleditor'          => 'இயல�பிர�ப�பாக வெளி தொக�ப�ப� மென�பொர�ளைப� பாயன�பட�த�த�',
-'tog-externaldiff'            => 'வெளி வேற�பாட�டை இயல�பிர�ப�பாக பயன�பட�த�த�',
+'tog-externaleditor'          => 'இயல�பிர�ப�பாக வெளி தொக�ப�ப� மென�பொர�ளைப� பயன�பட�த�த� (இத� நிப�ணர�கள�க�க� மட�ட�ம�, உங�கள� கணினியில� சிறப�ப� அமைப�ப�கள� தேவைப�பட�ம�)',
+'tog-externaldiff'            => 'வெளி வேற�பாட�டை இயல�பிர�ப�பாக பயன�பட�த�த� (இத� நிப�ணர�கள�க�க� மட�ட�ம�, உங�கள� கணினியில� சிறப�ப� அமைப�ப�கள� தேவைப�பட�ம�)',
 'tog-showjumplinks'           => '"தாவிச� செல�லவ�ம�" இணைப�ப�களை ம�ட�க�க�',
 'tog-uselivepreview'          => 'நேரடி ம�ன�தோற�றத�தைப� பயன�பட�த�த� (ஜாவா நிரல�) (சோதனையில�ள�ளத�)',
 'tog-forceeditsummary'        => 'தொக�ப�ப�ச� ச�ர�க�கம� வெற�றாக இர�க�க�ம� போத� எனக�க� நினைவூட�ட�',
 'tog-watchlisthideown'        => 'எனத� தொக�ப�ப�க�களைக� கவனிப�ப�ப� பட�டியலிலிர�ந�த� மறை',
 'tog-watchlisthidebots'       => 'தானியங�கித� தொக�ப�ப�க�களைக� கவனிப�ப�ப� பட�டியலில� காட�டாதே',
 'tog-watchlisthideminor'      => 'சிற� தொக�ப�ப�க�களைக� கவனிப�ப�ப� பட�டியலில� காட�டாதே',
+'tog-watchlisthideliu'        => 'கவனிப�ப�ப� பட�டியலில� ப�க�பதிகை செய�த பயனர�களின� தொக�ப�ப�க�களை மறைக�கவ�ம�.',
+'tog-watchlisthideanons'      => 'கவனிப�ப�ப� பட�டியலில� அடையாளம� காட�டாத பயனர�களின� தொக�ப�ப�க�களை மறைக�கவ�ம�.',
 'tog-ccmeonemails'            => '�னைய பயனர�க�க� நான� அன�ப�ப�ம� மின�னஞ�சல�களின� நகலொன�றை எனக�க�ம� அன�ப�ப�',
 'tog-diffonly'                => 'மாற�றங�களை ஒப�பிட�ம� போத� அதன� கீழ� பக�க உள�ளடக�கத�தைக� காட�டாதே',
 'tog-showhiddencats'          => 'மறைக�கப�பட�ட பக�ப�ப�களைக� காட�ட�',
@@ -91,8 +88,6 @@ $messages = array(
 'underline-never'   => 'எப�போத�மில�லை',
 'underline-default' => 'உலாவி இயல�பிர�ப�ப�',
 
-'skinpreview' => '(ம�ன�தோற�றம�)',
-
 # Dates
 'sunday'        => 'ஞாயிற�',
 'monday'        => 'திங�கள�',
@@ -186,7 +181,7 @@ $messages = array(
 'mytalk'         => 'என� பேச�ச�',
 'anontalk'       => 'இந�த �.பி. ம�கவரிக�கான பேச�ச�',
 'navigation'     => 'வழிசெல�த�தல�',
-'and'            => 'மற�ற�ம�',
+'and'            => '&#32;மற�ற�ம�',
 
 # Metadata in edit box
 'metadata_help' => 'மேல�நிலைத� தரவ�:',
@@ -214,7 +209,7 @@ $messages = array(
 'deletethispage'    => 'இப�பக�கத�தை நீக�க�',
 'undelete_short'    => '{{PLURAL:$1|ஒர� தொக�ப�பை|$1 தொக�ப�ப�க�களை}} மீட�டெட�',
 'protect'           => 'காப�ப�ச�செய�',
-'protect_change'    => 'காப�பை மாற�ற�',
+'protect_change'    => 'மாற�ற�',
 'protectthispage'   => 'இப� பக�கத�தை காப�ப�ச� செய�',
 'unprotect'         => 'காப�பைநீக�க�',
 'unprotectthispage' => 'இப�பக�கத�தின� காப�பை நீக�க�',
@@ -249,8 +244,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} பற�றி',
 'aboutpage'            => 'Project:விபரம�',
-'bugreports'           => 'வழ� அறிக�கை',
-'bugreportspage'       => 'Project:வழ� அறிக�கைகள�',
 'copyright'            => 'உள�ளடக�கங�கள� $1 இன� கீழ� கிடைக�கின�றன.',
 'copyrightpagename'    => '{{SITENAME}} பதிப�ப�ரிமை',
 'copyrightpage'        => '{{ns:project}}:பதிப�ப�ரிமை',
@@ -273,9 +266,7 @@ $messages = array(
 
 'badaccess'        => 'அன�மதி தவற�',
 'badaccess-group0' => 'நீங�கள� கோரிய செயலைச� செய�வதற�க� உங�கள�க�க� அன�மதி கிடையாத�.',
-'badaccess-group1' => 'நீங�கள� கோரிய செயற�பாட� $1 க�ழ�வின� பயனர�க�க� மட�ட�மே.',
-'badaccess-group2' => 'நீங�கள� கோரிய செயற�பாட� $1 க�ழ�க�கள�ள� ஒன�றின� பயனர�கள�க�க� மட�ட�மே.',
-'badaccess-groups' => 'நீங�கள� கோரிய செயற�பாட� $1 க�ழ�க�கள�ள� ஒன�றின� பயனர�கள�க�க� மட�ட�மே.',
+'badaccess-groups' => 'நீங�கள� கோரிய செயற�பாட� $1 {{PLURAL:$2|க�ழ�|க�ழ�க�கள�ள� ஒன�றின�}} பயனர�கள�க�க� மட�ட�மே.',
 
 'versionrequired'     => 'மீடியாவிக�கியின� $1 பதிப�ப� தேவை',
 'versionrequiredtext' => 'இப�பக�கத�தைப� பயன�பட�த�த மீடியாவிக�கியின� $1 பதிப�ப� தேவை. [[Special:Version|பதிப�ப�ப� பக�கத�தைப�]] பார�க�க.',
@@ -289,6 +280,8 @@ $messages = array(
 'editsection'             => 'தொக�',
 'editold'                 => 'தொக�',
 'viewsourceold'           => 'மூலத�தை காட�ட�க',
+'editlink'                => 'தொக�',
+'viewsourcelink'          => 'மூலத�தை காண�க',
 'editsectionhint'         => '$1 பக�தியை தொக�',
 'toc'                     => 'பொர�ளடக�கம�',
 'showtoc'                 => 'காட�ட�',
@@ -298,7 +291,7 @@ $messages = array(
 'restorelink'             => '{{PLURAL:$1|ஒர� நீக�கப�பட�ட தொக�ப�பை|$1 நீக�கப�பட�ட தொக�ப�ப�களை}}',
 'feedlinks'               => 'உள�ளிட�:',
 'feed-invalid'            => 'பிழையான ஓடை வகை.',
-'feed-unavailable'        => '{{SITENAME}} தளத�தில� தகவல� ஓடைகள� வழங�கப�பட�வதில�லை',
+'feed-unavailable'        => 'தகவல� ஓடைகள� வழங�கப�பட�வதில�லை',
 'site-rss-feed'           => '$1 RSS ஓடை',
 'site-atom-feed'          => '$1 Atom ஓடை',
 'page-rss-feed'           => '"$1" RSS ஓடை',
@@ -366,7 +359,6 @@ $1',
 'cannotdelete'         => 'க�றிக�கப�பட�ட பக�கத�தையோ கோப�பையோ நீக�க ம�டியாத�. (வேற� யாராலோ �ற�கெனவே நீக�கப�பட�டிர�க�கலாம�.)',
 'badtitle'             => 'பழ�த�ள�ள தலைப�ப�',
 'badtitletext'         => 'கோரப�பட�ட பக�கத�தின� தலைப�ப� செல�லாத�, வெற�மை, அல�லத� பிழையாக இணைக�கப�பட�ட மொழிகளிடை அல�லத� விக�கியிடைத� தலைப�பாக�ம�.',
-'perfdisabled'         => 'மன�னிக�கவ�ம�! இந�த வசதி தற�காலிகமாக செயலற�றதாக�கப�பட�ட�ள�ளத�. �னெனில� இத� விக�கியை ஒர�வர�ம� பயன�பட�த�த ம�டியாத அளவ�க�க� வேகத�தைக� க�றைத�த�ள�ளத�.',
 'perfcached'           => 'பின�வர�ம� தரவ�கள� இடைமாற�றைக� கொண�ட�ள�ளன தரவ�கள� நிகழ�நிலையிலில�லாமல� இர�க�கலாம�.',
 'perfcachedts'         => 'பின�வர�ம� தரவ�கள� இடைமாற�றைக� கொண�ட�ள�ளன, தரவ�கள� கடைசியாக  $1 இல� இற�றைப�பட�த�தப�பட�டன.',
 'querypage-no-updates' => 'இப�பக�கத�த�க�கான இற�றைப�பட�த�தல�கள� செயலிழக�கச� செய�யப�பட�ட�ள�ளன. இங�கே உள�ளத� தரவ�கள� தற�சமயம� இற�றைப�பட�த�தப�படமாட�டாத�.',
@@ -391,11 +383,11 @@ $1',
 
 # Login and logout pages
 'logouttitle'                => 'பயனர� விட�பதிகை',
-'logouttext'                 => '<strong>நீங�கள� இப�பொழ�த� விட�பதிகையில� உள�ளீர�கள�.</strong>
+'logouttext'                 => "'''நீங�கள� இப�பொழ�த� விட�பதிகையில� உள�ளீர�கள�.'''
 
-நீங�கள� தொடர�ந�த�ம� {{SITENAME}} தளத�தை அனனியாக பயன�பட�த�தலாம�, அல�லத� அதே பயனராகவோ வேற� பயனராகவோ மீண�ட�ம� ப�க�பதிகை செய�யலாம�. உங�கள� உலவியின� இடைமாற�ற� நீக�கப�பட�ம� வரை சில பக�கங�கள� தொடர�ந�த�ம� ப�க�பதிகையில� உள�ளத� போன�றே காட�சி தர�ம� என�பதைக� கவனிக�கவ�ம�.',
+நீங�கள� தொடர�ந�த�ம� {{SITENAME}} தளத�தை அனனியாக பயன�பட�த�தலாம�, அல�லத� [[Special:UserLogin|மீண�ட�ம� ப�க�பதிகை]] அதே பயனராகவோ வேற� பயனராகவோ செய�யலாம�. உங�கள� உலவியின� இடைமாற�ற� நீக�கப�பட�ம� வரை சில பக�கங�கள� தொடர�ந�த�ம� ப�க�பதிகையில� உள�ளத� போன�றே காட�சி தர�ம� என�பதைக� கவனிக�கவ�ம�.",
 'welcomecreation'            => '==நல�வரவ�, $1!==
-உங�கள�க�கான பயனர� கணக�க� உர�வாக�கப�பட�ட�ள�ளத�.{{SITENAME}} தளத�த�க�கான உங�கள� விர�பத�தேர�வ�களை உங�கள�க�கேற�றவாற� மாற�றிக� கொள�ள மறவாதீர�கள�.',
+உங�கள�க�கான பயனர� கணக�க� உர�வாக�கப�பட�ட�ள�ளத�. உங�கள�க�கேற�றவாற� [[Special:Preferences|{{SITENAME}} விர�ப�பத�தேர�வ�களை]] மாற�றிக� கொள�ள மறவாதீர�கள�.',
 'loginpagetitle'             => 'பயனர� ப�க�பதிகை',
 'yourname'                   => 'பயனர�பெயர�:',
 'yourpassword'               => 'உங�கள� கடவ�ச�சொல�',
@@ -403,7 +395,6 @@ $1',
 'remembermypassword'         => 'எனத� கடவ�ச�சொல�லை அமர�வ�களிடையே நினைவில� வைத�திர�க�கவ�ம�.',
 'yourdomainname'             => 'உங�கள� உரிமைப�பரப�ப�:',
 'externaldberror'            => 'வெளி உற�திப�பட�த�தலில� �ற�பட�ட தவற� காரணமாக உங�கள� வெளி கணக�கை இற�றைப�பட�த�த ம�டியாத�.',
-'loginproblem'               => '<b>உங�கள� ப�க�பதிகை தொடர�பில� பிரச�சினை உண�ட�.</b><br />திர�ம�ப ம�யலவ�ம�!',
 'login'                      => 'ப�க�பதிகை',
 'nav-login-createaccount'    => 'ப�க�பதிகை/பயனர� கணக�க� தொடக�கம�',
 'loginprompt'                => '{{SITENAME}} தளத�த�க�க� ப�க�பதிகை செய�ய உங�கள� இணைய உலாவியின� ஞாபகிகளை செயற�பட�த�த வேண�ட�ம�.',
@@ -422,6 +413,7 @@ $1',
 'youremail'                  => 'உங�கள� மின�னஞ�சல�:',
 'username'                   => 'பயனர�பெயர�:',
 'uid'                        => 'பயனர� அடையாள எண�:',
+'prefs-memberingroups'       => 'பின�வர�ம� {{PLURAL:$1|க�ழ�|க�ழ�க�களில�}} உற�ப�பினர�:',
 'yourrealname'               => 'உங�கள� உண�மைப� பெயர�:',
 'yourlanguage'               => 'மொழி:',
 'yournick'                   => 'கையொப�பம�:',
@@ -431,24 +423,24 @@ $1',
 'email'                      => 'மின�னஞ�சல�',
 'prefs-help-realname'        => 'உண�மையான பெயர� கட�டாயமற�றத�. நீங�கள� இதை கொட�த�தால� உங�கள� ஆக�கங�கள�க�கான உரிப�பளிப�ப�களின� போத� இத� பயன�பட�ம�.',
 'loginerror'                 => 'ப�க�பதிகைத� தவற�',
-'prefs-help-email'           => 'மின�னஞ�சல� (விர�ப�பத�தின� பேரில�) உங�கள� பயனர� பக�கம� அல�லத� பயனர� பேச�ச�ப� பக�கத�தில� இர�ந�த� மற�ற பயனர�கள� உங�கள�க�க� மின�னஞ�சல� அன�ப�ப உதவ�ம�. எனின�ம� உங�கள� மின�னஞ�சல� ம�கவரி வெளிப�பட�த�தப�பட மாட�டாத�.',
+'prefs-help-email'           => 'மின�னஞ�சல� விர�ப�பத�தின� பேரில� ஆனால� உங�கள� கடவ�ச�சொல� உங�கள�க�க� நினைவில�லையென�றால�, ப�திய கடவ�ச�சொல� ஒன�றை மின�னஞ�சல� மூலம� அன�ப�ப வழிசெய�ய�ம�.மேல�ம� உங�கள� பயனர� பக�கம� அல�லத� பயனர� பேச�ச�ப� பக�கத�தில� இர�ந�த� மற�ற பயனர�கள� உங�கள�க�க� மின�னஞ�சல� அன�ப�ப உதவ�ம�. எனின�ம� உங�கள� மின�னஞ�சல� ம�கவரி வெளிப�பட�த�தப�பட மாட�டாத�.',
 'prefs-help-email-required'  => 'மின�னஞ�சல� ம�கவரி தேவை.',
 'nocookiesnew'               => '{{SITENAME}} தளத�த�க�கான உங�கள� பயனர� கணக�க� உர�வாக�கப�பட�ட�ள�ளத�, ஆனால� நீங�கள� ப�க�பதிகை செய�யவில�லை. பயனர�களைப� ப�க�பதிகை செய�ய {{SITENAME}} தளம� ஞாபகிகளைப� (க�க�கிகள�) பயன�பட�த�த�கிறத�. நீங�கள� ஞாபகிகளைச� செயலற�றவையாக�கிய�ள�ளீர�கள�. தயவ�செய�த� அவற�றைச� செயற�பட�த�தியப� பின� உங�கள� ப�திய பயனர� பெயர�டன�ம�, கடவ�ச� சொல�ல�டன�ம� ப�க�பதிகை செய�ய�ங�கள�.',
 'nocookieslogin'             => '{{SITENAME}} தளம� பயனர�களைப� ப�க�பதிகை செய�வதற�க� ஞாபகிகளைப� (க�க�கிகள�) பயன�பட�த�த�கிறத�. நீங�கள� ஞாபகிகளைச� செயலிழக�கச� செய�த�ள�ளீர�கள�. தயவ�செய�த� அவற�றைச� செயற�பாட�ள�ளதாக�கித� திர�ம�பவ�ம� ம�யல�ங�கள�.',
 'noname'                     => 'நீங�கள� கொட�த�த பயனர� பெயர� செல�ல�படியற�றத�.',
 'loginsuccesstitle'          => 'ப�க�பதிகை வெற�றி',
 'loginsuccess'               => 'நீங�கள� தற�பொழ�த� {{SITENAME}} தளத�தில� "$1" கணக�கினூடாக ப�க�பதிகை செய�த�ள�ளீர�கள�.',
-'nosuchuser'                 => '"$1" பெயரில� பயனர� எவர�மில�லை. எழ�த�த�ப� பிழைகளைச� சரி பார�க�கவ�ம�, அல�லத� பின�வர�ம� படிவத�தை உபயோகித�த� ப�திய பயனர� கணக�கொன�றை உர�வாக�கவ�ம�.',
+'nosuchuser'                 => '"$1" பெயரில� பயனர� எவர�மில�லை. எழ�த�த�ப� பிழைகளைச� சரி பார�க�கவ�ம�, அல�லத� [[Special:UserLogin/signup|ப�திய பயனர� கணக�கொன�றை உர�வாக�கவ�ம�]].',
 'nosuchusershort'            => '"<nowiki>$1</nowiki>" என�ற பெயரில� பயனர� யார�ம� இல�லை. நீங�கள� உள�ளிட�ட பெயரை சரி பார�க�கவ�ம�.',
 'nouserspecified'            => 'நீங�கள� பயனர� பெயரொன�றை க�றிப�பிட வேண�ட�ம�.',
 'wrongpassword'              => 'நீங�கள� கொட�த�த கடவ�ச�சொல� சரியல�ல. மீண�ட�ம� ம�யற�சிக�கவ�ம�.',
 'wrongpasswordempty'         => 'நீங�கள� வெற�ற�க� கடவ�ச� சொல�லை அளித�திர�க�கிறீர�கள�. திர�ம�ப ம�யலவ�ம�.',
-'passwordtooshort'           => 'உங�கள� கடவ�ச�சொல� மிகச� சிறியதாக உள�ளத�. கடவ�ச�சொல�லில� க�றைந�தத� $1 எழ�த�த�க�களாவத� இர�க�க வேண�ட�ம�.',
+'passwordtooshort'           => 'உங�கள� கடவ�ச�சொல� மிகச� சிறியதாக உள�ளத�. கடவ�ச�சொல�லில� க�றைந�தத� {{PLURAL:$1|1 எழ�த�த� |$1 எழ�த�த�க�களாவத�}} இர�க�க வேண�ட�ம�. மேல�ம� கடவ�ச�சொல� பயனர�பெயராக இர�க�கக�கூடாத�.',
 'mailmypassword'             => 'ப�திய கடவ�ச� சொல�லொன�றை மின�னஞ�சல� செய�யவ�ம�',
 'passwordremindertitle'      => '{{SITENAME}} தளத�திலிர�ந�தான கடவ�ச�சொல� நினைவூட�டல�',
 'passwordremindertext'       => 'யாரோ ஒர�வர� (நீங�களாக இர�க�கலாம�, IP ம�கவரி $1 இலிர�ந�த�)
-ப�திய விக�கிப�பீடியா ($4) ப�க�பதிகை கடவ�ச�சொல� ஒன�ற� அன�ப�ப�ம�படி கோரிய�ள�ளார�.
-பயனர� "$2" க�கான கடவ�ச�சொல� இப�பொழ�த� "$3".
+{{SITENAME}} ($4) தளத�திற�க� ப�திய கடவ�ச�சொல� ஒன�ற� அன�ப�ப�ம�படி கோரிய�ள�ளார�.
+பயனர� "$2" க�கான தற�காலிக கடவ�ச�சொல� இப�பொழ�த� "$3".
 நீங�கள� ப�க�பதிகை செய�த� கடவ�ச�சொல�லை மாற�றிக�கொள�ளவ�ம�.
 
 வேற� யாராவத� இவ�வேண�ட�கோளை விட�த�திர�ந�தால� அல�லத� உங�கள� கடவ�ச�சொல� நினைவ�க�க� வந�திர�ந�த� நீங�கள� கடவ�ச�சொல�லை மாற�ற விர�ம�பாவிட�டால� இம�மின�னஞ�சலை ப�றக�கணித�த�விட�ட� உங�கள� பழைய கடவ�ச�சொல�லை தொடர�ந�த� பயன�பட�த�தலாம�.',
@@ -456,31 +448,37 @@ $1',
 'passwordsent'               => '"$1" பயனர�க�கான மின�னஞ�சல� ம�கவரிக�க� ஒர� ப�திய கடவ�ச�சொல� அன�ப�பப�பட�ட�ள�ளத�. பெற�ற�க�கொண�டத�ம� தயவ�செய�த� மீண�ட�ம� ப�க�பதிகை செய�யவ�ம�.',
 'blocked-mailpassword'       => 'உங�கள� �.பி. ம�கவரி தட�க�கப�பட�ட�ள�ளத�, விசம செயற�பாட�களைத� தவிர�க�க கடவ�ச�சொல� மீட�ப�ச� செயலியை நீங�கள� பயன�பட�த�த� அன�மதிக�கப�படவில�லை.',
 'eauthentsent'               => 'உற�திப�பட�த�தல� மின�னஞ�சலொன�ற� நீங�கள� கொட�த�த மின�னஞ�சல� ம�கவரிக�க� அன�ப�பப� பட�ட�ள�ளத�. மேலதிகமாக எந�த மின�னஞ�சல�ம� இந�த ம�கவரிக�க� அன�ப�பப�பட� ம�ன�னர�, மின�னலில� கொட�க�கப�பட�ட�ள�ள அறிவ�ற�த�தல�களின� படி, இம�மின�னஞ�சல� ம�கவரி உங�கள�டையத� என�பதை உற�திப�பட�த�தவ�ம�.',
-'throttled-mailpassword'     => 'கடந�த $1 மணித�தியாலத�த�ள� ஒர� கடவ�ச�சொல� நினைவூட�டல� மின�னஞ�சல� �ற�கனவே அன�ப�பப� பட�ட�விட�டத�. விசம பயன�பாட�களைத� தவிர�ப�பதற�காக $1 மணித�தியாலத�த�ள� ஒர� கடவ�ச�சொல� நினைவூட�டல� மின�னஞ�சல� மட�ட�மே அன�ப�பப�பட�ம�.',
+'throttled-mailpassword'     => 'கடந�த {{PLURAL:$1|மணிநேரத�த�க�க�ள�|$1 மணிநேரங�கள�க�க�ள�}} ஒர� கடவ�ச�சொல� நினைவூட�டல� மின�னஞ�சல� �ற�கனவே அன�ப�பப� பட�ட�விட�டத�. விசம பயன�பாட�களைத� தவிர�ப�பதற�காக {{PLURAL:$1|மணிநேரத�திற�க�|$1 மணிநேரங�கள�க�க�}} ஒர� கடவ�ச�சொல� நினைவூட�டல� மின�னஞ�சல� மட�ட�மே அன�ப�பப�பட�ம�.',
 'mailerror'                  => 'மின�னஞ�சல� அன�ப�ப�வதில� தவற�: $1',
-'acct_creation_throttle_hit' => 'மன�னிக�கவ�ம�, நீங�கள� �ற�கெனவே $1 கணக�க�கள� உர�வாக�கிய�ள�ளீர�கள�. மேல�ம� உர�வாக�கம�டியாத�.',
-'emailauthenticated'         => 'உங�கள� மின�னஞ�சல� ம�கவரி $1 அன�ற� உற�திப�பட�த�தப�பட�டத�.',
+'acct_creation_throttle_hit' => 'மன�னிக�கவ�ம�, நீங�கள� �ற�கெனவே {{PLURAL:$1|1 கணக�க�|$1 கணக�க�கள�}} உர�வாக�கிய�ள�ளீர�கள�. மேல�ம� உர�வாக�கம�டியாத�.',
+'emailauthenticated'         => 'உங�கள� மின�னஞ�சல� ம�கவரி $2 ஆம� தேதியன�ற� $3 மணிக�க� உற�திப�பட�த�தப�பட�டத�.',
 'emailnotauthenticated'      => 'உங�கள� மின�னஞ�சல� ம�கவரி இன�னம�ம� உற�திப�பட�த�தப�படவில�லை. பின�வர�வனவற�ற�க�க� மின�னஞ�சல� அன�ப�பட மாட�டாத�.',
 'noemailprefs'               => 'பின�வர�வனவற�றை இயங�க�நிலைக�க� கொண�ட�வர மின�னஞ�சல� ம�கவரியொன�றக� க�றிப�பிடவ�ம�.',
 'emailconfirmlink'           => 'உங�கள� மின�னஞ�சல� ம�கவரியை உற�திப�பட�த�தவ�ம�',
-'invalidemailaddress'        => 'மின�னஞ�சல� ம�கவரி பிழையான கட�டமைப�பைக� கொண�ட�ள�ளப�படியால� மின�னஞ�சல� ம�கவரியை �ற�ற�க�கொள�ள ம�டியாத�. சரியான கட�டமைப�ப�டன� கூடிய மின�னஞ�சல� ம�கவரியை இடவ�ம� அல�லத� அவ�விடத�தை வெற�றாக விடவ�ம�.',
+'invalidemailaddress'        => 'மின�னஞ�சல� ம�கவரி பிழையான கட�டமைப�பைக� கொண�ட�ள�ளப�படியால� மின�னஞ�சல� ம�கவரியை �ற�ற�க�கொள�ள ம�டியாத�. தயவ�செய�த�  சரியான கட�டமைப�ப�டன� கூடிய மின�னஞ�சல� ம�கவரியை இடவ�ம� அல�லத� அவ�விடத�தை வெற�றாக விடவ�ம�.',
 'accountcreated'             => 'கணக�க� உர�வாக�கப�பட�டத�.',
 'accountcreatedtext'         => '$1 என�ற பெயரில� பயனர� கணக�க� உர�வாக�கப�பட�டத�.',
 'createaccount-title'        => '{{SITENAME}} தளத�த�க�கான கணக�க� தொடக�கம�',
 'createaccount-text'         => 'யாரோ ஒர�வர� உங�கள� மின�னஞ�சல� ம�வரிக�காக {{SITENAME}} ($4) தளத�தில� கணக�கொண�றை தொடங�கிய�ள�ளார�. கணக�கின� பெயர� "$2", கடவ�ச�சொல� "$3". நீங�கள� இப�போத� ப�க�பதிகைச� செய�த� கடவ�ச�சொல�லை மாற�ற வேண�ட�ம�.
 
 இக�கணக�க� தவற�தலாக தொடங�கப�பட�டிர�ந�தால�, இத�தகவலைப� ப�றக�கணிக�கலாம�.',
+'login-throttled'            => 'இக� கணக�கின� கடவ�ச�சொல�லை அளவ�க�க� மீறிய தடவைகள� ம�யற�சித�த�ள�ளீர�கள�. மீண�ட�ம� ம�யற�சிக�க�ம�ன� சற�ற�த� தாமதிய�ங�கள�.',
 'loginlanguagelabel'         => 'மொழி: $1',
 
 # Password reset dialog
-'resetpass'               => 'கணக�கிற�கான கடவ�ச�சொல�லை மாற�றியைமை',
-'resetpass_announce'      => 'நீங�கள� தற�காலிக மின�னஞ�சல� க�றியீட�ட�டன� ப�க�பதிகை செய�த�ள�ளீர�கள�. ப�க�பதிகையை நிறைவ�ச� செய�ய ப�தியக� கடவ�ச� சொல�லொன�றை இங�கே தட�டசிட�க:',
-'resetpass_header'        => 'கடவ�ச�சொல�லை மாற�றியமை',
-'resetpass_submit'        => 'கடவ�ச�சொல�லை பதிவ�செய�த� ப�க�பதிகை செய�',
-'resetpass_success'       => 'உங�களத� கடவ�ச�சொல� வெற�றிகரமாக மாற�றப�பட�ட�ள�ளத�! உங�களை ப�க�பதிகை செய�யப�பட�கிறத�...',
-'resetpass_bad_temporary' => 'செல�ல�படியற�ற தற�காலிக கடவ�ச�சொல�. நீர� �ற�கனவே வெற�றிகரமாக கடவ�ச�சொல�லை மாற�றியிர�க�கலாம� அல�லத� ப�திய தற�காலிக கவவ�ச� சொல�லை கோற�க.',
-'resetpass_forbidden'     => '{{SITENAME}} தளத�தில� கடவ�ச�சொற�கள� மாற�றப�பட ம�டியாத�',
-'resetpass_missing'       => 'எங�கிர�ந�த� என�றத� தகவலில�லை.',
+'resetpass'                 => 'கடவ�ச�சொல�லை மாற�றியமை',
+'resetpass_announce'        => 'நீங�கள� தற�காலிக மின�னஞ�சல� க�றியீட�ட�டன� ப�க�பதிகை செய�த�ள�ளீர�கள�. ப�க�பதிகையை நிறைவ�ச� செய�ய ப�தியக� கடவ�ச� சொல�லொன�றை இங�கே தட�டசிட�க:',
+'resetpass_header'          => 'கணக�கிற�கான கடவ�ச�சொல�லை மாற�றியமை',
+'oldpassword'               => 'பழைய கடவ�ச�சொல�:',
+'newpassword'               => 'ப�திய கடவ�ச�சொல�:',
+'retypenew'                 => 'ப�திய கடவ�ச�சொல�லை மீண�ட�ம� தட�டச�சிட�',
+'resetpass_submit'          => 'கடவ�ச�சொல�லை பதிவ�செய�த� ப�க�பதிகை செய�',
+'resetpass_success'         => 'உங�களத� கடவ�ச�சொல� வெற�றிகரமாக மாற�றப�பட�ட�ள�ளத�! உங�களை ப�க�பதிகை செய�யப�பட�கிறத�...',
+'resetpass_bad_temporary'   => 'செல�ல�படியற�ற தற�காலிக கடவ�ச�சொல�. நீர� �ற�கனவே வெற�றிகரமாக கடவ�ச�சொல�லை மாற�றியிர�க�கலாம� அல�லத� ப�திய தற�காலிக கவவ�ச� சொல�லை கோற�க.',
+'resetpass_forbidden'       => 'கடவ�ச�சொற�கள� மாற�றப�பட ம�டியாத�',
+'resetpass-no-info'         => 'இப�பக�கத�தை நேரடியாக அண�க�வதற�க� நீங�கள� ப�க�பதிகை செய�திர�க�கவேண�ட�ம�.',
+'resetpass-submit-loggedin' => 'கடவ�ச�சொல�லை மாற�ற�',
+'resetpass-temp-password'   => 'தற�காலிக கடவ�ச�சொல�:',
 
 # Edit page toolbar
 'bold_sample'     => 'தடித�த எழ�த�த�க�கள�',
@@ -503,8 +501,8 @@ $1',
 'hr_tip'          => 'கிடைக� கோட� (அரிதாகவே பயன�பட�த�த�ங�கள�)',
 
 # Edit pages
-'summary'                   => 'ச�ர�க�கம�',
-'subject'                   => 'உட�பொர�ள�/தலைப�ப�',
+'summary'                   => 'ச�ர�க�கம�:',
+'subject'                   => 'உட�பொர�ள�/தலைப�ப�:',
 'minoredit'                 => 'இத� ஒர� சிற� தொக�ப�ப�',
 'watchthis'                 => 'இக�கட�ட�ரையைக� கவனிக�கவ�ம�',
 'savearticle'               => 'பக�கத�தை சேமி',
@@ -519,8 +517,8 @@ $1',
 'missingcommenttext'        => 'கீழே ச�ர�க�கமொன�றக� க�றிப�பிடவ�ம�.',
 'missingcommentheader'      => "'''நினைவூட�டல�:''' நீர� உட�பொர�ள�/தலைப�ப� ச�ர�க�கமொன�றைக� கொட�க�கவில�லை.
 இன�னொர� ம�றை பக�கத�தை சேமி என�பதை அழ�த�தினால� உங�கள� ச�ர�க�கமெத�வ�மில�லாமல� சேமிக�கப�பட�ம�.",
-'summary-preview'           => 'ச�ர�க�க ம�ன�தோற�றம�',
-'subject-preview'           => 'உட�பொர�ள�/தலைப�ப� ம�ன�தோற�றம�',
+'summary-preview'           => 'ச�ர�க�க ம�ன�தோற�றம�:',
+'subject-preview'           => 'உட�பொர�ள�/தலைப�ப� ம�ன�தோற�றம�:',
 'blockedtitle'              => 'பயனர� தட�க�கப�பட�ட�ள�ளார�',
 'blockedtext'               => "<big>'''உங�கள� பயனர� பெயர� அல�லத� �.பி. ம�கவரி தட�க�கப�பட�ட�ள�ளத�.'''</big>
 
@@ -528,21 +526,22 @@ $1',
 
 * தடை தொடக�கம�: $8
 * தடை ம�டிவ�: $6
-* தடை செய�தவர�: $7
+* தடை செய�யப�பட�டவர�: $7
 
-$1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage-sysop}}|நிர�வாகி]] ஒர�வரையோ அன�கி தடைப� பற�றி கலந�த�ரையாடலாம�. 'இப� பயனர�க�க� மின�னஞ�சல� செய�' என�ற வசதியை நீங�கள� பயன�பட�த�த�வதிலிந�த� தடைச� செய�யப�பட�டிர�ந�தாலோ அல�லத� [[Special:Preferences|என� விர�ப�பத�தேர�வ�கள�]] பக�கத�தில� இயங�க�நிலையில�ள�ள மின�னஞ�சல� ம�கவரியை தராத போதோ பயனர�க�க� மின�னஞ�சல� செய�ய ம�டியாத�. உங�களத� தற�போதைய �.பி. ம�கவரி $3, தடை எண�  #$5 என�பவற�றை கேள�விகள� கேட�க�ம� போத� கட�டாயம� க�றிப�பிடவ�ம�.",
-'autoblockedtext'           => 'வேற� தடைச�செய�யப�பட�ட பயனரால� பயன�பட�த�தப�பட�ட உங�கள� �.பி. ம�கவரி தானியக�கமாக தட�க�கப�பட�ட�ள�ளத�. பின�வர�ம� காரணத�தை(களை)க� காட�டி $1 இவ� �.பி. ம�கவரியைத� தடை செய�த�ள�ளார�:
+$1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage-sysop}}|நிர�வாகி]] ஒர�வரையோ அன�கி தடைப� பற�றி கலந�த�ரையாடலாம�. 'இப� பயனர�க�க� மின�னஞ�சல� செய�' என�ற வசதியை நீங�கள� பயன�பட�த�த�வத�லிர�ந�த� தடைச� செய�யப�பட�டிர�ந�தாலோ அல�லத� [[Special:Preferences|என� விர�ப�பத�தேர�வ�கள�]] பக�கத�தில� இயங�க�நிலையில�ள�ள மின�னஞ�சல� ம�கவரியை தராத போதோ பயனர�க�க� மின�னஞ�சல� செய�ய ம�டியாத�. உங�களத� தற�போதைய �.பி. ம�கவரி $3 மற�ற�ம� தடை எண�  #$5 என�பவற�றை கேள�விகள� கேட�க�ம� போத� கட�டாயம� க�றிப�பிடவ�ம�.",
+'autoblockedtext'           => '$1 ஆல� தடைச�செய�யப�பட�ட வேற� பயனரால� பயன�பட�த�தபட�டதால�, உங�கள� �.பி. ம�கவரி தானியக�கமாக தட�க�கப�பட�ட�ள�ளத�. அதற�கான காரணம� பின�வர�மாற�: 
 
 :\'\'$2\'\'
 
 * தடை தொடக�கம�: $8
 * தடை ம�டிவ�: $6
+* தடை செய�யப�பட�டவர�: $7
 
 $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage-sysop}}|நிர�வாகி]] ஒர�வரையோ அன�கி தடைப� பற�றி கலந�த�ரையாடலாம�.
-"இப� பயனர�க�க� மின�னஞ�சல� செய�" என�ற வசதியை நீங�கள� பயன�பட�த�த�வதிலிந�த� தடைச� செய�யப�பட�டிர�ந�தாலோ அல�லத� [[Special:Preferences|என� விர�ப�பத�தேர�வ�கள�]] பக�கத�தில� இயங�க�நிலையில�ள�ள மின�னஞ�சல� ம�கவரியை தராத போதோ பயனர�க�க� மின�னஞ�சல� செய�ய ம�டியாத�.
 
-உங�களத� தடை எண�  $5.
-கேள�விகள� கேட�க�ம� போத� இதைக� கட�டாயம� க�றிப�பிடவ�ம�.',
+"இப� பயனர�க�க� மின�னஞ�சல� செய�" என�ற வசதியை நீங�கள� பயன�பட�த�வதிலிர�ந�த� தடைச� செய�யப�பட�டிர�ந�தாலோ அல�லத� [[Special:Preferences|என� விர�ப�பத�தேர�வ�கள�]] பக�கத�தில� இயங�க�நிலையில�ள�ள மின�னஞ�சல� ம�கவரியை தராத போதோ பயனர�க�க� மின�னஞ�சல� செய�ய ம�டியாத�.
+
+உங�களத� தற�போதைய �.பி. ம�கவரி $3 மற�ற�ம� தடை எண� #$5 என�பவற�றை கேள�விகள� கேட�க�ம� போத� கட�டாயம� க�றிப�பிடவ�ம�.',
 'blockednoreason'           => 'காரணம� தரப�படவில�லை',
 'blockedoriginalsource'     => "'''$1''' பக�கத�தின� மூலம� கீழே தரப�பட�ட�ள�ளத�:",
 'blockededitsource'         => "'''$1''' பக�கத�த�க�கான '''உங�கள� தொக�ப�ப�கள�''' கீழே கொட�க�கப�பட�ட�ள�ளன:",
@@ -559,27 +558,32 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'accmailtext'               => "'$1' பயனர�க�க�க�கான கடவ�ச�சொல� $2 க�க� அன�ப�பப�பட�ட�ள�ளத�.",
 'newarticle'                => '(ப�தித�)',
 'newarticletext'            => 'ஒர� இணைப�பினூடாக நீங�கள� வந�த�ள�ள இப�பக�கம� இன�ன�ம� உர�வாக�கப�படவில�லை. பக�கத�தை உர�வாக�க�வதற�க�க� கீழேய�ள�ள கட�டத�த�ள� தட�டச�சிடத� தொடங�க�ங�கள�. (மேலதிக விபரங�கள�க�க� [[{{MediaWiki:Helppage}}|உதவிப� பக�கத�தைப�]] பார�க�கவ�ம�). நீங�கள� தவற�தலாக இங�கே வந�திர�ந�தால�, உங�கள� உலாவியின� பின� செல�வதற�கான பொத�தானைச� சொட�க�கவ�ம�.',
-'anontalkpagetext'          => '---- இத� இன�ன�ம� கணக�கொன�ற� �ற�பட�த�தாத அல�லத� இதனை வழமையாகப� பயன�பட�த�தாத பயனர�கள�க�க�ரிய கலந�த�ரையாடல� பக�கமாக�ம�. அதனால� நாங�கள� இவரை அடையாளம� காண�பதற�க� எண�சார�ந�த �பி ம�கவரியைப� பயன�பட�த�த�கிறோம�. இவ�வாறான �பி ம�கவரிகள� பல பயனர�களினால� பகிர�ந�த�கொள�ளப�படலாம�. நீங�கள� ஒர� ம�கவரியற�ற பயனராயிர�ந�த�, தொடர�பற�ற கர�த�த�க�கள� உங�களைக� க�றித�த�ச� சொல�லப�பட�டிர�ப�பதாக நீங�கள� உணர�ந�தால�, ம�கவரியற�ற �னைய பயனர�கள�டனான க�ழப�பங�களை எதிர�காலத�தில� தவிர�ப�பதற�க�, தயவ�செய�த� கணக�கொன�றை �ற�பட�த�த�ங�கள� அல�லத� [[சிறப�ப�:Userlogin|ப�க�பதிகை]] செய�ய�ங�கள�.
-
-----',
+'anontalkpagetext'          => "----''இத� இன�ன�ம� கணக�கொன�ற� �ற�பட�த�தாத அல�லத� அதனை வழமையாகப� பயன�பட�த�தாத பயனர�கள�க�க�ரிய கலந�த�ரையாடல� பக�கமாக�ம�. அதனால� நாங�கள� இவரை அடையாளம� காண�பதற�க� எண�சார�ந�த �பி ம�கவரியைப� பயன�பட�த�த வேண�டியதாய� இர�க�கின�றத�. இவ�வாறான �பி ம�கவரிகள� பல பயனர�களினால� பகிர�ந�த�கொள�ளப�படலாம�. 
+நீங�கள� ஒர� ம�கவரியற�ற பயனராயிர�ந�த�, தொடர�பற�ற கர�த�த�க�கள� உங�களைக� க�றித�த�ச� சொல�லப�பட�டிர�ப�பதாக நீங�கள� உணர�ந�தால�, ம�கவரியற�ற �னைய பயனர�கள�டனான க�ழப�பங�களை எதிர�காலத�தில� தவிர�ப�பதற�க�, தயவ�செய�த� [[Special:UserLogin/signup|ப�திய கணக�கொன�றை �ற�பட�த�த�ங�கள�]] அல�லத� [[Special:UserLogin|ப�க�பதிகை]] செய�ய�ங�கள�.''",
 'noarticletext'             => 'இப� பக�கத�தில� தற�பொழ�த� உள�ளடக�கம� எத�வ�மில�லை.நீங�கள� இப�பக�க [[Special:Search/{{PAGENAME}}|தலைப�பை வேற� பக�கங�களில� தேடவோ]] அல�லத� [{{fullurl:{{FULLPAGENAME}}|action=edit}} இப�பக�கத�தை தொக�க�கவோ] ம�டிய�ம�.',
 'userpage-userdoesnotexist' => '"$1" என�றக� கணக�க� இன�னம�ம� பதிவ�ச� செய�யப�படவில�லை. இதை உர�வாக�க/தொக�க�க வேண�ட�மா என�பதை உற�திப�பட�த�தவ�ம�.',
-'clearyourcache'            => "'''கவனிக�க:''' சேமித�த பின�னர�, நீங�கள� செய�த மாற�றங�களைக� காண�பதற�க� உங�கள� உலவியின� இடைமாற�ற� அகற�றப�பட வேண�ட�ம�: '''மொஸில�லா/சபாரி/கொன�க�வெரர�:''' ''Shift+reload''(அல�லத� ''ctrl-Shift-R''), '''இண�டர�நெட� எக�ஸ�ப�ளோரர�: ''' ''ctrl-f5'','''ஒப�பேரா:''' ''F5''",
-'usercssjsyoucanpreview'    => "<strong>உதவி:</strong>உங�களத� சி.எஸ�.எஸ�/ஜெ.எஸ�. � சேமிக�க� ம�ன�னதாக 'ம�ன�தோற�றத�தைக� காட�ட�' பொத�தானைப� பயனபட�த�தவ�ம�",
-'usercsspreview'            => "'''உங�களத� சி.எஸ�.எஸ�. இன� ம�ன� தோற�றத�தை மட�ட�மே காண�கிறீர�கள� அத� இன�னம�ம� சேமிக�கப�படவில�லை என�பதை நினைவில� கொள�ளவ�ம�!'''",
+'clearyourcache'            => "'''கவனிக�க - சேமித�த பின�னர�, நீங�கள� செய�த மாற�றங�களைக� காண�பதற�க� உங�கள� உலவியின� இடைமாற�ற� அகற�றப�பட வேண�ட�ம�.'''
+'''மொஸில�லா / பயர�பாக�ஸ� / சபாரி:''' ''Shift+Reload'', அல�லத� ''Ctrl-F5'' அல�லத� ''Ctrl-R''
+( மசிண�டோஷில� ''Command-R'');
+'''கொன�க�வெரர�: ''' ''Reload'' அல�லத� ''F5'';
+'''ஒபேரா:''' ''Tools → Preferences'' இல� இடைமாற�றை அகற�றவ�ம�;
+'''இண�டர�நெட� எக�ஸ�ப�ளோரர�:''' ''Ctrl-Refresh'' அல�லத� ''Ctrl-F5''.",
+'usercssjsyoucanpreview'    => "'''உதவி:'''உங�களத� சி.எஸ�.எஸ�/ஜெ.எஸ�. � சேமிக�க� ம�ன�னதாக 'ம�ன�தோற�றத�தைக� காட�ட�' பொத�தானைப� பயனபட�த�தவ�ம�",
+'usercsspreview'            => "'''உங�களத� பயனர� சி.எஸ�.எஸ�. இன� ம�ன� தோற�றத�தை மட�ட�மே காண�கிறீர�கள� என�பதை நினைவில� கொள�ளவ�ம�.'''
+'''இத� இன�னம�ம� சேமிக�கப�படவில�லை!'''",
 'userjspreview'             => "'''நீர� உமத� ஜாவா நிரலை சோதிக�கிறீர� அல�லத� ம�ன� தோற�றத�தைப� பார�க�கிறீர� என�பதை நினைவக�கவ�ம�, இன�னம�ம� சேமிக�கப�படவில�லை!'''",
 'userinvalidcssjstitle'     => "'''எச�சரிக�கை:'''  \"\$1\" என�றப� பெயரில� தோல�லொற�க� கிடையாத�. சி.எஸ�.எஸ� மற�ற�ம� ஜெ.எஸ�. பக�கங�கள� ஆங�கில கீழ� வரிசைப� பெயர�களைக� கொண�டிர�க�க வேண�ட�ம� என�பதைக� கவனிக�கவ�ம�. எ+கா: {{ns:user}}:Foo/monobook.css என�பத� சரியான வடிவம� {{ns:user}}:Foo/Monobook.css என�பத� பிழையான வடிவம�.",
 'updated'                   => '(இற�றைப�பட�த�தப�பட�டத�)',
-'note'                      => '<strong>க�றிப�ப�:</strong>',
-'previewnote'               => '<strong>இத� ஒர� ம�ன�தோற�றம� மட�ட�மே, உங�கள� மாற�றங�கள� இன�ன�ம� சேமிக�கப�படவில�லை!</strong>',
+'note'                      => "'''க�றிப�ப�:'''",
+'previewnote'               => "'''இத� ஒர� ம�ன�தோற�றம� மட�ட�மே, உங�கள� மாற�றங�கள� இன�ன�ம� சேமிக�கப�படவில�லை!'''",
 'previewconflict'           => 'இந�த ம�ன�தோற�றம� உரை தொக�ப�ப�ப� பக�தியின� மேற�பக�தியில�ள�ள உரையைப� பிரதிபலிக�கின�றத�. நீங�கள� இப�பொழ�த� சேமித�தால� மேற�படி தோற�றமே கிடைக�க�ம�.',
-'session_fail_preview'      => '<strong>உங�கள� அமர�வ�த� தரவ�கள� அழிந�த�ப�போனமையால� உங�கள� தொக�ப�பை செயற�பட�த�த ம�டியவில�லை. அர�ள� கூர�ந�த� மீண�ட�ம� ம�யலவ�ம�. அத�வ�ம� பலனளிக�காவிட�டால� விட�பதிகைச� செய�த� மீண�ட�ம� ப�க�பதிகைச� செய�யவ�ம�</strong>',
-'session_fail_preview_html' => '<strong>உங�கள� அமர�வ�த� தரவ�கள� அழிந�த�ப�போனமையால� உங�கள� தொக�ப�பை செயற�பட�த�த ம�டியவில�லை.</strong>
+'session_fail_preview'      => "'''உங�கள� அமர�வ�த� தரவ�கள� அழிந�த�ப�போனமையால� உங�கள� தொக�ப�பை செயற�பட�த�த ம�டியவில�லை. அர�ள� கூர�ந�த� மீண�ட�ம� ம�யலவ�ம�. அத�வ�ம� பலனளிக�காவிட�டால� விட�பதிகைச� செய�த� மீண�ட�ம� ப�க�பதிகைச� செய�யவ�ம�'''",
+'session_fail_preview_html' => "'''மன�னிக�கவ�ம�! உங�கள� அமர�வ�த� தரவ�கள� அழிந�த�ப�போனமையால� உங�கள� தொக�ப�பை செயற�பட�த�த ம�டியவில�லை.'''
 
-கரணியம�:{{SITENAME}} தளத�தில� எச�.டி.எம�.எல�. ம�ட�க�கிவிடப�பட�ட�ள�ளமையால� ஜாவா நிரல� தாக�க�தல�களைத� தவிர�க�க�ம� பொர�ட�ட� ம�ன�தோற�றம� ம�டக�கப�பட�ட�ள�ளத�.
+''கரணியம�:{{SITENAME}} தளத�தில� பக�க�வப�படாத எச�.டி.எம�.எல�. ம�ட�க�கிவிடப�பட�ட�ள�ளமையால� ஜாவா நிரல� தாக�க�தல�களைத� தவிர�க�க�ம� பொர�ட�ட� ம�ன�தோற�றம� ம�டக�கப�பட�ட�ள�ளத�.''
 
-<strong>இத� ஒர� ம�றையான தொக�ப�பாயின�, அர�ள� கூர�ந�த� மீண�ட�ம� ம�யலவ�ம�. அத�வ�ம� பலனளிக�காவிட�டால� விட�பதிகை செய�த� மீண�ட�ம� ப�க�பதிகை செய�யவ�ம�</strong>',
-'token_suffix_mismatch'     => '<strong>உங�கள� தொக�ப�பின�ள� சேவையாளர� நிற�த�தக�க�றியீட�களை செற�கிய�ள�ளனதன� காரணமாக உங�களத� தொக�ப�ப� நிராகரிக�கப�பட�ட�ள�ளத�. இத� வலைத�தளத�தை மையமாகக� கொண�ட அடையாளம� காட�டாத ப�ரொக�சி சேவைகளிலிர�ந�த� தொக�க�க�ம� போத� �ற�படலாம�.</strong>',
+'''இத� ஒர� ம�றையான தொக�ப�பாயின�, அர�ள� கூர�ந�த� மீண�ட�ம� ம�யலவ�ம�. அத�வ�ம� பலனளிக�காவிட�டால� [[Special:UserLogout|விட�பதிகை]] செய�த� மீண�ட�ம� ப�க�பதிகை செய�யவ�ம�'''",
+'token_suffix_mismatch'     => "'''உங�கள� தொக�ப�பின�ள� சேவையாளர� நிற�த�தக�க�றியீட�களை செற�கிய�ள�ளனதன� காரணமாக உங�களத� தொக�ப�ப� நிராகரிக�கப�பட�ட�ள�ளத�. இத� வலைத�தளத�தை மையமாகக� கொண�ட அடையாளம� காட�டாத ப�ரொக�சி சேவைகளிலிர�ந�த� தொக�க�க�ம� போத� �ற�படலாம�.'''",
 'editing'                   => 'தொக�ப�ப� $1',
 'editingsection'            => 'தொக�ப�ப� $1 (பிரிவ�)',
 'editingcomment'            => 'தொக�ப�ப� $1 (கர�த�த�)',
@@ -591,21 +595,23 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 \"பக�கத�தை சேமிக�கவ�ம�\" என�ற பொத�தானை அழ�த�த�ம�போத� உரைப�பக�தியின� மேற�பக�கத�தில�ள�ள உரை '''மட�ட�மே''' சேமிக�கப�பட�ம�.",
 'yourtext'                  => 'உங�கள� உரை',
 'storedversion'             => 'சேமிக�கப�பட�ட பதிப�ப�',
-'nonunicodebrowser'         => '<strong>எச�சரிக�கை: உங�களத� உலாவி ஒர�ங�க�க�க�றியை ஆதரிக�கவில�லை. உங�கள� தொக�ப�ப�க�களைத� பாத�காப�பகத� தொடர�ந�த�ச� செய�ய வழிம�றையொன�ற�ள�ளத�: அஸ�கியில�லாத எழ�த�த�கள� அடி பதினாறைக� கொண�ட க�றிகளாக தொக�ப�ப�க� கட�டத�தில� தென�பட�ம�.</strong>',
-'editingold'                => '<strong>எச�சரிக�கை: நீங�கள� தொக�த�த�க�கொண�டிர�ப�பத� இப�பக�கத�தின� பழைய திர�த�தமொன�றையாக�ம�. இதை நீங�கள� சேமித�தால�, மேற�படி திர�த�தத�தின� பின�னர� செய�யப�பட�ட மாற�றங�கள� அனைத�த�ம� இழக�கப�பட�ம�.</strong>',
+'nonunicodebrowser'         => "'''எச�சரிக�கை: உங�களத� உலாவி ஒர�ங�க�க�க�றியை ஆதரிக�கவில�லை. உங�கள� தொக�ப�ப�க�களைத� பாத�காப�பகத� தொடர�ந�த�ச� செய�ய வழிம�றையொன�ற�ள�ளத�: அஸ�கியில�லாத எழ�த�த�கள� அடி பதினாறைக� கொண�ட க�றிகளாக தொக�ப�ப�க� கட�டத�தில� தென�பட�ம�.'''",
+'editingold'                => "'''எச�சரிக�கை: நீங�கள� தொக�த�த�க�கொண�டிர�ப�பத� இப�பக�கத�தின� பழைய திர�த�தமொன�றையாக�ம�. இதை நீங�கள� சேமித�தால�, மேற�படி திர�த�தத�தின� பின�னர� செய�யப�பட�ட மாற�றங�கள� அனைத�த�ம� இழக�கப�பட�ம�.'''",
 'yourdiff'                  => 'வேற�பாட�கள�',
-'copyrightwarning'          => '{{SITENAME}} தளத�தில� உங�கள� பங�களிப�ப�கள� $2 உரிமத�தின� கீழ� அளிக�கப�பட�டதாக கர�தப�பட�ம�.(மேலதிக தகவல�கள�க�க� $1 பக�கத�தைப� பார�க�க) உங�கள�டைய எழ�த�த�க�கள� கட�மையாகத� தொக�க�கப�பட�வதையோ, விர�ம�பியபடி விநியோகிக�கப�பட�வதையோ நீங�கள� விர�ம�பாவிடில� இங�கே சமர�ப�பிக�காதீர�.<br />
+'copyrightwarning'          => "{{SITENAME}} தளத�தில� உங�கள� பங�களிப�ப�கள� $2 உரிமத�தின� கீழ� அளிக�கப�பட�டதாக கர�தப�பட�ம�.(மேலதிக தகவல�கள�க�க� $1 பக�கத�தைப� பார�க�க) உங�கள�டைய எழ�த�த�க�கள� கட�மையாகத� தொக�க�கப�பட�வதையோ, விர�ம�பியபடி விநியோகிக�கப�பட�வதையோ நீங�கள� விர�ம�பாவிடில� இங�கே சமர�ப�பிக�காதீர�.<br />
 அத�த�டன� நீங�களே இதை எழ�தியதாகவோ, அல�லத� வேற� பொத�க� களம� அல�லத� அத� போன�ற விட�தலையளிக�க�ம� மூலங�களிலிர�ந�த� பிரதி பண�ணியிர�ப�பதாகவோ உற�தி கூற�கிறீர�கள�.
-<strong>பதிப�ப�ரிமைய�ள�ள ஆக�கங�களை அன�மதியின�றி சமர�ப�பிக�க வேண�டாம�!</strong>',
-'copyrightwarning2'         => '{{SITENAME}} தளத�த�க�கான உமத� பங�களிப�ப�க�கள� அனைத�த�ம� வேற� பயனர�களால� தொக�க�கப� படவோ, மாற�றங�கள� செய�யப�படவோ அல�லத� நீக�கப�படவோ கூட�ம�. உமத� பங�களிப�ப�கள� கட�மையாகத� தொக�க�கப�பட�வதை நீர� விர�ம�பாவிடில� இங�கே சமர�ப�பிக�காதீர�.<br />
-நீர� இதை எழ�தியதாகவோ, அல�லத� வேற� பொத�க� களம� அல�லத� அத� போன�ற விட�தலையளிக�க�ம� மூலங�களிலிர�ந�த� பிரதி பண�ணியிர�ப�பதாகவோ உற�தி கூற�கிறீர�.(மேலதிக தகவல�கள�க�க� $1).<strong>பதிப�ப�ரிமைய�ள�ள ஆக�கங�களை அன�மதியின�றி சமர�ப�பிக�காதீர�!</strong>',
-'longpagewarning'           => '<strong>எச�சரிக�கை: இந�தப� பக�கம� $1 கிலோபைட�ஸ� நீளமானத�; 32 kb யை அண�மிக�க�ம� அல�லத� அதில�ம� கூடிய அளவ�ள�ள பக�கங�களைத� தொக�ப�பதில� சில உலாவிகள�க�க� பிரச�சினை உண�ட�. தயவ�செய�த� பக�கங�களைச� சிறிய பக�திகளாகப� பிரிப�பத� பற�றிக� கவனத�தில� எட�க�கவ�ம�.</strong>',
-'longpageerror'             => '<strong>தவற�: நீங�கள� இட�ட உரை $1 கிலோபைட�ட�கள� நீளமானத�, $2 கிலோபைட�டில�ம� கூடிய அளவ�ள�ள பக�கங�கள� இங�கே அன�மதிக�கப�பட�வதில�லை. உங�கள� உரையை சேமிக�க ம�டியாத�.</strong>',
-'readonlywarning'           => '<strong>எச�சரிக�கை: பராமரிப�ப�க�காகத� தரவ�த�தளம� பூட�டப�பட�ட�ள�ளத�, எனவே உங�கள� தொக�ப�ப�க�களை இப�பொழ�த� சேமிக�க ம�டியாத�. உங�கள� உரையை இன�னொர� உரைக� கோப�பில� வெட�டி ஒட�டி சேமித�த�வைத�த�ப� பின�ப� உபயோகிக�கலாம�.</strong>',
-'protectedpagewarning'      => '<strong>எச�சரிக�கை: ம�றைமை செயற�பட�த�த�னர� (நிர�வாகி) அன�மதிய�ள�ள பயனர�கள� மட�ட�மே தொக�க�க�ம� விதத�தில� இந�த பக�கம� பூட�டப�பட�ட�ள�ளத�.</strong>',
+'''பதிப�ப�ரிமைய�ள�ள ஆக�கங�களை அன�மதியின�றி சமர�ப�பிக�க வேண�டாம�!'''",
+'copyrightwarning2'         => "{{SITENAME}} தளத�த�க�கான உமத� பங�களிப�ப�க�கள� அனைத�த�ம� வேற� பயனர�களால� தொக�க�கப� படவோ, மாற�றங�கள� செய�யப�படவோ அல�லத� நீக�கப�படவோ கூட�ம�. உமத� பங�களிப�ப�கள� கட�மையாகத� தொக�க�கப�பட�வதை நீர� விர�ம�பாவிடில� இங�கே சமர�ப�பிக�காதீர�.<br />
+நீர� இதை எழ�தியதாகவோ, அல�லத� வேற� பொத�க� களம� அல�லத� அத� போன�ற விட�தலையளிக�க�ம� மூலங�களிலிர�ந�த� பிரதி பண�ணியிர�ப�பதாகவோ உற�தி கூற�கிறீர�.(மேலதிக தகவல�கள�க�க� $1).'''பதிப�ப�ரிமைய�ள�ள ஆக�கங�களை அன�மதியின�றி சமர�ப�பிக�காதீர�!'''",
+'longpagewarning'           => "'''எச�சரிக�கை: இந�தப� பக�கம� $1 கிலோபைட�ஸ� நீளமானத�; 32 kb யை அண�மிக�க�ம� அல�லத� அதில�ம� கூடிய அளவ�ள�ள பக�கங�களைத� தொக�ப�பதில� சில உலாவிகள�க�க� பிரச�சினை உண�ட�. தயவ�செய�த� பக�கங�களைச� சிறிய பக�திகளாகப� பிரிப�பத� பற�றிக� கவனத�தில� எட�க�கவ�ம�.'''",
+'longpageerror'             => "'''தவற�: நீங�கள� இட�ட உரை $1 கிலோபைட�ட�கள� நீளமானத�, $2 கிலோபைட�டில�ம� கூடிய அளவ�ள�ள பக�கங�கள� இங�கே அன�மதிக�கப�பட�வதில�லை. உங�கள� உரையை சேமிக�க ம�டியாத�.'''",
+'readonlywarning'           => "'''எச�சரிக�கை: பராமரிப�ப�க�காகத� தரவ�வழங�கன� பூட�டப�பட�ட�ள�ளத�, எனவே உங�கள� தொக�ப�ப�க�களை இப�பொழ�த� சேமிக�க ம�டியாத�. உங�கள� உரையை இன�னொர� உரைக� கோப�பில� வெட�டி ஒட�டி சேமித�த�வைத�த�ப� பின�ப� உபயோகிக�கலாம�.'''
+
+இந�த தரவ�வழங�கனை பூட�டிய நிர�வாகி அத�க�றித�த� அளித�த விளக�கம� பின�வர�மாற�: $1",
+'protectedpagewarning'      => "'''எச�சரிக�கை: ம�றைமை செயற�பட�த�த�னர� (நிர�வாகி) அன�மதிய�ள�ள பயனர�கள� மட�ட�மே தொக�க�க�ம� விதத�தில� இந�த பக�கம� பூட�டப�பட�ட�ள�ளத�.'''",
 'semiprotectedpagewarning'  => "'''க�றிப�ப�:''' ப�க�பதிகை செய�த பயனர�கள� மட�ட�ம� தொக�க�கக� கூடியவகையில� இப�பக�கம� காக�கப�பட�ட�ள�ளத�.",
 'cascadeprotectedwarning'   => 'எச�சரிக�கை: படிநிலைக� காப�ப�க�க�ட�பட�த�தப�பட�ட பின�வர�ம� {{PLURAL:$1|பக�கத�தில�|பக�கங�களில�}} இணைக�கப�பட�ட�ள�ளமையால� ம�றைமை செயற�பட�த�த�னர� (நிர�வாகி) அன�மதிய�ள�ள பயனர�கள� மட�ட�மே தொக�க�ககூடிய வகையில� இப�பக�கம� பூட�டப�பட�ட�ள�ளத�:',
-'titleprotectedwarning'     => '<strong>எச�சரிக�கை:  இப�பக�கம� சில பயனர�களால� மட�ட�மே தொக�க�கக� கூடிய வகையில� பூட�டப�பட�ட�ள�ளத�.</strong>',
+'titleprotectedwarning'     => "'''எச�சரிக�கை:  இப�பக�கம� சில பயனர�களால� மட�ட�மே தொக�க�கக� கூடிய வகையில� பூட�டப�பட�ட�ள�ளத�.'''",
 'templatesused'             => 'இப�பக�கத�தில� பயன�பட�த�தப�பட�ட�ள�ள வார�ப�ப�ர�க�கள�:',
 'templatesusedpreview'      => 'இம�ம�ன�தோற�றத�தில� பயன�பட�த�தப�பட�ட�ள�ள வார�ப�ப�ர�க�கள�:',
 'templatesusedsection'      => 'இப�பக�தியில� பயன�பட�த�தப�பட�ட�ள�ள வார�ப�ப�ர�க�கள�:',
@@ -615,25 +621,31 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'nocreatetitle'             => 'பக�கத� தொடக�கம� மட�ட�ப�பட�த�தப�பட�ட�ள�ளத�',
 'nocreatetext'              => '{{SITENAME}} ப�திய பக�கங�களை ஆக�க�வதற�கான அன�மதியை மட�ட�ப�பட�த�திய�ள�ளத�.
 நீங�கள� �ற�கனவே இர�க�க�ம� பக�கங�களைத� தொக�க�க ம�டிய�ம� அல�லத� [[Special:UserLogin|ப�க�பதிகை செய�யவ�ம� அல�லத� கணக�கொன�றை தொடங�க�ங�கள�]].',
-'nocreate-loggedin'         => '{{SITENAME}} தளத�தில� ப�தியப� பக�கங�களைத� தொடங�க�வதற�க� உங�கள�க�க� அன�மதி கிடையாத�.',
+'nocreate-loggedin'         => 'ப�தியப� பக�கங�களைத� தொடங�க�வதற�க� உங�கள�க�க� அன�மதி கிடையாத�.',
 'permissionserrors'         => 'அன�மதி தவற�கள�',
 'permissionserrorstext'     => 'பின�வர�ம� {{PLURAL:$1|காரணத�த�க�காக|காரணங�கள�க�காக}} நீங�கள� அதைச� செய�ய ம�டியாத�:',
 'recreate-deleted-warn'     => "'''எச�சரிக�கை: �ற�கனவே நீக�கப�பட�ட பக�கமொன�றை மீண�ட�ம� தொடங�க விழைகிறீர�கள�.'''
 
 இப�பக�கத�தை தொடர�ந�த� தொக�ப�பத� தக�மா என�பதை கர�த�திற� கொள�ளவ�ம�.
 உங�கள� வசதிக�காக ம�ன�பிர�ந�த பக�கத�த�க�கான நீக�கல� பதிவ� இங�கே தரப�பட�ட�ள�ளத�:",
+'deletelog-fulllog'         => 'ம�ழ� பதிவைய�ம� காண�க',
+'edit-gone-missing'         => 'இப�பக�கத�தை நிகழ�நிலைப� பட�த�தம�டியவில�லை.
+இத� நீக�கப�பட�டதாக இர�க�கலாம�.',
+'edit-no-change'            => 'வாசகங�கள�க�க� எந�த மாற�றம�ம� செய�யப�படவில�லை என�பதனால� உங�கள� தொக�ப�ப� ப�றக�கணிக�கப�பட�டத�.',
+'edit-already-exists'       => 'ப�திய பக�கமொன�றை உர�வாக�க ம�டியாத�. 
+இப�பக�கம� �ற�கனவே உள�ளத�.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'  => 'எச�சரிக�கை: இப�பக�கம� அதிகளவ� இலக�கணப� பாக�பட�த�திச� சார�ப�களைக� கொண�ட�ள�ளத�.
 
-இத� $2க�க�ம� க�றைவான இலக�கணப� பாக�பட�த�திச� சார�ப�களைக� கொண�டிர�க�க வேண�ட�ம�, ஆனால� தற�போத� $1 சார�ப�கள� உள�ளன.',
+இத� $2 {{PLURAL:$2|சார�ப�க�க�ம�|சார�ப�கள�க�க�ம� }} க�றைவான இலக�கணப� பாக�பட�த�திச� சார�ப�களைக� கொண�டிர�க�க வேண�ட�ம�, ஆனால� தற�போத� இதில� {{PLURAL:$1|$1 சார�ப�|$1 சார�ப�கள�}} உள�ளன.',
 'expensive-parserfunction-category' => 'அதிகளவ� இலக�கணப� பாக�பட�த�திச� சார�ப�களைக� கொண�ட பக�கங�கள�',
 
 # "Undo" feature
 'undo-success' => 'இத�தொக�க�ப�பை மீளமைக�க ம�டிய�ம�. அர�ள� கூர�ந�த� கீழே காட�டப�பட�ட�ள�ள ஒப�பீட�டைப� பார�த�த� நீங�கள� செய�ய விழைவத� இத�வா என�பதை உற�திப� பட�த�தியப�பின� பக�கத�தை சேமி என�பதன� மேல� சொட�கவ�ம�.',
 'undo-failure' => 'ம�ரண�பாடான இடைப�பட�டத� தொக�ப�ப�கள� காரணமாக இத�தொக�ப�பை மீளமைக�க ம�டியாத�.',
 'undo-norev'   => 'நீங�கள� க�றித�தவாரான தொக�ப�ப� இல�லாத படியாலோ அல�லத� நீக�கப�பட�ட படியாலோ இத�தொக�ப�பை மீளமைக�க ம�டியாத�.',
-'undo-summary' => '[[Special:Contributions/$2|$2]] ([[User talk:$2|பேச�ச�]]) பயனரால� செய�யப�பட�ட திர�த�தம� $1 இல�லாத� செய�யப�பட�டத�',
+'undo-summary' => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) பயனரால� செய�யப�பட�ட திர�த�தம� $1 இல�லாத� செய�யப�பட�டத�',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'கணக�கைத� தொடங�கள� ம�டியாத�',
@@ -642,29 +654,28 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 இதற�காக $3 கொட�த�த�ள�ள காரணங�கள�  ''$2''",
 
 # History pages
-'viewpagelogs'        => 'இப�பக�கத�த�க�கான பதிகைகளைப� பார�',
-'nohistory'           => 'இப� பக�கத�த�க�க�த� தொக�ப�ப� வரலாற� இல�லை.',
-'revnotfound'         => 'திர�த�தம� காணப�படவில�லை',
-'revnotfoundtext'     => 'இப� பக�கத�த�க�க�ரிய, நீங�கள� கோரிய பழைய திர�த�தம� காணப�படவில�லை. இந�தப� பக�கத�தை அண�க�வதற�க� நீங�கள� பயன�பட�த�திய இணைய ம�கவரியை அர�ள� கூர�ந�த� சரி பார�க�கவ�ம�.',
-'currentrev'          => 'நடைம�றையில�ள�ள திர�த�தம�',
-'revisionasof'        => '$1 இல� நிலவ�ம� திர�த�தம�',
-'revision-info'       => '$2 பயனரால� செய�யப�பட�ட $1 அன�றிர�ந�தவாரான திர�த�தம�',
-'previousrevision'    => '�ம�ந�தைய தொக�ப�ப�',
-'nextrevision'        => 'ப�திய தொக�ப�ப�→',
-'currentrevisionlink' => 'நடப�பில�ள�ள திர�த�தம�',
-'cur'                 => 'நடப�ப�',
-'next'                => 'அட�த�த',
-'last'                => 'கடைசி',
-'page_first'          => 'ம�தல�',
-'page_last'           => 'கடைசி',
-'histlegend'          => 'வேற�பாட�டைக� காண வேண�டிய இரண�ட� பத�திப�ப�க�களை தெரிவ�ச� செய�த� கீழ�ள�ள பொத�தானை அழ�த�தவ�ம�.<br />
+'viewpagelogs'           => 'இப�பக�கத�த�க�கான பதிகைகளைப� பார�',
+'nohistory'              => 'இப� பக�கத�த�க�க�த� தொக�ப�ப� வரலாற� இல�லை.',
+'currentrev'             => 'நடைம�றையில�ள�ள திர�த�தம�',
+'revisionasof'           => '$1 இல� நிலவ�ம� திர�த�தம�',
+'revision-info'          => '$2 பயனரால� செய�யப�பட�ட $1 அன�றிர�ந�தவாரான திர�த�தம�', # Additionally available: $3: revision id
+'previousrevision'       => '�ம�ந�தைய தொக�ப�ப�',
+'nextrevision'           => 'ப�திய தொக�ப�ப�→',
+'currentrevisionlink'    => 'நடப�பில�ள�ள திர�த�தம�',
+'cur'                    => 'நடப�ப�',
+'next'                   => 'அட�த�த',
+'last'                   => 'கடைசி',
+'page_first'             => 'ம�தல�',
+'page_last'              => 'கடைசி',
+'histlegend'             => 'வேற�பாட�டைக� காண வேண�டிய இரண�ட� பத�திப�ப�க�களை தெரிவ�ச� செய�த� கீழ�ள�ள பொத�தானை அழ�த�தவ�ம�.<br />
 க�றியீட�ட� விளக�கம�: (நடப�ப�) = நடைம�றையில�ள�ள பதிப�ப�டனான வேற�பாட�,
 (கடைசி) = ம�ந�திய பதிப�ப�டனான வேற�பாட�, சி = சிற� தொக�ப�ப�',
-'deletedrev'          => '[நீக�கப�பட�டத�]',
-'histfirst'           => 'மிகம�ந�திய',
-'histlast'            => 'மிகப�பிந�திய',
-'historysize'         => '({{PLURAL:$1|1 பைட�ட�|$1 பைட�ட�கள�}})',
-'historyempty'        => '(வெற�ற�)',
+'history-fieldset-title' => 'வரலாற�றில� தேடவ�ம�',
+'deletedrev'             => '[நீக�கப�பட�டத�]',
+'histfirst'              => 'மிகம�ந�திய',
+'histlast'               => 'மிகப�பிந�திய',
+'historysize'            => '({{PLURAL:$1|1 பைட�ட�|$1 பைட�ட�கள�}})',
+'historyempty'           => '(வெற�ற�)',
 
 # Revision feed
 'history-feed-title'          => 'திர�த�த வரலாற�',
@@ -764,7 +775,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 # Search results
 'searchresults'             => 'தேடல� ம�டிவ�கள�',
 'searchresulttext'          => '{{SITENAME}} தளத�தில� தேட�வத� தொடர�பான மேலதிகத� தகவல�கள�க�க� [[{{MediaWiki:Helppage}}|{{int:help}}]] பக�கத�தைப� பார�க�க.',
-'searchsubtitle'            => 'நீர� தேடியப� பக�கம� "[[:$1]]"',
+'searchsubtitle'            => 'நீர� தேடியப� பக�கம� \'\'\'[[:$1]]\'\'\'  ([[Special:Prefixindex/$1|"$1" இல� ஆரம�பிக�க�ம� அனைத�த� பக�கங�கள�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" இற�க� இணைப�ப� உள�ள அனைத�த� பக�கங�கள�]])',
 'searchsubtitleinvalid'     => 'நீர� தேடியப� பக�கம� "$1"',
 'noexactmatch'              => "'''\"\$1\" என�றத� தலைப�பில� பக�கமெத�வ�மில�லை.''' நீங�கள� [[:\$1|இப�பக�கத�தை உர�வாக�கலாம�]].",
 'noexactmatch-nocreate'     => "'''\"\$1\" என�றத� தலைப�ப�டைய பக�கமொன�ற� இல�லை.'''",
@@ -776,6 +787,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'prevn'                     => 'ம�ன� $1',
 'nextn'                     => 'அட�த�த $1',
 'viewprevnext'              => '($1) ($2) ($3) பக�கங�களைப� பார�.',
+'searchhelp-url'            => 'Help:உதவி',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 சொல�|$2 சொற�கள�}})',
 'search-result-score'       => 'பொர�த�தம�: $1%',
 'search-redirect'           => '(பக�க வழிமாற�றம� $1)',
@@ -792,10 +804,13 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'searchall'                 => 'அனைத�த�',
 'showingresults'            => "'''$2''' இலிர�ந�த� தொடங�க�ம�  {{PLURAL:$1|'''1''' ம�டிவ� கீழே காட�டப�பட�ட�ள�ளத�|'''$1''' ம�டிவ�கள� கீழே காட�டப�பட�ட�ள�ளன}}.",
 'showingresultsnum'         => "'''$2''' இலிர�ந�த� தொடங�க�ம�  {{PLURAL:$3|'''1''' ம�டிவ� கீழே காட�டப�பட�ட�ள�ளத�|'''$3''' ம�டிவ�கள� கீழே காட�டப�பட�ட�ள�ளன}}.",
-'showingresultstotal'       => "கீழ�வர�வன {{PLURAL:$3|'''$3''' ம�டிவில� '''$1'''|'''$3''' ம�டிவ�களில� '''$1 - $2'''}}",
-'nonefound'                 => '<strong>க�றிப�ப�</strong>: "அல�லத�", "கொண�ட" போன�ற பொத�வான, அட�டவணைப�பட�த�தப�படாத, சொற�களைத� தேட�ம�போதோ அல�லத� ஒன�ற�க�க� மேற�பட�ட தேடல�க�கான சொற�களைக� க�றிப�பிட�தல� தேடல�கள� தோல�வியில� ம�டிய காரணமாகிறத� (எல�லாத� தேட�தல�க�கான சொற�களைய�ம� கொண�ட பக�கங�கள� மட�ட�மே தேடல� ம�டிவில� காணப�பட�ம�).',
+'showingresultstotal'       => "கீழ�வர�வன {{PLURAL:$4|'''$3''' ம�டிவில� '''$1'''|'''$3''' ம�டிவ�களில� '''$1 - $2'''}}",
+'nonefound'                 => "<strong>க�றிப�ப�</strong>:சில பெயர�வெளிகள� மட�ட�மே இயல�பிர�ப�பாக தேடப�பட�ம�.
+
+அனைத�த� உள�ளடக�கங�களைய�ம� (பேச�ச� பக�கங�கள�, வார�ப�ர�கள� மற�ற�ம� பல) காண ''all:''  என�பதை உங�கள� கேள�விக�க� ம�ன�னொட�டி ம�யற�சிக�கவ�ம� அல�லத� விர�ம�பப�பட�ம� பெயர�வெளியை ம�ன�னொட�டியாக உபயோகிக�கவ�ம�.",
 'powersearch'               => 'மேம�பட�த�தப�பட�ட தேடல�',
 'powersearch-legend'        => 'மேம�பட�ட தேடல�',
+'powersearch-ns'            => 'பெயர�வெளிகளில� தேடவ�ம�',
 'powersearch-redir'         => 'வழிமாற�ற�களைப� பட�டியலிடவ�ம�',
 'search-external'           => 'வெளித�தேடல�',
 'searchdisabled'            => '{{SITENAME}} தளத�தின� தேடல� வசதிகள� தற�காலிகமாக ம�டக�கப�பட�ட�ள�ளத�. அத�வரை நீங�கள� கீழேய�ள�ள கூகிள� தேடலைப� பயன�பட�த�தலாம�. இத� சில சமயம� இற�றைப�பட�த�தப�படாததாய� இர�க�கக�கூட�ம�.',
@@ -805,7 +820,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'mypreferences'            => 'என� விர�ப�பத�தேர�வ�கள�',
 'prefs-edits'              => 'தொக�ப�ப�களின� எண�ணிக�கை:',
 'prefsnologin'             => 'ப�க�பதிகை செய�யப�படவில�லை',
-'prefsnologintext'         => 'பயனர� விர�ப�பத� தேர�வ�களை அமைப�பதற�க� நீங�கள� [[Special:UserLogin|ப�க�பதிகை செய�ய வேண�ட�ம�]].',
+'prefsnologintext'         => 'பயனர� விர�ப�பத�தேர�வ�களை அமைப�பதற�க� நீங�கள� <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ப�க�பதிகை ]</span> செய�திர�க�க வேண�ட�ம�.',
 'prefsreset'               => 'உங�கள� விர�ப�ப�கள� சேமிப�பிலிர�ந�த� மீட�டமைக�கப�பட�ட�ள�ளன.',
 'qbsettings'               => 'விரைவ�ச� சட�ட அமைவ�கள�',
 'qbsettings-none'          => 'எத�வ�மில�லை',
@@ -815,6 +830,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'qbsettings-floatingright' => 'மிதப�ப� வலத�',
 'changepassword'           => 'கடவ�ச�சொல�லை மாற�ற�',
 'skin'                     => 'தோல�',
+'skin-preview'             => 'ம�ன�தோற�றம�',
 'math'                     => 'கணிதம�',
 'dateformat'               => 'நாள� வடிவம�',
 'datedefault'              => 'விர�ப�பத�தேர�வ�கள� இல�லை',
@@ -834,9 +850,6 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'prefs-misc'               => 'பலதரப�பட�டவை',
 'saveprefs'                => 'சேமி',
 'resetprefs'               => 'சேமிக�காத மாற�றங�கள� நீக�க�க',
-'oldpassword'              => 'பழைய கடவ�ச�சொல�:',
-'newpassword'              => 'ப�திய கடவ�ச�சொல�:',
-'retypenew'                => 'ப�திய கடவ�ச�சொல�லை மீண�ட�ம� தட�டச�சிட�',
 'textboxsize'              => 'தொக�த�தல�',
 'rows'                     => 'நிரைகள�:',
 'columns'                  => 'நிரல�கள�',
@@ -846,13 +859,13 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'contextchars'             => 'ஒர� வரிக�கான இடம�சார� எழ�த�த�க�கள�',
 'stub-threshold'           => '<a href="#" class="stub">stub link</a> சீர�பட�த�தல�க�கான எல�லை (பைட�ட�கள�):',
 'recentchangesdays'        => 'அண�மைய மாற�றங�களில� காட�ட வேண�டிய நாட�களின� எண�ணிக�கை:',
-'recentchangescount'       => 'அண�மைய மாற�றங�களில� தலைப�ப�கள� எண�ணிக�கை:',
+'recentchangescount'       => 'அண�மைய மாற�றங�கள�, வரலாற� மற�ற�ம� பதிவ� பக�கங�களில� காட�டப�பட�ம� தொக�ப�ப�களின� எண�ணிக�கை:',
 'savedprefs'               => 'உங�கள� விர�ப�பத�தேர�வ�கள� சேமிக�கப�பட�ட�ள�ளன.',
 'timezonelegend'           => 'நேர வலயம�',
 'timezonetext'             => '¹வழங�கன� நேரத�த�க�க�ம� (UTC) உங�கள� உள�ளூர� நேரத�த�க�க�ம�ள�ள வேற�பாட�டை மணிகளில� பதிக.',
-'localtime'                => 'உள�ளூர� நேரம�',
-'timezoneoffset'           => 'நேர இடைவெளி¹',
-'servertime'               => 'வழங�கன� நேரம�',
+'localtime'                => 'உள�ளூர� நேரம�:',
+'timezoneoffset'           => 'நேர இடைவெளி¹:',
+'servertime'               => 'வழங�கன� நேரம�:',
 'guesstimezone'            => 'உலாவியிலிர�ந�த� நிரப�ப�',
 'allowemail'               => '�னைய பயனர�களிடம� இர�ந�தான மின�னஞ�சல�களை அன�மதி',
 'prefs-searchoptions'      => 'தேடல� விர�ப�பத� தேர�வ�கள�',
@@ -865,7 +878,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'userrights-lookup-user'      => 'பயனர�க� க�ழ�க�களை நிர�வாகி',
 'userrights-user-editname'    => 'பயனர� பெயரொன�றை இட�க:',
 'editusergroup'               => 'பயனர� க�ழ�க�களை தொக�',
-'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) பயனர�க�கான அன�மதிகளை மாற�றல�",
+'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) பயனர�க�கான அன�மதிகளை மாற�றல�",
 'userrights-editusergroup'    => 'பயனர� க�ழ�க�களை தொக�',
 'saveusergroups'              => 'பயனர� க�ழ�க�களை சேமி',
 'userrights-groupsmember'     => 'அங�கத�த�வம�:',
@@ -940,12 +953,15 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'rightslogentry' => '$1 பயனர�க�கான க�ழ� அங�கத�த�வம� $2 க�ழ�விலிர�ந�த� $3 க�ழ�விற�க�க� மாற�றப�பட�டத�',
 'rightsnone'     => '(எத�வ�மில�லை)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'இப�பக�கத�தைத� தொக�க�கவ�ம�',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|ஒர� மாற�றம�|$1 மாற�றங�கள�}}',
 'recentchanges'                     => 'அண�மைய மாற�றங�கள�',
 'recentchangestext'                 => 'இந�த விக�கிக�க� மிக அண�மையில� செய�யப�பட�ட மாற�றங�களை, இந�தப� பக�கத�தில� காணலாம�.',
 'recentchanges-feed-description'    => 'இவ�வ�ள�ளீட�டில� இந�த விக�கியில� செய�யப�பட�ட� மிக அண�மைய மாற�றங�கள� கவனிக�கப�பட�கின�றன.',
-'rcnote'                            => "கீழே காணப�பட�வத� $3 இல� உள�ளபடி கடைசி {{PLURAL:$2|24 மணித�தியாலங�களில�|'''$2''' நாட�களில�}} செய�யப�பட�ட {{PLURAL:$1|'''ஒர�''' மாற�றம�|'''$1''' மாற�றங�கள�}} ஆக�ம�.",
+'rcnote'                            => "கீழே காணப�பட�வத� $4 ஆம� தேதி $5 மணிக�க�� உள�ளபடி கடைசி {{PLURAL:$2|24 மணித�தியாலங�களில�|'''$2''' நாட�களில�}} செய�யப�பட�ட {{PLURAL:$1|'''ஒர�''' மாற�றம�|'''$1''' கடைசி மாற�றங�கள�}} ஆக�ம�.",
 'rcnotefrom'                        => "கீழே காணப�பட�வத� '''$2''' இலிர�ந�த� செய�யப�பட�ட மாற�றங�களாக�ம� ('''$1''' வரைக� காட�டப�பட�ட�ள�ளத�).",
 'rclistfrom'                        => '$1 தொடக�கம� செய�யப�பட�ட ப�திய மாற�றங�களைக� காட�டவ�ம�',
 'rcshowhideminor'                   => 'சிறிய தொக�ப�ப�களை $1',
@@ -972,7 +988,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'recentchangeslinked-title'    => '"$1" பக�கத�த�டன� தொடர�ப�டைய மாற�றங�கள�',
 'recentchangeslinked-noresult' => 'க�றித�த நேரத�தில� இப�பக�கத�த�டன� இணைக�கப�பட�ட பக�கங�களில� மாற�றங�கள� �த�மில�லை.',
 'recentchangeslinked-summary'  => "இணைக�கப�பட�டப� பக�கங�கள�க�க� (அல�லத� பக�ப�பொன�றின� அங�கத�தர�வர�கள�க�க�) செய�யபட�ட அண�மைய மாற�றங�களை இச�சிறப�ப�ப� பக�கம� பட�டியலிட�கிறத�. [[Special:Watchlist|உங�கள� கவணிப�ப�ப� பட�டியலில�]] உள�ளப� பக�கங�கள� '''தடித�த எழ�த�த�க�களில�''' உள�ளன.",
-'recentchangeslinked-page'     => 'பக�க பெயர�:',
+'recentchangeslinked-page'     => 'பக�கப� பெயர�:',
 
 # Upload
 'upload'                      => 'கோப�பைப� பதிவேற�ற�',
@@ -984,17 +1000,18 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'upload_directory_read_only'  => 'பதிவேற�ற அடைவ� ($1) வழங�கனால� எழ�தப�படம�டியாத�.',
 'uploaderror'                 => 'பதிவேற�றத� தவற�',
 'uploadtext'                  => "கோப�ப�க�களை பதிவேற�ற பின�வர�ம� படிமத�தைப� பயன�பட�த�தவ�ம�.
-ம�ன�னர� பதிவேற�றம� செய�யப�பட�ட படிமங�களைப� பார�ப�பதற�க� அல�லத� தேட�வதற�க�, [[Special:ImageList|பதிவேற�றம� செய�யப�பட�ட படிமங�களின� பட�டிய]]ல�க�க�ச� செல�லவ�ம�. பதிவேற�றங�கள�ம� நீக�கல�கள�ம� [[Special:Log/upload|பதிவேற�றப� பதிகையில�]] பதியப�பட�ட�ள�ளன.
+ம�ன�னர� பதிவேற�றம� செய�யப�பட�ட படிமங�களைப� பார�ப�பதற�க� அல�லத� தேட�வதற�க�, [[Special:FileList|பதிவேற�றம� செய�யப�பட�ட படிமங�களின� பட�டிய]]ல�க�க�ச� செல�லவ�ம�. பதிவேற�றங�கள�ம� நீக�கல�கள�ம� [[Special:Log/upload|பதிவேற�றப� பதிகையில�]] பதியப�பட�ட�ள�ளன.
 
 உங�கள� கட�ட�ரைகளில� படிமங�களைச� சேர�ப�பதற�க�,
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''' அல�லத� 
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|படிம பற�றிய உரை]]</nowiki>''' இணைப�ப� வடிவத�தைய�ம�, ஒளி,ஒலிக�கோப�ப�கள�க�க� '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' இணைப�ப�வடிவத�தைய�ம� பயன�பட�த�தவ�ம�.",
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''' அல�லத� 
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|படிம பற�றிய உரை]]</nowiki>''' இணைப�ப� வடிவத�தைய�ம�, ஒளி,ஒலிக�கோப�ப�கள�க�க� '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' இணைப�ப�வடிவத�தைய�ம� பயன�பட�த�தவ�ம�.",
 'upload-permitted'            => 'அன�மதிக�கப�பட�ட கோப�ப� வகைகள�: $1.',
 'upload-preferred'            => 'விர�ம�பத�தக�க கோப�ப� வகைகள�: $1.',
 'upload-prohibited'           => 'தடைச� செய�யப�பட�ட கோப�ப� வகைகள�: $1.',
 'uploadlog'                   => 'பதிவேற�றப� பதிகை',
 'uploadlogpage'               => 'பதிவேற�றப� பதிகை',
-'uploadlogpagetext'           => 'கீழேய�ள�ளத� மிக அண�மையில� பதிவேற�றம� செய�யப�பட�ட கோப�ப�களின� பட�டியலாக�ம�.',
+'uploadlogpagetext'           => 'கீழேய�ள�ளத� மிக அண�மையில� பதிவேற�றம� செய�யப�பட�ட கோப�ப�களின� பட�டியலாக�ம�.
+மேல�ம� விவரங�கள� அறிய, [[Special:NewFiles|ப�திய கோப�ப�கள� பக�கத�தைப�]] பார�க�கவ�ம�.',
 'filename'                    => 'கோப�ப�ப� பெயர�',
 'filedesc'                    => 'ச�ர�க�கம�',
 'fileuploadsummary'           => 'ச�ர�க�கம�:',
@@ -1007,32 +1024,35 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'illegalfilename'             => 'கோப�பின� பெயரில� தலைப�ப�க�களில� அன�மதிக�கப�படாத எழ�த�த�ர� "$1" காணப�பட�கிறத�. கோப�பிற�க� வேற� பெயரொன�றை இட�ட� மீண�ட�ம� ம�யல�க.',
 'badfilename'                 => 'படிமப� பெயர� "$1" ஆக மாற�றப�பட�ட�ள�ளத�.',
 'filetype-badmime'            => '"$1" வகைப� பலநோக�க� இணைய அஞ�சல� நீட�சிக� கோப�ப�கள� பதிவேற�ற அன�மதிகப�பட�வதில�லை.',
-'filetype-unwanted-type'      => "'''\".\$1\"''' தேவையற�ற கோப�ப� வகையாக�ம�. விர�ம�பப�பட�ம� கோப�ப�வகைகள� \$2 என�பனவாக�ம�.",
-'filetype-banned-type'        => "'''\".\$1\"''' அன�மதிக�கப�படாத கோப�ப� வகையாக�ம�. விர�ம�பப�பட�ம� கோப�ப�வகைகள� \$2 என�பனவாக�ம�.",
+'filetype-unwanted-type'      => "'''\".\$1\"''' தேவையற�ற கோப�ப� வகையாக�ம�. 
+விர�ம�பப�பட�ம� {{PLURAL:\$3|கோப�ப�வகை|கோப�ப�வகைகள�}} \$2 என�பத�(வை) ஆக�ம�.",
+'filetype-banned-type'        => "'''\".\$1\"''' அன�மதிக�கப�படாத கோப�ப� வகையாக�ம�. 
+அன�மதிக�கப�பட�ட {{PLURAL:\$3|கோப�ப�வகை|கோப�ப�வகைகள�}} \$2 என�பத�(வை) ஆக�ம�.",
 'filetype-missing'            => 'இந�தக� கோப�ப� நீட�சையைக� (எ+கா ".jpg") கொண�டிர�க�கவில�லை.',
 'large-file'                  => 'பரிந�த�ரைகப�பட�ம� கோப�ப�களின� உச�ச அளவ�  $1; இந�தக� கோப�பின� அளவ� $2.',
 'largefileserver'             => 'வழங�கனால� �ற�கக� கூடிய உச�ச அளவ� கோப�பைவிட இக�கோப�ப� பெரியதாக�ம�.',
 'emptyfile'                   => 'நீங�கள� பதிவேற�றிய கோப�ப� வெற�றாக உள�ளத�. இத� கோப�பின� பெயரை பிழையாக தட�டச�சிட�டத�தக காரணமாக �ற�பட�டிர�க�கலாம�. அர�ள� கூர�ந�த� இக�கோப�பை நீங�கள� பதிவேற�ற வேண�ட�மாக என�பதைக� கர�தவ�ம�.',
-'fileexists'                  => 'இப�பெயரைக� கொண�ட கோப�பொன�ற� �ற�கனவே உள�ளத�. அந�தக� கோப�பை மாற�றப�போகிறீர�கள� என�பதில� உங�கள�க�க� நிச�சயமில�லாவிடில� அர�ள� கூர�ந�த� <strong><tt>$1</tt></strong> கோப�பை ஒர� ம�றை பார�க�கவ�ம�.',
-'filepageexists'              => 'இகோப�பிற�கான விளக�கப�பக�கம� <strong><tt>$1</tt></strong> பக�கத�தில� �ற�கனவே உர�வாக�கப�பட�ட�ள�ளத�, ஆனால� இப�பெயரில� கோப�ப� ஒன�றில�லை. இங�கே நீங�கள� கொட�க�க�ம� ச�ர�க�கம� விளக�கப�பக�கத�தில� தானியக�கமாக இணைக�கப�பட மாட�டத�. ச�ர�க�கத�தை விளக�கப�பக�கத�தில� காணச� செய�வதற�காக அப�பக�கத�தை நேரடியாக தொக�க�க வேண�டியிர�க�க�ம�.',
-'fileexists-extension'        => 'இப�பெயரைக� கொண�ட கோப�ப� �ற�கனவே உள�ளத�:<br />
-பதிவேற�றப�பட�ம� கோப�பின� பெயர�: <strong><tt>$1</tt></strong><br />
-�ற�கனவே உள�ளக� கோப�பின� பெயர�: <strong><tt>$2</tt></strong><br />
-அர�ள� கூர�ந�த� வேற� பெயரைத� தெரிவ�ச� செய�யவ�ம�.',
+'fileexists'                  => "இப�பெயரைக� கொண�ட கோப�பொன�ற� �ற�கனவே உள�ளத�. அந�தக� கோப�பை மாற�றப�போகிறீர�கள� என�பதில� உங�கள�க�க� நிச�சயமில�லாவிடில� அர�ள� கூர�ந�த� '''<tt>$1</tt>''' கோப�பை ஒர� ம�றை பார�க�கவ�ம�.",
+'filepageexists'              => "இகோப�பிற�கான விளக�கப�பக�கம� '''<tt>$1</tt>''' பக�கத�தில� �ற�கனவே உர�வாக�கப�பட�ட�ள�ளத�, ஆனால� இப�பெயரில� கோப�ப� ஒன�றில�லை. இங�கே நீங�கள� கொட�க�க�ம� ச�ர�க�கம� விளக�கப�பக�கத�தில� தானியக�கமாக இணைக�கப�பட மாட�டத�. ச�ர�க�கத�தை விளக�கப�பக�கத�தில� காணச� செய�வதற�காக அப�பக�கத�தை நேரடியாக தொக�க�க வேண�டியிர�க�க�ம�.",
+'fileexists-extension'        => "இப�பெயரைக� கொண�ட கோப�ப� �ற�கனவே உள�ளத�:<br />
+பதிவேற�றப�பட�ம� கோப�பின� பெயர�: '''<tt>$1</tt>'''<br />
+�ற�கனவே உள�ளக� கோப�பின� பெயர�: '''<tt>$2</tt>'''<br />
+அர�ள� கூர�ந�த� வேற� பெயரைத� தெரிவ�ச� செய�யவ�ம�.",
 'fileexists-thumb'            => "<center>'''�ற�கனவே உள�ள படிமம�'''</center>",
-'fileexists-thumbnail-yes'    => 'இந�தக� கோப�ப� அளவில� சிறியதாக�கப�பட�ட படிமம� போலத� தோன�ற�கிறத�. அர�ள� கூர�ந�த� <strong><tt>$1</tt></strong> கோப�பை ஒர� ம�றை பார�க�கவ�ம�.<br />
-நீங�கள� பார�த படிமம�ம� பதிவேற�ற எத�தனிக�க�ம� படிமம� ஒன�றாயின� அதன� சிறிய படிமத�தை மீண�ட�ம� பதிவேற�றத� தேவையில�லை.',
-'file-thumbnail-no'           => 'இக�கோப�பின� பெயர� <strong><tt>$1</tt></strong> என�பத�டன� தொடங�க�கிறத�. இந�தக� கோப�ப� அளவில� சிறியதாக�கப�பட�ட படிமம� போலத� தோன�ற�கிறத�
-இப�படிமத�தின� ம�ழ� அளவிலான படிமம� உங�களிடமிர�ம�பின� அதைப� பதிவேற�றவ�ம� அல�லத� கோப�பின� பெயரை மாற�றவ�ம�.',
-'fileexists-forbidden'        => 'இப�பெயரைக� கொண�ட கோப�ப� �ற�கனவே உள�ளத�; அர�ள� கூர�ந�த� இக�கோப�பை வேற� பெயரின� கீழ� பதிவேற�றவ�ம�.[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'இப�பெயரைக� கொண�ட கோப�ப� �ற�கனவே பொத�க� கோப�பகத�தில� உள�ளத�; அர�ள� கூர�ந�த� இக�கோப�பை வேற� பெயரின� கீழ� பதிவேற�றவ�ம�.[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "இந�தக� கோப�ப� அளவில� சிறியதாக�கப�பட�ட படிமம� போலத� தோன�ற�கிறத�. அர�ள� கூர�ந�த� '''<tt>$1</tt>''' கோப�பை ஒர� ம�றை பார�க�கவ�ம�.<br />
+நீங�கள� பார�த படிமம�ம� பதிவேற�ற எத�தனிக�க�ம� படிமம� ஒன�றாயின� அதன� சிறிய படிமத�தை மீண�ட�ம� பதிவேற�றத� தேவையில�லை.",
+'file-thumbnail-no'           => "இக�கோப�பின� பெயர� '''<tt>$1</tt>''' என�பதில� தொடங�க�கிறத�. 
+இந�தக� கோப�ப� அளவில� சிறியதாக�கப�பட�ட படிமம� போலத� தோன�ற�கிறத� ''(thumbnail)''.
+இப�படிமத�தின� ம�ழ� அளவிலான படிமம� உங�களிடமிர�ப�பின� அதைப� பதிவேற�றவ�ம� அல�லத� தயவ�செய�த� கோப�பின� பெயரை மாற�றவ�ம�.",
+'fileexists-forbidden'        => 'இப�பெயரைக� கொண�ட கோப�ப� �ற�கனவே உள�ளத�; அர�ள� கூர�ந�த� இக�கோப�பை வேற� பெயரின� கீழ� பதிவேற�றவ�ம�.[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'இப�பெயரைக� கொண�ட கோப�ப� �ற�கனவே பொத�க� கோப�பகத�தில� உள�ளத�; நீங�கள� தவறாத� இக�கோப�பைப� பதிவேற�ற வேண�ட�மென�றால� அர�ள� கூர�ந�த� வேற� பெயரின� கீழ� பதிவேற�றவ�ம�.[[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'வெற�றிகரமான பதிவேற�றம�',
 'uploadwarning'               => 'பதிவேற�றல� எச�சரிக�கை',
 'savefile'                    => 'கோப�பைச� சேமி',
 'uploadedimage'               => '"[[$1]]" பதிவேற�றப�பட�டத�',
 'overwroteimage'              => '"[[$1]]" கோப�பின� ப�திய பதிப�பை பதிவேற�ற�',
 'uploaddisabled'              => 'பதிவேற�றம� செயலிழக�கச� செய�யப�பட�ட�ள�ளத�',
-'uploaddisabledtext'          => '{{SITENAME}} தளத�தில� பதிவேற�றங�கள� செயலிழக�கச� செய�யப�பட�ட�ள�ளன.',
+'uploaddisabledtext'          => 'கோப�ப� பதிவேற�றங�கள� செயலிழக�கச� செய�யப�பட�ட�ள�ளன.',
 'uploadscripted'              => 'இந�தக� கோப�ப� உலாவியால� பிழையாக விளங�கிக� கொள�ளக�கூடிய எச�.டி.எம�.எல�. அல�லத� வேற� நிரல�களைக� கொண�ட�ள�ளத�.',
 'uploadcorrupt'               => 'கோப�ப� பழ�தானத� அல�லத� பிழையான கோப�ப� நீட�சியைக� கொண�ட�ள�ளத�. அர�ள� கூர�ந�த� கோப�பை ஒர� ம�றை சரிபார�த�த�விட�ட� மீண�ட�ம� பதிவேற�றவ�ம�.',
 'uploadvirus'                 => 'கோப�ப� நச�ச�நிரலைக� (வைரஸ�) கொண�ட�ள�ளத�! விபரங�கள�:$1',
@@ -1045,12 +1065,12 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 
 இக�கோப�பை பதிவேற�ற�வத� சரியா என�பதைக� கர�தவ�ம�.
 உங�கள� வசதிக�காக இக�கோப�பிற�காக நீக�கல� பதிவ� தரப�பட�ட�ள�ளத�:",
-'filename-bad-prefix'         => 'நீங�கள� பதிவேற�ற எத�தனிக�க�ம� கோப�பின� பெயர� <strong>"$1"</strong> என�பத�டன� தொடங�க�கிறத�, பொத�வாக இத� எண�மர�வி கமெராக�கலால� தானியக�கமாக வழங�கப�ப�ட�ம� பெயராக�ம�. அர�ள� கூர�ந�த� கோப�பிற�க� விளக�கமான பெயரொன�றைக� கொட�க�கவ�ம�.',
+'filename-bad-prefix'         => "நீங�கள� பதிவேற�ற எத�தனிக�க�ம� கோப�பின� பெயர� '''\"\$1\"''' என�பத�டன� தொடங�க�கிறத�, பொத�வாக இத� எண�மர�வி கமெராக�கலால� தானியக�கமாக வழங�கப�ப�ட�ம� பெயராக�ம�. அர�ள� கூர�ந�த� கோப�பிற�க� விளக�கமான பெயரொன�றைக� கொட�க�கவ�ம�.",
 
 'upload-proto-error'      => 'பிழையான நெறி',
 'upload-proto-error-text' => 'தொலைவ�ப� பதிவேற�றத�த�க�க� ய�.ஆர�.எல�. <code>http://</code> அல�லத� <code>ftp://</code> என�ற ம�ன�னொட�ட�டன� தொடங�கவேண�ட�ம�.',
 'upload-file-error'       => 'உள�ளகத� தவற�',
-'upload-file-error-text'  => 'வழங�கனில� தற�காலிக கோப�பை உர�வாக�க ம�யற�சித�த போத� உள�ளகத� தவறொன�ற� �ற�பட�டத�. அர�ள� கூர�ந�த� ம�றைமைச� செயற�பட�த�த�னரை அண�கவ�ம�.',
+'upload-file-error-text'  => 'வழங�கனில� தற�காலிக கோப�பை உர�வாக�க ம�யற�சித�த போத� உள�ளகத� தவறொன�ற� �ற�பட�ட�விட�டத�. அர�ள� கூர�ந�த� [[Special:ListUsers/sysop|ம�றைமைச� செயற�பட�த�த�நரை]] அண�கவ�ம�.',
 'upload-misc-error'       => 'இனந�தெரியாத பதிவேற�றல� தவற�',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
@@ -1065,17 +1085,17 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'upload_source_url'  => ' (செல�ல�படியான, இணைய ம�கவரி)',
 'upload_source_file' => ' (உங�கள� கணணியில� உள�ள கோப�ப�)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'பின�வர�ம� பெயர�ள�ள ஊடகக� கோப�பைத� தேட�:',
+# Special:ListFiles
+'listfiles_search_for'  => 'பின�வர�ம� பெயர�ள�ள ஊடகக� கோப�பைத� தேட�:',
 'imgfile'               => 'கோப�ப�',
-'imagelist'             => 'படிமங�களின� பட�டியல�',
-'imagelist_date'        => 'நாள�',
-'imagelist_name'        => 'பெயர�',
-'imagelist_user'        => 'பயனர�',
-'imagelist_size'        => 'அளவ�',
-'imagelist_description' => 'விளக�கம�',
-
-# Image description page
+'listfiles'             => 'படிமங�களின� பட�டியல�',
+'listfiles_date'        => 'நாள�',
+'listfiles_name'        => 'பெயர�',
+'listfiles_user'        => 'பயனர�',
+'listfiles_size'        => 'அளவ�',
+'listfiles_description' => 'விளக�கம�',
+
+# File description page
 'filehist'                       => 'கோப�ப� வரலாற�',
 'filehist-help'                  => 'க�றித�த நேரத�தில� இர�ந�த படிமத�தைப� பார�க�க அந�நேரத�தின� மீத� சொட�கவ�ம�.',
 'filehist-deleteall'             => 'சகலதைய�ம� நீக�க�',
@@ -1088,7 +1108,8 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'filehist-filesize'              => 'கோப�பின� அளவ�',
 'filehist-comment'               => 'க�றிப�ப�',
 'imagelinks'                     => 'படிம இணைப�ப�கள�',
-'linkstoimage'                   => 'பின�வர�ம� பக�கங�கள� இப� படிமத�த�க�க� இணைக�கப�பட�ட�ள�ளன:',
+'linkstoimage'                   => 'பின�வர�ம� {{PLURAL:$1|பக�க இணைப�ப�கள�|$1 பக�கங�கள� இணைப�ப�}}
+இப� படிமத�த�க�க� இணைக�கபட�ட�ள�ளத�(ளன):',
 'nolinkstoimage'                 => 'இப� படிமத�த�க�க� இணைக�கப�பட�ட�ள�ள பக�கங�கள� எத�வ�ம� இல�லை.',
 'sharedupload'                   => 'இக�கோப�ப� ஒர� பகிரப�பட�ட பதிவேற�றமாக�ம�. �னைய திட�டங�களில�ம� பயன�பட�த�தப�படலாம�.',
 'shareduploadwiki'               => 'மேலதிகத� தகவல�கள�க�க� $1 பக�கத�தைப� பார�க�கவ�ம�.',
@@ -1099,8 +1120,8 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'shareduploadduplicate-linktext' => 'வேறொர� கோப�ப�',
 'shareduploadconflict'           => 'இந�தக� கோப�ப� பகிரப�பட�ட சேமிப�பில� உள�ள $1 கோப�பின� பெயரையே கொண�ட�ள�ளத�',
 'shareduploadconflict-linktext'  => 'வேறொர� கோப�ப�',
-'noimage'                        => 'இப�பெயர�டைய கோப�ப� எத�வ�ம� இல�லை. நீங�கள� அதை $1',
-'noimage-linktext'               => 'பதிவேற�றம� செய�யலாம�',
+'noimage'                        => 'இப�பெயர�டைய கோப�ப� எத�வ�ம� இல�லை, ஆனால� நீங�கள� அதை $1.',
+'noimage-linktext'               => 'ஒன�றை பதிவேற�றம� செய�',
 'uploadnewversion-linktext'      => 'இப�படிமத�தின� ப�திய பதிப�பை பதிவேற�ற�',
 'imagepage-searchdupe'           => 'நகல� கோப�ப�களைத� தேட�க',
 
@@ -1122,10 +1143,9 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'filedelete-comment'          => 'நீக�கல�க�கான காரணம�:',
 'filedelete-submit'           => 'நீக�க�',
 'filedelete-success'          => "'''$1''' நீக�கப�பட�ட�விட�டத�.",
-'filedelete-success-old'      => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' கோப�பின� $3, $2 இல� உள�ளபடியான பதிப�ப� நீக�கப�பட�டத�.</span>',
-'filedelete-nofile'           => "{{SITENAME}} தளத�தில� '''$1''' காணப�படவில�லை.",
+'filedelete-success-old'      => "'''[[Media:$1|$1]]''' கோப�பின� $3, $2 இல� உள�ளபடியான பதிப�ப� நீக�கப�பட�டத�.",
+'filedelete-nofile'           => "'''$1''' காணப�படவில�லை.",
 'filedelete-nofile-old'       => "கொட�க�கப�பட�ட பண�ப�கள�டன� '''$1''' பக�கத�திற�கான பரண� திர�த�தங�கள� காணப�படவில�லை.",
-'filedelete-iscurrent'        => 'நீர� இக�கோப�பின� மிகப�பிந�திய பதிப�பை நீக�க ம�யல�கிறீர�. அர�ள� கூர�ந�த� ம�தலில� பழைய பதிப�ப�க�க� ம�ன�நிலையாக�கவ�ம�.',
 'filedelete-otherreason'      => 'வேற� மேலதிக காரணம�:',
 'filedelete-reason-otherlist' => 'வேற� காரணம�',
 'filedelete-reason-dropdown'  => '*பொத�வான நீக�கல� காரணங�கள�
@@ -1147,33 +1167,21 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 
 # Unused templates
 'unusedtemplates'     => 'பயன�பட�த�தப�படாத வார�ப�ப�ர�க�கள�',
-'unusedtemplatestext' => 'இப�பக�கம� வேற� பக�கங�களில� பயன�பட�த�தப�படாத வார�ப�ப�ர� பெயர�வெளிப� பக�கங�களை பட�டியலிட�கிறத�. இவ�வார�ப�ர�க�களை நீக�க� ம�ன�னர� வார�ப�ப�ர�வ�க�கான �னைய இணைப�ப�க�களைய�ம� ஒர� ம�றை சரி பார�க�கவ�ம�.',
+'unusedtemplatestext' => 'இப�பக�கம� வேற� பக�கங�களில� பயன�பட�த�தப�படாத {{ns:template}} பெயர�வெளிப� பக�கங�களை பட�டியலிட�கிறத�. இவ�வார�ப�ப�ர�க�களை நீக�க� ம�ன�னர� வார�ப�ப�ர�வ�க�கான �னைய இணைப�ப�க�களைய�ம� ஒர� ம�றை சரி பார�க�கவ�ம�.',
 'unusedtemplateswlh'  => '�னைய இணைப�ப�கள�',
 
 # Random page
 'randompage'         => 'க�றிப�பில�வழிப� பக�கம�',
-'randompage-nopages' => 'இப�பபெயர�வெளியில� பக�கங�கள� எத�வ�மில�லை.',
+'randompage-nopages' => '"$1" பெயர�வெளியில� பக�கங�கள� எத�வ�மில�லை.',
 
 # Random redirect
 'randomredirect'         => 'க�றிப�பில�வழி வழிமாற�ற�',
-'randomredirect-nopages' => 'இப�பபெயர�வெளியில� வழிமாற�ற�ப� பக�கங�கள� எத�வ�மில�லை.',
+'randomredirect-nopages' => '"$1" பெயர�வெளியில� வழிமாற�ற�ப� பக�கங�கள� எத�வ�மில�லை.',
 
 # Statistics
-'statistics'             => 'ப�ள�ளி விபரங�கள�',
-'sitestats'              => '{{SITENAME}} தளத�தின� ப�ள�ளி விபரங�கள�',
-'userstats'              => 'பயனர� ப�ள�ளி விபரங�கள�',
-'sitestatstext'          => "உரையாடல� பக�கங�கள�, {{SITENAME}} தளம� பற�றிய பக�கங�கள�, க�ற�ம�பக�கங�கள�, வழிமாற�றிகள�, வார�ப�ப�ர�க�கள�, படிம விளக�கப� பக�கங�கள�, பக�ப�ப�ப� பக�கங�கள�, வலைவாசல�கள�, பயனர� பக�கங�கள� மற�ற�ம� கட�ட�ரைத� தரத�தில� இல�லாதிர�க�கக�கூடிய �னைய பக�கங�களைய�ம� சேர�த�த� தரவ�த� தளத�தில� மொத�தம� {{PLURAL:$1|ஒர� பக�கம� உள�ளத�|'''$1''' பக�கங�கள� உள�ளன}}.
-இவை தவிர�த�த�, {{PLURAL:$2|ஒர� பக�கம� ம�றையான கட�ட�ரையாக|'''$2''' பக�கங�கள� ம�றையான கட�ட�ரைகளாக}} இர�க�கக�கூட�ம�.
-
-{{PLURAL:$8|'''ஒர�''' கோப�ப� பதிவேற�றப�பட�ட�ள�ளத�|'''$8''' கோப�ப�கள� பதிவேற�றப�பட�ட�ள�ளன}}.
-
-{{SITENAME}} அமைக�கப�பட�டத�திலிர�ந�த� {{PLURAL:$3|ஒர� ம�றைப�| '''$3''' ம�றைகள�}} பார�க�கப�படிர�ப�பத�டன� {{PLURAL:$4|ஒர� பக�கத�தொக�ப�பைய�ம�|'''$4''' பக�கத� தொக�ப�ப�க�களைய�ம�}} கொண�ட�ள�ளத�.
-இத� ஒர� பக�கத�த�க�க� சராசரி '''$5''' தொக�ப�ப�கள�ம�, சராசரியாக ஒர� தொக�ப�ப�க�க� '''$6''' பார�வைகள�மாக�ம�.
-
-
-தற�போதைய [http://www.mediawiki.org/wiki/Manual:Job_queue வேலைக� காத�திர�ப�ப� வரிசை] '''$7''' ஆக�ம�.",
-'userstatstext'          => "இத�தளத�தில� {{PLURAL:$1|ஒர� பதிவ� செய�த [[Special:ListUsers|பயனர�]] உள�ளார�|'''$1''' பதிவ� செய�த [[Special:ListUsers|பயனர�கள�]] உள�ளனர�}}, இதில� '''$2''' (அல�லத� '''$4%''') {{PLURAL:$2|பயனர�|பயனர�கள�}} $5 அன�மதியைக� கொண�ட�ள�ளனர�.",
-'statistics-mostpopular' => 'அதிகம� பார�க�கப�பட�ட பக�கங�கள�',
+'statistics'              => 'ப�ள�ளி விபரங�கள�',
+'statistics-header-users' => 'பயனர� ப�ள�ளி விபரங�கள�',
+'statistics-mostpopular'  => 'அதிகம� பார�க�கப�பட�ட பக�கங�கள�',
 
 'disambiguations'      => 'பக�கவழி நெறிப�பட�த�தல� பக�கங�கள�',
 'disambiguationspage'  => 'Template:பக�கவழி நெறிப�பட�த�தல�',
@@ -1255,9 +1263,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'speciallogtitlelabel' => 'தலைப�ப�:',
 'log'                  => 'பதிகைகள�',
 'all-logs-page'        => 'அனைத�த�ப� பதிகைகள�',
-'log-search-legend'    => 'பதிகைகளைத� தேட�',
-'log-search-submit'    => 'செல�',
-'alllogstext'          => 'பதிவேற�றம�, நீக�கம�, காப�ப�, தடை, மற�ற�ம� செயற�பட�த�த�நர� நடவடிக�கைகள� ஆகியவற�றின� பதிவ�கள� அனைத�திற�க�மான ஒர�ங�கிணைந�த காட�சி. பதிவ� வகை, பயனர� பெயர�, அல�லத� தொடர�ப�டைய பக�கத�தைத� தெரிவ� செய�வதன�மூலம� காட�சி நோக�கை ச�ர�க�கிக� கொள�ள ம�டிய�ம�.',
+'alllogstext'          => '{{SITENAME}} தளத�தின� பதிவ�கள� அனைத�திற�க�மான ஒர�ங�கிணைந�த காட�சி. பதிவ� வகை, பயனர� பெயர�, அல�லத� தொடர�ப�டைய பக�கத�தைத� தெரிவ� செய�வதன�மூலம� காட�சி நோக�கை ச�ர�க�கிக� கொள�ள ம�டிய�ம�.',
 'logempty'             => 'பொர�த�தமான பதிவ�கள� யாத�மில�லை.',
 'log-title-wildcard'   => 'இவ�வ�ரைய�டன� தொடங�க�ம� தலைப�ப�களைத� தேட�',
 
@@ -1279,15 +1285,24 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 
 # Special:Categories
 'categories'                    => 'பக�ப�ப�கள�',
-'categoriespagetext'            => 'பின�வர�ம� பக�ப�ப�கள� பக�கங�களையோ அலத� ஊடகங�களையோ கொண�ட�ள�ளன.',
+'categoriespagetext'            => 'பின�வர�ம� பக�ப�ப�கள� பக�கங�களையோ அலத� ஊடகங�களையோ கொண�ட�ள�ளன.
+[[Special:UnusedCategories|உபயோகப�பட�த�தப�படாத  பக�ப�ப�கள�]] இங�கே காண�பிக�கப�படவில�லை.
+இத�த�டன� [[Special:WantedCategories|தேவைப�பட�ம� பக�ப�ப�களைய�ம�]] பார�க�கவ�ம�.',
 'special-categories-sort-count' => 'எண�ணிக�கையின� படி ஒழ�ங�க�ப� பட�த�த�க',
 'special-categories-sort-abc'   => 'அகரவரிசைப�படி ஒழ�ங�க�ப� பட�த�த�க',
 
+# Special:LinkSearch
+'linksearch-ns' => 'பெயர�வெளி:',
+'linksearch-ok' => 'தேட�க',
+
 # Special:ListUsers
 'listusersfrom'      => 'பின�வர�ம� எழ�த�த�டன� தொடங�க�ம� பயனர�களைக� காட�ட�:',
 'listusers-submit'   => 'காட�ட�',
 'listusers-noresult' => 'ஒர� பயனர�ம� இல�லை.',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'ப�திய பயனர� கணக�க�',
+
 # Special:ListGroupRights
 'listgrouprights'          => 'பயனர� க�ழ� உரிமைகள�',
 'listgrouprights-group'    => 'க�ழ�',
@@ -1301,16 +1316,17 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 �னைய பயனர�கள�க�க� மின�னஞ�சல� அன�ப�பக�கூடியத�தாக செல�ல�படியாகக�கூடிய மின�னஞ�சல� ம�கவரியொன�ற�ம� உங�கள�டைய  [[Special:Preferences|விர�ப�பத� தெரிவ�களில�]] கொட�பட�டிர�க�கவேண�ட�ம�.',
 'emailuser'       => 'இப� பயனர�க�க� மின�னஞ�சல� செய�',
 'emailpage'       => 'மின�னஞ�சல� பயனர�',
-'emailpagetext'   => 'இப� பயனர� ஒர� செல�ல�படியாகக�கூடிய மின�னஞ�சல� ம�கவரியை அவரத� பயனர� விர�ப�பத�தேர�வ�களில� கொட�த�திர�ந�தால�, கீழ� வர�ம� படிவம� ஒர� தனித�த செய�தியை அன�ப�ப�ம�.
-பயனர� விர�ப�பத�தேர�வ�களில� நீங�கள� கொட�த�த�ள�ள மின�னஞ�சல� ம�கவரி, பெற�னர� பதில� எழ�த ம�டிய�ம� வகையில�, மின�னஞ�சலின� "From" ம�கவரியாகக� காட�சி தர�ம�.',
+'emailpagetext'   => 'நீங�கள� கீழ�வர�ம� படிவத�தை உபயோகித�த� இந�த பயனர�க�க� மின�னஞ�சல� செய�யலாம�.
+
+[[Special:Preferences|என� விர�ப�பத�தேர�வ�களில�]] நீங�கள� கொட�த�த�ள�ள மின�னஞ�சல� ம�கவரி மின�னஞ�சலின� "From" ம�கவரியாகக� காட�சி தர�ம�, இதனால� பெற�நர� உங�கள�க�க� நேரடியாக பதில� எழ�த ம�டிய�ம�.',
 'usermailererror' => 'மின�னஞ�சல� விளைவாக�கிய தவற�:',
 'defemailsubject' => '{{SITENAME}} மின�னஞ�சல�',
 'noemailtitle'    => 'மின�னஞ�சல� ம�கவரி இல�லை',
-'noemailtext'     => 'இப� பயனர� ஒர� செல�ல�படியாகக�கூடிய மின�னஞ�சல� ம�கவரியைக� க�றிப�பிடவில�லை அல�லத� பிற பயனர�களிடமிர�ந�த� மின�னஞ�சல� பெற�ம� விர�ப�பத� தேர�வைத� தெரிவ� செய�யவில�லை.',
-'emailfrom'       => 'அன�ப�ப�னர�',
-'emailto'         => 'பெற�னர�',
-'emailsubject'    => 'உட�பொர�ள�',
-'emailmessage'    => 'தகவல�',
+'noemailtext'     => 'இப� பயனர� ஒர� செல�ல�படியாகக�கூடிய மின�னஞ�சல� ம�கவரியைக� க�றிப�பிடவில�லை.',
+'emailfrom'       => 'அன�ப�ப�நர�:',
+'emailto'         => 'பெற�நர�:',
+'emailsubject'    => 'பொர�ள�:',
+'emailmessage'    => 'தகவல�:',
 'emailsend'       => 'அன�ப�ப�',
 'emailccme'       => 'என� கர�த�த�க�களின� நகலொன�றை எனக�க� மின�னஞ�சலிட�',
 'emailccsubject'  => '$1 பயனர�க�கான உங�கள� மின�னஞ�சலின� நகல�: $2',
@@ -1328,7 +1344,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'addedwatch'           => 'கவனிப�ப�ப� பட�டியலில� சேர�க�கப�பட�டத�',
 'addedwatchtext'       => "\"[[:\$1]]\" பக�கம� உங�கள� [[Special:Watchlist|கவனிப�ப�ப� பக�கத�தில�]] சேர�க�கப�பட�ட�ள�ளத�. இந�தப� பக�கத�த�க�க� எதிகாலத�தில� செய�யப�படவ�ள�ள மாற�றங�கள�ம�, அதனோடிணைந�த பேச�ச�ப� பக�கம�ம�, அங�கே பட�டியலிடப�பட�ம�. அத�த�டன� தெரிந�தெட�க�க வசதியாக [[Special:RecentChanges|அண�மைய மாற�றங�களின� பட�டியலில�]] இத� தடித�த எழ�த�த�க�களில� காட�டப�பட�ம�. பின�னர�, இப� பக�கத�தை உங�கள� கவனிப�ப�ப� பட�டியலிலிர�ந�த� நீக�க விர�ம�பினால�, பக�கச� சட�டத�தில�ள�ள ''கவனிப�ப� நீக�க�'' என�ற இணைப�பைச� சொட�க�கவ�ம�.",
 'removedwatch'         => 'கவனிப�ப�ப� பட�டியலிலிர�ந�த� நீக�கப�பட�டத�',
-'removedwatchtext'     => '"[[:$1]]" பக�கம� உங�கள� கவனிப�ப�ப� பட�டியலிலிர�ந�த� நீக�கப�பட�டத�.',
+'removedwatchtext'     => '"[[:$1]]" பக�கம� [[Special:Watchlist|உங�கள� கவனிப�ப�ப� பட�டியலில�]] இர�ந�த� நீக�கப�பட�டத�.',
 'watch'                => 'கவனி',
 'watchthispage'        => 'இந�தப� பக�கத�தைக� கவனிக�கவ�ம�',
 'unwatch'              => 'கவனிப�ப�நீக�க�',
@@ -1336,7 +1352,7 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'notanarticle'         => 'ஒர� கட�ட�ரைப� பக�கமல�ல',
 'notvisiblerev'        => 'திர�த�தம� நீக�கப�பட�ட�ள�ளத�',
 'watchnochange'        => 'காட�சிப�பட�த�தப�பட�ட கால இடைவெளியில�, கவனிப�பில�ள�ள, உங�கள� விடயமெத�வ�ம� தொக�க�கப�பட�டிர�க�கவில�லை.',
-'watchlist-details'    => 'பேச�ச�ப� பக�கங�களைக� கணக�கிடாமல�, {{PLURAL:$1|ஒர� பக�கம� கவனிக�கப�பட�டத�.|$1 பக�கங�கள� கவனிக�கப�பட�டன.}}',
+'watchlist-details'    => 'பேச�ச�ப� பக�கங�களைக� தவிர�த�த�, {{PLURAL:$1|$1 பக�கம� கவனிக�கப�பட�டத�.|$1 பக�கங�கள� கவனிக�கப�பட�டன.}}',
 'wlheader-enotif'      => '* மின�னஞ�சல� அறிவித�தல�கள� செயல�பட�த�தப�பட�ட�ள�ளன.',
 'wlheader-showupdated' => "* உமத� கடைசி வர�கைக�க�ப� பின�னர� மாற�றங�கள� செய�யப�பட�ட பக�கங�கள� '''தடித�த எழ�த�த�க�களால�''' காட�டப�பட�ட�ள�ளன",
 'watchmethod-recent'   => 'கவனிக�கப�பட�கின�ற பக�கங�கள�க�காக, அண�மைய தொக�ப�ப�கள� தேடிப� பார�க�கப�பட�கிறன',
@@ -1345,12 +1361,6 @@ $1 பயனரையோ அல�லத� வேற� [[{{MediaWiki:Grouppage
 'iteminvalidname'      => "விடயம� '$1' தொடர�பில� பிரச�சினை உள�ளத�, செல�ல�படியாகாத பெயர�...",
 'wlnote'               => "பின�வர�வன கடைசி {{PLURAL:$2|மணித�தியாலத�தில�|'''$2''' மணித�தியாலங�களில�}} செய�யப�பட�ட {{PLURAL:$1|கடைசி ஒர� மாற�றமாக�ம�|கடைசி $1 மாற�றங�களாக�ம�}}.",
 'wlshowlast'           => 'கடைசி $1 மணித�தியாலங�கள� $2 நாட�களைக� காட�ட� $3',
-'watchlist-show-bots'  => 'தானியங�கி தொக�ப�ப�களைக� காட�ட�',
-'watchlist-hide-bots'  => 'தானியங�கி தொக�ப�ப�க�களை மறை',
-'watchlist-show-own'   => 'என� தொக�ப�ப�களை காட�ட�',
-'watchlist-hide-own'   => 'என� தொக�ப�ப�க�களை மறை',
-'watchlist-show-minor' => 'சிற� தொக�ப�ப�களைக� காட�ட�',
-'watchlist-hide-minor' => 'சிற� தொக�ப�ப�க�களை மறை',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'கவனிக�கப�பட�கிறத�...',
@@ -1391,65 +1401,73 @@ $NEWPAGE
 பின�னூட�டம�, மேலதிக உதவிகள�க�க�:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'பக�கத�தை நீக�க�',
-'confirm'                     => 'உற�திசெய�',
-'excontent'                   => "இர�ந�த உள�ளடக�கம�: '$1'",
-'excontentauthor'             => "இர�ந�த உள�ளடக�கம�: '$1' (தவிர, '[[Special:Contributions/$2|$2]]' மட�ட�மே பங�களித�திர�ந�தார�)",
-'exbeforeblank'               => "வெற�மைப�பட�த�த ம�ன�னிர�ந�த உள�ளடக�கம�: '$1'",
-'exblank'                     => 'பக�கம� வெற�மையாய� இர�ந�தத�',
-'delete-confirm'              => '"$1" பக�கத�தை நீக�க�',
-'delete-legend'               => 'நீக�க�',
-'historywarning'              => 'எச�சரிக�கை: நீங�கள� நீக�கவ�ள�ள பக�கத�த�க�க� ஒர� வரலாற� உண�ட�:',
-'confirmdeletetext'           => 'நீங�கள� இப�பக�கத�தை அதன� வரலாற�ற�டன� சேர�த�த� நீக�க விழைகிறிர�கள�.
+# Delete
+'deletepage'             => 'பக�கத�தை நீக�க�',
+'confirm'                => 'உற�திசெய�',
+'excontent'              => "இர�ந�த உள�ளடக�கம�: '$1'",
+'excontentauthor'        => "இர�ந�த உள�ளடக�கம�: '$1' (தவிர, '[[Special:Contributions/$2|$2]]' மட�ட�மே பங�களித�திர�ந�தார�)",
+'exbeforeblank'          => "வெற�மைப�பட�த�த ம�ன�னிர�ந�த உள�ளடக�கம�: '$1'",
+'exblank'                => 'பக�கம� வெற�மையாய� இர�ந�தத�',
+'delete-confirm'         => '"$1" பக�கத�தை நீக�க�',
+'delete-legend'          => 'நீக�க�',
+'historywarning'         => 'எச�சரிக�கை: நீங�கள� நீக�கவ�ள�ள பக�கத�த�க�க� ஒர� வரலாற� உண�ட�:',
+'confirmdeletetext'      => 'நீங�கள� இப�பக�கத�தை அதன� வரலாற�ற�டன� சேர�த�த� நீக�க விழைகிறிர�கள�.
 அர�ள� கூர�ந�த� உங�கள� செய�கையின� விளைவ�களை நீங�கள� விள�ங�கிக� கொண�டீர�கள� என�பதைய�ம� இத� [[{{MediaWiki:Policy-url}}|கொள�கைகள�டன�]] ஒத�த�ப�போவதைய�ம� உற�திப� பட�த�தவ�ம�.',
-'actioncomplete'              => 'செயற�பாட� நிறைவ�ற�றத�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" நீக�கப�பட�ட� விட�டத�. அண�மைய நீக�க�தல�களின� பதிவ�க�க� $2 �ப� பார�க�க.',
-'deletedarticle'              => '"$1" நீக�கப�பட�டத�',
-'dellogpage'                  => 'நீக�கல� பதிவ�',
-'dellogpagetext'              => 'கீழே காணப�பட�வத� மிக அண�மைய நீக�கல�களின� அட�டவணையாக�ம�.',
-'deletionlog'                 => 'நீக�கல� பதிவ�',
-'reverted'                    => 'ம�ன� திர�த�தத�த�க�க� ம�ன�நிலையாக�கப�பட�டத�',
-'deletecomment'               => 'நீக�கல�க�கான காரணம�',
-'deleteotherreason'           => 'வேற� மேலதிக காரணம�:',
-'deletereasonotherlist'       => 'வேற� காரணம�',
-'deletereason-dropdown'       => '*பொத�வான நீக�கல� காரணங�கள�
+'actioncomplete'         => 'செயற�பாட� நிறைவ�ற�றத�',
+'deletedtext'            => '"<nowiki>$1</nowiki>" நீக�கப�பட�ட� விட�டத�. அண�மைய நீக�க�தல�களின� பதிவ�க�க� $2 �ப� பார�க�க.',
+'deletedarticle'         => '"$1" நீக�கப�பட�டத�',
+'dellogpage'             => 'நீக�கல� பதிவ�',
+'dellogpagetext'         => 'கீழே காணப�பட�வத� மிக அண�மைய நீக�கல�களின� அட�டவணையாக�ம�.',
+'deletionlog'            => 'நீக�கல� பதிவ�',
+'reverted'               => 'ம�ன� திர�த�தத�த�க�க� ம�ன�நிலையாக�கப�பட�டத�',
+'deletecomment'          => 'நீக�கல�க�கான காரணம�',
+'deleteotherreason'      => 'வேற� மேலதிக காரணம�:',
+'deletereasonotherlist'  => 'வேற� காரணம�',
+'deletereason-dropdown'  => '*பொத�வான நீக�கல� காரணங�கள�
 ** காப�ப�ரிமை மீறப�பட�டமை
 ** விசமத� தொக�ப�ப�
 ** ஆசிரியர� வேண�ட�கோள�',
-'delete-edit-reasonlist'      => 'நீக�கல� காரணங�களைத� தொக�',
-'delete-toobig'               => 'இப�பக�கம� $1 திர�த�தங�கள�க�க� மேல� கொண�ட�ள�ளத�. {{SITENAME}} தளத�தின� தரவ�கள� தற�செயலாக அழிந�த�ப�போவதை தட�ப�பதற�க�காக  இவ�வாறான பக�கங�கள� நீக�கப�பட�வத� மட�ட�ப�பட�த�தப�பட�ட�ள�ளத�.',
-'delete-warning-toobig'       => 'இப�பக�கம� $1 திர�த�தங�கள�க�க� மேல� கொண�ட�ள�ளத�. இப�பக�கத�தை நீக�க�வத� {{SITENAME}} தளத�தின� தரவ�த�தளத�தின� செயற�பாட�டை பாதிக�கலாம� கவனத�த�டன� ம�ன�னெட�க�கவ�ம�.',
-'rollback'                    => 'ம�ன�நிலையாக�கத� தொக�ப�ப�கள�',
-'rollback_short'              => 'ம�ன�நிலையாக�க�',
-'rollbacklink'                => 'ம�ன�நிலையாக�க�',
-'rollbackfailed'              => 'ம�ன�நிலையாக�கம� தோல�வி',
-'cantrollback'                => 'தொக�ப�பை ம�ன�நிலையாக�க ம�டியாத�; கடைசிப� பங�களிப�பாளரே இக�கட�ட�ரையின� ஒரே ஆசிரியராக�ம�.',
-'alreadyrolled'               => '[[பயனர�:$2|$2]] ([[பயனர� பேச�ச�:$2|பேச�ச�]]) பயனரால� செய�யப�பட�ட [[:$1]] நாளின� கடைசித� தொக�ப�பை ம�ன�நிலையாக�க ம�டியாத�; வேற� யாரோ இக� கட�ட�ரையை �ற�கெனவே தொக�த�தோ அல�லத� ம�ன�நிலையாக�கியோ உள�ளார�.
-
-கடைசியாகத� தொக�த�தவர� [[பயனர�:$3|$3]] ([[பயனர� பேச�ச�:$3|பேச�ச�]]).',
-'editcomment'                 => 'தொக�ப�ப�க�க�ரிய கர�த�த�ரை: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|பேச�ச�]]) செய�தத� தொக�ப�ப�கள� நீக�கப�பட�ட� [[User:$1|$1]] இன� பதிப�ப�க�க� ம�ன�நிலையாக�கப�பட�டத�', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 செய�தத� தொக�ப�ப�கள� நீக�கப�பட�ட� $2 இன� பதிப�ப�க�க� ம�ன�நிலையாக�கப�பட�டத�.',
-'sessionfailure'              => 'உங�கள� ப�க�பதிகை அமர�வில� பிரச�சினை உள�ளத� போல தோன�ற�கிறத�. செல�வழி திர�ட�ட�க� கெதிரான ம�ன�னெச�செரிக�கையாக இந�த நடவடிக�கை இரத�த�ச� செய�யப�பட�டத�. உங�கள� உலாவியின� பின� செல�வதற�கான பொத�தானைச� செர�கி மீண�ட�ம� ம�யலவ�ம�.',
+'delete-edit-reasonlist' => 'நீக�கல� காரணங�களைத� தொக�',
+'delete-toobig'          => 'இப�பக�கம� அதிகமான திர�த�தங�களை கொண�ட�ள�ளத�, க�றிப�பாக $1 {{PLURAL:$1|திர�த�தத�திற�க�|திர�த�தங�களிற�க�}} மேல�.
+{{SITENAME}} தளத�தின� தரவ�கள� தற�செயலாக அழிந�த�ப�போவதை தட�ப�பதற�க�காக இவ�வாறான பக�கங�கள� நீக�கப�பட�வத� ம�டக�கப�பட�ட�ள�ளத�.',
+'delete-warning-toobig'  => 'இப�பக�கம� அதிகமான திர�த�தங�களை கொண�ட�ள�ளத�, க�றிப�பாக $1 {{PLURAL:$1|திர�த�தத�திற�க�|திர�த�தங�களிற�க�}} மேல�. 
+இப�பக�கத�தை நீக�க�வத� {{SITENAME}} தளத�தின� தரவ�வழங�கனின� செயற�பாட�டை பாதிக�கலாம�;
+கவனத�த�டன� ம�ன�னெட�க�கவ�ம�.',
+
+# Rollback
+'rollback'         => 'ம�ன�நிலையாக�கத� தொக�ப�ப�கள�',
+'rollback_short'   => 'ம�ன�நிலையாக�க�',
+'rollbacklink'     => 'ம�ன�நிலையாக�க�',
+'rollbackfailed'   => 'ம�ன�நிலையாக�கம� தோல�வி',
+'cantrollback'     => 'தொக�ப�பை ம�ன�நிலையாக�க ம�டியாத�; கடைசிப� பங�களிப�பாளரே இக�கட�ட�ரையின� ஒரே ஆசிரியராக�ம�.',
+'alreadyrolled'    => '[[User:$2|$2]] ([[User talk:$2|Talk]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) பயனரால� செய�யப�பட�ட [[:$1]] இன� கடைசித� தொக�ப�பை ம�ன�நிலையாக�க ம�டியாத�; வேற� யாரோ இப�பக�கத�தை �ற�கெனவே தொக�த�தோ அல�லத� ம�ன�நிலையாக�கியோ உள�ளார�.
+
+இப�பக�கத�தை கடைசியாகத� தொக�த�தவர� [[User:$3|$3]] ([[User talk:$3|Talk]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "தொக�ப�ப�க�க�ரிய கர�த�த�ரை: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|பேச�ச�]]) செய�தத� தொக�ப�ப�கள� நீக�கப�பட�ட� [[User:$1|$1]] இன� பதிப�ப�க�க� ம�ன�நிலையாக�கப�பட�டத�', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 செய�தத� தொக�ப�ப�கள� நீக�கப�பட�ட� $2 இன� பதிப�ப�க�க� ம�ன�நிலையாக�கப�பட�டத�.',
+'sessionfailure'   => 'உங�கள� ப�க�பதிகை அமர�வில� பிரச�சினை உள�ளத� போல தோன�ற�கிறத�. செல�வழி திர�ட�ட�க� கெதிரான ம�ன�னெச�செரிக�கையாக இந�த நடவடிக�கை இரத�த�ச� செய�யப�பட�டத�. உங�கள� உலாவியின� பின� செல�வதற�கான பொத�தானைச� செர�கி மீண�ட�ம� ம�யலவ�ம�.',
+
+# Protect
 'protectlogpage'              => 'காப�ப�ப� பதிகை',
 'protectlogtext'              => 'பின�வர�வத� பக�க திறப�ப�க�களத�ம� பூட�ட�க�களத�ம� பட�டியலாக�ம�. தற�போத� நடைம�றையில�ள�ள காக�கப�பட�டப� பக�கங�களைக� காண [[Special:ProtectedPages|காக�கப�பட�ட பக�கங�களின� பட�டியலைப�]] பார�க�கவ�ம�.',
 'protectedarticle'            => '"[[$1]]" காக�கப�பட�டத�',
 'modifiedarticleprotection'   => '"[[$1]]" பக�கத�திற�கான காப�பின� அளவ� மாற�றப�பட�டத�',
 'unprotectedarticle'          => '"[[$1]]" பக�கத�தின� காப�ப� நீக�கப�பட�டத�',
 'protect-title'               => '"$1" பக�கத�த�க�கான காப�ப� அமைப�ப�',
+'prot_1movedto2'              => '[[$1]], [[$2]] என�றத� தலைப�ப�க�க� நகர�த�தப� பட�ட�ள�ளத�',
 'protect-legend'              => 'காப�பை உற�திப�பட�த�த�',
 'protectcomment'              => 'காப�ப�ச� செய�வதற�கான காரணம�:',
 'protectexpiry'               => 'ம�டிவ� நாள�:',
 'protect_expiry_invalid'      => 'பொர�த�தமற�ற ம�டிவ� நாள�',
 'protect_expiry_old'          => 'ம�டிவ� நாள� கடந�தக� காலத�தில� உள�ளத�.',
 'protect-unchain'             => 'நகர�தல� அன�மதிகளை திறந�த�விட�',
-'protect-text'                => 'நீங�கள� <strong><nowiki>$1</nowiki></strong> பக�கத�த�க�கான காப�ப� நிலையைப� பார�த�த� அதனை மாற�ற ம�டிய�ம�.',
-'protect-locked-blocked'      => 'நீங�கள� தட�க�கப�பட�ட�ள�ள நிலையில� பக�க காப�ப� நிலைகளை மாற�ற ம�டியாத�. தற�போதை பக�க காப�ப� நிலை பின�வர�மாற� <strong>$1</strong>:',
-'protect-locked-dblock'       => 'தற�போத�ள�ள தரவ�த�தள பூட�டின� காரணமாக பக�க காப�ப� நிலைகள� மாற�றப� படம�டியாத�.
-<strong>$1</strong> பக�கத�த�க�கான தற�போதைய அமைவ�கள�:',
-'protect-locked-access'       => 'உங�கள� பயனர� கணக�க�க� இப�பக�கத�தின� காப�ப�நிலையை மாற�ற�வதற�கான அன�மதில� இல�லை.
-<strong>$1</strong> பக�கத�த�க�கான நடப�ப� அமைப�ப�கள� பின�வர�மாற�:',
+'protect-text'                => "நீங�கள� '''<nowiki>$1</nowiki>''' பக�கத�த�க�கான காப�ப� நிலையைப� பார�த�த� அதனை மாற�ற ம�டிய�ம�.",
+'protect-locked-blocked'      => "நீங�கள� தட�க�கப�பட�ட�ள�ள நிலையில� பக�க காப�ப� நிலைகளை மாற�ற ம�டியாத�. தற�போதை பக�க காப�ப� நிலை பின�வர�மாற� '''$1''':",
+'protect-locked-dblock'       => "தற�போத�ள�ள தரவ�த�தள பூட�டின� காரணமாக பக�க காப�ப� நிலைகள� மாற�றப� படம�டியாத�.
+'''$1''' பக�கத�த�க�கான தற�போதைய அமைவ�கள�:",
+'protect-locked-access'       => "உங�கள� பயனர� கணக�க�க� இப�பக�கத�தின� காப�ப�நிலையை மாற�ற�வதற�கான அன�மதில� இல�லை.
+'''$1''' பக�கத�த�க�கான நடப�ப� அமைப�ப�கள� பின�வர�மாற�:",
 'protect-cascadeon'           => 'இந�தப�பக�கம� படிநிலை காப�ப�க�ட�பட�த�தப�பட�ட {{PLURAL:$1|பக�கத�திற�க�|பக�கங�களிற�க�}} இணைக�கப�பட�ட�ள�ளமையால� காப�ப�ச� செய�யப�பட�ட�ள�ளத�. இந�த பக�கத�தின� காப�ப� நிலையை நீங�கள� மாற�றம� செய�யலாம� எனின�ம� இத� படிநிலை காப�பினை மாற�றம� செய�யாத�.',
 'protect-default'             => '(இயல�பிர�ப�ப�)',
 'protect-fallback'            => '"$1" அன�மதி தேவை',
@@ -1459,6 +1477,7 @@ $NEWPAGE
 'protect-expiring'            => '$1 (UTC) மணிக�க� காலாவதியாகிறத�',
 'protect-cascade'             => 'இப�பக�கத�தில� இணைக�கப�பட�ட பக�கங�களைக� காப�ப�ச� செய� (படிநிலைக� காப�ப�)',
 'protect-cantedit'            => 'இப�பக�கத�தின� காப�ப� நிலையை நீங�கள� மாற�ற ம�டியாத�. உங�கள�க�க� காப�ப� நிலையை தொக�ப�பதற�கான அன�மதி கிடையாத�.',
+'protect-expiry-options'      => '2 மணித�தியாலங�கள�:2 hours,1 நாள�:1 day,3 நாட�கள�:3 days,1 வாரம�:1 week,2 வாரங�கள�:2 weeks,1 மாதம�:1 month,3 மாதங�கள�:3 months,6 மாதங�கள�:6 months,1 ஆண�ட�:1 year,ம�டிவிலி:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'அன�மதி:',
 'restriction-level'           => 'தடை அளவ�:',
 'minimum-size'                => 'க�றைந�த அளவ�',
@@ -1481,10 +1500,16 @@ $NEWPAGE
 'undeletepage'                 => 'பார�ப�பத�டன�, நீக�கப�பட�ட பக�கங�களை மீட�டெட�',
 'undeletepagetitle'            => "'''[[:$1]] பக�கத�த�க�கான நீக�கப�பட�ட திர�த�தங�கள� கீழே தரப�பட�ட�ள�ளன'''.",
 'viewdeletedpage'              => 'நீக�க�கப�பட�ட பக�கங�களைப� பார�',
-'undeletepagetext'             => 'பின�வர�ம� பக�கங�கள� நீக�கப�பட�ட�விட�டன எனின�ம� காப�பகத�தில�ள�ளத�டன� அவற�றை மீட�டெட�க�கவ�ம� ம�டிய�ம�.  காப�பகம� காலத�த�க�க�க� காலம� ச�த�தப�பட�த�தப�படலாம�.',
+'undeletepagetext'             => 'பின�வர�ம� {{PLURAL:$1|பக�கம� நீக�கப�பட�ட�விட�டத� எனின�ம� அத�|$1 பக�கங�கள� நீக�கப�பட�ட�விட�டன எனின�ம� அவை}} காப�பகத�தில� உள�ளதால�, மீட�டெட�க�க ம�டிய�ம�. காப�பகம� காலத�த�க�க�க� காலம� ச�த�தப�பட�த�தப�படலாம�.',
 'undeleterevisions'            => '{{PLURAL:$1|ஒர� திர�த�தம� பரணிடப�பட�டத�|$1 திர�த�தங�கள� பரணிடப�பட�டன}}',
-'undeletehistory'              => 'இந�தப� பக�கத�தை நீங�கள� மீள�வித�தால�, எல�லாத� திர�த�தங�கள�ம� வரலாற�ற�க�க� மீள�விக�கப�பட�ம�. நீக�க�தலின� பின�னர�, அதே பெயர�டைய வேறொர� ப�திய பக�கம� உர�வாக�கப�பட�டிர�ந�தால�, மீள�விக�கப�பட�ட திர�த�தங�கள� ம�ன�னைய வரலாற�றிலேயே காணப�பட�ம�, அத�த�டன� உயிர�ப�ப� நிலையில�ள�ள நடப�ப�த� திர�த�தம� தன�னியக�கமாகப� பிரதியீட� செய�யப�பட மாட�டாத�.',
-'undelete-revision'            => '$3 செய�த $1 பக�கத�தின� ($2 இல� உள�ளபடியான) நீக�கப�பட�ட திர�த�தம�:',
+'undeletehistory'              => 'இந�தப� பக�கத�தை நீங�கள� மீள�வித�தால�, எல�லாத� திர�த�தங�கள�ம� வரலாற�ற�க�க� மீள�விக�கப�பட�ம�. 
+நீக�க�தலின� பின�னர�, அதே பெயர�டைய வேறொர� ப�திய பக�கம� உர�வாக�கப�பட�டிர�ந�தால�, மீள�விக�கப�பட�ட திர�த�தங�கள� ம�ன�னைய வரலாற�றிலேயே காணப�பட�ம�.',
+'undeletehistorynoadmin'       => 'இந�த பக�கம� நீக�கப�பட�ட� உள�ளத�.
+
+நீக�கப�பட�டமைக�கான காரனீயம�ம�, நீக�கப�பட�வதற�க� ம�ன� இப�பக�கத�தை தொக�த�த பயனர�களின� தகவல�கள�ம� பின�வர�ம� ச�ர�க�கத�தில� கொட�க�கப�பட�ட�ள�ளன.
+
+நீக�கப�பட�ட திர�த�தங�களின� வாசகங�களை நிர�வாகிகள� மட�ட�மே காணம�டிய�ம�.',
+'undelete-revision'            => '$3 செய�த $1 பக�கத�தின� ($4, $5 இல� உள�ளபடியான) நீக�கப�பட�ட திர�த�தம�:',
 'undeleterevision-missing'     => 'செல�ல�படியற�ற அல�லத� காணப�படாத திர�த�தம�. நீங�கள� இங�கே வந�த இணைப�ப� பழ�த�ள�ளதாக இர�க�கலாம� அல�லத� க�றித�த திர�த�தம� பரணிலிர�ந�த� நீக�கப�பட�டோ அல�லத� மீட�கபட�டோ இர�க�கலாம�.',
 'undelete-nodiff'              => 'ம�ந�தைய திர�த�தங�கள� காணப�படவில�லை.',
 'undeletebtn'                  => 'மீட�டெட�',
@@ -1512,6 +1537,8 @@ $NEWPAGE
 'undelete-error-long'          => 'கோப�பை மீட�டெட�க�க�ம� போத� தவற� �ற�பட�ட�ள�ளத�:
 
 $1',
+'undelete-show-file-confirm'   => '"<nowiki>$1</nowiki>" கோப�பின� $2, $3ல� நீக�கப�பட�ட திர�த�தத�தை நீங�கள� காணவேண�ட�மா என�பதை உற�திப�பட�த�தவ�ம�?',
+'undelete-show-file-submit'    => 'ஆம�',
 
 # Namespace form on various pages
 'namespace'      => 'பெயர�வெளி:',
@@ -1536,9 +1563,8 @@ $1',
 
 # What links here
 'whatlinkshere'            => 'இப� பக�கத�தை இணைத�தவை',
-'whatlinkshere-title'      => '$1 பக�கத�த�க�க� இணைக�கப�பட�டவை',
+'whatlinkshere-title'      => '"$1" பக�கத�த�க�க� இணைக�கப�பட�டவை',
 'whatlinkshere-page'       => 'பக�கம�:',
-'linklistsub'              => '(இணைப�ப�களின� பட�டியல�)',
 'linkshere'                => "'''[[:$1]]''' பின�வர�ம� பக�கங�களில� இப�பக�கம� இணைக�கப�பட�ட�ள�ளத�:",
 'nolinkshere'              => "'''[[:$1]]''' எந�தப� பக�கத�தில�ம� இந�தப� பக�கம� இணைக�கப�படவில�லை.",
 'nolinkshere-ns'           => "தெரிவ� செய�யப�பட�ட பெயர�வெளியில� '''[[:$1]]''' பக�கத�த�க�க� இணைக�கப�பட�ட பக�கங�கள� எத�வ�மில�லை.",
@@ -1587,14 +1613,14 @@ $1',
 'ipb-edit-dropdown'           => 'தடை காரணங�கள� தொக�',
 'ipb-unblock-addr'            => '$1 இன� தடையை நீக�க�',
 'ipb-unblock'                 => '�.பி. அல�லத� பயனர�க�கான தடையை நீக�க�',
-'ipb-blocklist-addr'          => '$1 பயனர�க�கான தற�போத�ள�ள தட�ப�ப�களைப� பார�',
+'ipb-blocklist-addr'          => '$1 இற�க� தற�போத�ள�ள தட�ப�ப�கள�',
 'ipb-blocklist'               => 'தற�போத�ள�ள தட�ப�ப�களைப� பார�',
 'unblockip'                   => 'பயனர� தடையை நீக�க�',
 'unblockiptext'               => 'ம�ன�னர� தட�க�கப�பட�ட �.பி. ம�கவரி அல�லத� பயனர�பெயரின� எழ�த�த� அண�க�கத�தை மீழ�விப�பதற�க� கீழேய�ள�ள படிவத�தை பயன�பட�த�தவ�ம�.',
 'ipusubmit'                   => 'இம�ம�கவரிக�கான தடையை நீக�க�',
 'unblocked'                   => '[[User:$1|$1]] பயனர�க�கான தடை நீக�கப�பட�டத�',
 'unblocked-id'                => '$1 தடை நீக�கப�பட�டத�',
-'ipblocklist'                 => 'தட�க�கப�பட�ட �பி ம�கவரிகளினத�ம�, பயனர� பெயர�களினத�ம� பட�டியல�',
+'ipblocklist'                 => 'தட�க�கப�பட�ட �பி ம�கவரிகள� மற�ற�ம� பயனர�பெயர�களின� பட�டியல�',
 'ipblocklist-legend'          => 'தட�க�கப�பட�ட பயனரொர�வரைத� தேட�',
 'ipblocklist-username'        => 'பயனர� பெயர� அல�லத� �.பி. ம�கவரி:',
 'ipblocklist-submit'          => 'தேட�க',
@@ -1647,50 +1673,56 @@ $1',
 'databasenotlocked'   => 'தரவ�த�தளம� பூட�டப�படவில�லை.',
 
 # Move page
-'move-page'               => '$1 பக�கத�தை நகர�த�த�',
-'move-page-legend'        => 'பக�கத�தை நகர�த�த�',
-'movepagetext'            => "பின�வர�ம� படிவத�தைப� பயன�பட�த�த�வத�, பக�கமொன�றின� பெயரை மாற�றி, இதன�டைய ம�ழ� வரலாற�றைய�ம� ப�திய பெயர�க�க� நகர�த�த�ம�. பழைய தலைப�ப�, ப�திய பக�கத�த�க�கான ஒர� வழிகாட�ட�ம� பக�கமாக ஆக�ம�.
-பழைய பக�கத� தலைப�ப�க�க� உள�ள இணைப�ப�க�கள� மாறமாட�டா;
-இரட�டை அல�லத� ம�றிந�த வழிமாற�ற�கள� உள�ளனவா என�பதைச� சரி பார�த�த� உற�திசெய�யவ�ம�.
+'move-page'                 => '$1 பக�கத�தை நகர�த�த�',
+'move-page-legend'          => 'பக�கத�தை நகர�த�த�',
+'movepagetext'              => "பின�வர�ம� படிவத�தைப� பயன�பட�த�த�வத�, பக�கமொன�றின� பெயரை மாற�றி, இதன�டைய ம�ழ� வரலாற�றைய�ம� ப�திய பெயர�க�க� நகர�த�த�ம�. பழைய தலைப�ப�, ப�திய பக�கத�த�க�கான ஒர� வழிகாட�ட�ம� பக�கமாக ஆக�ம�.
+நீங�கள� பழைய தலைப�ப�க�க� தானியக�கமாக வழிகாட�ட�ம� வழிமாற�ற�க�களை  மாற�றியமைக�கலாம�.
+அப�படி செய�ய நீங�கள� விர�ம�பவில�லை எனில�,[[Special:DoubleRedirects|இரட�டை]] அல�லத� [[Special:BrokenRedirects|ம�றிந�த வழிமாற�ற�கள�]]  உள�ளனவா என�பதைச� சரி பார�த�த� உற�திசெய�யவ�ம�.
 இணைப�ப�கள� எவ�விடத�த�க�க�ச� சென�றடைய வேண�ட�மோ அவ�விடத�தைத� தொடர�ந�த�ம� க�றிப�பதை உற�தி செய�த� கொள�வத� உங�கள� பொற�ப�பாக�ம�.
 
-�ற�கெனவே ப�திய தலைப�பில� ஒர� பக�கம� இர�ந�தால�, இந�தப� பக�கம� வெற�மையாகவோ அல�லத� ஒர� வழிமாற�ற�ப� பக�கமாகவோ இர�ப�பத�டன� பழைய தொக�ப�ப� வரலாற�ம� இல�லாதிர�ந�தால�தான�,  இப� பக�கம� நகர�த�தப�பட�ம� என�பதைக� கவனிக�கவ�ம�.
+�ற�கெனவே ப�திய தலைப�பில� ஒர� பக�கம� இர�ந�தால�, இந�தப� பக�கம� வெற�மையாகவோ அல�லத� ஒர� வழிமாற�ற�ப� பக�கமாகவோ இர�ப�பத�டன� பழைய தொக�ப�ப� வரலாற�ம� இல�லாதிர�ந�தால�தான�,  இப� பக�கம� '''நகர�த�தப�பட�ம�''' என�பதைக� கவனிக�கவ�ம�.
 தற�செயலாக, நீங�கள� தவற� செய�த�விட�டால�, எந�தப� பெயரிலிர�ந�த� பெயர� மாற�றம� செய�தீர�களோ அதே பெயர�க�க� மீண�ட�ம� மாற�றம�டிய�ம� என�பத�டன� �ற�கெனவே இர�க�க�ம� பக�கமொன�றை மேலெழ�த ம�டியாத� என�பதைய�ம� இத� க�றிக�கின�றத�.
 
 '''எச�சரிக�கை!'''
 இத� பிரபலமான ஒர� பக�கத�த�க�க�ச� செய�ய�ம� கட�மையானத�ம�, எதிர�பாராதத�மான மாற�றமாக இர�க�கக�கூட�ம�;
-தொடர�வதற�க� ம�ன� இதன� விளைவ�களை விளங�கிக�கொண�டிர�க�கிறீர�கள� என�பதை உற�திப�பட�த�திக� கொள�ளவ�ம�.",
-'movepagetalktext'        => "*நீங�கள� பக�கத�தைப� பெயர�வெளிகளிடையே நகர�த�த�கிறீர�கள� என�றோ,
+தயவ�செய�த� தொடர�வதற�க� ம�ன� இதன� விளைவ�களை விளங�கிக�கொண�டிர�க�கிறீர�கள� என�பதை உற�திப�பட�த�திக� கொள�ளவ�ம�.",
+'movepagetalktext'          => "*நீங�கள� பக�கத�தைப� பெயர�வெளிகளிடையே நகர�த�த�கிறீர�கள� என�றோ,
 *ஒர� வெற�மையில�லாத பேச�ச�ப� பக�கம� ப�திய பெயரில� �ற�கெனவேயிர�ந�தோ, அல�லத�
 *நீங�கள� கீழேய�ள�ள கட�டத�தில� க�றியிடாமல� விட�கிறீர�கள� என�றோ.
 '''இல�லாவிடில�''' சேர�ந�திர�க�க�ம� பேச�ச�ப� பக�கம�, �தாவத� இர�ந�தால�, தன�னியக�கமாக அதன�டன� நகர�த�தப�பட�ம�.
 இப�படியான சந�தர�ப�பங�களில�, விர�ம�பினால�, நகர�த�தலையோ அல�லத� ஒன�றிணைத�தலையோ நீங�கள� கைவினையாகச� செய�யவேண�டியிர�க�க�ம�.",
-'movearticle'             => 'பக�கத�தை நகர�த�',
-'movenotallowed'          => 'உமக�க� {{SITENAME}} தளத�தில� பக�கங�களை நகர�த�த அன�மதி கிடையாத�.',
-'newtitle'                => 'ப�திய தலைப�ப�',
-'move-watch'              => 'இப�பக�கத�தைக� கவனி',
-'movepagebtn'             => 'பக�கத�தை நகர�த�த�',
-'pagemovedsub'            => 'நகர�த�தல� வெற�றி',
-'movepage-moved'          => '<big>\'\'\'"$1", "$2" என�ற தலைப�ப�க�க� நகர�த�தப� பட�ட�ள�ளத�\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'அந�தப� பெயரைய�டைய பக�கம� �ற�கெனவே உள�ளத� அல�லத� நீங�கள� தெரிவ� செய�த பெயர� செல�ல�படியாகாத�. தயவ�செய�த� வேற� பெயரைத� தெரியவ�ம�.',
-'cantmove-titleprotected' => 'நீர� பக�கத�க�தை நகர�த�த எத�தனித�த தலைப�ப� உர�வாக�கப�பட�வத� தடை செய�யப�பட�ட�மையால� அத�தலைப�ப�க�க� நகர�த�த ம�டியாத�',
-'talkexists'              => 'பக�கம� வெற�றிகரமாக நகர�த�தப�பட�டத�, ஆனால� பேச�ச�ப� பக�கத�தை நகர�த�த ம�டியவில�லை �னெனில� ப�திய தலைப�பில� இன�னொன�ற� உள�ளத�. தயவ�செய�த� கையால� ஒன�ற�கலக�கவ�ம�.',
-'movedto'                 => 'நகர�த�தப�பட�ட இடம�',
-'movetalk'                => 'தக�கதாயின� "பேச�ச�ப�" பக�கத�தைய�ம� நகர�த�தவ�ம�.',
-'1movedto2'               => '[[$1]], [[$2]] என�றத� தலைப�ப�க�க� நகர�த�தப� பட�ட�ள�ளத�',
-'1movedto2_redir'         => '[[$1]],[[$2]] பக�கத�த�க�க� வழிமாற�றிக�க� மேலாக நகர�த�தப�பட�டத�',
-'movelogpage'             => 'நகர�த�தல� பதிகை',
-'movelogpagetext'         => 'நகர�த�தப�பட�டப� பக�கங�களின� பட�டியல� கீழே தரப�பட�ட�ள�ளத�.',
-'movereason'              => 'காரணம�:',
-'revertmove'              => 'ம�ன�நிலையாக�க�',
-'delete_and_move'         => 'நீக�கிவிட�ட� நகர�த�த�',
-'delete_and_move_text'    => '==நீக�கம� தேவை==
+'movearticle'               => 'பக�கத�தை நகர�த�',
+'movenologin'               => 'ப�க�பதிகை செய�யப�படவில�லை',
+'movenologintext'           => 'இப� பக�கத�தை நகர�த�த�வதற�க�, நீங�கள� ஒர� பதிவ� செய�யப�பட�ட பயனராய�ம� [[Special:UserLogin|ப�க�பதிகை செய�த�ம�]] இர�க�க வேண�ட�ம�.',
+'movenotallowed'            => 'உங�கள�க�க� பக�கங�களை நகர�த�த அன�மதி கிடையாத�.',
+'newtitle'                  => 'ப�திய தலைப�ப�',
+'move-watch'                => 'இப�பக�கத�தைக� கவனி',
+'movepagebtn'               => 'பக�கத�தை நகர�த�த�',
+'pagemovedsub'              => 'நகர�த�தல� வெற�றி',
+'movepage-moved'            => '<big>\'\'\'"$1", "$2" என�ற தலைப�ப�க�க� நகர�த�தப� பட�ட�ள�ளத�\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'             => 'அந�தப� பெயரைய�டைய பக�கம� �ற�கெனவே உள�ளத� அல�லத� நீங�கள� தெரிவ� செய�த பெயர� செல�ல�படியாகாத�. தயவ�செய�த� வேற� பெயரைத� தெரியவ�ம�.',
+'cantmove-titleprotected'   => 'நீர� பக�கத�க�தை நகர�த�த எத�தனித�த தலைப�ப� உர�வாக�கப�பட�வத� தடை செய�யப�பட�ட�மையால� அத�தலைப�ப�க�க� நகர�த�த ம�டியாத�',
+'talkexists'                => 'பக�கம� வெற�றிகரமாக நகர�த�தப�பட�டத�, ஆனால� பேச�ச�ப� பக�கத�தை நகர�த�த ம�டியவில�லை �னெனில� ப�திய தலைப�பில� இன�னொன�ற� உள�ளத�. தயவ�செய�த� கையால� ஒன�ற�கலக�கவ�ம�.',
+'movedto'                   => 'நகர�த�தப�பட�ட இடம�',
+'movetalk'                  => 'தக�கதாயின� "பேச�ச�ப�" பக�கத�தைய�ம� நகர�த�தவ�ம�.',
+'1movedto2'                 => '[[$1]], [[$2]] என�றத� தலைப�ப�க�க� நகர�த�தப� பட�ட�ள�ளத�',
+'1movedto2_redir'           => '[[$1]],[[$2]] பக�கத�த�க�க� வழிமாற�றிக�க� மேலாக நகர�த�தப�பட�டத�',
+'movelogpage'               => 'நகர�த�தல� பதிகை',
+'movelogpagetext'           => 'நகர�த�தப�பட�டப� பக�கங�களின� பட�டியல� கீழே தரப�பட�ட�ள�ளத�.',
+'movereason'                => 'காரணம�:',
+'revertmove'                => 'ம�ன�நிலையாக�க�',
+'delete_and_move'           => 'நீக�கிவிட�ட� நகர�த�த�',
+'delete_and_move_text'      => '==நீக�கம� தேவை==
 
 நகர�த�தப�படவேண�டியப� பக�கம� "[[:$1]]" �ற�கனவே உள�ளத�. நகர�த�தல�க�க� வழி �ற�பட�த�த அப�பக�கத�தை நீக�க வேண�ட�மா?',
-'delete_and_move_confirm' => 'ஆம�, இப�பக�கத�தை நீக�க�க',
-'delete_and_move_reason'  => 'நகர�த�த�வதற�க� இடமளிப�பதற�காக நீக�கப�பட�டத�',
-'selfmove'                => 'நகர�தலின� தொடக�கப� பக�கத�தலைப�ப�ம� ம�டிவ�ப� பக�கத�தலைப�ப�ம� ஒன�றாக�ம�; ஒர� தலைப�பை அதன� மீதே நகர�த�த ம�டியாத�.',
-'immobile_namespace'      => 'நகர�தலின� தொடக�க அல�லத� ம�டிவ�ப� பக�கத�தலைப�ப� சிறப�ப� வகையைச� சேர�ந�ததாக�ம�; ஒர� தலைப�பை க�றித�த பெயர�வெளியின� உள�ளோ அல�லத� வெளியோ நகர�த�த ம�டியாத�.',
+'delete_and_move_confirm'   => 'ஆம�, இப�பக�கத�தை நீக�க�க',
+'delete_and_move_reason'    => 'நகர�த�த�வதற�க� இடமளிப�பதற�காக நீக�கப�பட�டத�',
+'selfmove'                  => 'நகர�தலின� தொடக�கப� பக�கத�தலைப�ப�ம� ம�டிவ�ப� பக�கத�தலைப�ப�ம� ஒன�றாக�ம�; ஒர� தலைப�பை அதன� மீதே நகர�த�த ம�டியாத�.',
+'immobile-source-namespace' => '"$1" பெயர�வெளியின� பக�கங�களை நகர�த�த ம�டியாத�.',
+'immobile-target-namespace' => '"$1" பெயர�வேளிக�க�ள� பக�கங�களை நகர�த�த ம�டியாத�.',
+'immobile-source-page'      => 'இந�த பக�கம� நகர�த�தக�கூடியதல�ல.',
+'imagenocrossnamespace'     => 'ஒர� கோப�பற�ற பெயர�வெளிக�க� கோப�பை நகர�த�தம�டியாத�',
+'move-leave-redirect'       => 'ஒர� வழிமாற�றை விட�ட�ச�செல�',
 
 # Export
 'export'            => '�ற�ற�மதிப� பக�கங�கள�',
@@ -1698,7 +1730,7 @@ $1',
 
 �ற�ற�மதி செய�ய வேண�டிய பக�கங�களின� தலைப�ப�க�களை ஒர� நிரைக�க� ஒன�றாக கீழ�ள�ள உரைக� கட�டத�தில� இட�க, மேல�ம� உமக�க� நடப�ப�ப� பதிப�ப� மட�ட�ம� வேண�ட�மா அல�லத� பழைய பதிப�ப�க�கள�ம� வேண�ட�மா என�பதைக� க�றிப�பிடவ�ம�.
 
-நடப�ப�ப� பதிப�ப� தேவையாயின� இணைப�ப�க�களைப� பயன�பட�த�தலாம� எ+கா  "[[{{MediaWiki:Mainpage}}]]" என�றப� பக�கத�தை �ற�மதி செய�ய [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] என�ற இணைப�பை பயன�பட�த�தலாம�.',
+நடப�ப�ப� பதிப�ப� தேவையாயின� இணைப�ப�க�களைப� பயன�பட�த�தலாம� எ+கா  "[[{{MediaWiki:Mainpage}}]]" என�றப� பக�கத�தை �ற�மதி செய�ய [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] என�ற இணைப�பை பயன�பட�த�தலாம�.',
 'exportcuronly'     => 'நடப�ப�த� திர�த�தத�தை மட�ட�ம� சேர�க�கவ�ம�',
 'exportnohistory'   => "----
 '''க�றிப�ப�:'''செயல� திறைனைக� கர�த�திற� கொண�ட� பக�கங�களின� ம�ழ�மையான வரலாற�றை இப�படிமமூடாக �ற�ற�மதி செய�வத� ம�டக�கப�பட�ட�ள�ளத�.",
@@ -1731,10 +1763,13 @@ $1',
 'import-interwiki-text'      => 'இறக�க�மதிக�கான விக�கியைய�ம� பக�கத�தைய�ம� தெரிவ�ச� செய�க.
 திர�த�த நாட�கள�, தொக�த�தவர�களின� பெயர�கள� என�பன பேனப�பட�ம�.
 எல�லா விக�கியிடை இறக�க�மதிகள�ம� [[Special:Log/import|இறக�க�மதிப� பதிகையில�]] பதியப�பட�ம�.',
+'import-interwiki-source'    => 'மூல விக�கி/பக�கம�:',
 'import-interwiki-history'   => 'இப�பக�கத�தின� அனைத�த� வரலாற�ற�ப� பதிப�ப�களைய�ம� நகலெட�',
 'import-interwiki-submit'    => 'இறக�க�',
-'import-interwiki-namespace' => 'பக�கங�களை பின�வர�ம� பெயர�வெளிக�க� மாற�ற�:',
-'importtext'                 => 'அர�ள� கூர�ந�த� மூல விக�கியிலிர�ந�த� சிறப�ப�:�ற�ற�மதி அம�சத�தைப� பயன�பட�த�தி கோப�பை �ற�ற�மதி செய�த� உங�கள� கணினியில� சேமித�த� அக�கோப�பை இங�கே பதிவேற�றவ�ம�.',
+'import-interwiki-namespace' => 'பின�வர�ம� பெயர�வெளிக�க� மாற�ற�:',
+'import-upload-filename'     => 'கோப�ப�ப�பெயர�:',
+'import-comment'             => 'கர�த�த�:',
+'importtext'                 => 'அர�ள� கூர�ந�த� மூல விக�கியிலிர�ந�த� [[Special:Export|�ற�ற�மதி அம�சத�தைப�]] பயன�பட�த�தி கோப�பை �ற�ற�மதி செய�த� உங�கள� கணினியில� சேமித�த� அக�கோப�பை இங�கே பதிவேற�றவ�ம�.',
 'importstart'                => 'பக�கங�கள� இறக�கப�பட�கின�றன...',
 'import-revision-count'      => '{{PLURAL:$1|ஒர� திர�த�தம�|$1 திர�த�தங�கள�}}',
 'importnopages'              => 'இறக�க�மதிக�க� பக�கங�கள� எத�வ�மில�லை.',
@@ -1753,6 +1788,9 @@ $1',
 'import-noarticle'           => 'இறக�க�மதிக�கான பக�கமெத�வ�மில�லை!',
 'import-nonewrevisions'      => 'எல�லாத� திர�த�தங�கள�ம� ம�ன�னர� இறக�கப�பட�ட�ள�ளன.',
 'xml-error-string'           => '$1 நிரை $2, நிரல� $3 (பைட� $4): $5',
+'import-upload'              => 'XML தரவை பதிவேற�ற�',
+'import-token-mismatch'      => 'உங�கள� அமர�வின� தரவ�கள� அழிந�த�விட�டன. தயவ�செய�த� மீண�ட�ம� ம�யற�சிக�கவ�ம�.',
+'import-invalid-interwiki'   => 'க�றிப�பிட�ட விக�கியில� இர�ந�த� இறக�க�மதி செய�யம�டியாத� .',
 
 # Import log
 'importlogpage'                    => 'இறக�க�மதி பதிகை',
@@ -1826,17 +1864,17 @@ $1',
 'notacceptable' => 'உங�களத� சேவையாளர� வாசிக�க கூடிய விதத�தில� இந�த விக�கியால தரவ�களை வழங�க ம�டியாத�.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}} தளத�தின� அடையாளம� காட�டாத பயனர�(கள�)',
+'anonymous'        => '{{SITENAME}} தளத�தின� அடையாளம� காட�டாத {{PLURAL:$1|பயனர�|பயனர�கள�}}',
 'siteuser'         => '{{SITENAME}} தளத�தின� பயனர� $1',
 'lastmodifiedatby' => 'இப�பக�கம� கடைசியாக $2, $1 அன�ற� $3 என�றப� பயனரால� தொக�க�கப�பட�டத�.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 உடைய ஆக�கத�தை அடிப�படையாகக� கொண�டத�.',
 'others'           => '�னைய',
-'siteusers'        => '{{SITENAME}} பயனர�(கள�) $1',
+'siteusers'        => '{{SITENAME}} தளத�தின� {{PLURAL:$2|பயனர�|பயனர�கள�}} $1',
 'creditspage'      => 'பக�க நன�றிகள�',
 
 # Spam protection
 'spamprotectiontitle' => 'எரிதக� காப�ப� வடி',
-'spamprotectiontext'  => 'நீங�கள� சேமிக�க ம�ட�பட�ட பக�கம� எரித வடியால� தட�க�கப�பட�டத�. இத� வெளி இணையத�தளம� ஒன�ற�க�கான இணைப�ப�க� காரணமாக �ற�பட�டிர�க�கலாம�.',
+'spamprotectiontext'  => 'நீங�கள� சேமிக�க ம�ற�பட�ட பக�கம� எரித வடியால� தட�க�கப�பட�டத�. இத� தடை செய�யப�பட�ட வெளி இணையத�தளம� ஒன�ற�க�கான இணைப�ப�க� காரணமாக �ற�பட�டிர�க�கலாம�.',
 'spamprotectionmatch' => 'பின�வர�ம� உரையே எரித வடியை தூண�டியத�: $1',
 'spambot_username'    => 'மிடியாவிக�கி எரித த�ப�ப�ரவ�',
 'spam_reverting'      => '$1 தளத�த�க�க� இணைப�ப�களற�ற பதிப�ப�க�க� ம�ன�நிலையாக�கப�பட�டத�',
@@ -1850,6 +1888,11 @@ $1',
 'numauthors'     => 'எழ�த�தாளர�களின� எண�ணிக�கை (பக�கம�): $1',
 'numtalkauthors' => 'எழ�த�தாளர�களின� எண�ணிக�கை (உரையாடல� பக�கம�): $1',
 
+# Skin names
+'skinname-standard'    => 'இயல�பான',
+'skinname-nostalgia'   => 'பச�மை நினைவ� (Nostalgia)',
+'skinname-cologneblue' => 'கொலோன� (Cologne) நீலம� Blue',
+
 # Math options
 'mw_math_png'    => 'எப�போத�ம� PNG ஆக மாற�ற�',
 'mw_math_simple' => 'சிக�கலற�றதாயின� HTML அல�லத� PNG',
@@ -1886,8 +1929,8 @@ $1',
 'filedelete-archive-read-only'    => 'வழங�கனால� பரண� அடைவ� "$1" எழ�தப�படம�டியாத�.',
 
 # Browsing diffs
-'previousdiff' => '� ம�ந�தைய வேற�பாட�',
-'nextdiff'     => 'அட�த�த வேற�பாட� →',
+'previousdiff' => '� ம�ந�தைய தொக�ப�ப�',
+'nextdiff'     => 'அட�த�த தொக�ப�ப� →',
 
 # Media information
 'mediawarning'         => "'''எச�சரிக�கை''': இந�தக� கோப�ப� கேட�விளைவிக�கக� கூடிய நிரலைக� கொண�டிர�க�கலாம�, இதனை செயற�பட�த�த�வதன� மூலம� உங�கள� கணனியின� பாத�காப�ப� கேள�விக�ற�பட�த�தப�படலாம�.<hr />",
@@ -1901,10 +1944,10 @@ $1',
 'show-big-image'       => 'ம�ழ� அளவிலான படிமம�',
 'show-big-image-thumb' => '<small>இந�த ம�ன�தோற�றத�தின� பரிமாணம�: $1 × $2 பிக�சல�கள�</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'ப�திய படிமங�கள� பக�கம�',
 'imagelisttext'         => 'கீழ� வர�வத� $2 பாக�பட�த�தப�பட�ட $1 {{PLURAL:$1|படிமத�தின�|படிமங�களின�}} பட�டியலாக�ம�.',
-'newimages-summary'     => 'இச�சிறப�ப�ப� பக�கம� கடைசியாக பதிவேற�றப�பட�ட பக�களைப� பட�டியலிட�கிறத�',
+'newimages-summary'     => 'இச�சிறப�ப�ப� பக�கம� கடைசியாக பதிவேற�றப�பட�ட பக�கங�களைப� பட�டியலிட�கிறத�.',
 'showhidebots'          => '(தானியங�கிகளை $1)',
 'noimages'              => 'பார�வைக�க� ஓன�ற�மில�லை.',
 'ilsubmit'              => 'தேட�க',
@@ -1982,6 +2025,7 @@ $1',
 'exif-lightsource'                 => 'ஒளி மூலம�',
 'exif-flash'                       => 'திடீர� ஒளி',
 'exif-focallength'                 => 'வில�லை க�வியத�தூரம�',
+'exif-subjectarea'                 => 'பொர�ள� பக�தி',
 'exif-flashenergy'                 => 'திடீர� ஒளி வல�',
 'exif-focalplanexresolution'       => 'X க�வியத� தளத�தில� ந�ண�க�கம�',
 'exif-focalplaneyresolution'       => 'Y க�வியத� தளத�தில� ந�ண�க�கம�',
@@ -2130,7 +2174,7 @@ $1',
 
 # External editor support
 'edit-externally'      => 'இக�கோப�பை வெளி மென�பொர�ள� கொண�ட� தொக�க�க',
-'edit-externally-help' => 'மேலதிக தகவல�கள�க�க� [http://www.mediawiki.org/wiki/Manual:External_editors அறிவ�ற�த�தல�கள�] பக�கத�தைப� பார�க�கவ�ம�.',
+'edit-externally-help' => 'மேல�ம� தகவல�கள�க�க� [http://www.mediawiki.org/wiki/Manual:External_editors அமைப�ப� அறிவ�ற�த�தல�கள�] பக�கத�தைப� பார�க�கவ�ம�.',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'அனைத�த�',
@@ -2148,7 +2192,7 @@ $1',
 'confirmemail_sent'        => 'உற�திப�பட�த�தல� மின�னஞ�சல� அன�ப�பப� பட�டத�.',
 'confirmemail_oncreate'    => 'உற�திப�பட�த�தல� க�றியொன�ற� உங�கள� மின�னஞ�சல� ம�கவரிக�க� அன�ப�பட�ட�ள�ளத�.
 இக�க�றி ப�க�பதிகைச� செய�ய தேவையில�லை, எனின�ம� மின�னஞ�சல� ம�கவரிய�டன� தொடர�ப�டைய அம�சங�களைப� செயல�பட�நிலைக�க� கொண�ட�வர ம�தலில� இக�க�றியை கொட�க�க வேண�ட�ம�.',
-'confirmemail_sendfailed'  => 'உற�திப�பட�த�தல� மின�னஞ�சலை அன�ப�ப ம�டியவில�லை. மின�னஞ�சல� ம�கவரியில� செல�ல�படியற�ற எழ�த�த�க�கள� உள�ளனவா என�பதை சரி பார�க�கவ�ம�.
+'confirmemail_sendfailed'  => 'உற�திப�பட�த�தல� மின�னஞ�சலை {{SITENAME}} தளத�தால� அன�ப�ப ம�டியவில�லை. மின�னஞ�சல� ம�கவரியில� செல�ல�படியற�ற எழ�த�த�க�கள� உள�ளனவா என�பதை சரி பார�க�கவ�ம�.
 
 மின�னஞ�சல� நிற�வனத�தின� பதில�: $1',
 'confirmemail_invalid'     => 'செல�ல�படியற�ற உற�திப�பட�த�தல� க�றி. க�றி காலாவதியாகியிர�க�கலாம�.',
@@ -2174,39 +2218,29 @@ $5
 
 # Scary transclusion
 'scarytranscludedisabled' => '[விக�கியிடை இணைப�ப�கள� ம�டக�கப�பட�ட�ள�ளத�]',
-'scarytranscludefailed'   => '[$1 பக�கத�த�க�கான வாப�ப�ர�பெற� ம�யற�சித� தோல�வி; மன�னிக�கவ�ம�]',
-'scarytranscludetoolong'  => '[மன�னிக�கவ�ம�; இணைய ம�கவரி மிக நீளமானத�]',
+'scarytranscludefailed'   => '[$1 பக�கத�த�க�கான வாப�ப�ர�பெற� ம�யற�சித� தோல�வியடைந�தத�]',
+'scarytranscludetoolong'  => '[இணைய ம�கவரி மிகவ�ம� நீளமானத�]',
 
 # Trackbacks
 'trackbackremove' => ' ([$1 நீக�க�])',
 
 # Delete conflict
-'deletedwhileediting' => 'எச�சரிக�கை: நீங�கள� இப�பக�கத�தை தொக�க�க தொடங�கியப� பின� அத� நீக�கப�பட�ட�ள�ளத�!',
+'deletedwhileediting' => "'''எச�சரிக�கை''': நீங�கள� இப�பக�கத�தை தொக�க�க தொடங�கியப� பின� அத� நீக�கப�பட�ட�ள�ளத�!",
 'confirmrecreate'     => "நீங�கள� தொக�க�க தொடங�கியப� பின�ன பயனர� [[User:$1|$1]] ([[User talk:$1|பேச�ச�]]) இப�பக�கத�தை நீக�கிய�ள�ளார� தரப�பட�டக� காரணம�:
 : ''$2''
 இப�பக�கத�தை மீள� உர�வாக�க வேண�ட�மா என�பதை உற�திப�பட�த�தவ�ம�.",
 'recreate'            => 'மீள உர�வாக�க�',
 
-# HTML dump
-'redirectingto' => '[[:$1]] பக�கத�த�க�க� வழிமாற�றப�பட�கிறத�...',
-
 # action=purge
-'confirm_purge'        => 'இப�பக�கத�தின� இடைமாற�றை நீக�கவா?
-
-$1',
 'confirm_purge_button' => 'ஆம�',
-
-# AJAX search
-'searchcontaining' => "''$1''� உள�ளடக�கத�தில� கொண�ட பக�கங�களைத� தேடல�.",
-'searchnamed'      => "''$1''�த� தலைப�பாக கொண�ட பக�கங�களைத� தேடல�.",
-'articletitles'    => "''$1'' என�ற எழ�த�தில� தொடங�க�ம� கட�ட�ரைகள�",
-'hideresults'      => 'ம�டிவ�களை மறை',
-'useajaxsearch'    => 'AJAX தேடலைப� பயன�பட�த�த�',
+'confirm-purge-top'    => 'இப�பக�கத�தின� இடைமாற�றை நீக�கவா?',
+'confirm-purge-bottom' => 'ஒர� பக�கத�தை நீக�க�தல�, அதன� இடைமாற�றை நீக�கி மிக அண�மையப� பதிப�பை தோன�ற செய�ய�ம�.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� ம�ந�தைய பக�கம�',
 'imgmultipagenext' => 'அட�த�தப� பக�கம� →',
 'imgmultigo'       => 'செல�!',
+'imgmultigoto'     => 'பக�கம� $1இற�க� செல�க',
 
 # Table pager
 'ascending_abbrev'         => '�ற�',
@@ -2232,8 +2266,8 @@ $1',
 'livepreview-error'   => 'இணைக�க ம�டியவில�லை: $1 "$2". பொத�வான ம�ன�தோற�றத�தை ம�யல�க.',
 
 # Friendlier slave lag warnings
-'lag-warn-normal' => '$1 செக�கன�களைவிட ப�திய மாற�றங�கள� பட�டியலில� காட�டப�படாமல� போகலாம�.',
-'lag-warn-high'   => 'உயர� தரவ�த�தள இடைமாற�ற� காரணமாக $1 செக�கனில�ம� ப�திய மாற�றங�கள� காட�டப�படாமல� இர�க�கலாம�.',
+'lag-warn-normal' => '$1 {{PLURAL:$1|விநாடிக�க�ள�|விநாடிகள�க�க�ள�}} �ற�பட�ட ப�திய மாற�றங�கள� இந�த பட�டியலில� காட�டப�படாமல� இர�க�கலாம�.',
+'lag-warn-high'   => 'அதிகமான தரவ�த�தள இடைமாற�ற� காரணமாக $1 {{PLURAL:$1|விநாடிக�க�ள�|விநாடிகள�க�க�ள�}} �ற�பட�ட ப�திய மாற�றங�கள� இந�த பட�டியலில� காட�டப�படாமல� இர�க�கலாம�.',
 
 # Watchlist editor
 'watchlistedit-numitems'       => 'பேச�ச�ப� பக�கங�களைக� கணக�கிடாமல�, உங�கள� கவனிப�ப�ப� பட�டியலில� {{PLURAL:$1|ஒர� பக�கம� உள�ளத�|$1 பக�கங�கள� உள�ளன}}.',
@@ -2292,7 +2326,7 @@ $1',
 'filepath-summary' => 'இச�சிறப�ப�ப� பக�கம� கோப�ப� ஒன�ற�க�கான ம�ழ�மையான ம�கவரியை பெற�ற�க� கொட�க�க�ம�.
 படிமங�கள� அவற�றின� ம�ழ� அளவில� காட�டபட�வதோட� �னைய கோப�ப�கள� அவற�ற�க�கான மென�பொர�ளில� நேரடியாகத� திறக�கப�பட�ம�.
 
-"{{ns:image}}:" போன�ற ம�ன�னொட�ட� எத�வ�மில�லாமல� கோப�பின� பெயரை இட�க.',
+"{{ns:file}}:" போன�ற ம�ன�னொட�ட� எத�வ�மில�லாமல� கோப�பின� பெயரை இட�க.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'நகல� கோப�ப�களைத� தேட�க',
@@ -2305,6 +2339,9 @@ $1',
 
 # Special:SpecialPages
 'specialpages'                   => 'சிறப�ப�ப� பக�கங�கள�',
+'specialpages-note'              => '----
+* சாதாரண சிறப�ப�ப� பக�கங�கள�.
+* <span class="mw-specialpagerestricted">கட�ட�ப�பட�த�தப�பட�ட சிறப�ப�ப� பக�கங�கள�.</span>',
 'specialpages-group-maintenance' => 'பராமரிப�ப� அறிக�கைகள�',
 'specialpages-group-other'       => '�னைய சிறப�ப� பக�கங�கள�',
 'specialpages-group-login'       => 'ப�க�பதிகை / கணக�க� தொடக�கம�',
@@ -2312,5 +2349,14 @@ $1',
 'specialpages-group-media'       => 'ஊடக அறிக�கைகள�ம� பதிவேற�றங�கள�ம�',
 'specialpages-group-users'       => 'பயனர�கள�ம� உரிமைகள�ம�',
 'specialpages-group-highuse'     => 'உயர� பயன�பாட�ட� பக�கங�கள�',
+'specialpages-group-pages'       => 'பக�கங�களின� பட�டியல�',
+'specialpages-group-pagetools'   => 'பக�கக� கர�விகள�',
+'specialpages-group-wiki'        => 'விக�கி தரவ� மற�ற�ம� கர�விகள�',
+'specialpages-group-redirects'   => 'சிறப�ப� பக�கங�கள� வழிமாற�றம� செய�யப�பட�கின�றத�',
+'specialpages-group-spam'        => 'எரித கர�விகள�',
+
+# Special:BlankPage
+'blankpage'              => 'வெற�ற� பக�கம�',
+'intentionallyblankpage' => 'இந�த பக�கம� திட�டமிட�டே வெற�றாக விடப�பட�ட�ள�ளத�',
 
 );
diff --git a/languages/messages/MessagesTcy.php b/languages/messages/MessagesTcy.php
index 4a387000..57cdff20 100644
--- a/languages/messages/MessagesTcy.php
+++ b/languages/messages/MessagesTcy.php
@@ -47,6 +47,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'ವೀಕ�ಷಣಾಪಟ�ಟಿಡ� ಎನ�ನ ಸಂಪಾದನೆಲೆನ� ತೊಜ�’ಪಾವೊಚಿ',
 'tog-watchlisthidebots'       => 'ವೀಕ�ಷಣಾಪಟ�ಟಿಡ� ಬಾಟ� ಸಂಪಾದನೆಲೆನ� ದೆಂಗಾಲೆ',
 'tog-watchlisthideminor'      => 'ಎಲ�ಯ ಬದಲಾವಣೆಲೆನ� ವೀಕ�ಷಣಾಪಟ�ಟಿರ�ದ� ದೆಂಗಾಲೆ',
+'tog-watchlisthideliu'        => 'ಲಾಗಿನ� ಆತಿನಂಚಿನ ಸದಸ�ಯೆರ�’ನ ಸಂಪಾದನೆಲೆನ� ವೀಕ�ಷಣಾಪಟ�ಟಿರ�ದ� ದೆಂಗಾಲೆ',
+'tog-watchlisthideanons'      => 'ಪ�ದರಿಜ�ಜಂದಿನ ಬಳಕೆದಾರನ ಸಂಪಾದನೆಲೆನ� ವೀಕ�ಷಣಾಪಟ�ಟಿರ�ದ� ದೆಂಗಾಲೆ',
 'tog-ccmeonemails'            => 'ಯಾನ� ಬೇತೆ ಸದಸ�ಯೆರೆಗ� ಕಡಪ�ಡ�ಪ�ನಂಚಿನ ಇ-ಮೇಲ�’ಲೆದ ಪ�ರತಿಲೆನ�(copy) ಎಂಕ� ಕಡಪ�ಡ�ಲೆ',
 'tog-diffonly'                => 'ವ�ಯತ�ಯಾಸದ ತಿರ�ತ�ಪ�ಪ�ನಂಚಿನ ಪ�ಟೊತ ವಿವರೊಲೆನ� ತೊಜ�’ಪಾವೊಚಿ',
 'tog-showhiddencats'          => 'ದೆಂಗಾದಿನ ವರ�ಗೊಲೆನ� ತೊಜ�ಪಾಲೆ',
@@ -148,6 +150,7 @@ $messages = array(
 'mytalk'         => 'ಎನ�ನ ಚರ�ಚೆ',
 'anontalk'       => 'ಈ �.ಪಿ ಗ� ಪಾತೆರ�’ಲೆ',
 'navigation'     => 'ಸಂಚಾರ',
+'and'            => '&#32;ಬೊಕ�ಕ',
 
 # Metadata in edit box
 'metadata_help' => 'ಮೂಲಮಾಹಿತಿ:',
@@ -175,7 +178,7 @@ $messages = array(
 'deletethispage'    => 'ಈ ಪ�ಟೊನ� ದೆತ�ತ� ಪಾಡ�ಲೆ',
 'undelete_short'    => 'ಪಿರ ಪಾಡ�ಲೆ {{PLURAL:$1|ಒ೦ಜಿ ಬದಲಾವಣೆ|$1 ಬದಲಾವಣೆಲ�}}',
 'protect'           => 'ಸ೦ರಕ�ಷಿಸಾಲೆ',
-'protect_change'    => 'ಸ೦ರಕ�ಷಿಣೆನ� ಬದಲಾಯಿಸಾಲೆ',
+'protect_change'    => 'ಬದಲಾಲೆ',
 'protectthispage'   => 'ಈ ಪ�ಟೊನ� ಸ೦ರಕ�ಷಿಸಾಲೆ',
 'unprotect'         => 'ಸ೦ರಕ�ಷಣೆ ದೆಪ�ಲೆ',
 'unprotectthispage' => 'ಈ ಪ�ಟೊತ ಸ೦ರಕ�ಷಣೆನ� ದೆಪ�ಲೆ',
@@ -210,8 +213,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} ದ ಬಗ�ಗೆ',
 'aboutpage'            => 'Project:ನಮ�ಮ ಬಗ�ಗೆ',
-'bugreports'           => 'ದೋಷ ವರದಿಲ�',
-'bugreportspage'       => 'Project:ದೋಷ ವರದಿಲ�',
 'copyright'            => 'ಉಂದ� ಈ ಕಾಪಿರೈಟ�‌ಡ� ಲಭ�ಯವ�ಂಡ� $1.',
 'copyrightpagename'    => '{{SITENAME}} ಕಾಪಿರೈಟ�',
 'copyrightpage'        => '{{ns:project}}:ಕೃತಿಸ�ವಾಮ�ಯತೆಲ�',
@@ -234,6 +235,7 @@ $messages = array(
 
 'badaccess'        => 'ಅನ�ಮತಿ ದೋಷ',
 'badaccess-group0' => 'ಈರ� ಕೇನಿನ ಬೇಲೆನ� ಮಲ�ಪೆರೆ ಇರೆಗ� ಅನ�ಮತಿ ಇಜ�ಜಿ.',
+'badaccess-groups' => 'ಈರ� ಕೇನಿನಂಚಿನ ಕ�ರಿಯೆ ಖಾಲಿ $1 ಗ�ಂಪ�ಲೆಡ� ಒಂಜೆಕ� ಸೇರ�ದ�ಪ�ಪ�ನ ಬಳಕೆದಾರೆರೆಗ� ಮಾತ�ರ.',
 
 'versionrequired'     => 'ಮೀಡಿಯವಿಕಿಯದ $1 ನೇ ಅವೃತ�ತಿ ಬೋಡ�',
 'versionrequiredtext' => 'ಈ ಪ�ಟೊನ� ತೂಯೆರೆ ಮೀಡಿಯವಿಕಿಯದ $1 ನೇ ಆವೃತ�ತಿ ಬೋಡ�. 
@@ -249,6 +251,8 @@ $messages = array(
 'editsection-brackets'    => '[$1]',
 'editold'                 => 'ಸಂಪಾದನೆ ಮಲ�ಪ�ಲೆ',
 'viewsourceold'           => 'ಮೂಲೊನ� ತೂಲೆ',
+'editlink'                => 'ಎಡಿಟ� ಮಲ�ಪ�ಲೆ',
+'viewsourcelink'          => 'ಮೂಲೊನ� ತೂಲೆ',
 'editsectionhint'         => '$1 ವಿಭಾಗದ ಸಂಪಾದನೆ ಮಲ�ಪ�ಲೆ',
 'toc'                     => 'ಪರಿವಿಡಿ',
 'showtoc'                 => 'ತೊಜ�ಪಾವ�',
@@ -271,7 +275,7 @@ $messages = array(
 'nstab-main'      => 'ಪ�ಟ',
 'nstab-user'      => 'ಸದಸ�ಯೆರ�ನ ಪ�ಟ',
 'nstab-media'     => 'ಮೀಡಿಯ ಪ�ಟ',
-'nstab-special'   => 'ವಿಶೇಷ',
+'nstab-special'   => 'ವಿಶೇಷ ಪ�ಟ',
 'nstab-project'   => 'ಪ�ರೊಜೆಕ�ಟ� ಪ�ಟ',
 'nstab-image'     => 'ಫೈಲ�',
 'nstab-mediawiki' => 'ಸಂದೇಶ',
@@ -294,6 +298,13 @@ $messages = array(
 $1',
 'nodb'                 => 'ಡಾಟಾಬೇಸ� $1 ನ� ಆಯ�ಕೆ ಮಲ�ತೊನೆರೆ ಆಯಿಜಿ',
 'readonly'             => 'ಡಾಟಾಬೇಸ� ಲಾಕ� ಆತ�೦ಡ�',
+'missing-article'      => '"$1" $2 ಪ�ದರ�’ದ ಪ�ಟ ದೇಟಬೇಸ�’ಡ� ಇಜ�ಜಿ.
+
+ಡಿಲೀಟ� ಮಲ�ತಿನ ಪ�ಟೊಕ� ಸಂಪರ�ಕ ಕೊರ�ಪ�ನ ಇತಿಹಾಸ ಲಿಂಕ� ಅತ�ತ�’ನ�ಡ ವ�ಯತ�ಯಾಸ ಲಿಂಕ�’ನ� ಒತ�ತ�ನೆರ�ದಾದ� ಈ ದೋಷ ಸಾಧಾರಣವಾದ� ಬರ�ಪ�ಂಡ�.
+
+ಒಂಜಿ ವೇಳೆ ಅಂಚ ಆದಿಜ�ಜಿಂಡ, ಉಂದ� ಒಂಜಿ ಸಾಫ�ಟ�-ವೇರ� ದೋಷ ಆದ�ಪ�ಪ�.
+ಇಂದೆನ�  [[Special:ListUsers/sysop|ವಿಕಿ-ಅಧಿಕಾರಿಗ�]] ತೆರಿಪಾಲೆ.',
+'missingarticle-rev'   => '(ಮರ�-ಆವೃತ�ತಿ#: $1)',
 'internalerror'        => 'ಆ೦ತರಿಕ ದೋಷ',
 'internalerror_info'   => 'ಆಂತರಿಕ ದೋಷ: $1',
 'filecopyerror'        => 'ಫೈಲ� "$1" ನ� "$2" ಗ� ನಕಲ� ಮಲ�ಪೆರೆ ಆಯಿಜಿ',
@@ -308,10 +319,15 @@ $1',
 'viewsourcefor'        => '$1 ಪ�ಟೊಗ�',
 
 # Login and logout pages
+'yourname'                => 'ಸದಸ�ಯೆರ�ನ ಪ�ದರ�:',
+'yourpassword'            => 'ಪಾಸ�-ವರ�ಡ�:',
+'remembermypassword'      => 'ಈ ಕಂಪ�ಯೂಟರ�’ಡ� ಎನ�ನ ಪ�ರವೇಶ ಪದೊನ� ನೆನಪ� ದೀಲ',
+'login'                   => 'ಲಾಗ� ಇನ�',
 'nav-login-createaccount' => 'ಲಾಗ�-ಇನ� / ಅಕೌಂಟ� ಸೃಷ�ಟಿ ಮಲ�ಪ�ಲೆ',
 'userlogin'               => 'ಲಾಗ�-ಇನ� / ಅಕೌಂಟ� ಸೃಷ�ಟಿ ಮಲ�ಪ�ಲೆ',
 'logout'                  => 'ಲಾಗ� ಔಟ�',
 'userlogout'              => 'ಲಾಗ� ಔಟ�',
+'mailmypassword'          => 'ಪೊಸ ಪಾಸ�-ವರ�ಡ�’ನ� ಇ-ಮೇಲ� ಮಲ�ಪ�ಲೆ',
 
 # Edit page toolbar
 'bold_sample'     => 'ದಪ�ಪ ಅಕ�ಷರ',
@@ -334,43 +350,64 @@ $1',
 'hr_tip'          => 'ಅಡ�ಡ ಗೆರೆ(ಆಯಿನಾತ� ಕಮ�ಮಿ ಉಪಯೋಗಿಸಾಲೆ)',
 
 # Edit pages
-'minoredit'              => 'ಉಂದ� ಎಲ�ಯ ಬದಲಾವಣೆ',
-'watchthis'              => 'ಈ ಪ�ಟೊನ� ತೂಲೆ',
-'savearticle'            => 'ಪ�ಟೊನ� ಒರಿಪಾಲೆ',
-'preview'                => 'ಮ�ನ�ನೋಟ',
-'showpreview'            => 'ಮ�ನ�ನೋಟ ತೊಜ�ಪಾವ�',
-'showlivepreview'        => 'ಪ�ರತ�ಯಕ�ಷ ಮ�ನ�ನೋಟ',
-'showdiff'               => 'ಬದಲಾವಣೆಲೆನ� ತೊಜ�ಪಾವ�',
-'anoneditwarning'        => "'''ಜಾಗ�ರತೆ:''' ಈರ� ಇತ�ತೆ ಲಾಗ� ಇನ� ಆತಿಜರ�.
+'summary'                          => 'ಸಾರಾಂಶ:',
+'subject'                          => 'ವಿಷಯ/ಮ�ಖ�ಯಾ೦ಶ:',
+'minoredit'                        => 'ಉಂದ� ಎಲ�ಯ ಬದಲಾವಣೆ',
+'watchthis'                        => 'ಈ ಪ�ಟೊನ� ತೂಲೆ',
+'savearticle'                      => 'ಪ�ಟೊನ� ಒರಿಪಾಲೆ',
+'preview'                          => 'ಮ�ನ�ನೋಟ',
+'showpreview'                      => 'ಮ�ನ�ನೋಟ ತೊಜ�ಪಾವ�',
+'showlivepreview'                  => 'ಪ�ರತ�ಯಕ�ಷ ಮ�ನ�ನೋಟ',
+'showdiff'                         => 'ಬದಲಾವಣೆಲೆನ� ತೊಜ�ಪಾವ�',
+'anoneditwarning'                  => "'''ಜಾಗ�ರತೆ:''' ಈರ� ಇತ�ತೆ ಲಾಗ� ಇನ� ಆತಿಜರ�.
 ಈರ�ನ �.ಪಿ ಎಡ�ರೆಸ� ಈ ಪ�ಟೊತ ಬದಲಾವಣೆ ಇತಿಹಾಸೊಡ� ದಾಖಲಾಪ�೦ಡ�.",
-'missingsummary'         => "'''ಗಮನಿಸಾಲೆ:''' ಈರ� ಬದಲಾವಣೆದ ಸಾರಾ೦ಶನ� ಕೊರ�ತಿಜರ�.
+'missingsummary'                   => "'''ಗಮನಿಸಾಲೆ:''' ಈರ� ಬದಲಾವಣೆದ ಸಾರಾ೦ಶನ� ಕೊರ�ತಿಜರ�.
 ಈರ� ಪಿರ 'ಒರಿಪಾಲೆ' ಬಟನ� ನ� ಒತ�ತ�೦ಡ ಸಾರಾ೦ಶ ಇಜ�ಜ೦ದೆನೇ ಈರ�ನ ಬದಲಾವಣೆ ದಾಖಲಾಪ�೦ಡ�.",
-'missingcommenttext'     => 'ದಯ ಮಲ�ತ� ದ ಈರ�ನ ಅಭಿಪ�ರಾಯನ� ತಿರ�ತ� ಕೊರ�ಲೆ',
-'missingcommentheader'   => "'''ಗಮನಿಸಾಲೆ:''' ಈರ� ಈ ಅಭಿಪ�ರಾಯಗ� \"ವಿಷಯ/ಮ�ಖ�ಯಾ೦ಶ\" ದಾಲ ಕೊರ�ತಿಜರ�. ಈರ� ಪಿರ ’ಒರಿಪಾಲೆ’ ಬಟನ� ನ� ಒತ�ತ�೦ಡ ಈರ�ನ ಬದಲಾವಣೆ ವಿಷಯ/ಮ�ಖ�ಯಾ೦ಶ ಇಜ�ಜ೦ದನೇ ಒರಿಪ�ಪಾವ�೦ಡ�.",
-'blockedtitle'           => 'ಈ ಸದಸ�ಯೆರೆನ� ತಡೆ ಮಲ�ತ� ದ�೦ಡ�.',
-'newarticletext'         => "ನನಲ ಅಸ�ಥಿತ�ವಡ� ಉಪ�ಪಂದಿನ ಪ�ಟೊಗ� ಈರ� ಬೈದರ�.
+'missingcommenttext'               => 'ದಯ ಮಲ�ತ� ದ ಈರ�ನ ಅಭಿಪ�ರಾಯನ� ತಿರ�ತ� ಕೊರ�ಲೆ',
+'missingcommentheader'             => "'''ಗಮನಿಸಾಲೆ:''' ಈರ� ಈ ಅಭಿಪ�ರಾಯಗ� \"ವಿಷಯ/ಮ�ಖ�ಯಾ೦ಶ\" ದಾಲ ಕೊರ�ತಿಜರ�. ಈರ� ಪಿರ ’ಒರಿಪಾಲೆ’ ಬಟನ� ನ� ಒತ�ತ�೦ಡ ಈರ�ನ ಬದಲಾವಣೆ ವಿಷಯ/ಮ�ಖ�ಯಾ೦ಶ ಇಜ�ಜ೦ದನೇ ಒರಿಪ�ಪಾವ�೦ಡ�.",
+'summary-preview'                  => 'ಸಾರಾ೦ಶ ಮ�ನ�ನೋಟ:',
+'subject-preview'                  => 'ವಿಷಯ/ಮ�ಖ�ಯಾ೦ಶದ ಮ�ನ�ನೋಟ:',
+'blockedtitle'                     => 'ಈ ಸದಸ�ಯೆರೆನ� ತಡೆ ಮಲ�ತ� ದ�೦ಡ�.',
+'newarticle'                       => '(ಪೊಸತ�)',
+'newarticletext'                   => "ನನಲ ಅಸ�ಥಿತ�ವಡ� ಉಪ�ಪಂದಿನ ಪ�ಟೊಗ� ಈರ� ಬೈದರ�.
 ಈ ಪ�ಟೊನ� ಸೃಷ�ಟಿ ಮಲ�ಪೆರೆ ತಿರ�ತ�’ದ ಚೌಕೊಡ� ಬರೆಯೆರೆ ಸ�ರ� ಮಲ�ಪ�ಲೆ.
 (ಜಾಸ�ತಿ ಮಾಹಿತಿಗ� [[{{MediaWiki:Helppage}}|ಸಹಾಯ ಪ�ಟೊನ�]] ತೂಲೆ).
 ಈ ಪ�ಟೊಕ� ಈರ� ತಪ�ಪಾದ� ಬತ�ತಿತ�ತ�’ನ�ಡ ಇರೆನ ಬ�ರೌಸರ�’ದ '''back''' ಬಟನ�’ನ� ಒತ�ತ�’ಲೆ.",
-'noarticletext'          => 'ಈ ಪ�ಟೊಟ� ಸದ�ಯಗ� ಓ ಬರಹಲಾ ಇಜ�ಜಿ, ಈರ� ಬೇತೆ ಪೂಟೊಲೆಡ� [[Special:Search/{{PAGENAME}}|ಈ ಲೇಖನೊನ� ನಾಡೊಲಿ]] ಅತ�ತ�’ನ�ಡ [{{fullurl:{{FULLPAGENAME}}|action=edit}} ಈ ಪ�ಟೊನ� ಸಂಪಾದನೆ ಮಲ�ಪೊಲಿ].',
-'editing'                => '$1 ಲೇಖನೊನ� ಈರ� ಸಂಪಾದನೆ ಮಲ�ತೊಂದ�ಲ�ಲರ�',
-'editingsection'         => '$1 (ವಿಭಾಗೊನ�) ಸಂಪಾದನೆ ಮಲ�ತೊಂದ�ಲ�ಲರ�',
-'copyrightwarning'       => 'ದಯಮಲ�ತ�’ದ� ಗಮನಿಸ�’ಲೆ: {{SITENAME}} ಸೈಟ�’ಡ� ಇರೆನ ಪೂರಾ ಕಾಣಿಕೆಲ�ಲಾ $2 ಅಡಿಟ� ಬಿಡ�ಗಡೆ ಆಪ�ಂಡ� (ಮಾಹಿತಿಗ� $1 ನ� ತೂಲೆ). ಇರೆನ ಸಂಪಾದನೆಲೆನ� ಬೇತೆಕ�ಲ� ನಿರ�ಧಾಕ�ಷಿಣ�ಯವಾದ� ಬದಲ� ಮಲ�ತ�’ದ� ಬೇತೆ ಕಡೆಲೆಡ� ಪಟ�ಟೆರ�. ಇಂದೆಕ� ಇರೆನ ಒಪ�ಪಿಗೆ ಇತ�ತ�’ನ�ಡ ಮಾತ�ರ ಮ�ಲ�ಪ ಸಂಪಾದನೆ ಮಲ�ಪ�ಲೆ.<br />
+'noarticletext'                    => 'ಈ ಪ�ಟೊಟ� ಸದ�ಯಗ� ಓ ಬರಹಲಾ ಇಜ�ಜಿ, ಈರ� ಬೇತೆ ಪೂಟೊಲೆಡ� [[Special:Search/{{PAGENAME}}|ಈ ಲೇಖನೊನ� ನಾಡೊಲಿ]] ಅತ�ತ�’ನ�ಡ [{{fullurl:{{FULLPAGENAME}}|action=edit}} ಈ ಪ�ಟೊನ� ಸಂಪಾದನೆ ಮಲ�ಪೊಲಿ].',
+'previewnote'                      => "'''ಉಂದ� ಕೇವಲ ಮ�ನ�ನೋಟ; ಪ�ಟೊನ� ನನಲ ಒರಿಪಾದಿಜಿ ಪನ�ಪ�ನೇನ� ಮರಪೊರ�ಚಿ!'''",
+'editing'                          => '$1 ಲೇಖನೊನ� ಈರ� ಸಂಪಾದನೆ ಮಲ�ತೊಂದ�ಲ�ಲರ�',
+'editingsection'                   => '$1 (ವಿಭಾಗೊನ�) ಸಂಪಾದನೆ ಮಲ�ತೊಂದ�ಲ�ಲರ�',
+'copyrightwarning'                 => "ದಯಮಲ�ತ�’ದ� ಗಮನಿಸ�’ಲೆ: {{SITENAME}} ಸೈಟ�’ಡ� ಇರೆನ ಪೂರಾ ಕಾಣಿಕೆಲ�ಲಾ $2 ಅಡಿಟ� ಬಿಡ�ಗಡೆ ಆಪ�ಂಡ� (ಮಾಹಿತಿಗ� $1 ನ� ತೂಲೆ). ಇರೆನ ಸಂಪಾದನೆಲೆನ� ಬೇತೆಕ�ಲ� ನಿರ�ಧಾಕ�ಷಿಣ�ಯವಾದ� ಬದಲ� ಮಲ�ತ�’ದ� ಬೇತೆ ಕಡೆಲೆಡ� ಪಟ�ಟೆರ�. ಇಂದೆಕ� ಇರೆನ ಒಪ�ಪಿಗೆ ಇತ�ತ�’ನ�ಡ ಮಾತ�ರ ಮ�ಲ�ಪ ಸಂಪಾದನೆ ಮಲ�ಪ�ಲೆ.<br />
 ಅತ�ತಂದೆ ಇರೆನ ಸಂಪಾದನೆಲೆನ� ಈರ� ಸ�ವತಃ ಬರೆತರ�, ಅತ�ತ�’ನ�ಡ ಕೃತಿಸ�ವಾಮ�ಯತೆ ಇಜ�ಜಂದಿನ ಕಡೆರ�ದ� ದೆತೊನ�ದರ� ಪಂಡ�’ದ� ಪ�ರಮಾಣಿಸೊಂದ�ಲ�ಲರ�.
-<strong>ಕೃತಿಸ�ವಾಮ�ಯತೆದ ಅಡಿಟ�ಪ�ಪ�ನಂಚಿನ ಕೃತಿಲೆನ� ಒಪ�ಪಿಗೆ ಇಜ�ಜಂದೆ ಮ�ಲ�ಪ ಪಾಡೊಚಿ!</strong>',
-'templatesused'          => 'ಈ ಪ�ಟೊಟ� ಉಪಯೋಗ ಮಲ�ತಿನ ಫಲಕೊಲ�:',
-'template-protected'     => '(ಸಂರಕ�ಷಿತ)',
-'template-semiprotected' => '(ಅರೆ-ಸಂರಕ�ಷಿತ)',
+'''ಕೃತಿಸ�ವಾಮ�ಯತೆದ ಅಡಿಟ�ಪ�ಪ�ನಂಚಿನ ಕೃತಿಲೆನ� ಒಪ�ಪಿಗೆ ಇಜ�ಜಂದೆ ಮ�ಲ�ಪ ಪಾಡೊಚಿ!'''",
+'templatesused'                    => 'ಈ ಪ�ಟೊಟ� ಉಪಯೋಗ ಮಲ�ತಿನ ಫಲಕೊಲ�:',
+'templatesusedpreview'             => 'ಈ ಮ�ನ�ನೋಟೊಡ� ಉಪಯೋಗ ಮಲ�ತಿನ ಟೆಂಪ�ಲೇಟ�’ಲ�:',
+'template-protected'               => '(ಸಂರಕ�ಷಿತ)',
+'template-semiprotected'           => '(ಅರೆ-ಸಂರಕ�ಷಿತ)',
+'hiddencategories'                 => 'ಈ ಪ�ಟ {{PLURAL:$1|೧ ಗ�ಪ�ತ ವರ�ಗಗ�|$1 ಗ�ಪ�ತ ವರ�ಗೊಲೆಗ�}} ಸೇರ�ದ�’ನ�ಡ�:',
+'permissionserrorstext-withaction' => '$2 ಗ� ಇರೆಗ� ಅನ�ಮತಿ ಇಜ�ಜಿ, �ಕ� {{PLURAL:$1|ಕಾರಣ|ಕಾರಣೊಲ�}}:',
+'deleted-notice'                   => 'ಈ ಪೇಜ� ಅಸ�ತಿತ�ವಡ� ಇಜ�ಜಿ.
+ಪೂಟೊತ ಡಿಲೀಶನ� ಲಾಗ�’ನ� ತಿರ�ತ� ಕೊರ�ತ�ಂಡ�.',
 
 # History pages
-'viewpagelogs'     => 'ಈ ಪ�ಟೊತ ದಾಖಲೆಲೆನ� ತೂಲೆ',
-'currentrev'       => 'ಇತ�ತೆದ ಆವೃತ�ತಿ',
-'revisionasof'     => '$1 ದಿನೊತ ಆವೃತ�ತಿ',
-'previousrevision' => '�ದ�ಂಬ�ದ ಆವೃತ�ತಿ',
-'cur'              => 'ಸದ�ಯದ',
-'last'             => 'ಕಡೆತ',
-'histfirst'        => 'ಬಾರಿ ದ�ಂಬ�ದ',
-'histlast'         => 'ಇಂಚಿಪ�ಪದ',
+'viewpagelogs'           => 'ಈ ಪ�ಟೊತ ದಾಖಲೆಲೆನ� ತೂಲೆ',
+'currentrev'             => 'ಇತ�ತೆದ ಆವೃತ�ತಿ',
+'currentrev-asof'        => '$1 ದ ಮ�ಟ�ಟ ಇತ�ತೆದ ಆವೃತ�ತಿ',
+'revisionasof'           => '$1 ದಿನೊತ ಆವೃತ�ತಿ',
+'previousrevision'       => '�ದ�ಂಬ�ದ ಆವೃತ�ತಿ',
+'nextrevision'           => 'ಪೊಸ ಮರ�-ಆವೃತ�ತಿ',
+'cur'                    => 'ಸದ�ಯದ',
+'last'                   => 'ಕಡೆತ',
+'history-fieldset-title' => 'ಇತಿಹಾಸಡ� ನಾಡ�ಲೆ',
+'histfirst'              => 'ಬಾರಿ ದ�ಂಬ�ದ',
+'histlast'               => 'ಇಂಚಿಪ�ಪದ',
+
+# Revision deletion
+'rev-delundel'   => 'ತೊಜ�ಪಾವ�/ದೆಂಗಾವ�',
+'revdel-restore' => 'ವಿಸಿಬಿಲಿಟಿನ� ಬದಲ� ಮಲ�ಪ�ಲೆ',
+
+# Merge log
+'revertmerge' => 'ಅನ�-ಮರ�ಜ� ಮಲ�ಪ�ಲೆ',
 
 # Diffs
 'history-title'           => '"$1" ಪ�ಟೊತ ಆವೃತ�ತಿ ಇತಿಹಾಸ',
@@ -380,18 +417,54 @@ $1',
 'editundo'                => 'ದ�ಂಬ�ದಲೆಕ',
 
 # Search results
-'noexactmatch' => "'''\"\$1\". ಅ೦ಚಿನ ವಾ ಪ�ಟಲಾ ಇಜ�ಜಿ. '''
+'searchresults'             => 'ನಾಡಟದ ಫಲಿತಾಂಶೊಲ�',
+'searchresults-title'       => '"$1" ಕ� ನಾಡಟದ ಫಲಿತಾಂಶೊಲ�',
+'searchresulttext'          => '{{SITENAME}} ಡ� ನಾಡಟ ಮಲ�ಪ�ನ ಬಗ�ಗೆ ಜಾಸ�ತಿ ಮಾಹಿತಿಗ� [[{{MediaWiki:Helppage}}|{{int:help}}]] ನ� ತೂಲೆ.',
+'searchsubtitle'            => 'ಈರ� \'\'\'[[:$1]]\'\'\' ನ� ನಾಡಿಯರ� ([[Special:Prefixindex/$1|"$1" ರ�ದ� ಶ�ರ�ವಾಪ�ನ ಪೂರ ಪ�ಟೊಲ�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1" ಗ� ಲಿಂಕ� ಕೊರ�ಪ�ನ ಪೂರ ಪ�ಟೊಲ�]])',
+'searchsubtitleinvalid'     => "'''$1''' ನ� ಈರ� ನಾಡಿಯರ�.",
+'noexactmatch'              => "'''\"\$1\". ಅ೦ಚಿನ ವಾ ಪ�ಟಲಾ ಇಜ�ಜಿ. '''
 ಈರ� [[:\$1| �ನ� ಸ�ರ� ಮಲ�ಪೊಲಿ]].",
-'prevn'        => 'ದ�ಂಬ�ದ $1',
-'nextn'        => 'ಬೊಕ�ಕದ $1',
-'viewprevnext' => 'ತೂಲೆ ($1) ($2) ($3)',
-'powersearch'  => 'ನಾಡ�’ಲೆ',
+'noexactmatch-nocreate'     => "'''\"\$1\" ಪ�ದರ�ದ ವಾ ಪ�ಟೊಲಾ ಇಜ�ಜಿ.'''",
+'notitlematches'            => 'ವಾ ಪ�ಟೊತ ಶಿರ�ಷಿಕೆಲಾ ಹೊಂದಿಕೆ ಆವೊಂದಿಜ�ಜಿ',
+'notextmatches'             => 'ವಾ ಪ�ಟೊತ ಪಠ�ಯೊಡ�ಲಾ ಹೋಲಿಕೆ ಇಜ�ಜಿ',
+'prevn'                     => 'ದ�ಂಬ�ದ $1',
+'nextn'                     => 'ಬೊಕ�ಕದ $1',
+'viewprevnext'              => 'ತೂಲೆ ($1) ($2) ($3)',
+'searchhelp-url'            => 'Help:ಪರಿವಿಡಿ',
+'search-result-size'        => '$1 ({{PLURAL:$2|೧ ಪದ|$2 ಪದೊಲ�}})',
+'search-redirect'           => '(ಪ�ನರ�ನಿರ�ದೇಶನ $1)',
+'search-section'            => '(ವಿಭಾಗ $1)',
+'search-suggest'            => 'ಇಂದೆನ� ನಾಡೊಂದ�ಲ�ಲರೆ: $1',
+'search-interwiki-caption'  => 'ಬಳಗದ ಇತರ ಯೋಜನೆಲ�',
+'search-interwiki-default'  => '$1 ಫಲಿತಾಂಶೊಲ�:',
+'search-interwiki-more'     => '(ಮಸ�ತ�)',
+'search-mwsuggest-enabled'  => 'ಸಲಹೆದೊಟ�ಟಿಗೆ',
+'search-mwsuggest-disabled' => 'ಓವ� ಸಲಹೆಲಾ ಇಜ�ಜಿ',
+'showingresultstotal'       => "ಒಟ�ಟ� '''$3''' ನಾಡಟದ ಫಲಿತಾಂಶೊಲೆಡ� '''$1 - $2''' ತಿರ�ತ� ತೋಜಾದ�’ನ�ಡ�",
+'powersearch'               => 'ನಾಡ�’ಲೆ',
+'powersearch-legend'        => 'ಅಡ�ವಾನ�ಸ�’ಡ� ಸರ�ಚ�',
+'powersearch-ns'            => 'ನೇಮ�-ಸ�ಪೇಸ�’ಲೆಡ� ನಾಡ�ಲೆ',
+'powersearch-field'         => 'ನಾಡ�ಲೆ:',
 
 # Preferences page
+'preferences'   => 'ಪ�ರಾಶಸ�ತ�ಯೊಲ�',
 'mypreferences' => 'ಎನ�ನ ಪ�ರಾಶಸ�ತ�ಯಲ�',
 
+# Groups
+'group-sysop' => 'ನಿರ�ವಾಹಕೆರ�',
+
+'grouppage-sysop' => '{{ns:project}}:ನಿರ�ವಾಹಕೆರ�',
+
+# User rights log
+'rightslog' => 'ಸದಸ�ಯೆರ�ನ ಹಕ�ಕ� ದಾಖಲೆ',
+
+# Associated actions - in the sentence "You do not have permission to X"
+'action-edit' => 'ಈ ಪ�ಟೊನ� ಎಡಿಟ� ಮಲ�ಪ�ಲೆ',
+
 # Recent changes
+'nchanges'                       => '$1 {{PLURAL:$1|ಬದಲಾವಣೆ|ಬದಲಾವಣೆಲ�}}',
 'recentchanges'                  => 'ಇಂಚಿಪದ ಬದಲಾವಣೆಲ�',
+'recentchanges-legend'           => 'ಇಂಚಿಪದ ಬದಲಾವಣೆಲ� ಆಯ�ಕೆಲ�',
 'recentchanges-feed-description' => 'ಈ ಫೀಡ�’ಡ� ವಿಕಿಕ� ಇಂಚಿಪ�ಪ ಆತಿನಂಚಿನ ಬದಲಾವಣೆಲೆನ� ಟ�ರ�ಯಾಕ� ಮಲ�ಪ�ಲೆ.',
 'rcnote'                         => "$4, $5 ಮ�ಟ�ಟ ದ�ಂಬ�ದ {{PLURAL:$2|ದಿನೊಟ�|'''$2''' ದಿನೊಲೆಡ�}} ಮಲ�ತ�’ದಿನ {{PLURAL:$1|'''1''' ಬದಲಾವಣೆ|'''$1''' ಬದಲಾವಣೆಲ�}} ತಿರ�ತ�ಂಡ�.",
 'rclistfrom'                     => '$1 ರ�ದ� ಶ�ರ�ವಾತಿನ ಪೊಸ ಬದಲಾವಣೆಲೆನ� ತೊಜ�ಪಾವ�',
@@ -408,6 +481,8 @@ $1',
 'minoreditletter'                => 'ಚ�',
 'newpageletter'                  => 'ಪೊ',
 'boteditletter'                  => 'ಬಾ',
+'rc-enhanced-expand'             => 'ವಿವರೊಲೆನ� ತೊಜ�ಪಾವ� (ಜಾವ ಸ�ಕ�ರಿಪ�ಟ� ಬೋಡಾಪ�ಂಡ�)',
+'rc-enhanced-hide'               => 'ವಿವರೊಲೆನ� ದೆಂಗಾವ�',
 
 # Recent changes linked
 'recentchangeslinked'          => 'ಸಂಬಂಧ ಉಪ�ಪ�ನಂಚಿನ ಬದಲಾವಣೆಲ�',
@@ -415,30 +490,51 @@ $1',
 'recentchangeslinked-noresult' => 'ಕೊರ�ತಿನ ಸಮಯೊಡ� ಲಿಂಕ� ಉಪ�ಪ�ನ ಪ�ಟೊಲೆಡ� ಓವ�ಲಾ ಬದಲಾವಣೆಲ� ಆತಿಜಿ.',
 'recentchangeslinked-summary'  => "ಒಂಜಿ ನಿರ�ದಿಷ�ಟ ಪ�ಟೊರ�ದ� (ಅತ�ತ�’ನ�ಡ ನಿರ�ದಿಷ�ಟ ವರ�ಗೊಗ� ಸೇರ�ದಿನ ಪ�ಟೊಲೆರ�ದ�) ಸಂಪರ�ಕ ಉಪ�ಪ�ನ ಪ�ಟೊಲೆಡ� ಇಂಚಿಪ ಮಲ�ತಿನಂಚಿನ ಬದಲಾವಣೆಲೆನ� ತಿರ�ತ� ಪಟ�ಟಿ ಮಲ�ಪೆರಾತ�’ನ�ಡ�. 
 [[Special:Watchlist|ಇರೆನ ವೀಕ�ಷಣಾಪಟ�ಟಿಡ�]] ಉಪ�ಪ�ನ ಪ�ಟೊಲ� '''ದಪ�ಪ ಅಕ�ಷರೊಡ�''' ಉಂಡ�.",
+'recentchangeslinked-page'     => 'ಪ�ಟೊತ ಪ�ದರ�:',
+'recentchangeslinked-to'       => 'ಇಂದೆತ ಬದಲಿಗ� ಕೊರ�ತಿನ ಪ�ಟೊಗ� ಲಿಂಕ� ಉಪ�ಪ�ನಂಚಿನ ಪ�ಟೊಲೆದ ಬದಲಾವಣೆಲೆನ� ತೊಜ�ಪಾವ�',
 
 # Upload
-'upload' => 'ಫೈಲ� ಅಪ�ಲೋಡ�',
-
-# Image description page
-'filehist'            => 'ಫೈಲ�’ದ ಇತಿಹಾಸ',
-'filehist-help'       => 'ಫೈಲ� ಆ ದಿನೊಟ� ಎಂಚ ಇತ�ತ�’ನ�ಡ�’ನ�ದ� ತೂಯೆರೆ ಆ ದಿನ/ಪೊರ�ತ�ದ ಮಿತ�ತ� ಕ�ಲಿಕ� ಮಲ�ಪ�ಲೆ.',
-'filehist-current'    => 'ಪ�ರಸಕ�ತ',
-'filehist-datetime'   => 'ದಿನ/ಪೊರ�ತ�',
-'filehist-user'       => 'ಸದಸ�ಯೆ',
-'filehist-dimensions' => 'ಆಯಾಮೊಲ�',
-'filehist-filesize'   => 'ಫೈಲ�’ದ ಗಾತ�ರ',
-'filehist-comment'    => 'ಕಮೆಂಟ�',
-'imagelinks'          => 'ಲಿಂಕ�’ಲ�',
-'linkstoimage'        => 'ಈ ಫೈಲ�’ಗ� ತಿರ�ತ�’ದ ಈ {{PLURAL:$1|ಪ�ಟ|$1 ಪ�ಟೊಲ�}} ಲಿಂಕ� ಕೊರ�ಪ�ಂಡ�.',
-'sharedupload'        => 'ಈ ಫೈಲ�’ನ� ಮಸ�ತ� ಜನ ಪಟ�ಟ�’ದ�ಲ�ಲೆರ� ಅಂಚೆನೆ ಉಂದ� ಮಸ�ತ� ಪ�ರೊಜೆಕ�ಟ�’ಲೆಡ� ಉಪಯೋಗಡ�ಪ�ಪ�.',
+'upload'        => 'ಫೈಲ� ಅಪ�ಲೋಡ�',
+'uploadlogpage' => 'ಅಪ�ಲೋಡ� ದಾಖಲೆ',
+'uploadedimage' => '"[[$1]]" ಅಪ�ಲೋಡ� ಆಂಡ�',
+
+# File description page
+'filehist'                  => 'ಫೈಲ�’ದ ಇತಿಹಾಸ',
+'filehist-help'             => 'ಫೈಲ� ಆ ದಿನೊಟ� ಎಂಚ ಇತ�ತ�’ನ�ಡ�’ನ�ದ� ತೂಯೆರೆ ಆ ದಿನ/ಪೊರ�ತ�ದ ಮಿತ�ತ� ಕ�ಲಿಕ� ಮಲ�ಪ�ಲೆ.',
+'filehist-current'          => 'ಪ�ರಸಕ�ತ',
+'filehist-datetime'         => 'ದಿನ/ಪೊರ�ತ�',
+'filehist-thumb'            => 'ಥಂಬ�-ನೈಲ�',
+'filehist-thumbtext'        => '$1 ತ ಲೆಕ�ಕ ಆವೃತ�ತಿದ ತಂಬ�-ನೈಲ�',
+'filehist-user'             => 'ಸದಸ�ಯೆ',
+'filehist-dimensions'       => 'ಆಯಾಮೊಲ�',
+'filehist-filesize'         => 'ಫೈಲ�’ದ ಗಾತ�ರ',
+'filehist-comment'          => 'ಕಮೆಂಟ�',
+'imagelinks'                => 'ಫೈಲ� ಲಿಂಕ�’ಲ�',
+'linkstoimage'              => 'ಈ ಫೈಲ�’ಗ� ತಿರ�ತ�’ದ ಈ {{PLURAL:$1|ಪ�ಟ|$1 ಪ�ಟೊಲ�}} ಲಿಂಕ� ಕೊರ�ಪ�ಂಡ�.',
+'sharedupload'              => 'ಈ ಫೈಲ�’ನ� ಮಸ�ತ� ಜನ ಪಟ�ಟ�’ದ�ಲ�ಲೆರ� ಅಂಚೆನೆ ಉಂದ� ಮಸ�ತ� ಪ�ರೊಜೆಕ�ಟ�’ಲೆಡ� ಉಪಯೋಗಡ�ಪ�ಪ�.',
+'shareduploadwiki-desc'     => '$1 ಡ� ಉಪ�ಪ�ನ ವಿವರೊಲೆನ� ತಿರ�ತ� ತೊಜ�ಪಾದ�’ನ�ಡ�.',
+'shareduploadwiki-linktext' => 'ಫೈಲ�’ದ ಮಾಹಿತಿ ಪ�ಟ',
 
 # Random page
 'randompage' => 'ಯಾದೃಚ�ಛಿಕ ಪ�ಟ',
 
+# Statistics
+'statistics' => 'ಅಂಕಿ ಅಂಶೊಲ�',
+
 # Miscellaneous special pages
-'nbytes'   => '$1 {{PLURAL:$1|ಬೈಟ�|ಬೈಟ��ಲ�}}',
-'nmembers' => '$1 {{PLURAL:$1|ಸದಸ�ಯೆ|ಸದಸ�ಯೆರ�}}',
-'move'     => 'ಮೂವ�(ಸ�ಥಳಾಂತರ) ಮಲ�ಪ�ಲೆ',
+'nbytes'        => '$1 {{PLURAL:$1|ಬೈಟ�|ಬೈಟ��ಲ�}}',
+'nmembers'      => '$1 {{PLURAL:$1|ಸದಸ�ಯೆ|ಸದಸ�ಯೆರ�}}',
+'prefixindex'   => 'ಪೂರ�ವನಾಮೊಲ�ದ ಸೂಚಿಕೆ',
+'newpages'      => 'ಪೊಸ ಪ�ಟೊಲ�',
+'move'          => 'ಮೂವ�(ಸ�ಥಳಾಂತರ) ಮಲ�ಪ�ಲೆ',
+'movethispage'  => 'ಈ ಪ�ಟೊನ� ಮೂವ� ಮಲ�ಪ�ಲೆ',
+'pager-newer-n' => '{{PLURAL:$1|ಪೊಸ ೧|ಪೊಸ $1}}',
+'pager-older-n' => '{{PLURAL:$1|ಪರತ�ತ� ೧|ಪರತ�ತ� $1}}',
+
+# Book sources
+'booksources'               => 'ಪ�ಸ�ತಕೊಲ�ದ ಮೂಲ',
+'booksources-search-legend' => 'ಪ�ಸ�ತಕೊದ ಮೂಲೊನ� ನಾಡ�ಲ',
+'booksources-go'            => 'ಪೋ',
 
 # Special:Log
 'log' => 'ದಾಖಲೆಲ�',
@@ -446,22 +542,50 @@ $1',
 # Special:AllPages
 'allpages'       => 'ಪೂರಾ ಪೂಟೊಲ�',
 'alphaindexline' => '$1 ರ�ದ� $2 ಗ�',
+'allpagesfrom'   => 'ಇಂದೆರ�ದ� ಶ�ರ�ವಾಪ�ನ ಪ�ಟೊಲೆನ� ತೊಜ�ಪಾವ�:',
+'allpagesto'     => 'ಇಂದೆರ�ದ� ಅಂತ�ಯ ಆಪ�ನ ಪ�ಟೊಲೆನ� ತೊಜ�ಪಾವ�:',
+'allarticles'    => 'ಪೂರಾ ಲೇಖನೊಲ�',
 'allpagessubmit' => 'ಪೋ',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'ಸದಸ�ಯ ರಚನೆ ಲಾಗ�',
+'newuserlog-create-entry' => 'ಪೊಸ ಸದಸ�ಯೆರ�ನ ಎಕೌಂಟ�',
+
+# Special:ListGroupRights
+'listgrouprights-members' => '(ಸದಸ�ಯೆರ�ನ ಪಟ�ಟಿ)',
+
+# E-mail user
+'emailuser' => 'ಈ ಸದಸ�ಯೆರೆಗ� ಇ-ಮೈಲ� ಕಡಪ�ಡ�ಲೆ',
+
 # Watchlist
-'watchlist'   => 'ವೀಕ�ಷಣಾ ಪಟ�ಟಿ',
-'mywatchlist' => 'ಎನ�ನ ವೀಕ�ಷಣಾಪಟ�ಟಿ',
-'watch'       => 'ತೂಲೆ',
-'unwatch'     => 'ವೀಕ�ಷಣಾಪಟ�ಟಿರ�ದ� ದೆಪ�ಪ�',
+'watchlist'         => 'ವೀಕ�ಷಣಾ ಪಟ�ಟಿ',
+'mywatchlist'       => 'ಎನ�ನ ವೀಕ�ಷಣಾಪಟ�ಟಿ',
+'watchlistfor'      => "('''$1''' ಇಂದೆತ)",
+'watch'             => 'ತೂಲೆ',
+'watchthispage'     => 'ಈ ಪ�ಟೊನ� ತೂಲೆ',
+'unwatch'           => 'ವೀಕ�ಷಣಾಪಟ�ಟಿರ�ದ� ದೆಪ�ಪ�',
+'watchlist-options' => 'ವೀಕ�ಷಣಾಪಟ�ಟಿ ಆಯ�ಕೆಲ�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ವೀಕ�ಷಣಾಪಟ�ಟಿಗ� ಸೇರ�ಪಾವೊಂದ�ಂಡ�...',
 'unwatching' => 'ವೀಕ�ಷಣಾಪಟ�ಟಿರ�ದ� ದೆತ�ತೊಂದ�ಂಡ�...',
 
-# Delete/protect/revert
+# Delete
+'actioncomplete' => 'ಕಾರ�ಯ ಸಂಪೂರ�ಣ',
 'deletedarticle' => '"$1" ನೆನ�ನ� ದೆತ�ತ� ದಾ೦ಡ�',
 'dellogpage'     => 'ಡಿಲೀಟ� ಮಲ�ತಿನ ಫೈಲ�’ಲೆದ ದಾಖಲೆ',
-'rollbacklink'   => 'ಪಿರ ಪೋಲೆ',
+
+# Rollback
+'rollbacklink' => 'ಪಿರ ಪೋಲೆ',
+
+# Protect
+'protectlogpage'            => 'ಸಂರಕ�ಷಣೆ ದಿನಚರಿ',
+'protectedarticle'          => '"[[$1]]" ಸಂರಕ�ಷಿತವಾದ�ಂಡ�.',
+'modifiedarticleprotection' => '"[[$1]]" ಪ�ಟೊತ ಸಂರಕ�ಷಣೆ ಮಟ�ಟ ಬದಲಾಂಡ�',
+
+# Undelete
+'undeletelink'     => 'ದ�ಂಬ�ದ ಆವೃತ�ತಿಗ� ಪೋಲೆ',
+'undeletedarticle' => '"[[$1]]" ನ� ಪಿರಕನತ�’ನ�ಡ�',
 
 # Namespace form on various pages
 'namespace'      => 'ನೇಮ�-ಸ�ಪೇಸ�:',
@@ -469,26 +593,53 @@ $1',
 'blanknamespace' => '(ಮ�ಖ�ಯ)',
 
 # Contributions
-'contributions' => 'ಸದಸ�ಯೆರ�ನ ಕಾಣಿಕೆಲ�',
-'mycontris'     => 'ಎನ�ನ ಕಾಣಿಕೆಲ�',
-'month'         => 'ಈ ತಿಂಗೊಲ�ರ�ದ� (ಬೊಕ�ಕ ದ�ಂಬ�ದ):',
-'year'          => 'ಈ ವರ�ಷೊರ�ದ� (ಬೊಕ�ಕ ದ�ಂಬ�ದ):',
+'contributions'       => 'ಸದಸ�ಯೆರ�ನ ಕಾಣಿಕೆಲ�',
+'contributions-title' => '$1 ಗ� ಸದಸ�ಯೆರ�ನ ಕಾಣಿಕೆ',
+'mycontris'           => 'ಎನ�ನ ಕಾಣಿಕೆಲ�',
+'contribsub2'         => '$1 ($2) ಗ�',
+'uctop'               => ' (ಮಿತ�ತ�)',
+'month'               => 'ಈ ತಿಂಗೊಲ�ರ�ದ� (ಬೊಕ�ಕ ದ�ಂಬ�ದ):',
+'year'                => 'ಈ ವರ�ಷೊರ�ದ� (ಬೊಕ�ಕ ದ�ಂಬ�ದ):',
+
+'sp-contributions-newbies'  => 'ಪೊಸ ಖಾತೆಲೆದ ಕಾಣಿಕೆಲೆನ� ಮಾತ�ರ ತೊಜ�ಪಾವ�',
+'sp-contributions-blocklog' => 'ತಡೆಪತ�ತ�ನ ದಾಖಲೆ',
+'sp-contributions-search'   => 'ಕಾಣಿಕೆಲೆನ� ನಾಡ�ಲೆ',
+'sp-contributions-username' => '�.ಪಿ ವಿಳಾಸ ಅತ�ತ�’ನ�ಡ ಬಳಕೆದ ಪ�ದರ�:',
+'sp-contributions-submit'   => 'ನಾಡ�',
 
 # What links here
-'whatlinkshere'       => 'ಇಡೆ ವಾ ಪ�ಟೊಲ� ಲಿಂಕ� ಕೊರ�ಪ�ಂಡ�',
-'whatlinkshere-title' => '"$1" ಪ�ಟೊಗ� ಲಿಂಕ� ಕೊರ�ಪ�ನ ಪ�ಟೊಲ�',
-'linkshere'           => "'''[[:$1]]'''ಗ� ಈ ತಿರ�ತ�’ದ ಪ�ಟೊಲ� ಲಿಂಕ� ಕೊರ�ಪ�ಂಡ�.",
-'nolinkshere'         => "'''[[:$1]]''' ಗ� ವಾ ಪ�ಟೊಲ�ಲಾ ಲಿಂಕ� ಕೊರ�ಪ�ಜಿ.",
-'isredirect'          => 'ಪ�ನರ�ನಿರ�ದೇಶನ ಪ�ಟ',
-'istemplate'          => 'ಸೇರ�ಪಡೆ',
-'whatlinkshere-prev'  => '{{PLURAL:$1|ದ�ಂಬ�ದ|ದ�ಂಬ�ದ $1}}',
-'whatlinkshere-next'  => '{{PLURAL:$1|ಬೊಕ�ಕದ|ಬೊಕ�ಕದ $1}}',
-'whatlinkshere-links' => '� ಲಿಂಕ�’ಲ�',
+'whatlinkshere'            => 'ಇಡೆ ವಾ ಪ�ಟೊಲ� ಲಿಂಕ� ಕೊರ�ಪ�ಂಡ�',
+'whatlinkshere-title'      => '"$1" ಪ�ಟೊಗ� ಲಿಂಕ� ಕೊರ�ಪ�ನ ಪ�ಟೊಲ�',
+'whatlinkshere-page'       => 'ಪ�ಟ:',
+'linkshere'                => "'''[[:$1]]'''ಗ� ಈ ತಿರ�ತ�’ದ ಪ�ಟೊಲ� ಲಿಂಕ� ಕೊರ�ಪ�ಂಡ�.",
+'nolinkshere'              => "'''[[:$1]]''' ಗ� ವಾ ಪ�ಟೊಲ�ಲಾ ಲಿಂಕ� ಕೊರ�ಪ�ಜಿ.",
+'isredirect'               => 'ಪ�ನರ�ನಿರ�ದೇಶನ ಪ�ಟ',
+'istemplate'               => 'ಸೇರ�ಪಡೆ',
+'isimage'                  => 'ಚಿತ�ರ ಕೊಂಡಿ',
+'whatlinkshere-prev'       => '{{PLURAL:$1|ದ�ಂಬ�ದ|ದ�ಂಬ�ದ $1}}',
+'whatlinkshere-next'       => '{{PLURAL:$1|ಬೊಕ�ಕದ|ಬೊಕ�ಕದ $1}}',
+'whatlinkshere-links'      => '� ಲಿಂಕ�’ಲ�',
+'whatlinkshere-hideredirs' => '$1 ಪ�ನರ�ನಿರ�ದೇಶನಗಳ�',
+'whatlinkshere-hidetrans'  => '$1 ಟ�ರಾನ�ಸ�’ಕ�ಲೂಶನ�ಸ�',
+'whatlinkshere-hidelinks'  => '$1 ಕೊಂಡಿಲ�',
+'whatlinkshere-filters'    => 'ಅರಿಪೆಲ�',
 
 # Block/unblock
-'ipboptions'   => '2 ಗಂಟೆಲ�:2 hours,1 ದಿನ:1 day,3 ದಿನೊಲ�:3 days,1 ವಾರ:1 week,2 ವಾರೊಲ�:2 weeks,1 ತಿಂಗೊಲ�:1 month,3 ತಿಂಗೊಲ�:3 months,6 ತಿಂಗೊಲ�:6 months,1 ವರ�ಷ:1 year,ಅನಿರ�ಧಿಷ�ಟ:infinite', # display1:time1,display2:time2,...
-'blocklink'    => 'ಅಡ�ಡ ಪತ�ತ�’ಲೆ',
-'contribslink' => 'ಕಾಣಿಕೆಲ�',
+'blockip'                  => 'ಈ ಸದಸ�ಯೆರೆನ� ಬ�ಲಾಕ� ಮಲ�ಪ�ಲೆ',
+'ipboptions'               => '2 ಗಂಟೆಲ�:2 hours,1 ದಿನ:1 day,3 ದಿನೊಲ�:3 days,1 ವಾರ:1 week,2 ವಾರೊಲ�:2 weeks,1 ತಿಂಗೊಲ�:1 month,3 ತಿಂಗೊಲ�:3 months,6 ತಿಂಗೊಲ�:6 months,1 ವರ�ಷ:1 year,ಅನಿರ�ಧಿಷ�ಟ:infinite', # display1:time1,display2:time2,...
+'ipblocklist'              => 'ತಡೆಪತ�ತ�’ದಿನ �.ಪಿ ವಿಳಾಸೊಲ� ಅಂಚೆನೆ ಬಳಕೆದ ಪ�ದರ�’ಲ�',
+'blocklink'                => 'ಅಡ�ಡ ಪತ�ತ�’ಲೆ',
+'unblocklink'              => 'ಅಡ�ಡನ� ದೆಪ�ಪ�ಲೆ',
+'change-blocklink'         => 'ಬ�ಲಾಕ�’ನ� ಬದಲಾಲೆ',
+'contribslink'             => 'ಕಾಣಿಕೆಲ�',
+'blocklogpage'             => 'ತಡೆಪತ�ತ�’ದ�’ನ ಸದಸ�ಯೆರ�ನ ದಿನಚರಿ',
+'blocklogentry'            => '[[$1]] ಖಾತೆನ� $2 $3 ಮ�ಟ�ಟ ತಡೆಪತ�ತ�’ದ�’ನ�ಡ�',
+'unblocklogentry'          => '$1 ಖಾತೆನ� ಅನ�-ಬ�ಲಾಕ� ಮಲ�ತ�’ನ�ಡ�',
+'block-log-flags-nocreate' => 'ಖಾತೆ ಸೃಷ�ಟಿನ� ತಡೆಪತ�ತ�’ದ�’ನ�ಡ�',
+
+# Move page
+'movelogpage' => 'ಸ�ಥಳಾಂತರಿಕೆ ದಾಖಲೆ',
+'revertmove'  => 'ದ�ಂಬ�ದ ಲೆಕೆ ಮಲ�ಪ�ಲೆ',
 
 # Export
 'export' => 'ಪ�ಟಲೆನ� ರಫ�ತ� ಮಲ�ಪ�ಲೆ',
@@ -507,13 +658,18 @@ $1',
 'tooltip-pt-logout'               => 'ಲಾಗ� ಔಟ�',
 'tooltip-ca-talk'                 => 'ಮಾಹಿತಿ ಪ�ಟೊತ ಬಗ�ಗೆ ಚರ�ಚೆ',
 'tooltip-ca-edit'                 => 'ಈ ಪ�ಟೊನ� ಈರ� ಸಂಪಾದನೆ ಮಲ�ಪೊಲಿ. ಸೇವ� ಮಲ�ಪ�ನ ದ�ಂಬ� ಮ�ನ�ನೋಟದ ಉಪಯೊಗ ಮನ�ತೊನ�ಲೆ.',
-'tooltip-ca-addsection'           => 'ಈ ಚರ�ಚೆಗ� ಇರೆನ ಅಭಿಪ�ರಾಯೊನ� ಸೇರ�ಪಾಲೆ.',
+'tooltip-ca-addsection'           => 'ಪೊಸ ಸೆಶನ�ನ� ಶರ� ಮಲ�ಪ�ಲೆ',
 'tooltip-ca-viewsource'           => 'ಉಂದೊಂಜಿ ಸಂರಕ�ಷಿತ ಪ�ಟ.
 ಇಂದೆತ ಮೂಲೊನ� ಈರ� ತೂವೊಲಿ.',
+'tooltip-ca-history'              => 'ಈ ಪ�ಟೊತ ಪರತ�ತ� ಆವೃತ�ತಿಲ�',
+'tooltip-ca-protect'              => 'ಈ ಪ�ಟೊನ� ಸಂರಕ�ಷಣೆ ಮಲ�ಪ�ಲೆ',
+'tooltip-ca-delete'               => 'ಈ ಪ�ಟೊನ� ಡಿಲೀಟ� ಮಲ�ಪ�ಲೆ',
 'tooltip-ca-move'                 => 'ಈ ಪೂಟೊನ� ಮೂವ�(ಸ�ಥಳಾಂತರ) ಮಲ�ಪ�ಲೆ',
 'tooltip-ca-watch'                => 'ಈ ಪ�ಟೊನ� ಇರೆನ ವೀಕ�ಷಣಾಪಟ�ಟಿಗ� ಸೆರ�ಪಾಲೆ',
 'tooltip-ca-unwatch'              => 'ಈ ಪ�ಟೊನ� ಇರೆನ ವೀಕ�ಷಣಾ ಪಟ�ಟಿರ�ದ� ದೆಪ�ಪ�ಲೆ',
 'tooltip-search'                  => '{{SITENAME}}ನ� ನಾಡ�’ಲೆ',
+'tooltip-search-go'               => 'ಉಂದ�ವೇ ಪ�ದರ�ದ ಪ�ಟ ಇತ�ತ�’ನ�ಡ ಅಡೆ ಪೋಲ',
+'tooltip-search-fulltext'         => 'ಈ ಪಠ�ಯ ಉಪ�ಪ�ನಂಚಿನ ಪ�ಟೊಲೆನ� ನಾಡ�’ಲ',
 'tooltip-n-mainpage'              => 'ಮ�ಖ�ಯ ಪ�ಟೊನ� ತೂಲೆ',
 'tooltip-n-portal'                => 'ಪ�ರೊಜೆಕ�ಟ�’ದ ಬಗ�ಗೆ, ಈರ� ದಾದ ಮಲ�ಪೊಲಿ, ಓಲ� ಇಂದೆತ ಬಗ�ಗೆ ತೆರಿಯೊನೊಲಿ',
 'tooltip-n-currentevents'         => 'ಪ�ರಸಕ�ತ ಘಟನೆಲ�ದ ಬಗ�ಗೆ ಹಿನ�ನೆಲೆ ಮಾಹಿತಿ ತೆರಿಯೊನ�ಲೆ',
@@ -521,12 +677,21 @@ $1',
 'tooltip-n-randompage'            => 'ಯಾದೃಚ�ಛಿಕ ಪ�ಟವೊಂಜೇನ� ತೊಜ�ಪಾವ�',
 'tooltip-n-help'                  => 'ತೆರಿತೊನೆರೆ ಜಾಗ',
 'tooltip-t-whatlinkshere'         => 'ಇಡೆ ಲಿಂಕ� ಕೊರ�ಪ�ನಂಚಿನ ಪೂರ ವಿಕಿ ಪ�ಟೊಲ�ದ ಪಟ�ಟಿ',
+'tooltip-t-recentchangeslinked'   => 'ಈ ಪ�ಟೊರ�ದ� ಸಂಪರ�ಕ ಉಪ�ಪ�ನಂಚಿನ ಪ�ಟೊಲೆಡ� ಇಂಚಿಪದ ಬದಲಾವಣೆಲ�',
+'tooltip-feed-rss'                => 'ಈ ಪ�ಟೊಗ� ಆರ�.ಎಸ�.ಎಸ� ಫೀಡ�',
+'tooltip-feed-atom'               => 'ಈ ಪ�ಟೊಗ� Atom ಫೀಡ�',
 'tooltip-t-contributions'         => 'ಈ ಸದಸ�ಯೆರ�ನ ಕಾಣಿಕೆಲ�ದ ಪಟ�ಟಿನ� ತೊಜ�ಪಾವ�',
+'tooltip-t-emailuser'             => 'ಈ ಸದಸ�ಯೆರೆಗ� ಇ-ಮೇಲ� ಕಡಪ�ಡ�ಲೆ',
 'tooltip-t-upload'                => 'ಫೈಲ�’ನ� ಅಪ�ಲೋಡ� ಮಲ�ಪ�ಲೆ',
 'tooltip-t-specialpages'          => 'ಪೂರ ವಿಷೇಶ ಪ�ಟೊಲ�ದ ಪಟ�ಟಿ',
+'tooltip-t-print'                 => 'ಈ ಪ�ಟೊತ ಪ�ರಿಂಟ� ಆವೃತ�ತಿ',
+'tooltip-t-permalink'             => 'ಪ�ಟೊತ ಈ ಆವೃತ�ತಿಗ� ಶಾಶ�ವತ ಲಿಂಕ�',
+'tooltip-ca-nstab-main'           => 'ಮಾಹಿತಿ ಪ�ಟೊನ� ತೂಲೆ',
 'tooltip-ca-nstab-user'           => 'ಸದಸ�ಯೆರ�ನ ಪ�ಟೊನ� ತೂಲೆ',
+'tooltip-ca-nstab-special'        => 'ಉಂದೊಂಜಿ ವಿಶೇಷ ಪ�ಟ, ಇಂದೆನ� ಈರ� ಎಡಿಟ� ಮಲ�ಪೆರೆ ಆಪ�ಜಿ',
 'tooltip-ca-nstab-project'        => 'ಪ�ರೊಜೆಕ�ಟ� ಪ�ಟೊನ� ತೂಲೆ',
 'tooltip-ca-nstab-image'          => 'ಫೈಲ�’ದ ಪ�ಟೊನ� ತೂಲೆ',
+'tooltip-ca-nstab-template'       => 'ಟೆಂಪ�ಲೇಟ�’ನ� ತೂಲೆ',
 'tooltip-ca-nstab-category'       => 'ವರ�ಗೊದ ಪ�ಟೊನ� ತೂಲೆ',
 'tooltip-minoredit'               => 'ಇಂದೆನ� ಎಲ�ಯ ಬದಲಾವಣೆ ಪಂಡ�ದ� ಗ�ರ�ತ ಮಲ�ಪ�ಲೆ',
 'tooltip-save'                    => 'ಈರ� ಮಲ�ತ�’ದಿನ ಬದಲಾವಣೆಲೆನ� ಒರಿಪ�ಲೆ',
@@ -536,13 +701,17 @@ $1',
 'tooltip-watch'                   => 'ಈ ಪ�ಟನ� ಈರ�ನ ತೂಪ�ನ ಪಟ�ಟಿಗ� ಸೇರ�ಸಾಲೆ',
 'tooltip-recreate'                => 'ಈ ಪ�ಟ ಇತ�ತೆ ಇಜ�ಜ೦ಡಲಾ �ನ� ಪಿರ ಮಲ�ಪ�',
 'tooltip-upload'                  => 'ಅಪ�ಲೋಡ� ಸ�ರ� ಮಲ�ಪ�',
+'tooltip-rollback'                => '"Rollback", ಈ ಪ�ಟದ ಕರಿನ ಬದಾಲವಣೆಗ� ಒ೦ಜಿ ಕ�ಲಿಕ� ಡ� ಕೊನೊಪ�೦ಡ�',
+'tooltip-undo'                    => '"Undo" ಈ ಬದಲಾವಣೆನ� ದೆತೊನ�ಜಿ ಬ�ಕ ಪ�ರಿವ�ಯೂ ಮೋಡ� ಡ� ಬದಲಾವಣೆ ಮಲ�ಪೆರ� ಕೊನೊಪ�೦ಡ�. ಅ೦ಚೆನೆ ಸಮ�ಮರಿ ಡ� ಬದಲಾವಣೆ ಗ� ಕಾರಣ ಕೊರ�ರ��ಎ ಆಪ�೦ಡ�.',
 
 # Browsing diffs
 'previousdiff' => '� ದ�ಂಬ�ದ ಸಂಪಾದನೆ',
+'nextdiff'     => 'ಪೊಸ ಎಡಿಟ� →',
 
 # Media information
 'file-info-size'       => '($1 × $2 ಪಿಕ�ಸೆಲ�, ಫೈಲ�’ದ ಗಾತ�ರ: $3, MIME ಪ�ರಕಾರ: $4)',
 'file-nohires'         => '<small>ಇಂದೆರ�ದ� ಜಾಸ�ತಿ ವಿವರವಾಯಿನ ನೋಟ ಇಜ�ಜಿ.</small>',
+'svg-long-desc'        => '(ಎಸ�.ವಿ.ಜಿ ಫೈಲ�, ಸ�ಮಾರಾದ� $1 × $2 ಪಿಕ�ಸೆಲ�, ಫೈಲ�’ದ ಗಾತ�ರ: $3)',
 'show-big-image'       => 'ಪೂರ�ತಿ ರೆಸೊಲ�ಯೂಶನ�',
 'show-big-image-thumb' => '<small>ಈ ಮ�ನ�ನೋಟದ ಗಾತ�ರ: $1 × $2 ಪಿಕ�ಸೆಲ�</small>',
 
@@ -570,12 +739,16 @@ $1',
 
 # External editor support
 'edit-externally'      => 'ಬಾಹ�ಯ(ಪಿದಯಿದ) ತಂತ�ರಾಶೊನ� ಉಪಯೋಗ ಮಲ�ತ�’ದ� ಇಂದೆನ� ಸಂಪಾದನೆ ಮಲ�ಪ�ಲೆ',
-'edit-externally-help' => 'ಹೆಚ�ಚಿನ ಮಾಹಿತಿಗ� [http://www.mediawiki.org/wiki/Manual:External_editors ಸೆಟ�-ಅಪ� ನಿರ�ದೇಶನೊಲೆನ�] ತೂಲೆ.',
+'edit-externally-help' => 'ನನಲ ಮಾಹಿತಿಗ� [http://www.mediawiki.org/wiki/Manual:External_editors ಸೆಟ�-ಅಪ� ನಿರ�ದೇಶನೊಲೆನ�] ತೂಲೆ.',
 
 # 'all' in various places, this might be different for inflected languages
+'watchlistall2' => 'ಪೂರ',
 'namespacesall' => 'ಪೂರಾ',
 'monthsall'     => 'ಪೂರಾ',
 
+# Watchlist editing tools
+'watchlisttools-edit' => 'ವೀಕ�ಷಣಾಪಟ�ಟಿನ� ತೂಲೆ ಬೊಕ�ಕ ಎಡಿಟ� ಮಲ�ಪ�ಲೆ',
+
 # Special:SpecialPages
 'specialpages' => 'ವಿಷೇಶ ಪ�ಟೊಲ�',
 
diff --git a/languages/messages/MessagesTe.php b/languages/messages/MessagesTe.php
index fda94e67..6a762c8f 100644
--- a/languages/messages/MessagesTe.php
+++ b/languages/messages/MessagesTe.php
@@ -5,6 +5,7 @@
  * @file
  *
  * @author Chaduvari
+ * @author Meno25
  * @author Mpradeep
  * @author Sunil Mohan
  * @author Urhixidur
@@ -17,47 +18,50 @@
 $namespaceNames = array(
 	NS_MEDIA            => 'మీడియా',
 	NS_SPECIAL          => 'ప�రత�యేక',
-	NS_MAIN             => '',
 	NS_TALK             => 'చర�చ',
-	NS_USER             => 'సభ�య�ల�',
-	NS_USER_TALK        => 'సభ�య�లపై_చర�చ',
-	# NS_PROJECT set by $wgMetaNamespace
+	NS_USER             => 'వాడ�కరి',
+	NS_USER_TALK        => 'వాడ�కరి_చర�చ',
 	NS_PROJECT_TALK     => '$1_చర�చ',
-	NS_IMAGE            => 'బొమ�మ',
-	NS_IMAGE_TALK       => 'బొమ�మపై_చర�చ',
+	NS_FILE             => 'ఫైల�',
+	NS_FILE_TALK        => 'ఫైల�పై_చర�చ',
 	NS_MEDIAWIKI        => 'మీడియావికీ',
 	NS_MEDIAWIKI_TALK   => 'మీడియావికీ_చర�చ',
 	NS_TEMPLATE         => 'మూస',
 	NS_TEMPLATE_TALK    => 'మూస_చర�చ',
-	NS_HELP             => 'సహాయమ�',
-	NS_HELP_TALK        => 'సహాయమ�_చర�చ',
+	NS_HELP             => 'సహాయం',
+	NS_HELP_TALK        => 'సహాయం_చర�చ',
 	NS_CATEGORY         => 'వర�గం',
-	NS_CATEGORY_TALK    => 'వర�గం_చర�చ'
+	NS_CATEGORY_TALK    => 'వర�గం_చర�చ',
 );
 
 $namespaceAliases = array(
-	'సభ�య�డ�'          => NS_USER, # set for bug 11615
-	'సభ�య�నిపై_చర�చ'         => NS_USER_TALK,
-	'బొమ�మపై_చర�చ'          => NS_IMAGE_TALK
+	'సభ�య�ల�' => NS_USER,
+	'సభ�య�లపై_చర�చ' => NS_USER_TALK,
+	'సభ�య�డ�' => NS_USER, # set for bug 11615
+	'సభ�య�నిపై_చర�చ' => NS_USER_TALK,
+	'బొమ�మ' => NS_FILE,
+	'బొమ�మపై_చర�చ' => NS_FILE_TALK,
+	'బొమ�మపై_చర�చ' => NS_FILE_TALK,
+	'సహాయమ�' => NS_HELP,
+	'సహాయమ�_చర�చ' => NS_HELP_TALK,
 );
 
+$specialPageAliases = array(
+	'Preferences'               => array( 'అభిర�చ�ల�' ),
+	'Recentchanges'             => array( 'ఇటీవలిమార�ప�ల�' ),
+	'Listusers'                 => array( 'వాడ�కర�లజాబితా' ),
+	'Statistics'                => array( 'గణాంకాల�' ),
+	'Shortpages'                => array( 'చిన�నపేజీల�' ),
+	'Newpages'                  => array( 'కొత�తపేజీల�' ),
+	'Allpages'                  => array( 'అన�నిపేజీల�' ),
+	'Specialpages'              => array( 'ప�రత�యేకపేజీల�' ),
+	'Categories'                => array( 'వర�గాల�' ),
+	'Mypage'                    => array( 'నాపేజీ' ),
+	'Search'                    => array( 'అన�వేషణ' ),
+);
 
 $linkTrail = "/^([\xE0\xB0\x81-\xE0\xB1\xAF]+)(.*)$/sDu";
 
-// nobody seems to use these anymore
-/*$digitTransformTable = array(
-	'0' => '౦',
-	'1' => '౧',
-	'2' => '౨',
-	'3' => '౩',
-	'4' => '౪',
-	'5' => '౫',
-	'6' => '౬',
-	'7' => 'à±­',
-	'8' => 'à±®',
-	'9' => '౯'
-);*/
-
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'లింక�ల కింద గీతగీయి:',
@@ -96,6 +100,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'నా మార�ప�లన� వీక�షణా జాబితాలో చూపించొద�ద�',
 'tog-watchlisthidebots'       => 'బాట�ల� చేసిన మార�ప�లన� నా వీక�షణా జాబితాలో చూపించొద�ద�',
 'tog-watchlisthideminor'      => 'చిన�న మార�ప�లన� నా వీక�షణా జాబితాలో చూపించొద�ద�',
+'tog-watchlisthideliu'        => 'ప�రవేశించిన వాడ�కర�ల మార�ప�లన� వీక�షణా జాబితాలో చూపించక�',
+'tog-watchlisthideanons'      => 'అజ�ఞాత వాడ�కర�ల మార�ప�లన� విక�షణా జాబితాలో చూపించక�',
 'tog-ccmeonemails'            => 'నేన� ఇతర సభ�య�లక� పంపిస�త�న�న ఈ-మెయిళ�ల కాపీని నాక� కూడా పంప�',
 'tog-diffonly'                => 'తేడాలన� చూపిస�త�న�నప�డ�, కింద చూపించే పేజీలోని సమాచారాన�ని చూపించొద�ద�',
 'tog-showhiddencats'          => 'దాచిన వర�గాలన� చూపించ�',
@@ -104,8 +110,6 @@ $messages = array(
 'underline-never'   => 'ఎప�పటికీ వద�ద�',
 'underline-default' => 'బ�రవ�జర� న�ండి తీస�కో',
 
-'skinpreview' => '(మ�న�జూప�/సరిచూడ�)',
-
 # Dates
 'sunday'        => 'ఆదివారమ�',
 'monday'        => 'సోమవారమ�',
@@ -199,7 +203,7 @@ $messages = array(
 'mytalk'         => 'నా గ�రించి చర�చ',
 'anontalk'       => 'ఈ �.పి.కి సంబంధించిన చర�చ',
 'navigation'     => 'మార�గదర�శకం',
-'and'            => 'మరియ�',
+'and'            => '&#32;మరియ�',
 
 # Metadata in edit box
 'metadata_help' => 'మెటాడేటా:',
@@ -236,14 +240,14 @@ $messages = array(
 'talkpagelinktext'  => 'చర�చ',
 'specialpage'       => 'ప�రత�యేక పేజీ',
 'personaltools'     => 'వ�యక�తిగత పరికరాల�',
-'postcomment'       => 'వ�యాఖ�యానమ� చేయండి',
+'postcomment'       => 'కొత�త విభాగం',
 'articlepage'       => 'వ�యాసమ� చూడండి',
 'talk'              => 'చర�చ',
 'views'             => 'పేజీకి సంభందించిన లింక�ల�',
 'toolbox'           => 'పరికరాలపెట�టె',
 'userpage'          => 'సభ�య�ని పేజీని చూడ�',
 'projectpage'       => 'ప�రాజెక�ట� పేజీని చూడ�',
-'imagepage'         => 'మీడియా పేజీని చూడండి',
+'imagepage'         => 'ఫైల� పేజీని చూడండి',
 'mediawikipage'     => 'సందేశం పేజీని చూడ�',
 'templatepage'      => 'మూస పేజీని చూడ�',
 'viewhelppage'      => 'సహాయం పేజీని చూడ�',
@@ -262,8 +266,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} గ�రించి',
 'aboutpage'            => 'Project:గ�రించి',
-'bugreports'           => 'దోషాల నివేదనల�',
-'bugreportspage'       => 'Project:దోషాల నివేదనల�',
 'copyright'            => 'విషయ సంగ�రహం $1  కి లోబడి లభ�యం.',
 'copyrightpagename'    => '{{SITENAME}} ప�రచ�రణ హక�క�',
 'copyrightpage'        => '{{ns:project}}:ప�రచ�రణ హక�క�ల�',
@@ -286,9 +288,7 @@ $messages = array(
 
 'badaccess'        => 'అన�మతి లోపం',
 'badaccess-group0' => 'మీర� చేయతలపెట�టిన పనికి మీక� హక�క�ల� లేవ�.',
-'badaccess-group1' => 'మీర� ప�రస�త�తం చేయతలపెట�టిన పని $1 గ�ంప�క� చెందిన వాడ�కర�ల� మాత�రమే చేయగలర�.',
-'badaccess-group2' => 'మీర� ప�రస�త�తం చేయతలపెట�టిన పని $1 గ�ంప�లక� చెందిన వాడ�కర�ల� మాత�రమే చేయగలర�.',
-'badaccess-groups' => 'మీర� ప�రస�త�తం చేయతలపెట�టిన పని $1 గ�ంప�లక� చెందిన వాడ�కర�ల� మాత�రమే చేయగలర�.',
+'badaccess-groups' => 'మీర� చేయతలపెట�టిన పని ఈ {{PLURAL:$2|గ�ంప�|గ�ంప�ల}} లోని వాడ�కర�లక� మాత�రమే పరిమితం: $1.',
 
 'versionrequired'     => 'మీడియావికీ సాఫ�ట�వేర� వెర�షన� $1 కావాలి',
 'versionrequiredtext' => 'ఈ పేజీని వాడటానికి మీక� మీడియావికీ సాఫ�ట�వేర� వెర�షన� $1 కావాలి. [[Special:Version|వెర�షన� పేజీ]]ని చూడండి.',
@@ -302,6 +302,8 @@ $messages = array(
 'editsection'             => 'మార�చ�',
 'editold'                 => 'మార�చ�',
 'viewsourceold'           => 'మూలాన�ని చూడండి',
+'editlink'                => 'మార�చ�',
+'viewsourcelink'          => 'మూలాన�ని చూడండి',
 'editsectionhint'         => 'విభాగాన�ని మార�చ�: $1',
 'toc'                     => 'విషయ సూచిక',
 'showtoc'                 => 'చూపించ�',
@@ -316,13 +318,13 @@ $messages = array(
 'site-atom-feed'          => '$1 ఆటం(Atom) ఫీడ�',
 'page-rss-feed'           => '"$1" ఆరెసెస�స�(RSS) ఫీడ�',
 'page-atom-feed'          => '"$1" ఆటం(Atom) ఫీడ�',
-'red-link-title'          => '$1 (ఇంకా రాయలేద�)',
+'red-link-title'          => '$1 (పేజీ లేద�)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'వ�యాసమ�',
 'nstab-user'      => 'సభ�య�ని పేజీ',
 'nstab-media'     => 'మీడియా పేజీ',
-'nstab-special'   => 'ప�రత�యేక',
+'nstab-special'   => 'ప�రత�యేక పేజీ',
 'nstab-project'   => 'ప�రాజెక�ట� పేజీ',
 'nstab-image'     => 'ఫైల�',
 'nstab-mediawiki' => 'సందేశమ�',
@@ -332,8 +334,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'అట�వంటి కార�యం లేద�',
-'nosuchactiontext'  => 'మీర� URLలో పేర�కొన�న కార�యాన�ని
-ఈ వికీ గ�ర�తించలేక పోయింది',
+'nosuchactiontext'  => 'మీర� URLలో పేర�కొన�న కార�యం సరైనది కాద�.
+మీర� URLని తప�ప�గా టైప� చేసివ�ండవచ�చ� లేదా తప�ప�డ� లింక�ని అన�సరించివ�ండొచ�చ�.
+{{SITENAME}} ఉపయోగించే మృద�పరికరంలో దోషమైనా అయివ�ండవచ�చ�.',
 'nosuchspecialpage' => 'అట�వంటి ప�రత�యేక పేజీ లేద�',
 'nospecialpagetext' => "<big>'''మీర� అడిగిన ప�రత�యేకపేజీ సరైనది కాద�.'''</big>
 
@@ -386,7 +389,6 @@ $1',
 'cannotdelete'         => 'అడిగిన పేజీ లేదా ఫైల�న� తీసివేయటం క�దరలేద�. (ఇప�పటికే ఎవరైనా తీసివేసి ఉండవచ�చ�)',
 'badtitle'             => 'తప�ప� శీర�షిక',
 'badtitletext'         => 'మీర� కోరిన పేజీ పేర� సరైయినది కాద�, ఖాళీగా ఉంది, లేదా తప�ప�గా చేర�చిన అంతర�వికీ లింక� అయ�య�ండాలి.  పేజీ పేర�లలో ఉపయోగించకూడని అక�షరాల� వాటిలో ఉన�నట�ల�న�నాయి.',
-'perfdisabled'         => 'క�షమించండి! ఈ అంశంవలన డేటాబేస� బాగా స�లో అయిపోయి, ఎవరూ వికీని వాడ�కోలేర�. కాబట�టి, ప�రస�త�తానికి ఈ అంశాన�ని అంద�బాట�లో లేక�ండా చేస�త�న�నాం.',
 'perfcached'           => 'కింది డేటా మ�ందే సేకరించి పెట�ట�క�న�నది. కాబట�టి తాజా డేటాతో పోలిస�తే తేడాల�ండవచ�చ�.',
 'perfcachedts'         => 'కింది సమాచారం మ�ందే సేకరించి పెట�ట�క�న�నది. దీన�ని $1న చివరిసారిగా తాజాకరించార�.',
 'querypage-no-updates' => 'ప�రస�త�తం ఈ పజీపై మార�ప�ల�న� అన�మతించటం లేద�. ఇక�కడ�న�న సమాచారం కూడా రీఫ�రెష� అవ�వద�.',
@@ -400,7 +402,9 @@ $1',
 'protectedpagetext'    => 'ఈ పేజీపై దిద�ద�బాట�ల� చెయ�యనివ�వక�ండా లాక� చేసాం.',
 'viewsourcetext'       => 'మీరీ పేజీ సోర�స�న� చూడవచ�చ�, కాపీ చేస�కోవచ�చ�:',
 'protectedinterface'   => 'సాఫ�ట�వేర� ఇంటర�ఫేస�క� చెందిన టెక�స�ట�న� ఈ పేజీ అందిస�త�ంది. ద�శ�చర�యల నివారణ కోసమై దీన�ని లాక� చేసాం.',
-'editinginterface'     => 'హెచ�చరిక: సాఫ�ట�వేర�క� ఇంటర�ఫేస� టెక�స�ట�న� అందించే పేజీని మీర� సరిదిద�ద�త�న�నార�. ఈ పేజీలో చేసే మార�ప�ల� ఇతర వాడ�కదార�లక� ఇంటర�ఫేస� కనబడే విధానంలో తేడా కల�గజేస�త�ంది. అన�వాదాల కొరకైతే, [http://translatewiki.net/wiki/Main_Page?setlang=te బేటావికీ]ని, వాడండి.',
+'editinginterface'     => "'''హెచ�చరిక''': సాఫ�ట�వేర�క� ఇంటర�ఫేస� టెక�స�ట�న� అందించే పేజీని మీర� సరిదిద�ద�త�న�నార�.
+ఈ పేజీలో చేసే మార�ప�ల వల�ల ఇతర వాడ�కర�లక� ఇంటర�ఫేస� కనబడే విధానంలో తేడావస�త�ంది.
+అన�వాదాల కొరకైతే, [http://translatewiki.net/wiki/Main_Page?setlang=te ట�రాన�స�‌లేట� వికీ.నెట�], మీడియావికీ స�థానికీకరణ ప�రాజెక�ట�, ని వాడండి.",
 'sqlhidden'            => '(SQL క�విరీని చూపించటం లేద�)',
 'cascadeprotected'     => 'కింది {{PLURAL:$1|పేజీని|పేజీలన�}} కాస�కేడింగ� ఆప�షన�తో చేసి సంరక�షించార�. ప�రస�త�త పేజీ, ఈ పేజీల�లో ఇంక�లూడ� అయి ఉంది కాబట�టి, దిద�ద�బాట� చేసే వీల� లేక�ండా ఇది కూడా రక�షణలో ఉంది.
 $2',
@@ -411,16 +415,16 @@ $2',
 అంద�క� ఇచ�చిన కారణం: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'తప�ప�డ� స�వరూపణం: తెలియని వైరస� స�కానర�: <i>$1</i>',
+'virus-badscanner'     => "తప�ప�డ� స�వరూపణం: తెలియని వైరస� స�కానర�: ''$1''",
 'virus-scanfailed'     => 'స�కాన� విఫలమైంది (సంకేతం $1)',
 'virus-unknownscanner' => 'అజ�ఞాత యాంటీవైరస�:',
 
 # Login and logout pages
 'logouttitle'                => 'సభ�య�ని నిష�క�రమణ',
-'logouttext'                 => '<strong>ఇప�ప�డ� మీర� నిష�క�రమించార�.</strong>
+'logouttext'                 => "'''ఇప�ప�డ� మీర� నిష�క�రమించార�.'''
 
 మీర� {{SITENAME}}ని అజ�ఞాతంగా వాడ�త�ండొచ�చ� లేదా వేరే పేర�తో గాని ఇదే పేర�తోగాని మళ�ళీ ప�రవేశించవచ�చ�.
-ఒక గమనిక: బ�రౌజర�లోని కోశాన�ని శ�భ�రపరిచే వరక� కొన�ని పేజీల� మీరింకా లాగిన�‌ అయి ఉన�నట�ల�గానే చూపించవచ�చ�.',
+ఒక గమనిక: బ�రౌజర�లోని కోశాన�ని శ�భ�రపరిచే వరక� కొన�ని పేజీల� మీరింకా లాగిన�‌ అయి ఉన�నట�ల�గానే చూపించవచ�చ�.",
 'welcomecreation'            => '== స�వాగతం, $1! ==
 
 మీ ఖాతాని సృష�టించాం.
@@ -432,7 +436,6 @@ $2',
 'remembermypassword'         => 'ఈ కంప�యూటర�లో నన�న� గ�ర�త�పెట�ట�కో',
 'yourdomainname'             => 'మీ డోమైన�',
 'externaldberror'            => 'బయట ఉన�న డేటాబేస�లోకి లాగిన� అవ�వటంలో లోపం ఉంది లేదా మీర� ఇచ�చిన బయటి ఖాతా న�ండి డేటాబేస�పై మార�ప�ల� చేయటాన�ని నిషేదించినట�ల�న�నార�.',
-'loginproblem'               => '<b>మీ లాగిన�‌తో �దో ఇబ�బంది ఉంది.</b><br />మళ�ళీ ప�రయత�నించండి!',
 'login'                      => 'ప�రవేశించండి',
 'nav-login-createaccount'    => 'లోనికి ప�రవేశించండి / ఖాతాని సృష�టించ�కోండి',
 'loginprompt'                => '{{SITENAME}}లోకి ప�రవేశించాలంటే మీ విహారిణిలో కూకీల� చేతనమై ఉండాలి.',
@@ -471,7 +474,8 @@ $2',
 'loginsuccesstitle'          => 'ప�రవేశం విజయవంతమైనది',
 'loginsuccess'               => "'''మీర� ఇప�ప�డ� {{SITENAME}}లోనికి \"\$1\"గా ప�రవేశించార�.'''",
 'nosuchuser'                 => '"$1" అనే పేర�తో వాడ�కర�ల� లేర�.
-పేర� సరిచూస�కోండి, లేదా [[Special:UserLogin/signup|కొత�త ఖాతా సృష�టించ�కోండి]].',
+వాడ�కరి పేర�ల� కేస� సెన�సిటివ�.
+అక�షరక�రమం సరిచూస�కోండి, లేదా [[Special:UserLogin/signup|కొత�త ఖాతా సృష�టించ�కోండి]].',
 'nosuchusershort'            => '"<nowiki>$1</nowiki>" అనే పేర�తో సభ�య�ల� లేర�. పేర� సరి చూస�కోండి.',
 'nouserspecified'            => 'సభ�యనామాన�ని తప�పనిసరిగా ఎంచ�కోవాలి.',
 'wrongpassword'              => 'ఈ సంకేతపదం సరైనది కాద�. దయచేసి మళ�లీ ప�రయత�నించండి.',
@@ -492,8 +496,9 @@ $2',
 'throttled-mailpassword'     => 'గడచిన {{PLURAL:$1|ఒక గంటలో|$1 గంటల�లో}} ఇప�పటికే ఒక సంకేతపదప� రిమైండర�ని పంపించివ�న�నాం.
 ద�శ�చర�యలన� నివారించేంద�క� గాన�, {{PLURAL:$1|ఒక గంటకి|$1 గంటలకి}} ఒక�కసారి మాత�రమే సంకేతపదప� రిమైండర�ని పంపిస�తామ�.',
 'mailerror'                  => 'మెయిల� పంపించడంలో లోపం: $1',
-'acct_creation_throttle_hit' => 'క�షమించండి, మీరిప�పటికే $1 అకౌంట�ల� సృష�టించార�. ఇహ క�దరద�.',
-'emailauthenticated'         => 'మీ ఈ-మెయిల� చిర�నామా $1న ధృవీకరింపబడింది.',
+'acct_creation_throttle_hit' => 'మీ �పీ చిర�నామా వాడ�త�న�న ఈ వికీ సందర�శక�ల� గత ఒక�క రోజ�లో {{PLURAL:$1|1 ఖాతాని|$1 ఖాతాలన�}} సృష�టించార�, ఈ కాల వ�యవధిలో అది గరిష�ఠ పరిమితి.
+అంద�వల�ల, ఈ �పీని వాడ�త�న�న సందర�శక�ల� ప�రస�త�తానికి ఇంక ఖాతాలని సృష�టించలేర�.',
+'emailauthenticated'         => 'మీ ఈ-మెయిల� చిర�నామా $2న $3కి ధృవీకరింపబడింది.',
 'emailnotauthenticated'      => 'మీ ఈ-మెయిల� చిర�నామాన� ఇంకా ధృవీకరించలేద�. కాబట�టి కింద పేర�కొన�న అంశాలక� ఎట�వంటి ఈ-మెయ�ల�నూ పంపించమ�.',
 'noemailprefs'               => 'కింది అంశాల� పని చెయ�యటానికి ఈ-మెయిల� చిర�నామాన� నమొద�చయ�యండి.',
 'emailconfirmlink'           => 'మీ ఈ-మెయిల� చిర�నామాన� ధృవీకరించండి',
@@ -506,17 +511,25 @@ $2',
 మీర� సంకేత పదాన�ని మార�చ�కోవాలని అన�క�ంటే ఇప�ప�డ� లాగిన� అవ�వాలి.
 
 ఈ ఖాతా మీక� తెలియక�ండా సృష�టిస�తే గనక ఈ సందేశాన�ని పట�టించ�కోకండి.',
+'login-throttled'            => 'ఈ ఖాతా యొక�క సంకేతపదం కొరక� మీర� తాజాగా చాలాసార�ల� ప�రయత�నించార� . మళ�ళీ ప�రయత�నించే మ�ంద� కాసేప� వేచివ�ండండి.',
 'loginlanguagelabel'         => 'భాష: $1',
 
 # Password reset dialog
-'resetpass'               => 'ఎకౌంట� సంకేతపదాన�ని మార�చండి',
-'resetpass_announce'      => 'మీర� తాత�కాలిక ఈమెయిల� కోడ�తో లాగిన� అయి ఉన�నార�. లాగిన� పూర�తి అయేంద�క�, కొత�త సంకేతపదాన�ని ఎంచ�కోవాలి:',
-'resetpass_header'        => 'సంకేతపదాన�ని మార�చ�',
-'resetpass_submit'        => 'సంకేతపదాన�ని మార�చి లాగిన� కండి',
-'resetpass_success'       => 'మీ సంకేతపదాన�ని జయప�రదంగా మార�చాం! ఇక మిమ�మల�ని లాగిన� చేస�త�న�నాం...',
-'resetpass_bad_temporary' => 'ఈ తాత�కాలిక సంకేతపదం తప�ప�. మీ సంకేతపదాన�ని మార�చి ఉండాలి లేదా మరో కొత�త తాత�కాలిక సంకేతపదం కోసం అడిగి ఉండాలి.',
-'resetpass_forbidden'     => 'సంకేతపదాలన� మార�చటం క�దరద�',
-'resetpass_missing'       => 'ఫారంలో సమాచారం లేద�.',
+'resetpass'                 => 'సంకేతపదాన�ని మార�చండి',
+'resetpass_announce'        => 'మీర� తాత�కాలిక ఈమెయిల� కోడ�తో లాగిన� అయి ఉన�నార�. లాగిన� పూర�తి అయేంద�క�, కొత�త సంకేతపదాన�ని ఎంచ�కోవాలి:',
+'resetpass_header'          => 'ఖాతా సంకేతపదం మార�ప�',
+'oldpassword'               => 'పాత సంకేతపదమ�',
+'newpassword'               => 'కొత�త సంకేతపదమ�',
+'retypenew'                 => 'సంకేతపదం, మళ�ళీ',
+'resetpass_submit'          => 'సంకేతపదాన�ని మార�చి లాగిన� కండి',
+'resetpass_success'         => 'మీ సంకేతపదాన�ని జయప�రదంగా మార�చాం! ఇక మిమ�మల�ని లాగిన� చేస�త�న�నాం...',
+'resetpass_bad_temporary'   => 'ఈ తాత�కాలిక సంకేతపదం తప�ప�. మీ సంకేతపదాన�ని మార�చి ఉండాలి లేదా మరో కొత�త తాత�కాలిక సంకేతపదం కోసం అడిగి ఉండాలి.',
+'resetpass_forbidden'       => 'సంకేతపదాలన� మార�చటం క�దరద�',
+'resetpass-no-info'         => 'ఈ పేజీని నేర�గా చూడటానికి మీర� లోనికి ప�రవేశించివ�ండాలి.',
+'resetpass-submit-loggedin' => 'సంకేతపదాన�ని మార�చ�',
+'resetpass-wrong-oldpass'   => 'తప�ప�డ� తాత�కాలిక లేదా ప�రస�త�త సంకేతపదం.
+మీర� మీ సంకేతపదాన�ని ఇప�పటికే విజయవంతంగా మార�చ�కొనివ�ండవచ�చ� లేదా కొత�త తాత�కాలిక సంకేతపదం కోసం అభ�యర�థించార�.',
+'resetpass-temp-password'   => 'తాత�కాలిక సంకేతపదం:',
 
 # Edit page toolbar
 'bold_sample'     => 'బొద�ద� అక�షరాల�',
@@ -539,8 +552,8 @@ $2',
 'hr_tip'          => 'అడ�డగీత (అర�ద�గా వాడండి)',
 
 # Edit pages
-'summary'                          => 'సారాంశమ�',
-'subject'                          => 'విషయం/శీర�షిక',
+'summary'                          => 'సారాంశమ�:',
+'subject'                          => 'విషయం/శీర�షిక:',
 'minoredit'                        => 'ఇది ఒక చిన�న మార�ప�',
 'watchthis'                        => 'ఈ పేజీ మీద కన�నేసి ఉంచ�',
 'savearticle'                      => 'పేజీ భధ�రపరచ�',
@@ -552,8 +565,8 @@ $2',
 'missingsummary'                   => "'''గ�ర�త� చేస�త�న�నాం:''' మీర� దిద�ద�బాట� సారాంశమేమీ ఇవ�వలేద�. పేజీని మళ�ళీ భద�రపరచమని చెబితే సారాంశమేమీ లేక�ండానే దిద�ద�బాట�న� భద�రపర�స�తాం.",
 'missingcommenttext'               => 'కింద ఓ వ�యాఖ�య రాయండి.',
 'missingcommentheader'             => "'''గ�ర�త� చేస�త�న�నాం''': ఈ వ�యాఖ�యక� మీర� విషయం/శీర�షిక పెట�టలేద�. పేజీని మళ�ళీ భద�రపరచమని చెబితే, మీ విభాగాన�ని శీర�షికేమీ లేక�ండానే భద�రపర�స�తాం.",
-'summary-preview'                  => 'మీర� రాసిన సారాంశం',
-'subject-preview'                  => 'విషయం/శీర�షిక మ�న�జూప�',
+'summary-preview'                  => 'మీర� రాసిన సారాంశం:',
+'subject-preview'                  => 'విషయం/శీర�షిక మ�న�జూప�:',
 'blockedtitle'                     => 'సభ�య�నిపై నిరోధం అమలయింది',
 'blockedtext'                      => '<big>\'\'\'మీ వాడ�కరి పేర�ని లేదా �.పీ. చిర�నామాని నిరోధించార�.\'\'\'</big>
 
@@ -603,30 +616,33 @@ $2',
 'anontalkpagetext'                 => "----''ఇది ఒక అజ�ఞాత వాడ�కరికై చర�చా పేజీ. ఆ వాడ�కరి ఇంకా తనకై ఖాతాని సృష�టించ�కోలేద�, ఉన�నా దానిని ఉపయోగించడం లేద�.
 వారిని గ�ర�తించడానికి అంకెల �.పీ. చిర�నామానే వాడ�తాం. ఓ �.పీ. చిర�నామాని చాలా మంది వాడ�కర�ల� వాడే అవకాశం ఉంది.
 మీరూ ఓ అజ�ఞాత వాడ�కరి అయితే మరియ� సంబంధంలేని వ�యాఖ�యల� మిమ�మల�ని ఉద�దేశించినట�ట�గా అనిపిస�తే, భవిష�యత�త�లో ఇతర అజ�ఞాత వాడ�కర�లతో అయోమయం లేక�ండా ఉండటానికి, దయచేసి [[Special:UserLogin/signup|ఖాతా సృష�టించ�కోండి]] లేదా [[Special:UserLogin|లోనికి ప�రవేశించండి]].''",
-'noarticletext'                    => 'ప�రస�త�తం ఈ పేజీ ఖాళీగా ఉంది, మీర� ఈ పేజీ శీర�షిక కోసం వేరే పేజీలలో [[Special:Search/{{PAGENAME}}|వెతకవచ�చ�]] లేదా [{{fullurl:{{FULLPAGENAME}}|action=edit}} ఈ పేజీని సృష�టించవచ�చ�].',
+'noarticletext'                    => 'ప�రస�త�తం ఈ పేజీలో పాఠ�యమేమీ లేద�.
+వేరే పేజీలలో [[Special:Search/{{PAGENAME}}|ఈ పేజీ శీర�షిక కోసం వెతకవచ�చ�]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} సంబంధిత చిట�టాల� చూడవచ�చ�],
+లేదా [{{fullurl:{{FULLPAGENAME}}|action=edit}} ఈ పేజీని మార�చవచ�చ�]</span>.',
 'userpage-userdoesnotexist'        => '"$1" అనే వాడ�కరి ఖాతా నమోదయిలేద�. మీర� ఈ పేజీని సృష�టించ/సరిదిద�దాలన�క�ంటే, సరిచూస�కోండి.',
 'clearyourcache'                   => "'''గమనిక - భద�రపరచిన తర�వాత, మార�ప�లన� చూడడానికి మీ విహారిణి యొక�క కోశాన�ని తీసేయాల�సిరావచ�చ�.''' '''మొజిల�లా/ ఫైర�‌ఫాక�స�‌ / సఫారి:''' ''Shift'' మీటని నొక�కిపట�టి ''రీలోడ�''ని నొక�కండి లేదా ''Ctrl-F5'' అనే మీటల�ని లేదా ''Ctrl-R'' (మాకింటోష�లో ''Command-R'') అనే మీటల�ని కలిపి నొక�కండి; '''కాంకరర�: '''''రీలోడ�''ని నొక�కండి లేదా ''F5'' మీటని నొక�కండి; '''ఒపెరా:''' ''Tools → Preferences'' ద�వారా కోశాన�ని శ�భ�రపరచండి; '''ఇంటర�నెట� ఎక�ప�లోరర�:'''''Ctrl'' మీటని నొక�కిపట�టి ''రీఫ�రెష�''ని నొక�కండి లేదా ''Ctrl-F5'' మీటల�ని కలిపి నొక�కండి.",
-'usercssjsyoucanpreview'           => "<strong>చిట�కా:</strong> భద�రపరిచేమ�ంద� మీ CSS/JSలన� పరీక�షించడానికి 'సరిచూడ�' అనే బొత�తాన�ని వాడండి.",
+'usercssjsyoucanpreview'           => "'''చిట�కా:''' భద�రపరిచేమ�ంద� మీ CSS/JSలన� పరీక�షించడానికి 'సరిచూడ�' అనే బొత�తాన�ని వాడండి.",
 'usercsspreview'                   => "'''మీర� వాడ�కరి CSSన� కేవలం సరిచూస�త�న�నారని గ�ర�త�ంచ�కోండి.''' 
 '''దాన�నింకా భద�రపరచలేద�!'''",
 'userjspreview'                    => "'''గ�ర�త�ంచ�కోండి, మీరింకా మీ వాడ�కరి జావాస�క�రిప�ట�&zwnj;న� భద�రపరచలేద�, కేవలం పరీక�షిస�త�న�నార�/సరిచూస�త�న�నార�!'''",
 'userinvalidcssjstitle'            => "'''హెచ�చరిక:''' \"\$1\" అనే తొడ�గ� లేద�. .css మరియ� .js పేజీల పేర�ల� ఇంగ�లీష� లోవర� కేస�లోనే ఉండాలన�న సంగతి గ�ర�త�ంచ�కోండి. ఉదాహరణక� {{ns:user}}:Foo/monobook.css. అంతేగానీ, {{ns:user}}:Foo/Monobook.css -ఇలా కాద�.",
 'updated'                          => '(తాజా అయ�యింది)',
-'note'                             => '<strong>గమనిక:</strong>',
-'previewnote'                      => '<strong>ఇది మ�న�జూప� మాత�రమే;
-మార�ప�లని ఇంకా భద�రపరచలేద�!</strong>',
+'note'                             => "'''గమనిక:'''",
+'previewnote'                      => "'''ఇది మ�న�జూప� మాత�రమే;
+మార�ప�లని ఇంకా భద�రపరచలేద�!'''",
 'previewconflict'                  => 'భద�రపరచిన తర�వాత పై టెక�స�ట�‌ �రియాలోని టెక�స�ట� ఇలాగ కనిపిస�త�ంది.',
-'session_fail_preview'             => '<strong>క�షమించండి! సెషన� డేటా పోవడం వలన మీ మార�ప�లన� స�వీకరించలేకపోత�న�నాం.
-మళ�ళీ ప�రయత�నించండి. అయినా పని జరక�కపోతే, ఓ సారి లాగౌట� అయి, మళ�ళీ లాగిన� అయి ప�రయత�నించండి.</strong>',
-'session_fail_preview_html'        => "<strong>సారీ! సెషన� డేటా పోవడం వలన మీ దిద�ద�బాట�న� ప�రాసెస� చెయ�యలేలేక పోత�న�నాం.</strong>
+'session_fail_preview'             => "'''క�షమించండి! సెషన� డేటా పోవడం వలన మీ మార�ప�లన� స�వీకరించలేకపోత�న�నాం.
+మళ�ళీ ప�రయత�నించండి. అయినా పని జరక�కపోతే, ఓ సారి లాగౌట� అయి, మళ�ళీ లాగిన� అయి ప�రయత�నించండి.'''",
+'session_fail_preview_html'        => "'''సారీ! సెషన� డేటా పోవడం వలన మీ దిద�ద�బాట�న� ప�రాసెస� చెయ�యలేలేక పోత�న�నాం.'''
 
 ''{{SITENAME}}లో మ�డి HTML సశక�తమై ఉంది కాబట�టి, జావాస�క�రిప�ట� దాడ�ల న�ండి రక�షణగా మ�న�జూప�న� దాచేశాం.''
 
-<strong>మీర� చేసినది సరైన దిద�ద�బాటే అయితే, మళ�ళీ ప�రయత�నించండి. అయినా పనిచెయ�యకపోతే, ఓ సారి లాగౌటయ�యి, మళ�ళీ లాగినయి చూడండి.</strong>",
-'token_suffix_mismatch'            => '<strong>మీ క�లయంట�, దిద�ద�బాట� టోకెన�‌లోని వ�యాకరణ గ�ర�త�లన� గజిబిజి చేసింది కాబట�టి మీ దిద�ద�బాట�న� తిరస�కరించాం. పేజీలోని పాఠ�యాన�ని చెడగొట�టక�ండా ఉండేంద�క� గాన�, ఆ దిద�ద�బాట�న� రద�ద� చేశాం. వెబ�‌లో ఉండే లోపభూయిష�టమైన అజ�ఞాత ప�రాక�సీ సర�వీస�లన� వాడినప�డ� ఒక�కోసారి ఇలా జర�గ�త�ంది.</strong>',
+'''మీర� చేసినది సరైన దిద�ద�బాటే అయితే, మళ�ళీ ప�రయత�నించండి. అయినా పనిచెయ�యకపోతే, ఓ సారి లాగౌటయ�యి, మళ�ళీ లాగినయి చూడండి.'''",
+'token_suffix_mismatch'            => "'''మీ క�లయంట�, దిద�ద�బాట� టోకెన�‌లోని వ�యాకరణ గ�ర�త�లన� గజిబిజి చేసింది కాబట�టి మీ దిద�ద�బాట�న� తిరస�కరించాం. పేజీలోని పాఠ�యాన�ని చెడగొట�టక�ండా ఉండేంద�క� గాన�, ఆ దిద�ద�బాట�న� రద�ద� చేశాం. వెబ�‌లో ఉండే లోపభూయిష�టమైన అజ�ఞాత ప�రాక�సీ సర�వీస�లన� వాడినప�డ� ఒక�కోసారి ఇలా జర�గ�త�ంది.'''",
 'editing'                          => '$1కి మార�ప�ల�',
 'editingsection'                   => '$1క� మార�ప�ల� (విభాగం)',
-'editingcomment'                   => '$1 దిద�ద�బాట� (వ�యాఖ�య)',
+'editingcomment'                   => '$1 దిద�ద�బాట� (కొత�త విభాగం)',
 'editconflict'                     => 'దిద�ద�బాట� ఘర�షణ: $1',
 'explainconflict'                  => "మీర� మార�ప�ల� చెయ�యడం మొదల�పెట�టిన తర�వాత, ఇతర సభ�య�ల� ఈ పేజీలో మార�ప�ల� చేసార�.
 పైన ఉన�న టెక�స�ట� �రియాలో ప�రస�త�తప� సంచిక ఉన�నది.
@@ -634,20 +650,22 @@ $2',
 మీర� మీ మార�ప�లన� ప�రస�త�తప� సంచికతో విలీనం చెయ�యవలసి ఉంట�ంది. మీర� \"పేజీని భద�రపర�చ�\"న� నొక�కినప�డ�, పైన ఉన�న సంచిక '''మాత�రమే''' భద�రపరచబడ�త�ంది.",
 'yourtext'                         => 'మీ పాఠ�యం',
 'storedversion'                    => 'భద�రపరచిన కూర�ప�',
-'nonunicodebrowser'                => '<strong>WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>',
-'editingold'                       => '<strong>హెచ�చ రిక: ఈ పేజీ యొక�క కాలం చెల�లిన సంచికన� మీర� మర�స�త�న�నార�. దీనిని భద�రపరిస�తే, ఆ సంచిక తర�వాత ఈ పేజీలో జరిగిన మార�ప�లన�నీ పోతాయి.</strong>',
+'nonunicodebrowser'                => "'''WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.'''",
+'editingold'                       => "'''హెచ�చ రిక: ఈ పేజీ యొక�క కాలం చెల�లిన సంచికన� మీర� మర�స�త�న�నార�. దీనిని భద�రపరిస�తే, ఆ సంచిక తర�వాత ఈ పేజీలో జరిగిన మార�ప�లన�నీ పోతాయి.'''",
 'yourdiff'                         => 'తేడాల�',
-'copyrightwarning'                 => '{{SITENAME}}క� సమర�పించే అన�ని రచనలూ $2క� లోబడి ప�రచ�రింపబడినట�ల�గా భావించబడతాయి (వివరాలక� $1 చూడండి). మీ రచనలన� ఎవ�వరూ మార�చ రాదనీ లెదా వేరే ఎవ�వరూ వాడ�కో రాదని మీర� భావిస�తే, ఇక�కడ ప�రచ�రించకండి.<br /> మీ స�వీయ రచనన� గాని, సార�వజనీనమైన రచనన�గాని, ఇతర ఉచిత వనర�ల న�ండి సేకరించిన రచనన�గాని మాత�రమే ప�రచ�రిస�త�న�నానని కూడా మీర� ప�రమాణం చేస�త�న�నార�. <strong>కాపీహక�క�ల�గల రచనన� తగిన అన�మతి లేక�ండా సమర�పించకండి!</strong>',
-'copyrightwarning2'                => '{{SITENAME}}లో ప�రచ�రించే రచనలన�నిటినీ ఇతర రచయితల� సరిదిద�దడం, మార�చడం, తొలగించడం చేసే అవకాశం ఉంది. మీ రచనలన� అలా నిర�దాక�షిణ�యంగా దిద�ద�బాట�ల� చెయ�యడం మీకిష�టం లేకపోతే, వాటిని ఇక�కడ ప�రచ�రించకండి. <br />
+'copyrightwarning'                 => "{{SITENAME}}క� సమర�పించే అన�ని రచనలూ $2క� లోబడి ప�రచ�రింపబడినట�ల�గా భావించబడతాయి (వివరాలక� $1 చూడండి). మీ రచనలన� ఎవ�వరూ మార�చ రాదనీ లెదా వేరే ఎవ�వరూ వాడ�కో రాదని మీర� భావిస�తే, ఇక�కడ ప�రచ�రించకండి.<br /> మీ స�వీయ రచనన� గాని, సార�వజనీనమైన రచనన�గాని, ఇతర ఉచిత వనర�ల న�ండి సేకరించిన రచనన�గాని మాత�రమే ప�రచ�రిస�త�న�నానని కూడా మీర� ప�రమాణం చేస�త�న�నార�. '''కాపీహక�క�ల�గల రచనన� తగిన అన�మతి లేక�ండా సమర�పించకండి!'''",
+'copyrightwarning2'                => "{{SITENAME}}లో ప�రచ�రించే రచనలన�నిటినీ ఇతర రచయితల� సరిదిద�దడం, మార�చడం, తొలగించడం చేసే అవకాశం ఉంది. మీ రచనలన� అలా నిర�దాక�షిణ�యంగా దిద�ద�బాట�ల� చెయ�యడం మీకిష�టం లేకపోతే, వాటిని ఇక�కడ ప�రచ�రించకండి. <br />
 ఈ రచనన� మీరే చేసారని, లేదా �దైనా సార�వజనిక వనర� న�ండి కాపీ చేసి తెచ�చారని, లేదా అలాంటి ఉచిత, స�వేచ�ఛా వనర� న�ండి తెచ�చారని మాక� వాగ�దానం చేస�త�న�నార�. (వివరాలక� $1 చూడండి).
-<strong>తగ� అన�మత�ల� లేక�ండా కాపీ హక�క�ల� గల రచనలన� సమర�పించకండి!</strong>',
-'longpagewarning'                  => '<strong>హెచ�చరిక: ఈ పేజీ సైజ� $1  కిలోబైట�ల� ఉంది; 32 kb కంటే పెద�ద పేజీల తోటి కొన�ని బ�రౌజర�ల� ఇబ�బంది పడతాయి. పేజీని చిన�న పేజీల�గా విడగొట�టడానికి అవకాశం ఉందేమో చూడండి. </strong>',
-'longpageerror'                    => '<strong>లోపం: మీర� సమర�పించిన టెక�స�ట�, గరిష�ఠ పరిమితి అయిన $2 కిలోబైట�లన� మించి $1 కిలోబైట�ల పొడవ�ంది. దీన�ని భద�రపరచలేమ�.</strong>',
-'readonlywarning'                  => '<strong>హెచ�చరిక: నిర�వహణ కొరక� డేటాబేస� లాక� చెయ�యబడింది కాబట�టి, మీ మార�ప�ల�, చేర�ప�లన� ఇప�ప�డ� భద�రపరచలేర�. మీ మార�ప�లన� ఒక టెక�స�ట� ఫైల�లోకి కాపీ చేసి, భద�రపరచ�కొని, తర�వాత సమర�పించండి.</strong>',
-'protectedpagewarning'             => '<strong>హెచ�చరిక: ఈ పేజీ సంరక�షించబడినది, నిర�వాహక�ల� మాత�రమే మార�చగలర�. మీర� *** రక�షిత పేజీ మార�గదర�శకాలన� పాటిస�త�న�నారని నిర�ధారించ�కోండి.</strong>',
+'''తగ� అన�మత�ల� లేక�ండా కాపీ హక�క�ల� గల రచనలన� సమర�పించకండి!'''",
+'longpagewarning'                  => "'''హెచ�చరిక: ఈ పేజీ సైజ� $1  కిలోబైట�ల� ఉంది; 32 kb కంటే పెద�ద పేజీల తోటి కొన�ని బ�రౌజర�ల� ఇబ�బంది పడతాయి. పేజీని చిన�న పేజీల�గా విడగొట�టడానికి అవకాశం ఉందేమో చూడండి. '''",
+'longpageerror'                    => "'''లోపం: మీర� సమర�పించిన టెక�స�ట�, గరిష�ఠ పరిమితి అయిన $2 కిలోబైట�లన� మించి $1 కిలోబైట�ల పొడవ�ంది. దీన�ని భద�రపరచలేమ�.'''",
+'readonlywarning'                  => "'''హెచ�చరిక: నిర�వహణ కొరక� డేటాబేస�కి తాళం వేసార�, కాబట�టి మీ మార�ప�చేర�ప�లన� ఇప�ప�డ� భద�రపరచలేర�. మీ మార�ప�లన� ఒక ఫాఠ�య ఫైల�లోకి కాపీ చేసి భద�రపరచ�కొని, తర�వాత సమర�పించండి.'''
+
+తాళం వేసిన నిర�వాహక�డి వివరణ ఇదీ: $1",
+'protectedpagewarning'             => "'''హెచ�చరిక: ఈ పేజీ సంరక�షించబడినది, నిర�వాహక�ల� మాత�రమే మార�చగలర�. మీర� *** రక�షిత పేజీ మార�గదర�శకాలన� పాటిస�త�న�నారని నిర�ధారించ�కోండి.'''",
 'semiprotectedpagewarning'         => "'''గమనిక:''' నమోదయిన సభ�య�ల� మాత�రమే మార�ప�ల� చెయ�యగలిగేలా ఈ పేజీ లాక� చెయ�యబడింది.",
 'cascadeprotectedwarning'          => "'''హెచ�చరిక:''' ఈ పేజీ, కాస�కేడింగ� రక�షణలో ఉన�న కింది {{PLURAL:$1|పేజీ|పేజీల�లో}} ఇంక�లూడ� అయి ఉంది కాబట�టి, నిర�వాహక�ల� తప�ప ఇతర�ల� దిద�ద�బాట� చేసే వీల� లేక�ండా పేజీని లాక� చేసాం:",
-'titleprotectedwarning'            => '<strong>హెచ�చరిక:  కొద�దిమంది వాడ�కర�ల� మాత�రమే సృష�టించగలిగే విధంగా ఈ పేజీకి తాళం వేసార�.</strong>',
+'titleprotectedwarning'            => "హెచ�చరిక:  ఈ పేజీకి సంరక�షించార� కన�క దీన�ని సృష�టించడానికి [[Special:ListGroupRights|ప�రత�యేక హక�క�ల�]] ఉండాలి.'''",
 'templatesused'                    => 'ఈ పేజీలో వాడిన మూసల�:',
 'templatesusedpreview'             => 'ఈ మ�న�జూప�లో వాడిన మూసల�:',
 'templatesusedsection'             => 'ఈ విభాగంలో వాడిన మూసల�:',
@@ -664,12 +682,21 @@ $2',
 'recreate-deleted-warn'            => "'''హెచ�చరిక: ఇంతక� మ�న�ప� ఒకసారి తొలగించిన పేజీని మళ�లీ సృష�టిద�దామని మీర� ప�రయత�నిస�త�న�నార�.'''
 
 ఈ పేజీపై మార�ప�ల� చేసేమ�ంద�, అవి ఇక�కడ ఉండతగినవేనా కాదా అని ఒకసారి ఆలోచించండి.
-మీ సౌలభ�యం కొరక� తొలగింప� లాగ� ఇక�కడ ఇచ�చార�:",
+మీ సౌలభ�యం కొరక� తొలగింప� చిట�టా ఇక�కడ ఇచ�చామ�:",
+'deleted-notice'                   => 'ఈ పేజీని తొలగించార�.
+సమాచారం కొరక� ఈ పేజీ యొక�క తొలగింప� దినచర�యని క�రింద ఇచ�చాం.',
+'deletelog-fulllog'                => 'పూర�తి చిట�టా చూడండి',
+'edit-gone-missing'                => 'పేజీని మార�చలేమ�.
+దీన�ని తొలగించినట�ట�న�నార�.',
+'edit-conflict'                    => 'మార�ప� సంఘర�షణ.',
+'edit-no-change'                   => 'పాఠ�యంలో �మీ మార�ప�ల� లేవ� గనక, మీ మార�ప�ని పట�టించ�కోవట�లేద�.',
+'edit-already-exists'              => 'కొత�త పేజీని సృష�టించలేమ�.
+అది ఇప�పటికే ఉంది.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => 'గమనిక: ఈ పేజీలో ఉన�న పార�సర� సందేశాలన� నిర�వర�తించడానికి చాలా సమయం తీస�క�ంట�ంది.
+'expensive-parserfunction-warning'        => 'హెచ�చరిక: ఈ పేజీలో ఖరీదైన పార�సర� పిల�ప�ల� చాలా ఉన�నాయి.
 
-$2 కంటే తక�క�వ సంఖ�యలో పార�సల� సందేశాల� ఉండాలి, ప�రస�త�తం $1 ఉన�నాయి.',
+పార�సర� {{PLURAL:$2|పిల�ప�|పిల�ప�ల�}} $2 కంటే తక�క�వ ఉండాలి,  ప�రస�త�తం {{PLURAL:$1|$1 పిల�ప� ఉంది|$1  పిల�ప�ల� ఉన�నాయి}}.',
 'expensive-parserfunction-category'       => 'పార�సర� సందేశాల� అధికంగా ఉన�న పేజీల�',
 'post-expand-template-inclusion-warning'  => 'హెచ�చరిక: మూస చేర�ప� సైజూ చాలా పెద�దదిగా ఉంది.
 కొన�ని మూసలన� చేర�చమ�.',
@@ -691,28 +718,28 @@ $2 కంటే తకà±�à°•à±�à°µ సంఖà±�యలో పారà±�సలà±� à
 $3 చెప�పిన కారణం: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'ఈ పేజీకి సంబంధించిన లాగ�‌లన� చూడండి',
-'nohistory'           => 'ఈ పేజీకి మార�ప�ల చరిత�ర లేద�.',
-'revnotfound'         => 'సంచిక కనబడలేద�',
-'revnotfoundtext'     => 'మీరడిగిన పేజీ పాత కూర�ప� దొరకలేద�. ఆ పేజీ కోసం మీర� వాడిన URLన� సరిచూస�కోండి.',
-'currentrev'          => 'ప�రస�త�తప� సంచిక',
-'revisionasof'        => '$1 నాటి సంచిక',
-'revision-info'       => '$1 నాటి కూర�ప�. రచయిత: $2',
-'previousrevision'    => '�పాత సంచిక',
-'nextrevision'        => 'దీని తర�వాతి సంచిక→',
-'currentrevisionlink' => 'ప�రస�త�తప� సంచిక',
-'cur'                 => 'ప�రస�త�త',
-'next'                => 'తర�వాయి',
-'last'                => 'à°—à°¤',
-'page_first'          => 'మొదటి',
-'page_last'           => 'చివరి',
-'histlegend'          => 'తేడా ఎంపిక: సంచికల యొక�క రేడియో బాక�స�లన� ఎంచ�కొని ఎంటర�‌ నొక�కండి, లేదా పైన/ కింద ఉన�న మీటన� నొక�కండి.<br />
+'viewpagelogs'           => 'ఈ పేజీకి సంబంధించిన లాగ�‌లన� చూడండి',
+'nohistory'              => 'ఈ పేజీకి మార�ప�ల చరిత�ర లేద�.',
+'currentrev'             => 'ప�రస�త�తప� సంచిక',
+'currentrev-asof'        => '$1 నాటి ప�రస�త�త కూర�ప�',
+'revisionasof'           => '$1 నాటి సంచిక',
+'revision-info'          => '$1 నాటి కూర�ప�. రచయిత: $2', # Additionally available: $3: revision id
+'previousrevision'       => '�పాత సంచిక',
+'nextrevision'           => 'దీని తర�వాతి సంచిక→',
+'currentrevisionlink'    => 'ప�రస�త�తప� సంచిక',
+'cur'                    => 'ప�రస�త�త',
+'next'                   => 'తర�వాయి',
+'last'                   => 'à°—à°¤',
+'page_first'             => 'మొదటి',
+'page_last'              => 'చివరి',
+'histlegend'             => 'తేడా ఎంపిక: సంచికల యొక�క రేడియో బాక�స�లన� ఎంచ�కొని ఎంటర�‌ నొక�కండి, లేదా పైన/ కింద ఉన�న మీటన� నొక�కండి.<br />
 సూచిక: (ప�రస�త�త) = ప�రస�త�త సంచికతో కల తేడాల�, (గత) = ఇంతక� మ�ందరి సంచికతో గల తేడాల�, చి = చిన�న మార�ప�',
-'deletedrev'          => '[తొలగించబడినది]',
-'histfirst'           => 'తొట�టతొలి',
-'histlast'            => 'చిట�టచివరి',
-'historysize'         => '({{PLURAL:$1|ఒక బైట�|$1 బైట�ల�}})',
-'historyempty'        => '(ఖాళీ)',
+'history-fieldset-title' => 'చరిత�రలో చూడండి',
+'deletedrev'             => '[తొలగించబడినది]',
+'histfirst'              => 'తొట�టతొలి',
+'histlast'               => 'చిట�టచివరి',
+'historysize'            => '({{PLURAL:$1|ఒక బైట�|$1 బైట�ల�}})',
+'historyempty'           => '(ఖాళీ)',
 
 # Revision feed
 'history-feed-title'          => 'కూర�ప�ల చరిత�ర',
@@ -727,12 +754,12 @@ $3 చెప�పిన కారణం: ''$2''",
 'rev-deleted-user'            => '(సభ�యనామాన�ని తొలగించాం)',
 'rev-deleted-event'           => '(దినచర�యని తొలగించాం)',
 'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">
-సార�వజనిక సంగ�రహం న�ండి ఈ పేజీ కూర�ప�న� తొలగించాం.
-[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} తొలగింప� లాగ�]లో వివరాల� ఉండవచ�చ�.</div>',
+సార�వజనిక భండారాల న�ండి ఈ పేజీ కూర�ప�న� తొలగించాం.
+[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} తొలగింప� చిట�టా]లో వివరాల� ఉండవచ�చ�.</div>',
 'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">
-సార�వజనిక సంగ�రహం న�ండి ఈ పేజీ కూర�ప�న� తొలగించాం.
+సార�వజనిక భండారాల న�ండి ఈ పేజీ కూర�ప�న� తొలగించాం.
 {{SITENAME}} లో నిర�వాహక�డిగా మీర� దాన�ని చూడవచ�చ�;
-[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} తొలగింప� లాగ�]లో వివరాల� ఉండవచ�చ�.</div>',
+[{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} తొలగింప� చిట�టా]లో వివరాల� ఉండవచ�చ�.</div>',
 'rev-delundel'                => 'చూపించ�/దాచ�',
 'revisiondelete'              => 'కూర�ప�లన� తొలగించ�/తొలగింప�న� రద�ద�చెయ�యి',
 'revdelete-nooldid-title'     => 'తప�ప�డ� లక�ష�యప� కూర�ప�',
@@ -751,7 +778,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'revdelete-suppress'          => 'డేటాన� అందరిలాగే నిర�వాహక�లక� కూడా కనబడనివ�వక�',
 'revdelete-hide-image'        => 'ఫైల�లోని విషయాన�ని దాచ�',
 'revdelete-unsuppress'        => 'ప�నస�థాపిత కూర�ప�లపై నిబంధనలన� తీసివెయ�యి',
-'revdelete-log'               => 'లాగ� వ�యాఖ�య:',
+'revdelete-log'               => 'చిట�టా వ�యాఖ�య:',
 'revdelete-submit'            => 'ఎంచ�క�న�న కూర�ప�క� అమల� చెయ�యి',
 'revdelete-logentry'          => '[[$1]] కూర�ప� కనబడే విధానాన�ని మార�చాం',
 'logdelete-logentry'          => '[[$1]] ఘటన కనబడే విధానాన�ని మార�చాం',
@@ -771,7 +798,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'logdelete-log-message'       => '$2 {{PLURAL:$2|ఘటన|ఘటనల}}క� $1',
 
 # Suppression log
-'suppressionlog'     => 'అణచివేత లాగ�',
+'suppressionlog'     => 'అణచివేతల చిట�టా',
 'suppressionlogtext' => 'నిర�వాహక�లక� కనబడని విషయం కలిగిన తొలగింప�ల�, నిరోధాల జాబితా ఇది. 
 ప�రస�త�తం అమల�లో ఉన�న నిషేధాల�, నిరోధాల జాబితా కోసం [[Special:IPBlockList|�పీ నిరోధాల జాబితా]] చూడండి.',
 
@@ -795,6 +822,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'mergehistory-invalid-destination' => 'గమ�యం పేజీకి సరైన పేర� ఉండాలి.',
 'mergehistory-autocomment'         => '[[:$1]]ని [[:$2]] లోనికి విలీనం చేసార�',
 'mergehistory-comment'             => '[[:$1]]ని [[:$2]] లోనికి విలీనం చేసార�: $3',
+'mergehistory-same-destination'    => 'మూల మరియ� గమ�యస�థాన పేజీల� ఒకటే కాకూడద�',
 
 # Merge log
 'mergelog'           => 'లాగ�‌న� విలీనం చెయ�యి',
@@ -807,119 +835,161 @@ $3 చెప�పిన కారణం: ''$2''",
 'difference'              => '(సంచికల మధ�య తేడా)',
 'lineno'                  => 'లైన� $1:',
 'compareselectedversions' => 'ఎంచ�క�న�న సంచికలన� పోల�చిచూడ�',
+'visualcomparison'        => 'దృశ�యరూప పోలిక',
+'wikicodecomparison'      => 'వికీపాఠ�య పోలిక',
 'editundo'                => 'దిద�ద�బాట� రద�ద�చెయ�యి',
 'diff-multi'              => '(మధ�యలో ఉన�న {{PLURAL:$1|ఒక కూర�ప�న�|$1 కూర�ప�లన�}} చూపించటం లేద�.)',
+'diff-movedto'            => '$1కి తరలించార�',
+'diff-styleadded'         => '$1 శైలిని చేర�చార�',
+'diff-added'              => '$1 చేర�చార�',
+'diff-changedto'          => '$1కి మార�చార�',
+'diff-movedoutof'         => '$1 న�ండి తరలించార�',
+'diff-styleremoved'       => '$1 శైలిని తొలగించార�',
+'diff-removed'            => '$1ని తొలగించార�',
+'diff-changedfrom'        => '$1 న�ండి మార�చార�',
+'diff-src'                => 'మూలం',
+'diff-withdestination'    => '$1 గమ�యస�థానంతో',
+'diff-with'               => '&#32;$1 తో $2',
+'diff-with-final'         => '&#32;మరియ� $1 $2',
+'diff-width'              => 'వెడల�ప�',
+'diff-height'             => 'ఎత�త�',
+'diff-table'              => "ఒక '''పట�టిక'''",
+'diff-i'                  => "'''వాల�'''",
+'diff-b'                  => "'''బొద�ద�'''",
 
 # Search results
-'searchresults'             => 'అన�వేషణ ఫలితాల�',
-'searchresulttext'          => '{{SITENAME}}లో అన�వేషించే విషయమై మరింత సమాచారం కొరక� [[{{MediaWiki:Helppage}}|{{int:help}}]] చూడండి.',
-'searchsubtitle'            => "మీర� '''[[:$1]]''' కోసం వెతికార�",
-'searchsubtitleinvalid'     => "మీర� '''$1''' కోసం వెతికార�",
-'noexactmatch'              => "'''\"\$1\" శీర�షికతొ పేజీలేమీలేవ�.''' మీర� ఈ శీర�షికతొ పేజీని [[:\$1|సృష�టించవచ�చ�]].",
-'noexactmatch-nocreate'     => "'''\"\$1\" అనే పేర�తో పేజీ లేద�.'''",
-'toomanymatches'            => 'చాలా పోలికల� వచ�చాయి, దయచేసి మరో ప�రశ�నని ప�రయత�నించండి',
-'titlematches'              => 'వ�యాస శీర�షిక సరిపోయింది',
-'notitlematches'            => 'పేజీ పేర� సరిపోలడం లేద�',
-'textmatches'               => 'పేజిలోని పాఠం సరిపోలింది',
-'notextmatches'             => 'పేజీ పాఠ�యమేదీ సరిపోలడం లేద�',
-'prevn'                     => 'క�రితం $1',
-'nextn'                     => 'తర�వాతి $1',
-'viewprevnext'              => '($1) ($2) ($3) చూపించ�.',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 పదం|$2 పదాల�}})',
-'search-result-score'       => 'సంబంధం: $1%',
-'search-redirect'           => '(దారిమార�ప� $1)',
-'search-section'            => '(విభాగం $1)',
-'search-suggest'            => 'మీర� అంట�న�నది ఇదా: $1',
-'search-interwiki-caption'  => 'సోదర ప�రాజెక�ట�ల�',
-'search-interwiki-default'  => '$1 ఫలితాల�:',
-'search-interwiki-more'     => '(మరిన�ని)',
-'search-mwsuggest-enabled'  => 'సూచనలతో',
-'search-mwsuggest-disabled' => 'సూచనల� వద�ద�',
-'search-relatedarticle'     => 'సంబంధించినవి',
-'mwsuggest-disable'         => 'AJAX సూచనలన� అచేతనంచేయి',
-'searchrelated'             => 'సంబంధించినవి',
-'searchall'                 => 'అన�నీ',
-'showingresults'            => "కింద ఉన�న {{PLURAL:$1|'''ఒక�క''' ఫలితం|'''$1''' ఫలితాల�}}, #'''$2''' న�ండి మొదల�కొని చూపిస�త�న�నాం.",
-'showingresultsnum'         => "కింద ఉన�న {{PLURAL:$3|'''ఒక�క''' ఫలితం|'''$3''' ఫలితాల�}}, #'''$2''' న�ండి మొదల�కొని చూపిస�త�న�నాం.",
-'showingresultstotal'       => "{{PLURAL:$3|ఒకే ఒక�క ఫలితాన�ని|'''$3'''లో '''$1 - $2''' ఫలితాలన�}} క�రింద చూపిస�త�న�నాం",
-'nonefound'                 => "'''గమనిక''': డిఫాల�ట�గా కొన�ని నేమ�‌స�పేస�ల�లో మాత�రమే వెత�క�తాం. చర�చాపేజీల�, మూసల� మొదలైన వాటితో సహా ఆన�ని నేమ�‌స�పేస�ల�లోన� వెతికేంద�క� మీ అన�వేషకానికి మ�ంద� ''all:'' అనే పదం ఉంచండి. లేదా మీర� వెతకదలచిన నేమ�‌స�పేస�న� ఆదిపదంగా పెట�టండి.",
-'powersearch'               => 'నిశితంగా వెత�క�',
-'powersearch-legend'        => 'నిశితమైన అన�వేషణ',
-'powersearch-ns'            => 'ఈ నేమ�‌స�పేస�ల�లో వెత�క�:',
-'powersearch-redir'         => 'దారిమార�ప�లన� చూపించ�',
-'powersearch-field'         => 'దీని కోసం వెత�క�:',
-'search-external'           => 'బయటి అన�వేషణ',
-'searchdisabled'            => '{{SITENAME}} అన�వేషణ తాత�కాలికంగా పని చెయ�యడం లేద�. ఈలోగా మీర� గూగ�ల�‌ ఉపయోగించి అన�వేషించవచ�చ�. ఒక గమనిక: గూగ�ల�‌ ద�వారా కాలదోషం పట�టిన ఫలితాల� రావడానికి అవకాశం ఉంది.',
+'searchresults'                    => 'అన�వేషణ ఫలితాల�',
+'searchresults-title'              => '"$1"కి అన�వేషణ ఫలితాల�',
+'searchresulttext'                 => '{{SITENAME}}లో అన�వేషించే విషయమై మరింత సమాచారం కొరక� [[{{MediaWiki:Helppage}}|{{int:help}}]] చూడండి.',
+'searchsubtitle'                   => 'మీర� \'\'\'[[:$1]]\'\'\' కోసం వెతికార� ([[Special:Prefixindex/$1|"$1"తో మొదలయ�యే అన�ని పేజీల�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1"కి లింక� ఉన�న అన�ని పేజీల�]])',
+'searchsubtitleinvalid'            => "మీర� '''$1''' కోసం వెతికార�",
+'noexactmatch'                     => "'''\"\$1\" శీర�షికతొ పేజీలేమీలేవ�.''' మీర� ఈ శీర�షికతొ పేజీని [[:\$1|సృష�టించవచ�చ�]].",
+'noexactmatch-nocreate'            => "'''\"\$1\" అనే పేర�తో పేజీ లేద�.'''",
+'toomanymatches'                   => 'చాలా పోలికల� వచ�చాయి, దయచేసి మరో ప�రశ�నని ప�రయత�నించండి',
+'titlematches'                     => 'వ�యాస శీర�షిక సరిపోయింది',
+'notitlematches'                   => 'పేజీ పేర� సరిపోలడం లేద�',
+'textmatches'                      => 'పేజిలోని పాఠం సరిపోలింది',
+'notextmatches'                    => 'పేజీ పాఠ�యమేదీ సరిపోలడం లేద�',
+'prevn'                            => 'క�రితం $1',
+'nextn'                            => 'తర�వాతి $1',
+'viewprevnext'                     => '($1) ($2) ($3) చూపించ�.',
+'searchmenu-legend'                => 'అన�వేషణ ఎంపికల�',
+'searchmenu-exists'                => "'''ఈ వికీలో \"[[:\$1]]\" అనే పేజీ ఉంది'''",
+'searchmenu-new'                   => "'''ఈ వికీలో \"[[:\$1]]\" అనే పేర�తో పేజీని సృష�టించ�!'''",
+'searchhelp-url'                   => 'Help:సూచిక',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|ఈ ఉపసర�గ ఉన�న పేజీలన� చూడండి]]',
+'searchprofile-articles'           => 'విషయప� పేజీల�',
+'searchprofile-articles-and-proj'  => 'విషయప� & ప�రాజెక�ట� పేజీల�',
+'searchprofile-project'            => 'ప�రాజెక�ట� పేజీల�',
+'searchprofile-images'             => 'ఫైళ�ళ�',
+'searchprofile-everything'         => 'ప�రతీ ఒక�కటీ',
+'searchprofile-advanced'           => 'ఉన�నత',
+'searchprofile-articles-tooltip'   => '$1 లలో వెతకండి',
+'searchprofile-project-tooltip'    => '$1 లలో వెతకండి',
+'searchprofile-images-tooltip'     => 'పైళ�ళ కోసం వెతకండి',
+'searchprofile-everything-tooltip' => 'అన�ని చోట�లా (చర�చా పేజీలతో సహా) వెతకండి',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 పదం|$2 పదాల�}})',
+'search-result-score'              => 'సంబంధం: $1%',
+'search-redirect'                  => '(దారిమార�ప� $1)',
+'search-section'                   => '(విభాగం $1)',
+'search-suggest'                   => 'మీర� అంట�న�నది ఇదా: $1',
+'search-interwiki-caption'         => 'సోదర ప�రాజెక�ట�ల�',
+'search-interwiki-default'         => '$1 ఫలితాల�:',
+'search-interwiki-more'            => '(మరిన�ని)',
+'search-mwsuggest-enabled'         => 'సూచనలతో',
+'search-mwsuggest-disabled'        => 'సూచనల� వద�ద�',
+'search-relatedarticle'            => 'సంబంధించినవి',
+'mwsuggest-disable'                => 'AJAX సూచనలన� అచేతనంచేయి',
+'searchrelated'                    => 'సంబంధించినవి',
+'searchall'                        => 'అన�నీ',
+'showingresults'                   => "కింద ఉన�న {{PLURAL:$1|'''ఒక�క''' ఫలితం|'''$1''' ఫలితాల�}}, #'''$2''' న�ండి మొదల�కొని చూపిస�త�న�నాం.",
+'showingresultsnum'                => "కింద ఉన�న {{PLURAL:$3|'''ఒక�క''' ఫలితం|'''$3''' ఫలితాల�}}, #'''$2''' న�ండి మొదల�కొని చూపిస�త�న�నాం.",
+'showingresultstotal'              => "{{PLURAL:$4|'''$3'''లోని '''$1''' ఫలితాన�ని|'''$3'''లో '''$1 - $2''' ఫలితాలన�}} క�రింద చూపిస�త�న�నాం",
+'nonefound'                        => "'''గమనిక''': డిఫాల�ట�గా కొన�ని నేమ�‌స�పేస�ల�లో మాత�రమే వెత�క�తాం. చర�చాపేజీల�, మూసల� మొదలైన వాటితో సహా ఆన�ని నేమ�‌స�పేస�ల�లోన� వెతికేంద�క� మీ అన�వేషకానికి మ�ంద� ''all:'' అనే పదం ఉంచండి. లేదా మీర� వెతకదలచిన నేమ�‌స�పేస�న� ఆదిపదంగా పెట�టండి.",
+'search-nonefound'                 => 'మీ ప�రశ�నకి సరిపోలిన ఫలితాలేమీ లేవ�.',
+'powersearch'                      => 'నిశితంగా వెత�క�',
+'powersearch-legend'               => 'నిశితమైన అన�వేషణ',
+'powersearch-ns'                   => 'ఈ నేమ�‌స�పేస�ల�లో వెత�క�:',
+'powersearch-redir'                => 'దారిమార�ప�లన� చూపించ�',
+'powersearch-field'                => 'దీని కోసం వెత�క�:',
+'search-external'                  => 'బయటి అన�వేషణ',
+'searchdisabled'                   => '{{SITENAME}} అన�వేషణ తాత�కాలికంగా పని చెయ�యడం లేద�. ఈలోగా మీర� గూగ�ల�‌ ఉపయోగించి అన�వేషించవచ�చ�. ఒక గమనిక: గూగ�ల�‌ ద�వారా కాలదోషం పట�టిన ఫలితాల� రావడానికి అవకాశం ఉంది.',
 
 # Preferences page
-'preferences'              => 'అభిర�చ�ల�',
-'mypreferences'            => 'నా అభిర�చ�ల�',
-'prefs-edits'              => 'దిద�ద�బాట�ల సంఖ�య:',
-'prefsnologin'             => 'లాగిన�‌ అయిలేర�',
-'prefsnologintext'         => 'వాడ�కరి అభిర�చ�లన� మార�చ�కోడానికి, మీర� <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} లోనికి ప�రవేశించి]</span> ఉండాలి.',
-'prefsreset'               => 'ఇదివరకటి అభిర�చ�ల� ప�నర�ధ�ధరించబడ�డాయి.',
-'qbsettings'               => 'క�విక�‌బార�',
-'qbsettings-none'          => '�దీకాద�',
-'qbsettings-fixedleft'     => 'స�థిర ఎడమ',
-'qbsettings-fixedright'    => 'స�థిర క�డి',
-'qbsettings-floatingleft'  => 'ఎడమక� ఒదిగి',
-'qbsettings-floatingright' => 'క�డికి ఒదిగి',
-'changepassword'           => 'సంకేతపదం మార�చండి',
-'skin'                     => 'తొడ�గ�',
-'math'                     => 'గణితం',
-'dateformat'               => 'తేదీ ఆకృతి',
-'datedefault'              => '�దైనా పరవాలేద�',
-'datetime'                 => 'తేదీ, సమయం',
-'math_failure'             => 'పార�స� చెయ�యలేకపోయాం',
-'math_unknown_error'       => 'గ�ర�త�తెలియని పొరపాట�',
-'math_unknown_function'    => 'తెలియని ఫంక�షన�',
-'math_lexing_error'        => 'లెక�సింగ� లోపం',
-'math_syntax_error'        => 'సింటాక�స� లోపం',
-'math_image_error'         => 'PNG మార�పిడి విఫలమైంది; latex, dvips, gs ల� సరిగా ఇన�‌స�టాల� అయ�యాయో లేదో చూసి, అప�ప�డ� మార�చండి',
-'math_bad_tmpdir'          => 'math తాత�కాలిక డైరెక�టరీని సృష�టించలేకపోడం కానీ, అంద�లో రాయలేకపోవడంగానీ జరిగింది',
-'math_bad_output'          => 'math ఔట�‌ప�ట� డైరెక�టరీని సృష�టించలేకపోడం కానీ, అంద�లో రాయలేకపోవడంగానీ జరిగింది',
-'math_notexvc'             => 'texvc ఎక�జిక�యూటబ�ల� కనబడడం లేద�; కాన�ఫిగర� చెయ�యడానికి math/README చూడండి.',
-'prefs-personal'           => 'సభ�య�ని వివరాల�',
-'prefs-rc'                 => 'ఇటీవలి మార�ప�ల�, మొలకల�',
-'prefs-watchlist'          => 'వీక�షణ జాబితా',
-'prefs-watchlist-days'     => 'వీక�షణ జాబితాలో చూపించవలసిన రోజ�ల�:',
-'prefs-watchlist-edits'    => 'విస�తృత వీక�షణ జాబితాలో చూపించవలసిన దిద�ద�బాట�ల�:',
-'prefs-misc'               => 'ఇతరాల�',
-'saveprefs'                => 'భధ�రపరచ�',
-'resetprefs'               => 'మ�న�పటి వలె',
-'oldpassword'              => 'పాత సంకేతపదమ�',
-'newpassword'              => 'కొత�త సంకేతపదమ�',
-'retypenew'                => 'సంకేతపదం, మళ�ళీ',
-'textboxsize'              => 'మార�ప�ల�',
-'rows'                     => 'వర�సల�',
-'columns'                  => 'వర�సల�:',
-'searchresultshead'        => 'అన�వేషణ',
-'resultsperpage'           => 'పేజీకి ఫలితాల�:',
-'contextlines'             => 'హిట�ట�క� లైన�ల�:',
-'contextchars'             => 'లైన�క� సందర�భాల�:',
-'stub-threshold'           => '<a href="#" class="stub">మొలక లింక�</a> ఫార�మాటింగ� కొరక� హద�ద� (బైట�ల�):',
-'recentchangesdays'        => 'ఇటీవలి మార�ప�ల� లో చూపించవలసిన రోజ�ల�:',
-'recentchangescount'       => 'ఇటీవలి మార�ప�ల�, చరిత�ర మరియ� చిట�టా పేజీలలో చూపించాల�సిన మార�ప�ల సంఖ�య:',
-'savedprefs'               => 'మీ అభిర�చ�ల� భద�రపరచబడ�డయి.',
-'timezonelegend'           => 'టైం జోన�',
-'timezonetext'             => '¹సర�వర� సమయానికి (య�.టీ.సీ.), మీ స�థానిక సమయానికి మధ�య గల తేడా, గంటల�లో.',
-'localtime'                => 'స�థానిక సమయం',
-'timezoneoffset'           => 'తేడా¹',
-'servertime'               => 'సర�వర� సమయం',
-'guesstimezone'            => 'తేడాన� బ�రౌజర� న�ండి తీస�కో',
-'allowemail'               => 'ఇతర సభ�య�ల న�ండి ఈ-మెయిల� రానివ�వ�',
-'prefs-searchoptions'      => 'అన�వేషణ ఎంపికల�',
-'prefs-namespaces'         => 'పేర�బర�ల�',
-'defaultns'                => 'డిఫాల�ట�గా ఈ నేంస�పేస�లలో అన�వేషించ�:',
-'default'                  => 'డిఫాల�ట�',
-'files'                    => 'ఫైళ�ళ�',
+'preferences'               => 'అభిర�చ�ల�',
+'mypreferences'             => 'నా అభిర�చ�ల�',
+'prefs-edits'               => 'దిద�ద�బాట�ల సంఖ�య:',
+'prefsnologin'              => 'లాగిన�‌ అయిలేర�',
+'prefsnologintext'          => 'వాడ�కరి అభిర�చ�లన� మార�చ�కోడానికి, మీర� <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} లోనికి ప�రవేశించి]</span> ఉండాలి.',
+'prefsreset'                => 'ఇదివరకటి అభిర�చ�ల� ప�నర�ధ�ధరించబడ�డాయి.',
+'qbsettings'                => 'క�విక�‌బార�',
+'qbsettings-none'           => '�దీకాద�',
+'qbsettings-fixedleft'      => 'స�థిర ఎడమ',
+'qbsettings-fixedright'     => 'స�థిర క�డి',
+'qbsettings-floatingleft'   => 'ఎడమక� ఒదిగి',
+'qbsettings-floatingright'  => 'క�డికి ఒదిగి',
+'changepassword'            => 'సంకేతపదం మార�చండి',
+'skin'                      => 'తొడ�గ�',
+'skin-preview'              => 'మ�న�జూప�/సరిచూడ�',
+'math'                      => 'గణితం',
+'dateformat'                => 'తేదీ ఆకృతి',
+'datedefault'               => '�దైనా పరవాలేద�',
+'datetime'                  => 'తేదీ, సమయం',
+'math_failure'              => 'పార�స� చెయ�యలేకపోయాం',
+'math_unknown_error'        => 'గ�ర�త�తెలియని పొరపాట�',
+'math_unknown_function'     => 'తెలియని ఫంక�షన�',
+'math_lexing_error'         => 'లెక�సింగ� లోపం',
+'math_syntax_error'         => 'సింటాక�స� లోపం',
+'math_image_error'          => 'PNG మార�పిడి విఫలమైంది; latex, dvips, gs ల� సరిగా ఇన�‌స�టాల� అయ�యాయో లేదో చూసి, అప�ప�డ� మార�చండి',
+'math_bad_tmpdir'           => 'math తాత�కాలిక డైరెక�టరీని సృష�టించలేకపోడం కానీ, అంద�లో రాయలేకపోవడంగానీ జరిగింది',
+'math_bad_output'           => 'math ఔట�‌ప�ట� డైరెక�టరీని సృష�టించలేకపోడం కానీ, అంద�లో రాయలేకపోవడంగానీ జరిగింది',
+'math_notexvc'              => 'texvc ఎక�జిక�యూటబ�ల� కనబడడం లేద�; కాన�ఫిగర� చెయ�యడానికి math/README చూడండి.',
+'prefs-personal'            => 'సభ�య�ని వివరాల�',
+'prefs-rc'                  => 'ఇటీవలి మార�ప�ల�, మొలకల�',
+'prefs-watchlist'           => 'వీక�షణ జాబితా',
+'prefs-watchlist-days'      => 'వీక�షణ జాబితాలో చూపించవలసిన రోజ�ల�:',
+'prefs-watchlist-days-max'  => '(7 రోజ�ల� గరిష�ఠం)',
+'prefs-watchlist-edits'     => 'విస�తృత వీక�షణ జాబితాలో చూపించవలసిన దిద�ద�బాట�ల�:',
+'prefs-watchlist-edits-max' => '(గరిష�ఠ సంఖ�య: 1000)',
+'prefs-misc'                => 'ఇతరాల�',
+'prefs-resetpass'           => 'సంకేతపదాన�ని మార�చ�కోండి',
+'saveprefs'                 => 'భధ�రపరచ�',
+'resetprefs'                => 'మ�న�పటి వలె',
+'textboxsize'               => 'మార�ప�ల�',
+'prefs-edit-boxsize'        => 'మార�ప�ల కిటికీ యొక�క పరిమాణం.',
+'rows'                      => 'వర�సల�',
+'columns'                   => 'వర�సల�:',
+'searchresultshead'         => 'అన�వేషణ',
+'resultsperpage'            => 'పేజీకి ఫలితాల�:',
+'contextlines'              => 'హిట�ట�క� లైన�ల�:',
+'contextchars'              => 'లైన�క� సందర�భాల�:',
+'stub-threshold'            => '<a href="#" class="stub">మొలక లింక�</a> ఫార�మాటింగ� కొరక� హద�ద� (బైట�ల�):',
+'recentchangesdays'         => 'ఇటీవలి మార�ప�ల� లో చూపించవలసిన రోజ�ల�:',
+'recentchangesdays-max'     => '($1 {{PLURAL:$1|రోజ�|రోజ�ల�}} గరిష�ఠం)',
+'recentchangescount'        => 'ఇటీవలి మార�ప�ల�, పేజీల చరిత�ర మరియ� చిట�టా పేజీలలో అప�రమేయంగా చూపించాల�సిన మార�ప�ల సంఖ�య:',
+'savedprefs'                => 'మీ అభిర�చ�ల� భద�రపరచబడ�డయి.',
+'timezonelegend'            => 'టైం జోన�',
+'timezonetext'              => '¹సర�వర� సమయానికి (య�.టీ.సీ.), మీ స�థానిక సమయానికి మధ�య గల తేడా, గంటల�లో.',
+'localtime'                 => 'స�థానిక సమయం:',
+'timezoneselect'            => 'కాల మండలం:',
+'timezoneuseserverdefault'  => 'సర�వర� అమరికని వాడ�',
+'timezoneuseoffset'         => 'ఇతర (తేడాని ఇవ�వండి)',
+'timezoneoffset'            => 'తేడా¹:',
+'servertime'                => 'సర�వర� సమయం:',
+'guesstimezone'             => 'తేడాన� బ�రౌజర� న�ండి తీస�కో',
+'allowemail'                => 'ఇతర సభ�య�ల న�ండి ఈ-మెయిల� రానివ�వ�',
+'prefs-searchoptions'       => 'అన�వేషణ ఎంపికల�',
+'prefs-namespaces'          => 'పేర�బర�ల�',
+'defaultns'                 => 'డిఫాల�ట�గా ఈ నేంస�పేస�లలో అన�వేషించ�:',
+'default'                   => 'డిఫాల�ట�',
+'files'                     => 'ఫైళ�ళ�',
 
 # User rights
 'userrights'                  => 'సభ�య�ల హక�క�ల మేనేజిమెంట�', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'సభ�య�ల సమూహాలన� మేనేజి చెయ�యండి',
 'userrights-user-editname'    => 'సభ�యనామాన�ని ఇవ�వండి:',
 'editusergroup'               => 'వాడ�కరి గ�ంప�లన� మార�చ�',
-'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) అనే పేర�గల సభ�య�నికి హక�క�లన� మార�స�త�న�నామ�.",
+'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) అనే పేర�గల సభ�య�నికి హక�క�లన� మార�స�త�న�నామ�.",
 'userrights-editusergroup'    => 'సభ�య�ల సమూహాలన� మార�చండి',
 'saveusergroups'              => 'వాడ�కరి గ�ంప�లన� భద�రపరచ�',
 'userrights-groupsmember'     => 'సభ�య�ల�:',
@@ -968,6 +1038,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'right-minoredit'            => 'మార�ప�ని చిన�నదిగా గ�ర�తించడం',
 'right-move'                 => 'పేజీలన� తరలించడం',
 'right-move-subpages'        => 'పేజీలన� వాటి ఉపపేజీలతో బాట�గా తరలించడం',
+'right-movefile'             => 'ఫైళ�ళన� తరలించడం',
 'right-suppressredirect'     => 'పేజీని తరలించేటప�డ� పాత పేర� న�ండి దారిమార�ప�న� సృష�టించక�ండా ఉండటం',
 'right-upload'               => 'ఫైళ�ళన� ఎగ�మతి చేయడం',
 'right-reupload'             => 'ఇప�పటికే ఉన�న ఫైల�న� తిరగరాయి',
@@ -1013,14 +1084,48 @@ $3 చెప�పిన కారణం: ''$2''",
 'right-siteadmin'            => 'డేటాబేస�న� లాక�, అన�‌లాక� చెయ�యి',
 
 # User rights log
-'rightslog'      => 'సభ�య�ల హక�క�ల లాగ�',
-'rightslogtext'  => 'ఇది సభ�య�ల హక�క�లక� చేసిన మార�ప�ల లాగ�.',
+'rightslog'      => 'వాడ�కర�ల హక�క�ల మార�ప�ల చిట�టా',
+'rightslogtext'  => 'ఇది వాడ�కర�ల హక�క�లక� జరిగిన మార�ప�ల చిట�టా.',
 'rightslogentry' => '$1 గారి సభ�యత�వ గ�ంప�న� $2 న�ండి $3 కి మార�చార�',
 'rightsnone'     => '(�మీలేవ�)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'ఈ పేజీని చూసే',
+'action-edit'                 => 'ఈ పేజీని మార�చే',
+'action-createpage'           => 'పేజీలన� సృష�టించే',
+'action-createtalk'           => 'చర�చాపేజీలన� సృష�టించే',
+'action-createaccount'        => 'ఈ వాడ�కరి ఖాతాని సృష�టించే',
+'action-minoredit'            => 'ఈ మార�ప�ని చిన�నదానిగా గ�ర�తించే',
+'action-move'                 => 'ఈ పేజీని తరలించే',
+'action-move-subpages'        => 'ఈ పేజీని మరియ� దీని ఉపపేజీలన� తరలించే',
+'action-movefile'             => 'ఈ ఫైల�ని తరలించే',
+'action-upload'               => 'ఈ ఫైల�ని ఎగ�మతి చేసే',
+'action-reupload'             => 'ఈ ఫైల�ని తిరగవ�రాసే',
+'action-upload_by_url'        => 'ఈ ఫైల�ని URL చిర�నామా న�ండి ఎగ�మతి చేసే',
+'action-delete'               => 'ఈ పేజీని తొలగించే',
+'action-deleterevision'       => 'ఈ కూర�ప�ని తొలగించే',
+'action-deletedhistory'       => 'ఈ పేజీ యొక�క తొలగించిన చరిత�రని చూసే',
+'action-browsearchive'        => 'తొలగించిన పేజీలలో వెతికే',
+'action-undelete'             => 'ఈ పేజీని ప�నఃస�థాపించే',
+'action-suppressrevision'     => 'ఈ దాచిన కూర�ప�ని సమీక�షించి ప�నఃస�థాపించే',
+'action-suppressionlog'       => 'ఈ అంతరంగిక చిట�టాన� చూసే',
+'action-block'                => 'ఈ వాడ�కరిని మార�ప�ల� చేయడం న�ండి నిరోధించే',
+'action-protect'              => 'ఈ పేజీకి సంరక�షణా స�థాయిని మార�చే',
+'action-import'               => 'మరో వికీ న�ండి ఈ పేజీని దిగ�మతి చేసే',
+'action-importupload'         => 'ఎగ�మతి చేసిన ఫైల� న�ండి ఈ పేజీలోనికి దిగ�మతి చేసే',
+'action-patrol'               => 'ఇతర�ల మార�ప�లన� పర�యవేక�షించినవిగా గ�ర�తించే',
+'action-autopatrol'           => 'మీ మార�ప�లన� పర�యవేక�షించినవిగా గ�ర�తించే',
+'action-unwatchedpages'       => 'వీక�షణలో లేని పేజీల జాబితాని చూసే',
+'action-trackback'            => 'ట�రాక�బ�యాక�ని దాఖల�చేసే',
+'action-mergehistory'         => 'ఈ పేజీ యొక�క చరిత�రని విలీనం చేసే',
+'action-userrights'           => 'అందర� వాడ�కర�ల హక�క�లన� మార�చే',
+'action-userrights-interwiki' => 'ఇతర వికీలలో వాడ�కర�ల యొక�క హక�క�లన� మార�చే',
+'action-siteadmin'            => 'డాటాబేస�కి తాళం వేసే లేదా తీసే',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|ఒక మార�ప�|$1 మార�ప�ల�}}',
 'recentchanges'                     => 'ఇటీవలి మార�ప�ల�',
+'recentchanges-legend'              => 'ఇటీవలి మార�ప�ల ఎంపికల�',
 'recentchangestext'                 => 'వికీలో ఇటీవలి కాలంలో జరిగిన మార�ప�లన� ఈ పేజీలో చూడండి.',
 'recentchanges-feed-description'    => 'ఈ ఫీడ� ద�వారా వికీలో జర�గ�త�న�న మార�ప�ల గ�రించి ఎప�పటికప�ప�డ� సమాచారాన�ని పొందండి.',
 'rcnote'                            => "$4 నాడ� $5 సమయానికి, గత {{PLURAL:$2|ఒక�క రోజ�లో|'''$2''' రోజ�లలో}} చేసిన చివరి {{PLURAL:$1|ఒక�క మార�ప� కింద ఉంది|'''$1''' మార�ప�ల� కింద ఉన�నాయి}}.",
@@ -1044,6 +1149,8 @@ $3 చెప�పిన కారణం: ''$2''",
 'rc_categories'                     => 'ఈ వర�గాలక� పరిమితం చెయ�యి ("|" తో వేర� చెయ�యండి)',
 'rc_categories_any'                 => '�దయినా',
 'newsectionsummary'                 => '/* $1 */ కొత�త విభాగం',
+'rc-enhanced-expand'                => 'వివరాలని చూపించ� (జావాస�క�రిప�ట� అవసరం)',
+'rc-enhanced-hide'                  => 'వివరాలని దాచ�',
 
 # Recent changes linked
 'recentchangeslinked'          => 'సంబంధిత మార�ప�ల�',
@@ -1054,7 +1161,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'recentchangeslinked-to'       => 'ఇచ�చిన పేజీకి లింకయివ�న�న పేజీలలో జరిగిన మార�ప�లన� చూపించ�',
 
 # Upload
-'upload'                      => 'ఫైల� అప�‌లోడ�',
+'upload'                      => 'ఫైల� ఎగ�మతి',
 'uploadbtn'                   => 'ఫైల� అప�‌లోడ� చెయ�యి',
 'reupload'                    => 'మళ�ళీ అప�‌లోడ� చెయ�యి',
 'reuploaddesc'                => 'మళ�ళీ అప�‌లోడ� ఫారంక� వెళ�ళ�.',
@@ -1062,19 +1169,19 @@ $3 చెప�పిన కారణం: ''$2''",
 'uploadnologintext'           => 'ఫైల� అప�‌లోడ� చెయ�యాలంటే, మీర� [[Special:UserLogin|లాగిన�‌]] కావాలి',
 'upload_directory_missing'    => 'ఎగ�మతి డైరెక�టరీ ($1) తప�పింది మరియ� వెబ� సర�వర� దాన�ని సృష�టించలేక�న�నది.',
 'upload_directory_read_only'  => 'అప�‌లోడ� డైరెక�టరీ ($1), వెబ�‌సర�వర� రాసేంద�క� అన�కూలంగా లేద�.',
-'uploaderror'                 => 'అప�‌లోడ� లోపం',
+'uploaderror'                 => 'ఎగ�మతి లోపం',
 'uploadtext'                  => "ఫైళ�ళన� ఎగ�మతి చేయడానికి కింది ఫారాన�ని ఉపయోగించండి.
-ఇదివరలో ఎగ�మతి చేసిన ఫైళ�ళన� చూడడానికి లేదా వెతకడానికి [[Special:ImageList|ఎగ�మతైన ఫైళ�ళ జాబితా]]క� వెళ�ళండి,
+ఇదివరలో ఎగ�మతి చేసిన ఫైళ�ళన� చూడడానికి లేదా వెతకడానికి [[Special:FileList|ఎగ�మతైన ఫైళ�ళ జాబితా]]క� వెళ�ళండి,
 ఎగ�మత�ల� మరియ� తొలగింప�ల� [[Special:Log/upload|ఎగ�మత�ల చిట�టా]]లో కూడా నమోదవ�తాయి.
 
 ఫైల�న� �దైనా పేజీలో చేర�చడానికి, కింద చూపిన వాటిలో �దేనీ విధంగా లింక�ని వాడండి:
-* ఫైల� యొక�క పూర�తి కూర�ప�ని వాడడానికి '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>'''
-* ఎడమ వైప� మార�జిన�లో 200 పిక�సెళ�ళ వెడల�ప�గల బొమ�మ  మరియ� 'ప�రత�యామ�నాయ పాఠ�యం' అన�న వివరణతో గల పెట�టె కోసం  '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|ప�రత�యామ�నాయ పాఠ�యం]]</nowiki></tt>'''
+* ఫైల� యొక�క పూర�తి కూర�ప�ని వాడడానికి '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>'''
+* ఎడమ వైప� మార�జిన�లో 200 పిక�సెళ�ళ వెడల�ప�గల బొమ�మ  మరియ� 'ప�రత�యామ�నాయ పాఠ�యం' అన�న వివరణతో గల పెట�టె కోసం  '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|ప�రత�యామ�నాయ పాఠ�యం]]</nowiki></tt>'''
 * ఫైల�ని చూపించక�ండా, నేర�గా ఫైల�కే లింక� ఇవ�వడానికి '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>'''",
-'upload-permitted'            => 'అన�మతిగల ఫైల� రకాల�: $1.',
+'upload-permitted'            => 'అన�మతించే ఫైల� రకాల�: $1.',
 'upload-preferred'            => 'అన�మతించే ఫైల� రకాల�: $1.',
 'upload-prohibited'           => 'నిషేధించిన ఫైల� రకాల�: $1.',
-'uploadlog'                   => 'అప�‌లోడ� లాగ�',
+'uploadlog'                   => 'ఎగ�మతి చిట�టా',
 'uploadlogpage'               => 'ఎగ�మత�ల చిట�టా',
 'uploadlogpagetext'           => 'ఇటీవల జరిగిన ఫైల� అప�‌లోడ�ల జాబితా ఇది.',
 'filename'                    => 'ఫైల� పేర�',
@@ -1098,28 +1205,29 @@ $3 చెప�పిన కారణం: ''$2''",
 'large-file'                  => 'ఫైళ�ళ� $1 కంటే పెద�దవిగా ఉండక�ండా ఉంటే మంచిది; ఈ ఫైల� $2 ఉంది.',
 'largefileserver'             => 'ఈ ఫైల� సైజ� సర�వర�లో విధించిన పరిమితి కంటే ఎక�క�వగా ఉంది.',
 'emptyfile'                   => 'మీర� అప�‌లోడ� చేసిన ఫైల� ఖాళీగా ఉన�నట�ల�ంది. ఫైల� పేర�న� ఇవ�వడంలో స�పెల�లింగ� తప�ప� దొర�లి ఉండొచ�చ�. మీర� అప�‌లోడ� చెయ�యదలచింది ఇదో కాదో నిర�ధారించ�కోండి.',
-'fileexists'                  => 'ఈ పేర�తో ఒక ఫైల� ఇప�పటికే ఉంది. దీనిని మీర� మార�చాలో లేదో తెలియకపోతె ఫైల� <strong><tt>$1</tt></strong>ని చూడండి.',
-'filepageexists'              => 'ఈ ఫైల� కొరక� వివరణ పేజీని <strong><tt>$1</tt></strong> వద�ద ఈసరికే సృష�టించార�, కానీ ఆ పేర�తో ప�రస�త�తం � ఫైలూ లేద�. మీర� ఇస�త�న�న సంగ�రహం ఆ వివరణ పేజీలో కనబడద�. మీ సంగ�రహం అక�కడ కనబడాలంటే, నేర�గా అక�కడే చేర�చాలి.',
-'fileexists-extension'        => 'ఇట�వంటి పేర�తో మరో ఫైల� ఉంది:<br />
-ఎగ�మతి చేస�త�న�న ఫైల� పేర�: <strong><tt>$1</tt></strong><br />
-ప�రస�త�తం ఉన�న ఫైల� పేర�: <strong><tt>$2</tt></strong><br />
-దయచేసి మరో పేర� ఎంచ�కోండి.',
+'fileexists'                  => "ఈ పేర�తో ఒక ఫైల� ఇప�పటికే ఉంది. దీనిని మీర� మార�చాలో లేదో తెలియకపోతె ఫైల� '''<tt>$1</tt>'''ని చూడండి.",
+'filepageexists'              => "ఈ ఫైల� కొరక� వివరణ పేజీని '''<tt>$1</tt>''' వద�ద ఈసరికే సృష�టించార�, కానీ ఆ పేర�తో ప�రస�త�తం � ఫైలూ లేద�. మీర� ఇస�త�న�న సంగ�రహం ఆ వివరణ పేజీలో కనబడద�. మీ సంగ�రహం అక�కడ కనబడాలంటే, నేర�గా అక�కడే చేర�చాలి.",
+'fileexists-extension'        => "ఇట�వంటి పేర�తో మరో ఫైల� ఉంది:<br />
+ఎగ�మతి చేస�త�న�న ఫైల� పేర�: '''<tt>$1</tt>'''<br />
+ప�రస�త�తం ఉన�న ఫైల� పేర�: '''<tt>$2</tt>'''<br />
+దయచేసి మరో పేర� ఎంచ�కోండి.",
 'fileexists-thumb'            => "<center>'''ప�రస�త�త ఫైల�'''</center>",
-'fileexists-thumbnail-yes'    => 'ఈ ఫైల� క�దించిన బొమ�మ లాగా ఉంది <i>(థంబ�‌నెయిల�)</i>. <strong><tt>$1</tt></strong> ఫైల� చూడండి.<br />
-గ�ర�త� పెట�టబడిన ఫైల� అసల� సైజే అది అయితే, మరో థంబ�‌నెయిల�న� అప�‌లోడ� చెయ�యాల�సిన అవసరం లేద�.',
-'file-thumbnail-no'           => 'ఫైల� పేర� <strong><tt>$1</tt></strong> తో మొదలవ�తోంది.
-అది పరిమాణం తగ�గించిన <i>(నఖచిత�రం)</i> లాగా అనిపిస�తోంది.
-ఈ బొమ�మ యొక�క పూర�తి స�పష�టత కూర�ప� ఉంటే, దాన�ని ఎగ�మతి చెయ�యండి. లేదా ఫైల� పేర�న� మార�చండి.',
-'fileexists-forbidden'        => 'ఈ పేర�తో ఇప�పటికే ఒక ఫైల� ఉంది; దీన�ని మరో పేర�తో అప�‌లోడ� చెయ�యండి.
-[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "ఈ ఫైల� క�దించిన బొమ�మ లాగా ఉంది ''(థంబ�‌నెయిల�)''. '''<tt>$1</tt>''' ఫైల� చూడండి.<br />
+గ�ర�త� పెట�టబడిన ఫైల� అసల� సైజే అది అయితే, మరో థంబ�‌నెయిల�న� అప�‌లోడ� చెయ�యాల�సిన అవసరం లేద�.",
+'file-thumbnail-no'           => "ఫైల� పేర� '''<tt>$1</tt>''' తో మొదలవ�తోంది.
+అది పరిమాణం తగ�గించిన ''(నఖచిత�రం)'' లాగా అనిపిస�తోంది.
+ఈ బొమ�మ యొక�క పూర�తి స�పష�టత కూర�ప� ఉంటే, దాన�ని ఎగ�మతి చెయ�యండి. లేదా ఫైల� పేర�న� మార�చండి.",
+'fileexists-forbidden'        => 'ఈ పేర�తో ఇప�పటికే ఒక ఫైల� ఉంది, దాన�ని తిరగరాయలేర�.
+మీర� ఇప�పటికీ ఈ ఫైల�ని ఎగ�మతి చేయాలన�క�ంటే, వెనక�కి వెళ�ళి మరో పేర�తో ఎగ�మతి చేయండి. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'ఈ పేర�తో ఇప�పటికే ఒక ఫైల� అందరి ఫైళ�ళ ఖజానాలో ఉంది.
-ఇప�పటికీ మీ ఫైల�ని ఎగ�మతి చేయాలన�క�ంటే, వెనక�కివెళ�ళి మరో పేర� వాడండి. [[Image:$1|thumb|center|$1]]',
+ఇప�పటికీ మీ ఫైల�ని ఎగ�మతి చేయాలన�క�ంటే, వెనక�కివెళ�ళి మరో పేర� వాడండి. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'ఈ ఫైల� క�రింద పేర�కొన�న {{PLURAL:$1|ఫైల�కి|ఫైళ�ళకి}} నకల�:',
+'file-deleted-duplicate'      => 'గతంలో ఈ ఫైల� లాంటిదే ఒక ఫైల�ని ([[$1]]) తొలగించివ�న�నార�. మీర� దీన�ని ఎగ�మతి చేసేమ�ంద� ఆ ఫైల� యొక�క తొలగింప� చరిత�రని ఒక�కసారి చూడండి.',
 'successfulupload'            => 'అప�‌లోడ� జయప�రదం',
 'uploadwarning'               => 'అప�‌లోడ� హెచ�చరిక',
 'savefile'                    => 'ఫైల� భధ�రపరచ�',
-'uploadedimage'               => '"[[$1]]" అప�‌లోడ� అయింది',
-'overwroteimage'              => '"[[$1]]" యొక�క కొత�త కూర�ప�న� అప�‌లోడ� చేసాం.',
+'uploadedimage'               => '"[[$1]]"ని ఎగ�మతి చేసార�',
+'overwroteimage'              => '"[[$1]]" యొక�క కొత�త కూర�ప�న� ఎగ�మతి చేసార�',
 'uploaddisabled'              => 'క�షమించండి, అప�‌లోడ� చెయ�యడం ప�రస�త�తానికి ఆపబడింది',
 'uploaddisabledtext'          => 'ఫైళ�ళ ఎగ�మత�లన� అచేతనం చేసార�.',
 'uploadscripted'              => 'ఈ ఫైల�లో HTML కోడ� గానీ స�క�రిప�ట� కోడ� గానీ ఉంది. వెబ� బ�రౌజర� దాన�ని పొరపాట�గా అన�వదించే అవకాశం ఉంది.',
@@ -1132,9 +1240,9 @@ $3 చెప�పిన కారణం: ''$2''",
 'filewasdeleted'              => 'ఇదే పేర�తో ఉన�న ఒక ఫైల�న� గతంలో అప�లోడ� చేసార�, తర�వాతి కాలంలో దాన�ని తొలగించార�. దాన�నీ మళ�ళీ అప�లోడ� చేసే మ�ంద�, మీర� $1 న� చూడాలి',
 'upload-wasdeleted'           => "'''హెచ�చరిక: గతంలో తొలగించబడ�డ ఫైల�ని మీర� ఎక�కిస�త�న�నార�.'''
 
-ఈ ఫైల�ని ఎక�కిచడం సరియో కాదో చూస�కోండి.
-ఈ సౌలభ�యంకోసం తొలగింప� లాగ� ఇక�కడ ఇస�త�న�నాం:",
-'filename-bad-prefix'         => 'మీర� అప�లోడ� చేస�త�న�న ఫైల� పేర� <strong>"$1"</strong> తో మొదలవ�త�ంది. ఇది డిజిటల� కెమెరాల� ఆటోమాటిగ�గా ఇచ�చే పేర�. మరింత వివరంగా ఉండే పేర�న� ఎంచ�కోండి.',
+కొనసాగే మ�ంద� ఈ ఫైల�ని ఎక�కించడం సరియో కాదో చూస�కోండి.
+సౌలభ�యంకోసం ఈ ఫైల� యొక�క తొలగింప� చిట�టాని ఇక�కడ ఇస�త�న�నాం:",
+'filename-bad-prefix'         => "మీర� అప�లోడ� చేస�త�న�న ఫైల� పేర� '''\"\$1\"''' తో మొదలవ�త�ంది. ఇది డిజిటల� కెమెరాల� ఆటోమాటిగ�గా ఇచ�చే పేర�. మరింత వివరంగా ఉండే పేర�న� ఎంచ�కోండి.",
 
 'upload-proto-error'      => 'తప�ప� ప�రోటోకోల�',
 'upload-proto-error-text' => 'రిమోట� అప�‌లోడ�ల� చెయ�యాలంటే URLల� <code>http://</code> లేదా <code>ftp://</code> తో మొదల� కావాలి.',
@@ -1155,20 +1263,21 @@ $3 చెప�పిన కారణం: ''$2''",
 'upload_source_url'  => ' (సార�వజనికంగా అంద�బాట�లో ఉన�న, సరైన URL)',
 'upload_source_file' => ' (మీ కంప�యూటర�లో ఒక ఫైల�)',
 
-# Special:ImageList
-'imagelist-summary'     => 'ఈ ప�రత�యేక పేజీ ఇప�పటి వరకూ అప�లోడయిన ఫైళ�లన� చూపిస�త�ంది.
+# Special:ListFiles
+'listfiles-summary'     => 'ఈ ప�రత�యేక పేజీ ఇప�పటి వరకూ అప�లోడయిన ఫైళ�లన� చూపిస�త�ంది.
 � క�రమాన�నీ పేర�కొనకపోతే ఇటీవలే అప�లోడయిన ఫైళ�లన� మ�ంద�గా చూపిస�త�ంది.
 నిల�వ� వర�సలక�న�న శీర�షికలపై నొక�కితే క�రమపరిచే విధానం మార�త�ంది.',
-'imagelist_search_for'  => 'మీడియా పేర�కై వెత�క�:',
+'listfiles_search_for'  => 'మీడియా పేర�కై వెత�క�:',
 'imgfile'               => 'ఫైల�',
-'imagelist'             => 'ఫైళ�ళ జాబితా',
-'imagelist_date'        => 'తేదీ',
-'imagelist_name'        => 'పేర�',
-'imagelist_user'        => 'వాడ�కరి',
-'imagelist_size'        => 'పరిమాణం',
-'imagelist_description' => 'వివరణ',
-
-# Image description page
+'listfiles'             => 'ఫైళ�ళ జాబితా',
+'listfiles_date'        => 'తేదీ',
+'listfiles_name'        => 'పేర�',
+'listfiles_user'        => 'వాడ�కరి',
+'listfiles_size'        => 'పరిమాణం',
+'listfiles_description' => 'వివరణ',
+'listfiles_count'       => 'కూర�ప�ల�',
+
+# File description page
 'filehist'                       => 'ఫైల� చరితం',
 'filehist-help'                  => 'తేదీ/సమయం న� నొక�కి ఆ సమయాన ఫైల� ఎలా ఉండేదో చూడవచ�చ�.',
 'filehist-deleteall'             => 'అన�నిటినీ తొలగించ�',
@@ -1176,19 +1285,25 @@ $3 చెప�పిన కారణం: ''$2''",
 'filehist-revert'                => 'తిర�గ�సేత',
 'filehist-current'               => 'ప�రస�త�త',
 'filehist-datetime'              => 'తేదీ/సమయం',
+'filehist-thumb'                 => 'నఖచిత�రం',
+'filehist-thumbtext'             => '$1 యొక�క నఖచిత�ర కూర�ప�',
+'filehist-nothumb'               => 'నఖచిత�రం లేద�',
 'filehist-user'                  => 'వాడ�కరి',
 'filehist-dimensions'            => 'కొలతల�',
 'filehist-filesize'              => 'ఫైల� సైజ�',
 'filehist-comment'               => 'వ�యాఖ�య',
-'imagelinks'                     => 'లింక�ల�',
+'imagelinks'                     => 'ఫైల� లింక�ల�',
 'linkstoimage'                   => 'కింది {{PLURAL:$1|పేజీ|$1 పేజీల}} న�ండి ఈ ఫైల�కి లింక�ల� ఉన�నాయి:',
+'linkstoimage-more'              => '$1 కంటే ఎక�క�వ {{PLURAL:$1|పేజీల�|పేజీల�}} ఈ ఫైల�కి లింక�ని కలిగివ�న�నాయి.
+ఈ ఫైల�కి లింక�న�న {{PLURAL:$1|మొదటి ఒక పేజీని|మొదటి $1 పేజీలన�}} ఈ క�రింది జాబితా చూపిస�త�ంది.
+[[Special:WhatLinksHere/$2|పూర�తి జాబితా]] కూడా ఉంది.',
 'nolinkstoimage'                 => 'ఈ ఫైల�క� లింక�న�న పేజీల� లేవ�.',
 'morelinkstoimage'               => 'ఈ ఫైల�క� ఇంకా [[Special:WhatLinksHere/$1| లింక�లన�]] చూడ�',
 'redirectstofile'                => 'క�రింద పేర�కొన�న {{PLURAL:$1|ఫైల� ఈ ఫైల�కి దారిమార�ప� చెంద�త�ంది|$1 ఫైళ�ళ� ఈ ఫైల�కి దారిమార�ప� చెంద�తాయి}}:',
-'duplicatesoffile'               => 'క�రింద పేర�కొన�న {{PLURAL:$1|ఫైల� ఈ ఫైల�కి నకల�|$1 ఫైళ�ళ� ఈ ఫైల�కి నకళ�ళ�}}:',
+'duplicatesoffile'               => 'క�రింద పేర�కొన�న {{PLURAL:$1|ఫైల� ఈ ఫైల�కి నకల�|$1 ఫైళ�ళ� ఈ ఫైల�కి నకళ�ళ�}} ([[Special:FileDuplicateSearch/$2|మరిన�ని వివరాల�]]):',
 'sharedupload'                   => 'ఈ ఫైల� ఒక ఉమ�మడి అప�లోడ�, దీనిని ఇతర ప�రాజెక�ట�లలో కూడా ఉపయోగిస�తూ ఉండవచ�చ�.',
 'shareduploadwiki'               => 'మరింత సమాచారం కొరక� [$1 ఫైల� వివరణ పేజీ] చూడండి.',
-'shareduploadwiki-desc'          => 'భాగస�వామ�య ఖజానాలో ఉన�న దీని $1 లోని వివరణని క�రింద చూపించాం.',
+'shareduploadwiki-desc'          => 'దీని యొక�క $1 లోని వివరణని క�రింద చూపించాం.',
 'shareduploadwiki-linktext'      => 'ఫైల� వివరణ పేజీ',
 'shareduploadduplicate'          => 'భాగస�వామ�య ఖజానాలోని $1 క� ఈ ఫైల� నకల�',
 'shareduploadduplicate-linktext' => 'మరొక ఫైల�',
@@ -1212,7 +1327,7 @@ $3 చెప�పిన కారణం: ''$2''",
 # File deletion
 'filedelete'                  => '$1ని తొలగించ�',
 'filedelete-legend'           => 'ఫైల�ని తొలగించ�',
-'filedelete-intro'            => "'''[[Media:$1|$1]]'''ని మీర� తొలగిస�త�న�నార�.",
+'filedelete-intro'            => "మీర� '''[[Media:$1|$1]]''' ఫైల�ని దాని చరిత�రతో సహా తొలగించబోత�న�నార�.",
 'filedelete-intro-old'        => "మీర� '''[[Media:$1|$1]]''' యొక�క  [$4 $3, $2] నాటి కూర�ప�న� తొలగిస�త�న�నార�.",
 'filedelete-comment'          => 'వ�యాఖ�య:',
 'filedelete-submit'           => 'తొలగించ�',
@@ -1220,7 +1335,6 @@ $3 చెప�పిన కారణం: ''$2''",
 'filedelete-success-old'      => "'''[[Media:$1|$1]]''' యొక�క  $3, $2 నాటి కూర�ప�న� తొలగించాం.</span>",
 'filedelete-nofile'           => "'''$1''' ఇక�కడ లేద�.",
 'filedelete-nofile-old'       => "'''$1''' యొక�క పాత కూర�ప�ల�లో మీరిచ�చిన పరామిత�ల� కలిగిన కూర�పేమీ లేద�.",
-'filedelete-iscurrent'        => 'ఈ ఫైల� యొక�క సరికొత�త కూర�ప�న� తొలగించబోత�న�నార�. మ�ందో పాత కూర�ప�క� తీస�క�వెళ�ళండి.',
 'filedelete-otherreason'      => 'ఇతర/అదనప� కారణం:',
 'filedelete-reason-otherlist' => 'ఇతర కారణం',
 'filedelete-reason-dropdown'  => '*తొలగింప�నక� సాధారణ కారణాల�
@@ -1242,32 +1356,37 @@ $3 చెప�పిన కారణం: ''$2''",
 
 # Unused templates
 'unusedtemplates'     => 'వాడని మూసల�',
-'unusedtemplatestext' => '� ఇతర పేజీలోనూ చేరని మూస పేజీలన�నీ ఇక�కడ ఉన�నాయి.మూసలన� తొలగించే మ�ంద� వాటికి ఉన�న ఇతర లింక�ల కోసం చూడడం గ�ర�త�ంచ�కోండి.',
+'unusedtemplatestext' => 'వేరే ఇతర పేజీలలో చేర�చని {{ns:template}} పేర�బరిలోని పేజీలన�నింటినీ ఈ పేజీ చూపిస�త�ంది.
+మూసలన� తొలగించే మ�ంద� వాటికి ఉన�న ఇతర లింక�ల కోసం చూడడం గ�ర�త�ంచ�కోండి.',
 'unusedtemplateswlh'  => 'ఇతర లింక�ల�',
 
 # Random page
 'randompage'         => 'యాధృచ�ఛిక పేజీ',
-'randompage-nopages' => 'ఈ నేమ� స�పేస�లో పేజీల� లేవ�.',
+'randompage-nopages' => '"$1" అనే పేర�బరిలో పేజీలేమీ లేవ�.',
 
 # Random redirect
 'randomredirect'         => 'యాదృచ�చిక దారిమార�ప�',
-'randomredirect-nopages' => 'ఈ నేమ� స�పేస�లో దారిమార�ప�ల� లేవ�.',
+'randomredirect-nopages' => '"$1" పేర�బరిలో దారిమార�ప�లేమీ లేవ�.',
 
 # Statistics
-'statistics'             => 'గణాంకాల�',
-'sitestats'              => '{{SITENAME}} గణాంకాల�',
-'userstats'              => 'సభ�య�ల గణాంకాల�',
-'sitestatstext'          => "డెటాబేస�లో ప�రస�త�తం {{PLURAL:\$2|ఒకే ఒక�క వ�యాసం ఉంది|'''\$2''' వ�యాసాల�న�నాయి}}.
-{{SITENAME}}క� సంబంధించిన పేజీల�, \"చర�చ\" పేజీల�, \"మొలక\" పేజీల�, \"దారిమార�ప�\" పేజీల�, మరియ� {{SITENAME}}లో వ�యాసాల�గా భావించడానికి వీల�కాని ఇతర పేజీల� కల�ప�కొని డేటాబేస�లో {{PLURAL:\$1|ఒక�క పేజీనే ఉంది|మొత�తమ� '''\$1''' సక�రమమైన పేజీల� వ�న�నాయి}}.
-
-{{PLURAL:\$8|ఒక�క ఫైల� అప�లోడ� చేయబడింది|'''\$8''' ఫైళ�ళ� అప�‌లోడ� చేయబడ�డాయి}}.
-
-ఈ {{SITENAME}} ప�రారంభమైనప�పటి న�ండి మొత�తం {{PLURAL:\$3|ఒక�క పేజీ దర�శనం|'''\$3''' పేజీ దర�శనల�}}, మరియ� {{PLURAL:\$4|ఒక పేజీ మార�ప�|'''\$4''' పేజీ మార�ప�ల�}} జరిగాయి.
-అంటే, సగట�న ప�రతీ పేజీకి '''\$5''' మార�ప�ల� మరియ� ప�రతీ మార�ప�కి '''\$6''' దర�శనల�.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue చేయవలసిన పన�ల జాబితా] పొడవ� '''\$7'''.",
-'userstatstext'          => "ప�రస�త�తమ� {{PLURAL:$1|ఒక వాడ�కరి మాత�రమే|'''$1''' మంది సభ�య�ల�}}, సభ�య�నిగా [[Special:ListUsers|నమోద� చేస�క�న�నార�]]. వారిలో {{PLURAL:$2|ఒక�క సభ�నికి|'''$2''' సభ�య�లక�}} (లేదా '''$4%''') $5 హక�క�ల� ఉన�నాయి.",
-'statistics-mostpopular' => 'ఎక�క�వగా చూసిన పేజీల�',
+'statistics'                   => 'గణాంకాల�',
+'statistics-header-pages'      => 'పేజీ గణాంకాల�',
+'statistics-header-edits'      => 'మార�ప�ల గణాంకాల�',
+'statistics-header-views'      => 'వీక�షణల గణాంకాల�',
+'statistics-header-users'      => 'సభ�య�ల గణాంకాల�',
+'statistics-articles'          => 'విషయప� పేజీల�',
+'statistics-pages'             => 'పేజీల�',
+'statistics-pages-desc'        => 'ఈ వికీలోని అన�ని పేజీల� (చర�చా పేజీల�, దారిమార�ప�ల�, మొదలైనవన�నీ కల�ప�కొని).',
+'statistics-files'             => 'ఎగ�మతైన ఫైళ�ళ�',
+'statistics-edits'             => '{{SITENAME}}ని మొదల�పెట�టినప�పటిన�ండి జరిగిన మార�ప�ల�',
+'statistics-edits-average'     => 'పేజీకి సగట� మార�ప�ల�',
+'statistics-views-total'       => 'మొత�తం వీక�షణల�',
+'statistics-views-peredit'     => 'ఒక మార�ప�కి వీక�షణల�',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue పన�ల వర�స] పొడవ�',
+'statistics-users'             => 'నమోదైన [[Special:ListUsers|వాడ�కర�ల�]]',
+'statistics-users-active'      => 'క�రియాశీల వాడ�కర�ల�',
+'statistics-users-active-desc' => 'గత {{PLURAL:$1|రోజ�|$1 రోజ�ల}}లో ఒక�క చర�యైనా చేసిన వాడ�కర�ల�',
+'statistics-mostpopular'       => 'ఎక�క�వగా చూసిన పేజీల�',
 
 'disambiguations'      => 'అయోమయ నివృత�తి పేజీల�',
 'disambiguationspage'  => 'Template:అయోమయ నివృత�తి',
@@ -1278,7 +1397,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'double-redirect-fixed-move' => '[[$1]]ని తరలించార�, అది ప�రస�త�తం [[$2]]కి దారిమార�ప�.',
 
 'brokenredirects'        => 'తెగిపోయిన దారిమార�ప�ల�',
-'brokenredirectstext'    => 'కింది దారిమార�ప�ల� లేని పేజీలక� మాళ�ళించ�త�న�నాయి.',
+'brokenredirectstext'    => 'కింది దారిమార�ప�ల� లేని-పేజీలక� మళ�ళించ�త�న�నాయి:',
 'brokenredirects-edit'   => '(మార�చ�)',
 'brokenredirects-delete' => '(తొలగించ�)',
 
@@ -1308,14 +1427,15 @@ $3 చెప�పిన కారణం: ''$2''",
 'popularpages'            => 'ప�రజాదరణ పొందిన పేజీల�',
 'wantedcategories'        => 'కోరిన వర�గాల�',
 'wantedpages'             => 'కోరిన పేజీల�',
-'missingfiles'            => 'తప�పిపోయిన ఫైళ�ళ�',
+'wantedfiles'             => 'కావలసిన ఫైళ�ళ�',
+'wantedtemplates'         => 'కావాల�సిన మూసల�',
 'mostlinked'              => 'అధిక లింక�ల� చూపే పేజీల�',
 'mostlinkedcategories'    => 'అధిక లింక�ల� చూపే వర�గాల�',
 'mostlinkedtemplates'     => 'ఎక�క�వగా ఉపయోగించిన మూసల�',
 'mostcategories'          => 'అధిక వర�గాలలో చేరిన వ�యాసాల�',
 'mostimages'              => 'అధిక లింక�ల� గల బొమ�మల�',
 'mostrevisions'           => 'అధిక సంచికల� గల వ�యాసాల�',
-'prefixindex'             => 'ఆదిపదం సూచిక',
+'prefixindex'             => 'ఉపసర�గతో అన�ని పేజీల�',
 'shortpages'              => 'చిన�న పేజీల�',
 'longpages'               => 'పొడవ� పేజీల�',
 'deadendpages'            => 'అగాధ (డెడ�ఎండ�) పేజీల�',
@@ -1328,6 +1448,8 @@ $3 చెప�పిన కారణం: ''$2''",
 'protectedtitlestext'     => 'కింది శీర�షికలతో పేజీల� సృష�టించక�ండా సంరక�షించబడ�డాయి',
 'protectedtitlesempty'    => 'ఈ పరామిత�లతో ప�రస�త�తం శీర�షికలేమీ సరక�షించబడి లేవ�.',
 'listusers'               => 'వాడ�కర�ల జాబితా',
+'listusers-editsonly'     => 'మార�ప�ల� చేసిన వాడ�కర�లన� మాత�రమే చూపించ�',
+'usereditcount'           => '$1 {{PLURAL:$1|మార�ప�|మార�ప�ల�}}',
 'newpages'                => 'కొత�త పేజీల�',
 'newpages-username'       => 'సభ�యనామం:',
 'ancientpages'            => 'పాత పేజీల�',
@@ -1348,14 +1470,13 @@ $3 చెప�పిన కారణం: ''$2''",
 'booksources-search-legend' => 'ప�స�తక మూలాల కోసం వెత�క�',
 'booksources-go'            => 'వెళ�ళ�',
 'booksources-text'          => 'కొత�త, పాత ప�స�తకాల� అమ�మే ఇతర సైట�లక� లింక�ల� కింద ఇచ�చాం. మీర� వెతికే ప�స�తకాలక� సంబంధించిన మరింత సమాచారం కూడా అక�కడ దొరకొచ�చ�:',
+'booksources-invalid-isbn'  => 'మీరిచ�చిన ISBN సరైనదిగా అనిపించ�టలేద�; అసల� మూలాన�న�ండి కాపీ చేయడంలో పొరపాట�ల�న�నాయేమో చూస�కోండి.',
 
 # Special:Log
 'specialloguserlabel'  => 'వాడ�కరి:',
 'speciallogtitlelabel' => 'పేర�:',
 'log'                  => 'చిట�టాల�',
 'all-logs-page'        => 'అన�ని చిట�టాల�',
-'log-search-legend'    => 'లాగ�‌ల కొరక� వెత�క�',
-'log-search-submit'    => 'వెళ�ళ�',
 'alllogstext'          => '{{SITENAME}}  యొక�క అంద�బాట�లో ఉన�న అన�ని చిట�టాల సంయ�క�త ప�రదర�శన.
 ప�రత�యేకించి ఒక చిట�టా రకాన�ని గానీ, ఓ సభ�య�ని పేర� గానీ (case-sensitive), లేదా ప�రభావిత  పేజీని (ఇది కూడా case-sensitive) గాని ఎంచ�క�ని సంబంధిత చిట�టాన� మాత�రమే చూడవచ�చ�.',
 'logempty'             => 'దినచర�యలో సరిపోలిన అంశాల� లేవ�.',
@@ -1367,7 +1488,8 @@ $3 చెప�పిన కారణం: ''$2''",
 'nextpage'          => 'తర�వాతి పేజీ ($1)',
 'prevpage'          => 'మ�న�పటి పేజీ ($1)',
 'allpagesfrom'      => 'ఇక�కడ మొదల� పెట�టి పేజీల� చూపించ�:',
-'allarticles'       => 'అన�ని వ�యాసమ�ల�',
+'allpagesto'        => 'ఇక�కడవరక� ఉన�న పేజీల� చూపించ�:',
+'allarticles'       => 'అన�ని పేజీల�',
 'allinnamespace'    => 'అన�ని పేజీల� ($1 namespace)',
 'allnotinnamespace' => 'అన�ని పేజీల� ($1 నేంస�పేస� లేనివి)',
 'allpagesprev'      => 'పూర�వప�',
@@ -1386,40 +1508,67 @@ $3 చెప�పిన కారణం: ''$2''",
 'special-categories-sort-count' => 'సంఖ�యల ప�రకారం క�రమపరచ�',
 'special-categories-sort-abc'   => 'అకారాది క�రమంలో అమర�చ�',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'తొలగించబడిన సభ�య�ని రచనల�',
+
+# Special:LinkSearch
+'linksearch'       => 'బయటి లింక�ల�',
+'linksearch-pat'   => 'వెతకాల�సిన నమూనా:',
+'linksearch-ns'    => 'నేమ� స�పేస�:',
+'linksearch-ok'    => 'వెత�క�',
+'linksearch-text'  => '"*.wikipedia.org" వంటి వైల�డ� కార�డ�ల� వాడవచ�చ�.<br />ఉపయోగించ�కోగల ప�రోటోకాళ�ల�: <tt>$1</tt>',
+'linksearch-line'  => '$2 న�ండి $1కి లింక� ఉంది',
+'linksearch-error' => 'హోస�ట�‌నేమ�క� మ�ంద� మాత�రమే వైల�డ� కార�డ�ల� వాడవచ�చ�.',
+
 # Special:ListUsers
 'listusersfrom'      => 'ఇక�కడ మొదల�పెట�టి సభ�య�లన� చూపించ�:',
 'listusers-submit'   => 'చూపించ�',
 'listusers-noresult' => 'వాడ�కరి దొరకలేద�.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'కొత�త వాడ�కర�ల చిట�టా',
+'newuserlogpagetext'          => 'ఇది వాడ�కరి నమోద�ల చిట�టా.',
+'newuserlog-byemail'          => 'ఈ-మెయిల�లో సంకేతపదం పంపించాం',
+'newuserlog-create-entry'     => 'కొత�త వాడ�కరి',
+'newuserlog-create2-entry'    => '$1 అనే కొత�త ఖాతాని సృష�టించార�',
+'newuserlog-autocreate-entry' => 'ఖాతాన�ని ఆటోమెటిగ�గా సృష�టించాం',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'వాడ�కరి గ�ంప�ల హక�క�ల�',
-'listgrouprights-summary'  => 'కింది జాబితాలో ఈ వికీలో నిర�వచించిన వాడ�కరి గ�ంప�ల�, వాటికి సంబంధించిన హక�క�ల� ఉన�నాయి. 
+'listgrouprights'                 => 'వాడ�కరి గ�ంప�ల హక�క�ల�',
+'listgrouprights-summary'         => 'కింది జాబితాలో ఈ వికీలో నిర�వచించిన వాడ�కరి గ�ంప�ల�, వాటికి సంబంధించిన హక�క�ల� ఉన�నాయి. 
 విడివిడిగా హక�క�లక� సంబంధించిన మరింత సమాచారం [[{{MediaWiki:Listgrouprights-helppage}}]] వద�ద లభించవచ�చ�.',
-'listgrouprights-group'    => 'గ�ంప�',
-'listgrouprights-rights'   => 'హక�క�ల�',
-'listgrouprights-helppage' => 'Help:గ�ంప� హక�క�ల�',
-'listgrouprights-members'  => '(సభ�య�ల జాబితా)',
+'listgrouprights-group'           => 'గ�ంప�',
+'listgrouprights-rights'          => 'హక�క�ల�',
+'listgrouprights-helppage'        => 'Help:గ�ంప� హక�క�ల�',
+'listgrouprights-members'         => '(సభ�య�ల జాబితా)',
+'listgrouprights-addgroup'        => '{{PLURAL:$2|గ�ంప�ని|గ�ంప�లన�}} చేర�చగలర�: $1',
+'listgrouprights-removegroup'     => '{{PLURAL:$2|గ�ంప�ని|గ�ంప�లన�}} తొలగించగలర�: $1',
+'listgrouprights-addgroup-all'    => 'అన�ని గ�ంప�లన� చేర�చగలర�',
+'listgrouprights-removegroup-all' => 'అన�ని గ�ంప�లన� తొలగించగలర�',
 
 # E-mail user
-'mailnologin'     => 'పంపించవలసిన చిర�నామా లేద�',
-'mailnologintext' => 'ఇతర�లక� ఈ-మెయిల� పంపించాలంటే, మీర� [[Special:UserLogin|లాగిన�‌]] అయి ఉండాలి, మరియ� మీ [[Special:Preferences|అభిర�చ�ల]]లో సరైన ఈ-మెయిల� చిర�నామా ఇచ�చి ఉండాలి.',
-'emailuser'       => 'ఈ సభ�య�నికి ఈ-మెయిల� పంప�',
-'emailpage'       => 'సభ�య�నికి ఈ-మెయిల� పంప�',
-'emailpagetext'   => 'ఈ వాడ�కరి తన అభిర�చ�లలో సరైన ఈ-మెయిల� చిర�నామా ఇచ�చి ఉంటే, కింది ఫారం మీ సందేశాన�ని పంపిస�త�ంది. [[Special:Preferences|మీ వాడ�కరి అభిర�చ�ల]]లో మీరిచ�చిన ఈ-మెయిల� చిర�నామా "న�ండి" ఆ సందేశం వచ�చినట�ల�గా ఉంట�ంది, కన�క వేగ�ని అంద�క�నేవార� నేర�గా మీక� జవాబివ�వగల�గ�తార�.',
-'usermailererror' => 'మెయిల� ఆబ�జెక�ట� ఈ లోపాన�ని చూపింది:',
-'defemailsubject' => '{{SITENAME}} ఈ-మెయిల�',
-'noemailtitle'    => 'ఈ-మెయిల� చిర�నామా లేద�',
-'noemailtext'     => 'ఈ వాడ�కరి సరైన ఈ-మెయిల� చిర�నామా ఇవ�వలేద�, లేదా ఇతర�ల న�ండి ఈ-మెయిల�లన� అంద�కోవడానికి స�మ�ఖంగా లేర�.',
-'emailfrom'       => 'ఎవర�:',
-'emailto'         => 'ఎవరికి:',
-'emailsubject'    => 'విషయం:',
-'emailmessage'    => 'సందేశం:',
-'emailsend'       => 'పంపించ�',
-'emailccme'       => 'సందేశప� ఒక ప�రతిని నాక� ఈమెయిల� పంప�.',
-'emailccsubject'  => '$1 క� మీర� పంపిన సందేశప� ప�రతి: $2',
-'emailsent'       => 'ఈ-మెయిల� పంపించాం',
-'emailsenttext'   => 'మీ ఈ-మెయిల� సందేశం పంపబడింది.',
-'emailuserfooter' => 'ఈ ఈ-మెయిల�ని $2 కి {{SITENAME}} లోని "వాడ�కరికి ఈమెయిల�" అనే సౌలభ�యం ద�వారా $1 పంపించార�.',
+'mailnologin'      => 'పంపించవలసిన చిర�నామా లేద�',
+'mailnologintext'  => 'ఇతర�లక� ఈ-మెయిల� పంపించాలంటే, మీర� [[Special:UserLogin|లాగిన�‌]] అయి ఉండాలి, మరియ� మీ [[Special:Preferences|అభిర�చ�ల]]లో సరైన ఈ-మెయిల� చిర�నామా ఇచ�చి ఉండాలి.',
+'emailuser'        => 'ఈ సభ�య�నికి ఈ-మెయిల� పంప�',
+'emailpage'        => 'సభ�య�నికి ఈ-మెయిల� పంప�',
+'emailpagetext'    => 'ఈ వాడ�కరి తన అభిర�చ�లలో సరైన ఈ-మెయిల� చిర�నామా ఇచ�చి ఉంటే, కింది ఫారం మీ సందేశాన�ని పంపిస�త�ంది. [[Special:Preferences|మీ వాడ�కరి అభిర�చ�ల]]లో మీరిచ�చిన ఈ-మెయిల� చిర�నామా "న�ండి" ఆ సందేశం వచ�చినట�ల�గా ఉంట�ంది, కన�క వేగ�ని అంద�క�నేవార� నేర�గా మీక� జవాబివ�వగల�గ�తార�.',
+'usermailererror'  => 'మెయిల� ఆబ�జెక�ట� ఈ లోపాన�ని చూపింది:',
+'defemailsubject'  => '{{SITENAME}} ఈ-మెయిల�',
+'noemailtitle'     => 'ఈ-మెయిల� చిర�నామా లేద�',
+'noemailtext'      => 'ఈ వాడ�కరి సరైన ఈ-మెయిల� చిర�నామాని ఇవ�వలేద�.',
+'nowikiemailtitle' => 'ఈ-మెయిళ�ళన� అన�మతించర�',
+'nowikiemailtext'  => 'ఇతర వాడ�కర�ల న�ండి ఈ-మెయిళ�ళన� అంద�కోడానికి ఈ వాడ�కరి స�మ�ఖంగా లేర�.',
+'email-legend'     => 'మరో {{SITENAME}} వాడ�కరికి వేగ� పంపించండి',
+'emailfrom'        => 'ఎవర�:',
+'emailto'          => 'ఎవరికి:',
+'emailsubject'     => 'విషయం:',
+'emailmessage'     => 'సందేశం:',
+'emailsend'        => 'పంపించ�',
+'emailccme'        => 'సందేశప� ఒక ప�రతిని నాక� ఈమెయిల� పంప�.',
+'emailccsubject'   => '$1 క� మీర� పంపిన సందేశప� ప�రతి: $2',
+'emailsent'        => 'ఈ-మెయిల� పంపించాం',
+'emailsenttext'    => 'మీ ఈ-మెయిల� సందేశం పంపబడింది.',
+'emailuserfooter'  => 'ఈ ఈ-మెయిల�ని $2 కి {{SITENAME}} లోని "వాడ�కరికి ఈమెయిల�" అనే సౌలభ�యం ద�వారా $1 పంపించార�.',
 
 # Watchlist
 'watchlist'            => 'నా వీక�షణ జాబితా',
@@ -1451,12 +1600,7 @@ $3 చెప�పిన కారణం: ''$2''",
 'iteminvalidname'      => "'$1' తో ఇబ�బంది, సరైన పేర� కాద�...",
 'wlnote'               => "గత {{PLURAL:$2|గంట సేపటిలో|'''$2''' గంటలలో}} జరిగిన చివరి {{PLURAL:$1|ఒక�క మార�పూ కింద ఉంది|'''$1''' మార�ప�లూ కింద ఉన�నాయి}}.",
 'wlshowlast'           => 'గత $1 గంటల� $2 రోజ�ల� $3 చూపించ�',
-'watchlist-show-bots'  => 'బాట� దిద�ద�బాట�లన� చూపించ�',
-'watchlist-hide-bots'  => 'బాట� దిద�ద�బాట�లన� దాచ�',
-'watchlist-show-own'   => 'నా దిద�ద�బాట�లన� చూపించ�',
-'watchlist-hide-own'   => 'నా దిద�ద�బాట�లన� దాచ�',
-'watchlist-show-minor' => 'చిన�న దిద�ద�బాట�లన� చూపించ�',
-'watchlist-hide-minor' => 'చిన�న మార�ప�లన� దాచ�',
+'watchlist-options'    => 'వీక�షణ జాబితా ఎంపికల�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'గమనిస�త�న�నాం...',
@@ -1496,29 +1640,29 @@ $NEWPAGE
 మీ అభిప�రయాల� చెప�పేంద�క�, మరింత సహాయానికై:
 {{fullurl:{{MediaWiki:helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'పేజీని త�డిచివేయి',
-'confirm'                     => 'ధృవీకరించ�',
-'excontent'                   => "ఇదివరక� విషయ సంగ�రహం: '$1'",
-'excontentauthor'             => "ఇదివరక� విషయ సంగ�రహం: '$1' (మరియ� దీని ఒకేఒక�క రచయిత '$2')",
-'exbeforeblank'               => "ఖాళీ చెయ�యకమ�ంద� పేజీలో ఉన�న విషయ సంగ�రహం: '$1'",
-'exblank'                     => 'పేజీ ఖాళీగా ఉంది',
-'delete-confirm'              => '"$1"ని తొలగించ�',
-'delete-legend'               => 'తొలగించ�',
-'historywarning'              => 'హెచ�చరిక: మీర� తొలగించబోయే పేజీకి చరిత�ర ఉంది:',
-'confirmdeletetext'           => 'మీరో పేజీనో, బొమ�మనో దాని చరిత�రతోపాట�గా శాశ�వతంగా డేటాబేస� న�ండి తీసెయ�యబోత�న�నార�. మీర� చెయ�యదలచింది ఇదేననీ, దీని పర�యవసానాల� మీక� తెల�సనీ, దీన�ని [[{{MediaWiki:Policy-url}}|నిభందనల]] ప�రకారమే చేస�త�న�నారనీ నిర�ధారించ�కోండి.',
-'actioncomplete'              => 'పని పూర�తయింది',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" త�డిచివేయబడింది. ఇటీవలి త�డిచివేతలక� సంబంధించిన నివేదిక కొరక� $2 చూడండి.',
-'deletedarticle'              => '"$1" త�డిచివేయబడినది',
-'suppressedarticle'           => '"[[$1]]" న� అణచి ఉంచాం',
-'dellogpage'                  => 'తొలగింప�ల చిట�టా',
-'dellogpagetext'              => 'ఇది ఇటీవలి త�డిచివేతల జాబితా.',
-'deletionlog'                 => 'తొలగింప�ల చిట�టా',
-'reverted'                    => 'పాత కూర�ప�క� తీస�క�వెళ�ళాం.',
-'deletecomment'               => 'త�డిచివేతక� కారణమ�',
-'deleteotherreason'           => 'ఇతర/అదనప� కారణం:',
-'deletereasonotherlist'       => 'ఇతర కారణాల�',
-'deletereason-dropdown'       => '* మామూల� తొలగింప� కారణాల�
+# Delete
+'deletepage'             => 'పేజీని త�డిచివేయి',
+'confirm'                => 'ధృవీకరించ�',
+'excontent'              => "ఇదివరక� విషయ సంగ�రహం: '$1'",
+'excontentauthor'        => "ఇదివరక� విషయ సంగ�రహం: '$1' (మరియ� దీని ఒకేఒక�క రచయిత '$2')",
+'exbeforeblank'          => "ఖాళీ చెయ�యకమ�ంద� పేజీలో ఉన�న విషయ సంగ�రహం: '$1'",
+'exblank'                => 'పేజీ ఖాళీగా ఉంది',
+'delete-confirm'         => '"$1"ని తొలగించ�',
+'delete-legend'          => 'తొలగించ�',
+'historywarning'         => 'హెచ�చరిక: మీర� తొలగించబోయే పేజీకి చరిత�ర ఉంది:',
+'confirmdeletetext'      => 'మీరో పేజీనో, బొమ�మనో దాని చరిత�రతోపాట�గా శాశ�వతంగా డేటాబేస� న�ండి తీసెయ�యబోత�న�నార�. మీర� చెయ�యదలచింది ఇదేననీ, దీని పర�యవసానాల� మీక� తెల�సనీ, దీన�ని [[{{MediaWiki:Policy-url}}|నిభందనల]] ప�రకారమే చేస�త�న�నారనీ నిర�ధారించ�కోండి.',
+'actioncomplete'         => 'పని పూర�తయింది',
+'deletedtext'            => '"<nowiki>$1</nowiki>" త�డిచివేయబడింది. ఇటీవలి త�డిచివేతలక� సంబంధించిన నివేదిక కొరక� $2 చూడండి.',
+'deletedarticle'         => '"$1" త�డిచివేయబడినది',
+'suppressedarticle'      => '"[[$1]]" న� అణచి ఉంచాం',
+'dellogpage'             => 'తొలగింప�ల చిట�టా',
+'dellogpagetext'         => 'ఇది ఇటీవలి త�డిచివేతల జాబితా.',
+'deletionlog'            => 'తొలగింప�ల చిట�టా',
+'reverted'               => 'పాత కూర�ప�క� తీస�క�వెళ�ళాం.',
+'deletecomment'          => 'త�డిచివేతక� కారణమ�',
+'deleteotherreason'      => 'ఇతర/అదనప� కారణం:',
+'deletereasonotherlist'  => 'ఇతర కారణాల�',
+'deletereason-dropdown'  => '* మామూల� తొలగింప� కారణాల�
 ** కొత�త సభ�య�ని ప�రయోగం
 ** చెత�తరాతలతో వికీపేజీలన� సృష�టించే ప�రయత�నం
 ** కాపీహక�క� ఉల�లంఘన
@@ -1536,50 +1680,69 @@ $NEWPAGE
 ** సభ�య�ని కోరికపై, సభ�య�ని ఉపపేజీ తొలగింప�
 ** � సభ�య�నికీ చెందని సభ�యపేజీ
 ** లేని వ�యాసానికి దారిమార�ప�',
-'delete-edit-reasonlist'      => 'తొలగింప� కారణాలని మార�చండి',
-'delete-toobig'               => 'ఈ పేజీకి $1 {{PLURAL:$1|కూర�ప�క�|కూర�ప�లక�}} మించిన, చాలా పెద�ద దిద�ద�బాట� చరితం ఉంది. {{SITENAME}}క� అడ�డంక�ల� కలగడాన�ని నివారించేంద�క� గాన�, అలాంటి పెద�ద పేజీల తొలగింప�న� నియంత�రించాం.',
-'delete-warning-toobig'       => 'ఈ పేజీకి $1 {{PLURAL:$1|కూర�ప�క�|కూర�ప�లక�}} మించిన, చాలా పెద�ద దిద�ద�బాట� చరితం ఉంది. దాన�ని తొలగిస�తే {{SITENAME}}కి చెందిన డేటాబేస� కార�యాలక� ఆటంకం కలగొచ�చ�; అప�రమత�తతో మ�ంద�క�సాగండి.',
-'rollback'                    => 'దిద�ద�బాట�లన� వెనక�క�తిప�ప�',
-'rollback_short'              => 'వెనక�క�తిప�ప�',
-'rollbacklink'                => 'రద�ద�చేయి',
-'rollbackfailed'              => 'రోల�‌బ�యాక� విఫలమైంది',
-'cantrollback'                => 'రచనన� వెనక�కి తీస�క�వెళ�ళలేమ�; ఈ పేజీకి ఇదొక�కటే రచన.',
-'alreadyrolled'               => '[[$1]]లో [[User:$2|$2]] ([[User talk:$2|చర�చ]]) చేసిన చివరి మార�ప�న� రోల�‌బాక� చెయ�యలేమ�;
+'delete-edit-reasonlist' => 'తొలగింప� కారణాలని మార�చండి',
+'delete-toobig'          => 'ఈ పేజీకి $1 {{PLURAL:$1|కూర�ప�క�|కూర�ప�లక�}} మించిన, చాలా పెద�ద దిద�ద�బాట� చరితం ఉంది. {{SITENAME}}క� అడ�డంక�ల� కలగడాన�ని నివారించేంద�క� గాన�, అలాంటి పెద�ద పేజీల తొలగింప�న� నియంత�రించాం.',
+'delete-warning-toobig'  => 'ఈ పేజీకి $1 {{PLURAL:$1|కూర�ప�క�|కూర�ప�లక�}} మించిన, చాలా పెద�ద దిద�ద�బాట� చరితం ఉంది. దాన�ని తొలగిస�తే {{SITENAME}}కి చెందిన డేటాబేస� కార�యాలక� ఆటంకం కలగొచ�చ�; అప�రమత�తతో మ�ంద�క�సాగండి.',
+
+# Rollback
+'rollback'         => 'దిద�ద�బాట�లన� వెనక�క�తిప�ప�',
+'rollback_short'   => 'వెనక�క�తిప�ప�',
+'rollbacklink'     => 'రద�ద�చేయి',
+'rollbackfailed'   => 'రోల�‌బ�యాక� విఫలమైంది',
+'cantrollback'     => 'రచనన� వెనక�కి తీస�క�వెళ�ళలేమ�; ఈ పేజీకి ఇదొక�కటే రచన.',
+'alreadyrolled'    => '[[$1]]లో [[User:$2|$2]] ([[User talk:$2|చర�చ]]) చేసిన చివరి మార�ప�న� రోల�‌బాక� చెయ�యలేమ�;
 మరెవరో ఆ పేజీని రోల�‌బాక� చేసార�, లేదా మార�చార�.
 
 చివరి మార�ప�ల� చేసినవార�: [[User:$3|$3]] ([[User talk:$3|చర�చ]]).',
-'editcomment'                 => 'దిద�ద�బాట� వ�యాఖ�య: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|చర�చ]]) చేసిన మార�ప�లన� [[User:$1|$1]] యొక�క చివరి కూర�ప� వరక� తిప�పికొట�టార�.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 చేసిన దిద�ద�బాట�లన� వెనక�క� తీస�కెళ�ళాం; తిరిగి $2 చేసిన చివరి కూర�ప�క� మార�చాం.',
-'sessionfailure'              => 'మీ లాగిన� సెషన�తో �దో సమస�య ఉన�నట�ల�ంది;
+'editcomment'      => "దిద�ద�బాట� సారాశం: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|చర�చ]]) చేసిన మార�ప�లన� [[User:$1|$1]] యొక�క చివరి కూర�ప� వరక� తిప�పికొట�టార�.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 చేసిన దిద�ద�బాట�లన� వెనక�క� తీస�కెళ�ళాం; తిరిగి $2 చేసిన చివరి కూర�ప�క� మార�చాం.',
+'sessionfailure'   => 'మీ లాగిన� సెషన�తో �దో సమస�య ఉన�నట�ల�ంది;
 సెషన� హైజాక� కాక�ండా ఈ చర�యన� రద�ద� చేసాం.
 "back" కొట�టి, ఎక�కడి న�ండి వచ�చారో ఆ పేజీని మళ�ళీ లోడ� చేసి, మళ�ళీ ప�రయత�నించండి.',
+
+# Protect
 'protectlogpage'              => 'సంరక�షణల చిట�టా',
 'protectlogtext'              => 'పేజీ సంరక�షణ గ�రించిన వివరాల జాబితా క�రింద వ�న�నది.',
 'protectedarticle'            => '"[[$1]]" సంరక�షించబడింది.',
 'modifiedarticleprotection'   => '"[[$1]]" సరక�షణ స�థాయిని మార�చాం',
 'unprotectedarticle'          => '"[[$1]]" న� సంరక�షణ న�ండి తీసేసాం',
+'movedarticleprotection'      => 'సంరక�షణా అమరికని "[[$2]]" న�ండి "[[$1]]"కి మార�చార�',
 'protect-title'               => '"$1" క� సంరక�షణ స�థాయిని సెట� చేస�త�న�నాం',
+'prot_1movedto2'              => '$1, $2క� తరలించబడింది',
 'protect-legend'              => 'సంరక�షణన� నిర�ధారించ�',
 'protectcomment'              => 'సంరక�షించడానికి కారణం',
 'protectexpiry'               => 'గడ�వ�:',
 'protect_expiry_invalid'      => 'గడ�వ� సమయాన�ని సరిగ�గా ఇవ�వలేద�.',
 'protect_expiry_old'          => 'మీరిచ�చిన గడ�వ� ప�రస�త�త సమయం కంటే మ�ంద� ఉంది.',
 'protect-unchain'             => 'తరలింప� హక�క�లపై రక�షణన� తీసేయి',
-'protect-text'                => 'ఈ పెజీ <strong><nowiki>$1</nowiki></strong> ఎంత సంరక�షణలొ వ�ందో మీర� ఇక�కడ చూడవచ�చ�, మార�చవచ�చ�.',
-'protect-locked-blocked'      => 'నిరోధించబడి ఉండగా మీర� సంరక�షణ స�థాయిని మార�చలేర�. ప�రస�త�తం <strong>$1</strong> పేజీకి ఉన�న సెట�టింగ�లివి:',
-'protect-locked-dblock'       => 'ప�రస�త�తం అమల�లో ఉన�న డేటాబేస� లాక� కారణంగా సంరక�షణ స�థాయిని సెట� చెయ�యడం క�దరద�. ప�రస�త�తం <strong>$1</strong> పేజీకి ఉన�న సెట�టింగ�లివి:',
-'protect-locked-access'       => 'మీ ఖాతక� పేజీ రక�షన స�థాయిని మార�చే హక�క�ల� లేవ�.
-<strong>$1</strong> అనే పేర�న�న ఈ పేజీకి ప�రస�త�తం ఈ రక�షణ ఉంది:',
+'protect-text'                => "ఈ పెజీ '''<nowiki>$1</nowiki>''' ఎంత సంరక�షణలొ వ�ందో మీర� ఇక�కడ చూడవచ�చ�, మార�చవచ�చ�.",
+'protect-locked-blocked'      => "నిరోధించబడి ఉండగా మీర� సంరక�షణ స�థాయిని మార�చలేర�. ప�రస�త�తం '''$1''' పేజీకి ఉన�న సెట�టింగ�లివి:",
+'protect-locked-dblock'       => "ప�రస�త�తం అమల�లో ఉన�న డేటాబేస� లాక� కారణంగా సంరక�షణ స�థాయిని సెట� చెయ�యడం క�దరద�. ప�రస�త�తం '''$1''' పేజీకి ఉన�న సెట�టింగ�లివి:",
+'protect-locked-access'       => "మీ ఖాతక� పేజీ రక�షన స�థాయిని మార�చే హక�క�ల� లేవ�.
+'''$1''' అనే పేర�న�న ఈ పేజీకి ప�రస�త�తం ఈ రక�షణ ఉంది:",
 'protect-cascadeon'           => 'ఈ పేజీ కాస�కేడింగ� రక�షణలో ఉన�న ఈ కింది {{PLURAL:$1|పేజీకి|పేజీలక�}} జతచేయటం వలన, ప�రస�త�తం రక�షణలో ఉంది.  మీర� ఈ పేజీ యొక�క రక�షణ స�థాయిన మార�చవచ�చ�, దాని వలన కాస�కేడింగ� రక�షణక� ఎట�వంటి సమస�య ఉండద�.',
-'protect-default'             => '(డీఫాల�ట�)',
+'protect-default'             => 'అందర� వాడ�కర�లన� అన�మతించ�',
 'protect-fallback'            => '"$1" అన�మతి అవసరం',
-'protect-level-autoconfirmed' => 'అజ�ఞాత సభ�య�లన� నిరోధించ�',
+'protect-level-autoconfirmed' => 'కొత�త మరియ� నమోద�కాని వాడ�కర�లన� నిరోధించ�',
 'protect-level-sysop'         => 'నిర�వాహక�ల� మాత�రమే',
 'protect-summary-cascade'     => 'కాస�కేడింగ�',
 'protect-expiring'            => '$1 (UTC)న కాలంచెల�ల�త�ంది',
+'protect-expiry-indefinite'   => 'నిరవధికం',
 'protect-cascade'             => 'ఈ పేజీకి జతపరిచిన పేజీలన� కూడా రక�షించ� (కాస�కేడింగ� రక�షణ)',
 'protect-cantedit'            => 'ఈ పేజీ యొక�క సంరక�షణా స�థాయిని మీర� మార�చలేర�, ఎంద�కంటే దాన�ని మార�చే అన�మతి మీక� లేద�.',
+'protect-othertime'           => 'ఇతర సమయం:',
+'protect-othertime-op'        => 'ఇతర సమయం',
+'protect-existing-expiry'     => 'ప�రస�త�త కాల పరిమితి: $3, $2',
+'protect-otherreason'         => 'ఇతర/అదనప� కారణం:',
+'protect-otherreason-op'      => 'ఇతర/అదనప� కారణం',
+'protect-dropdown'            => '*సాధారణ సంరక�షణ కారణాల�
+** అత�యధిక వాండలిజం
+** అత�యధిక స�పామింగ�
+** నిర�మాణాత�మకంగా లేని మార�ప�ల య�ద�ధం
+** అధిక రద�దీగల పేజీ',
+'protect-edit-reasonlist'     => 'సంరక�షణా కారణాలని మార�చండి',
+'protect-expiry-options'      => '2 గంటల�:2 hours,1 రోజ�:1 day,3 రోజ�ల�:3 days,1 వారం:1 week,2 వారాల�:2 weeks,1 నెల:1 month,3 నెలల�:3 months,6 నెలల�:6 months,1 సంవత�సరం:1 year,ఎప�పటికీ:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'అన�మతి:',
 'restriction-level'           => 'నిరోధ స�థాయి:',
 'minimum-size'                => 'కనీస పరిమాణం',
@@ -1602,7 +1765,8 @@ $NEWPAGE
 'undeletepage'                 => 'త�డిచివేయబడిన పేజీలన� చూపించ�, ప�నఃస�థాపించ�',
 'undeletepagetitle'            => "'''క�రింద చూపిస�త�న�నవి [[:$1]] యొక�క తొలగించిన మార�ప�ల�'''.",
 'viewdeletedpage'              => 'తొలగించిన పేజీలన� చూడండి',
-'undeletepagetext'             => 'కీంది పేజీల� త�డిచివేయబడినవి, కానీ ప�నఃస�థాపనక� వీల�గా సంగ�రహంలో ఉన�నాయి. సంగ�రహం నిర�ణీత వ�యవధ�లలో పూర�తిగా ఖాళీ చేయబడ�త�ంట�ంది.',
+'undeletepagetext'             => 'క�రింది {{PLURAL:$1|పేజీని|$1 పేజీలన�}} తొలగించార�, కానీ ప�నఃస�థాపనక� వీల�గా భండాగారంలో ఉన�నాయి.
+భండాగారం నిర�ణీత వ�యవధ�లలో పూర�తిగా ఖాళీ చేయబడ�త�ంట�ంది.',
 'undelete-fieldset-title'      => 'కూర�ప�లన� ప�నఃస�థాపించండి',
 'undeleteextrahelp'            => "పేజీ మొత�తాన�ని ప�నస�థాపించేంద�క�, చెక� బాక�స�లన�నిటినీ ఖాళీగా ఉంచి, '''''ప�నస�థాపించ�''''' నొక�కండి. కొన�ని కూర�ప�లన� మాత�రమే ప�సస�థాపించ దలిస�తే, సదర� కూర�ప�లక� ఎద�ర�గా ఉన�న చెక� బాక�స�లలో టిక�క� పెట�టి, '''''ప�నస�థాపించ�''''' నొక�కండి. '''''మ�న�పటి వలె''''' న� నొక�కినప�డ�, చెక� బాక�స�లన�, వ�యాఖ�య పెట�టెన� ఖాళీ చేసిపెడ�త�ంది.",
 'undeleterevisions'            => '$1 {{PLURAL:$1|కూర�ప�న�|కూర�ప�లన�}} భాండారానికి చేర�చాం',
@@ -1611,7 +1775,7 @@ $NEWPAGE
 అంతే కాద� పేజీ పైన ఇంతక� మ�ంద� ఉన�న రక�షణలన�నీ పోతాయాని గమనించండి.',
 'undeleterevdel'               => 'తొలగింప�న� రద�ద� చేస�త�న�నప�ప�డ�, అన�నిటికంటే పైన�న�న కూర�ప� పాక�షికంగా తొలగింపబడే పక�షంలో తొలగింప�-రద�ద� జరగద�. అట�వంటి సందర�భాల�లో, తొలగించిన కూర�ప�లలో కొత�తవాటిని ఎంచ�కోక�ండా ఉండాలి, లేదా దాప� న�ండి తీసెయ�యాలి.',
 'undeletehistorynoadmin'       => 'ఈ వ�యాసం త�డిచివేయబడినది. త�డిచివేయడానికి కారణమ�, పేజీలో మార�ప�ల� చేసిన సభ�య�లతో సహా కింద సారాంశంలో చూపబడింది. త�డిచివేయబడిన సంచికలలోని విషయ సంగ�రహం నిర�వాహక�లక� మాత�రమే అంద�బాట�లో ఉంది.',
-'undelete-revision'            => '$1 యొక�క తొలగించబడిన కూర�ప� ($2 నాటిది). చివరి దిద�ద�బాట� చేసినది - $3:',
+'undelete-revision'            => '$1 యొక�క తొలగించబడిన కూర�ప� (చివరగా $4 నాడ�, $5కి $3 మార�చార�):',
 'undeleterevision-missing'     => 'తప�ప�డ� లేదా తప�పిపోయిన కూర�ప�. మీర� నొక�కింది తప�ప�డ� లింక� కావచ�చ�, లేదా భాండాగారం న�ండి కూర�ప� ప�నఃస�థాపించబడి లేదా తొలగించబడి ఉండవచ�చ�.',
 'undelete-nodiff'              => 'గత కూర�ప�లేమీ లేవ�.',
 'undeletebtn'                  => 'ప�నఃస�థాపించ�',
@@ -1625,7 +1789,7 @@ $NEWPAGE
 'cannotundelete'               => 'తొలగింప� రద�ద� విఫలమైంది; ఆ పేజీ తొలగింప�న� వేరెవరైనా రద�ద� చేసి ఉండవచ�చ�.',
 'undeletedpage'                => "<big>'''$1 న� ప�నస�థాపించాం'''</big>
 
-ఇటీవల జరిగిన తొలగింప�ల�, ప�నస�థాపనల కొరక� [[Special:Log/delete|తొలగింప� లాగ�]] చూడండి.",
+ఇటీవల జరిగిన తొలగింప�ల�, ప�నస�థాపనల కొరక� [[Special:Log/delete|తొలగింప� చిట�టా]]ని చూడండి.",
 'undelete-header'              => 'ఇటీవల తొలగించిన పేజీల కొరక� [[Special:Log/delete|తొలగింప� లాగ�]] చూడండి.',
 'undelete-search-box'          => 'తొలగించిన పేజీలన� వెత�క�',
 'undelete-search-prefix'       => 'దీనితో మొదలయ�యే పేజీల� చూపించ�:',
@@ -1646,13 +1810,14 @@ $NEWPAGE
 'blanknamespace' => '(మొదటి)',
 
 # Contributions
-'contributions' => 'సభ�య�ని రచనల�',
-'mycontris'     => 'నా మార�ప�ల�-చేర�ప�ల�',
-'contribsub2'   => '$1 ($2) కొరక�',
-'nocontribs'    => 'ఈ విధమైన మార�ప�లేమీ దొరకలేద�.',
-'uctop'         => '(పైది)',
-'month'         => 'ఈ నెల న�ండి (దాని మ�ంద�వి కూడా):',
-'year'          => 'ఈ సంవత�సరం న�ండి (దాని మ�ంద�వి కూడా):',
+'contributions'       => 'సభ�య�ని రచనల�',
+'contributions-title' => '$1 యొక�క మార�ప�ల�-చేర�ప�ల�',
+'mycontris'           => 'నా మార�ప�ల�-చేర�ప�ల�',
+'contribsub2'         => '$1 ($2) కొరక�',
+'nocontribs'          => 'ఈ విధమైన మార�ప�లేమీ దొరకలేద�.',
+'uctop'               => '(పైది)',
+'month'               => 'ఈ నెల న�ండి (దాని మ�ంద�వి కూడా):',
+'year'                => 'ఈ సంవత�సరం న�ండి (దాని మ�ంద�వి కూడా):',
 
 'sp-contributions-newbies'     => 'కొత�త సభ�య�ల� చేసిన రచనల� మాత�రమే చూపించ�',
 'sp-contributions-newbies-sub' => 'కొత�తవారి కోసం',
@@ -1665,7 +1830,6 @@ $NEWPAGE
 'whatlinkshere'            => 'ఇక�కడికి లింక� చేస�త�న�న పేజీల�',
 'whatlinkshere-title'      => '"$1"కి లింక�న�న పేజీల�',
 'whatlinkshere-page'       => 'పేజీ:',
-'linklistsub'              => '(లింక�ల జాబితా)',
 'linkshere'                => "కిందన�న�న పేజీల న�ండి '''[[:$1]]'''క� లింక�ల� ఉన�నాయి:",
 'nolinkshere'              => "'''[[:$1]]'''క� � పేజీ న�ండీ లింక� లేద�.",
 'nolinkshere-ns'           => "'''[[:$1]]''' పేజీకి లింకయ�యే పేజీల� ఎంచ�క�న�న నేంస�పేస�లో లేవ�.",
@@ -1710,6 +1874,8 @@ $NEWPAGE
 'ipbotherreason'                  => 'ఇతర/అదనప� కారణం',
 'ipbhidename'                     => 'నిరోధప� చిట�టా న�ండి, క�రియాశీల నిరోధప� జాబితా న�ండి  మరియ� వాడ�కర�ల జాబితాల న�ండి ఈ వాడ�కరిపేర�ని దాచ�',
 'ipbwatchuser'                    => 'ఈ సభ�య�ని సభ�య�ని పేజీ, చర�చాపేజీలన� వీక�షణలో ఉంచ�',
+'ipballowusertalk'                => 'నిరోధంలో ఉన�నప�ప�డ� ఈ వాడ�కరిని తమ చర�చా పేజీలో మార�ప�ల� చేస�కోనివ�వండి',
+'ipb-change-block'                => 'ఈ అమరికలతో వాడ�కరిని ప�నర�నిరోధించ�',
 'badipaddress'                    => 'సరైన �.పి. అడ�రస� కాద�',
 'blockipsuccesssub'               => 'నిరోధం విజయవంతం అయింది',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] నిరోధించబడింది.
@@ -1721,12 +1887,14 @@ $NEWPAGE
 'ipb-blocklist'                   => 'అమల�లో ఉన�న నిరోధాలన� చూపించ�',
 'unblockip'                       => 'సభ�య�నిపై నిరోధాన�ని తొలగించ�',
 'unblockiptext'                   => 'కింది ఫారం ఉపయోగించి, నిరోధించబడిన �.పీ. చిర�నామా లేదా సభ�య�నికి తిరిగి రచనల� చేసే అధికారం ఇవ�వవచ�చ�.',
-'ipusubmit'                       => 'ఈ చిర�నామాపై నిరోధం తొలగించ�',
+'ipusubmit'                       => 'ఈ నిరోధాన�ని తొలగించ�',
 'unblocked'                       => '[[User:$1|$1]]పై నిరోధం తొలగించబడింది',
 'unblocked-id'                    => '$1 అనే నిరోధాన�ని తొలగించాం',
 'ipblocklist'                     => 'నిరోధించబడిన �.పీ. చిర�నామాల� మరియ� వాడ�కర�ల పేర�ల�',
 'ipblocklist-legend'              => 'నిరోధించబడిన సభ�య�ని వెతకండి',
 'ipblocklist-username'            => 'సభ�యనామం లేదా IP అడ�రస�:',
+'ipblocklist-sh-userblocks'       => '$1 ఖాతా నిరోధాల�',
+'ipblocklist-sh-tempblocks'       => '$1 తాత�కాలిక నిరోధాల�',
 'ipblocklist-submit'              => 'వెత�క�',
 'blocklistline'                   => '$1, $2ల� $3 ($4)న� నిరోధించార�.',
 'infiniteblock'                   => 'అనంతం',
@@ -1735,25 +1903,32 @@ $NEWPAGE
 'noautoblockblock'                => 'ఆటోమాటిక� నిరోధాన�ని అశక�తం చేసాం',
 'createaccountblock'              => 'ఖాతా తెరవడాన�ని నిరోధించామ�',
 'emailblock'                      => 'ఈ-మెయిల�ని నిరోధించాం',
+'blocklist-nousertalk'            => 'తమ చర�చాపేజీని మార�చలేర�',
 'ipblocklist-empty'               => 'నిరోధప� జాబితా ఖాళీగా ఉంది.',
 'ipblocklist-no-results'          => 'మీరడిగిన �పీ అడ�రస� లేదా సభ�యనామాన�ని నిరోధించలేద�.',
 'blocklink'                       => 'నిరోధించ�',
 'unblocklink'                     => 'నిరోధం తొలగించ�',
+'change-blocklink'                => 'నిరోధాన�ని మార�చండి',
 'contribslink'                    => 'రచనల�',
 'autoblocker'                     => 'మీ �.పీ. అడ�రస�న� "[[User:$1|$1]]" ఇటీవల వాడ�ట చేత, అది ఆటోమాటిక�‌గా నిరోధించబడినది. $1న� నిరోధించడానికి కారణం: "\'\'\'$2\'\'\'"',
 'blocklogpage'                    => 'నిరోధాల చిట�టా',
+'blocklog-fulllog'                => ' నిరోధప� పూర�తి చిట�టా',
 'blocklogentry'                   => '"[[$1]]" పై నిరోధం అమలయింది. నిరోధ కాలం $2 $3',
+'reblock-logentry'                => '[[$1]] కై నిరోధప� అమరికలన� $2 $3 గడ�వ�తో మార�చార�',
 'blocklogtext'                    => 'వాడ�కర�ల నిరోధాల�, ప�నస�థాపనల చిట�టా ఇది. ఆటోమాటిక�‌గా నిరోధానికి గ�రైన �.పి. చిర�నామాల� ఈ జాబితాలో ఉండవ�. ప�రస�త�తం అమల�లో ఉన�న నిరోధాల�, నిషేధాల కొరక� [[Special:IPBlockList|�.పి. నిరోధాల జాబితా]]న� చూడండి.',
 'unblocklogentry'                 => '$1పై నిరోధం తొలగించబడింది',
 'block-log-flags-anononly'        => 'అజ�ఞాత వాడ�కర�ల� మాత�రమే',
 'block-log-flags-nocreate'        => 'ఖాతా సృష�టించడాన�ని అశక�తం చేసాం',
 'block-log-flags-noautoblock'     => 'ఆటోమాటిక� నిరోధాన�ని అశక�తం చేసాం',
 'block-log-flags-noemail'         => 'ఈ-మెయిల�ని నిరోధించాం',
+'block-log-flags-nousertalk'      => 'తమ చర�చాపేజీని మార�చలేర�',
 'block-log-flags-angry-autoblock' => 'మరింత ధృడమైన స�వయంనిరోధకం సచేతనం చేయబడింది',
 'range_block_disabled'            => 'శ�రేణి(రేంజి) నిరోధం చెయ�యగల నిర�వాహక అన�మతిని అశక�తం చేసాం.',
 'ipb_expiry_invalid'              => 'అంతమయ�యే గడ�వ� సరైనది కాద�.',
 'ipb_expiry_temp'                 => 'దాచిన వాడ�కరిపేర� నిరోధాల� శాశ�వతంగా ఉండాలి.',
 'ipb_already_blocked'             => '"$1" న� ఇప�పటికే నిరోధించాం',
+'ipb-needreblock'                 => '== ఇప�పటికే నిరోధించార� ==
+$1ని ఇప�పటికే నిరోధించార�. ఆ అమరికలని మీర� మార�చాలన�క�ంట�న�నారా?',
 'ipb_cant_unblock'                => 'లోపం: నిరోధించిన �డీ $1 దొరకలేద�. దానిపై ఉన�న నిరోధాన�ని ఈసరికే తొలగించి ఉండవచ�చ�.',
 'ipb_blocked_as_range'            => 'లోపం: �పీ $1 న� నేర�గా నిరోధించలేద�, అంచేత నిరోధాన�ని రద�ద�పరచలేమ�.  అయితే, అది $2 శ�రేణిలో భాగంగా నిరోధానికి గ�రైంది, ఈ శ�రేణిపై ఉన�న నిరోధాన�ని రద�ద�పరచవచ�చ�.',
 'ip_range_invalid'                => 'సరైన �పీ శ�రేణి కాద�.',
@@ -1764,6 +1939,7 @@ $NEWPAGE
 'proxyblocksuccess'               => 'పనయింది.',
 'sorbsreason'                     => '{{SITENAME}} వాడే DNSBLలో మీ �పీ అడ�రస� ఒక ఓపెన� ప�రాక�సీగా నమోదై ఉంది.',
 'sorbs_create_account_reason'     => 'మీ �పీ అడ�రస� DNSBL లో ఓపెన� ప�రాక�సీగా నమోదయి ఉంది. మీర� ఎకౌంట�న� సృష�టించజాలర�.',
+'cant-block-while-blocked'        => 'నిరోధంలో ఉన�న మీర� ఇతర వాడ�కర�లపై నిరోధం అమల�చేయలేర�.',
 
 # Developer tools
 'lockdb'              => 'డాటాబేస�న� లాక�‌ చెయ�యి',
@@ -1786,9 +1962,9 @@ $NEWPAGE
 'databasenotlocked'   => 'డేటాబేస� లాకవలేద�.',
 
 # Move page
-'move-page'               => '$1 తరలింప�',
-'move-page-legend'        => 'పేజీని తరలించ�',
-'movepagetext'            => "కింది ఫారం ఉపయోగించి, ఓ పేజీ పేర� మార�చవచ�చ�. దాంతో పాట� దాని చరిత�ర అంతా కొత�త పేజీ చరిత�రగా మార�త�ంది.
+'move-page'                    => '$1 తరలింప�',
+'move-page-legend'             => 'పేజీని తరలించ�',
+'movepagetext'                 => "కింది ఫారం ఉపయోగించి, ఓ పేజీ పేర� మార�చవచ�చ�. దాంతో పాట� దాని చరిత�ర అంతా కొత�త పేజీ చరిత�రగా మార�త�ంది.
 పాత పేజీ కొత�త దానికి దారిమార�ప� పేజీ అవ�త�ంది.
 పాత పేజీకి ఉన�న దారిమార�ప� పేజీలన� ఆటోమెటిగ�గా సరిచేయవచ�చ�.
 ఆలా చేయవద�దన�క�ంటే, [[Special:DoubleRedirects|ద�వంద]] లేదా [[Special:BrokenRedirects|పనిచేయని]] దారిమార�ప�ల పేజీలలో సరిచూస�కోండి.
@@ -1801,48 +1977,58 @@ $NEWPAGE
 '''హెచ�చరిక!'''
 ఈ మార�ప� బాగా జనరంజకమైన పేజీలక� అనూహ�యం కావచ�చ�; 
 దాని పరిణామాలన� అర�ధం చేస�క�ని మ�ంద�క�సాగండి.",
-'movepagetalktext'        => "దానితో పాట� సంబంధిత చర�చా పేజీ కూడా ఆటోమాటిక�‌‌గా తరలించబడ�త�ంది, '''కింది సందర�భాలలో తప�ప:'''
+'movepagetalktext'             => "దానితో పాట� సంబంధిత చర�చా పేజీ కూడా ఆటోమాటిక�‌‌గా తరలించబడ�త�ంది, '''కింది సందర�భాలలో తప�ప:'''
 *ఒక నేంస�పేస� న�ండి ఇంకోదానికి తరలించేటప�డ�,
 *కొత�త పేర�తో ఇప�పటికే ఒక చర�చా పేజీ ఉంటే,
 *కింది చెక�‌బాక�స�లో టిక�క� పెట�టకపోతే.
 
 ఆ సందర�భాలలో, మీర� చర�చా పేజీని కూడా పనిగట�ట�క�ని తరలించవలసి ఉంట�ంది, లేదా �కీకృత పరచవలసి ఉంట�ంది.",
-'movearticle'             => 'పేజీని తరలించ�',
-'movenotallowed'          => 'పేజీలన� తరలించడానికి మీక� అన�మతి లేద�.',
-'newtitle'                => 'కొత�త పేర�కి',
-'move-watch'              => 'ఈ పేజీని గమనించ�',
-'movepagebtn'             => 'పేజీని తరలించ�',
-'pagemovedsub'            => 'తరలింప� విజయవంతమైనది',
-'movepage-moved'          => '<big>\'\'\'"$1"ని "$2"కి తరలించాం\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'ఆ పేర�తో ఇప�పటికే ఒక పేజీ ఉంది, లేదా మీర� ఎంచ�క�న�న పేర� సరైనది కాద�. వేరే పేర� ఎంచ�కోండి.',
-'cantmove-titleprotected' => 'ఈ పేర�తోఉన�న పేజీని సృష�టించనివ�వక�ండా సంరక�షిస�త�న�నార�, అంద�కని ఈ ప�రదేశంలోకి పేజీని తరలించలేన�',
-'talkexists'              => "'''పేజీని జయప�రదంగా తరలించామ�, కానీ చర�చా పేజీని తరలించలేక పోయామ�. కొత�త పేర�తో చర�చ పేజీ ఇప�పటికే ఉంది, ఆ రెంటినీ మీరే �కీకృతం చెయ�యండి.'''",
-'movedto'                 => 'తరలింప�',
-'movetalk'                => 'కూడా వ�న�న చర�చ పేజీని తరలించ�',
-'move-subpages'           => 'అన�ని ఉపపేజీలన� కూడా తరలించ�, వర�తిస�తే',
-'move-talk-subpages'      => 'వర�తిస�తే, చర�చా పేజీ యొక�క అన�ని ఉపపేజీలన� తరలించ�',
-'movepage-page-exists'    => '$1 అనే పేజీ ఈపాటికే ఉంది మరియ� దాన�ని ఆటోమెటిగ�గా ఈ పేజీతో మార�చివేయలేర�.',
-'movepage-page-moved'     => '$1 అనే పేజీని $2 కి తరలించాం.',
-'movepage-page-unmoved'   => '$1 అనే పేజీని $2 కి తరలించలేకపోయామ�.',
-'movepage-max-pages'      => '$1 యొక�క గరిష�ఠ పరిమితి {{PLURAL:$1|పేజీ|పేజీల�}} వరక� తరలించడమైనది. ఇక ఆటోమాటిగ�గా తరలించమ�.',
-'1movedto2'               => '$1, $2క� తరలించబడింది',
-'1movedto2_redir'         => '[[$1]] న� దారిమార�ప� ద�వారా [[$2]] క� తరలించాం',
-'movelogpage'             => 'తరలింప�ల చిట�టా',
-'movelogpagetext'         => 'కింద తరలించిన పేజీల జాబితా ఉన�నది.',
-'movereason'              => 'కారణమ�',
-'revertmove'              => 'తరలింప�న� రద�ద�చేయి',
-'delete_and_move'         => 'తొలగించి, తరలించ�',
-'delete_and_move_text'    => '==తొలగింప� అవసరం==
+'movearticle'                  => 'పేజీని తరలించ�',
+'movenologin'                  => 'లాగిన�‌ అయిలేర�',
+'movenologintext'              => 'పేజీని తరలించడానికి మీర� [[Special:UserLogin|లాగిన�‌]] అయిఉండాలి.',
+'movenotallowed'               => 'పేజీలన� తరలించడానికి మీక� అన�మతి లేద�.',
+'movenotallowedfile'           => 'మీక� ఫైళ�ళన� తరలించే అన�మతి లేద�.',
+'cant-move-user-page'          => 'వాడ�కరి పేజీలన� (ఉపపేజీల� కానివాటిని) తరలించే అన�మతి మీక� లేద� .',
+'cant-move-to-user-page'       => 'మీక� ఒక పేజీని వాడ�కరి పేజీగా (వాడ�కరి ఉపపేజీగా తప�ప) తరలించే అన�మతి లేద�.',
+'newtitle'                     => 'కొత�త పేర�కి',
+'move-watch'                   => 'ఈ పేజీని గమనించ�',
+'movepagebtn'                  => 'పేజీని తరలించ�',
+'pagemovedsub'                 => 'తరలింప� విజయవంతమైనది',
+'movepage-moved'               => '<big>\'\'\'"$1"ని "$2"కి తరలించాం\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'                => 'ఆ పేర�తో ఇప�పటికే ఒక పేజీ ఉంది, లేదా మీర� ఎంచ�క�న�న పేర� సరైనది కాద�. వేరే పేర� ఎంచ�కోండి.',
+'cantmove-titleprotected'      => 'ఈ పేర�తోఉన�న పేజీని సృష�టించనివ�వక�ండా సంరక�షిస�త�న�నార�, అంద�కని ఈ ప�రదేశంలోకి పేజీని తరలించలేన�',
+'talkexists'                   => "'''పేజీని జయప�రదంగా తరలించామ�, కానీ చర�చా పేజీని తరలించలేక పోయామ�. కొత�త పేర�తో చర�చ పేజీ ఇప�పటికే ఉంది, ఆ రెంటినీ మీరే �కీకృతం చెయ�యండి.'''",
+'movedto'                      => 'తరలింప�',
+'movetalk'                     => 'కూడా వ�న�న చర�చ పేజీని తరలించ�',
+'move-subpages'                => 'అన�ని ఉపపేజీలన� కూడా తరలించ�, వర�తిస�తే',
+'move-talk-subpages'           => 'వర�తిస�తే, చర�చా పేజీ యొక�క అన�ని ఉపపేజీలన� తరలించ�',
+'movepage-page-exists'         => '$1 అనే పేజీ ఈపాటికే ఉంది మరియ� దాన�ని ఆటోమెటిగ�గా ఈ పేజీతో మార�చివేయలేర�.',
+'movepage-page-moved'          => '$1 అనే పేజీని $2 కి తరలించాం.',
+'movepage-page-unmoved'        => '$1 అనే పేజీని $2 కి తరలించలేకపోయామ�.',
+'movepage-max-pages'           => '$1 యొక�క గరిష�ఠ పరిమితి {{PLURAL:$1|పేజీ|పేజీల�}} వరక� తరలించడమైనది. ఇక ఆటోమాటిగ�గా తరలించమ�.',
+'1movedto2'                    => '$1, $2క� తరలించబడింది',
+'1movedto2_redir'              => '[[$1]] న� దారిమార�ప� ద�వారా [[$2]] క� తరలించాం',
+'movelogpage'                  => 'తరలింప�ల చిట�టా',
+'movelogpagetext'              => 'కింద తరలించిన పేజీల జాబితా ఉన�నది.',
+'movereason'                   => 'కారణమ�',
+'revertmove'                   => 'తరలింప�న� రద�ద�చేయి',
+'delete_and_move'              => 'తొలగించి, తరలించ�',
+'delete_and_move_text'         => '==తొలగింప� అవసరం==
 
 ఉద�దేశించిన వ�యాసం "[[:$1]]" ఇప�పటికే ఉనికిలో ఉంది. ప�రస�త�త తరలింప�క� వీల�గా దాన�ని తొలగించేయమంటారా?',
-'delete_and_move_confirm' => 'అవ�న�, పేజీని తొలగించ�',
-'delete_and_move_reason'  => 'తరలింప�క� వీల�గా తొలగించబడింది',
-'selfmove'                => 'మూలం, గమ�యం పేర�ల� ఒకటే; పేజీని దాని పైకే తరలించడం క�దరద�.',
-'immobile_namespace'      => 'మీర� తరలించబోత�న�న పేజీ లేదా గమ�యస�థానంలో ఉన�న పేజీ ఒక ప�రత�యేక పేజీ; ఆ నేంస�పేస�లోకి లేదా ఆ నేంస�పేస� న�ండి తరలించటం క�దరద�.',
-'imagenocrossnamespace'   => 'ఫైల�న�, ఫైల�క� చెందని నేమ�‌స�పేస�క� తరలించలేం',
-'imagetypemismatch'       => 'ఈ కొత�త ఫైల� ఎక�స�&zwnj;టెన�షన� ఫైల� రకానికి సరిపోలేద�',
-'imageinvalidfilename'    => 'టార�గెట� ఫైల� పేర� సరిగాలేద�',
-'fix-double-redirects'    => 'పాత పేజీని సూచిస�త�న�న దారిమార�ప�లన� తాజాకరించ�',
+'delete_and_move_confirm'      => 'అవ�న�, పేజీని తొలగించ�',
+'delete_and_move_reason'       => 'తరలింప�క� వీల�గా తొలగించబడింది',
+'selfmove'                     => 'మూలం, గమ�యం పేర�ల� ఒకటే; పేజీని దాని పైకే తరలించడం క�దరద�.',
+'immobile-source-namespace'    => '"$1" పేర�బరిలోని పేజీలన� తరలించలేర�',
+'immobile-target-namespace'    => '"$1" పేర�బరిలోనికి పేజీలన� తరలించలేర�',
+'immobile-target-namespace-iw' => 'పేజీని తరలించడానికి అంతర�వికీ లింక� సరైన లక�ష�యం కాద�.',
+'immobile-source-page'         => 'ఈ పేజీని తరలించలేర�.',
+'immobile-target-page'         => 'ఆ లక�ష�యిత శీర�షికకి తరలించలేమ�.',
+'imagenocrossnamespace'        => 'ఫైల�న�, ఫైల�క� చెందని నేమ�‌స�పేస�క� తరలించలేం',
+'imagetypemismatch'            => 'ఈ కొత�త ఫైల� ఎక�స�&zwnj;టెన�షన� ఫైల� రకానికి సరిపోలేద�',
+'imageinvalidfilename'         => 'టార�గెట� ఫైల� పేర� సరిగాలేద�',
+'fix-double-redirects'         => 'పాత పేజీని సూచిస�త�న�న దారిమార�ప�లన� తాజాకరించ�',
+'move-leave-redirect'          => 'దారిమార�ప�ని ఉంచండి',
 
 # Export
 'export'            => 'ఎగ�మతి పేజీల�',
@@ -1850,7 +2036,7 @@ $NEWPAGE
 
 పేజీలన� ఎగ�మతి చేసంద�క�, కింద ఇచ�చిన టెక�స�ట� బాక�స�లో పేజీ పేర�లన� లైన�కో పేర� చొప�ప�న ఇవ�వండి. ప�రస�త�త కూర�ప�తో పాట� పాత కూర�ప�ల� కూడా కావాలా, లేక ప�రస�త�త కూర�ప� మాత�రమే చాలా అనే విషయం కూడా ఇవ�వవచ�చ�.
 
-రెండో పద�ధతిలో అయితే, పేజీ యొక�క లింక�న� కూడా వాడవచ�చ�. ఉదాహరణక�, "[[{{MediaWiki:Mainpage}}]]" కోసమైతే [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] అని ఇవ�వవచ�చ�.',
+రెండో పద�ధతిలో అయితే, పేజీ యొక�క లింక�న� కూడా వాడవచ�చ�. ఉదాహరణక�, "[[{{MediaWiki:Mainpage}}]]" కోసమైతే [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] అని ఇవ�వవచ�చ�.',
 'exportcuronly'     => 'ప�రస�త�త కూర�ప� మాత�రమే, పూర�తి చరితం వద�ద�',
 'exportnohistory'   => "----
 '''గమనిక:''' ఈ ఫారాన�ని ఉపయోగించి పేజీలయొక�క పూర�తి చరిత�రన� ఎగ�మతి చేయడాన�ని సర�వర�పై వత�తిడి పెరిగిన కారణంగా ప�రస�త�తం నిలిపివేశార�.",
@@ -1886,11 +2072,14 @@ $NEWPAGE
 'import-interwiki-text'      => 'దిగ�మతి చేస�కోవడానికి ఒక వికీని మరియ� అంద�లోని పేజీని ఎంచ�కోండి.
 కూర�ప�ల తేదీల� మరియ� మార�ప�ల� చేసిన వారి పేర�ల� భద�రపరచబడతాయి.
 ఇతర వికీలన�ండి చేస�త�న�న దిగ�మత�ల చర�యలన�నీ [[Special:Log/import|దిగ�మత�ల చిట�టా]]లో నమోదవ�తాయి.',
+'import-interwiki-source'    => 'మూల వికీ/పేజీ:',
 'import-interwiki-history'   => 'ఈ పేజీ యొక�క అన�ని చారిత�రక కూర�ప�లన� కాపీ చెయ�యి',
 'import-interwiki-submit'    => 'దిగ�మతించ�',
 'import-interwiki-namespace' => 'ఈ నేంస�పేస�లోకి పేజీలన� పంపించ�:',
-'importtext'                 => '
-మూలవికీ న�ండి ప�రత�యేక:Export అనే ఉపయ�క�తమైన ప�రోగ�రామ�న� ఉపయోగించి ఫైల�న� ఎగ�మతి చేసి మీ హార�డ�డిస�క�లో బధ�రపరచ�క�ని, ఆ తర�వాత ఇక�కడ అప�లోడ� చేయండి.',
+'import-upload-filename'     => 'పైల�పేర�:',
+'import-comment'             => 'వ�యాఖ�య:',
+'importtext'                 => 'మూల వికీ లోని [[Special:Export|ఎగ�మతి సౌలభ�యా]]న�ని ఉపయోగించి ఫైల�ని మీ కంప�యూటర�లోనికి దిగ�మతి చేస�కోండి.
+ఆపై ఇక�కడికి ఎగ�మతి చేయండి.',
 'importstart'                => 'పేజీలన� దిగ�మతి చేస�త�న�నాం...',
 'import-revision-count'      => '$1 {{PLURAL:$1|కూర�ప�|కూర�ప�ల�}}',
 'importnopages'              => 'దిగ�మతి చెయ�యడానికి పేజీలేమీ లేవ�.',
@@ -1916,7 +2105,7 @@ $NEWPAGE
 'import-invalid-interwiki'   => 'మీర� చెప�పిన వికీన�ండి దిగ�మతి చేయలేమ�.',
 
 # Import log
-'importlogpage'                    => 'దిగ�మతి లాగ�',
+'importlogpage'                    => 'దిగ�మత�ల చిట�టా',
 'importlogpagetext'                => 'ఇతర వికీల న�ండీ మార�ప�ల చరిత�రతోసహా తెచ�చిన నిర�వహణా దిగ�మత�ల�.',
 'import-logentry-upload'           => '[[$1]]న� ఫైల� అప�లోడ� ద�వారా దిగ�మతి చేసాం',
 'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|కూర�ప�|కూర�ప�ల�}}',
@@ -1924,19 +2113,19 @@ $NEWPAGE
 'import-logentry-interwiki-detail' => '$2 న�ండి {{PLURAL:$1|ఒక కూర�ప�|$1 కూర�ప�ల�}}',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'నా వాడ�కరి పేజీ',
+'tooltip-pt-userpage'             => 'మీ వాడ�కరి పేజీ',
 'tooltip-pt-anonuserpage'         => 'మీ �పీ చిర�నామాకి సంబంధించిన వాడ�కరి పేజీ',
-'tooltip-pt-mytalk'               => 'నా చర�చా పేజీ',
+'tooltip-pt-mytalk'               => 'మీ చర�చా పేజీ',
 'tooltip-pt-anontalk'             => 'ఈ �పీ చిర�నామా న�ండి చేసిన మార�ప�ల గ�రించి చర�చ',
 'tooltip-pt-preferences'          => 'నా అభిర�చ�ల�',
 'tooltip-pt-watchlist'            => 'మీర� మార�ప�ల కొరక� గమనిస�త�న�న పేజీల జాబితా',
-'tooltip-pt-mycontris'            => 'నా మార�ప�-చేర�ప�ల జాబితా',
+'tooltip-pt-mycontris'            => 'మీ మార�ప�-చేర�ప�ల జాబితా',
 'tooltip-pt-login'                => 'మీర� లగిన� అయ�యి మార�ప�ల� చేస�తే బాగ�ంత�ంది, అలాగని మార�ప�ల� చేయటానికి లాగిన� అవ�వటం తప�పని సరి కాద�.',
 'tooltip-pt-anonlogin'            => 'మీర� ప�రవేశించడాన�ని (లాగిన�) ప�రోత�సహిస�తాం, కానీ అది తప�పనిసరి కాద�.',
 'tooltip-pt-logout'               => 'నిష�క�రమించండి',
 'tooltip-ca-talk'                 => 'విషయప� పేజీ గ�రించి చర�చ',
 'tooltip-ca-edit'                 => 'ఈ పేజీని మీర� సరిదిద�దవచ�చ�. భద�రపరిచేమ�ంద� మ�న�జూప� బొత�తాన�ని వాడండి.',
-'tooltip-ca-addsection'           => 'ఈ చర�చక� మీ వ�యాఖ�యన� చేర�చండి.',
+'tooltip-ca-addsection'           => 'కొత�త విభాగాన�ని మొదల�పెట�టండి',
 'tooltip-ca-viewsource'           => 'ఈ పేజీ సంరంక�షించబడింది. దీని మూలం చూడవచ�చ�.',
 'tooltip-ca-history'              => 'ఈ పేజీ యొక�క గత కూర�ప�ల�.',
 'tooltip-ca-protect'              => 'ఈ పేజీని సంరక�షించండి',
@@ -1983,6 +2172,9 @@ $NEWPAGE
 'tooltip-watch'                   => 'ఈ పేజీని మీ విక�షణా జాబితాక� చేర�చండి',
 'tooltip-recreate'                => 'పేజీ త�డిచివేయబడ�డాకానీ మళ�ళీ సృష�టించ�',
 'tooltip-upload'                  => 'ఎగ�మతి మొదల�పెట�ట�',
+'tooltip-rollback'                => '"రద�ద�చేయి" అనేది ఈ పేజీని చివరిగా మార�చినవారి మార�ప�లని రద�ద�చేస�త�ంది',
+'tooltip-undo'                    => '"దిద�ద�బాట�ని రద�ద�చేయి" ఈ మార�ప�ని రద�ద�చేస�త�ంది మరియ� దిద�ద�బాట� ఫారాన�ని మ�న�జూప�లో తెర�స�త�ంది.
+సారాంశానికి కారణాన�ని చేర�చే వీల�కల�పిస�త�ంది',
 
 # Metadata
 'nodublincore'      => 'డబ�లిన� కోర� RDF మెటాడేటాన� ఈ సర�వర�క� అశక�తం చేసాం.',
@@ -1990,12 +2182,12 @@ $NEWPAGE
 'notacceptable'     => 'ఈ వికీ సర�వర� మీ క�లయంట� చదవగలిగే రీతిలో డేటాన� ఇవ�వలేద�.',
 
 # Attribution
-'anonymous'        => '{{SITENAME}} యొక�క అజ�ఞాత సభ�య�ల�',
+'anonymous'        => '{{SITENAME}} యొక�క అజ�ఞాత {{PLURAL:$1|వాడ�కరి|వాడ�కర�ల�}}',
 'siteuser'         => '{{SITENAME}} వాడ�కరి $1',
 'lastmodifiedatby' => 'ఈ పేజీకి $3 $2, $1న చివరి మార�ప� చేసార�.', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1 యొక�క కృతిపై ఆధారితం.',
 'others'           => 'ఇతరాల�',
-'siteusers'        => '{{SITENAME}} సభ�య�ల� $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|వాడ�కరి|వాడ�కర�ల�}} $1',
 'creditspage'      => 'పేజీ క�రెడిట�ల�',
 'nocredits'        => 'ఈ పేజీకి క�రెడిట�ల సమాచారం అంద�బాట�లో లేద�.',
 
@@ -2016,6 +2208,16 @@ $NEWPAGE
 'numauthors'     => 'భిన�నమైన రచయితల సంఖ�య (వ�యాసం): $1',
 'numtalkauthors' => 'భిన�నమైన రచయితల సంఖ�య (చర�చా పేజీ): $1',
 
+# Skin names
+'skinname-standard'    => 'సంప�రదాయ',
+'skinname-nostalgia'   => 'నాస�టాల�జియా',
+'skinname-cologneblue' => 'కలోన� నీలం',
+'skinname-monobook'    => 'మోనోబ�క�',
+'skinname-myskin'      => 'నాఅలంకారం',
+'skinname-chick'       => 'చిక�',
+'skinname-simple'      => 'సరళ',
+'skinname-modern'      => 'ఆధ�నిక',
+
 # Math options
 'mw_math_png'    => 'ఎల�లప�ప�డూ PNGగా చూపించ�',
 'mw_math_simple' => 'తేలికగా ఉంటే HTML లేకపోతే PNG',
@@ -2036,10 +2238,11 @@ $NEWPAGE
 'markedaspatrollederror-noautopatrol' => 'మీర� చేసిన మార�ప�లన� మీరే నిఘాలో పెట�టలేర�.',
 
 # Patrol log
-'patrol-log-page'   => 'నిఘా లాగ�‌',
-'patrol-log-header' => 'ఇది పర�యవేక�షించిన కూర�ప�ల చిట�టా.',
-'patrol-log-line'   => 'మొత�తం $1లోని $2లన� $3గా పెట�రోల� చేసినట�ల�గా గ�ర�తించామ�',
-'patrol-log-auto'   => '(దావంత అదే)',
+'patrol-log-page'      => 'నిఘా లాగ�‌',
+'patrol-log-header'    => 'ఇది పర�యవేక�షించిన కూర�ప�ల చిట�టా.',
+'patrol-log-line'      => 'మొత�తం $1లోని $2లన� $3గా పెట�రోల� చేసినట�ల�గా గ�ర�తించామ�',
+'patrol-log-auto'      => '(దావంత అదే)',
+'log-show-hide-patrol' => '$1 పర�యవేక�షణ చిట�టా',
 
 # Image deletion
 'deletedrevision'                 => 'పాత సంచిక $1 తొలగించబడినది.',
@@ -2056,6 +2259,9 @@ $1',
 'previousdiff' => '� మ�న�పటి మార�ప�',
 'nextdiff'     => 'తర�వాతి మార�ప� →',
 
+# Visual comparison
+'visual-comparison' => 'దృశ�యరూప పోలిక',
+
 # Media information
 'mediawarning'         => "'''హెచ�చరిక''': ఈ ఫైల�లో హానికరమైన కోడ�‌ ఉండవచ�చ�, దానిని పనిచేయిస�తే మీ సిస�టమ� దెబ�బతినవచ�చ�.<hr />",
 'imagemaxsize'         => 'బొమ�మ వివరణ పేజీలో బొమ�మ ఉండవలసిన సైజ�:',
@@ -2068,10 +2274,12 @@ $1',
 'show-big-image'       => 'అసల� పరిమాణం',
 'show-big-image-thumb' => '<small>ఈ మ�న�జూప� సైజ�: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'కొత�త ఫైళ�ళ కొల�వ�',
 'imagelisttext'         => "ఇది $2 వారీగా పేర�చిన  '''$1''' {{PLURAL:$1|పైల�|ఫైళ�ళ}} జాబితా.",
 'newimages-summary'     => 'ఇటీవలే ఎగ�మతైన ఫైళ�ళన� ఈ ప�రత�యేక పేజీ చూపిస�త�ంది.',
+'newimages-legend'      => 'పడపోత',
+'newimages-label'       => 'ఫైల�పేర� (లేదా దానిలోని భాగం):',
 'showhidebots'          => '($1 బాట�ల�)',
 'noimages'              => 'చూసేంద�క� �మీ లేద�.',
 'ilsubmit'              => 'వెత�క�',
@@ -2277,6 +2485,9 @@ $1',
 'exif-lightsource-24'  => 'ISO స�టూడియోలోని బల�బ� వెల�త�ర�',
 'exif-lightsource-255' => 'ఇతర కాంతి మూలం',
 
+# Flash modes
+'exif-flash-redeye-1' => 'ఎర�ర-కన�న� తగ�గింప� పద�ధతి',
+
 'exif-focalplaneresolutionunit-2' => 'అంగ�ళాల�',
 
 'exif-sensingmethod-1' => 'అనిర�వచితం',
@@ -2418,21 +2629,9 @@ $1
 మీర� ఈ పేజీని మళ�ళీ తయార� చేయాలన�క�ంట�న�నారని ధృవీకరించండి.",
 'recreate'            => 'మళ�లీ సృష�టించ�',
 
-# HTML dump
-'redirectingto' => '[[:$1]]క� మళ�ళించబడ�త�ంది...',
-
 # action=purge
-'confirm_purge'        => 'ఈ పేజీ యొక�క పాత కాపీని తొలగించమంటారా?
-
-$1',
 'confirm_purge_button' => 'సరే',
-
-# AJAX search
-'searchcontaining' => "''$1'' న� కలిగి ఉన�న వ�యాసాల కోసం వెత�క�.",
-'searchnamed'      => "''$1'' పేర�తో ఉన�న వ�యాసాల కోసం వెత�క�.",
-'articletitles'    => "''$1''తొ మొదలయ�యే వ�యాసాల�",
-'hideresults'      => 'ఫలితాలన� దాచ�',
-'useajaxsearch'    => 'వెతకేటప�ప�డ� AJAXన� ఉపయోగించ�',
+'confirm-purge-top'    => 'ఈ పేజీ యొక�క పాత కాపీని తొలగించమంటారా?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� మ�న�పటి పేజీ',
@@ -2452,10 +2651,10 @@ $1',
 'table_pager_empty'        => 'ఫలితాల� లేవ�',
 
 # Auto-summaries
-'autosumm-blank'   => 'పేజీలోని సమాచారాన�నంతటినీ తీసేస�త�న�నార�',
+'autosumm-blank'   => 'పేజీలోని విషయాన�నంతటినీ తీసేసార�.',
 'autosumm-replace' => "పేజీని '$1' తో మార�స�త�న�నాం",
 'autoredircomment' => '[[$1]]క� మళ�ళించబడ�త�ంది',
-'autosumm-new'     => 'కొత�త పేజీ: $1',
+'autosumm-new'     => "'$1' తో కొత�త పేజీని సృష�టించార�",
 
 # Live preview
 'livepreview-loading' => 'లోడవ�త�ంది…',
@@ -2520,12 +2719,12 @@ $1',
 'filepath-submit'  => 'చిర�నామా',
 'filepath-summary' => 'ఈ ప�రత�యేక పేజీలో ఫైళ�ల పేర�ల� ఇస�తే వాటి పూర�తి చిర�నామల� వస�తాయి. బొమ�మలైతే వాటి పూర�తి సైజ�తో తెర�చ�క�ంటాయి, బొమ�మల� కాని ఇతర ఫైళ�ల� వాటి అన�బంధ ప�రోగ�రామ�లతో తెర�చ�క�ంటాయి.
 
-పేర�క� మ�ంద� "{{ns:image}}:" అని చేర�చవద�ద�.',
+పేర�క� మ�ంద� "{{ns:file}}:" అని చేర�చవద�ద�.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'ఫైళ�ల మార�ప�రత�ల కోసం వెత�క�',
 'fileduplicatesearch-summary'  => 'మార�ప�రత�ల కోసం ఫైళ�ల హాష� విల�వ ఆధారంగా వెత�క�.
-ఫైల� పేర�క� మ�ంద� "{{ns:image}}:"న� చేర�చక�ండా ఇవ�వండి.',
+ఫైల� పేర�క� మ�ంద� "{{ns:file}}:"న� చేర�చక�ండా ఇవ�వండి.',
 'fileduplicatesearch-legend'   => 'మార�ప�రతి కొరక� వెత�క�',
 'fileduplicatesearch-filename' => 'ఫైల� పేర�:',
 'fileduplicatesearch-submit'   => 'వెత�క�',
diff --git a/languages/messages/MessagesTet.php b/languages/messages/MessagesTet.php
index eac86f2c..f1ee8618 100644
--- a/languages/messages/MessagesTet.php
+++ b/languages/messages/MessagesTet.php
@@ -7,24 +7,15 @@
  * @author MF-Warburg
  */
 
-$skinNames = array(
-	'standard'    => 'Klásiku',
-	'cologneblue' => 'Kolónia azúl',
-	'myskin'      => 'MySkin',
-	'chick'       => 'Manu',
-);
-
 $namespaceNames = array(
 	NS_MEDIA          => 'Media',
 	NS_SPECIAL        => 'Espesiál',
-	NS_MAIN           => '',
 	NS_TALK           => 'Diskusaun',
 	NS_USER           => 'Uza-na\'in',
 	NS_USER_TALK      => 'Diskusaun_Uza-na\'in',
-	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => 'Diskusaun_$1',
-	NS_IMAGE          => 'Imajen',
-	NS_IMAGE_TALK     => 'Diskusaun_Imajen',
+	NS_FILE           => 'Imajen',
+	NS_FILE_TALK      => 'Diskusaun_Imajen',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Diskusaun_MediaWiki',
 	NS_TEMPLATE       => 'Template',
@@ -43,42 +34,55 @@ $namespaceAliases = array(
 $specialPageAliases = array(
 	'CreateAccount'             => array( 'Rejista' ),
 	'Preferences'               => array( 'Preferénsia' ),
-	'Watchlist'                 => array( 'Lista_hateke' ),
-	'Recentchanges'             => array( 'Mudansa_foufoun_sira' ),
-	'Upload'                    => array( 'Tau_iha_arkivu_laran' ),
-	'Imagelist'                 => array( 'Lista_imajen' ),
-	'Newimages'                 => array( 'Imajen_foun' ),
-	'Listusers'                 => array( 'Lista_uza-na\'in' ),
+	'Watchlist'                 => array( 'Lista hateke' ),
+	'Recentchanges'             => array( 'Mudansa foufoun sira' ),
+	'Upload'                    => array( 'Tau iha arkivu laran' ),
+	'Listfiles'                 => array( 'Lista imajen' ),
+	'Newimages'                 => array( 'Imajen foun' ),
+	'Listusers'                 => array( 'Lista uza-na\'in' ),
 	'Statistics'                => array( 'Estatístika' ),
-	'Randompage'                => array( 'Pájina_ruma' ),
-	'Shortpages'                => array( 'Pájina_badak' ),
-	'Longpages'                 => array( 'Pájina_naruk' ),
-	'Protectedpages'            => array( 'Pájina_sira-ne\'ebé_proteje_tiha' ),
-	'Allpages'                  => array( 'Pájina_hotu' ),
-	'Ipblocklist'               => array( 'Lista_ema_sira-ne\'ebé_blokeiu_tiha' ),
-	'Specialpages'              => array( 'Pájina_espesiál_sira' ),
+	'Randompage'                => array( 'Pájina ruma' ),
+	'Shortpages'                => array( 'Pájina badak' ),
+	'Longpages'                 => array( 'Pájina naruk' ),
+	'Protectedpages'            => array( 'Pájina sira-ne\'ebé proteje tiha' ),
+	'Allpages'                  => array( 'Pájina hotu' ),
+	'Ipblocklist'               => array( 'Lista ema sira-ne\'ebé blokeiu tiha' ),
+	'Specialpages'              => array( 'Pájina espesiál sira' ),
 	'Contributions'             => array( 'Kontribuisaun' ),
-	'Emailuser'                 => array( 'Haruka_korreiu_eletróniku' ),
-	'Whatlinkshere'             => array( 'Pájina_sira_ne\'ebé_bá_iha_ne\'e' ),
+	'Emailuser'                 => array( 'Haruka korreiu eletróniku' ),
+	'Whatlinkshere'             => array( 'Pájina sira ne\'ebé bá iha ne\'e' ),
 	'Movepage'                  => array( 'Book' ),
 	'Categories'                => array( 'Kategoria' ),
 	'Export'                    => array( 'Esporta' ),
 	'Version'                   => array( 'Versaun' ),
-	'Allmessages'               => array( 'Mensajen_hotu' ),
+	'Allmessages'               => array( 'Mensajen hotu' ),
 	'Blockip'                   => array( 'Blokeiu' ),
 	'Undelete'                  => array( 'Restaurar' ),
 	'Userrights'                => array( 'Kuana', 'Priviléjiu' ),
-	'Mypage'                    => array( 'Ha\'u-nia_pájina' ),
-	'Listadmins'                => array( 'Lista_administradór' ),
+	'Mypage'                    => array( 'Ha\'u-nia pájina' ),
+	'Listadmins'                => array( 'Lista administradór' ),
 	'Search'                    => array( 'Buka' ),
-	'Withoutinterwiki'          => array( 'Laiha_interwiki' ),
+	'Withoutinterwiki'          => array( 'Laiha interwiki' ),
 );
 
 $messages = array(
 # User preference toggles
+'tog-underline'          => 'Subliña ligasaun sira:',
+'tog-highlightbroken'    => 'Formatu ligasaun sira-ne\'ebé bá pájina maka wiki la iha: <a href="" class="new">ne\'e</a> ka <a href="" class="internal">ne\'e</a>).',
+'tog-justify'            => 'Justifika parágrafu sira',
 'tog-hideminor'          => "Lá'os hatudu osan-rahun sira iha mudansa foufoun sira",
+'tog-usenewrc'           => 'Lista "Mudansa foufoun sira" di\'ak liu (JavaScript)',
+'tog-showtoolbar'        => 'Hatudu kaixa edita (JavaScript)',
+'tog-watchcreations'     => "Hateke pájina sira-ne'ebé ha'u kria",
+'tog-watchdefault'       => "Hateke pájina sira-ne'ebé ha'u edita",
+'tog-watchmoves'         => "Hateke pájina sira-ne'ebé ha'u book",
+'tog-watchdeletion'      => "Hateke pájina sira-ne'ebé ha'u halakon",
+'tog-watchlisthideown'   => "La hatudu ha'u-nia edita iha lista hateke",
 'tog-watchlisthidebots'  => 'Hamsumik bot iha lista hateke',
 'tog-watchlisthideminor' => 'Hamsumik osan-rahun iha lista hateke',
+'tog-watchlisthideliu'   => 'La hatudu edita ema rejista nian iha lista hateke',
+'tog-watchlisthideanons' => 'La hatudu edita ema anónimu nian iha lista hateke',
+'tog-showhiddencats'     => "Hatudu kategoria sira-ne'ebé subar",
 
 'underline-always' => 'Sempre',
 'underline-never'  => 'Nunka',
@@ -138,11 +142,13 @@ $messages = array(
 # Categories related messages
 'pagecategories'         => '{{PLURAL:$1|Kategoría|Kategoría}}',
 'category_header'        => 'Artigu iha kategoría "$1"',
+'subcategories'          => 'Sub-kategoria sira',
 'category-empty'         => "''Kategoria ne'e agora la iha pájina sira.''",
 'listingcontinuesabbrev' => 'kont.',
 
 'about'          => 'Kona-ba',
 'article'        => 'Pájina',
+'cancel'         => 'Para',
 'qbfind'         => 'Hetan',
 'qbedit'         => 'Edita',
 'qbpageoptions'  => "Pájina ne'e",
@@ -153,9 +159,10 @@ $messages = array(
 'mytalk'         => "Ha'u-nia diskusaun",
 'anontalk'       => "Diskusaun ba IP ne'e",
 'navigation'     => 'Hatudu-dalan',
-'and'            => 'ho',
+'and'            => '&#32;ho',
 
 'errorpagetitle'    => 'Sala',
+'returnto'          => 'Fali ba $1.',
 'tagline'           => 'Husi {{SITENAME}}',
 'help'              => 'Ajuda',
 'search'            => 'Buka',
@@ -171,10 +178,12 @@ $messages = array(
 'edit'              => 'Edita',
 'create'            => 'Kria',
 'editthispage'      => "Edita pájina ne'e",
+'create-this-page'  => "Kria pájina ne'e",
 'delete'            => 'Halakon',
 'deletethispage'    => "Halakon pájina ne'e",
-'undelete_short'    => 'Restaurar {{PLURAL:$1|versaun ida|$1 versaun}}',
+'undelete_short'    => 'Restaurar {{PLURAL:$1|versaun ida|versaun $1}}',
 'protect'           => 'Proteje',
+'protect_change'    => 'filak',
 'protectthispage'   => "Proteje pájina ne'e",
 'unprotect'         => 'La proteje',
 'unprotectthispage' => "La proteje pájina ne'e",
@@ -182,7 +191,7 @@ $messages = array(
 'talkpage'          => "Diskusaun kona-ba pájina ne'e",
 'talkpagelinktext'  => 'Diskusaun',
 'specialpage'       => 'Pájina espesiál',
-'postcomment'       => 'Tau tan komentáriu ida',
+'postcomment'       => 'Seksaun foun',
 'talk'              => 'Diskusaun',
 'toolbox'           => 'Kaixa besi nian',
 'userpage'          => "Haree pájina uza-na'in",
@@ -193,7 +202,8 @@ $messages = array(
 'categorypage'      => 'Haree pájina kategoría nian',
 'viewtalkpage'      => 'Haree diskusaun',
 'otherlanguages'    => 'Iha lian seluk',
-'protectedpage'     => "Pájina ne'ebé naproteje",
+'lastmodifiedat'    => "Ema ruma filak ikus pájina ne'e iha $1, $2.", # $1 date, $2 time
+'protectedpage'     => 'Pájina maka ema ruma proteje tiha',
 'jumpto'            => 'Bá:',
 'jumptonavigation'  => 'hatudu-dalan',
 'jumptosearch'      => 'buka',
@@ -202,12 +212,17 @@ $messages = array(
 'aboutsite'            => 'Kona-ba {{SITENAME}}',
 'aboutpage'            => 'Project:Kona-ba',
 'copyright'            => 'Testu pájina nian iha $1 okos.',
+'copyrightpagename'    => 'Direitu autór sira nian iha {{SITENAME}}',
+'copyrightpage'        => '{{ns:project}}:Direitu_autór_nian',
 'currentevents'        => 'Mamosuk atuál sira',
 'currentevents-url'    => 'Project:Mamosuk atuál sira',
 'disclaimers'          => 'Avisu legál',
 'disclaimerpage'       => 'Project:Avisu legál',
 'edithelp'             => 'Ajuda kona-ba edita',
 'edithelppage'         => 'Help:Edita',
+'faq'                  => 'FAQ',
+'faqpage'              => 'Project:FAQ',
+'helppage'             => 'Help:Konteúdu',
 'mainpage'             => 'Pájina Mahuluk',
 'mainpage-description' => 'Pájina Mahuluk',
 'portal'               => 'Portál komunidade nian',
@@ -215,10 +230,9 @@ $messages = array(
 'privacy'              => 'Polítika privasidade nian',
 'privacypage'          => 'Project:Polítika privasidade nian',
 
+'badaccess'        => 'Sala priviléjiu nian',
 'badaccess-group0' => "Ó la bele halo ne'e.",
-'badaccess-group1' => "Ba halo ne'e tenke iha lubu $1.",
-'badaccess-group2' => "Ba halo ne'e tenke iha lubu ida husi $1.",
-'badaccess-groups' => "Ba halo ne'e tenke iha lubu ida husi $1.",
+'badaccess-groups' => "Ba halo ne'e tenke iha {{PLURAL:$2|lubu|lubu ida husi}} $1.",
 
 'versionrequired'     => 'Presiza MediaWiki versaun $1',
 'versionrequiredtext' => "Presiza MediaWiki versaun $1 ba uza pájina ne'e. Haree [[Special:Version|pájina versaun]].",
@@ -227,21 +241,27 @@ $messages = array(
 'retrievedfrom'           => 'Husi "$1"',
 'youhavenewmessages'      => 'Ó iha $1 ($2).',
 'newmessageslink'         => 'mensajen foun',
+'newmessagesdifflink'     => 'diferensa foun liu hotu',
 'youhavenewmessagesmulti' => 'Ó iha mensajen foun sira iha $1',
 'editsection'             => 'edita',
 'editold'                 => 'edita',
+'viewsourceold'           => 'lee testu',
+'editlink'                => 'edita',
+'viewsourcelink'          => 'lee testu',
 'editsectionhint'         => 'Edita parte $1 pájina nian',
+'toc'                     => 'Tabela konteúdu',
 'showtoc'                 => 'hatudu',
 'hidetoc'                 => 'subar',
 'thisisdeleted'           => 'Haree ka restaurar $1?',
 'viewdeleted'             => 'Haree $1?',
 'site-rss-feed'           => 'Feed RSS $1',
 'site-atom-feed'          => 'Feed Atom $1',
+'red-link-title'          => "$1 (pájina ne'e la iha)",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pájina',
 'nstab-user'      => "Pájina uza-na'in",
-'nstab-special'   => 'Espesiál',
+'nstab-special'   => 'Pájina espesiál',
 'nstab-project'   => 'Pájina projetu nian',
 'nstab-mediawiki' => 'Mensajen',
 'nstab-help'      => 'Pájina ajuda',
@@ -249,19 +269,37 @@ $messages = array(
 
 # Main script and global functions
 'nosuchspecialpage' => "Pájina espesiál ne'e la iha",
+'nospecialpagetext' => "<big>'''Pájina espesiál ne'e la iha.'''</big>
+
+Lista ida pájina espesiál nian [[Special:SpecialPages|iha ne'e]].",
 
 # General errors
-'error'         => 'Sala',
-'viewsourcefor' => 'ba $1',
+'error'               => 'Sala',
+'missingarticle-rev'  => '(version#: $1)',
+'missingarticle-diff' => '(Dif.: $1, $2)',
+'viewsource'          => 'Lee testu',
+'viewsourcefor'       => 'ba $1',
+'viewsourcetext'      => 'Ó bele lee no kopia testu pájina nian:',
+'namespaceprotected'  => "Ó la iha priviléjiu ba edita pájina sira iha espasu '''$1'''.",
+'ns-specialprotected' => 'La ema ida bele edita pájina espesiál sira.',
 
 # Login and logout pages
+'logouttitle'               => 'Husik',
+'welcomecreation'           => "== Loron di'ak, $1! ==
+Ó kria konta ó-nia.
+La haluha filak ó-nia [[Special:Preferences|preferénsia]].",
+'loginpagetitle'            => 'Log in',
 'yourname'                  => "Naran uza-n'in:",
+'login'                     => 'Log in',
 'nav-login-createaccount'   => 'Log in / kriar konta ida',
 'userlogin'                 => 'Log in / kriar konta ida',
 'logout'                    => 'Husik',
 'userlogout'                => 'Husik',
+'nologin'                   => 'La iha konta ida? $1.',
 'nologinlink'               => 'Registrar',
 'createaccount'             => "Registrar uza-na'in",
+'gotaccount'                => 'Ó iha konta ona? $1.',
+'gotaccountlink'            => 'Log in',
 'userexists'                => "Uza-na'in ne'e ona iha wiki. Favór ida lori naran seluk.",
 'youremail'                 => 'Korreiu eletróniku:',
 'username'                  => "Naran uza-na'in:",
@@ -269,6 +307,10 @@ $messages = array(
 'yourlanguage'              => 'Lian:',
 'email'                     => 'Korreiu eletróniku',
 'prefs-help-email-required' => 'Haruka diresaun korreiu eletróniku.',
+'nosuchuser'                => 'Konta uza-na\'in (naran "$1") la iha.
+User names are case sensitive.
+Check your spelling, ka [[Special:UserLogin/signup|kria konta foun]].',
+'nouserspecified'           => "Ó tenke espesífiku naran uza-na'in ida.",
 'accountcreated'            => "Registrar tiha uza-na'in",
 'loginlanguagelabel'        => 'Lian: $1',
 
@@ -282,17 +324,27 @@ $messages = array(
 'media_sample' => 'Ezemplu.ogg',
 
 # Edit pages
-'minoredit'         => "Ne'e osan-rahun",
-'watchthis'         => "Hateke pájina ne'e",
-'anoneditwarning'   => 'Ó lá\'os "log-in" iha momentu.',
-'blockedtitle'      => "Uza-na'in nablokeiu",
-'newarticle'        => '(Foun)',
-'noarticletext'     => "Iha momentu lá'os testu iha pájina ne'e, bele [[Special:Search/{{PAGENAME}}|buka naran pájina nian]] iha pájina seluk ka [{{fullurl:{{FULLPAGENAME}}|action=edit}} edita pájina ne'e].",
-'editing'           => 'Edita $1',
-'editingcomment'    => 'Edita $1 (komentáriu)',
-'yourtext'          => 'Ó-nia testu',
-'yourdiff'          => 'Diferensa sira',
-'nocreate-loggedin' => 'Ó la bele kria pájina foun.',
+'minoredit'              => "Ne'e osan-rahun",
+'watchthis'              => "Hateke pájina ne'e",
+'savearticle'            => 'Filak pájina',
+'showdiff'               => 'Hatudu diferensa sira',
+'anoneditwarning'        => 'Ó lá\'os "log-in" iha momentu.',
+'blockedtitle'           => "Uza-na'in la bele edita (blokeiu)",
+'blockednoreason'        => 'laiha motivu',
+'whitelistedittext'      => 'Ó tenke $1 ba edita pájina sira.',
+'loginreqpagetext'       => 'Ó tenke $1 ba haree pájina seluk.',
+'newarticle'             => '(Foun)',
+'noarticletext'          => "Iha momentu lá'os testu iha pájina ne'e, bele [[Special:Search/{{PAGENAME}}|buka naran pájina nian]] iha pájina seluk, <span class=\"plainlinks\">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} search the related logs], ka [{{fullurl:{{FULLPAGENAME}}|action=edit}} edita pájina ne'e].",
+'editing'                => 'Edita $1',
+'editingcomment'         => 'Edita $1 (seksaun foun)',
+'yourtext'               => 'Ó-nia testu',
+'yourdiff'               => 'Diferensa sira',
+'template-protected'     => '(proteje tiha)',
+'template-semiprotected' => '(proteje tiha balun)',
+'nocreatetext'           => "Ó la bele kria pájina foun iha {{SITENAME}}.
+Ó bele edita pájina sira-ne'ebé {{SITENAME}} iha ona ka [[Special:UserLogin|log in ka kria konta uza-na'in]].",
+'nocreate-loggedin'      => 'Ó la bele kria pájina foun.',
+'permissionserrorstext'  => "Ó la bele halo ne'e; {{PLURAL:$1|motivu|motivu sira}}:",
 
 # Account creation failure
 'cantcreateaccounttitle' => "La bele registrar uza-na'in",
@@ -307,7 +359,9 @@ $messages = array(
 'next'                => 'oinmai',
 'last'                => 'ikus',
 'page_first'          => 'uluk',
+'page_last'           => 'ikus',
 'histfirst'           => 'sedu liu hotu',
+'histlast'            => 'Foun liu hotu',
 'historyempty'        => '(mamuk)',
 
 # Revision feed
@@ -322,50 +376,88 @@ $messages = array(
 'lineno' => 'Liña $1:',
 
 # Search results
-'noexactmatch' => "'''Pájina ''$1'' la iha.''' Ó bele [[:$1|kria pájina ne'e]].",
-'prevn'        => 'molok $1',
-'nextn'        => 'oinmai $1',
-'viewprevnext' => 'Haree ($1) ($2) ($3)',
-'powersearch'  => 'Buka',
+'noexactmatch'       => "'''Pájina ''$1'' la iha.''' Ó bele [[:$1|kria pájina ne'e]].",
+'prevn'              => 'molok $1',
+'nextn'              => 'oinmai $1',
+'viewprevnext'       => 'Haree ($1) ($2) ($3)',
+'search-result-size' => '$1 ({{PLURAL:$2|liafuan ida|liafuan $2}})',
+'searchall'          => 'hotu',
+'powersearch'        => 'Buka',
+'powersearch-field'  => 'Buka',
 
 # Preferences page
+'preferences'       => 'Preferénsia',
 'mypreferences'     => "Ha'u-nia preferénsia",
+'dateformat'        => 'Formatu tempu nian',
 'prefs-rc'          => 'Mudansa foufoun sira',
 'prefs-watchlist'   => 'Lista hateke',
 'textboxsize'       => 'Edita',
 'searchresultshead' => 'Buka',
 
 # User rights
-'userrights'               => "Filak kuana uza-na'in", # Not used as normal message but as header for the special page itself
+'userrights'               => "Filak priviléjiu uza-na'in sira", # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'   => "Filak lubu uza-na'in",
 'userrights-user-editname' => "Hakerek naran uza-na'in ida-nian:",
 'editusergroup'            => "Filak lubu uza-na'in",
 'userrights-editusergroup' => "Filak lubu uza-na'in",
 'userrights-groupsmember'  => 'Membru iha:',
-'userrights-no-interwiki'  => "Ó la bele filak kuana uza-na'in iha wiki seluk.",
+'userrights-reason'        => 'Motivu ba filak:',
+'userrights-no-interwiki'  => "Ó la bele filak priviléjiu uza-na'in iha wiki seluk.",
 
 # Groups
 'group'            => 'Lubu:',
+'group-user'       => "Uza-na'in sira",
 'group-bot'        => 'Bot sira',
 'group-sysop'      => 'Administradór sira',
 'group-bureaucrat' => 'Burokrata sira',
+'group-suppress'   => "Oversight-na'in sira",
 'group-all'        => '(hotu)',
 
+'group-user-member'       => "Uza-na'in",
 'group-bot-member'        => 'Bot',
 'group-sysop-member'      => 'Administradór',
 'group-bureaucrat-member' => 'Burokrata',
+'group-suppress-member'   => "Oversight-na'in",
 
+'grouppage-user'       => "{{ns:project}}:Uza-na'in sira",
 'grouppage-bot'        => '{{ns:project}}:Bot sira',
 'grouppage-sysop'      => '{{ns:project}}:Administradór sira',
 'grouppage-bureaucrat' => '{{ns:project}}:Burokrata sira',
+'grouppage-suppress'   => '{{ns:project}}:Oversight',
+
+# Rights
+'right-read'                 => 'Lee pájina',
+'right-edit'                 => 'Edita pájina sira',
+'right-createpage'           => "Kria pájina (sira-ne'ebé pájina diskusaun lá'os)",
+'right-createtalk'           => 'Kria pájina diskusaun sira',
+'right-createaccount'        => "Kria konta uza-na'in foun sira",
+'right-move'                 => 'Book pájina sira',
+'right-delete'               => 'Halakon pájina sira',
+'right-bigdelete'            => "Halakon pájina sira-ne'ebé iha istória boot",
+'right-undelete'             => 'Restaurar pájina ida',
+'right-userrights'           => "Edita priviléjiu uza-na'in hotu",
+'right-userrights-interwiki' => "Edita priviléjiu uza-na'in iha wiki seluk sira",
 
 # User rights log
-'rightslog'      => "Lista filak kuana uza-na'in",
+'rightslog'      => "Lista filak priviléjiu uza-na'in",
 'rightslogtext'  => "Ne'e lista ba filak lubu uza-na'in.",
 'rightslogentry' => 'filak lubu $1 nian husi $2 ba $3',
 'rightsnone'     => '(mamuk)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => "lee pájina ne'e",
+'action-edit'                 => "edita pájina ne'e",
+'action-createpage'           => 'kria pájina sira',
+'action-createtalk'           => 'kria pájina diskusaun sira',
+'action-move'                 => "book pájina ne'e",
+'action-move-subpages'        => "book pájina ne'e ho sub-pájina",
+'action-delete'               => "halakon pájina ne'e",
+'action-undelete'             => "restaurar pájina ne'e",
+'action-userrights'           => "edita priviléjiu uza-na'in hotu",
+'action-userrights-interwiki' => "edita priviléjiu uza-na'in iha wiki seluk sira",
+
 # Recent changes
+'nchanges'        => '$1 {{PLURAL:$1|diferensa|diferensa}}',
 'recentchanges'   => 'Mudansa foufoun sira',
 'rcshowhideminor' => '$1 osan-rahun sira',
 'rcshowhidebots'  => '$1 bot sira',
@@ -381,18 +473,22 @@ $messages = array(
 'boteditletter'   => 'b',
 
 # Recent changes linked
-'recentchangeslinked' => 'Muda sira',
+'recentchangeslinked'       => 'Muda sira',
+'recentchangeslinked-title' => 'Mudansa iha pájina sira-ne\'ebé iha ligasaun husi "$1"',
 
 # Upload
 'upload'          => 'Tau iha arkivu laran',
 'uploadbtn'       => 'Tau iha arkivu laran',
 'watchthisupload' => "Hateke pájina ne'e",
 
-# Special:ImageList
-'imagelist_name' => 'Naran',
-'imagelist_user' => "Uza-na'in",
+'license' => 'Lisensa:',
+
+# Special:ListFiles
+'listfiles_date' => 'Tempu',
+'listfiles_name' => 'Naran',
+'listfiles_user' => "Uza-na'in",
 
-# Image description page
+# File description page
 'filehist-deleteall' => 'halakon hotu',
 'filehist-deleteone' => 'halakon',
 'filehist-current'   => 'atuál',
@@ -405,25 +501,30 @@ $messages = array(
 'filerevert-comment' => 'Komentáriu:',
 
 # File deletion
-'filedelete'         => 'Halakon $1',
-'filedelete-comment' => 'Komentáriu:',
-'filedelete-submit'  => 'Halakon',
+'filedelete'                  => 'Halakon $1',
+'filedelete-comment'          => 'Motivu ba halakon:',
+'filedelete-submit'           => 'Halakon',
+'filedelete-otherreason'      => 'Motivu seluk/ida tan:',
+'filedelete-reason-otherlist' => 'Motivu seluk',
+'filedelete-edit-reasonlist'  => 'Edita lista motivu nian',
 
 # Random page
 'randompage' => 'Pájina ruma',
 
 # Statistics
-'statistics'    => 'Estátistika',
-'sitestats'     => '{{SITENAME}} estátistika',
-'userstatstext' => "Iha ne'e registrar tiha ona '''$1''' {{PLURAL:$1|[[Special:ListUsers|uza-na'in]]|[[Special:ListUsers|uza-na'in]]}}, '''$2''' (ka '''$4%''') $5.",
+'statistics' => 'Estátistika',
 
 'brokenredirects-edit'   => '(edita)',
 'brokenredirects-delete' => '(halakon)',
 
+'withoutinterwiki' => "Pájina sira-ne'ebé la iha ligasaun ba lian seluk",
+
 # Miscellaneous special pages
-'nlinks'            => '$1 ligasaun',
+'nbytes'            => '$1 {{PLURAL:$1|byte|byte sira}}',
+'nlinks'            => '{{PLURAL:$1|Ligasaun|Ligasaun}} $1',
 'nmembers'          => '$1 {{PLURAL:$1|membru|membru}}',
 'nrevisions'        => '$1 {{PLURAL:$1|versaun|versaun}}',
+'unusedcategories'  => "Kategoria sira-ne'ebé la uza",
 'shortpages'        => 'Pájina badak',
 'longpages'         => 'Pájina naruk',
 'listusers'         => "Lista uza-na'in",
@@ -437,23 +538,40 @@ $messages = array(
 'booksources-go' => 'Bá',
 
 # Special:Log
-'specialloguserlabel' => "Uza-na'in:",
-'log-search-submit'   => 'Bá',
+'specialloguserlabel'  => "Uza-na'in:",
+'speciallogtitlelabel' => 'Títulu:',
 
 # Special:AllPages
-'allpages'       => 'Pájina hotu',
-'alphaindexline' => "$1 to'o $2",
-'nextpage'       => 'Pájina oinmai ($1)',
-'allarticles'    => 'Pájina hotu',
-'allpagesnext'   => 'Oinmai',
-'allpagessubmit' => 'Bá',
+'allpages'          => 'Pájina hotu',
+'alphaindexline'    => "$1 to'o $2",
+'nextpage'          => 'Pájina oinmai ($1)',
+'prevpage'          => 'Pájina molok ($1)',
+'allpagesfrom'      => 'Hatudu pájina sira; hahú iha:',
+'allpagesto'        => 'Hatudu pájina sira; para iha:',
+'allarticles'       => 'Pájina hotu',
+'allinnamespace'    => 'Pájina hotu (iha espasu $1)',
+'allnotinnamespace' => 'Pájina hotu (la iha espasu $1)',
+'allpagesprev'      => 'Molok',
+'allpagesnext'      => 'Oinmai',
+'allpagessubmit'    => 'Bá',
+'allpagesprefix'    => 'Hatudu pájina sira ho prefiksu:',
 
 # Special:Categories
 'categories' => 'Kategoria sira',
 
+# Special:LinkSearch
+'linksearch-ns' => 'Espasu pájina nian:',
+'linksearch-ok' => 'Buka',
+
 # Special:ListUsers
 'listusers-submit' => 'Hatudu',
 
+# Special:Log/newusers
+'newuserlogpage'           => "Lista kria uza-na'in",
+'newuserlogpagetext'       => "Ne'e lista kria uza-na'in.",
+'newuserlog-create-entry'  => "Uza-na'in foun",
+'newuserlog-create2-entry' => 'registrar tiha konta foun $1',
+
 # Special:ListGroupRights
 'listgrouprights-group'  => 'Lubu',
 'listgrouprights-rights' => 'Priviléjiu',
@@ -465,17 +583,16 @@ $messages = array(
 'emailsend'       => 'Haruka',
 
 # Watchlist
-'watchlist'            => "Ha'u-nia lista hateke",
-'mywatchlist'          => "Ha'u-nia lista hateke",
-'watchlistfor'         => "('''$1''' nian)",
-'addedwatch'           => 'tau tan tiha ba lista hateke',
-'watch'                => 'Hateke',
-'watchthispage'        => "Hateke pájina ne'e",
-'unwatch'              => 'La hateke',
-'watchlist-hide-bots'  => 'Hamsumik edita "bot" sira',
-'watchlist-hide-own'   => "Hamsumik edita ha'u-nia",
-'watchlist-show-minor' => 'Hatudu osan-rahun',
-'watchlist-hide-minor' => 'Subar osan-rahun',
+'watchlist'        => "Ha'u-nia lista hateke",
+'mywatchlist'      => "Ha'u-nia lista hateke",
+'watchlistfor'     => "('''$1''' nian)",
+'addedwatch'       => 'tau tan tiha ba lista hateke',
+'removedwatch'     => 'La hateke pájina ona',
+'removedwatchtext' => 'La hateke pájina "[[:$1]]" ona.',
+'watch'            => 'Hateke',
+'watchthispage'    => "Hateke pájina ne'e",
+'unwatch'          => 'La hateke ona',
+'wlshowlast'       => 'Hatudu $1 hora $2 loron ikus $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Hateke...',
@@ -486,25 +603,37 @@ $messages = array(
 'changed'                      => 'filak',
 'created'                      => 'kria',
 
-# Delete/protect/revert
-'deletepage'                  => 'Halakon pájina',
-'excontent'                   => "testu iha pájina: '$1'",
-'excontentauthor'             => "testu iha pájina: '$1' (no ema ida de'it ne'ebé kontribui '[[Special:Contributions/$2|$2]]')",
-'exblank'                     => 'pájina mamuk',
-'delete-legend'               => 'Halakon',
-'deletedarticle'              => 'halakon "[[$1]]"',
-'dellogpage'                  => 'Lista halakon',
-'deletionlog'                 => 'lista halakon',
-'deletecomment'               => 'Tansá ó halakon:',
+# Delete
+'deletepage'             => 'Halakon pájina',
+'excontent'              => "testu iha pájina: '$1'",
+'excontentauthor'        => "testu iha pájina: '$1' (no ema ida de'it ne'ebé kontribui '[[Special:Contributions/$2|$2]]')",
+'exblank'                => 'pájina mamuk',
+'delete-legend'          => 'Halakon',
+'deletedarticle'         => 'halakon "[[$1]]"',
+'dellogpage'             => 'Lista halakon',
+'deletionlog'            => 'lista halakon',
+'deletecomment'          => 'Motivu ba halakon:',
+'deleteotherreason'      => 'Motivu seluk/ida tan:',
+'deletereasonotherlist'  => 'Motivu seluk',
+'delete-edit-reasonlist' => 'Edita lista motivu nian',
+
+# Protect
 'protectedarticle'            => 'proteje "[[$1]]"',
+'prot_1movedto2'              => 'book tiha [[$1]] ba [[$2]]',
 'protectcomment'              => 'Komentáriu:',
 'protectexpiry'               => "to'o:",
-'protect-fallback'            => 'Presiza kuana "$1"',
-'protect-level-autoconfirmed' => 'Blokeiu ema anónimu',
+'protect-fallback'            => 'Presiza priviléjiu "$1"',
+'protect-level-autoconfirmed' => "Blokeiu ema anónimu ho uza-na'in foun",
 'protect-level-sysop'         => "de'it administradór",
 'protect-expiring'            => "to'o $1 (UTC)",
 'protect-cantedit'            => "Ó la bele filak proteje pájina ne'e nian, tan ba ó la bele edita pájina ne'e.",
-'restriction-type'            => 'Kuana:',
+'protect-othertime'           => 'Tempu seluk:',
+'protect-othertime-op'        => 'tempu seluk',
+'protect-otherreason'         => 'Motivu seluk/ida tan:',
+'protect-otherreason-op'      => 'motivu seluk/ida tan',
+'protect-edit-reasonlist'     => 'Edita lista motivu nian',
+'protect-expiry-options'      => '2 hours:2 hours,1 loron:1 day,3 Loron:3 days,1 semana:1 week,2 semana:2 weeks,1 fulan:1 month,3 fulan:3 months,6 fulan:6 months,1 tinan:1 year,infinite:infinite', # display1:time1,display2:time2,...
+'restriction-type'            => 'Permisaun:',
 
 # Restrictions (nouns)
 'restriction-edit'   => 'Edita',
@@ -517,15 +646,19 @@ $messages = array(
 'undeletelink'           => 'restaurar',
 'undeletecomment'        => 'Komentáriu:',
 'undeletedarticle'       => 'restaurar "[[$1]]"',
-'undeletedrevisions'     => 'restaurar $1 {{PLURAL:$1|versaun|versaun}}',
+'undeletedrevisions'     => 'restaurar {{PLURAL:$1|versaun|versaun}} $1',
 'undelete-search-submit' => 'Buka',
 
 # Namespace form on various pages
+'namespace'      => 'Espasu pájina nian:',
 'blanknamespace' => '(Prinsipál)',
 
 # Contributions
 'contributions' => "Kontribuisaun uza-na'in",
 'mycontris'     => "Ha'u-nia kontribuisaun",
+'uctop'         => '(versaun atuál)',
+'month'         => 'Fulan (ho molok):',
+'year'          => 'Tinan (ho molok):',
 
 'sp-contributions-newbies'  => "Hatudu de'it kontribuisaun uza-na'in foun sira-nia",
 'sp-contributions-search'   => 'Buka kontribuisaun',
@@ -536,7 +669,6 @@ $messages = array(
 'whatlinkshere'           => "Artigu sira ne'ebé bá iha ne'e",
 'whatlinkshere-title'     => 'Pájina sira ne\'ebé bá "$1".',
 'whatlinkshere-page'      => 'Pájina:',
-'linklistsub'             => '(Lista ligasaun nian)',
 'linkshere'               => "Pájina sira ne'e link ba '''[[:$1]]''':",
 'whatlinkshere-prev'      => '{{PLURAL:$1|oinmai|oinmai $1}}',
 'whatlinkshere-next'      => '{{PLURAL:$1|molok|molok $1}}',
@@ -546,16 +678,22 @@ $messages = array(
 # Block/unblock
 'blockip'                 => "Blokeiu uza-na'in",
 'blockip-legend'          => "Blokeiu uza-na'in",
+'ipaddress'               => 'Diresaun IP:',
+'ipbreason'               => 'Motivu:',
+'ipbreasonotherlist'      => 'Motivu seluk',
+'ipbsubmit'               => "Blokeiu uza-na'in ne'e",
+'ipbother'                => 'Tempu seluk:',
 'ipboptions'              => '2 hours:2 hours,1 loron:1 day,3 Loron:3 days,1 semana:1 week,2 semana:2 weeks,1 fulan:1 month,3 fulan:3 months,6 fulan:6 months,1 tinan:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'          => 'seluk',
-'ipblocklist'             => "Ema anónimu no rejista ne'ebé nablokeiu",
+'ipblocklist'             => 'Ema anónimu no rejista maka la bele edita',
 'ipblocklist-username'    => "Naran uza-na'in ka IP:",
 'ipblocklist-submit'      => 'Buka',
+'anononlyblock'           => "ema anónimu de'it",
 'blocklink'               => 'blokeiu',
 'unblocklink'             => 'la blokeiu',
 'contribslink'            => 'kontribuisaun',
 'block-log-flags-noemail' => 'korreiu eletróniku blokeiu',
-'ipb_already_blocked'     => '"$1" nablokeiu tiha ona',
+'ipb_already_blocked'     => 'Ema ruma blokeiu "$1" tiha ona',
 
 # Move page
 'move-page'               => 'Book $1',
@@ -569,51 +707,75 @@ $messages = array(
 'movetalk'                => 'Book pájina diskusaun mós',
 '1movedto2'               => 'book tiha [[$1]] ba [[$2]]',
 'movelogpage'             => 'Lista book',
+'movereason'              => 'Motivu:',
 'delete_and_move'         => 'Halakon ho book',
 'delete_and_move_confirm' => 'Sin, halakon pájina',
 
 # Export
 'export'        => 'Esporta pájina sira',
 'export-submit' => 'Esporta',
+'export-addcat' => 'Tau tan',
 
 # Namespace 8 related
 'allmessagesname'    => 'Naran',
 'allmessagescurrent' => 'Testu atuál',
 
+# Special:Import
+'import-comment' => 'Komentáriu:',
+
 # Import log
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|versaun|versaun}} husi $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'      => "Ha'u-nia pájina uza-na'in",
-'tooltip-pt-mytalk'        => "Ha'u-nia pájina diskusaun",
-'tooltip-pt-preferences'   => "Ha'u-nia preferénsia",
-'tooltip-pt-mycontris'     => "Lista ha'u-nia kontribuisaun",
-'tooltip-pt-logout'        => 'Husik',
-'tooltip-ca-addsection'    => "Tau tan komentáriu ida ba diskusaun ne'e.",
-'tooltip-ca-protect'       => "Proteje pájina ne'e",
-'tooltip-ca-delete'        => "Halakon pájina ne'e",
-'tooltip-ca-move'          => "Book pájina ne'e",
-'tooltip-ca-watch'         => "Tau tan pájina ne'e ba ó-nia lista hateke",
-'tooltip-search'           => 'Buka iha {{SITENAME}}',
-'tooltip-n-mainpage'       => 'Vizita Pájina Mahuluk',
-'tooltip-n-portal'         => "Kona-ba projetu, ne'ebé ó bele halo, iha ne'ebé ó hetan saida",
-'tooltip-n-recentchanges'  => "Lista mudansa foufoun sira iha wiki ne'e.",
-'tooltip-n-randompage'     => 'Hola pájina ruma',
-'tooltip-n-help'           => 'Hatudu pájina ajuda.',
-'tooltip-t-whatlinkshere'  => "Lista pájina nian ne'ebé bá iha ne'e",
-'tooltip-t-contributions'  => "Haree lista kontribuisaun uza-na'in ne'e nian",
-'tooltip-t-upload'         => 'Tau iha arkivu laran',
-'tooltip-t-specialpages'   => 'Lista pájina espesiál hotu nian',
-'tooltip-ca-nstab-user'    => "Haree pájina uza-na'in",
-'tooltip-ca-nstab-project' => 'Haree pájina projetu nian',
-'tooltip-minoredit'        => "Halo ne'e osan-rahun",
-'tooltip-watch'            => "Tau tan pájina ne'e ba ó-nia lista hateke",
+'tooltip-pt-userpage'       => "Ó-nia pájina uza-na'in",
+'tooltip-pt-mytalk'         => 'Ó-nia pájina diskusaun',
+'tooltip-pt-preferences'    => "Ha'u-nia preferénsia",
+'tooltip-pt-mycontris'      => 'Ó-nia kontribuisaun (lista)',
+'tooltip-pt-logout'         => 'Husik',
+'tooltip-ca-talk'           => 'Diskusaun kona-ba konteúdu pájina nian',
+'tooltip-ca-edit'           => "Ó bele filak pájina ne'e. Please use the preview button before saving.",
+'tooltip-ca-addsection'     => 'Tau tan seksaun foun ida.',
+'tooltip-ca-viewsource'     => "Ema ruma proteje tiha pájina ne'e.
+Ó bele lee testu.",
+'tooltip-ca-protect'        => "Proteje pájina ne'e",
+'tooltip-ca-delete'         => "Halakon pájina ne'e",
+'tooltip-ca-move'           => "Book pájina ne'e",
+'tooltip-ca-watch'          => "Tau tan pájina ne'e ba ó-nia lista hateke",
+'tooltip-search'            => 'Buka iha {{SITENAME}}',
+'tooltip-p-logo'            => 'Pájina Mahuluk',
+'tooltip-n-mainpage'        => 'Vizita Pájina Mahuluk',
+'tooltip-n-portal'          => "Kona-ba projetu, ne'ebé ó bele halo, iha ne'ebé ó hetan saida",
+'tooltip-n-recentchanges'   => "Lista mudansa foufoun sira iha wiki ne'e.",
+'tooltip-n-randompage'      => 'Hola pájina ruma',
+'tooltip-n-help'            => 'Hatudu pájina ajuda.',
+'tooltip-t-whatlinkshere'   => "Lista pájina nian ne'ebé bá iha ne'e",
+'tooltip-t-contributions'   => "Haree lista kontribuisaun uza-na'in ne'e nian",
+'tooltip-t-emailuser'       => 'Haruka korreiu eletróniku',
+'tooltip-t-upload'          => 'Tau iha arkivu laran',
+'tooltip-t-specialpages'    => 'Lista pájina espesiál hotu nian',
+'tooltip-ca-nstab-user'     => "Haree pájina uza-na'in",
+'tooltip-ca-nstab-project'  => 'Haree pájina projetu nian',
+'tooltip-ca-nstab-category' => 'Lee pájina kategoria',
+'tooltip-minoredit'         => "Halo ne'e osan-rahun",
+'tooltip-watch'             => "Tau tan pájina ne'e ba ó-nia lista hateke",
+
+# Attribution
+'lastmodifiedatby' => "$3 filak ikus pájina ne'e iha $1, $2.", # $1 date, $2 time, $3 user
+
+# Skin names
+'skinname-standard'    => 'Klásiku',
+'skinname-cologneblue' => 'Kolónia azúl',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Manu',
 
 # Browsing diffs
 'previousdiff' => '�Versaun molok',
 'nextdiff'     => 'Versaun oinmai→',
 
-# Special:NewImages
+# Media information
+'show-big-image' => 'Boot liu',
+
+# Special:NewFiles
 'showhidebots' => '($1 bot sira)',
 'ilsubmit'     => 'Buka',
 
@@ -622,6 +784,9 @@ $messages = array(
 
 'exif-meteringmode-255' => 'Seluk',
 
+# External editor support
+'edit-externally-help' => "(Haree [http://www.mediawiki.org/wiki/Manual:External_editors iha ne'e] ba informasaun barak liu)",
+
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'hotu',
 'imagelistall'     => 'hotu',
@@ -644,10 +809,13 @@ $messages = array(
 'table_pager_limit_submit' => 'Bá',
 
 # Auto-summaries
-'autosumm-new' => 'Pájina foun: $1',
+'autosumm-new' => "Pájina foun: '$1'",
 
 # Watchlist editor
 'watchlistedit-normal-title' => 'Filak lista hateke',
+'watchlistedit-raw-titles'   => 'Títulu sira:',
+'watchlistedit-raw-added'    => '{{PLURAL:$1|Títulu ida|Títulu $1}} tau tan tiha:',
+'watchlistedit-raw-removed'  => '{{PLURAL:$1|Títulu ida|Títulu $1}} hasai tiha:',
 
 # Watchlist editing tools
 'watchlisttools-edit' => 'Haree no edita lista hateke',
@@ -657,12 +825,22 @@ $messages = array(
 'version-specialpages'     => 'Pájina espesiál',
 'version-other'            => 'Seluk',
 'version-version'          => 'Versaun',
+'version-license'          => 'Lisensa',
+'version-software-product' => 'Produtu',
 'version-software-version' => 'Versaun',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch-submit' => 'Buka',
 
 # Special:SpecialPages
-'specialpages' => 'Pájina espesiál sira',
+'specialpages'               => 'Pájina espesiál sira',
+'specialpages-group-other'   => 'Pájina espesiál seluk',
+'specialpages-group-login'   => 'Login / kria konta',
+'specialpages-group-changes' => 'Mudansa foufoun sira no lista sira',
+'specialpages-group-users'   => "Uza-na'in no priviléjiu sira",
+'specialpages-group-pages'   => 'Lista pájina nian',
+
+# Special:BlankPage
+'blankpage' => 'Pájina mamuk',
 
 );
diff --git a/languages/messages/MessagesTg.php b/languages/messages/MessagesTg.php
index be82ba64..fe440614 100644
--- a/languages/messages/MessagesTg.php
+++ b/languages/messages/MessagesTg.php
@@ -1,5 +1,5 @@
 <?php
-/** Tajik (Тоҷикӣ/tojikī)
+/** Tajik (Тоҷикӣ)
  *
  * @ingroup Language
  * @file
diff --git a/languages/messages/MessagesTg_cyrl.php b/languages/messages/MessagesTg_cyrl.php
index 7a23aab5..8e0930ee 100644
--- a/languages/messages/MessagesTg_cyrl.php
+++ b/languages/messages/MessagesTg_cyrl.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => "Баҳ�и_корбар",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => "Баҳ�и_$1",
-	NS_IMAGE          => "�к�",
-	NS_IMAGE_TALK     => "Баҳ�и_ак�",
+	NS_FILE           => "�к�",
+	NS_FILE_TALK      => "Баҳ�и_ак�",
 	NS_MEDIAWIKI      => "Медиавики",
 	NS_MEDIAWIKI_TALK => "Баҳ�и_медиавики",
 	NS_TEMPLATE       => "Шаблон",
@@ -104,6 +104,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'Пинҳон намудани вироишҳои ман дар феҳри�ти назарот',
 'tog-watchlisthidebots'       => 'Пинҳон намудани вироишҳои бот дар феҳри�ти назарот',
 'tog-watchlisthideminor'      => 'Пинҳон намудани вироишҳои хурд дар феҳри�ти назарот',
+'tog-watchlisthideliu'        => 'Пинҳон кардани вироишоти корбарони вурудшуда аз феҳри�ти пайгириҳо',
+'tog-watchlisthideanons'      => 'Пинҳон кардани вироишоти корбарони гумном аз феҳри�ти пайгириҳо',
 'tog-ccmeonemails'            => '�у�хаҳои хатҳоро ба ман рои кунед, ман онҳоро ба корбарон рои мекунам',
 'tog-diffonly'                => 'Муҳтавиёти �аҳифаи зерин намоиш дода нашавад',
 'tog-showhiddencats'          => 'Гурӯҳҳои пинҳонро намоиш бидеҳ',
@@ -112,8 +114,6 @@ $messages = array(
 'underline-never'   => 'Ҳеҷгоҳ',
 'underline-default' => 'Пешфарзи мурургар',
 
-'skinpreview' => '(Пешнамоиш)',
-
 # Dates
 'sunday'        => 'Якшанбе',
 'monday'        => 'Душанбе',
@@ -207,7 +207,7 @@ $messages = array(
 'mytalk'         => 'Гуфтугӯи ман',
 'anontalk'       => 'Баҳ� бо ин IP',
 'navigation'     => 'Гаштан',
-'and'            => 'ва',
+'and'            => '&#32;ва',
 
 # Metadata in edit box
 'metadata_help' => 'Метадода:',
@@ -270,8 +270,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Дар бораи {{SITENAME}}',
 'aboutpage'            => 'Project:Дар бораи',
-'bugreports'           => 'Гузориши ишколот',
-'bugreportspage'       => 'Project:Гузоришҳои ишколот',
 'copyright'            => 'Мӯҳтаво таҳти иҷозатномаи $1 да�тра� а�т.',
 'copyrightpagename'    => 'Википедиа copyright',
 'copyrightpage'        => '{{ns:project}}:Copyrights',
@@ -294,8 +292,6 @@ $messages = array(
 
 'badaccess'        => 'Иштибоҳи иҷоза',
 'badaccess-group0' => 'Шумо рух�ати иҷрои амали дархо�тшударо надоред.',
-'badaccess-group1' => '�мали шумо дархо�ткарда ба корбарони ин гурӯҳ $1 маҳдуд а�т.',
-'badaccess-group2' => '�мале ки дархо�таед маҳдуд ба корбарони �ке аз гурӯҳои $1 а�т.',
 'badaccess-groups' => '�мале ки дархо�т кардаед маҳдуд ба корбарони �ке аз гурӯҳҳои $1 а�т.',
 
 'versionrequired'     => '�у�хаи $1 аз нармафзори МедиаВики лозим а�т',
@@ -311,6 +307,8 @@ $messages = array(
 'editsection'             => 'вироиш',
 'editold'                 => 'вироиш',
 'viewsourceold'           => 'намоиши манбаъ',
+'editlink'                => 'вироиш',
+'viewsourcelink'          => 'дидани манбаъ',
 'editsectionhint'         => 'Вироиши қи�мат: $1',
 'toc'                     => 'Мундариҷа',
 'showtoc'                 => '�амоиш дода шавад',
@@ -387,7 +385,6 @@ $1',
 'cannotdelete'         => 'Саҳифа ё парвандаи мушахха�шударо ҳазф карда нашуд. (Мумкин а�т қаблан ка�е дигаре онро ҳазф карда бошад.)',
 'badtitle'             => 'Унвони номуно�иб',
 'badtitletext'         => 'Унвони �аҳифаи дархо�тшуда номӯътабар, холӣ, ё пайванди байнизабони ё байнивикии нодуру�т буд. Он метавонад �к ё �кчанд аломатҳоеро дар бар гирад, ки дар унвонҳо и�тифода шуда наметавонанд.',
-'perfdisabled'         => 'Бубахшед! Ин имкон муваққатан ғайрифаъол шудаа�т, зеро ки он пойгоҳи додаро �у�т мекунад ва ҳеҷ ка�е наметавонад аз вики и�тифода барад.',
 'perfcached'           => 'Додаҳои зерин аз ҳофизаи муваққатӣ фарохонӣ шудаанд ва мумкин а�т, комилан ба рӯз нашудаанд.',
 'perfcachedts'         => 'Додаҳои зерин аз ҳофизаи муваққатӣ фарохонӣ шудаанд ва мумкин а�т, охирин ба рӯзра�онӣ $1 а�т.',
 'querypage-no-updates' => 'Имкони ба рӯзра�онии ин �аҳифа феълан ғайрифаъол шудаа�т.',
@@ -415,10 +412,10 @@ $1',
 
 # Login and logout pages
 'logouttitle'                => 'Хуруҷи корбар аз �и�тем',
-'logouttext'                 => '<strong>�кнун аз �и�тем хориҷ шудаед.</strong>
+'logouttext'                 => "'''�кнун аз �и�тем хориҷ шудаед.'''
 
 Шумо метавонед гумном аз {{SITENAME}} и�тифодабариро идома диҳед, ё метавонед бо ҳамин номи корбариатон ва ё номи корбарии дигаре [[Special:UserLogin|боз вуруд кунед]]. 
-Тавваҷӯҳ кунед, ки баъзе аз �аҳифаҳо қаблан чи тавре намоиш шуда будан ҳамин тавр намоиш дода мешаванд, то даме ки шумо ҳофизаи мурургаратонро пок кунед.',
+Тавваҷӯҳ кунед, ки баъзе аз �аҳифаҳо қаблан чи тавре намоиш шуда будан ҳамин тавр намоиш дода мешаванд, то даме ки шумо ҳофизаи мурургаратонро пок кунед.",
 'welcomecreation'            => '== Хуш омадед, $1! ==
 
 Ҳи�оби шумо �ҷод шуд. 
@@ -430,7 +427,6 @@ $1',
 'remembermypassword'         => 'Манро дар хотир нигоҳ дор',
 'yourdomainname'             => 'Домейни Шумо',
 'externaldberror'            => 'Хатое дар иртибот бо пойгоҳи дода рух дода а�т ё ин ки шумо иҷозат ба рӯзра�онии ҳи�оби берунии худро надоред.',
-'loginproblem'               => '<b>Вуруди шумо ба �и�тем бо мушкили рӯ ба рӯ шуд.</b><br />Бори дигар �анҷед!',
 'login'                      => 'Вуруд',
 'nav-login-createaccount'    => 'Вуруд / Сохтани ҳи�оби ҷадид',
 'loginprompt'                => 'Барои вуруд ба {{SITENAME}} бо�д кукиҳоро фаъол кунед.',
@@ -445,7 +441,8 @@ $1',
 'gotaccountlink'             => 'Вуруд шавед',
 'createaccountmail'          => 'бо почтаи �лектронӣ',
 'badretype'                  => 'Калимаҳои убуре, ки ворид кардаед бо ҳамдигар мувофиқат намекунанд.',
-'userexists'                 => '�оми корбарӣ дохил кардашуда мавриди и�тифода а�т. �оми дигарероро интихоб кунед.',
+'userexists'                 => '�оми корбарии дохил кардашуда мавриди и�тифода а�т. 
+�оми дигарероро интихоб кунед.',
 'youremail'                  => 'Почтаи �лектронии Шумо:',
 'username'                   => '�оми корбар:',
 'uid'                        => 'ID-и корбар:',
@@ -467,7 +464,8 @@ $1',
 'noname'                     => '�оми корбари дуру�теро шумо пешниҳод накардед.',
 'loginsuccesstitle'          => 'Вуруд бо муваффақи�т',
 'loginsuccess'               => "'''Шумо акнун ба Википедиа ҳамчун \"\$1\". вуруд кардед'''",
-'nosuchuser'                 => 'Корбаре бо номи "$1" вуҷуд надорад. �мали номро барра�и кунед, ё ҳи�оби ҷадидеро �ҷод кунед.',
+'nosuchuser'                 => 'Корбаре бо номи "$1" вуҷуд надорад. 
+�мали номро барра�и кунед, ё [[Special:UserLogin/signup|ҳи�оби ҷадидеро �ҷод кунед]].',
 'nosuchusershort'            => 'Ягон корбаре бо номи "<nowiki>$1</nowiki>" вуҷуд надорад. Тарзи навишти номро �анҷед.',
 'nouserspecified'            => 'Шумо бо�д �к номи корбарӣ мушахха� кунед.',
 'wrongpassword'              => 'Калимаи убури нодуру�т дохил карда шуд. Бори дигар �анҷед.',
@@ -475,11 +473,11 @@ $1',
 'passwordtooshort'           => 'Калимаи убур хеле кӯтоҳ а�т. Вай бо�д ҳадди ақал {{PLURAL:$1|1 аломат|$1 аломатҳо}} дошта аз номи корбарӣ фарқ кунад.',
 'mailmypassword'             => 'Гузарвожаи навро ба E-mail бифири�тед',
 'passwordremindertitle'      => 'Муваққатан калимаи убурӣ ҷадид барои {{SITENAME}}',
-'passwordremindertext'       => 'Ка�е (�ҳтимолан худи Шумо), аз нишонаи IP $1 дархо�т кардаа�т, ки калимаи убури ҷадиде барои {{SITENAME}} ($4) барои шумо бифири�тем.
-Калимаи убури корбар "$2" ҳамакнун "$3" а�т.
-Ҳоло бо�д вориди �и�тем шавед ва калимаи убури худро тағйир диҳед.
+'passwordremindertext'       => 'Ка�е (�ҳтимолан худи Шумо), аз нишонаи IP $1 дархо�т кардаа�т, ки гузарвожаи ҷадиде барои {{SITENAME}} ($4) барои шумо бифири�тем.
+Гузарвожаи муваққатӣ барои корбар "$2" ҳамакнун "$3" а�т.
+�гар ин ни�ти шумо буд, шумо бо�д вориди �и�тем шавед ва гузарвожаи худро тағйир диҳед.
 
-�гар ка�е дигаре инро дахо�т кардаа�т, ё инки шумо калимаи убури пешинаи худро ба ёд овардаед ва дигар хоҳиши тағйир додани онро надоред, ба ин паём аҳми�т надиҳед ва калимаи убури пешинаи худро и�тифода баред.',
+�гар ка�е дигаре инро дахо�т кардаа�т, ё инки шумо гузарвожаи пешинаи худро ба ёд овардаед ва дигар хоҳиши тағйир додани онро надоред, ба ин паём аҳми�т надиҳед ва гузарвожаи пешинаи худро и�тифода баред.',
 'noemail'                    => 'Ҳеҷ нишонаи почтаи �лектронӣ барои корбар "$1" �абт нашудаа�т.',
 'passwordsent'               => 'Калимаи убури нав ба адре�и e-mail, ки барои "$1" номнави� шудаа�т фири�тода шуд.
 Баъд аз да�тра� кардани он, марҳамат карда вуруд кунед.',
@@ -502,14 +500,18 @@ $1',
 'loginlanguagelabel'         => 'Забон: $1',
 
 # Password reset dialog
-'resetpass'               => 'Сифр кардани калимаи убурӣ ҳи�оби корбарӣ',
-'resetpass_announce'      => 'Шумо бо коди мувақатӣ ба �и�тем вуруд шудаед. Барои анҷом додани вурудшавӣ, шумо бо�д калимаи убурӣ ҷадидро инҷо ворид кунед:',
-'resetpass_header'        => 'Тағйири гузарвожаи ҳи�об',
-'resetpass_submit'        => 'Калимаи убурро танзим карда ба �и�тем вуруд кунед',
-'resetpass_success'       => 'Калимаи убури шумо бо муваффақи�т тағйир дода шуд! Дар ҳоли ворид кардани шумо ба �и�тем...',
-'resetpass_bad_temporary' => 'Калимаи убури мувақкатӣ нодуру�т а�т. Эҳтимолан калимаи убури худро пештар бо муваффақи�т тағйир додаед ё калимаи убури ҷадидеро дархо�т кардаед.',
-'resetpass_forbidden'     => 'Дар {{SITENAME}} калимаҳои убурро наметавон тағйир дод',
-'resetpass_missing'       => 'Иттилооте барои коргузорӣ фири�тода нашудаа�т.',
+'resetpass'                 => 'Сифр кардани калимаи убурӣ ҳи�оби корбарӣ',
+'resetpass_announce'        => 'Шумо бо коди мувақатӣ ба �и�тем вуруд шудаед. Барои анҷом додани вурудшавӣ, шумо бо�д калимаи убурӣ ҷадидро инҷо ворид кунед:',
+'resetpass_header'          => 'Тағйири гузарвожаи ҳи�об',
+'oldpassword'               => 'Калимаи кӯҳнаи убур:',
+'newpassword'               => 'Калимаи нави убур:',
+'retypenew'                 => 'Калимаи нави убурро такроран нави�ед:',
+'resetpass_submit'          => 'Калимаи убурро танзим карда ба �и�тем вуруд кунед',
+'resetpass_success'         => 'Калимаи убури шумо бо муваффақи�т тағйир дода шуд! Дар ҳоли ворид кардани шумо ба �и�тем...',
+'resetpass_bad_temporary'   => 'Калимаи убури мувақкатӣ нодуру�т а�т. Эҳтимолан калимаи убури худро пештар бо муваффақи�т тағйир додаед ё калимаи убури ҷадидеро дархо�т кардаед.',
+'resetpass_forbidden'       => 'Дар {{SITENAME}} калимаҳои убурро наметавон тағйир дод',
+'resetpass-submit-loggedin' => 'Тағйири гузарвожа',
+'resetpass-temp-password'   => 'Гузарвожаи муваққатӣ:',
 
 # Edit page toolbar
 'bold_sample'     => 'Матни пурранг',
@@ -532,8 +534,8 @@ $1',
 'hr_tip'          => 'Хати уфуқӣ (�арфакорона и�тифода кунед)',
 
 # Edit pages
-'summary'                   => 'Хуло�а',
-'subject'                   => 'Мавзӯъ/�арлавҳа',
+'summary'                   => 'Хуло�а:',
+'subject'                   => 'Мавзӯъ/�арлавҳа:',
 'minoredit'                 => 'Ин вироиши хурд а�т',
 'watchthis'                 => '�азар кардани ин �аҳифа',
 'savearticle'               => 'Саҳифа захира шавад',
@@ -547,12 +549,13 @@ $1',
 'missingcommenttext'        => 'Лутфан тав�ифе дар зер бинави�ед.',
 'missingcommentheader'      => "'''�доварӣ:''' Шумо мавзӯъ/унвони ин ёддоштро мушахха�т накардаед.
 �гар дубора тугмаи \"Захира\"-ро пахш кунед, вироишатон бидуни он захира хоҳад шуд.",
-'summary-preview'           => 'Пешнамоиши хуло�а',
-'subject-preview'           => 'Пешнамоиши мавзӯъ/унвон',
+'summary-preview'           => 'Пешнамоиши хуло�а:',
+'subject-preview'           => 'Пешнамоиши мавзӯъ/унвон:',
 'blockedtitle'              => 'Корбар ба�та шудаа�т',
 'blockedtext'               => "<big>'''�оми корбарии Шумо ё нишонаи IP ба�та шудаа�т.'''</big>
 
-Ба�тан аз тарафи $1 иҷро шуд. Сабаби он ''$2'' а�т.
+Ба�тан аз тарафи $1 иҷро шуд. 
+Сабаби он ''$2'' а�т.
 
 * Замони қатъ кардан: $8
 * Замони �аромадани қатъи да�тра�ӣ: $6
@@ -560,7 +563,8 @@ $1',
 
 Шумо метавонед бо $1 ё �ке дигаре аз [[{{MediaWiki:Grouppage-sysop}}|мудирон]] барои гуфтугӯ роҷеъ ба қатъи да�тра�ӣ тамо� гиред.
 Таваҷҷӯҳ кунед, ки аз қобили�ти 'фири�тодаи почтаи �лектронӣ ба ин корбар' наметавоне и�тифода кард, магар ин ки �к нишони мӯътабари почтаи �лектронӣ дар [[Special:Preferences|тарҷиҳоти корбарии]] худ �абт карда бошед ва аз корбурди он манъ нашуда бошед.
-�ишонаи кунунии IP Шумо $3 а�т, ва шино�аи қатъи да�тра�ии Шумо #$5 а�т. Лутфан ин ё онро ва ё ҳардуи онро дар дархо�тҳои худ зикр кунед.",
+�ишонаи кунунии IP Шумо $3 а�т, ва шино�аи қатъи да�тра�ии Шумо #$5 а�т. 
+Лутфан ин ё онро ва ё ҳардуи онро дар дархо�тҳои худ зикр кунед.",
 'autoblockedtext'           => "Да�тра�ии нишонаи IP шумо қатъ шудаа�т, �абаб он а�т, ки ин нишонаи IP аз тарафи корбаре и�тифода мешуд, ки да�тра�ии ӯ аз тарафи $1 қатъ гардонида шудаа�т.
 Иллати зикршуда чунин а�т:
 
@@ -596,23 +600,23 @@ $1',
 'noarticletext'             => 'Дар ин �аҳифа то кунун, матн вуҷуд надорад, шумо метавонед дар дигар �аҳифаҳо [[Special:Search/{{PAGENAME}}|унвони ин �аҳифаро ҷу�туҷӯ кунед]] ё [{{fullurl:{{FULLPAGENAME}}|action=edit}} ин �аҳифаро вироиш кунед].',
 'userpage-userdoesnotexist' => 'Ҳи�оби корбар "$1" �абт нашудаа�т. Итминон ҳо�ил кунед ки мехоҳед ин �аҳифаро �чод ё вироиш кунед.',
 'clearyourcache'            => "'''Эзоҳ:''' Па� аз захира�озӣ мумкин а�т барои дидани тағйирот ниёз бошад, ки ҳофизаи ниҳонии мурургари худро холӣ кунед. '''Мозилла / Файерфок� / Сафари:''' калиди ''Shift''-ро нигоҳ доред  ва рӯи тугмаи  ''Reload'' клик кунед, ё калидҳои ''Ctrl-Shift-R'' (''Cmd-Shift-R'' дар Эппл Макинтош) бо ҳам фишор диҳед; '''IE:''' калиди ''Ctrl'' нигоҳ доред ва рӯи тугмаи ''Refresh'' клик кунед, ё калидҳои ''Ctrl-F5'' бо ҳам фишор диҳед; '''Konqueror:''': тугмаи ''Reload''-ро оддӣ клик кунед, ё калиди ''F5'' фишор диҳед; Ба корбарони '''Opera''' мумкин а�т лозим бошад, ки ҳофизаи ниҳонии худро комилан дар ''Tools→Preferences'' холӣ кунанд.",
-'usercssjsyoucanpreview'    => '<strong>Эзоҳ:</strong> Пеш парвандаи CSS ё JS худро захира кунед, бо и�тифода аз тугмаи "Пешнамоиш" метавонед онро озмоиш кунед.',
+'usercssjsyoucanpreview'    => "'''Эзоҳ:''' Пеш парвандаи CSS ё JS худро захира кунед, бо и�тифода аз тугмаи \"Пешнамоиш\" метавонед онро озмоиш кунед.",
 'usercsspreview'            => "'''Фаромӯш накунед, ки шумо фақат CSS корбариатонро пешнамоиш карда и�тодааед ва он ҳанӯз захира нашудаа�т!'''",
 'userjspreview'             => "'''Фаромӯш накунед, ки шумо фақат ҶаваСкрипти корбариатонро имтиҳон,пешнамоиш карда и�тодаед ва он ҳанӯз захира нашудаа�т!'''",
 'userinvalidcssjstitle'     => "'''Ҳушдор:'''Пӯ�те бо номи \"\$1\" вуҷуд надорад. Таваҷҷӯҳ кунед ки �аҳифаҳои .css ва .js бо ҳарфҳои хурд навишта мешаванд, �амуна. {{ns:user}}:Фу/monobook.css дар муқобили корбар {{ns:user}}:Фу/Monobook.css.",
 'updated'                   => '(Ба рӯз шуда)',
-'note'                      => '<strong>Эзоҳ:</strong>',
-'previewnote'               => '<strong>Ин фақат пешнамоиш а�т; дигаргуниҳо ҳоло захира нашудаанд!</strong>',
+'note'                      => "'''Эзоҳ:'''",
+'previewnote'               => "'''Ин фақат пешнамоиш а�т; дигаргуниҳо ҳоло захира нашудаанд!'''",
 'previewconflict'           => 'Ин пешнамоиш акко�кунандаи матни ноҳи�и вироиш дар боло а�т ва агар онро захира кунед бо ҳамин шакл нишода дода хоҳад шуд.',
-'session_fail_preview'      => '<strong>Бубахшед! �з �абаби аз да�т рафтани иттилооти ниша�ти корбарӣ, наметавонем вироишҳои шуморо пардозиш кунем.
-Лутфан дубора �аъй кунед. �гар боз бо ҳамин паём рӯ ба рӯ шавед, аз �и�тем хориҷ шавед ва муҷаддадан ворид шавед.</strong>',
-'session_fail_preview_html' => "<strong>Бубахшед! Имкони �абти вироиши шумо ба хотир аз да�т рафтани иттилоот ниша�т.</strong>
+'session_fail_preview'      => "'''Бубахшед! �з �абаби аз да�т рафтани иттилооти ниша�ти корбарӣ, наметавонем вироишҳои шуморо пардозиш кунем.
+Лутфан дубора �аъй кунед. �гар боз бо ҳамин паём рӯ ба рӯ шавед, аз �и�тем хориҷ шавед ва муҷаддадан ворид шавед.'''",
+'session_fail_preview_html' => "'''Бубахшед! Имкони �абти вироиши шумо ба хотир аз да�т рафтани иттилоот ниша�т.'''
 
 ''Бо таваҷҷӯҳ ба ин ки дар {{SITENAME}} имкони HTML хом фаъол а�т, пешнамоиши �аҳифа пинҳон шуда то имкони зидди ҳамалоти ҶаваСкрипт вуҷуд ндошта бошад.''
 
-<strong>�гар боварӣ доред, ки ин пешнамоиш �к вироиши миҷоз а�, онро такрор кунед. �гар пешнамоиш натиҷае надод, аз �и�тем хориҷ шавед ва дубора ворид шавед</strong>",
-'token_suffix_mismatch'     => '<strong>Вироишҳои шумо захира нашуд, зеро мурургари шумо навиштаҳои нуқтагузориро аз ҳам пошида а�т. Вироиши шумо захира нашуд то аз вайрон шудани матни �аҳифа пешгирӣ кунад.
-Баъзан ин хато вақте пайдо мешавад, ки шумо аз хизмати (web-based proxy) и�тифода мекунед.</strong>',
+'''�гар боварӣ доред, ки ин пешнамоиш �к вироиши миҷоз а�, онро такрор кунед. �гар пешнамоиш натиҷае надод, аз �и�тем хориҷ шавед ва дубора ворид шавед'''",
+'token_suffix_mismatch'     => "'''Вироишҳои шумо захира нашуд, зеро мурургари шумо навиштаҳои нуқтагузориро аз ҳам пошида а�т. Вироиши шумо захира нашуд то аз вайрон шудани матни �аҳифа пешгирӣ кунад.
+Баъзан ин хато вақте пайдо мешавад, ки шумо аз хизмати (web-based proxy) и�тифода мекунед.'''",
 'editing'                   => 'Дар ҳоли вироиш $1',
 'editingsection'            => 'Дар ҳоли вироиши $1 (қи�мат)',
 'editingcomment'            => 'Дар ҳоли вироиш $1 (comment)',
@@ -624,21 +628,21 @@ $1',
 '''Фақат''', вақте, ки тугмаи \"Саҳифа захира шавад\"-ро фишор диҳед матни ноҳи�и матни болои захира хоҳад шуд.",
 'yourtext'                  => 'Матни Шумо',
 'storedversion'             => '�у�хаи �абтшуда',
-'nonunicodebrowser'         => '<strong>Ҳушдор: Муругари шумо бо �тандарти Юникод ҷавобгӯ не�т. �ломатҳои ғайр аз ASC11 ба �урати адад ба коди шонздаҳ ба шумо нишон дода мешаванд.</strong>',
-'editingold'                => '<strong>ҲУШДОР: Шумо ну�хаи кӯҳнаи ин �аҳифаро вироиш карда и�тодаед.
-�гар шумо онро захира кунед, ҳар тағйире ки па� аз ин ну�ха анҷом шуда, аз байн хоҳад рафт.</strong>',
+'nonunicodebrowser'         => "'''Ҳушдор: Муругари шумо бо �тандарти Юникод ҷавобгӯ не�т. �ломатҳои ғайр аз ASC11 ба �урати адад ба коди шонздаҳ ба шумо нишон дода мешаванд.'''",
+'editingold'                => "'''ҲУШДОР: Шумо ну�хаи кӯҳнаи ин �аҳифаро вироиш карда и�тодаед.
+�гар шумо онро захира кунед, ҳар тағйире ки па� аз ин ну�ха анҷом шуда, аз байн хоҳад рафт.'''",
 'yourdiff'                  => 'Фарқи�тҳо',
-'copyrightwarning'          => 'Ҳамаи ҳи��агузорӣ ба {{SITENAME}} аз рӯи қонунҳои зерин $2 (нигаред $1 барои маълумоти бештар) ҳи��агузорӣ мешаванд. �гар Шумо намехоҳед, ки навиштаҷоти Шумо вироиш ва паҳн нашаванд, Шумо метавонед ин мақоларо нафири�тед.<br /> Шумо ваъда медиҳед, ки худатон ин мақоларо навиштед ё ки аз �арчашмаҳои кушод ну�хабардорӣ кардаед. <strong>�С�РҲОИ ҚОБИЛИ ҲУҚУҚИ МУ�ЛЛИФРО БЕ ИҶОЗ�Т ��ФИРИСТЕД!</strong>',
-'copyrightwarning2'         => 'Лутфан таваҷҷӯҳ дошта бошед ки ҳамаи ҳи��агузориҳо ба {{SITENAME}} бо таҳти  "Иҷозатномаи му�танадоти Озод GNU" мунташир мешаванд. (барои ҷузъиёти бештар нигаред ба $1). �гар намехоҳед навиштаҳо�тон бераҳмона вироиш шуда ва ба дилхоҳ тавзеҳ шавад, инҷо нафири�тед.<br />
-Ҳамин тавр шумо қавл медиҳед, ки худатонро инро навиштаед ё онро аз �к манбаи озод бо молики�ти умумӣ ё мушобеҳи он ну�хабардорӣ кардаед. <strong>КОРҲОИ ҲУҚУҚИ И�ҲИСОРИ МУ�ЛЛИФРО (Т�КСИР) БЕ ИҷОЗ�ТЕ ��ФИРИСТЕД!</strong>',
-'longpagewarning'           => '<strong>Ҳушдор: Ин �аҳифа $1 килобайт дароз а�т; баъзе мурургарҳо мумкин ба вироиши �аҳифаҳои наздик ба 32 kb ё дарозтар аз он мушкили дошта бошанд.
-Лутфан дар барои ба қи�матҳои хурд ҷудо кардани ин �аҳифа фикр кунед.</strong>',
-'longpageerror'             => '<strong>Х�ТО: Матне ки ир�ол кардаед $1 килобайт ҳаҷм дорад, ки ин миқдор аз миқдори пешина $2 килобайт  бештар а�т. �аметавон онро захира кард.</strong>',
-'readonlywarning'           => '<strong>ҲУШДОР: Пойгоҳи дода барои нигоҳдорӣ қуфл шудаа�т, бинобар ин наметавонед вироишҳо�тонро ҳоло фавран захира кунед. �гар мехоҳед матнро дар �к парвандаи матнӣ ча�понед ва барои о�нда онро захира кунед.</strong>',
-'protectedpagewarning'      => '<strong>ҲУШДОР: Ин �аҳифа қуфл шудаа�т то фақат корбароне бо имтиёзи мудир (ё болотар) битавонанд онро вироиш кунанд.</strong>',
+'copyrightwarning'          => "Ҳамаи ҳи��агузорӣ ба {{SITENAME}} аз рӯи қонунҳои зерин $2 (нигаред $1 барои маълумоти бештар) ҳи��агузорӣ мешаванд. �гар Шумо намехоҳед, ки навиштаҷоти Шумо вироиш ва паҳн нашаванд, Шумо метавонед ин мақоларо нафири�тед.<br /> Шумо ваъда медиҳед, ки худатон ин мақоларо навиштед ё ки аз �арчашмаҳои кушод ну�хабардорӣ кардаед. '''�С�РҲОИ ҚОБИЛИ ҲУҚУҚИ МУ�ЛЛИФРО БЕ ИҶОЗ�Т ��ФИРИСТЕД!'''",
+'copyrightwarning2'         => "Лутфан таваҷҷӯҳ дошта бошед ки ҳамаи ҳи��агузориҳо ба {{SITENAME}} бо таҳти  \"Иҷозатномаи му�танадоти Озод GNU\" мунташир мешаванд. (барои ҷузъиёти бештар нигаред ба \$1). �гар намехоҳед навиштаҳо�тон бераҳмона вироиш шуда ва ба дилхоҳ тавзеҳ шавад, инҷо нафири�тед.<br />
+Ҳамин тавр шумо қавл медиҳед, ки худатонро инро навиштаед ё онро аз �к манбаи озод бо молики�ти умумӣ ё мушобеҳи он ну�хабардорӣ кардаед. '''КОРҲОИ ҲУҚУҚИ И�ҲИСОРИ МУ�ЛЛИФРО (Т�КСИР) БЕ ИҷОЗ�ТЕ ��ФИРИСТЕД!'''",
+'longpagewarning'           => "'''Ҳушдор: Ин �аҳифа $1 килобайт дароз а�т; баъзе мурургарҳо мумкин ба вироиши �аҳифаҳои наздик ба 32 kb ё дарозтар аз он мушкили дошта бошанд.
+Лутфан дар барои ба қи�матҳои хурд ҷудо кардани ин �аҳифа фикр кунед.'''",
+'longpageerror'             => "'''Х�ТО: Матне ки ир�ол кардаед $1 килобайт ҳаҷм дорад, ки ин миқдор аз миқдори пешина $2 килобайт  бештар а�т. �аметавон онро захира кард.'''",
+'readonlywarning'           => "'''ҲУШДОР: Пойгоҳи дода барои нигоҳдорӣ қуфл шудаа�т, бинобар ин наметавонед вироишҳо�тонро ҳоло фавран захира кунед. �гар мехоҳед матнро дар �к парвандаи матнӣ ча�понед ва барои о�нда онро захира кунед.'''",
+'protectedpagewarning'      => "'''ҲУШДОР: Ин �аҳифа қуфл шудаа�т то фақат корбароне бо имтиёзи мудир (ё болотар) битавонанд онро вироиш кунанд.'''",
 'semiprotectedpagewarning'  => "'''Таваҷҷӯҳ:''' Ин �аҳифа қуфл шудаа�т то танҳо корбарони �абтиномкарда қодир ба вироиши он бошанд.",
 'cascadeprotectedwarning'   => "'''Ҳушдор:''' Ин �аҳифа ба иллати қарор гирифтан дар {{PLURAL:$1|�аҳифаи|�аҳифаҳои}} обшорӣ-муҳофизатшудаи зер қуфл шудаа�т, то фақат мудирон битавонанд вироиш кунанд:",
-'titleprotectedwarning'     => '<strong>ҲУШДОР:  Ин �аҳифа қуфл шудаа�т, ба шакле ки фақат бархе корбарон метавонанд онро �ҷод кунанд.</strong>',
+'titleprotectedwarning'     => "'''ҲУШДОР:  Ин �аҳифа қуфл шудаа�т, ба шакле ки фақат бархе корбарон метавонанд онро �ҷод кунанд.'''",
 'templatesused'             => 'Шаблонҳои дар ин �аҳифа и�тифодашуда:',
 'templatesusedpreview'      => 'Шаблонҳои и�тифодашуда дар ин пешнамоиш:',
 'templatesusedsection'      => 'Шаблонҳои дар ин қи�мат и�тифода шуда:',
@@ -659,7 +663,7 @@ $1',
 # "Undo" feature
 'undo-success' => 'Ин вироиш метавонад ботил шавад. Лутфан муқои�аи зеринро барои таъйид кардани амалӣ худ, барра�ӣ кунед, ва баъдан барои анҷом додани ботилкунии вироиш тағйироти зеринро захира кунед.',
 'undo-failure' => 'Ба иллати бархӯрдани вироишҳои дар миён омада, ин вироишро ботил наметавон кард.',
-'undo-summary' => '�у�хаи ботил $1 аз тарафи [[Special:Contributions/$2|$2]] ([[User talk:$2|Баҳ�]])',
+'undo-summary' => 'Ботили ну�хаи $1 аз тарафи [[Special:Contributions/$2|$2]] ([[User talk:$2|Баҳ�]])',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Ҳи�обе �охта наметавонам',
@@ -668,29 +672,28 @@ $1',
 Далели $3 чунин а�т ''$2''",
 
 # History pages
-'viewpagelogs'        => '�амоиши гузоришҳои марбута ба ин �аҳифа',
-'nohistory'           => 'Таърихи вироиш барои ин �аҳифа вуҷуд надорад.',
-'revnotfound'         => '�у�ха ёфт нашуд',
-'revnotfoundtext'     => '�у�хаи кӯҳнаи �аҳифае, ки дархо�та будед, ёфт нашуд. Лутфан нишонаи URL-ро, ки аз он ба ин �аҳифа да�тра�ӣ карда будед, бара��ӣ кунед.',
-'currentrev'          => 'Вироишоти кунунӣ',
-'revisionasof'        => '�у�ха $1',
-'revision-info'       => '�у�хаи вироиш $2 дар таърихи $1',
-'previousrevision'    => '��у�хаи кӯҳнатар',
-'nextrevision'        => '�у�хаи навтарин→',
-'currentrevisionlink' => '�амоиши ну�хаи феълӣ',
-'cur'                 => 'феълӣ',
-'next'                => 'баъдӣ',
-'last'                => 'қаблӣ',
-'page_first'          => 'аввал',
-'page_last'           => 'охирин',
-'histlegend'          => 'Интихоби тафовут:қуттии ну�хаҳоро барои тафовут қайд кунед ва тугмаи дохил кардан ё тугмаи зерро пахш кунед.<br />
+'viewpagelogs'           => '�амоиши гузоришҳои марбута ба ин �аҳифа',
+'nohistory'              => 'Таърихи вироиш барои ин �аҳифа вуҷуд надорад.',
+'currentrev'             => 'Вироишоти кунунӣ',
+'revisionasof'           => '�у�ха $1',
+'revision-info'          => '�у�хаи вироиш $2 дар таърихи $1', # Additionally available: $3: revision id
+'previousrevision'       => '��у�хаи кӯҳнатар',
+'nextrevision'           => '�у�хаи навтарин→',
+'currentrevisionlink'    => '�амоиши ну�хаи феълӣ',
+'cur'                    => 'феълӣ',
+'next'                   => 'баъдӣ',
+'last'                   => 'қаблӣ',
+'page_first'             => 'аввал',
+'page_last'              => 'охирин',
+'histlegend'             => 'Интихоби тафовут:қуттии ну�хаҳоро барои тафовут қайд кунед ва тугмаи дохил кардан ё тугмаи зерро пахш кунед.<br />
 Шарҳ: (феълӣ) тафовут бо ну�хаи феълӣ
 (қаблӣ) = тафовут бо ну�хаи феълӣ, ҷузъ = вироиши ҷузъӣ',
-'deletedrev'          => '[ҳазфшуда]',
-'histfirst'           => '�ввалин',
-'histlast'            => 'Охирин',
-'historysize'         => '({{PLURAL:$1|1 байт|$1 байт}})',
-'historyempty'        => '(холӣ)',
+'history-fieldset-title' => 'Мурури таърих',
+'deletedrev'             => '[ҳазфшуда]',
+'histfirst'              => '�ввалин',
+'histlast'               => 'Охирин',
+'historysize'            => '({{PLURAL:$1|1 байт|$1 байт}})',
+'historyempty'           => '(холӣ)',
 
 # Revision feed
 'history-feed-title'          => 'Таърихи вироишҳо',
@@ -782,46 +785,73 @@ $1',
 'difference'              => '(Фарқи�ти байни ну�хаҳо)',
 'lineno'                  => 'Сатри $1:',
 'compareselectedversions' => '�у�хаҳои интихобшударо муқои�а кунед',
+'visualcomparison'        => 'Муқои�аи дидорӣ',
 'editundo'                => 'ботил',
 'diff-multi'              => '({{PLURAL:$1|вироиши миёнӣ|$1 вироишоти миёнӣ}} нишон дода нашудаа�т.)',
+'diff-movedto'            => 'кӯчонида шуд ба $1',
+'diff-added'              => '$1 илова шуд',
+'diff-changedto'          => 'ба $1 тағйирдода шуд',
+'diff-movedoutof'         => 'аз $1 кӯчонида шуд',
+'diff-removed'            => '$1 пок шуд',
+'diff-src'                => 'манбаъ',
+'diff-width'              => 'паҳно',
+'diff-height'             => 'баландӣ',
+'diff-a'                  => "�к '''пайванд'''",
+'diff-big'                => "'''калон'''",
+'diff-del'                => "'''ҳазфшуда'''",
 
 # Search results
-'searchresults'             => '�атиҷаҳои ҷу�туҷӯ',
-'searchresulttext'          => 'Барои иттилооти бештар дар бораи ҷу�туҷӯ дар {{SITENAME}}, нигаред ба [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "'''[[:$1]]'''ро ҷу�тед",
-'searchsubtitleinvalid'     => "'''$1''' барои пур�уҷӯ",
-'noexactmatch'              => "'''Бо �арлавҳаи \"\$1\" мақола вуҷуд надорад.''' Шумо метавонед [[:\$1|ин �аҳифаро бинави�ед]].",
-'noexactmatch-nocreate'     => "'''Саҳифае бо унвони \"\$1\" вуҷуд надорад.'''",
-'toomanymatches'            => 'Теъдоди мавориди мутобиқ хеле зиёд буд, лутфан дархо�ти дигареро имтиҳон кунед',
-'titlematches'              => 'Унвони �аҳифа татбиқ мекунад',
-'notitlematches'            => 'Унвонҳои ҳеҷ мақолае ро�т намео�д',
-'textmatches'               => 'Матни мақола татбиқ мекунад',
-'notextmatches'             => 'Матни ҳеҷ мақолае ро�т намео�д',
-'prevn'                     => 'қаблӣ $1',
-'nextn'                     => 'баъдӣ $1',
-'viewprevnext'              => '�амоиш ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 калима|$2 калимаҳо}})',
-'search-result-score'       => 'Иртибот: $1%',
-'search-redirect'           => '(тағйири ма�ир $1)',
-'search-section'            => '(қи�мат $1)',
-'search-suggest'            => 'Оё шумо инро дар назар доред: $1',
-'search-interwiki-default'  => '$1 натоиҷ:',
-'search-interwiki-more'     => '(бештар)',
-'search-mwsuggest-enabled'  => 'бо тавзеҳот',
-'search-mwsuggest-disabled' => 'бидуни тавзеҳот',
-'search-relatedarticle'     => '�лоқаманд',
-'searchrelated'             => 'алоқаманд',
-'searchall'                 => 'ҳама',
-'showingresults'            => "�амоиши {{PLURAL:$1|'''1''' натиҷа|'''$1''' натоиҷ}} дар зер оғоз аз #'''$2'''.",
-'showingresultsnum'         => "�амоиши {{PLURAL:$3|'''1''' натиҷа|'''$3''' натоиҷ}} оғоз аз #'''$2'''.",
-'showingresultstotal'       => "Дар ҳоли намоиши {{PLURAL:$3|натоиҷ '''$1''' аз '''$3'''|натоиҷ '''$1 - $2''' of '''$3'''}}",
-'nonefound'                 => "'''Эзоҳ''': Танҳо чанд фазоиномҳо аз рӯи пешфарш ҷу�туҷӯ мешаванд.  Ҷу�туҷӯи худро бо пешванди ''ҳама:'' барои ҷу�туҷӯи мӯҳтавои пурра (�аҳифаҳои баҳ�, шаблонҳо ва ғайраҳо) такрор кунед, ё фазои номи дилхоҳро чун пешванд и�тифода баред.",
-'powersearch'               => 'Ҷу�туҷӯ',
-'powersearch-legend'        => 'Ҷу�туҷӯи пешрафта',
-'powersearch-redir'         => 'Феҳри�т кардани ма�ирҳо',
-'powersearch-field'         => 'Ҷу�туҷӯ барои',
-'search-external'           => 'Ҷу�туҷӯи хориҷӣ',
-'searchdisabled'            => 'Ҷу�туҷу дар {{SITENAME}} ғайрифаъол карда шудаа�т. Шумо метавонед тариқи Google дар ҳол ҷу�туҷӯ кунед. Таваҷҷӯҳ кунед, ки натоиҷи ҷу�туҷӯ {{SITENAME}} метавонад барӯз набошад.',
+'searchresults'                    => '�атиҷаҳои ҷу�туҷӯ',
+'searchresults-title'              => '�атоиҷи ҷу�туҷӯ барои "$1"',
+'searchresulttext'                 => 'Барои иттилооти бештар дар бораи ҷу�туҷӯ дар {{SITENAME}}, нигаред ба [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Шумо \'\'\'[[:$1]]\'\'\'ро ҷу�туҷӯ кардед ([[Special:Prefixindex/$1|ҳамаи �аҳифаҳо шурӯъ бо "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|ҳамаи �аҳифаҳое, ки ба "$1" пайва�таанд]])',
+'searchsubtitleinvalid'            => "'''$1''' барои пур�уҷӯ",
+'noexactmatch'                     => "'''Бо �арлавҳаи \"\$1\" мақола вуҷуд надорад.''' Шумо метавонед [[:\$1|ин �аҳифаро бинави�ед]].",
+'noexactmatch-nocreate'            => "'''Саҳифае бо унвони \"\$1\" вуҷуд надорад.'''",
+'toomanymatches'                   => 'Теъдоди мавориди мутобиқ хеле зиёд буд, лутфан дархо�ти дигареро имтиҳон кунед',
+'titlematches'                     => 'Унвони �аҳифа татбиқ мекунад',
+'notitlematches'                   => 'Унвонҳои ҳеҷ мақолае ро�т намео�д',
+'textmatches'                      => 'Матни мақола татбиқ мекунад',
+'notextmatches'                    => 'Матни ҳеҷ мақолае ро�т намео�д',
+'prevn'                            => 'қаблӣ $1',
+'nextn'                            => 'баъдӣ $1',
+'viewprevnext'                     => '�амоиш ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Гузинаҳои ҷу�туҷӯ',
+'searchmenu-new'                   => "'''Эҷоди �аҳифаи \"[[:\$1]]\" дар ин вики!'''",
+'searchhelp-url'                   => 'Help:Мундариҷа',
+'searchprofile-articles'           => 'Саҳифаҳои мӯҳтавоӣ',
+'searchprofile-project'            => 'Саҳифаҳои лоиҳа',
+'searchprofile-images'             => 'Парвандаҳо',
+'searchprofile-advanced'           => 'Пешрафта',
+'searchprofile-articles-tooltip'   => 'Ҷу�туҷӯ дар $1',
+'searchprofile-project-tooltip'    => 'Ҷу�туҷӯ дар $1',
+'searchprofile-images-tooltip'     => 'Ҷу�туҷӯи парвандаҳо',
+'searchprofile-everything-tooltip' => 'Ҷу�туҷӯи ҳамаи мӯҳтаво (бо ҳи�оби �аҳифаҳои баҳ�)',
+'prefs-search-nsdefault'           => 'Ҷу�туҷӯ бо и�тифодаи пешфарзҳо:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 калима|$2 калимаҳо}})',
+'search-result-score'              => 'Иртибот: $1%',
+'search-redirect'                  => '(тағйири ма�ир $1)',
+'search-section'                   => '(қи�мат $1)',
+'search-suggest'                   => 'Оё шумо инро дар назар доред: $1',
+'search-interwiki-caption'         => 'Лоиҳаҳои хоҳарӣ',
+'search-interwiki-default'         => '$1 натоиҷ:',
+'search-interwiki-more'            => '(бештар)',
+'search-mwsuggest-enabled'         => 'бо тавзеҳот',
+'search-mwsuggest-disabled'        => 'бидуни тавзеҳот',
+'search-relatedarticle'            => '�лоқаманд',
+'searchrelated'                    => 'алоқаманд',
+'searchall'                        => 'ҳама',
+'showingresults'                   => "�амоиши {{PLURAL:$1|'''1''' натиҷа|'''$1''' натоиҷ}} дар зер оғоз аз #'''$2'''.",
+'showingresultsnum'                => "�амоиши {{PLURAL:$3|'''1''' натиҷа|'''$3''' натоиҷ}} оғоз аз #'''$2'''.",
+'showingresultstotal'              => "Дар ҳоли намоиши {{PLURAL:$3|натоиҷ '''$1''' аз '''$3'''|натоиҷ '''$1 - $2''' of '''$3'''}}",
+'nonefound'                        => "'''Эзоҳ''': Танҳо чанд фазоиномҳо аз рӯи пешфарш ҷу�туҷӯ мешаванд.  Ҷу�туҷӯи худро бо пешванди ''ҳама:'' барои ҷу�туҷӯи мӯҳтавои пурра (�аҳифаҳои баҳ�, шаблонҳо ва ғайраҳо) такрор кунед, ё фазои номи дилхоҳро чун пешванд и�тифода баред.",
+'powersearch'                      => 'Ҷу�туҷӯ',
+'powersearch-legend'               => 'Ҷу�туҷӯи пешрафта',
+'powersearch-ns'                   => 'Ҷу�туҷӯ дар фазоҳои ном:',
+'powersearch-redir'                => 'Феҳри�т кардани ма�ирҳо',
+'powersearch-field'                => 'Ҷу�туҷӯ барои',
+'search-external'                  => 'Ҷу�туҷӯи хориҷӣ',
+'searchdisabled'                   => 'Ҷу�туҷу дар {{SITENAME}} ғайрифаъол карда шудаа�т. Шумо метавонед тариқи Google дар ҳол ҷу�туҷӯ кунед. Таваҷҷӯҳ кунед, ки натоиҷи ҷу�туҷӯ {{SITENAME}} метавонад барӯз набошад.',
 
 # Preferences page
 'preferences'              => 'Тарҷиҳот',
@@ -838,6 +868,7 @@ $1',
 'qbsettings-floatingright' => 'Шиновар ро�т',
 'changepassword'           => 'Иваз намудани калимаи убур',
 'skin'                     => 'Пӯ�т',
+'skin-preview'             => 'Пешнамоиш',
 'math'                     => 'Риёзиёт',
 'dateformat'               => 'Қолаби �ана',
 'datedefault'              => 'Бе тарҷиҳ',
@@ -857,12 +888,11 @@ $1',
 'prefs-watchlist-days'     => 'Теъдоди рӯзҳое ки бо�д дар феҳри�ти пайгириҳои намоиш дода шавад:',
 'prefs-watchlist-edits'    => 'Теъдоди вироишҳои нишондода дар феҳри�ти пайгириҳои гу�таришёфта:',
 'prefs-misc'               => 'Танзимоти ҳархела',
+'prefs-resetpass'          => 'Тағйири гузарвожа',
 'saveprefs'                => 'Захираи тарҷиҳот',
 'resetprefs'               => 'Тозакунии тағйироти захиранашуда',
-'oldpassword'              => 'Калимаи кӯҳнаи убур:',
-'newpassword'              => 'Калимаи нави убур:',
-'retypenew'                => 'Калимаи нави убурро такроран нави�ед:',
 'textboxsize'              => 'Дар ҳоли вироиш',
+'prefs-edit-boxsize'       => 'Ҳаҷми равзанаи вироиш.',
 'rows'                     => 'Теъдоди �атрҳо:',
 'columns'                  => 'Теъдоди �утунҳо:',
 'searchresultshead'        => 'Ҷу�туҷӯ',
@@ -880,6 +910,8 @@ $1',
 'servertime'               => 'Вақти феълии коргузор',
 'guesstimezone'            => '�з мурургар гирифта шавад',
 'allowemail'               => 'Иҷозат додани e-mail аз дигар корбарон',
+'prefs-searchoptions'      => 'Гузинаҳои ҷу�туҷӯ',
+'prefs-namespaces'         => 'Фазоҳои ном',
 'defaultns'                => 'Ба таври пешфарз дар ин фазоҳои ном ҷу�туҷӯ шавад:',
 'default'                  => 'пешфарз',
 'files'                    => 'Файлҳо',
@@ -889,7 +921,7 @@ $1',
 'userrights-lookup-user'      => 'Мудири�ти гурӯҳҳои корбарӣ',
 'userrights-user-editname'    => '�оми корбарро дохил кунед:',
 'editusergroup'               => 'Гуруҳҳои корбарро вироиш кунед',
-'editinguser'                 => "Дар ҳоли вироиши корбар '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Дар ҳоли вироиши корбар '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Вироиши гурӯҳҳои корбарӣ',
 'saveusergroups'              => 'Сабти гурӯҳҳои корбарӣ',
 'userrights-groupsmember'     => '�ъзои:',
@@ -930,24 +962,43 @@ $1',
 'grouppage-suppress'      => '{{ns:project}}:�азорат',
 
 # Rights
-'right-read'             => 'Хондани �аҳифаҳо',
-'right-edit'             => 'Вироиши �аҳифаҳо',
-'right-createpage'       => 'Эҷоди �аҳифаҳо (кадоме ки �аҳифаҳои баҳ� не�танд)',
-'right-createtalk'       => 'Эҷоди �аҳифаҳои баҳ�',
-'right-createaccount'    => 'Эҷоди ҳи�обҳои корбарии ҷадид',
-'right-move'             => 'Кӯчонидани �аҳифаҳо',
-'right-move-subpages'    => 'Кӯчонидани �аҳифаҳо бо зер�аҳифаҳо�шон',
-'right-upload'           => 'Богузории парвандаҳо',
-'right-delete'           => 'Ҳазфи �аҳифаҳо',
-'right-bigdelete'        => 'Ҳазфи �аҳифаҳои бо таърихи бузург',
-'right-deleterevision'   => 'Ҳазв ва барқароркунии ну�хаҳои мушахха�и �аҳифаҳо',
-'right-browsearchive'    => 'Ҷу�туҷӯи �аҳифаҳои ҳазфшуда',
-'right-undelete'         => 'Барқарор кардани �аҳифа',
-'right-suppressrevision' => 'Барра�и ва барқарор кардани ну�хаҳои пинҳони аз мудирон',
-'right-suppressionlog'   => 'Дидани гузоришҳои шах�ӣ',
-'right-block'            => 'Ба�тани дигар корбарон аз вироишкунӣ',
-'right-blockemail'       => 'Ба�тани корбар аз фири�тодани почтаи �лектронӣ',
-'right-hideuser'         => 'Ба�тани корбар, бо пинҳон кардани он аз омма',
+'right-read'                 => 'Хондани �аҳифаҳо',
+'right-edit'                 => 'Вироиши �аҳифаҳо',
+'right-createpage'           => 'Эҷоди �аҳифаҳо (кадоме ки �аҳифаҳои баҳ� не�танд)',
+'right-createtalk'           => 'Эҷоди �аҳифаҳои баҳ�',
+'right-createaccount'        => 'Эҷоди ҳи�обҳои корбарии ҷадид',
+'right-minoredit'            => '�ломат задани вироишҳо ба �уръати ҷузъӣ',
+'right-move'                 => 'Кӯчонидани �аҳифаҳо',
+'right-move-subpages'        => 'Кӯчонидани �аҳифаҳо бо зер�аҳифаҳо�шон',
+'right-upload'               => 'Богузории парвандаҳо',
+'right-reupload'             => 'Бознавиштани парвандаи вуҷуддошта',
+'right-delete'               => 'Ҳазфи �аҳифаҳо',
+'right-bigdelete'            => 'Ҳазфи �аҳифаҳои бо таърихи бузург',
+'right-deleterevision'       => 'Ҳазв ва барқароркунии ну�хаҳои мушахха�и �аҳифаҳо',
+'right-browsearchive'        => 'Ҷу�туҷӯи �аҳифаҳои ҳазфшуда',
+'right-undelete'             => 'Барқарор кардани �аҳифа',
+'right-suppressrevision'     => 'Барра�и ва барқарор кардани ну�хаҳои пинҳони аз мудирон',
+'right-suppressionlog'       => 'Дидани гузоришҳои шах�ӣ',
+'right-block'                => 'Ба�тани дигар корбарон аз вироишкунӣ',
+'right-blockemail'           => 'Ба�тани корбар аз фири�тодани почтаи �лектронӣ',
+'right-hideuser'             => 'Ба�тани корбар, бо пинҳон кардани он аз омма',
+'right-editprotected'        => 'Вироиши �аҳифаҳои ҳифзшуда (бидуни ҳифзи обшорӣ)',
+'right-editinterface'        => 'Вироиши намоиши корбарӣ',
+'right-editusercssjs'        => 'Вироиши парвандаҳои CSS ва JS дигар корбарон',
+'right-rollback'             => 'Вогардонии тези вироишҳои охирин корбаре, ки �к �аҳифаро вироиш кардаа�т',
+'right-markbotedits'         => '�ломат задани вироишҳои вогардонишуда ба унвони вироиши бот',
+'right-noratelimit'          => 'Таъ�ирнопазир аз маҳдуди�ти �уръат',
+'right-import'               => 'Ворид кардани �аҳифаҳо аз дигар викиҳо',
+'right-importupload'         => 'Ворид кардани �аҳифаҳо тариқи боргузории парванда',
+'right-patrol'               => '�ломат задани вироишот чун гаштхӯрда',
+'right-autopatrol'           => '�ломат задани вироишҳо бо таври худкор ба унвони гаштхӯрда',
+'right-patrolmarks'          => 'Мушоҳидаи тағйироти охирини аломатгашта',
+'right-unwatchedpages'       => 'Мушоҳидаи �аҳифаҳое, ки пайгири намешаванд',
+'right-trackback'            => 'Сабти �к бозтоб',
+'right-mergehistory'         => 'Идғоми таърихи �аҳифаҳо',
+'right-userrights'           => 'Вироиши ҳамаи ихтиёроти корбарон',
+'right-userrights-interwiki' => 'Вироиши ихтиёроти корбарии корбарони дигар викиҳо',
+'right-siteadmin'            => 'Ба�тн ва боз кардани пойгоҳи дода',
 
 # User rights log
 'rightslog'      => 'Гузориши ихтиёроти корбар',
@@ -989,6 +1040,7 @@ $1',
 'recentchangeslinked-summary'  => "Ин феҳри�ти тағйироти охир барои �аҳифаҳои пайва�та аз �аҳифаи мушахха�шуда мебошад (ё ба аъзоёни гурӯҳи мушахха�шуда). 
 Саҳифаҳои дар [[Special:Watchlist|феҳри�ти назароти шумо]] буда  '''пурранг''' ҳа�танд.",
 'recentchangeslinked-page'     => '�оми �аҳифа:',
+'recentchangeslinked-to'       => 'Тағйироти �аҳифаҳое, ки ба �аҳифаи мавриди назар пайванддоштаро намоиш диҳед',
 
 # Upload
 'upload'                      => 'Фири�тодани парванда',
@@ -999,11 +1051,11 @@ $1',
 'uploadnologintext'           => 'Барои фири�тодани файлҳо Шумо бо�д [[Special:UserLogin|вуруд кунед]].',
 'upload_directory_read_only'  => 'Шохаи боргузорӣ ($1) аз тарафи веб коргузор қобили навиштан не�т.',
 'uploaderror'                 => 'Иштибоҳи фири�тодан',
-'uploadtext'                  => "�з форми зерин барои богузорӣ кардани парвандаҳои ҷадид и�тифода кунед. Барои дидани парвандаҳое, ки қаблан боргузори шудаанд ба [[Special:ImageList|феҳри�ти парвандаҳои боргузоришуда]], боргузориҳо ва ҳамчунин ҳазфҳо дар [[Special:Log/upload|гузориши боргузорӣ]] �абт мешаванд.
+'uploadtext'                  => "�з форми зерин барои богузорӣ кардани парвандаҳои ҷадид и�тифода кунед. Барои дидани парвандаҳое, ки қаблан боргузори шудаанд ба [[Special:FileList|феҳри�ти парвандаҳои боргузоришуда]], боргузориҳо ва ҳамчунин ҳазфҳо дар [[Special:Log/upload|гузориши боргузорӣ]] �абт мешаванд.
 
 Баъд аз ин ки парвандаеро богузорӣ кардаед, ба ин �е шакл метавонед онро дар �аҳифаҳо и�тифода кунед
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|номи ак�]]</nowiki>''' ё
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',
+'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|номи ак�]]</nowiki>''' ё
 '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' барои бево�ита пайва�т кардан ба парванда.",
 'upload-permitted'            => '�авъҳои парвандаҳои иҷозатшуда: $1.',
 'upload-preferred'            => '�авъҳои парвандаҳои иҷозатшуда: $1.',
@@ -1029,19 +1081,19 @@ $1',
 'large-file'                  => 'Тав�и� шудаа�т, ки парвандаҳо бузургтар аз $1 набошанд; ин парванда $2 а�т.',
 'largefileserver'             => 'Ин парванда аз андозаи иҷозат шудаи андозаҳои парванда дар хидматгор бурзургтар а�т.',
 'emptyfile'                   => 'Парвандаи боршуда холӣ ба назар мера�ад. Ин ма�ъала мумкин а�т хатои навишт дар номи парванда рух дода бошад. Лутфан таъйид кунед, ки оё шумо дар ҳақиқат мехоҳед ин парвандаро бо ҳамин шароит бор кунед.',
-'fileexists'                  => 'Дар ҳоли ҳозир парвандае бо ҳамин ном мавҷуд а�т. �гар боварӣ надоред, ки мехоҳед он парвандаро тағйир диҳед, лутфан <strong><tt>$1</tt></strong>-ро барра�ӣ кунед.',
-'filepageexists'              => 'Як �аҳифаи тав�ифот (на парванда) бо ҳамин ном дар <strong><tt>$1</tt></strong> �ҷод шуда буд, аммо парвандае бо ҳамин ном дар ҳоли ҳозир мавҷуд не�т. Хуло�аи ворид кардаи шумо дар �аҳифаи тав�ифот, пайдо нахоҳад шуд. Барои намоён кардани хуло�аи худ, шумо ниёз доред онро да�тӣ вироиш кунед.',
-'fileexists-extension'        => 'Парвандае бо номи мушобеҳ вуҷуд дорад:<br />
-�оми парвандаи боргузоришуда и�тода: <strong><tt>$1</tt></strong><br />
-�оми парвандаи вуҷуд дошта: <strong><tt>$2</tt></strong><br />
-Лутфан �к номи дигареро интихоб кунед.',
+'fileexists'                  => "Дар ҳоли ҳозир парвандае бо ҳамин ном мавҷуд а�т. �гар боварӣ надоред, ки мехоҳед он парвандаро тағйир диҳед, лутфан '''<tt>$1</tt>'''-ро барра�ӣ кунед.",
+'filepageexists'              => "Як �аҳифаи тав�ифот (на парванда) бо ҳамин ном дар '''<tt>$1</tt>''' �ҷод шуда буд, аммо парвандае бо ҳамин ном дар ҳоли ҳозир мавҷуд не�т. Хуло�аи ворид кардаи шумо дар �аҳифаи тав�ифот, пайдо нахоҳад шуд. Барои намоён кардани хуло�аи худ, шумо ниёз доред онро да�тӣ вироиш кунед.",
+'fileexists-extension'        => "Парвандае бо номи мушобеҳ вуҷуд дорад:<br />
+�оми парвандаи боргузоришуда и�тода: '''<tt>$1</tt>'''<br />
+�оми парвандаи вуҷуд дошта: '''<tt>$2</tt>'''<br />
+Лутфан �к номи дигареро интихоб кунед.",
 'fileexists-thumb'            => "<center>'''�к� аз қабл мавҷуд а�т'''</center>",
-'fileexists-thumbnail-yes'    => '�з ак� ба назар мера�ад, ки ак�и андозааш хурд <i>(ангуштдона)</i>. Лутан парвандаро <strong><tt>$1</tt></strong> барра�ӣ кунед.<br />
-�гар парвандаи барра�ишуда ак�и хурд карда шудаи он парвандаи а�лӣ а�т, ниёзе ба боргузории ак�и хурд не�т.',
-'file-thumbnail-no'           => '�оми парванда бо <strong><tt>$1</tt></strong> огоз мешавад. Ба назар мера�ад, ки ин парванда �к ак�е <i>(ангуштдона)</i> аз ак�и калонтар бошад.
-�гар ак�и бо андозаи калонтар доред, онро боргузорӣ кунед, вагарна лутфан номи парвандаро тағйир диҳед.',
-'fileexists-forbidden'        => 'Дар ҳоли ҳозир, парвандае бо ҳамин ном вуҷуд дорад; лутфан бар гардед ва парвандаи мавриди назари худро бо номи дигар бор кунед. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Дар ҳоли ҳозир парванде бо ҳамин ном дар анбори муштараки парвандаҳо вуҷуд дорад; лутфан бар гардед ва парвандаи мавриди назари худро бо номи дигар бо кунед. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "�з ак� ба назар мера�ад, ки ак�и андозааш хурд ''(ангуштдона)''. Лутан парвандаро '''<tt>$1</tt>''' барра�ӣ кунед.<br />
+�гар парвандаи барра�ишуда ак�и хурд карда шудаи он парвандаи а�лӣ а�т, ниёзе ба боргузории ак�и хурд не�т.",
+'file-thumbnail-no'           => "�оми парванда бо '''<tt>$1</tt>''' огоз мешавад. Ба назар мера�ад, ки ин парванда �к ак�е ''(ангуштдона)'' аз ак�и калонтар бошад.
+�гар ак�и бо андозаи калонтар доред, онро боргузорӣ кунед, вагарна лутфан номи парвандаро тағйир диҳед.",
+'fileexists-forbidden'        => 'Дар ҳоли ҳозир, парвандае бо ҳамин ном вуҷуд дорад; лутфан бар гардед ва парвандаи мавриди назари худро бо номи дигар бор кунед. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Дар ҳоли ҳозир парванде бо ҳамин ном дар анбори муштараки парвандаҳо вуҷуд дорад; лутфан бар гардед ва парвандаи мавриди назари худро бо номи дигар бо кунед. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Фири�тодан бомуваффақи�т',
 'uploadwarning'               => 'Огоҳии фири�тодан',
 'savefile'                    => 'Захираи парванда',
@@ -1061,7 +1113,7 @@ $1',
 
 Шумо бо�д биандешед, ки оё давом додани боргузории ин парванда муно�иб а�т ё на.
 Гузориши ҳазфи марбут ба ин парванда дар зер оварда шудаа�т:",
-'filename-bad-prefix'         => '�оми парвандае, ки шумо боргузори карданиед бо <strong>"$1"</strong> оғоз мешавад, ки �к пешванди мах�у�и ак�ҳои �абтшуда тава��ути ак�бардоракҳои рақамӣ а�т. Лутфан номи беҳтари тав�ифотӣ барои парванда интихоб кунед.',
+'filename-bad-prefix'         => "�оми парвандае, ки шумо боргузори карданиед бо '''\"\$1\"''' оғоз мешавад, ки �к пешванди мах�у�и ак�ҳои �абтшуда тава��ути ак�бардоракҳои рақамӣ а�т. Лутфан номи беҳтари тав�ифотӣ барои парванда интихоб кунед.",
 
 'upload-proto-error'      => 'Қарордоди нодуру�т',
 'upload-proto-error-text' => 'Боргузори аз дурда�т бо нишонаҳое, ки бо <code>http://</code> ё <code>ftp://</code> оғоз мешаванд, ниёз дорад.',
@@ -1082,20 +1134,20 @@ $1',
 'upload_source_url'  => '(�к нишони интернетии мӯътабар ва оммавӣ)',
 'upload_source_file' => ' (парвандае дар компютери шумо)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ин �аҳифаи вижа тамоми парвандаҳои боргузоришударо нишон медиҳад.
+# Special:ListFiles
+'listfiles-summary'     => 'Ин �аҳифаи вижа тамоми парвандаҳои боргузоришударо нишон медиҳад.
 Ба таври пешфарз охирин парвандаҳои боргузоришуда дар болои феҳри�т нишон дода шудаанд.
 Як клик кардани рӯи унвони �утунҳо бои�и тағйири тартиби намоиши парвандаҳо мешавад.',
-'imagelist_search_for'  => 'Ҷу�туҷӯи номи ак�:',
+'listfiles_search_for'  => 'Ҷу�туҷӯи номи ак�:',
 'imgfile'               => 'парванда',
-'imagelist'             => 'Феҳри�ти парванда',
-'imagelist_date'        => 'Сана',
-'imagelist_name'        => '�ом',
-'imagelist_user'        => 'Корбар',
-'imagelist_size'        => '�ндоза(ҳаҷм)',
-'imagelist_description' => 'Тав�ифот',
-
-# Image description page
+'listfiles'             => 'Феҳри�ти парванда',
+'listfiles_date'        => 'Сана',
+'listfiles_name'        => '�ом',
+'listfiles_user'        => 'Корбар',
+'listfiles_size'        => '�ндоза(ҳаҷм)',
+'listfiles_description' => 'Тав�ифот',
+
+# File description page
 'filehist'                       => 'Таърихи файл',
 'filehist-help'                  => 'Рӯи таърихҳо клик кунед то ну�хаи марбути парвандаро бубинед.',
 'filehist-deleteall'             => 'ҳазфи ҳама',
@@ -1142,7 +1194,6 @@ $1',
 'filedelete-success-old'      => '<span class="plainlinks">�у�хаи \'\'\'[[Media:$1|$1]]\'\'\' аз таърихи $3, $2 ҳазф шуд.</span>',
 'filedelete-nofile'           => "'''$1''' вуҷуд надорад.",
 'filedelete-nofile-old'       => "�у�хаи бойгонӣ шудае аз '''$1''' бо мушахха�оти дода шуда, вуҷуд надорад.",
-'filedelete-iscurrent'        => 'Шумо мехоҳед, ки охирин ну�хаи ин парвандаро ҳазф кунед. Лутфан ибтидо парвандеро ба �к ну�хаи кӯҳнатар вогардонӣ кунед.',
 'filedelete-otherreason'      => 'Далели дигар/изофӣ:',
 'filedelete-reason-otherlist' => 'Дигар далел',
 'filedelete-reason-dropdown'  => '*Далелҳои умумии ҳазф
@@ -1176,28 +1227,25 @@ $1',
 'randomredirect-nopages' => 'Ҳеҷ �аҳифаи тағйири ма�ире дар ин фазои ном мавҷуд не�т.',
 
 # Statistics
-'statistics'             => 'Омор\\Стати�тика',
-'sitestats'              => 'Омори {{SITENAME}}',
-'userstats'              => 'Омори корбарон',
-'sitestatstext'          => "Куллан {{PLURAL:\$1|'''1'''|'''\$1'''}} �аҳифа дар пойгоҳ вуҷуд дорад.
-Ин �аҳифаҳои \"баҳ�\", �аҳифаҳо дар {{SITENAME}}, �аҳифаҳои \"нопурра\" хурд, тағйири ма�ирҳо, ва дигар �аҳифаҳоро дар бар мегирад, �ҳтимолан ҳамчун мақолаҳо ба ҳи�об намераванд.
-Сарфи назар аз инҳо, {{PLURAL:\$2|'''1''' �аҳифае ҳа�т|'''\$2''' �аҳифаҳое ҳа�танд}}, ки �ҳтимолан   {{PLURAL:\$2|�аҳифаи|�аҳифаҳои}} ҳақиқӣ ба шумор {{PLURAL:\$2|меравад|мераванд}}.
-
-'''\$8''' {{PLURAL:\$8|парванда|парвандаҳо}} боргузорӣ {{PLURAL:\$8|шуд|шудаанд}}.
-
-Дар маҷмӯъ '''\$3''' {{PLURAL:\$3|назар|назарот}} ба �аҳифа шудаанд, ки шомили '''\$4''' {{PLURAL:\$4|вироиш|вироишҳо}} аз замони на�б шудани {{SITENAME}} иҷро шудаанд.
-Ба ин тартиб ҳар �аҳифа ба ҳи�оби миёна '''\$5''' вироиш шудаа�т, ва '''\$6''' назарот ба ҳар вироиш �урат гирифта а�т.
-
-Тӯли [http://www.mediawiki.org/wiki/Manual:Job_queue �аф корҳо] '''\$7''' а�т.",
-'userstatstext'          => "Теъдоди {{PLURAL:$1|'''1''' [[Special:ListUsers|корбаре]] �абти ном шуда вуҷуд дорад,|'''$1''' [[Special:ListUsers|корбароне]] вуҷуд доранд}}, ки аз байни онҳо '''$2''' (ё '''$4%''') нафар $5 дорои да�тра�и {{PLURAL:$2|а�т|ҳа�танд}}.",
-'statistics-mostpopular' => 'Саҳифаҳои би�ёр назаркардашуда',
+'statistics'              => 'Омор\\Стати�тика',
+'statistics-header-pages' => 'Саҳифаи омор',
+'statistics-header-edits' => 'Вироиши омор',
+'statistics-header-views' => 'Дидани омор',
+'statistics-header-users' => 'Омори корбарон',
+'statistics-articles'     => 'Саҳифаҳои мӯҳтаво',
+'statistics-pages'        => 'Саҳифаҳо',
+'statistics-files'        => 'Парвандаҳои боршуда',
+'statistics-users'        => '[[Special:ListUsers|Корбарони]] �абтиномшуда',
+'statistics-users-active' => 'Корбарони фаъол',
+'statistics-mostpopular'  => 'Саҳифаҳои би�ёр назаркардашуда',
 
 'disambiguations'      => 'Саҳифаҳои ибҳомзудоӣ',
 'disambiguationspage'  => 'Template:ибҳомзудоӣ',
 'disambiguations-text' => "Саҳифаҳои зерин пайванд ба '''�аҳифаи ибҳомзудоӣ''' доранд. Ин �аҳифаҳо бо�д ба мавзӯъи муно�иби худ пайва�т шаванд.<br />Саҳифа Ибҳомзудоӣ дар назар гирифта мешавад, ки дар он шаблоне, ки ба [[MediaWiki:Disambiguationspage]] пайванд дорад и�тифода шуда бошад",
 
-'doubleredirects'     => 'Тағйири ма�ирҳои дутоӣ',
-'doubleredirectstext' => 'Ҳар �атр дар бар дорандаи пайвандҳое ба тағйири ма�ири аввал ва дувум ва ҳамчунин хати наху�т тагйири ма�ири дувум а�т. Маъмулан �аҳифаи мақ�ади воқеъӣ, ки наху�тин тағйири ма�ир бо�д ба он бошад ба ин гуна мушахха� мешавад.',
+'doubleredirects'       => 'Тағйири ма�ирҳои дутоӣ',
+'doubleredirectstext'   => 'Ҳар �атр дар бар дорандаи пайвандҳое ба тағйири ма�ири аввал ва дувум ва ҳамчунин хати наху�т тагйири ма�ири дувум а�т. Маъмулан �аҳифаи мақ�ади воқеъӣ, ки наху�тин тағйири ма�ир бо�д ба он бошад ба ин гуна мушахха� мешавад.',
+'double-redirect-fixer' => 'Таъмиркори тағйирма�ирҳо',
 
 'brokenredirects'        => 'Саҳифаҳои кандашудаи равонакунӣ',
 'brokenredirectstext'    => 'Ма�ирҳои зерин ба �аҳифаҳои номавҷуд пайванданд:',
@@ -1230,6 +1278,8 @@ $1',
 'popularpages'            => 'Саҳифаҳои машҳур',
 'wantedcategories'        => 'Гурӯҳҳои дархо�тӣ',
 'wantedpages'             => 'Саҳифаҳои дархо�тӣ',
+'wantedfiles'             => 'Парвандаҳои дархо�тӣ',
+'wantedtemplates'         => 'Шаблонҳои дархо�тӣ',
 'mostlinked'              => 'Саҳифаҳое, ки ба онҳо аз ҳама бештар пайвандҳо равона карда шудаа�т',
 'mostlinkedcategories'    => 'Саҳифаҳое, ки дар бештари гурӯҳҳо дохил шудаанд',
 'mostlinkedtemplates'     => 'Шаблонҳое ки бештар аз ҳама бо онҳо пайванд шудаа�т',
@@ -1242,6 +1292,7 @@ $1',
 'deadendpages'            => 'Саҳифаҳои бемаъно',
 'deadendpagestext'        => 'Саҳифаҳои зерин ба ҳеҷ дигар �аҳифае дар {{SITENAME}} пайванд не�танд.',
 'protectedpages'          => 'Саҳифаҳои ҳифзшуда',
+'protectedpages-indef'    => 'Фақат ҳифзшудаҳои номуай�н',
 'protectedpagestext'      => 'Саҳифаи зерин аз вироиш ё кӯчонидани ҳифз шудаанд',
 'protectedpagesempty'     => 'Дар ҳоли ҳозир ҳеҷ �аҳифае муҳофизат нашудаа�т.',
 'protectedtitles'         => 'Унвонҳои муҳофизатшуда',
@@ -1257,6 +1308,7 @@ $1',
 'unusedcategoriestext'    => 'Гурӯҳҳои зерин вуҷуд дорад, вале �гон �аҳифа ё гурӯҳе аз онҳо и�тифода намекунанд.',
 'notargettitle'           => 'Мақ�аде не�т',
 'notargettext'            => 'Шумо �гон �аҳифа ё корбареро барои иҷрои ин амал рӯи он мушахха� накардаед.',
+'nopagetitle'             => 'Чунин �аҳифае вуҷуд надорад',
 'pager-newer-n'           => '{{PLURAL:$1|навтар 1|навтар $1}}',
 'pager-older-n'           => '{{PLURAL:$1|кӯҳнатар 1|кӯҳнатар $1}}',
 'suppress'                => '�азорат',
@@ -1272,8 +1324,6 @@ $1',
 'speciallogtitlelabel' => 'Сарлавҳа:',
 'log'                  => 'Гузоришҳо',
 'all-logs-page'        => 'Ҳамаи �абтҳо',
-'log-search-legend'    => 'Ба дунболи гузоришҳо ҷу�туҷӯ кун',
-'log-search-submit'    => 'Бирав',
 'alllogstext'          => '�амоиши ҳамаи гузоришҳои да�тра�и �кҷо�и да�тра�и {{SITENAME}}. Метавонед бо интихоби навъи гузориш, номи корбарӣ ва �аҳифаҳои тағйирёфта, намоишро маҳдудтар �озед.',
 'logempty'             => 'Мавриди мутобиқ ба манзури шумо дар гузориш пайдо нашуд.',
 'log-title-wildcard'   => 'Саҳифаҳоеро ҷу�туҷӯ кунед, ки унвонашон бо ин матн оғоз мешаванд',
@@ -1297,17 +1347,41 @@ $1',
 # Special:Categories
 'categories'                    => 'Гурӯҳҳо',
 'categoriespagetext'            => 'Гурӯҳҳои зерин дар вики вуҷуд доранд.',
+'categoriesfrom'                => '�амоиши гурӯҳҳо бо шурӯъ аз:',
 'special-categories-sort-count' => 'муратаб кардан бар а�о�и теъдод',
 'special-categories-sort-abc'   => 'муратаб кардани алифбоӣ',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Ҳи��агузориҳои ҳазфшудаи корбар',
+
+# Special:LinkSearch
+'linksearch'       => 'Ҷу�утҷӣ пайвандҳои веб',
+'linksearch-pat'   => 'Ҷу�туҷӯи нақш:',
+'linksearch-ns'    => 'Фазоином:',
+'linksearch-ok'    => 'Ҷу�туҷӯ',
+'linksearch-text'  => '�ишонаҳои монанди "*.wikipedia.org"-ро метавон и�тифода кард.<br />Протоколҳои пуштибонишуда: <tt>$1</tt>',
+'linksearch-line'  => '$1 дорои пайванд аз $2 а�т',
+'linksearch-error' => '�ишонаҳо фақат дар ибтидои номи мизбони интернетӣ метавонанд и�тифода шаванд.',
+
 # Special:ListUsers
 'listusersfrom'      => '�амоиши корбарон бо шурӯъ аз:',
 'listusers-submit'   => '�ишон додани',
 'listusers-noresult' => 'Ҳеҷ корбаре ёфт нашуд.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Гузориши �ҷоди корбар',
+'newuserlogpagetext'          => 'Ин гузориш аз номҳои корбарии тоза�охташуда а�т.',
+'newuserlog-byemail'          => 'калимаи убур ба почтаи �лектронӣ фири�тода шуд',
+'newuserlog-create-entry'     => 'Корбари нав',
+'newuserlog-create2-entry'    => 'Барои $1 ҳи�оби корбарӣ �ҷод шуд',
+'newuserlog-autocreate-entry' => 'Ҳи�об бо таври худкор �ҷод шудаа�т',
+
 # Special:ListGroupRights
-'listgrouprights-group'   => 'Гурӯҳ',
-'listgrouprights-members' => '(феҳри�ти аъзоён)',
+'listgrouprights'          => 'Ихтиёроти гурӯҳҳои корбарӣ',
+'listgrouprights-group'    => 'Гурӯҳ',
+'listgrouprights-rights'   => 'Да�тра�иҳо',
+'listgrouprights-helppage' => 'Help:Да�тра�иҳои гурӯҳӣ',
+'listgrouprights-members'  => '(феҳри�ти аъзоён)',
 
 # E-mail user
 'mailnologin'     => '�ишонае аз фири�танда вуҷуд надорад',
@@ -1353,7 +1427,7 @@ $1',
 'notanarticle'         => 'Мақола не�т',
 'notvisiblerev'        => '�у�ха ҳазф шуд',
 'watchnochange'        => 'Ягон мавриди пайгириҳои шумо дар давраи замони намоишёфта вироиш нашуда а�т.',
-'watchlist-details'    => '{{PLURAL:$1|$1 �аҳифаи|$1 �аҳифаҳои}} бидуни ҳи�оби �аҳифаҳои баҳ�.',
+'watchlist-details'    => '{{PLURAL:$1|$1 �аҳифаи|$1 �аҳифаҳои}} дар феҳри�ти пайгириҳои шумо, бидуни ҳи�оби �аҳифаҳои баҳ�.',
 'wlheader-enotif'      => '* Иттилоора�онии тариқи почтаи �лектронӣ (E-mail) имконпазир а�т.',
 'wlheader-showupdated' => "* Саҳифаҳое, ки па� аз охирин �ар заданатон ба онҳо тағйир кардаанд '''пурранг''' нишон дода шудаанд",
 'watchmethod-recent'   => 'барра�ии вироишҳои охир барои �аҳифаҳои пайгиришуда',
@@ -1362,12 +1436,6 @@ $1',
 'iteminvalidname'      => "Мушкилӣ бо мавриди '$1', номи номӯътабар а�т...",
 'wlnote'               => "Дар зер {{PLURAL:$1|охирин тағйир|'''$1''' охирин тағйирот}} дар $2 �оати охир {{PLURAL:омадаа�т|омадаанд}}.",
 'wlshowlast'           => '�амоиши охирин $1 �оат $2 рӯзҳо $3',
-'watchlist-show-bots'  => '�амоиши вироишҳои роботҳо',
-'watchlist-hide-bots'  => 'Пинҳон кардани вироишҳои роботҳо',
-'watchlist-show-own'   => '�амоиши вироишҳои ман',
-'watchlist-hide-own'   => 'Пинҳон кардани вироишҳои ман',
-'watchlist-show-minor' => '�амоиши вироишҳои ҷузъӣ',
-'watchlist-hide-minor' => 'Пинҳон намудани вироишҳои хурд',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Пайгири...',
@@ -1407,66 +1475,71 @@ $NEWPAGE
 Пешниҳодот ва кӯмаки бештар:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Ҳазфи �аҳифа',
-'confirm'                     => 'Та�диқ',
-'excontent'                   => "мӯҳтавои �аҳифа ин буд: '$1'",
-'excontentauthor'             => "мӯҳтавои �аҳифа ин буд: '$1' (ва �гона ҳи��агузор '[[Special:Contributions/$2|$2]]' буд)",
-'exbeforeblank'               => "мӯҳтавои �аҳифа қабл аз холӣ кардан ин '$1' буд",
-'exblank'                     => '�аҳифа холӣ буд',
-'delete-confirm'              => 'Ҳазф "$1"',
-'delete-legend'               => 'Ҳазф',
-'historywarning'              => 'Ҳушдор: Саҳифае ки шумо ҳазф карданиед, таърих дорад:',
-'confirmdeletetext'           => 'Шумо дар ҳоли ҳазф кардани �к �аҳифа ё ак�е аз пойгоҳ дода ҳамроҳ бо тамоми таърихи он ҳа�тед. Лутфан ин амалро та�диқ кунед ва итминон ҳо�ил кунед, ки оқибати ин корро медонед ва ин амалро мутобиқи [[{{MediaWiki:Policy-url}}|�иё�ати ҳазф]] анҷом медиҳед.',
-'actioncomplete'              => '�мал иҷро шуд',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ҳазф шудаа�т.
+# Delete
+'deletepage'             => 'Ҳазфи �аҳифа',
+'confirm'                => 'Та�диқ',
+'excontent'              => "мӯҳтавои �аҳифа ин буд: '$1'",
+'excontentauthor'        => "мӯҳтавои �аҳифа ин буд: '$1' (ва �гона ҳи��агузор '[[Special:Contributions/$2|$2]]' буд)",
+'exbeforeblank'          => "мӯҳтавои �аҳифа қабл аз холӣ кардан ин '$1' буд",
+'exblank'                => '�аҳифа холӣ буд',
+'delete-confirm'         => 'Ҳазф "$1"',
+'delete-legend'          => 'Ҳазф',
+'historywarning'         => 'Ҳушдор: Саҳифае ки шумо ҳазф карданиед, таърих дорад:',
+'confirmdeletetext'      => 'Шумо дар ҳоли ҳазф кардани �к �аҳифа ё ак�е аз пойгоҳ дода ҳамроҳ бо тамоми таърихи он ҳа�тед. Лутфан ин амалро та�диқ кунед ва итминон ҳо�ил кунед, ки оқибати ин корро медонед ва ин амалро мутобиқи [[{{MediaWiki:Policy-url}}|�иё�ати ҳазф]] анҷом медиҳед.',
+'actioncomplete'         => '�мал иҷро шуд',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ҳазф шудаа�т.
 �игаред ба $2 барои гузориши ҳазфи охирин.',
-'deletedarticle'              => 'ҳазфшуда "[[$1]]"',
-'suppressedarticle'           => '"[[$1]]"-ро мавқуф кард',
-'dellogpage'                  => 'Гузоришҳои ҳазф',
-'dellogpagetext'              => 'Феҳри�ти зер феҳри�ти аз охирин ҳазфҳо�т. Ҳамаи вақтҳои нишон додашуда, вақти Ҷаҳонӣ (вақти Гринвич) а�т.',
-'deletionlog'                 => 'гузоришҳои ҳазф',
-'reverted'                    => 'Ба ну�хаи пештара вогардонида шуд',
-'deletecomment'               => 'Сабаби ҳазфкунӣ',
-'deleteotherreason'           => 'Далели дигар/иловагӣ:',
-'deletereasonotherlist'       => 'Дигар �абаб',
-'deletereason-dropdown'       => '*Далелҳои умумии ҳазф
+'deletedarticle'         => 'ҳазфшуда "[[$1]]"',
+'suppressedarticle'      => '"[[$1]]"-ро мавқуф кард',
+'dellogpage'             => 'Гузоришҳои ҳазф',
+'dellogpagetext'         => 'Феҳри�ти зер феҳри�ти аз охирин ҳазфҳо�т. Ҳамаи вақтҳои нишон додашуда, вақти Ҷаҳонӣ (вақти Гринвич) а�т.',
+'deletionlog'            => 'гузоришҳои ҳазф',
+'reverted'               => 'Ба ну�хаи пештара вогардонида шуд',
+'deletecomment'          => 'Сабаби ҳазфкунӣ',
+'deleteotherreason'      => 'Далели дигар/иловагӣ:',
+'deletereasonotherlist'  => 'Дигар �абаб',
+'deletereason-dropdown'  => '*Далелҳои умумии ҳазф
 ** Дархо�ти корбар
 ** �ақзи ҳаққи так�ир
 ** Харобкорӣ',
-'delete-edit-reasonlist'      => 'Вироиш ҳазф далелҳо',
-'delete-toobig'               => 'Ин �аҳифа таърихчаи бузурге дорад, ки шомили беш аз $1 вироиш а�т. Ҳазфи ин гуна �аҳифаҳо барои пешгири аз шика�тани та�одуфӣ дар {{SITENAME}} маҳдуд шудаа�т.',
-'delete-warning-toobig'       => 'Ин �аҳифа таърихи бузурге дорад, ки шомили беш аз $1 вироиш а�т. Ҳазфи ин �аҳифа метавонад ихтилол ба амалгари пойгоҳи додаи {{SITENAME}} бишавад; лутфан бо �ҳтиёт иқдом кунед.',
-'rollback'                    => 'Вогардонии вироишҳо',
-'rollback_short'              => 'Вогард',
-'rollbacklink'                => 'вогардони',
-'rollbackfailed'              => 'Вогардони нашуд',
-'cantrollback'                => '�аметавон вироишро вогардонд; охирин ҳи��агузор танҳо муаллифи ин мақола а�т.',
-'alreadyrolled'               => 'Охирин вироиши [[:$1]] аз тарафи [[User:$2|$2]] ([[User talk:$2|Баҳ�]]) наметавон вогардонӣ кард; пеш аз ин шах�и дигаре мақоларо вироиш ё вогардонӣ кардаа�т.
+'delete-edit-reasonlist' => 'Вироиш ҳазф далелҳо',
+'delete-toobig'          => 'Ин �аҳифа таърихчаи бузурге дорад, ки шомили беш аз $1 вироиш а�т. Ҳазфи ин гуна �аҳифаҳо барои пешгири аз шика�тани та�одуфӣ дар {{SITENAME}} маҳдуд шудаа�т.',
+'delete-warning-toobig'  => 'Ин �аҳифа таърихи бузурге дорад, ки шомили беш аз $1 вироиш а�т. Ҳазфи ин �аҳифа метавонад ихтилол ба амалгари пойгоҳи додаи {{SITENAME}} бишавад; лутфан бо �ҳтиёт иқдом кунед.',
+
+# Rollback
+'rollback'         => 'Вогардонии вироишҳо',
+'rollback_short'   => 'Вогард',
+'rollbacklink'     => 'вогардони',
+'rollbackfailed'   => 'Вогардони нашуд',
+'cantrollback'     => '�аметавон вироишро вогардонд; охирин ҳи��агузор танҳо муаллифи ин мақола а�т.',
+'alreadyrolled'    => 'Охирин вироиши [[:$1]] аз тарафи [[User:$2|$2]] ([[User talk:$2|Баҳ�]]) наметавон вогардонӣ кард; пеш аз ин шах�и дигаре мақоларо вироиш ё вогардонӣ кардаа�т.
 
 Охирин вироиш аз тарафи [[User:$3|$3]] ([[User talk:$3|Баҳ�]]) буд.',
-'editcomment'                 => 'Тавзеҳи вироиш ин буд: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Вироиши [[Special:Contributions/$2|$2]] ([[User talk:$2|Баҳ�]]) вогардонида шуд ба охирин тағйире, ки [[User:$1|$1]] анҷом дода буд', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Вироишҳои $1 вогардонӣ шуд; �аҳифа ба вироиши $2 баргардонида шуд.',
-'sessionfailure'              => 'Ба назар мера�ад, мушкилие дар мавриди ниша�ти корбарии шумо вуҷуд дорад; амали дархо�тшуда ба унвони иқдоми пешгирона дар баробари рабуда шудани иттилооти ниша�ти корбарӣ, лағв шуд. Лутфан тугмаи "бозгашт"-ро дар мурургари худ пахш кунед ва �аҳифае, ки аз он инҷо ра�идаед муҷаддадан фарохонӣ кунед, �ипа� муҷаддадан боз �аъй кунед.',
+'editcomment'      => "Тавзеҳи вироиш ин буд: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Вироиши [[Special:Contributions/$2|$2]] ([[User talk:$2|Баҳ�]]) вогардонида шуд ба охирин тағйире, ки [[User:$1|$1]] анҷом дода буд', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Вироишҳои $1 вогардонӣ шуд; �аҳифа ба вироиши $2 баргардонида шуд.',
+'sessionfailure'   => 'Ба назар мера�ад, мушкилие дар мавриди ниша�ти корбарии шумо вуҷуд дорад; амали дархо�тшуда ба унвони иқдоми пешгирона дар баробари рабуда шудани иттилооти ниша�ти корбарӣ, лағв шуд. Лутфан тугмаи "бозгашт"-ро дар мурургари худ пахш кунед ва �аҳифае, ки аз он инҷо ра�идаед муҷаддадан фарохонӣ кунед, �ипа� муҷаддадан боз �аъй кунед.',
+
+# Protect
 'protectlogpage'              => 'Гузориши муҳофизат',
 'protectlogtext'              => 'Дар зер феҳри�ти қуфл карданҳо ва аз қуфл озод шуданҳо омада а�т. Барои иттилооти бештар ба [[Special:ProtectedPages|феҳри�ти �аҳифаҳои муҳофизатшуда]] нигаред.',
 'protectedarticle'            => '"[[$1]]" муҳофизат шуд',
 'modifiedarticleprotection'   => '�атҳи муҳофизати �аҳифаи "[[$1]]" тағйир дода шуд',
 'unprotectedarticle'          => 'аз муҳофизат озод шуда "[[$1]]"',
 'protect-title'               => 'Дар ҳоли гузоштани �атҳи муҳофизат барои "$1"',
+'prot_1movedto2'              => '[[$1]] ба [[$2]] кӯчонида шудаа�т',
 'protect-legend'              => 'Та�диқи муҳофизат',
 'protectcomment'              => 'Далели муҳофизат:',
 'protectexpiry'               => 'Замони �аромадан:',
 'protect_expiry_invalid'      => 'Замони �аромадан номӯътабар а�т.',
 'protect_expiry_old'          => 'Замони �аромадан дар гузашта а�т.',
 'protect-unchain'             => 'Боз кардани иҷозати кӯчонидан',
-'protect-text'                => 'Шумо инҷо �атҳи муҳофизати �аҳифаи <strong><nowiki>$1</nowiki></strong> метавонед нигаред ё тағйир диҳед',
-'protect-locked-blocked'      => 'Шумо муддате, ки да�тар�иатон қатъ а�т наметавонед �атҳи ҳифзи �аҳифаҳоро тагйир диҳед. Танзимоти феълии �аҳифаи <strong>$1</strong> ба ин қарор а�т:',
-'protect-locked-dblock'       => '�з �абаби қуфл шудани пойгоҳи дода, имкони тағйири �атҳи ҳифзи �аҳифа вуҷуд надорад.
-Танзимоти феълии �аҳифаи <strong>$1</strong> ба ин қарор а�т:',
-'protect-locked-access'       => 'Ҳи�оби шумо иҷозати тағйири �атҳи ҳифозати �аҳифаро надорад.
-Танзимоти кунунии �аҳифа ба ин қарор а�т <strong>$1</strong>:',
+'protect-text'                => "Шумо инҷо �атҳи муҳофизати �аҳифаи '''<nowiki>$1</nowiki>''' метавонед нигаред ё тағйир диҳед",
+'protect-locked-blocked'      => "Шумо муддате, ки да�тар�иатон қатъ а�т наметавонед �атҳи ҳифзи �аҳифаҳоро тагйир диҳед. Танзимоти феълии �аҳифаи '''$1''' ба ин қарор а�т:",
+'protect-locked-dblock'       => "�з �абаби қуфл шудани пойгоҳи дода, имкони тағйири �атҳи ҳифзи �аҳифа вуҷуд надорад.
+Танзимоти феълии �аҳифаи '''$1''' ба ин қарор а�т:",
+'protect-locked-access'       => "Ҳи�оби шумо иҷозати тағйири �атҳи ҳифозати �аҳифаро надорад.
+Танзимоти кунунии �аҳифа ба ин қарор а�т '''$1''':",
 'protect-cascadeon'           => 'Ин �аҳифа дар ҳоли ҳозир муҳофизат шудаа�т, чунки он дар {{PLURAL:$1|�аҳифае, ки муҳофизати обшорӣ дорад|�аҳифаҳое, ки муҳофизати обшорӣ доранд}} илова шудаа�т. Шумо метавонед �атҳи муҳофизати ин �аҳифаро тағйир диҳед, аммо он ба муҳофизати обшорӣ таъ�ир нахоҳад ра�онд.',
 'protect-default'             => '(пешфарз)',
 'protect-fallback'            => 'Сатҳи да�тра�ӣ "$1" лозим а�т',
@@ -1474,8 +1547,10 @@ $NEWPAGE
 'protect-level-sysop'         => 'Танҳо барои мудирон',
 'protect-summary-cascade'     => 'обшорӣ',
 'protect-expiring'            => 'замони �аромадан $1 (UTC)',
+'protect-expiry-indefinite'   => 'номуай�н',
 'protect-cascade'             => 'Муҳофизати обшорӣ - �з ҳама �аҳифаҳое, ки дар ин �аҳифа омадаанд муҳофизат мешаванд',
 'protect-cantedit'            => 'Шумо вазъи�ти ҳифзи ин �аҳифаро тағйир дода наметавонед, чун иҷозати вироиши онро надоред.',
+'protect-expiry-options'      => '2 �оат:2 hours,1 рӯз:1 day,3 рӯз:3 days,1 ҳафта:1 week,2 ҳафта:2 weeks,1 моҳ:1 month,3 моҳ:3 months,6 моҳ:6 months,1 �ол:1 year,беохир:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Да�тра�и:',
 'restriction-level'           => 'Сатҳи маҳдуди�т:',
 'minimum-size'                => 'Ҳадди ақали андоза',
@@ -1558,7 +1633,6 @@ $1',
 'whatlinkshere'           => 'Пайвандҳои дар ин �ахифа',
 'whatlinkshere-title'     => 'Саҳифаҳое ки ба $1 пайванд доранд',
 'whatlinkshere-page'      => 'Саҳифа:',
-'linklistsub'             => '(Феҳри�ти пайвандҳо)',
 'linkshere'               => "Саҳифаҳои зерин ба '''[[:$1]]''' пайванданд:",
 'nolinkshere'             => "Ягон �аҳифа ба '''[[:$1]]''' пайванд не�т.",
 'nolinkshere-ns'          => "Ҳеҷ �аҳифа аз фазоиноми интихобшуда ба '''[[:$1]]''' пайванд надорад.",
@@ -1613,7 +1687,7 @@ $1',
 'ipusubmit'                   => 'Боз кардани ин нишона',
 'unblocked'                   => 'Да�тра�ии [[User:$1|$1]] боз карда шуд',
 'unblocked-id'                => 'Қатъи да�тра�ии шумораи $1 хотима ёфт',
-'ipblocklist'                 => 'Рӯйхати IP нишонаҳо ва корбарҳои ба�та шуда',
+'ipblocklist'                 => 'IP нишонаҳо ва номҳои корбарии ба�та шуда',
 'ipblocklist-legend'          => 'Ҷу�туҷӯи корбари ба�та шуда',
 'ipblocklist-username'        => '�оми корбарӣ ё нишонаи IP:',
 'ipblocklist-submit'          => 'Ҷу�туҷӯ',
@@ -1695,6 +1769,8 @@ $1',
 
 Дар он ҳолатҳо, �аҳифаро бо�д ба таври да�тӣ кӯчонид ва ё ду �аҳифаро бо вироиш �к кунед.",
 'movearticle'             => 'Кӯчонидани �аҳифа:',
+'movenologin'             => 'Вуруд нашудаед',
+'movenologintext'         => 'Барои кӯчонидани �аҳифа шумо бо�д корбари �абтшуда ва [[Special:UserLogin|ба �и�тем вурудшуда]] бошед.',
 'movenotallowed'          => 'Шумо иҷозати кӯчонидани �аҳифаҳоро дар Википедиа надоред.',
 'newtitle'                => 'Ба унвони ҷадид:',
 'move-watch'              => '�азар кардани ин �аҳифа',
@@ -1720,7 +1796,7 @@ $1',
 'delete_and_move_confirm' => 'Бале, �аҳифа ҳазф шавад',
 'delete_and_move_reason'  => 'Ҳазф шуд барои мумкин шудани кӯчонидан',
 'selfmove'                => 'Унвонҳои манбаъ ва мақ�ад �кхела мебошад; кӯчонидани �аҳифа ба худаш мумкин не�т.',
-'immobile_namespace'      => 'Унвони манбаъ ва мақ�ад �к навъи мах�у� а�т; имкони кӯчонидани �аҳифаҳо аз ва ба ин фазои ном вуҷуд надорад.',
+'immobile-source-page'    => 'Ин �аҳифа кӯчонидашаванда не�т.',
 
 # Export
 'export'            => 'Судури �аҳифаҳо',
@@ -1728,7 +1804,7 @@ $1',
 
 Барои �одир кардани �аҳифаҳо, унвонҳои онҳоро дар ҷабъи матнии зер дохил кунед, �к унвон дар ҳар �атр, ва хоҳиши ну�хаи кунунӣ ё ну�хаҳои кӯҳнаи �аҳифаро бо �атрҳои таърихи �аҳифа, ё фақат ну�хаи охирин бо  иттилоот дар бораи вироиши охирро интихоб кунед.
 
-Дар ҳолати охир шумо метавонед пайвандеро и�тифода баред, намуна. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] ба �аҳифаи "[[{{MediaWiki:Mainpage}}]]".',
+Дар ҳолати охир шумо метавонед пайвандеро и�тифода баред, намуна. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] ба �аҳифаи "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Фақат ну�хаи феълро дар бар бигир, на кулли таърихча',
 'exportnohistory'   => "----
 '''Таваҷҷӯҳ:''' Имкони �удури таърихчаи комили �аҳифаҳо аз тариқи ин �аҳифа ба �абабҳои иҷроӣ аз кор андохта шудаа�т.",
@@ -1766,6 +1842,8 @@ $1',
 'import-interwiki-history'   => 'Тамоми таърихи ну�хаҳои ин �аҳифа интиқол дода шавад',
 'import-interwiki-submit'    => 'Ворид шавад',
 'import-interwiki-namespace' => 'Саҳифаҳо ба фазоином интиқол дода шаванд:',
+'import-upload-filename'     => '�оми парванда:',
+'import-comment'             => 'Тавзеҳ:',
 'importtext'                 => 'Лутфан парвандаро аз вики манбаъ �одир кунед, аз тариқи �аҳифа Special:Export ва па� аз захира кардан он ба ҳофизаи худатон онро ба дар ин вики боргузорӣ кунед.',
 'importstart'                => 'Дар ҳоли ворид кардани �аҳифаҳо...',
 'import-revision-count'      => '$1 {{PLURAL:$1|вироиш|вироиш}}',
@@ -1927,7 +2005,7 @@ $1',
 
 # Browsing diffs
 'previousdiff' => '� Вироишоти кӯҳнатар',
-'nextdiff'     => 'Фарқи�ти баъдина →',
+'nextdiff'     => 'Тафовути навтар →',
 
 # Media information
 'mediawarning'         => "'''Ҳушдор''': Ин парванда мумкин а�т кодҳои бадқа�дро дар бар гирад, ки бо иҷрои он �и�темаи шумо о�еб бубинад.<hr />",
@@ -1941,7 +2019,7 @@ $1',
 'show-big-image'       => '�к�и пурра',
 'show-big-image-thumb' => '<small>�ндозаи ин пешнамоиш: $1 × $2 пик�ел</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '�амоишгоҳи парвандаҳои ҷадид',
 'imagelisttext'         => "Дар зер феҳри�ти '''$1''' {{PLURAL:$1|парвандаи|парвандаҳои}} ба тартиб оварда шуда, омадаа�т $2.",
 'newimages-summary'     => 'Ин �аҳифаи вижа охирин парвандаҳои боршударо намоиш медиҳад.',
@@ -2226,7 +2304,7 @@ $1',
 
 # External editor support
 'edit-externally'      => 'Ин файлро бо барномаи беруна таҳрир кунед',
-'edit-externally-help' => 'Барои иттилооти бештар [http://www.mediawiki.org/wiki/Manual:External_editors роҳнамои танзимотро оиди вироишгарони беруна] нигаред.',
+'edit-externally-help' => '(Барои иттилооти бештар [http://www.mediawiki.org/wiki/Manual:External_editors роҳнамои танзимотро оиди вироишгарони беруна] нигаред)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'ҳама',
@@ -2302,21 +2380,9 @@ $5
 Лутфан таъйид кунед, ки муҷаддадан мехоҳед ин мақоларо �ҷод кунед.",
 'recreate'            => '�з нав �озед',
 
-# HTML dump
-'redirectingto' => 'Дар ҳоли тағйири ма�ир ба [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Пок карадни ну�хаи ҳофизаи ниҳонии (Cache) ин �аҳифаро таъйид мекунед?
-
-$1',
 'confirm_purge_button' => 'Таъйид',
-
-# AJAX search
-'searchcontaining' => "Ҷу�туҷӯи �аҳифаҳое ки ''$1'' доранд.",
-'searchnamed'      => "Ҷу�туҷӯи мақолаҳое, ки ''$1'' ном доранд.",
-'articletitles'    => "Мақолаҳое, кт бо ''$1'' оғоз мешаванд",
-'hideresults'      => '�атоиҷро пинҳон кун',
-'useajaxsearch'    => '�з ҷу�туҷӯи AJAX и�тифода кун',
+'confirm-purge-top'    => 'Пок карадни ну�хаи ҳофизаи ниҳонии (Cache) ин �аҳифаро таъйид мекунед?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� �аҳифаи пешин',
@@ -2420,13 +2486,13 @@ $1',
 'filepath-summary' => 'Ин �аҳифаи вижа нишонаи комил барои �к парвандаро нишон медиҳад.
 �к�ҳо бо кайфи�т бо ҳаҷми пурраашон нишон дода мешаванд, дигар навъҳои парвандаҳои дигар бо барномаҳои алоқаманди мах�у� ба худашон боз мешаванд.
 
-�ишонаи пайвандро бидуни пешванд "{{ns:image}}:" ворид кунед.',
+�ишонаи пайвандро бидуни пешванд "{{ns:file}}:" ворид кунед.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Ҷу�туҷӯ барои парвандаҳои такрорӣ',
 'fileduplicatesearch-summary'  => 'Ҷу�туҷӯ барои парвандаҳои такрорӣ бар а�о�и миқдори дар ҳам шудаи онҳо �урат мегирад.
 
-�оми парвандаро бе пешванди "{{ns:image}}:" ворид кунед.',
+�оми парвандаро бе пешванди "{{ns:file}}:" ворид кунед.',
 'fileduplicatesearch-legend'   => 'Ҷу�туҷӯи мавориди такрорӣ',
 'fileduplicatesearch-filename' => '�оми парванда:',
 'fileduplicatesearch-submit'   => 'Ҷу�туҷӯ',
diff --git a/languages/messages/MessagesTh.php b/languages/messages/MessagesTh.php
index 84d8a8de..1ee31535 100644
--- a/languages/messages/MessagesTh.php
+++ b/languages/messages/MessagesTh.php
@@ -14,26 +14,15 @@
  * @author วรา�ร อึ้งวิเชียร (Varakorn Ungvichian)
  */
 
-$skinNames = array(
-	'standard'    => 'ดั้งเดิม',
-	'nostalgia'   => 'อดีต',
-	'cologneblue' => 'น้ำเงินโคโล�จ์',
-	'myskin'      => 'ปรุงเอง',
-	'simple'      => 'เรียบง่าย',
-	'modern'      => 'ทันสมัย',
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'สื่อ',
 	NS_SPECIAL          => 'พิเศษ',
-	NS_MAIN	            => '',
-	NS_TALK	            => 'พูดคุย',
+	NS_TALK             => 'พูดคุย',
 	NS_USER             => 'ผู้ใช้',
 	NS_USER_TALK        => 'คุย�ับผู้ใช้',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'คุยเรื่อง$1',
-	NS_IMAGE            => 'ภาพ',
-	NS_IMAGE_TALK       => 'คุยเรื่องภาพ',
+	NS_FILE             => 'ไฟล์',
+	NS_FILE_TALK        => 'คุยเรื่องไฟล์',
 	NS_MEDIAWIKI        => 'มีเดียวิ�ิ',
 	NS_MEDIAWIKI_TALK   => 'คุยเรื่องมีเดียวิ�ิ',
 	NS_TEMPLATE         => '�ม่�บบ',
@@ -44,6 +33,71 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'คุยเรื่องหมวดหมู่',
 );
 
+$namespaceAliases = array(
+	'ภาพ' => NS_FILE,
+	'คุยเรื่องภาพ' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'เปลี่ยนทางซ้ำซ้อน' ),
+	'BrokenRedirects'           => array( 'เปลี่ยนทางเสีย' ),
+	'Disambiguations'           => array( '��้ความ�ำ�วม' ),
+	'Userlogin'                 => array( 'ล็อ�อิน' ),
+	'Userlogout'                => array( 'ล็อ�เอาต์' ),
+	'CreateAccount'             => array( 'สร้างบั�ชีผู้ใช้ใหม่' ),
+	'Preferences'               => array( '�ารตั้งค่า', 'ตั้งค่า' ),
+	'Watchlist'                 => array( 'ราย�ารเ�้าดู', 'เ�้าดู' ),
+	'Recentchanges'             => array( 'ปรับปรุงล่าสุด' ),
+	'Upload'                    => array( 'อัปโหลด' ),
+	'Listfiles'                 => array( 'รายชื่อภาพ' ),
+	'Newimages'                 => array( 'ภาพใหม่' ),
+	'Listusers'                 => array( 'รายชื่อผู้ใช้' ),
+	'Listgrouprights'           => array( 'รายชื่อสิทธิ�ลุ่มผู้ใช้งาน' ),
+	'Statistics'                => array( 'สถิติ' ),
+	'Randompage'                => array( 'สุ่ม', 'สุ่มหน้า' ),
+	'Lonelypages'               => array( 'หน้าสุดทาง', 'หน้าที่โยงไปไม่ถึง' ),
+	'Uncategorizedpages'        => array( 'หน้าที่ไม่ได้จัดหมวดหมู่' ),
+	'Uncategorizedcategories'   => array( 'หมวดหมู่ที่ไม่ได้จัดหมวดหมู่' ),
+	'Uncategorizedimages'       => array( 'ภาพที่ไม่ได้จัดหมวดหมู่' ),
+	'Uncategorizedtemplates'    => array( '�ม่�บบที่ไม่ได้จัดหมวดหมู่' ),
+	'Unusedcategories'          => array( 'หมวดหมู่ที่ไม่ได้ใช้' ),
+	'Unusedimages'              => array( 'ภาพที่ไม่ได้ใช้' ),
+	'Wantedpages'               => array( 'หน้าที่ต้อง�าร', '�ารเชื่อมโยงเสีย' ),
+	'Wantedcategories'          => array( 'หมวดหมู่ที่ต้อง�าร' ),
+	'Wantedfiles'               => array( 'ไฟล์ที่ต้อง�าร' ),
+	'Newpages'                  => array( 'หน้าใหม่' ),
+	'Ancientpages'              => array( 'บทความที่ไม่ได้��้ไขนานที่สุด' ),
+	'Deadendpages'              => array( 'หน้าสุดทาง' ),
+	'Protectedpages'            => array( 'หน้าที่ถู�ป้อง�ัน' ),
+	'Protectedtitles'           => array( 'หัวเรื่องที่ได้รับ�ารป้อง�ัน' ),
+	'Allpages'                  => array( 'หน้าทั้งหมด' ),
+	'Specialpages'              => array( 'หน้าพิเศษ' ),
+	'Contributions'             => array( 'เรื่องที่เขียน' ),
+	'Emailuser'                 => array( 'อีเมลผู้ใช้' ),
+	'Confirmemail'              => array( 'ยืนยันอีเมล' ),
+	'Whatlinkshere'             => array( 'บทความที่โยงมา' ),
+	'Movepage'                  => array( 'เปลี่ยนทาง' ),
+	'Categories'                => array( 'หมวดหมู่' ),
+	'Export'                    => array( 'ส่งออ�' ),
+	'Version'                   => array( 'เวอร์ชั่น' ),
+	'Allmessages'               => array( 'ข้อความทั้งหมด' ),
+	'Log'                       => array( 'ปูม' ),
+	'Blockip'                   => array( 'บล็อ�ไอพี' ),
+	'Undelete'                  => array( 'เรีย�คืน' ),
+	'Import'                    => array( 'นำเข้า' ),
+	'Userrights'                => array( 'สิทธิผู้ใช้' ),
+	'FileDuplicateSearch'       => array( 'ค้นหาไฟล์ซ้ำซ้อน' ),
+	'Unusedtemplates'           => array( '�ม่�บบที่ไม่ได้ใช้' ),
+	'Randomredirect'            => array( 'สุ่มหน้าเปลี่ยนทาง' ),
+	'Mypage'                    => array( 'หน้าของฉัน' ),
+	'Mytalk'                    => array( 'หน้าพูดคุยของฉัน' ),
+	'Mycontributions'           => array( 'เรื่องที่ฉันเขียน' ),
+	'Listadmins'                => array( 'รายชื่อผู้ดู�ล' ),
+	'Listbots'                  => array( 'รายชื่อบอต' ),
+	'Search'                    => array( 'ค้นหา' ),
+	'Resetpass'                 => array( 'ตั้งรหัสผ่านใหม่' ),
+);
+
 $datePreferences = array(
 	'default',
 	'thai',
@@ -108,7 +162,7 @@ $messages = array(
 'tog-enotifminoredits'        => '�ม้ว่า�าร��้ไขจะเป็น�าร��้ไขเล็�น้อย',
 'tog-enotifrevealaddr'        => 'เผยที่อยู่อีเมลในอีเมลที่ชี้�จง',
 'tog-shownumberswatching'     => '�สดงจำนวนผู้ใช้ที่เ�้าดูหน้านี้',
-'tog-fancysig'                => '�สดงเฉพาะลายเซ็น (ไม่มี�ารสร้างลิง�์)',
+'tog-fancysig'                => 'ลายเซ็นนี้ใช้คำสั่งวิ�ิ (ระบบจะไม่ใส่ลิง�์อัตโนมัติให้)',
 'tog-externaleditor'          => '�ำหนดค่ามาตร�าน ให้��้ไขโดยใช้โปร��รมภายนอ�ตัวอื่น',
 'tog-externaldiff'            => 'ใช้ซอฟต์�วร์ในเครื่อง��้ไขวิ�ิ',
 'tog-showjumplinks'           => 'เปิดใช้งาน "�ระโดด" อัตโนมัติไปตามลิง�์',
@@ -117,6 +171,8 @@ $messages = array(
 'tog-watchlisthideown'        => 'ไม่�สดง�าร��้ไขของตนเองจา�ราย�ารเ�้าดูของตนเอง',
 'tog-watchlisthidebots'       => 'ไม่�สดง�าร��้ไขของบอตจา�ราย�ารเ�้าดูของตนเอง',
 'tog-watchlisthideminor'      => 'ไม่�สดง�าร��้ไขเล็�น้อยจา�ราย�ารเ�้าดูของตนเอง',
+'tog-watchlisthideliu'        => 'ซ่อน�าร��้ไขโดยผู้ใช้ล็อ�อินจา�ราย�ารเ�้าดู',
+'tog-watchlisthideanons'      => 'ซ่อน�าร��้ไขโดยผู้ใช้ไม่ประสงค์ออ�นามจา�ราย�ารเ�้าดู',
 'tog-ccmeonemails'            => 'ส่งสำเนาอีเมล�ลับมาทุ�ครั้งที่ส่งหาคนอื่น',
 'tog-diffonly'                => 'ไม่�สดงเนื้อหาใต้ส่วนต่าง�าร��้ไข',
 'tog-showhiddencats'          => '�สดงหมวดหมู่ที่ซ่อนอยู่',
@@ -125,8 +181,6 @@ $messages = array(
 'underline-never'   => 'ไม่เคย',
 'underline-default' => 'ค่าปริยายตามเว็บเบราว์เซอร์',
 
-'skinpreview' => '(�สดงตัวอย่าง)',
-
 # Dates
 'sunday'        => 'วันอาทิตย์',
 'monday'        => 'วันจันทร์',
@@ -220,7 +274,7 @@ $messages = array(
 'mytalk'         => 'หน้าพูดคุยของฉัน',
 'anontalk'       => 'พูดคุย�ับไอพีนี้',
 'navigation'     => 'ป้ายบอ�ทาง',
-'and'            => '�ละ',
+'and'            => '&#32;�ละ',
 
 # Metadata in edit box
 'metadata_help' => 'เมทาเดทา:',
@@ -257,14 +311,14 @@ $messages = array(
 'talkpagelinktext'  => 'พูดคุย',
 'specialpage'       => 'หน้าพิเศษ',
 'personaltools'     => 'เครื่องมือส่วนตัว',
-'postcomment'       => '�สดงความเห็น',
+'postcomment'       => 'หัวข้อใหม่',
 'articlepage'       => '�สดงเนื้อหาของหน้า',
 'talk'              => 'อภิปราย',
 'views'             => 'ดู',
 'toolbox'           => 'เครื่องมือเพิ่ม',
 'userpage'          => 'ดูหน้าผู้ใช้',
 'projectpage'       => 'ดูหน้าโครง�าร',
-'imagepage'         => 'ดูหน้าภาพ',
+'imagepage'         => 'ดูหน้ารายละเอียดไฟล์',
 'mediawikipage'     => 'ดูหน้าข้อความ',
 'templatepage'      => 'ดูหน้า�ม่�บบ',
 'viewhelppage'      => 'ดูหน้าคำอธิบาย',
@@ -283,8 +337,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'เ�ี่ยว�ับ {{SITENAME}}',
 'aboutpage'            => 'Project:เ�ี่ยว�ับเว็บไซต์',
-'bugreports'           => 'รายงานบั๊�',
-'bugreportspage'       => 'Project:รายงานบั๊�',
 'copyright'            => 'เนื้อหาในหน้านี้อยู่ภายใต้ลิขสิทธิ์�บบ $1',
 'copyrightpagename'    => 'สงวนลิขสิทธิ์ {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:ลิขสิทธิ์',
@@ -307,9 +359,7 @@ $messages = array(
 
 'badaccess'        => 'มีข้อผิดพลาดใน�ารใช้สิทธิ',
 'badaccess-group0' => 'คุณไม่ได้รับอนุ�าตให้�ระทำสิ่งที่ร้องขอนี้',
-'badaccess-group1' => '�าร�ระทำที่ร้องขอนี้สงวนไว้เฉพาะผู้ใช้ใน�ลุ่ม $1',
-'badaccess-group2' => '�าร�ระทำที่ร้องขอนี้สงวนไว้เฉพาะผู้ใช้จา��ลุ่ม $1 �ลุ่มใด�ลุ่มหนึ่งเป็นอย่างน้อย',
-'badaccess-groups' => '�าร�ระทำที่ร้องขอนี้สงวนไว้เฉพาะผู้ใช้จา��ลุ่ม $1 �ลุ่มใด�ลุ่มหนึ่งเป็นอย่างน้อย',
+'badaccess-groups' => '�าร�ระทำที่ร้องขอนี้สงวนไว้เฉพาะผู้ใช้{{PLURAL:$2|จา��ลุ่ม|จา��ลุ่มใด�ลุ่มหนึ่ง ดังนี้}}: $1',
 
 'versionrequired'     => 'ต้อง�ารมีเดียวิ�ิรุ่น $1',
 'versionrequiredtext' => 'ต้อง�ารมีเดียวิ�ิรุ่น $1 สำหรับใช้งานหน้านี้ ดูเพิ่ม [[Special:Version|รุ่นซอฟต์�วร์]]',
@@ -323,6 +373,8 @@ $messages = array(
 'editsection'             => '��้ไข',
 'editold'                 => '��้ไข',
 'viewsourceold'           => 'ดูโค้ด',
+'editlink'                => '��้ไข',
+'viewsourcelink'          => 'ดูโค้ด',
 'editsectionhint'         => '��้ไขส่วน: $1',
 'toc'                     => 'เนื้อหา',
 'showtoc'                 => '�สดง',
@@ -337,13 +389,13 @@ $messages = array(
 'site-atom-feed'          => 'ฟีดอะตอม $1',
 'page-rss-feed'           => 'ฟีดอาร์เอสเอส "$1"',
 'page-atom-feed'          => 'ฟีดอะตอม "$1"',
-'red-link-title'          => '$1 (ยังไม่ได้สร้าง)',
+'red-link-title'          => '$1 (หน้านี้ไม่มี)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'เนื้อหา',
 'nstab-user'      => 'หน้าผู้ใช้',
 'nstab-media'     => 'หน้าสื่อ',
-'nstab-special'   => 'พิเศษ',
+'nstab-special'   => 'หน้าพิเศษ',
 'nstab-project'   => 'หน้าโครง�าร',
 'nstab-image'     => 'ไฟล์',
 'nstab-mediawiki' => 'ข้อความ',
@@ -403,7 +455,6 @@ $1',
 'cannotdelete'         => 'ไม่สามารถลบหน้าหรือไฟล์ที่�ำหนด (อาจถู�ลบไป�่อนหน้านี้โดยคนอื่น�ล้ว)',
 'badtitle'             => 'ชื่อหน้าไม่เหมาะสม',
 'badtitletext'         => 'ชื่อหน้าที่ร้องขอไม่ถู�ต้อง เป็นชื่อว่าง หรือชื่อที่ผิดพลาดเนื่องจา�ลิง�์ข้ามมาจา�ภาษาอื่น ชื่อที่ใช้อาจจะมีตัวอั�ษรที่ไม่สามารถถู�ใช้เป็นชื่อได้',
-'perfdisabled'         => 'ขออภัย คำสั่งเสริมนี้ถู�ระงับ�ารใช้ชั่วคราว เนื่องจา�ทำให้�านข้อมูลทำงานช้าเ�ิน�ว่าที่จะมีคนใช้งานวิ�ิได้',
 'perfcached'           => 'ข้อมูลต่อไปนี้อาจเป็นข้อมูลเ�่า ที่เ�็บไว้ใน�คชของระบบ',
 'perfcachedts'         => 'ข้อมูลด้านล่างมาจา��คช ซึ่งปรับปรุงครั้งล่าสุดเมื่อ $1',
 'querypage-no-updates' => 'ขณะนี้�ารปรับปรุงหน้านี้ถู�ระงับ ข้อมูลในที่นี่จะไม่รีเฟรชเป็นข้อมูลปัจจุบัน',
@@ -417,7 +468,7 @@ $1',
 'protectedpagetext'    => 'หน้านี้ถู�ล็อ�ป้อง�ัน�าร��้ไข',
 'viewsourcetext'       => 'โค้ดหน้านี้สามารถดู�ละนำไปคัดลอ�ได้:',
 'protectedinterface'   => 'หน้านี้เป็นข้อความที่ใช้�สดงบนหน้าตาหรือส่วนติดต่อผู้ใช้ของซอฟต์�วร์ ถู�ล็อ�ห้าม��้ไขเพื่อป้อง�ัน�าร�่อ�วน',
-'editinginterface'     => "'''คำเตือน:''' คุณ�ำลัง��้ไขข้อความที่ใช้�สดงบนหน้าตาหรือส่วนติดต่อผู้ใช้ของซอฟต์�วร์  �าร��้ไขหน้านี้จะมีผลต่อ�าร�สดงข้อความบนส่วนติดต่อผู้ใช้ของทุ�คน  ถ้าคุณต้อง�าร�ปลหน้านี้ ให้ลองใช้บริ�ารของ [http://translatewiki.net/wiki/Main_Page?setlang=th Betawiki] ซึ่งเป็นโครง�ารสำหรับ�ปลซอฟต์�วร์มีเดียวิ�ิ",
+'editinginterface'     => "'''คำเตือน:''' คุณ�ำลัง��้ไขข้อความที่ใช้�สดงบนหน้าตาหรือส่วนติดต่อผู้ใช้ของซอฟต์�วร์  �าร��้ไขหน้านี้จะมีผลต่อ�าร�สดงข้อความบนส่วนติดต่อผู้ใช้ของทุ�คน  ถ้าคุณต้อง�าร�ปลหน้านี้ ให้ลองใช้บริ�ารของ [http://translatewiki.net/wiki/Main_Page?setlang=th translatewiki.net] ซึ่งเป็นโครง�ารสำหรับ�ปลซอฟต์�วร์มีเดียวิ�ิ",
 'sqlhidden'            => '(คำสั่ง SQL ซ่อนอยู่)',
 'cascadeprotected'     => 'หน้านี้ได้รับ�ารป้อง�ันจา��าร��้ไข เนื่องจา�หน้านี้ถู�ใช้เป็นส่วนหนึ่งใน{{PLURAL:$1|หน้า $2 ซึ่งได้รับ�ารป้อง�ัน�บบ "ทบทุ�ลำดับขั้น"|หน้าซึ่งได้รับ�ารป้อง�ัน�บบ "ทบทุ�ลำดับขั้น" ดังต่อไปนี้: $2}}',
 'namespaceprotected'   => "คุณไม่มีสิทธิใน�าร��้ไขหน้าในเนมสเปซ '''$1'''",
@@ -426,15 +477,15 @@ $1',
 'titleprotected'       => "หัวเรื่องนี้ได้รับ�ารป้อง�ันไม่ให้สร้างใหม่  ผู้ดำเนิน�ารป้อง�ันคือ [[User:$1|$1]] ได้ให้เหตุผลไว้ว่า ''$2''",
 
 # Virus scanner
-'virus-badscanner'     => '�ารตั้งค่าผิดพลาด: ไม่รู้จั�ตัวส��นไวรัส: <i>$1</i>',
+'virus-badscanner'     => "�ารตั้งค่าผิดพลาด: ไม่รู้จั�ตัวส��นไวรัส: ''$1''",
 'virus-scanfailed'     => '�ารส��นล้มเหลว (โค้ด $1)',
 'virus-unknownscanner' => 'ไม่รู้จั�โปร��รมป้อง�ันไวรัสตัวนี้:',
 
 # Login and logout pages
 'logouttitle'                => 'ผู้ใช้งานล็อ�เอาต์',
-'logouttext'                 => '<strong>ขณะนี้คุณได้ล็อ�เอาต์ออ�จา�ระบบ</strong><br />
+'logouttext'                 => "'''ขณะนี้คุณได้ล็อ�เอาต์ออ�จา�ระบบ'''<br />
 คุณสามารถใช้งาน {{SITENAME}} ได้ต่อใน�บบผู้ไม่ประสงค์ออ�นาม หรือคุณสามารถทำ�ารล็อ�อิน�ลับเข้าไป
-อย่างไร�็ตามอาจจะมีบางหน้าที่ยัง�สดงข้อความว่าคุณ�ำลังล็อ�อินอยู่ จน�ว่าคุณจะปิดเว็บเบราว์เซอร์ หรือเคลียร์�คชออ�จา�เว็บเบราว์เซอร์',
+อย่างไร�็ตามอาจจะมีบางหน้าที่ยัง�สดงข้อความว่าคุณ�ำลังล็อ�อินอยู่ จน�ว่าคุณจะปิดเว็บเบราว์เซอร์ หรือเคลียร์�คชออ�จา�เว็บเบราว์เซอร์",
 'welcomecreation'            => '== ยินดีต้อนรับ $1! ==
 
 ชื่อบั�ชีผู้ใช้องคุณได้ถู�สร้างขึ้น อย่าลืมเข้าไปตั้งค่าผู้ใช้',
@@ -445,7 +496,6 @@ $1',
 'remembermypassword'         => 'จำชื่อ�ละรหัสผ่าน',
 'yourdomainname'             => 'โดเมนของคุณ:',
 'externaldberror'            => 'เ�ิดความผิดพลาดใน�ารระบุตัวตนจา�ภายนอ� หรือคุณไม่มีสิทธิใน�าร��้ไขบั�ชีอื่น',
-'loginproblem'               => '<b>เ�ิดข้อผิดพลาดใน�ารล็อ�อิน</b><br />�รุณาลองใหม่',
 'login'                      => 'ล็อ�อิน',
 'nav-login-createaccount'    => 'ล็อ�อิน / สร้างบั�ชีผู้ใช้',
 'loginprompt'                => 'ต้องเปิดใช้คุ��ี้�่อนที่จะล็อ�อินเข้าสู่ {{SITENAME}}',
@@ -468,7 +518,7 @@ $1',
 'yourrealname'               => 'ชื่อจริง:',
 'yourlanguage'               => 'ภาษา:',
 'yourvariant'                => 'ภาษาอื่น',
-'yournick'                   => 'ชื่อเล่น:',
+'yournick'                   => 'ลายเซ็น:',
 'badsig'                     => 'ลายเซ็นที่ใช้ผิดพลาด �รุณาตรวจสอบคำสั่งเอชทีเอ็ม�อล',
 'badsiglength'               => 'ชื่อเล่นยาวเ�ินไป ซึ่งต้องมีตัวอั�ษรน้อย�ว่า $1 {{PLURAL:$1|ตัว|ตัว}}',
 'email'                      => 'อีเมล',
@@ -505,8 +555,9 @@ $1',
 'eauthentsent'               => 'อีเมลยืนยันได้ถู�ส่งไปที่อีเมลที่ได้ถู�เสนอ �่อนที่อีเมลจะถู�ส่งไปที่ชื่อบั�ชีนั้น คุณต้องป�ิบัติตามคำ�นะนำในอีเมลเพื่อยืนยันว่าหมายเลยบั�ชีนั้นเป็นของคุณ',
 'throttled-mailpassword'     => 'ตัวเตือนรหัสผ่านได้ถู�ส่งไปใน {{PLURAL:$1|1 ชั่วโมงที่ผ่านมา|$1 ชั่วโมงที่ผ่านมา}} ซึ่งตัวเตือนรหัสผ่านนี้จะถู�ส่งได้หนึ่งครั้งต่อ {{PLURAL:$1|1 ชั่วโมง|$1 ชั่วโมง}} เท่านั้น เพื่อป้อง�ันปั�หา�าร�่อ�วน',
 'mailerror'                  => 'ไม่สามารถส่งอีเมลเนื่องจา� $1',
-'acct_creation_throttle_hit' => 'ขออภัย คุณได้สร้างชื่อบั�ชี�ล้วทั้งหมด $1 ชื่อ �ละไม่สามารถสร้างได้มา��ว่านี้',
-'emailauthenticated'         => 'อีเมลของคุณได้ถู�ยืนยันภายใต้ $1',
+'acct_creation_throttle_hit' => 'ขออภัย คุณได้สร้างชื่อบั�ชี�ล้วทั้งหมด {{PLURAL:$1|1 ครั้ง|$1 ครั้ง}} 
+�ละไม่สามารถสร้างได้มา��ว่านี้',
+'emailauthenticated'         => 'อีเมลของคุณได้รับ�ารรับรอง ณ วันที่ $2 เวลา $3',
 'emailnotauthenticated'      => 'อีเมลของคุณยังไม่ได้ถู�ยืนยัน ดังนั้นคำสั่งพิเศษที่ใช้งานผ่านอีเมลยังไม่เปิดใช้งาน',
 'noemailprefs'               => 'รับอีเมลตามเงื่อนไขพิเศษต่อไปนี้',
 'emailconfirmlink'           => 'ยืนยันอีเมลของคุณ',
@@ -518,17 +569,22 @@ $1',
 'createaccount-text'         => 'มีใครบางคนสร้างบั�ชีผู้ใช้สำหรับที่อยู่อีเมลของคุณไว้บน {{SITENAME}} ($4) โดยใช้ชื่อบั�ชีผู้ใช้ "$2" �ละรหัสผ่าน "$3" คุณควรล็อ�อินเพื่อเปลี่ยนรหัสผ่านโดยทันที
 
 ข้อความนี้อาจจะไม่สำคั�สำหรับคุณ หา��ารสร้างบั�ชีผู้ใช้นี้เ�ิดจา�ความผิดพลาด',
+'login-throttled'            => 'คุณได้พยายามล็อ�อินเข้าสู่บั�ชีนี้ด้วยรหัสผ่านที่ผิดมา�ครั้งเ�ินไป �รุณารอ�่อนที่จะลองใหม่อี�ครั้ง',
 'loginlanguagelabel'         => 'ภาษา: $1',
 
 # Password reset dialog
-'resetpass'               => 'ตั้งค่ารหัสผ่านใหม่',
-'resetpass_announce'      => 'คุณล็อ�อินผ่านรหัสอีเมลชั่วคราว คุณต้องใส่ค่ารหัสผ่านใหม่เพื่อเสร็จสิ้นขั้นตอน�ารล็อ�อิน:',
-'resetpass_header'        => 'เปลี่ยนรหัสผ่าน',
-'resetpass_submit'        => 'ตั้งรหัสผ่าน�ละล็อ�อิน',
-'resetpass_success'       => 'รหัสผ่านได้ถู�เปลี่ยนเรียบร้อย ขณะนี้�ำลังล็อ�อินให้คุณ...',
-'resetpass_bad_temporary' => 'รหัสผ่านชั่วคราวไม่ถู�ต้อง คุณอาจจะเปลี่ยนรหัสผ่านเรียบร้อย�ล้วหรือขอรหัสผ่านชั่วคราวใหม่',
-'resetpass_forbidden'     => 'ไม่สามารถเปลี่ยนรหัสผ่านได้',
-'resetpass_missing'       => 'ไม่มี�บบฟอร์มข้อมูล',
+'resetpass'                 => 'เปลี่ยนรหัสผ่าน',
+'resetpass_announce'        => 'คุณล็อ�อินผ่านรหัสอีเมลชั่วคราว คุณต้องใส่ค่ารหัสผ่านใหม่เพื่อเสร็จสิ้นขั้นตอน�ารล็อ�อิน:',
+'resetpass_header'          => 'เปลี่ยนรหัสผ่าน',
+'oldpassword'               => 'รหัสผ่านเดิม:',
+'newpassword'               => 'รหัสผ่านใหม่:',
+'retypenew'                 => 'พิมพ์รหัสผ่านใหม่อี�ครั้ง:',
+'resetpass_submit'          => 'ตั้งรหัสผ่าน�ละล็อ�อิน',
+'resetpass_success'         => 'รหัสผ่านได้ถู�เปลี่ยนเรียบร้อย ขณะนี้�ำลังล็อ�อินให้คุณ...',
+'resetpass_bad_temporary'   => 'รหัสผ่านชั่วคราวไม่ถู�ต้อง คุณอาจจะเปลี่ยนรหัสผ่านเรียบร้อย�ล้วหรือขอรหัสผ่านชั่วคราวใหม่',
+'resetpass_forbidden'       => 'ไม่สามารถเปลี่ยนรหัสผ่านได้',
+'resetpass-submit-loggedin' => 'เปลี่ยนรหัสผ่าน',
+'resetpass-temp-password'   => 'รหัสผ่านชั่วคราว:',
 
 # Edit page toolbar
 'bold_sample'     => 'ทำตัวหนา',
@@ -551,8 +607,8 @@ $1',
 'hr_tip'          => 'เส้นนอน',
 
 # Edit pages
-'summary'                          => 'คำอธิบายโดยย่อ',
-'subject'                          => 'หัวข้อ',
+'summary'                          => 'คำอธิบายโดยย่อ:',
+'subject'                          => 'หัวข้อ:',
 'minoredit'                        => 'เป็น�าร��้ไขเล็�น้อย',
 'watchthis'                        => 'เ�้าดูหน้านี้',
 'savearticle'                      => 'บันทึ�',
@@ -564,8 +620,8 @@ $1',
 'missingsummary'                   => "'''อย่าลืม:''' คุณยังไม่ได้ระบุคำอธิบาย�าร��้ไขครั้งนี้ ถ้าคุณ�ดบันทึ�ไปส่วนคำอธิบาย�าร��้ไขนั้นจะว่าง�ละไม่�สดงผล",
 'missingcommenttext'               => '�รุณาใส่ความเห็นด้านล่าง',
 'missingcommentheader'             => "'''อย่าลืม:''' คุณยังไม่ได้ใส่หัวข้อ/จ่าหัวสำหรับความเห็นในครั้งนี้ ถ้าคุณ�ดบันทึ�ไปส่วนหัวข้อความเห็นจะว่างไม่�สดงผล",
-'summary-preview'                  => 'ตัวอย่างคำอธิบาย�าร��้ไข',
-'subject-preview'                  => 'ตัวอย่างหัวข้อ',
+'summary-preview'                  => 'ตัวอย่างคำอธิบาย�าร��้ไข:',
+'subject-preview'                  => 'ตัวอย่างหัวข้อ:',
 'blockedtitle'                     => 'ผู้ใช้ถู�ห้ามใช้งาน',
 'blockedtext'                      => "<big>'''ชื่อผู้ใช้หรือหมายเลขไอพีถู�ของคุณถู�บล็อ��ารใช้งาน'''</big>
 
@@ -612,61 +668,65 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 (ดูเพิ่มเติมที่ [[{{MediaWiki:Helppage}}|หน้าคำอธิบาย]])
 ถ้าไม่ต้อง�ารสร้างให้�ดปุ่ม ถอยหลัง (back) ที่เว็บเบราว์เซอร์',
 'anontalkpagetext'                 => '----หน้านี้เป็นหน้าพูดคุยสำหรับผู้ใช้ที่ไม่ประสงค์ออ�นามผู้ซึ่งยังไม่ได้สร้างบั�ชีผู้ใช้ โดยทางเราจำเป็นต้องระบุผ่านทางหมายเลขไอพี อย่างไร�็ตามหมายเลขไอพีนี้ อาจจะเ�ิดจา�จา�ผู้ใช้หลายคน�็ตาม ถ้าคุณเป็นผู้ไม่ประสงค์ออ�นาม�ละรู้สึ�ว่าข้อความความเห็นที่คุณได้รับไม่เ�ี่ยวข้อง�ับคุณ�ต่อย่างใด �รุณา[[Special:UserLogin|สร้างบั�ชีผู้ใช้หรือทำ�ารล็อ�อิน]] เพื่อป้อง�ัน�ารสับสน�ับผู้ใช้ที่ไม่ล็อ�อินรายอื่น',
-'noarticletext'                    => 'ไม่มีข้อความในหน้านี้ ลอง[[Special:Search/{{PAGENAME}}|ค้นหา]]ในหน้าอื่นที่เ�ี่ยวข้อง หรืออาจจะ [{{fullurl:{{FULLPAGENAME}}|action=edit}} เริ่มสร้างหน้านี้]',
+'noarticletext'                    => 'ตอนนี้ไม่มีเนื้อหาในหน้านี้
+คุณสามารถ [[Special:Search/{{PAGENAME}}|ค้นหาชื่อบทความนี้]] ในหน้าอื่น
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ค้นหาบันทึ�ที่เ�ี่ยวข้อง] หรือ[{{fullurl:{{FULLPAGENAME}}|action=edit}} ��้ไขหน้านี้]</span>',
 'userpage-userdoesnotexist'        => 'ไม่มีบั�ชีผู้ใช้ "$1" อยู่ในสารบบ  �รุณาตรวจสอบให้�น่ใจว่าคุณต้อง�ารสร้างหรือ��้ไขหน้านี้จริงๆ',
 'clearyourcache'                   => "'''คำ�นะนำ:''' หลังจา�บันทึ�ผล�ล้ว คุณอาจจะต้องล้าง�คชเว็บเบราว์เซอร์ของคุณเพื่อดูผล�ารเปลี่ยน�ปลง <br />
 '''มอซิลลา / ไฟร์ฟอ�ซ์ / ซาฟารี:''' �ดปุ่ม ''Shift'' ค้างไว้ขณะ�ดปุ่ม ''รีโหลด'' หรือ�ด  ''Ctrl-F5'' หรือ�ด ''Ctrl-R'' (''Command-R'' สำหรับเครื่อง�มคอินทอช); <br />
 '''คองเคอเรอร์:''' �ดปุ่ม ''รีโหลด'' หรือ�ด ''F5;'' <br />
 '''โอเปร่า:''' อาจต้องล้าง�คชทั้งหมดผ่านเมนู ''Tools → Preferences;'' <br />
 '''อินเทอร์เน็ตเอ�ซ์พลอเรอร์:''' �ด  ''Ctrl'' ค้างไว้ขณะที่�ดปุ่ม ''รีเฟรช'' หรือ�ด ''Ctrl-F5;''",
-'usercssjsyoucanpreview'           => "<strong>คำ�นะนำ:</strong> �ดปุ่ม '�สดงตัวอย่าง' เพื่อทดสอบสไตล์ชีตหรือจาวาสคริปต์�่อนทำ�ารบันทึ�",
+'usercssjsyoucanpreview'           => "'''คำ�นะนำ:''' �ดปุ่ม '�สดงตัวอย่าง' เพื่อทดสอบสไตล์ชีตหรือจาวาสคริปต์�่อนทำ�ารบันทึ�",
 'usercsspreview'                   => "'''อย่าลืมว่าสไตล์ชีตที่คุณสร้างยังไม่ได้ถู�บันทึ�'''
 '''นี่คือ�าร�สดงตัวอย่างเท่านั้น!'''",
 'userjspreview'                    => "'''อย่าลืมว่าจาวาสคริปต์ยังไม่ได้ถู�บันทึ� ขณะนี้�สดงเพียงตัวอย่างเท่านั้น!'''",
 'userinvalidcssjstitle'            => "'''คำเตือน:''' ไม่มี�บบหน้าตา \"\$1\" อย่าลืมว่าหน้า .css �ละ .js ที่ปรับ�ต่งเอง ใช้เป็นอั�ษรตัวพิมพ์เล็�ทั้งหมด เช่น ใช้ {{ns:user}}:Foo/monobook.css �ทนที่จะเป็น {{ns:user}}:Foo/Monobook.css",
 'updated'                          => '(ปรับปรุง�ล้ว)',
-'note'                             => '<strong>คำ�นะนำ:</strong>',
-'previewnote'                      => '<strong>ตรงนี้เป็น�าร�สดงตัวอย่างเท่านั้น �ารเปลี่ยน�ปลงยังไม่ได้ถู�บันทึ�!</strong>',
+'note'                             => "'''คำ�นะนำ:'''",
+'previewnote'                      => "'''ตรงนี้เป็น�าร�สดงตัวอย่างเท่านั้น �ารเปลี่ยน�ปลงยังไม่ได้ถู�บันทึ�!'''",
 'previewconflict'                  => '�าร�สดงผลส่วนนี้เป็นตัวอย่างของ�าร��้ไขด้านบน  ถ้า�ดบันทึ��าร�สดงผลจะ�สดงในลั�ษณะนี้ทันที',
-'session_fail_preview'             => '<strong>ขออภัย ไม่สามารถดำเนิน�าร��้ไขต่อได้ เนื่องจา�ข้อมูลเชื่อมต่อสู�หาย
-ให้ทดลอง��้ไขอี�ครั้งหนึ่ง ถ้ายังไม่สามารถทำได้ ให้ลองล็อ�เอาต์�ละล็อ�อิน�ลับมาอี�ครั้ง</strong>',
-'session_fail_preview_html'        => "<strong>ขออภัย ไม่สามารถดำเนิน�าร��้ไขต่อได้ เนื่องจา�ข้อมูลเชื่อมต่อสู�หาย</strong>
+'session_fail_preview'             => "'''ขออภัย ไม่สามารถดำเนิน�าร��้ไขต่อได้ เนื่องจา�ข้อมูลเชื่อมต่อสู�หาย
+ให้ทดลอง��้ไขอี�ครั้งหนึ่ง ถ้ายังไม่สามารถทำได้ ให้ลองล็อ�เอาต์�ละล็อ�อิน�ลับมาอี�ครั้ง'''",
+'session_fail_preview_html'        => "'''ขออภัย ไม่สามารถดำเนิน�าร��้ไขต่อได้ เนื่องจา�ข้อมูลเชื่อมต่อสู�หาย'''
 
 ''เนื่องจา� {{SITENAME}} ใช้รูป�บบเอชทีเอ็ม�อลล้วน �าร�สดงตัวอย่างจะถู�ซ่อนไว้เพื่อป้อง�ัน�ารโตมตีด้วยจาวาสคริปต์''
 
-<strong>ถ้า�าร��้ไขครั้งนี้ถู�ต้อง ให้ทดลอง��้ไขอี�ครั้งหนึ่ง ถ้ายังไม่สามารถทำได้ ให้ลอง[[Special:UserLogout|ล็อ�เอาต์]]�ละล็อ�อิน�ลับมาอี�ครั้ง</strong>",
-'token_suffix_mismatch'            => '<strong>�าร��้ไขของคุณได้ถู�ป�ิเสธ เนื่องจา�เครื่องลู�ข่ายที่คุณใช้อยู่ได้ขัดขวางรูป�บบเครื่องหมายวรรคตอนใน�าร��้ไข
-ระบบไม่รับ�าร��้ไขของคุณเพื่อป้อง�ันความผิดพลาดของข้อมูล ปั�หานี้มั�จะเ�ิดขึ้นถ้าคุณใช้พร็อ�ซีสำหรับผู้ไม่ประสงค์ออ�นาม</strong>',
+'''ถ้า�าร��้ไขครั้งนี้ถู�ต้อง ให้ทดลอง��้ไขอี�ครั้งหนึ่ง ถ้ายังไม่สามารถทำได้ ให้ลอง[[Special:UserLogout|ล็อ�เอาต์]]�ละล็อ�อิน�ลับมาอี�ครั้ง'''",
+'token_suffix_mismatch'            => "'''�าร��้ไขของคุณได้ถู�ป�ิเสธ เนื่องจา�เครื่องลู�ข่ายที่คุณใช้อยู่ได้ขัดขวางรูป�บบเครื่องหมายวรรคตอนใน�าร��้ไข
+ระบบไม่รับ�าร��้ไขของคุณเพื่อป้อง�ันความผิดพลาดของข้อมูล ปั�หานี้มั�จะเ�ิดขึ้นถ้าคุณใช้พร็อ�ซีสำหรับผู้ไม่ประสงค์ออ�นาม'''",
 'editing'                          => '�ำลัง��้ไข $1',
 'editingsection'                   => '�ำลัง��้ไข $1 (เฉพาะส่วน)',
-'editingcomment'                   => '�ำลัง��้ไข $1 (ความเห็น)',
+'editingcomment'                   => '�ำลัง��้ไข $1 (หัวข้อใหม่)',
 'editconflict'                     => '��้ไขชน�ัน: $1',
 'explainconflict'                  => "ใครบางคนได้เปลี่ยน�ปลงหน้านี้ในขณะที่คุณ�ำลัง��้ไข
 ข้อความส่วนบนเป็นข้อความปัจจุบันของหน้านี้ �ละส่วนล่างเป็น�าร��้ไขของคุณ
 คุณต้องทำ�ารรวม�ารเปลี่ยน�ปลงของคุณเข้า�ับข้อความปัจจุบัน เพราะ'''ข้อความในส่วนบนเท่านั้น'''ที่จะถู�บันทึ� เมื่อ�ดปุ่ม \"บันทึ�หน้านี้\"",
 'yourtext'                         => 'ข้อความของคุณ',
 'storedversion'                    => 'รุ่นที่เ�็บไว้',
-'nonunicodebrowser'                => '<strong>คำเตือน: เว็บเบราว์เซอร์นี้ไม่สนับสนุน�ารใช้งาน�บบยูนิโคด ตัวอั�ษรที่ไม่ใช่�บบ�อส�ีจะ�สดงใน�ล่อง�าร��้ไขในลั�ษณะรหัสเลข�านสิบห�</strong>',
-'editingold'                       => '<strong>คำเตือน: ข้อมูลที่��้ไขอยู่ไม่ใช่ข้อมูลใหม่ล่าสุดของหน้านี้ ถ้าทำ�ารบันทึ�ไป �ารเปลี่ยน�ปลงที่เ�ิดขึ้นระหว่างรุ่นนี้�ับรุ่นใหม่จะสู�หาย</strong>',
+'nonunicodebrowser'                => "'''คำเตือน: เว็บเบราว์เซอร์นี้ไม่สนับสนุน�ารใช้งาน�บบยูนิโคด ตัวอั�ษรที่ไม่ใช่�บบ�อส�ีจะ�สดงใน�ล่อง�าร��้ไขในลั�ษณะรหัสเลข�านสิบห�'''",
+'editingold'                       => "'''คำเตือน: ข้อมูลที่��้ไขอยู่ไม่ใช่ข้อมูลใหม่ล่าสุดของหน้านี้ ถ้าทำ�ารบันทึ�ไป �ารเปลี่ยน�ปลงที่เ�ิดขึ้นระหว่างรุ่นนี้�ับรุ่นใหม่จะสู�หาย'''",
 'yourdiff'                         => 'ข้อ�ต�ต่าง',
-'copyrightwarning'                 => 'โปรดอย่าลืมว่างานเขียนทั้งหมดใน {{SITENAME}} ผู้เขียนทั้งหมดยินดีให้งานเ�็บไว้ภายใต้สั��าลิขสิทธิ์ $2 (ดู $1 สำหรับข้อมูลเพิ่มเติม)
+'copyrightwarning'                 => "โปรดอย่าลืมว่างานเขียนทั้งหมดใน {{SITENAME}} ผู้เขียนทั้งหมดยินดีให้งานเ�็บไว้ภายใต้สั��าลิขสิทธิ์ $2 (ดู $1 สำหรับข้อมูลเพิ่มเติม)
 ถ้าคุณไม่ต้อง�ารให้งานของคุณถู���้ไข หรือไม่ต้อง�ารให้งานเผย�พร่ตามที่ได้�ล่าวไว้ อย่าส่งข้อความเข้ามาที่นี่<br />
 นอ�จา�นี้�น่ใจว่าข้อความที่ส่งเข้ามาได้เขียนด้วยตัวเอง ไม่ได้คัดลอ� หรือทำซ้ำจา��หล่งอื่น
-<strong>อย่าส่งงานที่มีลิขสิทธิ์เข้ามา�่อนได้รับอนุ�าตจา�เจ้าของ!</strong>',
-'copyrightwarning2'                => 'โปรดอย่าลืมว่างานเขียนทั้งหมดใน {{SITENAME}} อาจจะถู���้ไข ดัด�ปลง หรือลบออ�โดยผู้ร่วมเขียนคนอื่น
+'''อย่าส่งงานที่มีลิขสิทธิ์เข้ามา�่อนได้รับอนุ�าตจา�เจ้าของ!'''",
+'copyrightwarning2'                => "โปรดอย่าลืมว่างานเขียนทั้งหมดใน {{SITENAME}} อาจจะถู���้ไข ดัด�ปลง หรือลบออ�โดยผู้ร่วมเขียนคนอื่น
 ถ้าคุณไม่ต้อง�ารให้งานของคุณถู���้ไข หรือไม่ต้อง�ารให้งานเผย�พร่ตามที่�ล่าวไว้ อย่าส่งข้อความของคุณเข้ามาที่นี่<br />
 นอ�จา�นี้คุณ�น่ใจว่าข้อความที่ส่งเข้ามาคุณได้เขียนด้วยตัวเอง ไม่ได้คัดลอ� ทำซ้ำส่วนหนึ่งส่วนใดหรือทั้งหมดจา��หล่งอื่น (ดูรายละเอียดที่ $1)
-<strong>อย่าส่งงานที่มีลิขสิทธิ์เข้ามา�่อนได้รับอนุ�าตจา�เจ้าของ!</strong>',
-'longpagewarning'                  => '<strong>คำเตือน: หน้านี้มีความยาว $1 �ิโลไบต์ ซึ่งเว็บเบราว์เซอร์บางตัวอาจจะมีปั�หาใน�าร��้ไขหน้าที่ความยาวเ�ิน�ว่า 32 �ิโลไบต์
-
-ลองพิจารณา�บ่งหน้าออ�เป็นหัวข้อย่อย</strong>',
-'longpageerror'                    => '<strong>ผิดพลาด: ข้อความที่คุณส่งเข้ามามีขนาด $1 �ิโลไบต์
-ซึ่งเ�ิน�ว่าขนาดที่�ำหนดไว้ที่ $2 �ิโลไบต์ จึงไม่สามารถบันทึ�ได้</strong>',
-'readonlywarning'                  => '<strong>คำเตือน: ขณะนี้�านข้อมูลถู�ล็อ�เพื่อบำรุงรั�ษา จึงไม่สามารถบันทึ�ข้อมูลที่��้ไขได้ �นะนำให้คัดลอ�ไปเ�็บไว้ที่อื่น�่อน�ล้วนำมาบันทึ�ในเว็บไซต์นี้ภายหลัง</strong>',
-'protectedpagewarning'             => '<strong>คำเตือน: หน้านี้ถู�ล็อ� �ละ��้ไขได้เฉพาะผู้ดู�ลระบบเท่านั้น</strong>',
+'''อย่าส่งงานที่มีลิขสิทธิ์เข้ามา�่อนได้รับอนุ�าตจา�เจ้าของ!'''",
+'longpagewarning'                  => "'''คำเตือน: หน้านี้มีความยาว $1 �ิโลไบต์ ซึ่งเว็บเบราว์เซอร์บางตัวอาจจะมีปั�หาใน�าร��้ไขหน้าที่ความยาวเ�ิน�ว่า 32 �ิโลไบต์
+
+ลองพิจารณา�บ่งหน้าออ�เป็นหัวข้อย่อย'''",
+'longpageerror'                    => "'''ผิดพลาด: ข้อความที่คุณส่งเข้ามามีขนาด $1 �ิโลไบต์
+ซึ่งเ�ิน�ว่าขนาดที่�ำหนดไว้ที่ $2 �ิโลไบต์ จึงไม่สามารถบันทึ�ได้'''",
+'readonlywarning'                  => "'''คำเตือน: ขณะนี้�านข้อมูลถู�ล็อ�เพื่อบำรุงรั�ษา จึงไม่สามารถบันทึ�ข้อมูลที่��้ไขได้ �นะนำให้คัดลอ�ไปเ�็บไว้ที่อื่น�่อน�ล้วนำมาบันทึ�ในเว็บไซต์นี้ภายหลัง'''
+
+ผู้ดู�ลระบบที่ล็อ��านข้อมูลได้ให้คำอธิบายดังนี้: $1",
+'protectedpagewarning'             => "'''คำเตือน: หน้านี้ถู�ล็อ� �ละ��้ไขได้เฉพาะผู้ดู�ลระบบเท่านั้น'''",
 'semiprotectedpagewarning'         => "'''คำ�นะนำ:''' หน้านี้ถู�ล็อ� �ละ��้ไขได้เฉพาะผู้ใช้ที่ลงทะเบียนเท่านั้น",
 'cascadeprotectedwarning'          => "'''คำเตือน:''' หน้านี้ถู�ล็อ� �ละ��้ไขได้เฉพาะผู้ดู�ลระบบเท่านั้น เนื่องจา�หน้านี้สืบทอด�ารล็อ�มาจา�หน้า $1 ต่อไปนี้:",
-'titleprotectedwarning'            => '<strong>คำเตือน:  หน้านี้ได้รับ�ารป้อง�ันไว้ให้สร้างได้โดยผู้ใช้บางท่านเท่านั้น</strong>',
+'titleprotectedwarning'            => "'''คำเตือน:  หน้านี้ได้รับ�ารป้อง�ันไว้ให้สร้างได้โดยผู้ใช้บางท่านเท่านั้น'''",
 'templatesused'                    => '�ม่�บบที่ใช้ในหน้านี้:',
 'templatesusedpreview'             => '�ม่�บบที่ใช้ใน�าร�สดงตัวอย่าง:',
 'templatesusedsection'             => '�ม่�บบที่ใช้ในส่วนนี้:',
@@ -684,8 +744,18 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'recreate-deleted-warn'            => "'''คำเตือน: �ำลังสร้างหน้าใหม่ซึ่ง�่อนหน้านี้ได้ถู�ลบไป�ล้ว'''
 
 ลองพิจารณาว่าหน้านี้เหมาะสมใน�ารสร้างใหม่หรือไม่ ลองตรวจสอบบันทึ��ารลบ�่อนหน้า:",
+'deleted-notice'                   => 'หน้านี้ถู�ลบ 
+บันทึ��ารลบสำหรับ�ต่ละหน้าจะถู�อธิบายไว้ส่วนล่างสำหรับ�ารอ้างอิง',
+'deletelog-fulllog'                => 'ดูบันทึ�ทั้งหมด',
+'edit-conflict'                    => '��้ชน�ัน',
+'edit-no-change'                   => '�าร��้ไขของคุณถู�เพิ�เฉย เพราะข้อความไม่ถู�เปลี่ยน�ปลงใด ๆ ทั้งสิ้น',
+'edit-already-exists'              => 'ไม่สามารถสร้างหน้าใหม่นี้ได้
+เนื่องจา�ว่าหน้านี้มีอยู่�ล้ว',
 
 # Parser/template warnings
+'expensive-parserfunction-warning'        => 'คำเตือน: หน้านี้มี�ารเรีย�ใช้ฟัง�์ชัน�จงส่วนมา�เ�ินไป
+
+หน้านี้ควรมี�ารเรีย�ใช้น้อย�ว่า $2 {{PLURAL:$2|ครั้ง|ครั้ง}} ปัจจุบันมี�ารเรีย�ใช้ $1 {{PLURAL:$1|ครั้ง|ครั้ง}}',
 'expensive-parserfunction-category'       => 'หน้าที่มี�ารเรีย�ใช้ฟัง�์ชัน�จงส่วนมา�เ�ินไป',
 'post-expand-template-inclusion-warning'  => 'คำเตือน: �ม่�บบที่นำมารวมมีขนาดให�่เ�ินไป
 �ม่�บบบางหน้าจะไม่ถู�รวมเข้ามา',
@@ -706,28 +776,28 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 เหตุผลที่ $3 ให้ไว้ คือ ''$2''",
 
 # History pages
-'viewpagelogs'        => 'ดูบันทึ�ของหน้านี้',
-'nohistory'           => 'ไม่มีประวัติ�าร��้ไขสำหรับหน้านี้',
-'revnotfound'         => 'ไม่พบรุ่น�ารปรับปรุง',
-'revnotfoundtext'     => 'ไม่พบรุ่น�ารปรับปรุงรุ่นเ�่าที่ต้อง�าร �รุณาตรวจสอบยูอาร์�อลที่ใช้เข้ามายังหน้านี้',
-'currentrev'          => 'รุ่นปัจจุบัน',
-'revisionasof'        => '�ารปรับปรุง เมื่อ $1',
-'revision-info'       => '�ารปรับปรุง เมื่อ $1 โดย $2',
-'previousrevision'    => '�รุ่น�่อนหน้า',
-'nextrevision'        => 'รุ่นถัดไป→',
-'currentrevisionlink' => 'รุ่นปัจจุบัน',
-'cur'                 => 'ป',
-'next'                => 'ถัดไป',
-'last'                => '�',
-'page_first'          => '�ร�สุด',
-'page_last'           => 'ท้ายสุด',
-'histlegend'          => 'วิธีเปรียบเทียบ: เลือ�ปุ่มของรุ่นสองรุ่นที่ต้อง�ารเปรียบเทียบ �ละ�ดปุ่มเริ่มเปรียบเทียบด้านล่าง<br />
+'viewpagelogs'           => 'ดูบันทึ�ของหน้านี้',
+'nohistory'              => 'ไม่มีประวัติ�าร��้ไขสำหรับหน้านี้',
+'currentrev'             => 'รุ่นปัจจุบัน',
+'currentrev-asof'        => 'รุ่นปัจจุบันของ $1',
+'revisionasof'           => '�ารปรับปรุง เมื่อ $1',
+'revision-info'          => '�ารปรับปรุง เมื่อ $1 โดย $2', # Additionally available: $3: revision id
+'previousrevision'       => '�รุ่น�่อนหน้า',
+'nextrevision'           => 'รุ่นถัดไป→',
+'currentrevisionlink'    => 'รุ่นปัจจุบัน',
+'cur'                    => 'ป',
+'next'                   => 'ถัดไป',
+'last'                   => '�',
+'page_first'             => '�ร�สุด',
+'page_last'              => 'ท้ายสุด',
+'histlegend'             => 'วิธีเปรียบเทียบ: เลือ�ปุ่มของรุ่นสองรุ่นที่ต้อง�ารเปรียบเทียบ �ละ�ดปุ่มเริ่มเปรียบเทียบด้านล่าง<br />
 คำอธิบาย: (ป) = เทียบ�ับรุ่นปัจจุบัน, (�) = เทียบ�ับรุ่น�่อนหน้า, ล = �าร��้ไขเล็�น้อย',
-'deletedrev'          => '[ถู�ลบ]',
-'histfirst'           => '�ร�สุด',
-'histlast'            => 'ท้ายสุด',
-'historysize'         => '({{PLURAL:$1|1 ไบต์|$1 ไบต์}})',
-'historyempty'        => '(ว่าง)',
+'history-fieldset-title' => 'ค้นหาประวัติ',
+'deletedrev'             => '[ถู�ลบ]',
+'histfirst'              => '�ร�สุด',
+'histlast'               => 'ท้ายสุด',
+'historysize'            => '({{PLURAL:$1|1 ไบต์|$1 ไบต์}})',
+'historyempty'           => '(ว่าง)',
 
 # Revision feed
 'history-feed-title'          => 'ประวัติ�ารปรับปรุง',
@@ -818,119 +888,178 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'difference'              => '(ความ�ต�ต่างระหว่างรุ่นปรับปรุง)',
 'lineno'                  => '�ถว $1:',
 'compareselectedversions' => 'เปรียบเทียบสองรุ่นที่เลือ�',
-'editundo'                => 'ย้อน�ลับ',
-'diff-multi'              => '(�าร��้ไข {{PLURAL:$1|1 รุ่นระหว่างสองรุ่น|$1 รุ่นระหว่างสองรุ่น}}ที่เปรียบเทียบไม่�สดงผล)',
+'visualcomparison'        => '�ารเปรียบเทียบลั�ษณะปรา��',
+'wikicodecomparison'      => '�ารเปรียบเทียบข้อความวิ�ิ',
+'editundo'                => 'ย้อน',
+'diff-multi'              => '({{PLURAL:$1|�าร��้ไขหนึ่งรุ่นระหว่างรุ่นที่เปรียบเทียบ|�าร��้ไข $1 รุ่นระหว่างรุ่นที่เปรียบเทียบ}}ไม่�สดงผล)',
+'diff-movedto'            => 'ย้ายไปยัง $1 �ล้ว',
+'diff-styleadded'         => 'รูป�บบ $1 ถู�เพิ่ม',
+'diff-added'              => '$1 ถู�เพิ่ม�ล้ว',
+'diff-changedto'          => 'เปลี่ยนไปยัง $1',
+'diff-styleremoved'       => 'รูป�บบ $1 ถู�นำออ�',
+'diff-removed'            => '$1 ถู�ลบ',
+'diff-changedfrom'        => 'เปลี่ยนมาจา� $1',
+'diff-src'                => '�หล่งที่มา',
+'diff-with'               => '&#32;�ับ $1 $2',
+'diff-with-final'         => '&#32;�ละ $1 $2',
+'diff-width'              => 'ความ�ว้าง',
+'diff-height'             => 'ความสูง',
+'diff-p'                  => "'''ย่อหน้า'''",
+'diff-h1'                 => "'''หัวข้อ (ระดับ 1)'''",
+'diff-h2'                 => "'''หัวข้อ (ระดับ 2)'''",
+'diff-h3'                 => "'''หัวข้อ (ระดับ 3)'''",
+'diff-h4'                 => "'''หัวข้อ (ระดับ 4)'''",
+'diff-h5'                 => "'''หัวข้อ (ระดับ 5)'''",
+'diff-table'              => "'''ตาราง'''",
+'diff-tr'                 => "'''�ถว'''",
+'diff-td'                 => "'''ช่อง'''",
+'diff-form'               => "'''�บบฟอร์ม'''",
+'diff-img'                => "'''ภาพ'''",
+'diff-a'                  => "'''ลิง�์'''",
+'diff-i'                  => "'''ตัวเอียง'''",
+'diff-b'                  => "'''ตัวหนา'''",
+'diff-strong'             => "'''เข้ม'''",
+'diff-em'                 => "'''เน้น'''",
+'diff-font'               => "'''ฟอนต์'''",
+'diff-big'                => "'''ให�่'''",
+'diff-del'                => "'''ถู�ลบ'''",
+'diff-tt'                 => "'''ความ�ว้างคงที่'''",
+'diff-sub'                => "'''ตัวห้อย'''",
+'diff-sup'                => "'''เยื้องขึ้นบน'''",
+'diff-strike'             => "'''ขีดเส้นฆ่า'''",
 
 # Search results
-'searchresults'             => 'ค้นหา',
-'searchresulttext'          => 'วิธี�ารค้นหาใน {{SITENAME}} ดูวิธีใช้งานเพิ่มที่ [[{{MediaWiki:Helppage}}|{{int:help}}]]',
-'searchsubtitle'            => "ค้นหาเ�ี่ยว�ับ '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "ค้นหาเ�ี่ยว�ับ '''$1'''",
-'noexactmatch'              => "'''ไม่พบหัวข้อ  \"\$1\"''' คุณอาจจะ [[:\$1|สร้างหน้าใหม่ในชื่อนี้]]",
-'noexactmatch-nocreate'     => "'''ไม่มีหน้าหัวเรื่อง \"\$1\" อยู่ในสารบบ'''",
-'toomanymatches'            => 'หัวข้อที่พบมีมา�เ�ินไป �รุณาใช้คำค้นหาอื่น',
-'titlematches'              => 'พบชื่อหัวข้อนี้',
-'notitlematches'            => 'ไม่พบชื่อหัวข้อนี้',
-'textmatches'               => 'พบคำนี้ในหน้า',
-'notextmatches'             => 'ไม่พบข้อความในหน้า',
-'prevn'                     => '�่อนหน้า $1',
-'nextn'                     => 'ถัดไป $1',
-'viewprevnext'              => 'ดู ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 คำ|$2 คำ}})',
-'search-result-score'       => 'ความเ�ี่ยวข้อง : $1%',
-'search-redirect'           => '(เปลี่ยนทาง $1)',
-'search-section'            => '(ส่วน $1)',
-'search-suggest'            => 'คุณอาจหมายถึง : $1',
-'search-interwiki-caption'  => 'โครง�ารพี่น้อง',
-'search-interwiki-default'  => '$1 ผลลัพธ์:',
-'search-interwiki-more'     => '(มา��ว่า)',
-'search-mwsuggest-enabled'  => 'พร้อมคำ�นะนำ',
-'search-mwsuggest-disabled' => 'ไม่รวมคำ�นะนำ',
-'search-relatedarticle'     => 'สัมพันธ์',
-'mwsuggest-disable'         => 'ย�เลิ��าร�นะนำในลั�ษณะเอ�จ็�ซ์',
-'searchrelated'             => 'สัมพันธ์',
-'searchall'                 => 'ทั้งหมด',
-'showingresults'            => "�สดง $1 ราย�าร เริ่มต้นจา�ราย�ารที่ '''$2'''",
-'showingresultsnum'         => "�สดง $3 ราย�าร เริ่มต้นจา�ราย�ารที่  '''$2'''",
-'showingresultstotal'       => "�สดงด้านล่าง {{PLURAL:$3|ผลลัพธ์ '''$1''' จา� '''$3'''|ผลลัพธ์ '''$1 - $2''' จา� '''$3'''}}",
-'nonefound'                 => "'''คำ�นะนำ''': ค้นหาไม่พบอาจเนื่องจา� �ารค้นหาจา�คำศัพท์ทั่วไป เช่นคำว่า \"ที่\" and \"ของ\" ไม่ได้ถู�เ�็บไว้ในดัชนีคำค้นหา",
-'powersearch'               => 'ค้นหาระดับสูง',
-'powersearch-legend'        => 'ค้นหาระดับสูง',
-'powersearch-ns'            => 'ค้นหาในเนมสเปซ:',
-'powersearch-redir'         => 'ราย�ารหน้าเปลี่ยนทาง',
-'powersearch-field'         => 'ค้นหา',
-'search-external'           => 'ค้นหาจา�ภายนอ�',
-'searchdisabled'            => 'ระบบ�ารค้นหาใน {{SITENAME}} ไม่เปิด�ารใช้งาน คุณสามารถค้นหาใน�ูเ�ิลหรือเซิร์ชเอนจินอื่น โปรดจำไว้ว่าเนื้อหาของ {{SITENAME}} บนเซิร์ชเอนจินอาจเป็นข้อมูลเ�่า',
+'searchresults'                   => 'ค้นหา',
+'searchresults-title'             => 'ผล�ารค้นหาสำหรับ "$1"',
+'searchresulttext'                => 'วิธี�ารค้นหาใน {{SITENAME}} ดูวิธีใช้งานเพิ่มที่ [[{{MediaWiki:Helppage}}|{{int:help}}]]',
+'searchsubtitle'                  => 'คุณได้สืบค้นเพื่อหา \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|ทุ�หน้าที่ขึ้นต้นด้วย "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|ทุ�หน้าที่โยงมาที่ "$1"]])',
+'searchsubtitleinvalid'           => "ค้นหาเ�ี่ยว�ับ '''$1'''",
+'noexactmatch'                    => "'''ไม่พบหัวข้อ  \"\$1\"''' คุณอาจจะ [[:\$1|สร้างหน้าใหม่ในชื่อนี้]]",
+'noexactmatch-nocreate'           => "'''ไม่มีหน้าหัวเรื่อง \"\$1\" อยู่ในสารบบ'''",
+'toomanymatches'                  => 'หัวข้อที่พบมีมา�เ�ินไป �รุณาใช้คำค้นหาอื่น',
+'titlematches'                    => 'พบชื่อหัวข้อนี้',
+'notitlematches'                  => 'ไม่พบชื่อหัวข้อนี้',
+'textmatches'                     => 'พบคำนี้ในหน้า',
+'notextmatches'                   => 'ไม่พบข้อความในหน้า',
+'prevn'                           => '�่อนหน้า $1',
+'nextn'                           => 'ถัดไป $1',
+'viewprevnext'                    => 'ดู ($1) ($2) ($3)',
+'searchmenu-legend'               => 'ตัวเลือ��ารค้นหา',
+'searchmenu-new'                  => "'''สร้างหน้า \"[[:\$1]]\" บนวิ�ินี้'''",
+'searchhelp-url'                  => 'Help:วิธี�ารใช้งาน',
+'searchmenu-prefix'               => '[[Special:PrefixIndex/$1|สืบค้นหน้าที่มีคำขึ้นต้นเหล่านี้]]',
+'searchprofile-articles'          => 'หน้าบทความ',
+'searchprofile-articles-and-proj' => 'หน้าเนื้อหา�ละโครง�าร',
+'searchprofile-project'           => 'หน้าโครง�าร',
+'searchprofile-images'            => 'ไฟล์',
+'searchprofile-everything'        => 'ทุ�สิ่ง',
+'searchprofile-advanced'          => 'ชั้นสูง',
+'searchprofile-articles-tooltip'  => 'ค้นหาใน $1',
+'searchprofile-project-tooltip'   => 'ค้นหาใน $1',
+'searchprofile-images-tooltip'    => 'ค้นหาไฟล์',
+'prefs-search-nsdefault'          => 'ค้นหาโดยใช้ค่าพื้น�าน:',
+'search-result-size'              => '$1 ({{PLURAL:$2|1 คำ|$2 คำ}})',
+'search-result-score'             => 'ความเ�ี่ยวข้อง : $1%',
+'search-redirect'                 => '(เปลี่ยนทาง $1)',
+'search-section'                  => '(ส่วน $1)',
+'search-suggest'                  => 'คุณอาจหมายถึง : $1',
+'search-interwiki-caption'        => 'โครง�ารพี่น้อง',
+'search-interwiki-default'        => '$1 ผลลัพธ์:',
+'search-interwiki-more'           => '(มา��ว่า)',
+'search-mwsuggest-enabled'        => 'พร้อมคำ�นะนำ',
+'search-mwsuggest-disabled'       => 'ไม่รวมคำ�นะนำ',
+'search-relatedarticle'           => 'สัมพันธ์',
+'mwsuggest-disable'               => 'ย�เลิ��าร�นะนำในลั�ษณะเอ�จ็�ซ์',
+'searchrelated'                   => 'สัมพันธ์',
+'searchall'                       => 'ทั้งหมด',
+'showingresults'                  => "�สดง $1 ราย�าร เริ่มต้นจา�ราย�ารที่ '''$2'''",
+'showingresultsnum'               => "�สดง $3 ราย�าร เริ่มต้นจา�ราย�ารที่  '''$2'''",
+'showingresultstotal'             => "ด้านล่างนี้�สดง{{PLURAL:$4|ผลลัพธ์ '''$1''' จา� '''$3'''|ผลลัพธ์ '''$1 - $2''' จา� '''$3'''}}",
+'nonefound'                       => "'''คำเตือน''': เนมสเปซบางส่วนจะถู�ค้นหาเอง
+ให้ลองเลือ�คำขึ้นต้น�ารค้นหาด้วย ''all:'' สำหรับค้นหาเนื้อหาทั้งหมด (รวมถึง หน้าอภิปราย �ม่�บบ ฯลฯ) หรือเลือ�เนมสเปซที่ต้อง�าร",
+'search-nonefound'                => 'ไม่มีผลลัพธ์ตามคำค้นที่�ำหนด',
+'powersearch'                     => 'ค้นหาระดับสูง',
+'powersearch-legend'              => 'ค้นหาระดับสูง',
+'powersearch-ns'                  => 'ค้นหาในเนมสเปซ:',
+'powersearch-redir'               => 'ราย�ารหน้าเปลี่ยนทาง',
+'powersearch-field'               => 'ค้นหา',
+'search-external'                 => 'ค้นหาจา�ภายนอ�',
+'searchdisabled'                  => 'ระบบ�ารค้นหาใน {{SITENAME}} ไม่เปิด�ารใช้งาน คุณสามารถค้นหาใน�ูเ�ิลหรือเซิร์ชเอนจินอื่น โปรดจำไว้ว่าเนื้อหาของ {{SITENAME}} บนเซิร์ชเอนจินอาจเป็นข้อมูลเ�่า',
 
 # Preferences page
-'preferences'              => 'ตั้งค่าส่วนตัว',
-'mypreferences'            => 'ตั้งค่าส่วนตัว',
-'prefs-edits'              => 'จำนวน�าร��้ไข:',
-'prefsnologin'             => 'ไม่ได้ล็อ�อิน',
-'prefsnologintext'         => 'คุณต้อง<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ล็อ�อิน]</span> �่อนเพื่อที่จะตั้งค่าส่วนตัวได้',
-'prefsreset'               => '�ารตั้งค่าถู�ตั้งเป็นค่าเริ่มต้น',
-'qbsettings'               => '�ถบพิเศษ',
-'qbsettings-none'          => 'ไม่มี',
-'qbsettings-fixedleft'     => 'อยู่ทางซ้าย',
-'qbsettings-fixedright'    => 'อยู่ทางขวา',
-'qbsettings-floatingleft'  => 'ด้านซ้าย',
-'qbsettings-floatingright' => 'ด้านขวา',
-'changepassword'           => 'เปลี่ยนรหัสผ่าน',
-'skin'                     => 'หน้าตา',
-'math'                     => 'คณิตศาสตร์',
-'dateformat'               => 'รูป�บบวันที่',
-'datedefault'              => 'ค่าตั้งต้น',
-'datetime'                 => 'วัน�ละเวลา',
-'math_failure'             => 'ส่งผ่านค่าไม่ได้',
-'math_unknown_error'       => 'ข้อผิดพลาดที่ไม่ทราบ',
-'math_unknown_function'    => 'คำสั่งที่ไม่ทราบ',
-'math_lexing_error'        => '�ารจำ�น�สูตรผิดพลาด',
-'math_syntax_error'        => 'ไวยา�รณ์ผิดพลาด',
-'math_image_error'         => '�าร�ปลงเป็นไฟล์ PNG ขัดข้อง �รุณาตรวจสอบ�ารติดตั้ง LaTex, dvips, gs, �ละ convert',
-'math_bad_tmpdir'          => 'ไม่สามารถเขียนค่าหรือสร้าง ลงไดเร�ทอรีชั่วคราวสำหรับเ�็บค่าทางคณิตศาสตร์ได้',
-'math_bad_output'          => 'ไม่สามารถเขียนค่าหรือสร้าง ลงไดเร�ทอรีปลายทางสำหรับเ�็บค่าทางคณิตศาสตร์ได้',
-'math_notexvc'             => 'เ�ิดข้อความผิดพลาด texvc ไม่พบ �รุณาตรวจสอบ math/README เพื่อตั้งค่า',
-'prefs-personal'           => 'รายละเอียดผู้ใช้',
-'prefs-rc'                 => 'ปรับปรุงล่าสุด',
-'prefs-watchlist'          => 'ราย�ารเ�้าดู',
-'prefs-watchlist-days'     => 'จำนวนวันที่�สดงในราย�ารเ�้าดู:',
-'prefs-watchlist-edits'    => 'จำนวน�าร��้ไขที่�สดงในราย�ารเ�้าดูที่เพิ่มเติมเข้ามา:',
-'prefs-misc'               => 'เบ็ดเตล็ด',
-'saveprefs'                => 'บันทึ�',
-'resetprefs'               => 'ตั้งค่าใหม่',
-'oldpassword'              => 'รหัสผ่านเดิม:',
-'newpassword'              => 'รหัสผ่านใหม่:',
-'retypenew'                => 'พิมพ์รหัสผ่านใหม่อี�ครั้ง:',
-'textboxsize'              => '��้ไข',
-'rows'                     => '�ถว:',
-'columns'                  => 'คอลัมน์:',
-'searchresultshead'        => 'ค้นหา',
-'resultsperpage'           => 'ราย�ารต่อหน้า:',
-'contextlines'             => 'บรรทัดที่�สดงต่อราย�าร:',
-'contextchars'             => 'ตัวอั�ษรต่อบรรทัด:',
-'stub-threshold'           => 'ขีด�บ่งสำหรับ <a href="#" class="stub">รูป�บบโครง</a> (ความยาวบทความ):',
-'recentchangesdays'        => 'วันที่�สดงในปรับปรุงล่าสุด:',
-'recentchangescount'       => 'จำนวน�าร��้ไขที่�สดงในปรับปรุงล่าสุด:',
-'savedprefs'               => '�ารตั้งค่าของคุณได้ถู�บันทึ��ล้ว',
-'timezonelegend'           => 'เวลา',
-'timezonetext'             => 'จำนวนชั่วโมงที่�ต�ต่างจา�เวลาเซิร์ฟเวอร์ (UTC)',
-'localtime'                => 'เวลาของคุณ',
-'timezoneoffset'           => 'ความ�ต�ต่าง¹',
-'servertime'               => 'เวลาเซิร์ฟเวอร์',
-'guesstimezone'            => 'เรีย�ค่าจา�เว็บเบราว์เซอร์',
-'allowemail'               => 'เปิดรับอีเมลจา�ผู้ใช้อื่น',
-'prefs-searchoptions'      => 'ตัวเลือ�ใน�ารค้นหา',
-'prefs-namespaces'         => 'เนมสเปซ',
-'defaultns'                => 'ค้นหาในเนมสเปซ (ค่าตั้งต้น):',
-'default'                  => 'ค่าตั้งต้น',
-'files'                    => 'ไฟล์',
+'preferences'               => 'ตั้งค่าส่วนตัว',
+'mypreferences'             => 'ตั้งค่าส่วนตัว',
+'prefs-edits'               => 'จำนวน�าร��้ไข:',
+'prefsnologin'              => 'ไม่ได้ล็อ�อิน',
+'prefsnologintext'          => 'คุณต้อง<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ล็อ�อิน]</span> �่อนเพื่อที่จะตั้งค่าส่วนตัวได้',
+'prefsreset'                => '�ารตั้งค่าถู�ตั้งเป็นค่าเริ่มต้น',
+'qbsettings'                => '�ถบพิเศษ',
+'qbsettings-none'           => 'ไม่มี',
+'qbsettings-fixedleft'      => 'อยู่ทางซ้าย',
+'qbsettings-fixedright'     => 'อยู่ทางขวา',
+'qbsettings-floatingleft'   => 'ด้านซ้าย',
+'qbsettings-floatingright'  => 'ด้านขวา',
+'changepassword'            => 'เปลี่ยนรหัสผ่าน',
+'skin'                      => 'หน้าตา',
+'skin-preview'              => '�สดงตัวอย่าง',
+'math'                      => 'คณิตศาสตร์',
+'dateformat'                => 'รูป�บบวันที่',
+'datedefault'               => 'ค่าตั้งต้น',
+'datetime'                  => 'วัน�ละเวลา',
+'math_failure'              => 'ส่งผ่านค่าไม่ได้',
+'math_unknown_error'        => 'ข้อผิดพลาดที่ไม่ทราบ',
+'math_unknown_function'     => 'คำสั่งที่ไม่ทราบ',
+'math_lexing_error'         => '�ารจำ�น�สูตรผิดพลาด',
+'math_syntax_error'         => 'ไวยา�รณ์ผิดพลาด',
+'math_image_error'          => '�าร�ปลงเป็นไฟล์ PNG ขัดข้อง �รุณาตรวจสอบ�ารติดตั้ง LaTex, dvips, gs, �ละ convert',
+'math_bad_tmpdir'           => 'ไม่สามารถเขียนค่าหรือสร้าง ลงไดเร�ทอรีชั่วคราวสำหรับเ�็บค่าทางคณิตศาสตร์ได้',
+'math_bad_output'           => 'ไม่สามารถเขียนค่าหรือสร้าง ลงไดเร�ทอรีปลายทางสำหรับเ�็บค่าทางคณิตศาสตร์ได้',
+'math_notexvc'              => 'เ�ิดข้อความผิดพลาด texvc ไม่พบ �รุณาตรวจสอบ math/README เพื่อตั้งค่า',
+'prefs-personal'            => 'รายละเอียดผู้ใช้',
+'prefs-rc'                  => 'ปรับปรุงล่าสุด',
+'prefs-watchlist'           => 'ราย�ารเ�้าดู',
+'prefs-watchlist-days'      => 'จำนวนวันที่�สดงในราย�ารเ�้าดู:',
+'prefs-watchlist-days-max'  => '(มา�สุด 7 วัน)',
+'prefs-watchlist-edits'     => 'จำนวน�าร��้ไขที่�สดงในราย�ารเ�้าดูที่เพิ่มเติมเข้ามา:',
+'prefs-watchlist-edits-max' => '(จำนวนมา�สุด: 1000)',
+'prefs-misc'                => 'เบ็ดเตล็ด',
+'prefs-resetpass'           => 'เปลี่ยนรหัสผ่าน',
+'saveprefs'                 => 'บันทึ�',
+'resetprefs'                => 'ตั้งค่าใหม่',
+'textboxsize'               => '��้ไข',
+'prefs-edit-boxsize'        => 'ขนาดหน้าจอ�ล่อง��้ไข',
+'rows'                      => '�ถว:',
+'columns'                   => 'คอลัมน์:',
+'searchresultshead'         => 'ค้นหา',
+'resultsperpage'            => 'ราย�ารต่อหน้า:',
+'contextlines'              => 'บรรทัดที่�สดงต่อราย�าร:',
+'contextchars'              => 'ตัวอั�ษรต่อบรรทัด:',
+'stub-threshold'            => 'ขีด�บ่งสำหรับ <a href="#" class="stub">รูป�บบโครง</a> (ความยาวบทความ):',
+'recentchangesdays'         => 'วันที่�สดงในปรับปรุงล่าสุด:',
+'recentchangescount'        => 'จำนวน�าร��้ไขที่�สดงในส่วนปรับปรุงล่าสุด ประวัติหน้า �ละบันทึ� ตามค่าตั้งต้น:',
+'savedprefs'                => '�ารตั้งค่าของคุณได้ถู�บันทึ��ล้ว',
+'timezonelegend'            => 'เวลา',
+'timezonetext'              => 'จำนวนชั่วโมงที่�ต�ต่างจา�เวลาเซิร์ฟเวอร์ (UTC)',
+'localtime'                 => 'เวลาท้องถิ่น',
+'timezoneselect'            => 'เขตเวลา:',
+'timezoneuseserverdefault'  => 'ค่ามาตร�านเซิร์ฟเวอร์',
+'timezoneuseoffset'         => 'อื่นๆ (ระบุเวลาต่าง)',
+'timezoneoffset'            => 'เวลาต่าง¹:',
+'servertime'                => 'เวลาที่เซิร์ฟเวอร์:',
+'guesstimezone'             => 'เรีย�ค่าจา�เว็บเบราว์เซอร์',
+'allowemail'                => 'เปิดรับอีเมลจา�ผู้ใช้อื่น',
+'prefs-searchoptions'       => 'ตัวเลือ�ใน�ารค้นหา',
+'prefs-namespaces'          => 'เนมสเปซ',
+'defaultns'                 => 'ค้นหาในเนมสเปซ (ค่าตั้งต้น):',
+'default'                   => 'ค่าตั้งต้น',
+'files'                     => 'ไฟล์',
 
 # User rights
 'userrights'                  => 'บริหารสิทธิผู้ใช้', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'บริหารสิทธิผู้ใช้',
 'userrights-user-editname'    => 'ใส่ชื่อผู้ใช้:',
 'editusergroup'               => '��้ไขผู้ใช้',
-'editinguser'                 => "�ำลัง��้ไขสิทธิของผู้ใช้ '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "�ำลัง��้ไขสิทธิของผู้ใช้ '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => '��้ไขผู้ใช้',
 'saveusergroups'              => 'ต�ลง',
 'userrights-groupsmember'     => 'สมาชิ�ใน�ลุ่ม:',
@@ -1021,9 +1150,38 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'rightslogentry' => '$1 ถู�เปลี่ยน�ลุ่มจา� $2 เป็น $3',
 'rightsnone'     => '(ไม่มี)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'อ่านหน้านี้',
+'action-edit'                 => '��้ไขหน้านี้',
+'action-createpage'           => 'สร้างหน้า',
+'action-createtalk'           => 'สร้างหน้าอภิปราย',
+'action-createaccount'        => 'สร้างบั�ชีผู้ใช้นี้',
+'action-minoredit'            => 'เป็น�าร��้ไขเล็�น้อย',
+'action-move'                 => 'ย้ายหน้านี้',
+'action-move-subpages'        => 'ย้ายหน้านี้�ละหน้าย่อยของหน้านี้',
+'action-movefile'             => 'ย้ายไฟล์นี้',
+'action-upload'               => 'อัปโหลดไฟล์นี้',
+'action-reupload'             => 'อัปโหลดทับไฟล์ที่มีอยู่�ล้วนี้',
+'action-upload_by_url'        => 'อัปโหลดไฟล์นี้จา�ที่อยู่ยูอาร์�อล',
+'action-delete'               => 'ลบหน้านี้',
+'action-deleterevision'       => 'ลบรุ่นนี้',
+'action-deletedhistory'       => 'ดูประวัติที่ถู�ลบของหน้านี้',
+'action-browsearchive'        => 'ค้นหาหน้าที่ถู�ลบ',
+'action-undelete'             => 'เรีย�คืนหน้านี้',
+'action-suppressionlog'       => 'ดูบันทึ�ส่วนตัว',
+'action-block'                => 'บล็อ�ผู้ใช้รายนี้จา��าร��้ไข',
+'action-protect'              => 'เปลี่ยนระดับ�ารล็อ�สำหรับหน้านี้',
+'action-import'               => 'นำเข้าหน้านี้มาจา�วิ�ิอื่น',
+'action-importupload'         => 'นำเข้าหน้านี้จา�ไฟล์ที่อัปโหลด�ล้ว',
+'action-unwatchedpages'       => 'ดูราย�ารของหน้าที่ไม่มีผู้เ�้าดู',
+'action-userrights'           => '��้ไขสิทธิผู้ใช้ทั้งหมด',
+'action-userrights-interwiki' => '��้ไขสิทธิผู้ใช้สำหรับวิ�ินี้',
+'action-siteadmin'            => 'ล็อ�หรือปลดล็อ��านข้อมูล',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|�าร��้ไข|�าร��้ไข}}',
 'recentchanges'                     => 'ปรับปรุงล่าสุด',
+'recentchanges-legend'              => 'ตัวเลือ�ปรับปรุงล่าสุด',
 'recentchangestext'                 => 'ในหน้านี้เป็นราย�ารล่าสุดที่มี�ารปรับปรุง',
 'recentchanges-feed-description'    => 'ฟีดนี้�สดง�ารเปลี่ยน�ปลงล่าสุด',
 'rcnote'                            => "ราย�ารด้านล่างคือ�าร��้ไข {{PLURAL:$1|'''1''' ราย�าร|ล่าสุด '''$1''' ราย�าร}} ในช่วง {{PLURAL:$2|1 วัน|'''$2''' วัน}}ที่ผ่านมา ตั้ง�ต่วันที่ $5; $4",
@@ -1047,6 +1205,8 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'rc_categories'                     => 'จำ�ัดเฉพาะหมวดหมู่ (�ย�ด้วย "|")',
 'rc_categories_any'                 => 'ใดๆ',
 'newsectionsummary'                 => '/* $1 */ หัวข้อใหม่',
+'rc-enhanced-expand'                => '�สดงรายละเอียด (จำเป็นต้องใช้จาวาสคริปต์)',
+'rc-enhanced-hide'                  => 'ซ่อนรายละเอียด',
 
 # Recent changes linked
 'recentchangeslinked'          => 'ปรับปรุงที่เ�ี่ยวโยง',
@@ -1067,11 +1227,11 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'upload_directory_read_only'  => 'ไม่สามารถเ�็บข้อมูลในไดเร�ทอรี ($1) ปั�หาเ�ิดที่เว็บเซิร์ฟเวอร์',
 'uploaderror'                 => 'เ�ิดความขัดข้องใน�ารอัปโหลด',
 'uploadtext'                  => "�รุณาใช้�บบฟอร์มด้านล่างใน�ารอัปโหลดไฟล์
-สำหรับ�ารดูหรือ�ารค้นหาไฟล์ที่เคยอัปโหลด�่อนหน้านี้ ให้ไปที่[[Special:ImageList|รายชื่อไฟล์ที่ถู�อัปโหลด]] �ารอัปโหลด�ละ�ารอัปโหลดซ้ำดูได้ที่[[Special:Log/upload|บันทึ��ารอัปโหลด]] �ละ�ารลบไฟล์ดูได้ที่[[Special:Log/delete|บันทึ��ารลบ]]
+สำหรับ�ารดูหรือ�ารค้นหาไฟล์ที่เคยอัปโหลด�่อนหน้านี้ ให้ไปที่[[Special:FileList|รายชื่อไฟล์ที่ถู�อัปโหลด]] �ารอัปโหลด�ละ�ารอัปโหลดซ้ำดูได้ที่[[Special:Log/upload|บันทึ��ารอัปโหลด]] �ละ�ารลบไฟล์ดูได้ที่[[Special:Log/delete|บันทึ��ารลบ]]
 
 ถ้าต้อง�าร�ทร�ไฟล์ลงในหน้าหนึ่งๆ ให้ใช้คำสั่งหนึ่งในรูป�บบต่อไปนี้
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' เพื่อใช้รูปขนาดเต็ม
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|ข้อความอธิบาย]]</nowiki></tt>''' เพื่อใช้รูปย่อขนาด�ว้าง 200 พิ�เซลใน�ล่องที่จัดชิดซ้าย โดยมี \"ข้อความอธิบาย\" เป็นคำบรรยายใต้ภาพ
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' เพื่อใช้รูปขนาดเต็ม
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|ข้อความอธิบาย]]</nowiki></tt>''' เพื่อใช้รูปย่อขนาด�ว้าง 200 พิ�เซลใน�ล่องที่จัดชิดซ้าย โดยมี \"ข้อความอธิบาย\" เป็นคำบรรยายใต้ภาพ
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' สำหรับ�ารเชื่อมโยงไฟล์โดยตรง โดยไม่ปรา��ไฟล์นั้นออ�มา",
 'upload-permitted'            => 'ชนิดชองไฟล์ที่อนุ�าตให้ใช้ได้: $1',
 'upload-preferred'            => 'ชนิดของไฟล์ที่ควรใช้: $1',
@@ -1097,21 +1257,21 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'large-file'                  => 'ไฟล์ไม่ควรมีขนาดให�่�ว่า $1 ไฟล์นี้มีขนาด $2',
 'largefileserver'             => 'ไฟล์นี้มีขนาดให�่�ว่าค่าที่อนุ�าตให้ใช้ได้',
 'emptyfile'                   => 'ไฟล์ที่อัปโหลดมาเหมือนไฟล์ว่าง อาจเ�ิดจา�ปั�หาพิมพ์ชื่อไฟล์ผิด �รุณาตรวจสอบไฟล์อี�ครั้ง �ละ�น่ใจว่าต้อง�ารที่จะอัปโหลดไฟล์นี้',
-'fileexists'                  => 'มีไฟล์ชื่อนี้อยู่�ล้ว �รุณาตรวจสอบ <strong><tt>$1</tt></strong> หา�คุณไม่�น่ใจว่าต้อง�ารเปลี่ยน�ปลงไฟล์นี้หรือไม่',
-'filepageexists'              => 'หน้าคำอธิบายสำหรับไฟล์นี้ได้ถู�สร้างไว้�ล้วที่ <strong><tt>$1</tt></strong> �ต่ไฟล์ชื่อนี้ไม่มีอยู่ในปัจจุบัน สาระสำคั�ที่คุณบันทึ�จะไม่ปรา��บนหน้าคำอธิบาย เพื่อให้สาระสำคั�ปรา��ขึ้น คุณจำเป็นต้อง��้ไขด้วยตนเอง',
-'fileexists-extension'        => 'ไฟล์ที่โหลดมีชื่อใ�ล้เคียง:<br />
-ชื่อไฟล์ที่�ำลังอัปโหลด: <strong><tt>$1</tt></strong><br />
-ชื่อไฟล์ที่มีอยู่�ล้ว: <strong><tt>$2</tt></strong><br />
-�รุณาเลือ�ชื่อไฟล์ใหม่',
+'fileexists'                  => "มีไฟล์ชื่อนี้อยู่�ล้ว �รุณาตรวจสอบ '''<tt>$1</tt>''' หา�คุณไม่�น่ใจว่าต้อง�ารเปลี่ยน�ปลงไฟล์นี้หรือไม่",
+'filepageexists'              => "หน้าคำอธิบายสำหรับไฟล์นี้ได้ถู�สร้างไว้�ล้วที่ '''<tt>$1</tt>''' �ต่ไฟล์ชื่อนี้ไม่มีอยู่ในปัจจุบัน สาระสำคั�ที่คุณบันทึ�จะไม่ปรา��บนหน้าคำอธิบาย เพื่อให้สาระสำคั�ปรา��ขึ้น คุณจำเป็นต้อง��้ไขด้วยตนเอง",
+'fileexists-extension'        => "ไฟล์ที่โหลดมีชื่อใ�ล้เคียง:<br />
+ชื่อไฟล์ที่�ำลังอัปโหลด: '''<tt>$1</tt>'''<br />
+ชื่อไฟล์ที่มีอยู่�ล้ว: '''<tt>$2</tt>'''<br />
+�รุณาเลือ�ชื่อไฟล์ใหม่",
 'fileexists-thumb'            => "<center>'''ภาพมีอยู่�ล้ว'''</center>",
-'fileexists-thumbnail-yes'    => 'ไฟล์นี้เหมือนจะเป็นภาพเดิมที่ถู�ลดขนาดมา  �รุณาตรวจสอบ <strong><tt>$1</tt></strong><br />
-ถ้าตรวจสอบ�ล้ว�ละเป็นไฟล์เดียว�ัน ไม่จำเป็นต้องอัปโหลดเพิ่ม',
-'file-thumbnail-no'           => 'ชื่อไฟล์ขึ้นต้นด้วย <strong><tt>$1</tt></strong> 
-ภาพนี้ดูเหมือนว่าจะเป็นภาพที่ถู�ลดขนาดมา <i>(thumbnail)</i> 
-ถ้าคุณมีไฟล์ต้นฉบับขนาดให�่�ว่านี้ �รุณาอัปโหลดไฟล์ต้นฉบับ หรือเปลี่ยนชื่อไฟล์ด้วย',
-'fileexists-forbidden'        => 'ไฟล์ภายใต้ชื่อนี้มี�ล้วในระบบ �รุณาอัปโหลดโดยใช้ชื่อใหม่ [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "ไฟล์นี้เหมือนจะเป็นภาพเดิมที่ถู�ลดขนาดมา  �รุณาตรวจสอบ '''<tt>$1</tt>'''<br />
+ถ้าตรวจสอบ�ล้ว�ละเป็นไฟล์เดียว�ัน ไม่จำเป็นต้องอัปโหลดเพิ่ม",
+'file-thumbnail-no'           => "ชื่อไฟล์ขึ้นต้นด้วย '''<tt>$1</tt>''' 
+ภาพนี้ดูเหมือนว่าจะเป็นภาพที่ถู�ลดขนาดมา ''(thumbnail)'' 
+ถ้าคุณมีไฟล์ต้นฉบับขนาดให�่�ว่านี้ �รุณาอัปโหลดไฟล์ต้นฉบับ หรือเปลี่ยนชื่อไฟล์ด้วย",
+'fileexists-forbidden'        => 'ไฟล์ภายใต้ชื่อนี้มี�ล้วในระบบ �รุณาอัปโหลดโดยใช้ชื่อใหม่ [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'ไฟล์ที่ใช้ชื่อนี้มีอยู่�ล้วในวิ�ิมีเดียคอมมอนส์
-�รุณาอัปโหลดใหม่โดยใช้อี�ชื่อหนึ่ง [[Image:$1|thumb|center|$1]]',
+�รุณาอัปโหลดใหม่โดยใช้อี�ชื่อหนึ่ง [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'ไฟล์นี้ซ้ำ�ับ{{PLURAL:$1|ไฟล์|ไฟล์}}ต่อไปนี้:',
 'successfulupload'            => 'อัปโหลดสำเร็จ',
 'uploadwarning'               => 'คำเตือน�ารอัปโหลด',
@@ -1132,7 +1292,7 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 
 โปรดพิจารณาความเหมาะสมว่าจะยังอัปโหลดไฟล์นี้ต่อหรือไม่
 นี่คือปูม�ารลบของไฟล์เพื่อประ�อบ�ารตัดสินใจ:",
-'filename-bad-prefix'         => 'ไฟล์ที่คุณ�ำลังจะอัปโหลดเข้ามานี้มีชื่อที่ขึ้นต้นด้วย <strong>"$1"</strong> ซึ่งเป็นชื่อที่ไม่สื่อความหมายใดๆ (โดยป�ติ�ล้วชื่อนี้จะถู�ตั้งมาโดย�ล้องถ่ายรูปดิจิทัล).  �รุณาตั้งชื่อไฟล์ใหม่ที่สื่อความหมายมา��ว่าเดิม',
+'filename-bad-prefix'         => "ไฟล์ที่คุณ�ำลังจะอัปโหลดเข้ามานี้มีชื่อที่ขึ้นต้นด้วย '''\"\$1\"''' ซึ่งเป็นชื่อที่ไม่สื่อความหมายใดๆ (โดยป�ติ�ล้วชื่อนี้จะถู�ตั้งมาโดย�ล้องถ่ายรูปดิจิทัล).  �รุณาตั้งชื่อไฟล์ใหม่ที่สื่อความหมายมา��ว่าเดิม",
 
 'upload-proto-error'      => 'โพรโทคอลไม่ถู�ต้อง',
 'upload-proto-error-text' => '�ารอัปโหลดโดยตรงจา�เว็บต้อง�ารยูอาร์�อลที่ขึ้นต้นด้วย <code>http://</code> หรือ <code>ftp://</code>',
@@ -1150,23 +1310,24 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'license'            => 'ลิขสิทธิ์:',
 'nolicense'          => 'ไม่ได้เลือ�',
 'license-nopreview'  => '(ไม่สามารถ�สดงตัวอย่าง)',
-'upload_source_url'  => ' (ยูอาร์�อลที่ถู�ต้อง�ละเข้าถึงได้โดยทั่วไป)',
+'upload_source_url'  => ' (ยูอาร์�อลที่บุคคลทั่วไปสามารถเข้าถึงได้)',
 'upload_source_file' => ' (ไฟล์จา�คอมพิวเตอร์คุณ)',
 
-# Special:ImageList
-'imagelist-summary'     => 'หน้าพิเศษนี้�สดงไฟล์ทั้งหมดที่ถู�อัปโหลด
+# Special:ListFiles
+'listfiles-summary'     => 'หน้าพิเศษนี้�สดงไฟล์ทั้งหมดที่ถู�อัปโหลด
 โดยปริยาย ไฟล์ที่ถู�อัปโหลดล่าสุด จะ�สดงอยู่บนสุดของราย�ารไฟล์
 คลิ�ที่คอมลัมน์บนสุดจะเปลี่ยน�ารจัด�ย�ประเภท',
-'imagelist_search_for'  => 'ค้นหาชื่อภาพ:',
+'listfiles_search_for'  => 'ค้นหาชื่อภาพ:',
 'imgfile'               => 'ไฟล์',
-'imagelist'             => 'รายชื่อไฟล์',
-'imagelist_date'        => 'วันที่',
-'imagelist_name'        => 'ชื่อ',
-'imagelist_user'        => 'ผู้ใช้',
-'imagelist_size'        => 'ขนาด',
-'imagelist_description' => 'คำอธิบาย',
-
-# Image description page
+'listfiles'             => 'รายชื่อไฟล์',
+'listfiles_date'        => 'วันที่',
+'listfiles_name'        => 'ชื่อ',
+'listfiles_user'        => 'ผู้ใช้',
+'listfiles_size'        => 'ขนาด',
+'listfiles_description' => 'คำอธิบาย',
+'listfiles_count'       => 'รุ่น',
+
+# File description page
 'filehist'                       => 'ประวัติไฟล์',
 'filehist-help'                  => '�ดเลือ� วัน/เวลา เพื่อดูไฟล์ที่�สดงในวันนั้น',
 'filehist-deleteall'             => 'ลบทั้งหมด',
@@ -1174,12 +1335,18 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'filehist-revert'                => 'ย้อน',
 'filehist-current'               => 'ปัจจุบัน',
 'filehist-datetime'              => 'วันที่/เวลา',
+'filehist-thumb'                 => 'รูปย่อ',
+'filehist-thumbtext'             => 'รูปย่อสำหรับรุ่น $1',
+'filehist-nothumb'               => 'ไม่มีรูปย่อ',
 'filehist-user'                  => 'ผู้ใช้',
 'filehist-dimensions'            => 'ขนาด',
 'filehist-filesize'              => 'ขนาดไฟล์',
 'filehist-comment'               => 'ความเห็น',
-'imagelinks'                     => 'หน้าที่ใช้ภาพนี้',
+'imagelinks'                     => 'หน้าที่มีไฟล์นี้',
 'linkstoimage'                   => '{{PLURAL:$1|หน้า|หน้า}}ที่ลิง�์มายังไฟล์นี้:',
+'linkstoimage-more'              => 'ไฟล์นี้มี�ารเชื่อมโยงมา��ว่า $1 {{PLURAL:$1|�ห่ง|�ห่ง}}
+รายชื่อต่อไปนี้�สดง�ารเชื่อมโยง $1 {{PLURAL:$1|�ห่ง�ร�|�ห่ง�ร�}}ที่มายังไฟล์นี้เท่านั้น
+ดูเพิ่มได้ที่[[Special:WhatLinksHere/$2|รายชื่อเต็ม]]',
 'nolinkstoimage'                 => 'ไม่มีหน้าที่ใช้ภาพนี้',
 'morelinkstoimage'               => 'ดู[[Special:WhatLinksHere/$1|หน้าที่ลิง�์]]มายังไฟล์นี้เพิ่มเติม',
 'redirectstofile'                => '{{PLURAL:$1|ไฟล์|$1 ไฟล์}}ดังต่อไปนี้เปลี่ยนทางมาที่ไฟล์นี้:',
@@ -1210,7 +1377,7 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 # File deletion
 'filedelete'                  => 'ลบ $1',
 'filedelete-legend'           => 'ลบไฟล์',
-'filedelete-intro'            => "คุณ�ำลังลบ '''[[Media:$1|$1]]'''",
+'filedelete-intro'            => "คุณ�ำลังจะลบไฟล์ '''[[Media:$1|$1]]''' ไปพร้อม�ับประวัติของไฟล์นี้",
 'filedelete-intro-old'        => "คุณ�ำลังลบ '''[[Media:$1|$1]]''' รุ่น [$4 $3, $2]",
 'filedelete-comment'          => 'เหตุผลใน�ารลบ:',
 'filedelete-submit'           => 'ลบ',
@@ -1218,7 +1385,6 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'filedelete-success-old'      => "ไฟล์ '''[[Media:$1|$1]]''' รุ่นเมื่อ $3, $2 ถู�ลบเรียบร้อย�ล้ว",
 'filedelete-nofile'           => "ไม่มีไฟล์ '''$1'''",
 'filedelete-nofile-old'       => "ไม่มี '''$1''' ตามคุณลั�ษณะที่�ำหนด อยู่ใน�รุ",
-'filedelete-iscurrent'        => 'คุณ�ำลังพยายามลบรุ่นล่าสุดของไฟล์นี้  �่อนลบ�รุณาย้อนไฟล์�ลับไปเป็นรุ่นที่เ�่า�ว่า�่อน',
 'filedelete-otherreason'      => 'เหตุผลอื่นเพิ่มเติม:',
 'filedelete-reason-otherlist' => 'เหตุผลอื่น',
 'filedelete-reason-dropdown'  => '* เหตุผลทั่วไปของ�ารลบ
@@ -1245,31 +1411,37 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 
 # Random page
 'randompage'         => 'สุ่มหน้า',
-'randompage-nopages' => 'ไม่มีหน้าใดในเนมสเปซนี้',
+'randompage-nopages' => 'ไม่มีหน้าใดในเนมสเปซ "$1"',
 
 # Random redirect
 'randomredirect'         => 'สุ่มหน้าเปลี่ยนทาง',
-'randomredirect-nopages' => 'ไม่มีหน้าเปลี่ยนทางในเนมสเปซนี้',
+'randomredirect-nopages' => 'ไม่มีหน้าเปลี่ยนทางในเนมสเปซ "$1"',
 
 # Statistics
-'statistics'             => 'สถิติ',
-'sitestats'              => 'สถิติของ {{SITENAME}}',
-'userstats'              => 'สถิติผู้ใช้',
-'sitestatstext'          => "ปัจจุบันในวิ�ินี้ มีข้อมูลทั้งหมด  '''$2''' หน้า <br />ตัวเลขนี้ไม่รวมหน้าพูดคุย หน้าเปลี่ยนทาง �ละหน้าอื่นที่อาจไม่นับว่าเป็นหน้าที่สมบูรณ์
-ซึ่งหา�รวมทั้งหมด ในปัจจุบันจะมี '''$1''' หน้า
-
-มีไฟล์ที่อัปโหลดทั้งหมด '''$8''' ไฟล์
-
-มี�ารเข้าชม  '''$3''' ครั้ง �ละ  '''$4''' �าร��้ไขตั้ง�ต่ {{SITENAME}} ได้เริ่มใช้งาน ซึ่งเฉลี่ย�ล้วมี�าร��้ไข '''$5''' ครั้งต่อหนึ่งหน้าหรือ�ารเข้าชม '''$6''' ครั้งต่อหนึ่ง�าร��้ไข
-
-ปัจจุบันมี[http://www.mediawiki.org/wiki/Manual:Job_queue งานในคิว]ทั้งหมด '''$7''' งาน",
-'userstatstext'          => "มีผู้ลงทะเบียนทั้งหมด '''$1''' ชื่อ โดย'''$2''' (หรือ '''$4%''') มีสิทธิ $5",
-'statistics-mostpopular' => 'หน้าที่มี�ารเข้าชมมา�ที่สุด',
+'statistics'                   => 'สถิติ',
+'statistics-header-pages'      => 'สถิติของหน้าต่าง ๆ',
+'statistics-header-edits'      => 'สถิติ�าร��้ไข',
+'statistics-header-views'      => 'สถิติ�ารเข้าชม',
+'statistics-header-users'      => 'สถิติผู้ใช้',
+'statistics-articles'          => 'จำนวนเนื้อหา',
+'statistics-pages'             => 'หน้าทั้งหมด',
+'statistics-pages-desc'        => 'หน้าทั้งหมดในเว็บไซต์นี้ รวมไปถึงหน้าต่าง ๆ เช่น หน้าสนทนา �ละหน้าเปลี่ยนทาง เป็นต้น',
+'statistics-files'             => 'จำนวนไฟล์ที่ถู�อัปโหลด',
+'statistics-edits'             => '��้ไขทั้งหมดตั้ง�ต่{{SITENAME}}ภาษาไทยถู��่อตั้งขึ้นมา',
+'statistics-edits-average'     => 'จำนวน��้ไขต่อหน้าโดยเฉลี่ย',
+'statistics-views-total'       => 'จำนวน�ารเข้าชมทั้งหมด',
+'statistics-views-peredit'     => 'จำนวน�ารเข้าดูต่อ�าร��้ไข:',
+'statistics-jobqueue'          => 'ความยาว[http://www.mediawiki.org/wiki/Manual:Job_queue คิวงาน]',
+'statistics-users'             => '[[Special:ListUsers|ผู้ใช้]]ที่ลงทะเบียน',
+'statistics-users-active'      => 'ผู้ใช้ที่ยัง��้ไขอยู่',
+'statistics-users-active-desc' => 'ผู้ใช้ที่ได้��้ไขในช่วง $1 วันที่ผ่านมา',
+'statistics-mostpopular'       => 'หน้าที่มี�ารเข้าชมมา�ที่สุด',
 
 'disambiguations'      => 'หน้า��้ความ�ำ�วม',
 'disambiguationspage'  => 'Template:��้�ำ�วม',
-'disambiguations-text' => "หน้าต่อไปนี้เชื่อมโยงไปยัง '''หน้า��้ความ�ำ�วม''' ซึ่งควร��้ไขลิง�์ให้เชื่อมโยงไปที่หน้าอื่นที่เหมาะสม<br />
-หน้าใดที่เรีย�ใช้�ม่�บบ [[MediaWiki:Disambiguationspage|��้�ำ�วม]] หน้าเหล่านั้นจะถือเป็นหน้า��้ความ�ำ�วม",
+'disambiguations-text' => "หน้าต่อไปนี้เชื่อมโยงไปยัง '''หน้าคำ�ำ�วม''' ซึ่งเนื้อหาในหน้าเหล่านั้นควรถู�เชื่อมโยงไปยังหัวข้อที่เหมาะสม�ทนที่<br />
+
+หน้าใดที่เรีย�ใช้ [[MediaWiki:Disambiguationspage]] หน้าเหล่านั้นจะถู�นับเป็นหน้าคำ�ำ�วม",
 
 'doubleredirects'            => 'หน้าเปลี่ยนทางซ้ำซ้อน',
 'doubleredirectstext'        => 'ใน�ต่ละ�ถวด้านล่าง�สดงลิง�์ไปยัง�ารเปลี่ยนทางครั้ง�ร��ละครั้งที่สองตามลำดับ �ละหน้าเป้าหมายที่ต้อง�าร ซึ่งควร��้ไข�ารเปลี่ยนทางครั้ง�ร�เป็นหน้านั้น',
@@ -1307,26 +1479,29 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'popularpages'            => 'หน้าที่มี�ารเข้าดูมา�',
 'wantedcategories'        => 'หมวดหมู่ที่ต้อง�าร',
 'wantedpages'             => 'หน้าที่ต้อง�าร',
-'missingfiles'            => 'ไฟล์ที่หายไป',
+'wantedfiles'             => 'ไฟล์ที่ต้อง�าร',
+'wantedtemplates'         => '�ม่�บบที่ต้อง�าร',
 'mostlinked'              => 'หน้าที่มี�ารลิง�์หามา�',
 'mostlinkedcategories'    => 'หมวดหมู่ที่มี�ารโยงหามา�',
 'mostlinkedtemplates'     => '�ม่�บบที่ใช้มา�',
 'mostcategories'          => 'หน้าที่มีหมวดหมู่มา�',
 'mostimages'              => 'ภาพที่ใช้มา�',
 'mostrevisions'           => 'หน้าที่มี�าร��้ไขมา�',
-'prefixindex'             => 'ดัชนีคำนำหน้า',
+'prefixindex'             => 'หน้าทั้งหมดตามดัชนีคำนำหน้า',
 'shortpages'              => 'หน้าสั้นมา�',
 'longpages'               => 'หน้ายาวมา�',
 'deadendpages'            => 'หน้าสุดทาง',
 'deadendpagestext'        => 'หน้าต่อไปนี้ไม่ได้ลิง�์ไปหน้าหน้าใดในวิ�ิ',
 'protectedpages'          => 'หน้าถู�ล็อ�',
 'protectedpages-indef'    => '�ารล็อ��บบไม่จำ�ัดเท่านั้น',
+'protectedpages-cascade'  => '�ารล็อ��บบสืบทอดเท่านั้น',
 'protectedpagestext'      => 'หน้าต่อไปนี้ถู�ล็อ�ห้าม��้ไขหรือห้ามเปลี่ยนชื่อ',
 'protectedpagesempty'     => 'ไม่มีหน้าใดที่ถู�ล็อ�ตามค่าที่เลือ�',
 'protectedtitles'         => 'หัวเรื่องที่ได้รับ�ารป้อง�ัน',
 'protectedtitlestext'     => 'หัวเรื่องต่อไปนี้ได้รับ�ารป้อง�ันไม่ให้สร้างใหม่',
 'protectedtitlesempty'    => 'ปัจจุบันไม่มีหัวเรื่องที่ได้รับ�ารป้อง�ันด้วยค่าต่อไปนี้',
 'listusers'               => 'รายนามผู้ใช้',
+'usereditcount'           => '�าร��้ไข $1 {{PLURAL:$1|ครั้ง|ครั้ง}}',
 'newpages'                => 'หน้าใหม่',
 'newpages-username'       => 'ชื่อผู้ใช้:',
 'ancientpages'            => 'หน้าที่ไม่ได้��้ไขนานสุด',
@@ -1347,18 +1522,17 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'booksources-search-legend' => 'ค้นหาหนังสือ',
 'booksources-go'            => 'ค้นหา',
 'booksources-text'          => 'ราย�ารด้านล่าง�สดงเว็บไซต์ที่ขายหนังสือใหม่หรือหนังสือใช้�ล้ว ซึ่งอาจมีข้อมูลของหนังสือที่คุณ�ำลังค้นหา:',
+'booksources-invalid-isbn'  => 'รหัส ISBN ที่ให้ไว้ไม่ถู�ต้อง �รุณาตรวจสอบจา�ต้นฉบับอี�ครั้ง',
 
 # Special:Log
 'specialloguserlabel'  => 'ผู้ใช้:',
 'speciallogtitlelabel' => 'ชื่อเรื่อง:',
 'log'                  => 'บันทึ�',
 'all-logs-page'        => 'บันทึ�ทั้งหมด',
-'log-search-legend'    => 'ค้นหาบันทึ�',
-'log-search-submit'    => 'ค้นหา',
 'alllogstext'          => '�สดงปูมทั้งหมดของ{{SITENAME}} 
 คุณสามารถค้นหาให้ละเอียดมา�ขึ้นโดยเลือ�ประเภทของปูม ชื่อผู้ใช้ (ตัวเล็�ให�่ในภาษาอัง�ฤษมีค่าไม่เท่า�ัน) หรือหน้าที่ต้อง�าร',
 'logempty'             => 'ไม่มีในบันทึ��่อนหน้า',
-'log-title-wildcard'   => 'ค้นหาคำหลา�หลาย',
+'log-title-wildcard'   => 'ค้นหาชื่อเรื่องด้วยคำขึ้นต้น',
 
 # Special:AllPages
 'allpages'          => 'หน้าทุ�หน้า',
@@ -1366,6 +1540,7 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'nextpage'          => 'ถัดไป ($1)',
 'prevpage'          => '�่อนหน้า ($1)',
 'allpagesfrom'      => 'เริ่ม�สดงผลจา�:',
+'allpagesto'        => 'จบ�าร�สดงผลที่:',
 'allarticles'       => 'หน้าทุ�หน้า',
 'allinnamespace'    => 'หน้าทุ�หน้า ($1 เนมสเปซ)',
 'allnotinnamespace' => 'หน้าทุ�หน้า (ไม่อยู่ใน $1 เนมสเปซ)',
@@ -1385,40 +1560,64 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'special-categories-sort-count' => 'เรียงตามจำนวน',
 'special-categories-sort-abc'   => 'เรียงลำดับตามตัวอั�ษร',
 
+# Special:DeletedContributions
+'deletedcontributions' => '�าร��้ไขที่ถู�ลบ',
+
+# Special:LinkSearch
+'linksearch'      => '�หล่งข้อมูลอื่น',
+'linksearch-pat'  => 'รูป�บบ�ารค้นหา:',
+'linksearch-ns'   => 'เนมสเปซ:',
+'linksearch-ok'   => 'ค้นหา',
+'linksearch-line' => '$1 ถู�ลิง�์จา� $2',
+
 # Special:ListUsers
 'listusersfrom'      => '�สดงชื่อผู้ใช้เริ่มต้นจา�:',
 'listusers-submit'   => '�สดง',
 'listusers-noresult' => 'ไม่พบผู้ใช้ที่ต้อง�าร',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'ปูม�ารสร้างบั�ชีผู้ใช้ใหม่',
+'newuserlogpagetext'          => 'นี่คือบันทึ��ารสร้างบั�ชีผู้ใช้',
+'newuserlog-byemail'          => 'รหัสผ่านถู�ส่งทางอีเมล',
+'newuserlog-create-entry'     => 'ผู้ใช้ใหม่',
+'newuserlog-create2-entry'    => 'ได้สร้างบั�ชีผู้ใช้ใหม่ชื่อ $1',
+'newuserlog-autocreate-entry' => 'ชื่อบั�ชีถู�สร้างอัตโนมัติ',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'สิทธิ�ลุ่มผู้ใช้งาน',
-'listgrouprights-summary'  => 'รายชื่อ�ลุ่มผู้ใช้ต่อไปนี้ถู��ำหนดไว้บน {{SITENAME}} โดยมีสิทธิ�ารเข้าถึงที่เ�ี่ยวข้อง �ละอาจมี[[{{MediaWiki:Listgrouprights-helppage}}|ข้อมูลเพิ่มเติม]]เ�ี่ยว�ับสิทธิของ�ต่ละบุคคล',
-'listgrouprights-group'    => '�ลุ่ม',
-'listgrouprights-rights'   => 'สิทธิ',
-'listgrouprights-helppage' => 'Help:สิทธิของ�ลุ่ม',
-'listgrouprights-members'  => '(รายชื่อสมาชิ�)',
+'listgrouprights'                 => 'สิทธิ�ลุ่มผู้ใช้งาน',
+'listgrouprights-summary'         => 'รายชื่อ�ลุ่มผู้ใช้ต่อไปนี้ถู��ำหนดไว้บน {{SITENAME}} โดยมีสิทธิ�ารเข้าถึงที่เ�ี่ยวข้อง �ละอาจมี[[{{MediaWiki:Listgrouprights-helppage}}|ข้อมูลเพิ่มเติม]]เ�ี่ยว�ับสิทธิของ�ต่ละบุคคล',
+'listgrouprights-group'           => '�ลุ่ม',
+'listgrouprights-rights'          => 'สิทธิ',
+'listgrouprights-helppage'        => 'Help:สิทธิของ�ลุ่ม',
+'listgrouprights-members'         => '(รายชื่อสมาชิ�)',
+'listgrouprights-addgroup'        => 'สามารถเพิ่ม{{PLURAL:$2|�ลุ่มนี้|�ลุ่มเหล่านี้}}ได้: $1',
+'listgrouprights-removegroup'     => 'สามารถลบ{{PLURAL:$2|�ลุ่มนี้|�ลุ่มเหล่านี้}}ได้: $1',
+'listgrouprights-addgroup-all'    => 'สามารถเพิ่ม�ลุ่มทั้งหมดได้',
+'listgrouprights-removegroup-all' => 'สามารถลบ�ลุ่มทั้งหมดได้',
 
 # E-mail user
-'mailnologin'     => 'ไม่มี�ารส่งอีเมล',
-'mailnologintext' => 'ต้อง�ารทำ[[Special:UserLogin|ล็อ�อิน]]�ละตั้งค่าอีเมลในส่วน[[Special:Preferences|�ารตั้งค่า]] เพื่อจะส่งอีเมลหาผู้ใช้คนอื่น',
-'emailuser'       => 'ส่งอีเมลหาผู้ใช้นี้',
-'emailpage'       => 'อีเมลผู้ใช้',
-'emailpagetext'   => 'คุณสามารถใช้�บบฟอร์มด้านล่างส่งอีเมลหาผู้ใช้คนนี้
+'mailnologin'      => 'ไม่มี�ารส่งอีเมล',
+'mailnologintext'  => 'ต้อง�ารทำ[[Special:UserLogin|ล็อ�อิน]]�ละตั้งค่าอีเมลในส่วน[[Special:Preferences|�ารตั้งค่า]] เพื่อจะส่งอีเมลหาผู้ใช้คนอื่น',
+'emailuser'        => 'ส่งอีเมลหาผู้ใช้นี้',
+'emailpage'        => 'อีเมลผู้ใช้',
+'emailpagetext'    => 'คุณสามารถใช้�บบฟอร์มด้านล่างส่งอีเมลหาผู้ใช้คนนี้
 ชื่ออีเมลผู้ส่งจะใช้ชื่ออีเมลที่ได้ระบุไว้�ล้วใน[[Special:Preferences|�ารตั้งค่าส่วนตัวของคุณ]] ซึ่งผู้รับสามารถตอบ�ลับได้',
-'usermailererror' => '�ารส่งอีเมลผิดพลาด:',
-'defemailsubject' => '{{SITENAME}} อีเมล',
-'noemailtitle'    => 'ไม่ได้ตั้งอีเมล',
-'noemailtext'     => 'ผู้ใช้นี้ไม่ได้ตั้งค่าอีเมล หรือเลือ�ที่จะไม่รับอีเมลจา�ผู้อื่น',
-'emailfrom'       => 'จา�:',
-'emailto'         => 'ถึง:',
-'emailsubject'    => 'หัวเรื่อง:',
-'emailmessage'    => 'ข้อความ:',
-'emailsend'       => 'ส่ง',
-'emailccme'       => 'ส่งอีเมลสำเนา�ลับมา',
-'emailccsubject'  => 'ส่งข้อความซ้ำไปที่$1: $2',
-'emailsent'       => 'อีเมลได้ถู�ส่งเรียบร้อย',
-'emailsenttext'   => 'อีเมลได้ถู�ส่งเรียบร้อย',
-'emailuserfooter' => 'อีเมลฉบับนี้ถู�ส่งโดย $1 ถึง $2 ด้วยฟัง�์ชัน "อีเมลผู้ใช้รายนี้" ที่ {{SITENAME}}',
+'usermailererror'  => '�ารส่งอีเมลผิดพลาด:',
+'defemailsubject'  => '{{SITENAME}} อีเมล',
+'noemailtitle'     => 'ไม่ได้ตั้งอีเมล',
+'noemailtext'      => 'ผู้ใช้คนนี้ไม่ได้ตั้งค่าอีเมล',
+'nowikiemailtitle' => 'ไม่อนุ�าตให้ใช้อีเมล',
+'email-legend'     => 'ส่งอีเมลถึงผู้ใช้อื่นใน {{SITENAME}}',
+'emailfrom'        => 'จา�:',
+'emailto'          => 'ถึง:',
+'emailsubject'     => 'หัวเรื่อง:',
+'emailmessage'     => 'ข้อความ:',
+'emailsend'        => 'ส่ง',
+'emailccme'        => 'ส่งอีเมลสำเนา�ลับมา',
+'emailccsubject'   => 'ส่งข้อความซ้ำไปที่$1: $2',
+'emailsent'        => 'อีเมลได้ถู�ส่งเรียบร้อย',
+'emailsenttext'    => 'อีเมลได้ถู�ส่งเรียบร้อย',
+'emailuserfooter'  => 'อีเมลฉบับนี้ถู�ส่งโดย $1 ถึง $2 ด้วยฟัง�์ชัน "อีเมลผู้ใช้รายนี้" ที่ {{SITENAME}}',
 
 # Watchlist
 'watchlist'            => 'ราย�ารเ�้าดู',
@@ -1450,12 +1649,7 @@ $1 เป็นผู้ดำเนินà¸�ารบล็อà¸�ในครà¸
 'iteminvalidname'      => "เ�ิดปั�หาชื่อไม่ถู�ต้อง�ับ '$1'...",
 'wlnote'               => 'ด้านล่างเป็น�าร��้ไข $1 ราย�าร ในช่วง $2 ชั่วโมงที่ผ่านมา',
 'wlshowlast'           => '�สดงล่าสุดใน $1 ชั่วโมง $2 วัน $3',
-'watchlist-show-bots'  => '�สดง�าร��้ไขของบอต',
-'watchlist-hide-bots'  => 'ซ่อน�าร��้ไขของบอต',
-'watchlist-show-own'   => '�สดง�าร��้ไขของฉัน',
-'watchlist-hide-own'   => 'ซ่อน�าร��้ไขของฉัน',
-'watchlist-show-minor' => '�สดง�าร��้ไขเล็�น้อย',
-'watchlist-hide-minor' => 'ซ่อน�าร��้ไขเล็�น้อย',
+'watchlist-options'    => 'ตัวเลือ�ราย�ารเ�้าดู',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'เ�้าดู...',
@@ -1496,76 +1690,88 @@ $NEWPAGE
 ถ้าต้อง�ารความช่วยเหลือเพิ่มเติม ให้เข้าที่:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'ลบหน้า',
-'confirm'                     => 'ยืนยัน',
-'excontent'                   => "เนื้อหาเดิม: '$1'",
-'excontentauthor'             => "เนื้อหาเดิม: '$1' (�ละมีผู้เขียนคนเดียว คือ '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "เนื้อหาเดิม�่อนหน้าถู�ทำให้ว่าง: '$1'",
-'exblank'                     => 'หน้าว่าง',
-'delete-confirm'              => 'ลบ "$1"',
-'delete-legend'               => 'ลบ',
-'historywarning'              => 'คำเตือน: ดูประวัติ�่อนหน้า:',
-'confirmdeletetext'           => 'คุณ�ำลังจะลบหน้าหรือภาพนี้ รวมไปถึงประวัติหน้าออ�จา�ระบบ
+# Delete
+'deletepage'             => 'ลบหน้า',
+'confirm'                => 'ยืนยัน',
+'excontent'              => "เนื้อหาเดิม: '$1'",
+'excontentauthor'        => "เนื้อหาเดิม: '$1' (�ละมีผู้เขียนคนเดียว คือ '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "เนื้อหาเดิม�่อนหน้าถู�ทำให้ว่าง: '$1'",
+'exblank'                => 'หน้าว่าง',
+'delete-confirm'         => 'ลบ "$1"',
+'delete-legend'          => 'ลบ',
+'historywarning'         => 'คำเตือน: ดูประวัติ�่อนหน้า:',
+'confirmdeletetext'      => 'คุณ�ำลังจะลบหน้าหรือภาพนี้ รวมไปถึงประวัติหน้าออ�จา�ระบบ
 �รุณายืนยันว่าต้อง�ารดำเนิน�ารต่อ�ละ�น่ใจว่าได้เข้าใจ�ละ�ารลบครั้งนี้สอดคล้อง�ับ[[{{MediaWiki:Policy-url}}]]',
-'actioncomplete'              => 'จัด�ารสำเร็จ',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" ถู�ลบ
+'actioncomplete'         => 'จัด�ารสำเร็จ',
+'deletedtext'            => '"<nowiki>$1</nowiki>" ถู�ลบ
 ดู $2 สำหรับบันทึ��ารลบล่าสุด',
-'deletedarticle'              => '"[[$1]]" ถู�ลบ',
-'suppressedarticle'           => '"[[$1]]" ระงับ�ล้ว',
-'dellogpage'                  => 'บันทึ��ารลบ',
-'dellogpagetext'              => 'ด้านล่างเป็นราย�ารของ�ารลบล่าสุด',
-'deletionlog'                 => 'บันทึ��ารลบ',
-'reverted'                    => 'ย้อนไปรุ่น�่อนหน้า',
-'deletecomment'               => 'สาเหตุใน�ารลบ',
-'deleteotherreason'           => 'เหตุผลอื่นเพิ่มเติม:',
-'deletereasonotherlist'       => 'เหตุผลอื่น',
-'deletereason-dropdown'       => '* เหตุผลทั่วไปของ�ารลบ
+'deletedarticle'         => '"[[$1]]" ถู�ลบ',
+'suppressedarticle'      => '"[[$1]]" ระงับ�ล้ว',
+'dellogpage'             => 'บันทึ��ารลบ',
+'dellogpagetext'         => 'ด้านล่างเป็นราย�ารของ�ารลบล่าสุด',
+'deletionlog'            => 'บันทึ��ารลบ',
+'reverted'               => 'ย้อนไปรุ่น�่อนหน้า',
+'deletecomment'          => 'สาเหตุใน�ารลบ',
+'deleteotherreason'      => 'เหตุผลอื่นเพิ่มเติม:',
+'deletereasonotherlist'  => 'เหตุผลอื่น',
+'deletereason-dropdown'  => '* เหตุผลทั่วไปของ�ารลบ
 ** รับ�จ้งจา�ผู้เขียน
 ** ละเมิดลิขสิทธิ์
 ** �่อ�วน',
-'delete-edit-reasonlist'      => '��้ไขรายชื่อเหตุผลใน�ารลบ',
-'delete-toobig'               => 'หน้านี้มีประวัติ�าร��้ไขมา�เ�ิน�ว่า $1 {{PLURAL:$1|รุ่น|รุ่น}} ซึ่งถือว่าเยอะมา� เพื่อป้อง�ันไม่ให้ {{SITENAME}} ได้รับความเสียหายอย่างที่ไม่เคยคาดคิดมา�่อน จึงไม่อนุ�าตให้ลบหน้านี้',
-'delete-warning-toobig'       => 'หน้านี้มีประวัติ�าร��้ไขมา�เ�ิน�ว่า $1 {{PLURAL:$1|รุ่น|รุ่น}} ซึ่งถือว่าเยอะมา� �ารลบหน้านี้อาจทำให้ {{SITENAME}} ได้รับความเสียหายอย่างที่ไม่เคยคาดคิดมา�่อน จึงได้เตือนไว้ �่อนที่จะ�ระทำสิ่งนี้',
-'rollback'                    => 'ย้อน�าร��้ไข',
-'rollback_short'              => 'ย้อน',
-'rollbacklink'                => 'ย้อน',
-'rollbackfailed'              => 'ย้อนไม่สำเร็จ',
-'cantrollback'                => 'ไม่สามารถย้อน�าร��้ไขได้ �่อนหน้านี้ไม่มีผู้��้ไขรายอื่น',
-'alreadyrolled'               => 'ไม่สามารถย้อน�าร��้ไข [[:$1]]
-��้โดย [[User:$2|$2]] ([[User talk:$2|พูดคุย]]) มีใครบางคนได้��้ไขหรือย้อนไป�่อนหน้า
-
-�าร��้ไขล่าสุดจัดทำโดย [[User:$3|$3]] ([[User talk:$3|พูดคุย]])',
-'editcomment'                 => 'ความเห็นโดย: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'ย้อน�าร��้ไขของ [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) ไปยังรุ่นของ [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'ย้อน�าร��้ไขของ $1 ไปยังรุ่นของ $2',
-'sessionfailure'              => 'ท่าทางจะมีปั�หาเ�ี่ยว�ารล็อ�อินในช่วงเวลานี้ เ�ิดจา�ทางระบบป้อง�ัน�ารลั�ลอบ�ารขโมยล็อ�อิน �รุณาย้อน�ลับไปหน้า�่อนหน้า �ละลองโหลดใหม่อี�ครั้ง',
+'delete-edit-reasonlist' => '��้ไขรายชื่อเหตุผลใน�ารลบ',
+'delete-toobig'          => 'หน้านี้มีประวัติ�าร��้ไขมา�เ�ิน�ว่า $1 {{PLURAL:$1|รุ่น|รุ่น}} ซึ่งถือว่าเยอะมา� เพื่อป้อง�ันไม่ให้ {{SITENAME}} ได้รับความเสียหายอย่างที่ไม่เคยคาดคิดมา�่อน จึงไม่อนุ�าตให้ลบหน้านี้',
+'delete-warning-toobig'  => 'หน้านี้มีประวัติ�าร��้ไขมา�เ�ิน�ว่า $1 {{PLURAL:$1|รุ่น|รุ่น}} ซึ่งถือว่าเยอะมา� �ารลบหน้านี้อาจทำให้ {{SITENAME}} ได้รับความเสียหายอย่างที่ไม่เคยคาดคิดมา�่อน จึงได้เตือนไว้ �่อนที่จะ�ระทำสิ่งนี้',
+
+# Rollback
+'rollback'         => 'ถอย�าร��้ไข�ลับฉุ�เฉิน',
+'rollback_short'   => 'ถอย�ลับฉุ�เฉิน',
+'rollbacklink'     => 'ถอย�ลับฉุ�เฉิน',
+'rollbackfailed'   => 'ย้อนไม่สำเร็จ',
+'cantrollback'     => 'ไม่สามารถย้อน�าร��้ไขได้ เนื่องจา�หน้านี้ไม่มีผู้��้ไขรายอื่นอี�',
+'alreadyrolled'    => 'ไม่สามารถย้อนรุ่นล่าสุด
+ที่��้โดย [[User:$2|$2]] ([[User talk:$2|พูดคุย]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) ของหน้า [[:$1]] มีใครบางคนได้��้ไขหรือย้อนหน้านี้ไป�่อน�ล้ว
+
+ผู้��้ไขล่าสุดของหน้านี้คือ [[User:$3|$3]] ([[User talk:$3|พูดคุย]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]])',
+'editcomment'      => "สรุป�าร��้ไข: \"''\$1''\"", # only shown if there is an edit comment
+'revertpage'       => 'ย้อน�าร��้ไขของ [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) ไปยังรุ่นของ [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'ย้อนรุ่นที่��้ไขโดย $1 ไปยังรุ่นล่าสุดที่��้ไขโดย $2 �ล้ว',
+'sessionfailure'   => 'ท่าทางจะมีปั�หาเ�ี่ยว�ารล็อ�อินในช่วงเวลานี้ เ�ิดจา�ทางระบบป้อง�ัน�ารลั�ลอบ�ารขโมยล็อ�อิน �รุณาย้อน�ลับไปหน้า�่อนหน้า �ละลองโหลดใหม่อี�ครั้ง',
+
+# Protect
 'protectlogpage'              => 'บันทึ��ารล็อ�',
 'protectlogtext'              => 'ราย�ารด้านล่าง�สดง�ารล็อ�หน้า�ละ�ารปลดล็อ� สำหรับหน้าที่โดนล็อ�ในปัจจุบันดูที่ [[Special:ProtectedPages|ราย�ารหน้าที่ถู�ล็อ�]]',
 'protectedarticle'            => '"[[$1]]" ถู�ล็อ�',
 'modifiedarticleprotection'   => 'เปลี่ยนระดับ�ารล็อ�สำหรับ "[[$1]]"',
 'unprotectedarticle'          => '"[[$1]]" ถู�ปลดล็อ�',
 'protect-title'               => '�ำลังล็อ�หน้า "$1"',
+'prot_1movedto2'              => '[[$1]] ถู�เปลี่ยนชื่อเป็น [[$2]]',
 'protect-legend'              => 'ยืนยัน�ารล็อ�',
 'protectcomment'              => 'ความเห็น:',
 'protectexpiry'               => 'หมดอายุ:',
 'protect_expiry_invalid'      => 'เวลาหมดอายุไม่ถู�ต้อง',
 'protect_expiry_old'          => 'เวลาหมดอายุผ่านมา�ล้ว',
 'protect-unchain'             => 'ล็อ��ารเปลี่ยนชื่อ',
-'protect-text'                => 'ดู�ละเปลี่ยนระดับ�ารล็อ�สำหรับหน้า <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'ไม่สามารถเปลี่ยนระดับ�ารล็อ�หน้าขณะที่ถู�บล็อ�ได้ ดูระดับ�ารล็อ�ของหน้า <strong>$1</strong>:',
-'protect-locked-dblock'       => 'ไม่สามารถเปลี่ยนระดับ�ารล็อ�หน้าได้เนื่องจา��านข้อมูลถู�ล็อ� ดูระดับ�ารล็อ�ของหน้า <strong>$1</strong>:',
-'protect-locked-access'       => 'คุณไม่สามารถเปลี่ยนระดับ�ารล็อ�หน้าได้ เนื่องจา�คุณไม่มีสิทธิ  ดูระดับ�ารล็อ�ของหน้า <strong>$1</strong>:',
+'protect-text'                => "ดู�ละเปลี่ยนระดับ�ารล็อ�สำหรับหน้า '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "ไม่สามารถเปลี่ยนระดับ�ารล็อ�หน้าขณะที่ถู�บล็อ�ได้ ดูระดับ�ารล็อ�ของหน้า '''$1''':",
+'protect-locked-dblock'       => "ไม่สามารถเปลี่ยนระดับ�ารล็อ�หน้าได้เนื่องจา��านข้อมูลถู�ล็อ� ดูระดับ�ารล็อ�ของหน้า '''$1''':",
+'protect-locked-access'       => "คุณไม่สามารถเปลี่ยนระดับ�ารล็อ�หน้าได้ เนื่องจา�คุณไม่มีสิทธิ  ดูระดับ�ารล็อ�ของหน้า '''$1''':",
 'protect-cascadeon'           => 'หน้านี้ถู�ล็อ�เนื่องจา�เป็นส่วนหนึ่งของ{{PLURAL:$1|หน้า|หน้า}}ที่ถู�ล็อ��บบสืบทอด
 คุณสามารถเปลี่ยนระดับ�ารล็อ�ได้ �ต่จะไม่มีผลต่อ�ารล็อ��บบสืบทอด',
-'protect-default'             => 'ใช้ป�ติ (ไม่บล็อ�)',
+'protect-default'             => 'อนุ�าตให้ใช้งานสำหรับผู้ใช้ทั้งหมด',
 'protect-fallback'            => 'จำเป็นต้องใช้สิทธิใน�าร "$1"',
-'protect-level-autoconfirmed' => 'บล็อ�ผู้ใช้ไม่ลงทะเบียน',
+'protect-level-autoconfirmed' => 'บล็อ�ผู้ใช้ใหม่�ละผู้ใช้ไม่ลงทะเบียน',
 'protect-level-sysop'         => 'ผู้ดู�ลระบบ��้ไขเท่านั้น',
 'protect-summary-cascade'     => 'สืบทอด',
 'protect-expiring'            => 'หมดอายุ $1 (UTC)',
+'protect-expiry-indefinite'   => 'ตลอด�าล',
 'protect-cascade'             => 'ล็อ�หน้าที่เป็นส่วนหนึ่งของหน้านี้ (ล็อ��บบสืบทอด)',
 'protect-cantedit'            => 'คุณไม่สามารถเปลี่ยนระดับ�ารป้อง�ันของหน้านี้ เนื่องจา�คุณไม่ได้รับสิทธิใน�าร��้ไขสิ่งนั้น',
+'protect-othertime'           => 'ระยะเวลาอื่น:',
+'protect-othertime-op'        => 'ระยะเวลาอื่น',
+'protect-otherreason'         => 'เหตุผลอื่นเพิ่มเติม:',
+'protect-otherreason-op'      => 'เหตุผลอื่นเพิ่มเติม',
+'protect-edit-reasonlist'     => 'สาเหตุ�ารป้อง�ัน�าร��้ไข',
+'protect-expiry-options'      => '1 ชั่วโมง:1 hour,2 ชั่วโมง:2 hours,6 ชั่วโมง:6 hours,1 วัน:1 day,3 วัน:3 days,1 อาทิตย์:1 week,2 อาทิตย์:2 weeks,1 เดือน:1 month,3 เดือน:3 months,1 ปี:1 year,ตลอดไป:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'อนุ�าต',
 'restriction-level'           => 'ระดับ�ารล็อ�',
 'minimum-size'                => 'ขนาดอย่างน้อย',
@@ -1597,12 +1803,13 @@ $NEWPAGE
 'undeletehistory'              => 'เมื่อคุณเรีย�คืนหน้าใดหน้าหนึ่ง รุ่น�าร��้ไขทั้งหมดจะถู�เรีย�คืนไปยังประวัติ หา�มีหน้าใหม่ในชื่อเดียว�ันถู�สร้างขึ้นหลังจา��ารลบ รุ่นที่เรีย�คืนจะปรา��ในช่วงประวัติที่มีมา�่อน',
 'undeleterevdel'               => 'จะเรีย�คืนไม่ได้ถ้ารุ่นในส่วนที่ใหม่ถู�ลบไปบางส่วน ถ้าเ�ิดขึ้นใน�รณีนี้ ต้อง�ด�สดงในส่วนใหม่�่อน',
 'undeletehistorynoadmin'       => 'หน้านี้ถู�ลบ�่อนหน้านี้ โดยสาเหตุ�ารลบ�ละรายชื่อผู้ร่วม��้ไข�่อนหน้า�สดงผลด้านล่าง สำหรับข้อมูลที่ถู�ลบจะดูได้เฉพาะผู้ดู�ลระบบ',
-'undelete-revision'            => 'รุ่นที่ถู�ลบของหน้า $1 (ปรับปรุงเมื่อ $2) โดย $3:',
+'undelete-revision'            => 'รุ่นที่ถู�ลบของหน้า $1 (ตั้ง�ต่ $4 เมื่อ $5) โดย $3:',
 'undeleterevision-missing'     => 'รุ่นที่ต้อง�ารดูไม่มี ข้อมูลอาจจะโดนลบ',
 'undelete-nodiff'              => 'ไม่พบรุ่น�่อนหน้า',
 'undeletebtn'                  => 'เรีย�คืน',
 'undeletelink'                 => 'เรีย�คืน',
 'undeletereset'                => 'ตั้งค่าใหม่',
+'undeleteinvert'               => '�ลับ�ารเลือ�',
 'undeletecomment'              => 'ความเห็น:',
 'undeletedarticle'             => 'เรีย�คืน "[[$1]]"',
 'undeletedrevisions'           => '$1 รุ่น�าร��้ไขถู�เรีย�คืน',
@@ -1633,26 +1840,27 @@ $1',
 'blanknamespace' => '(หลั�)',
 
 # Contributions
-'contributions' => 'เรื่องที่เขียนโดยผู้ใช้นี้',
-'mycontris'     => 'เรื่องที่เขียน',
-'contribsub2'   => 'สำหรับ $1 ($2)',
-'nocontribs'    => 'ไม่มี�ารเปลี่ยน�ปลงตามเงื่อนไขที่ใส่มา',
-'uctop'         => ' (บนสุด)',
-'month'         => 'จา�เดือน (�ละ�่อนหน้า):',
-'year'          => 'จา�ปี (�ละ�่อนหน้า):',
-
-'sp-contributions-newbies'     => '�สดง�าร��้ไขของผู้ใช้ใหม่เท่านั้น',
-'sp-contributions-newbies-sub' => 'สำหรับผู้ใช้ใหม่',
-'sp-contributions-blocklog'    => 'บันทึ��ารบล็อ�',
-'sp-contributions-search'      => 'ค้นหา�าร��้ไข',
-'sp-contributions-username'    => 'หมายเลขไอพีหรือชื่อผู้ใช้:',
-'sp-contributions-submit'      => 'ค้นหา',
+'contributions'       => 'เรื่องที่เขียนโดยผู้ใช้นี้',
+'contributions-title' => 'เรื่องที่เขียนโดย $1',
+'mycontris'           => 'เรื่องที่เขียน',
+'contribsub2'         => 'สำหรับ $1 ($2)',
+'nocontribs'          => 'ไม่มี�ารเปลี่ยน�ปลงตามเงื่อนไขที่ใส่มา',
+'uctop'               => ' (บนสุด)',
+'month'               => 'จา�เดือน (�ละ�่อนหน้า):',
+'year'                => 'จา�ปี (�ละ�่อนหน้า):',
+
+'sp-contributions-newbies'       => '�สดง�าร��้ไขของผู้ใช้ใหม่เท่านั้น',
+'sp-contributions-newbies-sub'   => 'สำหรับผู้ใช้ใหม่',
+'sp-contributions-newbies-title' => 'เรื่องที่เขียนโดยบั�ชีผู้ใช้ใหม่',
+'sp-contributions-blocklog'      => 'บันทึ��ารบล็อ�',
+'sp-contributions-search'        => 'ค้นหา�าร��้ไข',
+'sp-contributions-username'      => 'หมายเลขไอพีหรือชื่อผู้ใช้:',
+'sp-contributions-submit'        => 'ค้นหา',
 
 # What links here
 'whatlinkshere'            => 'หน้าที่ลิง�์มา',
 'whatlinkshere-title'      => 'หน้าที่โยงมาที่ "$1"',
 'whatlinkshere-page'       => 'หน้า:',
-'linklistsub'              => '(หน้าที่ลิง�์มา)',
 'linkshere'                => "หน้าต่อไปนี้ลิง�์มาที่ '''[[:$1]]''':",
 'nolinkshere'              => "ไม่มีหน้าใดลิง�์มาที่ '''[[:$1]]'''",
 'nolinkshere-ns'           => "ไม่มีหน้าใดลิง�์มาที่'''[[:$1]]''' ในเนมสเปซที่เลือ�ไว้",
@@ -1669,16 +1877,16 @@ $1',
 'whatlinkshere-filters'    => 'ตัว�รอง',
 
 # Block/unblock
-'blockip'                     => 'บล็อ�ผู้ใช้',
-'blockip-legend'              => 'บล็อ�ผู้ใช้',
-'blockiptext'                 => 'ใช้ฟอร์มด้านล่างสำหรับ�ารบล็อ�หมายเลขไอพีหรือผู้ใช้ ซึ่ง�่อ�วนระบบ โดย�น่ใจว่าได้ทำตาม [[{{MediaWiki:Policy-url}}|นโยบาย]]
+'blockip'                      => 'บล็อ�ผู้ใช้',
+'blockip-legend'               => 'บล็อ�ผู้ใช้',
+'blockiptext'                  => 'ใช้ฟอร์มด้านล่างสำหรับ�ารบล็อ�หมายเลขไอพีหรือผู้ใช้ ซึ่ง�่อ�วนระบบ โดย�น่ใจว่าได้ทำตาม [[{{MediaWiki:Policy-url}}|นโยบาย]]
 ใส่สาเหตุด้านล่าง (ตัวอย่าง หน้าที่ถู��่อ�วน)',
-'ipaddress'                   => 'หมายเลขไอพี:',
-'ipadressorusername'          => 'หมายเลขไอพีหรือชื่อผู้ใช้',
-'ipbexpiry'                   => 'หมดอายุ',
-'ipbreason'                   => 'สาเหตุ',
-'ipbreasonotherlist'          => 'เลือ�สาเหตุ',
-'ipbreason-dropdown'          => '
+'ipaddress'                    => 'หมายเลขไอพี:',
+'ipadressorusername'           => 'หมายเลขไอพีหรือชื่อผู้ใช้',
+'ipbexpiry'                    => 'หมดอายุ',
+'ipbreason'                    => 'สาเหตุ',
+'ipbreasonotherlist'           => 'เลือ�สาเหตุ',
+'ipbreason-dropdown'           => '
 *สาเหตุ�ารบล็อ�ทั่วไป
 ** ใส่ข้อมูลเท็จ
 ** ลบเนื้อหาในหน้าออ�
@@ -1687,69 +1895,79 @@ $1',
 ** คุ�คามผู้อื่น
 ** �่อ�วนผู้อื่น
 ** ชื่อผู้ใช้ที่ไม่สุภาพหรือไม่ควรใช้',
-'ipbanononly'                 => 'บล็อ�ผู้ใช้ไม่ล็อ�อินเท่านั้น',
-'ipbcreateaccount'            => 'ป้อง�ัน�ารสร้างบั�ชีผู้ใช้',
-'ipbemailban'                 => 'ป้อง�ันผู้ใช้ส่งอีเมลผ่านระบบ',
-'ipbenableautoblock'          => 'บล็อ�หมายเลขไอพีนี้�ละไอพีที่ผู้ใช้นี้อาจจะใช้',
-'ipbsubmit'                   => 'บล็อ�ชื่อผู้ใช้',
-'ipbother'                    => 'เวลาอื่น',
-'ipboptions'                  => '1 ชั่วโมง:1 hour,2 ชั่วโมง:2 hours,6 ชั่วโมง:6 hours,1 วัน:1 day,3 วัน:3 days,1 อาทิตย์:1 week,2 อาทิตย์:2 weeks,1 เดือน:1 month,3 เดือน:3 months,1 ปี:1 year,ตลอดไป:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'เลือ�เวลา',
-'ipbotherreason'              => 'เหตุผลอื่น',
-'ipbhidename'                 => 'ซ่อน ชื่อผู้ใช้/หมายเลขไอพี จา�บันทึ��ารบล็อ� รายชื่อผู้ใช้ �ละราย�ารผู้ที่ถู�บล็อ�',
-'ipbwatchuser'                => 'เ�้าดูหน้าผู้ใช้�ละหน้าคุย�ับผู้ใช้ของผู้ใช้รายนี้',
-'badipaddress'                => 'หมายเลขไอพีไม่ถู�ต้อง',
-'blockipsuccesssub'           => 'บล็อ�เรียบร้อย',
-'blockipsuccesstext'          => '[[Special:Contributions/$1|$1]] ถู�บล็อ�
+'ipbanononly'                  => 'บล็อ�ผู้ใช้ไม่ล็อ�อินเท่านั้น',
+'ipbcreateaccount'             => 'ป้อง�ัน�ารสร้างบั�ชีผู้ใช้',
+'ipbemailban'                  => 'ป้อง�ันผู้ใช้ส่งอีเมลผ่านระบบ',
+'ipbenableautoblock'           => 'บล็อ�หมายเลขไอพีนี้�ละไอพีที่ผู้ใช้นี้อาจจะใช้',
+'ipbsubmit'                    => 'บล็อ�ชื่อผู้ใช้',
+'ipbother'                     => 'เวลาอื่น',
+'ipboptions'                   => '1 ชั่วโมง:1 hour,2 ชั่วโมง:2 hours,6 ชั่วโมง:6 hours,1 วัน:1 day,3 วัน:3 days,1 อาทิตย์:1 week,2 อาทิตย์:2 weeks,1 เดือน:1 month,3 เดือน:3 months,1 ปี:1 year,ตลอดไป:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'               => 'เลือ�เวลา',
+'ipbotherreason'               => 'เหตุผลอื่น',
+'ipbhidename'                  => 'ซ่อน ชื่อผู้ใช้/หมายเลขไอพี จา�บันทึ��ารบล็อ� รายชื่อผู้ใช้ �ละราย�ารผู้ที่ถู�บล็อ�',
+'ipbwatchuser'                 => 'เ�้าดูหน้าผู้ใช้�ละหน้าคุย�ับผู้ใช้ของผู้ใช้รายนี้',
+'badipaddress'                 => 'หมายเลขไอพีไม่ถู�ต้อง',
+'blockipsuccesssub'            => 'บล็อ�เรียบร้อย',
+'blockipsuccesstext'           => '[[Special:Contributions/$1|$1]] ถู�บล็อ�
 <br />ดู  [[Special:IPBlockList|ราย�ารไอพีที่ถู�บล็อ�]] เพื่อตรวจสอบ�ารบล็อ�',
-'ipb-edit-dropdown'           => '��้ไขสาเหตุ�ารบล็อ�',
-'ipb-unblock-addr'            => 'เลิ�บล็อ� $1',
-'ipb-unblock'                 => 'เลิ�บล็อ�ผู้ใช้หรือหมายเลขไอพี',
-'ipb-blocklist-addr'          => 'ดู�ารบล็อ�ที่มีอยู่สำหรับ $1',
-'ipb-blocklist'               => 'ดู�ารปล็อ�ปัจจุบัน',
-'unblockip'                   => 'ปลดบล็อ�ผู้ใช้',
-'unblockiptext'               => 'ใช้�บบฟอร์มด้านล่างสำหรับบล็อ�หรือเลิ�บล็อ�หมายเลขไอพี หรือผู้ใช้',
-'ipusubmit'                   => 'บล็อ�',
-'unblocked'                   => '[[User:$1|$1]] ถู�บล็อ�',
-'unblocked-id'                => 'เลิ�บล็อ� $1',
-'ipblocklist'                 => 'หมายเลขไอพี�ละผู้ใช้ที่ถู�บล็อ�',
-'ipblocklist-legend'          => 'ค้นหาผู้ใช้ที่ถู�ระงับ�ารใช้งาน',
-'ipblocklist-username'        => 'ชื่อผู้ใช้หรือหมายเลขไอพี:',
-'ipblocklist-submit'          => 'ค้นหา',
-'blocklistline'               => '$1, $2 บล็อ� $3 ($4)',
-'infiniteblock'               => 'ตลอดไป',
-'expiringblock'               => 'หมดอายุ $1',
-'anononlyblock'               => 'ไม่ล็อ�อินเท่านั้น',
-'noautoblockblock'            => 'ย�เลิ��ารบล็อ�อัตโนมัติ',
-'createaccountblock'          => 'บล็อ��ารสร้างบั�ชีผู้ใช้ใหม่',
-'emailblock'                  => 'บล็อ��ารส่งอีเมล',
-'ipblocklist-empty'           => 'ราย�ารบล็อ�ว่าง',
-'ipblocklist-no-results'      => 'หมายเลขไอพีหรือชื่อผู้ใช้ที่ต้อง�ารไม่ได้ถู�บล็อ�',
-'blocklink'                   => 'บล็อ�',
-'unblocklink'                 => 'เลิ�บล็อ�',
-'contribslink'                => 'เรื่องที่เขียน',
-'autoblocker'                 => 'ถู�บล็อ�อัตโนมัติเนื่องจา�หมายเลขไอพีของคุณตรง�ับ "[[User:$1|$1]]" ถู�บล็อ��ล่อนหน้านี้เนื่องจา�สาเหตุ: "$2"',
-'blocklogpage'                => 'บันทึ��ารบล็อ�',
-'blocklogentry'               => 'บล็อ� "[[$1]]" หมดอายุ $2 $3',
-'blocklogtext'                => 'ด้านล่างเป็นบันทึ��ารบล็อ��ละ�ารเลิ�บล็อ�  ส่วน�ารบล็อ�อัตโนมัติจะไม่ถู�รวมอยู่ในราย�ารนี้ ดู [[Special:IPBlockList|ราย�ารบล็อ�ไอพี]] สำหรับ�ารบล็อ�ทั้งหมด',
-'unblocklogentry'             => 'เลิ�บล็อ� $1',
-'block-log-flags-anononly'    => 'ผู้ใช้ไม่ล็อ�อินเท่านั้น',
-'block-log-flags-nocreate'    => 'ห้ามสร้างบั�ชีผู้ใช้',
-'block-log-flags-noautoblock' => 'ย�เลิ��ารบล็อ�อัตโนมัติ',
-'block-log-flags-noemail'     => 'บล็อ��ารส่งอีเมล',
-'range_block_disabled'        => 'ย�เลิ��ารบล็อ�ช่วงไอพีของผู้ดู�ลระบบ',
-'ipb_expiry_invalid'          => 'ค่าวันหมดอายุไม่ถู�ต้อง',
-'ipb_already_blocked'         => '"$1" ถู�บล็อ��ล้ว�่อนหน้านี้',
-'ipb_cant_unblock'            => 'ปั�หา: หมายเลขบล็อ� $1 ไม่พบ อาจเ�ิดจา�ได้ถู�ย�เลิ��ารบล็อ��ล้ว',
-'ipb_blocked_as_range'        => 'มีข้อผิดพลาด: หมายเลขไอพี $1 ไม่ได้ถู�ระงับโดยตรง�ละไม่สามารถย�เลิ��ารระงับโดยตรงได้.  อย่างไร�็ตาม ไอพีนี้ถู�ระงับใน�านะที่เป็นส่วนหนึ่งของหมายเลขไอพีในช่วง $2 ซึ่งสามารถย�เลิ��ารระงับได้',
-'ip_range_invalid'            => 'ช่วงไอพีไม่ถู�ต้อง',
-'blockme'                     => 'บล็อ�ฉัน',
-'proxyblocker'                => 'บล็อ�พร็อ�ซี',
-'proxyblocker-disabled'       => 'ฟัง�์ชั่นนี้ไม่สามารถใช้ได้',
-'proxyblockreason'            => 'หมายเลขไอพีของคุณถู�บล็อ�เนื่องจา�เป็นพร็อ�ซีเปิด �รุณาติดต่อผู้ให้บริ�ารอินเทอร์เน็ตที่คุณใช้งานอยู่เ�ี่ยว�ับปั�หานี้',
-'proxyblocksuccess'           => 'บล็อ�สำเร็จ',
-'sorbsreason'                 => 'หมายเลขไอพีของคุณอยู่ในพร็อ�ซีเปิดในส่วน DNSBL ที่ถู�ใช้งานในเว็บไซต์',
-'sorbs_create_account_reason' => 'หมายเลขไอพีของคุณอยู่ในพร็อ�ซีเปิดในส่วน DNSBL ที่ถู�ใช้งานในเว็บไซต์ ดังนั้นคุณไม่สามารถสร้างชื่อบั�ชีผู้ใช้ได้',
+'ipb-edit-dropdown'            => '��้ไขสาเหตุ�ารบล็อ�',
+'ipb-unblock-addr'             => 'เลิ�บล็อ� $1',
+'ipb-unblock'                  => 'เลิ�บล็อ�ผู้ใช้หรือหมายเลขไอพี',
+'ipb-blocklist-addr'           => 'ดู�ารบล็อ�ที่มีอยู่สำหรับ $1',
+'ipb-blocklist'                => 'ดู�ารปล็อ�ปัจจุบัน',
+'ipb-blocklist-contribs'       => 'ผลงานที่สร้างสรรค์โดย $1',
+'unblockip'                    => 'ปลดบล็อ�ผู้ใช้',
+'unblockiptext'                => 'ใช้�บบฟอร์มด้านล่างสำหรับบล็อ�หรือเลิ�บล็อ�หมายเลขไอพี หรือผู้ใช้',
+'ipusubmit'                    => 'ย�เลิ��ารบล็อ�นี้',
+'unblocked'                    => '[[User:$1|$1]] ถู�บล็อ�',
+'unblocked-id'                 => 'เลิ�บล็อ� $1',
+'ipblocklist'                  => 'หมายเลขไอพี�ละผู้ใช้ที่ถู�บล็อ�',
+'ipblocklist-legend'           => 'ค้นหาผู้ใช้ที่ถู�ระงับ�ารใช้งาน',
+'ipblocklist-username'         => 'ชื่อผู้ใช้หรือหมายเลขไอพี:',
+'ipblocklist-sh-userblocks'    => '$1 �ารบล็อ�ชื่อบั�ชี',
+'ipblocklist-sh-tempblocks'    => '$1 �ารบล็อ�ชั่วคราว',
+'ipblocklist-sh-addressblocks' => '$1 �ารบล็อ�ของไอพีเดี่ยว',
+'ipblocklist-submit'           => 'ค้นหา',
+'blocklistline'                => '$1, $2 บล็อ� $3 ($4)',
+'infiniteblock'                => 'ตลอดไป',
+'expiringblock'                => 'หมดอายุ $1',
+'anononlyblock'                => 'ไม่ล็อ�อินเท่านั้น',
+'noautoblockblock'             => 'ย�เลิ��ารบล็อ�อัตโนมัติ',
+'createaccountblock'           => 'บล็อ��ารสร้างบั�ชีผู้ใช้ใหม่',
+'emailblock'                   => 'บล็อ��ารส่งอีเมล',
+'blocklist-nousertalk'         => 'ไม่สามารถ��้ไขหน้าอภิปรายของตนเอง',
+'ipblocklist-empty'            => 'ราย�ารบล็อ�ว่าง',
+'ipblocklist-no-results'       => 'หมายเลขไอพีหรือชื่อผู้ใช้ที่ต้อง�ารไม่ได้ถู�บล็อ�',
+'blocklink'                    => 'บล็อ�',
+'unblocklink'                  => 'เลิ�บล็อ�',
+'change-blocklink'             => 'เปลี่ยน�ารบล็อ�',
+'contribslink'                 => 'เรื่องที่เขียน',
+'autoblocker'                  => 'ถู�บล็อ�อัตโนมัติเนื่องจา�หมายเลขไอพีของคุณตรง�ับ "[[User:$1|$1]]" ถู�บล็อ��ล่อนหน้านี้เนื่องจา�สาเหตุ: "$2"',
+'blocklogpage'                 => 'บันทึ��ารบล็อ�',
+'blocklog-fulllog'             => 'บันทึ��ารบล็อ�ทั้งหมด',
+'blocklogentry'                => 'บล็อ� "[[$1]]" หมดอายุ $2 $3',
+'blocklogtext'                 => 'ด้านล่างเป็นบันทึ��ารบล็อ��ละ�ารเลิ�บล็อ�  ส่วน�ารบล็อ�อัตโนมัติจะไม่ถู�รวมอยู่ในราย�ารนี้ ดู [[Special:IPBlockList|ราย�ารบล็อ�ไอพี]] สำหรับ�ารบล็อ�ทั้งหมด',
+'unblocklogentry'              => 'เลิ�บล็อ� $1',
+'block-log-flags-anononly'     => 'ผู้ใช้ไม่ล็อ�อินเท่านั้น',
+'block-log-flags-nocreate'     => 'ห้ามสร้างบั�ชีผู้ใช้',
+'block-log-flags-noautoblock'  => 'ย�เลิ��ารบล็อ�อัตโนมัติ',
+'block-log-flags-noemail'      => 'บล็อ��ารส่งอีเมล',
+'block-log-flags-nousertalk'   => 'ไม่สามารถ��้ไขหน้าอภิปรายของตนเอง',
+'range_block_disabled'         => 'ย�เลิ��ารบล็อ�ช่วงไอพีของผู้ดู�ลระบบ',
+'ipb_expiry_invalid'           => 'ค่าวันหมดอายุไม่ถู�ต้อง',
+'ipb_already_blocked'          => '"$1" ถู�บล็อ��ล้ว�่อนหน้านี้',
+'ipb-needreblock'              => '== ถู�บล็อ��ล้ว ==
+$1 ถู�บล็อ��ล้ว คุณต้อง�าร��้ไขหรือไม่',
+'ipb_cant_unblock'             => 'ปั�หา: หมายเลขบล็อ� $1 ไม่พบ อาจเ�ิดจา�ได้ถู�ย�เลิ��ารบล็อ��ล้ว',
+'ipb_blocked_as_range'         => 'มีข้อผิดพลาด: หมายเลขไอพี $1 ไม่ได้ถู�ระงับโดยตรง�ละไม่สามารถย�เลิ��ารระงับโดยตรงได้.  อย่างไร�็ตาม ไอพีนี้ถู�ระงับใน�านะที่เป็นส่วนหนึ่งของหมายเลขไอพีในช่วง $2 ซึ่งสามารถย�เลิ��ารระงับได้',
+'ip_range_invalid'             => 'ช่วงไอพีไม่ถู�ต้อง',
+'blockme'                      => 'บล็อ�ฉัน',
+'proxyblocker'                 => 'บล็อ�พร็อ�ซี',
+'proxyblocker-disabled'        => 'ฟัง�์ชั่นนี้ไม่สามารถใช้ได้',
+'proxyblockreason'             => 'หมายเลขไอพีของคุณถู�บล็อ�เนื่องจา�เป็นพร็อ�ซีเปิด �รุณาติดต่อผู้ให้บริ�ารอินเทอร์เน็ตที่คุณใช้งานอยู่เ�ี่ยว�ับปั�หานี้',
+'proxyblocksuccess'            => 'บล็อ�สำเร็จ',
+'sorbsreason'                  => 'หมายเลขไอพีของคุณอยู่ในพร็อ�ซีเปิดในส่วน DNSBL ที่ถู�ใช้งานในเว็บไซต์',
+'sorbs_create_account_reason'  => 'หมายเลขไอพีของคุณอยู่ในพร็อ�ซีเปิดในส่วน DNSBL ที่ถู�ใช้งานในเว็บไซต์ ดังนั้นคุณไม่สามารถสร้างชื่อบั�ชีผู้ใช้ได้',
 
 # Developer tools
 'lockdb'              => 'ล็อ��านข้อมูล',
@@ -1770,9 +1988,9 @@ $1',
 'databasenotlocked'   => '�านข้อมูลไม่ได้ล็อ�',
 
 # Move page
-'move-page'               => 'ย้าย $1',
-'move-page-legend'        => 'เปลี่ยนชื่อ',
-'movepagetext'            => "ใช้�บบฟอร์มด้านล่างใน�ารเปลี่ยนชื่อหน้า ซึ่งประวัติ�าร��้ไขของหน้านี้จะถู�ย้ายตามไปด้วย
+'move-page'                 => 'ย้าย $1',
+'move-page-legend'          => 'เปลี่ยนชื่อ',
+'movepagetext'              => "ใช้�บบฟอร์มด้านล่างใน�ารเปลี่ยนชื่อหน้า ซึ่งประวัติ�าร��้ไขของหน้านี้จะถู�ย้ายตามไปด้วย
 นอ�จา�นี้ชื่อของหน้าเดิมจะถู�เปลี่ยนเป็นหน้าเปลี่ยนทาง ซึ่งหน้าที่ลิง�์มายังหน้าเ�่าจะลิง�์ต่อมาที่หน้าใหม่ �ต่ยังคงที่ชื่อเดิม
 อย่าลืมตรวจสอบหน้าเปลี่ยนทางซ้ำซ้อนที่อาจจะเ�ิดขึ้น
 
@@ -1780,46 +1998,55 @@ $1',
 
 <b>คำเตือน!</b>
 �ารเปลี่ยนชื่อจะมีผลอย่างมา��ับสถิติของหน้านิยมที่มีคนเข้าดูมา� ให้�น่ใจว่าต้อง�ารเปลี่ยนชื่อในครั้งนี้",
-'movepagetalktext'        => "หน้าพูดคุยของหน้านี้จะถู�เปลี่ยนชื่อตามไปด้วย '''เว้นเสีย�ต่:'''
+'movepagetalktext'          => "หน้าพูดคุยของหน้านี้จะถู�เปลี่ยนชื่อตามไปด้วย '''เว้นเสีย�ต่:'''
 *หน้าพูดคุยไม่ว่างมี�ล้วที่ชื่อใหม่ หรือ
 *ได้เลือ�ไม่ต้อง�ารเปลี่ยนชื่อด้านล่าง
 
 ใน�รณีนั้นให้เปลี่ยนชื่อหน้าเอง",
-'movearticle'             => 'เปลี่ยนชื่อ',
-'movenotallowed'          => 'คุณไม่ได้รับอนุ�าตให้ทำ�ารย้ายหน้าต่าง ๆ',
-'newtitle'                => 'ชื่อใหม่',
-'move-watch'              => 'เ�้าดูหน้านี้',
-'movepagebtn'             => 'เปลี่ยนชื่อ',
-'pagemovedsub'            => 'เปลี่ยนชื่อสำเร็จ',
-'movepage-moved'          => '<big>\'\'\'"$1" ถู�เปลี่ยนชื่อเป็น "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'หน้าที่ต้อง�ารมีอยู่�ล้ว หรือชื่อที่เลือ�ไม่ถู�ต้อง �รุณาเลือ�ชื่อใหม่',
-'cantmove-titleprotected' => 'คุณไม่สามารถเปลี่ยนชื่อหน้าเป็นชื่อนี้ได้ เนื่องจา�ชื่อใหม่นี้ได้รับ�ารป้อง�ันไม่ให้สร้างใหม่',
-'talkexists'              => "'''หน้าได้ถู�เปลี่ยนชื่อเรียบร้อย �ต่หน้าพูดคุยไม่ได้ถู�เปลี่ยนตามไปด้วยเนื่องจา�มีหน้าพูดคุยซ้ำ�ล้ว ให้ตรวจสอบ�ละย้ายเองอี�ครั้ง'''",
-'movedto'                 => 'เปลี่ยนชื่อเป็น',
-'movetalk'                => 'เปลี่ยนชื่อหน้าพูดคุยพร้อม�ัน',
-'move-subpages'           => 'ย้ายหน้าย่อยทั้งหมด (ถ้าเป็นไปได้)',
-'move-talk-subpages'      => 'ย้ายหน้าย่อยทั้งหมดของหน้าอภิปรายถ้าทำได้',
-'movepage-page-exists'    => 'หน้า $1 มีอยู่�ล้ว�ละไม่สามารถเขียนทับได้โดยอัตโนมัติ',
-'movepage-page-moved'     => 'หน้า $1 ถู�เปลี่ยนชื่อเป็น $2',
-'movepage-page-unmoved'   => 'หน้า $1 ไม่สามารถเปลี่ยนชื่อเป็น $2 ได้',
-'movepage-max-pages'      => 'หน้าทั้งหมด $1 {{PLURAL:$1|หน้า|หน้า}} ถู�ย้ายไป ซึ่งนับได้ว่าเป็นจำนวนที่มา�ที่สุดเท่าที่จะทได้ �ละหยุด�ารย้ายหน้าอย่างอัตโนมัติ�ล้ว',
-'1movedto2'               => '[[$1]] ถู�เปลี่ยนชื่อเป็น [[$2]]',
-'1movedto2_redir'         => '[[$1]] ถู�เปลี่ยนชื่อเป็น [[$2]] ทับหน้าเปลี่ยนทาง',
-'movelogpage'             => 'บันทึ��ารเปลี่ยนชื่อ',
-'movelogpagetext'         => 'ด้านล่าง�สดงราย�าร �ารเปลี่ยนชื่อ',
-'movereason'              => 'เหตุผล',
-'revertmove'              => 'ย้อน',
-'delete_and_move'         => 'ลบ�ละย้าย',
-'delete_and_move_text'    => '== จำเป็นต้องลบ ==
+'movearticle'               => 'เปลี่ยนชื่อ',
+'movenologin'               => 'ไม่ได้ล็อ�อิน',
+'movenologintext'           => 'ถ้าต้อง�ารเปลี่ยนชื่อหน้านี้ ต้องลงทะเบียน�ละให้ทำ�าร[[Special:UserLogin|ล็อ�อิน]]',
+'movenotallowed'            => 'คุณไม่ได้รับอนุ�าตให้ทำ�ารย้ายหน้าต่าง ๆ',
+'movenotallowedfile'        => 'คุณไม่มีสิทธิ์ที่จะย้ายไฟล์',
+'newtitle'                  => 'ชื่อใหม่',
+'move-watch'                => 'เ�้าดูหน้านี้',
+'movepagebtn'               => 'เปลี่ยนชื่อ',
+'pagemovedsub'              => 'เปลี่ยนชื่อสำเร็จ',
+'movepage-moved'            => '<big>\'\'\'"$1" ถู�เปลี่ยนชื่อเป็น "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'   => 'หน้าเปลี่ยนทางถู�สร้างขึ้น',
+'articleexists'             => 'หน้าที่ต้อง�ารมีอยู่�ล้ว หรือชื่อที่เลือ�ไม่ถู�ต้อง �รุณาเลือ�ชื่อใหม่',
+'cantmove-titleprotected'   => 'คุณไม่สามารถเปลี่ยนชื่อหน้าเป็นชื่อนี้ได้ เนื่องจา�ชื่อใหม่นี้ได้รับ�ารป้อง�ันไม่ให้สร้างใหม่',
+'talkexists'                => "'''หน้าได้ถู�เปลี่ยนชื่อเรียบร้อย �ต่หน้าพูดคุยไม่ได้ถู�เปลี่ยนตามไปด้วยเนื่องจา�มีหน้าพูดคุยซ้ำ�ล้ว ให้ตรวจสอบ�ละย้ายเองอี�ครั้ง'''",
+'movedto'                   => 'เปลี่ยนชื่อเป็น',
+'movetalk'                  => 'เปลี่ยนชื่อหน้าพูดคุยพร้อม�ัน',
+'move-subpages'             => 'ย้ายหน้าย่อยทั้งหมด (ถ้าเป็นไปได้)',
+'move-talk-subpages'        => 'ย้ายหน้าย่อยทั้งหมดของหน้าอภิปรายถ้าทำได้',
+'movepage-page-exists'      => 'หน้า $1 มีอยู่�ล้ว�ละไม่สามารถเขียนทับได้โดยอัตโนมัติ',
+'movepage-page-moved'       => 'หน้า $1 ถู�เปลี่ยนชื่อเป็น $2',
+'movepage-page-unmoved'     => 'หน้า $1 ไม่สามารถเปลี่ยนชื่อเป็น $2 ได้',
+'movepage-max-pages'        => 'หน้าทั้งหมด $1 {{PLURAL:$1|หน้า|หน้า}} ถู�ย้ายไป ซึ่งนับได้ว่าเป็นจำนวนที่มา�ที่สุดเท่าที่จะทได้ �ละหยุด�ารย้ายหน้าอย่างอัตโนมัติ�ล้ว',
+'1movedto2'                 => '[[$1]] ถู�เปลี่ยนชื่อเป็น [[$2]]',
+'1movedto2_redir'           => '[[$1]] ถู�เปลี่ยนชื่อเป็น [[$2]] ทับหน้าเปลี่ยนทาง',
+'move-redirect-suppressed'  => 'หน้าเปลี่ยนทางถู�ระงับ',
+'movelogpage'               => 'บันทึ��ารเปลี่ยนชื่อ',
+'movelogpagetext'           => 'ด้านล่าง�สดงราย�าร �ารเปลี่ยนชื่อ',
+'movereason'                => 'เหตุผล',
+'revertmove'                => 'ย้อน',
+'delete_and_move'           => 'ลบ�ละย้าย',
+'delete_and_move_text'      => '== จำเป็นต้องลบ ==
 
 ชื่อหัวข้อที่ต้อง�าร "[[:$1]]" มีอยู่�ล้ว �น่ใจหรือไม่ว่าต้อง�ารลบเพื่อที่จะให้�ารเปลี่ยนชื่อสำเร็จ',
-'delete_and_move_confirm' => 'ยืนยัน ต้อง�ารลบ',
-'delete_and_move_reason'  => 'ถู�ลบสำหรับ�ารเปลี่ยนชื่อ',
-'selfmove'                => 'ชื่อหน้าเดิม�ละหน้าใหม่เป็นชื่อเดียว�ัน ไม่สามารถเปลี่ยนชื่อได้',
-'immobile_namespace'      => 'ชื่อหน้าที่ต้อง�ารเป็นชนิดพิเศษ ไม่สามารถเปลี่ยนชื่อไปยังเนมสเปซนั้นได้',
-'imagenocrossnamespace'   => 'ไม่สามารถย้ายไฟล์ไปยังเนมสเปซที่ไม่รองรับ',
-'imageinvalidfilename'    => 'ชื่อไฟล์เป้าหมายไม่ถู�ต้อง',
-'fix-double-redirects'    => 'อัปเดตหน้าเปลี่ยนทางทุ�หน้าที่โอนไปยังชื่อเดิม',
+'delete_and_move_confirm'   => 'ยืนยัน ต้อง�ารลบ',
+'delete_and_move_reason'    => 'ถู�ลบสำหรับ�ารเปลี่ยนชื่อ',
+'selfmove'                  => 'ชื่อหน้าเดิม�ละหน้าใหม่เป็นชื่อเดียว�ัน ไม่สามารถเปลี่ยนชื่อได้',
+'immobile-source-namespace' => 'ไม่สามารถเปลี่ยนชื่อหน้าในเนมสเปซ "$1"',
+'immobile-target-namespace' => 'ไม่สามารถย้ายหน้าไปยังเนมสเปซ "$1" ได้',
+'immobile-source-page'      => 'หน้านี้ไม่สามารถเปลี่ยนชื่อได้',
+'immobile-target-page'      => 'ไม่สามารถเปลี่ยนไปยังชื่อที่ต้อง�ารได้',
+'imagenocrossnamespace'     => 'ไม่สามารถย้ายไฟล์ไปยังเนมสเปซที่ไม่รองรับ',
+'imageinvalidfilename'      => 'ชื่อไฟล์เป้าหมายไม่ถู�ต้อง',
+'fix-double-redirects'      => 'อัปเดตหน้าเปลี่ยนทางทุ�หน้าที่โอนไปยังชื่อเดิม',
+'move-leave-redirect'       => 'สร้างหน้าเปลี่ยนทางตามมา',
 
 # Export
 'export'            => 'ส่งออ�หน้า',
@@ -1827,7 +2054,7 @@ $1',
 
 �ารจะส่งออ�หน้านั้นสามารถทำได้โดยใส่ชื่อหัวเรื่องของหน้าที่ต้อง�าร ลงใน�ล่องข้อความด้านล่าง หนึ่งชื่อต่อหนึ่งบรรทัด จา�นั้นเลือ�ว่าต้อง�ารทั้งรุ่นปัจจุบัน�ละรุ่นเ�่าๆ ทั้งหมดพร้อม�ับประวัติของหน้านั้น หรือต้อง�ารเพียง�ต่เนื้อหารุ่นปัจจุบันพร้อม�ับรายละเอียดของรุ่นนั้นเท่านั้น
 
-ใน�รณีที่ต้อง�ารเฉพาะรุ่นปัจจุบัน คุณสามารถใช้ในรูป�บบของลิง�์ เช่น [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] สำหรับหน้า "[[{{MediaWiki:Mainpage}}]]"',
+ใน�รณีที่ต้อง�ารเฉพาะรุ่นปัจจุบัน คุณสามารถใช้ในรูป�บบของลิง�์ เช่น [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] สำหรับหน้า "[[{{MediaWiki:Mainpage}}]]"',
 'exportcuronly'     => 'เอาเฉพาะรุ่นปัจจุบันเท่านั้น ไม่เอาประวัติทั้งหมด',
 'exportnohistory'   => "----
 '''หมายเหตุ:''' �ารส่งออ�ประวัติหน้าทั้งหมดผ่านช่องทางนี้ได้ถู�ปิดไว้ เนื่องจา�ปั�หาทางเทคนิคในด้านประสิทธิภาพ",
@@ -1843,7 +2070,7 @@ $1',
 'allmessagesdefault'        => 'ข้อความตั้งต้น',
 'allmessagescurrent'        => 'ข้อความปัจจุบัน',
 'allmessagestext'           => 'ราย�ารข้อความของระบบ อยู่ในเนมสเปซมีเดียวิ�ิ
-�รุณาไปที่ [http://www.mediawiki.org/wiki/Localisation มีเดียวิ�ิ] �ละ [http://translatewiki.new Betawiki] ถ้าคุณยังอยา�ที่จะ�ปลข้อความของระบบมีเดียวิ�ิ',
+�รุณาไปที่ [http://www.mediawiki.org/wiki/Localisation มีเดียวิ�ิ] �ละ [http://translatewiki.new translatewiki.net] ถ้าคุณยังอยา�ที่จะ�ปลข้อความของระบบมีเดียวิ�ิ',
 'allmessagesnotsupportedDB' => "หน้านี้ไม่สามารถใช้งานได้เนื่องจา� '''\$wgUseDatabaseMessages''' ถู�ระงับ�ารใช้งาน",
 'allmessagesfilter'         => '�รองเฉพาะข้อความ:',
 'allmessagesmodified'       => '�สดงเฉพาะที่ถู���้ไข',
@@ -1861,9 +2088,12 @@ $1',
 'import'                     => 'หน้านำเข้า',
 'importinterwiki'            => 'นำเข้าข้ามวิ�ิ',
 'import-interwiki-text'      => 'เลือ�วิ�ิ�ละชื่อหัวข้อที่ต้อง�ารนำเข้า วันที่�ละชื่อผู้��้ไขทั้งหมดจะถู�เ�็บไว้ โดย�ารนำเข้าทุ�ส่วนจะถู�เ�็บไว้ใน [[Special:Log/import|บันทึ��ารนำเข้า]]',
+'import-interwiki-source'    => 'หน้า/วิ�ิ ต้นฉบับ:',
 'import-interwiki-history'   => 'คัดลอ�ประวัติทั้งหมดในหน้านี้',
 'import-interwiki-submit'    => 'นำเข้า',
 'import-interwiki-namespace' => 'เนมสเปซปลายทาง:',
+'import-upload-filename'     => 'ชื่อไฟล์:',
+'import-comment'             => 'ความเห็น:',
 'importtext'                 => '�รุณาส่งออ�ไฟล์จา�วิ�ิอื่นโดยใช้[[Special:Export|เครื่องมือส่งออ�]] บันทึ� �ละทำ�ารอัปโหลดมาที่นี่',
 'importstart'                => '�ำลังนำเข้าหน้า...',
 'import-revision-count'      => '$1 {{PLURAL:$1|รุ่น�าร��้ไข|รุ่น�าร��้ไข}}',
@@ -1900,19 +2130,19 @@ $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|รุ่น�าร��้ไข|รุ่น�าร��้ไข}}จา� $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'หน้าผู้ใช้ของฉัน',
+'tooltip-pt-userpage'             => 'หน้าผู้ใช้ของคุณ',
 'tooltip-pt-anonuserpage'         => 'หน้าผู้ใช้ของหมายเลขไอพีที่��้ไข',
-'tooltip-pt-mytalk'               => 'หน้าพูดคุยของฉัน',
+'tooltip-pt-mytalk'               => 'หน้าอธิปรายของคุณ',
 'tooltip-pt-anontalk'             => 'พูดคุยเ�ี่ยว�ับ�าร��้ไขจา�หมายเลขไอพี',
 'tooltip-pt-preferences'          => 'ตั้งค่า�ารใช้งานส่วนตัว',
 'tooltip-pt-watchlist'            => 'ราย�ารที่เ�้าดู�าร��้ไข',
-'tooltip-pt-mycontris'            => 'ราย�ารหน้าที่ร่วม��้ไข',
+'tooltip-pt-mycontris'            => 'ราย�ารหน้าที่ได้มีส่วนร่วม',
 'tooltip-pt-login'                => 'ไม่จำเป็นต้องล็อ�อินใน�าร��้ไข �ต่�นะนำอย่างยิ่งให้ล็อ�อิน',
 'tooltip-pt-anonlogin'            => 'ไม่จำเป็นต้องล็อ�อินใน�าร��้ไข �ต่�นะนำอย่างยิ่งให้ล็อ�อิน',
 'tooltip-pt-logout'               => 'ล็อ�เอาต์',
 'tooltip-ca-talk'                 => 'พูคุยเ�ี่ยว�ับเนื้อหา',
 'tooltip-ca-edit'                 => 'หน้านี้��้ไขได้ �่อนทำ�ารบันทึ�ให้�รุณา�ดปุ่มดูตัวอย่าง�่อน �น่ใจว่าได้ตามที่ต้อง�าร',
-'tooltip-ca-addsection'           => 'เพิ่มความเห็นในส่วนสนทนานี้',
+'tooltip-ca-addsection'           => 'เริ่มส่วนย่อยใหม่',
 'tooltip-ca-viewsource'           => 'หน้านี้ถู�ล็อ� �ต่ยังคงดูโค้ดได้',
 'tooltip-ca-history'              => 'รุ่นที่�ล้วของหน้านี้',
 'tooltip-ca-protect'              => 'ล็อ�หน้านี้',
@@ -1959,6 +2189,8 @@ $1',
 'tooltip-watch'                   => 'เพิ่มหน้านี้เข้าราย�ารเ�้าดู',
 'tooltip-recreate'                => 'สร้างหน้านี้อี�ครั้ง�ม้ว่าจะถู�ลบ',
 'tooltip-upload'                  => 'เริ่มอัปโหลด',
+'tooltip-rollback'                => '"ถอย�ลับฉุ�เฉิน" ใช้ย้อน�าร��้ไขของหน้านี้ไปยังรุ่นโดยผู้ใช้�่อนหน้าในคลิ�เดียว',
+'tooltip-undo'                    => '"ย้อน" ใช้ย้อน�าร��้ไขครั้งนี้�ละเปิดฟอร์มให้��้ไข สามารถเพิ่มคำอธิบายในตอนท้าย',
 
 # Stylesheets
 'common.css'   => '/** CSS ที่อยู่ในหน้านี้จะมีผลต่อทุ�ส�ินในเว็บไซต์ */',
@@ -1974,12 +2206,12 @@ $1',
 'notacceptable'     => 'เซิร์ฟเวอร์ของวิ�ิไม่สามารถให้ข้อมูลในรูป�บบที่ไคลเอนต์สามารถอ่านได้',
 
 # Attribution
-'anonymous'        => 'ผู้ใช้ไม่ประสงค์ออ�นามของ {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|ผู้ใช้|ผู้ใช้}}ไม่ประสงค์ออ�นามของ {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} ผู้ใช้ $1',
 'lastmodifiedatby' => '��้ไขล่าสุดเมื่อเวลา $2 $1 โดย $3', # $1 date, $2 time, $3 user
 'othercontribs'    => 'พัฒนาจา�งานเขียนของ $1',
 'others'           => 'ผู้อื่น',
-'siteusers'        => '{{SITENAME}} ผู้ใช้ $1',
+'siteusers'        => '{{PLURAL:$2|ผู้ใช้|ผู้ใช้}} {{SITENAME}} $1',
 'creditspage'      => 'เ�ียรติ��่ผู้ร่วมสร้าง',
 'nocredits'        => 'ไม่มีรายชื่อผู้เป็นเ�ียรติที่ร่วมสร้างหน้านี้',
 
@@ -1999,6 +2231,16 @@ $1',
 'numauthors'     => 'จำนวนผู้เขียน (เนื้อหา): $1',
 'numtalkauthors' => 'จำนวนผู้เขียน (หน้าพูดคุย): $1',
 
+# Skin names
+'skinname-standard'    => 'คลาสสิ�',
+'skinname-nostalgia'   => 'นอสตัลเจีย',
+'skinname-cologneblue' => 'โคโล�จ์บลู',
+'skinname-monobook'    => 'โมโนบุ๊�',
+'skinname-myskin'      => 'มายส�ิน',
+'skinname-chick'       => 'ชิ�',
+'skinname-simple'      => 'ซิมเปิล',
+'skinname-modern'      => 'โมเดิร์น',
+
 # Math options
 'mw_math_png'    => 'เรนเดอร์เป็น PNG เสมอ',
 'mw_math_simple' => 'ใช้พื้น�านเป็น HTML ถ้าไม่ได้ใช้ PNG',
@@ -2019,10 +2261,11 @@ $1',
 'markedaspatrollederror-noautopatrol' => 'คุณไม่สามารถทำเครื่องหมาย�าร��้ไขของคุณเองว่าตรวจสอบ�ล้ว',
 
 # Patrol log
-'patrol-log-page'   => 'บันทึ��ารตรวจสอบ',
-'patrol-log-header' => 'หน้านี้คือบันทึ�รุ่น�าร��้ไขที่�ำหนดว่าตรวจสอบ�ล้ว',
-'patrol-log-line'   => 'ทำเครื่องหมาย $1 ของ $2 ว่าถู�ตรวจสอบ $3 �ล้ว',
-'patrol-log-auto'   => '(อัตโนมัติ)',
+'patrol-log-page'      => 'บันทึ��ารตรวจสอบ',
+'patrol-log-header'    => 'หน้านี้คือบันทึ�รุ่น�าร��้ไขที่�ำหนดว่าตรวจสอบ�ล้ว',
+'patrol-log-line'      => 'ทำเครื่องหมาย $1 ของ $2 ว่าถู�ตรวจสอบ $3 �ล้ว',
+'patrol-log-auto'      => '(อัตโนมัติ)',
+'log-show-hide-patrol' => '$1 บันทึ��ารตรวจตรา',
 
 # Image deletion
 'deletedrevision'                 => 'รุ่นเ�่าที่ถู�ลบ $1',
@@ -2039,6 +2282,9 @@ $1',
 'previousdiff' => '� �ต�ต่าง�่อนหน้า',
 'nextdiff'     => '�ต�ต่างถัดไป →',
 
+# Visual comparison
+'visual-comparison' => '�ารเปรียบเทียบลั�ษณะปรา��',
+
 # Media information
 'mediawarning'         => "'''คำเตือน''': ไฟล์นี้อาจจะมีโค้ดที่มีอันตรายหรือมีไวรัส<hr />",
 'imagemaxsize'         => 'จำ�ัดภาพหรือคำอธิบายภาพไว้ที่ขนาด:',
@@ -2051,10 +2297,12 @@ $1',
 'show-big-image'       => 'ความละเอียดสูงสุด',
 'show-big-image-thumb' => '<small>ขนาดของภาพ�สดงผล: $1 × $2 พิ�เซล</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '��ลลอรีภาพใหม่',
 'imagelisttext'         => "รายชื่อไฟล์ '''$1''' ราย�าร เรียงตาม$2",
 'newimages-summary'     => 'หน้าพิเศษนี้�สดงไฟล์ที่ถู�อัปโหลดล่าสุด',
+'newimages-legend'      => 'ตัว�รอง',
+'newimages-label'       => 'ชื่อไฟล์ (หรือส่วนหนึ่งของชื่อ):',
 'showhidebots'          => '($1 บอต)',
 'noimages'              => 'ไม่มีให้ดู',
 'ilsubmit'              => 'ค้นหา',
@@ -2258,6 +2506,13 @@ $1',
 'exif-lightsource-24'  => 'ไอเอสโอสตูดิโอทังสเตน',
 'exif-lightsource-255' => '�สงลั�ษณะอื่น',
 
+# Flash modes
+'exif-flash-fired-0'    => 'ไม่ใช้�ฟลช',
+'exif-flash-fired-1'    => 'ใช้�ฟลช',
+'exif-flash-mode-3'     => 'โหมดอัตโนมัติ',
+'exif-flash-function-1' => 'ฟัง�์ชันไม่มี�ฟลช',
+'exif-flash-redeye-1'   => 'โหมดลบตา�ดง',
+
 'exif-focalplaneresolutionunit-2' => 'นิ้ว',
 
 'exif-sensingmethod-1' => 'ไม่�ำหนด',
@@ -2397,21 +2652,9 @@ $1
 �รุณายืนยันว่าต้อง�ารสร้างหน้านี้ขึ้นมาใหม่",
 'recreate'            => 'สร้างใหม่',
 
-# HTML dump
-'redirectingto' => '�ำลังเปลี่ยนทางไปที่ [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'ล้าง�คชสำหรับหน้านี้หรือไม่
-
-$1',
 'confirm_purge_button' => 'ต�ลง',
-
-# AJAX search
-'searchcontaining' => "ค้นหาที่มีส่วนประ�อบ ''$1''",
-'searchnamed'      => "ค้นหาหน้าชื่อ ''$1''",
-'articletitles'    => "หน้าที่เริ่มต้นด้วย ''$1''",
-'hideresults'      => 'ซ่อนผลลัพธ์',
-'useajaxsearch'    => 'ใช้�ารค้นหาผ่านเอ�จ็�ซ์',
+'confirm-purge-top'    => 'ล้าง�คชสำหรับหน้านี้หรือไม่',
 
 # Multipage image navigation
 'imgmultipageprev' => '� หน้า�่อนหน้า',
@@ -2505,13 +2748,13 @@ $1',
 'filepath-summary' => 'หน้าพิเศษนี้คืนค่าเป็นเส้นทางเต็มของไฟล์
 ไฟล์ภาพจะถู��สดงในขนาดเต็ม �ละไฟล์ประเภทอื่นจะถู�เปิดด้วยโปร��รมที่เ�ี่ยวข้องโดยตรง
 
-�รุณาป้อนชื่อไฟล์โดยไม่มี "{{ns:image}}:" นำหน้า',
+�รุณาป้อนชื่อไฟล์โดยไม่มี "{{ns:file}}:" นำหน้า',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'ค้นหาไฟล์ที่ซ้ำซ้อน',
 'fileduplicatesearch-summary'  => 'ค้นหาไฟล์ที่ซ้ำซ้อนด้วยค่า�ฮชของไฟล์
 
-�รุณาป้อนชื่อไฟล์โดยไม่มี "{{ns:image}}:" นำหน้า',
+�รุณาป้อนชื่อไฟล์โดยไม่มี "{{ns:file}}:" นำหน้า',
 'fileduplicatesearch-legend'   => 'ค้นหาไฟล์ที่ซ้ำ�ัน',
 'fileduplicatesearch-filename' => 'ชื่อไฟล์ :',
 'fileduplicatesearch-submit'   => 'ค้นหา',
@@ -2530,7 +2773,7 @@ $1',
 'specialpages-group-changes'     => 'ปรับปรุงล่าสุด�ละปูมต่าง ๆ',
 'specialpages-group-media'       => 'รายงานเรื่องสื่อ�ละ�ารอัปโหลด',
 'specialpages-group-users'       => 'ผู้ใช้�ละสิทธิ',
-'specialpages-group-highuse'     => 'หน้าที่มี�ารใช้สูง',
+'specialpages-group-highuse'     => 'หน้าที่มี�ารใช้งานสูง',
 'specialpages-group-pages'       => 'ราย�ารหน้า',
 'specialpages-group-pagetools'   => 'เครื่องมือเ�ี่ยว�ับหน้าต่าง ๆ',
 'specialpages-group-wiki'        => 'เครื่องมือ�ละข้อมูลวิ�ิ',
diff --git a/languages/messages/MessagesTi.php b/languages/messages/MessagesTi.php
index 22c4e71d..32e45112 100644
--- a/languages/messages/MessagesTi.php
+++ b/languages/messages/MessagesTi.php
@@ -5,7 +5,6 @@
  * @file
  *
  * @author Blake
- * @author Niklas Laxström
  * @author Node ue
  * @author Teak
  */
@@ -116,11 +115,11 @@ $messages = array(
 # Upload
 'savefile' => '�ስሊ ኣ��ጥ',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => '�ስሊ',
-'imagelist'      => '�ስ�ታት',
-'imagelist_name' => 'ሽ�',
-'imagelist_user' => 'ኣባ�',
+'listfiles'      => '�ስ�ታት',
+'listfiles_name' => 'ሽ�',
+'listfiles_user' => 'ኣባ�',
 
 # Miscellaneous special pages
 'nbytes'            => '$1 {{PLURAL:$1|ባይት|ባይታት}}',
@@ -134,7 +133,6 @@ $messages = array(
 
 # Special:Log
 'specialloguserlabel' => 'ኣባ�:',
-'log-search-submit'   => 'ኪድ',
 
 # Special:AllPages
 'alphaindexline' => '$1 ናብ $2',
@@ -148,7 +146,7 @@ $messages = array(
 # Watchlist
 'watchlistfor' => "(ን'''$1''')",
 
-# Delete/protect/revert
+# Protect
 'pagesize' => '(ባይታት)',
 
 # Undelete
@@ -168,7 +166,7 @@ $messages = array(
 # Tooltip help for the actions
 'tooltip-pt-preferences' => 'ናተይ ኣማረጽቲ',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'ድሉይ',
 
 # Metadata
diff --git a/languages/messages/MessagesTk.php b/languages/messages/MessagesTk.php
index 543c0731..8a0073fe 100644
--- a/languages/messages/MessagesTk.php
+++ b/languages/messages/MessagesTk.php
@@ -61,19 +61,30 @@ $messages = array(
 'nov'           => 'noý',
 'dec'           => 'dek',
 
-'newwindow' => '(täze bir penjirede açylyr)',
-'mytalk'    => 'TabÅŸyryk sahypam',
+# Categories related messages
+'pagecategories' => '{{PLURAL:$1|Kategoriýa|Kategoriýalar}}',
+
+'article'        => 'Makala',
+'newwindow'      => '(täze bir penjirede açylyr)',
+'qbedit'         => 'Redakte',
+'qbspecialpages' => '�örite sahypalar',
+'mytalk'         => 'TabÅŸyryk sahypam',
 
 'help'             => '�ardam',
 'search'           => 'Gözle',
 'searchbutton'     => 'Gözle',
 'searcharticle'    => 'Git',
+'history'          => 'Sahypanyň geçmişi',
 'permalink'        => 'HemiÅŸelik aragatnaÅŸyk',
 'edit'             => 'Redakte',
+'create'           => 'Döret',
+'protect_change'   => 'redakte',
 'talkpagelinktext' => 'Çekisme',
+'specialpage'      => '�örite Sahypa',
 'personaltools'    => 'Åžahsy gurallar',
-'talk'             => 'Çekisme',
+'talk'             => 'çekisme',
 'toolbox'          => 'Gurallar',
+'otherlanguages'   => 'BaÅŸga diller',
 'redirectedfrom'   => '($1 sahypasyndan gönükdirildi)',
 'jumptosearch'     => 'gözle',
 
@@ -85,11 +96,16 @@ $messages = array(
 'privacy'              => 'Hususylyk ýörelgesi',
 
 'editsection'     => 'redakte',
+'editold'         => 'redakte',
 'editsectionhint' => '$1. bölümü redaktirle',
 'showtoc'         => 'görkez',
 'hidetoc'         => 'ýaşyr',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
+'nstab-user'     => 'Ulaňyjy sahypasy',
+'nstab-special'  => '�örite',
+'nstab-project'  => 'Taslama sahypasy',
+'nstab-image'    => 'Dosýe',
 'nstab-category' => 'Kategoriya',
 
 # General errors
@@ -118,8 +134,12 @@ $messages = array(
 'cur'  => 'parh',
 'last' => 'soň',
 
+# Revision deletion
+'rev-delundel' => 'görkez/ýaşyr',
+
 # Search results
-'powersearch' => 'Giňişleýin Gözleg',
+'searchhelp-url' => 'Help:Içindäkiler',
+'powersearch'    => 'Giňişleýin Gözleg',
 
 # Recent changes
 'recentchanges'   => 'Ahyrky özgertişler',
@@ -134,12 +154,15 @@ $messages = array(
 # Recent changes linked
 'recentchangeslinked' => 'Meňzeçli özgertişler',
 
-# Image description page
+# File description page
 'filehist-current'  => 'häzirki',
 'filehist-datetime' => 'Gün/Zaman',
-'filehist-user'     => 'Ulanyjy',
+'filehist-user'     => 'Ulaňyjy',
 'imagelinks'        => 'AragatnaÅŸyklar',
 
+# Random page
+'randompage' => 'Oýlamazdan sahypa',
+
 # Miscellaneous special pages
 'newpages' => 'Täze sahypalar',
 'move'     => 'Atyňy özgert',
@@ -149,12 +172,16 @@ $messages = array(
 
 # Watchlist
 'mywatchlist' => 'Synlama tablisam',
+'watch'       => 'Synla',
+
+# Protect
+'prot_1movedto2' => '[[$1]] sahypasy [[$2]] sahypasyna göçürildi',
 
 # Namespace form on various pages
 'blanknamespace' => '(BaÅŸ)',
 
 # Contributions
-'mycontris' => 'Goşantlarım',
+'mycontris' => 'GoÅŸantlarym',
 
 # What links here
 'whatlinkshere'       => 'Sahypaýa aragatnaşyklar',
@@ -162,7 +189,8 @@ $messages = array(
 'whatlinkshere-links' => '� aragatnaşyklar',
 
 # Block/unblock
-'blocklink' => 'bökdençle',
+'blocklink'    => 'bökdençle',
+'contribslink' => 'GoÅŸantlar',
 
 # Move page
 '1movedto2' => '[[$1]] sahypasy [[$2]] sahypasyna göçürildi',
@@ -171,12 +199,13 @@ $messages = array(
 'thumbnail-more' => 'Ulal',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'       => 'Menim ulanyjy sahypam',
+'tooltip-pt-userpage'       => 'Menim ulaňyjy sahypam',
 'tooltip-pt-mytalk'         => 'Menim tabÅŸyryk sahypam',
 'tooltip-pt-mycontris'      => '�asadyýym goşantlarımıň tablisasy',
 'tooltip-pt-logout'         => 'Sessiýaýy kapas',
 'tooltip-ca-move'           => 'Bu sahypanyň atyňy özgert',
 'tooltip-ca-nstab-category' => 'Kategoriya sahypsayny gör',
+'tooltip-watch'             => 'Bu sahypaýy synlama tablisaňa goşun',
 
 # Special:SpecialPages
 'specialpages' => '�örite sahypalar',
diff --git a/languages/messages/MessagesTl.php b/languages/messages/MessagesTl.php
index 2392e322..ec7a24ec 100644
--- a/languages/messages/MessagesTl.php
+++ b/languages/messages/MessagesTl.php
@@ -7,9 +7,34 @@
  * @author AnakngAraw
  * @author Felipe Aira
  * @author Sky Harbor
+ * @author tl.wikipedia.org sysops
  * @author לערי ריינה�רט
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Midya',
+	NS_SPECIAL          => 'Natatangi',
+	NS_TALK             => 'Usapan',
+	NS_USER             => 'Tagagamit',
+	NS_USER_TALK        => 'Usapang tagagamit',
+	NS_PROJECT_TALK     => 'Usapang $1',
+	NS_FILE             => 'Larawan',
+	NS_FILE_TALK        => 'Usapang larawan',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Usapang MediaWiki',
+	NS_TEMPLATE         => 'Suleras',
+	NS_TEMPLATE_TALK    => 'Usapang suleras',
+	NS_HELP             => 'Tulong',
+	NS_HELP_TALK        => 'Usapang tulong',
+	NS_CATEGORY         => 'Kaurian',
+	NS_CATEGORY_TALK    => 'Usapang kaurian',
+);
+
+$namespaceAliases = array(
+	'Kategorya'         => NS_CATEGORY,
+	'Usapang kategorya' => NS_CATEGORY_TALK,
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Salungguhitan ang mga kawing:',
@@ -48,17 +73,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Itago ang aking mga pagbabago mula sa talaan ng mga binabantayan',
 'tog-watchlisthidebots'       => 'Itago ang mga pagbabago ng mga bot mula sa talaan ng mga binabantayan',
 'tog-watchlisthideminor'      => 'Itago ang mga maliliit na pagbabago mula sa talaan ng mga binabantayan',
+'tog-watchlisthideliu'        => 'Itago ang mga pagbabago ng mga lumagdang tagagamit mula sa talaan ng mga binabantayan',
+'tog-watchlisthideanons'      => 'Itago ang mga pagbabago ng hindi nakikilalang mga tagagamit mula sa talaan ng mga binabantayan',
 'tog-nolangconversion'        => 'Huwag paganahin ang pagpapalit ng mga halagang nagkakaibaiba (baryante)',
 'tog-ccmeonemails'            => 'Padalahan ako ng mga kopya ng mga ipinadala kong e-liham sa ibang mga tagagamit',
 'tog-diffonly'                => 'Huwag ipakita ang nilalaman ng pahinang nasa ilalim ng mga pagkakaiba',
 'tog-showhiddencats'          => 'Ipakita ang mga nakatagong kategorya (kaurian)',
+'tog-noconvertlink'           => 'Huwag paganahin ang pagpapalit ng pamagat na pangkawing',
+'tog-norollbackdiff'          => 'Alisin ang mga pagkakaiba pagkatapos isagawa ang pagpapagulong na pabalik sa dati',
 
 'underline-always'  => 'Palagi',
 'underline-never'   => 'Hindi magpakailanman',
 'underline-default' => 'Tinakda ng pambasa-basa',
 
-'skinpreview' => '(Pribyu)',
-
 # Dates
 'sunday'        => 'Linggo',
 'monday'        => 'Lunes',
@@ -152,7 +179,7 @@ $messages = array(
 'mytalk'         => 'Usapan ko',
 'anontalk'       => 'Usapan para sa IP na ito',
 'navigation'     => 'Panlibot (nabigasyon)',
-'and'            => 'at',
+'and'            => ',&#32;at',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata ("mga datong nasa likuran"):',
@@ -189,14 +216,14 @@ $messages = array(
 'talkpagelinktext'  => 'Usapan',
 'specialpage'       => 'Natatanging pahina',
 'personaltools'     => 'Mga kagamitang pansarili',
-'postcomment'       => 'Magbigay ng komento',
+'postcomment'       => 'Bagong seksyon',
 'articlepage'       => 'Tingnan ang pahina ng nilalaman',
 'talk'              => 'Usapan',
 'views'             => 'Mga anyo',
 'toolbox'           => 'Mga kagamitan',
 'userpage'          => 'Tingnan ang pahina ng tagagamit',
 'projectpage'       => 'Tingnan ang pahina ng proyekto',
-'imagepage'         => 'Tingnan ang pahina ng midya',
+'imagepage'         => 'Tingnan ang pahina ng talaksan',
 'mediawikipage'     => 'Tingnan ang pahina ng mensahe',
 'templatepage'      => 'Tingnan ang pahina ng suleras',
 'viewhelppage'      => 'Tingnan ang pahina ng tulong',
@@ -215,8 +242,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Tungkol sa {{SITENAME}}',
 'aboutpage'            => 'Project:Patungkol',
-'bugreports'           => 'Mga ulat pampagkakamali',
-'bugreportspage'       => "Project:Mga ulat ng depekto (''bug'')",
 'copyright'            => 'Maaring gamitin ang nilalaman sa ilalim ng $1.',
 'copyrightpagename'    => 'Karapatang-ari sa {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Mga karapatang-ari',
@@ -239,9 +264,7 @@ $messages = array(
 
 'badaccess'        => 'Kamalian sa pahintulot',
 'badaccess-group0' => 'Hindi ka pinahintulutang isagawa ang hiniling mong galaw.',
-'badaccess-group1' => 'Nakatakda lamang sa mga tagagamit na nasa pangkat na $1 ang hinihiling mong galaw.',
-'badaccess-group2' => 'Nakatakda lamang sa mga tagagamit na nasa isa sa mga pangkat na $1 ang hinihiling mong galaw.',
-'badaccess-groups' => 'Nakatakda lamang sa mga manggamit ng isa sa mga pangkat $1 hinihiling mo.',
+'badaccess-groups' => 'Ang galaw na hiniling mo ay nakatakda lamang para sa mga tagagamit sa {{PLURAL:$2|pangkat na|isa sa mga pangkat na}}: $1.',
 
 'versionrequired'     => 'Kinakailangan ang bersyong $1 ng MediaWiki',
 'versionrequiredtext' => 'Kinakailangan ang bersyong $1 ng MediaWiki upang magamit ang pahinang ito. Tingnan ang [[Special:Version|pahina ng bersyon]].',
@@ -255,6 +278,8 @@ $messages = array(
 'editsection'             => 'baguhin',
 'editold'                 => 'baguhin',
 'viewsourceold'           => 'tingnan ang pinagmulan',
+'editlink'                => 'baguhin',
+'viewsourcelink'          => 'tingnan ang pinagmulan',
 'editsectionhint'         => 'Baguhin ang seksyon: $1',
 'toc'                     => 'Mga nilalaman',
 'showtoc'                 => 'ipakita',
@@ -269,13 +294,13 @@ $messages = array(
 'site-atom-feed'          => '$1 kargang Atom',
 'page-rss-feed'           => '"$1" kargang RSS',
 'page-atom-feed'          => '"$1" kargang Atom',
-'red-link-title'          => '$1 (hindi pa nasusulat)',
+'red-link-title'          => '$1 (hindi umiiral ang pahina)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Pahina',
 'nstab-user'      => 'Pahina ng tagagamit',
 'nstab-media'     => 'Pahina ng midya',
-'nstab-special'   => 'Natatangi',
+'nstab-special'   => 'Natatanging pahina',
 'nstab-project'   => 'Pahina ng proyekto',
 'nstab-image'     => 'Talaksan',
 'nstab-mediawiki' => 'Mensahe',
@@ -285,8 +310,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Walang ganitong galaw',
-'nosuchactiontext'  => 'Hindi kinikilala ng wiki
-ang gawang itinakda ng URL',
+'nosuchactiontext'  => 'Hindi tanggap ang galaw na tinukoy ng URL.
+Maaaring nagkamali ka sa pagmamakinilya ng URL, o sumunod sa isang maling kawing.
+Maaari rin itong magpahiwatig ng isang depektong nasa loob ng {{SITENAME}}.',
 'nosuchspecialpage' => 'Walang ganyang natatanging pahina',
 'nospecialpagetext' => "<big>'''Humiling ka ng isang maling natatanging pahina.'''</big>
 
@@ -342,7 +368,6 @@ Maaaring nabura na ito ng ibang tagagamit.',
 'badtitle'             => 'Hindi kanaisnais na pamagat',
 'badtitletext'         => 'Ang hiniling na pamagat ng pahina ay hindi katanggap-tanggap, wala, o isang may-maling kawing na pamagat na pangugnayang-wika (interwika) o pangugnayang wiki (interwiki).
 Maaaring naglalaman ito ng isa o higit pang mga panitik (karakter) na hindi maaaring gamitin para sa mga pamagat.',
-'perfdisabled'         => 'Paumanhin! Pansamantalang hindi pinapaandar ang kasangkapang-katangian ito sapagkat nakapagpapabagal ito sa kalipunan ng dato na umaabot sa kalagayang wala nang makagamit ng wiki.',
 'perfcached'           => 'Ang sumusunod na mga dato ay nakaligpit at maaaring wala na sa panahon.',
 'perfcachedts'         => 'Ang sumusunod na mga dato ay nakaligpit, at dating isinapanahon noong $1.',
 'querypage-no-updates' => 'Kasulukuyang hindi gumagana ang mga pagbabago para sa pahinang ito.
@@ -360,7 +385,7 @@ Pakisubok na lang ulit pagkaraan ng kaunting mga minuto.",
 'protectedinterface'   => "Nagbibigay ang pahinang ito ng tekstong panghangganan (''interface'') para sa sopwer, at ikinandado para maiwasan ang pangaabuso.",
 'editinginterface'     => "'''Babala:''' Binabago mo ang isang pahinang ginagamit sa pagbibigay ng tekstong panghangganan para sa sopwer.  
 Makakaapekto ang mga pagbago sa pahinang ito sa anyo ng hangganang (''interface'') pangtagagamit na para sa ibang mga tagagamit.
-Para sa mga salinwika, paki isang-alang-alang o konsiderahin ang paggamit ng [http://translatewiki.net/wiki/Main_Page?setlang=en Betawiki], ang proyektong panglokalisasyon ng MediaWiki.",
+Para sa mga salinwika, paki isang-alang-alang o konsiderahin ang paggamit ng [http://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], ang proyektong panglokalisasyon ng MediaWiki.",
 'sqlhidden'            => '(nakatago ang tanong ng SQL)',
 'cascadeprotected'     => 'Nakasanggalang ang pahinang ito mula sa mga pagbabago, dahil kabilang ito sa sumusunod na {{PLURAL:$1|pahinang|mga pahinang}} nakasanggalang sa pamamagitan ng binuhay na opsyong "nahuhulog" (kumakaskada):
 $2',
@@ -371,16 +396,16 @@ $2',
 Ang ibinigay na dahilan ay ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Masamang kompigurasyon: hindi kilalang tagahagilap (iskaner) ng birus: <i>$1</i>',
+'virus-badscanner'     => "Masamang kompigurasyon: hindi kilalang tagahagilap (iskaner) ng birus: ''$1''",
 'virus-scanfailed'     => 'nabigo ang paghagilap (kodigong $1)',
 'virus-unknownscanner' => 'hindi kilalang panlaban sa birus:',
 
 # Login and logout pages
 'logouttitle'                => 'Pangalis sa pagkakalagda ng tagagamit',
-'logouttext'                 => "<strong>Nakaalis ka na sa pagkakalagda.</strong>
+'logouttext'                 => "'''Nakaalis ka na sa pagkakalagda.'''
 
 Maaari kang magpatuloy sa paggamit ng {{SITENAME}} na hindi nakikilala (anonimo), o maaaring kang [[Special:UserLogin|lumagda/tumala uli]] bilang kapareho o bilang ibang tagagamit.
-Tandaan na may ilang pahina maaaring magpatuloy na nagpapakitang parang nakalagda ka pa rin, hanggang sa linisin mo ang iyong naitatagong pangtingin-tingin (''browser cache'').",
+Tandaan na may ilang pahinang maaaring magpatuloy na nagpapakitang parang nakalagda ka pa rin, hanggang sa linisin mo ang iyong naitatagong pangtingin-tingin (''browser cache'').",
 'welcomecreation'            => '== Maligayang pagdating, $1! ==
 Nalikha na ang iyong kwenta o patnugutan.
 Huwag kalimutang baguhin ang [[Special:Preferences|mga kagustuhan mo sa {{SITENAME}}]].',
@@ -391,7 +416,6 @@ Huwag kalimutang baguhin ang [[Special:Preferences|mga kagustuhan mo sa {{SITENA
 'remembermypassword'         => 'Tandaan ang hudyat sa kompyuter na ito',
 'yourdomainname'             => 'Dominyo mo:',
 'externaldberror'            => 'Maaaring may kamalian sa pagpapatotoo ng kalipunan ng mga dato o kaya hindi ka pinahintulutang isapanahon ng iyong panlabas na kuwenta o patnugutan.',
-'loginproblem'               => '<b>Nagkaroon ng problema sa iyong paglagda.</b><br />Subukan po muli!',
 'login'                      => 'Lumagda',
 'nav-login-createaccount'    => 'Lumagda / lumikha ng kuwenta',
 'loginprompt'                => "Dapat na pinapahintulutan mo ang mga \"otap\" (''cookie'') upang makalagda sa {{SITENAME}}.",
@@ -418,8 +442,8 @@ Pumili lamang ng iba pang pangalan.',
 'yournick'                   => 'Panglagda:',
 'badsig'                     => 'Hindi tamang hilaw na lagda.
 Pakisuri ang mga tatak ng HTML.',
-'badsiglength'               => 'Napakahaba ng panlagda.
-Dapat na mas mababa kaysa $1 {{PLURAL:$1|na panitik|na mga panitik}} (karakter).',
+'badsiglength'               => 'Napakahaba ng iyong lagda.
+Dapat na mas mababa kaysa $1 {{PLURAL:$1|panitik|mga panitik}}.',
 'email'                      => 'E-liham',
 'prefs-help-realname'        => "Opsyonal ('di-talaga kailangan) ang tunay na pangalan.
 Kung pipiliin mong ibigay ito, gagamitin ito para mabigyan ka ng pagkilala para iyong mga ginawa.",
@@ -438,7 +462,8 @@ Paki paandarin mo ang mga ito at sumubok uli.',
 'loginsuccesstitle'          => 'Matagumpay ang paglagda',
 'loginsuccess'               => "'''Nakalagda ka na sa {{SITENAME}} bilang si \"\$1\".'''",
 'nosuchuser'                 => 'Walang tagagamit na may pangalang "$1".
-Suriin ang iyong pagbabaybay, o [[Special:UserLogin/signup|lumikha ng bagong kuwenta]].',
+Maselan ang pagmamakinilya ng mga pangalan ng tagagamit.
+Suriin ang iyong pagbabaybay, o [[Special:UserLogin/signup|lumikha ng bagong akawnt]].',
 'nosuchusershort'            => 'Walang tagagamit na may pangalang "<nowiki>$1</nowiki>". Pakitingnan ang iyong pagbabaybay.',
 'nouserspecified'            => 'Kailangang tukuyin mo ang isang pangalang pantagagamit.',
 'wrongpassword'              => 'Mali ang pinasok na hudyat.
@@ -449,13 +474,13 @@ Pakisubok muli.',
 Dapat na mayroon itong {{PLURAL:$1|1 panitik|$1 mga panitik}} (karakter) at naiiba sa iyong pangalang pantagagamit.',
 'mailmypassword'             => 'Ipadala sa pamamagitan ng e-liham ang bagong hudyat',
 'passwordremindertitle'      => 'Bagong pansamantalang hudyat para sa {{SITENAME}}',
-'passwordremindertext'       => 'Mayroong taong (maaaring ikaw, mula sa adres ng IP na $1) humiling ng isang bagong 
+'passwordremindertext'       => 'Mayroong (na maaaring ikaw, mula sa adres ng IP na $1) humiling ng isang bagong 
 hudyat para sa {{SITENAME}} ($4). Isang pansamantalang hudyat ang nilikha 
-para sa tagagamit na "$2" at itinakda bilang "$3".  Kung ito ang iyong pakay, 
+para sa tagagamit na "$2" at itinakda sa "$3".  Kung ito ang iyong pakay, 
 kailangan mo na ngayong lumagda/tumala at pumili ng isang bagong hudyat. 
 
 Kung ibang tao ang humiling nito, o kung naalala mo na ang iyong hudyat,
-at hindi mo ibig baguhin ito, maaari mong huwag pansinin ang mensaheng ito at
+at hindi mo na ibig pang baguhin ito, maaari mong huwag pansinin ang mensaheng ito at
 magpatuloy sa paggamit ng iyong lumang hudyat.',
 'noemail'                    => 'Walang nakatalang adres ng e-liham para sa tagagamit na "$1".',
 'passwordsent'               => 'Isang bagong hudyat ang ipinadala sa adres ng e-liham na nakatala para kay "$1".
@@ -466,12 +491,11 @@ Bago magpadala ng iba pang e-liham sa kuwenta, kailangan mong sundin ang mga tag
 'throttled-mailpassword'     => 'Nagpadala na ng isang paalalang panghudyat, nitong huling {{PLURAL:$1|oras|$1 mga oras}}.
 Para maiwasin ang pangaabuso, isang paalalang panghudyat lang ang ipapadala bawat {{PLURAL:$1|oras|$1 mga oras}}.',
 'mailerror'                  => 'Kamalian sa pagpapadala ng liham: $1',
-'acct_creation_throttle_hit' => 'Paumanhin, nakalikha ka na ng $1 mga kuwenta/akawnt.
-Hindi ka na maaaring gumawa ng higit pa rito.',
-'emailauthenticated'         => 'Napatotohanan ang iyong adres ng e-liham noong $1.',
+'acct_creation_throttle_hit' => 'Ang mga panauhin sa wiking ito na gumagamit ng adres ng IP mo ay nakalikha na ng {{PLURAL:$1|1 akawnt|$1 mga akawnt}} sa loob ng huling araw, na siyang pinakamataas na pinapahintulutan sa loob ng sakop ng panahong ito. Bilang kinalabasan, ang mga panauhing gumagamit ng ganitong adres ng IP ay hindi na muna makakalikha ng anumang karagdagan pang mga akawnt sa ngayon.',
+'emailauthenticated'         => 'Napatunayan na ang iyong adres ng e-liham noong $2 noong $3.',
 'emailnotauthenticated'      => 'Hindi pa napapatunayan ang iyong adres ng e-liham.
 Walang e-liham na ipapadala para sa anumang sumusunod na tampok na kasangkapang-katangian.',
-'noemailprefs'               => 'Tukuyin ang isang adres ng e-liham para gumana ang mga tampok na kasangkapang-katangiang ito.',
+'noemailprefs'               => 'Tumukoy ng isang adres ng e-liham sa loob ng mga nais mo upang gumana ang mga kasangkapang-katangiang ito.',
 'emailconfirmlink'           => 'Pakikompirma ang iyong adres ng e-liham.',
 'invalidemailaddress'        => 'Hindi matatanggap ang adres ng e-liham na ito dahil tila mayroon itong maling anyo.
 Pakipasok ang isang may mahusay na anyong adres o paki-iwang walang laman na lang ang lagayan.',
@@ -482,20 +506,29 @@ Pakipasok ang isang may mahusay na anyong adres o paki-iwang walang laman na lan
 Dapat kang tumala at baguhin ang hudyat mo ngayon.
 
 Maaari mong huwag pansinin ang mensaheng ito, kung mali ang paglikha ng kuwentang ito.',
+'login-throttled'            => 'Masyadong marami ang ginawa mong kamakailan lang na mga pagsubok sa hudyat ng kuwentang ito.
+Maghintay muna po bago sumubok uli.',
 'loginlanguagelabel'         => 'Wika: $1',
 
 # Password reset dialog
-'resetpass'               => 'Muling itakda ang hudyat',
-'resetpass_announce'      => 'Lumagda ka sa pamamagitan ng isang pansamantalang ini-e-liham na kodigo.
+'resetpass'                 => 'Palitan ang hudyat',
+'resetpass_announce'        => 'Lumagda ka sa pamamagitan ng isang pansamantalang ini-e-liham na kodigo.
 Para tapusin ang paglagda, dapat kang magtakda ng isang bagong hudyat dito:',
-'resetpass_text'          => '<!-- Idagdag ang teksto rito -->',
-'resetpass_header'        => 'Baguhin ang hudyat ng kuwenta',
-'resetpass_submit'        => 'Itakda ang hudyat at lumagda',
-'resetpass_success'       => 'Matagumpay na nabago ang iyong hudyat!  Inilalagda ka na ngayon...',
-'resetpass_bad_temporary' => 'Hindi tanggap na pansamantalang hudyat.
+'resetpass_text'            => '<!-- Idagdag ang teksto rito -->',
+'resetpass_header'          => 'Baguhin ang hudyat ng kuwenta',
+'oldpassword'               => 'Lumang hudyat:',
+'newpassword'               => 'Bagong hudyat:',
+'retypenew'                 => 'Ipasok muli ang bagong hudyat:',
+'resetpass_submit'          => 'Itakda ang hudyat at lumagda',
+'resetpass_success'         => 'Matagumpay na nabago ang iyong hudyat!  Inilalagda ka na ngayon...',
+'resetpass_bad_temporary'   => 'Hindi tanggap na pansamantalang hudyat.
+Maaaring matagumpay mo nang nabago ang iyong hudyat o nakahiling na ng isang bagong pansamantalang hudyat.',
+'resetpass_forbidden'       => 'Hindi mababago ang mga hudyat',
+'resetpass-no-info'         => 'Nakalagda ka dapat para tuwirang mapuntahan ang pahina ito.',
+'resetpass-submit-loggedin' => 'Baguhin ang hudyat',
+'resetpass-wrong-oldpass'   => 'Hindi tanggap na pansamantala o pangkasalukuyang hudyat.
 Maaaring matagumpay mo nang nabago ang iyong hudyat o nakahiling na ng isang bagong pansamantalang hudyat.',
-'resetpass_forbidden'     => 'Hindi mababago ang mga hudyat',
-'resetpass_missing'       => 'Datong walang kaanyuhan.',
+'resetpass-temp-password'   => 'Pansamantalang hudyat:',
 
 # Edit page toolbar
 'bold_sample'     => 'Makapal na panitik',
@@ -520,8 +553,8 @@ Maaaring matagumpay mo nang nabago ang iyong hudyat o nakahiling na ng isang bag
 'hr_tip'          => 'Pahalagang na guhit (gamitin nang madalang)',
 
 # Edit pages
-'summary'                          => 'Buod',
-'subject'                          => 'Paksa/punong pamagat',
+'summary'                          => 'Buod:',
+'subject'                          => 'Paksa/paulo:',
 'minoredit'                        => 'Ito ay isang munting pagbabago',
 'watchthis'                        => 'Bantayan ang pahinang ito',
 'savearticle'                      => 'Sagipin ang pahina',
@@ -536,8 +569,8 @@ Kapag pinindot mo uli ang Sagip, masasagip ang pagbabago mo na wala nito.",
 'missingcommenttext'               => 'Magbigay ng isang kumento/puna sa ibaba.',
 'missingcommentheader'             => "'''Paalala:''' Hindi ka nagbigay ng isang paksa/paulo para sa puna/kumentong ito.
 Kapag pinindot mo uli ang Sagip, masasagip ang pagbabago mo na wala nito.",
-'summary-preview'                  => 'Paunang tingin sa buod',
-'subject-preview'                  => 'Paunang tingin sa paksa/ulong-balita',
+'summary-preview'                  => 'Paunang tingin sa buod:',
+'subject-preview'                  => 'Paunang tingin sa paksa/paulo:',
 'blockedtitle'                     => 'Hinarang ang tagagamit',
 'blockedtext'                      => "<big>'''Hinarang/hinadlangan ang iyong pangalan ng tagagamit o adres ng IP.'''</big>
 
@@ -590,11 +623,14 @@ Kung napunta ka rito dahil sa pagkakamali, pakipindot ang pinduntang '''balik'''
 Kaya't kinailangan naming gamitin ang may bilang na adres ng IP para makilala siya.  
 Maaaring pagsaluhan ng ilang mga tagagamit ang ganyang adres ng IP.
 Kung isa kang hindi nagpapakilalang tagagamit at nakadaramang may mga walang saysay na puna/kumentong patungkol sa iyo, [[Special:UserLogin/signup|pakilikha ng isang kuwenta]] o [[Special:UserLogin|lumagda]] para maiwasan ang kalituhan o mapagkamalan ka bilang ibang hindi nakikilalang mga tagagamit sa hinaharap.",
-'noarticletext'                    => 'Walang teksto ang pahinang ito sa kasalukuyan, maaari kang [[Special:Search/{{PAGENAME}}|maghanap para sa pamagat ng pahinang ito]] sa ibang mga pahina o [{{fullurl:{{FULLPAGENAME}}|action=edit}} baguhin ang pahina na ito].',
+'noarticletext'                    => 'Kasalukuyang walang teksto sa loob ng pahinang ito.
+Maaari mong [[Special:Search/{{PAGENAME}}|hanapin ang pamagat ng pahinang ito]] sa loob iba pang mga pahina, 
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} maghanap sa kaugnay na mga talaan],
+o [{{fullurl:{{FULLPAGENAME}}|action=edit}} baguhin ang pahinang ito]</span>.',
 'userpage-userdoesnotexist'        => 'Hindi nakatala ang kuwenta ng tagagamit na "$1".
 Pakisuri kung ibig mong likhain/baguhin ang pahinang ito.',
 'clearyourcache'                   => "'''Tandaan:''' Pagkatapos magtala, dapat linisin mo ang ''cache'' ng iyong ''browser'' upang makita ang mga pagbabago: '''Mozilla:''' pindutin ang ''reload'' (o ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
-'usercssjsyoucanpreview'           => "<strong><i>Tip</i>:</strong> Bago itala, gamitin ang buton ng 'Paunang tingin' upang masubok ang bagong CSS/JS.",
+'usercssjsyoucanpreview'           => "'''<i>Tip</i>:''' Bago itala, gamitin ang buton ng 'Paunang tingin' upang masubok ang bagong CSS/JS.",
 'usercsspreview'                   => "'''Tandaan mong paunang tingin pa lamang ito ng iyong CSS na pantagagamit.'''
 '''Hindi pa ito nasasagip!'''",
 'userjspreview'                    => "'''Tandaang pagsubok/paunang tingin mo pa lang ito ng iyong JavaScript.'''
@@ -602,22 +638,22 @@ Pakisuri kung ibig mong likhain/baguhin ang pahinang ito.',
 'userinvalidcssjstitle'            => "'''Babala:''' Walang pabalat na \"\$1\".
 Tandaang gumagamit ang pinasadyang mga pahinang .css at .js ng mga pamagat na may maliliit na mga titik, halimbawa na ang {{ns:user}}:Foo/monobook.css na taliwas sa {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(Naisapanahon na)',
-'note'                             => '<strong>Paunawa:</strong>',
-'previewnote'                      => '<strong>Isang lamang itong paunang tingin;
-hindi pa nasasagip ang mga pagbabago!</strong>',
+'note'                             => "'''Paunawa:'''",
+'previewnote'                      => "'''Isang lamang itong paunang tingin;
+hindi pa nasasagip ang mga pagbabago!'''",
 'previewconflict'                  => 'Ipinamamalas ng paunang tinging ito ang teksto sa loob ng pangitaas na pook-patnugutan ng teksto ayon sa lilitaw na anyo nito kapag pinili mo ang pagsagip.',
-'session_fail_preview'             => '<strong>Paumanhin! Hindi namin maproseso ang iyong pagbabago hinggil sa pagkawala ng sesyon ng datos.
-Paki ulit muli. Kung hindi ito gumana, subukang umalis sa pagkalagda at bumalik muli.</strong>',
-'session_fail_preview_html'        => "<strong>Paumanhin! Hindi namin maproseso ang iyong pagbabago hinggil sa isang pagkawala ng sesyon ng datos.</strong>
+'session_fail_preview'             => "'''Paumanhin! Hindi namin maproseso ang iyong pagbabago hinggil sa pagkawala ng sesyon ng datos.
+Paki ulit muli. Kung hindi ito gumana, subukang umalis sa pagkalagda at bumalik muli.'''",
+'session_fail_preview_html'        => "'''Paumanhin! Hindi namin maproseso ang iyong pagbabago hinggil sa isang pagkawala ng sesyon ng datos.'''
 
 ''Dahil nakabukas ang hilaw na HTML sa wiking ito, nakatago ang paunang tingin bilang pag-iingat sa mga paglusob ng JavaScript.''
 
-<strong>Kung lehitimong pagbabago ito, paki ulit muli. Kung hindi ito gumana, subuking umalis sa pagkalagda at bumalik muli.</strong>",
-'token_suffix_mismatch'            => "<strong>Hindi tinanggap ang iyong pagbabago dahil sinira ng ''client'' ang mga karakter na bantas sa ''token'' ng mamatnugot. Tinanggihan ang pagbabago upang maiwasan ang korupsyon ng teksto ng artikulo. 
-Nangyayari ito sa kadalasan kapag gumagamit ka ng isang pang-web na hindi kilalang serbisyo ng ''proxy'' na may ''bug''.</strong>",
+'''Kung lehitimong pagbabago ito, paki ulit muli. Kung hindi ito gumana, subuking umalis sa pagkalagda at bumalik muli.'''",
+'token_suffix_mismatch'            => "'''Hindi tinanggap ang iyong pagbabago dahil sinira ng ''client'' ang mga karakter na bantas sa ''token'' ng mamatnugot. Tinanggihan ang pagbabago upang maiwasan ang korupsyon ng teksto ng artikulo. 
+Nangyayari ito sa kadalasan kapag gumagamit ka ng isang pang-web na hindi kilalang serbisyo ng ''proxy'' na may ''bug''.'''",
 'editing'                          => 'Binabago ang $1',
 'editingsection'                   => 'Binabago ang $1 (bahagi)',
-'editingcomment'                   => 'Binabago ang $1 (komento)',
+'editingcomment'                   => 'Binabago ang $1 (bagong seksyon)',
 'editconflict'                     => 'Alitan sa pagbabago: $1',
 'explainconflict'                  => 'Mayroon nagbago ng pahinang ito simula nang baguhin mo ito.
 Naglalaman ang mga nasa taas na teksto ng mga pahinang teksto at kasalukuyang mayroon ito.
@@ -626,28 +662,29 @@ Kailangan mong pagsamahin ang mga binago mo sa kasalukuyang teksto.
 Maitatala <b>lamang</b> ang nasa taas na teksto kapag pinindot ang "Itala ang pahina".<br />',
 'yourtext'                         => 'Teksto mo',
 'storedversion'                    => 'Nakatagong bersyon',
-'nonunicodebrowser'                => '<strong>BABALA: Hindi sumusunod sa unicode ang browser mo. May ginawang solusyon para pahintulutan na ligtas ang pagbabago ng mga artikulo: mga hindi ASCII mga karakter bilang kodigong hexadecimal ang magpapakita sa kahon.</strong>',
-'editingold'                       => '<strong>Babala: Binabago mo ang lumang bersyon ng pahinang ito.
-Kapag itinala mo ito, mawawala ang anumang pagbabago mula sa bersyon na ito.</strong>',
+'nonunicodebrowser'                => "'''BABALA: Hindi sumusunod sa unicode ang browser mo. May ginawang solusyon para pahintulutan na ligtas ang pagbabago ng mga artikulo: mga hindi ASCII mga karakter bilang kodigong hexadecimal ang magpapakita sa kahon.'''",
+'editingold'                       => "'''Babala: Binabago mo ang lumang bersyon ng pahinang ito.
+Kapag itinala mo ito, mawawala ang anumang pagbabago mula sa bersyon na ito.'''",
 'yourdiff'                         => 'Mga pagkakaiba',
-'copyrightwarning'                 => 'Pakitandaan na lahat ng mga ambag sa {{SITENAME}} ay itinuturing na inilibas sa ilalim ng $2 (tingnan ang $1 para sa mga detalye).
+'copyrightwarning'                 => "Pakitandaan na lahat ng mga ambag sa {{SITENAME}} ay itinuturing na inilibas sa ilalim ng $2 (tingnan ang $1 para sa mga detalye).
 Kung hindi mo nais na labis-labis na baguhin ang iyong isinulat at sadyaing muling ipamahagi, huwag mo na lamang itong ipasa rito.<br />
 Nangangako ka rin sa amin na ikaw mismo ang sumulat nito, sumipi/kumopya nito mula sa isang pinagmulang nasa dominyo na ng publIko o katulad.
-<strong>HUWAG MAGPASA NG AKDANG NAKAKARAPATANG-ARI (NAKAKOPIRAYT) NA HINDI MUNA HUMIHINGI NG PAHINTULOT!</strong>',
-'copyrightwarning2'                => 'Pakitandaan lamang na lahat ng mga ambag sa {{SITENAME}} ay maaaring baguhin o tanggalin ng ibang mga tagapaglathala/tagapagambag.
+'''HUWAG MAGPASA NG AKDANG NAKAKARAPATANG-ARI (NAKAKOPIRAYT) NA HINDI MUNA HUMIHINGI NG PAHINTULOT!'''",
+'copyrightwarning2'                => "Pakitandaan lamang na lahat ng mga ambag sa {{SITENAME}} ay maaaring baguhin o tanggalin ng ibang mga tagapaglathala/tagapagambag.
 Kung ayaw mong mabago nang labis-labis ang mga isinulat mo, mas mabuting huwag mo na lamang ipasa iyan dito.<br /> 
 Nangangako ka rin sa amin na ikaw ang mismong sumulat nito, o sinipi/kinopya mo ito mula sa isang pinagmulang nasa dominyo na ng publiko o katulad (tingnan ang $1 para sa mga detalye).
-<strong>HUWAG MAGTALA NG AKDANG NAKAKARAPATANG-ARI (NAKAKOPIRAYT) NA HINDI MUNA HUMIHINGI NG PAHINTULOT!</strong>',
-'longpagewarning'                  => "<strong>BABALA: May habang $1 ''kilobyte'' ang pahinang ito; maaaring magkaroon ng suliranin sa pagbabago ng mga pahina ang ilang mga pantingin-tinging (''browser'') malapit nang umabot o mas mahaba na sa 32kb.  Isaalang-alang ang paghahati ng pahina patungo sa mas maliliit na mga seksyon/bahagi.</strong>",
-'longpageerror'                    => "<strong>KAMALIAN: May habang $1 ''kilobyte'' ang ipinasa mong teksto, na mas mahaba kaysa $2 ''kilobyte'' na siyang pinakamataas na nakatakdang halaga.
-Hindi ito masasagip.</strong>",
-'readonlywarning'                  => "<strong>BABALA: Ikinandado ang kalipunan ng dato para sa pagpapanatili, kaya't hindi mo masasagip ang mga ginawa mong pagbabago sa ngayon.
-
-Maaaring ibigin mong gupitin at idikit ang teksto sa isang talaksang pangteksto at sagipin ito mamaya.</strong>",
-'protectedpagewarning'             => "<strong>BABALA: Ikinandado ang pahinang ito upang mga tagagamit na may mga karapatang pang-''sysop'' lamang ang makapagbago nito.</strong>",
+'''HUWAG MAGTALA NG AKDANG NAKAKARAPATANG-ARI (NAKAKOPIRAYT) NA HINDI MUNA HUMIHINGI NG PAHINTULOT!'''",
+'longpagewarning'                  => "'''BABALA: May habang $1 ''kilobyte'' ang pahinang ito; maaaring magkaroon ng suliranin sa pagbabago ng mga pahina ang ilang mga pantingin-tinging (''browser'') malapit nang umabot o mas mahaba na sa 32kb.  Isaalang-alang ang paghahati ng pahina patungo sa mas maliliit na mga seksyon/bahagi.'''",
+'longpageerror'                    => "'''KAMALIAN: May habang $1 ''kilobyte'' ang ipinasa mong teksto, na mas mahaba kaysa $2 ''kilobyte'' na siyang pinakamataas na nakatakdang halaga.
+Hindi ito masasagip.'''",
+'readonlywarning'                  => "'''BABALA: Ikinandado ang kalipunan ng dato para sa gawaing pampagpapanatili, kaya't hindi mo pa masasagip ang mga pagbabagong ginawa mo ngayon.
+Maaaring ibigin mong gupitin at idikit ang teksto patungo sa isang talaksang pangteksto at sagipin ito mamaya.'''
+
+Nagbigay ng ganitong paliwanag ang tagapangasiwang nagkandado nito: $1",
+'protectedpagewarning'             => "'''BABALA: Ikinandado ang pahinang ito upang mga tagagamit na may mga karapatang pang-''sysop'' lamang ang makapagbago nito.'''",
 'semiprotectedpagewarning'         => "'''Paunawa:''' Ikinandado ang pahinang ito upang tanging nakatalang mga tagagamit lamang ang makapagbago nito.",
 'cascadeprotectedwarning'          => "'''Babala:''' Ikinandado ang pahinang ito upang tanging mga tagagamit na may mga karapatang pang-''sysop'' lamang ang makapagbago nito, dahil kabilang ito sa sumusunod na mga {{PLURAL:$1|pahinang|mga pahinang}} may baita-baitang na panananggalang:",
-'titleprotectedwarning'            => '<strong>BABALA:  Ikinandado ang pahinang ito upang tanging ilang mga tagagamit lamang ang makalikha nito.</strong>',
+'titleprotectedwarning'            => "'''BABALA:  Ikinandado ang pahinang ito upang [[Special:ListGroupRights|partikular na mga karapatan]] ang kailanganin upang malikha ito.'''",
 'templatesused'                    => 'Mga suleras na ginagamit sa pahinang ito:',
 'templatesusedpreview'             => 'Mga suleras na ginagamit para sa paunang-tinging ito:',
 'templatesusedsection'             => 'Mga suleras na ginagamit para sa bahaging ito:',
@@ -666,17 +703,30 @@ Maaari kang bumalik at magbago ng isang umiiral na pahina, o kaya [[Special:User
 
 Dapat mong isaalang-alang kung nararapat bang ipagpatuloy ang pagbago sa pahinang ito.
 Ibinigay dito ang tala ng pagbubura para sa pahinang ito para sa kaginhawahan mo:",
+'deleted-notice'                   => 'Nabura na dati ang pahinang ito.
+Ibinigay sa ibaba ang tala ng pagbubura para sa pahinang ito bilang sanggunian.',
+'deletelog-fulllog'                => 'Tingnan ang buong tala',
+'edit-hook-aborted'                => 'Pinigil ng sungkit ang pagbabago.
+Walang ibinigay na paliwanag.',
+'edit-gone-missing'                => 'Hindi maisapanahon ang pahina.
+Tila binura na ito.',
+'edit-conflict'                    => 'May salungatan sa pagbago.',
+'edit-no-change'                   => 'Binalewala ang pagbabago mo, dahil walang pagbabagong ginawa sa teksto.',
+'edit-already-exists'              => 'Hindi makalikha ng isang bagong pahina.
+Umiiral na ito.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'        => "Babala: Naglalaman ang pahinang ito ng napakaraming mamahaling pagtawag sa mga tungkulin ng banghay (''parser'').
+'expensive-parserfunction-warning'        => 'Babala: Naglalaman ang pahinang ito ng napakaraming mamahaling mga tawag na pantungkulin.
 
-Dapat na mas mababa ito kaysa $2, sa ngayon ay mayroong mga $1.",
+Dapat na mayroon itong mas mababa sa $2 {{PLURAL:$2|tawag|mga tawag}}, mayroon {{PLURAL:$1|ngayong $1 isang tawag|ngayong $1 mga tawag}}.',
 'expensive-parserfunction-category'       => "Mga pahinang may napakaraming mga mamahaling tawag na pantungkulin ng banghay (''parser'')",
 'post-expand-template-inclusion-warning'  => 'Babala: Napakalaki ng sukat ng saklaw ng suleras.
 Hindi isasama ang ilang mga suleras.',
 'post-expand-template-inclusion-category' => 'Mga pahina kung saan lumabis ang sukat ng saklaw ng suleras',
 'post-expand-template-argument-warning'   => 'Babala: Naglalamang ang pahinang ito ng kahit isang pagaalitan ng suleras na napakalaki ng sukat ng paglawak.  Tinanggal ang mga alitang ito.',
 'post-expand-template-argument-category'  => 'Mga pahinang naglalaman ng mga tinanggal na mga alitan ng suleras',
+'parser-template-loop-warning'            => 'Nadiskubreng silo ng suleras: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Lumabis na sa nakatakdang lalim ng rekursyon (pormula) ng suleras ($1)',
 
 # "Undo" feature
 'undo-success' => 'Matatanggal ang pagbabago.
@@ -692,29 +742,29 @@ Pakitingnan ang paghahambing sa ibaba para masiyasat kung ito ang ibig mong gawi
 Ang dahilang ibinigay ni $3 ay ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Tingnan ang mga pagtatala para sa pahinang ito',
-'nohistory'           => 'Walang kasaysayan ng pagbabago para sa pahinang ito.',
-'revnotfound'         => 'Hindi natagpuan ang pagbabago',
-'revnotfoundtext'     => 'Hindi matagpuan ang hiniling mong lumang pagbabago ng isang pahina.  Pakisuri ang ginamit mong URL para mapuntahan ang pahinang ito.',
-'currentrev'          => 'Pangkasalukuyang pagbabago',
-'revisionasof'        => 'Pagbabago mula noong $1',
-'revision-info'       => 'Pagbabago mula noong $1 ni $2',
-'previousrevision'    => '� Lumang pagbabago',
-'nextrevision'        => 'Bagong pagbabago →',
-'currentrevisionlink' => 'Pangkasalukuyang pagbabago',
-'cur'                 => 'kasalukuyan',
-'next'                => 'susunod',
-'last'                => 'huli',
-'page_first'          => 'una',
-'page_last'           => 'huli',
-'histlegend'          => "Ipaghambing ang mga napili: markahan ang mga radyong buton (''radio button'') ng mga bersyong ihahambing at pindutin ang ''enter'' o ang buton sa ilalim.<br />
+'viewpagelogs'           => 'Tingnan ang mga pagtatala para sa pahinang ito',
+'nohistory'              => 'Walang kasaysayan ng pagbabago para sa pahinang ito.',
+'currentrev'             => 'Pangkasalukuyang pagbabago',
+'currentrev-asof'        => 'Pangkasalukuyang pagbabago mula noong $1',
+'revisionasof'           => 'Pagbabago mula noong $1',
+'revision-info'          => 'Pagbabago mula noong $1 ni $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Lumang pagbabago',
+'nextrevision'           => 'Bagong pagbabago →',
+'currentrevisionlink'    => 'Pangkasalukuyang pagbabago',
+'cur'                    => 'kasalukuyan',
+'next'                   => 'susunod',
+'last'                   => 'huli',
+'page_first'             => 'una',
+'page_last'              => 'huli',
+'histlegend'             => "Ipaghambing ang mga napili: markahan ang mga radyong buton (''radio button'') ng mga bersyong ihahambing at pindutin ang ''enter'' o ang buton sa ilalim.<br />
 Mga daglat: (kas) = pagkakaiba sa kasalukuyang bersyon,
 (huli) = pagkakaiba sa naunang bersyon, m = maliit na pagbabago.",
-'deletedrev'          => '[binura]',
-'histfirst'           => 'Pinakasinauna',
-'histlast'            => 'Pinakakamakailan',
-'historysize'         => "({{PLURAL:$1|1 byte|$1 mga ''byte''}})",
-'historyempty'        => '(walang laman)',
+'history-fieldset-title' => 'Tumingin-tingin sa kasaysayan',
+'deletedrev'             => '[binura]',
+'histfirst'              => 'Pinakasinauna',
+'histlast'               => 'Pinakakamakailan',
+'historysize'            => "({{PLURAL:$1|1 byte|$1 mga ''byte''}})",
+'historyempty'           => '(walang laman)',
 
 # Revision feed
 'history-feed-title'          => 'Kasaysayan ng pagbabago',
@@ -801,6 +851,7 @@ Tiyakin na ang pagbabago ay makapagpapanatili ng pagkakatuluy-tuloy ng pahinang
 'mergehistory-invalid-destination' => 'Tanggap na pamagat dapat ang kapupuntahang pahina.',
 'mergehistory-autocomment'         => 'Pinagsanib ang [[:$1]] sa [[:$2]]',
 'mergehistory-comment'             => 'Pinagsanib ang [[:$1]] sa [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Pinagmulan at patutunguhan hindi dapat magkatulad',
 
 # Merge log
 'mergelog'           => 'Tala ng pagsasanib',
@@ -813,122 +864,204 @@ Tiyakin na ang pagbabago ay makapagpapanatili ng pagkakatuluy-tuloy ng pahinang
 'difference'              => '(Pagkakaiba sa pagitan ng mga pagbabago)',
 'lineno'                  => 'Linya $1:',
 'compareselectedversions' => 'Paghambingin ang mga napiling bersyon',
+'visualcomparison'        => 'Napagmamasdang paghahambing',
+'wikicodecomparison'      => 'Paghahambing ng Wikiteksto',
 'editundo'                => 'ibalik',
 'diff-multi'              => '({{PLURAL:$1|Isang panggitnang pagbabago|$1 panggitnang mga pagbabago}} hindi ipinakita.)',
+'diff-movedto'            => 'nilipat sa $1',
+'diff-styleadded'         => '$1 estilo dinagdag',
+'diff-added'              => '$1 dinagdag',
+'diff-changedto'          => 'binago na naging $1',
+'diff-movedoutof'         => 'nilipat mula sa $1',
+'diff-styleremoved'       => '$1 estilo inalis',
+'diff-removed'            => '$1 inalis',
+'diff-changedfrom'        => 'binago mula sa $1',
+'diff-src'                => 'pinagmulan',
+'diff-withdestination'    => 'may patutunguhang $1',
+'diff-with'               => '&#32;may $1 $2',
+'diff-with-final'         => '&#32;at $1 $2',
+'diff-width'              => 'lapad',
+'diff-height'             => 'taas',
+'diff-p'                  => "isang '''talata'''",
+'diff-blockquote'         => "isang '''sipi ng pagbanggit'''",
+'diff-h1'                 => "isang '''paulo (antas 1)'''",
+'diff-h2'                 => "isang '''paulo (antas 2)'''",
+'diff-h3'                 => "isang '''paulo (antas 3)'''",
+'diff-h4'                 => "isang '''paulo (antas 4)'''",
+'diff-h5'                 => "isang '''paulo (antas 5)'''",
+'diff-pre'                => "isang '''pagharang/paghadlang na may dati nang nakatakdang pormat'''",
+'diff-div'                => "isang '''kahatian'''",
+'diff-ul'                 => "isang '''hindi magkakasunod na talaan'''",
+'diff-ol'                 => "isang '''may pagkakasunud-sunod na talaan'''",
+'diff-li'                 => "isang '''bagay na pantalaan'''",
+'diff-table'              => "isang '''tabla'''",
+'diff-tbody'              => "isang '''nilalaman ng tabla'''",
+'diff-tr'                 => "isang '''pahalang na hanay'''",
+'diff-td'                 => "isang '''selula'''",
+'diff-th'                 => "isang '''paulo'''",
+'diff-br'                 => "isang '''pagputol'''",
+'diff-hr'                 => "isang '''patakaran sa pagpapahalang'''",
+'diff-code'               => "isang '''pagharang sa kodigong pangkompyuter'''",
+'diff-dl'                 => "isang '''talaang pangkahulugan'''",
+'diff-dt'                 => "isang '''salitang pangkahulugan'''",
+'diff-dd'                 => "isang '''kahulugan'''",
+'diff-input'              => "isang '''puhunan''' (input)",
+'diff-form'               => "isang '''pormularyo'''",
+'diff-img'                => "isang '''larawan'''",
+'diff-span'               => "isang '''haba ng sukat''' (''span'')",
+'diff-a'                  => "isang '''kawing'''",
+'diff-i'                  => "'''mga pahilis'''",
+'diff-b'                  => "'''makapal'''",
+'diff-strong'             => "'''malakas'''",
+'diff-em'                 => "'''bigay-diin'''",
+'diff-font'               => "'''estilo ng titik''' (''font'')",
+'diff-big'                => "'''malaki'''",
+'diff-del'                => "'''nabura'''",
+'diff-tt'                 => "'''nakatakdang lapad'''",
+'diff-sub'                => "'''pangibabang panitik'''",
+'diff-sup'                => "'''pangitaas na panitik'''",
+'diff-strike'             => "'''patamaan ng guhit'''",
 
 # Search results
-'searchresults'             => 'Kinalabasan/Resulta ng paghahanap',
-'searchresulttext'          => 'Para sa mas maraming kabatiran hinggil sa paghahanap sa {{SITENAME}}, tingnan ang [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Hinanap mo ang \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|lahat ng mga pahinang nagsisimula sa "$1"]] | [[Special:WhatLinksHere/$1|lahat ng mga pahinang nakakawing sa "$1"]])',
-'searchsubtitleinvalid'     => "Hinanap mo ang '''$1'''",
-'noexactmatch'              => "'''Walang pahinang pinamagatang \"\$1\".'''
+'searchresults'                    => 'Kinalabasan/Resulta ng paghahanap',
+'searchresults-title'              => 'Resulta ng paghahanap para sa "$1"',
+'searchresulttext'                 => 'Para sa mas maraming kabatiran hinggil sa paghahanap sa {{SITENAME}}, tingnan ang [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => 'Hinanap mo ang \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|lahat ng mga pahinang nagsisimula sa "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|lahat ng mga pahinang nakakawing sa "$1"]])',
+'searchsubtitleinvalid'            => "Hinanap mo ang '''$1'''",
+'noexactmatch'                     => "'''Walang pahinang pinamagatang \"\$1\".'''
 Maaari mong [[:\$1|likhain ang pahinang ito]].",
-'noexactmatch-nocreate'     => "'''Walang pahinang pinamagatang \"\$1\".'''",
-'toomanymatches'            => 'Napakaraming mga tumutugmang ibinalik, pakisubok ang isang ibang tanong',
-'titlematches'              => 'Tumutugma ang pamagat ng pahina',
-'notitlematches'            => 'Walang tumutugmang pamagat ng pahina',
-'textmatches'               => 'Tumutugma ang teksto ng pahina',
-'notextmatches'             => 'Walang katugmang pahina ng teksto',
-'prevn'                     => 'nauna $1',
-'nextn'                     => 'kasunod $1',
-'viewprevnext'              => 'Tingnan ($1) ($2) ($3)',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 salita|$2 mga salita}})',
-'search-result-score'       => 'Kaugnayan: $1%',
-'search-redirect'           => '(ipanuto/ituro ang $1)',
-'search-section'            => '(seksyong $1)',
-'search-suggest'            => 'Ito ba ang ibig mong sabihin: $1',
-'search-interwiki-caption'  => 'Kapatid na mga proyekto',
-'search-interwiki-default'  => '$1 mga resulta:',
-'search-interwiki-more'     => '(mas marami pa)',
-'search-mwsuggest-enabled'  => 'may mga mungkahi',
-'search-mwsuggest-disabled' => 'walang mga mungkahi',
-'search-relatedarticle'     => 'Kaugnay',
-'mwsuggest-disable'         => 'Huwag paganahin ang mga mungkahi ng AJAX',
-'searchrelated'             => 'kaugnay',
-'searchall'                 => 'lahat',
-'showingresults'            => "Ipinapakita sa ibaba ang magpahanggang sa {{PLURAL:$1|'''1''' resultang|'''$1''' mga resultang}} nagsisimula sa #'''$2'''.",
-'showingresultsnum'         => "Ipinapakita sa ibaba ang {{PLURAL:$3|'''1''' resultang|'''$3''' mga resultang}} nagsisimula sa #'''$2'''.",
-'showingresultstotal'       => "Ipinapakita sa ibaba ang {{PLURAL:$3|kinalabasang '''$1''' ng '''$3'''|mga kinalabasang '''$1 - $2''' ng '''$3'''}}",
-'nonefound'                 => "'''Tandaan''': Ang hindi matagumpay na mga paghahanap ay kadalasang sanhi ng paghanap sa mga karaniwang mga salit tulad ng \"mayroon\" at \"mula\", na hindi naka-indeks, o pagbibigay ng higit sa isang terminong hinahanap. (ang pahina lamang na naglalaman ng lahat ng mga terminong hinahanap ang maipapakita sa resulta).",
-'powersearch'               => 'Paghahanap na may mas mataas na antas',
-'powersearch-legend'        => 'Paghahanap na may mas mataas na antas',
-'powersearch-ns'            => 'Maghanap sa mga espasyo ng pangalan:',
-'powersearch-redir'         => 'Itala ang mga panuto',
-'powersearch-field'         => 'Hanapin ang',
-'search-external'           => 'Panlabas na paghahanap',
-'searchdisabled'            => 'Nakapatay ang paghahanap sa {{SITENAME}}. Maaari kang pansamantalang maghanap sa pamamagitan ng Google. Tandaan na maaaring luma na ang kanilang mga indeks sa nilalaman ng {{SITENAME}}.',
+'noexactmatch-nocreate'            => "'''Walang pahinang pinamagatang \"\$1\".'''",
+'toomanymatches'                   => 'Napakaraming mga tumutugmang ibinalik, pakisubok ang isang ibang tanong',
+'titlematches'                     => 'Tumutugma ang pamagat ng pahina',
+'notitlematches'                   => 'Walang tumutugmang pamagat ng pahina',
+'textmatches'                      => 'Tumutugma ang teksto ng pahina',
+'notextmatches'                    => 'Walang katugmang pahina ng teksto',
+'prevn'                            => 'nauna $1',
+'nextn'                            => 'kasunod $1',
+'viewprevnext'                     => 'Tingnan ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Mga pagpipilian para sa paghahanap',
+'searchmenu-exists'                => "'''Mayroong pahinang may pangalang \"[[:\$1]]\" dito sa wiking ito'''",
+'searchmenu-new'                   => "'''Likhain ang pahinang \"[[:\$1]]\" sa wiking ito!'''",
+'searchhelp-url'                   => 'Help:Nilalaman',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Tingnan-tingnan ang mga pahinang may ganitong unahan/unlapi]]',
+'searchprofile-articles'           => 'Mga pahina ng nilalaman',
+'searchprofile-articles-and-proj'  => 'Mga pahina ng nilalaman at proyekto',
+'searchprofile-project'            => 'Mga pahina ng proyekto',
+'searchprofile-images'             => 'Mga talaksan',
+'searchprofile-everything'         => 'Lahat ng bagay',
+'searchprofile-advanced'           => 'Mas mataas na antas',
+'searchprofile-articles-tooltip'   => 'Hanapin sa $1',
+'searchprofile-project-tooltip'    => 'Hanapin sa $1',
+'searchprofile-images-tooltip'     => 'Maghanap ng mga talaksan',
+'searchprofile-everything-tooltip' => 'Hanapin ang lahat ng nilalaman (kabilang ang mga pahina ng usapan)',
+'searchprofile-advanced-tooltip'   => 'Hanapin sa pinasadyang mga espasyo ng pangalan',
+'prefs-search-nsdefault'           => 'Hanapin ayon sa likas na pagkakatakda:',
+'prefs-search-nscustom'            => 'Hanapin ang pinasadyang mga espasyo ng pangalan:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 salita|$2 mga salita}})',
+'search-result-score'              => 'Kaugnayan: $1%',
+'search-redirect'                  => '(ipanuto/ituro ang $1)',
+'search-section'                   => '(seksyong $1)',
+'search-suggest'                   => 'Ito ba ang ibig mong sabihin: $1',
+'search-interwiki-caption'         => 'Kapatid na mga proyekto',
+'search-interwiki-default'         => '$1 mga resulta:',
+'search-interwiki-more'            => '(mas marami pa)',
+'search-mwsuggest-enabled'         => 'may mga mungkahi',
+'search-mwsuggest-disabled'        => 'walang mga mungkahi',
+'search-relatedarticle'            => 'Kaugnay',
+'mwsuggest-disable'                => 'Huwag paganahin ang mga mungkahi ng AJAX',
+'searchrelated'                    => 'kaugnay',
+'searchall'                        => 'lahat',
+'showingresults'                   => "Ipinapakita sa ibaba ang magpahanggang sa {{PLURAL:$1|'''1''' resultang|'''$1''' mga resultang}} nagsisimula sa #'''$2'''.",
+'showingresultsnum'                => "Ipinapakita sa ibaba ang {{PLURAL:$3|'''1''' resultang|'''$3''' mga resultang}} nagsisimula sa #'''$2'''.",
+'showingresultstotal'              => "Ipinapakita sa ibaba ang {{PLURAL:$4|resultang '''$1''' ng '''$3'''|mga resultang '''$1 - $2''' ng '''$3'''}}",
+'nonefound'                        => "'''Paunawa''': Ilang mga espasyo ng pangalan lamang ang hinahanap ayon sa likas na pagkakatakda.
+Subuking lagyan ng unlapi/paunang ''all:'' upang hanapin ang lahat ng mga nialalaman (kabilang ang mga pahina ng usapan, mga suleras, atbp), o gamitin ang ninanais na espasyo ng pangalan bilang unlapi.",
+'search-nonefound'                 => 'Walang mga resultang tumutugma sa katanungan/pagtatanong.',
+'powersearch'                      => 'Paghahanap na may mas mataas na antas',
+'powersearch-legend'               => 'Paghahanap na may mas mataas na antas',
+'powersearch-ns'                   => 'Maghanap sa mga espasyo ng pangalan:',
+'powersearch-redir'                => 'Itala ang mga panuto',
+'powersearch-field'                => 'Hanapin ang',
+'search-external'                  => 'Panlabas na paghahanap',
+'searchdisabled'                   => 'Nakapatay ang paghahanap sa {{SITENAME}}. Maaari kang pansamantalang maghanap sa pamamagitan ng Google. Tandaan na maaaring luma na ang kanilang mga indeks sa nilalaman ng {{SITENAME}}.',
 
 # Preferences page
-'preferences'              => 'Mga kagustuhan',
-'mypreferences'            => 'Aking mga kagustuhan',
-'prefs-edits'              => 'Bilang ng mga pagbabago:',
-'prefsnologin'             => 'Hindi nakalagda/nakatala',
-'prefsnologintext'         => 'Kailangan mong <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} lumagda/tumala]</span> para makapagtakda ng mga kagustuhang ng tagagamit.',
-'prefsreset'               => 'Muling itinakda ang mga kagustuhan mula sa taguan.',
-'qbsettings'               => 'Quickbar',
-'qbsettings-none'          => 'Wala',
-'qbsettings-fixedleft'     => 'Inayos ang kaliwa',
-'qbsettings-fixedright'    => 'Inayos ang kanan',
-'qbsettings-floatingleft'  => 'Kaliwa lumulutang',
-'qbsettings-floatingright' => 'Kanan lumulutang',
-'changepassword'           => 'Baguhin ang hudyat',
-'skin'                     => 'Pabalat',
-'math'                     => 'Matematika',
-'dateformat'               => 'Anyo ng petsa',
-'datedefault'              => 'Walang kagustuhan',
-'datetime'                 => 'Petsa at oras',
-'math_failure'             => 'Nabigo sa pagbanghay',
-'math_unknown_error'       => 'hindi nalalamang kamalian',
-'math_unknown_function'    => 'hindi nalalamang tungkulin',
-'math_lexing_error'        => 'kamalian sa pagbabatas',
-'math_syntax_error'        => 'kamalian sa palaugnayan',
-'math_image_error'         => 'Nabigo ang pagpapalit patungong PNG;
+'preferences'               => 'Mga kagustuhan',
+'mypreferences'             => 'Aking mga kagustuhan',
+'prefs-edits'               => 'Bilang ng mga pagbabago:',
+'prefsnologin'              => 'Hindi nakalagda/nakatala',
+'prefsnologintext'          => 'Kailangan mong <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} lumagda/tumala]</span> para makapagtakda ng mga kagustuhang ng tagagamit.',
+'prefsreset'                => 'Muling itinakda ang mga kagustuhan mula sa taguan.',
+'qbsettings'                => 'Quickbar',
+'qbsettings-none'           => 'Wala',
+'qbsettings-fixedleft'      => 'Inayos ang kaliwa',
+'qbsettings-fixedright'     => 'Inayos ang kanan',
+'qbsettings-floatingleft'   => 'Kaliwa lumulutang',
+'qbsettings-floatingright'  => 'Kanan lumulutang',
+'changepassword'            => 'Baguhin ang hudyat',
+'skin'                      => 'Pabalat',
+'skin-preview'              => 'Unang tingin',
+'math'                      => 'Matematika',
+'dateformat'                => 'Anyo ng petsa',
+'datedefault'               => 'Walang kagustuhan',
+'datetime'                  => 'Petsa at oras',
+'math_failure'              => 'Nabigo sa pagbanghay',
+'math_unknown_error'        => 'hindi nalalamang kamalian',
+'math_unknown_function'     => 'hindi nalalamang tungkulin',
+'math_lexing_error'         => 'kamalian sa pagbabatas',
+'math_syntax_error'         => 'kamalian sa palaugnayan',
+'math_image_error'          => 'Nabigo ang pagpapalit patungong PNG;
 pakisuri kung tama ang pagiinstala ng latex, dvips, gs, at palitan',
-'math_bad_tmpdir'          => 'Hindi maisulat sa o makalikha ng pansamantalang direktoryong pangmatematika',
-'math_bad_output'          => 'Hindi maisulat sa o makalikha ng direktoryo ng produktong pangmatematika',
-'math_notexvc'             => 'Nawawala ang maisasakatuparang texvc;
+'math_bad_tmpdir'           => 'Hindi maisulat sa o makalikha ng pansamantalang direktoryong pangmatematika',
+'math_bad_output'           => 'Hindi maisulat sa o makalikha ng direktoryo ng produktong pangmatematika',
+'math_notexvc'              => 'Nawawala ang maisasakatuparang texvc;
 pakitingnan ang matematika/BASAHINAKO para maisaayos ang konpigurasyon.',
-'prefs-personal'           => 'Sanligang pangkatangian ng tagagamit',
-'prefs-rc'                 => 'Kamakailan lamang na mga pagbabago',
-'prefs-watchlist'          => 'Talaan ng mga binabantayan',
-'prefs-watchlist-days'     => 'Mga araw na ipapakita sa talaan ng mga binabantayan:',
-'prefs-watchlist-edits'    => 'Pinakamaraming bilang ng mga pagbabagong ipapakita sa pinalawak na talaan ng mga binabantayan:',
-'prefs-misc'               => 'Bala-balaki',
-'saveprefs'                => 'Sagip',
-'resetprefs'               => 'Hawanin ang hindi nasagip na mga pagbabago',
-'oldpassword'              => 'Lumang hudyat:',
-'newpassword'              => 'Bagong hudyat:',
-'retypenew'                => 'Ipasok muli ang bagong hudyat:',
-'textboxsize'              => 'May binabago',
-'rows'                     => 'Mga pahalang na hanay:',
-'columns'                  => 'Mga pahabang hanay:',
-'searchresultshead'        => 'Hanapin',
-'resultsperpage'           => 'Bilang ng pagtama sa bawat pahina:',
-'contextlines'             => 'Linya bawat pagtama:',
-'contextchars'             => 'Konteksto ng bawat guhit:',
-'stub-threshold'           => 'Kakayanan para sa pagpopormat ng <a href="#" class="usbong">kawing ng usbong</a> (mga \'\'byte\'\'):',
-'recentchangesdays'        => 'Mga araw na ipapakita sa kamakailan lamang na mga pagbabago:',
-'recentchangescount'       => 'Bilang ng mga pagbabagong ipapakita sa mga pahina ng kamakailan lamang na mga pagbabago, kasaysayan at pagtatala:',
-'savedprefs'               => 'Nasagip na ang mga kagustuhan mo.',
-'timezonelegend'           => 'Sona ng oras',
-'timezonetext'             => '¹Ang bilang ng pagkakaiba ng katutubong oras mo mula sa oras ng serbidor (UTC).',
-'localtime'                => 'Katutubong oras',
-'timezoneoffset'           => 'Pambawi (pambalanse)¹',
-'servertime'               => 'Oras sa serbidor',
-'guesstimezone'            => "Punuin ng mula sa pantingin-tingin (''browser'')",
-'allowemail'               => 'Pahintulutan ang e-liham mula sa ibang mga tagagamit',
-'prefs-searchoptions'      => 'Mga pagpipilian para sa paghahanap',
-'prefs-namespaces'         => 'Mga espasyo ng pangalan',
-'defaultns'                => 'Maghanap sa mga pangalan ng espasyong ito ayon sa likas na pagtatakda:',
-'default'                  => 'Likas na pagtatakda',
-'files'                    => 'Mga talaksan',
+'prefs-personal'            => 'Sanligang pangkatangian ng tagagamit',
+'prefs-rc'                  => 'Kamakailan lamang na mga pagbabago',
+'prefs-watchlist'           => 'Talaan ng mga binabantayan',
+'prefs-watchlist-days'      => 'Mga araw na ipapakita sa talaan ng mga binabantayan:',
+'prefs-watchlist-days-max'  => '(pinakamarami ang 7 mga araw)',
+'prefs-watchlist-edits'     => 'Pinakamaraming bilang ng mga pagbabagong ipapakita sa pinalawak na talaan ng mga binabantayan:',
+'prefs-watchlist-edits-max' => '(pinakamataas na bilang: 1000)',
+'prefs-misc'                => 'Bala-balaki',
+'prefs-resetpass'           => 'Baguhin ang hudyat',
+'saveprefs'                 => 'Sagip',
+'resetprefs'                => 'Hawanin ang hindi nasagip na mga pagbabago',
+'textboxsize'               => 'May binabago',
+'prefs-edit-boxsize'        => 'Sukat ng dungawan ng ginagawang pagbabago.',
+'rows'                      => 'Mga pahalang na hanay:',
+'columns'                   => 'Mga pahabang hanay:',
+'searchresultshead'         => 'Hanapin',
+'resultsperpage'            => 'Bilang ng pagtama sa bawat pahina:',
+'contextlines'              => 'Linya bawat pagtama:',
+'contextchars'              => 'Konteksto ng bawat guhit:',
+'stub-threshold'            => 'Kakayanan para sa pagpopormat ng <a href="#" class="usbong">kawing ng usbong</a> (mga \'\'byte\'\'):',
+'recentchangesdays'         => 'Mga araw na ipapakita sa kamakailan lamang na mga pagbabago:',
+'recentchangesdays-max'     => '(pinakamataas na ang $1 {{PLURAL:$1|araw|mga araw}})',
+'recentchangescount'        => 'Bilang ng mga pagbabagong ipapakita sa loob ng kamakailang mga pagbabago, mga kasaysayan ng pahina at sa loob ng mga tala, bilang likas na katakdaan:',
+'savedprefs'                => 'Nasagip na ang mga kagustuhan mo.',
+'timezonelegend'            => 'Sona ng oras',
+'timezonetext'              => '¹Ang bilang ng pagkakaiba ng katutubong oras mo mula sa oras ng serbidor (UTC).',
+'localtime'                 => 'Katutubong oras:',
+'timezoneselect'            => 'Sona ng oras:',
+'timezoneuseserverdefault'  => 'Gamitin ang itinakda ng serbidor',
+'timezoneuseoffset'         => "Iba pa (tukuyin ang pambawi o ''offset'')",
+'timezoneoffset'            => "Pambawi/pambalanse (''offset'')¹:",
+'servertime'                => 'Oras sa serbidor',
+'guesstimezone'             => "Punuin ng mula sa pantingin-tingin (''browser'')",
+'allowemail'                => 'Pahintulutan ang e-liham mula sa ibang mga tagagamit',
+'prefs-searchoptions'       => 'Mga pagpipilian para sa paghahanap',
+'prefs-namespaces'          => 'Mga espasyo ng pangalan',
+'defaultns'                 => 'Maghanap sa mga pangalan ng espasyong ito ayon sa likas na pagtatakda:',
+'default'                   => 'Likas na pagtatakda',
+'files'                     => 'Mga talaksan',
 
 # User rights
-'userrights'                  => 'Pamamahala ng mga karapatang ng tagagamit', # Not used as normal message but as header for the special page itself
+'userrights'                  => 'Pamamahala ng mga karapatan ng tagagamit', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Pamahalaan ang mga pangkat ng tagagamit',
 'userrights-user-editname'    => 'Magpasok ng isang pangalan ng tagagamit:',
 'editusergroup'               => 'Baguhin ang mga pangkat ng tagagamit',
-'editinguser'                 => 'Binabago ang <b>$1</b> na akawnt ng isang tagagamit',
+'editinguser'                 => "Binabago ang mga karapatang pangtagagamit ng tagagamit na si '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Baguhin ang mga pangkat ng tagagamit',
 'saveusergroups'              => 'Sagipin ang mga pangkat ng tagagamit',
 'userrights-groupsmember'     => 'Kasapi ng:',
@@ -977,6 +1110,8 @@ pakitingnan ang matematika/BASAHINAKO para maisaayos ang konpigurasyon.',
 'right-minoredit'            => 'Itatak ang mga pagbabago bilang maliit',
 'right-move'                 => 'Ilipat ang mga pahina',
 'right-move-subpages'        => 'Ilipat ang mga pahina kasama ang pahinang nasa ilalim nito',
+'right-move-rootuserpages'   => 'Ilipat ang pinagugatang mga pahina ng tagagamit',
+'right-movefile'             => 'Ilipat ang mga talaksan',
 'right-suppressredirect'     => 'Hindi nilikha sa isang pagkarga mula sa lumang pangalan kapag naglipat ng isang pahina',
 'right-upload'               => 'Magkarga ng mga talaksan',
 'right-reupload'             => 'Patungan ang mayroon nang mga talaksan',
@@ -1027,9 +1162,46 @@ pakitingnan ang matematika/BASAHINAKO para maisaayos ang konpigurasyon.',
 'rightslogentry' => 'binago ang kasapiang pampangkat para kay $1 mula sa $2 patungong $3',
 'rightsnone'     => '(wala)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'basahin itong pahina',
+'action-edit'                 => 'baguhin itong pahina',
+'action-createpage'           => 'lumikha ng mga pahina',
+'action-createtalk'           => 'lumikha ng mga pahina ng usapan',
+'action-createaccount'        => 'likhain itong kuwenta ng tagagamit',
+'action-minoredit'            => 'tatakan ito bilang isang maliit na pagbabago',
+'action-move'                 => 'ilipat itong pahina',
+'action-move-subpages'        => 'ilipat itong pahina, pati ang mga kabahaging pahina (subpahina) nito',
+'action-move-rootuserpages'   => 'ilipat ang mga pinagugatang mga pahina ng tagagamit',
+'action-movefile'             => 'ilipat ang talaksang ito',
+'action-upload'               => 'ikarga itong talaksan',
+'action-reupload'             => 'patungan itong pahinang umiiral',
+'action-reupload-shared'      => 'daigin itong talaksan sa isang pinagsasaluhang taguan/repositoryo',
+'action-upload_by_url'        => 'ikarga itong talaksan mula sa isang adres ng URL',
+'action-writeapi'             => 'gamitin ang pagsulat na API',
+'action-delete'               => 'burahin itong pahina',
+'action-deleterevision'       => 'burahin ang pagbabagong ito',
+'action-deletedhistory'       => 'tingnan ang binurang kasaysayan ng pahinang ito',
+'action-browsearchive'        => 'hanapin ang binurang mga pahina',
+'action-undelete'             => 'ibalik mula sa pagkakabura ang pahinang ito',
+'action-suppressrevision'     => 'suriing muli at ibalik ang nakatagong pagbabagong ito',
+'action-suppressionlog'       => 'tingnan itong pribadong tala',
+'action-block'                => 'harangin sa paggawa ng pagbabago ang tagagamit na ito',
+'action-protect'              => 'baguhin ang mga antas ng pagsasanggalang para sa pahinang ito',
+'action-import'               => 'angkatin itong pahina mula sa ibang wiki',
+'action-importupload'         => 'angkatin ang pahinang ito mula sa isang ikinargang talaksan',
+'action-patrol'               => 'tatakan bilang napatrolya na ang mga pagbabagong ginawa ng iba',
+'action-autopatrol'           => 'tatakan ang pagbabago mo bilang napatrolya na',
+'action-unwatchedpages'       => 'tingnan ang talaan ng mga pahinang hindi nababantayan',
+'action-trackback'            => "magpasa ng isang balikan-ang-bakas (''trackback'')",
+'action-mergehistory'         => 'pagsanibin ang kasaysayan nitong pahina',
+'action-userrights'           => 'baguhin ang lahat ng karapatan ng tagagamit',
+'action-userrights-interwiki' => 'baguhin ang mga karapatan ng tagagamit na nasa ibang mga wiki',
+'action-siteadmin'            => 'ikandado o tanggalin ang pagkakakandado ng kalipunan ng dato',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|pagbabago|mga pagbabago}}',
-'recentchanges'                     => 'Kamakailang mga pagbabago',
+'recentchanges'                     => 'Kamakailang pagbabago',
+'recentchanges-legend'              => 'Mga pagpipilian para sa kamakailang mga pagbabago',
 'recentchangestext'                 => 'Subaybayan ang mga pinakahuling pagbabago sa wiki sa pahinang ito.',
 'recentchanges-feed-description'    => 'Sundan ang pinakahuling mga pagbabago sa wiki sa pamamagitan ng feed na ito.',
 'rcnote'                            => "Nasa ibaba {{PLURAL:$1|ang '''1''' pagbabago|ang pinakahuling '''$1''' mga pagbabago}} sa huling {{PLURAL:$2|araw|'''$2''' mga araw}}, mula noong $5, $4.",
@@ -1053,6 +1225,8 @@ pakitingnan ang matematika/BASAHINAKO para maisaayos ang konpigurasyon.',
 'rc_categories'                     => 'Itakda lang sa mga kaurian (ihiwalay sa pamamagitan ng "|")',
 'rc_categories_any'                 => 'Kahit ano',
 'newsectionsummary'                 => '/* $1 */ bagong seksyon',
+'rc-enhanced-expand'                => 'Ipakita ang mga detalye (kailangan ng JavaScript)',
+'rc-enhanced-hide'                  => 'Itago ang mga detalye',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Kaugnay na mga pagbabago',
@@ -1073,20 +1247,19 @@ upang makapagkarga ng talaksan.',
 'upload_directory_missing'    => 'Nawawala ang direktoryo ng pagkarga ($1) at hindi na mailikha ng webserver.',
 'upload_directory_read_only'  => 'Ang direktoryo ng pagkarga ($1) ay hindi maisulat ng webserver.',
 'uploaderror'                 => 'Kamalian sa pagkarga',
-'uploadtext'                  => "Gamitin ang pormularyo sa ibaba para makapagkarga ng mga talaksan.
-Para matingnan o maghanap ng mga dati nang naikargang mga talaksan pumunta sa [[Special:ImageList|talaan ng ikinargang mga talaksan]], nakatala rin ang (muling) mga pagkarga sa [[Special:Log/upload|talaan ng pagkarga]], ang mga pagbubura sa [[Special:Log/delete|talaan ng pagbura]].
+'uploadtext'                  => "Gamitin ang pormularyong nasa ibaba para magkarga ng mga talaksan.
+Para tingnan o maghanap ng mga dati nang naikargang mga talaksan pumunta sa  [[Special:FileList|talaan ng ikinargang mga talaksan]], ang (muling) mga pagkakarga ay nakatala rin sa [[Special:Log/upload|talaan ng pagkarga]], ang mga binura/nabura sa  [[Special:Log/delete|talaan ng pagbubura]].
 
-Para isama ang isang talaksan sa loob ng isang pahina, gumamit ng isang kawing na nasa loob ng sumusunod na mga pormularyo:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' para magamit ang buong bersyon ng talaksan
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|tekstong pamalit]]</nowiki></tt>''' (''alt text'') para magamit ang isang may 200 piksel na paghabi sa loob ng isang kahong nasa kaliwang pataan na may 'tekstong pamalit' ('' 'alt text' '') bilang paglalarawan 
-* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' para tuwirang makakawing sa talaksan na hindi ipinapakita ang talaksan",
+Para maisama ang isang talaksan sa loob ng isang pahina, gumamit ng isang kawing na nasa loob ng isa sa mga sumusunod na mga pormularyo:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' para magamit ang buong bersyon ng talaksan
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|alt text]]</nowiki></tt>''' para magamit ang isang may 200 piksel na paghabi sa loob ng isang kahong nasa kaliwang pataan na may 'tekstong pamalit' ('' 'alt text' '') bilang paglalarawan 
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' para sa tuwirang pagkakawing sa isang pahina na hindi ipinapakita ang talaksan",
 'upload-permitted'            => 'Pinapahintulutang mga uri ng talaksan: $1.',
 'upload-preferred'            => 'Mas iniibig na mga uri ng talaksan: $1.',
 'upload-prohibited'           => 'Ipinagbabawal na mga uri ng talaksan: $1.',
 'uploadlog'                   => 'tala ng pagkarga',
 'uploadlogpage'               => 'Tala ng pagkarga',
-'uploadlogpagetext'           => 'Nasa ibaba ang isang talaan ng pinakakamakailan lamang na mga pagkarga ng talaksan.
-Tingnan ang [[Special:NewImages|galerya ng bagong mga talaksan]] para sa mas matatanaw na pagsisiyasat.',
+'uploadlogpagetext'           => 'Nasa ibaba ang tala ng pinakahuling mga karga ng talaksan.',
 'filename'                    => 'Pangalan ng talaksan',
 'filedesc'                    => 'Buod',
 'fileuploadsummary'           => 'Buod:',
@@ -1110,25 +1283,26 @@ Ang pinapahintulutang {{PLURAL:\$3|uri ng talaksan ay ang|mga uri ng talaksan ay
 ang talaksang ito ay $2.',
 'largefileserver'             => 'Mas malaki ang talaksan kaysa nakatakdang papahintulutan ng serbidor.',
 'emptyfile'                   => 'Mukhang walang laman ang talaksan (file) na ikinarga mo. Maaaring dahil ito sa maling pagkapasok ng pangalan ng talaksan.  Paki tingin kung gusto mo talagang ikarga ang talaksan na ito.',
-'fileexists'                  => 'Mayroon ng talaksan na ganitong pangalan, paki tingin ang <strong><tt>$1</tt></strong> kung tiyak ka na babaguhin ito.',
-'filepageexists'              => 'Ang pahina ng paglalarawan para sa talaksan na ito ay nalikha na sa <strong><tt>$1</tt></strong>, ngunit walang talaksan na may ganitong pangalan.
+'fileexists'                  => "Mayroon ng talaksan na ganitong pangalan, paki tingin ang '''<tt>$1</tt>''' kung tiyak ka na babaguhin ito.",
+'filepageexists'              => "Ang pahina ng paglalarawan para sa talaksan na ito ay nalikha na sa '''<tt>$1</tt>''', ngunit walang talaksan na may ganitong pangalan.
 Lilitaw ang buod na ipapasok mo sa pahina ng paglalarawan.
-Para lumitaw ang buod mo doon, kailangan mong baguhin ito ng manwal.',
-'fileexists-extension'        => 'Mayroon talaksan na ganitong pangalan:<br />
-Pangalan ng ikakargang talaksan: <strong><tt>$1</tt></strong><br />
-Pangalan ng mayroon nang talaksan: <strong><tt>$2</tt></strong><br />
-Pumili ng ibang pangalan.',
+Para lumitaw ang buod mo doon, kailangan mong baguhin ito ng manwal.",
+'fileexists-extension'        => "Mayroon talaksan na ganitong pangalan:<br />
+Pangalan ng ikakargang talaksan: '''<tt>$1</tt>'''<br />
+Pangalan ng mayroon nang talaksan: '''<tt>$2</tt>'''<br />
+Pumili ng ibang pangalan.",
 'fileexists-thumb'            => "<center>'''Umiiral na talaksan'''</center>",
-'fileexists-thumbnail-yes'    => 'Mukhang pinaliit <i>(thumbnail)</i> na larawan ang talaksan. Paki tingin ang talaksan <strong><tt>$1</tt></strong>.<br />
-Kung ang tinignan na talaksan ay ang kaparehong larawan ng orihinal na laki, hindi na kailangang magkarga ng panibagong <i>thumbnail</i>.',
-'file-thumbnail-no'           => "Nagsisimula ang pangalan ng talaksan sa <strong><tt>$1</tt></strong>.  Tila ito'y isang larawan na may pinaliit na sukat<i>(thumbnail)</i>.
+'fileexists-thumbnail-yes'    => "Mukhang pinaliit ''(thumbnail)'' na larawan ang talaksan. Paki tingin ang talaksan '''<tt>$1</tt>'''.<br />
+Kung ang tinignan na talaksan ay ang kaparehong larawan ng orihinal na laki, hindi na kailangang magkarga ng panibagong ''thumbnail''.",
+'file-thumbnail-no'           => "Nagsisimula ang pangalan ng talaksan sa '''<tt>$1</tt>'''.  Tila ito'y isang larawan na may pinaliit na sukat''(thumbnail)''.
 Kung mayroon ang larawang ito ng pinakamataas na resolution, ikarga ito, kung hindi paki palitan ang pangalan ng talaksan.",
-'fileexists-forbidden'        => 'Umiiral na ang isang talaksang may ganitong pangalan.
-Kung nais mo pa ring ikarga ang iyong talaksan, bumalik at gumamit ng isang bagong pangalan.
-[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Umiiral na ang isang talaksang may ganitong pangalan sa pinagsasaluhang repositoryo ng talaksan.
-Kung gusto mo pa ring ikarga ang iyong talaksan, magbalik at gumamit ng isang bagong pangalan. [[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => 'Umiiral na ang isang talaksang may ganitong pangalan, at hindi maaaring patungan.
+Kung nais mo pa ring ikarga pataas ang iyong talaksan, paki bumalik lamang at gumamit ng isang bagong pangalan.
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Mayroon nang ganitong talaksan sa binabahaging repositoryo;
+bumalik at ikarga ang talaksan na ito sa bagong pangalan. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Ang talaksang ito ay isang kakambal ng sumusunod na {{PLURAL:$1|talaksan|mga talaksan}}:',
+'file-deleted-duplicate'      => 'Dating nabura ang isang talaksang katulad ng talaksang ito ([[$1]]).  Dapat mong suriin ang kasaysayan ng pagbubura ng talaksang iyon bago magpatuloy sa muling pagkarga nito.',
 'successfulupload'            => 'Matagumpay na pagkakarga',
 'uploadwarning'               => 'Babala sa pagkakarga',
 'savefile'                    => 'Sagipin ang talaksan',
@@ -1148,7 +1322,7 @@ Kung gusto mo pa ring ikarga ang iyong talaksan, magbalik at gumamit ng isang ba
 
 Ikunsidera mo kung nararapat ba na ipagpatuloy ang pagkarga ng talaksang ito.
 Ibinigay ang tala ng pagbura ng talaksang ito para konbinyente:",
-'filename-bad-prefix'         => 'Ang talaksan na ikakarga mo ay nagsisimula sa <strong>"$1"</strong>, na isang hindi naglalarawang pangalan na karaniwang tinatakda ng mga kamerang digital. Paki pili ang isang mas naglalarawang pangalan para sa iyong talaksan.',
+'filename-bad-prefix'         => "Ang talaksan na ikakarga mo ay nagsisimula sa '''\"\$1\"''', na isang hindi naglalarawang pangalan na karaniwang tinatakda ng mga kamerang digital. Paki pili ang isang mas naglalarawang pangalan para sa iyong talaksan.",
 
 'upload-proto-error'      => 'Maling protokolo',
 'upload-proto-error-text' => 'Nangangailangan ang malayong pagkarga ng mga URL na nagsisimula sa <code>http://</code> o <code>ftp://</code>.',
@@ -1174,20 +1348,21 @@ Maaaring ibigin mong subukin uli sa isang hindi gaanong abalang panahon.',
 'upload_source_url'  => ' (isang tanggap at napupuntahan ng publikong URL)',
 'upload_source_file' => ' (isang talaksan sa iyong kompyuter)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Ipinapakita nitong natatanging pahinang ang lahat ng naikargang mga talaksan.
+# Special:ListFiles
+'listfiles-summary'     => 'Ipinapakita nitong natatanging pahinang ang lahat ng naikargang mga talaksan.
 Bilang naitakda ipinapakita sa itaas ng talaan ang huling ikinargang mga talaksan.
 Mababago ang pagkakapangkat-pangkat sa pamamagitan ng pagpindot sa isang paulo ng pahabang kahanayan.',
-'imagelist_search_for'  => 'Hanapin ang pangalan ng midya:',
+'listfiles_search_for'  => 'Hanapin ang pangalan ng midya:',
 'imgfile'               => 'talaksan',
-'imagelist'             => 'Talaan ng talaksan',
-'imagelist_date'        => 'Petsa',
-'imagelist_name'        => 'Pangalan',
-'imagelist_user'        => 'Tagagamit',
-'imagelist_size'        => 'Sukat',
-'imagelist_description' => 'Paglalarawan',
-
-# Image description page
+'listfiles'             => 'Talaan ng talaksan',
+'listfiles_date'        => 'Petsa',
+'listfiles_name'        => 'Pangalan',
+'listfiles_user'        => 'Tagagamit',
+'listfiles_size'        => 'Sukat',
+'listfiles_description' => 'Paglalarawan',
+'listfiles_count'       => 'Mga bersyon',
+
+# File description page
 'filehist'                       => 'Kasaysayan ng talaksan',
 'filehist-help'                  => 'Pindutin ang isang petsa/oras para makita ang anyo ng talaksan noong panahong iyon.',
 'filehist-deleteall'             => 'burahin lahat',
@@ -1195,19 +1370,25 @@ Mababago ang pagkakapangkat-pangkat sa pamamagitan ng pagpindot sa isang paulo n
 'filehist-revert'                => 'ibalik',
 'filehist-current'               => 'kasalukuyan',
 'filehist-datetime'              => 'Petsa/Oras',
+'filehist-thumb'                 => "Kagyat (''thumbnail'')",
+'filehist-thumbtext'             => "Kagyat (''thumbnail'') para sa bersyon mula noong $1",
+'filehist-nothumb'               => "Walang kagyat (''thumbnail'')",
 'filehist-user'                  => 'Tagagamit',
 'filehist-dimensions'            => 'Mga sukat',
 'filehist-filesize'              => 'Sukat ng talaksan',
 'filehist-comment'               => 'Komento',
-'imagelinks'                     => 'Mga kawing',
+'imagelinks'                     => 'Mga kawing ng talaksan',
 'linkstoimage'                   => 'Nakakawing ang sumusunod na {{PLURAL:$1|pahina|$1 mga pahina}} sa talaksang ito.',
+'linkstoimage-more'              => 'Mahigit sa $1 {{PLURAL:$1|pahina|mga pahina}} ang nakakawing sa talaksang ito.
+Ipinapakita sa sumusunod na talaan ang {{PLURAL:$1|unang pahina lamang|unang $1 mga pahina lamang}} na nakakawing sa talaksang ito.
+Mayroong makukuhang [[Special:WhatLinksHere/$2|buong talaan]].',
 'nolinkstoimage'                 => 'Walang pahinang nakakawing sa talaksang ito.',
 'morelinkstoimage'               => 'Tingnan ang [[Special:WhatLinksHere/$1|mas marami pang mga kawing]] para sa pahinang ito.',
 'redirectstofile'                => 'Tumuturo ang sumusunod na {{PLURAL:$1|talaksan|$1 mga talaksan}} patungo sa talaksang ito:',
-'duplicatesoffile'               => 'Ang sumusunod na {{PLURAL:$1|talaksan|$1 mga talaksan}} ay kapareho talaksan na ito:',
+'duplicatesoffile'               => 'Ang sumusunod na {{PLURAL:$1|file is a duplicate|$1 mga talaksan ay mga kapareho}} ng talaksang ito ([[Special:FileDuplicateSearch/$2|mas marami pang mga detalye]]):',
 'sharedupload'                   => 'Isang pinagsasaluhang pagkarga ang talaksang ito at maaaring gamitin ng ibang mga proyekto.',
 'shareduploadwiki'               => 'Pakitingnan ang $1 para sa mas marami pang kabatiran.',
-'shareduploadwiki-desc'          => 'Ang paglalarawang para sa $1 nito na nasa pinagsasaluhang repositoryo ay ipinapakita sa ibaba.',
+'shareduploadwiki-desc'          => 'Ang paglalarawang nasa ibabaw ng $1 nito roon ay ipinapakita sa ibaba.',
 'shareduploadwiki-linktext'      => 'pahina ng paglalarawan sa talaksan',
 'shareduploadduplicate'          => 'Ang talaksang ito ay isang kopya/kakambal ng $1 mula sa pinagsasaluhang repositoryo.',
 'shareduploadduplicate-linktext' => 'isa pang talaksan',
@@ -1233,7 +1414,7 @@ Mababago ang pagkakapangkat-pangkat sa pamamagitan ng pagpindot sa isang paulo n
 'filedelete'                  => 'Burahin ang $1',
 'filedelete-backlink'         => '� $1',
 'filedelete-legend'           => 'Burahin ang talaksan',
-'filedelete-intro'            => "Binubura mo ang '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Buburahin mo na ang talaksang '''[[Media:$1|$1]]''' na kasama ang lahat ng kasaysayan nito.",
 'filedelete-intro-old'        => '<span class="plainlinks">Binubura mo ang bersyon ng \'\'\'[[Media:$1|$1]]\'\'\' mula noong [$4 $3, $2].</span>',
 'filedelete-comment'          => 'Dahilan ng pagkakabura:',
 'filedelete-submit'           => 'Burahin',
@@ -1241,7 +1422,6 @@ Mababago ang pagkakapangkat-pangkat sa pamamagitan ng pagpindot sa isang paulo n
 'filedelete-success-old'      => "Nabura ang bersyon ng '''[[Media:$1|$1]]''' mula noong $2, $3.",
 'filedelete-nofile'           => "Hindi umiiral ang '''$1'''.",
 'filedelete-nofile-old'       => "Walang sininop/nakaarkibong bersyon ng '''$1''' na may tinukoy na mga katangian.",
-'filedelete-iscurrent'        => 'Sinusubukan mong burahin ang pinakakamakailan lamang na bersyon ng talaksang ito.  Pakibalikan lamang muna ang isang mas lumang bersyon.',
 'filedelete-otherreason'      => 'Iba pa/karagdagang dahilan:',
 'filedelete-reason-otherlist' => 'Iba pang dahilan',
 'filedelete-reason-dropdown'  => '*Karaniwang mga dahilan ng pagbubura
@@ -1268,28 +1448,31 @@ Mababago ang pagkakapangkat-pangkat sa pamamagitan ng pagpindot sa isang paulo n
 
 # Random page
 'randompage'         => 'Pahinang walang-pili',
-'randompage-nopages' => 'Walang mga pahina sa ngalan-espasyong ito.',
+'randompage-nopages' => 'Walang mga pahina sa pangalan-espasyong "$1".',
 
 # Random redirect
 'randomredirect'         => 'Alinmang panuto',
-'randomredirect-nopages' => 'Walang mga panuto/panturo sa loob ng espasyo ng pangalang ito.',
+'randomredirect-nopages' => 'Walang mga panuto sa pangalan-espasyong "$1".',
 
 # Statistics
-'statistics'             => 'Mga estadistika',
-'sitestats'              => 'Mga estadistika ng {{SITENAME}}',
-'userstats'              => 'Mga estadistika sa mga tagagamit',
-'sitestatstext'          => "Mayroong {{PLURAL:\$1|'''1''' pahina|'''\$1''' kabuoang mga pahina}} sa loob ng kalpunan ng dato.
-Kabilang dito ang mga pahina ng \"usapan\", ang pahina tungkol {{SITENAME}}, kaunting mga pahina ng \"usbong\", mga panuto/panturo, at iba pang maaaring hindi maibibilang bilang mga pahina ng nilalaman.
-Hindi kabilang ang mga ito, mayroong {{PLURAL:\$2|'''1''' pahinang itinuturing|'''\$2''' mga pahinang itinuturing na}} maaaring katanggap-tangap na {{PLURAL:\$2|pahina|mga pahina}} ng nilalaman.
-
-Naikarga na ang '''\$8''' {{PLURAL:\$8|talaksan|mga talaksan}}.
-
-Nagkaroon ng isang kabuoang '''\$3''' {{PLURAL:\$3|pagtingin sa pahina|pagtingin sa mga pahina}}, at '''\$4''' {{PLURAL:\$4|pagbago ng pahina|pagbago ng mga pahina}} mula nang maihanda at mapatakbo ang {{SITENAME}}.
-Umaabot na ito sa '''\$5''' pangkaraniwang bilang ng mga pagbabago bawat pahina, at '''\$6''' mga pagtingin bawat pagbabago.
-
-Ang haba ng [http://meta.wikimedia.org/wiki/Help:Job_queue pila ng gawain] ay '''\$7'''.",
-'userstatstext'          => "Mayroong {{PLURAL:$1|'''1''' nakatalang [[Special:ListUsers|tagagamit]]|'''$1''' nakatalang [[Special:ListUsers|mga tagagamit]]}}, na ang '''$2''' (o '''$4%''') ay {{PLURAL:$2|may|may mga}} $5 mga karapatan.",
-'statistics-mostpopular' => 'Mga pinakarinarayong pahina',
+'statistics'                   => 'Mga estadistika',
+'statistics-header-pages'      => 'Mga estadistika ng pahina',
+'statistics-header-edits'      => 'Baguhin ang mga estadistika',
+'statistics-header-views'      => 'Tingnan ang mga estadistika',
+'statistics-header-users'      => 'Mga estadistika sa mga tagagamit',
+'statistics-articles'          => 'Mga pahina ng nilalaman',
+'statistics-pages'             => 'Mga pahina',
+'statistics-pages-desc'        => 'Lahat ng mga pahina sa loob ng wiki, kabilang ang mga pahina ng usapan, mga panuto, atbp.',
+'statistics-files'             => 'Ikinargang mga talaksan',
+'statistics-edits'             => 'Naihanda na ang mga pagbabago ng pahina mula sa {{SITENAME}}',
+'statistics-edits-average'     => 'Karaniwang pagbabago sa bawat pahina',
+'statistics-views-total'       => 'Kalahatang pagdayo',
+'statistics-views-peredit'     => 'Pagtingin sa bawat pagbabago',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Bilang ng gagawin]',
+'statistics-users'             => 'Mga nakatalang [[Special:ListUsers|tagagamit]]',
+'statistics-users-active'      => 'Mga masusugid na tagagamit <small>(mga nakatalang mang-aambag sa buwang ito)</small>',
+'statistics-users-active-desc' => 'Mga tagagamit na nagsagawa ng isang galaw/gawain sa huling {{PLURAL:$1|araw|$1 mga araw}}',
+'statistics-mostpopular'       => 'Mga pinakarinarayong pahina',
 
 'disambiguations'      => 'Mga pahina ng paglilinaw',
 'disambiguationspage'  => 'Template:disambig',
@@ -1304,7 +1487,7 @@ Naglalaman ng link ang bawat hanay sa una at ikalawang redirect, at nang unang l
 'double-redirect-fixer'      => 'Tagapagayos ng panuto/panturo',
 
 'brokenredirects'        => 'Bali/putol na mga panuto o panturo',
-'brokenredirectstext'    => 'Ang mga sumusunod na redirect ay nakaturo sa pahinang hindi pa nagawa.',
+'brokenredirectstext'    => 'Ang sumusunod na mga panturo papunta sa ibang pahina ay kumakawing patungo sa mga pahinang hindi pa umiiral.',
 'brokenredirects-edit'   => '(baguhin)',
 'brokenredirects-delete' => '(burahin)',
 
@@ -1334,26 +1517,30 @@ Naglalaman ng link ang bawat hanay sa una at ikalawang redirect, at nang unang l
 'popularpages'            => 'Mga popular na pahina',
 'wantedcategories'        => 'Kinakailangang mga kategorya',
 'wantedpages'             => 'Kinakailangang mga pahina',
-'missingfiles'            => 'Nawawalang mga talaksan',
+'wantedfiles'             => 'Ninanais na mga talaksan',
+'wantedtemplates'         => 'Ninanais na mga suleras',
 'mostlinked'              => 'Pinakamaraming ugnay sa mga pahina',
 'mostlinkedcategories'    => 'Pinakamaraming ugnay sa mga kategorya',
 'mostlinkedtemplates'     => 'Pinakamaraming ugnay sa mga suleras',
 'mostcategories'          => 'Mga artikulong may pinakamaraming kategorya',
 'mostimages'              => 'Pinakamaraming ugnay sa mga larawan',
 'mostrevisions'           => 'Mga artikulong may pinakamaraming pagbabago',
-'prefixindex'             => 'Unlaping indeks',
+'prefixindex'             => 'Lahat ng mga pahinang may unlapi',
 'shortpages'              => 'Mga maiikling pahina',
 'longpages'               => 'Mga mahahabang pahina',
 'deadendpages'            => 'Mga pahinang walang panloob na ugnay (internal link)',
 'deadendpagestext'        => "Ang mga sumusunod na mga pahina'y hindi umuugnay sa ibang mga pahina sa wiking ito.",
 'protectedpages'          => 'Mga nakaprotektang pahina',
 'protectedpages-indef'    => 'Mga walang katiyakang proteksyon lamang',
+'protectedpages-cascade'  => 'Baita-baitang na mga panananggalang lamang',
 'protectedpagestext'      => 'Nakasanggalang ang sumusunod na mga pahina laban sa paglipat o pagbabago',
 'protectedpagesempty'     => 'Sa kasalukuyan, walang mga pahinang nakasanggalang na may ganitong mga parametro.',
 'protectedtitles'         => 'Nakasanggalang na mga pamagat',
 'protectedtitlestext'     => 'Ang sumusunod ay mga pamagat na nakaprotekta mula sa pagkalikha.',
 'protectedtitlesempty'    => 'Walang pamagat ang kasalukuyang nakaprotekta sa binigay na parametro.',
 'listusers'               => 'Tala ng tagagamit',
+'listusers-editsonly'     => 'Ipakita lamang ang mga tagagamit na gumawa/nakagawa na ng mga pagbabago',
+'usereditcount'           => '$1 {{PLURAL:$1|pagbabago|mga pagbabago}}',
 'newpages'                => 'Mga bagong pahina',
 'newpages-username'       => 'Bansag:',
 'ancientpages'            => 'Mga pinakalumang pahina',
@@ -1375,14 +1562,13 @@ Naglalaman ng link ang bawat hanay sa una at ikalawang redirect, at nang unang l
 'booksources-go'            => 'Punta',
 'booksources-text'          => 'Matatagpuan sa ibaba ang mga tala ng mga ugnay sa ibang mga websayt na nagbebenta ng bago at nagamit na mga aklat, at maaring mayroon din
 na iba pang impormasyon tungkol sa mga aklat na hinahanap mo:',
+'booksources-invalid-isbn'  => 'Tila mukhang hindi yata katanggap-tanggap ang ibinigay na ISBN; pakisuri kung may mga kamalian ang pagkakasip/pagkakakopya mula sa orihinal na pinagmulan.',
 
 # Special:Log
 'specialloguserlabel'  => 'Tagagamit:',
 'speciallogtitlelabel' => 'Pamagat:',
 'log'                  => 'Mga talaan',
 'all-logs-page'        => 'Lahat ng mga talaan',
-'log-search-legend'    => 'Maghanap ng mga talaan',
-'log-search-submit'    => 'Gawin',
 'alllogstext'          => 'Pinagsama-samang mga pagpapakita ng makukuhang mga talaan ng {{SITENAME}}.  
 Maaari mong pakitirin/pakiputin ang ipinapakita sa pamamagitan ng pagpili ng uri ng mga talaan, ang pangalan ng tagagamit (maselan ang pagmamakiniliya ng panitik), o ang naaapektuhang pahina (maselan din ang pagmamakinilya ng panitik).',
 'logempty'             => 'Walang katumbas na bagay sa talaan.',
@@ -1394,6 +1580,7 @@ Maaari mong pakitirin/pakiputin ang ipinapakita sa pamamagitan ng pagpili ng uri
 'nextpage'          => 'Susunod na pahina ($1)',
 'prevpage'          => 'Nakaraang pahina ($1)',
 'allpagesfrom'      => 'Pinapakita ang mga pahina na nagsisimula sa:',
+'allpagesto'        => 'Ipakita ang mga pahinang nagtatapos sa:',
 'allarticles'       => 'Lahat ng mga pahina',
 'allinnamespace'    => 'Lahat ng mga pahina ($1 espasyo ng pangalan)',
 'allnotinnamespace' => 'Lahat ng mga pahina (wala sa $1 espasyo ng pangalan)',
@@ -1413,42 +1600,69 @@ Tingnan din ang [[Special:WantedCategories|ninanais na mga kaurian]].',
 'special-categories-sort-count' => 'ayusin sa pamamagitan ng bilang',
 'special-categories-sort-abc'   => 'ayusin sa pamamagitan ng alpabeto',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Naburang ambag ng tagagamit',
+
+# Special:LinkSearch
+'linksearch'       => 'Panlabas na mga kawing',
+'linksearch-pat'   => 'Huwaran ng hanap',
+'linksearch-ns'    => 'Pangalang espasyo',
+'linksearch-ok'    => 'Hanapin',
+'linksearch-text'  => 'Maaaring gamitin ang mga "barahang panghalili/pamalit" (mga \'\'wildcard\'\') katulad ng "*.wikipedia.org".<br />
+Sinusuportahang mga protokolo: <tt>$1</tt>',
+'linksearch-line'  => '$1 nakakawing/nakaugnay mula sa $2',
+'linksearch-error' => "Lilitaw lamang ang mga \"barahang-pamalit\" (''wildcard'') sa simula ng pangunahin/punong-abalang pangalan.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Ipakita ang mga tagagamit na nagsisimula sa:',
 'listusers-submit'   => 'Ipakita',
 'listusers-noresult' => 'Walang nahanap na tagagamit.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Talaan ng paglikha ng tagagamit',
+'newuserlogpagetext'          => 'Isa itong talaan ng mga paglikha ng tagagamit.',
+'newuserlog-byemail'          => 'Ipinadala ang hudyat sa pamamagitan ng e-liham',
+'newuserlog-create-entry'     => 'Bagong tagagamit',
+'newuserlog-create2-entry'    => 'nalikha ang bagong akawnt na $1',
+'newuserlog-autocreate-entry' => 'Awtomatikong nalikha ang akawnt',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Mga uri ng tagagamit',
-'listgrouprights-summary'  => 'Ang sumusunod ay isang talaan ng mga pangkat ng tagagamit na binigyang kahulugang sa wiking ito, kasama ang kanilang mga kaugnay na mga karapatan.
+'listgrouprights'                 => 'Mga uri ng tagagamit',
+'listgrouprights-summary'         => 'Ang sumusunod ay isang talaan ng mga pangkat ng tagagamit na binigyang kahulugang sa wiking ito, kasama ang kanilang mga kaugnay na mga karapatan.
 Maaaring may mga [[{{MediaWiki:Listgrouprights-helppage}}|karagdagang kabatiran]] tungkol sa bawat isang mga karapatan sa [[{{MediaWiki:Listgrouprights-helppage}}]].',
-'listgrouprights-group'    => 'Pangkat',
-'listgrouprights-rights'   => 'Mga karapatan',
-'listgrouprights-helppage' => 'Help:Mga pangkat ng karapatan',
-'listgrouprights-members'  => '(tala ng mga kasapi)',
+'listgrouprights-group'           => 'Pangkat',
+'listgrouprights-rights'          => 'Mga karapatan',
+'listgrouprights-helppage'        => 'Help:Mga pangkat ng karapatan',
+'listgrouprights-members'         => '(tala ng mga kasapi)',
+'listgrouprights-addgroup'        => 'Maaaring idagdag ang {{PLURAL:$2|pangkat|mga pangkat}} na: $1',
+'listgrouprights-removegroup'     => 'Maaaring tanggalin ang {{PLURAL:$2|pangkat|mga pangkat}} na: $1',
+'listgrouprights-addgroup-all'    => 'Maaaring idagdag ang lahat ng mga pangkat',
+'listgrouprights-removegroup-all' => 'Maaaring tanggalin ang lahat ng mga pangkat',
 
 # E-mail user
-'mailnologin'     => 'Walang adres na mapagpapadalahan',
-'mailnologintext' => 'Kailangan mong [[Special:UserLogin|lumagda]] at magkaroon ng tanggap na e-liham sa iyong [[Special:Preferences|mga kagustuhan]] para makapagpadala ng e-liham sa ibang mga tagagamit.',
-'emailuser'       => 'Padalhan ng e-liham ang tagagamit',
-'emailpage'       => 'Magpadala ng e-liham sa tagagamit',
-'emailpagetext'   => 'Magagamit mo ang pormularyo sa ibaba para makapagpadala ng mensahe sa pamamagitan ng isang e-liham para sa tagagamit na ito.
+'mailnologin'      => 'Walang adres na mapagpapadalahan',
+'mailnologintext'  => 'Kailangan mong [[Special:UserLogin|lumagda]] at magkaroon ng tanggap na e-liham sa iyong [[Special:Preferences|mga kagustuhan]] para makapagpadala ng e-liham sa ibang mga tagagamit.',
+'emailuser'        => 'Padalhan ng e-liham ang tagagamit',
+'emailpage'        => 'Magpadala ng e-liham sa tagagamit',
+'emailpagetext'    => 'Magagamit mo ang pormularyo sa ibaba para makapagpadala ng mensahe sa pamamagitan ng isang e-liham para sa tagagamit na ito.
 Ang ipinasok mong adres ng e-liham sa [[Special:Preferences|iyong mga kagustuhan ng tagagamit]] ay lilitaw bilang adres na "Mula kay" ng e-liham, para tuwirang makatugon sa iyo ang nakatanggap.',
-'usermailererror' => 'Pagkakamaling sanhi ng pagkakabalik ng liham mula sa puntirya:',
-'defemailsubject' => 'E-liham ng {{SITENAME}}',
-'noemailtitle'    => 'Walang adres ng e-liham',
-'noemailtext'     => 'Hindi nagbigay ng tanggap na e-liham ang tagagamit na ito,
-o pinili niyang huwag tumanggap ng e-liham mula sa ibang mga tagagamit.',
-'emailfrom'       => 'Mula kay:',
-'emailto'         => 'Para kay:',
-'emailsubject'    => 'Paksa:',
-'emailmessage'    => 'Mensahe:',
-'emailsend'       => 'Ipadala',
-'emailccme'       => 'Padalhan ako ng sipi ng aking mensahe sa pamamagitan ng e-liham.',
-'emailccsubject'  => 'Kopya ng iyong mensahe sa $1: $2',
-'emailsent'       => 'Naipadala na ang e-liham',
-'emailsenttext'   => 'Naipadala na ang mensahe ng iyong e-liham.',
-'emailuserfooter' => 'Ipinadala ang e-liham na ito ni $1 para kay $2 sa pamamagitan ng tungkuling "Magpadala ng e-liham" na nasa {{SITENAME}}.',
+'usermailererror'  => 'Pagkakamaling sanhi ng pagkakabalik ng liham mula sa puntirya:',
+'defemailsubject'  => 'E-liham ng {{SITENAME}}',
+'noemailtitle'     => 'Walang adres ng e-liham',
+'noemailtext'      => 'Ang tagagamit na ito ay hindi tumukoy ng isang tanggap na adres ng e-liham.',
+'nowikiemailtitle' => 'Walang pinapahintulutang e-liham',
+'nowikiemailtext'  => 'Pinili ng tagagamit na ito na huwag makatanggap ng e-liham mula sa ibang mga tagagamit.',
+'email-legend'     => 'Magpadala ng e-liham patungo sa isa pang tagagamit ng {{SITENAME}}',
+'emailfrom'        => 'Mula kay:',
+'emailto'          => 'Para kay:',
+'emailsubject'     => 'Paksa:',
+'emailmessage'     => 'Mensahe:',
+'emailsend'        => 'Ipadala',
+'emailccme'        => 'Padalhan ako ng sipi ng aking mensahe sa pamamagitan ng e-liham.',
+'emailccsubject'   => 'Kopya ng iyong mensahe sa $1: $2',
+'emailsent'        => 'Naipadala na ang e-liham',
+'emailsenttext'    => 'Naipadala na ang mensahe ng iyong e-liham.',
+'emailuserfooter'  => 'Ipinadala ang e-liham na ito ni $1 para kay $2 sa pamamagitan ng tungkuling "Magpadala ng e-liham" na nasa {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Mga binabantayan ko',
@@ -1480,12 +1694,7 @@ Makikita doon ang lahat ng mga susunod na pagbabago sa pahinang ito pati na ang
 'iteminvalidname'      => "May suliranin ang bagay na '$1', hindi tanggap na pangalan...",
 'wlnote'               => "Nasa ibaba ang {{PLURAL:$1|pinakahuling pagbabago|pinakahuling '''$1''' mga pagbabago}} sa loob ng huling {{PLURAL:$2|oras|'''$2''' mga oras}}.",
 'wlshowlast'           => 'Ipakita ang huling $1 mga oras $2 mga araw $3',
-'watchlist-show-bots'  => "Ipakita ang mga pagbabagong ginawa ng ''bot''",
-'watchlist-hide-bots'  => "Itago ang mga pagbabagong ginawa ng ''bot''",
-'watchlist-show-own'   => 'Ipakita ang mga pagbabago ginawa ko',
-'watchlist-hide-own'   => 'Itago ang mga pagbabagong ginawa ko',
-'watchlist-show-minor' => 'Ipakita ang maliliit na mga pagbabago',
-'watchlist-hide-minor' => 'Itago ang maliliit na mga pagbabago',
+'watchlist-options'    => 'Mga pagpipilian para sa talaan ng mga binabantayan',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Isinasama sa mga binabantayan...',
@@ -1526,60 +1735,67 @@ Para baguhin ang mga pagtatakda ng iyong talaan ng mga binabantayan, dalawin ang
 Balik-tugon at karagdagang tulong:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Burahin ang pahina',
-'confirm'                     => 'Tiyakin',
-'excontent'                   => "ang dating nilalaman ay: '$1'",
-'excontentauthor'             => "ang nilalaman ay: '$1' (at ang tanging nag-ambag ay si '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "nilalaman bago nablangko: '$1'",
-'exblank'                     => 'walang laman ang pahina',
-'delete-confirm'              => 'Burahin "$1"',
-'delete-legend'               => 'Burahin',
-'historywarning'              => 'Babala: May kasaysayan ang pahinang buburahin mo:',
-'confirmdeletetext'           => 'Lubos mo nang buburahin ang pahinang ito pati ang kalahatan ng kasaysayan nito.
+# Delete
+'deletepage'             => 'Burahin ang pahina',
+'confirm'                => 'Tiyakin',
+'excontent'              => "ang dating nilalaman ay: '$1'",
+'excontentauthor'        => "ang nilalaman ay: '$1' (at ang tanging nag-ambag ay si '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "nilalaman bago nablangko: '$1'",
+'exblank'                => 'walang laman ang pahina',
+'delete-confirm'         => 'Burahin "$1"',
+'delete-legend'          => 'Burahin',
+'historywarning'         => 'Babala: May kasaysayan ang pahinang buburahin mo:',
+'confirmdeletetext'      => 'Lubos mo nang buburahin ang pahinang ito pati ang kalahatan ng kasaysayan nito.
 Pakitiyak lamang na ito ang nais mong gawin, na nauunawaan mo ang mga kahihinatnan, at ginagawa mo ito alinsunod sa [[{{MediaWiki:Policy-url}}|patakaran]].',
-'actioncomplete'              => 'Naisakatuparan na ang gawain',
-'deletedtext'                 => 'Nabura na ang "$1".  Tingnan ang $2 para sa talaan ng kamakailan lamang na mga pagbubura.',
-'deletedarticle'              => 'binura ang "[[$1]]"',
-'suppressedarticle'           => 'pinigil/sinupil ang "[[$1]]"',
-'dellogpage'                  => 'Talaan ng pagbubura',
-'dellogpagetext'              => 'Nasa ibaba ang isang talaan ng pinakakamailan lamang na mga pagbubura.',
-'deletionlog'                 => 'tala ng pagbubura',
-'reverted'                    => 'Ibinalik sa mas sinaunang pagbabago',
-'deletecomment'               => 'Dahilan ng pagbubura:',
-'deleteotherreason'           => 'Iba pa/karagdagang dahilan:',
-'deletereasonotherlist'       => 'Ibang dahilan',
-'deletereason-dropdown'       => '*Pangkaraniwang mga dahilan ng pagbura
+'actioncomplete'         => 'Naisakatuparan na ang gawain',
+'deletedtext'            => 'Nabura na ang "$1".  Tingnan ang $2 para sa talaan ng kamakailan lamang na mga pagbubura.',
+'deletedarticle'         => 'binura ang "[[$1]]"',
+'suppressedarticle'      => 'pinigil/sinupil ang "[[$1]]"',
+'dellogpage'             => 'Talaan ng pagbubura',
+'dellogpagetext'         => 'Nasa ibaba ang isang talaan ng pinakakamailan lamang na mga pagbubura.',
+'deletionlog'            => 'tala ng pagbubura',
+'reverted'               => 'Ibinalik sa mas sinaunang pagbabago',
+'deletecomment'          => 'Dahilan ng pagbubura:',
+'deleteotherreason'      => 'Iba pa/karagdagang dahilan:',
+'deletereasonotherlist'  => 'Ibang dahilan',
+'deletereason-dropdown'  => '*Pangkaraniwang mga dahilan ng pagbura
 ** Kahilingan ng may-akda
 ** Paglabag sa karapatang-ari/kopirayt
 ** Bandalismo',
-'delete-edit-reasonlist'      => 'Baguhin ang mga dahilan ng pagbura',
-'delete-toobig'               => 'May isang malaking kasaysayan ng pagbabago ang pahinang ito, mahigit sa $1 {{PLURAL:$1|pagbabago|mga pagbabago}}.
+'delete-edit-reasonlist' => 'Baguhin ang mga dahilan ng pagbura',
+'delete-toobig'          => 'May isang malaking kasaysayan ng pagbabago ang pahinang ito, mahigit sa $1 {{PLURAL:$1|pagbabago|mga pagbabago}}.
 Ipanagbabawal ang pagbura ng ganyang mga pahina upang maiwasan ang hindi sinasadyang pagantala/paggambala sa {{SITENAME}}.',
-'delete-warning-toobig'       => 'May malaking kasaysayan ng pagbabago ang pahinang ito, mahigit sa $1 {{PLURAL:$1|pagbabago|mga pagbabago}}.
+'delete-warning-toobig'  => 'May malaking kasaysayan ng pagbabago ang pahinang ito, mahigit sa $1 {{PLURAL:$1|pagbabago|mga pagbabago}}.
 Maaaring makagambala/makaabala sa pagpapatakbo sa kalipunan ng dato ng {{SITENAME}};
 magpatuloy na may pagiingat.',
-'rollback'                    => 'Mga pagbabagong may kaugnayan sa pagpapagulong na pabalik sa (mas) dati',
-'rollback_short'              => 'Pagulunging pabalik sa (mas) dati',
-'rollbacklink'                => 'pagulunging pabalik sa (mas) dati',
-'rollbackfailed'              => 'Nabigo ang pagpapagulong na pabalik sa (mas) dati',
-'cantrollback'                => 'Hindi maibalik ang pagbabago; tanging ang may-akda lamang ng pahinang ito ang huling tagapagambag/tagapaglathala.',
-'alreadyrolled'               => 'Hindi mapagulong pabalik sa dati ang huling pagbabago sa/ng [[$1]] ni [[User:$2|$2]] ([[User talk:$2|Usapan]]) dahil may ibang nagbago na o nagpagulong na pabalik sa (mas) dati ng pahina.
-
-Si [[User:$3|$3]] ([[User talk:$3|Usapan]]) ang pinakahuling gumawa ng pagbabago.',
-'editcomment'                 => 'Ang komento/puna para sa pagbabago ay: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Ibinalik ang mga pagbabagong ginawa ni [[Special:Contributions/$2|$2]] ([[User talk:$2|Usapan]]) patungo sa huling bersyon ni [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Ibinalik ang mga pagbabago sa $1; ibinalik sa huling bersyon ni $2.',
-'sessionfailure'              => "Tila mayroong suliraning may kaugnayan sa iyong sesyon/panahon ng pagkakalagda;
+
+# Rollback
+'rollback'         => 'Mga pagbabagong may kaugnayan sa pagpapagulong na pabalik sa (mas) dati',
+'rollback_short'   => 'Pagulunging pabalik sa (mas) dati',
+'rollbacklink'     => 'pagulunging pabalik sa (mas) dati',
+'rollbackfailed'   => 'Nabigo ang pagpapagulong na pabalik sa (mas) dati',
+'cantrollback'     => 'Hindi maibalik ang pagbabago; tanging ang may-akda lamang ng pahinang ito ang huling tagapagambag/tagapaglathala.',
+'alreadyrolled'    => 'Hindi mapagulong na pabalik sa dati ang huling pagbabago ng [[$1]] ni ([[User talk:$2|Usapan]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);
+mayroon nang ibang taong nagbago o nagpagulong pabalik sa dati ng pahina.
+
+Ang huling pagbabago sa pahina ay ginawa ni [[User:$3|$3]] ([[User talk:$3|Usapan]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Ang buod ng pagbabago ay: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Ibinalik ang mga pagbabagong ginawa ni [[Special:Contributions/$2|$2]] ([[User talk:$2|Usapan]]) patungo sa huling bersyon ni [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Ibinalik ang mga pagbabago sa $1; ibinalik sa huling bersyon ni $2.',
+'sessionfailure'   => "Tila mayroong suliraning may kaugnayan sa iyong sesyon/panahon ng pagkakalagda;
 Kinansela ang galaw/gawaing ito bilang pagiingat laban sa pagnanakaw (panghahaydyak) ng sesyon/panahon.
 Pakipindot ang pindutang \"ibalik\" (''back'') at ikarga uli ang pinanggalingan mong pahina, sumubok uli pagkaraan.",
+
+# Protect
 'protectlogpage'              => 'Talaan ng pagsasanggalang',
 'protectlogtext'              => 'Nasa ibaba ang isang talaan ng mga pagkandado at pagtanggal na mga pagkandado ng pahina.
 Tingnan ang [[Special:ProtectedPages|talaan ng nakasanggalang na mga pahina]] para sa talaan ng mga pangkasalukuyang gumaganang mga pagsasanggalang ng pahina.',
 'protectedarticle'            => 'ipinagsanggalang ang "[[$1]]"',
 'modifiedarticleprotection'   => 'binago ang antas ng panananggalang para sa "[[$1]]"',
 'unprotectedarticle'          => 'tinanggal sa panananggalang ang "[[$1]]"',
+'movedarticleprotection'      => 'inilipat ang pagtatakdang pampanananggalang mula sa "[[$2]]" patungong "[[$1]]"',
 'protect-title'               => 'Palitan ang antas ng panananggalang para sa "$1"',
+'prot_1movedto2'              => 'Inilipat ang [[$1]] patungo sa [[$2]]',
 'protect-backlink'            => '� $1',
 'protect-legend'              => 'Pagtibayin/tiyakin ang panananggalang',
 'protectcomment'              => 'Kumento/puna:',
@@ -1587,23 +1803,36 @@ Tingnan ang [[Special:ProtectedPages|talaan ng nakasanggalang na mga pahina]] pa
 'protect_expiry_invalid'      => 'Hindi tanggap/hindi tama ang oras ng pagtatapos.',
 'protect_expiry_old'          => 'Nasa nakaraan ang oras ng pagtatapos.',
 'protect-unchain'             => 'Tanggalin sa pagkakakandado ang mga pahintulot sa paglilipat',
-'protect-text'                => 'Maaari mong tingnan at baguhin dito ang antas ng pananananggalang para sa pahinang <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Hindi mo maaaring baguhin ang mga antas ng panananggalang habang may pagharang/paghadlang.
-Narito ang mga pangkasalukuyang pagtatakda para sa pahinang <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Hindi mababago ang mga antas ng panananggalang dahil sa isang umiiral na pagkandado ng kalipunan ng dato.
-Narito ang pangkasalukuyang mga pagtatakda para sa pahinang <strong>$1</strong>:',
-'protect-locked-access'       => 'Wala kapahintulutan ang iyong kuwenta/patnugutan/akawnt para makapagbago ng mga antas ng panananggalang ng pahina.
-Narito ang pangkasalukuyang mga pagtatakda para sa pahinang <strong>$1</strong>:',
+'protect-text'                => "Maaari mong tingnan at baguhin dito ang antas ng pananananggalang para sa pahinang '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Hindi mo maaaring baguhin ang mga antas ng panananggalang habang may pagharang/paghadlang.
+Narito ang mga pangkasalukuyang pagtatakda para sa pahinang '''$1''':",
+'protect-locked-dblock'       => "Hindi mababago ang mga antas ng panananggalang dahil sa isang umiiral na pagkandado ng kalipunan ng dato.
+Narito ang pangkasalukuyang mga pagtatakda para sa pahinang '''$1''':",
+'protect-locked-access'       => "Wala kapahintulutan ang iyong kuwenta/patnugutan/akawnt para makapagbago ng mga antas ng panananggalang ng pahina.
+Narito ang pangkasalukuyang mga pagtatakda para sa pahinang '''$1''':",
 'protect-cascadeon'           => 'Kasalukuyang nakasanggalang na ang pahinang ito dahil kabilang/kasama ito sa sumusunod na {{PLURAL:$1|pahinang may|mga pahinang may}} buhay/umiiral na baita-baitang na mga panananggalang.
 Maaari mong baguhin ang antas ng panananggalang ng pahina, ngunit hindi ito makakaapekto sa baita-baitang na panananggalang.',
-'protect-default'             => '(nakatakda)',
+'protect-default'             => 'Pahintulutan ang lahat ng mga tagagamit',
 'protect-fallback'            => 'Nangangailangan ng kapahintulutang "$1"',
-'protect-level-autoconfirmed' => 'Harangin/hadlangan ang mga hindi nagpapatalang mga tagagamit',
+'protect-level-autoconfirmed' => 'Hadlangan ang bago at hindi nagpapatalang mga tagagamit',
 'protect-level-sysop'         => "Mga tagapangasiwa (''sysop'') lamang",
 'protect-summary-cascade'     => 'baita-baitang',
 'protect-expiring'            => 'mawawalan ng bisa sa $1 (UTC)',
+'protect-expiry-indefinite'   => 'walang katiyakan',
 'protect-cascade'             => 'Ipagsanggalang ang mga pahinang kasama/kabilang sa pahinang ito (baita-baitang na panananggalang)',
 'protect-cantedit'            => 'Hindi mo mababago ang mga antas ng panananggalang ng pahinang ito, dahil wala kang pahintulot para baguhin ito.',
+'protect-othertime'           => 'Ibang oras:',
+'protect-othertime-op'        => 'ibang oras',
+'protect-existing-expiry'     => 'Umiiral na panahon/oras ng pagtatapos: $3, $2',
+'protect-otherreason'         => 'Iba pa/karagdagang dahilan:',
+'protect-otherreason-op'      => 'iba pa/karagdagang dahilan',
+'protect-dropdown'            => "*Mga pangkaraniwang dahilan ng pagsasanggalang
+** Labis na bandalismo/pambababoy
+** Labis na bilang ng mga mapanlusob na patalastas (''spam'')
+** Hindi kapakipakinabang na alitan hinggil sa pagbabago
+** Pahinang may mataas na antas ng daloy (matrapik)",
+'protect-edit-reasonlist'     => 'Mga dahilan ng panananggalang laban sa pagbabago',
+'protect-expiry-options'      => '1 oras:1 hour,1 araw:1 day,1 linggo:1 week,2 linggo:2 weeks,1 buwan:1 month,3 buwan:3 months,6 buwan:6 months,1 taon:1 year,walang hanggan:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Pahintulot:',
 'restriction-level'           => 'Antas ng kabawalan:',
 'minimum-size'                => 'Pinakamaliit na sukat',
@@ -1626,8 +1855,8 @@ Maaari mong baguhin ang antas ng panananggalang ng pahina, ngunit hindi ito maka
 'undeletepage'                 => 'Tingnan at ibalik ang mga naburang mga pahina',
 'undeletepagetitle'            => "'''Binubuo ang sumusunod ng binurang pagbabago ng [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Tingnan ang binurang mga pahina',
-'undeletepagetext'             => 'Nabura na ang sumusunod na mga pahina ngunit nananatiling nasa sinupan (arkibo) at maaari pang ibalik.
-Maaaring palagiang nililinis (tinatanggalan ng laman) ang sinupan.',
+'undeletepagetext'             => 'Ang sumusunod na {{PLURAL:$1|pahina ay nabura na subalit |$1 mga pahina ay nabura na subalit}} nananatili pa rin sa sinupan/arkibo at maaaring bang ibalik mula sa pagkakabura.
+Maaaring palagiang linisin o tanggalan ng laman ang sinupan/arkibo.',
 'undelete-fieldset-title'      => 'Ibalik ang mga pagbabago',
 'undeleteextrahelp'            => "Para maibalik ang kabuoan ng kasaysayan ng pahina, iwanang walang laman ang mga kahong lagayan ng mga tsek at pindutin ang '''''Ibalik'''''. Para maisagawa ang pagbabalik na may pagpili, lagyan ng tsek ang mga kahong may kaugnayan sa pagpapabalik ng mga pagbabago at pindutin ang '''''Ibalik'''''.
 Malilinis ang pook ng kumento/puna at iba pang mga kahong lagayan ng mga tsek kapag pinindot ang '''''Magtakda uli'''''.",
@@ -1637,12 +1866,13 @@ Kapag nalikha ang isang bagong pahinang may katulad na pangalan mula noong pagbu
 'undeleterevdel'               => 'Hindi gagawin ang pagpapabalik kung magreresulta sa bahaging pagkakabura ng itaas ng pahina o ng pagbabago sa talaksan.
 Sa ganitong mga pagkakataon, dapat mong tanggalin ang tsek o huwag itago ang pinakabagong naburang pagbabago.',
 'undeletehistorynoadmin'       => 'Nabura ang artikulong ito. Ipinapakita ang dahilan sa buod sa ibaba, kasama ang mga detalye ng mga tagagamit na binago ang pahinang ito bago nabura. Makikita lamang ng mga tagapangasiwa ang aktwal ng teksto ng mga naburang pagbabagong ito.',
-'undelete-revision'            => 'Naburang pagbabago ng $1 (mula noong $2) ni $3:',
+'undelete-revision'            => 'Naburang pagbabago ng $1 (mula noong $4, sa $5) ni $3:',
 'undeleterevision-missing'     => 'Inbalido o nawawalang pagbabago. Maaaring mayroon kang masamang ugnay (link), o ibinalik o tinanggal mula sa arkibo ang pagbabago.',
 'undelete-nodiff'              => 'Walang mahanap na nakaraang pagbabago.',
 'undeletebtn'                  => 'Ibalik',
 'undeletelink'                 => 'ibalik',
 'undeletereset'                => 'I-reset',
+'undeleteinvert'               => 'Baligtarin ang pagpili/pilian',
 'undeletecomment'              => 'Kumento:',
 'undeletedarticle'             => 'ibinalik "[[$1]]"',
 'undeletedrevisions'           => '{{PLURAL:$1|1 pagbabago|$1 mga pagbabagong}} naibalik na',
@@ -1674,26 +1904,27 @@ $1',
 'blanknamespace' => '(Pangunahin)',
 
 # Contributions
-'contributions' => 'Mga ambag ng tagagamit',
-'mycontris'     => 'Aking mga ginawa',
-'contribsub2'   => 'Para kay $1 ($2)',
-'nocontribs'    => 'Walang pagbabagong nakita sa binigay na kondisyon.',
-'uctop'         => ' (itaas)',
-'month'         => 'Mula sa buwan (at nauna):',
-'year'          => 'Mula sa taon (at nauna):',
-
-'sp-contributions-newbies'     => 'Ipakita ang mga ambag ng mga bagong kuwenta lamang',
-'sp-contributions-newbies-sub' => 'Para sa mga bagong kuwenta',
-'sp-contributions-blocklog'    => 'Tala ng paglipat',
-'sp-contributions-search'      => 'Maghanap ng ambag',
-'sp-contributions-username'    => 'IP Address o bansag:',
-'sp-contributions-submit'      => 'Hanapin',
+'contributions'       => 'Mga ambag ng tagagamit',
+'contributions-title' => 'Mga ambag ng tagagamit na si $1',
+'mycontris'           => 'Aking mga ginawa',
+'contribsub2'         => 'Para kay $1 ($2)',
+'nocontribs'          => 'Walang pagbabagong nakita sa binigay na kondisyon.',
+'uctop'               => ' (itaas)',
+'month'               => 'Mula sa buwan (at nauna):',
+'year'                => 'Mula sa taon (at nauna):',
+
+'sp-contributions-newbies'       => 'Ipakita ang mga ambag ng mga bagong kuwenta lamang',
+'sp-contributions-newbies-sub'   => 'Para sa mga bagong kuwenta',
+'sp-contributions-newbies-title' => 'Mga ambag ng tagagamit para sa mga bagong kuwenta/akawnt',
+'sp-contributions-blocklog'      => 'Tala ng paglipat',
+'sp-contributions-search'        => 'Maghanap ng ambag',
+'sp-contributions-username'      => 'IP Address o bansag:',
+'sp-contributions-submit'        => 'Hanapin',
 
 # What links here
 'whatlinkshere'            => 'Mga nakaturo dito',
 'whatlinkshere-title'      => 'Mga pahinang kumakawing sa $1',
 'whatlinkshere-page'       => 'Pahina:',
-'linklistsub'              => '(Talaan ng mga kawing)',
 'linkshere'                => "Nakakawing ang sumusunod na mga pahina sa '''[[:$1]]''':",
 'nolinkshere'              => "Walang pahinang nakakawing sa '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Walang pahinang nakakawing sa '''[[:$1]]''' mula sa loob ng napiling espasyo ng pangalan.",
@@ -1739,6 +1970,8 @@ Punan ang espesipikong dahilan sa ibaba (halimbawa, magbanggit ng partikular na
 'ipbotherreason'                  => 'Iba/karagdagang dahilan:',
 'ipbhidename'                     => 'Itago ang pangalan ng tagagamit mula sa talaan ng pagharang/paghadlang, talaan ng buhay na pagharang/paghadlang at talaan ng tagagamit',
 'ipbwatchuser'                    => 'Bantayan ang pahinang pantagagamit at pahina ng usapan ng tagagamit na ito',
+'ipballowusertalk'                => 'Pahintulutan ang tagagamit na ito na baguhin ang sariling pahina ng usapan habang hinahadlangan/may paghaharang',
+'ipb-change-block'                => 'Muling harangin/hadlangan ang tagagamit na ginagamitan ng ganitong mga pagtatakda',
 'badipaddress'                    => 'Hindi tanggap na adres ng IP',
 'blockipsuccesssub'               => 'Matagumpay ang pagharang/paghadlang',
 'blockipsuccesstext'              => 'Hinadlangan/hinarang si "$1"
@@ -1748,14 +1981,18 @@ Punan ang espesipikong dahilan sa ibaba (halimbawa, magbanggit ng partikular na
 'ipb-unblock'                     => 'Tanggalin ang pagkaharang ng isang bansag o IP address',
 'ipb-blocklist-addr'              => 'Umiiral na pagharang/paghadlang para kay $1',
 'ipb-blocklist'                   => 'Tingnan ang umiiral na mga pagharang/paghadlang',
+'ipb-blocklist-contribs'          => 'Mga ambag ni $1',
 'unblockip'                       => 'Tanggalin ang pagharang/paghadlang sa tagagamit',
 'unblockiptext'                   => 'Gamitin ang pormularyo sa ibaba upang ibalik ang akses ng pagsulat sa isang dating nakaharang na IP address o bansag.',
-'ipusubmit'                       => 'Tanggalin ang pagkaharang ng adres na ito',
+'ipusubmit'                       => 'Tanggalin ang paghadlang na ito',
 'unblocked'                       => 'Natanggal sa pagkaharang ang tagagamit na [[User:$1|$1]]',
 'unblocked-id'                    => 'Tinanggal na ang pagharang/paghadlang na $1',
 'ipblocklist'                     => 'Tala ng mga hinarang na mga IP address at bansag',
 'ipblocklist-legend'              => 'Hanapin ang isang hinarang na tagagamit',
 'ipblocklist-username'            => 'Bansag o IP address:',
+'ipblocklist-sh-userblocks'       => '$1 mga paghadlang o pagharang sa kuwenta/akawnt',
+'ipblocklist-sh-tempblocks'       => '$1 pansamantalang mga pagharang/paghadlang',
+'ipblocklist-sh-addressblocks'    => '$1 isahang pagharang/paghalang sa IP',
 'ipblocklist-submit'              => 'Hanapin',
 'blocklistline'                   => '$1, $2 hinarang si $3 (magtatapos sa $4)',
 'infiniteblock'                   => 'walang katapusan',
@@ -1764,14 +2001,18 @@ Punan ang espesipikong dahilan sa ibaba (halimbawa, magbanggit ng partikular na
 'noautoblockblock'                => 'hindi gumagana ang awtomatikong pagharang',
 'createaccountblock'              => 'Hinarang ang paglikha ng akawnt',
 'emailblock'                      => 'Hinarang/hinadlangan ang e-liham',
+'blocklist-nousertalk'            => 'hindi mo mababago ang iyong pansariling pahina ng usapan',
 'ipblocklist-empty'               => 'Walang laman ang talaan ng pagharang/paghadlang.',
 'ipblocklist-no-results'          => 'Nakaharang ang hiniling na IP address o bansag.',
 'blocklink'                       => 'harangin/hadlangan',
 'unblocklink'                     => 'tanggalin ang pagharang/paghadlang',
+'change-blocklink'                => 'baguhin ang pagharang/paghadlang',
 'contribslink'                    => 'ambag',
 'autoblocker'                     => 'Awtomatikong naharang dahil pareho kayo ng IP address ni "$1". Dahilan "$2".',
 'blocklogpage'                    => 'Tala ng pagharang',
+'blocklog-fulllog'                => 'Talaan ng lubos/ganap na pagharang o paghadlang',
 'blocklogentry'                   => 'hinarang/hinadlangan si [[$1]] na may oras/panahon ng pagtatapos na $2 $3',
+'reblock-logentry'                => 'binago ang itinakdang pagharang/paghadlang kay [[$1]] na may oras/panahon ng pagtatapos na $2 $3',
 'blocklogtext'                    => 'Tala ito ng paghaharang at pagpapawawalang bisa ng pagharang/paghadlang.
 Hindi nakatala rito ang mga awtomatiko/kusang hinarang/hinadlangang mga adres ng IP.
 Tingnan ang [[Special:IPBlockList|talaan ng mga hinarang na/hinadlangang IP]] para sa talaan ng pangkasalukuyang gumagana pang mga pinagbabawalan at mga pagharang/paghadlang.',
@@ -1780,11 +2021,14 @@ Tingnan ang [[Special:IPBlockList|talaan ng mga hinarang na/hinadlangang IP]] pa
 'block-log-flags-nocreate'        => 'Nakapatay ang paglikha ng akawnt',
 'block-log-flags-noautoblock'     => 'Nakapatay ang awtomatikong pagharang',
 'block-log-flags-noemail'         => 'hinadlangan/hinarang ang e-liham',
+'block-log-flags-nousertalk'      => 'hindi mo mababago ang iyong pansariling pahina ng usapan',
 'block-log-flags-angry-autoblock' => 'pinaandar ang pinainam/pinagibayong kusang paghadlang o awtomatikong pagharang',
 'range_block_disabled'            => 'Hindi gumagana ang kakayahan ng tagapangasiwa para makalikha ng mga pagharang/paghadlang na may sakop.',
 'ipb_expiry_invalid'              => 'Hindi tama ang oras ng pagtatapos.',
 'ipb_expiry_temp'                 => 'Kinakailangang palagian/permanente ang mga nakatagong pagharang/paghadlang ng pangalan ng tagagamit.',
 'ipb_already_blocked'             => 'Nakaharang na ang "$1"',
+'ipb-needreblock'                 => '== Hinarang/hinadlangan na ==
+Hinarang/hinadlangan na si $1.  Ibig mo bang baguhin ang mga pagtatakda?',
 'ipb_cant_unblock'                => 'Kamalian: Hindi natagpuan ang ID ng pagharang/paghadlang na $1.  Maaaring natanggal na ang pagkakaharang nito/paghahadlang dito.',
 'ipb_blocked_as_range'            => 'Mali: Hindi diretsong nakaharang ang IP na $1 at hindi maaaring tanggalin sa pagkakaharang. Bagaman, bahagi ito sa sakop na $2, na maaaring tanggalin sa pagkaharang.',
 'ip_range_invalid'                => 'Hindi tamang sakop ng IP.',
@@ -1795,6 +2039,7 @@ Tingnan ang [[Special:IPBlockList|talaan ng mga hinarang na/hinadlangang IP]] pa
 'proxyblocksuccess'               => 'Tapos na.',
 'sorbsreason'                     => 'Nakalista ang IP address mo bilang isang bukas na proxy sa DNSBL na ginagamit ng sayt na ito.',
 'sorbs_create_account_reason'     => 'Nakalista ang IP address mo bilang isang bukas na proxy sa DNSBL na ginagamit ng sayt na ito. Hindi ka makakalikha ng akawnt',
+'cant-block-while-blocked'        => 'Hindi mo mahahadlangan/mahaharang ang ibang mga tagagamit habang hinahadlangan ka.',
 
 # Developer tools
 'lockdb'              => 'Ikandado ang kalipunan ng datos',
@@ -1818,10 +2063,10 @@ Para ikandado o tanggalin ang kandado ng kalipunan ng dato, kailangan nitong mag
 'databasenotlocked'   => 'Hindi nakakandado ang kalipunan ng dato.',
 
 # Move page
-'move-page'               => 'Ilipat ang $1',
-'move-page-backlink'      => '� $1',
-'move-page-legend'        => 'Ilipat ang pahina',
-'movepagetext'            => "Mapapalitan ang pangalan ng isang pahina kapag ginamit mo ang pormularyong nasa ibaba, malilipat ang lahat ng kasaysayan nito patungo sa bagong pangalan.
+'move-page'                    => 'Ilipat ang $1',
+'move-page-backlink'           => '� $1',
+'move-page-legend'             => 'Ilipat ang pahina',
+'movepagetext'                 => "Mapapalitan ang pangalan ng isang pahina kapag ginamit mo ang pormularyong nasa ibaba, malilipat ang lahat ng kasaysayan nito patungo sa bagong pangalan.
 Magiging isang pahina ng panuto/panturo patungo sa bagong pamagat ang dati/lumang pangalan.
 Maaari mong isapanahon ang mga panutong tumuturo sa orihinal na pamagat sa pamamagitan ng kusang pamamaraan (paraang awtomatiko). 
 Kung pipiliin mong huwag gawin ito, dapat mong tiyakin kung may [[Special:DoubleRedirects|dalawahan o doble]] o [[Special:BrokenRedirects|bali o putol na mga panturo]].
@@ -1833,49 +2078,62 @@ Nangangahulugan ito na maaari mong muling pangalanan ang isang pahina pabalik sa
 '''BABALA!'''
 Maaaring itong maging isang marahas at hindi inaaasang pagbabago para sa isang bantog na pahina;
 pakitiyak na nauunawaan mo ang mga kahihinatnan nito bago magpatuloy.",
-'movepagetalktext'        => "Kusa/awtomatikong ililipat din ang mga kasama/kakabit na mga kaugnay na mga pahina '''maliban na lamang kung''':
+'movepagetalktext'             => "Kusa/awtomatikong ililipat din ang mga kasama/kakabit na mga kaugnay na mga pahina '''maliban na lamang kung''':
 *Mayroon nang isang pahina ng usapang may laman na at umiiral na sa ilalim ng isang bagong pangalan, o
 *Hindi mo nilagyan ng tsek ang kahong nasa ibaba.
 
 Sa mga kasong ganoon, kailangan mong ilipat o pagsamahin/pagsanibin ang pahina sa manwal o kinakamay na paraan kung nanaisin.",
-'movearticle'             => 'Ilipat ang pahina:',
-'movenotallowed'          => 'Wala kang permisong maglipat ng pahina.',
-'newtitle'                => 'Papunta sa bagong pamagat:',
-'move-watch'              => 'Bantayan ang pahinang ito',
-'movepagebtn'             => 'Ilipat ang pahina',
-'pagemovedsub'            => 'Matagumpay ang paglipat',
-'movepage-moved'          => '<big>\'\'\'Inilipat ang "$1" sa "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'May umiiral nang pahinang may ganyang pangalan, o ang
+'movearticle'                  => 'Ilipat ang pahina:',
+'movenologin'                  => 'Hindi nakalagda',
+'movenologintext'              => 'Dapat na isa kang nakapagpatala (nakarehistro) at [[Special:UserLogin|nakalagda]]ng tagagamit upang makapaglipat ng isang pahina.',
+'movenotallowed'               => 'Wala kang permisong maglipat ng pahina.',
+'movenotallowedfile'           => 'Wala kang pahintulot upang makapaglipat ng mga talaksan.',
+'cant-move-user-page'          => 'Wala kang pahintulot para makapaglipat ng mga pahina ng tagagamit (bukod pa sa kabahaging mga pahina o subpahina).',
+'cant-move-to-user-page'       => 'Wala kang pahintulot para makapaglipat ng isang pahina papunta sa isang pahina ng tagagamit (maliban na lamang sa isang kabahaging pahina o subpahina ng tagagamit).',
+'newtitle'                     => 'Papunta sa bagong pamagat:',
+'move-watch'                   => 'Bantayan ang pahinang ito',
+'movepagebtn'                  => 'Ilipat ang pahina',
+'pagemovedsub'                 => 'Matagumpay ang paglipat',
+'movepage-moved'               => '<big>\'\'\'Inilipat ang "$1" patungo sa "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Nalikha ang isang panturo patungo sa ibang pahina.',
+'movepage-moved-noredirect'    => 'Pinigilan ang paglikha ng isang panturo.',
+'articleexists'                => 'May umiiral nang pahinang may ganyang pangalan, o ang
 pangalang pinili mo ay hindi tanggap.
 Pumili muli ng ibang pangalan.',
-'cantmove-titleprotected' => 'Hindi mo malilipatan ang isang pahina sa lokasyong ito, dahil nakasanggalang sa paglikha ang baong pamagat',
-'talkexists'              => "'''Tagumpay na nailipat ang pahina mismo, ngunit hindi mailipat ang pahina ng usapan dahil mayroon ng ganito sa bagong pamagat. Ipagsama ito sa manwal na paraan.'''",
-'movedto'                 => 'inilipat sa',
-'movetalk'                => 'Ilipat ang kaugnay na pahinang usapan',
-'move-subpages'           => 'Ilipat lahat ng mga sub-pahina, kung mayroon',
-'move-talk-subpages'      => 'Ilipat lahat ng sub-pahina ng pahina ng usapan, kung mayroon',
-'movepage-page-exists'    => 'Mayroon na ang pahinang $1 at hindi na ito awtomatikong mapapatungan.',
-'movepage-page-moved'     => 'Nailipat na ang pahinang $1 sa $2.',
-'movepage-page-unmoved'   => 'Hindi na mailipat ang pahinang $1 sa $2.',
-'movepage-max-pages'      => 'Ang pinakamataas na $1 {{PLURAL:$1|pahina|mga pahina}} ay nailipat at wala nang maililipat ng awtomatiko.',
-'1movedto2'               => 'Ang [[$1]] ay inilipat sa [[$2]]',
-'1movedto2_redir'         => 'Ang [[$1]] ay inilipat sa [[$2]] sa ibabaw ng pangkarga',
-'movelogpage'             => 'Tala ng paglipat',
-'movelogpagetext'         => 'Sumusunod ang mga tala ng mga pahinang nailipat.',
-'movereason'              => 'Dahilan:',
-'revertmove'              => 'ibalik',
-'delete_and_move'         => 'Burahin at ilipat',
-'delete_and_move_text'    => '==Kinakailangan ang pagbura==
+'cantmove-titleprotected'      => 'Hindi mo malilipatan ang isang pahina sa lokasyong ito, dahil nakasanggalang sa paglikha ang baong pamagat',
+'talkexists'                   => "'''Tagumpay na nailipat ang pahina mismo, ngunit hindi mailipat ang pahina ng usapan dahil mayroon ng ganito sa bagong pamagat. Ipagsama ito sa manwal na paraan.'''",
+'movedto'                      => 'inilipat sa',
+'movetalk'                     => 'Ilipat ang kaugnay na pahinang usapan',
+'move-subpages'                => 'Ilipat lahat ng mga sub-pahina, kung mayroon',
+'move-talk-subpages'           => 'Ilipat lahat ng sub-pahina ng pahina ng usapan, kung mayroon',
+'movepage-page-exists'         => 'Mayroon na ang pahinang $1 at hindi na ito awtomatikong mapapatungan.',
+'movepage-page-moved'          => 'Nailipat na ang pahinang $1 sa $2.',
+'movepage-page-unmoved'        => 'Hindi na mailipat ang pahinang $1 sa $2.',
+'movepage-max-pages'           => 'Ang pinakamataas na $1 {{PLURAL:$1|pahina|mga pahina}} ay nailipat at wala nang maililipat ng awtomatiko.',
+'1movedto2'                    => 'Ang [[$1]] ay inilipat sa [[$2]]',
+'1movedto2_redir'              => 'Ang [[$1]] ay inilipat sa [[$2]] sa ibabaw ng pangkarga',
+'move-redirect-suppressed'     => 'Sinupil ang pagturo papunta sa ibang pahina',
+'movelogpage'                  => 'Tala ng paglipat',
+'movelogpagetext'              => 'Sumusunod ang mga tala ng mga pahinang nailipat.',
+'movereason'                   => 'Dahilan:',
+'revertmove'                   => 'ibalik',
+'delete_and_move'              => 'Burahin at ilipat',
+'delete_and_move_text'         => '==Kinakailangan ang pagbura==
 
 Mayroon na ang pupuntahang artikulo na "[[$1]]". Nais mo bang burahin ito para magbigay daan para sa paglipat?',
-'delete_and_move_confirm' => 'Oo, burahin ang pahina',
-'delete_and_move_reason'  => 'Binura upang makalipat',
-'selfmove'                => 'Magkatulad ang pinagmulan at pupuntahan ng mga titulo; hindi mailipat ang isang pahina sa kanyang sarili.',
-'immobile_namespace'      => 'Ang pinagmulan o patutunguhang pamagat ay isang may natatanging uri; hindi maililipat ang mga pahina mula sa at papunta sa espasyo ng pangalang iyan.',
-'imagenocrossnamespace'   => 'Hindi mailipat ang talaksan patungo sa hindi pangtalaksang espasyo ng pangalan',
-'imagetypemismatch'       => 'Hindi tumutugma sa uri nito ang bagong pandugtong/karugtong ng talaksan',
-'imageinvalidfilename'    => 'Hindi tanggap ang patutunguhan/puntiryang pangalan ng talaksan.',
-'fix-double-redirects'    => 'Isapanahon ang kahit anong panuto/panutong tumuturo sa orihinal na pamagat',
+'delete_and_move_confirm'      => 'Oo, burahin ang pahina',
+'delete_and_move_reason'       => 'Binura upang makalipat',
+'selfmove'                     => 'Magkatulad ang pinagmulan at pupuntahan ng mga titulo; hindi mailipat ang isang pahina sa kanyang sarili.',
+'immobile-source-namespace'    => 'Hindi mailipat ang mga pahinang nasa espasyo ng pangalang "$1"',
+'immobile-target-namespace'    => 'Hindi mailipat ang mga pahina patungo sa espasyo ng pangalang "$1"',
+'immobile-target-namespace-iw' => "Hindi isang tanggap na puntirya para sa isang paglilipat ng pahina ang isang kawing na pang-''interwiki'' (ugnayang pangwiki).",
+'immobile-source-page'         => 'Hindi naililipat ang pahinang ito.',
+'immobile-target-page'         => 'Hindi makakalipat papunta sa ganyang kapupuntahang pamagat.',
+'imagenocrossnamespace'        => 'Hindi mailipat ang talaksan patungo sa hindi pangtalaksang espasyo ng pangalan',
+'imagetypemismatch'            => 'Hindi tumutugma sa uri nito ang bagong pandugtong/karugtong ng talaksan',
+'imageinvalidfilename'         => 'Hindi tanggap ang patutunguhan/puntiryang pangalan ng talaksan.',
+'fix-double-redirects'         => 'Isapanahon ang kahit anong panuto/panutong tumuturo sa orihinal na pamagat',
+'move-leave-redirect'          => 'Mag-iwan ng isang panturo',
 
 # Export
 'export'            => 'Iluwas/ipadala ang mga pahina',
@@ -1883,7 +2141,7 @@ Mayroon na ang pupuntahang artikulo na "[[$1]]". Nais mo bang burahin ito para m
 
 Para ilabas ang mga pahina, ipasok ang mga pamagat sa tekstong kahon sa ibaba, isang pamagat bawat guhit, at piliin kung gusto mo rin ang kasalukuyang bersyon o mga lumang bersyon, kasama ang mga pahina ng kasaysayan, o iyon lamang kasalukuyang bersyon kasama ang mga kaalaman tungkol sa huling binago.
 
-Sa huling kaso, maaari mong gumamit ng ungay, hal. [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] para sa pahinang "[[{{MediaWiki:Mainpage}}]]".',
+Sa huling kaso, maaari mong gumamit ng ungay, hal. [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] para sa pahinang "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Isama lamang ang kasalukuyang rebisyon, hindi ang buong kasaysayan',
 'exportnohistory'   => "----
 '''Tandaan:''' Nakapatay ang paglalabas ng buong kasaysayan ng pahina ng mga pahina sa pamamagitan ng ''form'' na ito dahil maaaring bumagal ang sayt.",
@@ -1899,7 +2157,7 @@ Sa huling kaso, maaari mong gumamit ng ungay, hal. [[{{ns:special}}:Export/{{Med
 'allmessagesdefault'        => 'Tinakdang teksto',
 'allmessagescurrent'        => 'Kasalukuyang teksto',
 'allmessagestext'           => 'Isa itong talaan ng mga mensahe ng sistema na makukuha mula sa espasyo ng pangalang MediaWiki.
-Pakidalaw ang [http://www.mediawiki.org/wiki/Localisation Lokalisasyong MediaWiki] at [http://translatewiki.net Betawiki] kung ibig mong magambag sa heneriko o pangkalahatang lokalisasyon ng MediaWiki.',
+Pakidalaw ang [http://www.mediawiki.org/wiki/Localisation Lokalisasyong MediaWiki] at [http://translatewiki.net translatewiki.net] kung ibig mong magambag sa heneriko o pangkalahatang lokalisasyon ng MediaWiki.',
 'allmessagesnotsupportedDB' => "Hindi magagamit ang '''{{ns:special}}:AllMessages''' dahil hindi gumagana ang '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Pansala ng pangalan ng mensahe:',
 'allmessagesmodified'       => 'Ipakita lamang ang mga binago',
@@ -1919,9 +2177,12 @@ Pakidalaw ang [http://www.mediawiki.org/wiki/Localisation Lokalisasyong MediaWik
 'import-interwiki-text'      => 'Pumili ng isang wiki at pamagat ng pahina na iaangkat.
 Mapapanatili ang mga petsa ng pagbabago at mga pangalan ng patnugot.
 Naitatala sa [[Special:Log/import|tala ng inangkat]] ang lahat ng mga transwiking aksyon para sa pag-angkat.',
+'import-interwiki-source'    => 'Pinagmulang wiki/pahina:',
 'import-interwiki-history'   => 'Kopyahin ang lahat ng mga bersyon ng kasaysayan para sa pahinang ito',
 'import-interwiki-submit'    => 'Mag-angkat',
 'import-interwiki-namespace' => 'Kapupuntahang espasyo ng pangalan:',
+'import-upload-filename'     => 'Pangalan ng talaksan:',
+'import-comment'             => 'Komento:',
 'importtext'                 => 'Pakiluwas/pakikuha ang talaksan mula sa pinagmulang wiki na ginagamit ang [[Special:Export|kasangkapang pangluwas]].  Sagipin mo ito sa iyong kompyuter at ikarga rito.',
 'importstart'                => 'Inaangkat na ang mga pahina...',
 'import-revision-count'      => '$1 {{PLURAL:$1|pagbabago|mga pagbabago}}',
@@ -1955,19 +2216,19 @@ Naitatala sa [[Special:Log/import|tala ng inangkat]] ang lahat ng mga transwikin
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|pagbabago|mga pagbabago}} mula sa $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Ang aking pahina ng tagagamit',
+'tooltip-pt-userpage'             => 'Ang iyong pahina ng tagagamit',
 'tooltip-pt-anonuserpage'         => 'Ang pahina ng tagagamit para sa IP na iyong binabago bilang',
-'tooltip-pt-mytalk'               => 'Aking pahinang usapan',
+'tooltip-pt-mytalk'               => 'Ang iyong pahina ng usapan',
 'tooltip-pt-anontalk'             => 'Usapang tungkol sa mga pagbabagong ginawa sa ip address na ito',
 'tooltip-pt-preferences'          => 'Aking mga kagustuhan',
 'tooltip-pt-watchlist'            => 'Ang talaan ng mga pagbabago sa mga pahinang binabantayan mo',
-'tooltip-pt-mycontris'            => 'Tala ng aking mga ambag',
+'tooltip-pt-mycontris'            => 'Talaan ng mga ambag mo',
 'tooltip-pt-login'                => 'Hinihimok kang lumagda, bagaman hindi ito kinakailangan.',
 'tooltip-pt-anonlogin'            => 'Hinihimok kang lumagda, bagaman hindi ito kinakailangan.',
 'tooltip-pt-logout'               => 'Umalis sa pagkalagda',
 'tooltip-ca-talk'                 => 'Usapan tungkol sa nilalaman ng pahinang ito',
 'tooltip-ca-edit'                 => 'Maaaring baguhin ang pahinang ito. Paki gamit ang buton ng paunang tingin bago itala.',
-'tooltip-ca-addsection'           => 'Magdagdag ng kumento sa usapang ito.',
+'tooltip-ca-addsection'           => 'Magsimula ng isang bagong seksyon',
 'tooltip-ca-viewsource'           => 'Nakaprotekta ang pahinang ito. Makikita mo lamang ang pinagmulan (source) nito.',
 'tooltip-ca-history'              => 'Nakaraang bersyon ng pahinang ito.',
 'tooltip-ca-protect'              => 'Iprotekta ang pahinang ito',
@@ -2014,6 +2275,8 @@ Naitatala sa [[Special:Log/import|tala ng inangkat]] ang lahat ng mga transwikin
 'tooltip-watch'                   => 'Idagdag ang pahinang ito sa iyong tala ng mga binabantayan',
 'tooltip-recreate'                => 'Muling likhain ang pahina kahit na nabura na ito',
 'tooltip-upload'                  => 'Simulan ang pagkarga',
+'tooltip-rollback'                => 'Ibinabalik ng "Pagulungin pabalik sa dati" ang (mga) pagbabago sa pahinang ito patungo sa huling bersyon ng huling tagapagambag sa pamamagitan ng isang pindot lamang.',
+'tooltip-undo'                    => 'Ibinabalit ng "Ibalik" ang pagbabagong ito at binubuksan ang pahinang gawaan ng pagbabago sa anyong paunang-tingin muna.  Nagpapahintulot na makapagdagdag ng dahilan sa buod.',
 
 # Stylesheets
 'common.css'      => '/* Ang inilagay na CSS dito ay gagamitin para sa lahat ng mga pabalat */',
@@ -2025,6 +2288,8 @@ Naitatala sa [[Special:Log/import|tala ng inangkat]] ang lahat ng mga transwikin
 'chick.css'       => "/* Ang CSS na inilagay dito ay makakaapekto sa mga tagagamit ng pabalat na ''Chick'' */",
 'simple.css'      => "/* Ang CSS na iniligay dito ay makakaapekto sa mga tagagamit ng Payak (''Simple'') na pabalat */",
 'modern.css'      => "/* Ang CSS na iniligay dito ay makakaapekto sa tagagamit ng Makabagong (''Modern'') pabalat */",
+'print.css'       => '/* Ang CSS na inilagay dito ay makakaapekto sa kalalabasan o resulta ng paglilimbag */',
+'handheld.css'    => "/* Ang CSS na inilagay dito ay makakaapekto sa mga aparatong nahahawakan (''handheld device'') batay sa itinakdang pabalat sa ''\$wgHandheldStyle'' */",
 
 # Scripts
 'common.js'      => '/* Anumang JavaScript dito ay ikakarga para sa lahat ng mga tagagamit ng bawat pahinang ikinarga. */',
@@ -2043,12 +2308,12 @@ Naitatala sa [[Special:Log/import|tala ng inangkat]] ang lahat ng mga transwikin
 'notacceptable'     => 'Hindi makapagbigay ng dato ang serbidor ng wiki sa anyong mababasa ng iyong kliyente.',
 
 # Attribution
-'anonymous'        => 'Hindi nakikilalang (mga) tagagamit ng {{SITENAME}}',
+'anonymous'        => 'Hindi kilalang {{PLURAL:$1|tagagamit|mga tagagamit}} ng {{SITENAME}}',
 'siteuser'         => 'Tagagamit $1 ng {{SITENAME}}',
 'lastmodifiedatby' => 'Huling binago ang pahinang ito noong $2, $1 ni $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Batay sa gawa ni/nina $1.',
 'others'           => 'iba pa',
-'siteusers'        => '(Mga) tagagamit ng {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|tagagamit|mga tagagamit}} $1 ng {{SITENAME}}',
 'creditspage'      => 'Pahina ng pagkilala sa gumawa (mga kredito)',
 'nocredits'        => 'Walang mga kredito/pagkilala sa gumawa na makuha para sa pahinang ito.',
 
@@ -2069,6 +2334,16 @@ Maaaring dahil ito sa isang kawing sa isang nakatalang hinarang dahil di-kinaisn
 'numauthors'     => 'Bilang ng mga bukdo-tanging mga may-akda (pahina): $1',
 'numtalkauthors' => 'Bilang ng bukod-tanging mga may-akda (pahinang usapan): $1',
 
+# Skin names
+'skinname-standard'    => 'Klasiko',
+'skinname-nostalgia'   => 'Nostalhiya',
+'skinname-cologneblue' => 'Bughaw na Kolon',
+'skinname-monobook'    => 'MonoAklat ("isang aklat")',
+'skinname-myskin'      => 'PabalatKo',
+'skinname-chick'       => "\"Pambabae\" (''Chick'')",
+'skinname-simple'      => 'Payak',
+'skinname-modern'      => 'Makabago (Moderno)',
+
 # Math options
 'mw_math_png'    => 'Palaging ilarawan sa anyong PNG',
 'mw_math_simple' => 'HTML kung napakapayak o kaya PNG kung iba',
@@ -2089,10 +2364,12 @@ Maaaring dahil ito sa isang kawing sa isang nakatalang hinarang dahil di-kinaisn
 'markedaspatrollederror-noautopatrol' => 'Wala kang pahintulot para tatakan ang ginawa mong mga pagbabago bilang napatrolya na.',
 
 # Patrol log
-'patrol-log-page'   => 'Tala ng Pagpapatrolya',
-'patrol-log-header' => 'Tala ito ng mga pagbabagong napatrolya na.',
-'patrol-log-line'   => 'tinatakang $1 ng $2 napatrolya $3',
-'patrol-log-auto'   => '(awtomatiko)',
+'patrol-log-page'      => 'Tala ng Pagpapatrolya',
+'patrol-log-header'    => 'Tala ito ng mga pagbabagong napatrolya na.',
+'patrol-log-line'      => 'tinatakang $1 ng $2 napatrolya $3',
+'patrol-log-auto'      => '(awtomatiko)',
+'patrol-log-diff'      => 'rebisyong $1',
+'log-show-hide-patrol' => '$1 tala ng pagpatrolya',
 
 # Image deletion
 'deletedrevision'                 => 'Binurang lumang pagbabago $1',
@@ -2109,6 +2386,9 @@ $1',
 'previousdiff' => '� Mas lumang pagbabago',
 'nextdiff'     => 'Mas bagong pagbabago →',
 
+# Visual comparison
+'visual-comparison' => 'Paghahambing na matatanaw',
+
 # Media information
 'mediawarning'         => "'''Babala''': Maaaring naglalaman ang talaksang ito ng kodigong malisyoso, maaaring manganib ang iyong sistema kapag isinagawa mo ito .<hr />",
 'imagemaxsize'         => 'Itakda lamang ang hangganan ng mga larawan sa ibabaw ng pahina ng paglalarawang pangtalaksan sa:',
@@ -2121,10 +2401,12 @@ $1',
 'show-big-image'       => 'Buong resolusyon (kalinawan)',
 'show-big-image-thumb' => '<small>Laki ng paunang tinging ganito: $1 × $2 mga piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galerya ng mga bagong talaksan',
 'imagelisttext'         => "Nasa ibaba ang isang tala ng '''$1''' {{PLURAL:$1|talaksan|mga talakasang}} nauri na $2.",
 'newimages-summary'     => 'Nagpapakita ang natatanging pahinang ito ng huling naikargang mga talaksan.',
+'newimages-legend'      => 'Pansala',
+'newimages-label'       => 'Pangalan ng talaksan (o bahagi nito):',
 'showhidebots'          => "($1 mga ''bot'')",
 'noimages'              => 'Walang makikita dito.',
 'ilsubmit'              => 'Hanapin',
@@ -2338,6 +2620,18 @@ Nakatakdang itago ang iba pa.
 'exif-lightsource-24'  => 'Tungstenong pang-istudyo ng ISO',
 'exif-lightsource-255' => 'Iba pang pagmumulan ng liwanag',
 
+# Flash modes
+'exif-flash-fired-0'    => "Hindi kumislap/sumiklab ang pangkisap (''flash'')",
+'exif-flash-fired-1'    => "Sumiklab/kumislap ang pangkisap (''flash'')",
+'exif-flash-return-0'   => 'walang tungkuling pambalik kung makapansin ng liwanag ang istroboskopyo',
+'exif-flash-return-2'   => 'hindi makapansin ng bumabalik na liwanag ang istroboskopyo',
+'exif-flash-return-3'   => 'nakapansin ng bumabalik na liwanag ang istroboskopyo',
+'exif-flash-mode-1'     => "ipinatutupad na sapilitang pagpapasiklab ng pangkisap (''flash'')",
+'exif-flash-mode-2'     => "pagpipigil sa sapilitang pagpapasiklab ng pangkisap (''flash'')",
+'exif-flash-mode-3'     => 'automatikong modalidad',
+'exif-flash-function-1' => "Tungkuling walang pagpapakisap (''flash'')",
+'exif-flash-redeye-1'   => 'Modalidad na pambawas na mapulang mata/pula sa mata',
+
 'exif-focalplaneresolutionunit-2' => 'mga pulgada',
 
 'exif-sensingmethod-1' => 'Walang kahulugan',
@@ -2482,24 +2776,10 @@ Pakitiyak kung ibig mo talagang likhain muli ang pahinang ito.",
 
 'unit-pixel' => 'px',
 
-# HTML dump
-'redirectingto' => 'Nagkakarga sa [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Linisin ang baunan ng pahinang ito?
-
-$1',
 'confirm_purge_button' => "Sige/Ayos 'yan/Okey",
-
-# AJAX search
-'searchcontaining' => "Hanapin ang mga pahinang naglalaman ng ''$1''.",
-'searchnamed'      => "Hanapin ang mga pahinang pinangalanang ''$1''.",
-'articletitles'    => "Mga pahinang nagsisimula sa ''$1''",
-'hideresults'      => 'Itago ang mga resulta',
-'useajaxsearch'    => 'Gamitin ang panghanap na AJAX',
-
-# Separators for various lists, etc.
-'catseparator' => '|',
+'confirm-purge-top'    => 'Linisin/hawiin ang taguan ng pahinang ito?',
+'confirm-purge-bottom' => 'Nililinis ng pagdadalisay ng isang pahina ang taguan at mapipilitang palitawin ang pinakapangkasalukuyang bersyon.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� nakaraang pahina',
@@ -2519,10 +2799,10 @@ $1',
 'table_pager_empty'        => 'Walang resulta',
 
 # Auto-summaries
-'autosumm-blank'   => 'Itinatanggal ang lahat ng nilalaman mula sa pahina',
+'autosumm-blank'   => 'Tinanggal ang laman ng pahina',
 'autosumm-replace' => "Ipinapalit ang pahina ng may nilalamang '$1'",
 'autoredircomment' => 'Ikinakarga sa [[$1]]',
-'autosumm-new'     => 'Bagong pahina: $1',
+'autosumm-new'     => "Nilikha ang pahina na may '$1'",
 
 # Live preview
 'livepreview-loading' => 'Ikinakarga…',
@@ -2608,6 +2888,7 @@ Maaari mo ring [[Special:Watchlist/edit|gamitin ang pangkaraniwang pampatnugot]]
 
 # Core parser functions
 'unknown_extension_tag' => 'Hindi nalalamang tatak ng karugtong na "$1"',
+'duplicate-defaultsort' => 'Babala: Madadaig ng susi ng pagtatakdang "$2" ang mas naunang susi ng pagtatakdang "$1".',
 
 # Special:Version
 'version'                          => 'Bersyon', # Not used as normal message but as header for the special page itself
@@ -2634,16 +2915,15 @@ Maaari mo ring [[Special:Watchlist/edit|gamitin ang pangkaraniwang pampatnugot]]
 'filepath'         => 'Lokasyon ng talaksan (file path)',
 'filepath-page'    => 'Talaksan:',
 'filepath-submit'  => 'Patutunguhan',
-'filepath-summary' => 'Ibinabalik ng natatanging pahina ito ang buong daanan para sa isang talaksan.
-Ipinapakita ng may buong kalinawan (resolusyon) ang mga larawan, tuwirang sinimulan ang iba pang mga uri ng talaksan sa pamamagitan ng mga kaugnay nilang programa.
+'filepath-summary' => 'Ibinabalik ng natatanging pahinang ito ang buong daanan ng isang talaksan.  Ipinapakita ang mga larawan na may buong resolusyon (kalinawan), tuwirang sinimulan ang ibang uri ng mga talaksan sa pamamagitan ng kaugnay nilang mga programa.
 
 Ipasok ang pangalan ng talaksan na hindi kasama ang unlaping "{{ns:image}}:".',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Maghanap ng kaparehong mga talaksan',
-'fileduplicatesearch-summary'  => "Maghanap ng kakambal/kamukhang mga talaksan ayon sa halaga ng pagkakaroon ng katulad (''hash value'') nito.
+'fileduplicatesearch-summary'  => "Maghanap ng mga kaparehong mga talaksan sa baba ng kanyang halaga ng ''hash''.
 
-Ipasok ang pangalan ng talaksan na hindi kasama ang unlaping \"{{ns:image}}:\".",
+Ipasok ang pangalan ng talaksan na wala ang unlaping \"{{ns:image}}:\".",
 'fileduplicatesearch-legend'   => 'Maghanap ng mga kapareho',
 'fileduplicatesearch-filename' => 'Pangalan ng talaksan:',
 'fileduplicatesearch-submit'   => 'Hanapin',
@@ -2673,4 +2953,13 @@ Ipasok ang pangalan ng talaksan na hindi kasama ang unlaping \"{{ns:image}}:\"."
 'blankpage'              => 'Walang laman na pahina',
 'intentionallyblankpage' => 'Sinadyang walang laman ang pahinang ito',
 
+# External image whitelist
+'external_image_whitelist' => ' #Pabayaang talagang ganito lang ang hanay na ito<pre>
+#Ilagay ang mga piraso ng karaniwang pagpapahayag (iyong bahagi lang na napupunta sa pagitan ng //) sa ibaba
+#Tutugmaan ang mga ito ng mga URL ng panlabas (mga naging "maiinit na kawing") na mga larawan
+#Ang mga magtutugma ay ipapakita bilang mga larawan, kung hindi naman bilang isang kawing lang patungo sa larawan ang ipapakita
+#Itinuturing bilang mga kumento/puna ang mga hanay/hilerang nagsisimula sa #
+
+#Ilagay sa ibabaw ng hanay na ito ang mga piraso ng karaniwang pagpapahayag.  Pabayaang talagang ganito lang ang hanay/hilerang ito</pre>',
+
 );
diff --git a/languages/messages/MessagesTlh.php b/languages/messages/MessagesTlh.php
index 6237f551..612412e1 100644
--- a/languages/messages/MessagesTlh.php
+++ b/languages/messages/MessagesTlh.php
@@ -3,6 +3,7 @@
  *
  * @ingroup Language
  * @file
+ *
  */
 
 $namespaceNames = array(
@@ -14,8 +15,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => "lo'wI'_ja'chuq",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => "$1_ja'chuq",
-	NS_IMAGE            => "nagh_beQ",
-	NS_IMAGE_TALK       => "nagh_beQ_ja'chuq",
+	NS_FILE             => "nagh_beQ",
+	NS_FILE_TALK        => "nagh_beQ_ja'chuq",
 	NS_MEDIAWIKI        => "MediaWiki",
 	NS_MEDIAWIKI_TALK   => "MediaWiki_ja'chuq",
 	NS_TEMPLATE         => "chen'ay'",
diff --git a/languages/messages/MessagesTn.php b/languages/messages/MessagesTn.php
index 611e750d..d232e57c 100644
--- a/languages/messages/MessagesTn.php
+++ b/languages/messages/MessagesTn.php
@@ -102,7 +102,7 @@ O ipuletse akhaonte. O seka wa lebala go fetola tse o di dikgatlhegelo tsa gago
 'username'           => 'Leina la modirisi:',
 
 # Edit pages
-'summary'            => 'Tshoboko',
+'summary'            => 'Tshoboko:',
 'minoredit'          => 'Se ke paakanyo e potlana',
 'watchthis'          => 'Lebelela tsebe e',
 'savearticle'        => 'Boloka tsebe',
@@ -141,6 +141,9 @@ O ipuletse akhaonte. O seka wa lebala go fetola tse o di dikgatlhegelo tsa gago
 'watch'         => 'Lebelela',
 'watchthispage' => 'Lebelela tsebe e',
 
+# Protect
+'prot_1movedto2' => '[[$1]] o sutisediwa kwa go [[$2]]',
+
 # Undelete
 'undelete-search-submit' => 'Senka',
 
@@ -153,6 +156,7 @@ O ipuletse akhaonte. O seka wa lebala go fetola tse o di dikgatlhegelo tsa gago
 # Move page
 'move-page-legend' => 'Sutisa tsebe',
 'movearticle'      => 'Sutisa tsebe:',
+'movenologin'      => 'Ga o a ikwadisa',
 'movepagebtn'      => 'Sutisa tsebe',
 'movedto'          => 'sutela kwa',
 '1movedto2'        => '[[$1]] o sutisediwa kwa go [[$2]]',
diff --git a/languages/messages/MessagesTo.php b/languages/messages/MessagesTo.php
index 0661b3dc..0d712bb5 100644
--- a/languages/messages/MessagesTo.php
+++ b/languages/messages/MessagesTo.php
@@ -1,5 +1,5 @@
 <?php
-/** Tonga (faka-Tonga)
+/** Tonga (lea faka-Tonga)
  *
  * @ingroup Language
  * @file
@@ -11,24 +11,30 @@
 
 $messages = array(
 # User preference toggles
-'tog-underline'          => 'Ngaahi fehokotaki ʻoku laineʻi ʻi lalo:',
-'tog-highlightbroken'    => 'Ngaohi ʻa e ngaahi fehokotaki maumau ʻoku <a href="" class="new">pehē</a> (meʻa kehe ʻoku pehē <a href="" class="internal">?</a>).',
-'tog-rememberpassword'   => 'Manatuʻi ʻeku kau-ki-ai ʻi he komipiuta ʻeni',
-'tog-watchcreations'     => 'T�naki ngaahi peesi ʻoku fakatupu ʻe au ki he hokohoko leʻo',
-'tog-watchdefault'       => 'T�naki ngaahi peesi ʻoku fatu ʻe au ki he hokohoko leʻo',
-'tog-fancysig'           => 'Fakamoʻoniʻi tula pē (taʻefehokotaki fakamīsini)',
-'tog-forceeditsummary'   => 'Tala mai kapau ʻe ʻikai te u foaki ʻa e fakanounou fatu',
-'tog-watchlisthideown'   => 'Toi ʻeku ngaahi fatu mei he hokohoko leʻo',
-'tog-watchlisthidebots'  => 'Toi fatu fakamīsini mei he hokohoko leʻo',
-'tog-watchlisthideminor' => 'Toi ha ngaahi fatu siʻisiʻi mei he hokohoko leʻo',
-'tog-diffonly'           => 'ʻOua ʻe ʻasi ha kakano peesi ʻi lalo ngaahi liliu',
+'tog-underline'            => 'Ngaahi fehokotaki ʻoku laineʻi ʻi lalo:',
+'tog-highlightbroken'      => 'Ngaohi ʻa e ngaahi fehokotaki maumau ʻoku <a href="" class="new">pehē</a> (meʻa kehe ʻoku pehē <a href="" class="internal">?</a>).',
+'tog-rememberpassword'     => 'Manatuʻi ʻeku kau-ki-ai ʻi he komipiuta ʻeni',
+'tog-watchcreations'       => 'T�naki ngaahi peesi ʻoku fakatupu ʻe au ki he hokohoko leʻo',
+'tog-watchdefault'         => 'T�naki ngaahi peesi ʻoku fatu ʻe au ki he hokohoko leʻo',
+'tog-watchmoves'           => 'T�naki ki heʻeku hokohoko leʻo ʻa e ngaahi peesi kuo ʻunu ʻe au',
+'tog-watchdeletion'        => 'T�naki ki heʻeku hokohoko leʻo ʻa e ngaahi peesi kuo t�mateʻi ʻe au',
+'tog-enotifwatchlistpages' => 'Tohila mai ʻo ka liliu ha peesi ʻi heʻeku hokohoko leʻo',
+'tog-enotifusertalkpages'  => 'Tohila mai ʻo ka liliu ʻa heʻeku peesi alea',
+'tog-enotifminoredits'     => 'Tohila mai foki ʻo ka ʻi ai ha fatu siʻi pē',
+'tog-enotifrevealaddr'     => 'Fakah� hoku tuʻasila ʻi he ngaahi tohila tala',
+'tog-fancysig'             => 'Fakamoʻoniʻi tula pē (taʻefehokotaki fakamīsini)',
+'tog-forceeditsummary'     => 'Tala mai kapau ʻe ʻikai te u foaki ʻa e fakanounou fatu',
+'tog-watchlisthideown'     => 'Toi ʻeku ngaahi fatu mei he hokohoko leʻo',
+'tog-watchlisthidebots'    => 'Toi fatu fakamīsini mei he hokohoko leʻo',
+'tog-watchlisthideminor'   => 'Toi ha ngaahi fatu siʻisiʻi mei he hokohoko leʻo',
+'tog-ccmeonemails'         => 'ʻAve mai ʻa e hikitatau ʻo e ngaahi tohila naʻe ʻave atu ʻe au',
+'tog-diffonly'             => 'ʻOua ʻe ʻasi ha kakano peesi ʻi lalo ngaahi liliu',
+'tog-showhiddencats'       => 'ʻAsi mai ʻa e ngaahi faʻahinga toi',
 
 'underline-always'  => 'Taimi kotoa',
 'underline-never'   => 'ʻIkai teitei',
 'underline-default' => 'Palausa tuʻunga',
 
-'skinpreview' => '(Vakai pē)',
-
 # Dates
 'sunday'        => 'S�pate',
 'monday'        => 'M�nite',
@@ -82,11 +88,13 @@ $messages = array(
 'dec'           => 'Tis',
 
 # Categories related messages
-'pagecategories'         => 'Faʻahinga',
-'category_header'        => 'Ngaahi kupu ʻi he faʻahinga "$1"',
-'subcategories'          => 'Ngaahi faʻahinga siʻi',
-'category-empty'         => "''Ko e faʻahinga ʻeni ʻoku ʻikai ʻi ai haʻane kupu pe ʻata.''",
-'listingcontinuesabbrev' => ' hoko',
+'pagecategories'           => 'Faʻahinga',
+'category_header'          => 'Ngaahi kupu ʻi he faʻahinga "$1"',
+'subcategories'            => 'Ngaahi faʻahinga siʻi',
+'category-empty'           => "''Ko e faʻahinga ʻeni ʻoku ʻikai ʻi ai haʻane kupu pe ʻata.''",
+'hidden-categories'        => 'Faʻahinga toi',
+'hidden-category-category' => 'Ngaahi faʻahinga toi', # Name of the category where hidden categories will be listed
+'listingcontinuesabbrev'   => ' hoko',
 
 'about'          => 'Kau ki',
 'article'        => 'Peesi kakano',
@@ -103,7 +111,7 @@ $messages = array(
 'mytalk'         => 'Alea ʻaʻaku',
 'anontalk'       => 'Alea maʻa e IP´ ni',
 'navigation'     => 'ʻai taumuʻa ki he…',
-'and'            => 'mo e',
+'and'            => '&#32;mo e',
 
 'errorpagetitle'    => 'Halaʻi',
 'returnto'          => 'Foki ki he $1',
@@ -121,16 +129,19 @@ $messages = array(
 'permalink'         => 'Fehokotaki taumaʻu',
 'print'             => 'Paaki',
 'edit'              => 'Fatu',
+'create'            => 'Fakatupu',
 'editthispage'      => 'Fatuʻi e pēsí ni',
 'delete'            => 'T�mateʻi',
 'deletethispage'    => 'T�mateʻi he pēsí ni',
 'undelete_short'    => 'Taʻet�mateʻi ʻa e fatu ʻe $1',
 'protect'           => 'Maluʻi',
+'protect_change'    => 'liliu',
 'protectthispage'   => 'Maluʻi e pēsí ni',
 'unprotect'         => 'taʻemaluʻi',
 'unprotectthispage' => 'ʻE taʻemaluʻi he pēsí ni',
 'newpage'           => 'Peesi foʻou',
 'talkpage'          => 'Aleaʻi he pēsí ni',
+'talkpagelinktext'  => 'Alea',
 'specialpage'       => 'Peesi makehe',
 'personaltools'     => 'Puha haʻate meʻang�ue',
 'postcomment'       => 'Fokotuʻu ha fakamatala',
@@ -139,7 +150,7 @@ $messages = array(
 'views'             => 'Ngaahi vakai',
 'toolbox'           => 'Puha meʻang�ue',
 'userpage'          => 'Vakai ki he peesi ʻo e ʻetita',
-'imagepage'         => 'Vakai ki he peesi ʻo e fait�',
+'imagepage'         => 'Vakai ki he peesi ʻo e ʻata',
 'templatepage'      => 'Vakai ki he peesi sīpinga',
 'viewhelppage'      => 'Vakai ki he peesi fakatokoni',
 'categorypage'      => 'Vakai ki he peesi faʻahinga',
@@ -159,6 +170,8 @@ $messages = array(
 'copyrightpagename'    => 'Foʻi mafai ke pulusi maʻa e {{SITENAME}}',
 'currentevents'        => 'Ngaahi ongoongo',
 'currentevents-url'    => 'Project:Ongoongo taka',
+'disclaimers'          => 'Ngaahi fakaʻataʻat�',
+'disclaimerpage'       => 'Project:Fakaʻataʻat� lūkufua',
 'edithelp'             => 'Tokoni ki he fatu',
 'faq'                  => 'Fehuʻi faʻa eke',
 'faqpage'              => 'Project:Fehuʻi faʻa eke',
@@ -169,8 +182,6 @@ $messages = array(
 
 'badaccess'        => 'Halaʻi fakangofua',
 'badaccess-group0' => 'ʻOku ʻikai ngofua kia te koe ʻo fai ʻa e ng�ue naʻa ke eke ki ai.',
-'badaccess-group1' => 'Ko e ng�ue naʻa ke eke ki ai, ʻoku fakangatangata ki he kau ʻetita ʻi he kulupu $1 pē.',
-'badaccess-group2' => 'Ko e ng�ue naʻa ke eke ki ai, ʻoku fakangatangata ki he kau ʻetita ʻi he taha ʻo e ngaahi kulupu $1 pē.',
 'badaccess-groups' => 'Ko e ng�ue naʻa ke eke ki ai, ʻoku fakangatangata ki he kau ʻetita ʻi he taha ʻo e ngaahi kulupu $1 pē.',
 
 'versionrequired'     => "ʻOku pau ko e paaki $1 ʻo e ''MediaWiki''",
@@ -182,7 +193,10 @@ $messages = array(
 'youhavenewmessagesmulti' => 'ʻOku ʻi ai haʻo tala foʻou ʻi $1',
 'editsection'             => 'fatuʻi vahe',
 'editold'                 => 'fatu',
+'editlink'                => 'fatu',
+'viewsourcelink'          => 'vakai ki he tupunga',
 'editsectionhint'         => 'Fatuʻi vahe: $1',
+'toc'                     => 'Kakano',
 'showtoc'                 => 'ʻasi mai',
 'hidetoc'                 => 'toi',
 'thisisdeleted'           => 'Vakai pe fakafoki: $1?',
@@ -190,11 +204,15 @@ $messages = array(
 'restorelink'             => 'ko e fatu ʻosi t�mateʻi ʻe $1',
 'feedlinks'               => 'Fafanga:',
 'feed-invalid'            => 'Ko e falenga fafanga ʻoku taʻeʻaonga.',
+'site-atom-feed'          => "$1 Lave ''Atom''",
+'page-rss-feed'           => "\"\$1\" lave ''RSS''",
+'page-atom-feed'          => "\"\$1\" lave ''Atom''",
+'red-link-title'          => '$1 (ʻoku ʻikai moʻui ʻa e pēsí)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Kupu',
 'nstab-user'      => 'Peesi ʻo e ʻetita',
-'nstab-special'   => 'Makehe',
+'nstab-special'   => 'Peesi makehe',
 'nstab-image'     => 'Fait�',
 'nstab-mediawiki' => 'Tala',
 'nstab-template'  => 'SÄ«pinga',
@@ -226,7 +244,6 @@ Ko e pule, naʻe lokaʻi ia, ʻoku pehē: $1',
 'cannotdelete'         => 'Naʻe ʻikai lava t�mateʻi ʻa e peesi pe faile naʻe tala. Mahalo pē kuo t�mateʻi ʻuluaki ia ʻe he ʻetita kehe.',
 'badtitle'             => 'Hingoa ʻikai sai',
 'badtitletext'         => "Naʻe taʻeʻaonga ʻa e hingoa ʻo e peesi naʻa ke fili, pe naʻe ʻi ai ha fehokotaki m�hehei fakalea kehe pe fehokotaki m�hehei faka''wiki'' kehe. Mahalo pe ʻoku ʻi loto ha ʻū mataʻitohi ʻoku ʻikai lava ng�ueʻaki ʻi ha hingoa.",
-'perfdisabled'         => 'Fakamolemole! Naʻe fakataʻeʻaongaʻi fakataimi ʻa e f�tungá ni, koeʻuhi ʻoku fakatumotuma ʻa e t�nekingaʻilo ʻe ʻikai lava ng�ueʻakiʻi ʻa e wiki.',
 'perfcached'           => 'ʻOku fafaʻo ʻa e meʻaʻilo ʻi lalo, pea mahalo pē ʻoku ʻikai fakafoʻoua.',
 'perfcachedts'         => 'ʻOku fafaʻo ʻa e meʻaʻilo ʻi lalo, naʻe fakaonopooni fakamuimui ia $1.',
 'wrong_wfQuery_params' => "Ngaahi mahuʻinga ʻikai totonu ki he ''wfQuery()''<br />
@@ -241,8 +258,8 @@ Eke: $2",
 
 # Login and logout pages
 'logouttitle'                => 'ʻAlu mamaʻo ʻo e ʻetita',
-'logouttext'                 => '<strong>Kuo ʻalu mamaʻo koe he taimí ni.</strong><br />
-E lava te ke hoko atu ʻo ng�ueʻaki he {{SITENAME}} tatau mo e ʻetita taʻehingoa, pe te ke kau-ki-ai mo e hingoa tatau pe hingoa kehe. Tokanga, mahalo pē ʻe ʻi ai ha ngaahi peesi ʻoku ʻasi    ko koe kei kau-ki-ai aʻu ki he taimi te ke fakaʻat� ʻa e fafaʻo fakapalausa.',
+'logouttext'                 => "'''Kuo ʻalu mamaʻo koe he taimí ni.'''<br />
+E lava te ke hoko atu ʻo ng�ueʻaki he {{SITENAME}} tatau mo e ʻetita taʻehingoa, pe te ke kau-ki-ai mo e hingoa tatau pe hingoa kehe. Tokanga, mahalo pē ʻe ʻi ai ha ngaahi peesi ʻoku ʻasi ko koe kei kau-ki-ai aʻu ki he taimi te ke fakaʻat� ʻa e fafaʻo fakapalausa.",
 'welcomecreation'            => '== Tali fiefia, $1! ==
 
 Kuo fakatupu hoʻo tohi kau-ki-ai. ʻOua ʻe ngalo ke liliu hoʻo faʻiteliha {{SITENAME}}.',
@@ -252,7 +269,6 @@ Kuo fakatupu hoʻo tohi kau-ki-ai. ʻOua ʻe ngalo ke liliu hoʻo faʻiteliha {{
 'yourpasswordagain'          => 'Toe ʻai leatapu',
 'remembermypassword'         => 'Manatuʻi au',
 'yourdomainname'             => 'ho ng�ueʻanga',
-'loginproblem'               => '<b>Naʻe ʻi ai ha meʻafihi mo hoʻo kau-ki-ai.</b><br />Toe feinga.',
 'login'                      => 'Kau ki ai',
 'nav-login-createaccount'    => 'Kau ki ai',
 'loginprompt'                => 'ʻOku pau te ke fakamafeia ʻa e ngaahi foʻi keke kapau te ke fie kau-ki-ai ki he {{SITENAME}}.',
@@ -283,13 +299,13 @@ Kuo fakatupu hoʻo tohi kau-ki-ai. ʻOua ʻe ngalo ke liliu hoʻo faʻiteliha {{
 'noname'                     => 'Naʻe ʻikai te ke ʻoatu hao hingoa ʻetita ʻoku totonu.',
 'loginsuccesstitle'          => 'Kuo ola ʻa e kau-ki-ai',
 'loginsuccess'               => "'''ʻOku ke kau-ki-ai he taimí ni ki he {{SITENAME}} hangē \"\$1\".'''",
-'nosuchuser'                 => 'ʻOku ʻikai ʻi ai ha ʻetita mo hono hingoa "$1". Sivi hoʻo sipela pe fakatupu haʻo kau-ki-ai foʻou.',
+'nosuchuser'                 => 'ʻOku ʻikai ʻi ai ha ʻetita mo hono hingoa "$1". Sivi hoʻo sipela pe [[Special:UserLogin/signup|fakatupu haʻo kau-ki-ai foʻou]].',
 'nosuchusershort'            => 'ʻOku ʻikai ʻi ai ha ʻetita mo hono hingoa "<nowiki>$1</nowiki>". Sivi hoʻo sipela.',
 'nouserspecified'            => 'ʻOku pau te ke ʻoatu ha hingoa ʻo e ʻetita.',
 'wrongpassword'              => 'ʻOku ʻikai totonu ʻa e leatapu, k�taki ʻe toki feinga.',
 'wrongpasswordempty'         => 'Naʻe maha ʻa e tapulea, k�taki ʻe toki feinga.',
 'passwordtooshort'           => 'ʻOku fuʻu nounou hoʻo leatapu. ʻE pau ʻoku ʻi loto ko e mataʻitohi ʻe $1 pe lahi ange.',
-'mailmypassword'             => 'Tohila ʻa e leatapu',
+'mailmypassword'             => 'Tohila mai ʻa e leatapu foʻou',
 'passwordremindertitle'      => 'Ko e fakamanatu ki he leatapu mei he {{SITENAME}}',
 'passwordremindertext'       => 'Ko e tokotaha, mahalo pe ko koe mei he tuʻasila IP $1, naʻe kole ia ke ʻavea ha leatapu foʻou maʻa e {{SITENAME}} ($4). Ko e leatapu maʻa e ʻetita "$2", ʻoku "$3" he taimí ni. ʻOku pau te ke kau-ki-ai pea te ke liliu hoʻo leatapu.
 
@@ -298,8 +314,8 @@ Kapau naʻe kole ia ʻe he tokotaha kehe, pea ʻosi hoʻo manatuʻi ʻo e leatap
 'passwordsent'               => 'ʻOsi ʻave ʻa e leatapu foʻou ki he tohila kuo lēsisita maʻa "$1". K�taki ʻe toe kau-ki-ai ʻosi maʻu ia.',
 'eauthentsent'               => 'Kuo ʻave ʻa e tohila fakomoʻoniʻi ki he tuʻasila tohila naʻe fokotuʻu. ʻE pau te ke muitala ʻa e tohilá ni pea fakamoʻoniʻi ʻe koe ko e tuʻasila ē ʻoku moʻoni ko e tuʻasila ʻaʻau, ki muʻa ʻe ʻi ai ha tohila ʻe taha ʻe ʻave ia ki he tuʻasila ko ē.',
 'mailerror'                  => 'Hala mei he tohila, ʻene ʻave ia: $1',
-'acct_creation_throttle_hit' => 'Fakamolemole, kuo ʻosi hoʻo fakatupu ʻa e tohi kau-ki-ai ʻe $1. ʻOku ʻikai te ke lava t�naki ki ai.',
-'emailauthenticated'         => 'Kuo fakamoʻoniʻi ho tuʻasila tohila ʻi he $1.',
+'acct_creation_throttle_hit' => 'Fakamolemole, kuo ʻosi hoʻo fakatupu ʻa e tohi kau-ki-ai ʻe $1 mei he tuʻasila IP ʻeni. ʻOku ʻikai te ke lava t�naki ki ai he ʻahó ni.',
+'emailauthenticated'         => 'Kuo fakamoʻoniʻi ho tuʻasila tohila ʻi he $2, $3.',
 'emailnotauthenticated'      => "ʻOku '''teʻeki fakamoʻoniʻi''' hoʻo tuʻasila tohila. ʻE ʻikai ʻaupito ʻave ha tohila ki ai.",
 'noemailprefs'               => 'Tala ange ha tuʻasila tohila, ke sai ʻa e ngaahi meʻa ē.',
 'emailconfirmlink'           => 'Fakamoʻoniʻi ho tuʻasila tohila',
@@ -308,6 +324,11 @@ Kapau naʻe kole ia ʻe he tokotaha kehe, pea ʻosi hoʻo manatuʻi ʻo e leatap
 'accountcreatedtext'         => 'Kuo fakatupu ʻa e tohi kau-ki-ai maʻa $1.',
 'loginlanguagelabel'         => 'Lea: $1',
 
+# Password reset dialog
+'oldpassword' => 'Ko e leatapu motuʻa:',
+'newpassword' => 'Ko e leatapu foʻou:',
+'retypenew'   => 'Toe ʻai leatapu foʻou:',
+
 # Edit page toolbar
 'bold_sample'     => 'Tohi sinolahi',
 'bold_tip'        => 'Tohi sinolahi',
@@ -319,13 +340,14 @@ Kapau naʻe kole ia ʻe he tokotaha kehe, pea ʻosi hoʻo manatuʻi ʻo e leatap
 'extlink_tip'     => 'Fehokotaki ki tuʻa (manatuʻi ko e fakapipikimuʻa — http://)',
 'headline_sample' => 'Mataʻitohi tuʻumuʻa',
 'headline_tip'    => 'Tuʻumuʻa fakatuʻunga hono 2',
+'math_tip'        => "Kupuʻilea fakamatematika ''(LaTex)''",
 'nowiki_sample'   => 'Hulumaki ʻa e ʻū mataʻitohi taʻengaohi ʻi heni',
 'nowiki_tip'      => "taʻetokaʻi ngaohi ''wiki''",
 'sig_tip'         => 'Ko e fakamoʻoniʻi ʻaʻau mo hono taimi',
 
 # Edit pages
-'summary'                 => 'Fakanounou',
-'subject'                 => 'Tuʻunga lea',
+'summary'                 => 'Fakanounou:',
+'subject'                 => 'Tuʻunga lea:',
 'minoredit'               => 'Ko e fatu siʻi pē ia',
 'watchthis'               => 'Leʻo he pēsí ni',
 'savearticle'             => 'Haofaki e pēsí',
@@ -354,12 +376,12 @@ Kapau naʻe kole ia ʻe he tokotaha kehe, pea ʻosi hoʻo manatuʻi ʻo e leatap
 'noarticletext'           => 'Ko e pēsi ni, ʻoku ʻikai haʻane tohi ʻi ai he taimi ni. ʻE lava koe ʻo [[Special:Search/{{PAGENAME}}|kumi ki heʻene hingoa]] ʻi ha ngaahi peesi ʻe taha, pe [{{fullurl:{{FULLPAGENAME}}|action=edit}} ʻetita ʻi ai.]',
 'clearyourcache'          => "'''Tokanga''', ʻosi he haofaki e peesi, mahalo pē ʻoku pau te ke fakaʻat� ʻa e fafaʻo ʻo ho palausa, naʻa ʻikai te ke sio ʻa e paaki foʻou.",
 'updated'                 => '(Fakafoʻou)',
-'note'                    => '<strong>Tohi nounou:</strong>',
-'previewnote'             => '<strong>Ko e vakai pē ia, teʻeki haofakiʻi ʻa e ngaahi liliu!</strong>',
-'session_fail_preview'    => '<strong>K�taki, naʻe ʻikai fai hoʻo fatu ko e ʻuhinga ia ai naʻe mole ʻa e meʻaʻilo. K�taki toki feinga. Kapau e toe hala, mahalo pē te ke ʻalu mamaʻo pea te ke toki kau ki ai.</strong>',
+'note'                    => "'''Tohi nounou:'''",
+'previewnote'             => "'''Ko e vakai pē ia, teʻeki haofakiʻi ʻa e ngaahi liliu!'''",
+'session_fail_preview'    => "'''K�taki, naʻe ʻikai fai hoʻo fatu ko e ʻuhinga ia ai naʻe mole ʻa e meʻaʻilo. K�taki toki feinga. Kapau e toe hala, mahalo pē te ke ʻalu mamaʻo pea te ke toki kau ki ai.'''",
 'editing'                 => 'ʻOku fatuʻi $1',
 'editingsection'          => 'ʻOku fatuʻi $1 (vahe)',
-'editingcomment'          => 'ʻOku fatuʻi $1 (fakamatala)',
+'editingcomment'          => 'ʻOku fatuʻi $1 (fakamatala foʻou)',
 'editconflict'            => 'Fepaki fatu: $1',
 'explainconflict'         => "Naʻe liliu ʻa e pēsí ni ʻe he ʻetita ʻe taha lolotonga he taimi kuo ke kamata hoʻo fatu.
 Ko e konga ʻi olunga, ko e kupu ia he onopooni.
@@ -368,13 +390,15 @@ Ko e konga ʻi lalo, ko hoʻo ngaahi liliu ia.
 Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi ʻo e meʻalolomi \"haofaki e pēsí\".",
 'yourtext'                => 'tohi ʻaʻau',
 'storedversion'           => 'Ko e paaki kuo tuku',
-'editingold'              => '<strong>FAKATOKANGA: ʻOku ke fatu ʻi he paaki fakaonoʻaho ʻo e pēsi. Kapau te ke haofaki ia, ʻe mole ʻa e ngaahi liliu kotoa talu mei ai.</strong>',
+'editingold'              => "'''FAKATOKANGA: ʻOku ke fatu ʻi he paaki fakaonoʻaho ʻo e pēsi. Kapau te ke haofaki ia, ʻe mole ʻa e ngaahi liliu kotoa talu mei ai.'''",
 'yourdiff'                => 'Meʻa kehekehe',
-'copyrightwarning'        => "Fakamolemole, manatuʻi ko e ngaahi foaki kotoa pē ki he {{SITENAME}} ʻoku nau moʻulaloa ki he \"\$2\". Kapau ʻoku ʻikai te ke loto ki ai, ʻikai te ke fiemaʻu ʻa e ngaahi liliu taʻeʻofa, ʻikai holi ki ha pulusi ʻi he feituʻu kotoa pe, ʻe sai ange ʻe ʻikai ke ke ʻetita heni.
+'copyrightwarning'        => "Fakamolemole, manatuʻi ko e ngaahi foaki kotoa pē ki he {{SITENAME}} ʻoku nau moʻulaloa ki he \"\$2\" (vakai ki he \$1 maʻa ngaahi kiʻi meʻa). Kapau ʻoku ʻikai te ke loto ki ai, ʻikai te ke fiemaʻu ʻa e ngaahi liliu taʻeʻofa, ʻikai holi ki ha pulusi ʻi he feituʻu kotoa pe, ʻe sai ange ʻe ʻikai ke ke ʻetita heni.
 
 ʻOku foki te ke pal�mesi naʻa ke tohi ia ʻe koe, pe hiki ia mei he tohi tauʻat�ina, '''ʻOku ʻikai ʻaupito te ke ʻoatu ha tohi ʻoku foʻi mafai ke pulusi maʻa e tokotaha.'''",
-'readonlywarning'         => '<strong>TOKANGA. ʻOku lokaʻi ʻa e t�nekingaʻilo maʻa e monomono, ko ia ai ʻe ikai te ke lava haʻofaki hoʻo fatu he taimí ni. Mahalo pē te ke fie haʻofaki, hiki pea piki, hoʻo fatu ʻi he faile, ki he kahaʻu.<strong>',
-'cascadeprotectedwarning' => "'''Tokanga:''' ʻOku lokaʻi ʻa e pēsí ni ki he fatu, (ʻoku lava pē ʻe he kau pule), koeʻuhi ʻoku kau ki he ngaahi peesi ʻasi ʻi lalo, ʻoku nau maluʻi mo e hohoko fakaivia.",
+'readonlywarning'         => "'''TOKANGA. ʻOku lokaʻi ʻa e t�nekingaʻilo maʻa e monomono, ko ia ai ʻe ikai te ke lava haʻofaki hoʻo fatu he taimí ni. Mahalo pē te ke fie haʻofaki, hiki pea piki, hoʻo fatu ʻi he faile, ki he kahaʻu.'''
+
+Ko e ʻuhinga loka ko e $1 ia.",
+'cascadeprotectedwarning' => "'''Tokanga:''' ʻOku lokaʻi ʻa e pēsí ni ki he fatu, (ʻoku lava pē ʻe he kau pule), koeʻuhi ʻoku kau ki he ngaahi peesi ʻasi ʻi lalo, ʻoku nau maluʻi mo e hohoko fakaivia ʻi he peesi ʻe $1:",
 'templatesused'           => 'Ngaahi sīpinga ʻoku ng�ueʻaki he kupú ni:',
 'templatesusedpreview'    => 'Ngaahi sīpinga ʻoku ng�ueʻaki he vakaí ni:',
 'templatesusedsection'    => 'Ngaahi sīpinga ʻoku ng�ueʻaki he kongá ni:',
@@ -389,7 +413,7 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'nohistory'           => 'ʻOku ʻikai ʻi ai ha hisit�lia fatu maʻa e kupú ni.',
 'currentrev'          => 'Paaki taka',
 'revisionasof'        => 'Paaki he ko $1',
-'revision-info'       => 'Paaki he ko $1 fai ʻe $2',
+'revision-info'       => 'Paaki he ko $1 fai ʻe $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Paaki motuʻa ange',
 'nextrevision'        => 'Paaki foʻou ange→',
 'currentrevisionlink' => 'Paaki taka',
@@ -412,21 +436,33 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'revdelete-hide-restricted' => 'ʻAi ʻa e ngaahi fakangatangatá ni maʻa e kau pule fakafounga mo e kau kotoa',
 'revdelete-log'             => 'Fakamatala maʻa e tohinoa:',
 
+# Merge log
+'revertmerge' => 'Vete ʻa e fakataha',
+
 # Diffs
 'difference'              => '(Kehekehe he ongo paaki)',
 'lineno'                  => 'Laini hono $1:',
 'compareselectedversions' => 'Fakatatau ongo paaki fili',
+'editundo'                => 'vete',
 'diff-multi'              => '(Naʻe ʻikai ʻasi mai ʻa e paaki lotoloto ʻe $1).',
 
 # Search results
-'noexactmatch'      => "'''ʻOku ʻikai ʻi ai ha kupu mo hono ʻuluʻitohi \"\$1\".''' ʻOku lava ke ke [[:\$1|fakatupu he kupú ni]].",
-'prevn'             => '$1 ki muʻa',
-'nextn'             => '$1 hoko',
-'viewprevnext'      => 'Vakai ki he ($1) ($2) ($3).',
-'showingresults'    => "ʻOku ʻasi ʻi lalo ʻa e ngaahi fua ʻoku kamata mo e #'''$2''' (aʻu ki he '''$1''').",
-'showingresultsnum' => "ʻOku ʻasi ʻi lalo ha fua ʻe '''$3''', ʻoku kamata mo e #'''$2'''.",
-'nonefound'         => "'''Tokanga''': ko e ngaahi kumi ʻikai ke siaʻa, ko e ʻuhinga tuʻo lahi ia ko e ng�ueʻaki he ʻū foʻi lea fuʻu noa pe he ʻū foʻi lea fuʻu lahi (ko e ngaahi peesi mo e ʻū foʻi lea kotoa ʻi loto, ʻe ʻasi mai pē).",
-'powersearch'       => 'Kumi',
+'searchresults'             => 'kumi hono ʻ�tunga',
+'searchresults-title'       => 'kumi "$1" hono ʻ�tunga',
+'noexactmatch'              => "'''ʻOku ʻikai ʻi ai ha kupu mo hono ʻuluʻitohi \"\$1\".''' ʻOku lava ke ke [[:\$1|fakatupu he kupú ni]].",
+'prevn'                     => '$1 ki muʻa',
+'nextn'                     => '$1 hoko',
+'viewprevnext'              => 'Vakai ki he ($1) ($2) ($3).',
+'search-suggest'            => 'Mahalo pē naʻa ke fiemaʻu: $1',
+'search-interwiki-more'     => '(lahi ange)',
+'search-mwsuggest-enabled'  => 'mo e fokotuʻu atu',
+'search-mwsuggest-disabled' => 'taʻe fokotuʻu atu',
+'showingresults'            => "ʻOku ʻasi ʻi lalo ʻa e ngaahi fua ʻoku kamata mo e #'''$2''' (aʻu ki he '''$1''').",
+'showingresultsnum'         => "ʻOku ʻasi ʻi lalo ha fua ʻe '''$3''', ʻoku kamata mo e #'''$2'''.",
+'nonefound'                 => "Ko e ngaahi kumi naʻe ʻikai ke siaʻa. Mahalo pē te ke fiefeinga kumi ʻi he ngaahi v� hingoa kotoa (kupu, alea, sīpinga, mo e h� fua). T�naki ''all:'' ʻi muʻa ʻo hoʻo fehuʻi.",
+'powersearch'               => 'Kumi',
+'powersearch-legend'        => 'Kumi lakasi',
+'powersearch-redir'         => 'Hokohoko ʻo e ngaahi leʻei',
 
 # Preferences page
 'preferences'           => 'Faʻiteliha',
@@ -434,6 +470,7 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'prefsnologin'          => 'ʻOku ʻikai kau ki ai',
 'changepassword'        => 'Liliu hoʻo leatapu',
 'skin'                  => 'Kili',
+'skin-preview'          => 'Vakai pē',
 'math'                  => 'Matematika',
 'dateformat'            => 'Ngaohi ʻo e ʻaho',
 'datedefault'           => 'ʻIkai ha faʻiteliha',
@@ -449,20 +486,17 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'prefs-misc'            => 'Kehekehe',
 'saveprefs'             => 'Haofaki',
 'resetprefs'            => 'Fakafoki',
-'oldpassword'           => 'Ko e leatapu motuʻa:',
-'newpassword'           => 'Ko e leatapu foʻou:',
-'retypenew'             => 'Toe ʻai leatapu foʻou:',
 'textboxsize'           => 'ʻOku fatu',
 'rows'                  => 'Ngaahi ʻotu:',
 'columns'               => 'Vahaʻa laini:',
 'searchresultshead'     => 'Kumi',
-'recentchangescount'    => 'Ngaahi ʻuluʻitohi ʻi he toki liliu:',
+'recentchangescount'    => 'Ngaahi ʻuluʻitohi ʻoku ʻasi ʻi he toki liliu, hisit�lia peesi, mo e hokohoko:',
 'savedprefs'            => 'Kuo haofaki hoʻo faʻiteliha.',
 'timezonelegend'        => 'Feituʻu taimi',
 'timezonetext'          => 'Ko e lahi ʻo e ngaahi houa ʻoku faikehekehe hoʻo taimi fakakolo mei he taimi m�mani.',
-'localtime'             => 'Taimi fakafeituʻu',
-'timezoneoffset'        => 'Ngaahi houa ʻo e faikehekehe',
-'servertime'            => 'Taimi ʻo e tauhia',
+'localtime'             => 'Taimi fakafeituʻu:',
+'timezoneoffset'        => 'Ngaahi houa ʻo e faikehekehe:',
+'servertime'            => 'Taimi ʻo e tauhia:',
 'allowemail'            => 'Fakamafeiaʻi ʻa e tohila mei he kau ʻetita ʻe taha',
 'defaultns'             => 'Kumi ʻi he v� hingoa fakatuʻunga:',
 'default'               => 'tuʻunga',
@@ -485,26 +519,28 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'rightsnone'    => '(hala)',
 
 # Recent changes
-'recentchanges'     => 'Ngaahi toki liliu',
-'recentchangestext' => 'Fakatotolo ʻa e ngaahi toki liliu ki he wiki ʻi he pēsí ni.',
-'rcnote'            => 'ʻOku ʻasi ʻi lalo ʻa e liliu fakamuimui ʻe <strong>$1</strong> lolotonga ʻa e ʻaho fakamuimui ʻe <strong>$2</strong> mei he taimi: $3',
-'rcnotefrom'        => "ʻOku ʻasi ʻi lalo ʻa e liliu talu mei '''$2''' (aʻu ki he '''$1''').",
-'rclistfrom'        => 'ʻAsi mai ha ngaahi liliu foʻou ʻo kamata mei he $1',
-'rcshowhideminor'   => '$1 fatu siʻi',
-'rcshowhidebots'    => '$1 fatu fakamīsini',
-'rcshowhideliu'     => '$1 kau ʻetita ʻoku kau-ki-ai',
-'rcshowhideanons'   => '$1 kau ʻetita taʻehingoa',
-'rcshowhidemine'    => '$1 fatu ʻaʻaku',
-'rclinks'           => 'ʻAsi mai ha liliu ʻe $1 lolotonga ha ʻaho ʻe $2 fakamuimui<br />$3',
-'diff'              => 'kehe',
-'hist'              => 'hisi',
-'hide'              => 'Toi',
-'show'              => 'ʻAsi mai',
-'minoreditletter'   => 's',
-'newpageletter'     => 'F',
-'boteditletter'     => 'm',
-'rc_categories'     => 'Fakangatangata ki he faʻahinga (vaheʻi he "|")',
-'rc_categories_any' => 'Faʻahinga noa pē',
+'recentchanges'      => 'Ngaahi toki liliu',
+'recentchangestext'  => 'Fakatotolo ʻa e ngaahi toki liliu ki he wiki ʻi he pēsí ni.',
+'rcnote'             => 'ʻOku ʻasi ʻi lalo ʻa e liliu fakamuimui ʻe <strong>$1</strong> lolotonga ʻa e ʻaho fakamuimui ʻe <strong>$2</strong> mei he taimi: $4, $5',
+'rcnotefrom'         => "ʻOku ʻasi ʻi lalo ʻa e liliu talu mei '''$2''' (aʻu ki he '''$1''').",
+'rclistfrom'         => 'ʻAsi mai ha ngaahi liliu foʻou ʻo kamata mei he $1',
+'rcshowhideminor'    => '$1 fatu siʻi',
+'rcshowhidebots'     => '$1 fatu fakamīsini',
+'rcshowhideliu'      => '$1 kau ʻetita ʻoku kau-ki-ai',
+'rcshowhideanons'    => '$1 kau ʻetita taʻehingoa',
+'rcshowhidemine'     => '$1 fatu ʻaʻaku',
+'rclinks'            => 'ʻAsi mai ha liliu ʻe $1 lolotonga ha ʻaho ʻe $2 fakamuimui<br />$3',
+'diff'               => 'kehe',
+'hist'               => 'hisi',
+'hide'               => 'Toi',
+'show'               => 'ʻAsi mai',
+'minoreditletter'    => 's',
+'newpageletter'      => 'F',
+'boteditletter'      => 'm',
+'rc_categories'      => 'Fakangatangata ki he faʻahinga (vaheʻi he "|")',
+'rc_categories_any'  => 'Faʻahinga noa pē',
+'rc-enhanced-expand' => "ʻAsi ngaahi ʻeu (fiemaʻu ʻa e ''Javascript'')",
+'rc-enhanced-hide'   => 'Toi ngaahi ʻeu',
 
 # Recent changes linked
 'recentchangeslinked' => 'Ngaahi liliu fekauʻaki',
@@ -531,9 +567,9 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'badfilename'                 => 'Naʻe liliu ko e hingoa ʻo e faile ki he "$1".',
 'largefileserver'             => 'ʻOku fuʻu lahi ange ʻa e failé ni ʻi he tauhia hono ʻinasi.',
 'emptyfile'                   => 'ʻOku ngalingali maha ʻa e faile naʻa ke hiki hake ai. Mahalo pē naʻa ke fakasipelahalaʻi ki he hingoa. K�taki vakai ke ke pau te ke fiehiki ʻa e failé ni.',
-'fileexists'                  => 'ʻOku toka ʻi ai ha peesi mo e hingoa ē; fakamolemole fakamoʻoniʻi ki he <strong><tt>$1</tt></strong> kapau ʻoku ʻikai te ke pau ʻo te ke fieliliu ia.',
-'fileexists-forbidden'        => 'ʻOku toka ʻi ai ha peesi mo e hingoa ē; fakamolemole ʻe foki pea hiki hake ʻa e failé ni mo e ha hingoa foʻou. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'ʻOku toka ʻi ai ha peesi mo e hingoa ē ʻi he kalasi vahevahe; fakamolemole ʻe foki pea hiki hake ʻa e failé ni mo e ha hingoa foʻou. [[Image:$1|thumb|center|$1]]',
+'fileexists'                  => "ʻOku toka ʻi ai ha peesi mo e hingoa ē; fakamolemole fakamoʻoniʻi ki he '''<tt>$1</tt>''' kapau ʻoku ʻikai te ke pau ʻo te ke fieliliu ia.",
+'fileexists-forbidden'        => 'ʻOku toka ʻi ai ha peesi mo e hingoa ē, pea ʻe ʻikai lava liliu; fakamolemole ʻe foki pea hiki hake ʻa e failé ni mo e ha hingoa foʻou. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'ʻOku toka ʻi ai ha peesi mo e hingoa ē ʻi he kalasi vahevahe; fakamolemole ʻe foki pea hiki hake ʻa e failé ni mo e ha hingoa foʻou. [[File:$1|thumb|center|$1]]',
 'successfulupload'            => 'Kuo ola ʻa e hiki hake',
 'uploadwarning'               => 'Tokanga hiki hake',
 'savefile'                    => 'Haofaki faitaá ni',
@@ -550,24 +586,26 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'license'   => 'Laiseni:',
 'nolicense' => 'ʻIkai fili ha taha',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Kumi ki he hingoa ʻo e fait�:',
+# Special:ListFiles
+'listfiles_search_for'  => 'Kumi ki he hingoa ʻo e fait�:',
 'imgfile'               => 'faile',
-'imagelist'             => 'Hokohoko fait�',
-'imagelist_date'        => 'ʻAho',
-'imagelist_name'        => 'Hingoa',
-'imagelist_user'        => 'ʻEtita',
-'imagelist_size'        => 'Hono lahi (ʻū valu)',
-'imagelist_description' => 'Fakamahino',
-
-# Image description page
+'listfiles'             => 'Hokohoko fait�',
+'listfiles_date'        => 'ʻAho',
+'listfiles_name'        => 'Hingoa',
+'listfiles_user'        => 'ʻEtita',
+'listfiles_size'        => 'Hono lahi (ʻū valu)',
+'listfiles_description' => 'Fakamahino',
+
+# File description page
+'filehist-datetime'         => 'ʻAho/Taimi',
+'filehist-user'             => 'Ko e ʻetita',
 'imagelinks'                => 'Ngaahi fehokotaki',
-'linkstoimage'              => 'ʻOku fehokotaki ʻa e ngaahi peesi ki he failé ni:',
+'linkstoimage'              => 'ʻOku fehokotaki ʻa e peesi ʻe $1 ki he failé ni:',
 'nolinkstoimage'            => 'ʻOku ʻikai ha ngaahi peesi fehokotaki ki he faitaá ni.',
 'shareduploadwiki'          => 'K�taki, vakai ki he $1 mo hano ongoongo lahi ange.',
 'shareduploadwiki-linktext' => 'Peesi ʻo e faile hono fakamahino',
-'noimage'                   => 'ʻOku ʻikai ʻi ai ha fait� mo e hingoa koʻeni, ʻe fakatupu koe $1.',
-'noimage-linktext'          => 'hiki hake',
+'noimage'                   => 'ʻOku ʻikai ʻi ai ha faile mo e hingoa koʻeni, ʻe fakatupu koe $1.',
+'noimage-linktext'          => 'hiki hake ʻe taha',
 'uploadnewversion-linktext' => 'Hiki hake ʻa e paaki foʻou ʻo e failé ni.',
 
 # File reversion
@@ -592,7 +630,7 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 
 # Unused templates
 'unusedtemplates'     => 'Sīpinga ʻoku ʻikai ng�ueʻaki',
-'unusedtemplatestext' => 'ʻOku ʻasi heni ʻa e kupu kotoa ʻi he v�-hingoa ʻo e sīpinga, ʻoku ʻikai ng�ueʻaki ʻi he peesi ʻe taha. Manatuʻi te ke sivi ʻoku ʻi ai ha ngaahi fehokotaki kehe ki hē ki muʻa ʻi honau t�mateʻi.',
+'unusedtemplatestext' => "ʻOku ʻasi heni ʻa e kupu kotoa ʻi he v�-hingoa ''{{ns:template}}'', ʻoku ʻikai ng�ueʻaki ʻi he peesi ʻe taha. Manatuʻi te ke sivi ʻoku ʻi ai ha ngaahi fehokotaki kehe ki hē ki muʻa ʻi honau t�mateʻi.",
 'unusedtemplateswlh'  => 'ngaahi fehokotaki kehe',
 
 # Random page
@@ -602,11 +640,9 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'randomredirect' => 'Leʻei noa pē',
 
 # Statistics
-'statistics'             => 'Sitesitesika',
-'sitestats'              => 'Sitesitesika ʻo e {{SITENAME}}',
-'userstats'              => 'Sitesitesika ʻo e ʻetita',
-'userstatstext'          => "ʻOku ʻi ai ha kau ʻetita lēsista ʻe '''$1'''. ʻOku ʻi ai ha $5 ʻe '''$2''' (ʻa ia ko e '''$4%''').",
-'statistics-mostpopular' => 'Ko e ngaahi peesi naʻe vakai ki ai lahi taha',
+'statistics'              => 'Sitesitesika',
+'statistics-header-users' => 'Sitesitesika ʻo e ʻetita',
+'statistics-mostpopular'  => 'Ko e ngaahi peesi naʻe vakai ki ai lahi taha',
 
 'disambiguations'      => 'Peesi fakaʻuhingakehe',
 'disambiguationspage'  => 'Template:Fakaʻuhingakehe',
@@ -639,13 +675,15 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'popularpages'            => 'Peesi manakoa',
 'wantedcategories'        => 'Faʻahinga fiemaʻu',
 'wantedpages'             => 'Kupu fiemaʻu',
+'wantedfiles'             => 'Faile fiemaʻu',
+'wantedtemplates'         => 'Sīpinga fiemaʻu',
 'mostlinked'              => 'Peesi mo e ngaahi fehokotaki ki ai lahi taha',
 'mostlinkedcategories'    => 'Faʻahinga mo e ngaahi fehokotaki ki ai lahi taha',
-'mostlinkedtemplates'     => 'SÄ«pings mo e ngaahi fehokotaki ki ai lahi taha',
+'mostlinkedtemplates'     => 'SÄ«pinga mo e ngaahi fehokotaki ki ai lahi taha',
 'mostcategories'          => 'Kupu mo e ngaahi faʻahinga lahi taha',
 'mostimages'              => 'Fait� mo e ngaahi fehokotaki ki ai lahi taha',
 'mostrevisions'           => 'Kupu mo e ngaahi paaki lahi taha',
-'prefixindex'             => 'Hokohoko fakapipikimuʻa',
+'prefixindex'             => 'Hokohoko fakapipikimuʻa kotoa',
 'shortpages'              => 'Peesi nonou',
 'longpages'               => 'Peesi l�loa',
 'deadendpages'            => 'Peesi ngata-mate',
@@ -659,6 +697,8 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'movethispage'            => 'ʻUnu e pēsí ni',
 'unusedimagestext'        => 'K�taki, manatuʻi ʻoku lava ʻe ʻi ai ha ngaahi feituʻu fakamatamatakupenga mo honau fehokotaki ki heni, ko ia ai mahalo pē ʻoku moʻui ʻaupito ia, neongo ʻene h� ʻi he hokohoko ko ʻeni.',
 'unusedcategoriestext'    => 'ʻOku ʻi ai ha ngaahi faʻahinga ʻoku ʻikai ng�ueʻaki ʻi ha kupu ʻe taha pe faʻahinga ʻe taha.',
+'pager-newer-n'           => 'kupu foʻou ange ʻe $1',
+'pager-older-n'           => 'kupu motuʻa ange ʻe $1',
 
 # Book sources
 'booksources'    => 'Ngaahi tupunga tohi',
@@ -669,8 +709,6 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'speciallogtitlelabel' => 'Hingoa:',
 'log'                  => 'Tohinoa',
 'all-logs-page'        => 'Tohinoa k�toa',
-'log-search-legend'    => 'Kumi ha ngaahi tohinoa',
-'log-search-submit'    => 'Fai �',
 'alllogstext'          => 'Fakaʻaliʻali fakak�toa ʻo e ngaahi tohinoa hiki hake, mo t�mateʻi, mo maluʻi, mo taʻofi, mo fakapule. ʻOku lava ke ke sivi ʻa e fakaʻaliʻalí ni ʻi he fili ʻo e falenga tohinoa pe hingoa ʻo e ʻetita pe peesi hūkitonu.',
 'logempty'             => 'ʻOku maha ʻa e tohinoa.',
 
@@ -693,10 +731,24 @@ Ko e konga ʻi olunga, ko e '''konga pē ʻe taha''' ʻe haofaki ʻi he lomiʻi
 'categories'         => 'Faʻahinga',
 'categoriespagetext' => 'ʻOku ʻi ai ha ngaahi faʻahinga pehē.',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Ngaahi foaki ʻo ha ʻetita kuo t�mateʻi',
+
+# Special:LinkSearch
+'linksearch'       => 'Ngaahi fehokotaki fakamatamatakupenga',
+'linksearch-line'  => 'Kuo fehokotaki ʻa e $1 mei he $2',
+'linksearch-error' => 'ʻOku ngofua pē ke ʻasi ha ngaahi lauʻifano ʻi he kamataʻanga ʻo e tauhia hono hingoa.',
+
 # Special:ListUsers
 'listusersfrom'    => 'ʻAsi mai kau ʻetita mei he:',
 'listusers-submit' => 'ʻAsi mai',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Tohinoa ʻo e fakatupu kau ʻetita',
+'newuserlogpagetext'       => 'Ko e tohinoa ʻeni ʻo e fakatupu kau ʻetita.',
+'newuserlog-create-entry'  => 'ʻEtita foʻou',
+'newuserlog-create2-entry' => 'Naʻe fakatupu ʻa e tohi-kau-ki-ai maʻa $1',
+
 # E-mail user
 'mailnologin'     => 'ʻOku ʻikai ha tuʻasila ke tohila ki ai',
 'emailuser'       => 'Tohila ki he ʻetitá ni',
@@ -741,12 +793,6 @@ Kapau ʻaho ʻe taha, te ke fietoʻo ʻa e pēsí mei hoʻo hokohoko leʻo, lomi
 'iteminvalidname'      => "Meʻa fihi mo e meʻa '$1', hingo taʻeʻaongaʻi...",
 'wlnote'               => 'ʻOku ʻasi ʻi lalo ʻa e liliu fakamuimui ʻe $1 ʻi he houa fakamuimui ʻe <b>$2</b>.',
 'wlshowlast'           => 'ʻAsi mai houa fakamuimui ʻe $1, ʻaho ʻe $2, $3',
-'watchlist-show-bots'  => 'ʻAsi mai fatu fakamīsini',
-'watchlist-hide-bots'  => 'Toi fatu fakamīsini',
-'watchlist-show-own'   => 'ʻAsi mai fatu ʻaʻaku',
-'watchlist-hide-own'   => 'Toi fatu ʻaʻaku',
-'watchlist-show-minor' => 'ʻAsi mai fatu siʻi',
-'watchlist-hide-minor' => 'Toi fatu siʻi',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'ʻOku leʻo...',
@@ -756,38 +802,43 @@ Kapau ʻaho ʻe taha, te ke fietoʻo ʻa e pēsí mei hoʻo hokohoko leʻo, lomi
 'changed'            => 'ʻosi liliu',
 'created'            => 'kuo fakatupu',
 
-# Delete/protect/revert
-'deletepage'          => 'T�mateʻi peesi',
-'confirm'             => 'Fakamoʻoniʻi',
-'excontent'           => "ko e kakano naʻe: '$1'",
-'excontentauthor'     => "ko e kakano naʻe: '$1', mei he ʻetita ʻe taha pē: '[[Special:Contributions/$2|$2]]'",
-'exbeforeblank'       => "ko e kakano ʻi muʻa ʻene fakaʻat� naʻe: '$1'",
-'exblank'             => 'Naʻe maha ʻa e peesi',
-'historywarning'      => 'Tokanga: ko e peesi te ke fiet�mateʻi, ʻoku ʻi ai haʻane histolia.',
-'confirmdeletetext'   => 'Te ke t�mateʻi, ʻikai ala fūlihi, ʻa e peesi pe fait� mo hono hisit�lia k�toa mei he t�nekingaʻilo. K�taki fakamoʻoniʻi ʻoku sai ia, ʻoku ke ʻilo ʻa e fua, pea ʻoku ke fai pehē ototaha ia mo e [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'      => 'ʻOsi ng�ue',
-'deletedtext'         => 'Kuo t�mateʻi "<nowiki>$1</nowiki>"
+# Delete
+'deletepage'        => 'T�mateʻi peesi',
+'confirm'           => 'Fakamoʻoniʻi',
+'excontent'         => "ko e kakano naʻe: '$1'",
+'excontentauthor'   => "ko e kakano naʻe: '$1', mei he ʻetita ʻe taha pē: '[[Special:Contributions/$2|$2]]'",
+'exbeforeblank'     => "ko e kakano ʻi muʻa ʻene fakaʻat� naʻe: '$1'",
+'exblank'           => 'Naʻe maha ʻa e peesi',
+'historywarning'    => 'Tokanga: ko e peesi te ke fiet�mateʻi, ʻoku ʻi ai haʻane histolia.',
+'confirmdeletetext' => 'Te ke t�mateʻi, ʻikai ala fūlihi, ʻa e peesi pe fait� mo hono hisit�lia k�toa mei he t�nekingaʻilo. K�taki fakamoʻoniʻi ʻoku sai ia, ʻoku ke ʻilo ʻa e fua, pea ʻoku ke fai pehē ototaha ia mo e [[{{MediaWiki:Policy-url}}]].',
+'actioncomplete'    => 'ʻOsi ng�ue',
+'deletedtext'       => 'Kuo t�mateʻi "<nowiki>$1</nowiki>"
 Vakai ki he $2 maʻa e fakamatala ʻo e ngaahi toki t�mateʻi.',
-'deletedarticle'      => 'ʻosi tamateʻi "[[$1]]"',
-'dellogpage'          => 'Tohinoa ʻo e t�mateʻi',
-'dellogpagetext'      => 'ʻOku ʻasi ʻi lalo ha hokohoko ʻo e ngaahi t�mateʻi fakamuimui taha.',
-'deletionlog'         => 'tohinoa ʻo e t�mateʻi',
-'reverted'            => 'Kuo foki ki he paaki mui',
-'deletecomment'       => 'Ko e ʻuhinga ʻo e t�mateʻi',
-'rollback'            => 'Ngaahi fatu he teka hifo',
-'rollback_short'      => 'Teka hifo',
-'rollbacklink'        => 'teka hifo',
-'rollbackfailed'      => 'Halaʻi teka hifo',
-'cantrollback'        => 'Naʻe ʻikai lava fakafoki ʻa e fatu; ko e ʻetita fakamuimui ko e ʻetita ʻe taha pē ʻo e pēsí ni.',
-'alreadyrolled'       => 'ʻOku ʻikai lava teka hifo ʻa e fatu fakamuimui ʻo e [[:$1]] ʻe [[User:$2|$2]] ([[User talk:$2|Alea]]); ko e tokotaha ʻe taha naʻe fatu pe fatu teka hifo ʻa e peesi.
+'deletedarticle'    => 'ʻosi tamateʻi "[[$1]]"',
+'dellogpage'        => 'Tohinoa ʻo e t�mateʻi',
+'dellogpagetext'    => 'ʻOku ʻasi ʻi lalo ha hokohoko ʻo e ngaahi t�mateʻi fakamuimui taha.',
+'deletionlog'       => 'tohinoa ʻo e t�mateʻi',
+'reverted'          => 'Kuo foki ki he paaki mui',
+'deletecomment'     => 'Ko e ʻuhinga ʻo e t�mateʻi',
+
+# Rollback
+'rollback'       => 'Ngaahi fatu he teka hifo',
+'rollback_short' => 'Teka hifo',
+'rollbacklink'   => 'teka hifo',
+'rollbackfailed' => 'Halaʻi teka hifo',
+'cantrollback'   => 'Naʻe ʻikai lava fakafoki ʻa e fatu; ko e ʻetita fakamuimui ko e ʻetita ʻe taha pē ʻo e pēsí ni.',
+'alreadyrolled'  => 'ʻOku ʻikai lava teka hifo ʻa e fatu fakamuimui ʻo e [[:$1]] ʻe [[User:$2|$2]] ([[User talk:$2|Alea]]); ko e tokotaha ʻe taha naʻe fatu pe fatu teka hifo ʻa e peesi.
 
 Ko e fatu fakamuimui naʻe fatu ʻe [[User:$3|$3]] ([[User talk:$3|Alea]]).',
-'editcomment'         => 'Ko e fakamatala fatu naʻe "<i>$1</i>" ia.', # only shown if there is an edit comment
+'editcomment'    => "Ko e fakamatala fatu naʻe \"''\$1''\" ia.", # only shown if there is an edit comment
+
+# Protect
 'protectlogpage'      => 'Tohinoa ʻo e maluʻi',
 'protectlogtext'      => 'ʻOku ʻasi ʻi lalo ha hokohoko ʻo e ngaahi loka mo e taʻeloka fakapeesi.',
 'protectedarticle'    => 'maluʻi: "[[$1]]"',
 'unprotectedarticle'  => 'taʻemaluʻi "[[$1]]"',
 'protect-title'       => 'ʻOku maluʻi "$1"',
+'prot_1movedto2'      => 'Kuo ʻunu ʻa e [[$1]] ki he [[$2]]',
 'protect-legend'      => 'Fakamoʻoniʻi e maluʻi',
 'protectcomment'      => 'ʻUhingha maʻa e maluʻi',
 'protect-level-sysop' => 'Kau pule fakafounga pē',
@@ -802,6 +853,7 @@ Ko e fatu fakamuimui naʻe fatu ʻe [[User:$3|$3]] ([[User talk:$3|Alea]]).',
 'viewdeletedpage'    => 'Vakai ki he ngaahi peesi kuo t�mateʻi',
 'undeleterevisions'  => 'Ngaahi paaki ʻe $1 kuo ʻave ki he tauhiʻanga',
 'undeletebtn'        => 'Fakafoki',
+'undeletelink'       => 'fakafoki',
 'undeletereset'      => 'Fakafoki',
 'undeletecomment'    => 'Fakamatala:',
 'undeletedarticle'   => 'kuo fakafoki "[[$1]]"',
@@ -824,7 +876,6 @@ Vakai ki he [[Special:Log/delete|hokohoko t�mateʻi]] ki he lekooti ʻo e ngaah
 
 # What links here
 'whatlinkshere'       => 'Ngaahi fehokotaki ki heni',
-'linklistsub'         => '(Hokohoko ʻo e ngaahi fehokotaki)',
 'linkshere'           => 'ʻOku fehokotaki ki heni ʻa e ngaahi peesi:',
 'nolinkshere'         => 'ʻOku ʻikai ha ngaahi kupu fehokotaki ki heni.',
 'isredirect'          => 'Peesi leʻei',
@@ -903,6 +954,8 @@ Vakai ki he [[Special:Log/delete|hokohoko t�mateʻi]] ki he lekooti ʻo e ngaah
 *te ke tiki ʻa e puha ʻi lalo.
 ʻI he meʻa ko ia, ʻe ʻunuʻi pe fakatahaʻi ʻa e peesi alea faiʻaki ʻa e nima.",
 'movearticle'             => 'ʻUnu ʻa e kupu',
+'movenologin'             => 'ʻOku ʻikai ke kau-ki-ai',
+'movenologintext'         => 'Kuo pau ko e ʻetita lēsisita koe pea [[Special:UserLogin|kau-ki-ai]] kapau te ke fieʻunu ha peesi.',
 'newtitle'                => 'Ki he hingoa foʻou',
 'move-watch'              => 'Leʻo he pēsí ni',
 'movepagebtn'             => 'Peesi ʻunu',
@@ -948,6 +1001,7 @@ Vakai ki he [[Special:Log/delete|hokohoko t�mateʻi]] ki he lekooti ʻo e ngaah
 'import-interwiki-history'   => 'Hiki ko e paaki hisit�lia kotoa maʻa e pēsí ni',
 'import-interwiki-submit'    => 'HÅ« mai',
 'import-interwiki-namespace' => 'ʻAve ngaahi peesi ki he v� hingoa:',
+'import-comment'             => 'Fakamatala:',
 'importtext'                 => "K�taki ʻe hū atu ʻa e faile mei he ''wiki'' tupunga ng�ueʻaki ''Special:Export'', pea haofakiʻi ʻi hoʻo tisi, pea hū mai ia mei hē.",
 'importstart'                => 'HÅ« mai ngaahi peesi...',
 'import-revision-count'      => 'Paaki ʻe $1',
@@ -964,6 +1018,18 @@ Vakai ki he [[Special:Log/delete|hokohoko t�mateʻi]] ki he lekooti ʻo e ngaah
 'importlogpagetext'             => "Ko e ngaahi hūmai fakapule mo e honau hisit�lia fatu mei he ngaahi ''wiki'' kehe.",
 'import-logentry-upload-detail' => 'paaki ʻe $1',
 
+# Tooltip help for the actions
+'tooltip-pt-mytalk'        => 'Ko e peesi alea ʻaʻau',
+'tooltip-pt-logout'        => 'ʻAlu mamaʻo',
+'tooltip-search'           => "Kumi ''{{SITENAME}}''",
+'tooltip-t-whatlinkshere'  => 'Ko e hokohoko ʻo e ngaahi kupu ʻoku nau fehokotaki ki heni',
+'tooltip-feed-rss'         => "Lave ''RSS'' maʻa e pēsí ni",
+'tooltip-feed-atom'        => "Lave ''Atom'' maʻa e pēsí ni",
+'tooltip-t-upload'         => 'Hiki hake ʻa e ngaahi faile',
+'tooltip-ca-nstab-special' => 'Ko e peesi makehe ia, ʻoku ʻikai lava te ke fatu ia ʻe koe',
+'tooltip-undo'             => '"Vete" ʻoku toe foki ʻa e fatu ni pea fakaava ʻa e foomu fatu ʻi he anga siomuʻa.
+Pea hoko ai pē hoʻo lava t�naki ha ʻuhinga ʻi he fakanounou',
+
 # Metadata
 'notacceptable' => "ʻOku ʻikai lava fakaai ʻe he tauhia 'wiki' ʻa e meʻaʻilo ʻi he meʻangaohi ʻoku lava lau ʻe koe.",
 
@@ -1005,7 +1071,7 @@ Vakai ki he [[Special:Log/delete|hokohoko t�mateʻi]] ki he lekooti ʻo e ngaah
 'show-big-image'       => 'ʻAsi ʻa e fait� auiiki',
 'show-big-image-thumb' => '<small>Vakai pē ʻi hono lahi: $1 x $2 tefitoʻifait�</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Fakaʻaliʻali ʻo e ngaahi fait� foʻou',
 'imagelisttext'         => "ʻOku ʻasi ʻi lalo ha hokohoko ʻo e '''$1''' vahevahe he $2.",
 'showhidebots'          => '($1 fatu fakamīsini)',
@@ -1169,20 +1235,9 @@ Kapau Ê»oku Ê»ikai ko koe, Ê»oua Ê»e fakaava ia. Ê»E mate Ê»a e lea fakapulipulÃ
 K�taki fakapapauʻi te ke fie toe fatu ʻa e kupu ni.",
 'recreate'            => 'Toe fakatupu',
 
-# HTML dump
-'redirectingto' => 'ʻOku leʻei ki [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Fakaʻat� ko e fafaʻo ʻo e pēsí ni?
-
-$1',
 'confirm_purge_button' => 'Fai �',
-
-# AJAX search
-'searchcontaining' => "Kumi ha ngaahi kupu ʻoku faʻo ai ʻa e ''$1''.",
-'searchnamed'      => "Kumi ha ngaahi kupu ʻoku nau hingoa ''$11''.",
-'articletitles'    => "Ngaahi kupu ʻoku kamata mo e ''$1''",
-'hideresults'      => 'Toi fua',
+'confirm-purge-top'    => 'Fakaʻat� ko e fafaʻo ʻo e pēsí ni?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� Peesi ki muʻa',
diff --git a/languages/messages/MessagesTokipona.php b/languages/messages/MessagesTokipona.php
index 4eace801..2a35f389 100644
--- a/languages/messages/MessagesTokipona.php
+++ b/languages/messages/MessagesTokipona.php
@@ -89,7 +89,7 @@ $messages = array(
 'userlogout' => 'mi o tawa',
 
 # Edit pages
-'summary'          => 'ante li seme',
+'summary'          => 'ante li seme:',
 'minoredit'        => 'ante ni li lili taso',
 'watchthis'        => 'mi wile sona e ante ale pi lipu ni lon tenpo kama',
 'savearticle'      => 'o awen',
@@ -97,9 +97,9 @@ $messages = array(
 'showpreview'      => 'mi wile lukin taso e ante',
 'editing'          => 'mi ante e: $1',
 'editingcomment'   => 'mi ante e lipu $1 (wan sin)',
-'copyrightwarning' => 'o sona e ni: ken $2 (o lukin e $1) li lawa tawa ante ali lon {{SITENAME}} li. jan li ken ante e toki sina li ken pana e ona tawa jan ante. sina wile ala e ni la, o sitelen ala lon lipu ni.<br />
+'copyrightwarning' => "o sona e ni: ken $2 (o lukin e $1) li lawa tawa ante ali lon {{SITENAME}} li. jan li ken ante e toki sina li ken pana e ona tawa jan ante. sina wile ala e ni la, o sitelen ala lon lipu ni.<br />
 kin la sina toki e ni: toki sina ni li tan sina taso anu lipu pi ken ali.
-<strong>SINA KEN ALA LA, O PANA ALA E TOKI PI KEN LILI TAWA LIPU NI!</strong>',
+'''SINA KEN ALA LA, O PANA ALA E TOKI PI KEN LILI TAWA LIPU NI!'''",
 'templatesused'    => 'lipu ni li kepeken e lipu mama ni:',
 
 # History pages
diff --git a/languages/messages/MessagesTpi.php b/languages/messages/MessagesTpi.php
index c551f1fc..578b3744 100644
--- a/languages/messages/MessagesTpi.php
+++ b/languages/messages/MessagesTpi.php
@@ -9,6 +9,22 @@
  * @author לערי ריינה�רט
  */
 
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'Yusa login' ),
+	'Userlogout'                => array( 'Yusa logaut' ),
+	'CreateAccount'             => array( 'Mekim nupela login' ),
+	'Preferences'               => array( 'Ol laik bilong mi' ),
+	'Watchlist'                 => array( 'Lukautbuk' ),
+	'Recentchanges'             => array( 'Nupela senis' ),
+	'Upload'                    => array( 'Salim media fail' ),
+	'Randompage'                => array( 'Soim wanpela pes' ),
+	'Specialpages'              => array( 'Sipesol pes' ),
+	'Contributions'             => array( 'Ol senis bilong yusa' ),
+	'Emailuser'                 => array( 'Imel yusa' ),
+	'Confirmemail'              => array( 'Orait long imel' ),
+	'Whatlinkshere'             => array( 'Ol link ikam long hia' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Putim lain ananit long ol link:',
@@ -39,8 +55,6 @@ $messages = array(
 'tog-watchlisthidebots'       => 'Haitim ol senis ol bot i wokim long lukautbuk bilong mi',
 'tog-watchlisthideminor'      => 'Haitim ol liklik senis long lukautbuk bilong mi',
 
-'skinpreview' => '(pes mi senisim, pastaim long raitim)',
-
 # Dates
 'sunday'    => 'Sande',
 'monday'    => 'Mande',
@@ -109,8 +123,8 @@ $messages = array(
 'userlogout' => 'Logaut',
 
 # Edit pages
-'summary'           => 'Liklik toksave bilong senis',
-'subject'           => 'Nem bilong pes (o hap bilong pes)',
+'summary'           => 'Liklik toksave bilong senis:',
+'subject'           => 'Nem bilong pes (o hap bilong pes):',
 'minoredit'         => 'Dispela emi liklik senis',
 'watchthis'         => 'Putim dispela pes long lukautbuk bilong mi',
 'savearticle'       => 'Raitim pes',
@@ -118,19 +132,20 @@ $messages = array(
 'showpreview'       => 'Soim pes wantaim senis (pastaim long raitim)',
 'showlivepreview'   => 'Soim senis kwiktaim taim mi wokim (pastaim long raitim)',
 'showdiff'          => 'Soim ol senis',
-'summary-preview'   => 'Toksave bilong senis bai luk olsem',
-'subject-preview'   => 'Nem bilong pes (o hap bilong pes) bai olsem',
-'copyrightwarning'  => 'Toksave: olgeta senis yu wokim long long {{SITENAME}} bai stap ananit long tokorait $2 (lukim $1 long painimaut moa long dispela). Sapos yu no laikim narapela manmeri long senisim olgeta, o salim dispela i go long ol kainkain hap, noken raitim long hia.<br />
+'summary-preview'   => 'Toksave bilong senis bai luk olsem:',
+'subject-preview'   => 'Nem bilong pes (o hap bilong pes) bai olsem:',
+'copyrightwarning'  => "Toksave: olgeta senis yu wokim long long {{SITENAME}} bai stap ananit long tokorait $2 (lukim $1 long painimaut moa long dispela). Sapos yu no laikim narapela manmeri long senisim olgeta, o salim dispela i go long ol kainkain hap, noken raitim long hia.<br />
 Na tu yu tok tru nau olsem yu raitim dispela yu yet, o yu kisim long wanpela hap we lo i tok olsem i orait long kisim (Tok Inglis: <i>public domain</i>).
-<strong>YU NOKEN RAITIM WANPELA SAMTING SAPOS YU NO WOKIM YU YET, O YU KISIM TOKORAIT LONG PUTIM LONG HIA!</strong>',
-'copyrightwarning2' => 'Toksave: olgeta senis yu wokim long long {{SITENAME}} bai inap senis o raus long han bilong ol narapela manmeri. Sapos yu no laikim narapela manmeri long senisim olgeta samting yu raitim, o salim dispela i go long ol kainkain hap, noken raitim long hia.<br />
+'''YU NOKEN RAITIM WANPELA SAMTING SAPOS YU NO WOKIM YU YET, O YU KISIM TOKORAIT LONG PUTIM LONG HIA!'''",
+'copyrightwarning2' => "Toksave: olgeta senis yu wokim long long {{SITENAME}} bai inap senis o raus long han bilong ol narapela manmeri. Sapos yu no laikim narapela manmeri long senisim olgeta samting yu raitim, o salim dispela i go long ol kainkain hap, noken raitim long hia.<br />
 Na tu yu tok tru nau olsem yu raitim dispela yu yet, o yu kisim long wanpela hap we lo i tok olsem i orait long kisim (Tok Inglis: <i>public domain</i>). Lukim $1 long painimaut moa long dispela.<br />
-<strong>YU NOKEN RAITIM WANPELA SAMTING IGAT COPYRIGHT LONG EN (NARAPELA MANMERI I RAITIM)!</strong>',
+'''YU NOKEN RAITIM WANPELA SAMTING IGAT COPYRIGHT LONG EN (NARAPELA MANMERI I RAITIM)!'''",
 'templatesused'     => 'Dispela pes i yusim ol templet:',
 
 # Preferences page
 'mypreferences'   => 'Ol laik bilong mi',
 'prefs-edits'     => 'Hamas senis:',
+'skin-preview'    => 'pes mi senisim, pastaim long raitim',
 'prefs-rc'        => 'Nupela senis',
 'prefs-watchlist' => 'Lukautbuk',
 
@@ -200,6 +215,9 @@ Sapos yu laik rausim dispela pes long lukautbuk bilong yu bihain, paitim \"Pinis
 
 'enotif_reset' => 'Makim olgeta pes olsem mi lukim pinis',
 
+# Protect
+'prot_1movedto2' => '[[$1]] i surik i go long [[$2]] pinis',
+
 # Contributions
 'contributions' => 'Ol senis yusa i wokim',
 'mycontris'     => 'Ol senis mi wokim',
diff --git a/languages/messages/MessagesTr.php b/languages/messages/MessagesTr.php
index 11c33aea..d746466a 100644
--- a/languages/messages/MessagesTr.php
+++ b/languages/messages/MessagesTr.php
@@ -7,6 +7,8 @@
  * @author Bekiroflaz
  * @author Dbl2010
  * @author Erkan Yilmaz
+ * @author Fryed-peach
+ * @author Joseph
  * @author Karduelis
  * @author Katpatuka
  * @author Mach
@@ -21,16 +23,14 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Media',
+	NS_MEDIA            => 'Medya',
 	NS_SPECIAL          => 'Özel',
-	NS_MAIN             => '',
 	NS_TALK             => 'Tartışma',
 	NS_USER             => 'Kullanıcı',
 	NS_USER_TALK        => 'Kullanıcı_mesaj',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_tartışma',
-	NS_IMAGE            => 'Resim',
-	NS_IMAGE_TALK       => 'Resim_tartışma',
+	NS_FILE             => 'Resim',
+	NS_FILE_TALK        => 'Resim_tartışma',
 	NS_MEDIAWIKI        => 'MedyaViki',
 	NS_MEDIAWIKI_TALK   => 'MedyaViki_tartışma',
 	NS_TEMPLATE         => 'Åžablon',
@@ -41,6 +41,85 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Kategori_tartışma',
 );
 
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'ÇiftYönlendirmeler' ),
+	'BrokenRedirects'           => array( 'BozukYönlendirmeler' ),
+	'Disambiguations'           => array( 'AnlamAyrım' ),
+	'Userlogin'                 => array( 'KullanıcıGiriş' ),
+	'Userlogout'                => array( 'KullanıcıÇıkış' ),
+	'CreateAccount'             => array( 'HesapOluÅŸtur' ),
+	'Preferences'               => array( 'Tercihler' ),
+	'Watchlist'                 => array( 'Ä°zlemeListesi' ),
+	'Recentchanges'             => array( 'SonDeÄŸiÅŸiklikler' ),
+	'Upload'                    => array( 'Yükle' ),
+	'Listfiles'                 => array( 'ResimListesi' ),
+	'Newimages'                 => array( 'YeniResimler' ),
+	'Listusers'                 => array( 'KullanıcıListesi' ),
+	'Listgrouprights'           => array( 'GrupHaklarıListesi' ),
+	'Statistics'                => array( 'Ä°statistikler' ),
+	'Randompage'                => array( 'Rasgele', 'RasgeleSayfa' ),
+	'Lonelypages'               => array( 'YalnızSayfalar' ),
+	'Uncategorizedpages'        => array( 'KategorisizSayfalar' ),
+	'Uncategorizedcategories'   => array( 'KategorisizKategoriler' ),
+	'Uncategorizedimages'       => array( 'KategorisizResimler' ),
+	'Uncategorizedtemplates'    => array( 'KategorisizÅžablonlar' ),
+	'Unusedcategories'          => array( 'KullanılmayanKategoriler' ),
+	'Unusedimages'              => array( 'KullanılmayanResimler' ),
+	'Wantedpages'               => array( 'İstenenSayfalar', 'KırıkLinler' ),
+	'Wantedcategories'          => array( 'Ä°stenenKategoriler' ),
+	'Mostcategories'            => array( 'EnKategorili' ),
+	'Mostimages'                => array( 'EnResimli' ),
+	'Shortpages'                => array( 'KısaSayfalar' ),
+	'Longpages'                 => array( 'UzunSayfalar' ),
+	'Newpages'                  => array( 'YeniSayfalar' ),
+	'Ancientpages'              => array( 'EskiSayfalar' ),
+	'Deadendpages'              => array( 'BağlantısızSayfalar' ),
+	'Protectedpages'            => array( 'KorunanSayfalar' ),
+	'Protectedtitles'           => array( 'KorunanBaşlıklar' ),
+	'Allpages'                  => array( 'TümSayfalar' ),
+	'Prefixindex'               => array( 'ÖnekDizini' ),
+	'Ipblocklist'               => array( 'IPEngelListesi' ),
+	'Specialpages'              => array( 'ÖzelSayfalar' ),
+	'Contributions'             => array( 'Katkılar' ),
+	'Emailuser'                 => array( 'E-postalAt' ),
+	'Confirmemail'              => array( 'E-postaDoÄŸrula' ),
+	'Whatlinkshere'             => array( 'VerilenBağlantılar' ),
+	'Recentchangeslinked'       => array( 'Ä°lgiliDeÄŸiÅŸiklikler' ),
+	'Movepage'                  => array( 'SayfaTaşı' ),
+	'Blockme'                   => array( 'BeniEngelle' ),
+	'Booksources'               => array( 'KitapKaynakları' ),
+	'Categories'                => array( 'Kategoriler' ),
+	'Export'                    => array( 'DışaAktar' ),
+	'Version'                   => array( 'Sürüm' ),
+	'Allmessages'               => array( 'TümArayüzMetinleri' ),
+	'Log'                       => array( 'Kayıt', 'Kayıtlar' ),
+	'Blockip'                   => array( 'IPEngelle' ),
+	'Undelete'                  => array( 'Gerigetir' ),
+	'Import'                    => array( 'İçeAktar' ),
+	'Lockdb'                    => array( 'DBKilitle' ),
+	'Unlockdb'                  => array( 'DBKilitAç' ),
+	'Userrights'                => array( 'KullanıcıHakları' ),
+	'MIMEsearch'                => array( 'MIMEArama' ),
+	'FileDuplicateSearch'       => array( 'KopyaDosyaAraması' ),
+	'Unwatchedpages'            => array( 'Ä°zlenmeyenSayfalar' ),
+	'Listredirects'             => array( 'YönlendirmeListesi' ),
+	'Revisiondelete'            => array( 'RevizyonSil' ),
+	'Unusedtemplates'           => array( 'KullanılmayanŞablonlar' ),
+	'Randomredirect'            => array( 'RasgeleYönlendirme' ),
+	'Mypage'                    => array( 'BenimSayfam' ),
+	'Mytalk'                    => array( 'MesajSayfam' ),
+	'Mycontributions'           => array( 'Katkılarım' ),
+	'Listadmins'                => array( 'YöneticiListesi' ),
+	'Listbots'                  => array( 'BotListesi' ),
+	'Popularpages'              => array( 'PopülerSayfalar' ),
+	'Search'                    => array( 'Ara' ),
+	'Resetpass'                 => array( 'ŞifreSıfırla', 'ParolaSıfırla' ),
+	'Withoutinterwiki'          => array( 'Ä°ntervikisiz' ),
+	'MergeHistory'              => array( 'RevizyonBirleÅŸtir' ),
+	'Filepath'                  => array( 'DosyaKonumu' ),
+	'Invalidateemail'           => array( 'EmailDoÄŸrulamaÄ°ptal' ),
+);
+
 $separatorTransformTable = array(',' => '.', '.' => ',' );
 $linkTrail = '/^([a-zÇĞçğİıÖöŞşÜüÂâÎîÛû]+)(.*)$/sDu';
 
@@ -82,16 +161,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ä°zleme listemden benim deÄŸiÅŸikliklerimi gizle',
 'tog-watchlisthidebots'       => 'Ä°zleme listemden bot deÄŸiÅŸikliklerini gizle',
 'tog-watchlisthideminor'      => 'İzleme listemden küçük değişiklikleri gizle',
+'tog-watchlisthideliu'        => 'İzleme listemde, kayıtlı kullanıcılar tarafından yapılan değişiklikleri gösterme',
+'tog-watchlisthideanons'      => 'İzleme listemde, anonim kullanıcılar tarafından yapılan değişiklikleri gösterme',
+'tog-nolangconversion'        => 'Varyant dönüştürmesini devre dışı bırak',
 'tog-ccmeonemails'            => 'Diğer kullanıcılara gönderdiğim e-postaların kopyalarını bana da gönder',
 'tog-diffonly'                => 'Sayfa içeriğini sürüm farklarının aşağısında gösterme',
 'tog-showhiddencats'          => 'Gizli kategorileri göster',
+'tog-norollbackdiff'          => 'Rollback uygulandıktan sonra değişikliği sil',
 
 'underline-always'  => 'Daima',
 'underline-never'   => 'Asla',
 'underline-default' => 'Tarayıcı karar versin',
 
-'skinpreview' => '(Önizleme)',
-
 # Dates
 'sunday'        => 'Pazar',
 'monday'        => 'Pazartesi',
@@ -184,7 +265,7 @@ $messages = array(
 'mytalk'         => 'Mesaj sayfam',
 'anontalk'       => "Bu IP'nin mesajları",
 'navigation'     => 'Sitede yol bulma',
-'and'            => 've',
+'and'            => '&#32;ve',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -219,16 +300,16 @@ $messages = array(
 'newpage'           => 'Yeni sayfa',
 'talkpage'          => 'Sayfayı tartış',
 'talkpagelinktext'  => 'Mesaj',
-'specialpage'       => 'Özel Sayfa',
+'specialpage'       => 'Özel sayfa',
 'personaltools'     => 'KiÅŸisel aletler',
-'postcomment'       => 'Yorum ekle',
+'postcomment'       => 'Yeni bölüm',
 'articlepage'       => 'Maddeye git',
 'talk'              => '{{#ifeq:{{TALKSPACE}}|Kullanıcı mesaj|mesaj|tartışma}}',
 'views'             => 'Görünümler',
 'toolbox'           => 'Araçlar',
 'userpage'          => 'Kullanıcı sayfasını görüntüle',
 'projectpage'       => 'Proje sayfasına bak',
-'imagepage'         => 'Medya sayfasını görüntüle',
+'imagepage'         => 'Dosya sayfasını görüntüle',
 'mediawikipage'     => 'Mesaj sayfasını göster',
 'templatepage'      => 'Şablon sayfasını görüntüle',
 'viewhelppage'      => 'Yardım sayfasına bak',
@@ -247,13 +328,11 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} hakkında',
 'aboutpage'            => 'Project:Hakkında',
-'bugreports'           => 'Hata Raporları',
-'bugreportspage'       => 'Project:Hata raporları',
 'copyright'            => 'İçerik $1 altındadır.',
 'copyrightpagename'    => '{{SITENAME}} telif hakları',
 'copyrightpage'        => '{{ns:project}}:Telif hakları',
-'currentevents'        => 'Güncel olaylar',
-'currentevents-url'    => 'Project:Güncel olaylar',
+'currentevents'        => 'Köy çeşmesi',
+'currentevents-url'    => 'Project:Köy çeşmesi',
 'disclaimers'          => 'Sorumluluk reddi',
 'disclaimerpage'       => 'Project:Genel_sorumluluk_reddi',
 'edithelp'             => 'Nasıl değiştirilir?',
@@ -271,9 +350,7 @@ $messages = array(
 
 'badaccess'        => 'İzin hatası',
 'badaccess-group0' => 'Bu iÅŸlemi yapma yetkiniz yok.',
-'badaccess-group1' => 'Yapmak istediğiniz işlem ancak $1 grubundaki kullanıcılar tarafından yapılabilir.',
-'badaccess-group2' => 'Yapmak istediğiniz işlem, sadece $1 grubundaki kullanıcılardan biri tarafından yapılabilir.',
-'badaccess-groups' => 'Yapmak istediğiniz işlem, sadece $1 grubundaki kullanıcılardan biri tarafından yapılabilir.',
+'badaccess-groups' => 'Yapmak istediğiniz işlem, sadece {{PLURAL:$2|grubundaki|grubundaki}}: $1  kullanıcılardan biri tarafından yapılabilir.',
 
 'versionrequired'     => "MediaWiki'nin $1 sürümü gerekiyor",
 'versionrequiredtext' => "Bu sayfayı kullanmak için MediaWiki'nin $1 versiyonu gerekmektedir. [[Special:Version|Versiyon sayfasına]] bakınız.",
@@ -287,13 +364,15 @@ $messages = array(
 'editsection'             => 'deÄŸiÅŸtir',
 'editold'                 => 'deÄŸiÅŸtir',
 'viewsourceold'           => 'kaynağı gör',
+'editlink'                => 'deÄŸiÅŸtir',
+'viewsourcelink'          => 'kaynağı gör',
 'editsectionhint'         => '$1 bölümünü değiştir',
 'toc'                     => 'Konu başlıkları',
 'showtoc'                 => 'göster',
 'hidetoc'                 => 'gizle',
 'thisisdeleted'           => '$1 görmek veya geri getirmek istermisiniz?',
 'viewdeleted'             => '$1 gör?',
-'restorelink'             => '$1 silinmiÅŸ deÄŸiÅŸikliÄŸi',
+'restorelink'             => '{{PLURAL:$1|bir silinmiÅŸ deÄŸiÅŸikliÄŸi|$1 silinmiÅŸ deÄŸiÅŸikliÄŸi}}',
 'feedlinks'               => 'Besleme:',
 'feed-invalid'            => 'Hatalı besleme tipi.',
 'feed-unavailable'        => 'Sendikalaşma özet akışları geçerli değil.',
@@ -301,13 +380,13 @@ $messages = array(
 'site-atom-feed'          => '$1 Atom Beslemesi',
 'page-rss-feed'           => '"$1" RSS Beslemesi',
 'page-atom-feed'          => '"$1" Atom Beslemesi',
-'red-link-title'          => '$1 (henüz yazılmamış)',
+'red-link-title'          => '$1 (sayfa mevcut deÄŸil)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Sayfa',
 'nstab-user'      => 'kullanıcı sayfası',
 'nstab-media'     => 'Medya',
-'nstab-special'   => 'Özel',
+'nstab-special'   => 'Özel sayfa',
 'nstab-project'   => 'Proje sayfası',
 'nstab-image'     => 'Dosya',
 'nstab-mediawiki' => 'arayüz metni',
@@ -317,9 +396,11 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Böyle bir eylem yok',
-'nosuchactiontext'  => 'URL tarafından tanımlanan eylem Viki tarafından algılanamadı.',
+'nosuchactiontext'  => "URL tarafından tanımlanan eylem geçersiz.
+URL'yi yanlış yazmış olabilir, ya da doğru olmayan bir bağlantıyı takip etmiş olabilirsiniz.
+Bu, {{SITENAME}} sitesindeki bir hatayı da belirtebilir.",
 'nosuchspecialpage' => 'Bu isimde bir özel sayfa yok',
-'nospecialpagetext' => 'Bulunmayan bir özel sayfaya girdiniz. Varolan tüm özel sayfaları [[Special:SpecialPages]] sayfasında görebilirsiniz.',
+'nospecialpagetext' => 'Bulunmayan bir özel sayfaya girdiniz. Varolan tüm özel sayfaları [[Special:SpecialPages|özel sayfalar]] sayfasında görebilirsiniz.',
 
 # General errors
 'error'                => 'Hata',
@@ -368,7 +449,6 @@ Lütfen bunu bir [[Özel:Listusers/sysop|yöneticiye]], URL\'yi not ederek ileti
 'cannotdelete'         => 'Belirtilen sayfa ya da görüntü silinemedi. (başka bir kullanıcı tarafından silinmiş olabilir).',
 'badtitle'             => 'Geçersiz başlık',
 'badtitletext'         => 'Girilen sayfa ismi ya hatalı ya boş ya da diller arası bağlantı veya vikiler arası bağlantı içerdiğinden geçerli değil. Başlıklarda kullanılması yasak olan bir ya da daha çok karakter içeriyor olabilir.',
-'perfdisabled'         => 'Özür dileriz! Bu özellik, veritabanını kullanılamayacak derecede yavaşlattığı için, geçici olarak kullanımdan çıkarıldı.',
 'perfcached'           => 'Veriler daha önceden hazırlanmış olabilir. Bu sebeple güncel olmayabilir!',
 'perfcachedts'         => 'Aşağıda saklanmış bilgiler bulunmaktadır, son güncelleme zamanı: $1.',
 'querypage-no-updates' => 'Şu an için güncellemeler devre dışı bırakıldı. Buradaki veri hemen yenilenmeyecektir.',
@@ -383,7 +463,7 @@ Lütfen birkaç dakika sonra yeniden deneyin.',
 'protectedpagetext'    => 'Bu sayfa değişiklik yapılmaması için koruma altına alınmıştır.',
 'viewsourcetext'       => 'Bu sayfanın kaynağını görebilir ve kopyalayabilirsiniz:',
 'protectedinterface'   => 'Bu sayfa yazılım için arayüz metni sağlamaktadır ve kötüye kullanımı önlemek için kilitlenmiştir.',
-'editinginterface'     => "'''UYARI:''' Yazılım için arayüz sağlamakta kullanılan bir sayfayı değiştirmektesiniz. Bu sayfadaki değişiklikler kullanıcı arayüzünü diğer kullanıcılar için de değiştirecektir. Çeviriler için, lütfen [http://translatewiki.net/wiki/Main_Page?setlang=tr Betawiki]'yi kullanarak MediaWiki yerelleştirme projesini dikkate alınız.",
+'editinginterface'     => "'''UYARI:''' Yazılım için arayüz sağlamakta kullanılan bir sayfayı değiştirmektesiniz. Bu sayfadaki değişiklikler kullanıcı arayüzünü diğer kullanıcılar için de değiştirecektir. Çeviriler için, lütfen [http://translatewiki.net/wiki/Main_Page?setlang=tr translatewiki.net]'yi kullanarak MediaWiki yerelleştirme projesini dikkate alınız.",
 'sqlhidden'            => '(SQL gizli sorgu)',
 'cascadeprotected'     => 'Bu sayfa değişiklik yapılması engellenmiştir, çünkü  "kademeli" seçeneği aktif hale getirilerek koruma altına alınan {{PLURAL:$1|sayfada|sayfada}} kullanılmaktadır:
 $2',
@@ -394,7 +474,7 @@ $2',
 Verilen sebep: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Yanlış ayarlama: bilinmeyen virüs tarayıcı: <i>$1</i>',
+'virus-badscanner'     => "Yanlış ayarlama: bilinmeyen virüs tarayıcı: ''$1''",
 'virus-scanfailed'     => 'tarama başarısız (kod $1)',
 'virus-unknownscanner' => 'bilinmeyen antivürüs:',
 
@@ -413,7 +493,6 @@ Hesabınız açıldı.
 'remembermypassword'         => 'Parolayı hatırla.',
 'yourdomainname'             => 'Alan adınız',
 'externaldberror'            => 'Ya doğrulama vertiabanı hatası var ya da kullanıcı hesabınızı güncellemeye yetkiniz yok.',
-'loginproblem'               => '<b>Kayıt olurken bir problem oldu.</b><br />Tekrar deneyin!',
 'login'                      => 'Oturum aç',
 'nav-login-createaccount'    => 'Oturum aç ya da yeni hesap edin',
 'loginprompt'                => '{{SITENAME}} sitesinde oturum açabilmek için çerezleri etkinleştirmeniz gerekmektedir.',
@@ -438,7 +517,7 @@ Hesabınız açıldı.
 'yourvariant'                => 'Sizce:',
 'yournick'                   => 'İmzalarda gözükmesini istediğiniz isim',
 'badsig'                     => 'Geçersiz ham imza; HTML etiketlerini kontorl edin.',
-'badsiglength'               => 'İmza çok uzun
+'badsiglength'               => 'İmzanız çok uzun.
 $1 {{PLURAL:$1|karakterin|karakterin}} altında olmalı.',
 'email'                      => 'E-posta',
 'prefs-help-realname'        => '* Gerçek isim (isteğe bağlı): eğer gerçek isminizi vermeyi seçerseniz, çalışmanızı size atfederken kullanılacaktır.',
@@ -454,12 +533,15 @@ Lütfen çerez kullanımını açınız ve yeni kullanıcı adınız ve şifreni
 'noname'                     => 'Geçerli bir kullanıcı adı girmediniz.',
 'loginsuccesstitle'          => 'Oturum açıldı',
 'loginsuccess'               => '{{SITENAME}} sitesinde "$1" kullanıcı adıyla oturum açmış bulunmaktasınız.',
-'nosuchuser'                 => '"$1" adında bir kullanıcı bulunmamaktadır. Yazılışı kontrol edin veya [[Special:UserLogin/signup|yeni bir hesap açın]].',
+'nosuchuser'                 => '"$1" adında bir kullanıcı bulunmamaktadır.
+Kullanıcı adları büyük-küçük harf duyarlıdır.
+Yazılışı kontrol edin veya [[Special:UserLogin/signup|yeni bir hesap açın]].',
 'nosuchusershort'            => '"<nowiki>$1</nowiki>" adında bir kullanıcı bulunmamaktadır. Yazılışı kontrol edin.',
 'nouserspecified'            => 'Bir kullanıcı adı belirtmek zorundasınız.',
 'wrongpassword'              => 'Parolayı yanlış girdiniz. Lütfen tekrar deneyiniz.',
 'wrongpasswordempty'         => 'Boş parola girdiniz. Lütfen tekrar deneyiniz.',
-'passwordtooshort'           => 'Parolanız çok kısa. En az $1 harf ve/veya rakam içermeli.',
+'passwordtooshort'           => 'Parolanız geçersiz veya çok kısa.
+En az {{PLURAL:$1|1 karakter|$1 karakter}} içermeli ve kullanıcı adınızdan farklı olmalı.',
 'mailmypassword'             => 'Bana e-posta ile yeni parola gönder',
 'passwordremindertitle'      => '{{SITENAME}} için yeni geçici şifre',
 'passwordremindertext'       => '$1 IP adresinden birisi (muhtemelen siz) {{SITENAME}} ($4) için yeni bir parola gönderilmesi istedi. "$2" kullanıcısına geçici olarak "$3" parolası oluşturuldu. Eğer bu sizin isteğiniz ise, oturum açıp yeni bir parola oluşturmanız gerkemektedir.
@@ -473,41 +555,52 @@ E-postadaki yönerge uygulanıp adresin size ait olduğu onaylanmadıkça başka
 'throttled-mailpassword'     => 'Parola hatırlatıcı son {{PLURAL:$1|bir saat|$1 saat}} içinde zaten gönderildi.
 Hizmeti kötüye kullanmayı önlemek için, her {{PLURAL:$1|bir saatte|$1 saatte}} sadece bir parola hatırlatıcısı gönderilecektir.',
 'mailerror'                  => 'E-posta gönderim hatası: $1',
-'acct_creation_throttle_hit' => '$1 tane kullanıcı hesabı açtırmış durumdasınız. Daha fazla açtıramazsınız.',
-'emailauthenticated'         => 'E-posta adresiniz $1 tarihinde doğrulanmıştı.',
+'acct_creation_throttle_hit' => 'Sizin IP adresinizi kullanarak bu vikiyi ziyaret edenler son günde {{PLURAL:$1|1 hesap|$1 hesap}} oluşturdu, bu sayı bu zaman aralığında izin verilen azami sayıdır.
+Sonuç olarak, bu IP adresini kullanan ziyaretçiler şu anda daha fazla hesap açamazlar.',
+'emailauthenticated'         => 'E-posta adresiniz $2 $3 tarihinde doğrulanmıştı.',
 'emailnotauthenticated'      => 'E-posta adresiniz henüz onaylanmadı.
 Aşağıdaki işlevlerin hiçbiri için e-posta gönderilmeyecektir.',
 'noemailprefs'               => 'Bu özelliklerin çalışması için bir e-posta adresi belirtiniz.',
 'emailconfirmlink'           => 'E-posta adresinizi doğrulayın',
 'invalidemailaddress'        => 'Geçersiz bir formatta yazıldığından dolayı bu e-posta adresi kabul edilemez.
 Lütfen geçerli bir formatta e-posta adresi yazın veya bu bölümü boş bırakın.',
-'accountcreated'             => 'Hesap yaratıldı',
-'accountcreatedtext'         => '$1 için kullanıcı hesabı yaratıldı.',
+'accountcreated'             => 'Hesap açıldı',
+'accountcreatedtext'         => '$1 için bir kullanıcı hesabı açıldı.',
 'createaccount-title'        => '{{SITENAME}} için yeni kullanıcı hesabı oluşturulması',
 'createaccount-text'         => 'Birisi {{SITENAME}} sitesinde ($4) sizin e-posta adresinizi kullarak, ÅŸifresi "$3" olan, "$2" isimli bir hesap oluÅŸturdu.
 
 Siteye giriş yapmalı ve parolanızı değiştirmelisiniz.
 
 Eğer kullanıcı hesabını yanlışlıkla oluşturmuş iseniz, bu mesajı yoksayabilirsiniz.',
+'login-throttled'            => 'Bu hesabın şifresi için yakın zamanda çok fazla denemede bulundunuz.
+Lütfen tekrar denemeden önce bekleyin.',
 'loginlanguagelabel'         => 'Dil: $1',
 
 # Password reset dialog
-'resetpass'               => 'Kullanıcı parolasını sıfırla',
-'resetpass_announce'      => 'Size gönderilen muvakkat bir parola ile oturum açtınız.
+'resetpass'                 => 'Parolayı değiştir',
+'resetpass_announce'        => 'Size gönderilen muvakkat bir parola ile oturum açtınız.
 Girişi bitirmek için, burada yeni bir parola yazın:',
-'resetpass_header'        => 'Parolayı sıfırla',
-'resetpass_submit'        => 'Şifreyi ayarlayın ve oturum açın',
-'resetpass_success'       => 'Parolanız başarıyla değiştirldi! Şimdi oturumunuz açılıyor...',
-'resetpass_bad_temporary' => 'Geçersiz geçisi parola. Zaten başarıyla parolanızı değiştirmiş veya yeni geçici şifre istemiş olabilirsiniz.',
-'resetpass_forbidden'     => 'Parolalar deÄŸiÅŸtirilememektedir',
-'resetpass_missing'       => 'Form data yok.',
+'resetpass_text'            => '<!-- Metini buraya ekleyin -->',
+'resetpass_header'          => 'Hesap ÅŸifresini deÄŸiÅŸtir',
+'oldpassword'               => 'Eski parola',
+'newpassword'               => 'Yeni parola',
+'retypenew'                 => 'Yeni parolayı tekrar girin',
+'resetpass_submit'          => 'Şifreyi ayarlayın ve oturum açın',
+'resetpass_success'         => 'Parolanız başarıyla değiştirldi! Şimdi oturumunuz açılıyor...',
+'resetpass_bad_temporary'   => 'Geçersiz geçisi parola. Zaten başarıyla parolanızı değiştirmiş veya yeni geçici şifre istemiş olabilirsiniz.',
+'resetpass_forbidden'       => 'Parolalar deÄŸiÅŸtirilememektedir',
+'resetpass-no-info'         => 'Bu sayfaya doğrudan erişmek için oturum açmanız gereklidir.',
+'resetpass-submit-loggedin' => 'Parolayı değiştir',
+'resetpass-wrong-oldpass'   => 'Geçersiz geçici veya güncel şifre.
+Şifrenizi zaten başarıyla değiştirdiniz ya da yeni bir geçici şifre istediniz.',
+'resetpass-temp-password'   => 'Geçici parola:',
 
 # Edit page toolbar
 'bold_sample'     => 'Kalın yazı',
 'bold_tip'        => 'Kalın yazı',
 'italic_sample'   => 'İtalik yazı',
 'italic_tip'      => 'İtalik yazı',
-'link_sample'     => 'Sayfanın başlığı',
+'link_sample'     => 'Bağlantı başlığı',
 'link_tip'        => 'İç bağlantı',
 'extlink_sample'  => 'http://www.example.com adres açıklaması',
 'extlink_tip'     => 'Dış bağlantı (Adresin önüne http:// koymayı unutmayın)',
@@ -525,12 +618,12 @@ Girişi bitirmek için, burada yeni bir parola yazın:',
 'hr_tip'          => 'Yatay çizgi (çok sık kullanmayın)',
 
 # Edit pages
-'summary'                          => 'Özet',
-'subject'                          => 'Konu/başlık',
+'summary'                          => 'Özet:',
+'subject'                          => 'Konu/başlık:',
 'minoredit'                        => 'Küçük değişiklik',
 'watchthis'                        => 'Sayfayı izle',
 'savearticle'                      => 'Sayfayı kaydet',
-'preview'                          => 'Önizleme',
+'preview'                          => 'Ön izleme',
 'showpreview'                      => 'Önizlemeyi göster',
 'showlivepreview'                  => 'Canlı önizleme',
 'showdiff'                         => 'Değişiklikleri göster',
@@ -539,8 +632,8 @@ Girişi bitirmek için, burada yeni bir parola yazın:',
 Kaydet tuşuna tekrar basarsan sayfa özetsiz kaydedilecek.",
 'missingcommenttext'               => 'Lütfen aşağıda bir açıklama yazınız.',
 'missingcommentheader'             => "'''Hatırlatıcı:''' Bu yorum için konu/başlık sunmadınız. Eğer tekrar Kaydet tuşuna basarsanız, değişikliğiniz konu/başlık olmadan kaydedilecektir.",
-'summary-preview'                  => 'Önizleme özeti',
-'subject-preview'                  => 'Konu/Başlık önizlemesi',
+'summary-preview'                  => 'Önizleme özeti:',
+'subject-preview'                  => 'Konu/Başlık önizlemesi:',
 'blockedtitle'                     => 'Kullanıcı erişimi engellendi.',
 'blockedtext'                      => '<big>\'\'\'Kullanıcı adı veya IP adresiniz engellenmiştir.\'\'\'</big>
 
@@ -554,20 +647,21 @@ Engelleme sebebi: \'\'$2\'\'.
 Belirtilen nedene göre engellenmenizin uygun olmadığını düşünüyorsanız, $1 ya da başka bir [[{{MediaWiki:Grouppage-sysop}}|hizmetli]] ile bu durumu görüşebilirsiniz. [[Special:Preferences|Tercihlerim]] kısmında geçerli bir e-posta adresi girmediyseniz "Kullanıcıya e-posta gönder" özelliğini kullanamazsınız, tercihlerinize e-posta adresinizi eklediğinizde e-posta gönderme hakkına sahip olacaksınız. 
 <br />Şu anki IP adresiniz $3, engellenme numaranız #$5.
 <br />Bir hizmetliden durumunuz hakkında bilgi almak istediğinizde veya herhangi bir sorguda bu bilgiler gerekecektir, lütfen not ediniz.',
-'autoblockedtext'                  => 'IP adresiniz otomatik olarak engellendi çünkü $1 tarafından engellenmiş başka bir kullanıcı tarafından kullanılmaktaydı. 
+'autoblockedtext'                  => 'IP adresiniz otomatik olarak engellendi, çünkü $1 tarafından engellenmiş başka bir kullanıcı tarafından kullanılmaktaydı. 
 Belirtilen sebep ÅŸudur:
 
 :\'\'$2\'\'
 
 * Engellemenin başlangıcı: $8
 * Engellemenin bitiÅŸi: $6
+* Bloke edilmesi istenen: $7
 
 Engelleme hakkında tartışmak için $1 ile veya diğer [[{{MediaWiki:Grouppage-sysop}}|yöneticilerden]] biriyle irtibata geçebilirsiniz.
 
 Not, [[Special:Preferences|kullanıcı tercihlerinize]] geçerli bir e-posta adresi kaydetmediyseniz  "kullanıcıya e-posta gönder" özelliğinden faydalanamayabilirsiniz ve bu özelliği kullanmaktan engellenmediniz. 
 
-Şu anki IP nurmaranız $3 ve engellenme ID\'niz #$5. 
-Lütfen yapacağınız herhangi bir sorguda bu ID bulunsun.',
+Şu anki IP numaranız $3 ve engellenme ID\'niz #$5. 
+Lütfen yapacağınız herhangi bir sorguda yukarıdaki bütün detayları bulundurun.',
 'blockednoreason'                  => 'sebep verilmedi',
 'blockedoriginalsource'            => "'''$1''' sayfasının kaynak metni aşağıdır:",
 'blockededitsource'                => "'''$1''' sayfasında '''yaptığınız değişikliğe''' ait metin aşağıdadır:",
@@ -585,50 +679,60 @@ Lütfen yapacağınız herhangi bir sorguda bu ID bulunsun.',
 'newarticle'                       => '(Yeni)',
 'newarticletext'                   => "Henüz varolmayan bir sayfaya konulmuş bir bağlantıya tıkladınız. Bu sayfayı yaratmak için aşağıdaki metin kutusunu kullanınız. Bilgi için [[{{MediaWiki:Helppage}}|yardım sayfasına]] bakınız. Buraya yanlışlıkla geldiyseniz, programınızın '''Geri''' tuşuna tıklayınız.",
 'anontalkpagetext'                 => "----''Bu sayfa henüz bir kullanıcı hesabı oluşturmamış veya hesabını kullanmayan bir anonim kullanıcının mesaj sayfasıdır. Bu nedenle bu kişiyi belirtmek için rakamsal IP adresini kullanmak zorundayız. Bu gibi IP adresleri birçok kullanıcı tarafından paylaşılabilir. Eğer siz de bir anonim kullanıcıysanız ve size sizin ilginiz olmayan mesajlar geliyorsa, lütfen diğer anonim kullanıcılarla olabilecek olan karmaşayı önlemek için [[Special:UserLogin/signup|bir hesap oluşturun]] veya [[Special:UserLogin|oturum açın]].''",
-'noarticletext'                    => 'Bu sayfa boştur. Bu başlığı diğer sayfalarda [[Special:Search/{{PAGENAME}}|arayabilir]] veya bu sayfayı siz  [{{fullurl:{{FULLPAGENAME}}|action=edit}} yazabilirsiniz].',
+'noarticletext'                    => 'Bu sayfa ÅŸu anda boÅŸtur.
+Bu başlığı diğer sayfalarda [[Special:Search/{{PAGENAME}}|arayabilir]],
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} ilgili günlükleri arayabilir],
+ya da bu sayfayı [{{fullurl:{{FULLPAGENAME}}|action=edit}} değiştirebilirsiniz]</span>.',
 'userpage-userdoesnotexist'        => '"$1" kullanıcı hesabı kayıtlı değil. Bu sayfayı oluşturmak/değiştirmek istiyorsanız lütfen kontrol edin.',
 'clearyourcache'                   => "'''Not:''' Ayarlarınızı kaydettikten sonra, tarayıcınızın belleğini de temizlemeniz gerekmektedir: '''Mozilla / Firefox / Safari:''' ''Shift'' e basılıyken safyayı yeniden yükleyerek veya ''Ctrl-Shift-R'' yaparak (Apple Mac için ''Cmd-Shift-R'');, '''IE:''' ''Ctrl-F5'', '''Konqueror:''' Sadece sayfayı yeniden yükle tuşuna basarak.",
-'usercssjsyoucanpreview'           => "<strong>İpucu:</strong> Sayfayı kaydetmeden önce '''önizlemeyi göster''''e tıklayarak yaptığınız yeni sayfayı gözden geçirin.",
+'usercssjsyoucanpreview'           => "'''İpucu:''' Sayfayı kaydetmeden önce '''önizlemeyi göster''''e tıklayarak yaptığınız yeni sayfayı gözden geçirin.",
 'usercsspreview'                   => "'''Sadece kullanıcı CSS dosyanızın önizlemesini görüyorsun.''' '''Kullanıcı CSS dosyası henüz kaydolmadı!'''",
 'userjspreview'                    => "'''Sadece test ediyorsun ya da önizleme görüyorsun - kullanıcı JavaScript'i henüz kaydolmadı.'''",
 'userinvalidcssjstitle'            => "''Uyarı:''' \"\$1\" adıyla bir tema yoktur. tema-adı.css ve .js dosyalarının adları küçük harf ile yazması gerek, yani {{ns:user}}:Temel/'''M'''onobook.css değil, {{ns:user}}:Temel/'''m'''onobook.css.",
 'updated'                          => '(Güncellendi)',
-'note'                             => '<strong>Not: </strong>',
-'previewnote'                      => '<strong>Bu yalnızca bir önizlemedir, ve değişiklikleriniz henüz kaydedilmemiştir!</strong>',
+'note'                             => "'''Not: '''",
+'previewnote'                      => "'''Bu yalnızca bir önizlemedir, ve değişiklikleriniz henüz kaydedilmemiştir!'''",
 'previewconflict'                  => 'Bu önizleme metin düzenleme kutucuğunun üstünde, maddenin eğer değişikliklerinizi kaydetmeyi seçerseniz nasıl görüneceğini yansıtır.',
 'session_fail_preview'             => 'Özür dileriz. Oturum açılması ile ilgili veri kaybından kaynaklı değişikliğinizi kaydedemedik. Lütfen tekrar deneyiniz. Eğer bu yöntem işe yaramazsa oturumu kapatıp tekrar sisteme geri giriş yapınız.',
-'session_fail_preview_html'        => "<strong>Üzgünüz! Oturum verisinin kaybolmasından dolayı düzenlemenizi işleme geçiremeyeceğiz.</strong>
+'session_fail_preview_html'        => "'''Üzgünüz! Oturum verisinin kaybolmasından dolayı düzenlemenizi işleme geçiremeyeceğiz.'''
 
 ''Çünkü {{SITENAME}} sitesinde raw HTML etkindir, önizleme JavaScript saldırılarına önlem olarak gizlenmiştir.''
 
-<strong>Eğer bu haklı bir düzenleme girişimiyse, lütfen yeniden deneyin. Eğer hala çalışmazsa, [[Special:UserLogout|çıkış yapıp]] yeniden oturum açmayı deneyin.</strong>",
+'''Eğer bu haklı bir düzenleme girişimiyse, lütfen yeniden deneyin. Eğer hala çalışmazsa, [[Special:UserLogout|çıkış yapıp]] yeniden oturum açmayı deneyin.'''",
+'token_suffix_mismatch'            => "'''Değişikliğiniz geri çevrildi çünkü alıcınız düzenleme kutucuğundaki noktalama işaretlerini bozdu.
+Değişikliğiniz, sayfa metninde bozulmayı önlemek için geri çevrildi.
+Eğer sorunlu bir web-tabanlı anonim proksi servisi kullanıyorsanız bu olay bazen gerçekleşebilir.'''",
 'editing'                          => '"$1" sayfasını değiştirmektesiniz',
 'editingsection'                   => '"$1" sayfasında bölüm değiştirmektesiniz',
-'editingcomment'                   => '$1 sayfasına mesaj eklemektesiniz.',
+'editingcomment'                   => '$1 değiştiriliyor (yeni bölüm)',
 'editconflict'                     => 'Değişiklik çakışması: $1',
 'explainconflict'                  => 'Siz sayfayı değiştirirken başka biri de değişiklik yaptı.
 Yukarıdaki yazı sayfanın şu anki halini göstermektedir.
 Sizin değişiklikleriniz alta gösterilmiştir. Son değişiklerinizi yazının içine eklemeniz gerekecektir. "Sayfayı kaydet"e bastığınızda <b>sadece</b> yukarıdaki yazı kaydedilecektir. <br />',
 'yourtext'                         => 'Sizin metniniz',
 'storedversion'                    => 'KaydedilmiÅŸ metin',
-'editingold'                       => '<strong>DİKKAT: Sayfanın eski bir sürümünde değişiklik yapmaktasınız.
-Kaydettiğinizde bu tarihli sürümden günümüze kadar olan değişiklikler yok olacaktır.</strong>',
+'nonunicodebrowser'                => "'''UYARI: Tarayıcınız unicode uyumlu değil.
+Sayfaları güvenle değiştirmenize izin vermek için: ASCII olmayan karakterler değiştirme kutusunda onaltılık kodlar olarak görünecektir.'''",
+'editingold'                       => "'''DİKKAT: Sayfanın eski bir sürümünde değişiklik yapmaktasınız.
+Kaydettiğinizde bu tarihli sürümden günümüze kadar olan değişiklikler yok olacaktır.'''",
 'yourdiff'                         => 'Karşılaştırma',
-'copyrightwarning'                 => "<strong>Lütfen dikkat:</strong> {{SITENAME}} sitesine yapılan bütün katkılar <i>$2</i>
+'copyrightwarning'                 => "'''Lütfen dikkat:''' {{SITENAME}} sitesine yapılan bütün katkılar <i>$2</i>
 sözleşmesi kapsamındadır (ayrıntılar için $1'a bakınız).
 Yaptığınız katkının başka katılımcılarca acımasızca değiştirilmesini ya da özgürce ve sınırsızca başka yerlere dağıtılmasını istemiyorsanız, katkıda bulunmayınız.<br />
 Ayrıca, buraya katkıda bulunarak, bu katkının kendiniz tarafından yazıldığına, ya da kamuya açık bir kaynaktan ya da başka bir özgür kaynaktan kopyalandığına güvence vermiş oluyorsunuz.<br />
-<strong><center>TELİF HAKKI İLE KORUNAN HİÇBİR ÇALIŞMAYI BURAYA EKLEMEYİNİZ!</center></strong>",
+'''<center>TELİF HAKKI İLE KORUNAN HİÇBİR ÇALIŞMAYI BURAYA EKLEMEYİNİZ!</center>'''",
 'copyrightwarning2'                => 'Lütfen, {{SITENAME}} sitesinea bulunacağınız tüm katkıların diğer üyeler tarafından düzenlenebileceğini, değiştirilebileceğini ya da silinebileceğini hatırlayın. Yazılarınızın merhametsizce değiştirilebilmesine rıza göstermiyorsanız buraya katkıda bulunmayın. <br />
 Ayrıca bu ekleyeceğiniz yazıyı sizin yazdığınızı ya da serbest kopyalama izni veren bir kaynaktan kopyaladığınızı bize taahhüt etmektesiniz (ayrıntılar için referans: $1).',
-'longpagewarning'                  => '<strong>UYARI: Bu sayfa $1 kilobayt büyüklüğündedir; bazı tarayıcılar değişiklik yaparken 32 kb ve üstü büyüklüklerde sorunlar yaşayabilir. Sayfayı bölümlere ayırmaya çalışın.</strong>',
-'longpageerror'                    => '<strong>HATA: Girdiğiniz metnin uzunluğu $1 kilobyte, ve maksimum uzunluktan $2 kilobyte daha fazladır.
-Kaydedilmesi mümkün değildir.</strong>',
-'readonlywarning'                  => '<strong>DİKKAT: Bakım nedeni ile veritabanı şu anda kilitlidir. Bu sebeple değişiklikleriniz şu anda kaydedilememektedir. Yazdıklarınızı başka bir editöre alıp saklayabilir ve daha sonra tekrar buraya getirip kaydedebilirsiniz</strong>',
+'longpagewarning'                  => "'''UYARI: Bu sayfa $1 kilobayt büyüklüğündedir; bazı tarayıcılar değişiklik yaparken 32 kb ve üstü büyüklüklerde sorunlar yaşayabilir. Sayfayı bölümlere ayırmaya çalışın.'''",
+'longpageerror'                    => "'''HATA: Girdiğiniz metnin uzunluğu $1 kilobyte, ve maksimum uzunluktan $2 kilobyte daha fazladır.
+Kaydedilmesi mümkün değildir.'''",
+'readonlywarning'                  => "'''DİKKAT: Bakım nedeni ile veritabanı şu anda kilitlidir. Bu sebeple değişiklikleriniz şu anda kaydedilememektedir. Yazdıklarınızı başka bir editöre alıp saklayabilir ve daha sonra tekrar buraya getirip kaydedebilirsiniz'''
+
+Kilitleyen yönetici şu açıklamayı eklemiştir: $1",
 'protectedpagewarning'             => 'UYARI: Bu sayfa koruma altına alınmıştır ve yalnızca yönetici olanlar tarafından değiştirilebilir. Bu sayfayı değiştirirken lütfen [[Project:Koruma altına alınmış sayfa|korumalı sayfa kurallarını]] uygulayınız.',
 'semiprotectedpagewarning'         => "'''Uyarı''': Bu sayfa sadece kayıtlı kullanıcı olanlar tarafından değiştirilebilir.",
 'cascadeprotectedwarning'          => "'''UYARI:''' Bu sayfa sadece yöneticilik yetkileri olan kullanıcıların değişiklik yapabileceği şekilde koruma altına alınmıştır. Çünkü  \"kademeli\" seçeneği aktif hale getirilerek koruma altına alınan {{PLURAL:\$1|sayfada|sayfada}} kullanılmaktadır:",
-'titleprotectedwarning'            => '<strong>UYARI: Bu sayfa kilitlenmiştir ve yalnızca bazı kullanıcılar yaratabilir.</strong>',
+'titleprotectedwarning'            => "'''UYARI: Bu sayfa [[Special:ListGroupRights|özel hakları]] olanların oluşturabilmeleri için kilitlenmiştir.'''",
 'templatesused'                    => 'Bu sayfada kullanılan şablonlar:',
 'templatesusedpreview'             => 'Bu önizlemede kullanılan şablonlar:',
 'templatesusedsection'             => 'Bu bölümde kullanılan şablonlar:',
@@ -638,51 +742,76 @@ Kaydedilmesi mümkün değildir.</strong>',
 'nocreatetitle'                    => 'Sayfa oluşturulması limitlendi',
 'nocreatetext'                     => '{{SITENAME}}, yeni sayfa oluÅŸturulabilmesini engelledi.
 Geri giderek varolan sayfayı değiştirebilirsiniz ya da kayıtlı iseniz [[Special:UserLogin|oturum açabilir]], değilseniz [[Special:UserLogin|kayıt olabilirsiniz]].',
-'nocreate-loggedin'                => '{{SITENAME}} üzerinde yeni sayfalar oluşturmaya yetkiniz yok.',
+'nocreate-loggedin'                => 'Yeni sayfalar oluÅŸturmaya yetkiniz yok.',
 'permissionserrors'                => 'İzin hataları',
 'permissionserrorstext'            => 'Aşağıdaki {{PLURAL:$1|sebep|sebepler}}den dolayı, bunu yapmaya yetkiniz yok:',
-'permissionserrorstext-withaction' => 'Aşağıdaki {{PLURAL:$1|neden|nedenler}}den dolayı $2 işlemini yapmaya yetkiniz yok:',
+'permissionserrorstext-withaction' => 'Aşağıdaki {{PLURAL:$1|neden|nedenler}}den dolayı $2 yetkiniz yok:',
 'recreate-deleted-warn'            => "'''Uyarı: Daha önceden silinmiş bir sayfayı yeniden oluşturuyorsunuz.'''
 
 Bu sayfayı düzenlemeye devam ederken bunun uygun olup olmadığını düşünmelisiniz.
 Kolaylık olması açısından bu sayfanın silme kayıtları burada belirtilmiştir:",
+'deleted-notice'                   => 'Bu sayfa silindi.
+Bu sayfanın silinme kaydı aşağıda bulunmaktadır.',
+'deletelog-fulllog'                => 'Tüm kayıtları göster',
+'edit-hook-aborted'                => 'Değişiklik çengelle durduruldu.
+Bir açıklama verilmedi.',
+'edit-gone-missing'                => 'Sayfa güncellenemiyor.
+Silinmiş görünüyor.',
+'edit-conflict'                    => 'Değişiklik çakışması.',
+'edit-no-change'                   => 'Değişikliğiniz yoksayıldı, çünkü metinde bir değişiklik yapılmadı.',
+'edit-already-exists'              => 'Yeni sayfa oluşturulamıyor.
+Sayfa zaten mevcut.',
+
+# Parser/template warnings
+'expensive-parserfunction-warning'        => 'Uyarı: Bu sayfa çok fazla zengin derleyici fonksiyonu çağrısı içeriyor.
+
+Bu $2 çağrıdan az olmalı, şu anda {{PLURAL:$1|1 çağrı var|$1 çağrı var}}.',
+'expensive-parserfunction-category'       => 'Çok fazla zengin derleyici fonksiyonu çağrısına sahip sayfalar',
+'post-expand-template-inclusion-warning'  => 'Uyarı: Katılan şablon içeriği çok geniş. 
+Bazı şablonlar sayfaya katılmayacak.',
+'post-expand-template-inclusion-category' => 'Şablon içerik genişliği sınırı aşılan sayfalar',
+'post-expand-template-argument-warning'   => 'Uyarı: Bu sayfa çok fazla genişleme boyutuna sahip bir şablon değişkeninden en az bir tane içeriyor.
+Bu değişkenler atlandı.',
+'post-expand-template-argument-category'  => 'Geçersiz şablon argümanları içeren sayfalar',
+'parser-template-loop-warning'            => 'Şablon düğümü tespit edildi: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Şablon özyineleme yoğunluğu limiti aşıldı ($1)',
 
 # "Undo" feature
 'undo-success' => 'Bu değişiklik geri alınabilir. Lütfen aşağıdaki karşılaştırmayı kontrol edin, gerçekten bu değişikliği yapmak istediğinizden emin olun ve sayfayı kaydederek bir önceki değişikliği geriye alın.',
 'undo-failure' => 'Değişikliklerin çakışması nedeniyle geri alma işlemi başarısız oldu.',
 'undo-norev'   => 'Değişiklik geri alınamaz çünkü ya silinmiş ya da varolmamaktadır.',
-'undo-summary' => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) tarafından $1 kullanıcısının değişikliği geri alındı.',
+'undo-summary' => '$1 değişikliği [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) tarafından geri alındı.',
 
 # Account creation failure
-'cantcreateaccounttitle' => 'Hesap oluşturulamıyor',
+'cantcreateaccounttitle' => 'Hesap açılamıyor',
 'cantcreateaccount-text' => "Bu IP adresinden ('''$1''') kullaınıcı hesabı oluşturulması [[User:$3|$3]] tarafından engellenmiştir.
 
 $3 tarafından verilen sebep ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Bu sayfa ile ilgili kayıtları göster',
-'nohistory'           => 'Bu sayfanın geçmiş sürümü yok.',
-'revnotfound'         => 'Sürüm bulunmadı',
-'revnotfoundtext'     => "İstemiş olduğunuz sayfanın eski versiyonu bulunamadı. Lütfen bu sayfaya erişmekte kullandığınız URL'yi kontrol edin.",
-'currentrev'          => 'Güncel sürüm',
-'revisionasof'        => 'Sayfanın $1 tarihindeki hâli',
-'revision-info'       => '$2 tarafından oluşturulmuş $1 tarihli sürüm',
-'previousrevision'    => '� Önceki hali',
-'nextrevision'        => 'Sonraki hali →',
-'currentrevisionlink' => 'en güncel halini göster',
-'cur'                 => 'fark',
-'next'                => 'sonraki',
-'last'                => 'son',
-'page_first'          => 'ilk',
-'page_last'           => 'son',
-'histlegend'          => "Fark seçimi: karşılaştımayı istediğiniz 2 sürümün önündeki dairelere taıkayıp, enter'a basın ya da sayfanın en atında bulunan düğmeye basın.<br />
+'viewpagelogs'           => 'Bu sayfa ile ilgili kayıtları göster',
+'nohistory'              => 'Bu sayfanın geçmiş sürümü yok.',
+'currentrev'             => 'Güncel sürüm',
+'currentrev-asof'        => '$1 itibarı ile sayfanın şu anki hâli.',
+'revisionasof'           => 'Sayfanın $1 tarihindeki hâli',
+'revision-info'          => '$2 tarafından oluşturulmuş $1 tarihli sürüm', # Additionally available: $3: revision id
+'previousrevision'       => '� Önceki hali',
+'nextrevision'           => 'Sonraki hali →',
+'currentrevisionlink'    => 'en güncel halini göster',
+'cur'                    => 'fark',
+'next'                   => 'sonraki',
+'last'                   => 'son',
+'page_first'             => 'ilk',
+'page_last'              => 'son',
+'histlegend'             => "Fark seçimi: karşılaştırmayı istediğiniz 2 sürümün önündeki dairelere tıklayıp, enter'a basın ya da sayfanın en altında bulunan düğmeye basın.<br />
 Tanımlar: (güncel) = güncel sürümle aradaki fark,
-(önceki) = bir önceki sürümle aradaki fark, K = küçük değişiklik",
-'deletedrev'          => '[silindi]',
-'histfirst'           => 'En eski',
-'histlast'            => 'En yeni',
-'historysize'         => '({{PLURAL:$1|1 bayt|$1 bayt}})',
-'historyempty'        => '(boÅŸ)',
+(önceki) = bir önceki sürümle aradaki fark, K = küçük değişiklik.",
+'history-fieldset-title' => 'Geçmişe gözat',
+'deletedrev'             => '[silindi]',
+'histfirst'              => 'En eski',
+'histlast'               => 'En yeni',
+'historysize'            => '({{PLURAL:$1|1 bayt|$1 bayt}})',
+'historyempty'           => '(boÅŸ)',
 
 # Revision feed
 'history-feed-title'          => 'Değişiklik geçmişis',
@@ -708,16 +837,25 @@ Bu sayfa deÄŸiÅŸikiliÄŸi kamu arÅŸivlerinden silinmiÅŸtir.
 'revdelete-nooldid-text'      => 'Bu fonksiyonu uygulamak için belirli hedef değişiklik veya değişikileriniz yok. Sunulmuş olan revizyon mevcut değil, veya mevcut revizyonu gizlemeye çalışıyorsunuz.',
 'revdelete-selected'          => "'''[[:$1]] sayfasının {{PLURAL:$2|seçili değişikliği|seçili değişiklikleri}}:'''",
 'logdelete-selected'          => "'''{{PLURAL:$1|Seçili kayıt olayı|Seçili kayıt olayları}}:'''",
+'revdelete-text'              => "'''Silinen revizyonlar ve olaylar hala sayfa geçmişinde ve günlüklerde görünecektir, fakat içeriğin parçaları umumi olarak erişilemeyecektir.'''
+
+{{SITENAME}} sitesindeki diğer yöneticiler gizli içeriğe erişebilir ve ilave kısıtlamalar ayarlanmadıysa bu arayüz ile geri getirebilir.",
 'revdelete-legend'            => 'Görünürlük kısıtlamaları ayarla',
-'revdelete-hide-text'         => 'Değişikilik yazısını gizle',
+'revdelete-hide-text'         => 'Değişiklik yazısını gizle',
 'revdelete-hide-name'         => 'Olayı ve hedefi gizle',
 'revdelete-hide-comment'      => 'Özeti gösterme',
 'revdelete-hide-user'         => "Değişikliği yapan kullanıcı adını/IP'i gizle",
 'revdelete-hide-restricted'   => 'Bu kısıtlamaları yönetici ve kullanıcılara uygula ve de bu arayüzü kilitle.',
 'revdelete-suppress'          => 'Hem diğerlerinden hem de yöneticilerden veriyi gizle',
 'revdelete-hide-image'        => 'Dosya içeriğini gizle',
+'revdelete-unsuppress'        => 'Geri döndürülmüş revizyonlardaki kısıtlamaları kaldır',
 'revdelete-log'               => 'Log açıklama:',
 'revdelete-submit'            => 'Seçilen sürüme uygula',
+'revdelete-logentry'          => '[[$1]] için revizyon görünürlüğü değişti',
+'logdelete-logentry'          => '[[$1]] için olay görünürlüğü değişti',
+'revdelete-success'           => "'''Revizyon görünürlüğü başarıyla ayarlandı.'''",
+'logdelete-success'           => "'''Günlük görünürlüğü başarıyla ayarlandı.'''",
+'revdel-restore'              => 'Görünürlüğü değiştir',
 'pagehist'                    => 'Sayfa geçmişi',
 'deletedhist'                 => 'Silinmiş geçmiş',
 'revdelete-content'           => 'içerik',
@@ -727,141 +865,253 @@ Bu sayfa deÄŸiÅŸikiliÄŸi kamu arÅŸivlerinden silinmiÅŸtir.
 'revdelete-unrestricted'      => 'hizmetliler için kaldırılmış kısıtlamalar',
 'revdelete-hid'               => 'gizle $1',
 'revdelete-unhid'             => 'göster $1',
+'revdelete-log-message'       => '$2 {{PLURAL:$2|revizyon|revizyon}} için $1',
+'logdelete-log-message'       => '$2 {{PLURAL:$2|olay|olay}} için $1',
+
+# Suppression log
+'suppressionlog'     => 'Gizleme kayıtları',
+'suppressionlogtext' => 'Aşağıdaki, yöneticilerden gizlenen içerik içeren silinmelerin ve engellemelerin listesidir. 
+Şuanda işlevsel olan yasak ve engellemelerin listesi için [[Special:IPBlockList|IP engelleme listesine]] bakın.',
 
 # History merging
 'mergehistory'                     => 'Sayfa geçmişlerini takas et.',
+'mergehistory-header'              => 'Bu sayfa, bir kaynak sayfanın geçmiş revizyonlarını yeni bir sayfaya birleştirmenize olanak sağlar.
+Bu değişikliğin geçmişe ait sayfa devamlılığını devam ettirdiğinden emin olun.',
 'mergehistory-box'                 => 'İki sayfanın revizyonlarını birleştir:',
 'mergehistory-from'                => 'Kaynak sayfa:',
 'mergehistory-into'                => 'Hedef sayfa:',
-'mergehistory-list'                => 'Birleştirilebilir değişikilik geçmişi.',
+'mergehistory-list'                => 'Birleştirilebilir değişiklik geçmişi',
+'mergehistory-merge'               => '[[:$1]] içinn aşağıdaki revizyonlar [[:$2]] ile birleştirilebilir.
+Sadece belirtilen zamanda ve öncesinde oluşturulan revizyonları birleştirmek için radyo düğmesi sütununu kullanın.
+Gezinti bağlantılarının bu sütunu sıfırlayacağını unutmayın.',
 'mergehistory-go'                  => 'Birleştirilebilir değişikilikleri göster',
 'mergehistory-submit'              => 'Revizyonları birleştir',
 'mergehistory-empty'               => 'Hiçbir sürüm birleştirilemez.',
 'mergehistory-success'             => '[[:$1]] sayfasının $3 {{PLURAL:$3|revizyonu|revizyonu}} başarıyla [[:$2]] içine birleştirildi.',
+'mergehistory-fail'                => 'Geçmiş birleştirmesi gerçekleştirlemiyor, lütfen sayfa ve zaman parametrelerini yeniden kontrol edin.',
 'mergehistory-no-source'           => 'Kaynak sayfa $1 bulunmamaktadır.',
 'mergehistory-no-destination'      => 'Hedef sayfa $1 bulunmamaktadır.',
 'mergehistory-invalid-source'      => 'Kaynak sayfanın geçerli bir başlığı olmalı.',
 'mergehistory-invalid-destination' => 'Hedef sayfanın geçerli bir ismi olmalı.',
 'mergehistory-autocomment'         => '[[:$1]], [[:$2]] sayfasına birleştirildi',
 'mergehistory-comment'             => '[[:$1]] ile [[:$2]] birleÅŸtirildi: $3',
+'mergehistory-same-destination'    => 'Kaynak ve hedef sayfaları aynı olamaz',
 
 # Merge log
 'mergelog'           => 'Birleştirme kaydı',
 'pagemerge-logentry' => "[[$1]] ile [[$2]] birleÅŸtirildi ($3'e kadar olan revizyonlar)",
 'revertmerge'        => 'Ayır',
+'mergelogpagetext'   => 'Aşaüıdaki liste, sayfaların geçmiş versiyonlarının birbirleriyle en son birleştirilmelerini içerir',
 
 # Diffs
 'history-title'           => '"$1" sayfasının geçmişi',
 'difference'              => '(Sürümler arası farklar)',
 'lineno'                  => '$1. satır:',
 'compareselectedversions' => 'Seçilen sürümleri karşılaştır',
+'visualcomparison'        => 'Görsel karşılaştırma',
+'wikicodecomparison'      => 'Vikimetin karşılaştırması',
 'editundo'                => 'geriye al',
 'diff-multi'              => '(Gösterilmeyen {{PLURAL:$1|$1 ara değişiklik|$1 ara değişiklik}} bulunmaktadır.)',
+'diff-movedto'            => '$1 sayfasına taşındı',
+'diff-styleadded'         => '$1 stili eklendi',
+'diff-added'              => '$1 eklendi',
+'diff-changedto'          => '$1 olarak deÄŸiÅŸtirildi',
+'diff-movedoutof'         => '$1 den taşındı',
+'diff-styleremoved'       => '$1 stili silindi',
+'diff-removed'            => '$1 silindi',
+'diff-changedfrom'        => "$1'dan deÄŸiÅŸtirildi",
+'diff-src'                => 'kaynak',
+'diff-withdestination'    => '$1 hedefi ile',
+'diff-with'               => '&#32;$1 $2 ile',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;ve $1 $2',
+'diff-width'              => 'geniÅŸlik',
+'diff-height'             => 'yükseklik',
+'diff-p'                  => "bir '''paragraf'''",
+'diff-blockquote'         => "bir '''alıntı'''",
+'diff-h1'                 => "bir '''başlık (1. seviye)'''",
+'diff-h2'                 => "bir '''başlık (2. seviye)'''",
+'diff-h3'                 => "bir '''başlık (3. seviye)'''",
+'diff-h4'                 => "bir '''başlık (4. seviye)'''",
+'diff-h5'                 => "bir '''başlık (5. seviye)'''",
+'diff-pre'                => "bir '''önceden biçimlendirilmiş kalıp'''",
+'diff-div'                => "bir '''ayrım'''",
+'diff-ul'                 => "bir '''sıralanmamış liste'''",
+'diff-ol'                 => "bir '''sıralı liste'''",
+'diff-li'                 => "bir '''liste öğesi'''",
+'diff-table'              => "bir '''tablo'''",
+'diff-tbody'              => "bir '''tablo içeriği'''",
+'diff-tr'                 => "bir '''satır'''",
+'diff-td'                 => "bir '''hücre'''",
+'diff-th'                 => "bir '''başlık'''",
+'diff-br'                 => "bir '''satır sonu'''",
+'diff-hr'                 => "bir '''yatay cetvel'''",
+'diff-code'               => "bir '''bilgisayar kod bloÄŸu'''",
+'diff-dl'                 => "bir '''tanım listesi'''",
+'diff-dt'                 => "bir '''tanım terimi'''",
+'diff-dd'                 => "bir '''tanım'''",
+'diff-input'              => "bir '''girdi'''",
+'diff-form'               => "bir '''form'''",
+'diff-img'                => "bir '''resim'''",
+'diff-span'               => "bir '''span'''",
+'diff-a'                  => "bir '''bağlantı'''",
+'diff-i'                  => "'''eğik yazılar'''",
+'diff-b'                  => "'''kalın'''",
+'diff-strong'             => "'''kalın'''",
+'diff-em'                 => "'''vurgu'''",
+'diff-font'               => "'''yazıtipi'''",
+'diff-big'                => "'''büyük'''",
+'diff-del'                => "'''silinmiÅŸ'''",
+'diff-tt'                 => "'''sabit geniÅŸlik'''",
+'diff-sub'                => "'''altsimge'''",
+'diff-sup'                => "'''üstsimge'''",
+'diff-strike'             => "'''üstüçizili'''",
 
 # Search results
-'searchresults'             => 'Arama sonuçları',
-'searchresulttext'          => '{{SITENAME}} içinde arama yapmak konusunda bilgi almak için [[{{MediaWiki:Helppage}}|{{int:help}}]] sayfasına bakabilirsiniz.',
-'searchsubtitle'            => "Aranan: \"'''[[:\$1]]'''\"",
-'searchsubtitleinvalid'     => 'Aranan: "$1"',
-'noexactmatch'              => "''Başlığı \"\$1\" olan bir madde bulunamadı.''' Bu sayfayı siz [[:\$1|oluşturabilirsiniz]].",
-'noexactmatch-nocreate'     => "'''\"\$1\" başlıklı sayfa bulunmamaktadır.'''",
-'titlematches'              => 'Madde adı eşleşiyor',
-'notitlematches'            => 'Hiçbir başlıkta bulunamadı',
-'textmatches'               => 'Sayfa metni eÅŸleÅŸiyor',
-'notextmatches'             => 'Hiçbir sayfada bulunamadı',
-'prevn'                     => 'önceki $1',
-'nextn'                     => 'sonraki $1',
-'viewprevnext'              => '($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 kelime|$2 kelime}})',
-'search-result-score'       => 'Uygunluk: $1%',
-'search-redirect'           => '(yönlendirme $1)',
-'search-section'            => '(bölüm $1)',
-'search-suggest'            => 'Bunu mu demek istediniz: $1',
-'search-interwiki-caption'  => 'KardeÅŸ projeler',
-'search-interwiki-default'  => '$1 sonuçlar:',
-'search-interwiki-more'     => '(daha çok)',
-'search-mwsuggest-enabled'  => 'önerilerle',
-'search-mwsuggest-disabled' => 'öneri yok',
-'search-relatedarticle'     => 'ilgili',
-'searchrelated'             => 'ilgili',
-'searchall'                 => 'hepsi',
-'showingresults'            => "$2. sonuçtan başlayarak {{PLURAL:$1|'''1''' sonuç |'''$1''' sonuç }} aşağıdadır:",
-'showingresultsnum'         => "'''$2''' sonuçtan başlayarak {{PLURAL:$3|'''1''' sonuç|'''$3''' sonuç}} aşağıdadır:",
-'powersearch'               => 'GeliÅŸmiÅŸ arama',
-'powersearch-legend'        => 'GeliÅŸmiÅŸ arama',
-'powersearch-redir'         => 'Yönlendirmeleri listele',
-'powersearch-field'         => 'Ara:',
-'search-external'           => 'Dış arama',
-'searchdisabled'            => '{{SITENAME}} sitesinde arama yapma geçici olarak durdurulmuştur. Bu arada Google kullanarak {{SITENAME}} içinde arama yapabilirsiniz. Arama sitelerinde indekslemelerinin biraz eski kalmış olabileceğini göz önünde bulundurunuz.',
+'searchresults'                    => 'Arama sonuçları',
+'searchresults-title'              => '"$1" için arama sonuçları',
+'searchresulttext'                 => '{{SITENAME}} içinde arama yapmak konusunda bilgi almak için [[{{MediaWiki:Helppage}}|{{int:help}}]] sayfasına bakabilirsiniz.',
+'searchsubtitle'                   => '\'\'\'[[:$1]]\'\'\' için aradınız. ([[Special:Prefixindex/$1|"$1" ile başlayan tüm sayfalar]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1"\' sayfasına bağlantısı olan tüm sayfalar]])',
+'searchsubtitleinvalid'            => 'Aranan: "$1"',
+'noexactmatch'                     => "''Başlığı \"\$1\" olan bir madde bulunamadı.''' Bu sayfayı siz [[:\$1|oluşturabilirsiniz]].",
+'noexactmatch-nocreate'            => "'''\"\$1\" başlıklı sayfa bulunmamaktadır.'''",
+'toomanymatches'                   => 'Çok fazla eşleşme döndü, lütfen başka bir sorgu seçin',
+'titlematches'                     => 'Madde adı eşleşiyor',
+'notitlematches'                   => 'Hiçbir başlıkta bulunamadı',
+'textmatches'                      => 'Sayfa metni eÅŸleÅŸiyor',
+'notextmatches'                    => 'Hiçbir sayfada bulunamadı',
+'prevn'                            => 'önceki $1',
+'nextn'                            => 'sonraki $1',
+'viewprevnext'                     => '($1) ($2) ($3).',
+'searchmenu-legend'                => 'Arama seçenekleri',
+'searchmenu-exists'                => "'''Bu vikide \"[[:\$1]]\" adında bir sayfa mevcut'''",
+'searchmenu-new'                   => "'''Bu vikide \"[[:\$1]]\" sayfasını oluştur!'''",
+'searchhelp-url'                   => 'Help:İçindekiler',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Bu ön ekle sayfalara göz at]]',
+'searchprofile-articles'           => 'İçerik sayfaları',
+'searchprofile-articles-and-proj'  => 'İçerik & proje sayfaları',
+'searchprofile-project'            => 'Proje sayfaları',
+'searchprofile-images'             => 'Dosyalar',
+'searchprofile-everything'         => 'HerÅŸey',
+'searchprofile-advanced'           => 'GeliÅŸmiÅŸ',
+'searchprofile-articles-tooltip'   => '$1 içinde ara',
+'searchprofile-project-tooltip'    => '$1 içinde ara',
+'searchprofile-images-tooltip'     => 'Dosyalar için ara',
+'searchprofile-everything-tooltip' => 'Tüm içeriği ara (tartışma sayfaları dahil)',
+'searchprofile-advanced-tooltip'   => 'Özel ad alanlarında ara',
+'prefs-search-nsdefault'           => 'Varsayılanları kullanarak ara:',
+'prefs-search-nscustom'            => 'Özel ad alanlarını ara:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 kelime|$2 kelime}})',
+'search-result-score'              => 'Uygunluk: $1%',
+'search-redirect'                  => '(yönlendirme $1)',
+'search-section'                   => '(bölüm $1)',
+'search-suggest'                   => 'Bunu mu demek istediniz: $1',
+'search-interwiki-caption'         => 'KardeÅŸ projeler',
+'search-interwiki-default'         => '$1 sonuçlar:',
+'search-interwiki-more'            => '(daha çok)',
+'search-mwsuggest-enabled'         => 'önerilerle',
+'search-mwsuggest-disabled'        => 'öneri yok',
+'search-relatedarticle'            => 'ilgili',
+'mwsuggest-disable'                => 'AJAX önerilerini devre dışı bırak',
+'searchrelated'                    => 'ilgili',
+'searchall'                        => 'hepsi',
+'showingresults'                   => "$2. sonuçtan başlayarak {{PLURAL:$1|'''1''' sonuç |'''$1''' sonuç }} aşağıdadır:",
+'showingresultsnum'                => "'''$2''' sonuçtan başlayarak {{PLURAL:$3|'''1''' sonuç|'''$3''' sonuç}} aşağıdadır:",
+'showingresultstotal'              => "Toplam {{PLURAL:$4|'''$3''' sonuçtan '''$1''' tanesi|'''$3''' sonuçtan '''$1 - $2''' arası sonuçlar}} gösteriliyor",
+'nonefound'                        => "'''Not''': Sadece bazı alan adları varsayılan olarak aranır.
+Aramanızın başına '''all:''' önekini ekleyerek tüm içeriği aramayı (tartışma sayfalarını, şablonları vb. kapsayacak şekilde) deneyin veya önek olarak istenilen alan adını kullanın.",
+'search-nonefound'                 => 'Sorguyla eşleşen bir sonuç yok.',
+'powersearch'                      => 'GeliÅŸmiÅŸ arama',
+'powersearch-legend'               => 'GeliÅŸmiÅŸ arama',
+'powersearch-ns'                   => 'Ad alanlarında ara:',
+'powersearch-redir'                => 'Yönlendirmeleri listele',
+'powersearch-field'                => 'Ara:',
+'search-external'                  => 'Dış arama',
+'searchdisabled'                   => '{{SITENAME}} sitesinde arama yapma geçici olarak durdurulmuştur. Bu arada Google kullanarak {{SITENAME}} içinde arama yapabilirsiniz. Arama sitelerinde indekslemelerinin biraz eski kalmış olabileceğini göz önünde bulundurunuz.',
 
 # Preferences page
-'preferences'              => 'Tercihler',
-'mypreferences'            => 'Tercihlerim',
-'prefs-edits'              => 'Değişiklik sayısı:',
-'prefsnologin'             => 'Oturum açık değil',
-'prefsnologintext'         => 'Kullanıcı tercihlerinizi ayarlamak için <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} giriş yapmalısınız]</span>.',
-'prefsreset'               => 'Tercihler hafızadan sıfırlandı.',
-'qbsettings'               => 'Hızlı erişim sütun ayarları',
-'qbsettings-none'          => 'Hiçbiri',
-'qbsettings-fixedleft'     => 'Sola sabitlendi',
-'qbsettings-fixedright'    => 'SaÄŸa sabitlendi',
-'qbsettings-floatingleft'  => 'Sola yaslanıyor',
-'qbsettings-floatingright' => 'Sağa yaslanıyor',
-'changepassword'           => 'Åžifre deÄŸiÅŸtir',
-'skin'                     => 'Tema',
-'math'                     => 'Matematiksel semboller',
-'dateformat'               => 'Tarih gösterimi',
-'datedefault'              => 'Tercih yok',
-'datetime'                 => 'Tarih ve saat',
-'math_failure'             => 'Ayrıştırılamadı',
-'math_unknown_error'       => 'bilinmeyen hata',
-'math_unknown_function'    => 'bilinmeyen fonksiyon',
-'math_lexing_error'        => 'lexing hatası',
-'math_syntax_error'        => 'sözdizim hatası',
-'math_image_error'         => 'PNG çevirisi başarısız; latex, dvips ve gs programlarının doğru yüklendiğine emin olun ve çeviri işlemini başlatın',
-'prefs-personal'           => 'Kullanıcı bilgileri',
-'prefs-rc'                 => 'Son deÄŸiÅŸiklikler',
-'prefs-watchlist'          => 'Ä°zleme listesi',
-'prefs-watchlist-days'     => 'İzleme listesinde görüntülenecek gün sayısı:',
-'prefs-watchlist-edits'    => 'Genişletilmiş izleme listesinde gösterilecek değişiklik sayısı:',
-'prefs-misc'               => 'DiÄŸer ayarlar',
-'saveprefs'                => 'DeÄŸiÅŸiklikleri kaydet',
-'resetprefs'               => 'Ayarları ilk durumuna getir',
-'oldpassword'              => 'Eski parola',
-'newpassword'              => 'Yeni parola',
-'retypenew'                => 'Yeni parolayı tekrar girin',
-'textboxsize'              => 'Sayfa yazma alanı',
-'rows'                     => 'Satır',
-'columns'                  => 'Sütun',
-'searchresultshead'        => 'Arama',
-'resultsperpage'           => 'Sayfada gösterilecek bulunan madde sayısı',
-'contextlines'             => 'Bulunan madde için ayrılan satır sayısı',
-'contextchars'             => 'Satırdaki karakter sayısı',
-'recentchangesdays'        => 'Son değişikliklerde gösterilecek günler:',
-'recentchangescount'       => 'Son değişiklikler sayfasındaki madde sayısı',
-'savedprefs'               => 'Ayarlar kaydedildi.',
-'timezonelegend'           => 'Saat dilimi',
-'timezonetext'             => '¹Viki sunucusu (UTC/GMT) ile aranızdaki saat farkı. (Türkiye için +02:00)',
-'localtime'                => 'Åžu an sizin saatiniz',
-'timezoneoffset'           => 'Saat farkı',
-'servertime'               => 'Viki sunucusunda ÅŸu anki saat',
-'guesstimezone'            => 'Tarayıcınız sizin yerinize doldursun',
-'allowemail'               => 'Diğer kullanıcılar size e-posta atabilsin',
-'prefs-searchoptions'      => 'Arama seçenekleri',
-'prefs-namespaces'         => 'İsim alanları',
-'defaultns'                => 'Aramayı aşağıdaki seçili alanlarda yap.',
-'default'                  => 'orijinal',
-'files'                    => 'Dosyalar',
+'preferences'               => 'Tercihler',
+'mypreferences'             => 'Tercihlerim',
+'prefs-edits'               => 'Değişiklik sayısı:',
+'prefsnologin'              => 'Oturum açık değil',
+'prefsnologintext'          => 'Kullanıcı tercihlerinizi ayarlamak için <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} giriş yapmalısınız]</span>.',
+'prefsreset'                => 'Tercihler hafızadan sıfırlandı.',
+'qbsettings'                => 'Hızlı erişim sütun ayarları',
+'qbsettings-none'           => 'Hiçbiri',
+'qbsettings-fixedleft'      => 'Sola sabitlendi',
+'qbsettings-fixedright'     => 'SaÄŸa sabitlendi',
+'qbsettings-floatingleft'   => 'Sola yaslanıyor',
+'qbsettings-floatingright'  => 'Sağa yaslanıyor',
+'changepassword'            => 'Parola deÄŸiÅŸtir',
+'skin'                      => 'Motif',
+'skin-preview'              => 'Ön izleme',
+'math'                      => 'Matematiksel semboller',
+'dateformat'                => 'Tarih gösterimi',
+'datedefault'               => 'Tercih yok',
+'datetime'                  => 'Tarih ve saat',
+'math_failure'              => 'Ayrıştırılamadı',
+'math_unknown_error'        => 'bilinmeyen hata',
+'math_unknown_function'     => 'bilinmeyen fonksiyon',
+'math_lexing_error'         => 'lexing hatası',
+'math_syntax_error'         => 'sözdizim hatası',
+'math_image_error'          => 'PNG çevirisi başarısız; latex, dvips ve gs programlarının doğru yüklendiğine emin olun ve çeviri işlemini başlatın',
+'math_bad_tmpdir'           => 'Math geçici dizinine yazılamıyor ya da oluşturulamıyor',
+'math_bad_output'           => 'Math çıktı dizinine yazılamıyor ya da oluşturulamıyor',
+'math_notexvc'              => "texvc çalıştırılabiliri kayıp;
+ayarlamak için math/README'ye bakın.",
+'prefs-personal'            => 'Kullanıcı bilgileri',
+'prefs-rc'                  => 'Son deÄŸiÅŸiklikler',
+'prefs-watchlist'           => 'Ä°zleme listesi',
+'prefs-watchlist-days'      => 'İzleme listesinde görüntülenecek gün sayısı:',
+'prefs-watchlist-days-max'  => '(en fazla 7 gün)',
+'prefs-watchlist-edits'     => 'Genişletilmiş izleme listesinde gösterilecek değişiklik sayısı:',
+'prefs-watchlist-edits-max' => '(maksimum sayı: 1000)',
+'prefs-misc'                => 'DiÄŸer ayarlar',
+'prefs-resetpass'           => 'Parolayı değiştir',
+'saveprefs'                 => 'DeÄŸiÅŸiklikleri kaydet',
+'resetprefs'                => 'Ayarları ilk durumuna getir',
+'textboxsize'               => 'Sayfa yazma alanı',
+'prefs-edit-boxsize'        => 'DeÄŸiÅŸtirme penceresinin boyutu.',
+'rows'                      => 'Satır',
+'columns'                   => 'Sütun',
+'searchresultshead'         => 'Arama',
+'resultsperpage'            => 'Sayfada gösterilecek bulunan madde sayısı',
+'contextlines'              => 'Bulunan madde için ayrılan satır sayısı',
+'contextchars'              => 'Satırdaki karakter sayısı',
+'stub-threshold'            => '<a href="#" class="stub">Taslak bağlantısı</a> formatı için baraj (byte):',
+'recentchangesdays'         => 'Son değişikliklerde gösterilecek günler:',
+'recentchangesdays-max'     => '(maksimum $1 {{PLURAL:$1|gün|gün}})',
+'recentchangescount'        => 'Son değişiklikler, sayfa geçmişi ve günlüklerde varsayılan olarak gösterilecek değişiklik sayısı',
+'savedprefs'                => 'Ayarlar kaydedildi.',
+'timezonelegend'            => 'Saat dilimi',
+'timezonetext'              => '¹Viki sunucusu (UTC/GMT) ile aranızdaki saat farkı. (Türkiye için +02:00)',
+'localtime'                 => 'Yerel saat:',
+'timezoneselect'            => 'Saat dilimi:',
+'timezoneuseserverdefault'  => 'Sunucu varsayılanını kullan',
+'timezoneuseoffset'         => 'DiÄŸer (ofset belirtin)',
+'timezoneoffset'            => 'Ofset¹:',
+'servertime'                => 'Sunucu saati:',
+'guesstimezone'             => 'Tarayıcınız sizin yerinize doldursun',
+'allowemail'                => 'Diğer kullanıcılar size e-posta atabilsin',
+'prefs-searchoptions'       => 'Arama seçenekleri',
+'prefs-namespaces'          => 'Alan adları',
+'defaultns'                 => 'Aramayı aşağıdaki seçili alanlarda yap.',
+'default'                   => 'orijinal',
+'files'                     => 'Dosyalar',
 
 # User rights
-'userrights'                  => 'Kullanıcı hakları yönetimi.', # Not used as normal message but as header for the special page itself
+'userrights'                  => 'Kullanıcı hakları yönetimi', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Kullanıcı gruplarını düzenle',
 'userrights-user-editname'    => 'Kullanıcı adı giriniz:',
 'editusergroup'               => 'Kullanıcı grupları düzenle',
-'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) kullanıcısının yetkilerini değiştirmektesiniz",
+'editinguser'                 => "'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) kullanıcısının yetkilerini değiştirmektesiniz",
 'userrights-editusergroup'    => 'Kullanıcı grupları düzenle',
 'saveusergroups'              => 'Kullanıcı grupları kaydet',
 'userrights-groupsmember'     => 'İçinde olduğu gruplar:',
+'userrights-groups-help'      => 'Bu kullanıcının içinde olduğu grupları değiştirebilirsiniz:
+* Seçili bir kutu, kullanıcının o gruba dahil olduğu anlamına gelir
+* Seçilmemiş bir kutu, kullanıcının o grupta olmadığı anlamına gelir.
+* *, grubu bir kez oluşturduktan sonra silemeceğinizi belirtir, ya da karşılıklı olarak.',
 'userrights-reason'           => 'DeÄŸiÅŸtirme nedeni:',
 'userrights-no-interwiki'     => 'Diğer vikilerdeki kullanıcıların izinlerini değiştirmeye yetkiniz yok.',
 'userrights-nodatabase'       => '$1 veritabanı mevcut veya bölgesel değil',
@@ -871,39 +1121,83 @@ Bu sayfa deÄŸiÅŸikiliÄŸi kamu arÅŸivlerinden silinmiÅŸtir.
 'userrights-unchangeable-col' => 'DeÄŸiÅŸtirebilmediÄŸiniz gruplar',
 
 # Groups
-'group'            => 'Grup:',
-'group-user'       => 'Kullanıcılar',
-'group-bot'        => 'Botlar',
-'group-sysop'      => 'Hizmetliler',
-'group-bureaucrat' => 'Bürokratlar',
-'group-all'        => '(hepsi)',
-
-'group-user-member'       => 'Kullanıcı',
-'group-bot-member'        => 'Bot',
-'group-sysop-member'      => 'Hizmetli',
-'group-bureaucrat-member' => 'Bürokrat',
-
-'grouppage-user'       => '{{ns:project}}:Kullanıcılar',
-'grouppage-bot'        => '{{ns:project}}:Botlar',
-'grouppage-sysop'      => '{{ns:project}}:Hizmetliler',
-'grouppage-bureaucrat' => '{{ns:project}}:Bürokratlar',
+'group'               => 'Grup:',
+'group-user'          => 'Kullanıcılar',
+'group-autoconfirmed' => 'Otomatik onaylanmış kullanıcılar',
+'group-bot'           => 'Botlar',
+'group-sysop'         => 'Hizmetliler',
+'group-bureaucrat'    => 'Bürokratlar',
+'group-suppress'      => 'Gözetmenler',
+'group-all'           => '(hepsi)',
+
+'group-user-member'          => 'Kullanıcı',
+'group-autoconfirmed-member' => 'Otomatik onaylanmış kullanıcı',
+'group-bot-member'           => 'Bot',
+'group-sysop-member'         => 'Hizmetli',
+'group-bureaucrat-member'    => 'Bürokrat',
+'group-suppress-member'      => 'Gözetmen',
+
+'grouppage-user'          => '{{ns:project}}:Kullanıcılar',
+'grouppage-autoconfirmed' => '{{ns:project}}:Otomatik onaylanmış kullanıcılar',
+'grouppage-bot'           => '{{ns:project}}:Botlar',
+'grouppage-sysop'         => '{{ns:project}}:Hizmetliler',
+'grouppage-bureaucrat'    => '{{ns:project}}:Bürokratlar',
+'grouppage-suppress'      => '{{ns:project}}:Gözetmen',
 
 # Rights
-'right-read'          => 'Sayfaları oku',
-'right-edit'          => 'Sayfaları değiştir',
-'right-createtalk'    => 'Tartışma sayfaları yarat',
-'right-createaccount' => 'Yeni kullanıcı hesapları yarat',
-'right-minoredit'     => 'Değişikliklerini küçük olarak kaydet',
-'right-upload'        => 'Dosyaları yükle',
-'right-upload_by_url' => 'Bir URL adresinden dosya yükle',
-'right-delete'        => 'Sayfaları sil',
-'right-bigdelete'     => 'Uzun tarihli sayfaları sil',
-'right-browsearchive' => 'Silinen sayfaları ara',
-'right-undelete'      => 'Bir sayfanın silinmesini geri al',
-'right-editinterface' => 'Kullanıcı arayüzünü değiştirmek',
-'right-patrol'        => 'DiÄŸerlerinin deÄŸiÅŸikliklerini kontrol edilmiÅŸ olarak iÅŸaretle',
-'right-mergehistory'  => 'Sayfalarının tarihlerini birleştir',
-'right-userrights'    => 'Tüm kullanıcı haklarını değiştirmek',
+'right-read'                 => 'Sayfaları oku',
+'right-edit'                 => 'Sayfaları değiştir',
+'right-createpage'           => 'Sayfa oluştur (tartışma sayfası olmayan)',
+'right-createtalk'           => 'Tartışma sayfaları yarat',
+'right-createaccount'        => 'Yeni kullanıcı hesapları yarat',
+'right-minoredit'            => 'Değişikliklerini küçük olarak kaydet',
+'right-move'                 => 'Sayfaları taşı',
+'right-move-subpages'        => 'Sayfaları altsayfalarıyla beraber taşı',
+'right-move-rootuserpages'   => 'Kök kullanıcı sayfalarını taşı',
+'right-movefile'             => 'Dosyaları taşı',
+'right-suppressredirect'     => 'Bir sayfayı taşırken eski isimden yönlendirme oluşturma',
+'right-upload'               => 'Dosyaları yükle',
+'right-reupload'             => 'Mevcut dosyaların üstüne yaz',
+'right-reupload-own'         => 'Kendisinin yüklediği bir dosyanın üzerine yaz',
+'right-reupload-shared'      => 'Paylaşılan ortam deposundaki dosyaları yerel olarak geçersiz kıl',
+'right-upload_by_url'        => 'Bir URL adresinden dosya yükle',
+'right-purge'                => 'Doğrulama yapmadan bir sayfa için site belleğini temizle',
+'right-autoconfirmed'        => 'Yarı-korunumlu sayfaları değiştir',
+'right-bot'                  => 'Otomatik bir işlem gibi muamele gör',
+'right-nominornewtalk'       => 'Kullanıcı tartışma sayfalarında yaptığı küçük değişiklikler kullanıcıya yeni mesaj bildirimiyle bildirilmez',
+'right-apihighlimits'        => 'API sorgularında yüksek limit kullan',
+'right-writeapi'             => 'API yaz kullanımı',
+'right-delete'               => 'Sayfaları sil',
+'right-bigdelete'            => 'Uzun tarihli sayfaları sil',
+'right-deleterevision'       => 'Sayfaların belirli revizyonlarını sil ve geri yükle',
+'right-deletedhistory'       => 'Silinmiş geçmiş girdilerini gör, ilgili metinleri olmadan',
+'right-browsearchive'        => 'Silinen sayfaları ara',
+'right-undelete'             => 'Bir sayfanın silinmesini geri al',
+'right-suppressrevision'     => 'Sysoplardan gizlenmiş revizyonları gözden geçir ve geri yükle',
+'right-suppressionlog'       => 'Özel günlükleri gör',
+'right-block'                => 'Diğer kullanıcıların değişiklik yapmalarını engelle',
+'right-blockemail'           => 'Bir kullanıcının e-posta göndermesini engelle',
+'right-hideuser'             => 'Bir kullanıcı adını engelle, genelden gizleyerek',
+'right-ipblock-exempt'       => 'IP engellemelerini atla, otomatik engelle ve aralık engellemeleri',
+'right-proxyunbannable'      => 'Proxylerin otomatik engellemelerini atla',
+'right-protect'              => 'Koruma seviyelerini değiştir ve korumalı sayfalarda değişiklik yap',
+'right-editprotected'        => 'Korumalı sayfalarda değişiklik yap (korumayı basamaklamadan)',
+'right-editinterface'        => 'Kullanıcı arayüzünü değiştirmek',
+'right-editusercssjs'        => 'Diğer kullanıcıların CSS ve JS dosyalarında değişiklik yap',
+'right-rollback'             => 'Belirli bir sayfayı değiştiren son kullanıcının değişikliklerini hızlıca geri döndür',
+'right-markbotedits'         => 'Geri döndürülen değişiklikleri, bot değişiklikleri olarak işaretle',
+'right-noratelimit'          => 'Derecelendirme sınırlamalarından etkilenme',
+'right-import'               => 'Diğer vikilerden sayfaları içeri aktar',
+'right-importupload'         => 'Bir dosya yüklemesinden sayfaları içeri aktar',
+'right-patrol'               => 'DiÄŸerlerinin deÄŸiÅŸikliklerini kontrol edilmiÅŸ olarak iÅŸaretle',
+'right-autopatrol'           => 'Kişinin kendi değişikliklerinin otomatikman denetlendi olarak işaretlenmiş olması',
+'right-patrolmarks'          => 'Son değişiklikler gözleme işaretlerini gör',
+'right-unwatchedpages'       => 'İzlenmeyen sayfaların bir listesini gör',
+'right-trackback'            => 'Bir geri izleme gönder',
+'right-mergehistory'         => 'Sayfalarının tarihlerini birleştir',
+'right-userrights'           => 'Tüm kullanıcı haklarını değiştirmek',
+'right-userrights-interwiki' => 'Diğer vikilerdeki kullanıcıların kullanıcı haklarını değiştir',
+'right-siteadmin'            => 'Veritabanını kilitle ve kilidi aç',
 
 # User rights log
 'rightslog'      => 'Kullanıcı hakları kayıtları',
@@ -911,9 +1205,46 @@ Bu sayfa deÄŸiÅŸikiliÄŸi kamu arÅŸivlerinden silinmiÅŸtir.
 'rightslogentry' => '$1 in yetkileri $2 iken $3 olarak deÄŸiÅŸtirildi',
 'rightsnone'     => '(hiçbiri)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'bu sayfayı okumaya',
+'action-edit'                 => 'bu sayfayı değiştirmeye',
+'action-createpage'           => 'sayfa oluÅŸturmaya',
+'action-createtalk'           => 'tartışma sayfası oluşturmaya',
+'action-createaccount'        => 'bu kullanıcı hesabını oluşturmaya',
+'action-minoredit'            => 'bu değişikliği küçük olarak işaretlemeye',
+'action-move'                 => 'bu sayfayı taşımaya',
+'action-move-subpages'        => 'bu sayfayı ve altsayfalarını taşımaya',
+'action-move-rootuserpages'   => 'kök kullanıcı sayfalarını taşımaya',
+'action-movefile'             => 'bu dosyayı taşımaya',
+'action-upload'               => 'bu dosyayı yüklemeye',
+'action-reupload'             => 'bu mevcut dosyanın üzerine yazmaya',
+'action-reupload-shared'      => 'paylaşılan bir depoda bu dosyayı geçersiz kılmaya',
+'action-upload_by_url'        => 'bir URL adresinden bu dosyayı yüklemeye',
+'action-writeapi'             => 'API yaz kullanmaya',
+'action-delete'               => 'bu sayfayı silmeye',
+'action-deleterevision'       => 'bu revizyonu silmeye',
+'action-deletedhistory'       => 'bu sayfanın silinme geçmişini görmeye',
+'action-browsearchive'        => 'silinen sayfaları aramaya',
+'action-undelete'             => 'bu sayfanın silme işlemini geri almaya',
+'action-suppressrevision'     => 'bu gizli revizyonu gözden geçirip geri yüklemeye',
+'action-suppressionlog'       => 'bu özel günlüğü görmeye',
+'action-block'                => 'bu kullanıcının değişiklik yapmasını engellemeye',
+'action-protect'              => 'bu sayfa için koruma düzeylerini değiştirmeye',
+'action-import'               => 'bu sayfayı bir başka vikiden içeri aktarmaya',
+'action-importupload'         => 'bu sayfayı bir dosya yüklemesinden içeri aktarmaya',
+'action-patrol'               => 'diğerlerinin değişikliğini gözlenmiş olarak işaretlemeye',
+'action-autopatrol'           => 'değişikliğinizi gözlenmiş olarak işaretlemeye',
+'action-unwatchedpages'       => 'izlenmeyen sayfalar listesini görmeye',
+'action-trackback'            => 'bir geri izleme göndermeye',
+'action-mergehistory'         => 'bu sayfanın geçmişini birleştirmeye',
+'action-userrights'           => 'tüm kullanıcıların haklarını değiştirmeye',
+'action-userrights-interwiki' => 'diğer vikilerde kullanıcıların, kullanıcı haklarını değiştirmeye',
+'action-siteadmin'            => 'veritabanını kilitleyip açmaya',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|deÄŸiÅŸiklik|deÄŸiÅŸiklik}}',
 'recentchanges'                     => 'Son deÄŸiÅŸiklikler',
+'recentchanges-legend'              => 'Son değişiklikler seçenekleri',
 'recentchangestext'                 => 'Yapılan en son değişiklikleri bu sayfadan izleyin.',
 'recentchanges-feed-description'    => "Bu beslemedeki viki'de yapılan en son değişiklikleri takip edin.",
 'rcnote'                            => "$4 tarihi ve saat $5 itibarı ile, son {{PLURAL:$2|1 günde|'''$2''' günde}} yapılan, {{PLURAL:$1|'''1''' değişiklik|'''$1''' değişiklik}}, aşağıdadır.",
@@ -929,21 +1260,25 @@ Bu sayfa deÄŸiÅŸikiliÄŸi kamu arÅŸivlerinden silinmiÅŸtir.
 'diff'                              => 'fark',
 'hist'                              => 'geçmiş',
 'hide'                              => 'gizle',
-'show'                              => 'Göster',
+'show'                              => 'göster',
 'minoreditletter'                   => 'K',
 'newpageletter'                     => 'Y',
 'boteditletter'                     => 'b',
 'number_of_watching_users_pageview' => '[$1 izlenilen {{PLURAL:$1|kullanıcı|kullanıcı}}]',
+'rc_categories'                     => 'Kategorilere sınırla ("|" ile ayır)',
 'rc_categories_any'                 => 'Herhangi',
 'newsectionsummary'                 => '/* $1 */ yeni başlık',
+'rc-enhanced-expand'                => 'Ayrıntıları göster (JavaScript gerekir)',
+'rc-enhanced-hide'                  => 'Ayrıntıları gizle',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Ä°lgili deÄŸiÅŸiklikler',
 'recentchangeslinked-title'    => '"$1" ile iliÅŸkili deÄŸiÅŸiklikler',
-'recentchangeslinked-noresult' => 'Verilen süre içerisinde belirtilen sayfaya bağlı diğer sayfalarda değişikilik bulunmamaktadır.',
+'recentchangeslinked-noresult' => 'Verilen süre içerisinde belirtilen sayfaya bağlı diğer sayfalarda değişiklik bulunmamaktadır.',
 'recentchangeslinked-summary'  => "Aşağıdaki liste, belirtilen sayfaya (ya da belirtilen kategorinin üyelerine) bağlantı veren sayfalarda yapılan son değişikliklerin listesidir.
 [[Special:Watchlist|İzleme listenizdeki]] sayfalar '''kalın''' yazıyla belirtilmiştir.",
 'recentchangeslinked-page'     => 'Sayfa adı:',
+'recentchangeslinked-to'       => 'Verilen sayfa yerine verilen sayfaya bağlantı vermiş olan sayfaları göster',
 
 # Upload
 'upload'                      => 'Dosya yükle',
@@ -952,23 +1287,22 @@ Bu sayfa deÄŸiÅŸikiliÄŸi kamu arÅŸivlerinden silinmiÅŸtir.
 'reuploaddesc'                => 'Yükleme formuna geri dön.',
 'uploadnologin'               => 'Oturum açık değil',
 'uploadnologintext'           => 'Dosya yükleyebilmek için [[Special:UserLogin|oturum aç]]manız gerekiyor.',
+'upload_directory_missing'    => 'Yükleme dizini ($1) kayıp ve websunucusu tarafından oluşturulamıyor.',
 'upload_directory_read_only'  => 'Dosya yükleme dizinine ($1) web sunucusunun yazma izni yok.',
 'uploaderror'                 => 'Yükleme hatası',
-'uploadtext'                  => "Dosya yüklemek için aşağıdaki formu kullanın,
-Önceden yüklenmiş resimleri görmek için  [[Special:ImageList|resim listesine]] bakın,
-yüklenenler ve silinmişler [[Special:Log/upload|yükleme kaydı sayfasında da]] görülebilir.
-
-Sayfaya resim koymak için formdaki linklerdimelerşi kullanın;
-*'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Örnek.jpg]]</nowiki>'''
-*'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Örnek.png|açıklama]]</nowiki>'''
-veya doğrudan bağlantı için
-*'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Örnek.ogg]]</nowiki>'''",
+'uploadtext'                  => "Dosya yüklemek için aşağıdaki formu kullanın.
+Önceden yüklenmiş dosyaları görmek ya da aramak için [[Special:FileList|yüklenmiş dosyalar listesine]] bakın, (tekrar) yüklenenler [[Special:Log/upload|yükleme günlüğü]]nde, silinenler [[Special:Log/delete|silinme günlüğü]]nde tutulumaktadır.
+
+Bir sayfaya dosya koymak için bağlantınızda aşağıdaki formlardan birini kullanın;
+* Dosyanın tam sürümünü kullanmak için: '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Dosya.jpg]]</nowiki></tt>'''
+* Sol kenarda bir kutu içinde, altında tanım olarak 'alt metin' ile, 200 piksel genişiğindeki sürümü kullanmak için: '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Dosya.png|200px|thumb|left|alt metin]]</nowiki></tt>'''
+* Dosyayı göstermeden, dosyaya direk bağlantı vermek için: '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Dosya.ogg]]</nowiki></tt>'''",
 'upload-permitted'            => 'İzin verilen dosya türleri: $1.',
 'upload-preferred'            => 'Tercih edilen dosya türleri: $1.',
 'upload-prohibited'           => 'Yasaklanan dosya türleri: $1.',
 'uploadlog'                   => 'yükleme kaydı',
 'uploadlogpage'               => 'Dosya yükleme kayıtları',
-'uploadlogpagetext'           => 'Aşağıda en son eklenen [[Special:NewImages|dosyaların bir listesi]] bulunmaktadır.',
+'uploadlogpagetext'           => 'Aşağıda en son eklenen [[Special:NewFiles|dosyaların bir listesi]] bulunmaktadır.',
 'filename'                    => 'Dosya adı',
 'filedesc'                    => 'Dosya ile ilgili açıklama',
 'fileuploadsummary'           => 'Açıklama:',
@@ -980,22 +1314,46 @@ veya doğrudan bağlantı için
 'minlength1'                  => 'Dosya adı en az bir harften oluşmalıdır.',
 'illegalfilename'             => '"$1" dosya adı bazı kullanılmayan karekterler içermektedir. Lütfen, yeni bir dosya adıyla tekrar deneyin.',
 'badfilename'                 => 'Görüntü dosyasının ismi "$1" olarak değiştirildi.',
+'filetype-badmime'            => '"$1" MIME tipindeki dosyaların yüklenmesine izin verilmez.',
+'filetype-bad-ie-mime'        => 'Bu dosya yüklenemez; çünkü Internet Explorer bunu, izin verilmeyen ve potansiyel zararlı dosya türü olan "$1" olarak tespit etmektedir.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' istenmeyen bir dosya türüdür.  Önerilen {{PLURAL:\$3|dosya türü|dosya türleri}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' izin verilen bir dosya türü değil. İzin verilen {{PLURAL:\$3|dosya türü|dosya türleri}} \$2.",
 'filetype-missing'            => 'Dosyanın hiçbir uzantısı yok (".jpg" gibi).',
+'large-file'                  => 'Dosyaların $1 boyutundan daha büyük olmaması önerilmektedir;
+bu dosyanın boyutu $2.',
 'largefileserver'             => 'Bu dosyanın uzunluğu sunucuda izin verilenden daha büyüktür.',
 'emptyfile'                   => 'Yüklediğiniz dosya boş görünüyor. Bunun sebebi dosya adındaki bir yazım hatası olabilir. Lütfen dosyayı gerçekten tyüklemek isteyip istemediğinizden emin olun.',
-'fileexists'                  => 'Bu isimde bir dosya mevcut. Eğer değiştirmekten emin değilseniz ilk önce <strong><tt>$1</tt></strong> dosyasına bir gözatın.',
+'fileexists'                  => "Bu isimde bir dosya mevcut. Eğer değiştirmekten emin değilseniz ilk önce '''<tt>$1</tt>''' dosyasına bir gözatın.",
+'filepageexists'              => "Bu dosya için açıklama sayfası '''<tt>$1</tt>''' adresinde zaten oluşturulmuş, fakat bu isimde bir dosya şu anda mevcut değil.
+Gireceğiniz özet açıklama sayfasında görünmeyecektir.
+Özetinizin orada görünmesi için, bunu elle değiştirmelisiniz",
+'fileexists-extension'        => "Benzer isimle baÅŸka bir dosya mevcut:<br />
+Yüklenilen dosyanın adı: '''<tt>$1</tt>'''<br />
+Varolan dosyanın adı: '''<tt>$2</tt>'''<br />
+Lütfen başka bir isim seçin",
 'fileexists-thumb'            => "<center>'''Bu isimde zaten bir resim var'''</center>",
-'fileexists-forbidden'        => 'Bu isimde zaten dosya var; lütfen farklı bir isimle yeniden yükleyin. [[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Bu isimde bir dosya ortak havuzda zaten mevcut; lütfen geri gidip dosyayı yeni bir isimle yükleyiniz. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "The file seems to be an image of reduced size ''(thumbnail)''.
+Please check the file '''<tt>$1</tt>'''.<br />
+If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.
+Bu dosya, bir resmi küçültülmüş vesiyonu gibi görünüyor ''(thumbnail)''
+Lütfen '''<tt>$1</tt>''' dosyasını kontrol edin .<br />
+Eğer kontrol edilen dosya ile orijinal boyutundaki aynı dosyaysa fazladan pul imge yüklemeye gerek yoktur.",
+'file-thumbnail-no'           => "Bu dosyanın adı '''<tt>$1</tt>''' ile başlıyor.
+Bu başka bir resim küçültülmüş versiyonuna benziyor ''(thumbnail)''
+Eğer sizde bu resmin tam çöznürlükteki versiyonu varsa onu yükleyin, aksi takdirde lütfen dosya adını değiştirin.",
+'fileexists-forbidden'        => 'Bu isimde bir dosya zaten var, ve üzerine yazılamıyor.
+Dosyanızı yinede yüklemek istiyorsanız, lütfen geri dönüp yeni bir isim kullanın. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Bu isimde bir dosya ortak havuzda zaten mevcut.
+Dosyanızı yinede yüklemek istiyorsanız, lütfen geri gidip yeni bir isim kullanın. [[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'Bu dosya aşağıdaki {{PLURAL:$1|dosyanın|dosyaların}} kopyasıdır:',
+'file-deleted-duplicate'      => 'Bu dosyanın özdeşi olan başka bir dosya ([[$1]]) daha önceden silindi. Bu dosyayı yeniden yüklemeden önce diğer dosyanın silme kayıtlarını kontrol etmelisiniz.',
 'successfulupload'            => 'Yükleme başarılı',
 'uploadwarning'               => 'Yükleme uyarısı',
 'savefile'                    => 'Dosyayı kaydet',
 'uploadedimage'               => 'Yüklenen: "[[$1]]"',
 'overwroteimage'              => '"[[$1]]" resminin yeni versiyonu yüklenmiştir',
 'uploaddisabled'              => 'Geçici olarak şu anda herhangi bir dosya yüklenmez. Biraz sonra bir daha deneyiniz.',
-'uploaddisabledtext'          => '{{SITENAME}} sitesinde dosya yüklemeleri devredışı bırakılmıştır.',
+'uploaddisabledtext'          => 'Dosya yüklemeleri devredışı bırakılmıştır.',
 'uploadscripted'              => 'Bu dosya bir internet tarayıcısı tarafından hatalı çevrilebilecek bir HTML veya script kodu içermektedir.',
 'uploadcorrupt'               => 'Bu dosya ya bozuk ya da uzantısı yanlış. Dosyayı kontrol edip, tekrar yüklemeyi deneyin.',
 'uploadvirus'                 => 'Bu dosya virüslüdür! Detayları: $1',
@@ -1008,14 +1366,41 @@ veya doğrudan bağlantı için
 
 Dosyanın yüklenmesinin uygun olup olmadığını dikkate almalısınız.
 Bu dosyanın silme kayıtları kolaylık olması için burada sunulmuştur:",
-
-'upload-proto-error' => 'Hatalı protokol',
-'upload-file-error'  => 'Dahili hata',
-'upload-misc-error'  => 'Bilinmeyen yükleme hatası',
+'filename-bad-prefix'         => "Yüklemekte olçduğunuz dosyanın adı, genel olarak dijital kameralar tarafından otomatik olarak ekelenen ve açıklayıcı olmayan '''\"\$1\"''' ile başlamaktadır.
+Lütfen dosyanız için daha açıklayıcı bir isim seçin.",
+'filename-prefix-blacklist'   => ' #<!-- leave this line exactly as it is --> <pre>
+# Syntax is as follows:
+#   * Everything from a "#" character to the end of the line is a comment
+#   * Every non-blank line is a prefix for typical file names assigned automatically by digital cameras
+CIMG # Casio
+DSC_ # Nikon
+DSCF # Fuji
+DSCN # Nikon
+DUW # some mobile phones
+IMG # generic
+JD # Jenoptik
+MGP # Pentax
+PICT # misc.
+ #</pre> <!-- leave this line exactly as it is -->',
+
+'upload-proto-error'      => 'Hatalı protokol',
+'upload-proto-error-text' => "Uzaktan yükleme, <code>http://</code> veya <code>ftp://</code> ile başlayan URL'ler gerektirmektedir.",
+'upload-file-error'       => 'Dahili hata',
+'upload-file-error-text'  => 'Sunucuda geçici dosya oluşturma girişimi sırasında bir iç hata meydana geldi.
+Lütfen bir [[Special:ListUsers/sysop|yonetici]]yle iletişime geçin.',
+'upload-misc-error'       => 'Bilinmeyen yükleme hatası',
+'upload-misc-error-text'  => 'Yükleme sırasında bilinmeyen bir hata meydana geldi.
+Lütfen bağlantının geçerli ve ulaşılabilir olduğunu doğrulayın ve yeniden deneyin.
+Eğer problem tekrarlanırsa, bir [[Special:ListUsers/sysop|yönetici]]yle temasa geçin',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
-'upload-curl-error6'  => "URL'ye ulaşılamadı",
-'upload-curl-error28' => 'Yüklemede zaman aşımı',
+'upload-curl-error6'       => "URL'ye ulaşılamadı",
+'upload-curl-error6-text'  => "Belirtilen URL'ye eriÅŸilemiyor.
+Lütfen URL'nin doğru ve sitenin açık olduğunu kontrol edin.",
+'upload-curl-error28'      => 'Yüklemede zaman aşımı',
+'upload-curl-error28-text' => 'Bu sitenin yanıt vermesi çok uzun sürüyor.
+Lütfen sitenin açık olduğunu kontrol edin, kısa bir süre bekleyin ve yeniden deneyin.
+Sitenin daha az meÅŸgul olduÄŸu bir zamanda denemek daha iyi olabilir.',
 
 'license'            => 'Lisans:',
 'nolicense'          => 'Hiçbirini seçme',
@@ -1023,17 +1408,21 @@ Bu dosyanın silme kayıtları kolaylık olması için burada sunulmuştur:",
 'upload_source_url'  => ' (geçerli, herkesin ulaşabileceği bir URL)',
 'upload_source_file' => ' (bilgisayarınızdaki bir dosya)',
 
-# Special:ImageList
-'imagelist_search_for'  => 'Medya adı ara:',
+# Special:ListFiles
+'listfiles-summary'     => 'Bu özel sayfa yüklenilen tüm resimleri gösterir.
+Varsayılan olarak en son yüklenen resimler listenin başında gösterilir.
+Bir sütünun başlığına tıklayarak sıralamayı değiştirebilirsiniz.',
+'listfiles_search_for'  => 'Medya adı ara:',
 'imgfile'               => 'dosya',
-'imagelist'             => 'Resim listesi',
-'imagelist_date'        => 'Tarih',
-'imagelist_name'        => 'Ad',
-'imagelist_user'        => 'Kullanıcı',
-'imagelist_size'        => 'Boyut (bayt)',
-'imagelist_description' => 'Tanım',
-
-# Image description page
+'listfiles'             => 'Resim listesi',
+'listfiles_date'        => 'Tarih',
+'listfiles_name'        => 'Ad',
+'listfiles_user'        => 'Kullanıcı',
+'listfiles_size'        => 'Boyut (bayt)',
+'listfiles_description' => 'Tanım',
+'listfiles_count'       => 'Sürümler',
+
+# File description page
 'filehist'                       => 'Dosya geçmişi',
 'filehist-help'                  => 'Dosyanın geçmişini görebilmek için Gün/Zaman bölümündeki tarihleri tıklayınız.',
 'filehist-deleteall'             => 'Hepsini sil',
@@ -1041,36 +1430,56 @@ Bu dosyanın silme kayıtları kolaylık olması için burada sunulmuştur:",
 'filehist-revert'                => 'geri al',
 'filehist-current'               => 'Åžimdiki',
 'filehist-datetime'              => 'Gün/Zaman',
+'filehist-thumb'                 => 'Küçük resim',
+'filehist-thumbtext'             => '$1 tarihindeki versiyonun küçültülmüş hali',
+'filehist-nothumb'               => 'Küçük resim yok',
 'filehist-user'                  => 'Kullanıcı',
 'filehist-dimensions'            => 'Boyutlar',
 'filehist-filesize'              => 'Dosya boyutu',
 'filehist-comment'               => 'Açıklama',
-'imagelinks'                     => 'Kullanıldığı sayfalar',
+'imagelinks'                     => 'Dosya bağlantıları',
 'linkstoimage'                   => 'Bu görüntü dosyasına bağlantısı olan {{PLURAL:$1|sayfa|$1 sayfa}}:',
+'linkstoimage-more'              => "$1'den fazla {{PLURAL:$1|sayfa|sayfa}} bu dosyaya bağlantı veriyor.
+Sıradaki liste sadece bu dosyaya bağlantı veren {{PLURAL:$1|ilk dosyayı|ilk $1 dosyayı}} gösteriyor.
+[[Special:WhatLinksHere/$2|Tam bir liste]] mevcuttur.",
 'nolinkstoimage'                 => 'Bu görüntü dosyasına bağlanan sayfa yok.',
+'morelinkstoimage'               => 'Bu dosyaya [[Special:WhatLinksHere/$1|daha fazla bağlantıları]] gör.',
+'redirectstofile'                => 'Şu {{PLURAL:$1|dosya|$1 dosya}}, bu dosyaya yönlendiriyor:',
+'duplicatesoffile'               => 'Şu {{PLURAL:$1|dosya|$1 dosya}}, bu dosyanın kopyası ([[Special:FileDuplicateSearch/$2|daha fazla ayrıntı]]):',
 'sharedupload'                   => 'Bu dosya ortak alana yüklenmiştir ve diğer projelerde de kullanılıyor olabilir.',
 'shareduploadwiki'               => 'Lütfen daha fazla bilgi için $1 sayfasına bakın.',
+'shareduploadwiki-desc'          => '$1ndaki açıklaması aşağıda gösterilmektedir.',
 'shareduploadwiki-linktext'      => 'dosya açıklama sayfası',
+'shareduploadduplicate'          => 'Bu dosya paylaşılan depodan $1 ile aynıdır.',
 'shareduploadduplicate-linktext' => 'baÅŸka dosya',
+'shareduploadconflict'           => 'Bu dosya ortak havuzdan $1 ile aynı ada sahip.',
 'shareduploadconflict-linktext'  => 'baÅŸka dosya',
 'noimage'                        => 'Bu isimde dosya yok. Siz $1.',
 'noimage-linktext'               => 'yükleyebilirsiniz',
 'uploadnewversion-linktext'      => 'Dosyanın yenisini yükleyin',
+'imagepage-searchdupe'           => 'Eş dosyaları ara',
 
 # File reversion
-'filerevert'         => '$1 dosyasını eski haline döndür',
-'filerevert-legend'  => 'Dosyayı eski haline döndür',
-'filerevert-comment' => 'Yorum:',
-'filerevert-submit'  => 'Eski haline döndür',
+'filerevert'                => '$1 dosyasını eski haline döndür',
+'filerevert-legend'         => 'Dosyayı eski haline döndür',
+'filerevert-intro'          => "'''[[Media:$1|$1]]''' medyasının [$4 $3, $2 tarihli versiyonu]nu geri getiriyorsunuz.",
+'filerevert-comment'        => 'Yorum:',
+'filerevert-defaultcomment' => '$2, $1 tarihli sürüme geri döndürüldü',
+'filerevert-submit'         => 'Eski haline döndür',
+'filerevert-success'        => "'''[[Media:$1|$1]]''' dosyası [$4 $3, $2 tarihli sürüme] geri döndürüldü.",
+'filerevert-badversion'     => 'Bu dosyanın verilen zaman bilgisine sahip önceki bir yerel sürümü yok.',
 
 # File deletion
 'filedelete'                  => 'Sil $1',
 'filedelete-legend'           => 'Dosya sil',
-'filedelete-intro'            => "'''[[Media:$1|$1]]''' dosyasını silmektesiniz.",
+'filedelete-intro'            => "'''[[Media:$1|$1]]''' dosyasını tüm geçmişiyle birlikte silmek üzeresiniz.",
+'filedelete-intro-old'        => "'''[[Media:$1|$1]]''' dosyasının [$4 $3, $2] tarihli sürümünü siliyorsunuz.",
 'filedelete-comment'          => 'Silinme sebebi:',
 'filedelete-submit'           => 'Sil',
 'filedelete-success'          => "'''$1''' silindi.",
-'filedelete-nofile'           => "{{SITENAME}} üzerinde '''$1''' mevcut değildir.",
+'filedelete-success-old'      => "'''[[Media:$1|$1]]''' dosyasının $3, $2 tarihli sürümü silindi.",
+'filedelete-nofile'           => "'''$1''' mevcut deÄŸildir.",
+'filedelete-nofile-old'       => "'''$1''' için belirtilen niteliklerde arşivlenmiş bir sürüm yok.",
 'filedelete-otherreason'      => 'Diğer/ilave gerekçe:',
 'filedelete-reason-otherlist' => 'BaÅŸka sebeb',
 'filedelete-reason-dropdown'  => '*Genel silme gerekçeleri
@@ -1079,9 +1488,11 @@ Bu dosyanın silme kayıtları kolaylık olması için burada sunulmuştur:",
 'filedelete-edit-reasonlist'  => 'Silme nedenlerini deÄŸiÅŸtir',
 
 # MIME search
-'mimesearch' => 'MIME araması',
-'mimetype'   => 'MIME tipi:',
-'download'   => 'yükle',
+'mimesearch'         => 'MIME araması',
+'mimesearch-summary' => 'Bu sayfa dosyaların MIME-tiplerine göre süzülmesine olanak sağlar.
+Girdi: contenttype/subtype, ör: <tt>resim/jpeg</tt>.',
+'mimetype'           => 'MIME tipi:',
+'download'           => 'yükle',
 
 # Unwatched pages
 'unwatchedpages' => 'Ä°zlenmeyen sayfalar',
@@ -1091,47 +1502,54 @@ Bu dosyanın silme kayıtları kolaylık olması için burada sunulmuştur:",
 
 # Unused templates
 'unusedtemplates'     => 'Kullanılmayan şablonlar',
-'unusedtemplatestext' => 'Bu sayfa şablon alan adında bulunan ve diğer sayfalara eklenmemiş olan şablonları göstermektedir. Şablonlara olan diğer bağlantıları da kontrol etmeden silmeyiniz.',
+'unusedtemplatestext' => 'Bu sayfa, {{ns:template}} alan adında bulunan ve diğer sayfalara eklenmemiş olan sayfaları listeler. Şablonlara olan diğer bağlantıları da kontrol etmeden silmeyiniz.',
 'unusedtemplateswlh'  => 'diğer bağlantılar',
 
 # Random page
-'randompage' => 'Rastgele sayfa',
+'randompage'         => 'Rastgele sayfa',
+'randompage-nopages' => '"$1" ad alanında hiç bir sayfa yok.',
 
 # Random redirect
-'randomredirect' => 'Rastgele yönlendirme',
+'randomredirect'         => 'Rastgele yönlendirme',
+'randomredirect-nopages' => '"$1" ad alanında hiç bir yönlendirme yok.',
 
 # Statistics
-'statistics'             => 'Ä°statistikler',
-'sitestats'              => '{{SITENAME}} sitesi istatistikleri',
-'userstats'              => 'Kullanıcı istatistikleri',
-'sitestatstext'          => "{{SITENAME}} sitesinde şu anda '''\$2''' geçerli sayfa mevcuttur.
-
-Bu sayıya; \"yönlendirme\", \"tartışma\", \"resim\", \"kullanıcı\", \"yardım\", \"{{SITENAME}}\", \"şablon\" alanlarındakiler ve iç bağlantı içermeyen maddeler dahil değildir. Geçerli madde sayısına bu sayfaların sayısı eklendiğinde ise toplam '''\$1''' sayfa mevcuttur.
-
-\$8 tane dosya yüklenmiştir.
-
-Site kurulduğundan bu güne kadar toplam '''\$4''' sayfa değişikliği ve sayfa başına ortalama '''\$5''' katkı olmuştur.
-
-Toplam sayfa görüntülenme sayısı '''\$3''', değişiklik başına görüntüleme sayısı '''\$6''' olmuştur.
-
-Şu andaki [http://www.mediawiki.org/wiki/Manual:Job_queue iş kuyruğu] sayısı '''\$7'''.",
-'userstatstext'          => "'''$1''' kayıtlı [[Special:ListUsers|kullanıcı]] var. Bunlardan '''$2''' tanesi (ya da '''$4%''') $5 haklarına sahiptir.",
-'statistics-mostpopular' => 'En popüler maddeler',
+'statistics'                   => 'Ä°statistikler',
+'statistics-header-pages'      => 'Sayfa istatistikleri',
+'statistics-header-edits'      => 'DeÄŸiÅŸiklik istatistikleri',
+'statistics-header-views'      => 'Görüntüleme istatistikleri',
+'statistics-header-users'      => 'Kullanıcı istatistikleri',
+'statistics-articles'          => 'Maddeler',
+'statistics-pages'             => 'Sayfalar',
+'statistics-pages-desc'        => 'Vikipedideki tüm sayfalar, tartışma sayfaları, yönlendirmeler vs.',
+'statistics-files'             => 'Yüklenmiş dosyalar',
+'statistics-edits'             => '{{SITENAME}} kurulduğundan beri yapılan sayfa değişiklikleri',
+'statistics-edits-average'     => 'Her sayfadaki ortalama deÄŸiÅŸiklik',
+'statistics-views-total'       => 'Toplam görüntüleme',
+'statistics-views-peredit'     => 'Değişiklik başına görüntüleme',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue İş sırası] uzunluğu',
+'statistics-users'             => 'Kayıtlı [[Special:ListUsers|kullanıcılar]]',
+'statistics-users-active'      => 'Aktif kullanıcılar',
+'statistics-users-active-desc' => 'Son {{PLURAL:$1|1 günde|$1 günde}} çalışma yapan kullanıcılar',
+'statistics-mostpopular'       => 'En popüler maddeler',
 
 'disambiguations'      => 'Anlam ayrım sayfaları',
 'disambiguationspage'  => 'Template:Anlam ayrımı',
 'disambiguations-text' => 'İlk satırda yer alan sayfalar bir anlam ayrım sayfasına iç bağlantı olduğunu gösterir. İkinci sırada yer alan sayfalar anlam ayrım sayfalarını gösterir. <br />Burada [[MediaWiki:Disambiguationspage]] tüm anlam ayrım şablonlarına bağlantılar verilmesi gerekmektedir.',
 
-'doubleredirects'     => 'Yönlendirmeye olan yönlendirmeler',
-'doubleredirectstext' => 'Her satır, ikinci yönlendirme metninin ilk satırının (genellikle ikinci yönlendirmenin de işaret etmesi gereken "asıl" hedefin) yanısıra ilk ve ikinci yönlendirmeye bağlantılar içerir.',
+'doubleredirects'            => 'Yönlendirmeye olan yönlendirmeler',
+'doubleredirectstext'        => 'Her satır, ikinci yönlendirme metninin ilk satırının (genellikle ikinci yönlendirmenin de işaret etmesi gereken "asıl" hedefin) yanısıra ilk ve ikinci yönlendirmeye bağlantılar içerir.',
+'double-redirect-fixed-move' => '[[$1]] taşındı, artık [[$2]] sayfasına yönlendiriyor',
+'double-redirect-fixer'      => 'Yönlendirme tamircisi',
 
 'brokenredirects'        => 'Varolmayan maddeye yapılmış yönlendirmeler',
-'brokenredirectstext'    => 'Bu sayfa mevcut olmayan sayfalara yönlendirme içeren bozuk sayfaları listeler.',
+'brokenredirectstext'    => 'Aşağıdaki yönlendirmeler varolmayan sayfalara bağlantı veriyor:',
 'brokenredirects-edit'   => '(deÄŸiÅŸtir)',
 'brokenredirects-delete' => '(sil)',
 
 'withoutinterwiki'         => 'Diğer dillere bağlantısı olmayan sayfalar',
 'withoutinterwiki-summary' => 'Aşağıda listelenen sayfalar diğer dillere bağlantı içermemektedir:',
+'withoutinterwiki-legend'  => 'Önek',
 'withoutinterwiki-submit'  => 'Göster',
 
 'fewestrevisions' => 'En az düzenleme yapılmış sayfalar',
@@ -1143,7 +1561,9 @@ Toplam sayfa görüntülenme sayısı '''\$3''', deÄŸiÅŸiklik başına görüntÃ
 'nmembers'                => '{{PLURAL:$1|üye|üyeler}}',
 'nrevisions'              => '{{PLURAL:$1|deÄŸiÅŸiklik|deÄŸiÅŸiklikler}}',
 'nviews'                  => '$1 {{PLURAL:$1|görünüm|görünüm}}',
+'specialpage-empty'       => 'Bu rapor için hiç sonuç yok.',
 'lonelypages'             => 'Kendisine hiç bağlantı olmayan sayfalar',
+'lonelypagestext'         => 'Aşağıdaki sayfalara {{SITENAME}} sitesindeki diğer sayfalardan bağlantı verilmemiş yada çapraz dahil edilmemişler.',
 'uncategorizedpages'      => 'Herhangi bir kategoride olmayan sayfalar',
 'uncategorizedcategories' => 'Herhangi bir kategoride olmayan kategoriler',
 'uncategorizedimages'     => 'Herhangi bir kategoride olmayan resimler',
@@ -1153,46 +1573,59 @@ Toplam sayfa görüntülenme sayısı '''\$3''', deÄŸiÅŸiklik başına görüntÃ
 'popularpages'            => 'Popüler sayfalar',
 'wantedcategories'        => 'Ä°stenen kategoriler',
 'wantedpages'             => 'Ä°stenen sayfalar',
-'missingfiles'            => 'Eksik dosyalar',
+'wantedfiles'             => 'Ä°stenen dosyalar',
+'wantedtemplates'         => 'Ä°stenen ÅŸablonlar',
 'mostlinked'              => 'Kendisine en fazla bağlantı verilmiş sayfalar',
 'mostlinkedcategories'    => 'En çok maddeye sahip kategoriler',
 'mostlinkedtemplates'     => 'En çok kullanılan şablonlar',
 'mostcategories'          => 'En fazla kategoriye bağlanmış sayfalar',
 'mostimages'              => 'En çok kullanılan resimler',
 'mostrevisions'           => 'En çok değişikliğe uğramış sayfalar',
-'prefixindex'             => 'Önek girerek listeleme',
+'prefixindex'             => 'Önek ile tüm sayfalar',
 'shortpages'              => 'Kısa sayfalar',
 'longpages'               => 'Uzun sayfalar',
 'deadendpages'            => 'Başka sayfalara bağlantısı olmayan sayfalar',
-'deadendpagestext'        => 'Bu sayfa, diğer sayfalara bağlantısı olmayan sayfaları listeler.',
+'deadendpagestext'        => 'Aşağıdaki sayfalar, {{SITENAME}} sitesinde diğer sayfalara bağlantı vermiyor.',
 'protectedpages'          => 'Koruma altındaki sayfalar',
 'protectedpages-indef'    => 'Sadece süresiz korumalar',
+'protectedpages-cascade'  => 'Sadece ardışık korumalar',
 'protectedpagestext'      => 'Aşağıdaki sayfalar koruma altına alınmıştır',
+'protectedpagesempty'     => 'Şuanda, bu parametrelerle korunan hiç bir sayfa yok.',
 'protectedtitles'         => 'Korunan başlıklar',
+'protectedtitlestext'     => 'Aşağıdaki başlıklar oluşturulmaya karşı korumalıdır',
+'protectedtitlesempty'    => 'Şuanda, bu parametrelerle korunan hiç bir başlık yok.',
 'listusers'               => 'Kullanıcı listesi',
+'listusers-editsonly'     => 'Sadece değişiklik yapan kullanıcıları göster',
+'usereditcount'           => '$1 {{PLURAL:$1|deÄŸiÅŸiklik|deÄŸiÅŸiklik}}',
 'newpages'                => 'Yeni sayfalar',
 'newpages-username'       => 'Kullanıcı adı:',
 'ancientpages'            => 'En son deÄŸiÅŸiklik tarihi en eski olan maddeler',
 'move'                    => 'Adını değiştir',
 'movethispage'            => 'Sayfayı taşı',
+'unusedimagestext'        => 'Lütfen unutmayın ki, diğer web siteleri bir dosyaya doğrudan bir URL ile bağlantı verebilir, ve bu yüzden etkin kullanımda olmasa bile hala burada listenebilir.',
 'unusedcategoriestext'    => 'Aşağıda bulunan kategoriler mevcut olduğu halde, hiçbir madde ya da kategori tarafından kullanılmıyor.',
 'notargettitle'           => 'Hedef yok',
+'notargettext'            => 'Bu fonksiyonu uygulamak için bir hedef sayfası ya da kullanıcısı belirtmediniz.',
+'nopagetitle'             => 'Böyle bir hedef sayfası yok',
+'nopagetext'              => 'Belirttiğiniz hedef sayfası mevcut değil.',
+'pager-newer-n'           => '{{PLURAL:$1|1 daha yeni|$1 daha yeni}}',
+'pager-older-n'           => '{{PLURAL:$1|1 daha eski|$1 daha eski}}',
+'suppress'                => 'Gözetim',
 
 # Book sources
 'booksources'               => 'Kaynak kitaplar',
 'booksources-search-legend' => 'Kitap kaynaklarını ara',
 'booksources-go'            => 'Git',
+'booksources-text'          => 'Aşağıdaki, yeni ve kullanılmış kitap satan diğer sitelere bağlantıların listesidir, ve aradığınız kitaplar hakkında daha fazla bilgiye sahip olabilirler:',
+'booksources-invalid-isbn'  => 'Verilen ISBN geçersiz gibi görünüyor; orijinal kaynaktan kopyalama hataları için kontrol edin.',
 
 # Special:Log
 'specialloguserlabel'  => 'Kullanıcı:',
 'speciallogtitlelabel' => 'Başlık:',
 'log'                  => 'Kayıtlar',
 'all-logs-page'        => 'Tüm kayıtlar',
-'log-search-legend'    => 'Kayıtları ara',
-'log-search-submit'    => 'Git',
-'alllogstext'          => '[[Special:Log/upload|Yükleme]], [[Special:Log/delete|silme]], [[Special:Log/move|taşıma]], [[Special:Log/protect|koruma altına alma]], [[Special:Log/newusers|yeni kullanıcı]], [[Special:Log/renameuser|kullanıcıların yeniden adlandırmaları]], [[Special:Log/block|erişim engelleme]], [[Special:Log/rights|yönetici hareketlerinin]] ve [[Special:Log/makebot|botların durumunun]] tümünün kayıtları. 
-
-Kayıt tipini, kullanıcı ismini, sayfa ismini girerek listeyi daraltabilirsiniz.',
+'alllogstext'          => '{{SITENAME}} için mevcut tüm günlüklerin birleşik gösterimi.
+Günlük tipini, kullanıcı adını (büyük-küçük harf duyarlı), ya da etkilenen sayfayı (yine büyük-küçük harf duyarlı) seçerek görünümü daraltabilirsiniz.',
 'logempty'             => 'Kayıtlarda eşleşen bilgi yok.',
 'log-title-wildcard'   => 'Bu metinle başlayan başlıklar ara',
 
@@ -1202,6 +1635,7 @@ Kayıt tipini, kullanıcı ismini, sayfa ismini girerek listeyi daraltabilirsini
 'nextpage'          => 'Sonraki sayfa ($1)',
 'prevpage'          => 'Önceki sayfa ($1)',
 'allpagesfrom'      => 'Listelemeye başlanılacak harfler:',
+'allpagesto'        => 'Şununla biten sayfaları görüntüle:',
 'allarticles'       => 'Tüm maddeler',
 'allinnamespace'    => 'Tüm sayfalar ($1 sayfaları)',
 'allnotinnamespace' => 'Tüm sayfalar ($1 alanında olmayanlar)',
@@ -1210,42 +1644,80 @@ Kayıt tipini, kullanıcı ismini, sayfa ismini girerek listeyi daraltabilirsini
 'allpagessubmit'    => 'Getir',
 'allpagesprefix'    => 'Buraya yazdığınız harflerle başlayan sayfaları listeleyin:',
 'allpagesbadtitle'  => 'Girilen sayfa ismi diller arası bağlantı ya da vikiler arası bağlantı içerdiğinden geçerli değil. Başlıklarda kullanılması yasak olan bir ya da daha çok karakter içeriyor olabilir.',
+'allpages-bad-ns'   => '{{SITENAME}} sitesinde "$1" ad alanı yok.',
 
 # Special:Categories
 'categories'                    => 'Kategoriler',
-'categoriespagetext'            => 'Vikide aşağıdaki kategoriler mevcuttur.',
+'categoriespagetext'            => "Aşağıdaki kategoriler sayfa veya ortam içerir.
+[[Special:UnusedCategories|Kullanılmayan kategoriler]] burada gösterilmemektedir.
+Ayrıca [[Special:WantedCategories|İstenen kategoriler]]'e bakınız.",
+'categoriesfrom'                => 'Şununla başlayan kategorileri görüntüle:',
 'special-categories-sort-count' => 'sayılarına göre sırala',
 'special-categories-sort-abc'   => 'alfabetik olarak sırala',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Silinen kullanıcı katkıları',
+
+# Special:LinkSearch
+'linksearch'       => 'Dış bağlantılar',
+'linksearch-pat'   => 'Motif ara:',
+'linksearch-ns'    => 'İsimalanı:',
+'linksearch-ok'    => 'Ara',
+'linksearch-text'  => '"*.wikipedia.org" gibi jokerler kullanılabilir.<br />
+Desteklenen iletişim kuralları: <tt>$1</tt>',
+'linksearch-line'  => "$1'e $2'den bağlantı verilmiş",
+'linksearch-error' => 'Jokerler sadece ana makine adının başında görünebilir.',
+
 # Special:ListUsers
+'listusersfrom'      => 'Şununla başlayan kullanıcıları görüntüle:',
 'listusers-submit'   => 'Göster',
 'listusers-noresult' => 'Kullanıcı bulunamadı.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Yeni kullanıcı kayıtları',
+'newuserlogpagetext'          => 'En son kaydolan kullanıcı kayıtları.',
+'newuserlog-byemail'          => 'eposta yoluyla şifre gönderilmiştir',
+'newuserlog-create-entry'     => 'Yeni kullanıcı',
+'newuserlog-create2-entry'    => '$1 yeni hesabını oluşturdu',
+'newuserlog-autocreate-entry' => 'Otomatik hesap oluÅŸturuldu',
+
 # Special:ListGroupRights
-'listgrouprights-group'   => 'grup',
-'listgrouprights-rights'  => 'Haklar',
-'listgrouprights-members' => '(üyelerin listesi)',
+'listgrouprights'                 => 'Kullanıcı grubu hakları',
+'listgrouprights-summary'         => 'Aşağıdaki bu vikide tanımlanan kullanıcı gruplarının, ilgili erişim haklarıyla birlikte listesidir.
+Bireysel haklarla ilgili [[{{MediaWiki:Listgrouprights-helppage}}|daha fazla bilgi]] olabilir.',
+'listgrouprights-group'           => 'grup',
+'listgrouprights-rights'          => 'Haklar',
+'listgrouprights-helppage'        => 'Help:Grup hakları',
+'listgrouprights-members'         => '(üyelerin listesi)',
+'listgrouprights-addgroup'        => '{{PLURAL:$2|Grup|Grup}} ekleyebilir: $1',
+'listgrouprights-removegroup'     => '{{PLURAL:$2|Grubu|Grupları}} kaldırabilir: $1',
+'listgrouprights-addgroup-all'    => 'Tüm grupları ekleyebilir',
+'listgrouprights-removegroup-all' => 'Tüm grupları kaldırabilir',
 
 # E-mail user
-'mailnologin'     => 'Gönderi adresi yok.',
-'mailnologintext' => 'Diğer kullanıcılara e-posta gönderebilmeniz için [[Special:UserLogin|oturum aç]]malısınız ve [[Special:Preferences|tercihler]] sayfasında geçerli bir e-posta adresiniz olmalı.',
-'emailuser'       => 'Kullanıcıya e-posta gönder',
-'emailpage'       => 'Kullanıcıya e-posta gönder',
-'emailpagetext'   => 'Aşağıdaki form kullanıcı hesabıyla ilişkilendirilmiş geçerli bir e-posta adresi olduğu takdirde ilgili kişiye bir e-posta gönderecek. 
-Yanıt alabilmeniz için "From" (Kimden) kısmına tercih formunda belirttiğiniz e-posta adresi eklenecek.',
-'usermailererror' => 'Eposta hizmeti hata verdi:',
-'defemailsubject' => '{{SITENAME}} e-posta',
-'noemailtitle'    => 'e-posta adresi yok',
-'noemailtext'     => 'Kullanıcı e-posta adresi belirtmemiş ya da diğer kullanıcılardan posta almak istemiyor.',
-'emailfrom'       => 'Kimden:',
-'emailto'         => 'Kime:',
-'emailsubject'    => 'Konu:',
-'emailmessage'    => 'E-posta:',
-'emailsend'       => 'Gönder',
-'emailccme'       => 'Mesajın bir kopyasını da bana gönder.',
-'emailccsubject'  => "Mesajınızın bir kopyasını $1'e gönderin: $2",
-'emailsent'       => 'E-posta gönderildi',
-'emailsenttext'   => 'E-postanız gönderildi.',
+'mailnologin'      => 'Gönderi adresi yok.',
+'mailnologintext'  => 'Diğer kullanıcılara e-posta gönderebilmeniz için [[Special:UserLogin|oturum aç]]malısınız ve [[Special:Preferences|tercihler]] sayfasında geçerli bir e-posta adresiniz olmalı.',
+'emailuser'        => 'Kullanıcıya e-posta gönder',
+'emailpage'        => 'Kullanıcıya e-posta gönder',
+'emailpagetext'    => 'Bu kullanıcıya e-posta mesajı göndermek için aşağıdaki formu kullanabilirsiniz.
+[[Special:Preferences|Kullanıcı tercihlerinizde]] girdiğiniz e-posta adresiniz, e-postanın "From (Kimden)" adresinde görünecektir, bu yüzden alıcı size direk cevap verebilecektir.',
+'usermailererror'  => 'Eposta hizmeti hata verdi:',
+'defemailsubject'  => '{{SITENAME}} e-posta',
+'noemailtitle'     => 'e-posta adresi yok',
+'noemailtext'      => 'Bu kullanıcı geçerli bir e-posta adresi belirtmemiş.',
+'nowikiemailtitle' => 'E-postalara izin verilmiyor',
+'nowikiemailtext'  => 'Bu kullanıcı, diğer kullanıcılardan e-posta almamayı tercih etti.',
+'email-legend'     => 'Diğer {{SITENAME}} kullanıcısına e-posta gönder',
+'emailfrom'        => 'Kimden:',
+'emailto'          => 'Kime:',
+'emailsubject'     => 'Konu:',
+'emailmessage'     => 'E-posta:',
+'emailsend'        => 'Gönder',
+'emailccme'        => 'Mesajın bir kopyasını da bana gönder.',
+'emailccsubject'   => "$1'e gönderdiğiniz mesajın kopyası: $2",
+'emailsent'        => 'E-posta gönderildi',
+'emailsenttext'    => 'E-postanız gönderildi.',
+'emailuserfooter'  => 'Bu e-posta $1 tarafından $2 kullanıcısına, {{SITENAME}} sitesindeki "Kullanıcıya e-posta gönder" fonksiyonu ile gönderilmiştir.',
 
 # Watchlist
 'watchlist'            => 'Ä°zleme listem',
@@ -1270,21 +1742,18 @@ Sayfayı izleme listenizden çıkarmak istediğinizde "sayfayı izlemeyi durdur"
 'unwatch'              => 'Sayfa izlemeyi durdur',
 'unwatchthispage'      => 'Sayfa izlemeyi durdur',
 'notanarticle'         => 'İçerik sayfası değil',
+'notvisiblerev'        => 'Revizyon silinmiÅŸ',
 'watchnochange'        => 'Gösterilen zaman aralığında izleme listenizdeki sayfaların hiçbiri güncellenmemiş.',
 'watchlist-details'    => 'Tartışma sayfaları hariç {{PLURAL:$1|$1 sayfa|$1 sayfa}} izleme listenizdedir.',
 'wlheader-enotif'      => '* E-mail ile haber verme açılmıştır.',
 'wlheader-showupdated' => "* Son ziyaretinizden sonraki sayfa değişikleri '''kalın''' olarak gösterilmiştir.",
 'watchmethod-recent'   => 'son değişiklikler arasında izledğiniz sayfalar aranıyor',
 'watchmethod-list'     => 'izleme listenizdeki sayfalar kontrol ediliyor',
-'watchlistcontains'    => 'Ä°zleme listenizde $1 tane sayfa var.',
-'wlnote'               => '{{CURRENTTIME}} {{CURRENTMONTHNAME}} {{CURRENTDAY}} tarihinde son <b>$2</b> saatte yapılan $1 değişiklik aşağıdadır.',
+'watchlistcontains'    => 'Ä°zleme listenizde $1 tane {{PLURAL:$1|sayfa|sayfa}} var.',
+'iteminvalidname'      => "'$1' öğesi ile sorun, geçersiz isim...",
+'wlnote'               => "Son {{PLURAL:$2|bir saatte|'''$2''' saatte}} yapılan {{PLURAL:$1|son değişiklik|son '''$1''' değişiklik}} aşağıdadır.",
 'wlshowlast'           => 'Son $1 saati $2 günü göster $3',
-'watchlist-show-bots'  => 'Bot değişikliklerini göster',
-'watchlist-hide-bots'  => 'Bot deÄŸiÅŸikliklerini gizle',
-'watchlist-show-own'   => 'Benim değişikliklerimi göster',
-'watchlist-hide-own'   => 'Benim deÄŸiÅŸikliklerimi gizle',
-'watchlist-show-minor' => 'Küçük değişiklikleri göster',
-'watchlist-hide-minor' => 'Küçük değişiklikleri gizle',
+'watchlist-options'    => 'İzleme listesi seçenekleri',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ä°zleniyor...',
@@ -1296,6 +1765,7 @@ Sayfayı izleme listenizden çıkarmak istediğinizde "sayfayı izlemeyi durdur"
 'enotif_impersonal_salutation' => '{{SITENAME}} kullanıcı',
 'changed'                      => 'deÄŸiÅŸtirildi',
 'created'                      => 'oluÅŸturuldu',
+'enotif_subject'               => '{{SITENAME}} sayfası $PAGETITLE, $PAGEEDITOR tarafından $CHANGEDORCREATED',
 'enotif_lastvisited'           => "Son ziyaretinizden bu yana olan tüm değişiklikleri görmek için $1'e bakın.",
 'enotif_lastdiff'              => 'Bu değişikliği görmek için, $1 sayfasına bakınız.',
 'enotif_anon_editor'           => 'anonim kullanıcılar $1',
@@ -1322,55 +1792,69 @@ Ayarları değiştirmek için:
 Yardım ve öneriler için:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Sayfayı sil',
-'confirm'                     => 'Onayla',
-'excontent'                   => "eski içerik: '$1'",
-'excontentauthor'             => "eski içerik: '$1' ('[[Special:Contributions/$2|$2]]' katkıda bulunmuş olan tek kullanıcı)",
-'exbeforeblank'               => "Silinmeden önceki içerik: '$1'",
-'exblank'                     => 'sayfa içeriği boş',
-'delete-confirm'              => '"$1" sil',
-'delete-legend'               => 'Sil',
-'historywarning'              => 'Uyarı: Silmek üzere olduğunuz sayfanın geçmişi vardır:',
-'confirmdeletetext'           => 'Bu sayfayı veya dosyayı tüm geçmişi ile birlikte veritabanından kalıcı olarak silmek üzeresiniz.
+# Delete
+'deletepage'             => 'Sayfayı sil',
+'confirm'                => 'Onayla',
+'excontent'              => "eski içerik: '$1'",
+'excontentauthor'        => "eski içerik: '$1' ('[[Special:Contributions/$2|$2]]' katkıda bulunmuş olan tek kullanıcı)",
+'exbeforeblank'          => "Silinmeden önceki içerik: '$1'",
+'exblank'                => 'sayfa içeriği boş',
+'delete-confirm'         => '"$1" sil',
+'delete-legend'          => 'Sil',
+'historywarning'         => 'Uyarı: Silmek üzere olduğunuz sayfanın geçmişi vardır:',
+'confirmdeletetext'      => 'Bu sayfayı veya dosyayı tüm geçmişi ile birlikte veritabanından kalıcı olarak silmek üzeresiniz.
 Bu işlemden kaynaklı doğabilecek sonuçların farkında iseniz ve işlemin [[{{MediaWiki:Policy-url}}|Silme kurallarına]] uygun olduğuna eminseniz, işlemi onaylayın.',
-'actioncomplete'              => 'İşlem tamamlandı.',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" silindi.
+'actioncomplete'         => 'İşlem tamamlandı.',
+'deletedtext'            => '"<nowiki>$1</nowiki>" silindi.
 Yakın zamanda silinenleri görmek için: $2.',
-'deletedarticle'              => '"$1" silindi',
-'dellogpage'                  => 'Silme kayıtları',
-'dellogpagetext'              => 'Aşağıdaki liste son silme kayıtlarıdır.',
-'deletionlog'                 => 'silme kayıtları',
-'reverted'                    => 'Önceki sürüm geri getirildi',
-'deletecomment'               => 'Silme nedeni',
-'deleteotherreason'           => 'DiÄŸer/ilave neden:',
-'deletereasonotherlist'       => 'DiÄŸer nedenler',
-'deletereason-dropdown'       => '*Genel silme gerekçeleri
+'deletedarticle'         => '"$1" silindi',
+'suppressedarticle'      => '"[[$1]]" bastırıldı',
+'dellogpage'             => 'Silme kayıtları',
+'dellogpagetext'         => 'Aşağıdaki liste son silme kayıtlarıdır.',
+'deletionlog'            => 'silme kayıtları',
+'reverted'               => 'Önceki sürüm geri getirildi',
+'deletecomment'          => 'Silme nedeni',
+'deleteotherreason'      => 'DiÄŸer/ilave neden:',
+'deletereasonotherlist'  => 'DiÄŸer nedenler',
+'deletereason-dropdown'  => '*Genel silme gerekçeleri
 ** Yazarın talebi
 ** Telif hakları ihlali
 ** Vandalizm',
-'delete-edit-reasonlist'      => 'Silme nedenlerini deÄŸiÅŸtir',
-'delete-toobig'               => 'Bu sayfa, $1 {{PLURAL:$1|tane değişiklik|tane değişiklik}} ile çok uzun bir geçmişe sahiptir.
+'delete-edit-reasonlist' => 'Silme nedenlerini deÄŸiÅŸtir',
+'delete-toobig'          => 'Bu sayfa, $1 {{PLURAL:$1|tane değişiklik|tane değişiklik}} ile çok uzun bir geçmişe sahiptir.
 Böyle sayfaların silinmesi, {{SITENAME}} sitesini bozmamak için sınırlanmaktadır.',
-'rollback'                    => 'deÄŸiÅŸiklikleri geri al',
-'rollback_short'              => 'geri al',
-'rollbacklink'                => 'eski haline getir',
-'rollbackfailed'              => 'geri alma işlemi başarısız',
-'cantrollback'                => 'Sayfaya son katkıda bulunan kullanıcı, sayfaya katkıda bulunmuş tek kişi olduğu için, değişiklikler geri alınamıyor.',
-'alreadyrolled'               => '[[User:$2|$2]] ([[User talk:$2|Talk]]) tarafından [[:$1]] sayfasında yapılmış son değişiklik geriye alınamıyor çünkü bu esnada başka biri sayfada değişiklik yaptı ya da başka biri sayfayı geriye aldı.
-
-Son deÄŸiÅŸikliÄŸi yapan: [[User:$3|$3]] ([[User talk:$3|Talk]]).',
-'editcomment'                 => 'DeÄŸiÅŸtirme notu: "<i>$1</i>" idi.', # only shown if there is an edit comment
-'revertpage'                  => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) tarafından yapılan değişiklikler geri alınarak, [[User:$1|$1]] tarafından değiştirilmiş önceki sürüm geri getirildi.', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '$1 tarafından yapılan değişiklikler geri alınarak;
+'delete-warning-toobig'  => 'Bu sayfanın büyük bir değişiklik geçmişi var, $1 {{PLURAL:$1|revizyonun|revizyonun}} üzerinde.
+Bunu silmek {{SITENAME}} iÅŸlemlerini aksatabilir;
+dikkatle devam edin.',
+
+# Rollback
+'rollback'         => 'deÄŸiÅŸiklikleri geri al',
+'rollback_short'   => 'geri al',
+'rollbacklink'     => 'eski haline getir',
+'rollbackfailed'   => 'geri alma işlemi başarısız',
+'cantrollback'     => 'Sayfaya son katkıda bulunan kullanıcı, sayfaya katkıda bulunmuş tek kişi olduğu için, değişiklikler geri alınamıyor.',
+'alreadyrolled'    => '[[User:$2|$2]] ([[User talk:$2|Talk]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) tarafından [[:$1]] sayfasında yapılmış son değişiklik geriye alınamıyor;
+başka biri sayfada değişiklik yaptı ya da sayfayı geriye aldı.
+
+Son deÄŸiÅŸikliÄŸi yapan: [[User:$3|$3]] ([[User talk:$3|Talk]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Değişiklik özeti: \"''\$1''\" idi.", # only shown if there is an edit comment
+'revertpage'       => '[[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) tarafından yapılan değişiklikler geri alınarak, [[User:$1|$1]] tarafından değiştirilmiş önceki sürüm geri getirildi.', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '$1 tarafından yapılan değişiklikler geri alınarak;
 $2 tarafından değiştirilmiş önceki sürüme geri dönüldü.',
+'sessionfailure'   => 'Giriş oturumunuzla ilgili bir sorun var gibi görünüyor;
+bu eylem, oturum gaspına karşı önlem olarak iptal edildi.
+Lütfen "geri" gidin ve geldiğiniz sayfayı yeniden yükleyin, sonra tekrar deneyin.',
+
+# Protect
 'protectlogpage'              => 'Koruma kayıtları',
 'protectlogtext'              => 'Korumaya alma/kaldırma ile ilgili değişiklikleri görmektesiniz.
 Daha fazla bilgi için [[Project:Koruma altına alınmış sayfa]] sayfasına bakabilirsiniz.',
 'protectedarticle'            => '"[[$1]]" koruma altında alındı',
 'modifiedarticleprotection'   => '"[[$1]]" için koruma düzeyi değiştirildi',
 'unprotectedarticle'          => 'koruma kaldırıldı: "[[$1]]"',
+'movedarticleprotection'      => 'koruma ayarları "[[$2]]" sayfasından "[[$1]]" sayfasına taşındı',
 'protect-title'               => '"$1" için bir koruma seviyesi seçiniz',
+'prot_1movedto2'              => '[[$1]] sayfasının yeni adı: [[$2]]',
 'protect-legend'              => 'Korumayı onayla',
 'protectcomment'              => 'Koruma altına alma nedeni',
 'protectexpiry'               => 'BitiÅŸ tarihi:',
@@ -1378,18 +1862,35 @@ Daha fazla bilgi için [[Project:Koruma altına alınmış sayfa]] sayfasına ba
 'protect_expiry_old'          => 'Geçmişteki son kullanma zamanı.',
 'protect-unchain'             => 'Taşıma kilidini kaldır',
 'protect-text'                => '[[$1]] sayfasının koruma durumunu buradan görebilir ve değiştirebilirsiniz. Lütfen [[Project:Koruma politikası|koruma politikasına]] uygun hareket ettiğinizden emin olunuz.',
-'protect-locked-access'       => 'Kullanıcı hesabınız sayfanın koruma düzeylerini değiştirme yetkisine sahip değil.
-<strong>$1</strong> sayfasının geçerli ayarları şunlardır:',
+'protect-locked-blocked'      => "EngellenmiÅŸ iken koruma seviyelerini deÄŸiÅŸtiremezsiniz.
+'''$1''' sayfasının şu anki ayarları:",
+'protect-locked-dblock'       => "Aktif veritabanı kilidinden dolayı koruma seviyeleri değiştirilemez.
+'''$1''' sayfası için şu anki ayarlar:",
+'protect-locked-access'       => "Kullanıcı hesabınız sayfanın koruma düzeylerini değiştirme yetkisine sahip değil.
+'''$1''' sayfasının geçerli ayarları şunlardır:",
 'protect-cascadeon'           => 'Bu sayfa, kademeli koruma aktif hale getirilmiş aşağıdaki {{PLURAL:$1|$1 sayfada|$1 sayfada}} kullanıldığı için şu an koruma altındadır.
 Bu sayfanın koruma seviyesini değiştirebilirsiniz; ancak bu kademeli korumaya etki etmeyecektir.',
-'protect-default'             => '(standart)',
+'protect-default'             => 'Tüm kullanıcılara izin ver',
 'protect-fallback'            => '"$1" izni gerektir',
-'protect-level-autoconfirmed' => 'kayıtlı olmayan değiştirmesin',
+'protect-level-autoconfirmed' => 'Yeni ve kayıtlı olmayan kullanıcıları engelle',
 'protect-level-sysop'         => 'sadece hizmetliler',
 'protect-summary-cascade'     => 'kademeli',
 'protect-expiring'            => 'bitiÅŸ tarihi $1 (UTC)',
+'protect-expiry-indefinite'   => 'süresiz',
 'protect-cascade'             => 'Bu sayfada kullanılan tüm sayfaları korumaya al (kademeli koruma)',
 'protect-cantedit'            => 'Bu sayfanın koruma düzeyini değiştiremezsiniz; çünkü bunu yapmaya yetkiniz yok.',
+'protect-othertime'           => 'Farklı zaman:',
+'protect-othertime-op'        => 'farklı zaman',
+'protect-existing-expiry'     => 'Mevcut bitiş zamanı: $3, $2',
+'protect-otherreason'         => 'Diğer/ilave gerekçe:',
+'protect-otherreason-op'      => 'diğer/ilave gerekçe',
+'protect-dropdown'            => '*Genel koruma gerekçeleri
+** Aşırı vandalizm
+** Aşırı spam
+** Değişiklik savaşı
+** Yüksek trafiğe sahip sayfa',
+'protect-edit-reasonlist'     => 'Koruma nedenlerini deÄŸiÅŸtir',
+'protect-expiry-options'      => '15 dakika:15 minutes,1 saat:1 hour,3 saat:3 hours,24 saat:24 hours,48 saat:48 hours,1 hafta:1 week,1 ay:1 month,süresiz:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ä°zin:',
 'restriction-level'           => 'Kısıtlama düzeyi:',
 'minimum-size'                => 'Minumum boyutu',
@@ -1408,33 +1909,53 @@ Bu sayfanın koruma seviyesini değiştirebilirsiniz; ancak bu kademeli korumaya
 'restriction-level-all'           => 'Herhangi bir düzey',
 
 # Undelete
-'undelete'                  => 'Silinmiş sayfaları göster',
-'undeletepage'              => 'Sayfanın silinmiş sürümlerine göz at ve geri getir.',
-'viewdeletedpage'           => 'Silinen sayfalara bak',
-'undeletepagetext'          => 'Aşağıdaki sayfalar silinmiştir, ancak halen arşivde saklanmakta ve istendiği zaman geri getirilebilmektedirler. Arşiv düzenli olarak temizlenebilir.',
-'undeleteextrahelp'         => "Sayfala birlikte geçmişi geri getirmek için onay kutularına dokunmadan '''Geri getir!''' tuşuna tıklayın. Sayfanın geçmişini ayrı ayrı getirmek için geri getirmek istediğiniz değişikliklerin onay kutularını seçip '''Geri getir!''' tuşuna tıklayın. Seçilen onay kutularını ve '''Neden''' alanını sıfırlamak için '''Vazgeç''' tuşuna tıklayın.",
-'undeletehistory'           => 'Eğer bu sayfa geri getiriyorsanız sayfanın bütün geçmişi de geri getirilecektir. Silindikten sonra aynı isimle yeni bir sayfa eklenmişse geri gelecek sayfanın geçmişi varolan sayfayı değiştirmeden halihazırdaki geçmişe eklenecektir.',
-'undeletehistorynoadmin'    => 'Bu madde silinmiştir. Silinme sebebi ve silinme öncesinde maddeyi düzenleyen kullanıcıların detayları aşağıdaki özette verilmiştir. Bu silinmiş sürümlerin metinleri ise sadece yöneticiler tarafından görülebilir.',
-'undeletebtn'               => 'Geri getir!',
-'undeletelink'              => 'geri getir',
-'undeletereset'             => 'Vazgeç',
-'undeletecomment'           => 'Neden:',
-'undeletedarticle'          => '"$1" geri getirildi.',
-'undeletedrevisions'        => 'Toplam {{PLURAL:$1|1 kayıt|$1 kayıt}} geri getirildi.',
-'undeletedfiles'            => '{{PLURAL:$1|1 dosya|$1 dosya}} geri getirildi.',
-'cannotundelete'            => 'Sayfayı ya da medyayı sizden önce bir başka kullanıcı geri getirdiğinden dolayı sizin geri getirme işleminiz geçersiz.',
-'undeletedpage'             => "<big>'''$1 sayfası geri getirildi'''</big>
+'undelete'                     => 'Silinmiş sayfaları göster',
+'undeletepage'                 => 'Sayfanın silinmiş sürümlerine göz at ve geri getir.',
+'undeletepagetitle'            => "'''Aşağıdaki, [[:$1|$1]] sayfasının silinmiş revizyonlarından oluşuyor'''.",
+'viewdeletedpage'              => 'Silinen sayfalara bak',
+'undeletepagetext'             => 'Aşağıdaki {{PLURAL:$1|sayfa|$1 sayfa}} silinmiştir ama hala arşivdedir ve geri getirilebilir.
+Arşiv düzenli olarak temizlenebilir.',
+'undelete-fieldset-title'      => 'Revizyonları geri yükle',
+'undeleteextrahelp'            => "Sayfalarla birlikte geçmişi geri getirmek için onay kutularına dokunmadan '''Geri getir!''' tuşuna tıklayın. Sayfanın geçmişini ayrı ayrı getirmek için geri getirmek istediğiniz değişikliklerin onay kutularını seçip '''Geri getir!''' tuşuna tıklayın. Seçilen onay kutularını ve neden alanını sıfırlamak için '''Vazgeç''' tuşuna tıklayın.",
+'undeleterevisions'            => '$1 {{PLURAL:$1|revizyon|revizyon}} arÅŸivlendi',
+'undeletehistory'              => 'Eğer sayfayı geri getirirseniz, tüm revizyonlar geçmişe geri getirilecektir.
+Silindikten sonra aynı isimle yeni bir sayfa oluşturulmuşsa, geri gelen revizyonlar varolan sayfanın geçmişinde görünecektir.',
+'undeleterevdel'               => 'Eğer üst sayfada sonuçlanacaksa ya da dosya revizyonu kısmen silinmiş ise, silmeyi geri alma uygulanamaz.
+Böyle durumlarda, en yeni silinen revizyonu seçmemeli ya da gizlemesini kaldırmalısınız.',
+'undeletehistorynoadmin'       => 'Bu madde silinmiştir. Silinme sebebi ve silinme öncesinde maddeyi düzenleyen kullanıcıların detayları aşağıdaki özette verilmiştir. Bu silinmiş sürümlerin metinleri ise sadece yöneticiler tarafından görülebilir.',
+'undelete-revision'            => '$3 tarafından $1 sayfasının silinmiş revizyonu ($4 tarihinden beri, $5 saatinde):',
+'undeleterevision-missing'     => 'Geçersiz veya kayıp revizyon.
+Revizyon onarılmış veya arşivden silinmiş olabilir ya da sahip olduğunuz bağlantı yanlıştır.',
+'undelete-nodiff'              => 'Önceki bir revizyon bulunamadı.',
+'undeletebtn'                  => 'Geri getir!',
+'undeletelink'                 => 'geri getir',
+'undeletereset'                => 'Vazgeç',
+'undeleteinvert'               => 'Seçimi ters çevir',
+'undeletecomment'              => 'Neden:',
+'undeletedarticle'             => '"$1" geri getirildi.',
+'undeletedrevisions'           => 'Toplam {{PLURAL:$1|1 kayıt|$1 kayıt}} geri getirildi.',
+'undeletedrevisions-files'     => '{{PLURAL:$1|1 revizyon|$1 revizyon}} ve {{PLURAL:$2|1 dosya|$2 dosya}} eski konumuna getirildi',
+'undeletedfiles'               => '{{PLURAL:$1|1 dosya|$1 dosya}} geri getirildi.',
+'cannotundelete'               => 'Sayfayı ya da medyayı sizden önce bir başka kullanıcı geri getirdiğinden dolayı sizin geri getirme işleminiz geçersiz.',
+'undeletedpage'                => "<big>'''$1 sayfası geri getirildi'''</big>
 
 Önceki silme ve geri getirme işlemleri için [[Special:Log/delete|silme kayıtları]]na bakınız.",
-'undelete-header'           => 'Daha önce silinmiş sayfaları görmek için bakınız: [[Special:Log/delete|silme kayıtları]].',
-'undelete-search-box'       => 'Silinmiş sayfaları ara',
-'undelete-search-submit'    => 'Ara',
-'undelete-no-results'       => 'Silme arşivinde birbiriyle eşleşen hiçbir sayfaya rastlanmadı.',
-'undelete-error-short'      => 'Bu dosyanın silinmesini geri alırken hata çıktı: $1',
-'undelete-error-long'       => 'Bu dosyanın silinmesini geri alırken hatalar çıktı:
+'undelete-header'              => 'Daha önce silinmiş sayfaları görmek için bakınız: [[Special:Log/delete|silme kayıtları]].',
+'undelete-search-box'          => 'Silinmiş sayfaları ara',
+'undelete-search-prefix'       => 'Şununla başlayan sayfaları göster:',
+'undelete-search-submit'       => 'Ara',
+'undelete-no-results'          => 'Silme arşivinde birbiriyle eşleşen hiçbir sayfaya rastlanmadı.',
+'undelete-filename-mismatch'   => '$1 zaman bilgisine sahip dosya revizyonunun silinmesi geri alınamıyor: dosya adı uyuşmuyor',
+'undelete-bad-store-key'       => '$1 zaman bilgisine sahip dosya revizyonunun silinmesi geri alınamıyor: dosya silinmeden önce kayboldu.',
+'undelete-cleanup-error'       => 'Kullanılmayan "$1" arşiv dosyasını silerken hata.',
+'undelete-missing-filearchive' => 'Dosya arşiv IDsi $1 geri getirilemiyor çünkü veritabanında değil.
+Daha önceden silinmesi geri alınmış olabilir.',
+'undelete-error-short'         => 'Bu dosyanın silinmesini geri alırken hata çıktı: $1',
+'undelete-error-long'          => 'Bu dosyanın silinmesini geri alırken hatalar çıktı:
 
 $1',
-'undelete-show-file-submit' => 'Evet',
+'undelete-show-file-confirm'   => '"<nowiki>$1</nowiki>" dosyasının $2 $3 tarihli silinmiş bir revizyonunu görmek istediğinize emin misiniz?',
+'undelete-show-file-submit'    => 'Evet',
 
 # Namespace form on various pages
 'namespace'      => 'Alan adı:',
@@ -1442,28 +1963,30 @@ $1',
 'blanknamespace' => '(Ana)',
 
 # Contributions
-'contributions' => 'Kullanıcının katkıları',
-'mycontris'     => 'Katkılarım',
-'contribsub2'   => '$1 ($2)',
-'nocontribs'    => 'Bu kriterlere uyan değişiklik bulunamadı',
-'uctop'         => '(son)',
-'month'         => 'Ay:',
-'year'          => 'Yıl:',
-
-'sp-contributions-newbies'     => 'Sadece yeni hesap açan kullanıcıların katkılarını göster',
-'sp-contributions-newbies-sub' => 'Yeni kullanıcılar için',
-'sp-contributions-blocklog'    => 'Engel kaydı',
-'sp-contributions-search'      => 'Katkıları ara',
-'sp-contributions-username'    => 'IP veya kullanıcı:',
-'sp-contributions-submit'      => 'Ara',
+'contributions'       => 'Kullanıcının katkıları',
+'contributions-title' => '$1 için kullanıcı katkıları',
+'mycontris'           => 'Katkılarım',
+'contribsub2'         => '$1 ($2)',
+'nocontribs'          => 'Bu kriterlere uyan değişiklik bulunamadı',
+'uctop'               => '(son)',
+'month'               => 'Ay:',
+'year'                => 'Yıl:',
+
+'sp-contributions-newbies'       => 'Sadece yeni hesap açan kullanıcıların katkılarını göster',
+'sp-contributions-newbies-sub'   => 'Yeni kullanıcılar için',
+'sp-contributions-newbies-title' => 'Yeni hesaplar için kullanıcı katkıları',
+'sp-contributions-blocklog'      => 'Engel kaydı',
+'sp-contributions-search'        => 'Katkıları ara',
+'sp-contributions-username'      => 'IP veya kullanıcı:',
+'sp-contributions-submit'        => 'Ara',
 
 # What links here
 'whatlinkshere'            => 'Sayfaya bağlantılar',
 'whatlinkshere-title'      => '"$1" maddesine bağlantı veren sayfalar',
 'whatlinkshere-page'       => 'Sayfa:',
-'linklistsub'              => '(Bağlantı listesi)',
 'linkshere'                => "'''[[:$1]]''' sayfasına bağlantısı olan sayfalar:",
 'nolinkshere'              => "'''[[:$1]]''' sayfasına bağlantı yapan sayfa yok.",
+'nolinkshere-ns'           => "Seçilen ad alanında hiçbir sayfa '''[[:$1]]''' sayfasına bağlanmıyor.",
 'isredirect'               => 'yönlendirme sayfası',
 'istemplate'               => 'ekleme',
 'isimage'                  => 'dosya bağlantısı',
@@ -1471,127 +1994,211 @@ $1',
 'whatlinkshere-next'       => '{{PLURAL:$1|sonraki|sonraki $1}}',
 'whatlinkshere-links'      => '� bağlantılar',
 'whatlinkshere-hideredirs' => 'yönlendirmeleri $1',
+'whatlinkshere-hidetrans'  => 'Çapraz eklemeleri $1',
 'whatlinkshere-hidelinks'  => 'bağlantıları $1',
+'whatlinkshere-hideimages' => 'Resim bağlantılarını $1',
 'whatlinkshere-filters'    => 'Filtreler',
 
 # Block/unblock
-'blockip'                     => 'Kullanıcıyı engelle',
-'blockip-legend'              => 'Kullanıcıyı engelle',
-'blockiptext'                 => "Aşağıdaki formu kullanarak belli bir IP'nin veya kayıtlı kullanıcının değişiklik yapmasını engelleyebilirsiniz. Bu sadece vandalizmi engellemek için ve [[{{MediaWiki:Policy-url}}|kurallara]] uygun olarak yapılmalı. Aşağıya mutlaka engelleme ile ilgili bir açıklama yazınız. (örnek: -Şu- sayfalarda vandalizm yapmıştır).",
-'ipaddress'                   => 'IP Adresi',
-'ipadressorusername'          => 'IP adresi veya kullanıcı adı',
-'ipbexpiry'                   => 'Bitiş süresi',
-'ipbreason'                   => 'Neden:',
-'ipbreasonotherlist'          => 'BaÅŸka sebep',
-'ipbanononly'                 => 'Sadece anonim kullanıcıları engelle',
-'ipbsubmit'                   => 'Bu kullanıcıyı engelle',
-'ipbother'                    => 'Farklı zaman',
-'ipboptions'                  => '15 dakika:15 minutes,1 saat:1 hour,3 saat:3 hours,24 saat:24 hours,48 saat:48 hours,1 hafta:1 week,1 ay:1 month,süresiz:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'farklı',
-'ipbotherreason'              => 'BaÅŸka/ek sebepler:',
-'ipbwatchuser'                => 'Bu kullanıcının kullanıcı ve tartışma sayfalarını izle',
-'badipaddress'                => 'Geçersiz IP adresi',
-'blockipsuccesssub'           => 'IP adresi engelleme işlemi başarılı oldu',
-'blockipsuccesstext'          => '"$1" engellendi.
+'blockip'                         => 'Kullanıcıyı engelle',
+'blockip-legend'                  => 'Kullanıcıyı engelle',
+'blockiptext'                     => "Aşağıdaki formu kullanarak belli bir IP'nin veya kayıtlı kullanıcının değişiklik yapmasını engelleyebilirsiniz. Bu sadece vandalizmi engellemek için ve [[{{MediaWiki:Policy-url}}|kurallara]] uygun olarak yapılmalı. Aşağıya mutlaka engelleme ile ilgili bir açıklama yazınız. (örnek: -Şu- sayfalarda vandalizm yapmıştır).",
+'ipaddress'                       => 'IP Adresi',
+'ipadressorusername'              => 'IP adresi veya kullanıcı adı',
+'ipbexpiry'                       => 'Bitiş süresi',
+'ipbreason'                       => 'Neden:',
+'ipbreasonotherlist'              => 'BaÅŸka sebep',
+'ipbreason-dropdown'              => '*Genel engelleme sebepleri
+** Yanlış bilgi eklemek
+** Sayfalardan içeriği çıkarmak
+** Dış sitelere spam bağlantı vermek
+** Sayfalara mantıksız/anlaşılmaz sözler eklemek
+** Tehditvari davranış/Taciz
+** Birden fazla hesabı kötüye kullanmak
+** Kabul edilemez kullanıcı adı',
+'ipbanononly'                     => 'Sadece anonim kullanıcıları engelle',
+'ipbcreateaccount'                => 'Hesap oluşturulmasına engel ol',
+'ipbemailban'                     => 'Kullanıcının e-posta göndermesine engel ol',
+'ipbenableautoblock'              => 'Bu kullanıcı tarafından kullanılan son IP adresini ve değişişiklik yapmaya çalıştıkları mütakip IPleri otomatik olarak engelle',
+'ipbsubmit'                       => 'Bu kullanıcıyı engelle',
+'ipbother'                        => 'Farklı zaman',
+'ipboptions'                      => '15 dakika:15 minutes,1 saat:1 hour,3 saat:3 hours,24 saat:24 hours,48 saat:48 hours,1 hafta:1 week,1 ay:1 month,süresiz:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'                  => 'farklı',
+'ipbotherreason'                  => 'BaÅŸka/ek sebepler:',
+'ipbhidename'                     => 'Kullanıcı adını, engelleme günlüğünde, aktif engelleme listesinde ve kullanıcı listesinde gizle',
+'ipbwatchuser'                    => 'Bu kullanıcının kullanıcı ve tartışma sayfalarını izle',
+'ipballowusertalk'                => 'Bu kullanıcının engelliyken kendi tartışma sayfasını değiştirebilmesine izin ver',
+'ipb-change-block'                => 'Bu ayarlarla kullanıcıyı yeniden engelle',
+'badipaddress'                    => 'Geçersiz IP adresi',
+'blockipsuccesssub'               => 'IP adresi engelleme işlemi başarılı oldu',
+'blockipsuccesstext'              => '"$1" engellendi.
 <br />[[Special:IPBlockList|IP adresi engellenenler]] listesine bakınız.',
-'ipb-edit-dropdown'           => 'Engelleme nedenleri düzenle',
-'ipb-unblock-addr'            => '$1 için engellemeyi kaldır',
-'ipb-unblock'                 => 'Engellemeyi kaldır',
-'ipb-blocklist-addr'          => '$1 için daha önceki engelleme kayıtlarını görün',
-'ipb-blocklist'               => 'Mevcut olan engellemeleri göster',
-'unblockip'                   => 'Kullanıcının engellemesini kaldır',
-'ipusubmit'                   => 'Bu adresin engellemesini kaldır',
-'unblocked'                   => '[[User:$1|$1]] - engelleme kaldırıldı',
-'unblocked-id'                => '$1 engeli çıkarıldı',
-'ipblocklist'                 => 'Engellenmiş IP adresleri ve kullanıcı adları',
-'ipblocklist-legend'          => 'Engellenen kullanıcı ara',
-'ipblocklist-username'        => 'Kullanıcı adı veya IP adresi:',
-'ipblocklist-submit'          => 'Ara',
-'blocklistline'               => '$1, $2 blok etti: $3 ($4)',
-'infiniteblock'               => 'süresiz',
-'expiringblock'               => '$1 tarihinde doluyor',
-'anononlyblock'               => 'sadece anonim',
-'createaccountblock'          => 'hesap yaratımı engellendi',
-'emailblock'                  => 'e-posta engellendi',
-'ipblocklist-empty'           => 'Engelleme listesi boÅŸ.',
-'blocklink'                   => 'engelle',
-'unblocklink'                 => 'engellemeyi kaldır',
-'contribslink'                => 'Katkılar',
-'autoblocker'                 => 'Otomatik olarak engellendiniz çünkü yakın zamanda IP adresiniz "[[User:$1|$1]]" kullanıcısı tarafından  kullanılmıştır. $1 isimli kullanıcının engellenmesi için verilen sebep: "\'\'\'$2\'\'\'"',
-'blocklogpage'                => 'Erişim engelleme kayıtları',
-'blocklogentry'               => '[[$1]], $2 $3 tarihleri arası süresince engellendi',
-'blocklogtext'                => 'Burada kullanıcı erişimine yönelik engelleme ya da engelleme kaldırma kayıtları listelenmektedir. Otomatik  IP adresi engellemeleri listeye dahil değildir. Şu anda erişimi durdurulmuş kullanıcıları [[Special:IPBlockList|IP engelleme listesi]] sayfasından görebilirsiniz.',
-'unblocklogentry'             => '$1 kullanıcının engellemesi kaldırıldı',
-'block-log-flags-anononly'    => 'sadece anonim kullanıcılar',
-'block-log-flags-nocreate'    => 'hesap yaratımı engellendi',
-'block-log-flags-noautoblock' => 'Otomatik engelleme iptal edildi',
-'block-log-flags-noemail'     => 'e-posta engellendi',
-'ipb_expiry_invalid'          => 'Geçersiz bitiş zamanı.',
-'ipb_already_blocked'         => '"$1" zaten engellenmiÅŸ',
-'ip_range_invalid'            => 'Geçersiz IP aralığı.',
-'blockme'                     => 'Beni engelle',
-'proxyblocker'                => 'Proxy engelleyici',
-'proxyblocker-disabled'       => 'Bu özellik engellenildi.',
-'proxyblocksuccess'           => 'Tamamlanmıştır.',
+'ipb-edit-dropdown'               => 'Engelleme nedenleri düzenle',
+'ipb-unblock-addr'                => '$1 için engellemeyi kaldır',
+'ipb-unblock'                     => 'Engellemeyi kaldır',
+'ipb-blocklist-addr'              => '$1 için mevcut engellemeler',
+'ipb-blocklist'                   => 'Mevcut olan engellemeleri göster',
+'ipb-blocklist-contribs'          => '$1 için katkılar',
+'unblockip'                       => 'Kullanıcının engellemesini kaldır',
+'unblockiptext'                   => 'Daha önceden engellenmiş bir IP adresine ya da kullanıcı adına yazma erişimini geri vermek için aşağıdaki formu kullanın.',
+'ipusubmit'                       => 'Bu engellemeyi kaldır',
+'unblocked'                       => '[[User:$1|$1]] - engelleme kaldırıldı',
+'unblocked-id'                    => '$1 engeli çıkarıldı',
+'ipblocklist'                     => 'Engellenmiş IP adresleri ve kullanıcı adları',
+'ipblocklist-legend'              => 'Engellenen kullanıcı ara',
+'ipblocklist-username'            => 'Kullanıcı adı veya IP adresi:',
+'ipblocklist-sh-userblocks'       => 'Hesap engellemelerini $1',
+'ipblocklist-sh-tempblocks'       => 'Geçici engellemeleri $1',
+'ipblocklist-sh-addressblocks'    => 'Tek IP engellemelerini $1',
+'ipblocklist-submit'              => 'Ara',
+'blocklistline'                   => '$1, $2 engellendi: $3 ($4)',
+'infiniteblock'                   => 'Süresiz',
+'expiringblock'                   => '$1 tarihinde doluyor',
+'anononlyblock'                   => 'sadece anonim',
+'noautoblockblock'                => 'otomatik engelleme devre dışı bırakıldı',
+'createaccountblock'              => 'hesap yaratımı engellendi',
+'emailblock'                      => 'e-posta engellendi',
+'blocklist-nousertalk'            => 'kendi tartışma sayfasını değiştiremez',
+'ipblocklist-empty'               => 'Engelleme listesi boÅŸ.',
+'ipblocklist-no-results'          => 'İstenen IP adresi ya da kullanıcı adı engellenmedi.',
+'blocklink'                       => 'engelle',
+'unblocklink'                     => 'engellemeyi kaldır',
+'change-blocklink'                => 'engeli deÄŸiÅŸtir',
+'contribslink'                    => 'Katkılar',
+'autoblocker'                     => 'Otomatik olarak engellendiniz çünkü yakın zamanda IP adresiniz "[[User:$1|$1]]" kullanıcısı tarafından  kullanılmıştır. $1 isimli kullanıcının engellenmesi için verilen sebep: "\'\'\'$2\'\'\'"',
+'blocklogpage'                    => 'Erişim engelleme kayıtları',
+'blocklog-fulllog'                => 'Tüm engelleme kaydı',
+'blocklogentry'                   => ', [[$1]] kullanıcısını engelledi, engelleme süresi: $2 $3',
+'reblock-logentry'                => '[[$1]] için bitiş tarihi $2 $3 olmak üzere engelleme ayarlarını değiştirdi',
+'blocklogtext'                    => 'Burada kullanıcı erişimine yönelik engelleme ya da engelleme kaldırma kayıtları listelenmektedir. Otomatik  IP adresi engellemeleri listeye dahil değildir. Şu anda erişimi durdurulmuş kullanıcıları [[Special:IPBlockList|IP engelleme listesi]] sayfasından görebilirsiniz.',
+'unblocklogentry'                 => '$1 kullanıcının engellemesi kaldırıldı',
+'block-log-flags-anononly'        => 'sadece anonim kullanıcılar',
+'block-log-flags-nocreate'        => 'hesap yaratımı engellendi',
+'block-log-flags-noautoblock'     => 'Otomatik engelleme iptal edildi',
+'block-log-flags-noemail'         => 'e-posta engellendi',
+'block-log-flags-nousertalk'      => 'kendi tartışma sayfasını değiştiremez',
+'block-log-flags-angry-autoblock' => 'geliÅŸmiÅŸ oto-engelleme devrede',
+'range_block_disabled'            => 'Hizmetliler için aralık engellemesi oluşturma yeteneği devre dışı.',
+'ipb_expiry_invalid'              => 'Geçersiz bitiş zamanı.',
+'ipb_expiry_temp'                 => 'Gizli kullanıcı adı engellemeleri kalıcı olmalı.',
+'ipb_already_blocked'             => '"$1" zaten engellenmiÅŸ',
+'ipb-needreblock'                 => '== Zaten engellenmiÅŸ ==
+$1 zaten engellenmiş. Ayarları değiştirmek istiyor musunuz?',
+'ipb_cant_unblock'                => 'Hata: Engelleme IDsi $1 bulunamadı.
+Engelleme kaldırılmış olabilir.',
+'ipb_blocked_as_range'            => 'Hata: $1 IP adresi doğrudan engellenmemiş ve engelleme kaldırılamaz.
+Ancak, bu adres $2 aralığının parçası olarak engellenmiş, aralık engellemesini kaldırabilirsiniz.',
+'ip_range_invalid'                => 'Geçersiz IP aralığı.',
+'blockme'                         => 'Beni engelle',
+'proxyblocker'                    => 'Proxy engelleyici',
+'proxyblocker-disabled'           => 'Bu özellik engellenildi.',
+'proxyblockreason'                => 'IP adresiniz açık bir proxy olduğu için engellendi.
+Lütfen İnternet sevis sağlayınız ile ya da teknik destek ile irtibat kurun ve bu ciddi güvenlik probleminden haberdar edin.',
+'proxyblocksuccess'               => 'Tamamlanmıştır.',
+'sorbsreason'                     => "IP adresiniz, {{SITENAME}} sitesi tarafından kullanılan DNSBL'de açık proxy olarak listelenmiş.",
+'sorbs_create_account_reason'     => "IP adresiniz {{SITENAME}} sitesi tarafından kullanılan DNSBL'de açık proxy olarak listelenmiş.
+Hesap oluşturamazsınız",
+'cant-block-while-blocked'        => 'Siz engelliyken başka kullanıcıları engelleyemezsiniz.',
 
 # Developer tools
 'lockdb'              => 'Veritabanı kilitli',
 'unlockdb'            => 'Veritabanı kilitini aç',
+'lockdbtext'          => 'Veritabanını kilitlemek; tüm kullanıcıların sayfaları, tercihlerini ve izleme listelerini değiştirmelerini ve veritabanında değişiklik gerektiren diğer şeyleri askıya alır.
+Lütfen yapmak istediğinizin bu olduğunu ve bakım işleriniz bittiğinde veritabanını açacağınızı teyit edin.',
+'unlockdbtext'        => 'Veritabanının kilidini açmak; tüm kullanıcılara sayfaları, tercihlerini ve izleme listelerini değiştirmelerini ve veritabanında değişiklik gerektiren diğer şeyleri yapabilme yeteneğini geri verir.
+Lütfen yapmak istediğinizin bu olduğunu teyit edin.',
+'lockconfirm'         => 'Evet, veritabanını kilitlemeyi gerçekten istiyorum.',
 'unlockconfirm'       => 'Evet, veritabanının kilidini açmak istediğimden eminim.',
 'lockbtn'             => 'Veritabanı kilitli',
 'unlockbtn'           => 'Veritabanın kilidi kaldır',
+'locknoconfirm'       => 'Onay kutusunu seçmediniz.',
 'lockdbsuccesssub'    => 'Veritabanı kilitlendi',
 'unlockdbsuccesssub'  => 'Veritabanı kiliti açıldı.',
+'lockdbsuccesstext'   => 'Veritabanı kilitlendi.<br />
+Bakımın işleriniz bittiğinde veritabanının [[Special:UnlockDB|kilidini açmayı]] unutmayın.',
 'unlockdbsuccesstext' => 'Veritanı kilidi açıldı.',
+'lockfilenotwritable' => 'Veritabanı kilitleme dosyası yazılabilir değil.
+Bu, veritabanını kilitleyip açabilmek için, web sunucusu tarafından yazılabilir olmalıdır.',
 'databasenotlocked'   => 'Veritabanı kilitli değil.',
 
 # Move page
-'move-page'               => '$1 taşınıyor',
-'move-page-legend'        => 'Ä°sim deÄŸiÅŸikliÄŸi',
-'movepagetext'            => "Aşağıdaki form kullanılarak sayfanın adı değiştirilir. Beraberinde tüm geçmiş kayıtları da yeni isme aktarılır. Eski isim yeni isme yönlendirme hâline dönüşür. Otomatik olarak eski başlığa yönlendirmeleri güncelleyebilirsiniz. Bu işlemi otomatik yapmak istemezseniz tüm [[Special:DoubleRedirects|çift]] veya [[Special:BrokenRedirects|geçersiz]] yönlendirmeleri kendiniz düzeltmeniz gerekecek. Yapacağınız bu değişikllikle tüm bağlantıların olması gerektiği gibi çalıştığından sizin sorumlu olduğunuzu unutmayınız.
+'move-page'                    => '$1 taşınıyor',
+'move-page-legend'             => 'Ä°sim deÄŸiÅŸikliÄŸi',
+'movepagetext'                 => "Aşağıdaki form kullanılarak sayfanın adı değiştirilir. Beraberinde tüm geçmiş kayıtları da yeni isme aktarılır. Eski isim yeni isme yönlendirme hâline dönüşür. Otomatik olarak eski başlığa yönlendirmeleri güncelleyebilirsiniz. Bu işlemi otomatik yapmak istemezseniz tüm [[Special:DoubleRedirects|çift]] veya [[Special:BrokenRedirects|geçersiz]] yönlendirmeleri kendiniz düzeltmeniz gerekecek. Yapacağınız bu değişikllikle tüm bağlantıların olması gerektiği gibi çalıştığından sizin sorumlu olduğunuzu unutmayınız.
 
 Eğer yeni isimde bir madde zaten varsa isim değişikliği '''yapılmayacaktır'''. Ayrıca, isim değişikliğinden pişman olursanız değişikliği geri alabilir ve başka hiçbir sayfaya da dokunmamış olursunuz.
 
 '''UYARI!'''
 Bu değişim popüler bir sayfa için beklenmeyen sonuçlar doğurabilir; lütfen değişikliği yapmadan önce olabilecekleri göz önünde bulundurun.",
-'movepagetalktext'        => "İlişikteki tartışma sayfası da (eğer varsa) otomatik olarak yeni isme taşınacaktır. Ama şu durumlarda '''taşınmaz''':
+'movepagetalktext'             => "İlişikteki tartışma sayfası da (eğer varsa) otomatik olarak yeni isme taşınacaktır. Ama şu durumlarda '''taşınmaz''':
 
 *Alanlar arası bir taşıma ise, (örnek: \"Project:\" --> \"Help:\")
 *Yeni isimde bir tartışma sayfası zaten var ise,
 *Alttaki kutucuğu seçmediyseniz.
 
 Bu durumlarda sayfayı kendiniz aktarmalısınız.",
-'movearticle'             => 'Eski isim',
-'movenotallowed'          => '{{SITENAME}} sitesinde sayfa adlerını değiştirme izniniz yok.',
-'newtitle'                => 'Yeni isim',
-'move-watch'              => 'Bu sayfayı izle',
-'movepagebtn'             => 'Ä°smi deÄŸiÅŸtir',
-'pagemovedsub'            => 'İsim değişikliği tamamlandı.',
-'movepage-moved'          => '<big>\'\'\'"$1",  "$2" sayfasına taşındı\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Bu isimde bir sayfa bulunmakta veya seçmiş olduğunuz isim geçersizdir.
+'movearticle'                  => 'Eski isim',
+'movenologin'                  => 'Sistemde deÄŸilsiniz.',
+'movenologintext'              => 'Sayfanın adını değiştirebilmek için kayıtlı ve [[Special:UserLogin|sisteme]] giriş yapmış olmanız gerekmektedir.',
+'movenotallowed'               => 'Sayfaları taşımaya izniniz yok.',
+'movenotallowedfile'           => 'Sayfaları taşımaya izniniz yok.',
+'cant-move-user-page'          => 'Kullanıcı sayfalarını taşımaya izniniz yok (altsayfalardan başka).',
+'cant-move-to-user-page'       => 'Bir sayfayı, bir kullanıcı sayfasına taşımaya izniniz yok (bir kullanıcı altsayfası dışında).',
+'newtitle'                     => 'Yeni isim',
+'move-watch'                   => 'Bu sayfayı izle',
+'movepagebtn'                  => 'Ä°smi deÄŸiÅŸtir',
+'pagemovedsub'                 => 'İsim değişikliği tamamlandı.',
+'movepage-moved'               => '<big>\'\'\'"$1",  "$2" sayfasına taşındı\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Bir yönlendirme oluşturuldu.',
+'movepage-moved-noredirect'    => 'Bir yönlendirme oluşturulması bastırıldı.',
+'articleexists'                => 'Bu isimde bir sayfa bulunmakta veya seçmiş olduğunuz isim geçersizdir.
 Lütfen başka bir isim deneyiniz.',
-'talkexists'              => "'''Sayfanın kendisi başarıyla taşındı, ancak tartışma sayfası taşınamadı çünkü taşınacağı isimde zaten bir sayfa vardı. Lütfen sayfanın içeriğini diğer sayfaya kendiniz taşıyın.'''",
-'movedto'                 => 'taşındı:',
-'movetalk'                => 'Varsa "tartışma" sayfasını da aktar.',
-'movepage-page-exists'    => '$1 maddesi zaten var olmaktadır, ve otomatikman yeniden yazılamaz.',
-'movepage-page-moved'     => '$1 sayfası $2 sayfasına taşındı.',
-'1movedto2'               => '[[$1]] sayfasının yeni adı: [[$2]]',
-'1movedto2_redir'         => '[[$1]] başlığı [[$2]] sayfasına yönlendirildi',
-'movelogpage'             => 'İsim değişikliği kayıtları',
-'movelogpagetext'         => 'Aşağıda bulunan liste adı değiştirilmiş sayfaları gösterir.',
-'movereason'              => 'Neden:',
-'revertmove'              => 'geriye al',
-'delete_and_move'         => 'Sil ve taşı',
-'delete_and_move_text'    => '==Silinmesi gerekiyor==
+'cantmove-titleprotected'      => 'Bir sayfayı bu konuma taşıyamazsınız, çünkü yeni başlığın oluşturulması korunuyor',
+'talkexists'                   => "'''Sayfanın kendisi başarıyla taşındı, ancak tartışma sayfası taşınamadı çünkü taşınacağı isimde zaten bir sayfa vardı. Lütfen sayfanın içeriğini diğer sayfaya kendiniz taşıyın.'''",
+'movedto'                      => 'taşındı:',
+'movetalk'                     => 'Varsa "tartışma" sayfasını da aktar.',
+'move-subpages'                => 'Tüm altsayfaları taşı, eğer mümkünse',
+'move-talk-subpages'           => 'Tartışma sayfasının tüm altsayfalarını taşı, eğer mümkünse',
+'movepage-page-exists'         => '$1 maddesi zaten var olmaktadır, ve otomatikman yeniden yazılamaz.',
+'movepage-page-moved'          => '$1 sayfası $2 sayfasına taşındı.',
+'movepage-page-unmoved'        => '$1 sayfası $2 başlığına taşınamıyor.',
+'movepage-max-pages'           => 'En fazla $1 {{PLURAL:$1|sayfa|sayfa}} taşındı ve daha fazlası otomatik olarak taşınamaz.',
+'1movedto2'                    => '[[$1]] sayfasının yeni adı: [[$2]]',
+'1movedto2_redir'              => '[[$1]] başlığı [[$2]] sayfasına yönlendirildi',
+'move-redirect-suppressed'     => 'yönlendirme bastırılmış',
+'movelogpage'                  => 'İsim değişikliği kayıtları',
+'movelogpagetext'              => 'Aşağıda bulunan liste adı değiştirilmiş sayfaları gösterir.',
+'movereason'                   => 'Neden:',
+'revertmove'                   => 'geriye al',
+'delete_and_move'              => 'Sil ve taşı',
+'delete_and_move_text'         => '==Silinmesi gerekiyor==
 
 "[[:$1]]" isimli bir sayfa zaten mevcut. O sayfayı silerek, isim değişikliğini gerçekleştirmeye devam etmek istiyor musunuz?',
-'delete_and_move_confirm' => 'Evet, sayfayı sil',
-'delete_and_move_reason'  => 'İsim değişikliğinin gerçekleşmesi için silindi.',
-'selfmove'                => 'Olmasını istediğiniz isim ile mevcut isim aynı. Değişiklik mümkün değil.',
+'delete_and_move_confirm'      => 'Evet, sayfayı sil',
+'delete_and_move_reason'       => 'İsim değişikliğinin gerçekleşmesi için silindi.',
+'selfmove'                     => 'Olmasını istediğiniz isim ile mevcut isim aynı. Değişiklik mümkün değil.',
+'immobile-source-namespace'    => '"$1" ad alanında sayfalar taşınamıyor',
+'immobile-target-namespace'    => 'Sayfalar "$1" ad alanına taşınamıyor',
+'immobile-target-namespace-iw' => 'Vikilerarası bağlantı, sayfa taşıması için geçerli bir hedef değil.',
+'immobile-source-page'         => 'Bu sayfanın adı değiştirilemez.',
+'immobile-target-page'         => 'Bu hedef başlığına taşınamaz.',
+'imagenocrossnamespace'        => 'Dosya, dosyalar için olmayan ad alanına taşınamaz',
+'imagetypemismatch'            => 'Yeni dosya eklentisi tipiyle eÅŸleÅŸmiyor',
+'imageinvalidfilename'         => 'Hedef dosya adı geçersiz',
+'fix-double-redirects'         => 'Orijinal başlığa işaret eden yönlendirmeleri güncelle',
+'move-leave-redirect'          => 'Arkada bir yönlendirme bırak',
 
 # Export
 'export'            => 'Sayfa kaydet',
+'exporttext'        => 'Belirli bir sayfa ya da sayfa takımının metni ve değiştirme geçmişini XML ile sarılı olarak dışa aktarabilirsiniz.
+Bu, MedyaViki kullanan başka bir vikide [[Special:Import|içe aktarım sayfası]] ile içe aktarılabilir.
+
+Sayfaları dışa aktarmak için, başlıkları aşağıdaki metin kutusuna girin, her satıra bir tane, ve eski sürümlerle beraber şimdiki sürümü, sayfa geçmişi satırlarını, ya da son değişiklik bilgisiyle beraber güncel sürümü isteyip istemediğinizi belirtin.
+
+Sonuncu durumda, bir link de kullanabilirsiniz, ör: "[[{{MediaWiki:Mainpage}}]]" sayfası için [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Geçmiş sürümleri almadan sadece son sürümü al',
+'exportnohistory'   => "----
+'''Not:''' Sayfaların tüm geçmişini bu formla dışa aktarmak, performans nedenlerinden ötürü devre dışı bırakılmıştır.",
 'export-submit'     => 'Aktar',
 'export-addcattext' => 'Aşağıdaki kategoriden maddeler ekle:',
 'export-addcat'     => 'Ekle',
@@ -1609,43 +2216,76 @@ Lütfen başka bir isim deneyiniz.',
 'allmessagesmodified'       => 'Sadece değiştirilmişleri göster',
 
 # Thumbnails
-'thumbnail-more'  => 'Büyüt',
-'filemissing'     => 'Dosya bulunmadı',
-'thumbnail_error' => 'Önizleme oluşturmada hata: $1',
+'thumbnail-more'           => 'Büyüt',
+'filemissing'              => 'Dosya bulunmadı',
+'thumbnail_error'          => 'Önizleme oluşturmada hata: $1',
+'djvu_page_error'          => 'DjVu sayfası kapsamdışı',
+'djvu_no_xml'              => 'DjVu dosyası için XML alınamıyor',
+'thumbnail_invalid_params' => 'Geçersiz küçük resim parametreleri',
+'thumbnail_dest_directory' => 'Hedef dizini oluşturulamıyor',
 
 # Special:Import
 'import'                     => 'Sayfaları aktar',
+'importinterwiki'            => 'Vikilerarası içe aktarım',
+'import-interwiki-text'      => 'İçe aktarmak için bir viki ve sayfa başlığı seçin.
+Revizyon tarihleri ve yazarların isimleri korunacaktır.
+Bütün vikilerarası içe aktarım eylemleri [[Special:Log/import|içe aktarım günlüğünde]] kaydedilmektedir.',
+'import-interwiki-source'    => 'Kaynak viki/sayfa:',
 'import-interwiki-history'   => 'Sayfanın tüm geçmiş sürümlerini kopyala',
 'import-interwiki-submit'    => 'Import',
-'import-interwiki-namespace' => 'Sayfaları alan adına taşı:',
+'import-interwiki-namespace' => 'Hedef ad alanı:',
+'import-upload-filename'     => 'Dosyaadı:',
+'import-comment'             => 'Yorum:',
+'importtext'                 => 'Lütfen dosyayı viki kaynağından [[Special:Export|dışa aktarım uygulamasıyla]] dışa aktarın.
+Bilgisayarınıza kaydedin ve buraya yükleyin.',
 'importstart'                => 'Sayfalar aktarmaktadır...',
+'import-revision-count'      => '$1 {{PLURAL:$1|revizyon|revizyon}}',
 'importnopages'              => 'Aktarılacak dosya yok.',
 'importfailed'               => '$1 aktarımı başarısız',
 'importunknownsource'        => 'Bilinmeyen içeri aktarım kaynak türü',
+'importcantopen'             => 'İçeri aktarma dosyası açılamadı',
 'importbadinterwiki'         => 'Yanlış interwiki bağlantısı',
 'importnotext'               => 'BoÅŸ ya da metin yok',
 'importsuccess'              => 'Aktarma sonuçlandı!',
+'importhistoryconflict'      => 'Çakışan geçmiş revizyonu mevcut (bu sayfa daha önceden içe aktarılmış olabilir)',
+'importnosources'            => 'Hiç vikilerarası içe aktarım kaynağı tanımlanmamış ve doğrudan geçmiş yüklemeleri devre dışı.',
 'importnofile'               => 'Bir aktarım dosyası yüklenmedi.',
+'importuploaderrorsize'      => 'İçe aktarılmış dosyanın yüklenmesi başarısız oldu.
+Dosya, izin verilen yükleme boyutundan büyük.',
+'importuploaderrorpartial'   => 'İçe aktarılmış dosyanın yüklenmesi başarısız oldu.
+Dosyanın sadece bir kısmı yüklendi.',
+'importuploaderrortemp'      => 'İçe aktarılan dosyanın yüklenmesi başarısız oldu.
+Geçici dosya kayıp.',
+'import-parse-failure'       => 'XML içeri aktarma derlemesi başarısız',
+'import-noarticle'           => 'İçe aktarılacak sayfa yok!',
+'import-nonewrevisions'      => 'Tüm revizyonlar önceden içe aktarılmış.',
+'xml-error-string'           => '$2 satırında, $3 sütununda $1 (bayt $4): $5',
 'import-upload'              => 'XML bilgileri yükle',
+'import-token-mismatch'      => 'Oturum verisi kaybı. Lütfen yeniden deneyin.',
+'import-invalid-interwiki'   => 'Belirtilen vikiden içe aktarım yapılamaz.',
 
 # Import log
-'importlogpage'             => 'Dosya aktarım kayıtları',
-'import-logentry-interwiki' => '$1 transvikileÅŸmiÅŸ',
+'importlogpage'                    => 'Dosya aktarım kayıtları',
+'importlogpagetext'                => 'Diğer vikilerden sayfaların değişiklik geçmişiyle idari içe aktarımları.',
+'import-logentry-upload'           => '[[$1]] dosya yüklemesiyle içe aktarıldı',
+'import-logentry-upload-detail'    => '$1 {{PLURAL:$1|revizyon|revizyon}}',
+'import-logentry-interwiki'        => '$1 transvikileÅŸmiÅŸ',
+'import-logentry-interwiki-detail' => '$2 sayfasından $1 {{PLURAL:$1|revizyon|revizyon}}',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'KiÅŸisel sayfam',
+'tooltip-pt-userpage'             => 'Kullanıcı sayfanız',
 'tooltip-pt-anonuserpage'         => 'The user page for the ip you',
-'tooltip-pt-mytalk'               => 'Mesaj sayfam',
+'tooltip-pt-mytalk'               => 'Mesaj sayfanız',
 'tooltip-pt-anontalk'             => 'Bu IP adresinden yapılmış değişiklikleri tartış',
 'tooltip-pt-preferences'          => 'Ayarlarım',
 'tooltip-pt-watchlist'            => 'İzlemeye aldığım sayfalar',
-'tooltip-pt-mycontris'            => 'Yaptığım katkıların listesi',
+'tooltip-pt-mycontris'            => 'Yaptığınız katkıların listesi',
 'tooltip-pt-login'                => 'Oturum açmanız tavsiye olunur ama mecbur değilsiniz.',
 'tooltip-pt-anonlogin'            => 'Oturum açmanız tavsiye olunur ama mecbur değilsiniz.',
 'tooltip-pt-logout'               => 'Sistemden çık',
 'tooltip-ca-talk'                 => 'İçerik ile ilgili görüş belirt',
 'tooltip-ca-edit'                 => 'Bu sayfayı değiştirebilirsiniz. Kaydetmeden önce önizleme yapmayı unutmayın.',
-'tooltip-ca-addsection'           => 'Bu tartışmaya yorum ekleyin.',
+'tooltip-ca-addsection'           => 'Yeni bir bölüm başlat.',
 'tooltip-ca-viewsource'           => 'Bu sayfa koruma altında. Sadece kaynak kodunu sadece görebilirsiniz. İçeriği değiştiremezsiniz.',
 'tooltip-ca-history'              => 'Bu sayfanın geçmiş versiyonları.',
 'tooltip-ca-protect'              => 'Bu sayfayı koru',
@@ -1655,6 +2295,8 @@ Lütfen başka bir isim deneyiniz.',
 'tooltip-ca-watch'                => 'Bu sayfayı izlemeye al',
 'tooltip-ca-unwatch'              => 'Bu sayfayı izlemeyi bırakın',
 'tooltip-search'                  => '{{SITENAME}} içinde ara',
+'tooltip-search-go'               => 'EÄŸer varsa, tam bu addaki bir sayfaya git',
+'tooltip-search-fulltext'         => 'Bu metin için sayfaları ara',
 'tooltip-p-logo'                  => 'Ana sayfa',
 'tooltip-n-mainpage'              => 'Ana sayfaya dön',
 'tooltip-n-portal'                => 'Proje üzerine, ne nerdedir, neler yapılabilir',
@@ -1671,6 +2313,7 @@ Lütfen başka bir isim deneyiniz.',
 'tooltip-t-upload'                => 'Sisteme resim ya da medya dosyaları yükleyin',
 'tooltip-t-specialpages'          => 'Tüm özel sayfaların listesini göster',
 'tooltip-t-print'                 => 'Bu sayfanın basılmaya uygun görünümü',
+'tooltip-t-permalink'             => 'Sayfanın bu sürümüne kalıcı bağlantı',
 'tooltip-ca-nstab-main'           => 'Sayfayı göster',
 'tooltip-ca-nstab-user'           => 'Kullanıcı sayfasını göster',
 'tooltip-ca-nstab-media'          => 'Medya sayfasını göster',
@@ -1689,6 +2332,9 @@ Lütfen başka bir isim deneyiniz.',
 'tooltip-watch'                   => 'Sayfayı izleme listene ekle',
 'tooltip-recreate'                => 'Silinmiş olmasına rağmen sayfayı geri getir',
 'tooltip-upload'                  => 'Yüklemeyi başlat',
+'tooltip-rollback'                => '"Geri dönüş" tek tıklamayla bu sayfaya son katkı yapanın değişikliklerini geri döndürür',
+'tooltip-undo'                    => '"Geri al" bu değişikliği geri döndürür ve değişiklik formunu önizleme modunda açar.
+Özet için bir sebep eklemeye izin verir',
 
 # Stylesheets
 'common.css'   => '/* Buraya konulacak CSS kodu tüm temalarda etkin olur */',
@@ -1697,22 +2343,43 @@ Lütfen başka bir isim deneyiniz.',
 # Scripts
 'common.js' => '/* Buraya konulacak JavaScript kodu sitedeki her kullanıcı için her sayfa yüklendiğinde çalışacaktır */',
 
+# Metadata
+'nodublincore'      => 'Dublin Core RDF üstverisi bu sunucu için devre dışı bırakıldı.',
+'nocreativecommons' => 'Creative Commons RDF üstverisi bu sunucu için devre dışı bırakıldı.',
+'notacceptable'     => 'Bu viki sunucusu istemcinizin okuyabileceği formatta bir veri sağlayamıyor.',
+
 # Attribution
-'anonymous'        => '{{SITENAME}} sitesinin anonim kullanıcıları',
+'anonymous'        => '{{SITENAME}} sitesinin anonim {{PLURAL:$1|kullanıcısı|kullanıcıları}}',
 'siteuser'         => '{{SITENAME}} kullanıcı $1',
 'lastmodifiedatby' => 'Sayfa en son $3 tarafından $2, $1 tarihinde değiştirildi.', # $1 date, $2 time, $3 user
+'othercontribs'    => '$1 tarafından yapılan çalışma baz alınmıştır.',
 'others'           => 'diÄŸerleri',
-'siteusers'        => '{{SITENAME}} kullanıcılar $1',
+'siteusers'        => '{{SITENAME}} {{PLURAL:$2|kullanıcı|kullanıcılar}} $1',
+'creditspage'      => 'Sayfa künyesi',
+'nocredits'        => 'Bu sayfa için künye bilgisi mevcut değil.',
 
 # Spam protection
 'spamprotectiontitle' => 'Spam karşı koruma filtresi',
 'spamprotectiontext'  => 'Kaydetmek istediğiniz sayfa spam filtresi tarafından blok edildi. Büyük ihtimalle kara-listedeki bir dış bağlantıdan kaynaklanmaktadır.',
+'spamprotectionmatch' => 'Spam süzgecimizi harekete geçiren metin: $1',
+'spambot_username'    => 'Medyaviki spam temizleme',
+'spam_reverting'      => '$1 ile bağlantı içermeyen son sürüme geri dönülüyor',
+'spam_blanking'       => 'Tüm revizyonlar $1 sayfasına bağlantı içeriyor, boşaltılıyor',
 
 # Info page
-'infosubtitle' => 'Sayfa için bilgi',
-'numedits'     => 'Değişiklik sayısı (sayfa): $1',
-'numtalkedits' => 'Değişiklik sayısı (tartışma sayfası): $1',
-'numwatchers'  => 'izleyici sayısı: $1',
+'infosubtitle'   => 'Sayfa için bilgi',
+'numedits'       => 'Değişiklik sayısı (sayfa): $1',
+'numtalkedits'   => 'Değişiklik sayısı (tartışma sayfası): $1',
+'numwatchers'    => 'izleyici sayısı: $1',
+'numauthors'     => 'Farklı yazar sayısı (sayfa): $1',
+'numtalkauthors' => 'Farklı yazar sayısı (tartışma sayfası): $1',
+
+# Skin names
+'skinname-standard'  => 'Klasik',
+'skinname-nostalgia' => 'Nostaljik',
+'skinname-chick'     => 'Şık',
+'skinname-simple'    => 'Basit',
+'skinname-modern'    => 'Modern',
 
 # Math options
 'mw_math_png'    => 'Daima PNG resim formatına çevir',
@@ -1727,26 +2394,43 @@ Lütfen başka bir isim deneyiniz.',
 'markaspatrolledtext'                 => 'Kontrol edilmiÅŸ olarak iÅŸaretle',
 'markedaspatrolled'                   => 'Kontrol edildi',
 'markedaspatrolledtext'               => 'Gözden geçirilen metin kontrol edilmiş olarak işaretlendi.',
+'rcpatroldisabled'                    => 'Son Değişiklikler Gözetimi devre dışı bırakıldı',
+'rcpatroldisabledtext'                => 'Son Değişiklikler Gözetimi özelliği şuanda devre dışı.',
 'markedaspatrollederror'              => 'Kontrol edilmedi',
+'markedaspatrollederrortext'          => 'Gözlenmiş olarak işaretlemek için bir revizyon belirtmelisiniz.',
 'markedaspatrollederror-noautopatrol' => 'Kendi deÄŸiÅŸikliklerinizi kontrol edilmiÅŸ olarak iÅŸaretleyemezsiniz.',
 
 # Patrol log
-'patrol-log-page' => 'Kontrol kaydı',
-'patrol-log-line' => '$3 kontrol edilmiş olarak $2 $1 sürümü işaretlendi',
-'patrol-log-auto' => '(otomatik)',
+'patrol-log-page'      => 'Kontrol kaydı',
+'patrol-log-header'    => 'Bu gözlenmiş revizyonların günlüğüdür.',
+'patrol-log-line'      => '$3 kontrol edilmiş olarak $2 $1 sürümü işaretlendi',
+'patrol-log-auto'      => '(otomatik)',
+'patrol-log-diff'      => 'revizyon $1',
+'log-show-hide-patrol' => 'Gözetim günlüğünü $1',
 
 # Image deletion
-'deletedrevision'       => '$1 sayılı eski sürüm silindi.',
-'filedeleteerror-short' => '$1 dosyanın silinmesinde hata oldu',
+'deletedrevision'                 => '$1 sayılı eski sürüm silindi.',
+'filedeleteerror-short'           => '$1 dosyanın silinmesinde hata oldu',
+'filedeleteerror-long'            => 'Dosyayı silerken hatalarla karşılaşıldı:
+
+$1',
+'filedelete-missing'              => '"$1" dosyası silinemiyor, çünkü mevcut değil.',
+'filedelete-old-unregistered'     => 'Belirtilen dosya revizyonu "$1" veritabanında yok.',
+'filedelete-current-unregistered' => 'Belirtilen dosya "$1" veritabanında yok.',
+'filedelete-archive-read-only'    => '"$1" arşiv dizini websunucusu tarafından yazılabilir değil.',
 
 # Browsing diffs
 'previousdiff' => '� Önceki sürümle aradaki fark',
 'nextdiff'     => 'Sonraki sürümle aradaki fark →',
 
+# Visual comparison
+'visual-comparison' => 'Görsel karşılaştırma',
+
 # Media information
 'mediawarning'         => "'''Uyarı!''': Bu dosya kötü niyetli kodlar içerebilir ve işletim sisteminize zarar verebilir.<hr />",
 'imagemaxsize'         => 'Resim açıklamalar sayfalarındaki resmin en büyük boyutu:',
 'thumbsize'            => 'Küçük boyut:',
+'widthheight'          => '$1×$2',
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|sayfa|sayfa}}',
 'file-info'            => '(dosya boyutu: $1, MIME tipi: $2)',
 'file-info-size'       => '($1 × $2 piksel, dosya boyutu: $3, MIME tipi: $4)',
@@ -1755,16 +2439,24 @@ Lütfen başka bir isim deneyiniz.',
 'show-big-image'       => 'Tam çözünürlük',
 'show-big-image-thumb' => '<small>Ön izleme boyutu: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Yeni resimler',
 'imagelisttext'         => "Aşağıdaki liste '''$2''' göre dizilmiş {{PLURAL:$1|adet dosyayı|adet dosyayı}} göstermektedir.",
 'newimages-summary'     => 'Bu özel sayfa, en son yüklenen dosyaları göstermektedir.',
+'newimages-legend'      => 'Filtre',
+'newimages-label'       => 'Dosya adı (ya da bir parçası):',
 'showhidebots'          => '(botları $1)',
 'noimages'              => 'Görecek bir şey yok.',
 'ilsubmit'              => 'Ara',
 'bydate'                => 'kronolojik sırayla',
 'sp-newimages-showfrom' => '$1, $2 tarihi itibarı ile yeni resimleri göster',
 
+# Video information, used by Language::formatTimePeriod() to format lengths in the above messages
+'video-dims'     => '$1, $2×$3',
+'seconds-abbrev' => 'sn',
+'minutes-abbrev' => 'dk.',
+'hours-abbrev'   => 's',
+
 # Bad image list
 'bad_image_list' => 'Format şöyle:
 
@@ -1825,7 +2517,7 @@ Ondan sonraki link(ler) kural dışı olarak kabul edilir, örneğin: resim sayf
 'exif-componentsconfiguration'     => 'Her bileşenin anlamı',
 'exif-compressedbitsperpixel'      => 'Resim sıkıştırma biçimi',
 'exif-pixelydimension'             => 'Geçerli resim genişliği',
-'exif-pixelxdimension'             => 'Geçerli resim yükseğliği',
+'exif-pixelxdimension'             => 'Geçerli resim yüksekliği',
 'exif-makernote'                   => 'Yapımcı notları',
 'exif-usercomment'                 => 'Kullanıcı yorumu',
 'exif-relatedsoundfile'            => 'İlişkin ses dosyası',
@@ -1988,6 +2680,18 @@ Ondan sonraki link(ler) kural dışı olarak kabul edilir, örneğin: resim sayf
 'exif-lightsource-24'  => 'ISO stüdyo volframı',
 'exif-lightsource-255' => 'Diğer ışık kaynakları',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Flaş patlamadı',
+'exif-flash-fired-1'    => 'Flaş patladı',
+'exif-flash-return-0'   => 'Dönen ışık modu kapalı',
+'exif-flash-return-2'   => 'Dönen ışık yok',
+'exif-flash-return-3'   => 'Dönen ışık tespit edildi',
+'exif-flash-mode-1'     => 'Zorunlu flaş patladı',
+'exif-flash-mode-2'     => 'Zorunlu flaş kapalı',
+'exif-flash-mode-3'     => 'Otomatik kip',
+'exif-flash-function-1' => 'Flaş kapalı',
+'exif-flash-redeye-1'   => 'Kırmızı göz azaltma kipi',
+
 'exif-focalplaneresolutionunit-2' => 'inç',
 
 'exif-sensingmethod-1' => 'Tanımsız',
@@ -2037,7 +2741,7 @@ Ondan sonraki link(ler) kural dışı olarak kabul edilir, örneğin: resim sayf
 
 'exif-subjectdistancerange-0' => 'Bilinmiyor',
 'exif-subjectdistancerange-1' => 'Makro (yakın çekim)',
-'exif-subjectdistancerange-2' => 'Yakın görünüm',
+'exif-subjectdistancerange-2' => 'Kapalı görünüm',
 'exif-subjectdistancerange-3' => 'Uzak görünüm',
 
 # Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
@@ -2065,7 +2769,7 @@ Ondan sonraki link(ler) kural dışı olarak kabul edilir, örneğin: resim sayf
 
 # External editor support
 'edit-externally'      => 'Dosya üzerinde bilgisayarınızda bulunan uygulamalar ile değişiklikler yapın',
-'edit-externally-help' => 'Daha fazla bilgi için metadaki [http://www.mediawiki.org/wiki/Manual:External_editors dış uygulama ayarları] (İngilizce) sayfasına bakabilirsiniz.',
+'edit-externally-help' => '(Daha fazla bilgi için metadaki [http://www.mediawiki.org/wiki/Manual:External_editors dış uygulama ayarları] (İngilizce) sayfasına bakabilirsiniz)',
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'hepsi',
@@ -2075,45 +2779,56 @@ Ondan sonraki link(ler) kural dışı olarak kabul edilir, örneğin: resim sayf
 'monthsall'        => 'hepsi',
 
 # E-mail address confirmation
-'confirmemail'            => 'E-posta adresini onayla',
-'confirmemail_noemail'    => '[[Special:Preferences|Kullanıcı tercihlerinizde]] tanımlanmış uygun bir e-posta adresiniz yok.',
-'confirmemail_text'       => "Viki'nin e-posta işlevlerini kullanmabilmek için, önce e-posta adresinizin doğrulanması gerekiyor.
+'confirmemail'             => 'E-posta adresini onayla',
+'confirmemail_noemail'     => '[[Special:Preferences|Kullanıcı tercihlerinizde]] tanımlanmış uygun bir e-posta adresiniz yok.',
+'confirmemail_text'        => "Viki'nin e-posta işlevlerini kullanmabilmek için, önce e-posta adresinizin doğrulanması gerekiyor.
 Adresinize onay e-postası göndermek için aşağıdaki butonu tıklayın.
 Gönderilecek iletide adresinizi onaylamak için tarayıcınızla erişebileceğiniz, onay kodu içeren bir bağlantı olacak;
 linki tarayıcınıda açın ve e-posta adresinizin geçerliliğini doğrulayın.",
-'confirmemail_send'       => 'Onay kodu gönder',
-'confirmemail_sent'       => 'Onay e-postası gönderildi.',
-'confirmemail_sendfailed' => '{{SITENAME}} Onay maili gönderemedi. Geçersiz karakterler olabilir adresi kontrol edin
+'confirmemail_pending'     => '<div class="error">Bir doğrulama kodu size zaten e-postalandı;
+Eğer hesabınızı yeni oluşturduysanız, yeni bir kod istemeye çalışmadan önce gelmesini biraz beklemeyi isteyebilirsiniz.</div>',
+'confirmemail_send'        => 'Onay kodu gönder',
+'confirmemail_sent'        => 'Onay e-postası gönderildi.',
+'confirmemail_oncreate'    => 'Bir doğrulama kodu e-posta adresinize gönderildi.
+Giriş yapmak için bu kod gerekli değildir, ancak bu vikideki herhangi bir e-posta tabanlı özelliği devreye sokmak için bunu sağlamak zorundasınız.',
+'confirmemail_sendfailed'  => '{{SITENAME}} Onay maili gönderemedi. Geçersiz karakterler olabilir adresi kontrol edin
 
 Mail yazılımı iade etti:$1',
-'confirmemail_invalid'    => 'Geçersiz onay kodu. Onay kodunun son kullanma tarihi geçmiş olabilir.',
-'confirmemail_needlogin'  => 'E-posta adresinizi onaylamak için önce $1 yapmalısınız.',
-'confirmemail_success'    => "E-posta adresiniz onaylandı. Oturum açıp Viki'nin tadını çıkarabilirsiniz.",
-'confirmemail_loggedin'   => 'E-posta adresiniz onaylandı.',
-'confirmemail_error'      => 'Onayınız bilinmeyen bir hata nedeniyle kaydedilemedi.',
-'confirmemail_subject'    => '{{SITENAME}} e-posta adres onayı.',
-'confirmemail_body'       => '$1 internet adresinden yapılan erişimle {{SITENAME}} sitesinde 
-bu e-posta adresi ile ilişkilendirilen $2 kullanıcı hesabı 
-açıldı.  
-
-Bu e-posta adresinin bahsi geçen kullanıcı hesabına ait olduğunu
-onaylamak ve {{SITENAME}} sitesindeki e-posta iÅŸlevlerini aktif hale 
-getirmek için aşağıdakı bağlantıyı tıklayın.
+'confirmemail_invalid'     => 'Geçersiz onay kodu. Onay kodunun son kullanma tarihi geçmiş olabilir.',
+'confirmemail_needlogin'   => 'E-posta adresinizi onaylamak için önce $1 yapmalısınız.',
+'confirmemail_success'     => "E-posta adresiniz onaylandı. Oturum açıp Viki'nin tadını çıkarabilirsiniz.",
+'confirmemail_loggedin'    => 'E-posta adresiniz onaylandı.',
+'confirmemail_error'       => 'Onayınız bilinmeyen bir hata nedeniyle kaydedilemedi.',
+'confirmemail_subject'     => '{{SITENAME}} e-posta adres onayı.',
+'confirmemail_body'        => 'Birisi, muhtemelen siz, $1 IP adresinden,
+{{SITENAME}} sitesinde bu e-posta adresi ile $2 hesabını açtı.  
+
+Bu hesabın gerçekten size ait olduğunu onaylamak ve {{SITENAME}} sitesindeki
+e-posta işlevlerini aktif hale getirmek için aşağıdakı bağlantıyı tarayıcınızda açın.
 
 $3
 
-Bahsi geçen kullanıcı hesabı size ait değilse yapmanız gereken
-birÅŸey yok.
+Eğer hesabı siz *açmadıysanız*, e-posta adresi doğrulamasını
+iptal etmek için aşağıdaki bağlantıyı takip edin:
 
 $5
 
 Bu onay kodu $4 tarihine kadar geçerli olacak.',
+'confirmemail_invalidated' => 'E-posta adresi doğrulaması iptal edildi',
+'invalidateemail'          => 'E-posta doğrulamasını iptal et',
 
 # Scary transclusion
-'scarytranscludetoolong' => '[URL çok uzun]',
+'scarytranscludedisabled' => '[Vikilerarası çapraz ekleme devre dışı]',
+'scarytranscludefailed'   => '[$1 için şablon alımı başarısız oldu]',
+'scarytranscludetoolong'  => '[URL çok uzun]',
 
 # Trackbacks
-'trackbackremove' => ' ([$1 Sil])',
+'trackbackbox'      => '<div id="mw_trackbacks">Bu sayfa için geri izlemeler:<br />
+$1
+</div>',
+'trackbackremove'   => ' ([$1 Sil])',
+'trackbacklink'     => 'Geri izleme',
+'trackbackdeleteok' => 'Geri izleme başarıyla silindi.',
 
 # Delete conflict
 'deletedwhileediting' => "'''Uyarı''': Bu sayfa siz değişiklik yapmaya başladıktan sonra silinmiş!",
@@ -2124,19 +2839,10 @@ Sayfayı baştan açmak isityorsanız, lütfen onaylayın.",
 
 'unit-pixel' => 'px',
 
-# HTML dump
-'redirectingto' => 'Yönlendirme [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Sayfa önbelleği temizlensin mi? $1',
 'confirm_purge_button' => 'Tamam',
-
-# AJAX search
-'searchcontaining' => "''$1'' içeren sayfaları ara.",
-'searchnamed'      => "''$1'' isimli sayfaları ara.",
-'articletitles'    => "''$1'' ile baÅŸlayan maddeler",
-'hideresults'      => 'sonuçları gizle',
-'useajaxsearch'    => 'AJAX arama kullan',
+'confirm-purge-top'    => 'Sayfa önbelleği temizlensin mi?',
+'confirm-purge-bottom' => 'Bir sayfayı tasfiye etmek önbelleği temizler ve en güncel sürümün görünmesine zorlar.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� önceki sayfa',
@@ -2146,6 +2852,7 @@ Sayfayı baştan açmak isityorsanız, lütfen onaylayın.",
 
 # Table pager
 'ascending_abbrev'         => 'küçükten büyüğe',
+'descending_abbrev'        => 'azalan',
 'table_pager_next'         => 'Sonraki sayfa',
 'table_pager_prev'         => 'Önceki sayfa',
 'table_pager_first'        => 'Ä°lk',
@@ -2155,16 +2862,24 @@ Sayfayı baştan açmak isityorsanız, lütfen onaylayın.",
 'table_pager_empty'        => 'Sonuç yok',
 
 # Auto-summaries
-'autosumm-blank'   => 'Sayfa boşaltıldı',
+'autosumm-blank'   => 'Sayfayı boşalttı',
 'autosumm-replace' => "Sayfa içeriği '$1' ile değiştiriliyor",
 'autoredircomment' => '[[$1]] sayfasına yönlendirildi',
-'autosumm-new'     => 'Yeni sayfa: $1',
+'autosumm-new'     => "Sayfa oluşturdu, içeriği: '$1'",
 
 # Live preview
 'livepreview-loading' => 'Yükleniyor...',
 'livepreview-ready'   => 'Yükleniyor...  Tamam!',
+'livepreview-failed'  => 'Canlı önizleme başarısız! Normal önizlemeyi deneyin.',
+'livepreview-error'   => 'Bağlantı başarısız: $1 "$2".
+Normal önizlemeyi deneyin.',
+
+# Friendlier slave lag warnings
+'lag-warn-normal' => '$1 {{PLURAL:$1|dakikadan|dakikadan}} yeni değişiklikler bu listede görünmeyebilir.',
+'lag-warn-high'   => 'Veritabanı sunucusundaki aşırı gecikmeden dolayı, $1 {{PLURAL:$1|dakikadan|dakikadan}} yeni değişiklikler bu listede görünmeyebilir.',
 
 # Watchlist editor
+'watchlistedit-numitems'       => 'İzleme sayfanızda {{PLURAL:$1|1 başlık|$1 başlık}} var, tartışma sayfaları hariç.',
 'watchlistedit-noitems'        => 'İzleme listeniz hiçbir başlık içermemektedir.',
 'watchlistedit-normal-title'   => 'İzleme listesini düzenle',
 'watchlistedit-normal-legend'  => 'İzleme listesinden başlıkları kaldır',
@@ -2172,7 +2887,7 @@ Sayfayı baştan açmak isityorsanız, lütfen onaylayın.",
 Bir başlığı çıkarmak için, yanındaki kutucuğu işaretleyin, ve Başlıkları Çıkar butonuna tıklayın
 [[Special:Watchlist/raw|Satır listesini]] de düzenleyebilirsiniz',
 'watchlistedit-normal-submit'  => 'Başlıkları kaldır',
-'watchlistedit-normal-done'    => '$1 başlık izleme listenizden çıkartıldı:',
+'watchlistedit-normal-done'    => '{{PLURAL:$1|1 başlık|$1 başlık}} izleme listenizden çıkarıldı:',
 'watchlistedit-raw-title'      => 'Ham izleme listesini düzenle',
 'watchlistedit-raw-legend'     => 'Ham izleme listesini düzenle',
 'watchlistedit-raw-explain'    => "İzleme listenizdeki başlıklar aşağıda gösterilmektedir. Her satırda bir başlık olmak üzere, başlıkları ekleyerek ya da silerek listeyi düzenleyebilirsiniz. Bittiğinde ''İzleme listesini güncelle'''ye tıklayınız. Ayrıca [[Special:Watchlist/edit|standart düzenleme sayfasını]] da kullanabilirsiniz.",
@@ -2187,14 +2902,25 @@ Bir başlığı çıkarmak için, yanındaki kutucuğu işaretleyin, ve Başlık
 'watchlisttools-edit' => 'İzleme listesini gör ve düzenle',
 'watchlisttools-raw'  => 'Ham izleme listesini düzenle',
 
+# Core parser functions
+'unknown_extension_tag' => 'Bilinmeyen eklenti etiketi "$1"',
+'duplicate-defaultsort' => 'Uyarı: Varsayılan "$2" sınıflandırma anahtarı, önceki "$1" sınıflandırma anahtarını geçersiz kılıyor.',
+
 # Special:Version
 'version'                          => 'Sürüm', # Not used as normal message but as header for the special page itself
 'version-extensions'               => 'Yüklü ekler',
 'version-specialpages'             => 'Özel sayfalar',
+'version-parserhooks'              => 'Derleyici çengelleri',
 'version-variables'                => 'DeÄŸiÅŸkenler',
 'version-other'                    => 'DiÄŸer',
+'version-mediahandlers'            => 'Ortam iÅŸleyiciler',
+'version-hooks'                    => 'Çengeller',
 'version-extension-functions'      => 'Ek fonksiyonları',
+'version-parser-extensiontags'     => 'Derleyici eklenti etiketleri',
+'version-parser-function-hooks'    => 'Derleyici fonksiyon çengelleri',
 'version-skin-extension-functions' => 'Tema eki fonksiyonları',
+'version-hook-name'                => 'Çengel adı',
+'version-hook-subscribedby'        => 'Abone olan',
 'version-version'                  => 'Sürüm',
 'version-license'                  => 'Lisans',
 'version-software'                 => 'Yüklü yazılım',
@@ -2202,17 +2928,31 @@ Bir başlığı çıkarmak için, yanındaki kutucuğu işaretleyin, ve Başlık
 'version-software-version'         => 'Versiyon',
 
 # Special:FilePath
-'filepath'        => 'Dosyanın konumu',
-'filepath-page'   => 'Dosya adı:',
-'filepath-submit' => 'Konum',
+'filepath'         => 'Dosyanın konumu',
+'filepath-page'    => 'Dosya adı:',
+'filepath-submit'  => 'Konum',
+'filepath-summary' => 'Bu özel sayfa bir dosya için tam yolu getirir.
+Resimler tam çözünürlükte görüntülenir, diğer dosya tipleri ilgili programlarıyla doğrudan başlatılır.
+
+Dosya adını "{{ns:file}}:" öneki olmadan gir.',
 
 # Special:FileDuplicateSearch
+'fileduplicatesearch'          => 'Benzer dosyaları ara',
+'fileduplicatesearch-summary'  => 'Sağlama değeri tabanında benzer dosyaları ara.
+
+Dosya adını "{{ns:file}}:" öneki olmadan gir.',
+'fileduplicatesearch-legend'   => 'Bir benzerini ara',
 'fileduplicatesearch-filename' => 'Dosya adı:',
 'fileduplicatesearch-submit'   => 'Ara',
 'fileduplicatesearch-info'     => '$1 × $2 piksel<br />Dosya boyutu: $3<br />MIME tipi: $4',
+'fileduplicatesearch-result-1' => '"$1" dosyasının özdeş benzeri yok.',
+'fileduplicatesearch-result-n' => '"$1" dosyasının {{PLURAL:$2|1 özdeş benzeri|$2 özdeş benzeri}} var.',
 
 # Special:SpecialPages
 'specialpages'                   => 'Özel sayfalar',
+'specialpages-note'              => '----
+* Normal özel sayfalar.
+* <span class="mw-specialpagerestricted">Kısıtlı özel sayfalar.</span>',
 'specialpages-group-maintenance' => 'Bakım raporları',
 'specialpages-group-other'       => 'Diğer özel sayfalar',
 'specialpages-group-login'       => 'Oturum aç / hesap edin',
@@ -2223,10 +2963,20 @@ Bir başlığı çıkarmak için, yanındaki kutucuğu işaretleyin, ve Başlık
 'specialpages-group-pages'       => 'Sayfalar listesi',
 'specialpages-group-pagetools'   => 'Sayfa araçları',
 'specialpages-group-wiki'        => 'Viki bilgiler ve araçlar',
+'specialpages-group-redirects'   => 'Yönlendirmeli özel sayfalar',
 'specialpages-group-spam'        => 'Spam araçları',
 
 # Special:BlankPage
 'blankpage'              => 'BoÅŸ sayfa',
 'intentionallyblankpage' => 'Bu sayfa özellikle boştur.',
 
+# External image whitelist
+'external_image_whitelist' => ' #Bu satırı olduğu gibi bırakın<pre>
+#Düzenli ifade parçalarını (sadece // arasında kalan kısmı) aşağıya ekleyin
+#Bunlar dış (hotlink) resimlerin URLleri ile eşlenecektir
+#Eşleşenler resim olarak görünecek, aksi takdirde sadece resme bir bağlantı görünecektir
+# # ile başlayan satırlar yorum olarak muamele görecektir
+
+#Bütün düzenli ifade parçalarını bu satırın üstüne ekleyin. Bu satırı olduğu gibi bırakın</pre>',
+
 );
diff --git a/languages/messages/MessagesTs.php b/languages/messages/MessagesTs.php
index 9b1d7800..751b45c1 100644
--- a/languages/messages/MessagesTs.php
+++ b/languages/messages/MessagesTs.php
@@ -8,7 +8,31 @@
  */
 
 $messages = array(
-'skinpreview' => '(Ndzinganiso)',
+# User preference toggles
+'tog-justify'              => 'Hikahata xirhapa',
+'tog-hideminor'            => 'Tumbeta mindzulamiso leyi tsongo',
+'tog-usenewrc'             => 'Kucinca ka sweswinyana loku hlutiweke (JavaScript)',
+'tog-showtoc'              => 'Komba nxaxamelo wa leswingandzeni (eka tinhlokomhaka tinharhu kumbe kutlula)',
+'tog-rememberpassword'     => 'Tsundzuka ku nghena eka Khompuyuta leyi',
+'tog-watchcreations'       => 'Hoxa matluka lawa ndzi matumbuluxaka eka leswi ndziswi languteke',
+'tog-watchdefault'         => 'Hoxa matluka lawa ndzi malulamisaka eka leswi ndziswi languteke',
+'tog-watchmoves'           => "Hoxa matluka lawa ndzi mayisaka kun'wana eka leswi ndziswi languteke",
+'tog-watchdeletion'        => 'Hoxa matluka lawa ndzi masulaka eka leswi ndziswi languteke',
+'tog-enotifwatchlistpages' => 'ndzurhumele e-mail loko leswi ndzi swi languteke swi lulamisiwa',
+'tog-enotifusertalkpages'  => 'ndzurhumele e-mail loko tluka ra mbulavulo na mina ri lulamisiwa',
+'tog-enotifminoredits'     => 'ndzurhumele e-mail loko ku endleka mindzulamiso leyi ntsongo',
+'tog-enotifrevealaddr'     => 'Paluxa e-mail yamina eka mapapila lawa ndzimarhumelaka',
+'tog-shownumberswatching'  => 'Komba ntsengo wa vatirhisi lava hlaleleke tluka',
+'tog-forceeditsummary'     => 'Ndzivutisisi loko ndzinga hoxi nkomiso wa ndzulamiso lowu ndzi wu endleke',
+'tog-watchlisthideown'     => 'Tumbeta mindzulamiso ya mina eka leswi ndzi swi languteke',
+'tog-watchlisthidebots'    => 'Tumbeta mindzulamiso ya rhobhoti eka leswi ndzi swi languteke',
+'tog-watchlisthideminor'   => 'Tumbeta mindzulamiso leyi tsongo eka leswi ndzi swi languteke',
+'tog-watchlisthideliu'     => 'Tumbeta mindzulamiso ya vatirhisiwa lava ngheneke eka leswi ndzi swi languteke',
+'tog-watchlisthideanons'   => 'Tumbeta mindzulamiso ya vatirhisiwa lavanga tivekiki eka leswi ndzi swi languteke',
+'tog-ccmeonemails'         => "Ndzirhumele khopi ya ti e-mail leti ndzi ti rhumelaka van'wana",
+
+'underline-always' => 'Nkarhi hinkwawo',
+'underline-never'  => "Swinga endleki ni kan'we",
 
 # Dates
 'sunday'    => 'Sonto',
@@ -43,7 +67,7 @@ $messages = array(
 'mypage'         => 'Tluka ramina',
 'mytalk'         => 'Mbulavulo namina',
 'anontalk'       => 'Vulavula na IP leyi',
-'and'            => 'nakambe',
+'and'            => '&#32;nakambe',
 
 'errorpagetitle'   => 'Xihoxo',
 'returnto'         => 'Thlelela e $1.',
@@ -90,8 +114,6 @@ $messages = array(
 
 'badaccess'        => 'Xihoxo hita mpfumelelo',
 'badaccess-group0' => 'U hava mpumelelo wo endla xikombelo lexi.',
-'badaccess-group1' => 'The action you have requested is limited to users in the group $1.',
-'badaccess-group2' => 'The action you have requested is limited to users in one of the groups $1.',
 'badaccess-groups' => 'The action you have requested is limited to users in one of the groups $1.',
 
 'versionrequired'     => 'Version $1 of MediaWiki required',
@@ -192,7 +214,6 @@ It may have already been deleted by someone else.',
 'badtitle'             => 'Bad title',
 'badtitletext'         => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title.
 It may contain one or more characters which cannot be used in titles.',
-'perfdisabled'         => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.',
 'perfcached'           => 'The following data is cached and may not be up to date.',
 'perfcachedts'         => 'The following data is cached, and was last updated $1.',
 'querypage-no-updates' => 'Updates for this page are currently disabled.
@@ -215,19 +236,19 @@ Query: $2',
 'yourlanguage'            => 'Ririmi:',
 
 # Edit pages
-'summary'          => 'Nkomiso',
+'summary'          => 'Nkomiso:',
 'minoredit'        => 'Lowu i ndzulamiso wu tsongo',
 'watchthis'        => 'Langutisa tluka leri',
 'savearticle'      => 'Hlayisa tluka',
 'preview'          => 'Ringanisa',
 'showpreview'      => 'Komba kuringanisa',
 'showdiff'         => 'Komba ku cinca',
-'previewnote'      => '<strong>Lowu i ndzinganiso ntsena;
-kucinca a ku sihlayisiwa!</strong>',
-'copyrightwarning' => 'Xiya leswaku minyikelo hinkwayo e ka {{SITENAME}} yi tekiwa yitshuxiwe e hansi ka $2 (Vona $1 ku kuma vuxokoxoko).
+'previewnote'      => "'''Lowu i ndzinganiso ntsena;
+kucinca a ku sihlayisiwa!'''",
+'copyrightwarning' => "Xiya leswaku minyikelo hinkwayo e ka {{SITENAME}} yi tekiwa yitshuxiwe e hansi ka $2 (Vona $1 ku kuma vuxokoxoko).
 loko unga tsakeli leswaku vutsari bya wena byi lulamisiwa no aviwa handle ko tweriwa vusiwana, unga tsari laha.<br />
 U hi tshembisa nakambe leswaku hi wena mutsari wa leswi nyikeriwaka laha, kumbe leswi u swinyikelaka u swi tekile e xihloveni xa lerivaleni kumbe laha kunga na mpfumelelo wa mani na mani.
-<strong>UNGA RHUMERI MATSALWA LA MA SIRHELERIWEKE HANDLE KA MPFUMELELO!</strong>',
+'''UNGA RHUMERI MATSALWA LA MA SIRHELERIWEKE HANDLE KA MPFUMELELO!'''",
 
 # History pages
 'next'       => 'Leswilandzelaka',
@@ -240,15 +261,18 @@ U hi tshembisa nakambe leswaku hi wena mutsari wa leswi nyikeriwaka laha, kumbe
 'deletedhist'  => 'Matimu lamasuriweke',
 
 # Search results
+'searchhelp-url'        => 'Help:Leswinga ndzeni',
 'search-interwiki-more' => '(Leswi engetelekeke)',
 'search-relatedarticle' => 'Leswi yelanaka',
 'searchrelated'         => 'Yelanaka',
 'searchall'             => 'Hinkwaswo',
 'showingresults'        => "Kombisa e hansi kufika eka {{PLURAL:$1|'''1''' mbuyelo|'''$1''' mimbuyelo}} Kusungula hi#'''$2'''.",
+'powersearch'           => 'Ndzavisiso',
 
 # Preferences page
 'mypreferences'   => 'Minhlawulo ya mina',
 'prefs-edits'     => 'Ntsengo wa mindzulamiso:',
+'skin-preview'    => 'Ndzinganiso',
 'datetime'        => 'Siku na nkarhi',
 'prefs-watchlist' => 'Nxaxamelo wa Leswivoniwaka',
 'saveprefs'       => 'Hlayisa',
@@ -272,13 +296,13 @@ U hi tshembisa nakambe leswaku hi wena mutsari wa leswi nyikeriwaka laha, kumbe
 # Upload
 'upload' => 'Khandziyisa fayili',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'        => 'fayili',
-'imagelist'      => 'Nxaxamelo wa tifayili',
-'imagelist_date' => 'Siku',
-'imagelist_name' => 'vito',
+'listfiles'      => 'Nxaxamelo wa tifayili',
+'listfiles_date' => 'Siku',
+'listfiles_name' => 'vito',
 
-# Image description page
+# File description page
 'filehist-deleteall' => 'sula hinkwaswo',
 'filehist-deleteone' => 'Dlaya',
 'filehist-revert'    => 'thlerisela',
@@ -293,8 +317,15 @@ U hi tshembisa nakambe leswaku hi wena mutsari wa leswi nyikeriwaka laha, kumbe
 'specialloguserlabel' => 'Mutirhisi:',
 
 # Special:AllPages
-'allpages'    => 'Matluka hinkwawo',
-'allarticles' => 'Matluka hinkwawo',
+'allpages'       => 'Matluka hinkwawo',
+'alphaindexline' => '$1 kuya fika eka $2',
+'allarticles'    => 'Matluka hinkwawo',
+
+# Special:LinkSearch
+'linksearch-ok' => 'Lava',
+
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Mutirhisi muntswa',
 
 # E-mail user
 'emailuser' => 'rhumela mutirhisi loyi E-mail',
diff --git a/languages/messages/MessagesTt.php b/languages/messages/MessagesTt.php
index 00ec7395..20740b94 100644
--- a/languages/messages/MessagesTt.php
+++ b/languages/messages/MessagesTt.php
@@ -1,10 +1,9 @@
 <?php
-/** Tatar (Tatarça)
+/** Tatar (Tatarça/Татарча)
  *
  * @ingroup Language
  * @file
  *
- * @author Siebrand
  * @comment Placeholder for Tatar. Falls back to Tatar in Latin script.
  */
 
diff --git a/languages/messages/MessagesTt_cyrl.php b/languages/messages/MessagesTt_cyrl.php
index edc124b4..79bf1152 100644
--- a/languages/messages/MessagesTt_cyrl.php
+++ b/languages/messages/MessagesTt_cyrl.php
@@ -57,8 +57,6 @@ $messages = array(
 'underline-never'   => 'Һичкайчан',
 'underline-default' => 'Күзәтүче көйләнмәләрне кулланырга',
 
-'skinpreview' => '(�лдан карау)',
-
 # Dates
 'sunday'        => '�кшәмбе',
 'monday'        => 'дүшәмбе',
@@ -151,14 +149,14 @@ $messages = array(
 'mytalk'         => 'Фикер алышу битем',
 'anontalk'       => 'Бу IP-адре� өчен фикер алышу',
 'navigation'     => '�авигаци�',
-'and'            => 'һәм',
+'and'            => '&#32;һәм',
 
 # Metadata in edit box
 'metadata_help' => 'Мета-мәгълүматлар:',
 
 'errorpagetitle'    => 'Хата',
 'returnto'          => '$1 битенә кайту.',
-'tagline'           => "{{SITENAME}}'дән",
+'tagline'           => '{{SITENAME}} проектыннан',
 'help'              => 'Ярдәм',
 'search'            => 'Эзләү',
 'searchbutton'      => 'Эзләү',
@@ -182,30 +180,30 @@ $messages = array(
 'protect_change'    => '�клауны үзгәртү',
 'protectthispage'   => 'Бу битне �клау',
 'unprotect'         => 'Яклауны бетерү',
-'unprotectthispage' => 'Бу битнең �клауын бетерү',
+'unprotectthispage' => 'Бу битнең �клавын бетерү',
 'newpage'           => 'Яңа бит',
 'talkpage'          => 'Бу битне фикер алышу',
 'talkpagelinktext'  => 'Фикер алышу',
 'specialpage'       => 'Мах�у� бит',
 'personaltools'     => 'Шәх�и кораллар',
 'postcomment'       => 'Шәрехләү',
-'articlepage'       => 'Битне карарга',
+'articlepage'       => 'Битне карау',
 'talk'              => 'Фикер алышу',
 'views'             => 'Караулар',
 'toolbox'           => 'Кораллар җыелма�ы',
-'userpage'          => 'Кулланучы битен карарга',
-'projectpage'       => 'Проект битен карарга',
-'imagepage'         => 'Рә�ем битен карарга',
-'mediawikipage'     => 'Хәбәр битен карарга',
-'templatepage'      => 'Үрнәкнең битен карарга',
-'viewhelppage'      => 'Ярдәм битен карарга',
-'categorypage'      => 'Төркем битен карарга',
-'viewtalkpage'      => 'Фикер алышуны карарга',
+'userpage'          => 'Кулланучы битен карау',
+'projectpage'       => 'Проект битен карау',
+'imagepage'         => 'Рә�ем битен карау',
+'mediawikipage'     => 'Хәбәр битен карау',
+'templatepage'      => 'Үрнәк битен карау',
+'viewhelppage'      => 'Ярдәм битен карау',
+'categorypage'      => 'Төркем битен карау',
+'viewtalkpage'      => 'Фикер алышуны карау',
 'otherlanguages'    => 'Башка телләрендә',
-'redirectedfrom'    => '($1 битенән юнәлтелгән)',
-'redirectpagesub'   => 'Юнәлтү бите',
+'redirectedfrom'    => '($1 битеннән юнәлгән)',
+'redirectpagesub'   => 'Юнәлеш бите',
 'lastmodifiedat'    => 'Бу битне �оңгы үзгәртмә: $2, $1.', # $1 date, $2 time
-'viewcount'         => 'Бу биткә $1 {{PLURAL:$1|тапкыр}} мөрәҗәгать иттеләр.',
+'viewcount'         => 'Бу биткә $1 {{PLURAL:$1|тапкыр}} мөрәҗәгать ителгән.',
 'protectedpage'     => 'Якланган бит',
 'jumpto'            => 'Күчү:',
 'jumptonavigation'  => 'навигаци�',
@@ -214,9 +212,7 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{GRAMMAR:genitive|{{SITENAME}}}} турында',
 'aboutpage'            => 'Project:Та�вир',
-'bugreports'           => 'Хата хи�аплары',
-'bugreportspage'       => 'Project:Хата хи�аплары',
-'copyright'            => 'Мәглүмат үтәрлек моның буенча: $1.',
+'copyright'            => 'Мәглүмат ирешерлек моның буенча: $1.',
 'copyrightpagename'    => '{{SITENAME}} проектының авторлык хокукы',
 'copyrightpage'        => '{{ns:project}}:�вторлык хокуклары',
 'currentevents'        => 'Хәзерге вакыйгалар',
@@ -238,8 +234,6 @@ $messages = array(
 
 'badaccess'        => 'Рөх�әт хата�ы',
 'badaccess-group0' => 'Сез �ораган гамәлне башкара алмый�ыз.',
-'badaccess-group1' => 'Соралган гамәл $1 төркеменең кулланучылары гына өчен.',
-'badaccess-group2' => 'Соралган гамәл $1 төркемләренең кулланучылары гына өчен.',
 'badaccess-groups' => 'Соралган гамәл $1 төркемләренең кулланучылары гына өчен.',
 
 'versionrequired'     => 'MediaWiki вер�и� $1 кирәк',
@@ -336,7 +330,6 @@ $1',
 'cannotdelete'         => 'Бу битне �ки файлны бетереп булмый. Бәлки, ул инде бетерелгән.',
 'badtitle'             => 'Ярак�ыз башлам',
 'badtitletext'         => 'Битнең �оралган и�еме дөре� түгел � юк, �ки телара � интервики и�ем дөре� түгел күр�әтелгән. Бәлки, и�емдә �рамаган �имволлар куллыйлар.',
-'perfdisabled'         => 'Гафу итегез, бу мөмкинлек �ервер мәшгульлеге арка�ында кулланып булмый.',
 'perfcached'           => 'Бу мәгълүматлар кештән бирелгәннәр һәм, бәлки, аларда �оңгы үзгәртмәләр юк.',
 'perfcachedts'         => 'Бу мәгълүматлар кештән бирелгәннәр, ул �оңгы тапкырда $1 �ңарды.',
 'querypage-no-updates' => 'Хәзер бу битне үзгәртеп булмый. Бу мәгълүматлар хәзер �ңарма�лар.',
@@ -350,7 +343,7 @@ $1',
 'protectedpagetext'    => 'Бу битне үзгәртеп булмый.',
 'viewsourcetext'       => 'Сез бу битнең башлангыч тек�тны карый һәм күчермә ала�ыз:',
 'protectedinterface'   => 'Бу биттә программа интерфей� хәбәре бар. Вандализмга каршы, бу битне үзгәртеп булмый.',
-'editinginterface'     => "'''Игътибар:''' Сез MediaWiki �и�тема�ы хәбәре беләнге битне үзгәртә�ез. Бу башка кулланучылар интерфей�ын үзгәртер. Сезнең тәрҗемә итә�егез кил�ә, зинһар, [http://translatewiki.net/wiki/Main_Page?setlang=tt-cyrl Betawiki] кулланыгыз.",
+'editinginterface'     => "'''Игътибар:''' Сез MediaWiki �и�тема�ы хәбәре беләнге битне үзгәртә�ез. Бу башка кулланучылар интерфей�ын үзгәртер. Сезнең тәрҗемә итә�егез кил�ә, зинһар, [http://translatewiki.net/wiki/Main_Page?setlang=tt-cyrl translatewiki.net] кулланыгыз.",
 'sqlhidden'            => '(SQL �оравы �шерелгән)',
 'cascadeprotected'     => 'Бу бит үзгәртүдән �акланган, чөнки ул андый "ка�кад" �акланган {{PLURAL:$1|биткә|битләргә}} ө�тәлгән:
 $2',
@@ -362,10 +355,10 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => 'Чыгарга',
-'logouttext'                 => '<strong>Сез хәзер чыккан�ыз.</strong>
+'logouttext'                 => "'''Сез хәзер чыккан�ыз.'''
 
 Сез проект аноним кебек куллана ала�ыз, �ки Сез шул кулланучы да � башка кулланучы кебек керә ала�ыз.
-�индидер битләр һәм хәбәрләр, Сез кермәгән�ез, дип кебек күр�әтеләләр, әгәр �ез кешегез бушалып калдырма�агыз.',
+�индидер битләр һәм хәбәрләр, Сез кермәгән�ез, дип кебек күр�әтеләләр, әгәр �ез кешегез бушалып калдырма�агыз.",
 'welcomecreation'            => '== Рәхим итегез, $1! ==
 Сез теркәлгән�ез.
 Сайт пер�ональ көйләргә онытмагыз.',
@@ -375,7 +368,6 @@ $2',
 'yourpasswordagain'          => 'Сер�үзне кабат кертү:',
 'remembermypassword'         => 'Теркәү и�емемне бу компьютердә онытма�ка',
 'yourdomainname'             => 'Сезнең доменыгыз:',
-'loginproblem'               => '<b>Керүегездә авырлык бар.</b><br />Кабатлагызчы!',
 'login'                      => 'Керү',
 'nav-login-createaccount'    => 'Керү / хи�ап �зма�ы төзү',
 'userlogin'                  => 'Керү / хи�ап �зма�ы төзү',
@@ -451,6 +443,9 @@ $2',
 'resetpass_announce'      => 'Сез �лектрон почта белән вакытлы бирелгән �ер�үз белән кергән�ез. Си�темага керү төгәлләп, �ез �ңа �ер�үз төзергә тиеш.',
 'resetpass_text'          => '<!-- Монда тек�т ө�тәгез -->',
 'resetpass_header'        => 'Сер�үзне ташлатырга',
+'oldpassword'             => 'И�ке �ер�үз:',
+'newpassword'             => 'Яңа �ер�үз:',
+'retypenew'               => 'Яңа �ер�үзне кабатлагыз:',
 'resetpass_submit'        => 'Сер�үз төзү дә керү',
 'resetpass_bad_temporary' => 'Вакытлы �ер�үз дөре� түгел. Бәлки, �ез инде �ер�үзне алмаштырган идегез, �ки тагын бер тапкыр вакытлы �ер�үз �орарга �ынагыз.',
 'resetpass_forbidden'     => 'Бу вики-�и�темада �ер�үзләрне алмаштырып булмый.',
@@ -476,8 +471,8 @@ $2',
 'hr_tip'          => 'Горизонталь �ызык (еш кулланмагыз)',
 
 # Edit pages
-'summary'                => 'Үзгәртүләр та�виры',
-'subject'                => 'Тема/баши�ем',
+'summary'                => 'Үзгәртүләр та�виры:',
+'subject'                => 'Тема/баши�ем:',
 'minoredit'              => 'Бу әһәми�т�ез үзгәртү',
 'watchthis'              => 'Бу битне күзәтергә',
 'savearticle'            => 'Битне �аклау',
@@ -490,8 +485,8 @@ $2',
 'missingcommenttext'     => 'Зинһар, а�ка комментыгыз �зыгыз.',
 'missingcommentheader'   => "'''И�кәртү:''' Сез комментыгызның башын күр�әтмәгән�ез.
 Сез «Битне �аклау» кнопка�ына ба��агыз, үзгәртмәгез баш�ыз �зылыр.",
-'summary-preview'        => 'Җыелма нәтиҗәне алдан карау',
-'subject-preview'        => 'Баши�емне алдан карау',
+'summary-preview'        => 'Җыелма нәтиҗәне алдан карау:',
+'subject-preview'        => 'Баши�емне алдан карау:',
 'blockedtitle'           => 'Кулланучы кы�тырган',
 'blockednoreason'        => '�әбәп күр�әтмәгән',
 'blockedoriginalsource'  => 'Бит «$1» тек�ты а�ка күр�әткән.',
@@ -515,17 +510,17 @@ $2',
 'noarticletext'          => "Хәзер бу биттә тек�т юк. Сез [[Special:Search/{{PAGENAME}}|аның башы башка мәкаләләрдә таба]] �ки '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} андый баш белән бит ��ый]''' ала�ыз.",
 'clearyourcache'         => "'''И�кәрмә:''' Битне �аклаудан �оң төзәтмәләр күрү өчен күзәтүчегезнең к�шын буш итегез.
 '''Mozilla / Firefox''': ''Ctrl+Shift+R'', '''Safari''': ''Cmd+Shift+R'', '''IE:''' ''Ctrl+F5'', '''Konqueror''': ''F5'', '''Opera''': ''Tools→Preferences'' �айлагында.",
-'previewnote'            => '<strong>Бу фәкать алдан карау, төзәтмәләр әле �акланмаган!</strong>',
+'previewnote'            => "'''Бу фәкать алдан карау, төзәтмәләр әле �акланмаган!'''",
 'editing'                => 'Төзәтү: $1',
 'editingsection'         => '$1 үзгәртүе (бүлек)',
 'yourtext'               => 'Сезнең тек�т',
 'storedversion'          => 'Сакланган юрама',
 'yourdiff'               => '�ермалыклар',
-'copyrightwarning'       => 'Бөтен ө�тәмә һәм үзгәртмә $2 (к. $1) лицензи�нең шартлары буенча уйлана, дип игътибар итегезче.
+'copyrightwarning'       => "Бөтен ө�тәмә һәм үзгәртмә $2 (к. $1) лицензи�нең шартлары буенча уйлана, дип игътибар итегезче.
 Е�ли вы не хотите, чтобы һәркем аларны ирекле үзгәртә вә тарата, дип теләмә�әгез, анда алар �змагыз.<br />
 Сез дә, бу ө�тәлмә үзем �здыгыз �ке ирекле үзгәрүче чыганакның копи��е иттегез, дип �үз берә�ез.<br />
-<strong>РӨХСӘТСЕЗ �ВТОР ХОКУКЫ С�КЛ��УЧЫ М�ТЕРИ�ЛЛ�Р�Ы ЯЗМ�ГЫЗ!</strong>',
-'longpageerror'          => '<strong>Х�Т�: �зыла торган тек�тта $1 килобайт бар, бу $2 килобайт чигеннән күбрәк. Бит �аклана алмый.</strong>',
+'''РӨХСӘТСЕЗ �ВТОР ХОКУКЫ С�КЛ��УЧЫ М�ТЕРИ�ЛЛ�Р�Ы ЯЗМ�ГЫЗ!'''",
+'longpageerror'          => "'''Х�Т�: �зыла торган тек�тта $1 килобайт бар, бу $2 килобайт чигеннән күбрәк. Бит �аклана алмый.'''",
 'templatesused'          => 'Бу биттә кулланган өлгеләр:',
 'templatesusedpreview'   => 'Бу алдан карау биттә кулланган өлгеләр:',
 'templatesusedsection'   => 'Бу бүлектә кулланган өлгеләр:',
@@ -537,19 +532,20 @@ $2',
 'cantcreateaccounttitle' => 'Хи�ап �зма�ыны төзергә мөмкинлек юк',
 
 # History pages
-'viewpagelogs'        => 'Бу бит өчен журналларны карарга',
-'currentrev'          => '�гымдагы юрама',
-'revisionasof'        => 'Юрама $1',
-'revision-info'       => 'Юрама: $1; $2',
-'previousrevision'    => '� �лдагы төзәтмәләр',
-'nextrevision'        => 'Чираттагы төзәтмәләр →',
-'currentrevisionlink' => '�гымдагы юрама',
-'cur'                 => 'агым.',
-'last'                => 'ба�.',
-'page_first'          => 'беренче',
-'page_last'           => '�оңгы',
-'histfirst'           => 'Баштагы',
-'histlast'            => 'Ба�гы',
+'viewpagelogs'           => 'Бу бит өчен журналларны карарга',
+'currentrev'             => '�гымдагы юрама',
+'revisionasof'           => 'Юрама $1',
+'revision-info'          => 'Юрама: $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� �лдагы төзәтмәләр',
+'nextrevision'           => 'Чираттагы төзәтмәләр →',
+'currentrevisionlink'    => '�гымдагы юрама',
+'cur'                    => 'агым.',
+'last'                   => 'ба�.',
+'page_first'             => 'беренче',
+'page_last'              => '�оңгы',
+'history-fieldset-title' => 'Тарихын күзәтү',
+'histfirst'              => 'Баштагы',
+'histlast'               => 'Ба�гы',
 
 # Revision deletion
 'rev-deleted-comment' => '(и�кәрмә бетергән)',
@@ -571,6 +567,7 @@ $2',
 'prevn'               => 'алдагы $1',
 'nextn'               => 'чираттагы $1',
 'viewprevnext'        => '($1) ($2) ($3) карарга',
+'searchhelp-url'      => 'Help:Эчтәлек',
 'search-result-size'  => '$1 ({{PLURAL:$2|$2 �үз}})',
 'search-redirect'     => '($1 җибәрүлеге)',
 'search-section'      => '($1 бүлеге)',
@@ -589,6 +586,7 @@ $2',
 'qbsettings-none'       => 'Күр�әтмә�кә',
 'changepassword'        => 'Сер�үзне алыштырырга',
 'skin'                  => 'Күренеш',
+'skin-preview'          => '�лдан карау',
 'math'                  => 'Формулалар',
 'dateformat'            => 'Датаның форматы',
 'datetime'              => 'Дата һәм вакыт',
@@ -600,9 +598,6 @@ $2',
 'prefs-misc'            => 'Башка көйләнмәләр',
 'saveprefs'             => 'Саклау',
 'resetprefs'            => 'Сакланмаган төзәтмәләрне бетерү',
-'oldpassword'           => 'И�ке �ер�үз:',
-'newpassword'           => 'Яңа �ер�үз:',
-'retypenew'             => 'Яңа �ер�үзне кабатлагыз:',
 'textboxsize'           => 'Үзгәртү',
 'rows'                  => 'Юллар:',
 'columns'               => 'Баганалар:',
@@ -672,15 +667,15 @@ $2',
 'uploadlogpage' => 'Йөкләү журналы',
 'uploadedimage' => '«[[$1]]» йөкләнгән',
 
-# Special:ImageList
-'imagelist'             => 'Сүрәтләр и�емлеге',
-'imagelist_date'        => 'Вакыт',
-'imagelist_name'        => '�т',
-'imagelist_user'        => 'Кулланучы',
-'imagelist_size'        => 'Үлчәм',
-'imagelist_description' => 'Та�вир',
+# Special:ListFiles
+'listfiles'             => 'Сүрәтләр и�емлеге',
+'listfiles_date'        => 'Вакыт',
+'listfiles_name'        => '�т',
+'listfiles_user'        => 'Кулланучы',
+'listfiles_size'        => 'Үлчәм',
+'listfiles_description' => 'Та�вир',
 
-# Image description page
+# File description page
 'filehist'                  => 'Файлның тарихы',
 'filehist-help'             => 'Датага/�әгатькә ба�ыгыз, шул вакытта бит нинди булды дип карау өчен.',
 'filehist-current'          => 'агымдагы',
@@ -765,8 +760,6 @@ $2',
 'speciallogtitlelabel' => 'Башлам:',
 'log'                  => 'Журналлар',
 'all-logs-page'        => 'Барлык журналлар',
-'log-search-legend'    => 'Журналларны �зләү',
-'log-search-submit'    => 'Башкару',
 
 # Special:AllPages
 'allpages'       => 'Барлык битләр',
@@ -804,22 +797,16 @@ $2',
 'emailsent'       => 'Хат җибәрелгән',
 
 # Watchlist
-'watchlist'            => 'Күзәтү и�емлегем',
-'mywatchlist'          => 'Күзәтү и�емлегем',
-'watchlistfor'         => "('''$1''' кулланучы өчен)",
-'addedwatch'           => 'Күзәтү и�емлегенә ө�тәгән',
-'removedwatch'         => 'Күзәтү и�емлегенән бетерергән',
-'removedwatchtext'     => '«[[:$1]]» бите �езнең күзәтү и�емлегездә бетерергән',
-'watch'                => 'Күзәтергә',
-'watchthispage'        => 'Бу битне күзәтергә',
-'unwatch'              => 'Күзәтмә�кә',
-'wlshowlast'           => 'Ба�гы $1 �әгать $2 көн �чендә �ки $3ны күр�әтергә',
-'watchlist-show-bots'  => 'Ботларның үзгәртүләрене күр�әтергә',
-'watchlist-hide-bots'  => 'Ботлар төзәтмәләрне �шерергә',
-'watchlist-show-own'   => 'Минем үзгәртүләремне күр�әтергә',
-'watchlist-hide-own'   => 'Төзәтмәләремне �шерергә',
-'watchlist-show-minor' => 'Әһәми�т�ез үзгәртүләрне күр�әтергә',
-'watchlist-hide-minor' => 'Әһәми�т�ез үзгәртүләрне �шерергә',
+'watchlist'        => 'Күзәтү и�емлегем',
+'mywatchlist'      => 'Күзәтү и�емлегем',
+'watchlistfor'     => "('''$1''' кулланучы өчен)",
+'addedwatch'       => 'Күзәтү и�емлегенә ө�тәгән',
+'removedwatch'     => 'Күзәтү и�емлегенән бетерергән',
+'removedwatchtext' => '«[[:$1]]» бите �езнең күзәтү и�емлегездә бетерергән',
+'watch'            => 'Күзәтергә',
+'watchthispage'    => 'Бу битне күзәтергә',
+'unwatch'          => 'Күзәтмә�кә',
+'wlshowlast'       => 'Ба�гы $1 �әгать $2 көн �чендә �ки $3ны күр�әтергә',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Күзәтү и�емлегемә ө�тәүе…',
@@ -830,30 +817,35 @@ $2',
 'changed'                      => 'үзгәртергән',
 'created'                      => 'төзергән',
 
-# Delete/protect/revert
-'deletepage'                  => 'Битне бетерергә',
-'confirm'                     => 'Ра�ларга',
-'excontent'                   => '�чтәлек: «$1»',
-'exblank'                     => 'бит буш иде',
-'delete-confirm'              => '«$1» бетерүе',
-'delete-legend'               => 'Бетерү',
-'historywarning'              => 'Ки�әтү: �ез бетерергә теләгән биттә үзгәртү тарихы бар:',
-'actioncomplete'              => 'Гамәл башкарган',
-'deletedtext'                 => '«<nowiki>$1</nowiki>» бетерергән инде.<br />
+# Delete
+'deletepage'            => 'Битне бетерергә',
+'confirm'               => 'Ра�ларга',
+'excontent'             => '�чтәлек: «$1»',
+'exblank'               => 'бит буш иде',
+'delete-confirm'        => '«$1» бетерүе',
+'delete-legend'         => 'Бетерү',
+'historywarning'        => 'Ки�әтү: �ез бетерергә теләгән биттә үзгәртү тарихы бар:',
+'actioncomplete'        => 'Гамәл башкарган',
+'deletedtext'           => '«<nowiki>$1</nowiki>» бетерергән инде.<br />
 Соңгы бетерүләр карау өчен, $2 кара.',
-'deletedarticle'              => '«[[$1]]» бетерергән',
-'dellogpage'                  => 'Бетерү и�емлеге',
-'deletionlog'                 => 'бетерү журналы',
-'deletecomment'               => 'Бетерү �әбәбе:',
-'deleteotherreason'           => 'Башка/ө�тәмә �әбәп:',
-'deletereasonotherlist'       => 'Башка �әбәп',
-'rollbacklink'                => 'кире кайтару',
+'deletedarticle'        => '«[[$1]]» бетерергән',
+'dellogpage'            => 'Бетерү и�емлеге',
+'deletionlog'           => 'бетерү журналы',
+'deletecomment'         => 'Бетерү �әбәбе:',
+'deleteotherreason'     => 'Башка/ө�тәмә �әбәп:',
+'deletereasonotherlist' => 'Башка �әбәп',
+
+# Rollback
+'rollbacklink' => 'кире кайтару',
+
+# Protect
 'protectlogpage'              => 'Яклану журналы',
 'protectedarticle'            => '«[[$1]]» �кланган',
 'unprotectedarticle'          => '«[[$1]]» инде �кланмаган',
+'prot_1movedto2'              => '«[[$1]]» бите «[[$2]]» биткә күчерергән',
 'protectcomment'              => 'И�кәрмә:',
 'protect-unchain'             => 'Битнең күчерү рөх�әте ачарга',
-'protect-text'                => 'Биредә �ез <strong><nowiki>$1</nowiki></strong> бите өчен �клау дәрәҗә�ене карый һәм үзгәрә ала�ыз.',
+'protect-text'                => "Биредә �ез '''<nowiki>$1</nowiki>''' бите өчен �клау дәрәҗә�ене карый һәм үзгәрә ала�ыз.",
 'protect-default'             => '(килешү буенча)',
 'protect-fallback'            => '«$1»нең рөх�әте кирәк',
 'protect-level-autoconfirmed' => 'Теркәлмәгән кулланучыларны кы�арга',
@@ -862,6 +854,7 @@ $2',
 'protect-expiring'            => '$1 үтә (UTC)',
 'protect-cascade'             => 'Бу биткә кергән битләрне �кларга (ка�кадлы �клау)',
 'protect-cantedit'            => 'Сез бу битнең �клау дәрәҗә�ене үзгәрә алмый�ыз, чөнки �ездә аны үзгәртергә рөх�әтегез юк.',
+'protect-expiry-options'      => '15 минут:15 minutes,2 �әгать:2 hours,6 �әгать:6 hours,12 �әгать:12 hours,1 көн:1 day,3 көн:3 days,1 атна:1 week,2 атна:2 weeks,1 ай:1 month,3 ай:3 months,6 ай:6 months,1 ел:1 year,вакыт�ыз:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Рөх�әт:',
 'restriction-level'           => 'Мөмкинлек дәрәҗә�е:',
 'minimum-size'                => 'Иң кечкенә зурлык',
@@ -910,7 +903,6 @@ $2',
 'whatlinkshere'       => 'Бирегә нәр�ә �ылтый',
 'whatlinkshere-title' => '$1 битенә �ылтый торган битләр',
 'whatlinkshere-page'  => 'Бит:',
-'linklistsub'         => '(Сылтамалар и�емлеге)',
 'linkshere'           => "'''[[:$1]]''' биткә чираттагы битләр �ылтый:",
 'nolinkshere'         => "'''[[:$1]]''' битенә башка битләр �ылтамыйлар.",
 'isredirect'          => 'җибәрү өчен бит',
@@ -1005,7 +997,7 @@ $2',
 'show-big-image'       => 'Тулы ачыклык',
 'show-big-image-thumb' => '<small>�лдан карау зурлыгы: $1 × $2 нокта</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Яңа �үрәтләр җыелма�ы',
 
 # Bad image list
diff --git a/languages/messages/MessagesTt_latn.php b/languages/messages/MessagesTt_latn.php
index 3526e92f..dfcecc60 100644
--- a/languages/messages/MessagesTt_latn.php
+++ b/languages/messages/MessagesTt_latn.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
         NS_USER_TALK        => "Äğzä_bäxäse",
         # NS_PROJECT set by $wgMetaNamespace
         NS_PROJECT_TALK     => '$1_bäxäse',
-        NS_IMAGE            => "Räsem",
-        NS_IMAGE_TALK       => "Räsem_bäxäse",
+        NS_FILE             => "Räsem",
+        NS_FILE_TALK        => "Räsem_bäxäse",
         NS_MEDIAWIKI        => "MediaWiki",
         NS_MEDIAWIKI_TALK   => "MediaWiki_bäxäse",
         NS_TEMPLATE         => "Ürnäk",
@@ -82,8 +82,6 @@ $fallback8bitEncoding = "windows-1254";
 $linkTrail = '/^([a-zäçğıñöşü“»]+)(.*)$/sDu';
 
 $messages = array(
-'skinpreview' => '(Küzläw)',
-
 # Dates
 'sunday'    => 'Yäkşämbe',
 'monday'    => 'Düşämbe',
@@ -141,7 +139,7 @@ $messages = array(
 'mytalk'         => 'Bäxäsem',
 'anontalk'       => 'Bu IP turında bäxäs',
 'navigation'     => 'Küçü',
-'and'            => 'wä',
+'and'            => '&#32;wä',
 
 'errorpagetitle'    => 'Xata',
 'returnto'          => '«$1» bitenä qaytu.',
@@ -186,8 +184,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} Turında',
 'aboutpage'            => 'Project:Turında',
-'bugreports'           => 'Xatanamä',
-'bugreportspage'       => 'Project:Xata_yomğağı',
 'copyright'            => 'Eçtälek $1 buyınça ireşüle.',
 'copyrightpagename'    => '{{SITENAME}} qälämxaqı',
 'copyrightpage'        => '{{ns:project}}:Qälämxaq',
@@ -240,7 +236,6 @@ $messages = array(
 'filenotfound'    => 'Bu «$1» biremen tabalmím.',
 'formerror'       => 'Xata: formını künderä almím',
 'badtitle'        => 'Yaraqsız başlıq',
-'perfdisabled'    => 'Kiçer! Biremlekneñ äkren buluına säbäple, bu mömkinlek waqıtlıça sünderelgän ide.',
 'perfcached'      => 'Astağı belem alxäterdän alındı wä anıñ xäzerge xäl belän turı kilmäwe bar:',
 'perfcachedts'    => '$1 çağında bolğan torış asılında yasalğan tizme bo.',
 'viewsource'      => 'Mäqälä çığanağı',
@@ -255,7 +250,6 @@ Sineñ xísabıñ yasaldı. {{SITENAME}}'dağı köyläwläreñne dä üzgärter
 'yourpassword'          => 'Sersüzeñ',
 'yourpasswordagain'     => 'Sersüz qabat',
 'remembermypassword'    => 'Tanı mine kergändä.',
-'loginproblem'          => '<b>Kerüeñ waqıtında nindider qíınlıq bulıp çıqtı.</b><br />Qabat kerep qara!',
 'login'                 => 'İreşü',
 'userlogin'             => 'Xísap yasaw yä ki kerü',
 'logout'                => 'Çığış',
@@ -278,6 +272,11 @@ Sineñ xísabıñ yasaldı. {{SITENAME}}'dağı köyläwläreñne dä üzgärter
 Anı alğaç monda tağın kerep qara.',
 'mailerror'             => 'Xat künderü xatası: $1',
 
+# Password reset dialog
+'oldpassword' => 'İske sersüz',
+'newpassword' => 'Yaña sersüz',
+'retypenew'   => 'Yaña sersüz (qabat)',
+
 # Edit page toolbar
 'bold_sample'     => 'Qalın mäten',
 'bold_tip'        => 'Qalın mäten',
@@ -295,13 +294,13 @@ Anı alğaç monda tağın kerep qara.',
 'nowiki_tip'      => 'Wiki-qalıp eşkärtmäskä',
 'image_sample'    => 'Mísal.jpg',
 'image_tip'       => 'Quşılğan räsem',
-'media_sample'    => 'Mísal.mp3',
+'media_sample'    => 'Mísal.ogg',
 'sig_tip'         => '�mzañ belän zaman/waqıt tamğası',
 'hr_tip'          => 'Yatma sızıq (siräk qullan)',
 
 # Edit pages
-'summary'            => 'YomÄŸaq',
-'subject'            => 'Ni turında/başlıq',
+'summary'            => 'YomÄŸaq:',
+'subject'            => 'Ni turında/başlıq:',
 'minoredit'          => 'Bu waq-töyäk üzgärmä genä',
 'watchthis'          => 'Bitne küzätep torası',
 'savearticle'        => 'Saqla biremne',
@@ -316,13 +315,13 @@ Anı alğaç monda tağın kerep qara.',
 'newarticle'         => '(Yaña)',
 'clearyourcache'     => "'''İskärmä:''' Saqlawdan soñ, üzgärmälärne kürü öçen browserıñnıñ alxäteren buşatası bar: '''Mozilla:''' click ''reload''(yä ki ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
 'updated'            => '(Yañartıldı)',
-'note'               => '<strong>İskärmä:</strong>',
+'note'               => "'''İskärmä:'''",
 'editing'            => 'Üzgärtü: $1',
 'editconflict'       => 'Üzgärtü qíınlığı: $1',
 'yourtext'           => 'Mäteneñ',
 'storedversion'      => 'SaqlanÄŸan yurama',
-'editingold'         => '<strong>KİSÄTMÄ: Sin bu bitneñ iskergän yuramasın üzgärtäsen.
-Ägär sin monı saqlísıñ ikän, şul yuramadan soñ yasalğan üzgärmälär yuğalır.</strong>',
+'editingold'         => "'''KİSÄTMÄ: Sin bu bitneñ iskergän yuramasın üzgärtäsen.
+Ägär sin monı saqlísıñ ikän, şul yuramadan soñ yasalğan üzgärmälär yuğalır.'''",
 'yourdiff'           => 'Ayırmalar',
 'longpagewarning'    => "KİSÄTMÄ: Bu bit zurlığı $1 kB; qayber browserlarda 32 kB'tan da zurraq bulğan bitlärne kürsätkändä qíınlıqlar bula.
 Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
@@ -347,6 +346,7 @@ Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
 'prevn'          => 'uzÄŸan $1',
 'nextn'          => 'kiläse $1',
 'viewprevnext'   => 'Körsetesi: ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Eçtälek',
 'powersearch'    => 'Ezläw',
 
 # Preferences page
@@ -356,6 +356,7 @@ Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
 'qbsettings'            => 'Tiztirä caylawı',
 'changepassword'        => 'Sersüz üzgärtü',
 'skin'                  => 'Tışlaw',
+'skin-preview'          => 'Küzläw',
 'dateformat'            => 'Waqıt qalıbı',
 'math_failure'          => 'Uqí almadım',
 'math_unknown_error'    => 'tanılmağan xata',
@@ -365,9 +366,6 @@ Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
 'prefs-misc'            => 'Başqa köyläwlär',
 'saveprefs'             => 'Saqla köyläwlärne',
 'resetprefs'            => 'Awdar köyläwne',
-'oldpassword'           => 'İske sersüz',
-'newpassword'           => 'Yaña sersüz',
-'retypenew'             => 'Yaña sersüz (qabat)',
 'textboxsize'           => 'Mätenqır ülçäme',
 'rows'                  => 'Yul:',
 'columns'               => 'Buy:',
@@ -432,11 +430,11 @@ Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
 'uploaddisabled'    => 'Ğafu it, yökläw sünderelgän kileş tora.',
 'uploadcorrupt'     => 'Bu birem yä üze watıq, yä quşımtası yaraqsız. Birem tikşerüdän soñ qabat yöklä zínhar.',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'   => 'fayl',
-'imagelist' => 'Räsem tezmäse',
+'listfiles' => 'Räsem tezmäse',
 
-# Image description page
+# File description page
 'filehist-dimensions' => 'Ölçemi',
 'filehist-comment'    => 'Açıqlama',
 'imagelinks'          => 'Räsem läñkerläre',
@@ -458,9 +456,8 @@ Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
 'randompage' => 'Berär bit kürü',
 
 # Statistics
-'statistics' => 'Nöfüs',
-'sitestats'  => '{{SITENAME}} nöfüse',
-'userstats'  => 'Qullanuçı nöfüse',
+'statistics'              => 'Nöfüs',
+'statistics-header-users' => 'Qullanuçı nöfüse',
 
 'disambiguations' => 'Saylaqbit tezmäse',
 
@@ -537,7 +534,7 @@ Zínhar, bu bitneñ wağraq kisäklärgä bülü turında uylap qara.",
 'watchthispage'    => 'Bitne küzätep torası',
 'notanarticle'     => 'Eçtälek belän bit tügel',
 
-# Delete/protect/revert
+# Delete
 'deletepage'            => 'Beter bitne',
 'confirm'               => 'Raslaw',
 'excontentauthor'       => "soñğı içteligi: '$1' ('[[Special:Contributions/$2|$2]]' ğına qatnaşqan)",
@@ -559,14 +556,19 @@ Soñğı beterülär $2 bitendä terkälenä.',
 ** Yazğanı soradı
 ** Qelemxaqq bozılışı
 ** Bozıp yöriwçi işi',
-'editcomment'           => 'Bu üzgärtü taswírı: "<i>$1</i>".', # only shown if there is an edit comment
-'protectlogpage'        => 'Yaqlaw_köndälege',
-'protectedarticle'      => '[[$1]] yaqlandı',
-'unprotectedarticle'    => '[[$1]] ireklände',
-'protect-title'         => '«$1» yaqlaw',
-'protect-legend'        => 'Yaqlawnı raslaw',
-'protectcomment'        => 'Yaqlaw säbäbe',
-'protectexpiry'         => 'Eski bolaçaq:',
+
+# Rollback
+'editcomment' => "Bu üzgärtü taswírı: \"''\$1''\".", # only shown if there is an edit comment
+
+# Protect
+'protectlogpage'     => 'Yaqlaw_köndälege',
+'protectedarticle'   => '[[$1]] yaqlandı',
+'unprotectedarticle' => '[[$1]] ireklände',
+'protect-title'      => '«$1» yaqlaw',
+'prot_1movedto2'     => '$1 moña küçte: $2',
+'protect-legend'     => 'Yaqlawnı raslaw',
+'protectcomment'     => 'Yaqlaw säbäbe',
+'protectexpiry'      => 'Eski bolaçaq:',
 
 # Undelete
 'undelete'         => 'Beterelgän bit torğızu',
@@ -586,7 +588,6 @@ Soñğı beterülär $2 bitendä terkälenä.',
 
 # What links here
 'whatlinkshere' => 'Kem bäyle moña',
-'linklistsub'   => '(Läñker tezmäse)',
 'isredirect'    => 'küçerelü bite',
 
 # Block/unblock
@@ -621,6 +622,7 @@ Soñğı beterülär $2 bitendä terkälenä.',
 # Move page
 'move-page-legend' => 'Bit küçerü',
 'movearticle'      => 'Küçeräse bit',
+'movenologin'      => 'Kermädeñ',
 'newtitle'         => 'Yaña başlıq',
 'movepagebtn'      => 'Küçer bitne',
 'pagemovedsub'     => 'Küçerü uñışlı uzdı',
@@ -643,10 +645,11 @@ yä isä saylanğan isem yaraqsız buldı. Başqa isem sayla zínhar.',
 'thumbnail-more' => 'Zuraytası',
 
 # Special:Import
-'import'        => 'Bitlärne yökläw',
-'importfailed'  => 'Yökläw xatası: $1',
-'importnotext'  => 'Buş yä ki mäten tügel',
-'importsuccess' => 'Yökläw uñışlı buldı!',
+'import'         => 'Bitlärne yökläw',
+'import-comment' => 'Açıqlama:',
+'importfailed'   => 'Yökläw xatası: $1',
+'importnotext'   => 'Buş yä ki mäten tügel',
+'importsuccess'  => 'Yökläw uñışlı buldı!',
 
 # Tooltip help for the actions
 'tooltip-pt-userpage'        => 'Şäxsi bitem',
@@ -698,7 +701,7 @@ yä isä saylanğan isem yaraqsız buldı. Başqa isem sayla zínhar.',
 # Media information
 'show-big-image' => 'Towlı ölçemi',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Ezläw',
 'bydate'   => 'waqıt buyınça',
 
diff --git a/languages/messages/MessagesTy.php b/languages/messages/MessagesTy.php
index e91edd97..3a197cb5 100644
--- a/languages/messages/MessagesTy.php
+++ b/languages/messages/MessagesTy.php
@@ -123,10 +123,10 @@ $messages = array(
 # Recent changes
 'recentchanges' => 'Te mau fa’ahuru-’ē-ra’a ’�pī',
 
-# Special:ImageList
-'imagelist_user' => 'Ta’ata fa’a’ohipa',
+# Special:ListFiles
+'listfiles_user' => 'Ta’ata fa’a’ohipa',
 
-# Image description page
+# File description page
 'filehist-user' => 'Ta’ata',
 
 # Random page
@@ -141,9 +141,15 @@ $messages = array(
 # Special:Categories
 'categories' => 'Te mau huru o te ’api',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Ta’ata fa’a’ohipa ’�pī',
+
 # Watchlist
 'watch' => 'Ha’apa’o',
 
+# Protect
+'prot_1movedto2' => '’Ua t�hitihia te ’api [[$1]] e ana i te ’api ’�pī [[$2]]',
+
 # Restrictions (nouns)
 'restriction-edit' => 'Fa’ahuru ’ē',
 'restriction-move' => 'T�hiti',
diff --git a/languages/messages/MessagesTyv.php b/languages/messages/MessagesTyv.php
index 46dd6176..5d0c0e09 100644
--- a/languages/messages/MessagesTyv.php
+++ b/languages/messages/MessagesTyv.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Aжыглакчы_чугаа', //User_talk
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_чугаа', //_talk
-	NS_IMAGE            => 'Чурук', //Image
-	NS_IMAGE_TALK       => 'Чурук_чугаа', //Image_talk
+	NS_FILE             => 'Чурук', //Image
+	NS_FILE_TALK        => 'Чурук_чугаа', //Image_talk
 	NS_MEDIAWIKI        => 'МедиаВики', //MediaWiki
 	NS_MEDIAWIKI_TALK   => 'МедиаВики_чугаа', //MediaWiki_talk
 	NS_TEMPLATE         => '��', //Template
@@ -31,14 +31,6 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Бөлүк_чугаа', //Category_talk
 );
 
-$skinNames = array(
-	'standard' => 'Classic', //Classic
-	'nostalgia' => 'Nostalgia', //Nostalgia
-	'cologneblue' => 'Cologne Blue', //Cologne Blue
-	'monobook' => 'Моно-�ом', //MonoBook
-	'myskin' => 'MySkin', //MySkin
-	'chick' => 'Chick' //Chick
-);
 
 $bookstoreList = array(
 	'ОЗО�' => 'http://www.ozon.ru/?context=advsearch_book&isbn=$1',
@@ -64,8 +56,6 @@ $messages = array(
 'underline-never'   => 'Кажан-даа',
 'underline-default' => 'Веб-браузерниң ниити үнези',
 
-'skinpreview' => '(Чижеглей көөр)',
-
 # Dates
 'sunday'        => 'Улуг хүн',
 'monday'        => 'Бир дугаар хүн',
@@ -182,8 +172,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} дугайында',
 'aboutpage'            => 'Project:Дугайында',
-'bugreports'           => 'С��к илеткелдер',
-'bugreportspage'       => 'Project:С��к илеткелдер',
 'currentevents'        => '�мгы үеде болуушкуннар',
 'currentevents-url'    => 'Project:�мгы үеде болуушкуннар',
 'edithelp'             => 'Ө�кертиринге дуза',
@@ -272,9 +260,10 @@ $1',
 
 # Password reset dialog
 'resetpass_header'    => 'Чажыт �ө�тү катап чогаадып кылыр',
+'oldpassword'         => 'Эгри чажыт �ө�:',
+'newpassword'         => 'Чаа чажыт �ө�:',
 'resetpass_submit'    => 'Чажыт �ө�тү чоогадып кылыр база кирер.',
 'resetpass_forbidden' => '{{grammar:locative|{{SITENAME}}}} чажыт �ө�тү ө�кертивейн болба�',
-'resetpass_missing'   => 'Бижиирии мед�� чок.',
 
 # Edit page toolbar
 'bold_sample'     => 'Карартыр',
@@ -291,8 +280,8 @@ $1',
 'media_tip'       => 'Файл холбаазы',
 
 # Edit pages
-'summary'            => 'Түңнел',
-'subject'            => 'Кол �ө�',
+'summary'            => 'Түңнел:',
+'subject'            => 'Кол �ө�:',
 'minoredit'          => 'Бо ө�керлиишкин биче-дир',
 'watchthis'          => 'Бо арынны хайгаараар',
 'savearticle'        => '�рынны шыгжаар',
@@ -300,8 +289,8 @@ $1',
 'showpreview'        => 'Чижеглей көөр',
 'showdiff'           => 'Ө�керлиишкиннерни көргүзер',
 'missingcommenttext' => 'Комментарийни адаанда чогаадыңар.',
-'summary-preview'    => 'Түңнелдү чижеглей көөр',
-'subject-preview'    => 'Кол �ө� чижеглей көөр',
+'summary-preview'    => 'Түңнелдү чижеглей көөр:',
+'subject-preview'    => 'Кол �ө� чижеглей көөр:',
 'nosuchsectiontitle' => 'Ындыг бөлгүм чок',
 'loginreqlink'       => 'кирер',
 'accmailtitle'       => 'Чажыт �ө� чоргу�тунган.',
@@ -349,23 +338,23 @@ $1',
 'compareselectedversions' => 'Шилип алган хевирлери деңн��р',
 
 # Search results
-'searchresults' => 'Түңнелдер',
-'prevn'         => 'бүрүнгү $1',
-'nextn'         => '�оонда $1',
-'viewprevnext'  => '($1) ($2) ($3) көөр',
-'powersearch'   => 'Дил��р',
+'searchresults'  => 'Түңнелдер',
+'prevn'          => 'бүрүнгү $1',
+'nextn'          => '�оонда $1',
+'viewprevnext'   => '($1) ($2) ($3) көөр',
+'searchhelp-url' => 'Help:Допчузу',
+'powersearch'    => 'Дил��р',
 
 # Preferences page
 'preferences'        => 'Д��ре деп �анаарылар',
 'changepassword'     => 'Чажыт �ө�тү ө�кертир',
 'skin'               => 'Кеш',
+'skin-preview'       => 'Чижеглей көөр',
 'math_unknown_error' => 'билбе� алдаг',
 'prefs-personal'     => '�жыглакчының мед��лери',
 'prefs-rc'           => 'Д��м чаагы ө�керлиишкиннер',
 'prefs-watchlist'    => 'Хайгаарылга даңзызы',
 'saveprefs'          => 'Шыгжаар',
-'oldpassword'        => 'Эгри чажыт �ө�:',
-'newpassword'        => 'Чаа чажыт �ө�:',
 'textboxsize'        => 'Ө�кертир',
 'rows'               => 'Одуруглар:',
 'columns'            => 'Баганалар:',
@@ -417,15 +406,15 @@ $1',
 'upload-file-error' => 'Иштики алдаг',
 'upload-misc-error' => 'Билбе� кииреринге алдаг',
 
-# Special:ImageList
+# Special:ListFiles
 'imgfile'               => 'файл',
-'imagelist'             => 'Файл даңзызы',
-'imagelist_name'        => '�т',
-'imagelist_user'        => '�жыглакчы',
-'imagelist_size'        => 'Хемч��л',
-'imagelist_description' => 'Тодарадып биж��ни',
+'listfiles'             => 'Файл даңзызы',
+'listfiles_name'        => '�т',
+'listfiles_user'        => '�жыглакчы',
+'listfiles_size'        => 'Хемч��л',
+'listfiles_description' => 'Тодарадып биж��ни',
 
-# Image description page
+# File description page
 'filehist'           => 'Файлдың төөгүзү',
 'filehist-deleteall' => 'шуптуну ап каар',
 'filehist-deleteone' => 'мону ап каар',
@@ -505,7 +494,6 @@ $1',
 # Special:Log
 'specialloguserlabel'  => '�жыглакчы:',
 'speciallogtitlelabel' => '�т:',
-'log-search-submit'    => 'Чоруур',
 
 # Special:AllPages
 'allpages'       => 'Шупту арыннар',
@@ -532,20 +520,14 @@ $1',
 'emailsend'       => 'Чорудар',
 
 # Watchlist
-'watchlist'            => 'М��ң хайгаарылга даңзызым',
-'mywatchlist'          => 'М��ң хайгаарылга даңзызым',
-'nowatchlist'          => 'Чүү-даа �илерниң хайгаарылга даңзызыда чок.',
-'watchnologin'         => 'Кирбе�',
-'watch'                => 'Хайгаараар',
-'watchthispage'        => 'Бо арынны хайгаараар',
-'unwatch'              => 'Хайгаарава�',
-'unwatchthispage'      => 'Бо арынны хайгаараба�',
-'watchlist-show-bots'  => 'Боттуң ө�керлиишкиннерин көргүзер',
-'watchlist-hide-bots'  => 'Боттуң ө�керлиишкиннерин чажырар',
-'watchlist-show-own'   => 'М��ң ө�керлиишкиннеримни көргүзер',
-'watchlist-hide-own'   => 'М��ң ө�керлиишкиннеримни чажырар',
-'watchlist-show-minor' => 'Бичии ө�керлиишкиннерни көргүзер',
-'watchlist-hide-minor' => 'Бичии ө�керлиишкиннерни чажырар',
+'watchlist'       => 'М��ң хайгаарылга даңзызым',
+'mywatchlist'     => 'М��ң хайгаарылга даңзызым',
+'nowatchlist'     => 'Чүү-даа �илерниң хайгаарылга даңзызыда чок.',
+'watchnologin'    => 'Кирбе�',
+'watch'           => 'Хайгаараар',
+'watchthispage'   => 'Бо арынны хайгаараар',
+'unwatch'         => 'Хайгаарава�',
+'unwatchthispage' => 'Бо арынны хайгаараба�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Хайгаарап турар...',
@@ -555,11 +537,13 @@ $1',
 'enotif_impersonal_salutation' => '{{grammar:genitive|{{SITENAME}}}} ажыглакчызы',
 'enotif_anon_editor'           => 'ат �ве� ажыглакчы $1',
 
-# Delete/protect/revert
-'deletepage'          => '�рынны ап каар',
-'exblank'             => '�рын куруг турган',
-'actioncomplete'      => '�жыл доо�ту',
-'deletedarticle'      => '"[[$1]]" деп арынны ап каан',
+# Delete
+'deletepage'     => '�рынны ап каар',
+'exblank'        => '�рын куруг турган',
+'actioncomplete' => '�жыл доо�ту',
+'deletedarticle' => '"[[$1]]" деп арынны ап каан',
+
+# Protect
 'protectcomment'      => 'Комментарий:',
 'protect-default'     => '(ниити)',
 'protect-level-sysop' => 'Чүгле �и�оплар',
@@ -588,7 +572,6 @@ $1',
 
 # What links here
 'whatlinkshere'       => 'Pages that link here',
-'linklistsub'         => '(Холбаалар даңзызы)',
 'whatlinkshere-links' => '� холбаалар',
 
 # Block/unblock
@@ -626,6 +609,9 @@ $1',
 'allmessagesdefault' => '�иити �өзүглел',
 'allmessagescurrent' => '�мгы �өзүглел',
 
+# Special:Import
+'import-comment' => 'Комментарий:',
+
 # Import log
 'import-logentry-upload-detail' => '$1 үндүрери(лер)',
 
@@ -660,6 +646,14 @@ $1',
 # Attribution
 'anonymous' => '{{grammar:genitive|{{SITENAME}}}} ат �ве� ажыглакчызы(лары)',
 
+# Skin names
+'skinname-standard'    => 'Classic',
+'skinname-nostalgia'   => 'Nostalgia',
+'skinname-cologneblue' => 'Cologne Blue',
+'skinname-monobook'    => 'Моно-�ом',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chick',
+
 # Image deletion
 'filedelete-missing' => '"$1" деп файл чок, ынчангаш ол ап калдынма�.',
 
@@ -667,7 +661,7 @@ $1',
 'previousdiff' => '� Бүрүнгү ылгал',
 'nextdiff'     => 'Соонда ылгал →',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '(боцду $1)',
 'noimages'     => 'Чуруклар чок.',
 'ilsubmit'     => 'Дил��р',
@@ -689,9 +683,6 @@ $1',
 'namespacesall'    => 'шупту',
 'monthsall'        => 'шупту',
 
-# AJAX search
-'hideresults' => 'Түңнелдерни чажырар',
-
 # Multipage image navigation
 'imgmultipageprev' => '� бүрүнгү арын',
 'imgmultipagenext' => '�оонда арын →',
diff --git a/languages/messages/MessagesUdm.php b/languages/messages/MessagesUdm.php
index 0cc331fd..41a07dc7 100644
--- a/languages/messages/MessagesUdm.php
+++ b/languages/messages/MessagesUdm.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Викиавтор_��ры�ь_вера�ькон',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_��ры�ь_вера�ькон',
-	NS_IMAGE            => 'Суред',
-	NS_IMAGE_TALK       => 'Суред_��ры�ь_вера�ькон',
+	NS_FILE             => 'Суред',
+	NS_FILE_TALK        => 'Суред_��ры�ь_вера�ькон',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_��ры�ь_вера�ькон',
 	NS_TEMPLATE         => 'Шаблон',
@@ -73,6 +73,9 @@ $messages = array(
 'userlogout'    => 'Кошкыны',
 'createaccount' => 'выль вики-авторл�н реги�трациез',
 
+# Search results
+'searchhelp-url' => 'Help:Вал�ктон',
+
 # Preferences page
 'preferences' => 'на�тройкао�',
 
diff --git a/languages/messages/MessagesUg.php b/languages/messages/MessagesUg.php
index 9e4c4455..63672d4e 100644
--- a/languages/messages/MessagesUg.php
+++ b/languages/messages/MessagesUg.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Jose77
  * @author לערי ריינה�רט
  */
 
@@ -16,6 +17,18 @@ $messages = array(
 'wednesday' => 'Qarshenbe',
 'thursday'  => 'Payshanbe',
 'saturday'  => 'Shanba',
+'january'   => 'Yanwar',
+'february'  => 'Féwral',
+'march'     => 'Mart',
+'april'     => 'Aprél',
+'june'      => 'Iyun',
+'july'      => 'Iyul',
+'august'    => 'Awghust',
+'september' => 'Séntebr',
+'october'   => 'Öktebir',
+'november'  => 'Noyabr',
+'december'  => 'Dékabr',
+'may'       => 'May',
 
 'qbedit'     => 'Uzgartish',
 'navigation' => 'كۆرۈش',
@@ -57,7 +70,7 @@ $messages = array(
 'username'          => 'Ishletkuqi ismi:',
 
 # Edit pages
-'summary'     => 'Hulasa',
+'summary'     => 'Hulasa:',
 'minoredit'   => 'Bu Kichik Uzgartish',
 'watchthis'   => 'Bu Batka Kharang',
 'showpreview' => 'Aldinala kurux',
@@ -97,9 +110,6 @@ $messages = array(
 # Book sources
 'booksources-go' => 'Kuchush',
 
-# Special:Log
-'log-search-submit' => 'Kuchush',
-
 # Special:AllPages
 'allpagessubmit' => 'Kuchush',
 
@@ -134,7 +144,7 @@ $messages = array(
 'tooltip-search'  => 'Izdash {{SITENAME}}',
 'tooltip-p-logo'  => 'Bash Bet',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Izdash',
 
 # Trackbacks
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index f69d9612..7c8890ab 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -13,6 +13,7 @@
  * @author Innv
  * @author Kalan
  * @author NickK
+ * @author Urhixidur
  */
 
 /*
@@ -33,40 +34,30 @@ $fallback8bitEncoding = 'windows-1251';
 $linkPrefixExtension = true;
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Медіа',
-	NS_SPECIAL        => 'Спеціальна',
-	NS_MAIN           => '',
-	NS_TALK           => 'Обговоренн�',
-	NS_USER           => 'Кори�тувач',
-	NS_USER_TALK      => 'Обговоренн�_кори�тувача',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => 'Обговоренн�_{{grammar:genitive|$1}}',
-	NS_IMAGE          => 'Зображенн�',
-	NS_IMAGE_TALK     => 'Обговоренн�_зображенн�',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Обговоренн�_MediaWiki',
-	NS_TEMPLATE       => 'Шаблон',
-	NS_TEMPLATE_TALK  => 'Обговоренн�_шаблону',
-	NS_HELP           => 'Довідка',
-	NS_HELP_TALK      => 'Обговоренн�_довідки',
-	NS_CATEGORY       => 'Категорі�',
-	NS_CATEGORY_TALK  => 'Обговоренн�_категорії',
+	NS_MEDIA            => 'Медіа',
+	NS_SPECIAL          => 'Спеціальна',
+	NS_TALK             => 'Обговоренн�',
+	NS_USER             => 'Кори�тувач',
+	NS_USER_TALK        => 'Обговоренн�_кори�тувача',
+	NS_PROJECT_TALK     => 'Обговоренн�_{{GRAMMAR:genitive|$1}}',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Обговоренн�_файлу',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Обговоренн�_MediaWiki',
+	NS_TEMPLATE         => 'Шаблон',
+	NS_TEMPLATE_TALK    => 'Обговоренн�_шаблону',
+	NS_HELP             => 'Довідка',
+	NS_HELP_TALK        => 'Обговоренн�_довідки',
+	NS_CATEGORY         => 'Категорі�',
+	NS_CATEGORY_TALK    => 'Обговоренн�_категорії',
 );
 
 $namespaceAliases = array(
 	'Спеціальні' => NS_SPECIAL,
+	'Зображенн�' => NS_FILE,
+	'Обговоренн�_зображенн�' => NS_FILE_TALK,
 );
 
-$skinNames = array(
-	'standard'    => 'Стандартне',
-	'nostalgia'   => '�о�тальгі�',
-	'cologneblue' => 'Кельн�ьке �инє',
-	'monobook'    => 'Моно-книга',
-	'myskin'      => 'Своє',
-	'chick'       => 'Курча',
-	'simple'      => 'Про�те',
-	'modern'      => 'Суча�не',
-);
 
 $dateFormats = array(
 	'mdy time' => 'H:i',
@@ -84,7 +75,6 @@ $dateFormats = array(
 	'ISO 8601 time' => 'xnH:xni:xns',
 	'ISO 8601 date' => 'xnY-xnm-xnd',
 	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
-
 );
 
 $bookstoreList = array(
@@ -92,130 +82,134 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#REDIRECT', '#ПЕРЕ��ПР�ВЛЕ��Я', '#ПЕРЕ��ПР' ),
-	'notoc'               => array( '0', '__NOTOC__', '__БЕЗ_ЗМІСТУ__' ),
-	'nogallery'           => array( '0', '__NOGALLERY__', '__БЕЗ_Г�ЛЕРЕЇ__' ),
-	'forcetoc'            => array( '0', '__FORCETOC__', '__ОБОВ_ЗМІСТ__' ),
-	'toc'                 => array( '0', '__TOC__', '__ЗМІСТ__' ),
-	'noeditsection'       => array( '0', '__NOEDITSECTION__', '__БЕЗ_РЕД�ГУВ_РОЗДІЛУ__' ),
-	'currentmonth'        => array( '1', 'CURRENTMONTH', 'ПОТОЧ�ИЙ_МІСЯЦЬ' ),
-	'currentmonthname'    => array( '1', 'CURRENTMONTHNAME', '��ЗВ�_ПОТОЧ�ОГО_МІСЯЦЯ' ),
-	'currentmonthnamegen' => array( '1', 'CURRENTMONTHNAMEGEN', '��ЗВ�_ПОТОЧ�ОГО_МІСЯЦЯ_РОД' ),
-	'currentmonthabbrev'  => array( '1', 'CURRENTMONTHABBREV', '��ЗВ�_ПОТОЧ�ОГО_МІСЯЦЯ_�БР' ),
-	'currentday'          => array( '1', 'CURRENTDAY', 'ПОТОЧ�ИЙ_ДЕ�Ь' ),
-	'currentday2'         => array( '1', 'CURRENTDAY2', 'ПОТОЧ�ИЙ_ДЕ�Ь_2' ),
-	'currentdayname'      => array( '1', 'CURRENTDAYNAME', '��ЗВ�_ПОТОЧ�ОГО_Д�Я' ),
-	'currentyear'         => array( '1', 'CURRENTYEAR', 'ПОТОЧ�ИЙ_РІК' ),
-	'currenttime'         => array( '1', 'CURRENTTIME', 'ПОТОЧ�ИЙ_Ч�С' ),
-	'currenthour'         => array( '1', 'CURRENTHOUR', 'ПОТОЧ��_ГОДИ��' ),
-	'localmonth'          => array( '1', 'LOCALMONTH', 'ЛОК�ЛЬ�_МІСЯЦЬ' ),
-	'localmonthname'      => array( '1', 'LOCALMONTHNAME', '��ЗВ�_ЛОК�ЛЬ�_МІСЯЦЯ' ),
-	'localmonthnamegen'   => array( '1', 'LOCALMONTHNAMEGEN', '��ЗВ�_ЛОК�ЛЬ�_МІСЯЦЯ_РОД' ),
-	'localmonthabbrev'    => array( '1', 'LOCALMONTHABBREV', '��ЗВ�_ЛОК�ЛЬ�_МІСЯЦЯ_�БР' ),
-	'localday'            => array( '1', 'LOCALDAY', 'ЛОК�ЛЬ�_ДЕ�Ь' ),
-	'localday2'           => array( '1', 'LOCALDAY2', 'ЛОК�ЛЬ�_ДЕ�Ь_2' ),
-	'localdayname'        => array( '1', 'LOCALDAYNAME', '��ЗВ�_ЛОК�ЛЬ�_Д�Я' ),
-	'localyear'           => array( '1', 'LOCALYEAR', 'ЛОК�ЛЬ�_РІК' ),
-	'localtime'           => array( '1', 'LOCALTIME', 'ЛОК�ЛЬ�_Ч�С' ),
-	'localhour'           => array( '1', 'LOCALHOUR', 'ЛОК�ЛЬ�_ГОДИ��' ),
-	'numberofpages'       => array( '1', 'NUMBEROFPAGES', 'КІЛЬКІСТЬ_СТОРІ�ОК' ),
-	'numberofarticles'    => array( '1', 'NUMBEROFARTICLES', 'КІЛЬКІСТЬ_СТ�ТЕЙ' ),
-	'numberoffiles'       => array( '1', 'NUMBEROFFILES', 'КІЛЬКІСТЬ_Ф�ЙЛІВ' ),
-	'numberofusers'       => array( '1', 'NUMBEROFUSERS', 'КІЛЬКІСТЬ_КОРИСТУВ�ЧІВ' ),
-	'numberofedits'       => array( '1', 'NUMBEROFEDITS', 'КІЛЬКІСТЬ_РЕД�ГУВ��Ь' ),
-	'pagename'            => array( '1', 'PAGENAME', '��ЗВ�_СТОРІ�КИ' ),
-	'pagenamee'           => array( '1', 'PAGENAMEE', '��ЗВ�_СТОРІ�КИ_2' ),
-	'namespace'           => array( '1', 'NAMESPACE', 'ПРОСТІР_��ЗВ' ),
-	'namespacee'          => array( '1', 'NAMESPACEE', 'ПРОСТІР_��ЗВ_2' ),
-	'talkspace'           => array( '1', 'TALKSPACE', 'ПРОСТІР_ОБГОВОРЕ��Я' ),
-	'talkspacee'          => array( '1', 'TALKSPACEE', 'ПРОСТІР_ОБГОВОРЕ��Я_2' ),
-	'subjectspace'        => array( '1', 'SUBJECTSPACE', 'ARTICLESPACE', 'ПРОСТІР_СТ�ТЕЙ' ),
-	'subjectspacee'       => array( '1', 'SUBJECTSPACEE', 'ARTICLESPACEE', 'ПРОСТІР_СТ�ТЕЙ_2' ),
-	'fullpagename'        => array( '1', 'FULLPAGENAME', 'ПОВ��_��ЗВ�_СТОРІ�КИ' ),
-	'fullpagenamee'       => array( '1', 'FULLPAGENAMEE', 'ПОВ��_��ЗВ�_СТОРІ�КИ_2' ),
-	'subpagename'         => array( '1', 'SUBPAGENAME', '��ЗВ�_ПІДСТОРІ�КИ' ),
-	'subpagenamee'        => array( '1', 'SUBPAGENAMEE', '��ЗВ�_ПІДСТОРІ�КИ_2' ),
-	'basepagename'        => array( '1', 'BASEPAGENAME', 'ОС�ОВ�_��ЗВИ_ПІДСТОРІ�КИ' ),
-	'basepagenamee'       => array( '1', 'BASEPAGENAMEE', 'ОС�ОВ�_��ЗВИ_ПІДСТОРІ�КИ_2' ),
-	'talkpagename'        => array( '1', 'TALKPAGENAME', '��ЗВ�_СТОРІ�КИ_ОБГОВОРЕ��Я' ),
-	'talkpagenamee'       => array( '1', 'TALKPAGENAMEE', '��ЗВ�_СТОРІ�КИ_ОБГОВОРЕ��Я_2' ),
-	'subjectpagename'     => array( '1', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME', '��ЗВ�_СТ�ТТІ' ),
-	'subjectpagenamee'    => array( '1', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE', '��ЗВ�_СТ�ТТІ_2' ),
-	'msg'                 => array( '0', 'MSG:', 'ПОВІД:' ),
-	'subst'               => array( '0', 'SUBST:', 'ПІДСТ:' ),
-	'msgnw'               => array( '0', 'MSGNW:', 'ПОВІД_БЕЗ_ВІКІ:' ),
-	'img_thumbnail'       => array( '1', 'thumbnail', 'thumb', 'міні' ),
-	'img_manualthumb'     => array( '1', 'thumbnail=$1', 'thumb=$1', 'міні=$1' ),
-	'img_right'           => array( '1', 'right', 'праворуч' ),
-	'img_left'            => array( '1', 'left', 'ліворуч' ),
-	'img_none'            => array( '1', 'none', 'без' ),
-	'img_width'           => array( '1', '$1px', '$1пк�' ),
-	'img_center'          => array( '1', 'center', 'centre', 'центр' ),
-	'img_framed'          => array( '1', 'framed', 'enframed', 'frame', 'обрамити', 'рамка' ),
-	'img_frameless'       => array( '1', 'frameless', 'безрамки' ),
-	'img_page'            => array( '1', 'page=$1', 'page $1', '�торінка=$1', '�торінка $1' ),
-	'img_upright'         => array( '1', 'upright', 'upright=$1', 'upright $1', 'зверхуправоруч', 'зверхуправоруч=$1', 'зверхуправоруч $1' ),
-	'img_border'          => array( '1', 'border', 'межа' ),
-	'img_baseline'        => array( '1', 'baseline', 'о�нова' ),
-	'img_sub'             => array( '1', 'sub', 'під' ),
-	'img_super'           => array( '1', 'super', 'sup', 'над' ),
-	'img_top'             => array( '1', 'top', 'зверху' ),
-	'img_text_top'        => array( '1', 'text-top', 'тек�т-зверху' ),
-	'img_middle'          => array( '1', 'middle', 'по�ередині' ),
-	'img_bottom'          => array( '1', 'bottom', 'знизу' ),
-	'img_text_bottom'     => array( '1', 'text-bottom', 'тек�т-знизу' ),
-	'int'                 => array( '0', 'INT:', 'В�УТР:' ),
-	'sitename'            => array( '1', 'SITENAME', '��ЗВ�_С�ЙТ�' ),
-	'ns'                  => array( '0', 'NS:', 'П�:' ),
-	'localurl'            => array( '0', 'LOCALURL:', 'ЛОК�ЛЬ��_�ДРЕС�:' ),
-	'localurle'           => array( '0', 'LOCALURLE:', 'ЛОК�ЛЬ��_�ДРЕС�_2:' ),
-	'server'              => array( '0', 'SERVER', 'СЕРВЕР' ),
-	'servername'          => array( '0', 'SERVERNAME', '��ЗВ�_СЕРВЕР�' ),
-	'scriptpath'          => array( '0', 'SCRIPTPATH', 'ШЛЯХ_ДО_СКРИПТУ' ),
-	'grammar'             => array( '0', 'GRAMMAR:', 'ВІДМІ�ОК:' ),
-	'notitleconvert'      => array( '0', '__NOTITLECONVERT__', '__NOTC__', '__БЕЗ_ПЕРЕТВОРЕ��Я_З�ГОЛОВКУ__' ),
-	'nocontentconvert'    => array( '0', '__NOCONTENTCONVERT__', '__NOCC__', '__БЕЗ_ПЕРЕТВОРЕ��Я_ТЕКСТУ__' ),
-	'currentweek'         => array( '1', 'CURRENTWEEK', 'ПОТОЧ�ИЙ_ТИЖДЕ�Ь' ),
-	'currentdow'          => array( '1', 'CURRENTDOW', 'ПОТОЧ�ИЙ_ДЕ�Ь_ТИЖ�Я' ),
-	'localweek'           => array( '1', 'LOCALWEEK', 'ЛОК�ЛЬ�_ТИЖДЕ�Ь' ),
-	'localdow'            => array( '1', 'LOCALDOW', 'ЛОК�ЛЬ�_ДЕ�Ь_ТИЖ�Я' ),
-	'revisionid'          => array( '1', 'REVISIONID', 'ІД_ВЕРСІЇ' ),
-	'revisionday'         => array( '1', 'REVISIONDAY', 'ДЕ�Ь_ВЕРСІЇ' ),
-	'revisionday2'        => array( '1', 'REVISIONDAY2', 'ДЕ�Ь_ВЕРСІЇ_2' ),
-	'revisionmonth'       => array( '1', 'REVISIONMONTH', 'МІСЯЦЬ_ВЕРСІЇ' ),
-	'revisionyear'        => array( '1', 'REVISIONYEAR', 'РІК_ВЕРСІЇ' ),
-	'revisiontimestamp'   => array( '1', 'REVISIONTIMESTAMP', 'МІТК�_Ч�СУ_ВЕРСІЇ' ),
-	'plural'              => array( '0', 'PLURAL:', 'М�ОЖИ��:' ),
-	'fullurl'             => array( '0', 'FULLURL:', 'ПОВ��_�ДРЕС�:' ),
-	'fullurle'            => array( '0', 'FULLURLE:', 'ПОВ��_�ДРЕС�_2:' ),
-	'lcfirst'             => array( '0', 'LCFIRST:', '�Р_ПЕРШ�:' ),
-	'ucfirst'             => array( '0', 'UCFIRST:', 'ВР_ПЕРШ�:' ),
-	'lc'                  => array( '0', 'LC:', '�Р:', '�ИЖ�ІЙ_РЕГІСТР:' ),
-	'uc'                  => array( '0', 'UC:', 'ВР:', 'ВЕРХ�ІЙ_РЕГІСТР:' ),
-	'raw'                 => array( '0', 'RAW:', '�ЕОБРОБ:' ),
-	'displaytitle'        => array( '1', 'DISPLAYTITLE', 'ПОК�З�ТИ_З�ГОЛОВОК' ),
-	'rawsuffix'           => array( '1', 'R', '�' ),
-	'newsectionlink'      => array( '1', '__NEWSECTIONLINK__', '__ПОСИЛ���Я_��_�ОВИЙ_РОЗДІЛ__' ),
-	'currentversion'      => array( '1', 'CURRENTVERSION', 'ПОТОЧ��_ВЕРСІЯ' ),
-	'urlencode'           => array( '0', 'URLENCODE:', 'З�КОДОВ���_�ДРЕС�:' ),
-	'anchorencode'        => array( '0', 'ANCHORENCODE', 'КОДУВ�ТИ_МІТКУ' ),
-	'currenttimestamp'    => array( '1', 'CURRENTTIMESTAMP', 'МІТК�_ПОТОЧ�ОГО_Ч�СУ' ),
-	'localtimestamp'      => array( '1', 'LOCALTIMESTAMP', 'МІТК�_ЛОК�ЛЬ�_Ч�СУ' ),
-	'directionmark'       => array( '1', 'DIRECTIONMARK', 'DIRMARK', '��ПРЯМОК_ПИСЬМ�' ),
-	'language'            => array( '0', '#LANGUAGE:', '#МОВ�:' ),
-	'contentlanguage'     => array( '1', 'CONTENTLANGUAGE', 'CONTENTLANG', 'МОВ�_ЗМІСТУ' ),
-	'pagesinnamespace'    => array( '1', 'PAGESINNAMESPACE:', 'PAGESINNS:', 'СТОРІ�ОК_У_ПРОСТОРІ_��ЗВ:', 'СТОР_У_П�' ),
-	'numberofadmins'      => array( '1', 'NUMBEROFADMINS', 'КІЛЬКІСТЬ_�ДМІ�ІСТР�ТОРІВ' ),
-	'formatnum'           => array( '0', 'FORMATNUM', 'ФОРМ�ТУВ�ТИ_ЧИСЛО' ),
-	'padleft'             => array( '0', 'PADLEFT', 'З�ПОВ�ИТИ_ЛІВОРУЧ' ),
-	'padright'            => array( '0', 'PADRIGHT', 'З�ПОВ�ИТИ_ПР�ВОРУЧ' ),
-	'special'             => array( '0', 'special', '�пеціальна' ),
-	'defaultsort'         => array( '1', 'DEFAULTSORT:', 'СТ��Д�РТ�Е_СОРТУВ���Я' ),
-	'filepath'            => array( '0', 'FILEPATH:', 'ШЛЯХ_ДО_Ф�ЙЛУ:' ),
-	'tag'                 => array( '0', 'tag', 'тег' ),
-	'hiddencat'           => array( '1', '__HIDDENCAT__', '__ПРИХОВ_К�Т__' ),
-	'pagesincategory'     => array( '1', 'PAGESINCATEGORY', 'PAGESINCAT', 'СТОР_В_К�Т' ),
-	'pagesize'            => array( '1', 'PAGESIZE', 'РОЗМІР' ),
+	'redirect'              => array( '0', '#ПЕРЕ��ПР�ВЛЕ��Я', '#ПЕРЕ��ПР', '#REDIRECT' ),
+	'notoc'                 => array( '0', '__БЕЗ_ЗМІСТУ__', '__NOTOC__' ),
+	'nogallery'             => array( '0', '__БЕЗ_Г�ЛЕРЕЇ__', '__NOGALLERY__' ),
+	'forcetoc'              => array( '0', '__ОБОВ_ЗМІСТ__', '__FORCETOC__' ),
+	'toc'                   => array( '0', '__ЗМІСТ__', '__TOC__' ),
+	'noeditsection'         => array( '0', '__БЕЗ_РЕД�ГУВ_РОЗДІЛУ__', '__NOEDITSECTION__' ),
+	'currentmonth'          => array( '1', 'ПОТОЧ�ИЙ_МІСЯЦЬ', 'CURRENTMONTH' ),
+	'currentmonthname'      => array( '1', '��ЗВ�_ПОТОЧ�ОГО_МІСЯЦЯ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'   => array( '1', '��ЗВ�_ПОТОЧ�ОГО_МІСЯЦЯ_РОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'    => array( '1', '��ЗВ�_ПОТОЧ�ОГО_МІСЯЦЯ_�БР', 'CURRENTMONTHABBREV' ),
+	'currentday'            => array( '1', 'ПОТОЧ�ИЙ_ДЕ�Ь', 'CURRENTDAY' ),
+	'currentday2'           => array( '1', 'ПОТОЧ�ИЙ_ДЕ�Ь_2', 'CURRENTDAY2' ),
+	'currentdayname'        => array( '1', '��ЗВ�_ПОТОЧ�ОГО_Д�Я', 'CURRENTDAYNAME' ),
+	'currentyear'           => array( '1', 'ПОТОЧ�ИЙ_РІК', 'CURRENTYEAR' ),
+	'currenttime'           => array( '1', 'ПОТОЧ�ИЙ_Ч�С', 'CURRENTTIME' ),
+	'currenthour'           => array( '1', 'ПОТОЧ��_ГОДИ��', 'CURRENTHOUR' ),
+	'localmonth'            => array( '1', 'ЛОК�ЛЬ�ИЙ_МІСЯЦЬ', 'LOCALMONTH' ),
+	'localmonthname'        => array( '1', '��ЗВ�_ЛОК�ЛЬ�ОГО_МІСЯЦЯ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'     => array( '1', '��ЗВ�_ЛОК�ЛЬ�ОГО_МІСЯЦЯ_РОД', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'      => array( '1', '��ЗВ�_ЛОК�ЛЬ�ОГО_МІСЯЦЯ_�БР', 'LOCALMONTHABBREV' ),
+	'localday'              => array( '1', 'ЛОК�ЛЬ�ИЙ_ДЕ�Ь', 'LOCALDAY' ),
+	'localday2'             => array( '1', 'ЛОК�ЛЬ�ИЙ_ДЕ�Ь_2', 'LOCALDAY2' ),
+	'localdayname'          => array( '1', '��ЗВ�_ЛОК�ЛЬ�ОГО_Д�Я', 'LOCALDAYNAME' ),
+	'localyear'             => array( '1', 'ЛОК�ЛЬ�ИЙ_РІК', 'LOCALYEAR' ),
+	'localtime'             => array( '1', 'ЛОК�ЛЬ�ИЙ_Ч�С', 'LOCALTIME' ),
+	'localhour'             => array( '1', 'ЛОК�ЛЬ��_ГОДИ��', 'LOCALHOUR' ),
+	'numberofpages'         => array( '1', 'КІЛЬКІСТЬ_СТОРІ�ОК', 'NUMBEROFPAGES' ),
+	'numberofarticles'      => array( '1', 'КІЛЬКІСТЬ_СТ�ТЕЙ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'         => array( '1', 'КІЛЬКІСТЬ_Ф�ЙЛІВ', 'NUMBEROFFILES' ),
+	'numberofusers'         => array( '1', 'КІЛЬКІСТЬ_КОРИСТУВ�ЧІВ', 'NUMBEROFUSERS' ),
+	'numberofedits'         => array( '1', 'КІЛЬКІСТЬ_РЕД�ГУВ��Ь', 'NUMBEROFEDITS' ),
+	'pagename'              => array( '1', '��ЗВ�_СТОРІ�КИ', 'PAGENAME' ),
+	'pagenamee'             => array( '1', '��ЗВ�_СТОРІ�КИ_2', 'PAGENAMEE' ),
+	'namespace'             => array( '1', 'ПРОСТІР_��ЗВ', 'NAMESPACE' ),
+	'namespacee'            => array( '1', 'ПРОСТІР_��ЗВ_2', 'NAMESPACEE' ),
+	'talkspace'             => array( '1', 'ПРОСТІР_ОБГОВОРЕ��Я', 'TALKSPACE' ),
+	'talkspacee'            => array( '1', 'ПРОСТІР_ОБГОВОРЕ��Я_2', 'TALKSPACEE' ),
+	'subjectspace'          => array( '1', 'ПРОСТІР_СТ�ТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'         => array( '1', 'ПРОСТІР_СТ�ТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'          => array( '1', 'ПОВ��_��ЗВ�_СТОРІ�КИ', 'FULLPAGENAME' ),
+	'fullpagenamee'         => array( '1', 'ПОВ��_��ЗВ�_СТОРІ�КИ_2', 'FULLPAGENAMEE' ),
+	'subpagename'           => array( '1', '��ЗВ�_ПІДСТОРІ�КИ', 'SUBPAGENAME' ),
+	'subpagenamee'          => array( '1', '��ЗВ�_ПІДСТОРІ�КИ_2', 'SUBPAGENAMEE' ),
+	'basepagename'          => array( '1', 'ОС�ОВ�_��ЗВИ_ПІДСТОРІ�КИ', 'BASEPAGENAME' ),
+	'basepagenamee'         => array( '1', 'ОС�ОВ�_��ЗВИ_ПІДСТОРІ�КИ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'          => array( '1', '��ЗВ�_СТОРІ�КИ_ОБГОВОРЕ��Я', 'TALKPAGENAME' ),
+	'talkpagenamee'         => array( '1', '��ЗВ�_СТОРІ�КИ_ОБГОВОРЕ��Я_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'       => array( '1', '��ЗВ�_СТ�ТТІ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'      => array( '1', '��ЗВ�_СТ�ТТІ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                   => array( '0', 'ПОВІД:', 'MSG:' ),
+	'subst'                 => array( '0', 'ПІДСТ:', 'SUBST:' ),
+	'msgnw'                 => array( '0', 'ПОВІД_БЕЗ_ВІКІ:', 'MSGNW:' ),
+	'img_thumbnail'         => array( '1', 'міні', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'міні=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'праворуч', 'right' ),
+	'img_left'              => array( '1', 'ліворуч',  'left' ),
+	'img_none'              => array( '1', 'без', 'none' ),
+	'img_width'             => array( '1', '$1пк�', '$1px' ),
+	'img_center'            => array( '1', 'центр', 'center', 'centre' ),
+	'img_framed'            => array( '1', 'обрамити', 'рамка', 'framed', 'enframed', 'frame' ),
+	'img_frameless'         => array( '1', 'безрамки', 'frameless' ),
+	'img_page'              => array( '1', '�торінка=$1', '�торінка $1', 'page=$1', 'page $1' ),
+	'img_upright'           => array( '1', 'зверхуправоруч', 'зверхуправоруч=$1', 'зверхуправоруч $1','upright', 'upright=$1', 'upright $1' ),
+	'img_border'            => array( '1', 'межа', 'border' ),
+	'img_baseline'          => array( '1', 'о�нова', 'baseline' ),
+	'img_sub'               => array( '1', 'під', 'sub' ),
+	'img_super'             => array( '1', 'над', 'super', 'sup' ),
+	'img_top'               => array( '1', 'зверху', 'top' ),
+	'img_text_top'          => array( '1', 'тек�т-зверху', 'text-top' ),
+	'img_middle'            => array( '1', 'по�ередині', 'middle' ),
+	'img_bottom'            => array( '1', 'знизу', 'bottom' ),
+	'img_text_bottom'       => array( '1', 'тек�т-знизу', 'text-bottom' ),
+	'int'                   => array( '0', 'В�УТР:', 'INT:' ),
+	'sitename'              => array( '1', '��ЗВ�_С�ЙТ�', 'SITENAME' ),
+	'ns'                    => array( '0', 'П�:', 'ПИ:', 'NS:' ),
+	'localurl'              => array( '0', 'ЛОК�ЛЬ��_�ДРЕС�:', 'LOCALURL:' ),
+	'localurle'             => array( '0', 'ЛОК�ЛЬ��_�ДРЕС�_2:', 'LOCALURLE:' ),
+	'server'                => array( '0', 'СЕРВЕР', 'SERVER' ),
+	'servername'            => array( '0', '��ЗВ�_СЕРВЕР�', 'SERVERNAME' ),
+	'scriptpath'            => array( '0', 'ШЛЯХ_ДО_СКРИПТУ', 'SCRIPTPATH' ),
+	'grammar'               => array( '0', 'ВІДМІ�ОК:', 'GRAMMAR:' ),
+	'notitleconvert'        => array( '0', '__БЕЗ_ПЕРЕТВОРЕ��Я_З�ГОЛОВК�__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'      => array( '0', '__БЕЗ_ПЕРЕТВОРЕ��Я_ТЕКСТУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'           => array( '1', 'ПОТОЧ�ИЙ_ТИЖДЕ�Ь', 'CURRENTWEEK' ),
+	'currentdow'            => array( '1', 'ПОТОЧ�ИЙ_ДЕ�Ь_ТИЖ�Я', 'CURRENTDOW' ),
+	'localweek'             => array( '1', 'ЛОК�ЛЬ�ИЙ_ТИЖДЕ�Ь', 'LOCALWEEK' ),
+	'localdow'              => array( '1', 'ЛОК�ЛЬ�ИЙ_ДЕ�Ь_ТИЖ�Я', 'LOCALDOW' ),
+	'revisionid'            => array( '1', 'ІД_ВЕРСІЇ', 'REVISIONID' ),
+	'revisionday'           => array( '1', 'ДЕ�Ь_ВЕРСІЇ', 'REVISIONDAY' ),
+	'revisionday2'          => array( '1', 'ДЕ�Ь_ВЕРСІЇ_2', 'REVISIONDAY2' ),
+	'revisionmonth'         => array( '1', 'МІСЯЦЬ_ВЕРСІЇ', 'REVISIONMONTH' ),
+	'revisionyear'          => array( '1', 'РІК_ВЕРСІЇ', 'REVISIONYEAR' ),
+	'revisiontimestamp'     => array( '1', 'МІТК�_Ч�СУ_ВЕРСІЇ', 'REVISIONTIMESTAMP' ),
+	'plural'                => array( '0', 'М�ОЖИ��:', 'PLURAL:' ),
+	'fullurl'               => array( '0', 'ПОВ��_�ДРЕС�:', 'FULLURL:' ),
+	'fullurle'              => array( '0', 'ПОВ��_�ДРЕС�_2:', 'FULLURLE:' ),
+	'lcfirst'               => array( '0', '�Р_ПЕРШ�:', 'LCFIRST:' ),
+	'ucfirst'               => array( '0', 'ВР_ПЕРШ�:', 'UCFIRST:' ),
+	'lc'                    => array( '0', '�Р:', '�ИЖ�ІЙ_РЕГІСТР:', 'LC:' ),
+	'uc'                    => array( '0', 'ВР:', 'ВЕРХ�ІЙ_РЕГІСТР:', 'UC:' ),
+	'raw'                   => array( '0', '�ЕОБРОБ:', 'RAW:' ),
+	'displaytitle'          => array( '1', 'ПОК�З�ТИ_З�ГОЛОВОК', 'DISPLAYTITLE' ),
+	'rawsuffix'             => array( '1', '�', 'R' ),
+	'newsectionlink'        => array( '1', '__ПОСИЛ���Я_��_�ОВИЙ_РОЗДІЛ__', '__NEWSECTIONLINK__' ),
+	'currentversion'        => array( '1', 'ПОТОЧ��_ВЕРСІЯ', 'CURRENTVERSION' ),
+	'urlencode'             => array( '0', 'З�КОДОВ���_�ДРЕС�:', 'URLENCODE:' ),
+	'anchorencode'          => array( '0', 'КОДУВ�ТИ_МІТКУ', 'ANCHORENCODE' ),
+	'currenttimestamp'      => array( '1', 'МІТК�_ПОТОЧ�ОГО_Ч�СУ', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'        => array( '1', 'МІТК�_ЛОК�ЛЬ�ОГО_Ч�СУ', 'LOCALTIMESTAMP' ),
+	'directionmark'         => array( '1', '��ПРЯМОК_ПИСЬМ�', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'              => array( '0', '#МОВ�:', '#LANGUAGE:' ),
+	'contentlanguage'       => array( '1', 'МОВ�_ВМІСТУ', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'      => array( '1', 'СТОРІ�ОК_У_ПРОСТОРІ_��ЗВ:', 'СТОР_У_П�:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'        => array( '1', 'КІЛЬКІСТЬ_�ДМІ�ІСТР�ТОРІВ', 'NUMBEROFADMINS' ),
+	'formatnum'             => array( '0', 'ФОРМ�ТУВ�ТИ_ЧИСЛО', 'ФОРМ�Т_ЧИСЛ', 'FORMATNUM' ),
+	'padleft'               => array( '0', 'З�ПОВ�ИТИ_ЛІВОРУЧ', 'PADLEFT' ),
+	'padright'              => array( '0', 'З�ПОВ�ИТИ_ПР�ВОРУЧ',  'PADRIGHT' ),
+	'special'               => array( '0', '�пеціальна', 'special' ),
+	'defaultsort'           => array( '1', 'СТ��Д�РТ�Е_СОРТУВ���Я', 'КЛЮЧ_СОРТУВ���Я', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'              => array( '0', 'ШЛЯХ_ДО_Ф�ЙЛУ:', 'FILEPATH:' ),
+	'tag'                   => array( '0', 'тег', 'мітка', 'tag' ),
+	'hiddencat'             => array( '1', '__ПРИХОВ_К�Т__', '__HIDDENCAT__' ),
+	'pagesincategory'       => array( '1', 'СТОР_В_К�Т', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'              => array( '1', 'РОЗМІР', 'РОЗМІР_СТОРІ�КИ', 'PAGESIZE' ),
+	'index'                 => array( '1', '__І�ДЕКС__', '__INDEX__' ),
+	'noindex'               => array( '1', '__БЕЗ_І�ДЕКСУ__',  '__NOINDEX__' ),
+	'numberingroup'         => array( '1', 'КІЛЬКІСТЬ_У_ГРУПІ', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'        => array( '1', '__СТ�ТИЧ�Е_ПЕРЕ��ПР�ВЛЕ��Я__', '__STATICREDIRECT__' ),
 );
 
 $linkTrail = '/^([a-zабвгґдеєжзиіїйклмнопр�туфхцчшщьєю�ёъы“»]+)(.*)$/sDu';
@@ -258,17 +252,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ховати мої редагуванн� у �пи�ку �по�тереженн�',
 'tog-watchlisthidebots'       => 'Ховати редагуванн� ботів у �пи�ку �по�тереженн�',
 'tog-watchlisthideminor'      => 'Ховати незначні редагуванн� у �пи�ку �по�тереженн�',
+'tog-watchlisthideliu'        => 'Ховати редагуванн� зареє�трованих кори�тувачів у �пи�ку �по�етереженн�',
+'tog-watchlisthideanons'      => 'Ховати редагуванн� анонімів у �пи�ку �по�тереженн�',
 'tog-nolangconversion'        => 'Відключити перетворенн� �и�тем пи�ьма',
 'tog-ccmeonemails'            => 'Відправл�ти мені копії ли�тів, �кі � над�илаю іншим кори�тувачам',
 'tog-diffonly'                => '�е показувати вмі�т �торінки під різницею вер�ій',
 'tog-showhiddencats'          => 'Показувати приховані категорії',
+'tog-norollbackdiff'          => '�е показувати різницю вер�ій пі�л� виконанн� відкоту',
 
 'underline-always'  => 'Завжди',
 'underline-never'   => '�іколи',
 'underline-default' => 'Викори�тати налаштуванн� браузера',
 
-'skinpreview' => '(Попередній перегл�д)',
-
 # Dates
 'sunday'        => 'неділ�',
 'monday'        => 'понеділок',
@@ -312,7 +307,7 @@ $messages = array(
 'feb'           => 'лют',
 'mar'           => 'бер',
 'apr'           => 'квіт',
-'may'           => 'трав',
+'may'           => 'травень',
 'jun'           => 'чер',
 'jul'           => 'лип',
 'aug'           => '�ер',
@@ -362,7 +357,7 @@ $messages = array(
 'mytalk'         => 'Мо� �торінка обговоренн�',
 'anontalk'       => 'Обговоренн� дл� цієї IP-адре�и',
 'navigation'     => '�авігаці�',
-'and'            => 'Ñ–',
+'and'            => '&#32;Ñ–',
 
 # Metadata in edit box
 'metadata_help' => 'Метадані:',
@@ -399,14 +394,14 @@ $messages = array(
 'talkpagelinktext'  => 'обговоренн�',
 'specialpage'       => 'Спеціальна �торінка',
 'personaltools'     => 'О�оби�ті ін�трументи',
-'postcomment'       => 'Прокоментувати',
+'postcomment'       => '�овий розділ',
 'articlepage'       => 'Перегл�нути �таттю',
 'talk'              => 'Обговоренн�',
 'views'             => 'Перегл�ди',
 'toolbox'           => 'Ін�трументи',
 'userpage'          => 'Перегл�нути �торінку кори�тувача',
 'projectpage'       => 'Перегл�нути �торінку проекту',
-'imagepage'         => 'Перегл�нути �торінку зображенн�',
+'imagepage'         => 'Перегл�нути �торінку файлу',
 'mediawikipage'     => 'Перегл�нути �торінку повідомленн�',
 'templatepage'      => 'Перегл�нути �торінку шаблону',
 'viewhelppage'      => 'Отримати довідку',
@@ -425,8 +420,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Про {{grammar:accusative|{{SITENAME}}}}',
 'aboutpage'            => 'Project:Про',
-'bugreports'           => 'Звіти про помилки',
-'bugreportspage'       => 'Project:Звіти про помилки',
 'copyright'            => 'Вмі�т до�тупний згідно з $1.',
 'copyrightpagename'    => '�втор�ькі права проекту {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:�втор�ьке право',
@@ -449,9 +442,7 @@ $messages = array(
 
 'badaccess'        => 'Помилка до�тупу',
 'badaccess-group0' => 'Вам не дозволено виконувати цю дію.',
-'badaccess-group1' => 'Ді�, �ку ви хотіли зробити, дозволена лише кори�тувачам із групи $1.',
-'badaccess-group2' => 'Ді�, �ку ви хотіли зробити, дозволена лише кори�тувачам із груп $1.',
-'badaccess-groups' => 'Ді�, �ку ви хотіли зробити, дозволена лише кори�тувачам із груп $1.',
+'badaccess-groups' => 'Ді�, �ку ви хотіли зробити, дозволена лише кори�тувачам із {{PLURAL:$2|групи|груп}}: $1.',
 
 'versionrequired'     => 'Потрібна MediaWiki вер�ії $1',
 'versionrequiredtext' => 'Дл� роботи з цією �торінкою потрібна MediaWiki вер�ії $1. Див. [[Special:Version|інформацію про вер�ії програмного забезпеченн�, �ке викори�товуєть��]].',
@@ -466,6 +457,8 @@ $messages = array(
 'editsection'             => 'ред.',
 'editold'                 => 'ред.',
 'viewsourceold'           => 'перегл�нути вихідний код',
+'editlink'                => 'редагувати',
+'viewsourcelink'          => 'показати код',
 'editsectionhint'         => 'Редагувати розділ: $1',
 'toc'                     => 'Змі�т',
 'showtoc'                 => 'показати',
@@ -482,7 +475,7 @@ $messages = array(
 'page-atom-feed'          => '«$1» — Atom-�трічка',
 'feed-atom'               => 'Atom',
 'feed-rss'                => 'RSS',
-'red-link-title'          => '$1 (ще не напи�ано)',
+'red-link-title'          => '$1 (така �торінка не і�нує)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Статт�',
@@ -498,7 +491,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Такої дії нема',
-'nosuchactiontext'  => 'Ді�, зазначена в URL, не розпізнаєть�� програмним забезпеченн�м вікі',
+'nosuchactiontext'  => 'Ді�, зазначена в URL, неправильна.
+Ви могли неправильно набрати URL або перейти по некоректному по�иланню. 
+Це також може означати помилку в програмному забезпеченні {{GRAMMAR:genitive|{{SITENAME}}}}.',
 'nosuchspecialpage' => 'Такої �пеціальної �торінки нема',
 'nospecialpagetext' => "<big>'''Така �пеціальна �торінка не і�нує.'''</big>
 
@@ -552,7 +547,6 @@ $1",
 'badtitle'             => '�еприпу�тима назва',
 'badtitletext'         => 'Запитана назва �торінки неправильна, порожн�, або неправильно зазначена міжмовна чи міжвікі назва.
 Можливо, в назві викори�товують�� недопу�тимі �имволи.',
-'perfdisabled'         => '�а жаль, ц� можливі�ть тимча�ово недо�тупна через завантажені�ть �ервера.',
 'perfcached'           => '�а�тупні дані вз�ті з кешу і можуть бути за�тарілими:',
 'perfcachedts'         => '�а�тупні дані вз�ті з кешу, во�таннє він оновлював�� о $1.',
 'querypage-no-updates' => 'Зміни цієї �торінки зараз заборонені. Дані тут не можуть бути оновлені зараз.',
@@ -566,7 +560,7 @@ $1",
 'protectedpagetext'    => 'Ц� �торінка закрита дл� редагуванн�.',
 'viewsourcetext'       => 'Ви можете перегл�нути та �копіювати початковий тек�т цієї �торінки:',
 'protectedinterface'   => 'Ц� �торінка є ча�тиною інтерфей�у програмного забезпеченн� і її можуть редагувати лише адміні�тратори проекту.',
-'editinginterface'     => "'''Увага:''' Ви редагуєте �торінку, що є ча�тиною тек�тового інтерфей�у. Зміни цієї �торінки викличуть зміну інтерфей�у дл� інших кори�тувачів. Дл� перекладу повідомленн� викори�товуйте [http://translatewiki.net/wiki/Main_Page?setlang=uk Betawiki] — проект, що займаєть�� локалізацією MediaWiki.",
+'editinginterface'     => "'''Увага:''' Ви редагуєте �торінку, що є ча�тиною тек�тового інтерфей�у. Зміни цієї �торінки викличуть зміну інтерфей�у дл� інших кори�тувачів. Дл� перекладу повідомленн� викори�товуйте [http://translatewiki.net/wiki/Main_Page?setlang=uk translatewiki.net] — проект, що займаєть�� локалізацією MediaWiki.",
 'sqlhidden'            => '(SQL запит приховано)',
 'cascadeprotected'     => 'Сторінка захищена від змін, о�кільки її включено до {{PLURAL:$1|�торінки, дл� �кої|на�тупних �торінок, дл� �ких}} у�тановлено ка�кадний захи�т: $2',
 'namespaceprotected'   => 'У ва� нема дозволу редагувати �торінки в про�торі назв «$1».',
@@ -576,15 +570,15 @@ $1",
 Зазначена на�тупна причина: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Помилка налаштуванн�: невідомий �канер віру�ів: <i>$1</i>',
+'virus-badscanner'     => "Помилка налаштуванн�: невідомий �канер віру�ів: ''$1''",
 'virus-scanfailed'     => 'помилка �кануванн� (код $1)',
 'virus-unknownscanner' => 'невідомий антивіру�:',
 
 # Login and logout pages
 'logouttitle'                => 'Вийти з �и�теми',
-'logouttext'                 => '<strong>Тепер ви працюєте в тому ж режимі, �кий був до вашого входу до �и�теми.</strong>
+'logouttext'                 => "'''Тепер ви працюєте в тому ж режимі, �кий був до вашого входу до �и�теми.'''
 
-Ви можете продовжувати викори�товувати {{grammar:accusative|{{SITENAME}}}} анонімно або знову [[Special:UserLogin|ввійти у �и�тему]] �к той �амий чи інший кори�тувач. Де�кі �торінки можуть відображати��, ніби ви ще пред�тавлені �и�темі під іменем, щоб уникнути цього, оновіть кеш браузера.',
+Ви можете продовжувати викори�товувати {{grammar:accusative|{{SITENAME}}}} анонімно або знову [[Special:UserLogin|ввійти у �и�тему]] �к той �амий чи інший кори�тувач. Де�кі �торінки можуть відображати��, ніби ви ще пред�тавлені �и�темі під іменем, щоб уникнути цього, оновіть кеш браузера.",
 'welcomecreation'            => '== Вітаємо ва�, $1! ==
 Ваш обліковий запи� �творено.
 �е забудьте змінити �вої [[Special:Preferences|налаштуванн� дл� �айту]].',
@@ -595,7 +589,6 @@ $1",
 'remembermypassword'         => "Запам'�товувати мій обліковий запи� на цьому комп'ютері",
 'yourdomainname'             => 'Ваш домен:',
 'externaldberror'            => 'Стала�� помилка при автентифікації за допомогою зовнішньої бази даних, або у ва� недо�татньо прав дл� вне�енн� змін до �вого зовнішнього облікового запи�у.',
-'loginproblem'               => '<b>Проблема при вході до �и�теми.</b><br />Спробуйте ще раз!',
 'login'                      => 'Вхід до �и�теми',
 'nav-login-createaccount'    => 'Вхід / реє�траці�',
 'loginprompt'                => 'Ви повинні активувати куки (cookies) дл� входу до {{GRAMMAR:genitive|{{SITENAME}}}}.',
@@ -621,7 +614,7 @@ $1",
 'yourvariant'                => 'Варіант мови:',
 'yournick'                   => 'Ваш п�евдонім (дл� підпи�ів):',
 'badsig'                     => '�еправильний підпи�. Перевірте коректні�ть HTML-тегів.',
-'badsiglength'               => 'Дуже довгий підпи�.
+'badsiglength'               => 'Ваш підпи� дуже довгий.
 Повинно бути не більше $1 {{PLURAL:$1|�имволу|�имволів|�имволів}}.',
 'email'                      => 'Електронна пошта',
 'prefs-help-realname'        => "Справжнє ім'� (необов'�зкове поле): �кщо ви його зазначите, то воно буде викори�товувати��, щоб показувати, хто редагував �торінку.",
@@ -640,10 +633,11 @@ $1",
 'loginsuccesstitle'          => 'У�пішний вхід до �и�теми',
 'loginsuccess'               => "'''Тепер ви працюєте у {{grammar:genitive|{{SITENAME}}}} під іменем $1.'''",
 'nosuchuser'                 => 'Кори�тувач з іменем «$1» не і�нує.
+Імена кори�тувачів регі�трозалежні.
 Перевірте правильні�ть напи�анн� або �кори�тайте�� формою нижче, щоб [[Special:UserLogin/signup|зареє�трувати нового кори�тувача]].',
 'nosuchusershort'            => 'Кори�тувач з іменем <nowiki>$1</nowiki> не і�нує.
 Перевірте правильні�ть напи�анн� імені.',
-'nouserspecified'            => "Ви повинні вказати ім'� кори�тувача.",
+'nouserspecified'            => "Ви повинні зазначити ім'� кори�тувача.",
 'wrongpassword'              => 'Ви ввели хибний пароль. Спробуйте ще раз.',
 'wrongpasswordempty'         => 'Ви не ввели пароль. Будь ла�ка, �пробуйте ще раз.',
 'passwordtooshort'           => 'Ваш пароль неправильний або занадто короткий.
@@ -667,8 +661,9 @@ $1",
 'throttled-mailpassword'     => 'Функці� нагадуванн� парол� вже викори�товувала�ь прот�гом {{PLURAL:$1|о�танньої $1 години|о�танніх $1 годин|о�танніх $1 годин}}.
 Дл� попередженн� зловживань дозволено виконувати не більше одного нагадуванн� за $1 {{PLURAL:$1|годину|години|годин}}.',
 'mailerror'                  => 'Помилка при відправці пошти: $1',
-'acct_creation_throttle_hit' => '�а жаль, ви вже �творили $1 облікових запи�ів. Ви не можете �творити більше жодного.',
-'emailauthenticated'         => '�дре�у вашої електронної пошти підтверджено $1.',
+'acct_creation_throttle_hit' => 'Відвідувачі з вашої IP-адре�и вже �творили $1 {{PLURAL:$1|обліковий запи�|облікових запи�и|облікових запи�ів}} за о�танню добу, що є мак�имумом дл� цього відрізка ча�у.
+Таким чином, кори�тувачі з цієї IP-адре�и не можуть на цей момент �творювати нових облікових запи�ів.',
+'emailauthenticated'         => '�дре�у вашої електронної пошти підтверджено $2 о $3.',
 'emailnotauthenticated'      => '�дре�у вашої електронної пошти <strong>ще не підтверджено</strong>, функції вікі-двигуна роботи з ел. поштою відключені.',
 'noemailprefs'               => '�дре�у електронної пошти не вказано, функції вікі роботи з ел. поштою відключені.',
 'emailconfirmlink'           => 'Підтвердити адре�у вашої електронної пошти',
@@ -680,17 +675,25 @@ $1",
 'createaccount-text'         => 'Хто�ь �творив обліковий запи� «$2» на �ервері проекту {{SITENAME}} ($4) з паролем «$3», зазначивши вашу адре�у електронної пошти. Вам �лід зайти і змінити пароль.
 
 Проігноруйте дане повідомленн�, �кщо обліковий запи� було �творено помилково.',
+'login-throttled'            => 'Ви зробили надто багато �проб вве�ти пароль дл� цього облікового запи�у. Будь ла�ка, зачекайте перед повторною �пробою.',
 'loginlanguagelabel'         => 'Мова: $1',
 
 # Password reset dialog
-'resetpass'               => 'Очи�тити пароль облікового запи�у',
-'resetpass_announce'      => 'Ви ввійшли, викори�товуючи тимча�овий пароль, �кий отримали електронною поштою. Дл� завершенн� входу до �и�теми, ви повинні вказати новий пароль тут:',
-'resetpass_header'        => 'Змінити пароль облікового запи�у',
-'resetpass_submit'        => 'У�тановити пароль і ввійти',
-'resetpass_success'       => 'Ваш пароль у�пішно змінено! Виконуєть�� вхід до �и�теми…',
-'resetpass_bad_temporary' => '�едій�ний тимча�овий пароль. Можливо, ви вже змінили ваш пароль. Спробуйте наді�лати запит на тимча�овий пароль ще раз.',
-'resetpass_forbidden'     => 'Можливі�ть зміни парол� не передбачена.',
-'resetpass_missing'       => 'Форма не мі�тить даних.',
+'resetpass'                 => 'Змінити пароль',
+'resetpass_announce'        => 'Ви ввійшли, викори�товуючи тимча�овий пароль, �кий отримали електронною поштою. Дл� завершенн� входу до �и�теми, ви повинні вказати новий пароль тут:',
+'resetpass_header'          => 'Змінити пароль облікового запи�у',
+'oldpassword'               => 'Старий пароль:',
+'newpassword'               => '�овий пароль:',
+'retypenew'                 => 'Ще раз введіть новий пароль:',
+'resetpass_submit'          => 'У�тановити пароль і ввійти',
+'resetpass_success'         => 'Ваш пароль у�пішно змінено! Виконуєть�� вхід до �и�теми…',
+'resetpass_bad_temporary'   => '�едій�ний тимча�овий пароль. Можливо, ви вже змінили ваш пароль. Спробуйте наді�лати запит на тимча�овий пароль ще раз.',
+'resetpass_forbidden'       => 'Можливі�ть зміни парол� не передбачена.',
+'resetpass-no-info'         => 'Щоб звертати�� безпо�ередньо до цієї �торінки, вам �лід увійти до �и�теми.',
+'resetpass-submit-loggedin' => 'Змінити пароль',
+'resetpass-wrong-oldpass'   => '�еправильний тимча�овий або поточний пароль.
+Можливо, ви вже у�пішно змінили пароль або зробили запит на новий тимча�овий пароль.',
+'resetpass-temp-password'   => 'Тимча�овий пароль:',
 
 # Edit page toolbar
 'bold_sample'     => 'Жирний тек�т',
@@ -713,8 +716,8 @@ $1",
 'hr_tip'          => 'Горизонтальна ліні� (не викори�товуйте ча�то)',
 
 # Edit pages
-'summary'                          => 'Короткий опи� змін',
-'subject'                          => 'Тема/заголовок',
+'summary'                          => 'Короткий опи� змін:',
+'subject'                          => 'Тема/заголовок:',
 'minoredit'                        => '�езначна зміна',
 'watchthis'                        => 'Спо�терігати за цією �торінкою',
 'savearticle'                      => 'Зберегти �торінку',
@@ -728,8 +731,8 @@ $1",
 'missingcommenttext'               => 'Будь ла�ка, введіть нижче ваше повідомленн�.',
 'missingcommentheader'             => "'''�агадуванн�''': Ви не зазначили коментар до редагуванн�.
 �ати�нувши кнопку «Зберегти �торінку» ще раз, ви збережете редагуванн� без коментар�.",
-'summary-preview'                  => 'Опи� буде',
-'subject-preview'                  => 'Заголовок буде',
+'summary-preview'                  => 'Опи� буде:',
+'subject-preview'                  => 'Заголовок буде:',
 'blockedtitle'                     => 'Кори�тувача заблоковано',
 'blockedtext'                      => "<big>'''Ваш обліковий запи� або IP-адре�а заблоковані.'''</big>
 
@@ -782,33 +785,36 @@ $1",
 Тому ми вимушені викори�товувати IP-адре�у дл� його ідентифікації.
 Одна IP-адре�а може викори�товувати�� декількома кори�тувачами.
 Якщо ви — анонімний кори�тувач і вважаєте, що отримали коментарі, адре�овані не вам, будь ла�ка [[Special:UserLogin/signup|зареє�труйте�ь]] або [[Special:UserLogin|увійдіть до �и�теми]], щоб у майбутньому уникнути можливої плутанини з іншими анонімними кори�тувачами.''",
-'noarticletext'                    => "Зараз на цій �торінці нема тек�ту. Ви можете [[Special:Search/{{PAGENAME}}|пошукати цю назву]] в інших �татт�х або '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} �творити �торінку з такою назвою]'''.",
+'noarticletext'                    => 'Зараз на цій �торінці нема тек�ту.
+Ви можете [[Special:Search/{{PAGENAME}}|пошукати цю назву]] в інших �торінках,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} пошукати в журналах]
+або [{{fullurl:{{FULLPAGENAME}}|action=edit}} �творити �торінку з такою назвою]</span>.',
 'userpage-userdoesnotexist'        => 'Кори�тувач під назвою "$1" не зареє�трований. Переконайте��, що ви хочете �творити/редагувати цю �торінку.',
 'clearyourcache'                   => "'''Зауваженн�:''' Пі�л� зберіганн� ви маєте відновити кеш вашого браузера, щоб побачити зміни. '''Mozilla / Firefox / Safari:''' тримайте ''Shift'', коли нати�каєте ''Reload'', або нати�ніть ''Ctrl-Shift-R'' (''Cmd-Shift-R'' на Apple Mac); '''IE:''' тримайте ''Ctrl'', коли нати�каєте ''Refresh'', або нати�ніть ''Ctrl-F5''; '''Konqueror:''': нати�ніть кнопку ''Reload'', або нати�ніть ''F5''; '''Opera:''' кори�тувачам може знадобити�ь повні�тю очи�тити кеш у ''Tools→Preferences''.",
-'usercssjsyoucanpreview'           => '<strong>Підказка:</strong> Викори�товуйте кнопку попереднього перегл�ду, щоб проте�тувати ваш новий css-файл чи js-файл перед збереженн�м.',
+'usercssjsyoucanpreview'           => "'''Підказка:''' Викори�товуйте кнопку попереднього перегл�ду, щоб проте�тувати ваш новий css-файл чи js-файл перед збереженн�м.",
 'usercsspreview'                   => "'''Пам'�тайте, що це лише попередній перегл�д вашого css-файлу.'''
 '''Його ще не збережено!'''",
 'userjspreview'                    => "'''Пам'�тайте, що це тільки попередній перегл�д вашого JavaScript-файлу і поки він ще не збережений!'''",
 'userinvalidcssjstitle'            => "'''Увага:''' тема оформленн� «$1» не знайдена.
 Пам'�тайте, що кори�тувацькі .css та .js �торінки повинні мати назву, що �кладаєть�� лише з малих літер, наприклад «{{ns:user}}:Хто�ь/monobook.css», а не «{{ns:user}}:Хто�ь/Monobook.css».",
 'updated'                          => '(Оновлена)',
-'note'                             => '<strong>Зауваженн�:</strong>',
-'previewnote'                      => '<strong>Це лише попередній перегл�д,
-тек�т ще не збережений!</strong>',
+'note'                             => "'''Зауваженн�:'''",
+'previewnote'                      => "'''Це лише попередній перегл�д,
+тек�т ще не збережений!'''",
 'previewconflict'                  => 'Цей попередній перегл�д відображає тек�т з верхнього вікна редагуванн� так, �к він буде вигл�діти, �кщо ви вирішите зберегти його.',
-'session_fail_preview'             => '<strong>Си�тема не може зберегти ваші редагуванн� о�кільки втрачені дані �е�ії. Будь ла�ка повторіть вашу �пробу. Якщо помилка буде повторювати�ь, �пробуйте вийти з �и�теми і зайти знов.
-</strong>',
+'session_fail_preview'             => "'''Си�тема не може зберегти ваші редагуванн�, о�кільки втрачені дані �еан�у. Будь ла�ка, повторіть вашу �пробу.
+Якщо помилка буде повторювати�ь, �пробуйте [[Special:UserLogout|вийти з �и�теми]] і зайти знову.'''",
 'session_fail_preview_html'        => "<sstrong>Вибачте! �еможливо зберегти ваші зміни через втрату даних HTML-�е�ії.</sstrong>
 
 ''О�кільки {{SITENAME}} дозвол�є викори�товувати чи�тий HTML, попередній перегл�д відключено, щоб попередити JavaScript-атаки.''
 
 <sstrong>Якщо це добро�кі�на �проба редагуванн�, будь ла�ка, �пробуйте ще раз. Якщо не вийде знову, - �пробуйте [[Special:UserLogout|завершити �еан� роботи]] й ще раз ввійти до �и�теми.</sstrong>",
-'token_suffix_mismatch'            => '<strong>Ваше редагуванн� було відхилене, о�кільки ваша програма не правильно обробл�є знаки пунктуації у вікні редагуванн�. Редагуванн� було �ка�оване дл� запобіганн� �потворенню тек�ту �татті.
-Подібні проблеми можуть виникати при викори�танні анонімізуючих веб-прок�і, що мі�т�ть помилки.</strong>',
+'token_suffix_mismatch'            => "'''Ваше редагуванн� було відхилене, о�кільки ваша програма не правильно обробл�є знаки пунктуації у вікні редагуванн�. Редагуванн� було �ка�оване дл� запобіганн� �потворенню тек�ту �татті.
+Подібні проблеми можуть виникати при викори�танні анонімізуючих веб-прок�і, що мі�т�ть помилки.'''",
 'editing'                          => 'Редагуванн� $1',
 'editingsection'                   => 'Редагуванн� $1 (розділ)',
-'editingcomment'                   => 'Редагуванн� $1 (коментар)',
-'editconflict'                     => 'Конфлікт редакцій: $1',
+'editingcomment'                   => 'Редагуванн� $1 (новий розділ)',
+'editconflict'                     => 'Конфлікт редагуванн�: $1',
 'explainconflict'                  => 'Ще хто�ь змінив цю �торінку з того ча�у, �к ви розпочали її змінювати.
 У верхньому вікні показано поточний тек�т �торінки.
 Ваші зміни показані в нижньому вікні.
@@ -816,29 +822,31 @@ $1",
 Якщо ви нати�нете «Зберегти �торінку», то буде збережено <b>тільки</b> тек�т у верхньому вікні редагуванн�.',
 'yourtext'                         => 'Ваш тек�т',
 'storedversion'                    => 'Збережена вер�і�',
-'nonunicodebrowser'                => '<strong>ПОПЕРЕДЖЕ��Я: Ваш [[браузер]] не підтримує кодуванн� [[Юнікод]]. При редагуванні �татей в�і не-ASCII �имволи будуть замінені на �вої ші�надц�ткові коди.</strong>',
-'editingold'                       => '<strong>ПОПЕРЕДЖЕ��Я: Ви редагуєте за�тарілу вер�ію даної �татті.
-Якщо ви збережете її, будь-�кі редагуванн�, зроблені між вер�і�ми, будуть втрачені.</strong>',
+'nonunicodebrowser'                => "'''ПОПЕРЕДЖЕ��Я: Ваш [[браузер]] не підтримує кодуванн� [[Юнікод]]. При редагуванні �татей в�і не-ASCII �имволи будуть замінені на �вої ші�надц�ткові коди.'''",
+'editingold'                       => "'''ПОПЕРЕДЖЕ��Я: Ви редагуєте за�тарілу вер�ію даної �татті.
+Якщо ви збережете її, будь-�кі редагуванн�, зроблені між вер�і�ми, будуть втрачені.'''",
 'yourdiff'                         => 'Відмінно�ті',
-'copyrightwarning'                 => 'Зверніть увагу, що будь-�кі додаванн� і зміни до {{grammar:genitive|{{SITENAME}}}} розгл�дають�� �к випущені на умовах ліцензії $2 (див. $1).
+'copyrightwarning'                 => "Зверніть увагу, що будь-�кі додаванн� і зміни до {{grammar:genitive|{{SITENAME}}}} розгл�дають�� �к випущені на умовах ліцензії $2 (див. $1).
 Якщо ви не бажаєте, щоб напи�ане вами безжалі�но редагувало�ь і розпов�юджувало�� за бажанн�м будь-кого, не пишіть тут.<br />
 Ви також підтверджуєте, що напи�ане вами тут належить вам або вз�те з джерела, що є �у�пільним надбанн�м чи подібним вільним джерелом.
-<strong>�Е ПУБЛІКУЙТЕ ТУТ БЕЗ ДОЗВОЛУ М�ТЕРІ�ЛИ, ЩО ОХОРО�ЯЮТЬСЯ �ВТОРСЬКИМ ПР�ВОМ!</strong>',
+'''�Е ПУБЛІКУЙТЕ ТУТ БЕЗ ДОЗВОЛУ М�ТЕРІ�ЛИ, ЩО ОХОРО�ЯЮТЬСЯ �ВТОРСЬКИМ ПР�ВОМ!'''",
 'copyrightwarning2'                => "Будь ла�ка, зверніть увагу, що в�і вне�ені вами зміни можуть редагувати��, доповнювати�� або вилучати�� іншими кори�тувачами.
 Якщо ви не бажаєте, щоб напи�ане вами безжалі�но редагувало�ь — не пишіть тут.<br />
 Ви також зобов'�зуєте�ь, що напи�ане вами тут належить вам або вз�те з джерела, що є �у�пільним надбанн�м, або подібного вільного джерела (див. $1).<br />
-<strong>�Е ПУБЛІКУЙТЕ ТУТ БЕЗ ДОЗВОЛУ М�ТЕРІ�ЛИ, ЩО Є ОБ'ЄКТОМ �ВТОРСЬКОГО ПР�В�!</strong>",
-'longpagewarning'                  => '<strong>ПОПЕРЕДЖЕ��Я: Довжина цієї �торінки $1 кб;
+'''�Е ПУБЛІКУЙТЕ ТУТ БЕЗ ДОЗВОЛУ М�ТЕРІ�ЛИ, ЩО Є ОБ'ЄКТОМ �ВТОРСЬКОГО ПР�В�!'''",
+'longpagewarning'                  => "'''ПОПЕРЕДЖЕ��Я: Довжина цієї �торінки $1 кб;
 �торінки, розмір �ких перевищує 32&nbsp;кб, можуть �творювати проблеми дл� де�ких браузерів.
-Будь ла�ка, розгл�ньте варіанти розбитт� �торінки на менші ча�тини.</strong>',
-'longpageerror'                    => '<strong>ПОМИЛК�: тек�т, що ви хочете зберегти має $1 кілобайт, що більше ніж в�тановлену межу $2 кілобайт. Сторінку неможливо зберегти.</strong>',
-'readonlywarning'                  => "<strong>ПОПЕРЕДЖЕ��Я: База даних заблокована в зв'�зку з процедурами об�луговуванн�,
+Будь ла�ка, розгл�ньте варіанти розбитт� �торінки на менші ча�тини.'''",
+'longpageerror'                    => "'''ПОМИЛК�: тек�т, що ви хочете зберегти має $1 кілобайт, що більше ніж в�тановлену межу $2 кілобайт. Сторінку неможливо зберегти.'''",
+'readonlywarning'                  => "'''ПОПЕРЕДЖЕ��Я: База даних заблокована в зв'�зку з процедурами об�луговуванн�,
 тому, на даний момент, ви не можете запи�ати ваші зміни.
-Можливо, вам варто зберегти тек�т в локальний файл (на �воєму ди�ку) й зберегти його пізніше.</strong>",
-'protectedpagewarning'             => '<strong>ПОПЕРЕДЖЕ��Я: Ц� �торінка захищена від змін, її можуть редагувати тільки адміні�тратори.</strong>',
+Можливо, вам варто зберегти тек�т в локальний файл (на �воєму ди�ку) й зберегти його пізніше.'''
+
+�дміні�тратор, що заблокував базу даних, залишив на�тупне по��ненн�: $1",
+'protectedpagewarning'             => "'''ПОПЕРЕДЖЕ��Я: Ц� �торінка захищена від змін, її можуть редагувати тільки адміні�тратори.'''",
 'semiprotectedpagewarning'         => "'''Примітка:''' Ц� �торінка захищена. Її можуть редагувати тільки зареє�тровані кори�тувачі.",
 'cascadeprotectedwarning'          => "'''Попередженн�:''' Цю �торінку можуть редагувати лише кори�тувачі з групи «�дміні�тратори», о�кільки вона включена {{PLURAL:$1|до �торінки, дл� �кої|до на�тупних �торінок, дл� �ких}} активовано ка�кадний захи�т:",
-'titleprotectedwarning'            => '<strong>Попередженн�. Ц� �торінка була захищена, �творити її можуть лише певні кори�тувачі.</strong>',
+'titleprotectedwarning'            => "'''Попередженн�. Ц� �торінка була захищена, тому дл� її �творенн� потрібні [[Special:ListGroupRights|о�обливі права]].'''",
 'templatesused'                    => 'Шаблони, викори�тані на цій �торінці:',
 'templatesusedpreview'             => 'Шаблони, викори�тані на цій �торінці:',
 'templatesusedsection'             => 'Шаблони, викори�тані в цій �екції:',
@@ -857,11 +865,21 @@ $1",
 
 Перевірте, чи �правді вам потрібно знову �творювати цю �торінку.
 �ижче наведений журнал вилучень:",
+'deleted-notice'                   => 'Ц� �торінка була вилучена. Дл� довідки нижче наведені відповідні запи�и з журналу вилучень.',
+'deletelog-fulllog'                => 'Перегл�нути повний журнал',
+'edit-hook-aborted'                => 'Редагуванн� �ка�оване процедурою-перехоплювачем.
+Додаткові по��ненн� не наведені.',
+'edit-gone-missing'                => '�еможливо оновити �торінку.
+Імовірно, вона була вилучена.',
+'edit-conflict'                    => 'Конфлікт редагувань.',
+'edit-no-change'                   => 'Ваше редагуванн� відхилене, о�кільки в тек�ті не було зроблено змін.',
+'edit-already-exists'              => '�еможливо �творити нову �торінку.
+Вона вже і�нує.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Увага: Ц� �торінка мі�тить дуже багато викликів ре�ур�омі�тких функцій.
 
-Кількі�ть викликів не повинна перевищувати $2, а зараз їх $1.',
+Кількі�ть викликів не повинна перевищувати $2, зараз потрібно зробити $1 {{PLURAL:$1|виклик|виклики|викликів}}.',
 'expensive-parserfunction-category'       => 'Сторінки з дуже великою кількі�тю викликів ре�ур�омі�тких функцій',
 'post-expand-template-inclusion-warning'  => 'Увага: розмір шаблонів дл� включенн� занадто великий.
 Де�кі шаблони не будуть включені.',
@@ -869,6 +887,8 @@ $1",
 'post-expand-template-argument-warning'   => 'Увага: Ц� �торінка мі�тить принаймні один аргумент шаблону, �кий має надто великий розмір дл� розгортанн�.
 Такі аргументи були опущені.',
 'post-expand-template-argument-category'  => 'Сторінки, �кі мі�т�ть пропущені аргументи шаблонів',
+'parser-template-loop-warning'            => 'Ви�влена петл� у шаблонах: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Перевищена границ� глибини рекур�ії шаблону ($1)',
 
 # "Undo" feature
 'undo-success' => 'Редагуванн� відмінено. Будь-ла�ка, нати�ніть «Зберегти», щоб зберегти зміни.',
@@ -883,29 +903,28 @@ $1",
 $3 зазначив таку причину: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Показати журнали дл� цієї �торінки',
-'nohistory'           => 'Дл� цієї �татті від�утній журнал редагувань.',
-'revnotfound'         => 'Вер�ію не знайдено',
-'revnotfoundtext'     => '�еможливо знайти необхідну вам вер�ію �татті.
-Будь-ла�ка, перевірте правильні�ть по�иланн�, �ке ви викори�товували дл� до�тупу до цієї �татті.',
-'currentrev'          => 'Поточна вер�і�',
-'revisionasof'        => 'Вер�і� $1',
-'revision-info'       => 'Вер�і� від $1; $2',
-'previousrevision'    => '� Старіша вер�і�',
-'nextrevision'        => '�овіша вер�і� →',
-'currentrevisionlink' => 'Поточна вер�і�',
-'cur'                 => 'поточн.',
-'next'                => 'на�т.',
-'last'                => 'о�т.',
-'page_first'          => 'перша',
-'page_last'           => 'о�танн�',
-'histlegend'          => "По��ненн�: (поточн.) = відмінно�ті від поточної вер�ії,
+'viewpagelogs'           => 'Показати журнали дл� цієї �торінки',
+'nohistory'              => 'Дл� цієї �татті від�утній журнал редагувань.',
+'currentrev'             => 'Поточна вер�і�',
+'currentrev-asof'        => 'Поточна вер�і� на $1',
+'revisionasof'           => 'Вер�і� $1',
+'revision-info'          => 'Вер�і� від $1; $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Старіша вер�і�',
+'nextrevision'           => '�овіша вер�і� →',
+'currentrevisionlink'    => 'Поточна вер�і�',
+'cur'                    => 'поточн.',
+'next'                   => 'на�т.',
+'last'                   => 'о�т.',
+'page_first'             => 'перша',
+'page_last'              => 'о�танн�',
+'histlegend'             => "По��ненн�: (поточн.) = відмінно�ті від поточної вер�ії,
 (о�т.) = відмінно�ті від попередньої вер�ії, '''м''' = незначне редагуванн�",
-'deletedrev'          => '[вилучена]',
-'histfirst'           => 'най�таріші',
-'histlast'            => 'о�танні',
-'historysize'         => '($1 {{PLURAL:$1|байт|байти|байтів}})',
-'historyempty'        => '(порожньо)',
+'history-fieldset-title' => 'Показати і�торію',
+'deletedrev'             => '[вилучена]',
+'histfirst'              => 'най�таріші',
+'histlast'               => 'о�танні',
+'historysize'            => '($1 {{PLURAL:$1|байт|байти|байтів}})',
+'historyempty'           => '(порожньо)',
 
 # Revision feed
 'history-feed-title'          => 'І�торі� редагувань',
@@ -992,6 +1011,7 @@ $3 зазначив таку причину: ''$2''",
 'mergehistory-invalid-destination' => 'Цільова �торінка повинна мати правильний заголовок.',
 'mergehistory-autocomment'         => 'Редагуванн� з [[:$1]] перене�ені до [[:$2]]',
 'mergehistory-comment'             => 'Редагуванн� [[:$1]] перене�ені до [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Початкова і цільова �торінки повинні відрізн�ти��',
 
 # Merge log
 'mergelog'           => "Журнал об'єднань",
@@ -1004,120 +1024,202 @@ $3 зазначив таку причину: ''$2''",
 'difference'              => '(відмінно�ті між вер�і�ми)',
 'lineno'                  => 'Р�док $1:',
 'compareselectedversions' => 'Порівн�ти вибрані вер�ії',
+'visualcomparison'        => '�аочне порівн�нн�',
+'wikicodecomparison'      => 'Порівн�нн� вікі-тек�ту',
 'editundo'                => '�ка�увати',
 'diff-multi'              => '($1 {{PLURAL:$1|проміжна вер�і� не показана|проміжні вер�ії не показані|проміжних вер�ій не показані}}.)',
+'diff-movedto'            => 'оформлено �к $1',
+'diff-styleadded'         => 'доданий �тиль $1',
+'diff-added'              => 'додано $1',
+'diff-changedto'          => 'змінено на $1',
+'diff-movedoutof'         => 'вине�ено з $1',
+'diff-styleremoved'       => 'вилучено �тиль $1',
+'diff-removed'            => 'вилучено $1',
+'diff-changedfrom'        => 'змінено з $1',
+'diff-src'                => 'джерело',
+'diff-withdestination'    => 'з призначенн�м $1',
+'diff-with'               => '&#32;з $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;Ñ– $1 $2',
+'diff-width'              => 'ширина',
+'diff-height'             => 'ви�ота',
+'diff-p'                  => "'''абзац'''",
+'diff-blockquote'         => "'''цитата'''",
+'diff-h1'                 => "'''заголовок 1-го рівн�'''",
+'diff-h2'                 => "'''заголовок 2-го рівн�'''",
+'diff-h3'                 => "'''заголовок 3-го рівн�'''",
+'diff-h4'                 => "'''заголовок 4-го рівн�'''",
+'diff-h5'                 => "'''заголовок 5-го рівн�'''",
+'diff-pre'                => "'''блок заданого формату'''",
+'diff-div'                => "'''розділ'''",
+'diff-ul'                 => "'''невпор�дкований �пи�ок'''",
+'diff-ol'                 => "'''упор�дкований �пи�ок'''",
+'diff-li'                 => "'''елемент �пи�ку'''",
+'diff-table'              => "'''таблиц�'''",
+'diff-tbody'              => "'''вмі�т таблиці'''",
+'diff-tr'                 => "'''р�док'''",
+'diff-td'                 => "'''комірка'''",
+'diff-th'                 => "'''заголовок'''",
+'diff-br'                 => "'''розрив'''",
+'diff-hr'                 => "'''горизонтальна ліні�'''",
+'diff-code'               => "'''блок програмного коду'''",
+'diff-dl'                 => "'''�пи�ок означень'''",
+'diff-dt'                 => "'''означуваний термін'''",
+'diff-dd'                 => "'''означенн�'''",
+'diff-input'              => "'''поле вводу'''",
+'diff-form'               => "'''форма'''",
+'diff-img'                => "'''зображенн�'''",
+'diff-span'               => "'''span'''",
+'diff-a'                  => "'''по�иланн�'''",
+'diff-i'                  => "'''кур�ив'''",
+'diff-b'                  => "'''жирний шрифт'''",
+'diff-strong'             => "'''тег &lt;strong&gt;'''",
+'diff-em'                 => "'''тег &lt;em&gt;'''",
+'diff-font'               => "'''шрифт'''",
+'diff-big'                => "'''великий шрифт'''",
+'diff-del'                => "'''вилучено'''",
+'diff-tt'                 => "'''моноширинний шрифт'''",
+'diff-sub'                => "'''нижній індек�'''",
+'diff-sup'                => "'''верхній індек�'''",
+'diff-strike'             => "'''закре�лений шрифт'''",
 
 # Search results
-'searchresults'             => 'Результати пошуку',
-'searchresulttext'          => 'Дл� отриманн� детальнішої інформації про пошук у проекті, див. [[{{ns:project}}:Пошук]].',
-'searchsubtitle'            => 'Ви шукали «[[:$1]]» ([[Special:Prefixindex/$1|у�і �торінки, що починають�� на «$1»]] | [[Special:WhatLinksHere/$1|у�і �торінки, що мають по�иланн� на «$1»]])',
-'searchsubtitleinvalid'     => '�а запит «$1»',
-'noexactmatch'              => "'''Сторінка з назвою «$1» не і�нує.'''
+'searchresults'                    => 'Результати пошуку',
+'searchresults-title'              => 'Результати пошуку дл� «$1»',
+'searchresulttext'                 => 'Дл� отриманн� детальнішої інформації про пошук у проекті, див. [[{{ns:project}}:Пошук]].',
+'searchsubtitle'                   => 'Ви шукали «[[:$1]]» ([[Special:Prefixindex/$1|у�і �торінки, що починають�� на «$1»]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|у�і �торінки, що мають по�иланн� на «$1»]])',
+'searchsubtitleinvalid'            => '�а запит «$1»',
+'noexactmatch'                     => "'''Сторінка з назвою «$1» не і�нує.'''
 Ви можете [[:$1|�творити �торінку]].",
-'noexactmatch-nocreate'     => 'Сторінка з назвою «$1» не і�нує.',
-'toomanymatches'            => 'Знайдено дуже багато відповідно�тей, будь ла�ка, �пробуйте інший запит',
-'titlematches'              => 'Збіги в назвах �торінок',
-'notitlematches'            => '�ема збігів у назвах �торінок',
-'textmatches'               => 'Збіги в тек�тах �торінок',
-'notextmatches'             => '�емає збігів у тек�тах �торінок',
-'prevn'                     => 'попередні $1',
-'nextn'                     => 'на�тупні $1',
-'viewprevnext'              => 'Перегл�нути ($1) ($2) ($3).',
-'search-result-size'        => '$1 ($2 {{PLURAL:$2|�лово|�лова|�лів}})',
-'search-result-score'       => 'Відповідні�ть: $1 %',
-'search-redirect'           => '(перенаправленн� $1)',
-'search-section'            => '(розділ $1)',
-'search-suggest'            => 'Можливо, ви мали на увазі: $1',
-'search-interwiki-caption'  => 'Братні проекти',
-'search-interwiki-default'  => '$1 результати:',
-'search-interwiki-more'     => '(більше)',
-'search-mwsuggest-enabled'  => 'з порадами',
-'search-mwsuggest-disabled' => 'без порад',
-'search-relatedarticle'     => "Пов'�заний",
-'mwsuggest-disable'         => 'Вимкнути поради AJAX',
-'searchrelated'             => "пов'�заний",
-'searchall'                 => 'у�і',
-'showingresults'            => "�ижче {{PLURAL:$1|показане|показані|показані}} '''$1''' {{PLURAL:$1|результат|результати|результатів}}, починаючи з №&nbsp;'''$2'''",
-'showingresultsnum'         => '�ижче показано <strong>$3</strong> {{PLURAL:$3|результат|результати|результатів}}, починаючи з №&nbsp;<strong>$2</strong>.',
-'showingresultstotal'       => "�ижче {{PLURAL:$3|показаний результат '''$1''' із '''$3'''|показані результати '''$1 — $2''' із '''$3'''}}",
-'nonefound'                 => "'''Зауваженн�:''' За замовчуванн�м пошук відбуваєть�� не в у�іх про�торах назв. Викори�товуйте префік� ''all:'', щоб шукати у в�іх про�торах назв (у т.ч. �торінки обговорень, шаблони тощо), або зазначте потрібний про�тір назв.",
-'powersearch'               => 'Розширений пошук',
-'powersearch-legend'        => 'Розширений пошук',
-'powersearch-ns'            => 'Пошук у про�торах назв:',
-'powersearch-redir'         => 'Показувати перенаправленн�',
-'powersearch-field'         => 'Шукати',
-'search-external'           => 'Зовнішній пошук',
-'searchdisabled'            => '<p>Вибачте, повнотек�товий пошук тимча�ово недо�тупний через перевантаженн� �ервера; передбачаєть��, що ц� функці� буде знову включена пі�л� у�тановки нового обладнанн�. Поки що ми пропонуємо вам �кори�тати�� Google чи Yahoo!:</p>',
+'noexactmatch-nocreate'            => 'Сторінка з назвою «$1» не і�нує.',
+'toomanymatches'                   => 'Знайдено дуже багато відповідно�тей, будь ла�ка, �пробуйте інший запит',
+'titlematches'                     => 'Збіги в назвах �торінок',
+'notitlematches'                   => '�ема збігів у назвах �торінок',
+'textmatches'                      => 'Збіги в тек�тах �торінок',
+'notextmatches'                    => '�емає збігів у тек�тах �торінок',
+'prevn'                            => 'попередні $1',
+'nextn'                            => 'на�тупні $1',
+'viewprevnext'                     => 'Перегл�нути ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Параметри пошуку',
+'searchmenu-exists'                => "'''У цій вікі є �торінка з назвою «[[$1]]»'''",
+'searchmenu-new'                   => "'''Створити �торінку «[[:$1]]» у цій вікі!'''",
+'searchhelp-url'                   => 'Help:Довідка',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Показати �торінки з цим префік�ом]]',
+'searchprofile-articles'           => 'Статті',
+'searchprofile-articles-and-proj'  => 'Статті і �торінки проекту',
+'searchprofile-project'            => 'Сторінки проекту',
+'searchprofile-images'             => 'Файли',
+'searchprofile-everything'         => 'У�юди',
+'searchprofile-advanced'           => 'Розширений',
+'searchprofile-articles-tooltip'   => 'Пошук у $1',
+'searchprofile-project-tooltip'    => 'Пошук у $1',
+'searchprofile-images-tooltip'     => 'Пошук файлів',
+'searchprofile-everything-tooltip' => 'Пошук на в�іх �торінках (включаючи �торінки обговоренн�)',
+'searchprofile-advanced-tooltip'   => 'Шукати в заданих про�торах назв',
+'prefs-search-nsdefault'           => 'Пошук з викори�танн�м звичайних налаштувань:',
+'prefs-search-nscustom'            => 'Пошук у заданих про�торах назв:',
+'search-result-size'               => '$1 ($2 {{PLURAL:$2|�лово|�лова|�лів}})',
+'search-result-score'              => 'Відповідні�ть: $1 %',
+'search-redirect'                  => '(перенаправленн� $1)',
+'search-section'                   => '(розділ $1)',
+'search-suggest'                   => 'Можливо, ви мали на увазі: $1',
+'search-interwiki-caption'         => 'Братні проекти',
+'search-interwiki-default'         => '$1 результати:',
+'search-interwiki-more'            => '(більше)',
+'search-mwsuggest-enabled'         => 'з порадами',
+'search-mwsuggest-disabled'        => 'без порад',
+'search-relatedarticle'            => "Пов'�заний",
+'mwsuggest-disable'                => 'Вимкнути поради AJAX',
+'searchrelated'                    => "пов'�заний",
+'searchall'                        => 'у�і',
+'showingresults'                   => "�ижче {{PLURAL:$1|показане|показані|показані}} '''$1''' {{PLURAL:$1|результат|результати|результатів}}, починаючи з №&nbsp;'''$2'''",
+'showingresultsnum'                => '�ижче показано <strong>$3</strong> {{PLURAL:$3|результат|результати|результатів}}, починаючи з №&nbsp;<strong>$2</strong>.',
+'showingresultstotal'              => "�ижче {{PLURAL:$4|показаний результат '''$1''' із '''$3'''|показані результати '''$1 — $2''' із '''$3'''}}",
+'nonefound'                        => "'''Зауваженн�:''' За замовчуванн�м пошук відбуваєть�� не в у�іх про�торах назв. Викори�товуйте префік� ''all:'', щоб шукати у в�іх про�торах назв (у т.ч. �торінки обговорень, шаблони тощо), або зазначте потрібний про�тір назв.",
+'search-nonefound'                 => '�е знайдено результатів, що відповідають запиту.',
+'powersearch'                      => 'Розширений пошук',
+'powersearch-legend'               => 'Розширений пошук',
+'powersearch-ns'                   => 'Пошук у про�торах назв:',
+'powersearch-redir'                => 'Показувати перенаправленн�',
+'powersearch-field'                => 'Шукати',
+'search-external'                  => 'Зовнішній пошук',
+'searchdisabled'                   => '<p>Вибачте, повнотек�товий пошук тимча�ово недо�тупний через перевантаженн� �ервера; передбачаєть��, що ц� функці� буде знову включена пі�л� у�тановки нового обладнанн�. Поки що ми пропонуємо вам �кори�тати�� Google чи Yahoo!:</p>',
 
 # Preferences page
-'preferences'              => '�алаштуванн�',
-'mypreferences'            => '�алаштуванн�',
-'prefs-edits'              => 'Кількі�ть редагувань:',
-'prefsnologin'             => 'Ви не ввійшли в �и�тему',
-'prefsnologintext'         => 'Щоб змінити налаштуванн� кори�тувача, ви повинні <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ввійти до �и�теми]</span>.',
-'prefsreset'               => 'Відновлено �тандартні налаштуванн�.',
-'qbsettings'               => 'Панель навігації',
-'qbsettings-none'          => '�е показувати панель',
-'qbsettings-fixedleft'     => 'Фік�ована ліворуч',
-'qbsettings-fixedright'    => 'Фік�ована праворуч',
-'qbsettings-floatingleft'  => 'Плаваюча ліворуч',
-'qbsettings-floatingright' => 'Плаваюча праворуч',
-'changepassword'           => 'Змінити пароль',
-'skin'                     => 'Оформленн�',
-'math'                     => 'Відображенн� формул',
-'dateformat'               => 'Формат дати',
-'datedefault'              => 'Стандартний',
-'datetime'                 => 'Дата й ча�',
-'math_failure'             => '�еможливо розібрати вираз',
-'math_unknown_error'       => 'невідома помилка',
-'math_unknown_function'    => 'невідома функці�',
-'math_lexing_error'        => 'лек�ична помилка',
-'math_syntax_error'        => '�интак�ична помилка',
-'math_image_error'         => 'Перетворенн� в PNG відбуло�� з помилкою; перевірте правильні�ть в�тановленн� latex, dvips, gs та convert',
-'math_bad_tmpdir'          => '�е вдаєть�� �творити чи запи�ати в тимча�овий каталог математики',
-'math_bad_output'          => '�е вдаєть�� �творити чи запи�ати в вихідний каталог математики',
-'math_notexvc'             => '�е знайдено програму texvc; Див. math/README — довідку про налаштуванн�.',
-'prefs-personal'           => 'О�оби�ті дані',
-'prefs-rc'                 => 'Сторінка о�танніх редагувань',
-'prefs-watchlist'          => 'Спи�ок �по�тереженн�',
-'prefs-watchlist-days'     => 'Кількі�ть днів, що відображають�� у �пи�ку �по�тережень:',
-'prefs-watchlist-edits'    => 'Кількі�ть редагувань дл� відображенн� у розширеному �пи�ку �по�тереженн�:',
-'prefs-misc'               => 'Інші налаштуванн�',
-'saveprefs'                => 'Зберегти',
-'resetprefs'               => 'Ска�увати незбережені зміни',
-'oldpassword'              => 'Старий пароль:',
-'newpassword'              => '�овий пароль:',
-'retypenew'                => 'Ще раз введіть новий пароль:',
-'textboxsize'              => 'Розміри пол� вводу',
-'rows'                     => 'Р�дків:',
-'columns'                  => 'Колонок:',
-'searchresultshead'        => 'Пошук',
-'resultsperpage'           => 'Кількі�ть результатів на �торінку:',
-'contextlines'             => 'Кількі�ть р�дків на результат',
-'contextchars'             => 'Кількі�ть �имволів контек�ту на р�док',
-'stub-threshold'           => 'Поріг дл� визначенн� оформленн� <a href="#" class="stub">по�илань на �таби</a> (у байтах):',
-'recentchangesdays'        => '�а �кільки днів показувати нові редагуванн�:',
-'recentchangescount'       => 'Кількі�ть заголовків �татей на �торінці нових редагувань:',
-'savedprefs'               => 'Ваші налаштуванн� збережено.',
-'timezonelegend'           => 'Ча�овий по��',
-'timezonetext'             => 'Введіть зміщенн� вашого мі�цевого ча�у (в годинах) від ча�у �ервера (UTC - за Гринвічем).',
-'localtime'                => 'Мі�цевий ча�',
-'timezoneoffset'           => 'Зміщенн�',
-'servertime'               => 'Ча� �ервера',
-'guesstimezone'            => 'Заповнити з браузера',
-'allowemail'               => 'Дозволити електронну пошту від інших кори�тувачів',
-'prefs-searchoptions'      => 'Параметри пошуку',
-'prefs-namespaces'         => 'Про�тори назв',
-'defaultns'                => 'За замовчуванн�м шукати в таких про�торах назв:',
-'default'                  => 'за замовчуванн�м',
-'files'                    => 'Файли',
+'preferences'               => '�алаштуванн�',
+'mypreferences'             => '�алаштуванн�',
+'prefs-edits'               => 'Кількі�ть редагувань:',
+'prefsnologin'              => 'Ви не ввійшли в �и�тему',
+'prefsnologintext'          => 'Щоб змінити налаштуванн� кори�тувача, ви повинні <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} ввійти до �и�теми]</span>.',
+'prefsreset'                => 'Відновлено �тандартні налаштуванн�.',
+'qbsettings'                => 'Панель навігації',
+'qbsettings-none'           => '�е показувати панель',
+'qbsettings-fixedleft'      => 'Фік�ована ліворуч',
+'qbsettings-fixedright'     => 'Фік�ована праворуч',
+'qbsettings-floatingleft'   => 'Плаваюча ліворуч',
+'qbsettings-floatingright'  => 'Плаваюча праворуч',
+'changepassword'            => 'Змінити пароль',
+'skin'                      => 'Оформленн�',
+'skin-preview'              => 'Попередній перегл�д',
+'math'                      => 'Відображенн� формул',
+'dateformat'                => 'Формат дати',
+'datedefault'               => 'Стандартний',
+'datetime'                  => 'Дата й ча�',
+'math_failure'              => '�еможливо розібрати вираз',
+'math_unknown_error'        => 'невідома помилка',
+'math_unknown_function'     => 'невідома функці�',
+'math_lexing_error'         => 'лек�ична помилка',
+'math_syntax_error'         => '�интак�ична помилка',
+'math_image_error'          => 'Перетворенн� в PNG відбуло�� з помилкою; перевірте правильні�ть в�тановленн� latex, dvips, gs та convert',
+'math_bad_tmpdir'           => '�е вдаєть�� �творити чи запи�ати в тимча�овий каталог математики',
+'math_bad_output'           => '�е вдаєть�� �творити чи запи�ати в вихідний каталог математики',
+'math_notexvc'              => '�е знайдено програму texvc; Див. math/README — довідку про налаштуванн�.',
+'prefs-personal'            => 'О�оби�ті дані',
+'prefs-rc'                  => 'Сторінка о�танніх редагувань',
+'prefs-watchlist'           => 'Спи�ок �по�тереженн�',
+'prefs-watchlist-days'      => 'Кількі�ть днів, що відображають�� у �пи�ку �по�тережень:',
+'prefs-watchlist-days-max'  => '(мак�имум 7 днів)',
+'prefs-watchlist-edits'     => 'Кількі�ть редагувань дл� відображенн� у розширеному �пи�ку �по�тереженн�:',
+'prefs-watchlist-edits-max' => '(мак�имальне чи�ло: 1000)',
+'prefs-misc'                => 'Інші налаштуванн�',
+'prefs-resetpass'           => 'Змінити пароль',
+'saveprefs'                 => 'Зберегти',
+'resetprefs'                => 'Ска�увати незбережені зміни',
+'textboxsize'               => 'Розміри пол� вводу',
+'prefs-edit-boxsize'        => 'Розмір вікна редагуванн�.',
+'rows'                      => 'Р�дків:',
+'columns'                   => 'Колонок:',
+'searchresultshead'         => 'Пошук',
+'resultsperpage'            => 'Кількі�ть результатів на �торінку:',
+'contextlines'              => 'Кількі�ть р�дків на результат',
+'contextchars'              => 'Кількі�ть �имволів контек�ту на р�док',
+'stub-threshold'            => 'Поріг дл� визначенн� оформленн� <a href="#" class="stub">по�илань на �таби</a> (у байтах):',
+'recentchangesdays'         => '�а �кільки днів показувати нові редагуванн�:',
+'recentchangesdays-max'     => '(мак�имум $1 {{PLURAL:$1|день|дні|днів}})',
+'recentchangescount'        => 'Кількі�ть редагувань, �кі показують�� у �пи�ку нових редагувань, і�торі�х �торінок, журналах, за замовчуванн�м:',
+'savedprefs'                => 'Ваші налаштуванн� збережено.',
+'timezonelegend'            => 'Ча�овий по��',
+'timezonetext'              => '¹Зміщенн� вашого мі�цевого ча�у (в годинах) від ча�у �ервера (UTC — за Гринвічем).',
+'localtime'                 => 'Мі�цевий ча�:',
+'timezoneselect'            => 'Ча�овий по��:',
+'timezoneuseserverdefault'  => 'Викори�товувати налаштуванн� �ервера',
+'timezoneuseoffset'         => 'Інше (зазначте зміщенн�)',
+'timezoneoffset'            => 'Зміщенн�¹:',
+'servertime'                => 'Ча� �ервера:',
+'guesstimezone'             => 'Заповнити з браузера',
+'allowemail'                => 'Дозволити електронну пошту від інших кори�тувачів',
+'prefs-searchoptions'       => 'Параметри пошуку',
+'prefs-namespaces'          => 'Про�тори назв',
+'defaultns'                 => 'За замовчуванн�м шукати в таких про�торах назв:',
+'default'                   => 'за замовчуванн�м',
+'files'                     => 'Файли',
 
 # User rights
 'userrights'                  => 'Управлінн� правами кори�тувачів', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Управлінн� групами кори�тувача',
 'userrights-user-editname'    => "Введіть ім'� кори�тувача:",
 'editusergroup'               => 'Редагувати групи кори�тувача',
-'editinguser'                 => "Зміна прав кори�тувача '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Зміна прав кори�тувача '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Змінити групи кори�тувача',
 'saveusergroups'              => 'Зберегти групи кори�тувача',
 'userrights-groupsmember'     => 'Член груп:',
@@ -1166,6 +1268,8 @@ $3 зазначив таку причину: ''$2''",
 'right-minoredit'            => 'Позначенн� редагувань �к незначні',
 'right-move'                 => 'Перейменуванн� �торінок',
 'right-move-subpages'        => 'Перейменуванн� �торінок і їх під�торінок',
+'right-move-rootuserpages'   => 'Перейменувати кореневі �торінки кори�тувачів',
+'right-movefile'             => 'перейменувати файли',
 'right-suppressredirect'     => '�е�творенн� перенаправленн� зі �тарої назви на нову при перейменуванні �торінки',
 'right-upload'               => 'Завантаженн� файлів',
 'right-reupload'             => 'Перезапи�уванн� і�нуючих файлів',
@@ -1216,9 +1320,46 @@ $3 зазначив таку причину: ''$2''",
 'rightslogentry' => 'змінив права до�тупу дл� кори�тувача $1 з $2 на $3',
 'rightsnone'     => '(нема)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'читанн� цієї �торінки',
+'action-edit'                 => 'редагуванн� цієї �торінки',
+'action-createpage'           => '�творенн� �торінок',
+'action-createtalk'           => '�творенн� �торінок обговорень',
+'action-createaccount'        => '�творенн� цього облікового запи�у',
+'action-minoredit'            => 'позначенн� цього редагуванн� незначним',
+'action-move'                 => 'перейменуванн� цієї �торінки',
+'action-move-subpages'        => 'перейменуванн� цієї �торінки з у�іма її під�торінками',
+'action-move-rootuserpages'   => 'перейменувати кореневі �торінки кори�тувачів',
+'action-movefile'             => 'перейменувати цей файл',
+'action-upload'               => 'завантаженн� цього файлу',
+'action-reupload'             => 'перезапи� і�нуючого файлу',
+'action-reupload-shared'      => 'перекриванн� файлу зі �пільного �ховища',
+'action-upload_by_url'        => 'завантаженн� цього файлу з адре�и URL',
+'action-writeapi'             => 'викори�танн� API дл� редагувань',
+'action-delete'               => 'вилученн� цієї �торінки',
+'action-deleterevision'       => 'вилученн� цієї вер�ії �торінки',
+'action-deletedhistory'       => 'перегл�д вилученої і�торії редагувань цієї �торінки',
+'action-browsearchive'        => 'пошук вилучених �торінок',
+'action-undelete'             => 'відновленн� цієї �торінки',
+'action-suppressrevision'     => 'перегл�д і відновленн� цієї прихованої вер�ії',
+'action-suppressionlog'       => 'перегл�д цього приватного журналу',
+'action-block'                => 'блокуванн� цього кори�тувача',
+'action-protect'              => 'зміну рівн� захи�ту цієї �торінки',
+'action-import'               => 'імпорт цієї �торінки з іншої вікі',
+'action-importupload'         => 'імпорт цієї �торінки з файлу',
+'action-patrol'               => 'позначенн� чужих редагувань патрульованими',
+'action-autopatrol'           => 'позначенн� вла�них редагувань патрульованими',
+'action-unwatchedpages'       => 'перегл�д �пи�ку �торінок, за �кими ніхто не �по�терігає',
+'action-trackback'            => 'над�иланн� trackback',
+'action-mergehistory'         => 'приєднанн� і�торії змін цієї �торінки',
+'action-userrights'           => 'зміну в�іх прав кори�тувача',
+'action-userrights-interwiki' => 'зміну прав кори�тувачів у інших вікі',
+'action-siteadmin'            => 'блокуванн� і розблоковуванн� баз даних',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|зміна|зміни|змін}}',
 'recentchanges'                     => '�ові редагуванн�',
+'recentchanges-legend'              => '�алаштуванн� нових редагувань',
 'recentchangestext'                 => '�а цій �торінці показані о�танні зміни на �торінках {{grammar:genitive|{{SITENAME}}}}.',
 'recentchanges-feed-description'    => 'Від�тежувати о�танні зміни у вікі в цьому потоці.',
 'rcnote'                            => "{{PLURAL:$1|О�танн� '''$1''' зміна|О�танні '''$1''' зміни|О�танні '''$1''' змін}} за '''$2''' {{PLURAL:$2|день|дні|днів}}, на ча� $5, $4.",
@@ -1242,6 +1383,8 @@ $3 зазначив таку причину: ''$2''",
 'rc_categories'                     => 'Тільки з категорій (разділювач «|»)',
 'rc_categories_any'                 => 'Будь-�кий',
 'newsectionsummary'                 => '/* $1 */ нова тема',
+'rc-enhanced-expand'                => 'Показати деталі (потрібен JavaScript)',
+'rc-enhanced-hide'                  => 'Сховати деталі',
 
 # Recent changes linked
 'recentchangeslinked'          => "Пов'�зані редагуванн�",
@@ -1268,13 +1411,13 @@ $3 зазначив таку причину: ''$2''",
 було б непогано перевірити, чи такий файл уже і�нує.
 
 Щоби перегл�нути вже завантажені файли,
-зайдіть на: [[Special:ImageList|�пи�ок завантажених файлів]].
+зайдіть на: [[Special:FileList|�пи�ок завантажених файлів]].
 
 Завантаженн� відображають�� в [[Special:Log/upload|журналі завантажень]], вилученн� – у [[Special:Log/delete|журналі вилучень]].
 
 Дл� в�тавки зображень в �татті можна викори�товувати такі р�дки:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:�азва_зображенн�.jpg<nowiki>]]</nowiki></tt>''', щоб викори�тати повну вер�ію файлу
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:�азва_зображенн�.png|200px|thumb|left|Підпи� під зображенн�м<nowiki>]]</nowiki></tt>''', щоб викори�тати зображенн� у рамці зліва �торінки з підпи�ом під зображенн�м
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:�азва_зображенн�.jpg<nowiki>]]</nowiki></tt>''', щоб викори�тати повну вер�ію файлу
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:�азва_зображенн�.png|200px|thumb|left|Підпи� під зображенн�м<nowiki>]]</nowiki></tt>''', щоб викори�тати зображенн� у рамці зліва �торінки з підпи�ом під зображенн�м
 
 дл� інших медіа-файлів викори�товуйте р�док виду:
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:�азва_файлу.ogg<nowiki>]]</nowiki></tt>'''.",
@@ -1284,7 +1427,7 @@ $3 зазначив таку причину: ''$2''",
 'uploadlog'                   => 'журнал завантажень',
 'uploadlogpage'               => 'Журнал завантажень',
 'uploadlogpagetext'           => '�ижче наведено �пи�ок о�танніх завантажених файлів.
-Гл�ньте [[Special:NewImages|галерею нових зображень]] дл� більш візуального огл�ду.',
+Гл�ньте [[Special:NewFiles|галерею нових зображень]] дл� більш візуального огл�ду.',
 'filename'                    => '�азва файлу',
 'filedesc'                    => 'Опи� файлу',
 'fileuploadsummary'           => 'Короткий опи�:',
@@ -1306,22 +1449,25 @@ $3 зазначив таку причину: ''$2''",
 'large-file'                  => 'Рекомендуєть�� викори�товувати зображенн�, розмір �ких не перевищує $1 байтів (размір завантаженого файлу �кладає $2 байтів).',
 'largefileserver'             => 'Розмір файлу більший за мак�имальнодозволений.',
 'emptyfile'                   => 'Завантажений вами файл ймовірно порожній. Можливо, це �тало�� через помилку при введенні імені файлу. Будь-ла�ка, перевірте, чи �правді ви бажаєте звантажити цей файл.',
-'fileexists'                  => 'Файл з такою назвою вже і�нує. Будь ла�ка, перевірте <strong><tt>$1</tt></strong>, �кщо ви не впевнені, чи хочете замінти його.',
-'filepageexists'              => "Сторінка опи�у цього файлу вже �творена �к <strong><tt>$1</tt></strong>, але файлу з такою назвою немає. Уведений опи� не з'�вить�� на �торінці опи�у зображенн�. Щоб додати новий опи�, вам доведеть�� змінити його вручну.",
-'fileexists-extension'        => 'І�нує файл зі �хожою назвою:<br />
-�азва завантаженого файлу: <strong><tt>$1</tt></strong><br />
-�азва і�нуючого файлу: <strong><tt>$2</tt></strong><br />
-Будьте ла�каві, виберіть іншу назву.',
+'fileexists'                  => "Файл з такою назвою вже і�нує. Будь ла�ка, перевірте '''<tt>$1</tt>''', �кщо ви не впевнені, чи хочете замінти його.",
+'filepageexists'              => "Сторінка опи�у цього файлу вже �творена �к '''<tt>$1</tt>''', але файлу з такою назвою немає. Уведений опи� не з'�вить�� на �торінці опи�у зображенн�. Щоб додати новий опи�, вам доведеть�� змінити його вручну.",
+'fileexists-extension'        => "І�нує файл зі �хожою назвою:<br />
+�азва завантаженого файлу: '''<tt>$1</tt>'''<br />
+�азва і�нуючого файлу: '''<tt>$2</tt>'''<br />
+Будьте ла�каві, виберіть іншу назву.",
 'fileexists-thumb'            => "<center>'''І�нуюче зображенн�'''</center>",
-'fileexists-thumbnail-yes'    => 'Можливо, файл є зменшеною копією (мініатюрою). Будь ла�ка, перевірте файл <strong><tt>$1</tt></strong>.<br />
-Якщо вказаний файл є тим �амим зображенн�м, не варто окремо завантажувати його зменшену копію.',
-'file-thumbnail-no'           => '�азва файлу починаєть�� на <strong><tt>$1</tt></strong>.
-Можливо, це зменшена копі� зображенн� <i>(мініатюра)</i>.
-Якщо у ва� є це зображенн� в повному розмірі, завантажте його, інакше змініть назву файлу.',
-'fileexists-forbidden'        => 'Файл з такою назвою вже і�нує; будь ла�ка, поверніть�� та завантажте цей файл під іншою назвою. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Можливо, файл є зменшеною копією (мініатюрою). Будь ла�ка, перевірте файл '''<tt>$1</tt>'''.<br />
+Якщо вказаний файл є тим �амим зображенн�м, не варто окремо завантажувати його зменшену копію.",
+'file-thumbnail-no'           => "�азва файлу починаєть�� на '''<tt>$1</tt>'''.
+Можливо, це зменшена копі� зображенн� ''(мініатюра)''.
+Якщо у ва� є це зображенн� в повному розмірі, завантажте його, інакше змініть назву файлу.",
+'fileexists-forbidden'        => 'Файл з такою назвою вже і�нує і не може бути перезапи�аний.
+Якщо ви в�е одно хочете завантажити цей файл, будь ла�ка, поверніть�� назад і оберіть іншу назву.
+[[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Файл із такою назвою вже і�нує у �пільному �ховищі файлів.
-Якщо ви в�е ж хочете завантажити цей файл, будь ла�ка, поверніть�� назад і змініть назву файлу. [[Image:$1|thumb|center|$1]]',
-'file-exists-duplicate'       => 'Цей файл є дублікатом {{PLURAL:$1|файлу|на�тупних файлів}}:',
+Якщо ви в�е ж хочете завантажити цей файл, будь ла�ка, поверніть�� назад і змініть назву файлу. [[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'Цей файл є дублікатом {{PLURAL:$1|файлу|таких файлів}}:',
+'file-deleted-duplicate'      => 'Такий �амий файл ([[$1]]) уже вилучав�� раніше. Будь ла�ка, ознайомте�� з і�торією вилучень файлу перед тим, �к завантажити його знову.',
 'successfulupload'            => 'Завантаженн� у�пішно завершено',
 'uploadwarning'               => 'Попередженн�',
 'savefile'                    => 'Зберегти файл',
@@ -1329,8 +1475,9 @@ $3 зазначив таку причину: ''$2''",
 'overwroteimage'              => 'завантажена нова вер�і� «[[$1]]»',
 'uploaddisabled'              => 'Завантаженн� заборонене',
 'uploaddisabledtext'          => 'Можливі�ть завантаженн� файлів відключена.',
-'uploadscripted'              => 'Файл мі�тить HTML-код або �крипт, �кий може помилково обробити�� браузером.',
-'uploadcorrupt'               => 'Файл пошкоджений, або має невірне розширенн�. Будь-ла�ка, перевірте файл й �пробуйте завантажити його ще раз.',
+'uploadscripted'              => 'Файл мі�тить HTML-код або �крипт, �кий може неправильно обробити�� браузером.',
+'uploadcorrupt'               => 'Файл пошкоджений або має неправильне розширенн�.
+Будь ла�ка, перевірте файл і �пробуйте завантажити його ще раз.',
 'uploadvirus'                 => 'Файл мі�тить віру�! Див. $1',
 'sourcefilename'              => '�азва початкового файлу:',
 'destfilename'                => '�азва завантаженого файлу:',
@@ -1342,7 +1489,21 @@ $3 зазначив таку причину: ''$2''",
 
 Перевірте, чи �правді варто завантажувати файл.
 �ижче показано журнал вилучень дл� цього файлу:",
-'filename-bad-prefix'         => '�азва завантажуваного файлу починаєть�� на <strong>«$1»</strong> і, можливо, є шаблонною назвою, �ку цифрова фотокамера дає знімкам. Будь ла�ка, виберіть назву, �ка краще опи�уватиме вмі�т файлу.',
+'filename-bad-prefix'         => "�азва завантажуваного файлу починаєть�� на '''«$1»''' і, можливо, є шаблонною назвою, �ку цифрова фотокамера дає знімкам. Будь ла�ка, виберіть назву, �ка краще опи�уватиме вмі�т файлу.",
+'filename-prefix-blacklist'   => ' #<!-- не мін�йте цей р�док --> <pre>
+# Синтак�и� такий:
+#   * В�е, що починаєть�� з �имволу «#» вважаєть�� коментарем (до кінц� р�дка)
+#   * Кожен непорожній р�док - префік� �тандартної назви файлу, �ку зазвичай дає цифрова камера
+CIMG # Casio
+DSC_ # Nikon
+DSCF # Fuji
+DSCN # Nikon
+DUW # де�кі мобільні телефони
+IMG # загальне
+JD # Jenoptik
+MGP # Pentax
+PICT # різні
+ #</pre> <!-- не мін�йте цей р�док -->',
 
 'upload-proto-error'      => '�евірний протокол',
 'upload-proto-error-text' => 'Віддалене завантаженн� вимагає адре�ів, що починають�� з <code>http://</code> або <code>ftp://</code>.',
@@ -1363,20 +1524,21 @@ $3 зазначив таку причину: ''$2''",
 'upload_source_url'  => ' (вірна, публічно до�тупна інтернет-адре�а)',
 'upload_source_file' => " (файл на вашому комп'ютері)",
 
-# Special:ImageList
-'imagelist-summary'     => 'Ц� �пеціальна �торінка показує в�і завантажені файли.
+# Special:ListFiles
+'listfiles-summary'     => 'Ц� �пеціальна �торінка показує в�і завантажені файли.
 За замовчуванн�м о�танні завантажені файли показані зверху.
 �ати�ніть на заголовок �товпчика, щоб від�ортувати.',
-'imagelist_search_for'  => 'Пошук по назві зображенн�:',
+'listfiles_search_for'  => 'Пошук по назві зображенн�:',
 'imgfile'               => 'файл',
-'imagelist'             => 'Спи�ок файлів',
-'imagelist_date'        => 'Дата',
-'imagelist_name'        => '�азва',
-'imagelist_user'        => 'Кори�тувач',
-'imagelist_size'        => 'Розмір (в байтах)',
-'imagelist_description' => 'Опи�',
-
-# Image description page
+'listfiles'             => 'Спи�ок файлів',
+'listfiles_date'        => 'Дата',
+'listfiles_name'        => '�азва',
+'listfiles_user'        => 'Кори�тувач',
+'listfiles_size'        => 'Розмір (в байтах)',
+'listfiles_description' => 'Опи�',
+'listfiles_count'       => 'Вер�ії',
+
+# File description page
 'filehist'                       => 'І�торі� файлу',
 'filehist-help'                  => 'Клацніть на дату/ча�, щоб перегл�нути, �к тоді вигл�дав файл.',
 'filehist-deleteall'             => 'вилучити в�і',
@@ -1384,16 +1546,23 @@ $3 зазначив таку причину: ''$2''",
 'filehist-revert'                => 'повернути',
 'filehist-current'               => 'поточний',
 'filehist-datetime'              => 'Дата/ча�',
+'filehist-thumb'                 => 'Мініатюра',
+'filehist-thumbtext'             => 'Мініатюра дл� вер�ії від $1',
+'filehist-nothumb'               => '�ема мініатюри',
 'filehist-user'                  => 'Кори�тувач',
 'filehist-dimensions'            => "Розмір об'єкта",
 'filehist-filesize'              => 'Розмір файлу',
 'filehist-comment'               => 'Коментар',
-'imagelinks'                     => 'По�иланн�',
+'imagelinks'                     => 'По�иланн� на файл',
 'linkstoimage'                   => '{{PLURAL:$1|�а�тупна �торінка по�илаєть��|�а�тупні �торінки по�илають��}} на цей файл:',
-'nolinkstoimage'                 => 'Статті, що по�илають�� на дане зображенн�, від�утні.',
+'linkstoimage-more'              => 'Більше $1 {{PLURAL:$1|�торінки|�торінок}} по�илають�� на цей файл.
+У цьому �пи�ку {{PLURAL:$1|показане тільки $1 по�иланн�|показані тільки $1 по�иланн�|показані тільки $1 по�илань}} на цей файл.
+Також до�тупний [[Special:WhatLinksHere/$2|повний �пи�ок]].',
+'nolinkstoimage'                 => '�ема �торінок, що по�илають�� на цей файл.',
 'morelinkstoimage'               => 'Перегл�нути [[Special:WhatLinksHere/$1|інші по�иланн�]] на цей файл.',
-'redirectstofile'                => '{{PLURAL:$1|�а�тупний файл перенаправл�єть��|�а�тупні файли перенаправл�ють��}} на цей файл:',
-'duplicatesoffile'               => '{{PLURAL:$1|�а�тупний файл|�а�тупні файли}} є дублікатами цього файлу:',
+'redirectstofile'                => '�а цей файл {{PLURAL:$1|перенаправл�єть�� файл|перенаправл�ють�� такі файли}}:',
+'duplicatesoffile'               => '{{PLURAL:$1|Дублікатом цього файлу є файл|Такі $1 файли є дублікатами цього файлу|Такі $1 файлів є дублікатами цього файлу}}
+([[Special:FileDuplicateSearch/$2|докладніше]]):',
 'sharedupload'                   => 'Цей файл завантажений до �пільного дл� багатьох проектів �ховища.',
 'shareduploadwiki'               => 'Додаткову інформацію можна знайти на $1.',
 'shareduploadwiki-desc'          => 'Опи�, зазначений на його $1 у Commons, показаний нижче.',
@@ -1420,7 +1589,7 @@ $3 зазначив таку причину: ''$2''",
 # File deletion
 'filedelete'                  => 'Вилученн� $1',
 'filedelete-legend'           => 'Вилучити файл',
-'filedelete-intro'            => "Ви вилучаєте '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Ви збираєте�ь вилучити '''[[Media:$1|$1]]''' і в�ю його і�торію.",
 'filedelete-intro-old'        => "Ви вилучаєте вер�ію '''[[Media:$1|$1]]''' від [$4 $3, $2].",
 'filedelete-comment'          => 'Причина вилученн�:',
 'filedelete-submit'           => 'Вилучити',
@@ -1428,7 +1597,6 @@ $3 зазначив таку причину: ''$2''",
 'filedelete-success-old'      => "Вер�і� '''[[Media:$1|$1]]''' від $3, $2 була вилучена.",
 'filedelete-nofile'           => "Файл '''$1''' не і�нує.",
 'filedelete-nofile-old'       => "�е і�нує архівної вер�ії '''$1''' із зазначеними атрибутами.",
-'filedelete-iscurrent'        => 'Ви намагаєте�ь вилучити о�танню вер�ію цього файлу. Будь ла�ка, поверніть �початку файл до однієї зі �тарих вер�ій.',
 'filedelete-otherreason'      => 'Інша/додаткова причина:',
 'filedelete-reason-otherlist' => 'Інша причина',
 'filedelete-reason-dropdown'  => '* Поширені причини вилученн�
@@ -1455,28 +1623,31 @@ $3 зазначив таку причину: ''$2''",
 
 # Random page
 'randompage'         => 'Випадкова �татт�',
-'randompage-nopages' => 'У цьому про�торі назв нема �торінок.',
+'randompage-nopages' => 'У про�торі назв «$1» нема �торінок.',
 
 # Random redirect
 'randomredirect'         => 'Випадкове перенаправленн�',
-'randomredirect-nopages' => 'Цей про�тір назв не мі�тить перенаправлень.',
+'randomredirect-nopages' => 'Про�тір назв «$1» не мі�тить перенаправлень.',
 
 # Statistics
-'statistics'             => 'Стати�тика',
-'sitestats'              => 'Стати�тика �айту',
-'userstats'              => 'Стати�тика кори�тувачів',
-'sitestatstext'          => "Загалом в базі даних є '''\$1''' {{PLURAL:\$1|�торінка|�торінки|�торінок}}.
-Сюди вход�ть �торінки обговорень, �татті про {{grammar:accusative|{{SITENAME}}}}, �татті-\"заглушки\", перенаправленн� та інші �торінки, �кі, можливо, не повинні розгл�дати�� �к �татті.
-Окрім них, є '''\$2''' {{PLURAL:\$2|�торінка|�торінки|�торінок}}, �кі вважають�� повноцінними �татт�ми.
-
-Із моменту в�тановленн� програмного забезпеченн� зроблено '''\$3''' {{PLURAL:\$3|перегл�д|перегл�ди|перегл�дів}} та '''\$4''' {{PLURAL:\$4|редагуванн�|редагуванн�|редагувань}} �торінок.
-Таким чином, у �ередньому припадає '''\$5''' редагувань на �торінку та '''\$6''' перегл�дів на одне редагуванн�.
-
-{{PLURAL:\$8 | Був завантажений | Було завантажено | Було завантажено}} '''\$8''' {{PLURAL:\$8 | файл | файли | файлів}}.
-
-Величина [http://www.mediawiki.org/wiki/Manual:Job_queue черги завдань] �тановить '''\$7'''.",
-'userstatstext'          => "{{PLURAL:$1|Зареє�трував��|Зареє�трували��|Зареє�трували��}} '''$1''' {{PLURAL:$1|кори�тувач|кори�тувачі|кори�тувачів}}, з �ких '''$2''' ($4 %) {{PLURAL:$2|має|мають|мають}} права «$5».",
-'statistics-mostpopular' => 'Сторінки, �кі найча�тіше перегл�дають',
+'statistics'                   => 'Стати�тика',
+'statistics-header-pages'      => 'Стати�тика �торінок',
+'statistics-header-edits'      => 'Стати�тика редагувань',
+'statistics-header-views'      => 'Стати�тика перегл�дів',
+'statistics-header-users'      => 'Стати�тика кори�тувачів',
+'statistics-articles'          => 'Статей',
+'statistics-pages'             => 'Сторінок',
+'statistics-pages-desc'        => 'У�і �торінки у вікі, включаючи �торінки обговорень, перенаправленн� тощо.',
+'statistics-files'             => 'Завантажено файлів',
+'statistics-edits'             => 'Кількі�ть редагувань з моменту у�тановки {{grammar:genitive|{{SITENAME}}}}',
+'statistics-edits-average'     => 'Середн� кількі�ть редагувань на �торінку',
+'statistics-views-total'       => 'У�ього перегл�дів',
+'statistics-views-peredit'     => 'Перегл�дів на редагуванн�',
+'statistics-jobqueue'          => 'Величина [http://www.mediawiki.org/wiki/Manual:Job_queue черги завдань]',
+'statistics-users'             => 'Зареє�трованих [[Special:ListUsers|кори�тувачів]]',
+'statistics-users-active'      => '�ктивні кори�тувачі',
+'statistics-users-active-desc' => 'Кори�тувачі, �кі здій�нили �ку�ь дію прот�гом {{PLURAL:$1|минулого дн�|минулих $1 днів}}',
+'statistics-mostpopular'       => 'Сторінки, �кі найча�тіше перегл�дають',
 
 'disambiguations'      => 'Багатозначні �татті',
 'disambiguationspage'  => 'Template:disambig',
@@ -1489,12 +1660,12 @@ $3 зазначив таку причину: ''$2''",
 'double-redirect-fixer'      => 'Redirect fixer',
 
 'brokenredirects'        => 'Розірвані перенаправленн�',
-'brokenredirectstext'    => '�а�тупні перенаправленн� вказують на неі�нуючі �татті:',
+'brokenredirectstext'    => 'Такі перенаправленн� вказують на неі�нуючі �торінки:',
 'brokenredirects-edit'   => '(редагувати)',
 'brokenredirects-delete' => '(вилучити)',
 
 'withoutinterwiki'         => 'Сторінки без міжмовних по�илань',
-'withoutinterwiki-summary' => '�а�тупні �торінки не мають інтервікі-по�илань:',
+'withoutinterwiki-summary' => 'Такі �торінки не мають інтервікі-по�илань:',
 'withoutinterwiki-legend'  => 'Префік�',
 'withoutinterwiki-submit'  => 'Показати',
 
@@ -1519,26 +1690,30 @@ $3 зазначив таку причину: ''$2''",
 'popularpages'            => 'Попул�рні �татті',
 'wantedcategories'        => '�еобхідні категорії',
 'wantedpages'             => '�еобхідні �татті',
-'missingfiles'            => 'Від�утні файли',
+'wantedfiles'             => '�еобхідні файли',
+'wantedtemplates'         => '�еобхідні шаблони',
 'mostlinked'              => 'Сторінки, на �кі найбільше по�илань',
 'mostlinkedcategories'    => 'Категорії, на �кі найбільше по�илань',
 'mostlinkedtemplates'     => '�айуживаніші шаблони',
 'mostcategories'          => 'Статті з найбільшою кількі�тю категорій',
 'mostimages'              => '�айуживаніші зображенн�',
 'mostrevisions'           => 'Статті з найбільшою кількі�тю редакцій',
-'prefixindex'             => 'Покажчик за початком �лів',
+'prefixindex'             => 'Покажчик за початком назв �торінок',
 'shortpages'              => 'Короткі �татті',
 'longpages'               => 'Довгі �татті',
 'deadendpages'            => 'Сторінки без по�илань',
 'deadendpagestext'        => '�а�тупні �торінки не мі�т�ть по�илань на інші �торінки цієї вікі.',
 'protectedpages'          => 'Захищені �торінки',
 'protectedpages-indef'    => 'Тільки без�троково захищені',
+'protectedpages-cascade'  => 'Тільки ка�кадний захи�т',
 'protectedpagestext'      => '�а�тупні �торінки захищені від перейменуванн� або зміни.',
 'protectedpagesempty'     => 'Зараз нема захищених �торінок із зазначеними параметрами',
 'protectedtitles'         => 'Заборонені назви',
 'protectedtitlestext'     => '�а�тупні назви не дозволено викори�товувати',
 'protectedtitlesempty'    => 'Зараз нема захищених назв із зазначеними параметрами.',
 'listusers'               => 'Спи�ок кори�тувачів',
+'listusers-editsonly'     => 'Показати лише кори�тувачів, �кі зробили принаймні одне редагуванн�',
+'usereditcount'           => '$1 {{PLURAL:$1|редагуванн�|редагуванн�|редагувань}}',
 'newpages'                => '�ові �торінки',
 'newpages-username'       => "Ім'� кори�тувача:",
 'ancientpages'            => '�ай�таріші �татті',
@@ -1559,14 +1734,13 @@ $3 зазначив таку причину: ''$2''",
 'booksources-search-legend' => 'Пошук інформації про книгу',
 'booksources-go'            => 'Знайти',
 'booksources-text'          => '�а цій �торінці наведено �пи�ок по�илань на �айти, де ви, можливо, знайдете додаткову інформацію про книгу. Це інтернет-магазини й �и�теми пошуку в бібліотечних каталогах.',
+'booksources-invalid-isbn'  => 'Вказаний номер ISBN, �уд�чи з у�ього, мі�тить помилку. Будь ла�ка, перевірте, що при перене�енні номера з першоджерела не виникло �потворень.',
 
 # Special:Log
 'specialloguserlabel'  => 'Кори�тувач:',
 'speciallogtitlelabel' => '�азва:',
 'log'                  => 'Журнали',
 'all-logs-page'        => 'У�і журнали',
-'log-search-legend'    => 'Пошук журналів',
-'log-search-submit'    => 'Знайти',
 'alllogstext'          => 'Комбінований показ журналів {{grammar:genitive|{{SITENAME}}}}.
 Ви можете відфільтрувати результати за типом журналу, іменем кори�тувача (враховуєть�� регі�тр) або зазначеною �торінкою (також враховуєть�� регі�тр).',
 'logempty'             => 'В журналі немає подібних запи�ів.',
@@ -1578,6 +1752,7 @@ $3 зазначив таку причину: ''$2''",
 'nextpage'          => '�а�тупна �торінка ($1)',
 'prevpage'          => 'Попередн� �торінка ($1)',
 'allpagesfrom'      => 'Показати �торінки, що починають�� з:',
+'allpagesto'        => 'Зупинити вивід на:',
 'allarticles'       => 'У�і �торінки',
 'allinnamespace'    => 'У�і �торінки (про�тір назв $1)',
 'allnotinnamespace' => 'У�і �торінки (крім про�тору назв $1)',
@@ -1597,41 +1772,68 @@ $3 зазначив таку причину: ''$2''",
 'special-categories-sort-count' => 'упор�дкувати за кількі�тю',
 'special-categories-sort-abc'   => 'упор�дкувати за алфавітом',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Вилучений вне�ок кори�тувача',
+
+# Special:LinkSearch
+'linksearch'       => 'Зовнішні по�иланн�',
+'linksearch-pat'   => 'Шаблон дл� пошуку:',
+'linksearch-ns'    => 'Про�тір назв:',
+'linksearch-ok'    => 'Знайти',
+'linksearch-text'  => 'Можна викори�товувати під�тановочні �имволи, наприклад, <code>*.wikipedia.org</code>.<br />Підтримувані протоколи: <tt>$1</tt>',
+'linksearch-line'  => 'По�иланн� на $1 із $2',
+'linksearch-error' => 'Під�тановочні знаки можуть викори�товувати�� лише на початку адре�.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Показати кори�тувачів, починаючи з:',
 'listusers-submit'   => 'Показати',
 'listusers-noresult' => '�е знайдено кори�тувачів.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Журнал нових кори�тувачів',
+'newuserlogpagetext'          => 'Спи�ок нещодавно зареє�трованих кори�тувачів.',
+'newuserlog-byemail'          => 'пароль наді�ланий електронною поштою',
+'newuserlog-create-entry'     => '�овий кори�тувач',
+'newuserlog-create2-entry'    => '�творив новий обліковий запи� $1',
+'newuserlog-autocreate-entry' => 'Обліковий запи� �творений автоматично',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Права груп кори�тувачів',
-'listgrouprights-summary'  => '�ижче наведений �пи�ок груп кори�тувачів у цій вікі і права дл� кожної групи.
+'listgrouprights'                 => 'Права груп кори�тувачів',
+'listgrouprights-summary'         => '�ижче наведений �пи�ок груп кори�тувачів у цій вікі і права дл� кожної групи.
 Додаткову інформацію про права кори�тувачів можна знайти [[{{MediaWiki:Listgrouprights-helppage}}|тут]].',
-'listgrouprights-group'    => 'Група',
-'listgrouprights-rights'   => 'Права',
-'listgrouprights-helppage' => 'Help:Права кори�тувачів',
-'listgrouprights-members'  => '(�пи�ок членів)',
+'listgrouprights-group'           => 'Група',
+'listgrouprights-rights'          => 'Права',
+'listgrouprights-helppage'        => 'Help:Права кори�тувачів',
+'listgrouprights-members'         => '(�пи�ок членів)',
+'listgrouprights-addgroup'        => 'може додавати в {{PLURAL:$2|групу|групи}}: $1',
+'listgrouprights-removegroup'     => 'може виключати з {{PLURAL:$2|групи|груп}}: $1',
+'listgrouprights-addgroup-all'    => 'може додавати до в�іх груп',
+'listgrouprights-removegroup-all' => 'може виключати зі в�іх груп',
 
 # E-mail user
-'mailnologin'     => 'Від�утн� адре�а дл� відправки',
-'mailnologintext' => 'Ви повинні [[Special:UserLogin|ввійти до �и�теми]] і мати підтверджену адре�у електронної пошти у ваших [[Special:Preferences|налаштуванн�х]], щоб мати змогу над�илати електронну пошту іншим кори�тувачам.',
-'emailuser'       => '�аді�лати ли�та цьому кори�тувачеві',
-'emailpage'       => 'Ли�т кори�тувачеві',
-'emailpagetext'   => 'Заповнивши наведену нижче форму, можна наді�лати повідомленн� цьому кори�тувачу.
+'mailnologin'      => 'Від�утн� адре�а дл� відправки',
+'mailnologintext'  => 'Ви повинні [[Special:UserLogin|ввійти до �и�теми]] і мати підтверджену адре�у електронної пошти у ваших [[Special:Preferences|налаштуванн�х]], щоб мати змогу над�илати електронну пошту іншим кори�тувачам.',
+'emailuser'        => '�аді�лати ли�та цьому кори�тувачеві',
+'emailpage'        => 'Ли�т кори�тувачеві',
+'emailpagetext'    => 'Заповнивши наведену нижче форму, можна наді�лати повідомленн� цьому кори�тувачу.
 Електронна адре�а, �ку ви зазначили у [[Special:Preferences|�воїх налаштуванн�х]], буде зазначена в полі «Від кого» ли�та, тому одержувач матиме можливі�ть відпові�ти безпо�ередньо вам.',
-'usermailererror' => 'При відправці повідомленн� електронної пошти �тала�� помилка:',
-'defemailsubject' => '{{SITENAME}}: ли�т',
-'noemailtitle'    => 'Від�утн� адре�а електронної пошти',
-'noemailtext'     => 'Цей кори�тувач не вказав коректної адре�и електронної пошти, або вказав, що не бажає отримувати ли�ти від інших кори�тувачів.',
-'emailfrom'       => 'Від кого:',
-'emailto'         => 'Кому:',
-'emailsubject'    => 'Тема:',
-'emailmessage'    => 'Повідомленн�:',
-'emailsend'       => '�аді�лати',
-'emailccme'       => '�аді�лати мені копію повідомленн�.',
-'emailccsubject'  => 'Копі� вашого повідомленн� до $1: $2',
-'emailsent'       => 'Електронне повідомленн� наді�лано',
-'emailsenttext'   => 'Ваше електронне повідомленн� наді�лано.',
-'emailuserfooter' => 'Цей ли�т був наді�ланий кори�тувачеві $2 від кори�тувача $1 за допомогою функції «�аді�лати ли�та» проекту {{SITENAME}}.',
+'usermailererror'  => 'При відправці повідомленн� електронної пошти �тала�� помилка:',
+'defemailsubject'  => '{{SITENAME}}: ли�т',
+'noemailtitle'     => 'Від�утн� адре�а електронної пошти',
+'noemailtext'      => 'Цей кори�тувач не вказав коректної адре�и електронної пошти.',
+'nowikiemailtitle' => 'Ел. пошти не дозволено',
+'nowikiemailtext'  => 'Цей кори�тувач вирішив не отримувати ел. пошту від інших кори�тувачів.',
+'email-legend'     => '�аді�лати ли�та іншому кори�тувачеві {{grammar:genitive|{{SITENAME}}}}',
+'emailfrom'        => 'Від кого:',
+'emailto'          => 'Кому:',
+'emailsubject'     => 'Тема:',
+'emailmessage'     => 'Повідомленн�:',
+'emailsend'        => '�аді�лати',
+'emailccme'        => '�аді�лати мені копію повідомленн�.',
+'emailccsubject'   => 'Копі� вашого повідомленн� до $1: $2',
+'emailsent'        => 'Електронне повідомленн� наді�лано',
+'emailsenttext'    => 'Ваше електронне повідомленн� наді�лано.',
+'emailuserfooter'  => 'Цей ли�т був наді�ланий кори�тувачеві $2 від кори�тувача $1 за допомогою функції «�аді�лати ли�та» проекту {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Спи�ок �по�тереженн�',
@@ -1662,12 +1864,7 @@ $3 зазначив таку причину: ''$2''",
 'iteminvalidname'      => 'Проблема з елементом «$1», недопу�тима назва…',
 'wlnote'               => '�ижче наведені о�танні $1 {{PLURAL:$1|редагуванн�|редагуванн�|редагувань}} за {{PLURAL:$2|о�танню|о�танні|о�танні}} <strong>$2</strong> {{PLURAL:$2|годину|години|годин}}.',
 'wlshowlast'           => 'Показати зміни за о�танні $1 годин $2 днів $3',
-'watchlist-show-bots'  => 'Показати редагуванн� ботів',
-'watchlist-hide-bots'  => 'Сховати редагуванн� ботів',
-'watchlist-show-own'   => 'показати мої редагуванн�',
-'watchlist-hide-own'   => '�ховати мої редагуванн�',
-'watchlist-show-minor' => 'показати незначні редагуванн�',
-'watchlist-hide-minor' => '�ховати незначні редагуванн�',
+'watchlist-options'    => '�алаштуванн� �пи�ку �по�тереженн�',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Додаванн� до �пи�ку �по�тереженн�…',
@@ -1706,83 +1903,102 @@ $NEWPAGE
 Зворотний зв\'�зок та допомога:
 {{fullurl:{{ns:help}}:Змі�т}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Вилучити �торінку',
-'confirm'                     => 'Підтвердженн�',
-'excontent'                   => 'змі�т: «$1»',
-'excontentauthor'             => 'змі�т був: «$1» (єдиним автором був [[Special:Contributions/$2|$2]])',
-'exbeforeblank'               => 'змі�т до очи�тки: «$1»',
-'exblank'                     => '�татт� була порожньою',
-'delete-confirm'              => 'Вилученн� «$1»',
-'delete-legend'               => 'Вилученн�',
-'historywarning'              => 'Попередженн�: �торінка, �ку ви збираєте�� вилучити, має і�торію редагувань:',
-'confirmdeletetext'           => 'Ви збираєте�ь вилучити �торінку і в�і її журнали редагувань з бази даних.
+# Delete
+'deletepage'             => 'Вилучити �торінку',
+'confirm'                => 'Підтвердженн�',
+'excontent'              => 'змі�т: «$1»',
+'excontentauthor'        => 'змі�т був: «$1» (єдиним автором був [[Special:Contributions/$2|$2]])',
+'exbeforeblank'          => 'змі�т до очи�тки: «$1»',
+'exblank'                => '�татт� була порожньою',
+'delete-confirm'         => 'Вилученн� «$1»',
+'delete-legend'          => 'Вилученн�',
+'historywarning'         => 'Попередженн�: �торінка, �ку ви збираєте�� вилучити, має і�торію редагувань:',
+'confirmdeletetext'      => 'Ви збираєте�ь вилучити �торінку і в�і її журнали редагувань з бази даних.
 Будь ла�ка, підтвердіть, що ви бажаєте зробити це, повні�тю розумієте на�лідки і що робите це у відповідно�ті з [[{{MediaWiki:Policy-url}}|правилами]].',
-'actioncomplete'              => 'Дію виконано',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" було вилучено.
+'actioncomplete'         => 'Дію виконано',
+'deletedtext'            => '"<nowiki>$1</nowiki>" було вилучено.
 Див. $2 дл� перегл�ду �пи�ку о�танніх вилучень.',
-'deletedarticle'              => 'вилучив «[[$1]]»',
-'suppressedarticle'           => 'прихована «[[$1]]»',
-'dellogpage'                  => 'Журнал вилучень',
-'dellogpagetext'              => '�ижче наведено �пи�ок о�танніх вилучень.',
-'deletionlog'                 => 'журнал вилучень',
-'reverted'                    => 'Відновлено зі �тарої вер�ії',
-'deletecomment'               => 'Причина вилученн�',
-'deleteotherreason'           => 'Інша/додаткова причина:',
-'deletereasonotherlist'       => 'Інша причина',
-'deletereason-dropdown'       => '* Типові причини вилученн�
+'deletedarticle'         => 'вилучив «[[$1]]»',
+'suppressedarticle'      => 'прихована «[[$1]]»',
+'dellogpage'             => 'Журнал вилучень',
+'dellogpagetext'         => '�ижче наведено �пи�ок о�танніх вилучень.',
+'deletionlog'            => 'журнал вилучень',
+'reverted'               => 'Відновлено зі �тарої вер�ії',
+'deletecomment'          => 'Причина вилученн�',
+'deleteotherreason'      => 'Інша/додаткова причина:',
+'deletereasonotherlist'  => 'Інша причина',
+'deletereason-dropdown'  => '* Типові причини вилученн�
 ** вандалізм
 ** за запитом автора
 ** порушенн� автор�ьких прав',
-'delete-edit-reasonlist'      => 'Редагувати причини вилученн�',
-'delete-toobig'               => 'У цієї �торінки дуже довга і�торі� редагувань, більше $1 {{PLURAL:$1|вер�ії|вер�ій|вер�ій}}.
+'delete-edit-reasonlist' => 'Редагувати причини вилученн�',
+'delete-toobig'          => 'У цієї �торінки дуже довга і�торі� редагувань, більше $1 {{PLURAL:$1|вер�ії|вер�ій|вер�ій}}.
 Вилученн� таких �торінок було заборонене з метою уникненн� порушень у роботі �айту {{SITENAME}}.',
-'delete-warning-toobig'       => 'У цієї �торінки дуже довга і�торі� редагувань, більше $1 {{PLURAL:$1|вер�ії|вер�ій|вер�ій}}.
+'delete-warning-toobig'  => 'У цієї �торінки дуже довга і�торі� редагувань, більше $1 {{PLURAL:$1|вер�ії|вер�ій|вер�ій}}.
 Її вилученн� може призве�ти до порушень у роботі бази даних �айту {{SITENAME}};
 дійте обережно.',
-'rollback'                    => 'Відкинути редагуванн�',
-'rollback_short'              => 'Відкинути',
-'rollbacklink'                => 'відкинути',
-'rollbackfailed'              => 'Відкинути зміни не вдало��',
-'cantrollback'                => '�еможливо відкинути редагуванн�, о�танній, хто редагував, є єдиним автором цієї �торінки.',
-'alreadyrolled'               => '�еможливо відкинути о�танні редагуванн� [[:$1]], зроблені [[User:$2|$2]] ([[User talk:$2|обговоренн�]] | [[Special:Contributions/$2|{{int:contribslink}}]]); хто�ь інший уже змінив чи відкинув редагуванн� цієї �татті.
-
-О�танні редагуванн� зробив [[User:$3|$3]] ([[User talk:$3|обговоренн�]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => 'Редагуванн� прокоментовано так: <em>«$1»</em>.', # only shown if there is an edit comment
-'revertpage'                  => 'Редагуванн� кори�тувача [[Special:Contributions/$2|$2]] ([[User talk:$2|обговоренн�]]) відкинуті до вер�ії кори�тувача [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Відкинуті редагуванн� кори�тувача $1; поверненн� до вер�ії кори�тувача $2.',
-'sessionfailure'              => 'Здаєть��, виникли проблеми з поточним �еан�ом роботи;
+
+# Rollback
+'rollback'         => 'Відкинути редагуванн�',
+'rollback_short'   => 'Відкинути',
+'rollbacklink'     => 'відкинути',
+'rollbackfailed'   => 'Відкинути зміни не вдало��',
+'cantrollback'     => '�еможливо відкинути редагуванн�, о�танній, хто редагував, є єдиним автором цієї �торінки.',
+'alreadyrolled'    => '�еможливо відкинути о�танні редагуванн� [[:$1]], зроблені [[User:$2|$2]] ([[User talk:$2|обговоренн�]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); хто�ь інший уже змінив чи відкинув редагуванн� цієї �татті.
+
+О�танні редагуванн� зробив [[User:$3|$3]] ([[User talk:$3|обговоренн�]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "По��ненн� редагуванн� було: «''$1''».", # only shown if there is an edit comment
+'revertpage'       => 'Редагуванн� кори�тувача [[Special:Contributions/$2|$2]] ([[User talk:$2|обговоренн�]]) відкинуті до вер�ії кори�тувача [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Відкинуті редагуванн� кори�тувача $1; поверненн� до вер�ії кори�тувача $2.',
+'sessionfailure'   => 'Здаєть��, виникли проблеми з поточним �еан�ом роботи;
 ц� ді� була �ка�ована з метою попередити «захопленн� �еан�у».
 Будь ла�ка, нати�ніть кнопку «�азад» і перезавантажте �торінку, з �кої ви прийшли.',
+
+# Protect
 'protectlogpage'              => 'Журнал захи�ту',
 'protectlogtext'              => '�ижче наведено �пи�ок у�тановлень і зн�ть захи�ту зі �торінки.
 Ви також можете перегл�нути [[Special:ProtectedPages|�пи�ок захищених �торінок]].',
 'protectedarticle'            => 'захи�т на [[$1]] в�тановлено',
 'modifiedarticleprotection'   => 'змінено рівень захи�ту �торінки «[[$1]]»',
 'unprotectedarticle'          => 'зн�то захи�т зі �торінки «[[$1]]»',
+'movedarticleprotection'      => 'перені� налаштуванн� захи�ту з «[[$2]]» на «[[$1]]»',
 'protect-title'               => 'В�тановленн� захи�ту дл� «$1»',
+'prot_1movedto2'              => '«[[$1]]» перейменована на «[[$2]]»',
 'protect-legend'              => 'Підтвердженн� в�тановленн� захи�ту',
 'protectcomment'              => 'Причина в�тановленн� захи�ту',
 'protectexpiry'               => 'Закінчуєть��:',
 'protect_expiry_invalid'      => '�еправильний ча� закінченн� захи�ту.',
 'protect_expiry_old'          => 'Ча� закінченн� — в минулому.',
 'protect-unchain'             => 'Розблокувати перейменуванн� �торінки',
-'protect-text'                => 'Тут ви можете перегл�нути та змінити рівень захи�ту �торінки <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'Ви не можете змінювати рівень захи�ту �торінки, доки ваш обліковий запи� заблокований.
-Поточні у�тановки дл� �торінки <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Рівень захи�ту не може бути зміненим, так �к о�новна база даних тимча�ово заблокована.
-Поточні у�тановки дл� �торінки <strong>$1</strong>:',
-'protect-locked-access'       => 'У вашого облікового запи�у недо�татньо прав дл� зміни рівн� захи�ту �торінки.
-Поточні у�тановки дл� �торінки: <strong>$1</strong>:',
+'protect-text'                => "Тут ви можете перегл�нути та змінити рівень захи�ту �торінки '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "Ви не можете змінювати рівень захи�ту �торінки, доки ваш обліковий запи� заблокований.
+Поточні у�тановки дл� �торінки '''$1''':",
+'protect-locked-dblock'       => "Рівень захи�ту не може бути зміненим, так �к о�новна база даних тимча�ово заблокована.
+Поточні у�тановки дл� �торінки '''$1''':",
+'protect-locked-access'       => "У вашого облікового запи�у недо�татньо прав дл� зміни рівн� захи�ту �торінки.
+Поточні у�тановки дл� �торінки: '''$1''':",
 'protect-cascadeon'           => 'Ц� �торінка захищена, бо вона включена {{PLURAL:$1|до зазначеної нижче �торінки, на �ку|до нижчезазначених �торінок, на �кі}} в�тановлено ка�кадний захи�т. Ви можете змінити рівень захи�ту цієї �торінки, але це не вплине на ка�кадний захи�т.',
-'protect-default'             => '(за замовчанн�м)',
+'protect-default'             => 'Дозволити в�ім кори�тувачам',
 'protect-fallback'            => 'Потрібен дозвіл «$1»',
-'protect-level-autoconfirmed' => 'Захи�тити від незареє�трованих та нових кори�тувачів',
+'protect-level-autoconfirmed' => 'Захи�тити від нових і незареє�трованих кори�тувачів',
 'protect-level-sysop'         => 'Тільки адміні�тратори',
 'protect-summary-cascade'     => 'ка�кадний',
 'protect-expiring'            => 'закінчуєть�� $1 (UTC)',
+'protect-expiry-indefinite'   => 'без�троково',
 'protect-cascade'             => 'Захи�тити �торінки, що включені до цієї �торінки (ка�кадний захи�т)',
 'protect-cantedit'            => 'Ви не можете змінювати рівень захи�ту цієї �торінки, тому що ви не маєте прав дл� її редагуванн�.',
+'protect-othertime'           => 'Інший ча�/термін:',
+'protect-othertime-op'        => 'інший ча�/термін',
+'protect-existing-expiry'     => 'Поточний ча� завершенн�: $3, $2',
+'protect-otherreason'         => 'Інша/додаткова причина:',
+'protect-otherreason-op'      => 'інша/додаткова причина',
+'protect-dropdown'            => '* Типові причини захи�ту
+** ча�тий вандалізм
+** надмірний �пам
+** непродуктивна війна редагувань
+** попул�рна �торінка',
+'protect-edit-reasonlist'     => 'Причини захи�ту від редагувань',
+'protect-expiry-options'      => '1 година:1 hour,1 день:1 day,1 тиждень:1 week,2 тижні:2 weeks,1 мі��ць:1 month,3 мі��ці:3 months,6 мі��ців:6 months,1 рік:1 year,назавжди:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Права:',
 'restriction-level'           => 'Рівень до�тупу:',
 'minimum-size'                => 'Мінімальний розмір',
@@ -1805,7 +2021,7 @@ $NEWPAGE
 'undeletepage'                 => 'Перегл�д і відновленн� вилучених �торінок',
 'undeletepagetitle'            => "'''�ижче наведені вилучені вер�ії [[:$1|$1]]'''.",
 'viewdeletedpage'              => 'Перегл�нути видалені �торінки',
-'undeletepagetext'             => '�а�тупні �татті було вилучено, але вони ще в архіві і тому можуть бути відновлені. �рхів періодично очищаєть��.',
+'undeletepagetext'             => '{{PLURAL:$1|Сторінка була вилучена, однак вона в�е ще знаходить�� в архіві, тому може бути відновлена|Такі �торінки були вилучені, але вони в�е ще знаход�ть�� в архіві і тому можуть бути відновлені}}. �рхів періодично очищаєть��.',
 'undelete-fieldset-title'      => 'Відновити вер�ії',
 'undeleteextrahelp'            => "Дл� повного відновленн� �торінки залиште в�і позначки порожніми й нати�ніть '''«Відновити»'''.
 Дл� ча�ткового відновленн� позначте ті вер�ії �торінки, �кі необхідно відновити та нати�ніть '''«Відновити»'''.
@@ -1815,12 +2031,13 @@ $NEWPAGE
 Якщо з моменту вилученн� була �творена нова �торінка з такою �амою назвою, відновлені вер�ії будуть зазначені в журналі редагувань перед новими запи�ами, але поточна вер�і� і�нуючої �татті не буде замінена автоматично.',
 'undeleterevdel'               => 'Відновленн� не буде здій�нене, �кщо воно призведе до ча�ткового вилученн� о�танньої вер�ії �торінки або файлу. У подібному випадку ви повинні зн�ти позначку або показати о�танні вилучені вер�ії.',
 'undeletehistorynoadmin'       => 'Статт� вилучена. Причина вилученн� та �пи�ок кори�тувачів, що редагували �таттю до вилученн�, вказані нижче. Тек�т вилученої �татті можуть перегл�нути лише адміні�тратори.',
-'undelete-revision'            => 'Вилучена вер�і� $1 (від $2) кори�тувача $3:',
+'undelete-revision'            => 'Вилучена вер�і� $1 (від $4 $5) кори�тувача $3:',
 'undeleterevision-missing'     => '�евірна вер�і�. Помилкове по�иланн�, або вказану вер�ію �торінки вилучено з архіву.',
 'undelete-nodiff'              => '�е знайдена попередн� вер�і�.',
 'undeletebtn'                  => 'Відновити',
 'undeletelink'                 => 'відновити',
 'undeletereset'                => 'Очи�тити',
+'undeleteinvert'               => 'Інвертувати виділенн�',
 'undeletecomment'              => 'Коментар:',
 'undeletedarticle'             => 'відновив «[[$1]]»',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|редагуванн�|редагуванн�|редагувань}} відновлено',
@@ -1852,26 +2069,27 @@ $1',
 'blanknamespace' => '(О�новний)',
 
 # Contributions
-'contributions' => 'Вне�ок кори�тувача',
-'mycontris'     => 'Мій вне�ок',
-'contribsub2'   => 'Вне�ок $1 ($2)',
-'nocontribs'    => 'Редагувань, що задовольн�ють заданим умовам не знайдено.',
-'uctop'         => ' (о�танн�)',
-'month'         => 'Від мі��ц� (і раніше):',
-'year'          => 'Від року (і раніше):',
-
-'sp-contributions-newbies'     => 'Показати лише вне�ок з нових облікових запи�ів',
-'sp-contributions-newbies-sub' => 'Вне�ок новачків',
-'sp-contributions-blocklog'    => 'Протокол блокувань',
-'sp-contributions-search'      => 'Пошук вне�ку',
-'sp-contributions-username'    => "IP-адре�а або ім'� кори�тувача:",
-'sp-contributions-submit'      => 'Знайти',
+'contributions'       => 'Вне�ок кори�тувача',
+'contributions-title' => 'Вне�ок кори�тувача $1',
+'mycontris'           => 'Мій вне�ок',
+'contribsub2'         => 'Вне�ок $1 ($2)',
+'nocontribs'          => 'Редагувань, що задовольн�ють заданим умовам не знайдено.',
+'uctop'               => ' (о�танн�)',
+'month'               => 'Від мі��ц� (і раніше):',
+'year'                => 'Від року (і раніше):',
+
+'sp-contributions-newbies'       => 'Показати лише вне�ок з нових облікових запи�ів',
+'sp-contributions-newbies-sub'   => 'Вне�ок новачків',
+'sp-contributions-newbies-title' => 'Вне�ок з нових облікових запи�ів',
+'sp-contributions-blocklog'      => 'Протокол блокувань',
+'sp-contributions-search'        => 'Пошук вне�ку',
+'sp-contributions-username'      => "IP-адре�а або ім'� кори�тувача:",
+'sp-contributions-submit'        => 'Знайти',
 
 # What links here
 'whatlinkshere'            => 'По�иланн� �юди',
 'whatlinkshere-title'      => 'Сторінки, що по�илають�� на "$1"',
 'whatlinkshere-page'       => 'Сторінка:',
-'linklistsub'              => '(Спи�ок по�илань)',
 'linkshere'                => "�а�тупні �торінки по�илають�� на '''[[:$1]]''':",
 'nolinkshere'              => "�а �таттю '''[[:$1]]''' не вказує жодна �татт�.",
 'nolinkshere-ns'           => "У вибраному про�торі назв нема �торінок, що по�илають�� на '''[[:$1]]'''.",
@@ -1912,11 +2130,13 @@ $1',
 'ipbenableautoblock'              => '�втоматично блокувати IP-адре�и, �кі викори�товують�� цим кори�тувачем та будь-�кі на�тупні адре�и, з �ких він буде редагувати',
 'ipbsubmit'                       => 'Заблокувати до�туп цьому кори�тувачу',
 'ipbother'                        => 'Інший термін',
-'ipboptions'                      => '15 хвилин:15 minutes,2 години:2 hours,1 день:1 day,3 дні:3 days,1 тиждень:1 week,2 тижні:2 weeks,1 мі��ць:1 month,3 мі��ці:3 months,6 мі��ців:6 months,1 рік:1 year,назавжди:infinite', # display1:time1,display2:time2,...
+'ipboptions'                      => '2 години:2 hours,1 день:1 day,3 дні:3 days,1 тиждень:1 week,2 тижні:2 weeks,1 мі��ць:1 month,3 мі��ці:3 months,6 мі��ців:6 months,1 рік:1 year,назавжди:infinite', # display1:time1,display2:time2,...
 'ipbotheroption'                  => 'інший термін',
 'ipbotherreason'                  => 'Інша/додаткова причина:',
 'ipbhidename'                     => "Приховати ім'� кори�тувача в журналі блокувань, �пи�ку заблокованих та загальному �пи�ку кори�тувачів.",
 'ipbwatchuser'                    => 'Додати до �пи�ку �по�тереженн� �торінку кори�тувача і його обговоренн�',
+'ipballowusertalk'                => 'Дозволити цьому кори�тувачеві редагувати �вою �торінку обговоренн� на ча� блокуванн�',
+'ipb-change-block'                => 'Переблокувати кори�тувача з цими налаштуванн�ми',
 'badipaddress'                    => 'IP-адре�а запи�ана в невірному форматі, або кори�тувача з таким іменем не і�нує.',
 'blockipsuccesssub'               => 'Блокуванн� проведено',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|«$1»]] заблоковано.<br />
@@ -1926,14 +2146,18 @@ $1',
 'ipb-unblock'                     => 'Розблокувати кори�тувача або IP-адре�у',
 'ipb-blocklist-addr'              => 'Діючі блокуванн� дл� $1',
 'ipb-blocklist'                   => 'Показати діючі блокуванн�',
+'ipb-blocklist-contribs'          => 'Вне�ок кори�тувача $1',
 'unblockip'                       => 'Розблокувати IP-адре�у',
 'unblockiptext'                   => 'Викори�товуйте подану нижче форму, щоб відновити можливі�ть збереженн� з раніше заблокованої IP-адре�и.',
-'ipusubmit'                       => 'Розблокувати цю адре�у',
-'unblocked'                       => '[[User:$1|$1]] розблоковано.',
+'ipusubmit'                       => 'Зн�ти це блокуванн�',
+'unblocked'                       => '[[User:$1|$1]] розблокований',
 'unblocked-id'                    => 'Блокуванн� $1 було зн�те',
 'ipblocklist'                     => 'Спи�ок заблокованих IP-адре� та кори�тувачів',
 'ipblocklist-legend'              => 'Пошук заблокованого кори�тувача',
 'ipblocklist-username'            => 'Кори�тувач або IP-адре�а:',
+'ipblocklist-sh-userblocks'       => '$1 блокуванн� облікових запи�ів',
+'ipblocklist-sh-tempblocks'       => '$1 тимча�ові блокуванн�',
+'ipblocklist-sh-addressblocks'    => '$1 блокуванн� окремих IP-адре�',
 'ipblocklist-submit'              => 'Пошук',
 'blocklistline'                   => '$1, $2 заблокував $3 ($4)',
 'infiniteblock'                   => 'блокуванн� на невизначений термін',
@@ -1942,14 +2166,18 @@ $1',
 'noautoblockblock'                => 'автоблокуванн� вимкнене',
 'createaccountblock'              => 'Створенн� облікових запи�ів заблоковане',
 'emailblock'                      => 'ли�ти заборонені',
+'blocklist-nousertalk'            => 'не може редагувати �вою �торінку обговоренн�',
 'ipblocklist-empty'               => 'Спи�ок блокувань порожній.',
 'ipblocklist-no-results'          => "Запитана IP-адре�а або ім'� кори�тувача не заблоковані.",
 'blocklink'                       => 'заблокувати',
 'unblocklink'                     => 'розблокувати',
+'change-blocklink'                => 'змінити блокуванн�',
 'contribslink'                    => 'вне�ок',
 'autoblocker'                     => 'До�туп заблоковано автоматично, тому що ви викори�товуєте ту �аму адре�у, що й "$1". Причина блокуванн�: "$2".',
 'blocklogpage'                    => 'Журнал блокувань',
+'blocklog-fulllog'                => 'Повний журнал блокувань',
 'blocklogentry'                   => 'заблокував [[$1]] на термін $2 $3',
+'reblock-logentry'                => 'змінив налаштуванн� блокуванн� дл� [[$1]] з терміном до $2 $3',
 'blocklogtext'                    => 'Журнал блокуванн� й розблокуванн� кори�тувачів.
 IP-адре�и, що блокують�� автоматично тут не вказують��. Див.
 [[Special:IPBlockList|�пи�ок поточних заборон і блокувань]].',
@@ -1958,11 +2186,14 @@ IP-адре�и, що блокують�� автоматично тут не в
 'block-log-flags-nocreate'        => 'заборонена реє�траці� облікових запи�ів',
 'block-log-flags-noautoblock'     => 'автоблокуванн� вимкнене',
 'block-log-flags-noemail'         => 'електронні ли�ти заборонені',
+'block-log-flags-nousertalk'      => 'не може редагувати вла�ну �торінку обговоренн�',
 'block-log-flags-angry-autoblock' => 'увімкнене покращене автоблокуванн�',
 'range_block_disabled'            => '�дміні�траторам заборонено блокувати діапазони.',
 'ipb_expiry_invalid'              => '�евірно вказано термін.',
 'ipb_expiry_temp'                 => 'Блокуванн� із приховуванн�м імені кори�тувача мають бути без�троковими.',
 'ipb_already_blocked'             => '«$1» уже заблоковано. Дл� того, щоб призначити новий термін блокуванн�, �початку розблокуйте його.',
+'ipb-needreblock'                 => '== Уже заблокований ==
+Кори�тувач $1 вже заблокований. Хочете змінити параметри блокуванн�?',
 'ipb_cant_unblock'                => 'Помилка: блокуванн� з ID $1 не знайдене.
 Можливо, кори�тувач уже розблокований.',
 'ipb_blocked_as_range'            => 'Помилка: IP-адре�а $1 була заблокована не напр�му і не може бути розблокована. Однак, вона належить до заблокованого діапазону $2, �кий можна розблокувати.',
@@ -1975,6 +2206,7 @@ IP-адре�и, що блокують�� автоматично тут не в
 'proxyblocksuccess'               => 'Виконано.',
 'sorbsreason'                     => 'Ваша IP-адре�а чи�лить�� �к відкритий прок�і в DNSBL.',
 'sorbs_create_account_reason'     => 'Ваша IP-адре�а чи�лить�� �к відкритий прок�і в DNSBL. Ви не можете �творити обліковий запи�.',
+'cant-block-while-blocked'        => 'Ви не можете блокувати інших кори�тувачів, поки ви �амі заблоковані.',
 
 # Developer tools
 'lockdb'              => 'Заблокувати базу даних (режим "тільки дл� читанн�")',
@@ -1997,9 +2229,9 @@ IP-адре�и, що блокують�� автоматично тут не в
 'databasenotlocked'   => 'База даних не заблокована.',
 
 # Move page
-'move-page'               => 'Перейменуванн� �торінки «$1»',
-'move-page-legend'        => 'Перейменуванн� �торінки',
-'movepagetext'            => "Скори�тавши�ь формою нижче, ви можете перейменувати �торінку, одноча�но перемі�тивши на нове мі�це і журнал її редагувань.
+'move-page'                    => 'Перейменуванн� �торінки «$1»',
+'move-page-legend'             => 'Перейменуванн� �торінки',
+'movepagetext'                 => "Скори�тавши�ь формою нижче, ви можете перейменувати �торінку, одноча�но перемі�тивши на нове мі�це і журнал її редагувань.
 Стара назва �тане перенаправленн�м на нову назву.
 Ви можете автоматично оновити перенаправленн� на �трау назву.
 Якщо ви цього не зробите, будь ла�ка, перевірте на�вні�ть [[Special:DoubleRedirects|подвійних]] чи [[Special:BrokenRedirects|розірваних]] перенаправлень.
@@ -2011,48 +2243,61 @@ IP-адре�и, що блокують�� автоматично тут не в
 '''ПОПЕРЕДЖЕ��Я!'''
 Ц� ді� може �тати причиною �ерйозних та неочікуваних змін попул�рних �торінок.
 Будь ла�ка, перед продовженн�м переконайте�ь, що ви розумієте в�і можливі на�лідки.",
-'movepagetalktext'        => "Приєднана �торінка обговоренн� також буде автоматично перейменована, '''окрім на�тупних випадків:'''
+'movepagetalktext'             => "Приєднана �торінка обговоренн� також буде автоматично перейменована, '''окрім на�тупних випадків:'''
 * �епорожн� �торінка обговоренн� з такою назвою вже і�нує або
 * Ви не по�тавили галочку в полі нижче.
 
 У цих випадках ви будете змушені перейменувати чи об'єднати �торінки вручну в разі необхідно�ті",
-'movearticle'             => 'Перейменувати �торінку',
-'movenotallowed'          => 'У ва� нема дозволу перейменовувати �торінки.',
-'newtitle'                => '�ова назва:',
-'move-watch'              => 'Спо�терігати за цією �торінкою',
-'movepagebtn'             => 'Перейменувати �торінку',
-'pagemovedsub'            => 'Сторінка перейменована',
-'movepage-moved'          => "<big>'''Сторінка «$1» перейменована на «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Сторінка з такою назвою вже і�нує або зазначена вами назва недопу�тима.
+'movearticle'                  => 'Перейменувати �торінку',
+'movenologin'                  => 'Ви не ввійшли в �и�тему',
+'movenologintext'              => 'Ви повинні [[Special:UserLogin|ввійти до �и�теми]], щоб перейменувати �торінку.',
+'movenotallowed'               => 'У ва� нема дозволу перейменовувати �торінки.',
+'movenotallowedfile'           => 'У ва� немає прав перейменовувати файли.',
+'cant-move-user-page'          => 'У ва� нема дозволу перейменовувати �торінки кори�тувачів.',
+'cant-move-to-user-page'       => 'У ва� нема дозволу перейменовувати �торінки на �торінки про�тору «Кори�тувач» (окрім під�торінок)',
+'newtitle'                     => '�ова назва:',
+'move-watch'                   => 'Спо�терігати за цією �торінкою',
+'movepagebtn'                  => 'Перейменувати �торінку',
+'pagemovedsub'                 => 'Сторінка перейменована',
+'movepage-moved'               => "<big>'''Сторінка «$1» перейменована на «$2»'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Створено перенаправленн�.',
+'movepage-moved-noredirect'    => 'Створенн� перенаправленн� було заборонене.',
+'articleexists'                => 'Сторінка з такою назвою вже і�нує або зазначена вами назва недопу�тима.
 Будь ла�ка, оберіть іншу назву.',
-'cantmove-titleprotected' => '�еможливо перейменувати �торінку, о�кільки нова назва входить до �пи�ку заборонених.',
-'talkexists'              => "'''Сторінка була перейменована, але її �торінка обговоренн� не може бути перейменована, бо �торінка з такою назвою вже і�нує. Будь-ла�ка, об'єднайте їх вручну.'''",
-'movedto'                 => 'тепер називаєть��',
-'movetalk'                => 'Перейменувати відповідну �торінку обговоренн�',
-'move-subpages'           => 'Перейменувати в�і під�торінки, �кщо можливо',
-'move-talk-subpages'      => 'Перейменувати в�і під�торінки �торінки обговоренн�, �кщо можливо',
-'movepage-page-exists'    => 'Сторінка $1 вже і�нує і не може бути автоматично перезапи�ана.',
-'movepage-page-moved'     => 'Сторінка $1 перейменована на $2.',
-'movepage-page-unmoved'   => 'Сторінка $1 не може бути перейменована на $2.',
-'movepage-max-pages'      => '$1 {{PLURAL:$1|�торінка була перейменована|�торінки були перейменовані|�торінок були перейменовані}} — це мак�имум, більше �торінок не можна перейменувати автоматично.',
-'1movedto2'               => '«[[$1]]» перейменовано на «[[$2]]»',
-'1movedto2_redir'         => '«[[$1]]» перейменовано на «[[$2]]» (поверх перенаправленн�)',
-'movelogpage'             => 'Журнал перейменувань',
-'movelogpagetext'         => 'Далі подано �пи�ок перейменованих �торінок.',
-'movereason'              => 'Причина',
-'revertmove'              => 'відкинути',
-'delete_and_move'         => 'Вилучити і перейменувати',
-'delete_and_move_text'    => '== Потрібне вилученн� ==
+'cantmove-titleprotected'      => '�еможливо перейменувати �торінку, о�кільки нова назва входить до �пи�ку заборонених.',
+'talkexists'                   => "'''Сторінка була перейменована, але її �торінка обговоренн� не може бути перейменована, бо �торінка з такою назвою вже і�нує. Будь-ла�ка, об'єднайте їх вручну.'''",
+'movedto'                      => 'тепер називаєть��',
+'movetalk'                     => 'Перейменувати відповідну �торінку обговоренн�',
+'move-subpages'                => 'Перейменувати в�і під�торінки, �кщо можливо',
+'move-talk-subpages'           => 'Перейменувати в�і під�торінки �торінки обговоренн�, �кщо можливо',
+'movepage-page-exists'         => 'Сторінка $1 вже і�нує і не може бути автоматично перезапи�ана.',
+'movepage-page-moved'          => 'Сторінка $1 перейменована на $2.',
+'movepage-page-unmoved'        => 'Сторінка $1 не може бути перейменована на $2.',
+'movepage-max-pages'           => '$1 {{PLURAL:$1|�торінка була перейменована|�торінки були перейменовані|�торінок були перейменовані}} — це мак�имум, більше �торінок не можна перейменувати автоматично.',
+'1movedto2'                    => 'перейменував «[[$1]]» на «[[$2]]»',
+'1movedto2_redir'              => 'перейменував «[[$1]]» на «[[$2]]» поверх перенаправленн�',
+'move-redirect-suppressed'     => 'перенаправленн� зі �тарої назви не �творене',
+'movelogpage'                  => 'Журнал перейменувань',
+'movelogpagetext'              => 'Далі подано �пи�ок перейменованих �торінок.',
+'movereason'                   => 'Причина:',
+'revertmove'                   => 'відкинути',
+'delete_and_move'              => 'Вилучити і перейменувати',
+'delete_and_move_text'         => '== Потрібне вилученн� ==
 Сторінка з назвою [[:$1|«$1»]] вже і�нує.
 Бажаєте вилучити її дл� можливо�ті перейменуванн�?',
-'delete_and_move_confirm' => 'Так, вилучити цю �торінку',
-'delete_and_move_reason'  => 'Вилучена дл� можливо�ті перейменуванн�',
-'selfmove'                => '�еможливо перейменувати �торінку: поточна й нова назви �торінки �півпадають.',
-'immobile_namespace'      => 'Вихідний або цільовий заголовок �пеціального типу; не можна переміщувати �торінки з або до цього про�тору імен.',
-'imagenocrossnamespace'   => '�еможливо дати зображенню назву з іншого про�тору назв',
-'imagetypemismatch'       => '�ове розширенн� файлу не �півпадає з його типом',
-'imageinvalidfilename'    => '�азва цільового файлу неправильна',
-'fix-double-redirects'    => 'Виправити в�і перенаправленн� на попередню назву',
+'delete_and_move_confirm'      => 'Так, вилучити цю �торінку',
+'delete_and_move_reason'       => 'Вилучена дл� можливо�ті перейменуванн�',
+'selfmove'                     => '�еможливо перейменувати �торінку: поточна й нова назви �торінки �півпадають.',
+'immobile-source-namespace'    => '�е можна перейменовувати �торінки з про�тору назв «$1»',
+'immobile-target-namespace'    => '�е можна перейменовувати �торінки до про�тору назв «$1»',
+'immobile-target-namespace-iw' => 'Інтервікі-по�иланн� не підходить дл� перейменуванн� �торінки.',
+'immobile-source-page'         => 'Цю �торінку не можна перейменувати.',
+'immobile-target-page'         => '�е можна при�воїти �торінці цю назву.',
+'imagenocrossnamespace'        => '�еможливо дати файлові назву з іншого про�тору назв',
+'imagetypemismatch'            => '�ове розширенн� файлу не �півпадає з його типом',
+'imageinvalidfilename'         => '�азва цільового файлу неправильна',
+'fix-double-redirects'         => 'Виправити в�і перенаправленн� на попередню назву',
+'move-leave-redirect'          => 'Залишити перенаправленн�',
 
 # Export
 'export'            => 'Ек�порт �татей',
@@ -2060,7 +2305,7 @@ IP-адре�и, що блокують�� автоматично тут не в
 
 Щоб ек�портувати �торінки, введіть їх назви в поле редагуванн�, одну назву на р�док і оберіть, бажаєте ви ек�портувати в�ю і�торію змін �торінок чи тільки о�танні вер�ії �татей.
 
-Ви також можете викори�товувати �пеціальну адре�у дл� ек�порту тільки о�танньої вер�ії. �априклад, дл� �торінки «[[{{MediaWiki:Mainpage}}]]» ц� адре�а така: [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]].',
+Ви також можете викори�товувати �пеціальну адре�у дл� ек�порту тільки о�танньої вер�ії. �априклад, дл� �торінки «[[{{MediaWiki:Mainpage}}]]» ц� адре�а така: [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'Включати тільки поточну вер�ію, без повної і�торії',
 'exportnohistory'   => "----
 '''Зауваженн�:''' ек�порт в�ієї і�торії змін �торінок вимкнутий через проблеми з ре�ур�ами.",
@@ -2076,7 +2321,7 @@ IP-адре�и, що блокують�� автоматично тут не в
 'allmessagesdefault'        => 'Стандартний тек�т',
 'allmessagescurrent'        => 'Поточний тек�т',
 'allmessagestext'           => 'Це �пи�ок у�іх �и�темних повідомлень, �кі до�тупні в про�торі назв «MediaWiki». 
-Будь ла�ка, відвідайте [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] і [http://translatewiki.net Betawiki], �кщо ви хочете зробити вне�ок до �пільної локалізації MediaWiki.',
+Будь ла�ка, відвідайте [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] і [http://translatewiki.net translatewiki.net], �кщо ви хочете зробити вне�ок до �пільної локалізації MediaWiki.',
 'allmessagesnotsupportedDB' => "Ц� �торінка не може викори�товувати��, о�кільки вимкнена опці� '''\$wgUseDatabaseMessages'''.",
 'allmessagesfilter'         => 'Фільтр назв повідомлень:',
 'allmessagesmodified'       => 'Показати тільки змінені',
@@ -2096,9 +2341,12 @@ IP-адре�и, що блокують�� автоматично тут не в
 'import-interwiki-text'      => 'Вкажіть вікі й назву імпортованої �торінки.
 Дати змін й імена авторів буде збережено.
 В�і операції межвікі імпорту реє�трують�� в [[Special:Log/import|відповідному протоколі]].',
+'import-interwiki-source'    => 'Вікі/�торінка-джерело',
 'import-interwiki-history'   => 'Копіювати в�ю і�торію змін цієї �торінки',
 'import-interwiki-submit'    => 'Імпортувати',
 'import-interwiki-namespace' => 'Цільовий про�тір назв:',
+'import-upload-filename'     => '�азва файлу:',
+'import-comment'             => 'Примітка:',
 'importtext'                 => 'Будь ла�ка, ек�портуйте �торінку з іншої вікі, викори�товуючи [[Special:Export|за�іб ек�порту]], збережіть файл, а потім завантажте його �юди.',
 'importstart'                => 'Імпорт �торінок…',
 'import-revision-count'      => '$1 {{PLURAL:$1|вер�і�|вер�ії|вер�ій}}',
@@ -2132,19 +2380,19 @@ IP-адре�и, що блокують�� автоматично тут не в
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|вер�і�|вер�ії|вер�ій}} з $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Мо� �торінка кори�тувача',
-'tooltip-pt-anonuserpage'         => 'Сторінка кори�тувача дл� моєї IP-адре�и',
-'tooltip-pt-mytalk'               => 'Мо� �торінка обговоренн�',
+'tooltip-pt-userpage'             => 'Ваша �торінка кори�тувача',
+'tooltip-pt-anonuserpage'         => 'Сторінка кори�тувача дл� вашої IP-адре�и',
+'tooltip-pt-mytalk'               => 'Ваша �торінка обговоренн�',
 'tooltip-pt-anontalk'             => 'Обговоренн� редагувань з цієї IP-адре�и',
-'tooltip-pt-preferences'          => 'Мої налаштуванн�',
+'tooltip-pt-preferences'          => 'Ваші налаштуванн�',
 'tooltip-pt-watchlist'            => 'Спи�ок �торінок, за �кими � �по�терігаю',
-'tooltip-pt-mycontris'            => 'Мій вне�ок',
+'tooltip-pt-mycontris'            => 'Ваш вне�ок',
 'tooltip-pt-login'                => "Тут можна зареє�трувати�� в �и�темі, але це не обов'�зково.",
 'tooltip-pt-anonlogin'            => "Тут можна зареє�трувати�� в �и�темі, але це не обов'�зково.",
 'tooltip-pt-logout'               => 'Вихід із �и�теми',
 'tooltip-ca-talk'                 => 'Обговоренн� змі�ту �торінки',
 'tooltip-ca-edit'                 => 'Цю �торінку можна редагувати. Викори�товуйте, будь ла�ка, попередній перегл�д перед збереженн�м.',
-'tooltip-ca-addsection'           => 'Додати коментар до обговоренн�.',
+'tooltip-ca-addsection'           => 'Створити новий розділ',
 'tooltip-ca-viewsource'           => 'Ц� �торінка захищена від змін. Ви можете перегл�нути і �копіювати її вихідний тек�т.',
 'tooltip-ca-history'              => 'Журнал змін �торінки.',
 'tooltip-ca-protect'              => 'Захи�тити �торінку від змін',
@@ -2191,6 +2439,8 @@ IP-адре�и, що блокують�� автоматично тут не в
 'tooltip-watch'                   => 'Додати поточну �торінку до �пи�ку �по�тереженн�',
 'tooltip-recreate'                => 'Відновити �торінку недивл�чи�ь на те, що її вилучено',
 'tooltip-upload'                  => 'Почати завантаженн�',
+'tooltip-rollback'                => 'Одним кліком прибрати зміни, зроблені о�таннім редактором',
+'tooltip-undo'                    => 'Прибрати вне�ені зміни і показати попередній перегл�д. Дозвол�є зазначити причину �ка�уванн�.',
 
 # Stylesheets
 'common.css'   => '/** Розміщений тут CSS буде за�то�овувати�� до в�іх тем оформленн� */',
@@ -2218,12 +2468,12 @@ IP-адре�и, що блокують�� автоматично тут не в
 The wiki server can't provide data in a format your client can read.",
 
 # Attribution
-'anonymous'        => '�нонімні кори�тувачі {{grammar:genitive|{{SITENAME}}}}',
+'anonymous'        => '{{PLURAL:$1|�нонімний кори�тувач|�нонімні кори�тувачі}} {{grammar:genitive|{{SITENAME}}}}',
 'siteuser'         => 'Кори�тувач {{grammar:genitive|{{SITENAME}}}} $1',
 'lastmodifiedatby' => 'О�танн� зміна $2, $1 кори�тувачем $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Базуєть�� на праці $1.',
 'others'           => 'інші',
-'siteusers'        => 'Кори�тувач(і) {{grammar:genitive|{{SITENAME}}}} $1',
+'siteusers'        => '{{PLURAL:$2|Кори�тувач|Кори�тувачі}} {{grammar:genitive|{{SITENAME}}}} $1',
 'creditspage'      => 'Под�ки',
 'nocredits'        => 'Від�утній �пи�ок кори�тувачів дл� цієї �татті',
 
@@ -2244,6 +2494,16 @@ The wiki server can't provide data in a format your client can read.",
 'numauthors'     => 'Кількі�ть різних авторів (�торінка): $1',
 'numtalkauthors' => 'Кількі�ть авторів (�торінка обговоренн�): $1',
 
+# Skin names
+'skinname-standard'    => 'Стандартне',
+'skinname-nostalgia'   => '�о�тальгі�',
+'skinname-cologneblue' => 'Кельн�ьке �инє',
+'skinname-monobook'    => 'Моно-книга',
+'skinname-myskin'      => 'Своє',
+'skinname-chick'       => 'Курча',
+'skinname-simple'      => 'Про�те',
+'skinname-modern'      => 'Суча�не',
+
 # Math options
 'mw_math_png'    => 'Завжди генерувати PNG',
 'mw_math_simple' => 'HTML в про�тих випадках, інакше - PNG',
@@ -2264,10 +2524,12 @@ The wiki server can't provide data in a format your client can read.",
 'markedaspatrollederror-noautopatrol' => 'Вам не дозволено позначати вла�ні редагуванн� �к перевірені.',
 
 # Patrol log
-'patrol-log-page'   => 'Журнал патрулюванн�',
-'patrol-log-header' => 'Це журнал перевірених змін.',
-'patrol-log-line'   => 'перевірена $1 з $2 $3',
-'patrol-log-auto'   => '(автоматично)',
+'patrol-log-page'      => 'Журнал патрулюванн�',
+'patrol-log-header'    => 'Це журнал перевірених змін.',
+'patrol-log-line'      => 'перевірив $1 �торінки $2 $3',
+'patrol-log-auto'      => '(автоматично)',
+'patrol-log-diff'      => 'вер�ію $1',
+'log-show-hide-patrol' => '$1 журнал патрулюванн�',
 
 # Image deletion
 'deletedrevision'                 => 'Вилучена �тара вер�і� $1',
@@ -2284,6 +2546,9 @@ $1',
 'previousdiff' => '� Попереднє редагуванн�',
 'nextdiff'     => '�а�тупне редагуванн� →',
 
+# Visual comparison
+'visual-comparison' => '�аочне порівн�нн�',
+
 # Media information
 'mediawarning'         => "'''Увага''': цей файл може мі�тити шкідливий програмний код, виконанн� �кого може бути небезпечним дл� вашої �и�теми. <hr />",
 'imagemaxsize'         => 'Обмежити розмір зображень на �торінках опи�у зображень до:',
@@ -2297,10 +2562,12 @@ $1',
 'show-big-image'       => 'Повна роздільні�ть',
 'show-big-image-thumb' => '<small>Розмір при попередньому перегл�ді: $1 × $2 пік�елів</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Галере� нових файлів',
 'imagelisttext'         => "�ижче подано �пи�ок з '''$1''' {{PLURAL:$1|файлу|файлів|файлів}}, від�ортованих $2.",
 'newimages-summary'     => 'Ц� �пеціальна �торінка показує о�танні завантажені файли.',
+'newimages-legend'      => 'Фільтр',
+'newimages-label'       => '�азва файлу (або її ча�тина):',
 'showhidebots'          => '($1 ботів)',
 'noimages'              => 'Файли від�утні.',
 'ilsubmit'              => 'Шукати',
@@ -2508,6 +2775,18 @@ $1',
 'exif-lightsource-24'  => 'Студійна лампа �тандарту ISO',
 'exif-lightsource-255' => 'Інше джерело �вітла',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Спалах не �працював',
+'exif-flash-fired-1'    => 'Спрацював �палах',
+'exif-flash-return-0'   => 'нема режиму попереднього �палаху',
+'exif-flash-return-2'   => 'зворотний імпуль� попереднього �палаху не отриманий',
+'exif-flash-return-3'   => 'отриманий зворотний імпуль� попереднього �палаху',
+'exif-flash-mode-1'     => 'імпуль� приму�ового �палаху',
+'exif-flash-mode-2'     => 'придушенн� приму�ового �палаху',
+'exif-flash-mode-3'     => 'автоматичний режим',
+'exif-flash-function-1' => '�ема �палаху',
+'exif-flash-redeye-1'   => 'режим у�уненн� ефекту червоних очей',
+
 'exif-focalplaneresolutionunit-2' => 'дюймів',
 
 'exif-sensingmethod-1' => '�евизначений',
@@ -2654,21 +2933,10 @@ $1
 
 'unit-pixel' => ' пік�.',
 
-# HTML dump
-'redirectingto' => 'Перенаправленн� на �торінку [[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'Очи�тити кеш цієї �торінки?
-
-$1',
 'confirm_purge_button' => 'Гаразд',
-
-# AJAX search
-'searchcontaining' => 'Шукати �татті, �кі мі�т�ть «$1».',
-'searchnamed'      => "Шукати �торінки з назвою ''$1''.",
-'articletitles'    => 'Статті, що починають�� з «$1»',
-'hideresults'      => 'Сховати результати',
-'useajaxsearch'    => 'Викори�товувати AJAX-пошук',
+'confirm-purge-top'    => 'Очи�тити кеш цієї �торінки?',
+'confirm-purge-bottom' => 'Пі�л� очищенн� кешу �торінки буде показана її о�танн� вер�і�.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� попередн� �торінка',
@@ -2688,10 +2956,10 @@ $1',
 'table_pager_empty'        => '�е знайдено',
 
 # Auto-summaries
-'autosumm-blank'   => 'Видалений ве�ь вмі�т �торінки',
-'autosumm-replace' => 'Замінено �торінку на «$1»',
+'autosumm-blank'   => 'Сторінка очищена',
+'autosumm-replace' => 'Замінено вмі�т на «$1»',
 'autoredircomment' => 'Перенаправлено на [[$1]]',
-'autosumm-new'     => '�ова �торінка: $1',
+'autosumm-new'     => 'Створена �торінка: $1',
 
 # Size units
 'size-bytes'     => '$1 байтів',
@@ -2736,6 +3004,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '�евідомий тег доповненн� «$1»',
+'duplicate-defaultsort' => 'Увага. Ключ �ортуванн� «$2» перекриває попередній ключ �ортуванн� «$1».',
 
 # Special:Version
 'version'                          => 'Вер�і� MediaWiki', # Not used as normal message but as header for the special page itself
@@ -2764,13 +3033,13 @@ $1',
 'filepath-submit'  => 'Шл�х',
 'filepath-summary' => 'Ц� �пеціальна �торінка повертає повний шл�х до файлу в тому вигл�ді, в �кому він зберігаєть�� на ди�ку.
 
-Уведіть назву файлу без префік�у <code>{{ns:image}}:</code>.',
+Уведіть назву файлу без префік�у <code>{{ns:file}}:</code>.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Пошук файлів-дублікатів',
 'fileduplicatesearch-summary'  => 'Пошук дублікатів файлів базуєть�� на їх хеш-функції.
 
-Уведіть назву файлу без префік�у «{{ns:image}}:».',
+Уведіть назву файлу без префік�у «{{ns:file}}:».',
 'fileduplicatesearch-legend'   => 'Пошук дублікатів',
 'fileduplicatesearch-filename' => '�азва файлу:',
 'fileduplicatesearch-submit'   => 'Знайти',
@@ -2800,4 +3069,13 @@ $1',
 'blankpage'              => 'Порожн� �торінка',
 'intentionallyblankpage' => 'Цю �торінку навми�не залишили порожньою',
 
+# External image whitelist
+'external_image_whitelist' => ' #Залиште цей р�док таким, �ким він є<pre>
+#Запи�уйте тут фрагменти регул�рних виразів (ту ча�тину, що знаходить�� між //)
+#Вони будуть зі�тавлені з URL зовнішніх зображень.
+#Потрібні будуть показані �к зображенн�, решта будуть показані �к по�иланн� на зображенн�
+#Р�дки, що починають�� з #, вважають�� коментар�ми.
+
+#Розміщуйте фрагменти регул�рних виразів над цією �трочкою. Залиште цей р�док таким, �ким він є.</pre>',
+
 );
diff --git a/languages/messages/MessagesUr.php b/languages/messages/MessagesUr.php
index 5d8922a0..451399a7 100644
--- a/languages/messages/MessagesUr.php
+++ b/languages/messages/MessagesUr.php
@@ -8,8 +8,10 @@
  * @author Meno25
  * @author Wisesabre
  * @author לערי ריינה�רט
+ * @author محبوب عالم
  */
 
+$fallback8bitEncoding = 'windows-1256';
 $rtl = true;
 $defaultUserOptionOverrides = array(
 	# Swap sidebar to right side by default
@@ -27,8 +29,8 @@ $namespaceNames = array(
 	NS_USER_TALK => 'تبادلۂ_خیال_صار�',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK => 'تبادلۂ_خیال_$1',
-	NS_IMAGE => 'تصویر',
-	NS_IMAGE_TALK => 'تبادلۂ_خیال_تصویر',
+	NS_FILE => 'تصویر',
+	NS_FILE_TALK => 'تبادلۂ_خیال_تصویر',
 	NS_MEDIAWIKI => 'میڈیاوکی',
 	NS_MEDIAWIKI_TALK => 'تبادلۂ_خیال_میڈیاوکی',
 	NS_TEMPLATE => 'سانچ�',
@@ -97,7 +99,7 @@ $messages = array(
 'mytalk'        => 'میری گ�تگو',
 'anontalk'      => 'اس IP کیلیے بات چیت',
 'navigation'    => 'ر�نمائی',
-'and'           => 'اور',
+'and'           => '&#32;اور',
 
 'returnto'          => 'واپس $1۔',
 'tagline'           => '{{SITENAME}} سے',
@@ -122,80 +124,196 @@ $messages = array(
 'unprotectthispage' => 'اس ص�حےکو غیر مح�وظ کریں',
 'newpage'           => 'نیا ص�ح�',
 'talkpage'          => 'اس ص�ح� پر تبادلۂ خیال کریں',
+'talkpagelinktext'  => 'گ�تگو',
 'specialpage'       => 'خصوصی ص�ح�',
+'personaltools'     => 'ذاتی اوزار',
+'postcomment'       => 'اگلا حصّ�',
 'articlepage'       => 'مندرجاتی ص�ح� دیکھیۓ',
 'talk'              => 'تبادل�ٴ خیال',
 'views'             => 'خیالات',
-'toolbox'           => 'آلات',
-'userpage'          => 'دیکھیں صار� کا ص�ح�',
+'toolbox'           => 'اوزاردان',
+'userpage'          => 'ص�حۂ صار� دیکھئے',
+'projectpage'       => 'ص�حۂ منصوب� دیکھئے',
+'imagepage'         => 'ص�حۂ مسل دیکھئے',
+'mediawikipage'     => 'ص�حۂ پیغام دیکھئے',
+'templatepage'      => 'ص�حۂ سانچ� دیکھئے',
 'viewhelppage'      => 'ص�حۂ معاونت دیکھیے',
-'otherlanguages'    => 'دیگر زبانیں',
+'categorypage'      => 'زمر�‌جاتی ص�ح� دیکھئے',
+'viewtalkpage'      => 'تبادلۂ خیال دیکھئے',
+'otherlanguages'    => 'دیگر زبانوں میں',
 'redirectedfrom'    => '($1 سے پلٹایا گیا)',
 'redirectpagesub'   => 'لوٹایا گیا ص�ح�',
 'lastmodifiedat'    => 'آخری بار تدوین $2, $1 کو کی گئی۔', # $1 date, $2 time
+'viewcount'         => 'ا�س ص�ح� تک {{PLURAL:$1|ایک‌بار|$1 مرتب�}} رسائی کی گئی',
 'protectedpage'     => 'مح�وظ شد� ص�ح�',
+'jumpto'            => ':چھلانگ بطر�',
+'jumptonavigation'  => 'ر�نمائی',
+'jumptosearch'      => 'تلاش',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'aboutsite'            => '{{SITENAME}} کا تعار�',
+'aboutsite'            => 'کا تعار� {{SITENAME}}',
 'aboutpage'            => 'Project:تعار�',
 'copyright'            => 'تمام مواد $1 کے تحت میسر �ے۔',
 'copyrightpagename'    => '{{SITENAME}} حق تصنی�',
 'copyrightpage'        => '{{ns:project}}:حقوق تصانی�',
-'currentevents'        => 'تعار� وکیپیڈیا',
-'currentevents-url'    => 'Project:تعار� وکیپیڈیا',
+'currentevents'        => 'حالی� واقعات',
+'currentevents-url'    => 'Project:حالی� واقعات',
 'disclaimers'          => 'اعلانات',
+'disclaimerpage'       => 'Project:عام اعلان',
 'edithelp'             => 'معاونت براۓ ترمیم',
+'edithelppage'         => 'Help:ترمیم',
 'faq'                  => 'معلومات� عام�',
 'faqpage'              => 'Project:معلومات� عام�',
 'helppage'             => 'Help:��رست',
-'mainpage'             => 'ص�ح� اول',
-'mainpage-description' => 'ص�ح� اول',
+'mainpage'             => 'سرورق',
+'mainpage-description' => 'سرورق',
+'policy-url'           => 'Project:حکمت� عملی',
 'portal'               => 'دیوان عام',
 'portal-url'           => 'Project:دیوان عام',
 'privacy'              => 'اصول براۓ اخ�ائے راز',
+'privacypage'          => 'Project:اصول� اخ�ائے راز',
 
+'badaccess'        => 'خطائے اجازت',
 'badaccess-group0' => 'آپ متمنی عمل کا اجراء کرنے کے م�جاز ن�یں۔',
-
-'ok'                  => 'ٹھیک �ے',
-'pagetitle'           => '$1 - وکیپیڈیا',
-'youhavenewmessages'  => 'آپکے لیۓ ایک $1 �ے۔ ($2)',
-'newmessageslink'     => 'نیا پیغام',
-'newmessagesdifflink' => 'تـجـدیـد مـاقـبل آخـر سے �ـرق',
-'editsection'         => 'ترمیم',
-'editold'             => 'ترمیم',
-'toc'                 => '��رست',
-'showtoc'             => 'دکھائیں',
-'hidetoc'             => 'غائب کریں',
-'thisisdeleted'       => 'دیکھیں یا بحال کریں $1؟',
-'restorelink'         => '$1 ترامیم ضائع کردی',
-'feed-atom'           => 'ایٹم',
-'feed-rss'            => 'آر ایس ایس',
+'badaccess-groups' => 'آپ کا درخواست‌کرد� عمل {{PLURAL:$2|گرو�|گرو�وں میں سے ایک}}: $1 کے صار�ین تک محدود �ے.',
+
+'versionrequired'     => 'میڈیا ویکی کا $1 نسخ� لازمی چا�ئیے.',
+'versionrequiredtext' => 'ا�س ص�ح� کو استعمال کرنے کیلئے میڈیاویکی کا $1 نسخ� چا�ئیے.
+
+
+دیکھئے [[خاص:نسخ�|ص�حۂ نسخ�]]',
+
+'ok'                      => 'ٹھیک �ے',
+'pagetitle'               => '$1 - وکیپیڈیا',
+'retrievedfrom'           => '‘‘$1’’ مستعاد� منجانب',
+'youhavenewmessages'      => 'آپکے لیۓ ایک $1 �ے۔ ($2)',
+'newmessageslink'         => 'نئے پیغامات',
+'newmessagesdifflink'     => 'تـجـدیـد مـاقـبل آخـر سے �ـرق',
+'youhavenewmessagesmulti' => 'ء$1 پر آپ کیلئے نئے پیغامات �یں',
+'editsection'             => 'ترمیم',
+'editsection-brackets'    => '[$1]',
+'editold'                 => 'ترمیم',
+'viewsourceold'           => 'مآخذ دیکھئے',
+'editlink'                => 'تدوین کریں',
+'viewsourcelink'          => 'مآخذ دیکھئے',
+'editsectionhint'         => 'تدوین� حصّ�: $1',
+'toc'                     => '��رست',
+'showtoc'                 => 'دکھائیں',
+'hidetoc'                 => 'چھپائیں',
+'thisisdeleted'           => 'دیکھیں یا بحال کریں $1؟',
+'viewdeleted'             => 'دیکھیں $1؟',
+'restorelink'             => '$1 ترامیم ضائع کردی',
+'feedlinks'               => 'Feed:',
+'feed-invalid'            => 'Invalid subscription feed type.',
+'feed-unavailable'        => 'Syndication feeds are not available',
+'site-rss-feed'           => '$1 RSS Feed',
+'site-atom-feed'          => '$1 Atom Feed',
+'page-rss-feed'           => '"$1" RSS Feed',
+'page-atom-feed'          => '"$1" Atom Feed',
+'feed-atom'               => 'ایٹم',
+'feed-rss'                => 'آر ایس ایس',
+'red-link-title'          => '$1 (ص�ح� موجود ن�یں)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
-'nstab-main'      => 'مضمون',
+'nstab-main'      => 'ص�ح�',
 'nstab-user'      => 'ص�حۂ صار�',
-'nstab-special'   => 'خاص',
+'nstab-media'     => 'ص�حۂ وسیط',
+'nstab-special'   => 'خاص ص�ح�',
 'nstab-project'   => 'ص�حۂ منصوب�',
-'nstab-image'     => '�ائل',
+'nstab-image'     => 'مسل',
 'nstab-mediawiki' => 'پیغام',
 'nstab-template'  => 'سانچ�',
 'nstab-help'      => 'معاونت',
 'nstab-category'  => 'زمر�',
 
+# Main script and global functions
+'nosuchaction'      => 'کوئی سا عمل ن�یں',
+'nosuchactiontext'  => 'URL کی جانب سے مختص کیا گیا عمل درست ن�یں.
+آپ نے شاید URL غلط لکھا، یا کسی غیر صحیح ربط کی پیروی کی �ے.
+{{ا�س سے SITENAME کے زیر� استعمال مصنع لطی� میں کھٹمل کی نشاند�ی کا بھی اندیش� �ے}}.',
+'nosuchspecialpage' => 'کوئی ایسا خاص ص�ح� ن�یں',
+'nospecialpagetext' => "<big>'''آپ نے ایک ناقص خاص ص�ح� کی درخواست کی �ے.'''</big>
+
+{{درست خاص ص�حات کی ایک ��رست [[خاص:خاص‌ص�حات|خاص ص�حات]] پر دیکھی جاسکتی �ے}}.",
+
 # General errors
-'noconnect'         => 'ب� تاس�! ویکی کو چند طرزیاتی (ٹکنیکی) مشکلات کا سامنا �ے، اساسی موادی کمک کنند� ( ڈیٹا بیس سرور ) سے تک پ�نچنے میں ناکامی �وئی۔ <br />$1',
-'badarticleerror'   => 'اس ص�ح� پر ی� عمل انجام ن�یں دیا جاسکتا۔',
-'cannotdelete'      => 'ص�ح� یا م�لَ� کو حذ� ن�یں کیا جا سکا۔ (�وسکتا �ے ک� اسے پ�لے �ی کسی نے حذ� کردیا�و۔)',
-'viewsource'        => 'مسود�',
-'viewsourcefor'     => 'براۓ $1',
-'protectedpagetext' => 'اس ص�ح� کو تدوین سے مح�وظ رکھنے کیلیے مق�ل کر دیا گیا �ے۔',
-'viewsourcetext'    => 'آپ صر� مسود� دیکھ سکتے �یں اور اسکی نقل اتار سکتے �یں:',
-'editinginterface'  => "'''انتبا�:''' آپ ایک ایسا ص�ح� مرتب کر ر�ے �یں ک� جو مصنع لطی� (سو�ٹ ویئر) کے لیۓ وجیھت (انٹر�یس) م�یا کرنے کے لیۓ استعمال کیا جاتا �ے۔ اس ص�ح� میں کی جانے والی ترمیم ، دیگر صار�وں کے لیۓ وجیھت کو تبدیل کردے گی۔",
+'error'                => 'خطاء',
+'databaseerror'        => 'خطائے ڈیٹابیس',
+'dberrortext'          => 'ڈیٹابیس کے است�سار� میں ایک خطائے نحوی واقع �وئی �ے. 
+ا�س سے مصنع‌لطی� میں کھٹمل کی نشاند�ی کا اندیش� �ے. 
+پچھلا سعی‌شد� ڈیٹابیسی است�سار� ی� تھا:
+<blockquote><tt>$1</tt></blockquote>
+�علیت میں سے "<tt>$2</tt>".
+MySQL نے خطائی جواب دیا "<tt>$3: $4</tt>".',
+'dberrortextcl'        => 'ڈیٹابیس کے است�سار� میں ایک خطائے نحوی واقع �وئی �ے. 
+پچھلا سعی‌شد� ڈیٹابیسی است�سار� ی� تھا:
+"$1"
+"$2" �علیت میں سے.
+MySQL نے جواب� خطاء دیا "$3: $4"',
+'noconnect'            => 'ب� تاس�! ویکی کو چند تکنیکی مشکلات کا سامنا �ے جس کی وج� سے ڈیٹابیسی معیل کے ساتھ رابط� ن�یں کرسکتا۔ <br />$1',
+'nodb'                 => '$1 ڈیٹابیس منتخب ن� �وسکا.',
+'cachederror'          => 'نیچے التماس شد� ص�حے کا ایک ابطن‌شد� نسخ� �ے، اور ا�س کے بتاریخی (اپ ٹو ڈیٹ) �ونے میں شک �ے.',
+'laggedslavemode'      => 'انتبا�: ممکن �ے ک� ص�ح� میں حالی� بتاریخ� جات شامل ن� �وں.
+
+Warning: Page may not contain recent updates.',
+'readonly'             => 'ڈیٹابیس مق�ل �ے',
+'enterlockreason'      => 'ق�ل کیلئے کوئی وج� درج کیجئے، بشمول� تخمین� ک� ق�ل کب کھولا جائے گا.',
+'readonlytext'         => 'ڈیٹابیس نئے اندراجات اور دوسری ترمیمات کیلئے مق�ل �ے، شاید معمول کے ڈیٹابیسی اصلاح کیلئے، جس کے بعد ی� عام حالت پر آجائے گا. 
+منتظم، جس نے ق�ل لگایا، ی� ت�صیل �را�م کی �ے:',
+'missing-article'      => 'ڈیٹابیس نے کسی ص�حے کا متن بنام "$1" $2  ن�یں پایا جو ا�سے پانا چا�ئے تھا.
+
+ی� عموماً کسی ص�حے کے تاریخی یا پرانے حذ� شد� ربط کی وج� سے �وسکتا �ے. 
+
+اگر ی� وج� ن�یں، تو آپ نے مصنع‌لطی� میں کھٹمل پایا �ے.
+برائے م�ربانی، URL کی نشاند�ی کرتے �وئے کسی [[Special:ListUsers/sysop|منتظم]] کو ا�س کا سندیس کیجئے.',
+'missingarticle-rev'   => '(نظرثانی#: $1)',
+'readonly_lag'         => 'ڈیٹابیس خودکار طور پر مق�ل �وچکا �ے تاک� ماتحت ڈیٹابیسی معیلات کا درج� آقا کا �وجائے.',
+'internalerror'        => 'خطائے اندرونی',
+'internalerror_info'   => 'خطائے اندرونی: $1',
+'filecopyerror'        => '"$1" مسل کو "$2" کی طر� نقل ن�یں کیا جاسکا.',
+'filerenameerror'      => 'مسل "$1" کو "$2" میں بازنام ن�یں کیا جاسکا.',
+'filedeleteerror'      => 'مسل "$1" کو حذ� ن�یں کیا جاسکا.',
+'directorycreateerror' => 'ر�نامچ� "$1" تخلیق ن�یں کیا جاسکا.',
+'filenotfound'         => 'مسل "$1" ڈھونڈا ن� جاسکا.',
+'fileexistserror'      => 'مسل "$1" کو لکھنے سے قاصر، مسل پ�لے سے موجود',
+'unexpected'           => 'غیرمتوقع قدر: "$1"="$2"',
+'formerror'            => 'خطا: ورق� بھیجا ن� جاسکا.',
+'badarticleerror'      => 'اس ص�ح� پر ی� عمل انجام ن�یں دیا جاسکتا۔',
+'cannotdelete'         => 'ص�ح� یا م�لَ� کو حذ� ن�یں کیا جا سکا۔ (�وسکتا �ے ک� اسے پ�لے �ی کسی نے حذ� کردیا�و۔)',
+'badtitle'             => 'خراب عنوان',
+'badtitletext'         => 'درخواست شد� ص�ح� کا عنوان ناقص، خالی، یا کوئی غلط ربط شد� بین لسانی یا بین ویکی عنوان �ے.
+شاید ا�س میں ایک یا زیاد� ایسے حرو� موجود �وں جو عنوانات میں استعمال ن�یں �وسکتے.',
+'perfcached'           => 'ذیلی ڈیٹا ابطن شد� �ے اور ا�س کے پ�رانے �ونے کا امکان �ے.',
+'perfcachedts'         => 'ذیلی ڈیٹا ابطن شد� �ے اور آخری بار ا�س کی بتاریخیت $1 کو �وئی.',
+'querypage-no-updates' => 'ا�س ص�ح� کیلئے بتاریخات �ی الحال ناقابل بنائی گئی �یں. 
+ی�اں کا ڈیٹا ابھی تاز� ن�یں کیا جائے گا.',
+'viewsource'           => 'مسود�',
+'viewsourcefor'        => 'براۓ $1',
+'actionthrottledtext'  => 'بطور� ایک ضدسپم تدبیر، آپ کو مختصر وقت میں کئی بار ی� عمل بجا لانے سے محدود کیا گیا، اور آپ ی� حد پار کرچکے �یں.
+برا�� کرم، کچھ منٹ بعد کوشش کیجئے.',
+'protectedpagetext'    => 'اس ص�ح� کو تدوین سے مح�وظ رکھنے کیلیے مق�ل کر دیا گیا �ے۔',
+'viewsourcetext'       => 'آپ صر� مسود� دیکھ سکتے �یں اور اسکی نقل اتار سکتے �یں:',
+'protectedinterface'   => 'ی� ص�ح� مصنع‌لطی� کیلئے سطح‌البینی متن �را�م کرتا �ے، اور ناجائزاستعمال کے سد�باب کیلئے ا�سے مق�ل کیا گیا �ے.',
+'editinginterface'     => "'''انتبا�:''' آپ ایک ایسا ص�ح� تدوین کر ر�ے �یں جو مصنع‌لطی� کیلئے سطح‌البینی متن �را�م کرتا �ے۔ اس ص�ح� میں کی جانے والی ترمیم، دیگر صار�ین کیلئے سطح‌البین کو تبدیل کردے گی۔
+برا�� کرم، ترجم� کیلئے [http://translatewiki.net/wiki/Main_Page?setlang=en '''بیٹاویکی'''] (میڈیاویکی مقامیانی منصوب�) استعمال کیجئے.",
+'sqlhidden'            => '(SQL است�سار� پوشید�)',
+'cascadeprotected'     => 'This page has been protected from editing, because it is included in the following {{PLURAL:$1|page, which is|pages, which are}} protected with the "cascading" option turned on:
+$2',
+'namespaceprotected'   => "آپ کو '''$1''' �ضائے نام میں ص�حات تدوین کرنے کی ا�جازت ن�یں �ے.",
+'customcssjsprotected' => 'آب کو ا�س ص�ح� کی تدوین کی ا�جازت ن�یں �ے، کیونک� ا�س میں دوسرے صار� کی ذاتی ترتیبات موجود �یں.',
+'ns-specialprotected'  => 'خاص ص�حات کی تدوین ن�یں کی جاسکتی.',
+'titleprotected'       => 'This title has been protected from creation by [[User:$1|$1]].
+The reason given is "\'\'$2\'\'".',
+
+# Virus scanner
+'virus-badscanner'     => "خراب وضعیت: انجان وائرسی م�راس: ''$1''",
+'virus-scanfailed'     => 'ت�ریس ناکام (رمز $1)',
+'virus-unknownscanner' => 'انجان ضدوائرس:',
 
 # Login and logout pages
 'logouttitle'                => 'اخراج صار�',
-'logouttext'                 => '<strong>اب آپ خارج �وچکے �یں</strong><br />
-آپ خ�ی الاسم {{SITENAME}}  کا استعمال جاری رکھ سکتے �یں، یا دوبار� اسی نام یا مختل� نام سے داخل بھی �و سکتے �یں۔  ی� یاد آوری کرلیجیۓ ک� کچھ ص�حات ایسے نظر آتے ر�یں گے ک� جیسے ابھی آپ خارج ن�یں �وۓ ، جب تک آپ اپنے ت�صح� (براؤزر) کا ابطن (cache) صا� ن� کردیں۔',
+'logouttext'                 => "'''اب آپ خارج �وچکے �یں'''<br />
+آپ خ�ی الاسم {{SITENAME}}  کا استعمال جاری رکھ سکتے �یں، یا دوبار� اسی نام یا مختل� نام سے داخل بھی �و سکتے �یں۔  ی� یاد آوری کرلیجیۓ ک� کچھ ص�حات ایسے نظر آتے ر�یں گے ک� جیسے ابھی آپ خارج ن�یں �وۓ ، جب تک آپ اپنے ت�صح� (براؤزر) کا ابطن (cache) صا� ن� کردیں۔",
 'welcomecreation'            => '== خوش آمدید، $1 ! ==
 آپ کا کھات� بنا دیا گیا �ے۔ اپنی ویـکـیـپـیـڈ یـا کی ترجیحات تبدیل کرنا مت بھولیں۔',
 'loginpagetitle'             => 'داخل� صار�',
@@ -204,57 +322,89 @@ $messages = array(
 'yourpasswordagain'          => 'کلمۂ شناخت دوبار� لکھیں',
 'remembermypassword'         => 'مجھے یاد رکھیں',
 'yourdomainname'             => 'آپکا ڈومین',
-'loginproblem'               => '<b>داخلے میں کوئی مسل� درپیش �ے</b><br />دوبار� اندراج کیجیۓ!',
+'externaldberror'            => 'یا تو توثیقی ڈیٹابیس میں خطا واقع �وئی اور یا آپ کو بیرونی کھات� بتاریخ کرنے کی ا�جازت ن�یں �ے.',
 'login'                      => 'داخل �وں',
-'nav-login-createaccount'    => 'کھات� بنائیں یا اندراج کریں',
+'nav-login-createaccount'    => 'کھات� کھولیں یا اندراج کریں',
 'loginprompt'                => '{{SITENAME}} میں داخلے کیلۓ آپکے پاس قند (کوکیز) مجاز�وناچا�یں۔',
-'userlogin'                  => 'کھات� بنائیں یا اندراج کریں',
+'userlogin'                  => 'کھات� کھولیں یا اندراج کریں',
 'logout'                     => 'اخراج',
 'userlogout'                 => 'خارج �وجائیں',
+'notloggedin'                => 'داخل� ن�یں �وا',
 'nologin'                    => 'کیا آپ نے کھات� ن�یں بنایا �وا؟ $1۔',
 'nologinlink'                => 'کھاتا بنائیں',
-'createaccount'              => 'نیا کھات� بنائیں',
-'gotaccountlink'             => 'داخل',
+'createaccount'              => 'کھات� کھولیں',
+'gotaccount'                 => 'پ�لے سے کھات� بنا �وا �ے? $1.',
+'gotaccountlink'             => 'داخل �وجائیے',
 'createaccountmail'          => 'بذریعۂ برقی ڈاک',
 'badretype'                  => 'درج شد� کلمۂ شناخت اصل سے مطابقت ن�یں رکھتا۔',
 'userexists'                 => 'آپ نےجونام درج کیا �ے پ�لے سے زیراستعمال �ے۔ مختل� نام استعمال کریں۔',
 'youremail'                  => '٭ برقی خط',
 'username'                   => 'اسم صار�',
 'uid'                        => 'صار� نمبر:',
+'prefs-memberingroups'       => '{{PLURAL:$1|گرو�|گرو�وں}} کا ر�کن:',
 'yourrealname'               => '* اصلی نام',
 'yourlanguage'               => 'زبان:',
-'yournick'                   => 'لقب',
+'yourvariant'                => 'متغیّر:',
+'yournick'                   => 'دستخط',
+'badsig'                     => 'ناقص خام دستخط.
+HTML tags جانچئے.',
+'badsiglength'               => 'آپ کا دستخط کا�ی طویل �ے.
+ی� $1 {{PLURAL:$1|حر�|حرو�}} سے زیاد� ن�یں �ونا چا�ئے.',
 'email'                      => 'برقی خط',
+'prefs-help-realname'        => 'حقیقی نام اختیاری �ے. 
+اگر آپ ا�سے م�یّا کرتے �یں، تو ا�سے آپ کے کام کیلئے آپ کو انتساب دینے کیلئے استعمال کیا جائے گا.',
 'loginerror'                 => 'داخلے میں غلطی',
+'prefs-help-email'           => 'برقی ڈاک کا پت� اختیاری �ے، لیکن ی� ا�س وقت م�ید ثابت �وسکتا �ے جب آپ اپنا کلمۂ شناخت بھول جائیں. 
+آپ ی� بھی منتخب کرسکتے �یں ک� دوسرے صار�ین، آپ کی شناخت کو ا�شا کئے بغیر، آپ کے تبادلۂ خیال ص�ح� پر آپ سے رابط� کریں.',
+'prefs-help-email-required'  => 'برقی ڈاک پت� چا�ئے.',
+'nocookiesnew'               => 'کھاتۂ صار� بنادیا گیا �ے، لیکن آپ کا داخل� ن�یں �وا. 
+صار�ین کے داخل� کیلئے {{SITENAME}} کوکیز استعمال کرتا �ے.
+آپ کے �اں کوکیز غیر �عال �یں.
+برا�� کرم، ان�یں �عال کیجئے، اور پھر اپنے نئے اسم� صار� اور کلمۂ شناخت کے ساتھ داخل �وجائیے.',
+'nocookieslogin'             => 'صار�ین کے داخل �ونے کیلئے {{SITENAME}} کوکیز استعمال کرتا �ے.
+آپ کے �اں کوکیز غیر �عال �یں.
+ان�یں �عال کرنے کے بعد پھر کوشش کیجئے.',
+'noname'                     => 'آپ نے صحیح اسم صار� ن�یں چنا.',
 'loginsuccesstitle'          => 'داخل� کامیاب',
 'loginsuccess'               => "'''اب آپ {{SITENAME}} میں بنام \"\$1\" داخل �وچکے �یں۔'''",
 'nosuchuser'                 => '"$1" کے نام سے کوئی صار� موجود ن�یں۔  براۓکرم �جوں کے درست اندراج کی تصدیق کرلیجیۓ ، یا آپ چا�یں تو نیا کھاتا بھی بنا سکتے �یں۔',
+'nosuchusershort'            => '"<nowiki>$1</nowiki>" کے نام سے کوئی صار� موجود ن�یں.
+اپنا �ج� جانچئے.',
+'nouserspecified'            => 'آپ کو ایک اسم� صار� مخصوص کرنا �ے.',
 'wrongpassword'              => 'آپ نے غلط کلمۂ شناخت درج کیا �ے۔ دوبار� کو شش کریں۔',
 'wrongpasswordempty'         => 'کلمۂ شناخت ندارد۔ دوبار� کوشش کریں۔',
 'passwordtooshort'           => 'آپکا منتخب کرد� کلمۂ شناخت ب�ت مختصر �ے۔ اسے کم از کم $1 حرو� پر مشتمل �ونا چا�یۓ۔',
 'mailmypassword'             => 'کلمۂ شناخت بذریع� برقی خط',
+'passwordremindertitle'      => 'نیا عارضی کلمۂ شناخت برائے {{SITENAME}}',
+'noemail'                    => 'صار� "$1" کیلئے کوئی برقی پت� درج ن�یں کیا گیا.',
 'passwordsent'               => 'ایک نیا کلمۂ شناخت "$1" کے نام سے بننے والی برقی ڈاک کے پتے کیلیے بھیج دیا گیا �ے۔ 
 جب و� موصول �و جاۓ تو برا� کرم اسکے ذریعے دوبار� داخل �وں۔',
+'blocked-mailpassword'       => 'آپ کا آئی.پی پت� تدوین سے روک لیا گیا �ے، سو، ناجائز استعمال کو روکنے کیلئے، آپ کے آئی.پی پت� کو کلمۂ شناخت کی بحالی کا �عل استعمال کرنے کی ا�جازت ن�یں �ے.',
 'mailerror'                  => 'مسل� دوران ترسیل خط:$1',
 'acct_creation_throttle_hit' => 'عرض معذرت، چونک� آپ پ�لے �ی $1 کھاتے بنا چکے �یں اس لیے مزید ن�یں بنا سکتے۔',
 'emailauthenticated'         => 'آپ کے برقی خط کے پتے کی تصدیق $1 کو کی گئی۔',
 'accountcreated'             => 'تخلیق� کھات�',
 'accountcreatedtext'         => 'تخیلق� کھاتۂ صار� براۓ $1۔',
 
+# Password reset dialog
+'oldpassword' => 'پرانا کلمۂ شناخت:',
+'newpassword' => 'نیا کلمۂ شناخت',
+'retypenew'   => 'نیا کلمۂ شناخت دوبار� درج کریں:',
+
 # Edit page toolbar
 'headline_sample' => 'ش� سرخی',
 'headline_tip'    => 'ش� سرخی درج� دوم',
 
 # Edit pages
-'summary'              => 'خلاص�',
-'subject'              => 'مضمون/ش� سرخی',
+'summary'              => 'خلاص�:',
+'subject'              => 'مضمون/ش� سرخی:',
 'minoredit'            => 'معمولی ترمیم',
 'watchthis'            => 'ی� ص�ح� زیر نظر کیجیۓ',
 'savearticle'          => 'مح�وظ',
 'preview'              => 'نمائش',
 'showpreview'          => 'نمائش',
 'anoneditwarning'      => 'آپ {{SITENAME}} میں داخل ن�یں �وۓ ل�ذا آپکا IP پت� اس ص�ح� کے تاریخچ� ء ترمیم میں مح�وظ �وجاۓ گا۔',
-'summary-preview'      => 'نمائش خلاص�',
+'summary-preview'      => 'نمائش خلاص�:',
 'whitelistedittext'    => 'ترمیم و تدوین کے لیۓ آپکا [[Special:UserLogin|داخل �ونا]] لا زمی �ے۔',
 'loginreqtitle'        => 'داخل� / اندراج لازم',
 'loginreqlink'         => 'داخل�',
@@ -263,14 +413,14 @@ $messages = array(
 'newarticle'           => '(نیا)',
 'newarticletext'       => 'آپ ایک ایسے ص�حے کے ربط تک آگۓ �یں جو ابھی موجود ن�یں۔ اگر آپ اس عنوان سے ص�ح� بنانا چا�تے �یں تو اپنا مضمون نیچے دیۓ گۓ احاط� میں تحریر کیجیۓ اور مح�وظ کردیجیۓ (مزید معلومات کیلیۓ معاونت کا ص�ح� ملاحظ� کیجیۓ)۔ اگر آپ غلطی سے ی�اں پ�نچے �یں تو واپسی کے لیۓ اپنے تص�ح� (براؤزر) کا بیک بٹن ٹک کیجیۓ۔',
 'anontalkpagetext'     => "----''ی� ص�ح� ایک ایسے صار� کا �ے جن�وں نے یا تو اب تک اپنا کھاتا ن�یں بنایا یا پھر و� اسے استعمال ن�یں کر ر�ے/ ر�ی �یں۔ ل�ذا �میں انکی شناخت کے لیۓ ایک اعدادی آئی پی پت� استعمال کرنا پڑر�ا �ے۔ اس قسم کا آئی پی ایک سے زائد صار�ین کے لیۓ مشترک بھی �وسکتا �ے۔ اگر آپکی موجود� حیثیت ایک گمنام صار� کی �ے اور آپ محسوس کریں ک� اس ص�ح� پر آپکی جانب منسوب ی� بیان غیرضروری �ے تو برا� کرم [[Special:UserLogin|کھاتا بنائیے یا داخل نوشت� (لاگ ان) �وں]] تاک� مستقبل میں آپکو، گمنام صار�ین میں شمار کرنے سے پر�یز کیا جاسکے۔\"",
-'note'                 => '<strong>نوٹ:</strong>',
-'previewnote'          => '<strong>یاد رکھیں، ی� صر� نمائش �ے ۔آپ کی ترامیم ابھی مح�وظ ن�یں کی گئیں۔</strong>',
+'note'                 => "'''نوٹ:'''",
+'previewnote'          => "'''یاد رکھیں، ی� صر� نمائش �ے ۔آپ کی ترامیم ابھی مح�وظ ن�یں کی گئیں۔'''",
 'editing'              => 'آپ "$1" میں ترمیم کر ر�ے �یں۔',
 'editingsection'       => '$1 کے قطع� کی تدوین',
 'editingcomment'       => 'زیرترمیم $1 (تبصر�)',
 'editconflict'         => 'تنازع� ترمیم:$1',
 'yourtext'             => 'آپ کی تحریر',
-'editingold'           => '<strong>انتبا�: آپ اس ص�حے کا ایک پرانا مسود� مرتب کرر�ے �یں۔ اگر آپ اسے مح�وظ کرتے �یں تو اس ص�حے کے اس پرانے مسودے سے اب تک کی جانے والی تمام تدوین ضائع �و جاۓ گی۔</strong>',
+'editingold'           => "'''انتبا�: آپ اس ص�حے کا ایک پرانا مسود� مرتب کرر�ے �یں۔ اگر آپ اسے مح�وظ کرتے �یں تو اس ص�حے کے اس پرانے مسودے سے اب تک کی جانے والی تمام تدوین ضائع �و جاۓ گی۔'''",
 'yourdiff'             => 'تضادات',
 'copyrightwarning'     => "ی� یادآوری کرلیجیۓ ک� {{SITENAME}} میں تمام تحریری شراکت جی این یو آزاد مسوداتی اجاز� ($2)کے تحت تصور کی جاتی �ے (مزید ت�صیل کیلیۓ $1 دیکھیۓ)۔ اگر آپ اس بات سے مت�ق ن�یں ک� آپکی تحریر میں ترمیمات کری جائیں اور اسے آزادان� (جیسے ضرورت �و) استعمال کیا جاۓ تو براۓ کرم اپنی تصانی� ی�اں داخل ن� کیجیۓ۔ اگر آپ ی�اں اپنی تحریر جمع کراتے �یں تو آپ اس بات کا بھی اقرار کر ر�ے �یں ک�، اسے آپ نے خود تصنی� کیا �ے یا دائر� ءعام (پبلک ڈومین) سے حاصل کیا �ے یا اس جیسے کسی اور آذاد وسیل� سے۔'''بلااجازت ایسا کام داخل ن� کیجیۓ جسکا حق �طبع و نشر مح�وظ �و!'''",
 'templatesused'        => 'اس ص�حے پر استعمال �ونے والے سانچے:',
@@ -307,6 +457,7 @@ $messages = array(
 'prevn'                 => 'Ù¾Ú†Ú¾Ù„Û’ $1',
 'nextn'                 => 'اگلے $1',
 'viewprevnext'          => 'دیکھیں($1) ($2) ($3)۔',
+'searchhelp-url'        => 'Help:��رست',
 'powersearch'           => 'تلاش کریں',
 
 # Preferences page
@@ -319,9 +470,6 @@ $messages = array(
 'prefs-rc'          => 'حالی� تبدیلیاں',
 'prefs-misc'        => 'دیگر',
 'saveprefs'         => 'مح�وظ',
-'oldpassword'       => 'پرانا کلمۂ شناخت:',
-'newpassword'       => 'نیا کلمۂ شناخت',
-'retypenew'         => 'نیا کلمۂ شناخت دوبار� درج کریں:',
 'rows'              => 'قـطاریں:',
 'searchresultshead' => 'تلاش',
 'savedprefs'        => 'آپ کی ترجی�ات مح�وظ کر لی گئی �یں۔',
@@ -380,7 +528,7 @@ $messages = array(
  
 جب کوئی صار� مستقل ایسی مل� زبراثقال کرتا ر�ے ک� جس کے اجاز� کے بارے میں غلط بیانی کی گئی �و یا و� مستقل ایسے عکس زبراثقال کرتا ر�ے ک� جنکے بارے میں کوئی بیان تحریر ن� کیا گیا �و تو ایسی صورت میں پابندی لگاۓ جانے کا قوی امکان موجود �ے۔ 
 
-م�لَ� (�ائل) بھیجنے کیلیے درج ذیل ورق� (�ارم) استعمال کیجیے، اگر آپ اب تک ارسال کرد� تصاویر کو دیکھنا یا تلاش کرنا چا�تے �یں تو [[Special:ImageList|ارسال کرد� تصاویر]] کے ربط پر جائیے۔ <br /> تمام ارسال و حذ� کی گئی تصاویر کو [[Special:Log/upload|نوشتۂ منتقلی]] میں درج کر لیا جاتا �ے۔
+م�لَ� (�ائل) بھیجنے کیلیے درج ذیل ورق� (�ارم) استعمال کیجیے، اگر آپ اب تک ارسال کرد� تصاویر کو دیکھنا یا تلاش کرنا چا�تے �یں تو [[Special:FileList|ارسال کرد� تصاویر]] کے ربط پر جائیے۔ <br /> تمام ارسال و حذ� کی گئی تصاویر کو [[Special:Log/upload|نوشتۂ منتقلی]] میں درج کر لیا جاتا �ے۔
 
 تصویر کی منتقلی کے بعد، اسکو کسی ص�ح� پر رکھنے کیلیے مندرج� ذیل صورت میں رمـز (کوڈ) استعمال کیجیۓ۔
 
@@ -400,7 +548,7 @@ $messages = array(
 'ignorewarning'     => 'انتبا� نظرانداز کرتے �وۓ ب�رصورت مل� (�ائل) کو مح�وظ کرلیا جاۓ۔',
 'ignorewarnings'    => '�ر انتبا� نظرانداز کردیا جاۓ۔',
 'badfilename'       => 'مل� (�ائل) کا نام "$1" ، تبدیل کردیا گیا۔',
-'fileexists'        => 'اس نام سے ایک مل� (�ائل) پ�لے �ی موجود �ے، اگر آپ کو یقین ن� �و ک� اسے حذ� کردیا جانا چا�یۓ تو برا� کرم  <strong><tt>$1</tt></strong> کو ایک نظر دیکھ لیجیۓ۔',
+'fileexists'        => "اس نام سے ایک مل� (�ائل) پ�لے �ی موجود �ے، اگر آپ کو یقین ن� �و ک� اسے حذ� کردیا جانا چا�یۓ تو برا� کرم  '''<tt>$1</tt>''' کو ایک نظر دیکھ لیجیۓ۔",
 'uploadwarning'     => 'انتبا� ب� سلسلۂ زبراثقال',
 'savefile'          => '�ائل مح�وظ کریں',
 'uploadedimage'     => 'زبراثقال (اپ لوڈ) براۓ "[[$1]]"',
@@ -408,10 +556,10 @@ $messages = array(
 'destfilename'      => 'تعین شد� اسم مل�:',
 'watchthisupload'   => 'ی� ص�ح� زیر نظر کیجیۓ',
 
-# Special:ImageList
-'imagelist' => '��رست �ائل',
+# Special:ListFiles
+'listfiles' => '��رست �ائل',
 
-# Image description page
+# File description page
 'imagelinks'     => 'روابط',
 'linkstoimage'   => 'اس مل� (�ائل) سے درج ذیل ص�حات رابط� رکھتے �یں:',
 'nolinkstoimage' => 'ایسے کوئی ص�حات ن�یں جو اس مل� (�ائل) سے رابط� رکھتے �وں۔',
@@ -429,13 +577,8 @@ $messages = array(
 'randompage' => 'بےترتیب ص�ح�',
 
 # Statistics
-'statistics'    => 'اعداد و شمار',
-'sitestats'     => '{{SITENAME}} کے اعدادوشمار',
-'userstats'     => 'ارکان کے اعداد و شمار',
-'sitestatstext' => "{{SITENAME}}ا کے ذخیرے میں اب تک کل  '''$1''' ص�حات �یں۔ انمیں تبادل�ءخیال ص�حات ، {{SITENAME}}ا کے بارے میں ص�حات ، سٹب ص�حات ، پلٹائے گۓ ص�حات اور چند دیگر ایسے ص�حات شامل �یں جو ک� ممکن� طور پر مقالات یا مضامین ن�یں ک�ے جاسکتے۔ ان تمام کو نکال کر  '''$2''' ایسے ص�حات �یں جو ک� بجاطور پر مقالات کے زمرے میں شامل کیۓ جاسکتے �یں۔ 
-
-اگر ص�حات کے تناسب سے دیکھا جاۓ تو ، {{SITENAME}}ا کی ابتداء سے اب تک کل '''$4''' ص�حات صار�ین کی جانب سے  مرتب کیۓ گۓ۔ گویا �ی ص�ح� '''$5''' بار تدوین �وئی۔",
-'userstatstext' => "{{SITENAME}} میں '''$1''' مـثـبوت (رجسٹرڈ) صار� �یں ، جنمیں  '''$2''' (یعنی '''$4%''') منتظمین میں شامل �یں ، (دیکھیۓ $3) ۔",
+'statistics'              => 'اعداد و شمار',
+'statistics-header-users' => 'ارکان کے اعداد و شمار',
 
 'disambiguations' => 'ضد اب�ام ص�حات',
 
@@ -490,6 +633,11 @@ $messages = array(
 'categories'         => 'زمر�',
 'categoriespagetext' => 'مندرج� ذیل زمر� جات اس وکی میں موجود �یں۔',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'نوشتۂ آمد صار�',
+'newuserlogpagetext'      => 'ی� نۓ صار�وں کی آمد کا نوشت� �ے',
+'newuserlog-create-entry' => 'صار� جدید',
+
 # E-mail user
 'mailnologintext' => 'دیگر ارکان کو برقی خط ارسال کرنے کیلیۓ لازم �ے ک� آپ [[Special:UserLogin|داخل شد�]] حالت میں �وں اور آپ کی [[Special:Preferences|ترجیحات]] ایک درست برقی خط کا پتا درج �و۔',
 'emailuser'       => 'صار� کو برقی خط لکھیں',
@@ -518,30 +666,35 @@ $messages = array(
 'changed'            => 'تبدیل کردیاگیا',
 'created'            => 'بنا دیا گیا',
 
-# Delete/protect/revert
-'deletepage'          => 'ص�ح� ضائع کریں',
-'confirm'             => 'یقین',
-'excontent'           => "'$1':مواد تھا",
-'excontentauthor'     => "حذ� شد� مواد: '$1' (اور صر� '[[Special:Contributions/$2|$2]]' نے حص� ڈالا)",
-'exblank'             => 'ص�ح� خالی تھا',
-'historywarning'      => 'انتبا�: جو ص�ح� آپ حذ� کرنے جار�ے �یں اس سے ایک تاریخچ� منسلک �ے۔',
-'confirmdeletetext'   => 'آپ نے اس ص�حے کو اس سے ملحق� تاریخچ� سمیت حذ� کرنے کا اراد� کیا �ے۔ براۓ م�ربانی تصدیق کرلیجیۓ ک� آپ اس عمل کے نتائج سے بخوبی آگا� �یں، اور ی� بھی یقین کرلیجیۓ ک� آپ ایسا [[{{MediaWiki:Policy-url}}|ویکیپیڈیا کی حکمت عملی]] کے دائرے میں ر� کر کر ر�ے �یں۔',
-'actioncomplete'      => 'اقدام تکمیل کو پ�نچا',
-'deletedtext'         => '"<nowiki>$1</nowiki>" کو حذ� کر دیا گیا �ے ۔
+# Delete
+'deletepage'        => 'ص�ح� ضائع کریں',
+'confirm'           => 'یقین',
+'excontent'         => "'$1':مواد تھا",
+'excontentauthor'   => "حذ� شد� مواد: '$1' (اور صر� '[[Special:Contributions/$2|$2]]' نے حص� ڈالا)",
+'exblank'           => 'ص�ح� خالی تھا',
+'historywarning'    => 'انتبا�: جو ص�ح� آپ حذ� کرنے جار�ے �یں اس سے ایک تاریخچ� منسلک �ے۔',
+'confirmdeletetext' => 'آپ نے اس ص�حے کو اس سے ملحق� تاریخچ� سمیت حذ� کرنے کا اراد� کیا �ے۔ براۓ م�ربانی تصدیق کرلیجیۓ ک� آپ اس عمل کے نتائج سے بخوبی آگا� �یں، اور ی� بھی یقین کرلیجیۓ ک� آپ ایسا [[{{MediaWiki:Policy-url}}|ویکیپیڈیا کی حکمت عملی]] کے دائرے میں ر� کر کر ر�ے �یں۔',
+'actioncomplete'    => 'اقدام تکمیل کو پ�نچا',
+'deletedtext'       => '"<nowiki>$1</nowiki>" کو حذ� کر دیا گیا �ے ۔
 حالی� حذ� شدگی کے تاریخ نام� کیلیۓ  $2  دیکھیۓ',
-'deletedarticle'      => 'حذ� شد� "[[$1]]"',
-'dellogpage'          => 'نوشتۂ حذ� شدگی',
-'dellogpagetext'      => 'حالی� حذ� شدگی کی ��رست درج ذیل �ے۔',
-'deletionlog'         => 'نوشتۂ حذ� شدگی',
-'deletecomment'       => 'حذ� کرنے کی وج�',
-'rollback'            => 'ترمیمات سابق� حالت پرواپس',
-'rollback_short'      => 'واپس سابق� حالت',
-'rollbacklink'        => 'واپس سابق� حالت',
-'rollbackfailed'      => 'سابق� حالت پر واپسی ناکام',
-'cantrollback'        => 'تدوین ثانی کا اعاد� ن�یں کیا جاسکتا؛ کیونک� اس میں آخری بار حص� لینے والا �ی اس ص�ح� کا واحد کاتب �ے۔',
+'deletedarticle'    => 'حذ� شد� "[[$1]]"',
+'dellogpage'        => 'نوشتۂ حذ� شدگی',
+'dellogpagetext'    => 'حالی� حذ� شدگی کی ��رست درج ذیل �ے۔',
+'deletionlog'       => 'نوشتۂ حذ� شدگی',
+'deletecomment'     => 'حذ� کرنے کی وج�',
+
+# Rollback
+'rollback'       => 'ترمیمات سابق� حالت پرواپس',
+'rollback_short' => 'واپس سابق� حالت',
+'rollbacklink'   => 'واپس سابق� حالت',
+'rollbackfailed' => 'سابق� حالت پر واپسی ناکام',
+'cantrollback'   => 'تدوین ثانی کا اعاد� ن�یں کیا جاسکتا؛ کیونک� اس میں آخری بار حص� لینے والا �ی اس ص�ح� کا واحد کاتب �ے۔',
+
+# Protect
 'protectlogpage'      => 'نوشتۂ مح�وظ شدگی',
 'protectedarticle'    => '"[[$1]]" کومح�وظ کردیا',
 'unprotectedarticle'  => '"[[$1]]" کوغیر مح�وظ کیا',
+'prot_1movedto2'      => '[[$1]] بجانب [[$2]] منتقل',
 'protectcomment'      => 'مح�وظ کرنے کی وج�',
 'protect-default'     => '(طے شد�)',
 'protect-level-sysop' => 'صر� منتظمین',
@@ -569,7 +722,6 @@ $messages = array(
 
 # What links here
 'whatlinkshere' => 'ادھر کس کا جوڑ �ے',
-'linklistsub'   => '(��رست روابط)',
 'linkshere'     => 'ی�اں درج ذیل ص�حات رابط� رکھتے �یں:',
 'nolinkshere'   => 'ی�اں کسی ص�ح� کا ربط ن�یں۔',
 
@@ -634,7 +786,7 @@ $messages = array(
 'previousdiff' => '> گذشت� �رق',
 'nextdiff'     => '< اگلا �رق',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'    => 'نئی �ائلوں کی گیلری',
 'showhidebots' => '($1 بوٹ)',
 'ilsubmit'     => 'تلاش',
@@ -653,17 +805,9 @@ $messages = array(
 # Delete conflict
 'deletedwhileediting' => 'انتبا�: آپ کے ترمیم شروع کرنے کے بعد ی� ص�ح� حذ� کیا جا چکا �ے!',
 
-# HTML dump
-'redirectingto' => 'کی جانب پلٹایا گیا [[:$1]]...',
-
 # action=purge
 'confirm_purge_button' => 'جی!',
 
-# AJAX search
-'searchnamed'   => "مضمون بنام ''$1'' کیلیۓ تلاش۔",
-'articletitles' => "''$1'' سے شروع �ونے والے مضامین",
-'hideresults'   => 'نتیج� چھپائیں',
-
 # Auto-summaries
 'autosumm-blank'   => 'تمام مندرجات حذ�',
 'autoredircomment' => '[[$1]] سے رجوع مکرر',
diff --git a/languages/messages/MessagesUz.php b/languages/messages/MessagesUz.php
index d7e483f5..a01b9b0a 100644
--- a/languages/messages/MessagesUz.php
+++ b/languages/messages/MessagesUz.php
@@ -14,24 +14,22 @@ $fallback8bitEncoding = 'windows-1252';
 $linkPrefixExtension = true;
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Media',
-	NS_SPECIAL        => 'Maxsus',
-	NS_MAIN           => '',
-	NS_TALK           => 'Munozara',
-	NS_USER           => 'Foydalanuvchi',
-	NS_USER_TALK      => 'Foydalanuvchi_munozarasi',
-	# NS_PROJECT set by \$wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_munozarasi',
-	NS_IMAGE          => 'Tasvir',
-	NS_IMAGE_TALK     => 'Tasvir_munozarasi',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'MediaWiki_munozarasi',
-	NS_TEMPLATE       => 'Andoza',
-	NS_TEMPLATE_TALK  => 'Andoza_munozarasi',
-	NS_HELP           => 'Yordam',
-	NS_HELP_TALK      => 'Yordam_munozarasi',
-	NS_CATEGORY       => 'Turkum',
-	NS_CATEGORY_TALK  => 'Turkum_munozarasi',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Maxsus',
+	NS_TALK             => 'Munozara',
+	NS_USER             => 'Foydalanuvchi',
+	NS_USER_TALK        => 'Foydalanuvchi_munozarasi',
+	NS_PROJECT_TALK     => '$1_munozarasi',
+	NS_FILE             => 'Tasvir',
+	NS_FILE_TALK        => 'Tasvir_munozarasi',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_munozarasi',
+	NS_TEMPLATE         => 'Andoza',
+	NS_TEMPLATE_TALK    => 'Andoza_munozarasi',
+	NS_HELP             => 'Yordam',
+	NS_HELP_TALK        => 'Yordam_munozarasi',
+	NS_CATEGORY         => 'Turkum',
+	NS_CATEGORY_TALK    => 'Turkum_munozarasi',
 );
 	
 $namespaceAliases = array(
@@ -104,6 +102,8 @@ $messages = array(
 'category_header'        => '"$1" turkumidagi maqolalar.',
 'subcategories'          => 'Ostturkumlar',
 'category-empty'         => "''Ushbu turkumda hozircha sahifa yoki fayllar yoʻq.''",
+'category-subcat-count'  => '{{PLURAL:$2|Ushbu turkumda faqat bitta ostturkum mavjud.|Ushbu turkumda quyidagi {{PLURAL:$1|ostturkum|$1 ostturkumlar}}, hammasi boʻlib $2 ta ostturkum mavjud.}}',
+'category-article-count' => '{{PLURAL:$2|Ushbu turkumda faqat bitta sahifa mavjud.|Ushbu turkumda quyidagi {{PLURAL:$1|sahifa|$1 sahifalar}}, hammasi boʻlib $2 ta sahifa mavjud.}}',
 'listingcontinuesabbrev' => 'davomi',
 
 'linkprefix'        => '/^(.*?)([a-zA-Z\\x80-\\xffʻʼ«„]+)$/sDu',
@@ -121,10 +121,10 @@ $messages = array(
 'cancel'         => 'Voz kechish',
 'qbedit'         => 'Tahrirlash',
 'qbspecialpages' => 'Maxsus sahifalar',
-'mytalk'         => 'Mening suhbatim',
+'mytalk'         => 'Suhbatim',
 'anontalk'       => 'Bu IP uchun suhbat',
 'navigation'     => 'Saytda harakatlanish',
-'and'            => 'va',
+'and'            => '&#32;va',
 
 'errorpagetitle'   => 'Xato',
 'returnto'         => '$1 sahifasiga qaytish.',
@@ -139,6 +139,7 @@ $messages = array(
 'printableversion' => 'Bosma uchun versiya',
 'permalink'        => "Doimiy bog'",
 'edit'             => 'Tahrirlash',
+'create'           => 'Yarat',
 'editthispage'     => 'Sahifani tahrirla',
 'delete'           => "O'chirish",
 'protect'          => 'Himoyalash',
@@ -164,6 +165,7 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '{{SITENAME}} haqida',
 'aboutpage'            => 'Project:Haqida',
+'copyright'            => 'Kontent $1 ostidadir.',
 'currentevents'        => 'Joriy hodisalar',
 'currentevents-url'    => 'Project:Joriy hodisalar',
 'disclaimers'          => 'Ogohlantirishlar',
@@ -184,15 +186,17 @@ $messages = array(
 'newmessagesdifflink' => 'soʻnggi oʻzgarish',
 'editsection'         => 'tahrirlash',
 'editold'             => 'tahrir',
+'viewsourcelink'      => 'manbasini koʻr',
 'editsectionhint'     => 'Boʻlimni tahrirlash: $1',
 'toc'                 => 'Mundarija',
 'showtoc'             => "Ko'rsatish",
 'hidetoc'             => 'yashirish',
+'red-link-title'      => '$1 (sahifa yaratilmagan)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'     => 'Maqola',
 'nstab-user'     => 'Foydalanuvchi sahifasi',
-'nstab-special'  => 'Maxsus',
+'nstab-special'  => 'Maxsus sahifa',
 'nstab-project'  => 'Loyiha sahifasi',
 'nstab-image'    => 'Fayl',
 'nstab-template' => 'Andoza',
@@ -207,7 +211,7 @@ $messages = array(
 'viewsourcetext'    => "Siz bu sahifaning manbasini ko'rishingiz va uni nusxasini olishingiz mumkin:",
 
 # Login and logout pages
-'logouttext'              => "<strong>Siz saytdan muvaffaqiyatli chiqdingiz.</strong><br />
+'logouttext'              => "'''Siz saytdan muvaffaqiyatli chiqdingiz.'''<br />
 {{SITENAME}} saytidan anonim holda foydalanishda davom etishindiz mumkin. Yoki siz yana hozirgi yoki boshqa foydalanuvchi nomi bilan qaytadan tizimga kirishingiz mumkin. Shuni e'tiborga olingki, ayrim sahifalar siz brauzeringiz keshini tozalamaguningizga qadar xuddi tizimga kirganingizdagidek ko'rinishda davom etaverishi mumkin.",
 'yourname'                => 'Foydalanuvchi nomi',
 'yourpassword'            => "Maxfiy so'z",
@@ -229,6 +233,9 @@ $messages = array(
 'loginsuccess'            => "'''{{SITENAME}}ga \"\$1\" foydalanuvchi nomi bilan kirdingiz.'''",
 'wrongpassword'           => 'Kiritgan mahfiy soʻzingiz notoʻgʻri. Iltimos, qaytadan kiritib koʻring.',
 
+# Password reset dialog
+'retypenew' => 'Yangi mahfiy soʻzni qayta tering:',
+
 # Edit page toolbar
 'bold_sample'     => 'Qalin matn',
 'bold_tip'        => 'Qalin matn',
@@ -242,11 +249,11 @@ $messages = array(
 'math_sample'     => 'Formula qoʻying',
 'math_tip'        => 'Matematik formula (LaTeX)',
 'image_tip'       => 'Qoʻshilgan tasvir',
-'media_tip'       => 'Media faylga ishorat',
+'media_tip'       => 'Faylga ishorat',
 'sig_tip'         => 'Imzoingiz va sana',
 
 # Edit pages
-'summary'                => 'Qisqa izoh',
+'summary'                => 'Qisqa izoh:',
 'minoredit'              => 'Bu kichik tahrir',
 'watchthis'              => 'Sahifani kuzatish',
 'savearticle'            => 'Saqlash',
@@ -267,21 +274,21 @@ Sizning hozirgi IP manzilingiz - $3, chetlashtirish raqamingiz - #$5. Arizaga bu
 'newarticletext'         => "Bu sahifa hali mavjud emas.
 Sahifani yaratish uchun quyida matn kiritishingiz mumkin (qo'shimcha axborot uchun [[{{MediaWiki:Helppage}}|yordam sahifasini]] ko'ring).
 Agar bu sahifaga xatolik sabab kelgan bo'lsangiz brauzeringizning '''orqaga''' tugmasini bosing.",
-'noarticletext'          => "Bu sahifada hozircha hech qanday matn yo'q. Siz bu sarlavhani boshqa sahifalardan [[Special:Search/{{PAGENAME}}|qidirishingiz]] yoki bu sahifani [{{fullurl:{{FULLPAGENAME}}|action=edit}} tahrirlashingiz] mumkin.",
+'noarticletext'          => 'Bu sahifada hozircha hech qanday matn yoʻq. Siz bu sarlavhani boshqa sahifalardan [[Special:Search/{{PAGENAME}}|qidirishingiz]], <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} tegishli loglarga qarashingiz] yoki bu sahifani [{{fullurl:{{FULLPAGENAME}}|action=edit}} tahrirlashingiz]</span> mumkin.',
 'clearyourcache'         => "'''Etibor bering:''' O'zgartirishlaringiz ko'rish uchun, yangi moslamalaringizning saqlashdan keyin, brauser keshini tozalash kerak:<br />
 '''Mozilla / Firefox:''' ''Ctrl+Shift+R'', '''IE:''' ''Ctrl+F5'', '''Safari:''' ''Cmd+Shift+R'', '''Konqueror:''' ''F5'', '''Opera:''' ''Tools → Preferences'' orqali keshni tozalang.",
-'previewnote'            => "<strong>Bu shunchaki ko'rib chiqish. O'zgarishlar hali saqlangani yo'q!</strong>",
+'previewnote'            => "'''Bu shunchaki ko'rib chiqish. O'zgarishlar hali saqlangani yo'q!'''",
 'editing'                => '$1 tahrirlanmoqda',
 'editingsection'         => '$1 (boʻlim) tahrirlanmoqda',
 'copyrightwarning'       => "Iltimos, {{SITENAME}}ga yuklangan har qanday axborot $2 ostida tarqatilishiga diqqat qiling (batafsil ma'lumot uchun $1ni ko'ring).
 Agar yozganlaringiz keyinchalik tahrir qilinishi va qayta tarqatilishiga rozi bo'lmasangiz, u holda bu yerga yozmang.<br />
 Siz shuningdek bu yozganlaringiz sizniki yoki erkin litsenziya ostida ekanligini va'da qilmoqdasiz.
-<strong>MUALLIFLIK HUQUQLARI BILAN HIMOYALANGAN ISHLARNI ZINHOR BERUXSAT YUBORMANG!</strong>",
+'''MUALLIFLIK HUQUQLARI BILAN HIMOYALANGAN ISHLARNI ZINHOR BERUXSAT YUBORMANG!'''",
 'copyrightwarning2'      => "Iltimos, shuni esda tutingki, {{SITENAME}} sahifalaridagi barcha matnlar boshqa foydalanuvchilar tomonidan tahrirlanishi, almashtirilishi yoki o'chirilishi mumkin. Agar siz yozgan ma'lumotlaringizni bunday tartibda tahrirlanishiga rozi bo'lmasangiz, unda uni bu yerga joylashtirmang.<br />
 Bundan tashqari, siz ushbu ma'lumotlarni o'zingiz yozgan bo'lishingiz yoki ruxsat berilgan internet manzilidan yoki shu kabi erkin resursdan nusxa olgan bo'lishingiz lozim (Qo'shimcha ma'lumotlar ushun $1 sahifasiga murojaat qiling).
-<strong>MUALLIFLIK HUQUQI QO'YILGAN ISHLARNI RUXSATSIZ BU YERGA JOYLASHTIRMANG!</strong>",
-'longpagewarning'        => "<strong>DIQQAT: Ushbu sahifa hajmi $1 kilobaytdir; ayrim browser'lar 32 kb dan oshiq hajmli sahifalarni tahrirlashda muammolarga duch kelishi mumkin.
-Agar sizda shunday muammolar yuzaga kelsa, iltimos, sahifani butunlay emas, qismlab tahrirlang.</strong>",
+'''MUALLIFLIK HUQUQI QO'YILGAN ISHLARNI RUXSATSIZ BU YERGA JOYLASHTIRMANG!'''",
+'longpagewarning'        => "'''DIQQAT: Ushbu sahifa hajmi $1 kilobaytdir; ayrim browser'lar 32 kb dan oshiq hajmli sahifalarni tahrirlashda muammolarga duch kelishi mumkin.
+Agar sizda shunday muammolar yuzaga kelsa, iltimos, sahifani butunlay emas, qismlab tahrirlang.'''",
 'templatesused'          => 'Ushbu sahifada ishlatilgan andozalar:',
 'template-protected'     => '(himoyalangan)',
 'template-semiprotected' => '(yarim-himoyalangan)',
@@ -295,6 +302,7 @@ Qulaylik uchun quyida yoʻqotilish qaydlari keltirilgan:",
 # History pages
 'viewpagelogs'        => 'Ushbu sahifaga doir qaydlarni koʻrsat',
 'currentrev'          => 'Hozirgi koʻrinishi',
+'currentrev-asof'     => '$1dagi, joriy koʻrinishi',
 'revisionasof'        => '$1 paytdagi koʻrinishi',
 'previousrevision'    => '�Avvalgi koʻrinishi',
 'nextrevision'        => 'Yangiroq koʻrinishi→',
@@ -308,6 +316,9 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'histfirst'           => 'Eng avvalgi',
 'histlast'            => 'Eng soʻnggi',
 
+# Revision deletion
+'rev-delundel' => 'koʻrsat/yashir',
+
 # Diffs
 'history-title'           => '"$1"ning tarixi',
 'difference'              => '(Koʻrinishlar orasidagi farq)',
@@ -316,18 +327,34 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'editundo'                => 'qaytar',
 
 # Search results
-'searchresults'    => 'Qidiruv natijalari',
-'searchresulttext' => "{{SITENAME}}da qidirish haqida qo'shimcha ma'lumotga ega bo'lishini xoxlasangiz, [[{{MediaWiki:Helppage}}|{{SITENAME}}da qidiruv]] sahifasini o'qing.",
-'noexactmatch'     => "'''\"\$1\" nomli birorta ham sahifa yo'q.''' Bu sahifani [[:\$1|yaratishingiz]] mumkin.",
-'prevn'            => 'oldingi $1',
-'nextn'            => 'keyingi $1',
-'viewprevnext'     => "Ko'rish ($1) ($2) ($3).",
-'showingresults'   => "#<b>$2</b> boshlanayotgan <b>$1</b> natijalar ko'rsatilyapti.",
-'powersearch'      => 'Qidiruv',
+'searchresults'            => 'Qidiruv natijalari',
+'searchresults-title'      => '"$1" uchun qidiruv natijalari',
+'searchresulttext'         => "{{SITENAME}}da qidirish haqida qo'shimcha ma'lumotga ega bo'lishini xoxlasangiz, [[{{MediaWiki:Helppage}}|{{SITENAME}}da qidiruv]] sahifasini o'qing.",
+'searchsubtitle'           => '\'\'\'[[:$1]]\'\'\'ni qidirdingiz ([[Special:Prefixindex/$1|"$1" bilan boshlanadigan sahifalar]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|"$1"ga bogʻlangan sahifalar]])',
+'searchsubtitleinvalid'    => "'''$1'''ni qidirdingiz",
+'noexactmatch'             => "'''\"\$1\" nomli birorta ham sahifa yo'q.''' Bu sahifani [[:\$1|yaratishingiz]] mumkin.",
+'noexactmatch-nocreate'    => "'''\"\$1\" sarlavhali sahifa yoʻq.'''",
+'notitlematches'           => 'Bunday sarlavha topilmadi',
+'notextmatches'            => 'Bunday matn topilmadi',
+'prevn'                    => 'oldingi $1',
+'nextn'                    => 'keyingi $1',
+'viewprevnext'             => "Ko'rish ($1) ($2) ($3).",
+'searchhelp-url'           => 'Help:Mundarija',
+'search-result-size'       => '$1 ({{PLURAL:$2|1 soʻz|$2 soʻz}})',
+'search-redirect'          => '(yoʻnaltirish $1)',
+'search-section'           => '($1 boʻlimi)',
+'search-suggest'           => 'Balki buni nazarda tutgandirsiz: $1',
+'search-interwiki-default' => '$1 natijalar:',
+'showingresults'           => "#<b>$2</b> boshlanayotgan <b>$1</b> natijalar ko'rsatilyapti.",
+'showingresultstotal'      => "Quyida {{PLURAL:$4|'''$3'''dan '''$1''' natija|'''$3'''dan '''$1 - $2''' natijalar}} koʻrsatilgan",
+'powersearch'              => 'Qidiruv',
+'powersearch-ns'           => 'Bu nom-fazolarda izla:',
+'powersearch-redir'        => 'Yoʻnaltirishlarni koʻrsat',
+'powersearch-field'        => 'Qidir',
 
 # Preferences page
 'preferences'       => 'Moslamalar',
-'mypreferences'     => 'Mening moslamalarim',
+'mypreferences'     => 'Moslamalarim',
 'skin'              => "Tashqi ko'rinish",
 'math'              => 'Formulalar',
 'datetime'          => 'Sana va vaqt',
@@ -337,15 +364,19 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'prefs-misc'        => 'Boshqa moslamalar',
 'saveprefs'         => 'Saqlash',
 'resetprefs'        => 'Bekor qilish',
-'retypenew'         => 'Yangi mahfiy soʻzni qayta tering:',
 'textboxsize'       => 'Tahrirlash',
 'searchresultshead' => 'Qidiruv natijalari',
 'files'             => 'Fayllar',
 
+# Groups
+'group-sysop' => 'Administratorlar',
+
+'grouppage-sysop' => '{{ns:project}}:Administratorlar',
+
 # Recent changes
 'recentchanges'     => "Yangi o'zgartirishlar",
 'recentchangestext' => "Bu sahifada siz oxirgi o'zgartirishlarni ko'rishingiz mumkin.",
-'rcnote'            => "Quyida oxirgi '''$2''' kun davomida sodir bo'lgan $1 o'zgartirishlar ko'rsatilgan. ($3)",
+'rcnote'            => "Quyida $5, $4ga koʻra oxirgi {{PLURAL:$2|kun|'''$2''' kun}} davomida sodir boʻlgan {{PLURAL:$1|'''1''' oʻzgartirish|'''$1''' oʻzgartirishlar}} koʻrsatilgan.",
 'rclistfrom'        => "$1dan boshlab yangi o'zgartirishlarni ko'rsat.",
 'rcshowhideminor'   => 'Kichik tahrirlarni $1',
 'rcshowhidebots'    => 'Botlarni $1',
@@ -365,7 +396,7 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'recentchangeslinked'          => "Bog'langan o'zgarishlar",
 'recentchangeslinked-title'    => '"$1"ga aloqador oʻzgarishlar',
 'recentchangeslinked-noresult' => 'Berilgan davrda bogʻlangan sahifalarda oʻzgarishlar boʻlmagan.',
-'recentchangeslinked-summary'  => "Ushbu maxsus sahifa unga bogʻlangan sahifalardagi soʻnggi oʻzgarishlarni koʻrsatadi. Kuzatuv roʻyxatingizdagi sahifalar '''qalin''' qilib koʻrsatilgan.",
+'recentchangeslinked-summary'  => "Ushbu maxsus sahifa unga bogʻlangan sahifalardagi soʻnggi oʻzgarishlarni koʻrsatadi. [[Special:Watchlist|Kuzatuv roʻyxatingizdagi]] sahifalar '''qalin''' qilib koʻrsatilgan.",
 
 # Upload
 'upload'        => 'Fayl yuklash',
@@ -373,10 +404,10 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'uploadlogpage' => 'Yuklash qaydlari',
 'uploadedimage' => '"[[$1]]" yuklandi',
 
-# Special:ImageList
-'imagelist' => 'Fayllar roʻyxati',
+# Special:ListFiles
+'listfiles' => 'Fayllar roʻyxati',
 
-# Image description page
+# File description page
 'filehist'                  => 'Fayl tarixi',
 'filehist-help'             => 'Faylning biror paytdagi holatini koʻrish uchun tegishli sana/vaqtga bosingiz.',
 'filehist-current'          => 'joriy',
@@ -385,10 +416,11 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'filehist-dimensions'       => 'Oʻlchamlari',
 'filehist-filesize'         => 'Fayl hajmi',
 'filehist-comment'          => 'Izoh',
-'imagelinks'                => 'Ishoratlar',
-'linkstoimage'              => 'Bu faylga quyidagi sahifalar bogʻlangan:',
+'imagelinks'                => 'Fayllarga ishoratlar',
+'linkstoimage'              => 'Bu faylga quyidagi {{PLURAL:$1|sahifa|$1 sahifalar}} bogʻlangan:',
 'nolinkstoimage'            => 'Bu faylga bogʻlangan sahifalar yoʻq.',
 'sharedupload'              => 'Ushbu fayl umumiy joyga yuklangandir va boshqa loyihalarda ishlatilishi mumkin.',
+'shareduploadwiki-linktext' => 'fayl haqida sahifa',
 'uploadnewversion-linktext' => 'Bu faylning yangi versiyasini yukla',
 
 # Unused templates
@@ -398,20 +430,8 @@ Bu yerda: (joriy) = hozirgi koʻrinish bilan farq,
 'randompage' => 'Tasodifiy sahifa',
 
 # Statistics
-'statistics'    => 'Statistika',
-'sitestats'     => '{{SITENAME}} statistikasi',
-'userstats'     => 'Foydalanuvchilar statistikasi',
-'sitestatstext' => "Maʼlumotlar omborida jami {{PLURAL:\$1|'''1''' sahifa|'''\$1''' sahifa}} mavjud.
-Bularga maqola boʻlmagan \"munozara\" sahifalari, {{SITENAME}} haqidagi, ishoratsiz, yoʻnaltiruvchi va hokazo sahifalar kiradi.
-\"Maqola\" deb hisoblanuvchi sahifalar soni esa {{PLURAL:\$2|'''1''' donadir|'''\$2''' donadir}}.
-
-'''\$8''' {{PLURAL:\$8|dona fayl|fayllar}} yuklangan.
-
-{{SITENAME}} ochilganidan beri jami '''\$3''' {{PLURAL:\$3|sahifa|sahifalar}} koʻrilgan va '''\$4''' {{PLURAL:\$4|sahifa|sahifalar}} tahrirlangan.
-Bu bir sahifaga '''\$5''' tahrir va '''\$6''' koʻrish mos kelishini bildiradi.
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue Navbatdagi vazifalar] soni - '''\$7'''.",
-'userstatstext' => "Hozirda {{PLURAL:$1|'''1''' [[Special:ListUsers|foydalanuvchi]]|'''$1''' [[Special:ListUsers|foydalanuvchi]]}} roʻyxatdan oʻtgan, ulardan '''$2''' nafari (yoki '''$4%''') $5 huquqlariga egadir.",
+'statistics'              => 'Statistika',
+'statistics-header-users' => 'Foydalanuvchilar statistikasi',
 
 'disambiguationspage' => '{{ns:template}}:Disambig',
 
@@ -431,11 +451,12 @@ Bu bir sahifaga '''\$5''' tahrir va '''\$6''' koʻrish mos kelishini bildiradi.
 'newpages'                => 'Yangi sahifalar',
 'move'                    => "Ko'chirish",
 'movethispage'            => 'Bu sahifani koʻchir',
+'pager-newer-n'           => '{{PLURAL:$1|yangiroq 1|yangiroq $1}}',
+'pager-older-n'           => '{{PLURAL:$1|eskiroq 1|eskiroq $1}}',
 
 # Special:Log
-'log'               => 'Qaydlar',
-'all-logs-page'     => 'Barcha qaydlar',
-'log-search-submit' => "O'tish",
+'log'           => 'Qaydlar',
+'all-logs-page' => 'Barcha qaydlar',
 
 # Special:AllPages
 'allpages'       => 'Barcha sahifalar',
@@ -452,30 +473,30 @@ Bu bir sahifaga '''\$5''' tahrir va '''\$6''' koʻrish mos kelishini bildiradi.
 'categories'         => 'Turkumlar',
 'categoriespagetext' => 'Ushbu turkumlarda sahifa yoki fayllar mavjud.',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Yangi foydalanuvchi',
+
 # E-mail user
 'emailuser' => 'Bu foydalanuvchiga e-maktub joʻnat',
 
 # Watchlist
-'watchlist'            => "Mening kuzatuv ro'yxatim",
-'mywatchlist'          => "Mening kuzatuv ro'yxatim",
-'watchlistfor'         => "('''$1''' uchun)",
-'nowatchlist'          => "Kuzatuv ro'yxatingizda hech narsa yo'q.",
-'addedwatch'           => "Kuzatuv ro'yxatiga qo'shildi",
-'addedwatchtext'       => "\"[[:\$1]]\" sahifasi sizning [[Special:Watchlist|kuzatuv ro'yxatingizga]] qo'shildi. Bu sahifada va unga mos munozara sahifasida bo'ladigan kelajakdagi o'zgarishlar bu yerda ro'yxatga olinadi, hamda bu sahifa topish qulay bo'lishi uchun [[Special:RecentChanges|yangi o'zgarishlar ro'yxati]]da '''qalin''' harflar bilan ko'rsatiladi.
+'watchlist'        => 'Kuzatuv roʻyxatim',
+'mywatchlist'      => 'Kuzatuv roʻyxatim',
+'watchlistfor'     => "('''$1''' uchun)",
+'nowatchlist'      => "Kuzatuv ro'yxatingizda hech narsa yo'q.",
+'addedwatch'       => "Kuzatuv ro'yxatiga qo'shildi",
+'addedwatchtext'   => "\"[[:\$1]]\" sahifasi sizning [[Special:Watchlist|kuzatuv ro'yxatingizga]] qo'shildi. Bu sahifada va unga mos munozara sahifasida bo'ladigan kelajakdagi o'zgarishlar bu yerda ro'yxatga olinadi, hamda bu sahifa topish qulay bo'lishi uchun [[Special:RecentChanges|yangi o'zgarishlar ro'yxati]]da '''qalin''' harflar bilan ko'rsatiladi.
 
 Agar siz bu sahifani kuzatuv ro'yxatingizdan o'chirmoqchi bo'lsangiz \"Kuzatmaslik\" yozuvini bosing.",
-'removedwatch'         => "Kuzatuv ro'yxatidan o'chirildi",
-'removedwatchtext'     => '"[[:$1]]" sahifasi kuzatuv ro\'yxatingizdan o\'chirildi.',
-'watch'                => 'kuzatish',
-'watchthispage'        => 'Sahifani kuzatish',
-'unwatch'              => 'kuzatmaslik',
-'wlnote'               => "Pastda oxirgi '''$2''' soatda sodir bo'lgan $1 o'zgartirishlar ko'rsatilgan.",
-'wlshowlast'           => "Oxirgi $1 soatdagi $2 kundagi tahrirlarni ko'rsatish. $3 tahrirlarni ko'rsatish",
-'watchlist-hide-bots'  => 'Bot tahrirlarini yashir',
-'watchlist-hide-own'   => 'Tahrirlarimni yashir',
-'watchlist-hide-minor' => 'Kichkina tahrirlarni yashir',
-
-# Delete/protect/revert
+'removedwatch'     => "Kuzatuv ro'yxatidan o'chirildi",
+'removedwatchtext' => '"[[:$1]]" sahifasi kuzatuv ro\'yxatingizdan o\'chirildi.',
+'watch'            => 'kuzatish',
+'watchthispage'    => 'Sahifani kuzatish',
+'unwatch'          => 'kuzatmaslik',
+'wlnote'           => "Pastda oxirgi '''$2''' soatda sodir bo'lgan $1 o'zgartirishlar ko'rsatilgan.",
+'wlshowlast'       => "Oxirgi $1 soatdagi $2 kundagi tahrirlarni ko'rsatish. $3 tahrirlarni ko'rsatish",
+
+# Delete
 'actioncomplete'        => 'Bajarildi',
 'deletedtext'           => '"<nowiki>$1</nowiki>" yoʻqotildi.
 Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
@@ -484,15 +505,21 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 'deletecomment'         => "O'chirish sababi",
 'deleteotherreason'     => 'Boshqa/qoʻshimcha sabab:',
 'deletereasonotherlist' => 'Boshqa sabab',
-'rollbacklink'          => 'eski holiga keltir',
-'protectlogpage'        => 'Himoyalash qaydlari',
-'protect-level-sysop'   => 'Faqat administratorlar uchun',
+
+# Rollback
+'rollbacklink' => 'eski holiga keltir',
+
+# Protect
+'protectlogpage'         => 'Himoyalash qaydlari',
+'protect-level-sysop'    => 'Faqat administratorlar uchun',
+'protect-expiry-options' => '2 soat:2 hours,1 kun:1 day,3 kun:3 days,1 hafta:1 week,2 hafta:2 weeks,1 oy:1 month,3 oy:3 months,6 oy:6 months,1 yil:1 year,cheksiz:infinite', # display1:time1,display2:time2,...
 
 # Restrictions (nouns)
 'restriction-edit' => 'Tahrirlash',
 
 # Undelete
-'undeletebtn' => 'Qayta tikla',
+'undeletebtn'  => 'Qayta tikla',
+'undeletelink' => 'tikla',
 
 # Namespace form on various pages
 'namespace' => 'Soha:',
@@ -500,7 +527,7 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 
 # Contributions
 'contributions' => 'Foydalanuvchining hissasi',
-'mycontris'     => 'mening hissam',
+'mycontris'     => 'hissam',
 'contribsub2'   => '$1 uchun ($2)',
 
 'sp-contributions-newbies'  => 'Faqatgina yangi foydalanuvchilarning hissalarini koʻrsat',
@@ -511,8 +538,7 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 
 # What links here
 'whatlinkshere'       => "Bu sahifaga bog'langan sahifalar",
-'whatlinkshere-title' => '$1ga bogʻlangan sahifalar',
-'linklistsub'         => "(Bog'lanishlar ro'yxati)",
+'whatlinkshere-title' => '"$1"ga bogʻlangan sahifalar',
 'linkshere'           => "Quyidagi sahifalar '''[[:$1]]''' sahifasiga bog'langan:",
 'nolinkshere'         => "'''[[:$1]]''' sahifasiga hech qaysi sahifa bog'lanmagan.",
 'isredirect'          => 'yoʻnaltiruvchi sahifa',
@@ -522,7 +548,7 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 # Block/unblock
 'blockip'      => 'Foydalanuvchini chetlashtir',
 'ipboptions'   => '2 soat:2 hours,1 kun:1 day,3 kun:3 days,1 hafta:1 week,2 hafta:2 weeks,1 oy:1 month,3 oy:3 months,6 oy:6 months,1 yil:1 year,cheksiz:infinite', # display1:time1,display2:time2,...
-'ipblocklist'  => 'Chetlashtirilgan IP manzillari va foydalanuvchilar roʻyxati',
+'ipblocklist'  => 'Chetlashtirilgan IP manzillari va foydalanuvchilar',
 'blocklink'    => 'chetlashtir',
 'contribslink' => 'hissasi',
 'blocklogpage' => 'Chetlashtirish qaydlari',
@@ -535,24 +561,25 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 '1movedto2'      => "[[$1]] [[$2]]ga ko'chirildi",
 'movelogpage'    => 'Koʻchirish qaydlari',
 'movereason'     => 'Sabab:',
+'revertmove'     => 'qaytar',
 
 # Thumbnails
 'thumbnail-more' => 'Kattalashtir',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Mening foydalanuvchi sahifam',
+'tooltip-pt-userpage'             => 'Foydalanuvchi sahifangiz',
 'tooltip-pt-anonuserpage'         => 'Siznig ip manzilingiz foydalanuvchi sahifasi',
-'tooltip-pt-mytalk'               => 'Mening suhbat sahifam',
+'tooltip-pt-mytalk'               => 'Suhbat sahifangiz',
 'tooltip-pt-anontalk'             => 'Bu ip manzildan amalga oshirilgan tahrirlar munozarasi',
-'tooltip-pt-preferences'          => 'Mening moslamalarim',
+'tooltip-pt-preferences'          => 'Moslamalaringiz',
 'tooltip-pt-watchlist'            => "Siz kuzatib borayotgan sahifalar ro'yxati.",
-'tooltip-pt-mycontris'            => "Mening hissa qo'shgan sahifalarim ro'yxati",
+'tooltip-pt-mycontris'            => 'Hissalaringiz roʻyxati',
 'tooltip-pt-login'                => "Bu majburiyat bo'lmasada, kirishingiz taklif qilinadi.",
 'tooltip-pt-anonlogin'            => "Bu majburiyat bo'lmasada, kirishingiz taklif qilinadi.",
 'tooltip-pt-logout'               => 'Chiqish',
 'tooltip-ca-talk'                 => 'Sahifa matni borasida munozara',
 'tooltip-ca-edit'                 => "Siz bu sahifani tahrirlashingiz mumkin. Iltimos, saqlashdan oldim ko'rib chiqish tugmasidan foydalaning.",
-'tooltip-ca-addsection'           => "Bu munozaraga izoh qo'shish.",
+'tooltip-ca-addsection'           => 'Yangi boʻlim och',
 'tooltip-ca-viewsource'           => "Bu sahifa himoyalangan. Siz uning manbasini ko'rishingiz mumkin.",
 'tooltip-ca-history'              => 'Bu sahifaning oldingi versiyalari.',
 'tooltip-ca-protect'              => 'Bu sahifani himoyalash',
@@ -562,6 +589,8 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 'tooltip-ca-watch'                => "Bu sahifani kuzatuv ro'yxatingizga qo'shish",
 'tooltip-ca-unwatch'              => "Bu sahifani kuzatuv ro'yxatingizga o'chirish",
 'tooltip-search'                  => '{{SITENAME}}da qidirish',
+'tooltip-search-go'               => 'Xuddi shu nomli sahifa bor boʻlsa, uni och',
+'tooltip-search-fulltext'         => 'Sahifalarda shu matnni izla',
 'tooltip-p-logo'                  => 'Bosh sahifa',
 'tooltip-n-mainpage'              => "Bosh sahifaga o'tish",
 'tooltip-n-portal'                => 'Loyiha haqida, nimalar qilishingiz mumkin, nimalarni qayerdan topish mumkin',
@@ -577,6 +606,8 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 'tooltip-t-emailuser'             => "Bu foydalanuvchiga xat jo'natish",
 'tooltip-t-upload'                => 'Rasmlar yoki media fayllar yuklash',
 'tooltip-t-specialpages'          => "Maxsus sahifalar ro'yxati",
+'tooltip-t-print'                 => 'Ushbu sahifaning bosma uchun versiyasi',
+'tooltip-t-permalink'             => 'Sahifaning ushbu versiyasiga doimiy ishorat',
 'tooltip-ca-nstab-main'           => "Sahifani ko'rish",
 'tooltip-ca-nstab-user'           => "Foydalanuvchi sahifasini ko'rish",
 'tooltip-ca-nstab-media'          => "Media sahifasini ko'rish",
@@ -596,8 +627,8 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 'tooltip-recreate'                => "Bu sahifani u o'chirilgan bo'lishiga qaramasdan qayta yaratish",
 
 # Browsing diffs
-'previousdiff' => '� Avvalgi farq',
-'nextdiff'     => 'Keyingi farq →',
+'previousdiff' => '� Avvalgi tahrir',
+'nextdiff'     => 'Keyingi tahrir →',
 
 # Media information
 'imagemaxsize'         => "Tasvir ta'rifi sahifasidagi tasvirning kattaligi:",
@@ -608,7 +639,7 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 'show-big-image'       => 'Asl hajmdagi tasvir',
 'show-big-image-thumb' => '<small>Ushbu koʻrinish oʻlchamlari: $1 × $2 piksel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Qidirish',
 
 # Metadata
@@ -617,7 +648,7 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 
 # External editor support
 'edit-externally'      => 'Bu faylni tashqi dasturiy ilovalar yordamida tahrirla',
-'edit-externally-help' => "Batafsil ma'lumotlar uchun [http://www.mediawiki.org/wiki/Manual:External_editors bu yerga] qarang.",
+'edit-externally-help' => "(Batafsil ma'lumotlar uchun [http://www.mediawiki.org/wiki/Manual:External_editors bu yerga] qarang)",
 
 # 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'Barchasi',
diff --git a/languages/messages/MessagesVec.php b/languages/messages/MessagesVec.php
index 5c076e82..b62ab53d 100644
--- a/languages/messages/MessagesVec.php
+++ b/languages/messages/MessagesVec.php
@@ -17,14 +17,12 @@ $fallback = 'it';
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Speciale',
-	NS_MAIN             => '',
 	NS_TALK             => 'Discussion',
 	NS_USER             => 'Utente',
 	NS_USER_TALK        => 'Discussion_utente',
-	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Discussion_$1',
-	NS_IMAGE            => 'Imagine',
-	NS_IMAGE_TALK       => 'Discussion_imagine',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussion_file',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
 	NS_TEMPLATE         => 'Template',
@@ -32,7 +30,96 @@ $namespaceNames = array(
 	NS_HELP             => 'Aiuto',
 	NS_HELP_TALK        => 'Discussion_aiuto',
 	NS_CATEGORY         => 'Categoria',
-	NS_CATEGORY_TALK    => 'Discussion_categoria'
+	NS_CATEGORY_TALK    => 'Discussion_categoria',
+);
+
+$namespaceAliases = array(
+	'Imagine' => NS_FILE,
+	'Discussion_imagine' => NS_FILE_TALK,
+);
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( 'DópiRimandi' ),
+	'BrokenRedirects'           => array( 'RimandiSbaglià' ),
+	'Disambiguations'           => array( 'Disanbiguassion' ),
+	'Userlogin'                 => array( 'Entra' ),
+	'Userlogout'                => array( 'VàFora' ),
+	'CreateAccount'             => array( 'CreaAccount' ),
+	'Preferences'               => array( 'Preferense' ),
+	'Watchlist'                 => array( 'TegnùiDeOcio' ),
+	'Recentchanges'             => array( 'ÙltimiCanbiamenti' ),
+	'Upload'                    => array( 'Carga' ),
+	'Listfiles'                 => array( 'Imagini' ),
+	'Newimages'                 => array( 'ImaginiReçenti' ),
+	'Listusers'                 => array( 'Utenti' ),
+	'Listgrouprights'           => array( 'ListaDiritiDeGrupo' ),
+	'Statistics'                => array( 'Statìsteghe' ),
+	'Randompage'                => array( 'PàxenaACaso' ),
+	'Lonelypages'               => array( 'PàxenaÒrfana' ),
+	'Uncategorizedpages'        => array( 'PàxeneSensaCategorie' ),
+	'Uncategorizedcategories'   => array( 'CategorieSensaCategorie' ),
+	'Uncategorizedimages'       => array( 'ImaginiSensaCategorie' ),
+	'Uncategorizedtemplates'    => array( 'TemplateMiaCategorizà' ),
+	'Unusedcategories'          => array( 'CategorieMiaDoparà' ),
+	'Unusedimages'              => array( 'ImaginiMiaDoparà' ),
+	'Wantedpages'               => array( 'PàxeneRichieste' ),
+	'Wantedcategories'          => array( 'CategorieRichieste' ),
+	'Mostlinked'                => array( 'PàxenePiassèRiciamà' ),
+	'Mostlinkedcategories'      => array( 'CategoriePiassèRiciamà' ),
+	'Mostlinkedtemplates'       => array( 'TemplatePiassèDoparà' ),
+	'Mostcategories'            => array( 'PàxeneConPiassèCategorie' ),
+	'Mostimages'                => array( 'ImaginiPiassèRiciamà' ),
+	'Mostrevisions'             => array( 'PàxeneConPiassèRevision' ),
+	'Fewestrevisions'           => array( 'PàxeneConMancoRevision' ),
+	'Shortpages'                => array( 'PàxenePiCurte' ),
+	'Longpages'                 => array( 'PàxenePiLonghe' ),
+	'Newpages'                  => array( 'PàxenePiNove' ),
+	'Ancientpages'              => array( 'PàxeneMancoNove' ),
+	'Deadendpages'              => array( 'PàxeneSensaUscita' ),
+	'Protectedpages'            => array( 'PàxeneProtete' ),
+	'Protectedtitles'           => array( 'TitoliProteti' ),
+	'Allpages'                  => array( 'TuteLePàxene' ),
+	'Prefixindex'               => array( 'Prefissi' ),
+	'Ipblocklist'               => array( 'IPBlocài' ),
+	'Specialpages'              => array( 'PàxeneSpeciali' ),
+	'Contributions'             => array( 'Contributi' ),
+	'Emailuser'                 => array( 'MandaEMail' ),
+	'Confirmemail'              => array( 'ConfermaEMail' ),
+	'Whatlinkshere'             => array( 'PuntaQua' ),
+	'Recentchangeslinked'       => array( 'CanbiamentiLigà' ),
+	'Movepage'                  => array( 'Sposta' ),
+	'Blockme'                   => array( 'BlocaProxy' ),
+	'Booksources'               => array( 'SercaISBN' ),
+	'Categories'                => array( 'Categorie' ),
+	'Export'                    => array( 'Esporta' ),
+	'Allmessages'               => array( 'Messagi' ),
+	'Log'                       => array( 'Registri' ),
+	'Blockip'                   => array( 'Bloca' ),
+	'Undelete'                  => array( 'Ripristina' ),
+	'Import'                    => array( 'Inporta' ),
+	'Lockdb'                    => array( 'BlocaDB' ),
+	'Unlockdb'                  => array( 'DesblocaDB' ),
+	'Userrights'                => array( 'ParmessiUtente' ),
+	'MIMEsearch'                => array( 'SercaMIME' ),
+	'FileDuplicateSearch'       => array( 'SercaDopioniDeiFile' ),
+	'Unwatchedpages'            => array( 'PàxeneMiaTegnùDeOcio' ),
+	'Listredirects'             => array( 'Rimandi' ),
+	'Revisiondelete'            => array( 'ScancelaRevision' ),
+	'Unusedtemplates'           => array( 'TemplateMiaDoparà' ),
+	'Randomredirect'            => array( 'RImandoCasuale' ),
+	'Mypage'                    => array( 'LaMePàxenaUtente' ),
+	'Mytalk'                    => array( 'LeMeDiscussion' ),
+	'Mycontributions'           => array( 'IMeContributi' ),
+	'Listadmins'                => array( 'Aministradori' ),
+	'Listbots'                  => array( 'ListaDeiBot' ),
+	'Popularpages'              => array( 'PàxenePiassèVisità' ),
+	'Search'                    => array( 'Serca' ),
+	'Resetpass'                 => array( 'ReinpostaPassword' ),
+	'Withoutinterwiki'          => array( 'PàxeneSensaInterwiki' ),
+	'MergeHistory'              => array( 'FondiCronologia' ),
+	'Filepath'                  => array( 'PercorsoFile' ),
+	'Invalidateemail'           => array( 'InvalidaEMail' ),
+	'Blankpage'                 => array( 'PàxenaVoda' ),
 );
 
 $messages = array(
@@ -73,16 +160,17 @@ $messages = array(
 'tog-watchlisthideown'        => 'Scondi łe me modifeghe ne i osservati speciałi',
 'tog-watchlisthidebots'       => 'Scondi le modifighe de i bot ne i oservati speciałi',
 'tog-watchlisthideminor'      => 'Scondi le modifiche picenine nei osservati speciali',
+'tog-watchlisthideliu'        => "Scondi le modifiche dei utenti registrà tra le pàxene tegnùe d'ocio",
+'tog-watchlisthideanons'      => "Scondi le modifiche dei utenti anonimi tra le pàxene tegnùe d'ocio",
 'tog-ccmeonemails'            => 'Màndeme na copia dei messagi spedìi ai altri utenti',
 'tog-diffonly'                => 'No stà mostrar el contenuto de la pagina dopo el confronto tra version',
 'tog-showhiddencats'          => 'Mostra Å‚e categorie sconte',
+'tog-norollbackdiff'          => 'No stà far védar el riepilogo de le difarense dopo ver fato un ripristino',
 
 'underline-always'  => 'Senpre',
 'underline-never'   => 'Mai',
 'underline-default' => 'Mantien Å‚e inpostasion de el browser',
 
-'skinpreview' => '(Anteprima)',
-
 # Dates
 'sunday'        => 'Domenega',
 'monday'        => 'Luni',
@@ -177,7 +265,7 @@ I seguenti cołegamenti i xe en lengua inglese:
 'mytalk'         => 'le me discussión',
 'anontalk'       => 'Discussion par sto IP',
 'navigation'     => 'Navigazión',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metadati:',
@@ -214,14 +302,14 @@ I seguenti cołegamenti i xe en lengua inglese:
 'talkpagelinktext'  => 'discussion',
 'specialpage'       => 'Pàxena speciałe',
 'personaltools'     => 'Strumenti personali',
-'postcomment'       => 'Zonta un comento',
+'postcomment'       => 'Sezion nova',
 'articlepage'       => 'Varda voçe',
 'talk'              => 'Discussion',
 'views'             => 'Visite',
 'toolbox'           => 'Strumenti',
 'userpage'          => 'Varda pàxena utente',
 'projectpage'       => 'Varda ła pàxena de servizio',
-'imagepage'         => 'Varda la pagina del file multimedial',
+'imagepage'         => 'Varda la pagina del file',
 'mediawikipage'     => 'Mostra el messagio',
 'templatepage'      => 'Mostra el template',
 'viewhelppage'      => 'Mostra la pagina de ajuto',
@@ -240,8 +328,6 @@ I seguenti cołegamenti i xe en lengua inglese:
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Se parla de {{SITENAME}}',
 'aboutpage'            => 'Project:Se parla de',
-'bugreports'           => 'Malfunsionamenti',
-'bugreportspage'       => 'Project:Malfunsionamenti',
 'copyright'            => 'Contenuto disponibile soto $1.',
 'copyrightpagename'    => 'El copyright su {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -264,9 +350,7 @@ I seguenti cołegamenti i xe en lengua inglese:
 
 'badaccess'        => 'Eròr ne i permessi',
 'badaccess-group0' => "No te ghè i permessi necessari par eseguir l'azion richiesta.",
-'badaccess-group1' => 'La funzion richiesta la xe riservà ai utenti che fa parte del grupo $1.',
-'badaccess-group2' => 'La funzion richiesta la xe riservà ai utenti che fa parte dei gruppi $1.',
-'badaccess-groups' => 'La funzion richiesta la xe riservà ai utenti che fa parte de uno dei seguenti grupi: $1.',
+'badaccess-groups' => 'La funzion richiesta la xe riservà ai utenti che fa parte {{PLURAL:$2|del grupo|de uno dei seguenti grupi}}: $1.',
 
 'versionrequired'     => 'Version $1 de MediaWiki richiesta',
 'versionrequiredtext' => 'Par doparar sta pagina a ghe vole la version $1 del software MediaWiki. Varda la [[Special:Version|pagina de la version]].',
@@ -280,6 +364,8 @@ I seguenti cołegamenti i xe en lengua inglese:
 'editsection'             => 'modifica',
 'editold'                 => 'modifica',
 'viewsourceold'           => 'mostra sorgente',
+'editlink'                => 'modìfega',
+'viewsourcelink'          => 'varda el testo',
 'editsectionhint'         => 'Modifica sezión: $1',
 'toc'                     => 'Indice',
 'showtoc'                 => 'mostra',
@@ -294,13 +380,13 @@ I seguenti cołegamenti i xe en lengua inglese:
 'site-atom-feed'          => 'Feed Atom de $1',
 'page-rss-feed'           => 'Feed RSS par "$1"',
 'page-atom-feed'          => 'Feed Atom par "$1"',
-'red-link-title'          => "$1 ('ncora da scrìvar)",
+'red-link-title'          => '$1 (la pàxena no la esiste)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Voxe',
 'nstab-user'      => 'Utente',
 'nstab-media'     => 'File multimedial',
-'nstab-special'   => 'Speciale',
+'nstab-special'   => 'Pàxena speciale',
 'nstab-project'   => 'Pagina de servizio',
 'nstab-image'     => 'Imagine',
 'nstab-mediawiki' => 'Messagio',
@@ -310,7 +396,7 @@ I seguenti cołegamenti i xe en lengua inglese:
 
 # Main script and global functions
 'nosuchaction'      => 'Operazion mìa riconossùa',
-'nosuchactiontext'  => "L'operazion richiesta con la URL inserìa no la xe stà riconossiùa dal software MediaWiki",
+'nosuchactiontext'  => "L'azion indicà in tel'URL no la xe valida. Te podaressi ver sbalià a digitar l'URL o ver strucà un colegamento mia justo. Opure podarìa anca tratarse de un bug in {{SITENAME}}.",
 'nosuchspecialpage' => 'No xè disponibiłe nissuna pàxena speciałe co sto nome',
 'nospecialpagetext' => "<big>'''Te ghè richiesto na pagina speciale mìa esistente.'''</big>
 
@@ -362,7 +448,6 @@ Se prega de segnalar l\'acaduto a un [[Special:ListUsers/sysop|aministrador]] sp
 'cannotdelete'         => "No se pol mìa scancełar la pàxena o l'imagine richiesta.",
 'badtitle'             => "El titoło no'l xè mia giusto",
 'badtitletext'         => 'La pàxena richiesta no la xè disponibiłe, ła podaìia èssar mìa vałida, voda, o podarìa tratarse de un eror in un cołegamento interlenguistico o fra diverse version de {{SITENAME}}.',
-'perfdisabled'         => 'Ne dispiase, ma sta funzionalità la xe stà tenporaneamente disabilità parché la ralenta el database fin al punto che nissun utente riesse pi a doparar sto sito.',
 'perfcached'           => "Sta qua la xè na copia ''cache'' e quindi la podarìa no èssar conpletamente agiornà.",
 'perfcachedts'         => "I dati che segue i xe tirà fora da na copia ''cache'' del database. Ultimo agiornamento: $1.",
 'querypage-no-updates' => 'I agiornamenti de la pagina i xe tenporaneamente sospesi. I dati contegnù ne la pagina no i vegnarà mìa agiornà.',
@@ -378,7 +463,7 @@ Query: $2',
 'protectedinterface'   => "Sta pàxena la contien un elemento che fa parte de l'interfacia utente del software; e quindi la xè proteta par evitar possibiłi abusi.",
 'editinginterface'     => "'''Ocio:''' Te stè modificando na pagina che la fa parte de l'interfacia utente del sito. 
 Tute le modifiche che te fè a sta pagina le se riflete su l'aspeto de l'interfacia grafica visualizà da tuti i altri utenti.
-Se te ghè bisogno de tradur in veneto un messagio de l'interfacia utente, te pol doparar [http://translatewiki.net/wiki/Main_Page?setlang=vec Betawiki], el progeto de localizazion de MediaWiki.",
+Se te ghè bisogno de tradur in veneto un messagio de l'interfacia utente, te pol doparar [http://translatewiki.net/wiki/Main_Page?setlang=vec translatewiki.net], el progeto de localizazion de MediaWiki.",
 'sqlhidden'            => '(la query SQL la xe stà sconta)',
 'cascadeprotected'     => 'Su sta pàxena no se pol far modifighe parché ła xe stà inclusa {{PLURAL:$1|ne ła pàxena indicà de seguito, che ła xe stà proteta|ne łe pàxene indicae de seguito, che łe xe stà protete}} selezionando ła protesion "ricorsiva":
 $2',
@@ -389,15 +474,15 @@ $2',
 La motivazion la xe sta qua: ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Eror de configurassion: antivirus sconossiùo: <i>$1</i>',
+'virus-badscanner'     => "Eror de configurassion: antivirus sconossiùo: ''$1''",
 'virus-scanfailed'     => 'scansion mìa riussìa (codice de eror $1)',
 'virus-unknownscanner' => 'antivirus sconossiùo:',
 
 # Login and logout pages
 'logouttitle'                => 'Logout utente',
-'logouttext'                 => '<strong>Logout efetuà.</strong>
+'logouttext'                 => "'''Logout efetuà.'''
 
-Ora te podi continuar a doparar {{SITENAME}} come utente anonimo, opure te podi far [[Special:UserLogin|de novo el login]] col nome utente de prima, opure con uno difarente. Nota che çerte pagine le podarìa èssar visualizà come se te fussi ancora loggà, fin che no te neti la cache del to browser.',
+Ora te podi continuar a doparar {{SITENAME}} come utente anonimo, opure te podi far [[Special:UserLogin|de novo el login]] col nome utente de prima, opure con uno difarente. Nota che çerte pagine le podarìa èssar visualizà come se te fussi ancora loggà, fin che no te neti la cache del to browser.",
 'welcomecreation'            => "== Benvegnù, $1! ==
 El to account l'è stà creà con sucesso.
 No sta desmentegarte de personalixare le to [[Special:Preferences|preferense de {{SITENAME}}]].",
@@ -408,7 +493,6 @@ No sta desmentegarte de personalixare le to [[Special:Preferences|preferense de
 'remembermypassword'         => 'Ricorda la me password par più sessioni (ghe vol i cookies).',
 'yourdomainname'             => 'Specifica el dominio:',
 'externaldberror'            => 'Se gà verificà un erór con el server de autenticassion esterno, oppure no se dispone de łe autorixassion necessarie par agiornar el proprio açesso esterno.',
-'loginproblem'               => '<b>Si gà verificà un erore durante el to tentativo de login.</b><br />Ripróa da novo!',
 'login'                      => 'Entra',
 'nav-login-createaccount'    => 'Entra o crea un novo acesso',
 'loginprompt'                => 'Par acédere a {{SITENAME}} ti gà da abiłitare i cookie.',
@@ -434,7 +518,7 @@ Inserissi un nome difarente.",
 'yourvariant'                => 'Variante de linguaggio:',
 'yournick'                   => 'Firma:',
 'badsig'                     => 'Erór ne ła firma non standard, verifica i tag HTML.',
-'badsiglength'               => 'La firma la xe massa longa.
+'badsiglength'               => 'La to firma la xe massa longa.
 La gà da verghe al massimo $1 {{PLURAL:$1|caràtere|caràteri}}.',
 'email'                      => 'Indirizo e-mail',
 'prefs-help-realname'        => 'Indicar el proprio nome vero no xe obligatorio; se te siegli de inserirlo, el vegnarà doparà par atribuir la paternità dei contenuti invià.',
@@ -447,7 +531,9 @@ In più te pol anca farte contatar da altri tramite la to pagina personale o la
 'noname'                     => "El nome utente indicà no'l xe mìa valido, no se pol crear un account co sto nome.",
 'loginsuccesstitle'          => 'Login efetuà con sucesso!',
 'loginsuccess'               => "'''El cołegamento al server de {{SITENAME}} con el nome utente \"\$1\" el xè ativo.'''",
-'nosuchuser'                 => 'No xe stà registrà nissun utente de nome "$1". Verifica che el nome inserìo el sia giusto o [[Special:UserLogin/signup|crea un acesso novo]].',
+'nosuchuser'                 => 'No esiste nissun utente de nome "$1".
+I nomi utenti i distingue tra majuscole e minuscole.
+Verifica che el nome inserìo el sia giusto o [[Special:UserLogin/signup|crea na utensa nova]].',
 'nosuchusershort'            => 'No xè registrà nissun utente de nome "<nowiki>$1</nowiki>". Verifica el nome inserìo.',
 'nouserspecified'            => 'Bisogna specificar un nome utente.',
 'wrongpassword'              => "La password che te ghe messo no l'è mia giusta.<br /><br />Riproa, par piaser.",
@@ -468,8 +554,8 @@ Par piaser, fà subito un login \'pena che la te riva.',
 'eauthentsent'               => "Na email de conferma la xè stà invià a l'indirizzo che te ghè indicà. Prima che qualunque altra mail te vegna invià, te ghè da seguir le istrussioni contegnùe ne la mail ricevuta, par confermar che quel'indirizzo el xè dal bon el tuo.",
 'throttled-mailpassword'     => 'Na password nova la xe zà stà mandà da manco de {{PLURAL:$1|$1 ora|$1 ore}}. Par prevegner abusi, la funzion "Invia nova password" la pol èssar doparà solo na volta ogni {{PLURAL:$1|$1 ora|$1 ore}}.',
 'mailerror'                  => "Ghe xè stà un eror nel mandare l'email: $1",
-'acct_creation_throttle_hit' => 'Me despiase, te ghe xà creà $1 account. No te pol crearghine ancora.',
-'emailauthenticated'         => "El to indirisso de e-mail l'è stado autenticado su $1.",
+'acct_creation_throttle_hit' => "Dei utenti de sta wiki col to stesso indirisso IP i gà creà {{PLURAL:$1|1 utensa|$1 utense}} ne l'ultimo zorno, che xe el massimo consentìo in sto periodo de tenpo. Perciò, i utenti che dòpara sto indirisso IP no i pode crear altre utense par el momento.",
+'emailauthenticated'         => "El to indirisso de e-mail l'è stado autenticado su $2 el $3.",
 'emailnotauthenticated'      => "El to indirizo email <strong>no'l xè gnancora stà autenticà</strong>. Nissuna email la vegnarà invià tramite le funsioni che segue.",
 'noemailprefs'               => 'Indica un indirizo e-mail par ativar ste funzioni.',
 'emailconfirmlink'           => 'Conferma el to indirizo de e-mail',
@@ -482,17 +568,25 @@ Inserissi un indirisso valido o svoda la casèła.",
 La password par l\'utente "$2" la xe inpostà a "$3". Xe oportuno eseguir un acesso quanto prima e canbiar la password subito dopo.
 
 Se l\'acesso el xe stà creà par sbaglio, se pol ignorar sto messagio.',
+'login-throttled'            => 'Te ghè fato massa tentativi su la password de sto account. Spèta un tocheto prima de proàr da novo.',
 'loginlanguagelabel'         => 'Lengua: $1',
 
 # Password reset dialog
-'resetpass'               => 'Reinposta la password',
-'resetpass_announce'      => "L'acesso el xe stà efetuà con un codice tenporaneo, mandà par e-mail. Par conpletar l'acesso bisogna inpostar na password nova:",
-'resetpass_header'        => 'Cànbia la password de la to utensa',
-'resetpass_submit'        => 'Inposta la password e acedi al sito',
-'resetpass_success'       => 'La password la xe stà modificà. Acesso in corso...',
-'resetpass_bad_temporary' => 'Password tenporanea mìa valida. La password la podarìà èssar stà zà canbià, opure podarìà èssar stà richiesta na password tenporanea nova.',
-'resetpass_forbidden'     => 'No se pol modificar le password',
-'resetpass_missing'       => 'Dati mancanti nel modulo.',
+'resetpass'                 => 'Cànbia la password',
+'resetpass_announce'        => "L'acesso el xe stà efetuà con un codice tenporaneo, mandà par e-mail. Par conpletar l'acesso bisogna inpostar na password nova:",
+'resetpass_header'          => 'Cànbia la password de la to utensa',
+'oldpassword'               => 'Vecia password:',
+'newpassword'               => 'Nova password:',
+'retypenew'                 => 'Riscrivi la password nova:',
+'resetpass_submit'          => 'Inposta la password e acedi al sito',
+'resetpass_success'         => 'La password la xe stà modificà. Acesso in corso...',
+'resetpass_bad_temporary'   => 'Password tenporanea mìa valida. La password la podarìà èssar stà zà canbià, opure podarìà èssar stà richiesta na password tenporanea nova.',
+'resetpass_forbidden'       => 'No se pol modificar le password',
+'resetpass-no-info'         => "Te ghè da ver fato l'acesso per poder entrar in sta pàxena.",
+'resetpass-submit-loggedin' => 'Cànbia password',
+'resetpass-wrong-oldpass'   => 'Password corente o tenporanea mia valida.
+Forse te ghè zà canbià la to password o te ghè domandà na password tenporanea nova.',
+'resetpass-temp-password'   => 'Password tenporanea:',
 
 # Edit page toolbar
 'bold_sample'     => 'Grasseto',
@@ -515,8 +609,8 @@ Se l\'acesso el xe stà creà par sbaglio, se pol ignorar sto messagio.',
 'hr_tip'          => 'Linea orizontal (dòparela con giudizio)',
 
 # Edit pages
-'summary'                          => 'Ogeto',
-'subject'                          => 'Argomento (intestazion)',
+'summary'                          => 'Ogeto:',
+'subject'                          => 'Argomento (intestazion):',
 'minoredit'                        => "Sta quà l'è na modifica minore",
 'watchthis'                        => "Tegni d'ocio sta voçe",
 'savearticle'                      => 'Salva la pàxena',
@@ -528,8 +622,8 @@ Se l\'acesso el xe stà creà par sbaglio, se pol ignorar sto messagio.',
 'missingsummary'                   => "'''Ocio:''' No te ghè indicà l'ogeto de la modifica. Macando de novo 'Salva la pagina' la modifica la vegnerà con l'ogeto vodo.",
 'missingcommenttext'               => 'Inserissi un comento qua soto.',
 'missingcommentheader'             => "'''Ocio:''' No te ghè specificà l'intestazion de sto commento. Macando de novo '''Salva la pagina''' la modifica la vegnarà salvà senza intestazion.",
-'summary-preview'                  => 'Anteprima ogeto',
-'subject-preview'                  => 'Anteprima ogeto/intestazion',
+'summary-preview'                  => 'Anteprima ogeto:',
+'subject-preview'                  => 'Anteprima ogeto/intestazion:',
 'blockedtitle'                     => 'Utente blocà',
 'blockedtext'                      => "<big>'''Sto nome utente o indirizo IP el xe stà blocà.'''</big>
 
@@ -582,31 +676,34 @@ Se te si rivà qua par sbaglio, basta che te machi el boton '''Indrio''' sul to
 De conseguenza xè necessario identificarlo tramite l'indirizo IP numerico.
 Sto indirizo el pode èssar condivixo da diversi utenti.
 Se te sì un utente anonimo e te ghè riçevù dei messagi che te secondo ti i xera direti a qualchedun altro, te podi [[Special:UserLogin/signup|registrarte]] o [[Special:UserLogin|efetuar el login]] par evitar confuxion con altri utenti anonimi in futuro.''",
-'noarticletext'                    => 'In sto momento ła pàxena richiesta la xè voda. Se pol [[Special:Search/{{PAGENAME}}|çercar sto titoło]] ne łe altre pàxene del sito opure [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificar ła pàxena desso].',
+'noarticletext'                    => 'In sto momento ła pàxena richiesta la xè voda.
+Se pol [[Special:Search/{{PAGENAME}}|sercar sto titoło]] ne łe altre pàxene,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} sercar i registri relativi],
+opure [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificar ła pàxena desso].',
 'userpage-userdoesnotexist'        => 'L\'account "$1" no\'l corisponde mìa a un utente registrà. Verifica se te voli dal bon crear o modificar sta pagina.',
 'clearyourcache'                   => "'''Ocio: dopo aver salvà, te ghè da netar la cache del to browser par védar i canbiamenti.''' Par '''Mozilla / Firefox / Safari:''' tien macà el boton de le majuscole e schiza \"Ricarica\", o senò maca ''Ctrl-F5'' o ''Ctrl-R'' (''Command-R'' se te ghè el Macintosh); par '''Konqueror:''' schiza \"Ricarica\" o maca ''F5;'' par '''Opera:''' néta la cache in ''Strumenti → Preferenze;'' par '''Internet Explorer:''' tien macà ''Ctrl'' fin che te schizi ''Ricarica'', o maca ''Ctrl-F5.''",
-'usercssjsyoucanpreview'           => "<strong>Sugerimento:</strong> se consiglia de doparar el boton 'Visualiza anteprima' par proàr i novi CSS o JavaScript prima de salvarli.",
+'usercssjsyoucanpreview'           => "'''Sugerimento:''' se consiglia de doparar el boton 'Visualiza anteprima' par proàr i novi CSS o JavaScript prima de salvarli.",
 'usercsspreview'                   => "'''Sta qua la xe solo n'anteprima del proprio CSS personal.
 Le modifiche no le xe gnancora stà salvà!'''",
 'userjspreview'                    => "'''Sta qua la xe solo n'anteprima par proar el proprio JavaScript personal; le modifiche no le xe gnancora stà salvà!'''",
 'userinvalidcssjstitle'            => "'''Ocio:'''  No ghe xe nissuna skin con nome \"\$1\". Nota che le pagine par i .css e .js personalizà le gà l'iniziale del titolo minuscola, par esenpio {{ns:user}}:Esenpio/monobook.css e no {{ns:user}}:Esenpio/Monobook.css.",
 'updated'                          => '(Agiornà)',
-'note'                             => '<strong>Nota:</strong>',
-'previewnote'                      => "<strong>Tegni presente che sta qua xè solo n'anteprima, e che la to version NO la xè stà gnancora salvà!</strong>",
+'note'                             => "'''Nota:'''",
+'previewnote'                      => "'''Tegni presente che sta qua xè solo n'anteprima, e che la to version NO la xè stà gnancora salvà!'''",
 'previewconflict'                  => 'Sta anteprima la corisponde al testo ne la casèla de edizion de sora, e la fa védar come vegnarà fora la pagina se te machi "Salva la pagina" in sto momento.',
-'session_fail_preview'             => 'No xè stà possibiłe salvar le to modifiche parché i dati de la session i xè andai persi. 
+'session_fail_preview'             => "No xè stà possibiłe salvar le to modifiche parché i dati de la session i xè andai persi. 
 Par piaser, riproa da novo.
-Se no funsiona gnancora, proa a [[Special:UserLogout|scołegarte]] e a cołegarte de novo.</strong>',
-'session_fail_preview_html'        => "<strong>No xe mìa stà possibile elaborar la modifica parché xe 'ndà persi i dati relativi a la session.</strong>
+Se no funsiona gnancora, proa a [[Special:UserLogout|scołegarte]] e a cołegarte de novo.'''",
+'session_fail_preview_html'        => "'''No xe mìa stà possibile elaborar la modifica parché xe 'ndà persi i dati relativi a la session.'''
 
 ''Dato che su {{SITENAME}} xe abilità l'uso de HTML senza limitazion, l'anteprima no la vien visualizà; se tratta de na misura de sicureza contro i atachi JavaScript.''
 
-<strong>Se te stè fasendo na modifica legìtima, par piaser próa de novo.
-Se no funsiona gnancora, te pol proár a [[Special:UserLogout|scolegarte]] e efetuar da novo l'acesso.</strong>",
-'token_suffix_mismatch'            => "<strong>La modifica no la xe mìa stà salvà parché el client el gà mostrà de gestir in maniera sbaglià i caràteri de puntegiatura nel token associà a la stessa. Par evitar na possibile coruzion del testo de la pagina, xe stà rifiutà l'intera modifica. Sta situazion la pode verificarse, a olte, quando vien doparà çerti servizi de proxy anonimi via web che presenta dei bug.</strong>",
+'''Se te stè fasendo na modifica legìtima, par piaser próa de novo.
+Se no funsiona gnancora, te pol proár a [[Special:UserLogout|scolegarte]] e efetuar da novo l'acesso.'''",
+'token_suffix_mismatch'            => "'''La modifica no la xe mìa stà salvà parché el client el gà mostrà de gestir in maniera sbaglià i caràteri de puntegiatura nel token associà a la stessa. Par evitar na possibile coruzion del testo de la pagina, xe stà rifiutà l'intera modifica. Sta situazion la pode verificarse, a olte, quando vien doparà çerti servizi de proxy anonimi via web che presenta dei bug.'''",
 'editing'                          => 'Modifica de $1',
 'editingsection'                   => 'Modifica $1 (sezion)',
-'editingcomment'                   => 'Modifica de $1 (comento)',
+'editingcomment'                   => 'Modifica de $1 (sezion nova)',
 'editconflict'                     => 'Conflito de edizion: $1',
 'explainconflict'                  => "Qualcun altro el ga salvà na so version de ła voçe nel tempo in cui te stavi preparando ła to version.
 La casela de modifica de sora contegne el testo de la voçe ne ła so forma atuałe (el testo atualmente online).
@@ -615,24 +712,27 @@ Te dovarè inserire, se te vołi, le to modifiche nel testo esistente, e perciò
 '''Soltanto''' el testo ne ła caseła de sora el sarà salvà se te struchi el botón \"Salva\".",
 'yourtext'                         => 'El to testo',
 'storedversion'                    => 'Version in archivio',
-'nonunicodebrowser'                => '<strong>OCIO: Te stè doparando un browser mìa conpatibile coi caràteri Unicode. Par consentir la modifica de le pagine senza crear inconvenienti, i caràteri non ASCII i vien mostrà ne la casela de modifica soto forma de codici esadecimali.</strong>',
-'editingold'                       => '<strong>Ocio: Te stè modificando na version de ła voçe non agiornà. Se te la salvi cussì, tuti i canbiamenti apportai dopo sta version i vegnarà persi.</strong>',
+'nonunicodebrowser'                => "'''OCIO: Te stè doparando un browser mìa conpatibile coi caràteri Unicode. Par consentir la modifica de le pagine senza crear inconvenienti, i caràteri non ASCII i vien mostrà ne la casela de modifica soto forma de codici esadecimali.'''",
+'editingold'                       => "'''Ocio: Te stè modificando na version de ła voçe non agiornà. Se te la salvi cussì, tuti i canbiamenti apportai dopo sta version i vegnarà persi.'''",
 'yourdiff'                         => 'Difarense',
 'copyrightwarning'                 => "Nota: tuti i contributi a {{SITENAME}} i se considera rilasià nei termini de la licenza d'uso $2 (varda $1 par savérghene piessè). Se no te voli che i to testi i possa èssar modificà e redistribuìi da chiunque senza nissuna limitazion, no sta inviarli a {{SITENAME}}.<br />
 Con l'invio del testo te dichiari inoltre, soto la to responsabilità, che el testo el xe stà scrito da ti personalmente opure che el xe stà copià da na fonte de publico dominio o analogamente lìbara.
-<strong>NO STA INVIAR MATERIALE CUERTO DA DIRITO D'AUTOR SENZA AUTORIZAZION!</strong>",
-'copyrightwarning2'                => 'Ocio che tuti i contributi a {{SITENAME}} i pode èssar editai, alterai, o rimossi da altri contributori.
+'''NO STA INVIAR MATERIALE CUERTO DA DIRITO D'AUTOR SENZA AUTORIZAZION!'''",
+'copyrightwarning2'                => "Ocio che tuti i contributi a {{SITENAME}} i pode èssar editai, alterai, o rimossi da altri contributori.
 Se no te voli che i to scriti i vegna modificà sensa pietà, alora no sta inserirli qua.<br />
 Sapi che te stè prometendo che te stè inserendo un testo scrito de to pugno, o copià da na fonte de publico dominio o similarmente lìbara (varda $1 par i detagli).
-<strong>NO STA INSERIR OPERE PROTETE DA COPYRIGHT SENZA PERMESSO!</strong>',
-'longpagewarning'                  => "<strong>OCIO: Sta pàxena la xè longa $1 kilobyte; çerti browser i podarìa verghe dei problemi ne ła modifega de pàxene che se aviçina o supera i 32 kB. Valuta l'oportunità de sudivìdar ła pàxena in sezion pìassè picenine.</strong>",
-'longpageerror'                    => '<strong>ERROR: The text you have submitted is $1 kilobytes 
-long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</strong>',
-'readonlywarning'                  => '<strong>OCIO: El database el xe stà blocà par manutenzion, quindi no se pol salvar le modifiche in sto momento. Par no pèrdarle, te pol copiar tuto quel che te ghè inserìo fin desso ne la casela de modifica, incolarlo in un programa de elaborazion de testi e salvarlo, intanto che te speti che i sbloca el database.</strong>',
-'protectedpagewarning'             => '<strong>OCIO: Sta pagina la xe sta proteta e solo i aministradori i pode modificarla.</strong>',
+'''NO STA INSERIR OPERE PROTETE DA COPYRIGHT SENZA PERMESSO!'''",
+'longpagewarning'                  => "'''OCIO: Sta pàxena la xè longa $1 kilobyte; çerti browser i podarìa verghe dei problemi ne ła modifega de pàxene che se aviçina o supera i 32 kB. Valuta l'oportunità de sudivìdar ła pàxena in sezion pìassè picenine.'''",
+'longpageerror'                    => "'''ERROR: The text you have submitted is $1 kilobytes 
+long, which is longer than the maximum of $2 kilobytes. It cannot be saved.'''",
+'readonlywarning'                  => "'''OCIO: El database el xe stà blocà par manutenzion, quindi no se pol salvar le modifiche in sto momento.
+Par no pèrdarle, te pol copiar tuto quel che te ghè inserìo fin desso ne la casela de modifica, incolarlo in un programa de elaborazion de testi e salvarlo, intanto che te speti che i sbloca el database.'''
+
+L'aministrador che gà blocà el database el gà dato la seguente spiegassion: $1",
+'protectedpagewarning'             => "'''OCIO: Sta pagina la xe sta proteta e solo i aministradori i pode modificarla.'''",
 'semiprotectedpagewarning'         => "'''Nota:''' Sta pàxena la xè stà blocà in modo che solo i utenti registrài i poda modefegarla.",
 'cascadeprotectedwarning'          => "'''Ocio:''' Sta pagina la xe stà blocà in modo che solo i utenti con privilegi de aministrador i possa modificarla. Questo sucede parché la pagina la xe inclusa {{PLURAL:\$1|ne la pagina indicà de seguito, che la xe stà proteta|ne le pagine indicà de seguito, che le xe stà protete}} selezionando la protezion \"ricorsiva\":",
-'titleprotectedwarning'            => '<strong>OCIO:  Sta pagina la xe stà blocà in modo che solo çerte categorie de utenti le possa crearla.</strong>',
+'titleprotectedwarning'            => "'''OCIO:  Sta pàxena la xe stà blocà in modo che solo i utenti con [[Special:ListGroupRights|çerti privilègi]] i le possa crear.'''",
 'templatesused'                    => 'Template doparà in sta pagina:',
 'templatesusedpreview'             => 'Template doparà in sta anteprima:',
 'templatesusedsection'             => 'Template doparà in sta sezion:',
@@ -649,11 +749,21 @@ long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</str
 
 Par piaser assicùrete che sia dal bon el caso de 'ndar vanti a modificar sta pagina.
 L'elenco de le relative scancelazion el vien riportà qua de seguito par comodità:",
+'deleted-notice'                   => "Sta pàxena la xe stà scancelà. L'elenco de le relative scancelassion el vien riportà de sèvito par informassion.",
+'deletelog-fulllog'                => 'Varda el registro conpleto',
+'edit-hook-aborted'                => "Modifica abortìa da parte de l'hook.
+No xe stà dà nissuna spiegazion in merito.",
+'edit-gone-missing'                => 'No se riesse a agiornar la pàxena.
+Pararìa che la sìpia stà scancelà.',
+'edit-conflict'                    => 'Conflito de modifica.',
+'edit-no-change'                   => 'La to modifica la xe stà ignorà, parché no ti gà canbià gnente nel testo.',
+'edit-already-exists'              => 'No se pol crear na pàxena nova.
+La esiste de zà.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Ocio: Sta pagina la contien dele chiamate de funzion al parser massa onerose.
 
-Dovarìa èssarghene manco de $2, ghe ne xe $1.',
+Dovarìa èssarghe manco de $2 {{PLURAL:$2|chiamata|chiamate}}, {{PLURAL:$1|ghe ne xe|ghe ne xe}} $1.',
 'expensive-parserfunction-category'       => 'Pagina con chiamate de funzion al parser massa onerose',
 'post-expand-template-inclusion-warning'  => 'Ocio: la dimension de inclusion dei template la xe massa granda.
 Alcuni template no i sarà mia inclusi.',
@@ -661,6 +771,8 @@ Alcuni template no i sarà mia inclusi.',
 'post-expand-template-argument-warning'   => 'Ocio: Sta pagina la contien almanco un argomento de template che el gà na dimension de espansion massa granda.
 Sti argomenti i xe stà omessi.',
 'post-expand-template-argument-category'  => 'Pagine che contien template con argomenti mancanti',
+'parser-template-loop-warning'            => 'Xe stà catà un ciclo in tel modèl: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Xe stà rajunto el limite màssimo de ricorsion in tel modèl ($1)',
 
 # "Undo" feature
 'undo-success' => 'Sta modifica la pode èssar anulà. Verifica el confronto presentà de seguito par èssar sicuro che el contenuto el sia come te lo voli e quindi salva le modifiche par conpletar la procedura de anulamento.',
@@ -675,29 +787,28 @@ Sti argomenti i xe stà omessi.',
 La motivazion del bloco fornìa da $3 la xe sta qua: ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Varda i registri relativi a sta pagina qua.',
-'nohistory'           => 'La cronołogia de łe version de sta pàxena no la xè reperibiłe.',
-'revnotfound'         => 'Version mìa catà',
-'revnotfoundtext'     => "La version richiesta de ła pàxena no la xè mìa stà catà.
-Verifica l'URL che te doparà par açedere a sta pàxena.",
-'currentrev'          => 'Version atuałe',
-'revisionasof'        => 'Revixion $1',
-'revision-info'       => 'Version del $1, autor: $2',
-'previousrevision'    => '� Version manco reçente',
-'nextrevision'        => 'Version pì reçente →',
-'currentrevisionlink' => 'Varda ła version atuałe',
-'cur'                 => 'cor',
-'next'                => 'suc',
-'last'                => 'prec',
-'page_first'          => 'prima',
-'page_last'           => 'ultima',
-'histlegend'          => 'Legenda: (cor) = difarense con la versión corente,
+'viewpagelogs'           => 'Varda i registri relativi a sta pagina qua.',
+'nohistory'              => 'La cronołogia de łe version de sta pàxena no la xè reperibiłe.',
+'currentrev'             => 'Version atuałe',
+'currentrev-asof'        => 'Version corrente del $1',
+'revisionasof'           => 'Revixion $1',
+'revision-info'          => 'Version del $1, autor: $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Version manco reçente',
+'nextrevision'           => 'Version pì reçente →',
+'currentrevisionlink'    => 'Varda ła version atuałe',
+'cur'                    => 'cor',
+'next'                   => 'suc',
+'last'                   => 'prec',
+'page_first'             => 'prima',
+'page_last'              => 'ultima',
+'histlegend'             => 'Legenda: (cor) = difarense con la versión corente,
 (prec) = difarense con la versión precedente, m = modifica minore',
-'deletedrev'          => '[scancełà]',
-'histfirst'           => 'Prima',
-'histlast'            => 'Ultima',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(voda)',
+'history-fieldset-title' => 'Serca in te la cronologia',
+'deletedrev'             => '[scancełà]',
+'histfirst'              => 'Prima',
+'histlast'               => 'Ultima',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(voda)',
 
 # Revision feed
 'history-feed-title'          => 'Cronołogia',
@@ -779,6 +890,7 @@ Assicùrete che la continuità storica de la pagina no la vegna alterà.',
 'mergehistory-invalid-destination' => 'La pagina de destinazion la gà da verghe un titolo coreto.',
 'mergehistory-autocomment'         => 'Union de [[:$1]] in [[:$2]]',
 'mergehistory-comment'             => 'Union d [[:$1]] in [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Le pàxene de origine e de destinasion no le pode èssar la stessa',
 
 # Merge log
 'mergelog'           => 'Registro de le unioni',
@@ -791,119 +903,200 @@ Assicùrete che la continuità storica de la pagina no la vegna alterà.',
 'difference'              => '(Difarense fra Å‚e version)',
 'lineno'                  => 'Riga $1:',
 'compareselectedversions' => 'Confronta łe version selezionà',
+'visualcomparison'        => 'Confronto visuale',
+'wikicodecomparison'      => 'Confronto del wikitext',
 'editundo'                => 'annulla',
 'diff-multi'              => '({{PLURAL:$1|Una revision intermedia non mostrà|$1 revision intermedie non mostrà}}.)',
+'diff-movedto'            => 'spostà a $1',
+'diff-styleadded'         => '$1 stile zontà',
+'diff-added'              => '$1 zontà',
+'diff-changedto'          => 'canbià in $1',
+'diff-movedoutof'         => 'spostà fora da $1',
+'diff-styleremoved'       => 'stile $1 cavà',
+'diff-removed'            => '$1 cavà',
+'diff-changedfrom'        => 'canbià da $1',
+'diff-src'                => 'fonte',
+'diff-withdestination'    => "co' destinasion $1",
+'diff-with'               => "&#32;co' $1 $2",
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'larghessa',
+'diff-height'             => 'altessa',
+'diff-p'                  => "un '''paràgrafo'''",
+'diff-blockquote'         => "na '''citasion'''",
+'diff-h1'                 => "na '''intestasion (livèl 1)'''",
+'diff-h2'                 => "na '''intestasion (livèl 2)'''",
+'diff-h3'                 => "na '''intestasion (livèl 3)'''",
+'diff-h4'                 => "na '''intestasion (livèl 4)'''",
+'diff-h5'                 => "na '''intestasion (livèl 5)'''",
+'diff-pre'                => "un '''bloco za formatà'''",
+'diff-div'                => "na '''division'''",
+'diff-ul'                 => "na '''lista mia ordenà'''",
+'diff-ol'                 => "na '''lista ordenà'''",
+'diff-li'                 => "un '''elemento de la lista'''",
+'diff-table'              => "na '''tabèla'''",
+'diff-tbody'              => "el '''contenuto de na tabèla'''",
+'diff-tr'                 => "na '''riga'''",
+'diff-td'                 => "na '''casèla'''",
+'diff-th'                 => "na '''intestasion'''",
+'diff-br'                 => "na '''interusion'''",
+'diff-hr'                 => "na '''riga orizontal'''",
+'diff-code'               => "un '''toco de còdese da computer'''",
+'diff-dl'                 => "na '''lista de definissioni'''",
+'diff-dt'                 => "un '''termine de definission'''",
+'diff-dd'                 => "na '''definission'''",
+'diff-input'              => "un '''input'''",
+'diff-form'               => "un '''modulo'''",
+'diff-img'                => "na '''imagine'''",
+'diff-span'               => "un '''span'''",
+'diff-a'                  => "un '''colegamento'''",
+'diff-i'                  => "'''corsivo'''",
+'diff-b'                  => "'''grasseto'''",
+'diff-strong'             => "'''grasseto'''",
+'diff-em'                 => "'''ènfasi'''",
+'diff-font'               => "'''caràtere'''",
+'diff-big'                => "'''grando'''",
+'diff-del'                => "'''scancelà'''",
+'diff-tt'                 => "'''larghessa fissa'''",
+'diff-sub'                => "'''àpice'''",
+'diff-sup'                => "'''pèdice'''",
+'diff-strike'             => "'''sbarà'''",
 
 # Search results
-'searchresults'             => 'Risultato de la riçerca',
-'searchresulttext'          => 'Par verghe piassè informassion su la riçerca interna de {{SITENAME}}, varda [[{{MediaWiki:Helppage}}|Riçerca in {{SITENAME}}]].',
-'searchsubtitle'            => 'Te ghè çercà \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tute le pàxene che taca con "$1"]] | [[Special:WhatLinksHere/$1|tute le pàxene che punta a "$1"]])',
-'searchsubtitleinvalid'     => "Te ghè çercà '''$1'''",
-'noexactmatch'              => "'''La pàxena \"\$1\" no ła esiste.''' Te pol [[:\$1|crearla desso]].",
-'noexactmatch-nocreate'     => "'''No ghe xe nissuna pagina con titolo \"\$1\".'''",
-'toomanymatches'            => 'Xe stà catà massa corispondense, par piaser próa a modificar la richiesta.',
-'titlematches'              => 'Nei titołi de łe voçi',
-'notitlematches'            => 'Voçe richiesta mìa catà nei titoli de articolo',
-'textmatches'               => 'Corispondense nel testo de le pagine',
-'notextmatches'             => 'Voçe richiesta mìa catà nei testi dei articoli',
-'prevn'                     => 'precedenti $1',
-'nextn'                     => 'sucessivi $1',
-'viewprevnext'              => 'Varda ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|una parola|$2 parole}})',
-'search-result-score'       => 'Rilevansa: $1%',
-'search-redirect'           => '(rimando $1)',
-'search-section'            => '(sezion $1)',
-'search-suggest'            => 'Forsi te çercavi: $1',
-'search-interwiki-caption'  => 'Progeti fradèi',
-'search-interwiki-default'  => '$1 risultati:',
-'search-interwiki-more'     => '(piassè)',
-'search-mwsuggest-enabled'  => 'con sugerimenti',
-'search-mwsuggest-disabled' => 'senza sugerimenti',
-'search-relatedarticle'     => 'Ligà',
-'mwsuggest-disable'         => 'Disabilita sugerimenti AJAX',
-'searchrelated'             => 'ligà',
-'searchall'                 => 'tuti',
-'showingresults'            => "Qua de soto vien mostrà al massimo {{PLURAL:$1|'''1''' risultato|'''$1''' risultati}} a partir dal nùmaro '''$2'''.",
-'showingresultsnum'         => "Qua soto ghe xe {{PLURAL:$3|'''1''' risultato|'''$3''' risultati}} a partir da #'''$2'''.",
-'showingresultstotal'       => "De seguito vien mostrà {{PLURAL:$3|l'unico risultato|i risultati da '''$1''' a '''$2''' su un totale de '''$3'''}}",
-'nonefound'                 => "'''Ocio''': la riçerca la vien fata in automatico solo in çerti namespace. Se te voli sercar tra tuti i contenuti (conprese pagine de discussion, template, etc.) zónteghe ''all:'' davanti al testo che te serchi, o senò specifica el namespace in cui sercar.",
-'powersearch'               => 'Riçerca avansada',
-'powersearch-legend'        => 'Riçerca avanzada',
-'powersearch-ns'            => 'Serca in tei namespace:',
-'powersearch-redir'         => 'Elenca i redirect',
-'powersearch-field'         => 'Serca par',
-'search-external'           => 'Riçerca esterna',
-'searchdisabled'            => 'La riçerca interna de {{SITENAME}} no la xe ativa; par intanto te pol proár a doparar un motore de riçerca esterno come Google. (Nota però che i contenuti de {{SITENAME}} presenti in sti motori i podarìa èssar mìà agiornà.)',
+'searchresults'                    => 'Risultato de la riçerca',
+'searchresults-title'              => 'Risultati de la riçerca de "$1"',
+'searchresulttext'                 => 'Par verghe piassè informassion su la riçerca interna de {{SITENAME}}, varda [[{{MediaWiki:Helppage}}|Riçerca in {{SITENAME}}]].',
+'searchsubtitle'                   => 'Te ghè çercà \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|tute le pàxene che taca con "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|tute le pàxene che punta a "$1"]])',
+'searchsubtitleinvalid'            => "Te ghè çercà '''$1'''",
+'noexactmatch'                     => "'''La pàxena \"\$1\" no ła esiste.''' Te pol [[:\$1|crearla desso]].",
+'noexactmatch-nocreate'            => "'''No ghe xe nissuna pagina con titolo \"\$1\".'''",
+'toomanymatches'                   => 'Xe stà catà massa corispondense, par piaser próa a modificar la richiesta.',
+'titlematches'                     => 'Nei titołi de łe voçi',
+'notitlematches'                   => 'Voçe richiesta mìa catà nei titoli de articolo',
+'textmatches'                      => 'Corispondense nel testo de le pagine',
+'notextmatches'                    => 'Voçe richiesta mìa catà nei testi dei articoli',
+'prevn'                            => 'precedenti $1',
+'nextn'                            => 'sucessivi $1',
+'viewprevnext'                     => 'Varda ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Opzion de riserca',
+'searchmenu-exists'                => "*Pàxena '''[[$1]]'''",
+'searchmenu-new'                   => "'''Crèa la pàxena \"[[:\$1]]\" su sta wiki!'''",
+'searchhelp-url'                   => 'Help:Ajuto',
+'searchmenu-prefix'                => "[[Special:PrefixIndex/$1|Varda tute le pàxene co' sto prefisso]]",
+'searchprofile-articles'           => 'Pàxene de contenuti',
+'searchprofile-articles-and-proj'  => 'Pàxene de contenuti e projeti',
+'searchprofile-project'            => 'Pàxene del projèto',
+'searchprofile-images'             => 'File',
+'searchprofile-everything'         => 'Tuto quanto',
+'searchprofile-advanced'           => 'Avansada',
+'searchprofile-articles-tooltip'   => 'Serca in $1',
+'searchprofile-project-tooltip'    => 'Serca in $1',
+'searchprofile-images-tooltip'     => 'Serca file',
+'searchprofile-everything-tooltip' => 'Serca dapartuto (conprese le pàxene de discussion)',
+'searchprofile-advanced-tooltip'   => 'Serca nei namespace personalixài',
+'prefs-search-nsdefault'           => 'Serca doparando i predefinìi:',
+'prefs-search-nscustom'            => 'Serca in tei namespace personalixài:',
+'search-result-size'               => '$1 ({{PLURAL:$2|una parola|$2 parole}})',
+'search-result-score'              => 'Rilevansa: $1%',
+'search-redirect'                  => '(rimando $1)',
+'search-section'                   => '(sezion $1)',
+'search-suggest'                   => 'Forsi te çercavi: $1',
+'search-interwiki-caption'         => 'Progeti fradèi',
+'search-interwiki-default'         => '$1 risultati:',
+'search-interwiki-more'            => '(piassè)',
+'search-mwsuggest-enabled'         => 'con sugerimenti',
+'search-mwsuggest-disabled'        => 'senza sugerimenti',
+'search-relatedarticle'            => 'Ligà',
+'mwsuggest-disable'                => 'Disabilita sugerimenti AJAX',
+'searchrelated'                    => 'ligà',
+'searchall'                        => 'tuti',
+'showingresults'                   => "Qua de soto vien mostrà al massimo {{PLURAL:$1|'''1''' risultato|'''$1''' risultati}} a partir dal nùmaro '''$2'''.",
+'showingresultsnum'                => "Qua soto ghe xe {{PLURAL:$3|'''1''' risultato|'''$3''' risultati}} a partir da #'''$2'''.",
+'showingresultstotal'              => "De seguito vien mostrà {{PLURAL:$4|el risultato '''$1'''|i risultati da '''$1''' a '''$2'''}} su un totale de '''$3'''",
+'nonefound'                        => "'''Ocio''': la riçerca la vien fata in automatico solo in çerti namespace. Se te voli sercar tra tuti i contenuti (conprese pagine de discussion, template, etc.) zónteghe ''all:'' davanti al testo che te serchi, o senò specifica el namespace in cui sercar.",
+'search-nonefound'                 => 'La riserca no la gà catà gnente che corisponda ai criteri de riserca.',
+'powersearch'                      => 'Riçerca avansada',
+'powersearch-legend'               => 'Riçerca avanzada',
+'powersearch-ns'                   => 'Serca in tei namespace:',
+'powersearch-redir'                => 'Elenca i redirect',
+'powersearch-field'                => 'Serca par',
+'search-external'                  => 'Riçerca esterna',
+'searchdisabled'                   => 'La riçerca interna de {{SITENAME}} no la xe ativa; par intanto te pol proár a doparar un motore de riçerca esterno come Google. (Nota però che i contenuti de {{SITENAME}} presenti in sti motori i podarìa èssar mìà agiornà.)',
 
 # Preferences page
-'preferences'              => 'Preferense',
-'mypreferences'            => 'le me preferenze',
-'prefs-edits'              => 'Nùmaro de modifiche:',
-'prefsnologin'             => 'No te ghè eseguìo el login',
-'prefsnologintext'         => 'Te ghè da aver eseguìo el <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} login] par poder personalixare le to preferense.',
-'prefsreset'               => 'Le to Preferense le xè stà ripescae da la memoria de sistema del server de {{SITENAME}}.',
-'qbsettings'               => 'Settaggio barra menu',
-'qbsettings-none'          => 'Nessun',
-'qbsettings-fixedleft'     => 'Fisso a sinistra',
-'qbsettings-fixedright'    => 'Fisso a destra',
-'qbsettings-floatingleft'  => 'Fluttuante a sinistra',
-'qbsettings-floatingright' => 'Fluttuante a destra',
-'changepassword'           => 'Cambia Å‚a password',
-'skin'                     => 'Aspeto grafico',
-'math'                     => 'Formułe matematiche',
-'dateformat'               => 'Formato de la data',
-'datedefault'              => 'Nissuna preferensa',
-'datetime'                 => 'Data e ora',
-'math_failure'             => 'Eror del parser',
-'math_unknown_error'       => 'eror sconossiùo',
-'math_unknown_function'    => 'funzion sconossiùa',
-'math_lexing_error'        => 'eror lessicale',
-'math_syntax_error'        => 'eror de sintassi',
-'math_image_error'         => 'Conversion in PNG fałía',
-'math_bad_tmpdir'          => 'Inpossibile scrìvar o crear la directory tenporanea par math',
-'math_bad_output'          => 'Inpossibile scrìvar o crear la directory de output par math',
-'math_notexvc'             => 'Eseguibile texvc mancante; par piaser consulta math/README par la configurazion.',
-'prefs-personal'           => 'Profiło utente',
-'prefs-rc'                 => 'Ultime modifeghe',
-'prefs-watchlist'          => 'Osservati speciali',
-'prefs-watchlist-days'     => 'Nùmaro de giòrni da far védar nei osservati speciali:',
-'prefs-watchlist-edits'    => 'Nùmaro de modifiche da far védar con le funzion avanzade:',
-'prefs-misc'               => 'Preferense varie',
-'saveprefs'                => 'Salva le preferense',
-'resetprefs'               => 'Reinposta le preferense',
-'oldpassword'              => 'Vecia password:',
-'newpassword'              => 'Nova password:',
-'retypenew'                => 'Riscrivi la password nova:',
-'textboxsize'              => 'Dimension de la casela de modifica',
-'rows'                     => 'Righe:',
-'columns'                  => 'Cołone:',
-'searchresultshead'        => 'Riçerca',
-'resultsperpage'           => 'Nùmaro de risultati par pàxena:',
-'contextlines'             => 'Righe de testo par ciascun risultato',
-'contextchars'             => 'Caratteri par linea:',
-'stub-threshold'           => 'Valor minimo par i <a href="#" class="stub">colegamenti ai stub</a>:',
-'recentchangesdays'        => 'Nùmaro de giòrni da mostrar ne le ultime modifiche:',
-'recentchangescount'       => 'Nùmaro de modìfeghe da mostrar in modìfeghe reçenti, cronologia e pagine de registro:',
-'savedprefs'               => 'Le to preferense łe xè stà salvae.',
-'timezonelegend'           => 'Fuso orario',
-'timezonetext'             => "¹Inserissi el nùmaro de ore de difarensa fra la to ora locale e l'ora del server (UTC).",
-'localtime'                => 'Ora locale',
-'timezoneoffset'           => 'Difarenza¹',
-'servertime'               => 'Ora del server',
-'guesstimezone'            => "Dòpara l'ora del to browser",
-'allowemail'               => 'Consenti la ricezion de e-mail da altri utenti<sup>1</sup>',
-'prefs-searchoptions'      => 'Opsioni de riçerca',
-'prefs-namespaces'         => 'Namespace',
-'defaultns'                => 'Çerca in sti namespace se non diversamente specificà:',
-'default'                  => 'predefinìo',
-'files'                    => 'Imagini',
+'preferences'               => 'Preferense',
+'mypreferences'             => 'le me preferenze',
+'prefs-edits'               => 'Nùmaro de modifiche:',
+'prefsnologin'              => 'No te ghè eseguìo el login',
+'prefsnologintext'          => 'Te ghè da aver eseguìo el <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} login] par poder personalixare le to preferense.',
+'prefsreset'                => 'Le to Preferense le xè stà ripescae da la memoria de sistema del server de {{SITENAME}}.',
+'qbsettings'                => 'Settaggio barra menu',
+'qbsettings-none'           => 'Nessun',
+'qbsettings-fixedleft'      => 'Fisso a sinistra',
+'qbsettings-fixedright'     => 'Fisso a destra',
+'qbsettings-floatingleft'   => 'Fluttuante a sinistra',
+'qbsettings-floatingright'  => 'Fluttuante a destra',
+'changepassword'            => 'Cambia Å‚a password',
+'skin'                      => 'Aspeto grafico',
+'skin-preview'              => 'Anteprima',
+'math'                      => 'Formułe matematiche',
+'dateformat'                => 'Formato de la data',
+'datedefault'               => 'Nissuna preferensa',
+'datetime'                  => 'Data e ora',
+'math_failure'              => 'Eror del parser',
+'math_unknown_error'        => 'eror sconossiùo',
+'math_unknown_function'     => 'funzion sconossiùa',
+'math_lexing_error'         => 'eror lessicale',
+'math_syntax_error'         => 'eror de sintassi',
+'math_image_error'          => 'Conversion in PNG fałía',
+'math_bad_tmpdir'           => 'Inpossibile scrìvar o crear la directory tenporanea par math',
+'math_bad_output'           => 'Inpossibile scrìvar o crear la directory de output par math',
+'math_notexvc'              => 'Eseguibile texvc mancante; par piaser consulta math/README par la configurazion.',
+'prefs-personal'            => 'Profiło utente',
+'prefs-rc'                  => 'Ultime modifeghe',
+'prefs-watchlist'           => 'Osservati speciali',
+'prefs-watchlist-days'      => 'Nùmaro de giòrni da far védar nei osservati speciali:',
+'prefs-watchlist-days-max'  => '(massimo 7 zorni)',
+'prefs-watchlist-edits'     => 'Nùmaro de modifiche da far védar con le funzion avanzade:',
+'prefs-watchlist-edits-max' => '(nùmaro massimo: 1000)',
+'prefs-misc'                => 'Preferense varie',
+'prefs-resetpass'           => 'Cànbia password',
+'saveprefs'                 => 'Salva le preferense',
+'resetprefs'                => 'Reinposta le preferense',
+'textboxsize'               => 'Dimension de la casela de modifica',
+'prefs-edit-boxsize'        => 'Dimension de la finestra de modìfega.',
+'rows'                      => 'Righe:',
+'columns'                   => 'Cołone:',
+'searchresultshead'         => 'Riçerca',
+'resultsperpage'            => 'Nùmaro de risultati par pàxena:',
+'contextlines'              => 'Righe de testo par ciascun risultato',
+'contextchars'              => 'Caratteri par linea:',
+'stub-threshold'            => 'Valor minimo par i <a href="#" class="stub">colegamenti ai stub</a>:',
+'recentchangesdays'         => 'Nùmaro de giòrni da mostrar ne le ultime modifiche:',
+'recentchangesdays-max'     => '($1 {{PLURAL:$1|zorno|zorni}} massimo)',
+'recentchangescount'        => 'Nùmaro de modìfeghe da mostrar in ultime modìfeghe, cronologia e pagine de registro:',
+'savedprefs'                => 'Le to preferense łe xè stà salvae.',
+'timezonelegend'            => 'Fuso orario',
+'timezonetext'              => "¹Inserissi el nùmaro de ore de difarensa fra la to ora locale e l'ora del server (UTC).",
+'localtime'                 => 'Ora locale:',
+'timezoneselect'            => 'Fuso orario:',
+'timezoneuseserverdefault'  => "Dòpara l'ora del server",
+'timezoneuseoffset'         => 'Altro (speçifica difarensa)',
+'timezoneoffset'            => 'Difarensa¹:',
+'servertime'                => 'Ora del server:',
+'guesstimezone'             => "Dòpara l'ora del to browser",
+'allowemail'                => 'Consenti la ricezion de e-mail da altri utenti<sup>1</sup>',
+'prefs-searchoptions'       => 'Opsioni de riçerca',
+'prefs-namespaces'          => 'Namespace',
+'defaultns'                 => 'Çerca in sti namespace se non diversamente specificà:',
+'default'                   => 'predefinìo',
+'files'                     => 'Imagini',
 
 # User rights
 'userrights'                  => 'Gestion dei parmessi relativi ai utenti', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Gestion de i gruppi utente',
 'userrights-user-editname'    => 'Inserir el nome utente:',
 'editusergroup'               => 'Modifica grupi utente',
-'editinguser'                 => "Modifica dei diriti assegnà a l'utente '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Modifica dei diriti assegnà a l'utente '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Modifica grupi utente',
 'saveusergroups'              => 'Salva grupi utente',
 'userrights-groupsmember'     => 'Apartien ai grupi:',
@@ -952,6 +1145,8 @@ Assicùrete che la continuità storica de la pagina no la vegna alterà.',
 'right-minoredit'            => 'Segna le modifiche come picenine',
 'right-move'                 => 'Sposta pagine',
 'right-move-subpages'        => 'Sposta le pagine insieme co le so sotopagine',
+'right-move-rootuserpages'   => 'Sposta le pàxene prinsipài dei utenti',
+'right-movefile'             => 'Sposta file',
 'right-suppressredirect'     => 'Scancela un redirect co te sposti na pagina a quel titolo lì',
 'right-upload'               => 'Carga file',
 'right-reupload'             => 'Sorascrivi un file esistente',
@@ -1002,9 +1197,46 @@ Assicùrete che la continuità storica de la pagina no la vegna alterà.',
 'rightslogentry' => "gà modificà l'apartenenza de $1 dal grupo $2 al grupo $3",
 'rightsnone'     => '(nissun)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'lèxar sta pàxena',
+'action-edit'                 => 'modifegar sta pàxena',
+'action-createpage'           => 'crear pàxene nove',
+'action-createtalk'           => 'crear pàxene de discussion',
+'action-createaccount'        => 'crear sta utensa',
+'action-minoredit'            => 'segnar sta modìfega come picenina',
+'action-move'                 => 'spostar sta pàxena',
+'action-move-subpages'        => 'spostar sta pàxena e le so sotopàxene',
+'action-move-rootuserpages'   => 'spostar le pàxene prinsipài dei utenti',
+'action-movefile'             => 'sposta sto file',
+'action-upload'               => 'cargar sto file',
+'action-reupload'             => 'sorascrìvar sto file zà esistente',
+'action-reupload-shared'      => 'sorascrìvar sto file su un archivio condiviso',
+'action-upload_by_url'        => 'cargar sto file da un indirisso URL',
+'action-writeapi'             => 'doparar le API in scritura',
+'action-delete'               => 'scancelar sta pàxena',
+'action-deleterevision'       => 'scancelar sta version',
+'action-deletedhistory'       => 'vardar la cronologia scancelà de sta pàxena',
+'action-browsearchive'        => 'sercar pàxene scancelè',
+'action-undelete'             => 'recuperar sta pàxena',
+'action-suppressrevision'     => 'rivardar e ripristinar le modìfeghe sconte',
+'action-suppressionlog'       => 'vardar sto registro privato',
+'action-block'                => 'blocar sto utente in scritura',
+'action-protect'              => 'canbiar i livèi de protession par sta pàxena',
+'action-import'               => "inportar sta pàxena da n'antra wiki",
+'action-importupload'         => 'inportar sta pàxena tramite caricamento da file',
+'action-patrol'               => 'segnar le modìfeghe dei altri utenti come verificàe',
+'action-autopatrol'           => 'segnar le to modìfeghe come verificàe',
+'action-unwatchedpages'       => "vardar la lista de pàxene mia tegnùe d'ocio",
+'action-trackback'            => 'mandar na trackback',
+'action-mergehistory'         => 'unir la cronologia de sta pàxena',
+'action-userrights'           => 'canbiar tuti i diriti dei utenti',
+'action-userrights-interwiki' => 'canbiar i diriti dei utenti su altre wiki',
+'action-siteadmin'            => 'blocar e desblocar el database',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|modifica|modifiche}}',
 'recentchanges'                     => 'Ùltimi canbiamenti',
+'recentchanges-legend'              => 'Opzioni ultime modifiche',
 'recentchangestext'                 => 'Sta pàxena la presenta łe ultime modifeghe aportàe ai contenuti de el sito.',
 'recentchanges-feed-description'    => 'Sto feed qua el riporta le modifiche piassè recenti ai contenuti del sito.',
 'rcnote'                            => "Qua soto ghe xe {{PLURAL:$1|l'ultimo cambiamento|i ultimi '''$1''' canbiamenti}} ne {{PLURAL:$2|l'ultimo giòrno|i ultimi '''$2''' giòrni}}; i dati i xe agiornà a le ore $5 del $4.",
@@ -1028,6 +1260,8 @@ Assicùrete che la continuità storica de la pagina no la vegna alterà.',
 'rc_categories'                     => 'Limita a le categorie (separà da "|")',
 'rc_categories_any'                 => 'Qualsiasi',
 'newsectionsummary'                 => '/* $1 */ sezion nova',
+'rc-enhanced-expand'                => 'Mostra detagli (ghe vole JavaScript)',
+'rc-enhanced-hide'                  => 'Scondi detagli',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Modifeghe ligà a sta pàxena',
@@ -1050,11 +1284,11 @@ par poder cargar dei file.',
 'upload_directory_read_only'  => "El server web no l'è bon de scrìvar ne la directory de caricamento ($1).",
 'uploaderror'                 => 'Eror nel caricamento',
 'uploadtext'                  => "Par cargar novi file, dopara el modulo qua soto. 
-Par védar o çercar i file zà caricà, consulta la [[Special:ImageList|lista dei file caricà]]. I caricamenti de file te pol védarli nel [[Special:Log/upload|registro dei caricamenti]], le scancelasion nel [[Special:Log/delete|registro de le scancelasion]].
+Par védar o çercar i file zà caricà, consulta la [[Special:FileList|lista dei file caricà]]. I caricamenti de file te pol védarli nel [[Special:Log/upload|registro dei caricamenti]], le scancelasion nel [[Special:Log/delete|registro de le scancelasion]].
 
 Par métar un file drento de na pagina, te ghè da inserir un colegamento fato come uno de sti qua:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' par doparar la version conpleta de sto file
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|200px|thumb|left|testo alternativo]]</nowiki></tt>'''par inserir sto file co na larghessa de 200 pixel in te un riquadro a sinistra con 'testo alternativo' come descrission
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' par doparar la version conpleta de sto file
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|testo alternativo]]</nowiki></tt>'''par inserir sto file co na larghessa de 200 pixel in te un riquadro a sinistra con 'testo alternativo' come descrission
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' par inserir diretamente un colegamento al file sensa che el se véda in te la pagina",
 'upload-permitted'            => 'Tipi de file consentìi: $1.',
 'upload-preferred'            => 'Tipi de file consiglià: $1.',
@@ -1062,7 +1296,7 @@ Par métar un file drento de na pagina, te ghè da inserir un colegamento fato c
 'uploadlog'                   => 'File caricai',
 'uploadlogpage'               => 'Registro dei file caricai',
 'uploadlogpagetext'           => 'Qua se cata la lista dei ultimi files caricà.
-Varda la [[Special:NewImages|galerìa dei file nóvi]] par na vision de insieme.',
+Varda la [[Special:NewFiles|galerìa dei file nóvi]] par na vision de insieme.',
 'filename'                    => 'Nome del file',
 'filedesc'                    => 'Somario',
 'fileuploadsummary'           => 'Somario:',
@@ -1082,22 +1316,24 @@ Varda la [[Special:NewImages|galerìa dei file nóvi]] par na vision de insieme.
 'large-file'                  => 'Se racomanda de no superar mìa le dimension de $1 par ciascun file; sto file el xe grando $2.',
 'largefileserver'             => 'El file el supera le dimension consentìe da la configurazion del server.',
 'emptyfile'                   => 'El file che te ghè caricà el xè aparentemente vodo. Podarìa èssar par un eror nel nome del file. Par piaser controla se te vol dal bon caricar sto file.',
-'fileexists'                  => 'Un file con sto nome el esiste de xà, par piaser controła <strong><tt>$1</tt></strong> se no te sì sicuro de volerlo sovrascrìvar.',
-'filepageexists'              => "La pagina de descrizion de sto file la xe zà stà creà a l'indirizo <strong><tt>$1</tt></strong>, anca se no ghe xe gnancora un file co sto nome. La descrizion de l'ogeto inserìa in fase de caricamento no la vegnarà mìa fora su la pagina de discussion. Par far sì che l'ogeto el conpaja su la pagina de discussion, sarà necessario modificarla a man",
-'fileexists-extension'        => 'Ghe xe zà un file co un nome che ghe someja a sto qua:<br />
-Nome del file cargà: <strong><tt>$1</tt></strong><br />
-Nome del file esistente: <strong><tt>$2</tt></strong><br />
-Par piaser siegli un nome difarente.',
+'fileexists'                  => "Un file con sto nome el esiste de xà, par piaser controła '''<tt>$1</tt>''' se no te sì sicuro de volerlo sovrascrìvar.",
+'filepageexists'              => "La pagina de descrizion de sto file la xe zà stà creà a l'indirizo '''<tt>$1</tt>''', anca se no ghe xe gnancora un file co sto nome. La descrizion de l'ogeto inserìa in fase de caricamento no la vegnarà mìa fora su la pagina de discussion. Par far sì che l'ogeto el conpaja su la pagina de discussion, sarà necessario modificarla a man",
+'fileexists-extension'        => "Ghe xe zà un file co un nome che ghe someja a sto qua:<br />
+Nome del file cargà: '''<tt>$1</tt>'''<br />
+Nome del file esistente: '''<tt>$2</tt>'''<br />
+Par piaser siegli un nome difarente.",
 'fileexists-thumb'            => "<center>'''File zà esistente'''</center>",
-'fileexists-thumbnail-yes'    => "El file cargà el pararìa èssar el risultato de n'anteprima <i>(thumbnail)</i>. Verifica, par confronto, el file <strong><tt>$1</tt></strong>.<br />
+'fileexists-thumbnail-yes'    => "El file cargà el pararìa èssar el risultato de n'anteprima ''(thumbnail)''. Verifica, par confronto, el file '''<tt>$1</tt>'''.<br />
 Se se trata de la stessa imagine, ne le dimension originali, no xe necessario caricarghene altre anteprime.",
-'file-thumbnail-no'           => "El nome del file el scuminsia con <strong><tt>$1</tt></strong>.
-Pararìà quindi che el fusse el risultato de n'anteprima <i>(thumbnail)</i>.
+'file-thumbnail-no'           => "El nome del file el scuminsia con '''<tt>$1</tt>'''.
+Pararìà quindi che el fusse el risultato de n'anteprima ''(thumbnail)''.
 Se se dispone de l'imagine ne la risoluzion originale, se prega di cargarla. In caso contrario, se prega de canbiar el nome del file.",
-'fileexists-forbidden'        => 'Un file con sto nome el esiste xà; per favore torna indrio e cambia el nome che te voi dare al file. [[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => 'Un file con sto nome el esiste xà, e no se pode scrìvarghe insima.
+Se te vol cargar istesso el to file, par piaser torna indrio e cànbia el nome da darghe al file. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => "Un file con sto nome l'esiste de xà ne l'archivio de risorse multimediałi condivixe.
-Se te vol cargar el file istesso, par piaser torna indrio e canbia el nome che te vol darghe al file. [[Image:$1|thumb|center|$1]]",
+Se te vol cargar el file istesso, par piaser torna indrio e canbia el nome che te vol darghe al file. [[File:$1|thumb|center|$1]]",
 'file-exists-duplicate'       => 'Sto file el xe un duplicato {{PLURAL:$1|del seguente file|dei seguenti file}}:',
+'file-deleted-duplicate'      => "Un file preciso identico de sto file ([[$1]]) el xe stà zà scancelà in precedensa. Te dovaressi darghe n'ociada a la cronologia scancelà prima de cargarlo de novo.",
 'successfulupload'            => 'Caricamento conpletà',
 'uploadwarning'               => 'Avixo de caricamento',
 'savefile'                    => 'Salva file',
@@ -1117,7 +1353,7 @@ Se te vol cargar el file istesso, par piaser torna indrio e canbia el nome che t
 
 Verifica par piaser se xe el caso de continuare col caricamento de sto file.
 Par to comodità qua ghe xe la registrazion de la scancelazion:",
-'filename-bad-prefix'         => 'El nome del file che te sì drio cargar el scuminsia con <strong>"$1"</strong>, che el xe un nome non-descritivo tipicamente assegnà automaticamente da le fotocàmare digitali. Par piaser siegli un nome piassè descritivo par el to file.',
+'filename-bad-prefix'         => "El nome del file che te sì drio cargar el scuminsia con '''\"\$1\"''', che el xe un nome non-descritivo tipicamente assegnà automaticamente da le fotocàmare digitali. Par piaser siegli un nome piassè descritivo par el to file.",
 
 'upload-proto-error'      => 'Protocòl mìa giusto',
 'upload-proto-error-text' => 'Par el caricamento remoto bisogna specificar URL che scuminsia con <code>http://</code> opure <code>ftp://</code>.',
@@ -1141,20 +1377,21 @@ Se el problema el persiste, contatar un [[Special:ListUsers/sysop|aministrador]]
 'upload_source_url'  => ' (na URL coreta e acessibile)',
 'upload_source_file' => ' (un file sul to computer)',
 
-# Special:ImageList
-'imagelist-summary'     => "Sta pagina speciale la fa védar tuti i file caricài.
+# Special:ListFiles
+'listfiles-summary'     => "Sta pagina speciale la fa védar tuti i file caricài.
 I file caricài piessè de reçente i vien mostrà a l'inizio de la lista.
 Par modificar l'ordinamento, struca su l'intestazion de la colona presièlta.",
-'imagelist_search_for'  => 'Çerca imagini par nome:',
+'listfiles_search_for'  => 'Çerca imagini par nome:',
 'imgfile'               => 'file',
-'imagelist'             => 'Imagini',
-'imagelist_date'        => 'Data',
-'imagelist_name'        => 'Nome',
-'imagelist_user'        => 'Utente',
-'imagelist_size'        => 'Dimension in byte',
-'imagelist_description' => 'Descrizion',
-
-# Image description page
+'listfiles'             => 'Imagini',
+'listfiles_date'        => 'Data',
+'listfiles_name'        => 'Nome',
+'listfiles_user'        => 'Utente',
+'listfiles_size'        => 'Dimension in byte',
+'listfiles_description' => 'Descrizion',
+'listfiles_count'       => 'Versioni',
+
+# File description page
 'filehist'                       => 'Cronologia del file',
 'filehist-help'                  => 'Maca su un grupo data/ora par védar el file come el se presentava nel momento indicà.',
 'filehist-deleteall'             => 'scancela tuto',
@@ -1162,19 +1399,25 @@ Par modificar l'ordinamento, struca su l'intestazion de la colona presièlta.",
 'filehist-revert'                => 'ripristina',
 'filehist-current'               => 'corente',
 'filehist-datetime'              => 'Data/Ora',
+'filehist-thumb'                 => 'Miniatura',
+'filehist-thumbtext'             => 'Miniatura par la version del $1',
+'filehist-nothumb'               => 'Nissuna miniatura',
 'filehist-user'                  => 'Utente',
 'filehist-dimensions'            => 'Dimensioni',
 'filehist-filesize'              => 'Dimension del file',
 'filehist-comment'               => 'Ogeto',
-'imagelinks'                     => "Colegamenti a l'imagine",
+'imagelinks'                     => 'Colegamenti al file',
 'linkstoimage'                   => '{{PLURAL:$1|La pagina seguente la|Le $1 pàxene seguenti le}} riciama sto file:',
+'linkstoimage-more'              => 'Piassè de $1 {{PLURAL:$1|pagina la ponta|pagine le ponta}} a sto file.
+De seguito xe elencà solo {{PLURAL:$1|la prima pagina che ponta|le prime $1 pagine che ponta}} a sto file.
+Se pode védar un [[Special:WhatLinksHere/$2|elenco par intiero]].',
 'nolinkstoimage'                 => 'Nissuna pàxena la punta a sta imagine.',
 'morelinkstoimage'               => 'Varda i [[Special:WhatLinksHere/$1|altri colegamenti]] verso sto file.',
 'redirectstofile'                => '{{PLURAL:$1|El file seguente el|I $1 file seguenti i}} redirige verso sto file:',
-'duplicatesoffile'               => '{{PLURAL:$1|El file seguente el|I $1 file seguenti i}} xe dei dopioni de sto file:',
+'duplicatesoffile'               => '{{PLURAL:$1|El file seguente el xe un dopion|I $1 file seguenti i xe dei dopioni}} de sto file ([[Special:FileDuplicateSearch/$2|ulteriori detagli]]):',
 'sharedupload'                   => 'Sto file qua el xe un caricamento condiviso; quindi el pol èssar doparà da più progeti wiki.',
 'shareduploadwiki'               => 'Varda $1 par ulteriori informazion.',
-'shareduploadwiki-desc'          => 'La descrizion che se cata su la so $1 nel deposito condiviso la vien mostrà de seguito.',
+'shareduploadwiki-desc'          => 'La descrizion che se cata su la so $1 la vien mostrà qua soto.',
 'shareduploadwiki-linktext'      => 'pagina de descrizion del file',
 'shareduploadduplicate'          => 'Sto file el xe un duplicato del file $1 che se cata in tel deposito condiviso.',
 'shareduploadduplicate-linktext' => "n'altro file",
@@ -1198,7 +1441,7 @@ Par modificar l'ordinamento, struca su l'intestazion de la colona presièlta.",
 # File deletion
 'filedelete'                  => 'Scancela $1',
 'filedelete-legend'           => 'Scancela el file',
-'filedelete-intro'            => "Te stè par scancelar '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Te stè par scancelar el file '''[[Media:$1|$1]]''' insieme co' tuta la so cronologia.",
 'filedelete-intro-old'        => "Te sì drio scancelar la version de '''[[Media:$1|$1]]''' del [$4 $3, $2].",
 'filedelete-comment'          => 'Motivo:',
 'filedelete-submit'           => 'Scancela',
@@ -1206,7 +1449,6 @@ Par modificar l'ordinamento, struca su l'intestazion de la colona presièlta.",
 'filedelete-success-old'      => "La version del $3, $2 del file '''[[Media:$1|$1]]''' la xe stà scancelà.",
 'filedelete-nofile'           => 'No esiste un file $1.',
 'filedelete-nofile-old'       => "In archivio no ghe xe version de '''$1''' con le carateristiche indicà",
-'filedelete-iscurrent'        => 'Te stè proando a scancelar la version piassè recente de sto file. Par piaser, prima ripòrtelo a na version precedente.',
 'filedelete-otherreason'      => 'Altra motivazion o motivazion agiuntiva:',
 'filedelete-reason-otherlist' => 'Altra motivazion',
 'filedelete-reason-dropdown'  => '*Motivazion piassè comuni par la scancelazion
@@ -1233,27 +1475,31 @@ Par modificar l'ordinamento, struca su l'intestazion de la colona presièlta.",
 
 # Random page
 'randompage'         => 'Pàxena a caso',
-'randompage-nopages' => 'Nissuna pagina nel namespace selezionà.',
+'randompage-nopages' => 'Nissuna pàxena in tel namespace "$1".',
 
 # Random redirect
 'randomredirect'         => 'Un redirect a caso',
-'randomredirect-nopages' => 'Nissun redirect nel namespace selezionà.',
+'randomredirect-nopages' => 'No ghe xe nissun rimando in tel namespace "$1".',
 
 # Statistics
-'statistics'             => 'Statistiche',
-'sitestats'              => 'Statistiche de {{SITENAME}}',
-'userstats'              => 'Statistiche dei utenti',
-'sitestatstext'          => "Ghe xe in tuto {{PLURAL:\$1|'''1''' pagina|'''\$1''' pagine}} nel database.
-Sto nùmaro el conprende anca le pagine de discussion, quele de servizio de {{SITENAME}}, le voçi pì picenine (\"stub\"), i redirect e altre pagine che probabilmente no le va mìa considerà tra i contenuti del sito.
-Escludendo tute le pagine sora descrite, ghe ne xè '''\$2''' de contenuti veri e propri.
-
-Xe stà inoltre caricà '''\$8''' file.
-
-Da l'instalazion del sito fin a sto momento, xe stà visità '''\$3''' pagine ed eseguìe '''\$4''' modifeghe, pari a na media de '''\$5''' modifeghe par pàxena e '''\$6''' richieste de letura par ciascuna modifega.
-
-La [http://www.mediawiki.org/wiki/Manual:Job_queue coa] la contien '''\$7''' proçessi.",
-'userstatstext'          => "Ghe xe {{PLURAL:$1|'''1''' [[Special:ListUsers|utente]]|'''$1''' [[Special:ListUsers|utenti]]}} registrà, de cui '''$2''' (pari al '''$4%''') {{PLURAL:$2|el|i}} gà i diriti de $5.",
-'statistics-mostpopular' => 'Pagine piassè visità',
+'statistics'                   => 'Statistiche',
+'statistics-header-pages'      => 'Statìsteghe relative a le pàxene',
+'statistics-header-edits'      => 'Statìsteghe relative a i canbiamenti',
+'statistics-header-views'      => 'Statìsteghe relative a le visualizassion',
+'statistics-header-users'      => 'Statistiche dei utenti',
+'statistics-articles'          => 'Pàxene de contenuti',
+'statistics-pages'             => 'Pàxene',
+'statistics-pages-desc'        => 'Tute quante le pàxene de la wiki, conprese le pàxene de discussion, i rimandi, ecc.',
+'statistics-files'             => 'File cargà',
+'statistics-edits'             => "Modifiche a scuminsiar da l'istalassion de {{SITENAME}}",
+'statistics-edits-average'     => 'Canbiamenti in media par pàxena',
+'statistics-views-total'       => 'Visualizasion totali',
+'statistics-views-peredit'     => 'Visualizassion par modifica',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue Cóa dei processi] da far girar in background',
+'statistics-users'             => '[[Special:ListUsers|Utenti]] registrà',
+'statistics-users-active'      => 'Utenti atìvi',
+'statistics-users-active-desc' => "Utenti che gà fato almanco un'azion in {{PLURAL:$1|tel'ultimo zorno|in tei ultimi $1 zorni}}",
+'statistics-mostpopular'       => 'Pagine piassè visità',
 
 'disambiguations'      => 'Pàxene de disanbiguazion',
 'disambiguationspage'  => 'Template:Disambigua',
@@ -1266,7 +1512,7 @@ Vien considerà pagine de disanbiguazion tute quele che contien i template elenc
 'double-redirect-fixer'      => 'Coretòr de redirect',
 
 'brokenredirects'        => 'Redirect mìa giusti',
-'brokenredirectstext'    => 'I seguenti redirect i punta a articoli gnancora creai.',
+'brokenredirectstext'    => 'I seguenti rimandi i punta a pàxene che no esiste:',
 'brokenredirects-edit'   => '(modifica)',
 'brokenredirects-delete' => '(scancela)',
 
@@ -1296,7 +1542,8 @@ Vien considerà pagine de disanbiguazion tute quele che contien i template elenc
 'popularpages'            => 'Pàxene pì viste',
 'wantedcategories'        => 'Categorie richieste',
 'wantedpages'             => 'Pàxene pì richieste',
-'missingfiles'            => 'File mancanti',
+'wantedfiles'             => 'File domandà',
+'wantedtemplates'         => 'Template richiesti',
 'mostlinked'              => 'Pàxene piassè puntà',
 'mostlinkedcategories'    => 'Categorie piassè riciamae',
 'mostlinkedtemplates'     => 'Template piassè doparà',
@@ -1310,12 +1557,15 @@ Vien considerà pagine de disanbiguazion tute quele che contien i template elenc
 'deadendpagestext'        => 'Le pagine indicà de seguito no le gà colegamenti verso altre pagine de {{SITENAME}}.',
 'protectedpages'          => 'Pagine protete',
 'protectedpages-indef'    => 'Solo le protezion infinìe',
+'protectedpages-cascade'  => 'Solo protezion ricorsive',
 'protectedpagestext'      => 'De seguito vien presentà un elenco de pagine protete, che no se pol modificar o spostar',
 'protectedpagesempty'     => 'Al momento no ghe xe pagine protete',
 'protectedtitles'         => 'Titoli proteti',
 'protectedtitlestext'     => 'No se pol crear pagine coi titoli elencà de seguito',
 'protectedtitlesempty'    => 'Al momento no ghe xe titoli proteti coi parametri specificà.',
 'listusers'               => 'Elenco dei utenti',
+'listusers-editsonly'     => 'Fà védar sol che i utenti che gà fato dei contributi',
+'usereditcount'           => '$1 {{PLURAL:$1|contributo|contributi}}',
 'newpages'                => 'Pàxene nove',
 'newpages-username'       => 'Nome utente:',
 'ancientpages'            => 'Pàxene pì vece',
@@ -1336,14 +1586,15 @@ Vien considerà pagine de disanbiguazion tute quele che contien i template elenc
 'booksources-search-legend' => 'Riçerca de fonti librarie',
 'booksources-go'            => 'Và',
 'booksources-text'          => 'De seguito vien presentà un elenco de colegamenti verso siti foresti che vende libri novi e usài, atraverso i quali se pol otegner piassè informazioni sul testo çercà.',
+'booksources-invalid-isbn'  => "The given ISBN number does not appear to be valid; check for errors copying from the original source.
+
+El nùmaro ISBN inserìo no'l xe mia valido: controla de novo se te l'è scrito justo.",
 
 # Special:Log
 'specialloguserlabel'  => 'Utente:',
 'speciallogtitlelabel' => 'Titolo:',
 'log'                  => 'Registro',
 'all-logs-page'        => 'Tuti i registri',
-'log-search-legend'    => 'Riçerca nei registri',
-'log-search-submit'    => 'Và',
 'alllogstext'          => 'Vixualixazion unificà de tuti i registri disponibili de {{SITENAME}}. 
 Te podi restrénzar i criteri de riçerca selezionando el tipo de registro, el nome utente, o la pàxena interessà (ocio che sti ultimi du i distingue tra majuscolo e minuscolo).',
 'logempty'             => "El registro no'l contien mìa elementi corispondenti a la riçerca.",
@@ -1355,6 +1606,7 @@ Te podi restrénzar i criteri de riçerca selezionando el tipo de registro, el n
 'nextpage'          => 'Pàxena dopo ($1)',
 'prevpage'          => 'Pagina precedente ($1)',
 'allpagesfrom'      => 'Mostra łe pàxene scominsiando da:',
+'allpagesto'        => 'Fà védar le pagine fin a:',
 'allarticles'       => 'Tute le voçi',
 'allinnamespace'    => 'Tute łe pàxene ($1 namespace)',
 'allnotinnamespace' => 'Tute łe pàxene (via de quele nel namespace $1)',
@@ -1374,41 +1626,69 @@ Varda anca le [[Special:WantedCategories|categorie domandà]].',
 'special-categories-sort-count' => 'ordina par nùmaro',
 'special-categories-sort-abc'   => 'ordina alfabeticamente',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Contributi utente scancelà',
+
+# Special:LinkSearch
+'linksearch'       => 'Colegamenti foresti',
+'linksearch-pat'   => 'Pattern de riçerca:',
+'linksearch-ns'    => 'Namespace:',
+'linksearch-ok'    => 'Çerca',
+'linksearch-text'  => 'Se pol doparar dei metacaràteri, par es. "*.wikipedia.org".<br />
+Protocòli suportè: <tt>$1</tt>',
+'linksearch-line'  => '$1 presente ne la pagina $2',
+'linksearch-error' => "I metacaràteri i pode vegner doparài solo a l'inizio del nome de l'host.",
+
 # Special:ListUsers
 'listusersfrom'      => 'Mostra i utenti tacando da:',
 'listusers-submit'   => 'Mostra',
 'listusers-noresult' => 'Nissun utente el risponde ai criteri inpostà.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Registro utenti novi',
+'newuserlogpagetext'          => 'Sto qua el xè el registro dei novi utenti registrai.',
+'newuserlog-byemail'          => 'password spedìa par e-mail',
+'newuserlog-create-entry'     => 'se gà registrà',
+'newuserlog-create2-entry'    => 'ga registrà el nome utente $1',
+'newuserlog-autocreate-entry' => 'Account creà automaticamente',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Diriti dei grupi utenti',
-'listgrouprights-summary'  => 'Sta qua la xe na lista dei grupi de utenti definìi su sta wiki, coi diriti asocià a ognuno.
+'listgrouprights'                 => 'Diriti dei grupi utenti',
+'listgrouprights-summary'         => 'Sta qua la xe na lista dei grupi de utenti definìi su sta wiki, coi diriti asocià a ognuno.
 Se pol consultar anca dele altre [[{{MediaWiki:Listgrouprights-helppage}}|informassion in pi]] sui diriti individuali.',
-'listgrouprights-group'    => 'Grupo',
-'listgrouprights-rights'   => 'Diriti',
-'listgrouprights-helppage' => 'Help:Diriti dei grupi',
-'listgrouprights-members'  => '(lista dei menbri)',
+'listgrouprights-group'           => 'Grupo',
+'listgrouprights-rights'          => 'Diriti',
+'listgrouprights-helppage'        => 'Help:Diriti dei grupi',
+'listgrouprights-members'         => '(lista dei menbri)',
+'listgrouprights-addgroup'        => 'Pode zontar {{PLURAL:$2|al grupo|ai grupi}}: $1',
+'listgrouprights-removegroup'     => 'Pode cavar {{PLURAL:$2|dal grupo|dai grupi}}: $1',
+'listgrouprights-addgroup-all'    => 'Pode zontar tuti i grupi',
+'listgrouprights-removegroup-all' => 'Pode cavar tuti i grupi',
 
 # E-mail user
-'mailnologin'     => 'Nissun indirizo a cui mandarghe el messagio',
-'mailnologintext' => 'Par inviare messagi e-mail ad altri utenti xè neçessario [[Special:UserLogin|açedere al sito]] e aver registrà un indirisso vałido ne łe proprie [[Special:Preferences|preferense]].',
-'emailuser'       => "Scrivi a l'utente",
-'emailpage'       => "Scrivi na e-mail a l'utente",
-'emailpagetext'   => 'Te podi usar el modulo chi soto par mandare na e-mail a sto utente.
+'mailnologin'      => 'Nissun indirizo a cui mandarghe el messagio',
+'mailnologintext'  => 'Par inviare messagi e-mail ad altri utenti xè neçessario [[Special:UserLogin|açedere al sito]] e aver registrà un indirisso vałido ne łe proprie [[Special:Preferences|preferense]].',
+'emailuser'        => "Scrivi a l'utente",
+'emailpage'        => "Scrivi na e-mail a l'utente",
+'emailpagetext'    => 'Te podi usar el modulo chi soto par mandare na e-mail a sto utente.
 La e-mail che te ghè indicà ne le [[Special:Preferences|to preferense]] la vegnarà fora nel canpo "Da" de la mail, così che el destinatario el possa rispóndarte a ti diretamente.',
-'usermailererror' => "L'ogeto mail el gà restituìo l'eror:",
-'defemailsubject' => 'Messagio da {{SITENAME}}',
-'noemailtitle'    => 'Nissun indirisso e-mail',
-'noemailtext'     => "Sto utente no'l gà registrà nissuna casela e-mail, opure el gà sielto de no riçévar posta eletronica dai altri utenti.",
-'emailfrom'       => 'Da:',
-'emailto'         => 'A:',
-'emailsubject'    => 'Ogeto:',
-'emailmessage'    => 'Messajo:',
-'emailsend'       => 'Invia',
-'emailccme'       => 'Màndeme na copia al me indirizo.',
-'emailccsubject'  => 'Copia del messagio invià a $1: $2',
-'emailsent'       => 'E-mail invià',
-'emailsenttext'   => 'La to e-mail la xè stà invià.',
-'emailuserfooter' => 'Sta e-mail la xe stà mandà da $1 a $2 \'traverso la funsion "Manda na e-mail a l\'utente" su {{SITENAME}}.',
+'usermailererror'  => "L'ogeto mail el gà restituìo l'eror:",
+'defemailsubject'  => 'Messagio da {{SITENAME}}',
+'noemailtitle'     => 'Nissun indirisso e-mail',
+'noemailtext'      => "Sto utente no'l gà indicà nissuna casela e-mail valida.",
+'nowikiemailtitle' => 'Posta elétronega mia parmessa',
+'nowikiemailtext'  => 'Sto utente el ga sielto de no riçévar e-mail da i altri utenti.',
+'email-legend'     => "Màndeghe na e-mail a n'altro utente de {{SITENAME}}",
+'emailfrom'        => 'Da:',
+'emailto'          => 'A:',
+'emailsubject'     => 'Ogeto:',
+'emailmessage'     => 'Messajo:',
+'emailsend'        => 'Invia',
+'emailccme'        => 'Màndeme na copia al me indirizo.',
+'emailccsubject'   => 'Copia del messagio invià a $1: $2',
+'emailsent'        => 'E-mail invià',
+'emailsenttext'    => 'La to e-mail la xè stà invià.',
+'emailuserfooter'  => 'Sta e-mail la xe stà mandà da $1 a $2 \'traverso la funsion "Manda na e-mail a l\'utente" su {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => "Pagine tegnùe d'ocio",
@@ -1441,12 +1721,7 @@ Se pì avanti te vorè cavar sta articolo da la to lista de Osservati Speciali,
 'iteminvalidname'      => "Problemi con la voçe '$1', nome mìa vałido...",
 'wlnote'               => "Qua soto te cati {{PLURAL:$1|l'ultimo canbiamento|i ultimi '''$1''' canbiamenti}} ne {{PLURAL:$2|l'ultima ora|le ultime '''$2''' ore}}.",
 'wlshowlast'           => 'Mostra le ultime $1 ore $2 giòrni $3',
-'watchlist-show-bots'  => 'Mostra le modifiche dei bot',
-'watchlist-hide-bots'  => 'Scondi le modifiche dei bot',
-'watchlist-show-own'   => 'Mostra le me modifiche',
-'watchlist-hide-own'   => 'Scondi le me modifiche',
-'watchlist-show-minor' => 'Mostra le modifiche picenine',
-'watchlist-hide-minor' => 'Scondi le modifiche picenine',
+'watchlist-options'    => 'Preferense par i osservati speciali',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Zonto ai oservati speciali...',
@@ -1485,76 +1760,96 @@ Par canbiar łe inpostassion de i to osservati speciałi, visita
 Par riscontri e ulteriore assistensa:
 {{fullurl:Help:Ciacołe}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Scanceła pàxena',
-'confirm'                     => 'Conferma',
-'excontent'                   => "el contenuto xera: '$1'",
-'excontentauthor'             => "el contenuto l'era: '$1' (e l'unico contribudor l'era '$2')",
-'exbeforeblank'               => "El contenuto prima de lo svodamento xera: '$1'",
-'exblank'                     => "ła pàxena l'era voda",
-'delete-confirm'              => 'Scancela "$1"',
-'delete-legend'               => 'Scancela',
-'historywarning'              => 'Ocio: La pàxena che te stè par scancełar la gà na cronołogia:',
-'confirmdeletetext'           => "Te stè par scancełar permanentemente da el database na pàxena o na imagine, insieme a tuta la so cronołogia.
+# Delete
+'deletepage'             => 'Scanceła pàxena',
+'confirm'                => 'Conferma',
+'excontent'              => "el contenuto xera: '$1'",
+'excontentauthor'        => "el contenuto l'era: '$1' (e l'unico contribudor l'era '$2')",
+'exbeforeblank'          => "El contenuto prima de lo svodamento xera: '$1'",
+'exblank'                => "ła pàxena l'era voda",
+'delete-confirm'         => 'Scancela "$1"',
+'delete-legend'          => 'Scancela',
+'historywarning'         => 'Ocio: La pàxena che te stè par scancełar la gà na cronołogia:',
+'confirmdeletetext'      => "Te stè par scancełar permanentemente da el database na pàxena o na imagine, insieme a tuta la so cronołogia.
 Par piaser, conferma che l'è to intenzion proçedere a tałe scancełazion, conferma che te ghè piena consapevołeza de łe conseguense de la to azion, e conferma che la to azion l'è pienamente otenperante a łe regołe stabilíe in
 [[{{MediaWiki:Policy-url}}]].",
-'actioncomplete'              => 'Azión conpletà',
-'deletedtext'                 => 'La pàxena "<nowiki>$1</nowiki>" l\'è stà scancełà. Varda $2 par un ełenco de łe pàxene scancełae de reçente.',
-'deletedarticle'              => 'Scancełà "$1"',
-'suppressedarticle'           => 'sconto "[[$1]]"',
-'dellogpage'                  => 'Registro de scancełassión',
-'dellogpagetext'              => 'Qui de seguito ghe xe un ełenco de łe pàxene scancełae de reçente.',
-'deletionlog'                 => 'Registro de scancełasión',
-'reverted'                    => 'Ripristinà la version preçedente',
-'deletecomment'               => 'Motivo de ła scancełazion:',
-'deleteotherreason'           => 'Altra motivazion o motivazion agiuntiva:',
-'deletereasonotherlist'       => 'Altra motivazion',
-'deletereason-dropdown'       => "*Motivazion piassè comuni par la scancelazion
+'actioncomplete'         => 'Azión conpletà',
+'deletedtext'            => 'La pàxena "<nowiki>$1</nowiki>" l\'è stà scancełà. Varda $2 par un ełenco de łe pàxene scancełae de reçente.',
+'deletedarticle'         => 'Scancełà "$1"',
+'suppressedarticle'      => 'sconto "[[$1]]"',
+'dellogpage'             => 'Registro de scancełassión',
+'dellogpagetext'         => 'Qui de seguito ghe xe un ełenco de łe pàxene scancełae de reçente.',
+'deletionlog'            => 'Registro de scancełasión',
+'reverted'               => 'Ripristinà la version preçedente',
+'deletecomment'          => 'Motivo de ła scancełazion:',
+'deleteotherreason'      => 'Altra motivazion o motivazion agiuntiva:',
+'deletereasonotherlist'  => 'Altra motivazion',
+'deletereason-dropdown'  => "*Motivazion piassè comuni par la scancelazion
 ** Richiesta de l'autor
 ** Violazion de copyright
 ** Vandalismo",
-'delete-edit-reasonlist'      => 'Modifica le motivazion par la scancelazion',
-'delete-toobig'               => 'La cronologia de sta pagina la xe longa assè (oltre $1 {{PLURAL:$1|revision|revisioni}}). La so scancelazion la xe stà limità par evitar de crear acidentalmente dei problemi de funzionamento al database de {{SITENAME}}.',
-'delete-warning-toobig'       => 'La cronologia de sta pagina le xe longa assè (oltre $1 {{PLURAL:$1|revision|revisioni}}). La so scancelazion la pode crear dei problemi de funzionamento al database de {{SITENAME}}; procedi con cautela.',
-'rollback'                    => 'Anula le modifiche',
-'rollback_short'              => 'Tira indrìo',
-'rollbacklink'                => 'tira indrìo',
-'rollbackfailed'              => 'Ripristino mìa riussìo',
-'cantrollback'                => "No xè mia possibiłe tornar a na versión precedente: l'ultima modifica la xè stà aportà da l'unico utente che gà laorà a sto articoło.",
-'alreadyrolled'               => "No xè mia possibile efetuar el ripristino de [[:$1]] da [[User:$2|$2]] ([[User talk:$2|discussion]] | [[Special:Contributions/$2|{{int:contribslink}}]]); qualcun altro gà xà modificà o efetuà el ripristino de sta voçe.
-
-L'ultima modefega l'è stà fata da [[User:$3|$3]] ([[User talk:$3|discussion]] | [[Special:Contributions/$3|{{int:contribslink}}]]).",
-'editcomment'                 => 'El comento a la modifica el xera: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Anułàe łe modifeghe de [[Special:Contributions/$2|$2]] ([[User talk:$2|discussion]]), riportà a ła version preçedente de [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Anulà le modifiche de $1; riportà a la version precedente de $2.',
-'sessionfailure'              => "Se gà verificà un problema ne la session che identifica l'acesso; el sistema, par precauzion, no'l gà mìa eseguìo el comando che te ghè dato. Torna a la pagina precedente col boton 'Indrìo' del to browser, ricarica la pagina e ripróa da novo.",
+'delete-edit-reasonlist' => 'Modifica le motivazion par la scancelazion',
+'delete-toobig'          => 'La cronologia de sta pagina la xe longa assè (oltre $1 {{PLURAL:$1|revision|revisioni}}). La so scancelazion la xe stà limità par evitar de crear acidentalmente dei problemi de funzionamento al database de {{SITENAME}}.',
+'delete-warning-toobig'  => 'La cronologia de sta pagina le xe longa assè (oltre $1 {{PLURAL:$1|revision|revisioni}}). La so scancelazion la pode crear dei problemi de funzionamento al database de {{SITENAME}}; procedi con cautela.',
+
+# Rollback
+'rollback'         => 'Anula le modifiche',
+'rollback_short'   => 'Tira indrìo',
+'rollbacklink'     => 'tira indrìo',
+'rollbackfailed'   => 'Ripristino mìa riussìo',
+'cantrollback'     => "No xè mia possibiłe tornar a na versión precedente: l'ultima modifica la xè stà aportà da l'unico utente che gà laorà a sto articoło.",
+'alreadyrolled'    => "No xè mia possibile efetuar el ripristino de [[:$1]] da [[User:$2|$2]] ([[User talk:$2|discussion]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); qualcun altro gà xà modificà o efetuà el ripristino de sta voçe.
+
+L'ultima modefega l'è stà fata da [[User:$3|$3]] ([[User talk:$3|discussion]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
+'editcomment'      => "El comento a la modifica el xera: \"''\$1''\".", # only shown if there is an edit comment
+'revertpage'       => 'Anułàe łe modifeghe de [[Special:Contributions/$2|$2]] ([[User talk:$2|discussion]]), riportà a ła version preçedente de [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Anulà le modifiche de $1; riportà a la version precedente de $2.',
+'sessionfailure'   => "Se gà verificà un problema ne la session che identifica l'acesso; el sistema, par precauzion, no'l gà mìa eseguìo el comando che te ghè dato. Torna a la pagina precedente col boton 'Indrìo' del to browser, ricarica la pagina e ripróa da novo.",
+
+# Protect
 'protectlogpage'              => 'Registro de protezión',
 'protectlogtext'              => 'De seguito xe elencàe le azion de protezion e sbloco de le pagine.',
 'protectedarticle'            => 'gà proteto "[[$1]]"',
 'modifiedarticleprotection'   => 'gà modificà el livel de protezion de "[[$1]]"',
 'unprotectedarticle'          => 'gà sblocà "[[$1]]"',
+'movedarticleprotection'      => 'gà canbià la protesion da "[[$2]]" a "[[$1]]"',
 'protect-title'               => 'Canbia el livèl de protezion par "$1"',
+'prot_1movedto2'              => '[[$1]] spostà a [[$2]]',
 'protect-legend'              => 'Conferma la protezion',
 'protectcomment'              => 'Motivo de Å‚a protezion',
 'protectexpiry'               => 'Scadenza:',
 'protect_expiry_invalid'      => 'Scadenza mìa valida.',
 'protect_expiry_old'          => 'Scadenza zà passà.',
 'protect-unchain'             => 'Scołega i permessi de spostamento',
-'protect-text'                => 'Sto modulo qua el consente de védar e modificar el livel de protezion par la pagina <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'No se pol mìa canbiar i livèi de protezion co ghe xe un bloco ativo. Le inpostazion corenti par la pagina le xe <strong>$1</strong>:',
-'protect-locked-dblock'       => 'No se pol canbiar i livèi de protezion durante un bloco del database.
-Le inpostazion corenti par la pagina le xe <strong>$1</strong>:',
-'protect-locked-access'       => 'No te ghè i parmessi necessari par modificar i livèi de protezion de la pagina.
-Le impostazion atuali par la pagina le xe <strong>$1</strong>:',
+'protect-text'                => "Sto modulo qua el consente de védar e modificar el livel de protezion par la pagina '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "No se pol mìa canbiar i livèi de protezion co ghe xe un bloco ativo. Le inpostazion corenti par la pagina le xe '''$1''':",
+'protect-locked-dblock'       => "No se pol canbiar i livèi de protezion durante un bloco del database.
+Le inpostazion corenti par la pagina le xe '''$1''':",
+'protect-locked-access'       => "No te ghè i parmessi necessari par modificar i livèi de protezion de la pagina.
+Le impostazion atuali par la pagina le xe '''$1''':",
 'protect-cascadeon'           => 'Al momento sta pagina la xe blocà parché la xe inclusa {{PLURAL:$1|ne la pagina indicà de seguito, par la quale|ne le pagine indichè de seguito, par le quali}} xe ativa la protezion ricorsiva. Se pol modificar el livel de protezion individual de la pagina, ma le inpostazion derivanti da la protezion ricorsiva no le sarà mìa modificà.',
-'protect-default'             => '(predefinìo)',
+'protect-default'             => 'Autoriza tuti i utenti',
 'protect-fallback'            => 'Ghe vole el parmesso de "$1"',
-'protect-level-autoconfirmed' => 'Solo utenti registrai',
+'protect-level-autoconfirmed' => 'Bloca i utenti novi o mia registrà',
 'protect-level-sysop'         => 'Solo aministradori',
 'protect-summary-cascade'     => 'ricorsiva',
 'protect-expiring'            => 'scadenza: $1 (UTC)',
+'protect-expiry-indefinite'   => 'infinìo',
 'protect-cascade'             => "Protezion ricorsiva (l'estende la protezion a tute le pagine incluse in sta qua).",
 'protect-cantedit'            => 'No te pol modificar i livèi de protezion par la pagina, parché no te ghè mìa i parmessi necessari par modificar la pagina stessa.',
+'protect-othertime'           => 'Altra durata:',
+'protect-othertime-op'        => 'altra durata',
+'protect-existing-expiry'     => 'Scadensa de desso: $2, $3',
+'protect-otherreason'         => 'Altri motivi:',
+'protect-otherreason-op'      => 'altri motivi',
+'protect-dropdown'            => '*Motivi piessè comuni de protession
+** Guere de modifica (edit war)
+** Inserimenti ripetùi de spam
+** Pàxena archivià
+** Pàxena doparà assè
+** Vandalismi ripetùi',
+'protect-edit-reasonlist'     => 'Cànbia i motivi de la protesion',
+'protect-expiry-options'      => '1 ora:1 hour,1 zòrno:1 day,1 stimana:1 week,2 stimane:2 weeks,1 mese:1 month,3 mesi:3 months,6 mesi:6 months,1 ano:1 year,infinito:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Parmesso:',
 'restriction-level'           => 'Livel de restrizion',
 'minimum-size'                => 'Dimension minima',
@@ -1577,7 +1872,8 @@ Le impostazion atuali par la pagina le xe <strong>$1</strong>:',
 'undeletepage'                 => 'Varda e recupera pàxene scancełàe',
 'undeletepagetitle'            => "'''Quel che segue el xe conposto da revision scancelà de [[:$1]]'''.",
 'viewdeletedpage'              => 'Varda łe pàxene scancełàe',
-'undeletepagetext'             => "Le pagine qua de sèvito le xe stà sancelè, ma le ghe xe 'ncora in archivio e pertanto se pole 'ncora recuperarle. L'archivio el vien svodà periodicamente.",
+'undeletepagetext'             => "{{PLURAL:$1|La pàxena qua de sèvito la xe stà scancelà, ma la ghe xe 'ncora in archivio e pertanto se pole 'ncora recuperarla|Le $1 pàxene qua de sèvito le xe stà scancelè, ma le ghe xe 'ncora in archivio e pertanto se pole 'ncora recuperarle}}.
+L'archivio el vien svodà periodicamente.",
 'undelete-fieldset-title'      => 'Recupera version',
 'undeleteextrahelp'            => "Par recuperar la storia de la pàxena par intiero, lassa tute łe casełe desełezionàe e struca '''''Ripristina'''''. 
 Par efetuar un ripristino sełetivo, seleziona łe casełe corispondenti a łe revixion da ripristinar e struca '''''Ripristina'''''. Strucando '''''Reset''''' vegnarà deselezionàe tute łe casełe e svodà el posto par el comento.",
@@ -1586,12 +1882,13 @@ Par efetuar un ripristino sełetivo, seleziona łe casełe corispondenti a łe r
 Se dopo ła scancełazion xè stà creà na nova pàxena col stesso titoło, łe revixion recuperà le sarà inserìe ne ła cronołogia preçedente.',
 'undeleterevdel'               => "El ripristino no'l vegnarà mìa fato se el determina la scancelazion parziale de la version corente de la pagina o del file interessà. In sto caso, te ghè da cavar el segno de spunta o l'oscuramento da le revisioni scancelà piassè reçenti.",
 'undeletehistorynoadmin'       => 'La pàxena la xè stà scancełà. El motivo de ła scancełazion el xè indicà de seguito, insieme ai dati de i utenti che i gavea modifegà ła pàxena prima de ła scancełazion. El testo contegnù ne łe revixion scancełàe i pol védarlo solo i aministradori.',
-'undelete-revision'            => 'Revision scancelà de la pagina $1, inserìa el $2 da $3:',
+'undelete-revision'            => 'Revision scancelà de la pagina $1 (inserìa su $4 el $5) de $3:',
 'undeleterevision-missing'     => "Revision mìa valida o mancante. O el colegamento no'l xe mìa giusto, opure la revision la xe stà zà ripristinà o eliminà da l'archivio.",
 'undelete-nodiff'              => 'No xe stà catà nissuna revision precedente.',
 'undeletebtn'                  => 'RIPRISTINA!',
 'undeletelink'                 => 'ripristina',
 'undeletereset'                => 'Reinposta',
+'undeleteinvert'               => 'Inverti selession',
 'undeletecomment'              => 'Comento:',
 'undeletedarticle'             => 'Recuperà "$1"',
 'undeletedrevisions'           => '{{PLURAL:$1|Una revision recuperà|$1 revision recuperà}}',
@@ -1623,26 +1920,27 @@ $1',
 'blanknamespace' => '(Prinçipałe)',
 
 # Contributions
-'contributions' => 'Contributi utente',
-'mycontris'     => 'i me contributi',
-'contribsub2'   => 'Par $1 ($2)',
-'nocontribs'    => 'No xe stà catà nissuna modifica che vaga ben par sti critèri.',
-'uctop'         => '(ultima par ła pàxena)',
-'month'         => 'A partir dal mese (e precedenti):',
-'year'          => "A partir da l'ano (e precedenti):",
-
-'sp-contributions-newbies'     => 'Mostra solo i contributi dei utenti novi',
-'sp-contributions-newbies-sub' => 'Par i novi utenti',
-'sp-contributions-blocklog'    => 'Registro dei blochi',
-'sp-contributions-search'      => 'Riçerca contributi',
-'sp-contributions-username'    => 'Indirizo IP o nome utente:',
-'sp-contributions-submit'      => 'Riçerca',
+'contributions'       => 'Contributi utente',
+'contributions-title' => 'Contributi de $1',
+'mycontris'           => 'i me contributi',
+'contribsub2'         => 'Par $1 ($2)',
+'nocontribs'          => 'No xe stà catà nissuna modifica che vaga ben par sti critèri.',
+'uctop'               => '(ultima par ła pàxena)',
+'month'               => 'A partir dal mese (e precedenti):',
+'year'                => "A partir da l'ano (e precedenti):",
+
+'sp-contributions-newbies'       => 'Mostra solo i contributi dei utenti novi',
+'sp-contributions-newbies-sub'   => 'Par i novi utenti',
+'sp-contributions-newbies-title' => 'Contributi dei utenti novi',
+'sp-contributions-blocklog'      => 'Registro dei blochi',
+'sp-contributions-search'        => 'Riçerca contributi',
+'sp-contributions-username'      => 'Indirizo IP o nome utente:',
+'sp-contributions-submit'        => 'Riçerca',
 
 # What links here
 'whatlinkshere'            => 'Pàxene che le punta qua',
 'whatlinkshere-title'      => 'Pagine che punta a "$1"',
 'whatlinkshere-page'       => 'Pagina:',
-'linklistsub'              => '(Lista dei colegamenti)',
 'linkshere'                => "Ste pagine qua le contien dei colegamenti a '''[[:$1]]''':",
 'nolinkshere'              => "Nissuna pagina la contien colegamenti che punta a '''[[:$1]]'''.",
 'nolinkshere-ns'           => "No ghe xe pagine che punta a '''[[:$1]]''' nel namespace selezionà.",
@@ -1686,6 +1984,8 @@ $1',
 'ipbotherreason'                  => 'Altri motivi/detagli:',
 'ipbhidename'                     => "Scondi el nome utente dal registro dei blochi, da l'elenco dei blochi ativi e da l'elenco utenti.",
 'ipbwatchuser'                    => "Tien d'ocio la pagina utente e la pagina de discussion de sto utente",
+'ipballowusertalk'                => 'Parmétighe a sto utente de scrìvar su la so pàxena de discussion finché el xe blocà',
+'ipb-change-block'                => "Bloca de novo l'utente co ste inpostassion",
 'badipaddress'                    => "L'indirisso IP indicà no'l xè mìa coreto.",
 'blockipsuccesssub'               => 'Bloco eseguìo',
 'blockipsuccesstext'              => 'L\'indirizzo IP "$1" l\'è sta bloccà.
@@ -1695,14 +1995,18 @@ $1',
 'ipb-unblock'                     => 'Sbloca un utente o un indirizo IP',
 'ipb-blocklist-addr'              => 'Blochi esistenti par $1',
 'ipb-blocklist'                   => 'Elenca i blochi ativi',
+'ipb-blocklist-contribs'          => 'Contributi de $1',
 'unblockip'                       => 'Sbloca indirizzo IP',
 'unblockiptext'                   => 'Dòpara el modulo qua soto par ridarghe el dirito de scritura a un indirizzo IP precedentemente blocà.',
-'ipusubmit'                       => 'Sbloca sto indirisso IP',
+'ipusubmit'                       => 'Cava sto bloco',
 'unblocked'                       => "L'utente [[User:$1|$1]] el xe stà sblocà",
 'unblocked-id'                    => 'El bloco $1 el xe stà cavà',
 'ipblocklist'                     => 'Nomi utenti e indirizi IP blocài',
 'ipblocklist-legend'              => 'Cata fora un utente blocà',
 'ipblocklist-username'            => 'Nome utente o indirizo IP:',
+'ipblocklist-sh-userblocks'       => '$1 i blochi dei utenti registrài',
+'ipblocklist-sh-tempblocks'       => '$1 i blochi tenporanei',
+'ipblocklist-sh-addressblocks'    => '$1 i blochi dei singoli IP',
 'ipblocklist-submit'              => 'Çerca',
 'blocklistline'                   => '$1, $2 gà blocà $3 ($4)',
 'infiniteblock'                   => 'infinito',
@@ -1711,25 +2015,32 @@ $1',
 'noautoblockblock'                => 'gnente bloco automatico',
 'createaccountblock'              => 'creazion account blocà',
 'emailblock'                      => 'e-mail blocàe',
+'blocklist-nousertalk'            => "no'l pol scrivar su la so pàxena de discussion",
 'ipblocklist-empty'               => "L'elenco dei blochi el xe vodo.",
 'ipblocklist-no-results'          => "L'indirizo IP o nome utente richiesto no'l xe blocà.",
 'blocklink'                       => 'bloca',
 'unblocklink'                     => 'sbloca',
+'change-blocklink'                => 'cànbia bloco',
 'contribslink'                    => 'contributi',
 'autoblocker'                     => 'Bloccà automaticamente parché el to indirisso IP el xè stà doparà de recente da "[[User:$1|$1]]". La motivassion del bloco de $1 la xe: "$2"',
 'blocklogpage'                    => 'Registro dei blochi',
+'blocklog-fulllog'                => 'Registro conpleto dei blochi',
 'blocklogentry'                   => 'gà blocà [[$1]] par un periodo de $2 $3',
+'reblock-logentry'                => "gà canbià le inpostassion del bloco par [[$1]] co' na scadensa de $2 $3",
 'blocklogtext'                    => "Sto qua xè un elenco de azioni de bloco e sbloco dei indirizi IP. I indirizi blocai in automatico no i xè mìa elencai. Varda l'[[Special:IPBlockList|elenco dei IP blocà]] par la lista dei indirizi el cui bloco el xè operativo.",
 'unblocklogentry'                 => 'gà sblocà $1',
 'block-log-flags-anononly'        => 'solo utenti anonimi',
 'block-log-flags-nocreate'        => 'creazion account blocà',
 'block-log-flags-noautoblock'     => 'bloco automatico disativà',
 'block-log-flags-noemail'         => 'e-mail blocàe',
+'block-log-flags-nousertalk'      => "no'l pode scrìvar su la so pàxena de discussion",
 'block-log-flags-angry-autoblock' => 'bloco automatico avansado ativo',
 'range_block_disabled'            => 'La possibilità de blocar intervali de indirizzi IP no la xe ativa al momento.',
 'ipb_expiry_invalid'              => 'Tenpo de scadensa mìa valido. Controla el [http://www.gnu.org/software/tar/manual/html_chapter/tar_7.html manual de tar] par la sintassi esatta.',
 'ipb_expiry_temp'                 => 'I blochi dei nomi utente sconti i dovarìa essar infiniti.',
 'ipb_already_blocked'             => 'L\'utente "$1" el xe zà blocà',
+'ipb-needreblock'                 => '== Xà blocà ==
+$1 xe xà blocà. Vuto canbiar le inpostassion?',
 'ipb_cant_unblock'                => 'Eror: Inpossibile catar el bloco con ID $1. El bloco el podarìa èssar zà stà cavà.',
 'ipb_blocked_as_range'            => "Eror: L'indirizo IP $1 no'l xe sogeto a bloco individual e no'l pol èssar sblocà. El bloco el xe invesse ativo a livel de l'intervalo $2, che el pol èssar sblocà.",
 'ip_range_invalid'                => 'Intervało de indirissi IP mìa vałido.',
@@ -1740,6 +2051,7 @@ $1',
 'proxyblocksuccess'               => 'Fatto.',
 'sorbsreason'                     => 'Sto indirizo IP el xe elencà come proxy verto ne la lista nera DNSBL doparà da {{SITENAME}}.',
 'sorbs_create_account_reason'     => 'No se pol crear acessi novi da sto indirizo IP parché el xe elencà come proxy verto ne la lista nera DNSBL doparà da {{SITENAME}}.',
+'cant-block-while-blocked'        => 'No se pode blocar altri utenti finché se xe blocài.',
 
 # Developer tools
 'lockdb'              => 'Blocca el database',
@@ -1762,9 +2074,9 @@ Tiente in mente de [[Special:UnlockDB|sblocarlo]] co te ghè finìo de far manut
 'databasenotlocked'   => "El database no l'è mìa blocà.",
 
 # Move page
-'move-page'               => 'Spostamento de $1',
-'move-page-legend'        => 'Spostamento de pàxena',
-'movepagetext'            => "Col modulo qua soto te podi rinominar na pàxena, spostando anca tuta la so cronołogia al nome novo.
+'move-page'                    => 'Spostamento de $1',
+'move-page-legend'             => 'Spostamento de pàxena',
+'movepagetext'                 => "Col modulo qua soto te podi rinominar na pàxena, spostando anca tuta la so cronołogia al nome novo.
 El vecio titoło el deventarà automaticamente un rimando (redirect) che punta al novo titoło.
 Te podi agiornar automaticamente i rimandi che punta al vecio titolo.
 Se te siegli de no farlo, tiente in mente de controłar con cura che no se crea [[Special:DoubleRedirects|dopi redirect]] o [[Special:BrokenRedirects|redirect interoti]].
@@ -1776,50 +2088,68 @@ Questo significa che, se te fè un eror, te podi novamente rinominar na pàxena
 '''OCIO!'''
 Sto canbiamento drastico el podarìa crear contratenpi che no se se speta, specialmente se se tratta de na pàxena molto visità.
 Acèrtete de ver ben valutà le conseguenze del spostamento, prima de procédar.",
-'movepagetalktext'        => "La corispondente pàxena de discussion la sarà spostà automaticamente insieme a ła pàxena prinçipałe, '''trane che nei seguenti casi:'''
+'movepagetalktext'             => "La corispondente pàxena de discussion la sarà spostà automaticamente insieme a ła pàxena prinçipałe, '''trane che nei seguenti casi:'''
 * El spostamento de ła pàxena el xè tra namespace diversi
 * In corispondenza del novo titoło ghe xe xà na pàxena de discussion (mìa voda)
 * La caseła chi soto la xè stà desełezionà.",
-'movearticle'             => 'Rinomina voçe',
-'movenotallowed'          => 'No te ghè i parmessi necessari al spostamento de le pagine.',
-'newtitle'                => 'Al novo titoło de:',
-'move-watch'              => "Tien d'ocio",
-'movepagebtn'             => 'Sposta sta pàxena',
-'pagemovedsub'            => 'Spostamento efetuà con sucesso',
-'movepage-moved'          => '<big>\'\'\'"$1" la xe stà spostà al titolo "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => "Na pàxena con sto nome la existe xà, opure el nome che te ghè sielto no'l xè vałido.<br />Siegli, par piaser, un titoło diverso par ła voçe.",
-'cantmove-titleprotected' => 'No se pol mìa spostar la pagina, in quanto el novo titolo el xe stà proteto par inpedirghene la creazion',
-'talkexists'              => "'''La pagina la xe stà spostà coretamente, ma no s'à mìa podesto spostar la pagina de discussion parché ghe ne xe xà n'altra col stesso nome. Par piaser meti insieme i contenuti de le do pagine a man.'''",
-'movedto'                 => 'spostà a',
-'movetalk'                => 'Sposta anca la corispondente pagina "discussion", se se riesse.',
-'move-subpages'           => 'Sposta tute le sotopagine, se aplicabile',
-'move-talk-subpages'      => 'Sposta tute le sotopagine de la pagina de discussion, se aplicabile',
-'movepage-page-exists'    => 'La pagina $1 la esiste de zà e no la pode vegner automaticamente sorascrita.',
-'movepage-page-moved'     => 'La pagina $1 la xe stà spostà a $2.',
-'movepage-page-unmoved'   => "No s'à mìa podesto spostar $1 a $2.",
-'movepage-max-pages'      => "Xe stà ragiunto el nùmaro massimo consentìo de $1 {{PLURAL:$1|pagina|pagine}} spostà e nissun'altra la vegnarà spostà in automatico.",
-'1movedto2'               => '[[$1]] spostà a [[$2]]',
-'1movedto2_redir'         => "$1 spostà a $2 co'n redirect",
-'movelogpage'             => 'Registro dei spostamenti',
-'movelogpagetext'         => 'Lista de pàxene spostàe.',
-'movereason'              => 'Reason',
-'revertmove'              => 'ripristina',
-'delete_and_move'         => 'Scanceła e sposta',
-'delete_and_move_text'    => '==Scancełassion richiesta==
+'movearticle'                  => 'Rinomina voçe',
+'movenologin'                  => 'No te ghè efetuà el login',
+'movenologintext'              => 'Te ghè da èssar un utente registrà ed aver efetuà el [[Special:UserLogin|login]] par poder spostar na pàxena.',
+'movenotallowed'               => 'No te ghè i parmessi necessari al spostamento de le pagine.',
+'movenotallowedfile'           => 'No ti gà i parmessi necessari par spostar file.',
+'cant-move-user-page'          => 'No se dispone dei parmessi necessari par spostar le pàxene utente.',
+'cant-move-to-user-page'       => 'No se dispone dei parmessi necessari par spostar la pàxena su na pàxena utente (ad ecezion de na sotopàxena utente).',
+'newtitle'                     => 'Al novo titoło de:',
+'move-watch'                   => "Tien d'ocio",
+'movepagebtn'                  => 'Sposta sta pàxena',
+'pagemovedsub'                 => 'Spostamento efetuà con sucesso',
+'movepage-moved'               => '<big>\'\'\'"$1" la xe stà spostà a "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Un reindirissamento el xe stà creà.',
+'movepage-moved-noredirect'    => 'La creassion de un reindirissamento la xe stà sopressa.',
+'articleexists'                => "Na pàxena con sto nome la existe xà, opure el nome che te ghè sielto no'l xè vałido.<br />Siegli, par piaser, un titoło diverso par ła voçe.",
+'cantmove-titleprotected'      => 'No se pol mìa spostar la pagina, in quanto el novo titolo el xe stà proteto par inpedirghene la creazion',
+'talkexists'                   => "'''La pagina la xe stà spostà coretamente, ma no s'à mìa podesto spostar la pagina de discussion parché ghe ne xe xà n'altra col stesso nome. Par piaser meti insieme i contenuti de le do pagine a man.'''",
+'movedto'                      => 'spostà a',
+'movetalk'                     => 'Sposta anca la corispondente pagina "discussion", se se riesse.',
+'move-subpages'                => 'Sposta tute le sotopagine, se aplicabile',
+'move-talk-subpages'           => 'Sposta tute le sotopagine de la pagina de discussion, se aplicabile',
+'movepage-page-exists'         => 'La pagina $1 la esiste de zà e no la pode vegner automaticamente sorascrita.',
+'movepage-page-moved'          => 'La pagina $1 la xe stà spostà a $2.',
+'movepage-page-unmoved'        => "No s'à mìa podesto spostar $1 a $2.",
+'movepage-max-pages'           => "Xe stà ragiunto el nùmaro massimo consentìo de $1 {{PLURAL:$1|pagina|pagine}} spostà e nissun'altra la vegnarà spostà in automatico.",
+'1movedto2'                    => '[[$1]] spostà a [[$2]]',
+'1movedto2_redir'              => "$1 spostà a $2 co'n redirect",
+'move-redirect-suppressed'     => 'reindirissamento sopresso',
+'movelogpage'                  => 'Registro dei spostamenti',
+'movelogpagetext'              => 'Lista de pàxene spostàe.',
+'movereason'                   => 'Reason',
+'revertmove'                   => 'ripristina',
+'delete_and_move'              => 'Scanceła e sposta',
+'delete_and_move_text'         => '==Scancełassion richiesta==
 
 La voçe specificà come destinassion "[[:$1]]" l\'esiste xà. Vóto scancełarla par proseguir con ło spostamento?',
-'delete_and_move_confirm' => 'Si! Scancèła ła pàxena',
-'delete_and_move_reason'  => 'Scancełà par rendere possibile lo spostamento',
-'selfmove'                => 'El novo titoło el xè conpagno del vecio; no se pol spostar ła pàxena su de ela.',
-'immobile_namespace'      => "El titolo de destinazion l'è de tipo speciale; no se pol spostar pàxene in quel namespace.",
-'imagenocrossnamespace'   => 'No se pol spostar na imagine verso un namespace diverso da quelo de le imagini',
-'imagetypemismatch'       => "L'estension nova del file no la corisponde mìa al tipo de file",
-'imageinvalidfilename'    => "El nome file de destinassion no'l xe mia valido",
-'fix-double-redirects'    => 'Agiorna tuti quanti i redirect che ponta al titolo originàl',
+'delete_and_move_confirm'      => 'Si! Scancèła ła pàxena',
+'delete_and_move_reason'       => 'Scancełà par rendere possibile lo spostamento',
+'selfmove'                     => 'El novo titoło el xè conpagno del vecio; no se pol spostar ła pàxena su de ela.',
+'immobile-source-namespace'    => 'No te pol spostar pàxene in tel namespace "$1"',
+'immobile-target-namespace'    => 'No te pol spostar pàxene \'ntel namespace "$1"',
+'immobile-target-namespace-iw' => "El colegamento interwiki no'l xe na valida destinassion in do spostar na pàxena.",
+'immobile-source-page'         => 'Sta pàxena no la pol vegner spostà.',
+'immobile-target-page'         => 'No te pol spostar a sto titolo.',
+'imagenocrossnamespace'        => 'No se pol spostar na imagine verso un namespace diverso da quelo de le imagini',
+'imagetypemismatch'            => "L'estension nova del file no la corisponde mìa al tipo de file",
+'imageinvalidfilename'         => "El nome file de destinassion no'l xe mia valido",
+'fix-double-redirects'         => 'Agiorna tuti quanti i redirect che ponta al titolo originàl',
+'move-leave-redirect'          => 'Crea un redirect con lo spostamento',
 
 # Export
 'export'            => 'Esporta pàxene',
-'exporttext'        => 'Te podi esportar el testo e modificar ła cronołogia de na speçifica pàxena o de un gruppo de pàxene ragrupae in XML; questo el pode in seguito essere importà in un altro wiki che dòpara el software MediaWiki, trasformà, o tegnù semplicemente par el to personałe divertimento.',
+'exporttext'        => 'Te podi esportar el testo e modificar ła cronołogia de na speçifica pàxena o de un gruppo de pàxene ragrupae in XML.
+Questo el pode in seguito vegner inportà in te n\'altro wiki che dòpara el software MediaWiki tramite la [[Special:Import|pàxena de inportassion]].
+
+Par esportar le pàxene, scrivi i tìtoli in te la casèla qua soto, un tìtolo par riga, e selessiona se te voli la version ùltima con tute le version preçedenti e el storico de le modìfeghe, opure la version ùltima con solo le informassion de l\'ùltima modìfega.
+
+Nel secondo caso te poli anca doparar un colegamento, par esenpio [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] par la pàxena "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => "Includi soło ła version attuałe, no l'intera cronołogia",
 'exportnohistory'   => "----
 '''Ocio!''' Par motivi ligà a le prestazion del sistema xè stà disabiłità l'esportazion de tuta ła storia de łe pàxene fata co sto modulo.",
@@ -1835,7 +2165,7 @@ La voçe specificà come destinassion "[[:$1]]" l\'esiste xà. Vóto scancełarl
 'allmessagesdefault'        => 'Testo predefinìo',
 'allmessagescurrent'        => 'Testo come che el xe desso',
 'allmessagestext'           => "Sta quà l'è na lista de tuti i messagi disponibili nel namespace MediaWiki.
-Par piaser visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net Betawiki] se te voli jutarne par la traduzion del software MediaWiki ne le varie lengue.",
+Par piaser visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] e [http://translatewiki.net translatewiki.net] se te voli jutarne par la traduzion del software MediaWiki ne le varie lengue.",
 'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' no'l xè supportà parché '''\$wgUseDatabaseMessages''' no'l xè ativo.",
 'allmessagesfilter'         => 'Filtro sui messagi:',
 'allmessagesmodified'       => 'Mostra soło quełi modefegà',
@@ -1855,9 +2185,12 @@ Par piaser visita [http://www.mediawiki.org/wiki/Localisation MediaWiki Localisa
 'import-interwiki-text'      => 'Seleziona un projeto wiki e el titoło de ła pàxena da inportar.
 Le date de publicazion e i nomi de i autori de łe varie version i sarà conservà.
 Tute łe operazion de inportazion trans-wiki łe xè notà nel [[Special:Log/import|registro de inportazion]].',
+'import-interwiki-source'    => 'Sorgente wiki/pàxena:',
 'import-interwiki-history'   => "Copia l'intiera cronołogia de sta pàxena",
 'import-interwiki-submit'    => 'Inporta',
 'import-interwiki-namespace' => 'Namespace de destinassion:',
+'import-upload-filename'     => 'Nome del file:',
+'import-comment'             => 'Comento:',
 'importtext'                 => 'Par piaser, esporta el file da la wiki de origine doparando la [[Special:Export|funsion de esportassion]].
 Salvalo sul to computer e càrghelo qua.',
 'importstart'                => 'Inportazion de łe pàxene in corso...',
@@ -1892,19 +2225,19 @@ Salvalo sul to computer e càrghelo qua.',
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|una revixion importà|$1 revixion importae}} da $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'La me pàxena utente',
+'tooltip-pt-userpage'             => 'La to pàxena utente',
 'tooltip-pt-anonuserpage'         => 'La pàxena utente de sto indirizo IP',
-'tooltip-pt-mytalk'               => 'Le me discussion',
+'tooltip-pt-mytalk'               => 'La to pàxena de discussion',
 'tooltip-pt-anontalk'             => 'Discussioni riguardo le modifiche fate da sto ip',
 'tooltip-pt-preferences'          => 'Le me preferense',
 'tooltip-pt-watchlist'            => 'La lista de le pàxene che te stè tegnendo soto ocio.',
-'tooltip-pt-mycontris'            => 'La lista de i me contributi',
+'tooltip-pt-mycontris'            => 'La lista de i to contributi',
 'tooltip-pt-login'                => "Te consigliemo de registrarte, ma no'l xe obligatorio.",
 'tooltip-pt-anonlogin'            => "Te consigliemo de registrarte, ma no'l xe obligatorio.",
 'tooltip-pt-logout'               => 'Log out (esci)',
 'tooltip-ca-talk'                 => 'Varda łe discussion rełative a la voçe',
 'tooltip-ca-edit'                 => 'Te podi modificar sta pàxena. Par piaser dòpara el boton de anteprima prima de salvar.',
-'tooltip-ca-addsection'           => 'Xonta un commento a sta discussion.',
+'tooltip-ca-addsection'           => 'Intaca na sezion nova',
 'tooltip-ca-viewsource'           => 'Sta pàxena la xè proteta, ma te podi vedar el so còdexe sorgente.',
 'tooltip-ca-history'              => 'Version preçedenti de sta pàxena.',
 'tooltip-ca-protect'              => 'Protegi sta pàxena',
@@ -1951,6 +2284,8 @@ Salvalo sul to computer e càrghelo qua.',
 'tooltip-watch'                   => 'Zonta sta pagina a la lista dei osservati speciali',
 'tooltip-recreate'                => 'Ricrea ła pàxena anca se la xè stà scancełà',
 'tooltip-upload'                  => 'Intaca el caricamento',
+'tooltip-rollback'                => "El \"rollback\" co' un clic solo l'annulla le modifiche a sta pagina fate da l'ultimo contribudor.",
+'tooltip-undo'                    => 'L\'"Annulla" el permete de annullar sta modifica e el verze el modulo de modifica in modalità de anteprima. El permete de inserir na motivassion in te l\'ogeto de la modifica.',
 
 # Metadata
 'nodublincore'      => 'Metadati Dublin Core RDF non ativi su sto server.',
@@ -1958,12 +2293,12 @@ Salvalo sul to computer e càrghelo qua.',
 'notacceptable'     => "El server wiki no'l xè in grado di fornire i dati in un formato łeggibiłe dal client utilixà.",
 
 # Attribution
-'anonymous'        => 'Utente(/i) anonimo(/i) de {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Utente anonimo|Utenti anonimi}} de {{SITENAME}}',
 'siteuser'         => '$1, utente de {{SITENAME}}',
 'lastmodifiedatby' => "Sta pàxena la xè stà modificà l'ultima olta el $2, $1 da $3.", # $1 date, $2 time, $3 user
 'othercontribs'    => 'El testo atuale el xe basà su contributi de $1.',
 'others'           => 'altri',
-'siteusers'        => '$1, utenti de {{SITENAME}}',
+'siteusers'        => '$1, {{PLURAL:$2|utente|utenti}} de {{SITENAME}}',
 'creditspage'      => 'Autori de ła pàxena',
 'nocredits'        => 'Nissuna informazion sui autori disponibile par sta pagina.',
 
@@ -2004,10 +2339,12 @@ Questo xe probabilmente dovùo a la presenza de un colegamento a un sito foresto
 'markedaspatrollederror-noautopatrol' => 'No te ghè i parmessi necessari par segnar le to stesse modifiche come verificàe.',
 
 # Patrol log
-'patrol-log-page'   => 'Modifiche verificàe',
-'patrol-log-header' => 'Qua de sèvito xe elencàe le verifiche de le modifiche.',
-'patrol-log-line'   => 'gà segnà la $1 a la pagina $2 come verificà $3',
-'patrol-log-auto'   => '(verifica automatica)',
+'patrol-log-page'      => 'Modifiche verificàe',
+'patrol-log-header'    => 'Qua de sèvito xe elencàe le verifiche de le modifiche.',
+'patrol-log-line'      => 'gà segnà la $1 a la pagina $2 come verificà $3',
+'patrol-log-auto'      => '(verifica automatica)',
+'patrol-log-diff'      => 'revision $1',
+'log-show-hide-patrol' => '$1 el registro dei canbiamenti verificài',
 
 # Image deletion
 'deletedrevision'                 => 'Vecia version scancełà $1',
@@ -2024,6 +2361,9 @@ $1',
 'previousdiff' => '� Difarensa pi vècia',
 'nextdiff'     => 'Difarensa pi nova →',
 
+# Visual comparison
+'visual-comparison' => 'Confronto visuale',
+
 # Media information
 'mediawarning'         => "'''Ocio''': Sto file qua el podarìa contegner codice maligno; la so esecuzion la podarìa danegiar el proprio sistema informatico.<hr />",
 'imagemaxsize'         => 'Dimension massima de le imagini su le relative pagine de descrizion:',
@@ -2036,10 +2376,12 @@ $1',
 'show-big-image'       => 'Version ad alta risoluzion',
 'show-big-image-thumb' => '<small>Dimension de sta anteprima: $1 × $2 pixel</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Imagini nove',
 'imagelisttext'         => "Qua ghe xe na lista de '''$1''' {{PLURAL:$1|file|files}} ordinà par $2.",
 'newimages-summary'     => 'Sta pagina speciale la mostra i file cargà piassè reçentemente.',
+'newimages-legend'      => 'Filtro',
+'newimages-label'       => 'Nome del file (o na parte de élo):',
 'showhidebots'          => '($1 i bot)',
 'noimages'              => 'No ghè gnente da vardare.',
 'ilsubmit'              => 'Serca',
@@ -2251,6 +2593,18 @@ I colegamenti sucessivi, su la stessa riga, i xe considerà come ecezion (cioè
 'exif-lightsource-24'  => 'Lànpada da studio ISO al tungsteno',
 'exif-lightsource-255' => 'Altra sorgente Å‚uminoxa',
 
+# Flash modes
+'exif-flash-fired-0'    => "El flash no'l xe mia scatà",
+'exif-flash-fired-1'    => 'Flash scatà',
+'exif-flash-return-0'   => 'nissuna funsione de individuassion del ritorno de la luce stroboscopica',
+'exif-flash-return-2'   => 'luce stroboscopica de ritorno mia individuà',
+'exif-flash-return-3'   => 'luce stroboscopica de ritorno individuà',
+'exif-flash-mode-1'     => 'ativassion flash forzato',
+'exif-flash-mode-2'     => 'rimozion flash forzato',
+'exif-flash-mode-3'     => 'modalità automatica',
+'exif-flash-function-1' => 'Disativa el flash',
+'exif-flash-redeye-1'   => 'modalità ridussion òci rossi',
+
 'exif-focalplaneresolutionunit-2' => 'połiçi',
 
 'exif-sensingmethod-1' => 'Non definio',
@@ -2396,21 +2750,10 @@ $1
 Par piaser, conferma che te vołi dal bon ricrear sta voçe.",
 'recreate'            => 'Ricrea',
 
-# HTML dump
-'redirectingto' => 'Reindirizzamento a [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Vóto scancełar ła cache in sta pàxena?
-
-$1',
 'confirm_purge_button' => 'Conferma',
-
-# AJAX search
-'searchcontaining' => "Riçerca de łe voçi che contegne ''$1''.",
-'searchnamed'      => "Riçerca de le voçi con titolo ''$1''.",
-'articletitles'    => "Riçerca de łe voçi che łe scuminsia par ''$1''",
-'hideresults'      => 'Scondi i risultati',
-'useajaxsearch'    => 'Dòpara la riçerca AJAX',
+'confirm-purge-top'    => 'Vóto scancełar ła cache in sta pàxena?',
+'confirm-purge-bottom' => 'Netar la cache de na pàxena parmete de far védar la so version piassè ajornà.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pagina precedente',
@@ -2433,7 +2776,7 @@ $1',
 'autosumm-blank'   => 'Pagina svodà conpletamente',
 'autosumm-replace' => "Pagina sostituìa con '$1'",
 'autoredircomment' => 'Rimando a ła pàxena [[$1]]',
-'autosumm-new'     => 'Pàxena nova: $1',
+'autosumm-new'     => "Pàxena creà con '$1'",
 
 # Live preview
 'livepreview-loading' => 'Caricamento in corso…',
@@ -2471,6 +2814,7 @@ Doparar l\'anteprima standard.',
 
 # Core parser functions
 'unknown_extension_tag' => 'Tag estension sconossiùo: "$1"',
+'duplicate-defaultsort' => 'Ocio: la ciave de ordinamento predefinìa "$2" la va in conflito co\' quela de prima "$1".',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
@@ -2499,13 +2843,13 @@ Doparar l\'anteprima standard.',
 'filepath-submit'  => 'Percorso',
 'filepath-summary' => 'Sta pagina speciale la restituìsse el percorso conpleto de un file. Le imagini le vien mostrà a la risoluzion pi granda che se pol, par i altri tipi de file vien avià diretamente el programa associà.
 
-Inserissi el nome del file senza el prefisso "{{ns:image}}:"',
+Inserissi el nome del file senza el prefisso "{{ns:file}}:"',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Riçerca dei file duplicà',
 'fileduplicatesearch-summary'  => "Riçerca de eventuali duplicati del file in base al valor de ''hash''.
 
-Inserissi el nome del file senza el prefisso \"{{ns:image}}:\"",
+Inserissi el nome del file senza el prefisso \"{{ns:file}}:\"",
 'fileduplicatesearch-legend'   => 'Riçerca de un duplicato',
 'fileduplicatesearch-filename' => 'Nome del file:',
 'fileduplicatesearch-submit'   => 'Riçerca',
@@ -2535,4 +2879,13 @@ Inserissi el nome del file senza el prefisso \"{{ns:image}}:\"",
 'blankpage'              => 'Pàxena voda',
 'intentionallyblankpage' => 'Sta pagina la xe stà lassà voda aposta',
 
+# External image whitelist
+'external_image_whitelist' => " #lassa sta riga esatamente cussita come la xe<pre>
+#Inserissi i framenti de espression regolari (solo el toco che va fra //) de seguito
+#Ste qua le corispondarà coi URL de imagini foreste (hotlinked)
+#Quele che corispondarà le vegnarà fora come imagini, se no vegnarà mostrà solo un colegamento a l'imagine
+#Le linee che taca con # le xe de comento
+
+#Inserissi de sora de sta riga tuti i framenti de regex. Lassa sta riga esatamente cussita come la xe</pre>",
+
 );
diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index 42414b3e..d8188fbf 100644
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -22,30 +22,87 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA			=> 'Phương_tiện',
-	NS_SPECIAL			=> '�ặc_biệt',
-	NS_MAIN				=> '',
-	NS_TALK				=> 'Thảo_luận',
-	NS_USER				=> 'Thành_viên',
-	NS_USER_TALK		=> 'Thảo_luận_Thành_viên',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK		=> 'Thảo_luận_$1',
-	NS_IMAGE			=> 'Hình',
-	NS_IMAGE_TALK		=> 'Thảo_luận_Hình',
-	NS_MEDIAWIKI		=> 'MediaWiki',
-	NS_MEDIAWIKI_TALK	=> 'Thảo_luận_MediaWiki',
-	NS_TEMPLATE			=> 'Tiêu_bản',
-	NS_TEMPLATE_TALK	=> 'Thảo_luận_Tiêu_bản',
-	NS_HELP				=> 'Trợ_giúp',
-	NS_HELP_TALK		=> 'Thảo_luận_Trợ_giúp',
-	NS_CATEGORY			=> 'Thể_loại',
-	NS_CATEGORY_TALK	=> 'Thảo_luận_Thể_loại'
+	NS_MEDIA            => 'Phương_tiện',
+	NS_SPECIAL          => '�ặc_biệt',
+	NS_TALK             => 'Thảo_luận',
+	NS_USER             => 'Thành_viên',
+	NS_USER_TALK        => 'Thảo_luận_Thành_viên',
+	NS_PROJECT_TALK     => 'Thảo_luận_$1',
+	NS_FILE             => 'Tập_tin',
+	NS_FILE_TALK        => 'Thảo_luận_Tập_tin',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Thảo_luận_MediaWiki',
+	NS_TEMPLATE         => 'Tiêu_bản',
+	NS_TEMPLATE_TALK    => 'Thảo_luận_Tiêu_bản',
+	NS_HELP             => 'Trợ_giúp',
+	NS_HELP_TALK        => 'Thảo_luận_Trợ_giúp',
+	NS_CATEGORY         => 'Thể_loại',
+	NS_CATEGORY_TALK    => 'Thảo_luận_Thể_loại',
 );
 
-$skinNames = array(
-	'standard'		=> 'Cổ điển',
-	'nostalgia'		=> 'V�ng cổ',
-	'myskin'		=> 'Cá nhân'
+$namespaceAliases = array(
+	'Hình' => NS_FILE,
+	'Thảo_luận_Hình' => NS_FILE_TALK,
+);
+
+
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( '�ổi hướng kép' ),
+	'BrokenRedirects'           => array( '�ổi hướng sai' ),
+	'Disambiguations'           => array( 'Trang định hướng' ),
+	'Userlogin'                 => array( '�ăng nhập' ),
+	'Userlogout'                => array( '�ăng xuất' ),
+	'CreateAccount'             => array( '�ăng ký' ),
+	'Preferences'               => array( 'Tùy ch�n' ),
+	'Watchlist'                 => array( 'Danh sách theo dõi' ),
+	'Recentchanges'             => array( 'Thay đổi gần đây' ),
+	'Upload'                    => array( 'Tải lên' ),
+	'Listfiles'                 => array( 'Danh sách hình' ),
+	'Newimages'                 => array( 'Hình mới', 'Tập tin mới' ),
+	'Listusers'                 => array( 'Danh sách thành viên' ),
+	'Statistics'                => array( 'Thống kê' ),
+	'Randompage'                => array( 'Ngẫu nhiên' ),
+	'Lonelypages'               => array( 'Trang mồ côi' ),
+	'Uncategorizedpages'        => array( 'Trang chưa phân loại' ),
+	'Uncategorizedcategories'   => array( 'Thể loại chưa phân loại' ),
+	'Uncategorizedimages'       => array( 'Hình chưa phân loại' ),
+	'Uncategorizedtemplates'    => array( 'Tiêu bản chưa phân loại' ),
+	'Unusedcategories'          => array( 'Thể loại chưa dùng' ),
+	'Unusedimages'              => array( 'Hình chưa dùng' ),
+	'Wantedpages'               => array( 'Trang cần thiết' ),
+	'Wantedcategories'          => array( 'Thể loại cần thiết' ),
+	'Wantedfiles'               => array( 'Tập tin cần thiết' ),
+	'Mostlinked'                => array( 'Liên kết nhi�u nhất' ),
+	'Mostlinkedcategories'      => array( 'Thể loại liên kết nhi�u nhất' ),
+	'Mostlinkedtemplates'       => array( 'Tiêu bản liên kết nhi�u nhất' ),
+	'Shortpages'                => array( 'Trang ngắn' ),
+	'Longpages'                 => array( 'Trang dài' ),
+	'Newpages'                  => array( 'Trang má»›i' ),
+	'Ancientpages'              => array( 'Trang cũ' ),
+	'Deadendpages'              => array( 'Trang đư�ng cùng' ),
+	'Protectedpages'            => array( 'Trang khóa' ),
+	'Protectedtitles'           => array( 'Tựa đ� bị khóa' ),
+	'Allpages'                  => array( 'Allpages', 'M�i bài' ),
+	'Prefixindex'               => array( 'Prefixindex', 'Ti�n tố' ),
+	'Contributions'             => array( '�óng góp' ),
+	'Movepage'                  => array( 'Movepage', 'Di chuyển' ),
+	'Categories'                => array( 'Thể loại' ),
+	'Export'                    => array( 'Xuất' ),
+	'Version'                   => array( 'Phiên bản' ),
+	'Log'                       => array( 'Nhật trình' ),
+	'Blockip'                   => array( 'Cấm IP' ),
+	'Undelete'                  => array( 'Phục hồi' ),
+	'Import'                    => array( 'Nhập' ),
+	'Lockdb'                    => array( 'Khóa CSDL' ),
+	'Unlockdb'                  => array( 'Mở khóa CSDL' ),
+	'MIMEsearch'                => array( 'Tìm MIME' ),
+	'Listredirects'             => array( 'Trang đổi hướng' ),
+	'Revisiondelete'            => array( 'Xóa phiên bản' ),
+	'Randomredirect'            => array( '�ổi hướng ngẫu nhiên' ),
+	'Mypage'                    => array( 'Mypage', 'Trang tôi', 'Trang cá nhân' ),
+	'Mytalk'                    => array( 'Thảo luận tôi', 'Trang thảo luận của tôi' ),
+	'Mycontributions'           => array( '�óng góp của tôi', 'Tôi đóng góp' ),
+	'Search'                    => array( 'Tìm kiếm' ),
 );
 
 $magicWords = array(
@@ -164,17 +221,19 @@ $messages = array(
 'tog-watchlisthideown'        => 'Ẩn các sửa đổi của tôi kh�i danh sách theo dõi',
 'tog-watchlisthidebots'       => 'Ẩn các sửa đổi của robot kh�i danh sách theo dõi',
 'tog-watchlisthideminor'      => 'Ẩn các sửa đổi nh� kh�i danh sách theo dõi',
+'tog-watchlisthideliu'        => 'Ẩn sửa đổi của thành viên đã đăng nhập kh�i danh sách theo dõi',
+'tog-watchlisthideanons'      => 'Ẩn sửa đổi của thành viên vô danh kh�i danh sách theo dõi',
 'tog-nolangconversion'        => 'Tắt chuyển đổi biến thể',
 'tog-ccmeonemails'            => 'Gửi bản sao cho tôi khi gửi thư điện tử cho ngư�i khác',
 'tog-diffonly'                => 'Không hiển thị nội dung trang dưới phần so sánh phiên bản',
 'tog-showhiddencats'          => 'Hiển thị thể loại ẩn',
+'tog-noconvertlink'           => 'Tắt liên kết chuyển đổi tựa đ�',
+'tog-norollbackdiff'          => 'Không so sánh sau khi lùi sửa',
 
 'underline-always'  => 'Luôn luôn',
 'underline-never'   => 'Không bao gi�',
 'underline-default' => 'Mặc định của trình duyệt',
 
-'skinpreview' => '(Xem thá»­)',
-
 # Dates
 'sunday'        => 'Chủ nhật',
 'monday'        => 'thứ Hai',
@@ -255,7 +314,7 @@ $messages = array(
 'about'          => 'Giới thiệu',
 'article'        => 'Trang ná»™i dung',
 'newwindow'      => '(mở cửa sổ mới)',
-'cancel'         => 'Bãi b�',
+'cancel'         => 'Hủy b�',
 'qbfind'         => 'Tìm kiếm',
 'qbbrowse'       => 'Xem qua',
 'qbedit'         => 'Sửa đổi',
@@ -268,7 +327,7 @@ $messages = array(
 'mytalk'         => 'Thảo luận với tôi',
 'anontalk'       => 'Thảo luận với IP này',
 'navigation'     => 'Xem nhanh',
-'and'            => 'và',
+'and'            => '&#32;và',
 
 # Metadata in edit box
 'metadata_help' => '�ặc tính hình:',
@@ -305,14 +364,14 @@ $messages = array(
 'talkpagelinktext'  => 'Thảo luận',
 'specialpage'       => 'Trang đặc biệt',
 'personaltools'     => 'Công cụ cá nhân',
-'postcomment'       => 'Thêm bàn luận',
+'postcomment'       => '�� mục mới',
 'articlepage'       => 'Xem trang ná»™i dung',
 'talk'              => 'Thảo luận',
 'views'             => 'Xem',
 'toolbox'           => 'Thanh công cụ',
-'userpage'          => 'Trang thành viên',
+'userpage'          => 'Xem trang thành viên',
 'projectpage'       => 'Trang Wikipedia',
-'imagepage'         => 'Trang hình',
+'imagepage'         => 'Xem trang tập tin',
 'mediawikipage'     => 'Thông báo giao diện',
 'templatepage'      => 'Trang tiêu bản',
 'viewhelppage'      => 'Trang trợ giúp',
@@ -331,8 +390,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Giới thiệu {{SITENAME}}',
 'aboutpage'            => 'Project:Giới thiệu',
-'bugreports'           => 'Báo lỗi',
-'bugreportspage'       => 'Project:Báo lỗi',
 'copyright'            => 'Bản quy�n $1.',
 'copyrightpagename'    => 'giấy phép {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Bản quy�n',
@@ -355,9 +412,7 @@ $messages = array(
 
 'badaccess'        => 'Lỗi v� quy�n truy cập',
 'badaccess-group0' => 'Bạn không được phép thực hiện thao tác này.',
-'badaccess-group1' => 'Chỉ những thành viên trong nhóm $1 mới được làm thao tác này.',
-'badaccess-group2' => 'Chỉ những thành viên trong các nhóm $1 mới được làm thao tác này.',
-'badaccess-groups' => 'Chỉ những thành viên trong các nhóm $1 mới được làm thao tác này.',
+'badaccess-groups' => 'Chỉ những thành viên trong {{PLURAL:$2|nhóm|các nhóm}} $1 mới được thực hiện thao tác này.',
 
 'versionrequired'     => 'Cần phiên bản $1 của MediaWiki',
 'versionrequiredtext' => 'Cần phiên bản $1 của MediaWiki để sử dụng trang này. Xem [[Special:Version|trang phiên bản]].',
@@ -371,6 +426,8 @@ $messages = array(
 'editsection'             => 'sá»­a',
 'editold'                 => 'sá»­a',
 'viewsourceold'           => 'xem mã nguồn',
+'editlink'                => 'sửa đổi',
+'viewsourcelink'          => 'xem mã nguồn',
 'editsectionhint'         => 'Sửa đổi đ� mục: $1',
 'toc'                     => 'Mục lục',
 'showtoc'                 => 'hiện',
@@ -385,13 +442,13 @@ $messages = array(
 'site-atom-feed'          => '$1 mục Atom',
 'page-rss-feed'           => 'Mục RSS của “$1�',
 'page-atom-feed'          => 'Mục Atom của “$1�',
-'red-link-title'          => '$1 (chưa được viết)',
+'red-link-title'          => '$1 (trang chưa được viết)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Ná»™i dung',
-'nstab-user'      => 'Trang thành viên',
+'nstab-user'      => 'Thành viên',
 'nstab-media'     => 'Phương tiện',
-'nstab-special'   => '�ặc biệt',
+'nstab-special'   => 'Trang đặc biệt',
 'nstab-project'   => 'Dự án',
 'nstab-image'     => 'Tập tin',
 'nstab-mediawiki' => 'Thông báo',
@@ -401,8 +458,10 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'Không có tác vụ này',
-'nosuchactiontext'  => 'Wiki không hiểu được tác vụ được yêu cầu trong địa chỉ URL',
-'nosuchspecialpage' => 'Không có trang đặc biệt nào như vậy',
+'nosuchactiontext'  => 'Wiki không hiểu được tác vụ được yêu cầu trong địa chỉ URL.
+Có thể bạn đã gõ nhầm địa chỉ URL, hoặc nhấn vào một liên kết sai.
+Nó cũng có thể là dấu hiệu của một lỗi trong phần m�m mà {{SITENAME}} sử dụng.',
+'nosuchspecialpage' => 'Không có trang đặc biệt nào có tên này',
 'nospecialpagetext' => 'Không có trang đặc biệt này.',
 
 # General errors
@@ -447,7 +506,6 @@ Xin hãy báo nó cho một [[Special:ListUsers/sysop|bảo quản viên]], tron
 'cannotdelete'         => 'Không thể xóa trang hay tập tin được chỉ định. (Có thể nó đã bị ai đó xóa rồi).',
 'badtitle'             => 'Tá»±a trang sai',
 'badtitletext'         => 'Tựa trang yêu cầu không đúng, rỗng, hoặc là một liên kết ngôn ngữ hoặc liên kết wiki sai. Nó có thể chứa một hoặc nhi�u ký tự mà tựa trang không thể sử dụng.',
-'perfdisabled'         => 'Xin lỗi! Tính năng này đã bị tắt tạm th�i do nó làm chậm cơ sở dữ liệu đến mức không ai có thể dùng được wiki.',
 'perfcached'           => 'Dữ liệu sau được lấy từ bộ nhớ đệm và có thể đã lỗi th�i.',
 'perfcachedts'         => 'Dữ liệu dưới đây được đưa vào vùng nhớ đệm và được cập nhật lần cuối lúc $1.',
 'querypage-no-updates' => 'Việc cập nhật trang này hiện đã bị tắt. Dữ liệu ở đây có thể bị lỗi th�i.',
@@ -461,7 +519,7 @@ Truy vấn: $2',
 'protectedpagetext'    => 'Trang này đã bị khóa không cho sửa đổi.',
 'viewsourcetext'       => 'Bạn vẫn có thể xem và chép xuống mã nguồn của trang này:',
 'protectedinterface'   => 'Trang này cung cấp một thông báo trong giao diện phần m�m, và bị khóa để tránh phá hoại.',
-'editinginterface'     => "'''Lưu ý:''' Bạn đang sửa chữa một trang dùng để cung cấp thông báo giao diện cho phần m�m. Những thay đổi tại trang này sẽ ảnh hưởng đến giao diện của rất nhi�u ngư�i dùng website này. �ể dịch luật, hãy xem xét việc sử dụng [http://translatewiki.net/wiki/Main_Page?setlang=vi Betawiki], dự án địa phương hóa của MediaWiki.",
+'editinginterface'     => "'''Lưu ý:''' Bạn đang sửa chữa một trang dùng để cung cấp thông báo giao diện cho phần m�m. Những thay đổi tại trang này sẽ ảnh hưởng đến giao diện của rất nhi�u ngư�i dùng website này. �ể dịch luật, hãy xem xét việc sử dụng [http://translatewiki.net/wiki/Main_Page?setlang=vi translatewiki.net], dự án địa phương hóa của MediaWiki.",
 'sqlhidden'            => '(đã giấu truy vấn SQL)',
 'cascadeprotected'     => 'Trang này đã bị khóa không cho sửa đổi, vì nó được nhúng vào {{PLURAL:$1|trang|những trang}} đã bị khóa với tùy ch�n “khóa theo tầng� được kích hoạt:
 $2',
@@ -472,13 +530,13 @@ $2',
 Lý do được cung cấp là ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => 'Cấu hình sau: không nhận ra bộ quét virus: <i>$1</i>',
+'virus-badscanner'     => "Cấu hình sau: không nhận ra bộ quét virus: ''$1''",
 'virus-scanfailed'     => 'quét thất bại (mã $1)',
 'virus-unknownscanner' => 'không nhận ra phần m�m diệt virus:',
 
 # Login and logout pages
 'logouttitle'                => '�ăng xuất',
-'logouttext'                 => "<strong>Bạn đã đăng xuất.</strong>
+'logouttext'                 => "'''Bạn đã đăng xuất.'''
 
 Bạn có thể tiếp tục dùng {{SITENAME}} một cách vô danh, hoặc bạn có thể [[Special:UserLogin|đăng nhập lại]] dưới cùng tên ngư�i dùng này hoặc một tên ngư�i dùng khác. Xin lưu ý rằng một vài trang có thể vẫn hiển thị như khi bạn còn đăng nhập, cho đến khi bạn xóa vùng nhớ đệm (''cache'') của trình duyệt.",
 'welcomecreation'            => '== Chào mừng, $1! ==
@@ -491,7 +549,6 @@ Tài khoản của bạn đã mở.
 'remembermypassword'         => 'Nhớ thông tin đăng nhập của tôi trên máy tính này',
 'yourdomainname'             => 'Tên mi�n của bạn:',
 'externaldberror'            => 'Có lỗi khi xác nhận cơ sở dữ liệu bên ngoài hoặc bạn không được phép cập nhật tài khoản bên ngoài.',
-'loginproblem'               => '<b>Có trục trặc khi đăng nhập.</b><br />M�i thử lại!',
 'login'                      => '�ăng nhập',
 'nav-login-createaccount'    => '�ăng nhập / Mở tài khoản',
 'loginprompt'                => 'Bạn cần bật cookie để đăng nhập vào {{SITENAME}}.',
@@ -518,7 +575,7 @@ Hãy ch�n một tên khác.',
 'yournick'                   => 'Chữ ký:',
 'badsig'                     => 'Chữ ký không hợp lệ; hãy kiểm tra thẻ HTML.',
 'badsiglength'               => 'Chữ ký của bạn quá dài.
-Nó phải không quá $1 {{PLURAL:$1|ký tự|ký tự}}.',
+Nó không được dài quá $1 {{PLURAL:$1|ký tự|ký tự}}.',
 'email'                      => 'Thư điện tử',
 'prefs-help-realname'        => 'Tên thật là không bắt buộc, nhưng nếu bạn ghi lại, tên này sẽ dùng để ghi công cho bạn.',
 'loginerror'                 => 'Lỗi đăng nhập',
@@ -531,6 +588,7 @@ Bạn cÅ©ng có thể lá»±a chá»�n để cho phép ngÆ°á»�i khác liên lạc vá
 'loginsuccesstitle'          => '�ăng nhập thành công',
 'loginsuccess'               => "'''Bạn đã đăng nhập vào {{SITENAME}} với tên “$1�.'''",
 'nosuchuser'                 => 'Không có thành viên nào có tên “$1�.
+Tên ngư�i dùng có phân biệt chữ hoa chữ thư�ng.
 Hãy kiểm tra lại chính tả, hoặc [[Special:UserLogin/signup|mở tài khoản mới]].',
 'nosuchusershort'            => 'Không có thành viên nào có tên “<nowiki>$1</nowiki>�. Xin hãy kiểm tra lại chính tả.',
 'nouserspecified'            => 'Bạn phải đưa ra tên đăng ký.',
@@ -549,10 +607,11 @@ Nếu một ngư�i nào khác yêu cầu đi�u này, hoặc nếu bạn đã
 'eauthentsent'               => 'Thư xác nhận đã được gửi. Trước khi dùng chức năng nhận thư, bạn cần thực hiện hướng dẫn trong thư xác nhận, để đảm bảo tài khoản thuộc v� bạn.',
 'throttled-mailpassword'     => 'Mật khẩu đã được gửi đến cho bạn trong vòng {{PLURAL:$1|$1 gi�|$1 gi�}} đồng hồ trở lại. �ể tránh lạm dụng, chỉ có thể gửi mật khẩu $1 gi� đồng hồ một lần.',
 'mailerror'                  => 'Lá»—i gá»­i thÆ° : $1',
-'acct_creation_throttle_hit' => 'Bạn đã mở $1 tài khoản. Không thể mở thêm được nữa.',
-'emailauthenticated'         => '�ịa chỉ thư điện tử của bạn được xác nhận tại $1.',
+'acct_creation_throttle_hit' => 'Những ngư�i sử dụng địa chỉ IP này đã mở {{PLURAL:$1|1 tài khoản|$1 tài khoản}} trong vòng một ngày, và đó là số lượng tài khoản tối đa có thể mở trong ngày.
+Vì vậy, ngư�i khác sử dụng địa chỉ IP này hiện không thể mở thêm tài khoản được nữa.',
+'emailauthenticated'         => '�ịa chỉ thư điện tử của bạn được xác nhận tại $2 vào lúc $3.',
 'emailnotauthenticated'      => '�ịa chỉ thư điện tử của bạn chưa được xác nhận. Chức năng thư điện tử chưa bật.',
-'noemailprefs'               => 'Không có địa chỉ thư điện tử, chức năng sau có thể không hoạt động.',
+'noemailprefs'               => 'Hãy ghi một địa chỉ thư điện tử trong tùy ch�n cá nhân để có thể sử dụng tính năng này.',
 'emailconfirmlink'           => 'Xác nhận địa chỉ thư điện tử',
 'invalidemailaddress'        => '�ịa chỉ thư điện tử không được chấp nhận vì định dạng thư có vẻ sai.
 Hãy nhập một địa chỉ có định dạng đúng hoặc b� trống ô đó.',
@@ -562,18 +621,26 @@ Hãy nhập một địa chỉ có định dạng đúng hoặc b� trống ô
 'createaccount-text'         => 'Ai đó đã tạo một tài khoản với tên $2 tại {{SITENAME}} ($4). Mật khẩu của "$2" là "$3". Bạn nên đăng nhập và đổi mật khẩu ngay bây gi�.
 
 Xin hãy b� qua thông báo này nếu tài khoản này không phải do bạn tạo ra.',
+'login-throttled'            => 'Bạn đã thử quá nhi�u mật khẩu của tài khoản này. Xin hãy đợi chốc lát rồi thử lại.',
 'loginlanguagelabel'         => 'Ngôn ngữ: $1',
 
 # Password reset dialog
-'resetpass'               => '�ặt lại mật khẩu',
-'resetpass_announce'      => 'Bạn đã đăng nhập bằng mật khẩu tạm gởi qua e-mail. �ể hoàn tất việc đăng nhập, bạn phải tạo lại mật khẩu mới tại đây:',
-'resetpass_text'          => '<!-- Gõ chữ vào đây -->',
-'resetpass_header'        => '�ổi mật khẩu cho tài khoản',
-'resetpass_submit'        => 'Ch�n mật khẩu và đăng nhập',
-'resetpass_success'       => '�ã đổi mật khẩu thành công! �ang đăng nhập…',
-'resetpass_bad_temporary' => 'Mật khẩu tạm sai. Có thể là bạn đã đổi mật khẩu thành công hay đã xin mật khẩu tạm mới.',
-'resetpass_forbidden'     => 'Không được đổi mật khẩu',
-'resetpass_missing'       => 'Biểu mẫu đang trống.',
+'resetpass'                 => '�ổi mật khẩu',
+'resetpass_announce'        => 'Bạn đã đăng nhập bằng mật khẩu tạm gởi qua e-mail. �ể hoàn tất việc đăng nhập, bạn phải tạo lại mật khẩu mới tại đây:',
+'resetpass_text'            => '<!-- Gõ chữ vào đây -->',
+'resetpass_header'          => '�ổi mật khẩu cho tài khoản',
+'oldpassword'               => 'Mật khẩu cũ:',
+'newpassword'               => 'Mật khẩu mới:',
+'retypenew'                 => 'Gõ lại:',
+'resetpass_submit'          => 'Ch�n mật khẩu và đăng nhập',
+'resetpass_success'         => '�ã đổi mật khẩu thành công! �ang đăng nhập…',
+'resetpass_bad_temporary'   => 'Mật khẩu tạm sai. Có thể là bạn đã đổi mật khẩu thành công hay đã xin mật khẩu tạm mới.',
+'resetpass_forbidden'       => 'Không được đổi mật khẩu',
+'resetpass-no-info'         => 'Bạn phải đăng nhập mới có thể truy cập trực tiếp trang này.',
+'resetpass-submit-loggedin' => 'Thay đổi mật khẩu',
+'resetpass-wrong-oldpass'   => 'Mật khẩu tạm hoặc mật khẩu hiện th�i không hợp lệ.
+Có thể bạn đã thay đổi thành công mật khẩu của mình hoặc đã yêu cầu cung cấp một mật khẩu tạm mới.',
+'resetpass-temp-password'   => 'Mật khẩu tạm:',
 
 # Edit page toolbar
 'bold_sample'     => 'Chữ đậm',
@@ -598,8 +665,8 @@ Xin hãy b� qua thông báo này nếu tài khoản này không phải do bạ
 'hr_tip'          => 'Dòng kẻ ngang (không nên lạm dụng)',
 
 # Edit pages
-'summary'                          => 'Tóm tắt',
-'subject'                          => '�� mục',
+'summary'                          => 'Tóm lược:',
+'subject'                          => '�� mục:',
 'minoredit'                        => 'Sửa đổi nh�',
 'watchthis'                        => 'Theo dõi trang này',
 'savearticle'                      => 'LÆ°u trang',
@@ -611,8 +678,8 @@ Xin hãy b� qua thông báo này nếu tài khoản này không phải do bạ
 'missingsummary'                   => "'''Nhắc nhở:''' Bạn đã không ghi lại tóm lược sửa đổi. Nếu bạn nhấn Lưu trang một lần nữa, sửa đổi của bạn sẽ được lưu mà không có tóm lược.",
 'missingcommenttext'               => 'Xin hãy gõ vào l�i bàn luận ở dưới.',
 'missingcommentheader'             => "'''Nhắc nhở:''' Bạn chưa cung cấp đ� mục cho bàn luận này. Nếu bạn nhấn nút Lưu trang lần nữa, sửa đổi của bạn sẽ được lưu mà không có đ� mục.",
-'summary-preview'                  => 'Xem trước dòng tóm lược',
-'subject-preview'                  => 'Xem trước đ� mục',
+'summary-preview'                  => 'Xem trước dòng tóm lược:',
+'subject-preview'                  => 'Xem trước đ� mục:',
 'blockedtitle'                     => 'Thành viên bị cấm',
 'blockedtext'                      => "<big>'''Tên ngư�i dùng hoặc địa chỉ IP của bạn đã bị cấm.'''</big>
 
@@ -663,33 +730,35 @@ Xin hãy ghi kèm tất cả các chi tiết trên vào thÆ° yêu cầu của bá
 Do đó chúng ta phải dùng một dãy số g�i là địa chỉ IP để xác định anh/chị ta.
 Một địa chỉ IP như vậy có thể có nhi�u ngư�i cùng dùng chung.
 Nếu bạn là một thành viên vô danh và cảm thấy rằng có những l�i bàn luận không thích hợp đang nhắm vào bạn, xin hãy [[Special:UserLogin/signup|tạo tài khoản]] hoặc [[Special:UserLogin|đăng nhập]] để tránh sự nhầm lẫn v� sau với những thành viên vô danh khác.''",
-'noarticletext'                    => 'Trang này hiện chưa có gì, bạn có thể [[Special:Search/{{PAGENAME}}|tìm kiếm tựa trang]] tại các trang khác hoặc [{{fullurl:{{FULLPAGENAME}}|action=edit}} sửa đổi trang này].',
+'noarticletext'                    => 'Trang này hiện chưa có nội dung.
+Bạn có thể [[Special:Search/{{PAGENAME}}|tìm kiếm tựa trang này]] trong các trang khác, <span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} tìm trong các nhật trình liên quan],
+hoặc [{{fullurl:{{FULLPAGENAME}}|action=edit}} sửa đổi trang này]</span>.',
 'userpage-userdoesnotexist'        => 'Tài khoản mang tên “$1� chưa được đăng ký. Xin hãy kiểm tra lại nếu bạn muốn tạo/sửa trang này.',
 'clearyourcache'                   => "'''Ghi chú - Sau khi lưu trang, có thể bạn sẽ phải xóa bộ nhớ đệm của trình duyệt để xem các thay đổi.''' '''Mozilla / Firefox / Safari:''' giữ phím ''Shift'' trong khi nhấn ''Reload'', hoặc nhấn tổ hợp ''Ctrl-F5'' hay ''Ctrl-R'' (''Command-R'' trên Macintosh); '''Konqueror:''': nhấn nút ''Reload'' hoặc nhấn ''F5''; '''Opera:''' xóa bộ nhớ đệm trong ''Tools → Preferences''; '''Internet Explorer:''' giữ phím ''Ctrl'' trong khi nhấn ''Refresh'', hoặc nhấn tổ hợp ''Ctrl-F5''.",
-'usercssjsyoucanpreview'           => '<strong>Mẹo:</strong> Sử dụng nút “Xem thử� để kiểm thử trang CSS/JS của bạn trước khi lưu trang.',
+'usercssjsyoucanpreview'           => "'''Mẹo:''' Sử dụng nút “Xem thử� để kiểm thử trang CSS/JS của bạn trước khi lưu trang.",
 'usercsspreview'                   => "'''Hãy nhớ rằng bạn chỉ đang xem thử trang CSS cá nhân của bạn.
 Nó chưa được lưu!'''",
 'userjspreview'                    => "'''Nhớ rằng bạn chỉ đang kiểm thử/xem thử trang JavaScript, nó chưa được lưu!'''",
 'userinvalidcssjstitle'            => "'''Cảnh báo:''' Không có skin “$1�. Hãy nhớ rằng các trang .css và .js tùy chỉnh sử dụng tiêu đ� chữ thư�ng, như {{ns:user}}:Ví&nbsp;dụ/monobook.css chứ không phải {{ns:user}}:Ví&nbsp;dụ/Monobook.css.",
 'updated'                          => '(Cập nhật)',
-'note'                             => '<strong>Ghi chú:</strong>',
-'previewnote'                      => '<strong>�ây chỉ mới là xem thử; các thay đổi vẫn chưa được lưu!</strong>',
+'note'                             => "'''Ghi chú:'''",
+'previewnote'                      => "'''�ây chỉ mới là xem thử; các thay đổi vẫn chưa được lưu!'''",
 'previewconflict'                  => 'Phần xem thử này là kết quả của văn bản trong vùng soạn thảo phía trên và nó sẽ xuất hiện như vậy nếu bạn ch�n lưu trang.',
-'session_fail_preview'             => '<strong>Những sửa đổi của bạn chưa được lưu giữ do mất dữ liệu v� phiên làm việc.
+'session_fail_preview'             => "'''Những sửa đổi của bạn chưa được lưu giữ do mất dữ liệu v� phiên làm việc.
 Xin hãy thử lần nữa.
-Nếu vẫn không thành công, hãy thử [[Special:UserLogout|đăng xuất]] rồi đăng nhập lại.</strong>',
-'session_fail_preview_html'        => "<strong>Những sửa đổi của bạn chưa được lưu giữ do mất dữ liệu v� phiên làm việc.</strong>
+Nếu vẫn không thành công, hãy thử [[Special:UserLogout|đăng xuất]] rồi đăng nhập lại.'''",
+'session_fail_preview_html'        => "'''Những sửa đổi của bạn chưa được lưu giữ do mất dữ liệu v� phiên làm việc.'''
 
 ''Do {{SITENAME}} cho phép dùng mã HTML, trang xem thử được ẩn đi để đ� phòng bị tấn công bằng JavaScript.''
 
-<strong>Nếu sửa đổi này là đúng đắn, xin hãy thử lần nữa. 
-Nếu vẫn không thành công, bạn hãy thử [[Special:UserLogout|đăng xuất]] rồi đăng nhập lại.</strong>",
-'token_suffix_mismatch'            => '<strong>Sửa đổi của bạn bị hủy b� vì trình duyệt của bạn lẫn lộn các ký tự dấu trong số hiệu
+'''Nếu sửa đổi này là đúng đắn, xin hãy thử lần nữa. 
+Nếu vẫn không thành công, bạn hãy thử [[Special:UserLogout|đăng xuất]] rồi đăng nhập lại.'''",
+'token_suffix_mismatch'            => "'''Sửa đổi của bạn bị hủy b� vì trình duyệt của bạn lẫn lộn các ký tự dấu trong số hiệu
 sửa đổi. Việc hủy b� này nhằm tránh nội dung trang bị h�ng.
-�i�u này thư�ng xảy ra khi bạn sử dụng một dịch vụ proxy vô danh trên web có vấn đ�.</strong>',
+�i�u này thư�ng xảy ra khi bạn sử dụng một dịch vụ proxy vô danh trên web có vấn đ�.'''",
 'editing'                          => 'Sửa đổi $1',
 'editingsection'                   => 'Sửa đổi $1',
-'editingcomment'                   => 'Sửa đổi $1',
+'editingcomment'                   => 'Sửa đổi $1 (đ� mục mới)',
 'editconflict'                     => 'Sửa đổi mâu thuẫn: $1',
 'explainconflict'                  => "Trang này có đã được lưu bởi ngư�i khác sau khi bạn bắt đầu sửa.
 Phía trên là bản hiện tại.
@@ -698,22 +767,24 @@ Bạn sẽ phải trộn thay đổi của bạn với bản hiện tại.
 '''Chỉ có''' phần văn bản ở phía trên là sẽ được lưu khi bạn nhất nút “Lưu trang�.",
 'yourtext'                         => 'Nội dung bạn nhập',
 'storedversion'                    => 'Phiên bản lưu',
-'nonunicodebrowser'                => "<strong>CHU' Y': Tri`nh duye^.t cu?a ba.n kho^ng ho^~ tro+. unicode. Mo^.t ca'ch dde^? ba.n co' the^? su+?a ddo^?i an toa`n trang na`y: ca'c ky' tu+. kho^ng pha?i ASCII se~ xua^'t hie^.n trong ho^.p soa.n tha?o du+o+'i da.ng ma~ tha^.p lu.c pha^n.</strong>",
-'editingold'                       => '<strong>Chú ý: bạn đang sửa một phiên bản cũ. Nếu bạn lưu, các sửa đổi trên các phiên bản mới hơn sẽ bị mất.</strong>',
+'nonunicodebrowser'                => "'''CHU' Y': Tri`nh duye^.t cu?a ba.n kho^ng ho^~ tro+. unicode. Mo^.t ca'ch dde^? ba.n co' the^? su+?a ddo^?i an toa`n trang na`y: ca'c ky' tu+. kho^ng pha?i ASCII se~ xua^'t hie^.n trong ho^.p soa.n tha?o du+o+'i da.ng ma~ tha^.p lu.c pha^n.'''",
+'editingold'                       => "'''Chú ý: bạn đang sửa một phiên bản cũ. Nếu bạn lưu, các sửa đổi trên các phiên bản mới hơn sẽ bị mất.'''",
 'yourdiff'                         => 'Khác',
-'copyrightwarning'                 => 'Xin chú ý rằng tất cả các đóng góp của bạn tại {{SITENAME}} được xem là sẽ phát hành theo giấy phép $2 (xem $1 để biết thêm chi tiết). Nếu bạn không muốn trang của bạn bị sửa đổi không thương tiếc và không sẵn lòng cho phép phát hành lại, đừng đăng trang ở đây.<br />
+'copyrightwarning'                 => "Xin chú ý rằng tất cả các đóng góp của bạn tại {{SITENAME}} được xem là sẽ phát hành theo giấy phép $2 (xem $1 để biết thêm chi tiết). Nếu bạn không muốn trang của bạn bị sửa đổi không thương tiếc và không sẵn lòng cho phép phát hành lại, đừng đăng trang ở đây.<br />
 Bạn phải đảm bảo với chúng tôi rằng chính bạn là ngư�i viết nên, hoặc chép nó từ một nguồn thuộc phạm vi công cộng hoặc tự do tương đương.
-<strong>�ỪNG �ĂNG T�C PHẨM CÓ BẢN QUYỀN MÀ CHƯA XIN PHÉP!</strong>',
-'copyrightwarning2'                => 'Xin chú ý rằng tất cả các đóng góp của bạn tại {{SITENAME}} có thể được sửa đổi, thay thế, hoặc xóa b� bởi các thành viên khác. Nếu bạn không muốn trang của bạn bị sửa đổi không thương tiếc, đừng đăng trang ở đây.<br />
+'''�ỪNG �ĂNG T�C PHẨM CÓ BẢN QUYỀN MÀ CHƯA XIN PHÉP!'''",
+'copyrightwarning2'                => "Xin chú ý rằng tất cả các đóng góp của bạn tại {{SITENAME}} có thể được sửa đổi, thay thế, hoặc xóa b� bởi các thành viên khác. Nếu bạn không muốn trang của bạn bị sửa đổi không thương tiếc, đừng đăng trang ở đây.<br />
 Bạn phải đảm bảo với chúng tôi rằng chính bạn là ngư�i viết nên, hoặc chép nó từ một nguồn thuộc phạm vi công cộng hoặc tự do tương đương (xem $1 để biết thêm chi tiết).
-<strong>�ỪNG �ĂNG T�C PHẨM CÓ BẢN QUYỀN MÀ CHƯA XIN PHÉP!</strong>',
-'longpagewarning'                  => '<strong>CẢNH B�O: Trang này dài $1 kilobyte; một số trình duyệt không tải được trang dài hơn 32 kb. Bạn nên chia nh� trang này thành nhi�u trang.</strong>',
-'longpageerror'                    => '<strong>LỖI: Văn bạn mà bạn muốn lưu dài $1 kilobyte, dài hơn độ dài tối đa cho phép $2 kilobyte. Không thể lưu trang.</strong>',
-'readonlywarning'                  => '<strong>CẢNH B�O: Cơ sở dữ liệu đã bị khóa để bảo dưỡng, do đó bạn không thể lưu các sửa đổi của mình. Bạn nên cắt-dán đoạn bạn vừa sửa vào một tập tin và lưu nó lại để sửa đổi sau này.</strong>',
-'protectedpagewarning'             => '<strong>CẢNH B�O:  Trang này đã bị khoá, chỉ có các thành viên có quy�n quản lý mới sửa được.</strong>',
+'''�ỪNG �ĂNG T�C PHẨM CÓ BẢN QUYỀN MÀ CHƯA XIN PHÉP!'''",
+'longpagewarning'                  => "'''CẢNH B�O: Trang này dài $1 kilobyte; một số trình duyệt không tải được trang dài hơn 32 kb. Bạn nên chia nh� trang này thành nhi�u trang.'''",
+'longpageerror'                    => "'''LỖI: Văn bạn mà bạn muốn lưu dài $1 kilobyte, dài hơn độ dài tối đa cho phép $2 kilobyte. Không thể lưu trang.'''",
+'readonlywarning'                  => "'''CẢNH B�O: Cơ sở dữ liệu đã bị khóa để bảo dưỡng, do đó bạn không thể lưu các sửa đổi của mình. Bạn nên cắt-dán đoạn bạn vừa sửa vào một tập tin và lưu nó lại để sửa đổi sau này.'''
+
+Ngư�i quản lý khi khóa dữ liệu đã đưa ra lý do: $1",
+'protectedpagewarning'             => "'''CẢNH B�O:  Trang này đã bị khoá, chỉ có các thành viên có quy�n quản lý mới sửa được.'''",
 'semiprotectedpagewarning'         => "'''Ghi chú:''' Trang này đã bị khóa, chỉ cho phép các thành viên đã đăng ký sửa đổi.",
 'cascadeprotectedwarning'          => "'''Cảnh báo:''' Trang này đã bị khóa, chỉ có thành viên có quy�n quản lý mới có thể sửa đổi được, vì nó được nhúng vào {{PLURAL:$1|trang|những trang}} bị khóa theo tầng sau:",
-'titleprotectedwarning'            => '<strong>CẢNH B�O:  Trang này đã bị khóa, chỉ có một số thành viên mới có thể tạo ra.</strong>',
+'titleprotectedwarning'            => "'''CẢNH B�O:  Trang này đã bị khóa vì vậy bạn cần một số [[Special:ListGroupRights|quy�n]] mới có thể tạo trang.'''",
 'templatesused'                    => 'Các tiêu bản dùng trong trang này',
 'templatesusedpreview'             => 'Các tiêu bản sẽ được dùng trong trang này:',
 'templatesusedsection'             => 'Các tiêu bản sẽ được dùng trong phần này:',
@@ -732,11 +803,22 @@ Bạn có thể quay trở lại và sửa đổi các trang đã có, hoặc [[
 
 Bạn nên cân nhắc trong việc tiếp tục soạn thảo trang này.
 Nhật trình xóa của trang được đưa ra dưới đây để tiện theo dõi:",
+'deleted-notice'                   => 'Trang này đã bị xóa.
+Nhật trình xóa trang được ghi dưới đây để tiện theo dõi.',
+'deletelog-fulllog'                => 'Xem nhật trình đầy đủ',
+'edit-hook-aborted'                => 'Một phần bổ trợ phần m�m đã b� qua sửa đổi này.
+Không có lý do nào được đưa ra.',
+'edit-gone-missing'                => 'Không thể cập nhật trang.
+Dư�ng như trang này đã bị xóa.',
+'edit-conflict'                    => 'Sửa đổi mâu thuẫn.',
+'edit-no-change'                   => 'Sửa đổi của bạn không được tính đến, vì nó không làm thay đổi nội dung.',
+'edit-already-exists'              => 'Không thể tạo trang mới.
+Nó đã tồn tại.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Cảnh báo: Trang này có quá nhi�u lần g�i hàm cú pháp cần mức độ xử lý cao.
 
-Nó nên ít hơn $2, hiện gi� đang là $1.',
+Nó nên ít hơn $2 {{PLURAL:$2|lần g�i|lần g�i}}, hiện gi� đang là {{PLURAL:$1|$1 lần g�i|$1 lần g�i}}.',
 'expensive-parserfunction-category'       => 'Trang có quá nhi�u l�i g�i hàm cú pháp cần mức độ xử lý cao',
 'post-expand-template-inclusion-warning'  => 'Cảnh báo: Kích thước tiêu bản nhúng vào quá lớn.
 Một số tiêu bản sẽ không được đưa vào.',
@@ -744,6 +826,8 @@ Một số tiêu bản sẽ không được đưa vào.',
 'post-expand-template-argument-warning'   => 'Cảnh báo: Trang này có chứa ít nhất một giá trị tiêu bản có kích thước bung ra quá lớn.
 Những giá trị này sẽ bị b� đi.',
 'post-expand-template-argument-category'  => 'Những trang có chứa những giá trị tiêu bản bị loại b�',
+'parser-template-loop-warning'            => 'Phát hiện tiêu bản lặp vòng: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Tiêu bản đã vượt quá giới hạn v� độ sâu đệ quy ($1)',
 
 # "Undo" feature
 'undo-success' => 'Các sửa đổi có thể được lùi lại. Xin hãy kiểm tra phần so sánh bên dưới để xác nhận lại những gì bạn muốn làm, sau đó lưu thay đổi ở dưới để hoàn tất việc lùi lại sửa đổi.',
@@ -758,29 +842,29 @@ Những giá trị này sẽ bị b� đi.',
 Lý do được $3 đưa ra là ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Xem nhật trình của trang này',
-'nohistory'           => 'Trang này chưa có lịch sử.',
-'revnotfound'         => 'Không thấy',
-'revnotfoundtext'     => 'Không thấy phiên bản trước của trang này. Xin kiểm tra lại.',
-'currentrev'          => 'Bản hiện tại',
-'revisionasof'        => 'Phiên bản lúc $1',
-'revision-info'       => 'Phiên bản vào lúc $1 do $2 sửa đổi',
-'previousrevision'    => '� Phiên bản cũ',
-'nextrevision'        => 'Phiên bản mới →',
-'currentrevisionlink' => 'xem phiên bản hiện hành',
-'cur'                 => 'hiện',
-'next'                => 'tiếp',
-'last'                => 'trÆ°á»›c',
-'page_first'          => 'đầu',
-'page_last'           => 'cuối',
-'histlegend'          => 'Ch�n so sánh: đánh dấu để ch�n các phiên bản để so sánh rồi nhấn enter hoặc nút ở dưới.<br />
+'viewpagelogs'           => 'Xem nhật trình của trang này',
+'nohistory'              => 'Trang này chưa có lịch sử.',
+'currentrev'             => 'Bản hiện tại',
+'currentrev-asof'        => 'Bản hiện tại lúc $1',
+'revisionasof'           => 'Phiên bản lúc $1',
+'revision-info'          => 'Phiên bản vào lúc $1 do $2 sửa đổi', # Additionally available: $3: revision id
+'previousrevision'       => '� Phiên bản cũ',
+'nextrevision'           => 'Phiên bản mới →',
+'currentrevisionlink'    => 'xem phiên bản hiện hành',
+'cur'                    => 'hiện',
+'next'                   => 'tiếp',
+'last'                   => 'trÆ°á»›c',
+'page_first'             => 'đầu',
+'page_last'              => 'cuối',
+'histlegend'             => 'Ch�n so sánh: đánh dấu để ch�n các phiên bản để so sánh rồi nhấn enter hoặc nút ở dưới.<br />
 Chú giải: (hiện) = khác với phiên bản hiện hành,
 (trước) = khác với phiên bản trước, n = sửa đổi nh�.',
-'deletedrev'          => '[đã xóa]',
-'histfirst'           => 'Cũ nhất',
-'histlast'            => 'Mới nhất',
-'historysize'         => '({{PLURAL:$1|1 byte|$1 byte}})',
-'historyempty'        => '(trống)',
+'history-fieldset-title' => 'Tìm trong lịch sử',
+'deletedrev'             => '[đã xóa]',
+'histfirst'              => 'Cũ nhất',
+'histlast'               => 'Mới nhất',
+'historysize'            => '({{PLURAL:$1|1 byte|$1 byte}})',
+'historyempty'           => '(trống)',
 
 # Revision feed
 'history-feed-title'          => 'Lịch sử thay đổi',
@@ -865,6 +949,7 @@ Xin hãy bảo đảm giữ vững tính liên tục của lịch sử trang.',
 'mergehistory-invalid-destination' => 'Trang đích phải có tiêu đ� hợp lệ.',
 'mergehistory-autocomment'         => '�ã trộn [[:$1]] vào [[:$2]]',
 'mergehistory-comment'             => '�ã trộn [[:$1]] vào [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Trang nguồn và trang đích không được trùng tên',
 
 # Merge log
 'mergelog'           => 'Nhật trình trộn',
@@ -877,119 +962,200 @@ Xin hãy bảo đảm giữ vững tính liên tục của lịch sử trang.',
 'difference'              => '(Khác biệt giữa các bản)',
 'lineno'                  => 'Dòng $1:',
 'compareselectedversions' => 'So sánh các bản đã ch�n',
+'visualcomparison'        => 'So sánh hình dạng',
+'wikicodecomparison'      => 'So sánh mã wiki',
 'editundo'                => 'lùi sửa',
 'diff-multi'              => '(Không hiển thị {{PLURAL:$1|một|$1}} phiên bản ở giữa)',
+'diff-movedto'            => 'chuyển qua $1',
+'diff-styleadded'         => 'đã thêm kiểu $1',
+'diff-added'              => 'đã thêm $1',
+'diff-changedto'          => 'đã đổi thành $1',
+'diff-movedoutof'         => 'tách ra kh�i $1',
+'diff-styleremoved'       => 'đã xóa kiểu $1',
+'diff-removed'            => 'đã xóa $1',
+'diff-changedfrom'        => 'đã đổi từ $1',
+'diff-src'                => 'nguồn',
+'diff-withdestination'    => 'tá»›i $1',
+'diff-with'               => '&#32;vá»›i $1 $2',
+'diff-with-final'         => '&#32;và $1 $2',
+'diff-width'              => 'rá»™ng',
+'diff-height'             => 'cao',
+'diff-p'                  => "'''đoạn văn'''",
+'diff-blockquote'         => "'''đoạn trích dẫn'''",
+'diff-h1'                 => "'''mục cấp 1'''",
+'diff-h2'                 => "'''mục cấp 2'''",
+'diff-h3'                 => "'''mục cấp 3'''",
+'diff-h4'                 => "'''mục cấp 4'''",
+'diff-h5'                 => "'''mục cấp 5'''",
+'diff-pre'                => "'''khối định dạng trước'''",
+'diff-div'                => "'''đoạn'''",
+'diff-ul'                 => "'''danh sách hoa thị'''",
+'diff-ol'                 => "'''danh sách số'''",
+'diff-li'                 => "'''khoản trong danh sách'''",
+'diff-table'              => "'''bảng'''",
+'diff-tbody'              => "'''thân bảng'''",
+'diff-tr'                 => "'''hàng'''",
+'diff-td'                 => "'''ô'''",
+'diff-th'                 => "'''tiêu đ� bảng'''",
+'diff-br'                 => "'''dòng mới'''",
+'diff-hr'                 => "'''đư�ng gạch ngang'''",
+'diff-code'               => "'''khối mã lập trình'''",
+'diff-dl'                 => "'''danh sách định nghĩa'''",
+'diff-dt'                 => "'''thuật ngữ trong danh sách'''",
+'diff-dd'                 => "'''định nghĩa trong danh sách'''",
+'diff-input'              => "'''ô dữ liệu'''",
+'diff-form'               => "'''biểu mẫu'''",
+'diff-img'                => "'''hình'''",
+'diff-span'               => "'''khoảng'''",
+'diff-a'                  => "'''liên kết'''",
+'diff-i'                  => "'''chữ xiên'''",
+'diff-b'                  => "'''chữ đậm'''",
+'diff-strong'             => "'''chữ nhấn rất mạnh'''",
+'diff-em'                 => "'''chữ nhấn mạnh'''",
+'diff-font'               => "'''phông chữ'''",
+'diff-big'                => "'''chữ lớn'''",
+'diff-del'                => "'''văn bản xóa'''",
+'diff-tt'                 => "'''chữ đơn cách'''",
+'diff-sub'                => "'''chữ viết lên trên'''",
+'diff-sup'                => "'''chữ viết xuống dưới'''",
+'diff-strike'             => "'''chữ gạch ngang'''",
 
 # Search results
-'searchresults'             => 'Kết quả tìm kiếm',
-'searchresulttext'          => '�ể biết thêm chi tiết v� tìm kiếm tại {{SITENAME}}, xem [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => "Bạn đã tìm '''[[:$1]]''' ([[Special:Prefixindex/$1|tất cả các trang bắt đầu bằng “$1�]] | [[Special:WhatLinksHere/$1|tất cả các trang liên kết đến “$1�]])",
-'searchsubtitleinvalid'     => "Tìm '''$1'''",
-'noexactmatch'              => "'''Trang “$1� không tồn tại.''' Bạn có thể [[:$1|tạo trang này]].",
-'noexactmatch-nocreate'     => "'''Không có trang nào có tên “$1�.'''",
-'toomanymatches'            => 'Có quá nhi�u kết quả được trả v�, xin hãy thử câu tìm kiếm khác',
-'titlematches'              => '�� mục tương tự',
-'notitlematches'            => 'Không có tên trang nào có nội dung tương tự',
-'textmatches'               => 'Câu chữ tương tự',
-'notextmatches'             => 'Không tìm thấy nội dung trang',
-'prevn'                     => '$1 trÆ°á»›c',
-'nextn'                     => '$1 sau',
-'viewprevnext'              => 'Xem ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|1 từ|$2 từ}})',
-'search-result-score'       => '�ộ phù hợp: $1%',
-'search-redirect'           => '(đổi hướng $1)',
-'search-section'            => '(đ� mục $1)',
-'search-suggest'            => 'Có phải bạn muốn tìm: $1',
-'search-interwiki-caption'  => 'Các dự án liên quan',
-'search-interwiki-default'  => '$1 kết quả:',
-'search-interwiki-more'     => '(thêm)',
-'search-mwsuggest-enabled'  => 'có gợi ý',
-'search-mwsuggest-disabled' => 'không có gợi ý',
-'search-relatedarticle'     => 'Liên quan',
-'mwsuggest-disable'         => 'Tắt gợi ý bằng AJAX',
-'searchrelated'             => 'có liên quan',
-'searchall'                 => 'tất cả',
-'showingresults'            => "Dưới đây là {{PLURAL:$1|'''1'''|'''$1'''}} kết quả bắt đầu từ #'''$2'''.",
-'showingresultsnum'         => "Dưới đây là {{PLURAL:$3|'''1'''|'''$3'''}} kết quả bắt đầu từ #'''$2'''.",
-'showingresultstotal'       => "Dưới đây là {{PLURAL:$3|kết quả '''$1''' trong '''$3'''|những kết quả từ '''$1 - $2''' trong tổng số '''$3'''}}",
-'nonefound'                 => "'''Chú ý''': Theo mặc định chỉ tìm kiếm một số không gian tên. Hãy thử bắt đầu từ khóa bằng ''all:'' để tìm m�i nội dung (kể cả trang thảo luận, tiêu bản, v.v.), hoặc bắt đầu bằng không gian tên mong muốn (ví dụ ''Thảo luận:'', ''Tiêu bản:'', ''Thể loại:''…).",
-'powersearch'               => 'Tìm kiếm nâng cao',
-'powersearch-legend'        => 'Tìm kiếm nâng cao',
-'powersearch-ns'            => 'Tìm trong không gian tên:',
-'powersearch-redir'         => 'Liệt kê cả trang đổi hướng',
-'powersearch-field'         => 'Tìm',
-'search-external'           => 'Tìm kiếm từ bên ngoài',
-'searchdisabled'            => 'Chức năng tìm kiếm tại {{SITENAME}} đã bị tắt. Bạn có tìm kiếm bằng Google trong th�i gian này. Chú ý rằng các chỉ mục từ {{SITENAME}} của chúng có thể đã lỗi th�i.',
+'searchresults'                    => 'Kết quả tìm kiếm',
+'searchresults-title'              => 'Kết quả tìm kiếm “$1�',
+'searchresulttext'                 => '�ể biết thêm chi tiết v� tìm kiếm tại {{SITENAME}}, xem [[{{MediaWiki:Helppage}}|{{int:help}}]].',
+'searchsubtitle'                   => "Bạn đã tìm '''[[:$1]]''' ([[Special:Prefixindex/$1|tất cả các trang bắt đầu bằng “$1�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|tất cả các trang liên kết đến “$1�]])",
+'searchsubtitleinvalid'            => "Tìm '''$1'''",
+'noexactmatch'                     => "'''Trang “$1� không tồn tại.''' Bạn có thể [[:$1|tạo trang này]].",
+'noexactmatch-nocreate'            => "'''Không có trang nào có tên “$1�.'''",
+'toomanymatches'                   => 'Có quá nhi�u kết quả được trả v�, xin hãy thử câu tìm kiếm khác',
+'titlematches'                     => '�� mục tương tự',
+'notitlematches'                   => 'Không có tên trang nào có nội dung tương tự',
+'textmatches'                      => 'Câu chữ tương tự',
+'notextmatches'                    => 'Không tìm thấy nội dung trang',
+'prevn'                            => '$1 trÆ°á»›c',
+'nextn'                            => '$1 sau',
+'viewprevnext'                     => 'Xem ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Tùy ch�n tìm kiếm',
+'searchmenu-exists'                => "* Trang '''[[$1]]'''",
+'searchmenu-new'                   => "'''Tạo trang “[[:$1]]� trên wiki này!'''",
+'searchhelp-url'                   => 'Help:Ná»™i dung',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Duyệt các trang với ti�n tố này]]',
+'searchprofile-articles'           => 'Trang có nội dung',
+'searchprofile-articles-and-proj'  => 'Trang có nội dung & Trang dự án',
+'searchprofile-project'            => 'Trang dự án',
+'searchprofile-images'             => 'Tập tin',
+'searchprofile-everything'         => 'Tất cả',
+'searchprofile-advanced'           => 'Nâng cao',
+'searchprofile-articles-tooltip'   => 'Tìm trong $1',
+'searchprofile-project-tooltip'    => 'Tìm trong $1',
+'searchprofile-images-tooltip'     => 'Tìm tập tin',
+'searchprofile-everything-tooltip' => 'Tìm tất cả nội dung (gồm cả các trang thảo luận)',
+'searchprofile-advanced-tooltip'   => 'Tìm trong không gian tên tùy ch�n',
+'prefs-search-nsdefault'           => 'Tìm sử dụng giá trị mặc định:',
+'prefs-search-nscustom'            => 'Tìm không gian tên tùy ch�n:',
+'search-result-size'               => '$1 ({{PLURAL:$2|1 từ|$2 từ}})',
+'search-result-score'              => '�ộ phù hợp: $1%',
+'search-redirect'                  => '(đổi hướng $1)',
+'search-section'                   => '(đ� mục $1)',
+'search-suggest'                   => 'Có phải bạn muốn tìm: $1',
+'search-interwiki-caption'         => 'Các dự án liên quan',
+'search-interwiki-default'         => '$1 kết quả:',
+'search-interwiki-more'            => '(thêm)',
+'search-mwsuggest-enabled'         => 'có gợi ý',
+'search-mwsuggest-disabled'        => 'không có gợi ý',
+'search-relatedarticle'            => 'Liên quan',
+'mwsuggest-disable'                => 'Tắt gợi ý bằng AJAX',
+'searchrelated'                    => 'có liên quan',
+'searchall'                        => 'tất cả',
+'showingresults'                   => "Dưới đây là {{PLURAL:$1|'''1'''|'''$1'''}} kết quả bắt đầu từ #'''$2'''.",
+'showingresultsnum'                => "Dưới đây là {{PLURAL:$3|'''1'''|'''$3'''}} kết quả bắt đầu từ #'''$2'''.",
+'showingresultstotal'              => "Dưới đây là {{PLURAL:$4|kết quả thứ '''$1''' trong tổng số '''$3'''|những kết quả từ '''$1 - $2''' trong tổng số '''$3'''}}",
+'nonefound'                        => "'''Chú ý''': Theo mặc định chỉ tìm kiếm một số không gian tên. Hãy thử bắt đầu từ khóa bằng ''all:'' để tìm m�i nội dung (kể cả trang thảo luận, tiêu bản, v.v.), hoặc bắt đầu bằng không gian tên mong muốn (ví dụ ''Thảo luận:'', ''Tiêu bản:'', ''Thể loại:''…).",
+'search-nonefound'                 => 'Không có kết quả nào khớp với câu truy vấn.',
+'powersearch'                      => 'Tìm kiếm nâng cao',
+'powersearch-legend'               => 'Tìm kiếm nâng cao',
+'powersearch-ns'                   => 'Tìm trong không gian tên:',
+'powersearch-redir'                => 'Liệt kê cả trang đổi hướng',
+'powersearch-field'                => 'Tìm',
+'search-external'                  => 'Tìm kiếm từ bên ngoài',
+'searchdisabled'                   => 'Chức năng tìm kiếm tại {{SITENAME}} đã bị tắt. Bạn có tìm kiếm bằng Google trong th�i gian này. Chú ý rằng các chỉ mục từ {{SITENAME}} của chúng có thể đã lỗi th�i.',
 
 # Preferences page
-'preferences'              => 'Tùy ch�n',
-'mypreferences'            => 'Tùy ch�n',
-'prefs-edits'              => 'Số lần sửa đổi:',
-'prefsnologin'             => 'Chưa đăng nhập',
-'prefsnologintext'         => 'Bạn phải <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} đăng nhập]</span> để thiết lập tùy ch�n cá nhân.',
-'prefsreset'               => 'Các tùy ch�n cá nhân đã được mặc định lại.',
-'qbsettings'               => 'Thanh công cụ',
-'qbsettings-none'          => 'Không có',
-'qbsettings-fixedleft'     => 'Cố định trái',
-'qbsettings-fixedright'    => 'Cố định phải',
-'qbsettings-floatingleft'  => 'Nổi bên trái',
-'qbsettings-floatingright' => 'Nổi bên phải',
-'changepassword'           => '�ổi mật khẩu',
-'skin'                     => 'Hình dạng',
-'math'                     => 'Công thức toán',
-'dateformat'               => 'Kiểu ngày tháng',
-'datedefault'              => 'Không lựa ch�n',
-'datetime'                 => 'Ngày tháng',
-'math_failure'             => 'Không thể phân tích cú pháp',
-'math_unknown_error'       => 'lỗi lạ',
-'math_unknown_function'    => 'hàm lạ',
-'math_lexing_error'        => 'lỗi chính tả',
-'math_syntax_error'        => 'lỗi cú pháp',
-'math_image_error'         => 'Không chuyển sang định dạng PNG được; xin kiểm tra lại cài đặt latex, dvips, gs và convert',
-'math_bad_tmpdir'          => 'Không tạo mới hay viết vào thư mục toán tạm th�i được',
-'math_bad_output'          => 'Không tạo mới hay viết vào thư mục kết quả được',
-'math_notexvc'             => 'Không thấy hàm thực thi texvc; xin xem math/README để biết cách cấu hình.',
-'prefs-personal'           => 'Thông tin cá nhân',
-'prefs-rc'                 => 'Thay đổi gần đây',
-'prefs-watchlist'          => 'Theo dõi',
-'prefs-watchlist-days'     => 'Số ngày hiển thị trong danh sách theo dõi:',
-'prefs-watchlist-edits'    => 'Số lần sửa đổi tối đa trong danh sách theo dõi mở rộng:',
-'prefs-misc'               => 'Linh tinh',
-'saveprefs'                => 'Lưu tùy ch�n',
-'resetprefs'               => 'Mặc định lại lựa ch�n',
-'oldpassword'              => 'Mật khẩu cũ:',
-'newpassword'              => 'Mật khẩu mới:',
-'retypenew'                => 'Gõ lại:',
-'textboxsize'              => 'Sửa đổi',
-'rows'                     => 'Số hàng:',
-'columns'                  => 'Số cột:',
-'searchresultshead'        => 'Tìm kiếm',
-'resultsperpage'           => 'Số kết quả mỗi trang:',
-'contextlines'             => 'Số hàng trong trang dùng để tìm ra kết quả:',
-'contextchars'             => 'Số chữ trong một hàng kết quả:',
-'stub-threshold'           => '�ịnh dạng <a href="#" class="stub">liên kết đến sơ khai</a> cho các trang ngắn hơn (byte):',
-'recentchangesdays'        => 'Số ngày hiển thị trong thay đổi gần đây:',
-'recentchangescount'       => 'Số sửa đổi hiển thị trong trang thay đổi gần đây, lịch sử và nhật trình:',
-'savedprefs'               => '�ã lưu các tùy ch�n cá nhân.',
-'timezonelegend'           => 'Múi gi�',
-'timezonetext'             => '¹Số gi� chênh lệch giữa gi� địa phương của bạn với gi� máy chủ (UTC)',
-'localtime'                => 'Gi� địa phương',
-'timezoneoffset'           => 'Chênh gi�¹',
-'servertime'               => 'Gi� máy chủ',
-'guesstimezone'            => 'Dùng gi� của trình duyệt',
-'allowemail'               => 'Nhận thư điện tử từ các thành viên khác',
-'prefs-searchoptions'      => 'Lựa ch�n tìm kiếm',
-'prefs-namespaces'         => 'Không gian tên',
-'defaultns'                => 'Mặc định tìm kiếm trong không gian tên:',
-'default'                  => 'mặc định',
-'files'                    => 'Tập tin',
+'preferences'               => 'Tùy ch�n',
+'mypreferences'             => 'Tùy ch�n',
+'prefs-edits'               => 'Số lần sửa đổi:',
+'prefsnologin'              => 'Chưa đăng nhập',
+'prefsnologintext'          => 'Bạn phải <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} đăng nhập]</span> để thiết lập tùy ch�n cá nhân.',
+'prefsreset'                => 'Các tùy ch�n cá nhân đã được mặc định lại.',
+'qbsettings'                => 'Thanh công cụ',
+'qbsettings-none'           => 'Không có',
+'qbsettings-fixedleft'      => 'Cố định trái',
+'qbsettings-fixedright'     => 'Cố định phải',
+'qbsettings-floatingleft'   => 'Nổi bên trái',
+'qbsettings-floatingright'  => 'Nổi bên phải',
+'changepassword'            => '�ổi mật khẩu',
+'skin'                      => 'Hình dạng',
+'skin-preview'              => 'Xem thá»­',
+'math'                      => 'Công thức toán',
+'dateformat'                => 'Kiểu ngày tháng',
+'datedefault'               => 'Không lựa ch�n',
+'datetime'                  => 'Ngày tháng',
+'math_failure'              => 'Không thể phân tích cú pháp',
+'math_unknown_error'        => 'lỗi lạ',
+'math_unknown_function'     => 'hàm lạ',
+'math_lexing_error'         => 'lỗi chính tả',
+'math_syntax_error'         => 'lỗi cú pháp',
+'math_image_error'          => 'Không chuyển sang định dạng PNG được; xin kiểm tra lại cài đặt latex, dvips, gs và convert',
+'math_bad_tmpdir'           => 'Không tạo mới hay viết vào thư mục toán tạm th�i được',
+'math_bad_output'           => 'Không tạo mới hay viết vào thư mục kết quả được',
+'math_notexvc'              => 'Không thấy hàm thực thi texvc; xin xem math/README để biết cách cấu hình.',
+'prefs-personal'            => 'Thông tin cá nhân',
+'prefs-rc'                  => 'Thay đổi gần đây',
+'prefs-watchlist'           => 'Theo dõi',
+'prefs-watchlist-days'      => 'Số ngày hiển thị trong danh sách theo dõi:',
+'prefs-watchlist-days-max'  => '(tối đa 7 ngày)',
+'prefs-watchlist-edits'     => 'Số lần sửa đổi tối đa trong danh sách theo dõi mở rộng:',
+'prefs-watchlist-edits-max' => '(con số tối đa: 1000)',
+'prefs-misc'                => 'Linh tinh',
+'prefs-resetpass'           => 'Thay đổi mật khẩu',
+'saveprefs'                 => 'Lưu tùy ch�n',
+'resetprefs'                => 'Mặc định lại lựa ch�n',
+'textboxsize'               => 'Sửa đổi',
+'prefs-edit-boxsize'        => 'Kích thước cửa sổ soạn thảo.',
+'rows'                      => 'Số hàng:',
+'columns'                   => 'Số cột:',
+'searchresultshead'         => 'Tìm kiếm',
+'resultsperpage'            => 'Số kết quả mỗi trang:',
+'contextlines'              => 'Số hàng trong trang dùng để tìm ra kết quả:',
+'contextchars'              => 'Số chữ trong một hàng kết quả:',
+'stub-threshold'            => '�ịnh dạng <a href="#" class="stub">liên kết đến sơ khai</a> cho các trang ngắn hơn (byte):',
+'recentchangesdays'         => 'Số ngày hiển thị trong thay đổi gần đây:',
+'recentchangesdays-max'     => '(tối đa $1 {{PLURAL:$1|ngày|ngày}})',
+'recentchangescount'        => 'Số sửa đổi hiển thị trong trang thay đổi gần đây, lịch sử của trang, và các nhật trình, theo mặc định:',
+'savedprefs'                => '�ã lưu các tùy ch�n cá nhân.',
+'timezonelegend'            => 'Múi gi�',
+'timezonetext'              => '¹Số gi� chênh lệch giữa gi� địa phương của bạn với gi� máy chủ (UTC)',
+'localtime'                 => 'Gi� địa phương:',
+'timezoneselect'            => 'Múi gi�:',
+'timezoneuseserverdefault'  => 'Sử dụng gi� mặc định của máy chủ',
+'timezoneuseoffset'         => 'Khác (cần ghi mục chênh gi�)',
+'timezoneoffset'            => 'Chênh gi�¹:',
+'servertime'                => 'Gi� máy chủ:',
+'guesstimezone'             => 'Dùng gi� của trình duyệt',
+'allowemail'                => 'Nhận thư điện tử từ các thành viên khác',
+'prefs-searchoptions'       => 'Lựa ch�n tìm kiếm',
+'prefs-namespaces'          => 'Không gian tên',
+'defaultns'                 => 'Mặc định tìm kiếm trong không gian tên:',
+'default'                   => 'mặc định',
+'files'                     => 'Tập tin',
 
 # User rights
 'userrights'                  => 'Quản lý quy�n thành viên', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Quản lý nhóm thành viên',
 'userrights-user-editname'    => 'Nhập tên thành viên:',
 'editusergroup'               => 'Sửa nhóm thành viên',
-'editinguser'                 => "Thay đổi quy�n hạn của thành viên '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Thay đổi quy�n hạn của thành viên '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Sửa nhóm thành viên',
 'saveusergroups'              => 'Lưu nhóm thành viên',
 'userrights-groupsmember'     => 'Thuộc nhóm:',
@@ -1038,6 +1204,8 @@ Xin hãy bảo đảm giữ vững tính liên tục của lịch sử trang.',
 'right-minoredit'            => '�ánh dấu sửa đổi nh�',
 'right-move'                 => 'Di chuyển trang',
 'right-move-subpages'        => 'Di chuyển trang cùng với các trang con của nó',
+'right-move-rootuserpages'   => 'Di chuyển các trang cá nhân chính',
+'right-movefile'             => 'Di chuyển tập tin',
 'right-suppressredirect'     => 'Không tạo đổi hướng từ tên cũ khi di chuyển trang',
 'right-upload'               => 'Tải tập tin lên',
 'right-reupload'             => 'Tải đè tập tin cũ',
@@ -1088,9 +1256,46 @@ Xin hãy bảo đảm giữ vững tính liên tục của lịch sử trang.',
 'rightslogentry' => 'đã đổi cấp của thành viên $1 từ $2 thành $3',
 'rightsnone'     => '(không có)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'đ�c trang này',
+'action-edit'                 => 'sửa đổi trang này',
+'action-createpage'           => 'tạo trang',
+'action-createtalk'           => 'tạo trang thảo luận',
+'action-createaccount'        => 'mở tài khoản này',
+'action-minoredit'            => 'đánh dấu đây là sửa đổi nh�',
+'action-move'                 => 'di chuyển trang này',
+'action-move-subpages'        => 'di chuyển trang này và các trang con',
+'action-move-rootuserpages'   => 'di chuyển trang cá nhân chính',
+'action-movefile'             => 'di chuyển tập tin này',
+'action-upload'               => 'tải tập tin này lên',
+'action-reupload'             => 'ghi đè lên tập tin có sẵn này',
+'action-reupload-shared'      => 'ghi đè lên tập tin đang thuộc kho tập tin chung này',
+'action-upload_by_url'        => 'tải lên tập tin này từ địa chỉ URL',
+'action-writeapi'             => 'dùng API để sửa đổi',
+'action-delete'               => 'xóa trang này',
+'action-deleterevision'       => 'xóa phiên bản này',
+'action-deletedhistory'       => 'xem các phiên bản đã bị xóa của trang này',
+'action-browsearchive'        => 'tìm trong các trang đã bị xóa',
+'action-undelete'             => 'phục hồi trang này',
+'action-suppressrevision'     => 'duyệt và phục hồi phiên bản bị giấu này',
+'action-suppressionlog'       => 'xem nhật trình ẩn giấu này',
+'action-block'                => 'cấm không cho ngư�i dùng này sửa đổi',
+'action-protect'              => 'thay đổi mức khóa của trang này',
+'action-import'               => 'nhập trang này từ wiki khác',
+'action-importupload'         => 'nhập trang này bằng cách tải lên tập tin',
+'action-patrol'               => 'đánh dấu đã tuần tra vào sửa đổi của ngư�i khác',
+'action-autopatrol'           => 'tự động đánh dấu đã tuần tra vào sửa đổi của bạn',
+'action-unwatchedpages'       => 'xem danh sách các trang chưa được theo dõi',
+'action-trackback'            => 'gá»­i TrackBack',
+'action-mergehistory'         => 'hợp nhất lịch sử của trang này',
+'action-userrights'           => 'sửa đổi m�i quy�n ngư�i dùng',
+'action-userrights-interwiki' => 'sửa đổi quy�n của ngư�i dùng tại wiki khác',
+'action-siteadmin'            => 'khóa hoặc mở khóa cơ sở dữ liệu',
+
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|thay đổi|thay đổi}}',
 'recentchanges'                     => 'Thay đổi gần đây',
+'recentchanges-legend'              => 'Tùy ch�n thay đổi gần đây',
 'recentchangestext'                 => 'Xem các thay đổi gần đây nhất tại wiki trên trang này.',
 'recentchanges-feed-description'    => 'Theo dõi các thay đổi gần đây nhất của wiki dùng feed này.',
 'rcnote'                            => "Dưới đây là {{PLURAL:$1|'''1''' thay đổi|'''$1''' thay đổi gần nhất}} trong {{PLURAL:$2|ngày qua|'''$2''' ngày qua}}, tính tới $5, $4.",
@@ -1114,6 +1319,8 @@ Xin hãy bảo đảm giữ vững tính liên tục của lịch sử trang.',
 'rc_categories'                     => 'Hạn chế theo thể loại (phân cách bằng “|�)',
 'rc_categories_any'                 => 'Bất kỳ',
 'newsectionsummary'                 => '�� mục mới: /* $1 */',
+'rc-enhanced-expand'                => 'Xem chi tiết (cần JavaScript)',
+'rc-enhanced-hide'                  => 'Giấu chi tiết',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Thay đổi liên quan',
@@ -1135,12 +1342,12 @@ Các trang trong [[Special:Watchlist|danh sách bạn theo dõi]] được '''tÃ
 'upload_directory_read_only'  => 'Máy chủ không thể sửa đổi thư mục tải lên ($1) được.',
 'uploaderror'                 => 'Lỗi khi tải lên',
 'uploadtext'                  => "Hãy sử dụng mẫu sau để tải tập tin lên.
-�ể xem hoặc tìm kiếm những hình ảnh đã được tải lên trước đây, xin m�i xem [[Special:ImageList|danh sách các tập tin đã tải lên]]. 
+�ể xem hoặc tìm kiếm những hình ảnh đã được tải lên trước đây, xin m�i xem [[Special:FileList|danh sách các tập tin đã tải lên]]. 
 việc tải lên và tải lên lại được ghi lại trong [[Special:Log/upload|nhật trình tải lên]],  việc xóa đi được ghi trong [[Special:Log/delete|nhật trình xóa]].
 
 �ể đưa tập tin vào trang, hãy dùng liên kết có một trong các dạng sau:
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Tập tin.jpg]]</nowiki></tt>''' để phiên bản đầy đủ của tập tin
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:Tập tin.png|200px|nh�|trái|văn bản thay thế]]</nowiki></tt>''' để dùng hình đã được co lại còn 200 pixel chi�u rộng đặt trong một hộp ở l� bên trái với 'văn bản thay thế' dùng để mô tả
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Tập tin.jpg]]</nowiki></tt>''' để phiên bản đầy đủ của tập tin
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Tập tin.png|200px|nh�|trái|văn bản thay thế]]</nowiki></tt>''' để dùng hình đã được co lại còn 200 pixel chi�u rộng đặt trong một hộp ở l� bên trái với 'văn bản thay thế' dùng để mô tả
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Tập tin.ogg]]</nowiki></tt>''' để liên kết trực tiếp đến tập tin mà không hiển thị nó",
 'upload-permitted'            => 'Các định dạng tập tin được phép tải lên: $1.',
 'upload-preferred'            => 'Các định dạng tập tin nên dùng: $1.',
@@ -1148,9 +1355,9 @@ việc tải lên và tải lên lại được ghi lại trong [[Special:Log/up
 'uploadlog'                   => 'nhật trình tải lên',
 'uploadlogpage'               => 'Nhật trình tải lên',
 'uploadlogpagetext'           => 'Dưới đây là danh sách các tập tin đã tải lên gần nhất.
-Xem [[Special:NewImages|trang trưng bày các tập tin mới]] để xem trực quan hơn.',
-'filename'                    => 'Tên tập tin:',
-'filedesc'                    => 'Miêu tả:',
+Xem [[Special:NewFiles|trang trưng bày các tập tin mới]] để xem trực quan hơn.',
+'filename'                    => 'Tên tập tin',
+'filedesc'                    => 'Miêu tả',
 'fileuploadsummary'           => 'Tóm lược:',
 'filestatus'                  => 'Bản quy�n:',
 'filesource'                  => 'Nguồn:',
@@ -1170,22 +1377,24 @@ Xem [[Special:NewImages|trang trưng bày các tập tin mới]] để xem trự
 'large-file'                  => 'Các tập tin được khuyến cáo không được lớn hơn $1; tập tin này lớn đến $2.',
 'largefileserver'             => 'Tập tin này quá lớn so với khả năng phục vụ của máy chủ.',
 'emptyfile'                   => 'Tập tin bạn vừa mới tải lên có vẻ trống không. �i�u này có thể xảy ra khi bạn đánh sai tên tập tin. Xin hãy chắc chắn rằng bạn thật sự muốn tải lên tập tin này.',
-'fileexists'                  => 'Một tập tin với tên này đã tồn tại, xin hãy kiểm tra lại <strong><tt>$1</tt></strong> nếu bạn không chắc bạn có muốn thay đổi nó hay không.',
-'filepageexists'              => 'Trang miêu tả tập tin này đã tồn tại ở <strong><tt>$1</tt></strong>, nhưng chưa có tập tin với tên này. Những gì bạn ghi trong ô "Tóm tắt tập tin" sẽ không hiện ra ở trang miêu tả; để làm nó hiển thị, bạn sẽ cần phải sửa đổi trang đó bằng tay.',
-'fileexists-extension'        => 'Hiện có một tập tin trùng tên:<br />
-Tên tập tin đang tải lên: <strong><tt>$1</tt></strong><br />
-Tên tập tin có từ trước: <strong><tt>$2</tt></strong><br />
-Xin hãy ch�n một tên tập tin khác.',
+'fileexists'                  => "Một tập tin với tên này đã tồn tại, xin hãy kiểm tra lại '''<tt>$1</tt>''' nếu bạn không chắc bạn có muốn thay đổi nó hay không.",
+'filepageexists'              => "Trang miêu tả tập tin này đã tồn tại ở '''<tt>\$1</tt>''', nhưng chưa có tập tin với tên này. Những gì bạn ghi trong ô \"Tóm tắt tập tin\" sẽ không hiện ra ở trang miêu tả; để làm nó hiển thị, bạn sẽ cần phải sửa đổi trang đó bằng tay.",
+'fileexists-extension'        => "Hiện có một tập tin trùng tên:<br />
+Tên tập tin đang tải lên: '''<tt>$1</tt>'''<br />
+Tên tập tin có từ trước: '''<tt>$2</tt>'''<br />
+Xin hãy ch�n một tên tập tin khác.",
 'fileexists-thumb'            => "<center>'''Tập tin đã tồn tại'''</center>",
-'fileexists-thumbnail-yes'    => 'Tập tin này có vẻ là hình có kích thước thu g�n <i>(hình thu nh�)</i>. Xin kiểm tra lại tập tin <strong><tt>$1</tt></strong>.<br />
-Nếu tập tin được kiểm tra trùng với hình có kích cỡ gốc thì không cần thiết tải lên một hình thu nh� khác.',
-'file-thumbnail-no'           => 'Tên tập tin bắt đầu bằng <strong><tt>$1</tt></strong>.
-Có vẻ đây là bản thu nh� của hình gốc <i>(thumbnail)</i>.
-Nếu bạn có hình ở độ phân giải tối đa, xin hãy tải bản đó lên, nếu không xin hãy đổi lại tên tập tin.',
-'fileexists-forbidden'        => '�ã có tập tin với tên g�i này; xin quay lại để tải tập tin này lên dưới tên khác. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Tập tin này có vẻ là hình có kích thước thu g�n ''(hình thu nh�)''. Xin kiểm tra lại tập tin '''<tt>$1</tt>'''.<br />
+Nếu tập tin được kiểm tra trùng với hình có kích cỡ gốc thì không cần thiết tải lên một hình thu nh� khác.",
+'file-thumbnail-no'           => "Tên tập tin bắt đầu bằng '''<tt>$1</tt>'''.
+Có vẻ đây là bản thu nh� của hình gốc ''(thumbnail)''.
+Nếu bạn có hình ở độ phân giải tối đa, xin hãy tải bản đó lên, nếu không xin hãy đổi lại tên tập tin.",
+'fileexists-forbidden'        => '�ã có tập tin với tên g�i này, và nó không thể bị ghi đè.
+Nếu bạn vẫn muốn tải tập tin của bạn lên, xin hãy quay lại và sử dụng một tên khác. [[File:$1|thumb|center|$1]]',
 'fileexists-shared-forbidden' => 'Một tập tin với tên này đã tồn tại ở kho tập tin dùng chung.
-Nếu bạn vẫn muốn tải tập tin của bạn lên, xin hãy quay lại và dùng một tên khác. [[Image:$1|thumb|center|$1]]',
+Nếu bạn vẫn muốn tải tập tin của bạn lên, xin hãy quay lại và dùng một tên khác. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Tập tin này có vẻ là bản sao của {{PLURAL:$1|tập tin|các  tập tin}} sau:',
+'file-deleted-duplicate'      => 'Một tập tin giống hệt như tập tin này ([[$1]]) đã từng bị xóa trước đây. Bạn nên xem lại lịch sử xóa tập tin trước khi tiếp tục tải nó lên lại.',
 'successfulupload'            => '�ã tải xong',
 'uploadwarning'               => 'Cảnh báo!',
 'savefile'                    => 'Lưu tập tin',
@@ -1204,7 +1413,7 @@ Nếu bạn vẫn muốn tải tập tin của bạn lên, xin hãy quay lại v
 'upload-wasdeleted'           => "'''Cảnh báo: Bạn đang tải lên một tập tin từng bị xóa trước đây.'''
 
 Bạn nên cân nhắc trong việc tiếp tục tải lên tập tin này. Nhật trình xóa của tập tin được đưa ra dưới đây để tiện theo dõi:",
-'filename-bad-prefix'         => 'Tên cho tập tin mà bạn đang tải lên bắt đầu bằng <strong>“$1�</strong>, đây không phải là dạng tên tiêu biểu có tính chất miêu tả do các máy chụp ảnh số tự động đặt. Xin hãy ch�n một tên có tính chất miêu tả và gợi nhớ hơn cho tập tin của bạn.',
+'filename-bad-prefix'         => "Tên cho tập tin mà bạn đang tải lên bắt đầu bằng '''“$1�''', đây không phải là dạng tên tiêu biểu có tính chất miêu tả do các máy chụp ảnh số tự động đặt. Xin hãy ch�n một tên có tính chất miêu tả và gợi nhớ hơn cho tập tin của bạn.",
 'filename-prefix-blacklist'   => ' #<!-- xin để nguyên hàng này --> <pre>
 # Cú pháp như sau:
 #   * Các ký tự từ dấu "#" trở đến cuối hàng là chú thích
@@ -1242,20 +1451,21 @@ Nếu vẫn còn bị lỗi, xin hãy liên hệ với một [[Special:ListUsers
 'upload_source_url'  => ' (địa chỉ URL đúng, có thể truy cập)',
 'upload_source_file' => ' (tập tin trên máy của bạn)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Trang đặc biệt này liệt kê các tập tin được tải lên.
+# Special:ListFiles
+'listfiles-summary'     => 'Trang đặc biệt này liệt kê các tập tin được tải lên.
 Theo mặc định, các tập tin mới nhất được xếp vào đầu danh sách.
 Hãy nhấn chuột vào tiêu đ� cột để thay đổi thứ tự sắp xếp.',
-'imagelist_search_for'  => 'Tìm kiếm theo tên tập tin:',
+'listfiles_search_for'  => 'Tìm kiếm theo tên tập tin:',
 'imgfile'               => 'tập tin',
-'imagelist'             => 'Danh sách tập tin',
-'imagelist_date'        => 'Ngày tải',
-'imagelist_name'        => 'Tên',
-'imagelist_user'        => 'Thành viên tải',
-'imagelist_size'        => 'Kích cỡ',
-'imagelist_description' => 'Miêu tả',
-
-# Image description page
+'listfiles'             => 'Danh sách tập tin',
+'listfiles_date'        => 'Ngày tải',
+'listfiles_name'        => 'Tên',
+'listfiles_user'        => 'Thành viên tải',
+'listfiles_size'        => 'Kích cỡ',
+'listfiles_description' => 'Miêu tả',
+'listfiles_count'       => 'Số phiên bản',
+
+# File description page
 'filehist'                       => 'Lịch sử tập tin',
 'filehist-help'                  => 'Nhấn vào một ngày/gi� để xem nội dung tập tin tại th�i điểm đó.',
 'filehist-deleteall'             => 'xóa toàn bộ',
@@ -1263,19 +1473,25 @@ Hãy nhấn chuá»™t vào tiêu Ä‘á»� cá»™t để thay đổi thứ tá»± sắp xá
 'filehist-revert'                => 'lùi lại',
 'filehist-current'               => 'hiện',
 'filehist-datetime'              => 'Ngày/Gi�',
+'filehist-thumb'                 => 'Thu nh�',
+'filehist-thumbtext'             => 'Hình thu nh� của phiên bản vào lúc $1',
+'filehist-nothumb'               => 'Không có hình thu nh�',
 'filehist-user'                  => 'Thành viên',
 'filehist-dimensions'            => 'Kích cỡ',
 'filehist-filesize'              => 'Kích thước tập tin',
 'filehist-comment'               => 'Miêu tả',
-'imagelinks'                     => 'Liên kết',
+'imagelinks'                     => 'Liên kết đến tập tin',
 'linkstoimage'                   => '{{PLURAL:$1|Trang|$1 trang}} sau có liên kết đến tập tin này:',
+'linkstoimage-more'              => 'Có hơn $1 {{PLURAL:$1|trang|trang}} liên kết đến tập tin này.
+Danh sách dưới đây chỉ hiển thị {{PLURAL:$1|liên kết đầu tiên|$1 liên kết đầu tiên}} đến tập tin này.
+Có [[Special:WhatLinksHere/$2|danh sách đầy đủ ở đây]].',
 'nolinkstoimage'                 => 'Không có trang nào chứa liên kết đến hình.',
 'morelinkstoimage'               => 'Xem [[Special:WhatLinksHere/$1|thêm liên kết]] đến tập tin này.',
 'redirectstofile'                => '{{PLURAL:$1|Tập tin|$1 tập tin}} sau chuyển hướng đến tập tin này:',
-'duplicatesoffile'               => '{{PLURAL:$1|Tập tin sau|$1 tập tin sau}} là bản sao của tập tin này:',
+'duplicatesoffile'               => '{{PLURAL:$1|Tập tin sau|$1 tập tin sau}} là bản sao của tập tin này ([[Special:FileDuplicateSearch/$2|chi tiết]]):',
 'sharedupload'                   => 'Tập tin này được tải lên để dùng chung và có thể dùng ở các dự án khác.',
 'shareduploadwiki'               => 'Xin xem $1 để biết thêm thông tin.',
-'shareduploadwiki-desc'          => 'Dưới đây là nội dung từ $1 tại kho lưu trữ chung.',
+'shareduploadwiki-desc'          => 'Dưới đây là nội dung từ trang $1 tại kho lưu trữ chung.',
 'shareduploadwiki-linktext'      => 'trang miêu tả tập tin',
 'shareduploadduplicate'          => 'Tập tin này là bản sao của $1 từ kho tập tin dùng chung.',
 'shareduploadduplicate-linktext' => 'tập tin khác',
@@ -1299,7 +1515,7 @@ Hãy nhấn chuá»™t vào tiêu Ä‘á»� cá»™t để thay đổi thứ tá»± sắp xá
 # File deletion
 'filedelete'                  => 'Xóa $1',
 'filedelete-legend'           => 'Xóa tập tin',
-'filedelete-intro'            => "Bạn đang xóa '''[[Media:$1|$1]]'''.",
+'filedelete-intro'            => "Bạn sắp xóa tập tin '''[[Media:$1|$1]]''' cùng với tất cả lịch sử của nó.",
 'filedelete-intro-old'        => "Bạn đang xóa phiên bản của '''[[Media:$1|$1]]''' vào lúc [$4 $3, $2].",
 'filedelete-comment'          => 'Lý do:',
 'filedelete-submit'           => 'Xóa',
@@ -1307,7 +1523,6 @@ Hãy nhấn chuá»™t vào tiêu Ä‘á»� cá»™t để thay đổi thứ tá»± sắp xá
 'filedelete-success-old'      => "Phiên bản của '''[[Media:$1|$1]]''' vào lúc $3, $2 đã bị xóa.",
 'filedelete-nofile'           => "'''$1''' không tồn tại.",
 'filedelete-nofile-old'       => "Không có phiên bản lưu trữ của '''$1''' với các thuộc tính này.",
-'filedelete-iscurrent'        => 'Bạn đang cố xóa phiên bản mới nhất của tập tin này. Xin hãy lui tập tin v� một phiên bản cũ hơn đã.',
 'filedelete-otherreason'      => 'Lý do bổ sung:',
 'filedelete-reason-otherlist' => 'Lý do khác',
 'filedelete-reason-dropdown'  => '*Những lý do xóa thư�ng gặp
@@ -1336,27 +1551,31 @@ Hãy nhớ kiểm tra các liên kết khác đến tiêu bản trước khi xó
 
 # Random page
 'randompage'         => 'Trang ngẫu nhiên',
-'randompage-nopages' => 'Hiện chưa có trang nào trong không gian tên này.',
+'randompage-nopages' => 'Hiện chưa có trang nào trong không gian tên “$1�.',
 
 # Random redirect
 'randomredirect'         => 'Trang đổi hướng ngẫu nhiên',
-'randomredirect-nopages' => 'Không có trang đổi hướng nào trong không gian này.',
+'randomredirect-nopages' => 'Không có trang đổi hướng nào trong không gian tên “$1�.',
 
 # Statistics
-'statistics'             => 'Thống kê',
-'sitestats'              => 'Thống kê {{SITENAME}}',
-'userstats'              => 'Thống kê thành viên',
-'sitestatstext'          => "Hiện có {{PLURAL:$1|'''1''' trang|tổng cộng '''$1''' trang}} trong cơ sở dữ liệu.
-Trong số đó có các trang “thảo luận�, trang liên quan đến {{SITENAME}}, các trang “sơ khai� ngắn, và những trang khác không tính là trang có nội dung.
-Nếu không tính đến các trang đó, có {{PLURAL:$2|'''1'''|'''$2'''}} trang là những trang có nội dung tốt.
-
-Có '''$8''' tập tin đã được tải lên.
-
-�ã có tổng cộng '''$3''' lần truy cập, và '''$4''' sửa đổi từ khi {{SITENAME}} được khởi tạo. Như vậy trung bình có '''$5''' sửa đổi tại mỗi trang, và '''$6''' lần truy cập trên mỗi sửa đổi.
-
-�ộ dài của [http://www.mediawiki.org/wiki/Manual:Job_queue hàng đợi việc] là '''$7'''.",
-'userstatstext'          => "Có '''$1''' [[Special:ListUsers|thành viên]] đã đăng ký tài khoản, trong số đó có '''$2''' thành viên (chiếm '''$4%''' trên tổng số) {{PLURAL:$2||}} là $5.",
-'statistics-mostpopular' => 'Các trang được xem nhi�u nhất',
+'statistics'                   => 'Thống kê',
+'statistics-header-pages'      => 'Thống kê trang',
+'statistics-header-edits'      => 'Thống kê sửa đổi',
+'statistics-header-views'      => 'Thống kê truy cập',
+'statistics-header-users'      => 'Thống kê thành viên',
+'statistics-articles'          => 'Số trang nội dung',
+'statistics-pages'             => 'Số trang',
+'statistics-pages-desc'        => 'Tất cả các trang tại wiki, bao gồm trang thảo luận, trang đổi hướng, v.v.',
+'statistics-files'             => 'Số tập tin đã tải lên',
+'statistics-edits'             => 'Số sửa đổi trang từ khi {{SITENAME}} được thành lập',
+'statistics-edits-average'     => 'Số sửa đổi trung bình trên một trang',
+'statistics-views-total'       => 'Số lần xem tổng cộng',
+'statistics-views-peredit'     => 'Số lần xem trên một sửa đổi',
+'statistics-jobqueue'          => 'Chi�u dài [http://www.mediawiki.org/wiki/Manual:Job_queue hàng đợi việc]',
+'statistics-users'             => 'Số [[Special:ListUsers|thành viên]] đã đăng ký',
+'statistics-users-active'      => 'Số thành viên tích cực',
+'statistics-users-active-desc' => 'Những thành viên đã hoạt động trong {{PLURAL:$1|ngày|$1 ngày}} qua',
+'statistics-mostpopular'       => 'Các trang được xem nhi�u nhất',
 
 'disambiguations'      => 'Trang định hướng',
 'disambiguationspage'  => 'Template:disambig',
@@ -1368,7 +1587,7 @@ Có '''$8''' tập tin đã được tải lên.
 'double-redirect-fixer'      => 'Ngư�i sửa trang đổi hướng',
 
 'brokenredirects'        => '�ổi hướng sai',
-'brokenredirectstext'    => 'Các trang đổi hướng sau đây liên kết đến một trang không tồn tại.',
+'brokenredirectstext'    => 'Các trang đổi hướng sau đây liên kết đến trang không tồn tại:',
 'brokenredirects-edit'   => '(sá»­a)',
 'brokenredirects-delete' => '(xóa)',
 
@@ -1398,26 +1617,30 @@ Có '''$8''' tập tin đã được tải lên.
 'popularpages'            => 'Trang nhi�u ngư�i đ�c',
 'wantedcategories'        => 'Thể loại cần thiết',
 'wantedpages'             => 'Trang cần viết',
-'missingfiles'            => 'Tập tin bị thiếu',
+'wantedfiles'             => 'Tập tin cần thiết',
+'wantedtemplates'         => 'Tiêu bản cần viết nhất',
 'mostlinked'              => 'Trang được liên kết đến nhi�u nhất',
 'mostlinkedcategories'    => 'Thể loại có nhi�u trang nhất',
 'mostlinkedtemplates'     => 'Tiêu bản được liên kết đến nhi�u nhất',
 'mostcategories'          => 'Các trang có nhi�u thể loại nhất',
 'mostimages'              => 'Tập tin được liên kết đến nhi�u nhất',
 'mostrevisions'           => 'Các trang được sửa đổi nhi�u lần nhất',
-'prefixindex'             => 'Các trang trùng với ti�n tố',
+'prefixindex'             => 'Tất cả các trang trùng với ti�n tố',
 'shortpages'              => 'Trang ngắn nhất',
 'longpages'               => 'Trang dài nhất',
 'deadendpages'            => 'Trang đư�ng cùng',
 'deadendpagestext'        => 'Các trang này không có liên kết đến trang khác trong {{SITENAME}}.',
 'protectedpages'          => 'Trang bị khóa',
 'protectedpages-indef'    => 'Chỉ hiển thị khóa vô hạn',
+'protectedpages-cascade'  => 'Chỉ hiển thị khóa theo tầng',
 'protectedpagestext'      => 'Các trang này bị khóa không cho sửa đổi hay di chuyển',
 'protectedpagesempty'     => 'Hiện không có trang nào bị khóa với các thông số này.',
 'protectedtitles'         => 'Các tựa trang được bảo vệ',
 'protectedtitlestext'     => 'Các tựa trang sau đây đã bị khóa không cho tạo mới',
 'protectedtitlesempty'    => 'Không có tựa trang nào bị khóa với các thông số như vậy.',
 'listusers'               => 'Danh sách thành viên',
+'listusers-editsonly'     => 'Chỉ hiện thành viên có tham gia sửa đổi',
+'usereditcount'           => '$1 {{PLURAL:$1|sửa đổi|sửa đổi}}',
 'newpages'                => 'Các trang mới nhất',
 'newpages-username'       => 'Tên ngư�i dùng:',
 'ancientpages'            => 'Các trang cũ nhất',
@@ -1438,14 +1661,13 @@ Có '''$8''' tập tin đã được tải lên.
 'booksources-search-legend' => 'Tìm kiếm nguồn sách',
 'booksources-go'            => 'Tìm kiếm',
 'booksources-text'          => 'Dưới đây là danh sách những trang bán sách mới và cũ, đồng th�i có thể có thêm thông tin v� những cuốn sách bạn đang tìm:',
+'booksources-invalid-isbn'  => 'ISBN mà bạn cung cấp dư�ng như không đúng; xin hãy kiểm tra lại xem có lỗi gì khi sao chép từ nội dung gốc hay không.',
 
 # Special:Log
 'specialloguserlabel'  => 'Thành viên:',
 'speciallogtitlelabel' => 'Tên trang:',
 'log'                  => 'Nhật trình',
 'all-logs-page'        => 'Tất cả các nhật trình',
-'log-search-legend'    => 'Tìm kiếm nhật trình',
-'log-search-submit'    => 'Tìm kiếm',
 'alllogstext'          => 'Hiển thị tất cả các nhật trình đang có của {{SITENAME}} chung với nhau.
 Bạn có thể thu hẹp kết quả bằng cách ch�n loại nhật trình, tên thành viên (phân biệt chữ hoa-chữ thư�ng), hoặc các trang bị ảnh hưởng (cũng phân biệt chữ hoa-chữ thư�ng).',
 'logempty'             => 'Không có mục nào khớp với từ khóa.',
@@ -1457,6 +1679,7 @@ Bạn có thể thu hẹp kết quả bằng cách ch�n loại nhật trình,
 'nextpage'          => 'Trang sau ($1)',
 'prevpage'          => 'Trang trÆ°á»›c ($1)',
 'allpagesfrom'      => 'Xem trang từ:',
+'allpagesto'        => 'Xem đến trang:',
 'allarticles'       => 'M�i trang',
 'allinnamespace'    => 'M�i trang (không gian $1)',
 'allnotinnamespace' => 'M�i trang (không trong không gian $1)',
@@ -1476,41 +1699,68 @@ Xem thêm [[Special:WantedCategories|thể loại cần thiết]].',
 'special-categories-sort-count' => 'xếp theo số trang',
 'special-categories-sort-abc'   => 'xếp theo vần',
 
+# Special:DeletedContributions
+'deletedcontributions' => '�óng góp đã bị xóa của thành viên',
+
+# Special:LinkSearch
+'linksearch'       => 'Liên kết ngoài',
+'linksearch-pat'   => 'Mẫu liên kết:',
+'linksearch-ns'    => 'Không gian tên:',
+'linksearch-ok'    => 'Tìm kiếm',
+'linksearch-text'  => "Có thể sử dụng ký tự đại diện (''wildcard'') ở đầu tiên, ví dụ “*.wikipedia.org�.<br />Hiện hỗ trợ các giao thức: <tt>$1</tt>",
+'linksearch-line'  => '$1 được liên kết từ $2',
+'linksearch-error' => "Chỉ được sử dụng ký tự đại diện (''wildcard'') vào đầu tên mi�n (''hostname'').",
+
 # Special:ListUsers
 'listusersfrom'      => 'Hiển thị thành viên bắt đầu từ:',
 'listusers-submit'   => 'Liệt kê',
 'listusers-noresult' => 'Không thấy thành viên.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Nhật trình mở tài khoản',
+'newuserlogpagetext'          => '�ây là danh sách những tài khoản thành viên mở lên gần đây.',
+'newuserlog-byemail'          => 'gửi mật khẩu qua thư điện tử',
+'newuserlog-create-entry'     => 'Tài khoản mới',
+'newuserlog-create2-entry'    => 'đã tạo tài khoản mới với tên $1',
+'newuserlog-autocreate-entry' => 'Tài khoản được tạo tự động',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Nhóm thành viên',
-'listgrouprights-summary'  => 'Dưới đây là danh sách nhóm thành viên được định nghĩa tại wiki này, với mức độ truy cập của từng nhóm.
+'listgrouprights'                 => 'Nhóm thành viên',
+'listgrouprights-summary'         => 'Dưới đây là danh sách nhóm thành viên được định nghĩa tại wiki này, với mức độ truy cập của từng nhóm.
 Có [[{{MediaWiki:Listgrouprights-helppage}}|thông tin thêm]] v� từng nhóm riêng biệt.',
-'listgrouprights-group'    => 'Nhóm',
-'listgrouprights-rights'   => 'Khả năng',
-'listgrouprights-helppage' => 'Help:Khả năng của nhóm thành viên',
-'listgrouprights-members'  => '(danh sách thành viên)',
+'listgrouprights-group'           => 'Nhóm',
+'listgrouprights-rights'          => 'Khả năng',
+'listgrouprights-helppage'        => 'Help:Khả năng của nhóm thành viên',
+'listgrouprights-members'         => '(danh sách thành viên)',
+'listgrouprights-addgroup'        => 'Có thể thêm {{PLURAL:$2|nhóm|các nhóm}}: $1',
+'listgrouprights-removegroup'     => 'Có thể b� {{PLURAL:$2|nhóm|các nhóm}}: $1',
+'listgrouprights-addgroup-all'    => 'Có thể thêm tất cả các nhóm',
+'listgrouprights-removegroup-all' => 'Có thể b� tất cả các nhóm',
 
 # E-mail user
-'mailnologin'     => 'Không có địa chỉ gửi thư',
-'mailnologintext' => 'Bạn phải [[Special:UserLogin|đăng nhập]] và khai báo một địa chỉ thư điện tử hợp lệ trong phần [[Special:Preferences|tùy ch�n cá nhân]] thì mới gửi được thư cho ngư�i khác.',
-'emailuser'       => 'Gửi thư cho ngư�i này',
-'emailpage'       => 'Gá»­i thÆ°',
-'emailpagetext'   => 'Mẫu dưới đây sẽ gửi một bức thư điện tử tới ngư�i dùng này.
+'mailnologin'      => 'Không có địa chỉ gửi thư',
+'mailnologintext'  => 'Bạn phải [[Special:UserLogin|đăng nhập]] và khai báo một địa chỉ thư điện tử hợp lệ trong phần [[Special:Preferences|tùy ch�n cá nhân]] thì mới gửi được thư cho ngư�i khác.',
+'emailuser'        => 'Gửi thư cho ngư�i này',
+'emailpage'        => 'Gá»­i thÆ°',
+'emailpagetext'    => 'Mẫu dưới đây sẽ gửi một bức thư điện tử tới ngư�i dùng này.
 �ịa chỉ thư điện tử mà bạn đã cung cấp trong [[Special:Preferences|tùy ch�n cá nhân của mình]] sẽ xuất hiện trong phần địa chỉ “Ngư�i gửi� của bức thư, do đó ngư�i nhận sẽ có thể trả l�i trực tiếp cho bạn.',
-'usermailererror' => 'Lá»—i gá»­i thÆ°:',
-'defemailsubject' => 'thư gửi từ {{SITENAME}}',
-'noemailtitle'    => 'Không có địa chỉ nhận thư',
-'noemailtext'     => 'Ngư�i này không cung cấp một địa chỉ thư hợp lệ, hoặc đã ch�n không nhận thư từ ngư�i khác.',
-'emailfrom'       => 'Ngư�i gửi:',
-'emailto'         => 'Ngư�i nhận:',
-'emailsubject'    => 'Chủ đ�:',
-'emailmessage'    => 'Ná»™i dung:',
-'emailsend'       => 'Gá»­i',
-'emailccme'       => 'Gửi cho tôi bản sao của thư này.',
-'emailccsubject'  => 'Bản sao của thư gửi cho $1: $2',
-'emailsent'       => '�ã gửi',
-'emailsenttext'   => 'Thư của bạn đã được gửi.',
-'emailuserfooter' => 'Thư điện tử này được $1 gửi đến $2 thông qua chức năng “Gửi thư cho ngư�i này� của {{SITENAME}}.',
+'usermailererror'  => 'Lá»—i gá»­i thÆ°:',
+'defemailsubject'  => 'thư gửi từ {{SITENAME}}',
+'noemailtitle'     => 'Không có địa chỉ nhận thư',
+'noemailtext'      => 'Ngư�i này không cung cấp một địa chỉ thư hợp lệ.',
+'nowikiemailtitle' => 'Không cho phép thư điện tử',
+'nowikiemailtext'  => 'Thành viên này quyết định không nhận thư từ các thành viên khác.',
+'email-legend'     => 'Gửi thư điện tử đến thành viên {{SITENAME}} khác',
+'emailfrom'        => 'Ngư�i gửi:',
+'emailto'          => 'Ngư�i nhận:',
+'emailsubject'     => 'Chủ đ�:',
+'emailmessage'     => 'Ná»™i dung:',
+'emailsend'        => 'Gá»­i',
+'emailccme'        => 'Gửi cho tôi bản sao của thư này.',
+'emailccsubject'   => 'Bản sao của thư gửi cho $1: $2',
+'emailsent'        => '�ã gửi',
+'emailsenttext'    => 'Thư của bạn đã được gửi.',
+'emailuserfooter'  => 'Thư điện tử này được $1 gửi đến $2 thông qua chức năng “Gửi thư cho ngư�i này� của {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Trang tôi theo dõi',
@@ -1542,12 +1792,7 @@ Nếu bạn muốn cho trang này ra kh�i danh sách theo dõi, nhấn vào "N
 'iteminvalidname'      => 'Tên trang “$1� không hợp lệ…',
 'wlnote'               => "Dưới đây là {{PLURAL:$1|sửa đổi cuối cùng|'''$1''' sửa đổi mới nhất}} trong '''$2''' gi� qua.",
 'wlshowlast'           => 'Hiển thị $1 gi� $2 ngày gần đây $3',
-'watchlist-show-bots'  => 'Hiện sửa đổi bot',
-'watchlist-hide-bots'  => 'Ẩn sửa đổi bot',
-'watchlist-show-own'   => 'Hiện sửa đổi của tôi',
-'watchlist-hide-own'   => 'Ẩn sửa đổi của tôi',
-'watchlist-show-minor' => 'Hiện sửa đổi nh�',
-'watchlist-hide-minor' => 'Ẩn sửa đổi nh�',
+'watchlist-options'    => 'Tùy ch�n v� danh sách theo dõi',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '�ang theo dõi…',
@@ -1587,83 +1832,102 @@ Sẽ không có thông báo nào khác nếu có sự thay đổi tiếp theo tr
 Phản hồi và cần sự hỗ trợ:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Xóa trang',
-'confirm'                     => 'Xác nhận',
-'excontent'                   => 'nội dung cũ: “$1�',
-'excontentauthor'             => 'nội dung cũ: “$1� (ngư�i viết duy nhất “[[Special:Contributions/$2|$2]]�)',
-'exbeforeblank'               => 'nội dung trước khi tẩy trống: “$1�',
-'exblank'                     => 'trang trắng',
-'delete-confirm'              => '
+# Delete
+'deletepage'             => 'Xóa trang',
+'confirm'                => 'Xác nhận',
+'excontent'              => 'nội dung cũ: “$1�',
+'excontentauthor'        => 'nội dung cũ: “$1� (ngư�i viết duy nhất “[[Special:Contributions/$2|$2]]�)',
+'exbeforeblank'          => 'nội dung trước khi tẩy trống: “$1�',
+'exblank'                => 'trang trắng',
+'delete-confirm'         => '
 
 Xóa “$1�',
-'delete-legend'               => 'Xóa',
-'historywarning'              => 'Cảnh báo: Trang bạn sắp xóa đã có lịch sử:',
-'confirmdeletetext'           => 'Bạn sắp xóa hẳn một trang cùng với tất cả lịch sử của nó.
+'delete-legend'          => 'Xóa',
+'historywarning'         => 'Cảnh báo: Trang bạn sắp xóa đã có lịch sử:',
+'confirmdeletetext'      => 'Bạn sắp xóa hẳn một trang cùng với tất cả lịch sử của nó.
 Xin xác nhận việc bạn định làm, và hiểu rõ những hệ lụy của nó, và bạn thực hiện nó theo đúng đúng [[{{MediaWiki:Policy-url}}|quy định]].',
-'actioncomplete'              => '�ã thực hiện xong',
-'deletedtext'                 => '�ã xóa “<nowiki>$1</nowiki>�. Xem danh sách các xóa b� gần nhất tại $2.',
-'deletedarticle'              => 'đã xóa “$1�',
-'suppressedarticle'           => 'đã giấu "[[$1]]"',
-'dellogpage'                  => 'Nhật trình xóa',
-'dellogpagetext'              => 'Dưới đây là danh sách các trang bị xóa gần đây nhất.',
-'deletionlog'                 => 'nhật trình xóa',
-'reverted'                    => '�ã hồi phục một phiên bản cũ',
-'deletecomment'               => 'Lý do',
-'deleteotherreason'           => 'Lý do khác/bổ sung:',
-'deletereasonotherlist'       => 'Lý do khác',
-'deletereason-dropdown'       => '*Các lý do xóa phổ biến
+'actioncomplete'         => '�ã thực hiện xong',
+'deletedtext'            => '�ã xóa “<nowiki>$1</nowiki>�. Xem danh sách các xóa b� gần nhất tại $2.',
+'deletedarticle'         => 'đã xóa “$1�',
+'suppressedarticle'      => 'đã giấu "[[$1]]"',
+'dellogpage'             => 'Nhật trình xóa',
+'dellogpagetext'         => 'Dưới đây là danh sách các trang bị xóa gần đây nhất.',
+'deletionlog'            => 'nhật trình xóa',
+'reverted'               => '�ã hồi phục một phiên bản cũ',
+'deletecomment'          => 'Lý do',
+'deleteotherreason'      => 'Lý do khác/bổ sung:',
+'deletereasonotherlist'  => 'Lý do khác',
+'deletereason-dropdown'  => '*Các lý do xóa phổ biến
 ** Tác giả yêu cầu
 ** Vi phạm bản quy�n
 ** Phá hoại',
-'delete-edit-reasonlist'      => 'Sửa lý do xóa',
-'delete-toobig'               => 'Trang này có lịch sử sửa đổi lớn, đến hơn {{PLURAL:$1|lần|lần}} sửa đổi.
+'delete-edit-reasonlist' => 'Sửa lý do xóa',
+'delete-toobig'          => 'Trang này có lịch sử sửa đổi lớn, đến hơn {{PLURAL:$1|lần|lần}} sửa đổi.
 Việc xóa các trang như vậy bị hạn chế để ngăn ngừa phá hoại do vô ý cho {{SITENAME}}.',
-'delete-warning-toobig'       => 'Trang này có lịch sử sửa đổi lớn, đến hơn {{PLURAL:$1|lần|lần}} sửa đổi.
+'delete-warning-toobig'  => 'Trang này có lịch sử sửa đổi lớn, đến hơn {{PLURAL:$1|lần|lần}} sửa đổi.
 Việc xóa các trang có thể làm tổn hại đến hoạt động của cơ sở dữ liệu {{SITENAME}};
 hãy cẩn tr�ng khi thực hiện.',
-'rollback'                    => 'Lùi tất cả sửa đổi',
-'rollback_short'              => 'Lùi tất cả',
-'rollbacklink'                => 'lùi tất cả',
-'rollbackfailed'              => 'Lùi sửa đổi không thành công',
-'cantrollback'                => 'Không lùi sửa đổi được;
+
+# Rollback
+'rollback'         => 'Lùi tất cả sửa đổi',
+'rollback_short'   => 'Lùi tất cả',
+'rollbacklink'     => 'lùi tất cả',
+'rollbackfailed'   => 'Lùi sửa đổi không thành công',
+'cantrollback'     => 'Không lùi sửa đổi được;
 ngư�i viết trang cuối cùng cũng là tác giả duy nhất của trang này.',
-'alreadyrolled'               => 'Không thể lùi tất cả sửa đổi cuối của [[User:$2|$2]] ([[User talk:$2|thảo luận]] | [[Special:Contributions/$2|{{int:contribslink}}]]) tại [[:$1]]; ai đó đã thực hiện sửa đổi hoặc thực hiện lùi tất cả rồi.
+'alreadyrolled'    => 'Không thể lùi tất cả sửa đổi cuối của [[User:$2|$2]] ([[User talk:$2|thảo luận]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) tại [[:$1]]; ai đó đã thực hiện sửa đổi hoặc thực hiện lùi tất cả rồi.
 
-Sửa đổi cuối cùng tại trang do [[User:$3|$3]] ([[User talk:$3|thảo luận]] | [[Special:Contributions/$3|{{int:contribslink}}]]) thực hiện.',
-'editcomment'                 => 'Tóm lược sửa đổi: “<i>$1</i>�.', # only shown if there is an edit comment
-'revertpage'                  => '�ã hủy sửa đổi của [[Special:Contributions/$2|$2]] ([[User talk:$2|Thảo luận]]) quay v� phiên bản của [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '�ã hủy sửa đổi của $1;
+Sửa đổi cuối cùng tại trang do [[User:$3|$3]] ([[User talk:$3|thảo luận]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) thực hiện.',
+'editcomment'      => "Tóm lược sửa đổi: “''$1''�.", # only shown if there is an edit comment
+'revertpage'       => '�ã hủy sửa đổi của [[Special:Contributions/$2|$2]] ([[User talk:$2|Thảo luận]]) quay v� phiên bản của [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '�ã hủy sửa đổi của $1;
 quay v� phiên bản cuối của $2.',
-'sessionfailure'              => 'Dư�ng như có trục trặc với phiên đăng nhập của bạn; thao tác này đã bị hủy để tránh việc cướp quy�n đăng nhập. Xin hãy nhấn nút “Back�, tải lại trang đó, rồi thử lại.',
+'sessionfailure'   => 'Dư�ng như có trục trặc với phiên đăng nhập của bạn; thao tác này đã bị hủy để tránh việc cướp quy�n đăng nhập. Xin hãy nhấn nút “Back�, tải lại trang đó, rồi thử lại.',
+
+# Protect
 'protectlogpage'              => 'Nhật trình khóa',
 'protectlogtext'              => 'Dưới đây là danh sách các thao tác khóa và mở khóa trang. Xem [[Special:ProtectedPages|danh sách các trang bị khóa]] để xem danh sách các trang hiện th�i đang bị khóa.',
 'protectedarticle'            => 'đã khóa “[[$1]]�',
 'modifiedarticleprotection'   => 'đã đổi mức khóa cho “[[$1]]�',
 'unprotectedarticle'          => 'đã mở khóa cho “[[$1]]�',
+'movedarticleprotection'      => 'đã di chuyển thiết lập khóa trang từ “[[$2]]� đến “[[$1]]�',
 'protect-title'               => 'Thiết lập mức khóa cho “$1�',
+'prot_1movedto2'              => '[[$1]] đổi thành [[$2]]',
 'protect-legend'              => 'Xác nhận khóa',
 'protectcomment'              => 'Lý do:',
 'protectexpiry'               => 'Th�i hạn:',
 'protect_expiry_invalid'      => 'Th�i hạn không hợp lệ.',
 'protect_expiry_old'          => 'Th�i hạn đã qua.',
 'protect-unchain'             => 'Thay đổi mức cấm di chuyển',
-'protect-text'                => 'Bạn có thể xem và đổi kiểu khóa trang <strong><nowiki>$1</nowiki></strong> ở đây.',
-'protect-locked-blocked'      => 'Bạn không thể đổi mức khóa khi bị cấm. �ây là trạng thái
-hiện tại của trang <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Hiện không thể đổi mức khóa do cơ sở dữ liệu bị khóa.
-�ây là trạng thái hiện tại của trang <strong>$1</strong>:',
-'protect-locked-access'       => 'Tài khoản của bạn không được cấp quy�n đổi mức khóa của trang.
-�ây là trạng thái hiện tại của trang <strong>$1</strong>:',
+'protect-text'                => "Bạn có thể xem và đổi kiểu khóa trang '''<nowiki>$1</nowiki>''' ở đây.",
+'protect-locked-blocked'      => "Bạn không thể đổi mức khóa khi bị cấm. �ây là trạng thái
+hiện tại của trang '''$1''':",
+'protect-locked-dblock'       => "Hiện không thể đổi mức khóa do cơ sở dữ liệu bị khóa.
+�ây là trạng thái hiện tại của trang '''$1''':",
+'protect-locked-access'       => "Tài khoản của bạn không được cấp quy�n đổi mức khóa của trang.
+�ây là trạng thái hiện tại của trang '''$1''':",
 'protect-cascadeon'           => 'Trang này hiện bị khóa vì nó được nhúng vào {{PLURAL:$1|những trang|trang}} dưới đây bị khóa với tùy ch�n “khóa theo tầng� được kích hoạt. Bạn có thể đổi mức độ khóa của trang này, nhưng nó sẽ không ảnh hưởng đến việc khóa theo tầng.',
-'protect-default'             => '(mặc định)',
+'protect-default'             => 'Cho phép m�i thành viên',
 'protect-fallback'            => 'Cần quy�n “$1�',
-'protect-level-autoconfirmed' => 'Cấm thành viên chưa đăng ký',
+'protect-level-autoconfirmed' => 'Cấm thành viên mới và thành viên chưa đăng ký',
 'protect-level-sysop'         => 'Cấm m�i thành viên (trừ quản lý)',
 'protect-summary-cascade'     => 'khóa theo tầng',
 'protect-expiring'            => 'hết hạn $1 (UTC)',
+'protect-expiry-indefinite'   => 'vô th�i hạn',
 'protect-cascade'             => 'Tự động khóa các trang được nhúng vào trang này (khóa theo tầng)',
 'protect-cantedit'            => 'Bạn không thể thay đổi mức khóa cho trang này do không có đủ quy�n hạn.',
+'protect-othertime'           => 'Th�i hạn khác:',
+'protect-othertime-op'        => 'th�i hạn khác',
+'protect-existing-expiry'     => 'Th�i hạn hiện th�i: $3, $2',
+'protect-otherreason'         => 'Lý do khác/bổ sung:',
+'protect-otherreason-op'      => 'lý do khác/bổ sung',
+'protect-dropdown'            => '*Các lý do thư�ng dùng khi khóa
+** Bị phá hoại quá mức
+** Bị spam quá mức
+** Bút chiến thiếu tính xây dựng
+** Trang nhi�u ngư�i xem',
+'protect-edit-reasonlist'     => 'Sửa lý do khóa trang',
+'protect-expiry-options'      => '1 gi�:1 hour,1 ngày:1 day,1 tuần:1 week,2 tuần:2 weeks,1 tháng:1 month,3 tháng:3 months,6 tháng:6 months,1 năm:1 year,vô hạn:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Quy�n:',
 'restriction-level'           => 'Mức độ hạn chế:',
 'minimum-size'                => 'Kích thước tối thiểu',
@@ -1686,7 +1950,7 @@ hiện tại của trang <strong>$1</strong>:',
 'undeletepage'                 => 'Xem và phục hồi trang bị xóa',
 'undeletepagetitle'            => "'''Sau đây là những phiên bản đã bị xóa của [[:$1]].'''",
 'viewdeletedpage'              => 'Xem các trang bị xóa',
-'undeletepagetext'             => 'Các trang sau đã bị xóa nhưng vẫn nằm trong kho lưu trữ và có thể phục hồi được. Kho lưu trữ sẽ được khóa định kỳ.',
+'undeletepagetext'             => '{{PLURAL:$1|Trang sau|$1 trang sau}} đã bị xóa nhưng vẫn nằm trong kho lưu trữ và có thể phục hồi được. Kho lưu trữ sẽ được xóa định kỳ.',
 'undelete-fieldset-title'      => 'Phục hồi phiên bản',
 'undeleteextrahelp'            => "�ể phục hồi toàn bộ lịch sử trang, hãy để trống các hộp kiểm và bấm nút '''''Phục hồi'''''.
 �ể thực hiện phục hồi có ch�n l�c, hãy đánh dấu vào hộp kiểm của các phiên bản muốn phục hồi, rồi bấm nút '''''Phục hồi'''''.
@@ -1699,12 +1963,13 @@ Trong trư�ng hợp đó, bạn phải b� đánh dấu hộp kiểm hoặc b
 'undeletehistorynoadmin'       => 'Trang này đã bị xóa.
 Lý do xóa trang được hiển thị dưới đây, cùng với thông tin v� các ngư�i đã sửa đổi trang này trước khi bị xóa.
 Chỉ có ngư�i quản lý mới xem được văn bản đầy đủ của những phiên bản trang bị xóa.',
-'undelete-revision'            => 'Phiên bản của $1 do $3 xóa (vào lúc $2):',
+'undelete-revision'            => 'Phiên bản đã xóa của $1 (vào lúc $4 tại $5) do $3 sửa đổi:',
 'undeleterevision-missing'     => 'Phiên bản này không hợp lệ hay không tồn tại. �ây có thể là một địa chỉ sai, hoặc là phiên bản đã được phục hồi hoặc đã xóa kh�i kho lưu trữ.',
 'undelete-nodiff'              => 'Không tìm thấy phiên bản cũ hơn.',
 'undeletebtn'                  => 'Phục hồi',
 'undeletelink'                 => 'phục hồi',
 'undeletereset'                => 'Tẩy trống',
+'undeleteinvert'               => '�ảo sự lựa ch�n',
 'undeletecomment'              => 'Lý do:',
 'undeletedarticle'             => 'đã phục hồi “$1�',
 'undeletedrevisions'           => '$1 {{PLURAL:$1|bản|bản}} được phục hồi',
@@ -1737,26 +2002,27 @@ $1',
 'blanknamespace' => '(Chính)',
 
 # Contributions
-'contributions' => '�óng góp của thành viên',
-'mycontris'     => '�óng góp của tôi',
-'contribsub2'   => 'Của $1 ($2)',
-'nocontribs'    => 'Không tìm thấy thay đổi nào khớp với yêu cầu.',
-'uctop'         => '(mới nhất)',
-'month'         => 'Từ tháng (trở v� trước):',
-'year'          => 'Từ năm (trở v� trước):',
-
-'sp-contributions-newbies'     => 'Chỉ hiển thị đóng góp của tài khoản mới',
-'sp-contributions-newbies-sub' => 'Các thành viên mới',
-'sp-contributions-blocklog'    => 'Nhật trình cấm',
-'sp-contributions-search'      => 'Tìm kiếm đóng góp',
-'sp-contributions-username'    => '�ịa chỉ IP hay tên thành viên:',
-'sp-contributions-submit'      => 'Tìm kiếm',
+'contributions'       => '�óng góp của thành viên',
+'contributions-title' => '�óng góp của thành viên $1',
+'mycontris'           => '�óng góp của tôi',
+'contribsub2'         => 'Của $1 ($2)',
+'nocontribs'          => 'Không tìm thấy thay đổi nào khớp với yêu cầu.',
+'uctop'               => '(mới nhất)',
+'month'               => 'Từ tháng (trở v� trước):',
+'year'                => 'Từ năm (trở v� trước):',
+
+'sp-contributions-newbies'       => 'Chỉ hiển thị đóng góp của tài khoản mới',
+'sp-contributions-newbies-sub'   => 'Các thành viên mới',
+'sp-contributions-newbies-title' => '�óng góp của các thành viên mới',
+'sp-contributions-blocklog'      => 'Nhật trình cấm',
+'sp-contributions-search'        => 'Tìm kiếm đóng góp',
+'sp-contributions-username'      => '�ịa chỉ IP hay tên thành viên:',
+'sp-contributions-submit'        => 'Tìm kiếm',
 
 # What links here
 'whatlinkshere'            => 'Các liên kết đến đây',
 'whatlinkshere-title'      => 'Các trang liên kết đến “$1�',
 'whatlinkshere-page'       => 'Trang:',
-'linklistsub'              => '(Danh sách liên kết)',
 'linkshere'                => "Các trang sau liên kết đến '''[[:$1]]''':",
 'nolinkshere'              => "Không có trang nào liên kết đến '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Không có trang nào liên kết đến '''[[:$1]]''' trong không gian tên đã ch�n.",
@@ -1806,6 +2072,8 @@ $1',
 'ipbotherreason'                  => 'Lý do khác',
 'ipbhidename'                     => 'Ẩn tên ngư�i dùng kh�i nhật trình cấm, danh sách cấm và danh sách thành viên hiện tại',
 'ipbwatchuser'                    => 'Theo dõi trang thành viên và thảo luận thành viên của thành viên này',
+'ipballowusertalk'                => 'Cho phép ngư�i dùng sửa trang thảo luận của chính h� trong khi bị khóa',
+'ipb-change-block'                => 'Cấm ngư�i dùng này lại theo các thiết lập này',
 'badipaddress'                    => '�ịa chỉ IP không hợp lệ',
 'blockipsuccesssub'               => 'Cấm thành công',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] đã bị cấm.
@@ -1815,6 +2083,7 @@ $1',
 'ipb-unblock'                     => 'B� cấm thành viên hay địa chỉ IP',
 'ipb-blocklist-addr'              => 'Tình trạng cấm hiện tại của $1',
 'ipb-blocklist'                   => 'Xem danh sách đang bị cấm',
+'ipb-blocklist-contribs'          => '�óng góp của $1',
 'unblockip'                       => 'B� cấm thành viên',
 'unblockiptext'                   => 'Sử dụng mẫu sau để phục hồi lại quy�n sửa đổi đối với một địa chỉ IP hoặc tên thành viên đã bị cấm trước đó.',
 'ipusubmit'                       => 'B� cấm',
@@ -1823,6 +2092,9 @@ $1',
 'ipblocklist'                     => '�ịa chỉ IP và tên ngư�i dùng bị cấm',
 'ipblocklist-legend'              => 'Tìm một thành viên bị cấm',
 'ipblocklist-username'            => 'Tên thành viên hoặc địa chỉ IP:',
+'ipblocklist-sh-userblocks'       => '$1 tác vụ cấm vĩnh viễn',
+'ipblocklist-sh-tempblocks'       => '$1 tác vụ cấm có th�i hạn',
+'ipblocklist-sh-addressblocks'    => '$1 tác vụ cấm IP',
 'ipblocklist-submit'              => 'Tìm kiếm',
 'blocklistline'                   => '$1, $2 đã cấm $3 (hết hạn $4)',
 'infiniteblock'                   => 'vô hạn',
@@ -1831,25 +2103,32 @@ $1',
 'noautoblockblock'                => 'đã tắt chức năng tự động cấm',
 'createaccountblock'              => 'không được mở tài khoản',
 'emailblock'                      => 'đã cấm thư điện tử',
+'blocklist-nousertalk'            => 'không được sửa đổi trang thảo luận cá nhân',
 'ipblocklist-empty'               => 'Danh sách cấm hiện đang trống.',
 'ipblocklist-no-results'          => '�ịa chỉ IP hoặc tên thành viên này hiện không bị cấm.',
 'blocklink'                       => 'cấm',
 'unblocklink'                     => 'b� cấm',
+'change-blocklink'                => 'đổi mức cấm',
 'contribslink'                    => 'đóng góp',
 'autoblocker'                     => 'Bạn bị tự động cấm vì địa chỉ IP của bạn vừa rồi đã được “$1� sử dụng. Lý do đưa ra cho việc cấm $1 là: �$2�',
 'blocklogpage'                    => 'Nhật trình cấm',
+'blocklog-fulllog'                => 'Nhật trình cấm đầy đủ',
 'blocklogentry'                   => 'đã cấm [[$1]] với th�i hạn là $2 $3',
+'reblock-logentry'                => 'thay đổi thiết lập cấm [[$1]] để hết hạn $2 $3',
 'blocklogtext'                    => '�ây là nhật trình ghi lại những lần cấm và b� cấm. Các địa chỉ IP bị cấm tự động không được liệt kê ở đây. Xem thêm [[Special:IPBlockList|danh sách cấm]] để có danh sách cấm và cấm hẳn hiện tại.',
 'unblocklogentry'                 => 'đã b� cấm “$1�',
 'block-log-flags-anononly'        => 'chỉ cấm thành viên vô danh',
 'block-log-flags-nocreate'        => 'cấm mở tài khoản',
 'block-log-flags-noautoblock'     => 'tắt tự động cấm',
 'block-log-flags-noemail'         => 'cấm thư điện tử',
+'block-log-flags-nousertalk'      => 'không được sửa trang thảo luận của mình',
 'block-log-flags-angry-autoblock' => 'bật tự động cấm nâng cao',
 'range_block_disabled'            => '�ã tắt khả năng cấm hàng loạt của quản lý.',
 'ipb_expiry_invalid'              => 'Th�i điểm hết hạn không hợp lệ.',
 'ipb_expiry_temp'                 => 'Cấm tên ngư�i dùng ẩn nên là cấm vô hạn.',
 'ipb_already_blocked'             => '“$1� đã bị cấm rồi',
+'ipb-needreblock'                 => '== �ã bị cấm ==
+$1 đã bị cấm. Bạn có muốn thay đổi các thiết lập?',
 'ipb_cant_unblock'                => 'Lỗi: Không tìm được ID cấm $1. �ịa chỉ IP này có thể đã được b� cấm.',
 'ipb_blocked_as_range'            => 'Lỗi: �ịa chỉ IP $1 không bị cấm trực tiếp và do đó không thể b� cấm. Tuy nhiên, nó bị cấm do là một bộ phận của dải IP $2, bạn có thể b� cấm dải này.',
 'ip_range_invalid'                => 'Dải IP không hợp lệ.',
@@ -1860,6 +2139,7 @@ $1',
 'proxyblocksuccess'               => 'Xong.',
 'sorbsreason'                     => '�ịa chỉ IP của bạn bị liệt kê là một proxy mở trong DNSBL mà {{SITENAME}} đang sử dụng.',
 'sorbs_create_account_reason'     => '�ịa chỉ chỉ IP của bạn bị liệt kê là một proxy mở trong DNSBL mà {{SITENAME}} đang sử dụng. Bạn không thể mở tài khoản.',
+'cant-block-while-blocked'        => 'Bạn không thể cấm thành viên khác trong khi bạn đang bị cấm.',
 
 # Developer tools
 'lockdb'              => 'Khóa cơ sở dữ liệu',
@@ -1883,9 +2163,9 @@ Xin hãy xác nhận đây là đi�u bạn định làm.',
 'databasenotlocked'   => 'Cơ sở dữ liệu không bị khóa.',
 
 # Move page
-'move-page'               => 'Di chuyển $1',
-'move-page-legend'        => 'Di chuyển trang',
-'movepagetext'            => "Dùng mẫu dưới đây để đổi tên một trang, di chuyển tất cả lịch sử của nó sang tên mới.
+'move-page'                    => 'Di chuyển $1',
+'move-page-legend'             => 'Di chuyển trang',
+'movepagetext'                 => "Dùng mẫu dưới đây để đổi tên một trang, di chuyển tất cả lịch sử của nó sang tên mới.
 Tên cũ sẽ trở thành trang đổi hướng sang tên mới.
 Bạn có thể cập nhật tự động các trang đổi hướng đến tên cũ.
 Nếu bạn ch�n không cập nhật, hãy nhớ kiểm tra [[Special:DoubleRedirects|đổi hướng kép]] hoặc [[Special:BrokenRedirects|đổi hướng đến trang không tồn tại]].
@@ -1897,48 +2177,61 @@ Chú ý rằng trang sẽ '''không''' bị di chuyển nếu đã có một tra
 '''CẢNH B�O!'''
 Việc làm này có thể dẫn đến sự thay đổi mạnh mẽ và không lư�ng trước đối với các trang dễ nhìn thấy;
 xin hãy chắc chắn rằng bạn đã nhận thức được những hệ lụy của nó trước khi thực hiện.",
-'movepagetalktext'        => "Trang thảo luận đi kèm sẽ được tự động di chuyển theo '''trừ khi''':
+'movepagetalktext'             => "Trang thảo luận đi kèm sẽ được tự động di chuyển theo '''trừ khi''':
 *�ã tồn tại một trang thảo luận không trống tại tên mới, hoặc
 *Bạn không đánh vào ô bên dưới.
 
 Trong những trư�ng hợp đó, bạn phải di chuyển hoặc hợp nhất trang theo kiểu thủ công nếu muốn.",
-'movearticle'             => 'Di chuyển trang:',
-'movenotallowed'          => 'Bạn không có quy�n di chuyển trang.',
-'newtitle'                => 'Tên mới',
-'move-watch'              => 'Theo dõi trang này',
-'movepagebtn'             => 'Di chuyển trang',
-'pagemovedsub'            => 'Di chuyển thành công',
-'movepage-moved'          => "<big>'''“$1� đã được di chuyển đến “$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '�ã có một trang với tên đó, hoặc tên bạn ch�n không hợp lệ.
+'movearticle'                  => 'Di chuyển trang:',
+'movenologin'                  => 'Chưa đăng nhập',
+'movenologintext'              => 'Bạn phải là thành viên đã đăng ký và [[Special:UserLogin|đăng nhập]] mới di chuyển trang được.',
+'movenotallowed'               => 'Bạn không có quy�n di chuyển trang.',
+'movenotallowedfile'           => 'Bạn không có đủ quy�n để di chuyển tập tin.',
+'cant-move-user-page'          => 'Bạn không có quy�n di chuyển trang cá nhân (ngoại trừ trang con).',
+'cant-move-to-user-page'       => 'Bạn không có quy�n di chuyển một trang đến trang cá nhân (ngoại trừ đến trang con của trang cá nhân).',
+'newtitle'                     => 'Tên mới',
+'move-watch'                   => 'Theo dõi trang này',
+'movepagebtn'                  => 'Di chuyển trang',
+'pagemovedsub'                 => 'Di chuyển thành công',
+'movepage-moved'               => "<big>'''“$1� đã được di chuyển đến “$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '�ã tạo trang chuyển hướng.',
+'movepage-moved-noredirect'    => 'Chức năng tạo trang chuyển hướng đã bị tắt.',
+'articleexists'                => '�ã có một trang với tên đó, hoặc tên bạn ch�n không hợp lệ.
 Xin hãy ch�n tên khác.',
-'cantmove-titleprotected' => 'Bạn không thể đổi tên trang, vì tên trang mới đã bị khóa không cho tạo mới',
-'talkexists'              => "'''Trang được di chuyển thành công, nhưng trang thảo luận không thể di chuyển được vì đã tồn tại một trang thảo luận ở tên mới. Xin hãy hợp nhất chúng lại một cách thủ công.'''",
-'movedto'                 => 'đổi thành',
-'movetalk'                => 'Di chuyển trang thảo luận đi kèm',
-'move-subpages'           => 'Di chuyển tất cả các trang con, nếu được',
-'move-talk-subpages'      => 'Di chuyển tất cả các trang con của trang thảo luận, nếu được',
-'movepage-page-exists'    => 'Trang $1 đã tồn tại và không thể bị tự động ghi đè.',
-'movepage-page-moved'     => 'Trang $1 đã được di chuyển đến $2.',
-'movepage-page-unmoved'   => 'Trang $1 không thể di chuyển đến $2.',
-'movepage-max-pages'      => '�ã có tối đa $1 {{PLURAL:$1|trang|trang}} đã di chuyển và không tự động di chuyển thêm được nữa.',
-'1movedto2'               => '[[$1]] đổi thành [[$2]]',
-'1movedto2_redir'         => '[[$1]] đổi thành [[$2]] qua đổi hướng',
-'movelogpage'             => 'Nhật trình di chuyển',
-'movelogpagetext'         => 'Dưới đây là danh sách các trang đã được di chuyển.',
-'movereason'              => 'Lý do:',
-'revertmove'              => 'lùi lại',
-'delete_and_move'         => 'Xóa và đổi tên',
-'delete_and_move_text'    => '==Cần xóa==
+'cantmove-titleprotected'      => 'Bạn không thể đổi tên trang, vì tên trang mới đã bị khóa không cho tạo mới',
+'talkexists'                   => "'''Trang được di chuyển thành công, nhưng trang thảo luận không thể di chuyển được vì đã tồn tại một trang thảo luận ở tên mới. Xin hãy hợp nhất chúng lại một cách thủ công.'''",
+'movedto'                      => 'đổi thành',
+'movetalk'                     => 'Di chuyển trang thảo luận đi kèm',
+'move-subpages'                => 'Di chuyển tất cả các trang con, nếu được',
+'move-talk-subpages'           => 'Di chuyển tất cả các trang con của trang thảo luận, nếu được',
+'movepage-page-exists'         => 'Trang $1 đã tồn tại và không thể bị tự động ghi đè.',
+'movepage-page-moved'          => 'Trang $1 đã được di chuyển đến $2.',
+'movepage-page-unmoved'        => 'Trang $1 không thể di chuyển đến $2.',
+'movepage-max-pages'           => '�ã có tối đa $1 {{PLURAL:$1|trang|trang}} đã di chuyển và không tự động di chuyển thêm được nữa.',
+'1movedto2'                    => '[[$1]] đổi thành [[$2]]',
+'1movedto2_redir'              => '[[$1]] đổi thành [[$2]] qua đổi hướng',
+'move-redirect-suppressed'     => 'đã tắt chuyển hướng',
+'movelogpage'                  => 'Nhật trình di chuyển',
+'movelogpagetext'              => 'Dưới đây là danh sách các trang đã được di chuyển.',
+'movereason'                   => 'Lý do:',
+'revertmove'                   => 'lùi lại',
+'delete_and_move'              => 'Xóa và đổi tên',
+'delete_and_move_text'         => '==Cần xóa==
 
 Trang với tên “[[:$1]]� đã tồn tại. Bạn có muốn xóa nó để d�n chỗ di chuyển tới tên này không?',
-'delete_and_move_confirm' => 'Xóa trang để đổi tên',
-'delete_and_move_reason'  => 'Xóa để có chỗ đổi tên',
-'selfmove'                => 'Tên mới giống tên cũ; không đổi tên một trang thành chính nó.',
-'immobile_namespace'      => 'Tên mới hoặc tên cũ là loạiđặc biệt; không thể di chuyển từ/đến không gian tên đó.',
-'imagenocrossnamespace'   => 'Không được di chuyển tập tin ra kh�i không gian tên Tập tin',
-'imagetypemismatch'       => 'Phần mở rộng trong tên tập tin mới không hợp dạng của tập tin',
-'imageinvalidfilename'    => 'Tên tập tin đích không hợp lệ',
-'fix-double-redirects'    => 'Cập nhật tất cả các trang đổi hướng chỉ đến tựa đ� cũ',
+'delete_and_move_confirm'      => 'Xóa trang để đổi tên',
+'delete_and_move_reason'       => 'Xóa để có chỗ đổi tên',
+'selfmove'                     => 'Tên mới giống tên cũ; không đổi tên một trang thành chính nó.',
+'immobile-source-namespace'    => 'Không thể di chuyển các trang trong không gian tên    	 	 	 	“$1�',
+'immobile-target-namespace'    => 'Không thể di chuyển trang vào không gian tên    	 	 	 	“$1�',
+'immobile-target-namespace-iw' => 'Không cho phép di chuyển trang đến một liên kết liên wiki.',
+'immobile-source-page'         => 'Bạn không thể di chuyển trang này.',
+'immobile-target-page'         => 'Không thể di chuyển đến tựa đ� đích.',
+'imagenocrossnamespace'        => 'Không được di chuyển tập tin ra kh�i không gian tên Tập tin',
+'imagetypemismatch'            => 'Phần mở rộng trong tên tập tin mới không hợp dạng của tập tin',
+'imageinvalidfilename'         => 'Tên tập tin đích không hợp lệ',
+'fix-double-redirects'         => 'Cập nhật tất cả các trang đổi hướng chỉ đến tựa đ� cũ',
+'move-leave-redirect'          => '�ể lại trang đổi hướng',
 
 # Export
 'export'            => 'Xuất các trang',
@@ -1947,7 +2240,7 @@ Những tập tin này cũng có thể được nhập vào wiki khác có sử
 
 �ể xuất các trang, nhập vào tên trang trong hộp soạn thảo ở dưới, mỗi dòng một tên, và lựa ch�n bạn muốn phiên bản hiện tại cũng như tất cả phiên bản cũ, với các dòng lịch sử trang, hay chỉ là phiên bản hiện tại với thông tin v� lần sửa đổi cuối.
 
-Trong trư�ng hợp sau bạn cũng có thể dùng một liên kết, ví dụ [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] để biểu thị trang “[[{{MediaWiki:Mainpage}}]]�.',
+Trong trư�ng hợp sau bạn cũng có thể dùng một liên kết, ví dụ [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] để biểu thị trang “[[{{MediaWiki:Mainpage}}]]�.',
 'exportcuronly'     => 'Chỉ xuất phiên bản hiện hành, không xuất tất cả lịch sử trang',
 'exportnohistory'   => "----
 '''Chú ý:''' Chức năng xuất lịch sử trang đầy đủ bằng mẫu này bị tắt do vấn đ� hiệu suất.",
@@ -1963,7 +2256,7 @@ Trong trÆ°á»�ng hợp sau bạn cÅ©ng có thể dùng má»™t liên kết, ví dá»
 'allmessagesdefault'        => 'Nội dung mặc định',
 'allmessagescurrent'        => 'Nội dung hiện th�i',
 'allmessagestext'           => '�ây là toàn bộ thông báo hệ thống có trong không gian tên MediaWiki.
-M�i vào [http://www.mediawiki.org/wiki/Localisation �ịa phương hóa MediaWiki]  và [http://translatewiki.net Betawiki] nếu bạn muốn đóng góp dịch chung cả MediaWiki.',
+M�i vào [http://www.mediawiki.org/wiki/Localisation �ịa phương hóa MediaWiki]  và [http://translatewiki.net translatewiki.net] nếu bạn muốn đóng góp dịch chung cả MediaWiki.',
 'allmessagesnotsupportedDB' => "Trang này không dùng được vì biến '''\$wgUseDatabaseMessages''' đã bị tắt.",
 'allmessagesfilter'         => 'Bộ l�c tên thông báo:',
 'allmessagesmodified'       => 'Chỉ hiển thị các thông báo đã được sửa đổi.',
@@ -1983,9 +2276,12 @@ M�i vào [http://www.mediawiki.org/wiki/Localisation �ịa phương hóa Medi
 'import-interwiki-text'      => 'Ch�n tên trang và wiki để nhập trang vào.
 Ngày của phiên bản và tên ngư�i viết trang sẽ được giữ nguyên.
 Tất cả những lần nhập trang từ wiki khác được ghi lại ở [[Special:Log/import|nhật trình nhập trang]].',
+'import-interwiki-source'    => 'Wiki/trang mã nguồn:',
 'import-interwiki-history'   => 'Sao chép tất cả các phiên bản cũ của trang này',
 'import-interwiki-submit'    => 'Nhập trang',
 'import-interwiki-namespace' => 'Không gian tên đích:',
+'import-upload-filename'     => 'Tên tập tin:',
+'import-comment'             => 'Lý do:',
 'importtext'                 => 'Xin hãy xuất tập tin từ wiki nguồn sử dụng [[Special:Export|tính năng xuất]].
 Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'importstart'                => '�ang nhập các trang…',
@@ -2026,13 +2322,13 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'tooltip-pt-anontalk'             => 'Thảo luận với địa chỉ IP này',
 'tooltip-pt-preferences'          => 'Tùy ch�n cá nhân của tôi',
 'tooltip-pt-watchlist'            => 'Thay đổi của các trang tôi theo dõi',
-'tooltip-pt-mycontris'            => '�óng góp của tôi',
+'tooltip-pt-mycontris'            => 'Danh sách các đóng góp của tôi',
 'tooltip-pt-login'                => '�ăng nhập sẽ có lợi hơn, tuy nhiên không bắt buộc.',
 'tooltip-pt-anonlogin'            => 'Không đăng nhập vẫn tham gia được, tuy nhiên đăng nhập sẽ lợi hơn.',
 'tooltip-pt-logout'               => '�ăng xuất',
 'tooltip-ca-talk'                 => 'Thảo luận v� trang này',
 'tooltip-ca-edit'                 => 'Bạn có thể sửa được trang này. Xin xem thử trước khi lưu.',
-'tooltip-ca-addsection'           => 'Thêm bàn luận vào đây.',
+'tooltip-ca-addsection'           => 'Bắt đầu một đ� mục mới',
 'tooltip-ca-viewsource'           => 'Trang này được khóa. Bạn có thể xem mã nguồn.',
 'tooltip-ca-history'              => 'Những phiên bản cũ của trang này.',
 'tooltip-ca-protect'              => 'Khóa trang này lại',
@@ -2064,7 +2360,7 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'tooltip-ca-nstab-main'           => 'Xem trang này',
 'tooltip-ca-nstab-user'           => 'Xem trang v� ngư�i này',
 'tooltip-ca-nstab-media'          => 'Xem trang phương tiện',
-'tooltip-ca-nstab-special'        => '�ây là một trang dặc biệt, bạn không thể sửa đổi được nó.',
+'tooltip-ca-nstab-special'        => '�ây là một trang đặc biệt, bạn không thể sửa đổi được nó.',
 'tooltip-ca-nstab-project'        => 'Xem trang dự án',
 'tooltip-ca-nstab-image'          => 'Xem trang hình',
 'tooltip-ca-nstab-mediawiki'      => 'Xem thông báo hệ thống',
@@ -2079,14 +2375,32 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'tooltip-watch'                   => 'Thêm trang này vào danh sách theo dõi',
 'tooltip-recreate'                => 'Tạo lại trang dù cho nó vừa bị xóa',
 'tooltip-upload'                  => 'Bắt đầu tải lên',
+'tooltip-rollback'                => '"Lùi tất cả" sẽ lùi m�i sửa đổi của ngư�i sửa đổi cuối cùng chỉ bằng một cú nhấp chuột.',
+'tooltip-undo'                    => '"Lùi lại" sẽ lùi sửa đổi này và mở trang sửa đổi ở chế độ xem thử. Cho phép thêm lý do vào tóm lược.',
 
 # Stylesheets
-'common.css'   => '/* Mã CSS đặt ở đây sẽ áp dụng cho m�i hình dạng */',
-'monobook.css' => '/* Mã CSS đặt ở đây sẽ ảnh hưởng đến thành viên sử dụng hình dạng Monobook */',
+'common.css'      => '/* Mã CSS đặt ở đây sẽ áp dụng cho m�i hình dạng */',
+'standard.css'    => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng Cổ điển */',
+'nostalgia.css'   => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng V�ng cổ */',
+'cologneblue.css' => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng Xanh Cologne */',
+'monobook.css'    => '/* Mã CSS đặt ở đây sẽ ảnh hưởng đến thành viên sử dụng hình dạng Monobook */',
+'myskin.css'      => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng Cá nhân */',
+'chick.css'       => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng Chick */',
+'simple.css'      => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng �ơn giản */',
+'modern.css'      => '/* Mã CSS tại đây sẽ ảnh hưởng đến những ngư�i dùng sử dụng hình dạng Hiện đại */',
+'print.css'       => '/* Mã CSS tại đây sẽ ảnh hưởng đến bản để in */',
+'handheld.css'    => '/* Mã CSS tại đây sẽ ảnh hưởng đến các thiết bị cầm tay dựa trên hình dạng cấu hình trong $wgHandheldStyle */',
 
 # Scripts
-'common.js'   => '/* Bất kỳ mã JavaScript ở đây sẽ được tải cho tất cả các thành viên khi tải một trang nào đó lên. */',
-'monobook.js' => '/* Những ngư�i dùng hình dạng MonoBook tải mã JavaScript ở đây */',
+'common.js'      => '/* Bất kỳ mã JavaScript ở đây sẽ được tải cho tất cả các thành viên khi tải một trang nào đó lên. */',
+'standard.js'    => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng Cổ điển */',
+'nostalgia.js'   => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng V�ng cổ */',
+'cologneblue.js' => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng Xanh Cologne */',
+'monobook.js'    => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng MonoBook */',
+'myskin.js'      => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng Cá nhân */',
+'chick.js'       => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng Chick */',
+'simple.js'      => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng �ơn giản */',
+'modern.js'      => '/* Mã JavaScript tại đây sẽ được tải khi ngư�i dùng sử dụng hình dạng Hiện đại */',
 
 # Metadata
 'nodublincore'      => 'Máy chủ không hỗ trợ siêu dữ liệu Dublin Core RDF.',
@@ -2094,12 +2408,12 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'notacceptable'     => 'Máy chủ không thể cho ra định dạng dữ liệu tương thích với phần m�m của bạn.',
 
 # Attribution
-'anonymous'        => 'Thành viên vô danh của {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|Thành viên|Thành viên}} vô danh của {{SITENAME}}',
 'siteuser'         => 'Thành viên $1 của {{SITENAME}}',
 'lastmodifiedatby' => 'Trang này được $3 cập nhật lần cuối lúc $2, $1.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Dựa trên công trình của $1.',
 'others'           => 'những ngư�i khác',
-'siteusers'        => 'Thành viên $1 của {{SITENAME}}',
+'siteusers'        => '{{PLURAL:$2|Thành viên|Các thành viên}} $1 của {{SITENAME}}',
 'creditspage'      => 'Trang ghi nhận đóng góp',
 'nocredits'        => 'Không có thông tin ghi nhận đóng góp cho trang này.',
 
@@ -2120,6 +2434,14 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'numauthors'     => 'Số ngư�i sửa đổi khác nhau (trang nội dung): $1',
 'numtalkauthors' => 'Số ngư�i sửa đổi khác nhau (trang thảo luận): $1',
 
+# Skin names
+'skinname-standard'    => 'Cổ điển',
+'skinname-nostalgia'   => 'V�ng cổ',
+'skinname-cologneblue' => 'Xanh Cologne',
+'skinname-myskin'      => 'Cá nhân',
+'skinname-simple'      => '�ơn giản',
+'skinname-modern'      => 'Hiện đại',
+
 # Math options
 'mw_math_png'    => 'Luôn cho ra dạng hình PNG',
 'mw_math_simple' => 'HTML nếu rất đơn giản, nếu không thì PNG',
@@ -2140,11 +2462,12 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'markedaspatrollederror-noautopatrol' => 'Bạn không được đánh dấu tuần tra vào sửa đổi của bạn.',
 
 # Patrol log
-'patrol-log-page'   => 'Nhật ký tuần tra',
-'patrol-log-header' => '�ây là nhật trình tuần tra phiên bản.',
-'patrol-log-line'   => 'đánh dấu tuần tra vào phiên bản $1 của $2 $3',
-'patrol-log-auto'   => '(tá»± Ä‘á»™ng)',
-'patrol-log-diff'   => 'bản $1',
+'patrol-log-page'      => 'Nhật ký tuần tra',
+'patrol-log-header'    => '�ây là nhật trình tuần tra phiên bản.',
+'patrol-log-line'      => 'đánh dấu tuần tra vào phiên bản $1 của $2 $3',
+'patrol-log-auto'      => '(tá»± Ä‘á»™ng)',
+'patrol-log-diff'      => 'bản $1',
+'log-show-hide-patrol' => '$1 nhật trình tuần tra',
 
 # Image deletion
 'deletedrevision'                 => '�ã xóa phiên bản cũ $1',
@@ -2161,6 +2484,9 @@ $1',
 'previousdiff' => '� Sửa đổi cũ',
 'nextdiff'     => 'Sửa đổi sau →',
 
+# Visual comparison
+'visual-comparison' => 'So sánh hình dạng',
+
 # Media information
 'mediawarning'         => "'''Cảnh báo''': Tập tin này có thể chứa mã hiểm độc, nếu thực thi nó máy tính của bạn có thể bị tiếm quy�n.<hr />",
 'imagemaxsize'         => 'Giới hạn độ phân giải trên trang miêu tả tập tin:',
@@ -2173,16 +2499,23 @@ $1',
 'show-big-image'       => '�ộ phân giải tối đa',
 'show-big-image-thumb' => '<small>Kích thước xem thử: $1 × $2 điểm ảnh</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Trang trưng bày hình ảnh mới',
 'imagelisttext'         => "Dưới đây là danh sách '''$1''' {{PLURAL:$1|tập tin|tập tin}} xếp theo $2.",
 'newimages-summary'     => 'Trang đặc biệt này hiển thị các tập tin được tải lên gần đây nhất.',
+'newimages-legend'      => 'Bộ l�c',
+'newimages-label'       => 'Tên tập tin (hoặc một phần tên):',
 'showhidebots'          => '($1 robot)',
 'noimages'              => 'Chưa có hình.',
 'ilsubmit'              => 'Tìm kiếm',
 'bydate'                => 'theo ngày',
 'sp-newimages-showfrom' => 'Trưng bày những tập tin mới, bắt đầu từ lúc $2, ngày $1',
 
+# Video information, used by Language::formatTimePeriod() to format lengths in the above messages
+'seconds-abbrev' => 's',
+'minutes-abbrev' => 'm',
+'hours-abbrev'   => 'h',
+
 # Bad image list
 'bad_image_list' => '�ịnh dạng như sau:
 
@@ -2252,6 +2585,7 @@ Những thông tin khác mặc định sẽ được ẩn đi.
 'exif-exposuretime'                => 'Th�i gian mở ống kính',
 'exif-exposuretime-format'         => '$1 giây ($2)',
 'exif-fnumber'                     => 'Số F',
+'exif-fnumber-format'              => 'f/$1',
 'exif-exposureprogram'             => 'Chương trình phơi sáng',
 'exif-spectralsensitivity'         => '�ộ nhạy quang phổ',
 'exif-isospeedratings'             => '�iểm tốc độ ISO',
@@ -2266,6 +2600,7 @@ Những thông tin khác mặc định sẽ được ẩn đi.
 'exif-lightsource'                 => 'Nguồn sáng',
 'exif-flash'                       => '�èn chớp',
 'exif-focallength'                 => '�ộ dài tiêu cự thấu kính',
+'exif-focallength-format'          => '$1 mm',
 'exif-subjectarea'                 => 'Diện tích vật thể',
 'exif-flashenergy'                 => 'Nguồn đèn chớp',
 'exif-spatialfrequencyresponse'    => 'Phản ứng tần số không gian',
@@ -2325,6 +2660,9 @@ Những thông tin khác mặc định sẽ được ẩn đi.
 
 # EXIF attributes
 'exif-compression-1' => 'Không nén',
+'exif-compression-6' => 'JPEG',
+
+'exif-photometricinterpretation-2' => 'RGB',
 
 'exif-unknowndate' => 'Không biết ngày',
 
@@ -2381,6 +2719,18 @@ Những thông tin khác mặc định sẽ được ẩn đi.
 'exif-lightsource-24'  => 'Vonfram xưởng ISO',
 'exif-lightsource-255' => 'Nguồn ánh sáng khác',
 
+# Flash modes
+'exif-flash-fired-0'    => '�èn flash không chớp',
+'exif-flash-fired-1'    => 'Có chớp đèn flash',
+'exif-flash-return-0'   => 'không có chức năng kiểm tra tín hiệu trả v� nhấp nháy',
+'exif-flash-return-2'   => 'không phát hiện ra ánh sáng trả v� nhấp nháy',
+'exif-flash-return-3'   => 'phát hiện ra ánh sáng trả v� nhấp nháy',
+'exif-flash-mode-1'     => 'chớp flash cưỡng ép',
+'exif-flash-mode-2'     => 'tắt flash cưỡng ép',
+'exif-flash-mode-3'     => 'chế độ tự động',
+'exif-flash-function-1' => 'Không có chức năng flash',
+'exif-flash-redeye-1'   => 'chế độ giảm mắt đ�',
+
 'exif-focalplaneresolutionunit-2' => 'inch',
 
 'exif-sensingmethod-1' => 'Không định rõ',
@@ -2528,21 +2878,10 @@ $1
 Xin hãy xác nhận bạn thực sự muốn tạo lại trang này.",
 'recreate'            => 'Tạo ra lại',
 
-# HTML dump
-'redirectingto' => '�ang đổi hướng đến [[:$1]]…',
-
 # action=purge
-'confirm_purge'        => 'Làm sạch vùng nhớ đệm của trang này?
-
-$1',
 'confirm_purge_button' => 'OK',
-
-# AJAX search
-'searchcontaining' => "Tìm những trang có chứa ''$1''.",
-'searchnamed'      => "Tìm những trang có tên ''$1''.",
-'articletitles'    => "Những trang bắt đầu bằng ''$1''",
-'hideresults'      => 'Ẩn kết quả',
-'useajaxsearch'    => 'Dùng tìm kiếm AJAX',
+'confirm-purge-top'    => 'Làm sạch vùng nhớ đệm của trang này?',
+'confirm-purge-bottom' => 'Làm mới một trang sẽ giúp xóa bộ đệm và buộc hiển thị phiên bản gần nhất.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� trang trước',
@@ -2562,10 +2901,10 @@ $1',
 'table_pager_empty'        => 'Không có kết quả nào.',
 
 # Auto-summaries
-'autosumm-blank'   => 'Tẩy trống',
+'autosumm-blank'   => 'Tẩy trống trang',
 'autosumm-replace' => 'Thay cả nội dung bằng “$1�',
 'autoredircomment' => '�ổi hướng đến [[$1]]',
-'autosumm-new'     => 'Trang má»›i: $1',
+'autosumm-new'     => 'Tạo trang mới với nội dung ‘$1’',
 
 # Size units
 'size-kilobytes' => '$1 kB',
@@ -2606,6 +2945,7 @@ Bạn cũng có thể [[Special:Watchlist/edit|dùng trình soạn thảo chuẩ
 
 # Core parser functions
 'unknown_extension_tag' => 'Không hiểu thẻ mở rộng “$1�',
+'duplicate-defaultsort' => 'Cảnh báo: Từ khóa xếp mặc định “$2� ghi đè từ khóa trước, “$1�.',
 
 # Special:Version
 'version'                          => 'Phiên bản', # Not used as normal message but as header for the special page itself
@@ -2634,13 +2974,13 @@ Bạn cũng có thể [[Special:Watchlist/edit|dùng trình soạn thảo chuẩ
 'filepath-submit'  => 'Hiển thị tập tin',
 'filepath-summary' => 'Trang này chuyển bạn thẳng đến địa chỉ của một tập tin. Nếu là hình, địa chỉ là của hình kích thước tối đa; các loại tập tin khác sẽ được mở lên ngay trong chương trình đúng.
 
-Hãy ghi vào tên tập tin, không bao gồm ti�n tố “{{ns:image}}:�.',
+Hãy ghi vào tên tập tin, không bao gồm ti�n tố “{{ns:file}}:�.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => 'Tìm kiếm các tập tin trùng lắp',
 'fileduplicatesearch-summary'  => 'Tìm kiếm các bản sao y hệt với tập tin khác, theo giá trị băm của nó.
 
-Hãy cho vào tên của tập tin, trừ ti�n tố “{{ns:image}}:�.',
+Hãy cho vào tên của tập tin, trừ ti�n tố “{{ns:file}}:�.',
 'fileduplicatesearch-legend'   => 'Tìm kiếm tập tin trùng lắp',
 'fileduplicatesearch-filename' => 'Tên tập tin:',
 'fileduplicatesearch-submit'   => 'Tìm kiếm',
@@ -2670,4 +3010,13 @@ Hãy cho vào tên của tập tin, trừ ti�n tố “{{ns:image}}:�.',
 'blankpage'              => 'Trang trắng',
 'intentionallyblankpage' => 'Trang này được chủ định để trắng',
 
+# External image whitelist
+'external_image_whitelist' => ' #Hãy để yên dòng này.<pre>
+#Hãy cho vào các mảnh biểu thức chính quy -- chỉ phần ở giữa đôi dấu chéo (/) -- ở dưới.
+#Các mảnh này sẽ được so với địa chỉ của các hình được nhúng từ bên ngoài.
+#Các trang sẽ hiển thị những hình ảnhy có địa chỉ trùng với nó, còn chỉ liên kết đến các hình ảnh kia.
+#Các dòng chú thích bắt đầu với dấu thăng (#).
+
+#Hãy cho vào các mảnh biểu thức chính quy ở trên dòng này. Xin để yên dòng này.</pre>',
+
 );
diff --git a/languages/messages/MessagesVls.php b/languages/messages/MessagesVls.php
index 7f77b5a6..1a224912 100644
--- a/languages/messages/MessagesVls.php
+++ b/languages/messages/MessagesVls.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Discuusje_gebruker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Discuusje_$1',
-	NS_IMAGE          => 'Ofbeeldienge',
-	NS_IMAGE_TALK     => 'Discuusje_ofbeeldienge',
+	NS_FILE           => 'Ofbeeldienge',
+	NS_FILE_TALK      => 'Discuusje_ofbeeldienge',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discuusje_MediaWiki',
 	NS_TEMPLATE       => 'Patrôon',
@@ -69,6 +69,10 @@ $messages = array(
 'newpages'          => 'Nieuwe bloadn',
 'newpages-username' => 'Gebrukersnoame:',
 
+# Special:Log/newusers
+'newuserlogpage'          => 'Logboek nieuwe gebrukers',
+'newuserlog-create-entry' => 'Nieuwe gebruker',
+
 # Watchlist
 'mywatchlist' => 'Myn volglyste',
 'watch'       => 'Volgn',
@@ -95,7 +99,7 @@ $messages = array(
 # Tooltip help for the actions
 'tooltip-n-mainpage' => "Noar 't voorblad goane",
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Nieuwe ofbeeldiengn',
 
 );
diff --git a/languages/messages/MessagesVo.php b/languages/messages/MessagesVo.php
index 80898fab..5fc54aff 100644
--- a/languages/messages/MessagesVo.php
+++ b/languages/messages/MessagesVo.php
@@ -10,24 +10,27 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA          => 'Nünamakanäd',
-	NS_SPECIAL        => 'Patikos',
-	NS_MAIN           => '',
-	NS_TALK           => 'Bespik',
-	NS_USER           => 'Geban',
-	NS_USER_TALK      => 'Gebanibespik',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => 'Bespik_dö_$1',
-	NS_IMAGE          => 'Magod',
-	NS_IMAGE_TALK     => 'Magodibespik',
-	NS_MEDIAWIKI      => 'Sitanuns',
-	NS_MEDIAWIKI_TALK => 'Bespik_dö_sitanuns',
-	NS_TEMPLATE       => 'Samafomot',
-	NS_TEMPLATE_TALK  => 'Samafomotibespik',
-	NS_HELP           => 'Yuf',
-	NS_HELP_TALK      => 'Yufibespik',
-	NS_CATEGORY       => 'Klad',
-	NS_CATEGORY_TALK  => 'Kladibespik',
+	NS_MEDIA            => 'Nünamakanäd',
+	NS_SPECIAL          => 'Patikos',
+	NS_TALK             => 'Bespik',
+	NS_USER             => 'Geban',
+	NS_USER_TALK        => 'Gebanibespik',
+	NS_PROJECT_TALK     => 'Bespik_dö_$1',
+	NS_FILE             => 'Ragiv',
+	NS_FILE_TALK        => 'Ragivibespik',
+	NS_MEDIAWIKI        => 'Sitanuns',
+	NS_MEDIAWIKI_TALK   => 'Bespik_dö_sitanuns',
+	NS_TEMPLATE         => 'Samafomot',
+	NS_TEMPLATE_TALK    => 'Samafomotibespik',
+	NS_HELP             => 'Yuf',
+	NS_HELP_TALK        => 'Yufibespik',
+	NS_CATEGORY         => 'Klad',
+	NS_CATEGORY_TALK    => 'Kladibespik',
+);
+
+$namespaceAliases = array(
+	'Magod' => NS_FILE,
+	'Magodibespik' => NS_FILE_TALK,
 );
 
 $datePreferences = array(
@@ -50,32 +53,32 @@ $dateFormats = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'Lüodükömstelik', 'Lüodüköms_telik' ),
-	'BrokenRedirects'           => array( 'Lüodükömsdädik', 'Lüodüköms_dädik' ),
-	'Disambiguations'           => array( 'Telplänovs' ),
+	'DoubleRedirects'           => array( 'Lüodükömstelik', 'Lüodüköms telik' ),
+	'BrokenRedirects'           => array( 'Lüodükömsdädik', 'Lüodüköms dädik' ),
+	'Disambiguations'           => array( 'Telplänovs', 'Telplänovapads' ),
 	'Userlogin'                 => array( 'Gebananunäd' ),
 	'Userlogout'                => array( 'Gebanasenunäd' ),
 	'Preferences'               => array( 'Buükams' ),
 	'Watchlist'                 => array( 'Galädalised' ),
 	'Recentchanges'             => array( 'Votükamsnulik' ),
 	'Upload'                    => array( 'Löpükön' ),
-	'Imagelist'                 => array( 'Magodalised' ),
-	'Newimages'                 => array( 'Magodsnulik', 'Magods_nulik' ),
+	'Listfiles'                 => array( 'Magodalised' ),
+	'Newimages'                 => array( 'Magodsnulik', 'Magods nulik' ),
 	'Listusers'                 => array( 'Gebanalised' ),
 	'Statistics'                => array( 'Statits' ),
-	'Randompage'                => array( 'Padfädik', 'Pad_fädik', 'Fädik' ),
-	'Lonelypages'               => array( 'Padssoelöl', 'Pads_soelöl' ),
-	'Uncategorizedpages'        => array( 'Padsnenklads', 'Pads_nen_klads' ),
-	'Uncategorizedcategories'   => array( 'Kladsnenklads', 'Klads_nen_klads' ),
-	'Uncategorizedimages'       => array( 'Magodsnenklads', 'Magods_nen_klads' ),
-	'Uncategorizedtemplates'    => array( 'Samafomotsnenklads', 'Samafomots_nen_klads' ),
-	'Unusedcategories'          => array( 'Kladsnopageböls', 'Klad_no_pageböls' ),
-	'Unusedimages'              => array( 'Magodsnopageböls', 'Magods_no_pageböls' ),
-	'Wantedpages'               => array( 'Padspavilöl', 'Yümsdädik', 'Pads_pavilöl', 'Yüms_dädik' ),
-	'Wantedcategories'          => array( 'Kladspavilöl', 'Klads_pavilöl' ),
-	'Mostlinked'                => array( 'Suvüno_peyümöls' ),
-	'Mostlinkedcategories'      => array( 'Klads_suvüno_peyümöls' ),
-	'Mostlinkedtemplates'       => array( 'Samafomots_suvüno_peyümöls' ),
+	'Randompage'                => array( 'Padfädik', 'Pad fädik', 'Fädik' ),
+	'Lonelypages'               => array( 'Padssoelöl', 'Pads soelöl' ),
+	'Uncategorizedpages'        => array( 'Padsnenklads', 'Pads nen klads' ),
+	'Uncategorizedcategories'   => array( 'Kladsnenklads', 'Klads nen klads' ),
+	'Uncategorizedimages'       => array( 'Magodsnenklads', 'Magods nen klads' ),
+	'Uncategorizedtemplates'    => array( 'Samafomotsnenklads', 'Samafomots nen klads' ),
+	'Unusedcategories'          => array( 'Kladsnopageböls', 'Klad no pageböls' ),
+	'Unusedimages'              => array( 'Magodsnopageböls', 'Magods no pageböls' ),
+	'Wantedpages'               => array( 'Pads mekabik', 'Padsmekabik', 'Padspavilöl', 'Yümsdädik', 'Pads pavilöl', 'Yüms dädik' ),
+	'Wantedcategories'          => array( 'Klads mekabik', 'Kladsmekabik', 'Kladspavilöl', 'Klads pavilöl' ),
+	'Mostlinked'                => array( 'Suvüno peyümöls' ),
+	'Mostlinkedcategories'      => array( 'Klads suvüno peyümöls' ),
+	'Mostlinkedtemplates'       => array( 'Samafomots suvüno peyümöls' ),
 	'Shortpages'                => array( 'Padsbrefik' ),
 	'Longpages'                 => array( 'Padslunik' ),
 	'Newpages'                  => array( 'Padsnulik' ),
@@ -100,52 +103,53 @@ $specialPageAliases = array(
 
 $messages = array(
 # User preference toggles
-'tog-underline'               => 'Dislienükolöd yümis:',
+'tog-underline'               => 'Dislienükön yümis:',
 'tog-highlightbroken'         => 'Jonön yümis dädik <a href="" class="new">ön mod at</a> (voto: ön mod at<a href="" class="internal">?</a>).',
 'tog-justify'                 => 'Lonedükön bagafis',
 'tog-hideminor'               => 'Klänedön redakamis pülik su lised votükamas nulik',
 'tog-extendwatchlist'         => 'Stäänükön galädalisedi ad jonön votükamis tefik valik',
 'tog-usenewrc'                => 'Lised pamenodöl votükamas nulik (JavaScript)',
 'tog-numberheadings'          => 'Givön itjäfidiko nümis dilädatiädes',
-'tog-showtoolbar'             => 'Jonön redakastumemi (JavaScript)',
+'tog-showtoolbar'             => 'Jonön redakamastumemi (JavaScript)',
 'tog-editondblclick'          => 'Dälön redakön padis pö drän telik mugaknopa (JavaScript)',
 'tog-editsection'             => 'Dälön redakami dilädas me yüms: [redakön]',
 'tog-editsectiononrightclick' => 'Dälön redakami diläda me klik mugaknopa detik su dilädatiäds (JavaScript)',
 'tog-showtoc'                 => 'Jonön ninädalisedi (su pads labü diläds plu 3)',
 'tog-rememberpassword'        => 'Dakipön nunädamanünis obik in nünöm at',
 'tog-editwidth'               => 'Redakaspad labon vidoti lölöfik',
-'tog-watchcreations'          => 'Läükolöd padis fa ob pejafölis lä galädalised obik',
-'tog-watchdefault'            => 'Läükolöd padis fa ob peredakölis la galädalised obik',
-'tog-watchmoves'              => 'Läükolöd padis fa ob petopätükölis lä galädalised obik',
-'tog-watchdeletion'           => 'Läükolöd padis fa ob pemoükölis lä galädalised obik',
-'tog-minordefault'            => 'Lelogolöd redakamis no pebepenölis valikis asä pülikis',
-'tog-previewontop'            => 'Jonolöd büologedi bü redakaspad',
-'tog-previewonfirst'          => 'Jonolöd büologedi pö redakam balid',
+'tog-watchcreations'          => 'Läükön padis fa ob pejafölis lä galädalised obik',
+'tog-watchdefault'            => 'Läükön padis fa ob peredakölis la galädalised obik',
+'tog-watchmoves'              => 'Läükön padis fa ob petopätükölis lä galädalised obik',
+'tog-watchdeletion'           => 'Läükön padis fa ob pemoükölis lä galädalised obik',
+'tog-minordefault'            => 'Bepenön redakamis no pebepenölis valikis asä pülikis',
+'tog-previewontop'            => 'Jonön büologedi bü redakaspad',
+'tog-previewonfirst'          => 'Jonön büologedi pö redakam balid',
 'tog-nocache'                 => 'Nejäfidükön el caché padas',
-'tog-enotifwatchlistpages'    => 'Sedolös obe penedi leäktronik ven ek votükon padi se galädalised obik',
-'tog-enotifusertalkpages'     => 'Sedolös obe penedi leäktronik ven gebanapad obik pavotükon',
-'tog-enotifminoredits'        => 'Sedolös obe penedi leäktronik igo pö padavotükams pülik',
+'tog-enotifwatchlistpages'    => 'Sedön obe penedi leäktronik ven ek votükon padi se galädalised obik',
+'tog-enotifusertalkpages'     => 'Sedön obe penedi leäktronik ven gebanapad obik pavotükon',
+'tog-enotifminoredits'        => 'Sedön obe penedi leäktronik igo pö padavotükams pülik',
 'tog-enotifrevealaddr'        => 'Jonön ladeti leäktronik oba in nunapeneds.',
 'tog-shownumberswatching'     => 'Jonön numi gebanas galädöl',
 'tog-fancysig'                => 'Dispenäd balugik (nen yüms lü gebanapad)',
-'tog-externaleditor'          => 'Gebön nomiko redakömi plödik',
-'tog-externaldiff'            => 'Gebön nomiko difi plödik',
-'tog-showjumplinks'           => 'Dälolöd lügolovi me yüms "lübunöl"',
+'tog-externaleditor'          => 'Gebön nomiko redakömi plödik (te pro jäfüdisevans; paramets patik paneodons su nünöm olik)',
+'tog-externaldiff'            => 'Gebön nomiko difi plödik (te pro jäfüdisevans; paramets patik paneodons su nünöm olik)',
+'tog-showjumplinks'           => 'Dälön lügolovi me yüms „lübunöl“',
 'tog-uselivepreview'          => 'Gebön büologedi itjäfidik (JavaScript) (Sperimäntik)',
-'tog-forceeditsummary'        => 'Sagolös obe, ven redakaplän brefik vagon',
-'tog-watchlisthideown'        => 'No jonolöd redakamis obik in galädalised',
-'tog-watchlisthidebots'       => 'No jonolöd redakamis mäikamenas in galädalised',
-'tog-watchlisthideminor'      => 'Klänolöd redakamis pülik se galädalised',
-'tog-ccmeonemails'            => 'Sedolös obe kopiedis penedas, kelis sedob gebanes votik',
+'tog-forceeditsummary'        => 'Sagön obe, ven redakaplän brefik vagon',
+'tog-watchlisthideown'        => 'Klänedön redakamis obik se galädalised',
+'tog-watchlisthidebots'       => 'Klänedön redakamis mäikamenas se galädalised',
+'tog-watchlisthideminor'      => 'Klänedön redakamis pülik se galädalised',
+'tog-watchlisthideliu'        => 'Klänedön redakamis gebanas senunädöl se galädalised',
+'tog-watchlisthideanons'      => 'Klänedön redakamis gebanas nennemik se galädalised',
+'tog-ccmeonemails'            => 'Sedön obe kopiedis penedas, kelis sedob gebanes votik',
 'tog-diffonly'                => 'No jonön padaninädi dis difs',
 'tog-showhiddencats'          => 'Jonön kladis peklänedöl',
+'tog-norollbackdiff'          => 'Moädön difi pos sädunam',
 
 'underline-always'  => 'Pö jenets valik',
 'underline-never'   => 'Neföro',
 'underline-default' => 'Ma bevüresodatävöm',
 
-'skinpreview' => '(Büologed)',
-
 # Dates
 'sunday'        => 'sudel',
 'monday'        => 'mudel',
@@ -202,7 +206,7 @@ $messages = array(
 'pagecategories'                 => '{{PLURAL:$1|Klad|Klads}}',
 'category_header'                => 'Pads in klad: „$1“',
 'subcategories'                  => 'Donaklads',
-'category-media-header'          => 'Media in klad: "$1"',
+'category-media-header'          => 'Ragivs in klad: „$1“',
 'category-empty'                 => "''Klad at anu ninädon padis e ragivis nonikis.''",
 'hidden-categories'              => '{{PLURAL:$1|Klad|Klads}} peklänedöl',
 'hidden-category-category'       => 'Klads peklänedöl', # Name of the category where hidden categories will be listed
@@ -239,7 +243,7 @@ $messages = array(
 'mytalk'         => 'Bespiks obik',
 'anontalk'       => 'Bespiks ela IP at',
 'navigation'     => 'Nafam',
-'and'            => 'e',
+'and'            => '&#32;e',
 
 # Metadata in edit box
 'metadata_help' => 'Metanünods:',
@@ -276,14 +280,14 @@ $messages = array(
 'talkpagelinktext'  => 'Bespik',
 'specialpage'       => 'Pad patik',
 'personaltools'     => 'Stums pösodik',
-'postcomment'       => 'Sedön küpeti',
+'postcomment'       => 'Diläd nulik',
 'articlepage'       => 'Jonön ninädapadi',
 'talk'              => 'Bespik',
 'views'             => 'Logams',
 'toolbox'           => 'Stumem',
 'userpage'          => 'Logön gebanapadi',
 'projectpage'       => 'Logön proyegapadi',
-'imagepage'         => 'Jonön magodapad',
+'imagepage'         => 'Jonön ragivapad',
 'mediawikipage'     => 'Logön nunapadi',
 'templatepage'      => 'Logön samafomotapadi',
 'viewhelppage'      => 'Jonön yufapadi',
@@ -302,8 +306,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Tefü {{SITENAME}}',
 'aboutpage'            => 'Project:Tefü',
-'bugreports'           => 'Nunods dö programapöks',
-'bugreportspage'       => 'Project:Nunods dö programapöks',
 'copyright'            => 'Ninäd gebidon ma el $1.',
 'copyrightpagename'    => 'Kopiedagität {{SITENAME}}a',
 'copyrightpage'        => '{{ns:project}}:Kopiedagitäts',
@@ -326,15 +328,13 @@ $messages = array(
 
 'badaccess'        => 'Dälapöl',
 'badaccess-group0' => 'No pedälol ad ledunön atosi, kelosi ebegol.',
-'badaccess-group1' => 'Dun, keli eflagol, padälon te gebanes grupa: $1.',
-'badaccess-group2' => 'Dun fa ol pebegöl pemiedükon ad gebans grupas $1.',
-'badaccess-groups' => 'Utos, kelosi vilol dunön, padälon te gebanes dutöl lü bal grupas: $1.',
+'badaccess-groups' => 'Utos, kelosi vilol dunön, padälon te gebanes dutöl lü {{PLURAL:$2|grup|bal grupas}}: $1.',
 
 'versionrequired'     => 'Fomam: $1 ela MediaWiki paflagon',
 'versionrequiredtext' => 'Fomam: $1 ela MediaWiki zesüdon ad gebön padi at. Logolös [[Special:Version|fomamapadi]].',
 
 'ok'                      => 'Si!',
-'retrievedfrom'           => 'Pekopiedon se "$1"',
+'retrievedfrom'           => 'Pekopiedon se „$1“',
 'youhavenewmessages'      => 'Su pad ola binons $1 ($2).',
 'newmessageslink'         => 'nuns nulik',
 'newmessagesdifflink'     => 'votükam lätik',
@@ -342,10 +342,12 @@ $messages = array(
 'editsection'             => 'redakön',
 'editold'                 => 'redakön',
 'viewsourceold'           => 'logön fonätavödemi',
+'editlink'                => 'redakön',
+'viewsourcelink'          => 'logedön fonäti',
 'editsectionhint'         => 'Redakolöd dilädi: $1',
 'toc'                     => 'Ninäd',
-'showtoc'                 => 'jonolöd',
-'hidetoc'                 => 'klänedolöd',
+'showtoc'                 => 'jonön',
+'hidetoc'                 => 'klänedön',
 'thisisdeleted'           => 'Jonön u sädunön moükami $1?',
 'viewdeleted'             => 'Logön eli $1?',
 'restorelink'             => '{{PLURAL:$1|redakama bal|redakamas $1}}',
@@ -354,15 +356,15 @@ $messages = array(
 'feed-unavailable'        => 'Nünamakanads no gebidons',
 'site-rss-feed'           => 'Kanad (RSS): $1',
 'site-atom-feed'          => 'Kanad (Atom): $1',
-'page-rss-feed'           => 'Kanad (RSS): "$1"',
+'page-rss-feed'           => 'Kanad (RSS): „$1“',
 'page-atom-feed'          => 'Kanad (Atom) „$1“',
-'red-link-title'          => '$1 (no nog pepenon)',
+'red-link-title'          => '$1 (pad no dabinon)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Yeged',
 'nstab-user'      => 'Gebanapad',
 'nstab-media'     => 'Nünamakanädapad',
-'nstab-special'   => 'Patik',
+'nstab-special'   => 'Pad patik',
 'nstab-project'   => 'Proyegapad',
 'nstab-image'     => 'Ragiv',
 'nstab-mediawiki' => 'Vödem',
@@ -383,13 +385,13 @@ $messages = array(
 Atos ba sinifön, das dabinon säkäd pö program.
 Steifül lätik ad gebön vüki äbinon:
 <blockquote><tt>$1</tt></blockquote>
-se dunod: "<tt>$2</tt>".
-El MySQL ägesedon pökanuni: "<tt>$3: $4</tt>".',
+se dunod: „<tt>$2</tt>“.
+El MySQL ägesedon pökanuni: „<tt>$3: $4</tt>“.',
 'dberrortextcl'        => 'Süntagapök pö geb vüka at ejenon.
 Steifül lätik ad gebön vüki at äbinon:
-"$1"
-se dunod: "$2".
-El MySQL ägesedon pökanuni: "$3: $4"',
+„$1“
+se dunod: „$2“.
+El MySQL ägesedon pökanuni: „$3: $4“',
 'noconnect'            => 'Liedo vük at labon anu fikulis kaenik e no fägon ad kosädön ko zänodanünöm nünodema. <br />
 $1',
 'nodb'                 => 'No eplöpos ad välön nünodemi: $1',
@@ -400,6 +402,11 @@ $1',
 'readonlytext'         => 'Vük pefärmükon: yegeds e votükams nuliks no kanons padakipön. Atos ejenon bo pro kosididaduns, pos kels vük ogeikon ad stad kösömik.
 
 Guvan, kel äfärmükon vüki, äplänon osi ön mod sököl: $1',
+'missing-article'      => 'Nünodem no etuvon vödemi pada, keli sötonov dabinön, tiädü „$1“ $2.
+
+Atos kösömiko jenon sekü difa- u jenotemayüm dädik (o.b. lü pad pemoüköl).
+
+Üf yüm no binon dädik, ba etuvol pöli pö program vüka at. Nunodolös oni, begö! [[Special:ListUsers/sysop|guvane]], mäniotölo eli URL.',
 'missingarticle-rev'   => '(fomamanüm: $1)',
 'missingarticle-diff'  => '(Dif: $1, $2)',
 'readonly_lag'         => 'Vük pefärmükon itjäfidiko du dünanünöms slafik kosädons ko mastanünöm.',
@@ -417,7 +424,6 @@ Guvan, kel äfärmükon vüki, äplänon osi ön mod sököl: $1',
 'cannotdelete'         => 'No emögos ad moükön padi/ragivi pevälöl. (Ba ya pemoükon fa geban votik.)',
 'badtitle'             => 'Tiäd badik',
 'badtitletext'         => 'Padatiäd peflagöl äbinon nelonöfik, vägik, u ba yüm bevüpükik u bevüvükik dädik. Mögos, das ninädon malati(s), kel(s) no dalon(s) pagebön ad jafön tiädis.',
-'perfdisabled'         => 'Dun at penemögükon nelaidüpo bi nevifükon vüki so vemo, das nek kanon gebön oni.',
 'perfcached'           => 'Nüns sököl ekömons se el caché e ba no binons anuik.',
 'perfcachedts'         => 'Nüns sököl kömons se mem nelaidüpik e päbevobons lätiküno ün: $1.',
 'querypage-no-updates' => 'Atimükam pada at penemögükon. Nünods isik no poflifedükons suno.',
@@ -440,12 +446,17 @@ Beg: $2',
 'titleprotected'       => "Jaf tiäda at penemögükon fa geban: [[User:$1|$1]].
 Kod binon: ''$2''.",
 
+# Virus scanner
+'virus-badscanner'     => "Parametem badik: program tavirudik nesevädik: ''$1''",
+'virus-scanfailed'     => 'skrutam no eplöpon (kot $1)',
+'virus-unknownscanner' => 'program tavirudik nesëvadik:',
+
 # Login and logout pages
 'logouttitle'                => 'Senunädön oki',
-'logouttext'                 => '<strong>Esenunädol oli.</strong>
+'logouttext'                 => "'''Esenunädol oli.'''
 
 Kanol laigebön {{SITENAME}} nennemiko, u kanol [[Special:UserLogin|nunädön oli dönu]] me gebananem ot u gebenanem votik.
-Küpälolös, das pads anik ba nog pojenons äsva no esenunädol oli, jüs uklinükol memi no laidüpik bevüresodanaföma olik.',
+Küpälolös, das pads anik ba nog pojenons äsva no esenunädol oli, jüs uklinükol memi no laidüpik bevüresodanaföma olik.",
 'welcomecreation'            => '== Benokömö, o $1! ==
 
 Kal olik pejafon. No glömolöd ad votükön buükamis olik in {{SITENAME}}.',
@@ -456,7 +467,6 @@ Kal olik pejafon. No glömolöd ad votükön buükamis olik in {{SITENAME}}.',
 'remembermypassword'         => 'Dakipolöd ninädamanünis obik in nünöm at',
 'yourdomainname'             => 'Domen olik:',
 'externaldberror'            => 'U ejenon fümükamapöl plödik nünödema, u no dalol atimükön kali plödik ola.',
-'loginproblem'               => '<b>No eplöpos ad nunädön oli.</b><br />Steifülolös dönu!',
 'login'                      => 'Nunädolös obi',
 'nav-login-createaccount'    => 'Nunädön oki / jafön kali',
 'loginprompt'                => 'Mutol mögükön „kekilis“ ad kanön nunädön oli in {{SITENAME}}.',
@@ -485,8 +495,8 @@ Muton labön {{PLURAL:$1|malati|malatis}} läs $1.',
 'email'                      => 'Ladet leäktronik',
 'prefs-help-realname'        => 'Nem jenöfik no binon zesüdik. If vilol givön oni, pogebon ad dasevön vobi olik.',
 'loginerror'                 => 'Nunädamapöl',
-'prefs-help-email'           => '* Ladet leäktronik (if vilol): dälon votikanes ad kosikön ko ol
-yufü gebanapad u gebanabespikapad olik nes sävilupol dientifi olik.',
+'prefs-help-email'           => 'Ladet leäktronik no peflagon, ab dälon sedi letavöda nulik ole üf glömol letavödi olik.
+Dalol i dälön votikanes kosikön ko ol yufü gebana- u bespikapad olik nes sävilupol dientifi olik.',
 'prefs-help-email-required'  => 'Ladet leäktronik paflagon.',
 'nocookiesnew'               => 'Gebanakal pejafon, ab no enunädol oli. {{SITENAME}} gebon „kekilis“ pö nunädam gebanas. Pö bevüresodanaföm olik ye geb kekilas penemogükon. Mogükolös oni e nunädolös oli me gebananem e letavöd nuliks ola.',
 'nocookieslogin'             => '{{SITENAME}} gebon „kekilis“ ad nunädön gebanis. Anu geb kekilas nemögon. Mögükolös onis e steifülolös nogna.',
@@ -503,12 +513,9 @@ Koräkolös tonatami nema at, u [[Special:UserLogin/signup|jafolös kali nulik]]
 Muton binädon me {{PLURAL:$1|malat|malats}} pu $1 e difön de gebananem olik.',
 'mailmypassword'             => 'Sedön letavödi nulik',
 'passwordremindertitle'      => 'Letavöd nulik nelaidik in {{SITENAME}}',
-'passwordremindertext'       => 'Ek (luveratiko ol, se ladet-IP: $1)
-ebegon, das osedobs ole letavödi nulik pro {{SITENAME}} ($4).
-Letavöd gebana: "$2" binon anu "$3".
-Anu kanol nunädön oli e votükön letavödi olik.
+'passwordremindertext'       => 'Ek (luveratiko ol, se ladet-IP: $1) ebegon sedi letavöda nulik pro {{SITENAME}} ($4). Letavöd nelaidüpik pejafon pro geban: „$2“ e pesedon ele „$3“. If atos ejenon ma vil olik, mutol anu nunädön oli e välön letavödi nulik.
 
-If no ol, ab pösod votik ebegon letavödi nulik, ud if ememol letavödi olik e no plu vilol votükön oni, kanol nedemön penedi at e laigebön letavödi rigik ola.',
+If pösod votik edunon begi at, ud if anu memol letavödi olik e no plu vilol votükön oni, dalol nedemön penedi at e laigebön letavödi rigik ola.',
 'noemail'                    => 'Ladet leäktronik nonik peregistaron pro geban "$1".',
 'passwordsent'               => 'Letavöd nulik pesedon ladete leäktronik fa "$1" peregistaröle.<br />
 Nunädolös oli dönu posä ogetol oni.',
@@ -518,29 +525,39 @@ Büä pened votik alseimik okanon pasedön kale at, omutol dunön valikosi in pe
 'throttled-mailpassword'     => 'Mebapened tefü letavöd olik ya pesedon, dü {{PLURAL:$1|düp lätik|düps lätik $1}}.
 Ad neletön migebi, mebapened te bal a {{PLURAL:$1|düp|düps $1}} dalon pasedön.',
 'mailerror'                  => 'Pöl dü sedam pota: $1',
-'acct_creation_throttle_hit' => 'Säkusädolös, ya ejafol kalis $1. No plu kanol jafön kali nulik.',
-'emailauthenticated'         => 'Ladet leäktronik olik päfümükon tü düp $1.',
+'acct_creation_throttle_hit' => 'Säkusädolös, ya ejafol {{PLURAL:$1|kali bal|kalis $1}}.
+No plu kanol jafön kali nulik.',
+'emailauthenticated'         => 'Ladet leäktronik olik päfümükon tü düp $2 ün $3.',
 'emailnotauthenticated'      => 'Ladet leäktronik ola no nog pefümedon. Pened nonik posedon me pads sököl.',
 'noemailprefs'               => 'Givolös ladeti leäktronik, dat pads at okanons pagebön.',
 'emailconfirmlink'           => 'Fümedolös ladeti leäktronik ola',
-'invalidemailaddress'        => 'Ladet leäktronik no kanon pazepön bi jiniko labon fomäti no lonöföli. Vagükolös penamaspadi at, u penolös ladeti labü fomät verätik.',
+'invalidemailaddress'        => 'Ladet leäktronik no kanon pazepön bi fomät onik jiniko no lonöfon. 
+Penolös ladeti labü fomät lonöföl, u vagükolös penamaspadi.',
 'accountcreated'             => 'Kal pejafon',
 'accountcreatedtext'         => 'Gebanakal pro $1 pejafon.',
 'createaccount-title'        => 'Kalijafam in {{SITENAME}}',
 'createaccount-text'         => 'Ek ejafon kali pro ladet leäktronik ola in {{SITENAME}} ($4) labü nem: „$2“ e letavöd: „$3“. Kanol nunädön oli e votükön letavödi olik anu.
 
 Kanol nedemön penedi at, üf jafam kala at binon pöl.',
+'login-throttled'            => 'Esteifülol tumödikna ad tuvön letavödi kala at. Stebedolös büä osteifülol nogna.',
 'loginlanguagelabel'         => 'Pük: $1',
 
 # Password reset dialog
-'resetpass'               => 'Dönuvälön kalaletavödi',
-'resetpass_announce'      => 'Enunädol oli me kot nelaidüpik pisedöl ole. Ad finükön nunädami, mutol välön letavödi nulik is:',
-'resetpass_header'        => 'Dönuvälön letavödi',
-'resetpass_submit'        => 'Välön letavödi e nunädön omi',
-'resetpass_success'       => 'Letavöd olik pevotükon benosekiko! Anu sit nunädon oli...',
-'resetpass_bad_temporary' => 'Letavöd nelaidüpik no lonöföl. Ba ya evotükol letavödi olik, u ba ya ebegol letavödi nelaidüpik nulik.',
-'resetpass_forbidden'     => 'Letavöds no kanons pavotükön in {{SITENAME}}',
-'resetpass_missing'       => 'Fomet labon nünis nonik.',
+'resetpass'                 => 'Votükön letavödi',
+'resetpass_announce'        => 'Enunädol oli me kot nelaidüpik pisedöl ole. Ad finükön nunädami, mutol välön letavödi nulik is:',
+'resetpass_header'          => 'Votükön kalaletavödi',
+'oldpassword'               => 'Letavöd büik:',
+'newpassword'               => 'Letavöd nulik:',
+'retypenew'                 => 'Klavolöd dönu letavödi nulik:',
+'resetpass_submit'          => 'Välön letavödi e nunädön omi',
+'resetpass_success'         => 'Letavöd olik pevotükon benosekiko! Anu sit nunädon oli...',
+'resetpass_bad_temporary'   => 'Letavöd nelaidüpik no lonöföl. Ba ya evotükol letavödi olik, u ba ya ebegol letavödi nelaidüpik nulik.',
+'resetpass_forbidden'       => 'Letavöds no kanons pavotükön',
+'resetpass-no-info'         => 'Mutol nunädön oli ad logön padi at nemediko.',
+'resetpass-submit-loggedin' => 'Votükön letavödi',
+'resetpass-wrong-oldpass'   => 'Letavöd (laidüpik u nelaidüpik) no lonöföl.
+Ba ya evotükol benosekiko letavödi olik, u ya ebegol benosekiko letavödi nelaidüpik nulik.',
+'resetpass-temp-password'   => 'Letavöd nelaidüpik:',
 
 # Edit page toolbar
 'bold_sample'     => 'Vödem bigik',
@@ -563,133 +580,166 @@ Kanol nedemön penedi at, üf jafam kala at binon pöl.',
 'hr_tip'          => 'Lien horitätik (no gebolös tu suvo)',
 
 # Edit pages
-'summary'                   => 'Plän brefik',
-'subject'                   => 'Subyet/tiäd',
-'minoredit'                 => 'Votükam pülik',
-'watchthis'                 => 'Galädolöd padi at',
-'savearticle'               => 'Dakipolöd padi',
-'preview'                   => 'Büologed',
-'showpreview'               => 'Jonolöd padalogoti',
-'showlivepreview'           => 'Büologed vifik',
-'showdiff'                  => 'Jonolöd votükamis',
-'anoneditwarning'           => "'''Nuned:''' No enunädol oli. Ladet-IP olik poregistaron su redakamajenotem pada at.",
-'missingsummary'            => "'''Noet:''' No epenol redakamipläni. If ovälol dönu knopi: Dakipolöd, redakam olik podakipon nen plän.",
-'missingcommenttext'        => 'Penolös, begö! küpeti dono.',
-'missingcommentheader'      => "'''Noet:''' No epenol yegädi/tiädi küpete at. If ovälol dönu knopi: Dakipolöd, redakam olik podakipon nen on.",
-'summary-preview'           => 'Büologed brefik',
-'subject-preview'           => 'Büologed yegäda/diläda',
-'blockedtitle'              => 'Geban peblokon',
-'blockedtext'               => "<big>'''Gebananam u ladet-IP olik(s) peblokon(s).'''</big>
-
-Blokam at pejenükon fa $1. Kod binon ''$2''.
+'summary'                          => 'Plän brefik:',
+'subject'                          => 'Subyet/tiäd:',
+'minoredit'                        => 'Votükam pülik',
+'watchthis'                        => 'Galädolöd padi at',
+'savearticle'                      => 'Dakipolöd padi',
+'preview'                          => 'Büologed',
+'showpreview'                      => 'Jonolöd padalogoti',
+'showlivepreview'                  => 'Büologed vifik',
+'showdiff'                         => 'Jonolöd votükamis',
+'anoneditwarning'                  => "'''Nuned:''' No enunädol oli. Ladet-IP olik poregistaron su redakamajenotem pada at.",
+'missingsummary'                   => "'''Noet:''' No epenol redakamipläni. If ovälol dönu knopi: Dakipolöd, redakam olik podakipon nen plän.",
+'missingcommenttext'               => 'Penolös, begö! küpeti dono.',
+'missingcommentheader'             => "'''Noet:''' No epenol yegädi/tiädi küpete at. If ovälol dönu knopi: Dakipolöd, redakam olik podakipon nen on.",
+'summary-preview'                  => 'Büologed brefik:',
+'subject-preview'                  => 'Büologed yegäda/diläda:',
+'blockedtitle'                     => 'Geban peblokon',
+'blockedtext'                      => "<big>'''Gebananam u ladet-IP olik(s) peblokon(s).'''</big>
+
+Blokam at pejenükon fa geban: $1. 
+Kod binon: ''$2''.
 
 * Prim blokama: $8
 * Fin blokama: $6
-* Geban desinik: $7
+* Geban pedesinöl: $7
 
-Kanol penön ele $1, u [[{{MediaWiki:Grouppage-sysop}}|guvanes]], ad bespikön blokami.
-Kanol gebön yümi: 'penön gebane at' bisä ladet leäktronik verätik lonöföl patuvon in [[Special:Preferences|buükams kala]] olik. Ladet-IP nuik ola binon $3 e nüm blokama binon #$5. Mäniotolös oni pö säks valik.",
-'autoblockedtext'           => "Ladet-IP olik peblokon itjäfidiko bi pägebon fa geban, kel peblokon fa geban: $1.
+Kanol penön gebane: $1, u [[{{MediaWiki:Grouppage-sysop}}|guvane]] votik, ad bespikön blokami.
+Kanol gebön yümi: 'penön gebane at' bisä ladet leäktronik verätik lonöföl patuvon in [[Special:Preferences|buükams kala]] olik e geb onik no peblokon. Ladet-IP nuik ola binon $3 e nüm blokama binon #$5. Mäniotolös nünis löpik valik in peneds ola.",
+'autoblockedtext'                  => "Ladet-IP olik peblokon itjäfidiko bi pägebon fa geban, kel peblokon fa geban: $1.
 Kod blokama äbinon:
 
 :''$2''
 
 * Prim bloküpa: $8
 * Fin bloküpa: $6
-
-Dalol penön gebane: $1 u balane [[{{MediaWiki:Grouppage-sysop}}|guvanas votik]] ad bespikön bloki at.
-
-Küpälolös, das no dalol gebön yümi: „penön gebane at“ if no labol ladet leäktronik lonöföl in [[Special:Preferences|büukams olik]] ed if geb onik fa ol no peblokon.
-
-Blokamanüm olik binon $5. Mäniotolös, begö! oni in peneds valik olik.",
-'blockednoreason'           => 'kod nonik pegivon',
-'blockedoriginalsource'     => "Fonät pada: '''$1''' pajonon dono:",
-'blockededitsource'         => "Vödem '''redakamas olik''' pada: '''$1''' pajonon dono:",
-'whitelistedittitle'        => 'Mutol nunädön oli ad redakön',
-'whitelistedittext'         => 'Mutol $1 ad redakön padis.',
-'confirmedittitle'          => 'Fümedam me pot leäktronik zesüdon ad redakön',
-'confirmedittext'           => 'Mutol fümedön ladeti leäktronik ola büä okanol redakön padis. Pladölos e lonöfükölos ladeti olik in [[Special:Preferences|buükams olik]].',
-'nosuchsectiontitle'        => 'Diläd at no dabinon',
-'nosuchsectiontext'         => 'Esteifülol ad redakön dilädi no dabinöli. Bi diläd: $1 no dabinon, redakam onik no kanon padakipön.',
-'loginreqtitle'             => 'Nunädam Paflagon',
-'loginreqlink'              => 'ninädolös obi',
-'loginreqpagetext'          => 'Mutol $1 ad logön padis votik.',
-'accmailtitle'              => 'Letavöd pesedon.',
-'accmailtext'               => 'Letavöd pro "$1" pasedon lü $2.',
-'newarticle'                => '(Nulik)',
-'newarticletext'            => "Esökol yümi lü pad, kel no nog dabinon.
+* Geban pedesinöl: $7
+
+Dalol penön gebane: $1 u balane [[{{MediaWiki:Grouppage-sysop}}|guvanas votik]] ad bespikön blokami at.
+
+Küpälolös, das no dalol gebön yümi: „penön gebane at“ if no labol ladeti leäktronik lonöföl in [[Special:Preferences|büukams olik]] ed if geb onik fa ol no peblokon.
+
+Ladet-IP olik binon $3, e nüm blokama at binon #$5. Mäniotolös nünis löpik valik in peneds valik ola.",
+'blockednoreason'                  => 'kod nonik pegivon',
+'blockedoriginalsource'            => "Fonät pada: '''$1''' pajonon dono:",
+'blockededitsource'                => "Vödem '''redakamas olik''' pada: '''$1''' pajonon dono:",
+'whitelistedittitle'               => 'Mutol nunädön oli ad redakön',
+'whitelistedittext'                => 'Mutol $1 ad redakön padis.',
+'confirmedittitle'                 => 'Fümedam me pot leäktronik zesüdon ad redakön',
+'confirmedittext'                  => 'Mutol fümedön ladeti leäktronik ola büä okanol redakön padis. Pladölos e lonöfükölos ladeti olik in [[Special:Preferences|buükams olik]].',
+'nosuchsectiontitle'               => 'Diläd at no dabinon',
+'nosuchsectiontext'                => 'Esteifülol ad redakön dilädi no dabinöli. Bi diläd: $1 no dabinon, redakam onik no kanon padakipön.',
+'loginreqtitle'                    => 'Nunädam Paflagon',
+'loginreqlink'                     => 'ninädolös obi',
+'loginreqpagetext'                 => 'Mutol $1 ad logön padis votik.',
+'accmailtitle'                     => 'Letavöd pesedon.',
+'accmailtext'                      => 'Letavöd pro "$1" pasedon lü $2.',
+'newarticle'                       => '(Nulik)',
+'newarticletext'                   => "Esökol yümi lü pad, kel no nog dabinon.
 Ad jafön padi at, primolös ad klavön vödemi olik in penaspad dono (logolöd [[{{MediaWiki:Helppage}}|yufapadi]] tefü nüns tefik votik).
 If binol is pölo, välolös knopi: '''geikön''' bevüresodatävöma olik.",
-'anontalkpagetext'          => "----''Bespikapad at duton lü geban nennemik, kel no nog ejafon kali, u no vilon labön u gebön oni. Sekü atos pemütobs ad gebön ladeti-IP ad dientifükön gebani at. Ladets-IP kanons pagebön fa gebans difik. If binol geban nennemik e cedol, das küpets netefik pelüodükons ole, [[Special:UserLogin|jafolös, begö! kali u nunädolös oli]] ad vitön kofudi ko gebans nennemik votik.''",
-'noarticletext'             => 'Atimo no dabinon vödem su pad at. Kanol [[Special:Search/{{PAGENAME}}|sukön padatiädi at]] su pads votik u [{{fullurl:{{FULLPAGENAME}}|action=edit}} redakön padi at].',
-'userpage-userdoesnotexist' => 'Gebanakal: "$1" no peregistaron. Fümükolös, va vilol jäfön/redakön padi at.',
-'clearyourcache'            => "'''Prudö!''' Pos dakip buükamas, mögos, das ozesüdos ad nedemön memi nelaidüpik bevüresodatävöma ad logön votükamis. '''Mozilla / Firefox / Safari:''' kipolöd klavi ''Shift'' dono e välolöd eli ''Reload'' (= dönulodön) me mugaparat, u dränolöd klävis ''Ctrl-Shift-R'' (''Cmd-Shift-R'' pö el Apple Mac); pro el '''IE:''' (Internet Explorer) kipolöd klavi ''Ctrl'' dono e välolöd eli ''Refresh'' (= flifädükön) me mugaparat, u dränolöd klavis ''Ctrl-F5''; '''Konqueror:''' välolöd eli ''Reload'' (= dönulodön) me mugaparat, u dränolöd klavi ''F5''; gebans ela '''Opera''' ba nedons vagükön lölöfiko memi nelaidüpik me ''Tools→Preferences'' (Stumem->Buükams).",
-'usercssjsyoucanpreview'    => '<strong>Mob:</strong> Välolös eli „Jonön büologedi“ ad blufön eli CSS/JS nulik olik bü dakip.',
-'usercsspreview'            => "'''Memolös, das anu te büologol eli CSS olik.'''
+'anontalkpagetext'                 => "----''Bespikapad at duton lü geban nennemik, kel no nog ejafon kali, u no vilon labön u gebön oni. Sekü atos pemütobs ad gebön ladeti-IP ad dientifükön gebani at. Ladets-IP kanons pagebön fa gebans difik. If binol geban nennemik e cedol, das küpets netefik pelüodükons ole, [[Special:UserLogin|jafolös, begö! kali]], u [[Special:UserLogin|nunädolös oli]] ad vitön kofudi ko gebans nennemik votik.''",
+'noarticletext'                    => 'Atimo no dabinon vödem su pad at.
+Kanol [[Special:Search/{{PAGENAME}}|sukön padatiädi at]] su pads votik u [{{fullurl:{{FULLPAGENAME}}|action=edit}} redakön padi at].',
+'userpage-userdoesnotexist'        => 'Gebanakal: "$1" no peregistaron. Fümükolös, va vilol jäfön/redakön padi at.',
+'clearyourcache'                   => "'''Prudö!''' Pos dakip buükamas, mögos, das ozesüdos ad nedemön memi nelaidüpik bevüresodatävöma ad logön votükamis. 
+'''Mozilla / Firefox / Safari:''' kipolöd klavi: ''Shift'' dono e välolöd eli ''Reload'' (= dönulodön) me mugaparat, u dränolöd klävis: ''Ctrl-F5'' u ''Ctrl-R'' (''Command-R'' if labol eli Macintosh);
+'''Konqueror:''' välolöd eli ''Reload'' (= dönulodön) me mugaparat, u dränolöd klavi: ''F5'';
+'''Opera:''' vagükolöd lölöfiko memi nelaidüpik me ''Tools → Preferences'' (Stumem → Buükams).
+'''Internet Explorer:''' kipolöd klavi: ''Ctrl'' dono e välolöd eli ''Refresh'' (= flifädükön) me mugaparat, u dränolöd klavis: ''Ctrl-F5''.",
+'usercssjsyoucanpreview'           => "'''Mob:''' Välolös eli „Jonön büologedi“ ad blufön eli CSS/JS nulik olik bü dakip.",
+'usercsspreview'                   => "'''Memolös, das anu te büologol eli CSS olik.'''
 '''No nog pedakipon!'''",
-'userjspreview'             => "'''Memolös, das anu te blufol/büologol eli JavaScript olik, no nog pedakipon!'''",
-'userinvalidcssjstitle'     => "'''Nuned:''' No dabinon fomät: \"\$1\".
+'userjspreview'                    => "'''Memolös, das anu te blufol/büologol eli JavaScript olik, no nog pedakipon!'''",
+'userinvalidcssjstitle'            => "'''Nuned:''' No dabinon fomät: \"\$1\".
 Memolös, das pads: .css e .js mutons labön tiädi minudik: {{ns:user}}:Foo/monobook.css, no {{ns:user}}:Foo/Monobook.css.",
-'updated'                   => '(peatimükon)',
-'note'                      => '<strong>Penet:</strong>',
-'previewnote'               => '<strong>Is pajonon te büologed; votükams no nog pedakipons!</strong>',
-'previewconflict'           => 'Büologed at jonon vödemi in redakamaspad löpik soäsä opubon if odakipol oni.',
-'session_fail_preview'      => '<strong>Pidö! No emögos ad lasumön votükamis olik kodü per redakamanünas.<br />Steifülolös dönu. If no oplöpol, tän senunädolös e genunädolös oli, e steifülolös nogna.</strong>',
-'session_fail_preview_html' => "<strong>Liedo no eplöpos ad zepön redakami olik kodü per nünodas.</strong>
+'updated'                          => '(peatimükon)',
+'note'                             => "'''Penet:'''",
+'previewnote'                      => "'''Is pajonon te büologed; votükams no nog pedakipons!'''",
+'previewconflict'                  => 'Büologed at jonon vödemi in redakamaspad löpik soäsä opubon if odakipol oni.',
+'session_fail_preview'             => "'''Pidö! No emögos ad lasumön votükamis olik kodü per redakamanünodas.<br />Steifülolös dönu. If no oplöpol, tän senunädolös e genunädolös oli, e steifülolös nogna.'''",
+'session_fail_preview_html'        => "'''Liedo no eplöpos ad zepön redakami olik kodü per nünodas.'''
 
 ''Bi {{SITENAME}} emogükon gebi kota: HTML krüdik, büologed peklänedon as jel ta tataks me el JavaScript.
 
-<strong>If evilol dunön redakami legik, steifülolös dönu. If no jäfidon, senunädolös oli e nunädolös oli dönu.</strong>",
-'editing'                   => 'Redakam pada: $1',
-'editingsection'            => 'Redakam pada: $1 (diläd)',
-'editingcomment'            => 'Redakam pada: $1 (küpet)',
-'editconflict'              => 'Redakamakonflit: $1',
-'explainconflict'           => 'Ek evotükon padi at sisä äprimol ad redakön oni. Vödem balid jonon padi soäsä dabinon anu. Votükams olik pajonons in vödem telid. Sludolös, vio fomams tel at mutons pabalön. Kanol kopiedön se vödem telid ini balid.
+'''If evilol dunön redakami legik, steifülolös dönu. If no jäfidon, senunädolös oli e nunädolös oli dönu.'''",
+'token_suffix_mismatch'            => "'''Redakam olik no peläsumon bi dünanünöm olik ädädükon malülis redakama at.
+Redakam perefudon ad vitön dädükami padavödema.
+Atos jenon ömna ven geboy düni pladulöma nennemik bevüresodik säkädik.'''",
+'editing'                          => 'Redakam pada: $1',
+'editingsection'                   => 'Redakam pada: $1 (diläd)',
+'editingcomment'                   => 'Redakam pada: $1 (diläd nulik)',
+'editconflict'                     => 'Redakamakonflit: $1',
+'explainconflict'                  => 'Ek evotükon padi at sisä äprimol ad redakön oni. Vödem balid jonon padi soäsä dabinon anu. Votükams olik pajonons in vödem telid. Sludolös, vio fomams tel at mutons pabalön. Kanol kopiedön se vödem telid ini balid.
 <b>Te vödem balid podakipon!</b><br />',
-'yourtext'                  => 'Vödem olik',
-'storedversion'             => 'Fomam pedakipöl',
-'nonunicodebrowser'         => '<strong>NÜNED: Bevüresodatävöm olik no kanon gebön eli Unicode.
-Ad dälön ole ad redakön padis, malats no-ASCII opubons in redakamabog as kots degmälnumatik.</strong>',
-'editingold'                => '<strong>NUNED: Anu redakol fomami büik pada at. If dakipol oni, votükams posik onepubons.</strong>',
-'yourdiff'                  => 'Difs',
-'copyrightwarning'          => 'Demolös, das keblünots valik lü Vükiped padasumons ma el $2 (logolöd eli $1 tefü notets). If no vilol, das vödems olik poredakons nenmisero e poseagivons ma vil alana, tän no pladolös oni isio.<br />
+'yourtext'                         => 'Vödem olik',
+'storedversion'                    => 'Fomam pedakipöl',
+'nonunicodebrowser'                => "'''NÜNED: Bevüresodatävöm olik no kanon gebön eli Unicode.
+Ad dälön ole ad redakön padis, malats no-ASCII opubons in redakamabog as kots degmälnumatik.'''",
+'editingold'                       => "'''NUNED: Anu redakol fomami büik pada at. If dakipol oni, votükams posik onepubons.'''",
+'yourdiff'                         => 'Difs',
+'copyrightwarning'                 => "Demolös, das keblünots valik lü Vükiped padasumons ma el $2 (logolöd eli $1 tefü notets). If no vilol, das vödems olik poredakons nenmisero e poseagivons ma vil alana, tän no pladolös oni isio.<br />
 Garanol obes, das ol it epenol atosi, u das ekopiedol atosi se räyun notidik u se fon libik sümik.<br />
-<strong>NO PLADOLÖD ISIO NEN DÄL LAUTANA VÖDEMIS LABÜ KOPIEDAGITÄT!</strong>',
-'copyrightwarning2'         => 'Demolös, das keblünots valik lü {{SITENAME}} padasumons ma el $2 (logolöd eli $1 tefü notets).
-If no vilol, das vödems olik poredakons nenmisero e poseagivons ma vil alana, tän no pladolös onis isio.<br />
-Garanol obes, das ol it epenol atosi, u das ekopiedol atosi se räyun notidik u se fon libik sümik (logolös $1 pro notets).
-<strong>NO PLADOLÖD ISIO NEN DÄL LAUTANA VÖDEMIS LABÜ KOPIEDAGITÄT!</strong>',
-'longpagewarning'           => '<strong>NUNED: Pad at labon lunoti miljölätas $1;
+'''NO PLADOLÖD ISIO NEN DÄL LAUTANA VÖDEMIS LABÜ KOPIEDAGITÄT!'''",
+'copyrightwarning2'                => "Demolös, das keblünots valik lü {{SITENAME}} dalons paredakön, pavotükön, u pamoükön fa keblünans votik.
+If no vilol, das vödems olik poredakons nenmisero, tän no pladolös onis isio.<br />
+Garanol obes, das ol it epenol atosi, u das ekopiedol atosi se räyun notidik u se fon libik sümik (logolös eli $1 pro notets).
+
+'''NO PLADOLÖD ISIO NEN DÄL LAUTANA VÖDEMIS LABÜ KOPIEDAGITÄT!'''",
+'longpagewarning'                  => "'''NUNED: Pad at labon lunoti miljölätas $1;
 bevüresodatävöms anik ba no fägons ad redakön nendsäkädo padis lunotü miljölats plu 32.
-Betikolös dilami pada at ad pads smalikum.</strong>',
-'longpageerror'             => '<strong>PÖL: Vödem fa ol pesedöl labon lunoti miljölätas $1, kelos pluon leigodü völad muik pedälöl miljölätas $2. No kanon padakipön.</strong>',
-'readonlywarning'           => '<strong>NUNED: Vük pefärmükon kodü kodididazesüd. No kanol dakipön votükamis olik anu. Kopiedolös vödemi nulik ini program votik e dakipolös oni in nünöm olik. Poso okanol dönu steifülön ad pladön oni isio.</strong>',
-'protectedpagewarning'      => '<strong>NUNED: Pad at pejelon, dat te gebans labü guvanagitäts kanons redakön oni.</strong>',
-'semiprotectedpagewarning'  => "'''Noet:''' Pad at pefärmükon. Te gebans peregistaröl kanons redakön oni.",
-'cascadeprotectedwarning'   => "'''Nuned:''' Pad at pefärmükon löko (te guvans dalons redakön oni) bi binon dil {{PLURAL:$1|pada|padas}} sököl, me sökodajel {{PLURAL:$1|pejelöla|pejelölas}}:",
-'titleprotectedwarning'     => '<strong>NUNED: Pad at pejelon, dat te gebans anik kanons jafön oni.</strong>',
-'templatesused'             => 'Samafomots su pad at pegeböls:',
-'templatesusedpreview'      => 'Samafomots in büologed at pageböls:',
-'templatesusedsection'      => 'Samafomots in diläd at pageböls:',
-'template-protected'        => '(pejelon)',
-'template-semiprotected'    => '(dilo pejelon)',
-'hiddencategories'          => 'Pad at duton lü {{PLURAL:$1|klad peklänedöl 1|klads peklänedöl $1}}:',
-'nocreatetitle'             => 'Padijafam pemiedükon',
-'nocreatetext'              => '{{SITENAME}} emiedükon mögi ad jafön padis nulik.
+Betikolös dilami pada at ad pads smalikum.'''",
+'longpageerror'                    => "'''PÖL: Vödem fa ol pesedöl labon lunoti miljölätas $1, kelos pluon leigodü völad muik pedälöl miljölätas $2. No kanon padakipön.'''",
+'readonlywarning'                  => "'''NUNED: Vük pefärmükon kodü kodididazesüd. No kanol dakipön votükamis olik anu. Kopiedolös vödemi nulik ini program votik e dakipolös oni in nünöm olik. Poso okanol dönu steifülön ad pladön oni isio.'''
+
+Geban, kel efärmükon oni, egevon kodi at: $1",
+'protectedpagewarning'             => "'''NUNED: Pad at pejelon, dat te gebans labü guvanagitäts kanons redakön oni.'''",
+'semiprotectedpagewarning'         => "'''Noet:''' Pad at pefärmükon. Te gebans peregistaröl kanons redakön oni.",
+'cascadeprotectedwarning'          => "'''Nuned:''' Pad at pefärmükon löko (te guvans dalons redakön oni) bi binon dil {{PLURAL:$1|pada|padas}} sököl, me sökodajel {{PLURAL:$1|pejelöla|pejelölas}}:",
+'titleprotectedwarning'            => "'''NUNED: Pad at pejelon, dat te gebans anik kanons jafön oni.'''",
+'templatesused'                    => 'Samafomots su pad at pegeböls:',
+'templatesusedpreview'             => 'Samafomots in büologed at pageböls:',
+'templatesusedsection'             => 'Samafomots in diläd at pageböls:',
+'template-protected'               => '(pejelon)',
+'template-semiprotected'           => '(dilo pejelon)',
+'hiddencategories'                 => 'Pad at duton lü {{PLURAL:$1|klad peklänedöl 1|klads peklänedöl $1}}:',
+'nocreatetitle'                    => 'Padijafam pemiedükon',
+'nocreatetext'                     => '{{SITENAME}} emiedükon mögi ad jafön padis nulik.
 Kanol redakön padi dabinöl, u [[Special:UserLogin|nunädön oli u jafön kali]].',
-'nocreate-loggedin'         => 'No dalol jafön padis nulik.',
-'permissionserrors'         => 'Dälapöls',
-'permissionserrorstext'     => 'No dalol dunön atosi sekü {{PLURAL:$1|kod|kods}} sököl:',
-'recreate-deleted-warn'     => "'''NUNED: Dönujafol padi pemoüköl.'''
+'nocreate-loggedin'                => 'No dalol jafön padis nulik.',
+'permissionserrors'                => 'Dälapöls',
+'permissionserrorstext'            => 'No dalol dunön atosi sekü {{PLURAL:$1|kod|kods}} sököl:',
+'permissionserrorstext-withaction' => 'No dalol $2, sekü {{PLURAL:$1|kod|kods}} sököl:',
+'recreate-deleted-warn'            => "'''NUNED: Dönujafol padi pemoüköl.'''
 
 Vätälolös, va binos pötik ad lairedakön padi at.
 Jenotalised moükama pada at pajonon is as yuf.",
+'deleted-notice'                   => 'Pad at pemoükon.
+Moükamajenotem pada at palisedon dono.',
+'deletelog-fulllog'                => 'Logön jenotemalisedi lölik',
+'edit-hook-aborted'                => 'Redakam pestöpädon fa huköm.
+No enunon kodi.',
+'edit-gone-missing'                => 'No eplöpos ad votükön padi.
+Jiniko pemoükon.',
+'edit-conflict'                    => 'Redakamakonflit.',
+'edit-no-change'                   => 'Redakam olik penedemon, bi vödemivotükams nonik pedunons.',
+'edit-already-exists'              => 'No kanoy jafön padi nulik.
+On ya dabinon.',
 
 # Parser/template warnings
-'expensive-parserfunction-warning'  => 'Nuned: pad at vokon „parser“-sekätis tusuvo.
-
-Muton labön vokis läs $2, ab labon anu vokis $1.',
-'expensive-parserfunction-category' => 'Pads, kels vokons tusuvo „parser“-sekätis jerik',
+'expensive-parserfunction-warning'        => 'Nuned: Pad at vokon „parser“-sekätis tusuvo.
+
+Muton labön {{PLURAL:$2|voki|vokis}} läs $2, ab labon anu {{PLURAL:$1|voki|vokis}} $1.',
+'expensive-parserfunction-category'       => 'Pads, kels vokons tusuvo „parser“-sekätis jerik',
+'post-expand-template-inclusion-warning'  => 'Nuned: Gretot samafomotas ninükabik binon tuik.
+Samafomots anik no poninükons.',
+'post-expand-template-inclusion-category' => 'Pads, pö kels gretot samafomotas peninüköl pluon lä maxum.',
+'post-expand-template-argument-warning'   => 'Nuned: Pad at ninädon samafomotaparameti pu bali labü stäänükamagretot tuik.
+Paramet(s) at pemoädon(s).',
+'post-expand-template-argument-category'  => 'Pads labü samafomotaparamets pemoädöl',
+'parser-template-loop-warning'            => 'Samafomotasnal petuvon: [[$1]]',
+'parser-template-recursion-depth-warning' => 'Okvoknivod maxumik samafomotas ya pereivon ($1)',
 
 # "Undo" feature
 'undo-success' => 'Redakam at kanon pasädunön. Reidolös leigodi dono ad fümükön, va vilol vo dunön atosi, e poso dakipolös votükamis ad fisädunön redakami.',
@@ -704,29 +754,29 @@ Muton labön vokis läs $2, ab labon anu vokis $1.',
 Kod blokama fa el $3 pegivöl binon ''$2''",
 
 # History pages
-'viewpagelogs'        => 'Jonön jenotalisedis pada at',
-'nohistory'           => 'Pad at no labon redakamajenotemi.',
-'revnotfound'         => 'Fomam no petuvon',
-'revnotfoundtext'     => 'Padafomam büik fa ol peflagöl no petuvon. Kontrololös, begö! ladeti-URL, keli egebol ad logön padi at.',
-'currentrev'          => 'Fomam anuik',
-'revisionasof'        => 'Fomam dätü $1',
-'revision-info'       => 'Fomam timü $1 fa el $2',
-'previousrevision'    => '�Fomam vönedikum',
-'nextrevision'        => 'Fomam nulikum→',
-'currentrevisionlink' => 'Fomam anuik',
-'cur'                 => 'nuik',
-'next'                => 'sököl',
-'last'                => 'lätik',
-'page_first'          => 'balid',
-'page_last'           => 'lätik',
-'histlegend'          => 'Difiväl: välolös fomamis ad paleigodön e gebolös klavi: "Enter" u knopi dono.<br />
+'viewpagelogs'           => 'Jonön jenotalisedis pada at',
+'nohistory'              => 'Pad at no labon redakamajenotemi.',
+'currentrev'             => 'Fomam anuik',
+'currentrev-asof'        => 'Fomam nuik tü $1',
+'revisionasof'           => 'Fomam dätü $1',
+'revision-info'          => 'Fomam timü $1 fa el $2', # Additionally available: $3: revision id
+'previousrevision'       => '�Fomam vönedikum',
+'nextrevision'           => 'Fomam nulikum→',
+'currentrevisionlink'    => 'Fomam anuik',
+'cur'                    => 'nuik',
+'next'                   => 'sököl',
+'last'                   => 'lätik',
+'page_first'             => 'balid',
+'page_last'              => 'lätik',
+'histlegend'             => 'Difiväl: välolös fomamis ad paleigodön e gebolös klavi: "Enter" u knopi dono.<br />
 Plän: (anuik) = dif tefü fomam anuik,
 (lätik) = dif tefü fomam büik, p = redakam pülik.',
-'deletedrev'          => '[pemoüköl]',
-'histfirst'           => 'Balid',
-'histlast'            => 'Lätik',
-'historysize'         => '({{PLURAL:$1|jölät 1|jöläts $1}})',
-'historyempty'        => '(vagik)',
+'history-fieldset-title' => 'Logamajenotem',
+'deletedrev'             => '[pemoüköl]',
+'histfirst'              => 'Balid',
+'histlast'               => 'Lätik',
+'historysize'            => '({{PLURAL:$1|jölät 1|jöläts $1}})',
+'historyempty'           => '(vagik)',
 
 # Revision feed
 'history-feed-title'          => 'Revidajenotem',
@@ -745,7 +795,7 @@ Padafomam at pemoükon se ragivs notidik.
 Pats tefik ba patuvons in [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} jenotalised moükamas].</div>',
 'rev-deleted-text-view'       => '<div class="mw-warning plainlinks">
 Padafomam at pemoükon se registar notidik. As guvan in {{SITENAME}}, kanol logön oni. Pats tefik ba binons in  [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} jenotalised moükamas].</div>',
-'rev-delundel'                => 'jonolöd/klänedolöd',
+'rev-delundel'                => 'jonön/klänedön',
 'revisiondelete'              => 'Moükön/sädunön moükami fomamas',
 'revdelete-nooldid-title'     => 'Zeilafomam no lonöfon',
 'revdelete-nooldid-text'      => 'U no elevälol zeilafomami(s) pro dun at, u fomam pelevälöl no dabinon, u steifülol ad klänedön fomami anuik.',
@@ -806,6 +856,7 @@ Kontrololös, va votükam at okipon fovöfi padajenotema.',
 'mergehistory-invalid-destination' => 'Zeilapad muton labön tiädi lonöföl.',
 'mergehistory-autocomment'         => 'Pad: [[:$1]] peninükon ini pad: [[:$2]].',
 'mergehistory-comment'             => 'Pad: [[:$1]] peninükon ini pad: [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Fonäta- e zeilapad no dalons binön pad ot.',
 
 # Merge log
 'mergelog'           => 'Jenotalised padibalamas',
@@ -818,115 +869,202 @@ Kontrololös, va votükam at okipon fovöfi padajenotema.',
 'difference'              => '(dif vü revids)',
 'lineno'                  => 'Lien $1:',
 'compareselectedversions' => 'Leigodolöd fomamis pevälöl',
+'visualcomparison'        => 'Leigodam ma logot',
+'wikicodecomparison'      => 'Leigodam ma vödem vükik',
 'editundo'                => 'sädunön',
 'diff-multi'              => '({{PLURAL:$1|Revid vüik bal no pejonon|Revids vüik $1 no pejonons}}.)',
+'diff-movedto'            => 'petopätükon lü $1',
+'diff-styleadded'         => 'stül: $1 peläükon',
+'diff-added'              => '$1 peläükon',
+'diff-changedto'          => 'pevotükon ad $1',
+'diff-movedoutof'         => 'petopätükon se $1',
+'diff-styleremoved'       => 'stül: $1 pemoükon',
+'diff-removed'            => '$1 pemoükon',
+'diff-changedfrom'        => 'pevotükon se $1',
+'diff-src'                => 'fonät',
+'diff-withdestination'    => 'ko zeil: $1',
+'diff-with'               => '&#32;ko $1 $2',
+'diff-with-final'         => '&#32;e $1 $2',
+'diff-width'              => 'vidot',
+'diff-height'             => 'geilot',
+'diff-p'                  => "'''bagaf'''",
+'diff-blockquote'         => "'''saitot'''",
+'diff-h1'                 => "'''suspenäd (nivod: 1)'''",
+'diff-h2'                 => "'''suspenäd (nivod: 2)'''",
+'diff-h3'                 => "a '''suspenäd (nivod: 3)'''",
+'diff-h4'                 => "'''suspenäd (nivod: 4)'''",
+'diff-h5'                 => "'''suspenäd (nivod: 5)'''",
+'diff-pre'                => "'''vödemadilod pebüofomätüköl'''",
+'diff-div'                => "'''teil'''",
+'diff-ul'                 => "'''lised no peleodüköl'''",
+'diff-ol'                 => "'''lised peleodüköl'''",
+'diff-li'                 => "'''lisedabinet'''",
+'diff-table'              => "'''taib'''",
+'diff-tbody'              => "'''taibaninäd'''",
+'diff-tr'                 => "'''ked'''",
+'diff-td'                 => "'''ziöb'''",
+'diff-th'                 => "'''tiäd'''",
+'diff-br'                 => "'''lienabreik'''",
+'diff-hr'                 => "'''lien horitätik'''",
+'diff-code'               => "'''vödemadilod binü programakot'''",
+'diff-dl'                 => "'''miedetalised'''",
+'diff-dt'                 => "'''miedetanotod'''",
+'diff-dd'                 => "'''miedet'''",
+'diff-input'              => "'''fometafel'''",
+'diff-form'               => "'''fomet'''",
+'diff-img'                => "'''magod'''",
+'diff-span'               => "'''stäänöp'''",
+'diff-a'                  => "'''yüm'''",
+'diff-i'                  => "'''korsivik'''",
+'diff-b'                  => "'''bigik'''",
+'diff-strong'             => "'''nämöfik'''",
+'diff-em'                 => "'''kazet'''",
+'diff-font'               => "'''penät'''",
+'diff-big'                => "'''gretik'''",
+'diff-del'                => "'''pemoükon'''",
+'diff-tt'                 => "'''vidot nevotükovik'''",
+'diff-sub'                => "'''pedonopenöl'''",
+'diff-sup'                => "'''pelöpopenöl'''",
+'diff-strike'             => "'''peduliunöl'''",
 
 # Search results
-'searchresults'             => 'Sukaseks',
-'searchresulttext'          => 'Ad lärnön mödikumosi dö suks in {{SITENAME}}, logolös [[{{MediaWiki:Helppage}}|Suks in {{SITENAME}}]].',
-'searchsubtitle'            => "Esukol padi: '''[[:$1]]'''",
-'searchsubtitleinvalid'     => "Esukol padi: '''$1'''",
-'noexactmatch'              => "'''No dabinon pad tiädü \"\$1\".''' Kanol [[:\$1|jafön oni]].",
-'noexactmatch-nocreate'     => "'''No dabinon pad tiädü \"\$1\".'''",
-'toomanymatches'            => 'Pads tu mödiks labü vöd(s) pesuköl petuvons. Sukolös vödi(s) votik.',
-'titlematches'              => 'Leigon ko padatiäd',
-'notitlematches'            => 'Leigon ko padatiäds nonik',
-'textmatches'               => 'Leigon ko dil padavödema',
-'notextmatches'             => 'Leigon ko nos in padavödem',
-'prevn'                     => 'büik $1',
-'nextn'                     => 'sököl $1',
-'viewprevnext'              => 'Logön padis ($1) ($2) ($3).',
-'search-result-size'        => '$1 ({{PLURAL:$2|vöd 1|vöds $2}})',
-'search-result-score'       => 'Demäd: $1%',
-'search-redirect'           => '(lüodüköm: $1)',
-'search-section'            => '(diläd: $1)',
-'search-suggest'            => 'Ediseinol-li: $1 ?',
-'search-interwiki-caption'  => 'Svistaproyegs',
-'search-interwiki-default'  => 'Seks se $1:',
-'search-interwiki-more'     => '(pluikos)',
-'search-mwsuggest-enabled'  => 'sa mobs',
-'search-mwsuggest-disabled' => 'nen mobs',
-'search-relatedarticle'     => 'Tefik',
-'mwsuggest-disable'         => 'Nemögükön mobis ela AJAX',
-'searchrelated'             => 'tefik',
-'searchall'                 => 'valik',
-'showingresults'            => "Pajonons dono jü {{PLURAL:$1|sukasek '''1'''|sukaseks '''$1'''}}, primölo me nüm #'''$2'''.",
-'showingresultsnum'         => "Dono pajonons {{PLURAL:$3:|sek '''1'''|seks '''$3'''}}, primölo me nüm: '''$2'''.",
-'showingresultstotal'       => "Is palisedons {{PLURAL:$3|sukasek nüm: '''$1''' se '''$3'''|sukaseks nüm: '''$1 - $2''' se '''$3'''}}",
-'nonefound'                 => "'''Noet''': Suks no benosekiks suvo pakodons dub steifüls ad tuvön vödis suvik äs „binon“ u „at“, tefü kels komataibs no padunons, u dub suk vöda plu bala. Te pads labü vöds pasuköl valiks polisedons.",
-'powersearch'               => 'Suk',
-'powersearch-legend'        => 'Suk komplitikum',
-'search-external'           => 'Suk plödik',
-'searchdisabled'            => 'Suk in {{SITENAME}} penemogükon. Vütimo kanol sukön yufü el Google. Demolös, das liseds onik tefü ninäd in {{SITENAME}} ba no binon anuik.',
+'searchresults'                    => 'Sukaseks',
+'searchresults-title'              => 'Sukaseks pro: "$1"',
+'searchresulttext'                 => 'Ad lärnön mödikumosi dö suks in {{SITENAME}}, logolös [[{{MediaWiki:Helppage}}|Suks in {{SITENAME}}]].',
+'searchsubtitle'                   => "Esukol padi: '''[[:$1]]'''",
+'searchsubtitleinvalid'            => "Esukol padi: '''$1'''",
+'noexactmatch'                     => "'''No dabinon pad tiädü \"\$1\".''' Kanol [[:\$1|jafön oni]].",
+'noexactmatch-nocreate'            => "'''No dabinon pad tiädü \"\$1\".'''",
+'toomanymatches'                   => 'Pads tu mödiks labü vöd(s) pesuköl petuvons. Sukolös vödi(s) votik.',
+'titlematches'                     => 'Leigon ko padatiäd',
+'notitlematches'                   => 'Leigon ko padatiäds nonik',
+'textmatches'                      => 'Leigon ko dil padavödema',
+'notextmatches'                    => 'Leigon ko nos in padavödem',
+'prevn'                            => 'büik $1',
+'nextn'                            => 'sököl $1',
+'viewprevnext'                     => 'Logön padis ($1) ($2) ($3).',
+'searchmenu-legend'                => 'Sukaparamets',
+'searchmenu-exists'                => "'''Dabinon pad labü nem: \"[[:\$1]]\" su vük at'''",
+'searchmenu-new'                   => "'''Jafön padi: \"[[:\$1]]\" su vük at!'''",
+'searchhelp-url'                   => 'Help:Ninäd',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Logön padis labü foyümot at]]',
+'searchprofile-articles'           => 'Pads ninädilabik',
+'searchprofile-articles-and-proj'  => 'Pads ninädilabik e proyegapads',
+'searchprofile-project'            => 'Proyegapads',
+'searchprofile-images'             => 'Ragivs',
+'searchprofile-everything'         => 'Valikos',
+'searchprofile-advanced'           => 'Paramets pluik',
+'searchprofile-articles-tooltip'   => 'Sukön in $1',
+'searchprofile-project-tooltip'    => 'Sukön in $1',
+'searchprofile-images-tooltip'     => 'Sukön ragivis',
+'searchprofile-everything-tooltip' => 'Sukön in ninäd lölik (keninükamü bespikapads)',
+'searchprofile-advanced-tooltip'   => 'Sukön in nemaspads patik',
+'prefs-search-nsdefault'           => 'Sukön gebölo parametemi kösömik:',
+'prefs-search-nscustom'            => 'Sukön in nemaspads patik:',
+'search-result-size'               => '$1 ({{PLURAL:$2|vöd 1|vöds $2}})',
+'search-result-score'              => 'Demäd: $1%',
+'search-redirect'                  => '(lüodüköm: $1)',
+'search-section'                   => '(diläd: $1)',
+'search-suggest'                   => 'Ediseinol-li: $1 ?',
+'search-interwiki-caption'         => 'Svistaproyegs',
+'search-interwiki-default'         => 'Seks se $1:',
+'search-interwiki-more'            => '(pluikos)',
+'search-mwsuggest-enabled'         => 'sa mobs',
+'search-mwsuggest-disabled'        => 'nen mobs',
+'search-relatedarticle'            => 'Tefik',
+'mwsuggest-disable'                => 'Nemögükön mobis ela AJAX',
+'searchrelated'                    => 'tefik',
+'searchall'                        => 'valik',
+'showingresults'                   => "Pajonons dono jü {{PLURAL:$1|sukasek '''1'''|sukaseks '''$1'''}}, primölo me nüm #'''$2'''.",
+'showingresultsnum'                => "Dono pajonons {{PLURAL:$3:|sek '''1'''|seks '''$3'''}}, primölo me nüm: '''$2'''.",
+'showingresultstotal'              => "Is palisedons {{PLURAL:$4|sukasek nüm: '''$1''' se '''$3'''|sukaseks nüm: '''$1 - $2''' se '''$3'''}}",
+'nonefound'                        => "'''Noet''': Suks jenons nomiko in nemaspads te aniks. Ad demön nemaspadis valik (keninükamü bespikapads, samafomots e r.), gebolös foyümoti: ''all:'', u nemaspadi pevilöl as foyümot.",
+'search-nonefound'                 => 'Sukaseks nonik dabinons.',
+'powersearch'                      => 'Suk',
+'powersearch-legend'               => 'Suk komplitikum',
+'powersearch-ns'                   => 'Sukön in nemaspads:',
+'powersearch-redir'                => 'Lisedön lüodükömis',
+'powersearch-field'                => 'Sukön',
+'search-external'                  => 'Suk plödik',
+'searchdisabled'                   => 'Suk in {{SITENAME}} penemogükon. Vütimo kanol sukön yufü el Google. Demolös, das liseds onik tefü ninäd in {{SITENAME}} ba no binon anuik.',
 
 # Preferences page
-'preferences'              => 'Buükams',
-'mypreferences'            => 'Buükams obik',
-'prefs-edits'              => 'Num redakamas:',
-'prefsnologin'             => 'No enunädon oki',
-'prefsnologintext'         => 'Nedol <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} nunädön oli]</span> büä kanol votükön gebanabuükamis.',
-'prefsreset'               => 'Buükams egekömons ad stad büik peregistaröl.',
-'qbsettings'               => 'Stumem',
-'qbsettings-none'          => 'Nonik',
-'qbsettings-fixedleft'     => 'nedeto (fimiko)',
-'qbsettings-fixedright'    => 'Deto (fimiko)',
-'qbsettings-floatingleft'  => 'nedeto (vebölo)',
-'qbsettings-floatingright' => 'deto (vebölo)',
-'changepassword'           => 'Votükön letavödi',
-'skin'                     => 'Fomät',
-'math'                     => 'Logot formülas',
-'dateformat'               => 'Dätafomät',
-'datedefault'              => 'Buükam nonik',
-'datetime'                 => 'Dät e Tim',
-'math_failure'             => 'Diletam fomüla no eplöpon',
-'math_unknown_error'       => 'pök nesevädik',
-'math_unknown_function'    => 'dun nesevädik',
-'math_lexing_error'        => 'vödidiletam no eplöpon',
-'math_syntax_error'        => 'süntagapöl',
-'math_image_error'         => 'Feajafam ela PNG no eplöpon;
+'preferences'               => 'Buükams',
+'mypreferences'             => 'Buükams obik',
+'prefs-edits'               => 'Num redakamas:',
+'prefsnologin'              => 'No enunädon oki',
+'prefsnologintext'          => 'Nedol <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} nunädön oli]</span> büä kanol votükön gebanabuükamis.',
+'prefsreset'                => 'Buükams egekömons ad stad büik peregistaröl.',
+'qbsettings'                => 'Stumem',
+'qbsettings-none'           => 'Nonik',
+'qbsettings-fixedleft'      => 'nedeto (fimiko)',
+'qbsettings-fixedright'     => 'Deto (fimiko)',
+'qbsettings-floatingleft'   => 'nedeto (vebölo)',
+'qbsettings-floatingright'  => 'deto (vebölo)',
+'changepassword'            => 'Votükön letavödi',
+'skin'                      => 'Fomät',
+'skin-preview'              => 'Büologed',
+'math'                      => 'Logot formülas',
+'dateformat'                => 'Dätafomät',
+'datedefault'               => 'Buükam nonik',
+'datetime'                  => 'Dät e Tim',
+'math_failure'              => 'Diletam fomüla no eplöpon',
+'math_unknown_error'        => 'pök nesevädik',
+'math_unknown_function'     => 'dun nesevädik',
+'math_lexing_error'         => 'vödidiletam no eplöpon',
+'math_syntax_error'         => 'süntagapöl',
+'math_image_error'          => 'Feajafam ela PNG no eplöpon;
 vestigolös stitami verätik ela latex, ela dvips, ela gs, e feajafön',
-'math_bad_tmpdir'          => 'No mögos ad penön ini / jafön ragiviär(i) matematik nelaidüpik.',
-'math_bad_output'          => 'No mögos ad penön ini / jafön ragiviär(i) matematik labü seks',
-'prefs-personal'           => 'Gebananüns',
-'prefs-rc'                 => 'Votükams nulik',
-'prefs-watchlist'          => 'Galädalised',
-'prefs-watchlist-days'     => 'Num delas ad pajonön in galädalised:',
-'prefs-watchlist-edits'    => 'Num redakamas ad pajonön in galädalised pestäänüköl:',
-'prefs-misc'               => 'Votikos',
-'saveprefs'                => 'Dakipolöd',
-'resetprefs'               => 'Buükams rigik',
-'oldpassword'              => 'Letavöd büik:',
-'newpassword'              => 'Letavöd nulik:',
-'retypenew'                => 'Klavolöd dönu letavödi nulik:',
-'textboxsize'              => 'Redakam',
-'rows'                     => 'Kedets:',
-'columns'                  => 'Padüls:',
-'searchresultshead'        => 'Suk',
-'resultsperpage'           => 'Tiäds petuvöl a pad:',
-'contextlines'             => 'Kedets a pad petuvöl:',
-'contextchars'             => 'Kevödem a kedet:',
-'stub-threshold'           => 'Soliad pro fomätam <a href="#" class="stub">sidayümas</a> (jöläts):',
-'recentchangesdays'        => 'Dels ad pajonön in votükams nulik:',
-'recentchangescount'       => 'Tiäds in lised votükamas nulik:',
-'savedprefs'               => 'Buükams olik pedakipons.',
-'timezonelegend'           => 'Timatopäd',
-'timezonetext'             => 'Num düpas, mö kel tim topik difon de tim dünanünöma (UTC).',
-'localtime'                => 'Tim topik',
-'timezoneoffset'           => 'Näedot¹',
-'servertime'               => 'Tim dünanünöma',
-'guesstimezone'            => 'Benüpenolös yufü befüresodatävöm',
-'allowemail'               => 'Fägükolös siti ad getön poti leäktronik de gebans votik',
-'prefs-namespaces'         => 'Nemaspads',
-'defaultns'                => 'Sukolös nomiko in nemaspads at:',
-'default'                  => 'stad kösömik',
-'files'                    => 'Ragivs',
+'math_bad_tmpdir'           => 'No mögos ad penön ini / jafön ragiviär(i) matematik nelaidüpik.',
+'math_bad_output'           => 'No mögos ad penön ini / jafön ragiviär(i) matematik labü seks',
+'math_notexvc'              => 'Program-texvc ledunovik no petuvon;
+logolös eli math/README ad givulön parametemi.',
+'prefs-personal'            => 'Gebananüns',
+'prefs-rc'                  => 'Votükams nulik',
+'prefs-watchlist'           => 'Galädalised',
+'prefs-watchlist-days'      => 'Num delas ad pajonön in galädalised:',
+'prefs-watchlist-days-max'  => '(maxum: dels 7)',
+'prefs-watchlist-edits'     => 'Num redakamas ad pajonön in galädalised pestäänüköl:',
+'prefs-watchlist-edits-max' => '(maxumanum: 1000)',
+'prefs-misc'                => 'Votikos',
+'prefs-resetpass'           => 'Votükön letavödi',
+'saveprefs'                 => 'Dakipolöd',
+'resetprefs'                => 'Buükams rigik',
+'textboxsize'               => 'Redakam',
+'prefs-edit-boxsize'        => 'Gretot redakamafenäta.',
+'rows'                      => 'Kedets:',
+'columns'                   => 'Padüls:',
+'searchresultshead'         => 'Suk',
+'resultsperpage'            => 'Tiäds petuvöl a pad:',
+'contextlines'              => 'Kedets a pad petuvöl:',
+'contextchars'              => 'Kevödem a kedet:',
+'stub-threshold'            => 'Soliad pro fomätam <a href="#" class="stub">sidayümas</a> (jöläts):',
+'recentchangesdays'         => 'Dels ad pajonön in votükams nulik:',
+'recentchangesdays-max'     => '(maxum: {{PLURAL:$1|del|dels}} $1)',
+'recentchangescount'        => 'Tiäds in lised votükamas nulik:',
+'savedprefs'                => 'Buükams olik pedakipons.',
+'timezonelegend'            => 'Timatopäd',
+'timezonetext'              => 'Num düpas, mö kel tim topik difon de tim dünanünöma (UTC).',
+'localtime'                 => 'Tim topik:',
+'timezoneselect'            => 'Timazon:',
+'timezoneuseserverdefault'  => 'Gebön parametemi kösömik dünanünöma',
+'timezoneuseoffset'         => 'Votik (nunolös difi)',
+'timezoneoffset'            => 'Näedot¹:',
+'servertime'                => 'Tim dünanünöma:',
+'guesstimezone'             => 'Benüpenolös yufü befüresodatävöm',
+'allowemail'                => 'Fägükolös siti ad getön poti leäktronik de gebans votik',
+'prefs-searchoptions'       => 'Sukaparamets',
+'prefs-namespaces'          => 'Nemaspads',
+'defaultns'                 => 'Sukolös nomiko in nemaspads at:',
+'default'                   => 'stad kösömik',
+'files'                     => 'Ragivs',
 
 # User rights
 'userrights'                  => 'Guvam gebanagitätas', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => 'Guvön gebanagrupis',
 'userrights-user-editname'    => 'Penolös gebananemi:',
 'editusergroup'               => 'Redakön Gebanagrupis',
-'editinguser'                 => "Votükam gitätas gebana: '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Votükam gitätas gebana: '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => 'Redakön gebanagrupis',
 'saveusergroups'              => 'Dakipolöd gebanagrupis',
 'userrights-groupsmember'     => 'Liman grupa(s):',
@@ -967,32 +1105,59 @@ vestigolös stitami verätik ela latex, ela dvips, ela gs, e feajafön',
 'grouppage-suppress'      => '{{ns:project}}:Lovelogam',
 
 # Rights
-'right-read'             => 'Reidön padis',
-'right-edit'             => 'Redakön padis',
-'right-createpage'       => 'Jafön padis (no bespikapadis)',
-'right-createtalk'       => 'Jafön bespikapadis',
-'right-createaccount'    => 'Jafön gebanakalis nulik',
-'right-minoredit'        => 'Malön redakamis as püliks.',
-'right-move'             => 'Topätükön padis',
-'right-suppressredirect' => 'No jafön lüodükömi de nem büik posä pad petopätükon',
-'right-upload'           => 'Löpükön ragivis',
-'right-upload_by_url'    => 'Löpükön ragivi se ladet-URL.',
-'right-autoconfirmed'    => 'Redakön padis dilo pejelölis',
-'right-bot'              => 'Palelogön as dun itjäfidik',
-'right-delete'           => 'Moükön padis',
-'right-bigdelete'        => 'Moükön padis labü jenotems lunik',
-'right-deleterevision'   => 'Moükön u sädunön moükami padafomamas pevälöl',
-'right-deletedhistory'   => 'Logön jenotemis pemoüköl nen vödems tefik',
-'right-browsearchive'    => 'Sukön padis pemoüköl',
-'right-undelete'         => 'Sädunön padimoükami',
-'right-block'            => 'Blokön redakamagitäti gebanas votik',
-'right-blockemail'       => 'Blokön gitäti gebana ad sedön penedis leäktronik',
-'right-hideuser'         => 'Blokön gebananemi, klänedölo oni de votikans',
-'right-protect'          => 'Votükön jelanivodis e redakön padis pejelöl',
-'right-editusercssjs'    => 'Redakön ragivis-CSS e -JS gebanas votik',
-'right-patrol'           => 'Zepön redakamis',
-'right-mergehistory'     => 'Kobükön padajenotemis',
-'right-userrights'       => 'Redakön gebanagitätis valik',
+'right-read'                 => 'Reidön padis',
+'right-edit'                 => 'Redakön padis',
+'right-createpage'           => 'Jafön padis (no bespikapadis)',
+'right-createtalk'           => 'Jafön bespikapadis',
+'right-createaccount'        => 'Jafön gebanakalis nulik',
+'right-minoredit'            => 'Malön redakamis as püliks.',
+'right-move'                 => 'Topätükön padis',
+'right-move-subpages'        => 'Topätükön padis kobü donapads onsik',
+'right-move-rootuserpages'   => 'Topätükön gebanapadis cifik',
+'right-movefile'             => 'Topätükön ragivis',
+'right-suppressredirect'     => 'No jafön lüodükömi de nem büik posä pad petopätükon',
+'right-upload'               => 'Löpükön ragivis',
+'right-reupload'             => 'Lovepladön sui ragiv ya dabinöl',
+'right-reupload-own'         => 'Lovepladön sui ragiv dabinöl fa ol it pelöpüköl',
+'right-reupload-shared'      => 'Nedemön ragivis se ragivakipedöp kobädik',
+'right-upload_by_url'        => 'Löpükön ragivi se ladet-URL.',
+'right-purge'                => 'Vagükön memi nelaidüpik pada nen fümedam',
+'right-autoconfirmed'        => 'Redakön padis dilo pejelölis',
+'right-bot'                  => 'Palelogön as dun itjäfidik',
+'right-nominornewtalk'       => 'No dälön redakames pülik bespikapadas ad kodön nuni: „nuns nulik“',
+'right-apihighlimits'        => 'Gebön miedis löpikum pö seivids-API',
+'right-writeapi'             => 'Gebi ela API penamik',
+'right-delete'               => 'Moükön padis',
+'right-bigdelete'            => 'Moükön padis labü jenotems lunik',
+'right-deleterevision'       => 'Moükön u sädunön moükami padafomamas pevälöl',
+'right-deletedhistory'       => 'Logön jenotemis pemoüköl nen vödems tefik',
+'right-browsearchive'        => 'Sukön padis pemoüköl',
+'right-undelete'             => 'Sädunön padimoükami',
+'right-suppressrevision'     => 'Logön e nätükön revidis se guvans peklänedölis',
+'right-suppressionlog'       => 'Logön jenotalisedis privatik',
+'right-block'                => 'Blokön redakamagitäti gebanas votik',
+'right-blockemail'           => 'Blokön gitäti gebana ad sedön penedis leäktronik',
+'right-hideuser'             => 'Blokön gebananemi, klänedölo oni de votikans',
+'right-ipblock-exempt'       => 'Nedemön blokamis-IP, blokamis itjäfidik e grupiblokamis',
+'right-proxyunbannable'      => 'Nedemön blokamis itjäfidik pladulömas',
+'right-protect'              => 'Votükön jelanivodis e redakön padis pejelöl',
+'right-editprotected'        => 'Bevobön padis pejelöl (nen vatafalajel)',
+'right-editinterface'        => 'Votükön gebanaloveikömi',
+'right-editusercssjs'        => 'Redakön ragivis-CSS e -JS gebanas votik',
+'right-rollback'             => 'Sädunön vifiko redakamis gebana lätik, kel äredakon padi semik.',
+'right-markbotedits'         => 'Bepenön redakamis pesädunöl as redakams ela bot',
+'right-noratelimit'          => 'No lobedön miedükamis',
+'right-import'               => 'Nüveigön padis se vüks votik',
+'right-importupload'         => 'Nüveigön padis se ragivilöpükam',
+'right-patrol'               => 'Zepön redakamis votikanas',
+'right-autopatrol'           => 'Zepön itjäfidiko redakamis okik',
+'right-patrolmarks'          => 'Logön zepamals in lised votükamas nulik',
+'right-unwatchedpages'       => 'Logön lisedi padas nepagalädöl',
+'right-trackback'            => 'Sedön gevegi',
+'right-mergehistory'         => 'Kobükön padajenotemis',
+'right-userrights'           => 'Redakön gebanagitätis valik',
+'right-userrights-interwiki' => 'Redakön gebanagitätis gebanas vükas votik',
+'right-siteadmin'            => 'Lökofärmükön e maifükön nünodemi',
 
 # User rights log
 'rightslog'      => 'Jenotalised gebanagitätas',
@@ -1000,24 +1165,61 @@ vestigolös stitami verätik ela latex, ela dvips, ela gs, e feajafön',
 'rightslogentry' => 'grupalimanam gebana: $1 pevotükon de $2 ad $3',
 'rightsnone'     => '(nonik)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => 'reidön padi at',
+'action-edit'                 => 'redakön padi at',
+'action-createpage'           => 'jafön padis',
+'action-createtalk'           => 'jafön bespikapadis',
+'action-createaccount'        => 'jafön gebanakali at',
+'action-minoredit'            => 'bepenön redakami at as pülik',
+'action-move'                 => 'topätükön padi at',
+'action-move-subpages'        => 'topätükön padi at äsi donapadis onik',
+'action-move-rootuserpages'   => 'topätükön gebanapadis cifik',
+'action-movefile'             => 'topätükön ragivi at',
+'action-upload'               => 'löpükön ragivi at',
+'action-reupload'             => 'lovepladön sui ragiv dabinöl at',
+'action-reupload-shared'      => 'nedemön ragivi at se kipedöp kobädik',
+'action-upload_by_url'        => 'löpükön ragivi at se ladet-URL',
+'action-writeapi'             => 'gebön eli API penamik',
+'action-delete'               => 'moükön padi at',
+'action-deleterevision'       => 'moükön fomami at',
+'action-deletedhistory'       => 'logön jenotemi pemoüköl pada at',
+'action-browsearchive'        => 'sukön vü pads pemoüköl',
+'action-undelete'             => 'sämoükön padi at',
+'action-suppressrevision'     => 'nülogön e gepladön revidi peklänedöl at',
+'action-suppressionlog'       => 'logön jenotalisedi privatik at',
+'action-block'                => 'blokön redakami gebana at',
+'action-protect'              => 'votükön jelanivodis pada at',
+'action-import'               => 'nüveigön padi at se vük votik',
+'action-importupload'         => 'nüveigön padi at se ragivilöpükam',
+'action-patrol'               => 'Zepön redakami votikanas',
+'action-autopatrol'           => 'zepön redakami olik',
+'action-unwatchedpages'       => 'Logön lisedi padas no pagalädölas',
+'action-trackback'            => 'sedön gevegi',
+'action-mergehistory'         => 'balön jenotemi pada at',
+'action-userrights'           => 'redakön gebanagitätis valik',
+'action-userrights-interwiki' => 'redakön gebanagitätis gebanas vükas votik',
+'action-siteadmin'            => 'lökofärmükön u maifükön nünodemi',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|votükam|votükams}} $1',
 'recentchanges'                     => 'Votükams nulik',
+'recentchanges-legend'              => 'Votükams nulik: paramets',
 'recentchangestext'                 => 'Su pad at binons votükams nulikün in vüki at.',
 'recentchanges-feed-description'    => 'Getön votükamis nulikün in vük at me nünakanad at.',
 'rcnote'                            => "Dono {{PLURAL:$1|binon votükam '''1'''|binons votükams '''$1'''}} lätikün {{PLURAL:$2|dela|delas '''$2'''}} lätikün, pänumädöls tü $5, $4.",
 'rcnotefrom'                        => "Is palisedons votükams sis '''$2''' (jü '''$1''').",
-'rclistfrom'                        => 'Jonolöd votükamis nulik, primölo tü düp $1',
-'rcshowhideminor'                   => '$1 votükams pülik',
+'rclistfrom'                        => 'Jonön votükamis nulik, primölo tü düp $1',
+'rcshowhideminor'                   => '$1 votükamis pülik',
 'rcshowhidebots'                    => '$1 elis bot',
 'rcshowhideliu'                     => '$1 gebanis penunädöl',
 'rcshowhideanons'                   => '$1 gebanis nennemik',
 'rcshowhidepatr'                    => 'Redakams $1 pekontrolons',
 'rcshowhidemine'                    => '$1 redakamis obik',
-'rclinks'                           => 'Jonolöd votükamis lätik $1 ün dels lätik $2<br />$3',
+'rclinks'                           => 'Jonön votükamis lätik $1 ün dels lätik $2<br />$3',
 'diff'                              => 'dif',
 'hist'                              => 'jen',
-'hide'                              => 'Klänedolöd',
+'hide'                              => 'Klänedön',
 'show'                              => 'Jonolöd',
 'minoreditletter'                   => 'p',
 'newpageletter'                     => 'N',
@@ -1026,6 +1228,8 @@ vestigolös stitami verätik ela latex, ela dvips, ela gs, e feajafön',
 'rc_categories'                     => 'Te klads fovik (ditolös me el "|")',
 'rc_categories_any'                 => 'Alseimik',
 'newsectionsummary'                 => '/* $1 */ diläd nulik',
+'rc-enhanced-expand'                => 'Jonön patis (el JavaScript zesüdon)',
+'rc-enhanced-hide'                  => 'Klänedön patis',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Votükams teföl',
@@ -1044,15 +1248,16 @@ Pads [[Special:Watchlist|galädaliseda olik]] '''pakazetons'''.",
 'reuploaddesc'                => 'Nosükon lopükami e geikön lü löpükamafomet.',
 'uploadnologin'               => 'No enunädon oki',
 'uploadnologintext'           => 'Mutol [[Special:UserLogin|nunädön oli]] ad löpükön ragivis.',
+'upload_directory_missing'    => 'Löpükamaragiviär ($1) no dabinon e no ekanon pajafön fa dünanünöm bevüresodik.',
 'upload_directory_read_only'  => 'Ragiviär lopükama ($1) no kanon papenön fa dünanünöm bevüresodik.',
 'uploaderror'                 => 'Pök pö löpükam',
-'uploadtext'                  => "Gebolös fometi dono ad löpükön ragivis. Ad logön u sukön ragivis ya pelöpükölis, gololös lü [[Special:ImageList|lised ragivas pelöpüköl]].
-Löpükams e moükams padakipons id in  [[Special:Log/upload|jenotalised löpükamas]].
+'uploadtext'                  => "Gebolös fometi dono ad löpükön ragivis. 
+Ad logön u sukön ragivis ya pelöpükölis, gebolös [[Special:FileList|lisedi ragivas pelöpüköl]]; (dönu)löpukams palisedons i su [[Special:Log/upload|jenotalised löpükamas]], moükams su [[Special:Log/delete|jenotalised moükamas]].
 
-Ad pladön magodi at ini pad semik, gebolös yümi fomätü:
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''',
-'''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' u
-'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' ad yümön stedöfiko ko ragiv.",
+Ad pladön ragivi ini pad semik, gebolös yümi fomätü:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Ragiv.jpg]]</nowiki></tt>''' ad pladön ragivi in fomät lölöfik;
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Ragiv.png|200px|thumb|left|vödem]]</nowiki></tt>''' ad pladön ragivi in fomät smalik (vidotü pixels 200) in bügil nedeto labü „vödem“ as bepenam;
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Ragiv.ogg]]</nowiki></tt>''' ad yümön nemediko ad ragiv nes jonön oni.",
 'upload-permitted'            => 'Ragivasots pedälöl: $1.',
 'upload-preferred'            => 'Ragivasots buik: $1.',
 'upload-prohibited'           => 'Ragivasots peproiböl: $1.',
@@ -1071,6 +1276,7 @@ Ad pladön magodi at ini pad semik, gebolös yümi fomätü:
 'illegalfilename'             => 'Ragivanem: „$1“ labon malatis no pedälölis pö padatiäds. Votanemolös ragivi e steifülolös ad löpükön oni dönu.',
 'badfilename'                 => 'Ragivanem pevotükon ad "$1".',
 'filetype-badmime'            => 'Ragivs MIME-pateda "$1" no dalons palöpükön.',
+'filetype-bad-ie-mime'        => 'Löpükam ragiva at no mögon, bi el Internet Explorer lelogonöv oni asä „$1“: ragivasot no pedälöl ä mögiko riskädik.',
 'filetype-unwanted-type'      => "'''\".\$1\"''' binon ragivasot no pavipöl.
 {{PLURAL:\$3|Ragivasot pabuüköl binon|Ragivasots pabuüköl binons}} \$2.",
 'filetype-banned-type'        => "'''\".\$1\"''' binon ragivasot no pedälöl.
@@ -1079,26 +1285,28 @@ Ad pladön magodi at ini pad semik, gebolös yümi fomätü:
 'large-file'                  => 'Pakomandos, das ragivs no binons gretikums ka mö $1; ragiv at binon mö $2.',
 'largefileserver'             => 'Ragiv at binon tu gretik: dünanünöm no kanon dälon oni.',
 'emptyfile'                   => 'Ragiv fa ol pelöpüköl binon jiniko vägik. Kod atosa äbinon ba pöl pö ragivanem. Vilol-li jenöfo löpükön ragivi at?',
-'fileexists'                  => 'Ragiv labü nem at ya dabinon, logolös, begö! <strong><tt>$1</tt></strong> üf no sevol fümiko, va vilol votükön oni.',
-'filepageexists'              => 'Bepenamapad ragiva at ya pejafon (<strong><tt>$1</tt></strong>), ab ragiv nonik labü nem at abinon anu. Naböfodönuam olik no opubon su bepenamapad. Ad pübön oni us, onedol redakön oni ol it.',
-'fileexists-extension'        => 'Ragiv labü nem sümik ya dabinon:<br />
-Nem ragiva palöpüköl: <strong><tt>$1</tt></strong><br />
-Nem ragiva dabinöl: <strong><tt>$2</tt></strong><br />
-Välolös, begö! nemi difik.',
+'fileexists'                  => "Ragiv labü nem at ya dabinon, logolös, begö! '''<tt>$1</tt>''' üf no sevol fümiko, va vilol votükön oni.",
+'filepageexists'              => "Bepenamapad ragiva at ya pejafon ('''<tt>$1</tt>'''), ab ragiv nonik labü nem at abinon anu. Naböfodönuam olik no opubon su bepenamapad. Ad pübön oni us, onedol redakön oni ol it.",
+'fileexists-extension'        => "Ragiv labü nem sümik ya dabinon:<br />
+Nem ragiva palöpüköl: '''<tt>$1</tt>'''<br />
+Nem ragiva dabinöl: '''<tt>$2</tt>'''<br />
+Välolös, begö! nemi difik.",
 'fileexists-thumb'            => "<center>'''Magod dabinöl'''</center>",
-'fileexists-thumbnail-yes'    => 'Ragiv at binon jiniko magoda gretota smalik <i>(magodil)</i>. Logolös, begö! ragivi ya dabinöli: <strong><tt>$1</tt></strong>.<br />
-If ragiv ya dabinöli binon magod ot gretota rigik, no zesüdos ad löpükön magodili pluik.',
-'file-thumbnail-no'           => 'Ragivanem primon me <strong><tt>$1</tt></strong>. Binon jiniko magod gretota smalik <i>(magodil)</i>.
-Üf labol magodi at gretota rigik, löpükölos oni, pläo votükolös ragivanemi.',
-'fileexists-forbidden'        => 'Ragiv labü nem at ya dabinon; geikolös e löpükolös ragivi at me nem votik.[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Ragiv labü nem at ya dabinon in ragivastok kobädik; geikolös e löpükolös ragivi at me nem votik. [[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "Ragiv at binon jiniko magoda gretota smalik ''(magodil)''. Logolös, begö! ragivi ya dabinöli: '''<tt>$1</tt>'''.<br />
+If ragiv ya dabinöli binon magod ot gretota rigik, no zesüdos ad löpükön magodili pluik.",
+'file-thumbnail-no'           => "Ragivanem primon me '''<tt>$1</tt>'''. Binon jiniko magod gretota smalik ''(magodil)''.
+Üf labol magodi at gretota rigik, löpükölos oni, pläo votükolös ragivanemi.",
+'fileexists-forbidden'        => 'Ragiv labü nem at ya dabinon; geikolös e löpükolös ragivi at me nem votik.[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Ragiv labü nem at ya dabinon in ragivastok kobädik. If nog vilol löpükön ragivi olik, geikolös e löpükolös ragivi at me nem votik. [[File:$1|thumb|center|$1]]',
+'file-exists-duplicate'       => 'Ragiv at leigon ko {{PLURAL:$1|ragiv|ragivs}} fovik:',
+'file-deleted-duplicate'      => 'Ragiv votik, kel leigon ko ragiv at ([[$1]]), pemoükon büo. Sötol kontrolön moükamajenotemi ragiva et büä odönulöpükol oni.',
 'successfulupload'            => 'Löpükam eplöpon',
 'uploadwarning'               => 'Löpükamanuned',
 'savefile'                    => 'Dakipolöd ragivi',
 'uploadedimage'               => '"[[$1]]" pelöpüköl',
 'overwroteimage'              => 'fomami nulik ragiva: „[[$1]]“ pelöpükon',
 'uploaddisabled'              => 'Löpükam penemögükon',
-'uploaddisabledtext'          => 'Löpükam ragivas penemögükon in {{SITENAME}}.',
+'uploaddisabledtext'          => 'Löpükam ragivas penemögükon.',
 'uploadscripted'              => 'Ragiv at ninükon eli HTML u vödis programapüka, kelis bevüresodanaföm ba opölanätäpreton',
 'uploadcorrupt'               => 'Ragiv binon dädik u duton lü sot no lonöföl. Kontrololös ragivi e löpükolös oni dönu.',
 'uploadvirus'                 => 'Ragiv at labon virudi! Pats: $1',
@@ -1110,7 +1318,7 @@ If ragiv ya dabinöli binon magod ot gretota rigik, no zesüdos ad löpükön ma
 'upload-wasdeleted'           => "'''Nuned: Löpükol ragivi büo pimoüköl.'''
 
 Vätälolös, va pötos ad löpükön ragivi at. Kodü koveniäl, jenotalised tefü moükam ragiva at pagivon is.",
-'filename-bad-prefix'         => 'Nem ragiva fa ol palöpüköl primon me <strong>"$1"</strong>: nem no bepenöl nomiko pagevöl itjäfidiko fa käms nulädik. Välolös, begö! nemi bepenöl pro ragiv olik.',
+'filename-bad-prefix'         => "Nem ragiva fa ol palöpüköl primon me '''\"\$1\"''': nem no bepenöl nomiko pagevöl itjäfidiko fa käms nulädik. Välolös, begö! nemi bepenöl pro ragiv olik.",
 
 'upload-proto-error'      => 'Protok neverätik',
 'upload-proto-error-text' => 'Löpükam flagon elis URLs me <code>http://</code> u <code>ftp://</code> primölis.',
@@ -1120,7 +1328,7 @@ Begolös yufi [[Special:ListUsers/sysop|guvana]].',
 'upload-misc-error'       => 'Pök nesevädik pö löpükam',
 'upload-misc-error-text'  => 'Pöl nesevädik äjenon dü löpükam.
 Fümedolös, begö! das el URL lonöfon e kanon palogön, e poso steifülolös nogna.
-If säkäd at laibinon, kosikolös guvani tefü on.',
+If säkäd at laibinon, kosikolös ko [[Special:ListUsers/sysop|guvan]] tefü on.',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6'       => 'No eplöpos ad rivön eli URL',
@@ -1136,42 +1344,56 @@ Binosöv gudikum, if steifülolöv dönu ün tim votik läs jäfädik.',
 'upload_source_url'  => ' (el URL lonöföl ä fa valans gebovik)',
 'upload_source_file' => ' (ragiv pö nünöm olik)',
 
-# Special:ImageList
-'imagelist-summary'     => 'Su pad patik at ragivs pelöpüköl valik pelisedons.
+# Special:ListFiles
+'listfiles-summary'     => 'Su pad patik at ragivs pelöpüköl valik pelisedons.
 Nomiko ragivs pelöpüköl lätikün palisedons primü lised.
 Klikolös tiädi padüla ad votükön sökaleodi at.',
-'imagelist_search_for'  => 'Sukön ragivanemi:',
+'listfiles_search_for'  => 'Sukön ragivanemi:',
 'imgfile'               => 'ragiv',
-'imagelist'             => 'Ragivalised',
-'imagelist_date'        => 'Dät',
-'imagelist_name'        => 'Nem',
-'imagelist_user'        => 'Geban',
-'imagelist_size'        => 'Gretot',
-'imagelist_description' => 'Bepenam',
-
-# Image description page
-'filehist'                  => 'Jenotem ragiva',
-'filehist-help'             => 'Välolös däti/timi ad logön ragivi soäsä äbinon ün tim at.',
-'filehist-deleteall'        => 'moükön valikis',
-'filehist-deleteone'        => 'moükön atosi',
-'filehist-revert'           => 'sädunön valikosi',
-'filehist-current'          => 'anuik',
-'filehist-datetime'         => 'Dät/Tim',
-'filehist-user'             => 'Geban',
-'filehist-dimensions'       => 'Mafots',
-'filehist-filesize'         => 'Ragivagret',
-'filehist-comment'          => 'Küpet',
-'imagelinks'                => 'Yüms',
-'linkstoimage'              => '{{PLURAL:$1|Pad sököl payümon|Pads sököl payümons}} ko pad at:',
-'nolinkstoimage'            => 'Pads nonik peyümons ad ragiv at.',
-'sharedupload'              => 'Ragiv at binon komunik e kanon pagebön fa proyegs votik.',
-'shareduploadwiki'          => 'Logolös eli $1 ad getön nünis pluik.',
-'shareduploadwiki-desc'     => 'Bepenam su $1 usik ona pajonon dono.',
-'shareduploadwiki-linktext' => 'bepenamapad ragiva',
-'noimage'                   => 'Ragiv labü nem at no dabinon, ab kanol $1.',
-'noimage-linktext'          => 'löpükön bali',
-'uploadnewversion-linktext' => 'Löpükön fomami nulik ragiva at',
-'imagepage-searchdupe'      => 'Sukön ragivis pedönuöl',
+'listfiles'             => 'Ragivalised',
+'listfiles_date'        => 'Dät',
+'listfiles_name'        => 'Nem',
+'listfiles_user'        => 'Geban',
+'listfiles_size'        => 'Gretot',
+'listfiles_description' => 'Bepenam',
+'listfiles_count'       => 'Fomams',
+
+# File description page
+'filehist'                       => 'Jenotem ragiva',
+'filehist-help'                  => 'Välolös däti/timi ad logön ragivi soäsä äbinon ün tim at.',
+'filehist-deleteall'             => 'moükön valikis',
+'filehist-deleteone'             => 'moükön atosi',
+'filehist-revert'                => 'sädunön valikosi',
+'filehist-current'               => 'anuik',
+'filehist-datetime'              => 'Dät/Tim',
+'filehist-thumb'                 => 'Magodil',
+'filehist-thumbtext'             => 'Magodil fomama tü $1',
+'filehist-nothumb'               => 'Magodil nonik',
+'filehist-user'                  => 'Geban',
+'filehist-dimensions'            => 'Mafots',
+'filehist-filesize'              => 'Ragivagret',
+'filehist-comment'               => 'Küpet',
+'imagelinks'                     => 'Ragivayüms',
+'linkstoimage'                   => '{{PLURAL:$1|Pad sököl payümon|Pads sököl payümons}} ko pad at:',
+'linkstoimage-more'              => 'Pads plu {{PLURAL:$1|bals|$1}} labons yümi lü ragiv at.
+Lised dono jonon {{PLURAL:$1|padayümi balid|padayümis balid $1}} te lü ragiv at.
+[[Special:WhatLinksHere/$2|Lised lölöfik]] gebidon.',
+'nolinkstoimage'                 => 'Pads nonik peyümons ad ragiv at.',
+'morelinkstoimage'               => 'Logolös [[Special:WhatLinksHere/$1|yümis pluik]] ad ragiv at.',
+'redirectstofile'                => '{{PLURAL:$1|Ragiv sököl lüodükon|Ragivs sököl $1 lüodükons}} ad ragiv at:',
+'duplicatesoffile'               => '{{Plural:$1|Ragiv fovik leigon|Ragivs fovik $1 leigons}} ko ragiv at:',
+'sharedupload'                   => 'Ragiv at binon komunik e kanon pagebön fa proyegs votik.',
+'shareduploadwiki'               => 'Logolös eli $1 ad getön nünis pluik.',
+'shareduploadwiki-desc'          => 'Bepenam su $1 ona us pajonon dono.',
+'shareduploadwiki-linktext'      => 'bepenamapad ragiva',
+'shareduploadduplicate'          => 'Ragiv at leigon ko ragiv: $1 se kipedöp kobädik.',
+'shareduploadduplicate-linktext' => 'ragiv votik',
+'shareduploadconflict'           => 'Ragiv at e ragiv: $1 se kipedöp kobädik labons nemi ot.',
+'shareduploadconflict-linktext'  => 'ragiv votik',
+'noimage'                        => 'Ragiv labü nem at no dabinon, ab kanol $1.',
+'noimage-linktext'               => 'löpükön bali',
+'uploadnewversion-linktext'      => 'Löpükön fomami nulik ragiva at',
+'imagepage-searchdupe'           => 'Sukön ragivis pedönuöl',
 
 # File reversion
 'filerevert'                => 'Geükön padi: $1',
@@ -1194,7 +1416,6 @@ Klikolös tiädi padüla ad votükön sökaleodi at.',
 'filedelete-success-old'      => "Fomam ela '''[[Media:$1|$1]]''' timü $3, $2 pemoükon.",
 'filedelete-nofile'           => "'''$1''' no dabinon.",
 'filedelete-nofile-old'       => "No dabinon fomam peregistaröl pada: '''$1''' labü pats pevipöl.",
-'filedelete-iscurrent'        => 'Steifülol ad moükön fomami nulikün ragiva at. Mutol büo geikön ad fomam büik.',
 'filedelete-otherreason'      => 'Kod votik/zuik:',
 'filedelete-reason-otherlist' => 'Kod votik',
 'filedelete-reason-dropdown'  => '*Kods kösömik moükama
@@ -1203,9 +1424,11 @@ Klikolös tiädi padüla ad votükön sökaleodi at.',
 'filedelete-edit-reasonlist'  => 'Redakön kodis moükama',
 
 # MIME search
-'mimesearch' => 'Sukön (MIME)',
-'mimetype'   => 'Klad ela MIME:',
-'download'   => 'donükön',
+'mimesearch'         => 'Sukön (MIME)',
+'mimesearch-summary' => 'Pad at mögükon ragivisulami ma MIME-sot.
+Primanünods: ninädasot/donasot, a.s. <tt>image/jpeg</tt>.',
+'mimetype'           => 'Klad ela MIME:',
+'download'           => 'donükön',
 
 # Unwatched pages
 'unwatchedpages' => 'Pads no pagalädöls',
@@ -1215,33 +1438,36 @@ Klikolös tiädi padüla ad votükön sökaleodi at.',
 
 # Unused templates
 'unusedtemplates'     => 'Samafomots no pageböls',
-'unusedtemplatestext' => 'Pad at jonon padis valik in nemaspad "samafomot", kels no paninükons in pad votik. Kontrololös, va dabinons yüms votik lü samafomots at büä omoükol onis.',
+'unusedtemplatestext' => 'Pad at jonon padis valik in nemaspad: "{{ns:template}}", kels no paninükons in pad votik. Kontrololös, va dabinons yüms votik lü samafomots at büä omoükol onis.',
 'unusedtemplateswlh'  => 'yüms votik',
 
 # Random page
 'randompage'         => 'Pad fädik',
-'randompage-nopages' => 'Pads nonik dabinons in nemaspad at.',
+'randompage-nopages' => 'Pads nonik dabinons in nemaspad: "$1".',
 
 # Random redirect
 'randomredirect'         => 'Lüodüköm fädik',
-'randomredirect-nopages' => 'Lüodüköms nonik dabinons in nemaspad at.',
+'randomredirect-nopages' => 'Lüodüköms nonik dabinons in nemaspad: "$1".',
 
 # Statistics
-'statistics'             => 'Statits',
-'sitestats'              => 'Statits {{SITENAME}}',
-'userstats'              => 'Gebanastatits',
-'sitestatstext'          => "{{PLURAL:\$1|Dabinon pad '''1'''|Dabinons valodo pads '''\$1'''}} in {{SITENAME}}.
-Atos ninükon i \"bespikapadis\", padis dö Vükiped it, padis go smalikis (\"sidis\"), lüodükömis, e votikis, kels luveratiko no kanons palelogön as pads ninädilabik.
-Atis fakipölo, retons nog {{PLURAL:\$2|pad '''1''', kel luveratiko binon legiko ninädilabik|pads '''\$2''', kels luveratiko binons legiko ninädilabiks}}.
-
-{{PLURAL:\$8|Ragiv '''1''' pelöpükon|Ragivs '''\$8''' pelöpükons}}.
-
-Ejenons valodo {{PLURAL:\$3|padilogam '''1'''|padilogams '''\$3'''}}, e {{PLURAL:\$4|padiredakam '''1'''|padiredakams '''\$4'''}}, sisä vük at pästiton.
-Kludo, zänedo ebinons redakams '''\$5'''  a pad, e logams '''\$6''' a redakam.
-
-Lunot [http://www.mediawiki.org/wiki/Manual:Job_queue vobodapoodkeda] binon '''\$7'''.",
-'userstatstext'          => "Dabinon{{PLURAL:$1| [[Special:ListUsers|geban]] peregistaröl '''1'''|s [[Special:ListUsers|gebans]] peregistaröl '''$1'''}}; '''$2''' (ü '''$4%''') {{PLURAL:$2|binon|binons}} $5.",
-'statistics-mostpopular' => 'Pads suvüno palogöls:',
+'statistics'                   => 'Statits',
+'statistics-header-pages'      => 'Statits pada',
+'statistics-header-edits'      => 'Redakamastatits',
+'statistics-header-views'      => 'Logamastatits',
+'statistics-header-users'      => 'Gebanastatits',
+'statistics-articles'          => 'Pads ninädilabik',
+'statistics-pages'             => 'Pads',
+'statistics-pages-desc'        => 'Pads valik vüka at, keninükamü bespikapads, lüodüköms e r.',
+'statistics-files'             => 'Ragivs pelöpüköl',
+'statistics-edits'             => 'Padiredakams sisä {{SITENAME}} päjafon',
+'statistics-edits-average'     => 'Num zänedik redakamas a pad',
+'statistics-views-total'       => 'Logams (valod)',
+'statistics-views-peredit'     => 'Logams a redakam',
+'statistics-jobqueue'          => 'Gretot [http://www.mediawiki.org/wiki/Manual:Job_queue vobodaliseda]',
+'statistics-users'             => '[[Special:ListUsers|Gebans]] peregistaröl',
+'statistics-users-active'      => 'Gebans jäfedik',
+'statistics-users-active-desc' => 'Gebans, kels edunons bosi ün {{PLURAL:$1|del lätik|dels lätik $1}}',
+'statistics-mostpopular'       => 'Pads suvüno palogöls:',
 
 'disambiguations'      => 'Telplänovapads',
 'disambiguationspage'  => 'Template:Telplänov',
@@ -1249,8 +1475,10 @@ Lunot [http://www.mediawiki.org/wiki/Manual:Job_queue vobodapoodkeda] binon '''\
 Sötons plao payümon lü yeged pötik.<br />
 Pad palelogon telplänovapad if gebon samafomoti, lü kel payümon pad [[MediaWiki:Disambiguationspage]].",
 
-'doubleredirects'     => 'Lüodüköms telik',
-'doubleredirectstext' => 'Kedet alik labon yümis lü lüodüköm balid e telid, ed i kedeti balid vödema lüodüköma telid, kel nomiko ninädon padi, ko kel lüodüköm balid söton payümön.',
+'doubleredirects'            => 'Lüodüköms telik',
+'doubleredirectstext'        => 'Kedet alik labon yümis lü lüodüköm balid e telid, ed i kedeti balid vödema lüodüköma telid, kel nomiko ninädon padi, ko kel lüodüköm balid söton payümön.',
+'double-redirect-fixed-move' => 'Pad: [[$1]] petopätükon, anu binon lüodüköm lü pad: [[$2]]',
+'double-redirect-fixer'      => 'Nätüköm lüodükömas',
 
 'brokenredirects'        => 'Lüodüköms dädik',
 'brokenredirectstext'    => 'Lüodüköms sököl dugons lü pads no dabinöls:',
@@ -1273,7 +1501,7 @@ Pad palelogon telplänovapad if gebon samafomoti, lü kel payümon pad [[MediaWi
 'nviews'                  => '{{PLURAL:$1|logam|logams}} $1',
 'specialpage-empty'       => 'Pad at vagon.',
 'lonelypages'             => 'Pads, lü kels yüms nonik dugons',
-'lonelypagestext'         => 'Pads nonik in vüki at peyümons ad pads sököl.',
+'lonelypagestext'         => 'Pads nonik in vük at peyümons ad pads sököl in {{SITENAME}}.',
 'uncategorizedpages'      => 'Pads nen klad',
 'uncategorizedcategories' => 'Klads nen klad löpikum',
 'uncategorizedimages'     => 'Magods nen klad',
@@ -1283,33 +1511,41 @@ Pad palelogon telplänovapad if gebon samafomoti, lü kel payümon pad [[MediaWi
 'popularpages'            => 'Pads suvüno pelogöls',
 'wantedcategories'        => 'Klads mekabik',
 'wantedpages'             => 'Pads mekabik',
+'wantedfiles'             => 'Ragivs mekabik',
+'wantedtemplates'         => 'Samafomots mekabik',
 'mostlinked'              => 'Pads suvüno peyümöls',
 'mostlinkedcategories'    => 'Klads suvüno peyümöls',
 'mostlinkedtemplates'     => 'Samafomots suvüno pegeböls',
 'mostcategories'          => 'Yegeds labü klads mödikün',
 'mostimages'              => 'Magods suvüno peyümöls',
 'mostrevisions'           => 'Yegeds suvüno perevidöls',
-'prefixindex'             => 'Lised ma foyümots',
+'prefixindex'             => 'Pads valik kö foyümot',
 'shortpages'              => 'Pads brefik',
 'longpages'               => 'Pads lunik',
 'deadendpages'            => 'Pads nen yüms lü votiks',
 'deadendpagestext'        => 'Pads sököl no labons yümis ad pads votik in vüki at.',
 'protectedpages'          => 'Pads pejelöl',
 'protectedpages-indef'    => 'Te jels nefümik',
+'protectedpages-cascade'  => 'Te vatafalajels',
 'protectedpagestext'      => 'Pads fovik pejelons e no kanons patöpätükön u paredakön',
 'protectedpagesempty'     => 'Pads nonik pejelons',
 'protectedtitles'         => 'Tiäds pejelöl',
 'protectedtitlestext'     => 'Tiäds sököl no dalons pajafön:',
 'protectedtitlesempty'    => 'Tiäds nonik pejelons me paramets at.',
 'listusers'               => 'Gebanalised',
+'listusers-editsonly'     => 'Jonön te gebanis keblünöl',
+'usereditcount'           => '{{PLURAL:$1|redakam|redakams}} $1',
 'newpages'                => 'Pads nulik',
 'newpages-username'       => 'Gebananem:',
 'ancientpages'            => 'Pads bäldikün',
 'move'                    => 'Topätükön',
 'movethispage'            => 'Topätükolöd padi at',
+'unusedimagestext'        => 'Demolös, das bevüresodatopäds votik (samo Vükipeds votik) kanons yumön lü ragiv me ladet-URL nemedik. Sekü atos, ragiv at kanon binön su lised isik do nog pagebon.',
 'unusedcategoriestext'    => 'Kladapads sököl dabinons do yeged u klad votik nonik gebon oni.',
 'notargettitle'           => 'No dabinon zeilapad',
 'notargettext'            => 'No evälol fonätapadi u fonätagebani, keli dun at otefon:',
+'nopagetitle'             => 'Fonätapad no dabinon',
+'nopagetext'              => 'Fonätapad fa ol pevälöl no dabinon.',
 'pager-newer-n'           => '{{PLURAL:$1|nulikum 1|nulikum $1}}',
 'pager-older-n'           => '{{PLURAL:$1|büikum 1|büikum $1}}',
 'suppress'                => 'Lovelogam',
@@ -1319,16 +1555,15 @@ Pad palelogon telplänovapad if gebon samafomoti, lü kel payümon pad [[MediaWi
 'booksources-search-legend' => 'Sukön bukafonis:',
 'booksources-go'            => 'Getolöd',
 'booksources-text'          => 'Is palisedons bevüresodatopäds votik, kels selons bukis nulik e pegebölis, e kels ba labons nünis pluik dö buks fa ol pasuköls:',
+'booksources-invalid-isbn'  => 'El ISBN at jiniko no lonöfon; kontrololös pökis po kopiedam se rigafonät.',
 
 # Special:Log
 'specialloguserlabel'  => 'Geban:',
 'speciallogtitlelabel' => 'Tiäd:',
 'log'                  => 'Jenotaliseds',
 'all-logs-page'        => 'Jenotaliseds valik',
-'log-search-legend'    => 'Sukön jenotalisedis',
-'log-search-submit'    => 'Maifükön padi',
-'alllogstext'          => 'Kobojonam jenotalisedas löpükamas, moükamas, jelodamas, blokamas e guvanas.
-Ad brefükam lisedi, kanoy välön lisedasoti, gebananemi, u padi tefik.',
+'alllogstext'          => 'Kobojonam jenotalisedas gebidik valik in {{SITENAME}}. 
+Ad brefükam lisedi, kanol välön lisedasoti, gebananemi, u padi tefik.',
 'logempty'             => 'No dabinons notets in jenotalised at.',
 'log-title-wildcard'   => 'Sukön tiäds primöl me:',
 
@@ -1338,6 +1573,7 @@ Ad brefükam lisedi, kanoy välön lisedasoti, gebananemi, u padi tefik.',
 'nextpage'          => 'Pad sököl ($1)',
 'prevpage'          => 'Pad büik ($1)',
 'allpagesfrom'      => 'Jonolöd padis, primöl me:',
+'allpagesto'        => 'Jonön padis jü:',
 'allarticles'       => 'Yegeds valik',
 'allinnamespace'    => 'Pads valik ($1 nemaspad)',
 'allnotinnamespace' => 'Pads valik ($1 nemaspad)',
@@ -1350,44 +1586,73 @@ Ad brefükam lisedi, kanoy välön lisedasoti, gebananemi, u padi tefik.',
 
 # Special:Categories
 'categories'                    => 'Klads',
-'categoriespagetext'            => 'Klads sököl dabinons in vüki at.',
+'categoriespagetext'            => 'Klads sököl labons padis u ragivis. [[Special:UnusedCategories|Klads no pageböls]] no pajonons is. Logolös i [[Special:WantedCategories|klads pevilöl]].',
+'categoriesfrom'                => 'Jonön padis primölo de:',
 'special-categories-sort-count' => 'leodükön ma num',
 'special-categories-sort-abc'   => 'leodükön ma lafab',
 
+# Special:DeletedContributions
+'deletedcontributions' => 'Gebanakeblünots pemoüköl',
+
+# Special:LinkSearch
+'linksearch'       => 'Yüms plödik',
+'linksearch-pat'   => 'Sukapated:',
+'linksearch-ns'    => 'Nemaspad:',
+'linksearch-ok'    => 'Suk',
+'linksearch-text'  => 'WilStelüls kanons pagebön, a.s. „*.wikipedia.org“.<br />
+Protoks pestütöl: <tt>$1</tt>',
+'linksearch-line'  => '$1 labon yümi se $2',
+'linksearch-error' => 'Stelüls kanons pubön te lä prim lotidiananema.',
+
 # Special:ListUsers
 'listusersfrom'      => 'Jonolöd gebanis primölo me:',
 'listusers-submit'   => 'Jonolöd',
 'listusers-noresult' => 'Geban nonik petuvon.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'Lised gebanijafamas',
+'newuserlogpagetext'          => 'Is palisedons jafams gebanas nulik.',
+'newuserlog-byemail'          => 'letavöd pesedon me pot leäktronik',
+'newuserlog-create-entry'     => 'Geban nulik',
+'newuserlog-create2-entry'    => 'ejafon kali nulik: $1',
+'newuserlog-autocreate-entry' => 'Kal itjäfidiko pejaföl',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'Gitäts gebanagrupa',
-'listgrouprights-summary'  => 'Is palisedons gebanagrups in vük at dabinöls, sa gitäts tefik onsik.
-Nüns pluik tefü gebanagitäts patuvons [[{{MediaWiki:Listgrouprights-helppage}}|is]].',
-'listgrouprights-group'    => 'Grup',
-'listgrouprights-rights'   => 'Gitäts',
-'listgrouprights-helppage' => 'Help:Grupagitäts',
-'listgrouprights-members'  => '(lised limanas)',
+'listgrouprights'                 => 'Gitäts gebanagrupa',
+'listgrouprights-summary'         => 'Is palisedons gebanagrups in vük at dabinöls, sa gitäts tefik onsik.
+Ba dabinons [[{{MediaWiki:Listgrouprights-helppage}}|nüns pluik]] tefü gebanagitäts patik.',
+'listgrouprights-group'           => 'Grup',
+'listgrouprights-rights'          => 'Gitäts',
+'listgrouprights-helppage'        => 'Help:Grupagitäts',
+'listgrouprights-members'         => '(lised limanas)',
+'listgrouprights-addgroup'        => 'Kanon läükön {{PLURAL:$2|grupi|grupis}}: $1',
+'listgrouprights-removegroup'     => 'Kanon moükön {{PLURAL:$2|grupi|grupis}}: $1',
+'listgrouprights-addgroup-all'    => 'Kanon läükön grupis valik',
+'listgrouprights-removegroup-all' => 'Kanon moükön grupis valik',
 
 # E-mail user
-'mailnologin'     => 'Ladet nonik ad sedön',
-'mailnologintext' => 'Mutol [[Special:UserLogin|nunädön oli]] e labön ladeti leäktronik lonöföl pö [[Special:Preferences|buükams olik]] ad dalön sedön poti leäktronik gebanes votik.',
-'emailuser'       => 'Penön gebane at',
-'emailpage'       => 'Penön gebane',
-'emailpagetext'   => 'If gebane at egivon ladeti leäktronik lonöföl in gebanabuükams onik,
-fomet at osedon one penedi bal. Ladet leäktronik in gebanabuükams olik opubon as fonät (el "De:") peneda at, dat getan okanon gepenön.',
-'usermailererror' => 'Potayeg egesedon pöli:',
-'defemailsubject' => 'Ladet leäktronik ela {{SITENAME}}',
-'noemailtitle'    => 'Ladet no dabinon',
-'noemailtext'     => 'Geban at no egivon ladeti leäktronik lonöföl, ud ebuükon ad no getön penedis de gebans votik.',
-'emailfrom'       => 'De el:',
-'emailto'         => 'Ele:',
-'emailsubject'    => 'Yegäd:',
-'emailmessage'    => 'Nun:',
-'emailsend'       => 'Sedolöd',
-'emailccme'       => 'Sedolöd obe kopiedi peneda obik.',
-'emailccsubject'  => 'Kopied peneda olik ele $1: $2',
-'emailsent'       => 'Pened pesedon',
-'emailsenttext'   => 'Pened leäktronik ola pesedon.',
+'mailnologin'      => 'Ladet nonik ad sedön',
+'mailnologintext'  => 'Mutol [[Special:UserLogin|nunädön oli]] e labön ladeti leäktronik lonöföl pö [[Special:Preferences|buükams olik]] ad dalön sedön poti leäktronik gebanes votik.',
+'emailuser'        => 'Penön gebane at',
+'emailpage'        => 'Penön gebane',
+'emailpagetext'    => 'Kanol gebön fometi dono ad sedön penedi leäktronik gebane at. Ladet leäktronik in [[Special:Preferences|gebanabüukams olik]] opubon as fonät (el "De:") peneda, dat getan okanon gepenön ole.',
+'usermailererror'  => 'Potayeg egesedon pöli:',
+'defemailsubject'  => 'Ladet leäktronik ela {{SITENAME}}',
+'noemailtitle'     => 'Ladet no dabinon',
+'noemailtext'      => 'Geban at no egivon ladeti leäktronik lonöföl.',
+'nowikiemailtitle' => 'Pot leäktronik no pedälon.',
+'nowikiemailtext'  => 'Geban at no vilon getön penedis leäktronik gebanas votik.',
+'email-legend'     => 'Sedön penedi gebane votik in {{SITENAME}}',
+'emailfrom'        => 'De el:',
+'emailto'          => 'Ele:',
+'emailsubject'     => 'Yegäd:',
+'emailmessage'     => 'Nun:',
+'emailsend'        => 'Sedolöd',
+'emailccme'        => 'Sedolöd obe kopiedi peneda obik.',
+'emailccsubject'   => 'Kopied peneda olik ele $1: $2',
+'emailsent'        => 'Pened pesedon',
+'emailsenttext'    => 'Pened leäktronik ola pesedon.',
+'emailuserfooter'  => 'Pened at pesedon fa geban: $1 gebane: $2 medü program: „sedön gebane penedi“ ela {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'Galädalised obik',
@@ -1420,18 +1685,14 @@ If vilol poso moükön padi de galädalised olik, välolös lä on knopi: „neg
 'iteminvalidname'      => "Fikul tefü el '$1': nem no lonöföl...",
 'wlnote'               => "Is palisedons votükam{{PLURAL:$1| lätik|s lätik '''$1'''}} dü düp{{PLURAL:$2| lätik|s lätik '''$2'''}}.",
 'wlshowlast'           => 'Jonolöd: düpis lätik $1, delis lätik $2, $3',
-'watchlist-show-bots'  => 'Jonolöd redakamis elas bots',
-'watchlist-hide-bots'  => 'Klänolöd redakamis elas bots',
-'watchlist-show-own'   => 'Jonolöd redakamis obik',
-'watchlist-hide-own'   => 'Klänolöd redakamis obik',
-'watchlist-show-minor' => 'Jonolöd redakamis pülik',
-'watchlist-hide-minor' => 'Klänolöd redakamis pülik',
+'watchlist-options'    => 'Paramets galädaliseda',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Papladon ini galädalised...',
 'unwatching' => 'Pamoükon se galädalised...',
 
 'enotif_mailer'                => 'Nunamasit ela {{SITENAME}}',
+'enotif_reset'                 => 'Malön padis pevisitöl valik',
 'enotif_newpagetext'           => 'Atos binon pad nulik.',
 'enotif_impersonal_salutation' => 'Geban {{SITENAME}}-a',
 'changed'                      => 'pevotüköl',
@@ -1465,76 +1726,98 @@ Ad votükön parametami galädaliseda olik, loglös
 Küpets e yuf pluik:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Moükolöd padi',
-'confirm'                     => 'Fümedolös',
-'excontent'                   => "ninäd äbinon: '$1'",
-'excontentauthor'             => "ninäd äbinon: '$1' (e keblünan teik äbinon '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "ninäd bü vagükam äbinon: '$1'",
-'exblank'                     => 'pad ävagon',
-'delete-confirm'              => 'Moükön padi: "$1"',
-'delete-legend'               => 'Moükön',
-'historywarning'              => 'Nuned: pad, keli vilol moükön, labon jenotemi:',
-'confirmdeletetext'           => 'Primikol ad moükön laidüpiko padi u magodi sa jenotem valik ona. Fümedolös, das desinol ad dunön atosi, das suemol sekis, e das dunol atosi bai [[{{MediaWiki:Policy-url}}]].',
-'actioncomplete'              => 'Peledunon',
-'deletedtext'                 => 'Pad: "<nowiki>$1</nowiki>" pemoükon;
+# Delete
+'deletepage'             => 'Moükolöd padi',
+'confirm'                => 'Fümedolös',
+'excontent'              => "ninäd äbinon: '$1'",
+'excontentauthor'        => "ninäd äbinon: '$1' (e keblünan teik äbinon '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "ninäd bü vagükam äbinon: '$1'",
+'exblank'                => 'pad ävagon',
+'delete-confirm'         => 'Moükön padi: "$1"',
+'delete-legend'          => 'Moükön',
+'historywarning'         => 'Nuned: pad, keli vilol moükön, labon jenotemi:',
+'confirmdeletetext'      => 'Primikol ad moükön laidüpiko padi u magodi sa jenotem valik ona. Fümedolös, das desinol ad dunön atosi, das suemol sekis, e das dunol atosi bai [[{{MediaWiki:Policy-url}}]].',
+'actioncomplete'         => 'Peledunon',
+'deletedtext'            => 'Pad: "<nowiki>$1</nowiki>" pemoükon;
 $2 jonon moükamis nulik.',
-'deletedarticle'              => 'Pad: "[[$1]]" pemoükon',
-'suppressedarticle'           => 'logov pada: „[[$1]]“ pevotükon',
-'dellogpage'                  => 'Jenotalised moükamas',
-'dellogpagetext'              => 'Dono binon lised moükamas nulikün.',
-'deletionlog'                 => 'jenotalised moükamas',
-'reverted'                    => 'Pegeükon ad revid büik',
-'deletecomment'               => 'Kod moükama',
-'deleteotherreason'           => 'Kod votik:',
-'deletereasonotherlist'       => 'Kod votik',
-'deletereason-dropdown'       => '* Kods kösömik moükama
+'deletedarticle'         => 'Pad: "[[$1]]" pemoükon',
+'suppressedarticle'      => 'logov pada: „[[$1]]“ pevotükon',
+'dellogpage'             => 'Jenotalised moükamas',
+'dellogpagetext'         => 'Dono binon lised moükamas nulikün.',
+'deletionlog'            => 'jenotalised moükamas',
+'reverted'               => 'Pegeükon ad revid büik',
+'deletecomment'          => 'Kod moükama',
+'deleteotherreason'      => 'Kod votik:',
+'deletereasonotherlist'  => 'Kod votik',
+'deletereason-dropdown'  => '* Kods kösömik moükama
 ** Beg lautana
 ** Kopiedagitäts
 ** Vandalim',
-'delete-edit-reasonlist'      => 'Redakön kodis moükama',
-'delete-toobig'               => 'Pad at labon redakamajenotemi lunik ({{PLURAL:$1|revid|revids}} plu $1).
+'delete-edit-reasonlist' => 'Redakön kodis moükama',
+'delete-toobig'          => 'Pad at labon redakamajenotemi lunik ({{PLURAL:$1|revid|revids}} plu $1).
 Moükam padas somik pemiedükon ad vitön däropami pö {{SITENAME}}.',
-'delete-warning-toobig'       => 'Pad at labon jenotemi lunik: {{PLURAL:$1|revid|revids}} plu $1.
+'delete-warning-toobig'  => 'Pad at labon jenotemi lunik: {{PLURAL:$1|revid|revids}} plu $1.
 Prudö! Moükam onik ba osäkädükon jäfidi nünodema: {{SITENAME}}.',
-'rollback'                    => 'Sädunön redakamis',
-'rollback_short'              => 'Sädunön vali',
-'rollbacklink'                => 'sädunön vali',
-'rollbackfailed'              => 'Sädunam no eplöpon',
-'cantrollback'                => 'Redakam no kanon pasädunön; keblünan lätik binon lautan teik pada at.',
-'alreadyrolled'               => 'No eplöpos ad sädunön redakami lätik pada: [[:$1]] fa geban: [[User:$2|$2]] ([[User talk:$2|Bespikapad]]); ek ya eredakon ud esädunon padi at.
-
-Redakam lätik päjenükon fa geban: [[User:$3|$3]] ([[User talk:$3|Bespikapad]]).',
-'editcomment'                 => 'Redakamaküpet äbinon: "<i>$1</i>".', # only shown if there is an edit comment
-'revertpage'                  => 'Redakams ela [[Special:Contributions/$2|$2]] ([[User talk:$2|Bespik]]) pegeükons; pad labon nu fomami ma redakam lätik ela [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'Redakams gebana: $1 pesädunons; pad pevotükon ad fomam lätik fa geban: $2.',
+
+# Rollback
+'rollback'         => 'Sädunön redakamis',
+'rollback_short'   => 'Sädunön vali',
+'rollbacklink'     => 'sädunön vali',
+'rollbackfailed'   => 'Sädunam no eplöpon',
+'cantrollback'     => 'Redakam no kanon pasädunön; keblünan lätik binon lautan teik pada at.',
+'alreadyrolled'    => 'No eplöpos ad sädunön redakami lätik pada: [[:$1]] fa geban: [[User:$2|$2]] ([[User talk:$2|Bespikapad]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); ek ya eredakon oni ud esädunon redakami ona.
+
+Redakam lätik päjenükon fa geban: [[User:$3|$3]] ([[User talk:$3|Bespikapad]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
+'editcomment'      => "Redakamaplän äbinon: „''$1''“.", # only shown if there is an edit comment
+'revertpage'       => 'Redakams ela [[Special:Contributions/$2|$2]] ([[User talk:$2|Bespik]]) pegeükons ad fomam ma redakam lätik gebana: [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'Redakams gebana: $1 pesädunons; pad pevotükon ad fomam lätik fa geban: $2.',
+'sessionfailure'   => 'Jiniko ädabinon säkäd seimik pö nunädam olik. 
+Dun at no pelasumon ad vitön mögi, das votükams olik pogivulons gebane votik.
+Välolös knopi: „Geikön“ e dönulodolös padi, de kel ekömol, e tän steifülolös nogna.',
+
+# Protect
 'protectlogpage'              => 'Jenotalised jelodamas',
 'protectlogtext'              => 'Is palisedons pads pelökofärmüköl e pemaifüköls.
 Logolös [[Special:ProtectedPages|lisedi padas pejelöl]], kö pajonons padijelams anu lonöföls.',
-'protectedarticle'            => 'ejelon padi: "[[$1]]"',
-'modifiedarticleprotection'   => 'evotükon jelanivodi pada: "[[$1]]"',
-'unprotectedarticle'          => 'Pad: "[[$1]]" pesäjelon.',
-'protect-title'               => 'lonon jelanivodi pada: "$1"',
+'protectedarticle'            => 'ejelon padi: „[[$1]]“',
+'modifiedarticleprotection'   => 'evotükon jelanivodi pada: „[[$1]]“',
+'unprotectedarticle'          => 'Pad: „[[$1]]“ pesäjelon.',
+'movedarticleprotection'      => 'moved protection settings from „[[$2]]“ to „[[$1]]“',
+'protect-title'               => 'lonon jelanivodi pada: „$1“',
+'prot_1movedto2'              => '[[$1]] petopätükon lü [[$2]]',
 'protect-legend'              => 'Fümedolös jeli',
 'protectcomment'              => 'Küpet:',
 'protectexpiry'               => 'Dul:',
 'protect_expiry_invalid'      => 'Dul no lonöfon.',
 'protect_expiry_old'          => 'Dul ya epasetikon.',
 'protect-unchain'             => 'Mögükön dälis ad topätükön',
-'protect-text'                => 'Kanol logön e votükön is jelanivodi pada: <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => 'No kanol votükön jelanivodi bi peblokol. Ekö! paramets anuik pada: <strong>$1</strong>:',
-'protect-locked-dblock'       => 'Jelanivods no kanons pavotükön sekü lökofärmükam vüka at. Ekö! paramets anuik pada: <strong>$1</strong>:',
-'protect-locked-access'       => 'Kal olik no labon däli ad votükön jelanivodi padas.
-Ekö! parametem anuik pada: <strong>$1</strong>:',
+'protect-text'                => "Kanol logön e votükön is jelanivodi pada: '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "No kanol votükön jelanivodi bi peblokol. Ekö! paramets anuik pada: '''$1''':",
+'protect-locked-dblock'       => "Jelanivods no kanons pavotükön sekü lökofärmükam vüka at. Ekö! paramets anuik pada: '''$1''':",
+'protect-locked-access'       => "Kal olik no labon däli ad votükön jelanivodi padas.
+Ekö! parametem anuik pada: '''$1''':",
 'protect-cascadeon'           => 'Pad at atimo pajelon bi duton lü {{PLURAL:$1|pad sököl, kel labon|pads sököl, kels labons}} jänajeli jäfidik. Kanol votükön jelanivodi pada at, ab atos no oflunon jänajeli.',
 'protect-default'             => '(pebuüköl)',
 'protect-fallback'            => 'Däl: "$1" zesüdon',
-'protect-level-autoconfirmed' => 'Blokön gebanis no peregistarölis',
+'protect-level-autoconfirmed' => 'Blokön gebanis nulik e no peregistarölis',
 'protect-level-sysop'         => 'Te guvans',
 'protect-summary-cascade'     => 'as jän',
 'protect-expiring'            => 'dul jü $1 (UTC)',
+'protect-expiry-indefinite'   => 'nenfinik',
 'protect-cascade'             => 'Jelön padis in pad at pekeninükölis (jänajelam)',
 'protect-cantedit'            => 'No kanol votükön jelanivodi pada at bi no labol däli ad redakön oni.',
+'protect-othertime'           => 'Tim votik:',
+'protect-othertime-op'        => 'tim votik',
+'protect-existing-expiry'     => 'Dul dabinöl: jü $3, tü $2',
+'protect-otherreason'         => 'Kod votik/pluik:',
+'protect-otherreason-op'      => 'kod votik/pluik',
+'protect-dropdown'            => '* Jelakods suvik
+** Vandalim tuik
+** Spam tuik
+** Redakamakrigs tupöl
+** Pad labü dakosäd tuik',
+'protect-edit-reasonlist'     => 'Redakön jelakodis',
+'protect-expiry-options'      => 'düps 2:2 hours,del 1:1 day,dels 3:3 days,vig 1:1 week,vigs 2:2 weeks,mul 1:1 month,muls 3:3 months,muls 6:6 months,yel 1:1 year,laidüp:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Däl:',
 'restriction-level'           => 'Miedükamanivod:',
 'minimum-size'                => 'Gretot smalikün',
@@ -1545,6 +1828,7 @@ Ekö! parametem anuik pada: <strong>$1</strong>:',
 'restriction-edit'   => 'Redakön',
 'restriction-move'   => 'Topätükön',
 'restriction-create' => 'Jafön',
+'restriction-upload' => 'Löpükön',
 
 # Restriction levels
 'restriction-level-sysop'         => 'pejelon lölöfiko',
@@ -1556,22 +1840,25 @@ Ekö! parametem anuik pada: <strong>$1</strong>:',
 'undeletepage'                 => 'Jonön e sädunön padimoükamis',
 'undeletepagetitle'            => "'''Sökölos binädon me fomams pemoüköl pada: [[:$1]]'''.",
 'viewdeletedpage'              => 'Jonön padis pemoüköl',
-'undeletepagetext'             => 'Pads sököl pemoükons ab binons nog in registar: moükam onas kanon pasädunön.
+'undeletepagetext'             => '{{PLURAL:$1|Pad sököl pemoükon ab binon nog in registar: moükam ona|Pads sököl $1 pemoükons ab binons nog in registar: moükam onas}} kanon pasädunön.
 Registar pavagükon periodiko.',
-'undeleteextrahelp'            => "Ad sädunön moükami pada lölik, vagükolös bügilis valik e välolös me mugaparat knopi: '''''Sädunolöd moükami'''''. Ad sädunön moükami no lölöfik, välolös me mugaparat bügilis revidas pavipöl, e tän knopi: '''''Sädunolöd moükami'''''. Knop: '''''Vagükolöd vali''''' vagükön küpeti e bügilis valik.",
+'undelete-fieldset-title'      => 'Nätükön revidis',
+'undeleteextrahelp'            => "Ad sädunön moükami pada lölik, vagükolös bügilis valik e välolös me mugaparat knopi: '''''Sädunolöd moükami'''''. 
+Ad sädunön moükami no lölöfik, välolös me mugaparat bügilis revidas pavipöl, täno knopi: '''''Sädunolöd moükami'''''. Knop: '''''Vagükolöd vali''''' vagükön küpeti e bügilis valik.",
 'undeleterevisions'            => '{{PLURAL:$1|revid 1 peregistaron|revids $1 peregistarons}}',
 'undeletehistory'              => 'If osädunol moükami pada at, revids valik ogepubons in jenotem onik.
-If pad nulik labü tiäd ot pejafon pos moükam at, revids ogepubons in jenotem pada nulik at, e fomam nuik ona no poplaädon itjäfidiko.',
+If pad nulik labü tiäd ot pejafon pos moükam at, revids pada rigik ogepubons in jenotem ona.',
 'undeleterevdel'               => 'Sädunam moükama no poledunon if okodon moükami dila padafomama lätik.
 Ön jenets at, nedol sävälön u säklänedön fomamis pemoüköl nulikün.',
 'undeletehistorynoadmin'       => 'Yeged at pemoükon. Kod moükama pajonon dono, kobü pats gebanas, kels iredakons padi at büä pämoükon. Vödem redakamas pemoüköl at gebidon te guvanes.',
-'undelete-revision'            => 'Pemoükon fomam pada: $1 (dätü $2) pejaföl fa geban: $3:',
+'undelete-revision'            => 'Fomam pada: $1 (dät: $4, tim: $5), pemoüköl fa geban: $3:',
 'undeleterevision-missing'     => 'Fomam no lonöföl u no dabinöl.
 Ba labol yümi dädik, u ba fomam pegepübon u pemoükon se registar.',
 'undelete-nodiff'              => 'Fomams büik no petuvons.',
 'undeletebtn'                  => 'Sädunön moükami',
 'undeletelink'                 => 'sädunön moükami',
 'undeletereset'                => 'Vagükolöd vali',
+'undeleteinvert'               => 'Väli güükön',
 'undeletecomment'              => 'Küpet:',
 'undeletedarticle'             => 'Moükam pada: "[[$1]]" pesädunon',
 'undeletedrevisions'           => 'Moükam {{PLURAL:$1|revida 1 pesädunon|revidas $1 pesädunons}}',
@@ -1586,6 +1873,8 @@ Logolös [[Special:Log/delete|lisedi moükamas]] if vilol kontrolön moükamis e
 'undelete-search-prefix'       => 'Jonön padis primölo me:',
 'undelete-search-submit'       => 'Sukolöd',
 'undelete-no-results'          => 'Pads leigöl nonik petuvons in registar moükamas.',
+'undelete-filename-mismatch'   => 'No mögos ad moükön ragivirevidi tü $1: ragivanem no leigon',
+'undelete-bad-store-key'       => 'No mögos ad moükön ragivirevidi tü $1: ragiv no ädabinon bü moükam.',
 'undelete-cleanup-error'       => 'Pöl dü moükam ragiva no pageböla: "$1".',
 'undelete-missing-filearchive' => 'No emögos ad sädunön moükami ragiva: $1 bi no binon in nünodem.
 Moükam onik ba ya pesädunon.',
@@ -1593,6 +1882,7 @@ Moükam onik ba ya pesädunon.',
 'undelete-error-long'          => 'Pöls äjenons dü sädunam moükama ragiva:
 
 $1',
+'undelete-show-file-confirm'   => 'Vilol-li fümiko logön revidi pemoüköl ragiva: „<nowiki>$1</nowiki>“ dätü $2 tü $3?',
 'undelete-show-file-submit'    => 'Si',
 
 # Namespace form on various pages
@@ -1601,105 +1891,140 @@ $1',
 'blanknamespace' => '(Cifik)',
 
 # Contributions
-'contributions' => 'Gebanakeblünots',
-'mycontris'     => 'Keblünots obik',
-'contribsub2'   => 'Tefü $1 ($2)',
-'nocontribs'    => 'Votükams nonik petuvons me paramets at.',
-'uctop'         => '(lätik)',
-'month'         => 'De mul (e büiks):',
-'year'          => 'De yel (e büiks):',
-
-'sp-contributions-newbies'     => 'Jonolöd te keblünotis kalas nulik',
-'sp-contributions-newbies-sub' => 'Tefü kals nulik',
-'sp-contributions-blocklog'    => 'Jenotalised blokamas',
-'sp-contributions-search'      => 'Sukön keblünotis',
-'sp-contributions-username'    => 'Ladet-IP u gebananem:',
-'sp-contributions-submit'      => 'Suk',
+'contributions'       => 'Gebanakeblünots',
+'contributions-title' => 'Gebanakeblünots pro $1',
+'mycontris'           => 'Keblünots obik',
+'contribsub2'         => 'Tefü $1 ($2)',
+'nocontribs'          => 'Votükams nonik petuvons me paramets at.',
+'uctop'               => '(lätik)',
+'month'               => 'De mul (e büiks):',
+'year'                => 'De yel (e büiks):',
+
+'sp-contributions-newbies'       => 'Jonolöd te keblünotis kalas nulik',
+'sp-contributions-newbies-sub'   => 'Tefü kals nulik',
+'sp-contributions-newbies-title' => 'Gebanakeblünots pro kals nulik',
+'sp-contributions-blocklog'      => 'Jenotalised blokamas',
+'sp-contributions-search'        => 'Sukön keblünotis',
+'sp-contributions-username'      => 'Ladet-IP u gebananem:',
+'sp-contributions-submit'        => 'Suk',
 
 # What links here
 'whatlinkshere'            => 'Yüms isio',
 'whatlinkshere-title'      => 'Pads ad "$1" yumöls',
 'whatlinkshere-page'       => 'Pad:',
-'linklistsub'              => '(Yümalised)',
 'linkshere'                => "Pads sököl payümons ko '''[[:$1]]''':",
 'nolinkshere'              => "Pads nonik peyümons lü '''[[:$1]]'''.",
 'nolinkshere-ns'           => "Pads nonik yumons lü pad: '''[[:$1]]''' in nemaspad pevälöl.",
 'isredirect'               => 'lüodükömapad',
 'istemplate'               => 'ninükam',
+'isimage'                  => 'magodayüm',
 'whatlinkshere-prev'       => '{{PLURAL:$1|büik|büik $1}}',
 'whatlinkshere-next'       => '{{PLURAL:$1|sököl|sököl $1}}',
 'whatlinkshere-links'      => '� yüms',
 'whatlinkshere-hideredirs' => '$1 lüodükömis',
 'whatlinkshere-hidelinks'  => '$1 yümis',
 'whatlinkshere-hideimages' => '$1 yümis magodas',
+'whatlinkshere-filters'    => 'Suls',
 
 # Block/unblock
-'blockip'                     => 'Blokön gebani',
-'blockip-legend'              => 'Blokön gebani',
-'blockiptext'                 => 'Gebolös padi at ad blokön redakamagitäti gebananema u ladeta-IP semikas. Atos söton padunön teiko ad vitön vandalimi, e bai [[{{MediaWiki:Policy-url}}|dunalesets {{SITENAME}}]]. Penolös dono kodi patik pro blokam (a. s., mäniotolös padis pedobüköl).',
-'ipaddress'                   => 'Ladet-IP',
-'ipadressorusername'          => 'Ladet-IP u gebananem',
-'ipbexpiry'                   => 'Dü',
-'ipbreason'                   => 'Kod',
-'ipbreasonotherlist'          => 'Kod votik',
-'ipbanononly'                 => 'Blokön te gebanis nen gebananem',
-'ipbcreateaccount'            => 'Neletön kalijafi',
-'ipbemailban'                 => 'Nemögükön gebane sedi pota leäktronik',
-'ipbenableautoblock'          => 'Blokön itjäfidiko ladeti-IP lätik fa geban at pegeböli, äsi ladetis-IP fovik valik, yufü kels osteifülon ad redakön',
-'ipbsubmit'                   => 'Blokön gebani at',
-'ipbother'                    => 'Dul votik',
-'ipboptions'                  => 'düps 2:2 hours,del 1:1 day,dels 3:3 days,vig 1:1 week,vigs 2:2 weeks,mul 1:1 month,muls 3:3 months,muls 6:6 months,yel 1:1 year,laidüp:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'              => 'dul votik',
-'ipbotherreason'              => 'Kod(s) votik',
-'ipbhidename'                 => 'Klänedön gebani u ladeti-IP se jenotalised blokamas, blokamalised anuik e gebanalised',
-'badipaddress'                => 'Ladet-IP no lonöfon',
-'blockipsuccesssub'           => 'Blokam eplöpon',
-'blockipsuccesstext'          => '[[Special:Contributions/$1|$1]] peblokon.
+'blockip'                         => 'Blokön gebani',
+'blockip-legend'                  => 'Blokön gebani',
+'blockiptext'                     => 'Gebolös padi at ad blokön redakamagitäti gebananema u ladeta-IP semikas. Atos söton padunön teiko ad vitön vandalimi, e bai [[{{MediaWiki:Policy-url}}|dunalesets {{SITENAME}}]]. Penolös dono kodi patik pro blokam (a. s., mäniotolös padis pedobüköl).',
+'ipaddress'                       => 'Ladet-IP',
+'ipadressorusername'              => 'Ladet-IP u gebananem',
+'ipbexpiry'                       => 'Dü',
+'ipbreason'                       => 'Kod',
+'ipbreasonotherlist'              => 'Kod votik',
+'ipbreason-dropdown'              => '*Blokamakods suvik:
+** Läükam nünas neverätik
+** Moükam ninäda se pads
+** Läükam yümas plödik tu mödikis (el „spam“)
+** Penam vödas/vödemas nesiämik su pads
+** Kondöt tu komipälik u dredüköl
+** Geb dobik kalas mödik
+** Gebananem no zepabik',
+'ipbanononly'                     => 'Blokön te gebanis nen gebananem',
+'ipbcreateaccount'                => 'Neletön kalijafi',
+'ipbemailban'                     => 'Nemögükön gebane sedi pota leäktronik',
+'ipbenableautoblock'              => 'Blokön itjäfidiko ladeti-IP lätik fa geban at pegeböli, äsi ladetis-IP fovik valik, yufü kels osteifülon ad redakön',
+'ipbsubmit'                       => 'Blokön gebani at',
+'ipbother'                        => 'Dul votik',
+'ipboptions'                      => 'düps 2:2 hours,del 1:1 day,dels 3:3 days,vig 1:1 week,vigs 2:2 weeks,mul 1:1 month,muls 3:3 months,muls 6:6 months,yel 1:1 year,laidüp:infinite', # display1:time1,display2:time2,...
+'ipbotheroption'                  => 'dul votik',
+'ipbotherreason'                  => 'Kod(s) votik',
+'ipbhidename'                     => 'Klänedön gebani u ladeti-IP se jenotalised blokamas, blokamalised anuik e gebanalised',
+'ipbwatchuser'                    => 'Galädon gebana- e bespikapadis gebana at',
+'ipballowusertalk'                => 'Dälön gebane pebloköl ad redakön bespikapadi okik',
+'ipb-change-block'                => 'Dönublokön gebani me paramets at',
+'badipaddress'                    => 'Ladet-IP no lonöfon',
+'blockipsuccesssub'               => 'Blokam eplöpon',
+'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] peblokon.
 <br />Logolös [[Special:IPBlockList|lisedi ladetas-IP pebloköl]] ad vestigön blokamis.',
-'ipb-edit-dropdown'           => 'Redakön kodis blokama',
-'ipb-unblock-addr'            => 'Säblokön eli $1',
-'ipb-unblock'                 => 'Säblokön gebananemi u ladeti-IP',
-'ipb-blocklist-addr'          => 'Blokams dabinöl tefü el $1',
-'ipb-blocklist'               => 'Logön blokamis dabinöl',
-'unblockip'                   => 'Säblokön gebani',
-'unblockiptext'               => 'Gebolös padi at ad gegivön redakamafägi gebane (u ladete-IP) büo pibloköle.',
-'ipusubmit'                   => 'Säblokön ladeti at',
-'unblocked'                   => '[[User:$1|$1]] pesäblokon',
-'unblocked-id'                => 'Blokam: $1 pesädunon',
-'ipblocklist'                 => 'Ladets-IP e gebananems pebloköls',
-'ipblocklist-legend'          => 'Tuvön gebani pebloköl',
-'ipblocklist-username'        => 'Gebananem u ladet IP:',
-'ipblocklist-submit'          => 'Suk',
-'blocklistline'               => '$1, $2 äblokon $3 ($4)',
-'infiniteblock'               => 'laidüpo',
-'anononlyblock'               => 'te nennemans',
-'noautoblockblock'            => 'Blokam itjäfidik penemögukon',
-'createaccountblock'          => 'kalijaf peblokon',
-'emailblock'                  => 'ladet leäktronik peblokon',
-'ipblocklist-empty'           => 'Blokamalised vagon.',
-'ipblocklist-no-results'      => 'Ladet-IP u gebananem peflagöl no peblokon.',
-'blocklink'                   => 'blokön',
-'unblocklink'                 => 'säblokön',
-'contribslink'                => 'keblünots',
-'autoblocker'                 => 'Peblokon bi ladet-IP olik pegebon brefabüo fa geban: „[[User:$1|$1]]“. Kod blokama ela $1 binon: „$2“',
-'blocklogpage'                => 'Jenotalised blokamas',
-'blocklogentry'               => '"[[$1]]" peblokon dü: $2 $3',
-'blocklogtext'                => 'Is binon lised gebanablokamas e gebanasäblokamas. Ladets-IP itjäfidiko pebloköls no pajonons. Logolös blokamis e xilis anu lonöfölis in [[Special:IPBlockList|lised IP-blokamas]].',
-'unblocklogentry'             => '$1 pesäblokon',
-'block-log-flags-anononly'    => 'te gebans nennemik',
-'block-log-flags-nocreate'    => 'kalijaf penemögükon',
-'block-log-flags-noautoblock' => 'blokam itjäfidik penemögükon',
-'block-log-flags-noemail'     => 'ladet leäktronik peblokon',
-'range_block_disabled'        => 'Fäg guvana ad jafön ladetemis penemögükon.',
-'ipb_expiry_invalid'          => 'Blokamadul no lonöfon.',
-'ipb_already_blocked'         => '"$1" ya peblokon',
-'ipb_cant_unblock'            => 'Pöl: Bokamadientif: $1 no petuvon. Ba ya pesäblokon.',
-'ipb_blocked_as_range'        => 'Pöl: ladet-IP $1 no peblokon stedöfiko e no kanon pasäblokön.
+'ipb-edit-dropdown'               => 'Redakön kodis blokama',
+'ipb-unblock-addr'                => 'Säblokön eli $1',
+'ipb-unblock'                     => 'Säblokön gebananemi u ladeti-IP',
+'ipb-blocklist-addr'              => 'Blokams dabinöl tefü el $1',
+'ipb-blocklist'                   => 'Logön blokamis dabinöl',
+'ipb-blocklist-contribs'          => 'Keblünots gebana: $1',
+'unblockip'                       => 'Säblokön gebani',
+'unblockiptext'                   => 'Gebolös padi at ad gegivön redakamafägi gebane (u ladete-IP) büo pibloköle.',
+'ipusubmit'                       => 'Säblokön ladeti at',
+'unblocked'                       => '[[User:$1|$1]] pesäblokon',
+'unblocked-id'                    => 'Blokam: $1 pesädunon',
+'ipblocklist'                     => 'Ladets-IP e gebananems pebloköls',
+'ipblocklist-legend'              => 'Tuvön gebani pebloköl',
+'ipblocklist-username'            => 'Gebananem u ladet IP:',
+'ipblocklist-sh-userblocks'       => 'kaliblokams $1',
+'ipblocklist-sh-tempblocks'       => 'blokams nelaidüpik $1',
+'ipblocklist-sh-addressblocks'    => 'blokams $1 tefü ladets-IP balatik',
+'ipblocklist-submit'              => 'Suk',
+'blocklistline'                   => '$1, $2 äblokon $3 ($4)',
+'infiniteblock'                   => 'laidüpo',
+'expiringblock'                   => 'dulon jü $1',
+'anononlyblock'                   => 'te nennemans',
+'noautoblockblock'                => 'Blokam itjäfidik penemögukon',
+'createaccountblock'              => 'kalijaf peblokon',
+'emailblock'                      => 'ladet leäktronik peblokon',
+'blocklist-nousertalk'            => 'no dalon redakön bespikapadi okik',
+'ipblocklist-empty'               => 'Blokamalised vagon.',
+'ipblocklist-no-results'          => 'Ladet-IP u gebananem peflagöl no peblokon.',
+'blocklink'                       => 'blokön',
+'unblocklink'                     => 'säblokön',
+'change-blocklink'                => 'votükön blokami',
+'contribslink'                    => 'keblünots',
+'autoblocker'                     => 'Peblokon bi ladet-IP olik pegebon brefabüo fa geban: „[[User:$1|$1]]“. Kod blokama ela $1 binon: „$2“',
+'blocklogpage'                    => 'Jenotalised blokamas',
+'blocklog-fulllog'                => 'Jenotalised lölöfik blokamas',
+'blocklogentry'                   => '"[[$1]]" peblokon dü: $2 $3',
+'reblock-logentry'                => 'blokamaparamets gebana: [[$1]] pevotükons, pro dul: $2 (kod: $3)',
+'blocklogtext'                    => 'Is binon lised gebanablokamas e gebanasäblokamas. Ladets-IP itjäfidiko pebloköls no pajonons. Logolös blokamis e xilis anu lonöfölis in [[Special:IPBlockList|lised IP-blokamas]].',
+'unblocklogentry'                 => '$1 pesäblokon',
+'block-log-flags-anononly'        => 'te gebans nennemik',
+'block-log-flags-nocreate'        => 'kalijaf penemögükon',
+'block-log-flags-noautoblock'     => 'blokam itjäfidik penemögükon',
+'block-log-flags-noemail'         => 'ladet leäktronik peblokon',
+'block-log-flags-nousertalk'      => 'no dalon redakön bespikapadi okik',
+'block-log-flags-angry-autoblock' => 'blokam itjäfidik gudikum pemögükon',
+'range_block_disabled'            => 'Fäg guvana ad jafön ladetemis penemögükon.',
+'ipb_expiry_invalid'              => 'Blokamadul no lonöfon.',
+'ipb_expiry_temp'                 => 'Gebananemiblokams klänedik mutons binön laidüpiks.',
+'ipb_already_blocked'             => '"$1" ya peblokon',
+'ipb-needreblock'                 => '== Ya Peblokon ==
+Geban: $1 ya peblokon. Vilol-li votükön parametis?',
+'ipb_cant_unblock'                => 'Pöl: Bokamadientif: $1 no petuvon. Ba ya pesäblokon.',
+'ipb_blocked_as_range'            => 'Pöl: ladet-IP $1 no peblokon stedöfiko e no kanon pasäblokön.
 Peblokon ye as dil ladetema: $2, kel kanon pasäblokön.',
-'ip_range_invalid'            => 'Ladetem-IP no lonöföl.',
-'blockme'                     => 'Blokolöd obi',
-'proxyblocker-disabled'       => 'Dun at penemogükon.',
-'proxyblocksuccess'           => 'Peledunon.',
+'ip_range_invalid'                => 'Ladetem-IP no lonöföl.',
+'blockme'                         => 'Blokolöd obi',
+'proxyblocker'                    => 'Bloköm pladulömas',
+'proxyblocker-disabled'           => 'Dun at penemogükon.',
+'proxyblockreason'                => 'Ladet-IP olik peblokon bi binon pladulöm maifik.
+Kosikolös ko dünigevan bevüresodik u kaenastütans olik e nunolös ones sefasäkädi fefik at.',
+'proxyblocksuccess'               => 'Peledunon.',
+'sorbsreason'                     => 'Ladet-IP olik palisedon as pladulöm maifik pö el DNSBL fa {{SITENAME}} pageböl.',
+'sorbs_create_account_reason'     => 'Ladet-IP olik palisedon as pladulöm maifik pö el DNSBL fa {{SITENAME}} pageböl.
+No dalol jafön kali.',
+'cant-block-while-blocked'        => 'No dalol blokön gebanis votik bi peblokol it.',
 
 # Developer tools
 'lockdb'              => 'Lökofärmükön nünodemi',
@@ -1722,47 +2047,69 @@ No glömolös ad [[Special:UnlockDB|maifükön oni]] ven ufinükol vobi olik.',
 'databasenotlocked'   => 'Vük at no pefärmükon.',
 
 # Move page
-'move-page'               => 'Topätükön padi: $1',
-'move-page-legend'        => 'Topätükolöd padi',
-'movepagetext'            => "Me fomet at kanoy votükön padanemi, ottimo feapladölo jenotemi lölöfik ona disi nem nulik. Tiäd büik ovedon lüodüköm lü tiäd nulik. Yüms lü padatiäd büik no povotükons; kontrolös dabini lüodükömas telik u dädikas. Gididol ad garanön, das yüms blebons lüodükön lü pads, lü kels mutons lüodükön.
+'move-page'                    => 'Topätükön padi: $1',
+'move-page-legend'             => 'Topätükolöd padi',
+'movepagetext'                 => "Me fomet at kanoy votükön padanemi, ottimo feapladölo jenotemi lölöfik ona disi nem nulik. Tiäd büik ovedon lüodüköm lü tiäd nulik. Yüms lü padatiäd büik no povotükons; kontrolös dabini lüodükömas telik u dädikas. Gididol ad garanön, das yüms blebons lüodükön lü pads, lü kels mutons lüodükön.
 
 Küpälolös, das pad '''no''' potopätükon if ya dabinon pad labü tiäd nulik, bisä vagon u binon lüodüköm e no labon jenotemi. Atos sinifon, das, if pölol, nog kanol gepladön padi usio, kö äbinon büo, e das no kanol pladön padi nulik sui pad ya dabinöl.
 
 <b>NUNED!</b>
 Votükam at kanon binön mu staböfik ä no paspetöl pö pad pöpedik. Suemolös, begö! gudiko sekis duna at büä ofövol oni.",
-'movepagetalktext'        => "Bespikapad tefik potopätükön itjäfidiko kobü pad at '''pläsif:'''
+'movepagetalktext'             => "Bespikapad tefik potopätükön itjäfidiko kobü pad at '''pläsif:'''
 * bespikapad no vägik labü tiäd nulik ya dabinon, u
 * vagükol anu bokili dono.
 
 Ön jenets at, if vilol topätükön bespikapadi u balön oni e padi ya dabinöl, ol it omutol dunön osi.",
-'movearticle'             => 'Topätükolöd padi',
-'movenotallowed'          => 'No dalol topätükön padis.',
-'newtitle'                => 'Lü tiäd nulik',
-'move-watch'              => 'Pladolöd padi at ini galädalised',
-'movepagebtn'             => 'Topätükolöd padi',
-'pagemovedsub'            => 'Topätükam eplöpon',
-'movepage-moved'          => '<big>\'\'\'"$1" petopätükon lü "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => 'Pad labü nem at ya dabinon, u nem fa ol pevälöl no lonöfon.
+'movearticle'                  => 'Topätükolöd padi',
+'movenologin'                  => 'No enunädon oki',
+'movenologintext'              => 'Mutol binön geban peregistaröl e [[Special:UserLogin|nunädön oli]] ad topätükön padi.',
+'movenotallowed'               => 'No dalol topätükön padis.',
+'movenotallowedfile'           => 'No dalol topätükön ragivis.',
+'cant-move-user-page'          => 'No dalol topäkütön gebanapadis (pläamü donapads).',
+'cant-move-to-user-page'       => 'No dalol topätükön padi ad gebanapad (te ad gebanadonapad).',
+'newtitle'                     => 'Lü tiäd nulik',
+'move-watch'                   => 'Pladolöd padi at ini galädalised',
+'movepagebtn'                  => 'Topätükolöd padi',
+'pagemovedsub'                 => 'Topätükam eplöpon',
+'movepage-moved'               => '<big>\'\'\'"$1" petopätükon lü "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => 'Lüodüköm pejafon.',
+'movepage-moved-noredirect'    => 'Lüoküköm ye no pejafon.',
+'articleexists'                => 'Pad labü nem at ya dabinon, u nem fa ol pevälöl no lonöfon.
 Välolös nemi votik.',
-'cantmove-titleprotected' => 'No kanol topätükön padi bi jafam tiäda nulik at penemögükon.',
-'talkexists'              => "'''Pad it petopätükon benosekiko, ab bespikapad onik no petopätükon bi ya dabinon pad labü tiäd ona. Ol it balolös onis.'''",
-'movedto'                 => 'petöpätükon lü',
-'movetalk'                => 'Topätükolöd bespikapadi tefik',
-'movepage-page-moved'     => 'Pad: $1 petopätükon lü $2.',
-'1movedto2'               => '[[$1]] petopätükon lü [[$2]]',
-'1movedto2_redir'         => '[[$1]] petopätükon lü [[$2]] vegü lüodüköm',
-'movelogpage'             => 'Jenotalised topätükamas',
-'movelogpagetext'         => 'Is palisedons pads petopätüköl.',
-'movereason'              => 'Kod:',
-'revertmove'              => 'sädunön',
-'delete_and_move'         => 'Moükolöd e topätükolöd',
-'delete_and_move_text'    => '==Moükam peflagon==
+'cantmove-titleprotected'      => 'No kanol topätükön padi bi jafam tiäda nulik at penemögükon.',
+'talkexists'                   => "'''Pad it petopätükon benosekiko, ab bespikapad onik no petopätükon bi ya dabinon pad labü tiäd ona. Ol it balolös onis.'''",
+'movedto'                      => 'petöpätükon lü',
+'movetalk'                     => 'Topätükolöd bespikapadi tefik',
+'move-subpages'                => 'Topätükön donapadis valik, if dabinons',
+'move-talk-subpages'           => 'Topätükön donapadis valik bespikapada, if dabinons',
+'movepage-page-exists'         => 'Pad: $1 ya dabinon; pad nulik no dalon palovepladön sui on itjäfidiko.',
+'movepage-page-moved'          => 'Pad: $1 petopätükon lü $2.',
+'movepage-page-unmoved'        => 'No eplöpos ad topätükön padi: $1 ad pad: $2.',
+'movepage-max-pages'           => 'Maxumanüm {{PLURAL:$1|pada bal|pads $1}} petopätükon; pads pluik nonik potopätükons itjäfidiko.',
+'1movedto2'                    => '[[$1]] petopätükon lü [[$2]]',
+'1movedto2_redir'              => '[[$1]] petopätükon lü [[$2]] vegü lüodüköm',
+'move-redirect-suppressed'     => 'lüodüköm no pejafon',
+'movelogpage'                  => 'Jenotalised topätükamas',
+'movelogpagetext'              => 'Is palisedons pads petopätüköl.',
+'movereason'                   => 'Kod:',
+'revertmove'                   => 'sädunön',
+'delete_and_move'              => 'Moükolöd e topätükolöd',
+'delete_and_move_text'         => '==Moükam peflagon==
 
 Yeged nulik "[[:$1]]" ya dabinon. Vilol-li moükön oni ad jafön spadi pro topätükam?',
-'delete_and_move_confirm' => 'Si! moükolöd padi',
-'delete_and_move_reason'  => 'Pemoükon ad jafön spadi pro topätükam',
-'selfmove'                => 'Tiäds nulik e bäldik binons ots; pad no kanon patopätükön sui ok it.',
-'immobile_namespace'      => 'Fonät e/u zeil binon padasots patik: no kanoy topätükön padis ini u se nemaspad at.',
+'delete_and_move_confirm'      => 'Si! moükolöd padi',
+'delete_and_move_reason'       => 'Pemoükon ad jafön spadi pro topätükam',
+'selfmove'                     => 'Tiäds nulik e bäldik binons ots; pad no kanon patopätükön sui ok it.',
+'immobile-source-namespace'    => 'Paditopätükön ini nemaspad: "$1" nemögon',
+'immobile-target-namespace'    => 'Paditopätükam ini nemaspad: "$1" nemögon',
+'immobile-target-namespace-iw' => 'Yüms vüvükik no lonöfons as zeil paditopätükama.',
+'immobile-source-page'         => 'Pad at no binon topätükovik.',
+'immobile-target-page'         => 'Topätükam ad tiäd at nemögon.',
+'imagenocrossnamespace'        => 'Ragivs no kanons patopätükön ini nemaspad no pedisinöl pro ragivs',
+'imagetypemismatch'            => 'Poyümot ragiva nulik no pöton pö sot onik',
+'imageinvalidfilename'         => 'Zeilaragivanem no lonöfon',
+'fix-double-redirects'         => 'Verätükön lüodükömis, kels dugons lü tiäd rigik',
+'move-leave-redirect'          => 'Posbinükön as lüodüköm',
 
 # Export
 'export'            => 'Seveigön padis',
@@ -1770,7 +2117,7 @@ Yeged nulik "[[:$1]]" ya dabinon. Vilol-li moükön oni ad jafön spadi pro topÃ
 
 Ad seveigön padis, penolös tiädis in penamaspad dono, tiädi bal a kedet, e välolös, va vilol fomami anuik kobü fomams büik valik, ko kedets padajenotema, u te fomami anuik kobü nüns dö redakam lätikün.
 
-Ön jenet lätik, kanol i gebön yümi, a.s.: [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pro pad "[[{{MediaWiki:Mainpage}}]]".',
+Ön jenet lätik, kanol i gebön yümi, a.s.: [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pro pad "[[{{MediaWiki:Mainpage}}]]".',
 'exportcuronly'     => 'Ninükolöd te revidi anuik, no jenotemi valik',
 'exportnohistory'   => "----
 '''Noet:''' Seveig padajenotema lölik medü fomet at penemögükon ad gudükumön duinafägi.",
@@ -1794,6 +2141,7 @@ Ad seveigön padis, penolös tiädis in penamaspad dono, tiädi bal a kedet, e v
 'thumbnail-more'           => 'Gretükön',
 'filemissing'              => 'Ragiv deföl',
 'thumbnail_error'          => 'Pöl pö jafam magodila: $1',
+'djvu_no_xml'              => 'No eplöpos ad tuvön eli XML pro ragiv fomätü DjVu',
 'thumbnail_invalid_params' => 'Paramets magodila no lonöfons',
 'thumbnail_dest_directory' => 'No emögos ad jafön zeilaragiviäri',
 
@@ -1803,9 +2151,12 @@ Ad seveigön padis, penolös tiädis in penamaspad dono, tiädi bal a kedet, e v
 'import-interwiki-text'      => 'Levälolös vüki e padatiädi ad nüveigön.
 Däts fomamas e nems redakanas pokipedons.
 Nüveigs vüvükik valik pajonons su [[Special:Log/import|nüveigamalised]].',
+'import-interwiki-source'    => 'Fonätavük/pad:',
 'import-interwiki-history'   => 'Kopiedön fomamis valik jenotema pada at',
 'import-interwiki-submit'    => 'Nüveigön',
-'import-interwiki-namespace' => 'Topätükon padis ini nemaspad:',
+'import-interwiki-namespace' => 'Ini nemaspad:',
+'import-upload-filename'     => 'Ragivanem:',
+'import-comment'             => 'Küpet:',
 'importtext'                 => 'Seveigolös ragivi se fonätavük me [[Special:Export|stum seveiga]].
 Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'importstart'                => 'Nüveigölo padis...',
@@ -1827,6 +2178,9 @@ Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'import-noarticle'           => 'Pad nüveigabik nonik!',
 'import-nonewrevisions'      => 'Fomams valik ya pinüveigons.',
 'xml-error-string'           => '$1 pö lien: $2, kolum: $3 (jölat: $4): $5',
+'import-upload'              => 'Löpükön nünodis-XML',
+'import-token-mismatch'      => 'Redakamanünods peperons. Steifülolös dönu.',
+'import-invalid-interwiki'   => 'Nüveigam se vük pavilöl no mögon.',
 
 # Import log
 'importlogpage'                    => 'Jenotalised nüveigamas',
@@ -1837,19 +2191,19 @@ Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'import-logentry-interwiki-detail' => '{{PLURAL:$1|fomam|fomams}} $1 se $2',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Gebanapad obik',
+'tooltip-pt-userpage'             => 'Gebanapad olik',
 'tooltip-pt-anonuserpage'         => 'Gebanapad ladeta-IP, me kel redakol',
-'tooltip-pt-mytalk'               => 'Bespiks obik',
+'tooltip-pt-mytalk'               => 'Bespiks olik',
 'tooltip-pt-anontalk'             => 'Bespik votükamas me ladet-IP at pejenükölas',
 'tooltip-pt-preferences'          => 'Buükams obik',
 'tooltip-pt-watchlist'            => 'Lised padas, kö galädol tefü votükams',
-'tooltip-pt-mycontris'            => 'Lised keblünotas obik',
+'tooltip-pt-mycontris'            => 'Lised keblünotas olik',
 'tooltip-pt-login'                => 'Binos gudik, ab no bligik, ad nunädön oyi.',
 'tooltip-pt-anonlogin'            => 'Binos gudik - ab no zesüdik - ad nunädön oli.',
 'tooltip-pt-logout'               => 'Senunädön oki',
 'tooltip-ca-talk'                 => 'Bespik dö ninädapad',
 'tooltip-ca-edit'                 => 'Kanol redakön padi at. Gebolös, begö! büologedi bü dakip.',
-'tooltip-ca-addsection'           => 'Lüükön küpeti bespike at.',
+'tooltip-ca-addsection'           => 'Primön dilädi nulik',
 'tooltip-ca-viewsource'           => 'Pad at pejelon. Kanol logön fonätakoti onik.',
 'tooltip-ca-history'              => 'Fomams büik pada at.',
 'tooltip-ca-protect'              => 'Jelön padi at',
@@ -1870,6 +2224,8 @@ Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'tooltip-n-help'                  => 'Is kanoy tuvön yufi e nünis.',
 'tooltip-t-whatlinkshere'         => 'Lised padas valik, kels yumons isio',
 'tooltip-t-recentchangeslinked'   => 'Votükams nulik padas, lü kels pad at yumon',
+'tooltip-feed-rss'                => 'Kanad (RSS) pro pad at',
+'tooltip-feed-atom'               => 'Kanad (Toum) pro pad at',
 'tooltip-t-contributions'         => 'Logön keblünotalisedi gebana at',
 'tooltip-t-emailuser'             => 'Sedolös penedi gebane at',
 'tooltip-t-upload'                => 'Löpükön ragivis',
@@ -1894,6 +2250,9 @@ Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'tooltip-watch'                   => 'Lüükön padi at galädalisede olik',
 'tooltip-recreate'                => 'Dönujafön padi do ya balna emoükon',
 'tooltip-upload'                  => 'Primön löpükami.',
+'tooltip-rollback'                => '„Sädunön vali“ sädunon redakami(s) pada at fa keblünan lätik me klik bal mugaparata.',
+'tooltip-undo'                    => '"Sädunön bali" sädunon redakami at e maifükön redakamafometi as büologed. 
+Dälon läükami koda.',
 
 # Stylesheets
 'common.css'   => '/** El CSS isio peplädöl pogebon pro padafomäts valik */',
@@ -1906,15 +2265,23 @@ Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'notacceptable' => 'Dünanünömi vüka no fägon ad blünön nünodis ma fomät, keli nünöm olik kanon reidön.',
 
 # Attribution
-'anonymous'        => 'Geban(s) nennemik {{SITENAME}}a',
+'anonymous'        => '{{PLURAL:$1|Geban|Gebans}} nennemik ela {{SITENAME}}',
 'siteuser'         => 'Geban ela {{SITENAME}}: $1',
 'lastmodifiedatby' => 'Pad at pävotükon lätiküno tü dÜp $1, ün $2, fa el $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'Stabü vob gebana: $1.',
 'others'           => 'votiks',
-'siteusers'        => 'Geban(s) ela {{SITENAME}}: $1',
+'siteusers'        => '{{PLURAL:$2|Geban|Gebans}} ela {{SITENAME}}: $1',
+'creditspage'      => 'Padanüns',
+'nocredits'        => 'Nüns padi at teföls no gebidons.',
 
 # Spam protection
-'spam_reverting' => 'Geükön ad fomam lätik, kel no älabon yümis lü $1',
+'spamprotectiontitle' => 'Jelasul ta spam',
+'spamprotectiontext'  => 'Pad, keli vilol dakipön, peblokon fa spamisul.
+Pad luveratiko ninädon yümi lü bevüresodatopäd plödik in blägalised.',
+'spamprotectionmatch' => 'Vödem sököl ekodon blokami fa spamisul: $1',
+'spambot_username'    => 'Spamiklinükam ela MediaWiki',
+'spam_reverting'      => 'Geükön ad fomam lätik, kel no älabon yümis lü $1',
+'spam_blanking'       => 'Moükam revidas valik (bi ninädons yüms lü $1)',
 
 # Info page
 'infosubtitle'   => 'Nüns tefü pad',
@@ -1944,9 +2311,11 @@ Dakipolös oni su nünöm olik e löpükolös oni isio.',
 'markedaspatrollederror-noautopatrol' => 'No dalol zepön votükamis lönik ola.',
 
 # Patrol log
-'patrol-log-page' => 'Jenotalised zepamas',
-'patrol-log-line' => 'Fomam: $1 pada: $2 pezepon $3',
-'patrol-log-auto' => '(itjäfidik)',
+'patrol-log-page'      => 'Jenotalised zepamas',
+'patrol-log-header'    => 'Is lisedons revids pezepöl.',
+'patrol-log-line'      => 'Fomam: $1 pada: $2 pezepon $3',
+'patrol-log-auto'      => '(itjäfidik)',
+'log-show-hide-patrol' => 'Jenotalised Zepamas: $1',
 
 # Image deletion
 'deletedrevision'                 => 'Fomam büik: $1 pemoükon.',
@@ -1963,6 +2332,9 @@ $1',
 'previousdiff' => '� Dif vönädikum',
 'nextdiff'     => 'Dif nulikum →',
 
+# Visual comparison
+'visual-comparison' => 'Leigodam ma logot',
+
 # Media information
 'mediawarning'         => "'''Nuned''': Ragiv at ba ninükon programi(s) badälik; if ojäfidükol oni, nünömasit olik ba podämükon.<hr />",
 'imagemaxsize'         => 'Miedükön magodis su pads magodis bepenöls ad:',
@@ -1975,10 +2347,12 @@ $1',
 'show-big-image'       => 'Gretot gudikün',
 'show-big-image-thumb' => '<small>Gretot büologeda at: magodaziöbs $1 × $2</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Pänotem ragivas nulik',
 'imagelisttext'         => "Dono binon lised '''$1''' {{PLURAL:$1|ragiva|ragivas}} $2 pedilädölas.",
 'newimages-summary'     => 'Pad patik at lisedon ragivis pelöpüköl lätik.',
+'newimages-legend'      => 'Sul',
+'newimages-label'       => 'Ragivanem (u dil ona):',
 'showhidebots'          => '($1 mäikamenis)',
 'noimages'              => 'Nos ad logön.',
 'ilsubmit'              => 'Sukolöd',
@@ -2006,44 +2380,114 @@ Te lisedaliens (liens me * primöl) pabevobons. Yüm balid liena muton binön yÃ
 # EXIF tags
 'exif-imagewidth'                  => 'Vidot',
 'exif-imagelength'                 => 'Geilot',
+'exif-bitspersample'               => 'Jölätabinets a köl',
 'exif-compression'                 => 'Skemat kobopedama',
+'exif-photometricinterpretation'   => 'Pixelabinädükam',
+'exif-orientation'                 => 'Kämilüodükam',
+'exif-samplesperpixel'             => 'Num kölas',
+'exif-planarconfiguration'         => 'Leodükam nünodas',
+'exif-ycbcrpositioning'            => 'staned Y e C',
+'exif-xresolution'                 => 'Distidafäg horitätik',
+'exif-yresolution'                 => 'Distidafäg penditik',
+'exif-resolutionunit'              => 'Stabäd distidafäga X e Y',
 'exif-stripoffsets'                => 'Topam magodanünodas',
+'exif-rowsperstrip'                => 'Num kedetas a strip',
+'exif-stripbytecounts'             => 'Jöläts a strip pekobopedöl',
+'exif-jpeginterchangeformat'       => 'Topätükön ad JPEG SOI',
 'exif-jpeginterchangeformatlength' => 'Jöläts nünodas: JPEG',
+'exif-transferfunction'            => 'Lovepladamasekät',
+'exif-whitepoint'                  => 'Kölöf püna vietik',
+'exif-primarychromaticities'       => 'Kölöf stabakölas',
+'exif-ycbcrcoefficients'           => 'Koäfs votükamataiba kölaspada',
+'exif-referenceblackwhite'         => 'Pär stabavöladas (vietik/blägik)',
 'exif-datetime'                    => 'Dät e tim votükama ragiva',
 'exif-imagedescription'            => 'Tiäd magoda',
+'exif-make'                        => 'Fabrikan aparata',
+'exif-model'                       => 'Aparatasot',
 'exif-software'                    => 'Nünömaprogram pegeböl',
 'exif-artist'                      => 'Lautan',
 'exif-copyright'                   => 'Dalaban kopiedagitäta',
 'exif-exifversion'                 => 'Fomam-Exif',
 'exif-colorspace'                  => 'Kölaspad',
+'exif-componentsconfiguration'     => 'Sinif komponena alik',
 'exif-compressedbitsperpixel'      => 'Mod kobopedama magoda',
 'exif-pixelydimension'             => 'Magodavidot lonöföl',
 'exif-pixelxdimension'             => 'Magodageilot lonöföl',
+'exif-makernote'                   => 'Penets fabrikana',
 'exif-usercomment'                 => 'Küpets gebana',
 'exif-relatedsoundfile'            => 'Tonaragiv tefik',
 'exif-datetimeoriginal'            => 'Dät e tim jafama nünodas',
 'exif-datetimedigitized'           => 'Dät e tim numatükama',
+'exif-subsectime'                  => 'Dät e tim (1/100 s)',
+'exif-subsectimeoriginal'          => 'Dät e tim rigiks (1/100 s)',
+'exif-subsectimedigitized'         => 'Dät e tim numeriks (1/100 s)',
+'exif-exposuretime'                => 'Jonamadul',
 'exif-exposuretime-format'         => '$1 sek ($2)',
 'exif-fnumber'                     => 'Num-F',
+'exif-exposureprogram'             => 'Jonamaprogram',
+'exif-spectralsensitivity'         => 'Senöfik späktrumik',
+'exif-isospeedratings'             => 'Senöf (ISO)',
+'exif-shutterspeedvalue'           => 'Färmikamavifot',
+'exif-aperturevalue'               => 'Maifamagrad',
+'exif-brightnessvalue'             => 'Litöf',
+'exif-exposurebiasvalue'           => 'Gudükumam jonama',
+'exif-maxaperturevalue'            => 'Maifikam maxumik',
+'exif-subjectdistance'             => 'Fagot zeila',
+'exif-meteringmode'                => 'Mafamamod',
 'exif-lightsource'                 => 'Litafonät',
 'exif-flash'                       => 'Kämalelit',
+'exif-focallength'                 => 'Foukafagot',
+'exif-subjectarea'                 => 'Portät',
 'exif-flashenergy'                 => 'Nämet kämalelita',
+'exif-spatialfrequencyresponse'    => 'Spadasuvöf',
+'exif-focalplanexresolution'       => 'Distidafäg-X foukaplena',
+'exif-focalplaneyresolution'       => 'Distidafäg-Y foukaplena',
+'exif-focalplaneresolutionunit'    => 'Distidafägastabäd foukaplena',
+'exif-subjectlocation'             => 'Staned zeila',
+'exif-exposureindex'               => 'Mafädanum litükama',
+'exif-sensingmethod'               => 'Senametod',
 'exif-filesource'                  => 'Fonät ragiva',
+'exif-scenetype'                   => 'Sot süfüla',
+'exif-cfapattern'                  => 'Pated-CFA',
+'exif-customrendered'              => 'Magodibevobam pelönedüköl',
+'exif-exposuremode'                => 'Litükamamod',
+'exif-whitebalance'                => 'Vietaleigavet',
+'exif-digitalzoomratio'            => 'Gretükamapropor numerik',
+'exif-focallengthin35mmfilm'       => 'Foukafagot pro films milmetas 35',
+'exif-scenecapturetype'            => 'Sot süfülilasumama',
+'exif-gaincontrol'                 => 'Litakontrol',
+'exif-contrast'                    => 'Taädam',
+'exif-saturation'                  => 'Satükam',
+'exif-sharpness'                   => 'Magodakurat',
+'exif-devicesettingdescription'    => 'Bepenam parametema aparata',
+'exif-subjectdistancerange'        => 'Zeilafagot',
 'exif-imageuniqueid'               => 'Magodadientifäd balik',
 'exif-gpslatituderef'              => 'Videt Nolüdik u Sulüdik',
 'exif-gpslatitude'                 => 'Videt',
 'exif-gpslongituderef'             => 'Lunet Lofüdik u Vesüdik',
 'exif-gpslongitude'                => 'Lunet',
+'exif-gpsaltituderef'              => 'Geilotastab',
 'exif-gpsaltitude'                 => 'Geilot',
 'exif-gpstimestamp'                => 'tim-GPS (glok taumik)',
 'exif-gpssatellites'               => 'Muneds pö mafam pegeböls',
+'exif-gpsstatus'                   => 'Getanastad',
+'exif-gpsmeasuremode'              => 'Mafamametod',
 'exif-gpsdop'                      => 'Kurat mafama',
 'exif-gpsspeedref'                 => 'Vifotastabäd',
+'exif-gpsspeed'                    => 'Vifot GPS-getiana',
+'exif-gpstrackref'                 => 'Stab pro mufalüod',
 'exif-gpstrack'                    => 'Mufalüod',
+'exif-gpsimgdirectionref'          => 'Stab pro magodalüod',
 'exif-gpsimgdirection'             => 'Lüod magoda',
+'exif-gpsdestlatituderef'          => 'Stab videta zeila',
 'exif-gpsdestlatitude'             => 'Zeilavidet',
+'exif-gpsdestlongituderef'         => 'Stab luneta zeila',
 'exif-gpsdestlongitude'            => 'Zeilalunet',
+'exif-gpsdestbearingref'           => 'Stab lüodükama zeila',
+'exif-gpsdestbearing'              => 'Zeilalüod',
+'exif-gpsdestdistanceref'          => 'Stab fagota zeila',
 'exif-gpsdestdistance'             => 'Fagot jü lükömöp',
+'exif-gpsprocessingmethod'         => 'Nem dunamoda-GPS',
 'exif-gpsareainformation'          => 'Nem topäda: GPS',
 'exif-gpsdatestamp'                => 'Dät ela GPS',
 
@@ -2053,17 +2497,29 @@ Te lisedaliens (liens me * primöl) pabevobons. Yüm balid liena muton binön yÃ
 'exif-unknowndate' => 'Dät nesevädik',
 
 'exif-orientation-1' => 'Nomik', # 0th row: top; 0th column: left
+'exif-orientation-2' => 'Petülöl horitäto', # 0th row: top; 0th column: right
 'exif-orientation-3' => 'Mö 180° pefleköl', # 0th row: bottom; 0th column: right
+'exif-orientation-4' => 'Petülöl pendito', # 0th row: bottom; 0th column: left
+
+'exif-planarconfiguration-1' => 'fomät grobik',
 
 'exif-componentsconfiguration-0' => 'no dabinon',
 
 'exif-exposureprogram-0' => 'No pemiedetöl',
+'exif-exposureprogram-1' => 'Gebü nams',
 'exif-exposureprogram-2' => 'Program nomöfik',
+'exif-exposureprogram-5' => 'Program buüköl feladibi',
+'exif-exposureprogram-6' => 'Program buüköl färmikami vifikum',
+'exif-exposureprogram-7' => 'Pöträtaprogram (pro fotografam nilao, pödaglun no kuratik)',
+'exif-exposureprogram-8' => 'Länodaprogram (pro länodifotografam, pödaglun kuratik)',
 
 'exif-subjectdistance-value' => 'Mets $1',
 
 'exif-meteringmode-0'   => 'Nesevädik',
 'exif-meteringmode-1'   => 'Zäned',
+'exif-meteringmode-3'   => 'Pünamafam',
+'exif-meteringmode-4'   => 'Mödapünamafam',
+'exif-meteringmode-5'   => 'Pated',
 'exif-meteringmode-6'   => 'Dilik',
 'exif-meteringmode-255' => 'Votik',
 
@@ -2073,24 +2529,60 @@ Te lisedaliens (liens me * primöl) pabevobons. Yüm balid liena muton binön yÃ
 'exif-lightsource-9'   => 'Stom gudik',
 'exif-lightsource-10'  => 'Stom lefogagik',
 'exif-lightsource-11'  => 'Jad',
+'exif-lightsource-17'  => 'Stabalit A',
+'exif-lightsource-18'  => 'Stabalit B',
+'exif-lightsource-19'  => 'Stabalit C',
 'exif-lightsource-255' => 'Litafonät votik',
 
+# Flash modes
+'exif-flash-fired-0'    => 'Kämalelit no pegebon',
+'exif-flash-fired-1'    => 'Kämalelit pegebon',
+'exif-flash-mode-1'     => 'Kämalelitigeb bligik',
+'exif-flash-mode-2'     => 'Kämalelitinegeb bligik',
+'exif-flash-mode-3'     => 'stad itjäfidik',
+'exif-flash-function-1' => 'Kämalelit no dabinon',
+'exif-flash-redeye-1'   => 'läsükam redaloga',
+
 'exif-focalplaneresolutionunit-2' => 'puids',
 
 'exif-sensingmethod-1' => 'No pemiedetöl',
+'exif-sensingmethod-5' => 'Kölisenian mastripik sürfatik',
+'exif-sensingmethod-7' => 'Senian killienöfik',
+'exif-sensingmethod-8' => 'Kölisenian lienöfik mastripik',
+
+'exif-scenetype-1' => 'Magod pefotograföl nemediko',
+
+'exif-customrendered-0' => 'Kösömik',
+'exif-customrendered-1' => 'Fa geban pelönedüköl',
+
+'exif-exposuremode-0' => 'Jonam itjäfidik',
+'exif-exposuremode-1' => 'Jonam gebü nams',
+'exif-exposuremode-2' => 'Kläm itjäfidik',
+
+'exif-whitebalance-0' => 'Vietaleigavet itjäfidik',
+'exif-whitebalance-1' => 'Vietaleigavet gebü nams',
 
+'exif-scenecapturetype-0' => 'Kösömik',
+'exif-scenecapturetype-1' => 'Länod',
 'exif-scenecapturetype-2' => 'Pöträt',
 'exif-scenecapturetype-3' => 'Ãœn neit',
 
 'exif-gaincontrol-0' => 'Nonik',
 
 'exif-contrast-0' => 'Nomik',
+'exif-contrast-1' => 'Fiböfik',
+'exif-contrast-2' => 'Nämöfik',
 
 'exif-saturation-0' => 'Nomik',
+'exif-saturation-1' => 'Satükam fiböfik',
+'exif-saturation-2' => 'Satükam nämöfik',
 
 'exif-sharpness-0' => 'Nomik',
+'exif-sharpness-1' => 'Pülik',
+'exif-sharpness-2' => 'Nämöfik',
 
 'exif-subjectdistancerange-0' => 'Nesevädik',
+'exif-subjectdistancerange-1' => 'Makro',
 'exif-subjectdistancerange-2' => 'Loged nilik',
 'exif-subjectdistancerange-3' => 'Loged fägik',
 
@@ -2104,6 +2596,9 @@ Te lisedaliens (liens me * primöl) pabevobons. Yüm balid liena muton binön yÃ
 
 'exif-gpsstatus-a' => 'Mafam padunon',
 
+'exif-gpsmeasuremode-2' => 'mafam 2-mafotik',
+'exif-gpsmeasuremode-3' => 'mafam 3-mafotik',
+
 # Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
 'exif-gpsspeed-k' => 'Milmets a düp',
 'exif-gpsspeed-m' => 'Liöls a düp',
@@ -2133,7 +2628,7 @@ Välolös me mugaparat knopi dono ad sedön fümedapenedi ladete olik. Pened oni
 'confirmemail_send'        => 'Sedön fümedakoti me pot leäktronik',
 'confirmemail_sent'        => 'Fümedapened pesedon.',
 'confirmemail_oncreate'    => 'Fümedakot pesedon lü ladet leäktronik ola. Kot at no zesüdon ad nunädön oli, ab omutol klavön oni büä okanol gebön ladeti leäktronik ola in vük at.',
-'confirmemail_sendfailed'  => 'No eplöpos ad sedön fümedapenedi. Ba ädabinons malats no lonöföls in ladet.
+'confirmemail_sendfailed'  => '{{SUTENAME}} no eplöpon ad sedön fümedapenedi. Ba ädabinons malats no lonöföls in ladet leäktronik ola.
 
 Potanünöm egesedon: $1',
 'confirmemail_invalid'     => 'Fümedakot no lonöfon. Jiniko binon tu bäldik.',
@@ -2158,38 +2653,34 @@ Fümedakot at operon lonöfi okik ün $4.',
 'invalidateemail'          => 'Negebidükon fümedami ladeta leäktronik',
 
 # Scary transclusion
+'scarytranscludefailed'  => '[Tuv samafomota no eplopön kodü $1]',
 'scarytranscludetoolong' => '[el URL binon tu lunik]',
 
 # Trackbacks
-'trackbackremove' => ' ([$1 Moükön])',
+'trackbackbox'      => '<div id="mw_trackbacks">Gevegs padi at teföls:<br />
+$1
+</div>',
+'trackbackremove'   => ' ([$1 Moükön])',
+'trackbacklink'     => 'Geveg',
+'trackbackdeleteok' => 'Geveg pemoükon benosekiko.',
 
 # Delete conflict
-'deletedwhileediting' => 'Nuned: Pad at pemoükon posä äprimol ad redakön oni!',
+'deletedwhileediting' => "'''Nuned''': Pad at pemoükon posä äprimol ad redakön oni!",
 'confirmrecreate'     => "Geban: [[User:$1|$1]] ([[User talk:$1|talk]]) ämoükon padi at posä äprimol ad redakön oni sekü kod sököl:
 : ''$2''
 Fümedolös, das jenöfo vilol dönujafön padi at.",
 'recreate'            => 'Dönujafön',
 
-# HTML dump
-'redirectingto' => 'Lüodükölo lü: [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => 'Vagükön eli caché pada at?
-
-$1',
 'confirm_purge_button' => 'Si!',
-
-# AJAX search
-'searchcontaining' => "Sukön padis labü ''$1''.",
-'searchnamed'      => "Sukön padis tiädü ''$1''.",
-'articletitles'    => "Yegeds me ''$1'' primöls",
-'hideresults'      => 'Klänedön sekis',
-'useajaxsearch'    => 'Gebön suki ela AJAX',
+'confirm-purge-top'    => 'Vagükön eli caché pada at?',
+'confirm-purge-bottom' => 'Vagükam mema nelaidüpik pada müton fomami nulikün ad pubön.',
 
 # Multipage image navigation
 'imgmultipageprev' => '� pad büik',
 'imgmultipagenext' => 'pad sököl →',
 'imgmultigo'       => 'Gololöd!',
+'imgmultigoto'     => 'Lü pad: $1',
 
 # Table pager
 'ascending_abbrev'         => 'löpio',
@@ -2203,10 +2694,10 @@ $1',
 'table_pager_empty'        => 'Seks nonik',
 
 # Auto-summaries
-'autosumm-blank'   => 'Ninäd valik pemoükon se pad',
+'autosumm-blank'   => 'Emoükon ninädi valik se pad',
 'autosumm-replace' => "Pad pepläadon me '$1'",
 'autoredircomment' => 'Lüodükon lü [[$1]]',
-'autosumm-new'     => 'Pad nulik: $1',
+'autosumm-new'     => "Ejafon padi ko: '$1'",
 
 # Live preview
 'livepreview-loading' => 'Pabelodon…',
@@ -2240,14 +2731,22 @@ Kanol i [[Special:Watchlist/edit|gebön redakametodi kösömik]].',
 'watchlisttools-edit' => 'Logön e redakön galädalisedi',
 'watchlisttools-raw'  => 'Redakön galädalisedi nen fomät',
 
+# Core parser functions
+'duplicate-defaultsort' => 'Nüned: Leodükamakik kösömik: „$2“ buon bu leodükamakik kösömik büik: „$1“.',
+
 # Special:Version
-'version'                  => 'Fomam', # Not used as normal message but as header for the special page itself
-'version-specialpages'     => 'Pads patik',
-'version-other'            => 'Votik',
-'version-version'          => 'Fomam',
-'version-license'          => 'Dälazöt',
-'version-software-product' => 'Prodäd',
-'version-software-version' => 'Fomam',
+'version'                   => 'Fomam', # Not used as normal message but as header for the special page itself
+'version-extensions'        => 'veitükumams pestitöl',
+'version-specialpages'      => 'Pads patik',
+'version-other'             => 'Votik',
+'version-hooks'             => 'Huköms',
+'version-hook-name'         => 'Hukömanem',
+'version-hook-subscribedby' => 'Pagebon fa',
+'version-version'           => 'Fomam',
+'version-license'           => 'Dälazöt',
+'version-software'          => 'Programs pestitöl',
+'version-software-product'  => 'Prodäd',
+'version-software-version'  => 'Fomam',
 
 # Special:FilePath
 'filepath'         => 'Ragivaluveg',
@@ -2255,23 +2754,40 @@ Kanol i [[Special:Watchlist/edit|gebön redakametodi kösömik]].',
 'filepath-submit'  => 'Luveg',
 'filepath-summary' => 'Pad patik at tuvon luvegi lölöfik ragiva. Magods pajonons ma fomät gudikün, ragivasots votik pamaifükons stedöfo kobü programs onsik.
 
-Penolös ragivanemi nen foyümot: „{{ns:image}}:“',
+Penolös ragivanemi nen foyümot: „{{ns:file}}:“',
 
 # Special:FileDuplicateSearch
+'fileduplicatesearch'          => 'Sukön ragivis petelüköl',
+'fileduplicatesearch-summary'  => 'Sukön ragivis petelüköl stabü völad kontrolasaedota onsik.
+
+Penolös ragivanemi nen foyümot: „{{ns:file}}:“.',
+'fileduplicatesearch-legend'   => 'Sukön telükoti',
 'fileduplicatesearch-filename' => 'Ragivanem:',
 'fileduplicatesearch-submit'   => 'Sukön',
 'fileduplicatesearch-info'     => 'pixels $1 × $2 <br />Ragivagretot: $3<br />MIME-sot: $4',
+'fileduplicatesearch-result-1' => 'Ragiv: „$1“ no labon telükoti kuratik.',
+'fileduplicatesearch-result-n' => 'Ragiv: „$1“ labon {{PLURAL:$2|telükoti kuratik bal|telükotis kuratik $2}}.',
 
 # Special:SpecialPages
-'specialpages'               => 'Pads patik',
-'specialpages-group-other'   => 'Pads patik votik',
-'specialpages-group-login'   => 'Nunädön oki / jafön kali',
-'specialpages-group-changes' => 'Votükams nulik e jenotaliseds',
-'specialpages-group-users'   => 'Gebans e gitäts',
-'specialpages-group-highuse' => 'Pads suvo pegeböls',
-'specialpages-group-pages'   => 'Padalised',
+'specialpages'                   => 'Pads patik',
+'specialpages-note'              => '----
+* Pads patik nomik.
+* <span class="mw-specialpagerestricted">Pads patik pemiedüköl.</span>',
+'specialpages-group-maintenance' => 'Nunods tefü kiped',
+'specialpages-group-other'       => 'Pads patik votik',
+'specialpages-group-login'       => 'Nunädön oki / jafön kali',
+'specialpages-group-changes'     => 'Votükams nulik e jenotaliseds',
+'specialpages-group-media'       => 'Nüns e löpükams ragivas',
+'specialpages-group-users'       => 'Gebans e gitäts',
+'specialpages-group-highuse'     => 'Pads suvo pegeböls',
+'specialpages-group-pages'       => 'Padalised',
+'specialpages-group-pagetools'   => 'Padastumem',
+'specialpages-group-wiki'        => 'Nüns e stums vükiks',
+'specialpages-group-redirects'   => 'Lüodükam padas patik',
+'specialpages-group-spam'        => 'Stums ta el spam',
 
 # Special:BlankPage
-'blankpage' => 'Pad vagik',
+'blankpage'              => 'Pad vagik',
+'intentionallyblankpage' => 'Pad at pevagükon desino',
 
 );
diff --git a/languages/messages/MessagesWa.php b/languages/messages/MessagesWa.php
index 46f6f46a..60ad6713 100644
--- a/languages/messages/MessagesWa.php
+++ b/languages/messages/MessagesWa.php
@@ -41,8 +41,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => "Uzeu_copene", /* User_talk */
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_copene',
-	NS_IMAGE          => "Imådje", /* Image */
-	NS_IMAGE_TALK     => "Imådje_copene", /* Image_talk */
+	NS_FILE           => "Imådje", /* Image */
+	NS_FILE_TALK      => "Imådje_copene", /* Image_talk */
 	NS_MEDIAWIKI      => "MediaWiki", /* MediaWiki */
 	NS_MEDIAWIKI_TALK => "MediaWiki_copene", /* MediaWiki_talk */
 	NS_TEMPLATE       => "Modele",
@@ -112,8 +112,6 @@ $messages = array(
 'underline-never'   => 'MÃ¥y',
 'underline-default' => 'Valixhance do betchteu',
 
-'skinpreview' => '(vey divant)',
-
 # Dates
 'sunday'        => 'dimegne',
 'monday'        => 'londi',
@@ -191,7 +189,7 @@ $messages = array(
 'mytalk'         => 'Mi copinaedje',
 'anontalk'       => 'PÃ¥dje di copene po ciste adresse IP',
 'navigation'     => 'Naiviaedje',
-'and'            => 'eyet',
+'and'            => '&#32;eyet',
 
 # Metadata in edit box
 'metadata_help' => 'Meta-dnêyes :',
@@ -247,8 +245,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ã…d fwait di {{SITENAME}}',
 'aboutpage'            => 'Project:Ã…d fwait',
-'bugreports'           => 'Rapoirts di bugs',
-'bugreportspage'       => 'Project:Rapoirts di bugs',
 'copyright'            => "Li contnou est dizo l' $1.",
 'copyrightpagename'    => 'Abondroets {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Abondroets',
@@ -332,9 +328,6 @@ $1",
 'cannotdelete'         => "Dji n' sai disfacer l' pådje ou l' imådje dimandêye (ça s' pôreut k' ene ôte sakî l' a ddja disfacé).",
 'badtitle'             => 'MÃ¥va tite',
 'badtitletext'         => "Li tite del pådje dimandêye n' esteut nén valide, il estet vude, oudonbén c' esteut on cron loyén eterlingaedje ou eterwiki. Ça s' pout k' il åye onk ou sacwants caracteres ki n' polèt nén esse eployîs dins les tites.",
-'perfdisabled'         => "Mande escuzes! mins cisse fonccionålité ci a stî essoctêye pol moumint
-pask' ele est trop pezante pol båze di dnêyes, ki dvént si télmint
-londjinne k' on s' endè pout pus siervi a môde di djin.",
 'perfcached'           => "Les dnêyes ki shuvèt c' est ene copeye e muchete, et ça s' pout ki ça n' soeye nén ttafwaitmint a djoû.",
 'perfcachedts'         => "Les dnêyes ki shuvèt c' est ene copeye e muchete, ey elle ont stî metowes a djoû pol dierin côp li $1.",
 'wrong_wfQuery_params' => 'Parametes incoreks po wfQuery()<br />
@@ -347,7 +340,7 @@ Cweraedje: $2',
 
 # Login and logout pages
 'logouttitle'                => 'Dislodjaedje',
-'logouttext'                 => "<strong>Vos vs avoz dislodjî.</strong><br />
+'logouttext'                 => "'''Vos vs avoz dislodjî.'''<br />
 Vos ploz continouwer a naivyî so {{SITENAME}} anonimmint, oudonbén
 vos relodjî dizo l' minme uzeu ou dizo èn uzeu diferin. Notez ki des
 pådjes k' i gn a si pôrént continowuer a vey come si vos estîz elodjî,
@@ -362,7 +355,6 @@ Vosse conte a stî ahivé.
 'yourpasswordagain'          => 'Ritapez vosse sicret',
 'remembermypassword'         => "Rimimbrer m' sicret inte les sessions.",
 'yourdomainname'             => 'Vosse dominne',
-'loginproblem'               => "<b>Åk n' a nén stî tot vs elodjant.</b><br />Rissayîz s' i vs plait!",
 'login'                      => "S' elodjî",
 'loginprompt'                => 'Vos dvoz permete les coûkes po vs elodjî so {{SITENAME}}.',
 'userlogin'                  => "S' elodjî",
@@ -426,6 +418,11 @@ Divant d' poleur evoyî èn ôte emile a ci conte la, vos dvroz shure les instru
 'accountcreatedtext'         => "Li conte d' uzeu «$1» a stî ahivé.",
 'loginlanguagelabel'         => 'Lingaedje: $1',
 
+# Password reset dialog
+'oldpassword' => 'Vî scret',
+'newpassword' => 'Noû scret',
+'retypenew'   => "Ritapez l' noû scret",
+
 # Edit page toolbar
 'bold_sample'     => 'Cråssès letes',
 'bold_tip'        => 'Tecse e cråssès letes',
@@ -449,8 +446,8 @@ Divant d' poleur evoyî èn ôte emile a ci conte la, vos dvroz shure les instru
 'hr_tip'          => "Roye di coûtchî (a n' nén eployî d' trop)",
 
 # Edit pages
-'summary'                   => 'Rascourti',
-'subject'                   => 'Sudjet/tiestire',
+'summary'                   => 'Rascourti:',
+'subject'                   => 'Sudjet/tiestire:',
 'minoredit'                 => "Ci n' est k' ene tchitcheye",
 'watchthis'                 => 'Shuve cist årtike',
 'savearticle'               => "Schaper l' pådje",
@@ -487,20 +484,20 @@ Si vos n' voloz nén scrire cisse pådje chal, clitchîz simplumint sol boton ''
 'anontalkpagetext'          => "---- ''Çouchal, c' est li pådje di copene po èn uzeu anonime ki n' a nén (co) fwait on conte por lu s' elodjî, ou ki n' l' eploye nén. Ça fwait k' on doet eployî si adresse IP limerike po l' idintifyî. Come ene sifwaite adresse IP pout esse eployeye pa pus d' èn uzeu, i s' pout ki vos voeyoz chal des rmåkes et des messaedjes ki n' sont nén por vos. Loukîz s' i vs plait po [[Special:UserLogin|fé on novea conte ou s' elodjî]] po n' pus aveur d' ecramiaedje avou des ôtes uzeus anonimes.''",
 'noarticletext'             => "I gn a pol moumint nou tecse e cisse pådje chal, vos ploz [[Special:Search/{{PAGENAME}}|cweri après l' tite di cisse pådje ci]] dins des ôtès pådjes, oudonbén [{{fullurl:{{FULLPAGENAME}}|action=edit}} ahiver l' pådje].",
 'clearyourcache'            => "'''Note:''' après aveur schapé l' pådje, vos l' divoz rafrister, po pleur vey les candjmints dins vosse betchteu waibe: '''Mozilla / Firefox / Safari:''' tchôkîz so ''Shift'' to clitchant so ''Rafrister'', ou co fjhoz ''Ctrl-Shift-R'' (''Cmd-Shift-R'' so on Macintosh); '''IE:''' tchôkîz so ''Ctrl'' tot clitchant so ''Rafrister'', ou co fjhoz ''Ctrl-F5''; '''Konqueror:''' simplumint clitchîz so ''Rafrister'' ou l' tape ''F5''; les uzeus d' '''Opera''' dvront motoit netyî pår leu muchete, dins ''Usteyes→Preferinces''.",
-'usercssjsyoucanpreview'    => "<strong>Racsegne:</strong> eployîz l' boton «Vey divant» po sayî vosse novea CSS/JS divant del schaper.",
+'usercssjsyoucanpreview'    => "'''Racsegne:''' eployîz l' boton «Vey divant» po sayî vosse novea CSS/JS divant del schaper.",
 'usercsspreview'            => "'''Èn rovyîz nén ki c' est djusse on prévoeyaedje di vosse stîle CSS d' uzeu, i n' a nén co stî schapé!'''",
 'userjspreview'             => "'''Èn rovyîz nén ki c' est djusse on prévoeyaedje/saye di vosse JavaScript d' uzeu, i n' a nén co stî schapé!'''",
 'userinvalidcssjstitle'     => "'''Asteme:''' I n' a pont d' pea lomêye «$1». Tuzez ki les pådjes .css eyet .js des uzeus eployèt des tite e ptitès letes, metans {{ns:user}}:Toto/monobook.css et nén {{ns:user}}:Toto/Monobook.css.",
 'updated'                   => '(Ramidré)',
-'previewnote'               => "<strong>Èn rovyîz nén ki c' est djusse on prévoeyaedje, li pådje n' est nén co schapêye!</strong>",
+'previewnote'               => "'''Èn rovyîz nén ki c' est djusse on prévoeyaedje, li pådje n' est nén co schapêye!'''",
 'previewconflict'           => 'Ci prévoeyaedje ci mostere kimint kel tecse del boesse di tecse do dzeu sereut håyné si vos decidez di clitchî so «schaper».',
-'session_fail_preview'      => "<strong>Mande escuzes! Mins dji n' a nén polou traitî vosse candjmint paski les dnêyes del session ont stî pierdowes.
-Rissayîz s' i vs plait. Si çoula n' va todi nén, sayîz di vs dislodjî eyet di vs relodjî.</strong>",
-'session_fail_preview_html' => "<strong>Mande escuzes! Mins dji n' a nén polou traitî vosse candjmint paski les dnêyes del session ont stî pierdowes.</strong>
+'session_fail_preview'      => "'''Mande escuzes! Mins dji n' a nén polou traitî vosse candjmint paski les dnêyes del session ont stî pierdowes.
+Rissayîz s' i vs plait. Si çoula n' va todi nén, sayîz di vs dislodjî eyet di vs relodjî.'''",
+'session_fail_preview_html' => "'''Mande escuzes! Mins dji n' a nén polou traitî vosse candjmint paski les dnêyes del session ont stî pierdowes.'''
 
 ''Come ci wiki chal a-st en alaedje li HTML brut, li prévoeyaedje est catchî, come proteccion siconte des atakes JavaScript.''
 
-<strong>Si c' est ene saye oniesse di candjî l' pådje, rissayîz s' i vs plait. Si çoula n' va todi nén, sayîz di vs dislodjî eyet di vs relodjî.</strong>",
+'''Si c' est ene saye oniesse di candjî l' pådje, rissayîz s' i vs plait. Si çoula n' va todi nén, sayîz di vs dislodjî eyet di vs relodjî.'''",
 'editing'                   => 'Candjant $1',
 'editingsection'            => 'Candjant $1 (seccion)',
 'editingcomment'            => 'Candjant $1 (comintaire)',
@@ -514,27 +511,27 @@ l' tecse d' asteure (å dzeur) si vos lez vloz co evoyî.
 boton «Schaper l' pådje».<br />",
 'yourtext'                  => 'Li tecse da vosse',
 'storedversion'             => 'Modêye sol sierveu',
-'nonunicodebrowser'         => "<strong>ASTEME: li betchteu waibe da vosse ni sopoite nén l' ecôdaedje unicôde, cåze di çoula les caracteres nén-ASCII vont aparexhe dins l' boesse di tecse come des côdes hecsadecimås, insi vos pôroz tot l' minme candjî l' pådje.</strong>",
-'editingold'                => "<strong>ASTEME: Vos estoz ki candje ene viye modêye del pådje.
+'nonunicodebrowser'         => "'''ASTEME: li betchteu waibe da vosse ni sopoite nén l' ecôdaedje unicôde, cåze di çoula les caracteres nén-ASCII vont aparexhe dins l' boesse di tecse come des côdes hecsadecimås, insi vos pôroz tot l' minme candjî l' pådje.'''",
+'editingold'                => "'''ASTEME: Vos estoz ki candje ene viye modêye del pådje.
 Si vos l' schapez, tos les candjmints k' ont stî fwaits
-dispoy adon si vont piede.</strong>",
+dispoy adon si vont piede.'''",
 'yourdiff'                  => 'Diferinces',
 'copyrightwarning'          => "Notez ki tos les contribouwaedjes fwaits po {{SITENAME}} dvèt esse dizo l' licince $2 (loukîz $1 po pus di racsegnes).
 Si vos n' voloz nén ki vosse tecse poye esse candjî eyet spårdou pa tot l' minme kî, adon nel evoyîz nén chal.<br />
 Vos nos acertinez eto ki vos avoz scrît l' tecse vos-minme, oudonbén l' avoz copyî d' on sourdant libe (dominne publik ou on sourdant pareymint libe).
-<strong>N' EVOYÎZ NÉN DES TECSES DIZO ABONDROETS SINS PERMISSION!</strong>",
+'''N' EVOYÎZ NÉN DES TECSES DIZO ABONDROETS SINS PERMISSION!'''",
 'copyrightwarning2'         => "Notez ki tos les contribouwaedjes fwaits po {{SITENAME}} polèt esse esse candjîs ou disfacés pa des ôtes contribouweus.
 Si vos n' voloz nén scrire des årtikes ki polèt esse candjîs pa des ôtes, adon nels evoyîz nén chal.<br />
 Vos nos acertinez eto ki vos avoz scrît l' tecse vos-minme, oudonbén l' avoz copyî d' on sourdant libe (voeyoz $1 po pus di racsegnes).
-<strong>N' EVOYÎZ NÉN DES TECSES DIZO ABONDROETS SINS PERMISSION!</strong>",
-'longpagewarning'           => "<strong>ASTEME: Cisse pådje fwait $1 kilo-octets; des
+'''N' EVOYÎZ NÉN DES TECSES DIZO ABONDROETS SINS PERMISSION!'''",
+'longpagewarning'           => "'''ASTEME: Cisse pådje fwait $1 kilo-octets; des
 betchteus waibes k' i gn a polèt aveut des rujhes po-z aspougnî
 des pådjes k' aprepièt ou di pus di 32 ko.
-Vos dvrîz tuzer a pårti l' pådje e pus ptits bokets.</strong>",
-'longpageerror'             => "<strong>AROKE: Li tecse ki vos avoz evoyî fwait di pus d' $1 kilo-octets, çou k' est pus ki l' macsimom di $2 kilo-octets. C' est nén possible del schaper sol sierveu.</strong>",
-'readonlywarning'           => "<strong>ASTEME: On-z overe sol båze di dnêyes pol moumint, ey elle a stî metowe e mode seulmint-lére.
-Do côp, vos n' såroz schaper vos candjmints asteure; motoit vos dvrîz copyî et aclaper l' tecse dins on fitchî da vosse pol poleur rimete pus tård.</strong>",
-'protectedpagewarning'      => '<strong>ASTEME: Cisse pådje chal a stî protedjeye siconte des candjmints, seulmint les uzeus avou èn accès di manaedjeu el polèt candjî.</strong>',
+Vos dvrîz tuzer a pårti l' pådje e pus ptits bokets.'''",
+'longpageerror'             => "'''AROKE: Li tecse ki vos avoz evoyî fwait di pus d' $1 kilo-octets, çou k' est pus ki l' macsimom di $2 kilo-octets. C' est nén possible del schaper sol sierveu.'''",
+'readonlywarning'           => "'''ASTEME: On-z overe sol båze di dnêyes pol moumint, ey elle a stî metowe e mode seulmint-lére.
+Do côp, vos n' såroz schaper vos candjmints asteure; motoit vos dvrîz copyî et aclaper l' tecse dins on fitchî da vosse pol poleur rimete pus tård.'''",
+'protectedpagewarning'      => "'''ASTEME: Cisse pådje chal a stî protedjeye siconte des candjmints, seulmint les uzeus avou èn accès di manaedjeu el polèt candjî.'''",
 'semiprotectedpagewarning'  => "'''Note:''' cisse pådje ci a stî protedjeye po k' seulmint les uzeus edjîstrés el polexhe candjî.",
 'templatesused'             => 'Modeles eployîs e cisse pådje ci:',
 'template-protected'        => '(protedjî)',
@@ -545,9 +542,6 @@ Do côp, vos n' såroz schaper vos candjmints asteure; motoit vos dvrîz copyî
 # History pages
 'viewpagelogs'        => 'Vey les djournås po cisse pådje ci',
 'nohistory'           => "I n' a pont d' istwere des modêyes po cisse pådje chal.",
-'revnotfound'         => 'Modêye nén trovêye',
-'revnotfoundtext'     => "Li viye modêye del pådje ki vos avoz dmandé n' a nén stî trovêye.
-Verifyîz l' hårdêye ki vs avoz eployî po-z ariver sol pådje s' i vs plait.",
 'currentrev'          => "Modêye d' asteure",
 'revisionasof'        => 'Modêye do $1',
 'previousrevision'    => '�Modêye di dvant',
@@ -618,6 +612,7 @@ Les ôtes manaedjeus so ç' wiki ci pôront todi vey li contnou catchî eyet l'
 'prevn'                 => '$1 di dvant',
 'nextn'                 => '$1 shuvants',
 'viewprevnext'          => 'Vey ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Aidance',
 'showingresults'        => 'Chal pa dzo <b>$1</b> rizultats a pårti do limero <b>$2</b>.',
 'showingresultsnum'     => 'Chal pa dzo <b>$3</b> rizultats a pårti do limero <b>$2</b>.',
 'nonefound'             => "'''Note''': des cweraedjes ki n' dinèt nou rzultat c' est sovint li cweraedje di ptits mots trop corants (come «les», «des») ki n' sont nén indecsés, oudonbén des cweraedjes di pus d' on mot (seulmint les pådjes avou tos les mots dmandés sront håynêyes dins l' rizultat do cweraedje).",
@@ -639,6 +634,7 @@ Les ôtes manaedjeus so ç' wiki ci pôront todi vey li contnou catchî eyet l'
 'qbsettings-floatingright' => 'Flotante a droete',
 'changepassword'           => "Candjî l' sicret",
 'skin'                     => 'Pea',
+'skin-preview'             => 'vey divant',
 'math'                     => 'Formules matematikes',
 'dateformat'               => 'Cogne del date',
 'datedefault'              => 'Nole preferince',
@@ -658,9 +654,6 @@ Les ôtes manaedjeus so ç' wiki ci pôront todi vey li contnou catchî eyet l'
 'prefs-misc'               => 'Totes sôres',
 'saveprefs'                => 'Schaper les preferinces',
 'resetprefs'               => 'Rimete les prémetowès valixhances',
-'oldpassword'              => 'Vî scret',
-'newpassword'              => 'Noû scret',
-'retypenew'                => "Ritapez l' noû scret",
 'textboxsize'              => 'Grandeu del boesse di tecse',
 'rows'                     => 'Royes',
 'columns'                  => 'Colones',
@@ -751,11 +744,11 @@ Les ôtes manaedjeus so ç' wiki ci pôront todi vey li contnou catchî eyet l'
 'uploaderror'                 => "Aroke d' eberwetaedje",
 'uploadtext'                  => "Eployîz les boesses d' intrêye chal pa dzo po-z eberweter des noveas fitchîs d' imådjes po vos årtikes. Sol plupårt des betchteus, vos voeroz on boton «Foyter...» (ou «Browse...») ki vs permetrè di foyter dins les ridants del deure plake da vosse po tchoezi l' fitchî, çou ki rimplirè otomaticmint li tchamp do no do fitchî k' est a costé.
 
-Po håyner ou cweri des imådjes k' ont ddja stî rçuvowes, alez sol [[Special:ImageList|djivêye des imådjes dedja eberwetêyes]]. Les eberwetaedjes et disfaçaedjes sont metous èn on [[Special:Log/upload|djournå des eberwetaedjes]].
+Po håyner ou cweri des imådjes k' ont ddja stî rçuvowes, alez sol [[Special:FileList|djivêye des imådjes dedja eberwetêyes]]. Les eberwetaedjes et disfaçaedjes sont metous èn on [[Special:Log/upload|djournå des eberwetaedjes]].
 
 Po håyner l' imådje dins èn årtike, eployîz on loyén del foûme
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fitchî.jpg]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Fitchî.png|thumb|tecse a mete padzo]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fitchî.jpg]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Fitchî.png|thumb|tecse a mete padzo]]</nowiki>'''
 ou co po les sons
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Fitchî.ogg]]</nowiki>'''",
 'uploadlog'                   => 'djournå des eberwetaedjes',
@@ -773,9 +766,9 @@ ou co po les sons
 'badfilename'                 => "Li no d' l' imådje a stî candjî a «$1».",
 'largefileserver'             => "Ci fitchî ci est pus pezant ki çou k' li sierveu est apontyî po-z accepter.",
 'emptyfile'                   => "I shonnreut kel fitchî k' vos eberwetez soeye vude. Çoula pout esse cåze d' ene aroke di tapaedje dins l' no do fitchî. Acertinez si vos vloz evoyî po do bon ç' fitchî ci, s' i vs plait.",
-'fileexists'                  => "On fitchî avou ç' no la egzistêye dedja, loukîz s' i vs plait a <strong><tt>$1</tt></strong> po vs acertiner ki vos vloz bén replaecî l' fitchî avou l' ci ki vos eberwetez asteure, oubén si vos l' voloz eberweter dizo èn ôte no.",
-'fileexists-forbidden'        => "I gn a ddja on fitchî avou ç' no la; rivnoz s' i vs plait en erî et s' reberwetez l' fitchî dizo èn ôte no. [[Image:$1|thumb|center|$1]]",
-'fileexists-shared-forbidden' => "I gn a ddja on fitchî avou ç' no la e ridant des fitchîs pårtaedjîs; rivnoz s' i vs plait en erî et s' reberwetez l' fitchî dizo èn ôte no. [[Image:$1|thumb|center|$1]]",
+'fileexists'                  => "On fitchî avou ç' no la egzistêye dedja, loukîz s' i vs plait a '''<tt>$1</tt>''' po vs acertiner ki vos vloz bén replaecî l' fitchî avou l' ci ki vos eberwetez asteure, oubén si vos l' voloz eberweter dizo èn ôte no.",
+'fileexists-forbidden'        => "I gn a ddja on fitchî avou ç' no la; rivnoz s' i vs plait en erî et s' reberwetez l' fitchî dizo èn ôte no. [[File:$1|thumb|center|$1]]",
+'fileexists-shared-forbidden' => "I gn a ddja on fitchî avou ç' no la e ridant des fitchîs pårtaedjîs; rivnoz s' i vs plait en erî et s' reberwetez l' fitchî dizo èn ôte no. [[File:$1|thumb|center|$1]]",
 'successfulupload'            => "L' eberwetaedje a stî comifåt",
 'uploadwarning'               => "Adviertixhmint so l' eberwetaedje",
 'savefile'                    => "Schaper l' fitchî",
@@ -795,16 +788,16 @@ ou co po les sons
 'nolicense'          => 'Nole licince tchoezeye',
 'upload_source_file' => ' (on fitchî sol copiutrece da vosse)',
 
-# Special:ImageList
-'imagelist_search_for'  => "Cweri l' no d' imådje:",
+# Special:ListFiles
+'listfiles_search_for'  => "Cweri l' no d' imådje:",
 'imgfile'               => 'fitchî',
-'imagelist'             => 'Djivêye des imådjes',
-'imagelist_name'        => 'No',
-'imagelist_user'        => 'Uzeu',
-'imagelist_size'        => 'Grandeu',
-'imagelist_description' => 'Discrijhaedje',
+'listfiles'             => 'Djivêye des imådjes',
+'listfiles_name'        => 'No',
+'listfiles_user'        => 'Uzeu',
+'listfiles_size'        => 'Grandeu',
+'listfiles_description' => 'Discrijhaedje',
 
-# Image description page
+# File description page
 'filehist-deleteall'        => 'disfacer ttafwait',
 'filehist-deleteone'        => 'disfacer çouci',
 'filehist-datetime'         => 'Date/Eure',
@@ -853,23 +846,9 @@ ou co po les sons
 'randomredirect' => "Redjiblaedje a l' astcheyance",
 
 # Statistics
-'statistics'             => 'Sitatistikes',
-'sitestats'              => 'Sitatistikes di {{SITENAME}}',
-'userstats'              => 'Sitatistikes des uzeus',
-'sitestatstext'          => "I gn a '''$1''' pådjes å totå el båze di dnêyes.
-Çoula tot contant les pådjes di «Copenes», les pådjes åd fwait di {{SITENAME}}, les pådjes «djermons» (pådjes sins waire di contnou), les redjiblaedjes, eyet co ds ôtes ki n' sont nén vormint des årtikes.
-Si on n' conte nén ces la, i gn a '''$2''' pådjes ki sont
-probåblumint des vraiys årtikes.
-
-'''$8''' fitchîz ont stî eberwetés.
-
-I gn a-st avou å totå '''$3''' riwaitaedjes di pådjes, eyet '''$4''' candjmints do contnou des pådjes dispoy ki ci wiki chal est en alaedje.
-Dj' ô bén k' i gn a ene moyene di '''$5''' candjmints par pådje, eyet '''$6''' riwaitaedjes po on candjmint.
-
-Li longueur del [http://www.mediawiki.org/wiki/Manual:Job_queue cawêye des bouyes] est di '''$7'''.",
-'userstatstext'          => "I gn a '''$1''' uzeus d' eredjîstrés.
-'''$2''' (ou '''$4%''') di zels sont eto des manaedjeus (riloukîz a $3).",
-'statistics-mostpopular' => 'PÃ¥djes les pus veyowes',
+'statistics'              => 'Sitatistikes',
+'statistics-header-users' => 'Sitatistikes des uzeus',
+'statistics-mostpopular'  => 'PÃ¥djes les pus veyowes',
 
 'disambiguations'     => "PÃ¥djes d' omonimeye",
 'disambiguationspage' => 'Template:Omonimeye',
@@ -947,6 +926,12 @@ Vos ploz limiter l' håynaedje tot tchoezixhant ene sôre di djournå, on no d'
 'categories'         => 'Categoreyes',
 'categoriespagetext' => 'I gn a les categoreyes shuvantes sol wiki.',
 
+# Special:Log/newusers
+'newuserlogpage'           => 'Djournå des noveas uzeus',
+'newuserlogpagetext'       => "Chal pa dzo c' est ene djivêye des uzeus novelmint eredjîstrés.",
+'newuserlog-create-entry'  => 'Novea uzeu',
+'newuserlog-create2-entry' => 'conte ahivé po $1',
+
 # E-mail user
 'mailnologin'     => "Nole adresse d' evoyeu",
 'mailnologintext' => "Po-z evoyî èn emile a èn ôte uzeu i vs fåt esse [[Special:UserLogin|elodjî]] eyet aveur ene adresse emile d' evoyeu ki soeye valide dins vos [[Special:Preferences|preferinces]].",
@@ -1035,47 +1020,53 @@ Po candjî l\' apontiaedje di vosse djivêye a shuve, loukîz
 Po pus d\' aidance:
 {{fullurl:{{ns:help}}:Aidance}}',
 
-# Delete/protect/revert
-'deletepage'                  => "Disfacer l' pådje",
-'confirm'                     => 'Acertiner',
-'excontent'                   => 'li contnou esteut: «$1»',
-'excontentauthor'             => "li contnou esteut: «$1» (eyet l' seu contribouweu esteut «$2»)",
-'exbeforeblank'               => "li contnou dvant l' disfaçaedje esteut: «$1»",
-'exblank'                     => 'li pådje esteut vude',
-'historywarning'              => 'Asteme: Li pådje ki vos alez disfacer a-st ene istwere:',
-'confirmdeletetext'           => "Vos alez disfacer po tofer del båze di dnêyes ene
+# Delete
+'deletepage'        => "Disfacer l' pådje",
+'confirm'           => 'Acertiner',
+'excontent'         => 'li contnou esteut: «$1»',
+'excontentauthor'   => "li contnou esteut: «$1» (eyet l' seu contribouweu esteut «$2»)",
+'exbeforeblank'     => "li contnou dvant l' disfaçaedje esteut: «$1»",
+'exblank'           => 'li pådje esteut vude',
+'historywarning'    => 'Asteme: Li pådje ki vos alez disfacer a-st ene istwere:',
+'confirmdeletetext' => "Vos alez disfacer po tofer del båze di dnêyes ene
 pådje ou ene imådje, avou tote si istwere.
 Acertinez s' i vs plait ki c' est bén çoula ki vos vloz fé,
 ki vos comprindoz les consecwinces, et ki vos fjhoz çoula
 tot [[{{MediaWiki:Policy-url}}|shuvant les rîles]].",
-'actioncomplete'              => 'Fwait',
-'deletedtext'                 => 'Li pådje «<nowiki>$1</nowiki>» a stî disfacêye. Loukîz li $2 po ene
+'actioncomplete'    => 'Fwait',
+'deletedtext'       => 'Li pådje «<nowiki>$1</nowiki>» a stî disfacêye. Loukîz li $2 po ene
 djivêye des dierins disfaçaedjes.',
-'deletedarticle'              => 'pådje «$1» disfacêye',
-'dellogpage'                  => 'Djournå des disfaçaedjes',
-'dellogpagetext'              => "Chal pa dzo c' est l' djivêye des dierins disfaçaedjes.",
-'deletionlog'                 => 'djournå des disfaçaedjes',
-'reverted'                    => 'Rimetou ene modêye di dvant',
-'deletecomment'               => 'Råjhon do disfaçaedje',
-'cantrollback'                => "Dji n' sai disfé les candjmints; li dierin contribouweu est li seu oteur po cist årtike ci.",
-'alreadyrolled'               => "Dji n' sai disfé li dierin candjmint di [[$1]] fwait pa [[User:$2|$2]] ([[User talk:$2|Copene]]); 
+'deletedarticle'    => 'pådje «$1» disfacêye',
+'dellogpage'        => 'Djournå des disfaçaedjes',
+'dellogpagetext'    => "Chal pa dzo c' est l' djivêye des dierins disfaçaedjes.",
+'deletionlog'       => 'djournå des disfaçaedjes',
+'reverted'          => 'Rimetou ene modêye di dvant',
+'deletecomment'     => 'Råjhon do disfaçaedje',
+
+# Rollback
+'cantrollback'  => "Dji n' sai disfé les candjmints; li dierin contribouweu est li seu oteur po cist årtike ci.",
+'alreadyrolled' => "Dji n' sai disfé li dierin candjmint di [[$1]] fwait pa [[User:$2|$2]] ([[User talk:$2|Copene]]); 
 ene sakî d' ôte a ddja candjî l' årtike ou ddja rmetou l' modêye di dvant.
 
 Li dierin candjmint a stî fwait pa [[User:$3|$3]] ([[User talk:$3|Copene]]).",
-'editcomment'                 => 'Li comintaire do candjmint esteut: «<i>$1</i>».', # only shown if there is an edit comment
-'revertpage'                  => 'Disfwait li candjmint da [[Special:Contributions/$2|$2]] ([[User talk:$2|copene]]); li dierin candjmint est asteure da [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'editcomment'   => "Li comintaire do candjmint esteut: «''$1''».", # only shown if there is an edit comment
+'revertpage'    => 'Disfwait li candjmint da [[Special:Contributions/$2|$2]] ([[User talk:$2|copene]]); li dierin candjmint est asteure da [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'              => 'Djournå des protedjaedjes',
 'protectlogtext'              => "Chal pa dzo c' est ene djivêye des protedjaedjes et disprotedjaedjes des pådjes.",
 'protectedarticle'            => '«[[$1]]» protedjî',
 'unprotectedarticle'          => '«[[$1]]» disprotedjî',
 'protect-title'               => 'Protedjant «$1»',
+'prot_1movedto2'              => '[[$1]] displaecî viè [[$2]]',
 'protect-legend'              => "Acertinez l' protedjaedje",
 'protectcomment'              => 'Råjhon po protedjî',
 'protect-unchain'             => 'Disbloker les permissions di displaeçaedje',
-'protect-text'                => "Vos ploz droci vey eyet candjî l' livea d' protedjaedje pol pådje <strong><nowiki>$1</nowiki></strong>.",
+'protect-text'                => "Vos ploz droci vey eyet candjî l' livea d' protedjaedje pol pådje '''<nowiki>$1</nowiki>'''.",
 'protect-default'             => '(prémetou)',
 'protect-level-autoconfirmed' => 'Bloker les uzeus nén eredjîstrés',
 'protect-level-sysop'         => 'Seulmint les manaedjeus',
+'protect-expiry-options'      => '2 eures:2 hours,1 djoû:1 day,3 djoûs:3 days,1 samwinne:1 week,2 samwinnes:2 weeks,1 moes:1 month,3 moes:3 months,6 moes:6 months,1 anêye:1 year,po todi:infinite', # display1:time1,display2:time2,...
 'pagesize'                    => '(octets)',
 
 # Restrictions (nouns)
@@ -1127,7 +1118,6 @@ Loukîz l' [[Special:Log/delete|djournå des disfaçaedjes]] po ene djivêye des
 
 # What links here
 'whatlinkshere' => 'PÃ¥djes ki loynut chal',
-'linklistsub'   => '(Djivêye des loyéns)',
 'linkshere'     => 'Les pådjes ki shuvèt ont des loyéns viè cisse ci:',
 'nolinkshere'   => 'Nole pådje avou des loyéns viè cisse ci.',
 'isredirect'    => 'pådje di redjiblaedje',
@@ -1201,6 +1191,8 @@ Dins ces cas la, vos dvroz displaecî l' pådje di copene al mwin, ou rcopyî
 si contnou, si vos l' vloz mete adlé l' novea no
 d' l' årtike.",
 'movearticle'             => 'Displaecî di',
+'movenologin'             => 'Nén elodjî',
+'movenologintext'         => 'I vs fåt esse èn uzeu eredjîstré eyet esse [[Special:UserLogin|elodjî]] por vos pleur displaecî ene pådje.',
 'newtitle'                => "Viè l' novea tite",
 'movepagebtn'             => 'Displaecî',
 'pagemovedsub'            => 'Li displaçaedje a stî comifåt',
@@ -1223,7 +1215,6 @@ L' årtike såme «[[:$1]]» egzistêye dedja. El voloz vs disfacer po vs permet
 'delete_and_move_confirm' => "Oyi, disfacer l' pådje",
 'delete_and_move_reason'  => 'Disfacé po permete on displaeçaedje',
 'selfmove'                => 'Les tites sourdant et såme sont les minmes; ene pådje ni pout nén esse displaeceye so leye minme.',
-'immobile_namespace'      => "Li tite såme est d' ene sôre especiåle; on n' pout nén displaecî des pådjes dins cist espåce di lomaedje la.",
 
 # Export
 'export'          => 'Ricopyî des pådjes foû',
@@ -1231,7 +1222,7 @@ L' årtike såme «[[:$1]]» egzistêye dedja. El voloz vs disfacer po vs permet
 
 Po rcopyî des pådjes foû, metoz les tites des pådjes dins l' boesse di tecse chal pa dzo, on tite pa roye, eyet tchoezixhoz si vos vloz totes les modêyes avou l' istwere, ou rén kel dierinne modêye avou fok les racsegnes sol dierin candjmint.
 
-Dins ç' dierin cas, vos ploz eto eployî ene hårdêye, eg: [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] pol pådje «[[{{MediaWiki:Mainpage}}]]».",
+Dins ç' dierin cas, vos ploz eto eployî ene hårdêye, eg: [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pol pådje «[[{{MediaWiki:Mainpage}}]]».",
 'exportcuronly'   => "Inclure fok li modêye do moumint, nén tote l' istwere",
 'exportnohistory' => "----
 '''Note:''' li rcopiaedje foû di tote l' istwere des pådjes a stî dismetou cåze di problinmes di tchedje des sierveus.",
@@ -1261,6 +1252,7 @@ Les dates des diferinnès modêyes eyet les nos des contribouweus seront consier
 Totes les accions di rcopiaedje eterwiki sont metowes e [[Special:Log/import|djournå des ristitchaedjes]].",
 'import-interwiki-history' => "Ristitchî avou l' istwere di totes les modêyes",
 'import-interwiki-submit'  => 'Ristitchî',
+'import-comment'           => 'Comintaire:',
 'importtext'               => "S' vs plait ricopyîz l' fitchî foû do sourdant wiki avou l' usteye di rcopiaedje foû (Special:Export), el schaper so voste éndjole, et poy l' eberweter droci.",
 'importstart'              => "Dj' enonde li ristitchaedje...",
 'import-revision-count'    => '$1 modêye(s)',
@@ -1373,7 +1365,7 @@ Totes les accions di rcopiaedje eterwiki sont metowes e [[Special:Log/import|djo
 'imagemaxsize' => "Limite pol håynaedje ezès pådjes d' imådje:",
 'thumbsize'    => 'Grandeu po les imådjetes (thumb):',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'Galreye des nouvès imådjes',
 'imagelisttext'         => "Chal pa dzo c' est ene djivêye di '''$1''' {{PLURAL:$1|imådje relîte|imådjes relîtes}} $2.",
 'showhidebots'          => '($1 robots)',
@@ -1556,20 +1548,9 @@ po l' $4.",
 Acertinez s' i vs plait ki vos vloz vormint rifé cisse pådje ci.",
 'recreate'            => 'Rifé',
 
-# HTML dump
-'redirectingto' => 'Redjiblant viè [[:$1]]...',
-
 # action=purge
-'confirm_purge'        => "Netyî l' muchete di cisse pådje ci?
-
-$1",
 'confirm_purge_button' => "'l est bon",
-
-# AJAX search
-'searchcontaining' => "Cweri après des årtikes k' ont «''$1''» å dvins.",
-'searchnamed'      => "Cweri après des årtikes lomés «''$1''».",
-'articletitles'    => "Årtikes ki cmincèt avou «''$1''»",
-'hideresults'      => 'Catchî les rzultats',
+'confirm-purge-top'    => "Netyî l' muchete di cisse pådje ci?",
 
 # Multipage image navigation
 'imgmultipageprev' => '� pådje di dvant',
diff --git a/languages/messages/MessagesWar.php b/languages/messages/MessagesWar.php
index 1fa2dd53..d73e0260 100644
--- a/languages/messages/MessagesWar.php
+++ b/languages/messages/MessagesWar.php
@@ -8,6 +8,26 @@
  * @author לערי ריינה�רט
  */
 
+$specialPageAliases = array(
+	'Watchlist'                 => array( 'Angay Timan-an' ),
+	'Upload'                    => array( 'Pagkarga' ),
+	'Statistics'                => array( 'Mga Estadistika' ),
+	'Randompage'                => array( 'Bisan Ano', 'BisanAnongaPakli' ),
+	'Mostlinked'                => array( 'Gidamo-iHinSumpay' ),
+	'Shortpages'                => array( 'HaglipotngamgaPakli' ),
+	'Longpages'                 => array( 'HaglabangamgaPakli' ),
+	'Newpages'                  => array( 'Bag-ongamgaPakli' ),
+	'Allpages'                  => array( 'NgatananngaPakli' ),
+	'Specialpages'              => array( 'MgaIspisyalngaPakli' ),
+	'Contributions'             => array( 'Mga �mot' ),
+	'Movepage'                  => array( 'BalhinaAnPakli' ),
+	'Categories'                => array( 'Mga Kategorya' ),
+	'Version'                   => array( 'Bersyon' ),
+	'Mypage'                    => array( 'AkonPakli' ),
+	'Mytalk'                    => array( 'AkonHiruhimangraw' ),
+	'Search'                    => array( 'Bilnga' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'           => 'Bagisa ha ilarom an mga sumpay:',
@@ -95,7 +115,7 @@ $messages = array(
 'mytalk'         => 'Akon paghingay',
 'anontalk'       => 'Paghingay para hini nga IP',
 'navigation'     => 'Paglayag',
-'and'            => 'ngan',
+'and'            => '&#32;ngan',
 
 'errorpagetitle'   => 'Sayop',
 'returnto'         => 'Balik ngadto ha $1.',
@@ -173,10 +193,11 @@ $messages = array(
 'page_last'    => 'kataposan',
 
 # Search results
-'prevn'        => 'naha-una nga $1',
-'nextn'        => 'sunod nga $1',
-'viewprevnext' => 'Kitaa an ($1) ($2) ($3)',
-'powersearch'  => 'Bilnga',
+'prevn'          => 'naha-una nga $1',
+'nextn'          => 'sunod nga $1',
+'viewprevnext'   => 'Kitaa an ($1) ($2) ($3)',
+'searchhelp-url' => 'Help:Sulod',
+'powersearch'    => 'Bilnga',
 
 # Preferences page
 'preferences'       => 'Mga karuyag',
@@ -199,11 +220,11 @@ $messages = array(
 'upload'    => 'Pagkarga hin file',
 'uploadbtn' => 'Igkarga an file',
 
-# Special:ImageList
-'imagelist_date' => 'Pitsa',
-'imagelist_name' => 'Ngaran',
+# Special:ListFiles
+'listfiles_date' => 'Pitsa',
+'listfiles_name' => 'Ngaran',
 
-# Image description page
+# File description page
 'filehist-datetime' => 'Pitsa/Oras',
 'imagelinks'        => 'Mga sumpay',
 'linkstoimage'      => 'Nasumpay hini nga fayl an mga nasunod nga mga pakli:',
@@ -219,7 +240,6 @@ $messages = array(
 
 # Statistics
 'statistics' => 'Mga estadistika',
-'sitestats'  => '{{SITENAME}} nga mga estadistika',
 
 # Miscellaneous special pages
 'longpages' => 'Haglaba nga mga pakli',
@@ -228,9 +248,6 @@ $messages = array(
 # Book sources
 'booksources-go' => 'Kadto-a',
 
-# Special:Log
-'log-search-submit' => 'Kadto-a',
-
 # Special:AllPages
 'allpages'       => 'Ngatanan nga mga pakli',
 'allarticles'    => 'Ngatanan nga mga artikulo',
@@ -247,7 +264,7 @@ $messages = array(
 'watch'         => 'Bantayi',
 'watchthispage' => 'Bantayi ini nga pakli',
 
-# Delete/protect/revert
+# Delete
 'deletedtext' => 'Ginpara an "<nowiki>$1</nowiki>".
 Kitaa an $2 para hin talaan han mga gibag-ohi nga mga ginpamara.',
 
@@ -260,7 +277,7 @@ Kitaa an $2 para hin talaan han mga gibag-ohi nga mga ginpamara.',
 # Block/unblock
 'ipblocklist-submit' => 'Bilnga',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Bilnga',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesWo.php b/languages/messages/MessagesWo.php
index 8b42f8b8..aff0f149 100644
--- a/languages/messages/MessagesWo.php
+++ b/languages/messages/MessagesWo.php
@@ -11,6 +11,68 @@
 
 $fallback = 'fr';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Xibaarukaay',
+	NS_SPECIAL          => 'Jagleel',
+	NS_TALK             => 'Waxtaan',
+	NS_USER             => 'Jëfandikukat',
+	NS_USER_TALK        => 'Waxtaani_jëfandikukat',
+	NS_PROJECT_TALK     => '$1_waxtaan',
+	NS_FILE             => 'Dencukaay',
+	NS_FILE_TALK        => 'Waxtaani_dencukaay',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Waxtaani_MediaWiki',
+	NS_TEMPLATE         => 'Royuwaay',
+	NS_TEMPLATE_TALK    => 'Waxtaani_royuwaay',
+	NS_HELP             => 'Ndimbal',
+	NS_HELP_TALK        => 'Waxtaani_ndimbal',
+	NS_CATEGORY         => 'Wàll',
+	NS_CATEGORY_TALK    => 'Waxtaani_wàll',
+);
+
+$namespaceAliases = array(
+	'Discuter' => NS_TALK,
+	'Utilisateur' => NS_USER,
+	'Discussion_Utilisateur' => NS_USER_TALK,
+	'Discussion_$1' => NS_PROJECT_TALK,
+	'Discussion_Image' => NS_FILE_TALK,
+	'Discussion_MediaWiki' => NS_MEDIAWIKI_TALK,
+	'Modèle' => NS_TEMPLATE,
+	'Discussion_Modèle' => NS_TEMPLATE_TALK,
+	'Aide' => NS_HELP,
+	'Discussion_Aide' => NS_HELP_TALK,
+	'Catégorie' => NS_CATEGORY,
+	'Discussion_Catégorie' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'Userlogin'                 => array( 'Lonku' ),
+	'Userlogout'                => array( 'Lonkiku' ),
+	'CreateAccount'             => array( 'Sos am sàq' ),
+	'Preferences'               => array( 'Tànneef' ),
+	'Watchlist'                 => array( 'Limu toppte' ),
+	'Recentchanges'             => array( 'Coppite yu mujj' ),
+	'Upload'                    => array( 'Yeb' ),
+	'Listfiles'                 => array( 'Limu nataal yi' ),
+	'Newimages'                 => array( 'Nataal bu bees' ),
+	'Listusers'                 => array( 'Limu jëfandikukat yi' ),
+	'Listgrouprights'           => array( 'Limu mboolooy jëfandikukat' ),
+	'Randompage'                => array( 'Xët cig mbetteel' ),
+	'Lonelypages'               => array( 'Xëtu jirim' ),
+	'Uncategorizedpages'        => array( 'Xët yi amul wàll' ),
+	'Uncategorizedcategories'   => array( 'Wàll yi amul wàll' ),
+	'Uncategorizedimages'       => array( 'Nataal yi amul wàll' ),
+	'Uncategorizedtemplates'    => array( 'Royuwaay yi amul wàll' ),
+	'Unusedcategories'          => array( 'Royuwaay yiñ jëfandikuwul' ),
+	'Unusedimages'              => array( 'Nataal yiñ jëfandikuwul' ),
+	'Wantedpages'               => array( 'Xët yiñ laaj' ),
+	'Wantedcategories'          => array( 'Wàll yiñ laaj' ),
+	'Mypage'                    => array( 'Sama xët' ),
+	'Mytalk'                    => array( 'Samay waxtaan' ),
+	'Mycontributions'           => array( 'Samay cëru' ),
+	'Search'                    => array( 'Ceet' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Rëddaatu lëkkalekaay yi :',
@@ -26,30 +88,32 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Soppi ab xaaj cib cuqub ndeyjoor ci kojam  (JavaScript)',
 'tog-showtoc'                 => 'Wone tëralinu ne-ne yi (ngir xët yi ëpp 3 xaaj)',
 'tog-rememberpassword'        => 'Fattaliku sama baatujàll(cookie)',
-'tog-editwidth'               => 'Wone palanteeru coppite gi ci yaatuwaay bépp',
+'tog-editwidth'               => 'Wone palanteeru coppite bi ci yaatuwaay bépp',
 'tog-watchcreations'          => 'Yokk ci sama limu toppte xët yi may sos',
 'tog-watchdefault'            => 'Yokk ci sama limu toppte xët yi may soppi',
 'tog-watchmoves'              => 'Yokk ci sama limu toppte xët yi may tuddaat',
 'tog-watchdeletion'           => 'Yokk ci sama limu toppte xët yi may far',
 'tog-minordefault'            => 'jàppe samay coppite ni yu néewal saa su ne',
-'tog-previewontop'            => 'Tegal wonendi ngi ci kaw balaa boyotu coppite gi',
+'tog-previewontop'            => 'Tegal wonendi gi ci kaw balaa boyotu coppite bi',
 'tog-previewonfirst'          => 'wone wonendi gi su dee soppi gu njëkk la',
 'tog-nocache'                 => 'Doxadil ndenciti xët yi',
 'tog-enotifwatchlistpages'    => 'Yónne ma ab bataaxal su aw xët wu ne ci sama limu toppte soppikoo',
 'tog-enotifusertalkpages'     => 'Yónne ma ab bataaxal su ay coppite amee ci sama xëtu waxtaanuwaay',
-'tog-enotifminoredits'        => 'Yónne ma ab bataaxal donte coppite yu néew la ñu',
-'tog-enotifrevealaddr'        => 'Wone sama makkaan gu mbëjfeppal ci bataaxali yëgle yi',
-'tog-shownumberswatching'     => "Wone limu jëfandikukat yi'y topp wii xët",
-'tog-fancysig'                => 'Xaatim bu ñumm (amul lëkkalekaay bu boppal)',
-'tog-externaleditor'          => 'Jëfandiku soppikat bu biti saa su ne',
+'tog-enotifminoredits'        => 'Yónne ma ab bataaxal donte coppite yu néew lañu',
+'tog-enotifrevealaddr'        => 'Wone sama màkkaan bu mbëjfeppal ci bataaxali yëgle yi',
+'tog-shownumberswatching'     => 'Wone limu jëfandikukat yiy topp wii xët',
+'tog-fancysig'                => 'Xaatim bu ñumm (amul lëkkalekaay bu boppul)',
+'tog-externaleditor'          => 'Jëfandikoo soppikaay bu biti saa su ne',
 'tog-externaldiff'            => 'Jëfandiku ab méngalekaay bu biti saa su ne (ngir jëfandikukat yu xarale yi rekk, dafa laaj yenn kocc-koccal yi ci sa nosukaay)',
 'tog-showjumplinks'           => 'Doxalal lëkkalekaay yii di « joowin » ak « seet »',
 'tog-uselivepreview'          => 'Jëfandikul wonendi gu gaaw gi (JavaScript)',
-'tog-forceeditsummary'        => 'Wax ma ko suma mottaliwul ndefu boyotu sanni-kàddu bi',
-'tog-watchlisthideown'        => 'Nëbb samay coppite ci limu toppte gi',
+'tog-forceeditsummary'        => 'Wax ma ko suma mottaliwul koju coppite bi',
+'tog-watchlisthideown'        => 'Nëbb samay coppite ci limu toppte bi',
 'tog-watchlisthidebots'       => 'Nëbb coppite yi bot yi def ci biir limu toppte bi',
 'tog-watchlisthideminor'      => 'Nëbb coppite yu néewal yi ci biir limu toppte bi',
-'tog-ccmeonemails'            => 'Yónnee ma ab duppi bu bataaxal yi may yónnee yeneen jëfandikukat yi',
+'tog-watchlisthideliu'        => 'Nëbb coppite yu jëfandikukat yi bindu ci limu toppte bi',
+'tog-watchlisthideanons'      => 'Nëbb coppite yu jëfandikukat yi binduwul ci limu toppte bi',
+'tog-ccmeonemails'            => 'Yónne ma ab duppit bu bataaxal yi may yónne yeneen jëfandikukat yi',
 'tog-diffonly'                => 'Bul wone ëmbitu xët yi ci suufu fi ngay méngalee ay sumbam',
 'tog-showhiddencats'          => 'Wone wàll yi nëbbu',
 
@@ -57,8 +121,6 @@ $messages = array(
 'underline-never'   => 'Mukku',
 'underline-default' => 'Aju ci joowukaay bi',
 
-'skinpreview' => '(Wonendil)',
-
 # Dates
 'sunday'        => 'dibéer',
 'monday'        => 'altine',
@@ -152,7 +214,7 @@ $messages = array(
 'mytalk'         => 'Xëtu waxtaanuwaay',
 'anontalk'       => 'Waxtaan ak bii IP',
 'navigation'     => 'Joowiin',
-'and'            => 'ak',
+'and'            => '&#32;ak',
 
 # Metadata in edit box
 'metadata_help' => 'Jéeginjoxe :',
@@ -215,8 +277,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Ci mbiri {{SITENAME}}',
 'aboutpage'            => 'Project:Ci mbiri',
-'bugreports'           => 'Ngértey njuumte yi',
-'bugreportspage'       => 'Project:Ngértey njuumte',
 'copyright'            => 'Ëmbit li jàppandi na ci $1.',
 'copyrightpagename'    => 'àqu {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:Copyright',
@@ -239,9 +299,7 @@ $messages = array(
 
 'badaccess'        => 'Njuumte ci ndigël gi',
 'badaccess-group0' => 'Amoo ay sañ-sañ yu doy ngir man a def li nga bëgg a def.',
-'badaccess-group1' => 'jëf ji ngay jéem a def ñi bokk ci mbooloo mii $1 rek ñoo ko man.',
-'badaccess-group2' => 'Jëf ji ngay jéem a def, jëfandikukatu mbooloo yii $1 rek ñoo ko man.',
-'badaccess-groups' => 'Jëf ji ngay jéem a def, jëfandikukatu mbooloo yii $1 rek ñoo ko man.',
+'badaccess-groups' => 'Jëf ji ngay jéem a def dañu koo jagleel jëfandikukat yi bokk ci {{PLURAL:$2|mbooloo mu|benn ci mbooloo yi toftal}}: $1.',
 
 'versionrequired'     => 'Laaj na $1 sumbum MediaWiki',
 'versionrequiredtext' => 'Laaj na $1 sumbum MediaWiki ngir man a jëfandikoo wii xët. Xoolal [[Special:Version|fii]]',
@@ -271,20 +329,22 @@ $messages = array(
 'red-link-title'          => '$1 (xët wi amagul)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
-'nstab-main'      => 'Jukki',
+'nstab-main'      => 'Xët',
 'nstab-user'      => 'Xëtu jëfandikukat',
 'nstab-media'     => 'Xibaarukaay',
-'nstab-special'   => 'Jagleel',
+'nstab-special'   => 'Xëtu jagleel',
 'nstab-project'   => 'Xëtu sémb',
 'nstab-image'     => 'Dencukaay',
 'nstab-mediawiki' => 'Bataaxal',
 'nstab-template'  => 'Royuwaay',
-'nstab-help'      => 'Ndimbal',
+'nstab-help'      => 'Xëtu ndimbal',
 'nstab-category'  => 'Wàll',
 
 # Main script and global functions
 'nosuchaction'      => 'Jëf ji xameesu ko',
-'nosuchactiontext'  => 'Jëf ji ñu biral ci bii URL wiki bi xammeewu ko.',
+'nosuchactiontext'  => 'Jëf ji nga def ci URL bi xameesu  ko. 
+Xéj-na dangaa juum ci bind URL bi, walla nga topp lëkkalekaay bu baaxul. 
+Lii man naa doon it ag njuumte ci tëriin bi ñuy jëfandikoo ci {{SITENAME}}.',
 'nosuchspecialpage' => 'Xëtu jagleel wu amul',
 'nospecialpagetext' => "<big>'''Da nga laaj aw xëtu jagleel wu wiki bi xamul.'''</big>
 
@@ -292,11 +352,11 @@ Ab limu xëti jagleel yépp, ma nees na koo gis ci [[Special:SpecialPages|{{int:
 
 # General errors
 'error'                => 'Njuumte',
-'databaseerror'        => 'Njuumtey dattub njoxe bi',
-'dberrortext'          => 'Njuumtey mbindin ci laaj bi nga yóonne dattub njobe bi. Man na nekk it ab njuumte ci tëriin wi. Laaj bi ñu mujje yónne ci dattub njoxe bi moo doonoon:
+'databaseerror'        => 'Njuumtey dàttub njoxe bi',
+'dberrortext'          => 'Njuumtey mbindin ci laaj bi nga yónne dàttub njoxe bi. Man na nekk it ab njuumte ci tëriin bi. Laaj bi ñu mujje yónne ci dàttub njoxe bi moo doonoon:
 <blockquote><tt>$1</tt></blockquote>
-bàyyikoo ci bii solo « <tt>$2</tt> ». MySQL moo yónnewaat bii njuumte « <tt>$3 : $4</tt> ».',
-'dberrortextcl'        => 'Ab laaj ca dattub njoxe ba jur na ab njuumtey mbindin. Laaj bi ñu mujje yónne dattub njoxe bi moo doonoon : « $1 » bàyyikoo ci bii solo « $2 ». MySQL delloo na njuumte li « $3 : $4 ».',
+bàyyikoo ci bii solo « <tt>$2</tt> ». MySQL moo yónne waat bii njuumte « <tt>$3 : $4</tt> ».',
+'dberrortextcl'        => 'Ab laaj ca dàttub njoxe ba jur na ab njuumtey mbindin. Laaj bi ñu mujje yónne dàttub njoxe bi moo doonoon : « $1 » bàyyikoo ci bii solo « $2 ». MySQL delloo na njuumte li « $3 : $4 ».',
 'noconnect'            => 'Jéggalu! ngir ay tolof-tolofi xarala, fi mu ne nii dugg gi jàppandiwul. <br />
 $1',
 'nodb'                 => 'Falug dàttub njoxe bii di $1 antuwul',
@@ -327,7 +387,6 @@ Di la sakku nga yegge ko ab [[Special:ListUsers/sysop|yorkat]] , jox ko màkkaan
 'cannotdelete'         => 'Farug xët walla dencukaay bi nga joxoñ antuwul. (xayna far gi am na keneen ku ko def ba noppi.)',
 'badtitle'             => 'Koj bu baaxul',
 'badtitletext'         => 'Kojug xët wi nga laaj baaxul, amul dara walla  day di kojjug diggantelàkk walla diggantesémb yu seen lonkoo baaxul. Xayna it dafa am benn walla ay araf yu ñu manuta jëfandikoo cib koj.',
-'perfdisabled'         => 'Jéggalu! bii jëfukaay dañ kaa doxadilandi ndaxte day yeexal lool dattub njoxe bi, ba tax kenn manatul a jëfandikoo bi wiki.',
 'perfcached'           => 'Lii ab duppitu ndencitu sumb mi la, kon xéj-na beesul.',
 'perfcachedts'         => 'Njoxe yii di toftal ab duppitu ndencitu dattub njoxe bi la, te yeesalam gu mujj mi ngi am ci: $1',
 'querypage-no-updates' => 'Yeesal yu xët wii dañ leen a doxadil fi mu ne nii. Xibaar yi ne fii ci suuf beesuñu.',
@@ -341,7 +400,7 @@ Laaj : $2',
 'protectedpagetext'    => 'Wii xêt dañ kaa aar ngir bañ ag coppiteem.',
 'viewsourcetext'       => 'Man ngaa xool te duppi li nekk ci bii jukki ngir man cee liggéey :',
 'protectedinterface'   => 'Xët wii dafa am ay mbind yu bokk ci jokkalekaayu tëriin wi, moo tax ñu caabi ko ngir bañ ku ci ëppal.',
-'editinginterface'     => "'''Moytul''': mbindu xët wii dafa bokk ci jokkalekaayu tëriin bi. Bépp coppite boo ci def day feeñ ci bataaxal yi yeneen jëfandikukat yi di gis. Ngir tekki yi ñu lay ñaan nga dem ci   [http://translatewiki.net/wiki/Main_Page?setlang=wo Betawiki] di am sémb ngir bennal bataaxal yi.",
+'editinginterface'     => "'''Moytul''': mbindu xët wii dafa bokk ci jokkalekaayu tëriin bi. Bépp coppite boo ci def day feeñ ci bataaxal yi yeneen jëfandikukat yi di gis. Ngir tekki yi ñu lay ñaan nga dem ci   [http://translatewiki.net/wiki/Main_Page?setlang=wo translatewiki.net] di am sémb ngir bennal bataaxal yi.",
 'sqlhidden'            => '(Laaju SQL nëbbu na)',
 'cascadeprotected'     => 'Xët wii dañ kaa aar ndaxte daa ëmbu ci {{PLURAL:$1|xët wi toftal|xët yi toftal}}, di yu ñu aar :
 $2',
@@ -365,7 +424,6 @@ Sag mbindu sotti na. Bul fatte soppi say tànneef ni nga ko bëggee ci {{SITENAM
 'remembermypassword'         => 'Fattaliku sama baatujàll ci bii nosukaay',
 'yourdomainname'             => 'Sa barab',
 'externaldberror'            => 'Njuumte juddu na ci dattub njoxe bi, walla day ni rekk amuloo sañ-sañu yeesal sa sàqum biti.',
-'loginproblem'               => '<b>Jafe-jafey xammeeku.</b><br />Jéemaatal!',
 'login'                      => 'xammeeku',
 'nav-login-createaccount'    => 'Bindu/Duggu',
 'loginprompt'                => 'Faaw nga doxal cookie yi ngir man a duggu ci {{SITENAME}}.',
@@ -419,8 +477,8 @@ Soo doonul ki biral bii laaj, walla fattaliku nga sa baatujàll bu njëkk ba, te
 'eauthentsent'               => 'Yónnee nañ la ab m-bataaxalub dëggal ci màkkaanub m-bataaxal bi nga joxe. Balaa ñuy yónnee beneen m-bataaxal ci bii màkkaan, fawwu nga topp tektal yiñ la jox ngir dëggal ni yaa moom bii màkkaan.',
 'throttled-mailpassword'     => 'Ab m-bataaxal bu lay fattali sa baatujàll yónnee nañ la ko, am na $1 waxtu. Ngir moytu ay say-sayee, benn m-bataaxalu fattali rek lañ lay yónnee ci diiru $1 waxtu.',
 'mailerror'                  => 'Njuumte ci yónneeb m-bataaxal bi : $1',
-'acct_creation_throttle_hit' => 'Jéggalu, bindu nga $1 yoon. manoo binduwaat',
-'emailauthenticated'         => 'Ci $1 nga dëggal sa màkkaanu m-bataaxal.',
+'acct_creation_throttle_hit' => 'Jéggalu, sos nga {{PLURAL:$1|1 sàq|$1 sàq}}. manoo binduwaat',
+'emailauthenticated'         => '$2 ci $3. Nga dëggal sa màkkaanu m-bataaxal.',
 'emailnotauthenticated'      => 'Dëggalagoo sa m-bataaxal. Duñ la man a yónne benn m-bataaxal bu aju ci yii ci suuf.',
 'noemailprefs'               => 'Joxeel ab m-bataaxal ngir doxal yii solo',
 'emailconfirmlink'           => 'Dëggalal sa m-bataaxal',
@@ -432,6 +490,7 @@ Soo doonul ki biral bii laaj, walla fattaliku nga sa baatujàll bu njëkk ba, te
 Baatujàll bu « $2 » mooy « $3 ». Li gën mooy nga dugg ci teel te soppi baatujàll bi.
 
 Jéelaleel bataaxal bii su fekkee ci njuumte nga sosee mii sàq.',
+'login-throttled'            => 'Jéem ngaa dugg yoon yu bari ak bii baatujàll bu mii sàq. Xaaral tuuti laataa ngay jéemaat.',
 'loginlanguagelabel'         => 'Làkk : $1',
 
 # Password reset dialog
@@ -439,6 +498,9 @@ Jéelaleel bataaxal bii su fekkee ci njuumte nga sosee mii sàq.',
 'resetpass_announce'      => 'Da nga dugg ak ab baatujàll bu saxul-dakk, buñ la yónne cib bataaxal. Ngir jeexal mbindu mi, faaw nga roof ab baatujàll bu bees fii:',
 'resetpass_text'          => '<!-- Bindal fii -->',
 'resetpass_header'        => 'Neenalug baatujàll',
+'oldpassword'             => 'Baatujàll bu yàgg :',
+'newpassword'             => 'Baatujàll bu bees :',
+'retypenew'               => 'Bindaatal baatujàll bu bees bi :',
 'resetpass_submit'        => 'Soppil baatujàll bi te dugg',
 'resetpass_success'       => 'Coppiteeg baatujàll bi antu na : Yaa ngi duggu...',
 'resetpass_bad_temporary' => 'Baatujàll bu diiru bi baaxul. Xéj-na ni nga soppee sa baatujàll bi moo baax, walla nga laaj baatujàll bu bees.',
@@ -463,8 +525,8 @@ Jéelaleel bataaxal bii su fekkee ci njuumte nga sosee mii sàq.',
 'hr_tip'          => 'Rëbb wu tëdd (bul ci ëppal)',
 
 # Edit pages
-'summary'                          => 'Koj&nbsp;',
-'subject'                          => 'Tëriit/koj',
+'summary'                          => 'Koj&nbsp;:',
+'subject'                          => 'Tëriit/koj:',
 'minoredit'                        => 'Coppite yu néewal',
 'watchthis'                        => 'Topp xët wii',
 'savearticle'                      => 'Duggal coppite yi',
@@ -476,8 +538,8 @@ Jéelaleel bataaxal bii su fekkee ci njuumte nga sosee mii sàq.',
 'missingsummary'                   => "'''Moytul :''' Defoo ab tënk ci coppite yi nga amal. Soo cuqaate ci «Duggal coppite yi», say coppite di nañ duggu te duñ am koj, maanaam duñ xam loo soppi.",
 'missingcommenttext'               => 'Di la sakku nga duggal ab tënk ci-suuf, jërëjëf.',
 'missingcommentheader'             => "'''Fattali :''' Joxoo ab koj say coppite. Soo cuqaate ci «duggal coppite yi», di nañ leen duggal te duñ am koj.",
-'summary-preview'                  => 'Wonendi koj gi',
-'subject-preview'                  => 'Wonendi gu tëriit/koj',
+'summary-preview'                  => 'Wonendi koj gi:',
+'subject-preview'                  => 'Wonendi gu tëriit/koj:',
 'blockedtitle'                     => 'Bii jëfandikukat dañ kaa téye',
 'blockedtext'                      => '<big>\'\'\'Sa sàqum jëfandikukat walla sa màkkaanu IP dañ leen téye .\'\'\'</big>
 
@@ -532,16 +594,16 @@ Su fekkee jëfandikukat bu kenn-xamul nga, te nga gis ne dañu laa féetale ay k
 'userjspreview'                    => "'''Bul fatte ne lii ab wonendib sa yoonu javaScript rekk la; dencagoo say coppite!'''",
 'userinvalidcssjstitle'            => "'''Moytul :''' amul wenn melin wu tuddu « $1 ». Bul fatte ne xët yiy jeexee .css ak .js seeni koj ay araf yu tuut ñoo ciy tegu/.<br />ci misaal, {{ns:user}}:Foo/'''m'''onobook.css moo baax, waaye bii du baax {{ns:user}}:Foo/'''M'''onobook.css .",
 'updated'                          => '(bees na)',
-'note'                             => '<strong>Karmat :</strong>',
-'previewnote'                      => '<strong>Lii ab wonendi rekk la; coppite yi ci xët wi dencagoo leen!</strong>',
+'note'                             => "'''Karmat :'''",
+'previewnote'                      => "'''Lii ab wonendi rekk la; coppite yi ci xët wi dencagoo leen!'''",
 'previewconflict'                  => "Wonendi bi mengóo na ak mbind yi ne ci boyotu coppite bi te nii lay mel soo cuqe ci 'Denc xët wi'.",
-'session_fail_preview'             => '<strong>Jéegalu! manu noo denc say coppite ngir ñakkub ay njoxe ñeel sag duggu. Di la ñaan nga jéemaat. Su tolof-tolof bi wéyee, Jéemal a génn te duggaat. </strong>',
-'session_fail_preview_html'        => "<strong>Jéegalu ! manu noo denc say coppite ngir ab ñakkub ay njoxe ñeel sag duggu.</strong>
+'session_fail_preview'             => "'''Jéegalu! manu noo denc say coppite ngir ñakkub ay njoxe ñeel sag duggu. Di la ñaan nga jéemaat. Su tolof-tolof bi wéyee, Jéemal a génn te duggaat. '''",
+'session_fail_preview_html'        => "'''Jéegalu ! manu noo denc say coppite ngir ab ñakkub ay njoxe ñeel sag duggu.'''
 
 ''Segam ci bii dal dañ fee doxal HTML bu ñumm, ngir ay ngirtey kaaraange, wonendi gi du gisuwu.''
 
-<strong>Su tolof-tolof bi wéyee, man nga jéem a génn te duggaat .</strong>",
-'token_suffix_mismatch'            => '<strong>Votre édition n’a été acceptée car votre navigateur a mélangé les caractères de ponctuation dans l’identifiant d’édition. L’édition a été rejetée afin d’empêcher la corruption du texte de l’article. Ce problème se produit lorsque vous utilisez un proxy anonyme à problème.</strong>',
+'''Su tolof-tolof bi wéyee, man nga jéem a génn te duggaat .'''",
+'token_suffix_mismatch'            => "'''Votre édition n’a été acceptée car votre navigateur a mélangé les caractères de ponctuation dans l’identifiant d’édition. L’édition a été rejetée afin d’empêcher la corruption du texte de l’article. Ce problème se produit lorsque vous utilisez un proxy anonyme à problème.'''",
 'editing'                          => 'Coppiteg $1',
 'editingsection'                   => 'Coppiteg $1 (xaaj)',
 'editingcomment'                   => 'Coppiteg $1 (sanni-kàddu)',
@@ -553,27 +615,29 @@ Soo nammee denc say coppite, faaw nga duggal leen ci boyot bi ci kaw.
 Soo cuqe ci 'Denc xët wi', mbind yi ne ci boyot bi ci kaw rekk ñooy dencu .",
 'yourtext'                         => 'Sa mbind',
 'storedversion'                    => 'Sumb bi dencu',
-'nonunicodebrowser'                => '<strong>Attention : Votre navigateur ne supporte pas l’unicode. Une solution temporaire a été trouvée pour vous permettre de modifier en tout sûreté un article : les caractères non-ASCII apparaîtront dans votre boîte de modification en tant que codes hexadécimaux. Vous devriez utiliser un navigateur plus récent.</strong>',
-'editingold'                       => '<strong>Moytul: yaa ngi soppi am sumb mu yàgg mu xët wii. Soo leen dence, bépp coppite buñ defoon laataa mii sumb, di nañ leen ñakk.</strong>',
+'nonunicodebrowser'                => "'''Attention : Votre navigateur ne supporte pas l’unicode. Une solution temporaire a été trouvée pour vous permettre de modifier en tout sûreté un article : les caractères non-ASCII apparaîtront dans votre boîte de modification en tant que codes hexadécimaux. Vous devriez utiliser un navigateur plus récent.'''",
+'editingold'                       => "'''Moytul: yaa ngi soppi am sumb mu yàgg mu xët wii. Soo leen dence, bépp coppite buñ defoon laataa mii sumb, di nañ leen ñakk.'''",
 'yourdiff'                         => 'Wuute',
-'copyrightwarning'                 => 'Bépp cëru ci {{SITENAME}} dañ leen di jàppe niki ay siiwal yoo def te teg leen ci $2 (xoolal $1 ngir yeneeni xamle).
+'copyrightwarning'                 => "Bépp cëru ci {{SITENAME}} dañ leen di jàppe niki ay siiwal yoo def te teg leen ci $2 (xoolal $1 ngir yeneeni xamle).
 Soo bëggul keneen jël say mbind soppi leen, tas leen teg ci, bu leen fi duggal.<br />
 Te it na wóor ne li nga fiy duggal yaa leen moom, yaa leen bind, walla fa nga leen jële gongikuwaay bu ubbeeku la, lu kenn moomul.
-<strong>BUL FI DUGGAL LIGGÉEYI KENEEN YU AQI KI-SOS AAR TE AMOO CI BENN NDIGËL!</strong>',
-'copyrightwarning2'                => 'Karmat: Bépp cëru ci {{SITENAME}} yeneen jëfandikukat yi man nañ leen a soppi walla far leen.
+'''BUL FI DUGGAL LIGGÉEYI KENEEN YU AQI KI-SOS AAR TE AMOO CI BENN NDIGËL!'''",
+'copyrightwarning2'                => "Karmat: Bépp cëru ci {{SITENAME}} yeneen jëfandikukat yi man nañ leen a soppi walla far leen.
 Soo bëggul keneen jël say mbind soppi leen, tas leen teg ci, bu leen fi duggal.<br />
 Te it na wóor ne li nga fiy duggal yaa leen moom, yaa leen bind, walla fa nga leen jële gongikuwaay bu ubbeeku la, lu kenn moomul (xoolal $1 ngir yeneeni xamle).
-<strong>BUL FI DUGGAL LIGGÉEYI KENEEN YU AQI KI-SOS AAR TE AMOO CI BENN NDIGËL!</strong>',
+'''BUL FI DUGGAL LIGGÉEYI KENEEN YU AQI KI-SOS AAR TE AMOO CI BENN NDIGËL!'''",
 'longpagewarning'                  => "'''Muytul: guddaayu xët wi da fa romb $1 Kio ;
 yenn joowukaay yi, man nañoo wone ay tolof-tolof ci bu ñuy soppi xët yi romb dayoob 32 Kio. Li doon gën mooy nga séddatle ko ci ay xaaj yu bari.'''",
-'longpageerror'                    => '<strong>NJUUMTE : mbind mi nga yónne guddee na $1 kio, kon romb na dig bi di $2 kio. Mbind mi maneesu kaa denc.</strong>',
-'readonlywarning'                  => "'''Moytul: dattub njoxe bi dañ kaa caabi ngir ay liggéey,
-kon doo man a denc say coppite fi mu nekk nii. Man ngaa duppi mbind mi taf ko cib tëriin bu ñuy binde te taaxirlu ñu ubbi dattub njoxe bi.'''",
+'longpageerror'                    => "'''NJUUMTE : mbind mi nga yónne guddee na $1 kio, kon romb na dig bi di $2 kio. Mbind mi maneesu kaa denc.'''",
+'readonlywarning'                  => "'''Moytul: dàttub njoxe bi dañu koo caabi ngir ay liggéey,
+kon doo man a denc say coppite fi mu nekk nii. Man ngaa duppi mbind mi taf ko cib tëriin bu ñuy binde te taaxirlu ñu ubbi dàttub njoxe bi.'''
+
+Yorkat bi caabi dàttub njoxe bi joxe na yii leeral: $1",
 'protectedpagewarning'             => "'''Moytul : wii xët dañ kaa aar.
 Jëfandikukat yi nekk yorkat rekk a ko man a soppi.'''",
 'semiprotectedpagewarning'         => "'''Karmat :''' wii xët dañ kaa aar ba nga xam ne ñi bindu rekk a ko man a soppi.",
 'cascadeprotectedwarning'          => "'''MOYTUL :''' Xët wii dañ kaa aar ba nga xam ne yorkat yi rek ñoo koy man a soppi. Kaaraange googu dañ kaa def ndaxte xët wii dañ kaa dugal ci biir {{PLURAL:$1|aw xët wu ñu aar|ay xët yu ñu aar}}.",
-'titleprotectedwarning'            => '<strong>MOYTUL: wii xët dañ kaa aar ci anam boo xam ne yenn jëfandikukat yi rekk a ko man a sos.</strong>',
+'titleprotectedwarning'            => "'''MOYTUL: wii xët dañ kaa aar ci anam boo xam ne yenn jëfandikukat yi rekk a ko man a sos.'''",
 'templatesused'                    => 'Royuwaay yi nekk ci wii xët :',
 'templatesusedpreview'             => 'Royuwaay yi nekk ci gii wonendi :',
 'templatesusedsection'             => 'Royuwaay yi ne ci bii xaaj:',
@@ -589,6 +653,8 @@ Jëfandikukat yi nekk yorkat rekk a ko man a soppi.'''",
 'recreate-deleted-warn'            => "'''Moytul: yaa ngi nekk di sosaat aw xët wu ñu faroon.'''
 
 Wóorluwul bu baax ndax sosaat xët wi di na doon li gën. Xoolal yéenekaayu far gi ci suuf.",
+'deleted-notice'                   => 'Xët wii dañu koo far.
+Jaar-jaaru far bi moo ngi ci suuf ngir yeneen xibaar.',
 
 # Parser/template warnings
 'post-expand-template-inclusion-warning'  => 'Moytul: Royuwaay yi ñu duggal ci xët wi dañoo ëpp.
@@ -609,28 +675,28 @@ Yenn royuwaay yi duñu man a dugg.',
 Ngirtey téye gi $3 joxe, mooy ne: ''$2''.",
 
 # History pages
-'viewpagelogs'        => 'Xool yéenekaayu xët wii',
-'nohistory'           => 'Xët wii amulub jaar-jaar.',
-'revnotfound'         => 'Sumb mi gisuñ ko',
-'revnotfoundtext'     => 'Sumbum xët wi ngay laaj gisuñ ko. Saytul URL bi nga jëfandikoo ngir jot xët wii.',
-'currentrev'          => 'Sumb mi teew',
-'revisionasof'        => 'Sumb mu $1',
-'revision-info'       => 'Sumb mu $1, jëfandikukat: $2',
-'previousrevision'    => '� Sumb mi jiitu',
-'nextrevision'        => 'Sumb mi toftal →',
-'currentrevisionlink' => 'Sumb mi teew',
-'cur'                 => 'xamle',
-'next'                => 'tegu',
-'last'                => 'mujj',
-'page_first'          => 'jiitu',
-'page_last'           => 'mujj',
-'histlegend'          => 'Méngaley sumb: falal sumb yi nga bëgg a méngale te bës ci Ayca walla ci cuquwaay bi ci suuf.
+'viewpagelogs'           => 'Xool yéenekaayu xët wii',
+'nohistory'              => 'Xët wii amulub jaar-jaar.',
+'currentrev'             => 'Sumb mi teew',
+'currentrev-asof'        => 'Sumb mi teew mu $1',
+'revisionasof'           => 'Sumb mu $1',
+'revision-info'          => 'Sumb mu $1, jëfandikukat: $2', # Additionally available: $3: revision id
+'previousrevision'       => '� Sumb mi jiitu',
+'nextrevision'           => 'Sumb mi toftal →',
+'currentrevisionlink'    => 'Sumb mi teew',
+'cur'                    => 'xamle',
+'next'                   => 'tegu',
+'last'                   => 'mujj',
+'page_first'             => 'jiitu',
+'page_last'              => 'mujj',
+'histlegend'             => 'Méngaley sumb: falal sumb yi nga bëgg a méngale te bës ci Ayca walla ci cuquwaay bi ci suuf.
 
 (teew) = li mu wuuteek sumb mi teew, (jii) = li mu wuuteek sumb mi jiitu, <b>c</b> = coppite yu néewal.',
-'deletedrev'          => '[far nañ ko]',
-'histfirst'           => 'Cëru yi njëkk',
-'histlast'            => 'Cëru yi mujj',
-'historyempty'        => '(këmm)',
+'history-fieldset-title' => 'Seet ci jaar-jaar bi',
+'deletedrev'             => '[far nañ ko]',
+'histfirst'              => 'Cëru yi njëkk',
+'histlast'               => 'Cëru yi mujj',
+'historyempty'           => '(këmm)',
 
 # Revision feed
 'history-feed-title'          => 'Jaar-jaaru sumb yi',
@@ -720,13 +786,61 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 'difference'              => '(Wuute gi ci sumb yi)',
 'lineno'                  => 'Rëdd $1 :',
 'compareselectedversions' => 'Méengale sumb yi nga fal',
+'visualcomparison'        => 'Méengale gu gisu',
+'wikicodecomparison'      => 'Méengale gu wikitexte bi',
 'editundo'                => 'neenal',
 'diff-multi'              => '({{PLURAL:$1|am sumb mu diggu feeñul|$1 sumb yu diggu feeñuñu}}.)',
+'diff-movedto'            => 'mu jëm $1',
+'diff-added'              => '$1 yokku na ci',
+'diff-changedto'          => 'soppi nañ ko $1',
+'diff-movedoutof'         => 'toppale nañ ko ci biti $1',
+'diff-removed'            => '$1 far nañ ko',
+'diff-changedfrom'        => 'soppi nañ ko mat na $1',
+'diff-src'                => 'Gongikuwaay',
+'diff-withdestination'    => 'ak bàyyikuwaay $1',
+'diff-with'               => '&#32;ak $1 $2',
+'diff-with-additional'    => '$1 $2',
+'diff-with-final'         => '&#32;ak $1 $2',
+'diff-width'              => 'yaatuwaay',
+'diff-height'             => 'kawewaay',
+'diff-p'                  => "ab '''xise'''",
+'diff-blockquote'         => "aw '''tudd'''",
+'diff-h1'                 => "ab '''bopp (tolluwaay 1)'''",
+'diff-h2'                 => "ab '''bopp (tolluwaay 2)'''",
+'diff-h3'                 => "ab '''bopp (tolluwaay  3)'''",
+'diff-h4'                 => "ab '''bopp (tolluwaay 5)'''",
+'diff-h5'                 => "ab '''bopp (tolluwaay 5)'''",
+'diff-div'                => "ab '''séddale'''",
+'diff-ul'                 => "ab '''lim bu nosoodi'''",
+'diff-ol'                 => "ab '''lim bu nosu'''",
+'diff-li'                 => "ab '''limu ay jukki'''",
+'diff-table'              => "ab '''alliwa'''",
+'diff-tbody'              => "aw '''ëmbitu alliwa'''",
+'diff-tr'                 => "aw '''rëdd'''",
+'diff-th'                 => "ab '''bopp'''",
+'diff-br'                 => "aw '''dog'''",
+'diff-hr'                 => "aw '''rëdd wu tëdd'''",
+'diff-code'               => "ab '''danku yoonu nosukaay'''",
+'diff-dl'                 => "ab '''limu ay firi'''",
+'diff-dt'                 => "ab '''baatu firi'''",
+'diff-dd'                 => "ab '''firi'''",
+'diff-input'              => "ab '''duggit'''",
+'diff-img'                => "ab '''nataal'''",
+'diff-a'                  => "ab '''lëkkalekaay'''",
+'diff-i'                  => "'''wengal'''",
+'diff-b'                  => "'''duufal'''",
+'diff-strong'             => "'''duufal'''",
+'diff-font'               => "'''dayoo mbind'''",
+'diff-big'                => "'''réy'''",
+'diff-del'                => "'''faru'''",
+'diff-tt'                 => "'''yaatuwaay wi taxaw'''",
+'diff-strike'             => "'''rëddu-digg'''",
 
 # Search results
 'searchresults'             => 'Ngértey ceet gi',
+'searchresults-title'       => 'Ngértey ceet gu "$1"',
 'searchresulttext'          => 'Ngir yeneeni xibaar ci ceet gi ci {{SITENAME}}, xoolal [[{{MediaWiki:Helppage}}|{{int:help}}]].',
-'searchsubtitle'            => 'Yaa ngi seet « \'\'\'[[:$1]]\'\'\' » ([[Special:Prefixindex/$1|wépp wu tambalee "$1"]] | 
+'searchsubtitle'            => 'Yaa ngi seet « \'\'\'[[:$1]]\'\'\' » ([[Special:Prefixindex/$1|wépp wu tambalee "$1"]]{{int:pipe-separator}}
 [[Special:WhatLinksHere/$1|wépp xët wu ñu lëkkale ak wii "$1"]])',
 'searchsubtitleinvalid'     => 'Yaa ngi seet « $1 »',
 'noexactmatch'              => "'''Amul wenn xët wu tudd « $1 » wu am.''' man ngaa [[:$1|sakk xët wi]].",
@@ -739,6 +853,7 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 'prevn'                     => '$1 yi jiitu',
 'nextn'                     => '$1 yi toftal',
 'viewprevnext'              => 'Xool ($1) ($2) ($3).',
+'searchhelp-url'            => 'Help:Ndimbal',
 'search-result-size'        => '$1 ({{PLURAL:$2|1 baat|$2 baat}})',
 'search-result-score'       => 'Baaxaay: $1%',
 'search-redirect'           => '(jubluwaat bu jëm $1)',
@@ -755,6 +870,7 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 'searchall'                 => 'yépp',
 'showingresults'            => 'Woneg <b>$1</b> {{PLURAL:$1|ngérte|ciy ngérte}} doore ko ci #<b>$2</b>.',
 'showingresultsnum'         => 'Woneg <b>$3</b> {{PLURAL:$3|ngérte|ciy ngérte}} doore ko ci #<b>$2</b>.',
+'showingresultstotal'       => "Fii ci suuf woneg {{PLURAL:$4|ngérte '''$1'''|ngérte '''$1 – $2'''}} ci lu mat '''$3'''",
 'nonefound'                 => '<strong>Karmat</strong> : liy waral ñakkug ay ngérte yenn saa yi, mooy jëfandikoo ab baatu ceet bu gàtt, niki « a » walla « ak », walla jëfandikoo baati ceet yu bari (xët yi ëmb baat yi nga bind yépp, rekk ñooy feeñ).',
 'powersearch'               => 'Seet',
 'powersearch-legend'        => 'Ceet gu xóot',
@@ -779,6 +895,7 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 'qbsettings-floatingright' => 'Ci ndayjoor',
 'changepassword'           => 'Coppiteg baatujàll bi',
 'skin'                     => 'Melokaan',
+'skin-preview'             => 'Wonendil',
 'math'                     => 'Xayma',
 'dateformat'               => 'Dayoob taariix bi',
 'datedefault'              => 'Benn tànneef',
@@ -792,9 +909,6 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 'prefs-watchlist-days'     => 'Limu bes yi nga koy ba ci sa limu toppte :',
 'saveprefs'                => 'Denc tànneef yi',
 'resetprefs'               => 'Loppanti tànneef yi',
-'oldpassword'              => 'Baatujàll bu yàgg :',
-'newpassword'              => 'Baatujàll bu bees :',
-'retypenew'                => 'Bindaatal baatujàll bu bees bi :',
 'textboxsize'              => 'Boyotu coppite',
 'searchresultshead'        => 'Seet',
 'recentchangesdays'        => 'Limu bes yi nga koy wone ci coppite yu mujj yi :',
@@ -846,6 +960,7 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 # Recent changes linked
 'recentchangeslinked'          => 'Coppite yi ko ñeel',
 'recentchangeslinked-title'    => 'Coppite yi ñeel $1',
+'recentchangeslinked-backlink' => '� $1',
 'recentchangeslinked-noresult' => 'Benn coppite amul ci xët yi mu lëkkalool ci diir bi nga wax.',
 'recentchangeslinked-summary'  => "Wii xëtu jagleel moo lay won coppite yu mujj ci xët yi lëkkalook wii. Xët yi ci sa [[Special:Watchlist|limu toppte]] ñoo '''duuf'''.",
 'recentchangeslinked-page'     => 'Turu xët wi :',
@@ -885,16 +1000,16 @@ Soo jëfandikoo lëkkalekaayu joow yi day neenal boyot yi nga jotoon a fal.',
 'large-file'                  => 'li gën mooy dayoo dencukaay bi baña romb $1; bii dencukaay $2 la.',
 'largefileserver'             => 'Dayoo dencukaay bi romb na kem bu joxekaay bi attan.',
 'emptyfile'                   => 'Dencukaay bi nga bëgga yeb dafa mel ni amul dara. Xéj-na ag njuumte ci turu dencukaay bi moo ko waral. Seetal bu baax ndax dëgg-dëgg bëgg nga yeb bii dencukaay.',
-'fileexists'                  => 'Am na dencukaay bu tudd nii ba noppi. Saytul <strong><tt>$1</tt></strong> su dee wóoru la ne bëgg nga koo soppi.',
-'filepageexists'              => 'Xëtu faramfacce wu dencukaay bi sos nañ ko ba noppi ci bii màkkaan <strong><tt>$1</tt></strong>, waaye amagul dencukaay bu ni tudd nii-nii. Faramfacceg xët wi nga duggal ci diirub yeb gi du feeñ ci xëtu waxtaanuwaay wi. Ngir faramfacce gi feeñ ci xëtu waxtaanuwaay wi faaw nga soppi ko ak sa loxo.',
-'fileexists-extension'        => 'Am na dencukaay bu ni tudd ba noppi: <br />
-Turu dencukaay bi ngay yeb : <strong><tt>$1</tt></strong><br />
-Turu dencukaay bi fi am : <strong><tt>$2</tt></strong><br />
-Ngir-yàlla tànnal beneen tur.',
+'fileexists'                  => "Am na dencukaay bu tudd nii ba noppi. Saytul '''<tt>$1</tt>''' su dee wóoru la ne bëgg nga koo soppi.",
+'filepageexists'              => "Xëtu faramfacce wu dencukaay bi sos nañ ko ba noppi ci bii màkkaan '''<tt>$1</tt>''', waaye amagul dencukaay bu ni tudd nii-nii. Faramfacceg xët wi nga duggal ci diirub yeb gi du feeñ ci xëtu waxtaanuwaay wi. Ngir faramfacce gi feeñ ci xëtu waxtaanuwaay wi faaw nga soppi ko ak sa loxo.",
+'fileexists-extension'        => "Am na dencukaay bu ni tudd ba noppi: <br />
+Turu dencukaay bi ngay yeb : '''<tt>$1</tt>'''<br />
+Turu dencukaay bi fi am : '''<tt>$2</tt>'''<br />
+Ngir-yàlla tànnal beneen tur.",
 'fileexists-thumb'            => "<center>'''Dencukaay bi am na'''</center>",
 'fileexists-forbidden'        => 'Am na dencukaay bu ni tudd ba noppi; Dellul ginnaaw ngir yeb dencukaay bi ak beneen tur 
-[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Am na dencukaay bu ni tudd ba noppi ci dàttub njoxe biñ bokk; Dellul ginnaaw ngir yeb dencukaay bi ak beneen tur. [[Image:$1|thumb|center|$1]]',
+[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Am na dencukaay bu ni tudd ba noppi ci dàttub njoxe biñ bokk; Dellul ginnaaw ngir yeb dencukaay bi ak beneen tur. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => 'Dencukaay bi ñaaralub {{PLURAL:$1|dencukaay bii di toftal|dencukaay yii di toftal}} :',
 'successfulupload'            => 'Yeb gi jàll na',
 'uploadwarning'               => 'Moytul !',
@@ -914,11 +1029,11 @@ Ngir-yàlla tànnal beneen tur.',
 
 Jaar-jaaru far gi man na laa dimbali ci nga see ndaxam jar na nga yebaat ko.",
 
-# Special:ImageList
-'imagelist'      => 'Limu nataal yi',
-'imagelist_user' => 'Jëfëndikookat',
+# Special:ListFiles
+'listfiles'      => 'Limu nataal yi',
+'listfiles_user' => 'Jëfëndikookat',
 
-# Image description page
+# File description page
 'filehist'            => 'Jaar-jaaru dencukaay bi',
 'filehist-help'       => 'Cuqal cib taariix/waxtu ngir gis ni dencukaay bi meloo ca jamono jooju.',
 'filehist-deleteall'  => 'Far lépp',
@@ -931,6 +1046,9 @@ Jaar-jaaru far gi man na laa dimbali ci nga see ndaxam jar na nga yebaat ko.",
 'filehist-filesize'   => 'Dayoo dencukaay bi',
 'imagelinks'          => 'Xët yi am bii nataal',
 'linkstoimage'        => 'Xët yii ci suuf am nañ ci seen biir bii nataal :',
+'linkstoimage-more'   => 'Lu ëpp $1 {{PLURAL:$1|xët lëkkale nañu leen|xët lëkkale nañu leen}} ak bii dencukaay.
+Lim bii di toftal moo lay won {{PLURAL:$1|xët wi ñu njëkk a|xët yi ñu njëkk a}} lëkkale ak wii.
+Ab [[Special:WhatLinksHere/$2|lim bu mat]] jàppandi na.',
 'nolinkstoimage'      => 'Amul wenn xët wu am bii nataal.',
 'morelinkstoimage'    => 'Xool [[Special:WhatLinksHere/$1|yeneeni lëkkalekaay]] yuy jëme ci bii nataal.',
 'redirectstofile'     => '{{PLURAL:$1|Dencukaay bii di toftal ab|$1 dencukaay yii di toftal ay}} jubluwaat {{PLURAL:$1|la buy|lañu yuy}} jëme ci bii dencukaay:',
@@ -949,7 +1067,7 @@ Jaar-jaaru far gi man na laa dimbali ci nga see ndaxam jar na nga yebaat ko.",
 'randompage' => 'Aw xët ci mbetteel',
 
 # Statistics
-'userstats' => 'Limbarem jëfëndikookat',
+'statistics-header-users' => 'Limbarem jëfëndikookat',
 
 'brokenredirectstext'    => "Yoonalaat yii dañuy jëmee ci'y xët yu amul :",
 'brokenredirects-edit'   => '(Soppi)',
@@ -994,8 +1112,6 @@ Jaar-jaaru far gi man na laa dimbali ci nga see ndaxam jar na nga yebaat ko.",
 'speciallogtitlelabel' => 'Koj :',
 'log'                  => 'Yéenekaay',
 'all-logs-page'        => 'Yéenekaay yëpp',
-'log-search-legend'    => 'Seet ci yéenekaay yi',
-'log-search-submit'    => 'waaw',
 'logempty'             => 'Dara nekkul ci jaar-jaaru xët mii.',
 
 # Special:AllPages
@@ -1050,10 +1166,6 @@ Jaar-jaaru far gi man na laa dimbali ci nga see ndaxam jar na nga yebaat ko.",
 'watchlistcontains'    => "Sa limu toppte am na '''$1''' {{PLURAL:$1|xët|xët}}.",
 'wlnote'               => 'Fii ci suuf {{PLURAL:$1| ngay gis coppite yu mujj yi|ngay gis $1 coppite yu mujj}} ci {{PLURAL:$2|waxtu gu mujj gi|<b>$2</b> waxtu yu mujj}}.',
 'wlshowlast'           => 'wone $1 waxtu yu mujj, $2 bess yu mujj, walla $3.',
-'watchlist-show-own'   => 'Wone samay coppite',
-'watchlist-hide-own'   => 'Nëbb samay coppite',
-'watchlist-show-minor' => 'Wone coppite yu tuut yi',
-'watchlist-hide-minor' => 'Nëbb coppite yu tuut yi',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Topp...',
@@ -1069,14 +1181,39 @@ Jaar-jaaru far gi man na laa dimbali ci nga see ndaxam jar na nga yebaat ko.",
 'enotif_lastdiff'              => 'Xoolal $1 ngir gis gii coppite.',
 'enotif_anon_editor'           => 'Jëfandikukat bu binduwul $1',
 
-# Delete/protect/revert
-'deletepage'      => 'Far xët wi',
-'confirm'         => 'Dëggal',
-'excontent'       => 'ëmbitam doonoon « $1 »',
-'excontentauthor' => 'ëmbitam doonoon: « $1 » te kenn ki ci cëru doonoon « [[Special:Contributions/$2|$2]] »',
-'exbeforeblank'   => 'ëmbitam laataa far gi : $1',
-'exblank'         => 'xët wi amul dara',
-'deletionlog'     => 'Yéenekaay',
+# Delete
+'deletepage'             => 'Far xët wi',
+'confirm'                => 'Dëggal',
+'excontent'              => 'ëmbitam doonoon « $1 »',
+'excontentauthor'        => 'ëmbitam doonoon: « $1 » te kenn ki ci cëru doonoon « [[Special:Contributions/$2|$2]] »',
+'exbeforeblank'          => 'ëmbitam laataa far gi : $1',
+'exblank'                => 'xët wi amul dara',
+'delete-confirm'         => 'Far « $1 »',
+'delete-backlink'        => '� $1',
+'delete-legend'          => 'Far',
+'historywarning'         => 'Moytul! xët wi ngay waaja far am na jaar-jaar :',
+'confirmdeletetext'      => 'Yaa ngi waaja far ba faaw, ci dáttub njoxe bi, aw xët walla ab nataal ak jaar-jaaram. Dila ñaan nga dëggal ne loolu nga namma def dëgg-dëgg, te xam nga limuy jur, te itam dëppoo na ak átte yi ñu tëral ci [[{{MediaWiki:Policy-url}}]].',
+'actioncomplete'         => 'Jëf ji defees nañu ko',
+'deletedtext'            => '« <nowiki>$1</nowiki> » far nañu ko.
+Xolal $2 ngir gis limu farte bi mujj.',
+'deletedarticle'         => 'moo far « [[$1]] »',
+'dellogpage'             => 'Jaar-jaaru farte bi',
+'dellogpagetext'         => 'Li toftal ab limu farte yi mujj la.',
+'deletionlog'            => 'jaar-jaaru  farte bi',
+'reverted'               => 'Loppanti ci sumb mi weesu',
+'deletecomment'          => 'Ngirtey farte gi:',
+'deleteotherreason'      => 'Yeneeni ngirte :',
+'deletereasonotherlist'  => 'Yeneeni ngirte',
+'deletereason-dropdown'  => '*Ngirtey farte yi gëna bari
+** Aji-sos jee ko deflu
+** Jalgati aqi aji-sos
+** Caay-caay',
+'delete-edit-reasonlist' => 'Soppi ngirtey farte gi',
+'delete-toobig'          => 'Xët wii dafa am jaar-jaar bu bari, bu weesu $1 {{PLURAL:$1|sumb|sumb}}. Farteg yooyule xët dañu koo digal ngir bañ ay jafe-jafe yu mana am ci doxinu {{SITENAME}}.',
+'delete-warning-toobig'  => 'Xët wii dafa am jaar-jaar bu bari, bu weesu $1 {{PLURAL:$1|sumb|sumb}}. Seenug farte man naa jur ag jaxasoo ci dáttub njoxeeb {{SITENAME}} ; def ko ak teey.',
+
+# Protect
+'prot_1movedto2' => 'tuddewaat ko [[$1]] en [[$2]]',
 
 # Undelete
 'viewdeletedpage'            => 'Jaar-jaaru xët wi ñu dindi',
@@ -1115,7 +1252,6 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 'whatlinkshere'            => 'Xët yi mu lëkkalool',
 'whatlinkshere-title'      => 'Xët yi lëkkalook wii « $1 »',
 'whatlinkshere-page'       => 'Xët :',
-'linklistsub'              => '(Limuy lëkkalekaay)',
 'linkshere'                => 'Xët yii ci suuf am nañ ab lëkkalekaay buy jëm <b>[[:$1]]</b> :',
 'nolinkshere'              => 'Amul wenn xët wu lëkkalook wii <b>[[:$1]]</b>.',
 'nolinkshere-ns'           => "Amul wenn xët wu lëkkalook wii '''[[:$1]]''' ci barabu tur bi nga tànn.",
@@ -1197,6 +1333,7 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 # Move page
 'move-page-legend'        => 'Tuddewaat aw xët',
 'movearticle'             => 'Tuddewaatal jukki bi',
+'movenologintext'         => 'Ngir man a tuddewaat aw xët, da ngaa war a [[Special:UserLogin|dugg]] ni jëfëndikookat bu bindu te saw sàq war naa am yaggaa bi mu laaj.',
 'newtitle'                => 'Koj bu bees',
 'move-watch'              => 'Topp xët wii',
 'movepagebtn'             => 'Tuddewaat xët wi',
@@ -1228,16 +1365,19 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 'thumbnail-more' => 'Ngandal',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'Xëtu jëfëndikookat',
-'tooltip-pt-mytalk'               => 'Sama xëtu waxtaanukaay',
-'tooltip-pt-preferences'          => 'Samay tànneef',
+'tooltip-pt-userpage'             => 'Sa xëtu jëfandikukat',
+'tooltip-pt-anonuserpage'         => 'Xëtu jëfandikukat wu bii màkkaanu IP',
+'tooltip-pt-mytalk'               => 'Sa xëtu waxtaanuwaay',
+'tooltip-pt-anontalk'             => 'Xëtu waxtaanuwaay wu bii màkkaanu IP',
+'tooltip-pt-preferences'          => 'Say tànneef',
 'tooltip-pt-watchlist'            => 'Limu xët yi ngay topp',
-'tooltip-pt-mycontris'            => 'Limu samay cërute',
+'tooltip-pt-mycontris'            => 'Limu say cëru',
 'tooltip-pt-login'                => 'Woo nan la ngir nga xammeku, waaye doonul lu manuta ñakk.',
 'tooltip-pt-anonlogin'            => 'woo nan la ngir nga xammeku, waaye doonul lu manuta ñakk.',
-'tooltip-pt-logout'               => 'Gennu',
+'tooltip-pt-logout'               => 'Génn',
 'tooltip-ca-talk'                 => 'Waxtaan yi ñeel xët wii',
 'tooltip-ca-edit'                 => 'Man ngaa soppi xët wi. Ngir yàlla wonendil laataa ngay denc.',
+'tooltip-ca-addsection'           => 'Tambali xaaj bu bees',
 'tooltip-ca-viewsource'           => 'Xët wii dañ koo aar. Waaye man ngaa xool ëmbitam.',
 'tooltip-ca-history'              => 'Sumb yi weesu yu xët wi.',
 'tooltip-ca-protect'              => 'Aar xët wii',
@@ -1246,7 +1386,7 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 'tooltip-ca-move'                 => 'Tuddewaatal xët wii',
 'tooltip-ca-watch'                => 'Yokk xët wii ci sa limu toppte',
 'tooltip-ca-unwatch'              => 'Jële xët wii ci sa limu toppte',
-'tooltip-search'                  => 'Seetal ci biir {{SITENAME}}',
+'tooltip-search'                  => 'Seet ci biir {{SITENAME}}',
 'tooltip-search-go'               => 'Dem ci xët wi tudd ni nga wax, su dee am na.',
 'tooltip-search-fulltext'         => 'Seet xët yi ëmb kàddu gi',
 'tooltip-p-logo'                  => 'Xët wu njëkk',
@@ -1260,7 +1400,7 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 'tooltip-t-recentchangeslinked'   => 'Limu coppite yu mujj yu xët yi lëkkalook wii',
 'tooltip-feed-rss'                => 'Walug RSS ngir wii xët',
 'tooltip-feed-atom'               => 'Walug Atom ngir wii xët',
-'tooltip-t-contributions'         => 'Xool limu cërute bu bii jëfandikukat',
+'tooltip-t-contributions'         => 'Xool limu cëru bu bii jëfandikukat',
 'tooltip-t-emailuser'             => 'Yónne ab m-bataaxal bii jëfandikukat',
 'tooltip-t-upload'                => 'Yeb ay dencukaay',
 'tooltip-t-specialpages'          => 'Limu xëti jagleel yépp',
@@ -1338,7 +1478,7 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 'file-info-size' => '($1 × $2 pixels, réyaayu file bi : $3, type MIME : $4)',
 'show-big-image' => 'Ngandalal nataal gii',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Seet',
 'bydate'   => 'ci diir',
 
@@ -1361,9 +1501,6 @@ Saytul [[Special:Log/delete|jaar-jaaru far bi]] ngir xool far yi ak loppanti yu
 : ''$2''
 Dëgëlël ni bëgg ngaa sakkaat xët wii.",
 
-# AJAX search
-'articletitles' => 'Jukki yu tambalee « $1 »',
-
 # Auto-summaries
 'autoredircomment' => 'Jubluwaat fii [[$1]]',
 'autosumm-new'     => 'Xët wu bees : $1',
diff --git a/languages/messages/MessagesWuu.php b/languages/messages/MessagesWuu.php
index e7b33a96..7235ea28 100644
--- a/languages/messages/MessagesWuu.php
+++ b/languages/messages/MessagesWuu.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Hercule
  * @author O
  */
 
@@ -39,8 +40,6 @@ $messages = array(
 'underline-never'   => '从�弗',
 'underline-default' => '�览器默认',
 
-'skinpreview' => '(预览)',
-
 # Dates
 'sunday'        => '星期天',
 'monday'        => '星期一',
@@ -99,7 +98,7 @@ $messages = array(
 'subcategories'                 => '亚类',
 'category-media-header'         => '"$1"分类中个媒体',
 'category-empty'                => "''该个分类中尚未包�任何文章或媒体。''",
-'hidden-categories'             => '个囥脱分类',
+'hidden-categories'             => '$1��分类',
 'hidden-category-category'      => '囥脱分类', # Name of the category where hidden categories will be listed
 'category-subcat-count-limited' => '该个分类中有个亚类。',
 
@@ -125,7 +124,7 @@ $messages = array(
 'mytalk'         => '我个讲张',
 'anontalk'       => '该IP个讲张',
 'navigation'     => '导航',
-'and'            => '�仔',
+'and'            => '&#32;�仔',
 
 'errorpagetitle'    => '错误',
 'returnto'          => '返回到$1。',
@@ -232,6 +231,7 @@ $messages = array(
 
 # General errors
 'error'           => '错误',
+'laggedslavemode' => '警告: 页��能弗包�最近个更新。',
 'filedeleteerror' => '呒能删除文物“$1�。',
 'filenotfound'    => '寻弗�文件 "$1"。',
 'badtitle'        => '该�标题弗�三',
@@ -241,7 +241,7 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'                => '用户登出',
-'logouttext'                 => '<strong>倷已�登出哉。</strong><br /> 倷�以继续匿�使用{{SITENAME}} ，倷也�以�次以相�或者两样个用户�登录。注�，有星页�作兴还是会�倷登出�头一样显示，一脚到倷清脱倷个�览器缓存。',
+'logouttext'                 => "'''倷已�登出哉。'''<br /> 倷�以继续匿�使用{{SITENAME}} ，倷也�以�次以相�或者两样个用户�登录。注�，有星页�作兴还是会�倷登出�头一样显示，一脚到倷清脱倷个�览器缓存。",
 'welcomecreation'            => '== 欢迎， $1� ==
 
 倷个户头已�建立哉。覅忘记脱改动倷个{{SITENAME}}�好噢。',
@@ -256,7 +256,7 @@ $messages = array(
 'logout'                     => '登出',
 'userlogout'                 => '登出',
 'notloggedin'                => '朆登录',
-'nologin'                    => '还呒拨户头？$1。',
+'nologin'                    => '您还没有账户�？$1。',
 'nologinlink'                => '新开户头',
 'createaccount'              => '新开户头',
 'gotaccount'                 => '已�有仔��哉？ $1。',
@@ -277,13 +277,18 @@ $messages = array(
 'loginsuccess'               => "'''倷现在以 \"\$1\" 个身份登录到{{SITENAME}}。 '''",
 'nouserspecified'            => '侬必须选个用户�。',
 'wrongpassword'              => '密�弗对嗄。请倷�试试看。',
-'mailmypassword'             => '电�邮件��密�',
+'mailmypassword'             => '将新密�寄给我',
 'acct_creation_throttle_hit' => '对覅起，侬�建了$1个账�。侬呒能�建了。',
 'emailauthenticated'         => '倷个电�邮箱地�勒拉 $1 验�过哉。',
 'accountcreated'             => '户头开好哉',
 'accountcreatedtext'         => '$1 个户头已�建立哉。',
 'loginlanguagelabel'         => '语言：$1',
 
+# Password reset dialog
+'oldpassword' => '旧密�:',
+'newpassword' => '新密�:',
+'retypenew'   => '�打一�新密�:',
+
 # Edit page toolbar
 'bold_sample'    => '黑体文本',
 'bold_tip'       => '黑体文本',
@@ -298,7 +303,7 @@ $messages = array(
 'sig_tip'        => '倷个签��仔辰光记录',
 
 # Edit pages
-'summary'            => '总结',
+'summary'            => '总结:',
 'minoredit'          => '该个是个�改动',
 'watchthis'          => '监控该�页�',
 'savearticle'        => '�存页�',
@@ -317,14 +322,14 @@ $messages = array(
 �创建该页�呢，就勒下底个框框里�开始写（[[{{MediaWiki:Helppage}}|帮助页�]]浪有更加多个信�）。
 �是倷是弗用心到该�个说�，��点击倷�览器个'''返回'''�钮。",
 'noarticletext'      => '个篇文章目�还呒拨内容，倷�以拉别个页�里�[[Special:Search/{{PAGENAME}}|寻寻该�标题看]]或者[{{fullurl:{{FULLPAGENAME}}|action=edit}} 编辑当�页�].',
-'note'               => '<strong>注�：</strong>',
-'previewnote'        => '<strong>该个还�是预览；改动还朆�存�</strong>',
+'note'               => "'''注�：'''",
+'previewnote'        => "'''该个还�是预览；改动还朆�存�'''",
 'editing'            => '正在编辑$1',
 'editingsection'     => '正在编辑$1（段�）',
 'editingcomment'     => '正在编辑$1（评论）',
 'editconflict'       => '编辑冲�: $1',
 'yourtext'           => '侬个文字',
-'editingold'         => '<strong> 注�：倷勒里改动一�已�过期个页�修改。 如果倷�存俚个说�，勒拉该个修改之�个亨白浪当个修改侪会呒拨个。</strong>',
+'editingold'         => "''' 注�：倷勒里改动一�已�过期个页�修改。 如果倷�存俚个说�，勒拉该个修改之�个亨白浪当个修改侪会呒拨个。'''",
 'template-protected' => '(�护)',
 
 # Account creation failure
@@ -351,6 +356,7 @@ $messages = array(
 # Diffs
 'compareselectedversions' => '比较选中个版本',
 'editundo'                => '撤销',
+'diff-multi'              => '($1个中途个修订版本无没显示。)',
 
 # Search results
 'searchresults'         => '�索结果',
@@ -361,7 +367,8 @@ $messages = array(
 'prevn'                 => '上个 $1',
 'nextn'                 => '下个 $1',
 'viewprevnext'          => '查看 ($1) ($2) ($3)',
-'powersearch'           => '�寻',
+'searchhelp-url'        => 'Help:目录',
+'powersearch'           => '高级�索',
 
 # Preferences page
 'preferences'           => '�好',
@@ -370,6 +377,7 @@ $messages = array(
 'qbsettings-none'       => 'å‘’',
 'changepassword'        => '改密�',
 'skin'                  => '皮肤',
+'skin-preview'          => '预览',
 'math'                  => '数学公�',
 'datedefault'           => '呒拨�好',
 'datetime'              => '日脚�仔辰光',
@@ -379,9 +387,6 @@ $messages = array(
 'prefs-watchlist-days'  => '勒拉监控列表里�显示个日数：',
 'prefs-watchlist-edits' => '勒拉扩展个监控列表里�显示个编辑趟数：',
 'saveprefs'             => '�存',
-'oldpassword'           => '旧密�:',
-'newpassword'           => '新密�:',
-'retypenew'             => '�打一�新密�:',
 'textboxsize'           => '编辑',
 'searchresultshead'     => '�索',
 'recentchangescount'    => '近段辰光个改动标题数：',
@@ -443,11 +448,11 @@ $messages = array(
 'uploadnologin'     => '朆登录',
 'uploadnologintext' => '倷�定�[[Special:UserLogin|登录]]仔�好上载文件。',
 'uploaderror'       => '上载出错',
-'uploadtext'        => "拿下头�表格�上载文件。�查看或者�寻之�上载个图片个说法，请到[[Special:ImageList|已上载文件列表]]，上载�仔删脱也记录勒拉[[Special:Log/upload|上载日志]]里�。
+'uploadtext'        => "拿下头�表格�上载文件。�查看或者�寻之�上载个图片个说法，请到[[Special:FileList|已上载文件列表]]，上载�仔删脱也记录勒拉[[Special:Log/upload|上载日志]]里�。
 
 �勒拉页�里�摆进图片个说法，用下头该�形�个链接
-'''<nowiki>[[{{ns:image}}:文件.jpg]]</nowiki>'''，
-'''<nowiki>[[{{ns:image}}:文件.png|替代文本]]</nowiki>''' 或者用
+'''<nowiki>[[{{ns:file}}:文件.jpg]]</nowiki>'''，
+'''<nowiki>[[{{ns:file}}:文件.png|替代文本]]</nowiki>''' 或者用
 '''<nowiki>[[{{ns:media}}:文件.ogg]]</nowiki>''' 直接链到文件。",
 'uploadlog'         => '文件上载日志',
 'uploadlogpage'     => '文件上载日志',
@@ -467,17 +472,17 @@ $messages = array(
 'destfilename'      => '目标文件�:',
 'watchthisupload'   => '监控该�页�',
 
-# Special:ImageList
-'imagelist_search_for'  => '寻图片�字:',
+# Special:ListFiles
+'listfiles_search_for'  => '寻图片�字:',
 'imgfile'               => '�文件',
-'imagelist'             => '文件列表',
-'imagelist_date'        => '日脚',
-'imagelist_name'        => '�字',
-'imagelist_user'        => '用户',
-'imagelist_size'        => '尺寸 (bytes)',
-'imagelist_description' => '�述',
-
-# Image description page
+'listfiles'             => '文件列表',
+'listfiles_date'        => '日脚',
+'listfiles_name'        => '�字',
+'listfiles_user'        => '用户',
+'listfiles_size'        => '尺寸 (bytes)',
+'listfiles_description' => '�述',
+
+# File description page
 'filehist'                  => '文物历�',
 'filehist-deleteall'        => '全删',
 'filehist-deleteone'        => '删',
@@ -510,11 +515,8 @@ $messages = array(
 'randompage' => '�便望望',
 
 # Statistics
-'statistics'    => '统计',
-'sitestats'     => '{{SITENAME}}统计',
-'userstats'     => '用户资料',
-'sitestatstext' => "数�库里�亨白浪当有'''{{PLURAL:$1|一|$1}}'''�页�。 个包括'''讲张页'''，'''{{SITENAME}}'''个说明页，顶少个'''stub'''页，�定�页�仔别个作兴还弗好算�格内容页�个页�。 弗包括该星个说�，有'''{{PLURAL:$2|一|$2}}'''�作兴是�格个内容页。 亨白浪当上载� '''$8''' �文件。",
-'userstatstext' => "亨白浪当有 '''{{PLURAL:$1|1|$1}}''' 个登记户头，�里� '''$2''' (或 '''$4%''') 个是 $5。",
+'statistics'              => '统计',
+'statistics-header-users' => '用户资料',
 
 'brokenredirects'        => '�脱个�定�',
 'brokenredirectstext'    => '下底个�定�链到弗存在个页�:',
@@ -579,28 +581,22 @@ $messages = array(
 'emailsenttext' => '倷个电�邮件讯�已�拨��哉。',
 
 # Watchlist
-'watchlist'            => '监控列表',
-'mywatchlist'          => '我个监控列表',
-'watchlistfor'         => "（'''$1'''个监控列表）",
-'nowatchlist'          => '倷个监控列表是空个。',
-'watchnologin'         => '朆登录',
-'addedwatch'           => '加到监控列表哉',
-'addedwatchtext'       => "该个页� \"[[:\$1]]\" 已�加到侬个[[Special:Watchlist|监控列表]]哉。
+'watchlist'         => '监控列表',
+'mywatchlist'       => '我个监控列表',
+'watchlistfor'      => "（'''$1'''个监控列表）",
+'nowatchlist'       => '倷个监控列表是空个。',
+'watchnologin'      => '朆登录',
+'addedwatch'        => '加到监控列表哉',
+'addedwatchtext'    => "该个页� \"[[:\$1]]\" 已�加到侬个[[Special:Watchlist|监控列表]]哉。
 将�对该页�个改动�仔�界个讲张页个改动会列表垃该�，并且页�会垃拉[[Special:RecentChanges|近段辰光个改�列表]]里�显示�功'''黑体'''，实梗好外加便当拿渠拣出�。�使侬歇仔两日�想拿箇个页�登侬个监控列表里�拿脱个说法，垃侧�里�点击“弗�监控。",
-'removedwatch'         => '登监控列表里�拿脱哉',
-'removedwatchtext'     => '"[[:$1]]"已�从侬个监控列表移除。',
-'watch'                => '监控',
-'watchthispage'        => '监控该�页�',
-'unwatch'              => '覅监控',
-'unwatchthispage'      => '�止监控',
-'watchlistcontains'    => '倷个监控列表包括{{PLURAL:$1|1|$1}}�页�。',
-'wlshowlast'           => '显示上个 $1 个钟头 $2 日 $3',
-'watchlist-show-bots'  => '显示机器人个编辑',
-'watchlist-hide-bots'  => '��机器人个编辑',
-'watchlist-show-own'   => '显示我个编辑',
-'watchlist-hide-own'   => '��我个编辑',
-'watchlist-show-minor' => '显示�编辑',
-'watchlist-hide-minor' => '���编辑',
+'removedwatch'      => '登监控列表里�拿脱哉',
+'removedwatchtext'  => '"[[:$1]]"已�从侬个监控列表移除。',
+'watch'             => '监控',
+'watchthispage'     => '监控该�页�',
+'unwatch'           => '覅监控',
+'unwatchthispage'   => '�止监控',
+'watchlistcontains' => '倷个监控列表包括{{PLURAL:$1|1|$1}}�页�。',
+'wlshowlast'        => '显示上个 $1 个钟头 $2 日 $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '监控……',
@@ -610,21 +606,26 @@ $messages = array(
 'changed'            => '改�哉',
 'created'            => '建立哉',
 
-# Delete/protect/revert
-'deletepage'      => '删脱页�',
-'confirm'         => '确认',
-'historywarning'  => '警告：倷�删脱个该�页�有历�：',
-'actioncomplete'  => '�作完�哉',
-'deletedarticle'  => '"[[$1]]" 已�删脱哉',
-'dellogpage'      => '删除记录',
-'deletionlog'     => '删除记录',
-'deletecomment'   => '删脱俚个�由',
-'rollback'        => '��编辑',
-'rollback_short'  => '��',
-'rollbacklink'    => '��',
-'rollbackfailed'  => '��失败',
-'revertpage'      => '��[[Special:Contributions/$2|$2]] ([[User talk:$2|讲张]])个改动；��到[[User:$1|$1]]个上一版本', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+# Delete
+'deletepage'     => '删脱页�',
+'confirm'        => '确认',
+'historywarning' => '警告：倷�删脱个该�页�有历�：',
+'actioncomplete' => '�作完�哉',
+'deletedarticle' => '"[[$1]]" 已�删脱哉',
+'dellogpage'     => '删除记录',
+'deletionlog'    => '删除记录',
+'deletecomment'  => '删脱俚个�由',
+
+# Rollback
+'rollback'       => '��编辑',
+'rollback_short' => '��',
+'rollbacklink'   => '��',
+'rollbackfailed' => '��失败',
+'revertpage'     => '��[[Special:Contributions/$2|$2]] ([[User talk:$2|讲张]])个改动；��到[[User:$1|$1]]个上一版本', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage'  => '�护日志',
+'prot_1movedto2'  => '[[$1]]�到[[$2]]',
 'protectcomment'  => '�护�由:',
 'protect-default' => '(默认)',
 
@@ -684,6 +685,8 @@ $messages = array(
 个作兴会引起对一�热门页�剧烈个�想弗�个改�。
 ��作�头请倷确定倷已�充分了解个能�法个�果。",
 'movearticle'             => '页���:',
+'movenologin'             => '朆登录',
+'movenologintext'         => '倷�定�是已登记用户且勒拉[[Special:UserLogin|登录]]状�下头�好拿页���。',
 'newtitle'                => '新个题目:',
 'movepagebtn'             => '页���',
 'pagemovedsub'            => '���功哉',
@@ -737,7 +740,7 @@ $messages = array(
 'tooltip-n-help'             => '寻求帮助',
 'tooltip-t-whatlinkshere'    => '列出所有与此页相链个页�',
 'tooltip-t-emailuser'        => '��信拨该个用户',
-'tooltip-t-upload'           => '上载图�或媒体文物',
+'tooltip-t-upload'           => '上传文件',
 'tooltip-t-specialpages'     => '亨白浪当个特殊页�列表',
 'tooltip-ca-nstab-main'      => '查看内容页',
 'tooltip-ca-nstab-user'      => '查看用户页',
@@ -764,7 +767,7 @@ $messages = array(
 # Image deletion
 'deletedrevision' => '拨删脱个旧修订 $1',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'    => '新文件陈列室',
 'showhidebots' => '（$1机器人）',
 'ilsubmit'     => '�寻',
@@ -818,11 +821,6 @@ Variants for Chinese language
 # action=purge
 'confirm_purge_button' => '确定',
 
-# AJAX search
-'searchcontaining' => "�寻里�有 ''$1'' 个页�。",
-'articletitles'    => "以 ''$1'' 开头个页�",
-'hideresults'      => '囥脱结果',
-
 # Multipage image navigation
 'imgmultipageprev' => '� 上一页',
 'imgmultipagenext' => '下一页 →',
diff --git a/languages/messages/MessagesXal.php b/languages/messages/MessagesXal.php
index eae81f84..23765f8d 100644
--- a/languages/messages/MessagesXal.php
+++ b/languages/messages/MessagesXal.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Орлцачна_ту�кар_ухалвр',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_ту�кар_ухалвр',
-	NS_IMAGE            => 'Зург',
-	NS_IMAGE_TALK       => 'Зургин_ту�кар_ухалвр',
+	NS_FILE             => 'Зург',
+	NS_FILE_TALK        => 'Зургин_ту�кар_ухалвр',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_ту�кар_ухалвр',
 	NS_TEMPLATE         => 'Зура',
@@ -60,7 +60,7 @@ $messages = array(
 # Preferences page
 'preferences' => 'Дурллһн',
 
-# Image description page
+# File description page
 'filehist-user' => 'Орлцач',
 
 # Contributions
diff --git a/languages/messages/MessagesXh.php b/languages/messages/MessagesXh.php
index 57900a8c..e75af574 100644
--- a/languages/messages/MessagesXh.php
+++ b/languages/messages/MessagesXh.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Jcwf
  * @author Jose77
  */
 
@@ -14,15 +15,15 @@ $messages = array(
 'tuesday'       => 'ULwesibini',
 'wednesday'     => 'ULwesithathu',
 'thursday'      => 'ULwesine',
-'friday'        => 'u Lwesihlanu',
+'friday'        => 'ULwesihlanu',
 'saturday'      => 'UMgqibelo',
 'january'       => 'EyoMqungu',
-'february'      => 'Eyo Mdumba',
-'march'         => 'Eyo Kwindla',
-'april'         => 'Ekatshazimpuzi',
-'june'          => 'Eyesilimela',
-'july'          => 'Eye Khala',
-'august'        => 'Eye Thupha',
+'february'      => 'EyoMdumba',
+'march'         => 'EyoKwindla',
+'april'         => 'EkaTshazimpuzi',
+'june'          => 'EyeSilimela',
+'july'          => 'EyeKhala',
+'august'        => 'EyeThupha',
 'september'     => 'Eyo Msintsi',
 'october'       => 'Eye Dwarha',
 'november'      => 'Eye Nkanga',
@@ -42,20 +43,21 @@ $messages = array(
 'may'           => 'EkaCanzibe',
 
 'article'        => 'Inqaku',
-'qbspecialpages' => 'Amaphepha',
+'qbspecialpages' => 'Amaphepha Abalulekileyo',
 'mypage'         => 'Inqaku yam',
 'mytalk'         => 'Inthetho yam',
 
-'help'           => 'Uncedo',
-'search'         => 'Khangela',
-'searchbutton'   => 'Khangela',
-'go'             => 'Hamba',
-'searcharticle'  => 'Hamba',
-'edit'           => 'Tshintsha',
-'delete'         => 'Cima',
-'protect'        => 'Khusela',
-'talk'           => 'Ingxoxo',
-'otherlanguages' => 'Kwezinye Ilwimi',
+'help'             => 'Uncedo',
+'search'           => 'Khangela',
+'searchbutton'     => 'Khangela',
+'go'               => 'Hamba',
+'searcharticle'    => 'Hamba',
+'edit'             => 'Tshintsha',
+'delete'           => 'Cima',
+'protect'          => 'Khusela',
+'talkpagelinktext' => 'Inthetho',
+'talk'             => 'Ingxoxo',
+'otherlanguages'   => 'Kwezinye Ilwimi',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'currentevents'        => 'Imisebenzi Eyenzekayo',
@@ -87,7 +89,7 @@ I Account yakhgo ivuliwe, ungalibali ukutshitsha izinto ozithandayo ngo {{SITENA
 'loginlanguagelabel' => 'Ulwimi: $1',
 
 # Edit pages
-'summary'     => 'Isishwankathelo',
+'summary'     => 'Isishwankathelo:',
 'minoredit'   => 'Lutshitsho oluncinci olu',
 'watchthis'   => 'Bukela le Page',
 'savearticle' => 'Gcina eliphepha',
@@ -102,7 +104,8 @@ I Account yakhgo ivuliwe, ungalibali ukutshitsha izinto ozithandayo ngo {{SITENA
 'searchresultshead' => 'Khangela',
 
 # Recent changes
-'recentchanges' => 'Utshitsho olusandokwenziwa',
+'recentchanges'   => 'Utshitsho olusandokwenziwa',
+'minoreditletter' => 'nc',
 
 # Recent changes linked
 'recentchangeslinked' => 'Utsitsho olufana nolu',
@@ -118,6 +121,7 @@ I Account yakhgo ivuliwe, ungalibali ukutshitsha izinto ozithandayo ngo {{SITENA
 
 # Special:AllPages
 'allinnamespace' => 'Amanqaku onke ($1 namespace)',
+'allpagessubmit' => 'Hamba',
 
 # Watchlist
 'watchlist'     => 'Endizibukeleyo',
@@ -125,6 +129,9 @@ I Account yakhgo ivuliwe, ungalibali ukutshitsha izinto ozithandayo ngo {{SITENA
 'watch'         => 'Bukela',
 'watchthispage' => 'Bukela le Page',
 
+# Protect
+'prot_1movedto2' => '[[$1]] lidluliselwe [[$2]]',
+
 # Contributions
 'contributions' => 'Imisebenzi ye lungu',
 'mycontris'     => 'Inkxaso yam',
@@ -141,7 +148,7 @@ I Account yakhgo ivuliwe, ungalibali ukutshitsha izinto ozithandayo ngo {{SITENA
 '1movedto2'        => '[[$1]] lidluliselwe [[$2]]',
 'movereason'       => 'Isizathu',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Khangela',
 
 # Special:SpecialPages
diff --git a/languages/messages/MessagesXmf.php b/languages/messages/MessagesXmf.php
index 3459d1ad..5fe37c39 100644
--- a/languages/messages/MessagesXmf.php
+++ b/languages/messages/MessagesXmf.php
@@ -96,7 +96,7 @@ $messages = array(
 'mypage'         => 'ჩქიმ ხ�სილ�',
 'mytalk'         => 'ჩქიმ სხუნუ�',
 'navigation'     => 'ნ�ვიგ�ცი�',
-'and'            => 'დ�',
+'and'            => '&#32;დ�',
 
 'errorpagetitle'   => 'შეცთ�მ�',
 'returnto'         => 'დირთი $1-შ�',
@@ -229,8 +229,8 @@ $messages = array(
 'hr_tip'          => 'ჰ�რიზ�ნტ�ლურ ხ�ზ (ნუ გ�მ�იყენებთ ხშირ�ს)',
 
 # Edit pages
-'summary'                => 'რეზიუმე',
-'subject'                => 'თემ�/ს�ხელ',
+'summary'                => 'რეზიუმე:',
+'subject'                => 'თემ�/ს�ხელ:',
 'minoredit'              => 'ჭიჭე რედ�ქტირ�ფ�',
 'watchthis'              => 'თე ხ�სილ�შ კ�ნტრ�ლ',
 'savearticle'            => 'ჩუ�ლ�',
@@ -238,7 +238,7 @@ $messages = array(
 'showpreview'            => '�წ�ხი�ნ გინ�ჯინ�',
 'showdiff'               => 'თირ�ფეფიშ ძირ�ფ�',
 'anoneditwarning'        => "'''გ�თხილებ�:''' თქვ� ვ�რეთ რეგისტრირებულ. თქვ�ნ IP მის�მ�რთ დინ�ჭ�რილ იჸიი თე ხ�სილ�შ რედ�ქტირ�ფ�შ ისტ�რი�ს.",
-'summary-preview'        => 'რეზიუმეშ �წ�ხი�ნ გინ�ჯინ�',
+'summary-preview'        => 'რეზიუმეშ �წ�ხი�ნ გინ�ჯინ�:',
 'blockedtext'            => "<big>'''თქვ�ნ მ�ხვ�რებუშ ჯ�ხ� ვ�რ� IP მი�წურ�ფუქ ბლ�კირქ იჸუ. '''</big> 
 
 ბლ�კირ�ფ� ღ�ლუ $-ქ. 
@@ -258,13 +258,13 @@ $messages = array(
 (ძირ.[[{{MediaWiki:Helppage}}|მ�ხვ�რ�შ ხ�სილ�]] გეძინელ ინფ�რმ�ცი�შ�).
 თე ხ�სილ�ს ჩილ�თირ� მ�ხვ�დით დ�, დირთით უკ�ხ�ლე თქვ�ნ ბრ�უზერიშ ხენწყუ�ლ�თ.',
 'noarticletext'          => '�სე თე ხ�სილ�ს ტექსტ ვ�რე, [[Special:Search/{{PAGENAME}}|მიგ�რეთ თე ხ�სილ�შ ს�ხელ]] შხვ� ხ�სილებს ვ�რ� [{{fullurl:{{FULLPAGENAME}}|action=edit}} დ�ჭ�რით თენ� ხ�სილ�].',
-'previewnote'            => '<strong> ენ� ხვ�ლე ნიმუშიე; თირ�ფეფ დი� ვ� ჩუ�ლე!</strong>',
+'previewnote'            => "''' ენ� ხვ�ლე ნიმუშიე; თირ�ფეფ დი� ვ� ჩუ�ლე!'''",
 'editing'                => 'რედ�ქტირ�ფ� - $1',
 'editingsection'         => 'რედ�ქტირ�ფ� - $1 (სექცი�)',
 'yourtext'               => 'თქვ�ნ ტექსტ',
-'copyrightwarning'       => 'თ�ლჸუჯი ქიმეჩით: ნ�მდგ� ვ� რდ�ს თი�მიშნ�ღელი ხ�სილ�ს {{SITENAME}} $2 ლიცენზი�ს �თ�ჸუნს(ძირით $1 დეტ�ლეფშ�თ). ვ� გ�კ�ნ� თქვ�ნ ნ�ხ�ნდიშ დუდშულ� გ�ფ�ჩუ� დ� თიშ უდუნდებელ რედ�ქტირ�ფ� დ�, თიწკუმ� ვ� მიშეჸ�ნ�თ თინ� თ�ქ.<br />
+'copyrightwarning'       => "თ�ლჸუჯი ქიმეჩით: ნ�მდგ� ვ� რდ�ს თი�მიშნ�ღელი ხ�სილ�ს {{SITENAME}} $2 ლიცენზი�ს �თ�ჸუნს(ძირით $1 დეტ�ლეფშ�თ). ვ� გ�კ�ნ� თქვ�ნ ნ�ხ�ნდიშ დუდშულ� გ�ფ�ჩუ� დ� თიშ უდუნდებელ რედ�ქტირ�ფ� დ�, თიწკუმ� ვ� მიშეჸ�ნ�თ თინ� თ�ქ.<br />
 თქვ� ხ�ლ� პიჯ�ლ�ს დუთმ�დვ�ნთ, ნ�მდ� თენ� თქვ�ნ ნ�ჭ�რ� რე, ვ�რ� გინ�ღ�ლირ რე �ირკ�ჩე დ�მენშე, დ� ვ�რ� თიშ მ�ნგურ დუდშულ წყუშე. 
-<strong> ვ� მიშეღ�თ ��ვტ�რე უფლებებით თხილერ ნ�ხ�ნდი �ვტ�რიშ ქ�ჸი�შ უმშ�!</strong>',
+''' ვ� მიშეღ�თ ��ვტ�რე უფლებებით თხილერ ნ�ხ�ნდი �ვტ�რიშ ქ�ჸი�შ უმშ�!'''",
 'templatesused'          => 'თე ხ�სილ�ს გიმ�რინ�ფილ თ�რგეფ:',
 'templatesusedpreview'   => 'თ�რგეფ, ნ�მუთ �წ�ხი�ნ გინ�ჯინ�შ ხ�სილ�ს რე გიმ�რინ�ფილ',
 'template-protected'     => '(თხილერი)',
@@ -279,7 +279,7 @@ $messages = array(
 'viewpagelogs'        => 'თე ხ�სილ�შ� ს�რეგისტრ�ციე ჟურნ�ლეფიშ ძირ�ფ�',
 'currentrev'          => 'მიმ�ლ გიშ�ნწყუ�ლ�',
 'revisionasof'        => '$1-იშ ვერსი�',
-'revision-info'       => '$1-იშ ვერსი�, $2-იშ მიშ�ღ�ლირ',
+'revision-info'       => '$1-იშ ვერსი�, $2-იშ მიშ�ღ�ლირ', # Additionally available: $3: revision id
 'previousrevision'    => '�ჯვეშ ვერსი�',
 'nextrevision'        => 'უკულ ვერსი�→',
 'currentrevisionlink' => 'მიმ�ლ ვერსი�',
@@ -308,11 +308,12 @@ $messages = array(
 'editundo'                => 'გ�უქვებ�',
 
 # Search results
-'noexactmatch' => "'''ხ�სილ� თე ს�ხელით \"\$1\" ვ��რსეენს.''' თქვ� შეილებნ� [[:\$1|თე გვერდიშ ღ�ლ�მ�]].",
-'prevn'        => 'წ�ხლენ $1',
-'nextn'        => 'უკულ $1',
-'viewprevnext' => 'ქ�ძირ  ($1) ($2) ($3).',
-'powersearch'  => 'გ�რუ�',
+'noexactmatch'   => "'''ხ�სილ� თე ს�ხელით \"\$1\" ვ��რსეენს.''' თქვ� შეილებნ� [[:\$1|თე გვერდიშ ღ�ლ�მ�]].",
+'prevn'          => 'წ�ხლენ $1',
+'nextn'          => 'უკულ $1',
+'viewprevnext'   => 'ქ�ძირ  ($1) ($2) ($3).',
+'searchhelp-url' => 'Help:მ�ხვ�რ�',
+'powersearch'    => 'გ�რუ�',
 
 # Preferences page
 'preferences'   => 'კ�ნფიგურ�ცი�',
@@ -356,11 +357,11 @@ $messages = array(
 'uploadlogpage' => 'გიმ�ხ�რგუ�შ რეგისტრ�ცი�',
 'uploadedimage' => 'გეთებ�� "[[$1]]"',
 
-# Special:ImageList
-'imagelist'      => 'სურ�თეფიშ ერკებულ',
-'imagelist_name' => 'ს�ხელ',
+# Special:ListFiles
+'listfiles'      => 'სურ�თეფიშ ერკებულ',
+'listfiles_name' => 'ს�ხელ',
 
-# Image description page
+# File description page
 'filehist'            => 'ფ�ილიშ ისტ�რი�',
 'filehist-help'       => 'ქ�გეუნჭირით ბ�რჯის, ნ�მდ� ქ�ძირ�თ ფ�ილი თეშ, მუჭ�თ თინ� თიწკუმ� კილეძირედუ.',
 'filehist-current'    => 'მიმ�ლ',
@@ -429,32 +430,34 @@ $messages = array(
 'emailuser' => 'მიდუჯღ�ნით ელ.ფ�შტ� �თე მ�ხვ�რებუს',
 
 # Watchlist
-'watchlist'            => 'ჩქიმ კ�ნტრ�ლიშ ხ�სილეფ',
-'mywatchlist'          => 'ჩქიმ კ�ნტრ�ლიშ ერკებულ',
-'watchlistfor'         => "('''$1'''-შენი)",
-'removedwatchtext'     => '�სე გვერდ "[[:$1]]" ვ�რე თქვ�ნ კ�ნტრ�ლიშ გვერდეფს.',
-'watch'                => 'კ�ნტრ�ლ',
-'watchthispage'        => 'თე ხ�სილ�შ კ�ნტრ�ლ',
-'unwatch'              => 'კ�ნტრ�ლიშ გ�უქვებ�',
-'watchlist-details'    => '$1 ხ�სილ�ს კილმ�ჯინეთ სხუნუ�შ ხ�სილ�შ უკ�რ�ცხუ�.',
-'wlshowlast'           => 'ძირ�ფ� ბ�ლ� $1 ს��თიშ $2 დღ�შ $3',
-'watchlist-hide-bots'  => 'რ�ბ�ტიშ თირუეფიშ ფულუ�',
-'watchlist-hide-own'   => 'ჩქიმ რედ�ქტირებ�შ ფულუ�',
-'watchlist-hide-minor' => 'ჭიჭე რედ�ქტირებებ�შ ფულუ�',
+'watchlist'         => 'ჩქიმ კ�ნტრ�ლიშ ხ�სილეფ',
+'mywatchlist'       => 'ჩქიმ კ�ნტრ�ლიშ ერკებულ',
+'watchlistfor'      => "('''$1'''-შენი)",
+'removedwatchtext'  => '�სე გვერდ "[[:$1]]" ვ�რე თქვ�ნ კ�ნტრ�ლიშ გვერდეფს.',
+'watch'             => 'კ�ნტრ�ლ',
+'watchthispage'     => 'თე ხ�სილ�შ კ�ნტრ�ლ',
+'unwatch'           => 'კ�ნტრ�ლიშ გ�უქვებ�',
+'watchlist-details' => '$1 ხ�სილ�ს კილმ�ჯინეთ სხუნუ�შ ხ�სილ�შ უკ�რ�ცხუ�.',
+'wlshowlast'        => 'ძირ�ფ� ბ�ლ� $1 ს��თიშ $2 დღ�შ $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'კ�ნტრ�ლირ�ფ�ნი...',
 'unwatching' => 'ვ�კ�ნტრ�ლირ�ფ�ნი...',
 
-# Delete/protect/revert
-'deletepage'                  => 'ხ�სილ�შ შ�ლუ�',
-'actioncomplete'              => 'მ�ქმედ�ლ� რსულებულ რე',
-'deletedarticle'              => 'წ�შ�ლულ რე "[[$1]]"',
-'dellogpage'                  => 'ლ�სირეფიშ ერკებულ',
-'deleteotherreason'           => 'შხვ�/დ�მ�ტებით ბ�ძ�ძი:',
-'deletereasonotherlist'       => 'შხვ� ბ�ძ�ძი',
-'rollbacklink'                => 'გ�უქვებ�',
+# Delete
+'deletepage'            => 'ხ�სილ�შ შ�ლუ�',
+'actioncomplete'        => 'მ�ქმედ�ლ� რსულებულ რე',
+'deletedarticle'        => 'წ�შ�ლულ რე "[[$1]]"',
+'dellogpage'            => 'ლ�სირეფიშ ერკებულ',
+'deleteotherreason'     => 'შხვ�/დ�მ�ტებით ბ�ძ�ძი:',
+'deletereasonotherlist' => 'შხვ� ბ�ძ�ძი',
+
+# Rollback
+'rollbacklink' => 'გ�უქვებ�',
+
+# Protect
 'protectlogpage'              => 'თხილუ�შ ისტ�რი�',
+'prot_1movedto2'              => '[[$1]] გინ�ღ�ლირიე ხ�სილ�შ� [[$2]]',
 'protectcomment'              => 'კ�მენტ�რ:',
 'protectexpiry'               => 'ვ�დ�',
 'protect-unchain'             => 'გინ�ღ�ლ�ს �ლ�ბ�ს ბლ�კიშ მ�ნწყუმ�',
@@ -463,6 +466,7 @@ $messages = array(
 'protect-level-autoconfirmed' => 'ვ�რეგისტრირებულ მ�ხვ�რებელეფიშ დ�ბლ�კვ�',
 'protect-level-sysop'         => 'ხვ�ლე �დმინისტრ�ტ�რეფ',
 'protect-summary-cascade'     => 'იერ�რქიულ',
+'protect-expiry-options'      => '2 ს��თი:2 hours,1 დღ�:1 დღ�,3 დღ�:3 დღ�ლეფ,1 მ�რ�:1 week,2 მ�რ�:2 weeks,1 თუთ�:1 month,3 თუთ�:3 months,6 თუთ�:6 months,1 წ�ნ�:1 year,გ�ნუს�ზღვრელი ვ�დით:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'ულ�ფ�',
 
 # Undelete
@@ -489,7 +493,6 @@ $messages = array(
 'whatlinkshere'       => 'ს� რე თენ� ხ�სილ� წურ�ფილ',
 'whatlinkshere-title' => 'ხ�სილეფ, ს�დეთ რენ� რსხილეფ $1-ს',
 'whatlinkshere-page'  => 'გვერდ:',
-'linklistsub'         => '(რსხილეფ)',
 'linkshere'           => "გეჸვენჯ ხ�სილეფს �ხ�ლუ რსხილეფ '''[[:$1]]'''-შენ",
 'nolinkshere'         => "'''[[:$1]]''', თე ხ�სილ�ს ვ�რე რსხილ.",
 'isredirect'          => 'გინ�წურ�ფ�შ ხ�სილ�',
@@ -590,7 +593,7 @@ $messages = array(
 'show-big-image'       => 'რსული გ�რჩევ�დ�ბ�',
 'show-big-image-thumb' => '<small>ზ�მ� �წმ�ხ ძირ�შ დრ�ს: $1 × $2 პიქსელ</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => '�ხ�ლ სურ�თეფ',
 
 # Bad image list
diff --git a/languages/messages/MessagesYdd.php b/languages/messages/MessagesYdd.php
index c6e89109..ec3a4a2b 100644
--- a/languages/messages/MessagesYdd.php
+++ b/languages/messages/MessagesYdd.php
@@ -3,6 +3,7 @@
  *
  * @ingroup Language
  * @file
+ *
  */
 
 $rtl = true;
diff --git a/languages/messages/MessagesYi.php b/languages/messages/MessagesYi.php
index c9da3592..6bd3edff 100644
--- a/languages/messages/MessagesYi.php
+++ b/languages/messages/MessagesYi.php
@@ -7,6 +7,7 @@
  * @author Jiddisch
  * @author Teak
  * @author Yidel
+ * @author וו�רצג�נג
  * @author לערי ריינה�רט
  * @author פוילישער
  */
@@ -16,30 +17,30 @@ $fallback = 'he';
 $rtl = true;
 
 $namespaceNames = array(
-	NS_MEDIA          => 'מעדיע',
-	NS_SPECIAL        => 'ב�ַזונדער',
-	NS_MAIN           => '',
-	NS_TALK           => 'רעדן',
-	NS_USER           => 'ב�ַניצער',
-	NS_USER_TALK      => 'ב�ַניצער_רעדן',
-	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK   => '$1_רעדן',
-	NS_IMAGE          => 'בילד',
-	NS_IMAGE_TALK     => 'בילד_רעדן',
-	NS_MEDIAWIKI      => 'מעדיעװיקי',
-	NS_MEDIAWIKI_TALK => 'מעדיעװיקי_רעדן',
-	NS_TEMPLATE       => 'מוסטער',
-	NS_TEMPLATE_TALK  => 'מוסטער_רעדן',
-	NS_HELP           => 'הילף',
-	NS_HELP_TALK      => 'הילף_רעדן',
-	NS_CATEGORY       => 'ק�ַטעג�ָריע',
-	NS_CATEGORY_TALK  => 'ק�ַטעג�ָריע_רעדן'
+	NS_MEDIA            => 'מעדיע',
+	NS_SPECIAL          => 'ב�ַזונדער',
+	NS_TALK             => 'רעדן',
+	NS_USER             => 'ב�ַניצער',
+	NS_USER_TALK        => 'ב�ַניצער_רעדן',
+	NS_PROJECT_TALK     => '$1_רעדן',
+	NS_FILE             => 'טעקע',
+	NS_FILE_TALK        => 'טעקע_רעדן',
+	NS_MEDIAWIKI        => 'מעדיעװיקי',
+	NS_MEDIAWIKI_TALK   => 'מעדיעװיקי_רעדן',
+	NS_TEMPLATE         => 'מוסטער',
+	NS_TEMPLATE_TALK    => 'מוסטער_רעדן',
+	NS_HELP             => 'הילף',
+	NS_HELP_TALK        => 'הילף_רעדן',
+	NS_CATEGORY         => 'ק�ַטעג�ָריע',
+	NS_CATEGORY_TALK    => 'ק�ַטעג�ָריע_רעדן',
 );
 
 $namespaceAliases = array(
 	'ב�זונדער' => NS_SPECIAL,
 	'ב�נוצער' => NS_USER,
 	'ב�נוצער_רעדן' => NS_USER_TALK,
+	'בילד' => NS_FILE,
+	'בילד_רעדן' => NS_FILE_TALK,
 	'מעדיעוויקי' => NS_MEDIAWIKI,
 	'מעדיעוויקי_רעדן' => NS_MEDIAWIKI_TALK,
 	'ק�טעג�ריע' => NS_CATEGORY,
@@ -49,57 +50,65 @@ $namespaceAliases = array(
 );
 
 $specialPageAliases = array(
-	'DoubleRedirects'           => array( 'פ�רט�פלטע_ווייטערפירונגען' ),
-	'BrokenRedirects'           => array( 'צעבר�כענע_ווייטערפירונגען' ),
+	'DoubleRedirects'           => array( 'פ�רט�פלטע ווייטערפירונגען' ),
+	'BrokenRedirects'           => array( 'צעבר�כענע ווייטערפירונגען' ),
 	'Disambiguations'           => array( 'ב�דייטן' ),
-	'Userlogin'                 => array( 'ב�ניצער_�יינל�גירן' ),
+	'Userlogin'                 => array( 'ב�ניצער �יינל�גירן' ),
 	'Preferences'               => array( 'פרעפערענצן' ),
-	'Watchlist'                 => array( '�ויפֿפ�סן_ליסטע', 'מיין_�ויפֿפ�סן_ליסטע' ),
-	'Recentchanges'             => array( 'לעצטע_ענדערונגען' ),
+	'Watchlist'                 => array( '�ויפֿפ�סן ליסטע', 'מיין �ויפֿפ�סן ליסטע' ),
+	'Recentchanges'             => array( 'לעצטע ענדערונגען' ),
 	'Upload'                    => array( '�רויפל�דן' ),
-	'Imagelist'                 => array( 'בילדער' ),
-	'Newimages'                 => array( 'נייע_בילדער' ),
-	'Listusers'                 => array( 'ליסטע_פון_ב�ניצערס' ),
+	'Listfiles'                 => array( 'בילדער' ),
+	'Newimages'                 => array( 'נייע בילדער' ),
+	'Listusers'                 => array( 'ליסטע פון ב�ניצערס' ),
 	'Statistics'                => array( 'סט�טיסטיק' ),
-	'Randompage'                => array( 'צופעליג', 'צופעליגער_בל�ט' ),
-	'Lonelypages'               => array( 'פ�ר\'יתומ\'טע_בלעטער' ),
-	'Uncategorizedpages'        => array( 'בלעטער_�ן_ק�טעג�ריעס' ),
-	'Uncategorizedcategories'   => array( 'ק�טעג�ריעס_�ן_ק�טעג�ריעס' ),
-	'Uncategorizedimages'       => array( 'בילדער_�ן_ק�טעג�ריעס' ),
-	'Uncategorizedtemplates'    => array( 'מוסטערן_�ן_ק�טעג�ריעס' ),
-	'Unusedcategories'          => array( '�ומב�ניצטע_ק�טעג�ריעס' ),
-	'Unusedimages'              => array( '�ומב�ניצטע_בילדער' ),
-	'Wantedpages'               => array( 'געזוכטע_בלעטער' ),
-	'Wantedcategories'          => array( 'געזוכטע_ק�טעג�ריעס' ),
-	'Mostlinked'                => array( 'מערסטע_פ�רבונדענע_בלעטער' ),
-	'Mostlinkedcategories'      => array( 'מערסטע_פ�רבונדענע_ק�טעג�ריעס' ),
-	'Mostlinkedtemplates'       => array( 'מערסטע_פ�רבונדענע_מוסטערן' ),
-	'Mostimages'                => array( 'מערסטע_פ�רבונדענע_בילדער' ),
-	'Shortpages'                => array( 'קורצע_בלעטער' ),
-	'Longpages'                 => array( 'ל�נגע_בלעטער' ),
-	'Newpages'                  => array( 'נייע_בלעטער' ),
-	'Ancientpages'              => array( '�ור�לטע_בלעטער' ),
-	'Deadendpages'              => array( 'בלעטער_�ן_פ�רבינדונגען' ),
-	'Protectedpages'            => array( 'געשיצטע_בלעטער' ),
-	'Protectedtitles'           => array( 'געשיצטע_קעפלעך' ),
-	'Allpages'                  => array( '�לע_בלעטער' ),
-	'Prefixindex'               => array( 'בלעטער_וו�ס_הייבן_�ין_מיט' ),
-	'Specialpages'              => array( 'ב�זונדערע_בלעטער' ),
-	'Emailuser'                 => array( 'שיקן_�ן_ע-פ�סט_צו�_ב�ניצער' ),
-	'Confirmemail'              => array( 'ב�שטעטיגן_ע-פ�סט' ),
-	'Whatlinkshere'             => array( 'בלעטער_וו�ס_פ�רבונדן_�הער' ),
-	'Movepage'                  => array( 'ב�וועגן_בל�ט' ),
+	'Randompage'                => array( 'צופעליג', 'צופעליגער בל�ט' ),
+	'Lonelypages'               => array( 'פ�ר\'יתומ\'טע בלעטער' ),
+	'Uncategorizedpages'        => array( 'בלעטער �ן ק�טעג�ריעס' ),
+	'Uncategorizedcategories'   => array( 'ק�טעג�ריעס �ן ק�טעג�ריעס' ),
+	'Uncategorizedimages'       => array( 'בילדער �ן ק�טעג�ריעס' ),
+	'Uncategorizedtemplates'    => array( 'מוסטערן �ן ק�טעג�ריעס' ),
+	'Unusedcategories'          => array( '�ומב�ניצטע ק�טעג�ריעס' ),
+	'Unusedimages'              => array( '�ומב�ניצטע בילדער' ),
+	'Wantedpages'               => array( 'געזוכטע בלעטער' ),
+	'Wantedcategories'          => array( 'געזוכטע ק�טעג�ריעס' ),
+	'Mostlinked'                => array( 'מערסטע פ�רבונדענע בלעטער' ),
+	'Mostlinkedcategories'      => array( 'מערסטע פ�רבונדענע ק�טעג�ריעס' ),
+	'Mostlinkedtemplates'       => array( 'מערסטע פ�רבונדענע מוסטערן' ),
+	'Mostimages'                => array( 'מערסטע פ�רבונדענע בילדער' ),
+	'Shortpages'                => array( 'קורצע בלעטער' ),
+	'Longpages'                 => array( 'ל�נגע בלעטער' ),
+	'Newpages'                  => array( 'נייע בלעטער' ),
+	'Ancientpages'              => array( '�ור�לטע בלעטער' ),
+	'Deadendpages'              => array( 'בלעטער �ן פ�רבינדונגען' ),
+	'Protectedpages'            => array( 'געשיצטע בלעטער' ),
+	'Protectedtitles'           => array( 'געשיצטע קעפלעך' ),
+	'Allpages'                  => array( '�לע בלעטער' ),
+	'Prefixindex'               => array( 'בלעטער וו�ס הייבן �ין מיט' ),
+	'Specialpages'              => array( 'ב�זונדערע בלעטער' ),
+	'Contributions'             => array( 'בײַשטײַערונגען' ),
+	'Emailuser'                 => array( 'שיקן �ן ע-פ�סט צו� ב�ניצער' ),
+	'Confirmemail'              => array( 'ב�שטעטיגן ע-פ�סט' ),
+	'Whatlinkshere'             => array( 'בלעטער וו�ס פ�רבונדן �הער' ),
+	'Movepage'                  => array( 'ב�וועגן בל�ט' ),
 	'Categories'                => array( 'ק�טעג�ריעס' ),
+	'Export'                    => array( 'עקספ�רט' ),
 	'Version'                   => array( 'ווערזיע' ),
-	'Allmessages'               => array( 'סיסטע�_מעלדונגען' ),
+	'Allmessages'               => array( 'סיסטע� מעלדונגען' ),
+	'Log'                       => array( 'ל�גביכער' ),
 	'Blockip'                   => array( 'בל�קירן' ),
-	'Unwatchedpages'            => array( 'נישט_�ויפגעפ�סטע_בלעטער' ),
+	'Import'                    => array( '�ימפ�רט' ),
+	'Unwatchedpages'            => array( 'נישט �ויפגעפ�סטע בלעטער' ),
 	'Listredirects'             => array( 'ווייטערפירונגען' ),
-	'Mycontributions'           => array( 'מיינע_ביישטייערן' ),
-	'Listadmins'                => array( 'ליסטע_פון_סיס�פס' ),
-	'Listbots'                  => array( 'ליסטע_פון_ב�טס' ),
+	'Mypage'                    => array( 'מײַן בל�ט' ),
+	'Mytalk'                    => array( 'מײַן שמועס בל�ט' ),
+	'Mycontributions'           => array( 'מיינע ביישטייערן' ),
+	'Listadmins'                => array( 'ליסטע פון סיס�פן' ),
+	'Listbots'                  => array( 'ליסטע פון ב�טס' ),
+	'Popularpages'              => array( 'פ�פולערע בלעטער' ),
 	'Search'                    => array( 'זוכן' ),
-	'Withoutinterwiki'          => array( 'בלעטער_�ָן_�ינטערוויקי' ),
+	'Withoutinterwiki'          => array( 'בלעטער �ָן �ינטערוויקי' ),
+	'Blankpage'                 => array( 'ליידיגער בל�ט' ),
 );
 
 $defaultUserOptionOverrides = array(
@@ -108,18 +117,22 @@ $defaultUserOptionOverrides = array(
 );
 
 $magicWords = array(
-	'redirect'            => array( '0', '#ווייטערפירן', '#REDIRECT' ),
-	'toc'                 => array( '0', '__�ינה�לט__', '__תוכן__', '__TOC__' ),
-	'pagename'            => array( '1', 'בל�טנ�מען', 'PAGENAME' ),
-	'namespace'           => array( '1', 'נ�מענטייל', 'NAMESPACE' ),
-	'subst'               => array( '0', 'ס:', 'SUBST:' ),
-	'img_thumbnail'       => array( '1', 'קליין', 'ממוזער', 'thumbnail', 'thumb' ),
-	'img_manualthumb'     => array( '1', 'קליין=$1', 'ממוזער=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'           => array( '1', 'רעכטס', 'right' ),
-	'img_left'            => array( '1', 'לינקס', 'left' ),
-	'img_center'          => array( '1', 'צענטער', 'center', 'centre' ),
-	'plural'              => array( '0', 'מערצ�ל:', 'PLURAL:' ),
-	'defaultsort'         => array( '1', 'גרונטס�רטיר:', 'DEFAULTSORT:' ),
+	'redirect'              => array( '0', '#ווייטערפירן', '#הפניה', '#REDIRECT' ),
+	'toc'                   => array( '0', '__�ינה�לט__', '__תוכן__', '__תוכן_ענייני�__', '__תוכן__', '__TOC__' ),
+	'pagename'              => array( '1', 'בל�טנ�מען', 'ש� הדף', 'PAGENAME' ),
+	'namespace'             => array( '1', 'נ�מענטייל', 'מרחב הש�', 'NAMESPACE' ),
+	'fullpagename'          => array( '1', 'פולבל�טנ�מען', 'ש� הדף המל�', 'FULLPAGENAME' ),
+	'subpagename'           => array( '1', '�ונטערבל�טנ�מען', 'ש� דף המשנה', 'SUBPAGENAME' ),
+	'subst'                 => array( '0', 'ס:', 'ס:', 'SUBST:' ),
+	'img_thumbnail'         => array( '1', 'קליין', 'ממוזער', 'thumbnail', 'thumb' ),
+	'img_manualthumb'       => array( '1', 'קליין=$1', 'ממוזער=$1', 'ממוזער=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'             => array( '1', 'רעכטס', 'ימין', 'right' ),
+	'img_left'              => array( '1', 'לינקס', 'שמ�ל', 'left' ),
+	'img_center'            => array( '1', 'צענטער', 'מרכז', 'center', 'centre' ),
+	'plural'                => array( '0', 'מערצ�ל:', 'רבי�:', 'PLURAL:' ),
+	'displaytitle'          => array( '1', 'ווייזן קעפל', 'כותרת תצוגה', 'כותרת תצוגה', 'DISPLAYTITLE' ),
+	'language'              => array( '0', '#שפר�ך:', '#שפה:', '#שפה:', '#LANGUAGE:' ),
+	'defaultsort'           => array( '1', 'גרונטס�רטיר:', 'מיון רגיל:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 );
 
 $messages = array(
@@ -160,17 +173,18 @@ $messages = array(
 'tog-watchlisthideown'        => 'ב�ה�לט מיינע ענדערונגען פון דער �ויפפ�סן ליסטע',
 'tog-watchlisthidebots'       => 'ב�ה�לט ב�ט עדיטס פון �ויפפ�סן ליסטע',
 'tog-watchlisthideminor'      => 'ב�ה�לט קליינע ענדערונגען פון דער �ויפפ�סן ליסטע',
+'tog-watchlisthideliu'        => 'ב�ה�לטן רעד�קטירונגען פון �יינל�גירטע ב�ניצערס פון דער �ויפֿפ�סונג ליסטע',
+'tog-watchlisthideanons'      => 'ב�ה�לטן רעד�קטירונגען פון �נ�נימע ב�ניצערס פון דער �ויפֿפ�סונג ליסטע',
 'tog-nolangconversion'        => 'זיי מבטל פ�רשידענ�רטיגקייט �ין ק�נווערס�ציע',
 'tog-ccmeonemails'            => 'שיק מיר ק�פיס פון �ימעילס וו�ס �יך שיק צו �נדערע ב�נוצער',
 'tog-diffonly'                => 'ווייז נישט �ינה�לט �ונטער די דיפערענץ',
 'tog-showhiddencats'          => 'ווײַז ב�ה�לטענע ק�טעג�ריעס',
+'tog-norollbackdiff'          => 'היפט �יבער �ן �ונטערשייד נ�כן �ויספֿירן � צוריקדריי',
 
 'underline-always'  => '�ייביג',
 'underline-never'   => 'קיינמ�ל',
 'underline-default' => 'בלעטערער גרונטשטעלונג',
 
-'skinpreview' => '(פ�רויסדיגע ווייזונג)',
-
 # Dates
 'sunday'        => 'זונט�ג',
 'monday'        => 'מ�ָנטיג',
@@ -240,16 +254,16 @@ $messages = array(
 'listingcontinuesabbrev'         => '(המשך)',
 
 'mainpagetext'      => "'''מעדיעוויקי �ינסט�לירט מיט דערפ�לג.'''",
-'mainpagedocfooter' => 'געבט זיך �ן עצה מיט [http://meta.wikimedia.org/wiki/Help:Contents �נווייזער פ�ר ב�נוצער] פ�ר �ינפ�רמ�ציע ווי�זוי זיך ב�נוצען מיט וויקי ס�פטוועיר.
+'mainpagedocfooter' => "גיט זיך �ן עצה מיט [http://meta.wikimedia.org/wiki/Help:Contents ב�ניצער'ס וועגווײַזער] פֿ�ר �ינפֿ�רמ�ציע ווי�זוי זיך ב�נוצן מיט וויקי ווייכוו�ַרג.
 
-== נוצליכע לינקס ==
-* [http://www.mediawiki.org/wiki/Manual:Configuration_settings רשימת ההגדרות]
-* [http://www.mediawiki.org/wiki/Manual:FAQ ש�לות נפוצות]
-* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce מידיעוויקי רעליס מעלינג ליסט]',
+== נוצליכע וועבלינקען פֿ�ַר �נהייבערס ==
+* [http://www.mediawiki.org/wiki/Manual:Configuration_settings רשימה פון ק�נפֿיגור�ציעס]
+* [http://www.mediawiki.org/wiki/Manual:FAQ �פֿט געפֿרעגטע ש�לות]
+* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce מעדיעוויקי ב�פֿרײַ�ונג פ�סטליסטע]",
 
 'about'          => 'וועגן',
 'article'        => '�ינה�לט בל�ט',
-'newwindow'      => '(עפענט זיך �ין נײַע� פענסטער)',
+'newwindow'      => '(עפֿנט זיך �ין � נײַע� פענסטער)',
 'cancel'         => 'זיי מבטל',
 'qbfind'         => 'טרעף',
 'qbbrowse'       => 'בלעטערט',
@@ -259,11 +273,11 @@ $messages = array(
 'qbmyoptions'    => 'מיינע בלעטער',
 'qbspecialpages' => 'ספעציעלע בלעטער',
 'moredotdotdot'  => 'נ�ך…',
-'mypage'         => 'מיין בל�ט',
+'mypage'         => 'מײַן בל�ט',
 'mytalk'         => 'מײַן שמועס',
 'anontalk'       => 'ד�ס רעדן פון דע� IP',
 'navigation'     => 'נ�ַװיג�ַציע',
-'and'            => '�ון',
+'and'            => '&#32;�ון',
 
 # Metadata in edit box
 'metadata_help' => 'מעט�־ד�ט�:',
@@ -289,7 +303,7 @@ $messages = array(
 'create-this-page'  => 'ש�ף דע� בל�ט',
 'delete'            => '�ויסמעקן',
 'deletethispage'    => 'מעק �ויס דע� בל�ט',
-'undelete_short'    => 'צוריקשטעל {{PLURAL:$1|�יין עדיט|$1 עדיטס}}',
+'undelete_short'    => 'צוריקשטעלן {{PLURAL:$1|�יין רעד�ַקטירונג|$1 רעד�ַקטירונגען}}',
 'protect'           => 'ב�שיצן',
 'protect_change'    => 'טוישן',
 'protectthispage'   => 'ב�שיץ דע� בל�ט',
@@ -299,15 +313,15 @@ $messages = array(
 'talkpage'          => 'שמועסט �יבער דע� בל�ט',
 'talkpagelinktext'  => 'שמועס',
 'specialpage'       => 'ספעציעלער בל�ט',
-'personaltools'     => 'פערזענליכע טולס',
-'postcomment'       => 'שטעלט צו � ק�מענטור',
+'personaltools'     => 'פערזענלעכע געצייג',
+'postcomment'       => 'נייע �פטיילונג',
 'articlepage'       => 'זעט �ינה�לט בל�ט',
 'talk'              => 'שמועס',
 'views'             => 'קוקן',
-'toolbox'           => 'טול ק�סטן',
+'toolbox'           => 'געצייג ק�סטן',
 'userpage'          => 'זעהט ב�נוצער בל�ט',
 'projectpage'       => 'זעהט פר�יעקט בל�ט',
-'imagepage'         => 'זעט בילדער בל�ט',
+'imagepage'         => 'זען טעקע בל�ט',
 'mediawikipage'     => 'זעה מעסעזש בל�ט',
 'templatepage'      => 'זעט מוסטער בל�ט',
 'viewhelppage'      => 'זעט הילף בל�ט',
@@ -326,8 +340,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'וועגן {{SITENAME}}',
 'aboutpage'            => 'Project:וועגן',
-'bugreports'           => 'ב�ג ב�ריכטען',
-'bugreportspage'       => 'Project:ב�ג ב�ריכטן',
 'copyright'            => 'דער �ינה�ַלט �יז ב�רעכטיגט �ונטער $1.',
 'copyrightpagename'    => 'ק�פירעכטן פון {{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:ק�פירעכטן',
@@ -350,9 +362,7 @@ $messages = array(
 
 'badaccess'        => 'רשות טעות',
 'badaccess-group0' => '�יר זענט נישט ב�רעכטיגט צו ט�ן די �קציע וו�ס �יר ווילט.',
-'badaccess-group1' => 'די �קציע וו�ס �יר ה�ט פ�רל�נגט צו ט�ן �יז ב�גרענעצט צו ב�ניצערס �ין גרופע $1.',
-'badaccess-group2' => 'די �קציע וו�ס �יר ה�ט פ�רל�נגט צו ט�ן �יז ב�גרעיניצט צו �יינע פון די גרופעס $1.',
-'badaccess-groups' => 'די �קציע וו�ס �יר ה�ט פ�רל�נגט צו ט�ן �יז ב�גרעניצט צו ב�נוצער �ין �יינע פון די גרופעס $1.',
+'badaccess-groups' => 'די �קציע וו�ס �יר ה�ט פ�רל�נגט צו ט�ן �יז ב�גרעניצט צו ב�ניצערס �ין {{PLURAL:$2|דער גרופע| �יינער פון די גרופעס}}: $1.',
 
 'versionrequired'     => 'ווערסיע $1 פון מעדיעוויקי פ�רל�נגט זיך',
 'versionrequiredtext' => 'ווערסיע $1 פון מעדיעוויקי פ�רל�נגט זיך צו נוצן דע� בל�ט. פ�ר מער �ינפ�רמ�ציע זעהט [[Special:Version|ווערסיע בל�ט]].',
@@ -363,18 +373,21 @@ $messages = array(
 'newmessageslink'         => 'נייע מעלדונגען',
 'newmessagesdifflink'     => 'לעצטע ענדערונג',
 'youhavenewmessagesmulti' => '�יר ה�ט נייע מעסעדזשעס �ין $1',
-'editsection'             => 'ענדערן',
+'editsection'             => 'ב�ַ�ַרבעטן',
 'editold'                 => 'ענדערן',
 'viewsourceold'           => 'ווײַזן מקור',
+'editlink'                => 'רעד�ַקטירן',
+'viewsourcelink'          => 'ווײַזן מקור',
 'editsectionhint'         => 'ענדערן �פטיילונג: $1',
 'toc'                     => '�ינה�ַלט',
 'showtoc'                 => 'ווייז',
-'hidetoc'                 => 'ב�ַה�ַלט',
+'hidetoc'                 => 'ב�ַה�ַלטן',
 'thisisdeleted'           => 'זעה �דער שטעל צוריק $1?',
-'viewdeleted'             => '×–×¢×” $1?',
-'restorelink'             => '{{PLURAL:$1|�יין געמעקטע ענדערונג|$1 געמעקטע ענדערונגן}}',
+'viewdeleted'             => 'זען $1?',
+'restorelink'             => '{{PLURAL:$1|�יין געמעקטע ענדערונג|$1 געמעקטע ענדערונגען}}',
 'feedlinks'               => 'פיטערן:',
-'feed-invalid'            => 'נישט גוטער סובסקריבשן פיעד טיפ.',
+'feed-invalid'            => '�ומגילטיק �ַב�נ�ַמענט פֿיטער טיפ.',
+'feed-unavailable'        => 'סינדיק�ציע פֿיטערן זענען נישט פֿ�ַר�ַן',
 'site-rss-feed'           => 'RSS פ�ר $1',
 'site-atom-feed'          => 'Atom פ�ר $1',
 'page-rss-feed'           => 'RSS פֿון$1',
@@ -387,7 +400,7 @@ $messages = array(
 'nstab-main'      => '�ַרטיקל',
 'nstab-user'      => 'ב�ַניצער בל�ט',
 'nstab-media'     => 'מעדיע בל�ט',
-'nstab-special'   => 'ספעציעל',
+'nstab-special'   => 'ספעציעלער בל�ט',
 'nstab-project'   => 'פר�יעקט בל�ט',
 'nstab-image'     => 'בילד טעקע',
 'nstab-mediawiki' => 'מעלדונג',
@@ -397,7 +410,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => 'נישט� �ז� �קציע',
-'nosuchactiontext'  => 'די �קציע ספעסיפיזירט דורך די URL �יז נישט �נערקענט ביי דע� וויקי',
+'nosuchactiontext'  => "די �קציע ספעסיפיזירט דורך דע� URL �יז נישט גילטיג.
+�יר ה�ט מעגלעך �ַרײַנגעקל�ַפט פֿ�ַלש, �דער נ�כגעפֿ�לגט � פֿ�ַלשן לינק.
+ס'קען �ויך זײַן � ב�ַג �ין דע� ווייכוו�ר געניצט �ין {{SITENAME}}.",
 'nosuchspecialpage' => 'נישט� �ז� ספעציעלער בל�ט',
 'nospecialpagetext' => '�יר ה�ט געבעטן � נישט ריכטיגן סעפעציעלן בל�ט. זעהט די [[Special:SpecialPages|{{int:specialpages}}]].',
 
@@ -443,7 +458,7 @@ $messages = array(
 </table>',
 'noconnect'            => '�נטשולדיגט! די וויקי גייט דורך �יצט טעכנישע פר�בלעמען �ון קען זיך נישט ב�העפטן צו דער ד�טנב�זע.<br />$1',
 'nodb'                 => 'קען נישט �ויסוויילן ד�טעב�זע $1',
-'cachederror'          => 'ווייטער �יז � ק�שעיד ק�פי (Cache), וו�ס �יז וו�רשיינליך נ�ך נישט �פדעיטעטי, פונע� געבעטענע� בל�ט.',
+'cachederror'          => 'ווײַטער �יז � געק�ַשטע ק�פיע פונע� געבעטענע� בל�ט, וו�ס �יז �פשר נ�ך נישט דערהײַנטיגט.',
 'laggedslavemode'      => 'וו�רענונג: בל�ט טוט מעגליך נישט �נטה�לטן לעצטיגע דערהײַנטיגונגען.',
 'readonly'             => 'ד�טעב�זע פ�רשפ�רט',
 'enterlockreason'      => 'שטעלט � סיבה פ�רן �פשפ�ר, �ריינגערעכנט � געש�צטער צייט �ויף ווען ד�ס וועט זיך צוריקעפענען די פ�רשפ�רונג.',
@@ -473,7 +488,6 @@ $messages = array(
 'cannotdelete'         => '�ויסמעקן דע� בל�ט �דער די טעקע ה�ט נישט מצליח געווען. (עס �יז מעגליך �ז ד�ס �יז שוין געוו�רן �ויסגעמעקט דורך �ן �נדערן.)',
 'badtitle'             => 'שלעכט קעפל',
 'badtitletext'         => "ד�ס קעפל פון דע� געזוכטן בל�ט �יז געווען �ומגעזעצליך, ליידיג, �ן �ינטערשפר�ך �דער �ינטערוויקי לינק וו�ס פ�סט נישט, �דער �נטה�ט כ�ר�קטערס וו�ס מ'קען נישט ניצן �ין � קעפל.",
-'perfdisabled'         => 'וו�רענונג! די פיטשער �יז געוו�רן טעמפ�ר�רלי דיסעבלד צוליב דע� וו�ס ד�ס פ�רשטייטערט די ד�טעב�זע צוטריט צו � פונקט וו�ס קיינער קען נישט נוצן דע� וויקי',
 'perfcached'           => "די פ�לגענדע ד�טע זענען גענומען פונע� 'ק�ש' �ון מעגלעך נישט �קטועל.",
 'perfcachedts'         => 'די פ�לגענדע ד�טע �יז ק�שעיט, �ון �יז לעצט געוו�רן �פדעיטעט $1.',
 'querypage-no-updates' => '�פדעיטס פ�ר דע� בל�ט �יז �יצט דיסעיבלט, דעטע ד� וועט נישט דערווייל ווערן ריפרעשט.',
@@ -483,9 +497,10 @@ $messages = array(
 'viewsource'           => 'זעט מקור',
 'viewsourcefor'        => 'פ�ר $1',
 'actionthrottled'      => 'די �ַקציע �יז ב�ַגרענעצט',
+'actionthrottledtext'  => '�לס מ�ָסמיטל קעגן ספ�ַ�, זענט �יר ב�ַגרענעצט פֿון דורכפֿירן די פעולה צופֿיל מ�ל �ין � קורצער צײַט. ביטע פרובירט נ�כ�ַמ�ָל �ין � פ�ר מינוט.',
 'protectedpagetext'    => 'דער בל�ט �יז פ�רשפ�רט צו �פה�לטן ענדערונגן.',
 'viewsourcetext'       => '�יר קענט זעהן �ון ק�פיען די מקור פון דע� בל�ט:',
-'protectedinterface'   => 'דער בל�ט �יז שטעלט צו �ינטערפעיס טעקסט פ�ר די ס�פטוועיר, �ון �יז פ�רשפ�רט פון �יר צו קענען ענדערן, בלויז פ�ר די סיס�פס כדי צו פ�רמיידן וו�נד�ליז�.',
+'protectedinterface'   => 'דער בל�ַט שטעלט צו �ינטערפֿייס טעקסט פֿ�ַרן װײכװ�ַרג, �ון �יז פֿ�ַרשפּ�ַרט כּדי צו פֿ�ַרמײַדן װ�ַנד�ַליז�.',
 'editinginterface'     => "'''וו�רענונג:''' �יר ב��רבעט � בל�ט וו�ס �יז גענוצט צוצושטעלן �ינטערפעיס טעקסט פ�ר דער ווייכוו�רג. ענדערונגען �ין די בלעטער וועלן טוישן די �ויסזען פון סיסטע� מודעות פ�ר �לע �נדערע ב�ניצערס.",
 'sqlhidden'            => '(SQL פ�רל�נג ב�ה�לטן)',
 'cascadeprotected'     => 'דער בל�ט �יז פ�רשפ�רט צו� ענדערן וויב�לד ער �יז �יינגעשל�סן �ין �יינע פון די פ�לגנדע {{PLURAL:$1|בל�ט, וו�ס �יז|בלעטער, וו�ס זענען}} ב�שיצט מיט דער ק�סקייד �פציע:
@@ -498,13 +513,13 @@ $2',
 די �ורז�ך �יז  \'\'$2".',
 
 # Virus scanner
-'virus-badscanner'     => 'שלעכטע ק�נפֿיגור�ציע: �ומב�וו�וסטער ווירוס �יבערקוקער: <i>$1</i>',
+'virus-badscanner'     => "שלעכטע ק�נפֿיגור�ציע: �ומב�וו�וסטער ווירוס �יבערקוקער: ''$1''",
 'virus-scanfailed'     => '�יבערקוקן נישט גער�טן (ק�ד: $1)',
 'virus-unknownscanner' => '�ומב�וו�וסטער �נטי־ווירוס:',
 
 # Login and logout pages
 'logouttitle'                => 'ב�נוצער �רויסל�גירן',
-'logouttext'                 => '<strong>ה�ָסט זיך �רויסל�ָגירט מיט הצלחה.</strong>',
+'logouttext'                 => "'''ה�ָסט זיך �רויסל�ָגירט מיט הצלחה.'''",
 'welcomecreation'            => '== ברוך הב�, $1! ==
 �ייער ק�נטע �יז ב�ש�פן געוו�רן. נישט פ�רגעסן צו ענדערן �ייערע [[Special:Preferences|{{SITENAME}} פרעפֿערענצן]].',
 'loginpagetitle'             => 'ב�נוצער ל�גירן',
@@ -514,7 +529,6 @@ $2',
 'remembermypassword'         => 'געדיינק מיך',
 'yourdomainname'             => 'דיין ד�מיין:',
 'externaldberror'            => 'עס �יז �דער פ�רגעקומען � דערויסענדיגער �טענטיק�ציע ד�טעבע�זע פעילער �דער �יר זענט נישט ערמעגליכט צו �פדעיטן �ייער דערויסענידגער �ק�ונט.',
-'loginproblem'               => "'''עס �יז געווען � פר�בלע� מיט דיין �ריינל�גירן.'''<br />פרוביר נ�כ�מ�ל!",
 'login'                      => '�ַרײַנל�ָגירן',
 'nav-login-createaccount'    => '�רײַנל�ָגירן / זיך �ײַנשרײַבן',
 'loginprompt'                => '�יר מוסט ערלויבן קיכלעך ("cookies") �ויף צו �ַרײַנל�ָגירן �ינע� {{SITENAME}}.',
@@ -530,7 +544,7 @@ $2',
 'createaccountmail'          => 'דורך ע-פ�סט',
 'badretype'                  => 'די פ�סווערטער וו�ס �יר ה�ט �ריינגעלייגט זענען נישט �ייניג.',
 'userexists'                 => 'דער ב�ַנוצער נ�ָמען �יז שוין �ין ב�ַנוץ. ביטע קלײַב �ױס �ַן �ַנדער נ�ָמען.',
-'youremail'                  => '�י-מעיל *:',
+'youremail'                  => 'ע-פ�סט:',
 'username'                   => 'ב�ַנוצער־נ�ָמען:',
 'uid'                        => 'ב�ַנוצער־נומער:',
 'prefs-memberingroups'       => 'מיטגליד �ין {{PLURAL:$1|גרופע|גרופעס}}:',
@@ -576,9 +590,11 @@ $2',
 'eauthentsent'               => '� ב�שטעטיגונג ע-בריוו �יז געשיקט געוו�רן צו דע� ב�שטימטן ע-פ�סט �דרעס. �יידער סיי וו�ס �נדערע ע-פ�סט וועט ווערן געשיקט צו דער ק�נטע, וועט �יר ד�רפן פ�לגן די �נווייזונגען �ין דער מעלדונג כדי צו זיין זיכער �ז די ק�נטע �יז ט�קע �ייערס.',
 'throttled-mailpassword'     => "� פ�סוו�רט דערמ�נונג �יז שוין געשיקט געוו�רן, �ין {{PLURAL:$1|דער לעצטער שעה|די לעצטע $1 שעה'ן}}. כדי צו פ�רמײַדן שלעכט ב�ניצן, נ�ר �יין פ�סוו�רט דערמ�נונג וועט געשיקט ווערן �ין {{PLURAL:$1|� שעה |$1 שעה'ן}}.",
 'mailerror'                  => 'פֿעלער שיקנדיג פ�סט: $1',
-'acct_creation_throttle_hit' => 'צו� ב�ַדױערן, �יר ה�ָט שױן ב�ַש�ַפֿן $1 ק�ָנטעס. �יר קענט נישט מער ש�ַפֿן נײַע ק�ָנטעס.',
-'emailauthenticated'         => 'דיין �י-מעיל �דרעס �יז ב�שטעטיגט געוו�רן דורך $1.',
-'emailnotauthenticated'      => 'דיין �י-מעיל �דרעס �יז נ�כנישט ב�שטעטיגט. קיין �י-מעיל וועט נישט געשיקט ווערן פון קיין �יינע פון די פ�לגענדע פישטערס.',
+'acct_creation_throttle_hit' => 'ב�ַזוכער צו דער וויקי וו�ס ב�ַניצן �ייער IP �ַדרעס ה�ָבן שױן ב�ַש�ַפֿן {{PLURAL:$1|1 ק�נטע|$1 ק�נטעס}} במשך דע� לעצטן ט�ָג, דע� מ�ַקסימו� וו�ָס מען ערלויבט �ין דע� פערי�ד.
+
+דערפֿ�ַר קענען ב�ַזוכער וו�ס ב�ַניצן דע�  IP �ַדרעס נישט מער ש�ַפֿן נײַע ק�ָנטעס דערווײַל.',
+'emailauthenticated'         => '�ייער ע-פ�סט �דרעס �יז ב�שטעטיגט געוו�רן �ו� $2, $3.',
+'emailnotauthenticated'      => '�ײַער ע-פ�סט �דרעס �יז נ�כנישט ב�שטעטיגט. קיין ע-פ�סט וועט נישט ווערן געשיקט פון קיין �יינע פון די פ�לגנדע �ייגנקייטן.',
 'noemailprefs'               => 'ספעציפיר �ן �י-מעיל �דרעס פ�ר די פיטשערס צו �רבייטן.',
 'emailconfirmlink'           => 'ב�שטעטיגט דיין �ייער ע-פ�סט �דרעס',
 'invalidemailaddress'        => 'דער ע-פ�סט �דרעס קען נישט �קצעפטירט ווערן ווייל ער שיינט צו ה�בן �ן �ומגילטיגן פֿ�רמ�ט. 
@@ -589,18 +605,27 @@ $2',
 'createaccount-text'         => 'עמעצער ה�ט ב�ש�פֿן � ק�נטע פֿ�ר �ייער ע-פ�סט �דרעס �ין {{SITENAME}} ($4) מיטן נ�מען "$2" �ון  פ�סוו�רט "$3". �יר ד�רפט �צינד �יינל�גירן �ון ענדערן ד�ס פ�סוו�רט.
 
 �יר קענט �יגנ�רירן די מעלדונג, ווען די ק�נטע �יז ב�ש�פֿן בטעות.',
+'login-throttled'            => '�יר ה�ט געפרוווט צופֿיל מ�ל לעצטנס ד�ס פ�סוו�רט פון דער ק�נטע.
+זייט �זוי גוט �ון וו�ַרט �יידער �יר פרוווט נ�כ�מ�ל.',
 'loginlanguagelabel'         => 'שפר�ך: $1',
 
 # Password reset dialog
-'resetpass'               => 'ווידערשטעלן ק�נטע פ�סוו�רט',
-'resetpass_announce'      => '�יר ה�ט �ריינל�גירט מיט � פר�וויז�רישן ק�ד געשיקט דורכן ע-פ�סט. צו פ�רענדיגן �ריינל�גירן, ברויכט �יר �נשטעלן � ניי פ�סוו�רט ד�:',
-'resetpass_text'          => '<!-- לייגט צו טעקסט ד� -->',
-'resetpass_header'        => 'ענדערן ק�נטע פ�סוו�רט',
-'resetpass_submit'        => 'שטעלן פ�סוו�רט �ון �ריינל�גירן',
-'resetpass_success'       => '�ייער פ�ַסוו�רט �יז געטוישט געוו�רן מיט דערפֿ�לג! �יצט טוט מען �ייך �ריינל�גירן…',
-'resetpass_bad_temporary' => '�ומריכטיג צייטווייליג פ�ַסוו�רט. �יר ה�ט מעגליך שוין מצליח געווען צו טוישן �ייער פ�ַסוו�רט �דער געבעטן � ניי צייטווייליג פ�ַסוו�רט.',
-'resetpass_forbidden'     => 'פ�סווערטער קענען נישט ווערן געטוישט',
-'resetpass_missing'       => 'נישט� קיין פ�רע� ד�טע.',
+'resetpass'                 => 'ענדערן ק�נטע פ�סוו�רט',
+'resetpass_announce'        => '�יר ה�ט �ריינל�גירט מיט � פר�וויז�רישן ק�ד געשיקט דורכן ע-פ�סט. צו פ�רענדיגן �ריינל�גירן, ברויכט �יר �נשטעלן � ניי פ�סוו�רט ד�:',
+'resetpass_text'            => '<!-- לייגט צו טעקסט ד� -->',
+'resetpass_header'          => 'ענדערן ק�נטע פ�סוו�רט',
+'oldpassword'               => '�ַלטע פ�ַסוו�רט:',
+'newpassword'               => 'ניי פּ�סוו�ָרט:',
+'retypenew'                 => 'ווידער שרײַבן פ�ַסוו�רט:',
+'resetpass_submit'          => 'שטעלן פ�סוו�רט �ון �ריינל�גירן',
+'resetpass_success'         => '�ייער פ�ַסוו�רט �יז געטוישט געוו�רן מיט דערפֿ�לג! �יצט טוט מען �ייך �ריינל�גירן…',
+'resetpass_bad_temporary'   => '�ומריכטיג צייטווייליג פ�ַסוו�רט. �יר ה�ט מעגליך שוין מצליח געווען צו טוישן �ייער פ�ַסוו�רט �דער געבעטן � ניי צייטווייליג פ�ַסוו�רט.',
+'resetpass_forbidden'       => 'פ�סווערטער קענען נישט ווערן געטוישט',
+'resetpass-no-info'         => '�יר ד�רפֿט זיין �ריינל�גירט צוצוקומען גלייך צו דע� ד�זיגן בל�ט.',
+'resetpass-submit-loggedin' => 'טוישן פ�סוו�רט',
+'resetpass-wrong-oldpass'   => '�ומגילטיג צײַטווײַליק �דער לויפֿיק פ�ַסוו�רט.
+�יר ה�ט מעגלעך שוין געטוישט �ייער פ�ַסוו�רט מיט הצלחה �דער געבעטן � נײַ  צײַטווײַליק פ�ַסוו�רט.',
+'resetpass-temp-password'   => 'צײַטווייליק פ�ַסוו�רט:',
 
 # Edit page toolbar
 'bold_sample'     => 'טייפּט ד�ָ �ַריין די טעקסט ז�ל זיין דיק',
@@ -625,8 +650,8 @@ $2',
 'hr_tip'          => '� שטרייך �ין די ברייט, (נישט נוצן �פט)',
 
 # Edit pages
-'summary'                          => 'קורץ וו�ָרט',
-'subject'                          => 'טעמע/קעפל',
+'summary'                          => 'קורץ וו�ָרט:',
+'subject'                          => 'טעמע/קעפל:',
 'minoredit'                        => 'ד�ס �יז � מינערדיגע ענדערונג',
 'watchthis'                        => 'טוט �ױפֿפּ�ַסן דע� בל�ט',
 'savearticle'                      => 'טוט �ױפֿהיטן',
@@ -638,8 +663,8 @@ $2',
 'missingsummary'                   => "'''דערמ�נונג:''' �יר ה�ט נישט �ויסגעפילט דע� קורץ וו�רט �ויפקלערונג �ויף �ייער עדיט. �ויב וועט �יר דרוקן נ�כ�מ�ל �ויף  \"היט �פ דע� בל�ט\", וועט �ייער ענדערונג ווערן געהיטן �ן דע�.",
 'missingcommenttext'               => 'ביטע שטעלט �ריין � �נמערקונג פון �ונטן.',
 'missingcommentheader'             => "'''דערמ�נונג:''' �יר ה�ט נישט �ריינגעשטעלט � טעמע/קעפל פ�ר דע� �נמערקונג. �ויב וועט �יר דרוקן נ�כ�מ�ל �ויפן \"היט-�פ בל�ט\", וועט �ייער ענדערונג ווערן �פגעהיטן �ן דע�.",
-'summary-preview'                  => 'סך-הכל פ�ר�ויסדיגע ווייזונג',
-'subject-preview'                  => 'טעמע/קעפל פ�ר�ויסדיגע ווייזונג',
+'summary-preview'                  => 'סך-הכל פ�ר�ויסדיגע ווייזונג:',
+'subject-preview'                  => 'טעמע/קעפל פ�ר�ויסדיגע ווייזונג:',
 'blockedtitle'                     => 'ב�נוצער �יז בל�קירט',
 'blockedtext'                      => '<big>\'\'\'�ייער ב�ניצער נ�מען �דער IP �דרעס �יז געוו�רן בל�קירט.\'\'\'</big>
 
@@ -686,7 +711,10 @@ $2',
 'newarticle'                       => '(× ×™×™)',
 'newarticletext'                   => "'''דער בל�ַט עקזיסטירט נ�ָך נישט!''' �יר קענט יעצט שרײַבן �ַ נײַע� �ַרטיקל �ין דע� קעסטל �ונטן. (זעט דע� [[הילף:�נהייבן � נייע� בל�ט|הילף בל�ַט]] ווי �ַזוי צו שרײַבן �ַרטיקלען).",
 'anontalkpagetext'                 => "----'''ד�ס �יז � רעדן בל�ט פון � �ן �נ�נימען ב�ַניצער וו�ס ה�ט נ�ך נישט ב�ַש�ַפֿן קיין ק�נטע, �דער ב�ניצט זיך נישט דערמיט. דערוועגן, מוזן מיר זיך ב�ניצן מיט זיין IP �דרעס כדי �י� צו �ידענטיפיצירן. עס קען זיין �ז עטלעכע �נדערע ניצן �ויך דע�  IP �דרעס. �ויב זענט �יר �ן �נ�נימער ב�ַניצער וו�ס שפירט �ז �יר ה�ט ב�קומען מעלדונגען וו�ס זענען נישט שייך צו �ייך, ביטע [[Special:UserLogin/signup|ב�ַש�ַפֿט � ק�נטע]] �דער [[Special:UserLogin|טוט זיך �ריינל�גירן]] כדי צו פ�רמיידן ד�ס �ין די עתיד זיך פ�רמישן מיט �נדערע �נ�נימע ב�ַניצערס.'''",
-'noarticletext'                    => 'עס �יז דערווייל נישט פ�רה�ן קיין שו� טעקסט �ין דע� בל�ט, �יר קענט [[Special:Search/{{PAGENAME}}|זוכן דע� בל�ט טיטול]] �ין �נדערע בלעטער �דער [{{fullurl:{{FULLPAGENAME}}|action=edit}} ענדערן דע� בל�ט].',
+'noarticletext'                    => 'דערווייל �יז נישט פ�ַרה�ן קיין שו� טעקסט �ין דע� בל�ט.
+�יר קענט [[Special:Search/{{PAGENAME}}|זוכן דע� בל�ט טיטל]] �ין �נדערע בלעטער,
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} זוכן די רעלעוו�נטע ל�גביכער],
+�דער [{{fullurl:{{FULLPAGENAME}}|action=edit}} רעד�ַקטירן דע� בל�ט].',
 'userpage-userdoesnotexist'        => 'ב�ניצער ק�נטע "$1" �יז נישט �ײַנגעשריבן. קוקט �יבער צי �יר ווילט ש�פֿן/רעד�קטירן דע� בל�ט.',
 'clearyourcache'                   => "'''�כטונג: נ�כן �ויפֿהיטן, ברויכט �יר �פשר נ�ך �ריבערגיין דע� בלעטערס ק�ש זיכרון (cache) צו זען די ענדערונגען.'''
 
@@ -697,24 +725,24 @@ $2',
 '''�ינטערנעט עקספל�רער''': ה�לט ''Ctrl'' בשעתן קליקן ''Refresh'', �דער  דרוקט ''Ctrl-F5'';
 
 '''�פערע:''' מען ליידיגט �ויס דע� ק�ש �ין ''Tools → Preferences'' (''העדפות'' > ''כלי�'')",
-'usercssjsyoucanpreview'           => "<strong>טיפ:</strong> נוצט דע� 'ווייז פ�ר�ויסדיגע ווייזונג' ב�ט�ן צו �ויספרובירן �ייער  CSS/JS בעפ�ר �פהיטן.",
+'usercssjsyoucanpreview'           => "'''טיפ:''' נוצט דע� 'ווייז פ�ר�ויסדיגע ווייזונג' ב�ט�ן צו �ויספרובירן �ייער  CSS/JS בעפ�ר �פהיטן.",
 'usercsspreview'                   => "'''געדענקט �ז �יר טוט בלויז פ�ר�ויס זען �ייער ב�ניצער CSS.'''
 '''ער �יז דערווייל נ�כנישט �ויפֿגעהיטן!'''",
 'userjspreview'                    => "'''געדענקט �ז �יר טוט בלויז טעסטן\\פ�ר�ויסזעהן �ייער ב�נוצער JavaScript, עס �יז דערווייל נ�כנישט �פגעהיטן!'''",
 'userinvalidcssjstitle'            => "'''וו�רענונג:''' ס�יז נישט� קיין סקין \"\$1\". גדענקט �ז ק�סטע� .css �ון .js בלעטער נוצען ל�וער קעיס טיטול, e.g. {{ns:user}}:Foo/monobook.css ווי �נדערשט צו {{ns:user}}:Foo/Monobook.css.",
 'updated'                          => '(דערהיינטיגט)',
-'note'                             => '<strong>ב�מערקונג:</strong>',
-'previewnote'                      => '<strong>ד�ס �יז נ�ָר �ין �ַ פֿ�ָרויסיקע ווייזונג, דער �ַרטיקל �יז דערווייל נ�ָך נישט געהיט!</strong>',
+'note'                             => "'''ב�מערקונג:'''",
+'previewnote'                      => "'''ד�ס �יז נ�ָר �ין �ַ פֿ�ָרויסיקע ווייזונג, דער �ַרטיקל �יז דערווייל נ�ָך נישט געהיט!'''",
 'previewconflict'                  => 'די פ�ר�ויסדיגע ווייזונג רעפלעקטירט די טעקסט �ון די �ויבערשטע טעקסט ענדערונג �פטיילונג ווי�זוי ד�ס וועט �ויסזעהן �ויב וועט �יר �ויסוועילן צו ד�ס �פהיטן.',
 'session_fail_preview'             => "'''�נטשולדיגט! מען ה�ט נישט געקענט פר�צעסירן �ייער ענדערונג צוליב � פ�רלוסט פון סעסיע ד�טע. ביטע פרובירט נ�כ�מ�ל. �ויב ס'�רבעט נ�ך �לס ניט, פרובירט [[Special:UserLogout|�רויסל�גירן]] �ון זיך צוריק �ריינל�גירן.",
-'session_fail_preview_html'        => "<strong>'''�ַנטשולדיקט! מיר קענען נישט פּר�ָצעסירן �ײַער ענדערונג צוליב � פֿ�ַרלוסט פֿון סעסיע ד�ַטע.'''</strong>
+'session_fail_preview_html'        => "''''''�ַנטשולדיקט! מיר קענען נישט פּר�ָצעסירן �ײַער ענדערונג צוליב � פֿ�ַרלוסט פֿון סעסיע ד�ַטע.''''''
 
 ''װײַל די װיקי ה�ט רױע HTML ערמעגליכט, דער פֿ�ָרױסיקער װײַזונג �יז ב�ַ�ַלטן �ַלס �ַ ב�ַװ�ָרענונג �ַנטקעגן JavaScript �ַט�ַקירונגען.''
 
-<strong>�ױב ד�ַס �יז �ַ כשרע רעד�ַקציע פרוּװ, פּרובירט נ�ָכ�ַמ�ָל. �ױב ד�ָס גײט נ�ָכ�ַלץ ניט, פּרובירט [[Special:UserLogout|�רױסל�ָגירן]] �ון װידער �ַרײַנל�ָגירן. </strong>",
+'''�ױב ד�ַס �יז �ַ כשרע רעד�ַקציע פרוּװ, פּרובירט נ�ָכ�ַמ�ָל. �ױב ד�ָס גײט נ�ָכ�ַלץ ניט, פּרובירט [[Special:UserLogout|�רױסל�ָגירן]] �ון װידער �ַרײַנל�ָגירן. '''",
 'editing'                          => 'ענדערן $1',
 'editingsection'                   => 'ענדערט $1 (�פטיילונג)',
-'editingcomment'                   => 'ענדערט $1 (הערה)',
+'editingcomment'                   => 'רעד�ַקטירן $1 (נײַע �פטיילונג)',
 'editconflict'                     => 'ענדערן ק�נפליקט: $1',
 'explainconflict'                  => "�יינער �נדערשט ה�ט געטוישט דע� בל�ט זינט �יר ה�ט �נגעהויבן ד�ס צו ענדערן.
 דער �ויבערשטער טעקסט �פטייל �נטה�לט דע� בל�ט טעקסט ווי עס טוט �יצט עקזעסטירן.
@@ -723,22 +751,24 @@ $2',
 '''בלויז''' דער טעקסט �ינע� �ויבערשטען טעקסט �פטיילונג וועט ווערן �פגעהיטן ווען �יר וועט קוועטשן \"טוט �ויפֿהיטן\".",
 'yourtext'                         => '�ייער טעקסט',
 'storedversion'                    => '�וועגעלייגטע ווערסיע',
-'nonunicodebrowser'                => '<strong>וו�רענונג: �ייער בלעטערער �יז נישט יוניק�ד געה�רכיק. 
-�ן �רו�-�רבעט �יז �ין פל�ץ �ייך צו ערלויבן צו ענדערן בלעטער מיט זיכערקייט: non-ASCII �ותיות וועלן ערשיינען �ין די ענדערען קעסטל ווי hexadecimal ק�דס.</strong>',
-'editingold'                       => '<strong>פ�ָרזיכטיג! ב��רבעטסט יעצט נישט קיין �קטועלע ווערסיע, �ויב דו וועסט היטן דע� ב��רבעטונג, וועט די לעצטע ענדרענונגען גיין ק�ַפוט.</strong>',
+'nonunicodebrowser'                => "'''וו�רענונג: �ייער בלעטערער �יז נישט יוניק�ד געה�רכיק. 
+�ן �רו�-�רבעט �יז �ין פל�ץ �ייך צו ערלויבן צו ענדערן בלעטער מיט זיכערקייט: non-ASCII �ותיות וועלן ערשיינען �ין די ענדערען קעסטל ווי hexadecimal ק�דס.'''",
+'editingold'                       => "'''פ�ָרזיכטיג! ב��רבעטסט יעצט נישט קיין �קטועלע ווערסיע, �ויב דו וועסט היטן דע� ב��רבעטונג, וועט די לעצטע ענדרענונגען גיין ק�ַפוט.'''",
 'yourdiff'                         => '�ינטערשיידן',
 'copyrightwarning'                 => "<small>ביטע מערקט �ויף �ז �ייערע �לע ביישטייערונגען �ינע� '''{{SITENAME}}''' ערשיינען �ונטער דע� $2 דערלויבן (מער פרטי� זעה $1). �ויב �יר וויִלט נישט ל�זן �נדערע ענדערן �ייערע ביישטייערונגען �ון פ�רשפרייטן �ייער �רבעט - ביטע שרייבט זיי נישט ד�.<br />
 �יר ז�גט צו �ז �יר ה�ט געשריבן �ן �ייגענע� �ינה�ַלט, �דער ה�ט �יר ב�קומען ערלויבעניש זיי ד� צו שרייבן.</small>",
 'copyrightwarning2'                => "<div id=\"editing-warn\">'''�כטונג:''' �נדערע ב�ניצערס קענען מעקן �ון ענדערן �ייערע ביישטייערונגען צו{{grammar:תחילית|{{SITENAME}}}}. �ויב ווילט �יר נישט �ייער �רבעט צו זיין הפקר פ�ר �נדערע ד�ס צו ב��רבעטן – פ�רשפרייט עס נישט ד�. �זוי �ויך, ז�גט �יר צו �יז �יר ה�ט ד�ס געשריבן �ליין'ס, �דער ד�ס �יבערגעק�פיט פון � מקור מיט פולער רשות ד�ס מפקיר זיין (זעהט \$1 פ�ר מער פרטי�). '''זיך נישט ב�נוצן מיט שט�ף וו�ס �יז ב�שיצט מיט ק�פירעכטן!'''</div>",
-'longpagewarning'                  => '<strong>וו�רענונג: דער בל�ט �יז ל�נג $1 קיל�בייטן; געוויסע בלעטערערס קענען מעגלעך ה�בן פר�בלעמען צו רעד�קטירן בלעטער וו�ס גרייכן �דער זענען לענגער פֿון 32kb.
-ביטע ב�טר�כט �יינטיילן דע� בל�ט צו קלענערע �פטיילונגען.</strong>',
-'longpageerror'                    => '<strong>פעילער: די טעקסט וו�ס �יר ה�ט �ריינגעשטעלט �יז $1 קיל�בייטס ל�נג, וו�ס �יז לענגער פון די מ�קסימו� פון $2 קיל�בייטס. עס קען נישט ווערן �פגעהיטן.</strong>',
-'readonlywarning'                  => '<strong>וו�רענונג: די ד�טעב�זע �יז געוו�רן בל�קירט פ�ר סייט �ויפה�לטונג,
-ממיל� וועט �יר נישט קענען �פהיטן �ייערע ענדערונגן צו די �יצטיגע צייט. �יר ז�לט ה�פן צו ד�ס ק�ט-ענד-פעיסט די טעקסט �ריין צו � טעקסט פייל �ון ד�ס ד�רטן �פהיטן פ�ר שפעטער.</strong>',
-'protectedpagewarning'             => '<strong>וו�רענונג:  דער בל�ט �יז געוו�רן פ�רשפ�רט �ז בלויז ב�ניצערס מיט סיס�פ פריווילעגיעס קענען �י� ענדערן.</strong>',
+'longpagewarning'                  => "'''וו�רענונג: דער בל�ט �יז ל�נג $1 קיל�בייטן; געוויסע בלעטערערס קענען מעגלעך ה�בן פר�בלעמען צו רעד�קטירן בלעטער וו�ס גרייכן �דער זענען לענגער פֿון 32kb.
+ביטע ב�טר�כט �יינטיילן דע� בל�ט צו קלענערע �פטיילונגען.'''",
+'longpageerror'                    => "'''פעילער: די טעקסט וו�ס �יר ה�ט �ריינגעשטעלט �יז $1 קיל�בייטס ל�נג, וו�ס �יז לענגער פון די מ�קסימו� פון $2 קיל�בייטס. עס קען נישט ווערן �פגעהיטן.'''",
+'readonlywarning'                  => "'''וו�רענונג: די ד�טעב�זע �יז געוו�רן פ�רשל�סן פ�ר סייט �ויפה�לטונג,
+ממיל� וועט �יר נישט קענען �פהיטן �ייערע ענדערונגען �צינד. �יר קענט ק�פירן �ון �רײַנלייגן דע� טעקסט �ריין צו � טעקסט טעקע �ון ד�ס ד�רטן �פהיטן פ�ר שפעטער.'''
+
+דער �דמיניסטר�ט�ר וו�ס ה�ט זי פ�רשל�סן ה�ט מסביר געווען �זוי: $1",
+'protectedpagewarning'             => "'''וו�רענונג:  דער בל�ט �יז געוו�רן פ�רשפ�רט �ז בלויז ב�ניצערס מיט סיס�פ פריווילעגיעס קענען �י� ענדערן.'''",
 'semiprotectedpagewarning'         => "'''ב�מערקונג:''' דער ד�זיגער בל�ט �יז פֿ�רשפ�רט �ז בלויז �יינגעשריבענע ב�ניצערס קענען �י� ענדערן.",
 'cascadeprotectedwarning'          => "'''וו�רענונג:''' דער בל�ט �יז פ�רשפ�רט �ז בלויז סיס�פן קענען �י� ענדערן, וויב�לד ער �יז �יינגעשל�סן �ין {{PLURAL:$1| דע� פ�לגנדן בל�ט, וו�ס �יז|די פ�לגנדע בלעטער, וו�ס זענען}} ק�סק�ד ב�שיצט:",
-'titleprotectedwarning'            => '<strong>�זהרה: דער בל�ט �יז פֿ�רשל�סן ט� קענען נ�ר געוויסע ב�ניצערס ש�פֿן �י�.</strong>',
+'titleprotectedwarning'            => "'''�זהרה: דער בל�ט �יז פֿ�רשל�סן ט� ד�רף מען  נ�ר  [[Special:ListGroupRights|ספעציפֿישע רעכטן]] צו ש�פֿן �י�.'''",
 'templatesused'                    => 'מוסטערן ב�נוצט �ויף דע� בל�ט:',
 'templatesusedpreview'             => 'ב�ַנוצטע מוסטערן �ין דע� פֿ�ָר�ױסדיקע �ױסקוק:',
 'templatesusedsection'             => 'מוסטערן ב�נוצט �ין דע� �פטיילונג:',
@@ -752,11 +782,22 @@ $2',
 'nocreate-loggedin'                => '�יר זענט נישט ערלויבט צו ש�ַפֿן נײַע בלעטער.',
 'permissionserrors'                => 'ערלויבענישן פעילערס',
 'permissionserrorstext'            => '�יר זענט נישט ערלויבט צו טון ד�ס, פֿ�ר , {{PLURAL:$1|דער פֿ�לגנדער סיבה|די פֿ�לגנדע סיבות}}:',
-'permissionserrorstext-withaction' => '�יר זענט נישט ערלויבט צו $2 פֿ�ר , {{PLURAL:$1|דער פֿ�לגנדער סיבה| די פֿ�לגנדע סיבות}}:',
+'permissionserrorstext-withaction' => '�יר זענט נישט ערלויבט צו $2, וועגן {{PLURAL:$1|דער פֿ�לגנדער סיבה| די פֿ�לגנדע סיבות}}:',
 'recreate-deleted-warn'            => "'''וו�רענונג: �יר ש�פט � נייע� בל�ט וו�ס �יז שוין �יינמ�ל געוו�רן �ויסגעמעקט.'''
 
 �נ� שיקלו �� יהיה זה נכון להמשיך לערוך �ת הדף.
 יומן המחיקות של הדף מוצג להלן:",
+'deleted-notice'                   => 'דער בל�ט �יז געוו�רן �ויסגעמעקט.
+ד�ס �ויסמעקן ל�ג-בוך פונע� בל�ט �יז געוויזן ד� �ונטן.',
+'deletelog-fulllog'                => 'זען ד�ס פֿולע ל�ג-בוך',
+'edit-hook-aborted'                => 'רעד�ַקטירונג �ַנולירט דורך Hook.
+נישט� קיין הסבר.',
+'edit-gone-missing'                => "נישט מעגלעך צו דערהיינטיגן דע� בל�ט.
+ס'ווייזט �ויס �ז ער �יז �ויסגעמעקט.",
+'edit-conflict'                    => 'רעד�קטירן ק�נפֿליקט.',
+'edit-no-change'                   => "מ'ה�ט �יגנ�רירט �ײַער רעד�ַקטירונג, ווײַל קיין שו� ענדערונג �יז נישט געמ�ַכט צו� טעקסט.",
+'edit-already-exists'              => 'נישט מעגליך צו ש�ַפֿן נייע בל�ט.
+ער עקזיסטירט שוין.',
 
 # "Undo" feature
 'undo-success' => 'די ענדערונג קען ווערן מבוטל. ביטע נ�כקוקן די פ�רגלייך פון �ונטן צו זיין זיכער �ז ד�ס �יז וו�ס �יר ווילט ט�ן, �ון דערנ�ך היט-�פ די ענדערונגן פון �ונטן צו ענדיגן ד�ס בטל מ�כן די ענדערונג.',
@@ -769,29 +810,28 @@ $2',
 'cantcreateaccount-text' => 'ש�פֿן ק�נטעס פון דע� IP �דרעס (<b>$1</b>) �יז געוו�רן בל�קירט דורך [[User:$3|$3]]. די סיבה געגעבן פֿון $3 �יז "$2".',
 
 # History pages
-'viewpagelogs'        => 'זעה ל�גס פ�ר דע� בל�ט',
-'nohistory'           => 'נישט� קיין ענדערן היסט�ריע פ�ר דע� בל�ט.',
-'revnotfound'         => 'די גירסה נישט געפינען',
-'revnotfoundtext'     => 'די �לטע רעוויזיע �יר ה�ט געבעטן קען נישט געפינען ווערן.
-ביטע טשעקט די URL וו�ס ברויכט �ריינצוגיין �ין דע� בל�ט.',
-'currentrev'          => '�יצטיגע ווערסיע',
-'revisionasof'        => 'רעוויזיע ביי $1',
-'revision-info'       => 'רעוויזיע ביי $1 פון $2',
-'previousrevision'    => '→ עלטערער ווערסיע',
-'nextrevision'        => 'נייע ווערסיע �',
-'currentrevisionlink' => '�יצטיגע ווערסיע',
-'cur'                 => '�יצט',
-'next'                => 'קומענדיגע',
-'last'                => 'לעצטע',
-'page_first'          => 'ערשט',
-'page_last'           => 'לעצט',
-'histlegend'          => 'פֿ�רגלייכן  �ויסקלויב: צייכנט די קנעפלעך פֿון די ווערסיעס צו פֿ�רגלײַכן, �ון קל�פט  Enter �דער ד�ס קנעפל �ונטן.<br />
+'viewpagelogs'           => 'זעה ל�גס פ�ר דע� בל�ט',
+'nohistory'              => 'נישט� קיין ענדערן היסט�ריע פ�ר דע� בל�ט.',
+'currentrev'             => '�יצטיגע ווערסיע',
+'currentrev-asof'        => 'לויפיקע רעוויזיע פון $1',
+'revisionasof'           => 'רעוויזיע ביי $1',
+'revision-info'          => 'רעוויזיע ביי $1 פון $2', # Additionally available: $3: revision id
+'previousrevision'       => '→ עלטערער ווערסיע',
+'nextrevision'           => 'נייע ווערסיע �',
+'currentrevisionlink'    => '�יצטיגע ווערסיע',
+'cur'                    => '�יצט',
+'next'                   => 'קומענדיגע',
+'last'                   => 'לעצטע',
+'page_first'             => 'ערשט',
+'page_last'              => 'לעצט',
+'histlegend'             => 'פֿ�רגלייכן  �ויסקלויב: צייכנט די קנעפלעך פֿון די ווערסיעס צו פֿ�רגלײַכן, �ון קל�פט  Enter �דער ד�ס קנעפל �ונטן.<br />
 מקר�: (�יצט) = �ונטערשייד פֿון לויפֿיגער ווערסיע, (לעצט) = �ונטערשייד פֿון פֿריערדיגער ווערסיע, מ = מינערדיקע רעד�קטירונג',
-'deletedrev'          => '[�ויסגעמעקט]',
-'histfirst'           => 'ערשטע',
-'histlast'            => 'לעצטיגע',
-'historysize'         => '({{PLURAL:$1|1 בייט|$1 בייטן}})',
-'historyempty'        => '(ליידיג)',
+'history-fieldset-title' => 'בלעטערט די היסט�ריע',
+'deletedrev'             => '[�ויסגעמעקט]',
+'histfirst'              => 'ערשטע',
+'histlast'               => 'לעצטיגע',
+'historysize'            => '({{PLURAL:$1|1 בייט|$1 בייטן}})',
+'historyempty'           => '(ליידיג)',
 
 # Revision feed
 'history-feed-title'          => 'ווערסיע היסט�ריע',
@@ -823,12 +863,14 @@ $2',
 'revdelete-hide-comment'      => 'ב�ה�לט ענדערן הערה',
 'revdelete-hide-user'         => "ב�ה�לט רעד�קטער'ס ב�נוצער-נ�מען/�יי.פי.",
 'revdelete-hide-image'        => 'ב�ה�לט טעקע �ינה�לט',
+'revdelete-log'               => 'ל�ג-בוך הערה:',
+'revdel-restore'              => 'טויש די זעב�רקייט',
 'pagehist'                    => 'בל�ט היסט�ריע',
 'deletedhist'                 => '�ויסגעמעקטע ווערסיעס',
-'revdelete-content'           => 'תוכן',
+'revdelete-content'           => '�ינה�לט',
 'revdelete-summary'           => 'רעד�קטירונג קיצור',
 'revdelete-uname'             => 'ב�ניצער נ�מען',
-'revdelete-restricted'        => 'ב�גרעניצונגען פ�ר סיס�פן',
+'revdelete-restricted'        => 'פ�רמערט ב�גרעניצונגען פ�ר סיס�פן',
 'revdelete-unrestricted'      => '�וועקגענומען ב�גרעניצונגען פ�ר סיס�פן',
 'revdelete-hid'               => 'ב�ה�לטן $1',
 'revdelete-unhid'             => 'מבטל געווען ב�ה�לטן $1',
@@ -843,117 +885,167 @@ $2',
 'mergehistory-box'                 => 'צונויפֿגיסן רעוויזיעס פֿון צוויי בלעטער:',
 'mergehistory-from'                => 'מקור בל�ַט:',
 'mergehistory-into'                => 'פֿ�רציל בל�ַט:',
+'mergehistory-submit'              => 'צונויפֿגיסן רעוויזיעס',
 'mergehistory-no-source'           => 'מקור בל�ַט $1 עקזיסטירט נישט.',
 'mergehistory-no-destination'      => 'פֿ�רציל בל�ַט $1 עקזיסטירט נישט.',
 'mergehistory-invalid-source'      => 'מקור בל�ַט מוז זײַן � גילטיק קעפל.',
 'mergehistory-invalid-destination' => 'פֿ�רציל בל�ַט מוז זײַן � גילטיק קעפל.',
 'mergehistory-autocomment'         => 'צונויפֿגעג�סן [[:$1]] �ין [[:$2]]',
 
+# Merge log
+'mergelog'         => 'צונויפֿגיסן ל�ג-בוך',
+'revertmerge'      => 'זיי מבטל צ�משטעל',
+'mergelogpagetext' => "�ונטן �יז � ליסטע פון לעצטנסדיגע צונויפגיסונגען פון �יין בל�ט'ס היסט�ריע �ין � צווייטער.",
+
 # Diffs
 'history-title'           => 'רעוויזיע היסט�ריע פֿון $1',
 'difference'              => '(�ונטערשייד צווישן ווערסיעס)',
 'lineno'                  => 'שורה $1:',
 'compareselectedversions' => 'פ�רגלייך סעלעקטירטע ווערסיעס',
+'visualcomparison'        => 'זעהב�רע פ�רגלייך',
+'wikicodecomparison'      => 'וויקיטעקסט פֿ�ַרגלייכונג',
 'editundo'                => '�ַנולירן',
 'diff-multi'              => '({{PLURAL:$1|�יין מיטלסטע ווערסיע |$1 מיטלסטע ווערסיעס}}  נישט געוויזן.)',
+'diff-movedto'            => '�ריבערגעפֿירט צו $1',
+'diff-styleadded'         => '$1 סטיל צוגעלייגט',
+'diff-added'              => '$1 צוגעלייגט',
+'diff-changedto'          => 'געענדערט צו $1',
+'diff-movedoutof'         => '�ריבערגעפֿירט פֿון $1',
+'diff-styleremoved'       => '$1 סטיל �וועקגענומען',
+'diff-removed'            => '$1 �וועקגענומען',
+'diff-changedfrom'        => 'געענדערט פֿון $1',
+'diff-src'                => 'מקור',
+'diff-withdestination'    => 'מיט ציל $1',
+'diff-with'               => '&#32;מיט $1 $2',
+'diff-with-final'         => '&#32;�ון $1 $2',
+'diff-width'              => 'ברייט',
+'diff-height'             => 'הייך',
+'diff-p'                  => "� '''פ�ַר�ַגר�ַף'''",
+'diff-table'              => "� '''ט�בעלע'''",
+'diff-tr'                 => "� '''שורה'''",
+'diff-td'                 => "� '''צעל'''",
+'diff-th'                 => "�ַ '''קעפל'''",
+'diff-img'                => "�ַ '''בילד'''",
+'diff-big'                => "'''גרויס'''",
+'diff-del'                => "'''�ויסגעמעקט'''",
 
 # Search results
-'searchresults'            => 'זוכן רעזולט�טן',
-'searchresulttext'         => 'לערנען מער ווי צו זוכן �ין {{SITENAME}}, זעט  [[{{MediaWiki:Helppage}}|{{int:help}}]]',
-'searchsubtitle'           => '�יר ה�ט געזוכט \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�לע בלעטער וו�ס הייבן �ן "$1"]] | [[Special:WhatLinksHere/$1|�לע בלעטעט וו�ס פֿ�ַרבינדן צו "$1"]])',
-'searchsubtitleinvalid'    => '$1דו ה�סט געזוכט פ�ר',
-'noexactmatch'             => 'דערווייל �יז נ�ָך נישט�ָ � בל�ט מיט דע� טיטל.<br /> �יר זײַט געל�דנט [[:$1|�ויפשרייבן � נייע� בל�ט]].',
-'noexactmatch-nocreate'    => 'נישט� קיין בל�ט מיטן קעפל "$1".',
-'toomanymatches'           => 'צו פֿיל רעזולט�ַטן, ביטע פרו�ווט �ן �נדער זוך',
-'titlematches'             => 'בל�ט קעפל שטימט',
-'notitlematches'           => 'קיין שו� בל�ט ה�ט נישט � צוגעפ�סט קעפל',
-'prevn'                    => '$1 פריערדיגע',
-'nextn'                    => '$1 קומענדיגע',
-'viewprevnext'             => 'קוקט �ויף ($1) ($2) ($3)',
-'search-result-size'       => '$1 ({{PLURAL:$2|�יין וו�רט|$2 ווערטער}})',
-'search-result-score'      => 'שייכותדיקייט: $1%',
-'search-redirect'          => '(ווײַטערפֿירן $1)',
-'search-section'           => '(�פטיילונג $1)',
-'search-suggest'           => 'צי ה�ט �יר געמיינט: $1',
-'search-interwiki-caption' => 'שוועסטער פר�יעקטן',
-'search-interwiki-default' => '$1 רעזולט�טן:',
-'search-interwiki-more'    => '(נ�ך)',
-'searchall'                => '�לץ',
-'showingresultstotal'      => "ווײַזן {{PLURAL:$3| רעזולט�ט '''$1''' פֿון '''$3'''| רעזולט�טן '''$1 - $2''' פֿון '''$3'''}}",
-'powersearch'              => 'זוכן',
-'powersearch-legend'       => 'ווײַטה�לטן זוכן',
-'powersearch-ns'           => 'זוכן �ין נ�מענטיילן:',
-'powersearch-redir'        => 'ווײַז ווײַטערפֿירונג בלעטער',
-'powersearch-field'        => 'זוך',
-'search-external'          => 'דרויסנדיק זוכן',
+'searchresults'                  => 'זוכן רעזולט�טן',
+'searchresults-title'            => 'זוכן רעזולט�ַטן פֿ�ַר "$1"',
+'searchresulttext'               => 'לערנען מער ווי צו זוכן �ין {{SITENAME}}, זעט  [[{{MediaWiki:Helppage}}|{{int:help}}]]',
+'searchsubtitle'                 => '�יר ה�ט געזוכט \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|�לע בלעטער וו�ס הייבן �ן "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|�לע בלעטעט וו�ס פֿ�ַרבינדן צו "$1"]])',
+'searchsubtitleinvalid'          => '$1דו ה�סט געזוכט פ�ר',
+'noexactmatch'                   => 'דערווייל �יז נ�ָך נישט�ָ � בל�ט מיט דע� טיטל.<br /> �יר זײַט געל�דנט [[:$1|�ויפשרייבן � נייע� בל�ט]].',
+'noexactmatch-nocreate'          => 'נישט� קיין בל�ט מיטן קעפל "$1".',
+'toomanymatches'                 => 'צו פֿיל רעזולט�ַטן, ביטע פרו�ווט �ן �נדער זוך',
+'titlematches'                   => 'בל�ט קעפל שטימט',
+'notitlematches'                 => 'קיין שו� בל�ט ה�ט נישט � צוגעפ�סט קעפל',
+'notextmatches'                  => 'נישט� קיין בלעטער מיט פ�סענדע �ינה�לט',
+'prevn'                          => '$1 פריערדיגע',
+'nextn'                          => '$1 קומענדיגע',
+'viewprevnext'                   => 'קוקט �ויף ($1) ($2) ($3)',
+'searchmenu-legend'              => 'זוכן ברירות',
+'searchhelp-url'                 => 'Help:�ינה�ַלט',
+'searchprofile-articles'         => '�ינה�לט בלעטער',
+'searchprofile-project'          => 'פר�יעקט בלעטער',
+'searchprofile-images'           => 'טעקעס',
+'searchprofile-everything'       => '�לץ',
+'searchprofile-articles-tooltip' => 'זוכן �ין $1',
+'searchprofile-project-tooltip'  => 'זוכן �ין $1',
+'searchprofile-images-tooltip'   => 'זוכן טעקעס',
+'search-result-size'             => '$1 ({{PLURAL:$2|�יין וו�רט|$2 ווערטער}})',
+'search-result-score'            => 'שייכותדיקייט: $1%',
+'search-redirect'                => '(ווײַטערפֿירן $1)',
+'search-section'                 => '(�פטיילונג $1)',
+'search-suggest'                 => 'צי ה�ט �יר געמיינט: $1',
+'search-interwiki-caption'       => 'שוועסטער פר�יעקטן',
+'search-interwiki-default'       => '$1 רעזולט�טן:',
+'search-interwiki-more'          => '(נ�ך)',
+'search-mwsuggest-enabled'       => 'מיט פ�רשל�גן',
+'search-mwsuggest-disabled'      => '�ן פ�רשל�גן',
+'search-relatedarticle'          => 'פ�רבינדן',
+'mwsuggest-disable'              => 'בטל מ�כן פ�רשל�גן AJAX',
+'searchrelated'                  => 'פ�רבינדן',
+'searchall'                      => '�לץ',
+'showingresults'                 => "ווייזן ביז {{PLURAL:$1|רעזולט�ט '''�יינס'''|'''$1''' רעזולט�טן}} �נגעפ�נגן פון נומער #'''$2''':",
+'showingresultsnum'              => "ווייזן {{PLURAL:$3|רעזולט�ט '''�יינס'''|'''$3''' רעזולט�טן}} �נגעפ�נגן פון נומער #'''$2''':",
+'showingresultstotal'            => "ווײַזן {{PLURAL:$4| רעזולט�ט '''$1''' פֿון '''$3'''| רעזולט�טן '''$1 - $2''' פֿון '''$3'''}}",
+'nonefound'                      => "'''�כטונג''': ביי דיפ�לט טוט ד�ס זוכן בלויז �ין טייל נ�מענטיילן. �יר קענט שרייבן'''all:''' בעפ�ר דער זוך טערמין כדי צו זיכן �ין �לע בלעטער (�ריינגערעכנט שמועס בלעטער, מוסטערן, �.�.וו.), �דער שרייבן בעפ�רן זוך-טערמין דע� נ�מענטייל וו�ס �יר זענט �ינטערסירט דערין.",
+'powersearch'                    => 'זוכן',
+'powersearch-legend'             => 'ווײַטה�לטן זוכן',
+'powersearch-ns'                 => 'זוכן �ין נ�מענטיילן:',
+'powersearch-redir'              => 'ווײַז ווײַטערפֿירונג בלעטער',
+'powersearch-field'              => 'זוך',
+'search-external'                => 'דרויסנדיק זוכן',
 
 # Preferences page
-'preferences'           => 'פרעפערענצן',
-'mypreferences'         => 'מיינע פרעפערענצן',
-'prefs-edits'           => 'צ�ל פון ענדערונגן:',
-'prefsnologin'          => 'נישט �ריינל�גירט',
-'prefsnologintext'      => '�יר ד�רפט זיין  <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} �ריינל�גירט]</span> כדי צו ענדערן ב�ניצער פרעפֿערענצן.',
-'qbsettings-none'       => 'ג�רנישט',
-'qbsettings-fixedleft'  => 'קבוע לינקס',
-'qbsettings-fixedright' => 'קבוע רעכטס',
-'changepassword'        => 'טוישן פ�ַסוו�רט',
-'skin'                  => 'סקין',
-'math'                  => 'פ�ָרמ�ַל',
-'dateformat'            => 'ד�טו� פ�רמ�ט',
-'datedefault'           => 'נישט� קיין פרעפערענץ',
-'datetime'              => 'ד�טו� �ון צייט',
-'math_unknown_error'    => '�ומב�ק�נטער פעילער',
-'math_unknown_function' => '�ומב�ק�נטער פונקציע',
-'math_syntax_error'     => 'סינט�קס גרייז',
-'prefs-personal'        => 'ב�ַנוצער פר�ָפֿיל',
-'prefs-rc'              => 'לעצטע ענדערונגען',
-'prefs-watchlist'       => '�ויפפ�סונג ליסטע',
-'prefs-watchlist-days'  => 'טעג צו ווייזן �ין דער �ויפפ�סונג ליסטע:',
-'prefs-misc'            => 'ב�ַ�ַרבעטן',
-'saveprefs'             => '�פהיטן',
-'resetprefs'            => '�וועקנעמען נישט-�ויפגעהיטענע ענדערונגען',
-'oldpassword'           => '�ַלטע פ�ַסוו�רט:',
-'newpassword'           => 'ניי פּ�סוו�ָרט:',
-'retypenew'             => 'ווידער שרײַבן פ�ַסוו�רט:',
-'textboxsize'           => 'ב�ַ�ַרבעטן',
-'rows'                  => 'שורות:',
-'columns'               => 'עמודי�:',
-'searchresultshead'     => 'זוכן',
-'contextlines'          => 'שורות פער רעזולט�ט',
-'contextchars'          => 'ק�נטעקסט פער שורה',
-'recentchangesdays'     => 'צ�ל פון טעג צו ווייזן �ין די לעצטע ענדערונגן:',
-'recentchangescount'    => 'דער צ�ָל פון ליניעס �ין די לעצטע ענדערונגען:',
-'savedprefs'            => '�ייערע פרעפערענצן �יז �פגעהיטן געוו�רן.',
-'timezonelegend'        => 'צייט ז�נע',
-'localtime'             => 'ל�ק�לער צייט',
-'allowemail'            => 'ערלויבן �נדערע צו �ײַך שיקן �ימעילס',
-'prefs-searchoptions'   => 'ברירות פ�ר זוכן',
-'prefs-namespaces'      => 'נ�מענטיילן',
-'defaultns'             => 'זוך �ין דע� נ�מענטייל �לס גרונט �ויסקלייב:',
-'default'               => 'דיפ�לט',
-'files'                 => 'טעקעס',
+'preferences'              => 'פרעפערענצן',
+'mypreferences'            => 'מיינע פרעפערענצן',
+'prefs-edits'              => 'צ�ל פון ענדערונגן:',
+'prefsnologin'             => 'נישט �ריינל�גירט',
+'prefsnologintext'         => '�יר ד�רפט זיין  <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} �ריינל�גירט]</span> כדי צו ענדערן ב�ניצער פרעפֿערענצן.',
+'qbsettings-none'          => 'ג�רנישט',
+'qbsettings-fixedleft'     => 'קבוע לינקס',
+'qbsettings-fixedright'    => 'קבוע רעכטס',
+'changepassword'           => 'טוישן פ�ַסוו�רט',
+'skin'                     => 'סקין',
+'skin-preview'             => 'פ�רויסדיגע ווייזונג',
+'math'                     => 'פ�ָרמ�ַל',
+'dateformat'               => 'ד�טו� פ�רמ�ט',
+'datedefault'              => 'נישט� קיין פרעפערענץ',
+'datetime'                 => 'ד�טו� �ון צייט',
+'math_unknown_error'       => '�ומב�ק�נטער פעילער',
+'math_unknown_function'    => '�ומב�ק�נטער פונקציע',
+'math_syntax_error'        => 'סינט�קס גרייז',
+'prefs-personal'           => 'ב�ַנוצער פר�ָפֿיל',
+'prefs-rc'                 => 'לעצטע ענדערונגען',
+'prefs-watchlist'          => '�ויפפ�סונג ליסטע',
+'prefs-watchlist-days'     => 'טעג צו ווייזן �ין דער �ויפפ�סונג ליסטע:',
+'prefs-watchlist-days-max' => '(מ�קסימו� 7 טעג)',
+'prefs-misc'               => 'ב�ַ�ַרבעטן',
+'saveprefs'                => '�פהיטן',
+'resetprefs'               => '�וועקנעמען נישט-�ויפגעהיטענע ענדערונגען',
+'textboxsize'              => 'ב�ַ�ַרבעטן',
+'rows'                     => 'שורות:',
+'columns'                  => 'עמודי�:',
+'searchresultshead'        => 'זוכן',
+'contextlines'             => 'שורות פער רעזולט�ט',
+'contextchars'             => 'ק�נטעקסט פער שורה',
+'recentchangesdays'        => 'צ�ל פון טעג צו ווייזן �ין די לעצטע ענדערונגן:',
+'recentchangescount'       => 'דער צ�ָל פון ליניעס �ין די לעצטע ענדערונגען:',
+'savedprefs'               => '�ייערע פרעפערענצן �יז �פגעהיטן געוו�רן.',
+'timezonelegend'           => 'צייט ז�נע',
+'localtime'                => 'ל�ק�לע צייט:',
+'allowemail'               => 'ערלויבן �נדערע צו �ײַך שיקן �ימעילס',
+'prefs-searchoptions'      => 'ברירות פ�ר זוכן',
+'prefs-namespaces'         => 'נ�מענטיילן',
+'defaultns'                => 'זוך �ין דע� נ�מענטייל �לס גרונט �ויסקלייב:',
+'default'                  => 'דיפ�לט',
+'files'                    => 'טעקעס',
 
 # User rights
 'userrights-user-editname'    => 'לייגט �ריין � ב�נוצער-נ�מען:',
 'editusergroup'               => 'עדיט ב�נוצער גרופעס',
-'editinguser'                 => "ענדערן ב�ניצער רעכטן פון ב�ניצער user '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "ענדערן ב�ניצער רעכטן פון ב�ניצער user '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-groupsmember'     => 'מיטגליד פון:',
 'userrights-reason'           => 'סיבה פ�רן ענדערונג:',
 'userrights-changeable-col'   => 'גרופעס �יר קענט ענדערן',
 'userrights-unchangeable-col' => 'גרופעס �יר קענט נישט ענדערן',
 
 # Groups
-'group'            => 'גרופע:',
-'group-user'       => 'ב�ניצערס',
-'group-bot'        => 'ב�טס',
-'group-sysop'      => 'סיס�פס',
-'group-bureaucrat' => 'ביור�קר�טן',
-'group-all'        => '(�לע)',
-
-'group-user-member'       => 'ב�ניצער',
-'group-bot-member'        => 'ב�ט',
-'group-sysop-member'      => 'סיס�פ',
-'group-bureaucrat-member' => 'ביור�קר�ט',
+'group'               => 'גרופע:',
+'group-user'          => 'ב�ניצערס',
+'group-autoconfirmed' => 'ב�ַשטעטיקטע ב�ַניצער',
+'group-bot'           => 'ב�טס',
+'group-sysop'         => 'סיס�פן',
+'group-bureaucrat'    => 'ביור�קר�טן',
+'group-all'           => '(�לע)',
+
+'group-user-member'          => 'ב�ניצער',
+'group-autoconfirmed-member' => 'ב�ַשטעטיקטער ב�ַניצער',
+'group-bot-member'           => 'ב�ט',
+'group-sysop-member'         => 'סיס�פ',
+'group-bureaucrat-member'    => 'ביור�קר�ט',
 
 'grouppage-user'       => '{{ns:project}}:�ײַנגעשריבענער ב�ניצער',
 'grouppage-bot'        => '{{ns:project}}:ב�טס',
@@ -961,24 +1053,45 @@ $2',
 'grouppage-bureaucrat' => '{{ns:project}}:ביר�קר�ט',
 
 # Rights
-'right-read'          => 'ליינען בלעטער',
-'right-edit'          => 'רעד�קטירן בלעטער',
-'right-minoredit'     => 'צייכן רעד�קטירונגען �לס  מינערדיק',
-'right-move'          => 'ב�וועג בלעטער',
-'right-upload'        => '�רויפל�דן טעקעס',
-'right-reupload'      => '�יבערשרײַבן עקסיסטירנדע טעקע',
-'right-autoconfirmed' => 'רעד�קטירן ה�לב-געשיצטע בלעטער',
-'right-delete'        => 'מעקן בלעטער',
-'right-undelete'      => 'צוריקשטעלן � בל�ט',
+'right-read'               => 'ליינען בלעטער',
+'right-edit'               => 'רעד�קטירן בלעטער',
+'right-createpage'         => 'ש�ַפֿן בלעטער (וו�ָס זענען נישט שמועס בלעטער)',
+'right-createtalk'         => 'ש�ַפֿן שמועס בלעטער',
+'right-createaccount'      => 'ש�ַפֿן נײַע ב�ַניצער ק�נטעס',
+'right-minoredit'          => 'צייכן רעד�קטירונגען �לס  מינערדיק',
+'right-move'               => 'ב�וועג בלעטער',
+'right-move-rootuserpages' => 'ב�ַוועגן ב�ַניצער הויפטבלעטער',
+'right-movefile'           => 'ב�ַוועגן טעקעס',
+'right-upload'             => '�רויפל�דן טעקעס',
+'right-reupload'           => '�יבערשרײַבן עקסיסטירנדע טעקע',
+'right-autoconfirmed'      => 'רעד�קטירן ה�לב-געשיצטע בלעטער',
+'right-delete'             => 'מעקן בלעטער',
+'right-deletedhistory'     => '�ײַערע �ויסגעמעקטע היסט�ריע פֿ�ַרשרײַבונגען, �ן זייער �ס�צי�ירטן טעקסט',
+'right-undelete'           => 'צוריקשטעלן � בל�ט',
+'right-import'             => '�ימפ�רטירן בלעטער פון �נדערע וויקיס',
 
 # User rights log
 'rightslog'      => 'ב�ַניצער רעכטן ל�ג',
 'rightslogentry' => 'געביטן די מיטגלידערש�ַפֿט פֿ�ַר $1 פֿון $2 �ויף $3',
 'rightsnone'     => '(ג�רנישט)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'               => 'ליינען דע� בל�ַט',
+'action-edit'               => 'רעד�קטירן דע� בל�ַט',
+'action-createpage'         => 'ש�ַפֿן בלעטער',
+'action-createtalk'         => 'ש�ַפֿן שמועס בלעטער',
+'action-createaccount'      => 'ש�ַפֿן די ב�ַניצער ק�נטע',
+'action-move'               => 'ב�ַוועגן דע� בל�ַט',
+'action-move-rootuserpages' => 'ב�ַוועגן ב�ַניצער הויפטבלעטער',
+'action-upload'             => '�ַרויפֿל�ָדן די טעקע',
+'action-delete'             => '�ויסמעקן דע� בל�ַט',
+'action-deletedhistory'     => "ב�ַקוקן דע� בל�ט'ס �ויסגעמעקטע היסט�ריע",
+'action-undelete'           => 'צוריקשטעלן דע� בל�ט',
+
 # Recent changes
 'nchanges'                          => '{{PLURAL:$1|ענדערונג|$1 ענדערונגען}}',
 'recentchanges'                     => 'לעצטע ענדערונגען',
+'recentchanges-legend'              => 'ברירות פ�ר לעצטע ענדערונגען',
 'recentchangestext'                 => 'גיי נ�ך די לעצטע ענדערונגען צו דער וויקי �ויף דע� בל�ט.',
 'recentchanges-feed-description'    => 'גייט נ�ך די לעצטע ענדערונגען צו דער וויקי �ין דע� בל�ט.',
 'rcnote'                            => "�ונטן {{PLURAL:$1|�יז '''1''' ענדערונג|זײַנען די לעצטע '''$1''' ענדערונגען}} �ין {{PLURAL:$2|דע� לעצטן ט�ג|די לעצטע $2 טעג}}, ביז $5, $4.",
@@ -1000,6 +1113,8 @@ $2',
 'boteditletter'                     => 'ב',
 'number_of_watching_users_pageview' => '[{{PLURAL:$1|�יין ב�ַניצער פ�ַסט|$1 ב�ַניצערס פ�ַסן}} �ויף]',
 'newsectionsummary'                 => '/* $1 */ נייע �פטיילונג',
+'rc-enhanced-expand'                => 'צייג דעט�לען (פ�רל�נגט זיך JavaScript)',
+'rc-enhanced-hide'                  => 'ב�ה�לט דעט�לן',
 
 # Recent changes linked
 'recentchangeslinked'          => 'פֿ�ַרבונדענע ענדערונגען',
@@ -1008,37 +1123,58 @@ $2',
 'recentchangeslinked-summary'  => "�ט � רשימה פון נייע ענדערונגען צו בלעטער פ�רבונדן פון � ספעציפישן בל�ט (�דער מיטגליד בלעטער פון � ספעציפישער ק�טעג�ריע).
 בלעטער �ויף [[Special:Watchlist|�ייער �ויפפ�סונג ליסטע]] זענען געוויזן '''דיק'''.",
 'recentchangeslinked-page'     => 'בל�ט נ�מען:',
+'recentchangeslinked-to'       => 'צייג ענדערונגען צו בלעטער פ�רבינדן צו דע� בל�ט �נשט�ט',
 
 # Upload
-'upload'          => 'בילדער/טעקעס �ַרױפֿל�ָדירן',
-'uploadbtn'       => '�ַרױפֿל�ָדן טעקע',
-'uploadnologin'   => 'נישט �ריינל�גירט',
-'uploaderror'     => '�רויפל�דירן פעילער',
-'uploadlog'       => '�רויפל�ָדן ל�ָגבוך',
-'uploadlogpage'   => '�רויפֿל�דן ל�ג',
-'filename'        => 'טעקע נ�מען',
-'filesource'      => 'מקור:',
-'uploadedfiles'   => '�רויפֿגעל�דעטע טעקעס',
-'minlength1'      => '� טעקע נ�מען מוז ה�בן כ�טש �יין �ות.',
-'badfilename'     => 'פייל נ�מען �יז געטוישט צו "$1".',
-'emptyfile'       => 'די פייל וו�ס �יר ה�ט �רויפל�דירט �יז ליידיג. עס קען זיין �ז דער סיבה �יז פשוט � טייפ�. ביטע מ�כט זיכער �ז ד�ס �יז די פייל וו�ס �יר ווילט �רויפל�דירן.',
-'savefile'        => 'טעקע �ױפֿהיטן',
-'uploadedimage'   => '�ַרױפֿל�ָדירט "[[$1]]"',
-'uploadvirus'     => 'די טעקע ה�ָט �ַ ווירוס! פרטי�: <div style="direction:rtl;">$1</div>',
-'sourcefilename'  => 'מקור טעקע נ�מען:',
-'destfilename'    => 'ציל טעקע נ�מען:',
-'watchthisupload' => 'פ�ס �ויף דע� בל�ט',
-
-# Special:ImageList
+'upload'            => '�ַרױפֿל�ָדן בילדער/טעקעס',
+'uploadbtn'         => '�ַרױפֿל�ָדן טעקע',
+'uploadnologin'     => 'נישט �ַרײַנל�גירט',
+'uploadnologintext' => '�יר מוזט זײַן [[Special:UserLogin| �ַרײַנל�ָָגירט]] כדי �רויפֿצול�ָדן טעקעס',
+'uploaderror'       => '�ַרויפֿל�ָדן פֿעלער',
+'uploadtext'        => "ב�ניצט דע� פֿ�רע� �ַרויפֿצול�ָדן טעקעס.
+כדי צו זען �דער זוכן טעקעס וו�ס זענען שוין �ַרויפֿגעל�ָדן ווענדט זיך צו דער [[Special:FileList|ליסטע פֿון �ַרויפֿגעל�ָדענע טעקעס]]; (ווידער)�ַרויפֿל�ָדונגען ווערן �ויך ל�גירט �ינע�  [[Special:Log/upload| �ַרויפֿל�ָדן ל�ג-בוך]], �ויסמעקונגען �ינע� [[Special:Log/delete|�ויסמעקן ל�ג-בוך]].
+
+כדי �ײַנשליסן � טעקע �ין � בל�ַט, ב�ניצט � לינק �ין �יינע� פון די פֿ�לגנדע פֿ�רעמען:
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></tt>''' צו ניצן די פֿולע ווערסיע פֿון דער טעקע
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|טעקסט קעפל]]</nowiki></tt>''' צו ניצן � 200 פיקסל ברייט ווערסיע �ין � קעסטל �ויף דער לינקער זײַט, מיט דער שילדערונג 'טעקסט קעפל'
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></tt>''' פֿ�ר � גר�ָדער פֿ�ַרבינדונג צו דער טעקע �ָן צו ווײַזן זי",
+'upload-permitted'  => 'ערלויבטע טעקע טיפן: $1.',
+'upload-preferred'  => 'פרעפֿרירטע טעקע טיפן: $1.',
+'upload-prohibited' => 'פֿ�ַרווערענע טעקע טיפן: $1.',
+'uploadlog'         => '�רויפל�ָדן ל�ָגבוך',
+'uploadlogpage'     => '�רויפֿל�דן ל�ג',
+'uploadlogpagetext' => 'פֿ�ָלגנד �יז �ַ ליסטע פֿון די לעצטע �ַרױפֿגעל�ָדענע טעקעס.
+זעט די  [[Special:NewFiles|ג�ל�ריע פֿון נײַע טעקעס]] פֿ�ַר � מער וויזועלע �יבערבליק.',
+'filename'          => 'טעקע נ�מען',
+'filedesc'          => 'רעזומע',
+'fileuploadsummary' => 'רעזומע:',
+'filesource'        => 'מקור:',
+'uploadedfiles'     => '�רויפֿגעל�דעטע טעקעס',
+'minlength1'        => '� טעקע נ�מען מוז ה�בן כ�טש �יין �ות.',
+'badfilename'       => 'טעקע נ�מען �יז געטוישט צו "$1".',
+'emptyfile'         => 'די טעקע וו�ס �יר ה�ט �רויפֿלגעל�ָדן �יז ליידיג.
+עס קען זיין �ז די סיבה �יז פשוט � טייפ�. 
+ביטע קוקט �יבער צי �יר ווילט �רויפֿל�דן  די ד�זיקע טעקע.',
+'fileexists-thumb'  => "<center>'''עקזיסטירנדע טעקע'''</center>",
+'uploadwarning'     => '�ַרויפֿל�ָדן וו�ָרענונג',
+'savefile'          => 'טעקע �ױפֿהיטן',
+'uploadedimage'     => '�ַרױפֿל�ָדירט "[[$1]]"',
+'uploadscripted'    => 'די טעקע ה�ט � סקריפט �דער HTML ק�ד וו�ס קען ווערן פֿ�לש �ויסגעטייטשט דורך � בלעטערער',
+'uploadvirus'       => 'די טעקע ה�ָט �ַ ווירוס! פרטי�: <div style="direction:rtl;">$1</div>',
+'sourcefilename'    => 'מקור טעקע נ�מען:',
+'destfilename'      => 'ציל טעקע נ�מען:',
+'watchthisupload'   => 'פ�ס �ויף דע� בל�ט',
+
+# Special:ListFiles
 'imgfile'               => 'טעקע',
-'imagelist'             => 'טעקע ליסטע',
-'imagelist_date'        => 'ד�טע',
-'imagelist_name'        => 'נ�מען',
-'imagelist_user'        => 'ב�ַניצער',
-'imagelist_size'        => 'גרייס',
-'imagelist_description' => 'ב�ַשרײַבונג',
-
-# Image description page
+'listfiles'             => 'טעקע ליסטע',
+'listfiles_date'        => 'ד�טע',
+'listfiles_name'        => 'נ�מען',
+'listfiles_user'        => 'ב�ַניצער',
+'listfiles_size'        => 'גרייס',
+'listfiles_description' => 'ב�ַשרײַבונג',
+
+# File description page
 'filehist'                       => 'היסט�ריע פֿון דער טעקע',
 'filehist-help'                  => 'קליקט �ויף � ד�טע/צײַט צו זען ד�ס בילד �זוי ווי עס �יז דעמ�לסט געווען',
 'filehist-deleteall'             => '�ויסמעקן �לץ',
@@ -1046,11 +1182,14 @@ $2',
 'filehist-revert'                => 'צוריקגיין',
 'filehist-current'               => 'לויפיק',
 'filehist-datetime'              => 'ד�טע/צײַט',
+'filehist-thumb'                 => 'געמינערטע בילד',
+'filehist-thumbtext'             => 'געמינערטע בילד פֿ�ַר דער װערסיע פֿון דער ד�ַטע $1',
+'filehist-nothumb'               => 'קיין פֿ�ַרקלענערט בילד',
 'filehist-user'                  => 'ב�ניצער',
 'filehist-dimensions'            => 'געמעסטן',
 'filehist-filesize'              => 'טעקע גרייס',
 'filehist-comment'               => 'ב�מערקונג',
-'imagelinks'                     => 'פֿ�רבינדונגען',
+'imagelinks'                     => 'פֿ�ַרבינדונגען צו� בילד',
 'linkstoimage'                   => '{{PLURAL:$1|דער פ�לגנדער בל�ט ניצט|די פ�לגנדע בלעטער ניצן}} ד�ס ד�זיגע בילד:',
 'nolinkstoimage'                 => 'נישט� קיין בלעטער וו�ס ניצן ד�ס ד�זיגע בילד.',
 'sharedupload'                   => 'די טעקע �יז � בשותפותדיקע טעקע �ון מען מעג זי ניצן �ין �נדערע פר�יעקטן.',
@@ -1062,6 +1201,7 @@ $2',
 'noimage'                        => "ס'�יז נישט� � טעקע מיט דע� נ�מען, �יר קענט �בער $1.",
 'noimage-linktext'               => '�רויפל�דן � טעקע',
 'uploadnewversion-linktext'      => '�רויפֿל�דן � נײַע ווערסיע פֿוו דער טעקע',
+'imagepage-searchdupe'           => 'זוכן דופליקירטע טעקעס',
 
 # File reversion
 'filerevert'         => 'צוריקדרייען $1',
@@ -1091,24 +1231,32 @@ $2',
 'unusedtemplateswlh'  => '�נדערע פֿ�ַרבינדונגען',
 
 # Random page
-'randompage' => 'צופֿעליגער �ַרטיקל',
+'randompage'         => 'צופֿעליגער �ַרטיקל',
+'randompage-nopages' => 'נישט� קיין בלעטער �ין נ�מענטייל "$1".',
 
 # Random redirect
 'randomredirect'         => 'צופֿעליק ווײַטערפֿירן',
-'randomredirect-nopages' => 'נישט� קיין ווײַטערפֿירונגען �ין דע� נ�מענטייל.',
+'randomredirect-nopages' => 'נישט� קיין ווײַטערפֿירונגען �ין דע� נ�מענטייל $1.',
 
 # Statistics
-'statistics'             => 'סט�ַטיסטיק',
-'sitestatstext'          => "עס {{PLURAL:\$1|�יז פ�ר�ן �יין בל�ט|זענען פ�ר�ן �ינג�נצן '''\$1''' בלעטער}} �ין דער ד�ט�ב�זע.
-ד�ס שליסט �יין \"רעדן\" בלעטער, בלעטער וועגן {{SITENAME}}, שטומף בלעטער, ווייטערפירן בלעטער �ון �נדערע  בלעטער �ָן  �ינה�לט. �חוץ דע�, עס {{PLURAL:\$2|�יז פ�ר�ן '''�יין''' בל�ט וו�ס ה�ט מסתמ�|זענען פ�ר�ן '''\$2''' בלעטער וו�ס ה�בן מסתמ�}} עכטן �ינה�לט.
-
-'''\$8''' {{PLURAL:\$8| טעקע �יז | טעקעס זענען}} געוו�רן �ויפגעל�דן.
-
-עס זענען געווען סה\"כ '''\$3''' {{PLURAL:\$3|בל�ט קוק|בל�ט קוקן}}, �ון  '''\$4''' {{PLURAL:\$4|בל�ט ב��רבעטונגען| בל�ט ב��רבעטונג}} זייט  {{SITENAME}} �יז געוו�רן �ויפגעשטעלט.
-ד�ס ב�טרעפט דורכשניטלעך  '''\$5''' ב��רבעטונגען � בל�ט, �ון  '''\$6''' קוקן �  ב��רבעטונג.
-
-די [http://www.mediawiki.org/wiki/Manual:Job_queue �רבעט ריי] ה�ט � לענג פון '''\$7'''.",
-'statistics-mostpopular' => 'מערסטע געזען בלעטער',
+'statistics'                   => 'סט�ַטיסטיק',
+'statistics-header-pages'      => 'בלעטער סט�טיסטיק',
+'statistics-header-edits'      => 'רעד�קטירן סט�ַטיסטיק',
+'statistics-header-views'      => 'זען סט�טיסטיק',
+'statistics-header-users'      => 'ב�ניצער סט�טיסטיק',
+'statistics-articles'          => '�ינה�לט בלעטער',
+'statistics-pages'             => 'בלעטער',
+'statistics-pages-desc'        => '�לע בלעטער �ין דער וויקי, כולל רעדן בלעטער, ווייטערפירונגען, ��"וו',
+'statistics-files'             => '�רויפֿגעל�דענע טעקעס',
+'statistics-edits'             => 'רעד�ַקטירונגען זײַט {{SITENAME}} �יז �ויפֿגעשטעלט',
+'statistics-edits-average'     => 'דורכשניט רעד�ַקטירונגען �ין � בל�ַט',
+'statistics-views-total'       => 'צ�ל קוקן �ינג�ַנצן',
+'statistics-views-peredit'     => 'צ�ל קוקן צו � רעד�ַקטירונג',
+'statistics-jobqueue'          => 'לענג [http://www.mediawiki.org/wiki/Manual:Job_queue �ויפֿג�ַבעס ריי]',
+'statistics-users'             => '�יינגעשריבענע [[Special:ListUsers|ב�ניצערס]]',
+'statistics-users-active'      => 'טעטיקע ב�ניצערס',
+'statistics-users-active-desc' => 'ב�ניצערס וו�ס ה�בן דורכגעפירט � פעולה �ין די לעצטע {{PLURAL:$1|ט�ג|$1 טעג}}',
+'statistics-mostpopular'       => 'מערסטע געזען בלעטער',
 
 'disambiguations'      => 'ב�דייטן בלעטער',
 'disambiguationspage'  => 'Template:ב�דייטן',
@@ -1149,14 +1297,15 @@ $2',
 'popularpages'            => 'פ�פולערע בלעטער',
 'wantedcategories'        => 'געזוכטע ק�טעג�ריעס',
 'wantedpages'             => 'געזוכטע בלעטער',
-'missingfiles'            => 'פֿעלנדיקע טעקעס',
+'wantedfiles'             => 'געזוכטע טעקעס',
+'wantedtemplates'         => 'געזוכטע מוסטערן',
 'mostlinked'              => 'מערסט פֿ�רבינדענע בלעטער',
 'mostlinkedcategories'    => 'מערסט פֿ�רבינדענע ק�טעג�ריעס',
 'mostlinkedtemplates'     => 'מערסט פֿ�רבינדענע מוסטערן',
 'mostcategories'          => '�ַרטיקלען מיט די מערקסטע ק�ַטעג�ָריעס',
 'mostimages'              => 'מערסט פֿ�רבונדענע טעקעס',
 'mostrevisions'           => '�ַרטיקלען מיט די מערסטע ב�ַ�ַרבעטונגען',
-'prefixindex'             => 'פרעפֿיקס �ינדעקס',
+'prefixindex'             => 'פּרעפֿיקס �ינדעקס',
 'shortpages'              => 'קורצע בלעטער',
 'longpages'               => 'ל�נגע בלעטער',
 'deadendpages'            => 'בלינדע בלעטער',
@@ -1166,7 +1315,10 @@ $2',
 'protectedpagesempty'     => '�צינד זענען קיין בלעטער נישט געשיצט מיט די ד�זיגע פ�ַר�ַמעטערס.',
 'protectedtitles'         => 'געשיצטע קעפלעך',
 'protectedtitlestext'     => 'די פֿ�לגנדע קעפלעך זענען געשיצט פון ב�ש�פֿן:',
+'protectedtitlesempty'    => '�צינד זענען קיין קעפלעך נישט ב�ַשיצט מיט די ד�זיגע פ�ַר�ַמעטערס.',
 'listusers'               => 'ליסטע פון ב�ניצערס',
+'listusers-editsonly'     => 'ווייזן נ�ר ב�ניצערס מיט רעד�קטירונגען',
+'usereditcount'           => '{{PLURAL:$1|רעד�ַקטירונג|$1 רעד�ַקטירונגען}}',
 'newpages'                => 'נייע בלעטער',
 'newpages-username'       => 'ב�ניצער נ�מען:',
 'ancientpages'            => 'עלטסטע בלעטער',
@@ -1190,8 +1342,6 @@ $2',
 'speciallogtitlelabel' => 'קעפל:',
 'log'                  => 'ל�ג-ביכער',
 'all-logs-page'        => '�לע ל�ג-ביכער',
-'log-search-legend'    => 'זוך ל�ג ביכער',
-'log-search-submit'    => 'ווײַז',
 'alllogstext'          => 'ק�מבינירטער �ויסשטעל פון �לע ל�גס פון {{SITENAME}}.
 מען קען פֿ�ַרשמעלרן די �ויסוו�ל דורך �ויסוועלן דע� ס�רט ל�ג, ב�ַניצער נ�מען �דער �נרירנדע בלעטער.',
 
@@ -1201,6 +1351,7 @@ $2',
 'nextpage'          => 'קומענדיגער בל�ט ($1)',
 'prevpage'          => 'פֿריערדיגער בל�ט ($1)',
 'allpagesfrom'      => 'ווייזן בלעטער �נגעהויבן פון:',
+'allpagesto'        => 'ווייזן בלעטער ביז:',
 'allarticles'       => '�לע �רטיקלען',
 'allinnamespace'    => '�לע בלעטער ($1 נ�ָמענטייל )',
 'allnotinnamespace' => '�לע בלעטער (נישט �ין נ�מענטייל  $1)',
@@ -1218,25 +1369,47 @@ $2',
 זעט �ויך [[Special:WantedCategories|געזוכטע ק�ַטעג�ריעס]].',
 'categoriesfrom'     => 'ווײַזן ק�טעג�ריעס �נהייבנדיג פֿון:',
 
+# Special:LinkSearch
+'linksearch'      => 'דערויסענדע לינקן',
+'linksearch-ns'   => 'נ�מענטייל:',
+'linksearch-ok'   => 'זוכן',
+'linksearch-line' => '$1 פֿ�ַרבונדן פֿון $2',
+
 # Special:ListUsers
 'listusers-submit'   => 'ווײַז',
 'listusers-noresult' => 'קיין ב�ניצער נישט געטר�פֿן.',
 
+# Special:Log/newusers
+'newuserlogpage'              => 'נייע ב�ַניצערס ל�ָג-בוך',
+'newuserlogpagetext'          => 'ד�ס �יז � ל�ג פון ב�ַניצערס �ײַנשרײַבונגען.',
+'newuserlog-byemail'          => 'פ�ַסוו�רט געשיקט דורך ע-פ�סט',
+'newuserlog-create-entry'     => 'נײַער ב�ניצער',
+'newuserlog-create2-entry'    => 'געש�פֿן ק�נטע פֿ�ר $1',
+'newuserlog-autocreate-entry' => 'ק�נטע ב�ַש�ַפֿן �ויט�מ�ַטיש',
+
 # Special:ListGroupRights
-'listgrouprights'          => 'ב�ַניצער גרופע רעכטן',
-'listgrouprights-group'    => 'גרופע',
-'listgrouprights-rights'   => 'רעכטן',
-'listgrouprights-helppage' => 'Help: גרופע רעכטן',
-'listgrouprights-members'  => '(רשימה פֿון מיטגלידער)',
+'listgrouprights'                 => 'ב�ַניצער גרופע רעכטן',
+'listgrouprights-summary'         => "פֿ�לגנד �יז � רשימה פֿון ב�ַניצער גרופעס דעפֿינירט �ויף דער ד�ָזיקער וויקי, מיט זײַערע �ַס�צי�ירטע צוטריט רעכטן.
+ס'קען זײַן  [[{{MediaWiki:Listgrouprights-helppage}}|מער �ינפֿ�רמ�ַציע]] וועגן �יינציקע רעכטן.",
+'listgrouprights-group'           => 'גרופע',
+'listgrouprights-rights'          => 'רעכטן',
+'listgrouprights-helppage'        => 'Help: גרופע רעכטן',
+'listgrouprights-members'         => '(רשימה פֿון מיטגלידער)',
+'listgrouprights-addgroup'        => 'קען צולייגן {{PLURAL:$2|גרופע|גרופעס}}: $1',
+'listgrouprights-removegroup'     => 'קען �ר�פנעמען {{PLURAL:$2|גרופע|גרופעס}}: $1',
+'listgrouprights-addgroup-all'    => 'רשות צוצולייגן �לע גרופעס',
+'listgrouprights-removegroup-all' => 'רשות �וועקצונעמען �לע גרופעס',
 
 # E-mail user
 'emailuser'       => '�ַרויסשיקן ע-פ�סט צו דע� ב�ַניצער',
 'emailpage'       => '�ַרויסשיקן ע-פ�סט צו ב�ַניצער.',
 'emailpagetext'   => '�יר קענט ניצן דע� פֿ�רע� �ונטן צו שיקן �ן בליצבריוו צו דע� ד�זיגן ב�ַניצער.
 דער ע-פ�סט �דרעס וו�ס �יר ה�ט �ריינגעלייגט �ין [[Special:Preferences| �ייערע ב�ניצער פרעפערנעצן]] וועט זיך ווייזן כ�ילו ד�ס �יז געקומען פון ד�רטן, בכדי צו דערמעגלעכן � תשובה.',
+'usermailererror' => 'בליצבריוו ה�ט צוריקגעשיקט � טעות:',
 'defemailsubject' => 'ע-פ�סט {{SITENAME}}',
 'noemailtitle'    => 'נישט� קיין �י-מעיל �דרעס',
-'noemailtext'     => 'דער ב�ניצער ה�ט נישט ב�שטימט קיין ע-פ�סט �דרעס, �דער וויל נישט ב�קומען קיין ע-פ�סט פון �נדערע ב�ניצערס.',
+'noemailtext'     => 'דער ב�ַניצער ה�ט נישט ב�שטימט קיין גילטיקן ע-פ�סט �דרעס.',
+'email-legend'    => '�ַרויסשיקן ע-פ�סט צו �ַן �ַנדער {{SITENAME}} ב�ַניצער',
 'emailfrom'       => 'פון',
 'emailto'         => 'צו',
 'emailsubject'    => 'טעמע:',
@@ -1246,39 +1419,35 @@ $2',
 'emailccsubject'  => 'ק�פי פון דיין מעסעדזש צו $1: $2',
 'emailsent'       => 'ע-פ�סט געשיקט',
 'emailsenttext'   => 'דיין �י-מעיל מעסעדזש �יז געשיקט געוו�רן.',
+'emailuserfooter' => 'דער בליצבריוו �יז געשיקט געוו�רן דורך$1 צו $2 מיט דער  "שיקן בליצבריוו"  פֿונקציע בײַ {{SITENAME}}.',
 
 # Watchlist
-'watchlist'            => 'מיין �ויפפַּ�סונג ליסטע',
-'mywatchlist'          => 'מיין �ויפפַּ�סונג ליסטע',
-'watchlistfor'         => "(פ�ר '''$1''')",
-'nowatchlist'          => '�יר ה�ט נישט קיין שו� בלעטער �ין �ייער �ויפפַּ�סונג ליסטע.',
-'watchlistanontext'    => 'ביטע $1 כדי צו זעהן �דער ענדערן בלעטער פון �ייער �ויפפַּ�סונג ליסטע.',
-'watchnologin'         => '�יר זענט נישט �ריינגל�גירט',
-'watchnologintext'     => '�יר מוזט זיין �ריינגעסיינט [[Special:UserLogin|�ריינגל�גירט]] צו מ�דיפֿיצירן �ייער �ויפפַּ�סן ליסטע.',
-'addedwatch'           => 'דער בל�ט �יז צוגעלייגט געוו�ָרן צו דער �ויפֿפַּ�סונג ליסטע',
-'addedwatchtext'       => "דער בל�ט \"[[:\$1]]\" �יז צוגעלײגט געוו�ָרן צו �ײַער[[Special:Watchlist|�ויפפַּ�סונג ליסטע]].
+'watchlist'         => 'מיין �ויפפַּ�סונג ליסטע',
+'mywatchlist'       => 'מיין �ויפפַּ�סונג ליסטע',
+'watchlistfor'      => "(פ�ר '''$1''')",
+'nowatchlist'       => '�יר ה�ט נישט קיין שו� בלעטער �ין �ייער �ויפפַּ�סונג ליסטע.',
+'watchlistanontext' => 'ביטע $1 כדי צו זעהן �דער ענדערן בלעטער פון �ייער �ויפפַּ�סונג ליסטע.',
+'watchnologin'      => '�יר זענט נישט �ריינגל�גירט',
+'watchnologintext'  => '�יר מוזט זיין �ריינגעסיינט [[Special:UserLogin|�ריינגל�גירט]] צו מ�דיפֿיצירן �ייער �ויפפַּ�סן ליסטע.',
+'addedwatch'        => 'דער בל�ט �יז צוגעלייגט געוו�ָרן צו דער �ויפֿפַּ�סונג ליסטע',
+'addedwatchtext'    => "דער בל�ט \"[[:\$1]]\" �יז צוגעלײגט געוו�ָרן צו �ײַער[[Special:Watchlist|�ויפפַּ�סונג ליסטע]].
 
 ענדערונגען צו דע� בל�ט �ון צו זײַן פ�רבינדענע� רעדן בל�ט וועלן זײַן �ויסגערעכענט ד�.
 �ון דער בל�ט וועט זיין '''דיק''' [[Special:RecentChanges|ליסטע פון לעצטע ענדערונגען]] צו גרינגער מ�כן ד�ס �רויסנעמען.",
-'removedwatch'         => '�ַר�ָפּגענומען געוו�רן פון דער �ויפפַּ�סונג ליסטע',
-'removedwatchtext'     => 'דער �ַרטיקל "[[:$1]]" �יז �ָפּגער�ַמעט געוו�ָרן פון �ייער �ױפֿפּ�ַסונג ליסטע',
-'watch'                => '�ױפֿפּ�ַסן',
-'watchthispage'        => 'טוט �ױפֿפּ�ַסן דע� בל�ט',
-'unwatch'              => '�ויפֿהערן �ויפֿפּ�ַסן',
-'unwatchthispage'      => 'ענדיג �ויפפ�סן',
-'notanarticle'         => 'ד�ס �יז נישט קיין �ינה�לט בל�ט',
-'notvisiblerev'        => 'די ב��רבעטונג �יז געוו�רן �ויסגעמעקט',
-'watchlist-details'    => '{{PLURAL:$1|�יין בל�ט|$1 בלעטער}} �ין �ייער �ויפֿפ�סן ליסטע (נישט רעכענען  רעדן בלעטער).',
-'wlheader-enotif'      => '* �י-מעיל נ�טיפיק�ציע ערמעגליכט.',
-'watchlistcontains'    => '�ייער �ויפֿפ�סונג ליסטע �נטה�לט {{PLURAL:$1|�יין בל�ט|$1 בלעטער}}.',
-'wlnote'               => "�ונטן {{PLURAL:$1|�יז די לעצטע ענדערונג|זענען די לעצטע '''$1''' ענדערונגען}} �ין {{PLURAL:$2|דער לעצטער שעה|די לעצטע '''$2''' שעה'ן}}.",
-'wlshowlast'           => "(ווײַזן די לעצטע $1 שעה'ן | $2 טעג | $3)",
-'watchlist-show-bots'  => 'ווייזן ב�ט רעד�ַקטירונגען',
-'watchlist-hide-bots'  => 'ב�ה�לטן ב�טן',
-'watchlist-show-own'   => 'צייג מיינע ענדערונגן',
-'watchlist-hide-own'   => 'ב�ה�לטן מיינע רעד�קטירונגען',
-'watchlist-show-minor' => 'צייג מינדעריגע ענדערונגן',
-'watchlist-hide-minor' => 'ב�ה�לטן מינעריגע ענדערונגען',
+'removedwatch'      => '�ַר�ָפּגענומען געוו�רן פון דער �ויפפַּ�סונג ליסטע',
+'removedwatchtext'  => 'דער �ַרטיקל "[[:$1]]" �יז �ָפּגער�ַמעט געוו�ָרן פון �ייער �ױפֿפּ�ַסונג ליסטע',
+'watch'             => '�ױפֿפּ�ַסן',
+'watchthispage'     => 'טוט �ױפֿפּ�ַסן דע� בל�ט',
+'unwatch'           => '�ויפֿהערן �ויפֿפּ�ַסן',
+'unwatchthispage'   => 'ענדיג �ויפפ�סן',
+'notanarticle'      => 'ד�ס �יז נישט קיין �ינה�לט בל�ט',
+'notvisiblerev'     => 'די ב��רבעטונג �יז געוו�רן �ויסגעמעקט',
+'watchlist-details' => '{{PLURAL:$1|�יין בל�ט|$1 בלעטער}} �ין �ייער �ויפֿפ�סן ליסטע (נישט רעכענען  רעדן בלעטער).',
+'wlheader-enotif'   => '* �י-מעיל נ�טיפיק�ציע ערמעגליכט.',
+'watchlistcontains' => '�ייער �ויפֿפ�סונג ליסטע �נטה�לט {{PLURAL:$1|�יין בל�ט|$1 בלעטער}}.',
+'wlnote'            => "�ונטן {{PLURAL:$1|�יז די לעצטע ענדערונג|זענען די לעצטע '''$1''' ענדערונגען}} �ין {{PLURAL:$2|דער לעצטער שעה|די לעצטע '''$2''' שעה'ן}}.",
+'wlshowlast'        => "(ווײַזן די לעצטע $1 שעה'ן | $2 טעג | $3)",
+'watchlist-options' => '�ויפֿפ�ַסן ליסטע ברירות',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '�ויפפ�סענדונג…',
@@ -1296,91 +1465,105 @@ $2',
 'enotif_anon_editor'           => '�ַנ�נימער ב�ַניצער $1',
 'enotif_body'                  => 'לכבוד $WATCHINGUSERNAME,
 
-די {{SITENAME}} בל�ט $PAGETITLE �יז געוו�רן $CHANGEDORCREATED �ין $PAGEEDITDATE דורך $PAGEEDITOR, זעהט $PAGETITLE_URL פ�ר די �יצטיגע ווערסיע.
+דער {{SITENAME}} בל�ט $PAGETITLE �יז געוו�רן $CHANGEDORCREATED �ו� $PAGEEDITDATE דורך $PAGEEDITOR, זעט $PAGETITLE_URL פ�ר דער �יצטיגער ווערסיע.
 
 $NEWPAGE
 
 ענדערערס קורץ וו�רט: $PAGESUMMARY $PAGEMINOREDIT
 
-פ�רבידט זיך צו� דע� שרייבער:
-�י-מעיל: $PAGEEDITOR_EMAIL
+פ�רבינדט זיך צו� שרייבער:
+ע-פ�סט: $PAGEEDITOR_EMAIL
 וויקי: $PAGEEDITOR_WIKI
 
-עס וועט מער נישט זיין קיין מעלדונגען �ין פ�ל פון נ�ך ענדערונגען נ�ר �ויב �יר וועט ב�זוכן דע� בל�ט �יר קענט �ויך �יבערסעטן די מעלדונגען פ�נען פון �לע �ייערע �ויפפ�סונג בלעטער �ין �ייער �ויפפ�סונג ליסטער.
-             �ייער פריינטליכער  {{SITENAME}} מעלדונגען סיסטע�
+עס וועט מער נישט זיין קיין מעלדונגען �ין פ�ל פון נ�ך ענדערונגען נ�ר �ויב �יר וועט ב�זוכן דע� בל�ט.
+�יר קענט �ויך צוריקשטעלן די מעלדונגען פ�נען פון �לע �ייערע �ויפֿגעפ�סטע בלעטער �ין �ייער �ויפפ�סונג ליסטע.
+             �ייער פֿריינטליכע  {{SITENAME}} מעלדונגען סיסטע�
 
 --
-צו ענדערן �ייעע �ויפפ�סונג ליסטע, ב�זוכט
+צו ענדערן �ייער �ויפֿפ�סונג ליסטע, ב�זוכט
 {{fullurl:{{ns:special}}:Watchlist/edit}}
 
-פידבעק �ון מער הילף:
+פ�ר מער הילף:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'מעק �ויס בל�ט',
-'confirm'                     => 'ב�שטעטיג',
-'excontent'                   => '�ינה�לט געווען: "$1"',
-'excontentauthor'             => "�ינה�לט געווען: '$1' (�ון דער �יינציגסטער ב�רבייטער �יז געווען '[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => '�ינה�לט בעפ�רן �ויסליידיגען �יז געווען: "$1"',
-'exblank'                     => 'בל�ט �יז געווען ליידיג',
-'delete-confirm'              => '�ויסמעקן $1',
-'delete-legend'               => '�ויסמעקן',
-'historywarning'              => '�כטונג – �יר גייט �ויסמעקן � בל�ט מיט � היסט�ריע פֿון פֿריערדיגע ווערסיעס:',
-'confirmdeletetext'           => '�יר גייט �יצט �ויסמעקן � בל�ט �דער � בילד, צוז�מן מיט �יר ג�נצע היסט�ריע, פון די ד�טעב�זע.
+# Delete
+'deletepage'             => 'מעק �ויס בל�ט',
+'confirm'                => 'ב�שטעטיג',
+'excontent'              => '�ינה�לט געווען: "$1"',
+'excontentauthor'        => "�ינה�לט געווען: '$1' (�ון דער �יינציגסטער ב�רבייטער �יז געווען '[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => '�ינה�לט בעפ�רן �ויסליידיגען �יז געווען: "$1"',
+'exblank'                => 'בל�ט �יז געווען ליידיג',
+'delete-confirm'         => '�ויסמעקן $1',
+'delete-legend'          => '�ויסמעקן',
+'historywarning'         => '�כטונג – �יר גייט �ויסמעקן � בל�ט מיט � היסט�ריע פֿון פֿריערדיגע ווערסיעס:',
+'confirmdeletetext'      => '�יר גייט �יצט �ויסמעקן � בל�ט �דער � בילד, צוז�מן מיט �יר ג�נצע היסט�ריע, פון די ד�טעב�זע.
 
 ביטע ב�שטעטיגט �ז ד�ס �יז ט�קע �ייער כוונה, �ז �יר פ�רשטייט פולערהייט די ק�נסקווענסן פון �ז� ה�רבע �קט, �ון �ז ד�ס �יז �ין �יינקל�נג מיטן פ�ליסי פון דע� סייט.',
-'actioncomplete'              => 'די �ַקציע �ָט זיך דורכגעפֿירט',
-'deletedtext'                 => '"<nowiki>$1</nowiki>" �ויסגעמעקט. זעה $2 פ�ר רעק�רד פון לעצטיגע �ויסמעקונגען.',
-'deletedarticle'              => '�ויסגעמעקט "[[$1]]"',
-'dellogpage'                  => '�ויסמעקונג ל�ג',
-'dellogpagetext'              => 'ווייטער �יז � ליסטע פון די מערסט לעצטיגע �ויסמעקונגען.',
-'deletionlog'                 => '�ויסמעקונג ל�ג',
-'deletecomment'               => 'סיבה פ�רן �ויסמעקן:',
-'deleteotherreason'           => '�נדער/נ�ך �ו �ורז�ך:',
-'deletereasonotherlist'       => '�נדער �ורז�ך',
-'deletereason-dropdown'       => '* געוויינטלעכע �ויסמעקן �ורז�כן
+'actioncomplete'         => 'די �ַקציע �ָט זיך דורכגעפֿירט',
+'deletedtext'            => '"<nowiki>$1</nowiki>" �ויסגעמעקט. זעה $2 פ�ר רעק�רד פון לעצטיגע �ויסמעקונגען.',
+'deletedarticle'         => '�ויסגעמעקט "[[$1]]"',
+'dellogpage'             => '�ויסמעקונג ל�ג',
+'dellogpagetext'         => 'ווייטער �יז � ליסטע פון די מערסט לעצטיגע �ויסמעקונגען.',
+'deletionlog'            => '�ויסמעקונג ל�ג',
+'deletecomment'          => 'סיבה פ�רן �ויסמעקן:',
+'deleteotherreason'      => '�נדער/נ�ך �ו �ורז�ך:',
+'deletereasonotherlist'  => '�נדער �ורז�ך',
+'deletereason-dropdown'  => '* געוויינטלעכע �ויסמעקן �ורז�כן
 ** פֿ�רל�נג פֿון שרייבער
 ** ק�פירעכט ברעכונג
 ** וו�נד�ליז�
 ** נישט יידיש',
-'delete-edit-reasonlist'      => 'רעד�ַקטירן די �ויסמעקן סיבות',
-'delete-toobig'               => 'דער בל�ַט ה�ט � גרויסע רעד�קטירונג היסט�ריע, מער ווי $1 {{PLURAL:$1|רעוויזיע|רעוויזיעס}}. �ויסמעקן �זעלכע בלעטער �יז ב�ַגרענעצט געוו�רן בכדי צו פֿ�ַרמײַדן � צופֿעליגע פֿ�ַרשטערונג פֿון  {{SITENAME}}.',
-'delete-warning-toobig'       => 'דער בל�ַט ה�ט � גרויסע רעד�קטירונג היסט�ריע, מער ווי $1 {{PLURAL:$1|רעוויזיע|רעוויזיעס}}. �ויסמעקן �י� קען פֿ�ַרשטערן ד�ַטנב�ַזע �פער�ַציעס פֿון {{SITENAME}}; זײַט פֿ�רזיכטיג �יידער �יר מעקט �ויס.',
-'rollback'                    => 'דרייען צוריק רעד�ַקטירונגען',
-'rollback_short'              => '�ויפֿריכטן',
-'rollbacklink'                => 'צוריקדרייען',
-'rollbackfailed'              => 'צוריקדרייען דורכגעפֿ�ַלן',
-'cantrollback'                => 'מען קען נישט צוריקדרייען די ענדערונג – די לעצטער ב�טייליגער �יז דער �יינציגסטער ב�טייליגונג; פ�רט, קען מען �ויסמעקן דע� בל�ט.',
-'alreadyrolled'               => 'מען קעגן נישט צוריקדריין די לעצטע ענדערונג פון בל�ט [[:$1]] דורך
+'delete-edit-reasonlist' => 'רעד�ַקטירן די �ויסמעקן סיבות',
+'delete-toobig'          => 'דער בל�ַט ה�ט � גרויסע רעד�קטירונג היסט�ריע, מער ווי $1 {{PLURAL:$1|רעוויזיע|רעוויזיעס}}. �ויסמעקן �זעלכע בלעטער �יז ב�ַגרענעצט געוו�רן בכדי צו פֿ�ַרמײַדן � צופֿעליגע פֿ�ַרשטערונג פֿון  {{SITENAME}}.',
+'delete-warning-toobig'  => 'דער בל�ַט ה�ט � גרויסע רעד�קטירונג היסט�ריע, מער ווי $1 {{PLURAL:$1|רעוויזיע|רעוויזיעס}}. �ויסמעקן �י� קען פֿ�ַרשטערן ד�ַטנב�ַזע �פער�ַציעס פֿון {{SITENAME}}; זײַט פֿ�רזיכטיג �יידער �יר מעקט �ויס.',
+
+# Rollback
+'rollback'         => 'דרייען צוריק רעד�ַקטירונגען',
+'rollback_short'   => '�ויפֿריכטן',
+'rollbacklink'     => 'צוריקדרייען',
+'rollbackfailed'   => 'צוריקדרייען דורכגעפֿ�ַלן',
+'cantrollback'     => 'מען קען נישט צוריקדרייען די ענדערונג – די לעצטער ב�טייליגער �יז דער �יינציגסטער ב�טייליגונג; פ�רט, קען מען �ויסמעקן דע� בל�ט.',
+'alreadyrolled'    => 'מען קעגן נישט צוריקדריין די לעצטע ענדערונג פון בל�ט [[:$1]] דורך
 [[User:$2|$2]] ([[User talk:$2|רעדן]]| [[Special:Contributions/$2|{{int:contribslink}}]]); 
 �ן �נדערער ה�ט שוין געענדערט �דער צוריקגעדרייט דע� בל�ט.
 
 די לעצטע ענדערונג �יז געווען פון [[User:$3|$3]] ([[User talk:$3|רעדן]]|[[Special:Contributions/$3|{{int:contribslink}}]]).',
-'editcomment'                 => "קורץ וו�רט �יז געווען: \"'''\$1'''\".", # only shown if there is an edit comment
-'revertpage'                  => '�ויפֿגעריכט פון ב�ַנוצער $2 צוריק צו� לעצטע ווערסיע פון ב�ַנוצער $1', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => 'צוריקגעדרייט רעד�ַקטירונגען פֿון $1 צו דער לעצטע ווערסיע פֿון $2',
+'editcomment'      => "קורץ וו�רט �יז געווען: \"'''\$1'''\".", # only shown if there is an edit comment
+'revertpage'       => 'רעד�ַקטירונגען פֿון  [[Special:Contributions/$2|$2]] צוריקגענומען ([[User talk:$2|רעדן]])  צו דער לעצטער ווערסיע פֿון [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => 'צוריקגעדרייט רעד�ַקטירונגען פֿון $1 צו דער לעצטע ווערסיע פֿון $2',
+'sessionfailure'   => "ווײַזט �ויס �ז ס'�יז ד� � פר�בלע� מיט �ייער �רײַנל�גירן; די פעולה �יז �יז געוו�רן �נולירט צו פֿ�ַרהיטן קעגן פֿ�ַרשטעלן �ייער סעסיע. זייט �זוי גוט �ון גייט צוריק צו� פֿריערדיקן בל�ט, �ון פרובירט נ�כ�ַמ�ָל.",
+
+# Protect
 'protectlogpage'              => 'ב�שיצונג ל�ָג-בוך',
+'protectedarticle'            => 'געשיצט [[$1]]',
+'modifiedarticleprotection'   => 'געענדערט ב�שיצונג שט�פל פון [[$1]]',
+'movedarticleprotection'      => 'ב�וועגט די שיץ ב�שטימונגען פֿון "[[$2]]" �ויף "[[$1]]"',
+'prot_1movedto2'              => '[[$1]] �ריבערגעפירט צו [[$2]]',
 'protectcomment'              => 'הערה:',
 'protectexpiry'               => 'גייט �ויס:',
 'protect_expiry_invalid'      => '�ויסגיין צײַט �ומגילטיג.',
 'protect_expiry_old'          => 'שוין דערנ�ך דער �ויסגיין צײַט.',
 'protect-unchain'             => '�ויפֿשליסן ב�וועגונג הרש�ות',
-'protect-text'                => '�יר מעגט זען �ון ענדערן דע� שוץ ניוו� ד� פֿ�רן בל�ט <strong><nowiki>$1</nowiki></strong>.',
-'protect-locked-blocked'      => '�יר קען נישט ענדערן דע� שוץ ניוו� בעת ווען �יר זענט בל�קירט.
-פֿ�לגנד זענען די לויפֿיגע שטעלונגען פֿ�רן בל�ט <strong>$1</strong>:',
-'protect-locked-access'       => '�ייער ק�נטע ה�ט נישט קיין ערלויבניש צו ענדערן בל�ט שיצונג ניוו�ען.
-ד� זענען די לויפֿיקע שטעלונגען פֿ�ַר דע� בל�ַט <strong>$1</strong>:',
+'protect-text'                => "�יר מעגט זען �ון ענדערן דע� שוץ ניוו� ד� פֿ�רן בל�ט '''<nowiki>$1</nowiki>'''.",
+'protect-locked-blocked'      => "�יר קען נישט ענדערן דע� שוץ ניוו� בעת ווען �יר זענט בל�קירט.
+פֿ�לגנד זענען די לויפֿיגע שטעלונגען פֿ�רן בל�ט '''$1''':",
+'protect-locked-access'       => "�ייער ק�נטע ה�ט נישט קיין ערלויבניש צו ענדערן בל�ט שיצונג ניוו�ען.
+ד� זענען די לויפֿיקע שטעלונגען פֿ�ַר דע� בל�ַט '''$1''':",
 'protect-cascadeon'           => 'דער בל�ַט �יז געשיצט �ַצינד ווײַל ער �יז �ײַנגעשל�סן �ין  {{PLURAL:$1|דע� פֿ�לגנדן בל�ַט, וו�ס ה�ט|די פֿ�לגנדע בלעטער, וו�ס ה�בן}} ק�ַסק�ַדירטע שיצונג. 
 
 �יר קענט ענדערן דע� שיצונג ניוו� פונע� בל�ַט, �בער ד�ס וועט נישט ווירקן �ויף דער ק�ַסק�ַדירטער שיצונג .',
-'protect-default'             => '(גרונט�ויסקלייב)',
+'protect-default'             => '�לע ב�ניצער ערלויבט',
 'protect-fallback'            => 'פֿ�דערט "$1" ערלויבניש',
-'protect-level-autoconfirmed' => 'בל�קירן נישט �יינגעשריבענע ב�ַניצערס',
+'protect-level-autoconfirmed' => 'פּרעװענטיװן נײַע �ון ניט �ײַנגעשריבענע ב�ַניצערס',
 'protect-level-sysop'         => 'נ�ר סיס�פן',
 'protect-summary-cascade'     => 'ק�סק�דירן',
 'protect-expiring'            => 'גייט �ויס $1 (UTC)',
 'protect-cascade'             => 'שיץ בלעטער �יינגעשל�סן �ין דע� בל�ט (ק�סק�ד שיץ)',
 'protect-cantedit'            => '�יר קען נישט ענדערן די שוץ ניוו�ען פֿון דע� בל�ט, ווײַל �יר ה�ט נישט קיין רשות  צו רעד�קטירן �י�.',
+'protect-othertime'           => '�נדער צייט:',
+'protect-othertime-op'        => '�נדער צײַט',
+'protect-edit-reasonlist'     => 'רעד�ַקטירן שיצן סיבות',
+'protect-expiry-options'      => 'שעה:1 hour,ט�ג:1 day,וו�ך:1 week,וו�כן:2 weeks,חודש:1 month,דריי חדשי�:3 months,זעקס חדשי�:6 months,י�ר:1 year,�ייביג:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'ערלויבניש:',
 'restriction-level'           => 'ב�ַשיצונג ניוו�:',
 'minimum-size'                => 'מינימו� גרייס',
@@ -1388,25 +1571,27 @@ $NEWPAGE
 'pagesize'                    => '(בייטן)',
 
 # Restrictions (nouns)
-'restriction-edit' => 'רעד�קטירן',
-'restriction-move' => 'ב�וועגן',
+'restriction-edit'   => 'רעד�קטירן',
+'restriction-move'   => 'ב�וועגן',
+'restriction-upload' => '�ַרויפֿל�ָדן',
 
 # Undelete
 'undelete'                  => 'זען �ויסגעמעקטע בלעטער',
 'undeletepage'              => 'זען �ון צוריקשטעלן �ויסגעמעקט בלעטער',
+'undeletepagetitle'         => "'''פֿ�לגנד ב�ַשטייט פֿון �ויסגעמעקטע ווערסיע פֿון [[:$1]]'''.",
 'viewdeletedpage'           => 'זען �ויסגעמעקטע בלעטער',
+'undeleteextrahelp'         => "צוריקצושטעלן דע� בל�ט מיט זײַן ג�נצע געשיכטע, דרוקט נישט �ויף קיין �יין ווערסיע, �ון דרוקט '''צוריקשטעלן'''. 
+צוריקצושטעלן נ�ר געוויסע ווערסיעס, קלויבט �ויס �ונטן די רעוויזיעס וו�ס �יר ווילט, �ון דרוקט �ויף '''צוריקשטעלן'''. 
+דרוקן �ויף '''�יבערמ�כן''' וועט �ומ�ויסקלויבן �לע ווערסיעס �ון �ויסמעקן �לעס �ין דע� ק�מענט�רן קעסטל.",
+'undeleterevisions'         => '{{PLURAL:$1|�יין ווערסיע|$1 ווערסיעס}} �ַרכיווירט',
 'undeletebtn'               => 'צוריקשטעלן',
 'undeletelink'              => 'צוריקשטעלן',
 'undeletecomment'           => 'הערה:',
+'undeletedarticle'          => 'צוריק געשטעלט "[[$1]]"',
 'cannotundelete'            => 'צוריקשטעלונג �יז דורכגעפ�לן; עס �יז מעגליך �ז �ן �נדערע ה�ט ד�ס שוין צוריקגעשטעלט.',
 'undeletedpage'             => "'''דער בל�ט $1 �יז געוו�רן צוריקגעשטעלט.'''
 
-זעט דע� [[Special:Log/delete| �ויסמעקן ל�ג]] פ�ר � ליסטע פון די לעצטע �ויסגעמעקטע �ון צוריקגעשטעלטע בלעטער.
-
-
-'''דער בל�ט $1 �יז געוו�רן צוריקגעשטעלט.'''
-
-זעה די [[{{ns:special}}:Log/delete|�ויסמעקן ל�ג]] פ�ר � ליסטע פון �ויסגעמעקטע �ון צוריקגעשטעלטע בלעטער.",
+זעט דע� [[Special:Log/delete| �ויסמעקן ל�ג]] פֿ�ר � ליסטע פון די לעצטע �ויסגעמעקטע �ון צוריקגעשטעלטע בלעטער.",
 'undelete-search-box'       => 'זוכן �ויסגעמעקטע בלעטער',
 'undelete-search-prefix'    => 'ווײַז בלעטער וו�ס הייבן �ן מיט:',
 'undelete-search-submit'    => 'זוכן',
@@ -1418,25 +1603,26 @@ $NEWPAGE
 'blanknamespace' => '(הויפט)',
 
 # Contributions
-'contributions' => "ב�ניצער'ס בײַשטײַערונגען",
-'mycontris'     => 'מײַנע בײַשטײַערונגען',
-'contribsub2'   => 'וועגן $1 ($2)',
-'uctop'         => '(לעצטע)',
-'month'         => 'ביז חודש:',
-'year'          => 'ביז י�ר:',
-
-'sp-contributions-newbies'     => 'ווײַזן בײַשטײַערונגען נ�ר פֿון נײַע ב�ַניצערס',
-'sp-contributions-newbies-sub' => 'פ�ר נייע ק�נטעס',
-'sp-contributions-blocklog'    => 'בל�קירן ל�ג',
-'sp-contributions-search'      => 'זוכן בײַשטײַערונגען',
-'sp-contributions-username'    => 'ב�ניצער נ�מען �דער IP �דרעס:',
-'sp-contributions-submit'      => 'זוכן',
+'contributions'       => "ב�ניצער'ס בײַשטײַערונגען",
+'contributions-title' => 'בײַשטײַערונגען פֿון ב�ַניצער $1',
+'mycontris'           => 'מײַנע בײַשטײַערונגען',
+'contribsub2'         => 'וועגן $1 ($2)',
+'uctop'               => '(לעצטע)',
+'month'               => 'ביז חודש:',
+'year'                => 'ביז י�ר:',
+
+'sp-contributions-newbies'       => 'ווײַזן בײַשטײַערונגען נ�ר פֿון נײַע ב�ַניצערס',
+'sp-contributions-newbies-sub'   => 'פ�ר נייע ק�נטעס',
+'sp-contributions-newbies-title' => 'בײַשטײַערונגען פֿון נײַע ב�ַניצערס',
+'sp-contributions-blocklog'      => 'בל�קירן ל�ג',
+'sp-contributions-search'        => 'זוכן בײַשטײַערונגען',
+'sp-contributions-username'      => 'ב�ניצער נ�מען �דער IP �דרעס:',
+'sp-contributions-submit'        => 'זוכן',
 
 # What links here
 'whatlinkshere'            => 'װ�ָס פֿ�ַרבינדט ד�',
 'whatlinkshere-title'      => 'בלעטער וו�ס פֿ�רבינדן צו $1',
 'whatlinkshere-page'       => 'בל�ַט:',
-'linklistsub'              => '(ליסטע פֿון פֿ�רבינדונגען)',
 'linkshere'                => "די פ�לגנדע בלעטער פ�רבינדן צו� בל�ט '''[[:$1]]''':",
 'nolinkshere'              => "קיין שו� בל�ט פ�רבינדט נישט צו '''[[:$1]]'''.",
 'nolinkshere-ns'           => "קיין בלעטער פֿ�ַרבינדן נישט צו '''[[:$1]]''' �ינע� �ויסגעקליבענע� נ�מענטייל.",
@@ -1453,22 +1639,22 @@ $NEWPAGE
 'whatlinkshere-filters'    => 'פֿילטערס',
 
 # Block/unblock
-'blockip'                  => 'ב�נוצער �רויסטרייבן',
-'blockip-legend'           => 'בל�קירן ב�ַניצער',
-'blockiptext'              => 'ב�נוצט זיך מיט די פ�רע� ד� �ונטן כדי צו בל�קירן �יינגעשריבענע ב�נוצער �דער סת� ספעציפישע �יי פי �דרעסן.
+'blockip'                         => 'ב�נוצער �רויסטרייבן',
+'blockip-legend'                  => 'בל�קירן ב�ַניצער',
+'blockiptext'                     => 'ב�נוצט זיך מיט די פ�רע� ד� �ונטן כדי צו בל�קירן �יינגעשריבענע ב�נוצער �דער סת� ספעציפישע �יי פי �דרעסן.
 
 �ז�לכע בל�קירונגן מוזן דורכגעפירט ווערן פ�ר דע� בלויזן �ין �יינע� ציל: �פה�לטן וו�נד�ליז�, �ון לויט די פ�רשריפטען �ון פ�ליסיס פון די סייט.
 
 ביטע שרייבט �רויס קל�ר וו�ס די וו�נד�ליז� ב�שטייט, �ון וועלכע בל�ט ער ה�ט וו�נד�ליזירט.',
-'ipaddress'                => '�דרעס IP:',
-'ipadressorusername'       => '�דרעס IP �דער ב�ַניצער נ�מען',
-'ipbreason'                => 'סיבה:',
-'ipbreasonotherlist'       => '�נדער סיבה',
-'ipbsubmit'                => 'בל�קירן דע� ב�ַניצער',
-'ipbother'                 => '�ַנדער צײַט',
-'ipboptions'               => '15 מינוט:15 minutes,
-1 שעה:1 hour,
-2 שעהן:2 hours,
+'ipaddress'                       => 'IP �דרעס:',
+'ipadressorusername'              => 'IP �דרעס �דער ב�ַניצער נ�מען:',
+'ipbexpiry'                       => '�ויסגיין:',
+'ipbreason'                       => 'סיבה:',
+'ipbreasonotherlist'              => '�נדער סיבה',
+'ipbanononly'                     => 'בל�קירן נ�ר �נ�נימע ב�ַניצערס',
+'ipbsubmit'                       => 'בל�קירן דע� ב�ַניצער',
+'ipbother'                        => '�ַנדער צײַט',
+'ipboptions'                      => '2 שעהן:2 hours,
 1 ט�ָג:1 day,
 3 טעג:3 days,
 1 װ�ָך:1 week,
@@ -1478,51 +1664,59 @@ $NEWPAGE
 6 מ�ָנ�ַטן:6 months,
 1 י�ָר:1 year,
 �ויף �ייביק:infinite', # display1:time1,display2:time2,...
-'ipbotheroption'           => '�ַנדער',
-'badipaddress'             => 'נישט קיין גוטע �ייפי �דרעס.',
-'blockipsuccesssub'        => 'בל�ק �יז דורכגפירט מיט דערפֿ�לג',
-'blockipsuccesstext'       => 'ב�נוצער [[Special:Contributions/$1|$1]] <br />�יז פ�רשפ�רט.
+'ipbotheroption'                  => '�ַנדער',
+'badipaddress'                    => 'נישט קיין גוטע �ייפי �דרעס.',
+'blockipsuccesssub'               => 'בל�ק �יז דורכגפירט מיט דערפֿ�לג',
+'blockipsuccesstext'              => 'ב�נוצער [[Special:Contributions/$1|$1]] <br />�יז פ�רשפ�רט.
 זעהט די [[Special:IPBlockList|ליסטע פון בל�קירטע ב�נוצער]] כדי צו זעהן די בל�קירונגן.',
-'ipb-unblock-addr'         => '�ויפֿבל�קירן $1',
-'unblockip'                => '�ויפֿבל�קירן ב�ניצער',
-'ipblocklist'              => ' ליסטע פון בל�קירטע ב�ניצערס �ון IP �דרעסן',
-'ipblocklist-legend'       => 'געפֿינען � בל�קירטן ב�ניצער',
-'ipblocklist-username'     => 'ב�ניצער נ�מען �דער IP �דרעס:',
-'ipblocklist-submit'       => 'זוכן',
-'blocklistline'            => '$1 $2 פ�רשפ�רט $3 ($4)',
-'infiniteblock'            => '�ויף �ייביק',
-'expiringblock'            => 'גייט �ויס $1',
-'anononlyblock'            => '�נינ�נימעס בלויז',
-'createaccountblock'       => 'ק�נטע ב�ש�פֿן בל�קירט',
-'emailblock'               => 'בליצפ�סט בל�קירט',
-'ipblocklist-empty'        => 'בל�קירן ליסטע �יז  ליידיג.',
-'blocklink'                => '�רויסטרייבן',
-'unblocklink'              => 'ב�ַפֿרײַען',
-'contribslink'             => 'ב�ַניצערס בײַשטײַערונגען',
-'autoblocker'              => 'דו ביסט געבל�קט �ט�מ�טיק ווייל דו טיילסט זיך די IP �דרעס מיט [[User:$1|$1]]. דער סיבה וו�ס �יז �נגעבען געוו�רן  [[User:$1|$1]] �יז: "$2".',
-'blocklogpage'             => 'בל�קירן ל�ג',
-'blocklogentry'            => 'בל�קירט "[[$1]]" �ויף �ַ תקופה פון $2 $3',
-'blocklogtext'             => 'ד�ס �יז � ל�ג בוך פון �לע בל�קירונגען �ון ב�פרייונגען פֿון ב�ניצערס. �יי פי �דרעסן וו�ס זענען בל�קירט �ויט�מ�טיש ווערן נישט �ויסגערעכענט ד�.
+'ipb-unblock-addr'                => '�ויפֿבל�קירן $1',
+'ipb-unblock'                     => '�ויפֿבל�קירן � ב�ַניצער נ�מען �דער IP �דרעס',
+'ipb-blocklist-contribs'          => 'בײַשטײַערונגען פֿון $1',
+'unblockip'                       => '�ויפֿבל�קירן ב�ניצער',
+'ipblocklist'                     => ' ליסטע פון בל�קירטע ב�ניצערס �ון IP �דרעסן',
+'ipblocklist-legend'              => 'געפֿינען � בל�קירטן ב�ניצער',
+'ipblocklist-username'            => 'ב�ניצער נ�מען �דער IP �דרעס:',
+'ipblocklist-submit'              => 'זוכן',
+'blocklistline'                   => '$1 $2 פ�רשפ�רט $3 ($4)',
+'infiniteblock'                   => '�ויף �ייביק',
+'expiringblock'                   => 'גייט �ויס $1',
+'anononlyblock'                   => '�נינ�נימעס בלויז',
+'createaccountblock'              => 'ק�נטע ב�ש�פֿן בל�קירט',
+'emailblock'                      => 'בליצפ�סט בל�קירט',
+'ipblocklist-empty'               => 'בל�קירן ליסטע �יז  ליידיג.',
+'blocklink'                       => '�רויסטרייבן',
+'unblocklink'                     => 'ב�ַפֿרײַען',
+'change-blocklink'                => 'פעסוו�רד טויש',
+'contribslink'                    => 'ב�ַניצערס בײַשטײַערונגען',
+'autoblocker'                     => 'דו ביסט געבל�קט �ט�מ�טיק ווייל דו טיילסט זיך די IP �דרעס מיט [[User:$1|$1]]. דער סיבה וו�ס �יז �נגעבען געוו�רן  [[User:$1|$1]] �יז: "$2".',
+'blocklogpage'                    => 'בל�קירן ל�ג',
+'blocklog-fulllog'                => 'פילער בל�קירונגן ל�ג',
+'blocklogentry'                   => 'בל�קירט "[[$1]]" �ויף �ַ תקופה פון $2 $3',
+'reblock-logentry'                => 'גענדערט די בל�קירונג דעפיניציעס פון [[$1]] מיטן צייט �פלויף פון $2 $3',
+'blocklogtext'                    => 'ד�ס �יז � ל�ג בוך פון �לע בל�קירונגען �ון ב�פרייונגען פֿון ב�ניצערס. �יי פי �דרעסן וו�ס זענען בל�קירט �ויט�מ�טיש ווערן נישט �ויסגערעכענט ד�.
 זעט די �יצטיגע [[Special:IPBlockList|ליסטע פון בל�קירטע ב�ניצערס]].',
-'unblocklogentry'          => 'ב�פֿרייט [[$1]]',
-'block-log-flags-anononly' => 'בלויז �נינ�מע ב�נוצער',
-'block-log-flags-nocreate' => '�ק�ונט ב�ש�פען פ�רשפ�רט',
-'block-log-flags-noemail'  => 'ע-פ�סט בל�קירט',
-'range_block_disabled'     => 'די סיס�פ מעגליכקייט צו בל�קירן רענזש בל�קס �יז �ומ-ערמעגליכט.',
-'ipb_expiry_invalid'       => '�פלויפונג צייט �ומ-געזעליך.',
-'ipb_already_blocked'      => '"$1" �יז שוין בל�קירט',
-'ipb_cant_unblock'         => "פעילער: בל�ק �יי.די. $1 געפינט זיך נישט. ס'מעגליך שוין ב�פרייט געוו�רן.",
-'ip_range_invalid'         => '�ומריכטיגער IP גרייך.',
-'proxyblocker'             => 'פר�קסי בל�קער',
-'proxyblockreason'         => '�ייער �יי.פי. �דרעס �יז געוו�רן געבל�קט צוליב דע� ווייל ד�ס �יז � �פענער פר�קסי. ביטע פ�רבינדט זיך מיט �ייער �ינטערנעט סערוויס פר�וויידער �דער טעקס ס�פ�רט צו �ינפ�רמירן זיי �יבער דע� ערענסטן זיכערהייט פר�בלע�.',
+'unblocklogentry'                 => '�ומבל�קירט [[$1]]',
+'block-log-flags-anononly'        => 'בלויז �נינ�מע ב�נוצער',
+'block-log-flags-nocreate'        => '�ק�ונט ב�ש�פען פ�רשפ�רט',
+'block-log-flags-noautoblock'     => '�ויט�-בל�קיר �יז בטל',
+'block-log-flags-noemail'         => '�י-מעיל בל�קירט',
+'block-log-flags-nousertalk'      => 'ענדערן �ייגן שמועס בל�ט בל�קירט',
+'block-log-flags-angry-autoblock' => 'פ�רבעסערטער �ויט�-בל�קירונג דערמעגליכט',
+'range_block_disabled'            => 'די סיס�פ מעגליכקייט צו בל�קירן רענזש בל�קס �יז �ומ-ערמעגליכט.',
+'ipb_expiry_invalid'              => '�פלויפונג צייט �ומ-געזעליך.',
+'ipb_already_blocked'             => '"$1" �יז שוין בל�קירט',
+'ipb_cant_unblock'                => "פעילער: בל�ק �יי.די. $1 געפינט זיך נישט. ס'מעגליך שוין ב�פרייט געוו�רן.",
+'ip_range_invalid'                => '�ומריכטיגער IP גרייך.',
+'proxyblocker'                    => 'פר�קסי בל�קער',
+'proxyblockreason'                => '�ייער �יי.פי. �דרעס �יז געוו�רן געבל�קט צוליב דע� ווייל ד�ס �יז � �פענער פר�קסי. ביטע פ�רבינדט זיך מיט �ייער �ינטערנעט סערוויס פר�וויידער �דער טעקס ס�פ�רט צו �ינפ�רמירן זיי �יבער דע� ערענסטן זיכערהייט פר�בלע�.',
 
 # Developer tools
 'databasenotlocked' => 'די ד�טעב�זע �יז נישט פ�רשפ�רט.',
 
 # Move page
-'move-page'               => 'ב�ַוועגן $1',
-'move-page-legend'        => 'ב�ַוועגן בל�ַט',
-'movepagetext'            => "זיך ב�ניצן מיט דע� פֿ�רע� וועט פֿ�רענדערן דע� נ�מען פֿון דע� בל�ט, �ון וועט �ריבערפֿירן זיין געשיכטע צו� נייע� נ�מען.
+'move-page'                 => 'ב�ַוועגן $1',
+'move-page-legend'          => 'ב�ַוועגן בל�ַט',
+'movepagetext'              => "זיך ב�ניצן מיט דע� פֿ�רע� וועט פֿ�רענדערן דע� נ�מען פֿון דע� בל�ט, �ון וועט �ריבערפֿירן זיין געשיכטע צו� נייע� נ�מען.
 
 ד�ס �לטע קעפל וועט ווערן � ווייטערפֿירן בל�ט צו� נייע� נ�מען.
 
@@ -1535,37 +1729,51 @@ $NEWPAGE
 �כטונג: דער בל�ט וועט נישט ווערן �ריבערגעפֿירט �ויב עס �יז שוין ד� � בל�ט �ונטער דע� נייע� נ�מען, �חוץ ווען ער �יז ליידיג. �דער ער �יז � ווייטערפֿירונג בל�ט, �ון ער ה�ט נישט קיין געשיכטע פון ענדערונגען. פשט דערפֿון, �ז �יר קענט �יבערקערן � ווייטערפֿירונג וו�ס �יר ה�ט �ט געמ�כט בטעות, �ון �יר קענט נישט �ריבערשרייבן �ן עקסיסטירנדן בל�ט.
 
 '''וו�רענונג:''' �ז� ענדערונג קען זיין דר�סטיש �ון נישט געווינטשען פ�ר � פ�פולערן בל�ט; ביטע פֿ�רזיכערט �ז �יר פֿ�רשטייט די ווייטגרייכנדע ק�נסקווענסן צו דער �קציע בעפֿ�ר �יר פֿירט ד�ס �ויס.",
-'movepagetalktext'        => "דער רעדן בל�ט וועט ווערן ב�ַוועגט �ויט�מ�ֵטיש מיט �י�, '''�חוץ:'''
+'movepagetalktext'          => "דער רעדן בל�ט וועט ווערן ב�ַוועגט �ויט�מ�ֵטיש מיט �י�, '''�חוץ:'''
 * ס'�יז שוין ד� � נישט-ליידיגער בל�ט מיטן נייע� נ�מען, �דער.
 * �יר נעמט  �ר�פ דע� צייכן פונע� קעסטל �ונטן.
 
 �ין די פֿעלער, וועט �יר ד�רפֿן ב�ַוועגן �דער צונויפֿגיסן דע� בל�ט ה�ַנטלעך, ווען �יר ווילט.",
-'movearticle'             => 'ב�וועג בל�ט:',
-'movenotallowed'          => '�יר זענט נישט דערלויבט צו ב�וועגן בלעטער.',
-'newtitle'                => 'צו נייע� קעפל:',
-'move-watch'              => '�ויפֿפ�ַסן �ויף דע� בל�ַט',
-'movepagebtn'             => 'ב�וועגן',
-'pagemovedsub'            => 'ב�ַוועגט מיט הצלחה',
-'movepage-moved'          => '<big>דער בל�ט "$1" �יז �ריבערגעפֿירט געוו�רן צו "$2".</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '� בל�ט מיט דע� נ�מען עקזיסטירט שוין, �דער די נ�מען וו�ס �יר ה�ט �ויסגעוועילט �יז נישט געזעצליך.
+'movearticle'               => 'ב�וועג בל�ט:',
+'movenologin'               => '�יר זענט נישט �ַריינל�ָגירט',
+'movenologintext'           => '�יר ד�רפֿט זיך �ײַנשרײַבן �ון זײַן  [[Special:UserLogin|�ַרײַנל�גירט]] צו ב�ַוועגן � בל�ַט.',
+'movenotallowed'            => '�יר זענט נישט דערלויבט צו ב�וועגן בלעטער.',
+'cant-move-user-page'       => '�יר זענט נישט דערלויבט צו ב�ַוועגן ב�ַניצער בלעטער (�חוץ �ונטערבלעטער).',
+'cant-move-to-user-page'    => '�יר זענט נישט דערלויבט צו ב�ַוועגן � בל�ַט צו � ב�ַניצער בל�ַט (�ַחוץ צו � ב�ַניצער �ונטערבל�ַט).',
+'newtitle'                  => 'צו נייע� קעפל:',
+'move-watch'                => '�ויפֿפ�ַסן �ויף דע� בל�ַט',
+'movepagebtn'               => 'ב�וועגן',
+'pagemovedsub'              => 'ב�ַוועגט מיט הצלחה',
+'movepage-moved'            => '<big>דער בל�ט "$1" �יז �ריבערגעפֿירט געוו�רן צו "$2".</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'   => 'ווײַטערפֿירונג  געש�ַפֿן.',
+'movepage-moved-noredirect' => 'ש�ַפֿן  � ווײַטערפֿירונג פֿ�ַרשטיקט.',
+'articleexists'             => '� בל�ט מיט דע� נ�מען עקזיסטירט שוין, �דער די נ�מען וו�ס �יר ה�ט �ויסגעוועילט �יז נישט געזעצליך.
 ביטע �ויסוועילן �ן �נדער נ�מען.',
-'cantmove-titleprotected' => '�יר קענט נישט ב�ַוועגן � בל�ַט צו דע� נ�מען, ווייל ד�ס נייע קעפל �יז געשיצט פֿון ווערן געש�ַפֿן',
-'talkexists'              => "דער בל�ט �ליין �יז ב�וועגט מיט דערפֿ�לג, �בער דער רעדן בל�ט ה�ט מען נישט ב�וועגט ווײַל ס'�יז שוין ד� � בל�ט מיט דע� זעלבן נ�מען. זײַט �זוי גוט פֿ�ר�ייניגט זיי ה�נטלעך.",
-'movedto'                 => 'ב�ַוועגט צו',
-'movetalk'                => 'ב�וועגט �ס�סיצירטע רעדן בל�ט',
-'movepage-page-unmoved'   => 'מען קען נישט ב�וועגן בל�ט $1 צו $2.',
-'1movedto2'               => '[[$1]] �ריבערגעפירט צו [[$2]]',
-'1movedto2_redir'         => '[[$1]] �יז �ַריבער צו [[$2]] �ַנטשט�ָט � ווײַטערפֿירונג',
-'movelogpage'             => 'ב�וועגן ל�ג',
-'movelogpagetext'         => 'פֿ�לגנד �יז � ליסטע פֿון  בלעטער ב�וועגט.',
-'movereason'              => '�ורז�ך:',
-'revertmove'              => 'צוריקדרייען',
-'delete_and_move'         => '�ויסמעקן �ון ב�וועגן',
-'delete_and_move_text'    => '== �ויסמעקן פ�רל�נגט ==
-די ציל ב�לט "[[:$1]]" עקזיסטירט שוין. ווילט �יר ד�ס �ויסמעקן כדי צו ערמעגליכן דע� ב�וועגונג?',
-'delete_and_move_confirm' => 'י�, מעק �ויס דע� בל�ט',
-'delete_and_move_reason'  => '�ויסמעקן כדי צו קענען ב�וועגן',
-'imageinvalidfilename'    => 'דער ציל טעקע נ�מען �יז נישט גילטיק.',
+'cantmove-titleprotected'   => '�יר קענט נישט ב�ַוועגן � בל�ַט צו דע� נ�מען, ווייל ד�ס נייע קעפל �יז געשיצט פֿון ווערן געש�ַפֿן',
+'talkexists'                => "דער בל�ט �ליין �יז ב�וועגט מיט דערפֿ�לג, �בער דער רעדן בל�ט ה�ט מען נישט ב�וועגט ווײַל ס'�יז שוין ד� � בל�ט מיט דע� זעלבן נ�מען. זײַט �זוי גוט פֿ�ר�ייניגט זיי ה�נטלעך.",
+'movedto'                   => 'ב�ַוועגט צו',
+'movetalk'                  => 'ב�וועגט �ס�סיצירטע רעדן בל�ט',
+'movepage-page-moved'       => 'דער בל�ַט $1 �יז געוורן ב�ַוועגט צו $2.',
+'movepage-page-unmoved'     => 'מען קען נישט ב�וועגן בל�ט $1 צו $2.',
+'1movedto2'                 => '[[$1]] �ריבערגעפירט צו [[$2]]',
+'1movedto2_redir'           => '[[$1]] �יז �ַריבער צו [[$2]] �ַנטשט�ָט � ווײַטערפֿירונג',
+'move-redirect-suppressed'  => 'ווײַטערפֿירונג פֿ�ַרשטיקט',
+'movelogpage'               => 'ב�וועגן ל�ג',
+'movelogpagetext'           => 'פֿ�לגנד �יז � ליסטע פֿון  בלעטער ב�וועגט.',
+'movereason'                => '�ורז�ך:',
+'revertmove'                => 'צוריקדרייען',
+'delete_and_move'           => '�ויסמעקן �ון ב�וועגן',
+'delete_and_move_text'      => '== �ויסמעקן פ�רל�נגט ==
+דער ציל בל�ַט "[[:$1]]" עקזיסטירט שוין. 
+צי ווילט �יר �י� �ויסמעקן כדי צו ערמעגליכן די ב�וועגונג?',
+'delete_and_move_confirm'   => 'י�, מעק �ויס דע� בל�ט',
+'delete_and_move_reason'    => '�ויסמעקן כדי צו קענען ב�וועגן',
+'selfmove'                  => 'מקור �ון ציל קעפלעך זענען גלײַך; מען קען נישט ב�וועגן � בל�ט צו זיך זעלבסט.',
+'immobile-source-namespace' => 'נישט מעגלעך צו ב�וועגן בלעטער �ין נ�מענטייל "$1"',
+'immobile-target-namespace' => 'מען קען נישט ב�ַוועגן בלעטער צו� נ�מענטייל "$1"',
+'immobile-source-page'      => 'דער ד�זיגער בל�ט קען נישט ווערן ב�וועגט.',
+'imageinvalidfilename'      => 'דער ציל טעקע נ�מען �יז נישט גילטיק.',
+'move-leave-redirect'       => '�יבערל�זן � ווײַטערפֿירונג',
 
 # Export
 'export'            => 'עקספ�רטירן בלעטער',
@@ -1574,7 +1782,7 @@ $NEWPAGE
 
 צו עקספ�רטירן בלעטער, לייגט �ריין די טיטלען �ין דע� טעקסט קעסטל פון �ונטן, �יין טיטל פ�ר � שורה, �ון קלויבט �ויס צי �יר ד�רפט די לויפיגע ווערסיע, ווי �ויך די �לטע ווערסיעס, מיט די בל�ט היסט�ריע שורות, �דער בלויז די �יצטיגע ווערסיע מיט דער קורץ וו�רט �ינפ�רמ�ציע פון דער לעצטער ענדערונג.
 
-�ין דע� לעצטן פ�ל קענט �יר �ויך ניצן � לינק, למשל [[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]] פ�רן בל�ט [[{{MediaWiki:Mainpage}}]].',
+�ין דע� לעצטן פ�ל קענט �יר �ויך ניצן � לינק, למשל [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] פ�רן בל�ט [[{{MediaWiki:Mainpage}}]].',
 'exportcuronly'     => 'רעכן �ריין בלויז די �יצטיגע רע-ווערסיע, נישט די פולער היסט�ריע',
 'exportnohistory'   => "----
 '''ב�מערקונג:''' עקספ�רטירן די פולער היסט�ריע פון בלעטער דורך די פ�רע� �יז געוו�רן �ומ-ערמעגליכט צוליב פערפ�רמענס סיבות.",
@@ -1613,9 +1821,12 @@ $NEWPAGE
 'import-interwiki-text'      => 'קלויבט �ויס � וויקי �ון �ן �רטיקל קעפל צו �ימפ�רטירן.
 די ד�טעס �ון די נעמען פון די רעד�קט�רן וועט ווערן געהיטן.
 �לע צווישנוויקי �ימפ�רט �קציעס ווערן פ�רשריבן �ינע�   [[Special:Log/import|�ימפ�רט ל�ג]].',
+'import-interwiki-source'    => 'מקור וויקי/בל�ט',
 'import-interwiki-history'   => 'ק�פירן �לע היסט�ריע ווערסיעס פ�ר דע� בל�ט',
 'import-interwiki-submit'    => '�ימפ�רט',
 'import-interwiki-namespace' => 'ציל נ�מענטייל:',
+'import-upload-filename'     => 'טעקע נ�מען:',
+'import-comment'             => 'הערה:',
 'importtext'                 => 'ביטע עקספ�רטירט די טעקע פון דער מקור וויקי ניצנדיג ד�ס [[Special:Export|עקספ�רט הילפמיטל]], שפייכלט �יין �ויף �ייער ה�רטדיסק �ון ל�דט �ויף ד�.',
 'importstart'                => '�ימפ�רטירט בלעטער…',
 'import-revision-count'      => '{{PLURAL:$1|�יין ווערסיע|$1 ווערסיעס}}',
@@ -1636,19 +1847,19 @@ $NEWPAGE
 'import-logentry-interwiki'     => '�ריבערגעוויקיט $1',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => 'מיין ב�ניצער בל�ט',
+'tooltip-pt-userpage'             => '�ייער ב�ניצער בל�ט',
 'tooltip-pt-anonuserpage'         => 'ב�ניצער בל�ט פון  דע� �נ�נימען ב�ניצער',
-'tooltip-pt-mytalk'               => 'מיין רעדן בל�ט',
-'tooltip-pt-anontalk'             => 'רעדן �ויף �נינונימע ב�טייליגען',
-'tooltip-pt-preferences'          => 'מיינע פרעפערענצן',
-'tooltip-pt-watchlist'            => '�ויפפּ�סן בלעטער',
-'tooltip-pt-mycontris'            => 'מיינע ביישטייערונגען',
-'tooltip-pt-login'                => 'ביטע �יינשרייבן, �בער עס �יז נישט קיין חוב',
-'tooltip-pt-anonlogin'            => 'סבעסער �יינשרייבן, �בער עס �יז נישט קיין חוב',
-'tooltip-pt-logout'               => 'זיך �ויסשרייבן',
+'tooltip-pt-mytalk'               => '�ייער שמועס בל�ט',
+'tooltip-pt-anontalk'             => 'שמועס �יבער ב�טייליגען פון די �יי.פי.',
+'tooltip-pt-preferences'          => '�ייערע פרעפערענצן',
+'tooltip-pt-watchlist'            => 'ליסטע פון בלעטער וו�ס �יר טוט �ויפפ�סן נ�ך ענדערונגן',
+'tooltip-pt-mycontris'            => 'ליסטע פון �ייערע ביישטייערונגען',
+'tooltip-pt-login'                => 'עס �יז רעק�ָמענדירט זיך צו �ײַנשרײַבן: �בער, עס �יז נישט קיין פליכט',
+'tooltip-pt-anonlogin'            => 'עס �יז רעק�ָמענדירט זיך צו �ײַנשרײַבן, �ָבער, עס �יז נישט קײַן פֿליכט',
+'tooltip-pt-logout'               => '�רויסל�גירן',
 'tooltip-ca-talk'                 => 'שמועס �יבער די �ינה�לט בל�ט',
 'tooltip-ca-edit'                 => "�יר קענט ענדערן דע� בל�ט, ביטע ב�נוצט זיך מיט ''פ�רויסדיגע ווייזונג'' קנעפל בעפ�רן �פהיטען",
-'tooltip-ca-addsection'           => 'לייג צו �ייער הערה צו דע� שמועס',
+'tooltip-ca-addsection'           => 'הייב �ן � נייער שמועס �פטיילונג',
 'tooltip-ca-viewsource'           => 'ד�ס �יז � פ�רשל�סן בל�ט, קענסט נ�ר קוקן �יר מקור',
 'tooltip-ca-history'              => 'פריערדיגע ווערסיעס פון דע� בל�ט.',
 'tooltip-ca-protect'              => 'ב�שיצט דע� בל�ט',
@@ -1695,6 +1906,8 @@ $NEWPAGE
 'tooltip-watch'                   => 'לייגט צו דע� בל�ט צו �ייער �ויפֿפ�סונג ליסטע',
 'tooltip-recreate'                => 'ווידערש�ַפֿן דע� בל�ַט כ�טש ער �יז �ַמ�ל �ויסגעמעקט',
 'tooltip-upload'                  => 'הייב �ן �ויפל�דן',
+'tooltip-rollback'                => 'דרײ צוריק רעד�ַקטירונגע(ן) צו דער לעצטער װערסיע פֿון דע� בל�ַט פֿונע� לעצטען ב�ַניצער �ין �ײן קװעטש',
+'tooltip-undo'                    => 'עפֿנט דע� רעד�ַגיר־פֿענסטער �ין �ַ פֿ�ָרױסדיקן �ױסקוק כּדי צוריקדרײען די רעד�ַקציע. עס �יז מעגלעך צוצולײגן �ַ סיבה דערװעגן �ין דע� "קורץ װ�ָרט" ב�ָקסל.',
 
 # Stylesheets
 'common.css'   => '/* CSS געשריבן ד� וועט �פילירן �ון ב�יינפלוסן �לע סקינס */',
@@ -1704,12 +1917,12 @@ $NEWPAGE
 'common.js' => '/* �לע סקריפטן פון JavaScript ד� געשריבן וועט לויפן פ�ר �לע ב�נוצער ווען זיי וועלן ל�דירן דע� בל�ט */',
 
 # Attribution
-'anonymous'        => '�ַנ�ָנימע/ר ב�ַניצער(ס) פֿון {{SITENAME}}',
+'anonymous'        => '{{PLURAL:$1|�ַנ�נימער ב�ַניצער| �ַנ�נימע ב�ַניצערס}} פֿון {{SITENAME}}',
 'siteuser'         => 'ב�ַניצער {{SITENAME}} $1',
 'lastmodifiedatby' => 'די לעצטע ענדערונג פון דע� בל�ט �יז געווען $2, $1 דורך $3.', # $1 date, $2 time, $3 user
 'othercontribs'    => 'ב�זירט �ויף �רבעט פון $1.',
 'others'           => '�נדערע',
-'siteusers'        => 'ב�ניצער(ס) {{SITENAME}} $1',
+'siteusers'        => '{{PLURAL:$2|ב�ַניצער| ב�ַניצערס}} {{SITENAME}} $1',
 'creditspage'      => 'בל�ט קרעדיטס',
 
 # Info page
@@ -1717,17 +1930,23 @@ $NEWPAGE
 'numedits'     => 'צ�ל פון רעד�קציעס (בל�ט): $1',
 
 # Patrolling
-'markaspatrolleddiff' => 'ב�צייכנען �לס פ�טר�לירט',
-'markaspatrolledtext' => 'ב�צייכנען בל�ט �לס פ�טר�לירט',
-'markedaspatrolled'   => 'ב�צייכנט �לס פ�טר�לירט',
+'markaspatrolleddiff'    => 'ב�צייכנען �לס פ�טר�לירט',
+'markaspatrolledtext'    => 'ב�צייכנען בל�ט �לס פ�טר�לירט',
+'markedaspatrolled'      => 'ב�צייכנט �לס פ�טר�לירט',
+'markedaspatrollederror' => 'נישט מעגלעך צו צייכענען �לס פ�ַטר�לירט',
 
 # Patrol log
-'patrol-log-page' => 'פ�טר�לירן ל�ג-בוך',
+'patrol-log-page'      => 'פ�טר�לירן ל�ג-בוך',
+'patrol-log-header'    => 'ד�ס �יז � ל�ג-בוך פון פ�ַטר�ליטע רעוויזיעס.',
+'patrol-log-line'      => 'געצייכנט $1 פון בל�ט $2 ווי פ�ַטר�לירט $3',
+'patrol-log-auto'      => '(�ויט�מ�ַטיש)',
+'log-show-hide-patrol' => '$1 פ�ַטר�לירן ל�ג-בוך',
 
 # Image deletion
-'deletedrevision'       => '�ויסגעמעקט �לטע ווערסיע $1.',
-'filedeleteerror-short' => 'גרייז ביי� �ויסמעקן טעקע: $1',
-'filedelete-missing'    => 'קען נישט �ויסמעקן טעקע "$1", ווייל זי עקזיסטירט נישט.',
+'deletedrevision'                 => '�ויסגעמעקט �לטע ווערסיע $1.',
+'filedeleteerror-short'           => 'גרייז ביי� �ויסמעקן טעקע: $1',
+'filedelete-missing'              => 'קען נישט �ויסמעקן טעקע "$1", ווייל זי עקזיסטירט נישט.',
+'filedelete-current-unregistered' => 'די טעקע "$1" �יז נישט �ין דער ד�טנב�זע.',
 
 # Browsing diffs
 'previousdiff' => 'פריערדיגע ווערסיע →',
@@ -1741,10 +1960,12 @@ $NEWPAGE
 'show-big-image'       => 'בילד מיט דער גרעסטער רעז�לוציע',
 'show-big-image-thumb' => '<small>גרייס פון דער ווײַזונג: $1 × $2 פיקסעלן</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => 'ג�ַלעריע פֿון נײַע בילדער',
 'imagelisttext'         => 'פ�לגנד � ליסטע פון {{PLURAL:$1|�יין בילד|$1 בילדער}}, ס�רטירט $2:',
 'newimages-summary'     => 'דער ב�זונדערער בל�ט ווײַזט די לעצטע �רויפגעל�דענע טעקעס',
+'newimages-legend'      => 'פֿילטער',
+'newimages-label'       => 'טעקע נ�ָמען (�דער �ַ טײל פֿון �י�):',
 'showhidebots'          => '($1 ר�ָב�ָטן)',
 'noimages'              => 'נישט� קיין בילדער.',
 'ilsubmit'              => 'זוכן',
@@ -1889,22 +2110,23 @@ $NEWPAGE
 'monthsall'        => '�לע',
 
 # E-mail address confirmation
-'confirmemail'            => 'ב�שטעטיגט �ייער �ימעיל �דרעס',
-'confirmemail_noemail'    => '�יר ה�ט נישט קיין ריכטיגע �ימעיל �דרעס �ויפגעסעט �ין �ייער[[Special:Preferences|ב�נוצער פרעפערעצן]].',
+'confirmemail'            => 'ב�ַשטעטיקט בליצפּ�ָסט �ַדרעס',
+'confirmemail_noemail'    => '�יר ה�ט נישט קיין גוטן בליצבריוו �ַדרעס �ין �ײַער [[Special:Preferences|ב�ניצער פרעפֿערענצן]].',
 'confirmemail_text'       => 'די וויקי פ�רל�נגט �ז �יר ז�לט ב�שטעטיגן �ייער בליצפ�סט �דרעס �יידער �יר ב�ניצט זיך מיט דער ע-פ�סט ב�דינסט. דרוקט �ויפן קנעפל �ונטן כדי צו שיקן � ב�שטעטיגונג ק�ד צו �ייער �דרעס. ל�דט �ן דע� לינק �ין �ייער בלעטערער צו ב�שטעטיגן �ז �ייער �דרעס �יז גילטיג.',
 'confirmemail_pending'    => '<div class="error">�ימעיל ב�שטעטיגונג ק�וד �יז שוין געשיקט געוו�רן צו �ייך; �ויב ה�ט �יר לעצטענס ב�ש�פן �ן �ק�ונט, עס מעגליך �ז �יר ברויכט וו�רטן � פ�ר סעקונדעס �דער מינוט ביז ד�ס דערגרייכט �ייך ווי �יידער צו בעטן � נייע ק�וד.</div>',
-'confirmemail_send'       => 'שיק � ב�שטעטיגונג ק�וד',
-'confirmemail_sent'       => 'ב�שטעטיגונג ק�וד �ימעיל געשיקט.',
+'confirmemail_send'       => 'שיקט ב�ַשטעטיקונג ק�ד',
+'confirmemail_sent'       => 'ב�שטעטיקונג בליצברװ געשיקט.',
 'confirmemail_oncreate'   => 'ב�שטעטיגונג ק�וד �יז געשיקט געוו�רן צו �ייער �ימעיל �דרעס. די ק�וד פ�רל�נגט זיך נישט �ויף צו קענען �ריין, �בער �יר וועט עס ד�רפן דערל�נגן �ויף זיך צו קענען ב�נוצען מיט �ימעיל ב�זירטע פיטשערס �ין די וויקי.',
 'confirmemail_sendfailed' => '{{SITENAME}} ה�ט נישט געקענט שיקן �ייך די ב�שטעטיגונג ק�ד. ביטע טוט ק�נטר�לירן �ייער �דרעס �ויב עס ה�ט נישט קיין טעות.
 
 ע-פ�סט צוריגעקערט: $1',
-'confirmemail_invalid'    => 'נישט קיין גוטע ק�נפירימ�ציע ק�וד. עס ה�ט מעגליך עקפייערט.',
+'confirmemail_invalid'    => 'נישט קיין גוטער ב�ַשטעטיקן ק�ָד. ער �יז מעגליך �ויסגעג�ַנגען.',
 'confirmemail_needlogin'  => 'ברויכט �יר דורכפירן $1 כדי צו ב�שטעטיגן �ייער �ימעיל �דרעס.',
-'confirmemail_success'    => '�ייער �ימעיל �דרעס �יז ב�שטעטיגט. �יר קענט �יצט �ריין �ין �ייער �ק�ונט �ון הנ�ה ה�בן פון די וויקי.',
+'confirmemail_success'    => '�ײַער בליצפּ�ָסט �ַדרעס �יז ב�ַשטעטיקט געװ�ָרן. 
+�יר קענט �יצט [[Special:UserLogin|�ַרײַנל�גירן]] �ון הנ�ה ה�ָבן פֿון דער וויקי.',
 'confirmemail_loggedin'   => '�ייער �ימעיל �דרעס �יז �יצט געוו�רען ב�שטעטיגט.',
-'confirmemail_error'      => 'עפעס �יז געג�נגען שלעכט מיט סעיוון �ייער ק�נפירימ�ציע.',
-'confirmemail_subject'    => 'ב�שטעטיגונג ק�וד �ימעיל פון{{grammar:תחילית|{{SITENAME}}}}',
+'confirmemail_error'      => 'עפעס �יז געג�נגען שלעכט מיט �ָפּהיטן �ײַער ב�ַשטעטיקונג.',
+'confirmemail_subject'    => '{{SITENAME}} בליצבריװ �דרעס ב�ַשטעטיקונג',
 'confirmemail_body'       => 'עמעצער, וו�רשיינליך �יר (פון �יי פי �דרעס: $1), ה�ט �יינגעשריבן די קונטע: "$2" מיט �ט דע� בליצפ�סט �דרעס �ויף {{SITENAME}}.
 
 כדי זיכער מ�כן �ז די קונטע געהערט ט�קע צו �ייך, ביטע טוט עפענען דע� לינק �ין די �ייער בלעטערער:
@@ -1925,13 +2147,8 @@ $5
 'recreate'            => 'ש�ַפֿן פֿונד�סניי',
 
 # action=purge
-'confirm_purge'        => '�ויסקל�רן די ק�שעי פון דע� בל�ט?
-
-$1',
 'confirm_purge_button' => '�ויקעי',
-
-# AJAX search
-'articletitles' => "זוכט בלעטער וו�ס הייבן זיך �ן מיט '''$1'''",
+'confirm-purge-top'    => '�ויסקל�רן די ק�שעי פון דע� בל�ט?',
 
 # Multipage image navigation
 'imgmultigo'   => 'גייט!',
diff --git a/languages/messages/MessagesYo.php b/languages/messages/MessagesYo.php
index 6080ebb2..db26c234 100644
--- a/languages/messages/MessagesYo.php
+++ b/languages/messages/MessagesYo.php
@@ -9,6 +9,25 @@
  * @author Urhixidur
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Amóhùnmáwòrán',
+	NS_SPECIAL          => 'Pàtàkì',
+	NS_TALK             => 'Ọ̀r�̀',
+	NS_USER             => 'Oníṣe',
+	NS_USER_TALK        => 'Ọ̀r�̀_oníṣe',
+	NS_PROJECT_TALK     => 'Ọ̀r�̀_$1',
+	NS_FILE             => 'Àwòrán',
+	NS_FILE_TALK        => 'Ọ̀r�̀_àwòrán',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Ọ̀r�̀_mediaWiki',
+	NS_TEMPLATE         => 'Àdàk�',
+	NS_TEMPLATE_TALK    => 'Ọ̀r�̀_àdàk�',
+	NS_HELP             => 'Ìrànl��w��',
+	NS_HELP_TALK        => 'Ọ̀r�̀_ìrànl��w��',
+	NS_CATEGORY         => 'Ẹ̀ka',
+	NS_CATEGORY_TALK    => 'Ọ̀r�̀_ẹ̀ka',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'            => 'Fàlàsí àw�n ijáp�̀:',
@@ -40,8 +59,6 @@ $messages = array(
 
 'underline-always' => 'Nígbà gbogbo',
 
-'skinpreview' => '(Àyẹ̀wò)',
-
 # Dates
 'sunday'        => 'Ọj��àìkú',
 'monday'        => 'Ọj��ajé',
@@ -109,6 +126,7 @@ $messages = array(
 'newwindow'      => '(yíò sí nínú fèrèsè tuntun)',
 'cancel'         => "Fa'gilé",
 'qbfind'         => 'Wá rí',
+'qbbrowse'       => 'Ìṣíwò',
 'qbedit'         => 'Àtúnṣe',
 'qbpageoptions'  => 'Ojúewé yi',
 'qbmyoptions'    => 'Àw�n ojúewé mi',
@@ -118,7 +136,7 @@ $messages = array(
 'mytalk'         => 'Ọ̀r�̀ mi',
 'anontalk'       => 'Ọ̀r�̀ fún IP yí',
 'navigation'     => 'At��ka',
-'and'            => 'àti',
+'and'            => '&#32;àti',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -180,8 +198,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Nípa {{SITENAME}}',
 'aboutpage'            => 'Project:Nípa',
-'bugreports'           => 'Ìjáb�̀ àsìṣe',
-'bugreportspage'       => 'Project:Ìjáb�̀ àsìṣe',
 'copyright'            => 'Gbogbo ohun inú ibí yi wà lábẹ�  $1.',
 'copyrightpagename'    => '{{SITENAME}} ẹ̀t��àwòk�',
 'copyrightpage'        => '{{ns:project}}:Ẹ̀t��àwòko',
@@ -194,6 +210,7 @@ $messages = array(
 'helppage'             => 'Help:Àwon ohunnú',
 'mainpage'             => 'Ojúewé Àk��k��',
 'mainpage-description' => 'Ojúewé Àk��k��',
+'policy-url'           => 'Project:Ètò',
 'portal'               => 'Èbúté àwùj�',
 'portal-url'           => 'Project:Èbúté Àwùj�',
 'privacy'              => 'Ètò àbò',
@@ -210,6 +227,7 @@ $messages = array(
 'editsection'             => "s'àtúnṣe",
 'editold'                 => "s'àtúnṣe",
 'viewsourceold'           => 'wo àmì�̀r�̀',
+'editlink'                => 'àtúnṣe',
 'editsectionhint'         => 'Abala àtúnṣe: $1',
 'toc'                     => 'Ohunnú',
 'showtoc'                 => 'fihàn',
@@ -227,7 +245,7 @@ $messages = array(
 'nstab-main'      => 'Ày�kà',
 'nstab-user'      => 'Ojúewé oníṣe',
 'nstab-media'     => 'Ojúewé amóhùnmáwòrán',
-'nstab-special'   => 'Pàtàkì',
+'nstab-special'   => 'Ojúewé pàtàkì',
 'nstab-project'   => 'Ojúewé iṣẹ��w��',
 'nstab-image'     => 'Faili',
 'nstab-mediawiki' => 'Ìf�̀r�̀ránsẹ',
@@ -265,7 +283,7 @@ $messages = array(
 
 # Login and logout pages
 'logouttitle'               => 'Ib�sóde oníṣe',
-'logouttext'                => "<strong>Ẹ ti b��s��de.</strong>
+'logouttext'                => "'''Ẹ ti b��s��de.'''
 
 Ẹ le tẹ̀síwájú sí ní lo {{SITENAME}} láìmorúk� yín, tàbí kí ẹ [[Special:UserLogin|padà w�lé]] bí ẹnikanan tàbí ẹlòmíràn.
 Àkíyèsí wípé àw�n ojúewé kan le hàn b'ígbà tójẹ�pé ẹ sì w�lé títí tí ẹ ó fi j�̀w�� àdìmú (cache) browser yín.",
@@ -278,7 +296,6 @@ A ti fi orúk� yín s'ílẹ̀. Ẹ m�� gbàgbé l'áti s'àtúnṣe àw�
 'yourpasswordagain'         => 'Tẹkík� �̀r�̀ìpam�� lẹ�ẹ̀kansí:',
 'remembermypassword'        => "Sè'rántí �̀r�̀ìpamí mi lórí k�mputa yi (cookies)",
 'yourdomainname'            => 'Domain yín:',
-'loginproblem'              => '<b>Ẹ ní ìṣòro láti w�lé.</b><br />Ẹ gbìyànjú lẹ�kan sí!',
 'login'                     => 'Ìw�lé',
 'nav-login-createaccount'   => 'Ìw�lé / Ìforúk� sílẹ̀',
 'loginprompt'               => 'Ẹ gb��d�̀ j�̀w�� cookies láti w�lé sí {{SITENAME}}.',
@@ -300,7 +317,7 @@ A ti fi orúk� yín s'ílẹ̀. Ẹ m�� gbàgbé l'áti s'àtúnṣe àw�
 'yourlanguage'              => 'Èdè:',
 'yournick'                  => 'Ìt�w��b�̀:',
 'badsiglength'              => 'Ìt�w��b�̀ yín ti gùnjù.
-Kò gbod�̀ ju {{PLURAL:$1|àmìlẹ�tà|àw�n àmìlẹ�tà}} $1 l�.',
+Kò gbod�̀ ju $1 {{PLURAL:$1|àmìlẹ�tà|àw�n àmìlẹ�tà}} l�.',
 'email'                     => 'E-mail',
 'prefs-help-realname'       => 'Orúk� gangan kò p�ndandan.
 Tí ẹ bá fisílẹ̀ a ó lòó láti tóka iṣẹ� yín fún yín.',
@@ -322,11 +339,19 @@ Tí ẹ bá fisílẹ̀ a ó lòó láti tóka iṣẹ� yín fún yín.',
 Kò gb��d�̀ dín ju {{PLURAL:$1|àmìlẹ�tà kan|àmìlẹ�tà $1}} l�, kí ó sì yàt�̀ sí orík�oníṣe yín.',
 'mailmypassword'            => 'Ọ̀r�̀ìpam�� tuntun sí e-mail',
 'passwordremindertitle'     => 'Ọ̀r�̀ìpam�� tuntun fún ìgbà díẹ̀ fún {{SITENAME}}',
+'passwordremindertext'      => 'Ẹnìkan (ó ṣe é ṣe kó jẹ� ẹ̀yin gan, láti ojú�̀ná IP $1) bèrè fún 
+�̀r�̀ìpam�� tuntun fùn {{SITENAME}} ($4). A ti ṣ\'èdá �̀r�̀ìpam�� ìgbádíẹ̀ fún
+oníṣe "$2" bẹ� ẹ̀ sì ni a ti ṣ\'ètò rẹ̀ sí "$3". Tó bá jẹ� pé èrò yín nuhun, ẹ gbúd�̀ w�lé 
+kí ẹ yan �̀r�̀ìpam�� tuntun ní ìsinsìnyí.
+
+Tó bá jẹ� pé ẹlòmíràn ni ò ṣe ìt�r� yìí, tábí pé ẹ ti rántí �̀r�̀ìpam�� yín,
+tí ẹ kò sì fẹ� yípadà m��, ẹ m�� k�biara sí ìránṣẹ� yìí.',
 'noemail'                   => 'Kò sí àk�sílẹ̀ ojú�̀nà e-mail fún oníṣe "$1".',
 'passwordsent'              => 'A ti fi �̀r�̀ìpam�� tuntun ránṣẹ� sí ojú�̀nà e-mail tí a fisílẹ̀ fún "$1".
 Ẹ j�̀w�� ẹ padà w�lé tí ẹ bá ti gbàá.',
 'eauthentsent'              => 'A ti fi e-mail ìmúdájú ránṣẹ� sí ojú�̀nà e-mail tí ẹ fi sílẹ̀.
 Kí á tó fi e-mail mìíràn ránṣẹ� sí àpam�� yìí, ẹ gb��d�̀ tẹ̀lé àw�n ìlànà inú e-mail �̀ún, láti fidájú pé àpam�� �̀ún jẹ� ti yín lóòót��.',
+'emailauthenticated'        => 'Ojú�̀nà e-mail yín fidájú ní ago $3 �j�� $2.',
 'emailconfirmlink'          => 'Ẹ ṣe ìmúdájú ojú�̀nà e-mail yín',
 'accountcreated'            => 'Ẹ ti fi orúk� sílẹ̀',
 'accountcreatedtext'        => "A ti ṣ'èdá àpam�� oniṣe fún $1.",
@@ -334,8 +359,11 @@ Kí á tó fi e-mail mìíràn ránṣẹÌ� sí àpamá»�Ì� yìí, ẹ gbá»�Ì�dá»
 'loginlanguagelabel'        => 'Èdè: $1',
 
 # Password reset dialog
-'resetpass'         => 'Àtúntò �̀r�̀ìpam�� àpam��',
-'resetpass_header'  => 'Àtúntò �̀r�̀ìpam��',
+'resetpass'         => 'Àyípadà �̀r�̀ìpam��',
+'resetpass_header'  => "Ẹ ṣ'àyípadà �̀r�̀ìpam��",
+'oldpassword'       => 'Ọ̀r�̀ìpam�� titẹ�lẹ̀:',
+'newpassword'       => 'Ọ̀r�̀ìpam�� tuntun:',
+'retypenew'         => 'Àtúntẹ̀ �̀r�̀ìpam�� tuntun:',
 'resetpass_success' => 'Ìyípadà �̀r�̀ìpam�� yín ti já sí rere! Ẹ̀ ún w�lé l��w��...',
 
 # Edit page toolbar
@@ -359,8 +387,8 @@ Kí á tó fi e-mail mìíràn ránṣẹÌ� sí àpamá»�Ì� yìí, ẹ gbá»�Ì�dá»
 'hr_tip'          => 'Ìlà gb�l�j� (ẹ l�̀�� pẹ̀lú àkíyèsì)',
 
 # Edit pages
-'summary'                => 'Àkótán',
-'subject'                => 'Orí �̀r�̀/àk�lé',
+'summary'                => 'Àkótán:',
+'subject'                => 'Orí �̀r�̀/àk�lé:',
 'minoredit'              => 'Àtúnṣe kékeré nìyí',
 'watchthis'              => "M'ójútó ojúewé yìí",
 'savearticle'            => 'Ẹ fi pam��',
@@ -369,7 +397,7 @@ Kí á tó fi e-mail mìíràn ránṣẹÌ� sí àpamá»�Ì� yìí, ẹ gbá»�Ì�dá»
 'showdiff'               => 'Àfihàn àw�n àyípadà',
 'anoneditwarning'        => "'''Ìkìl�̀:''' Ẹ ò tíì w�lé.
 � ṣe àk�sílẹ̀ ojú�̀nà IP yín ninu ìwé àtúnṣe ojúewé yìí.",
-'summary-preview'        => 'Àyẹ̀wò àkótán',
+'summary-preview'        => 'Àyẹ̀wò àkótán:',
 'blockedtitle'           => 'Ìdènà sí oníṣe',
 'blockedtext'            => "<big>'''A ti dínà orúk� oníṣe tàbí ojú�̀nà IP yín.'''</big>
 
@@ -398,22 +426,22 @@ Ojú�̀nà IP yín l��w��l��w�� ni $3, bẹ� ẹ̀ sì ni ID fún
 Láti dá ojúewé yí ẹ bẹ̀rẹ̀ síní tẹ�k� sí inú àpótí ìsàlẹ̀ yí (ẹ wo [[{{MediaWiki:Helppage}}|ojúewé ìrànl��w�� ]] fun ẹ̀kúnrẹ�rẹ� ).
 T'óbá sepé àsìse ló gbé yin dé bi, ẹ k�n b��tìnì ìpadàsẹ�yìn.",
 'noarticletext'          => "L��w��l��w�� kò sí ìk� nínú ojúewé yìí, ẹ le [[Special:Search/{{PAGENAME}}|s'àwáarí fún àk�lé ojúewé yìí]] nínú àw�n ojúewé mìíràn tàbí [{{fullurl:{{FULLPAGENAME}}|action=edit}} kí ẹ ṣ'àtúnṣe ojúewé òún].",
-'note'                   => '<strong>Àkíyèsí:</strong>',
-'previewnote'            => '<strong>Àyẹ̀wò kan ni èyí;
-àw�n àtúnṣe kò tíì pam��!</strong>',
-'session_fail_preview'   => '<strong>Àforíjìn! A kò le gbésẹ̀ àtúnṣe yín nítorí ìpòfo data ìsinsìyí.
+'note'                   => "'''Àkíyèsí:'''",
+'previewnote'            => "'''Àyẹ̀wò kan ni èyí;
+àw�n àtúnṣe kò tíì pam��!'''",
+'session_fail_preview'   => "'''Àforíjìn! A kò le gbésẹ̀ àtúnṣe yín nítorí ìpòfo data ìsinsìyí.
 Ẹ j�̀w�� ẹ gbìyànjú lẹ�ẹ̀kan si.
-Tí kò bá sì tún ṣiṣẹ�, ẹ gbìyànjú láti [[Special:UserLogout|b�̀sòde]] kí ẹ sì padá w�lé.</strong>',
+Tí kò bá sì tún ṣiṣẹ�, ẹ gbìyànjú láti [[Special:UserLogout|b�̀sòde]] kí ẹ sì padá w�lé.'''",
 'editing'                => 'Àtúnṣe sí $1',
 'editingsection'         => 'Àtúnṣe sí $1 (abala)',
 'yourdiff'               => 'Àw�n ìyàt�̀',
-'copyrightwarning'       => 'Ẹ j�̀w�� ẹ kíyèsi wípé gbogbo àw�n àfikún sí {{SITENAME}} jẹ� bẹ̀ lábẹ�  $2 (Ẹ wo $1 fún ẹkunrẹrẹ).
+'copyrightwarning'       => "Ẹ j�̀w�� ẹ kíyèsi wípé gbogbo àw�n àfikún sí {{SITENAME}} jẹ� bẹ̀ lábẹ�  $2 (Ẹ wo $1 fún ẹkunrẹrẹ).
 Tí ẹ kò bá fẹ� kí ìk���lẹ̀ yín ó jẹ� títúnṣe tàbí kì ó jẹ� pípìn kiri l��ná tí kò wù yín, ẹ m�� mù wá síbí.<br />
 Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín, tàbí ẹ wòók� láti agbègbè ìgboro tàbí irú ìtìlẹ�yín �̀fẹ� bíi bẹ�ẹ̀.
-<strong>Ẹ MỌ� MÚ IṢẸ� TÓ N� Ẹ̀TỌ�ÀWÒKỌ S�LẸ̀ L�Ì GBÀṢẸ!</strong>',
-'longpagewarning'        => "<strong>ÌKILỌ̀: Ojúewé yìí jẹ� $1 kilobytes ní gúngùn;
+'''Ẹ MỌ� MÚ IṢẸ� TÓ N� Ẹ̀TỌ�ÀWÒKỌ S�LẸ̀ L�Ì GBÀṢẸ!'''",
+'longpagewarning'        => "'''ÌKILỌ̀: Ojúewé yìí jẹ� $1 kilobytes ní gúngùn;
 àw�n browsers míràn le è ní ṣòro láti ṣ'àtúnṣe àw�n ojúewé tó tó tàbí tògùnju 32 kb l�.
-Ẹ j�̀w�� ẹ rò ó wò bóyá ẹ lè f�� ojúewé �̀ún sí abala kéékèké.</strong>",
+Ẹ j�̀w�� ẹ rò ó wò bóyá ẹ lè f�� ojúewé �̀ún sí abala kéékèké.'''",
 'templatesused'          => 'Àw�n àdàk� tí a lò lórí ojúewé yìí:',
 'templatesusedpreview'   => 'Àw�n àdàk� tí a lò nìnú àgbéyẹ�wò yìí:',
 'template-protected'     => '(aláàbò)',
@@ -429,22 +457,23 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'cantcreateaccounttitle' => 'Ìforúk�sílẹ̀ kò se é se',
 
 # History pages
-'viewpagelogs'        => 'Ẹ wo àk�sílẹ̀ fún ojúewé yìí',
-'currentrev'          => 'Àtúnyẹ̀wò ìsinsìnyí',
-'revisionasof'        => 'Àtúnyẹ̀wò ní $1',
-'revision-info'       => "Àtúnyẹ̀wò ní $1 l'át�w�� $2",
-'previousrevision'    => '� Àtúnyẹ̀wò tópẹ�ju',
-'nextrevision'        => 'Àtúnyẹ̀wò tótuntunju →',
-'currentrevisionlink' => 'Àtúnyẹ̀wò ìsinsìnyí',
-'cur'                 => 'l��w��',
-'next'                => 'tókàn',
-'last'                => 'tẹ�lẹ̀',
-'page_first'          => 'àk��k��',
-'page_last'           => 'tógbẹ̀yìn',
-'deletedrev'          => '[tiparẹ�]',
-'histfirst'           => 'Pípẹ�jùl�',
-'histlast'            => 'Tuntunjùl�',
-'historyempty'        => '(òfo)',
+'viewpagelogs'           => 'Ẹ wo àk�sílẹ̀ fún ojúewé yìí',
+'currentrev'             => 'Àtúnyẹ̀wò ìsinsìnyí',
+'revisionasof'           => 'Àtúnyẹ̀wò ní $1',
+'revision-info'          => "Àtúnyẹ̀wò ní $1 l'át�w�� $2", # Additionally available: $3: revision id
+'previousrevision'       => '� Àtúnyẹ̀wò tópẹ�ju',
+'nextrevision'           => 'Àtúnyẹ̀wò tótuntunju →',
+'currentrevisionlink'    => 'Àtúnyẹ̀wò ìsinsìnyí',
+'cur'                    => 'l��w��',
+'next'                   => 'tókàn',
+'last'                   => 'tẹ�lẹ̀',
+'page_first'             => 'àk��k��',
+'page_last'              => 'tógbẹ̀yìn',
+'history-fieldset-title' => 'Ìtàn Ìṣíwò',
+'deletedrev'             => '[tiparẹ�]',
+'histfirst'              => 'Pípẹ�jùl�',
+'histlast'               => 'Tuntunjùl�',
+'historyempty'           => '(òfo)',
 
 # Revision feed
 'history-feed-title'          => 'Ìtàn àtúnyẹ̀wò',
@@ -464,10 +493,12 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'lineno'                  => 'Ìlà $1:',
 'compareselectedversions' => 'Ìfiwéra àw�n àtúnṣe ìṣàyàn',
 'editundo'                => 'dápadà',
+'diff-movedto'            => 'tiyípò sí $1',
 
 # Search results
 'searchresults'         => 'Àw�n èsì àwáàrí',
-'searchsubtitle'        => 'Ẹ ṣ\'àwáàrí fun \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|gbogbo ojúewé tó bẹ̀rẹ̀ pẹ̀lu "$1"]] | [[Special:WhatLinksHere/$1|gbogbo ojúewé tó jáp�̀ m�� "$1"]])',
+'searchresults-title'   => 'Àw�n èsì àwáàrí fún "$1"',
+'searchsubtitle'        => 'Ẹ ṣ\'àwáàrí fun \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|gbogbo ojúewé tó bẹ̀rẹ̀ pẹ̀lu "$1"]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|gbogbo ojúewé tó jáp�̀ m�� "$1"]])',
 'searchsubtitleinvalid' => "Ẹ ṣ'àwáàrí fun '''$1'''",
 'noexactmatch'          => "'''Kò sí ojúewé pẹ̀lú àk�lé \"\$1\".'''
 Ẹ le [[:\$1|ṣ'èdá ojúewé yìí]].",
@@ -475,6 +506,7 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'prevn'                 => 'titẹ�lẹ̀ $1',
 'nextn'                 => 'tókàn $1',
 'viewprevnext'          => 'Ẹ wo ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:Àwon ohunnú',
 'search-relatedarticle' => 'Tóbáramu',
 'searchrelated'         => 'tóbáramu',
 'searchall'             => 'gbogbo',
@@ -501,18 +533,18 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'prefs-watchlist-days' => 'Ọj�� láti fihàn nínú ìmójútó:',
 'saveprefs'            => 'Ìfipam��',
 'resetprefs'           => 'Palẹ̀m�� àw�n àtúnṣe tí kò sì ní ìpam��',
-'oldpassword'          => 'Ọ̀r�̀ìpam�� titẹ�lẹ̀:',
-'newpassword'          => 'Ọ̀r�̀ìpam�� tuntun:',
-'retypenew'            => 'Àtúntẹ̀ �̀r�̀ìpam�� tuntun:',
 'searchresultshead'    => 'Àwáàrí',
 'savedprefs'           => 'Àw�n ìfẹ�ràn yín ti wà nípam��.',
+'localtime'            => 'Àkókò ìbílẹ̀:',
 'prefs-searchoptions'  => 'Àw�n ìyàn àwáàrí',
 'prefs-namespaces'     => 'Àw�n orúk�àyè',
 'files'                => 'Àw�n faili',
 
 # Groups
 'group'               => 'Àkój�p�̀:',
+'group-user'          => 'Àw�n oníṣe',
 'group-autoconfirmed' => 'Àw�n oníṣe ìmúdájú fúnraw�n',
+'group-bot'           => 'Àw�n Bot',
 'group-sysop'         => 'Àw�n alámùójútó',
 
 'grouppage-user'          => '{{ns:project}}:Àw�n oníṣe',
@@ -572,12 +604,12 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'minlength1'        => 'Ó kéréjù àw�n orúk� faili gb�d�̀ jẹ� lẹ�tà kan.',
 'uploadedimage'     => 'ti ru "[[$1]]" s\'ókè',
 
-# Special:ImageList
-'imagelist'      => 'Àkój� faili',
-'imagelist_name' => 'Orúk�',
-'imagelist_user' => 'Oníṣe',
+# Special:ListFiles
+'listfiles'      => 'Àkój� faili',
+'listfiles_name' => 'Orúk�',
+'listfiles_user' => 'Oníṣe',
 
-# Image description page
+# File description page
 'filehist'                  => 'Ìtàn faili',
 'filehist-help'             => 'Ẹ kan �j��/àsìkò kan láti wo faili òún bó ṣe hàn ní ìgbà na.',
 'filehist-current'          => 'l��w��',
@@ -608,10 +640,11 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 # Unused templates
 'unusedtemplates' => 'Àdàk� àìlò',
 
+# Random page
+'randompage' => 'Ojúewé àrìnàkò',
+
 # Statistics
 'statistics' => 'Àw�n statistiki',
-'sitestats'  => 'Àw�n statistiki {{SITENAME}}',
-'userstats'  => 'Àw�n statistiki oníṣe',
 
 'disambiguations' => 'Àw�n ojúewé ìpíns��t�̀',
 
@@ -658,6 +691,9 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'move'                    => 'Yípò',
 'movethispage'            => 'Yípò ojúewé yìí',
 
+# Book sources
+'booksources' => 'Àw�n ibi ìwẹ�',
+
 # Special:Log
 'specialloguserlabel'  => 'Oníṣe:',
 'speciallogtitlelabel' => 'Àk�lé:',
@@ -688,23 +724,20 @@ Bákannà ẹ tún ṣèlérí fún wa wípé ẹ̀yin lẹk�� fúnra arayín
 'emailsend'    => 'Firánṣẹ�',
 
 # Watchlist
-'watchlist'            => 'Ìmójútó mi',
-'mywatchlist'          => 'Ìmójútó mi',
-'watchlistfor'         => "(fún '''$1''')",
-'addedwatch'           => 'Ti fikún sí ìmójútó',
-'addedwatchtext'       => "A ti ṣ'àfikún \"[[:\$1]]\" sí [[Special:Watchlist|ìmójútó]] yín.
+'watchlist'         => 'Ìmójútó mi',
+'mywatchlist'       => 'Ìmójútó mi',
+'watchlistfor'      => "(fún '''$1''')",
+'addedwatch'        => 'Ti fikún sí ìmójútó',
+'addedwatchtext'    => "A ti ṣ'àfikún \"[[:\$1]]\" sí [[Special:Watchlist|ìmójútó]] yín.
 A óò ṣ'àkój� àw�n àtúnṣe �j��wajú sí ojúewé yìí àti ojúewé �̀r�̀ rẹ̀ sí bẹ̀. Bákanáà ojúewé náà yíò hàn '''kedere''' nìnú [[Special:RecentChanges|àkój� àw�n àtúnṣe tuntun]] kó le ba à r�rùn láti rí.",
-'removedwatch'         => 'Ti mú kúrò nínú ìmójútó',
-'removedwatchtext'     => 'A ti y� ojúewé "[[:$1]]" kúrò nínú [[Special:Watchlist|ìmójútó yín]].',
-'watch'                => "M'ójútó",
-'watchthispage'        => "M'ójútó ojúewé yi",
-'unwatch'              => "Já'w�� ìmójútó",
-'unwatchthispage'      => "Já'w�� ìmójútó ojúewé yi",
-'watchlist-details'    => '{{PLURAL:$1|Ojúewé $1|Àw�n ojúewé $1}} ló wà nínú ìmójútó yín, tí a kò bá ka àw�n ojúewé �̀r�̀.',
-'wlshowlast'           => '�fihàn wákàtí $1 sẹ�yìn �j�� $2 sẹ�yìn $3',
-'watchlist-hide-bots'  => 'Ìbòm��lẹ̀ àw�n àtúnṣe bot',
-'watchlist-hide-own'   => 'Ìbòm��lẹ̀ àw�n àtúnṣe mi',
-'watchlist-hide-minor' => 'Ìbòm��lẹ̀ àw�n àtúnṣe kékéèké',
+'removedwatch'      => 'Ti mú kúrò nínú ìmójútó',
+'removedwatchtext'  => 'A ti y� ojúewé "[[:$1]]" kúrò nínú [[Special:Watchlist|ìmójútó yín]].',
+'watch'             => "M'ójútó",
+'watchthispage'     => "M'ójútó ojúewé yi",
+'unwatch'           => "Já'w�� ìmójútó",
+'unwatchthispage'   => "Já'w�� ìmójútó ojúewé yi",
+'watchlist-details' => '{{PLURAL:$1|Ojúewé $1|Àw�n ojúewé $1}} ló wà nínú ìmójútó yín, tí a kò bá ka àw�n ojúewé �̀r�̀.',
+'wlshowlast'        => '�fihàn wákàtí $1 sẹ�yìn �j�� $2 sẹ�yìn $3',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => 'Ún mójútó...',
@@ -715,33 +748,38 @@ A óò ṣ'àkój� àw�n àtúnṣe �j��wajú sí ojúewé yìí àti o
 'created'                      => 'tiṣèdá',
 'enotif_subject'               => '$PAGEEDITOR $CHANGEDORCREATED ojúewé $PAGETITLE lórí {{SITENAME}}',
 
-# Delete/protect/revert
-'deletepage'                  => 'Pa ojúewé rẹ�',
-'historywarning'              => 'Ìkìl�̀: Ojúewé tí ẹ fẹ� parẹ� ní ìtàn:',
-'actioncomplete'              => 'Ìmúṣe ti parí',
-'deletedtext'                 => 'A ti pa "<nowiki>$1</nowiki>" rẹ�.
+# Delete
+'deletepage'            => 'Pa ojúewé rẹ�',
+'historywarning'        => 'Ìkìl�̀: Ojúewé tí ẹ fẹ� parẹ� ní ìtàn:',
+'actioncomplete'        => 'Ìmúṣe ti parí',
+'deletedtext'           => 'A ti pa "<nowiki>$1</nowiki>" rẹ�.
 Ẹ wo $2 fún àk���lẹ̀ àw�n ìparẹ� àìpẹ�.',
-'deletedarticle'              => 'A ti pa "[[$1]]" rẹ�',
-'dellogpage'                  => 'Àk�sílẹ̀ ìparẹ�',
-'deletecomment'               => 'Ìdí fún ìparẹ�:',
-'deleteotherreason'           => 'Àw�n ìdí mìíràn:',
-'deletereasonotherlist'       => 'Ìdí mìíràn',
-'rollbacklink'                => 'yísẹ�yìn',
+'deletedarticle'        => 'A ti pa "[[$1]]" rẹ�',
+'dellogpage'            => 'Àk�sílẹ̀ ìparẹ�',
+'deletecomment'         => 'Ìdí fún ìparẹ�:',
+'deleteotherreason'     => 'Àw�n ìdí mìíràn:',
+'deletereasonotherlist' => 'Ìdí mìíràn',
+
+# Rollback
+'rollbacklink' => 'yísẹ�yìn',
+
+# Protect
 'protectlogpage'              => 'Àk�sílẹ̀ àbò',
 'protectcomment'              => 'Àríwí:',
 'protectexpiry'               => 'Ìparí:',
 'protect_expiry_invalid'      => 'Àkókò ìparí kò ní ìbámu.',
 'protect_expiry_old'          => 'Ìgbà tó ti k�já ni ìparí.',
 'protect-unchain'             => 'Ṣíṣí ìy�̀nda láti yípò',
-'protect-text'                => "Ẹ lè wo, bẹ� ẹ̀ sìni ẹ lè ṣ'àtúnṣe ibi àbò níbí fún ojúewé <strong><nowiki>$1</nowiki></strong>.",
+'protect-text'                => "Ẹ lè wo, bẹ� ẹ̀ sìni ẹ lè ṣ'àtúnṣe ibi àbò níbí fún ojúewé '''<nowiki>$1</nowiki>'''.",
 'protect-locked-access'       => "Àpam�� yín kò ní àyè láti ṣ'àtúnṣe àw�n ibi àbò.
-Bí a ṣe to ojúewé <strong>$1</strong> nì yí:",
+Bí a ṣe to ojúewé '''$1''' nì yí:",
 'protect-default'             => '(ìbáwá)',
 'protect-fallback'            => 'Ìy�̀nda "$1" p�n dandan',
 'protect-level-autoconfirmed' => 'Dínà àw�n oníṣe tíkòforúk� sílẹ�',
 'protect-level-sysop'         => 'Alámùójútó nìkan',
 'protect-expiring'            => 'parí ní $1 (UTC)',
 'protect-cantedit'            => "Ẹ kò le è ṣe àyípadà ibi àbò ojúewé yìí, nítorípé a kò y�̀nda yín láti ṣ'àtúnṣe rẹ̀.",
+'protect-expiry-options'      => 'wákàtí 2:2 hours,�j�� 1:1 day,�j�� 3:3 days,�̀ṣẹ̀ 1:1 week,�̀ṣẹ̀ 2:2 weeks,osù 1:1 month,osù 3:3 months,osù 6:6 months,�dún 1:1 year,láìlópin:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Ìy�̀nda:',
 'restriction-level'           => 'Ibi ìpàlà:',
 
@@ -761,8 +799,10 @@ Bí a ṣe to ojúewé <strong>$1</strong> nì yí:",
 'month'         => 'Láti osù (àti sẹ�yìn):',
 'year'          => 'Láti �dún (àti sẹ�yìn):',
 
+'sp-contributions-newbies'     => 'Àfihàn àw�n àfikún àw�n àpam�� tuntun nìkan',
 'sp-contributions-newbies-sub' => 'Fún àw�n àpam�� tuntun',
 'sp-contributions-blocklog'    => 'Àk�sílẹ̀ ìdínà',
+'sp-contributions-search'      => 'Àwáàrí fún àw�n àfikún',
 'sp-contributions-username'    => 'Ojú�̀nà IP tàbí orúk� oníṣe:',
 
 # What links here
@@ -791,12 +831,17 @@ Bí a ṣe to ojúewé <strong>$1</strong> nì yí:",
 # Move page
 'move-page'        => 'Yípò $1',
 'move-page-legend' => 'Yípò ojúewé',
+'movepagetalktext' => "Ojúewé �̀r�̀ tó sop�̀ m� náà yíó yípò p�̀ m� '''àfibí:'''
+*Tí �̀r�̀ ojúewé tí kò jẹ� òfo wà pẹ̀lú orúk� tuntun, tàbí
+*Ẹ mú àmí kúrò nínú àpótí ìṣàlẹ̀ yìí.
+
+Tí ó bá jẹ� báhun, ẹ gbúd�̀ ṣe ìyípò rẹ̀ fúnra yín.",
 'movearticle'      => 'Yípò ojúewé:',
 'newtitle'         => 'Sí àk�lé tuntun:',
 'move-watch'       => 'Mójútó ojúewé yìí',
 'movepagebtn'      => 'Yípò ojúewé',
 'pagemovedsub'     => 'Ìyípò ti já sí rere',
-'movepage-moved'   => '<big>\'\'\'"$1" ti yípò sí "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved'   => '<big>\'\'\'"$1" ti yípò sí "$2"\'\'\'</big>.', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
 'articleexists'    => 'Ojúewé pẹ̀lú orúk� un wà tẹ�lẹ̀, tàbí kójẹ�pé orúk� tí ẹ yàn kò ní ìbámu.
 Ẹ j�̀w�� ẹ yan orúk� mìíràn.',
 'movedto'          => 'tiyípò sí',
@@ -845,6 +890,7 @@ Bí a ṣe to ojúewé <strong>$1</strong> nì yí:",
 'tooltip-n-portal'                => 'Ẹ̀kúnrẹ�rẹ� nípa iṣẹ��w�� yìí',
 'tooltip-n-currentevents'         => 'Ìròhìn l��w��l��w��',
 'tooltip-n-recentchanges'         => 'Àkój� àw�n àtúnṣe tuntun nínú wiki.',
+'tooltip-n-randompage'            => 'Ẹ ṣe àrìnàkò ojúewé kan',
 'tooltip-n-help'                  => 'Fún ìrànl��w��.',
 'tooltip-t-whatlinkshere'         => "Àkój� gbogbo ojúewé wiki tó jáp�̀ s'íbí",
 'tooltip-t-contributions'         => 'Ẹ wo àkój� àw�n àfikún oníṣe yìí',
@@ -865,10 +911,8 @@ Bí a ṣe to ojúewé <strong>$1</strong> nì yí:",
 'tooltip-watch'                   => "Ẹ ṣ'àfikún ojúewé yìí m�� ìmójútó yín",
 
 # Attribution
-'anonymous'        => 'Aláìlórúk� (àw�n) oníṣe lórí {{SITENAME}}',
 'siteuser'         => '$1 oníṣe lórí {{SITENAME}}',
 'lastmodifiedatby' => 'Igba ti a se atunse si ojuewe yi gbeyin ni $2, $1 by $3.', # $1 date, $2 time, $3 user
-'siteusers'        => '$1 (àw�n) oníṣe lórí {{SITENAME}}',
 
 # Browsing diffs
 'previousdiff' => '� Àtúnṣe tópẹ�jù',
@@ -881,7 +925,7 @@ Bí a ṣe to ojúewé <strong>$1</strong> nì yí:",
 'show-big-image'       => 'Pẹ̀lú ìgbéhàn gíga',
 'show-big-image-thumb' => '<small>Ìtóbi àyẹ̀wò yìí: $1 × $2 pixels</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Ọ̀dẹ̀dẹ̀ àwòrán àw�n faili tuntun',
 
 # Metadata
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index 5a27b79a..6adc48fd 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -6,17 +6,6 @@
  *
  */
 
-$skinNames = array(
-	'standard'    => '傳統', /* "Classic, Standard" */
-	'nostalgia'   => '懷舊', /* "Nostalgia" */
-	'cologneblue' => '科隆�', /* "Cologne Blue" */
-	'monobook'    => 'MonoBook',
-	'myskin'      => '我嘅畫�', /* "MySkin" */
-	'chick'       => '�', /* "Chick" */
-	'simple'      => 'ç°¡å–®', /* "Simple" */
-	'modern'      => 'æ‘©ç™»', /* "Modern" */
-);
-
 $bookstoreList = array(
 	'AddALL' => 'http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN',
 	'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
@@ -65,8 +54,8 @@ $namespaceNames = array(
 	NS_USER_TALK 		=> 'User_talk',
 	# NS_PROJECT 		=> $wgMetaNamespace,
 	NS_PROJECT_TALK 	=> '$1_talk',
-	NS_IMAGE 		=> 'Image',
-	NS_IMAGE_TALK 		=> 'Image_talk',
+	NS_FILE 		=> 'File',
+	NS_FILE_TALK 		=> 'File_talk',
 	NS_MEDIAWIKI 		=> 'MediaWiki',
 	NS_MEDIAWIKI_TALK 	=> 'MediaWiki_talk',
 	NS_TEMPLATE 		=> 'Template',
@@ -95,14 +84,24 @@ $namespaceAliases = array(
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#"{$wgMetaNamespace} 討論" => NS_PROJECT_TALK,
 	#"{$wgMetaNamespace} 讨论" => NS_PROJECT_TALK,
-	"圖" 			=> NS_IMAGE,
-	"圖�" 			=> NS_IMAGE,
-	"图" 			=> NS_IMAGE,
-	"图�" 			=> NS_IMAGE,
-	"圖 討論" 		=> NS_IMAGE_TALK,
-	"图 讨论" 		=> NS_IMAGE_TALK,
-	"圖� 討論" 		=> NS_IMAGE_TALK,
-	"图� 讨论" 		=> NS_IMAGE_TALK,
+	"檔" 			=> NS_FILE,
+	"檔案" 			=> NS_FILE,
+	"æ¡£" 			=> NS_FILE,
+	"档案" 			=> NS_FILE,
+	"圖" 			=> NS_FILE,
+	"圖�" 			=> NS_FILE,
+	"图" 			=> NS_FILE,
+	"图�" 			=> NS_FILE,
+	'Image'                 => NS_FILE,
+	'Image_talk'            => NS_FILE_TALK,
+	"檔 討論" 		=> NS_FILE_TALK,
+	"档 讨论" 		=> NS_FILE_TALK,
+	"檔案 討論" 		=> NS_FILE_TALK,
+	"档案 讨论" 		=> NS_FILE_TALK,
+	"圖 討論" 		=> NS_FILE_TALK,
+	"图 讨论" 		=> NS_FILE_TALK,
+	"圖� 討論" 		=> NS_FILE_TALK,
+	"图� 讨论" 		=> NS_FILE_TALK,
 	"模" 			=> NS_TEMPLATE,
 	"模 討論" 		=> NS_TEMPLATE_TALK,
 	"模 讨论" 		=> NS_TEMPLATE_TALK,
@@ -144,12 +143,12 @@ $messages = array(
 'tog-justify'                 => '�齊段�',
 'tog-hideminor'               => '最新更改唔顯示�修改',
 'tog-extendwatchlist'         => '展開監視清單去顯示��嘅更改',
-'tog-usenewrc'                => '強化版最近更改（JavaScript）',
+'tog-usenewrc'                => '強化版最近更改（需�JavaScript）',
 'tog-numberheadings'          => '標題自動編號',
-'tog-showtoolbar'             => '顯示修改工具列（JavaScript）',
-'tog-editondblclick'          => '撳兩下改嘢（JavaScript）',
+'tog-showtoolbar'             => '顯示修改工具列（需�JavaScript）',
+'tog-editondblclick'          => '撳兩下改嘢（需�JavaScript）',
 'tog-editsection'             => '�以用 [修改] 掣更改個別段�',
-'tog-editsectiononrightclick' => '�以撳�掣更改個別段�（JavaScript）',
+'tog-editsectiononrightclick' => '�以撳�掣更改個別段�（需�JavaScript）',
 'tog-showtoc'                 => '多�三段時顯示目錄',
 'tog-rememberpassword'        => '響呢部電腦度記�我嘅密碼',
 'tog-editwidth'               => '全螢幕�闊嘅修改欄',
@@ -170,22 +169,24 @@ $messages = array(
 'tog-externaleditor'          => '�設用外掛編輯器（高階者專用，需�響你部電腦度�一啲特別設定）',
 'tog-externaldiff'            => '�設用外掛比較器（高階者專用，需�響你部電腦度�一啲特別設定）',
 'tog-showjumplinks'           => '啟用 "跳至" �助連�',
-'tog-uselivepreview'          => '用�時�覽（JavaScript）（實驗緊）',
+'tog-uselivepreview'          => '用�時�覽（需�JavaScript）（實驗緊）',
 'tog-forceeditsummary'        => '我冇入修改註解時通知我',
 'tog-watchlisthideown'        => '響監視清單度隱�我嘅編輯',
 'tog-watchlisthidebots'       => '響監視清單度隱�機械人嘅編輯',
 'tog-watchlisthideminor'      => '響監視清單度隱��修改',
+'tog-watchlisthideliu'        => '響監視清單度隱�登入用戶',
+'tog-watchlisthideanons'      => '響監視清單度隱�匿�用戶',
 'tog-nolangconversion'        => '唔�用字轉�',
 'tog-ccmeonemails'            => '當我寄電郵畀其他人嗰陣寄返�副本畀我',
 'tog-diffonly'                => '響差異下�唔顯示��內容',
 'tog-showhiddencats'          => '顯示隱�類',
+'tog-noconvertlink'           => '唔轉連�標題',
+'tog-norollbackdiff'          => '進行�轉之後略�差異',
 
 'underline-always'  => '全部',
 'underline-never'   => '永�',
 'underline-default' => '�覽器�設',
 
-'skinpreview' => '(�覽)',
-
 # Dates
 'sunday'        => '星期日',
 'monday'        => '星期一',
@@ -315,14 +316,14 @@ $messages = array(
 'talkpagelinktext'  => '傾�',
 'specialpage'       => '特別�',
 'personaltools'     => '個人工具',
-'postcomment'       => '寫��見',
+'postcomment'       => '新�節',
 'articlepage'       => '�目錄',
 'talk'              => '討論',
 'views'             => '去�',
 'toolbox'           => '工具箱',
 'userpage'          => '去�用戶�',
 'projectpage'       => '去�專題�',
-'imagepage'         => '去�媒體�',
+'imagepage'         => '去�檔案�',
 'mediawikipage'     => '去�信��',
 'templatepage'      => '去�模�',
 'viewhelppage'      => '去�幫手�',
@@ -341,8 +342,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '關於{{SITENAME}}',
 'aboutpage'            => 'Project:關於',
-'bugreports'           => '臭蟲回報',
-'bugreportspage'       => 'Project:臭蟲回報',
 'copyright'            => '響版度嘅內容係根據$1嘅�款發佈。',
 'copyrightpagename'    => '{{SITENAME}}版權',
 'copyrightpage'        => '{{ns:project}}:版權',
@@ -365,9 +364,7 @@ $messages = array(
 
 'badaccess'        => '權�錯誤',
 'badaccess-group0' => '你係唔准執行你�求嘅動作。',
-'badaccess-group1' => '你所�求嘅動作�係�制畀$1組嘅用戶。',
-'badaccess-group2' => '你所�求嘅動作�係�制畀$1組嘅其中一�用戶。',
-'badaccess-groups' => '你所�求嘅動作�係�制畀$1組嘅其中一�用戶。',
+'badaccess-groups' => '你所�求嘅動作�係�制畀{{PLURAL:$2|呢個|呢啲}}組嘅其中一�用戶: $1',
 
 'versionrequired'     => '係需�用 $1 版嘅 MediaWiki',
 'versionrequiredtext' => '�用呢一�，�用MediaWiki版本 $1 。��[[Special:Version|版本�]]。',
@@ -381,6 +378,8 @@ $messages = array(
 'editsection'             => '編輯',
 'editold'                 => '編輯',
 'viewsourceold'           => '��原始碼',
+'editlink'                => '編輯',
+'viewsourcelink'          => '��原始碼',
 'editsectionhint'         => '編輯�節: $1',
 'toc'                     => '目錄',
 'showtoc'                 => '展開',
@@ -395,7 +394,7 @@ $messages = array(
 'site-atom-feed'          => '$1嘅Atom Feed',
 'page-rss-feed'           => '"$1"嘅RSS Feed',
 'page-atom-feed'          => '"$1"嘅Atom Feed',
-'red-link-title'          => '$1 (未寫)',
+'red-link-title'          => '$1 (��未存在)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => '版',
@@ -411,7 +410,9 @@ $messages = array(
 
 # Main script and global functions
 'nosuchaction'      => '冇呢個動作',
-'nosuchactiontext'  => '呢個 URL 嘅指定動作 wiki 識別唔到',
+'nosuchactiontext'  => '呢個 URL 嘅指定動作 係無效嘅。
+你�能打錯咗個 URL ，或者撳錯咗唔啱嘅連�。
+呢個�能係{{SITENAME}}所用嘅軟件入�嘅臭蟲所引致嘅。',
 'nosuchspecialpage' => '冇呢�特別�',
 'nospecialpagetext' => "<big>'''無你所�求嘅特別�。'''</big>
 
@@ -464,7 +465,6 @@ $1',
 'cannotdelete'         => '指定嗰�或檔案唔刪得。（�能已經刪咗。）',
 'badtitle'             => '錯嘅標題',
 'badtitletext'         => '�求嘅標題唔啱�空白，跨語言或者跨維基連�標題錯誤。亦�能係標題包括咗一個或多�一個字元。',
-'perfdisabled'         => '�唔��呢個功能有�能造�資料庫癱瘓，所以�暫時�用。',
 'perfcached'           => '以下嘅資料係嚟自快�，�能唔係最新嘅。',
 'perfcachedts'         => '以下嘅資料係嚟自快�，上一次嘅更新喺$1。',
 'querypage-no-updates' => '響呢一�嘅更新�時�用。啲資料將唔會�時更新。',
@@ -478,7 +478,7 @@ $1',
 'protectedpagetext'    => '呢一�已經鎖咗唔畀改。',
 'viewsourcetext'       => '你�以��或者複製呢一�嘅原始碼：',
 'protectedinterface'   => '呢一��供軟件嘅介�文字，呢一�已經鎖上以�防濫用。',
-'editinginterface'     => "'''警告：'''你而家編輯緊嘅呢一個用嚟�供介�文字嘅��。響呢一�嘅更改會影響到其他用戶使用中嘅介�外觀。�翻譯，請考慮利用[http://translatewiki.net/wiki/Main_Page?setlang=yue Betawiki]，一個用來為MediaWiki軟件本地化嘅計劃。",
+'editinginterface'     => "'''警告：'''你而家編輯緊嘅呢一個用嚟�供介�文字嘅��。響呢一�嘅更改會影響到其他用戶使用中嘅介�外觀。�翻譯，請考慮利用[http://translatewiki.net/wiki/Main_Page?setlang=yue translatewiki.net]，一個用來為MediaWiki軟件本地化嘅計劃。",
 'sqlhidden'            => '(SQL 查詢隱�)',
 'cascadeprotected'     => '呢一版已經�護咗唔能夠編輯，因為佢係響以下嘅{{PLURAL:$1|一|幾}}�度包�咗，當中啟用咗"連串"�護�項來�護嗰一版: $2',
 'namespaceprotected'   => "你無權編輯響'''$1'''空間���嘅呢一版。",
@@ -506,9 +506,6 @@ $1',
 'remembermypassword'         => '響呢部電腦度記�我嘅密碼',
 'yourdomainname'             => '你嘅網域:',
 'externaldberror'            => '驗證資料庫出錯，或者唔�許你更新你嘅外部帳戶。',
-'loginproblem'               => "'''你嘅登入手續出咗�題。'''
-
-唔該�試�登入。",
 'login'                      => '登入',
 'nav-login-createaccount'    => '登入�開新戶�',
 'loginprompt'                => '你一定�開咗 cookies 先登入到{{SITENAME}}。',
@@ -533,7 +530,7 @@ $1',
 'yourvariant'                => '字體變化:',
 'yournick'                   => '簽�:',
 'badsig'                     => '無效嘅程�碼簽�。檢查� HTML 有無錯。',
-'badsiglength'               => '簽�太長喇。
+'badsiglength'               => '你嘅簽�太長喇。
 佢嘅長度一定�響$1個字元以下。',
 'email'                      => '電郵',
 'prefs-help-realname'        => '真�係�以�填嘅。
@@ -546,7 +543,9 @@ $1',
 'noname'                     => '你未指定一個有效嘅用戶�。',
 'loginsuccesstitle'          => '登入�功',
 'loginsuccess'               => "'''你已經�功�喺{{SITENAME}}登入�「$1�。'''",
-'nosuchuser'                 => '呢度冇�� "$1"嘅用戶。 請檢查你個�嘅輸入方法，或者[[Special:UserLogin/signup|建立一個新嘅戶�]]。',
+'nosuchuser'                 => '呢度冇�� "$1"嘅用戶。
+用戶�係有分大細楷嘅。
+請檢查你個�嘅輸入方法，或者[[Special:UserLogin/signup|建立一個新嘅戶�]]。',
 'nosuchusershort'            => '呢度冇�� "<nowiki>$1</nowiki>"嘅用戶。 請檢查你個�嘅輸入方法。',
 'nouserspecified'            => '你需�指定一個用戶�。',
 'wrongpassword'              => '密碼唔啱，麻煩你�試多次。',
@@ -568,10 +567,11 @@ $1',
 'eauthentsent'               => '確�電郵已經傳�到指定嘅電郵地�。喺其它嘅郵件傳�到呢個戶�之�，你需�按電郵嘅指示，嚟確�呢個戶�真係屬於你嘅。',
 'throttled-mailpassword'     => '一個密碼�醒已經響$1個�頭之�發�咗。為咗防止濫用，響$1個�頭之內��以發�一個密碼�醒。',
 'mailerror'                  => '傳�電郵錯誤： $1',
-'acct_creation_throttle_hit' => '�唔�，你已經開咗 $1 個戶�，唔�以�開多個戶�。',
-'emailauthenticated'         => '你嘅電郵地�已經喺 $1 確�。',
+'acct_creation_throttle_hit' => '利用你呢個IP地�嘅訪客響上一日已經開咗 $1 個戶�，係響呢段時間嘅上�。
+�果，利用呢個IP地�嘅訪客唔�以響呢段時間�開多個戶�。',
+'emailauthenticated'         => '你嘅電郵地�已經喺 $2 $3 確�。',
 'emailnotauthenticated'      => '你嘅電郵地��未確�。 任何傳�電郵嘅功能都唔會�作。',
-'noemailprefs'               => '設置一個電郵地�令到呢啲功能開始�作。',
+'noemailprefs'               => '響你嘅喜好設定度設置一個電郵地�令到呢啲功能開始�作。',
 'emailconfirmlink'           => '確�你嘅電郵地�',
 'invalidemailaddress'        => '呢個電郵地�嘅格�唔啱，所以接�唔到。請輸入一個啱格�嘅地�，或清咗嗰個空格。',
 'accountcreated'             => '戶�已經建立咗',
@@ -580,19 +580,27 @@ $1',
 'createaccount-text'         => '有人響{{SITENAME}}度用咗你個電郵開咗個�� "$2" 嘅新戶� ($4)，密碼係 "$3" 。你應該而家登入，改埋個密碼。
 
 如果個戶�係開錯咗嘅話，你�以唔埋呢篇信。',
+'login-throttled'            => '你已經試咗太多次響呢個戶�嘅密碼度。請等多一陣�試�。',
 'loginlanguagelabel'         => '語言：$1',
 
 # Password reset dialog
-'resetpass'               => '�設戶�密碼',
-'resetpass_announce'      => '你已經用咗一個臨時電郵碼登入。�完�登入，你一定�響呢度定一個新嘅密碼：',
-'resetpass_text'          => '<!-- 響呢度加入文字 -->',
-'resetpass_header'        => '改戶�密碼',
-'resetpass_submit'        => '設定密碼�登入',
-'resetpass_success'       => '你嘅密碼已經�功噉改咗�而家幫你登入緊...',
-'resetpass_bad_temporary' => '無效嘅臨時密碼。
+'resetpass'                 => '改密碼',
+'resetpass_announce'        => '你已經用咗一個臨時電郵碼登入。�完�登入，你一定�響呢度定一個新嘅密碼：',
+'resetpass_text'            => '<!-- 響呢度加入文字 -->',
+'resetpass_header'          => '改戶�密碼',
+'oldpassword'               => '舊密碼:',
+'newpassword'               => '新密碼:',
+'retypenew'                 => '打多次新密碼:',
+'resetpass_submit'          => '設定密碼�登入',
+'resetpass_success'         => '你嘅密碼已經�功噉改咗�而家幫你登入緊...',
+'resetpass_bad_temporary'   => '無效嘅臨時密碼。
+你�能已經�功�更改你嘅密碼，�或者�新請求�一個新嘅臨時密碼。',
+'resetpass_forbidden'       => '唔�以更改密碼',
+'resetpass-no-info'         => '你一定�登入咗去直接入來呢一版。',
+'resetpass-submit-loggedin' => '改密碼',
+'resetpass-wrong-oldpass'   => '無效嘅臨時或�有嘅密碼。
 你�能已經�功�更改你嘅密碼，�或者�新請求�一個新嘅臨時密碼。',
-'resetpass_forbidden'     => '唔�以更改密碼',
-'resetpass_missing'       => '響資料度�唔到嘢。',
+'resetpass-temp-password'   => '臨時密碼:',
 
 # Edit page toolbar
 'bold_sample'     => '粗體字',
@@ -615,8 +623,8 @@ $1',
 'hr_tip'          => '橫線（請�心用）',
 
 # Edit pages
-'summary'                          => '摘�',
-'subject'                          => '主題�標題',
+'summary'                          => '摘�:',
+'subject'                          => '主題�標題:',
 'minoredit'                        => '呢個係�修改',
 'watchthis'                        => '�實呢一�',
 'savearticle'                      => '儲存呢�',
@@ -628,8 +636,8 @@ $1',
 'missingsummary'                   => "'''�醒：''' 你未�供編輯摘�。如果你�撳多一下儲存嘅話，�你儲存嘅編輯就會無摘�。",
 'missingcommenttext'               => '請輸入一個註解。',
 'missingcommentheader'             => "'''�醒：'''你響呢個註解度並無�供一個主題�標題。如果你�撳一次儲存，你嘅編輯就會無題。",
-'summary-preview'                  => '摘��覽',
-'subject-preview'                  => '標題�頭��覽',
+'summary-preview'                  => '摘��覽:',
+'subject-preview'                  => '標題�頭��覽:',
 'blockedtitle'                     => '用戶已經�鎖',
 'blockedtext'                      => "<big>你嘅用戶�或者 IP ��已經被 $1 �咗。</big>
 
@@ -676,7 +684,9 @@ $1',
 �起版新嘅，請你喺下�嗰格度輸入。(��[[{{MediaWiki:Helppage}}|自助版]]拎多啲資料。)
 如果你係唔覺�嚟到呢度，撳一次你個�覽器'''返轉頭'''個掣。",
 'anontalkpagetext'                 => "----''呢度係匿�用戶嘅討論�，佢�能係�未開戶�，或者佢�唔識開戶�。我哋會用數字表示嘅IP地�嚟代表佢。一個IP地�係�以由幾個用戶夾來用。如果你係匿�用戶，�覺得呢啲留言係�你冇關係嘅話，唔該去[[Special:UserLogin/signup|開一個新戶�]]或[[Special:UserLogin|登入]]，��喺以後嘅留言會�埋其它用戶混淆。''",
-'noarticletext'                    => '喺呢一�而家並冇任何嘅文字，你�以喺其它嘅��中[[Special:Search/{{PAGENAME}}|�呢一�嘅標題]]或者[{{fullurl:{{FULLPAGENAME}}|action=edit}} 編輯呢一�]。',
+'noarticletext'                    => '喺呢一�而家並冇任何嘅文字，你�以喺其它嘅��中[[Special:Search/{{PAGENAME}}|�呢一�嘅標題]]，
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} �有關嘅日誌]，
+或者[{{fullurl:{{FULLPAGENAME}}|action=edit}} 編輯呢一版]</span>。',
 'userpage-userdoesnotexist'        => '用戶戶�"$1"�未開。請響䦒�編輯呢版之�先檢查一下。',
 'clearyourcache'                   => "'''注� - 喺儲存之後，你�能�先略�你嘅�覽器快�去�到更改。'''
 '''Mozilla / Firefox / Safari:''' 㩒�''Shift''掣�撳''�新載入''，�或者㩒''Ctrl-F5''或者''Ctrl-R''（喺Macintosh㩒''Command-R''掣）；
@@ -690,8 +700,8 @@ $1',
 '''佢嘅內容�未儲存�'''",
 'userinvalidcssjstitle'            => "'''警告：''' 無�� \"\$1\" 嘅畫�。請記�自訂介�的 .css 和 .js ��時應使用細楷，例如：{{ns:user}}:Foo/monobook.css 而唔係 {{ns:user}}:Foo/Monobook.css 。",
 'updated'                          => '(己更新)',
-'note'                             => '<strong>留�:</strong>',
-'previewnote'                      => '<strong>請記�呢個�係�覽；更改嘅内容�未儲存�</strong>',
+'note'                             => "'''留�:'''",
+'previewnote'                      => "'''請記�呢個�係�覽；更改嘅内容�未儲存�'''",
 'previewconflict'                  => '呢個�覽係�映如果你�擇儲存嘅話，嘅上�嘅文字編輯���嘅字會儲存�嚟。',
 'session_fail_preview'             => "'''�唔��由於�節嘅資料唔見咗，我哋唔能夠處�你嘅編輯。
 請�試�喇。如果�然唔得嘅話，試下[[Special:UserLogout|登出]]，然後�新登入。'''",
@@ -704,7 +714,7 @@ $1',
 當你響度用緊一啲好多臭蟲，以網絡為主嘅匿�代��務。'''",
 'editing'                          => '而家喺度編輯$1',
 'editingsection'                   => '而家喺度編輯$1 （�節）',
-'editingcomment'                   => '而家喺度編輯$1 （評論）',
+'editingcomment'                   => '而家喺度編輯$1 （新�節）',
 'editconflict'                     => '編輯��：$1',
 'explainconflict'                  => "有其他人喺你開始編輯之後已經更改呢一�。
 喺上�嗰個空間而家�存嘅��文字。
@@ -727,11 +737,13 @@ $1',
 'longpagewarning'                  => "'''警告：呢一�有 $1 kilobytes �長；有啲�覽器�能會喺就離或者超� 32kb 編輯��會出�一啲�題。
 請考慮分割呢個��到細啲嘅�節。'''",
 'longpageerror'                    => "'''錯誤：你所�交嘅文字係有 $1 kilobytes �長，係長�最大嘅 $2 kilobytes。儲唔到你�交嘅文字。'''",
-'readonlywarning'                  => "'''錯誤：料庫已經鎖�咗，以便定期�養。而家你唔�以儲起你嘅編輯。你�以儲啲文字�一份文字檔先。'''",
+'readonlywarning'                  => "'''錯誤：料庫已經鎖�咗，以便定期�養。而家你唔�以儲起你嘅編輯。你�以儲啲文字�一份文字檔先。'''
+
+管�員嘅解釋： $1",
 'protectedpagewarning'             => "'''警告：呢版已經�到�護，�有管�員權�嘅用戶先至�以改。'''",
 'semiprotectedpagewarning'         => "'''注�：'''呢一�已經鎖咗，�有已經註冊嘅用戶先至�以改。",
 'cascadeprotectedwarning'          => "'''警告：'''呢一�已經鎖咗，�有管�員權�嘅用戶先至�以改，因為佢係響以下連串�護嘅{{PLURAL:$1|一|幾}}�度包�咗：",
-'titleprotectedwarning'            => '<strong>警告：呢一版已經鎖咗，�有一啲用戶先至�以開到。</strong>',
+'titleprotectedwarning'            => "'''警告：呢一版已經鎖咗，�有一啲用戶先至�以開到。'''",
 'templatesused'                    => '喺呢一�所用嘅模：',
 'templatesusedpreview'             => '喺呢一次�覽所用嘅模：',
 'templatesusedsection'             => '喺呢一�節所用嘅模：',
@@ -750,11 +762,22 @@ $1',
 
 你應該�考慮�繼續編輯呢一版係唔係��嘅。
 為咗方便起見，呢一版嘅刪除記錄已經響下��供:",
+'deleted-notice'                   => '呢一版已經刪除咗。
+呢版嘅刪除日誌響下��供咗以便�考。',
+'deletelog-fulllog'                => '去��個日誌',
+'edit-hook-aborted'                => '編輯由鈎�消咗。
+佢無畀到解釋。',
+'edit-gone-missing'                => '唔能夠更新�。
+佢�能啱啱刪除咗。',
+'edit-conflict'                    => '編輯��。',
+'edit-no-change'                   => '你嘅編輯已經略�，因為文字無改�。',
+'edit-already-exists'              => '唔�以開一新版。
+佢已經存在。',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => '警告: 呢一版有太多耗費嘅語法功能呼�。
 
-佢應該少�$2，但而家係$1。',
+佢應該少�$2次呼�，佢而家係$1次呼�。',
 'expensive-parserfunction-category'       => '響版度有太多嘅耗費嘅語法功能呼�',
 'post-expand-template-inclusion-warning'  => '警告: 包�模大細太大。
 有啲模將唔會包�。',
@@ -762,6 +785,8 @@ $1',
 'post-expand-template-argument-warning'   => '警告: 呢一版有最少一個模�數有太大嘅擴展大細。
 呢啲�數會被略�。',
 'post-expand-template-argument-category'  => '包��略�模�數嘅版',
+'parser-template-loop-warning'            => '已�測迴模: [[$1]]',
+'parser-template-recursion-depth-warning' => '迴模深度�制超�咗 ($1)',
 
 # "Undo" feature
 'undo-success' => '呢個編輯�以�消。請檢查一下個差異去確�呢個係你�去�嘅，跟�儲存下�嘅更改去完�編輯。',
@@ -776,29 +801,28 @@ $1',
 當中俾$3�鎖嘅原因係''$2''",
 
 # History pages
-'viewpagelogs'        => '�呢�嘅日誌',
-'nohistory'           => '呢版冇歷�。',
-'revnotfound'         => '�唔到歷�',
-'revnotfoundtext'     => '呢版無你��嗰個版本喎。
-唔該�下�網�啱唔啱。',
-'currentrev'          => '家下嘅修訂',
-'revisionasof'        => '喺$1嘅修訂',
-'revision-info'       => '喺$1嘅修訂；修訂自$2',
-'previousrevision'    => '�之�嘅修訂',
-'nextrevision'        => '新啲嘅修訂→',
-'currentrevisionlink' => '家下嘅修訂版本',
-'cur'                 => '�時',
-'next'                => '之後',
-'last'                => '之�',
-'page_first'          => '最頭',
-'page_last'           => '最尾',
-'histlegend'          => '�擇唔�版本：響兩個唔�版本嘅圓框分別撳一下，�撳最底的「比較被�版本�掣以作比較。<br />
-說明：（�時）= ��時修訂版本嘅差別，（先�）= 與�一個修訂版本嘅差別，M = �修改。',
-'deletedrev'          => '[刪除咗]',
-'histfirst'           => '最早',
-'histlast'            => '最近',
-'historysize'         => '($1 {{PLURAL:$1|byte|bytes}})',
-'historyempty'        => '(空)',
+'viewpagelogs'           => '�呢�嘅日誌',
+'nohistory'              => '呢版冇歷�。',
+'currentrev'             => '家下嘅修訂',
+'currentrev-asof'        => '響 $1 嘅家下修訂',
+'revisionasof'           => '喺$1嘅修訂',
+'revision-info'          => '喺$1嘅修訂；修訂自$2', # Additionally available: $3: revision id
+'previousrevision'       => '�之�嘅修訂',
+'nextrevision'           => '新啲嘅修訂→',
+'currentrevisionlink'    => '家下嘅修訂版本',
+'cur'                    => '�時',
+'next'                   => '之後',
+'last'                   => '之�',
+'page_first'             => '最頭',
+'page_last'              => '最尾',
+'histlegend'             => "�擇唔�版本：響兩個唔�版本嘅圓框分別撳一下，�撳最底的「比較被�版本�掣以作比較。<br />
+說明：'''（{{int:cur}}）'''= ��時修訂版本嘅差別，'''（{{int:last}}）'''= 與�一個修訂版本嘅差別，'''{{int:minoreditletter}}''' = �修改。",
+'history-fieldset-title' => '�覽歷�',
+'deletedrev'             => '[刪除咗]',
+'histfirst'              => '最早',
+'histlast'               => '最近',
+'historysize'            => '($1 {{PLURAL:$1|byte|bytes}})',
+'historyempty'           => '(空)',
 
 # Revision feed
 'history-feed-title'          => '修訂歷�',
@@ -882,6 +906,7 @@ $1',
 'mergehistory-invalid-destination' => '目的�一定�係一個有效嘅標題。',
 'mergehistory-autocomment'         => '已經�併咗[[:$1]]去到[[:$2]]',
 'mergehistory-comment'             => '已經�併咗[[:$1]]去到[[:$2]]: $3',
+'mergehistory-same-destination'    => '來���目的�唔�以一樣',
 
 # Merge log
 'mergelog'           => '�併日誌',
@@ -894,119 +919,200 @@ $1',
 'difference'              => '（修訂之間嘅差異）',
 'lineno'                  => '第$1行：',
 'compareselectedversions' => '比較被�嘅版本',
+'visualcomparison'        => '�見比較',
+'wikicodecomparison'      => 'Wikitext比較',
 'editundo'                => '復原',
-'diff-multi'              => '(當中有$1次嘅修訂唔會顯示。)',
+'diff-multi'              => '(當中有$1次嘅修訂唔會顯示)',
+'diff-movedto'            => '�到去$1',
+'diff-styleadded'         => '加咗$1樣�表',
+'diff-added'              => '加咗$1',
+'diff-changedto'          => '改到$1',
+'diff-movedoutof'         => '拎走自$1',
+'diff-styleremoved'       => '拎走咗$1樣�表',
+'diff-removed'            => 'æ‹Žèµ°å’—$1',
+'diff-changedfrom'        => '改自$1',
+'diff-src'                => '�碼',
+'diff-withdestination'    => '跟$1目的地',
+'diff-with'               => 'è·Ÿ $1 $2',
+'diff-with-final'         => '� $1 $2',
+'diff-width'              => 'é—Š',
+'diff-height'             => '高',
+'diff-p'                  => '段�',
+'diff-blockquote'         => '語錄',
+'diff-h1'                 => '標題（1級）',
+'diff-h2'                 => '標題（2級）',
+'diff-h3'                 => '標題（3級）',
+'diff-h4'                 => '標題（4級）',
+'diff-h5'                 => '標題（5級）',
+'diff-pre'                => '�先設定嘅塊',
+'diff-div'                => '部',
+'diff-ul'                 => '未排列嘅表',
+'diff-ol'                 => '排列咗嘅表',
+'diff-li'                 => '表項目',
+'diff-table'              => '表',
+'diff-tbody'              => '表內容',
+'diff-tr'                 => '行',
+'diff-td'                 => 'æ ¼',
+'diff-th'                 => '表頭',
+'diff-br'                 => '斷行',
+'diff-hr'                 => '橫綫',
+'diff-code'               => '電腦碼塊',
+'diff-dl'                 => '定義表',
+'diff-dt'                 => '定義字',
+'diff-dd'                 => '解釋',
+'diff-input'              => '輸入',
+'diff-form'               => '表',
+'diff-img'                => '圖�',
+'diff-span'               => '樣�',
+'diff-a'                  => '連�',
+'diff-i'                  => '斜體',
+'diff-b'                  => 'ç²—é«”',
+'diff-strong'             => '強調',
+'diff-em'                 => '�點',
+'diff-font'               => 'å­—é«”',
+'diff-big'                => '大',
+'diff-del'                => '刪咗',
+'diff-tt'                 => '固定闊度',
+'diff-sub'                => '下標',
+'diff-sup'                => '上標',
+'diff-strike'             => '刪除綫',
 
 # Search results
-'searchresults'             => '�嘢�果',
-'searchresulttext'          => '有關�{{SITENAME}}嘅更多資料請�考[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
-'searchsubtitle'            => '你利用\'\'\'[[:$1]]\'\'\'�  ([[Special:Prefixindex/$1|全部由 "$1" 開始嘅�]] | [[Special:WhatLinksHere/$1|全部連去 "$1" 嘅�]])',
-'searchsubtitleinvalid'     => "你利用'''$1'''�",
-'noexactmatch'              => "'''�唔到到標題為\"\$1\"嘅��。''' 你�以而家[[:\$1|開呢個新�]]。",
-'noexactmatch-nocreate'     => "'''�唔到到標題為\"\$1\"嘅��。'''",
-'toomanymatches'            => '太多嘅���到，請試�一個唔�嘅查詢',
-'titlematches'              => '��標題符�',
-'notitlematches'            => '冇��嘅標題符�',
-'textmatches'               => '��文字符�',
-'notextmatches'             => '冇��文字符�',
-'prevn'                     => '�$1',
-'nextn'                     => '後$1',
-'viewprevnext'              => '去� ($1) ($2) ($3)',
-'search-result-size'        => '$1 ($2個字)',
-'search-result-score'       => '相關度: $1%',
-'search-redirect'           => '(跳轉 $1)',
-'search-section'            => '(�節 $1)',
-'search-suggest'            => '你係唔係�: $1',
-'search-interwiki-caption'  => '姊妹計劃',
-'search-interwiki-default'  => '$1項�果:',
-'search-interwiki-more'     => '(更多)',
-'search-mwsuggest-enabled'  => '有建議',
-'search-mwsuggest-disabled' => '無建議',
-'search-relatedarticle'     => '有關',
-'mwsuggest-disable'         => '�用AJAX建議',
-'searchrelated'             => '有關',
-'searchall'                 => '全部',
-'showingresults'            => "'自#'''$2'''起顯示最多'''$1'''個�果。",
-'showingresultsnum'         => "自#'''$2'''起顯示'''$3'''個�果。",
-'showingresultstotal'       => "下�顯示緊由'''$1 - $2'''，總共'''$3'''項嘅�果",
-'nonefound'                 => "'''注�''': �有一啲空間�係會作�設�嘢。試�''all:''去�全部嘅嘢（包埋討論版�模等），或用需�嘅空間���綴。",
-'powersearch'               => '進階�嘢',
-'powersearch-legend'        => '進階�嘢',
-'powersearch-ns'            => '喺以下嘅空間�度�:',
-'powersearch-redir'         => '彈去清單',
-'powersearch-field'         => '�',
-'search-external'           => '出��嘢',
-'searchdisabled'            => '{{SITENAME}}嘅�尋功能已經關閉。你�以利用Google嚟�。��佢哋�{{SITENAME}}嘅索引�能唔係最新嘅。',
+'searchresults'                    => '�嘢�果',
+'searchresults-title'              => '�"$1"嘅�嘢�果',
+'searchresulttext'                 => '有關�{{SITENAME}}嘅更多資料請�考[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
+'searchsubtitle'                   => '你利用\'\'\'[[:$1]]\'\'\'�  ([[Special:Prefixindex/$1|全部由 "$1" 開始嘅�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|全部連去 "$1" 嘅�]])',
+'searchsubtitleinvalid'            => "你利用'''$1'''�",
+'noexactmatch'                     => "'''�唔到到標題為\"\$1\"嘅��。''' 你�以而家[[:\$1|開呢個新�]]。",
+'noexactmatch-nocreate'            => "'''�唔到到標題為\"\$1\"嘅��。'''",
+'toomanymatches'                   => '太多嘅���到，請試�一個唔�嘅查詢',
+'titlematches'                     => '��標題符�',
+'notitlematches'                   => '冇��嘅標題符�',
+'textmatches'                      => '��文字符�',
+'notextmatches'                    => '冇��文字符�',
+'prevn'                            => '�$1',
+'nextn'                            => '後$1',
+'viewprevnext'                     => '去� ($1) ($2) ($3)',
+'searchmenu-legend'                => '�嘢�項',
+'searchmenu-exists'                => "'''響呢個wiki度有一版��\"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''響呢個wiki度開呢版\"[[:\$1]]\"�'''",
+'searchhelp-url'                   => 'Help:目錄',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|去�以呢個�開頭嘅版]]',
+'searchprofile-articles'           => '內容�',
+'searchprofile-articles-and-proj'  => '內容�專題�',
+'searchprofile-project'            => '專題�',
+'searchprofile-images'             => '檔案',
+'searchprofile-everything'         => '全部嘢',
+'searchprofile-advanced'           => '進階',
+'searchprofile-articles-tooltip'   => '響$1度�',
+'searchprofile-project-tooltip'    => '響$1度�',
+'searchprofile-images-tooltip'     => '�檔案',
+'searchprofile-everything-tooltip' => '�全部嘢（包埋討論版）',
+'searchprofile-advanced-tooltip'   => '響自定空間�度�',
+'prefs-search-nsdefault'           => '用�設值�:',
+'prefs-search-nscustom'            => '�自定空間�:',
+'search-result-size'               => '$1 ($2個字)',
+'search-result-score'              => '相關度: $1%',
+'search-redirect'                  => '(跳轉 $1)',
+'search-section'                   => '(�節 $1)',
+'search-suggest'                   => '你係唔係�: $1',
+'search-interwiki-caption'         => '姊妹計劃',
+'search-interwiki-default'         => '$1項�果:',
+'search-interwiki-more'            => '(更多)',
+'search-mwsuggest-enabled'         => '有建議',
+'search-mwsuggest-disabled'        => '無建議',
+'search-relatedarticle'            => '有關',
+'mwsuggest-disable'                => '�用AJAX建議',
+'searchrelated'                    => '有關',
+'searchall'                        => '全部',
+'showingresults'                   => "'自#'''$2'''起顯示最多'''$1'''個�果。",
+'showingresultsnum'                => "自#'''$2'''起顯示'''$3'''個�果。",
+'showingresultstotal'              => "下�顯示緊由第'''$1{{PLURAL:$4|| - $2}}'''項，總共'''$3'''項嘅�果",
+'nonefound'                        => "'''注�''': �有一啲空間�係會作�設�嘢。試�''all:''去�全部嘅嘢（包埋討論版�模等），或用需�嘅空間���綴。",
+'search-nonefound'                 => '響個查詢度無�果��。',
+'powersearch'                      => '進階�嘢',
+'powersearch-legend'               => '進階�嘢',
+'powersearch-ns'                   => '喺以下嘅空間�度�:',
+'powersearch-redir'                => '彈去清單',
+'powersearch-field'                => '�',
+'search-external'                  => '出��嘢',
+'searchdisabled'                   => '{{SITENAME}}嘅�尋功能已經關閉。你�以利用Google嚟�。��佢哋�{{SITENAME}}嘅索引�能唔係最新嘅。',
 
 # Preferences page
-'preferences'              => '喜好設定',
-'mypreferences'            => '我嘅喜好設定',
-'prefs-edits'              => '編輯數:',
-'prefsnologin'             => '�未登入',
-'prefsnologintext'         => '你一定�去<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登入]</span>設定好用戶喜好值先。',
-'prefsreset'               => '喜好設定已經從儲存空間中�設。',
-'qbsettings'               => '快�列',
-'qbsettings-none'          => 'ç„¡',
-'qbsettings-fixedleft'     => '左邊固定',
-'qbsettings-fixedright'    => '�邊固定',
-'qbsettings-floatingleft'  => '左邊浮動',
-'qbsettings-floatingright' => '�邊浮動',
-'changepassword'           => '改密碼',
-'skin'                     => '畫�',
-'math'                     => '數',
-'dateformat'               => '日期格�',
-'datedefault'              => '冇喜好',
-'datetime'                 => '日期�埋時間',
-'math_failure'             => '語法拼砌失敗',
-'math_unknown_error'       => '唔知錯乜',
-'math_unknown_function'    => '唔知乜函數',
-'math_lexing_error'        => 'lexing錯誤',
-'math_syntax_error'        => '語法錯誤',
-'math_image_error'         => 'PNG 轉�失敗；檢查latex�dvips�gs�埋convert係唔係已經正確�樣安�',
-'math_bad_tmpdir'          => '唔能夠寫入或建立臨時數目錄',
-'math_bad_output'          => '唔能夠寫入或建立輸出數目錄',
-'math_notexvc'             => 'texvc 執行檔已經�失；請�� math/README 去較�。',
-'prefs-personal'           => '用戶簡介',
-'prefs-rc'                 => '最近更改',
-'prefs-watchlist'          => '監視清單',
-'prefs-watchlist-days'     => '監視清單嘅顯示日數：',
-'prefs-watchlist-edits'    => '喺加強版監視清單度嘅最多顯示更改數：',
-'prefs-misc'               => '雜項',
-'saveprefs'                => '儲存',
-'resetprefs'               => '清除未�存嘅更改',
-'oldpassword'              => '舊密碼:',
-'newpassword'              => '新密碼:',
-'retypenew'                => '打多次新密碼:',
-'textboxsize'              => '編輯中',
-'rows'                     => '列：',
-'columns'                  => '行：',
-'searchresultshead'        => '�嘢',
-'resultsperpage'           => '��顯示嘅擊中數：',
-'contextlines'             => '�一擊顯示嘅行數：',
-'contextchars'             => '�一行嘅字數：',
-'stub-threshold'           => '<a href="#" class="stub">楔�連�</a>格�門檻 (bytes):',
-'recentchangesdays'        => '最近更改中嘅顯示日數：',
-'recentchangescount'       => '最近更改�編輯紀錄�日誌�中嘅編輯數：',
-'savedprefs'               => '你嘅喜好設定已經儲存。',
-'timezonelegend'           => '時�',
-'timezonetext'             => '¹你嘅本地時間�伺�器時間 (UTC) 之間嘅差，以�頭為單�。',
-'localtime'                => '本地時間',
-'timezoneoffset'           => '時間�移¹',
-'servertime'               => '伺機器時間',
-'guesstimezone'            => '由�覽器填上',
-'allowemail'               => '由其它用戶啟用電�郵件',
-'prefs-searchoptions'      => '�嘢�項',
-'prefs-namespaces'         => '空間�',
-'defaultns'                => '�設喺呢啲空間��嘢：',
-'default'                  => '�設',
-'files'                    => '檔案',
+'preferences'               => '喜好設定',
+'mypreferences'             => '我嘅喜好設定',
+'prefs-edits'               => '編輯數:',
+'prefsnologin'              => '�未登入',
+'prefsnologintext'          => '你一定�去<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登入]</span>設定好用戶喜好值先。',
+'prefsreset'                => '喜好設定已經從儲存空間中�設。',
+'qbsettings'                => '快�列',
+'qbsettings-none'           => 'ç„¡',
+'qbsettings-fixedleft'      => '左邊固定',
+'qbsettings-fixedright'     => '�邊固定',
+'qbsettings-floatingleft'   => '左邊浮動',
+'qbsettings-floatingright'  => '�邊浮動',
+'changepassword'            => '改密碼',
+'skin'                      => '畫�',
+'skin-preview'              => '�覽',
+'math'                      => '數',
+'dateformat'                => '日期格�',
+'datedefault'               => '冇喜好',
+'datetime'                  => '日期�埋時間',
+'math_failure'              => '語法拼砌失敗',
+'math_unknown_error'        => '唔知錯乜',
+'math_unknown_function'     => '唔知乜函數',
+'math_lexing_error'         => 'lexing錯誤',
+'math_syntax_error'         => '語法錯誤',
+'math_image_error'          => 'PNG 轉�失敗；檢查latex�dvips�gs�埋convert係唔係已經正確�樣安�',
+'math_bad_tmpdir'           => '唔能夠寫入或建立臨時數目錄',
+'math_bad_output'           => '唔能夠寫入或建立輸出數目錄',
+'math_notexvc'              => 'texvc 執行檔已經�失；請�� math/README 去較�。',
+'prefs-personal'            => '用戶簡介',
+'prefs-rc'                  => '最近更改',
+'prefs-watchlist'           => '監視清單',
+'prefs-watchlist-days'      => '監視清單嘅顯示日數：',
+'prefs-watchlist-days-max'  => '(最多 7 日)',
+'prefs-watchlist-edits'     => '喺加強版監視清單度嘅最多顯示更改數：',
+'prefs-watchlist-edits-max' => '(最多數�: 1000)',
+'prefs-misc'                => '雜項',
+'prefs-resetpass'           => '改密碼',
+'saveprefs'                 => '儲存',
+'resetprefs'                => '清除未�存嘅更改',
+'textboxsize'               => '編輯中',
+'prefs-edit-boxsize'        => '編輯框大細',
+'rows'                      => '列：',
+'columns'                   => '行：',
+'searchresultshead'         => '�嘢',
+'resultsperpage'            => '��顯示嘅擊中數：',
+'contextlines'              => '�一擊顯示嘅行數：',
+'contextchars'              => '�一行嘅字數：',
+'stub-threshold'            => '<a href="#" class="stub">楔�連�</a>格�門檻 (bytes):',
+'recentchangesdays'         => '最近更改中嘅顯示日數：',
+'recentchangesdays-max'     => '(最多 $1 日)',
+'recentchangescount'        => '最近更改�版紀錄�日誌中嘅�設編輯數：',
+'savedprefs'                => '你嘅喜好設定已經儲存。',
+'timezonelegend'            => '時�',
+'timezonetext'              => '¹你嘅本地時間�伺�器時間 (UTC) 之間嘅差，以�頭為單�。',
+'localtime'                 => '本地時間:',
+'timezoneselect'            => '時�:',
+'timezoneuseserverdefault'  => '用伺�器�設值',
+'timezoneuseoffset'         => '其它 (指定�移)',
+'timezoneoffset'            => '�移¹:',
+'servertime'                => '伺機器時間:',
+'guesstimezone'             => '由�覽器填上',
+'allowemail'                => '由其它用戶啟用電�郵件',
+'prefs-searchoptions'       => '�嘢�項',
+'prefs-namespaces'          => '空間�',
+'defaultns'                 => '�設喺呢啲空間��嘢：',
+'default'                   => '�設',
+'files'                     => '檔案',
 
 # User rights
 'userrights'                  => '用戶權�管�', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => '管�用戶組',
 'userrights-user-editname'    => '輸入一個用戶�：',
 'editusergroup'               => '編輯用戶組',
-'editinguser'                 => "改緊用戶'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) 嘅用戶權�",
+'editinguser'                 => "改緊用戶'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) 嘅用戶權�",
 'userrights-editusergroup'    => '編輯用戶組',
 'saveusergroups'              => '儲存用戶組',
 'userrights-groupsmember'     => '屬於：',
@@ -1055,6 +1161,8 @@ $1',
 'right-minoredit'            => '標示�編輯',
 'right-move'                 => '�版',
 'right-move-subpages'        => '�版�埋佢哋嘅細版',
+'right-move-rootuserpages'   => '�根用戶版',
+'right-movefile'             => '�檔案',
 'right-suppressredirect'     => '�版嗰陣唔開跳轉',
 'right-upload'               => '上載檔案',
 'right-reupload'             => '覆蓋�有嘅檔案',
@@ -1105,9 +1213,46 @@ $1',
 'rightslogentry' => '已經將$1嘅組別從$2改到去$3',
 'rightsnone'     => '(ç„¡)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '讀呢版',
+'action-edit'                 => '編輯呢版',
+'action-createpage'           => '開版',
+'action-createtalk'           => '開討論版',
+'action-createaccount'        => '開呢個用戶戶�',
+'action-minoredit'            => '標示呢個編輯�細嘅',
+'action-move'                 => '�呢版',
+'action-move-subpages'        => '�呢版�埋佢嘅細�',
+'action-move-rootuserpages'   => '�根用戶版',
+'action-movefile'             => '�呢個檔案',
+'action-upload'               => '上載呢個檔案',
+'action-reupload'             => '覆蓋呢個�有嘅檔案',
+'action-reupload-shared'      => '覆蓋響共用檔案庫上�嘅檔案',
+'action-upload_by_url'        => '由一個URL地�度上載檔案',
+'action-writeapi'             => '用來寫API',
+'action-delete'               => '刪呢版',
+'action-deleterevision'       => '刪呢次修訂',
+'action-deletedhistory'       => '�呢版嘅刪除歷�',
+'action-browsearchive'        => '�刪咗嘅版',
+'action-undelete'             => '�刪呢一版',
+'action-suppressrevision'     => '翻���復呢個隱�修訂',
+'action-suppressionlog'       => '�呢個�有日誌',
+'action-block'                => '�鎖呢�用戶嘅編輯',
+'action-protect'              => '改呢版嘅�護等級',
+'action-import'               => '由�一個wiki倒入呢一版',
+'action-importupload'         => '由一個檔案上載倒入呢一版',
+'action-patrol'               => '標示其它嘅編輯�已巡查嘅',
+'action-autopatrol'           => '將你嘅編輯標示�已巡查嘅',
+'action-unwatchedpages'       => '�未畀人監視嘅版',
+'action-trackback'            => '�交一個trackback',
+'action-mergehistory'         => '�併呢版嘅歷�',
+'action-userrights'           => '編輯全部嘅權�',
+'action-userrights-interwiki' => '編輯響其它wiki用戶嘅權�',
+'action-siteadmin'            => '鎖�解鎖資料庫',
+
 # Recent changes
 'nchanges'                          => '$1次更改',
 'recentchanges'                     => '最近更改',
+'recentchanges-legend'              => '最近更改�項',
 'recentchangestext'                 => '追蹤�哩一個 wiki 嘅最後更改。',
 'recentchanges-feed-description'    => '追蹤�哩一個 wiki 度呢個集�嘅最後更改。',
 'rcnote'                            => "以下係響$4 $5，近'''$2'''日嘅最後'''$1'''次修改。",
@@ -1131,6 +1276,8 @@ $1',
 'rc_categories'                     => '�定到分類（以"|"作分隔）',
 'rc_categories_any'                 => '任何',
 'newsectionsummary'                 => '/* $1 */ 新�節',
+'rc-enhanced-expand'                => '顯示細節 (需� JavaScript)',
+'rc-enhanced-hide'                  => '隱�細節',
 
 # Recent changes linked
 'recentchangeslinked'          => '連��嘅更改',
@@ -1152,11 +1299,11 @@ $1',
 'upload_directory_read_only'  => '嗰個上載嘅目錄 ($1) 而家唔能夠被網�伺�器寫入。',
 'uploaderror'                 => '上載錯誤',
 'uploadtext'                  => "用下�嘅表格嚟上載檔案。
-��或者�嘢之�上載嘅圖�請去[[Special:ImageList|已上載檔案一覽]]，（�）上載嘅動作會喺[[Special:Log/upload|上載日誌]]��記錄�嚟，而刪除嘅動作會喺[[Special:Log/delete|刪除日誌]]��記錄�嚟。
+��或者�嘢之�上載嘅圖�請去[[Special:FileList|已上載檔案一覽]]，（�）上載嘅動作會喺[[Special:Log/upload|上載日誌]]��記錄�嚟，而刪除嘅動作會喺[[Special:Log/delete|刪除日誌]]��記錄�嚟。
 
 如果�喺��度引入呢張圖�，�以使用以下其中一種方�嘅連�：
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:file.jpg<nowiki>]]</nowiki></tt>'''去用檔案嘅完整版
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:file.png|200px|thumb|left|替代文字<nowiki>]]</nowiki></tt>'''去用200�素比例闊，�左邊加盒，響�述度加'替代文字'
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:file.jpg<nowiki>]]</nowiki></tt>'''去用檔案嘅完整版
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:file.png|200px|thumb|left|替代文字<nowiki>]]</nowiki></tt>'''去用200�素比例闊，�左邊加盒，響�述度加'替代文字'
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:file.ogg<nowiki>]]</nowiki></tt>''' 直接連�到檔案而唔顯示個檔案。",
 'upload-permitted'            => '准許嘅檔案類型: $1。',
 'upload-preferred'            => '建議嘅檔案類型: $1。',
@@ -1164,7 +1311,7 @@ $1',
 'uploadlog'                   => '上載日誌',
 'uploadlogpage'               => '上載日誌',
 'uploadlogpagetext'           => '以下係最近檔案上載嘅一覽表。
-�[[Special:NewImages|新圖�畫廊]]去�更詳細嘅總覽。',
+�[[Special:NewFiles|新圖�畫廊]]去�更詳細嘅總覽。',
 'filename'                    => '檔�',
 'filedesc'                    => '摘�',
 'fileuploadsummary'           => '摘�：',
@@ -1186,8 +1333,8 @@ $1',
 'large-file'                  => '建議檔案嘅大細唔好大�$1 bytes，呢個檔案有$2 bytes',
 'largefileserver'             => '呢個檔案超�咗伺�器設定�許嘅大細。',
 'emptyfile'                   => '你上載嘅檔案似乎係空嘅。噉樣�能係因為你打錯咗個檔�。請檢查�你係唔係真係�上載呢個檔案。',
-'fileexists'                  => '呢個檔�已經存在，如果你唔肯定係唔係�更改<strong><tt>$1</tt></strong>，請先檢查佢。',
-'filepageexists'              => "呢個檔嘅�述�已經響'''<tt>$1</tt></strong>開咗，但係呢個�嘅檔案�未存在。你輸入咗嘅摘�係唔會顯示響個�述�度。�令到個摘�響嗰度出�，你就�手動噉去編輯佢。'''",
+'fileexists'                  => "呢個檔�已經存在，如果你唔肯定係唔係�更改'''<tt>$1</tt>'''，請先檢查佢。",
+'filepageexists'              => "呢個檔嘅�述�已經響'''<tt>$1</tt>'''開咗，但係呢個�嘅檔案�未存在。你輸入咗嘅摘�係唔會顯示響個�述�度。�令到個摘�響嗰度出�，你就�手動噉去編輯佢。'''",
 'fileexists-extension'        => "一個相似檔�嘅檔案已經存在:
 
 上載檔案嘅檔�: '''<tt>$1</tt>'''
@@ -1201,9 +1348,11 @@ $1',
 如果檢查咗嘅檔案係�原本幅圖個大細係一樣嘅話，就唔使�上載多一幅縮圖。",
 'file-thumbnail-no'           => "個檔�係以'''<tt>$1</tt>'''開始。佢好似係一幅圖�嘅縮細版本''（縮圖）''。
 如果你有呢幅圖�嘅完整大細，唔係嘅話請�改�個檔�。",
-'fileexists-forbidden'        => '呢個檔案嘅�已經存在；麻煩返轉去用第二個�嚟上載呢個檔案。[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => '共享檔案庫入�已經有一個��嘅檔案；麻煩返轉去用第二個�嚟上載呢個檔案。[[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => '呢個檔案嘅�已經存在，唔�以覆蓋；麻煩返轉去用第二個�嚟上載呢個檔案。[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => '共享檔案庫入�已經有一個��嘅檔案。
+如果你�然想去上載佢嘅話，麻煩返轉去用第二個�嚟上載呢個檔案。[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => '呢個檔案係�下�嘅{{PLURAL:$1|一|幾}}個檔案�覆:',
+'file-deleted-duplicate'      => '一個��嘅檔案 ([[$1]]) 響之�刪除�。你應該響�新上載之�檢查一下嗰個檔案嘅刪除紀錄。',
 'successfulupload'            => '�功嘅上載',
 'uploadwarning'               => '上載警告',
 'savefile'                    => '儲存檔案',
@@ -1244,20 +1393,21 @@ $1',
 'upload_source_url'  => ' （啱嘅，公開嘅網�）',
 'upload_source_file' => ' （你部電腦��嘅一個檔案）',
 
-# Special:ImageList
-'imagelist-summary'     => '呢個特別版顯示全部上載�嘅檔案。
+# Special:ListFiles
+'listfiles-summary'     => '呢個特別版顯示全部上載�嘅檔案。
 響�設最後上載嘅檔案會顯示響呢個表嘅最頂。
 撳一欄嘅標題去改個排列。',
-'imagelist_search_for'  => '�媒體�:',
+'listfiles_search_for'  => '�媒體�:',
 'imgfile'               => '檔案',
-'imagelist'             => '檔案清單',
-'imagelist_date'        => '日期',
-'imagelist_name'        => '�',
-'imagelist_user'        => '用戶',
-'imagelist_size'        => '大細',
-'imagelist_description' => '�述',
-
-# Image description page
+'listfiles'             => '檔案清單',
+'listfiles_date'        => '日期',
+'listfiles_name'        => '�',
+'listfiles_user'        => '用戶',
+'listfiles_size'        => '大細',
+'listfiles_description' => '�述',
+'listfiles_count'       => '版本',
+
+# File description page
 'filehist'                       => '檔案歷�',
 'filehist-help'                  => '撳個日期�時間去�響嗰個時間出��嘅檔案。',
 'filehist-deleteall'             => '刪除全部',
@@ -1265,12 +1415,18 @@ $1',
 'filehist-revert'                => '回復',
 'filehist-current'               => '�時',
 'filehist-datetime'              => '日期�時間',
+'filehist-thumb'                 => '縮圖',
+'filehist-thumbtext'             => '響$1嘅縮圖版本',
+'filehist-nothumb'               => '無縮圖',
 'filehist-user'                  => '用戶',
 'filehist-dimensions'            => '尺寸',
 'filehist-filesize'              => '檔案大細',
 'filehist-comment'               => '註解',
-'imagelinks'                     => '連�',
+'imagelinks'                     => '檔案連�',
 'linkstoimage'                   => '以下嘅$1個��連�到呢個檔案：',
+'linkstoimage-more'              => '多�$1版連�去呢個檔案。
+下�嘅表�係列示咗連去呢個檔案嘅最頭$1版。
+一個[[Special:WhatLinksHere/$2|完整嘅表]]�以�供。',
 'nolinkstoimage'                 => '冇個��連�到呢個檔案。',
 'morelinkstoimage'               => '去�連到呢個檔案嘅[[Special:WhatLinksHere/$1|更多連�]]。',
 'redirectstofile'                => '下�嘅$1個檔案跳轉到呢個檔案:',
@@ -1291,7 +1447,7 @@ $1',
 # File reversion
 'filerevert'                => '回復$1',
 'filerevert-legend'         => '回復檔案',
-'filerevert-intro'          => "你而家回復緊'''[[Media:$1|$1]]'''到[$4 響$2 $3嘅版本]。",
+'filerevert-intro'          => "你而家回復緊個檔案'''[[Media:$1|$1]]'''到[$4 響$2 $3嘅版本]。",
 'filerevert-comment'        => '註解:',
 'filerevert-defaultcomment' => '已經回復到響$1 $2嘅版本',
 'filerevert-submit'         => '回復',
@@ -1301,7 +1457,7 @@ $1',
 # File deletion
 'filedelete'                  => '刪除$1',
 'filedelete-legend'           => '刪除檔案',
-'filedelete-intro'            => "你而家刪除緊'''[[Media:$1|$1]]'''。",
+'filedelete-intro'            => "你而家刪除緊個檔案'''[[Media:$1|$1]]'''。",
 'filedelete-intro-old'        => "你而家刪除緊'''[[Media:$1|$1]]'''響[$4 $2 $3]嘅版本。",
 'filedelete-comment'          => '刪除原因:',
 'filedelete-submit'           => '刪除',
@@ -1309,7 +1465,6 @@ $1',
 'filedelete-success-old'      => "'''[[Media:$1|$1]]'''響 $2 $3 嘅版本已經刪除咗。",
 'filedelete-nofile'           => "'''$1'''唔存在。",
 'filedelete-nofile-old'       => "用指定嘅屬性，呢度係無'''$1'''響 $2 $3 嘅歸檔版本。",
-'filedelete-iscurrent'        => '你而家嘗試刪除呢個檔案嘅最近版本。請先將個檔打回頭�舊啲嘅版本先。',
 'filedelete-otherreason'      => '其它�附加嘅原因:',
 'filedelete-reason-otherlist' => '其它原因',
 'filedelete-reason-dropdown'  => '
@@ -1337,27 +1492,31 @@ $1',
 
 # Random page
 'randompage'         => '隨便一版',
-'randompage-nopages' => '響呢個空間�度�唔到一版。',
+'randompage-nopages' => '響 "$1" 空間�度�唔到一版。',
 
 # Random redirect
 'randomredirect'         => '隨便彈',
-'randomredirect-nopages' => '響呢個空間�度冇一個彈去版。',
+'randomredirect-nopages' => '響 "$1" 空間�度冇一個彈去版。',
 
 # Statistics
-'statistics'             => '統計',
-'sitestats'              => '{{SITENAME}}嘅統計',
-'userstats'              => '用戶統計',
-'sitestatstext'          => "資料庫中而家有'''$1'''�。
-其中包括咗「討論���關於{{SITENAME}}嘅��好短嘅「楔��版��跳轉，以�其他唔計入內容嘅�。唔計�內容�在內，則總共有'''$2'''��能會計入正�嘅內容。
-
-'''$8''' 個檔案已經上載。
-
-呢個Wiki喺建立以嚟，總共有'''$3'''次�覽，�埋'''$4'''次編輯。
-平��個��有'''$5'''次�覽，�埋'''$6'''次編輯。
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue]嘅長度係'''$7'''。",
-'userstatstext'          => "目�有'''$1'''個註冊[[Special:ListUsers|用戶]]，其中有'''$2'''人（�'''$4%'''）有$5權�。",
-'statistics-mostpopular' => '最多人�嘅�',
+'statistics'                   => '統計',
+'statistics-header-pages'      => '�統計',
+'statistics-header-edits'      => '編輯統計',
+'statistics-header-views'      => '�看統計',
+'statistics-header-users'      => '用戶統計',
+'statistics-articles'          => '內容�',
+'statistics-pages'             => 'é �',
+'statistics-pages-desc'        => '響wiki上嘅全部�，包埋討論��跳轉等',
+'statistics-files'             => '已經上載咗嘅檔案',
+'statistics-edits'             => '自從{{SITENAME}}設定後嘅�編輯數',
+'statistics-edits-average'     => '�一版平�編輯數',
+'statistics-views-total'       => '查看總數',
+'statistics-views-peredit'     => '�次編輯查看數',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue 工作隊列]長度',
+'statistics-users'             => '註冊咗嘅[[Special:ListUsers|用戶]]',
+'statistics-users-active'      => '活�用戶',
+'statistics-users-active-desc' => '響$1日���動作嘅用戶',
+'statistics-mostpopular'       => '最多人�嘅�',
 
 'disambiguations'      => '�清楚�',
 'disambiguationspage'  => 'Template:disambig
@@ -1366,11 +1525,11 @@ Template:�清楚',
 
 'doubleredirects'            => '雙�跳轉',
 'doubleredirectstext'        => '呢一版列出咗全部跳轉�跳轉到�一版跳轉�嘅版。�一行包括指去第一個�第二個跳轉嘅連�，以�第二個跳轉嘅目標。呢行文字通常畀出咗第一個跳轉應該指去嘅嗰個「真正�嘅目標��。',
-'double-redirect-fixed-move' => '[[$1]]已經�好咗，佢而家跳轉�去[[$2]]',
+'double-redirect-fixed-move' => '[[$1]]已經�好咗，佢而家跳轉�去[[$2]]。',
 'double-redirect-fixer'      => '跳轉修正器',
 
 'brokenredirects'        => '破碎嘅跳轉',
-'brokenredirectstext'    => '以下嘅跳轉係指�唔存在嘅��。',
+'brokenredirectstext'    => '以下嘅跳轉係指�唔存在嘅��:',
 'brokenredirects-edit'   => '(編輯)',
 'brokenredirects-delete' => '(刪除)',
 
@@ -1400,26 +1559,30 @@ Template:�清楚',
 'popularpages'            => '�歡迎嘅��',
 'wantedcategories'        => '被徵求嘅分類',
 'wantedpages'             => '被徵求嘅��',
-'missingfiles'            => '�失咗嘅檔案',
+'wantedfiles'             => '被徵求嘅檔案',
+'wantedtemplates'         => '被徵求嘅模',
 'mostlinked'              => '有最多連�嘅��',
 'mostlinkedcategories'    => '有最多連�嘅分類',
 'mostlinkedtemplates'     => '有最多連�嘅模',
 'mostcategories'          => '有最多分類嘅��',
 'mostimages'              => '有最多連�嘅檔案',
 'mostrevisions'           => '有最多修改嘅��',
-'prefixindex'             => '�綴索引',
+'prefixindex'             => '全部�嘅�綴',
 'shortpages'              => '短�',
 'longpages'               => 'é•·é �',
 'deadendpages'            => '掘頭�',
 'deadendpagestext'        => '呢啲�無連到{{SITENAME}}內嘅任何一�。',
 'protectedpages'          => '�護�',
 'protectedpages-indef'    => '�有無期�謢�',
+'protectedpages-cascade'  => '�有連串�護�',
 'protectedpagestext'      => '以下嘅��係����，唔能夠移動或編輯',
 'protectedpagesempty'     => '響呢啲�數度，�時無��響度�護緊。',
 'protectedtitles'         => '�護咗嘅標題',
 'protectedtitlestext'     => '下�係一個�護咗唔䦒得嘅標題',
 'protectedtitlesempty'    => '響呢啲�數之下並無標題�護�。',
 'listusers'               => '用戶一覽',
+'listusers-editsonly'     => '�顯示有編輯嘅用戶',
+'usereditcount'           => '$1次編輯',
 'newpages'                => 'æ–°é �',
 'newpages-username'       => '用戶�：',
 'ancientpages'            => '舊��',
@@ -1440,14 +1603,13 @@ Template:�清楚',
 'booksources-search-legend' => '�書�',
 'booksources-go'            => '去',
 'booksources-text'          => '以下嘅連�清單列出其它一啲賣新書�二手書嘅網站，�能�以�供到有關你想�嘅書嘅更多資料：',
+'booksources-invalid-isbn'  => '個ISBN無效；請檢查原來�複製�來嘅錯。',
 
 # Special:Log
 'specialloguserlabel'  => '用戶:',
 'speciallogtitlelabel' => '標題:',
 'log'                  => '日誌',
 'all-logs-page'        => '全部嘅日誌',
-'log-search-legend'    => '�日誌',
-'log-search-submit'    => '去',
 'alllogstext'          => '響{{SITENAME}}度全部日誌嘅綜�顯示。你�以�擇一個日誌類型�用戶��或者�影響嘅��，嚟縮窄顯示嘅範�。',
 'logempty'             => '日誌中冇符�嘅項目。',
 'log-title-wildcard'   => '�以呢個文字開始嘅標題',
@@ -1458,6 +1620,7 @@ Template:�清楚',
 'nextpage'          => '下一� ($1)',
 'prevpage'          => '上一� ($1)',
 'allpagesfrom'      => '顯示以下�置開始嘅��:',
+'allpagesto'        => '顯示以下�置��嘅��:',
 'allarticles'       => '所有��',
 'allinnamespace'    => '所有��（喺$1空間�入�）',
 'allnotinnamespace' => '所有��（唔喺$1空間�入�）',
@@ -1477,41 +1640,69 @@ Template:�清楚',
 'special-categories-sort-count' => '跟數�排',
 'special-categories-sort-abc'   => '跟字�排',
 
+# Special:DeletedContributions
+'deletedcontributions' => '已經刪除咗嘅用戶貢�',
+
+# Special:LinkSearch
+'linksearch'       => '外部連�',
+'linksearch-pat'   => '�嘅形態:',
+'linksearch-ns'    => '空間�',
+'linksearch-ok'    => '�',
+'linksearch-text'  => '�以用類似"*.wikipedia.org"嘅�用字元。<br />
+支�嘅�議: <tt>$1</tt>',
+'linksearch-line'  => '$1 連自 $2',
+'linksearch-error' => '�用字元��以響主機�嘅開頭度用。',
+
 # Special:ListUsers
 'listusersfrom'      => '顯示由呢個字開始嘅用戶：',
 'listusers-submit'   => '顯示',
 'listusers-noresult' => '�唔到用戶。',
 
+# Special:Log/newusers
+'newuserlogpage'              => '使用者開戶記錄',
+'newuserlogpagetext'          => '呢個係一個使用者開戶嘅日誌',
+'newuserlog-byemail'          => '密碼已由電郵寄出',
+'newuserlog-create-entry'     => '新用戶戶�',
+'newuserlog-create2-entry'    => '已經開咗$1嘅新戶�',
+'newuserlog-autocreate-entry' => '自動建立咗戶�',
+
 # Special:ListGroupRights
-'listgrouprights'          => '用戶組權�',
-'listgrouprights-summary'  => '下�係一個響呢個wiki定義咗嘅用戶權�一覽，�埋佢哋嘅存�權。
+'listgrouprights'                 => '用戶組權�',
+'listgrouprights-summary'         => '下�係一個響呢個wiki定義咗嘅用戶權�一覽，�埋佢哋嘅存�權。
 更多有關個別權�嘅[[{{MediaWiki:Listgrouprights-helppage}}|更多細節]]�以響嗰度�到。',
-'listgrouprights-group'    => '組',
-'listgrouprights-rights'   => '權',
-'listgrouprights-helppage' => 'Help:組權�',
-'listgrouprights-members'  => '(�員�單)',
+'listgrouprights-group'           => '組',
+'listgrouprights-rights'          => '權',
+'listgrouprights-helppage'        => 'Help:組權�',
+'listgrouprights-members'         => '(�員�單)',
+'listgrouprights-addgroup'        => '�以加入嘅{{PLURAL:$2|一|多}}組: $1',
+'listgrouprights-removegroup'     => '�以拎走嘅{{PLURAL:$2|一|多}}組: $1',
+'listgrouprights-addgroup-all'    => '�以加入全部組',
+'listgrouprights-removegroup-all' => '�以拎走全部組',
 
 # E-mail user
-'mailnologin'     => '冇傳�地�',
-'mailnologintext' => '你一定�[[Special:UserLogin|登入咗]]�埋喺你嘅[[Special:Preferences|喜好設定]]度有個有效嘅電郵地�先�以傳�電郵畀其他用戶。',
-'emailuser'       => '發電郵畀呢�用戶',
-'emailpage'       => '發電郵畀用戶',
-'emailpagetext'   => '你�以用下�嘅表去寄一�電郵畀呢�用戶。
+'mailnologin'      => '冇傳�地�',
+'mailnologintext'  => '你一定�[[Special:UserLogin|登入咗]]�埋喺你嘅[[Special:Preferences|喜好設定]]度有個有效嘅電郵地�先�以傳�電郵畀其他用戶。',
+'emailuser'        => '發電郵畀呢�用戶',
+'emailpage'        => '發電郵畀用戶',
+'emailpagetext'    => '你�以用下�嘅表去寄一�電郵畀呢�用戶。
 你喺[[Special:Preferences|你嘅用戶喜好設定]]入�填寫嘅電郵地�會出�喺呢�電郵「由�嘅地�度，以便收件人�以回覆到。',
-'usermailererror' => '目標郵件地�返回錯誤：',
-'defemailsubject' => '{{SITENAME}} 電郵',
-'noemailtitle'    => '無電郵地�',
-'noemailtext'     => '呢個用戶�指指定一個有效嘅電郵電�，�或者佢�咗唔收其他用戶畀佢嘅電郵。',
-'emailfrom'       => 'ç”±:',
-'emailto'         => '到:',
-'emailsubject'    => '主題:',
-'emailmessage'    => '信�:',
-'emailsend'       => '傳�',
-'emailccme'       => '傳�一個我嘅信�電郵畀我。',
-'emailccsubject'  => '你畀$1: $2�信嘅副本',
-'emailsent'       => '電郵已傳�',
-'emailsenttext'   => '你嘅電郵信�已傳�。',
-'emailuserfooter' => '呢�電郵係由$1寄畀$2經{{SITENAME}}嘅「電郵用戶�功能發出嘅。',
+'usermailererror'  => '目標郵件地�返回錯誤：',
+'defemailsubject'  => '{{SITENAME}} 電郵',
+'noemailtitle'     => '無電郵地�',
+'noemailtext'      => '呢個用戶�未指定一個有效嘅電郵地�。',
+'nowikiemailtitle' => '唔容許電郵',
+'nowikiemailtext'  => '呢�用戶�咗唔收其他用戶畀佢嘅電郵。',
+'email-legend'     => '寄電郵畀�一�{{SITENAME}}用戶',
+'emailfrom'        => 'ç”±:',
+'emailto'          => '到:',
+'emailsubject'     => '主題:',
+'emailmessage'     => '信�:',
+'emailsend'        => '傳�',
+'emailccme'        => '傳�一個我嘅信�電郵畀我。',
+'emailccsubject'   => '你畀$1: $2�信嘅副本',
+'emailsent'        => '電郵已傳�',
+'emailsenttext'    => '你嘅電郵信�已傳�。',
+'emailuserfooter'  => '呢�電郵係由$1寄畀$2經{{SITENAME}}嘅「電郵用戶�功能發出嘅。',
 
 # Watchlist
 'watchlist'            => '監視清單',
@@ -1542,12 +1733,7 @@ Template:�清楚',
 'iteminvalidname'      => "項目'$1'出錯，無效嘅�稱...",
 'wlnote'               => "以下係最近'''$2'''個�之內嘅最新$1次修改。",
 'wlshowlast'           => '顯示最近 $1 個� $2 日 $3 嘅修改',
-'watchlist-show-bots'  => '顯示機械人嘅編輯',
-'watchlist-hide-bots'  => '隱�機械人嘅編輯',
-'watchlist-show-own'   => '顯示我嘅編輯',
-'watchlist-hide-own'   => '隱�我嘅編輯',
-'watchlist-show-minor' => '顯示�修改',
-'watchlist-hide-minor' => '隱��修改',
+'watchlist-options'    => '監視清單�項',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '監視緊...',
@@ -1587,55 +1773,61 @@ wiki: $PAGEEDITOR_WIKI
 回饋�更多幫助：
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '刪除��',
-'confirm'                     => '確�',
-'excontent'                   => "內容係：'$1'",
-'excontentauthor'             => "內容係：'$1' (而且唯一嘅貢�者係'[[Special:Contributions/$2|$2]]')",
-'exbeforeblank'               => "喺清空之�嘅內容係：'$1'",
-'exblank'                     => '��之�係空嘅',
-'delete-confirm'              => '刪除"$1"',
-'delete-legend'               => '刪除',
-'historywarning'              => '警告：你�刪除嘅��有歷�版本：',
-'confirmdeletetext'           => '你準備刪除一個��或者圖�，包括佢嘅所有歷�版本。
+# Delete
+'deletepage'             => '刪除��',
+'confirm'                => '確�',
+'excontent'              => "內容係：'$1'",
+'excontentauthor'        => "內容係：'$1' (而且唯一嘅貢�者係'[[Special:Contributions/$2|$2]]')",
+'exbeforeblank'          => "喺清空之�嘅內容係：'$1'",
+'exblank'                => '��之�係空嘅',
+'delete-confirm'         => '刪除"$1"',
+'delete-legend'          => '刪除',
+'historywarning'         => '警告：你�刪除嘅��有歷�版本：',
+'confirmdeletetext'      => '你準備刪除一個��或者圖�，包括佢嘅所有歷�版本。
 請確�你打算噉�，而且你知�後果係點，加上確�你噉�冇��到[[{{MediaWiki:Policy-url}}]]。',
-'actioncomplete'              => '�作完�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>"已經刪除。最近嘅刪除記錄請�$2。',
-'deletedarticle'              => '已經刪除"[[$1]]"',
-'suppressedarticle'           => '已經廢止"[[$1]]"',
-'dellogpage'                  => '刪除日誌',
-'dellogpagetext'              => '以下係最近嘅刪除清單。',
-'deletionlog'                 => '刪除日誌',
-'reverted'                    => '�復到先�嘅修訂',
-'deletecomment'               => '刪除原因:',
-'deleteotherreason'           => '其它�附加嘅原因:',
-'deletereasonotherlist'       => '其它原因',
-'deletereason-dropdown'       => '
+'actioncomplete'         => '�作完�',
+'deletedtext'            => '"<nowiki>$1</nowiki>"已經刪除。最近嘅刪除記錄請�$2。',
+'deletedarticle'         => '已經刪除"[[$1]]"',
+'suppressedarticle'      => '已經廢止"[[$1]]"',
+'dellogpage'             => '刪除日誌',
+'dellogpagetext'         => '以下係最近嘅刪除清單。',
+'deletionlog'            => '刪除日誌',
+'reverted'               => '�復到先�嘅修訂',
+'deletecomment'          => '刪除原因:',
+'deleteotherreason'      => '其它�附加嘅原因:',
+'deletereasonotherlist'  => '其它原因',
+'deletereason-dropdown'  => '
 *常用刪除原因
 ** 作者請求
 ** 侵犯版權
 ** 破壞',
-'delete-edit-reasonlist'      => '編輯刪除原因',
-'delete-toobig'               => '呢一版有一個好大�嘅編輯歷�，�咗$1次修訂。刪除呢類版嘅動作已經�制咗，以防止響{{SITENAME}}嘅�外擾亂。',
-'delete-warning-toobig'       => '呢一版有一個好大�嘅編輯歷�，�咗$1次修訂。刪除佢�能會擾亂{{SITENAME}}嘅資料庫�作；響繼續嗰陣請�心。',
-'rollback'                    => '�轉修改',
-'rollback_short'              => '�轉',
-'rollbacklink'                => '�轉',
-'rollbackfailed'              => '�轉唔到',
-'cantrollback'                => '�轉唔到；上一�貢�者係唯一修改�呢版嘅人。',
-'alreadyrolled'               => '無法�轉[[User:$2|$2]]（[[User talk:$2|留言]] | [[Special:Contributions/$2|{{int:contribslink}}]]）�[[:$1]]嘅最後編輯；有人已經修改�或者�轉咗呢個��。
-
-上次�呢版嘅編輯係由[[User:$3|$3]]（[[User talk:$3|留言]] | [[Special:Contributions/$3|{{int:contribslink}}]]）�嘅。',
-'editcomment'                 => "編輯摘�係：\"''\$1''\"。", # only shown if there is an edit comment
-'revertpage'                  => '已經�轉由[[Special:Contributions/$2|$2]]（[[User talk:$2|�話]]）所寫嘅編輯到[[User:$1|$1]]嘅最後版本。', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '已經�轉由$1所寫嘅編輯；�復到$2嘅最後版本。',
-'sessionfailure'              => '你嘅登入會話 (session) 好似有啲�題；為咗防止會話劫�，呢個�作已經�消。請撳「返轉頭�然後�新載入你嚟自嘅��，然後�試�啦。',
+'delete-edit-reasonlist' => '編輯刪除原因',
+'delete-toobig'          => '呢一版有一個好大�嘅編輯歷�，�咗$1次修訂。刪除呢類版嘅動作已經�制咗，以防止響{{SITENAME}}嘅�外擾亂。',
+'delete-warning-toobig'  => '呢一版有一個好大�嘅編輯歷�，�咗$1次修訂。刪除佢�能會擾亂{{SITENAME}}嘅資料庫�作；響繼續嗰陣請�心。',
+
+# Rollback
+'rollback'         => '�轉修改',
+'rollback_short'   => '�轉',
+'rollbacklink'     => '�轉',
+'rollbackfailed'   => '�轉唔到',
+'cantrollback'     => '�轉唔到；上一�貢�者係唯一修改�呢版嘅人。',
+'alreadyrolled'    => '無法�轉[[User:$2|$2]]（[[User talk:$2|留言]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]）�[[:$1]]嘅最後編輯；有人已經修改�或者�轉咗呢個��。
+
+上次�呢版嘅編輯係由[[User:$3|$3]]（[[User talk:$3|留言]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]）�嘅。',
+'editcomment'      => "編輯摘�係：\"''\$1''\"。", # only shown if there is an edit comment
+'revertpage'       => '已經�轉由[[Special:Contributions/$2|$2]]（[[User talk:$2|�話]]）所寫嘅編輯到[[User:$1|$1]]嘅最後版本。', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '已經�轉由$1所寫嘅編輯；�復到$2嘅最後版本。',
+'sessionfailure'   => '你嘅登入會話 (session) 好似有啲�題；為咗防止會話劫�，呢個�作已經�消。請撳「返轉頭�然後�新載入你嚟自嘅��，然後�試�啦。',
+
+# Protect
 'protectlogpage'              => '�護日誌',
 'protectlogtext'              => '下�係一個�護�埋解除�護��嘅一覽表。��[[Special:ProtectedPages|�護��一覽]]去拎�時進行緊嘅���護一覽。',
 'protectedarticle'            => '已經�護 "[[$1]]"',
 'modifiedarticleprotection'   => '已經改咗 "[[$1]]" 嘅�護等級',
 'unprotectedarticle'          => '已經唔��護 "[[$1]]"',
+'movedarticleprotection'      => '已經改咗由「[[$2]]�到「[[$1]]�嘅�護設定',
 'protect-title'               => '改緊「$1�嘅�護等級',
+'prot_1movedto2'              => '[[$1]]�到去[[$2]]',
 'protect-legend'              => '確��護',
 'protectcomment'              => '註解:',
 'protectexpiry'               => '到期:',
@@ -1650,14 +1842,27 @@ wiki: $PAGEEDITOR_WIKI
 'protect-locked-access'       => "你嘅戶�係無權�去改呢版嘅�護等級。
 呢個係'''$1'''版嘅�時設定：",
 'protect-cascadeon'           => '呢一版�時正響度�護緊，因為佢係響以下嘅{{PLURAL:$1|一|幾}}�度包�咗，而當中�開咗連串�護。你�以更改呢一版嘅�護等級，但係呢個修改係唔會影響到嗰個連串�護。',
-'protect-default'             => '（�設）',
+'protect-default'             => '容許全部用戶',
 'protect-fallback'            => '需�"$1"嘅許�',
-'protect-level-autoconfirmed' => '�制未註冊嘅用戶',
+'protect-level-autoconfirmed' => '�制新嘅�未註冊嘅用戶',
 'protect-level-sysop'         => '���作員',
 'protect-summary-cascade'     => '連串�護',
 'protect-expiring'            => '響 $1 (UTC) 到期',
+'protect-expiry-indefinite'   => '唔定',
 'protect-cascade'             => '�護包�響呢一版嘅�� (連串�護)',
 'protect-cantedit'            => '你唔�以改呢版嘅�護等級，因為你無權�去編輯佢。',
+'protect-othertime'           => '其它時間:',
+'protect-othertime-op'        => '其它時間',
+'protect-existing-expiry'     => '�時到期嘅時間: $2 $3',
+'protect-otherreason'         => '其它�附加嘅原因:',
+'protect-otherreason-op'      => '其它�附加嘅原因',
+'protect-dropdown'            => '*通用�護原因
+** ��嘅破壞
+** ��嘅�水
+** �生產性編輯戰
+** 高���',
+'protect-edit-reasonlist'     => '編輯�護原因',
+'protect-expiry-options'      => '兩個�頭:2 hours,一日:1 day,三日:3 days,一個禮拜:1 week,兩個禮拜:2 weeks,一個月:1 month,三個月:3 months,六個月:6 months,一年:1 year,終身:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '許�:',
 'restriction-level'           => '�制等級:',
 'minimum-size'                => '最�大細',
@@ -1680,7 +1885,7 @@ wiki: $PAGEEDITOR_WIKI
 'undeletepage'                 => '去���復刪除咗嘅��',
 'undeletepagetitle'            => "'''下�包括咗[[:$1]]嘅已刪除修訂'''。",
 'viewdeletedpage'              => '去�被刪除咗嘅��',
-'undeletepagetext'             => '以下��已經刪除，但係�喺檔庫度�以�復。檔案庫�能會定時清�。',
+'undeletepagetext'             => '以下嘅$1個��已經刪除，但係�喺檔庫度�以�復。檔案庫�能會定時清�。',
 'undelete-fieldset-title'      => '�復修訂',
 'undeleteextrahelp'            => "��復�個��，唔好剔任何嘅核�盒，�撳'''''�復'''''。
 ��復已經�擇咗嘅修訂，將��復代表有關修訂嘅核�盒剔上，�撳'''''�復'''''。
@@ -1689,12 +1894,13 @@ wiki: $PAGEEDITOR_WIKI
 'undeletehistory'              => '如果你�復呢個��，佢嘅所有修改歷�都會�復返到嗰篇��嘅歷�度。如果喺佢刪除之後�新開咗��嘅��，你�復嘅修改歷�會顯示喺先�歷�度。',
 'undeleterevdel'               => '如果響最新修訂度部份刪除，噉�刪除就唔能夠進行。如果�到呢種情�，你一定���或者�隱�最新刪除咗嘅修訂。',
 'undeletehistorynoadmin'       => '呢一版已經刪咗。刪除嘅原因喺下�嘅摘�度，連��有刪除之�編輯�呢個��嘅用戶嘅詳細資料。所刪除嘅版本嘅實際內容得管�員�以�到。',
-'undelete-revision'            => '已經刪除咗$1嗰陣（響$2）由$3所寫嘅修訂:',
+'undelete-revision'            => '已經刪除咗$1嗰陣（響$4 $5）由$3所寫嘅修訂:',
 'undeleterevision-missing'     => '唔正確或者�失咗修訂。你�能有一個壞連�，或者嗰個修訂已經響存檔度�復咗或者刪除咗。',
 'undelete-nodiff'              => '�唔到之�嘅修訂。',
 'undeletebtn'                  => '�復',
 'undeletelink'                 => '�復',
 'undeletereset'                => '�設',
+'undeleteinvert'               => '��',
 'undeletecomment'              => '註解：',
 'undeletedarticle'             => '已經�復咗"[[$1]]"',
 'undeletedrevisions'           => '$1個修訂已經�復',
@@ -1726,26 +1932,27 @@ $1',
 'blanknamespace' => '（主）',
 
 # Contributions
-'contributions' => '用戶貢�',
-'mycontris'     => '我嘅貢�',
-'contribsub2'   => '$1嘅貢� ($2)',
-'nocontribs'    => '�唔到符�呢啲�件嘅修改。',
-'uctop'         => '(最頂)',
-'month'         => '由呢個月 (�更早):',
-'year'          => '由呢一年 (�更早):',
-
-'sp-contributions-newbies'     => '�顯示新戶�嘅貢�',
-'sp-contributions-newbies-sub' => '新戶�嘅貢�',
-'sp-contributions-blocklog'    => '�鎖日誌',
-'sp-contributions-search'      => '�貢�',
-'sp-contributions-username'    => 'IP地�或用戶�：',
-'sp-contributions-submit'      => '�',
+'contributions'       => '用戶貢�',
+'contributions-title' => '$1嘅用戶貢�',
+'mycontris'           => '我嘅貢�',
+'contribsub2'         => '$1嘅貢� ($2)',
+'nocontribs'          => '�唔到符�呢啲�件嘅修改。',
+'uctop'               => '(最頂)',
+'month'               => '由呢個月 (�更早):',
+'year'                => '由呢一年 (�更早):',
+
+'sp-contributions-newbies'       => '�顯示新戶�嘅貢�',
+'sp-contributions-newbies-sub'   => '新戶�嘅貢�',
+'sp-contributions-newbies-title' => '新戶�嘅用戶貢�',
+'sp-contributions-blocklog'      => '�鎖日誌',
+'sp-contributions-search'        => '�貢�',
+'sp-contributions-username'      => 'IP地�或用戶�：',
+'sp-contributions-submit'        => '�',
 
 # What links here
 'whatlinkshere'            => '有乜嘢連�來呢度',
 'whatlinkshere-title'      => '連到「$1�嘅�',
 'whatlinkshere-page'       => 'é �:',
-'linklistsub'              => '（連�一覽）',
 'linkshere'                => "呢啲�連�到'''[[:$1]]'''：",
 'nolinkshere'              => "無一�連�到'''[[:$1]]'''。",
 'nolinkshere-ns'           => "響已經�咗嘅空間�無嘢連�到'''[[:$1]]'''。",
@@ -1792,6 +1999,8 @@ $1',
 'ipbotherreason'                  => '其它�附加嘅原因:',
 'ipbhidename'                     => '響個�鎖日誌��時嘅�鎖�單以用戶�單度隱�用戶�',
 'ipbwatchuser'                    => '監視呢�用戶嘅用戶��埋佢嘅討論�',
+'ipballowusertalk'                => '當被�鎖嗰陣容許呢�用戶去編輯自己嘅討論版',
+'ipb-change-block'                => '用呢啲設定�新�鎖用戶',
 'badipaddress'                    => '無效嘅IP地�',
 'blockipsuccesssub'               => '�鎖�功',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]]已經�鎖。<br />
@@ -1801,14 +2010,18 @@ $1',
 'ipb-unblock'                     => '解�一個用戶�或IP地�',
 'ipb-blocklist-addr'              => '$1嘅�時�鎖',
 'ipb-blocklist'                   => '去��時嘅�鎖',
+'ipb-blocklist-contribs'          => '$1嘅貢�',
 'unblockip'                       => '解�用戶',
 'unblockiptext'                   => '使用以下表格�復之�阻止嘅�個IP地�或者�個用戶�嘅寫權�。',
-'ipusubmit'                       => '解�呢個地�',
+'ipusubmit'                       => '拎走呢個�鎖',
 'unblocked'                       => '"[[User:$1|$1]]"已經解�',
 'unblocked-id'                    => '$1嘅�鎖已經拎走咗',
 'ipblocklist'                     => 'IP地��用戶�阻止�單',
 'ipblocklist-legend'              => '�一��咗嘅用戶',
 'ipblocklist-username'            => '用戶�或IP地�:',
+'ipblocklist-sh-userblocks'       => '$1次戶��鎖',
+'ipblocklist-sh-tempblocks'       => '$1次暫時�鎖',
+'ipblocklist-sh-addressblocks'    => '$1次單IP�鎖',
 'ipblocklist-submit'              => '�',
 'blocklistline'                   => '$1，$2已經�鎖咗$3（$4）',
 'infiniteblock'                   => '�設期�',
@@ -1817,25 +2030,32 @@ $1',
 'noautoblockblock'                => '自動�鎖已經�用',
 'createaccountblock'              => '�咗開新戶�',
 'emailblock'                      => '�咗電郵',
+'blocklist-nousertalk'            => '唔�以編輯自己嘅討論�',
 'ipblocklist-empty'               => '�鎖�單係空嘅。',
 'ipblocklist-no-results'          => '所請求嘅IP地�或用戶�係冇被�鎖嘅。',
 'blocklink'                       => '�鎖',
 'unblocklink'                     => '解�',
+'change-blocklink'                => '改�',
 'contribslink'                    => '貢�',
 'autoblocker'                     => '已經自動�鎖，因為你嘅IP地�冇幾�之�"[[User:$1|$1]]"使用�。$1\\嘅�鎖原因係: 「$2�',
 'blocklogpage'                    => '�鎖日誌',
+'blocklog-fulllog'                => '�個�鎖日誌',
 'blocklogentry'                   => '已�鎖[[$1]]，到期時間為$2 $3',
+'reblock-logentry'                => '已改[[$1]]嘅�鎖設定，到期時間為$2 $3',
 'blocklogtext'                    => '呢個係�鎖�埋解�動作嘅日誌。自動�鎖IP地�嘅動作冇列出嚟。去[[Special:IPBlockList|IP�鎖�單]]��時生效嘅�鎖�單',
 'unblocklogentry'                 => '已經解�$1',
 'block-log-flags-anononly'        => '��匿�用戶',
 'block-log-flags-nocreate'        => '�用開新戶�',
 'block-log-flags-noautoblock'     => '�用自動�鎖器',
 'block-log-flags-noemail'         => '�咗電郵',
+'block-log-flags-nousertalk'      => '唔�以編輯自己嘅討論版',
 'block-log-flags-angry-autoblock' => '加強自動�鎖已經啟用',
 'range_block_disabled'            => '�作員嘅建立範��鎖已經�用。',
 'ipb_expiry_invalid'              => '無效嘅期�。',
 'ipb_expiry_temp'                 => '隱�用戶��鎖定一定係�永久性嘅。',
 'ipb_already_blocked'             => '"$1"已經�鎖咗',
+'ipb-needreblock'                 => '== 已經�鎖咗 ==
+$1已經被�鎖。你係咪想更改呢個設定？',
 'ipb_cant_unblock'                => '錯誤：�唔到�鎖ID$1。�能已經解�咗。',
 'ipb_blocked_as_range'            => '錯誤：個IP $1 無直接�鎖，唔�以解�。但係佢係響 $2 嘅�鎖範�之內，嗰段範�係�以解�嘅。',
 'ip_range_invalid'                => '無效嘅IP範�',
@@ -1846,6 +2066,7 @@ $1',
 'proxyblocksuccess'               => '完�。',
 'sorbsreason'                     => '你嘅IP地�已經畀響{{SITENAME}}度用嘅DNSBL列咗�公開代�。',
 'sorbs_create_account_reason'     => '你嘅IP地�已經畀響{{SITENAME}}度用嘅DNSBL列咗�公開代�。你唔�以開新戶�。',
+'cant-block-while-blocked'        => '當你被�鎖嗰陣唔�以�鎖其他用戶。',
 
 # Developer tools
 'lockdb'              => '鎖定資料庫',
@@ -1868,9 +2089,9 @@ $1',
 'databasenotlocked'   => '資料庫而家冇鎖到。',
 
 # Move page
-'move-page'               => '�$1',
-'move-page-legend'        => '��',
-'movepagetext'            => "使用以下表格會將��改�，兼且連��埋佢嘅歷��去。
+'move-page'                    => '�$1',
+'move-page-legend'             => '��',
+'movepagetext'                 => "使用以下表格會將��改�，兼且連��埋佢嘅歷��去。
 舊標題會變�指去新標題嘅跳轉�。
 你�以自動噉更新指到原先標題嘅跳轉。
 如果你�咗唔去�嘅話，請務必�檢查�有冇[[Special:Doubledirects|雙�跳轉]]或者[[Special:BrokenRedirects|死跳轉]]（嘅情�發生）。
@@ -1880,47 +2101,60 @@ $1',
 
 '''警告�'''
 噉樣�於一個好多人經�嘅��嚟講�能係一個好大嘅�埋出人�表嘅修改；請你喺行動之�確�你清楚噉�嘅後果。",
-'movepagetalktext'        => "相應嘅討論�會連�佢一齊自動��去，'''除�'''：
+'movepagetalktext'             => "相應嘅討論�會連�佢一齊自動��去，'''除�'''：
 *新嘅���下�已經有咗一個�空嘅討論�，�或者
 *你唔剔下�個框。
 
 喺呢啲情�下，需�嘅話你唯有手動���併個��。",
-'movearticle'             => '��:',
-'movenotallowed'          => '你並無權�去�版。',
-'newtitle'                => '到新標題:',
-'move-watch'              => '�實呢一版',
-'movepagebtn'             => '��',
-'pagemovedsub'            => '���功',
-'movepage-moved'          => '<big>\'\'\'"$1"已經�到去"$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '已經有���嗰個�，或者你�嘅�唔�法。請��第二個�。',
-'cantmove-titleprotected' => '你唔�以�呢版去呢個�置，因為個新標題已經�護咗，唔畀開版。',
-'talkexists'              => "'''��本身已經�功�咗，但係個討論��唔到，因為已經有一個��嘅討論�。請手工�併佢哋。'''",
-'movedto'                 => '�去',
-'movetalk'                => '�相應嘅討論�',
-'move-subpages'           => '如果�以嘅話，�全部嘅細�',
-'move-talk-subpages'      => '如果�以嘅話，�全部嘅細討論�',
-'movepage-page-exists'    => '版$1已經存在，唔�以自動噉覆寫。',
-'movepage-page-moved'     => '版$1已經�到去$2。',
-'movepage-page-unmoved'   => '版$1唔�以�到去$2。',
-'movepage-max-pages'      => '最多有$1版已經�咗�時唔�以自動噉��更多。',
-'1movedto2'               => '[[$1]]�到去[[$2]]',
-'1movedto2_redir'         => '[[$1]]通�跳轉�到去[[$2]]',
-'movelogpage'             => '移動日誌',
-'movelogpagetext'         => '以下係��嘅��清單。',
-'movereason'              => '原因',
-'revertmove'              => '�復',
-'delete_and_move'         => '刪除並移動',
-'delete_and_move_text'    => '==需�刪除==
+'movearticle'                  => '��:',
+'movenologin'                  => '未登入',
+'movenologintext'              => '你�係註冊用戶而且�[[Special:UserLogin|登入]]咗先�以��',
+'movenotallowed'               => '你並無權�去�版。',
+'movenotallowedfile'           => '你並無權�去�檔。',
+'cant-move-user-page'          => '你並無權�去�用戶版（佢嘅細版之外）。',
+'cant-move-to-user-page'       => '你並無權�去�到一個用戶版（佢嘅細版之外）。',
+'newtitle'                     => '到新標題:',
+'move-watch'                   => '�實呢一版',
+'movepagebtn'                  => '��',
+'pagemovedsub'                 => '���功',
+'movepage-moved'               => '<big>\'\'\'"$1"已經�到去"$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '一個跳轉已經開咗。',
+'movepage-moved-noredirect'    => '已經壓制開個跳轉。',
+'articleexists'                => '已經有���嗰個�，或者你�嘅�唔�法。請��第二個�。',
+'cantmove-titleprotected'      => '你唔�以�呢版去呢個�置，因為個新標題已經�護咗，唔畀開版。',
+'talkexists'                   => "'''��本身已經�功�咗，但係個討論��唔到，因為已經有一個��嘅討論�。請手工�併佢哋。'''",
+'movedto'                      => '�去',
+'movetalk'                     => '�相應嘅討論�',
+'move-subpages'                => '如果�以嘅話，�全部嘅細�',
+'move-talk-subpages'           => '如果�以嘅話，�全部嘅細討論�',
+'movepage-page-exists'         => '版$1已經存在，唔�以自動噉覆寫。',
+'movepage-page-moved'          => '版$1已經�到去$2。',
+'movepage-page-unmoved'        => '版$1唔�以�到去$2。',
+'movepage-max-pages'           => '最多有$1版已經�咗�時唔�以自動噉��更多。',
+'1movedto2'                    => '[[$1]]�到去[[$2]]',
+'1movedto2_redir'              => '[[$1]]通�跳轉�到去[[$2]]',
+'move-redirect-suppressed'     => '跳轉已壓制',
+'movelogpage'                  => '移動日誌',
+'movelogpagetext'              => '以下係全部��嘅��清單。',
+'movereason'                   => '原因',
+'revertmove'                   => '�復',
+'delete_and_move'              => '刪除並移動',
+'delete_and_move_text'         => '==需�刪除==
 
 目標�「[[:$1]]�已經存在。你�唔�刪咗佢空個�出嚟畀個�文動作？',
-'delete_and_move_confirm' => '好，刪咗嗰個��',
-'delete_and_move_reason'  => '已經刪咗嚟畀�畀個�文動作',
-'selfmove'                => '原始標題�目的標題一樣；唔�以將個���返去自己度。',
-'immobile_namespace'      => '來�或目的標題屬於特別類型；唔�以將���自或�去嗰個空間�。',
-'imagenocrossnamespace'   => '唔�以�檔案到�檔案空間�',
-'imagetypemismatch'       => '個新副檔�唔�佢嘅類型',
-'imageinvalidfilename'    => '個目標檔�係無效嘅',
-'fix-double-redirects'    => '更新指到原先標題嘅任何跳轉',
+'delete_and_move_confirm'      => '好，刪咗嗰個��',
+'delete_and_move_reason'       => '已經刪咗嚟畀�畀個�文動作',
+'selfmove'                     => '原始標題�目的標題一樣；唔�以將個���返去自己度。',
+'immobile-source-namespace'    => '唔�以響空間�「$1�度�版',
+'immobile-target-namespace'    => '唔�以將版�到「$1�度',
+'immobile-target-namespace-iw' => '垮維基連�響�版度係無效嘅目標。',
+'immobile-source-page'         => '呢版唔�得。',
+'immobile-target-page'         => '�唔到去目標標題度。',
+'imagenocrossnamespace'        => '唔�以�檔案到�檔案空間�',
+'imagetypemismatch'            => '個新副檔�唔�佢嘅類型',
+'imageinvalidfilename'         => '個目標檔�係無效嘅',
+'fix-double-redirects'         => '更新指到原先標題嘅任何跳轉',
+'move-leave-redirect'          => '留底跳轉',
 
 # Export
 'export'            => '倒出/導出/匯出（Export）��',
@@ -1928,7 +2162,7 @@ $1',
 
 �倒出��嘅話，就喺下�嘅文字框度打標題�，一行一個標題，然後�你係��時版本加上所有嘅舊版本�歷�，定係淨係��時版本�最後編輯嘅相關資訊。
 
-喺後�嗰種情�下，你亦都�以用一個連�，例如[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]���"[[{{MediaWiki:Mainpage}}]]"。',
+喺後�嗰種情�下，你亦都�以用一個連�，例如[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]���"[[{{MediaWiki:Mainpage}}]]"。',
 'exportcuronly'     => '淨係包括而家嘅修訂版本，唔包括完整歷�',
 'exportnohistory'   => "----
 '''注�：'''因為性能嘅原因，已經�用�止咗使用呢個表格倒出��嘅完整歷�",
@@ -1944,7 +2178,7 @@ $1',
 'allmessagesdefault'        => '�設文字',
 'allmessagescurrent'        => '�時文字',
 'allmessagestext'           => '以下係 MediaWiki 空間�入邊�有系統信�嘅清單。
-如果想貢�正宗嘅MediaWiki本地化嘅話，請�閱[http://www.mediawiki.org/wiki/Localisation MediaWiki本地化]�埋[http://translatewiki.net Betawiki]。',
+如果想貢�正宗嘅MediaWiki本地化嘅話，請�閱[http://www.mediawiki.org/wiki/Localisation MediaWiki本地化]�埋[http://translatewiki.net translatewiki.net]。',
 'allmessagesnotsupportedDB' => "呢一版唔�以用，因為'''\$wgUseDatabaseMessages'''已經閂咗。",
 'allmessagesfilter'         => '信���濾（器）：',
 'allmessagesmodified'       => '�顯示修改�嘅',
@@ -1964,9 +2198,12 @@ $1',
 'import-interwiki-text'      => '�一個 wiki �埋一�去倒入。
 修訂日期�編輯者會被�存�嚟。
 所有 transwiki 嘅倒入動作會響[[Special:Log/import|倒入日誌]]度記錄�嚟。',
+'import-interwiki-source'    => '來� wiki��:',
 'import-interwiki-history'   => '複製呢一�所有嘅歷�版本',
 'import-interwiki-submit'    => '倒入',
 'import-interwiki-namespace' => '目的空間�：',
+'import-upload-filename'     => '檔�:',
+'import-comment'             => '註解:',
 'importtext'                 => '請由原 wiki 嘅[[Special:Export|匯出工具]]匯出�檔案。
 儲存喺你個�碟度，然後�上載到呢度。',
 'importstart'                => '倒入緊...',
@@ -2001,19 +2238,19 @@ $1',
 'import-logentry-interwiki-detail' => '由$2嘅$1個修訂',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => '我嘅用戶�',
+'tooltip-pt-userpage'             => '你嘅用戶�',
 'tooltip-pt-anonuserpage'         => '你編輯呢個IP嘅�應用戶�',
-'tooltip-pt-mytalk'               => '我嘅�話�',
+'tooltip-pt-mytalk'               => '你嘅�話�',
 'tooltip-pt-anontalk'             => '�於嚟自呢一個IP地�編輯嘅討論',
-'tooltip-pt-preferences'          => '我嘅喜好設定',
+'tooltip-pt-preferences'          => '你嘅喜好設定',
 'tooltip-pt-watchlist'            => '你所監視嘅��更改一覽',
-'tooltip-pt-mycontris'            => '我嘅貢�一覽',
-'tooltip-pt-login'                => '登入係唔需�嘅，但會帶嚟好多嘅好處',
-'tooltip-pt-anonlogin'            => '登入係唔需�嘅，但會帶嚟好多嘅好處',
+'tooltip-pt-mycontris'            => '你嘅貢�一覽',
+'tooltip-pt-login'                => '建議你去登入；但係唔係一定嘅',
+'tooltip-pt-anonlogin'            => '建議你去登入；但係唔係一定嘅',
 'tooltip-pt-logout'               => '登出',
 'tooltip-ca-talk'                 => '關於內容�嘅討論',
 'tooltip-ca-edit'                 => '你�以編輯呢一�。請在儲存之�先�覽一�。',
-'tooltip-ca-addsection'           => '開始新嘅討論',
+'tooltip-ca-addsection'           => '開始新嘅�節',
 'tooltip-ca-viewsource'           => '呢一�已經被�護。你�以��呢一�呢原始碼。',
 'tooltip-ca-history'              => '呢一�之�嘅版本',
 'tooltip-ca-protect'              => '�護呢一�',
@@ -2025,7 +2262,7 @@ $1',
 'tooltip-search'                  => '�{{SITENAME}}',
 'tooltip-search-go'               => '如果相�嘅標題存在嘅話就直接去嗰一版',
 'tooltip-search-fulltext'         => '�呢個文字嘅版',
-'tooltip-p-logo'                  => '頭版',
+'tooltip-p-logo'                  => '�頭版',
 'tooltip-n-mainpage'              => '�頭版',
 'tooltip-n-portal'                => '關於呢個計劃，你�以�乜，應該�點�',
 'tooltip-n-currentevents'         => '�供而家發生嘅事嘅背景資料',
@@ -2054,12 +2291,14 @@ $1',
 'tooltip-ca-nstab-category'       => '��分類�',
 'tooltip-minoredit'               => '標為細嘅修訂',
 'tooltip-save'                    => '�存你嘅更改',
-'tooltip-preview'                 => '�覽你嘅修改，請喺�存之�先�覽一次先�',
+'tooltip-preview'                 => '�覽你嘅修改，請喺�存之�先�覽一次先',
 'tooltip-diff'                    => '顯示你���所作嘅修改',
 'tooltip-compareselectedversions' => '顯示該��兩個所�版本嘅唔�之處。',
 'tooltip-watch'                   => '將呢�加到去你嘅監視清單度',
 'tooltip-recreate'                => '�使已經刪除�都��新整�呢�',
 'tooltip-upload'                  => '開始上載',
+'tooltip-rollback'                => '『�轉��以一撳復原上一�貢�者�呢版嘅編輯',
+'tooltip-undo'                    => '『復原��以響編輯模�度開編輯表以便復原。容許響摘�度加入原因',
 
 # Stylesheets
 'common.css'      => '/* 響呢度放 CSS 碼來改�個網站嘅畫� */',
@@ -2071,6 +2310,8 @@ $1',
 'chick.css'       => '/* 響呢度放 CSS 碼去改用戶用嘅�畫� */',
 'simple.css'      => '/* 響呢度放 CSS 碼去改用戶用嘅簡單畫� */',
 'modern.css'      => '/* 響呢度放 CSS 碼去改用戶用嘅摩登畫� */',
+'print.css'       => '/* 響呢度放 CSS 碼去改打�輸出 */',
+'handheld.css'    => '/* 響呢度放 CSS 碼去改響 $wgHandheldStyle 設定手��置畫� */',
 
 # Scripts
 'common.js'      => '/* 響�一次個��載入時，所有用戶都會載入呢度任何嘅JavaScript。 */',
@@ -2089,12 +2330,12 @@ $1',
 'notacceptable'     => '呢個 wiki 伺�器唔能夠畀一個�以讀嘅資料畀個客。',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}嘅匿�用戶',
+'anonymous'        => '{{SITENAME}}嘅匿�{{PLURAL:$1|用戶|用戶}}',
 'siteuser'         => '{{SITENAME}}嘅用戶$1',
 'lastmodifiedatby' => '呢一�最後響 $1 $2 畀 $3 修改。', # $1 date, $2 time, $3 user
 'othercontribs'    => '以$1嘅作�為基礎。',
 'others'           => '其他',
-'siteusers'        => '{{SITENAME}}嘅用戶$1',
+'siteusers'        => '{{SITENAME}}嘅{{PLURAL:$2|用戶|用戶}}$1',
 'creditspage'      => '��信譽',
 'nocredits'        => '呢一�並無任何嘅信譽資料�以�供。',
 
@@ -2115,6 +2356,16 @@ $1',
 'numauthors'     => '唔�編者嘅數目（版�）：$1',
 'numtalkauthors' => '唔�編者嘅數目（討論�）：$1',
 
+# Skin names
+'skinname-standard'    => '傳統',
+'skinname-nostalgia'   => '懷舊',
+'skinname-cologneblue' => '科隆�',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => '我嘅畫�',
+'skinname-chick'       => '�',
+'skinname-simple'      => 'ç°¡å–®',
+'skinname-modern'      => 'æ‘©ç™»',
+
 # Math options
 'mw_math_png'    => '全部用PNG表示',
 'mw_math_simple' => '如果好簡單嘅就用HTML，�則就用PNG',
@@ -2135,10 +2386,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '你係唔准去標示你自己嘅更改�已巡查嘅。',
 
 # Patrol log
-'patrol-log-page'   => '巡查日誌',
-'patrol-log-header' => '呢個係已經巡查�嘅日誌。',
-'patrol-log-line'   => '已經標示咗$1/$2版�已經巡查嘅$3',
-'patrol-log-auto'   => '(自動)',
+'patrol-log-page'      => '巡查日誌',
+'patrol-log-header'    => '呢個係已經巡查�嘅日誌。',
+'patrol-log-line'      => '已經標示咗$1/$2版�已經巡查嘅$3',
+'patrol-log-auto'      => '(自動)',
+'patrol-log-diff'      => '修訂 $1',
+'log-show-hide-patrol' => '$1巡查紀錄',
 
 # Image deletion
 'deletedrevision'                 => '刪除咗$1嘅舊有修訂',
@@ -2155,6 +2408,9 @@ $1',
 'previousdiff' => '� 上一個差異',
 'nextdiff'     => '下一個差異 →',
 
+# Visual comparison
+'visual-comparison' => '�見比較',
+
 # Media information
 'mediawarning'         => "'''警告'''：呢個檔案�能有一啲惡�嘅程�編碼，如果執行佢嘅話，你嘅系統�能會被波�。<hr />",
 'imagemaxsize'         => '�制檔案述�中嘅圖�細到：',
@@ -2167,10 +2423,12 @@ $1',
 'show-big-image'       => '完整解�度',
 'show-big-image-thumb' => '<small>呢個�覽嘅大細： $1 × $2 �素</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '新檔案畫廊',
 'imagelisttext'         => "以下係'''$1'''個檔案$2排�嘅清單。",
 'newimages-summary'     => '呢個特別�顯示最後上載咗嘅檔案。',
+'newimages-legend'      => '�濾',
+'newimages-label'       => '檔�（或佢嘅一部份）:',
 'showhidebots'          => '($1 機械人)',
 'noimages'              => '冇嘢去�。',
 'ilsubmit'              => '�嘢',
@@ -2404,6 +2662,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ISO �影廠鎢燈',
 'exif-lightsource-255' => '其它光�',
 
+# Flash modes
+'exif-flash-fired-0'    => '閃光燈無開�',
+'exif-flash-fired-1'    => '閃光燈開�',
+'exif-flash-return-0'   => '無頻閃觀測器功能',
+'exif-flash-return-2'   => '頻閃觀測器未�測到光',
+'exif-flash-return-3'   => '頻閃觀測器�測到光',
+'exif-flash-mode-1'     => '強制閃光燈開�',
+'exif-flash-mode-2'     => '強制壓制閃光燈',
+'exif-flash-mode-3'     => '自動模�',
+'exif-flash-function-1' => '無閃光燈功能',
+'exif-flash-redeye-1'   => '紅眼減退模�',
+
 'exif-focalplaneresolutionunit-2' => '�',
 
 'exif-sensingmethod-1' => '無定義',
@@ -2541,21 +2811,10 @@ $1
 請確�你係咪真係想�新整�呢版。",
 'recreate'            => '�新整�',
 
-# HTML dump
-'redirectingto' => '跳轉去[[:$1]]...',
-
 # action=purge
-'confirm_purge'        => '肯定�洗咗呢版個快�版本？
-
-$1',
 'confirm_purge_button' => '肯定',
-
-# AJAX search
-'searchcontaining' => "��有''$1''嘅版。",
-'searchnamed'      => "�個�係''$1''嘅版。",
-'articletitles'    => "以''$1''開頭嘅版",
-'hideresults'      => '收埋�果',
-'useajaxsearch'    => '用AJAX來�嘢',
+'confirm-purge-top'    => '肯定�洗咗呢版個快�版本？',
+'confirm-purge-bottom' => '清�一版係會清除快��埋強迫顯示最�時嘅版本。',
 
 # Multipage image navigation
 'imgmultipageprev' => '� 上一版',
@@ -2575,10 +2834,10 @@ $1',
 'table_pager_empty'        => '無�果',
 
 # Auto-summaries
-'autosumm-blank'   => '移除緊響嗰一版嘅全部內容',
-'autosumm-replace' => "用 '$1' �代緊嗰一版",
-'autoredircomment' => '跳緊轉到[[$1]]',
-'autosumm-new'     => '新�： $1',
+'autosumm-blank'   => '�版洗曬',
+'autosumm-replace' => "用 '$1' �代內容",
+'autoredircomment' => '跳緊轉呢版到[[$1]]',
+'autosumm-new'     => "開咗新版 '$1'",
 
 # Live preview
 'livepreview-loading' => '載入緊…',
@@ -2614,6 +2873,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '未知嘅擴展標籤 "$1"',
+'duplicate-defaultsort' => '警告: �設嘅排�� "$2" 覆蓋之�嘅�設排�� "$1"。',
 
 # Special:Version
 'version'                          => '版本', # Not used as normal message but as header for the special page itself
@@ -2642,13 +2902,13 @@ $1',
 'filepath-submit'  => '�路徑',
 'filepath-summary' => '呢個特別�拎一個檔案嘅完整路徑。圖�會以完整嘅解�度顯示，其它嘅檔案類型會以�佢哋關�咗嘅程�啟動。
 
-請輸入檔�，唔好連埋個"{{ns:image}}:"開頭。',
+請輸入檔�，唔好連埋個"{{ns:file}}:"開頭。',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '㨂�覆檔案',
 'fileduplicatesearch-summary'  => '用�覆檔案嘅切細值去�個檔案係唔係�覆。
 
-輸入檔�嗰陣唔使輸入 "{{ns:image}}:" 開頭。',
+輸入檔�嗰陣唔使輸入 "{{ns:file}}:" 開頭。',
 'fileduplicatesearch-legend'   => '��覆',
 'fileduplicatesearch-filename' => '檔�:',
 'fileduplicatesearch-submit'   => '�',
@@ -2676,6 +2936,15 @@ $1',
 
 # Special:BlankPage
 'blankpage'              => '空白�',
-'intentionallyblankpage' => '呢一版係留空咗嘅，用來作測速等用嘅',
+'intentionallyblankpage' => '呢一版係留空咗嘅，用來作測速等用嘅。',
+
+# External image whitelist
+'external_image_whitelist' => ' #留番呢行一樣嘅字<pre>
+#響下�（//嘅中間部份）入正�表��
+#呢啲將會�外�（已超連�嘅）圖���
+#嗰啲晒�到出來嘅會顯示�圖�，唔係嘅話就�係會顯示連�
+#有 # 開頭嘅行會當�註解
+
+#響呢行上�入晒全部嘅regex。留番呢行一樣嘅字</pre>',
 
 );
diff --git a/languages/messages/MessagesZa.php b/languages/messages/MessagesZa.php
index de856578..765ebbef 100644
--- a/languages/messages/MessagesZa.php
+++ b/languages/messages/MessagesZa.php
@@ -71,7 +71,7 @@ $messages = array(
 'username'    => 'Ciu bouxdeiz:',
 
 # Edit pages
-'summary'            => 'Saegmangj',
+'summary'            => 'Saegmangj:',
 'minoredit'          => 'Di-nej gaij noix',
 'watchthis'          => 'Demq mae-nej',
 'savearticle'        => 'Zonzdiuz mae-nej',
@@ -104,9 +104,6 @@ $messages = array(
 'move'              => 'Caen',
 'movethispage'      => 'Caen mae nej',
 
-# Special:Log
-'log-search-submit' => 'Bei',
-
 # Watchlist
 'watchlist'     => 'Gaeq gou demq',
 'mywatchlist'   => 'Gaeq gou demq',
@@ -114,6 +111,9 @@ $messages = array(
 'watch'         => 'Demq',
 'watchthispage' => 'Demq mae-nej',
 
+# Protect
+'prot_1movedto2' => '[[$1]] caen bei [[$2]]',
+
 # Restrictions (nouns)
 'restriction-move' => 'Caen',
 
@@ -132,6 +132,7 @@ $messages = array(
 # Move page
 'move-page-legend' => 'Caen doengh mae',
 'movearticle'      => 'Caen doengh mae:',
+'movenologin'      => 'Maengx laezhaej',
 'move-watch'       => 'Demq mae-nej',
 'movepagebtn'      => 'Caen doengh mae',
 'movedto'          => 'Caen bei',
@@ -142,7 +143,7 @@ $messages = array(
 'tooltip-pt-preferences' => 'Doenghgaeq gou hae',
 'tooltip-p-logo'         => 'Mae meh',
 
-# Special:NewImages
+# Special:NewFiles
 'ilsubmit' => 'Cwmh',
 
 # Multipage image navigation
diff --git a/languages/messages/MessagesZea.php b/languages/messages/MessagesZea.php
index 6b9ad7f2..a68fc0e3 100644
--- a/languages/messages/MessagesZea.php
+++ b/languages/messages/MessagesZea.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Overleg_gebruker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Overleg_$1',
-	NS_IMAGE            => 'Plaetje',
-	NS_IMAGE_TALK       => 'Overleg_plaetje',
+	NS_FILE             => 'Plaetje',
+	NS_FILE_TALK        => 'Overleg_plaetje',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
 	NS_TEMPLATE         => 'Sjabloon',
@@ -85,8 +85,6 @@ $messages = array(
 'underline-never'   => 'Nooit',
 'underline-default' => 'Webbrowser-standard',
 
-'skinpreview' => '(Voevertoônienge)',
-
 # Dates
 'sunday'        => 'zundag',
 'monday'        => 'maendag',
@@ -180,7 +178,7 @@ $messages = array(
 'mytalk'         => 'Mien overleg',
 'anontalk'       => 'Discussie vò dit IP-adres',
 'navigation'     => 'Navigaotie',
-'and'            => 'en',
+'and'            => '&#32;en',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -243,8 +241,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'Over {{SITENAME}}',
 'aboutpage'            => 'Project:Info',
-'bugreports'           => "Foutrapport'n",
-'bugreportspage'       => "Project:Foutrapport'n",
 'copyright'            => 'Den inoud is beschikbaer onder de $1.',
 'copyrightpagename'    => '{{SITENAME}} auteursrechen',
 'copyrightpage'        => '{{ns:project}}:Auteursrechen',
@@ -267,8 +263,6 @@ $messages = array(
 
 'badaccess'        => 'Fout in toegangsrechten',
 'badaccess-group0' => 'Jie mag de opgevraegde actie nie zelf uutvoere.',
-'badaccess-group1' => 'De actie die-a je opgevrogen ei is gerizzerveerd vo gebrukers uut de groep van $1.',
-'badaccess-group2' => 'De actie die-a je opgevroge ei is gerizzerveerd vò gebrukers uut de groepen $1.',
 'badaccess-groups' => 'De actie die-a je opgevroge ei is gerizzerveerd vò gebrukers uut de groepen $1.',
 
 'versionrequired'     => 'Versie $1 van MediaWiki is vereist',
@@ -358,7 +352,6 @@ De beheêrder ei de volhende reeën opeheven: $1',
 'cannotdelete'         => "Kan de bladzie of 't bestand nie wisse. Misschien is 't a deu iemand aors gewist.",
 'badtitle'             => 'Verkeerde titel',
 'badtitletext'         => "De bladzie die-a je angevrogen ei was ongeldig, leeg, of fout gelinkt vanuut 'n aore wiki. Mischien stae d'r eên of meer teêkens in die-an nie in titels gebruukt kunne ore.",
-'perfdisabled'         => 'Sorry! Deêze functionaliteit is tiedelijk uiteschaokeld, omda dezen de database zò langzaem mik da niemand de wiki kan gebruken.',
 'perfcached'           => "De hehevens komm'n uut een cache en zien meuhlijk nie actueel.",
 'perfcachedts'         => "De hehevens komm'n uut een cache en zien voe 't lèst biehewerkt op $1.",
 'querypage-no-updates' => 'Deêze pagina kan nie biehewerkt worn. Deêze hehevens worn nie ververst.',
@@ -374,7 +367,7 @@ Probeer 't over een antal menuten wee.",
 'protectedpagetext'    => 'Deêze pagina is beveiligd. Bewerken is nie meuhlijk.',
 'viewsourcetext'       => 'Je kan de brontekst van deêze pagina bekieken en kopiëren:',
 'protectedinterface'   => "Deêze pagina bevat tekst voe berichen van de software en is beveiligd om misbruuk te voorkomm'n.",
-'editinginterface'     => "'''Waerschuwienge:''' Je bewerk een pagina die a gebruukt wor deur de software. Bewerkiengen op deêze pagina beïnvloeden de gebrukersinterface van iedereên. Overweeg voe vertaeliengen om [http://translatewiki.net/wiki/Main_Page?setlang=zea Betawiki] te gebruken, 't vertaeliengsproject voe MediaWiki.",
+'editinginterface'     => "'''Waerschuwienge:''' Je bewerk een pagina die a gebruukt wor deur de software. Bewerkiengen op deêze pagina beïnvloeden de gebrukersinterface van iedereên. Overweeg voe vertaeliengen om [http://translatewiki.net/wiki/Main_Page?setlang=zea translatewiki.net] te gebruken, 't vertaeliengsproject voe MediaWiki.",
 'sqlhidden'            => '(SQL-zoekopdracht verborhen)',
 'cascadeprotected'     => "Deêze pagina kan nie bewerkt worn, omda 't een is openomen in de volhende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zien}} mie de cascaode-optie:
 $2",
@@ -386,7 +379,7 @@ De heheven reeën is ''$2''.",
 
 # Login and logout pages
 'logouttitle'                => 'Gebruker afmelden',
-'logouttext'                 => "<strong>Je bin noe ofemeld.</strong><br />
+'logouttext'                 => "'''Je bin noe ofemeld.'''<br />
 Je kan {{SITENAME}} noe anoniem gebruken of wee anmelden as dezelven of een aore gebruker.
 Meuhlijk worn nog een antal pagina's weereheven asof a je anemeld bin totda je de cache van je browser leeg.",
 'welcomecreation'            => '== Welkom, $1! ==
@@ -399,8 +392,6 @@ Vergeet nie je [[Special:Preferences|vòkeuren voe {{SITENAME}}]] an te passen.'
 'remembermypassword'         => 'Anmeldhehevens ontouwen',
 'yourdomainname'             => 'Je domein:',
 'externaldberror'            => "Der is een fout opetreeën bie 't anmelden bie de database of je ei hin toestemmieng jen externe gebruker bie te werken.",
-'loginproblem'               => "<b>Der was een probleem bie 't anmelden.</b><br />
-Probeer 't asjeblieft nog een keêr.",
 'login'                      => 'Anmelden',
 'nav-login-createaccount'    => 'Anmelden / Inschrieven',
 'loginprompt'                => "Je mò cookies ineschaokeld ène om je te kunn'n anmelden bie {{SITENAME}}.",
@@ -460,7 +451,8 @@ diert kan je, om misbruuk te vorkommen, geên nieuw wachtwoord laete opstiere.',
 'eauthentsent'               => "Der is een bevestigiengs-e-mail ni 't opeheven e-mailadres ezon'n. Volg de anwieziengen in de e-mail om an te heven dat 't joen e-mailadres is. Tot die tied kunn'n der hin e-mails ni 't e-mailadres ezon'n worn.",
 'throttled-mailpassword'     => "Der is in de lèste $1 uur een wachtwoôrdherinnerienge verzon'n. Om misbruuk te vorkomm'n wor der slechs eên herinnerienge per $1 uur verzon'n.",
 'mailerror'                  => "Fout bie 't verzen'n van e-mail: $1",
-'acct_creation_throttle_hit' => "J'ei al $1 gebrukers angemaekt. Meêr mag je d'r nie ebbe.",
+'acct_creation_throttle_hit' => "J'ei al $1 {{PLURAL:$1|gebruker|gebrukers}} angemaekt.
+Meêr mag je d'r nie ebbe.",
 'emailauthenticated'         => 'Jen e-mailadres is bevestigd op $1.',
 'emailnotauthenticated'      => 'Jen e-mailadres is <strong>nie bevestigd</strong>. Je ontvang hin e-mail voe de onderstaende functies.',
 'noemailprefs'               => 'Heef een e-mailadres op om deêze functies te gebruken.',
@@ -479,11 +471,13 @@ Neheer dit bericht as deêze gebruker zonder joe medeweten is anemikt.',
 'resetpass'               => "Wachtwoôrd herinstell'n",
 'resetpass_announce'      => "Je bin anemeld mie een tiedelijke code die a je per e-mail is toe-ezon'n. Voer een nieuw wachtwoôrd in om 't anmelden te voltooien:",
 'resetpass_header'        => "Wachtwoôrd herinstell'n",
+'oldpassword'             => 'Udihe wachtwoôrd:',
+'newpassword'             => 'Nieuw wachtwoôrd:',
+'retypenew'               => 'Herhaolieng nieuwe wachtwoôrd:',
 'resetpass_submit'        => "Wachtwoôrd instell'n en anmelden",
 'resetpass_success'       => 'Je wachtwoord is ewiezigd. Bezig mie anmelden ...',
 'resetpass_bad_temporary' => 'Onheldig tiedelijk wachtwoôrd. Je ei je wachtwoôrd a ewiezigd of een nieuw tiedelijk wachtwoôrd anevrogen.',
 'resetpass_forbidden'     => "Wachtwoôrden kunn'n op {{SITENAME}} nie ewiezigd worn",
-'resetpass_missing'       => 'Je ei hin wachtwoôrd ineheven.',
 
 # Edit page toolbar
 'bold_sample'     => 'Vette tekst',
@@ -506,8 +500,8 @@ Neheer dit bericht as deêze gebruker zonder joe medeweten is anemikt.',
 'hr_tip'          => 'Horizontaele lien (gebruuk spaerzaem)',
 
 # Edit pages
-'summary'                   => 'Saemenvatting',
-'subject'                   => 'Onderwerp/kop',
+'summary'                   => 'Saemenvatting:',
+'subject'                   => 'Onderwerp/kop:',
 'minoredit'                 => 'Dit is een kleine wieziging',
 'watchthis'                 => 'Volg deêze bladzie',
 'savearticle'               => 'Bewaer bladzie',
@@ -519,8 +513,8 @@ Neheer dit bericht as deêze gebruker zonder joe medeweten is anemikt.',
 'missingsummary'            => "'''Herinnerieng:''' je ei hin saemenvattieng opeheven voe je bewerkieng. A je nog een keêr op ''Pagina opslaen'' klik wor de bewerkieng zonder saemenvattieng opeslogen.",
 'missingcommenttext'        => 'Plek jen opmerkieng asjeblieft ieronder.',
 'missingcommentheader'      => "'''Let op:''' Je ei hin onderwerp/kop voe deêze opmerkieng opeheven. A je opnieuw op \"opslaen\" klik, wor je wieziging zonder een onderwerp/kop opeslogen.",
-'summary-preview'           => 'Saemenvattieng naekieken',
-'subject-preview'           => 'Naekieken onderwerp/kop',
+'summary-preview'           => 'Saemenvattieng naekieken:',
+'subject-preview'           => 'Naekieken onderwerp/kop:',
 'blockedtitle'              => 'Gebruker is geblokkeerd',
 'blockedtext'               => "<big>'''Je gebruker of IP-adres is eblokkeerd.'''</big>
 
@@ -583,24 +577,24 @@ Je kan [[Special:Search/{{PAGENAME}}|ni deêze term zoeken]] in aore pagina\'s o
 |-
 | Konqueror || F5
 |}',
-'usercssjsyoucanpreview'    => "<strong>Tip:</strong> Gebruuk de knoppe 'Naekieken' om je nieuwe CSS/JS te tessen voe da je opsli.",
+'usercssjsyoucanpreview'    => "'''Tip:''' Gebruuk de knoppe 'Naekieken' om je nieuwe CSS/JS te tessen voe da je opsli.",
 'usercsspreview'            => "'''Dit is alleên een voeôvertonieng van je persoônlijke CSS, dezen is nog nie opeslogen!'''",
 'userjspreview'             => "'''Let op: je test noe je persoônlijke JavaScript. De pagina is nie opeslogen!'''",
 'userinvalidcssjstitle'     => "'''Waerschuwieng:''' der is hin skin \"\$1\". Let op: jen eihen .css- en .js-pagina's behunnen mie een kleine letter, buvobbeld {{ns:user}}:Naem/monobook.css in plekke van {{ns:user}}:Naem/Monobook.css.",
 'updated'                   => '(Biehewerkt)',
-'note'                      => '<strong>Opmerkieng:</strong>',
-'previewnote'               => '<strong>Let op: dit is een controlepagina; je tekst is nie opeslogen!</strong>',
+'note'                      => "'''Opmerkieng:'''",
+'previewnote'               => "'''Let op: dit is een controlepagina; je tekst is nie opeslogen!'''",
 'previewconflict'           => "Deêze voevertoônieng heef an oe a de tekst in 't bovenste veld deruut zie a je die opsli.",
-'session_fail_preview'      => "<strong>Sorry! Je bewerkieng is nie verwerkt, omdan de sessiehehevens verloorn zien ehaen.
-Probeer 't opnieuw. A 't dan nog nie luk, mel jen eihen dan of en wee an.</strong>",
-'session_fail_preview_html' => "<strong>Sorry! Je bewerkieng is nie verwerkt, omdan sessiehehevens verloren zien ehaene.</strong>
+'session_fail_preview'      => "'''Sorry! Je bewerkieng is nie verwerkt, omdan de sessiehehevens verloorn zien ehaen.
+Probeer 't opnieuw. A 't dan nog nie luk, mel jen eihen dan of en wee an.'''",
+'session_fail_preview_html' => "'''Sorry! Je bewerkieng is nie verwerkt, omdan sessiehehevens verloren zien ehaene.'''
 
 ''Omda in {{SITENAME}} ruwe HTML is ineschaokeld, is een voevertoônieng nie meuhlijk as beschermieng tehen anvall'n mie JavaScript.''
 
-<strong>A dit een lehitieme bewerkieng is, probeer 't dan opnieuw. A 't dan nog nie luk, mel jen eihen dan of en wee an.</strong>",
-'token_suffix_mismatch'     => "<strong>Je bewerkieng is eweiherd omda je browser de leesteêkens in 't bewerkiengstoken onjuust ei behandeld.
+'''A dit een lehitieme bewerkieng is, probeer 't dan opnieuw. A 't dan nog nie luk, mel jen eihen dan of en wee an.'''",
+'token_suffix_mismatch'     => "'''Je bewerkieng is eweiherd omda je browser de leesteêkens in 't bewerkiengstoken onjuust ei behandeld.
 De bewerkieng is eweiherd om vermienkieng van de paginatekst te voorkomm'n.
-Dit gebeur soms a der een webhebaseerde proxydienst wor gebruukt die a fout'n bevat.</strong>",
+Dit gebeur soms a der een webhebaseerde proxydienst wor gebruukt die a fout'n bevat.'''",
 'editing'                   => 'Bezig mie bewerken van $1',
 'editingsection'            => 'Bezig mie bewerken van $1 (deêlpagina)',
 'editingcomment'            => 'Bezig mie bewerken van $1 (opmerkieng)',
@@ -612,29 +606,29 @@ Je dien je bewerkiengen in te voehen in de bestaende tekst.
 <b>Alleên</b> de tekst in 't bovenste hedeêlte wor opeslogen a je op \"Pagina opslaen\" klik.<br />",
 'yourtext'                  => 'Joe tekst',
 'storedversion'             => 'Opeslogen versie',
-'nonunicodebrowser'         => "<strong>WAERSCHUWIENG: Je browser kan nie hoed overwig mie unicode.
-Iermie wor deur de MediaWiki-software rekenienge ehouwen zoda je toch zonder probleemn pagina's kan bewerken: nie-ASCII karakters worn in 't bewerkiengsveld weereheven as hexadecimale codes.</strong>",
-'editingold'                => '<strong>WAARSCHUWING!
+'nonunicodebrowser'         => "'''WAERSCHUWIENG: Je browser kan nie hoed overwig mie unicode.
+Iermie wor deur de MediaWiki-software rekenienge ehouwen zoda je toch zonder probleemn pagina's kan bewerken: nie-ASCII karakters worn in 't bewerkiengsveld weereheven as hexadecimale codes.'''",
+'editingold'                => "'''WAARSCHUWING!
 Je bewerk een ouwe versie van deêze pagina.
-A je je bewerkieng opsli, haen aolle wiezigiengen die an nae deêze versie emikt zien verloorn.</strong>',
+A je je bewerkieng opsli, haen aolle wiezigiengen die an nae deêze versie emikt zien verloorn.'''",
 'yourdiff'                  => 'Wiezigiengen',
 'copyrightwarning'          => "Opelet: Aolle biedraegen an {{SITENAME}} worn eacht te zien vrie'eheven onder de $2 (zie $1 voe details).
 A je nie wil da je tekst deur aore ni believen bewerkt en verspreid kan worn, kies dan nie voe 'Pagina Opslaen'.<br />
 Ierbie beloof je ons ok da je deêze tekst zelf eschreven ei, of overenomen uut een vrieë, openbaere bron.<br />
-<strong>GEBRUUK HIN MATERIAOL DAT A BESCHERMD WOR DEUR AUTEURSRECHT, TENZIE A JE DIVOE TOESTEMMIENG                   EI!</strong>",
+'''GEBRUUK HIN MATERIAOL DAT A BESCHERMD WOR DEUR AUTEURSRECHT, TENZIE A JE DIVOE TOESTEMMIENG                   EI!'''",
 'copyrightwarning2'         => "Al je biedraehen an {{SITENAME}} kunn'n bewerkt, ewiezigd of verwiederd worn deur aore gebrukers.
 A je nie wil dan je teksen rihoreus anepast worn deur aore, plek ze ier dan nie.<br />
 Je beloof ok da je de oôrspronkelijke auteur bin van dit materiaol, of da je 't ei ekopieerd uut een bron in 't publieke domein, of een soôrthelieke vrieë bron (zie $1 voor details).
-<strong>GEBRUUK HIN MATERIAOL DAT A BESCHERMD WOR DEUR AUTEURSRECHT, TENZIE A JE DIVOE TOESTEMMIENG EI!</strong>",
-'longpagewarning'           => "<strong>WAERSCHUWIENG: Deêze pagina is $1 kilobyte hroôt; sommihe browsers èn probleemn mie 't bewerken van pagina's die an hrotter zien dan 32 kb. Misschien kan deêze pagina esplitst worn in kleinere deêln.</strong>",
-'longpageerror'             => "<strong>FOUT: de tekst die a je ei toe'evoegd is $1 kilobyte hroôt, wat a hrotter is dan 't maximum van $2 kilobyte.
-Opslaene is nie meuhlijk.</strong>",
-'readonlywarning'           => "<strong>WAERSCHUWIENG: de database is eblokkeerd voe onderoud, dus je kan dezen noe nie opslaen.
-'t Is misschien verstandig om je tekst tiedelijk in een tekstbestand op te slaene om dit te bewaeren                    ve wunnir a de blokkerieng van de database opeheven is.</strong>",
-'protectedpagewarning'      => '<strong>WAERSCHUWIENG! Deêze beveiligde pagina kan allin deur gebrukers mie beheêrdersrechten bewerkt        worn.</strong>',
+'''GEBRUUK HIN MATERIAOL DAT A BESCHERMD WOR DEUR AUTEURSRECHT, TENZIE A JE DIVOE TOESTEMMIENG EI!'''",
+'longpagewarning'           => "'''WAERSCHUWIENG: Deêze pagina is $1 kilobyte hroôt; sommihe browsers èn probleemn mie 't bewerken van pagina's die an hrotter zien dan 32 kb. Misschien kan deêze pagina esplitst worn in kleinere deêln.'''",
+'longpageerror'             => "'''FOUT: de tekst die a je ei toe'evoegd is $1 kilobyte hroôt, wat a hrotter is dan 't maximum van $2 kilobyte.
+Opslaene is nie meuhlijk.'''",
+'readonlywarning'           => "'''WAERSCHUWIENG: de database is eblokkeerd voe onderoud, dus je kan dezen noe nie opslaen.
+'t Is misschien verstandig om je tekst tiedelijk in een tekstbestand op te slaene om dit te bewaeren                    ve wunnir a de blokkerieng van de database opeheven is.'''",
+'protectedpagewarning'      => "'''WAERSCHUWIENG! Deêze beveiligde pagina kan allin deur gebrukers mie beheêrdersrechten bewerkt        worn.'''",
 'semiprotectedpagewarning'  => "'''Let op:''' deêze pagina is beveiligd en kan allaen deur herehistreerde gebrukers bewerkt worn.",
 'cascadeprotectedwarning'   => "'''Waerschuwieng:''' Deêze pagina is beveiligd en kan allin deur beheêrders bewerkt worn, omda dezen is openomen in de volhende {{PLURAL:$1|pagina|pagina's}} die a beveiligd {{PLURAL:$1|is|zien}} mie de cascade-optie:",
-'titleprotectedwarning'     => "<strong>WAERSCHUWIENG: Deêze pagina is beveiligd zodan allaen ienkele gebrukers 't kunn'n anmaeken.</strong>",
+'titleprotectedwarning'     => "'''WAERSCHUWIENG: Deêze pagina is beveiligd zodan allaen ienkele gebrukers 't kunn'n anmaeken.'''",
 'templatesused'             => "Op deêze pagina gebruukte sjabloon'n:",
 'templatesusedpreview'      => "Sjabloon'n gebruukt in deêze voevertoônieng:",
 'templatesusedsection'      => "Sjabloon'n die an gebruukt worn in deêze subkop:",
@@ -671,12 +665,9 @@ De deur $3 opeheven reeën is ''$2''",
 # History pages
 'viewpagelogs'        => 'Bekiek de logboeken vò deêze bladzie',
 'nohistory'           => 'Deêze pagina is nie bewerkt.',
-'revnotfound'         => "Bewerkieng nie evon'n",
-'revnotfoundtext'     => 'De opevrogen ouwe versie van deêze pagina is onvindbaer.
-Controleer asjeblieft de URL die  a je hebruken om ni deêze pagina te haene.',
 'currentrev'          => 'Udihe versie',
 'revisionasof'        => 'Versie op $1',
-'revision-info'       => 'Versie op $1 van $2',
+'revision-info'       => 'Versie op $1 van $2', # Additionally available: $3: revision id
 'previousrevision'    => '�Ouwere versie',
 'nextrevision'        => 'Nieuwere versie→',
 'currentrevisionlink' => 'Udihe versie',
@@ -803,6 +794,7 @@ Zurg da je bie deêze wiezigieng de heschiedenisdeurloôpendeid van de pagina be
 'prevn'                 => 'vorrege $1',
 'nextn'                 => 'volhende $1',
 'viewprevnext'          => 'Bekiek ($1) ($2) ($3).',
+'searchhelp-url'        => 'Help:Inoud',
 'search-result-size'    => '$1 ({{PLURAL:$2|1 woôrd|$2 woôrn}})',
 'search-result-score'   => 'Rillevantie: $1%',
 'search-redirect'       => '(deurverwiezieng $1)',
@@ -835,6 +827,7 @@ De hehevens over {{SITENAME}} zien meuhlijk nie bie'ewerkt.",
 'qbsettings-floatingright' => 'Rechs zwevend',
 'changepassword'           => 'Wachtwoôrd wiezigen',
 'skin'                     => 'Vurmhevieng',
+'skin-preview'             => 'Voevertoônienge',
 'math'                     => 'Formules',
 'dateformat'               => 'Datumopmaek',
 'datedefault'              => 'Hin vòkeur',
@@ -856,9 +849,6 @@ De hehevens over {{SITENAME}} zien meuhlijk nie bie'ewerkt.",
 'prefs-misc'               => 'Rest',
 'saveprefs'                => 'Opslaene',
 'resetprefs'               => 'Nie opeslogen wiezigiengen herstellen',
-'oldpassword'              => 'Udihe wachtwoôrd:',
-'newpassword'              => 'Nieuw wachtwoôrd:',
-'retypenew'                => 'Herhaolieng nieuwe wachtwoôrd:',
 'textboxsize'              => 'Bewerken',
 'rows'                     => 'Rehels:',
 'columns'                  => "Kolomm'n:",
@@ -886,7 +876,7 @@ De hehevens over {{SITENAME}} zien meuhlijk nie bie'ewerkt.",
 'userrights-lookup-user'      => "Gebrukershroep'n beheern",
 'userrights-user-editname'    => 'Voer een gebrukersnaem in:',
 'editusergroup'               => "Gebrukershroep'n wiezigen",
-'editinguser'                 => "Bezig mie wiezigen van de gebrukersrechen van gebruker '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+'editinguser'                 => "Bezig mie wiezigen van de gebrukersrechen van gebruker '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
 'userrights-editusergroup'    => "Gebrukershroep'n wiezigen",
 'saveusergroups'              => "Gebrukershroep'n opslaene",
 'userrights-groupsmember'     => 'Lid van:',
@@ -973,12 +963,12 @@ om bestan'n te upload'n.",
 'upload_directory_read_only' => 'De webserver kan nie schrieven in de uploadmap ($1).',
 'uploaderror'                => 'Uploadfout',
 'uploadtext'                 => "Gebruuk 't onderstaende formelier om bestan'n te uploaden.
-Om eêder toehevoegde bestan'n te bekieken of te zoeken kan je ni de [[Special:ImageList|bestandslieste]] haen.
+Om eêder toehevoegde bestan'n te bekieken of te zoeken kan je ni de [[Special:FileList|bestandslieste]] haen.
 Uploads en verwiederiengen worn bie'ehouwen in 't [[Special:Log/upload|uploadlogboek]].
 
 Om 't bestand in te voehen in een pagina kan je eên van de volhende codes gebruken, a ni helang 't bestandsformaot dat van toepassieng is:
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bestand.jpg]]</nowiki>'''
-* '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:Bestand.png|alternatieve tekst]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bestand.jpg]]</nowiki>'''
+* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:Bestand.png|alternatieve tekst]]</nowiki>'''
 * '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:Bestand.ogg]]</nowiki>'''
 
 De lèste lienk is bedoeld voe mediabestan'n die an hin plaetje zien.",
@@ -1040,38 +1030,43 @@ Je kan 't overzicht bepaelen deu 'n soôrte logboek, 'n gebrukersnaem of eên bl
 'special-categories-sort-count' => 'op antal sorteern',
 'special-categories-sort-abc'   => 'alfabetisch sorteern',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Nieuwe gebruker',
+
 # E-mail user
 'emailuser' => 'E-mail deêze gebruker',
 'emailpage' => 'E-mail gebruker',
 
 # Watchlist
-'watchlist'            => 'Volglieste',
-'mywatchlist'          => 'Mien volglieste',
-'watchlistfor'         => "(vò '''$1''')",
-'watchnologin'         => 'Je bin nie angemolde.',
-'watchnologintext'     => 'Je moe [[Special:UserLogin|angemolde]] weze om je volglieste an te passen.',
-'addedwatch'           => 'An de volglieste toegevoegd',
-'addedwatchtext'       => "De bladzie \"[[:\$1]]\" is an je [[Special:Watchlist|Volglieste]] toegevoegd.
+'watchlist'         => 'Volglieste',
+'mywatchlist'       => 'Mien volglieste',
+'watchlistfor'      => "(vò '''$1''')",
+'watchnologin'      => 'Je bin nie angemolde.',
+'watchnologintext'  => 'Je moe [[Special:UserLogin|angemolde]] weze om je volglieste an te passen.',
+'addedwatch'        => 'An de volglieste toegevoegd',
+'addedwatchtext'    => "De bladzie \"[[:\$1]]\" is an je [[Special:Watchlist|Volglieste]] toegevoegd.
 Veranderiengen an deêze bladzie en de overlegbladzie die-a d'rbie oort zulle ierop zichtbaer ore
 en de bladzie komt '''vet''' te staen in de [[Special:RecentChanges|lieste van wat-a juust veranderd is]], daermee 't makkeliker te vinden is.
 A je de bladzie laeter weêr van je volglieste afaele wil, klik dan op \"nie meêr volge\" bovenan de bladzie.",
-'watch'                => 'Volg',
-'watchthispage'        => 'Bekiek deêze bladzie',
-'unwatch'              => 'Nie meêr volge',
-'watchnochange'        => "D'r is in d'n opgevrogen tied niks op je volglieste veranderd.",
-'watchlistcontains'    => 'Uw volglieste bevat $1 {{PLURAL:$1|bladzie|bladzies}}.',
-'watchlist-hide-bots'  => 'Verberge bot wiezigingen',
-'watchlist-hide-own'   => 'Verberge mien wiezigingen',
-'watchlist-hide-minor' => 'Verberge kleine wiezigingen',
-
-# Delete/protect/revert
+'watch'             => 'Volg',
+'watchthispage'     => 'Bekiek deêze bladzie',
+'unwatch'           => 'Nie meêr volge',
+'watchnochange'     => "D'r is in d'n opgevrogen tied niks op je volglieste veranderd.",
+'watchlistcontains' => 'Uw volglieste bevat $1 {{PLURAL:$1|bladzie|bladzies}}.',
+
+# Delete
 'actioncomplete' => 'Actie uutgevoerd',
 'deletedarticle' => 'wiste "[[$1]]"',
 'dellogpage'     => 'Wislogboek',
-'alreadyrolled'  => 'De lèste bewerkienge op [[$1]] deu [[User:$2|$2]] ([[User talk:$2|Overleggienge]]) kan nie vrommegedraoid ore; iemand aors eit de bladzie al bewerkt of ersteld.
+
+# Rollback
+'alreadyrolled' => 'De lèste bewerkienge op [[$1]] deu [[User:$2|$2]] ([[User talk:$2|Overleggienge]]) kan nie vrommegedraoid ore; iemand aors eit de bladzie al bewerkt of ersteld.
 De lèste bewerkienge wier gedaen deu [[User:$3|$3]] ([[User talk:$3|Overleggienge]]).',
-'revertpage'     => 'Wiezigingen deur [[Special:Contributions/$2|$2]] ([[User talk:$2|Overleg]]) teruggedraoid nae de lèste versie van [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'revertpage'    => 'Wiezigingen deur [[Special:Contributions/$2|$2]] ([[User talk:$2|Overleg]]) teruggedraoid nae de lèste versie van [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+
+# Protect
 'protectlogpage' => 'Beschermlogboek',
+'prot_1movedto2' => '[[$1]] is verschove nae [[$2]]',
 
 # Undelete
 'cannotundelete' => 'Can de bladzie nie erstelle; mischien eit iemand aors de bladzie a vrommegezet.',
@@ -1145,9 +1140,6 @@ Kiest 'n aore naem.",
 'watchlistall2' => 'aol',
 'namespacesall' => 'aol',
 
-# AJAX search
-'articletitles' => "Artikels die-an beginne mee ''$1''",
-
 # Multipage image navigation
 'imgmultipageprev' => '� vorrege bladzie',
 'imgmultipagenext' => 'volgende bladzie →',
diff --git a/languages/messages/MessagesZh.php b/languages/messages/MessagesZh.php
index 79e070b3..137baff0 100644
--- a/languages/messages/MessagesZh.php
+++ b/languages/messages/MessagesZh.php
@@ -27,10 +27,17 @@ $namespaceAliases = array(
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#'{{SITENAME}}_对�' => NS_PROJECT_TALK
 	#"{{SITENAME}}_�話" => NS_PROJECT_TALK
-	'图�' => NS_IMAGE,
-	'圖�' => NS_IMAGE,
-	'图�对�' => NS_IMAGE_TALK,
-	'圖��話' => NS_IMAGE_TALK,
+	'图�' => NS_FILE,
+	'圖�' => NS_FILE,
+	'档案' => NS_FILE,
+	'檔案' => NS_FILE,
+	'文件' => NS_FILE,
+	'图�对�' => NS_FILE_TALK,
+	'圖��話' => NS_FILE_TALK,
+	'档案对�' => NS_FILE_TALK,
+	'檔案�話' => NS_FILE_TALK,
+	'文件对話' => NS_FILE_TALK,
+	'文件�話' => NS_FILE_TALK,
 	'模�'	=> NS_TEMPLATE,
 	'模�讨论'=> NS_TEMPLATE_TALK,
 	"樣�" => NS_TEMPLATE,
diff --git a/languages/messages/MessagesZh_classical.php b/languages/messages/MessagesZh_classical.php
index fea8aa93..2b49864a 100644
--- a/languages/messages/MessagesZh_classical.php
+++ b/languages/messages/MessagesZh_classical.php
@@ -5,19 +5,9 @@
  * @file
  *
  * @author Itsmine
+ * @author Omnipaedista
  */
 
-$skinNames = array(
-        'standard' => '經典',
-        'nostalgia' => '懷�',
-        'cologneblue' => '馨�',
-        'monobook' => '單書',
-        'myskin' => '�風',
-	'chick' => '窈窕',
-	'simple' => '簡明',
-	'modern' => '時髦',
-);
-
 /**
  * A list of date format preference keys which can be selected in user
  * preferences. New preference keys can be added, provided they are supported
@@ -108,17 +98,19 @@ $messages = array(
 'tog-watchlisthideown'        => '�哨己文',
 'tog-watchlisthidebots'       => '�哨僕文',
 'tog-watchlisthideminor'      => '�哨�纂',
+'tog-watchlisthideliu'        => '�哨有簿',
+'tog-watchlisthideanons'      => '�哨無簿',
 'tog-nolangconversion'        => '�轉',
 'tog-ccmeonemails'            => '傳己之副信',
 'tog-diffonly'                => '異下無示�',
 'tog-showhiddencats'          => '示隱類',
+'tog-noconvertlink'           => '�轉�題',
+'tog-norollbackdiff'          => '轉後略異',
 
 'underline-always'  => '�',
 'underline-never'   => '絕',
 'underline-default' => 'æ…£',
 
-'skinpreview' => '（�覽）',
-
 # Dates
 'sunday'        => '週日',
 'monday'        => '週一',
@@ -275,8 +267,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => 'è¿°{{SITENAME}}',
 'aboutpage'            => 'Project:è¿°',
-'bugreports'           => '錯�集',
-'bugreportspage'       => 'Project:錯�集',
 'copyright'            => '文奉$1行。',
 'copyrightpagename'    => '權歸{{SITENAME}}',
 'copyrightpage'        => '{{ns:project}}:版權',
@@ -299,7 +289,7 @@ $messages = array(
 
 'badaccess'        => '�未逮',
 'badaccess-group0' => '�未逮，歉�之。',
-'badaccess-group1' => '��$1，歉�之',
+'badaccess-groups' => '�未逮，歉�之有{{PLURAL:$2|一|多}}：$1',
 
 'versionrequired'     => '惠置$1媒維基',
 'versionrequiredtext' => '惠置$1媒維基，見[[Special:Version|版]]。',
@@ -313,6 +303,8 @@ $messages = array(
 'editsection'             => '纂',
 'editold'                 => '纂',
 'viewsourceold'           => '察�碼',
+'editlink'                => '纂',
+'viewsourcelink'          => '察�碼',
 'editsectionhint'         => '纂 $1',
 'toc'                     => 'ç« ',
 'showtoc'                 => '示',
@@ -320,6 +312,7 @@ $messages = array(
 'thisisdeleted'           => '還$1或閱之？',
 'viewdeleted'             => '閱$1之？',
 'restorelink'             => '$1已刪',
+'feedlinks'               => '�：',
 'feed-unavailable'        => '���無視也',
 'site-rss-feed'           => '$1之RSS�',
 'site-atom-feed'          => '$1之Atom�',
@@ -351,7 +344,7 @@ $messages = array(
 'error'                => '有誤',
 'databaseerror'        => '庫�誤然',
 'dberrortext'          => '�庫語誤，或軟體瑕焉。
-末語�:
+末語�：
 <blockquote><tt>$1</tt></blockquote>
 內此函�"<tt>$2</tt>".
 MySQL報有誤"<tt>$3: $4</tt>"。',
@@ -386,14 +379,14 @@ $1',
 'cannotdelete'         => '此�或刪矣，�復為之。',
 'badtitle'             => '無此題',
 'badtitletext'         => '或別�或缺�或��或他山謬�，此題�存也。',
-'perfdisabled'         => '歉哉，此舉累�他人，故�之。',
 'perfcached'           => '下為謄本，��新也。',
 'perfcachedts'         => '下為謄本，$1新之。',
 'wrong_wfQuery_params' => 'wfQuery()�數謬然<br />
-函�: $1<br />
-�語: $2',
+函�： $1<br />
+�語： $2',
 'viewsource'           => '覽�',
 'viewsourcefor'        => '$1',
+'actionthrottled'      => '無為',
 'protectedinterface'   => '此��版，緘之以�濫。',
 'editinginterface'     => "'''警示：'''此��版，一髮牽身，惠慎之。如譯之，�慮[http://translatewiki.net/wiki/Main_Page?setlang=zh-hant Betawiki]也，為MediaWiki軟件本地化之計劃也。",
 'sqlhidden'            => '(SQL隱然)',
@@ -421,7 +414,6 @@ $2',
 'yourpasswordagain'          => '復核節',
 'remembermypassword'         => '記之',
 'externaldberror'            => '�庫之錯或�更爾之外簿。',
-'loginproblem'               => '<b>登簿有誤</b><br />惠�之。',
 'login'                      => '登簿',
 'nav-login-createaccount'    => '登簿�增簿',
 'loginprompt'                => '登簿{{SITENAME}}須cookies，請准之。',
@@ -477,8 +469,8 @@ $2',
 'throttled-mailpassword'     => '密記已寄之於$1時�。
 防濫，單一密記短至$1時寄之。',
 'mailerror'                  => '信失�如下：$1',
-'acct_creation_throttle_hit' => '歉哉，$1存矣，��復增也。',
-'emailauthenticated'         => '$1郵驛證矣',
+'acct_creation_throttle_hit' => '歉哉，$1簿增矣，��復增也。',
+'emailauthenticated'         => '$2 $3郵驛證矣',
 'emailnotauthenticated'      => '郵驛<strong>未證</strong>，下��書。',
 'noemailprefs'               => '郵驛須然如下：',
 'emailconfirmlink'           => '惠考郵驛',
@@ -489,17 +481,27 @@ $2',
 'createaccount-text'         => '有人於{{SITENAME}}用爾之電郵增�為 "$2" 之簿 ($4)，符節為 "$3" 。�應登，�改符節也。
 
 如簿誤增，爾�略之。',
+'login-throttled'            => '爾多試於此簿之符中。請候�試之。',
 'loginlanguagelabel'         => '語：$1',
 
 # Password reset dialog
-'resetpass_announce'      => '爾乃�郵之臨符登之。�完登，�乃需設新符節：',
-'resetpass_text'          => '<!-- 加字 -->',
-'resetpass_header'        => '改簿符',
-'resetpass_submit'        => '設符�登',
-'resetpass_success'       => '爾之符節已改��登簿中...',
-'resetpass_bad_temporary' => '無效之臨符。
+'resetpass'                 => '變符',
+'resetpass_announce'        => '爾乃�郵之臨符登之。�完登，�乃需設新符節：',
+'resetpass_text'            => '<!-- 加字 -->',
+'resetpass_header'          => '改簿符',
+'oldpassword'               => '舊符節：',
+'newpassword'               => '新符節：',
+'retypenew'                 => '�察新符節：',
+'resetpass_submit'          => '設符�登',
+'resetpass_success'         => '爾之符節已改��登簿中...',
+'resetpass_bad_temporary'   => '無效之臨符。
 爾或改符，或求新臨符。',
-'resetpass_forbidden'     => '無改符節',
+'resetpass_forbidden'       => '無改符節',
+'resetpass-no-info'         => '爾須登簿後方進此�。',
+'resetpass-submit-loggedin' => '改符節',
+'resetpass-wrong-oldpass'   => '無效之臨符或�符。
+爾或改符，或求新臨符。',
+'resetpass-temp-password'   => '臨符節:',
 
 # Edit page toolbar
 'bold_sample'     => 'ç²—é«”',
@@ -508,6 +510,7 @@ $2',
 'italic_tip'      => '斜體',
 'link_sample'     => '�',
 'link_tip'        => '�內',
+'extlink_sample'  => 'http://www.example.com �題',
 'extlink_tip'     => '冠http://以�外',
 'headline_sample' => '題',
 'headline_tip'    => '二題',
@@ -521,8 +524,8 @@ $2',
 'hr_tip'          => '縱線，慎用之',
 
 # Edit pages
-'summary'                          => '概',
-'subject'                          => '題',
+'summary'                          => '概：',
+'subject'                          => '題：:',
 'minoredit'                        => '令校',
 'watchthis'                        => '派哨',
 'savearticle'                      => '存儲',
@@ -533,6 +536,8 @@ $2',
 'anoneditwarning'                  => "'''警示：'''�未登簿，IP將誌。",
 'missingsummary'                   => "''''醒示：'''�未概之，復存則文�焉。",
 'missingcommenttext'               => '請贊之',
+'summary-preview'                  => '覽概：',
+'subject-preview'                  => '覽題：',
 'blockedtitle'                     => '�見�',
 'blockedtext'                      => "<big>'''���IP見�。'''</big>�者$1也，因''$2''故。
 
@@ -602,7 +607,9 @@ $2',
 文務親撰，或謄公本，如$1。<strong>�勿盜版�</strong>',
 'longpagewarning'                  => '<strong>警示：此�長$1仟�元組，逾�二，覽器��盡堪，望縮斷之。<strong>',
 'longpageerror'                    => '<strong>警示：文長$1仟�元組，越幅$2，未能儲焉。</strong>',
-'readonlywarning'                  => '<strong>警示：修庫�，存儲�焉。惠謄文備用之。</strong>',
+'readonlywarning'                  => '<strong>警示：修庫�，存儲�焉。惠謄文備用之。</strong>
+
+鎖者曰：「$1�',
 'protectedpagewarning'             => '<strong>警示：庫�鎖矣，惟有秩纂之。</strong>',
 'semiprotectedpagewarning'         => "'''註記'''庫�鎖矣，惟登簿纂之。",
 'templatesused'                    => '此文用模：',
@@ -617,11 +624,22 @@ $2',
 'permissionserrorstext-withaction' => '�權未逮，有{{PLURAL:$1|因|因}}如$2：',
 'recreate-deleted-warn'            => "'''留�：刪文復造，惠慎纂。'''
 誌刪如下：",
+'deleted-notice'                   => '此�刪矣。
+此�之誌�留之。',
+'deletelog-fulllog'                => '察整誌',
+'edit-hook-aborted'                => '鈎纂消矣。
+無解也。',
+'edit-gone-missing'                => '無更�。
+刪之也。',
+'edit-conflict'                    => '纂�。',
+'edit-no-change'                   => '爾之纂已略，由字無改也。',
+'edit-already-exists'              => '�建新�。
+已存也。',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => '警：�有多貴功呼。
 
-其須少$2，�有$1。',
+其須少$2呼，�有$1呼。',
 'expensive-parserfunction-category'       => '�有多貴功呼',
 'post-expand-template-inclusion-warning'  => '警：�模�大也。
 一些模�將�會包�。',
@@ -629,6 +647,8 @@ $2',
 'post-expand-template-argument-warning'   => '警：此�有至少一模數展大。
 數略之。',
 'post-expand-template-argument-category'  => '�略模數之�',
+'parser-template-loop-warning'            => '測迴模：[[$1]]',
+'parser-template-recursion-depth-warning' => '已超迴模�深（$1）',
 
 # "Undo" feature
 'undo-success' => '此審�返也。查確然完之。',
@@ -641,27 +661,28 @@ $2',
 'cantcreateaccount-text' => "[[User:$3|S3]]因''$2''故，��IP <b>$1</b>。",
 
 # History pages
-'viewpagelogs'        => '覽誌',
-'nohistory'           => '此題無誌',
-'revnotfound'         => '查無審',
-'revnotfoundtext'     => '查無舊審，惠核網�。',
-'currentrev'          => '今審',
-'revisionasof'        => '$1審',
-'previousrevision'    => '�舊',
-'nextrevision'        => '新→',
-'currentrevisionlink' => '今審',
-'cur'                 => '辨今',
-'next'                => '後',
-'last'                => '�',
-'page_first'          => '首',
-'page_last'           => '末',
-'histlegend'          => '辨異：擇二孔後，按Enter�或點下鈕以辨之。<br />
+'viewpagelogs'           => '覽誌',
+'nohistory'              => '此題無誌',
+'currentrev'             => '今審',
+'currentrev-asof'        => '$1之今審',
+'revisionasof'           => '$1審',
+'revision-info'          => '$1之審由$2', # Additionally available: $3: revision id
+'previousrevision'       => '�舊',
+'nextrevision'           => '新→',
+'currentrevisionlink'    => '今審',
+'cur'                    => '辨今',
+'next'                   => '後',
+'last'                   => '�',
+'page_first'             => '首',
+'page_last'              => '末',
+'histlegend'             => '辨異：擇二孔後，按Enter�或點下鈕以辨之。<br />
 釋義：（辨今）與今審辨；（��）與�審辨；校，校文',
-'deletedrev'          => '刪矣',
-'histfirst'           => '�',
-'histlast'            => '末',
-'historysize'         => '（$1�元組）',
-'historyempty'        => '（空）',
+'history-fieldset-title' => '誌覽',
+'deletedrev'             => '刪矣',
+'histfirst'              => '�',
+'histlast'               => '末',
+'historysize'            => '（$1�元組）',
+'historyempty'           => '（空）',
 
 # Revision feed
 'history-feed-title'          => '誌審',
@@ -740,6 +761,7 @@ $2',
 'mergehistory-invalid-destination' => '到�之題須效之。',
 'mergehistory-autocomment'         => '併[[:$1]]至[[:$2]]',
 'mergehistory-comment'             => '併[[:$1]]至[[:$2]]：$3',
+'mergehistory-same-destination'    => '��和到�無�也',
 
 # Merge log
 'mergelog'           => '誌併',
@@ -752,101 +774,183 @@ $2',
 'difference'              => '（辨異）',
 'lineno'                  => '列$1：',
 'compareselectedversions' => '辨二擇',
+'visualcomparison'        => '較見',
+'wikicodecomparison'      => '較字',
 'editundo'                => 'æ‚”',
 'diff-multi'              => '（未示之途審有$1。）',
+'diff-movedto'            => '�到$1',
+'diff-styleadded'         => '加$1樣表',
+'diff-added'              => '加$1',
+'diff-changedto'          => '改到$1',
+'diff-movedoutof'         => '除自$1',
+'diff-styleremoved'       => '除$1樣表',
+'diff-removed'            => '除$1',
+'diff-changedfrom'        => '改自$1',
+'diff-src'                => '�碼',
+'diff-withdestination'    => '跟$1目的地',
+'diff-with'               => 'è·Ÿ $1 $2',
+'diff-with-final'         => '與 $1 $2',
+'diff-width'              => 'é—Š',
+'diff-height'             => '高',
+'diff-p'                  => '段',
+'diff-blockquote'         => '錄',
+'diff-h1'                 => '題（一級）',
+'diff-h2'                 => '題（二級）',
+'diff-h3'                 => '題（三級）',
+'diff-h4'                 => '題（四級）',
+'diff-h5'                 => '題（五級）',
+'diff-pre'                => '�設塊',
+'diff-div'                => '部分',
+'diff-ul'                 => '未排表',
+'diff-ol'                 => '已排表',
+'diff-li'                 => '表項',
+'diff-table'              => '表',
+'diff-tbody'              => '表容',
+'diff-tr'                 => '行',
+'diff-td'                 => 'æ ¼',
+'diff-th'                 => '表頭',
+'diff-br'                 => '斷行',
+'diff-hr'                 => 'æ©«ç·š',
+'diff-code'               => '電腦碼塊',
+'diff-dl'                 => '定表',
+'diff-dt'                 => '定字',
+'diff-dd'                 => '解',
+'diff-input'              => '輸',
+'diff-form'               => '表',
+'diff-img'                => '圖',
+'diff-span'               => '樣',
+'diff-a'                  => '接',
+'diff-i'                  => '斜',
+'diff-b'                  => 'ç²—',
+'diff-strong'             => 'å¼·',
+'diff-em'                 => '�',
+'diff-font'               => 'å­—é«”',
+'diff-big'                => '大',
+'diff-del'                => '刪',
+'diff-tt'                 => '固闊',
+'diff-sub'                => '下標',
+'diff-sup'                => '上標',
+'diff-strike'             => '刪線',
 
 # Search results
-'searchresults'             => 'å¾—å°‹',
-'searchresulttext'          => '何索{{SITENAME}}，詳見[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
-'searchsubtitle'            => "'''[[:$1]]'''尋焉（[[Special:Prefixindex/$1|『$1�之全首�]] | [[Special:WhatLinksHere/$1|『$1�之全��]]）",
-'searchsubtitleinvalid'     => "'''$1'''尋焉",
-'noexactmatch'              => "'''無題曰\"\$1\"。'''��[[:\$1|撰之]]。",
-'noexactmatch-nocreate'     => "'''無題曰\"\$1\"。'''",
-'toomanymatches'            => '多�應之，試異詢也',
-'titlematches'              => '�題',
-'notitlematches'            => '無題�',
-'textmatches'               => '�文',
-'notextmatches'             => '無文�',
-'prevn'                     => '�$1',
-'nextn'                     => '次$1',
-'viewprevnext'              => '見（$1）（$2）（$3）',
-'search-result-size'        => '$1 （$2字）',
-'search-result-score'       => '關：$1%',
-'search-redirect'           => '(轉 $1)',
-'search-section'            => '(節 $1)',
-'search-suggest'            => '爾�解之：$1',
-'search-interwiki-caption'  => '�義金蘭',
-'search-interwiki-default'  => '�果有$1：',
-'search-interwiki-more'     => '(多)',
-'search-mwsuggest-enabled'  => '有議',
-'search-mwsuggest-disabled' => 'ç„¡è­°',
-'search-relatedarticle'     => '關',
-'mwsuggest-disable'         => '�AJAX議',
-'searchrelated'             => '關',
-'searchall'                 => 'å…¨',
-'showingresults'            => "見'''$1'''尋，自'''$2'''始：",
-'showingresultsnum'         => "見'''$3'''尋，自'''$2'''始：",
-'showingresultstotal'       => "見'''$1至$2'''共'''$3'''尋",
-'nonefound'                 => "'''注'''：部�冊�尋也。。試''all:''尋全�刪之�（�議模等），或�用�之�冊為�綴也。",
-'powersearch'               => 'å°‹',
-'powersearch-legend'        => 'å°‹',
-'powersearch-ns'            => '尋�集：',
-'powersearch-redir'         => '轉表',
-'powersearch-field'         => 'å°‹',
-'search-external'           => '外尋',
-'searchdisabled'            => '{{SITENAME}}因性能而�用之。�Gooogle查之，乃之�時也。',
+'searchresults'                    => 'å¾—å°‹',
+'searchresults-title'              => '"$1"å¾—å°‹',
+'searchresulttext'                 => '何索{{SITENAME}}，詳見[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
+'searchsubtitle'                   => "'''[[:$1]]'''尋焉（[[Special:Prefixindex/$1|『$1�之全首�]] | [[Special:WhatLinksHere/$1|『$1�之全��]]）",
+'searchsubtitleinvalid'            => "'''$1'''尋焉",
+'noexactmatch'                     => "'''無題曰\"\$1\"。'''��[[:\$1|撰之]]。",
+'noexactmatch-nocreate'            => "'''無題曰\"\$1\"。'''",
+'toomanymatches'                   => '多�應之，試異詢也',
+'titlematches'                     => '�題',
+'notitlematches'                   => '無題�',
+'textmatches'                      => '�文',
+'notextmatches'                    => '無文�',
+'prevn'                            => '�$1',
+'nextn'                            => '次$1',
+'viewprevnext'                     => '見（$1）（$2）（$3）',
+'searchmenu-legend'                => '尋�',
+'searchmenu-exists'                => "'''在此wiki中有�為\"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''在此wiki上建�\"[[:\$1]]\"�'''",
+'searchhelp-url'                   => 'Help:目錄',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|查此首之�]]',
+'searchprofile-articles'           => '容',
+'searchprofile-articles-and-proj'  => '容與題',
+'searchprofile-project'            => '題',
+'searchprofile-images'             => '檔',
+'searchprofile-everything'         => 'å…¨',
+'searchprofile-advanced'           => '進',
+'searchprofile-articles-tooltip'   => '在$1中尋',
+'searchprofile-project-tooltip'    => '在$1中尋',
+'searchprofile-images-tooltip'     => '尋檔',
+'searchprofile-everything-tooltip' => '尋全（�議）',
+'searchprofile-advanced-tooltip'   => '自定�集中尋',
+'prefs-search-nsdefault'           => '用定值尋：',
+'prefs-search-nscustom'            => '尋自定�集：',
+'search-result-size'               => '$1 （$2字）',
+'search-result-score'              => '關：$1%',
+'search-redirect'                  => '(轉 $1)',
+'search-section'                   => '(節 $1)',
+'search-suggest'                   => '爾�解之：$1',
+'search-interwiki-caption'         => '�義金蘭',
+'search-interwiki-default'         => '�果有$1：',
+'search-interwiki-more'            => '(多)',
+'search-mwsuggest-enabled'         => '有議',
+'search-mwsuggest-disabled'        => 'ç„¡è­°',
+'search-relatedarticle'            => '關',
+'mwsuggest-disable'                => '�AJAX議',
+'searchrelated'                    => '關',
+'searchall'                        => 'å…¨',
+'showingresults'                   => "見'''$1'''尋，自'''$2'''始：",
+'showingresultsnum'                => "見'''$3'''尋，自'''$2'''始：",
+'showingresultstotal'              => "見'''$1{{PLURAL:$4||至$2}}'''，共'''$3'''尋",
+'nonefound'                        => "'''注'''：部�冊�尋也。。試''all:''尋全�刪之�（�議模等），或�用�之�冊為�綴也。",
+'search-nonefound'                 => '詢中無�。',
+'powersearch'                      => 'å°‹',
+'powersearch-legend'               => 'å°‹',
+'powersearch-ns'                   => '尋�集：',
+'powersearch-redir'                => '轉表',
+'powersearch-field'                => 'å°‹',
+'search-external'                  => '外尋',
+'searchdisabled'                   => '{{SITENAME}}因性能而�用之。�Gooogle查之，乃之�時也。',
 
 # Preferences page
-'preferences'           => '簿註',
-'mypreferences'         => '簿註',
-'prefs-edits'           => '數纂：',
-'prefsnologin'          => '未登簿',
-'prefsnologintext'      => '註記須<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登簿]</span>。',
-'prefsreset'            => '簿註歸白',
-'changepassword'        => '易符節',
-'skin'                  => '�版',
-'math'                  => '數學',
-'dateformat'            => '日期格�',
-'datedefault'           => '原註',
-'datetime'              => '日時',
-'math_failure'          => '譯��',
-'math_unknown_error'    => '未知之誤',
-'math_unknown_function' => '未知函�',
-'math_lexing_error'     => '律有誤',
-'math_syntax_error'     => '語法有誤',
-'prefs-personal'        => '概簿',
-'prefs-rc'              => '近易',
-'prefs-watchlist'       => '哨站',
-'prefs-watchlist-days'  => '哨報有日',
-'prefs-watchlist-edits' => '哨站有易',
-'prefs-misc'            => '雜',
-'saveprefs'             => '儲',
-'resetprefs'            => '除未儲之修',
-'oldpassword'           => '舊符節：',
-'newpassword'           => '新符節：',
-'retypenew'             => '�察新符節：',
-'textboxsize'           => '在修',
-'rows'                  => '行：',
-'columns'               => '列：',
-'searchresultshead'     => 'å°‹',
-'resultsperpage'        => '�示尋',
-'contextlines'          => '尋分列',
-'contextchars'          => '列有字',
-'recentchangesdays'     => '近易示日：',
-'recentchangescount'    => '近易��與誌有題：',
-'savedprefs'            => '簿註書矣',
-'timezonelegend'        => '時�',
-'timezonetext'          => '¹與伺�器�時有',
-'localtime'             => '本地時',
-'timezoneoffset'        => '�¹',
-'servertime'            => '伺�器時',
-'guesstimezone'         => '�覽器填之',
-'allowemail'            => '予收信',
-'prefs-searchoptions'   => 'å°‹é …',
-'prefs-namespaces'      => '�集',
-'defaultns'             => '定尋之�集：',
-'default'               => '予定',
-'files'                 => '檔',
+'preferences'               => '簿註',
+'mypreferences'             => '簿註',
+'prefs-edits'               => '數纂：',
+'prefsnologin'              => '未登簿',
+'prefsnologintext'          => '註記須<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登簿]</span>。',
+'prefsreset'                => '簿註歸白',
+'qbsettings-none'           => 'ç„¡',
+'changepassword'            => '易符節',
+'skin'                      => '�版',
+'skin-preview'              => '�覽',
+'math'                      => '數學',
+'dateformat'                => '日期格�',
+'datedefault'               => '原註',
+'datetime'                  => '日時',
+'math_failure'              => '譯��',
+'math_unknown_error'        => '未知之誤',
+'math_unknown_function'     => '未知函�',
+'math_lexing_error'         => '律有誤',
+'math_syntax_error'         => '語法有誤',
+'prefs-personal'            => '概簿',
+'prefs-rc'                  => '近易',
+'prefs-watchlist'           => '哨站',
+'prefs-watchlist-days'      => '哨報有日',
+'prefs-watchlist-days-max'  => '（最大有七）',
+'prefs-watchlist-edits'     => '哨站有易',
+'prefs-watchlist-edits-max' => '（最多之�：一�）',
+'prefs-misc'                => '雜',
+'prefs-resetpass'           => '更符節',
+'saveprefs'                 => '儲',
+'resetprefs'                => '除未儲之修',
+'textboxsize'               => '在修',
+'prefs-edit-boxsize'        => '修框尺',
+'rows'                      => '行：',
+'columns'                   => '列：',
+'searchresultshead'         => 'å°‹',
+'resultsperpage'            => '�示尋',
+'contextlines'              => '尋分列',
+'contextchars'              => '列有字',
+'recentchangesdays'         => '近易示日：',
+'recentchangesdays-max'     => '（最大有$1）',
+'recentchangescount'        => '近易��與誌有題：',
+'savedprefs'                => '簿註書矣',
+'timezonelegend'            => '時�',
+'timezonetext'              => '¹與伺�器�時有',
+'localtime'                 => '本地時：',
+'timezoneselect'            => '時�：',
+'timezoneuseserverdefault'  => '用伺候器之�定',
+'timezoneuseoffset'         => '它（定�）',
+'timezoneoffset'            => '�¹：',
+'servertime'                => '伺�器時：',
+'guesstimezone'             => '�覽器填之',
+'allowemail'                => '予收信',
+'prefs-searchoptions'       => 'å°‹é …',
+'prefs-namespaces'          => '�集',
+'defaultns'                 => '定尋之�集：',
+'default'                   => '予定',
+'files'                     => '檔',
 
 # User rights
 'userrights'                     => '齋權管', # Not used as normal message but as header for the special page itself
@@ -903,6 +1007,8 @@ $2',
 'right-minoredit'            => '示�改',
 'right-move'                 => '��',
 'right-move-subpages'        => '連���',
+'right-move-rootuserpages'   => '�根齋',
+'right-movefile'             => '�勳檔',
 'right-suppressredirect'     => '��時無增轉',
 'right-upload'               => '貢��物',
 'right-reupload'             => '蓋�之�物',
@@ -950,9 +1056,45 @@ $2',
 # User rights log
 'rightsnone' => '（凡）',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '閱此�',
+'action-edit'                 => '纂此�',
+'action-createpage'           => '建此�',
+'action-createtalk'           => '建論�',
+'action-createaccount'        => '增簿',
+'action-minoredit'            => '示纂為�',
+'action-move'                 => '移�',
+'action-move-subpages'        => '移�和其字�',
+'action-move-rootuserpages'   => '移根齋',
+'action-upload'               => '貢檔',
+'action-reupload'             => '蓋�檔',
+'action-reupload-shared'      => '蓋庫檔',
+'action-upload_by_url'        => '自URLm貢檔',
+'action-writeapi'             => '寫API',
+'action-delete'               => '刪�',
+'action-deleterevision'       => '刪審',
+'action-deletedhistory'       => '看此�之刪�',
+'action-browsearchive'        => '尋刪�',
+'action-undelete'             => '�刪此�',
+'action-suppressrevision'     => '查復是次之隱訂',
+'action-suppressionlog'       => '看此誌�',
+'action-block'                => '�簿纂',
+'action-protect'              => '更�錮',
+'action-import'               => '自�wiki入此�',
+'action-importupload'         => '自貢入此�',
+'action-patrol'               => '示他纂為巡',
+'action-autopatrol'           => '示己纂為巡',
+'action-unwatchedpages'       => '查無哨',
+'action-trackback'            => '交trackback',
+'action-mergehistory'         => '併此�之�',
+'action-userrights'           => '纂全權',
+'action-userrights-interwiki' => '纂他wiki上之權',
+'action-siteadmin'            => '鎖�解鎖其庫',
+
 # Recent changes
 'nchanges'                          => '$1易',
 'recentchanges'                     => '近易',
+'recentchanges-legend'              => '近易項',
 'recentchangestext'                 => '共筆�新，悉列於此。',
 'rcnote'                            => "下為自$4$5起，'''$2'''日內'''$1'''近易也。",
 'rcnotefrom'                        => "下為自'''$2'''至'''$1'''之易也。",
@@ -974,6 +1116,8 @@ $2',
 'number_of_watching_users_pageview' => '[放有$1哨]',
 'rc_categories_any'                 => 'ä»»',
 'newsectionsummary'                 => '/* $1 */ 新節',
+'rc-enhanced-expand'                => '示細（� JavaScript）',
+'rc-enhanced-hide'                  => '�細',
 
 # Recent changes linked
 'recentchangeslinked'          => '�引',
@@ -994,10 +1138,10 @@ $2',
 'upload_directory_missing'   => '目錄$1已失，無建之。',
 'upload_directory_read_only' => '目錄$1�入，無��。',
 'uploaderror'                => '進�有變',
-'uploadtext'                 => "下表以�，[[Special:ImageList|載�]]覽之。或見[[Special:Log/upload|誌�]]與[[Special:Log/delete|誌刪]]。
+'uploadtext'                 => "下表以�，[[Special:FileList|載�]]覽之。或見[[Special:Log/upload|誌�]]與[[Special:Log/delete|誌刪]]。
 欲嵌�中，是格�之其一：
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:File.jpg]]</tt>'''用此整�
-* '''<tt><nowiki>[[</nowiki>{{ns:image}}:File.png||200px|thumb|left|�]]</tt>'''以二百�素置左框置『��
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:File.jpg]]</tt>'''用此整�
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}:File.png||200px|thumb|left|�]]</tt>'''以二百�素置左框置『��
 * '''<tt><nowiki>[[</nowiki>{{ns:media}}:File.ogg]]</tt>'''直連�，無示�",
 'upload-permitted'           => '�之物類：$1。',
 'upload-preferred'           => '議之物類：$1。',
@@ -1005,7 +1149,7 @@ $2',
 'uploadlog'                  => '誌�',
 'uploadlogpage'              => '誌�',
 'uploadlogpagetext'          => '近�如下。
-看[[Special:NewImages|新畫�]]示�功。',
+看[[Special:NewFiles|新畫�]]示�功。',
 'filename'                   => '�',
 'filedesc'                   => '概',
 'fileuploadsummary'          => '概：',
@@ -1030,9 +1174,11 @@ $2',
 'filepageexists'             => '此檔之述於<strong><tt>$1</tt></strong>存矣，檔未存也。爾入述無存也。��之，爾需纂之。',
 'fileexists-thumb'           => "<center>'''�存之檔'''</center>",
 'file-exists-duplicate'      => '此檔乃�檔{{PLURAL:$1|一|數}}：',
+'file-deleted-duplicate'     => '此檔（[[$1]]）�刪。爾需查刪錄�貢之。',
 'successfulupload'           => '檔案安矣',
 'uploadwarning'              => '慎焉�',
 'savefile'                   => '存之',
+'uploadedimage'              => '進�"[[$1]]"',
 'overwroteimage'             => '新置「[[$1]]�矣',
 'uploaddisabledtext'         => '貢被�也。',
 'sourcefilename'             => '��：',
@@ -1045,19 +1191,21 @@ $2',
 
 'license-nopreview' => '（��覽）',
 
-# Special:ImageList
-'imagelist-summary'     => '此奇�示檔之全呈也。
+# Special:ListFiles
+'listfiles-summary'     => '此奇�示檔之全呈也。
 設最後之檔呈示於表頂。
 點題改其列之。',
-'imagelist_search_for'  => '以媒�尋：',
+'listfiles_search_for'  => '以媒�尋：',
 'imgfile'               => '檔',
-'imagelist_date'        => '時',
-'imagelist_name'        => '�',
-'imagelist_user'        => 'ç°¿',
-'imagelist_size'        => '幅（�元組）',
-'imagelist_description' => 'è¿°',
-
-# Image description page
+'listfiles'             => '見檔',
+'listfiles_date'        => '時',
+'listfiles_name'        => '�',
+'listfiles_user'        => 'ç°¿',
+'listfiles_size'        => '幅（�元組）',
+'listfiles_description' => 'è¿°',
+'listfiles_count'       => '擇',
+
+# File description page
 'filehist'                       => '檔�',
 'filehist-help'                  => '�日尋檔。',
 'filehist-deleteall'             => '全刪',
@@ -1065,12 +1213,18 @@ $2',
 'filehist-revert'                => 'é‚„',
 'filehist-current'               => '今',
 'filehist-datetime'              => '時',
+'filehist-thumb'                 => '縮',
+'filehist-thumbtext'             => '於$1之縮',
+'filehist-nothumb'               => '無縮',
 'filehist-user'                  => 'è–„',
 'filehist-dimensions'            => '度',
 'filehist-filesize'              => '檔幅',
 'filehist-comment'               => '註',
 'imagelinks'                     => '圖�',
 'linkstoimage'                   => '下�連本檔有$1：',
+'linkstoimage-more'              => '連檔有多於$1。
+下表示連檔之首$1。
+[[Special:WhatLinksHere/$2|整表]]�供之閱也。',
 'nolinkstoimage'                 => '無�連本檔也。',
 'morelinkstoimage'               => '閱檔[[Special:WhatLinksHere/$1|接]]。',
 'redirectstofile'                => '下檔轉到此檔有$1：',
@@ -1106,7 +1260,6 @@ $2',
 'filedelete-success-old'      => "'''[[Media:$1|$1]]'''$2$3之版刪矣。",
 'filedelete-nofile'           => "無'''$1'''也。",
 'filedelete-nofile-old'       => "無�'''$1'''�也。",
-'filedelete-iscurrent'        => '刪版乃新，先還舊焉。',
 'filedelete-otherreason'      => '��附之因：',
 'filedelete-reason-otherlist' => '�因',
 'filedelete-reason-dropdown'  => '
@@ -1137,17 +1290,27 @@ $2',
 
 # Random redirect
 'randomredirect'         => '任渡',
-'randomredirect-nopages' => '�冊內無渡也。',
+'randomredirect-nopages' => '「$1��冊內無渡也。',
 
 # Statistics
-'statistics'             => '彙統',
-'sitestats'              => '{{SITENAME}}彙統',
-'userstats'              => '有簿彙統',
-'sitestatstext'          => "庫�有�'''$1'''，除議�釋�芻文�渡與�濟者，有足文$2���'''$8'''。
-自{{SITENAME}}始焉，閱�'''$3'''，纂文'''$4'''。�之則��'''$5'''覽，�文'''$6'''纂。
-[http://www.mediawiki.org/wiki/Manual:Job_queue job queue]長'''$7'''。",
-'userstatstext'          => "有[[Special:ListUsers|簿]]者'''$1'''，內'''$2'''人掌$5權，據百分之'''$4'''。",
-'statistics-mostpopular' => '燴炙',
+'statistics'                   => '彙統',
+'statistics-header-pages'      => '�彙統',
+'statistics-header-edits'      => '纂彙統',
+'statistics-header-views'      => '閱彙統',
+'statistics-header-users'      => '有簿彙統',
+'statistics-articles'          => '容�',
+'statistics-pages'             => 'é �',
+'statistics-pages-desc'        => 'wiki上之全�，�議�轉等',
+'statistics-files'             => '已貢',
+'statistics-edits'             => '自{{SITENAME}}設之�纂數',
+'statistics-edits-average'     => '���纂數',
+'statistics-views-total'       => '閱總',
+'statistics-views-peredit'     => '�纂閱數',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue 隊]長',
+'statistics-users'             => '註[[Special:ListUsers|簿]]',
+'statistics-users-active'      => '活簿',
+'statistics-users-active-desc' => '早$1日�更動之簿',
+'statistics-mostpopular'       => '燴炙',
 
 'disambiguations'      => '釋義',
 'disambiguations-text' => '�下引[[MediaWiki:Disambiguationspage]]模，求釋義，宜正題之。',
@@ -1187,18 +1350,23 @@ $2',
 'popularpages'            => '膾炙',
 'wantedcategories'        => '求門',
 'wantedpages'             => '徵�',
-'missingfiles'            => '失檔',
+'wantedfiles'             => '求檔',
+'wantedtemplates'         => '徵模',
 'mostlinked'              => '好料',
 'mostlinkedcategories'    => '豪門',
 'mostlinkedtemplates'     => '美模',
 'mostcategories'          => '跨船',
 'mostimages'              => '�檔',
 'mostrevisions'           => '屢審',
+'prefixindex'             => '以�外查',
 'shortpages'              => '短篇',
 'longpages'               => '長言',
 'protectedpages'          => '�錮',
 'protectedpages-indef'    => '�示無期之錮',
+'protectedpages-cascade'  => '�示連串之錮',
 'listusers'               => '點簿',
+'listusers-editsonly'     => '�示有纂之簿',
+'usereditcount'           => '$1纂',
 'newpages'                => '新�',
 'newpages-username'       => '簿�：',
 'ancientpages'            => '陳年',
@@ -1219,14 +1387,13 @@ $2',
 'booksources-search-legend' => '舀書海',
 'booksources-go'            => 'å¾€',
 'booksources-text'          => '有賈售新舊書，或有助焉。茲列如下：',
+'booksources-invalid-isbn'  => '供之ISBN無確，查始複之誤。',
 
 # Special:Log
 'specialloguserlabel'  => '簿：',
 'speciallogtitlelabel' => '標：',
 'log'                  => '誌',
 'all-logs-page'        => '眾誌',
-'log-search-legend'    => '尋誌',
-'log-search-submit'    => 'å¾€',
 'alllogstext'          => '眾{{SITENAME}}之誌有�者，俱併版見。擇門��簿��疆以�之。',
 'logempty'             => '無�誌也。',
 'log-title-wildcard'   => '題以此始者，�之',
@@ -1237,6 +1404,7 @@ $2',
 'nextpage'          => '次�（$1）',
 'prevpage'          => '先�（$1）',
 'allpagesfrom'      => '始�：',
+'allpagesto'        => '末�：',
 'allarticles'       => '全典',
 'allinnamespace'    => '全$1�冊',
 'allnotinnamespace' => '�$1�冊',
@@ -1256,19 +1424,44 @@ $2',
 'special-categories-sort-count' => '排數',
 'special-categories-sort-abc'   => '排字',
 
+# Special:DeletedContributions
+'deletedcontributions' => '已刪之�',
+
+# Special:LinkSearch
+'linksearch'       => '尋網連',
+'linksearch-pat'   => '尋�：',
+'linksearch-ns'    => '�集：',
+'linksearch-ok'    => 'å°‹',
+'linksearch-text'  => '用似"*.wikipedia.org"之�字。<br />
+�之議：<tt>$1</tt>',
+'linksearch-line'  => '$1連$2',
+'linksearch-error' => '�字僅用於機之始也。',
+
 # Special:ListUsers
 'listusersfrom'      => '始簿：',
 'listusers-submit'   => '見',
 'listusers-noresult' => '尋無簿。',
 
+# Special:Log/newusers
+'newuserlogpage'              => '誌簿',
+'newuserlogpagetext'          => '此為誌簿之記也',
+'newuserlog-byemail'          => '號發自電郵',
+'newuserlog-create-entry'     => 'æ–°ç°¿',
+'newuserlog-create2-entry'    => '已註$1之簿',
+'newuserlog-autocreate-entry' => '已自註之簿',
+
 # Special:ListGroupRights
-'listgrouprights'          => '簿組權',
-'listgrouprights-summary'  => '下乃wiki之簿權表�存�之權也。
+'listgrouprights'                 => '簿組權',
+'listgrouprights-summary'         => '下乃wiki之簿權表�存�之權也。
 欲知權節，�望[[{{MediaWiki:Listgrouprights-helppage}}|此]]矣。',
-'listgrouprights-group'    => '組',
-'listgrouprights-rights'   => '權',
-'listgrouprights-helppage' => 'Help:組權',
-'listgrouprights-members'  => '（社員表）',
+'listgrouprights-group'           => '組',
+'listgrouprights-rights'          => '權',
+'listgrouprights-helppage'        => 'Help:組權',
+'listgrouprights-members'         => '（社員表）',
+'listgrouprights-addgroup'        => '加{{PLURAL:$2|一|多}}組：$1',
+'listgrouprights-removegroup'     => '除{{PLURAL:$2|一|多}}組：$1',
+'listgrouprights-addgroup-all'    => '加全組',
+'listgrouprights-removegroup-all' => '除全組',
 
 # E-mail user
 'mailnologin'     => 'ç„¡é©›',
@@ -1281,6 +1474,7 @@ $2',
 'defemailsubject' => '{{SITENAME}}來書',
 'noemailtitle'    => '無郵',
 'noemailtext'     => '此�無郵，或�收之。',
+'email-legend'    => '發郵至{{SITENAME}}之�一簿',
 'emailfrom'       => '自：',
 'emailto'         => '致：',
 'emailsubject'    => '題：',
@@ -1320,12 +1514,7 @@ $2',
 'iteminvalidname'      => "'$1'謬�。",
 'wlnote'               => '近<b>$2</b>時有$1者易。',
 'wlshowlast'           => '見近$1時�$2天�$3時易',
-'watchlist-show-bots'  => '見僕',
-'watchlist-hide-bots'  => '�僕',
-'watchlist-show-own'   => '見己',
-'watchlist-hide-own'   => '�己',
-'watchlist-show-minor' => '見校',
-'watchlist-hide-minor' => '�校',
+'watchlist-options'    => '哨項',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '出陣…',
@@ -1358,51 +1547,57 @@ $NEWPAGE
 欲更哨令，惠訪{{fullurl:{{ns:special}}:Watchlist/edit}}
 饋助之，惠訪{{fullurl:{{ns:help}}:Contents}}',
 
-# Delete/protect/revert
-'deletepage'                  => '刪�',
-'confirm'                     => '准',
-'excontent'                   => "文乃'$1'",
-'excontentauthor'             => "文乃'$1'，乃[[Special:Contributions/$2|$2]]�作。",
-'exblank'                     => '缺�',
-'delete-confirm'              => '刪"$1"',
-'delete-legend'               => '刪',
-'historywarning'              => '警示，此�有誌：',
-'confirmdeletetext'           => '欲刪此物與誌，知後果��[[{{MediaWiki:Policy-url}}]]後�為之。',
-'actioncomplete'              => '�矣',
-'deletedtext'                 => '"<nowiki>$1</nowiki>"刪矣，見誌刪於$2。',
-'deletedarticle'              => '刪焉「[[$1]]�',
-'suppressedarticle'           => '廢焉「[[$1]]�',
-'dellogpage'                  => '誌刪',
-'dellogpagetext'              => '近刪如下：',
-'deletionlog'                 => '誌刪',
-'reverted'                    => '已還�審',
-'deletecomment'               => '刪因：',
-'deleteotherreason'           => '��附之因：',
-'deletereasonotherlist'       => '�因',
-'deletereason-dropdown'       => '
+# Delete
+'deletepage'             => '刪�',
+'confirm'                => '准',
+'excontent'              => "文乃'$1'",
+'excontentauthor'        => "文乃'$1'，乃[[Special:Contributions/$2|$2]]�作。",
+'exblank'                => '缺�',
+'delete-confirm'         => '刪"$1"',
+'delete-legend'          => '刪',
+'historywarning'         => '警示，此�有誌：',
+'confirmdeletetext'      => '欲刪此物與誌，知後果��[[{{MediaWiki:Policy-url}}]]後�為之。',
+'actioncomplete'         => '�矣',
+'deletedtext'            => '"<nowiki>$1</nowiki>"刪矣，見誌刪於$2。',
+'deletedarticle'         => '刪焉「[[$1]]�',
+'suppressedarticle'      => '廢焉「[[$1]]�',
+'dellogpage'             => '誌刪',
+'dellogpagetext'         => '近刪如下：',
+'deletionlog'            => '誌刪',
+'reverted'               => '已還�審',
+'deletecomment'          => '刪因：',
+'deleteotherreason'      => '��附之因：',
+'deletereasonotherlist'  => '�因',
+'deletereason-dropdown'  => '
 *常刪之因
 ** 作者之求
 ** 侵版權
 ** 破壞',
-'delete-edit-reasonlist'      => '纂刪因',
-'delete-toobig'               => '此��大誌，�$1修。刪��矣，防於{{SITENAME}}之亂也。',
-'delete-warning-toobig'       => '此��大誌，�$1修。刪之�亂{{SITENAME}}之事也；續時留神之。',
-'rollback'                    => '退修',
-'rollback_short'              => '退',
-'rollbacklink'                => '退',
-'rollbackfailed'              => '退未�',
-'cantrollback'                => '退修��，作者�也。',
-'alreadyrolled'               => '[[User:$2|$2]]（[[User talk:$2|議]] | [[Special:Contributions/$2|{{int:contribslink}}]]）作[[:$1]]，退��也。有易或已退焉。新纂者為[[User:$3|$3]]（[[User talk:$3|議]] | [[Special:Contributions/$3|{{int:contribslink}}]]）',
-'editcomment'                 => 'è´Šæ›°"<i>$1</i>"', # only shown if there is an edit comment
-'revertpage'                  => '去[[Special:Contributions/$2|$2]]之作（欲言之，�至[[User talk:$2|此]]）為[[User:$1|$1]]之本耳', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '去$1之作，復為$2之本耳。',
-'sessionfailure'              => '登簿有變。為防盜簿，返����為之。',
+'delete-edit-reasonlist' => '纂刪因',
+'delete-toobig'          => '此��大誌，�$1修。刪��矣，防於{{SITENAME}}之亂也。',
+'delete-warning-toobig'  => '此��大誌，�$1修。刪之�亂{{SITENAME}}之事也；續時留神之。',
+
+# Rollback
+'rollback'         => '退修',
+'rollback_short'   => '退',
+'rollbacklink'     => '退',
+'rollbackfailed'   => '退未�',
+'cantrollback'     => '退修��，作者�也。',
+'alreadyrolled'    => '[[User:$2|$2]]（[[User talk:$2|議]] | [[Special:Contributions/$2|{{int:contribslink}}]]）作[[:$1]]，退��也。有易或已退焉。新纂者為[[User:$3|$3]]（[[User talk:$3|議]] | [[Special:Contributions/$3|{{int:contribslink}}]]）',
+'editcomment'      => 'è´Šæ›°"<i>$1</i>"', # only shown if there is an edit comment
+'revertpage'       => '去[[Special:Contributions/$2|$2]]之作（欲言之，�至[[User talk:$2|此]]）為[[User:$1|$1]]之本耳', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '去$1之作，復為$2之本耳。',
+'sessionfailure'   => '登簿有變。為防盜簿，返����為之。',
+
+# Protect
 'protectlogpage'              => '誌緘',
 'protectlogtext'              => '誌緘如下；近緘見[[Special:ProtectedPages|此]] 。',
 'protectedarticle'            => '緘焉"[[$1]]"',
 'modifiedarticleprotection'   => '令"$1"',
 'unprotectedarticle'          => '啟焉"[[$1]]"',
+'movedarticleprotection'      => '自「[[$2]]�至「[[$1]]�之錮改矣',
 'protect-title'               => '更"$1"之緘',
+'prot_1movedto2'              => '[[$1]]�至[[$2]]',
 'protect-legend'              => '准緘',
 'protectcomment'              => 'è´Šæ›°',
 'protectexpiry'               => '屆期',
@@ -1420,8 +1615,21 @@ $NEWPAGE
 'protect-level-sysop'         => '惟有秩',
 'protect-summary-cascade'     => 'è¿­ç·˜',
 'protect-expiring'            => '$1（UTC）屆',
+'protect-expiry-indefinite'   => '無屆',
 'protect-cascade'             => '�引緘，牽迭',
 'protect-cantedit'            => '�無動�之護也，因�無權纂之矣。',
+'protect-othertime'           => '它時：',
+'protect-othertime-op'        => '它時',
+'protect-existing-expiry'     => '�屆時：$2 $3',
+'protect-otherreason'         => '它�附之�：',
+'protect-otherreason-op'      => '它�附之�',
+'protect-dropdown'            => '*通錮之�
+** 多破
+** 多�
+** �產之戰纂
+** 高�之�',
+'protect-edit-reasonlist'     => '纂護之�',
+'protect-expiry-options'      => '二時:2 hours,一日:1 day,三日:3 days,一週:1 week,二週:2 weeks,一月:1 month,三月:3 months,六月:6 months,一年:1 year,永如:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '准',
 'restriction-level'           => '緘�',
 'minimum-size'                => '幅越',
@@ -1444,7 +1652,7 @@ $NEWPAGE
 'undeletepage'                 => '覽刪並還之',
 'undeletepagetitle'            => "'''如下�[[:$1]]刪之審'''。",
 'viewdeletedpage'              => '覽刪',
-'undeletepagetext'             => '如下已刪，備謄以還；曆滿乃清之。',
+'undeletepagetext'             => '如下之$1�已刪，備謄以還；曆滿乃清之。',
 'undelete-fieldset-title'      => '復審',
 'undeleteextrahelp'            => "欲還題，撤核後令'''''還刪'''''。
 欲還�審，核之�令。
@@ -1453,11 +1661,12 @@ $NEWPAGE
 'undeletehistory'              => '如還題，審亦隨焉；若存�題，還如誌，�以代焉。',
 'undeleterevdel'               => '新審�牽，難還也；銷�見之以篤還。',
 'undeletehistorynoadmin'       => '文刪矣，何由如下；並示末纂者。詳文�，惟有迭�閱。',
-'undelete-revision'            => '自$2，$3纂之$1審刪如下：',
+'undelete-revision'            => '自$4$5，$3纂之$1審刪如下：',
 'undeleterevision-missing'     => '審謬失；棄�還或�亡。',
 'undeletebtn'                  => 'é‚„',
 'undeletelink'                 => 'é‚„',
 'undeletereset'                => '歸白',
+'undeleteinvert'               => '�相',
 'undeletecomment'              => 'è´Šæ—¥',
 'undeletedarticle'             => '還焉"[[$1]]"',
 'undeletedrevisions'           => '$1審已還',
@@ -1488,26 +1697,27 @@ $1',
 'blanknamespace' => '主',
 
 # Contributions
-'contributions' => '功績',
-'mycontris'     => '�績',
-'contribsub2'   => '$1勛（$2）',
-'nocontribs'    => '無勛�也。',
-'uctop'         => '(至頂)',
-'month'         => '且�越',
-'year'          => '年�越',
-
-'sp-contributions-newbies'     => '惟列新進',
-'sp-contributions-newbies-sub' => '予新進',
-'sp-contributions-blocklog'    => '誌�',
-'sp-contributions-search'      => '�勛',
-'sp-contributions-username'    => '簿�或IP�',
-'sp-contributions-submit'      => '�',
+'contributions'       => '功績',
+'contributions-title' => '$1之功績',
+'mycontris'           => '�績',
+'contribsub2'         => '$1勛（$2）',
+'nocontribs'          => '無勛�也。',
+'uctop'               => '(至頂)',
+'month'               => '且�越',
+'year'                => '年�越',
+
+'sp-contributions-newbies'       => '惟列新進',
+'sp-contributions-newbies-sub'   => '予新進',
+'sp-contributions-newbies-title' => '新進之功績',
+'sp-contributions-blocklog'      => '誌�',
+'sp-contributions-search'        => '�勛',
+'sp-contributions-username'      => '簿�或IP�',
+'sp-contributions-submit'        => '�',
 
 # What links here
 'whatlinkshere'            => '��',
 'whatlinkshere-title'      => '「$1���',
 'whatlinkshere-page'       => '題',
-'linklistsub'              => '（列��）',
 'linkshere'                => "��'''[[:$1]]'''如下：",
 'nolinkshere'              => "無���'''[[:$1]]'''。",
 'nolinkshere-ns'           => "�冊內無���'''[[:$1]]'''。",
@@ -1552,6 +1762,8 @@ $1',
 'ipbotherreason'                  => '補證�加證曰',
 'ipbhidename'                     => '簿�隱乎誌��表��點簿。',
 'ipbwatchuser'                    => '哨該簿之齋與議',
+'ipballowusertalk'                => '�時許其簿纂己之議',
+'ipb-change-block'                => '用此設��此簿',
 'badipaddress'                    => 'IP�格',
 'blockipsuccesssub'               => '�焉',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]]�焉。表�<br />見[[Special:IPBlockList|此]]。',
@@ -1560,6 +1772,7 @@ $1',
 'ipb-unblock'                     => '赦簿��',
 'ipb-blocklist-addr'              => '$1之�',
 'ipb-blocklist'                   => '列�',
+'ipb-blocklist-contribs'          => '$1勛績',
 'unblockip'                       => '赦簿',
 'unblockiptext'                   => '函下赦�。',
 'ipusubmit'                       => '赦此�',
@@ -1568,6 +1781,9 @@ $1',
 'ipblocklist'                     => '列�簿���',
 'ipblocklist-legend'              => '尋�簿',
 'ipblocklist-username'            => '簿��IP�：',
+'ipblocklist-sh-userblocks'       => '$1次�簿',
+'ipblocklist-sh-tempblocks'       => '$1次臨�',
+'ipblocklist-sh-addressblocks'    => '$1次�單IP',
 'ipblocklist-submit'              => 'å°‹',
 'blocklistline'                   => '$1，$2�$3（$4）',
 'infiniteblock'                   => '永如',
@@ -1576,31 +1792,39 @@ $1',
 'noautoblockblock'                => '止自�',
 'createaccountblock'              => '�增簿',
 'emailblock'                      => '郵�焉',
+'blocklist-nousertalk'            => '�其議',
 'ipblocklist-empty'               => '無�。',
 'ipblocklist-no-results'          => '簿��IP�未�焉。',
 'blocklink'                       => '�',
 'unblocklink'                     => '赦',
+'change-blocklink'                => 'æ›´',
 'contribslink'                    => 'å‹›',
 'autoblocker'                     => '近日$1"$2"；��IP�，故�焉。',
 'blocklogpage'                    => '誌�',
+'blocklog-fulllog'                => '整誌�',
 'blocklogentry'                   => '�[[$1]]屆$2$3',
+'reblock-logentry'                => '改[[$1]]之�，屆$2$3',
 'blocklogtext'                    => '此誌�赦；自��示。見[[Special:IPBlockList|此]]列今�者。',
 'unblocklogentry'                 => '$1赦焉',
 'block-log-flags-anononly'        => '惟�匿',
 'block-log-flags-nocreate'        => '�增簿',
 'block-log-flags-noautoblock'     => '止自�',
 'block-log-flags-noemail'         => '郵�焉',
+'block-log-flags-nousertalk'      => '�己議',
 'block-log-flags-angry-autoblock' => '強自�用也',
 'range_block_disabled'            => '未准有秩��。',
 'ipb_expiry_invalid'              => '屆期�明。',
 'ipb_expiry_temp'                 => '�簿��必為長久也。',
 'ipb_already_blocked'             => '"$1"早�矣',
+'ipb-needreblock'                 => '== 已� ==
+$1已被�矣。爾是�改此置？',
 'ipb_cant_unblock'                => '有誤：�$1無尋；或早赦矣。',
 'ipb_blocked_as_range'            => '錯：該IP $1 無直�也，無赦之。唯它在 $2 之範�內，其範�赦之。',
 'ip_range_invalid'                => 'IP���格',
 'blockme'                         => '自�',
 'proxyblocker'                    => '�Proxy',
 'proxyblocksuccess'               => '�矣。',
+'cant-block-while-blocked'        => '爾然被�，勿施於人。',
 
 # Developer tools
 'lockdb'              => '閉庫',
@@ -1620,50 +1844,59 @@ $1',
 'databasenotlocked'   => '庫未閉焉。',
 
 # Move page
-'move-page'               => '�$1',
-'move-page-legend'        => '��',
-'movepagetext'            => "函下��，誌隨新往�舊題作渡���欲移。��正，[[Special:DoubleRedirects|防窮]]�[[Special:BrokenRedirects|斷渡]]。
+'move-page'                    => '�$1',
+'move-page-legend'             => '��',
+'movepagetext'                 => "函下��，誌隨新往�舊題作渡���欲移。��正，[[Special:DoubleRedirects|防窮]]�[[Special:BrokenRedirects|斷渡]]。
 
 囑之者，新題若�空�渡�缺誌，則舊'''��'''焉。存�勿覆，而誤��悔也。
 
 <b>警示</b>
 膾炙�焉，�生�測；戒慎行之。",
-'movearticle'             => '�文：',
-'movenotallowed'          => '無准�文也。',
-'newtitle'                => '至新題：',
-'move-watch'              => '派哨',
-'movepagebtn'             => '�文',
-'pagemovedsub'            => '��矣',
-'movepage-moved'          => "<big>'''「$1�已�至「$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '此題早存，或�謬焉；請更之。',
-'cantmove-titleprotected' => '爾��動�至此，因新題已緘焉，防建之。',
-'talkexists'              => "'''文��而議未移，蓋早存也；請併之。'''",
-'movedto'                 => '�至',
-'movetalk'                => '議並�',
-'move-subpages'           => '如�，��議',
-'move-talk-subpages'      => '如�，���議',
-'movepage-page-exists'    => '�$1已存矣，�自覆也。',
-'movepage-page-moved'     => '�$1�$2矣。',
-'movepage-page-unmoved'   => '�$1�$2��。',
-'movepage-max-pages'      => '上之$1��矣��自�之下。',
-'1movedto2'               => '[[$1]]�至[[$2]]',
-'1movedto2_redir'         => '[[$1]]�至[[$2]]為渡',
-'movelogpage'             => '誌�',
-'movelogpagetext'         => '��如下：',
-'movereason'              => 'å› ',
-'revertmove'              => 'é‚„',
-'delete_and_move'         => '刪�',
-'delete_and_move_text'    => '==准刪==
+'movearticle'                  => '�文：',
+'movenologin'                  => '未登簿',
+'movenologintext'              => '�文須[[Special:UserLogin|登簿]]。',
+'movenotallowed'               => '無准�文也。',
+'cant-move-user-page'          => '無動自齋（除字�）。',
+'cant-move-to-user-page'       => '無動至齋（除字�）。',
+'newtitle'                     => '至新題：',
+'move-watch'                   => '派哨',
+'movepagebtn'                  => '�文',
+'pagemovedsub'                 => '��矣',
+'movepage-moved'               => "<big>'''「$1�已�至「$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'articleexists'                => '此題早存，或�謬焉；請更之。',
+'cantmove-titleprotected'      => '爾��動�至此，因新題已緘焉，防建之。',
+'talkexists'                   => "'''文��而議未移，蓋早存也；請併之。'''",
+'movedto'                      => '�至',
+'movetalk'                     => '議並�',
+'move-subpages'                => '如�，��議',
+'move-talk-subpages'           => '如�，���議',
+'movepage-page-exists'         => '�$1已存矣，�自覆也。',
+'movepage-page-moved'          => '�$1�$2矣。',
+'movepage-page-unmoved'        => '�$1�$2��。',
+'movepage-max-pages'           => '上之$1��矣��自�之下。',
+'1movedto2'                    => '[[$1]]�至[[$2]]',
+'1movedto2_redir'              => '[[$1]]�至[[$2]]為渡',
+'movelogpage'                  => '誌�',
+'movelogpagetext'              => '��如下：',
+'movereason'                   => 'å› ',
+'revertmove'                   => 'é‚„',
+'delete_and_move'              => '刪�',
+'delete_and_move_text'         => '==准刪==
 
 往�"[[:$1]]"存，刪之以替乎？',
-'delete_and_move_confirm' => '刪之',
-'delete_and_move_reason'  => '為�而刪之',
-'selfmove'                => '鄉���，如未移也。',
-'immobile_namespace'      => '鄉�其一，�冊特異，���也。',
-'imagenocrossnamespace'   => '�勳檔至�檔�間',
-'imagetypemismatch'       => '其新副檔���其類也',
-'imageinvalidfilename'    => '標之檔�乃無效也',
-'fix-double-redirects'    => '更指原題之任渡',
+'delete_and_move_confirm'      => '刪之',
+'delete_and_move_reason'       => '為�而刪之',
+'selfmove'                     => '鄉���，如未移也。',
+'immobile-source-namespace'    => '�集「$1�上無動',
+'immobile-target-namespace'    => '無移至「$1�中',
+'immobile-target-namespace-iw' => '無移至垮維基，此乃無效也。',
+'immobile-source-page'         => '此�無動也。',
+'immobile-target-page'         => '無動至標之標題。',
+'imagenocrossnamespace'        => '�勳檔至�檔�間',
+'imagetypemismatch'            => '其新副檔���其類也',
+'imageinvalidfilename'         => '標之檔�乃無效也',
+'fix-double-redirects'         => '更指原題之任渡',
+'move-leave-redirect'          => '留渡',
 
 # Export
 'export'            => '出匯',
@@ -1699,9 +1932,12 @@ $1',
 'import'                     => '圖入匯',
 'importinterwiki'            => '維基互匯',
 'import-interwiki-text'      => '欲入匯，擇維基��題文，審時�纂者隨記也。互匯錄於[[Special:Log/import|誌入]]。',
+'import-interwiki-source'    => '來�wiki��：',
 'import-interwiki-history'   => '審�誌�匯',
 'import-interwiki-submit'    => '入匯',
 'import-interwiki-namespace' => '入�集：',
+'import-upload-filename'     => '檔�：',
+'import-comment'             => '註：',
 'importtext'                 => '請[[Special:Export|出匯]]儲之。
 �入匯於此。',
 'importstart'                => '入匯…',
@@ -1795,6 +2031,8 @@ $1',
 'tooltip-watch'                   => '哨此報',
 'tooltip-recreate'                => '昔棄鄙，�起�',
 'tooltip-upload'                  => '��備，�步跑',
+'tooltip-rollback'                => '『返�乃�之上貢也。',
+'tooltip-undo'                    => '『復�乃開表加因也。',
 
 # Stylesheets
 'common.css'      => '/* 此之 CSS 用於全�也 */',
@@ -1806,6 +2044,8 @@ $1',
 'chick.css'       => '/* 此之 CSS 用於窈窕�之簿也 */',
 'simple.css'      => '/* 此之 CSS 用於簡明�之簿也 */',
 'modern.css'      => '/* 此之 CSS 用於時髦�之簿也 */',
+'print.css'       => '/* 此之 CSS 用於�之出力也 */',
+'handheld.css'    => '/* 此之 CSS 用於 $wgHandheldStyle 之手置�也 */',
 
 # Scripts
 'common.js'      => '/* 此之JavaScript將載於全簿之�。 */',
@@ -1819,12 +2059,12 @@ $1',
 'modern.js'      => '/* 此之JavaScript將載於用時髦�之簿 */',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}無簿者',
+'anonymous'        => '{{SITENAME}}無{{PLURAL:$1|簿|簿}}者',
 'siteuser'         => '{{SITENAME}}有簿者$1',
 'lastmodifiedatby' => '$1$2，$3新易此�。', # $1 date, $2 time, $3 user
 'othercontribs'    => '$1主撰',
 'others'           => 'ä»–',
-'siteusers'        => '{{SITENAME}}有簿者$1',
+'siteusers'        => '{{SITENAME}}有{{PLURAL:$2|簿|簿}}者$1',
 'creditspage'      => '�贊',
 'nocredits'        => '本�未有贊信也。',
 
@@ -1845,6 +2085,16 @@ $1',
 'numauthors'     => '編者$1',
 'numtalkauthors' => '議者$1',
 
+# Skin names
+'skinname-standard'    => '經典',
+'skinname-nostalgia'   => '懷�',
+'skinname-cologneblue' => '馨�',
+'skinname-monobook'    => '單書',
+'skinname-myskin'      => '�風',
+'skinname-chick'       => '窈窕',
+'skinname-simple'      => '簡明',
+'skinname-modern'      => '時髦',
+
 # Math options
 'mw_math_png'    => '屢作PNG',
 'mw_math_simple' => '易為則作HTML，�則PNG',
@@ -1865,10 +2115,11 @@ $1',
 'markedaspatrollederror-noautopatrol' => '己易��哨。',
 
 # Patrol log
-'patrol-log-page'   => '誌哨',
-'patrol-log-header' => '此乃誌哨也。',
-'patrol-log-line'   => '令哨$2之$1$3',
-'patrol-log-auto'   => '（自行）',
+'patrol-log-page'      => '誌哨',
+'patrol-log-header'    => '此乃誌哨也。',
+'patrol-log-line'      => '令哨$2之$1$3',
+'patrol-log-auto'      => '（自行）',
+'log-show-hide-patrol' => '$1誌巡',
 
 # Image deletion
 'deletedrevision'                 => '刪舊審$1',
@@ -1883,20 +2134,27 @@ $1',
 'previousdiff' => '��辨',
 'nextdiff'     => '後辨→',
 
+# Visual comparison
+'visual-comparison' => '較見',
+
 # Media information
 'mediawarning'         => "'''警'''日：此檔疑惡，行之�諜也。<hr />",
 'imagemaxsize'         => '述檔�惟列：',
 'thumbsize'            => '縮圖幅',
 'widthheight'          => '$1矩$2',
 'widthheightpage'      => '$1矩$2，共$3�',
+'file-info'            => '（大�：$1，MIME類型：$2）',
+'file-info-size'       => '（�素$1矩$2，大�：$3，MIME類型：$4）',
 'svg-long-desc'        => '（SVG檔，貌有�素$1矩$2，幅$3）',
 'show-big-image'       => '全幅',
 'show-big-image-thumb' => '<small>縮圖幅有�素$1矩$2</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '新圖之廊',
 'imagelisttext'         => "下表乃按$2排之的'''$1'''檔。",
 'newimages-summary'     => '此奇�示最後呈上之檔也。',
+'newimages-legend'      => '濾',
+'newimages-label'       => '�（或其部）：',
 'showhidebots'          => '（$1僕）',
 'noimages'              => '無�見。',
 'ilsubmit'              => '尋檔',
@@ -1925,16 +2183,45 @@ $1',
 * focallength', # Do not translate list items
 
 # EXIF tags
-'exif-imagewidth'        => '寬',
-'exif-imagelength'       => 'é•·',
-'exif-datetime'          => '文檔修訂之日期時辰',
-'exif-make'              => '出廠',
-'exif-model'             => '型號',
-'exif-datetimeoriginal'  => '數據生�之日期時辰',
-'exif-datetimedigitized' => '數�化之日期時辰',
-'exif-exposuretime'      => '�光',
-'exif-fnumber'           => '光圈',
-'exif-focallength'       => '焦�',
+'exif-imagewidth'                => '寬',
+'exif-imagelength'               => 'é•·',
+'exif-photometricinterpretation' => '�素構�',
+'exif-datetime'                  => '文檔修訂之日期時辰',
+'exif-make'                      => '出廠',
+'exif-model'                     => '型號',
+'exif-artist'                    => '作者',
+'exif-exifversion'               => 'Exif版本',
+'exif-datetimeoriginal'          => '數據生�之日期時辰',
+'exif-datetimedigitized'         => '數�化之日期時辰',
+'exif-exposuretime'              => '�光',
+'exif-exposuretime-format'       => '$1 秒 ($2)',
+'exif-fnumber'                   => '光圈',
+'exif-aperturevalue'             => '光圈',
+'exif-brightnessvalue'           => '光度',
+'exif-flash'                     => '閃光燈',
+'exif-focallength'               => '焦�',
+'exif-flashenergy'               => '閃光燈能�',
+'exif-contrast'                  => '�比',
+'exif-saturation'                => '飽和度',
+'exif-sharpness'                 => '清晰度',
+
+'exif-meteringmode-255' => '其他',
+
+# Flash modes
+'exif-flash-fired-0'    => '閃無�',
+'exif-flash-fired-1'    => '閃開�',
+'exif-flash-return-0'   => '無閃測',
+'exif-flash-return-2'   => '閃無測光',
+'exif-flash-return-3'   => '閃測光',
+'exif-flash-mode-1'     => 'å¼·é–‹é–ƒ',
+'exif-flash-mode-2'     => '強閉閃',
+'exif-flash-mode-3'     => '自模',
+'exif-flash-function-1' => 'ç„¡é–ƒ',
+'exif-flash-redeye-1'   => '紅退模',
+
+'exif-focalplaneresolutionunit-2' => '�',
+
+'exif-gaincontrol-0' => 'ç„¡',
 
 # External editor support
 'edit-externally'      => '以外部程�修此文',
@@ -1978,25 +2265,15 @@ $1
 請爾審視之。",
 'recreate'            => '復',
 
-# HTML dump
-'redirectingto' => '渡至[[:$1]]…',
-
 # action=purge
-'confirm_purge'        => '清謄本？
-
-$1',
 'confirm_purge_button' => '准',
-
-# AJAX search
-'searchcontaining' => "尋文�''$1''",
-'searchnamed'      => "尋文�''$1''.",
-'articletitles'    => "文首為''$1''",
-'hideresults'      => 'è—�',
-'useajaxsearch'    => '用AJAX尋之',
+'confirm-purge-top'    => '清謄本？',
+'confirm-purge-bottom' => '清�會清謄本以迫示近審。',
 
 # Separators for various lists, etc.
-'comma-separator' => '�',
-'colon-separator' => '：',
+'semicolon-separator' => 'ï¼›',
+'comma-separator'     => '�',
+'colon-separator'     => '：',
 
 # Multipage image navigation
 'imgmultipageprev' => '���',
@@ -2058,6 +2335,7 @@ $1',
 
 # Core parser functions
 'unknown_extension_tag' => '未明之擴標「$1�',
+'duplicate-defaultsort' => '警：�之排�「$2�蓋�之排�「$1�。',
 
 # Special:Version
 'version'                          => '版', # Not used as normal message but as header for the special page itself
@@ -2086,17 +2364,17 @@ $1',
 'filepath-submit'  => 'å°‹è·¯',
 'filepath-summary' => '此奇��一檔之整路。圖以全解�示之，他檔會以有關之程�啟動也。
 
-輸檔�之，�包「{{ns:image}}:�開頭也。',
+輸檔�之，�包「{{ns:file}}:�開頭也。',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '擇�檔',
 'fileduplicatesearch-summary'  => '以�檔之切去查�也。
 
-入�時無 "{{ns:image}}:" 首也。',
+入�時無 "{{ns:file}}:" 首也。',
 'fileduplicatesearch-legend'   => '尋�',
 'fileduplicatesearch-filename' => '�：',
 'fileduplicatesearch-submit'   => 'å°‹',
-'fileduplicatesearch-info'     => '$1 × $2 �素<br />大�: $3<br />MIME類型: $4',
+'fileduplicatesearch-info'     => '�素$1矩$2<br />大�：$3<br />MIME類型：$4',
 'fileduplicatesearch-result-1' => '案 "$1" 無�也。',
 'fileduplicatesearch-result-n' => '案 "$1" �有$2。',
 
@@ -2122,4 +2400,13 @@ $1',
 'blankpage'              => '白�',
 'intentionallyblankpage' => '此�為白也，試速之用',
 
+# External image whitelist
+'external_image_whitelist' => ' #�留<pre>
+#下（中之//）乃正表�
+#乃外（連）圖�之
+#�乃��，��則�連
+#有 # 之為注
+
+#入正表�。�留</pre>',
+
 );
diff --git a/languages/messages/MessagesZh_cn.php b/languages/messages/MessagesZh_cn.php
index d4dcd53d..b7e77d3a 100644
--- a/languages/messages/MessagesZh_cn.php
+++ b/languages/messages/MessagesZh_cn.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Chinese (PRC) (中文 (中国大陆))
+/** ‪Chinese (PRC)‬ (‪中文(中国大陆)‬)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 1e54b935..36c7c3a8 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -5,8 +5,12 @@
  * @file
  *
  * @author Bencmq
+ * @author Gaoxuewei
+ * @author Gzdavidwong
  * @author O
  * @author Shinjiman
+ * @author Wmr89502270
+ * @author Wong128hk
  */
 
 $namespaceNames = array(
@@ -18,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talk',
-	NS_IMAGE            => 'Image',
-	NS_IMAGE_TALK       => 'Image_talk',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'File_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -40,8 +44,14 @@ $namespaceAliases = array(
 	'用户讨论' => NS_USER_TALK,
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#'{{SITENAME}}_对�' => NS_PROJECT_TALK
-	'图�' => NS_IMAGE,
-	'图�对�' => NS_IMAGE_TALK,
+	'图�' => NS_FILE,
+	'档案' => NS_FILE,
+	'文件' => NS_FILE,
+	'Image' => NS_FILE,
+	'Image_talk' => NS_FILE_TALK,
+	'图�对�' => NS_FILE_TALK,
+	'档案对�' => NS_FILE_TALK,
+	'文件对�' => NS_FILE_TALK,
 	'模�'	=> NS_TEMPLATE,
 	'模�讨论'=> NS_TEMPLATE_TALK,
 	'帮助'	=> NS_HELP,
@@ -50,11 +60,80 @@ $namespaceAliases = array(
 	'分类讨论'=> NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-	'standard' => '标准',
-	'nostalgia' => '怀旧',
-	'cologneblue' => '科隆香水�',
-	'modern' => '现代',
+$specialPageAliases = array(
+	'DoubleRedirects'           => array( '���定�页�' ),
+	'BrokenRedirects'           => array( '��的�定�页' ),
+	'Userlogin'                 => array( '用户登入' ),
+	'Userlogout'                => array( '用户登出' ),
+	'CreateAccount'             => array( '创建账户' ),
+	'Preferences'               => array( '�数设置' ),
+	'Watchlist'                 => array( '监视列表' ),
+	'Recentchanges'             => array( '最近更改' ),
+	'Upload'                    => array( '上传文件' ),
+	'Listfiles'                 => array( '文件列表' ),
+	'Newimages'                 => array( '新建文件' ),
+	'Listusers'                 => array( '用户列表' ),
+	'Listgrouprights'           => array( '群组��' ),
+	'Statistics'                => array( '统计信�' ),
+	'Randompage'                => array( '�机页�' ),
+	'Lonelypages'               => array( '孤立页�' ),
+	'Uncategorizedpages'        => array( '未归类页�' ),
+	'Uncategorizedcategories'   => array( '未归类分类' ),
+	'Uncategorizedimages'       => array( '未归类文件' ),
+	'Uncategorizedtemplates'    => array( '未归类模版' ),
+	'Unusedcategories'          => array( '未使用的模�' ),
+	'Unusedimages'              => array( '未使用文件' ),
+	'Wantedpages'               => array( '待撰页�' ),
+	'Wantedcategories'          => array( '待撰分类' ),
+	'Wantedfiles'               => array( '需�的文件' ),
+	'Wantedtemplates'           => array( '需�的模�' ),
+	'Mostlinked'                => array( '最多链接页�' ),
+	'Mostlinkedcategories'      => array( '最多链接分类' ),
+	'Mostlinkedtemplates'       => array( '最多链接模版' ),
+	'Mostimages'                => array( '最多链接文件' ),
+	'Mostcategories'            => array( '最多分类页�' ),
+	'Mostrevisions'             => array( '最多修订页�' ),
+	'Fewestrevisions'           => array( '最少修订的页�' ),
+	'Shortpages'                => array( '短页�' ),
+	'Longpages'                 => array( '长页�' ),
+	'Newpages'                  => array( '最新页�' ),
+	'Ancientpages'              => array( '最早页�' ),
+	'Deadendpages'              => array( '断链页�' ),
+	'Protectedpages'            => array( '已�护页�' ),
+	'Protectedtitles'           => array( '已�护的标题' ),
+	'Allpages'                  => array( '所有页�' ),
+	'Prefixindex'               => array( '�缀索引' ),
+	'Ipblocklist'               => array( '��列表' ),
+	'Specialpages'              => array( '特殊页�' ),
+	'Contributions'             => array( '用户贡献' ),
+	'Emailuser'                 => array( '电邮用户' ),
+	'Confirmemail'              => array( '确认电�邮件' ),
+	'Whatlinkshere'             => array( '链入页�' ),
+	'Movepage'                  => array( '移动页�' ),
+	'Booksources'               => array( '网络书�' ),
+	'Categories'                => array( '页�分类' ),
+	'Export'                    => array( '导出页�' ),
+	'Version'                   => array( '版本信�' ),
+	'Allmessages'               => array( '所有信�' ),
+	'Log'                       => array( '日志' ),
+	'Undelete'                  => array( '��被删页�' ),
+	'Import'                    => array( '导入页�' ),
+	'Userrights'                => array( '用户��' ),
+	'MIMEsearch'                => array( 'MIME �索' ),
+	'Unusedtemplates'           => array( '未使用的模�' ),
+	'Mypage'                    => array( '我的页�' ),
+	'Mytalk'                    => array( '我的对�页' ),
+	'Mycontributions'           => array( '我的贡献' ),
+	'Listadmins'                => array( '管�员列表' ),
+	'Listbots'                  => array( '机器人列表' ),
+	'Popularpages'              => array( '热点页�' ),
+	'Search'                    => array( '�索' ),
+	'Resetpass'                 => array( '修改密�' ),
+	'MergeHistory'              => array( '�并历�' ),
+	'Filepath'                  => array( '文件路径' ),
+	'Invalidateemail'           => array( '��识别的电�邮件地�' ),
+	'Blankpage'                 => array( '空白页' ),
+	'DeletedContributions'      => array( '已删除的用户贡献' ),
 );
 
 $extraUserToggles = array(
@@ -120,17 +199,19 @@ $messages = array(
 'tog-watchlisthideown'        => '在监视列表中��我的编辑',
 'tog-watchlisthidebots'       => '在监视列表中��机器人的编辑',
 'tog-watchlisthideminor'      => '在监视列表中��微�更改',
+'tog-watchlisthideliu'        => '在监视列表中��登入用户',
+'tog-watchlisthideanons'      => '在监视列表中��匿�用户',
 'tog-nolangconversion'        => '�进行用字转�',
 'tog-ccmeonemails'            => '把我��给其他用户的邮件�时��副本给我自己',
 'tog-diffonly'                => '在比较两个修订版本差异时�显示页�内容',
 'tog-showhiddencats'          => '显示��分类',
+'tog-noconvertlink'           => '�转�链接标题',
+'tog-norollbackdiff'          => '进行�转�略过差异',
 
 'underline-always'  => '总是使用',
 'underline-never'   => '从�使用',
 'underline-default' => '�览器默认',
 
-'skinpreview' => '(预览)',
-
 # Dates
 'sunday'        => '星期日',
 'monday'        => '星期一',
@@ -287,8 +368,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '关于{{SITENAME}}',
 'aboutpage'            => 'Project:关于',
-'bugreports'           => '错误报告',
-'bugreportspage'       => 'Project:错误报告',
 'copyright'            => '本站的全部文本内容在$1之�款下�供。',
 'copyrightpagename'    => '{{SITENAME}}版�',
 'copyrightpage'        => '{{ns:project}}:版�信�',
@@ -311,9 +390,7 @@ $messages = array(
 
 'badaccess'        => '��错误',
 'badaccess-group0' => '您刚�的请求��许执行。',
-'badaccess-group1' => '您刚�的请求�有$1用户组的用户�能使用。',
-'badaccess-group2' => '您刚�的请求�有$1用户组的用户�能使用。',
-'badaccess-groups' => '您刚�的请求�有$1用户组的用户�能使用。',
+'badaccess-groups' => '您刚�的请求�有{{PLURAL:$2|这个|这些}}用户组的用户�能使用: $1',
 
 'versionrequired'     => '需�MediaWiki $1 版',
 'versionrequiredtext' => '需�版本$1的 MediaWiki �能使用此页。��[[Special:Version|版本�]]。',
@@ -327,6 +404,8 @@ $messages = array(
 'editsection'             => '编辑',
 'editold'                 => '编辑',
 'viewsourceold'           => '查看��',
+'editlink'                => '编辑',
+'viewsourcelink'          => '查看��',
 'editsectionhint'         => '编辑段�: $1',
 'toc'                     => '目录',
 'showtoc'                 => '显示',
@@ -411,7 +490,6 @@ $1',
 'cannotdelete'         => '无法删除选定的页�或图�（它�能已�被其他人删除了）。',
 'badtitle'             => '错误的标题',
 'badtitletext'         => '所请求页�的标题是无效的��存在，跨语言或跨wiki链接的标题错误。它�能包�一个或更多的�能用于标题的字符。',
-'perfdisabled'         => '抱歉�由于此项�作有�能造�数�库瘫痪，目�暂时无法使用。',
 'perfcached'           => '下列是缓存数�，因此�能�是最新的:',
 'perfcachedts'         => '下列是缓存数�，其最�更新时间是$1。',
 'querypage-no-updates' => '当��止对此页�进行更新。此处的数�将�能被立�刷新。',
@@ -425,14 +503,14 @@ $1',
 'protectedpagetext'    => '该页�已被�定以防止编辑。',
 'viewsourcetext'       => '您�以查看并�制此页�的��:',
 'protectedinterface'   => '该页�供了软件的界�文本，它已被�定以防止��的修改。',
-'editinginterface'     => "'''警告:''' 您正在编辑的页�是用于�供软件的界�文本。改�此页将影�其他用户的界�外观。如�翻译，请考虑使用[http://translatewiki.net/wiki/Main_Page?setlang=zh-hans Betawiki]，一个用�为MediaWiki软件本地化的计划。",
+'editinginterface'     => "'''警告:''' 您正在编辑的页�是用于�供软件的界�文本。改�此页将影�其他用户的界�外观。如�翻译，请考虑使用[http://translatewiki.net/wiki/Main_Page?setlang=zh-hans translatewiki.net]，一个用�为MediaWiki软件本地化的计划。",
 'sqlhidden'            => '(SQL查询已��)',
 'cascadeprotected'     => '这个页�已�被�护，因为这个页�被以下已标注"���护"的{{PLURAL:$1|一个|多个}}被�护页�包�:
 $2',
 'namespaceprotected'   => "您并没有��编辑'''$1'''�字空间内的页�。",
 'customcssjsprotected' => '您并无��去编辑这个页�，因为它包�了�一�用户的个人设定。',
 'ns-specialprotected'  => '特殊页�是��以编辑的。',
-'titleprotected'       => '这个标题已�被[[User:$1|$1]]�护以防止创建。�由是<i>$2</i>。',
+'titleprotected'       => "这个标题已�被[[User:$1|$1]]�护以防止创建。�由是''$2''。",
 
 # Virus scanner
 'virus-badscanner'     => "��设置: 未知的病毒扫瞄器: ''$1''",
@@ -441,9 +519,9 @@ $2',
 
 # Login and logout pages
 'logouttitle'                => '退出',
-'logouttext'                 => '<strong>您现在已�退出。</strong><br />
+'logouttext'                 => "'''您现在已�退出。'''<br />
 您�以继续以匿�方�使用{{SITENAME}}，或�次以相�或��用户身份[[Special:UserLogin|登录]]。
-请注�一些页��能�然显示您为登录状�，直到您清空您的�览器缓存为止。',
+请注�一些页��能�然显示您为登录状�，直到您清空您的�览器缓存为止。",
 'welcomecreation'            => '== 欢迎, $1! ==
 
  您的账户已�建立，��忘记设置[[Special:Preferences|{{SITENAME}}的个人�数]]。',
@@ -454,7 +532,6 @@ $2',
 'remembermypassword'         => '下次登录记�密�',
 'yourdomainname'             => '您的域�:',
 'externaldberror'            => '这�能是由于验�数�库错误或您被�止更新您的外部账�。',
-'loginproblem'               => '<b>登录有问题。</b><br />请�试一次�',
 'login'                      => '登录',
 'nav-login-createaccount'    => '登录�创建账户',
 'loginprompt'                => '您必须�用 Cookies �能登录{{SITENAME}}。',
@@ -513,10 +590,10 @@ $2',
 'eauthentsent'               => '一�确认信已���到推�的地�。在��其它邮件到此账户�，您必须首先�照这�信中的指导确认这个电�邮箱真实有效。',
 'throttled-mailpassword'     => '密��醒已在最近$1�时内��。为了安全起�，在�$1�时内�能��一个密��醒。',
 'mailerror'                  => '��邮件错误: $1',
-'acct_creation_throttle_hit' => '对�起，您已�创建了$1个账�。你�能�创建了。',
-'emailauthenticated'         => '您的电�邮箱地�已�于$1确认有效。',
+'acct_creation_throttle_hit' => '抱歉�您已�创建了$1个账�。你�能�创建了。',
+'emailauthenticated'         => '您的电�邮箱地�已�于$2 $3确认有效。',
 'emailnotauthenticated'      => '您的邮箱地�<strong>还没被认�</strong>。以下功能将�会��任何邮件。',
-'noemailprefs'               => '<strong>指定一个电�邮箱地�以使用此功能</strong>',
+'noemailprefs'               => '在您的�数设置中指定一个电�邮箱地�以使用此功能',
 'emailconfirmlink'           => '确认您的邮箱地�',
 'invalidemailaddress'        => '邮箱地�格��正确，请输入正确的邮箱地�或清空该输入框。',
 'accountcreated'             => '已建立账户',
@@ -525,19 +602,27 @@ $2',
 'createaccount-text'         => '有人在{{SITENAME}}中利用您的邮箱创建了一个�为 "$2" 的新�户($4)，密�是 "$3" 。您应该立�登入并更改密�。
 
 如果该账户创建错误的�，您�以忽略此信�。',
+'login-throttled'            => '您已��试多次在这个账户的密�上。请�等多一会�试。',
 'loginlanguagelabel'         => '语言: $1',
 
 # Password reset dialog
-'resetpass'               => '�设账户密�',
-'resetpass_announce'      => '您是通过一个临时的��到邮件中的代�登录的。�完�登录，您必须在这里设定一个新密�:',
-'resetpass_text'          => '<!-- 在此处添加文本 -->',
-'resetpass_header'        => '更改账户密�',
-'resetpass_submit'        => '设定密�并登录',
-'resetpass_success'       => '您的密�已�被�功更改�现在正为您登录...',
-'resetpass_bad_temporary' => '无效的临时密�。
+'resetpass'                 => '更改密�',
+'resetpass_announce'        => '您是通过一个临时的��到邮件中的代�登录的。�完�登录，您必须在这里设定一个新密�:',
+'resetpass_text'            => '<!-- 在此处添加文本 -->',
+'resetpass_header'          => '更改账户密�',
+'oldpassword'               => '旧密�:',
+'newpassword'               => '新密�:',
+'retypenew'                 => '确认密�:',
+'resetpass_submit'          => '设定密�并登录',
+'resetpass_success'         => '您的密�已�被�功更改�现在正为您登录...',
+'resetpass_bad_temporary'   => '无效的临时密�。
+您�能已�功地更改了您的密�，或者已�请求一个新的临时密�。',
+'resetpass_forbidden'       => '无法更改密�',
+'resetpass-no-info'         => '您必须登入�直接进入这个页�。',
+'resetpass-submit-loggedin' => '更改密�',
+'resetpass-wrong-oldpass'   => '无效的临时或现有的密�。
 您�能已�功地更改了您的密�，或者已�请求一个新的临时密�。',
-'resetpass_forbidden'     => '无法更改密�',
-'resetpass_missing'       => '无表�数�。',
+'resetpass-temp-password'   => '临时密�:',
 
 # Edit page toolbar
 'bold_sample'     => '粗体文字',
@@ -560,8 +645,8 @@ $2',
 'hr_tip'          => '水平线 (�心使用)',
 
 # Edit pages
-'summary'                          => '摘�',
-'subject'                          => '标题',
+'summary'                          => '摘�：',
+'subject'                          => '标题:',
 'minoredit'                        => '这是一个�修改',
 'watchthis'                        => '监视本页',
 'savearticle'                      => '�存本页',
@@ -573,8 +658,8 @@ $2',
 'missingsummary'                   => "'''�示:''' 您没有�供一个编辑摘�。如果您�次�击�存，您的编辑将�带编辑摘��存。",
 'missingcommenttext'               => '请在下�输入评论。',
 'missingcommentheader'             => "'''�示:''' 您没有为此评论�供一个标题。如果您�次�击�存，您的编辑将�带标题�存。",
-'summary-preview'                  => '摘�预览',
-'subject-preview'                  => '标题预览',
+'summary-preview'                  => '摘�预览:',
+'subject-preview'                  => '标题预览:',
 'blockedtitle'                     => '用户被查�',
 'blockedtext'                      => "<big>你的用户�或IP地�已�被$1查�。</big>
 
@@ -628,24 +713,24 @@ $2',
 '''Konqueror:''' �需點擊 ''刷新''或按下''F5''；
 '''Opera:''' 在 ''工具→設定'' 中完整地清除它們的緩存；
 '''Internet Explorer:''' 按著 ''Ctrl'' �點擊 ''刷新''，或按下 ''Ctrl-F5''。",
-'usercssjsyoucanpreview'           => "<strong>�示:</strong> 在�存�请用'显示预  '按钮�测试您新的 CSS/JS 。",
+'usercssjsyoucanpreview'           => "'''�示:''' 在�存�请用'显示预  '按钮�测试您新的 CSS/JS 。",
 'usercsspreview'                   => "'''注�您�是在预览您的个人 CSS。'''
 '''还没有�存�'''",
 'userjspreview'                    => "'''注�您�是在测试�预览您的个人 JavaScript。'''
 '''还没有�存�'''",
 'userinvalidcssjstitle'            => "'''警告:''' �存在皮肤\"\$1\"。注�自定义的 .css 和 .js 页�使用�写标题，例如，{{ns:user}}:Foo/monobook.css ��于 {{ns:user}}:Foo/Monobook.css。",
 'updated'                          => '(已更新)',
-'note'                             => '<strong>注�:</strong>',
-'previewnote'                      => '<strong>请记�这�是预览，内容还未�存�</strong>',
+'note'                             => "'''注�:'''",
+'previewnote'                      => "'''请记�这�是预览，内容还未�存�'''",
 'previewconflict'                  => '这个预览显示了上�文字编辑区中的内容。它将在你选择�存�出现。',
-'session_fail_preview'             => '<strong>抱歉�我们�能处�你在进程数�丢失时的编辑。请�试�如果�次失败，请[[Special:UserLogout|登出]]��新登陆。</strong>',
-'session_fail_preview_html'        => "<strong>抱歉�我们�能处�你在进程数�丢失时的编辑。</strong>
+'session_fail_preview'             => "'''抱歉�我们�能处�你在进程数�丢失时的编辑。请�试�如果�次失败，请[[Special:UserLogout|登出]]��新登陆。'''",
+'session_fail_preview_html'        => "'''抱歉�我们�能处�你在进程数�丢失时的编辑。'''
 
 ''由于{{SITENAME}}�许使用原始的 HTML，为了防范 JavaScript 攻击，预览已被��。''
 
-<strong>如果这是一次�法的编辑，请�新进行�试。如果还�行，请[[Special:UserLogout|退出]]并�新登录。</strong>",
-'token_suffix_mismatch'            => '<strong>由于您用户端中的编辑令牌��了一些标点符�字元，为防止编辑的文字��，您的编辑已�被拒�。
-这�情况通常出现于使用�有很多臭虫�以网络为主的匿�代��务的时候。</strong>',
+'''如果这是一次�法的编辑，请�新进行�试。如果还�行，请[[Special:UserLogout|退出]]并�新登录。'''",
+'token_suffix_mismatch'            => "'''由于您用户端中的编辑令牌��了一些标点符�字元，为防止编辑的文字��，您的编辑已�被拒�。
+这�情况通常出现于使用�有很多臭虫�以网络为主的匿�代��务的时候。'''",
 'editing'                          => '正在编辑$1',
 'editingsection'                   => '正在编辑$1 (段�)',
 'editingcomment'                   => '正在编辑$1 (评论)',
@@ -657,27 +742,29 @@ $2',
 <b>�有</b>在上�文字框中的内容会在你点击"�存页�"�被�存。<br />',
 'yourtext'                         => '您的文字',
 'storedversion'                    => '已�存版本',
-'nonunicodebrowser'                => '<strong>警告: 您的�览器�兼容Unicode编�。这里有一个工作区将使您能安全地编辑页�: �ASCII字符将以�六进制编�方�出现在编辑框中。</strong>',
-'editingold'                       => '<strong>警告：你正在编辑的是本页的旧版本。
-如果你�存它的�，在本版本之�的任何修改都会丢失。</strong>',
+'nonunicodebrowser'                => "'''警告: 您的�览器�兼容Unicode编�。这里有一个工作区将使您能安全地编辑页�: �ASCII字符将以�六进制编�方�出现在编辑框中。'''",
+'editingold'                       => "'''警告：你正在编辑的是本页的旧版本。
+如果你�存它的�，在本版本之�的任何修改都会丢失。'''",
 'yourdiff'                         => '差异',
-'copyrightwarning'                 => '请注�您对{{SITENAME}}的所有贡献都被认为是在$2下�布，请查看在$1的细节。
+'copyrightwarning'                 => "请注�您对{{SITENAME}}的所有贡献都被认为是在$2下�布，请查看在$1的细节。
 如果您�希望您的文字被任�修改和�散布，请���交。<br />
 您�时也��我们��您所�交的内容是您自己所作，或得自一个��版��护或相似自由的��。
-<strong>��在未获授�的情况下�表�</strong><br />',
-'copyrightwarning2'                => '请注�您对{{SITENAME}}的所有贡献
+'''��在未获授�的情况下�表�'''<br />",
+'copyrightwarning2'                => "请注�您对{{SITENAME}}的所有贡献
 都�能被其他贡献者编辑，修改或删除。
 如果您�希望您的文字被任�修改和�散布，请���交。<br />
 您�时也��我们��您所�交的内容是您自己所作，或得自一个��版��护或相似自由的��（�阅$1的细节）。
-<strong>��在未获授�的情况下�表�</strong>',
-'longpagewarning'                  => '<strong>警告: 该页�的长度是$1KB；一些�览器在编辑长度接近或大于32KB的页��能存在问题。
-您应该考虑将此页�分�更�的章节。</strong>',
-'longpageerror'                    => '<strong>错误: 您所�交的文本长度有$1KB，这大于$2KB的最大值。该文本�能被�存。</strong>',
-'readonlywarning'                  => '<strong>警告: 数�库被�以进行维护，所以您目�将无法�存您的修改。您或许希望先将本段文字�制并�存到文本文件，然�等一会儿�修改。</strong>',
-'protectedpagewarning'             => '<strong>警告: 此页已�被�护，�有拥有管�员��的用户��修改。</strong>',
+'''��在未获授�的情况下�表�'''",
+'longpagewarning'                  => "'''警告: 该页�的长度是$1KB；一些�览器在编辑长度接近或大于32KB的页��能存在问题。
+您应该考虑将此页�分�更�的章节。'''",
+'longpageerror'                    => "'''错误: 您所�交的文本长度有$1KB，这大于$2KB的最大值。该文本�能被�存。'''",
+'readonlywarning'                  => "'''警告: 数�库被�以进行维护，所以您目�将无法�存您的修改。您或许希望先将本段文字�制并�存到文本文件，然�等一会儿�修改。'''
+
+管�员有如下解释: $1",
+'protectedpagewarning'             => "'''警告: 此页已�被�护，�有拥有管�员��的用户��修改。'''",
 'semiprotectedpagewarning'         => "'''注�：''' 本页�被�定，仅�注册用户编辑。",
 'cascadeprotectedwarning'          => '警告: 本页已�被�护，�有拥有管�员��的用户��修改，因为本页已被以下连��护的{{PLURAL:$1|一个|多个}}页�所包�:',
-'titleprotectedwarning'            => '<strong>警告: 本页�已被�上，�有一些用户方�创建。</strong>',
+'titleprotectedwarning'            => "'''警告: 本页�已被�上，�有一些用户方�创建。'''",
 'templatesused'                    => '在这个页�上使用的模�有:',
 'templatesusedpreview'             => '此次预览中使用的模�有:',
 'templatesusedsection'             => '在这个段�上使用的模�有:',
@@ -695,11 +782,22 @@ $2',
 
 你应该�考虑一下继续编辑这一个页�是��适。
 为方便起�，这一个页�的删除记录已�在下��供:",
+'deleted-notice'                   => '这个页�已�删除。
+这个页�的删除日志已在下��供以便�考。',
+'deletelog-fulllog'                => '查看整个日志',
+'edit-hook-aborted'                => '编辑被钩�消。
+它并无给出解释。',
+'edit-gone-missing'                => '�能更新页�。
+它�能刚刚被删除。',
+'edit-conflict'                    => '编辑冲�。',
+'edit-no-change'                   => '您的编辑已�略过，因为文字无任何改动。',
+'edit-already-exists'              => '��以建立一个新页�。
+它已�存在。',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => '警告: 这个页�有太多耗费的语法功能呼�。
 
-它应该少过$2，现在有$1。',
+它应该少过$2次呼�，现在有$1次呼�。',
 'expensive-parserfunction-category'       => '页�中有太多耗费的语法功能呼�',
 'post-expand-template-inclusion-warning'  => '警告: 包�模�大�过大。
 一些模�将�会包�。',
@@ -707,6 +805,8 @@ $2',
 'post-expand-template-argument-warning'   => '警告: 这个页�有最少一个模�数有过大扩展大�。
 这些�数会被略过。',
 'post-expand-template-argument-category'  => '包��略过模��数的页�',
+'parser-template-loop-warning'            => '已侦测回归模�: [[$1]]',
+'parser-template-recursion-depth-warning' => '已超过回归模�深度�制 ($1)',
 
 # "Undo" feature
 'undo-success' => '此编辑�以被撤销。请检查以下对比以核实这正是您想�的，然��存以下更改以完�撤销编辑。',
@@ -721,29 +821,28 @@ $2',
 当中被$3��的原因是''$2''",
 
 # History pages
-'viewpagelogs'        => '查看此页�的日志',
-'nohistory'           => '此页没有修订记录。',
-'revnotfound'         => '没有找到修订记录',
-'revnotfoundtext'     => '您请求的更早版本的修订记录没有找到。
-请检查您请求本页�用的 URL 是�正确。',
-'currentrev'          => '当�修订版本',
-'revisionasof'        => '在$1所�的修订版本',
-'revision-info'       => '在$1由$2所�的修订版本',
-'previousrevision'    => '�上一修订',
-'nextrevision'        => '下一修订→',
-'currentrevisionlink' => '当�修订',
-'cur'                 => '当�',
-'next'                => '�继',
-'last'                => '先�',
-'page_first'          => '最�',
-'page_last'           => '最�',
-'histlegend'          => '差异选择: 标记�比较版本的�选按钮并点击底部的按钮进行比较。<br />
-说明: (当�) 指与当�版本比较，(先�) 指与�一个修订版本比较，� = �修改。',
-'deletedrev'          => '[已删除]',
-'histfirst'           => '最早版本',
-'histlast'            => '最新版本',
-'historysize'         => '($1 字节)',
-'historyempty'        => '(空)',
+'viewpagelogs'           => '查看此页�的日志',
+'nohistory'              => '此页没有修订记录。',
+'currentrev'             => '当�修订版本',
+'currentrev-asof'        => '在$1的当�修订版本',
+'revisionasof'           => '在$1所�的修订版本',
+'revision-info'          => '在$1由$2所�的修订版本', # Additionally available: $3: revision id
+'previousrevision'       => '�上一修订',
+'nextrevision'           => '下一修订→',
+'currentrevisionlink'    => '当�修订',
+'cur'                    => '当�',
+'next'                   => '�继',
+'last'                   => '先�',
+'page_first'             => '最�',
+'page_last'              => '最�',
+'histlegend'             => "差异选择: 标记�比较版本的�选按钮并点击底部的按钮进行比较。<br />
+说明: '''(当�)''' 指与当�版本比较，'''(先�)''' 指与�一个修订版本比较，'''�''' = �修改。",
+'history-fieldset-title' => '�览历�',
+'deletedrev'             => '[已删除]',
+'histfirst'              => '最早版本',
+'histlast'               => '最新版本',
+'historysize'            => '($1 字节)',
+'historyempty'           => '(空)',
 
 # Revision feed
 'history-feed-title'          => '修订历�',
@@ -825,6 +924,7 @@ $2',
 'mergehistory-invalid-destination' => '目的页�必须是一个有效的标题。',
 'mergehistory-autocomment'         => '已��并[[:$1]]去到[[:$2]]',
 'mergehistory-comment'             => '已��并[[:$1]]去到[[:$2]]: $3',
+'mergehistory-same-destination'    => '��页�与目的页���以相�',
 
 # Merge log
 'mergelog'           => '�并日志',
@@ -837,126 +937,207 @@ $2',
 'difference'              => '(修订版本间差异)',
 'lineno'                  => '第$1行:',
 'compareselectedversions' => '比较选定的版本',
+'visualcomparison'        => '��比较',
+'wikicodecomparison'      => 'Wikitext比较',
 'editundo'                => '撤销',
-'diff-multi'              => '($1个中途的修订版本没有显示。)',
+'diff-multi'              => '($1个中途的修订版本没有显示)',
+'diff-movedto'            => '移动到$1',
+'diff-styleadded'         => '已加入$1样�表',
+'diff-added'              => '已加入$1',
+'diff-changedto'          => '更改到$1',
+'diff-movedoutof'         => '移除自$1',
+'diff-styleremoved'       => '已移除$1样�表',
+'diff-removed'            => '已移除$1',
+'diff-changedfrom'        => '更改自$1',
+'diff-src'                => '��',
+'diff-withdestination'    => '跟$1目的地',
+'diff-with'               => 'è·Ÿ $1 $2',
+'diff-with-final'         => '和 $1 $2',
+'diff-width'              => '阔',
+'diff-height'             => '高',
+'diff-p'                  => '段�',
+'diff-blockquote'         => '语录',
+'diff-h1'                 => '标题（1级）',
+'diff-h2'                 => '标题（2级）',
+'diff-h3'                 => '标题（3级）',
+'diff-h4'                 => '标题（4级）',
+'diff-h5'                 => '标题（5级）',
+'diff-pre'                => '预先设置的方�',
+'diff-div'                => '部分',
+'diff-ul'                 => '未排列的表',
+'diff-ol'                 => '已排列的表',
+'diff-li'                 => '表项目',
+'diff-table'              => '表',
+'diff-tbody'              => '表内容',
+'diff-tr'                 => '行',
+'diff-td'                 => 'æ ¼',
+'diff-th'                 => '表头',
+'diff-br'                 => '断行',
+'diff-hr'                 => '横线',
+'diff-code'               => '电脑�方�',
+'diff-dl'                 => '定义表',
+'diff-dt'                 => '定义字',
+'diff-dd'                 => '解释',
+'diff-input'              => '输入',
+'diff-form'               => '表',
+'diff-img'                => '图�',
+'diff-span'               => '样�',
+'diff-a'                  => '连结',
+'diff-i'                  => '斜体',
+'diff-b'                  => '粗体',
+'diff-strong'             => '强调',
+'diff-em'                 => '�点',
+'diff-font'               => '字体',
+'diff-big'                => '大',
+'diff-del'                => '已删除',
+'diff-tt'                 => '固定阔度',
+'diff-sub'                => '下标',
+'diff-sup'                => '上标',
+'diff-strike'             => '删除线',
 
 # Search results
-'searchresults'             => '�索结果',
-'searchresulttext'          => '有关�索{{SITENAME}}的更多详情,��[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
-'searchsubtitle'            => '�索\'\'\'[[:$1]]\'\'\'([[Special:Prefixindex/$1|所有以 "$1" 开头的页�]] | [[Special:WhatLinksHere/$1|所有链接到 "$1" 的页�]])',
-'searchsubtitleinvalid'     => "�索'''$1'''",
-'noexactmatch'              => "'''没找到标题为\"\$1\"的页�。''' 您�以[[:\$1|创建此页�]]。",
-'noexactmatch-nocreate'     => "'''没找到标题为\"\$1\"的页�。'''",
-'toomanymatches'            => '过多的匹�已�应，请�试一个��的查询',
-'titlematches'              => '页�题目相符',
-'notitlematches'            => '没有找到匹�页�题目',
-'textmatches'               => '页�内容相符',
-'notextmatches'             => '没有页�内容匹�',
-'prevn'                     => '�$1个',
-'nextn'                     => '�$1个',
-'viewprevnext'              => '查看 ($1) ($2) ($3)',
-'search-result-size'        => '$1 ($2个字)',
-'search-result-score'       => '相关度: $1%',
-'search-redirect'           => '(�定� $1)',
-'search-section'            => '(段� $1)',
-'search-suggest'            => '你是�解: $1',
-'search-interwiki-caption'  => '姊妹计划',
-'search-interwiki-default'  => '$1项结果:',
-'search-interwiki-more'     => '(更多)',
-'search-mwsuggest-enabled'  => '有建议',
-'search-mwsuggest-disabled' => '无建议',
-'search-relatedarticle'     => '相关',
-'mwsuggest-disable'         => '�用AJAX建议',
-'searchrelated'             => '相关',
-'searchall'                 => '所有',
-'showingresults'            => '下�显示从第<b>$2</b>�开始的<b>$1</b>�结果:',
-'showingresultsnum'         => '下�显示从第<b>$2</b>�开始的<b>$3</b>�结果:',
-'showingresultstotal'       => "下�显示从'''$1 - $2'''，总共'''$3'''项之结果",
-'nonefound'                 => "'''注�''': �有一些�字空间是会作为预设�寻。�试''all:''去�寻全部的页�（包埋讨论页��模�等），或�用需�的�字空间作为�缀。",
-'powersearch'               => '高级�索',
-'powersearch-legend'        => '高级�索',
-'powersearch-ns'            => '在以下的�字空间中�索:',
-'powersearch-redir'         => '�定�列表',
-'powersearch-field'         => '�索',
-'search-external'           => '外部�索',
-'searchdisabled'            => '{{SITENAME}}由于性能方�的原因，全文�索已被暂时�用。您�以暂时通过Google�索。请留�他们的索引�能会过时。',
+'searchresults'                    => '�索结果',
+'searchresults-title'              => '对"$1"的�索结果',
+'searchresulttext'                 => '有关�索{{SITENAME}}的更多详情,��[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
+'searchsubtitle'                   => '�索\'\'\'[[:$1]]\'\'\'([[Special:Prefixindex/$1|所有以 "$1" 开头的页�]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|所有链接到 "$1" 的页�]])',
+'searchsubtitleinvalid'            => "�索'''$1'''",
+'noexactmatch'                     => "'''没找到标题为\"\$1\"的页�。''' 您�以[[:\$1|创建此页�]]。",
+'noexactmatch-nocreate'            => "'''没找到标题为\"\$1\"的页�。'''",
+'toomanymatches'                   => '过多的匹�已�应，请�试一个��的查询',
+'titlematches'                     => '页�题目相符',
+'notitlematches'                   => '没有找到匹�页�题目',
+'textmatches'                      => '页�内容相符',
+'notextmatches'                    => '没有页�内容匹�',
+'prevn'                            => '�$1个',
+'nextn'                            => '�$1个',
+'viewprevnext'                     => '查看 ($1) ($2) ($3)',
+'searchmenu-legend'                => '�寻选项',
+'searchmenu-exists'                => "'''在这个wiki上有一页���\"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''在这个wiki上新建这个页�\"[[:\$1]]\"�'''",
+'searchhelp-url'                   => 'Help:目录',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|去�览以此为首的页�]]',
+'searchprofile-articles'           => '内容页�',
+'searchprofile-articles-and-proj'  => '内容和专题页�',
+'searchprofile-project'            => '专题页�',
+'searchprofile-images'             => '文件',
+'searchprofile-everything'         => '全部',
+'searchprofile-advanced'           => '高级',
+'searchprofile-articles-tooltip'   => '在$1中�寻',
+'searchprofile-project-tooltip'    => '在$1中�寻',
+'searchprofile-images-tooltip'     => '�寻文件',
+'searchprofile-everything-tooltip' => '�寻全部（包括讨论页�）',
+'searchprofile-advanced-tooltip'   => '在自定�字空间中度�寻',
+'prefs-search-nsdefault'           => '使用预设值�寻:',
+'prefs-search-nscustom'            => '�寻自定�字空间:',
+'search-result-size'               => '$1 ($2个字)',
+'search-result-score'              => '相关度: $1%',
+'search-redirect'                  => '(�定� $1)',
+'search-section'                   => '(段� $1)',
+'search-suggest'                   => '你是�解: $1',
+'search-interwiki-caption'         => '姊妹计划',
+'search-interwiki-default'         => '$1项结果:',
+'search-interwiki-more'            => '(更多)',
+'search-mwsuggest-enabled'         => '有建议',
+'search-mwsuggest-disabled'        => '无建议',
+'search-relatedarticle'            => '相关',
+'mwsuggest-disable'                => '�用AJAX建议',
+'searchrelated'                    => '相关',
+'searchall'                        => '所有',
+'showingresults'                   => '下�显示从第<b>$2</b>�开始的<b>$1</b>�结果:',
+'showingresultsnum'                => '下�显示从第<b>$2</b>�开始的<b>$3</b>�结果:',
+'showingresultstotal'              => "下�显示从第'''$1{{PLURAL:$4|| - $2}}'''项，总共'''$3'''项之结果",
+'nonefound'                        => "'''注�''': �有一些�字空间是会作为预设�寻。�试''all:''去�寻全部的页�（包埋讨论页��模�等），或�用需�的�字空间作为�缀。",
+'search-nonefound'                 => '在查询中无结果��。',
+'powersearch'                      => '高级�索',
+'powersearch-legend'               => '高级�索',
+'powersearch-ns'                   => '在以下的�字空间中�索:',
+'powersearch-redir'                => '�定�列表',
+'powersearch-field'                => '�索',
+'search-external'                  => '外部�索',
+'searchdisabled'                   => '{{SITENAME}}由于性能方�的原因，全文�索已被暂时�用。您�以暂时通过Google�索。请留�他们的索引�能会过时。',
 
 # Preferences page
-'preferences'              => '�数设置',
-'mypreferences'            => '我的�数设置',
-'prefs-edits'              => '编辑数�:',
-'prefsnologin'             => '尚未登录',
-'prefsnologintext'         => '您必须先<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登录]</span>�能设置个人�数。',
-'prefsreset'               => '�数已被�新设置。',
-'qbsettings'               => '快速导航�',
-'qbsettings-none'          => 'æ— ',
-'qbsettings-fixedleft'     => '左侧固定',
-'qbsettings-fixedright'    => '�侧固定',
-'qbsettings-floatingleft'  => '左侧漂移',
-'qbsettings-floatingright' => '�侧漂移',
-'changepassword'           => '更改密�',
-'skin'                     => '皮肤',
-'math'                     => '数学公�',
-'dateformat'               => '日期格�',
-'datedefault'              => '默认值',
-'datetime'                 => '日期和时间',
-'math_failure'             => '解�失败',
-'math_unknown_error'       => '未知错误',
-'math_unknown_function'    => '未知函数',
-'math_lexing_error'        => '�法错误',
-'math_syntax_error'        => '语法错误',
-'math_image_error'         => 'PNG 转�失败；请检查是�正确安装了 latex, dvips, gs 和 convert',
-'math_bad_tmpdir'          => '无法写入或建立数学公�临时目录',
-'math_bad_output'          => '无法写入或建立数学公�输出目录',
-'math_notexvc'             => '无法执行"texvc"；请�照 math/README 进行�置。',
-'prefs-personal'           => '用户资料',
-'prefs-rc'                 => '最近更改',
-'prefs-watchlist'          => '监视列表',
-'prefs-watchlist-days'     => '监视列表中显示记录的天数:',
-'prefs-watchlist-edits'    => '在增强的监视列表中显示最多更改次数:',
-'prefs-misc'               => '�项',
-'saveprefs'                => '�存',
-'resetprefs'               => '清除未�存的更改',
-'oldpassword'              => '旧密�:',
-'newpassword'              => '新密�:',
-'retypenew'                => '确认密�:',
-'textboxsize'              => '编辑',
-'rows'                     => '行:',
-'columns'                  => '列:',
-'searchresultshead'        => '�索结果设定',
-'resultsperpage'           => '�页显示链接数',
-'contextlines'             => '�链显示行数:',
-'contextchars'             => '�行显示字数:',
-'stub-threshold'           => '<a href="#" class="stub">短页�链接</a>格�门槛值 (字节):',
-'recentchangesdays'        => '最近更改中的显示日数:',
-'recentchangescount'       => '最近更改�历��日志页�中的编辑数:',
-'savedprefs'               => '您的个人�数设置已��存。',
-'timezonelegend'           => '时区',
-'timezonetext'             => '¹输入当地时间与�务器时间(UTC)的时差。',
-'localtime'                => '当地时间',
-'timezoneoffset'           => '时差¹',
-'servertime'               => '�务器时间',
-'guesstimezone'            => '从�览器填写',
-'allowemail'               => '接��自其他用户的邮件',
-'prefs-searchoptions'      => '�索选项',
-'prefs-namespaces'         => '�字空间',
-'defaultns'                => '默认�索的�字空间',
-'default'                  => '默认',
-'files'                    => '文件',
+'preferences'               => '�数设置',
+'mypreferences'             => '我的�数设置',
+'prefs-edits'               => '编辑数�:',
+'prefsnologin'              => '尚未登录',
+'prefsnologintext'          => '您必须先<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登录]</span>�能设置个人�数。',
+'prefsreset'                => '�数已被�新设置。',
+'qbsettings'                => '快速导航�',
+'qbsettings-none'           => 'æ— ',
+'qbsettings-fixedleft'      => '左侧固定',
+'qbsettings-fixedright'     => '�侧固定',
+'qbsettings-floatingleft'   => '左侧漂移',
+'qbsettings-floatingright'  => '�侧漂移',
+'changepassword'            => '更改密�',
+'skin'                      => '皮肤',
+'skin-preview'              => '预览',
+'math'                      => '数学公�',
+'dateformat'                => '日期格�',
+'datedefault'               => '默认值',
+'datetime'                  => '日期和时间',
+'math_failure'              => '解�失败',
+'math_unknown_error'        => '未知错误',
+'math_unknown_function'     => '未知函数',
+'math_lexing_error'         => '�法错误',
+'math_syntax_error'         => '语法错误',
+'math_image_error'          => 'PNG 转�失败；请检查是�正确安装了 latex, dvips, gs 和 convert',
+'math_bad_tmpdir'           => '无法写入或建立数学公�临时目录',
+'math_bad_output'           => '无法写入或建立数学公�输出目录',
+'math_notexvc'              => '无法执行"texvc"；请�照 math/README 进行�置。',
+'prefs-personal'            => '用户资料',
+'prefs-rc'                  => '最近更改',
+'prefs-watchlist'           => '监视列表',
+'prefs-watchlist-days'      => '监视列表中显示记录的天数:',
+'prefs-watchlist-days-max'  => '(最大7天)',
+'prefs-watchlist-edits'     => '在增强的监视列表中显示最多更改次数:',
+'prefs-watchlist-edits-max' => '(最多数�: 1000)',
+'prefs-misc'                => '�项',
+'prefs-resetpass'           => '更改密�',
+'saveprefs'                 => '�存',
+'resetprefs'                => '清除未�存的更改',
+'textboxsize'               => '编辑',
+'prefs-edit-boxsize'        => '编辑框尺寸',
+'rows'                      => '行:',
+'columns'                   => '列:',
+'searchresultshead'         => '�索',
+'resultsperpage'            => '�页显示链接数',
+'contextlines'              => '�链显示行数:',
+'contextchars'              => '�行显示字数:',
+'stub-threshold'            => '<a href="#" class="stub">短页�链接</a>格�门槛值 (字节):',
+'recentchangesdays'         => '最近更改中的显示日数:',
+'recentchangesdays-max'     => '(最大 $1 日)',
+'recentchangescount'        => '最近更改�页�历��日志页�中的预设编辑数:',
+'savedprefs'                => '您的个人�数设置已��存。',
+'timezonelegend'            => '时区',
+'timezonetext'              => '¹输入当地时间与�务器时间(UTC)的时差。',
+'localtime'                 => '当地时间:',
+'timezoneselect'            => '时区:',
+'timezoneuseserverdefault'  => '使用�务器预设值',
+'timezoneuseoffset'         => '其它 (指定�移)',
+'timezoneoffset'            => '时差¹:',
+'servertime'                => '�务器时间:',
+'guesstimezone'             => '从�览器填写',
+'allowemail'                => '接��自其他用户的邮件',
+'prefs-searchoptions'       => '�索选项',
+'prefs-namespaces'          => '�字空间',
+'defaultns'                 => '默认�索的�字空间',
+'default'                   => '默认',
+'files'                     => '文件',
 
 # User rights
 'userrights'                  => '用户��管�', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => '管�用户群组',
 'userrights-user-editname'    => '输入用户�:',
 'editusergroup'               => '编辑用户群组',
-'editinguser'                 => "正在更改用户'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) 的用户��",
+'editinguser'                 => "正在更改用户'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) 的用户��",
 'userrights-editusergroup'    => '编辑用户群组',
 'saveusergroups'              => '存储用户群组',
 'userrights-groupsmember'     => '隶属于:',
 'userrights-groups-help'      => '您�以改动这�用户所属的组群:
 * 已剔选的核�方�代表该用户属于该组群。
 * 未剔选的核�方�代表该用户�是属于该组群。
-* 一个 * 表示当您加入群组之�更�能移除它，�之亦然。',
+* 有 * 项目表示一旦您加入该群组之�便�能移除它，�之亦然。',
 'userrights-reason'           => '更改原因:',
 'userrights-no-interwiki'     => '您并没有��去编辑在其它wiki上的用户��。',
 'userrights-nodatabase'       => '数�库$1�存在或并�为本地的。',
@@ -998,6 +1179,8 @@ $2',
 'right-minoredit'            => '标示作�编辑',
 'right-move'                 => '移动页�',
 'right-move-subpages'        => '移动页�跟它的字页�',
+'right-move-rootuserpages'   => '移动根用户页�',
+'right-movefile'             => '移动文件',
 'right-suppressredirect'     => '移动页�时�建立�定�',
 'right-upload'               => '上载文件',
 'right-reupload'             => '覆盖现有的文件',
@@ -1048,9 +1231,46 @@ $2',
 'rightslogentry' => '将 $1 的��从 $2 改为 $3',
 'rightsnone'     => '(æ— )',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '阅读这个页�',
+'action-edit'                 => '编辑这个页�',
+'action-createpage'           => '建立这个页�',
+'action-createtalk'           => '建立讨论页�',
+'action-createaccount'        => '建立这个用户账户',
+'action-minoredit'            => '标示这个编辑为�的',
+'action-move'                 => '移动这个页�',
+'action-move-subpages'        => '移动这个页�跟它的字页�',
+'action-move-rootuserpages'   => '移动根用户页�',
+'action-movefile'             => '移动这个文件',
+'action-upload'               => '上载这个文件',
+'action-reupload'             => '覆盖这个现有的文件',
+'action-reupload-shared'      => '覆盖在共用文件库上的文件',
+'action-upload_by_url'        => '由一个URL地�中上载文件',
+'action-writeapi'             => '用�写API',
+'action-delete'               => '删除这个页�',
+'action-deleterevision'       => '删除这次修订',
+'action-deletedhistory'       => '查看这个页�的删除历�',
+'action-browsearchive'        => '�寻已删除的页�',
+'action-undelete'             => '�删除这个页�',
+'action-suppressrevision'     => '翻查和��这次��修订',
+'action-suppressionlog'       => '查看这个�有日志',
+'action-block'                => '��这�用户的编辑',
+'action-protect'              => '更改这个页�的�护等级',
+'action-import'               => '由�一个wiki导入这个页�',
+'action-importupload'         => '由一个文件上载中导入这个页�',
+'action-patrol'               => '标示其它的编辑为已巡查的',
+'action-autopatrol'           => '将您的编辑标示为已巡查的',
+'action-unwatchedpages'       => '查看未被人监视的页�',
+'action-trackback'            => '递交一个trackback',
+'action-mergehistory'         => '�并这个页�的历�',
+'action-userrights'           => '编辑所有的��',
+'action-userrights-interwiki' => '编辑在其它wiki上用户的��',
+'action-siteadmin'            => '�定和解除�定数�库',
+
 # Recent changes
 'nchanges'                          => '$1次更改',
 'recentchanges'                     => '最近更改',
+'recentchanges-legend'              => '最近更改选项',
 'recentchangestext'                 => '跟踪这个wiki上的最新更改。',
 'recentchanges-feed-description'    => '跟踪此订阅在 wiki 上的最近更改。',
 'rcnote'                            => "以下是在$4 $5，最近'''$2'''天内的'''$1'''次最近更改记录:",
@@ -1060,7 +1280,7 @@ $2',
 'rcshowhidebots'                    => '$1机器人的编辑',
 'rcshowhideliu'                     => '$1登录用户的编辑',
 'rcshowhideanons'                   => '$1匿�用户的编辑',
-'rcshowhidepatr'                    => ' $1检查过的编辑',
+'rcshowhidepatr'                    => '$1检查过的编辑',
 'rcshowhidemine'                    => '$1我的编辑',
 'rclinks'                           => '显示最近$2天内最新的$1次改动。<br />$3',
 'diff'                              => '差异',
@@ -1074,6 +1294,8 @@ $2',
 'rc_categories'                     => '分类界�(以"|"分割)',
 'rc_categories_any'                 => '任�',
 'newsectionsummary'                 => '/* $1 */ 新段�',
+'rc-enhanced-expand'                => '显示细节 (需� JavaScript)',
+'rc-enhanced-hide'                  => '��细节',
 
 # Recent changes linked
 'recentchangeslinked'          => '链出更改',
@@ -1096,13 +1318,13 @@ $2',
 'uploaderror'                 => '上载错误',
 'uploadtext'                  => "使用下�的表��上传用在页�内新的文件。
 �查看或�索以�上传的文件
-�以进入[[Special:ImageList|文件上传列表]]，
+�以进入[[Special:FileList|文件上传列表]]，
 （�新）上传将在[[Special:Log/upload|上传日志]]中记录，
 而删除将在[[Special:Log/delete|删除日志]]中记录。
 
 �在页�中加入文件，使用以下形�的连接:
-'''<nowiki>[[</nowiki>{{ns:image}}</nowiki>:file.jpg]]</nowiki>'''，
-'''<nowiki>[[</nowiki>{{ns:image}}</nowiki>:file.png|替�文字]]</nowiki>''' 或
+'''<nowiki>[[</nowiki>{{ns:file}}</nowiki>:file.jpg]]</nowiki>'''，
+'''<nowiki>[[</nowiki>{{ns:file}}</nowiki>:file.png|替�文字]]</nowiki>''' 或
 '''<nowiki>[[</nowiki>{{ns:media}}</nowiki>:file.ogg]]</nowiki>'''。",
 'upload-permitted'            => '准许的文件类型: $1。',
 'upload-preferred'            => '建议的文件类型: $1。',
@@ -1110,7 +1332,7 @@ $2',
 'uploadlog'                   => '上传日志',
 'uploadlogpage'               => '上传日志',
 'uploadlogpagetext'           => '以下是一个最近上传文件的列表。
-查看[[Special:NewImages|新文件画廊]]去看更富图�的总览。',
+查看[[Special:NewFiles|新文件画廊]]去看更富图�的总览。',
 'filename'                    => '文件�',
 'filedesc'                    => '文件�述',
 'fileuploadsummary'           => '文件�述:',
@@ -1143,9 +1365,11 @@ $2',
 如果检查�的文件是�原本图�的大�是一样的�，就�用�上载多一幅缩图。',
 'file-thumbnail-no'           => '文件�是以<strong><tt>$1</tt></strong>开头的。它似乎是一幅图�的缩�版本<i>（缩略图）</i>。
 如果你有该图�的完整大�，请上传完整版本。�则请修改文件�。',
-'fileexists-forbidden'        => '已存在相��称的文件；请返回并用一个新的�称�上传此文件。[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => '在共享文件库中已存在此�称的文件；请返回并用一个新的�称�上传此文件。[[Image:$1|thumb|center|$1]]',
+'fileexists-forbidden'        => '已存在相��称的文件，且�能覆盖；请返回并用一个新的�称�上传此文件。[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => '在共享文件库中已存在此�称的文件。
+如果你�然想去上载它的�，请返回并用一个新的�称�上传此文件。[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => '这个文件是跟以下的{{PLURAL:$1|一|多}}个文件�覆:',
+'file-deleted-duplicate'      => '一个相��称的文件 ([[$1]]) 在先�删除过。您应该在�新上传之�检查一下该文件之删除纪录。',
 'successfulupload'            => '上传�功',
 'uploadwarning'               => '上载警告',
 'savefile'                    => '�存文件',
@@ -1172,7 +1396,7 @@ $2',
 'upload-file-error'       => '内部错误',
 'upload-file-error-text'  => '当试图在�务器上创建临时文件时�生内部错误。请与[[Special:ListUsers/sysop|管�员]]�系。',
 'upload-misc-error'       => '未知的上传错误',
-'upload-misc-error-text'  => '在上传时�生未知的错误. 请验�使用了正确并�访问的 URL，然�进行�试。如果问题�然存在，请与[[Special:ListUsers/sysop|管�员]]�系。',
+'upload-misc-error-text'  => '在上传时�生未知的错误。请确认您使用了正确并�访问的URL，然�进行�试。如果问题�然存在，请与[[Special:ListUsers/sysop|管�员]]�系。',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6'       => '无法访问 URL',
@@ -1186,20 +1410,21 @@ $2',
 'upload_source_url'  => ' (一个有效的，�公开访问的 URL)',
 'upload_source_file' => ' (在您计算机上的一个文件)',
 
-# Special:ImageList
-'imagelist-summary'     => '这个特殊页�显示所有上传过的文件。
+# Special:ListFiles
+'listfiles-summary'     => '这个特殊页�显示所有上传过的文件。
 预设中最�上传的文件会显示在这个列表中的最顶处。
 点击一�的标题去改�这个排列。',
-'imagelist_search_for'  => '按媒体�称�索:',
+'listfiles_search_for'  => '按媒体�称�索:',
 'imgfile'               => '文件',
-'imagelist'             => '文件列表',
-'imagelist_date'        => '日期',
-'imagelist_name'        => '�称',
-'imagelist_user'        => '用户',
-'imagelist_size'        => '大�',
-'imagelist_description' => '�述',
-
-# Image description page
+'listfiles'             => '文件列表',
+'listfiles_date'        => '日期',
+'listfiles_name'        => '�称',
+'listfiles_user'        => '用户',
+'listfiles_size'        => '大�',
+'listfiles_description' => '�述',
+'listfiles_count'       => '版本',
+
+# File description page
 'filehist'                       => '文件历�',
 'filehist-help'                  => '点击日期�时间以查看当时出现过的文件。',
 'filehist-deleteall'             => '删除全部',
@@ -1207,16 +1432,22 @@ $2',
 'filehist-revert'                => '��',
 'filehist-current'               => '当�',
 'filehist-datetime'              => '日期�时间',
+'filehist-thumb'                 => '缩图',
+'filehist-thumbtext'             => '于$1的缩图版本',
+'filehist-nothumb'               => '没有缩图',
 'filehist-user'                  => '用户',
 'filehist-dimensions'            => '维度',
 'filehist-filesize'              => '文件大�',
 'filehist-comment'               => '注解',
-'imagelinks'                     => '链接',
+'imagelinks'                     => '文件链接',
 'linkstoimage'                   => '以下的$1个页�链接到本文件:',
+'linkstoimage-more'              => '多于$1个页�连接到这个文件。
+下�的列表�列示了连去这个文件的最首$1个页�。
+一个[[Special:WhatLinksHere/$2|完整的列表]]�以�供。',
 'nolinkstoimage'                 => '没有页�链接到本文件。',
 'morelinkstoimage'               => '查看连接到这个文件的[[Special:WhatLinksHere/$1|更多连结]]。',
 'redirectstofile'                => '以下的$1个文件�新定�到这个文件:',
-'duplicatesoffile'               => '以下的$1个文件是跟这个文件�覆:',
+'duplicatesoffile'               => '以下的$1个文件跟这个文件�覆（[[Special:FileDuplicateSearch/$2|更多细节]]）：',
 'sharedupload'                   => '该文件是一个共享上传，它�能在其它项目中被应用。',
 'shareduploadwiki'               => '请�阅在共享文件库上的$1以了解其相关信�。',
 'shareduploadwiki-desc'          => '它在$1上的�述于下�显示。',
@@ -1233,7 +1464,7 @@ $2',
 # File reversion
 'filerevert'                => '��$1',
 'filerevert-legend'         => '��文件',
-'filerevert-intro'          => "您现正在��'''[[Media:$1|$1]]'''到[$4 于$2 $3的版本]。",
+'filerevert-intro'          => "您现正在��文件'''[[Media:$1|$1]]'''到[$4 于$2 $3的版本]。",
 'filerevert-comment'        => '注解:',
 'filerevert-defaultcomment' => '已���到于$1 $2的版本',
 'filerevert-submit'         => '��',
@@ -1243,7 +1474,7 @@ $2',
 # File deletion
 'filedelete'                  => '删除$1',
 'filedelete-legend'           => '删除文件',
-'filedelete-intro'            => "您现正删除'''[[Media:$1|$1]]'''。",
+'filedelete-intro'            => "您现正删除文件'''[[Media:$1|$1]]'''。",
 'filedelete-intro-old'        => "你现正删除'''[[Media:$1|$1]]'''于[$4 $2 $3]的版本。",
 'filedelete-comment'          => '删除�由:',
 'filedelete-submit'           => '删除',
@@ -1251,7 +1482,6 @@ $2',
 'filedelete-success-old'      => "'''[[Media:$1|$1]]'''于 $2 $3 的版本已�删除。",
 'filedelete-nofile'           => "'''$1'''�存在。",
 'filedelete-nofile-old'       => "在已指定属性的情况下，这里没有'''$1'''于 $2 $3 的版本。",
-'filedelete-iscurrent'        => '您现正�试删除这个文件的最近版本。请先将个该文件回退�较旧的版本。',
 'filedelete-otherreason'      => '其它�附加的�由:',
 'filedelete-reason-otherlist' => '其它�由',
 'filedelete-reason-dropdown'  => '
@@ -1279,29 +1509,31 @@ $2',
 
 # Random page
 'randompage'         => '�机页�',
-'randompage-nopages' => '在这个�字空间中没有页�。',
+'randompage-nopages' => '在 "$1" �字空间中没有页�。',
 
 # Random redirect
 'randomredirect'         => '�机�定�页�',
-'randomredirect-nopages' => '在这个�字空间中没有�定�页�。',
+'randomredirect-nopages' => '在 "$1" �字空间中没有�定�页�。',
 
 # Statistics
-'statistics'             => '统计',
-'sitestats'              => '{{SITENAME}}统计数�',
-'userstats'              => '用户统计',
-'sitestatstext'          => "数�库中共有'''\$1'''页页�。
-其中包括对�页�关于{{SITENAME}}的页��最少�的\"�作�\"页��定�的页�，
-以�未达到页�质�的页�。除此之外还有'''\$2'''页�能是�乎标准的页�。
-
-'''\$8'''个文件已被上传。
-
-从{{SITENAME}}设置以�，全站点共有页��览'''\$3'''次，页�编辑'''\$4'''次。
-��页平�编辑'''\$5'''次，�次编辑�页�的�个版本平��览'''\$6'''次。
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue 工作排队]的长度是'''\$7'''。",
-'userstatstext'          => "网站有'''$1'''�注册[[Special:ListUsers|用户]]，其中
-'''$2''' (或 '''$4%''') 有$5��。",
-'statistics-mostpopular' => '�览最多的页�',
+'statistics'                   => '统计',
+'statistics-header-pages'      => '页�统计',
+'statistics-header-edits'      => '编辑统计',
+'statistics-header-views'      => '查看统计',
+'statistics-header-users'      => '用户统计',
+'statistics-articles'          => '内容页�',
+'statistics-pages'             => '页�',
+'statistics-pages-desc'        => '在wiki上的所有页�，包括对�页���新定�等',
+'statistics-files'             => '已�上载的文件',
+'statistics-edits'             => '自从{{SITENAME}}设置的页�编辑数',
+'statistics-edits-average'     => '�一页�的平�编辑数',
+'statistics-views-total'       => '查看总数',
+'statistics-views-peredit'     => '�次编辑查看数',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue 工作队列]长度',
+'statistics-users'             => '已注册[[Special:ListUsers|用户]]',
+'statistics-users-active'      => '活跃用户',
+'statistics-users-active-desc' => '在�$1天中�作过的用户',
+'statistics-mostpopular'       => '�览最多的页�',
 
 'disambiguations'      => '消�糊页',
 'disambiguationspage'  => 'Template:disambig
@@ -1315,11 +1547,11 @@ Template:消除歧義',
 
 'doubleredirects'            => '���定�页�',
 'doubleredirectstext'        => '这一页列出所有�定�页��定�到�一个�定�页的页�。�一行都包�到第一和第二个�定�页�的链接，以�第二个�定�页�的目标，通常显示的都会是"真正"的目标页�，也就是第一个�定�页�应该指�的页�。',
-'double-redirect-fixed-move' => '[[$1]]已�完�移动，它现在�定�到[[$2]]',
+'double-redirect-fixed-move' => '[[$1]]已�完�移动，它现在�定�到[[$2]]。',
 'double-redirect-fixer'      => '�定�修正器',
 
 'brokenredirects'        => '��的�定�页',
-'brokenredirectstext'    => '以下的�定�页�指�的是�存在的页�。',
+'brokenredirectstext'    => '以下的�定�页�指�的是�存在的页�:',
 'brokenredirects-edit'   => '(编辑)',
 'brokenredirects-delete' => '(删除)',
 
@@ -1349,26 +1581,30 @@ Template:消除歧義',
 'popularpages'            => '热点页�',
 'wantedcategories'        => '待撰分类',
 'wantedpages'             => '待撰页�',
-'missingfiles'            => '�失文件',
+'wantedfiles'             => '需�的文件',
+'wantedtemplates'         => '需�的模�',
 'mostlinked'              => '最多链接页�',
 'mostlinkedcategories'    => '最多链接分类',
 'mostlinkedtemplates'     => '最多链接模版',
 'mostcategories'          => '最多分类页�',
 'mostimages'              => '最多链接文件',
 'mostrevisions'           => '最多修订页�',
-'prefixindex'             => '�缀索引',
+'prefixindex'             => '所有页�之�缀',
 'shortpages'              => '短页�',
 'longpages'               => '长页�',
 'deadendpages'            => '断链页�',
 'deadendpagestext'        => '以下页�没有链接到{{SITENAME}}中的其它页�。',
 'protectedpages'          => '已�护页�',
 'protectedpages-indef'    => '�有无期之�护页�',
+'protectedpages-cascade'  => '�有连�之�护页�',
 'protectedpagestext'      => '以下页�已�被�护以防止移移或编辑',
 'protectedpagesempty'     => '在这些�数下没有页�正在�护。',
 'protectedtitles'         => '已�护的标题',
 'protectedtitlestext'     => '以下的页�已�被�护以防止创建',
 'protectedtitlesempty'    => '在这些�数之下并无标题正在�护。',
 'listusers'               => '用户列表',
+'listusers-editsonly'     => '�显示有编辑的用户',
+'usereditcount'           => '$1次编辑',
 'newpages'                => '最新页�',
 'newpages-username'       => '用户�:',
 'ancientpages'            => '最早页�',
@@ -1389,14 +1625,13 @@ Template:消除歧義',
 'booksources-search-legend' => '�索网络书�',
 'booksources-go'            => '转到',
 'booksources-text'          => '以下是一些网络书店的链接列表，其中�能有您�找的书�的更多信�:',
+'booksources-invalid-isbn'  => '�供的ISBN��并�正确，请检查原始�制����是�有误。',
 
 # Special:Log
 'specialloguserlabel'  => '用户:',
 'speciallogtitlelabel' => '标题:',
 'log'                  => '日志',
 'all-logs-page'        => '所有日志',
-'log-search-legend'    => '�寻日志',
-'log-search-submit'    => '去',
 'alllogstext'          => '综�显示{{SITENAME}}所有的�用日志。
 您�以选择日志类型，用户�（区分大�写）或者相关页�（区分大�写）�缩�查询范围。',
 'logempty'             => '在日志中�存在匹�项。',
@@ -1408,6 +1643,7 @@ Template:消除歧義',
 'nextpage'          => '下一页($1)',
 'prevpage'          => '上一页($1)',
 'allpagesfrom'      => '显示从此处开始的页�:',
+'allpagesto'        => '显示从此处结�的页�:',
 'allarticles'       => '所有页�',
 'allinnamespace'    => '所有页�(属于$1�字空间)',
 'allnotinnamespace' => '所有页�(�属于$1�字空间)',
@@ -1427,44 +1663,71 @@ Template:消除歧義',
 'special-categories-sort-count' => '按数�排列',
 'special-categories-sort-abc'   => '按字�排列',
 
+# Special:DeletedContributions
+'deletedcontributions' => '已删除的用户贡献',
+
+# Special:LinkSearch
+'linksearch'       => '外部链接',
+'linksearch-pat'   => '�索网�:',
+'linksearch-ns'    => '�字空间:',
+'linksearch-ok'    => '�索',
+'linksearch-text'  => '�以使用类似"*.wikipedia.org"的通�符。<br />
+已支�：<tt>$1</tt>',
+'linksearch-line'  => '$1 链自 $2',
+'linksearch-error' => '通�符仅�在主机�称的开头使用。',
+
 # Special:ListUsers
 'listusersfrom'      => '给定显示用户�件:',
 'listusers-submit'   => '显示',
 'listusers-noresult' => '找�到用户。',
 
+# Special:Log/newusers
+'newuserlogpage'              => '新进用户�册',
+'newuserlogpagetext'          => '本日志是显示新注册用户的日志',
+'newuserlog-byemail'          => '密�已由电�邮件�出',
+'newuserlog-create-entry'     => '新用户账户',
+'newuserlog-create2-entry'    => '已创建$1的新账户',
+'newuserlog-autocreate-entry' => '已自动建立账户',
+
 # Special:ListGroupRights
-'listgrouprights'          => '用户群组��',
-'listgrouprights-summary'  => '以下�是一个在这个wiki中定义出�的用户��列表，以�它们的访问�。
+'listgrouprights'                 => '用户群组��',
+'listgrouprights-summary'         => '以下�是一个在这个wiki中定义出�的用户��列表，以�它们的访问�。
 更多有关个别��的细节�以在[[{{MediaWiki:Listgrouprights-helppage}}|这里]]找到。',
-'listgrouprights-group'    => '群组',
-'listgrouprights-rights'   => '��',
-'listgrouprights-helppage' => 'Help:群组��',
-'listgrouprights-members'  => '(�员列表)',
+'listgrouprights-group'           => '群组',
+'listgrouprights-rights'          => '��',
+'listgrouprights-helppage'        => 'Help:群组��',
+'listgrouprights-members'         => '(�员列表)',
+'listgrouprights-addgroup'        => '�以加入的{{PLURAL:$2|一个|多个}}群组: $1',
+'listgrouprights-removegroup'     => '�以移除的{{PLURAL:$2|一个|多个}}群组: $1',
+'listgrouprights-addgroup-all'    => '�以加入所有群组',
+'listgrouprights-removegroup-all' => '�以移除所有群组',
 
 # E-mail user
-'mailnologin'     => '无电邮地�',
-'mailnologintext' => '您必须先[[Special:UserLogin|登录]]
+'mailnologin'      => '无电邮地�',
+'mailnologintext'  => '您必须先[[Special:UserLogin|登录]]
 并在[[Special:Preferences|�数设置]]
 中有一个有效的电�邮箱地���以�其他用户�邮件。',
-'emailuser'       => '�该用户�邮件',
-'emailpage'       => '�用户�邮件',
-'emailpagetext'   => '您�以用下�的表格去寄一�电邮给这�用户。
+'emailuser'        => '�该用户�邮件',
+'emailpage'        => '�用户�邮件',
+'emailpagetext'    => '您�以用下�的表格去寄一�电邮给这�用户。
 您在[[Special:Preferences|您�数设置]]中所输入的电�邮箱地�将出现在邮件"�件人"一�中，这样该用户就�以回�您。',
-'usermailererror' => 'Mail 对象返回错误:',
-'defemailsubject' => '{{SITENAME}}电�邮件',
-'noemailtitle'    => '无电�邮件地�',
-'noemailtext'     => '该用户还没有指定一个有效的电�邮件地�，
-或者选择�接��自其他用户的电�邮件。',
-'emailfrom'       => '�件人:',
-'emailto'         => '收件人:',
-'emailsubject'    => '主题:',
-'emailmessage'    => '信�:',
-'emailsend'       => '��',
-'emailccme'       => '将我的消�的副本��一份到我的邮箱。',
-'emailccsubject'  => '将您的消��制到 $1: $2',
-'emailsent'       => '电�邮件已��',
-'emailsenttext'   => '您的电�邮件已��出。',
-'emailuserfooter' => '这�电邮是由$1寄给$2�{{SITENAME}}的“电邮用户�功能�出的。',
+'usermailererror'  => 'Mail 对象返回错误:',
+'defemailsubject'  => '{{SITENAME}}电�邮件',
+'noemailtitle'     => '无电�邮件地�',
+'noemailtext'      => '该用户还没有指定一个有效的电�邮件地�。',
+'nowikiemailtitle' => '�容许电�邮件',
+'nowikiemailtext'  => '这�用户选择�接收其他用户的电�邮件。',
+'email-legend'     => '�一�电�邮件至�一�{{SITENAME}}用户',
+'emailfrom'        => '�件人:',
+'emailto'          => '收件人:',
+'emailsubject'     => '主题:',
+'emailmessage'     => '信�:',
+'emailsend'        => '��',
+'emailccme'        => '将我的消�的副本��一份到我的邮箱。',
+'emailccsubject'   => '将您的消��制到 $1: $2',
+'emailsent'        => '电�邮件已��',
+'emailsenttext'    => '您的电�邮件已��出。',
+'emailuserfooter'  => '这�电邮是由$1寄给$2�{{SITENAME}}的“电邮用户�功能�出的。',
 
 # Watchlist
 'watchlist'            => '监视列表',
@@ -1497,12 +1760,7 @@ Template:消除歧義',
 'iteminvalidname'      => "页�'$1'错误，无效命�...",
 'wlnote'               => "以下是最近'''$2'''�时内的最�'''$1'''次修改:",
 'wlshowlast'           => '显示最近$1�时 $2天 $3的修改',
-'watchlist-show-bots'  => '显示机器人的编辑',
-'watchlist-hide-bots'  => '��机器人的编辑',
-'watchlist-show-own'   => '显示我的编辑',
-'watchlist-hide-own'   => '��我的编辑',
-'watchlist-show-minor' => '显示�编辑',
-'watchlist-hide-minor' => '���编辑',
+'watchlist-options'    => '监视列表选项',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '监视……',
@@ -1543,56 +1801,62 @@ $NEWPAGE
 �馈和进一步的帮助:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '删除页�',
-'confirm'                     => '确认',
-'excontent'                   => '内容为: "$1"',
-'excontentauthor'             => '内容为: "$1" (而且唯一贡献者为"$2")',
-'exbeforeblank'               => '被清空�的内容为: "$1"',
-'exblank'                     => '页�为空',
-'delete-confirm'              => '删除“$1�',
-'delete-legend'               => '删除',
-'historywarning'              => '警告: 您将�删除的页内�有历�',
-'confirmdeletetext'           => '您�将删除一个页�或图�以�其历�。
+# Delete
+'deletepage'             => '删除页�',
+'confirm'                => '确认',
+'excontent'              => '内容为: "$1"',
+'excontentauthor'        => '内容为: "$1" (而且唯一贡献者为"$2")',
+'exbeforeblank'          => '被清空�的内容为: "$1"',
+'exblank'                => '页�为空',
+'delete-confirm'         => '删除“$1�',
+'delete-legend'          => '删除',
+'historywarning'         => '警告: 您将�删除的页内�有历�',
+'confirmdeletetext'      => '您�将删除一个页�或图�以�其历�。
 请确定您�进行此项�作，并且了解其�果，�时您的行为符�[[{{MediaWiki:Policy-url}}]]。',
-'actioncomplete'              => '�作完�',
-'deletedtext'                 => '"<nowiki>$1</nowiki>"已�被删除。最近删除的纪录请��$2。',
-'deletedarticle'              => '已删除"[[$1]]"',
-'suppressedarticle'           => '已废止"[[$1]]"',
-'dellogpage'                  => '删除日志',
-'dellogpagetext'              => '以下是最近删除的纪录列列表:',
-'deletionlog'                 => '删除日志',
-'reverted'                    => '��到早期版本',
-'deletecomment'               => '删除原因:',
-'deleteotherreason'           => '其它�附加的�由:',
-'deletereasonotherlist'       => '其它�由',
-'deletereason-dropdown'       => '
+'actioncomplete'         => '�作完�',
+'deletedtext'            => '"<nowiki>$1</nowiki>"已�被删除。最近删除的纪录请��$2。',
+'deletedarticle'         => '已删除"[[$1]]"',
+'suppressedarticle'      => '已废止"[[$1]]"',
+'dellogpage'             => '删除日志',
+'dellogpagetext'         => '以下是最近删除的纪录列列表:',
+'deletionlog'            => '删除日志',
+'reverted'               => '��到早期版本',
+'deletecomment'          => '删除原因:',
+'deleteotherreason'      => '其它�附加的�由:',
+'deletereasonotherlist'  => '其它�由',
+'deletereason-dropdown'  => '
 *常用删除�由
 ** 作者请求
 ** 侵犯版�
 ** 破�',
-'delete-edit-reasonlist'      => '编辑删除�由',
-'delete-toobig'               => '这个页�有一个�分大�的编辑历�，超过$1次修订。删除此类页�的动作已�被�制，以防止在{{SITENAME}}上的�外扰乱。',
-'delete-warning-toobig'       => '这个页�有一个�分大�的编辑历�，超过$1次修订。删除它�能会扰乱{{SITENAME}}的数�库�作；在继续此动作�请�心。',
-'rollback'                    => '��编辑',
-'rollback_short'              => '��',
-'rollbacklink'                => '��',
-'rollbackfailed'              => '��失败',
-'cantrollback'                => '无法��编辑；最�的贡献者是本文的唯一作者。',
-'alreadyrolled'               => '无法��由[[User:$2|$2]] ([[User talk:$2|讨论]]  | [[Special:Contributions/$2|{{int:contribslink}}]])进行的[[$1]]的最�编辑；
+'delete-edit-reasonlist' => '编辑删除�由',
+'delete-toobig'          => '这个页�有一个�分大�的编辑历�，超过$1次修订。删除此类页�的动作已�被�制，以防止在{{SITENAME}}上的�外扰乱。',
+'delete-warning-toobig'  => '这个页�有一个�分大�的编辑历�，超过$1次修订。删除它�能会扰乱{{SITENAME}}的数�库�作；在继续此动作�请�心。',
+
+# Rollback
+'rollback'         => '��编辑',
+'rollback_short'   => '��',
+'rollbacklink'     => '��',
+'rollbackfailed'   => '��失败',
+'cantrollback'     => '无法��编辑；最�的贡献者是本文的唯一作者。',
+'alreadyrolled'    => '无法��由[[User:$2|$2]] ([[User talk:$2|讨论]] {{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]])进行的[[$1]]的最�编辑；
 其他人已�编辑或是��了该页。
 
-最�对页�编辑的编辑者: [[User:$3|$3]] ([[User talk:$3|讨论]] | [[Special:Contributions/$3|{{int:contribslink}}]])。',
-'editcomment'                 => '编辑说明: "<i>$1</i>"。', # only shown if there is an edit comment
-'revertpage'                  => '��由[[Special:Contributions/$2|$2]] ([[User talk:$2|对�]])的编辑至[[User:$1|$1]]的最�一个版本', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '��由$1的编辑；更改回$2的最�一个版本。',
-'sessionfailure'              => '似乎在您登录时�生问题，作为一项防范性措施，该动作已�被�消。请�击"�退"�次�试�',
+最�对页�编辑的编辑者: [[User:$3|$3]] ([[User talk:$3|讨论]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]])。',
+'editcomment'      => '编辑摘�: "<i>$1</i>"。', # only shown if there is an edit comment
+'revertpage'       => '��由[[Special:Contributions/$2|$2]] ([[User talk:$2|对�]])的编辑至[[User:$1|$1]]的最�一个版本', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '��由$1的编辑；更改回$2的最�一个版本。',
+'sessionfailure'   => '似乎在您登录时�生问题，作为一项防范性措施，该动作已�被�消。请�击"�退"�次�试�',
+
+# Protect
 'protectlogpage'              => '�护日志',
 'protectlogtext'              => '下�是页��定和�消�定的列表。请�考[[Special:ProtectedPages|�护页�列表]]以查看当�进行的页��护。',
 'protectedarticle'            => '已�护"[[$1]]"',
 'modifiedarticleprotection'   => '已�更改 "[[$1]]" 的�护等级',
 'unprotectedarticle'          => '已�消�护"[[$1]]"',
+'movedarticleprotection'      => '已�更改由“[[$2]]�至“[[$1]]�的�护设置',
 'protect-title'               => '正在更改"$1"的�护等级',
+'prot_1movedto2'              => '[[$1]]移动到[[$2]]',
 'protect-legend'              => '确认�护',
 'protectcomment'              => '注解:',
 'protectexpiry'               => '到期:',
@@ -1607,14 +1871,27 @@ $NEWPAGE
 'protect-locked-access'       => '您的�户���能修改�护级别。
 以下是<strong>$1</strong>现时的�护级别:',
 'protect-cascadeon'           => '以下的{{PLURAL:$1|一个|多个}}页�包�  本页�的�时，�动了连��护，因此本页�目�也被�护，未能编辑。您�以设置本页�的�护级别，但这并�会对连��护有所影�。',
-'protect-default'             => '(默认)',
+'protect-default'             => '容许所有用户',
 'protect-fallback'            => '需�"$1"的许�',
-'protect-level-autoconfirmed' => '�止未注册用户',
+'protect-level-autoconfirmed' => '�止新的和未注册的用户',
 'protect-level-sysop'         => '仅�作员',
 'protect-summary-cascade'     => '��',
 'protect-expiring'            => '终止于 $1 (UTC)',
+'protect-expiry-indefinite'   => '无期',
 'protect-cascade'             => '�护本页中包�的页� (连��护)',
 'protect-cantedit'            => '您无法更改这个页�的�护等级，因为您没有��去编辑它。',
+'protect-othertime'           => '其它时间:',
+'protect-othertime-op'        => '其它时间',
+'protect-existing-expiry'     => '现时到期之时间: $2 $3',
+'protect-otherreason'         => '其它�附加的�由:',
+'protect-otherreason-op'      => '其它�附加的�由',
+'protect-dropdown'            => '*通用�护�由
+** 过�的破�
+** 过�的�水
+** �生产性编辑战
+** 高��页�',
+'protect-edit-reasonlist'     => '编辑�护�由',
+'protect-expiry-options'      => '2�时:2 hours,1天:1 day,3天:3 days,1周:1 week,2周:2 weeks,1个月:1 month,3个月:3 months,6个月:6 months,1年:1 year,永久:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '��:',
 'restriction-level'           => '�制级别:',
 'minimum-size'                => '最�大�',
@@ -1637,7 +1914,7 @@ $NEWPAGE
 'undeletepage'                 => '�览���被删页�',
 'undeletepagetitle'            => "'''以下包�[[:$1]]的已删除之修订版本'''。",
 'viewdeletedpage'              => '查看被删页�',
-'undeletepagetext'             => '以下页�已�被删除，但�然在档案中并�以被��。
+'undeletepagetext'             => '以下的$1个页�已�被删除，但�然在档案中并�以被��。
 档案库�能被定时清�。',
 'undelete-fieldset-title'      => '��修订',
 'undeleteextrahelp'            => "��整个页�时，请清除所有�选框�点击'''''��'''''。��特定版本时，请选择相应版本�的�选框�点击'''''��'''''。点击'''''�设'''''将清除评论内容�所有�选框。",
@@ -1646,12 +1923,13 @@ $NEWPAGE
 如果本页删除�有一个��的新页�建立，被��的版本将会称为较新的历�。',
 'undeleterevdel'               => '如果把最新修订部份删除，�删除便无法进行。如果�到这�情况，您必须�选或���最新已删除的修订。',
 'undeletehistorynoadmin'       => '这个页�已被删除。删除原因显示在下方编辑摘�中，被删除�的所有修订文本连�删除�贡献用户的细节信��对管�员��。',
-'undelete-revision'            => '删除$1时由$3（在$2）所编写的修订版本:',
+'undelete-revision'            => '删除$1时由$3（在$4 $5）所编写的修订版本:',
 'undeleterevision-missing'     => '无效或丢失的修订版本。您�能使用了错误的链接，或者此修订版本已�被从存档中��或移除。',
 'undelete-nodiff'              => '找�到先�的修订版本。',
 'undeletebtn'                  => '��',
 'undeletelink'                 => '��',
 'undeletereset'                => '�设',
+'undeleteinvert'               => '��选择',
 'undeletecomment'              => '评论:',
 'undeletedarticle'             => '已��的"[[$1]]"',
 'undeletedrevisions'           => '$1个修订版本已��',
@@ -1683,26 +1961,27 @@ $1',
 'blanknamespace' => '(主)',
 
 # Contributions
-'contributions' => '用户贡献',
-'mycontris'     => '我的贡献',
-'contribsub2'   => '$1的贡献 ($2)',
-'nocontribs'    => '没有找到符�特�的更改。',
-'uctop'         => '(最新修改)',
-'month'         => '从该月份 (或更早):',
-'year'          => '从该年份 (或更早):',
-
-'sp-contributions-newbies'     => '�显示新创建之用户的贡献',
-'sp-contributions-newbies-sub' => '新手',
-'sp-contributions-blocklog'    => '查�记录',
-'sp-contributions-search'      => '�寻贡献记录',
-'sp-contributions-username'    => 'IP地�或用户�称：',
-'sp-contributions-submit'      => '�索',
+'contributions'       => '用户贡献',
+'contributions-title' => '$1的用户贡献',
+'mycontris'           => '我的贡献',
+'contribsub2'         => '$1的贡献 ($2)',
+'nocontribs'          => '没有找到符�特�的更改。',
+'uctop'               => '(最新修改)',
+'month'               => '从该月份 (或更早):',
+'year'                => '从该年份 (或更早):',
+
+'sp-contributions-newbies'       => '�显示新创建之用户的贡献',
+'sp-contributions-newbies-sub'   => '新手',
+'sp-contributions-newbies-title' => '新手的用户贡献',
+'sp-contributions-blocklog'      => '查�记录',
+'sp-contributions-search'        => '�寻贡献记录',
+'sp-contributions-username'      => 'IP地�或用户�称：',
+'sp-contributions-submit'        => '�索',
 
 # What links here
 'whatlinkshere'            => '链入页�',
 'whatlinkshere-title'      => '链接到“$1�的页�',
-'whatlinkshere-page'       => '页�:',
-'linklistsub'              => '(链接列表)',
+'whatlinkshere-page'       => '页�：',
 'linkshere'                => '以下页�链接到[[:$1]]：',
 'nolinkshere'              => '没有页�链接到[[:$1]]。',
 'nolinkshere-ns'           => '在所选的�字空间内没有页�链接到[[:$1]]。',
@@ -1749,6 +2028,8 @@ $1',
 'ipbotherreason'                  => '其它�附带原因:',
 'ipbhidename'                     => '在查�日志�活跃查�列表以�用户列表中��用户�',
 'ipbwatchuser'                    => '监视这�用户的用户页�以�其对�页�',
+'ipballowusertalk'                => '当被��时容许这�用户去编辑自己的讨论页�',
+'ipb-change-block'                => '利用这些设置�新��用户',
 'badipaddress'                    => 'IP地��正确。',
 'blockipsuccesssub'               => '查��功',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]]已�被查�。
@@ -1758,14 +2039,18 @@ $1',
 'ipb-unblock'                     => '解除��用户�或IP地�',
 'ipb-blocklist-addr'              => '$1的现有��',
 'ipb-blocklist'                   => '查看现有的��',
+'ipb-blocklist-contribs'          => '$1的贡献',
 'unblockip'                       => '解�用户',
 'unblockiptext'                   => '用下�的表����先�被查�的IP地�或用户的写��。',
-'ipusubmit'                       => '解�此地�',
+'ipusubmit'                       => '移除这个��',
 'unblocked'                       => '[[User:$1|$1]]已�被解�',
 'unblocked-id'                    => '�� $1 已�被删除',
 'ipblocklist'                     => '被��IP地�和用户�',
 'ipblocklist-legend'              => '检索一�已�被查�的用户',
 'ipblocklist-username'            => '用户�称或IP地�:',
+'ipblocklist-sh-userblocks'       => '$1次账户��',
+'ipblocklist-sh-tempblocks'       => '$1次临时��',
+'ipblocklist-sh-addressblocks'    => '$1次�IP��',
 'ipblocklist-submit'              => '�索',
 'blocklistline'                   => '$1，$2��$3 ($4)',
 'infiniteblock'                   => '永久',
@@ -1774,14 +2059,18 @@ $1',
 'noautoblockblock'                => '�用自动查�',
 'createaccountblock'              => '�止创建账户',
 'emailblock'                      => '�止电�邮件',
+'blocklist-nousertalk'            => '��以编辑自己的对�页',
 'ipblocklist-empty'               => '查�列表为空。',
 'ipblocklist-no-results'          => '所�求的IP地�/用户�没有被查�。',
 'blocklink'                       => '查�',
 'unblocklink'                     => '解除��',
+'change-blocklink'                => '更改��',
 'contribslink'                    => '贡献',
 'autoblocker'                     => '因为您与"[[$1]]"共享一个IP地�而被自动查�。$1被�的�由是"$2"。',
 'blocklogpage'                    => '查�日志',
+'blocklog-fulllog'                => '完整查�日志',
 'blocklogentry'                   => '已��[[$1]]，到期时间为$2 $3',
+'reblock-logentry'                => '更改[[$1]]的��設定時間 $2 $3',
 'blocklogtext'                    => '这是关于用户查�和解��作的日志。
 被自动查�的IP地�没有被列出。请�看[[Special:IPBlockList|被�IP地�列表]]。',
 'unblocklogentry'                 => '[[$1]]已被解�',
@@ -1789,11 +2078,14 @@ $1',
 'block-log-flags-nocreate'        => '�止此IP/用户建立新�户',
 'block-log-flags-noautoblock'     => '�用自动��',
 'block-log-flags-noemail'         => '�止电�邮件',
+'block-log-flags-nousertalk'      => '��编辑自己的讨论页�',
 'block-log-flags-angry-autoblock' => '加强自动��已�用',
 'range_block_disabled'            => '�有管�员�能创建�止查�的范围。',
 'ipb_expiry_invalid'              => '无效的终止时间。',
 'ipb_expiry_temp'                 => '��用户���必须是永久性的。',
 'ipb_already_blocked'             => '已���"$1"',
+'ipb-needreblock'                 => '== 已��� ==
+$1已�被��。您是�想更改这个设置？',
 'ipb_cant_unblock'                => '错误: 找�到查�ID$1。�能已�解除��。',
 'ipb_blocked_as_range'            => '错误: 该IP $1 无直接查�，��以解除��。但是它是在 $2 的查�范围之内，该段范围是�以解除��的。',
 'ip_range_invalid'                => '无效的IP范围。\\n',
@@ -1804,6 +2096,7 @@ $1',
 'proxyblocksuccess'               => '完�。\\n',
 'sorbsreason'                     => '您的IP地�在{{SITENAME}}中被 DNSBL 列为属于开放代��务器。',
 'sorbs_create_account_reason'     => '由于您的IP地�在{{SITENAME}}中被 DNSBL 列为属于开放代��务器，所以您�能创建新账户。',
+'cant-block-while-blocked'        => '当您被��时��以��其他用户。',
 
 # Developer tools
 'lockdb'              => '�定数�库',
@@ -1826,9 +2119,9 @@ $1',
 'databasenotlocked'   => '数�库没有�定。',
 
 # Move page
-'move-page'               => '移动$1',
-'move-page-legend'        => '移动页�',
-'movepagetext'            => "用下�的表���命�一个页�，并将其修订历��时移动到新页�。
+'move-page'                    => '移动$1',
+'move-page-legend'             => '移动页�',
+'movepagetext'                 => "用下�的表���命�一个页�，并将其修订历��时移动到新页�。
 �的页�将�为新页�的�定�页。
 您�以自动地更新指到原标题的�定�。
 如果您选择�去�的�，请检查[[Special:DoubleRedirects|��]]或[[Special:BrokenRedirects|���定�]]连结。
@@ -1842,48 +2135,62 @@ $1',
 <b>警告�</b>
 对一个�常被访问的页�而言这�能是一个�大与��的更改；
 请在行动�先了结其所�能带�的�果。",
-'movepagetalktext'        => "有关的讨论页将被自动与该页�一起移动，'''除�''':
+'movepagetalktext'             => "有关的讨论页将被自动与该页�一起移动，'''除�''':
 *新页�已�有一个包�内容的讨论页，或者
 *您�勾选下�的�选框。
 
 在这些情况下，您在必�时必须手工移动或�并页�。",
-'movearticle'             => '移动页�:',
-'movenotallowed'          => '您并没有��去移动页�。',
-'newtitle'                => '新标题:',
-'move-watch'              => '监视此页',
-'movepagebtn'             => '移动页�',
-'pagemovedsub'            => '移动�功',
-'movepage-moved'          => "<big>'''“$1�已�移动到“$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '该�字的页�已�存在，或者您选择的�字无效。请�选一个�字。',
-'cantmove-titleprotected' => '您��以移动这个页�到这个�置，因为该新标题已�被�护以防止创建。',
-'talkexists'              => '页�本身移动�功，
+'movearticle'                  => '移动页�:',
+'movenologin'                  => '未登录',
+'movenologintext'              => '您必须是一�登记用户并且[[Special:UserLogin|登录]]
+���移动一个页�。',
+'movenotallowed'               => '您并没有��去移动页�。',
+'movenotallowedfile'           => '您并没有��去移动文件。',
+'cant-move-user-page'          => '您并没有许��去移动用户页�（它的字页�除外）。',
+'cant-move-to-user-page'       => '您并没有许��去移动到用户页�（它的字页�除外）。',
+'newtitle'                     => '新标题:',
+'move-watch'                   => '监视此页',
+'movepagebtn'                  => '移动页�',
+'pagemovedsub'                 => '移动�功',
+'movepage-moved'               => "<big>'''“$1�已�移动到“$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '一个�新定�已�被创建。',
+'movepage-moved-noredirect'    => '已�压制创建�新定�。',
+'articleexists'                => '该�字的页�已�存在，或者您选择的�字无效。请�选一个�字。',
+'cantmove-titleprotected'      => '您��以移动这个页�到这个�置，因为该新标题已�被�护以防止创建。',
+'talkexists'                   => '页�本身移动�功，
 但是由于新标题下已�有对�页存在，所以对�页无法移动。请手工�并两个页�。',
-'movedto'                 => '移动到',
-'movetalk'                => '移动关�的讨论页',
-'move-subpages'           => '如果�能的�，�时移动所有的�页�',
-'move-talk-subpages'      => '如果�能的�，�时移动所有的�对�页�',
-'movepage-page-exists'    => '页�$1已�存在，��以自动地覆写。',
-'movepage-page-moved'     => '页�$1已�移动到$2。',
-'movepage-page-unmoved'   => '页�$1��以移动到$2。',
-'movepage-max-pages'      => '最多有$1个页�已�移动�时��以自动地�移动更多。',
-'1movedto2'               => '[[$1]]移动到[[$2]]',
-'1movedto2_redir'         => '[[$1]]通过�定�移动到[[$2]]',
-'movelogpage'             => '移动日志',
-'movelogpagetext'         => '以下是已�移动的页�列表:',
-'movereason'              => '原因',
-'revertmove'              => '��该移动',
-'delete_and_move'         => '删除并移动',
-'delete_and_move_text'    => '==需�删除==
+'movedto'                      => '移动到',
+'movetalk'                     => '移动关�的讨论页',
+'move-subpages'                => '如果�能的�，�时移动所有的�页�',
+'move-talk-subpages'           => '如果�能的�，�时移动所有的�对�页�',
+'movepage-page-exists'         => '页�$1已�存在，��以自动地覆写。',
+'movepage-page-moved'          => '页�$1已�移动到$2。',
+'movepage-page-unmoved'        => '页�$1��以移动到$2。',
+'movepage-max-pages'           => '最多有$1个页�已�移动�时��以自动地�移动更多。',
+'1movedto2'                    => '[[$1]]移动到[[$2]]',
+'1movedto2_redir'              => '[[$1]]通过�定�移动到[[$2]]',
+'move-redirect-suppressed'     => '�新定�已压制',
+'movelogpage'                  => '移动日志',
+'movelogpagetext'              => '以下是所有移动的页�列表:',
+'movereason'                   => '原因',
+'revertmove'                   => '��该移动',
+'delete_and_move'              => '删除并移动',
+'delete_and_move_text'         => '==需�删除==
 
 目标页�"[[:$1]]"已�存在。你确认需�删除原页�并以进行移动�？',
-'delete_and_move_confirm' => '是的，删除此页�',
-'delete_and_move_reason'  => '删除以便移动',
-'selfmove'                => '原始标题和目标标题相�，�能移动一个页�到它自身。',
-'immobile_namespace'      => '目标标题属于特别类型；�能将页�移入这个�字空间。',
-'imagenocrossnamespace'   => '��以移动文件到�文件�字空间',
-'imagetypemismatch'       => '该新副档��匹�它的类型',
-'imageinvalidfilename'    => '目标文件�称是无效的',
-'fix-double-redirects'    => '更新指到原先标题的任何�定�',
+'delete_and_move_confirm'      => '是的，删除此页�',
+'delete_and_move_reason'       => '删除以便移动',
+'selfmove'                     => '原始标题和目标标题相�，�能移动一个页�到它自身。',
+'immobile-source-namespace'    => '��以在空间�「$1�上移动页�',
+'immobile-target-namespace'    => '��以将页�移动到「$1�空间�中',
+'immobile-target-namespace-iw' => '垮维基连结在移动页�中是无效的目标。',
+'immobile-source-page'         => '这个页��能移动。',
+'immobile-target-page'         => '无法移动至目标标题中。',
+'imagenocrossnamespace'        => '��以移动文件到�文件�字空间',
+'imagetypemismatch'            => '该新副档��匹�它的类型',
+'imageinvalidfilename'         => '目标文件�称是无效的',
+'fix-double-redirects'         => '更新指到原先标题的任何�定�',
+'move-leave-redirect'          => '留下�新定�',
 
 # Export
 'export'            => '导出页�',
@@ -1893,7 +2200,7 @@ $1',
 并选择你是�需�导出带有页�历�的以�的版本，
 或是�选择导出带有最�一次编辑信�的当�版本。
 
-此外你还�以利用链接导出文件，例如你�以使用[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]导出"[[{{MediaWiki:Mainpage}}]]"页�。',
+此外你还�以利用链接导出文件，例如你�以使用[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]导出"[[{{MediaWiki:Mainpage}}]]"页�。',
 'exportcuronly'     => '仅包�当�的修订，而�是全部的历�。',
 'exportnohistory'   => "----
 '''注�:''' 由于性能原因，从此表�导出页�的全部历�已被�用。",
@@ -1909,7 +2216,7 @@ $1',
 'allmessagesdefault'        => '默认的文字',
 'allmessagescurrent'        => '当�的文字',
 'allmessagestext'           => '这里列出所有�定制的系统界�。
-如果想贡献正宗的MediaWiki本地化的�，请�阅[http://www.mediawiki.org/wiki/Localisation MediaWiki本地化]以�[http://translatewiki.net Betawiki]。',
+如果想贡献正宗的MediaWiki本地化的�，请�阅[http://www.mediawiki.org/wiki/Localisation MediaWiki本地化]以�[http://translatewiki.net translatewiki.net]。',
 'allmessagesnotsupportedDB' => "这个页�无法使用，因为'''\$wgUseDatabaseMessages'''已被设置关闭。",
 'allmessagesfilter'         => '按消��称筛选:',
 'allmessagesmodified'       => '仅显示已修改的',
@@ -1929,9 +2236,12 @@ $1',
 'import-interwiki-text'      => '选择一个 wiki 和页�标题以进行导入。
 修订日期和编辑者�字将�时被�存。
 所有的跨 wiki 导入�作被记录在[[Special:Log/import|导入日志]]。',
+'import-interwiki-source'    => '��维基�页�：',
 'import-interwiki-history'   => '�制此页的所有历�版本',
 'import-interwiki-submit'    => '导入',
 'import-interwiki-namespace' => '目标�字空间：',
+'import-upload-filename'     => '文件�：',
+'import-comment'             => '注解:',
 'importtext'                 => '请使用[[Special:Export|导出功能]]从� wiki 导出文件，
 �存到您的�盘并上传到这里。',
 'importstart'                => '正在导入页�...',
@@ -1966,19 +2276,19 @@ $1',
 'import-logentry-interwiki-detail' => '�自$2的$1个修订',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => '我的用户页',
+'tooltip-pt-userpage'             => '您的用户页',
 'tooltip-pt-anonuserpage'         => '您编辑本站所用IP的对应用户页',
-'tooltip-pt-mytalk'               => '我的对�页',
+'tooltip-pt-mytalk'               => '您的对�页',
 'tooltip-pt-anontalk'             => '对于�自此IP地�的编辑的对�',
-'tooltip-pt-preferences'          => '我的�数设置',
-'tooltip-pt-watchlist'            => '我的监视列表',
-'tooltip-pt-mycontris'            => '我的贡献列表',
+'tooltip-pt-preferences'          => '您的�数设置',
+'tooltip-pt-watchlist'            => '您所监视页�的更改列表',
+'tooltip-pt-mycontris'            => '您的贡献列表',
 'tooltip-pt-login'                => '我们鼓励您登录，但这并�是强制性的',
 'tooltip-pt-anonlogin'            => '我们鼓励您登录，但这并�是强制性的',
 'tooltip-pt-logout'               => '退出',
 'tooltip-ca-talk'                 => '关于页�正文的讨论',
 'tooltip-ca-edit'                 => '你�编辑此页，请在�存�先预览一下。',
-'tooltip-ca-addsection'           => '在该讨论页增加新的评论主题',
+'tooltip-ca-addsection'           => '开始一个新�节',
 'tooltip-ca-viewsource'           => '该页�已被�护。你�以查看该页��。',
 'tooltip-ca-history'              => '此页�的早�版本',
 'tooltip-ca-protect'              => '�护此页',
@@ -1990,7 +2300,7 @@ $1',
 'tooltip-search'                  => '�索该网站',
 'tooltip-search-go'               => '如果相�的标题存在的�便直接�往该页�',
 'tooltip-search-fulltext'         => '�索该文字的页�',
-'tooltip-p-logo'                  => '首页',
+'tooltip-p-logo'                  => '访问首页',
 'tooltip-n-mainpage'              => '访问首页',
 'tooltip-n-portal'                => '关于本计划, 您�以�什么, 应该如何�',
 'tooltip-n-currentevents'         => '�供当�事件的背景资料',
@@ -2020,11 +2330,13 @@ $1',
 'tooltip-minoredit'               => '将此标记为�更改',
 'tooltip-save'                    => '�存您的更改',
 'tooltip-preview'                 => '预览您的更改，请在�存�使用此功能�',
-'tooltip-diff'                    => '显示您对该文字所�的更改。',
+'tooltip-diff'                    => '显示您对该文字所�的更改',
 'tooltip-compareselectedversions' => '查看此页�两个选定的版本间的差异。',
 'tooltip-watch'                   => '将该页�加到您的监视列表',
 'tooltip-recreate'                => '�建该页�，无论是�被删除。',
 'tooltip-upload'                  => '开始上传',
+'tooltip-rollback'                => '‘�转’�以一按��上一�贡献者对这个页�的编辑',
+'tooltip-undo'                    => '‘�原’�以在编辑方�上开�编辑表格以便�原。容许在摘�中加入原因',
 
 # Stylesheets
 'common.css'      => '/* 此处的 CSS 将应用于所有的皮肤 */',
@@ -2036,6 +2348,8 @@ $1',
 'chick.css'       => '/* 此处的 CSS 将影�使用 Chick 皮肤的用户 */',
 'simple.css'      => '/* 此处的 CSS 将影�使用 Simple 皮肤的用户 */',
 'modern.css'      => '/* 此处的 CSS 将影�使用 Modern 皮肤的用户 */',
+'print.css'       => '/* 此处的 CSS 将影�打�输出 */',
+'handheld.css'    => '/* 此处的 CSS 将影�在 $wgHandheldStyle 设置手�装置�� */',
 
 # Scripts
 'common.js'      => '/* 此处的JavaScript将加载于所有用户�一个页�。 */',
@@ -2054,12 +2368,12 @@ $1',
 'notacceptable'     => '该网站�务器�能�供您的客户端能识别的数�格�。',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}的匿�用户',
+'anonymous'        => '{{SITENAME}}的匿�{{PLURAL:$1|用户|用户}}',
 'siteuser'         => '{{SITENAME}}用户$1',
 'lastmodifiedatby' => '此页由$3于$1 $2的最�更改。', # $1 date, $2 time, $3 user
 'othercontribs'    => '在$1的工作基础上。',
 'others'           => '其他',
-'siteusers'        => '{{SITENAME}}用户$1',
+'siteusers'        => '{{SITENAME}}{{PLURAL:$2|用户|用户}}$1',
 'creditspage'      => '页�致谢',
 'nocredits'        => '该页没有致谢��信�。',
 
@@ -2080,6 +2394,16 @@ $1',
 'numauthors'     => '作者数� (页�): $1',
 'numtalkauthors' => '作者数� (讨论页): $1',
 
+# Skin names
+'skinname-standard'    => '标准',
+'skinname-nostalgia'   => '怀旧',
+'skinname-cologneblue' => '科隆香水�',
+'skinname-monobook'    => 'MonoBook',
+'skinname-myskin'      => 'MySkin',
+'skinname-chick'       => 'Chick',
+'skinname-simple'      => 'Simple',
+'skinname-modern'      => '现代',
+
 # Math options
 'mw_math_png'    => '永远使用PNG图�',
 'mw_math_simple' => '如果是简�的公�使用HTML，�则使用PNG图�',
@@ -2092,7 +2416,7 @@ $1',
 'markaspatrolleddiff'                 => '标记为已检查',
 'markaspatrolledtext'                 => '标记此页�为已检查',
 'markedaspatrolled'                   => '标记为已检查',
-'markedaspatrolledtext'               => '选定的版本已被标记为已检查.',
+'markedaspatrolledtext'               => '选定的版本已被标记为已检查。',
 'rcpatroldisabled'                    => '最新更改检查被关闭',
 'rcpatroldisabledtext'                => '最新更改检查的功能目�已关闭。',
 'markedaspatrollederror'              => '�能标志为已检查',
@@ -2100,10 +2424,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '您无法将你自己所作的更改标记为已检查。',
 
 # Patrol log
-'patrol-log-page'   => '巡查日志',
-'patrol-log-header' => '这个是已�巡查过的日志。',
-'patrol-log-line'   => '$2的版本$1已被标记为已检查的$3',
-'patrol-log-auto'   => '(自动)',
+'patrol-log-page'      => '巡查日志',
+'patrol-log-header'    => '这个是已�巡查过的日志。',
+'patrol-log-line'      => '$2的版本$1已被标记为已检查的$3',
+'patrol-log-auto'      => '(自动)',
+'patrol-log-diff'      => '修订 $1',
+'log-show-hide-patrol' => '$1巡查纪录',
 
 # Image deletion
 'deletedrevision'                 => '已删除旧版本$1',
@@ -2120,6 +2446,9 @@ $1',
 'previousdiff' => '�上一版本',
 'nextdiff'     => '下一版本→',
 
+# Visual comparison
+'visual-comparison' => '��比较',
+
 # Media information
 'mediawarning'         => "'''警告''': 该文件�能包���代�，�行它�能对您的系统带��险。<hr />",
 'imagemaxsize'         => '在文件�述页对图�大��制为:',
@@ -2132,10 +2461,12 @@ $1',
 'show-big-image'       => '完整分辨率',
 'show-big-image-thumb' => '<small>这幅略缩图的分辨率: $1 × $2 �素</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '新建图�画廊',
 'imagelisttext'         => "以下是按$2排列的'''$1'''个文件列表。",
 'newimages-summary'     => '这个特殊页�中显示最�已上传的文件。',
+'newimages-legend'      => '过滤',
+'newimages-label'       => '文件�称（或它的一部份）:',
 'showhidebots'          => '($1机器人)',
 'noimages'              => '无�查看图�。',
 'ilsubmit'              => '�索',
@@ -2356,6 +2687,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ISO摄影棚钨�',
 'exif-lightsource-255' => '其他光�',
 
+# Flash modes
+'exif-flash-fired-0'    => '闪光�无开�',
+'exif-flash-fired-1'    => '闪光�开�',
+'exif-flash-return-0'   => '无频闪观测器功能',
+'exif-flash-return-2'   => '频闪观测器未侦测到光',
+'exif-flash-return-3'   => '频闪观测器侦测到光',
+'exif-flash-mode-1'     => '强制闪光�开�',
+'exif-flash-mode-2'     => '强制压制闪光�',
+'exif-flash-mode-3'     => '自动方�',
+'exif-flash-function-1' => '无闪光�功能',
+'exif-flash-redeye-1'   => '红眼�退方�',
+
 'exif-focalplaneresolutionunit-2' => '英寸',
 
 'exif-sensingmethod-1' => '未定义',
@@ -2497,19 +2840,10 @@ $1
 请确认在您�新创建页��三�。',
 'recreate'            => '�建',
 
-# HTML dump
-'redirectingto' => '�定�到[[:$1]]...',
-
 # action=purge
-'confirm_purge'        => '�清除此页�的缓存�?\\n\\n$1',
 'confirm_purge_button' => '确定',
-
-# AJAX search
-'searchcontaining' => "�索包�''$1''的页�。",
-'searchnamed'      => "�索�为''$1''的页�。",
-'articletitles'    => '页�以"$1"开头',
-'hideresults'      => '��结果',
-'useajaxsearch'    => '使用AJAX�索',
+'confirm-purge-top'    => '�清除此页�的缓存�?',
+'confirm-purge-bottom' => '清�一页将会清除快�以�强迫显示最现时之版本。',
 
 # Multipage image navigation
 'imgmultipageprev' => '� 上一页',
@@ -2529,10 +2863,10 @@ $1
 'table_pager_empty'        => '没有结果',
 
 # Auto-summaries
-'autosumm-blank'   => '移除所有页�内容',
-'autosumm-replace' => "正在将页�替�为 '$1'",
-'autoredircomment' => '正在�定�到 [[$1]]',
-'autosumm-new'     => '新页�: $1',
+'autosumm-blank'   => '清空页�',
+'autosumm-replace' => "替�内容为 '$1'",
+'autoredircomment' => '�定�页�到 [[$1]]',
+'autosumm-new'     => "创建新页�为 '$1'",
 
 # Size units
 'size-bytes' => '$1 字节',
@@ -2571,6 +2905,7 @@ $1
 
 # Core parser functions
 'unknown_extension_tag' => '�明的扩展标签 "$1"',
+'duplicate-defaultsort' => '警告: 预设的排�键 "$2" 覆盖先�的预设排�键 "$1"。',
 
 # Special:Version
 'version'                          => '版本', # Not used as normal message but as header for the special page itself
@@ -2599,16 +2934,16 @@ $1
 'filepath-submit'  => '查找路径',
 'filepath-summary' => '这个特殊页�撷�一个文件的完整路径。图�会以完整的解�度显示，其它的文件类型会以�它们已关�程��动。
 
-请输入档�，��包�"{{ns:image}}:"开头。',
+请输入档�，��包�"{{ns:file}}:"开头。',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '选择�覆文件',
 'fileduplicatesearch-summary'  => '用�覆文件的切细值去找出文件是��覆。
 
-输入档�时�需�输入 "{{ns:image}}:" 开头。',
+输入档�时�需�输入 "{{ns:file}}:" 开头。',
 'fileduplicatesearch-legend'   => '找�覆',
 'fileduplicatesearch-filename' => '文件�称:',
-'fileduplicatesearch-submit'   => '找',
+'fileduplicatesearch-submit'   => '�索',
 'fileduplicatesearch-info'     => '$1 × $2 �素<br />文件大�: $3<br />MIME类型: $4',
 'fileduplicatesearch-result-1' => '文件 "$1" 无完全相�的�覆。',
 'fileduplicatesearch-result-n' => '文件 "$1" 有$2项完全相�的�覆。',
@@ -2633,6 +2968,15 @@ $1
 
 # Special:BlankPage
 'blankpage'              => '空白页�',
-'intentionallyblankpage' => '这个页�是为空白，以用�作测试速度等用途',
+'intentionallyblankpage' => '这个页�是为空白',
+
+# External image whitelist
+'external_image_whitelist' => ' #留下这行一样的文字<pre>
+#在下�（//之中间部份）输入正规表达�
+#这些将会跟外部（已超连结的）图���
+#那些��到出�的会显示�图�，�则就�会显示�连结
+#有 # 开头的行会当�注解
+
+#在这行上�输入所有的regex。留下这行一样的文字</pre>',
 
 );
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index 4d2748f6..142973f6 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -8,7 +8,10 @@
  * @author Bencmq
  * @author Shinjiman
  * @author Skjackey tse
+ * @author Wmr89502270
+ * @author Wong128hk
  * @author Wrightbus
+ * @author Yuyu
  */
 
 $fallback = 'zh-hans';
@@ -22,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talk',
-	NS_IMAGE            => 'Image',
-	NS_IMAGE_TALK       => 'Image_talk',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'File_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -42,8 +45,14 @@ $namespaceAliases = array(
 	"用戶�話" => NS_USER_TALK,
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#"{{SITENAME}}_�話" => NS_PROJECT_TALK
-	"圖�" => NS_IMAGE,
-	"圖��話" => NS_IMAGE_TALK,
+	"圖�" => NS_FILE,
+	"檔案" => NS_FILE,
+	"文件" => NS_FILE,
+	'Image' => NS_FILE,
+	'Image_talk' => NS_FILE_TALK,
+	"圖��話" => NS_FILE_TALK,
+	"檔案�話" => NS_FILE_TALK,
+	"文件�話" => NS_FILE_TALK,
 	"樣�" => NS_TEMPLATE,
 	"樣�討論" => NS_TEMPLATE_TALK,
 	"幫助" => NS_HELP,
@@ -52,12 +61,6 @@ $namespaceAliases = array(
 	"分類討論" => NS_CATEGORY_TALK,
 );
 
-$skinNames = array(
-	'standard' => '標準',
-	'nostalgia' => '懷舊',
-	'cologneblue' => '科隆香水�',
-	'modern' => '�代',
-);
 
 $bookstoreList = array(
 	'�客來書店' => 'http://www.books.com.tw/exep/prod/booksfile.php?item=$1',
@@ -73,12 +76,12 @@ $messages = array(
 'tog-justify'                 => '段��齊',
 'tog-hideminor'               => '最近更改中隱��修改',
 'tog-extendwatchlist'         => '增強監視清單以顯示所有�用更改',
-'tog-usenewrc'                => '增強最近更改 (JavaScript)',
+'tog-usenewrc'                => '增強最近更改 (需�JavaScript)',
 'tog-numberheadings'          => '標題自動編號',
-'tog-showtoolbar'             => '顯示編輯工具欄',
-'tog-editondblclick'          => '雙擊編輯�� (JavaScript)',
+'tog-showtoolbar'             => '顯示編輯工具欄 (需�JavaScript)',
+'tog-editondblclick'          => '雙擊編輯�� (需�JavaScript)',
 'tog-editsection'             => '�許通�點擊[編輯]連�編輯段�',
-'tog-editsectiononrightclick' => '�許�擊標題編輯段� (JavaScript)',
+'tog-editsectiononrightclick' => '�許�擊標題編輯段� (需�JavaScript)',
 'tog-showtoc'                 => '顯示目錄 (��一�超�3個標題的��)',
 'tog-rememberpassword'        => '在這部電腦上記�我的密碼',
 'tog-editwidth'               => '編輯欄�已有最大寬度',
@@ -99,22 +102,24 @@ $messages = array(
 'tog-externaleditor'          => '�設使用外部編輯器 (進階者專用，需�在您的電腦上作出一些特別設定)',
 'tog-externaldiff'            => '�設使用外部差異分� (進階者專用，需�在您的電腦上作出一些特別設定)',
 'tog-showjumplinks'           => '啟用「跳轉到�訪�連�',
-'tog-uselivepreview'          => '使用實時�覽 (JavaScript) (試驗中)',
+'tog-uselivepreview'          => '使用實時�覽 (需�JavaScript) (試驗中)',
 'tog-forceeditsummary'        => '當沒有輸入摘�時�醒我',
 'tog-watchlisthideown'        => '監視列表中隱�我的編輯',
 'tog-watchlisthidebots'       => '監視列表中隱�機器人的編輯',
 'tog-watchlisthideminor'      => '監視列表中隱��修改',
+'tog-watchlisthideliu'        => '監視列表中隱�登入用戶',
+'tog-watchlisthideanons'      => '監視列表中隱�匿�用戶',
 'tog-nolangconversion'        => '�進行用字轉�',
 'tog-ccmeonemails'            => '當我寄電�郵件給其他用戶時，也寄一份複本到我的信箱。',
 'tog-diffonly'                => '在比較兩個修訂版本差異時�顯示��內容',
 'tog-showhiddencats'          => '顯示隱�分類',
+'tog-noconvertlink'           => '�轉�連�標題',
+'tog-norollbackdiff'          => '進行�轉後略�差異',
 
 'underline-always'  => '總是使用',
 'underline-never'   => '從�使用',
 'underline-default' => '�覽器�設',
 
-'skinpreview' => '(�覽)',
-
 # Dates
 'sunday'        => '星期日',
 'monday'        => '星期一',
@@ -184,7 +189,7 @@ $messages = array(
 'listingcontinuesabbrev'         => '續',
 
 'mainpagetext'      => "<big>'''已�功安� MediaWiki!'''</big>",
-'mainpagedocfooter' => '請�閱 [http://meta.wikimedia.org/wiki/Help:Contents 用戶手冊] 以�得使用此 wiki 軟體的訊��
+'mainpagedocfooter' => '請�閱 [http://meta.wikimedia.org/wiki/Help:Contents 用戶手冊] 以�得使用此 wiki 軟件的訊��
 
 == 入門 ==
 
@@ -245,14 +250,14 @@ $messages = array(
 'talkpagelinktext'  => '�話',
 'specialpage'       => '特殊��',
 'personaltools'     => '個人工具',
-'postcomment'       => '發表評論',
+'postcomment'       => '新�節',
 'articlepage'       => '查看��',
 'talk'              => '討論',
 'views'             => '檢視',
 'toolbox'           => '工具箱',
 'userpage'          => '查看用戶��',
 'projectpage'       => '查看計劃��',
-'imagepage'         => '查看媒體��',
+'imagepage'         => '查看檔案��',
 'mediawikipage'     => '檢視使用者介�訊�',
 'templatepage'      => '檢視模���',
 'viewhelppage'      => '檢視說明��',
@@ -271,8 +276,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '關於{{SITENAME}}',
 'aboutpage'            => 'Project:關於',
-'bugreports'           => '錯誤報告',
-'bugreportspage'       => 'Project:錯誤報告',
 'copyright'            => '本站的全部文本內容在$1之�款下�供。',
 'copyrightpagename'    => '{{SITENAME}}版權',
 'copyrightpage'        => '{{ns:project}}:版權訊�',
@@ -295,9 +298,7 @@ $messages = array(
 
 'badaccess'        => '權�錯誤',
 'badaccess-group0' => '您剛�的請求��許執行。',
-'badaccess-group1' => '您剛�的請求�有$1用戶組的用戶�能使用。',
-'badaccess-group2' => '您剛�的請求�有$1用戶組的用戶�能使用。',
-'badaccess-groups' => '您剛�的請求�有$1用戶組的用戶�能使用。',
+'badaccess-groups' => '您剛�的請求�有{{PLURAL:$2|這個|這些}}用戶組的用戶�能使用: $1',
 
 'versionrequired'     => '需�MediaWiki $1 版',
 'versionrequiredtext' => '需�版本$1的 MediaWiki �能使用此�。�見[[Special:Version|版本�]]。',
@@ -311,6 +312,8 @@ $messages = array(
 'editsection'             => '編輯',
 'editold'                 => '編輯',
 'viewsourceold'           => '檢視原始碼',
+'editlink'                => '編輯',
+'viewsourcelink'          => '檢視原始碼',
 'editsectionhint'         => '編輯段�: $1',
 'toc'                     => '目錄',
 'showtoc'                 => '顯示',
@@ -325,7 +328,7 @@ $messages = array(
 'site-atom-feed'          => '$1的Atom訂閱',
 'page-rss-feed'           => '「$1�的RSS訂閱',
 'page-atom-feed'          => '「$1�的Atom訂閱',
-'red-link-title'          => '$1 (尚未撰寫)',
+'red-link-title'          => '$1 (��未存在)',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => '��',
@@ -334,14 +337,16 @@ $messages = array(
 'nstab-special'   => '特殊��',
 'nstab-project'   => '計劃��',
 'nstab-image'     => '檔案',
-'nstab-mediawiki' => '介�',
+'nstab-mediawiki' => '界�',
 'nstab-template'  => '模�',
 'nstab-help'      => '幫助��',
 'nstab-category'  => '分類',
 
 # Main script and global functions
 'nosuchaction'      => '這個命令�存在',
-'nosuchactiontext'  => '這個wiki無法識別URL請求的命令',
+'nosuchactiontext'  => '該URL所指定的動作無效。
+您�能打錯URL，或跟隨�正確的連�。
+這��能是{{SITENAME}}所使用的軟件出�臭蟲。',
 'nosuchspecialpage' => '此特殊���存在',
 'nospecialpagetext' => "<big>'''您請求的特殊��無效。'''</big>
 
@@ -394,7 +399,6 @@ $1',
 'cannotdelete'         => '無法刪除�定的��或圖�（它�能已經被其他人刪除了）。',
 'badtitle'             => '錯誤的標題',
 'badtitletext'         => '所請求��的標題是無效的��存在，跨語言或跨wiki連�的標題錯誤。',
-'perfdisabled'         => '抱歉�由於此項�作有�能造�資料庫癱瘓，目�暫時無法使用。',
 'perfcached'           => '下列是快�資料，因此�能�是最新的:',
 'perfcachedts'         => '下列是快�資料，其最後更新時間是$1。',
 'querypage-no-updates' => '當��止�此��進行更新。此處的資料將�能被立��新整�。',
@@ -406,14 +410,14 @@ $1',
 'protectedpagetext'    => '該��已被鎖定以防止編輯。',
 'viewsourcetext'       => '你�以檢視並複製本��的原始碼。',
 'protectedinterface'   => '該��供了軟體的介�文字，它已被鎖定以防止隨�的修改。',
-'editinginterface'     => "'''警告:''' 您正在編輯的��是用於�供軟體的介�文字。改變此�將影響其他用戶的介�外觀。如�翻譯，請考慮使用[http://translatewiki.net/wiki/Main_Page?setlang=zh-hant Betawiki]，一個用來為MediaWiki軟件本地化的計劃。",
+'editinginterface'     => "'''警告:''' 您正在編輯的��是用於�供軟體的介�文字。改變此�將影響其他用戶的介�外觀。如�翻譯，請考慮使用[http://translatewiki.net/wiki/Main_Page?setlang=zh-hant translatewiki.net]，一個用來為MediaWiki軟件本地化的計劃。",
 'sqlhidden'            => '(隱�SQL查詢)',
 'cascadeprotected'     => '這個��已經被�護，因為這個��被以下已標註"�鎖�護"的{{PLURAL:$1|一個|多個}}被�護��包�:
 $2',
 'namespaceprotected'   => "您並沒有權�編輯'''$1'''�字空間的��。",
 'customcssjsprotected' => '您並無許�權去編輯這個��，因為它包�了�一�用戶的個人設定。',
 'ns-specialprotected'  => '特殊��是��以編輯的。',
-'titleprotected'       => '這個標題已經被[[User:$1|$1]]�護以防止建立。�由是<i>$2</i>。',
+'titleprotected'       => "這個標題已經被[[User:$1|$1]]�護以防止建立。�由是''$2''。",
 
 # Virus scanner
 'virus-badscanner'     => "�壞設定: 未知的病毒掃瞄器: ''$1''",
@@ -432,18 +436,17 @@ $2',
 'remembermypassword'         => '下次登入記�密碼。',
 'yourdomainname'             => '您的網域:',
 'externaldberror'            => '這�能是由於驗證資料庫錯誤或您被�止更新您的外部帳號。',
-'loginproblem'               => '<b>登入有�題。</b><br />�試一次�',
 'login'                      => '登入',
-'nav-login-createaccount'    => '登入�建立新帳號',
+'nav-login-createaccount'    => '登入�建立新賬號',
 'loginprompt'                => '您必須�許�覽器紀錄Cookie�能�功登入 {{SITENAME}} 並順利進行�作',
-'userlogin'                  => '登入�建立新帳號',
+'userlogin'                  => '登入�建立新賬號',
 'logout'                     => '登出',
 'userlogout'                 => '登出',
 'notloggedin'                => '未登入',
-'nologin'                    => '您還沒有帳號嗎？$1。',
-'nologinlink'                => '建立新帳號',
-'createaccount'              => '建立新帳號',
-'gotaccount'                 => '已經�有帳號？$1。',
+'nologin'                    => '您還沒有賬號嗎？$1。',
+'nologinlink'                => '建立新賬號',
+'createaccount'              => '建立新賬號',
+'gotaccount'                 => '已經�有賬號？$1。',
 'gotaccountlink'             => '登入',
 'createaccountmail'          => '通�e-Mail',
 'badretype'                  => '您所輸入的密碼並�相�。',
@@ -457,7 +460,7 @@ $2',
 'yourvariant'                => '字體變�:',
 'yournick'                   => '簽�:',
 'badsig'                     => '錯誤的原始簽�。檢查一下HTML標籤。',
-'badsiglength'               => '簽��長。
+'badsiglength'               => '您的簽��長。
 它的長度必須在$1個字元以下。',
 'email'                      => '電�郵件',
 'prefs-help-realname'        => '真實姓�是��的。
@@ -471,7 +474,8 @@ $2',
 'loginsuccesstitle'          => '登入�功',
 'loginsuccess'               => '你�在以 "$1"的身份登入{{SITENAME}}。',
 'nosuchuser'                 => '找�到用戶 "$1"。
-檢查您的拼寫，或者用下�的表格[[Special:UserLogin/signup|建立一個新帳號]]。',
+用戶�稱是有大�寫�分的。
+檢查您的拼寫，或者用下�的表格[[Special:UserLogin/signup|建立一個新賬號]]。',
 'nosuchusershort'            => '沒有一個�為「<nowiki>$1</nowiki>�的用戶。請檢查您輸入的文字是�有錯誤。',
 'nouserspecified'            => '你需�指定一個用戶�。',
 'wrongpassword'              => '您輸入的密碼錯誤，請�試一次。',
@@ -492,10 +496,11 @@ $2',
 'eauthentsent'               => '一�確�信已經發�到所示的地�。在發�其它郵件到此帳戶�，您必須首先�照這�信中的指導確�這個電�郵件信箱真實有效。',
 'throttled-mailpassword'     => '密碼�醒已經在�$1�時內發�。為防止濫用，�定在$1�時內僅發�一次密碼�醒。',
 'mailerror'                  => '發�郵件錯誤: $1',
-'acct_creation_throttle_hit' => '��起，您已經註冊了$1帳號。你�能�註冊了。',
-'emailauthenticated'         => '您的電�郵件地�已經於$1確�有效。',
+'acct_creation_throttle_hit' => '在這個wiki上的訪客利用您的IP地�在昨天創建了$1個賬戶，是在這段時間中的上�。
+�果利用這個IP地�的訪客在這段時間中�能創建更多的賬戶。',
+'emailauthenticated'         => '您的電�郵件地�已經於$2 $3確�有效。',
 'emailnotauthenticated'      => '您的郵箱��<strong>還沒被�証</strong>。以下功能將�會發�任何郵件。',
-'noemailprefs'               => '<strong>指定一個電�郵件地�以使用此功能</strong>',
+'noemailprefs'               => '在您的�數設置中指定一個電�郵件地�以使用此功能',
 'emailconfirmlink'           => '確�您的郵箱地�',
 'invalidemailaddress'        => '郵箱地�格��正確，請輸入正確的郵箱��或清空該輸入框。',
 'accountcreated'             => '已建立帳戶',
@@ -504,19 +509,27 @@ $2',
 'createaccount-text'         => '有人在{{SITENAME}}中利用您的電郵創建了一個�為 "$2" 的新帳戶($4)，密碼是 "$3" 。您應該立�登入並更改密碼。
 
 如果該帳戶創建錯誤的話，您�以忽略此信�。',
+'login-throttled'            => '您已經嘗試多次在這個賬戶的密碼上。請�等多一會�試。',
 'loginlanguagelabel'         => '語言: $1',
 
 # Password reset dialog
-'resetpass'               => '�設帳戶密碼',
-'resetpass_announce'      => '您是��一個臨時的發�到郵件中的代碼登入的。�完�登入，您必須在這裡設定一個新密碼:',
-'resetpass_text'          => '<!-- 在此處加入文字 -->',
-'resetpass_header'        => '更改賬戶密碼',
-'resetpass_submit'        => '設定密碼並登入',
-'resetpass_success'       => '您的密碼已經被�功更改��在正為您登入...',
-'resetpass_bad_temporary' => '無效的臨時密碼。
+'resetpass'                 => '更改密碼',
+'resetpass_announce'        => '您是��一個臨時的發�到郵件中的代碼登入的。�完�登入，您必須在這裡設定一個新密碼:',
+'resetpass_text'            => '<!-- 在此處加入文字 -->',
+'resetpass_header'          => '更改賬戶密碼',
+'oldpassword'               => '舊密碼:',
+'newpassword'               => '新密碼:',
+'retypenew'                 => '確�密碼:',
+'resetpass_submit'          => '設定密碼並登入',
+'resetpass_success'         => '您的密碼已經被�功更改��在正為您登入...',
+'resetpass_bad_temporary'   => '無效的臨時密碼。
+您�能已�功地更改了您的密碼，或者已經請求一個新的臨時密碼。',
+'resetpass_forbidden'       => '無法更改密碼',
+'resetpass-no-info'         => '您必須登入後直接進入這個��。',
+'resetpass-submit-loggedin' => '更改密碼',
+'resetpass-wrong-oldpass'   => '無效的臨時或�有的密碼。
 您�能已�功地更改了您的密碼，或者已經請求一個新的臨時密碼。',
-'resetpass_forbidden'     => '無法更改密碼',
-'resetpass_missing'       => '無表單資料。',
+'resetpass-temp-password'   => '臨時密碼:',
 
 # Edit page toolbar
 'bold_sample'     => '粗體文字',
@@ -539,8 +552,8 @@ $2',
 'hr_tip'          => '水平線 (�心使用)',
 
 # Edit pages
-'summary'                          => '摘�',
-'subject'                          => '主題',
+'summary'                          => '摘�:',
+'subject'                          => '主題:',
 'minoredit'                        => '這是一個�修改',
 'watchthis'                        => '監視本�',
 'savearticle'                      => '�存本�',
@@ -552,8 +565,8 @@ $2',
 'missingsummary'                   => "'''�示:''' 您沒有�供一個編輯摘�。如果您�次單擊儲存，您的編輯將�帶編輯摘�儲存。",
 'missingcommenttext'               => '請在下�輸入評論。',
 'missingcommentheader'             => "'''�示:''' 您沒有為此評論�供一個標題。如果您�次單擊儲存，您的編輯將�帶標題儲存。",
-'summary-preview'                  => '摘��覽',
-'subject-preview'                  => '主題/標題�覽',
+'summary-preview'                  => '摘��覽:',
+'subject-preview'                  => '主題/標題�覽:',
 'blockedtitle'                     => '用戶被查�',
 'blockedtext'                      => "<big>你的用戶�或IP地�已經被$1查�。</big>
 
@@ -599,34 +612,36 @@ $2',
 �創建該��，請在下�的編輯框中輸入內容(詳情�見[[Help:幫助|幫助]])。
 如果您是��心來到此��，直接點擊您�覽器中的"返回"按鈕返回。',
 'anontalkpagetext'                 => "---- ''這是一個還未建立帳號的匿�用戶的�話�。我們因此�能用IP地�來與他�她�絡。該IP地��能由幾�用戶共享。如果您是一�匿�用戶並�為本�上的評語與您無關，請[[Special:UserLogin/signup|創建新帳號]]或[[Special:UserLogin|登入]]以��在未來於其他匿�用戶混淆。''",
-'noarticletext'                    => '此�目�沒有內容，您�以在其它�[[Special:Search/{{PAGENAME}}|�索此�標題]]或[{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} 編輯此�]。',
+'noarticletext'                    => '此�目�沒有內容，您�以在其它�[[Special:Search/{{PAGENAME}}|�索此�標題]]，
+<span class="plainlinks">[{{fullurl:Special:Log|page={{urlencode:{{FULLPAGENAME}}}}}} �索有關日誌]，
+或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 編輯此�]</span>。',
 'userpage-userdoesnotexist'        => '用戶帳號「$1�未曾創建。請在創建�編輯這個���先檢查一下。',
 'clearyourcache'                   => "'''注� - 在儲存以後, 您必須清除�覽器的快��能看到所作出的改變。'''
 '''Mozilla / Firefox / Safari:''' 按著 ''Shift'' �點擊''�新整�''，或按下''Ctrl-F5''或''Ctrl-R''，(在Macintosh上按下''Command-R'')；
 '''Konqueror:''' �需點擊 ''�新整�''或按下''F5''；
 '''Opera:''' 在 ''工具→設定'' 中完整地清除它們的快�；
 '''Internet Explorer:''' 按著 ''Ctrl'' �點擊 ''�新整�''，或按下 ''Ctrl-F5''。",
-'usercssjsyoucanpreview'           => "<strong>�示:</strong> 在�存�請用'顯示�覧'按鈕來測試您新的 CSS/JS 。",
+'usercssjsyoucanpreview'           => "'''�示:''' 在�存�請用'顯示�覧'按鈕來測試您新的 CSS/JS 。",
 'usercsspreview'                   => "'''注�您�是在�覽您的個人 CSS。'''
 '''還沒有儲存﹗'''",
 'userjspreview'                    => "'''注�您�是在測試��覽您的個人 JavaScript。'''
 '''還沒有儲存﹗'''",
 'userinvalidcssjstitle'            => "'''警告:''' �存在��\"\$1\"。注�自訂的 .css 和 .js ��使用�寫標題，例如，{{ns:user}}:Foo/monobook.css ��於 {{ns:user}}:Foo/Monobook.css。",
 'updated'                          => '(已更新)',
-'note'                             => '<strong>注�:</strong>',
-'previewnote'                      => '<strong>請記�這�是�覽，內容還未�存�</strong>',
+'note'                             => "'''注�:'''",
+'previewnote'                      => "'''請記�這�是�覽，內容還未�存�'''",
 'previewconflict'                  => '這個�覽顯示了上�文字編輯�中的內容。它將在你�擇�存後出�。',
-'session_fail_preview'             => '<strong>抱歉�由於部份資料�失，我們無法處�您的編輯。請�試一次，如果�然失敗，請[[Special:UserLogout|登出]]後�新登入。</strong>',
-'session_fail_preview_html'        => "<strong>抱歉�部份資料已�失，我們無法處�您的編輯。</strong>
+'session_fail_preview'             => "'''抱歉�由於部份資料�失，我們無法處�您的編輯。請�試一次，如果�然失敗，請[[Special:UserLogout|登出]]後�新登入。'''",
+'session_fail_preview_html'        => "'''抱歉�部份資料已�失，我們無法處�您的編輯。'''
 
 ''由於{{SITENAME}}已經開放原始 HTML 碼，�覽已經隱�以�防 JavaScript 的攻擊。''
 
-<strong>如果這個編輯�程沒有�題，請�試一次。如果�然有�題，請[[Special:UserLogout|登出]]後��新登入一次。</strong>",
-'token_suffix_mismatch'            => '<strong>由於您用戶端中的編輯信符毀�了一些標點符號字元，為防止編輯的文字�壞，您的編輯已經被拒絕。
-這種情�通常出�於使用�有很多臭蟲�以網絡為主的匿�代��務的時候。</strong>',
+'''如果這個編輯�程沒有�題，請�試一次。如果�然有�題，請[[Special:UserLogout|登出]]後��新登入一次。'''",
+'token_suffix_mismatch'            => "'''由於您用戶端中的編輯信符毀�了一些標點符號字元，為防止編輯的文字�壞，您的編輯已經被拒絕。
+這種情�通常出�於使用�有很多臭蟲�以網絡為主的匿�代��務的時候。'''",
 'editing'                          => '正在編輯$1',
 'editingsection'                   => '正在編輯$1 (段�)',
-'editingcomment'                   => '正在編輯$1 (評論)',
+'editingcomment'                   => '正在編輯$1 (新段�)',
 'editconflict'                     => '編輯��：$1',
 'explainconflict'                  => '有人在你開始編輯後更改了��。
 上�的文字框內顯示的是目�本�的內容。
@@ -635,26 +650,28 @@ $2',
 <b>�有</b>在上�文字框中的內容會在你點擊"�存��"後被�存。<br />',
 'yourtext'                         => '您的文字',
 'storedversion'                    => '已�存版本',
-'nonunicodebrowser'                => '<strong>警告: 您的�覽器�兼容Unicode編碼。這裡有一個工作�將使您能安全地編輯��: �ASCII字元將以�六進製編碼模�出�在編輯框中。</strong>',
-'editingold'                       => '<strong>警告：你正在編輯的是本�的舊版本。
-如果你�存它的話，在本版本之後的任何修改都會丟失。</strong>',
+'nonunicodebrowser'                => "'''警告: 您的�覽器�兼容Unicode編碼。這裡有一個工作�將使您能安全地編輯��: �ASCII字元將以�六進製編碼模�出�在編輯框中。'''",
+'editingold'                       => "'''警告：你正在編輯的是本�的舊版本。
+如果你�存它的話，在本版本之後的任何修改都會丟失。'''",
 'yourdiff'                         => '差異',
-'copyrightwarning'                 => '請注�您�{{SITENAME}}的所有貢�都被�為是在$2下發佈，請查看在$1的細節。
+'copyrightwarning'                 => "請注�您�{{SITENAME}}的所有貢�都被�為是在$2下發佈，請查看在$1的細節。
 如果您�希望您的文字被任�修改和�散佈，請���交。<br />
 您�時也��我們�證您所�交的內容是您自己所作，或得自一個��版權�護或相似自由的來�。
-<strong>��在未�授權的情�下發表�</strong><br />',
-'copyrightwarning2'                => '請注�您�{{SITENAME}}的所有貢�
+'''��在未�授權的情�下發表�'''<br />",
+'copyrightwarning2'                => "請注�您�{{SITENAME}}的所有貢�
 都�能被其他貢�者編輯，修改或刪除。
 如果您�希望您的文字被任�修改和�散佈，請���交。<br />
 您�時也��我們�證您所�交的內容是您自己所作，或得自一個��版權�護或相似自由的來�（�閱$1的細節）。
-<strong>��在未�授權的情�下發表�</strong>',
-'longpagewarning'                  => '<strong>警告: 本�長度�$1KB；一些�覽器將無法編輯長�32KB��。請考慮將本文切割�幾個�段�。</strong>',
-'longpageerror'                    => '<strong>錯誤: 您所�交的文字長度有$1KB，這大於$2KB的最大值。該文本�能被儲存。</strong>',
-'readonlywarning'                  => '<strong>警告: 資料庫被鎖以進行維護，所以您目�將無法�存您的修改。您或許希望先將本段文字複製並�存到文字文件，然後等一會兒�修改。</strong>',
-'protectedpagewarning'             => '<strong>警告: 本�已經被�護，�有�有管�員許�權的用戶��修改。</strong>',
+'''��在未�授權的情�下發表�'''",
+'longpagewarning'                  => "'''警告: 本�長度�$1KB；一些�覽器將無法編輯長�32KB��。請考慮將本文切割�幾個�段�。'''",
+'longpageerror'                    => "'''錯誤: 您所�交的文字長度有$1KB，這大於$2KB的最大值。該文本�能被儲存。'''",
+'readonlywarning'                  => "'''警告: 資料庫被鎖以進行維護，所以您目�將無法�存您的修改。您或許希望先將本段文字複製並�存到文字文件，然後等一會兒�修改。'''
+
+管�員有如下解釋: $1",
+'protectedpagewarning'             => "'''警告: 本�已經被�護，�有�有管�員許�權的用戶��修改。'''",
 'semiprotectedpagewarning'         => "'''注�:''' 本��被鎖定，僅�註冊用戶編輯。",
 'cascadeprotectedwarning'          => '警告: 本�已經被�護，�有�有管�員權�的用戶��修改，因為本�已被以下連鎖�護的{{PLURAL:$1|一個|多個}}��所包�:',
-'titleprotectedwarning'            => '<strong>警告: 本��已被鎖上，�有一些用戶方�創建。</strong>',
+'titleprotectedwarning'            => "'''警告: 本��已被鎖上，�有一些用戶方�創建。'''",
 'templatesused'                    => '在這個��上使用的模�有:',
 'templatesusedpreview'             => '此次�覽中使用的模�有:',
 'templatesusedsection'             => '在這個段�上使用的模�有:',
@@ -672,11 +689,22 @@ $2',
 
 你應該�考慮一下繼續編輯這一個��是���。
 為方便起見，這一個��的刪除記錄已經在下��供:",
+'deleted-notice'                   => '這個��已經刪除。
+這個��的刪除日誌已在下��供以便�考。',
+'deletelog-fulllog'                => '查看整個日誌',
+'edit-hook-aborted'                => '編輯被鈎�消。
+它並無給出解釋。',
+'edit-gone-missing'                => '�能更新��。
+它�能剛剛被刪除。',
+'edit-conflict'                    => '編輯��。',
+'edit-no-change'                   => '您的編輯已經略�，因為文字無任何改動。',
+'edit-already-exists'              => '��以建立一個新��。
+它已經存在。',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => '警告: 這個��有太多耗費的語法功能呼�。
 
-它應該少�$2，�在有$1。',
+它應該少�$2次呼�，�在有$1次呼�。',
 'expensive-parserfunction-category'       => '��中有太多耗費的語法功能呼�',
 'post-expand-template-inclusion-warning'  => '警告: 包�模�大��大。
 一些模�將�會包�。',
@@ -684,6 +712,8 @@ $2',
 'post-expand-template-argument-warning'   => '警告: 這個��有最少一個模�數有�大擴展大�。
 這些�數會被略�。',
 'post-expand-template-argument-category'  => '包��略�模��數的��',
+'parser-template-loop-warning'            => '已�測迴歸模�: [[$1]]',
+'parser-template-recursion-depth-warning' => '已超�迴歸模�深度�制 ($1)',
 
 # "Undo" feature
 'undo-success' => '該編輯�以被撤銷。請檢查以下�比以核實這正是您想�的，然後儲存以下更改以完�撤銷編輯。',
@@ -698,29 +728,28 @@ $2',
 當中被$3��的原因是''$2''",
 
 # History pages
-'viewpagelogs'        => '查詢這個��的日誌',
-'nohistory'           => '沒有本�的修訂記錄。',
-'revnotfound'         => '沒有找到修訂記錄',
-'revnotfoundtext'     => '您請求的更早版本的修訂記錄沒有找到。
-請檢查您請求本��用的URL是�正確。',
-'currentrev'          => '當�修訂版本',
-'revisionasof'        => '在$1所�的修訂版本',
-'revision-info'       => '在$1由$2所�的修訂版本',
-'previousrevision'    => '�上一修訂',
-'nextrevision'        => '下一修訂→',
-'currentrevisionlink' => '當�修訂',
-'cur'                 => '當�',
-'next'                => '後繼',
-'last'                => '先�',
-'page_first'          => '最�',
-'page_last'           => '最後',
-'histlegend'          => '差異�擇: 標記�比較版本的單�按鈕並點擊底部的按鈕進行比較。<br />
-說明: (當�) 指與當�版本比較，(先�) 指與�一個修訂版本比較，� = �修改。',
-'deletedrev'          => '[已刪除]',
-'histfirst'           => '最早版本',
-'histlast'            => '最新版本',
-'historysize'         => '($1 �元組)',
-'historyempty'        => '(空)',
+'viewpagelogs'           => '查詢這個��的日誌',
+'nohistory'              => '沒有本�的修訂記錄。',
+'currentrev'             => '當�修訂版本',
+'currentrev-asof'        => '在$1的當�修訂版本',
+'revisionasof'           => '在$1所�的修訂版本',
+'revision-info'          => '在$1由$2所�的修訂版本', # Additionally available: $3: revision id
+'previousrevision'       => '�上一修訂',
+'nextrevision'           => '下一修訂→',
+'currentrevisionlink'    => '當�修訂',
+'cur'                    => '當�',
+'next'                   => '後繼',
+'last'                   => '先�',
+'page_first'             => '最�',
+'page_last'              => '最後',
+'histlegend'             => "差異�擇: 標記�比較版本的單�按鈕並點擊底部的按鈕進行比較。<br />
+說明: '''({{int:cur}})''' 指與當�版本比較，'''({{int:last}})''' 指與�一個修訂版本比較，'''{{int:minoreditletter}}''' = �修改。",
+'history-fieldset-title' => '�覽歷�',
+'deletedrev'             => '[已刪除]',
+'histfirst'              => '最早版本',
+'histlast'               => '最新版本',
+'historysize'            => '($1 �元組)',
+'historyempty'           => '(空)',
 
 # Revision feed
 'history-feed-title'          => '修訂歷�',
@@ -802,6 +831,7 @@ $2',
 'mergehistory-invalid-destination' => '目的��必須是一個有效的標題。',
 'mergehistory-autocomment'         => '已經�併[[:$1]]去到[[:$2]]',
 'mergehistory-comment'             => '已經�併[[:$1]]去到[[:$2]]: $3',
+'mergehistory-same-destination'    => '來���與目的����以相�',
 
 # Merge log
 'mergelog'           => '�併日誌',
@@ -814,126 +844,207 @@ $2',
 'difference'              => '(修訂版本間差異)',
 'lineno'                  => '第$1行：',
 'compareselectedversions' => '比較�定的版本',
+'visualcomparison'        => '�見比較',
+'wikicodecomparison'      => 'Wikitext比較',
 'editundo'                => '撤銷',
-'diff-multi'              => '($1個中途的修訂版本沒有顯示。)',
+'diff-multi'              => '($1個中途的修訂版本沒有顯示)',
+'diff-movedto'            => '移動到$1',
+'diff-styleadded'         => '已加入$1樣�表',
+'diff-added'              => '已加入$1',
+'diff-changedto'          => '更改到$1',
+'diff-movedoutof'         => '移除自$1',
+'diff-styleremoved'       => '已移除$1樣�表',
+'diff-removed'            => '已移除$1',
+'diff-changedfrom'        => '更改自$1',
+'diff-src'                => '�碼',
+'diff-withdestination'    => '跟$1目的地',
+'diff-with'               => 'è·Ÿ $1 $2',
+'diff-with-final'         => '和 $1 $2',
+'diff-width'              => 'é—Š',
+'diff-height'             => '高',
+'diff-p'                  => '段�',
+'diff-blockquote'         => '語錄',
+'diff-h1'                 => '標題（1級）',
+'diff-h2'                 => '標題（2級）',
+'diff-h3'                 => '標題（3級）',
+'diff-h4'                 => '標題（4級）',
+'diff-h5'                 => '標題（5級）',
+'diff-pre'                => '�先設定的方塊',
+'diff-div'                => '部分',
+'diff-ul'                 => '未排列的表',
+'diff-ol'                 => '已排列的表',
+'diff-li'                 => '表項目',
+'diff-table'              => '表',
+'diff-tbody'              => '表內容',
+'diff-tr'                 => '行',
+'diff-td'                 => 'æ ¼',
+'diff-th'                 => '表頭',
+'diff-br'                 => '斷行',
+'diff-hr'                 => 'æ©«ç·š',
+'diff-code'               => '電腦碼方塊',
+'diff-dl'                 => '定義表',
+'diff-dt'                 => '定義字',
+'diff-dd'                 => '解釋',
+'diff-input'              => '輸入',
+'diff-form'               => '表',
+'diff-img'                => '圖�',
+'diff-span'               => '樣�',
+'diff-a'                  => '連�',
+'diff-i'                  => '斜體',
+'diff-b'                  => 'ç²—é«”',
+'diff-strong'             => '強調',
+'diff-em'                 => '�點',
+'diff-font'               => 'å­—é«”',
+'diff-big'                => '大',
+'diff-del'                => '已刪除',
+'diff-tt'                 => '固定闊度',
+'diff-sub'                => '下標',
+'diff-sup'                => '上標',
+'diff-strike'             => '刪除線',
 
 # Search results
-'searchresults'             => '�索�果',
-'searchresulttext'          => '有關�索{{SITENAME}}的更多詳情,�見[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
-'searchsubtitle'            => '查詢\'\'\'[[:$1]]\'\'\'([[Special:Prefixindex/$1|所有以 "$1" 開頭的��]] | [[Special:WhatLinksHere/$1|所有�接到 "$1" 的��]])',
-'searchsubtitleinvalid'     => '查詢"$1"',
-'noexactmatch'              => "'''沒找到標題為\"\$1\"的��。''' 您�以[[:\$1|創建此��]]。",
-'noexactmatch-nocreate'     => "'''沒找到標題為\"\$1\"的��。'''",
-'toomanymatches'            => '�多的匹�已回應，請嘗試一個��的查詢',
-'titlematches'              => '��題目相符',
-'notitlematches'            => '沒有找到匹���題目',
-'textmatches'               => '��內容相符',
-'notextmatches'             => '沒有��內容匹�',
-'prevn'                     => '�$1個',
-'nextn'                     => '後$1個',
-'viewprevnext'              => '檢視 ($1) ($2) ($3)',
-'search-result-size'        => '$1 ($2個字)',
-'search-result-score'       => '相關度: $1%',
-'search-redirect'           => '(�定� $1)',
-'search-section'            => '(段� $1)',
-'search-suggest'            => '你是�解: $1',
-'search-interwiki-caption'  => '姊妹計劃',
-'search-interwiki-default'  => '$1項�果:',
-'search-interwiki-more'     => '(更多)',
-'search-mwsuggest-enabled'  => '有建議',
-'search-mwsuggest-disabled' => '無建議',
-'search-relatedarticle'     => '相關',
-'mwsuggest-disable'         => '�用AJAX建議',
-'searchrelated'             => '相關',
-'searchall'                 => '所有',
-'showingresults'            => '下�顯示從第<b>$2</b>�開始的<b>$1</b>��果:',
-'showingresultsnum'         => '下�顯示從第<b>$2</b>�開始的<b>$3</b>��果:',
-'showingresultstotal'       => "下�顯示從'''$1 - $2'''，總共'''$3'''項之�果",
-'nonefound'                 => "'''注�''': �有一些�字空間是會作為�設�尋。嘗試''all:''去�尋全部的��（包埋討論���模�等），或�用需�的�字空間作為�綴。",
-'powersearch'               => '進階�索',
-'powersearch-legend'        => '進階�索',
-'powersearch-ns'            => '在以下的�字空間中�尋:',
-'powersearch-redir'         => '�新定�清單',
-'powersearch-field'         => '�尋',
-'search-external'           => '外部�索',
-'searchdisabled'            => '{{SITENAME}}由於性能方�的原因，全文�索已被暫時�用。您�以暫時��Google�索。請留�他們的索引�能會�時。',
+'searchresults'                    => '�索�果',
+'searchresults-title'              => '�"$1"的�尋�果',
+'searchresulttext'                 => '有關�索{{SITENAME}}的更多詳情,�見[[{{MediaWiki:Helppage}}|{{int:help}}]]。',
+'searchsubtitle'                   => '查詢\'\'\'[[:$1]]\'\'\'([[Special:Prefixindex/$1|所有以 "$1" 開頭的��]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|所有�接到 "$1" 的��]])',
+'searchsubtitleinvalid'            => '查詢"$1"',
+'noexactmatch'                     => "'''沒找到標題為\"\$1\"的��。''' 您�以[[:\$1|創建此��]]。",
+'noexactmatch-nocreate'            => "'''沒找到標題為\"\$1\"的��。'''",
+'toomanymatches'                   => '�多的匹�已回應，請嘗試一個��的查詢',
+'titlematches'                     => '��題目相符',
+'notitlematches'                   => '沒有找到匹���題目',
+'textmatches'                      => '��內容相符',
+'notextmatches'                    => '沒有��內容匹�',
+'prevn'                            => '�$1個',
+'nextn'                            => '後$1個',
+'viewprevnext'                     => '檢視 ($1) ($2) ($3)',
+'searchmenu-legend'                => '�尋�項',
+'searchmenu-exists'                => "'''在這個wiki上有一����\"[[:\$1]]\"'''",
+'searchmenu-new'                   => "'''在這個wiki上新建這個��\"[[:\$1]]\"�'''",
+'searchhelp-url'                   => 'Help:目錄',
+'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|去�覽以此為首的��]]',
+'searchprofile-articles'           => '內容��',
+'searchprofile-articles-and-proj'  => '內容和專題��',
+'searchprofile-project'            => '專題��',
+'searchprofile-images'             => '檔案',
+'searchprofile-everything'         => '全部',
+'searchprofile-advanced'           => '進階',
+'searchprofile-articles-tooltip'   => '在$1中�尋',
+'searchprofile-project-tooltip'    => '在$1中�尋',
+'searchprofile-images-tooltip'     => '�尋檔案',
+'searchprofile-everything-tooltip' => '�尋全部（包括討論��）',
+'searchprofile-advanced-tooltip'   => '在自定�字空間中度�尋',
+'prefs-search-nsdefault'           => '使用�設值�尋:',
+'prefs-search-nscustom'            => '�尋自定�字空間:',
+'search-result-size'               => '$1 ($2個字)',
+'search-result-score'              => '相關度: $1%',
+'search-redirect'                  => '(�定� $1)',
+'search-section'                   => '(段� $1)',
+'search-suggest'                   => '你是�解: $1',
+'search-interwiki-caption'         => '姊妹計劃',
+'search-interwiki-default'         => '$1項�果:',
+'search-interwiki-more'            => '(更多)',
+'search-mwsuggest-enabled'         => '有建議',
+'search-mwsuggest-disabled'        => '無建議',
+'search-relatedarticle'            => '相關',
+'mwsuggest-disable'                => '�用AJAX建議',
+'searchrelated'                    => '相關',
+'searchall'                        => '所有',
+'showingresults'                   => '下�顯示從第<b>$2</b>�開始的<b>$1</b>��果:',
+'showingresultsnum'                => '下�顯示從第<b>$2</b>�開始的<b>$3</b>��果:',
+'showingresultstotal'              => "下�顯示從第'''$1{{PLURAL:$4|| - $2}}'''項，總共'''$3'''項之�果",
+'nonefound'                        => "'''注�''': �有一些�字空間是會作為�設�尋。嘗試''all:''去�尋全部的��（包埋討論���模�等），或�用需�的�字空間作為�綴。",
+'search-nonefound'                 => '在查詢中無�果��。',
+'powersearch'                      => '進階�索',
+'powersearch-legend'               => '進階�索',
+'powersearch-ns'                   => '在以下的�字空間中�尋:',
+'powersearch-redir'                => '�新定�清單',
+'powersearch-field'                => '�尋',
+'search-external'                  => '外部�索',
+'searchdisabled'                   => '{{SITENAME}}由於性能方�的原因，全文�索已被暫時�用。您�以暫時��Google�索。請留�他們的索引�能會�時。',
 
 # Preferences page
-'preferences'              => '�數設置',
-'mypreferences'            => '我的�數設置',
-'prefs-edits'              => '編輯數�:',
-'prefsnologin'             => '還未登入',
-'prefsnologintext'         => '您必須先<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登入]</span>�能設置個人�數。',
-'prefsreset'               => '�數已�新設置。',
-'qbsettings'               => '快速導航�',
-'qbsettings-none'          => 'ç„¡',
-'qbsettings-fixedleft'     => '左�固定',
-'qbsettings-fixedright'    => '��固定',
-'qbsettings-floatingleft'  => '左�漂移',
-'qbsettings-floatingright' => '��漂移',
-'changepassword'           => '更改密碼',
-'skin'                     => '��',
-'math'                     => '數學公�',
-'dateformat'               => '日期格�',
-'datedefault'              => '�設值',
-'datetime'                 => '日期和時間',
-'math_failure'             => '解�失敗',
-'math_unknown_error'       => '未知錯誤',
-'math_unknown_function'    => '未知函數',
-'math_lexing_error'        => '�法錯誤',
-'math_syntax_error'        => '語法錯誤',
-'math_image_error'         => 'PNG 轉�失敗；請檢查是�正確安�了 latex, dvips, gs 和 convert',
-'math_bad_tmpdir'          => '無法寫入或建立數學公�臨時目錄',
-'math_bad_output'          => '無法寫入或建立數學公�輸出目錄',
-'math_notexvc'             => '無法執行"texvc"；請�照 math/README 進行�置。',
-'prefs-personal'           => '用戶資料',
-'prefs-rc'                 => '最近更改',
-'prefs-watchlist'          => '監視列表',
-'prefs-watchlist-days'     => '監視列表中顯示記錄的天數:',
-'prefs-watchlist-edits'    => '在增強的監視列表中顯示的最多更改次數:',
-'prefs-misc'               => '雜項',
-'saveprefs'                => '�存',
-'resetprefs'               => '清除未�存的更改',
-'oldpassword'              => '舊密碼:',
-'newpassword'              => '新密碼:',
-'retypenew'                => '確�密碼:',
-'textboxsize'              => '編輯',
-'rows'                     => '列:',
-'columns'                  => '欄:',
-'searchresultshead'        => '�索�果設定',
-'resultsperpage'           => '��顯示連�數',
-'contextlines'             => '�連�行數:',
-'contextchars'             => '�行字數:',
-'stub-threshold'           => '<a href="#" class="stub">短��連�</a>格�門檻值 (�元組):',
-'recentchangesdays'        => '最近更改中的顯示日數:',
-'recentchangescount'       => '最近更改�歷��日誌��中的編輯數:',
-'savedprefs'               => '您的個人�數設置已經�存。',
-'timezonelegend'           => '時�',
-'timezonetext'             => '¹輸入當地時間與伺�器時間(UTC)的時差。',
-'localtime'                => '當地時間',
-'timezoneoffset'           => '時差¹',
-'servertime'               => '伺�器時間',
-'guesstimezone'            => '從�覽器填寫',
-'allowemail'               => '接�來自其他用戶的郵件',
-'prefs-searchoptions'      => '�尋�項',
-'prefs-namespaces'         => '���稱空間',
-'defaultns'                => '�設�索的�字空間',
-'default'                  => '�設',
-'files'                    => '檔案',
+'preferences'               => '�數設置',
+'mypreferences'             => '我的�數設置',
+'prefs-edits'               => '編輯數�:',
+'prefsnologin'              => '還未登入',
+'prefsnologintext'          => '您必須先<span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} 登入]</span>�能設置個人�數。',
+'prefsreset'                => '�數已�新設置。',
+'qbsettings'                => '快速導航�',
+'qbsettings-none'           => 'ç„¡',
+'qbsettings-fixedleft'      => '左�固定',
+'qbsettings-fixedright'     => '��固定',
+'qbsettings-floatingleft'   => '左�漂移',
+'qbsettings-floatingright'  => '��漂移',
+'changepassword'            => '更改密碼',
+'skin'                      => '��',
+'skin-preview'              => '�覽',
+'math'                      => '數學公�',
+'dateformat'                => '日期格�',
+'datedefault'               => '�設值',
+'datetime'                  => '日期和時間',
+'math_failure'              => '解�失敗',
+'math_unknown_error'        => '未知錯誤',
+'math_unknown_function'     => '未知函數',
+'math_lexing_error'         => '�法錯誤',
+'math_syntax_error'         => '語法錯誤',
+'math_image_error'          => 'PNG 轉�失敗；請檢查是�正確安�了 latex, dvips, gs 和 convert',
+'math_bad_tmpdir'           => '無法寫入或建立數學公�臨時目錄',
+'math_bad_output'           => '無法寫入或建立數學公�輸出目錄',
+'math_notexvc'              => '無法執行"texvc"；請�照 math/README 進行�置。',
+'prefs-personal'            => '用戶資料',
+'prefs-rc'                  => '最近更改',
+'prefs-watchlist'           => '監視列表',
+'prefs-watchlist-days'      => '監視列表中顯示記錄的天數:',
+'prefs-watchlist-days-max'  => '(最大7天)',
+'prefs-watchlist-edits'     => '在增強的監視列表中顯示的最多更改次數:',
+'prefs-watchlist-edits-max' => '(最多數�: 1000)',
+'prefs-misc'                => '雜項',
+'prefs-resetpass'           => '更改密碼',
+'saveprefs'                 => '�存',
+'resetprefs'                => '清除未�存的更改',
+'textboxsize'               => '編輯',
+'prefs-edit-boxsize'        => '編輯框尺寸',
+'rows'                      => '列:',
+'columns'                   => '欄:',
+'searchresultshead'         => '�索�果設定',
+'resultsperpage'            => '��顯示連�數',
+'contextlines'              => '�連�行數:',
+'contextchars'              => '�行字數:',
+'stub-threshold'            => '<a href="#" class="stub">短��連�</a>格�門檻值 (�元組):',
+'recentchangesdays'         => '最近更改中的顯示日數:',
+'recentchangesdays-max'     => '(最大 $1 日)',
+'recentchangescount'        => '最近更改���歷��日誌��中的�設編輯數:',
+'savedprefs'                => '您的個人�數設置已經�存。',
+'timezonelegend'            => '時�',
+'timezonetext'              => '¹輸入當地時間與伺�器時間(UTC)的時差。',
+'localtime'                 => '當地時間:',
+'timezoneselect'            => '時�:',
+'timezoneuseserverdefault'  => '使用伺�器�設值',
+'timezoneuseoffset'         => '其它 (指定�移)',
+'timezoneoffset'            => '時差¹:',
+'servertime'                => '伺�器時間:',
+'guesstimezone'             => '從�覽器填寫',
+'allowemail'                => '接�來自其他用戶的郵件',
+'prefs-searchoptions'       => '�尋�項',
+'prefs-namespaces'          => '���稱空間',
+'defaultns'                 => '�設�索的�字空間',
+'default'                   => '�設',
+'files'                     => '檔案',
 
 # User rights
 'userrights'                  => '用戶權�管�', # Not used as normal message but as header for the special page itself
 'userrights-lookup-user'      => '管�用戶群組',
 'userrights-user-editname'    => '輸入用戶�:',
 'editusergroup'               => '編輯用戶群組',
-'editinguser'                 => "正在更改用戶'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]]) 的用戶權�",
+'editinguser'                 => "正在更改用戶'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]]) 的用戶權�",
 'userrights-editusergroup'    => '編輯用戶群組',
 'saveusergroups'              => '�存用戶群組',
 'userrights-groupsmember'     => '屬於:',
 'userrights-groups-help'      => '您�以改動這�用戶所屬的群組:
 * 已剔�的核�方塊代表該用戶屬於該群組。
 * 未剔�的核�方塊代表該用戶�是屬於該群組。
-* 一個 * 表示當您加入群組之後更�能移除它，�之亦然。',
+* 有 * 項目表示一旦您加入該群組之後便�能移除它，�之亦然。',
 'userrights-reason'           => '更改原因:',
 'userrights-no-interwiki'     => '您並沒有權�去編輯在其它wiki上的用戶權�。',
 'userrights-nodatabase'       => '資料庫$1�存在或並�為本地的。',
@@ -975,6 +1086,8 @@ $2',
 'right-minoredit'            => '標示作�編輯',
 'right-move'                 => '移動��',
 'right-move-subpages'        => '移動��跟它的字��',
+'right-move-rootuserpages'   => '移動根用戶��',
+'right-movefile'             => '移動檔案',
 'right-suppressredirect'     => '移動��時�建立�定�',
 'right-upload'               => '上載檔案',
 'right-reupload'             => '覆蓋�有的檔案',
@@ -1025,9 +1138,46 @@ $2',
 'rightslogentry' => '將 $1 的權�從 $2 改為 $3',
 'rightsnone'     => '(ç„¡)',
 
+# Associated actions - in the sentence "You do not have permission to X"
+'action-read'                 => '閱讀這個��',
+'action-edit'                 => '編輯這個��',
+'action-createpage'           => '建立這個��',
+'action-createtalk'           => '建立討論��',
+'action-createaccount'        => '建立這個用戶賬戶',
+'action-minoredit'            => '標示這個編輯為�的',
+'action-move'                 => '移動這個��',
+'action-move-subpages'        => '移動這個��跟它的字��',
+'action-move-rootuserpages'   => '移動根用戶��',
+'action-movefile'             => '移動這個檔案',
+'action-upload'               => '上載這個檔案',
+'action-reupload'             => '覆蓋這個�有的檔案',
+'action-reupload-shared'      => '覆蓋在共用檔案庫上的檔案',
+'action-upload_by_url'        => '由一個URL地�中上載檔案',
+'action-writeapi'             => '用來寫API',
+'action-delete'               => '刪除這個��',
+'action-deleterevision'       => '刪除這次修訂',
+'action-deletedhistory'       => '查看這個��的刪除歷�',
+'action-browsearchive'        => '�尋已刪除的��',
+'action-undelete'             => '�刪除這個��',
+'action-suppressrevision'     => '翻查和�復這次隱�修訂',
+'action-suppressionlog'       => '查看這個�有日誌',
+'action-block'                => '�鎖這�用戶的編輯',
+'action-protect'              => '更改這個��的�護等級',
+'action-import'               => '由�一個wiki匯入這個��',
+'action-importupload'         => '由一個檔案上載中匯入這個��',
+'action-patrol'               => '標示其它的編輯為已巡查的',
+'action-autopatrol'           => '將您的編輯標示為已巡查的',
+'action-unwatchedpages'       => '查看未被人監視的��',
+'action-trackback'            => '�交一個trackback',
+'action-mergehistory'         => '�併這個��的歷�',
+'action-userrights'           => '編輯所有的權�',
+'action-userrights-interwiki' => '編輯在其它wiki上用戶的權�',
+'action-siteadmin'            => '鎖定和解除鎖定資料庫',
+
 # Recent changes
 'nchanges'                          => '$1次更改',
 'recentchanges'                     => '最近更改',
+'recentchanges-legend'              => '最近更改�項',
 'recentchangestext'                 => '跟蹤這個wiki上的最新更改。',
 'recentchanges-feed-description'    => '跟蹤此訂閱在 wiki 上的最近更改。',
 'rcnote'                            => "以下是在$4 $5，最近'''$2'''天內的'''$1'''次最近更改記錄:",
@@ -1037,7 +1187,7 @@ $2',
 'rcshowhidebots'                    => '$1機器人的編輯',
 'rcshowhideliu'                     => '$1已登入用戶的編輯',
 'rcshowhideanons'                   => '$1匿�用戶的編輯',
-'rcshowhidepatr'                    => ' $1檢查�的編輯',
+'rcshowhidepatr'                    => '$1檢查�的編輯',
 'rcshowhidemine'                    => '$1我的編輯',
 'rclinks'                           => '顯示最近$2天內最新的$1次改動。<br />$3',
 'diff'                              => '差異',
@@ -1051,6 +1201,8 @@ $2',
 'rc_categories'                     => '分類界�(以"|"分割)',
 'rc_categories_any'                 => '任�',
 'newsectionsummary'                 => '/* $1 */ 新段�',
+'rc-enhanced-expand'                => '顯示細節 (需� JavaScript)',
+'rc-enhanced-hide'                  => '隱�細節',
 
 # Recent changes linked
 'recentchangeslinked'          => '�出更改',
@@ -1074,21 +1226,21 @@ $2',
 'uploaderror'                 => '上載錯誤',
 'uploadtext'                  => "使用下�的表單來上傳檔案。
 �檢視或�索以�上傳的檔案
-�以進入[[Special:ImageList|檔案上傳清單]]，
+�以進入[[Special:FileList|檔案上傳清單]]，
 （�新）上傳將在[[Special:Log/upload|上傳日誌]]中記錄，
 而刪除將在[[Special:Log/delete|刪除日誌]]中記錄。
 
 �在��中加入檔案，使用以下其中一種形�的連接:
-* '''<tt><nowiki>[[{{ns:image}}:file.jpg]]</nowiki></tt>'''去用檔案的完整版本
-* '''<tt><nowiki>[[{{ns:image}}:file.png|200px|thumb|left|替�文字]]</nowiki></tt>'''去用一個200�素寬，左�盒上有'替�文字'的�述
-* '''<tt><nowiki>[[{{ns:media}}:file.ogg]]</nowiki></tt>'''去直接連接到檔案而�顯示檔案",
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki></tt>'''去用檔案的完整版本
+* '''<tt><nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png|200px|thumb|left|替�文字]]</nowiki></tt>'''去用一個200�素寬，左�盒上有'替�文字'的�述
+* '''<tt><nowiki>[[</nowiki>{{ns:media}}<nowiki>:file.ogg]]</nowiki></tt>'''去直接連接到檔案而�顯示檔案",
 'upload-permitted'            => '准許的檔案類型: $1。',
 'upload-preferred'            => '建議的檔案類型: $1。',
 'upload-prohibited'           => '�止的檔案類型: $1。',
 'uploadlog'                   => '上載紀錄',
 'uploadlogpage'               => '上載紀錄',
 'uploadlogpagetext'           => '以下是最近上載的檔案的一覽表。
-查看[[Special:NewImages|新檔案畫廊]]去看更富圖�的總覽。',
+查看[[Special:NewFiles|新檔案畫廊]]去看更富圖�的總覽。',
 'filename'                    => '檔案�',
 'filedesc'                    => '檔案�述',
 'fileuploadsummary'           => '檔案�述:',
@@ -1110,20 +1262,22 @@ $2',
 'large-file'                  => '建議檔案大��能超� $1；本檔案大�為 $2。',
 'largefileserver'             => '這個檔案的大�比伺�器�置�許的大�還�大。',
 'emptyfile'                   => '您所上傳的檔案�存在。這�能是由於檔案��入錯誤。請檢查您是�真的�上傳此檔案。',
-'fileexists'                  => '已存在相��稱的檔案，如果您無法確定您是��改變它，請檢查<strong><tt>$1</tt></strong>。',
-'filepageexists'              => '這個檔案的�述�已經在<strong><tt>$1</tt></strong>創建，但是這個�稱的檔案尚未存在。您輸入了的摘�是�會顯示在該�述�中。�令該摘�在該處中出�，您便�手動地去編輯它。',
-'fileexists-extension'        => '一個相似檔�的檔案已經存在:<br />
-上載檔案的檔�: <strong><tt>$1</tt></strong><br />
-�有檔案的檔�: <strong><tt>$2</tt></strong><br />
-請�擇一個��的�字。',
+'fileexists'                  => "已存在相��稱的檔案，如果您無法確定您是��改變它，請檢查'''<tt>$1</tt>'''。",
+'filepageexists'              => "這個檔案的�述�已經在'''<tt>$1</tt>'''創建，但是這個�稱的檔案尚未存在。您輸入了的摘�是�會顯示在該�述�中。�令該摘�在該處中出�，您便�手動地去編輯它。",
+'fileexists-extension'        => "一個相似檔�的檔案已經存在:<br />
+上載檔案的檔�: '''<tt>$1</tt>'''<br />
+�有檔案的檔�: '''<tt>$2</tt>'''<br />
+請�擇一個��的�字。",
 'fileexists-thumb'            => "<center>'''已經存在的檔案'''</center>",
-'fileexists-thumbnail-yes'    => '這個檔案好�是一幅圖�的縮圖版本<i>(縮圖)</i>。請檢查清楚該檔案<strong><tt>$1</tt></strong>。<br />
-如果檢查後的檔案是�原本圖�的大�是一樣的話，就�用�上載多一幅縮圖。',
-'file-thumbnail-no'           => '該檔�是以<strong><tt>$1</tt></strong>開始。它好�一幅圖�的縮圖版本<i>(縮圖)</i>。
-如果你有該圖�的完整大�，如�是請�修改檔�。',
-'fileexists-forbidden'        => '已存在相��稱的檔案；請返回並用一個新的�稱來上傳此檔案。[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => '在共享檔案庫中已存在此�稱的檔案；請返回並用一個新的�稱來上傳此檔案。[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "這個檔案好�是一幅圖�的縮圖版本''(縮圖)''。請檢查清楚該檔案'''<tt>$1</tt>'''。<br />
+如果檢查後的檔案是�原本圖�的大�是一樣的話，就�用�上載多一幅縮圖。",
+'file-thumbnail-no'           => "該檔�是以'''<tt>$1</tt>'''開始。它好�一幅圖�的縮圖版本''(縮圖)''。
+如果你有該圖�的完整大�，如�是請�修改檔�。",
+'fileexists-forbidden'        => '已存在相��稱的檔案，且�能覆蓋；請返回並用一個新的�稱來上傳此檔案。[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => '在共享檔案庫中已存在此�稱的檔案。
+如果你�然想去上載它的話，請返回並用一個新的�稱來上傳此檔案。[[File:$1|thumb|center|$1]]',
 'file-exists-duplicate'       => '這個檔案是跟以下的{{PLURAL:$1|一|多}}個檔案�覆:',
+'file-deleted-duplicate'      => '一個相��稱的檔案 ([[$1]]) 在先�刪除�。您應該在�新上傳之�檢查一下該檔案之刪除紀錄。',
 'successfulupload'            => '上傳�功',
 'uploadwarning'               => '上載警告',
 'savefile'                    => '�存檔案',
@@ -1143,14 +1297,14 @@ $2',
 
 您應該�考慮一下繼續上傳一個檔案��是���。
 為方便起見，這一個檔案的刪除記錄已經在下��供:",
-'filename-bad-prefix'         => '您上傳的檔案�稱是以<strong>「$1�</strong>作為開頭，通常這種沒有��的檔案�稱是由數碼相機中自動編排。請在您的檔案中�新�擇一個更加有�義的檔案�稱。',
+'filename-bad-prefix'         => "您上傳的檔案�稱是以'''「$1�'''作為開頭，通常這種沒有��的檔案�稱是由數碼相機中自動編排。請在您的檔案中�新�擇一個更加有�義的檔案�稱。",
 
 'upload-proto-error'      => '�議錯誤',
 'upload-proto-error-text' => '�程上傳�求 URL 以 <code>http://</code> 或 <code>ftp://</code> 開頭。',
 'upload-file-error'       => '內部錯誤',
 'upload-file-error-text'  => '當試圖在伺�器上創建臨時檔案時發生內部錯誤。請與[[Special:ListUsers/sysop|管�員]]�繫。',
 'upload-misc-error'       => '未知的上傳錯誤',
-'upload-misc-error-text'  => '在上傳時發生未知的錯誤. 請驗証使用了正確並�訪�的 URL，然後進行�試。如果�題�然存在，請與[[Special:ListUsers/sysop|管�員]]�繫。',
+'upload-misc-error-text'  => '在上傳時發生未知的錯誤。請驗証使用了正確並�訪�的 URL，然後進行�試。如果�題�然存在，請與[[Special:ListUsers/sysop|管�員]]�繫。',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6'       => '無法訪� URL',
@@ -1164,20 +1318,21 @@ $2',
 'upload_source_url'  => ' (一個有效的，�公開訪�的 URL)',
 'upload_source_file' => ' (在您電腦上的一個檔案)',
 
-# Special:ImageList
-'imagelist-summary'     => '這個特殊��顯示所有上傳�的檔案。
+# Special:ListFiles
+'listfiles-summary'     => '這個特殊��顯示所有上傳�的檔案。
 �設中最後上傳的檔案會顯示在這個列表中的最頂處。
 點擊一欄的標題去改變這個排列。',
-'imagelist_search_for'  => '按檔案�稱�索:',
+'listfiles_search_for'  => '按檔案�稱�索:',
 'imgfile'               => '檔案',
-'imagelist'             => '檔案列表',
-'imagelist_date'        => '日期',
-'imagelist_name'        => '�稱',
-'imagelist_user'        => '用戶',
-'imagelist_size'        => '大�',
-'imagelist_description' => '�述',
-
-# Image description page
+'listfiles'             => '檔案列表',
+'listfiles_date'        => '日期',
+'listfiles_name'        => '�稱',
+'listfiles_user'        => '用戶',
+'listfiles_size'        => '大�',
+'listfiles_description' => '�述',
+'listfiles_count'       => '版本',
+
+# File description page
 'filehist'                       => '檔案歷�',
 'filehist-help'                  => '點擊日期�時間以檢視當時出��的檔案。',
 'filehist-deleteall'             => '刪除全部',
@@ -1185,16 +1340,22 @@ $2',
 'filehist-revert'                => '�復',
 'filehist-current'               => '當�',
 'filehist-datetime'              => '日期�時間',
+'filehist-thumb'                 => '縮圖',
+'filehist-thumbtext'             => '於$1的縮圖版本',
+'filehist-nothumb'               => '沒有縮圖',
 'filehist-user'                  => '用戶',
 'filehist-dimensions'            => '維度',
 'filehist-filesize'              => '檔案大�',
 'filehist-comment'               => '註解',
-'imagelinks'                     => '連�',
+'imagelinks'                     => '檔案連�',
 'linkstoimage'                   => '以下的$1個��連接到本檔案:',
+'linkstoimage-more'              => '多於$1個��連接到這個檔案。
+下�的清單�列示了連去這個檔案的最首$1個��。
+一個[[Special:WhatLinksHere/$2|完整的清單]]�以�供。',
 'nolinkstoimage'                 => '沒有��連接到本檔案。',
 'morelinkstoimage'               => '查看連接到這個檔案的[[Special:WhatLinksHere/$1|更多連�]]。',
 'redirectstofile'                => '以下的$1個檔案�新定�到這個檔案:',
-'duplicatesoffile'               => '以下的$1個檔案是跟這個檔案�覆:',
+'duplicatesoffile'               => '以下的$1個文件跟這個文件�覆（[[Special:FileDuplicateSearch/$2|更多細節]]）：',
 'sharedupload'                   => '該檔案是一個共享上傳，它�能在其它項目中被應用。',
 'shareduploadwiki'               => '請�閱在共享檔案庫上的$1以了解其相關資訊。',
 'shareduploadwiki-desc'          => '它在$1上的�述於下�顯示。',
@@ -1211,7 +1372,7 @@ $2',
 # File reversion
 'filerevert'                => '�復$1',
 'filerevert-legend'         => '�復檔案',
-'filerevert-intro'          => "您�正在�復'''[[Media:$1|$1]]'''到[$4 於$2 $3的版本]。",
+'filerevert-intro'          => "您�正在�復檔案'''[[Media:$1|$1]]'''到[$4 於$2 $3的版本]。",
 'filerevert-comment'        => '註解:',
 'filerevert-defaultcomment' => '已經�復到於$1 $2的版本',
 'filerevert-submit'         => '�復',
@@ -1221,7 +1382,7 @@ $2',
 # File deletion
 'filedelete'                  => '刪除$1',
 'filedelete-legend'           => '刪除檔案',
-'filedelete-intro'            => "您�正刪除'''[[Media:$1|$1]]'''。",
+'filedelete-intro'            => "您�正刪除檔案'''[[Media:$1|$1]]'''。",
 'filedelete-intro-old'        => "你�正刪除'''[[Media:$1|$1]]'''於[$4 $2 $3]的版本。",
 'filedelete-comment'          => '刪除�由:',
 'filedelete-submit'           => '刪除',
@@ -1229,7 +1390,6 @@ $2',
 'filedelete-success-old'      => "'''[[Media:$1|$1]]'''於 $2 $3 的版本已經刪除。",
 'filedelete-nofile'           => "'''$1'''�存在。",
 'filedelete-nofile-old'       => "在已指定屬性的情�下，這裡沒有'''$1'''於 $2 $3 的版本。",
-'filedelete-iscurrent'        => '您�正嘗試刪除這個檔案的最近版本。請先將個該檔案回退�較舊的版本。',
 'filedelete-otherreason'      => '其它�附加的�由:',
 'filedelete-reason-otherlist' => '其它�由',
 'filedelete-reason-dropdown'  => '
@@ -1257,29 +1417,31 @@ $2',
 
 # Random page
 'randompage'         => '隨機��',
-'randompage-nopages' => '在這個�字空間中沒有��。',
+'randompage-nopages' => '在 "$1" �字空間中沒有��。',
 
 # Random redirect
 'randomredirect'         => '隨機�定���',
-'randomredirect-nopages' => '在這個�字空間中沒有�定���。',
+'randomredirect-nopages' => '在 "$1" �字空間中沒有�定���。',
 
 # Statistics
-'statistics'             => '統計',
-'sitestats'              => '{{SITENAME}}統計數據',
-'userstats'              => '用戶統計',
-'sitestatstext'          => "資料庫中共有'''\$1'''���。
-其中包括�話��關於{{SITENAME}}的���最少�的\"stub\"���定�的��，
-以�未�到��質�的��。除此之外還有'''\$2'''��能是�乎標準的��。
-
-'''\$8'''個檔案已被上傳。
-
-從{{SITENAME}}設定以來，全網站共有���覽'''\$3'''次，��編輯'''\$4'''次。
-���平�編輯'''\$5'''次，�次編輯後��的�個版本平��覽'''\$6'''次。
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue 工作隊列]的長度是'''\$7'''。",
-'userstatstext'          => "網站有'''$1'''�註冊[[Special:ListUsers|用戶]]，其中
-'''$2''' (或 '''$4%''') 有$5許�權。",
-'statistics-mostpopular' => '被查閱次數最多的��',
+'statistics'                   => '統計',
+'statistics-header-pages'      => '��統計',
+'statistics-header-edits'      => '編輯統計',
+'statistics-header-views'      => '查看統計',
+'statistics-header-users'      => '用戶統計',
+'statistics-articles'          => '內容��',
+'statistics-pages'             => '��',
+'statistics-pages-desc'        => '在wiki上的所有��，包括�話����新定�等',
+'statistics-files'             => '已經上載的檔案',
+'statistics-edits'             => '自從{{SITENAME}}設定的��編輯數',
+'statistics-edits-average'     => '�一��的平�編輯數',
+'statistics-views-total'       => '查看總數',
+'statistics-views-peredit'     => '�次編輯查看數',
+'statistics-jobqueue'          => '[http://www.mediawiki.org/wiki/Manual:Job_queue 工作隊列]長度',
+'statistics-users'             => '已註冊[[Special:ListUsers|用戶]]',
+'statistics-users-active'      => '活�用戶',
+'statistics-users-active-desc' => '在�$1天中�作�的用戶',
+'statistics-mostpopular'       => '被查閱次數最多的��',
 
 'disambiguations'      => '消�糊�',
 'disambiguationspage'  => 'Template:disambig
@@ -1293,11 +1455,11 @@ Template:消除歧義',
 
 'doubleredirects'            => '雙��定���',
 'doubleredirectstext'        => '這一�列出所有�定����定�到�一個�定��的��。�一行都包�到第一和第二個�定���的�接，以�第二個�定���的目標，通常顯示的都會是"真正"的目標��，也就是第一個�定���應該指�的��。',
-'double-redirect-fixed-move' => '[[$1]]已經完�移動，它�在�新定�到[[$2]]',
+'double-redirect-fixed-move' => '[[$1]]已經完�移動，它�在�新定�到[[$2]]。',
 'double-redirect-fixer'      => '�新定�修正器',
 
 'brokenredirects'        => '�壞的�定��',
-'brokenredirectstext'    => '以下的�定��指�的是�存在的��。',
+'brokenredirectstext'    => '以下的�定��指�的是�存在的��:',
 'brokenredirects-edit'   => '(編輯)',
 'brokenredirects-delete' => '(刪除)',
 
@@ -1327,26 +1489,30 @@ Template:消除歧義',
 'popularpages'            => '熱點��',
 'wantedcategories'        => '需�的分類',
 'wantedpages'             => '待撰��',
-'missingfiles'            => '�失檔案',
+'wantedfiles'             => '需�的檔案',
+'wantedtemplates'         => '需�的模�',
 'mostlinked'              => '最多連���',
 'mostlinkedcategories'    => '最多連�分類',
 'mostlinkedtemplates'     => '最多連�模版',
 'mostcategories'          => '最多分類��',
 'mostimages'              => '最多連�檔案',
 'mostrevisions'           => '最多修訂��',
-'prefixindex'             => '�綴索引',
+'prefixindex'             => '所有��之�綴',
 'shortpages'              => '短��',
 'longpages'               => '長��',
 'deadendpages'            => '斷���',
 'deadendpagestext'        => '以下��沒有連�到{{SITENAME}}中的其它��。',
 'protectedpages'          => '已�護��',
 'protectedpages-indef'    => '�有無期之�護��',
+'protectedpages-cascade'  => '�有連鎖之�護��',
 'protectedpagestext'      => '以下��已經被�護以防止移動或編輯',
 'protectedpagesempty'     => '在這些�數下沒有��正在�護。',
 'protectedtitles'         => '已�護的標題',
 'protectedtitlestext'     => '以下的��已經被�護以防止建立',
 'protectedtitlesempty'    => '在這些�數之下並無標題正在�護。',
 'listusers'               => '用戶列表',
+'listusers-editsonly'     => '�顯示有編輯的用戶',
+'usereditcount'           => '$1次編輯',
 'newpages'                => '最新��',
 'newpages-username'       => '用戶�:',
 'ancientpages'            => '最舊��',
@@ -1367,14 +1533,13 @@ Template:消除歧義',
 'booksources-search-legend' => '尋找網路書�',
 'booksources-go'            => '�出',
 'booksources-text'          => '以下是一份銷售新書或二手書的列表，並�能有你正尋找的書的進一步訊�：',
+'booksources-invalid-isbn'  => '�供的ISBN號碼並�正確，請檢查原始複製來�號碼是�有誤。',
 
 # Special:Log
 'specialloguserlabel'  => '用戶:',
 'speciallogtitlelabel' => '標題:',
 'log'                  => '日誌',
 'all-logs-page'        => '所有日誌',
-'log-search-legend'    => '�尋日誌',
-'log-search-submit'    => '去',
 'alllogstext'          => '綜�{{SITENAME}}的顯示上傳�刪除��護�查�以�站務日誌。',
 'logempty'             => '在日誌中�存在匹�項。',
 'log-title-wildcard'   => '�尋以這個文字開始的標題',
@@ -1385,6 +1550,7 @@ Template:消除歧義',
 'nextpage'          => '下一�($1)',
 'prevpage'          => '上一�($1)',
 'allpagesfrom'      => '顯示從此處開始的��:',
+'allpagesto'        => '顯示從此處��的��:',
 'allarticles'       => '所有��',
 'allinnamespace'    => '所有��(屬於$1�字空間)',
 'allnotinnamespace' => '所有��(�屬於$1�字空間)',
@@ -1404,44 +1570,71 @@ Template:消除歧義',
 'special-categories-sort-count' => '按數�排列',
 'special-categories-sort-abc'   => '按字�排列',
 
+# Special:DeletedContributions
+'deletedcontributions' => '已刪除的用戶貢�',
+
+# Special:LinkSearch
+'linksearch'       => '外部連�',
+'linksearch-pat'   => '�尋網�:',
+'linksearch-ns'    => '�稱空間:',
+'linksearch-ok'    => '�尋',
+'linksearch-text'  => '�以使用類似"*.wikipedia.org"的�用字元。<br />
+已支�：<tt>$1</tt>',
+'linksearch-line'  => '$1 連自 $2',
+'linksearch-error' => '�用字元僅�在主機�稱的開頭使用。',
+
 # Special:ListUsers
 'listusersfrom'      => '給定顯示用戶�件:',
 'listusers-submit'   => '顯示',
 'listusers-noresult' => '找�到用戶。',
 
+# Special:Log/newusers
+'newuserlogpage'              => '新進用戶�冊',
+'newuserlogpagetext'          => '這是一個最近被創建用戶的新日誌',
+'newuserlog-byemail'          => '密碼已由電�郵件寄出',
+'newuserlog-create-entry'     => '新用戶賬戶',
+'newuserlog-create2-entry'    => '已創建$1的新賬戶',
+'newuserlog-autocreate-entry' => '已自動建立賬戶',
+
 # Special:ListGroupRights
-'listgrouprights'          => '用戶群組權�',
-'listgrouprights-summary'  => '以下�是一個在這個wiki中定義出來的用戶權�清單，以�它們的存�權。
+'listgrouprights'                 => '用戶群組權�',
+'listgrouprights-summary'         => '以下�是一個在這個wiki中定義出來的用戶權�清單，以�它們的存�權。
 更多有關個別權�的細節�以在[[{{MediaWiki:Listgrouprights-helppage}}|這�]]找到。',
-'listgrouprights-group'    => '群組',
-'listgrouprights-rights'   => '權�',
-'listgrouprights-helppage' => 'Help:群組權�',
-'listgrouprights-members'  => '(�員清單)',
+'listgrouprights-group'           => '群組',
+'listgrouprights-rights'          => '權�',
+'listgrouprights-helppage'        => 'Help:群組權�',
+'listgrouprights-members'         => '(�員清單)',
+'listgrouprights-addgroup'        => '�以加入的{{PLURAL:$2|一個|多個}}群組: $1',
+'listgrouprights-removegroup'     => '�以移除的{{PLURAL:$2|一個|多個}}群組: $1',
+'listgrouprights-addgroup-all'    => '�以加入所有群組',
+'listgrouprights-removegroup-all' => '�以移除所有群組',
 
 # E-mail user
-'mailnologin'     => '無電郵地�',
-'mailnologintext' => '您必須先[[Special:UserLogin|登入]]
+'mailnologin'      => '無電郵地�',
+'mailnologintext'  => '您必須先[[Special:UserLogin|登入]]
 並在[[Special:Preferences|�數設置]]
 中有一個有效的e-mail地���以電郵其他用戶。',
-'emailuser'       => 'E-mail該用戶',
-'emailpage'       => 'E-mail用戶',
-'emailpagetext'   => '您�以用下�的表格去寄一�電郵給這�用戶。
+'emailuser'        => 'E-mail該用戶',
+'emailpage'        => 'E-mail用戶',
+'emailpagetext'    => '您�以用下�的表格去寄一�電郵給這�用戶。
 您在[[Special:Preferences|您�數設置]]中所輸入的e-mail地�將出�在郵件「發件人�一欄中，這樣該用戶就�以回覆您。',
-'usermailererror' => '目標郵件地�返回錯誤：',
-'defemailsubject' => '{{SITENAME}}電�郵件',
-'noemailtitle'    => '無e-mail地�',
-'noemailtext'     => '該用戶還沒有指定一個有效的e-mail地�，
-或者�擇�接�來自其他用戶的e-mail。',
-'emailfrom'       => '發件人:',
-'emailto'         => '收件人:',
-'emailsubject'    => '主題:',
-'emailmessage'    => '訊�:',
-'emailsend'       => '發�',
-'emailccme'       => '將我的消�的副本發�一份到我的電郵信箱。',
-'emailccsubject'  => '將您的訊�複製到 $1: $2',
-'emailsent'       => '電�郵件已發�',
-'emailsenttext'   => '您的電�郵件已經發出。',
-'emailuserfooter' => '這�電郵是由$1寄給$2經{{SITENAME}}的「電郵用戶�功能發出的。',
+'usermailererror'  => '目標郵件地�返回錯誤：',
+'defemailsubject'  => '{{SITENAME}}電�郵件',
+'noemailtitle'     => '無e-mail地�',
+'noemailtext'      => '該用戶還沒有指定一個有效的e-mail地�。',
+'nowikiemailtitle' => '�容許電�郵件',
+'nowikiemailtext'  => '這�用戶�擇�接收其他用戶的電�郵件。',
+'email-legend'     => '發一�電�郵件至�一�{{SITENAME}}用戶',
+'emailfrom'        => '發件人:',
+'emailto'          => '收件人:',
+'emailsubject'     => '主題:',
+'emailmessage'     => '訊�:',
+'emailsend'        => '發�',
+'emailccme'        => '將我的消�的副本發�一份到我的電郵信箱。',
+'emailccsubject'   => '將您的訊�複製到 $1: $2',
+'emailsent'        => '電�郵件已發�',
+'emailsenttext'    => '您的電�郵件已經發出。',
+'emailuserfooter'  => '這�電郵是由$1寄給$2經{{SITENAME}}的「電郵用戶�功能發出的。',
 
 # Watchlist
 'watchlist'            => '監視列表',
@@ -1475,12 +1668,7 @@ Template:消除歧義',
 'iteminvalidname'      => "��'$1'錯誤，無效命�...",
 'wlnote'               => '以下是最近<b>$2</b>�時內的最後$1次修改。',
 'wlshowlast'           => '顯示最近$1�時；$2天；$3的修改。',
-'watchlist-show-bots'  => '顯示機器人的編輯',
-'watchlist-hide-bots'  => '隱�機器人的編輯',
-'watchlist-show-own'   => '顯示我的修改',
-'watchlist-hide-own'   => '隱�我的修改',
-'watchlist-show-minor' => '顯示�修改',
-'watchlist-hide-minor' => '隱��修改',
+'watchlist-options'    => '監視列表�項',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '正在監視...',
@@ -1521,78 +1709,97 @@ $NEWPAGE
 回饋和進一步的幫助:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '刪除��',
-'confirm'                     => '確�',
-'excontent'                   => '內容為: "$1"',
-'excontentauthor'             => '內容為: "$1" (而且唯一貢�者為"$2")',
-'exbeforeblank'               => '被清空�的內容為: "$1"',
-'exblank'                     => '��為空',
-'delete-confirm'              => '刪除「$1�',
-'delete-legend'               => '刪除',
-'historywarning'              => '警告: 您將�刪除的�內�有歷�',
-'confirmdeletetext'           => '您�將刪除一個��或圖�以�其歷�。
+# Delete
+'deletepage'             => '刪除��',
+'confirm'                => '確�',
+'excontent'              => '內容為: "$1"',
+'excontentauthor'        => '內容為: "$1" (而且唯一貢�者為"$2")',
+'exbeforeblank'          => '被清空�的內容為: "$1"',
+'exblank'                => '��為空',
+'delete-confirm'         => '刪除「$1�',
+'delete-legend'          => '刪除',
+'historywarning'         => '警告: 您將�刪除的�內�有歷�',
+'confirmdeletetext'      => '您�將刪除一個��或圖�以�其歷�。
 請確定您�進行此項�作，並且了解其後果，�時您的行為符�[[{{MediaWiki:Policy-url}}]]。',
-'actioncomplete'              => '�作完�',
-'deletedtext'                 => '「<nowiki>$1</nowiki>�已經被刪除。最近刪除的紀錄請�見$2。',
-'deletedarticle'              => '已刪除「[[$1]]�',
-'suppressedarticle'           => '已廢止「[[$1]]�',
-'dellogpage'                  => '刪除紀錄',
-'dellogpagetext'              => '以下是最近刪除的紀錄列表。',
-'deletionlog'                 => '刪除紀錄',
-'reverted'                    => '�復到早期版本',
-'deletecomment'               => '刪除�由:',
-'deleteotherreason'           => '其它�附加的�由:',
-'deletereasonotherlist'       => '其它�由',
-'deletereason-dropdown'       => '
+'actioncomplete'         => '�作完�',
+'deletedtext'            => '「<nowiki>$1</nowiki>�已經被刪除。最近刪除的紀錄請�見$2。',
+'deletedarticle'         => '已刪除「[[$1]]�',
+'suppressedarticle'      => '已廢止「[[$1]]�',
+'dellogpage'             => '刪除紀錄',
+'dellogpagetext'         => '以下是最近刪除的紀錄列表。',
+'deletionlog'            => '刪除紀錄',
+'reverted'               => '�復到早期版本',
+'deletecomment'          => '刪除�由:',
+'deleteotherreason'      => '其它�附加的�由:',
+'deletereasonotherlist'  => '其它�由',
+'deletereason-dropdown'  => '
 *常用刪除�由
 ** 作者請求
 ** 侵犯版權
 ** 破壞',
-'delete-edit-reasonlist'      => '編輯刪除�由',
-'delete-toobig'               => '這個��有一個�分大�的編輯歷�，超�$1次修訂。刪除此類��的動作已經被�制，以防止在{{SITENAME}}上的�外擾亂。',
-'delete-warning-toobig'       => '這個��有一個�分大�的編輯歷�，超�$1次修訂。刪除它�能會擾亂{{SITENAME}}的資料庫�作；在繼續此動作�請�心。',
-'rollback'                    => '�復編輯',
-'rollback_short'              => '�復',
-'rollbacklink'                => '�復',
-'rollbackfailed'              => '無法�復',
-'cantrollback'                => '無法�復編輯；最後的貢�者是本文的唯一作者。',
-'alreadyrolled'               => '無法�復由[[User:$2|$2]] ([[User talk:$2|討論]]  | [[Special:Contributions/$2|{{int:contribslink}}]])進行的[[$1]]的最後編輯；
+'delete-edit-reasonlist' => '編輯刪除�由',
+'delete-toobig'          => '這個��有一個�分大�的編輯歷�，超�$1次修訂。刪除此類��的動作已經被�制，以防止在{{SITENAME}}上的�外擾亂。',
+'delete-warning-toobig'  => '這個��有一個�分大�的編輯歷�，超�$1次修訂。刪除它�能會擾亂{{SITENAME}}的資料庫�作；在繼續此動作�請�心。',
+
+# Rollback
+'rollback'         => '�復編輯',
+'rollback_short'   => '�復',
+'rollbacklink'     => '�復',
+'rollbackfailed'   => '無法�復',
+'cantrollback'     => '無法�復編輯；最後的貢�者是本文的唯一作者。',
+'alreadyrolled'    => '無法�復由[[User:$2|$2]] ([[User talk:$2|討論]] {{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]])進行的[[$1]]的最後編輯；
 其他人已經編輯或是�復了該�。
 
-最後���編輯的編輯者: [[User:$3|$3]] ([[User talk:$3|討論]] | [[Special:Contributions/$3|{{int:contribslink}}]])。',
-'editcomment'                 => '編輯說明: "<i>$1</i>"。', # only shown if there is an edit comment
-'revertpage'                  => '�復由[[Special:Contributions/$2|$2]] ([[User talk:$2|�話]])的編輯至[[User:$1|$1]]的最後一個版本', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '�復由$1的編輯；更改回$2的最後一個版本。',
-'sessionfailure'              => '您的登入資訊似乎有�題，為防止此該訊�被攔截，本次�作已經�消，請按「上一���新載入。',
+最後���編輯的編輯者: [[User:$3|$3]] ([[User talk:$3|討論]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]])。',
+'editcomment'      => "編輯摘�: \"''\$1''\"。", # only shown if there is an edit comment
+'revertpage'       => '�復由[[Special:Contributions/$2|$2]] ([[User talk:$2|�話]])的編輯至[[User:$1|$1]]的最後一個版本', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '�復由$1的編輯；更改回$2的最後一個版本。',
+'sessionfailure'   => '您的登入資訊似乎有�題，為防止此該訊�被攔截，本次�作已經�消，請按「上一���新載入。',
+
+# Protect
 'protectlogpage'              => '�護日誌',
 'protectlogtext'              => '下�是��鎖定和�消鎖定的列表。請�考[[Special:ProtectedPages|�護��清單]]以檢視當�進行的���護。',
 'protectedarticle'            => '已�護"[[$1]]"',
 'modifiedarticleprotection'   => '已經更改 "[[$1]]" 的�護等級',
 'unprotectedarticle'          => '已解除�護"[[$1]]"',
+'movedarticleprotection'      => '已經更改由「[[$2]]�至「[[$1]]�的�護設定',
 'protect-title'               => '正在更改"$1"的�護等級',
+'prot_1movedto2'              => '[[$1]]移動到[[$2]]',
 'protect-legend'              => '確��護',
 'protectcomment'              => '註解:',
 'protectexpiry'               => '到期:',
 'protect_expiry_invalid'      => '輸入的終止時間無效。',
 'protect_expiry_old'          => '終止時間已�去。',
 'protect-unchain'             => '移動權�解鎖',
-'protect-text'                => '你�以在這裡�覽和修改���<strong><nowiki>$1</nowiki></strong>的�護級別。',
-'protect-locked-blocked'      => '您�能在被查�時更改�護級別。
-以下是<strong>$1</strong>�時的�護級別:',
-'protect-locked-dblock'       => '在資料庫鎖定時無法更改�護級別。
-以下是<strong>$1</strong>�時的�護級別:',
-'protect-locked-access'       => '您的帳戶權��能修改�護級別。
-以下是<strong>$1</strong>�時的�護級別:',
+'protect-text'                => "你�以在這裡�覽和修改���'''<nowiki>$1</nowiki>'''的�護級別。",
+'protect-locked-blocked'      => "您�能在被查�時更改�護級別。
+以下是'''$1'''�時的�護級別:",
+'protect-locked-dblock'       => "在資料庫鎖定時無法更改�護級別。
+以下是'''$1'''�時的�護級別:",
+'protect-locked-access'       => "您的帳戶權��能修改�護級別。
+以下是'''$1'''�時的�護級別:",
 'protect-cascadeon'           => '以下的{{PLURAL:$1|一個|多個}}��包��本��的�時，啟動了連鎖�護，因此本��目�也被�護，未能編輯。您�以設定本��的�護級別，但這並�會�連鎖�護有所影響。',
-'protect-default'             => '(�設)',
+'protect-default'             => '容許所有用戶',
 'protect-fallback'            => '需�"$1"的許�',
-'protect-level-autoconfirmed' => '�止未註冊用戶',
+'protect-level-autoconfirmed' => '�止新的和未註冊的用戶',
 'protect-level-sysop'         => '僅�作員',
 'protect-summary-cascade'     => '連鎖',
 'protect-expiring'            => '終止於 $1 (UTC)',
+'protect-expiry-indefinite'   => '無期',
 'protect-cascade'             => '�護本�中包�的�� (連鎖�護)',
 'protect-cantedit'            => '您無法更改這個��的�護等級，因為您沒有權�去編輯它。',
+'protect-othertime'           => '其它時間:',
+'protect-othertime-op'        => '其它時間',
+'protect-existing-expiry'     => '�時到期之時間: $2 $3',
+'protect-otherreason'         => '其它�附加的�由:',
+'protect-otherreason-op'      => '其它�附加的�由',
+'protect-dropdown'            => '*通用�護�由
+** ��的破壞
+** ��的�水
+** �生產性編輯戰
+** 高����',
+'protect-edit-reasonlist'     => '編輯�護�由',
+'protect-expiry-options'      => '2�時:2 hours,1天:1 day,3天:3 days,1周:1 week,2周:2 weeks,1個月:1 month,3個月:3 months,6個月:6 months,1年:1 year,永久:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '權�:',
 'restriction-level'           => '�制級別:',
 'minimum-size'                => '最�大�',
@@ -1615,7 +1822,7 @@ $NEWPAGE
 'undeletepage'                 => '�覽��復被刪��',
 'undeletepagetitle'            => "'''以下包�[[:$1]]的已刪除之修訂版本'''。",
 'viewdeletedpage'              => '檢視被刪除的��',
-'undeletepagetext'             => '以下��已經被刪除，但�然在檔案中並�以被�復。
+'undeletepagetext'             => '以下的$1個��已經被刪除，但�然在檔案中並�以被�復。
 檔案庫�能被定時清�。',
 'undelete-fieldset-title'      => '�復修訂',
 'undeleteextrahelp'            => "�復整個��時，請清除所有複�框後按 '''''�復''''' 。
@@ -1626,12 +1833,13 @@ $NEWPAGE
 如果本�刪除後有一個��的新��建立，被�復的版本將會稱為較新的歷�。',
 'undeleterevdel'               => '如果把最新修訂部份刪除，�刪除便無法進行。如果�到這種情�，您必須��或�隱�最新已刪除的修訂。',
 'undeletehistorynoadmin'       => '這個��已經被刪除，刪除原因顯示在下方編輯摘�中。被刪除�的所有修訂版本，連�刪除�貢�用戶等等細節�有管�員�以看見。',
-'undelete-revision'            => '刪除$1時由$3（在$2）所編寫的修訂版本:',
+'undelete-revision'            => '刪除$1時由$3（在$4 $5）所編寫的修訂版本:',
 'undeleterevision-missing'     => '此版本的內容�正確或已經�失。�能連�錯誤�被移除或已經被�復。',
 'undelete-nodiff'              => '找�到先�的修訂版本。',
 'undeletebtn'                  => '�復',
 'undeletelink'                 => '�復',
 'undeletereset'                => '�設',
+'undeleteinvert'               => '���擇',
 'undeletecomment'              => '原因',
 'undeletedarticle'             => '已經�復「$1�',
 'undeletedrevisions'           => '$1個修訂版本已經�復',
@@ -1661,26 +1869,27 @@ $1',
 'blanknamespace' => '(主)',
 
 # Contributions
-'contributions' => '用戶貢�',
-'mycontris'     => '我的貢�',
-'contribsub2'   => '$1的貢� ($2)',
-'nocontribs'    => '沒有找到符�特徵的更改。',
-'uctop'         => '(最新修改)',
-'month'         => '從該月份 (或更早):',
-'year'          => '從該年份 (或更早):',
-
-'sp-contributions-newbies'     => '�顯示新建立之用戶的貢�',
-'sp-contributions-newbies-sub' => '新手',
-'sp-contributions-blocklog'    => '��記錄',
-'sp-contributions-search'      => '�尋貢�記錄',
-'sp-contributions-username'    => 'IP��或用戶�稱：',
-'sp-contributions-submit'      => '�尋',
+'contributions'       => '用戶貢�',
+'contributions-title' => '$1的用戶貢�',
+'mycontris'           => '我的貢�',
+'contribsub2'         => '$1的貢� ($2)',
+'nocontribs'          => '沒有找到符�特徵的更改。',
+'uctop'               => '(最新修改)',
+'month'               => '從該月份 (或更早):',
+'year'                => '從該年份 (或更早):',
+
+'sp-contributions-newbies'       => '�顯示新建立之用戶的貢�',
+'sp-contributions-newbies-sub'   => '新手',
+'sp-contributions-newbies-title' => '新手的用戶貢�',
+'sp-contributions-blocklog'      => '��記錄',
+'sp-contributions-search'        => '�尋貢�記錄',
+'sp-contributions-username'      => 'IP��或用戶�稱：',
+'sp-contributions-submit'        => '�尋',
 
 # What links here
 'whatlinkshere'            => '�入��',
 'whatlinkshere-title'      => '�接到「$1�的��',
 'whatlinkshere-page'       => '��:',
-'linklistsub'              => '(連�列表)',
 'linkshere'                => '以下��連�到[[:$1]]：',
 'nolinkshere'              => '沒有��連�到[[:$1]]。',
 'nolinkshere-ns'           => '在所�的�字空間內沒有���接到[[:$1]]。',
@@ -1727,6 +1936,8 @@ $1',
 'ipbotherreason'                  => '其它�附帶原因:',
 'ipbhidename'                     => '在查�日誌�活�查�列表以�用戶列表中隱�用戶�',
 'ipbwatchuser'                    => '監視這�用戶的用戶��以�其�話��',
+'ipballowusertalk'                => '當被�鎖時容許這�用戶去編輯自己的討論��',
+'ipb-change-block'                => '利用這些設定�新�鎖用戶',
 'badipaddress'                    => 'IP地��正確。',
 'blockipsuccesssub'               => '查��功',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]]已經被查�。
@@ -1736,14 +1947,18 @@ $1',
 'ipb-unblock'                     => '解除��用戶�或IP地�',
 'ipb-blocklist-addr'              => '$1的�有��',
 'ipb-blocklist'                   => '檢視�有的��',
+'ipb-blocklist-contribs'          => '$1的貢�',
 'unblockip'                       => '解�用戶',
 'unblockiptext'                   => '用下�的表單來�復先�被查�的IP��或用戶的寫權�。',
-'ipusubmit'                       => '解�此地�',
+'ipusubmit'                       => '移除這個�鎖',
 'unblocked'                       => '[[User:$1|$1]] 的��已經解除。',
 'unblocked-id'                    => '�� $1 已經被移除',
 'ipblocklist'                     => '被�IP地�列表',
 'ipblocklist-legend'              => '�尋一�已經被查�的用戶',
 'ipblocklist-username'            => '用戶�稱或IP地�:',
+'ipblocklist-sh-userblocks'       => '$1次賬戶�鎖',
+'ipblocklist-sh-tempblocks'       => '$1次臨時�鎖',
+'ipblocklist-sh-addressblocks'    => '$1次單IP�鎖',
 'ipblocklist-submit'              => '�尋',
 'blocklistline'                   => '$1，$2��$3 ($4)',
 'infiniteblock'                   => '永久',
@@ -1752,25 +1967,32 @@ $1',
 'noautoblockblock'                => '�用自動查�',
 'createaccountblock'              => '�止創建賬戶',
 'emailblock'                      => '�止電�郵件',
+'blocklist-nousertalk'            => '��以編輯自己的�話�',
 'ipblocklist-empty'               => '查�列表為空。',
 'ipblocklist-no-results'          => '所�求的IP地�/用戶�沒有被查�。',
 'blocklink'                       => '查�',
 'unblocklink'                     => '解除��',
+'change-blocklink'                => '更改��',
 'contribslink'                    => '貢�',
 'autoblocker'                     => '你的IP和被�了的 "$1" 是一樣的。�鎖原因： "$2".',
 'blocklogpage'                    => '�鎖記錄',
+'blocklog-fulllog'                => '完整�鎖記錄',
 'blocklogentry'                   => '已�鎖[[$1]]，到期時間為$2 $3',
+'reblock-logentry'                => '更改[[$1]]的��設定時間 $2 $3',
 'blocklogtext'                    => '這是關於用戶��和解除���作的記錄。被自動��的IP地�沒有被列出。請�閱[[Special:IPBlockList|被查�的IP地�和用戶列表]]。',
 'unblocklogentry'                 => '[[$1]]已被解�',
 'block-log-flags-anononly'        => '僅�匿�用戶',
 'block-log-flags-nocreate'        => '�止此IP/用戶建立新帳戶',
 'block-log-flags-noautoblock'     => '�用自動��',
 'block-log-flags-noemail'         => '�止電�郵件',
+'block-log-flags-nousertalk'      => '��編輯自己的討論��',
 'block-log-flags-angry-autoblock' => '加強自動�鎖已啟用',
 'range_block_disabled'            => '�有管�員�能創建�止查�的範�。',
 'ipb_expiry_invalid'              => '無效的終止時間。',
 'ipb_expiry_temp'                 => '隱�用戶��鎖必須是永久性的。',
 'ipb_already_blocked'             => '已經�鎖"$1"',
+'ipb-needreblock'                 => '== 已經�鎖 ==
+$1已經被�鎖。您是�想更改這個設定？',
 'ipb_cant_unblock'                => '錯誤: 找�到查�ID$1。�能已經解除��。',
 'ipb_blocked_as_range'            => '錯誤: 該IP $1 無直接查�，��以解除��。但是它是在 $2 的查�範�之內，該段範�是�以解除��的。',
 'ip_range_invalid'                => '無效的IP範�。\\n',
@@ -1781,6 +2003,7 @@ $1',
 'proxyblocksuccess'               => '完�。\\n',
 'sorbsreason'                     => '您的IP��在{{SITENAME}}中被 DNSBL列為屬於開放代��務器。',
 'sorbs_create_account_reason'     => '由於您的IP��在{{SITENAME}}中被 DNSBL列為屬於開放代��務器，所以您無法建立帳號。',
+'cant-block-while-blocked'        => '當您被�鎖時��以�鎖其他用戶。',
 
 # Developer tools
 'lockdb'              => '�止更改資料庫',
@@ -1803,9 +2026,9 @@ $1',
 'databasenotlocked'   => '資料庫沒有鎖定。',
 
 # Move page
-'move-page'               => '移動$1',
-'move-page-legend'        => '移動��',
-'movepagetext'            => "用下�的表單來�新命�一個��，並將其修訂歷��時移動到新��。
+'move-page'                    => '移動$1',
+'move-page-legend'             => '移動��',
+'movepagetext'                 => "用下�的表單來�新命�一個��，並將其修訂歷��時移動到新��。
 �的��將�為新��的�定��。
 您�以自動地更新指到原標題的�定�。
 如果您�擇�去�的話，請檢查[[Special:DoubleRedirects|雙�]]或[[Special:BrokenRedirects|�壞�定�]]連�。
@@ -1819,49 +2042,63 @@ $1',
 <b>警告�</b>
 �一個經常被訪�的��而言這�能是一個�大與��的更改；
 請在行動�先了�其所�能帶來的後果。",
-'movepagetalktext'        => "有關的�話�（如果有的話）將被自動與該��一起移動，'''除�'''：
+'movepagetalktext'             => "有關的�話�（如果有的話）將被自動與該��一起移動，'''除�'''：
 *您將��移動到��的�字空間；
 *新��已經有一個包�內容的�話�，或者
 *您�勾�下�的覆�框。
 
 在這些情�下，您在必�時必須手工移動或�併��。",
-'movearticle'             => '移動��:',
-'movenotallowed'          => '您並沒有許�權去移動��。',
-'newtitle'                => '新標題:',
-'move-watch'              => '監視此�',
-'movepagebtn'             => '移動��',
-'pagemovedsub'            => '移動�功',
-'movepage-moved'          => "<big>'''「$1�已經移動到「$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
-'articleexists'           => '該�字的��已經存在，或者您�擇的�字無效。請��一個�字。',
-'cantmove-titleprotected' => '您��以移動這個��到這個�置，因為該新標題已經被�護以防止建立。',
-'talkexists'              => '��本身移動�功，
+'movearticle'                  => '移動��:',
+'movenologin'                  => '未登入',
+'movenologintext'              => '您必須是一�登記用戶並且[[Special:UserLogin|登入]]
+後��移動一個��。',
+'movenotallowed'               => '您並沒有許�權去移動��。',
+'movenotallowedfile'           => '您並沒有許�權去移動檔案。',
+'cant-move-user-page'          => '您並沒有許�權去移動用戶��（它的字��除外）。',
+'cant-move-to-user-page'       => '您並沒有許�權去移動到用戶��（它的字��除外）。',
+'newtitle'                     => '新標題:',
+'move-watch'                   => '監視此�',
+'movepagebtn'                  => '移動��',
+'pagemovedsub'                 => '移動�功',
+'movepage-moved'               => "<big>'''「$1�已經移動到「$2�'''</big>", # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
+'movepage-moved-redirect'      => '一個�新定�已經被創建。',
+'movepage-moved-noredirect'    => '已經壓制創建�新定�。',
+'articleexists'                => '該�字的��已經存在，或者您�擇的�字無效。請��一個�字。',
+'cantmove-titleprotected'      => '您��以移動這個��到這個�置，因為該新標題已經被�護以防止建立。',
+'talkexists'                   => '��本身移動�功，
 但是由於新標題下已經有�話�存在，所以�話�無法移動。請手工�併兩個��。',
-'movedto'                 => '移動到',
-'movetalk'                => '如果�能的話，�時移動�話�。',
-'move-subpages'           => '如果�能的話，�時移動所有的���',
-'move-talk-subpages'      => '如果�能的話，�時移動所有的��話��',
-'movepage-page-exists'    => '��$1已經存在，��以自動地覆寫。',
-'movepage-page-moved'     => '��$1已經移動到$2。',
-'movepage-page-unmoved'   => '��$1��以移動到$2。',
-'movepage-max-pages'      => '最多有$1個��已經移動�時��以自動地�移動更多。',
-'1movedto2'               => '[[$1]]移動到[[$2]]',
-'1movedto2_redir'         => '[[$1]]���定�移動到[[$2]]',
-'movelogpage'             => '移動日誌',
-'movelogpagetext'         => '以下是已經移動的��清單:',
-'movereason'              => '原因',
-'revertmove'              => '�復該移動',
-'delete_and_move'         => '刪除並移動',
-'delete_and_move_text'    => '==需�刪除==
+'movedto'                      => '移動到',
+'movetalk'                     => '如果�能的話，�時移動�話�。',
+'move-subpages'                => '如果�能的話，�時移動所有的���',
+'move-talk-subpages'           => '如果�能的話，�時移動所有的��話��',
+'movepage-page-exists'         => '��$1已經存在，��以自動地覆寫。',
+'movepage-page-moved'          => '��$1已經移動到$2。',
+'movepage-page-unmoved'        => '��$1��以移動到$2。',
+'movepage-max-pages'           => '最多有$1個��已經移動�時��以自動地�移動更多。',
+'1movedto2'                    => '[[$1]]移動到[[$2]]',
+'1movedto2_redir'              => '[[$1]]���定�移動到[[$2]]',
+'move-redirect-suppressed'     => '�新定�已壓制',
+'movelogpage'                  => '移動日誌',
+'movelogpagetext'              => '以下是所有移動的��清單:',
+'movereason'                   => '原因',
+'revertmove'                   => '�復該移動',
+'delete_and_move'              => '刪除並移動',
+'delete_and_move_text'         => '==需�刪除==
 
 目標��"[[:$1]]"已經存在。你確�需�刪除原��並以進行移動嗎？',
-'delete_and_move_confirm' => '是的，刪除此��',
-'delete_and_move_reason'  => '刪除以便移動',
-'selfmove'                => '原始標題與目標標題相�，您�能移動一�覆蓋本身。',
-'immobile_namespace'      => '目標標題屬於特別類型；�能將��移入這個�字空間。',
-'imagenocrossnamespace'   => '��以移動檔案到�檔案�字空間',
-'imagetypemismatch'       => '該新副檔��匹�它的類型',
-'imageinvalidfilename'    => '目標檔案�稱是無效的',
-'fix-double-redirects'    => '更新指到原先標題的任何�新定�',
+'delete_and_move_confirm'      => '是的，刪除此��',
+'delete_and_move_reason'       => '刪除以便移動',
+'selfmove'                     => '原始標題與目標標題相�，您�能移動一�覆蓋本身。',
+'immobile-source-namespace'    => '��以在空間�「$1�上移動��',
+'immobile-target-namespace'    => '��以將��移動到「$1�空間�中',
+'immobile-target-namespace-iw' => '垮維基連�在移動��中是無效的目標。',
+'immobile-source-page'         => '這個���能移動。',
+'immobile-target-page'         => '無法移動至目標標題中。',
+'imagenocrossnamespace'        => '��以移動檔案到�檔案�字空間',
+'imagetypemismatch'            => '該新副檔��匹�它的類型',
+'imageinvalidfilename'         => '目標檔案�稱是無效的',
+'fix-double-redirects'         => '更新指到原先標題的任何�新定�',
+'move-leave-redirect'          => '留下�新定�',
 
 # Export
 'export'            => '匯出��',
@@ -1882,12 +2119,12 @@ $1',
 'export-templates'  => '包�模版',
 
 # Namespace 8 related
-'allmessages'               => '系統介�',
+'allmessages'               => '系統界�',
 'allmessagesname'           => '�稱',
 'allmessagesdefault'        => '�設的文字',
 'allmessagescurrent'        => '當�的文字',
-'allmessagestext'           => '這裡列出所有�定製的系統介�。
-如果想貢�正宗的MediaWiki本地化的話，請�閱[http://www.mediawiki.org/wiki/Localisation MediaWiki本地化]以�[http://translatewiki.net Betawiki]。',
+'allmessagestext'           => '這裡列出所有�定製的系統界�。
+如果想貢�正宗的MediaWiki本地化的話，請�閱[http://www.mediawiki.org/wiki/Localisation MediaWiki本地化]以�[http://translatewiki.net translatewiki.net]。',
 'allmessagesnotsupportedDB' => "這個��無法使用，因為'''\$wgUseDatabaseMessages'''已被設定關閉。",
 'allmessagesfilter'         => '正則表���濾�件：',
 'allmessagesmodified'       => '僅顯示修改�的',
@@ -1907,9 +2144,12 @@ $1',
 'import-interwiki-text'      => '�擇一個 wiki 和��標題以進行匯入。
 修訂日期和編輯者�字將�時被儲存。
 所有的跨 wiki 匯入�作被記錄在[[Special:Log/import|匯入日誌]]。',
+'import-interwiki-source'    => '來�維基���：',
 'import-interwiki-history'   => '複製此�的所有歷�版本',
 'import-interwiki-submit'    => '匯入',
 'import-interwiki-namespace' => '目的�字空間:',
+'import-upload-filename'     => '檔案�：',
+'import-comment'             => '註解:',
 'importtext'                 => '請使用[[Special:Export|匯出功能]]從� wiki 匯出檔案，
 儲存到您的�片並上傳到這裡。',
 'importstart'                => '正在匯入��...',
@@ -1944,21 +2184,21 @@ $1',
 'import-logentry-interwiki-detail' => '來自$2的$1個修訂',
 
 # Tooltip help for the actions
-'tooltip-pt-userpage'             => '我的用戶�',
+'tooltip-pt-userpage'             => '您的用戶�',
 'tooltip-pt-anonuserpage'         => '您編輯本站所用IP的�應用戶�',
-'tooltip-pt-mytalk'               => '我的�話�',
+'tooltip-pt-mytalk'               => '您的�話�',
 'tooltip-pt-anontalk'             => '�於來自此IP地�編輯的�話',
-'tooltip-pt-preferences'          => '我的�數設置',
-'tooltip-pt-watchlist'            => '我的監視列表',
-'tooltip-pt-mycontris'            => '我的貢�列表',
+'tooltip-pt-preferences'          => '您的�數設置',
+'tooltip-pt-watchlist'            => '您所監視��的更改列表',
+'tooltip-pt-mycontris'            => '您的貢�列表',
 'tooltip-pt-login'                => '建議您登入，儘管並�必須。',
 'tooltip-pt-anonlogin'            => '建議您登入，儘管並�必須。',
 'tooltip-pt-logout'               => '登出',
 'tooltip-ca-talk'                 => '關於��正文的討論',
 'tooltip-ca-edit'                 => '您�以編輯此�，請在�存之�先�覽一下。',
-'tooltip-ca-addsection'           => '於本討論�增加新的討論主題',
+'tooltip-ca-addsection'           => '開始一個新�節',
 'tooltip-ca-viewsource'           => '該��已被�護。你�以查看該�原始碼。',
-'tooltip-ca-history'              => '本��的早�版本。',
+'tooltip-ca-history'              => '本��的早�版本',
 'tooltip-ca-protect'              => '�護該��',
 'tooltip-ca-delete'               => '刪除本�',
 'tooltip-ca-undelete'             => '將這個���復到被刪除以�的狀態',
@@ -1968,7 +2208,7 @@ $1',
 'tooltip-search'                  => '�尋該網站',
 'tooltip-search-go'               => '如果相�的標題存在的話便直接�往該��',
 'tooltip-search-fulltext'         => '�尋該文字的��',
-'tooltip-p-logo'                  => '首�',
+'tooltip-p-logo'                  => '訪�首�',
 'tooltip-n-mainpage'              => '訪�首�',
 'tooltip-n-portal'                => '關於本計劃�你�以�什麼�應該如何�',
 'tooltip-n-currentevents'         => '�供當�新�事件的背景資料',
@@ -2003,6 +2243,8 @@ $1',
 'tooltip-watch'                   => '將此�加入您的監視列表',
 'tooltip-recreate'                => '�建該��，無論是�被刪除。',
 'tooltip-upload'                  => '開始上傳',
+'tooltip-rollback'                => '『�轉��以一按�復上一�貢�者�這個��的編輯',
+'tooltip-undo'                    => '『復原��以在編輯模�上開啟編輯表格以便復原。容許在摘�中加入原因',
 
 # Stylesheets
 'common.css'      => '/* 此處的 CSS 將應用於所有的�� */',
@@ -2014,6 +2256,8 @@ $1',
 'chick.css'       => '/* 此處的 CSS 將影響使用 Chick ��的用戶 */',
 'simple.css'      => '/* 此處的 CSS 將影響使用 Simple ��的用戶 */',
 'modern.css'      => '/* 此處的 CSS 將影響使用 Modern ��的用戶 */',
+'print.css'       => '/* 此處的 CSS 將影響打�輸出 */',
+'handheld.css'    => '/* 此處的 CSS 將影響在 $wgHandheldStyle 設定手��置�� */',
 
 # Scripts
 'common.js'      => '/* 此處的JavaScript將載入於所有用戶�一個��。 */',
@@ -2032,12 +2276,12 @@ $1',
 'notacceptable'     => '該網站伺�器�能�供您的客戶端能識別的數據格�。',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}的匿�用戶',
+'anonymous'        => '{{SITENAME}}的匿�{{PLURAL:$1|用戶|用戶}}',
 'siteuser'         => '{{SITENAME}}用戶$1',
 'lastmodifiedatby' => '此�由$3於$1 $2的最後更改。', # $1 date, $2 time, $3 user
 'othercontribs'    => '在$1的工作基礎上。',
 'others'           => '其他',
-'siteusers'        => '{{SITENAME}}用戶$1',
+'siteusers'        => '{{SITENAME}}{{PLURAL:$2|用戶|用戶}}$1',
 'creditspage'      => '��致�',
 'nocredits'        => '該�沒有致��單訊�。',
 
@@ -2058,6 +2302,12 @@ $1',
 'numauthors'     => '作者數� (��): $1',
 'numtalkauthors' => '作者數� (討論�): $1',
 
+# Skin names
+'skinname-standard'    => '標準',
+'skinname-nostalgia'   => '懷舊',
+'skinname-cologneblue' => '科隆香水�',
+'skinname-modern'      => '�代',
+
 # Math options
 'mw_math_png'    => '永�使用PNG圖�',
 'mw_math_simple' => '如果是簡單的公�使用HTML，�則使用PNG圖�',
@@ -2070,7 +2320,7 @@ $1',
 'markaspatrolleddiff'                 => '標記為已檢查',
 'markaspatrolledtext'                 => '標記此��為已檢查',
 'markedaspatrolled'                   => '標記為已檢查',
-'markedaspatrolledtext'               => '�定的版本已被標記為已檢查.',
+'markedaspatrolledtext'               => '�定的版本已被標記為已檢查。',
 'rcpatroldisabled'                    => '最新更改檢查被關閉',
 'rcpatroldisabledtext'                => '最新更改檢查的功能目�已關閉。',
 'markedaspatrollederror'              => '�能標誌為已檢查',
@@ -2078,10 +2328,12 @@ $1',
 'markedaspatrollederror-noautopatrol' => '您無法將你自己所作的更改標記為已檢查。',
 
 # Patrol log
-'patrol-log-page'   => '巡查日誌',
-'patrol-log-header' => '這個是已經巡查�的日誌。',
-'patrol-log-line'   => '$2的版本$1已被標記為已檢查的$3',
-'patrol-log-auto'   => '(自動)',
+'patrol-log-page'      => '巡查日誌',
+'patrol-log-header'    => '這個是已經巡查�的日誌。',
+'patrol-log-line'      => '$2的版本$1已被標記為已檢查的$3',
+'patrol-log-auto'      => '(自動)',
+'patrol-log-diff'      => '修訂 $1',
+'log-show-hide-patrol' => '$1巡查記錄',
 
 # Image deletion
 'deletedrevision'                 => '已刪除舊版本$1',
@@ -2098,6 +2350,9 @@ $1',
 'previousdiff' => '�上一版本',
 'nextdiff'     => '下一版本→',
 
+# Visual comparison
+'visual-comparison' => '�見比較',
+
 # Media information
 'mediawarning'         => "'''警告''': 該檔案�能包�惡�代碼，執行它�能�您的系統帶來�險。<hr />",
 'imagemaxsize'         => '在圖��述��檔案大��制為:',
@@ -2110,10 +2365,12 @@ $1',
 'show-big-image'       => '完整解�度',
 'show-big-image-thumb' => '<small>這幅縮圖的解�度: $1 × $2 �素</small>',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages'             => '新建圖�畫廊',
 'imagelisttext'         => "以下是按$2排列的'''$1'''個檔案列表。",
 'newimages-summary'     => '這個特殊��中顯示最後已上傳的檔案。',
+'newimages-legend'      => '�濾',
+'newimages-label'       => '檔案�稱（或它的一部份）:',
 'showhidebots'          => '($1機器人)',
 'noimages'              => '無�檢視圖�。',
 'ilsubmit'              => '�尋',
@@ -2334,6 +2591,18 @@ Variants for Chinese language
 'exif-lightsource-24'  => 'ISO�影棚鎢燈',
 'exif-lightsource-255' => '其他光�',
 
+# Flash modes
+'exif-flash-fired-0'    => '閃光燈無開�',
+'exif-flash-fired-1'    => '閃光燈開�',
+'exif-flash-return-0'   => '無頻閃觀測器功能',
+'exif-flash-return-2'   => '頻閃觀測器未�測到光',
+'exif-flash-return-3'   => '頻閃觀測器�測到光',
+'exif-flash-mode-1'     => '強制閃光燈開�',
+'exif-flash-mode-2'     => '強制壓制閃光燈',
+'exif-flash-mode-3'     => '自動模�',
+'exif-flash-function-1' => '無閃光燈功能',
+'exif-flash-redeye-1'   => '紅眼減退模�',
+
 'exif-focalplaneresolutionunit-2' => '英寸',
 
 'exif-sensingmethod-1' => '未定義',
@@ -2475,19 +2744,10 @@ $1
 請確�在您�新創建���三�。',
 'recreate'            => '�建',
 
-# HTML dump
-'redirectingto' => '�定�到[[:$1]]...',
-
 # action=purge
-'confirm_purge'        => '�清除此��的快�嗎?\\n\\n$1',
 'confirm_purge_button' => '確定',
-
-# AJAX search
-'searchcontaining' => "�索包�''$1''的��。",
-'searchnamed'      => "�索�稱為''$1''的��。",
-'articletitles'    => '��以"$1"開頭',
-'hideresults'      => '隱��果',
-'useajaxsearch'    => '使用AJAX�索',
+'confirm-purge-top'    => '�清除此��的快�嗎?',
+'confirm-purge-bottom' => '清�一�將會清除快�以�強迫顯示最�時之版本。',
 
 # Multipage image navigation
 'imgmultipageprev' => '� 上一�',
@@ -2507,10 +2767,10 @@ $1
 'table_pager_empty'        => '沒有�果',
 
 # Auto-summaries
-'autosumm-blank'   => '移除所有��內容',
-'autosumm-replace' => "正在將��替�為 '$1'",
-'autoredircomment' => '正在�定�到 [[$1]]',
-'autosumm-new'     => '新��: $1',
+'autosumm-blank'   => '清空��',
+'autosumm-replace' => "替�內容為 '$1'",
+'autoredircomment' => '�定���到 [[$1]]',
+'autosumm-new'     => "創建新��為 '$1'",
 
 # Size units
 'size-bytes' => '$1 �元組',
@@ -2549,6 +2809,7 @@ $1
 
 # Core parser functions
 'unknown_extension_tag' => '�明的擴展標籤 "$1"',
+'duplicate-defaultsort' => '警告: �設的排�� "$2" 覆蓋先�的�設排�� "$1"。',
 
 # Special:Version
 'version'                          => '版本', # Not used as normal message but as header for the special page itself
@@ -2577,13 +2838,13 @@ $1
 'filepath-submit'  => '�尋路徑',
 'filepath-summary' => '這個特殊��擷�一個檔案的完整路徑。圖�會以完整的解�度顯示，其它的檔案類型會以�它們已關�程�啟動。
 
-請輸入檔�，��包�"{{ns:image}}:"開頭。',
+請輸入檔�，��包�"{{ns:file}}:"開頭。',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch'          => '�擇�覆檔案',
 'fileduplicatesearch-summary'  => '用�覆檔案的切細值去找出檔案是��覆。
 
-輸入檔�時�需�輸入 "{{ns:image}}:" 開頭。',
+輸入檔�時�需�輸入 "{{ns:file}}:" 開頭。',
 'fileduplicatesearch-legend'   => '找�覆',
 'fileduplicatesearch-filename' => '檔案�稱:',
 'fileduplicatesearch-submit'   => '找',
@@ -2611,6 +2872,15 @@ $1
 
 # Special:BlankPage
 'blankpage'              => '空白��',
-'intentionallyblankpage' => '這個��是為空白，以用來作測試速度等用途',
+'intentionallyblankpage' => '這個��是為空白',
+
+# External image whitelist
+'external_image_whitelist' => ' #留下這行一樣的文字<pre>
+#在下�（//之中間部份）輸入正�表��
+#這些將會跟外部（已超連�的）圖���
+#那些��到出來的會顯示�圖�，�則就�會顯示�連�
+#有 # 開頭的行會當�註解
+
+#在這行上�輸入所有的regex。留下這行一樣的文字</pre>',
 
 );
diff --git a/languages/messages/MessagesZh_hk.php b/languages/messages/MessagesZh_hk.php
index 89ac4ad4..ff6cb64c 100644
--- a/languages/messages/MessagesZh_hk.php
+++ b/languages/messages/MessagesZh_hk.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Yuyu
  */
 
 $fallback = 'zh-hant';
@@ -12,6 +13,47 @@ $messages = array(
 # User preference toggles
 'tog-watchlisthidebots' => '監視列表中隱�機械人的編輯',
 
+# Dates
+'sunday'        => '星期日',
+'monday'        => '星期一',
+'tuesday'       => '星期二',
+'wednesday'     => '星期三',
+'thursday'      => '星期四',
+'friday'        => '星期五',
+'saturday'      => '星期六',
+'sun'           => 'æ—¥',
+'mon'           => '一',
+'tue'           => '二',
+'wed'           => '三',
+'thu'           => 'å››',
+'fri'           => '五',
+'sat'           => 'å…­',
+'january'       => '1月',
+'february'      => '2月',
+'march'         => '3月',
+'april'         => '4月',
+'may_long'      => '5月',
+'june'          => '6月',
+'july'          => '7月',
+'august'        => '8月',
+'september'     => '9月',
+'october'       => '10月',
+'november'      => '11月',
+'december'      => '12月',
+'january-gen'   => '一月',
+'february-gen'  => '二月',
+'march-gen'     => '三月',
+'april-gen'     => '四月',
+'may-gen'       => '五月',
+'june-gen'      => '六月',
+'july-gen'      => '七月',
+'august-gen'    => '八月',
+'september-gen' => '�月',
+'october-gen'   => '�月',
+'november-gen'  => '�一月',
+'december-gen'  => '�二月',
+'jan'           => '1月',
+
 'printableversion' => '�打�版',
 'print'            => '打�',
 
@@ -29,14 +71,10 @@ $messages = array(
 # Recent changes
 'rcshowhidebots' => '$1機械人的編輯',
 
-# Watchlist
-'watchlist-show-bots' => '顯示機械人的編輯',
-'watchlist-hide-bots' => '隱�機械人的編輯',
-
 # Tooltip help for the actions
 'tooltip-t-print' => '這個��的�打�版本',
 
-# Special:NewImages
+# Special:NewFiles
 'showhidebots' => '($1機械人)',
 
 );
diff --git a/languages/messages/MessagesZh_min_nan.php b/languages/messages/MessagesZh_min_nan.php
index 707faefd..d4574cbf 100644
--- a/languages/messages/MessagesZh_min_nan.php
+++ b/languages/messages/MessagesZh_min_nan.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Min Nan (Bân-lâm-gú/閩�話)
+/** Min Nan (Bân-lâm-gú/閩�話)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesZh_mo.php b/languages/messages/MessagesZh_mo.php
index fac8ae03..986a074b 100644
--- a/languages/messages/MessagesZh_mo.php
+++ b/languages/messages/MessagesZh_mo.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Chinese (Macau) (中文 (澳門))
+/** ‪Chinese (Macau) (‪中文(澳門)‬)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesZh_my.php b/languages/messages/MessagesZh_my.php
index 56aea6f7..69336742 100644
--- a/languages/messages/MessagesZh_my.php
+++ b/languages/messages/MessagesZh_my.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Chinese (Malaysia) (中文 (马�西亚))
+/** ‪Chinese (Malaysia)‬ (‪中文(马�西亚)‬)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesZh_sg.php b/languages/messages/MessagesZh_sg.php
index 2130b9fa..f6842f92 100644
--- a/languages/messages/MessagesZh_sg.php
+++ b/languages/messages/MessagesZh_sg.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Chinese (Singapore) (中文 (新加�))
+/** ‪Chinese (Singapore) (‪中文(新加�)‬)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php
index 1695d642..08558162 100644
--- a/languages/messages/MessagesZh_tw.php
+++ b/languages/messages/MessagesZh_tw.php
@@ -4,6 +4,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Alexsh
  * @author BobChao
  * @author Roc michael
  * @author Urhixidur
@@ -20,9 +21,9 @@ $namespaceNames = array(
 	NS_USER             => '使用者',
 	NS_USER_TALK        => '使用者討論',
 	# NS_PROJECT set by $wgMetaNamespace
-	NS_PROJECT_TALK     => '$1�話',
-	NS_IMAGE            => '圖片',
-	NS_IMAGE_TALK       => '圖片討論',
+	NS_PROJECT_TALK     => '$1討論',
+	NS_FILE             => '圖片',
+	NS_FILE_TALK        => '圖片討論',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => '模�',
@@ -33,11 +34,6 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => '分類討論'
 );
 
-$skinNames = array(
-	'standard' => '標準',
-	'nostalgia' => '懷舊',
-	'cologneblue' => '科隆香水�',
-);
 
 $bookstoreList = array(
 	'�客來書店' => 'http://www.books.com.tw/exep/prod/booksfile.php?item=$1',
@@ -93,8 +89,6 @@ $messages = array(
 'underline-never'   => '從�使用',
 'underline-default' => '�覽器�設',
 
-'skinpreview' => '(�覽)',
-
 # Dates
 'sunday'        => '星期日',
 'monday'        => '星期一',
@@ -183,7 +177,7 @@ $messages = array(
 'mytalk'         => '我的�話�',
 'anontalk'       => '該IP的�話�',
 'navigation'     => '導航',
-'and'            => '和',
+'and'            => '&#32;和',
 
 # Metadata in edit box
 'metadata_help' => '元數據:',
@@ -224,7 +218,7 @@ $messages = array(
 'views'             => '檢視',
 'toolbox'           => '工具箱',
 'userpage'          => '查看使用者��',
-'projectpage'       => '查看計劃��',
+'projectpage'       => '查看計畫��',
 'imagepage'         => '查看圖片��',
 'mediawikipage'     => '檢視使用者介�訊�',
 'templatepage'      => '檢視模���',
@@ -234,7 +228,7 @@ $messages = array(
 'otherlanguages'    => '其它語言',
 'redirectedfrom'    => '(�定�自$1)',
 'redirectpagesub'   => '�定���',
-'lastmodifiedat'    => '本�最後更動時間：$1 $2。', # $1 date, $2 time
+'lastmodifiedat'    => '本�最後更動時間在 $1 $2。', # $1 date, $2 time
 'viewcount'         => '本��已經被�覽$1次。',
 'protectedpage'     => '被�護�',
 'jumpto'            => '跳轉到:',
@@ -244,8 +238,6 @@ $messages = array(
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite'            => '關於{{SITENAME}}',
 'aboutpage'            => 'Project:關於',
-'bugreports'           => '錯誤報告',
-'bugreportspage'       => 'Project:錯誤報告',
 'copyright'            => '本站的文字內容除�有�明外，全部以 $1 �款授權使用。',
 'copyrightpagename'    => '{{SITENAME}}版權',
 'copyrightpage'        => '{{ns:project}}:版權訊�',
@@ -268,9 +260,7 @@ $messages = array(
 
 'badaccess'        => '權�錯誤',
 'badaccess-group0' => '您剛�的請求��許執行。',
-'badaccess-group1' => '您剛�的請求�有$1使用者組的使用者�能使用。',
-'badaccess-group2' => '您剛�的請求�有$1使用者組的使用者�能使用。',
-'badaccess-groups' => '您剛�的請求�有$1使用者組的使用者�能使用。',
+'badaccess-groups' => '您剛�的請求�有{{PLURAL:$2|這個|這些}}使用者組的使用者�能使用: $1',
 
 'versionrequired'     => '需�MediaWiki $1 版',
 'versionrequiredtext' => '需�版本$1的 MediaWiki �能使用此�。�見[[Special:Version|版本�]]。',
@@ -301,7 +291,7 @@ $messages = array(
 'nstab-user'      => '使用者��',
 'nstab-media'     => '媒體��',
 'nstab-special'   => '特殊��',
-'nstab-project'   => '計劃��',
+'nstab-project'   => '計畫��',
 'nstab-image'     => '檔案',
 'nstab-mediawiki' => '介�',
 'nstab-template'  => '模�',
@@ -355,7 +345,6 @@ MySQL返回錯誤「$3: $4�。',
 'cannotdelete'         => '無法刪除�定的��或圖片（它�能已經被其他人刪除了）。',
 'badtitle'             => '錯誤的標題',
 'badtitletext'         => '所請求��的標題是無效的��存在，跨語言或跨wiki連�的標題錯誤。',
-'perfdisabled'         => '抱歉�由於此項�作有�能造�資料庫癱瘓，目�暫時無法使用。',
 'perfcached'           => '下列是快�資料，因此�能�是最新的:',
 'perfcachedts'         => '下列是快�資料，其最後更新時間是$1。',
 'querypage-no-updates' => '當��止�此��進行更新。此處的資料將�能被立��新整�。',
@@ -387,7 +376,6 @@ $2',
 'remembermypassword'         => '下次登入記�密碼。',
 'yourdomainname'             => '您的網域:',
 'externaldberror'            => '這�能是由於驗證資料庫錯誤或您被�止更新您的外部帳號。',
-'loginproblem'               => '<b>登入有�題。</b><br />�試一次�',
 'login'                      => '登入',
 'nav-login-createaccount'    => '登入�建立新帳號',
 'loginprompt'                => '您必須�許�覽器紀錄Cookie�能�功登入 {{SITENAME}} 並順利進行�作',
@@ -417,7 +405,7 @@ $2',
 'loginerror'                 => '登入錯誤',
 'prefs-help-email'           => '電�郵件是�填的，但當啟用它後�以在您沒有公開自己的使用者身分時��您的使用者�或使用者討論�與您�繫。',
 'prefs-help-email-required'  => '需�電�郵件地�。',
-'nocookiesnew'               => '已�功建立新賬戶��測到您已關閉 Cookies，請開啟它並登入。',
+'nocookiesnew'               => '已�功建立新帳戶��測到您已關閉 Cookies，請開啟它並登入。',
 'nocookieslogin'             => '本站利用 Cookies 進行使用者登入，�測到您已關閉 Cookies，請開啟它並�新登入。',
 'noname'                     => '你沒有輸入一個有效的使用者帳號。',
 'loginsuccesstitle'          => '登入�功',
@@ -442,13 +430,13 @@ $2',
 'acct_creation_throttle_hit' => '��起，您已經註冊了$1帳號。你�能�註冊了。',
 'emailauthenticated'         => '您的電�郵件地�已經於$1確�有效。',
 'emailnotauthenticated'      => '您的電�郵件地�<strong>還沒被�証</strong>。以下功能將�會發�任何郵件。',
-'noemailprefs'               => '<strong>指定一個電�郵件地�以使用此功能</strong>',
+'noemailprefs'               => '指定一個電�郵件地�以使用此功能',
 'emailconfirmlink'           => '確�您的電�郵件地�',
 'invalidemailaddress'        => '電�郵件地�格��正確，請輸入正確的電�郵件地�或清空該輸入框。',
 'accountcreated'             => '已建立帳號',
 'accountcreatedtext'         => '$1的帳號已經被建立。',
 'createaccount-title'        => '在{{SITENAME}}中建立新帳號',
-'createaccount-text'         => '有人 在{{SITENAME}}中為 $2 建立了一個新帳號($4)。 "$2" 的密碼是 "$3" 。您應該立�登入並更改密碼。
+'createaccount-text'         => '有人在{{SITENAME}}中為 $2 建立了一個新帳號($4)。 "$2" 的密碼是 "$3" 。您應該立�登入並更改密碼。
 
 如果該帳號建立錯誤的話，您�以忽略此信�。',
 'loginlanguagelabel'         => '語言: $1',
@@ -458,11 +446,13 @@ $2',
 'resetpass_announce'      => '您是��臨時發�到郵件中的代碼登入的。�完�登入，您必須在這裡設定一個新密碼:',
 'resetpass_text'          => '<!-- 在此處加入文字 -->',
 'resetpass_header'        => '�設密碼',
+'oldpassword'             => '舊密碼',
+'newpassword'             => '新密碼',
+'retypenew'               => '確�密碼:',
 'resetpass_submit'        => '設定密碼並登入',
 'resetpass_success'       => '您的密碼已經被�功更改﹗�下正為您登入...',
 'resetpass_bad_temporary' => '無效的臨時密碼。您�能已�功地更改了您的密碼，或者需�請求一個新的臨時密碼。',
 'resetpass_forbidden'     => '無法在此 wiki 上更改密碼',
-'resetpass_missing'       => '無表單資料。',
 
 # Edit page toolbar
 'bold_sample'     => '粗體文字',
@@ -486,7 +476,7 @@ $2',
 
 # Edit pages
 'summary'                   => '摘�',
-'subject'                   => '主題',
+'subject'                   => '主題:',
 'minoredit'                 => '這是一個細微修改',
 'watchthis'                 => '監視本�',
 'savearticle'               => '�存本�',
@@ -498,33 +488,9 @@ $2',
 'missingsummary'            => "'''�示:''' 您沒有�供一個編輯摘�。如果您�次單擊儲存，您的編輯將�帶編輯摘�儲存。",
 'missingcommenttext'        => '請在下�輸入評論。',
 'missingcommentheader'      => "'''�示:''' 您沒有為此評論�供一個標題。如果您�次單擊儲存，您的編輯將�帶標題儲存。",
-'summary-preview'           => '摘��覽',
-'subject-preview'           => '主題/標題�覽',
+'summary-preview'           => '摘��覽:',
+'subject-preview'           => '主題/標題�覽:',
 'blockedtitle'              => '使用者被�鎖',
-'blockedtext'               => "<big>你的使用者�或IP地�已經被$1�鎖。</big>
-
-這次�鎖是由$1所�的。當中的原因是''$2''。
-
-* 這次�鎖開始的時間是：$8
-* 這次�鎖到期的時間是：$6
-* �於被�鎖者：$7
-
-你�以�絡$1或者其他的[[{{MediaWiki:Grouppage-sysop}}|管�員]]，討論這次�鎖。
-除�你已經在你的[[Special:Preferences|帳號�好設定]]中設定了一個有效的電�郵件地�，�則你是�能使用「E-mail這�使用者�的功能。當設定了一個有效的電�郵件地�後，這個功能是�會�鎖的。
-
-你目�的IP地�是$3，而該�鎖ID是 #$5。 請你在所有查詢中註明這地���或�鎖ID。",
-'autoblockedtext'           => "由於先�的��使用者被$1所�鎖，故你的IP地�已經被自動�鎖。
-而�鎖的原因是：
-
-:''$2''
-
-* 這次�鎖的開始時間是：$8
-* 這次�鎖的到期時間是：$6
-
-你�以�絡$1或者其他的[[{{MediaWiki:Grouppage-sysop}}|管�員]]，討論這次�鎖。
-除�你已經在你的[[Special:Preferences|帳號�好設定]]中設定了一個有效的電�郵件地�，�則你是�能使用「E-mail這�使用者�的功能。當設定了一個有效的電�郵件地�後，這個功能是�會�鎖的。
-
-您的�鎖ID是 #$5。 請你在所有查詢中註明這個�鎖ID。",
 'blockednoreason'           => '無給出原因',
 'blockedoriginalsource'     => "以下是'''$1'''的原始碼:",
 'blockededitsource'         => "你�'''$1'''進行'''編輯'''的文字如下:",
@@ -547,18 +513,18 @@ $2',
 'noarticletext'             => '此�目�沒有內容，您�以在其它�[[Special:Search/{{PAGENAME}}|�尋此�標題]]或[{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} 編輯此�]。',
 'userpage-userdoesnotexist' => '使用者帳號「$1�未曾建立。請在建立�編輯這個���先檢查一下。',
 'clearyourcache'            => "'''注�:''' 在儲存以後, 您必須清除�覽器的快��能看到所作出的改變。 '''Mozilla / Firefox / Safari:''' 按著 ''Shift'' �點擊''�新整�''(或按下''Ctrl-Shift-R''，在蘋果Mac上按下''Cmd-Shift-R'')；'''IE:''' 按著 ''Ctrl'' �點擊 ''�新整�''，或按下 ''Ctrl-F5''；'''Konqueror:''' �需點擊 ''�新整�''；'''Opera:''' 使用者需�在 ''工具-設定'' 中完整地清除它們的快�。",
-'usercssjsyoucanpreview'    => "<strong>�示:</strong> 在�存�請用'顯示�覧'按鈕來測試您新的 CSS/JS 。",
+'usercssjsyoucanpreview'    => "'''�示:''' 在�存�請用'顯示�覧'按鈕來測試您新的 CSS/JS 。",
 'usercsspreview'            => "'''注�您�是在�覽您的個人 CSS, 還沒有儲存﹗'''",
 'userjspreview'             => "'''注�您�是在測試��覽您的個人 JavaScript，還沒有儲存﹗'''",
 'userinvalidcssjstitle'     => "'''警告:''' �存在��\"\$1\"。注�自訂的 .css 和 .js ��使用�寫標題，例如，{{ns:user}}:Foo/monobook.css ��於 {{ns:user}}:Foo/Monobook.css。",
 'updated'                   => '(已更新)',
-'note'                      => '<strong>注�:</strong>',
-'previewnote'               => '<strong>請記�這�是�覽，內容還未�存�</strong>',
+'note'                      => "'''注�:'''",
+'previewnote'               => "'''請記�這�是�覽，內容還未�存�'''",
 'previewconflict'           => '這個�覽顯示了上�文字編輯�中的內容。它將在你�擇�存後出�。',
-'session_fail_preview'      => '<strong>很抱歉�由於部份資料�失，我們無法處�您的編輯。請�試一次，如果�然失敗，請登出後�新登入。</strong>',
-'session_fail_preview_html' => '<strong>很抱歉�部份資料已�失，我們無法處�您的編輯。</strong><strong>如果這個編輯�程沒有�題，請�試一次。如果�然有�題，請登出後��新登入一次。</strong>',
-'token_suffix_mismatch'     => '<strong>由於您使用者端中的編輯信符毀�了一些標點符號字元，為防止編輯的文字�壞，您的編輯已經被拒絕。
-這種情�通常出�於使用�有很多臭蟲�以網絡為主的匿�代��務的時候。</strong>',
+'session_fail_preview'      => "'''很抱歉�由於部份資料�失，我們無法處�您的編輯。請�試一次，如果�然失敗，請登出後�新登入。'''",
+'session_fail_preview_html' => "'''很抱歉�部份資料已�失，我們無法處�您的編輯。''''''如果這個編輯�程沒有�題，請�試一次。如果�然有�題，請登出後��新登入一次。'''",
+'token_suffix_mismatch'     => "'''由於您使用者端中的編輯信符毀�了一些標點符號字元，為防止編輯的文字�壞，您的編輯已經被拒絕。
+這種情�通常出�於使用�有很多臭蟲�以網絡為主的匿�代��務的時候。'''",
 'editing'                   => '正在編輯$1',
 'editingsection'            => '正在編輯$1 (段�)',
 'editingcomment'            => '正在編輯$1 (評論)',
@@ -570,23 +536,22 @@ $2',
 <b>�有</b>在上�文字框中的內容會在你點擊"�存��"後被�存。<br />',
 'yourtext'                  => '您的文字',
 'storedversion'             => '已�存版本',
-'nonunicodebrowser'         => '<strong>警告: 您的�覽器�相容Unicode編碼。這裡有一個工作�將使您能安全地編輯��: �ASCII字元將以�六進製編碼模�出�在編輯框中。</strong>',
-'editingold'                => '<strong>警告：你正在編輯的是本�的舊版本。
-如果你�存它的話，在本版本之後的任何修改都會丟失。</strong>',
+'nonunicodebrowser'         => "'''警告: 您的�覽器�相容Unicode編碼。這裡有一個工作�將使您能安全地編輯��: �ASCII字元將以�六進製編碼模�出�在編輯框中。'''",
+'editingold'                => "'''警告：你正在編輯的是本�的舊版本。
+如果你�存它的話，在本版本之後的任何修改都會丟失。'''",
 'yourdiff'                  => '差異',
-'copyrightwarning'          => '請注�您�{{SITENAME}}的所有貢�都被�為是在$2下發佈，請查看在$1的細節。
+'copyrightwarning'          => "請注�您�{{SITENAME}}的所有貢�都被�為是在$2下發佈，請查看在$1的細節。
 如果您�希望您的文字被任�修改和�散佈，請���交。<br />
 您�時也��我們�證您所�交的內容是您自己所作，或得自一個��版權�護或相似自由的來�。
-<strong>��在未�授權的情�下發表�</strong><br />',
-'copyrightwarning2'         => '請注�您�{{SITENAME}}的所有貢�
+'''��在未�授權的情�下發表�'''<br />",
+'copyrightwarning2'         => "請注�您�{{SITENAME}}的所有貢�
 都�能被其他貢�者編輯，修改或刪除。
 如果您�希望您的文字被任�修改和�散佈，請���交。<br />
 您�時也��我們�證您所�交的內容是您自己所作，或得自一個��版權�護或相似自由的來�（�閱$1的細節）。
-<strong>��在未�授權的情�下發表�</strong>',
-'longpagewarning'           => '<strong>警告: 本�長度�$1 kB；一些�覽器將無法編輯長�32KB��。請考慮將本文切割�幾個�段�。</strong>',
-'longpageerror'             => '<strong>錯誤: 您所�交的文字長度有$1KB，這大於$2KB的最大值。該文本�能被儲存。</strong>',
-'readonlywarning'           => '<strong>警告: 資料庫被鎖以進行維護，所以您目�將無法�存您的修改。您或許希望先將本段文字複製並�存到文字文件，然後等一會兒�修改。</strong>',
-'protectedpagewarning'      => '<strong>警告: 本�已經被�護，�有�有管�員許�權的使用者��修改。</strong>',
+'''��在未�授權的情�下發表�'''",
+'longpagewarning'           => "'''警告: 本�長度�$1 kB；一些�覽器將無法編輯長�32KB��。請考慮將本文切割�幾個�段�。'''",
+'longpageerror'             => "'''錯誤: 您所�交的文字長度有$1KB，這大於$2KB的最大值。該文本�能被儲存。'''",
+'protectedpagewarning'      => "'''警告: 本�已經被�護，�有�有管�員許�權的使用者��修改。'''",
 'semiprotectedpagewarning'  => "'''注�:''' 本��被鎖定，僅�註冊使用者編輯。",
 'cascadeprotectedwarning'   => '警告: 本�已經被�護，�有�有管�員權�的使用者��修改，因為本�已被以下連鎖�護的{{PLURAL:$1|一個|多個}}��所包�:',
 'templatesused'             => '在這個��上使用的模�有:',
@@ -619,12 +584,9 @@ $2',
 # History pages
 'viewpagelogs'        => '查詢這個��的日誌',
 'nohistory'           => '沒有本�的修訂記錄。',
-'revnotfound'         => '沒有找到修訂記錄',
-'revnotfoundtext'     => '您請求的更早版本的修訂記錄沒有找到。
-請檢查您請求本��用的URL是�正確。',
 'currentrev'          => '當�修訂版本',
 'revisionasof'        => '在$1所�的修訂版本',
-'revision-info'       => '在$1由$2所�的修訂版本',
+'revision-info'       => '在$1由$2所�的修訂版本', # Additionally available: $3: revision id
 'previousrevision'    => '�上一修訂',
 'nextrevision'        => '下一修訂→',
 'currentrevisionlink' => '當�修訂',
@@ -727,6 +689,7 @@ $2',
 'prevn'                 => '�$1個',
 'nextn'                 => '後$1個',
 'viewprevnext'          => '檢視 ($1) ($2) ($3)',
+'searchhelp-url'        => 'Help:目錄',
 'showingresults'        => '下�顯示從第<b>$2</b>�開始的<b>$1</b>��果:',
 'showingresultsnum'     => '下�顯示從第<b>$2</b>�開始的<b>$3</b>��果:',
 'nonefound'             => '<strong>注�：</strong>失敗的�尋往往是由於試圖�尋諸如「的�或「和�之類的常見字所引起。',
@@ -748,6 +711,7 @@ $2',
 'qbsettings-floatingright' => '��漂移',
 'changepassword'           => '更改密碼',
 'skin'                     => '��',
+'skin-preview'             => '�覽',
 'math'                     => '數學公�',
 'dateformat'               => '日期格�',
 'datedefault'              => '�設值',
@@ -769,9 +733,6 @@ $2',
 'prefs-misc'               => '雜項',
 'saveprefs'                => '�存�好設定',
 'resetprefs'               => '�設�數',
-'oldpassword'              => '舊密碼',
-'newpassword'              => '新密碼',
-'retypenew'                => '確�密碼:',
 'textboxsize'              => '編輯',
 'rows'                     => '列:',
 'columns'                  => '欄:',
@@ -834,7 +795,6 @@ $2',
 'recentchanges'                     => '近期變動',
 'recentchangestext'                 => '跟蹤這個wiki上的最新更改。',
 'recentchanges-feed-description'    => '跟蹤此訂閱在 wiki 上的近期變動。',
-'rcnote'                            => "以下是在$3，最近'''$2'''天內的'''$1'''次近期變動記錄:",
 'rcnotefrom'                        => '下�是自<b>$2</b>(最多顯示<b>$1</b>):',
 'rclistfrom'                        => '顯示自$1以來的新更改',
 'rcshowhideminor'                   => '$1細微修改',
@@ -874,12 +834,12 @@ $2',
 'uploaderror'                 => '上載錯誤',
 'uploadtext'                  => "使用下�的表單來上傳用在��內新的圖片檔案。
 �檢視或�尋以�上傳的圖片
-�以進入[[Special:ImageList|圖片清單]]，
+�以進入[[Special:FileList|圖片清單]]，
 上傳和刪除將在[[Special:Log/upload|上傳日誌]]中記錄。
 
 �在��中加入圖片，使用以下形�的連接:
-'''<nowiki>[[</nowiki>{{ns:image}}:file.jpg<nowiki>]]</nowiki>'''，
-'''<nowiki>[[</nowiki>{{ns:image}}:file.png|替�文字<nowiki>]]</nowiki>''' 或
+'''<nowiki>[[</nowiki>{{ns:file}}:file.jpg<nowiki>]]</nowiki>'''，
+'''<nowiki>[[</nowiki>{{ns:file}}:file.png|替�文字<nowiki>]]</nowiki>''' 或
 '''<nowiki>[[</nowiki>{{ns:media}}:file.ogg<nowiki>]]</nowiki>'''。",
 'uploadlog'                   => '上載紀錄',
 'uploadlogpage'               => '上載紀錄',
@@ -900,18 +860,18 @@ $2',
 'large-file'                  => '建議檔案大��能超� $1；本檔案大�為 $2。',
 'largefileserver'             => '這個檔案的大�比伺�器�置�許的大�還�大。',
 'emptyfile'                   => '您所上傳的檔案�存在。這�能是由於檔案��入錯誤。請檢查您是�真的�上傳此檔案。',
-'fileexists'                  => '已存在相��稱的檔案，如果您無法確定您是��改變它，請檢查<strong><tt>$1</tt></strong>。',
-'fileexists-extension'        => '一個相似檔�的檔案已經存在:<br />
-上載檔案的檔�: <strong><tt>$1</tt></strong><br />
-�有檔案的檔�: <strong><tt>$2</tt></strong><br />
-請�擇一個��的�字。',
+'fileexists'                  => "已存在相��稱的檔案，如果您無法確定您是��改變它，請檢查'''<tt>$1</tt>'''。",
+'fileexists-extension'        => "一個相似檔�的檔案已經存在:<br />
+上載檔案的檔�: '''<tt>$1</tt>'''<br />
+�有檔案的檔�: '''<tt>$2</tt>'''<br />
+請�擇一個��的�字。",
 'fileexists-thumb'            => "<center>'''已經存在的圖片'''</center>",
-'fileexists-thumbnail-yes'    => '這個檔案好�是一幅圖片的縮圖版本<i>(縮圖)</i>。請檢查清楚該檔案<strong><tt>$1</tt></strong>。<br />
-如果檢查後的檔案是�原本圖片的大�是一樣的話，就�用�上載多一幅縮圖。',
-'file-thumbnail-no'           => '該檔�是以<strong><tt>$1</tt></strong>開始。它好�一幅圖片的縮圖版本<i>(縮圖)</i>。
-如果你有該圖片的完整大�，如�是請�修改檔�。',
-'fileexists-forbidden'        => '已存在相��稱的檔案；請返回並用一個新的�稱來上傳此檔案。[[Image:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => '在共享檔案庫中已存在此�稱的檔案；請返回並用一個新的�稱來上傳此檔案。[[Image:$1|thumb|center|$1]]',
+'fileexists-thumbnail-yes'    => "這個檔案好�是一幅圖片的縮圖版本''(縮圖)''。請檢查清楚該檔案'''<tt>$1</tt>'''。<br />
+如果檢查後的檔案是�原本圖片的大�是一樣的話，就�用�上載多一幅縮圖。",
+'file-thumbnail-no'           => "該檔�是以'''<tt>$1</tt>'''開始。它好�一幅圖片的縮圖版本''(縮圖)''。
+如果你有該圖片的完整大�，如�是請�修改檔�。",
+'fileexists-forbidden'        => '已存在相��稱的檔案；請返回並用一個新的�稱來上傳此檔案。[[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => '在共享檔案庫中已存在此�稱的檔案；請返回並用一個新的�稱來上傳此檔案。[[File:$1|thumb|center|$1]]',
 'successfulupload'            => '上傳�功',
 'uploadwarning'               => '上載警告',
 'savefile'                    => '�存檔案',
@@ -930,7 +890,7 @@ $2',
 
 您應該�考慮一下繼續上傳一個檔案��是���。
 為方便起見，這一個檔案的刪除記錄已經在下��供:",
-'filename-bad-prefix'         => '您上傳的檔案�稱是以<strong>「$1�</strong>作為開頭，通常這種沒有��的檔案�稱是由數碼相機中自動編排。請在您的檔案中�新�擇一個更加有�義的檔案�稱。',
+'filename-bad-prefix'         => "您上傳的檔案�稱是以'''「$1�'''作為開頭，通常這種沒有��的檔案�稱是由數碼相機中自動編排。請在您的檔案中�新�擇一個更加有�義的檔案�稱。",
 
 'upload-proto-error'      => '�訂錯誤',
 'upload-proto-error-text' => '�程上傳�求 URL 以 <code>http://</code> 或 <code>ftp://</code> 開頭。',
@@ -951,17 +911,17 @@ $2',
 'upload_source_url'  => ' (一個有效的，�公開訪�的 URL)',
 'upload_source_file' => ' (在您電腦上的一個檔案)',
 
-# Special:ImageList
-'imagelist_search_for'  => '按圖片�稱�尋:',
+# Special:ListFiles
+'listfiles_search_for'  => '按圖片�稱�尋:',
 'imgfile'               => '檔案',
-'imagelist'             => '檔案列表',
-'imagelist_date'        => '日期',
-'imagelist_name'        => '�稱',
-'imagelist_user'        => '使用者',
-'imagelist_size'        => '大�',
-'imagelist_description' => '�述',
-
-# Image description page
+'listfiles'             => '檔案列表',
+'listfiles_date'        => '日期',
+'listfiles_name'        => '�稱',
+'listfiles_user'        => '使用者',
+'listfiles_size'        => '大�',
+'listfiles_description' => '�述',
+
+# File description page
 'filehist'                  => '檔案歷�',
 'filehist-help'             => '點擊日期�時間以檢視當時出��的檔案。',
 'filehist-deleteall'        => '刪除全部',
@@ -974,7 +934,6 @@ $2',
 'filehist-filesize'         => '檔案大�',
 'filehist-comment'          => '註解',
 'imagelinks'                => '連�',
-'linkstoimage'              => '以下��連接到本檔案:',
 'nolinkstoimage'            => '沒有��連接到本檔案。',
 'sharedupload'              => '該檔案是一個共享上傳，它�能在其它項目中被應用。',
 'shareduploadwiki'          => '請�閱$1以了解其相關資訊。',
@@ -994,17 +953,15 @@ $2',
 'filerevert-badversion'     => '這個檔案所�供的時間截記並無先�的本地版本。',
 
 # File deletion
-'filedelete'             => '刪除$1',
-'filedelete-legend'      => '刪除檔案',
-'filedelete-intro'       => "您�正刪除'''[[Media:$1|$1]]'''。",
-'filedelete-intro-old'   => '<span class="plainlinks">你�正刪除\'\'\'[[Media:$1|$1]]\'\'\'於[$4 $2 $3]的版本。</span>',
-'filedelete-comment'     => '註解:',
-'filedelete-submit'      => '刪除',
-'filedelete-success'     => "'''$1'''已經刪除。",
-'filedelete-success-old' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\'於 $2 $3 的版本已經刪除。</span>',
-'filedelete-nofile'      => "'''$1'''在這個網站中�存在。",
-'filedelete-nofile-old'  => "在已指定屬性的情�下，這裡沒有'''$1'''於 $2 $3 的版本。",
-'filedelete-iscurrent'   => '您�正嘗試刪除這個檔案的最近版本。請先將個該檔案回退�較舊的版本。',
+'filedelete'            => '刪除$1',
+'filedelete-legend'     => '刪除檔案',
+'filedelete-intro'      => "您�正刪除'''[[Media:$1|$1]]'''。",
+'filedelete-intro-old'  => '<span class="plainlinks">你�正刪除\'\'\'[[Media:$1|$1]]\'\'\'於[$4 $2 $3]的版本。</span>',
+'filedelete-comment'    => '註解:',
+'filedelete-submit'     => '刪除',
+'filedelete-success'    => "'''$1'''已經刪除。",
+'filedelete-nofile'     => "'''$1'''在這個網站中�存在。",
+'filedelete-nofile-old' => "在已指定屬性的情�下，這裡沒有'''$1'''於 $2 $3 的版本。",
 
 # MIME search
 'mimesearch'         => 'MIME �尋',
@@ -1032,22 +989,9 @@ $2',
 'randomredirect-nopages' => '在這個�字空間中沒有�定���。',
 
 # Statistics
-'statistics'             => '統計',
-'sitestats'              => '{{SITENAME}}統計數據',
-'userstats'              => '使用者統計',
-'sitestatstext'          => "資料庫中共有'''\$1'''���。
-其中包括�話��關於{{SITENAME}}的���最少�的\"stub\"���定�的��，
-以�未�到��質�的��。除此之外還有'''\$2'''��能是�乎標準的��。
-
-'''\$8'''個檔案已被上傳。
-
-從{{SITENAME}}設定以來，全網站共有���覽'''\$3'''次，��編輯'''\$4'''次。
-���平�編輯'''\$5'''次，�次編輯後��的�個版本平��覽'''\$6'''次。
-
-[http://www.mediawiki.org/wiki/Manual:Job_queue 工作隊列]的長度是'''\$7'''。",
-'userstatstext'          => "網站有'''$1'''�註冊[[Special:ListUsers|使用者]]，其中
-'''$2''' (或 '''$4%''') 有$5許�權。",
-'statistics-mostpopular' => '被查閱次數最多的��',
+'statistics'              => '統計',
+'statistics-header-users' => '使用者統計',
+'statistics-mostpopular'  => '被查閱次數最多的��',
 
 'disambiguations'      => '消歧義',
 'disambiguationspage'  => 'Template:disambig
@@ -1129,8 +1073,6 @@ Template:消除歧義',
 'speciallogtitlelabel' => '標題:',
 'log'                  => '日誌',
 'all-logs-page'        => '所有日誌',
-'log-search-legend'    => '�尋日誌',
-'log-search-submit'    => '去',
 'alllogstext'          => '綜�顯示上傳�刪除��護��鎖以�站務日誌。',
 'logempty'             => '在日誌中�存在匹�項。',
 'log-title-wildcard'   => '�尋以這個文字開始的標題',
@@ -1198,9 +1140,7 @@ Template:消除歧義',
 'addedwatchtext'       => "��\"[[:\$1]]\"已經被加入到您的[[Special:Watchlist|監視清單]]中。
 將來有關此���其討論�的任何修改將會在那裡列出，
 而且還會在[[Special:RecentChanges|近期變動]]中
-以'''粗體'''形�列出以使起更容易識別。
-
-如果您之後想將該��從監視清單中刪除，�點擊導航�中的\"�止監視\"連�。",
+以'''粗體'''形�列出以使起更容易識別。",
 'removedwatch'         => '已�止監視',
 'removedwatchtext'     => '��「<nowiki>$1</nowiki>�已經從您的監視��中移除。',
 'watch'                => '監視',
@@ -1218,12 +1158,6 @@ Template:消除歧義',
 'iteminvalidname'      => "��'$1'錯誤，無效命�...",
 'wlnote'               => '以下是最近<b>$2</b>�時內的最後$1次修改。',
 'wlshowlast'           => '顯示最近$1�時；$2天；$3的修改。',
-'watchlist-show-bots'  => '顯示機器人的編輯',
-'watchlist-hide-bots'  => '隱�機器人的編輯',
-'watchlist-show-own'   => '顯示我的修改',
-'watchlist-hide-own'   => '隱�我的修改',
-'watchlist-show-minor' => '顯示細微修改',
-'watchlist-hide-minor' => '隱�細微修改',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching'   => '正在監視...',
@@ -1264,64 +1198,69 @@ $NEWPAGE
 回饋和進一步的說明:
 {{fullurl:{{MediaWiki:Helppage}}}}',
 
-# Delete/protect/revert
-'deletepage'                  => '刪除��',
-'confirm'                     => '確�',
-'excontent'                   => '內容為: "$1"',
-'excontentauthor'             => '內容為: "$1" (而且唯一貢�者為"$2")',
-'exbeforeblank'               => '被清空�的內容為: "$1"',
-'exblank'                     => '��為空',
-'historywarning'              => '警告: 您將�刪除的�內�有歷�',
-'confirmdeletetext'           => '您�將從資料庫中永�刪除一個��或圖片以�其歷�。
+# Delete
+'deletepage'            => '刪除��',
+'confirm'               => '確�',
+'excontent'             => '內容為: "$1"',
+'excontentauthor'       => '內容為: "$1" (而且唯一貢�者為"$2")',
+'exbeforeblank'         => '被清空�的內容為: "$1"',
+'exblank'               => '��為空',
+'historywarning'        => '警告: 您將�刪除的�內�有歷�',
+'confirmdeletetext'     => '您�將從資料庫中永�刪除一個��或圖片以�其歷�。
 請確定您�進行此項�作，並且了解其後果，�時您的行為符�[[{{MediaWiki:Policy-url}}]]。',
-'actioncomplete'              => '�作完�',
-'deletedtext'                 => '「<nowiki>$1</nowiki>�已經被刪除。
+'actioncomplete'        => '�作完�',
+'deletedtext'           => '「<nowiki>$1</nowiki>�已經被刪除。
 最近刪除的紀錄請�見$2。',
-'deletedarticle'              => '已刪除「$1�',
-'dellogpage'                  => '刪除紀錄',
-'dellogpagetext'              => '以下是最近刪除的紀錄列表。
+'deletedarticle'        => '已刪除「$1�',
+'dellogpage'            => '刪除紀錄',
+'dellogpagetext'        => '以下是最近刪除的紀錄列表。
 所有的時間都是使用伺�器時間。',
-'deletionlog'                 => '刪除紀錄',
-'reverted'                    => '復原到早期版本',
-'deletecomment'               => '刪除�由',
-'deleteotherreason'           => '其它�附加的�由:',
-'deletereasonotherlist'       => '其它�由',
-'deletereason-dropdown'       => '
+'deletionlog'           => '刪除紀錄',
+'reverted'              => '復原到早期版本',
+'deletecomment'         => '刪除�由',
+'deleteotherreason'     => '其它�附加的�由:',
+'deletereasonotherlist' => '其它�由',
+'deletereason-dropdown' => '
 *常用刪除�由
 ** 作者請求
 ** 侵犯版權
 ** 破壞',
-'rollback'                    => '復原',
-'rollback_short'              => '復原',
-'rollbacklink'                => '復原',
-'rollbackfailed'              => '無法復原',
-'cantrollback'                => '無法復原編輯；最後的貢�者是本文的唯一作者。',
-'alreadyrolled'               => '無法復原由[[User:$2|$2]] ([[User talk:$2|討論]])進行的[[$1]]的最後編輯；
+
+# Rollback
+'rollback'         => '復原',
+'rollback_short'   => '復原',
+'rollbacklink'     => '復原',
+'rollbackfailed'   => '無法復原',
+'cantrollback'     => '無法復原編輯；最後的貢�者是本文的唯一作者。',
+'alreadyrolled'    => '無法復原由[[User:$2|$2]] ([[User talk:$2|討論]])進行的[[$1]]的最後編輯；
 其他人已經編輯或是復原了該�。
 
-最後編輯者: [[User:$3|$3]] ([[User talk:$3|討論]])。',
-'editcomment'                 => '編輯說明: "<i>$1</i>"。', # only shown if there is an edit comment
-'revertpage'                  => '復原由[[Special:Contributions/$2|$2]] ([[User talk:$2|�話]])的編輯；更改回[[User:$1|$1]]的最後一個版本', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
-'rollback-success'            => '復原由$1的編輯；更改回$2的最後一個版本。',
-'sessionfailure'              => '您的登入資訊似乎有�題，為防止此該訊�被攔截，本次�作已經�消，請按「上一���新載入。',
+最後編輯者: [[User:$3|$3]] ([[User talk:$3|討論]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]])。',
+'editcomment'      => "編輯說明: \"''\$1''\"。", # only shown if there is an edit comment
+'revertpage'       => '復原由[[Special:Contributions/$2|$2]] ([[User talk:$2|�話]])的編輯；更改回[[User:$1|$1]]的最後一個版本', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
+'rollback-success' => '復原由$1的編輯；更改回$2的最後一個版本。',
+'sessionfailure'   => '您的登入資訊似乎有�題，為防止此該訊�被攔截，本次�作已經�消，請按「上一���新載入。',
+
+# Protect
 'protectlogpage'              => '�護日誌',
 'protectlogtext'              => '下�是��鎖定和�消鎖定的列表。請�考[[Special:ProtectedPages|�護��清單]]以檢視當�進行的���護。',
 'protectedarticle'            => '已�護"[[$1]]"',
 'modifiedarticleprotection'   => '已經更改 "[[$1]]" 的�護等級',
 'unprotectedarticle'          => '已解除�護"[[$1]]"',
 'protect-title'               => '正在�護"$1"',
+'prot_1movedto2'              => '[[$1]]移動到[[$2]]',
 'protectcomment'              => '註解:',
 'protectexpiry'               => '到期:',
 'protect_expiry_invalid'      => '輸入的終止時間無效。',
 'protect_expiry_old'          => '終止時間已�去。',
 'protect-unchain'             => '移動權�解鎖',
-'protect-text'                => '你�以在這裡�覽和修改���<strong><nowiki>$1</nowiki></strong>的�護級別。',
-'protect-locked-blocked'      => '您�能在被�鎖時更改�護級別。
-以下是<strong>$1</strong>�時的�護級別:',
-'protect-locked-dblock'       => '在資料庫鎖定時無法更改�護級別。
-以下是<strong>$1</strong>�時的�護級別:',
-'protect-locked-access'       => '您的帳號權��能修改�護級別。
-以下是<strong>$1</strong>�時的�護級別:',
+'protect-text'                => "你�以在這裡�覽和修改���'''<nowiki>$1</nowiki>'''的�護級別。",
+'protect-locked-blocked'      => "您�能在被�鎖時更改�護級別。
+以下是'''$1'''�時的�護級別:",
+'protect-locked-dblock'       => "在資料庫鎖定時無法更改�護級別。
+以下是'''$1'''�時的�護級別:",
+'protect-locked-access'       => "您的帳號權��能修改�護級別。
+以下是'''$1'''�時的�護級別:",
 'protect-cascadeon'           => '以下的{{PLURAL:$1|一個|多個}}��包��本��的�時，啟動了連鎖�護，因此本��目�也被�護，未能編輯。您�以設定本��的�護級別，但這並�會�連鎖�護有所影響。',
 'protect-default'             => '(�設)',
 'protect-fallback'            => '需�"$1"的許�',
@@ -1330,6 +1269,7 @@ $NEWPAGE
 'protect-summary-cascade'     => '連鎖',
 'protect-expiring'            => '終止於 $1 (UTC)',
 'protect-cascade'             => '�護本�中包�的�� (連鎖�護)',
+'protect-expiry-options'      => '2�時:2 hours,1天:1 day,3天:3 days,1周:1 week,2周:2 weeks,1個月:1 month,3個月:3 months,6個月:6 months,1年:1 year,永久:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => '權�:',
 'restriction-level'           => '�制級別:',
 'minimum-size'                => '最�大�',
@@ -1354,7 +1294,7 @@ $NEWPAGE
 'undeleteextrahelp'            => "復原整個��時，請清除所有複�框後按 '''''復原''''' 。 復原特定版本時，請�擇相應版本�的複�框後按'''''復原''''' 。按 '''''�設''''' 將清除評論內容�所有複�框。",
 'undeleterevisions'            => '$1版本存檔',
 'undeletehistory'              => '如果您復原了該��，所有版本都會被復原到修訂沿�中。
-如果本�刪除後有一個��的新��建立，被復原的版本將會稱為較新的歷�。�時請留�在檔案修訂中的�制會在復原時�失。',
+如果本�刪除後有一個��的新��建立，被復原的版本將會稱為較新的歷�。',
 'undeleterevdel'               => '如果把最新修訂部份刪除，�刪除便無法進行。如果�到這種情�，您必須��或�隱�最新已刪除的修訂。�於您沒有權�去檢視的修訂是無法復原的。',
 'undeletehistorynoadmin'       => '這個��已經被刪除，刪除原因顯示在下方編輯摘�中。被刪除�的所有修訂版本，連�刪除�貢�使用者等等細節�有管�員�以看見。',
 'undelete-revision'            => '刪除$1時由$3（在$2）所編寫的修訂版本:',
@@ -1408,7 +1348,6 @@ $1',
 'whatlinkshere'       => '�入��',
 'whatlinkshere-title' => '�接到$1的��',
 'whatlinkshere-page'  => '��:',
-'linklistsub'         => '(連�列表)',
 'linkshere'           => '以下��連�到[[:$1]]：',
 'nolinkshere'         => '沒有��連�到[[:$1]]。',
 'nolinkshere-ns'      => '在所�的�字空間內沒有���接到[[:$1]]。',
@@ -1419,7 +1358,7 @@ $1',
 'whatlinkshere-links' => '� �入',
 
 # Block/unblock
-'blockip'                     => '�鎖IP地�',
+'blockip'                     => '�鎖使用者',
 'blockiptext'                 => '用下�的表單來�止來自�一特定IP地�的修改許�權。
 �有在為防止破壞，�符�[[{{MediaWiki:Policy-url}}|守則]]的情�下��採�此行動。
 請在下�輸入一個具體的�由（例如引述一個被破壞的��）。',
@@ -1454,7 +1393,6 @@ $1',
 'ipb-edit-dropdown'           => '編輯�鎖原因',
 'ipb-unblock-addr'            => '解除�鎖$1',
 'ipb-unblock'                 => '解除��使用者�或IP地�',
-'ipb-blocklist-addr'          => '檢視$1的�有�鎖',
 'ipb-blocklist'               => '檢視�有的�鎖',
 'unblockip'                   => '解除��IP地�',
 'unblockiptext'               => '用下�的表單來復原先�被��的IP地�的書寫權。',
@@ -1543,6 +1481,9 @@ $1',
 
 在這些情�下，您在必�時必須手工移動或�併��。",
 'movearticle'             => '移動��:',
+'movenologin'             => '未登入',
+'movenologintext'         => '您必須是一�登記使用者並且[[Special:UserLogin|登入]]
+後��移動一個��。',
 'movenotallowed'          => '您在這個wiki中度並沒有許�權去移動��。',
 'newtitle'                => '新標題:',
 'move-watch'              => '監視此�',
@@ -1567,7 +1508,6 @@ $1',
 'delete_and_move_confirm' => '是的，刪除此��',
 'delete_and_move_reason'  => '刪除以便移動',
 'selfmove'                => '原始標題與目標標題相�，您�能移動一�覆蓋本身。',
-'immobile_namespace'      => '目標標題屬於特別類型；�能將��移入這個�字空間。',
 
 # Export
 'export'            => '匯出��',
@@ -1577,7 +1517,7 @@ $1',
 並�擇你是�需�匯出帶有修訂記錄的以�的版本，
 或是��擇匯出帶有最後一次編輯訊�的當�版本。
 
-此外你還�以利用連�匯出檔案，例如你�以使用[[{{ns:special}}:Export/{{MediaWiki:Mainpage}}]]匯出"[[{{MediaWiki:Mainpage}}]]"��。',
+此外你還�以利用連�匯出檔案，例如你�以使用[[{{#Special:Export}}/{{MediaWiki:Mainpage}}]]匯出"[[{{MediaWiki:Mainpage}}]]"��。',
 'exportcuronly'     => '僅包�當�的修訂，而�是全部的歷�。',
 'exportnohistory'   => "----
 '''注�:''' 由於性能原因，從此表單匯出��的全部歷�已被�用。",
@@ -1614,6 +1554,7 @@ $1',
 'import-interwiki-history'   => '複製此�的所有歷�版本',
 'import-interwiki-submit'    => '匯入',
 'import-interwiki-namespace' => '將��轉移到�字空間:',
+'import-comment'             => '註解:',
 'importtext'                 => '請使用 Special:Export 功能從� wiki 匯出檔案，儲存到您的�片並上傳到這裡。',
 'importstart'                => '正在匯入��...',
 'import-revision-count'      => '$1個修訂',
@@ -1711,12 +1652,12 @@ $1',
 'notacceptable'     => '該網站伺�器�能�供您的客戶端能識別的數據格�。',
 
 # Attribution
-'anonymous'        => '{{SITENAME}}的匿�使用者',
+'anonymous'        => '{{SITENAME}}的匿�{{PLURAL:$1|使用者|使用者}}',
 'siteuser'         => '{{SITENAME}}使用者$1',
 'lastmodifiedatby' => '此�由$3於$1 $2的最後更改。', # $1 date, $2 time, $3 user
 'othercontribs'    => '在$1的工作基礎上。',
 'others'           => '其他',
-'siteusers'        => '{{SITENAME}}使用者$1',
+'siteusers'        => '{{SITENAME}}{{PLURAL:$2|使用者|使用者}}$1',
 'creditspage'      => '��致�',
 'nocredits'        => '該�沒有致��單訊�。',
 
@@ -1736,6 +1677,11 @@ $1',
 'numauthors'     => '作者數� (��): $1',
 'numtalkauthors' => '作者數� (討論�): $1',
 
+# Skin names
+'skinname-standard'    => '標準',
+'skinname-nostalgia'   => '懷舊',
+'skinname-cologneblue' => '科隆香水�',
+
 # Math options
 'mw_math_png'    => '永�使用PNG圖片',
 'mw_math_simple' => '如果是簡單的公�使用HTML，�則使用PNG圖片',
@@ -1787,14 +1733,13 @@ $1',
 'show-big-image'       => '完整解�度',
 'show-big-image-thumb' => '<small>這幅縮圖的解�度: $1 × $2 �素</small>',
 
-# Special:NewImages
-'newimages'             => '新建圖片畫廊',
-'imagelisttext'         => '以下是按$2排列的$1個檔案列表。',
-'showhidebots'          => '($1機器人)',
-'noimages'              => '無�檢視圖片。',
-'ilsubmit'              => '�尋',
-'bydate'                => '按日期',
-'sp-newimages-showfrom' => '從$1開始顯示新圖片',
+# Special:NewFiles
+'newimages'     => '新建圖片畫廊',
+'imagelisttext' => '以下是按$2排列的$1個檔案列表。',
+'showhidebots'  => '($1機器人)',
+'noimages'      => '無�檢視圖片。',
+'ilsubmit'      => '�尋',
+'bydate'        => '按日期',
 
 # Bad image list
 'bad_image_list' => '請根據以下的格�去編寫:
@@ -2114,14 +2059,6 @@ Variants for Chinese language
 'confirmemail_loggedin'   => '您的電�郵件地��下已被確�。',
 'confirmemail_error'      => '你的確��程發生錯誤。',
 'confirmemail_subject'    => '{{SITENAME}}電�郵件地�確�',
-'confirmemail_body'       => '�有IP��$1的使用者(�能是您)在{{SITENAME}}建立了帳號"$2"，並�交了您的電�電�郵件地�。
-
-請確�這個帳號是屬於您的，並�時啟用在{{SITENAME}}上的
-電�郵件功能。請在�覽器中打開下�的連�:
-
-$3
-
-如果您*沒有*�出這個請求，請��點擊此連�。確�碼會在$4�期。',
 
 # Scary transclusion
 'scarytranscludedisabled' => '[跨wiki轉�代碼��用]',
@@ -2142,18 +2079,9 @@ $1
 'confirmrecreate'     => '在您編輯這個��後，使用者[[User:$1|$1]]([[User talk:$1|�話]])以下列原因刪除了這個��: $2。請在�新建立���三�。',
 'recreate'            => '�建',
 
-# HTML dump
-'redirectingto' => '�定�到[[:$1]]...',
-
 # action=purge
-'confirm_purge'        => '�清除此��的快�嗎?\\n\\n$1',
 'confirm_purge_button' => '確定',
-
-# AJAX search
-'searchcontaining' => "�尋包�''$1''的��。",
-'searchnamed'      => "�尋�稱為''$1''的��。",
-'articletitles'    => '��以"$1"開頭',
-'hideresults'      => '隱��果',
+'confirm-purge-top'    => '�清除此��的快�嗎?',
 
 # Multipage image navigation
 'imgmultipageprev' => '� 上一�',
diff --git a/languages/messages/MessagesZh_yue.php b/languages/messages/MessagesZh_yue.php
index 68ac9b41..1dcfd26a 100644
--- a/languages/messages/MessagesZh_yue.php
+++ b/languages/messages/MessagesZh_yue.php
@@ -1,9 +1,9 @@
 <?php
-/**
- * Cantonese (粵語/廣�話)
+/** Cantonese (粵語/廣�話)
  *
  * @ingroup Language
  * @file
+ *
  */
 
 # Inherit everything for now
diff --git a/languages/messages/MessagesZu.php b/languages/messages/MessagesZu.php
index 9e2a8de7..85c0a6e8 100644
--- a/languages/messages/MessagesZu.php
+++ b/languages/messages/MessagesZu.php
@@ -126,6 +126,9 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'emailconfirmlink'   => 'Qinisekisa ikheli likagesi lakho',
 'loginlanguagelabel' => 'Ulimi: $1',
 
+# Password reset dialog
+'newpassword' => 'Izwi elingenangozi elisha:',
+
 # Edit page toolbar
 'italic_sample' => 'Amazwi ama-italiki',
 'italic_tip'    => 'Amazwi ama-italiki',
@@ -133,7 +136,7 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'hr_tip'        => 'Umugqa uhleliwe  (use sparingly)',
 
 # Edit pages
-'summary'            => 'Isifinyezo',
+'summary'            => 'Isifinyezo:',
 'minoredit'          => 'Lokho ngukuhlela okuncane',
 'watchthis'          => 'Bukela ngalelikhasi',
 'savearticle'        => 'Ukonga ikhasi',
@@ -157,8 +160,9 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'rev-delundel' => 'bukisa/fihla',
 
 # Search results
-'searchresults' => 'Umphumela wokusesha',
-'powersearch'   => 'Sesha',
+'searchresults'  => 'Umphumela wokusesha',
+'searchhelp-url' => 'Help:Isiqikili',
+'powersearch'    => 'Sesha',
 
 # Preferences page
 'preferences'       => 'Amakhethelo',
@@ -168,7 +172,6 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'changepassword'    => 'Guqula izwi elingenangozi',
 'math'              => 'Izibalo',
 'saveprefs'         => 'Saveprefs',
-'newpassword'       => 'Izwi elingenangozi elisha:',
 'searchresultshead' => 'Sesha',
 'timezonelegend'    => 'Isifunda sasikhathi',
 'localtime'         => 'Isikhathi siyalapha',
@@ -190,7 +193,7 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 
 'nolicense' => 'Ubekhetha lutho',
 
-# Image description page
+# File description page
 'nolinkstoimage'   => 'Akukho amakhasi akhomba kuleli fayela.',
 'noimage'          => 'Akukho ifayela elinaleli gama, unga $1.',
 'noimage-linktext' => 'Layisha',
@@ -199,7 +202,7 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'randompage' => 'Ikhasi elingaphandle kokucabanga',
 
 # Statistics
-'userstats' => 'Ukwaziswa wamsebenzisi',
+'statistics-header-users' => 'Ukwaziswa wamsebenzisi',
 
 # Miscellaneous special pages
 'shortpages'        => 'Amakhasi amafishane',
@@ -216,6 +219,9 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'allinnamespace' => 'Onke amakhasi ($1 namespace)',
 'allpagessubmit' => 'Hamba',
 
+# Special:Log/newusers
+'newuserlog-create-entry' => 'Umsebenzi omusha',
+
 # E-mail user
 'emailuser'    => 'Thumela umlayezo lo msebenzisi',
 'noemailtitle' => 'Akukho ikheli likaposi',
@@ -232,10 +238,12 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 
 'enotif_newpagetext' => 'Lelikhasi liyasha.',
 
-# Delete/protect/revert
-'deletepage'     => 'Sula ikhasi',
-'confirm'        => 'Qinisekisa',
-'exblank'        => 'ikhasi elize',
+# Delete
+'deletepage' => 'Sula ikhasi',
+'confirm'    => 'Qinisekisa',
+'exblank'    => 'ikhasi elize',
+
+# Protect
 'protectcomment' => 'Isizathu ngenxa yalondoloza',
 
 # Restrictions (nouns)
@@ -267,6 +275,7 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 # Move page
 'move-page-legend'        => 'Thuthisa ikhasi',
 'movearticle'             => 'Thuthisa ikhasi',
+'movenologin'             => 'Awungenile',
 'movepagebtn'             => 'Thuthisa ikhasi',
 'movedto'                 => 'Lithuthiselwe e',
 'movereason'              => 'Isizathu',
@@ -294,7 +303,7 @@ ikhawundi lakho liyadalwa. musa ukukhohlwa ukuguqula amakhethelo a-{{SITENAME}}
 'markaspatrolledtext' => 'Dweba ukuthi lelikhasi liyagadwa',
 'markedaspatrolled'   => 'Dweba ukuthi lelikhasi liyagadwa',
 
-# Special:NewImages
+# Special:NewFiles
 'newimages' => 'Uhlelo lwamafayela amasha',
 'noimages'  => 'Awuboni lutho.',
 'ilsubmit'  => 'Sesha',
diff --git a/locale/README b/locale/README
deleted file mode 100644
index ab9773c2..00000000
--- a/locale/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory is for .po files generated by ./maintenance/language/lang2po.php
diff --git a/maintenance/Doxyfile b/maintenance/Doxyfile
index df67ba60..cdc748d8 100644
--- a/maintenance/Doxyfile
+++ b/maintenance/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.1
+# Doxyfile 1.5.6
 
 #
 # Some placeholders have been added for MediaWiki usage:
@@ -7,6 +7,8 @@
 # {{STRIP_FROM_PATH}}
 # {{SVNSTAT}}
 # {{INPUT}}
+#
+# A number of MediaWiki-specific aliases are near the end of this file.
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -16,7 +18,6 @@ PROJECT_NUMBER         = {{CURRENT_VERSION}}
 OUTPUT_DIRECTORY       = {{OUTPUT_DIRECTORY}}
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = "The $name class" \
@@ -41,12 +42,11 @@ MULTILINE_CPP_IS_BRIEF = NO
 DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 4
-ALIASES                = 
+TAB_SIZE               = 8
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 BUILTIN_STL_SUPPORT    = NO
-DISTRIBUTE_GROUP_DOC   = NO
+DISTRIBUTE_GROUP_DOC   = YES
 SUBGROUPING            = YES
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -59,7 +59,7 @@ EXTRACT_LOCAL_METHODS  = NO
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
+HIDE_IN_BODY_DOCS      = YES
 INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
@@ -174,7 +174,7 @@ CHM_FILE               =
 HHC_LOCATION           = 
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
-TOC_EXPAND             = NO
+TOC_EXPAND             = YES
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = YES
@@ -190,8 +190,8 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         = 
 LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
 #---------------------------------------------------------------------------
@@ -206,7 +206,7 @@ RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
@@ -268,8 +268,6 @@ DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               = 
 DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
@@ -279,3 +277,20 @@ DOT_CLEANUP            = YES
 # Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 SEARCHENGINE           = NO
+
+ALIASES =	"type{1}=<b> \1 </b>:" \
+		"types{2}=<b> \1 </b> or <b> \2 </b>:" \
+		"types{3}=<b> \1 </b>, <b> \2 </b>, or <b> \3 </b>:" \
+		"arrayof{2}=<b> Array </b> of \2" \
+		"null=\type{Null}" \
+		"boolean=\type{Boolean}" \
+		"bool=\boolean" \
+		"integer=\type{Integer}" \
+		"int=\integer" \
+		"string=\type{String}" \
+		"str=\string" \
+		"mixed=\type{Mixed}" \
+		"access=\par Access:\n" \
+		"private=\access private" \
+		"protected=\access protected" \
+		"public=\access public"
\ No newline at end of file
diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index 7ae8f5d0..5632241a 100644
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -20,8 +20,9 @@ class FiveUpgrade {
 	function FiveUpgrade() {
 		$this->conversionTables = $this->prepareWindows1252();
 
-		$this->dbw =& $this->newConnection();
-		$this->dbr =& $this->streamConnection();
+		$this->loadBalancers = array();
+		$this->dbw = wfGetDB( DB_MASTER );
+		$this->dbr = $this->streamConnection();
 
 		$this->cleanupSwaps = array();
 		$this->emailAuth = false; # don't preauthenticate emails
@@ -67,13 +68,23 @@ class FiveUpgrade {
 	 * @return Database
 	 * @access private
 	 */
-	function &newConnection() {
-		global $wgDBadminuser, $wgDBadminpassword, $wgDBtype;
-		global $wgDBserver, $wgDBname;
-		$dbclass = 'Database' . ucfirst( $wgDBtype ) ;
-		$db = new $dbclass( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname );
+	function newConnection() {
+		$lb = wfGetLBFactory()->newMainLB();
+		$db = $lb->getConnection( DB_MASTER );
+		
+		$this->loadBalancers[] = $lb;
 		return $db;
 	}
+	
+	/**
+	 * Commit transactions and close the connections when we're done...
+	 */
+	function close() {
+		foreach( $this->loadBalancers as $lb ) {
+			$lb->commitMasterChanges();
+			$lb->closeAll();
+		}
+	}
 
 	/**
 	 * Open a second connection to the master server, with buffering off.
@@ -82,13 +93,13 @@ class FiveUpgrade {
 	 * @return Database
 	 * @access private
 	 */
-	function &streamConnection() {
+	function streamConnection() {
 		global $wgDBtype;
 
 		$timeout = 3600 * 24;
 		$db =& $this->newConnection();
 		$db->bufferResults( false );
-        if ($wgDBtype == 'mysql') {
+		if ($wgDBtype == 'mysql') {
 			$db->query( "SET net_read_timeout=$timeout" );
 			$db->query( "SET net_write_timeout=$timeout" );
 		}
@@ -877,17 +888,17 @@ END;
 		$add = array();
 		while( $row = $this->dbr->fetchObject( $result ) ) {
 			$add[] = array(
-				'wl_user'      =>                        $row->wl_user,
-				'wl_namespace' => Namespace::getSubject( $row->wl_namespace ),
-				'wl_title'     =>           $this->conv( $row->wl_title ),
-				'wl_notificationtimestamp' =>            '0' );
+				'wl_user'      =>                          $row->wl_user,
+				'wl_namespace' => MWNamespace::getSubject( $row->wl_namespace ),
+				'wl_title'     =>             $this->conv( $row->wl_title ),
+				'wl_notificationtimestamp' =>              '0' );
 			$this->addChunk( $add );
 
 			$add[] = array(
-				'wl_user'      =>                        $row->wl_user,
-				'wl_namespace' =>    Namespace::getTalk( $row->wl_namespace ),
-				'wl_title'     =>           $this->conv( $row->wl_title ),
-				'wl_notificationtimestamp' =>            '0' );
+				'wl_user'      =>                          $row->wl_user,
+				'wl_namespace' =>    MWNamespace::getTalk( $row->wl_namespace ),
+				'wl_title'     =>             $this->conv( $row->wl_title ),
+				'wl_notificationtimestamp' =>              '0' );
 			$this->addChunk( $add );
 		}
 		$this->lastChunk( $add );
@@ -988,7 +999,7 @@ CREATE TABLE $1 (
 
   -- Filename of target image.
   -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
+  -- all such pages are in namespace 6 (NS_FILE).
   il_to varchar(255) binary NOT NULL default '',
 
   UNIQUE KEY il_from(il_from,il_to),
diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php
index b9c48506..ebe52f2e 100644
--- a/maintenance/addwiki.php
+++ b/maintenance/addwiki.php
@@ -49,6 +49,7 @@ function addWiki( $lang, $site, $dbName )
 	dbsource( "$IP/extensions/CheckUser/cu_log.sql", $dbw );
 	dbsource( "$IP/extensions/TitleKey/titlekey.sql", $dbw );
 	dbsource( "$IP/extensions/Oversight/hidden.sql", $dbw );
+	dbsource( "$IP/extensions/GlobalBlocking/localdb_patches/setup-global_block_whitelist.sql", $dbw );
 
 	$dbw->query( "INSERT INTO site_stats(ss_row_id) VALUES (1)" );
 
diff --git a/maintenance/archives/patch-ipb_allow_usertalk.sql b/maintenance/archives/patch-ipb_allow_usertalk.sql
new file mode 100644
index 00000000..92e7d9a4
--- /dev/null
+++ b/maintenance/archives/patch-ipb_allow_usertalk.sql
@@ -0,0 +1,3 @@
+-- Adding ipb_allow_usertalk for blocks
+ALTER TABLE /*$wgDBprefix*/ipblocks
+  ADD ipb_allow_usertalk bool NOT NULL default 1;
diff --git a/maintenance/archives/patch-linktables.sql b/maintenance/archives/patch-linktables.sql
index ae9768a8..b15878c3 100644
--- a/maintenance/archives/patch-linktables.sql
+++ b/maintenance/archives/patch-linktables.sql
@@ -49,7 +49,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   
   -- Filename of target image.
   -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
+  -- all such pages are in namespace 6 (NS_FILE).
   il_to varchar(255) binary NOT NULL default '',
   
   UNIQUE KEY il_from(il_from,il_to),
diff --git a/maintenance/archives/patch-log_user_text.sql b/maintenance/archives/patch-log_user_text.sql
new file mode 100644
index 00000000..f89a35f6
--- /dev/null
+++ b/maintenance/archives/patch-log_user_text.sql
@@ -0,0 +1,5 @@
+ALTER TABLE /*$wgDBprefix*/logging 
+	ADD log_user_text varchar(255) binary NOT NULL default '',
+	ADD log_target_id int unsigned NULL,
+	CHANGE `log_type` `log_type` VARBINARY( 15 ) NOT NULL,
+	CHANGE `log_action` `log_action` VARBINARY( 15 ) NOT NULL;
diff --git a/maintenance/archives/patch-ss_active_users.sql b/maintenance/archives/patch-ss_active_users.sql
new file mode 100644
index 00000000..a583cdc8
--- /dev/null
+++ b/maintenance/archives/patch-ss_active_users.sql
@@ -0,0 +1,3 @@
+-- More statistics, for version 1.14
+
+ALTER TABLE /*$wgDBprefix*/site_stats ADD ss_active_users bigint default '-1';
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index bf52c1f3..e2e5363e 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -175,7 +175,7 @@ class BackupDumper {
 		// extension point for subclasses to add options
 	}
 
-	function dump( $history, $text = MW_EXPORT_TEXT ) {
+	function dump( $history, $text = WikiExporter::TEXT ) {
 		# Notice messages will foul up your XML output even if they're
 		# relatively harmless.
 		if( ini_get( 'display_errors' ) )
@@ -192,13 +192,21 @@ class BackupDumper {
 
 		if( !$this->skipHeader )
 			$exporter->openStream();
-
-		if( is_null( $this->pages ) ) {
+		# Log item dumps: all or by range
+		if( $history & WikiExporter::LOGS ) {
+			if( $this->startId || $this->endId ) {
+				$exporter->logsByRange( $this->startId, $this->endId );
+			} else {
+				$exporter->allLogs();
+			}
+		# Page dumps: all or by page ID range
+		} else if( is_null( $this->pages ) ) {
 			if( $this->startId || $this->endId ) {
 				$exporter->pagesByRange( $this->startId, $this->endId );
 			} else {
 				$exporter->allPages();
 			}
+		# Dump of specific pages
 		} else {
 			$exporter->pagesByName( $this->pages );
 		}
diff --git a/maintenance/benchmarkPurge.php b/maintenance/benchmarkPurge.php
index 76302a01..796e1da2 100644
--- a/maintenance/benchmarkPurge.php
+++ b/maintenance/benchmarkPurge.php
@@ -9,7 +9,12 @@
 /** */
 require_once( "commandLine.inc" );
 
-/** @todo document */
+/** 
+ * Run a bunch of URLs through SquidUpdate::purge()
+ * to benchmark Squid response times.
+ * @param $urls array A bunch of URLs to purge
+ * @param $trials int How many times to run the test?
+ */
 function benchSquid( $urls, $trials = 1 ) {
 	$start = wfTime();
 	for( $i = 0; $i < $trials; $i++) {
@@ -22,7 +27,10 @@ function benchSquid( $urls, $trials = 1 ) {
 		count( $urls ), $pertrial * 1000.0, $pertitle * 1000.0 );
 }
 
-/** @todo document */
+/** 
+ * Get an array of randomUrl()'s.
+ * @param $length int How many urls to add to the array
+ */
 function randomUrlList( $length ) {
 	$list = array();
 	for( $i = 0; $i < $length; $i++ ) {
@@ -31,13 +39,19 @@ function randomUrlList( $length ) {
 	return $list;
 }
 
-/** @todo document */
+/** 
+ * Return a random URL of the wiki. Not necessarily an actual title in the
+ * database, but at least a URL that looks like one. 
+ */
 function randomUrl() {
 	global $wgServer, $wgArticlePath;
 	return $wgServer . str_replace( '$1', randomTitle(), $wgArticlePath );
 }
 
-/** @todo document */
+/** 
+ * Create a random title string (not necessarily a Title object). 
+ * For use with randomUrl().
+ */
 function randomTitle() {
 	$str = '';
 	$length = mt_rand( 1, 20 );
diff --git a/maintenance/checkAutoLoader.php b/maintenance/checkAutoLoader.php
index c2909ef7..554395ca 100644
--- a/maintenance/checkAutoLoader.php
+++ b/maintenance/checkAutoLoader.php
@@ -3,17 +3,24 @@ if ( php_sapi_name() != 'cli' ) exit;
 
 $IP = dirname(__FILE__) .'/..';
 require( "$IP/includes/AutoLoader.php" );
-$files = array_unique( AutoLoader::$localClasses );
+$files = array_unique( $wgAutoloadLocalClasses );
 
 foreach ( $files as $file ) {
-	$parseInfo = parsekit_compile_file( "$IP/$file" );
-	$classes = array_keys( $parseInfo['class_table'] );
+	if( function_exists( 'parsekit_compile_file' ) ){
+		$parseInfo = parsekit_compile_file( "$IP/$file" );
+		$classes = array_keys( $parseInfo['class_table'] );
+	} else {
+		$contents = file_get_contents( "$IP/$file" );
+		$m = array();
+		preg_match_all( '/\n\s*class\s+([a-zA-Z0-9_]+)/', $contents, $m, PREG_PATTERN_ORDER );
+		$classes = $m[1];
+	}
 	foreach ( $classes as $class ) {
-		if ( !isset( AutoLoader::$localClasses[$class] ) ) {
+		if ( !isset( $wgAutoloadLocalClasses[$class] ) ) {
 			//printf( "%-50s Unlisted, in %s\n", $class, $file );
 			echo "		'$class' => '$file',\n";
-		} elseif ( AutoLoader::$localClasses[$class] !== $file ) {
-			echo "$class: Wrong file: found in $file, listed in " . AutoLoader::$localClasses[$class] . "\n";
+		} elseif ( $wgAutoloadLocalClasses[$class] !== $file ) {
+			echo "$class: Wrong file: found in $file, listed in " . $wgAutoloadLocalClasses[$class] . "\n";
 		}
 	}
 
diff --git a/maintenance/checkBadRedirects.php b/maintenance/checkBadRedirects.php
new file mode 100644
index 00000000..48a4b0e6
--- /dev/null
+++ b/maintenance/checkBadRedirects.php
@@ -0,0 +1,30 @@
+<?php
+
+require "commandLine.inc";
+
+echo "Fetching redirects...\n";
+$dbr = wfGetDB( DB_SLAVE );
+$result = $dbr->select(
+	array( 'page' ),
+	array( 'page_namespace','page_title', 'page_latest' ),
+	array( 'page_is_redirect' => 1 ) );
+
+$count = $result->numRows();
+echo "Found $count total redirects.\n";
+echo "Looking for bad redirects:\n";
+echo "\n";
+
+foreach( $result as $row ) {
+	$title = Title::makeTitle( $row->page_namespace, $row->page_title );
+	$rev = Revision::newFromId( $row->page_latest );
+	if( $rev ) {
+		$target = Title::newFromRedirect( $rev->getText() );
+		if( !$target ) {
+			echo $title->getPrefixedText();
+			echo "\n";
+		}
+	}
+}
+
+echo "\n";
+echo "done.\n";
diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php
new file mode 100644
index 00000000..994cd5b9
--- /dev/null
+++ b/maintenance/checkImages.php
@@ -0,0 +1,45 @@
+<?php
+
+require( 'commandLine.inc' );
+
+$batchSize = 1000;
+$start = '';
+$dbr = wfGetDB( DB_SLAVE );
+$localRepo = RepoGroup::singleton()->getLocalRepo();
+
+$numImages = 0;
+$numGood = 0;
+
+do {
+	$res = $dbr->select( 'image', '*', array( 'img_name > ' . $dbr->addQuotes( $start ) ) );
+	foreach ( $res as $row ) {
+		$numImages++;
+		$start = $row->img_name;
+		$file = $localRepo->newFileFromRow( $row );
+		$path = $file->getPath();
+		if ( !$path ) {
+			echo "{$row->img_name}: not locally accessible\n";
+			continue;
+		}
+		$stat = @stat( $file->getPath() );
+		if ( !$stat ) {
+			echo "{$row->img_name}: missing\n";
+			continue;
+		}
+
+		if ( $stat['size'] == 0 && $row->img_size != 0 ) {
+			echo "{$row->img_name}: truncated, was {$row->img_size}\n";
+			continue;
+		}
+
+		if ( $stat['size'] != $row->img_size ) {
+			echo "{$row->img_name}: size mismatch DB={$row->img_size}, actual={$stat['size']}\n";
+			continue;
+		}
+
+		$numGood++;
+	}
+
+} while ( $res->numRows() );
+
+echo "Good images: $numGood/$numImages\n";
diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index 79ff54e8..00903f22 100644
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -54,6 +54,9 @@ class ImageCleanup extends TableCleanup {
 		
 		// About half of old bad image names have percent-codes
 		$cleaned = rawurldecode( $cleaned );
+
+		// We also have some HTML entities there
+		$cleaned = Sanitizer::decodeCharReferences( $cleaned );
 		
 		// Some are old latin-1
 		$cleaned = $wgContLang->checkTitleEncoding( $cleaned );
@@ -61,11 +64,13 @@ class ImageCleanup extends TableCleanup {
 		// Many of remainder look like non-normalized unicode
 		$cleaned = UtfNormal::cleanUp( $cleaned );
 		
-		$title = Title::makeTitleSafe( NS_IMAGE, $cleaned );
+		$title = Title::makeTitleSafe( NS_FILE, $cleaned );
 		
 		if( is_null( $title ) ) {
 			$this->log( "page $source ($cleaned) is illegal." );
 			$safe = $this->buildSafeTitle( $cleaned );
+			if( $safe === false )
+				return $this->progress( 0 );
 			$this->pokeFile( $source, $safe );
 			return $this->progress( 1 );
 		}
@@ -110,8 +115,8 @@ class ImageCleanup extends TableCleanup {
 		$version = 0;
 		$final = $new;
 		
-		while( $db->selectField( 'image', 'img_name',
-			array( 'img_name' => $final ), __METHOD__ ) ) {
+		while( $db->selectField( 'image', 'img_name', array( 'img_name' => $final ), __METHOD__ ) ||
+			Title::makeTitle( NS_FILE, $final )->exists() ) {
 			$this->log( "Rename conflicts with '$final'..." );
 			$version++;
 			$final = $this->appendTitle( $new, "_$version" );
@@ -123,14 +128,23 @@ class ImageCleanup extends TableCleanup {
 			$this->log( "DRY RUN: would rename $path to $finalPath" );
 		} else {
 			$this->log( "renaming $path to $finalPath" );
+			// XXX: should this use File::move()?  FIXME?
 			$db->begin();
 			$db->update( 'image',
 				array( 'img_name' => $final ),
 				array( 'img_name' => $orig ),
 				__METHOD__ );
+			$db->update( 'oldimage',
+				array( 'oi_name' => $final ),
+				array( 'oi_name' => $orig ),
+				__METHOD__ );
+			$db->update( 'page',
+				array( 'page_title' => $final ),
+				array( 'page_title' => $orig, 'page_namespace' => NS_FILE ),
+				__METHOD__ );
 			$dir = dirname( $finalPath );
 			if( !file_exists( $dir ) ) {
-				if( !mkdir( $dir, 0777, true ) ) {
+				if( !wfMkdirParents( $dir ) ) {
 					$this->log( "RENAME FAILED, COULD NOT CREATE $dir" );
 					$db->rollback();
 					return;
@@ -153,11 +167,11 @@ class ImageCleanup extends TableCleanup {
 	function buildSafeTitle( $name ) {
 		global $wgLegalTitleChars;
 		$x = preg_replace_callback(
-			"/([^$wgLegalTitleChars])/",
+			"/([^$wgLegalTitleChars]|~)/",
 			array( $this, 'hexChar' ),
 			$name );
 		
-		$test = Title::makeTitleSafe( NS_IMAGE, $x );
+		$test = Title::makeTitleSafe( NS_FILE, $x );
 		if( is_null( $test ) || $test->getDBkey() !== $x ) {
 			$this->log( "Unable to generate safe title from '$name', got '$x'" );
 			return false;
diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index a6991829..4d76ac7a 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -48,19 +48,30 @@ class TitleCleanup extends TableCleanup {
 
 		$title = Title::newFromText( $verified );
 
-		if( is_null( $title ) ) {
+		if( !is_null( $title ) && $title->equals( $current ) && $title->canExist() ) {
+			return $this->progress( 0 );  // all is fine
+		}
+
+		if( $row->page_namespace == NS_FILE && $this->fileExists( $row->page_title ) ) {
+			$this->log( "file $row->page_title needs cleanup, please run cleanupImages.php." );
+			return $this->progress( 0 );
+		} elseif( is_null( $title ) ) {
 			$this->log( "page $row->page_id ($display) is illegal." );
 			$this->moveIllegalPage( $row );
 			return $this->progress( 1 );
-		}
-
-		if( !$title->equals( $current ) ) {
+		} else {
 			$this->log( "page $row->page_id ($display) doesn't match self." );
 			$this->moveInconsistentPage( $row, $title );
 			return $this->progress( 1 );
 		}
+	}
 
-		$this->progress( 0 );
+	function fileExists( $name ) {
+		// XXX: Doesn't actually check for file existence, just presence of image record.
+		// This is reasonable, since cleanupImages.php only iterates over the image table.
+		$dbr = wfGetDB( DB_SLAVE );
+		$row = $dbr->selectRow( 'image', array( 'img_name' ), array( 'img_name' => $name ), __METHOD__ );
+		return $row !== false;
 	}
 
 	function moveIllegalPage( $row ) {
diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index d10948a0..5aeea781 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -2,9 +2,10 @@
 
 /**
  * Deletes a batch of pages
- * Usage: php deleteBatch.php [-u <user>] [-r <reason>] [-i <interval>] <listfile>
+ * Usage: php deleteBatch.php [-u <user>] [-r <reason>] [-i <interval>] [listfile]
  * where
- * 	<listfile> is a file where each line contains the title of a page to be deleted.
+ *	[listfile] is a file where each line contains the title of a page to be
+ *             deleted, standard input is used if listfile is not given.
  *	<user> is the username
  *	<reason> is the delete reason
  *	<interval> is the number of seconds to sleep for after each delete
@@ -70,7 +71,7 @@ for ( $linenum = 1; !feof( $file ); $linenum++ ) {
 
 	print $page->getPrefixedText();
 	$dbw->begin();
-	if( $page->getNamespace() == NS_IMAGE ) {
+	if( $page->getNamespace() == NS_FILE ) {
 		$art = new ImagePage( $page );
 		$img = wfFindFile( $art->mTitle );
 		if( !$img || !$img->delete( $reason ) ) {
diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index bb431242..de7ce655 100644
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -63,6 +63,8 @@ if( isset( $options['full'] ) ) {
 	$dumper->dump( WikiExporter::FULL, $textMode );
 } elseif( isset( $options['current'] ) ) {
 	$dumper->dump( WikiExporter::CURRENT, $textMode );
+} elseif( isset( $options['logs'] ) ) {
+	$dumper->dump( WikiExporter::LOGS );
 } else {
 	$dumper->progress( <<<ENDS
 This script dumps the wiki page database into an XML interchange wrapper
@@ -74,6 +76,7 @@ Usage: php dumpBackup.php <action> [<options>]
 Actions:
   --full      Dump complete history of every page.
   --current   Includes only the latest revision of each page.
+  --logs      Dump action logs for every page.
 
 Options:
   --quiet     Don't dump status reports to stderr.
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index eb4cc072..e85fe421 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -487,7 +487,7 @@ class TextPassDumper extends BackupDumper {
 
 	function clearOpenElement( $style ) {
 		if( $this->openElement ) {
-			$this->buffer .= wfElement( $this->openElement[0], $this->openElement[1], $style );
+			$this->buffer .= Xml::element( $this->openElement[0], $this->openElement[1], $style );
 			$this->openElement = false;
 		}
 	}
diff --git a/maintenance/edit.php b/maintenance/edit.php
index 037f9a9a..64178045 100644
--- a/maintenance/edit.php
+++ b/maintenance/edit.php
@@ -58,15 +58,20 @@ $text = file_get_contents( 'php://stdin' );
 
 # Do the edit
 print "Saving... ";
-$success = $wgArticle->doEdit( $text, $summary, 
+$status = $wgArticle->doEdit( $text, $summary, 
 	( $minor ? EDIT_MINOR : 0 ) |
 	( $bot ? EDIT_FORCE_BOT : 0 ) | 
 	( $autoSummary ? EDIT_AUTOSUMMARY : 0 ) |
 	( $noRC ? EDIT_SUPPRESS_RC : 0 ) );
-if ( $success ) {
+if ( $status->isOK() ) {
 	print "done\n";
+	$exit = 0;
 } else {
 	print "failed\n";
-	exit( 1 );
+	$exit = 1;
+}
+if ( !$status->isGood() ) {
+	print $status->getWikiText() . "\n";
 }
+exit( $exit );
 
diff --git a/maintenance/findhooks.php b/maintenance/findhooks.php
index 7a2ba53f..d7cad253 100644
--- a/maintenance/findhooks.php
+++ b/maintenance/findhooks.php
@@ -31,6 +31,7 @@ $pathinc = array(
 	$IP.'/includes/',
 	$IP.'/includes/api/',
 	$IP.'/includes/db/',
+	$IP.'/includes/diff/',
 	$IP.'/includes/filerepo/',
 	$IP.'/includes/parser/',
 	$IP.'/includes/specials/',
diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index cc3f523a..52dc33ae 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -80,8 +80,8 @@ class GenerateSitemap {
 		NS_USER_TALK		=> '0.1',
 		NS_PROJECT		=> '0.5',
 		NS_PROJECT_TALK		=> '0.1',
-		NS_IMAGE		=> '0.5',
-		NS_IMAGE_TALK		=> '0.1',
+		NS_FILE			=> '0.5',
+		NS_FILE_TALK		=> '0.1',
 		NS_MEDIAWIKI		=> '0.0',
 		NS_MEDIAWIKI_TALK	=> '0.1',
 		NS_TEMPLATE		=> '0.0',
@@ -424,7 +424,7 @@ class GenerateSitemap {
 	 *
 	 * @static
 	 *
-	 * @param string $url An RFC 2396 compilant URL
+	 * @param string $url An RFC 2396 compliant URL
 	 * @param string $date A ISO 8601 date
 	 * @param string $priority A priority indicator, 0.0 - 1.0 inclusive with a 0.1 stepsize
 	 *
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 99e69ce8..eb51126a 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -48,13 +48,10 @@ class BackupReader {
 
 	function handleRevision( $rev ) {
 		$title = $rev->getTitle();
-		if (!$title) {
+		if( !$title ) {
 			$this->progress( "Got bogus revision with null title!" );
 			return;
 		}
-		#$timestamp = $rev->getTimestamp();
-		#$display = $title->getPrefixedText();
-		#echo "$display $timestamp\n";
 
 		$this->revCount++;
 		$this->report();
@@ -79,6 +76,15 @@ class BackupReader {
 		}
 	}
 
+	function handleLogItem( $rev ) {
+		$this->revCount++;
+		$this->report();
+
+		if( !$this->dryRun ) {
+			call_user_func( $this->logItemCallback, $rev );
+		}
+	}
+
 	function report( $final = false ) {
 		if( $final xor ( $this->pageCount % $this->reportingInterval == 0 ) ) {
 			$this->showReport();
@@ -95,7 +101,11 @@ class BackupReader {
 				$rate = '-';
 				$revrate = '-';
 			}
-			$this->progress( "$this->pageCount ($rate pages/sec $revrate revs/sec)" );
+			# Logs dumps don't have page tallies
+			if( $this->pageCount )
+				$this->progress( "$this->pageCount ($rate pages/sec $revrate revs/sec)" );
+			else
+				$this->progress( "$this->revCount ($revrate revs/sec)" );
 		}
 		wfWaitForSlaves(5);
 	}
@@ -129,6 +139,8 @@ class BackupReader {
 			array( &$this, 'handleRevision' ) );
 		$this->uploadCallback = $importer->setUploadCallback(
 			array( &$this, 'handleUpload' ) );
+		$this->logItemCallback = $importer->setLogItemCallback(
+			array( &$this, 'handleLogItem' ) );
 
 		return $importer->doImport();
 	}
diff --git a/maintenance/importImages.inc.php b/maintenance/importImages.inc.php
index 53895778..290f3c07 100644
--- a/maintenance/importImages.inc.php
+++ b/maintenance/importImages.inc.php
@@ -46,4 +46,43 @@ function splitFilename( $filename ) {
 	unset( $parts[ count( $parts ) - 1 ] );
 	$fname = implode( '.', $parts );
 	return array( $fname, $ext );
+}
+
+/**
+ * Find an auxilliary file with the given extension, matching 
+ * the give base file path. $maxStrip determines how many extensions 
+ * may be stripped from the original file name before appending the
+ * new extension. For example, with $maxStrip = 1 (the default), 
+ * file files acme.foo.bar.txt and acme.foo.txt would be auxilliary
+ * files for acme.foo.bar and the extension ".txt". With $maxStrip = 2,
+ * acme.txt would also be acceptable.
+ *
+ * @param $file base path
+ * @param $auxExtension the extension to be appended to the base path
+ * @param $maxStrip the maximum number of extensions to strip from the base path (default: 1)
+ * @return string or false
+ */
+function findAuxFile( $file, $auxExtension, $maxStrip = 1 ) {
+	if ( strpos( $auxExtension, '.' ) !== 0 ) {
+		$auxExtension = '.' . $auxExtension;
+	}
+
+	$d = dirname( $file );
+	$n = basename( $file );
+
+	while ( $maxStrip >= 0 ) {
+		$f = $d . '/' . $n . $auxExtension;
+
+		if ( file_exists( $f ) ) {
+			return $f;
+		}
+
+		$idx = strrpos( $n, '.' );
+		if ( !$idx ) break;
+
+		$n = substr( $n, 0, $idx );
+		$maxStrip -= 1;
+	}
+
+	return false;
 }
\ No newline at end of file
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 63bbec5f..4c6082b2 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -9,7 +9,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-$optionsWithArguments = array( 'extensions', 'overwrite' );
+$optionsWithArgs = array( 'extensions', 'comment', 'comment-file', 'comment-ext', 'user', 'license' );
 require_once( 'commandLine.inc' );
 require_once( 'importImages.inc.php' );
 $added = $skipped = $overwritten = 0;
@@ -39,9 +39,19 @@ if( count( $args ) > 0 ) {
 	$wgUser = $user;
 
 	# Get the upload comment
-	$comment = isset( $options['comment'] )
-		? $options['comment']
-		: 'Importing image file';
+	$comment = 'Importing image file';
+
+	if ( isset( $options['comment-file'] ) ) {
+		$comment =  file_get_contents( $options['comment-file'] );
+		if ( $comment === false || $comment === NULL ) {
+			die( "failed to read comment file: {$options['comment-file']}\n" );
+		}
+	}
+	else if ( isset( $options['comment'] ) ) {
+		$comment =  $options['comment'];
+	}
+
+	$commentExt = isset( $options['comment-ext'] ) ? $options['comment-ext'] : false;
 
 	# Get the license specifier
 	$license = isset( $options['license'] ) ? $options['license'] : '';
@@ -53,7 +63,7 @@ if( count( $args ) > 0 ) {
 			$base = wfBaseName( $file );
 	
 			# Validate a title
-			$title = Title::makeTitleSafe( NS_IMAGE, $base );
+			$title = Title::makeTitleSafe( NS_FILE, $base );
 			if( !is_object( $title ) ) {
 				echo( "{$base} could not be imported; a valid title cannot be produced\n" );
 				continue;
@@ -75,15 +85,40 @@ if( count( $args ) > 0 ) {
 				$svar = 'added';
 			}
 
+			# Find comment text
+			$commentText = false;
+
+			if ( $commentExt ) {
+				$f = findAuxFile( $file, $commentExt );
+				if ( !$f ) {
+					echo( " No comment file with extension {$commentExt} found for {$file}, using default comment. " );
+				} else {
+					$commentText = file_get_contents( $f );
+					if ( !$f ) {
+						echo( " Failed to load comment file {$f}, using default comment. " );
+					}
+				}
+			}
+
+			if ( !$commentText ) {
+				$commentText = $comment;
+			}
+
 			# Import the file	
-			$archive = $image->publish( $file );
-			if( WikiError::isError( $archive ) || !$archive->isGood() ) {
-				echo( "failed.\n" );
-				continue;
+			if ( isset( $options['dry'] ) ) {
+				echo( " publishing {$file}... " );
+			} else {
+				$archive = $image->publish( $file );
+				if( WikiError::isError( $archive ) || !$archive->isGood() ) {
+					echo( "failed.\n" );
+					continue;
+				}
 			}
 
 			$$svar++;
-			if ( $image->recordUpload( $archive->value, $comment, $license ) ) {
+			if ( isset( $options['dry'] ) ) {
+				echo( "done.\n" );
+			} else if ( $image->recordUpload( $archive->value, $commentText, $license ) ) {
 				# We're done!
 				echo( "done.\n" );
 			} else {
@@ -123,10 +158,14 @@ USAGE: php importImages.php [options] <dir>
 
 Options:
 --extensions=<exts>	Comma-separated list of allowable extensions, defaults to \$wgFileExtensions
---overwrite			Overwrite existing images if a conflicting-named image is found
+--overwrite		Overwrite existing images if a conflicting-named image is found
 --user=<username> 	Set username of uploader, default 'Maintenance script'
 --comment=<text>  	Set upload summary comment, default 'Importing image file'
+--comment-file=<file>  	Set upload summary comment the the content of <file>.
+--comment-ext=<ext>  	Causes the comment for each file to be loaded from a file with the same name
+			but the extension <ext>.
 --license=<code>  	Use an optional license template
+--dry			Dry run, don't import anything
 
 END;
 	exit();
diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php
index 5004c3c0..0a0068d7 100644
--- a/maintenance/importTextFile.php
+++ b/maintenance/importTextFile.php
@@ -24,19 +24,19 @@ if( count( $args ) < 1 || isset( $options['help'] ) ) {
 		
 		$title = isset( $options['title'] ) ? $options['title'] : titleFromFilename( $filename );
 		$title = Title::newFromUrl( $title );
-		echo( "\nUsing title '" . $title->getPrefixedText() . "'..." );
 		
 		if( is_object( $title ) ) {
 			
+			echo( "\nUsing title '" . $title->getPrefixedText() . "'..." );
 			if( !$title->exists() || !isset( $options['nooverwrite'] ) ) {
 			
 				$text = file_get_contents( $filename );
 				$user = isset( $options['user'] ) ? $options['user'] : 'Maintenance script';
 				$user = User::newFromName( $user );
-				echo( "\nUsing username '" . $user->getName() . "'..." );
 				
 				if( is_object( $user ) ) {
 				
+					echo( "\nUsing username '" . $user->getName() . "'..." );
 					$wgUser =& $user;
 					$comment = isset( $options['comment'] ) ? $options['comment'] : 'Importing text file';
 					$flags = 0 | ( isset( $options['norc'] ) ? EDIT_SUPPRESS_RC : 0 );
diff --git a/maintenance/interwiki.sql b/maintenance/interwiki.sql
index c8e088f5..2521d381 100644
--- a/maintenance/interwiki.sql
+++ b/maintenance/interwiki.sql
@@ -8,22 +8,16 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local) VALUES
 ('arxiv','http://www.arxiv.org/abs/$1',0),
 ('c2find','http://c2.com/cgi/wiki?FindPage&value=$1',0),
 ('cache','http://www.google.com/search?q=cache:$1',0),
-('codersbase','http://www.codersbase.com/index.php/$1',0), # 2008-02-27: Fatal error
 ('commons','http://commons.wikimedia.org/wiki/$1',0),
 ('corpknowpedia','http://corpknowpedia.org/wiki/index.php/$1',0),
 ('dictionary','http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1',0),
 ('disinfopedia','http://www.disinfopedia.org/wiki.phtml?title=$1',0),
 ('docbook','http://wiki.docbook.org/topic/$1',0),
+('doi','http://dx.doi.org/$1',0),
 ('drumcorpswiki','http://www.drumcorpswiki.com/index.php/$1',0),
 ('dwjwiki','http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1',0),
-('efnetceewiki','http://purl.net/wiki/c/$1',0), # 2008-02-27: does not appear to be working
-('efnetcppwiki','http://purl.net/wiki/cpp/$1',0), # 2008-02-27: does not appear to be working
-('efnetpythonwiki','http://purl.net/wiki/python/$1',0), # 2008-02-27: does not appear to be working
-('efnetxmlwiki','http://purl.net/wiki/xml/$1',0), # 2008-02-27: does not appear to be working
-('eljwiki','http://elj.sourceforge.net/phpwiki/index.php/$1',0), # 2008-02-27: Fatal PhpWiki Error
 ('emacswiki','http://www.emacswiki.org/cgi-bin/wiki.pl?$1',0),
 ('elibre','http://enciclopedia.us.es/index.php/$1',0),
-('eokulturcentro','http://esperanto.toulouse.free.fr/wakka.php?wiki=$1',0), # 2007-02-27: no access to database
 ('foldoc','http://foldoc.org/?$1',0),
 ('foxwiki','http://fox.wikis.com/wc.dll?Wiki~$1',0),
 ('freebsdman','http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1',0),
@@ -31,12 +25,10 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local) VALUES
 ('gentoo-wiki','http://gentoo-wiki.com/$1',0),
 ('google','http://www.google.com/search?q=$1',0),
 ('googlegroups','http://groups.google.com/groups?q=$1',0),
-('gotamac','http://www.got-a-mac.org/$1',0), # 2008-02-27: appears ill maintained; loads of spambots
 ('hammondwiki','http://www.dairiki.org/HammondWiki/$1',0),
 ('hewikisource','http://he.wikisource.org/wiki/$1',1),
 ('hrwiki','http://www.hrwiki.org/index.php/$1',0),
 ('imdb','http://us.imdb.com/Title?$1',0),
-('infosecpedia','http://www.infosecpedia.org/pedia/index.php/$1',0), # 2008-02-27: lot of spambot activity
 ('jargonfile','http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1',0),
 ('jspwiki','http://www.jspwiki.org/wiki/$1',0),
 ('keiki','http://kei.ki/en/$1',0),
@@ -57,7 +49,6 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local) VALUES
 ('oeis','http://www.research.att.com/cgi-bin/access.cgi/as/njas/sequences/eisA.cgi?Anum=$1',0),
 ('openfacts','http://openfacts.berlios.de/index.phtml?title=$1',0),
 ('openwiki','http://openwiki.com/?$1',0),
-('orgpatterns','http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?$1',0), # 2008-02-27: may not be working. Please double check
 ('patwiki','http://gauss.ffii.org/$1',0), # 2008-02-27: lots of spambots
 ('pmeg','http://www.bertilow.com/pmeg/$1.php',0),
 ('ppr','http://c2.com/cgi/wiki?$1',0),
diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc
index 2cfd1b04..52281b57 100644
--- a/maintenance/language/checkLanguage.inc
+++ b/maintenance/language/checkLanguage.inc
@@ -13,41 +13,36 @@ class CheckLanguageCLI {
 	protected $checks = array();
 	protected $L = null;
 
-	protected $defaultChecks = array(
-		'untranslated', 'obsolete', 'variables', 'empty', 'plural',
-		'whitespace', 'xhtml', 'chars', 'links', 'unbalanced'
-	);
-
 	protected $results = array();
 
 	private $includeExif = false;
 
 	/**
-	 * GLOBALS: $wgLanguageCode;
+	 * Constructor.
+	 * @param $options Options for script.
 	 */
 	public function __construct( Array $options ) {
-
 		if ( isset( $options['help'] ) ) {
 			echo $this->help();
 			exit();
 		}
 
-		if ( isset($options['lang']) ) {
+		if ( isset( $options['lang'] ) ) {
 			$this->code = $options['lang'];
 		} else {
 			global $wgLanguageCode;
 			$this->code = $wgLanguageCode;
 		}
 
-		if ( isset($options['level']) ) {
+		if ( isset( $options['level'] ) ) {
 			$this->level = $options['level'];
 		}
 
-		$this->doLinks = isset($options['links']);
-		$this->includeExif = !isset($options['noexif']);
-		$this->checkAll = isset($options['all']);
+		$this->doLinks = isset( $options['links'] );
+		$this->includeExif = !isset( $options['noexif'] );
+		$this->checkAll = isset( $options['all'] );
 
-		if ( isset($options['wikilang']) ) {
+		if ( isset( $options['wikilang'] ) ) {
 			$this->wikiCode = $options['wikilang'];
 		}
 
@@ -55,57 +50,136 @@ class CheckLanguageCLI {
 			$this->checks = explode( ',', $options['whitelist'] );
 		} elseif ( isset( $options['blacklist'] ) ) {
 			$this->checks = array_diff(
-				$this->defaultChecks,
+				isset( $options['easy'] ) ? $this->easyChecks() : $this->defaultChecks(),
 				explode( ',', $options['blacklist'] )
 			);
+		} elseif ( isset( $options['easy'] ) ) {
+			$this->checks = $this->easyChecks();
 		} else {
-			$this->checks = $this->defaultChecks;
+			$this->checks = $this->defaultChecks();
 		}
 
-		if ( isset($options['output']) ) {
+		if ( isset( $options['output'] ) ) {
 			$this->output = $options['output'];
 		}
 
-		# Some additional checks not enabled by default
-		if ( isset( $options['duplicate'] ) ) {
-			$this->checks[] = 'duplicate';
-		}
-
 		$this->L = new languages( $this->includeExif );
 	}
 
+	/**
+	 * Get the default checks.
+	 * @return A list of the default checks.
+	 */
+	protected function defaultChecks() {
+		return array(
+			'untranslated', 'duplicate', 'obsolete', 'variables', 'empty', 'plural',
+			'whitespace', 'xhtml', 'chars', 'links', 'unbalanced', 'namespace',
+			'projecttalk', 'magic', 'magic-old', 'magic-over', 'magic-case',
+			'special', 'special-old',
+		);
+	}
+
+	/**
+	 * Get the checks which check other things than messages.
+	 * @return A list of the non-message checks.
+	 */
+	protected function nonMessageChecks() {
+		return array(
+			'namespace', 'projecttalk', 'magic', 'magic-old', 'magic-over',
+			'magic-case', 'special', 'special-old',
+		);
+	}
+
+	/**
+	 * Get the checks that can easily be treated by non-speakers of the language.
+	 * @return A list of the easy checks.
+	 */
+	protected function easyChecks() {
+		return array(
+			'duplicate', 'obsolete', 'empty', 'whitespace', 'xhtml', 'chars', 'magic-old',
+			'magic-over', 'magic-case', 'special-old',
+		);
+	}
+
+	/**
+	 * Get all checks.
+	 * @return An array of all check names mapped to their function names.
+	 */
 	protected function getChecks() {
-		$checks = array();
-		$checks['untranslated'] = 'getUntranslatedMessages';
-		$checks['duplicate'] = 'getDuplicateMessages';
-		$checks['obsolete'] = 'getObsoleteMessages';
-		$checks['variables'] = 'getMessagesWithoutVariables';
-		$checks['plural'] = 'getMessagesWithoutPlural';
-		$checks['empty'] = 'getEmptyMessages';
-		$checks['whitespace'] = 'getMessagesWithWhitespace';
-		$checks['xhtml'] = 'getNonXHTMLMessages';
-		$checks['chars'] = 'getMessagesWithWrongChars';
-		$checks['links'] = 'getMessagesWithDubiousLinks';
-		$checks['unbalanced'] = 'getMessagesWithUnbalanced';
-		return $checks;
+		return array(
+			'untranslated' => 'getUntranslatedMessages',
+			'duplicate'    => 'getDuplicateMessages',
+			'obsolete'     => 'getObsoleteMessages',
+			'variables'    => 'getMessagesWithMismatchVariables',
+			'plural'       => 'getMessagesWithoutPlural',
+			'empty'        => 'getEmptyMessages',
+			'whitespace'   => 'getMessagesWithWhitespace',
+			'xhtml'        => 'getNonXHTMLMessages',
+			'chars'        => 'getMessagesWithWrongChars',
+			'links'        => 'getMessagesWithDubiousLinks',
+			'unbalanced'   => 'getMessagesWithUnbalanced',
+			'namespace'    => 'getUntranslatedNamespaces',
+			'projecttalk'  => 'getProblematicProjectTalks',
+			'magic'        => 'getUntranslatedMagicWords',
+			'magic-old'    => 'getObsoleteMagicWords',
+			'magic-over'   => 'getOverridingMagicWords',
+			'magic-case'   => 'getCaseMismatchMagicWords',
+			'special'      => 'getUntraslatedSpecialPages',
+			'special-old'  => 'getObsoleteSpecialPages',
+		);
+	}
+
+	/**
+	 * Get total count for each check non-messages check.
+	 * @return An array of all check names mapped to a two-element array:
+	 * function name to get the total count and language code or null
+	 * for checked code.
+	 */
+	protected function getTotalCount() {
+		return array(
+			'namespace'    => array( 'getNamespaceNames', 'en' ),
+			'projecttalk'  => null,
+			'magic'        => array( 'getMagicWords', 'en' ),
+			'magic-old'    => array( 'getMagicWords', null ),
+			'magic-over'   => array( 'getMagicWords', null ),
+			'magic-case'   => array( 'getMagicWords', null ),
+			'special'      => array( 'getSpecialPageAliases', 'en' ),
+			'special-old'  => array( 'getSpecialPageAliases', null ),
+		);
 	}
 
+	/**
+	 * Get all check descriptions.
+	 * @return An array of all check names mapped to their descriptions.
+	 */
 	protected function getDescriptions() {
-		$descriptions = array();
-		$descriptions['untranslated'] = '$1 message(s) of $2 are not translated to $3, but exist in en:';
-		$descriptions['duplicate'] = '$1 message(s) of $2 are translated the same in en and $3:';
-		$descriptions['obsolete'] = '$1 message(s) of $2 do not exist in en or are in the ignore list, but are in $3';
-		$descriptions['variables'] = '$1 message(s) of $2 in $3 don\'t use some variables that en uses:';
-		$descriptions['plural'] = '$1 message(s) of $2 in $3 don\'t use {{plural}} while en uses:';
-		$descriptions['empty'] = '$1 message(s) of $2 in $3 are empty or -:';
-		$descriptions['whitespace'] = '$1 message(s) of $2 in $3 have trailing whitespace:';
-		$descriptions['xhtml'] = '$1 message(s) of $2 in $3 contain illegal XHTML:';
-		$descriptions['chars'] = '$1 message(s) of $2 in $3 include hidden chars which should not be used in the messages:';
-		$descriptions['links'] = '$1 message(s) of $2 in $3 have problematic link(s):';
-		$descriptions['unbalanced'] = '$1 message(s) of $2 in $3 have unbalanced {[]}:';
-		return $descriptions;
+		return array(
+			'untranslated' => '$1 message(s) of $2 are not translated to $3, but exist in en:',
+			'duplicate'    => '$1 message(s) of $2 are translated the same in en and $3:',
+			'obsolete'     => '$1 message(s) of $2 do not exist in en or are in the ignore list, but exist in $3:',
+			'variables'    => '$1 message(s) of $2 in $3 don\'t match the variables used in en:',
+			'plural'       => '$1 message(s) of $2 in $3 don\'t use {{plural}} while en uses:',
+			'empty'        => '$1 message(s) of $2 in $3 are empty or -:',
+			'whitespace'   => '$1 message(s) of $2 in $3 have trailing whitespace:',
+			'xhtml'        => '$1 message(s) of $2 in $3 contain illegal XHTML:',
+			'chars'        => '$1 message(s) of $2 in $3 include hidden chars which should not be used in the messages:',
+			'links'        => '$1 message(s) of $2 in $3 have problematic link(s):',
+			'unbalanced'   => '$1 message(s) of $2 in $3 have unbalanced {[]}:',
+			'namespace'    => '$1 namespace name(s) of $2 are not translated to $3, but exist in en:',
+			'projecttalk'  => '$1 namespace name(s) and alias(es) in $3 are project talk namespaces without the parameter:',
+			'magic'        => '$1 magic word(s) of $2 are not translated to $3, but exist in en:',
+			'magic-old'    => '$1 magic word(s) of $2 do not exist in en, but exist in $3:',
+			'magic-over'   => '$1 magic word(s) of $2 in $3 do not contain the original en word(s):',
+			'magic-case'   => '$1 magic word(s) of $2 in $3 change the case-sensitivity of the original en word:',
+			'special'      => '$1 special page alias(es) of $2 are not translated to $3, but exist in en:',
+			'special-old'  => '$1 special page alias(es) of $2 do not exist in en, but exist in $3:',
+		);
 	}
 
+	/**
+	 * Get help.
+	 * @return The help string.
+	 */
 	protected function help() {
 		return <<<ENDS
 Run this script to check a specific language file, or all of them.
@@ -114,24 +188,32 @@ Parameters:
 	* lang: Language code (default: the installation default language).
 	* all: Check all customized languages.
 	* help: Show this help.
-	* level: Show the following level (default: 2).
+	* level: Show the following display level (default: 2).
 	* links: Link the message values (default off).
 	* wikilang: For the links, what is the content language of the wiki to display the output in (default en).
 	* whitelist: Do only the following checks (form: code,code).
 	* blacklist: Don't do the following checks (form: code,code).
-	* duplicate: Additionally check for messages which are translated the same to English (default off).
+	* easy: Do only the easy checks, which can be treated by non-speakers of the language.
 	* noexif: Don't check for EXIF messages (a bit hard and boring to translate), if you know that they are currently not translated and want to focus on other problems (default off).
-Check codes (ideally, all of them should result 0; all the checks are executed by default (except duplicate and language specific check blacklists in checkLanguage.inc):
+Check codes (ideally, all of them should result 0; all the checks are executed by default (except language-specific check blacklists in checkLanguage.inc):
 	* untranslated: Messages which are required to translate, but are not translated.
 	* duplicate: Messages which translation equal to fallback
-	* obsolete: Messages which are untranslatable, but translated.
-	* variables: Messages without variables which should be used.
-	* empty: Empty messages.
+	* obsolete: Messages which are untranslatable or do not exist, but are translated.
+	* variables: Messages without variables which should be used, or with variables which shouldn't be used.
+	* empty: Empty messages and messages that contain only -.
 	* whitespace: Messages which have trailing whitespace.
 	* xhtml: Messages which are not well-formed XHTML (checks only few common errors).
 	* chars: Messages with hidden characters.
 	* links: Messages which contains broken links to pages (does not find all).
 	* unbalanced: Messages which contains unequal numbers of opening {[ and closing ]}.
+	* namespace: Namespace names that were not translated.
+	* projecttalk: Namespace names and aliases where the project talk does not contain $1.
+	* magic: Magic words that were not translated.
+	* magic-old: Magic words which do not exist.
+	* magic-over: Magic words that override the original English word.
+	* magic-case: Magic words whose translation changes the case-sensitivity of the original English word.
+	* special: Special page names that were not translated.
+	* special-old: Special page names which do not exist.
 Display levels (default: 2):
 	* 0: Skip the checks (useful for checking syntax).
 	* 1: Show only the stub headers and number of wrong messages, without list of messages.
@@ -141,10 +223,13 @@ Display levels (default: 2):
 ENDS;
 	}
 
+	/**
+	 * Execute the script.
+	 */
 	public function execute() {
 		$this->doChecks();
 		if ( $this->level > 0 ) {
-			switch ($this->output) {
+			switch ( $this->output ) {
 				case 'plain':
 					$this->outputText();
 					break;
@@ -152,11 +237,14 @@ ENDS;
 					$this->outputWiki();
 					break;
 				default:
-					throw new MWException( "Invalid output type $this->output");
+					throw new MWException( "Invalid output type $this->output" );
 			}
 		}
 	}
 
+	/**
+	 * Execute the checks.
+	 */
 	protected function doChecks() {
 		$ignoredCodes = array( 'en', 'enRTL' );
 
@@ -164,24 +252,33 @@ ENDS;
 		# Check the language
 		if ( $this->checkAll ) {
 			foreach ( $this->L->getLanguages() as $language ) {
-				if ( !in_array($language, $ignoredCodes) ) {
+				if ( !in_array( $language, $ignoredCodes ) ) {
 					$this->results[$language] = $this->checkLanguage( $language );
 				}
 			}
 		} else {
-			if ( in_array($this->code, $ignoredCodes) ) {
-				throw new MWException("Cannot check code $this->code.");
+			if ( in_array( $this->code, $ignoredCodes ) ) {
+				throw new MWException( "Cannot check code $this->code." );
 			} else {
 				$this->results[$this->code] = $this->checkLanguage( $this->code );
 			}
 		}
 	}
 
+	/**
+	 * Get the check blacklist.
+	 * @return The list of checks which should not be executed.
+	 */
 	protected function getCheckBlacklist() {
 		global $checkBlacklist;
 		return $checkBlacklist;
 	}
 
+	/**
+	 * Check a language.
+	 * @param $code The language code.
+	 * @return The results.
+	 */
 	protected function checkLanguage( $code ) {
 		# Syntax check only
 		if ( $this->level === 0 ) {
@@ -193,22 +290,28 @@ ENDS;
 		$checkFunctions = $this->getChecks();
 		$checkBlacklist = $this->getCheckBlacklist();
 		foreach ( $this->checks as $check ) {
-			if ( isset($checkBlacklist[$code]) &&
-				in_array($check, $checkBlacklist[$code]) ) {
+			if ( isset( $checkBlacklist[$code] ) &&
+				in_array( $check, $checkBlacklist[$code] ) ) {
 				$result[$check] = array();
 				continue;
 			}
 
 			$callback = array( $this->L, $checkFunctions[$check] );
-			if ( !is_callable($callback ) ) {
+			if ( !is_callable( $callback ) ) {
 				throw new MWException( "Unkown check $check." );
 			}
-			$results[$check] = call_user_func( $callback , $code );
+			$results[$check] = call_user_func( $callback, $code );
 		}
 
 		return $results;
 	}
 
+	/**
+	 * Format a message key.
+	 * @param $key The message key.
+	 * @param $code The language code.
+	 * @return The formatted message key.
+	 */
 	protected function formatKey( $key, $code ) {
 		if ( $this->doLinks ) {
 			$displayKey = ucfirst( $key );
@@ -222,28 +325,44 @@ ENDS;
 		}
 	}
 
+	/**
+	 * Output the checks results as plain text.
+	 * @return The checks results as plain text.
+	 */
 	protected function outputText() {
 		foreach ( $this->results as $code => $results ) {
 			$translated = $this->L->getMessages( $code );
 			$translated = count( $translated['translated'] );
-			$translatable = $this->L->getGeneralMessages();
-			$translatable = count( $translatable['translatable'] );
 			foreach ( $results as $check => $messages ) {
 				$count = count( $messages );
 				if ( $count ) {
+					if ( $check == 'untranslated' ) {
+						$translatable = $this->L->getGeneralMessages();
+						$total = count( $translatable['translatable'] );
+					} elseif ( in_array( $check, $this->nonMessageChecks() ) ) {
+						$totalCount = $this->getTotalCount();
+						$totalCount = $totalCount[$check];
+						$callback = array( $this->L, $totalCount[0] );
+						$callCode = $totalCount[1] ? $totalCount[1] : $code;
+						$total = count( call_user_func( $callback, $callCode ) );
+					} else {
+						$total = $translated;
+					}
 					$search = array( '$1', '$2', '$3' );
-					$replace = array( $count, $check == 'untranslated' ? $translatable: $translated, $code );
+					$replace = array( $count, $total, $code );
 					$descriptions = $this->getDescriptions();
 					echo "\n" . str_replace( $search, $replace, $descriptions[$check] ) . "\n";
 					if ( $this->level == 1 ) {
 						echo "[messages are hidden]\n";
 					} else {
 						foreach ( $messages as $key => $value ) {
-							$displayKey = $this->formatKey( $key, $code );
-							if ( $this->level == 2 ) {
-								echo "* $displayKey\n";
+							if( !in_array( $check, $this->nonMessageChecks() ) ) {
+								$key = $this->formatKey( $key, $code );
+							}
+							if ( $this->level == 2 || empty( $value ) ) {
+								echo "* $key\n";
 							} else {
-								echo "* $displayKey:		'$value'\n";
+								echo "* $key:		'$value'\n";
 							}
 						}
 					}
@@ -253,7 +372,8 @@ ENDS;
 	}
 
 	/**
-	 * Globals: $wgContLang, $IP
+	 * Output the checks results as wiki text.
+	 * @return The checks results as wiki text.
 	 */
 	function outputWiki() {
 		global $wgContLang, $IP;
@@ -265,6 +385,9 @@ ENDS;
 			$problems = 0;
 			$detailTextForLangChecks = array();
 			foreach ( $results as $check => $messages ) {
+				if( in_array( $check, $this->nonMessageChecks() ) ) {
+					continue;
+				}
 				$count = count( $messages );
 				if ( $count ) {
 					$problems += $count;
@@ -273,7 +396,7 @@ ENDS;
 						$displayKey = $this->formatKey( $key, $code );
 						$messageDetails[] = $displayKey;
 					}
-					$detailTextForLangChecks[] = "===$code-$check===\n* " . implode( ', ', $messageDetails );
+					$detailTextForLangChecks[] = "=== $code-$check ===\n* " . implode( ', ', $messageDetails );
 					$numbers[] = "'''[[#$code-$check|$count]]'''";
 				} else {
 					$numbers[] = $count;
@@ -285,7 +408,10 @@ ENDS;
 				$detailText .= $detailTextForLang . implode( "\n", $detailTextForLangChecks ) . "\n";
 			}
 
-			if ( !$problems ) { continue; } // Don't list languages without problems
+			if ( !$problems ) {
+				# Don't list languages without problems
+				continue;
+			}
 			$language = $wgContLang->getLanguageName( $code );
 			$rows[] = "| $language || $code || $problems || " . implode( ' || ', $numbers );
 		}
@@ -297,7 +423,7 @@ ENDS;
 '''Check results are for:''' <code>$version</code>
 
 
-{| class="sortable wikitable" border="2" cellpadding="4" cellspacing="0" style="background-color: #F9F9F9; border: 1px #AAAAAA solid; border-collapse: collapse; clear:both;"
+{| class="sortable wikitable" border="2" cellpadding="4" cellspacing="0" style="background-color: #F9F9F9; border: 1px #AAAAAA solid; border-collapse: collapse; clear: both;"
 $tableRows
 |}
 
@@ -306,46 +432,50 @@ $detailText
 EOL;
 	}
 
+	/**
+	 * Check if there are any results for the checks, in any language.
+	 * @return True if there are any results, false if not.
+	 */
 	protected function isEmpty() {
-		$empty = true;
 		foreach( $this->results as $code => $results ) {
 			foreach( $results as $check => $messages ) {
 				if( !empty( $messages ) ) {
-					$empty = false;
-					break;
+					return false;
 				}
 			}
-			if( !$empty ) {
-				break;
-			}
 		}
-		return $empty;
+		return true;
 	}
 }
 
 class CheckExtensionsCLI extends CheckLanguageCLI {
 	private $extensions;
 
+	/**
+	 * Constructor.
+	 * @param $options Options for script.
+	 * @param $extension The extension name (or names).
+	 */
 	public function __construct( Array $options, $extension ) {
 		if ( isset( $options['help'] ) ) {
 			echo $this->help();
 			exit();
 		}
 
-		if ( isset($options['lang']) ) {
+		if ( isset( $options['lang'] ) ) {
 			$this->code = $options['lang'];
 		} else {
 			global $wgLanguageCode;
 			$this->code = $wgLanguageCode;
 		}
 
-		if ( isset($options['level']) ) {
+		if ( isset( $options['level'] ) ) {
 			$this->level = $options['level'];
 		}
 
-		$this->doLinks = isset($options['links']);
+		$this->doLinks = isset( $options['links'] );
 
-		if ( isset($options['wikilang']) ) {
+		if ( isset( $options['wikilang'] ) ) {
 			$this->wikiCode = $options['wikilang'];
 		}
 
@@ -353,14 +483,16 @@ class CheckExtensionsCLI extends CheckLanguageCLI {
 			$this->checks = explode( ',', $options['whitelist'] );
 		} elseif ( isset( $options['blacklist'] ) ) {
 			$this->checks = array_diff(
-				$this->defaultChecks,
+				isset( $options['easy'] ) ? $this->easyChecks() : $this->defaultChecks(),
 				explode( ',', $options['blacklist'] )
 			);
+		} elseif ( isset( $options['easy'] ) ) {
+			$this->checks = $this->easyChecks();
 		} else {
-			$this->checks = $this->defaultChecks;
+			$this->checks = $this->defaultChecks();
 		}
 
-		if ( isset($options['output']) ) {
+		if ( isset( $options['output'] ) ) {
 			$this->output = $options['output'];
 		}
 
@@ -372,23 +504,29 @@ class CheckExtensionsCLI extends CheckLanguageCLI {
 		$this->extensions = array();
 		$extensions = new PremadeMediawikiExtensionGroups();
 		$extensions->addAll();
-		if( $extension == 'all' ) {
-			foreach( MessageGroups::singleton()->getGroups() as $group ) {
-				if( strpos( $group->getId(), 'ext-' ) === 0 && !$group->isMeta() ) {
+		if ( $extension == 'all' ) {
+			foreach ( MessageGroups::singleton()->getGroups() as $group ) {
+				if ( strpos( $group->getId(), 'ext-' ) === 0 && !$group->isMeta() ) {
 					$this->extensions[] = new extensionLanguages( $group );
 				}
 			}
-		} elseif( $extension == 'wikimedia' ) {
+		} elseif ( $extension == 'wikimedia' ) {
 			$wikimedia = MessageGroups::getGroup( 'ext-0-wikimedia' );
-			foreach( $wikimedia->wmfextensions() as $extension ) {
+			foreach ( $wikimedia->wmfextensions() as $extension ) {
 				$group = MessageGroups::getGroup( $extension );
 				$this->extensions[] = new extensionLanguages( $group );
 			}
+		} elseif ( $extension == 'flaggedrevs' ) {
+			foreach ( MessageGroups::singleton()->getGroups() as $group ) {
+				if ( strpos( $group->getId(), 'ext-flaggedrevs-' ) === 0 && !$group->isMeta() ) {
+					$this->extensions[] = new extensionLanguages( $group );
+				}
+			}
 		} else {
 			$extensions = explode( ',', $extension );
-			foreach( $extensions as $extension ) {
+			foreach ( $extensions as $extension ) {
 				$group = MessageGroups::getGroup( 'ext-' . $extension );
-				if( $group ) {
+				if ( $group ) {
 					$extension = new extensionLanguages( $group );
 					$this->extensions[] = $extension;
 				} else {
@@ -398,25 +536,58 @@ class CheckExtensionsCLI extends CheckLanguageCLI {
 		}
 	}
 
+	/**
+	 * Get the default checks.
+	 * @return A list of the default checks.
+	 */
+	protected function defaultChecks() {
+		return array(
+			'untranslated', 'duplicate', 'obsolete', 'variables', 'empty', 'plural',
+			'whitespace', 'xhtml', 'chars', 'links', 'unbalanced',
+		);
+	}
+
+	/**
+	 * Get the checks which check other things than messages.
+	 * @return A list of the non-message checks.
+	 */
+	protected function nonMessageChecks() {
+		return array();
+	}
+
+	/**
+	 * Get the checks that can easily be treated by non-speakers of the language.
+	 * @return A list of the easy checks.
+	 */
+	protected function easyChecks() {
+		return array(
+			'duplicate', 'obsolete', 'empty', 'whitespace', 'xhtml', 'chars',
+		);
+	}
+
+	/**
+	 * Get help.
+	 * @return The help string.
+	 */
 	protected function help() {
 		return <<<ENDS
 Run this script to check the status of a specific language in extensions, or all of them.
 Command line settings are in form --parameter[=value], except for the first one.
 Parameters:
-	* First parameter (mandatory): Extension name, multiple extension names (separated by commas), "all" for all the extensions or "wikimedia" for extensions used by Wikimedia.
+	* First parameter (mandatory): Extension name, multiple extension names (separated by commas), "all" for all the extensions, "wikimedia" for extensions used by Wikimedia or "flaggedrevs" for all FLaggedRevs extension messages.
 	* lang: Language code (default: the installation default language).
 	* help: Show this help.
-	* level: Show the following level (default: 2).
+	* level: Show the following display level (default: 2).
 	* links: Link the message values (default off).
 	* wikilang: For the links, what is the content language of the wiki to display the output in (default en).
 	* whitelist: Do only the following checks (form: code,code).
 	* blacklist: Do not perform the following checks (form: code,code).
-	* duplicate: Additionally check for messages which are translated the same to English (default off).
-Check codes (ideally, all of them should result 0; all the checks are executed by default (except duplicate and language specific check blacklists in checkLanguage.inc):
+	* easy: Do only the easy checks, which can be treated by non-speakers of the language.
+Check codes (ideally, all of them should result 0; all the checks are executed by default (except language-specific check blacklists in checkLanguage.inc):
 	* untranslated: Messages which are required to translate, but are not translated.
 	* duplicate: Messages which translation equal to fallback
 	* obsolete: Messages which are untranslatable, but translated.
-	* variables: Messages without variables which should be used.
+	* variables: Messages without variables which should be used, or with variables which shouldn't be used.
 	* empty: Empty messages.
 	* whitespace: Messages which have trailing whitespace.
 	* xhtml: Messages which are not well-formed XHTML (checks only few common errors).
@@ -432,10 +603,17 @@ Display levels (default: 2):
 ENDS;
 	}
 
+	/**
+	 * Execute the script.
+	 */
 	public function execute() {
 		$this->doChecks();
 	}
 
+	/**
+	 * Check a language and show the results.
+	 * @param $code The language code.
+	 */
 	protected function checkLanguage( $code ) {
 		foreach( $this->extensions as $extension ) {
 			$this->L = $extension;
diff --git a/maintenance/language/checkLanguage.php b/maintenance/language/checkLanguage.php
index f8553a1e..7a4d3dd2 100644
--- a/maintenance/language/checkLanguage.php
+++ b/maintenance/language/checkLanguage.php
@@ -11,4 +11,9 @@ require_once( 'checkLanguage.inc' );
 require_once( 'languages.inc' );
 
 $cli = new CheckLanguageCLI( $options );
-$cli->execute();
+
+try {
+	$cli->execute();
+} catch( MWException $e ) {
+	print 'Error: ' . $e->getMessage() . "\n";
+}
diff --git a/maintenance/language/countMessages.php b/maintenance/language/countMessages.php
new file mode 100644
index 00000000..7d16915a
--- /dev/null
+++ b/maintenance/language/countMessages.php
@@ -0,0 +1,40 @@
+<?php
+
+require_once( dirname(__FILE__).'/../commandLine.inc' );
+
+global $IP;
+
+if ( !isset( $args[0] ) ) {
+	$dir = "$IP/languages/messages";
+} else {
+	$dir = $args[0];
+}
+
+$total = 0;
+$nonZero = 0;
+foreach ( glob( "$dir/*.php" ) as $file ) {
+	$baseName = basename( $file );
+	if( !preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $baseName, $m ) ) {
+		continue;
+	}
+	$code = str_replace( '_', '-', strtolower( $m[1] ) );
+	$numMessages = wfGetNumMessages( $file );
+	//print "$code: $numMessages\n";
+	$total += $numMessages;
+	if ( $numMessages > 0 ) {
+		$nonZero ++;
+	}
+}
+print "\nTotal: $total\n";
+print "Languages: $nonZero\n";
+
+function wfGetNumMessages( $file ) {
+	// Separate function to limit scope
+	require( $file );
+	if ( isset( $messages ) ) {
+		return count( $messages );
+	} else {
+		return 0;
+	}
+}
+
diff --git a/maintenance/language/diffLanguage.php b/maintenance/language/diffLanguage.php
index 389b01d5..9d395b3c 100644
--- a/maintenance/language/diffLanguage.php
+++ b/maintenance/language/diffLanguage.php
@@ -84,7 +84,6 @@ function getMediawikiMessages($languageCode = 'En') {
 		$langFile = $IP.'/languages/classes/Language'.$languageCode.'.php';
 		if (file_exists( $langFile ) ) {
 			print "Including $langFile\n";
-			global $wgNamespaceNamesEn;  // potentially unused global declaration?
 			include($langFile);
 		} else wfDie("ERROR: The file $langFile does not exist !\n");
 	}
diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc
index 6d16f80c..6159e844 100644
--- a/maintenance/language/languages.inc
+++ b/maintenance/language/languages.inc
@@ -11,12 +11,18 @@
  */
 class languages {
 	protected $mLanguages; # List of languages
+
 	protected $mRawMessages; # Raw list of the messages in each language
 	protected $mMessages; # Messages in each language (except for English), divided to groups
 	protected $mGeneralMessages; # General messages in English, divided to groups
 	protected $mIgnoredMessages; # All the messages which should be exist only in the English file
 	protected $mOptionalMessages; # All the messages which may be translated or not, depending on the language
 
+	protected $mNamespaceNames; # Namespace names
+	protected $mNamespaceAliases; # Namespace aliases
+	protected $mMagicWords; # Magic words
+	protected $mSpecialPageAliases; # Special page aliases
+
 	/**
 	 * Load the list of languages: all the Messages*.php
 	 * files in the languages directory.
@@ -64,24 +70,41 @@ class languages {
 	}
 
 	/**
-	 * Load the raw messages for a specific language from the messages file.
+	 * Load the language file.
 	 *
 	 * @param $code The language code.
 	 */
-	protected function loadRawMessages( $code ) {
-		if ( isset( $this->mRawMessages[$code] ) ) {
+	protected function loadFile( $code ) {
+		if ( isset( $this->mRawMessages[$code] ) &&
+			isset( $this->mNamespaceNames[$code] ) &&
+			isset( $this->mNamespaceAliases[$code] ) &&
+			isset( $this->mMagicWords[$code] ) &&
+			isset( $this->mSpecialPageAliases[$code] ) ) {
 			return;
 		}
+		$this->mRawMessages[$code] = array();
+		$this->mNamespaceNames[$code] = array();
+		$this->mNamespaceAliases[$code] = array();
+		$this->mMagicWords[$code] = array();
+		$this->mSpecialPageAliases[$code] = array();
 		$filename = Language::getMessagesFileName( $code );
 		if ( file_exists( $filename ) ) {
 			require( $filename );
 			if ( isset( $messages ) ) {
 				$this->mRawMessages[$code] = $messages;
-			} else {
-				$this->mRawMessages[$code] = array();
 			}
-		} else {
-			$this->mRawMessages[$code] = array();
+			if ( isset( $namespaceNames ) ) {
+				$this->mNamespaceNames[$code] = $namespaceNames;
+			}
+			if ( isset( $namespaceAliases ) ) {
+				$this->mNamespaceAliases[$code] = $namespaceAliases;
+			}
+			if ( isset( $magicWords ) ) {
+				$this->mMagicWords[$code] = $magicWords;
+			}
+			if ( isset( $specialPageAliases ) ) {
+				$this->mSpecialPageAliases[$code] = $specialPageAliases;
+			}
 		}
 	}
 
@@ -90,7 +113,7 @@ class languages {
 	 * all - all the messages.
 	 * required - messages which should be translated in order to get a complete translation.
 	 * optional - messages which can be translated, the fallback translation is used if not translated.
-	 * obsolete - messages which should not be translated, either because they are not exist, or they are ignored messages.
+	 * obsolete - messages which should not be translated, either because they do not exist, or they are ignored messages.
 	 * translated - messages which are either required or optional, but translated from English and needed.
 	 *
 	 * @param $code The language code.
@@ -99,7 +122,7 @@ class languages {
 		if ( isset( $this->mMessages[$code] ) ) {
 			return;
 		}
-		$this->loadRawMessages( $code );
+		$this->loadFile( $code );
 		$this->loadGeneralMessages();
 		$this->mMessages[$code]['all'] = $this->mRawMessages[$code];
 		$this->mMessages[$code]['required'] = array();
@@ -131,7 +154,7 @@ class languages {
 		if ( isset( $this->mGeneralMessages ) ) {
 			return;
 		}
-		$this->loadRawMessages( 'en' );
+		$this->loadFile( 'en' );
 		$this->mGeneralMessages['all'] = $this->mRawMessages['en'];
 		$this->mGeneralMessages['required'] = array();
 		$this->mGeneralMessages['optional'] = array();
@@ -156,7 +179,7 @@ class languages {
 	 * all - all the messages.
 	 * required - messages which should be translated in order to get a complete translation.
 	 * optional - messages which can be translated, the fallback translation is used if not translated.
-	 * obsolete - messages which should not be translated, either because they are not exist, or they are ignored messages.
+	 * obsolete - messages which should not be translated, either because they do not exist, or they are ignored messages.
 	 * translated - messages which are either required or optional, but translated from English and needed.
 	 *
 	 * @param $code The language code.
@@ -184,6 +207,54 @@ class languages {
 	}
 
 	/**
+	 * Get namespace names for a specific language.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return Namespace names.
+	 */
+	public function getNamespaceNames( $code ) {
+		$this->loadFile( $code );
+		return $this->mNamespaceNames[$code];
+	}
+
+	/**
+	 * Get namespace aliases for a specific language.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return Namespace aliases.
+	 */
+	public function getNamespaceAliases( $code ) {
+		$this->loadFile( $code );
+		return $this->mNamespaceAliases[$code];
+	}
+
+	/**
+	 * Get magic words for a specific language.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return Magic words.
+	 */
+	public function getMagicWords( $code ) {
+		$this->loadFile( $code );
+		return $this->mMagicWords[$code];
+	}
+
+	/**
+	 * Get special page aliases for a specific language.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return Special page aliases.
+	 */
+	public function getSpecialPageAliases( $code ) {
+		$this->loadFile( $code );
+		return $this->mSpecialPageAliases[$code];
+	}
+
+	/**
 	 * Get the untranslated messages for a specific language.
 	 *
 	 * @param $code The language code.
@@ -193,13 +264,7 @@ class languages {
 	public function getUntranslatedMessages( $code ) {
 		$this->loadGeneralMessages();
 		$this->loadMessages( $code );
-		$requiredGeneralMessages = array_keys( $this->mGeneralMessages['required'] );
-		$requiredMessages = array_keys( $this->mMessages[$code]['required'] );
-		$untranslatedMessages = array();
-		foreach ( array_diff( $requiredGeneralMessages, $requiredMessages ) as $key ) {
-			$untranslatedMessages[$key] = $this->mGeneralMessages['required'][$key];
-		}
-		return $untranslatedMessages;
+		return array_diff_key( $this->mGeneralMessages['required'], $this->mMessages[$code]['required'] );
 	}
 
 	/**
@@ -221,6 +286,13 @@ class languages {
 		return $duplicateMessages;
 	}
 
+	/**
+	 * Get the obsolete messages for a specific language.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The obsolete messages for this language.
+	 */
 	public function getObsoleteMessages( $code ) {
 		$this->loadGeneralMessages();
 		$this->loadMessages( $code );
@@ -228,17 +300,17 @@ class languages {
 	}
 
 	/**
-	 * Get the messages which do not use some variables.
+	 * Get the messages whose variables do not match the original ones.
 	 *
 	 * @param $code The language code.
 	 *
-	 * @return The messages which do not use some variables in this language.
+	 * @return The messages whose variables do not match the original ones.
 	 */
-	public function getMessagesWithoutVariables( $code ) {
+	public function getMessagesWithMismatchVariables( $code ) {
 		$this->loadGeneralMessages();
 		$this->loadMessages( $code );
 		$variables = array( '\$1', '\$2', '\$3', '\$4', '\$5', '\$6', '\$7', '\$8', '\$9' );
-		$messagesWithoutVariables = array();
+		$mismatchMessages = array();
 		foreach ( $this->mMessages[$code]['translated'] as $key => $value ) {
 			$missing = false;
 			foreach ( $variables as $var ) {
@@ -246,12 +318,16 @@ class languages {
 					!preg_match( "/$var/sU", $value ) ) {
 					$missing = true;
 				}
+				if ( !preg_match( "/$var/sU", $this->mGeneralMessages['translatable'][$key] ) &&
+					preg_match( "/$var/sU", $value ) ) {
+					$missing = true;
+				}
 			}
 			if ( $missing ) {
-				$messagesWithoutVariables[$key] = $value;
+				$mismatchMessages[$key] = $value;
 			}
 		}
-		return $messagesWithoutVariables;
+		return $mismatchMessages;
 	}
 
 	/**
@@ -376,6 +452,13 @@ class languages {
 		return $wrongCharsMessages;
 	}
 
+	/**
+	 * Get the messages which include dubious links.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The messages which include dubious links in this language.
+	 */
 	public function getMessagesWithDubiousLinks( $code ) {
 		$this->loadGeneralMessages();
 		$this->loadMessages( $code );
@@ -383,9 +466,9 @@ class languages {
 		$messages = array();
 		foreach ( $this->mMessages[$code]['translated'] as $key => $value ) {
 			$matches = array();
-			preg_match_all( "/\[\[([{$tc}]+)(?:\\|(.+?))?]]/sDu", $value, $matches);
+			preg_match_all( "/\[\[([{$tc}]+)(?:\\|(.+?))?]]/sDu", $value, $matches );
 			for ($i = 0; $i < count($matches[0]); $i++ ) {
-				if ( preg_match( "/.*project.*/isDu",  $matches[1][$i]) ) {
+				if ( preg_match( "/.*project.*/isDu",  $matches[1][$i] ) ) {
 					$messages[$key][] = $matches[0][$i];
 				}
 			}
@@ -398,19 +481,33 @@ class languages {
 		return $messages;
 	}
 
+	/**
+	 * Get the messages which include unbalanced brackets.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The messages which include unbalanced brackets in this language.
+	 */
 	public function getMessagesWithUnbalanced( $code ) {
 		$this->loadGeneralMessages();
 		$this->loadMessages( $code );
 		$messages = array();
 		foreach ( $this->mMessages[$code]['translated'] as $key => $value ) {
-
 			$a = $b = $c = $d = 0;
-			foreach ( preg_split('//', $value) as $char ) {
-				switch ($char) {
-					case '[': $a++; break;
-					case ']': $b++; break;
-					case '{': $c++; break;
-					case '}': $d++; break;
+			foreach ( preg_split( '//', $value ) as $char ) {
+				switch ( $char ) {
+					case '[':
+						$a++;
+						break;
+					case ']':
+						$b++;
+						break;
+					case '{':
+						$c++;
+						break;
+					case '}':
+						$d++;
+						break;
 				}
 			}
 
@@ -422,6 +519,175 @@ class languages {
 		return $messages;
 	}
 
+	/**
+	 * Get the untranslated namespace names.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The untranslated namespace names in this language.
+	 */
+	public function getUntranslatedNamespaces( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		return array_flip( array_diff_key( $this->mNamespaceNames['en'], $this->mNamespaceNames[$code] ) );
+	}
+
+	/**
+	 * Get the project talk namespace names with no $1.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The problematic project talk namespaces in this language.
+	 */
+	public function getProblematicProjectTalks( $code ) {
+		$this->loadFile( $code );
+		$namespaces = array();
+
+		# Check default namespace name
+		if( isset( $this->mNamespaceNames[$code][NS_PROJECT_TALK] ) ) {
+			$default = $this->mNamespaceNames[$code][NS_PROJECT_TALK];
+			if ( strpos( $default, '$1' ) === FALSE ) {
+				$namespaces[$default] = 'default';
+			}
+		}
+
+		# Check namespace aliases
+		foreach( $this->mNamespaceAliases[$code] as $key => $value ) {
+			if ( $value == NS_PROJECT_TALK && strpos( $key, '$1' ) === FALSE ) {
+				$namespaces[$key] = '';
+			}
+		}
+
+		return $namespaces;
+	}
+
+	/**
+	 * Get the untranslated magic words.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The untranslated magic words in this language.
+	 */
+	public function getUntranslatedMagicWords( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		$magicWords = array();
+		foreach ( $this->mMagicWords['en'] as $key => $value ) {
+			if ( !isset( $this->mMagicWords[$code][$key] ) ) {
+				$magicWords[$key] = $value[1];
+			}
+		}
+		return $magicWords;
+	}
+
+	/**
+	 * Get the obsolete magic words.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The obsolete magic words in this language.
+	 */
+	public function getObsoleteMagicWords( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		$magicWords = array();
+		foreach ( $this->mMagicWords[$code] as $key => $value ) {
+			if ( !isset( $this->mMagicWords['en'][$key] ) ) {
+				$magicWords[$key] = $value[1];
+			}
+		}
+		return $magicWords;
+	}
+
+	/**
+	 * Get the magic words that override the original English magic word.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The overriding magic words in this language.
+	 */
+	public function getOverridingMagicWords( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		$magicWords = array();
+		foreach ( $this->mMagicWords[$code] as $key => $local ) {
+			if ( !isset( $this->mMagicWords['en'][$key] ) ) {
+				# Unrecognized magic word
+				continue;
+			}
+			$en = $this->mMagicWords['en'][$key];
+			array_shift( $local );
+			array_shift( $en );
+			foreach ( $en as $word ) {
+				if ( !in_array( $word, $local ) ) {
+					$magicWords[$key] = $word;
+					break;
+				}
+			}
+		}
+		return $magicWords;
+	}
+
+	/**
+	 * Get the magic words which do not match the case-sensitivity of the original words.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The magic words whose case does not match in this language.
+	 */
+	public function getCaseMismatchMagicWords( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		$magicWords = array();
+		foreach ( $this->mMagicWords[$code] as $key => $local ) {
+			if ( !isset( $this->mMagicWords['en'][$key] ) ) {
+				# Unrecognized magic word
+				continue;
+			}
+			if ( $local[0] != $this->mMagicWords['en'][$key][0] ) {
+				$magicWords[$key] = $local[0];
+			}
+		}
+		return $magicWords;
+	}
+
+	/**
+	 * Get the untranslated special page names.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The untranslated special page names in this language.
+	 */
+	public function getUntraslatedSpecialPages( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		$specialPageAliases = array();
+		foreach ( $this->mSpecialPageAliases['en'] as $key => $value ) {
+			if ( !isset( $this->mSpecialPageAliases[$code][$key] ) ) {
+				$specialPageAliases[$key] = $value[0];
+			}
+		}
+		return $specialPageAliases;
+	}
+
+	/**
+	 * Get the obsolete special page names.
+	 *
+	 * @param $code The language code.
+	 *
+	 * @return The obsolete special page names in this language.
+	 */
+	public function getObsoleteSpecialPages( $code ) {
+		$this->loadFile( 'en' );
+		$this->loadFile( $code );
+		$specialPageAliases = array();
+		foreach ( $this->mSpecialPageAliases[$code] as $key => $value ) {
+			if ( !isset( $this->mSpecialPageAliases['en'][$key] ) ) {
+				$specialPageAliases[$key] = $value[0];
+			}
+		}
+		return $specialPageAliases;
+	}
 }
 
 class extensionLanguages extends languages {
@@ -449,11 +715,11 @@ class extensionLanguages extends languages {
 	}
 
 	/**
-	 * Load the raw messages for a specific language.
+	 * Load the language file.
 	 *
 	 * @param $code The language code.
 	 */
-	protected function loadRawMessages( $code ) {
+	protected function loadFile( $code ) {
 		if( !isset( $this->mRawMessages[$code] ) ) {
 			$this->mRawMessages[$code] = $this->mMessageGroup->load( $code );
 			if( empty( $this->mRawMessages[$code] ) ) {
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 67caaddd..1b95fe98 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -65,11 +65,13 @@ $wgIgnoredMessages = array(
 	'accesskey-preview',
 	'accesskey-diff',
 	'accesskey-compareselectedversions',
+	'accesskey-visualcomparison',
 	'accesskey-watch',
 	'accesskey-upload',
 	'addsection',
 	'anonnotice',
 	'autoblock_whitelist',
+	'searchmenu-help',
 	'googlesearch',
 	'opensearch-desc',
 	'exif-make-value',
@@ -83,7 +85,7 @@ $wgIgnoredMessages = array(
 	'markaspatrolledlink',
 	'newarticletextanon',
 	'newsectionheaderdefaultlevel',
-	'newtalkseperator',
+	'newtalkseparator',
 	'noarticletextanon',
 	'number_of_watching_users_RCview',
 	'pagecategorieslink',
@@ -103,6 +105,7 @@ $wgIgnoredMessages = array(
 	'sitetitle',
 	'sp-contributions-footer',
 	'sp-contributions-footer-anon',
+	'statistics-summary',
 	'statistics-footer',
 	'talkpagetext',
 	'trackback',
@@ -127,6 +130,7 @@ $wgIgnoredMessages = array(
 	'uncategorizedtemplates-summary',
 	'popularpages-summary',
 	'wantedcategories-summary',
+	'wantedfiles-summary',
 	'wantedpages-summary',
 	'mostlinked-summary',
 	'mostlinkedcategories-summary',
@@ -148,8 +152,11 @@ $wgIgnoredMessages = array(
 	'lonelypages-summary',
 	'unusedtemplates-summary',
 	'fewestrevisions-summary',
-	'missingfiles-summary',
 	'upload-summary',
+	'pagetitle-view-mainpage',
+	'newuserlogentry',
+	'restrictlogpage',
+	'wantedtemplates-summary',
 );
 
 /** Optional messages, which may be translated only if changed in the target language. */
@@ -162,6 +169,7 @@ $wgOptionalMessages = array(
 	'unit-pixel',
 	'userrights-irreversible-marker',
 	'tog-nolangconversion',
+	'tog-noconvertlink',
 	'yourvariant',
 	'variantname-zh-hans',
 	'variantname-zh-hant',
@@ -192,6 +200,14 @@ $wgOptionalMessages = array(
 	'resetpass_text',
 	'image_sample',
 	'media_sample',
+	'skinname-standard',
+	'skinname-nostalgia',
+	'skinname-cologneblue',
+	'skinname-monobook',
+	'skinname-myskin',
+	'skinname-chick',
+	'skinname-simple',
+	'skinname-modern',
 	'common.css',
 	'standard.css',
 	'nostalgia.css',
@@ -201,6 +217,8 @@ $wgOptionalMessages = array(
 	'chick.css',
 	'simple.css',
 	'modern.css',
+	'print.css',
+	'handheld.css',
 	'common.js',
 	'standard.js',
 	'nostalgia.js',
@@ -307,10 +325,15 @@ $wgOptionalMessages = array(
 	'semicolon-separator',
 	'comma-separator',
 	'colon-separator',
+	'pipe-separator',
+	'word-separator',
+	'ellipsis',
 	'autocomment-prefix',
 	'listgrouprights-right-display',
 	'timezone-utc',
-	'whatlinkshere-barrow',
+	'whatlinkshere-backlink',
+	'recentchangeslinked-backlink',
+	'diff-with-additional',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
@@ -481,6 +504,16 @@ $wgEXIFMessages = array(
 	'exif-lightsource-19',
 	'exif-lightsource-24',
 	'exif-lightsource-255',
+	'exif-flash-fired-0' ,
+	'exif-flash-fired-1' ,
+	'exif-flash-return-0' ,
+	'exif-flash-return-2' ,
+	'exif-flash-return-3' ,
+	'exif-flash-mode-1' ,
+	'exif-flash-mode-2' ,
+	'exif-flash-mode-3' ,
+	'exif-flash-function-1' ,
+	'exif-flash-redeye-1' ,
 	'exif-focalplaneresolutionunit-2',
 	'exif-sensingmethod-1',
 	'exif-sensingmethod-2',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index d99f2e45..d7475428 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -48,19 +48,20 @@ $wgMessageStructure = array(
 		'tog-watchlisthideown',
 		'tog-watchlisthidebots',
 		'tog-watchlisthideminor',
+		'tog-watchlisthideliu',
+		'tog-watchlisthideanons',
 		'tog-nolangconversion',
 		'tog-ccmeonemails',
 		'tog-diffonly',
 		'tog-showhiddencats',
+		'tog-noconvertlink',
+		'tog-norollbackdiff',
 	),
 	'underline' => array(
 		'underline-always',
 		'underline-never',
 		'underline-default',
 	),
-	'skinpreview' => array(
-		'skinpreview',
-	),
 	'dates' => array(
 		'sunday',
 		'monday',
@@ -217,8 +218,6 @@ $wgMessageStructure = array(
 	'links' => array(
 		'aboutsite',
 		'aboutpage',
-		'bugreports',
-		'bugreportspage',
 		'copyright',
 		'copyrightpagename',
 		'copyrightpage',
@@ -243,8 +242,6 @@ $wgMessageStructure = array(
 	'badaccess' => array(
 		'badaccess',
 		'badaccess-group0',
-		'badaccess-group1',
-		'badaccess-group2',
 		'badaccess-groups',
 	),
 	'versionrequired' => array(
@@ -255,17 +252,20 @@ $wgMessageStructure = array(
 		'ok',
 		'sitetitle',
 		'pagetitle',
+		'pagetitle-view-mainpage',
 		'sitesubtitle',
 		'retrievedfrom',
 		'youhavenewmessages',
 		'newmessageslink',
 		'newmessagesdifflink',
 		'youhavenewmessagesmulti',
-		'newtalkseperator',
+		'newtalkseparator',
 		'editsection',
 		'editsection-brackets',
 		'editold',
 		'viewsourceold',
+		'editlink',
+		'viewsourcelink',
 		'editsectionhint',
 		'toc',
 		'showtoc',
@@ -335,7 +335,6 @@ $wgMessageStructure = array(
 		'cannotdelete',
 		'badtitle',
 		'badtitletext',
-		'perfdisabled',
 		'perfcached',
 		'perfcachedts',
 		'querypage-no-updates',
@@ -371,7 +370,6 @@ $wgMessageStructure = array(
 		'remembermypassword',
 		'yourdomainname',
 		'externaldberror',
-		'loginproblem',
 		'login',
 		'nav-login-createaccount',
 		'loginprompt',
@@ -435,6 +433,7 @@ $wgMessageStructure = array(
 		'accountcreatedtext',
 		'createaccount-title',
 		'createaccount-text',
+		'login-throttled',
 		'loginlanguagelabel',
 		'loginlanguagelinks',
 	),
@@ -443,11 +442,17 @@ $wgMessageStructure = array(
 		'resetpass_announce',
 		'resetpass_text',
 		'resetpass_header',
+		'oldpassword',
+		'newpassword',
+		'retypenew',
 		'resetpass_submit',
 		'resetpass_success',
 		'resetpass_bad_temporary',
 		'resetpass_forbidden',
-		'resetpass_missing',
+		'resetpass-no-info',
+		'resetpass-submit-loggedin',
+		'resetpass-wrong-oldpass',
+		'resetpass-temp-password',
 	),
 	'toolbar' => array(
 		'bold_sample',
@@ -495,10 +500,6 @@ $wgMessageStructure = array(
 		'blockededitsource',
 		'whitelistedittitle',
 		'whitelistedittext',
-		'whitelistreadtitle',
-		'whitelistreadtext',
-		'whitelistacctitle',
-		'whitelistacctext',
 		'confirmedittitle',
 		'confirmedittext',
 		'nosuchsectiontitle',
@@ -561,6 +562,13 @@ $wgMessageStructure = array(
 		'permissionserrorstext',
 		'permissionserrorstext-withaction',
 		'recreate-deleted-warn',
+		'deleted-notice',
+		'deletelog-fulllog',
+		'edit-hook-aborted',
+		'edit-gone-missing',
+		'edit-conflict',
+		'edit-no-change',
+		'edit-already-exists',
 	),
 	'parserwarnings' => array(
 		'expensive-parserfunction-warning',
@@ -569,6 +577,8 @@ $wgMessageStructure = array(
 		'post-expand-template-inclusion-category',
 		'post-expand-template-argument-warning',
 		'post-expand-template-argument-category',
+		'parser-template-loop-warning',
+		'parser-template-recursion-depth-warning',
 	),
 	'undo' => array(
 		'undo-success',
@@ -584,9 +594,8 @@ $wgMessageStructure = array(
 	'history' => array(
 		'viewpagelogs',
 		'nohistory',
-		'revnotfound',
-		'revnotfoundtext',
 		'currentrev',
+		'currentrev-asof',
 		'revisionasof',
 		'revision-info',
 		'revision-info-current',
@@ -600,6 +609,7 @@ $wgMessageStructure = array(
 		'page_first',
 		'page_last',
 		'histlegend',
+		'history-fieldset-title',
 		'history_copyright',
 		'deletedrev',
 		'histfirst',
@@ -679,6 +689,7 @@ $wgMessageStructure = array(
 		'mergehistory-invalid-destination',
 		'mergehistory-autocomment',
 		'mergehistory-comment',
+		'mergehistory-same-destination',
 	),
 	'mergelog' => array(
 		'mergelog',
@@ -691,11 +702,68 @@ $wgMessageStructure = array(
 		'difference',
 		'lineno',
 		'compareselectedversions',
+		'visualcomparison',
+		'wikicodecomparison',
 		'editundo',
 		'diff-multi',
+		'diff-movedto',
+		'diff-styleadded',
+		'diff-added',
+		'diff-changedto',
+		'diff-movedoutof',
+		'diff-styleremoved',
+		'diff-removed',
+		'diff-changedfrom',
+		'diff-src',
+		'diff-withdestination',
+		'diff-with',
+		'diff-with-additional',
+		'diff-with-final',
+		'diff-width',
+		'diff-height',
+		'diff-p',
+		'diff-blockquote',
+		'diff-h1',
+		'diff-h2',
+		'diff-h3',
+		'diff-h4',
+		'diff-h5',
+		'diff-pre',
+		'diff-div',
+		'diff-ul',
+		'diff-ol',
+		'diff-li',
+		'diff-table',
+		'diff-tbody',
+		'diff-tr',
+		'diff-td',
+		'diff-th',
+		'diff-br',
+		'diff-hr',
+		'diff-code',
+		'diff-dl',
+		'diff-dt',
+		'diff-dd',
+		'diff-input',
+		'diff-form',
+		'diff-img',
+		'diff-span',
+		'diff-a',
+		'diff-i',
+		'diff-b',
+		'diff-strong',
+		'diff-em',
+		'diff-font',
+		'diff-big',
+		'diff-del',
+		'diff-tt',
+		'diff-sub',
+		'diff-sup',
+		'diff-strike',
 	),
 	'search' => array(
 		'searchresults',
+		'searchresults-title',
 		'searchresulttext',
 		'searchsubtitle',
 		'searchsubtitleinvalid',
@@ -709,6 +777,25 @@ $wgMessageStructure = array(
 		'prevn',
 		'nextn',
 		'viewprevnext',
+		'searchmenu-legend',
+		'searchmenu-exists',
+		'searchmenu-new',
+		'searchhelp-url',
+		'searchmenu-prefix',
+		'searchmenu-help',
+		'searchprofile-articles',
+		'searchprofile-articles-and-proj',
+		'searchprofile-project',
+		'searchprofile-images',
+		'searchprofile-everything',
+		'searchprofile-advanced',
+		'searchprofile-articles-tooltip',
+		'searchprofile-project-tooltip',
+		'searchprofile-images-tooltip',
+		'searchprofile-everything-tooltip',
+		'searchprofile-advanced-tooltip',
+		'prefs-search-nsdefault',
+		'prefs-search-nscustom',
 		'search-result-size',
 		'search-result-score',
 		'search-redirect',
@@ -719,15 +806,16 @@ $wgMessageStructure = array(
 		'search-interwiki-custom',
 		'search-interwiki-more',
 		'search-mwsuggest-enabled',
-		'search-mwsuggest-disabled',	
+		'search-mwsuggest-disabled',
 		'search-relatedarticle',
 		'mwsuggest-disable',
-		'searchrelated',	
+		'searchrelated',
 		'searchall',
 		'showingresults',
 		'showingresultsnum',
 		'showingresultstotal',
 		'nonefound',
+		'search-nonefound',
 		'powersearch',
 		'powersearch-legend',
 		'powersearch-ns',
@@ -756,6 +844,7 @@ $wgMessageStructure = array(
 		'qbsettings-floatingright',
 		'changepassword',
 		'skin',
+		'skin-preview',
 		'math',
 		'dateformat',
 		'datedefault',
@@ -773,14 +862,15 @@ $wgMessageStructure = array(
 		'prefs-rc',
 		'prefs-watchlist',
 		'prefs-watchlist-days',
+		'prefs-watchlist-days-max',
 		'prefs-watchlist-edits',
+		'prefs-watchlist-edits-max',
 		'prefs-misc',
+		'prefs-resetpass',
 		'saveprefs',
 		'resetprefs',
-		'oldpassword',
-		'newpassword',
-		'retypenew',
 		'textboxsize',
+		'prefs-edit-boxsize',
 		'rows',
 		'columns',
 		'searchresultshead',
@@ -789,11 +879,15 @@ $wgMessageStructure = array(
 		'contextchars',
 		'stub-threshold',
 		'recentchangesdays',
+		'recentchangesdays-max',
 		'recentchangescount',
 		'savedprefs',
 		'timezonelegend',
 		'timezonetext',
 		'localtime',
+		'timezoneselect',
+		'timezoneuseserverdefault',
+		'timezoneuseoffset',
 		'timezoneoffset',
 		'servertime',
 		'guesstimezone',
@@ -802,6 +896,7 @@ $wgMessageStructure = array(
 		'prefs-namespaces',
 		'defaultns',
 		'default',
+		'defaultns',
 		'files',
 	),
 	'userrights' => array(
@@ -859,6 +954,8 @@ $wgMessageStructure = array(
 		'right-minoredit',
 		'right-move',
 		'right-move-subpages',
+		'right-move-rootuserpages',
+		'right-movefile',
 		'right-suppressredirect',
 		'right-upload',
 		'right-reupload',
@@ -909,10 +1006,47 @@ $wgMessageStructure = array(
 		'rightslogentry',
 		'rightsnone',
 	),
+	'action' => array(
+		'action-read',
+		'action-edit',
+		'action-createpage',
+		'action-createtalk',
+		'action-createaccount',
+		'action-minoredit',
+		'action-move',
+		'action-move-subpages',
+		'action-move-rootuserpages',
+		'action-movefile',
+		'action-upload',
+		'action-reupload',
+		'action-reupload-shared',
+		'action-upload_by_url',
+		'action-writeapi',
+		'action-delete',
+		'action-deleterevision',
+		'action-deletedhistory',
+		'action-browsearchive',
+		'action-undelete',
+		'action-suppressrevision',
+		'action-suppressionlog',
+		'action-block',
+		'action-protect',
+		'action-import',
+		'action-importupload',
+		'action-patrol',
+		'action-autopatrol',
+		'action-unwatchedpages',
+		'action-trackback',
+		'action-mergehistory',
+		'action-userrights',
+		'action-userrights-interwiki',
+		'action-siteadmin',
+	),
 	'recentchanges' => array(
 		'nchanges',
 		'recentchanges',
 		'recentchanges-url',
+		'recentchanges-legend',
 		'recentchangestext',
 		'recentchanges-feed-description',
 		'rcnote',
@@ -939,10 +1073,13 @@ $wgMessageStructure = array(
 		'rc_categories_any',
 		'rc-change-size',
 		'newsectionsummary',
+		'rc-enhanced-expand',
+		'rc-enhanced-hide',
 	),
 	'recentchangeslinked' => array(
 		'recentchangeslinked',
 		'recentchangeslinked-title',
+		'recentchangeslinked-backlink',
 		'recentchangeslinked-noresult',
 		'recentchangeslinked-summary',
 		'recentchangeslinked-page',
@@ -995,6 +1132,7 @@ $wgMessageStructure = array(
 		'fileexists-forbidden',
 		'fileexists-shared-forbidden',
 		'file-exists-duplicate',
+		'file-deleted-duplicate',
 		'successfulupload',
 		'uploadwarning',
 		'savefile',
@@ -1036,18 +1174,19 @@ $wgMessageStructure = array(
 		'upload_source_url',
 		'upload_source_file',
 	),
-	'imagelist' => array(
-		'imagelist-summary',
-		'imagelist_search_for',
+	'filelist' => array(
+		'listfiles-summary',
+		'listfiles_search_for',
 		'imgfile',
-		'imagelist',
-		'imagelist_date',
-		'imagelist_name',
-		'imagelist_user',
-		'imagelist_size',
-		'imagelist_description',
-	),
-	'imagedesciption' => array(
+		'listfiles',
+		'listfiles_date',
+		'listfiles_name',
+		'listfiles_user',
+		'listfiles_size',
+		'listfiles_description',
+		'listfiles_count',
+	),
+	'filedescription' => array(
 		'filehist',
 		'filehist-help',
 		'filehist-deleteall',
@@ -1055,12 +1194,16 @@ $wgMessageStructure = array(
 		'filehist-revert',
 		'filehist-current',
 		'filehist-datetime',
+		'filehist-thumb',
+		'filehist-thumbtext',
+		'filehist-nothumb',
 		'filehist-user',
 		'filehist-dimensions',
 		'filehist-filesize',
 		'filehist-comment',
 		'imagelinks',
 		'linkstoimage',
+		'linkstoimage-more',
 		'nolinkstoimage',
 		'morelinkstoimage',
 		'redirectstofile',
@@ -1102,7 +1245,6 @@ $wgMessageStructure = array(
 		'filedelete-success-old',
 		'filedelete-nofile',
 		'filedelete-nofile-old',
-		'filedelete-iscurrent',
 		'filedelete-otherreason',
 		'filedelete-reason-otherlist',
 		'filedelete-reason-dropdown',
@@ -1139,10 +1281,23 @@ $wgMessageStructure = array(
 	),
 	'statistics' => array(
 		'statistics',
-		'sitestats',
-		'userstats',
-		'sitestatstext',
-		'userstatstext',
+		'statistics-summary',
+		'statistics-header-pages',
+		'statistics-header-edits',
+		'statistics-header-views',
+		'statistics-header-users',
+		'statistics-articles',
+		'statistics-pages',
+		'statistics-pages-desc',
+		'statistics-files',
+		'statistics-edits',
+		'statistics-edits-average',
+		'statistics-views-total',
+		'statistics-views-peredit',
+		'statistics-jobqueue',
+		'statistics-users',
+		'statistics-users-active',
+		'statistics-users-active-desc',
 		'statistics-mostpopular',
 		'statistics-footer',
 	),
@@ -1204,8 +1359,10 @@ $wgMessageStructure = array(
 		'wantedcategories-summary',
 		'wantedpages',
 		'wantedpages-summary',
-		'missingfiles',
-		'missingfiles-summary',
+		'wantedfiles',
+		'wantedfiles-summary',
+		'wantedtemplates',
+		'wantedtemplates-summary',
 		'mostlinked',
 		'mostlinked-summary',
 		'mostlinkedcategories',
@@ -1230,6 +1387,7 @@ $wgMessageStructure = array(
 		'protectedpages',
 		'protectedpages-indef',
 		'protectedpages-summary',
+		'protectedpages-cascade',
 		'protectedpagestext',
 		'protectedpagesempty',
 		'protectedtitles',
@@ -1238,6 +1396,8 @@ $wgMessageStructure = array(
 		'protectedtitlesempty',
 		'listusers',
 		'listusers-summary',
+		'listusers-editsonly',
+		'usereditcount',
 		'newpages',
 		'newpages-summary',
 		'newpages-username',
@@ -1262,6 +1422,7 @@ $wgMessageStructure = array(
 		'booksources-isbn',
 		'booksources-go',
 		'booksources-text',
+		'booksources-invalid-isbn',
 	),
 	'magicwords' => array(
 		'rfcurl',
@@ -1272,8 +1433,6 @@ $wgMessageStructure = array(
 		'speciallogtitlelabel',
 		'log',
 		'all-logs-page',
-		'log-search-legend',
-		'log-search-submit',
 		'alllogstext',
 		'logempty',
 		'log-title-wildcard',
@@ -1285,6 +1444,7 @@ $wgMessageStructure = array(
 		'nextpage',
 		'prevpage',
 		'allpagesfrom',
+		'allpagesto',
 		'allarticles',
 		'allinnamespace',
 		'allnotinnamespace',
@@ -1303,11 +1463,32 @@ $wgMessageStructure = array(
 		'special-categories-sort-count',
 		'special-categories-sort-abc',
 	),
+	'deletedcontribs' => array(
+		'deletedcontributions',
+	),
+	'linksearch' => array(
+		'linksearch',
+		'linksearch-pat',
+		'linksearch-ns',
+		'linksearch-ok',
+		'linksearch-text',
+		'linksearch-line',
+		'linksearch-error',
+	),
 	'listusers' => array(
 		'listusersfrom',
 		'listusers-submit',
 		'listusers-noresult',
 	),
+	'newuserlog' => array(
+		'newuserlogpage',
+		'newuserlogpagetext',
+		'newuserlogentry',
+		'newuserlog-byemail',
+		'newuserlog-create-entry',
+		'newuserlog-create2-entry',
+		'newuserlog-autocreate-entry',
+	),
 	'listgrouprights' => array(
 		'listgrouprights',
 		'listgrouprights-summary',
@@ -1316,6 +1497,10 @@ $wgMessageStructure = array(
 		'listgrouprights-helppage',
 		'listgrouprights-members',
 		'listgrouprights-right-display',
+		'listgrouprights-addgroup',
+		'listgrouprights-removegroup',
+		'listgrouprights-addgroup-all',
+		'listgrouprights-removegroup-all',
 	),
 	'emailuser' => array(
 		'mailnologin',
@@ -1327,6 +1512,9 @@ $wgMessageStructure = array(
 		'defemailsubject',
 		'noemailtitle',
 		'noemailtext',
+		'nowikiemailtitle',
+		'nowikiemailtext',
+		'email-legend',
 		'emailfrom',
 		'emailto',
 		'emailsubject',
@@ -1366,12 +1554,7 @@ $wgMessageStructure = array(
 		'iteminvalidname',
 		'wlnote',
 		'wlshowlast',
-		'watchlist-show-bots',
-		'watchlist-hide-bots',
-		'watchlist-show-own',
-		'watchlist-hide-own',
-		'watchlist-show-minor',
-		'watchlist-hide-minor',
+		'watchlist-options',
 	),
 	'watching' => array(
 		'watching',
@@ -1390,7 +1573,7 @@ $wgMessageStructure = array(
 		'enotif_anon_editor',
 		'enotif_body',
 	),
-	'deleteprotectrev' => array(
+	'delete' => array(
 		'deletepage',
 		'confirm',
 		'excontent',
@@ -1417,6 +1600,8 @@ $wgMessageStructure = array(
 		'delete-edit-reasonlist',
 		'delete-toobig',
 		'delete-warning-toobig',
+	),
+	'rollback' => array(
 		'rollback',
 		'rollback_short',
 		'rollbacklink',
@@ -1427,15 +1612,18 @@ $wgMessageStructure = array(
 		'revertpage',
 		'rollback-success',
 		'sessionfailure',
+	),
+	'protect' => array(
 		'protectlogpage',
 		'protectlogtext',
 		'protectedarticle',
 		'modifiedarticleprotection',
 		'unprotectedarticle',
+		'movedarticleprotection',
 		'protect-title',
+		'prot_1movedto2',
 		'protect-backlink',
 		'protect-legend',
-		'confirmprotect',
 		'protectcomment',
 		'protectexpiry',
 		'protect_expiry_invalid',
@@ -1452,8 +1640,17 @@ $wgMessageStructure = array(
 		'protect-level-sysop',
 		'protect-summary-cascade',
 		'protect-expiring',
+		'protect-expiry-indefinite',
 		'protect-cascade',
 		'protect-cantedit',
+		'protect-othertime',
+		'protect-othertime-op',
+		'protect-existing-expiry',
+		'protect-otherreason',
+		'protect-otherreason-op',
+		'protect-dropdown',
+		'protect-edit-reasonlist',
+		'protect-expiry-options',
 		'restriction-type',
 		'restriction-level',
 		'minimum-size',
@@ -1489,6 +1686,7 @@ $wgMessageStructure = array(
 		'undeletebtn',
 		'undeletelink',
 		'undeletereset',
+		'undeleteinvert',
 		'undeletecomment',
 		'undeletedarticle',
 		'undeletedrevisions',
@@ -1517,6 +1715,7 @@ $wgMessageStructure = array(
 	),
 	'contributions' => array(
 		'contributions',
+		'contributions-title',
 		'mycontris',
 		'contribsub2',
 		'nocontribs',
@@ -1527,6 +1726,7 @@ $wgMessageStructure = array(
 	'sp-contributions' => array(
 		'sp-contributions-newbies',
 		'sp-contributions-newbies-sub',
+		'sp-contributions-newbies-title',
 		'sp-contributions-blocklog',
 		'sp-contributions-search',
 		'sp-contributions-username',
@@ -1540,8 +1740,7 @@ $wgMessageStructure = array(
 		'whatlinkshere-title',
 		'whatlinkshere-summary',
 		'whatlinkshere-page',
-		'whatlinkshere-barrow',
-		'linklistsub',
+		'whatlinkshere-backlink',
 		'linkshere',
 		'nolinkshere',
 		'nolinkshere-ns',
@@ -1578,6 +1777,8 @@ $wgMessageStructure = array(
 		'ipbotherreason',
 		'ipbhidename',
 		'ipbwatchuser',
+		'ipballowusertalk',
+		'ipb-change-block',
 		'badipaddress',
 		'blockipsuccesssub',
 		'blockipsuccesstext',
@@ -1586,6 +1787,7 @@ $wgMessageStructure = array(
 		'ipb-unblock',
 		'ipb-blocklist-addr',
 		'ipb-blocklist',
+		'ipb-blocklist-contribs',
 		'unblockip',
 		'unblockiptext',
 		'ipusubmit',
@@ -1594,6 +1796,9 @@ $wgMessageStructure = array(
 		'ipblocklist',
 		'ipblocklist-legend',
 		'ipblocklist-username',
+		'ipblocklist-sh-userblocks',
+		'ipblocklist-sh-tempblocks',
+		'ipblocklist-sh-addressblocks',
 		'ipblocklist-summary',
 		'ipblocklist-submit',
 		'blocklistline',
@@ -1603,25 +1808,31 @@ $wgMessageStructure = array(
 		'noautoblockblock',
 		'createaccountblock',
 		'emailblock',
+		'blocklist-nousertalk',
 		'ipblocklist-empty',
 		'ipblocklist-no-results',
 		'blocklink',
 		'unblocklink',
+		'change-blocklink',
 		'contribslink',
 		'autoblocker',
 		'blocklogpage',
+		'blocklog-fulllog',
 		'blocklogentry',
+		'reblock-logentry',
 		'blocklogtext',
 		'unblocklogentry',
 		'block-log-flags-anononly',
 		'block-log-flags-nocreate',
 		'block-log-flags-noautoblock',
 		'block-log-flags-noemail',
+		'block-log-flags-nousertalk',
 		'block-log-flags-angry-autoblock',
 		'range_block_disabled',
 		'ipb_expiry_invalid',
 		'ipb_expiry_temp',
 		'ipb_already_blocked',
+		'ipb-needreblock',
 		'ipb_cant_unblock',
 		'ipb_blocked_as_range',
 		'ip_range_invalid',
@@ -1633,6 +1844,7 @@ $wgMessageStructure = array(
 		'sorbs',
 		'sorbsreason',
 		'sorbs_create_account_reason',
+		'cant-block-while-blocked',
 	),
 	'developertools' => array(
 		'lockdb',
@@ -1661,11 +1873,16 @@ $wgMessageStructure = array(
 		'movenologin',
 		'movenologintext',
 		'movenotallowed',
+		'movenotallowedfile',
+		'cant-move-user-page',
+		'cant-move-to-user-page',
 		'newtitle',
 		'move-watch',
 		'movepagebtn',
 		'pagemovedsub',
 		'movepage-moved',
+		'movepage-moved-redirect',
+		'movepage-moved-noredirect',
 		'articleexists',
 		'cantmove-titleprotected',
 		'talkexists',
@@ -1679,6 +1896,7 @@ $wgMessageStructure = array(
 		'movepage-max-pages',
 		'1movedto2',
 		'1movedto2_redir',
+		'move-redirect-suppressed',
 		'movelogpage',
 		'movelogpagetext',
 		'movereason',
@@ -1688,11 +1906,17 @@ $wgMessageStructure = array(
 		'delete_and_move_confirm',
 		'delete_and_move_reason',
 		'selfmove',
+		'immobile-source-namespace',
+		'immobile-target-namespace',
+		'immobile-target-namespace-iw',
+		'immobile-source-page',
+		'immobile-target-page',
 		'immobile_namespace',
 		'imagenocrossnamespace',
 		'imagetypemismatch',
 		'imageinvalidfilename',
 		'fix-double-redirects',
+		'move-leave-redirect',
 	),
 	'export' => array(
 		'export',
@@ -1728,9 +1952,12 @@ $wgMessageStructure = array(
 		'import',
 		'importinterwiki',
 		'import-interwiki-text',
+		'import-interwiki-source',
 		'import-interwiki-history',
 		'import-interwiki-submit',
 		'import-interwiki-namespace',
+		'import-upload-filename',
+		'import-comment',
 		'importtext',
 		'importstart',
 		'import-revision-count',
@@ -1821,6 +2048,7 @@ $wgMessageStructure = array(
 		'accesskey-preview',
 		'accesskey-diff',
 		'accesskey-compareselectedversions',
+		'accesskey-visualcomparison',
 		'accesskey-watch',
 		'accesskey-upload',
 	),
@@ -1885,6 +2113,8 @@ $wgMessageStructure = array(
 		'tooltip-watch',
 		'tooltip-recreate',
 		'tooltip-upload',
+		'tooltip-rollback',
+		'tooltip-undo',
 	),
 	'stylesheets' => array(
 		'common.css',
@@ -1896,6 +2126,8 @@ $wgMessageStructure = array(
 		'chick.css',
 		'simple.css',
 		'modern.css',
+		'print.css',
+		'handheld.css',
 	),
 	'scripts' => array(
 		'common.js',
@@ -1939,6 +2171,16 @@ $wgMessageStructure = array(
 		'numauthors',
 		'numtalkauthors',
 	),
+	'skin' => array(
+		'skinname-standard',
+		'skinname-nostalgia',
+		'skinname-cologneblue',
+		'skinname-monobook',
+		'skinname-myskin',
+		'skinname-chick',
+		'skinname-simple',
+		'skinname-modern',
+	),
 	'math' => array(
 		'mw_math_png',
 		'mw_math_simple',
@@ -1965,6 +2207,7 @@ $wgMessageStructure = array(
 		'patrol-log-line',
 		'patrol-log-auto',
 		'patrol-log-diff',
+		'log-show-hide-patrol',
 	),
 	'imagedeletion' => array(
 		'deletedrevision',
@@ -1979,6 +2222,9 @@ $wgMessageStructure = array(
 		'previousdiff',
 		'nextdiff',
 	),
+	'visual-comparison' => array(
+		'visual-comparison',
+	),
 	'media-info' => array(
 		'mediawarning',
 		'imagemaxsize',
@@ -1992,10 +2238,12 @@ $wgMessageStructure = array(
 		'show-big-image',
 		'show-big-image-thumb',
 	),
-	'newimages' => array(
+	'newfiles' => array(
 		'newimages',
 		'imagelisttext',
 		'newimages-summary',
+		'newimages-legend',
+		'newimages-label',
 		'showhidebots',
 		'noimages',
 		'ilsubmit',
@@ -2269,6 +2517,18 @@ $wgMessageStructure = array(
 		'exif-lightsource-24',
 		'exif-lightsource-255',
 	),
+	'exif-flash' => array(
+		'exif-flash-fired-0' ,
+		'exif-flash-fired-1' ,
+		'exif-flash-return-0' ,
+		'exif-flash-return-2' ,
+		'exif-flash-return-3' ,
+		'exif-flash-mode-1' ,
+		'exif-flash-mode-2' ,
+		'exif-flash-mode-3' ,
+		'exif-flash-function-1' ,
+		'exif-flash-redeye-1' ,
+	),
 	'exif-focalplaneresolutionunit' => array(
 		'exif-focalplaneresolutionunit-2',
 	),
@@ -2410,19 +2670,10 @@ $wgMessageStructure = array(
 	'unit-pixel' => array(
 		'unit-pixel',
 	),
-	'htmldump' => array(
-		'redirectingto',
-	),
 	'purge' => array(
-		'confirm_purge',
 		'confirm_purge_button',
-	),
-	'search2' => array(
-		'searchcontaining',
-		'searchnamed',
-		'articletitles',
-		'hideresults',
-		'useajaxsearch',
+		'confirm-purge-top',
+		'confirm-purge-bottom',
 	),
 	'separators' => array(
 		'catseparator',
@@ -2430,6 +2681,9 @@ $wgMessageStructure = array(
 		'comma-separator',
 		'colon-separator',
 		'autocomment-prefix',
+		'pipe-separator',
+		'word-separator',
+		'ellipsis',
 	),
 	'imgmulti' => array(
 		'imgmultipageprev',
@@ -2560,6 +2814,7 @@ $wgMessageStructure = array(
 	),
 	'CoreParserFunctions' => array(
 		'unknown_extension_tag',
+		'duplicate-defaultsort',
 	),
 	'version' => array(
 		'version',
@@ -2619,6 +2874,9 @@ $wgMessageStructure = array(
 		'blankpage',
 		'intentionallyblankpage',
 	),
+	'external_images' => array(
+		'external_image_whitelist',
+	),
 );
 
 /** Comments for each block */
@@ -2631,7 +2889,6 @@ XHTML id it should only appear once and include characters that are legal
 XHTML id names.",
 	'toggles'             => 'User preference toggles',
 	'underline'           => '',
-	'skinpreview'         => '',
 	'dates'               => 'Dates',
 	'categorypages'       => 'Categories related messages',
 	'mainpage'            => '',
@@ -2668,6 +2925,7 @@ XHTML id names.",
 	'group-member'        => '',
 	'grouppage'           => '',
 	'right'               => 'Rights',
+	'action'              => 'Associated actions - in the sentence "You do not have permission to X"',
 	'rightslog'           => 'User rights log',
 	'recentchanges'       => 'Recent changes',
 	'recentchangeslinked' => 'Recent changes linked',
@@ -2675,8 +2933,8 @@ XHTML id names.",
 	'upload-errors'       => '',
 	'upload-curl-errors'  => 'Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>',
 	'licenses'            => '',
-	'imagelist'           => 'Special:ImageList',
-	'imagedesciption'     => 'Image description page',
+	'filelist'            => 'Special:ListFiles',
+	'filedescription'     => 'File description page',
 	'filerevert'          => 'File reversion',
 	'filedelete'          => 'File deletion',
 	'mimesearch'          => 'MIME search',
@@ -2697,13 +2955,18 @@ XHTML id names.",
 	'logpages'            => 'Special:Log',
 	'allpages'            => 'Special:AllPages',
 	'categories'          => 'Special:Categories',
+	'deletedcontribs'     => 'Special:DeletedContributions',
+	'linksearch'          => 'Special:LinkSearch',
 	'listusers'           => 'Special:ListUsers',
+	'newuserlog'          => 'Special:Log/newusers',
 	'listgrouprights'     => 'Special:ListGroupRights',
 	'emailuser'           => 'E-mail user',
 	'watchlist'           => 'Watchlist',
 	'watching'            => 'Displayed when you click the "watch" button and it is in the process of watching',
 	'enotif'              => '',
-	'deleteprotectrev'    => 'Delete/protect/revert',
+	'delete'              => 'Delete',
+	'rollback'            => 'Rollback',
+	'protect'             => 'Protect',
 	'restrictions'        => 'Restrictions (nouns)',
 	'restriction-levels'  => 'Restriction levels',
 	'undelete'            => 'Undelete',
@@ -2727,12 +2990,13 @@ XHTML id names.",
 	'attribution'         => 'Attribution',
 	'spamprotection'      => 'Spam protection',
 	'info'                => 'Info page',
+	'skin'                => 'Skin names',
 	'math'                => 'Math options',
 	'patrolling'          => 'Patrolling',
 	'patrol-log'          => 'Patrol log',
 	'imagedeletion'       => 'Image deletion',
 	'browsediffs'         => 'Browsing diffs',
-	'newimages'           => 'Special:NewImages',
+	'newfiles'           => 'Special:NewFiles',
 	'video-info'          => 'Video information, used by Language::formatTimePeriod() to format lengths in the above messages',
 	'badimagelist'        => 'Bad image list',
 	'variantname-zh'      => "Short names for language variants used for language conversion links.
@@ -2743,6 +3007,7 @@ Variants for Chinese language",
 	'variantname-kk'      => 'Variants for Kazakh language',
 	'variantname-ku'      => 'Variants for Kurdish language',
 	'variantname-tg'      => 'Variants for Tajiki language',
+	'visual-comparison'   => 'Visual comparison',
 	'media-info'          => 'Media information',
 	'metadata'            => 'Metadata',
 	'exif'                           => 'EXIF tags',
@@ -2759,6 +3024,7 @@ Variants for Chinese language",
 	'exif-subjectdistance-value'     => '',
 	'exif-meteringmode'              => '',
 	'exif-lightsource'               => '',
+	'exif-flash'                     => 'Flash modes',
 	'exif-focalplaneresolutionunit'  => '',
 	'exif-sensingmethod'             => '',
 	'exif-filesource'                => '',
@@ -2785,9 +3051,7 @@ Variants for Chinese language",
 	'trackbacks'            => 'Trackbacks',
 	'deleteconflict'        => 'Delete conflict',
 	'unit-pixel'            => '',
-	'htmldump'              => 'HTML dump',
 	'purge'                 => 'action=purge',
-	'search2'               => 'AJAX search',
 	'separators'            => 'Separators for various lists, etc.',
 	'imgmulti'              => 'Multipage image navigation',
 	'tablepager'            => 'Table pager',
@@ -2808,6 +3072,7 @@ Variants for Chinese language",
 	'fileduplicatesearch'   => 'Special:FileDuplicateSearch',
 	'special-specialpages'  => 'Special:SpecialPages',
 	'special-blank'         => 'Special:BlankPage',
+	'external_images'       => 'External image whitelist',
 );
 
 /** Short comments for standalone messages */
@@ -2817,7 +3082,7 @@ $wgMessageComments = array(
 	'sitenotice'                  => 'the equivalent to wgSiteNotice',
 	'history-feed-item-nocomment' => 'user at time',
 	'editcomment'                 => 'only shown if there is an edit comment',
-	'revertpage'                  => 'Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from',
+	'revertpage'                  => 'Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from',
 	'lastmodifiedatby'            => '$1 date, $2 time, $3 user',
 	'exif-orientation-1'          => '0th row: top; 0th column: left',
 	'exif-orientation-2'          => '0th row: top; 0th column: right',
@@ -2829,7 +3094,10 @@ $wgMessageComments = array(
 	'exif-orientation-8'          => '0th row: left; 0th column: bottom',
 	'movepage-moved'              => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.',
 	'ipboptions'                  => 'display1:time1,display2:time2,...',
+	'protect-expiry-options'      => 'display1:time1,display2:time2,...',
 	'metadata-fields'             => 'Do not translate list items',
 	'version'                     => 'Not used as normal message but as header for the special page itself',
 	'userrights'                  => 'Not used as normal message but as header for the special page itself',
+	'revision-info'               => 'Additionally available: $3: revision id',
+	'revision-info-current'       => 'Available parameters: $1: timestamp; $2: userlinks; $3: revision id',
 );
diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php
index ee2b844c..b433abb4 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -96,12 +96,12 @@ foreach ( $wgLanguages->getLanguages() as $code ) {
 	$requiredMessagesPercent = $wgOut->formatPercent( $requiredMessagesNumber, $wgRequiredMessagesNumber );
 	$obsoleteMessagesNumber = count( $messages['obsolete'] );
 	$obsoleteMessagesPercent = $wgOut->formatPercent( $obsoleteMessagesNumber, $messagesNumber, true );
-	$messagesWithoutVariables = $wgLanguages->getMessagesWithoutVariables( $code );
+	$messagesWithMismatchVariables = $wgLanguages->getMessagesWithMismatchVariables( $code );
 	$emptyMessages = $wgLanguages->getEmptyMessages( $code );
 	$messagesWithWhitespace = $wgLanguages->getMessagesWithWhitespace( $code );
 	$nonXHTMLMessages = $wgLanguages->getNonXHTMLMessages( $code );
 	$messagesWithWrongChars = $wgLanguages->getMessagesWithWrongChars( $code );
-	$problematicMessagesNumber = count( array_unique( array_merge( $messagesWithoutVariables, $emptyMessages, $messagesWithWhitespace, $nonXHTMLMessages, $messagesWithWrongChars ) ) );
+	$problematicMessagesNumber = count( array_unique( array_merge( $messagesWithMismatchVariables, $emptyMessages, $messagesWithWhitespace, $nonXHTMLMessages, $messagesWithWrongChars ) ) );
 	$problematicMessagesPercent = $wgOut->formatPercent( $problematicMessagesNumber, $messagesNumber, true );
 
 	# Output them
diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 52e6ddc6..427e5d09 100644
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -7,10 +7,11 @@
  * @ingroup Maintenance
  * @author Tim Starling
  *
- * USAGE: php moveBatch.php [-u <user>] [-r <reason>] [-i <interval>] <listfile>
+ * USAGE: php moveBatch.php [-u <user>] [-r <reason>] [-i <interval>] [listfile]
  *
- * <listfile> - file with two titles per line, separated with pipe characters;
- * the first title is the source, the second is the destination
+ * [listfile] - file with two titles per line, separated with pipe characters;
+ * the first title is the source, the second is the destination.
+ * Standard input is used if listfile is not given.
  * <user> - username to perform moves as
  * <reason> - reason to be given for moves
  * <interval> - number of seconds to sleep after each move
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 92296eb9..fcc7d3a1 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -195,7 +195,7 @@ class NamespaceConflictChecker {
 
 	function reportConflict( $row, $suffix ) {
 		$newTitle = Title::makeTitleSafe( $row->namespace, $row->title );
-		if( !$newTitle ) {
+		if( is_null($newTitle) || !$newTitle->canExist() ) {
 			// Title is also an illegal title...
 			// For the moment we'll let these slide to cleanupTitles or whoever.
 			printf( "... %d (0,\"%s\")\n",
diff --git a/maintenance/nukePage.inc b/maintenance/nukePage.inc
index 9ac28034..a19c6df6 100644
--- a/maintenance/nukePage.inc
+++ b/maintenance/nukePage.inc
@@ -25,6 +25,7 @@ function NukePage( $name, $delete = false ) {
 	if( $title ) {
 		$id   = $title->getArticleID();
 		$real = $title->getPrefixedText();
+		$isGoodArticle = $title->isContentPage();
 		echo( "found \"$real\" with ID $id.\n" );
 		
 		# Get corresponding revisions
@@ -56,6 +57,16 @@ function NukePage( $name, $delete = false ) {
 			PurgeRedundantText( true );
 		}
 		
+		# Update stats as appropriate
+		if ( $delete ) {
+			echo( "Updating site stats..." );
+			$ga = $isGoodArticle ? -1 : 0; // if it was good, decrement that too
+			$stats = new SiteStatsUpdate( 0, -$count, $ga, -1 );
+			$stats->doUpdate();
+			echo( "done.\n" );
+		}
+		
+		
 	} else {
 		echo( "not found in database.\n" );
 		$dbw->commit();
@@ -74,14 +85,6 @@ function DeleteRevisions( $ids ) {
 	$dbw->query( "DELETE FROM $tbl_rev WHERE rev_id IN ( $set )" );
 	
 	$dbw->commit();	
-
-	#TODO: see if this is a "good" page, to decrement that as well.
-	$pages = $dbw->selectField('site_stats', 'ss_total_pages');
-	$pages--;
-	$dbw->update( 'site_stats', 
-		      array('ss_total_pages' => $pages ), 
-		      array( 'ss_row_id' => 1),
-		      __METHOD__ );
 	
 }
 
diff --git a/maintenance/ourusers.php b/maintenance/ourusers.php
index 620393fb..a7a3132b 100644
--- a/maintenance/ourusers.php
+++ b/maintenance/ourusers.php
@@ -14,42 +14,14 @@
 /** */
 $wikiuser_pass = `wikiuser_pass`;
 $wikiadmin_pass = `wikiadmin_pass`;
-$wikisql_pass = `wikisql_pass`;
+$nagios_pass = `nagios_sql_pass`;
 
-if ( @$argv[1] == 'yaseo' ) {
-	$hosts = array(
-		'localhost',
-		'211.115.107.158',
-		'211.115.107.159',
-		'211.115.107.160',
-		'211.115.107.138',
-		'211.115.107.139',
-		'211.115.107.140',
-		'211.115.107.141',
-		'211.115.107.142',
-		'211.115.107.143',
-		'211.115.107.144',
-		'211.115.107.145',
-		'211.115.107.146',
-		'211.115.107.147',
-		'211.115.107.148',
-		'211.115.107.149',
-		'211.115.107.150',
-		'211.115.107.152',
-		'211.115.107.153',
-		'211.115.107.154',
-		'211.115.107.155',
-		'211.115.107.156',
-		'211.115.107.157',
-	);
-} else {
-	$hosts = array(
-		'localhost',
-		'10.0.%',
-		'66.230.200.%',
-		'208.80.152.%',
-	);
-}
+$hosts = array(
+	'localhost',
+	'10.0.%',
+	'66.230.200.%',
+	'208.80.152.%',
+);
 
 $databases = array(
 	'%wik%',
@@ -60,7 +32,8 @@ print "/*!40100 set old_passwords=1 */;\n";
 print "/*!40100 set global old_passwords=1 */;\n";
 
 foreach( $hosts as $host ) {
-	print "--\n-- $host\n--\n\n-- wikiuser\n\n";
+	print "--\n-- $host\n--\n";
+	print "\n-- wikiuser\n\n";
 	print "GRANT REPLICATION CLIENT,PROCESS ON *.* TO 'wikiuser'@'$host' IDENTIFIED BY '$wikiuser_pass';\n";
 	print "GRANT ALL PRIVILEGES ON `boardvote%`.* TO 'wikiuser'@'$host' IDENTIFIED BY '$wikiuser_pass';\n";
 	foreach( $databases as $db ) {
@@ -73,6 +46,9 @@ foreach( $hosts as $host ) {
 	foreach ( $databases as $db ) {
 		print "GRANT ALL PRIVILEGES ON `$db`.* TO wikiadmin@'$host' IDENTIFIED BY '$wikiadmin_pass';\n";
 	}
+	print "\n-- nagios\n\n";
+	print "GRANT REPLICATION CLIENT ON *.* TO 'nagios'@'$host' IDENTIFIED BY '$nagios_pass';\n";
+
 	print "\n";
 }
 
diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index 2cb85d2c..7971e64e 100644
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -26,7 +26,7 @@
 
 /** */
 $options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record' );
-$optionsWithArgs = array( 'regex' );
+$optionsWithArgs = array( 'regex', 'seed' );
 
 require_once( 'commandLine.inc' );
 require_once( "$IP/maintenance/parserTestsParserHook.php" );
@@ -62,6 +62,10 @@ class ParserTest {
 	 */
 	private $oldTablePrefix;
 
+	private $maxFuzzTestLength = 300;
+	private $fuzzSeed = 0;
+	private $memoryLimit = 50;
+
 	/**
 	 * Sets terminal colorization and diff/quick modes depending on OS and
 	 * command-line options (--color and --quick).
@@ -117,6 +121,10 @@ class ParserTest {
 		}
 		$this->keepUploads = isset( $options['keep-uploads'] );
 
+		if ( isset( $options['seed'] ) ) {
+			$this->fuzzSeed = intval( $options['seed'] ) - 1;
+		}
+
 		$this->hooks = array();
 		$this->functionHooks = array();
 	}
@@ -134,6 +142,119 @@ class ParserTest {
 	}
 
 	/**
+	 * Run a fuzz test series
+	 * Draw input from a set of test files
+	 */
+	function fuzzTest( $filenames ) {
+		$dict = $this->getFuzzInput( $filenames );
+		$dictSize = strlen( $dict );
+		$logMaxLength = log( $this->maxFuzzTestLength );
+		$this->setupDatabase();
+		ini_set( 'memory_limit', $this->memoryLimit * 1048576 );
+
+		$numTotal = 0;
+		$numSuccess = 0;
+		$user = new User;
+		$opts = ParserOptions::newFromUser( $user );
+		$title = Title::makeTitle( NS_MAIN, 'Parser_test' );
+
+		while ( true ) {
+			// Generate test input
+			mt_srand( ++$this->fuzzSeed );
+			$totalLength = mt_rand( 1, $this->maxFuzzTestLength );
+			$input = '';
+			while ( strlen( $input ) < $totalLength ) {
+				$logHairLength = mt_rand( 0, 1000000 ) / 1000000 * $logMaxLength;
+				$hairLength = min( intval( exp( $logHairLength ) ), $dictSize );
+				$offset = mt_rand( 0, $dictSize - $hairLength );
+				$input .= substr( $dict, $offset, $hairLength );
+			}
+
+			$this->setupGlobals();
+			$parser = $this->getParser();
+			// Run the test
+			try {
+				$parser->parse( $input, $title, $opts );
+				$fail = false;
+			} catch ( Exception $exception ) {
+				$fail = true;
+			}
+
+			if ( $fail ) {
+				echo "Test failed with seed {$this->fuzzSeed}\n";
+				echo "Input:\n";
+				var_dump( $input );
+				echo "\n\n";
+				echo "$exception\n";
+			} else {
+				$numSuccess++;
+			}
+			$numTotal++;
+			$this->teardownGlobals();
+			$parser->__destruct();
+
+			if ( $numTotal % 100 == 0 ) {
+				$usage = intval( memory_get_usage( true ) / $this->memoryLimit / 1048576 * 100 );
+				echo "{$this->fuzzSeed}: $numSuccess/$numTotal (mem: $usage%)\n";
+				if ( $usage > 90 ) {
+					echo "Out of memory:\n";
+					$memStats = $this->getMemoryBreakdown();
+					foreach ( $memStats as $name => $usage ) {
+						echo "$name: $usage\n";
+					}
+					$this->abort();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get an input dictionary from a set of parser test files
+	 */
+	function getFuzzInput( $filenames ) {
+		$dict = '';
+		foreach( $filenames as $filename ) {
+			$contents = file_get_contents( $filename );
+			preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches );
+			foreach ( $matches[1] as $match ) {
+				$dict .= $match . "\n";
+			}
+		}
+		return $dict;
+	}
+
+	/**
+	 * Get a memory usage breakdown
+	 */
+	function getMemoryBreakdown() {
+		$memStats = array();
+		foreach ( $GLOBALS as $name => $value ) {
+			$memStats['$'.$name] = strlen( serialize( $value ) );
+		}
+		$classes = get_declared_classes();
+		foreach ( $classes as $class ) {
+			$rc = new ReflectionClass( $class );
+			$props = $rc->getStaticProperties();
+			$memStats[$class] = strlen( serialize( $props ) );
+			$methods = $rc->getMethods();
+			foreach ( $methods as $method ) {
+				$memStats[$class] += strlen( serialize( $method->getStaticVariables() ) );
+			}
+		}
+		$functions = get_defined_functions();
+		foreach ( $functions['user'] as $function ) {
+			$rf = new ReflectionFunction( $function );
+			$memStats["$function()"] = strlen( serialize( $rf->getStaticVariables() ) );
+		}
+		asort( $memStats );
+		return $memStats;
+	}
+
+	function abort() {
+		$this->abort();
+	}
+
+	/**
 	 * Run a series of tests listed in the given text files.
 	 * Each test consists of a brief description, wikitext input,
 	 * and the expected HTML output.
@@ -267,6 +388,24 @@ class ParserTest {
 	}
 
 	/**
+	 * Get a Parser object
+	 */
+	function getParser() {
+		global $wgParserConf;
+		$class = $wgParserConf['class'];
+		$parser = new $class( $wgParserConf );
+		foreach( $this->hooks as $tag => $callback ) {
+			$parser->setHook( $tag, $callback );
+		}
+		foreach( $this->functionHooks as $tag => $bits ) {
+			list( $callback, $flags ) = $bits;
+			$parser->setFunctionHook( $tag, $callback, $flags );
+		}
+		wfRunHooks( 'ParserTestParser', array( &$parser ) );
+		return $parser;
+	}
+
+	/**
 	 * Run a given wikitext input through a freshly-constructed wiki parser,
 	 * and compare the output against the expected results.
 	 * Prints status and explanatory messages to stdout.
@@ -276,7 +415,6 @@ class ParserTest {
 	 * @return bool
 	 */
 	private function runTest( $desc, $input, $result, $opts ) {
-		global $wgParserConf;
 		if( $this->showProgress ) {
 			$this->showTesting( $desc );
 		}
@@ -300,18 +438,7 @@ class ParserTest {
 		}
 
 		$noxml = (bool)preg_match( '~\\b noxml \\b~x', $opts );
-
-		$class = $wgParserConf['class'];
-		$parser = new $class( $wgParserConf );
-		foreach( $this->hooks as $tag => $callback ) {
-			$parser->setHook( $tag, $callback );
-		}
-		foreach( $this->functionHooks as $tag => $bits ) {
-			list( $callback, $flags ) = $bits;
-			$parser->setFunctionHook( $tag, $callback, $flags );
-		}
-		wfRunHooks( 'ParserTestParser', array( &$parser ) );
-
+		$parser = $this->getParser();
 		$title =& Title::makeTitle( NS_MAIN, $titleText );
 
 		$matches = array();
@@ -336,7 +463,11 @@ class ParserTest {
 				global $wgOut;
 				$wgOut->addCategoryLinks($output->getCategories());
 				$cats = $wgOut->getCategoryLinks();
-				$out = $this->tidy( implode( ' ', $cats['normal'] ) );
+				if ( isset( $cats['normal'] ) ) {
+					$out = $this->tidy( implode( ' ', $cats['normal'] ) );
+				} else {
+					$out = '';
+				}
 			}
 
 			$result = $this->tidy($result);
@@ -383,6 +514,8 @@ class ParserTest {
 			self::getOptionValue( '/variant=([a-z]+(?:-[a-z]+)?)/', $opts, false );
 		$maxtoclevel =
 			self::getOptionValue( '/wgMaxTocLevel=(\d+)/', $opts, 999 );
+		$linkHolderBatchSize = 
+			self::getOptionValue( '/wgLinkHolderBatchSize=(\d+)/', $opts, 1000 );
 
 		$settings = array(
 			'wgServer' => 'http://localhost',
@@ -426,8 +559,11 @@ class ParserTest {
 				'createpage'    => true,
 				'createtalk'    => true,
 			) ),
+			'wgNamespaceProtection' => array( NS_MEDIAWIKI => 'editinterface' ),
 			'wgDefaultExternalStore' => array(),
 			'wgForeignFileRepos' => array(),
+			'wgLinkHolderBatchSize' => $linkHolderBatchSize,
+			'wgEnforceHtmlIds' => true,
 			);
 		$this->savedGlobals = array();
 		foreach( $settings as $var => $val ) {
@@ -437,6 +573,7 @@ class ParserTest {
 		$langObj = Language::factory( $lang );
 		$GLOBALS['wgLang'] = $langObj;
 		$GLOBALS['wgContLang'] = $langObj;
+		$GLOBALS['wgMemc'] = new FakeMemCachedClient;
 
 		//$GLOBALS['wgMessageCache'] = new MessageCache( new BagOStuff(), false, 0, $GLOBALS['wgDBname'] );
 
@@ -484,9 +621,12 @@ class ParserTest {
 			throw new MWException( 'setupDatabase should be called before setupGlobals' );
 		}
 		$this->databaseSetupDone = true;
+		$this->oldTablePrefix = $wgDBprefix;
 
 		# CREATE TEMPORARY TABLE breaks if there is more than one server
-		if ( wfGetLB()->getServerCount() != 1 ) {
+		# FIXME: r40209 makes temporary tables break even with just one server
+		# FIXME: (bug 15892); disabling the feature entirely as a temporary fix
+		if ( true || wfGetLB()->getServerCount() != 1 ) {
 			$this->useTemporaryTables = false;
 		}
 
@@ -504,19 +644,28 @@ class ParserTest {
 				$def = '';
 			}
 			foreach ($tables as $tbl) {
+				# Clean up from previous aborted run.  So that table escaping
+				# works correctly across DB engines, we need to change the pre-
+				# fix back and forth so tableName() works right.
+				$this->changePrefix( $this->oldTablePrefix );
 				$oldTableName = $db->tableName( $tbl );
-				# Clean up from previous aborted run
-				if ( $db->tableExists( "`parsertest_$tbl`" ) ) {
-					$db->query("DROP TABLE `parsertest_$tbl`");
+				$this->changePrefix( 'parsertest_' );
+				$newTableName = $db->tableName( $tbl );
+
+				if ( $db->tableExists( $tbl ) ) {
+					$db->query("DROP TABLE $newTableName");
 				}
 				# Create new table
-				$db->query("CREATE $temporary TABLE `parsertest_$tbl` (LIKE $oldTableName $def)");
+				$db->query("CREATE $temporary TABLE $newTableName (LIKE $oldTableName $def)");
 			}
 		} else {
 			# Hack for MySQL versions < 4.1, which don't support
 			# "CREATE TABLE ... LIKE". Note that
 			# "CREATE TEMPORARY TABLE ... SELECT * FROM ... LIMIT 0"
 			# would not create the indexes we need....
+			#
+			# Note that we don't bother changing around the prefixes here be-
+			# cause we know we're using MySQL anyway.
 			foreach ($tables as $tbl) {
 				$oldTableName = $db->tableName( $tbl );
 				$res = $db->query("SHOW CREATE TABLE $oldTableName");
@@ -532,13 +681,15 @@ class ParserTest {
 			}
 		}
 
+		$this->changePrefix( 'parsertest_' );
+
 		# Hack: insert a few Wikipedia in-project interwiki prefixes,
 		# for testing inter-language links
-		$db->insert( '`parsertest_interwiki`', array(
-			array( 'iw_prefix' => 'Wikipedia',
+		$db->insert( 'interwiki', array(
+			array( 'iw_prefix' => 'wikipedia',
 				   'iw_url'    => 'http://en.wikipedia.org/wiki/$1',
 				   'iw_local'  => 0 ),
-			array( 'iw_prefix' => 'MeatBall',
+			array( 'iw_prefix' => 'meatball',
 				   'iw_url'    => 'http://www.usemod.com/cgi-bin/mb.pl?$1',
 				   'iw_local'  => 0 ),
 			array( 'iw_prefix' => 'zh',
@@ -556,7 +707,7 @@ class ParserTest {
 			) );
 
 		# Hack: Insert an image to work with
-		$db->insert( '`parsertest_image`', array(
+		$db->insert( 'image', array(
 			'img_name'        => 'Foobar.jpg',
 			'img_size'        => 12345,
 			'img_description' => 'Some lame file',
@@ -573,11 +724,7 @@ class ParserTest {
 			) );
 
 		# Update certain things in site_stats
-		$db->insert( '`parsertest_site_stats`', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
-
-		# Change the table prefix
-		$this->oldTablePrefix = $wgDBprefix;
-		$this->changePrefix( 'parsertest_' );
+		$db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
 	}
 
 	/**
@@ -609,11 +756,12 @@ class ParserTest {
 			return;
 		}
 
+		/*
 		$tables = $this->listTables();
 		$db = wfGetDB( DB_MASTER );
 		foreach ( $tables as $table ) {
 			$db->query( "DROP TABLE `parsertest_$table`" );
-		}
+		}*/
 	}
 	
 	/**
@@ -633,9 +781,11 @@ class ParserTest {
 		}
 
 		wfDebug( "Creating upload directory $dir\n" );
-		mkdir( $dir );
-		mkdir( $dir . '/3' );
-		mkdir( $dir . '/3/3a' );
+		if ( file_exists( $dir ) ) {
+			wfDebug( "Already exists!\n" );
+			return $dir;
+		}
+		wfMkdirParents( $dir . '/3/3a' );
 		copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" );
 		return $dir;
 	}
@@ -646,6 +796,8 @@ class ParserTest {
 	 */
 	private function teardownGlobals() {
 		RepoGroup::destroySingleton();
+		FileCache::destroySingleton();
+		LinkCache::singleton()->clear();
 		foreach( $this->savedGlobals as $var => $val ) {
 			$GLOBALS[$var] = $val;
 		}
@@ -1085,6 +1237,8 @@ class DbTestPreviewer extends TestRecorder  {
 				'ff' => 'still FAILING test(s) :(',
 			);
 
+			$prevResults = array();
+
 			$res = $this->db->select( 'testitem', array( 'ti_name', 'ti_success' ),
 				array( 'ti_run' => $this->prevRun ), __METHOD__ );
 			foreach ( $res as $row ) {
diff --git a/maintenance/parserTests.php b/maintenance/parserTests.php
index 192eeaa8..0d50feb1 100644
--- a/maintenance/parserTests.php
+++ b/maintenance/parserTests.php
@@ -28,22 +28,21 @@ require('parserTests.inc');
 if( isset( $options['help'] ) ) {
     echo <<<ENDS
 MediaWiki $wgVersion parser test suite
-Usage: php parserTests.php [--quick] [--quiet] [--show-output]
-                           [--color[=(yes|no)]]
-                           [--regex=<expression>] [--file=<testfile>]
-                           [--record] [--compare]
-                           [--help]
+Usage: php parserTests.php [options...]
+
 Options:
   --quick          Suppress diff output of failed tests
   --quiet          Suppress notification of passed tests (shows only failed tests)
   --show-output    Show expected and actual output
-  --color          Override terminal detection and force color output on or off
+  --color[=yes|no] Override terminal detection and force color output on or off
                    use wgCommandLineDarkBg = true; if your term is dark 
   --regex          Only run tests whose descriptions which match given regex
-  --file           Run test cases from a custom file instead of parserTests.txt
+  --file=<testfile> Run test cases from a custom file instead of parserTests.txt
   --record         Record tests in database
   --compare        Compare with recorded results, without updating the database.
   --keep-uploads   Re-use the same upload directory for each test, don't delete it
+  --fuzz           Do a fuzz test instead of a normal test
+  --seed <n>       Start the fuzz test from the specified seed
   --help           Show this help message
 
 
@@ -67,7 +66,10 @@ if( isset( $options['file'] ) ) {
 # Print out software version to assist with locating regressions
 $version = SpecialVersion::getVersion();
 echo( "This is MediaWiki version {$version}.\n\n" );
-$ok = $tester->runTestsFromFiles( $files );
-
-exit ($ok ? 0 : -1);
 
+if ( isset( $options['fuzz'] ) ) {
+	$tester->fuzzTest( $files );
+} else {
+	$ok = $tester->runTestsFromFiles( $files );
+	exit ($ok ? 0 : -1);
+}
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 07c897f1..c84e0e35 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1027,7 +1027,7 @@ URL-encoding in URL functions (single parameter)
 !! input
 {{localurl:Some page|amp=&}}
 !! result
-<p>/index.php?title=Some_page&amp;amp=%26
+<p>/index.php?title=Some_page&amp;amp=&amp;
 </p>
 !! end
 
@@ -1036,7 +1036,7 @@ URL-encoding in URL functions (multiple parameters)
 !! input
 {{localurl:Some page|q=?&amp=&}}
 !! result
-<p>/index.php?title=Some_page&amp;q=%3F&amp;amp=%26
+<p>/index.php?title=Some_page&amp;q=?&amp;amp=&amp;
 </p>
 !! end
 
@@ -1264,7 +1264,9 @@ Invalid attributes in table cell (bug 1830)
 !! end
 
 
-# FIXME: this one has incorrect tag nesting still.
+# FIXME: It's not clear at all that this is the result we want, but the actual
+# output right now is invalid XML, so clearly something is wrong.  The result
+# specified here is now valid XML, which is an improvement . . .
 !! test
 Table security: embedded pipes (http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html)
 !! input
@@ -1273,7 +1275,7 @@ Table security: embedded pipes (http://lists.wikimedia.org/mailman/htdig/wikitec
 !! result
 <table>
 <tr>
-<td><a href="ftp://|x||" class="external autonumber" title="ftp://|x||" rel="nofollow">[1]</td><td></a>" onmouseover="alert(document.cookie)">test
+<td><a href="ftp://|x||" class="external autonumber" title="ftp://|x||" rel="nofollow">[1]</a></td><td>" onmouseover="alert(document.cookie)"&gt;test
 </td>
 </tr>
 </table>
@@ -1321,6 +1323,33 @@ Broken link
 !! end
 
 !! test
+Broken link with fragment
+!! input
+[[Zigzagzogzagzig#zug]]
+!! result
+<p><a href="/index.php?title=Zigzagzogzagzig&amp;action=edit&amp;redlink=1" class="new" title="Zigzagzogzagzig (not yet written)">Zigzagzogzagzig#zug</a>
+</p>
+!! end
+
+!! test
+Special page link with fragment
+!! input
+[[Special:Version#anchor]]
+!! result
+<p><a href="/wiki/Special:Version#anchor" title="Special:Version">Special:Version#anchor</a>
+</p>
+!! end
+
+!! test
+Nonexistent special page link with fragment
+!! input
+[[Special:ThisNameWillHopefullyNeverBeUsed#anchor]]
+!! result
+<p><a href="/wiki/Special:ThisNameWillHopefullyNeverBeUsed" class="new" title="Special:ThisNameWillHopefullyNeverBeUsed (not yet written)">Special:ThisNameWillHopefullyNeverBeUsed#anchor</a>
+</p>
+!! end
+
+!! test
 Link with prefix
 !! input
 xxx[[main Page]], xxx[[Main Page]], Xxx[[main Page]] XXX[[main Page]], XXX[[Main Page]]
@@ -1334,7 +1363,7 @@ Link with suffix
 !! input
 [[Main Page]]xxx, [[Main Page]]XXX, [[Main Page]]!!!
 !! result
-<p><a href="/wiki/Main_Page" title="Main Page">Main Pagexxx</a>, <a href="/wiki/Main_Page" title="Main Page">Main PageXXX</a>, <a href="/wiki/Main_Page" title="Main Page">Main Page</a>!!!
+<p><a href="/wiki/Main_Page" title="Main Page">Main Pagexxx</a>, <a href="/wiki/Main_Page" title="Main Page">Main Page</a>XXX, <a href="/wiki/Main_Page" title="Main Page">Main Page</a>!!!
 </p>
 !! end
 
@@ -2067,7 +2096,7 @@ Namespace -1 {{ns:-1}}
 !! end
 
 !! test
-Namespace Project {{ns:User}}
+Namespace User {{ns:User}}
 !! input
 {{ns:User}}
 !! result
@@ -2075,6 +2104,64 @@ Namespace Project {{ns:User}}
 </p>
 !! end
 
+!! test
+Namespace User talk {{ns:User_talk}}
+!! input
+{{ns:User_talk}}
+!! result
+<p>User talk
+</p>
+!! end
+
+!! test
+Namespace User talk {{ns:uSeR tAlK}}
+!! input
+{{ns:uSeR tAlK}}
+!! result
+<p>User talk
+</p>
+!! end
+
+!! test
+Namespace File {{ns:File}}
+!! input
+{{ns:File}}
+!! result
+<p>File
+</p>
+!! end
+
+!! test
+Namespace File {{ns:Image}}
+!! input
+{{ns:Image}}
+!! result
+<p>File
+</p>
+!! end
+
+!! test
+Namespace (lang=de) Benutzer {{ns:User}}
+!! options
+language=de
+!! input
+{{ns:User}}
+!! result
+<p>Benutzer
+</p>
+!! end
+
+!! test
+Namespace (lang=de) Benutzer Diskussion {{ns:3}}
+!! options
+language=de
+!! input
+{{ns:3}}
+!! result
+<p>Benutzer Diskussion
+</p>
+!! end
+
 
 ###
 ### Magic links
@@ -2120,7 +2207,7 @@ PMID 1234
 ####
 
 !! test
-Nonexistant template
+Nonexistent template
 !! input
 {{thistemplatedoesnotexist}}
 !! result
@@ -2306,7 +2393,7 @@ Template with thumb image (with link in description)
 {{paramtest|
   param =[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption]]]]}}
 !! result
-This is a test template with parameter <div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/index.php?title=Special:Upload&amp;wpDestFile=Noimage.png" class="new" title="Image:Noimage.png">Image:Noimage.png</a>  <div class="thumbcaption"><a href="/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">link</a> <a href="/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">caption</a></div></div></div>
+This is a test template with parameter <div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/index.php?title=Special:Upload&amp;wpDestFile=Noimage.png" class="new" title="File:Noimage.png">File:Noimage.png</a>  <div class="thumbcaption"><a href="/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">link</a> <a href="/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">caption</a></div></div></div>
 
 !! end
 
@@ -2594,8 +2681,8 @@ Bug 6563: Edit link generation for section shown by <includeonly>
 !! input
 {{includeonly section}}
 !! result
-<a name="Includeonly_section"></a><h2><span class="editsection">[<a href="/index.php?title=Template:Includeonly_section&amp;action=edit&amp;section=T-1" title="Template:Includeonly section">edit</a>]</span> <span class="mw-headline">Includeonly section</span></h2>
-<a name="Section_T-1"></a><h2><span class="editsection">[<a href="/index.php?title=Template:Includeonly_section&amp;action=edit&amp;section=T-2" title="Template:Includeonly section">edit</a>]</span> <span class="mw-headline">Section T-1</span></h2>
+<a name="Includeonly_section" id="Includeonly_section"></a><h2><span class="editsection">[<a href="/index.php?title=Template:Includeonly_section&amp;action=edit&amp;section=T-1" title="Template:Includeonly section">edit</a>]</span> <span class="mw-headline">Includeonly section</span></h2>
+<a name="Section_T-1" id="Section_T-1"></a><h2><span class="editsection">[<a href="/index.php?title=Template:Includeonly_section&amp;action=edit&amp;section=T-2" title="Template:Includeonly section">edit</a>]</span> <span class="mw-headline">Section T-1</span></h2>
 
 !! end
 
@@ -2621,7 +2708,7 @@ Bug 6563: Edit link generation for section suppressed by <includeonly>
 </includeonly>
 ==Section 1==
 !! result
-<a name="Section_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Section 1">edit</a>]</span> <span class="mw-headline">Section 1</span></h2>
+<a name="Section_1" id="Section_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Section 1">edit</a>]</span> <span class="mw-headline">Section 1</span></h2>
 
 !! end
 
@@ -2662,7 +2749,7 @@ PST
 !! end
 
 !! test
-pre-save transform: nonexistant template
+pre-save transform: nonexistent template
 !! options
 PST
 !! input
@@ -3043,7 +3130,7 @@ Simple image
 !! input
 [[Image:foobar.jpg]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3052,36 +3139,101 @@ Right-aligned image
 !! input
 [[Image:foobar.jpg|right]]
 !! result
-<div class="floatright"><span><a href="/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div>
+<div class="floatright"><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
 
 !! end
 
 !! test
+Simple image (using File: namespace, now canonical)
+!! input
+[[File:foobar.jpg]]
+!! result
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="File:foobar.jpg"><img alt="File:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+</p>
+!! end
+
+!! test
 Image with caption
 !! input
 [[Image:foobar.jpg|right|Caption text]]
 !! result
-<div class="floatright"><span><a href="/wiki/Image:Foobar.jpg" class="image" title="Caption text"><img alt="Caption text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div>
+<div class="floatright"><a href="/wiki/File:Foobar.jpg" class="image" title="Caption text"><img alt="Caption text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
+
+!! end
+
+!! test
+Image with link parameter, wiki target
+!! input
+[[Image:foobar.jpg|link=Target page]]
+!! result
+<p><a href="/wiki/Target_page" title="Target page"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+</p>
+!! end
 
+!! test
+Image with link parameter, URL target
+!! input
+[[Image:foobar.jpg|link=http://example.com/]]
+!! result
+<p><a href="http://example.com/"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+</p>
 !! end
 
 !! test
+Image with empty link parameter
+!! input
+[[Image:foobar.jpg|link=]]
+!! result
+<p><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" />
+</p>
+!! end
+
+
+
+!! test
 Image with frame and link
 !! input
 [[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]]]
 !! result
-<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="This is a test image Main Page" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a>  <div class="thumbcaption">This is a test image <a href="/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
+<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="/wiki/File:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a>  <div class="thumbcaption">This is a test image <a href="/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
 
 !! end
 
 !! test
+Image with frame and link and explicit alt
+!! input
+[[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]|alt=Altitude]]
+!! result
+<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="/wiki/File:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="Altitude" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a>  <div class="thumbcaption">This is a test image <a href="/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
+
+!! end
+
+!! test
+Image with wiki markup in implicit alt
+!! input
+[[Image:Foobar.jpg|testing '''bold''' in alt]]
+!! result
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="testing bold in alt"><img alt="testing bold in alt" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+</p>
+!! end
+
+!! test
+Image with wiki markup in explicit alt
+!! input
+[[Image:Foobar.jpg|alt=testing '''bold''' in alt]]
+!! result
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="testing bold in alt" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+</p>
+!! end
+
+!! test
 Link to image page- image page normally doesn't exists, hence edit link
 Add test with existing image page
-#<p><a href="/wiki/Image:Test" title="Image:Test">Image:test</a>
+#<p><a href="/wiki/File:Test" title="Image:Test">Image:test</a>
 !! input
 [[:Image:test]]
 !! result
-<p><a href="/index.php?title=Image:Test&amp;action=edit&amp;redlink=1" class="new" title="Image:Test (not yet written)">Image:test</a>
+<p><a href="/index.php?title=File:Test&amp;action=edit&amp;redlink=1" class="new" title="File:Test (not yet written)">Image:test</a>
 </p>
 !! end
 
@@ -3090,7 +3242,7 @@ Frameless image caption with a free URL
 !! input
 [[Image:foobar.jpg|http://example.com]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3099,7 +3251,16 @@ Thumbnail image caption with a free URL
 !! input
 [[Image:foobar.jpg|thumb|http://example.com]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="http://example.com"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
+
+!! end
+
+!! test
+Thumbnail image caption with a free URL and explicit alt
+!! input
+[[Image:foobar.jpg|thumb|http://example.com|alt=Alteration]]
+!! result
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="http://example.com"><img alt="Alteration" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
 
 !! end
 
@@ -3108,7 +3269,7 @@ BUG 1887: A ISBN with a thumbnail
 !! input
 [[Image:foobar.jpg|thumb|ISBN 1235467890]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="ISBN 1235467890" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="/wiki/Special:BookSources/1235467890" class="internal">ISBN 1235467890</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="/wiki/Special:BookSources/1235467890" class="internal">ISBN 1235467890</a></div></div></div>
 
 !! end
 
@@ -3117,7 +3278,7 @@ BUG 1887: A RFC with a thumbnail
 !! input
 [[Image:foobar.jpg|thumb|This is RFC 12354]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="This is RFC 12354"><img alt="This is RFC 12354" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is <a href="http://tools.ietf.org/html/rfc12354" class="external" title="http://tools.ietf.org/html/rfc12354">RFC 12354</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="This is RFC 12354"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is <a href="http://tools.ietf.org/html/rfc12354" class="external" title="http://tools.ietf.org/html/rfc12354">RFC 12354</a></div></div></div>
 
 !! end
 
@@ -3126,7 +3287,7 @@ BUG 1887: A mailto link with a thumbnail
 !! input
 [[Image:foobar.jpg|thumb|Please mailto:nobody@example.com]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="Please mailto:nobody@example.com"><img alt="Please mailto:nobody@example.com" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>Please <a href="mailto:nobody@example.com" class="external free" title="mailto:nobody@example.com" rel="nofollow">mailto:nobody@example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="Please mailto:nobody@example.com"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>Please <a href="mailto:nobody@example.com" class="external free" title="mailto:nobody@example.com" rel="nofollow">mailto:nobody@example.com</a></div></div></div>
 
 !! end
 
@@ -3136,7 +3297,7 @@ so math is not stripped and turns up as escaped &lt;math&gt; tags.
 !! input
 [[Image:foobar.jpg|thumb|<math>2+2</math>]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="&lt;math&gt;2+2&lt;/math&gt;"><img alt="&lt;math&gt;2+2&lt;/math&gt;" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>&lt;math&gt;2+2&lt;/math&gt;</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="&lt;math&gt;2+2&lt;/math&gt;"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>&lt;math&gt;2+2&lt;/math&gt;</div></div></div>
 
 !! end
 
@@ -3147,7 +3308,7 @@ math
 !! input
 [[Image:foobar.jpg|thumb|<math>2+2</math>]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="2 + 2"><img alt="2 + 2" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><span class="texhtml">2 + 2</span></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="2 + 2"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><span class="texhtml">2 + 2</span></div></div></div>
 
 !! end
 
@@ -3157,7 +3318,7 @@ BUG 648: Frameless image caption with a link
 !! input
 [[Image:foobar.jpg|text with a [[link]] in it]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3166,7 +3327,7 @@ BUG 648: Frameless image caption with a link (suffix)
 !! input
 [[Image:foobar.jpg|text with a [[link]]foo in it]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="text with a linkfoo in it"><img alt="text with a linkfoo in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="text with a linkfoo in it"><img alt="text with a linkfoo in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3175,7 +3336,7 @@ BUG 648: Frameless image caption with an interwiki link
 !! input
 [[Image:foobar.jpg|text with a [[MeatBall:Link]] in it]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="text with a MeatBall:Link in it"><img alt="text with a MeatBall:Link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="text with a MeatBall:Link in it"><img alt="text with a MeatBall:Link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3184,7 +3345,7 @@ BUG 648: Frameless image caption with a piped interwiki link
 !! input
 [[Image:foobar.jpg|text with a [[MeatBall:Link|link]] in it]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3193,7 +3354,7 @@ Escape HTML special chars in image alt text
 !! input
 [[Image:foobar.jpg|& < > "]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="&amp; &lt; &gt; &quot;"><img alt="&amp; &lt; &gt; &quot;" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="&amp; &lt; &gt; &quot;"><img alt="&amp; &lt; &gt; &quot;" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3202,7 +3363,7 @@ BUG 499: Alt text should have &#1234;, not &amp;1234;
 !! input
 [[Image:foobar.jpg|&#9792;]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="♀"><img alt="♀" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="♀"><img alt="♀" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !! end
 
@@ -3220,7 +3381,7 @@ Image caption containing another image
 !! input
 [[Image:Foobar.jpg|thumb|This is a caption with another [[Image:icon.png|image]] inside it!]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="This is a caption with another Image:Icon.png inside it!"><img alt="This is a caption with another Image:Icon.png inside it!" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is a caption with another <a href="/index.php?title=Special:Upload&amp;wpDestFile=Icon.png" class="new" title="Image:Icon.png">Image:Icon.png</a> inside it!</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="This is a caption with another File:Icon.png inside it!"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is a caption with another <a href="/index.php?title=Special:Upload&amp;wpDestFile=Icon.png" class="new" title="File:Icon.png">File:Icon.png</a> inside it!</div></div></div>
 
 !! end
 
@@ -3230,7 +3391,7 @@ Image caption containing a newline
 [[Image:Foobar.jpg|This
 *is some text]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="This *is some text"><img alt="This *is some text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="This *is some text"><img alt="This *is some text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !!end
 
@@ -3240,7 +3401,7 @@ Bug 3090: External links other than http: in image captions
 !! input
 [[Image:Foobar.jpg|thumb|200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="This caption has irc and Secure ext links in it."><img alt="This caption has irc and Secure ext links in it." src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" width="200" height="23" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This caption has <a href="irc://example.net" class="external text" title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class="external text" title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a href="/wiki/File:Foobar.jpg" class="image" title="This caption has irc and Secure ext links in it."><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" width="200" height="23" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This caption has <a href="irc://example.net" class="external text" title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class="external text" title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div>
 
 !! end
 
@@ -3310,7 +3471,7 @@ Link to category
 !! input
 [[:Category:MediaWiki User's Guide]]
 !! result
-<p><a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User's Guide">Category:MediaWiki User's Guide</a>
+<p><a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User&#39;s Guide">Category:MediaWiki User's Guide</a>
 </p>
 !! end
 
@@ -3321,7 +3482,7 @@ cat
 !! input
 [[Category:MediaWiki User's Guide]]
 !! result
-<a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User's Guide">MediaWiki User's Guide</a>
+<a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User&#039;s Guide">MediaWiki User's Guide</a>
 !! end
 
 !! test
@@ -3362,13 +3523,13 @@ More
 ===Smaller headline===
 Blah blah
 !! result
-<a name="Headline_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Headline 1">edit</a>]</span> <span class="mw-headline"> Headline 1 </span></h2>
+<a name="Headline_1" id="Headline_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Headline 1">edit</a>]</span> <span class="mw-headline"> Headline 1 </span></h2>
 <p>Some text
 </p>
-<a name="Headline_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Headline 2">edit</a>]</span> <span class="mw-headline">Headline 2</span></h2>
+<a name="Headline_2" id="Headline_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Headline 2">edit</a>]</span> <span class="mw-headline">Headline 2</span></h2>
 <p>More
 </p>
-<a name="Smaller_headline"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Smaller headline">edit</a>]</span> <span class="mw-headline">Smaller headline</span></h3>
+<a name="Smaller_headline" id="Smaller_headline"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Smaller headline">edit</a>]</span> <span class="mw-headline">Smaller headline</span></h3>
 <p>Blah blah
 </p>
 !! end
@@ -3407,14 +3568,14 @@ Some text
 </li>
 </ul>
 </td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
-<a name="Headline_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Headline 1">edit</a>]</span> <span class="mw-headline"> Headline 1 </span></h2>
-<a name="Subheadline_1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Subheadline 1">edit</a>]</span> <span class="mw-headline"> Subheadline 1 </span></h3>
-<a name="Skipping_a_level"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Skipping a level">edit</a>]</span> <span class="mw-headline"> Skipping a level </span></h5>
-<a name="Skipping_a_level_2"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Skipping a level">edit</a>]</span> <span class="mw-headline"> Skipping a level </span></h6>
-<a name="Headline_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: Headline 2">edit</a>]</span> <span class="mw-headline"> Headline 2 </span></h2>
+<a name="Headline_1" id="Headline_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Headline 1">edit</a>]</span> <span class="mw-headline"> Headline 1 </span></h2>
+<a name="Subheadline_1" id="Subheadline_1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Subheadline 1">edit</a>]</span> <span class="mw-headline"> Subheadline 1 </span></h3>
+<a name="Skipping_a_level" id="Skipping_a_level"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Skipping a level">edit</a>]</span> <span class="mw-headline"> Skipping a level </span></h5>
+<a name="Skipping_a_level_2" id="Skipping_a_level_2"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Skipping a level">edit</a>]</span> <span class="mw-headline"> Skipping a level </span></h6>
+<a name="Headline_2" id="Headline_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: Headline 2">edit</a>]</span> <span class="mw-headline"> Headline 2 </span></h2>
 <p>Some text
 </p>
-<a name="Another_headline"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Another headline">edit</a>]</span> <span class="mw-headline">Another headline</span></h3>
+<a name="Another_headline" id="Another_headline"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Another headline">edit</a>]</span> <span class="mw-headline">Another headline</span></h3>
 
 !! end
 
@@ -3462,16 +3623,16 @@ Handling of sections up to level 6 and beyond
 </li>
 </ul>
 </td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
-<a name="Level_1_Heading"></a><h1><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Level 1 Heading">edit</a>]</span> <span class="mw-headline"> Level 1 Heading</span></h1>
-<a name="Level_2_Heading"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Level 2 Heading">edit</a>]</span> <span class="mw-headline"> Level 2 Heading</span></h2>
-<a name="Level_3_Heading"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Level 3 Heading">edit</a>]</span> <span class="mw-headline"> Level 3 Heading</span></h3>
-<a name="Level_4_Heading"></a><h4><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Level 4 Heading">edit</a>]</span> <span class="mw-headline"> Level 4 Heading</span></h4>
-<a name="Level_5_Heading"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: Level 5 Heading">edit</a>]</span> <span class="mw-headline"> Level 5 Heading</span></h5>
-<a name="Level_6_Heading"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Level 6 Heading">edit</a>]</span> <span class="mw-headline"> Level 6 Heading</span></h6>
-<a name=".3D_Level_7_Heading.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=7" title="Edit section: = Level 7 Heading=">edit</a>]</span> <span class="mw-headline">= Level 7 Heading=</span></h6>
-<a name=".3D.3D_Level_8_Heading.3D.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=8" title="Edit section: == Level 8 Heading==">edit</a>]</span> <span class="mw-headline">== Level 8 Heading==</span></h6>
-<a name=".3D.3D.3D_Level_9_Heading.3D.3D.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=9" title="Edit section: === Level 9 Heading===">edit</a>]</span> <span class="mw-headline">=== Level 9 Heading===</span></h6>
-<a name=".3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=10" title="Edit section: ==== Level 10 Heading====">edit</a>]</span> <span class="mw-headline">==== Level 10 Heading====</span></h6>
+<a name="Level_1_Heading" id="Level_1_Heading"></a><h1><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Level 1 Heading">edit</a>]</span> <span class="mw-headline"> Level 1 Heading</span></h1>
+<a name="Level_2_Heading" id="Level_2_Heading"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Level 2 Heading">edit</a>]</span> <span class="mw-headline"> Level 2 Heading</span></h2>
+<a name="Level_3_Heading" id="Level_3_Heading"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Level 3 Heading">edit</a>]</span> <span class="mw-headline"> Level 3 Heading</span></h3>
+<a name="Level_4_Heading" id="Level_4_Heading"></a><h4><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Level 4 Heading">edit</a>]</span> <span class="mw-headline"> Level 4 Heading</span></h4>
+<a name="Level_5_Heading" id="Level_5_Heading"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: Level 5 Heading">edit</a>]</span> <span class="mw-headline"> Level 5 Heading</span></h5>
+<a name="Level_6_Heading" id="Level_6_Heading"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Level 6 Heading">edit</a>]</span> <span class="mw-headline"> Level 6 Heading</span></h6>
+<a name=".3D_Level_7_Heading.3D" id=".3D_Level_7_Heading.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=7" title="Edit section: = Level 7 Heading=">edit</a>]</span> <span class="mw-headline">= Level 7 Heading=</span></h6>
+<a name=".3D.3D_Level_8_Heading.3D.3D" id=".3D.3D_Level_8_Heading.3D.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=8" title="Edit section: == Level 8 Heading==">edit</a>]</span> <span class="mw-headline">== Level 8 Heading==</span></h6>
+<a name=".3D.3D.3D_Level_9_Heading.3D.3D.3D" id=".3D.3D.3D_Level_9_Heading.3D.3D.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=9" title="Edit section: === Level 9 Heading===">edit</a>]</span> <span class="mw-headline">=== Level 9 Heading===</span></h6>
+<a name=".3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D" id=".3D.3D.3D.3D_Level_10_Heading.3D.3D.3D.3D"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=10" title="Edit section: ==== Level 10 Heading====">edit</a>]</span> <span class="mw-headline">==== Level 10 Heading====</span></h6>
 
 !! end
 
@@ -3504,12 +3665,12 @@ TOC regression (bug 9764)
 </li>
 </ul>
 </td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
-<a name="title_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: title 1">edit</a>]</span> <span class="mw-headline"> title 1 </span></h2>
-<a name="title_1.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: title 1.1">edit</a>]</span> <span class="mw-headline"> title 1.1 </span></h3>
-<a name="title_1.1.1"></a><h4><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: title 1.1.1">edit</a>]</span> <span class="mw-headline"> title 1.1.1 </span></h4>
-<a name="title_1.2"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: title 1.2">edit</a>]</span> <span class="mw-headline"> title 1.2 </span></h3>
-<a name="title_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: title 2">edit</a>]</span> <span class="mw-headline"> title 2 </span></h2>
-<a name="title_2.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: title 2.1">edit</a>]</span> <span class="mw-headline"> title 2.1 </span></h3>
+<a name="title_1" id="title_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: title 1">edit</a>]</span> <span class="mw-headline"> title 1 </span></h2>
+<a name="title_1.1" id="title_1.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: title 1.1">edit</a>]</span> <span class="mw-headline"> title 1.1 </span></h3>
+<a name="title_1.1.1" id="title_1.1.1"></a><h4><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: title 1.1.1">edit</a>]</span> <span class="mw-headline"> title 1.1.1 </span></h4>
+<a name="title_1.2" id="title_1.2"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: title 1.2">edit</a>]</span> <span class="mw-headline"> title 1.2 </span></h3>
+<a name="title_2" id="title_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: title 2">edit</a>]</span> <span class="mw-headline"> title 2 </span></h2>
+<a name="title_2.1" id="title_2.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: title 2.1">edit</a>]</span> <span class="mw-headline"> title 2.1 </span></h3>
 
 !! end
 
@@ -3540,12 +3701,12 @@ wgMaxTocLevel=3
 </li>
 </ul>
 </td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
-<a name="title_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: title 1">edit</a>]</span> <span class="mw-headline"> title 1 </span></h2>
-<a name="title_1.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: title 1.1">edit</a>]</span> <span class="mw-headline"> title 1.1 </span></h3>
-<a name="title_1.1.1"></a><h4><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: title 1.1.1">edit</a>]</span> <span class="mw-headline"> title 1.1.1 </span></h4>
-<a name="title_1.2"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: title 1.2">edit</a>]</span> <span class="mw-headline"> title 1.2 </span></h3>
-<a name="title_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: title 2">edit</a>]</span> <span class="mw-headline"> title 2 </span></h2>
-<a name="title_2.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: title 2.1">edit</a>]</span> <span class="mw-headline"> title 2.1 </span></h3>
+<a name="title_1" id="title_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: title 1">edit</a>]</span> <span class="mw-headline"> title 1 </span></h2>
+<a name="title_1.1" id="title_1.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: title 1.1">edit</a>]</span> <span class="mw-headline"> title 1.1 </span></h3>
+<a name="title_1.1.1" id="title_1.1.1"></a><h4><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: title 1.1.1">edit</a>]</span> <span class="mw-headline"> title 1.1.1 </span></h4>
+<a name="title_1.2" id="title_1.2"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: title 1.2">edit</a>]</span> <span class="mw-headline"> title 1.2 </span></h3>
+<a name="title_2" id="title_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: title 2">edit</a>]</span> <span class="mw-headline"> title 2 </span></h2>
+<a name="title_2.1" id="title_2.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: title 2.1">edit</a>]</span> <span class="mw-headline"> title 2.1 </span></h3>
 
 !! end
 
@@ -3555,8 +3716,8 @@ Resolving duplicate section names
 == Foo bar ==
 == Foo bar ==
 !! result
-<a name="Foo_bar"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Foo bar">edit</a>]</span> <span class="mw-headline"> Foo bar </span></h2>
-<a name="Foo_bar_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Foo bar">edit</a>]</span> <span class="mw-headline"> Foo bar </span></h2>
+<a name="Foo_bar" id="Foo_bar"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Foo bar">edit</a>]</span> <span class="mw-headline"> Foo bar </span></h2>
+<a name="Foo_bar_2" id="Foo_bar_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Foo bar">edit</a>]</span> <span class="mw-headline"> Foo bar </span></h2>
 
 !! end
 
@@ -3566,8 +3727,8 @@ Resolving duplicate section names with differing case (bug 10721)
 == Foo bar ==
 == Foo Bar ==
 !! result
-<a name="Foo_bar"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Foo bar">edit</a>]</span> <span class="mw-headline"> Foo bar </span></h2>
-<a name="Foo_Bar_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Foo Bar">edit</a>]</span> <span class="mw-headline"> Foo Bar </span></h2>
+<a name="Foo_bar" id="Foo_bar"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Foo bar">edit</a>]</span> <span class="mw-headline"> Foo bar </span></h2>
+<a name="Foo_Bar_2" id="Foo_Bar_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Foo Bar">edit</a>]</span> <span class="mw-headline"> Foo Bar </span></h2>
 
 !! end
 
@@ -3586,10 +3747,10 @@ __NOTOC__
 {{sections}}
 ==Section 4==
 !! result
-<a name="Section_0"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Section 0">edit</a>]</span> <span class="mw-headline">Section 0</span></h2>
-<a name="Section_1"></a><h3><span class="editsection">[<a href="/index.php?title=Template:Sections&amp;action=edit&amp;section=T-1" title="Template:Sections">edit</a>]</span> <span class="mw-headline">Section 1</span></h3>
-<a name="Section_2"></a><h2><span class="editsection">[<a href="/index.php?title=Template:Sections&amp;action=edit&amp;section=T-2" title="Template:Sections">edit</a>]</span> <span class="mw-headline">Section 2</span></h2>
-<a name="Section_4"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Section 4">edit</a>]</span> <span class="mw-headline">Section 4</span></h2>
+<a name="Section_0" id="Section_0"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Section 0">edit</a>]</span> <span class="mw-headline">Section 0</span></h2>
+<a name="Section_1" id="Section_1"></a><h3><span class="editsection">[<a href="/index.php?title=Template:Sections&amp;action=edit&amp;section=T-1" title="Template:Sections">edit</a>]</span> <span class="mw-headline">Section 1</span></h3>
+<a name="Section_2" id="Section_2"></a><h2><span class="editsection">[<a href="/index.php?title=Template:Sections&amp;action=edit&amp;section=T-2" title="Template:Sections">edit</a>]</span> <span class="mw-headline">Section 2</span></h2>
+<a name="Section_4" id="Section_4"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Section 4">edit</a>]</span> <span class="mw-headline">Section 4</span></h2>
 
 !! end
 
@@ -3600,8 +3761,8 @@ __NOEDITSECTION__
 ==Section 1==
 ==Section 2==
 !! result
-<a name="Section_1"></a><h2> <span class="mw-headline">Section 1</span></h2>
-<a name="Section_2"></a><h2> <span class="mw-headline">Section 2</span></h2>
+<a name="Section_1" id="Section_1"></a><h2> <span class="mw-headline">Section 1</span></h2>
+<a name="Section_2" id="Section_2"></a><h2> <span class="mw-headline">Section 2</span></h2>
 
 !! end
 
@@ -3610,7 +3771,7 @@ Link inside a section heading
 !! input
 ==Section with a [[Main Page|link]] in it==
 !! result
-<a name="Section_with_a_link_in_it"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Section with a link in it">edit</a>]</span> <span class="mw-headline">Section with a <a href="/wiki/Main_Page" title="Main Page">link</a> in it</span></h2>
+<a name="Section_with_a_link_in_it" id="Section_with_a_link_in_it"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Section with a link in it">edit</a>]</span> <span class="mw-headline">Section with a <a href="/wiki/Main_Page" title="Main Page">link</a> in it</span></h2>
 
 !! end
 
@@ -3632,9 +3793,9 @@ __TOC__
 <li class="toclevel-1"><a href="#title_2"><span class="tocnumber">2</span> <span class="toctext">title 2</span></a></li>
 </ul>
 </td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
-<a name="title_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: title 1">edit</a>]</span> <span class="mw-headline"> title 1 </span></h2>
-<a name="title_1.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: title 1.1">edit</a>]</span> <span class="mw-headline"> title 1.1 </span></h3>
-<a name="title_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: title 2">edit</a>]</span> <span class="mw-headline"> title 2 </span></h2>
+<a name="title_1" id="title_1"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: title 1">edit</a>]</span> <span class="mw-headline"> title 1 </span></h2>
+<a name="title_1.1" id="title_1.1"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: title 1.1">edit</a>]</span> <span class="mw-headline"> title 1.1 </span></h3>
+<a name="title_2" id="title_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: title 2">edit</a>]</span> <span class="mw-headline"> title 2 </span></h2>
 
 !! end
 
@@ -3643,7 +3804,7 @@ BUG 1219 URL next to image (good)
 !! input
 http://example.com [[Image:foobar.jpg]]
 !! result
-<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a> <a href="/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a> <a href="/wiki/File:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !!end
 
@@ -3652,7 +3813,7 @@ BUG 1219 URL next to image (broken)
 !! input
 http://example.com[[Image:foobar.jpg]]
 !! result
-<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a><a href="/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
+<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a><a href="/wiki/File:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 </p>
 !!end
 
@@ -3838,7 +3999,7 @@ Image link to nonexistent file (bug 1850 - good)
 !! input
 [[Image:No such.jpg]]
 !! result
-<p><a href="/index.php?title=Special:Upload&amp;wpDestFile=No_such.jpg" class="new" title="Image:No such.jpg">Image:No such.jpg</a>
+<p><a href="/index.php?title=Special:Upload&amp;wpDestFile=No_such.jpg" class="new" title="File:No such.jpg">File:No such.jpg</a>
 </p>
 !! end
 
@@ -3847,7 +4008,7 @@ Image link to nonexistent file (bug 1850 - good)
 !! input
 [[:Image:No such.jpg]]
 !! result
-<p><a href="/index.php?title=Image:No_such.jpg&amp;action=edit&amp;redlink=1" class="new" title="Image:No such.jpg (not yet written)">Image:No such.jpg</a>
+<p><a href="/index.php?title=File:No_such.jpg&amp;action=edit&amp;redlink=1" class="new" title="File:No such.jpg (not yet written)">Image:No such.jpg</a>
 </p>
 !! end
 
@@ -4802,7 +4963,7 @@ Fuzz testing: Parser14
 == onmouseover= ==
 http://__TOC__
 !! result
-<a name="onmouseover.3D"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: onmouseover=">edit</a>]</span> <span class="mw-headline"> onmouseover= </span></h2>
+<a name="onmouseover.3D" id="onmouseover.3D"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: onmouseover=">edit</a>]</span> <span class="mw-headline"> onmouseover= </span></h2>
 http://<table id="toc" class="toc" summary="Contents"><tr><td><div id="toctitle"><h2>Contents</h2></div>
 <ul>
 <li class="toclevel-1"><a href="#onmouseover.3D"><span class="tocnumber">1</span> <span class="toctext">onmouseover=</span></a></li>
@@ -4817,7 +4978,7 @@ Fuzz testing: Parser14-table
 ==a==
 {| STYLE=__TOC__
 !! result
-<a name="a"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: a">edit</a>]</span> <span class="mw-headline">a</span></h2>
+<a name="a" id="a"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: a">edit</a>]</span> <span class="mw-headline">a</span></h2>
 <table style="&#95;_TOC&#95;_">
 <tr><td></td></tr>
 </table>
@@ -4903,11 +5064,16 @@ MOVE YOUR MOUSE CURSOR OVER THIS TEXT
 
 !! end
 
-# Known to produce bad XML for now
+# Note: the current result listed for this is not what the original one was,
+# but the original bug was JavaScript injection, which is fixed in any case.
+# It's not clear that the original result listed was any more correct than the
+# current one.  Original result:
+# <p>{{{| 
+# </p>
+# <li class="&#124;&#124;">
+# }}}blah" onmouseover="alert('hello world');" align="left"<b>MOVE MOUSE CURSOR OVER HERE</b>
 !!test
 Fuzz testing: Parser25 (bug 6055)
-!! options
-noxml
 !! input
 {{{
 | 
@@ -4915,11 +5081,8 @@ noxml
  >
 }}}blah" onmouseover="alert('hello world');" align="left"'''MOVE MOUSE CURSOR OVER HERE
 !! result
-<p>{{{| 
+<p>&lt;LI CLASS=blah" onmouseover="alert('hello world');" align="left"<b>MOVE MOUSE CURSOR OVER HERE</b>
 </p>
-<li class="&#124;&#124;">
-}}}blah" onmouseover="alert('hello world');" align="left"<b>MOVE MOUSE CURSOR OVER HERE</b>
-
 !! end
 
 !!test
@@ -5048,14 +5211,19 @@ New wiki paragraph
 </p>
 !! end
 
-
+# Original result was this:
+# <p><b>bold</b><b>bold<i>bolditalics</i></b>
+# </p>
+# While that might be marginally more intuitive, maybe, the six-apostrophe
+# construct is clearly pathological and the result stated here (which is what
+# the parser actually does) is about as reasonable as anything.
 !!test
 Mixing markup for italics and bold
 !! options
 !! input
 '''bold''''''bold''bolditalics'''''
 !! result
-<p><b>bold</b><b>bold<i>bolditalics</i></b>
+<p>'<i>bold'</i><b>bold<i>bolditalics</i></b>
 </p>
 !! end
 
@@ -6153,7 +6321,7 @@ Centre-aligned image
 !! input
 [[Image:foobar.jpg|centre]]
 !! result
-<div class="center"><div class="floatnone"><span><a href="/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div></div>
+<div class="center"><div class="floatnone"><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div></div>
 
 !!end
 
@@ -6162,7 +6330,7 @@ None-aligned image
 !! input
 [[Image:foobar.jpg|none]]
 !! result
-<div class="floatnone"><span><a href="/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div>
+<div class="floatnone"><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
 
 !!end
 
@@ -6171,7 +6339,34 @@ Width + Height sized image (using px) (height is ignored)
 !! input
 [[Image:foobar.jpg|640x480px]]
 !! result
-<p><a href="/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
+</p>
+!!end
+
+!! test
+Width-sized image (using px, no following whitespace)
+!! input
+[[Image:foobar.jpg|640px]]
+!! result
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
+</p>
+!!end
+
+!! test
+Width-sized image (using px, with following whitespace - test regression from r39467)
+!! input
+[[Image:foobar.jpg|640px ]]
+!! result
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
+</p>
+!!end
+
+!! test
+Width-sized image (using px, with preceding whitespace - test regression from r39467)
+!! input
+[[Image:foobar.jpg| 640px]]
+!! result
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
 </p>
 !!end
 
@@ -6209,7 +6404,7 @@ Images with the "|" character in the comment
 !! input
 [[image:Foobar.jpg|thumb|An [http://test/?param1=|left|&param2=|x external] URL]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="An external URL"><img alt="An external URL" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>An <a href="http://test/?param1=|left|&amp;param2=|x" class="external text" title="http://test/?param1=|left|&amp;param2=|x" rel="nofollow">external</a> URL</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="An external URL"><img alt="An external URL" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>An <a href="http://test/?param1=|left|&amp;param2=|x" class="external text" title="http://test/?param1=|left|&amp;param2=|x" rel="nofollow">external</a> URL</div></div></div>
 
 !!end
 
@@ -6270,8 +6465,6 @@ subpage title=[[Subpage test/L1/L2/L3]]
 </p>
 !! end
 
-
-# Question: should result be "/index.php?title=Subpage_test/L1&amp;action=edit" instead?
 !! test
 Parents of subpages, two levels up, without trailing slash or name.
 !! options
@@ -6279,12 +6472,10 @@ subpage title=[[Subpage test/L1/L2/L3]]
 !! input
 [[../..]]
 !! result
-<p><a href="/index.php?title=Subpage_test/L1/L2/..&amp;action=edit&amp;redlink=1" class="new" title="Subpage test/L1 (not yet written)">../..</a>
+<p>[[../..]]
 </p>
 !! end
 
-# Question: Why should the link text in the above test be "../..", yet in this test the "../.." part is silently dropped?
-# Current result: <p><a href="/index.php?title=Subpage_test/L1////&amp;action=edit" class="new" title="Subpage test/L1////">///
 !! test
 Parents of subpages, two levels up, with lots of extra trailing slashes.
 !! options
@@ -6292,7 +6483,7 @@ subpage title=[[Subpage test/L1/L2/L3]]
 !! input
 [[../../////]]
 !! result
-<p><a href="/index.php?title=Subpage_test/L1&amp;action=edit&amp;redlink=1" class="new" title="Subpage test/L1 (not yet written)">Subpage test/L1</a>
+<p><a href="/index.php?title=Subpage_test/L1////&amp;action=edit&amp;redlink=1" class="new" title="Subpage test/L1//// (not yet written)">///</a>
 </p>
 !! end
 
@@ -6370,7 +6561,7 @@ Inclusion of !userCanEdit() content
 !! input
 {{MediaWiki:Fake}}
 !! result
-<a name="header"></a><h2><span class="editsection">[<a href="/index.php?title=MediaWiki:Fake&amp;action=edit&amp;section=T-1" title="MediaWiki:Fake">edit</a>]</span> <span class="mw-headline">header</span></h2>
+<a name="header" id="header"></a><h2><span class="editsection">[<a href="/index.php?title=MediaWiki:Fake&amp;action=edit&amp;section=T-1" title="MediaWiki:Fake">edit</a>]</span> <span class="mw-headline">header</span></h2>
 
 !! end
 
@@ -6401,12 +6592,12 @@ Out-of-order TOC heading levels
 </li>
 </ul>
 </td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
-<a name="2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: 2">edit</a>]</span> <span class="mw-headline">2</span></h2>
-<a name="6"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: 6">edit</a>]</span> <span class="mw-headline">6</span></h6>
-<a name="3"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: 3">edit</a>]</span> <span class="mw-headline">3</span></h3>
-<a name="1"></a><h1><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: 1">edit</a>]</span> <span class="mw-headline">1</span></h1>
-<a name="5"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: 5">edit</a>]</span> <span class="mw-headline">5</span></h5>
-<a name="2_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: 2">edit</a>]</span> <span class="mw-headline">2</span></h2>
+<a name="2" id="2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: 2">edit</a>]</span> <span class="mw-headline">2</span></h2>
+<a name="6" id="6"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: 6">edit</a>]</span> <span class="mw-headline">6</span></h6>
+<a name="3" id="3"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: 3">edit</a>]</span> <span class="mw-headline">3</span></h3>
+<a name="1" id="1"></a><h1><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: 1">edit</a>]</span> <span class="mw-headline">1</span></h1>
+<a name="5" id="5"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: 5">edit</a>]</span> <span class="mw-headline">5</span></h5>
+<a name="2_2" id="2_2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: 2">edit</a>]</span> <span class="mw-headline">2</span></h2>
 
 !! end
 
@@ -6593,7 +6784,7 @@ language=sr cat
 !! input
 [[:Category:МедиаWики У�ер'� Гуиде]]
 !! result
-<a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User's Guide">MediaWiki User's Guide</a>
+<a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User&#039;s Guide">MediaWiki User's Guide</a>
 !! end
 
 
@@ -6652,7 +6843,7 @@ language=sr variant=sr-ec
 !! input
 == -{Naslov}- ==
 !! result
-<a name="-.7BNaslov.7D-"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Уреди део: Naslov">уреди</a>]</span> <span class="mw-headline"> Naslov </span></h2>
+<a name="-.7BNaslov.7D-" id="-.7BNaslov.7D-"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Уреди део: Naslov">уреди</a>]</span> <span class="mw-headline"> Naslov </span></h2>
 
 !! end
 
@@ -6791,7 +6982,7 @@ Morwen/13: Unclosed link followed by heading
 !! result
 <p>[[link
 </p>
-<a name="heading"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: heading">edit</a>]</span> <span class="mw-headline">heading</span></h2>
+<a name="heading" id="heading"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: heading">edit</a>]</span> <span class="mw-headline">heading</span></h2>
 
 !! end
 
@@ -6803,7 +6994,7 @@ HHP2.1: Heuristics for headings in preprocessor parenthetical structures
 !! result
 <p>{{foo|
 </p>
-<a name="heading"></a><h1> <span class="mw-headline">heading</span></h1>
+<a name="heading" id="heading"></a><h1> <span class="mw-headline">heading</span></h1>
 
 !! end
 
@@ -6815,7 +7006,7 @@ HHP2.2: Heuristics for headings in preprocessor parenthetical structures
 !! result
 <p>{{foo|
 </p>
-<a name="heading"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: heading">edit</a>]</span> <span class="mw-headline">heading</span></h2>
+<a name="heading" id="heading"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: heading">edit</a>]</span> <span class="mw-headline">heading</span></h2>
 
 !! end
 
@@ -6829,6 +7020,219 @@ pst
 <!-- ~~~~ -->
 !! end
 
+!! test
+Paragraphs inside divs (no extra line breaks)
+!! input
+<div>Line one
+
+Line two</div>
+!! result
+<div>Line one
+Line two</div>
+
+!! end
+
+!! test
+Paragraphs inside divs (extra line break on open)
+!! input
+<div>
+Line one
+
+Line two</div>
+!! result
+<div>
+<p>Line one
+</p>
+Line two</div>
+
+!! end
+
+!! test
+Paragraphs inside divs (extra line break on close)
+!! input
+<div>Line one
+
+Line two
+</div>
+!! result
+<div>Line one
+<p>Line two
+</p>
+</div>
+
+!! end
+
+!! test
+Paragraphs inside divs (extra line break on open and close)
+!! input
+<div>
+Line one
+
+Line two
+</div>
+!! result
+<div>
+<p>Line one
+</p><p>Line two
+</p>
+</div>
+
+!! end
+
+# Bug 6200: <blockquote> should behave like <div> with respect to line breaks
+!! test
+Bug 6200: paragraphs inside blockquotes (no extra line breaks)
+!! input
+<blockquote>Line one
+
+Line two</blockquote>
+!! result
+<blockquote>Line one
+Line two</blockquote>
+
+!! end
+
+!! test
+Bug 6200: paragraphs inside blockquotes (extra line break on open)
+!! input
+<blockquote>
+Line one
+
+Line two</blockquote>
+!! result
+<blockquote>
+<p>Line one
+</p>
+Line two</blockquote>
+
+!! end
+
+!! test
+Bug 6200: paragraphs inside blockquotes (extra line break on close)
+!! input
+<blockquote>Line one
+
+Line two
+</blockquote>
+!! result
+<blockquote>Line one
+<p>Line two
+</p>
+</blockquote>
+
+!! end
+
+!! test
+Bug 6200: paragraphs inside blockquotes (extra line break on open and close)
+!! input
+<blockquote>
+Line one
+
+Line two
+</blockquote>
+!! result
+<blockquote>
+<p>Line one
+</p><p>Line two
+</p>
+</blockquote>
+
+!! end
+
+!! test
+Paragraphs inside blockquotes/divs (no extra line breaks)
+!! input
+<blockquote><div>Line one
+
+Line two</div></blockquote>
+!! result
+<blockquote><div>Line one
+Line two</div></blockquote>
+
+!! end
+
+!! test
+Paragraphs inside blockquotes/divs (extra line break on open)
+!! input
+<blockquote><div>
+Line one
+
+Line two</div></blockquote>
+!! result
+<blockquote><div>
+<p>Line one
+</p>
+Line two</div></blockquote>
+
+!! end
+
+!! test
+Paragraphs inside blockquotes/divs (extra line break on close)
+!! input
+<blockquote><div>Line one
+
+Line two
+</div></blockquote>
+!! result
+<blockquote><div>Line one
+<p>Line two
+</p>
+</div></blockquote>
+
+!! end
+
+!! test
+Paragraphs inside blockquotes/divs (extra line break on open and close)
+!! input
+<blockquote><div>
+Line one
+
+Line two
+</div></blockquote>
+!! result
+<blockquote><div>
+<p>Line one
+</p><p>Line two
+</p>
+</div></blockquote>
+
+!! end
+
+!! test
+Interwiki links trounced by replaceExternalLinks after early LinkHolderArray expansion
+!! options
+wgLinkHolderBatchSize=0
+!! input
+[[meatball:1]]
+[[meatball:2]]
+[[meatball:3]]
+!! result
+<p><a href="http://www.usemod.com/cgi-bin/mb.pl?1" class="extiw" title="meatball:1">meatball:1</a>
+<a href="http://www.usemod.com/cgi-bin/mb.pl?2" class="extiw" title="meatball:2">meatball:2</a>
+<a href="http://www.usemod.com/cgi-bin/mb.pl?3" class="extiw" title="meatball:3">meatball:3</a>
+</p>
+!! end
+
+!! test
+Free external link invading image caption
+!! input
+[[Image:Foobar.jpg|thumb|http://x|hello]]
+!! result
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image" title="hello"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>hello</div></div></div>
+
+!! end
+
+!! test
+Bug 15196: localised external link numbers
+!! options
+language=fa
+!! input
+[http://en.wikipedia.org/]
+!! result
+<p><a href="http://en.wikipedia.org/" class="external autonumber" title="http://en.wikipedia.org/" rel="nofollow">[Û±]</a>
+</p>
+!! end
+
 #
 #
 #
diff --git a/maintenance/parserTestsStaticParserHook.php b/maintenance/parserTestsStaticParserHook.php
index 5a98a89d..98c4bba1 100644
--- a/maintenance/parserTestsStaticParserHook.php
+++ b/maintenance/parserTestsStaticParserHook.php
@@ -21,24 +21,27 @@ function wfParserTestStaticParserHookSetup( &$parser ) {
 	return true;
 }
 
-function wfParserTestStaticParserHookHook( $in, $argv ) {
-	static $buf = null;
-	
+function wfParserTestStaticParserHookHook( $in, $argv, $parser ) {
 	if ( ! count( $argv ) ) {
-		$buf = $in;
+		$parser->static_tag_buf = $in;
 		return '';
-	} else if ( count( $argv ) === 1 && $argv['action'] === 'flush' && $in === null ) {
+	} else if ( count( $argv ) === 1 && isset( $argv['action'] ) 
+		&& $argv['action'] === 'flush' && $in === null ) 
+	{
 		// Clear the buffer, we probably don't need to
-		$tmp = $buf;
-		$buf = null;
+		if ( isset( $parser->static_tag_buf ) ) {
+			$tmp = $parser->static_tag_buf;
+		} else {
+			$tmp = '';
+		}
+		$parser->static_tag_buf = null;
 		return $tmp;
 	} else
 		// wtf?
-		die(
+		return
 			"\nCall this extension as <statictag>string</statictag> or as" .
 			" <statictag action=flush/>, not in any other way.\n" .
 			"text: " . var_export( $in, true ) . "\n" .
-			"argv: " . var_export( $argv, true ) . "\n"
-		);
+			"argv: " . var_export( $argv, true ) . "\n";
 }
 
diff --git a/maintenance/postgres/archives/patch-ipb_address_unique.sql b/maintenance/postgres/archives/patch-ipb_address_unique.sql
index 9cfc6318..e618f99c 100644
--- a/maintenance/postgres/archives/patch-ipb_address_unique.sql
+++ b/maintenance/postgres/archives/patch-ipb_address_unique.sql
@@ -1,2 +1 @@
-DROP INDEX IF EXISTS ipb_address;
 CREATE UNIQUE INDEX ipb_address_unique ON ipblocks (ipb_address,ipb_user,ipb_auto,ipb_anon_only);
diff --git a/maintenance/postgres/compare_schemas.pl b/maintenance/postgres/compare_schemas.pl
index 84415d79..144663df 100644
--- a/maintenance/postgres/compare_schemas.pl
+++ b/maintenance/postgres/compare_schemas.pl
@@ -379,6 +379,7 @@ tl_namespace     int SMALLINT
 wl_namespace     int SMALLINT
 
 ## Easy enough to change if a wiki ever does grow this big:
+ss_active_users  bigint INTEGER
 ss_good_articles bigint INTEGER
 ss_total_edits   bigint INTEGER
 ss_total_pages   bigint INTEGER
@@ -479,7 +480,7 @@ sub scan_dir {
 	my $dir = shift;
 
 	opendir my $dh, $dir or die qq{Could not opendir $dir: $!\n};
-	print "Scanning $dir...\n";
+	#print "Scanning $dir...\n";
 	for my $file (grep { -f "$dir/$_" and /\.php$/ } readdir $dh) {
 		find_problems("$dir/$file");
 	}
diff --git a/maintenance/postgres/mediawiki_mysql2postgres.pl b/maintenance/postgres/mediawiki_mysql2postgres.pl
index 47fa3c0c..a3b17f94 100644
--- a/maintenance/postgres/mediawiki_mysql2postgres.pl
+++ b/maintenance/postgres/mediawiki_mysql2postgres.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ## Convert data from a MySQL mediawiki database into a Postgres mediawiki database
-## svn: $Id: mediawiki_mysql2postgres.pl 33556 2008-04-18 16:27:57Z greg $
+## svn: $Id: mediawiki_mysql2postgres.pl 43845 2008-11-22 06:44:45Z greg $
 
 ## NOTE: It is probably easier to dump your wiki using maintenance/dumpBackup.php
 ## and then import it with maintenance/importDump.php
@@ -181,7 +181,7 @@ $MYSQLSOCKET and $conninfo .= "\n--   socket    $MYSQLSOCKET";
 print qq{
 -- Dump of MySQL Mediawiki tables for import into a Postgres Mediawiki schema
 -- Performed by the program: $0
--- Version: $VERSION (subversion }.q{$LastChangedRevision: 33556 $}.qq{)
+-- Version: $VERSION (subversion }.q{$LastChangedRevision: 43845 $}.qq{)
 -- Author: Greg Sabino Mullane <greg\@turnstep.com> Comments welcome
 --
 -- This file was created: $now
@@ -275,7 +275,7 @@ $verbose and warn qq{Writing truncates to empty existing tables\n};
 for my $t (@torder, 'objectcache', 'querycache') {
 	next if $t eq '---';
 	my $tname = $special{$t}||$t;
-	printf qq{TRUNCATE TABLE %-20s;\n}, qq{"$tname"};
+	printf qq{TRUNCATE TABLE %-20s CASCADE;\n}, qq{"$tname"};
 }
 print "\n\n";
 
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index cd8dd8a7..93cee862 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -173,6 +173,7 @@ CREATE TABLE templatelinks (
   tl_title      TEXT     NOT NULL
 );
 CREATE UNIQUE INDEX templatelinks_unique ON templatelinks (tl_namespace,tl_title,tl_from);
+CREATE INDEX templatelinks_from          ON templatelinks (tl_from);
 
 CREATE TABLE imagelinks (
   il_from  INTEGER  NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE,
@@ -210,9 +211,10 @@ CREATE TABLE site_stats (
   ss_row_id         INTEGER  NOT NULL  UNIQUE,
   ss_total_views    INTEGER            DEFAULT 0,
   ss_total_edits    INTEGER            DEFAULT 0,
-  ss_good_articles  INTEGER             DEFAULT 0,
+  ss_good_articles  INTEGER            DEFAULT 0,
   ss_total_pages    INTEGER            DEFAULT -1,
   ss_users          INTEGER            DEFAULT -1,
+  ss_active_users   INTEGER            DEFAULT -1,
   ss_admins         INTEGER            DEFAULT -1,
   ss_images         INTEGER            DEFAULT 0
 );
@@ -239,7 +241,9 @@ CREATE TABLE ipblocks (
   ipb_range_start       TEXT,
   ipb_range_end         TEXT,
   ipb_deleted           SMALLINT     NOT NULL  DEFAULT 0,
-  ipb_block_email       SMALLINT     NOT NULL  DEFAULT 0
+  ipb_block_email       SMALLINT     NOT NULL  DEFAULT 0,
+  ipb_allow_usertalk    SMALLINT     NOT NULL  DEFAULT 0
+
 );
 CREATE UNIQUE INDEX ipb_address_unique ON ipblocks (ipb_address,ipb_user,ipb_auto,ipb_anon_only);
 CREATE INDEX ipb_user    ON ipblocks (ipb_user);
@@ -350,6 +354,7 @@ CREATE TABLE recentchanges (
   rc_params          TEXT
 );
 CREATE INDEX rc_timestamp       ON recentchanges (rc_timestamp);
+CREATE INDEX rc_timestamp_bot   ON recentchanges (rc_timestamp) WHERE rc_bot = 0;
 CREATE INDEX rc_namespace_title ON recentchanges (rc_namespace, rc_title);
 CREATE INDEX rc_cur_id          ON recentchanges (rc_cur_id);
 CREATE INDEX new_name_timestamp ON recentchanges (rc_new, rc_namespace, rc_timestamp);
@@ -363,7 +368,7 @@ CREATE TABLE watchlist (
   wl_notificationtimestamp  TIMESTAMPTZ
 );
 CREATE UNIQUE INDEX wl_user_namespace_title ON watchlist (wl_namespace, wl_title, wl_user);
-
+CREATE INDEX wl_user ON watchlist (wl_user);
 
 CREATE TABLE math (
   math_inputhash              BYTEA     NOT NULL  UNIQUE,
@@ -568,5 +573,5 @@ CREATE TABLE mediawiki_version (
 );
 
 INSERT INTO mediawiki_version (type,mw_version,sql_version,sql_date)
-  VALUES ('Creation','??','$LastChangedRevision: 40517 $','$LastChangedDate: 2008-09-06 02:14:20 -0500 (Sat, 06 Sep 2008) $');
+  VALUES ('Creation','??','$LastChangedRevision: 41967 $','$LastChangedDate: 2008-10-11 07:08:10 -0500 (Sat, 11 Oct 2008) $');
 
diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
new file mode 100644
index 00000000..125b8842
--- /dev/null
+++ b/maintenance/rebuildFileCache.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Build file cache for content pages
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+
+/** */
+require_once( "commandLine.inc" );
+if( !$wgUseFileCache ) {
+	echo "Nothing to do -- \$wgUseFileCache is disabled.\n";
+	exit(0);
+}
+$wgDisableCounters = false; // no real hits here
+
+$start = isset($args[0]) ? intval($args[0]) : 0;
+$overwrite = isset( $args[1] ) && $args[1] === 'overwrite';
+echo "Building content page file cache from page {$start}!\n";
+
+$dbr = wfGetDB( DB_SLAVE );
+$start = $start > 0 ? $start : $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
+$end = $dbr->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+if( !$start ) {
+	die("Nothing to do.\n");
+}
+
+$_SERVER['HTTP_ACCEPT_ENCODING'] = 'bgzip'; // hack, no real client
+OutputPage::setEncodings(); # Not really used yet
+
+$BATCH_SIZE = 100;
+# Do remaining chunk
+$end += $BATCH_SIZE - 1;
+$blockStart = $start;
+$blockEnd = $start + $BATCH_SIZE - 1;
+
+// Go through each page and save the output
+while( $blockEnd <= $end ) {
+	// Get the pages
+	$res = $dbr->select( 'page', array('page_namespace','page_title','page_id'),
+		array('page_namespace' => $wgContentNamespaces,
+			"page_id BETWEEN $blockStart AND $blockEnd" ),
+		array('ORDER BY' => 'page_id ASC','USE INDEX' => 'PRIMARY')
+	);
+	while( $row = $dbr->fetchObject( $res ) ) {
+		$rebuilt = false;
+		$wgTitle = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
+		if( null == $wgTitle ) {
+			echo "Page {$row->page_id} bad title\n";
+			continue; // broken title?
+		}
+		$wgArticle = new Article( $wgTitle );
+		// If the article is cacheable, then load it
+		if( $wgArticle->isFileCacheable() ) {
+			$cache = new HTMLFileCache( $wgTitle );
+			if( $cache->isFileCacheGood() ) {
+				if( $overwrite ) {
+					$rebuilt = true;
+				} else {
+					echo "Page {$row->page_id} already cached\n";
+					continue; // done already!
+				}
+			} else {
+				echo "Page {$row->page_id} not cached\n";
+			}
+			ob_start( array(&$cache, 'saveToFileCache' ) ); // save on ob_end_clean()
+			$wgUseFileCache = false; // hack, we don't want $wgArticle fiddling with filecache
+			$wgArticle->view();
+			@$wgOut->output(); // header notices
+			$wgUseFileCache = true;
+			ob_end_clean(); // clear buffer
+			$wgOut = new OutputPage(); // empty out any output page garbage
+			if( $rebuilt )
+				echo "Re-cached page {$row->page_id}\n";
+			else
+				echo "Cached page {$row->page_id}\n";
+		} else {
+			echo "Page {$row->page_id} not cacheable\n";
+		}
+	}
+	$blockStart += $BATCH_SIZE;
+	$blockEnd += $BATCH_SIZE;
+	wfWaitForSlaves( 5 );
+}
+echo "Done!\n";
+
+// Remove these to be safe
+if( isset($wgTitle) )
+	unset($wgTitle);
+if( isset($wgArticle) )
+	unset($wgArticle);
diff --git a/maintenance/refreshLinks.inc b/maintenance/refreshLinks.inc
index 6d68e277..036d4109 100644
--- a/maintenance/refreshLinks.inc
+++ b/maintenance/refreshLinks.inc
@@ -17,7 +17,9 @@ function refreshLinks( $start, $newOnly = false, $maxLag = false, $end = 0, $red
 	$wgUser->setOption('math', MW_MATH_SOURCE);
 
 	# Don't generate extension images (e.g. Timeline)
-	$wgParser->clearTagHooks();
+	if( method_exists( $wgParser, "clearTagHooks" ) ) {
+		$wgParser->clearTagHooks();
+	}
 
 	# Don't use HTML tidy
 	$wgUseTidy = false;
@@ -110,13 +112,13 @@ function fixRedirect( $id ){
 
 function fixLinksFromArticle( $id ) {
 	global $wgTitle, $wgParser;
-	
+
 	$wgTitle = Title::newFromID( $id );
 	$dbw = wfGetDB( DB_MASTER );
 
 	$linkCache =& LinkCache::singleton();
 	$linkCache->clear();
-	
+
 	if ( is_null( $wgTitle ) ) {
 		return;
 	}
diff --git a/maintenance/removeUnusedAccounts.inc b/maintenance/removeUnusedAccounts.inc
index 8f900272..02c07c1f 100644
--- a/maintenance/removeUnusedAccounts.inc
+++ b/maintenance/removeUnusedAccounts.inc
@@ -39,6 +39,8 @@ function isInactiveAccount( $id, $master = false ) {
 function showHelp() {
 	echo( "Delete unused user accounts from the database.\n\n" );
 	echo( "USAGE: php removeUnusedAccounts.php [--delete]\n\n" );
-	echo( "  --delete : Delete accounts which are discovered to be inactive\n" );
+	echo( "  --delete             : Delete accounts which are discovered to be inactive\n" );
+	echo( "  --ignore-touched=x   : Ignore accounts touched within the lasts x days\n" );
+	echo( "  --ignore-groups=x,y  : Ignore accounts within these groups\n" );
 	echo( "\n" );
 }
diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 636832cb..419955b0 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -8,10 +8,6 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-/**
- * @todo Don't delete sysops or bureaucrats
- */
-
 $options = array( 'help', 'delete' );
 require_once( 'commandLine.inc' );
 require_once( 'removeUnusedAccounts.inc' );
@@ -27,10 +23,29 @@ if( isset( $options['help'] ) ) {
 echo( "Checking for unused user accounts...\n" );
 $del = array();
 $dbr = wfGetDB( DB_SLAVE );
-$res = $dbr->select( 'user', array( 'user_id', 'user_name' ), '', $fname );
+$res = $dbr->select( 'user', array( 'user_id', 'user_name', 'user_touched' ), '', $fname );
+if( isset( $options['ignore-groups'] ) ) {
+	$excludedGroups = explode( ',', $options['ignore-groups'] );
+} else { $excludedGroups = array(); }
+$touchedSeconds = 0;
+if( isset( $options['ignore-touched'] ) ) {
+	$touchedParamError = 0;
+	if( ctype_digit( $options['ignore-touched'] ) ) {
+		if( $options['ignore-touched'] <= 0 ) {
+			$touchedParamError = 1;
+		}
+	} else { $touchedParamError = 1; }
+	if( $touchedParamError == 1 ) {
+		die( "Please put a valid positive integer on the --ignore-touched parameter.\n" );
+	} else { $touchedSeconds = 86400 * $options['ignore-touched']; }
+}
 while( $row = $dbr->fetchObject( $res ) ) {
-	# Check the account, but ignore it if it's the primary administrator
-	if( $row->user_id > 1 && isInactiveAccount( $row->user_id, true ) ) {
+	# Check the account, but ignore it if it's within a $excludedGroups group or if it's touched within the $touchedSeconds seconds.
+	$instance = User::newFromId( $row->user_id );
+	if( count( array_intersect( $instance->getEffectiveGroups(), $excludedGroups ) ) == 0
+		&& isInactiveAccount( $row->user_id, true )
+		&& wfTimestamp( TS_UNIX, $row->user_touched ) < wfTimestamp( TS_UNIX, time() - $touchedSeconds )
+		) {
 		# Inactive; print out the name and flag it
 		$del[] = $row->user_id;
 		echo( $row->user_name . "\n" );
@@ -53,5 +68,3 @@ if( $count > 0 && isset( $options['delete'] ) ) {
 		echo( "\nRun the script again with --delete to remove them from the database.\n" );
 }
 echo( "\n" );
-
-
diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php
new file mode 100644
index 00000000..17568b4a
--- /dev/null
+++ b/maintenance/renameDbPrefix.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Run this script to after changing $wgDBPrefix on a wiki.
+ * The wiki will have to get downtime to do this correctly.
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+$optionsWithArgs = array('old','new','help');
+
+require_once( 'commandLine.inc' );
+
+if( @$options['help'] || !isset($options['old']) || !isset($options['new']) ) {
+	print "usage:updateSpecialPages.php [--help] [--old x] [new y]\n";
+	print "  --help      : this help message\n";
+	print "  --old x       : old db prefix x\n";
+	print "  --old 0       : EMPTY old db prefix x\n";
+	print "  --new y       : new db prefix y\n";
+	print "  --new 0       : EMPTY new db prefix\n";
+	wfDie();
+}
+
+// Allow for no old prefix
+if( $options['old'] === '0' ) {
+	$old = '';
+} else {
+	// Use nice safe, sane, prefixes
+	preg_match( '/^[a-zA-Z]+_$/', $options['old'], $m );
+	$old = isset($m[0]) ? $m[0] : false;
+}
+// Allow for no new prefix
+if( $options['new'] === '0' ) {
+	$new = '';
+} else {
+	// Use nice safe, sane, prefixes
+	preg_match( '/^[a-zA-Z]+_$/', $options['new'], $m );
+	$new = isset($m[0]) ? $m[0] : false;
+}
+
+if( $old===false || $new===false ) {
+	print "Invalid prefix!\n";
+	wfDie();
+}
+if( $old === $new ) {
+	print "Same prefix. Nothing to rename!\n";
+	wfDie();
+}
+
+print "Renaming DB prefix for tables of $wgDBname from '$old' to '$new'\n";
+$count = 0;
+
+$dbw = wfGetDB( DB_MASTER );
+$res = $dbw->query( "SHOW TABLES LIKE '".$dbw->escapeLike($old)."%'" );
+foreach( $res as $row ) {
+	// XXX: odd syntax. MySQL outputs an oddly cased "Tables of X"
+	// sort of message. Best not to try $row->x stuff...
+	$fields = get_object_vars( $row );
+	// Silly for loop over one field...
+	foreach( $fields as $resName => $table ) {
+		// $old should be regexp safe ([a-zA-Z_])
+		$newTable = preg_replace( '/^'.$old.'/',$new,$table);
+		print "Renaming table $table to $newTable\n";
+		$dbw->query( "RENAME TABLE $table TO $newTable" );
+	}
+	$count++;
+}
+print "Done! [$count tables]\n";
+
diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 14d08091..cee9cb1e 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -34,7 +34,7 @@ $conds = '';
 if ($type !== false)
 	$conds = "job_cmd = " . $dbw->addQuotes($type);
 
-while ( $dbw->selectField( 'job', 'count(*)', $conds, 'runJobs.php' ) ) {
+while ( $dbw->selectField( 'job', 'job_id', $conds, 'runJobs.php' ) ) {
 	$offset=0;
 	for (;;) {
 		$job = ($type == false) ?
diff --git a/maintenance/sql.php b/maintenance/sql.php
index 38c995ac..ab6546b9 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -53,15 +53,15 @@ class SqlPromptPrinter {
 	}
 }
 
-function sqlPrintResult( $res ) {
+function sqlPrintResult( $res, $db ) {
 	if ( !$res ) {
 		// Do nothing
-	} elseif ( $res->numRows() ) {
+	} elseif ( is_object( $res ) && $res->numRows() ) {
 		while ( $row = $res->fetchObject() ) {
 			print_r( $row );
 		}
 	} else {
-		$affected = $res->db->affectedRows();
+		$affected = $db->affectedRows();
 		echo "Query OK, $affected row(s) affected\n";
 	}
 }
diff --git a/maintenance/stats.php b/maintenance/stats.php
index 9c16e12d..00f79ded 100644
--- a/maintenance/stats.php
+++ b/maintenance/stats.php
@@ -11,11 +11,13 @@ require_once('commandLine.inc');
 if( get_class( $wgMemc ) == 'FakeMemCachedClient' ) {
 	die("You are running FakeMemCachedClient, I can not provide any statistics.\n");
 }
-
-print "Requests\n";
 $session = intval($wgMemc->get(wfMemcKey('stats','request_with_session')));
 $noSession = intval($wgMemc->get(wfMemcKey('stats','request_without_session')));
 $total = $session + $noSession;
+if ( $total == 0 ) {
+	die("You either have no stats or memcached isn't running. Aborting.\n");
+}
+print "Requests\n";
 printf( "with session:      %-10d %6.2f%%\n", $session, $session/$total*100 );
 printf( "without session:   %-10d %6.2f%%\n", $noSession, $noSession/$total*100 );
 printf( "total:             %-10d %6.2f%%\n", $total, 100 );
diff --git a/maintenance/storage/blob_tracking.sql b/maintenance/storage/blob_tracking.sql
new file mode 100644
index 00000000..6cac9a38
--- /dev/null
+++ b/maintenance/storage/blob_tracking.sql
@@ -0,0 +1,57 @@
+
+-- Table for tracking blobs prior to recompression or similar maintenance operations
+
+CREATE TABLE /*$wgDBprefix*/blob_tracking (
+	-- page.page_id
+	-- This may be zero for orphan or deleted text
+	-- Note that this is for compression grouping only -- it doesn't need to be
+	-- accurate at the time recompressTracked is run. Operations such as a
+	-- delete/undelete cycle may make it inaccurate.
+	bt_page integer not null,
+
+	-- revision.rev_id
+	-- This may be zero for orphan or deleted text
+	-- Like bt_page, it does not need to be accurate when recompressTracked is run.
+	bt_rev_id integer not null,
+
+	-- text.old_id
+	bt_text_id integer not null,
+
+	-- The ES cluster
+	bt_cluster varbinary(255),
+
+	-- The ES blob ID
+	bt_blob_id integer not null,
+
+	-- The CGZ content hash, or null
+	bt_cgz_hash varbinary(255),
+
+	-- The URL this blob is to be moved to
+	bt_new_url varbinary(255),
+
+	-- True if the text table has been updated to point to bt_new_url
+	bt_moved bool not null default 0,
+
+	-- Primary key
+	-- Note that text_id is not unique due to null edits (protection, move)
+	-- moveTextRow(), commit(), trackOrphanText()
+	PRIMARY KEY (bt_text_id, bt_rev_id),
+
+	-- Sort by page for easy CGZ recompression
+	-- doAllPages(), doAllOrphans(), doPage(), finishIncompleteMoves()
+	KEY (bt_moved, bt_page, bt_text_id),
+
+	-- Key for determining the revisions using a given blob
+	-- Not used by any scripts yet
+	KEY (bt_cluster, bt_blob_id, bt_cgz_hash)
+
+) /*$wgDBTableOptions*/;
+
+-- Tracking table for blob rows that aren't tracked by the text table
+CREATE TABLE /*$wgDBprefix*/blob_orphans (
+	bo_cluster varbinary(255),
+	bo_blob_id integer not null,
+
+	PRIMARY KEY (bo_cluster, bo_blob_id)
+) /*$wgDBTableOptions*/;
+
diff --git a/maintenance/storage/compressOld.inc b/maintenance/storage/compressOld.inc
index 52b9c40b..fb8cc422 100644
--- a/maintenance/storage/compressOld.inc
+++ b/maintenance/storage/compressOld.inc
@@ -4,10 +4,6 @@
  * @ingroup Maintenance ExternalStorage
  */
 
-/** */
-require_once( 'Revision.php' );
-require_once( 'ExternalStoreDB.php' );
-
 /** @todo document */
 function compressOldPages( $start = 0, $extdb = '' ) {
 	$fname = 'compressOldPages';
@@ -70,7 +66,7 @@ define( 'LS_INDIVIDUAL', 0 );
 define( 'LS_CHUNKED', 1 );
 
 /** @todo document */
-function compressWithConcat( $startId, $maxChunkSize, $maxChunkFactor, $factorThreshold, $beginDate,
+function compressWithConcat( $startId, $maxChunkSize, $beginDate, 
 	$endDate, $extdb="", $maxPageId = false )
 {
 	$fname = 'compressWithConcat';
@@ -198,7 +194,7 @@ function compressWithConcat( $startId, $maxChunkSize, $maxChunkFactor, $factorTh
 			$primaryOldid = $revs[$i]->rev_text_id;
 
 			# Get the text of each revision and add it to the object
-			for ( $j = 0; $j < $thisChunkSize && $chunk->isHappy( $maxChunkFactor, $factorThreshold ); $j++ ) {
+			for ( $j = 0; $j < $thisChunkSize && $chunk->isHappy(); $j++ ) {
 				$oldid = $revs[$i + $j]->rev_text_id;
 
 				# Get text
@@ -229,7 +225,7 @@ function compressWithConcat( $startId, $maxChunkSize, $maxChunkFactor, $factorTh
 						$stub = false;
 						print 'x';
 					} else {
-						$stub = $chunk->addItem( $text );
+						$stub = new HistoryBlobStub( $chunk->addItem( $text ) );
 						$stub->setLocation( $primaryOldid );
 						$stub->setReferrer( $oldid );
 						print '.';
diff --git a/maintenance/storage/compressOld.php b/maintenance/storage/compressOld.php
index dda765d7..6f8b48eb 100644
--- a/maintenance/storage/compressOld.php
+++ b/maintenance/storage/compressOld.php
@@ -18,8 +18,6 @@
  *  -b <begin-date>     earliest date to check for uncompressed revisions
  *  -e <end-date>       latest revision date to compress
  *  -s <start-id>       the old_id to start from
- *  -f <max-factor>     the maximum ratio of compressed chunk bytes to uncompressed avg. revision bytes
- *  -h <threshold>      is a minimum number of KB, where <max-factor> cuts in
  *  --extdb <cluster>   store specified revisions in an external cluster (untested)
  *
  * @file
@@ -40,8 +38,6 @@ $defaults = array(
 	't' => 'concat',
 	'c' => 20,
 	's' => 0,
-	'f' => 5,
-	'h' => 100,
 	'b' => '',
     'e' => '',
     'extdb' => '',
@@ -62,7 +58,7 @@ if ( $options['extdb'] != '' ) {
 
 $success = true;
 if ( $options['t'] == 'concat' ) {
-    $success = compressWithConcat( $options['s'], $options['c'], $options['f'], $options['h'], $options['b'],
+    $success = compressWithConcat( $options['s'], $options['c'], $options['b'],
         $options['e'], $options['extdb'], $options['endid'] );
 } else {
 	compressOldPages( $options['s'], $options['extdb'] );
diff --git a/maintenance/storage/dumpRev.php b/maintenance/storage/dumpRev.php
index 720eb958..c84d8aa5 100644
--- a/maintenance/storage/dumpRev.php
+++ b/maintenance/storage/dumpRev.php
@@ -6,13 +6,51 @@
 
 require_once( dirname(__FILE__) . '/../commandLine.inc' );
 
+$wgDebugLogFile = '/dev/stdout';
+
+
 $dbr = wfGetDB( DB_SLAVE );
-$row = $dbr->selectRow( 'text', array( 'old_flags', 'old_text' ), array( 'old_id' => $args[0] ) );
-$obj = unserialize( $row->old_text );
+$row = $dbr->selectRow( 
+	array( 'text', 'revision' ), 
+	array( 'old_flags', 'old_text' ), 
+	array( 'old_id=rev_text_id', 'rev_id' => $args[0] )
+);
+if ( !$row ) {
+	print "Row not found\n";
+	exit;
+}
 
-if ( get_class( $obj ) == 'concatenatedgziphistoryblob' ) {
-	print_r( array_keys( $obj->mItems ) );
-} else {
-	var_dump( $obj );
+$flags = explode( ',',  $row->old_flags );
+$text = $row->old_text;
+if ( in_array( 'external', $flags ) ) {
+	print "External $text\n";
+	if ( preg_match( '!^DB://(\w+)/(\w+)/(\w+)$!', $text, $m ) ) {
+		$es = ExternalStore::getStoreObject( 'DB' );
+		$blob = $es->fetchBlob( $m[1], $m[2], $m[3] );
+		if ( strtolower( get_class( $blob ) ) == 'concatenatedgziphistoryblob' ) {
+			print "Found external CGZ\n";
+			$blob->uncompress();
+			print "Items: (" . implode( ', ', array_keys( $blob->mItems ) ) . ")\n";
+			$text = $blob->getItem( $m[3] );
+		} else {
+			print "CGZ expected at $text, got " . gettype( $blob ) . "\n";
+			$text = $blob;
+		}
+	} else {
+		print "External plain $text\n";
+		$text = ExternalStore::fetchFromURL( $text );
+	}
+}
+if ( in_array( 'gzip', $flags ) ) {
+	$text = gzinflate( $text );
+}
+if ( in_array( 'object', $flags ) ) {
+	$text = unserialize( $text );
 }
 
+if ( is_object( $text ) ) {
+	print "Unexpectedly got object of type: " . get_class( $text ) .  "\n";
+} else {
+	print "Text length: " . strlen( $text ) ."\n";
+	print substr( $text, 0, 100 ) . "\n";
+}
diff --git a/maintenance/storage/orphanStats.php b/maintenance/storage/orphanStats.php
new file mode 100644
index 00000000..afea815e
--- /dev/null
+++ b/maintenance/storage/orphanStats.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Show some statistics on the blob_orphans table, created with trackBlobs.php
+ */
+require_once( dirname(__FILE__).'/../commandLine.inc' );
+
+$stats = new OrphanStats;
+$stats->execute();
+
+class OrphanStats {
+	function getDB( $cluster ) {
+		$lb = wfGetLBFactory()->getExternalLB( $cluster );
+		return $lb->getConnection( DB_SLAVE );
+	}
+
+	function execute() {
+		$extDBs = array();
+		$dbr = wfGetDB( DB_SLAVE );
+		$res = $dbr->select( 'blob_orphans', '*', false, __METHOD__ );
+		
+		$num = 0;
+		$totalSize = 0;
+		$hashes = array();
+		$maxSize = 0;
+
+		foreach ( $res as $boRow ) {
+			$extDB = $this->getDB( $boRow->bo_cluster );
+			$blobRow = $extDB->selectRow( 'blobs', '*', array( 'blob_id' => $boRow->bo_blob_id ), __METHOD__ );
+			
+			$num++;
+			$size = strlen( $blobRow->blob_text );
+			$totalSize += $size;
+			$hashes[ sha1( $blobRow->blob_text ) ] = true;
+			$maxSize = max( $size, $maxSize );
+		}
+		unset( $res );
+
+		echo "Number of orphans: $num\n";
+		if ( $num > 0 ) {
+			echo "Average size: " . round( $totalSize / $num, 0 ) . " bytes\n" .
+			"Max size: $maxSize\n" . 
+			"Number of unique texts: " . count( $hashes ) . "\n";
+		}
+	}
+}
diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php
new file mode 100644
index 00000000..7e4ed1b4
--- /dev/null
+++ b/maintenance/storage/recompressTracked.php
@@ -0,0 +1,742 @@
+<?php
+
+$optionsWithArgs = RecompressTracked::getOptionsWithArgs();
+require( dirname( __FILE__ ) .'/../commandLine.inc' );
+
+if ( count( $args ) < 1 ) {
+	echo "Usage: php recompressTracked.php [options] <cluster> [... <cluster>...]
+Moves blobs indexed by trackBlobs.php to a specified list of destination clusters, and recompresses them in the process. Restartable.
+
+Options: 
+    --procs <procs>         Set the number of child processes (default 1)
+	--copy-only             Copy only, do not update the text table. Restart without this option to complete.
+	--debug-log <file>      Log debugging data to the specified file
+	--info-log <file>       Log progress messages to the specified file
+	--critical-log <file>   Log error messages to the specified file
+";
+	exit( 1 );
+}
+
+$job = RecompressTracked::newFromCommandLine( $args, $options );
+$job->execute();
+
+class RecompressTracked {
+	var $destClusters;
+	var $batchSize = 1000;
+	var $orphanBatchSize = 1000;
+	var $reportingInterval = 10;
+	var $numProcs = 1;
+	var $useDiff, $pageBlobClass, $orphanBlobClass;
+	var $slavePipes, $slaveProcs, $prevSlaveId;
+	var $copyOnly = false;
+	var $isChild = false;
+	var $slaveId = false;
+	var $debugLog, $infoLog, $criticalLog;
+	var $store;
+
+	static $optionsWithArgs = array( 'procs', 'slave-id', 'debug-log', 'info-log', 'critical-log' );
+	static $cmdLineOptionMap = array(
+		'procs' => 'numProcs',
+		'copy-only' => 'copyOnly',
+		'child' => 'isChild',
+		'slave-id' => 'slaveId',
+		'debug-log' => 'debugLog',
+		'info-log' => 'infoLog',
+		'critical-log' => 'criticalLog',
+	);
+
+	static function getOptionsWithArgs() {
+		return self::$optionsWithArgs;
+	}
+
+	static function newFromCommandLine( $args, $options ) {
+		$jobOptions = array( 'destClusters' => $args );
+		foreach ( self::$cmdLineOptionMap as $cmdOption => $classOption ) {
+			if ( isset( $options[$cmdOption] ) ) {
+				$jobOptions[$classOption] = $options[$cmdOption];
+			}
+		}
+		return new self( $jobOptions );
+	}
+
+	function __construct( $options ) {
+		foreach ( $options as $name => $value ) {
+			$this->$name = $value;
+		}
+		$this->store = new ExternalStoreDB;
+		if ( !$this->isChild ) {
+			$GLOBALS['wgDebugLogPrefix'] = "RCT M: ";
+		} elseif ( $this->slaveId !== false ) {
+			$GLOBALS['wgDebugLogPrefix'] = "RCT {$this->slaveId}: ";
+		}
+		$this->useDiff = function_exists( 'xdiff_string_bdiff' );
+		$this->pageBlobClass = $this->useDiff ? 'DiffHistoryBlob' : 'ConcatenatedGzipHistoryBlob';
+		$this->orphanBlobClass = 'ConcatenatedGzipHistoryBlob';
+	}
+
+	function debug( $msg ) {
+		wfDebug( "$msg\n" );
+		if ( $this->debugLog ) {
+			$this->logToFile( $msg, $this->debugLog );
+		}
+
+	}
+
+	function info( $msg ) {
+		echo "$msg\n";
+		if ( $this->infoLog ) {
+			$this->logToFile( $msg, $this->infoLog );
+		}
+	}
+
+	function critical( $msg ) {
+		echo "$msg\n";
+		if ( $this->criticalLog ) {
+			$this->logToFile( $msg, $this->criticalLog );
+		}
+	}
+
+	function logToFile( $msg, $file ) {
+		$header = '[' . date('d\TH:i:s') . '] ' . wfHostname() . ' ' . posix_getpid();
+		if ( $this->slaveId !== false ) {
+			$header .= "({$this->slaveId})";
+		}
+		$header .= ' ' . wfWikiID();
+		wfErrorLog( sprintf( "%-50s %s\n", $header, $msg ), $file );
+	}
+
+	/**
+	 * Wait until the selected slave has caught up to the master.
+	 * This allows us to use the slave for things that were committed in a 
+	 * previous part of this batch process. 
+	 */
+	function syncDBs() {
+		$dbw = wfGetDB( DB_MASTER );
+		$dbr = wfGetDB( DB_SLAVE );
+		$pos = $dbw->getMasterPos();
+		$dbr->masterPosWait( $pos, 100000 );
+	}
+
+	/**
+	 * Execute parent or child depending on the isChild option
+	 */
+	function execute() {
+		if ( $this->isChild ) {
+			$this->executeChild();
+		} else {
+			$this->executeParent();
+		}
+	}
+
+	/**
+	 * Execute the parent process
+	 */
+	function executeParent() {
+		if ( !$this->checkTrackingTable() ) {
+			return;
+		}
+
+		$this->syncDBs();
+		$this->startSlaveProcs();
+		$this->doAllPages();
+		$this->doAllOrphans();
+		$this->killSlaveProcs();
+	}
+
+	/**
+	 * Make sure the tracking table exists and isn't empty
+	 */
+	function checkTrackingTable() {
+		$dbr = wfGetDB( DB_SLAVE );
+		if ( !$dbr->tableExists( 'blob_tracking' ) ) {
+			$this->critical( "Error: blob_tracking table does not exist" );
+			return false;
+		}
+		$row = $dbr->selectRow( 'blob_tracking', '*', false, __METHOD__ );
+		if ( !$row ) {
+			$this->info( "Warning: blob_tracking table contains no rows, skipping this wiki." );
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Start the worker processes.
+	 * These processes will listen on stdin for commands.
+	 * This necessary because text recompression is slow: loading, compressing and
+	 * writing are all slow.
+	 */
+	function startSlaveProcs() {
+		$cmd = 'php ' . wfEscapeShellArg( __FILE__ );
+		foreach ( self::$cmdLineOptionMap as $cmdOption => $classOption ) {
+			if ( $cmdOption == 'slave-id' ) {
+				continue;
+			} elseif ( in_array( $cmdOption, self::$optionsWithArgs ) && isset( $this->$classOption ) ) {
+				$cmd .= " --$cmdOption " . wfEscapeShellArg( $this->$classOption );
+			} elseif ( $this->$classOption ) {
+				$cmd .= " --$cmdOption";
+			}
+		}
+		$cmd .= ' --child' . 
+			' --wiki ' . wfEscapeShellArg( wfWikiID() ) .
+			' ' . call_user_func_array( 'wfEscapeShellArg', $this->destClusters );
+
+		$this->slavePipes = $this->slaveProcs = array();
+		for ( $i = 0; $i < $this->numProcs; $i++ ) {
+			$pipes = false;
+			$spec = array( 
+				array( 'pipe', 'r' ),
+				array( 'file', 'php://stdout', 'w' ),
+				array( 'file', 'php://stderr', 'w' )
+			);
+			wfSuppressWarnings();
+			$proc = proc_open( "$cmd --slave-id $i", $spec, $pipes );
+			wfRestoreWarnings();
+			if ( !$proc ) {
+				$this->critical( "Error opening slave process: $cmd" );
+				exit( 1 );
+			}
+			$this->slaveProcs[$i] = $proc;
+			$this->slavePipes[$i] = $pipes[0];
+		}
+		$this->prevSlaveId = -1;
+	}
+
+	/**
+	 * Gracefully terminate the child processes
+	 */
+	function killSlaveProcs() {
+		$this->info( "Waiting for slave processes to finish..." );
+		for ( $i = 0; $i < $this->numProcs; $i++ ) {
+			$this->dispatchToSlave( $i, 'quit' );
+		}
+		for ( $i = 0; $i < $this->numProcs; $i++ ) {
+			$status = proc_close( $this->slaveProcs[$i] );
+			if ( $status ) {
+				$this->critical( "Warning: child #$i exited with status $status" );
+			}
+		}
+		$this->info( "Done." );
+	}
+
+	/**
+	 * Dispatch a command to the next available slave.
+	 * This may block until a slave finishes its work and becomes available.
+	 */
+	function dispatch( /*...*/ ) {
+		$args = func_get_args();
+		$pipes = $this->slavePipes;
+		$numPipes = stream_select( $x=array(), $pipes, $y=array(), 3600 );
+		if ( !$numPipes ) {
+			$this->critical( "Error waiting to write to slaves. Aborting" );
+			exit( 1 );
+		}
+		for ( $i = 0; $i < $this->numProcs; $i++ ) {
+			$slaveId = ( $i + $this->prevSlaveId + 1 ) % $this->numProcs;
+			if ( isset( $pipes[$slaveId] ) ) {
+				$this->prevSlaveId = $slaveId;
+				$this->dispatchToSlave( $slaveId, $args );
+				return;
+			}
+		}
+		$this->critical( "Unreachable" );
+		exit( 1 );
+	}
+
+	/**
+	 * Dispatch a command to a specified slave
+	 */
+	function dispatchToSlave( $slaveId, $args ) {
+		$args = (array)$args;
+		$cmd = implode( ' ',  $args );
+		fwrite( $this->slavePipes[$slaveId], "$cmd\n" );
+	}
+
+	/**
+	 * Move all tracked pages to the new clusters
+	 */
+	function doAllPages() {
+		$dbr = wfGetDB( DB_SLAVE );
+		$i = 0;
+		$startId = 0;
+		$numPages = $dbr->selectField( 'blob_tracking', 
+			'COUNT(DISTINCT bt_page)', 
+			# A condition is required so that this query uses the index
+			array( 'bt_moved' => 0 ),
+			__METHOD__
+		);
+		if ( $this->copyOnly ) {
+			$this->info( "Copying pages..." );
+		} else {
+			$this->info( "Moving pages..." );
+		}
+		while ( true ) {
+			$res = $dbr->select( 'blob_tracking', 
+				array( 'bt_page' ),
+				array( 
+					'bt_moved' => 0,
+					'bt_page > ' . $dbr->addQuotes( $startId )
+				),
+				__METHOD__,
+				array( 
+					'DISTINCT', 
+					'ORDER BY' => 'bt_page',
+					'LIMIT' => $this->batchSize,
+				)
+			);
+			if ( !$res->numRows() ) {
+				break;
+			}
+			foreach ( $res as $row ) {
+				$this->dispatch( 'doPage', $row->bt_page );
+				$i++;
+			}
+			$startId = $row->bt_page;
+			$this->report( 'pages', $i, $numPages );
+		}
+		$this->report( 'pages', $i, $numPages );
+		if ( $this->copyOnly ) {
+			$this->info( "All page copies queued." );
+		} else {
+			$this->info( "All page moves queued." );
+		}
+	}
+
+	/**
+	 * Display a progress report
+	 */
+	function report( $label, $current, $end ) {
+		$this->numBatches++;
+		if ( $current == $end || $this->numBatches >= $this->reportingInterval ) {
+			$this->numBatches = 0;
+			$this->info( "$label: $current / $end" );
+			wfWaitForSlaves( 5 );
+		}
+	}
+
+	/**
+	 * Move all orphan text to the new clusters
+	 */
+	function doAllOrphans() {
+		$dbr = wfGetDB( DB_SLAVE );
+		$startId = 0;
+		$i = 0;
+		$numOrphans = $dbr->selectField( 'blob_tracking', 
+			'COUNT(DISTINCT bt_text_id)', 
+			array( 'bt_moved' => 0, 'bt_page' => 0 ),
+			__METHOD__ );
+		if ( !$numOrphans ) {
+			return;
+		}
+		if ( $this->copyOnly ) {
+			$this->info( "Copying orphans..." );
+		} else {
+			$this->info( "Moving orphans..." );
+		}
+		$ids = array();
+
+		while ( true ) {
+			$res = $dbr->select( 'blob_tracking',
+				array( 'bt_text_id' ),
+				array(
+					'bt_moved' => 0,
+					'bt_page' => 0,
+					'bt_text_id > ' . $dbr->addQuotes( $startId )
+				),
+				__METHOD__,
+				array(
+					'DISTINCT',
+					'ORDER BY' => 'bt_text_id',
+					'LIMIT' => $this->batchSize
+				)
+			);
+			if ( !$res->numRows() ) {
+				break;
+			}
+			foreach ( $res as $row ) {
+				$ids[] = $row->bt_text_id;
+				$i++;
+			}
+			// Need to send enough orphan IDs to the child at a time to fill a blob,
+			// so orphanBatchSize needs to be at least ~100.
+			// batchSize can be smaller or larger.
+			while ( count( $ids ) > $this->orphanBatchSize ) {
+				$args = array_slice( $ids, 0, $this->orphanBatchSize );
+				$ids = array_slice( $ids, $this->orphanBatchSize );
+				array_unshift( $args, 'doOrphanList' );
+				call_user_func_array( array( $this, 'dispatch' ), $args );
+			}
+			$startId = $row->bt_text_id;
+			$this->report( 'orphans', $i, $numOrphans );
+		}
+		$this->report( 'orphans', $i, $numOrphans );
+		$this->info( "All orphans queued." );
+	}
+
+	/**
+	 * Main entry point for worker processes
+	 */
+	function executeChild() {
+		$this->debug( 'starting' );
+		$this->syncDBs();
+
+		while ( !feof( STDIN ) ) {
+			$line = rtrim( fgets( STDIN ) );
+			if ( $line == '' ) {
+				continue;
+			}
+			$this->debug( $line );
+			$args = explode( ' ', $line );
+			$cmd = array_shift( $args );
+			switch ( $cmd ) {
+			case 'doPage':
+				$this->doPage( intval( $args[0] ) );
+				break;
+			case 'doOrphanList':
+				$this->doOrphanList( array_map( 'intval', $args ) );
+				break;
+			case 'quit':
+				return;
+			}
+			wfWaitForSlaves( 5 );
+		}
+	}
+
+	/**
+	 * Move tracked text in a given page
+	 */
+	function doPage( $pageId ) {
+		$title = Title::newFromId( $pageId );
+		if ( $title ) {
+			$titleText = $title->getPrefixedText();
+		} else {
+			$titleText = '[deleted]';
+		}
+		$dbr = wfGetDB( DB_SLAVE );
+
+		// Finish any incomplete transactions
+		if ( !$this->copyOnly ) {
+			$this->finishIncompleteMoves( array( 'bt_page' => $pageId ) );
+			$this->syncDBs();
+		}
+
+		$startId = 0;
+		$trx = new CgzCopyTransaction( $this, $this->pageBlobClass );
+
+		while ( true ) {
+			$res = $dbr->select( 
+				array( 'blob_tracking', 'text' ), 
+				'*',
+				array(
+					'bt_page' => $pageId,
+					'bt_text_id > ' . $dbr->addQuotes( $startId ),
+					'bt_moved' => 0,
+					'bt_new_url IS NULL',
+					'bt_text_id=old_id',
+				),
+				__METHOD__,
+				array( 
+					'ORDER BY' => 'bt_text_id',
+					'LIMIT' => $this->batchSize
+				)
+			);
+			if ( !$res->numRows() ) {
+				break;
+			}
+
+			$lastTextId = 0;
+			foreach ( $res as $row ) {
+				if ( $lastTextId == $row->bt_text_id ) {
+					// Duplicate (null edit)
+					continue;
+				}
+				$lastTextId = $row->bt_text_id;
+				// Load the text
+				$text = Revision::getRevisionText( $row );
+				if ( $text === false ) {
+					$this->critical( "Error loading {$row->bt_rev_id}/{$row->bt_text_id}" );
+					continue;
+				}
+
+				// Queue it
+				if ( !$trx->addItem( $text, $row->bt_text_id ) ) {
+					$this->debug( "$titleText: committing blob with " . $trx->getSize() . " items" );
+					$trx->commit();
+					$trx = new CgzCopyTransaction( $this, $this->pageBlobClass );
+				}
+			}
+			$startId = $row->bt_text_id;
+		}
+
+		$this->debug( "$titleText: committing blob with " . $trx->getSize() . " items" );
+		$trx->commit();
+	}
+
+	/**
+	 * Atomic move operation.
+	 *
+	 * Write the new URL to the text table and set the bt_moved flag.
+	 *
+	 * This is done in a single transaction to provide restartable behaviour
+	 * without data loss.
+	 * 
+	 * The transaction is kept short to reduce locking.
+	 */
+	function moveTextRow( $textId, $url ) {
+		if ( $this->copyOnly ) {
+			$this->critical( "Internal error: can't call moveTextRow() in --copy-only mode" );
+			exit( 1 );
+		}
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
+		$dbw->update( 'text',
+			array( // set
+				'old_text' => $url,
+				'old_flags' => 'external,utf-8',
+			),
+			array( // where
+				'old_id' => $textId
+			),
+			__METHOD__
+		);
+		$dbw->update( 'blob_tracking',
+			array( 'bt_moved' => 1 ),
+			array( 'bt_text_id' => $textId ),
+			__METHOD__
+		);
+		$dbw->commit();
+	}
+
+	/**
+	 * Moves are done in two phases: bt_new_url and then bt_moved.
+	 *  - bt_new_url indicates that the text has been copied to the new cluster.
+	 *  - bt_moved indicates that the text table has been updated.
+	 *
+	 * This function completes any moves that only have done bt_new_url. This
+	 * can happen when the script is interrupted, or when --copy-only is used.
+	 */
+	function finishIncompleteMoves( $conds ) {
+		$dbr = wfGetDB( DB_SLAVE );
+
+		$startId = 0;
+		$conds = array_merge( $conds, array( 
+			'bt_moved' => 0,
+			'bt_new_url IS NOT NULL'
+		));
+		while ( true ) {
+			$res = $dbr->select( 'blob_tracking',
+				'*',
+				array_merge( $conds, array( 'bt_text_id > ' . $dbr->addQuotes( $startId ) ) ),
+				__METHOD__,
+				array( 
+					'ORDER BY' => 'bt_text_id',
+					'LIMIT' => $this->batchSize,
+				)
+			);
+			if ( !$res->numRows() ) {
+				break;
+			}
+			$this->debug( 'Incomplete: ' . $res->numRows() . ' rows' );
+			foreach ( $res as $row ) {
+				$this->moveTextRow( $row->bt_text_id, $row->bt_new_url );
+			}
+			$startId = $row->bt_text_id;
+		}
+	}
+
+	/**
+	 * Returns the name of the next target cluster
+	 */
+	function getTargetCluster() {
+		$cluster = next( $this->destClusters );
+		if ( $cluster === false ) {
+			$cluster = reset( $this->destClusters );
+		}
+		return $cluster;
+	}
+
+	/**
+	 * Gets a DB master connection for the given external cluster name
+	 */
+	function getExtDB( $cluster ) {
+		$lb = wfGetLBFactory()->getExternalLB( $cluster );
+		return $lb->getConnection( DB_MASTER );
+	}
+
+	/**
+	 * Move an orphan text_id to the new cluster
+	 */
+	function doOrphanList( $textIds ) {
+		// Finish incomplete moves
+		if ( !$this->copyOnly ) {
+			$this->finishIncompleteMoves( array( 'bt_text_id' => $textIds ) );
+			$this->syncDBs();
+		}
+		
+		$trx = new CgzCopyTransaction( $this, $this->orphanBlobClass );
+
+		$res = wfGetDB( DB_SLAVE )->select(
+			array( 'text', 'blob_tracking' ), 
+			array( 'old_id', 'old_text', 'old_flags' ), 
+			array( 
+				'old_id' => $textIds,
+				'bt_text_id=old_id',
+				'bt_moved' => 0,
+			), 
+			__METHOD__,
+			array( 'DISTINCT' )
+		);
+
+		foreach ( $res as $row ) {
+			$text = Revision::getRevisionText( $row );
+			if ( $text === false ) {
+				$this->critical( "Error: cannot load revision text for old_id=$textId" );
+				continue;
+			}
+			
+			if ( !$trx->addItem( $text, $row->old_id ) ) {
+				$this->debug( "[orphan]: committing blob with " . $trx->getSize() . " rows" );
+				$trx->commit();
+				$trx = new CgzCopyTransaction( $this, $this->orphanBlobClass );
+			}
+		}
+		$this->debug( "[orphan]: committing blob with " . $trx->getSize() . " rows" );
+		$trx->commit();
+	}
+}
+
+/**
+ * Class to represent a recompression operation for a single CGZ blob
+ */
+class CgzCopyTransaction {
+	var $parent;
+	var $blobClass;
+	var $cgz;
+	var $referrers;
+
+	/**
+	 * Create a transaction from a RecompressTracked object
+	 */
+	function __construct( $parent, $blobClass ) {
+		$this->blobClass = $blobClass;
+		$this->cgz = false;
+		$this->texts = array();
+		$this->parent = $parent;
+	}
+
+	/**
+	 * Add text.
+	 * Returns false if it's ready to commit.
+	 */
+	function addItem( $text, $textId ) {
+		if ( !$this->cgz ) {
+			$class = $this->blobClass;
+			$this->cgz = new $class;
+		}
+		$hash = $this->cgz->addItem( $text );
+		$this->referrers[$textId] = $hash;
+		$this->texts[$textId] = $text;
+		return $this->cgz->isHappy();
+	}
+
+	function getSize() {
+		return count( $this->texts );
+	}
+
+	/**
+	 * Recompress text after some aberrant modification
+	 */
+	function recompress() {
+		$class = $this->blobClass;
+		$this->cgz = new $class;
+		$this->referrers = array();
+		foreach ( $this->texts as $textId => $text ) {
+			$hash = $this->cgz->addItem( $text );
+			$this->referrers[$textId] = $hash;
+		}
+	}
+
+	/**
+	 * Commit the blob.
+	 * Does nothing if no text items have been added.
+	 * May skip the move if --copy-only is set.
+	 */
+	function commit() {
+		$originalCount = count( $this->texts );
+		if ( !$originalCount ) {
+			return;
+		}
+
+		// Check to see if the target text_ids have been moved already.
+		//
+		// We originally read from the slave, so this can happen when a single 
+		// text_id is shared between multiple pages. It's rare, but possible 
+		// if a delete/move/undelete cycle splits up a null edit.
+		//
+		// We do a locking read to prevent closer-run race conditions.
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
+		$res = $dbw->select( 'blob_tracking', 
+			array( 'bt_text_id', 'bt_moved' ),
+			array( 'bt_text_id' => array_keys( $this->referrers ) ),
+			__METHOD__, array( 'FOR UPDATE' ) );
+		$dirty = false;
+		foreach ( $res as $row ) {
+			if ( $row->bt_moved ) {
+				# This row has already been moved, remove it
+				$this->parent->debug( "TRX: conflict detected in old_id={$row->bt_text_id}" );
+				unset( $this->texts[$row->bt_text_id] );
+				$dirty = true;
+			}
+		}
+
+		// Recompress the blob if necessary
+		if ( $dirty ) {
+			if ( !count( $this->texts ) ) {
+				// All have been moved already
+				if ( $originalCount > 1 ) {
+					// This is suspcious, make noise
+					$this->critical( "Warning: concurrent operation detected, are there two conflicting " .
+						"processes running, doing the same job?" );
+				}
+				return;
+			}
+			$this->recompress();
+		}
+
+		// Insert the data into the destination cluster
+		$targetCluster = $this->parent->getTargetCluster();
+		$store = $this->parent->store;
+		$targetDB = $store->getMaster( $targetCluster );
+		$targetDB->clearFlag( DBO_TRX ); // we manage the transactions
+		$targetDB->begin();
+		$baseUrl = $this->parent->store->store( $targetCluster, serialize( $this->cgz ) );
+
+		// Write the new URLs to the blob_tracking table
+		foreach ( $this->referrers as $textId => $hash ) {
+			$url = $baseUrl . '/' . $hash;
+			$dbw->update( 'blob_tracking',
+				array( 'bt_new_url' => $url ),
+				array(
+					'bt_text_id' => $textId,
+					'bt_moved' => 0, # Check for concurrent conflicting update
+				),
+				__METHOD__
+			);
+		}
+
+		$targetDB->commit();
+		// Critical section here: interruption at this point causes blob duplication
+		// Reversing the order of the commits would cause data loss instead
+		$dbw->commit();
+
+		// Write the new URLs to the text table and set the moved flag
+		if ( !$this->parent->copyOnly ) {
+			foreach ( $this->referrers as $textId => $hash ) {
+				$url = $baseUrl . '/' . $hash;
+				$this->parent->moveTextRow( $textId, $url );
+			}
+		}
+	}
+}
+
diff --git a/maintenance/storage/testCompression.php b/maintenance/storage/testCompression.php
new file mode 100644
index 00000000..9c96c9f8
--- /dev/null
+++ b/maintenance/storage/testCompression.php
@@ -0,0 +1,81 @@
+<?php
+
+$optionsWithArgs = array( 'start', 'limit', 'type' );
+require( dirname(__FILE__).'/../commandLine.inc' );
+
+if ( !isset( $args[0] )  ) {
+	echo "Usage: php testCompression.php [--type=<type>] [--start=<start-date>] [--limit=<num-revs>] <page-title>\n";
+	exit( 1 );
+}
+
+$title = Title::newFromText( $args[0] );
+if ( isset( $options['start'] ) ) {
+	$start = wfTimestamp( TS_MW, strtotime( $options['start'] ) );
+	echo "Starting from " . $wgLang->timeanddate( $start ) . "\n";
+} else {
+	$start = '19700101000000';
+}
+if ( isset( $options['limit'] ) ) {
+	$limit = $options['limit'];
+	$untilHappy = false;
+} else {
+	$limit = 1000;
+	$untilHappy = true;
+}
+$type = isset( $options['type'] ) ? $options['type'] : 'ConcatenatedGzipHistoryBlob';
+
+
+$dbr = wfGetDB( DB_SLAVE );
+$res = $dbr->select( 
+	array( 'page', 'revision', 'text' ),
+	'*',
+	array( 
+		'page_namespace' => $title->getNamespace(),
+		'page_title' => $title->getDBkey(),
+		'page_id=rev_page',
+		'rev_timestamp > ' . $dbr->addQuotes( $dbr->timestamp( $start ) ),
+		'rev_text_id=old_id'
+	), __FILE__, array( 'LIMIT' => $limit )
+);
+
+$blob = new $type;
+$hashes = array();
+$keys = array();
+$uncompressedSize = 0;
+$t = -microtime( true );
+foreach ( $res as $row ) {
+	$revision = new Revision( $row );
+	$text = $revision->getText();
+	$uncompressedSize += strlen( $text );
+	$hashes[$row->rev_id] = md5( $text );
+	$keys[$row->rev_id] = $blob->addItem( $text );
+	if ( $untilHappy && !$blob->isHappy() ) {
+		break;
+	}
+}
+
+$serialized = serialize( $blob );
+$t += microtime( true );
+#print_r( $blob->mDiffMap );
+
+printf( "%s\nCompression ratio for %d revisions: %5.2f, %s -> %d\n", 
+	$type,
+	count( $hashes ),
+	$uncompressedSize / strlen( $serialized ),
+	$wgLang->formatSize( $uncompressedSize ),
+	strlen( $serialized )
+);
+printf( "Compression time: %5.2f ms\n", $t * 1000 );
+
+$t = -microtime( true );
+$blob = unserialize( $serialized );
+foreach ( $keys as $id => $key ) {
+	$text = $blob->getItem( $key );
+	if ( md5( $text ) != $hashes[$id] ) {
+		echo "Content hash mismatch for rev_id $id\n";
+		#var_dump( $text );
+	}
+}
+$t += microtime( true );
+printf( "Decompression time: %5.2f ms\n", $t * 1000 );
+
diff --git a/maintenance/storage/trackBlobs.php b/maintenance/storage/trackBlobs.php
new file mode 100644
index 00000000..b13faa00
--- /dev/null
+++ b/maintenance/storage/trackBlobs.php
@@ -0,0 +1,316 @@
+<?php
+
+require( dirname( __FILE__ ) .'/../commandLine.inc' );
+
+
+if ( count( $args ) < 1 ) {
+	echo "Usage: php trackBlobs.php <cluster> [... <cluster>]\n";
+	echo "Adds blobs from a given ES cluster to the blob_tracking table\n";
+	echo "Automatically deletes the tracking table and starts from the start again when restarted.\n";
+
+	exit( 1 );
+}
+$tracker = new TrackBlobs( $args );
+$tracker->trackBlobs();
+
+class TrackBlobs {
+	var $clusters, $textClause;
+	var $doBlobOrphans;
+	var $trackedBlobs = array();
+
+	var $batchSize = 1000;
+	var $reportingInterval = 10;
+
+	function __construct( $clusters ) {
+		$this->clusters = $clusters;
+		if ( extension_loaded( 'gmp' ) ) {
+			$this->doBlobOrphans = true;
+			foreach ( $clusters as $cluster ) {
+				$this->trackedBlobs[$cluster] = gmp_init( 0 );
+			}
+		} else {
+			echo "Warning: the gmp extension is needed to find orphan blobs\n";
+		}
+	}
+
+	function trackBlobs() {
+		$this->initTrackingTable();
+		$this->trackRevisions();
+		$this->trackOrphanText();
+		if ( $this->doBlobOrphans ) {
+			$this->findOrphanBlobs();
+		}
+	}
+
+	function initTrackingTable() {
+		$dbw = wfGetDB( DB_MASTER );
+		if ( $dbw->tableExists( 'blob_tracking' ) ) {
+			$dbw->query( 'DROP TABLE ' . $dbw->tableName( 'blob_tracking' ) );
+			$dbw->query( 'DROP TABLE ' . $dbw->tableName( 'blob_orphans' ) );
+		}
+		$dbw->sourceFile( dirname( __FILE__ ) . '/blob_tracking.sql' );
+	}
+
+	function getTextClause() {
+		if ( !$this->textClause ) {
+			$dbr = wfGetDB( DB_SLAVE );
+			$this->textClause = '';
+			foreach ( $this->clusters as $cluster ) {
+				if ( $this->textClause != '' ) {
+					$this->textClause .= ' OR ';
+				}
+				$this->textClause .= 'old_text LIKE ' . $dbr->addQuotes( $dbr->escapeLike( "DB://$cluster/" ) . '%' );
+			}
+		}
+		return $this->textClause;
+	}
+
+	function interpretPointer( $text ) {
+		if ( !preg_match( '!^DB://(\w+)/(\d+)(?:/([0-9a-fA-F]+)|)$!', $text, $m ) ) {
+			return false;
+		}
+		return array(
+			'cluster' => $m[1],
+			'id' => intval( $m[2] ),
+			'hash' => isset( $m[3] ) ? $m[2] : null
+		);
+	}
+
+	/**
+	 *  Scan the revision table for rows stored in the specified clusters
+	 */
+	function trackRevisions() {
+		$dbw = wfGetDB( DB_MASTER );
+		$dbr = wfGetDB( DB_SLAVE );
+
+		$textClause = $this->getTextClause();
+		$startId = 0;
+		$endId = $dbr->selectField( 'revision', 'MAX(rev_id)', false, __METHOD__ );
+		$batchesDone = 0;
+		$rowsInserted = 0;
+
+		echo "Finding revisions...\n";
+
+		while ( true ) {
+			$res = $dbr->select( array( 'revision', 'text' ),
+				array( 'rev_id', 'rev_page', 'old_id', 'old_flags', 'old_text' ),
+				array(
+					'rev_id > ' . $dbr->addQuotes( $startId ),
+					'rev_text_id=old_id',
+					$textClause,
+					"old_flags LIKE '%external%'",
+				),
+				__METHOD__,
+				array(
+					'ORDER BY' => 'rev_id',
+					'LIMIT' => $this->batchSize
+				)
+			);
+			if ( !$res->numRows() ) {
+				break;
+			}
+
+			$insertBatch = array();
+			foreach ( $res as $row ) {
+				$startId = $row->rev_id;
+				$info = $this->interpretPointer( $row->old_text );
+				if ( !$info ) {
+					echo "Invalid DB:// URL in rev_id {$row->rev_id}\n";
+					continue;
+				}
+				if ( !in_array( $info['cluster'], $this->clusters ) ) {
+					echo "Invalid cluster returned in SQL query: {$info['cluster']}\n";
+					continue;
+				}
+				$insertBatch[] = array(
+					'bt_page' => $row->rev_page,
+					'bt_rev_id' => $row->rev_id,
+					'bt_text_id' => $row->old_id,
+					'bt_cluster' => $info['cluster'],
+					'bt_blob_id' => $info['id'],
+					'bt_cgz_hash' => $info['hash']
+				);
+				if ( $this->doBlobOrphans ) {
+					gmp_setbit( $this->trackedBlobs[$info['cluster']], $info['id'] );
+				}
+			}
+			$dbw->insert( 'blob_tracking', $insertBatch, __METHOD__ );
+			$rowsInserted += count( $insertBatch );
+
+			++$batchesDone;
+			if ( $batchesDone >= $this->reportingInterval ) {
+				$batchesDone = 0;
+				echo "$startId / $endId\n";
+				wfWaitForSlaves( 5 );
+			}
+		}
+		echo "Found $rowsInserted revisions\n";
+	}
+
+	/**
+	 * Scan the text table for orphan text
+	 * Orphan text here does not imply DB corruption -- deleted text tracked by the
+	 * archive table counts as orphan for our purposes.
+	 */
+	function trackOrphanText() {
+		# Wait until the blob_tracking table is available in the slave
+		$dbw = wfGetDB( DB_MASTER );
+		$dbr = wfGetDB( DB_SLAVE );
+		$pos = $dbw->getMasterPos();
+		$dbr->masterPosWait( $pos, 100000 );
+
+		$textClause = $this->getTextClause( $this->clusters );
+		$startId = 0;
+		$endId = $dbr->selectField( 'text', 'MAX(old_id)', false, __METHOD__ );
+		$rowsInserted = 0;
+		$batchesDone = 0;
+
+		echo "Finding orphan text...\n";
+
+		# Scan the text table for orphan text
+		while ( true ) {
+			$res = $dbr->select( array( 'text', 'blob_tracking' ), 
+				array( 'old_id', 'old_flags', 'old_text' ),
+				array( 
+					'old_id>' . $dbr->addQuotes( $startId ),
+					$textClause,
+					"old_flags LIKE '%external%'",
+					'bt_text_id IS NULL'
+				),
+				__METHOD__,
+				array(
+					'ORDER BY' => 'old_id',
+					'LIMIT' => $this->batchSize 
+				),
+				array( 'blob_tracking' => array( 'LEFT JOIN', 'bt_text_id=old_id' ) )
+			);
+			$ids = array();
+			foreach ( $res as $row ) {
+				$ids[] = $row->old_id;
+			}
+
+			if ( !$res->numRows() ) {
+				break;
+			}
+
+			$insertBatch = array();
+			foreach ( $res as $row ) {
+				$startId = $row->old_id;
+				$info = $this->interpretPointer( $row->old_text );
+				if ( !$info ) {
+					echo "Invalid DB:// URL in old_id {$row->old_id}\n";
+					continue;
+				}
+				if ( !in_array( $info['cluster'], $this->clusters ) ) {
+					echo "Invalid cluster returned in SQL query\n";
+					continue;
+				}
+
+				$insertBatch[] = array(
+					'bt_page' => 0,
+					'bt_rev_id' => 0,
+					'bt_text_id' => $row->old_id,
+					'bt_cluster' => $info['cluster'],
+					'bt_blob_id' => $info['id'],
+					'bt_cgz_hash' => $info['hash']
+				);
+				if ( $this->doBlobOrphans ) {
+					gmp_setbit( $this->trackedBlobs[$info['cluster']], $info['id'] );
+				}
+			}
+			$dbw->insert( 'blob_tracking', $insertBatch, __METHOD__ );
+
+			$rowsInserted += count( $insertBatch );
+			++$batchesDone;
+			if ( $batchesDone >= $this->reportingInterval ) {
+				$batchesDone = 0;
+				echo "$startId / $endId\n";
+				wfWaitForSlaves( 5 );
+			}
+		}
+		echo "Found $rowsInserted orphan text rows\n";
+	}
+
+	/**
+	 * Scan the blobs table for rows not registered in blob_tracking (and thus not
+	 * registered in the text table).
+	 *
+	 * Orphan blobs are indicative of DB corruption. They are inaccessible and
+	 * should probably be deleted.
+	 */
+	function findOrphanBlobs() {
+		if ( !extension_loaded( 'gmp' ) ) {
+			echo "Can't find orphan blobs, need bitfield support provided by GMP.\n";
+			return;
+		}
+
+		$dbw = wfGetDB( DB_MASTER );
+
+		foreach ( $this->clusters as $cluster ) {
+			echo "Searching for orphan blobs in $cluster...\n";
+			$lb = wfGetLBFactory()->getExternalLB( $cluster );
+			try {
+				$extDB = $lb->getConnection( DB_SLAVE );
+			} catch ( DBConnectionError $e ) {
+				if ( strpos( $e->error, 'Unknown database' ) !== false ) {
+					echo "No database on $cluster\n";
+				} else {
+					echo "Error on $cluster: " . $e->getMessage() . "\n";
+				}
+				continue;
+			}
+			$startId = 0;
+			$batchesDone = 0;
+			$actualBlobs = gmp_init( 0 );
+			$endId = $extDB->selectField( 'blobs', 'MAX(blob_id)', false, __METHOD__ );
+
+			// Build a bitmap of actual blob rows
+			while ( true ) {
+				$res = $extDB->select( 'blobs', 
+					array( 'blob_id' ), 
+					array( 'blob_id > ' . $extDB->addQuotes( $startId ) ),
+					__METHOD__,
+					array( 'LIMIT' => $this->batchSize, 'ORDER BY' => 'blob_id' )
+				);
+
+				if ( !$res->numRows() ) {
+					break;
+				}
+
+				foreach ( $res as $row ) {
+					gmp_setbit( $actualBlobs, $row->blob_id );
+				}
+				$startId = $row->blob_id;
+
+				++$batchesDone;
+				if ( $batchesDone >= $this->reportingInterval ) {
+					$batchesDone = 0;
+					echo "$startId / $endId\n";
+				}
+			}
+
+			// Find actual blobs that weren't tracked by the previous passes
+			// This is a set-theoretic difference A \ B, or in bitwise terms, A & ~B
+			$orphans = gmp_and( $actualBlobs, gmp_com( $this->trackedBlobs[$cluster] ) );
+			
+			// Traverse the orphan list
+			$insertBatch = array();
+			$id = 0;
+			while ( true ) {
+				$id = gmp_scan1( $orphans, $id );
+				if ( $id == -1 ) {
+					break;
+				}
+				$insertBatch[] = array(
+					'bo_cluster' => $cluster,
+					'bo_blob_id' => $id
+				);
+				++$id;
+			}
+
+			// Insert the batch
+			echo "Found " . count( $insertBatch ) . " orphan(s) in $cluster\n";
+			$dbw->insert( 'blob_orphans', $insertBatch, __METHOD__ );
+		}
+	}
+}
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 11ed7cb2..28f496eb 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -446,7 +446,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   
   -- Filename of target image.
   -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
+  -- all such pages are in namespace 6 (NS_FILE).
   il_to varchar(255) binary NOT NULL default '',
   
   UNIQUE KEY il_from (il_from,il_to),
@@ -596,6 +596,9 @@ CREATE TABLE /*$wgDBprefix*/site_stats (
 
   -- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
   ss_users bigint default '-1',
+  
+  -- Number of users that still edit
+  ss_active_users bigint default '-1',
 
   -- Deprecated, no longer updated as of 1.5
   ss_admins int default '-1',
@@ -675,6 +678,9 @@ CREATE TABLE /*$wgDBprefix*/ipblocks (
   -- Block prevents user from accessing Special:Emailuser
   ipb_block_email bool NOT NULL default 0,
   
+  -- Block allows user to edit their own talk page
+  ipb_allow_usertalk bool NOT NULL default 0,
+  
   PRIMARY KEY ipb_id (ipb_id),
 
   -- Unique index to support "user already blocked" messages
@@ -695,7 +701,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks (
 CREATE TABLE /*$wgDBprefix*/image (
   -- Filename.
   -- This is also the title of the associated description page,
-  -- which will be in namespace 6 (NS_IMAGE).
+  -- which will be in namespace 6 (NS_FILE).
   img_name varchar(255) binary NOT NULL default '',
   
   -- File size in bytes.
@@ -904,7 +910,7 @@ CREATE TABLE /*$wgDBprefix*/recentchanges (
   rc_old_len int,
   rc_new_len int,
 
-  -- Visibility of deleted revisions, bitfield
+  -- Visibility of recent changes items, bitfield
   rc_deleted tinyint unsigned NOT NULL default '0',
 
   -- Value corresonding to log_id, specific log entries
@@ -1044,7 +1050,7 @@ CREATE TABLE /*$wgDBprefix*/objectcache (
   keyname varbinary(255) NOT NULL default '',
   value mediumblob,
   exptime datetime,
-  UNIQUE KEY (keyname),
+  PRIMARY KEY (keyname),
   KEY (exptime)
 
 ) /*$wgDBTableOptions*/;
diff --git a/maintenance/updateArticleCount.inc.php b/maintenance/updateArticleCount.inc.php
index de19191e..a847a2ed 100644
--- a/maintenance/updateArticleCount.inc.php
+++ b/maintenance/updateArticleCount.inc.php
@@ -38,7 +38,8 @@ class ArticleCounter {
 	function makeSql() {
 		list( $page, $pagelinks ) = $this->dbr->tableNamesN( 'page', 'pagelinks' );
 		$nsset = $this->makeNsSet();
-		return "SELECT DISTINCT page_namespace,page_title FROM $page,$pagelinks " .
+		return "SELECT COUNT(DISTINCT page_namespace, page_title) AS pagecount " .
+			"FROM $page, $pagelinks " .
 			"WHERE pl_from=page_id and page_namespace IN ( $nsset ) " .
 			"AND page_is_redirect = 0 AND page_len > 0";
 	}
@@ -50,15 +51,9 @@ class ArticleCounter {
 	 */
 	function count() {
 		$res = $this->dbr->query( $this->makeSql(), __METHOD__ );
-		if( $res ) {
-			$count = $this->dbr->numRows( $res );
-			$this->dbr->freeResult( $res );
-			return $count;
-		} else {
-			# Look out for this when handling the result
-			#    - Actually it's unreachable, !$res throws an exception -- TS
-			return false; 
-		}
+		$row = $this->dbr->fetchObject( $res );
+		$this->dbr->freeResult( $res );
+		return $row->pagecount;
 	}
 
 }
diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index c2d256e3..f0567b5b 100644
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -25,6 +25,11 @@ function migrate_page_restrictions( $db ) {
 	
 	$start = $db->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
 	$end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+	
+	if( !$start ) {
+		die("Nothing to do.\n");
+	}
+	
 	# Do remaining chunk
 	$end += BATCH_SIZE - 1;
 	$blockStart = $start;
@@ -32,18 +37,19 @@ function migrate_page_restrictions( $db ) {
 	$encodedExpiry = 'infinity';
 	while ( $blockEnd <= $end ) {
 		echo "...doing page_id from $blockStart to $blockEnd\n";
-		$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !='' AND page_restrictions !='edit=:move='";
+		$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''";
 		$res = $db->select( 'page', array('page_id', 'page_restrictions'), $cond, __FUNCTION__ );
 		$batch = array();
 		while ( $row = $db->fetchObject( $res ) ) {
 			$oldRestrictions = array();
 			foreach( explode( ':', trim( $row->page_restrictions ) ) as $restrict ) {
 				$temp = explode( '=', trim( $restrict ) );
-				if(count($temp) == 1) {
+				// Make sure we are not settings restrictions to ""
+				if( count($temp) == 1 && $temp[0] ) {
 					// old old format should be treated as edit/move restriction
 					$oldRestrictions["edit"] = trim( $temp[0] );
 					$oldRestrictions["move"] = trim( $temp[0] );
-				} else {
+				} else if( $temp[1] ) {
 					$oldRestrictions[$temp[0]] = trim( $temp[1] );
 				}
 			}
@@ -61,12 +67,21 @@ function migrate_page_restrictions( $db ) {
 		# We use insert() and not replace() as Article.php replaces
 		# page_restrictions with '' when protected in the restrictions table
 		if ( count( $batch ) ) {
-			$db->insert( 'page_restrictions', $batch, __FUNCTION__, array( 'IGNORE' ) );
+			$ok = $db->deadlockLoop(
+				array( $db, 'insert' ),
+				'page_restrictions', $batch, __FUNCTION__, array( 'IGNORE' ) );
+			if( !$ok ) {
+				throw new MWException( "Deadlock loop failed wtf :(" );
+			}
 		}
 		$blockStart += BATCH_SIZE - 1;
 		$blockEnd += BATCH_SIZE - 1;
 		wfWaitForSlaves( 5 );
 	}
+	echo "...removing dead rows from page_restrictions\n";
+	// Kill any broken rows from previous imports
+	$db->delete( 'page_restrictions', array( 'pr_level' => '' ) );
+	echo "...Done!\n";
 }
 
 
diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php
index ac7ee11f..3eaa6205 100644
--- a/maintenance/updateSpecialPages.php
+++ b/maintenance/updateSpecialPages.php
@@ -25,7 +25,31 @@ if(@$options['help']) {
 $wgOut->disable();
 $dbw = wfGetDB( DB_MASTER );
 
-foreach ( $wgQueryPages as $page ) {
+foreach( $wgSpecialPageCacheUpdates as $special => $call ) {
+	if( !is_callable($call) ) {
+		print "Uncallable function $call!\n";
+		continue;
+	}
+	$t1 = explode( ' ', microtime() );
+	call_user_func( $call, $dbw );
+	$t2 = explode( ' ', microtime() );
+	printf( '%-30s ', $special );
+	$elapsed = ($t2[0] - $t1[0]) + ($t2[1] - $t1[1]);
+	$hours = intval( $elapsed / 3600 );
+	$minutes = intval( $elapsed % 3600 / 60 );
+	$seconds = $elapsed - $hours * 3600 - $minutes * 60;
+	if ( $hours ) {
+		print $hours . 'h ';
+	}
+	if ( $minutes ) {
+		print $minutes . 'm ';
+	}
+	printf( "completed in %.2fs\n", $seconds );
+	# Wait for the slave to catch up
+	wfWaitForSlaves( 5 );
+}
+
+foreach( $wgQueryPages as $page ) {
 	@list( $class, $special, $limit ) = $page;
 
 	# --list : just show the name of pages
@@ -50,33 +74,30 @@ foreach ( $wgQueryPages as $page ) {
 	}
 	$queryPage = new $class;
 
-	if( !(isset($options['only'])) or ($options['only'] == $queryPage->getName()) ) {
-	printf( '%-30s ',  $special );
-
-	if ( $queryPage->isExpensive() ) {
-		$t1 = explode( ' ', microtime() );
-		# Do the query
-		$num = $queryPage->recache( $limit === null ? $wgQueryCacheLimit : $limit );
-		$t2 = explode( ' ', microtime() );
-
-		if ( $num === false ) {
-			print "FAILED: database error\n";
-		} else {
-			print "got $num rows in ";
-
-			$elapsed = ($t2[0] - $t1[0]) + ($t2[1] - $t1[1]);
-			$hours = intval( $elapsed / 3600 );
-			$minutes = intval( $elapsed % 3600 / 60 );
-			$seconds = $elapsed - $hours * 3600 - $minutes * 60;
-			if ( $hours ) {
-				print $hours . 'h ';
-			}
-			if ( $minutes ) {
-				print $minutes . 'm ';
-			}
-			printf( "%.2fs\n", $seconds );
+	if( !isset($options['only']) or $options['only'] == $queryPage->getName() ) {
+		printf( '%-30s ',  $special );
+		if ( $queryPage->isExpensive() ) {
+			$t1 = explode( ' ', microtime() );
+			# Do the query
+			$num = $queryPage->recache( $limit === null ? $wgQueryCacheLimit : $limit );
+			$t2 = explode( ' ', microtime() );
+			if ( $num === false ) {
+				print "FAILED: database error\n";
+			} else {
+				print "got $num rows in ";
+
+				$elapsed = ($t2[0] - $t1[0]) + ($t2[1] - $t1[1]);
+				$hours = intval( $elapsed / 3600 );
+				$minutes = intval( $elapsed % 3600 / 60 );
+				$seconds = $elapsed - $hours * 3600 - $minutes * 60;
+				if ( $hours ) {
+					print $hours . 'h ';
+				}
+				if ( $minutes ) {
+					print $minutes . 'm ';
+				}
+				printf( "%.2fs\n", $seconds );
 		}
-
 		# Reopen any connections that have closed
 		if ( !wfGetLB()->pingAll())  {
 			print "\n";
@@ -89,22 +110,10 @@ foreach ( $wgQueryPages as $page ) {
 			# Commit the results
 			$dbw->immediateCommit();
 		}
-
 		# Wait for the slave to catch up
-		/*
-		$slaveDB = wfGetDB( DB_SLAVE, array('QueryPage::recache', 'vslow' ) );
-		while( $slaveDB->getLag() > 600 ) {
-			print "Slave lagged, waiting...\n";
-			sleep(30);
-
-		}
-		*/
 		wfWaitForSlaves( 5 );
-
-	} else {
-		print "cheap, skipped\n";
-	}
+		} else {
+			print "cheap, skipped\n";
+		}
 	}
 }
-
-
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 13cdc4c8..e671efe5 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -143,6 +143,11 @@ $wgMysqlUpdates = array(
 	array( 'maybe_do_profiling_memory_update' ),
 	array( 'do_filearchive_indices_update' ),
 	array( 'update_password_format' ),
+	
+	// 1.14
+	array( 'add_field', 'site_stats',     'ss_active_users',  'patch-ss_active_users.sql' ),
+	array( 'do_active_users_init' ),
+	array( 'add_field', 'ipblocks',     'ipb_allow_usertalk',  'patch-ipb_allow_usertalk.sql' )
 );
 
 
@@ -1015,12 +1020,32 @@ function do_stats_init() {
 	$row = $wgDatabase->selectRow( 'site_stats', '*', array( 'ss_row_id' => 1 ), __METHOD__ );
 	if( $row === false ) {
 		wfOut( "data is missing! rebuilding...\n" );
-		global $IP;
-		require_once "$IP/maintenance/initStats.inc";
-		wfInitStats();
+	} elseif ( isset( $row->site_stats ) && $row->ss_total_pages == -1 ) {
+		wfOut( "missing ss_total_pages, rebuilding...\n" );
 	} else {
 		wfOut( "ok.\n" );
+		return;
+	}
+
+	global $IP;
+	require_once "$IP/maintenance/initStats.inc";
+	wfInitStats();
+}
+
+function do_active_users_init() {
+	global $wgDatabase;
+	$activeUsers = $wgDatabase->selectField( 'site_stats', 'ss_active_users', false, __METHOD__ );
+	if( $activeUsers == -1 ) {
+		$activeUsers = $wgDatabase->selectField( 'recentchanges', 
+			'COUNT( DISTINCT rc_user_text )',
+			array( 'rc_user != 0', 'rc_bot' => 0, "rc_log_type != 'newusers'" ), __METHOD__ 
+		);
+		$wgDatabase->update( 'site_stats', 
+			array( 'ss_active_users' => intval($activeUsers) ),
+			array( 'ss_row_id' => 1 ), __METHOD__, array( 'LIMIT' => 1 )
+		);
 	}
+	wfOut( "...ss_active_users user count set...\n" );
 }
 
 function purge_cache() {
@@ -1431,12 +1456,13 @@ function do_postgres_updates() {
 		array("archive",       "ar_page_id",           "INTEGER"),
 		array("archive",       "ar_parent_id",         "INTEGER"),
 		array("image",         "img_sha1",             "TEXT NOT NULL DEFAULT ''"),
-		array("ipblocks",      "ipb_anon_only",        "CHAR NOT NULL DEFAULT '0'"),
+		array("ipblocks",      "ipb_anon_only",        "SMALLINT NOT NULL DEFAULT 0"),
 		array("ipblocks",      "ipb_by_text",          "TEXT NOT NULL DEFAULT ''"),
-		array("ipblocks",      "ipb_block_email",      "CHAR NOT NULL DEFAULT '0'"),
-		array("ipblocks",      "ipb_create_account",   "CHAR NOT NULL DEFAULT '1'"),
+		array("ipblocks",      "ipb_block_email",      "SMALLINT NOT NULL DEFAULT 0"),
+		array("ipblocks",      "ipb_create_account",   "SMALLINT NOT NULL DEFAULT 1"),
 		array("ipblocks",      "ipb_deleted",          "SMALLINT NOT NULL DEFAULT 0"),
-		array("ipblocks",      "ipb_enable_autoblock", "CHAR NOT NULL DEFAULT '1'"),
+		array("ipblocks",      "ipb_enable_autoblock", "SMALLINT NOT NULL DEFAULT 1"),
+		array("ipblocks",      "ipb_allow_usertalk",   "SMALLINT NOT NULL DEFAULT 0"),
 		array("filearchive",   "fa_deleted",           "SMALLINT NOT NULL DEFAULT 0"),
 		array("logging",       "log_deleted",          "SMALLINT NOT NULL DEFAULT 0"),
 		array("logging",       "log_id",               "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('log_log_id_seq')"),
@@ -1461,6 +1487,8 @@ function do_postgres_updates() {
 		array("revision",      "rev_len",              "INTEGER"),
 		array("revision",      "rev_deleted",          "SMALLINT NOT NULL DEFAULT 0"),
 		array("user_newtalk",  "user_last_timestamp",  "TIMESTAMPTZ"),
+		array("site_stats",    "ss_active_users",      "INTEGER DEFAULT '-1'"),
+		array("revision",      "rev_parent_id",        "INTEGER DEFAULT NULL"),
 	);
 
 
@@ -1494,6 +1522,7 @@ function do_postgres_updates() {
 		array("mwuser",       "user_email_token","text",     ""),
 		array("objectcache",  "keyname",         "text",     ""),
 		array("oldimage",     "oi_height",       "integer",  ""),
+		array("oldimage",     "oi_metadata",     "bytea",    "decode(img_metadata,'escape')"),
 		array("oldimage",     "oi_size",         "integer",  ""),
 		array("oldimage",     "oi_width",        "integer",  ""),
 		array("page",         "page_is_redirect","smallint", "page_is_redirect::smallint DEFAULT 0"),
@@ -1513,10 +1542,13 @@ function do_postgres_updates() {
 	);
 
 	$newindexes = array(
-		array("archive",       "archive_user_text", "(ar_user_text)"),
-		array("image",         "img_sha1",          "(img_sha1)"),
-		array("oldimage",      "oi_sha1",           "(oi_sha1)"),
-		array("revision",      "rev_text_id_idx",   "(rev_text_id)"),
+		array("archive",       "archive_user_text",  "(ar_user_text)"),
+		array("image",         "img_sha1",           "(img_sha1)"),
+		array("oldimage",      "oi_sha1",            "(oi_sha1)"),
+		array("revision",      "rev_text_id_idx",    "(rev_text_id)"),
+		array("recentchanges", "rc_timestamp_nobot", "(rc_timestamp) WHERE rc_bot = 0"),
+		array("templatelinks", "templatelinks_from", "(tl_from)"),
+		array("watchlist",     "wl_user",            "(wl_user)"),
 	);
 
 	$newrules = array(
@@ -1672,9 +1704,14 @@ function do_postgres_updates() {
 	}
 
 	# Fix ipb_address index
+	if (pg_index_exists('ipblocks', 'ipb_address' )) {
+		wfOut( "Removing deprecated index 'ipb_address'...\n" );
+		$wgDatabase->query('DROP INDEX ipb_address');
+	}
 	if (pg_index_exists('ipblocks', 'ipb_address_unique' )) {
 		wfOut( "... have ipb_address_unique\n" );
-	} else {
+	}
+	else {
 		wfOut( "Adding ipb_address_unique index\n" );
 		dbsource(archive('patch-ipb_address_unique.sql'));
 	}
@@ -1713,11 +1750,20 @@ function do_postgres_updates() {
 	# This is create or replace, so harmless to call if not needed
 	dbsource(archive('patch-ts2pagetitle.sql'));
 
-	## If the server is 8.3 or higher, rewrite teh tsearch2 triggers
+	## If the server is 8.3 or higher, rewrite the tsearch2 triggers
 	## in case they have the old 'default' versions
 	if ( $numver >= 8.3 )
 		dbsource(archive('patch-tsearch2funcs.sql'));
 
+	## Put a new row in the mediawiki_version table
+	$wgDatabase->insert( 'mediawiki_version',
+		array(
+			'type' => 'Update',
+			'ctype' => 'U',
+			'mw_version' => $wgVersion,
+			'pg_version' => $version,
+			'sql_version' => '$LastChangedRevision: 46891 $',
+			'sql_date' => '$LastChangedDate: 2009-02-05 22:54:47 -0600 (Thu, 05 Feb 2009) $',
+		) );
 	return;
 }
-
diff --git a/math/texutil.ml b/math/texutil.ml
index 5ea16eef..7355bd64 100644
--- a/math/texutil.ml
+++ b/math/texutil.ml
@@ -57,7 +57,7 @@ let get_preface ()  = "\\nonstopmode\n\\documentclass[12pt]{article}\n" ^
               (if !modules_nonascii then get_encoding !modules_encoding else "") ^
               (if !modules_ams then "\\usepackage{amsmath}\n\\usepackage{amsfonts}\n\\usepackage{amssymb}\n" else "") ^
               (if !modules_color then "\\usepackage[dvips,usenames]{color}\n" else "") ^
-              "\\pagestyle{empty}\n\\begin{document}\n$$\n"
+              "\\usepackage{cancel}\n\\pagestyle{empty}\n\\begin{document}\n$$\n"
 let get_footer  ()  = "\n$$\n\\end{document}\n"
 
 let set_encoding = function
@@ -108,6 +108,10 @@ let find = function
     | "\\nu"               -> LITERAL (HTMLABLEC (FONT_UF,  "\\nu ", "&nu;"))
     | "\\Nu"               -> (tex_use_ams (); LITERAL (HTMLABLEC (FONT_UF,
     "\\mathrm{N}", "&Nu;")))
+    | "\\omicron"          -> (tex_use_ams (); LITERAL (HTMLABLEC (FONT_UF,
+    "\\mathrm{o}", "&omicron;")))
+    | "\\Omicron"          -> (tex_use_ams (); LITERAL (HTMLABLEC (FONT_UF,
+    "\\mathrm{O}", "&Omicron;")))
     | "\\pi"               -> LITERAL (HTMLABLEC (FONT_UF,  "\\pi ", "&pi;"))
     | "\\Pi"               -> LITERAL (HTMLABLEC (FONT_UF, "\\Pi ", "&Pi;"))
     | "\\varpi"            -> LITERAL (TEX_ONLY "\\varpi ")
@@ -503,6 +507,8 @@ let find = function
     | "\\cfrac"            -> (tex_use_ams (); FUN_AR2h ("\\cfrac ", fun num den -> Html.html_render [num], "<hr style=\"{background: black}\">", Html.html_render [den]))
     | "\\over"             -> FUN_INFIXh ("\\over ", fun num den -> Html.html_render num, "<hr style=\"{background: black}\"/>", Html.html_render den)
     | "\\sqrt"             -> FUN_AR1 "\\sqrt "
+    | "\\cancel"           -> FUN_AR1 "\\cancel "
+    | "\\cancelto"         -> FUN_AR2 "\\cancelto "
     | "\\pmod"             -> FUN_AR1hl ("\\pmod ", ("(mod ", ")"))
     | "\\bmod"             -> FUN_AR1hl ("\\bmod ", ("mod ", ""))
     | "\\emph"             -> FUN_AR1 "\\emph "
diff --git a/php5.php5 b/php5.php5
new file mode 100644
index 00000000..fd7f2182
--- /dev/null
+++ b/php5.php5
@@ -0,0 +1,11 @@
+<?php
+
+/** 
+ * Test for *.php5 capability in webserver
+ * Used by includes/templates/PHP4.php
+ */
+if ( version_compare( phpversion(), '5.0.0' ) >= 0 ) {
+	echo 'y'.'e'.'s';
+}
+
+?>
diff --git a/profileinfo.php b/profileinfo.php
index 0eae51d5..d1cf8536 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -1,3 +1,15 @@
+<?php
+ini_set( 'zlib.output_compression', 'off' );
+
+$wgDBadminuser = $wgDBadminpassword = $wgDBserver = $wgDBname = $wgDBprefix = false;
+$wgEnableProfileInfo = $wgProfileToDatabase = false;
+
+define( 'MW_NO_SETUP', 1 );
+require_once( './includes/WebStart.php' );
+@include_once( './AdminSettings.php' );
+require_once( './includes/GlobalFunctions.php' );
+
+?>
 <!--
      Show profiling data.
 
@@ -56,13 +68,6 @@
 <body>
 <?php
 
-$wgDBadminuser = $wgDBadminpassword = $wgDBserver = $wgDBname = $wgEnableProfileInfo = $wgDBprefix = false;
-
-define( 'MW_NO_SETUP', 1 );
-require_once( './includes/WebStart.php' );
-@include_once("./AdminSettings.php");
-require_once( './includes/GlobalFunctions.php' );
-
 if (!$wgEnableProfileInfo) {
 	echo "disabled\n";
 	exit( 1 );
diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php
index 5ccdfe0e..a39cc5c9 100644
--- a/skins/ArchLinux.php
+++ b/skins/ArchLinux.php
@@ -17,14 +17,31 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinArchLinux extends SkinTemplate {
 	/** Using archlinux. */
-	function initPage( &$out ) {
-		SkinTemplate::initPage( $out );
+	function initPage( OutputPage $out ) {
+		parent::initPage( $out );
 		$this->skinname  = 'archlinux';
 		$this->stylename = 'archlinux';
 		$this->template  = 'ArchLinuxTemplate';
-		# Bug 14520: skins that just include this file shouldn't load nonexis-
-		# tent CSS fix files.
-		$this->cssfiles = array( 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl' );
+	}
+
+	function setupSkinUserCss( OutputPage $out ) {
+		global $wgHandheldStyle;
+
+		parent::setupSkinUserCss( $out );
+
+		// Append to the default screen common & print styles...
+		$out->addStyle( 'archlinux/main.css', 'screen' );
+		if( $wgHandheldStyle ) {
+			// Currently in testing... try 'chick/main.css'
+			$out->addStyle( $wgHandheldStyle, 'handheld' );
+		}
+
+		$out->addStyle( 'archlinux/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
+		$out->addStyle( 'archlinux/IE55Fixes.css', 'screen', 'IE 5.5000' );
+		$out->addStyle( 'archlinux/IE60Fixes.css', 'screen', 'IE 6' );
+		$out->addStyle( 'archlinux/IE70Fixes.css', 'screen', 'IE 7' );
+
+		$out->addStyle( 'archlinux/rtl.css', 'screen', '', 'rtl' );
 	}
 }
 
@@ -59,17 +76,11 @@ class ArchLinuxTemplate extends QuickTemplate {
 		<meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
 		<?php $this->html('headlinks') ?>
 		<title><?php $this->text('pagetitle') ?></title>
-		<style type="text/css" media="screen, projection">/*<![CDATA[*/
-			@import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
-			@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
-		/*]]>*/</style>
-		<link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('printcss') ?>?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
-		<?php if( in_array( 'IE50', $skin->cssfiles ) ) { ?><!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } if( in_array( 'IE55', $skin->cssfiles ) ) { ?><!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } if( in_array( 'IE60', $skin->cssfiles ) ) { ?><!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } if( in_array( 'IE70', $skin->cssfiles ) ) { ?><!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } ?><!--[if lt IE 7]><?php if( in_array( 'IE', $skin->cssfiles ) ) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
-		<?php } ?><meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+		<?php $this->html('csslinks') ?>
+
+		<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
+		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+
 		<style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/archlinux.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style>
 		<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
 
@@ -95,7 +106,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 	</head>
 <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
- class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
+ class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
 
 	<?php if (empty($_REQUEST['printable'])) {?>
 	<a id="logo" style="background-image: url(<?php $this->text('logopath') ?>);" <?php
@@ -125,7 +136,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 	<div id="content">
 		<a name="top" id="top"></a>
 		<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-		<h1 class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
+		<h1 id="firstHeading" class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
 		<div id="bodyContent">
 			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
 			<div id="contentSub"><?php $this->html('subtitle') ?></div>
@@ -136,6 +147,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 			<?php $this->html('bodytext') ?>
 			<?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
 			<!-- end content -->
+			<?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
 			<div class="visualClear"></div>
 		</div>
 	</div>
@@ -147,7 +159,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 			<ul>
 	<?php		foreach($this->data['content_actions'] as $key => $tab) {
 					echo '
-				 <li id="ca-' . Sanitizer::escapeId($key).'"';
+				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
 					if( $tab['class'] ) {
 						echo ' class="'.htmlspecialchars($tab['class']).'"';
 					}
@@ -174,7 +186,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 		<div class="pBody">
 			<ul>
 <?php 			foreach($this->data['personal_urls'] as $key => $item) { ?>
-				<li id="pt-<?php echo Sanitizer::escapeId($key) ?>"<?php
+				<li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
 					if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
 				echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
 				if(!empty($item['class'])) { ?> class="<?php
@@ -205,19 +217,30 @@ class ArchLinuxTemplate extends QuickTemplate {
 		</div><!-- end of the left (by default at least) column -->
 			<div class="visualClear"></div>
 			<div id="footer">
-			<ul id="f-list">
 <?php
+		// Generate additional footer links
 		$footerlinks = array(
 			'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
 			'privacy', 'about', 'disclaimer', 'tagline',
 		);
+		$validFooterLinks = array();
 		foreach( $footerlinks as $aLink ) {
 			if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
+			$validFooterLinks[] = $aLink;
+			}
+		}
+		if ( count( $validFooterLinks ) > 0 ) {
+?>			<ul id="f-list">
+<?php
+			foreach( $validFooterLinks as $aLink ) {
+				if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
 ?>				<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
 <?php 		}
 		}
 ?>
 			</ul>
+<?php	}
+?>
 		</div>
 </div>
 <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
@@ -277,7 +300,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 <?php 	}
 		if($this->data['feeds']) { ?>
 			<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-					?><span id="feed-<?php echo Sanitizer::escapeId($key) ?>"><a href="<?php
+					?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php
 					echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
 					<?php } ?></li><?php
 		}
@@ -333,7 +356,7 @@ class ArchLinuxTemplate extends QuickTemplate {
 	/*************************************************************************************************/
 	function customBox( $bar, $cont ) {
 ?>
-	<div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
+	<div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
 		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 		<div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
diff --git a/skins/Chick.php b/skins/Chick.php
index cfbdbc7d..a95a72ce 100644
--- a/skins/Chick.php
+++ b/skins/Chick.php
@@ -18,12 +18,20 @@ require_once( dirname(__FILE__) . '/MonoBook.php' );
  * @ingroup Skins
  */
 class SkinChick extends SkinTemplate {
-	function initPage( &$out ) {
+	function initPage( OutputPage $out ) {
 		SkinTemplate::initPage( $out );
 		$this->skinname  = 'chick';
 		$this->stylename = 'chick';
 		$this->template  = 'MonoBookTemplate';
-		$this->fixfiles  = array( 'IE50', 'IE55', 'IE60' );
+	}
+
+	function setupSkinUserCss( OutputPage $out ){
+		parent::setupSkinUserCss( $out );
+		// Append to the default screen common & print styles...
+		$out->addStyle( 'chick/main.css', 'screen,handheld' );
+		$out->addStyle( 'chick/IE50Fixes.css', 'screen,handheld', 'lt IE 5.5000' );
+		$out->addStyle( 'chick/IE55Fixes.css', 'screen,handheld', 'IE 5.5000' );
+		$out->addStyle( 'chick/IE60Fixes.css', 'screen,handheld', 'IE 6' );
 	}
 }
 
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 29addfc9..f3806dc9 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -96,9 +96,8 @@ class SkinCologneBlue extends Skin {
 		return $s;
 	}
 
-	function doGetUserStyles() {
-		global $wgOut;
-		$s = parent::doGetUserStyles();
+	function reallyGenerateUserStylesheet() {
+		$s = parent::reallyGenerateUserStylesheet();
 		$qb = $this->qbSetting();
 
 		if ( 2 == $qb ) { # Right
@@ -264,8 +263,7 @@ class SkinCologneBlue extends Skin {
 		$s .= $this->menuHead( "qbspecialpages" )
 		  . $this->specialLink( "newpages" )
 		  . $sep . $this->specialLink( "imagelist" )
-		  . $sep . $this->specialLink( "statistics" )
-		  . $sep . $this->bugReportsLink();
+		  . $sep . $this->specialLink( "statistics" );
 		if ( $wgUser->isLoggedIn() && $wgEnableUploads ) {
 			$s .= $sep . $this->specialLink( "upload" );
 		}
diff --git a/skins/Modern.php b/skins/Modern.php
index 32581b16..cb24bafa 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -21,16 +21,24 @@ class SkinModern extends SkinTemplate {
 	 * skin L&F.
 	 */
 	function getPoweredBy() {
-	global	$wgVersion;
+		global	$wgVersion;
 		return "<div class='mw_poweredby'>Powered by MediaWiki $wgVersion</div>";
 	}
 
-	function initPage( &$out ) {
-		SkinTemplate::initPage( $out );
+	function initPage( OutputPage $out ) {
+		parent::initPage( $out );
 		$this->skinname  = 'modern';
 		$this->stylename = 'modern';
 		$this->template  = 'ModernTemplate';
 	}
+	
+	function setupSkinUserCss( OutputPage $out ){
+		// Do not call parent::setupSkinUserCss(), we have our own print style
+		$out->addStyle( 'common/shared.css', 'screen' );
+		$out->addStyle( 'modern/main.css', 'screen' );
+		$out->addStyle( 'modern/print.css', 'print' );
+		$out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' );
+	}
 }
 
 /**
@@ -64,13 +72,7 @@ class ModernTemplate extends QuickTemplate {
 		<meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
 		<?php $this->html('headlinks') ?>
 		<title><?php $this->text('pagetitle') ?></title>
-<?php 	if(empty($this->data['printable']) ) { ?>
-		<style type="text/css" media="screen, projection">/*<![CDATA[*/
-			@import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
-			@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
-		/*]]>*/</style>
-		<?php } ?>
-		<link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/print.css?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
+		<?php $this->html('csslinks') ?>
 		<!--[if lt IE 7]><meta http-equiv="imagetoolbar" content="no" /><![endif]-->
 		
 		<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
@@ -97,12 +99,10 @@ class ModernTemplate extends QuickTemplate {
 	</head>
 <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload'    ]) { ?> onload="<?php     $this->text('body_onload')     ?>"<?php } ?>
- class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
+ class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
 
 	<!-- heading -->
-	<div id="mw_header">
-		<h1 id="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
-	</div>
+	<div id="mw_header"><h1 id="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1></div>
 
 	<div id="mw_main">
 	<div id="mw_contentwrapper">
@@ -113,7 +113,7 @@ class ModernTemplate extends QuickTemplate {
 			<ul>
 	<?php		foreach($this->data['content_actions'] as $key => $tab) {
 					echo '
-				 <li id="ca-' . Sanitizer::escapeId($key).'"';
+				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
 					if( $tab['class'] ) {
 						echo ' class="'.htmlspecialchars($tab['class']).'"';
 					}
@@ -143,6 +143,7 @@ class ModernTemplate extends QuickTemplate {
 	     for the margins -->
 	<div id="mw_contentholder">
 		<div class='mw-topboxes'>
+			<div id="mw-js-message" style="display:none;"></div>
 			<div class="mw-topbox" id="siteSub"><?php $this->msg('tagline') ?></div>
 			<?php if($this->data['newtalk'] ) {
 				?><div class="usermessage mw-topbox"><?php $this->html('newtalk')  ?></div>
@@ -160,6 +161,7 @@ class ModernTemplate extends QuickTemplate {
 		<?php $this->html('bodytext') ?>
 		<div class='mw_clear'></div>
 		<?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
+		<?php $this->html ('dataAfterContent') ?>
 	</div><!-- mw_contentholder -->
 	</div><!-- mw_content -->
 	</div><!-- mw_contentwrapper -->
@@ -199,7 +201,7 @@ class ModernTemplate extends QuickTemplate {
 		<div class="pBody">
 			<ul>
 <?php 			foreach($this->data['personal_urls'] as $key => $item) { ?>
-				<li id="pt-<?php echo Sanitizer::escapeId($key) ?>"<?php
+				<li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
 					if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
 				echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
 				if(!empty($item['class'])) { ?> class="<?php
@@ -287,7 +289,7 @@ class ModernTemplate extends QuickTemplate {
 <?php 	}
 		if($this->data['feeds']) { ?>
 			<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-					?><span id="feed-<?php echo Sanitizer::escapeId($key) ?>"><a href="<?php
+					?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php
 					echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
 					<?php } ?></li><?php
 		}
@@ -343,7 +345,7 @@ class ModernTemplate extends QuickTemplate {
 	/*************************************************************************************************/
 	function customBox( $bar, $cont ) {
 ?>
-		<div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
+		<div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
 		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 		<div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index a0b3157a..8afc4982 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -20,14 +20,32 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinMonoBook extends SkinTemplate {
 	/** Using monobook. */
-	function initPage( &$out ) {
-		SkinTemplate::initPage( $out );
+	function initPage( OutputPage $out ) {
+		parent::initPage( $out );
 		$this->skinname  = 'monobook';
 		$this->stylename = 'monobook';
 		$this->template  = 'MonoBookTemplate';
-		# Bug 14520: skins that just include this file shouldn't load nonexis-
-		# tent CSS fix files.
-		$this->cssfiles = array( 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl' );
+
+	}
+
+	function setupSkinUserCss( OutputPage $out ) {
+		global $wgHandheldStyle;
+
+		parent::setupSkinUserCss( $out );
+
+		// Append to the default screen common & print styles...
+		$out->addStyle( 'monobook/main.css', 'screen' );
+		if( $wgHandheldStyle ) {
+			// Currently in testing... try 'chick/main.css'
+			$out->addStyle( $wgHandheldStyle, 'handheld' );
+		}
+
+		$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
+		$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' );
+		$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
+		$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
+
+		$out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
 	}
 }
 
@@ -54,7 +72,7 @@ class MonoBookTemplate extends QuickTemplate {
 		wfSuppressWarnings();
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php 
+<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php
 	foreach($this->data['xhtmlnamespaces'] as $tag => $ns) {
 		?>xmlns:<?php echo "{$tag}=\"{$ns}\" ";
 	} ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
@@ -62,20 +80,13 @@ class MonoBookTemplate extends QuickTemplate {
 		<meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
 		<?php $this->html('headlinks') ?>
 		<title><?php $this->text('pagetitle') ?></title>
-		<style type="text/css" media="screen, projection">/*<![CDATA[*/
-			@import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
-			@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
-		/*]]>*/</style>
-		<link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('printcss') ?>?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
-		<?php if( in_array( 'IE50', $skin->cssfiles ) ) { ?><!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } if( in_array( 'IE55', $skin->cssfiles ) ) { ?><!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } if( in_array( 'IE60', $skin->cssfiles ) ) { ?><!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } if( in_array( 'IE70', $skin->cssfiles ) ) { ?><!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
-		<?php } ?><!--[if lt IE 7]><?php if( in_array( 'IE', $skin->cssfiles ) ) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
-		<?php } ?><meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-		
+		<?php $this->html('csslinks') ?>
+
+		<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
+		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+
 		<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
-                
+
 		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
 		<!-- Head Scripts -->
 <?php $this->html('headscripts') ?>
@@ -98,13 +109,13 @@ class MonoBookTemplate extends QuickTemplate {
 	</head>
 <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
- class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
+ class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
 	<div id="globalWrapper">
 		<div id="column-content">
 	<div id="content">
 		<a name="top" id="top"></a>
 		<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-		<h1 class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
+		<h1 id="firstHeading" class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
 		<div id="bodyContent">
 			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
 			<div id="contentSub"><?php $this->html('subtitle') ?></div>
@@ -115,6 +126,7 @@ class MonoBookTemplate extends QuickTemplate {
 			<?php $this->html('bodytext') ?>
 			<?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
 			<!-- end content -->
+			<?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
 			<div class="visualClear"></div>
 		</div>
 	</div>
@@ -126,7 +138,7 @@ class MonoBookTemplate extends QuickTemplate {
 			<ul>
 	<?php		foreach($this->data['content_actions'] as $key => $tab) {
 					echo '
-				 <li id="ca-' . Sanitizer::escapeId($key).'"';
+				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
 					if( $tab['class'] ) {
 						echo ' class="'.htmlspecialchars($tab['class']).'"';
 					}
@@ -153,7 +165,7 @@ class MonoBookTemplate extends QuickTemplate {
 		<div class="pBody">
 			<ul>
 <?php 			foreach($this->data['personal_urls'] as $key => $item) { ?>
-				<li id="pt-<?php echo Sanitizer::escapeId($key) ?>"<?php
+				<li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
 					if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
 				echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
 				if(!empty($item['class'])) { ?> class="<?php
@@ -169,8 +181,8 @@ class MonoBookTemplate extends QuickTemplate {
 			echo $skin->tooltipAndAccesskey('n-mainpage') ?>></a>
 	</div>
 	<script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
-<?php 
-		$sidebar = $this->data['sidebar'];		
+<?php
+		$sidebar = $this->data['sidebar'];
 		if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true;
 		if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
 		if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
@@ -198,20 +210,28 @@ class MonoBookTemplate extends QuickTemplate {
 <?php	}
 
 		// Generate additional footer links
-?>
-			<ul id="f-list">
-<?php
 		$footerlinks = array(
 			'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
 			'privacy', 'about', 'disclaimer', 'tagline',
 		);
+		$validFooterLinks = array();
 		foreach( $footerlinks as $aLink ) {
 			if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>				<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
-<?php 		}
+				$validFooterLinks[] = $aLink;
+			}
 		}
+		if ( count( $validFooterLinks ) > 0 ) {
+?>			<ul id="f-list">
+<?php
+			foreach( $validFooterLinks as $aLink ) {
+				if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
+?>					<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
+<?php 			}
+			}
 ?>
 			</ul>
+<?php	}
+?>
 		</div>
 </div>
 <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
@@ -271,7 +291,7 @@ class MonoBookTemplate extends QuickTemplate {
 <?php 	}
 		if($this->data['feeds']) { ?>
 			<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-					?><span id="feed-<?php echo Sanitizer::escapeId($key) ?>"><a href="<?php
+					?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php
 					echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
 					<?php } ?></li><?php
 		}
@@ -307,7 +327,7 @@ class MonoBookTemplate extends QuickTemplate {
 
 	/*************************************************************************************************/
 	function languageBox() {
-		if( $this->data['language_urls'] ) { 
+		if( $this->data['language_urls'] ) {
 ?>
 	<div id="p-lang" class="portlet">
 		<h5><?php $this->msg('otherlanguages') ?></h5>
@@ -327,7 +347,7 @@ class MonoBookTemplate extends QuickTemplate {
 	/*************************************************************************************************/
 	function customBox( $bar, $cont ) {
 ?>
-	<div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
+	<div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
 		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 		<div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
diff --git a/skins/MySkin.php b/skins/MySkin.php
index 90fb5349..46098454 100644
--- a/skins/MySkin.php
+++ b/skins/MySkin.php
@@ -10,20 +10,15 @@
 if( !defined( 'MEDIAWIKI' ) )
 	die( -1 );
 
-/** */
-require_once( dirname(__FILE__) . '/MonoBook.php' );
-
 /**
  * @todo document
  * @ingroup Skins
  */
 class SkinMySkin extends SkinTemplate {
-	function initPage( &$out ) {
-		SkinTemplate::initPage( $out );
+	function initPage( OutputPage $out ) {
+		parent::initPage( $out );
 		$this->skinname  = 'myskin';
 		$this->stylename = 'myskin';
 		$this->template  = 'MonoBookTemplate';
 	}
 }
-
-
diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index a7eae66d..2b9b2f67 100644
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -24,13 +24,13 @@ class SkinNostalgia extends Skin {
 	}
 
 	function doBeforeContent() {
-
-		$s = "\n<div id='content'>\n<div id='topbar'>";
-		$s .= $this->logoText( "right" );
+		$s = "\n<div id='content'>\n<div id='top'>\n";
+		$s .= "<div id=\"logo\">".$this->logoText( "right" )."</div>";
 
 		$s .= $this->pageTitle();
 		$s .= $this->pageSubtitle() . "\n";
 
+		$s .= "<div id=\"topbar\">";
 		$s .= $this->topLinks() . "\n<br />";
 
 		$notice = wfGetSiteNotice();
@@ -45,34 +45,54 @@ class SkinNostalgia extends Skin {
 		$cat = $this->getCategoryLinks();
 		if($cat) $s .= "<br />" . $cat;
 
-		$s .= "<br clear='all' /><hr />\n</div>\n";
+		$s .= "<br clear='all' /></div><hr />\n</div
+>\n";
 		$s .= "\n<div id='article'>";
 
 		return $s;
 	}
 
 	function topLinks() {
-		global $wgOut, $wgUser;
+		global $wgOut, $wgUser, $wgEnableUploads;
 		$sep = " |\n";
 
 		$s = $this->mainPageLink() . $sep
-		  . $this->specialLink( "recentchanges" );
+		  . $this->specialLink( 'recentchanges' );
 
 		if ( $wgOut->isArticle() ) {
 			$s .=  $sep . $this->editThisPage()
 			  . $sep . $this->historyLink();
 		}
-		
+
 		/* show links to different language variants */
 		$s .= $this->variantLinks();
 		$s .= $this->extensionTabLinks();
-		
 		if ( $wgUser->isAnon() ) {
-			$s .= $sep . $this->specialLink( "userlogin" );
+			$s .= $sep . $this->specialLink( 'userlogin' );
 		} else {
-			$s .= $sep . $this->specialLink( "userlogout" );
+			$name = $wgUser->getName();
+			/* show user page and user talk links */
+			$s .= $sep . $this->link( $wgUser->getUserPage(), wfMsgHtml( 'mypage' ) );
+			$s .= $sep . $this->link( $wgUser->getTalkPage(), wfMsgHtml( 'mytalk' ) );
+			if ( $wgUser->getNewtalk() ) {
+				$s .= ' *';
+			}
+			/* show watchlist link */
+			$s .= $sep . $this->specialLink( 'watchlist' );
+			/* show my contributions link */
+			$s .= $sep . $this->link(
+				SpecialPage::getSafeTitleFor( "Contributions", $wgUser->getName() ),
+				wfMsgHtml( 'mycontris' ) );
+			/* show my preferences link */
+			$s .= $sep . $this->specialLink( 'preferences' );
+			/* show upload file link */
+			if ( $wgEnableUploads ) {
+				$s .= $sep . $this->specialLink( 'upload' );
+			}
+			/* show log out link */
+			$s .= $sep . $this->specialLink( 'userlogout' );
 		}
-		
+
 		$s .= $sep . $this->specialPagesList();
 
 		return $s;
diff --git a/skins/Simple.php b/skins/Simple.php
index db64e48b..b26f50d0 100644
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -18,15 +18,20 @@ require_once( dirname(__FILE__) . '/MonoBook.php' );
  * @ingroup Skins
  */
 class SkinSimple extends SkinTemplate {
-	function initPage( &$out ) {
+	function initPage( OutputPage $out ) {
 		SkinTemplate::initPage( $out );
 		$this->skinname  = 'simple';
 		$this->stylename = 'simple';
 		$this->template  = 'MonoBookTemplate';
-		$this->cssfiles  = array( 'rtl' );
 	}
 
-	function reallyDoGetUserStyles() {
+	function setupSkinUserCss( OutputPage $out ){
+		$out->addStyle( 'simple/main.css', 'screen' );
+		$out->addStyle( 'simple/rtl.css', '', '', 'rtl' );
+
+	}
+
+	function reallyGenerateUserStylesheet() {
 		global $wgUser;
 		$s = '';
 		if (($undopt = $wgUser->getOption("underline")) != 2) {
diff --git a/skins/Standard.php b/skins/Standard.php
index 87a151fa..1f3cab95 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -33,40 +33,33 @@ class SkinStandard extends Skin {
 	/**
 	 *
 	 */
-	function getUserStyles() {
-		global $wgStylePath, $wgStyleVersion;
-		$s = '';
+	function setupSkinUserCss( OutputPage $out ){
 		if ( 3 == $this->qbSetting() ) { # Floating left
-			$s .= "<style type='text/css'>\n" .
-			  "@import '{$wgStylePath}/common/quickbar.css?$wgStyleVersion';\n</style>\n";
+			$out->addStyle( 'common/quickbar.css' );
 		} else if ( 4 == $this->qbSetting() ) { # Floating right
-			$s .= "<style type='text/css'>\n" .
-			  "@import '{$wgStylePath}/common/quickbar-right.css?$wgStyleVersion';\n</style>\n";
+			$out->addStyle( 'common/quickbar-right.css' );
 		}
-		$s .= parent::getUserStyles();
-		return $s;
+		parent::setupSkinUserCss( $out );
 	}
 
 	/**
 	 *
 	 */
-	function doGetUserStyles() {
-		global $wgStylePath;
-
-		$s = parent::doGetUserStyles();
+	function reallyGenerateUserStylesheet() {
+		$s = parent::reallyGenerateUserStylesheet();
 		$qb = $this->qbSetting();
 
 		if ( 2 == $qb ) { # Right
 			$s .= "#quickbar { position: absolute; top: 4px; right: 4px; " .
 			  "border-left: 2px solid #000000; }\n" .
-			  "#article { margin-left: 4px; margin-right: 152px; }\n";
+			  "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n";
 		} else if ( 1 == $qb || 3 == $qb ) {
 			$s .= "#quickbar { position: absolute; top: 4px; left: 4px; " .
 			  "border-right: 1px solid gray; }\n" .
-			  "#article { margin-left: 152px; margin-right: 4px; }\n";
+			  "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n";
 		} else if ( 4 == $qb) {
 			$s .= "#quickbar { border-right: 1px solid gray; }\n" .
-			  "#article { margin-right: 152px; margin-left: 4px; }\n";
+			  "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n";
 		}
 		return $s;
 	}
@@ -182,7 +175,7 @@ class SkinStandard extends Skin {
 						case NS_TALK:
 						case NS_USER_TALK:
 						case NS_PROJECT_TALK:
-						case NS_IMAGE_TALK:
+						case NS_FILE_TALK:
 						case NS_MEDIAWIKI_TALK:
 						case NS_TEMPLATE_TALK:
 						case NS_HELP_TALK:
@@ -198,7 +191,7 @@ class SkinStandard extends Skin {
 						case NS_PROJECT:
 							$text = wfMsg( 'projectpage' );
 							break;
-						case NS_IMAGE:
+						case NS_FILE:
 							$text = wfMsg( 'imagepage' );
 							break;
 						case NS_MEDIAWIKI:
@@ -273,7 +266,7 @@ class SkinStandard extends Skin {
 				$id=User::idFromName($wgTitle->getText());
 				$ip=User::isIP($wgTitle->getText());
 
-				if($id||$ip) {
+				if( $id || $ip ){
 					$s .= $sep . $this->userContribsLink();
 				}
 				if( $this->showEmailUser( $id ) ) {
@@ -286,8 +279,7 @@ class SkinStandard extends Skin {
 		if ( $wgUser->isLoggedIn() && ( $wgEnableUploads || $wgRemoteUploads ) ) {
 			$s .= $this->specialLink( 'upload' ) . $sep;
 		}
-		$s .= $this->specialLink( 'specialpages' )
-		  . $sep . $this->bugReportsLink();
+		$s .= $this->specialLink( 'specialpages' );
 
 		global $wgSiteSupportPage;
 		if( $wgSiteSupportPage ) {
@@ -302,5 +294,3 @@ class SkinStandard extends Skin {
 
 
 }
-
-
diff --git a/skins/archlinux/IE50Fixes.css b/skins/archlinux/IE50Fixes.css
index 027e32ed..26c3dc97 100644
--- a/skins/archlinux/IE50Fixes.css
+++ b/skins/archlinux/IE50Fixes.css
@@ -63,5 +63,5 @@ li#pt-logout {
 	padding:0;
 	margin: 0;
 }
-.firstHeading { margin-bottom: .3em; }
+#firstHeading { margin-bottom: .3em; }
 /*div{ border:1px solid Red !important;}*/
diff --git a/skins/archlinux/main.css b/skins/archlinux/main.css
index 8db47d2b..7e5809b5 100644
--- a/skins/archlinux/main.css
+++ b/skins/archlinux/main.css
@@ -260,7 +260,7 @@ span.subpages {
 #bodyContent h3, #bodyContent h4, #bodyContent h5 {
 	margin-bottom: .3em;
 }
-.firstHeading {
+#firstHeading {
 	margin-bottom: .1em;
 	/* These two rules hack around bug 2013 (fix for more limited bug 11325).
 	   When bug 2013 is fixed properly, they should be removed. */
@@ -892,10 +892,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
 	text-transform: lowercase;
 }
 
-/*
-** the remaining portlets
-*/
-#p-tbx,
 #p-lang {
 	position: relative;
 	z-index: 3;
@@ -1413,6 +1409,10 @@ div#searchTargetHide {
 	padding:2px;
 }
 
+#powersearch p {
+	margin-top:0px;
+}
+
 div.multipageimagenavbox {
    border: solid 1px silver;
    padding: 4px;
@@ -1465,6 +1465,7 @@ tr.sv-space td { display: none; }
   - remove line wrapping for all td and th, set background color
   - restore line wrapping for the last two table cells (description and size)
 */
+.TablePager { min-width: 80%; }
 .TablePager_nav a { text-decoration: none; }
 .TablePager { border-collapse: collapse; }
 .TablePager, .TablePager td, .TablePager th { 
@@ -1503,17 +1504,6 @@ div.mw-lag-warn-high {
 	background-color: #FFCCCC;
 }
 
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn,
-div#mw-recreate-deleted-warn {
-	padding: 3px;
-	margin-bottom: 3px;
-	border: 2px solid #2F6FAB;
-}
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 90%;
-}
 .MediaTransformError {
 	background-color: #ccc;
 	padding: 0.1em;
@@ -1541,11 +1531,6 @@ div#mw-search-interwiki-caption {
 	background: #cae8ff;
 }
 
-span.searchmatch {
-	font-weight: bold;
-	color: red;
-}
-
 /* God-damned hack for the crappy layout */
 .os-suggest {
 	font-size: 127%;
diff --git a/skins/archlinux/rtl.css b/skins/archlinux/rtl.css
index f00cf09f..fbd5ab35 100644
--- a/skins/archlinux/rtl.css
+++ b/skins/archlinux/rtl.css
@@ -205,8 +205,9 @@ input#wpSave, input#wpDiff {
 	float: right;
 	margin: 0 0 1em 3em;
 }
-/* Convenience links to edit block and delete reasons */
-p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
+/* Convenience links to edit block, delete and protect reasons */
+p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
+p.mw-filedelete-editreasons, p.mw-delete-editreasons {
 	float: left;
 }
 
diff --git a/skins/chick/IE50Fixes.css b/skins/chick/IE50Fixes.css
index dd9eda3e..4a193e94 100644
--- a/skins/chick/IE50Fixes.css
+++ b/skins/chick/IE50Fixes.css
@@ -63,5 +63,5 @@ li#pt-logout {
     padding:0;
     margin:0;
 }
-.firstHeading { margin-bottom: 0.3em; }
+#firstHeading { margin-bottom: 0.3em; }
 /*div{ border:1px solid Red !important;}*/
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 9ba97920..fde03301 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -176,7 +176,7 @@ span.subpages { display: block; }
 #bodyContent h5 {
     margin-bottom: 0.3em;
 }
-.firstHeading { margin-bottom:0.1em; }
+#firstHeading { margin-bottom:0.1em; }
 
 /* user notification thing */
 .usermessage {
@@ -419,14 +419,25 @@ div.gallerytext {
         padding: 2px 4px;
 }       
 
-#jump-to-nav {
+#xjump-to-nav {
   display: none;
 }
 
 .templatesUsed { margin-top: 1.5em; }
 
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 95%;
+.printfooter {
+	display: none;
 }
+
+#footer {
+	background-color: white;
+	border-top: 1px solid #fabd23;
+	border-bottom: 1px solid #fabd23;
+	margin: .6em 0 1em 0;
+	padding: .4em 0 1.2em 0;
+	text-align: center;
+	font-size: 90%;
+}
+#f-poweredbyico, #f-copyrightico {
+	display: inline;
+}
\ No newline at end of file
diff --git a/skins/common/ajax.js b/skins/common/ajax.js
index 854d7a00..afcfa708 100644
--- a/skins/common/ajax.js
+++ b/skins/common/ajax.js
@@ -154,3 +154,14 @@ function sajax_do_call(func_name, args, target) {
 
 	return true;
 }
+
+/**
+ * @return boolean whether the browser supports XMLHttpRequest
+ */
+function wfSupportsAjax() {
+	var request = sajax_init_object();
+	var supportsAjax = request ? true : false;
+	delete request;
+	return supportsAjax;
+}
+
diff --git a/skins/common/ajaxsearch.js b/skins/common/ajaxsearch.js
deleted file mode 100644
index b9fb56f3..00000000
--- a/skins/common/ajaxsearch.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// remote scripting library
-// (c) copyright 2005 modernmethod, inc
-
-var started;
-var typing;
-var memory=null;
-var body=null;
-var oldbody=null;
-
-// Remove the typing barrier to allow call() to complete
-function Search_doneTyping()
-{
-	typing=false;
-}
-
-// Wait 500ms to run call()
-function Searching_Go()
-{
-        setTimeout("Searching_Call()", 500);
-}
-
-// If the user is typing wait until they are done.
-function Search_Typing() {
-	started=true;
-	typing=true;
-	setTimeout("Search_doneTyping()", 500);
-
-	// I believe these are needed by IE for when the users press return?
-	if (window.event)
-	{
-		if (event.keyCode == 13)
-		{
-			event.cancelBubble = true;
-			event.returnValue = true;
-		}
-	}
-}
-
-// Set the body div to the results
-function Searching_SetResult( request )
-{
-	if ( request.status != 200 ) {
-		alert("Error: " + request.status + " " + request.statusText + ": " + request.responseText);
-		return;
-	}
-
-	var result = request.responseText;
-
-        //body.innerHTML = result;
-	t = document.getElementById("searchTarget");
-	if ( t == null ) {
-		oldbody=body.innerHTML;
-		body.innerHTML= '<div id="searchTargetContainer"><div id="searchTarget" ></div></div>' ;
-		t = document.getElementById("searchTarget");
-	}
-	t.innerHTML = result;
-	t.style.display='block';
-}
-
-function Searching_Hide_Results()
-{
-	t = document.getElementById("searchTarget");
-	t.style.display='none';
-	body.innerHTML = oldbody;
-}
-
-
-// This will call the php function that will eventually
-// return a results table
-function Searching_Call()
-{
-	var x;
-	Searching_Go();
-
-	//Don't proceed if user is typing
-	if (typing)
-		return;
-
-	x = document.getElementById("searchInput").value;
-
-	// Don't search again if the query is the same
-	if (x==memory)
-		return;
-
-	memory=x;
-	if (started) {
-		// Don't search for blank or < 3 chars.
-		if ((x=="") || (x.length < 3))
-		{
-			return;
-		}
-
-		sajax_do_call( "wfSajaxSearch", [ x ], Searching_SetResult );
-	}
-}
-
-//Initialize
-function sajax_onload() {
-	x = document.getElementById( 'searchInput' );
-	x.onkeypress= function() { Search_Typing(); };
-	Searching_Go();
-	body = document.getElementById("content");
-}
diff --git a/skins/common/ajaxwatch.js b/skins/common/ajaxwatch.js
index b30e4ffd..c8d90b80 100644
--- a/skins/common/ajaxwatch.js
+++ b/skins/common/ajaxwatch.js
@@ -101,6 +101,11 @@ wgAjaxWatch.processResult = function(request) {
 	if(wgAjaxWatch.timeoutID) {
 		window.clearTimeout(wgAjaxWatch.timeoutID);
 	}
+	// Bug 12395 - avoid some watch link confusion on edit
+	var watchthis = document.getElementById("wpWatchthis");
+	if( watchthis && response.match(/^<[uw]#>/) ) {
+		watchthis.checked = response.match(/^<w#>/) ? "checked" : "";
+	}
 	return;
 };
 
@@ -146,13 +151,3 @@ wgAjaxWatch.onLoad = function() {
 };
 
 hookEvent("load", wgAjaxWatch.onLoad);
-
-/**
- * @return boolean whether the browser supports XMLHttpRequest
- */
-function wfSupportsAjax() {
-	var request = sajax_init_object();
-	var supportsAjax = request ? true : false;
-	delete request;
-	return supportsAjax;
-}
diff --git a/skins/common/block.js b/skins/common/block.js
index 78ae3bf2..6f7be0cd 100644
--- a/skins/common/block.js
+++ b/skins/common/block.js
@@ -1,3 +1,5 @@
+addOnloadHook(considerChangingExpiryFocus);
+
 function considerChangingExpiryFocus() {
 	if (!document.getElementById) {
 		return;
diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index 670996ea..2723bbef 100644
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -94,16 +94,3 @@ a.new, #quickbar a.new { color: #CC2200; }
 h2, h3, h4, h5, h6 { margin-bottom: 0; }
 small { font-size: 75%; }
 input.mw-searchInput { width: 106px; }
-
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn,
-div#mw-recreate-deleted-warn {
-	padding: 3px;
-	margin-top: 3px;
-	margin-bottom: 3px;
-	border: 1px solid #6688AA;
-}
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 90%;
-}
\ No newline at end of file
diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css
index cda3835d..11fc995b 100644
--- a/skins/common/common_rtl.css
+++ b/skins/common/common_rtl.css
@@ -28,8 +28,9 @@ div.tright, div.floatright {
 div.tleft, div.floatleft {
 	clear: left;
 }
-/* Convenience links to edit block and delete reasons */
-p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
+/* Convenience links to edit block, delete and protect reasons */
+p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
+p.mw-filedelete-editreasons, p.mw-delete-editreasons {
 	float: left;
 }
 table.filehistory th {
diff --git a/skins/common/diff.css b/skins/common/diff.css
index b262222a..6afa3734 100644
--- a/skins/common/diff.css
+++ b/skins/common/diff.css
@@ -74,3 +74,70 @@ table.diff td div {
 	   table: */
 	/* overflow: visible; */
 }
+
+/*
+ * Styles for the HTML Diff
+ */
+div.diff-switchtype{
+	text-align: center;
+	font-weight: bold;
+	font-size: smaller;
+}
+
+span.diff-html-added {
+  font-size: 100%;
+  background-color: #20ff20
+}
+
+span.diff-html-removed {
+  font-size: 100%;
+  text-decoration: line-through;
+  background-color: #ff2020
+}
+
+span.diff-html-changed {
+  background: url(images/diffunderline.gif) bottom repeat-x;
+  /* Hack for IE5.5, see http://lists.wikimedia.org/pipermail/wikitech-l/2008-November/040273.html */
+  *background-color: #c6c6fd; /* light blue */
+}
+
+span.diff-html-added img{
+ border: 5px solid #ccffcc;
+}
+
+span.diff-html-removed img{
+ border: 5px solid #fdc6c6;
+}
+
+span.diff-html-changed img{
+ border: 5px dotted #000099;
+ 
+}
+
+span.diff-html-changed  {
+  position: relative;   /* this is key */
+  cursor: help;
+}
+ 
+span.diff-html-changed span.tip {
+  display: none;        /* so is this */
+}
+
+/* tooltip will display on :hover event */
+ 
+span.diff-html-changed:hover span.tip {
+  display: block;
+  z-index: 95;
+  position: absolute;
+  top: 2.5em;
+  left: 0;
+  width: auto;
+  line-height: 1.2em;
+  padding: 3px 7px 4px 6px;
+  border: 1px solid #336;
+  background-color: #f7f7ee;
+  font-size: 10px;
+  text-align: left;
+}
+
+
diff --git a/skins/common/diff.js b/skins/common/diff.js
index e80a895c..5fd151fc 100644
--- a/skins/common/diff.js
+++ b/skins/common/diff.js
@@ -17,4 +17,4 @@ if (navigator && navigator.product == "Gecko" && navigator.productSub < "2002113
 	lastSheet.insertRule(
 		"table.diff td div { overflow: visible; }",
 		lastSheet.cssRules.length);
-}
\ No newline at end of file
+}
diff --git a/skins/common/enhancedchanges.js b/skins/common/enhancedchanges.js
new file mode 100644
index 00000000..b1789c9e
--- /dev/null
+++ b/skins/common/enhancedchanges.js
@@ -0,0 +1,40 @@
+/* 
+  JavaScript file for enhanced recentchanges
+ */
+ 
+/*
+  * Add the CSS to hide parts that should be collapsed
+  *
+  * We do this with JS so everything will be expanded by default
+  * if JS is disabled
+ */
+appendCSS('.mw-changeslist-hidden {'+
+	'	display:none;'+
+	'}'+
+	'div.mw-changeslist-expanded {'+
+	'	display:block;'+
+	'}'+
+	'span.mw-changeslist-expanded {'+
+	'	display:inline !important;'+
+	'	visibility:visible !important;'+
+	'}'
+);
+
+/*
+ * Switch an RC line between hidden/shown
+ * @param int idNumber : the id number of the RC group
+*/ 
+function toggleVisibility(idNumber) {
+	var openarrow = document.getElementById("mw-rc-openarrow-"+idNumber);
+	var closearrow = document.getElementById("mw-rc-closearrow-"+idNumber);
+	var subentries = document.getElementById("mw-rc-subentries-"+idNumber);
+	if (openarrow.className == 'mw-changeslist-expanded') {
+		openarrow.className = 'mw-changeslist-hidden';
+		closearrow.className = 'mw-changeslist-expanded';
+		subentries.className = 'mw-changeslist-expanded';
+	} else {
+		openarrow.className = 'mw-changeslist-expanded';
+		closearrow.className = 'mw-changeslist-hidden';
+		subentries.className = 'mw-changeslist-hidden';
+	}
+}
diff --git a/skins/common/mwsuggest.js b/skins/common/mwsuggest.js
index 52470060..061a6451 100644
--- a/skins/common/mwsuggest.js
+++ b/skins/common/mwsuggest.js
@@ -1,13 +1,13 @@
 /*
  * OpenSearch ajax suggestion engine for MediaWiki
- * 
+ *
  * uses core MediaWiki open search support to fetch suggestions
  * and show them below search boxes and other inputs
  *
  * by Robert Stojnic (April 2008)
  */
- 
-// search_box_id -> Results object 
+
+// search_box_id -> Results object
 var os_map = {};
 // cached data, url -> json_text
 var os_cache = {};
@@ -31,16 +31,38 @@ var os_autoload_forms = new Array('searchform', 'searchform2', 'powersearch', 's
 var os_is_stopped = false;
 // max lines to show in suggest table
 var os_max_lines_per_suggest = 7;
-
-/** Timeout timer class that will fetch the results */ 
+// number of steps to animate expansion/contraction of container width
+var os_animation_steps = 6;
+// num of pixels of smallest step
+var os_animation_min_step = 2;
+// delay between steps (in ms)
+var os_animation_delay = 30;
+// max width of container in percent of normal size (1 == 100%)
+var os_container_max_width = 2;
+// currently active animation timer
+var os_animation_timer = null;
+
+/** Timeout timer class that will fetch the results */
 function os_Timer(id,r,query){
 	this.id = id;
 	this.r = r;
-	this.query = query;	
+	this.query = query;
+}
+
+/** Timer user to animate expansion/contraction of container width */
+function os_AnimationTimer(r, target){
+	this.r = r;
+	var current = document.getElementById(r.container).offsetWidth;
+	this.inc = Math.round((target-current) / os_animation_steps);
+	if(this.inc < os_animation_min_step && this.inc >=0)
+		this.inc = os_animation_min_step; // minimal animation step
+	if(this.inc > -os_animation_min_step && this.inc <0)
+		this.inc = -os_animation_min_step;
+	this.target = target;
 }
 
 /** Property class for single search box */
-function os_Results(name, formname){	
+function os_Results(name, formname){
 	this.searchform = formname; // id of the searchform
 	this.searchbox = name; // id of the searchbox
 	this.container = name+"Suggest"; // div that holds results
@@ -50,9 +72,9 @@ function os_Results(name, formname){
 	this.query = null; // last processed query
 	this.results = null;  // parsed titles
 	this.resultCount = 0; // number of results
-	this.original = null; // query that user entered 
+	this.original = null; // query that user entered
 	this.selected = -1; // which result is selected
-	this.containerCount = 0; // number of results visible in container 
+	this.containerCount = 0; // number of results visible in container
 	this.containerRow = 0; // height of result field in the container
 	this.containerTotal = 0; // total height of the container will all results
 	this.visible = false; // if container is visible
@@ -78,15 +100,15 @@ function os_showResults(r){
 		c.scrollTop = 0;
 		c.style.visibility = "visible";
 		r.visible = true;
-	}	
+	}
 }
 
 function os_operaWidthFix(x){
 	// TODO: better css2 incompatibility detection here
 	if(is_opera || is_khtml || navigator.userAgent.toLowerCase().indexOf('firefox/1')!=-1){
-		return x - 30; // opera&konqueror & old firefox don't understand overflow-x, estimate scrollbar width
-	}	
-	return x;
+		return 30; // opera&konqueror & old firefox don't understand overflow-x, estimate scrollbar width
+	}
+	return 0;
 }
 
 function os_encodeQuery(value){
@@ -175,20 +197,20 @@ function os_getElementPosition(elemID){
 function os_createContainer(r){
 	var c = document.createElement("div");
 	var s = document.getElementById(r.searchbox);
-	var pos = os_getElementPosition(r.searchbox);	
+	var pos = os_getElementPosition(r.searchbox);
 	var left = pos.left;
 	var top = pos.top + s.offsetHeight;
 	c.className = "os-suggest";
-	c.setAttribute("id", r.container);	
-	document.body.appendChild(c); 
-	
-	// dynamically generated style params	
+	c.setAttribute("id", r.container);
+	document.body.appendChild(c);
+
+	// dynamically generated style params
 	// IE workaround, cannot explicitely set "style" attribute
 	c = document.getElementById(r.container);
 	c.style.top = top+"px";
 	c.style.left = left+"px";
 	c.style.width = s.offsetWidth+"px";
-	
+
 	// mouse event handlers
 	c.onmouseover = function(event) { os_eventMouseover(r.searchbox, event); };
 	c.onmousemove = function(event) { os_eventMousemove(r.searchbox, event); };
@@ -198,13 +220,13 @@ function os_createContainer(r){
 }
 
 /** change container height to fit to screen */
-function os_fitContainer(r){	
+function os_fitContainer(r){
 	var c = document.getElementById(r.container);
 	var h = os_availableHeight(r) - 20;
 	var inc = r.containerRow;
 	h = parseInt(h/inc) * inc;
 	if(h < (2 * inc) && r.resultCount > 1) // min: two results
-		h = 2 * inc;	
+		h = 2 * inc;
 	if((h/inc) > os_max_lines_per_suggest )
 		h = inc * os_max_lines_per_suggest;
 	if(h < r.containerTotal){
@@ -217,11 +239,41 @@ function os_fitContainer(r){
 }
 /** If some entries are longer than the box, replace text with "..." */
 function os_trimResultText(r){
+	// find max width, first see if we could expand the container to fit it
+	var maxW = 0;
+	for(var i=0;i<r.resultCount;i++){
+		var e = document.getElementById(r.resultText+i);
+		if(e.offsetWidth > maxW)
+			maxW = e.offsetWidth;
+	}
 	var w = document.getElementById(r.container).offsetWidth;
-	if(r.containerCount < r.resultCount){		
-		w -= 20; // give 20px for scrollbar		
+	var fix = 0;
+	if(r.containerCount < r.resultCount){
+		fix = 20; // give 20px for scrollbar
 	} else
-		w = os_operaWidthFix(w);
+		fix = os_operaWidthFix(w);
+	if(fix < 4)
+		fix = 4; // basic padding
+	maxW += fix;
+
+	// resize container to fit more data if permitted
+	var normW = document.getElementById(r.searchbox).offsetWidth;
+	var prop = maxW / normW;
+	if(prop > os_container_max_width)
+		prop = os_container_max_width;
+	else if(prop < 1)
+		prop = 1;
+	var newW = Math.round( normW * prop );
+	if( w != newW ){
+		w = newW;
+		if( os_animation_timer != null )
+			clearInterval(os_animation_timer.id)
+		os_animation_timer = new os_AnimationTimer(r,w);
+		os_animation_timer.id = setInterval("os_animateChangeWidth()",os_animation_delay);
+		w -= fix; // this much is reserved
+	}
+
+	// trim results
 	if(w < 10)
 		return;
 	for(var i=0;i<r.resultCount;i++){
@@ -233,7 +285,7 @@ function os_trimResultText(r){
 		while(e.offsetWidth > w && (e.offsetWidth < lastW || iteration<2)){
 			changedText = true;
 			lastW = e.offsetWidth;
-			var l = e.innerHTML;			
+			var l = e.innerHTML;
 			e.innerHTML = l.substring(0,l.length-replace)+"...";
 			iteration++;
 			replace = 4; // how many chars to replace
@@ -245,8 +297,31 @@ function os_trimResultText(r){
 	}
 }
 
+/** Invoked on timer to animate change in container width */
+function os_animateChangeWidth(){
+	var r = os_animation_timer.r;
+	var c = document.getElementById(r.container);
+	var w = c.offsetWidth;
+	var normW = document.getElementById(r.searchbox).offsetWidth;
+	var normL = os_getElementPosition(r.searchbox).left;
+	var inc = os_animation_timer.inc;
+	var target = os_animation_timer.target;
+	var nw = w + inc;
+	if( (inc > 0 && nw >= target) || (inc <= 0 && nw <= target) ){
+		// finished !
+		c.style.width = target+"px";
+		clearInterval(os_animation_timer.id)
+		os_animation_timer = null;
+	} else{
+		// in-progress
+		c.style.width = nw+"px";
+		if(document.documentElement.dir == "rtl")
+			c.style.left = (normL + normW + (target - nw) - os_animation_timer.target - 1)+"px";
+	}
+}
+
 /** Handles data from XMLHttpRequest, and updates the suggest results */
-function os_updateResults(r, query, text, cacheKey){	 
+function os_updateResults(r, query, text, cacheKey){
 	os_cache[cacheKey] = text;
 	r.query = query;
 	r.original = query;
@@ -254,7 +329,7 @@ function os_updateResults(r, query, text, cacheKey){
 		r.results = null;
 		r.resultCount = 0;
 		os_hideResults(r);
-	} else{		
+	} else{
 		try {
 			var p = eval('('+text+')'); // simple json parse, could do a safer one
 			if(p.length<2 || p[1].length == 0){
@@ -262,29 +337,30 @@ function os_updateResults(r, query, text, cacheKey){
 				r.resultCount = 0;
 				os_hideResults(r);
 				return;
-			}		
+			}
 			var c = document.getElementById(r.container);
 			if(c == null)
-				c = os_createContainer(r);			
+				c = os_createContainer(r);
 			c.innerHTML = os_createResultTable(r,p[1]);
 			// init container table sizes
-			var t = document.getElementById(r.resultTable);		
-			r.containerTotal = t.offsetHeight;	
+			var t = document.getElementById(r.resultTable);
+			r.containerTotal = t.offsetHeight;
 			r.containerRow = t.offsetHeight / r.resultCount;
-			os_trimResultText(r);				
+			os_fitContainer(r);
+			os_trimResultText(r);
 			os_showResults(r);
 		} catch(e){
 			// bad response from server or such
-			os_hideResults(r);			
+			os_hideResults(r);
 			os_cache[cacheKey] = null;
 		}
-	}	
+	}
 }
 
 /** Create the result table to be placed in the container div */
 function os_createResultTable(r, results){
 	var c = document.getElementById(r.container);
-	var width = os_operaWidthFix(c.offsetWidth);	
+	var width = c.offsetWidth - os_operaWidthFix(c.offsetWidth);
 	var html = "<table class=\"os-suggest-results\" id=\""+r.resultTable+"\" style=\"width: "+width+"px;\">";
 	r.results = new Array();
 	r.resultCount = results.length;
@@ -299,14 +375,14 @@ function os_createResultTable(r, results){
 
 /** Fetch namespaces from checkboxes or hidden fields in the search form,
     if none defined use wgSearchNamespaces global */
-function os_getNamespaces(r){	
+function os_getNamespaces(r){
 	var namespaces = "";
 	var elements = document.forms[r.searchform].elements;
 	for(i=0; i < elements.length; i++){
 		var name = elements[i].name;
-		if(typeof name != 'undefined' && name.length > 2 
-		&& name[0]=='n' && name[1]=='s' 
-		&& ((elements[i].type=='checkbox' && elements[i].checked) 
+		if(typeof name != 'undefined' && name.length > 2
+		&& name[0]=='n' && name[1]=='s'
+		&& ((elements[i].type=='checkbox' && elements[i].checked)
 		 	|| (elements[i].type=='hidden' && elements[i].value=="1")) ){
 			if(namespaces!="")
 				namespaces+="|";
@@ -321,7 +397,7 @@ function os_getNamespaces(r){
 /** Update results if user hasn't already typed something else */
 function os_updateIfRelevant(r, query, text, cacheKey){
 	var t = document.getElementById(r.searchbox);
-	if(t != null && t.value == query){ // check if response is still relevant	        			
+	if(t != null && t.value == query){ // check if response is still relevant
 		os_updateResults(r, query, text, cacheKey);
 	}
 	r.query = query;
@@ -337,22 +413,22 @@ function os_delayedFetch(){
 	var path = wgMWSuggestTemplate.replace("{namespaces}",os_getNamespaces(r))
 							  	  .replace("{dbname}",wgDBname)
 							  	  .replace("{searchTerms}",os_encodeQuery(query));
-	
+
 	// try to get from cache, if not fetch using ajax
 	var cached = os_cache[path];
 	if(cached != null){
 		os_updateIfRelevant(r, query, cached, path);
-	} else{									  
+	} else{
 		var xmlhttp = sajax_init_object();
 		if(xmlhttp){
-			try {			
+			try {
 				xmlhttp.open("GET", path, true);
 				xmlhttp.onreadystatechange=function(){
-		        	if (xmlhttp.readyState==4 && typeof os_updateIfRelevant == 'function') {	        		
+		        	if (xmlhttp.readyState==4 && typeof os_updateIfRelevant == 'function') {
 		        		os_updateIfRelevant(r, query, xmlhttp.responseText, path);
 	        		}
 	      		};
-	     		xmlhttp.send(null);     	
+	     		xmlhttp.send(null);
 	     	} catch (e) {
 				if (window.location.hostname == "localhost") {
 					alert("Your browser blocks XMLHttpRequest to 'localhost', try using a real hostname for development/testing.");
@@ -370,23 +446,23 @@ function os_fetchResults(r, query, timeout){
 		return;
 	} else if(query == r.query)
 		return; // no change
-	
+
 	os_is_stopped = false; // make sure we're running
-	
-	/* var cacheKey = wgDBname+":"+query; 
+
+	/* var cacheKey = wgDBname+":"+query;
 	var cached = os_cache[cacheKey];
 	if(cached != null){
 		os_updateResults(r,wgDBname,query,cached);
 		return;
 	} */
-	
+
 	// cancel any pending fetches
 	if(os_timer != null && os_timer.id != null)
 		clearTimeout(os_timer.id);
-	// schedule delayed fetching of results	
+	// schedule delayed fetching of results
 	if(timeout != 0){
 		os_timer = new os_Timer(setTimeout("os_delayedFetch()",timeout),r,query);
-	} else{		
+	} else{
 		os_timer = new os_Timer(null,r,query);
 		os_delayedFetch(); // do it now!
 	}
@@ -397,11 +473,11 @@ function os_changeHighlight(r, cur, next, updateSearchBox){
 	if (next >= r.resultCount)
 		next = r.resultCount-1;
 	if (next < -1)
-		next = -1;   
+		next = -1;
 	r.selected = next;
    	if (cur == next)
     	return; // nothing to do.
-    
+
     if(cur >= 0){
     	var curRow = document.getElementById(r.resultTable + cur);
     	if(curRow != null)
@@ -415,7 +491,7 @@ function os_changeHighlight(r, cur, next, updateSearchBox){
     	newText = r.results[next];
     } else
     	newText = r.original;
-    	
+
     // adjust the scrollbar if any
     if(r.containerCount < r.resultCount){
     	var c = document.getElementById(r.container);
@@ -426,10 +502,10 @@ function os_changeHighlight(r, cur, next, updateSearchBox){
     	else if(next >= vEnd)
     		c.scrollTop = (next - r.containerCount + 1) * r.containerRow;
     }
-    	
+
     // update the contents of the search box
     if(updateSearchBox){
-    	os_updateSearchQuery(r,newText);	
+    	os_updateSearchQuery(r,newText);
     }
 }
 
@@ -463,8 +539,8 @@ function os_getTarget(e){
 
 
 /********************
- *  Keyboard events 
- ********************/ 
+ *  Keyboard events
+ ********************/
 
 /** Event handler that will fetch results on keyup */
 function os_eventKeyup(e){
@@ -472,8 +548,8 @@ function os_eventKeyup(e){
 	var r = os_map[targ.id];
 	if(r == null)
 		return; // not our event
-		
-	// some browsers won't generate keypressed for arrow keys, catch it 
+
+	// some browsers won't generate keypressed for arrow keys, catch it
 	if(os_keypressed_count == 0){
 		os_processKey(r,os_cur_keypressed,targ);
 	}
@@ -484,8 +560,8 @@ function os_eventKeyup(e){
 /** catch arrows up/down and escape to hide the suggestions */
 function os_processKey(r,keypressed,targ){
 	if (keypressed == 40){ // Arrow Down
-    	if (r.visible) {      		
-      		os_changeHighlight(r, r.selected, r.selected+1, true);      		
+    	if (r.visible) {
+      		os_changeHighlight(r, r.selected, r.selected+1, true);
     	} else if(os_timer == null){
     		// user wants to get suggestions now
     		r.query = "";
@@ -505,12 +581,12 @@ function os_processKey(r,keypressed,targ){
 }
 
 /** When keys is held down use a timer to output regular events */
-function os_eventKeypress(e){	
+function os_eventKeypress(e){
 	var targ = os_getTarget(e);
 	var r = os_map[targ.id];
 	if(r == null)
 		return; // not our event
-	
+
 	var keypressed = os_cur_keypressed;
 	if(keypressed == 38 || keypressed == 40){
 		var d = new Date()
@@ -520,7 +596,7 @@ function os_eventKeypress(e){
 			return;
 		}
 	}
-	
+
 	os_keypressed_count++;
 	os_processKey(r,keypressed,targ);
 }
@@ -532,21 +608,21 @@ function os_eventKeydown(e){
 	var r = os_map[targ.id];
 	if(r == null)
 		return; // not our event
-			
+
 	os_mouse_moved = false;
 
-	os_cur_keypressed = (window.Event) ? e.which : e.keyCode;
+	os_cur_keypressed = (e.keyCode == undefined) ? e.which : e.keyCode;
 	os_last_keypress = 0;
 	os_keypressed_count = 0;
 }
 
 /** Event: loss of focus of input box */
-function os_eventBlur(e){	
+function os_eventBlur(e){
 	var targ = os_getTarget(e);
 	var r = os_map[targ.id];
 	if(r == null)
 		return; // not our event
-	if(!os_mouse_pressed)	
+	if(!os_mouse_pressed)
 		os_hideResults(r);
 }
 
@@ -558,19 +634,19 @@ function os_eventFocus(e){
 
 
 /********************
- *  Mouse events 
- ********************/ 
+ *  Mouse events
+ ********************/
 
 /** Mouse over the container */
 function os_eventMouseover(srcId, e){
-	var targ = os_getTarget(e);	
+	var targ = os_getTarget(e);
 	var r = os_map[srcId];
 	if(r == null || !os_mouse_moved)
 		return; // not our event
 	var num = os_getNumberSuffix(targ.id);
 	if(num >= 0)
 		os_changeHighlight(r,r.selected,num,false);
-					
+
 }
 
 /* Get row where the event occured (from its id) */
@@ -596,7 +672,7 @@ function os_eventMousedown(srcId, e){
 	if(r == null)
 		return; // not our event
 	var num = os_getNumberSuffix(targ.id);
-	
+
 	os_mouse_pressed = true;
 	if(num >= 0){
 		os_mouse_num = num;
@@ -604,7 +680,7 @@ function os_eventMousedown(srcId, e){
 	}
 	// keep the focus on the search field
 	document.getElementById(r.searchbox).focus();
-	
+
 	return false; // prevents selection
 }
 
@@ -615,7 +691,7 @@ function os_eventMouseup(srcId, e){
 	if(r == null)
 		return; // not our event
 	var num = os_getNumberSuffix(targ.id);
-		
+
 	if(num >= 0 && os_mouse_num == num){
 		os_updateSearchQuery(r,r.results[num]);
 		os_hideResults(r);
@@ -654,10 +730,10 @@ function os_eventOnsubmit(e){
 		var r = os_map[os_autoload_inputs[i]];
 		if(r != null){
 			var b = document.getElementById(r.searchform);
-			if(b != null && b == targ){ 
+			if(b != null && b == targ){
 				// set query value so the handler won't try to fetch additional results
 				r.query = document.getElementById(r.searchbox).value;
-			}			
+			}
 			os_hideResults(r);
 		}
 	}
@@ -674,7 +750,7 @@ function os_hookEvent(element, hookName, hookFunct) {
 
 /** Init Result objects and event handlers */
 function os_initHandlers(name, formname, element){
-	var r = new os_Results(name, formname);	
+	var r = new os_Results(name, formname);
 	// event handler
 	os_hookEvent(element, "keyup", function(event) { os_eventKeyup(event); });
 	os_hookEvent(element, "keydown", function(event) { os_eventKeydown(event); });
@@ -684,10 +760,10 @@ function os_initHandlers(name, formname, element){
 	element.setAttribute("autocomplete","off");
 	// stopping handler
 	os_hookEvent(document.getElementById(formname), "submit", function(event){ return os_eventOnsubmit(event); });
-	os_map[name] = r; 
+	os_map[name] = r;
 	// toggle link
 	if(document.getElementById(r.toggle) == null){
-		// TODO: disable this while we figure out a way for this to work in all browsers 
+		// TODO: disable this while we figure out a way for this to work in all browsers
 		/* if(name=='searchInput'){
 			// special case: place above the main search box
 			var t = os_createToggle(r,"os-suggest-toggle");
@@ -708,7 +784,7 @@ function os_initHandlers(name, formname, element){
 			t.style.visibility = "visible";
 		} */
 	}
-	
+
 }
 
 /** Return the span element that contains the toggle link */
@@ -722,7 +798,7 @@ function os_createToggle(r,className){
 	var msg = document.createTextNode(wgMWSuggestMessages[0]);
 	link.appendChild(msg);
 	t.appendChild(link);
-	return t; 	
+	return t;
 }
 
 /** Call when user clicks on some of the toggle links */
@@ -732,7 +808,7 @@ function os_toggle(inputId,formName){
 	if(r == null){
 		os_enableSuggestionsOn(inputId,formName);
 		r = os_map[inputId];
-		msg = wgMWSuggestMessages[0];		
+		msg = wgMWSuggestMessages[0];
 	} else{
 		os_disableSuggestionsOn(inputId,formName);
 		msg = wgMWSuggestMessages[1];
@@ -756,7 +832,7 @@ function os_disableSuggestionsOn(inputId){
 		os_hideResults(r);
 		// turn autocomplete on !
 		document.getElementById(inputId).setAttribute("autocomplete","on");
-		// remove descriptor	
+		// remove descriptor
 		os_map[inputId] = null;
 	}
 }
@@ -769,7 +845,7 @@ function os_MWSuggestInit() {
 		element = document.getElementById( id );
 		if(element != null)
 			os_initHandlers(id,form,element);
-	}	
+	}
 }
 
 hookEvent("load", os_MWSuggestInit);
diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css
index 5cffb073..3acd5e23 100644
--- a/skins/common/oldshared.css
+++ b/skins/common/oldshared.css
@@ -201,10 +201,6 @@ table.small { font-size: 100% }
 	font-size:150%;
 	margin:5px;
 }
-.searchmatch {
-	color: red;
-	font-weight: bold;
-}
 .sharedUploadNotice {
 	font-style: italic;
 }
@@ -406,13 +402,6 @@ table.multipageimage td {
 
 .templatesUsed { margin-top: 1em; }
 
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 95%;
-}
-
-
 .MediaTransformError {
 	border: thin solid #777;
 	background-color: #ccc;
@@ -423,3 +412,7 @@ div#mw-recreate-deleted-warn ul li {
 	vertical-align: middle;
 	font-size: 90%;
 }
+
+form#specialpages {
+	display: inline;
+}
diff --git a/skins/common/prefs.js b/skins/common/prefs.js
index d9a612f9..c2554c00 100644
--- a/skins/common/prefs.js
+++ b/skins/common/prefs.js
@@ -95,6 +95,7 @@ function unhidetzbutton() {
 	if (tzb) {
 		tzb.style.display = 'inline';
 	}
+	updateTimezoneSelection(false);
 }
 
 // in [-]HH:MM format...
@@ -113,6 +114,50 @@ function fetchTimezone() {
 
 function guessTimezone(box) {
 	document.getElementsByName("wpHourDiff")[0].value = fetchTimezone();
+	updateTimezoneSelection(true);
+}
+
+function updateTimezoneSelection(force_offset) {
+	var wpTimeZone = document.getElementsByName("wpTimeZone")[0];
+	var wpHourDiff = document.getElementsByName("wpHourDiff")[0];
+	var wpLocalTime = document.getElementById("wpLocalTime");
+	var wpServerTime = document.getElementsByName("wpServerTime")[0];
+	var minDiff = 0;
+
+	if (force_offset) wpTimeZone.selectedIndex = 1;
+	if (wpTimeZone.selectedIndex == 1) {
+		wpHourDiff.disabled = false;
+		var diffArr = wpHourDiff.value.split(':');
+		if (diffArr.length == 1) {
+			minDiff = parseInt(diffArr[0], 10) * 60;
+		} else {
+			minDiff = Math.abs(parseInt(diffArr[0], 10))*60 + parseInt(diffArr[1], 10);
+			if (parseInt(diffArr[0], 10) < 0) minDiff = -minDiff;
+		}
+	} else {
+		wpHourDiff.disabled = true;
+		var diffArr = wpTimeZone.options[wpTimeZone.selectedIndex].value.split('|');
+		minDiff = parseInt(diffArr[1], 10);
+	}
+	if (isNaN(minDiff)) minDiff = 0;
+	var localTime = parseInt(wpServerTime.value, 10) + minDiff;
+	while (localTime < 0) localTime += 1440;
+	while (localTime >= 1440) localTime -= 1440;
+
+	var hour = String(Math.floor(localTime/60));
+	if (hour.length<2) hour = '0'+hour;
+	var min = String(localTime%60);
+	if (min.length<2) min = '0'+min;
+	changeText(wpLocalTime, hour+':'+min);
+
+	if (wpTimeZone.selectedIndex != 1) {
+		hour = String(Math.abs(Math.floor(minDiff/60)));
+		if (hour.length<2) hour = '0'+hour;
+		if (minDiff < 0) hour = '-'+hour;
+		min = String(minDiff%60);
+		if (min.length<2) min = '0'+min;
+		wpHourDiff.value = hour+':'+min;
+	}
 }
 
 hookEvent("load", unhidetzbutton);
diff --git a/skins/common/preview.js b/skins/common/preview.js
index 8c5c07d3..faf611f0 100644
--- a/skins/common/preview.js
+++ b/skins/common/preview.js
@@ -87,6 +87,7 @@ function lpStatusUpdate() {
 	var previewContainer = document.getElementById( lpIdPreview );
 	if ( previewContainer && previewElement ) {
 		previewContainer.innerHTML = previewElement.firstChild.data;
+		previewContainer.style.display = 'block';
 	} else {
 		/* Should never happen */
 		window.alert(i18n(wgLivepreviewMessageFailed));
diff --git a/skins/common/protect.js b/skins/common/protect.js
index 863b95bd..d9650c82 100644
--- a/skins/common/protect.js
+++ b/skins/common/protect.js
@@ -1,218 +1,351 @@
-/**
- * Set up the protection chaining interface (i.e. "unlock move permissions" checkbox)
- * on the protection form
- *
- * @param String tableId Identifier of the table containing UI bits
- * @param String labelText Text to use for the checkbox label
- */
-function protectInitialize( tableId, labelText, types ) {
-	if( !( document.createTextNode && document.getElementById && document.getElementsByTagName ) )
-		return false;
-		
-	var box = document.getElementById( tableId );
-	if( !box )
-		return false;
+
+var ProtectionForm = {
+	'existingMatch': false,
+
+	/**
+	 * Set up the protection chaining interface (i.e. "unlock move permissions" checkbox)
+	 * on the protection form
+	 *
+	 * @param Object opts : parameters with members:
+	 *     tableId              Identifier of the table containing UI bits
+	 *     labelText            Text to use for the checkbox label
+	 *     numTypes             The number of protection types
+	 *     existingMatch        True if all the existing expiry times match
+	 */
+	'init': function( opts ) {
+		if( !( document.createTextNode && document.getElementById && document.getElementsByTagName ) )
+			return false;
+
+		var box = document.getElementById( opts.tableId );
+		if( !box )
+			return false;
 		
-	var tbody = box.getElementsByTagName( 'tbody' )[0];
-	var row = document.createElement( 'tr' );
-	tbody.appendChild( row );
-	
-	row.appendChild( document.createElement( 'td' ) );
-	var col = document.createElement( 'td' );
-	row.appendChild( col );
-	// If there is only one protection type, there is nothing to chain
-	if( types > 1 ) {
-		var check = document.createElement( 'input' );
-		check.id = 'mwProtectUnchained';
-		check.type = 'checkbox';
-		col.appendChild( check );
-		addClickHandler( check, protectChainUpdate );
-
-		col.appendChild( document.createTextNode( ' ' ) );
-		var label = document.createElement( 'label' );
-		label.htmlFor = 'mwProtectUnchained';
-		label.appendChild( document.createTextNode( labelText ) );
-		col.appendChild( label );
-
-		check.checked = !protectAllMatch();
-		protectEnable( check.checked );
-	}
-	
-	setCascadeCheckbox();
-	
-	return true;
-}
+		var boxbody = box.getElementsByTagName('tbody')[0]
+		var row = document.createElement( 'tr' );
+		boxbody.insertBefore( row, boxbody.firstChild );
+
+		this.existingMatch = opts.existingMatch;
+
+		var cell = document.createElement( 'td' );
+		row.appendChild( cell );
+		// If there is only one protection type, there is nothing to chain
+		if( opts.numTypes > 1 ) {
+			var check = document.createElement( 'input' );
+			check.id = 'mwProtectUnchained';
+			check.type = 'checkbox';
+			cell.appendChild( check );
+			addClickHandler( check, function() { ProtectionForm.onChainClick(); } );
+
+			cell.appendChild( document.createTextNode( ' ' ) );
+			var label = document.createElement( 'label' );
+			label.htmlFor = 'mwProtectUnchained';
+			label.appendChild( document.createTextNode( opts.labelText ) );
+			cell.appendChild( label );
+
+			check.checked = !this.areAllTypesMatching();
+			this.enableUnchainedInputs( check.checked );
+		}
+
+		this.updateCascadeCheckbox();
+
+		return true;
+	},
 
-/**
-* Determine if, given the cascadeable protection levels
-* and what is currently selected, if the cascade box 
-* can be checked
-*
-* @return boolean
-*
-*/
-function setCascadeCheckbox() {
-	// For non-existent titles, there is no cascade option
-	if( !document.getElementById( 'mwProtect-cascade' ) ) {
+	/**
+	 * Sets the disabled attribute on the cascade checkbox depending on the current selected levels
+	 */
+	'updateCascadeCheckbox': function() {
+		// For non-existent titles, there is no cascade option
+		if( !document.getElementById( 'mwProtect-cascade' ) ) {
+			return;
+		}
+		var lists = this.getLevelSelectors();
+		for( var i = 0; i < lists.length; i++ ) {
+			if( lists[i].selectedIndex > -1 ) {
+				var items = lists[i].getElementsByTagName( 'option' );
+				var selected = items[ lists[i].selectedIndex ].value;
+				if( !this.isCascadeableLevel(selected) ) {
+					document.getElementById( 'mwProtect-cascade' ).checked = false;
+					document.getElementById( 'mwProtect-cascade' ).disabled = true;
+					return;
+				}
+			}
+		}
+		document.getElementById( 'mwProtect-cascade' ).disabled = false;
+	},
+
+	/**
+	 * Is this protection level cascadeable?
+	 * @param String level
+	 *
+	 * @return boolean
+	 *
+	 */
+	'isCascadeableLevel': function( level ) {
+		for (var k = 0; k < wgCascadeableLevels.length; k++) {
+			if ( wgCascadeableLevels[k] == level ) {
+				return true;
+			}
+		}
 		return false;
-	}
-	var lists = protectSelectors();
-	for( var i = 0; i < lists.length; i++ ) {
-		if( lists[i].selectedIndex > -1 ) {
-			var items = lists[i].getElementsByTagName( 'option' );
-			var selected = items[ lists[i].selectedIndex ].value;
-			if( !isCascadeableLevel(selected) ) {
-				document.getElementById( 'mwProtect-cascade' ).checked = false;
-				document.getElementById( 'mwProtect-cascade' ).disabled = true;
-				return false;
+	},
+
+	/**
+	 * When protection levels are locked together, update the rest
+	 * when one action's level changes
+	 *
+	 * @param Element source Level selector that changed
+	 */
+	'updateLevels': function(source) {
+		if( !this.isUnchained() )
+			this.setAllSelectors( source.selectedIndex );
+		this.updateCascadeCheckbox();
+	},
+
+	/**
+	 * When protection levels are locked together, update the
+	 * expiries when one changes
+	 *
+	 * @param Element source expiry input that changed
+	 */
+
+	'updateExpiry': function(source) {
+		if( !this.isUnchained() ) {
+			var expiry = source.value;
+			this.forEachExpiryInput(function(element) {
+				element.value = expiry;
+			});
+		}
+		var listId = source.id.replace( /^mwProtect-(\w+)-expires$/, 'mwProtectExpirySelection-$1' );
+		var list = document.getElementById( listId );
+		if (list && list.value != 'othertime' ) {
+			if ( this.isUnchained() ) {
+				list.value = 'othertime';
+			} else {
+				this.forEachExpirySelector(function(element) {
+					element.value = 'othertime';
+				});
 			}
 		}
-	}
-	document.getElementById( 'mwProtect-cascade' ).disabled = false;
-	return true;
-}
+	},
 
-/**
-* Is this protection level cascadeable?
-* @param String level
-*
-* @return boolean
-*
-*/
-function isCascadeableLevel( level ) { 	 
-	for (var k = 0; k < wgCascadeableLevels.length; k++) { 	 
-		if ( wgCascadeableLevels[k] == level ) { 	 
-			return true; 	 
-		} 
-	} 	 
-	return false; 	 
-}
+	/**
+	 * When protection levels are locked together, update the
+	 * expiry lists when one changes and clear the custom inputs
+	 *
+	 * @param Element source expiry selector that changed
+	 */
+	'updateExpiryList': function(source) {
+		if( !this.isUnchained() ) {
+			var expiry = source.value;
+			this.forEachExpirySelector(function(element) {
+				element.value = expiry;
+			});
+			this.forEachExpiryInput(function(element) {
+				element.value = '';
+			});
+		}
+	},
 
-/**
- * When protection levels are locked together, update the rest
- * when one action's level changes
- *
- * @param Element source Level selector that changed
- */
-function protectLevelsUpdate(source) {
-	if( !protectUnchained() )
-		protectUpdateAll( source.selectedIndex );
-	setCascadeCheckbox();
-}
+	/**
+	 * Update chain status and enable/disable various bits of the UI
+	 * when the user changes the "unlock move permissions" checkbox
+	 */
+	'onChainClick': function() {
+		if( this.isUnchained() ) {
+			this.enableUnchainedInputs( true );
+		} else {
+			this.setAllSelectors( this.getMaxLevel() );
+			this.enableUnchainedInputs( false );
+		}
+		this.updateCascadeCheckbox();
+	},
 
-/**
- * Update chain status and enable/disable various bits of the UI
- * when the user changes the "unlock move permissions" checkbox
- */
-function protectChainUpdate() {
-	if( protectUnchained() ) {
-		protectEnable( true );
-	} else {
-		protectChain();
-		protectEnable( false );
-	}
-	setCascadeCheckbox();
-}
+	/**
+	 * Returns true if the named attribute in all objects in the given array are matching
+	 */
+	'matchAttribute' : function( objects, attrName ) {
+		var value = null;
 
-/**
- * Are all actions protected at the same level?
- *
- * @return boolean
- */
-function protectAllMatch() {
-	var values = new Array();
-	protectForSelectors(function(set) {
-		values[values.length] = set.selectedIndex;
-	});
-	for (var i = 1; i < values.length; i++) {
-		if (values[i] != values[0]) {
-			return false;
+		// Check levels
+		for ( var i = 0; i < objects.length; i++ ) {
+			var element = objects[i];
+			if ( value == null ) {
+				value = element[attrName];
+			} else {
+				if ( value != element[attrName] ) {
+					return false;
+				}
+			}
 		}
-	}
-	return true;
-}
+		return true;
+	},
 
-/**
- * Is protection chaining on or off?
- *
- * @return bool
- */
-function protectUnchained() {
-	var unchain = document.getElementById( 'mwProtectUnchained' );
-	return unchain
-		? unchain.checked
-		: true; // No control, so we need to let the user set both levels
-}
+	/**
+	 * Are all actions protected at the same level, with the same expiry time?
+	 *
+	 * @return boolean
+	 */
+	'areAllTypesMatching': function() {
+		return this.existingMatch
+			&& this.matchAttribute( this.getLevelSelectors(), 'selectedIndex' )
+			&& this.matchAttribute( this.getExpirySelectors(), 'selectedIndex' )
+			&& this.matchAttribute( this.getExpiryInputs(), 'value' );
+	},
+
+	/**
+	 * Is protection chaining off?
+	 *
+	 * @return bool
+	 */
+	'isUnchained': function() {
+		var element = document.getElementById( 'mwProtectUnchained' );
+		return element
+			? element.checked
+			: true; // No control, so we need to let the user set both levels
+	},
+
+	/**
+	 * Find the highest protection level in any selector
+	 */
+	'getMaxLevel': function() {
+		var maxIndex = -1;
+		this.forEachLevelSelector(function(element) {
+			if (element.selectedIndex > maxIndex) {
+				maxIndex = element.selectedIndex;
+			}
+		});
+		return maxIndex;
+	},
 
-/**
- * Find the highest-protected action and set all others to that level
- */
-function protectChain() {
-	var maxIndex = -1;
-	protectForSelectors(function(set) {
-		if (set.selectedIndex > maxIndex) {
-			maxIndex = set.selectedIndex;
+	/**
+	 * Protect all actions at the specified level
+	 *
+	 * @param int index Protection level
+	 */
+	'setAllSelectors': function(index) {
+		this.forEachLevelSelector(function(element) {
+			if (element.selectedIndex != index) {
+				element.selectedIndex = index;
+			}
+		});
+	},
+
+	/**
+	 * Apply a callback to each protection selector
+	 *
+	 * @param callable func Callback function
+	 */
+	'forEachLevelSelector': function(func) {
+		var selectors = this.getLevelSelectors();
+		for (var i = 0; i < selectors.length; i++) {
+			func(selectors[i]);
 		}
-	});
-	protectUpdateAll(maxIndex);
-}
+	},
+
+	/**
+	 * Get a list of all protection selectors on the page
+	 *
+	 * @return Array
+	 */
+	'getLevelSelectors': function() {
+		var all = document.getElementsByTagName("select");
+		var ours = new Array();
+		for (var i = 0; i < all.length; i++) {
+			var element = all[i];
+			if (element.id.match(/^mwProtect-level-/)) {
+				ours[ours.length] = element;
+			}
+		}
+		return ours;
+	},
 
-/**
- * Protect all actions at the specified level
- *
- * @param int index Protection level
- */
-function protectUpdateAll(index) {
-	protectForSelectors(function(set) {
-		if (set.selectedIndex != index) {
-			set.selectedIndex = index;
+	/**
+	 * Apply a callback to each expiry input
+	 *
+	 * @param callable func Callback function
+	 */
+	'forEachExpiryInput': function(func) {
+		var inputs = this.getExpiryInputs();
+		for (var i = 0; i < inputs.length; i++) {
+			func(inputs[i]);
 		}
-	});
-}
+	},
 
-/**
- * Apply a callback to each protection selector
- *
- * @param callable func Callback function
- */
-function protectForSelectors(func) {
-	var selectors = protectSelectors();
-	for (var i = 0; i < selectors.length; i++) {
-		func(selectors[i]);
-	}
-}
+	/**
+	 * Get a list of all expiry inputs on the page
+	 *
+	 * @return Array
+	 */
+	'getExpiryInputs': function() {
+		var all = document.getElementsByTagName("input");
+		var ours = new Array();
+		for (var i = 0; i < all.length; i++) {
+			var element = all[i];
+			if (element.name.match(/^mwProtect-expiry-/)) {
+				ours[ours.length] = element;
+			}
+		}
+		return ours;
+	},
 
-/**
- * Get a list of all protection selectors on the page
- *
- * @return Array
- */
-function protectSelectors() {
-	var all = document.getElementsByTagName("select");
-	var ours = new Array();
-	for (var i = 0; i < all.length; i++) {
-		var set = all[i];
-		if (set.id.match(/^mwProtect-level-/)) {
-			ours[ours.length] = set;
+	/**
+	 * Apply a callback to each expiry selector list
+	 * @param callable func Callback function
+	 */
+	'forEachExpirySelector': function(func) {
+		var inputs = this.getExpirySelectors();
+		for (var i = 0; i < inputs.length; i++) {
+			func(inputs[i]);
 		}
-	}
-	return ours;
-}
+	},
 
-/**
- * Enable/disable protection selectors
- *
- * @param boolean val Enable?
- */
-function protectEnable(val) {
-	// fixme
-	var first = true;
-	protectForSelectors(function(set) {
-		if (first) {
-			first = false;
-		} else {
-			set.disabled = !val;
-			set.style.visible = val ? "visible" : "hidden";
+	/**
+	 * Get a list of all expiry selector lists on the page
+	 *
+	 * @return Array
+	 */
+	'getExpirySelectors': function() {
+		var all = document.getElementsByTagName("select");
+		var ours = new Array();
+		for (var i = 0; i < all.length; i++) {
+			var element = all[i];
+			if (element.id.match(/^mwProtectExpirySelection-/)) {
+				ours[ours.length] = element;
+			}
 		}
-	});
+		return ours;
+	},
+
+	/**
+	 * Enable/disable protection selectors and expiry inputs
+	 *
+	 * @param boolean val Enable?
+	 */
+	'enableUnchainedInputs': function(val) {
+		var first = true;
+		this.forEachLevelSelector(function(element) {
+			if (first) {
+				first = false;
+			} else {
+				element.disabled = !val;
+			}
+		});
+		first = true;
+		this.forEachExpiryInput(function(element) {
+			if (first) {
+				first = false;
+			} else {
+				element.disabled = !val;
+			}
+		});
+		first = true;
+		this.forEachExpirySelector(function(element) {
+			if (first) {
+				first = false;
+			} else {
+				element.disabled = !val;
+			}
+		});
+	}
 }
diff --git a/skins/common/shared.css b/skins/common/shared.css
index d42fc1c0..bd306167 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -9,6 +9,10 @@
 img.tex { vertical-align: middle; }
 span.texhtml { font-family: serif; }
 
+/* add a bit of margin space between the preview and the toolbar */
+/* this replaces the ugly <p><br /></p> we used to insert into the page source */
+#wikiPreview.ontop { margin-bottom: 1em; }
+
 /* Stop floats from intruding into edit area in previews */
 #toolbar, #wpTextbox1 { clear: both; }
 
@@ -88,8 +92,9 @@ body.ltr .magnify { float:right; }
 .mw-hidden-cats-hidden { display: none; }
 .catlinks-allhidden { display: none; }
 
-/* Convenience links to edit block and delete reasons */
-p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
+/* Convenience links to edit block, delete and protect reasons */
+p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
+p.mw-filedelete-editreasons, p.mw-delete-editreasons {
 	font-size: 90%;
 	float: right;
 }
@@ -101,12 +106,18 @@ div.searchresult {
 }
 .mw-search-results li {
 	padding-bottom: 1em;
+	list-style:none;
 }
 .mw-search-result-data {
 	color: green;
 	font-size: 97%;
 }
 
+td#mw-search-menu {
+	padding-left:6em;
+	font-size:85%;
+}
+
 div#mw-search-interwiki {
 	float: right;
 	width: 18em;
@@ -131,8 +142,26 @@ span.searchalttitle {
 
 div.searchdidyoumean {
 	font-size: 127%;
-	padding-bottom:1ex;
-	padding-top:1ex; 
+	margin-bottom: 1ex;
+	margin-top: 1ex;
+	/* Note that this color won't affect the link, as desired. */
+	color: #c00;
+}
+
+div.searchdidyoumean em {
+	font-weight: bold;
+}
+
+.searchmatch {
+	font-weight: bold;
+}
+
+div.searchresults {
+	border:1px solid darkblue;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 20px;
+	padding-right: 20px;
 }
 
 /*
@@ -157,6 +186,7 @@ table.mw-userrights-groups * td,table.mw-userrights-groups * th {
 	left: 0px;
 	width: 0px;
 	background-color: white; 
+	background-color: Window;
 	border-style: solid;
 	border-color: #AAAAAA;
 	border-width: 1px;
@@ -220,7 +250,13 @@ td.os-suggest-result-hl {
     border: 1px dashed #aaa;
 }
 
-table.mw-listgrouprights-table  {
+/*
+ * Special:ListGroupRights styling
+ * Special:Statistics styling 
+*/
+
+table.mw-listgrouprights-table,
+table.mw-statistics-table {
 	border: 1px solid #ccc;
 	border-collapse: collapse;
 }
@@ -229,11 +265,16 @@ table.mw-listgrouprights-table tr  {
 	vertical-align: top;
 }
 
-table.mw-listgrouprights-table td, table.mw-listgrouprights-table th {
+table.mw-listgrouprights-table td, table.mw-listgrouprights-table th,
+table.mw-statistics-table td, table.mw-statistics-table th {
 	padding: 0.5em 0.2em 0.5em 0.2em;
 	border: 1px solid #ccc;
 }
 
+td.mw-statistics-numbers {
+	text-align: right;
+}
+
 /* Special:SpecialPages styling */
 h4.mw-specialpagesgroup {
 	background-color: #dcdcdc;
@@ -247,3 +288,26 @@ h4.mw-specialpagesgroup {
 #shared-image-dup, #shared-image-conflict {
 	font-style: italic;
 }
+
+/* Special:EmailUser styling */
+table.mw-emailuser-table {
+	width: 98%;
+}
+td#mw-emailuser-sender, td#mw-emailuser-recipient {
+	font-weight: bold;
+}
+
+/*
+ * Recreating deleted page warning
+ * Reupload file warning
+ * Page protection warning
+ * incl. log entries for these warnings
+ */
+div.mw-warning-with-logexcerpt {
+	padding: 3px;
+	margin-bottom: 3px;
+	border: 2px solid #2F6FAB;
+}
+div.mw-warning-with-logexcerpt ul li {
+	font-size: 90%;
+}
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 59f15cef..089d22d7 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -44,15 +44,14 @@ function addOnloadHook(hookFunct) {
 }
 
 function hookEvent(hookName, hookFunct) {
-	if (window.addEventListener) {
-		window.addEventListener(hookName, hookFunct, false);
-	} else if (window.attachEvent) {
-		window.attachEvent("on" + hookName, hookFunct);
-	}
+	addHandler(window, hookName, hookFunct);
 }
 
 function importScript(page) {
-	return importScriptURI(wgScript + '?action=raw&ctype=text/javascript&title=' + encodeURIComponent(page.replace(/ /g,'_')));
+	var uri = wgScript + '?title=' +
+		encodeURIComponent(page.replace(/ /g,'_')).replace('%2F','/').replace('%3A',':') +
+		'&action=raw&ctype=text/javascript';
+	return importScriptURI(uri);
 }
  
 var loadedScripts = {}; // included-scripts tracker
@@ -104,22 +103,6 @@ if (wgBreakFrames) {
 	}
 }
 
-// for enhanced RecentChanges
-function toggleVisibility(_levelId, _otherId, _linkId) {
-	var thisLevel = document.getElementById(_levelId);
-	var otherLevel = document.getElementById(_otherId);
-	var linkLevel = document.getElementById(_linkId);
-	if (thisLevel.style.display == 'none') {
-		thisLevel.style.display = 'block';
-		otherLevel.style.display = 'none';
-		linkLevel.style.display = 'inline';
-	} else {
-		thisLevel.style.display = 'none';
-		otherLevel.style.display = 'inline';
-		linkLevel.style.display = 'none';
-	}
-}
-
 function showTocToggle() {
 	if (document.createTextNode) {
 		// Uses DOM calls to avoid document.write + XHTML issues
@@ -309,6 +292,28 @@ function addPortletLink(portlet, href, text, id, tooltip, accesskey, nextnode) {
 	return item;
 }
 
+function getInnerText(el) {
+	if (typeof el == "string") return el;
+	if (typeof el == "undefined") { return el };
+	if (el.textContent) return el.textContent; // not needed but it is faster
+	if (el.innerText) return el.innerText;     // IE doesn't have textContent
+	var str = "";
+
+	var cs = el.childNodes;
+	var l = cs.length;
+	for (var i = 0; i < l; i++) {
+		switch (cs[i].nodeType) {
+			case 1: //ELEMENT_NODE
+				str += ts_getInnerText(cs[i]);
+				break;
+			case 3:	//TEXT_NODE
+				str += cs[i].nodeValue;
+				break;
+		}
+	}
+	return str;
+}
+
 
 /**
  * Set up accesskeys/tooltips from the deprecated ta array.  If doId
@@ -449,8 +454,19 @@ function toggle_element_check(ida,idb) {
 	From http://www.robertnyman.com/2005/11/07/the-ultimate-getelementsbyclassname/
 */
 function getElementsByClassName(oElm, strTagName, oClassNames){
-	var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName);
 	var arrReturnElements = new Array();
+	if ( typeof( oElm.getElementsByClassName ) == "function" ) {
+		/* Use a native implementation where possible FF3, Saf3.2, Opera 9.5 */
+		var arrNativeReturn = oElm.getElementsByClassName( oClassNames );
+		if ( strTagName == "*" )
+			return arrNativeReturn;
+		for ( var h=0; h < arrNativeReturn.length; h++ ) {
+			if( arrNativeReturn[h].tagName.toLowerCase() == strTagName.toLowerCase() )
+				arrReturnElements[arrReturnElements.length] = arrNativeReturn[h];
+		}
+		return arrReturnElements;
+	}
+	var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName);
 	var arrRegExpClassNames = new Array();
 	if(typeof oClassNames == "object"){
 		for(var i=0; i<oClassNames.length; i++){
@@ -518,8 +534,9 @@ var ts_image_up = "sort_up.gif";
 var ts_image_down = "sort_down.gif";
 var ts_image_none = "sort_none.gif";
 var ts_europeandate = wgContentLanguage != "en"; // The non-American-inclined can change to "true"
-var ts_alternate_row_colors = true;
-var SORT_COLUMN_INDEX;
+var ts_alternate_row_colors = false;
+var ts_number_transform_table = null;
+var ts_number_regex = null;
 
 function sortables_init() {
 	var idnum = 0;
@@ -549,7 +566,14 @@ function ts_makeSortable(table) {
 	for (var i = 0; i < firstRow.cells.length; i++) {
 		var cell = firstRow.cells[i];
 		if ((" "+cell.className+" ").indexOf(" unsortable ") == -1) {
-			cell.innerHTML += '&nbsp;&nbsp;<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;"><span class="sortarrow"><img src="'+ ts_image_path + ts_image_none + '" alt="&darr;"/></span></a>';
+			cell.innerHTML += '&nbsp;&nbsp;'
+				+ '<a href="#" class="sortheader" '
+				+ 'onclick="ts_resortTable(this);return false;">'
+				+ '<span class="sortarrow">'
+				+ '<img src="'
+				+ ts_image_path
+				+ ts_image_none
+				+ '" alt="&darr;"/></span></a>';
 		}
 	}
 	if (ts_alternate_row_colors) {
@@ -558,25 +582,7 @@ function ts_makeSortable(table) {
 }
 
 function ts_getInnerText(el) {
-	if (typeof el == "string") return el;
-	if (typeof el == "undefined") { return el };
-	if (el.textContent) return el.textContent; // not needed but it is faster
-	if (el.innerText) return el.innerText;     // IE doesn't have textContent
-	var str = "";
-
-	var cs = el.childNodes;
-	var l = cs.length;
-	for (var i = 0; i < l; i++) {
-		switch (cs[i].nodeType) {
-			case 1: //ELEMENT_NODE
-				str += ts_getInnerText(cs[i]);
-				break;
-			case 3:	//TEXT_NODE
-				str += cs[i].nodeValue;
-				break;
-		}
-	}
-	return str;
+	return getInnerText( el );
 }
 
 function ts_resortTable(lnk) {
@@ -592,9 +598,14 @@ function ts_resortTable(lnk) {
 		table = table.parentNode;
 	if (!table) return;
 
-	// Work out a type for the column
 	if (table.rows.length <= 1) return;
 
+	// Generate the number transform table if it's not done already
+	if (ts_number_transform_table == null) {
+		ts_initTransformTable();
+	}
+
+	// Work out a type for the column
 	// Skip the first row if that's where the headings are
 	var rowStart = (table.tHead && table.tHead.rows.length > 0 ? 0 : 1);
 
@@ -607,39 +618,52 @@ function ts_resortTable(lnk) {
 		}
 	}
 
-	sortfn = ts_sort_caseinsensitive;
-	if (itm.match(/^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/))
-		sortfn = ts_sort_date;
-	if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/))
-		sortfn = ts_sort_date;
-	if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d$/))
-		sortfn = ts_sort_date;
-	if (itm.match(/^[\u00a3$\u20ac]/)) // pound dollar euro
-		sortfn = ts_sort_currency;
-	if (itm.match(/^[\d.,]+\%?$/))
-		sortfn = ts_sort_numeric;
+	// TODO: bug 8226, localised date formats
+	var sortfn = ts_sort_generic;
+	var preprocessor = ts_toLowerCase;
+	if (/^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/.test(itm)) {
+		preprocessor = ts_dateToSortKey;
+	} else if (/^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/.test(itm)) {
+		preprocessor = ts_dateToSortKey;
+	} else if (/^\d\d[\/.-]\d\d[\/.-]\d\d$/.test(itm)) {
+		preprocessor = ts_dateToSortKey;
+	// pound dollar euro yen currency cents
+	} else if (/(^[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test(itm)) {
+		preprocessor = ts_currencyToSortKey;
+	} else if (ts_number_regex.test(itm)) {
+		preprocessor = ts_parseFloat;
+	}
 
 	var reverse = (span.getAttribute("sortdir") == 'down');
 
 	var newRows = new Array();
+	var staticRows = new Array();
 	for (var j = rowStart; j < table.rows.length; j++) {
 		var row = table.rows[j];
-		var keyText = ts_getInnerText(row.cells[column]);
-		var oldIndex = (reverse ? -j : j);
+		if((" "+row.className+" ").indexOf(" unsortable ") < 0) {
+			var keyText = ts_getInnerText(row.cells[column]);
+			var oldIndex = (reverse ? -j : j);
+			var preprocessed = preprocessor( keyText );
 
-		newRows[newRows.length] = new Array(row, keyText, oldIndex);
+			newRows[newRows.length] = new Array(row, preprocessed, oldIndex);
+		} else staticRows[staticRows.length] = new Array(row, false, j-rowStart);
 	}
 
 	newRows.sort(sortfn);
 
 	var arrowHTML;
 	if (reverse) {
-			arrowHTML = '<img src="'+ ts_image_path + ts_image_down + '" alt="&darr;"/>';
-			newRows.reverse();
-			span.setAttribute('sortdir','up');
+		arrowHTML = '<img src="'+ ts_image_path + ts_image_down + '" alt="&darr;"/>';
+		newRows.reverse();
+		span.setAttribute('sortdir','up');
 	} else {
-			arrowHTML = '<img src="'+ ts_image_path + ts_image_up + '" alt="&uarr;"/>';
-			span.setAttribute('sortdir','down');
+		arrowHTML = '<img src="'+ ts_image_path + ts_image_up + '" alt="&uarr;"/>';
+		span.setAttribute('sortdir','down');
+	}
+
+	for (var i = 0; i < staticRows.length; i++) {
+		var row = staticRows[i];
+		newRows.splice(row[2], 0, row);
 	}
 
 	// We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
@@ -661,7 +685,66 @@ function ts_resortTable(lnk) {
 	}
 	span.innerHTML = arrowHTML;
 
-	ts_alternate(table);		
+	if (ts_alternate_row_colors) {
+		ts_alternate(table);
+	}
+}
+
+function ts_initTransformTable() {
+	if ( typeof wgSeparatorTransformTable == "undefined"
+			|| ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) )
+	{
+		digitClass = "[0-9,.]";
+		ts_number_transform_table = false;
+	} else {
+		ts_number_transform_table = {};
+		// Unpack the transform table
+		// Separators
+		ascii = wgSeparatorTransformTable[0].split("\t");
+		localised = wgSeparatorTransformTable[1].split("\t");
+		for ( var i = 0; i < ascii.length; i++ ) { 
+			ts_number_transform_table[localised[i]] = ascii[i];
+		}
+		// Digits
+		ascii = wgDigitTransformTable[0].split("\t");
+		localised = wgDigitTransformTable[1].split("\t");
+		for ( var i = 0; i < ascii.length; i++ ) { 
+			ts_number_transform_table[localised[i]] = ascii[i];
+		}
+
+		// Construct regex for number identification
+		digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.'];
+		maxDigitLength = 1;
+		for ( var digit in ts_number_transform_table ) {
+			// Escape regex metacharacters
+			digits.push( 
+				digit.replace( /[\\\\$\*\+\?\.\(\)\|\{\}\[\]\-]/,
+					function( s ) { return '\\' + s; } )
+			);
+			if (digit.length > maxDigitLength) {
+				maxDigitLength = digit.length;
+			}
+		}
+		if ( maxDigitLength > 1 ) {
+			digitClass = '[' + digits.join( '', digits ) + ']';
+		} else {
+			digitClass = '(' + digits.join( '|', digits ) + ')';
+		}
+	}
+
+	// We allow a trailing percent sign, which we just strip.  This works fine
+	// if percents and regular numbers aren't being mixed.
+	ts_number_regex = new RegExp(
+		"^(" +
+			"[+-]?[0-9][0-9,]*(\\.[0-9,]*)?(E[+-]?[0-9][0-9,]*)?" + // Fortran-style scientific
+			"|" +
+			"[+-]?" + digitClass + "+%?" + // Generic localised
+		")$", "i"
+	);
+}
+
+function ts_toLowerCase( s ) {
+	return s.toLowerCase();
 }
 
 function ts_dateToSortKey(date) {	
@@ -705,38 +788,34 @@ function ts_dateToSortKey(date) {
 	return "00000000";
 }
 
-function ts_parseFloat(num) {
-	if (!num) return 0;
-	num = parseFloat(num.replace(/,/g, ""));
-	return (isNaN(num) ? 0 : num);
-}
-
-function ts_sort_date(a,b) {
-	var aa = ts_dateToSortKey(a[1]);
-	var bb = ts_dateToSortKey(b[1]);
-	return (aa < bb ? -1 : aa > bb ? 1 : a[2] - b[2]);
-}
-
-function ts_sort_currency(a,b) {
-	var aa = ts_parseFloat(a[1].replace(/[^0-9.]/g,''));
-	var bb = ts_parseFloat(b[1].replace(/[^0-9.]/g,''));
-	return (aa != bb ? aa - bb : a[2] - b[2]);
-}
+function ts_parseFloat( s ) {
+	if ( !s ) {
+		return 0;
+	}
+	if (ts_number_transform_table != false) {
+		var newNum = '', c;
+		
+		for ( var p = 0; p < s.length; p++ ) {
+			c = s.charAt( p );
+			if (c in ts_number_transform_table) {
+				newNum += ts_number_transform_table[c];
+			} else {
+				newNum += c;
+			}
+		}
+		s = newNum;
+	}
 
-function ts_sort_numeric(a,b) {
-	var aa = ts_parseFloat(a[1]);
-	var bb = ts_parseFloat(b[1]);
-	return (aa != bb ? aa - bb : a[2] - b[2]);
+	num = parseFloat(s.replace(/,/g, ""));
+	return (isNaN(num) ? s : num);
 }
 
-function ts_sort_caseinsensitive(a,b) {
-	var aa = a[1].toLowerCase();
-	var bb = b[1].toLowerCase();
-	return (aa < bb ? -1 : aa > bb ? 1 : a[2] - b[2]);
+function ts_currencyToSortKey( s ) {
+	return ts_parseFloat(s.replace(/[^0-9.,]/g,''));
 }
 
-function ts_sort_default(a,b) {
-	return (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2]);
+function ts_sort_generic(a, b) {
+	return a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2];
 }
 
 function ts_alternate(table) {
@@ -805,6 +884,7 @@ function jsMsg( message, className ) {
 	}
 
 	messageDiv.setAttribute( 'id', 'mw-js-message' );
+	messageDiv.style.display = 'block';
 	if( className ) {
 		messageDiv.setAttribute( 'class', 'mw-js-message-'+className );
 	}
@@ -895,6 +975,21 @@ function addHandler( element, attach, handler ) {
 function addClickHandler( element, handler ) {
 	addHandler( element, 'click', handler );
 }
+
+/**
+ * Removes an event handler from an element
+ *
+ * @param Element element Element to remove handler from
+ * @param String remove Event to remove
+ * @param callable handler Event handler callback to remove
+ */
+function removeHandler( element, remove, handler ) {
+	if( window.removeEventListener ) {
+		element.removeEventListener( remove, handler, false );
+	} else if( window.detachEvent ) {
+		element.detachEvent( 'on' + remove, handler );
+	}
+}
 //note: all skins should call runOnloadHook() at the end of html output,
 //      so the below should be redundant. It's there just in case.
 hookEvent("load", runOnloadHook);
diff --git a/skins/common/wikiprintable.css b/skins/common/wikiprintable.css
index 58e132d6..8b099bb2 100644
--- a/skins/common/wikiprintable.css
+++ b/skins/common/wikiprintable.css
@@ -21,7 +21,7 @@ a, a.external, a.new, a.stub {
 }
 
 /* Hide ugly UI stuff */
-#quickbar, #topbar, #footer, #siteNotice,
+#quickbar, #topbar, #logo, #footer, #siteNotice,
 .editsection, .toctoggle {
 	display: none;
 }
diff --git a/skins/common/wikistandard.css b/skins/common/wikistandard.css
index 3fe8d2fb..5bf59246 100644
--- a/skins/common/wikistandard.css
+++ b/skins/common/wikistandard.css
@@ -5,7 +5,7 @@
 #powersearch {
   background: #DDEEFF; border-style: solid; border-width: 1px; padding: 2px;
 }
-#quickbar { width: 140px; padding: 4px; visibility: visible; z-index:99;font-size:95%;}
+#quickbar { width: 140px; height:100%; padding: 4px; visibility: visible; z-index:99;font-size:95%;}
 #topbar { padding: 4px;font-size:95%; }
 
 
diff --git a/skins/disabled/MonoBookCBT.php b/skins/disabled/MonoBookCBT.php
index c6297cd9..0d693a86 100644
--- a/skins/disabled/MonoBookCBT.php
+++ b/skins/disabled/MonoBookCBT.php
@@ -443,7 +443,7 @@ class SkinMonoBookCBT extends SkinTemplate {
 				$this->mOut->setSquidMaxage(0);
 			}
 		} else if (count($newtalks)) {
-			$sep = str_replace("_", " ", wfMsgHtml("newtalkseperator"));
+			$sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
 			$msgs = array();
 			foreach ($newtalks as $newtalk) {
 				$msgs[] = wfElement("a", 
diff --git a/skins/modern/main.css b/skins/modern/main.css
index d86a1f87..d9537c18 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -140,7 +140,7 @@ div.mw_clear {
 }
 
 .portlet div.pBody {
-	padding: 0em 0 1em 0;
+	padding: 0em 0 0.5em 0;
 }
 
 textarea {
@@ -647,7 +647,7 @@ div.patrollink {
 	font-size: 75%;
 	text-align: right;
 }
-span.newpage, span.minor, span.searchmatch, span.bot {
+span.newpage, span.minor, span.bot {
 	font-weight: bold;
 }
 span.unpatrolled {
@@ -655,9 +655,6 @@ span.unpatrolled {
 	color: red;
 }
 
-span.searchmatch {
-	color: red;
-}
 .sharedUploadNotice {
 	font-style: italic;
 }
@@ -1002,17 +999,6 @@ div.mw-lag-warn-high {
 	background-color: #FFCCCC;
 }
 
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn,
-div#mw-recreate-deleted-warn {
-	padding: 3px;
-	margin-bottom: 3px;
-	border: 2px solid #2F6FAB;
-}
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 90%;
-}
 .MediaTransformError {
 	background-color: #ccc;
 	padding: 0.1em;
diff --git a/skins/modern/print.css b/skins/modern/print.css
index 2d5b265e..33a36b20 100644
--- a/skins/modern/print.css
+++ b/skins/modern/print.css
@@ -3,7 +3,8 @@
 #p-personal,
 #jump-to-nav,
 #footer,
-span.editsection
+span.editsection,
+.noprint
 {
 	display: none;
 }
diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css
index 239bc8d4..d7aae769 100644
--- a/skins/modern/rtl.css
+++ b/skins/modern/rtl.css
@@ -82,8 +82,9 @@ input#wpSave, input#wpDiff {
 	float: right;
 	margin: 0 0 1em 3em;
 }
-/* Convenience links to edit block and delete reasons */
-p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
+/* Convenience links to edit block, delete and protect reasons */
+p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
+p.mw-filedelete-editreasons, p.mw-delete-editreasons {
 	float: left;
 }
 
@@ -99,7 +100,7 @@ table.filehistory th {
 	margin: 0 -15em 0 0;
 	float: left;
 }
-	
+
 #mw_content {
 	margin: 0 14em 0 0;
 	border-left: none;
@@ -141,6 +142,12 @@ table.filehistory th {
 html > body div#mw_contentholder ul {
 	display: table;
 }
+html > body div#mw_contentholder ul li {
+	margin-right:10px;
+}
+html > body div.pBody ul li {
+	margin-right:4px;
+}
 html > body div#mw_contentholder ul#filetoc {
 	display: block;
 }
diff --git a/skins/monobook/IE50Fixes.css b/skins/monobook/IE50Fixes.css
index 027e32ed..26c3dc97 100644
--- a/skins/monobook/IE50Fixes.css
+++ b/skins/monobook/IE50Fixes.css
@@ -63,5 +63,5 @@ li#pt-logout {
 	padding:0;
 	margin: 0;
 }
-.firstHeading { margin-bottom: .3em; }
+#firstHeading { margin-bottom: .3em; }
 /*div{ border:1px solid Red !important;}*/
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 8db47d2b..7e5809b5 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -260,7 +260,7 @@ span.subpages {
 #bodyContent h3, #bodyContent h4, #bodyContent h5 {
 	margin-bottom: .3em;
 }
-.firstHeading {
+#firstHeading {
 	margin-bottom: .1em;
 	/* These two rules hack around bug 2013 (fix for more limited bug 11325).
 	   When bug 2013 is fixed properly, they should be removed. */
@@ -892,10 +892,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
 	text-transform: lowercase;
 }
 
-/*
-** the remaining portlets
-*/
-#p-tbx,
 #p-lang {
 	position: relative;
 	z-index: 3;
@@ -1413,6 +1409,10 @@ div#searchTargetHide {
 	padding:2px;
 }
 
+#powersearch p {
+	margin-top:0px;
+}
+
 div.multipageimagenavbox {
    border: solid 1px silver;
    padding: 4px;
@@ -1465,6 +1465,7 @@ tr.sv-space td { display: none; }
   - remove line wrapping for all td and th, set background color
   - restore line wrapping for the last two table cells (description and size)
 */
+.TablePager { min-width: 80%; }
 .TablePager_nav a { text-decoration: none; }
 .TablePager { border-collapse: collapse; }
 .TablePager, .TablePager td, .TablePager th { 
@@ -1503,17 +1504,6 @@ div.mw-lag-warn-high {
 	background-color: #FFCCCC;
 }
 
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn,
-div#mw-recreate-deleted-warn {
-	padding: 3px;
-	margin-bottom: 3px;
-	border: 2px solid #2F6FAB;
-}
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 90%;
-}
 .MediaTransformError {
 	background-color: #ccc;
 	padding: 0.1em;
@@ -1541,11 +1531,6 @@ div#mw-search-interwiki-caption {
 	background: #cae8ff;
 }
 
-span.searchmatch {
-	font-weight: bold;
-	color: red;
-}
-
 /* God-damned hack for the crappy layout */
 .os-suggest {
 	font-size: 127%;
diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css
index f00cf09f..fbd5ab35 100644
--- a/skins/monobook/rtl.css
+++ b/skins/monobook/rtl.css
@@ -205,8 +205,9 @@ input#wpSave, input#wpDiff {
 	float: right;
 	margin: 0 0 1em 3em;
 }
-/* Convenience links to edit block and delete reasons */
-p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
+/* Convenience links to edit block, delete and protect reasons */
+p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
+p.mw-filedelete-editreasons, p.mw-delete-editreasons {
 	float: left;
 }
 
diff --git a/skins/simple/main.css b/skins/simple/main.css
index cc76f522..6f3e8eb8 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -345,10 +345,6 @@ div.printfooter {
   display: none;
 }
 
-span.searchmatch {
-  font-weight: bold;
-}
-
 #preftoc {
     float: left;
     margin: 1em;
@@ -393,12 +389,3 @@ table.collapsed tr.collapsable {
 
 .templatesUsed { margin-top: 1.5em; }
 
-/* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn ul li,
-div#mw-recreate-deleted-warn ul li {
-	font-size: 95%;
-}
-div.mw-recreate-deleted-control {
-	float: right;
-	font-size: 90%;
-}
diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css
index c560caba..1ba1431d 100644
--- a/skins/simple/rtl.css
+++ b/skins/simple/rtl.css
@@ -151,8 +151,9 @@ input#wpSave, input#wpDiff {
 	float: right;
 	margin: 0 0 1em 3em;
 }
-/* Convenience links to edit block and delete reasons */
-p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
+/* Convenience links to edit block, delete and protect reasons */
+p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
+p.mw-filedelete-editreasons, p.mw-delete-editreasons {
 	float: left;
 }
 
diff --git a/t/Search.inc b/t/Search.inc
index fa8a8b97..25229306 100644
--- a/t/Search.inc
+++ b/t/Search.inc
@@ -14,19 +14,15 @@ function buildTestDatabase( $tables ) {
 	global $wgDBprefix, $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname, $wgDBtype;
 	$oldPrefix = $wgDBprefix;
 	$wgDBprefix = 'parsertest';
-	$class = 'Database' . ucfirst( $wgDBtype );
-	$db = new $class (
-		$wgDBserver,
-		$wgDBadminuser,
-		$wgDBadminpassword,
-		$wgDBname );
+
+	$db = wfGetDB ( DB_SLAVE );
+
 	if( $db->isOpen() ) {
 		if ( !( stristr( $db->getSoftwareLink(), 'MySQL') && version_compare( $db->getServerVersion(), '4.1', '<' ) ) ) {
 			# Database that supports CREATE TABLE ... LIKE
 			foreach ($tables as $tbl) {
 				$newTableName = $db->tableName( $tbl );
-				#$tableName = $oldPrefix . $tbl;
-				$tableName = $tbl;
+				$tableName = $oldPrefix . $tbl;
 				$db->query("CREATE TEMPORARY TABLE $newTableName (LIKE $tableName)");
 			}
 		} else {
@@ -162,4 +158,4 @@ END
 		$got = $this->fetchIds( $this->search->searchTitle( 'smithee' ) );
 		is( $got, $exp, "Title power search" );
 	}
-}
\ No newline at end of file
+}
diff --git a/t/inc/Database.t b/t/inc/Database.t
index 5092be9d..4367fcd1 100644
--- a/t/inc/Database.t
+++ b/t/inc/Database.t
@@ -5,14 +5,12 @@ define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
 require 'includes/Defines.php';
+require 'StartProfiler.php';
+require 'includes/AutoLoader.php';
 require 'LocalSettings.php';
+require 'includes/Setup.php';
 
-plan( 13 );
-
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/GlobalFunctions.php' );
-require_ok( 'includes/Exception.php' );
-require_ok( 'includes/Database.php' );
+plan( 9 );
 
 $db = new Database( $wgDBserver, $wgDBuser, $wgDBpassword );
 
diff --git a/t/inc/Global.t b/t/inc/Global.t
index adf8d135..7b2994e6 100644
--- a/t/inc/Global.t
+++ b/t/inc/Global.t
@@ -5,12 +5,12 @@ define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
 require 'includes/Defines.php';
+require 'StartProfiler.php';
+require 'includes/AutoLoader.php';
 require 'LocalSettings.php';
+require 'includes/Setup.php';
 
-plan( 48 );
-
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/GlobalFunctions.php' );
+plan( 46 );
 
 $wgReadOnly = null;
 $wgReadOnlyFile = tempnam(wfTempDir(), "mwtest_readonly");
@@ -48,7 +48,7 @@ is( wfQuotedPrintable( "\xc4\x88u legebla?", "UTF-8" ),
 $start = wfTime();
 is( gettype( $start ), 'float', 'Time (type)' );
 $end = wfTime();
-cmp_ok( $end, '>', $start, 'Time' );
+cmp_ok( $end, '>', $start, 'Time (compare)' );
 
 $arr = wfArrayToCGI(
 	array( 'baz' => 'AT&T', 'ignore' => '' ),
diff --git a/tests/MediaWiki_TestCase.php b/tests/MediaWiki_TestCase.php
index 3ca1dbdf..387fe011 100644
--- a/tests/MediaWiki_TestCase.php
+++ b/tests/MediaWiki_TestCase.php
@@ -7,7 +7,7 @@ abstract class MediaWiki_TestCase extends PHPUnit_Framework_TestCase {
 	 */
 	protected function buildTestDatabase( $tables ) {
 		global $testOptions, $wgDBprefix, $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname;
-		$wgDBprefix = 'parsertest';
+		$wgDBprefix = 'parsertest_';
 		$db = new Database(
 			$wgDBserver,
 			$wgDBadminuser,
diff --git a/thumb.php b/thumb.php
index 677979a0..b973cc65 100644
--- a/thumb.php
+++ b/thumb.php
@@ -40,10 +40,31 @@ function wfThumbMain() {
 	}
 	unset( $params['r'] );
 
+	// Is this a thumb of an archived file?
+	$isOld = (isset( $params['archived'] ) && $params['archived']);
+	unset( $params['archived'] );
+
 	// Some basic input validation
 	$fileName = strtr( $fileName, '\\/', '__' );
 
-	$img = wfLocalFile( $fileName );
+	// Actually fetch the image. Method depends on whether it is archived or not.
+	if( $isOld ) {
+		// Format is <timestamp>!<name>
+		$bits = explode( '!', $fileName, 2 );
+		if( !isset($bits[1]) ) {
+			wfThumbError( 404, wfMsg( 'badtitletext' ) );
+			return;
+		}
+		$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
+		if( is_null($title) ) {
+			wfThumbError( 404, wfMsg( 'badtitletext' ) );
+			return;
+		}
+		$img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
+	} else {
+		$img = wfLocalFile( $fileName );
+	}
+
 	if ( !$img ) {
 		wfThumbError( 404, wfMsg( 'badtitletext' ) );
 		return;
diff --git a/trackback.php b/trackback.php
index bcb63768..398cc794 100644
--- a/trackback.php
+++ b/trackback.php
@@ -4,14 +4,11 @@
  * @file
  * @ingroup SpecialPage
  */
+
 require_once( './includes/WebStart.php' );
-require_once( './includes/DatabaseFunctions.php' );
 
-/**
- *
- */
 function XMLsuccess() {
-	header("Content-Type: application/xml; charset=utf-8");
+	header( "Content-Type: application/xml; charset=utf-8" );
 	echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <response>
 <error>0</error>
@@ -20,9 +17,9 @@ function XMLsuccess() {
 	exit;
 }
 
-function XMLerror($err = "Invalid request.") {
-	header("HTTP/1.0 400 Bad Request");
-	header("Content-Type: application/xml; charset=utf-8");
+function XMLerror( $err = "Invalid request." ) {
+	header( "HTTP/1.0 400 Bad Request" );
+	header( "Content-Type: application/xml; charset=utf-8" );
 	echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <response>
 <error>1</error>
@@ -32,14 +29,14 @@ function XMLerror($err = "Invalid request.") {
 		exit;
 }
 
-if (!$wgUseTrackbacks)
+if( !$wgUseTrackbacks )
 	XMLerror("Trackbacks are disabled.");
 
-if (   !isset($_POST['url'])
-    || !isset($_REQUEST['article']))
+if( !isset( $_POST['url'] )
+ || !isset( $_REQUEST['article'] ) )
 	XMLerror("Required field not specified");
 
-$dbw = wfGetDB(DB_MASTER);
+$dbw = wfGetDB( DB_MASTER );
 
 $tbtitle = strval( @$_POST['title'] );
 $tbex = strval( @$_POST['excerpt'] );
@@ -48,8 +45,8 @@ $tbname = strval( @$_POST['blog_name'] );
 $tbarticle = strval( $_REQUEST['article'] );
 
 $title = Title::newFromText($tbarticle);
-if (!isset($title) || !$title->exists())
-	XMLerror("Specified article does not exist.");
+if( !$title || !$title->exists() )
+	XMLerror( "Specified article does not exist." );
 
 $dbw->insert('trackbacks', array(
 	'tb_page'	=> $title->getArticleID(),
@@ -58,8 +55,7 @@ $dbw->insert('trackbacks', array(
 	'tb_ex'		=> $tbex,
 	'tb_name'	=> $tbname
 ));
+
 $dbw->commit();
 
 XMLsuccess();
-
-?>